Packman Build Service PMBS

Changes of Revision 14

deadbeef.changes Changed

@@ -1,4 +1,742 @@
 -------------------------------------------------------------------
+Tue Mar 19 07:54:26 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Drop hardcoded '-msse3' in ddb_dsp_libretro (fix non-x86 builds)
+
+-------------------------------------------------------------------
+Fri Mar 1 15:19:18 UTC 2024 - Michael Pujos <pujos.michael@gmail.com>
+
+- removed deadbeef-fix-includes.patch. Modify CFLAGS instead
+- removed upstream patches:
+ * deadbeef-fix-register-cxx17.patch 
+ * deadbeef-adplug-use-cxx11.patch
+ * deadbeef-fix-libretro-compilation.patch
+- Update to 1.9.6: 
+ * Fixed: Drawing spectrum analyzer in discrete frequencies mode
+ * Fixed: Handling the option to enter archives when scanning folders (fudanchii)
+ * Fixed: Playback performance issue when searching in large playlist
+ * Fixed: Possible crash when starting playback with ALSA plugin
+ * Fixed: Shuffle albums was not using Album Artist
+ * Fixed: Title formatting failure with large calculated values
+ * Fixed: Loading of small album art image files
+ * Fixed: MP4 parser failing to read/write certain tags correctly
+ * Fixed: Handling of title-formatted paths
+ * Fixed: A bug when editing metadata in multiple selected tracks
+ * Fixed: OSD notification reuse by default, with an option to disable
+ * Added: Bit depth override option (HiFiPhile)
+ * Added: DSD DoP support for ALSA/FFMPEG plugins (HiFiPhile)
+ * Added: $put, $puts, $get title formatting functions (Robin Ekman)
+
+-------------------------------------------------------------------
+Mon May 8 19:25:05 UTC 2023 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
+
+- Add deadbeef-fix-register-cxx17.patch
+- Add deadbeef-adplug-use-cxx11.patch
+
+-------------------------------------------------------------------
+Fri Feb 24 13:50:58 UTC 2023 - Michael Pujos <pujos.michael@gmail.com>
+
+- removed fix-warning.patch, not needed anymore
+- added pipewire build dependency
+- added deadbeef-fix-desktop-file.patch to fix bogus "Play Pause" action
+- added upstream deadbeef-fix-libretro-compilation.patch to fix compilation on ARM
+- Update to 1.9.5:
+
+ * Fixed: GME chiptune voice muting was affecting converter / replaygain scanner
+ * Fixed: SID chiptune voice muting was affecting converter / replaygain scanner
+ * Fixed: SID stereo was not working the way it was intended
+ * Fixed: Wave format conversion regressions, which could lead to wrong channels mapping
+ * Fixed: Converter race condition bug when checking whether a directory exists (dakeryas)
+ * Fixed: Album art fetching for tracks with multiple artists
+ * Fixed: GTK warning when opening track properties
+ * Fixed: Prompting before deleting playlist via middle mouse button
+ * Fixed: Album art left/right/center alignment in GTKUI
+ * Fixed: Removed embedded album art size limit for ID3v2 tags
+ * Fixed: Deadlock when trying to delete files from disk
+ * Fixed: Mute functionality for output plugins with their own volume control
+ * Fixed: Switching to previous/next track after the current track is removed
+ * Fixed: Incorrect playlist affected by hotkeys
+ * Fixed: Unsynchronized ID3v2 tag loading (credit: Robin Seth Ekman)
+ * Fixed: Spectrum analyzer buffer overflow
+ * Fixed: Deadlock when removing multiple selected tracks while one of them is playing
+ * Added: Pipewire output plugin (saivert)
+ * Added: LibRetro resampling plugin (toadking)
+ * Added: Chiptune voice muting in DUMB plugin
+ * Added: Improved drawing of spectrum analyzer
+ * Added: $itematindex(index,value) function to title formatting, get value by index from multivalue fields
+
+-------------------------------------------------------------------
+Sun Jan 1 17:43:46 UTC 2023 - Michael Pujos <pujos.michael@gmail.com>
+
+- Update to 1.9.4:
+ * Fixed: Deadlock when playing network streams
+ * Fixed: Handling multi-value genre in ID3v2
+ * Fixed: Will fully reinitialize ALSA device when changing output format,
+ to be compatible with more DACs
+ * Fixed: Duplicate playlist menu item was not showing
+ * Fixed: A random crash in visualization code
+ * Added: Customizable visualization background color for GTKUI
+ * Added: 64-bit seeking support in AAC, ALAC, Sndfile, Musepack, MP3, WMA, Vorbis
+ * Added: Embedded album art from OGG files
+ * Added: When double clicking a playlist in Playlist browser,
+ will play the first track in the shuffle queue,
+ according to current settings (pappnu)
+
+ * version 1.9.3
+ * Fixed: OpenBSD compatibility / warnings (Brad Smith)
+ * Fixed: Crash when loading certain malformed cuesheets
+ * Fixed: API behavior change regression causing certain plugins to malfunction
+ * Added: Support for building with FFMPEG 5.0 (xuzhen)
+
+- Removed fix-ffmpeg-5-support.patch: not needed anymore
+- Fixed deadbeef Help menu entries resulting in file not found errors
+
+-------------------------------------------------------------------
+Sun Nov 6 10:56:06 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add fix-ffmpeg-5-support.patch: Fix build against ffmpeg 5.0x
+
+-------------------------------------------------------------------
+Thu Nov 3 14:58:35 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 1.9.2:
+ * Fixed: Many race conditions, deadlocks and crashes
+ * Fixed: Crash when reading metadata of some .SPU files
+ * Fixed: Config file content was repeated twice
+ * Fixed: Default album art max file size increased to 40MB (Dakeryas)
+ * Fixed: Reading some DTS files which require a larger buffer when probing
+ * Fixed: Noise was played in the beginning of DTS files
+ * Fixed: Default cddb server changed to gnudb.gnudb.org:8880
+ * Fixed: Crash when playing certain .AY files
+ * Fixed: Playlist corruption when sorting by random
+ * Fixed: Crash in the sndfile plugin
+ * Fixed: Spectrum analyzer samplerate bug
+ * Fixed: Visualization buffer out-of-bounds access
+ * Fixed: Multichannel down-mixing bug
+ * Added: Notification displaying compatibility with KDE 5.23.5
+ * Added: GTKUI oscilloscope rendering with anti-aliasing
+ * Added: Selection Properties widget configurable to display metadata, properties, or both
+ * Added: Toggle Pause action in the Deadbeef.desktop file
+ * Added: Confirmation dialog when removing a playlist using hotkey
+ * Added: Improved Sort By -> Custom dialog
+- Add fix-warning.patch
+
+-------------------------------------------------------------------
+Mon Jul 4 12:03:46 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Sync ExcludeArch %ix86 with libdispatch: libdispatch is not being
+ buily and as such we don't have the needed dep available.
+
+-------------------------------------------------------------------
+Sat Jul 02 13:08:43 UTC 2022 - predivan@mts.rs
+
+- Update to version 1.9.1:
+ * Remove the hearts from default titlebar - mainly because large percentage of systems can't display emoji in the title bar.
+ * fix LINGUAS and translators.txt to include 'be'
+ * translation: restore Belarussian language translation
+ * gtkui: exclude medialib files, to avoid broken tarball
+
+ Changes in 1.9.0
+ * Fixed: WMA regression which caused corrupt playback
+ * Fixed: Deadlock in ALSA plugin
+ * Fixed: Mis-detection of raw AAC files as MP4 files
+ * Fixed: Handling empty title formatting scripts
+ * Fixed: Memory error when dragging playlist via Playlist Browser
+ * Fixed: Keyboard nagivation issues across playlist tabs (Saivert)
+ * Fixed: Playlist tabs and playlist customized colors bugs (Saivert)
+ * Fixed: Paused state was not persisted correctly after force-quitting
+ * Fixed: Regression which broke musepack seeking
+ * Fixed: Crash when notification artwork could not be found
+ * Fixed: Poor performance when saving playlist and configuration files
+ * Fixed: sndfile not opening files because of uninitialized memory access bug
+ * Fixed: Crash when removing tracks from playlist while they're playing
+ * Fixed: Rendering group titles with blank text
+ * Fixed: Delay activation of a playlist tab during drag-drop over the tab bar
+ * Fixed: ᵣussian and ᵦelarussian languages are no longer supported
+ * Added: Long file seeking support for Opus and FFMPEG
+ * Added: HTTPS support for vfs_curl in portable builds, via libmbedtls
+ * Added: New Scope and Spectrum Analyzer visualizations
+ * Added: Visualization appearance preferences pane
+ * Added: New album art loader
+ * Added: Configurable volume bar scale (dB, linear, cubic) via context menu (Saivert)
+ * Added: Title formatting $year(time) function
+ * Added: GTK UI for editing a chosen field of multiple selected tracks, in a table interface
+ * Added: Creating new playlist via clicking the "+" button in the playlist tab strip (Saivert)
+ * Added: Improved DSP preferences GTK UI (Saivert)
+ * Added: Improved handling of invalid MP3 files
+ * Added: Last.fm scrobbler will use HTTPS by default
+
+- Refresh deadbeef-drop-documents-installation.patch
+- Add deadbeef-fix-includes.patch
+
+-------------------------------------------------------------------
+Thu Sep 9 18:58:52 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>
+
+- Update version to 1.8.8
+ - Fixed: A crash and file path issues in PSF plugin
+ - Fixed: A crash when reading certain AAC files
+ - Fixed: Reading and writing metadata in certain MP4 files, which
+ didn't work before
+ - Fixed: Finding a cuesheet when the path contains symlink
+ - Fixed: %isplaying% and %ispaused% title formatting behavior
+ - Fixed: Playback of raw AAC files with ID3v2 tags
+ - Fixed: Infinite loop when trying to $replace an empty string
+ using title formatting
+ - Added: Handling of Disc subtitle frames in ID3v2 and APE tags
+ - Added: New improved plugin preferences UI
+ - Added: Non-modal preferences window
+ - Added: `$rgb()` title formatting function
+ - Added: Group title colorization support via title formatting
+ - Added: Plugin report and filtering in Plugin list
+ - Added: Focusable playlist tabs with keyboard navigation support
+ - Added: Sorting plugin list alphabetically
+ - Added: Reading of WAV RIFF tags
+ - Added: Improved album path handling, especially for Windows
+ - Added: Drag-and-drop on the main window
+ - Added: Using scroll wheel with seek bar
+ - Added: "Play Next" context menu action
+ - Added: Handling samplerates higher than 192KHz to pulseaudio
+ - Added: Delete from disk dialog will highlight the Delete button
+ as destructive action
+
+-------------------------------------------------------------------
+Thu Apr 1 10:50:57 UTC 2021 - Predrag Ivanović <predivan@mts.rs>
+
+- Disable LTO for now.
+ Enabling LTO breaks the use of Clang as a compiler.
+ It's detected by the build system, but compiler test fails, so 
+ the build fails, since Clang is the only supported compiler now.
+- Disable soundtouch plugin on i586 architecture.
+
+-------------------------------------------------------------------
+Thu Mar 25 22:38:42 UTC 2021 - Predrag Ivanović <predivan@mts.rs>
+
+- Update version to 1.8.7
+ * Fixed: Pulseaudio crash after a non-critical recoverable error
+ * Fixed: Hotkeys were sometimes not connecting to the correct UI plugins
+ * Fixed: Hotkey action "Sort by title" was missing
+ * Fixed: Unsupported ID3v2 frames are converted to supported frames instead of discarding
+ * Fixed: MP4 crash when encountering unknown metadata fields
+ * Fixed: Writing MP4 tags would corrupt the metadata, if the moov box is moving to the end of file
+ * Fixed: Off-by-one error when loading unsynchronized ID3v2.3 and 2.2 tags (sktt@github)
+ * Fixed: Parsing ALAC M4A files without relying on legacy 24-byte magic cookie
+ * Fixed: Saving the player resume state whenever a song finishes playing
+ * Fixed: ALSA deadlock / distortion bug caused by changing audio format at a wrong moment
+ * Fixed: WMA+CUE crash
+ 
+ * version 1.8.6
+ * Fixed loading encoder presets in non-portable builds
+ * Fixed truncation of long group titles in the playlist
+ 
+ * version 1.8.5
+ * Added the new ISO/IEC Base Media File Format library MP4P for working with MP4 files, which removes MP4FF dependency
+ * Added support for additional per-track metadata in cuesheets
+ * Added updating titlebar when displaying playback position (Nicolai Syvertsen)
+ * Added a more convenient way to edit container widgets in design mode (Nicolai Syvertsen)
+ * Fixed ALAC bug whiuch caused division by zero exception
+ * Fixed cuesheet parser bug caused by unknown/unsupported field names
+ * Fixed a series of bugs in the Adplug plugin
+ * Fixed a bug when parsing MP3 Xing/Info header, reading incorrect packet count
+ * Fixed a number of bugs in artwork plugin, especially affecting the Windows version (Jakub Wasylków, Keith Cancel)
+ * Fixed a SHIFT-JIS detection bug which caused memory corruption
+ * Fixed a bug when configuring keyboard shortcut involving Shift key
+ * Fixed a bug with playlist becoming to small in certain UI layouts
+ * Fixed a crash when deadbeef window becomes too small when using certain UI layouts
+ * Fixed drawing playlist column separators in certain newer GTK themes
+ * Fixed on-screen notification bug when too many notifications accumulated at the same time, spawning too many threads
+ * Fixed a bug, causing the Band field to be missing from %artist% specifier when using title formatting
+ * Fixed bugs leaking file handles in AAC and ALAC plugins (Thomas Jepp)
+ * Fixed handling certain non-conformant S3M files
+ * Fixed a bug where resizing the log window caused the auto-scroll to stop working (Nicolai Syvertsen)
+ * Fixed album shuffle bug, causing the same album to repeat after the last track of the album has finished
+ * Fixed shuffle bug causing short tracks to repeat
+ 
+- Package changes
+ * Switch the build to Clang (the only upstream supported compiler since version 1.8.6)
+ * Remove deadbeef_disable_psf.patch, use configure switch instead.
+ * Use _service generated tarball instead of the broken Github one (missing gitmodules).
+ * Spec-cleaner run
+
+-------------------------------------------------------------------
+Sat Jul 4 12:17:38 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
+
+- Fix deadbeef.appdata.xml 
+
+-------------------------------------------------------------------
+Thu Jul 2 12:44:41 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
+
+- Update version to 1.8.4
+ * Soundtouch plugin has been updated, and is now included in the releases
+ * Added %last_modified% title formatting keyword (Cristian Ciocaltea)
+ * Fixed stack overflow bug in converter
+ * Fixed buffer overflow bug in mp3 parser
+ * Fixed handling of leading forward shash character in zipper file names
+ * Fixed handling user-specified file mask in artwork plugin
+ * Fixed CBR MP3 scanning performance
+ * Fixed stack overflow in title formatting tint range calculation
+ * Fixed pulseaudio plugin configuration backwards compatibility issue
+ * Fixed last.fm scrobbling of streaming shoutcast tracks
+ * Fixed deadlock when loading cuesheets which recursively reference themselves
+ * Fixed a false-positive when detecting free format MP3 files
+ * Fixed skipping unsupported fields in cuesheets
+ * Fixed a regression which caused MP3 tag editing to crash when text can't be
+ represented as CP1252
+ * Fixed playback of certain network streams
+ * Fixed handling of ID3v2 COMM frame content description data
+- Drop deadbeef-better-ogg-and-aac-converter-support.patch, merged by upstream
+- Drop 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch, merged
+ by upstream
+- Drop deadbeef-fix-return-type.patch, fixed by upstream.
+- Drop deadbeef-compiler-warnings.patch, fixed by upstream.
+
+-------------------------------------------------------------------
+Thu Apr 2 14:02:20 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
+
+- Update version to 1.8.3 
+ * Fixed a CD Text reading issue
+ * Added title formatting functions: len2, longer, longest, padcut,
+ padcut_right, progress, progress2, right, roman, rot13, shortest, strchr,
+ stricmp, strrchr, strstr, substr, tab, trim (esainane@github)
+ * Fixed a bunch of memory bugs in title formatting (esainane@github)
+ * Added optional automatic playlist sorting (kpcee@github)
+ * Added title formatting value %playback_time_ms% (nonoo@github)
+ * Added an option to start deadbeef hidden / minimized to tray (kpcee@github)
+ * Fixed %_path_raw% to always produce an URI (Evgeny Kravchenko)
+ * Fixed rounding of %selection_playback_time% (kpcee@github)
+ * Fixed a memory leak in AAC plugin
+ * Fixed crash when removing playlist from UI layout (Nicolai Syvertsen)
+ * Added logging of plugin load errors
+ * Added an option to replaygain scan all unscanned files in playlist
+ (kpcee@github)
+ * Added detecting and ignoring freeformat MP3 files
+ * Removed logging of playlist load debug messages
+ * Fixed playback stuttering after deleting files
+ * Fixed deleting files using playlist tab context menu
+ * Fixed saving playlist after deleting files
+ * Fixed saving playlist after replaygain scan
+ * Fixed a bunch of crashes and memory leaks when opening playlist context menu
+ (Christian Boxdörfer)
+ * Fixed a performance issue when seeking in MP3 files
+ * Fixed a bunch of issues with Repeat and Shuffle implementation
+ * Fixed handling of in-stream HTTP headers for streaming audio
+ * Fixed a bunch of bugs in HTTP stream interruption
+ * Fixed semicolon-separated values handling in track properties dialog
+ * Fixed choosing next track when the currently playing track was removed
+ * Fixed seeking out of bounds using hotkeys
+ * Fixed saving opus header gain when no replaygain info is present
+ * Improved remove from disk dialog (kpcee@github)
+ * Fixed ID3v2 TLAN (LANGUAGE) and TMED (MEDIA TYPE) mapping to be consistent
+ with other formats
+ * Fixed replaygain bug causing it to be ON by default
+ * Fixed bug in elapsed time calculation in replaygain scanner UI
+ * Fixed a stack overflow bug when writing ID3v1
+ * Added ID3v2 POPM rating support, both reading and writing
+ * Fixed an issue with splitters not reaching the view edges
+ * Fixed single-quote escaping issue in ShellExec
+ * Fixed Add Location dialog not adding URLs
+ * Fixed ffmpeg file handle leak
+ * Added remove playlist confirmation dialog in GTK UI (kpcee@github)
+ * Fixed DTS channel count metadata
+ * Fixed loading MP3 album art of APIC type=0 (Other)
+ * Added album art fallback to png (jakesfr@github)
+ * Fixed ALSA hanging after audio format change
+ * Fixed handling "ICY 200 OK" status in vfs-curl (thesame)
+ * Improved EQ UI layout in the DSP settings
+ * Fixed streamer being stuck in buffering mode when trying to play deleted files
+- Drop deadbeef-fix_ubuntu_unity_desktop.patch, merged by upstream.
+ 
+-------------------------------------------------------------------
+Sun Feb 16 09:02:21 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
+
+- More profiles for ogg and aac
+ add deadbeef-better-ogg-and-aac-converter-support.patch
+
+-------------------------------------------------------------------
+Thu Jan 16 11:11:11 UTC 2020 - olaf@aepfle.de
+
+- Fix potential buffer overflow in on_group_by_custom_activate
+
+-------------------------------------------------------------------
+Mon Jan 6 13:26:05 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
+
+- Update version to 1.8.2
+ * Volume control from command line supports increment syntax (by
+ eauno1re@github)
+ * Fixed writing multi-value fields into FLAC tags
+ * Map ALBUMARTIST field to ALBUM ARTIST field in FLAC
+ * Fixed sound output plugin selection bug in GTK UI
+ * Fixed crash when opening files of 0 size
+ * Fixed UI freeze when nullout plugin is selected
+ * Fixed a regression in restoring the last selected folder in GTK file chooser
+- Fixed reture type, add deadbeef-fix-return-type.patch
+- Install documents by rpmbuild, add deadbeef-drop-documents-installation.patch
+
+-------------------------------------------------------------------
+Sat Jun 29 21:15:00 UTC 2019 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 1.8.1:
+ * Fix audio freeze while sorting.
+ * Fix a crash when resuming playback of a file that has been
+ deleted.
+ * Fix error messages when loading PLS playlist with relative
+ paths.
+ * Fix adjusting shuffle queue after a user initiated track change.
+ * Write Album Artist field into OGG files as "ALBUMARTIST".
+ * Load external album covers before embedded.
+ * Remove the unmaintained sndio plugin.
+ * Fix localisation of status bar.
+ * Add experimental subgrouping support in playlist, via using a
+ "|||" separator for each subsequent nested group, when using
+ Group by -> Custom.
+ * Add new title formatting functions "$stripprefix" and
+ "$swapprefix".
+ * Change supereq DSP configuration to be more compact
+ horizontally and to have more slider precision.
+ * Update Repeat and Shuffle hotkey names to match the menus.
+ * Fix rounding bug of total playtime in statusbar.
+ * Fix design mode splitter handles dragging beyond the window edges.
+ * Fix setting album art size based on larger dimension (by ToadKing).
+ * Fix a regression causing custom layouts with splitters look
+ wrong.
+ * Add a FLAC plugin option to ignore corrupted stream errors.
+ * Fix a supereq reentrancy bug, potentially causing crash after
+ changing audio output configuration.
+ * Fix reloading replaygain info.
+ * Fix writing replaygain info to APEv2 tags.
+- Rebase deadbeef-compiler-warnings.patch,
+ deadbeef_disable_psf.patch.
+
+-------------------------------------------------------------------
+Fri May 24 08:21:09 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
+
+- Added _service file to remove the non-distributable plugins/psf 
+ and other undesired files
+- Added deadbeef_disable_psf.patch
+
+-------------------------------------------------------------------
+Mon Apr 8 06:01:14 UTC 2019 - olaf@aepfle.de
+
+- Fix filelist for restricted build
+
+-------------------------------------------------------------------
+Sun Apr 7 17:43:47 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 1.8.0
+ * added Opus support
+ * added ReplayGain Scanner
+ * added proper tracks+cue support (in cooperation with wdlkmpx)
+ * added/improved MP4 tag reading and writing
+ * added loading embedded album art from MP4 files
+ * added File Copy and File Move converter presets
+ * added Log Window displaying error information from various
+ sources (in cooperation with Saivert)
+ * improved replaygain configuration and runtime behavior
+ * fixed replaygain support in Converter
+ * improved reading, storing and editing multi-value tag fields
+ * added GBS support to Game_Music_Emu (kode54)
+ * added SGC support to Game_Music_Emu
+ * fixed clipping prevention for mp3, replaygain is applied
+ before clipping
+ * fixed vfz_zip handling of colons in filenames
+ * fixed wma decoding precision error
+ * fixed issues with playing very short files
+ * fixed a number of known issues in the Converter
+ * UI splitter proportional resizing (cboxdoerfer)
+ * added to title formatting: $num, %_path_raw%,
+ %_playlist_name%, $replace, $upper, $lower,
+ %playback_bitrate%, $repeat, $insert, $len, <<<>>>, >>><<<,
+ $pad, $pad_right (saivert)
+ * added support for dim and bright text in playlist columns
+ (saivert)
+ * improved detecting GTK theme colors for custom widgets
+ * added new multiline tag editing dialog for individual values
+ * added Copy&Paste in playlist (cboxdoerfer)
+ * added localization support for plugin UI
+ * added Drag'n'drop support from deadbeef to other
+ applications (cboxdoerfer)
+ * fixed a number of ogg file tagging issues (kode54)
+ * fixed multiple crash bugs in AdPlug plugin
+ * added UMX module support, ported from foo_dumb
+ * updated Game_Music_Emu and VGMplay (kode54)
+ * added an option to Converter, to copy the files if the
+ format doesn't change
+ * added a configuration option `gtkui.start_hidden`, to start
+ the player with hidden main window (Radics Péter)
+ * added a converter option to retag the files after copying
+ * added a context menu action for duplicating playlists (Alex
+ Couture-Beil)
+ * fixed a number of fadeout issues in Game_Music_Emu
+ * fixed musepack seeking issue
+ * fixed loading album covers from ID3v2.2
+ * fixed mp3 bitrate calculation bug for incomplete files with
+ LAME header
+ * improved large file support with many internal values
+ converted to use 64 bits for sample counts
+ * use title formatting for displaying status bar text
+ * added %seltime% title formatting value, for displaying
+ playback time of selected tracks (Thomas Ross)
+ * added reading SONGWRITER field from cue sheets (wdlkmpx)
+ * added playlist group spacing configuration (saivert)
+ * improved mp3 USLT lyrics support (in copperation with Ignat
+ Loskutov)
+ * improved playlist browser configurability (Jakub Wasylków)
+ * added hotkey action for opening track properties (Jakub
+ Wasylków)
+ * added hotkey actions for add/remove/toggle in playqueue
+ (Jakub Wasylków)
+ * added --volume command line option (Saivert)
+ * improved ISRC and subindex handling in CUE (wdlkmpx)
+ * added hotkey actions to move selected tracks up/down (Jakub
+ Wasylków)
+ * fixed memory access bugs in config handling and supereq
+ (github/tsowa)
+ * added charset detection based on the whole ID3v2 tag content
+ * added automatic charset detection for cdtext (Jakub Wasylków)
+ * added configuration for output samplerate setting
+ * removed fast scanning mp3 option, since it was too inaccurate
+ * improved detection of PSF files, to disambiguate them
+ against other files which use the same extension
+ * added Edit In Place and Crop options to the track properties
+ menu
+ * fixed WildMidi playback of some MID files playing more than
+ 1024 simultaneous notes
+ * fixed playing stereo APE files with single-channel silence
+ * added wavpack version 5 support with DSD
+ * fixed performance issue when reading AdPlug's HSC files
+ * fixed loading audio files from GVFS volumes
+ * fixed handling of cuesheets in zip files
+ * fixed writing tags into tiny ogg files
+ * fixed handling FLAC files with huge block sizes over 100KB
+ * replaced mp3 parsing code with the new library, which is
+ more reliable and tested, and can handle even more obscure
+ mp3 files
+ * renamed Looping and Order menus to Repeat and Shuffle,
+ respectively
+ * fixed loading larger Songlenths.txt in sid plugin, and added
+ support for Songlengths.md5
+
+- Refreshed deadbeef-fix_ubuntu_unity_desktop.patch and
+ deadbeef-compiler-warnings.patch
+
+- Dropped 0001-Explicitly-specify-signedness-for-char.patch and
+ 0002-Use-signed-values-instead-of-potentially-unsigned-li.patch
+ (no longer necessary)
+
+- Enabled opus
+
+-------------------------------------------------------------------
+Wed Feb 14 15:43:17 UTC 2018 - crrodriguez@opensuse.org
+
+- Add missing direct buildRequires 
+- Remove buildrequires on xorg-x11-libs metapackage
+
+-------------------------------------------------------------------
+Fri Nov 3 18:10:41 UTC 2017 - sor.alexei@meowr.ru
+
+- Add deadbeef.appdata.xml as a separate file and remove
+ deadbeef-add-appdata.patch (boo#1066408): the patch was rejected
+ upstream. Remove intltool stubs, which fixes the bug.
+
+-------------------------------------------------------------------
+Thu Nov 2 17:25:14 UTC 2017 - stefan.bruens@rwth-aachen.de
+
+Fix build on ARM/PPC:
+ * Add 0001-Explicitly-specify-signedness-for-char.patch
+ * Add 0002-Use-signed-values-instead-of-potentially-unsigned-li.patch
+ * Add 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch
+
+-------------------------------------------------------------------
+Fri Aug 25 06:10:58 UTC 2017 - olaf@aepfle.de
+
+- Remove mpg123/mad conditional because it is always present
+
+-------------------------------------------------------------------
+Fri Jun 30 20:35:31 UTC 2017 - olaf@aepfle.de
+
+- Better conditional for mp3.so
+
+-------------------------------------------------------------------
+Tue Jun 27 21:32:39 UTC 2017 - olaf@aepfle.de
+
+- buildconditional for mad and mpg123
+
+-------------------------------------------------------------------
+Thu May 11 09:27:18 UTC 2017 - sor.alexei@meowr.ru
+
+- Enable building with libmpg123 and libmad for newer openSUSE
+ releases even outside of Packman.
+
+-------------------------------------------------------------------
+Wed Mar 15 17:36:47 UTC 2017 - olaf@aepfle.de
+
+- List all %doc files to fix build with rpm 4.13
+
+-------------------------------------------------------------------
+Sun Feb 5 13:36:34 UTC 2017 - mailaender@opensuse.org
+
+- Add deadbeef-add-appdata.patch for
+ https://software.opensuse.org/appstore
+
+-------------------------------------------------------------------
+Sun Feb 5 12:24:41 UTC 2017 - jengelh@inai.de
+
+- Update description
+
+-------------------------------------------------------------------
+Wed May 4 16:34:01 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to version 0.7.2:
+ * Fix title formatting %filename% crash.
+ * Fix streaming of aac content in mp4 container.
+ * Add https:// support to vfs_curl.
+ * Add zh_TW translation to deadbeef.desktop.
+ * Fix loading cue sheets without any metadata fields.
+ * Fix file close bug in VTX plugin.
+ * Fix evaluating nested square brackets syntax in title
+ formatting.
+ * Improve support for large fields in ID3v2 tags.
+ * Fix potential crash bug in artwork plugin.
+ * Fix path separator '/' escaping regression in converter.
+ * Move ffmpeg plugin to the end of plugin list, to prevent
+ conflicts with other input plugins.
+ * Add $fix_eol, $hex title formatting.
+ * Fix importing , and \n characters from old configuration
+ files.
+ * Fix "Group by artist/date/title" title formatting.
+ * Add enumerating/exposing of all supported file extensions to
+ ffmpeg plugin.
+ * Fix handling of ':' in file path in vfs_zip plugin.
+ * Fix old ffmpeg versions support.
+ * Fix wma decoder loudness issue.
+ * Fix DCA buffer allocation, to make it more musl-friendly.
+ * Add $num implementation to title formatting.
+ * Fix --nowplaying-tf behavior when player is stopped.
+- Remove deadbeef-0.7.1-fix-osd-notify.patch.
+- Rebase deadbeef-fix_ubuntu_unity_desktop.patch.
+
+-------------------------------------------------------------------
+Wed Apr 6 06:45:54 UTC 2016 - sor.alexei@meowr.ru
+
+- Add deadbeef-0.7.1-fix-osd-notify.patch from the upstream commit
+ da89020: fix a crash when processing "%filename%".
+
+-------------------------------------------------------------------
+Tue Mar 15 19:41:43 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to 0.7.1:
+ * Fix GTKUI maximised window layout saving/restoring.
+ * Fix GTKUI maximised window column autoresize saving/restoring.
+ * Fix artwork plugin version checks.
+ * Disable bogus shift-jis detection, which was overriding cp1252.
+ * Fix MP3 bitrate calculation regression.
+ * Fix wrong padding of formatted time.
+ * Fix importing legacy title formatting fields bug.
+ * Fix incorrect output format after resuming paused session.
+ * Fix $ext title formatting bug.
+ * Fix %tracknumber% title formatting bug.
+ * Fix auto-updating title formatting fields.
+ * Fix cache cleaner crash bug.
+ * Fix crash when trying to play GYM files.
+ * Fix importing legacy playlist grouping config.
+ * Fix FLAC metadata field mapping.
+ * Fix FLAC metadata track/total and disc/total splitting.
+
+-------------------------------------------------------------------
+Mon Feb 1 14:19:36 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to 0.7.0:
+ * converter: Fix bug overwriting the source file with destination.
+ * artwork: add cache cleaner, MusicBrainz backend;
+ + configurable default picture, numerous bugfixes;
+ + performance improvements, more customisation options.
+ * playlist browser: improve drag-n-drop;
+ + double-click / middle-click on empty area to create new
+ playlist;
+ + middle-click on playlist to remove it;
+ + highlight current playlist, configurable columns;
+ + sort columns by clicking their headers;
+ + performance optimisations.
+ * Various selection properties improvements.
+ * Add "Skip to ..." next/prev album/genre/composer actions.
+ * More appearance customisation options in GTK+UI.
+ * Add center-alignment option to playlist columns.
+ * Add 1 and 5 second "Seek forward/backward" actions.
+ * Fix random gtkui crash when closing playlist via menu.
+ * New title formatting implementation, aiming to be compatible
+ with fb2k, replacing the old one.
+ * Add grouping to search window.
+ * Improve error handling in vfs_curl.
+ * Fix volume control via mouse scroll when using Gtk3.
+ * Fix unwanted restarting when unpausing streaming tracks of
+ known length.
+ * sid: Use stereo by default, with an option to force mono;
+ fix performance issues.
+ * cdda: Improve cddb support, libcdparanoia, multiple CD drives,
+ speed selection.
+ * gtkui: Add selection focus, such that the found tracks will be
+ focused while using the search window.
+ * tags: Use cp1252 instead of iso8859-1 everywhere.
+ * Fix resuming network streams after losing network connection.
+ * Fix cuesheet charset detection crash bug.
+ * Rename mpgmad plugin to "mp3".
+ * Add libmpg123 support as a 2nd backend to mp3 plugin, as default.
+ * mp3: Fix xing header parsing, length calculation issues.
+ * Favour album artist over artist in "stop after current album"
+ mode.
+ * gme: Fix SAP file duration and improved looping handling.
+ * sid: Automatic detection of HVSC SongLengths.txt from sid file
+ paths.
+ * gtkui: Add Tabs widget in Design mode.
+ * Add sc68 plugin for playing Atari ST music.
+ * Add on-demand initialisation to wild-midi, to speed up player
+ init.
+ * flac: Fix legacy cuesheet handling.
+ * Add writing updated replaygain info to all supported tag
+ formats.
+ * Fix setting focus on the main window / playlist on startup.
+ * Change volume up/down actions to have a step of 1dB instead of
+ 2dB.
+ * Fix bigendian support in the converter.
+ * Update DUMB and GME to the newest versions.
+ * Fix handling of several formats in sndfile plugin.
+ * Add support for ORIGINAL_RELEASE_TIME and ORIGINAL_RELEASE_YEAR
+ metadata fields.
+ * Add loading plugins from a $DEADBEEF_PLUGIN_DIR directory.
+ * Fix a bug which was skipping next track after deleting current
+ track.
+ * DUMB and GME can now do their own proper infinite looping in
+ "Loop single" mode.
+ * alac: Fix bits per sample varying from what the MP4 container
+ specifies.
+ * psf: Fix crash after format probing failure.
+ * Search window title will show the number of search results.
+ * SRC resampler: Fix very rare buffer overflow crash.
+ * mp3: Add LAME preset support.
+ * album art: Fix scaling of non-square images.
+ * ffmpeg: Update to support new library versions.
+ * gtkui: Improve playlist column drag-n-drop.
+ * Configuration file is now written with 0600 permissions.
+ * Add tracktotal and disctotal support for many tagging formats.
+ * Add extended ID3v1 genres.
+ * Fix int-float conversion off-by-one precision bug.
+ * Fix sorting algorithm u8_strcasecmp stability issue.
+ * Fix playlist context menu actions to work on clicked playlist,
+ instead of the current one.
+- Add plugin licences to the main package.
+- Move GME plugin to the main package.
+- Rebase deadbeef-fix_ubuntu_unity_desktop.patch.
+- Update deadbeef-compiler-warnings.patch.
+- Remove workaround_div_by_zero.diff: merged upstream.
+
+-------------------------------------------------------------------
+Tue Sep 1 10:22:51 UTC 2015 - sor.alexei@meowr.ru
+
+- Enable Gtk2 build.
+- Move Game Music Emu and AOSDK plugins to deadbeef-plugins-extra
+ package: non-commercial restriction makes these plugins non-FOSS.
+- Require deadbeef-plugins-extra instead of recommending in PMBS.
+
+-------------------------------------------------------------------
 Thu Jun 25 07:13:39 UTC 2015 - olaf@aepfle.de
 
 - Fix compiler warnings
@@ -268,7 +1006,6 @@
 - "middle mouse button to delete playlist" is now default behavior
 - fixed few issues with auto-saving playlist configuration
 - fixed playlist redraw after cddb queries
- 
 
 -------------------------------------------------------------------
 Fri Jun 4 21:58:24 UTC 2010 - andrea@opensuse.org
@@ -285,4 +1022,3 @@
 Sun May 23 23:05:28 UTC 2010 - andrea@opensuse.org
 
 - New package 
-

deadbeef.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package deadbeef
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,79 +12,96 @@
 # 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
+# LTO breaks compiler test at configure stage,
+# which is bad since Clang is the only suported compiler now.
+%define _lto_cflags %{nil}
 %bcond_with restricted
 Name: deadbeef
-Version: 0.6.2
+Version: 1.9.6
 Release: 0
 Summary: GTK+ audio player
-License: Zlib
+License: BSD-3-Clause AND GPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later
 Group: Productivity/Multimedia/Sound/Players
-Url: http://deadbeef.sourceforge.net/
-Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE deadbeef-fix_ubuntu_unity_desktop.patch i@marguerite.su -- Fix Unity-oriented desktop-file warnings.
-Patch0: deadbeef-fix_ubuntu_unity_desktop.patch
-Patch1: deadbeef-compiler-warnings.patch
-BuildRequires: alsa-devel
-BuildRequires: dbus-1-devel
-BuildRequires: flac-devel
-BuildRequires: gcc-c++
+URL: https://deadbeef.sourceforge.io/
+Source: %{name}-%{version}.tar.bz2
+Source1: %{name}.appdata.xml
+# PATCH-FIX-OPENSUSE 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch
+Patch0: 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch
+# PATCH-FIX-OPENSUSE deadbeef-drop-documents-installation.patch hillwood@opensuse.org -- Install documents by rpmbuild.
+Patch1: %{name}-drop-documents-installation.patch
+# PATCH-FIX-OPENSUSE deadbeef-fix-desktop-file.patch -- fix bogus "Play Pause" action
+Patch2: %{name}-fix-desktop-file.patch
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: clang
+BuildRequires: fdupes
 BuildRequires: hicolor-icon-theme
-BuildRequires: imlib2-devel
 BuildRequires: intltool
-BuildRequires: libcddb-devel
-BuildRequires: libcdio-devel
-BuildRequires: libcurl-devel
+BuildRequires: libdispatch-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libnotify-devel
-BuildRequires: libpulse-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libzip-devel
+BuildRequires: libtool
+BuildRequires: pkgconfig
 BuildRequires: update-desktop-files
-BuildRequires: wavpack-devel
-BuildRequires: xorg-x11-libs
 BuildRequires: yasm
-Recommends: %{name}-lang = %{version}
-Recommends: %{name}-plugins-extra = %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} >= 1210
-BuildRequires: gtk3-devel
-%else
-BuildRequires: gtk2-devel
-%endif
-%if 0%{?suse_version} <= 1140
-BuildRequires: xorg-x11-libxcb-devel
-%endif
+BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(atk)
+BuildRequires: pkgconfig(cairo)
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(flac)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(imlib2)
+BuildRequires: pkgconfig(jansson)
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavutil)
+BuildRequires: pkgconfig(libcddb)
+BuildRequires: pkgconfig(libcdio)
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(libmpg123)
+BuildRequires: pkgconfig(libnotify)
+BuildRequires: pkgconfig(libpipewire-0.3)
+BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(libzip)
+BuildRequires: pkgconfig(mad)
+BuildRequires: pkgconfig(opusfile)
+BuildRequires: pkgconfig(pango)
+BuildRequires: pkgconfig(samplerate)
+BuildRequires: pkgconfig(sndfile)
+BuildRequires: pkgconfig(vorbis)
+BuildRequires: pkgconfig(wavpack)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(zlib)
+ExcludeArch: %{ix86}
 %if %{with restricted}
 BuildRequires: libfaad-devel
-BuildRequires: libffmpeg-devel
-BuildRequires: libmad-devel
+Requires: %{name}-plugins-extra = %{version}-%{release}
+%else
+Recommends: %{name}-plugins-extra = %{version}
 %endif
 
 %description
-DeaDBeeF is an audio player for GNU/Linux and other UNIX-like
-systems. It is written in C with some plugins in C++. DeaDBeeF has
-minimal dependencies for a native GTK+ GUI, cuesheet support,
-support for MP3, Ogg, FLAC, and APE, chiptune formats with subtunes,
-song-length databases, and more.
-It is very fast, lightweight, and extensible using plugins (DSP,
-GUI, output, input, etc.). The GUI looks similar to Foobar2000.
+DeaDBeeF is an audio player using GTK+. Through use of the ffmpeg
+libraries, it supports many formats. It also supports cuesheets,
+chiptune formats with subtunes, song-length databases. It can be
+extended using plugins (DSP, GUI, output, input, etc.). The GUI looks
+similar to Foobar2000.
 
 %lang_package
 
 %if %{with restricted}
-%package 	plugins-extra
+%package plugins-extra
 Summary: Extra plugins for DeaDBeeF
-License: Zlib and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause and Unicode
+License: BSD-3-Clause AND GPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND Unicode AND NonFree
 Group: Productivity/Multimedia/Sound/Players
 Requires: %{name} = %{version}
+Recommends: faac
 Obsoletes: %{name}-restricted-plugins < %{version}
-Provides: %{name}-restricted-plugins = %{version}
+Provides: %{name}-restricted-plugins = %{version}-%{version}
 
 %description plugins-extra
 Extra plugins for DeaDBeeF audio player.
@@ -95,50 +112,61 @@
 License: Zlib
 Group: Development/Libraries/C and C++
 Requires: %{name} = %{version}
-Requires: pkg-config
 
 %description devel
 This package provides headers for DeaDBeeF plugins development.
 
 %prep
-%setup -q
-%patch0
-%patch1 -p1
-sed -i 's/zip_file_t/db_zip_file_t/g' plugins/vfs_zip/vfs_zip.c
+%autosetup -n %{name}-%{version} -p1
+
+cp %{SOURCE1} %{name}.appdata.xml
+
+# Drop hardcoded -msse3
+sed -i "s/-msse3//" ./external/ddb_dsp_libretro/Makefile.*
 
 %build
-export CFLAGS="%{optflags} -fno-strict-aliasing"
-export CXXFLAGS="%{optflags} -fno-strict-aliasing"
-%configure \
- --disable-static \
-%if 0%{?suse_version} >= 1210
- --enable-gtk3 --disable-gtk2 \
+export CC=clang
+export CXX=clang++
+# clang on 15.3 doesn't know about '-Wno-unused-but-set-variable'
+%if 0%{?sle_version} == 150300
+export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused-command-line-argument -fpie -fPIC"
+export CXXFLAGS="$CFLAGS"
+%else
+export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused-command-line-argument -Wno-unused-but-set-variable -fpie -fPIC"
+export CXXFLAGS="$CFLAGS"
 %endif
-%if %{with restricted}
- --enable-ffmpeg \
+%ifnarch x86_64
+export CFLAGS=$(echo "$CFLAGS -Wno-error=unused-variable")
+export CXXFLAGS="$CFLAGS"
+%endif
+# libdispatch-devel puts Block.h in non standard directory
+export CFLAGS="$CFLAGS -I%{_includedir}/block"
+export LDFLAGS="$LDFLAGS -pie"
+
+%configure \
+ --disable-static \
+%ifarch %{ix86}
+ --disable-soundtouch \
 %endif
- --docdir=%{_docdir}/%{name}/
-make %{?_smp_mflags}
+ --disable-psf \
+	--docdir=%{_docdir}/%{name}
+%make_build
 
 %install
 %make_install
+rm -rf %{buildroot}%{_libexecdir}/debug/%{_libdir}/%{name}/ddb_soundtouch.so*
+rm -rf %{buildroot}%{_docdir}/%{name}
+install -Dpm 0644 %{name}.appdata.xml \
+%{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml
+
 %suse_update_desktop_file %{name}
 find %{buildroot} -type f -name "*.la" -delete -print
 %find_lang %{name}
-
-%if 0%{?suse_version} > 1140
-%post
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun
-%desktop_database_postun
-%icon_theme_cache_postun
-%endif
+%fdupes -s %{buildroot}%{_libdir}/%{name}/data68/Replay
 
 %files
-%defattr(-,root,root)
-%doc %{_docdir}/%{name}/
+%doc README help.txt about.txt translators.txt ChangeLog
+%license COPYING COPYING.GPLv2 COPYING.LGPLv2.1
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/adplug.so*
@@ -146,6 +174,7 @@
 %{_libdir}/%{name}/artwork.so*
 %{_libdir}/%{name}/cdda.so*
 %{_libdir}/%{name}/ffap.so*
+%{_libdir}/%{name}/ffmpeg.so*
 %{_libdir}/%{name}/flac.so*
 %{_libdir}/%{name}/gme.so*
 %{_libdir}/%{name}/hotkeys.so*
@@ -154,6 +183,7 @@
 %{_libdir}/%{name}/nullout.so*
 %{_libdir}/%{name}/oss.so*
 %{_libdir}/%{name}/pulse.so*
+%{_libdir}/%{name}/rg_scanner.so*
 %{_libdir}/%{name}/sid.so*
 %{_libdir}/%{name}/sndfile.so*
 %{_libdir}/%{name}/supereq.so*
@@ -165,18 +195,26 @@
 %{_libdir}/%{name}/dca.so*
 %{_libdir}/%{name}/mms.so*
 %{_libdir}/%{name}/musepack.so*
+%{_libdir}/%{name}/opus.so*
 %{_libdir}/%{name}/shellexec.so*
 %{_libdir}/%{name}/tta.so*
 %{_libdir}/%{name}/wildmidi.so*
 %{_libdir}/%{name}/converter.so*
 %{_libdir}/%{name}/dsp_libsrc.so*
 %{_libdir}/%{name}/m3u.so*
+%{_libdir}/%{name}/mp3.so*
 %{_libdir}/%{name}/vfs_zip.so*
-%{_libdir}/%{name}/ddb_ao.so*
 %{_libdir}/%{name}/ddb_dumb.so*
+%{_libdir}/%{name}/ddb_dsp_libretro.so*
 %{_libdir}/%{name}/ddb_mono2stereo.so*
+%{_libdir}/%{name}/ddb_out_pw.so*
 %{_libdir}/%{name}/ddb_shn.so*
+%ifnarch %{ix86}
+%{_libdir}/%{name}/ddb_soundtouch.so*
+%endif
 %{_libdir}/%{name}/alac.so*
+%{_libdir}/%{name}/in_sc68.so*
+%{_libdir}/%{name}/data68/
 %{_libdir}/%{name}/converter_gtk?.so*
 %{_libdir}/%{name}/ddb_gui_GTK?.so*
 %{_libdir}/%{name}/pltbrowser_gtk?.so*
@@ -185,20 +223,17 @@
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
+%dir %{_datadir}/metainfo/
+%{_datadir}/metainfo/%{name}.appdata.xml
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
 
 %if %{with restricted}
 %files plugins-extra
-%defattr(-,root,root)
-%{_libdir}/deadbeef/aac.so*
-%{_libdir}/deadbeef/ffmpeg.so*
-%{_libdir}/deadbeef/mpgmad.so*
+%{_libdir}/%{name}/aac.so*
 %endif
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/%{name}/
 
 %changelog

0003-Fix-operator-precedence-and-uninitialized-value-warn.patch Added

@@ -0,0 +1,45 @@
+From 30080bc60897545bb39805eeaebe6588a760d126 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Thu, 2 Nov 2017 20:10:18 +0100
+Subject: PATCH 3/3 Fix operator precedence and uninitialized value warnings
+
+---
+ plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h | 4 ++--
+ plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: deadbeef-1.9.2/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
+===================================================================
+--- deadbeef-1.9.2.orig/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
++++ deadbeef-1.9.2/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
+@@ -115,7 +115,7 @@ inline void endian_16hi8 (uint_least16_t
+ #endif
+ }
+ 
+-// Set the hi byte (8 bit) in a word (16 bit)
++// Get the hi byte (8 bit) of a word (16 bit)
+ inline uint8_t endian_16hi8 (uint_least16_t word)
+ {
+ #if defined(SID_OPTIMISE_MEMORY_ACCESS)
+@@ -141,7 +141,7 @@ inline void endian_16swap8 (uint_least16
+ // Convert high-byte and low-byte to 16-bit word.
+ inline uint_least16_t endian_16 (uint8_t hi, uint8_t lo)
+ {
+- uint_least16_t word;
++ uint_least16_t word = 0;
+ endian_16lo8 (word, lo);
+ endian_16hi8 (word, hi);
+ return word;
+Index: deadbeef-1.9.2/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
+===================================================================
+--- deadbeef-1.9.2.orig/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
++++ deadbeef-1.9.2/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
+@@ -197,7 +197,7 @@ private:
+ 
+ // Compress address to not leave so many spaces
+ uint_least8_t convertAddr(uint_least8_t addr)
+- { return (((addr) & 0x3) | ((addr) >> 3) & 0x0c); }
++ { return ((addr) & 0x3) | (((addr) >> 3) & 0x0c); }
+ 
+ void reset (void);
+ uint8_t read (uint_least8_t addr)

deadbeef-0.6.2-fix_ubuntu_unity_desktop.patch Deleted

@@ -1,53 +0,0 @@
---- deadbeef.desktop.in.orig	2014-11-08 08:54:43.708910182 +0100
-+++ deadbeef.desktop.in	2014-11-08 10:51:33.530003678 +0100
-@@ -13,50 +13,3 @@
- Type=Application
- Icon=deadbeef
- X-PulseAudio-Properties=media.role=music
--
--X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Next;Prev
--
--Play Shortcut Group
--Name=Play
--Exec=deadbeef --play
--TargetEnvironment=Unity
--
--Pause Shortcut Group
--Name=Pause
--Exec=deadbeef --pause
--TargetEnvironment=Unity
--
--Stop Shortcut Group
--Name=Stop
--Exec=deadbeef --stop
--TargetEnvironment=Unity
--
--Next Shortcut Group
--Name=Next
--Exec=deadbeef --next
--TargetEnvironment=Unity
--
--Prev Shortcut Group
--Name=Prev
--Exec=deadbeef --prev
--TargetEnvironment=Unity
--
--Desktop Action Play
--Name=Play
--Exec=deadbeef --play
--
--Desktop Action Pause
--Name=Pause
--Exec=deadbeef --pause
--
--Desktop Action Stop
--Name=Stop
--Exec=deadbeef --stop
--
--Desktop Action Next
--Name=Next
--Exec=deadbeef --next
--
--Desktop Action Previous
--Name=Prev
--Exec=deadbeef --prev

deadbeef-compiler-warnings.patch Deleted

@@ -1,216 +0,0 @@
- 168s I: A function overflows or underflows an array access. This could be a real error,
- 168s but occasionaly this condition is also misdetected due to loop unrolling or strange pointer
- 168s handling. So this is warning only, please review.
- 168s W: deadbeef arraysubscript dumb-kode54/src/it/readdsmf.c:32
- 168s W: deadbeef arraysubscript game-music-emu-0.6pre/gme/Spc_Cpu.cpp:403, 404
- 168s 
- 168s I: Program causes undefined operation
- 168s (likely same variable used twiceand post/pre incremented in the same expression).
- 168s e.g. x = x++; Split it in two operations.
- 168s W: deadbeef sequence-point adplug/cff.cpp:381
- 168s W: deadbeef sequence-point adplug/dmo.cpp:323, 343, 367
- 168s W: deadbeef sequence-point lh5dec.c:95
- 168s W: deadbeef sequence-point ttadec.c:515
- 168s 
- 168s I: Program is using uninitialized variables.
- 168s Note the difference between "is used" and "may be used"
- 168s W: deadbeef uninitialized-variable ../../plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h:91
- 168s 
- 168s I: Program returns random data in a function
- 168s E: deadbeef no-return-in-nonvoid-function artwork.c:229
- 168s E: deadbeef no-return-in-nonvoid-function streamer.c:810, 818, 826
- 168s E: deadbeef no-return-in-nonvoid-function vorbis.c:134
- 168s 
- 168s I: Program returns random data in a function
- 168s E: deadbeef no-return-in-nonvoid-function artwork.c:229
- 168s E: deadbeef no-return-in-nonvoid-function streamer.c:810, 818, 826
- 168s E: deadbeef no-return-in-nonvoid-function vorbis.c:134
- 168s 
- 168s I: Expression compares a char* pointer with a string literal.
- 168s Usually a strcmp() was intended by the programmer
- 168s E: deadbeef stringcompare widgets.c:1179, 1212
----
- plugins/adplug/adplug/cff.cpp | 5 ++++-
- plugins/adplug/adplug/dmo.cpp | 15 ++++++++++++---
- plugins/artwork/artwork.c | 1 +
- plugins/gtkui/widgets.c | 4 ++--
- plugins/tta/ttadec.h | 2 +-
- plugins/vorbis/vorbis.c | 7 ++-----
- plugins/vtx/lh5dec.c | 2 +-
- streamer.c | 6 +++---
- 8 files changed, 26 insertions(+), 16 deletions(-)
-
-Index: deadbeef-0.6.2/plugins/adplug/adplug/cff.cpp
-===================================================================
---- deadbeef-0.6.2.orig/plugins/adplug/adplug/cff.cpp
-+++ deadbeef-0.6.2/plugins/adplug/adplug/cff.cpp
-@@ -378,7 +378,10 @@ long CcffLoader::cff_unpacker::unpack(un
- 	 }
- 
- 	 for (unsigned int i=0;i<repeat_counter*repeat_length;i++)
--	 outputoutput_length++ = outputoutput_length - repeat_length;
-+	 {
-+	 outputoutput_length = outputoutput_length - repeat_length;
-+	 output_length++;
-+	 }
- 
- 	 code_length = old_code_length;
- 
-Index: deadbeef-0.6.2/plugins/adplug/adplug/dmo.cpp
-===================================================================
---- deadbeef-0.6.2.orig/plugins/adplug/adplug/dmo.cpp
-+++ deadbeef-0.6.2/plugins/adplug/adplug/dmo.cpp
-@@ -320,7 +320,10 @@ short CdmoLoader::dmo_unpacker::unpack_b
- 	 return -1;
- 
- 	 for(int i=0;i<cx;i++)
--	 *opos++ = *(opos - ax);
-+	 {
-+	 *opos = *(opos - ax);
-+	 *opos++;
-+	 }
- 
- 	 continue;
- 	}
-@@ -340,7 +343,10 @@ short CdmoLoader::dmo_unpacker::unpack_b
- 	 return -1;
- 
- 	 for(i=0;i<cx;i++)
--	 *opos++ = *(opos - ax);
-+	 {
-+	 *opos = *(opos - ax);
-+	 *opos++;
-+	 }
- 
- 	 for (i=0;i<bx;i++)
- 	 *opos++ = *ipos++;
-@@ -364,7 +370,10 @@ short CdmoLoader::dmo_unpacker::unpack_b
- 	 return -1;
- 
- 	 for(i=0;i<cx;i++)
--	 *opos++ = *(opos - bx);
-+	 {
-+	 *opos = *(opos - bx);
-+	 *opos++;
-+	 }
- 
- 	 for (i=0;i<ax;i++)
- 	 *opos++ = *ipos++;
-Index: deadbeef-0.6.2/plugins/artwork/artwork.c
-===================================================================
---- deadbeef-0.6.2.orig/plugins/artwork/artwork.c
-+++ deadbeef-0.6.2/plugins/artwork/artwork.c
-@@ -226,6 +226,7 @@ make_cache_path2 (char *path, int size,
- *p = '_';
- }
- }
-+ return 0;
- }
- 
- static void
-Index: deadbeef-0.6.2/plugins/gtkui/widgets.c
-===================================================================
---- deadbeef-0.6.2.orig/plugins/gtkui/widgets.c
-+++ deadbeef-0.6.2/plugins/gtkui/widgets.c
-@@ -1176,7 +1176,7 @@ w_splitter_lock (w_splitter_t *w) {
- }
- w->locked = 1;
- 
-- int vert = w->base.type == "vsplitter";
-+ int vert = strcmp(w->base.type, "vsplitter");
- 
- GtkAllocation a;
- gtk_widget_get_allocation (w->base.widget, &a);
-@@ -1209,7 +1209,7 @@ w_splitter_unlock (w_splitter_t *w) {
- }
- w->locked = 0;
- 
-- int vert = w->base.type == "vsplitter";
-+ int vert = strcmp(w->base.type, "vsplitter");
- // convert back to vpaned
- GtkWidget *paned = vert ? gtk_vpaned_new () : gtk_hpaned_new ();
- gtk_widget_set_can_focus (paned, FALSE);
-Index: deadbeef-0.6.2/plugins/tta/ttadec.h
-===================================================================
---- deadbeef-0.6.2.orig/plugins/tta/ttadec.h
-+++ deadbeef-0.6.2/plugins/tta/ttadec.h
-@@ -81,7 +81,7 @@ typedef unsigned char byte;
- #endif
- 
- #define PREDICTOR1(x, k)	((int)((((uint64)x << k) - x) >> k))
--#define DEC(x)			(((x)&1)?(++(x)>>1):(-(x)>>1))
-+#define DEC(x)			(((x)&1)?((++(x))>>1):((-(x))>>1))
- 
- typedef struct {
- 	unsigned int TTAid;
-Index: deadbeef-0.6.2/plugins/vorbis/vorbis.c
-===================================================================
---- deadbeef-0.6.2.orig/plugins/vorbis/vorbis.c
-+++ deadbeef-0.6.2/plugins/vorbis/vorbis.c
-@@ -114,7 +114,7 @@ is_special_tag(const char *tag) {
- !strcasecmp(tag, gain_tag_name(RG_REFERENCE_LOUDNESS));
- }
- 
--static bool
-+static void
- add_meta(DB_playItem_t *it, const char *key, const char *value)
- {
- const char *old_value = deadbeef->pl_find_meta(it, key);
-@@ -124,12 +124,9 @@ add_meta(DB_playItem_t *it, const char *
- sprintf(new_value, "%s"DELIMITER"%s", old_value, value);
- deadbeef->pl_replace_meta(it, key, new_value);
- free(new_value);
-- return true;
- }
-- }
-- else {
-+ } else {
- deadbeef->pl_add_meta(it, key, value);
-- return true;
- }
- }
- 
-Index: deadbeef-0.6.2/plugins/vtx/lh5dec.c
-===================================================================
---- deadbeef-0.6.2.orig/plugins/vtx/lh5dec.c
-+++ deadbeef-0.6.2/plugins/vtx/lh5dec.c
-@@ -92,7 +92,7 @@ static void make_table(int nchar, unsign
- starti >>= jutbits;
- weighti = 1U << (tablebits - i);
- }
-- while (i <= 16) weighti++ = 1U << (16 - i);
-+ while (i <= 16) { weighti = 1U << (16 - i); i++; }
- 
- i = starttablebits + 1 >> jutbits;
- if (i != (unsigned short)(1U << 16)) {
-Index: deadbeef-0.6.2/streamer.c
-===================================================================
---- deadbeef-0.6.2.orig/streamer.c
-+++ deadbeef-0.6.2/streamer.c
-@@ -806,7 +806,7 @@ streamer_move_to_nextsong (int r) {
- if (r) {
- streamer_abort_files ();
- }
-- handler_push (handler, STR_EV_NEXT, 0, r, 0);
-+ return handler_push (handler, STR_EV_NEXT, 0, r, 0);
- }
- 
- int
-@@ -814,7 +814,7 @@ streamer_move_to_prevsong (int r) {
- if (r) {
- streamer_abort_files ();
- }
-- handler_push (handler, STR_EV_PREV, 0, r, 0);
-+ return handler_push (handler, STR_EV_PREV, 0, r, 0);
- }
- 
- int
-@@ -822,7 +822,7 @@ streamer_move_to_randomsong (int r) {
- if (r) {
- streamer_abort_files ();
- }
-- handler_push (handler, STR_EV_RAND, 0, r, 0);
-+ return handler_push (handler, STR_EV_RAND, 0, r, 0);
- }
- 
- // playlist must call that whenever item was removed

deadbeef-drop-documents-installation.patch Added

deadbeef-fix-desktop-file.patch Added

deadbeef-fix_ubuntu_unity_desktop.patch Deleted

_service Added

_servicedata Added

deadbeef-0.6.2.tar.bz2/common.h Deleted

@@ -1,50 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- utility routines and global variables
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __COMMON_H
-#define __COMMON_H
-
-#include <limits.h>
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#if HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
-
-#define min(x,y) ((x)<(y)?(x):(y))
-#define max(x,y) ((x)>(y)?(x):(y))
-
-// those are defined in main.c
-extern char confdirPATH_MAX; // $HOME/.config
-extern char dbconfdirPATH_MAX; // $HOME/.config/deadbeef
-extern char dbinstalldirPATH_MAX; // see deadbeef->get_prefix
-extern char dbdocdirPATH_MAX; // see deadbeef->get_doc_dir
-extern char dbplugindirPATH_MAX; // see deadbeef->get_plugin_dir
-extern char dbpixmapdirPATH_MAX; // see deadbeef->get_pixmap_dir
-
-
-#endif // __COMMON_H

deadbeef-0.6.2.tar.bz2/conf.c Deleted

@@ -1,342 +0,0 @@
-/*
- deadbeef config file manager
- http://deadbeef.sourceforge.net
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <unistd.h>
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-#if HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
-#include "conf.h"
-#include "threading.h"
-
-#define min(x,y) ((x)<(y)?(x):(y))
-
-static DB_conf_item_t *conf_items;
-static int changed = 0;
-static uintptr_t mutex;
-
-void
-conf_init (void) {
- mutex = mutex_create ();
-}
-
-void
-conf_lock (void) {
- mutex_lock (mutex);
-}
-
-void
-conf_unlock (void) {
- mutex_unlock (mutex);
-}
-
-void
-conf_free (void) {
- mutex_lock (mutex);
- DB_conf_item_t *next = NULL;
- for (DB_conf_item_t *it = conf_items; it; it = next) {
- next = it->next;
- conf_item_free (it);
- }
- conf_items = NULL;
- changed = 0;
- mutex_free (mutex);
- mutex = 0;
-}
-
-int
-conf_load (void) {
- extern char dbconfdir1024; // $HOME/.config/deadbeef
- char str1024;
- snprintf (str, 1024, "%s/config", dbconfdir);
- FILE *fp = fopen (str, "rt");
- if (!fp) {
- fprintf (stderr, "failed to load config file\n");
- return -1;
- }
- conf_lock ();
- int line = 0;
- while (fgets (str, 1024, fp) != NULL) {
- line++;
- if (str0 == '#' || str0 <= 0x20) {
- continue;
- }
- uint8_t *p = (uint8_t *)str;
- while (*p && *p > 0x20) {
- p++;
- }
- if (!*p) {
- fprintf (stderr, "error in config file line %d\n", line);
- continue;
- }
- *p = 0;
- p++;
- // skip whitespace
- while (*p && *p <= 0x20) {
- p++;
- }
- char *value = p;
- // remove trailing trash
- while (*p && *p >= 0x20) {
- p++;
- }
- *p = 0;
- // new items are appended, to preserve order
- conf_set_str (str, value);
- }
- fclose (fp);
- changed = 0;
- conf_unlock ();
- return 0;
-}
-
-int
-conf_save (void) {
- extern char dbconfdir1024; // $HOME/.config/deadbeef
- char tempfilePATH_MAX;
- char strPATH_MAX;
- FILE *fp;
- int err;
-
- if (!changed) {
- return 0;
- }
-
- snprintf (tempfile, sizeof (tempfile), "%s/config.tmp", dbconfdir);
- snprintf (str, sizeof (str), "%s/config", dbconfdir);
-
- conf_lock ();
- changed = 0;
- fp = fopen (tempfile, "w+t");
- if (!fp) {
- fprintf (stderr, "failed to open config file for writing\n");
- conf_unlock ();
- return -1;
- }
- for (DB_conf_item_t *it = conf_items; it; it = it->next) {
- if (fprintf (fp, "%s %s\n", it->key, it->value) < 0) {
- fprintf (stderr, "failed to write to file %s (%s)\n", tempfile, strerror (errno));
- fclose (fp);
- conf_unlock ();
- return -1;
- }
- }
- fclose (fp);
- err = rename (tempfile, str);
- if (err != 0) {
- fprintf (stderr, "config rename %s -> %s failed: %s\n", tempfile, str, strerror (errno));
- }
- conf_unlock ();
- return 0;
-}
-
-void
-conf_item_free (DB_conf_item_t *it) {
- conf_lock ();
- if (it) {
- if (it->key) {
- free (it->key);
- }
- if (it->value) {
- free (it->value);
- }
- free (it);
- }
- conf_unlock ();
-}
-
-const char *
-conf_get_str_fast (const char *key, const char *def) {
- for (DB_conf_item_t *it = conf_items; it; it = it->next) {
- if (!strcasecmp (key, it->key)) {
- return it->value;
- }
- }
- return def;
-}
-
-void
-conf_get_str (const char *key, const char *def, char *buffer, int buffer_size) {
- conf_lock ();
- const char *out = conf_get_str_fast (key, def);
- if (out) {
- int n = strlen (out)+1;
- n = min (n, buffer_size);
- memcpy (buffer, out, n);
- bufferbuffer_size-1 = 0;
- }
- else {
- *buffer = 0;
- }
- conf_unlock ();
-}
-
-float
-conf_get_float (const char *key, float def) {
- conf_lock ();
- const char *v = conf_get_str_fast (key, NULL);
- conf_unlock ();
- return v ? atof (v) : def;
-}
-
-int
-conf_get_int (const char *key, int def) {
- conf_lock ();
- const char *v = conf_get_str_fast (key, NULL);
- conf_unlock ();
- return v ? atoi (v) : def;
-}
-
-int64_t
-conf_get_int64 (const char *key, int64_t def) {
- conf_lock ();
- const char *v = conf_get_str_fast (key, NULL);
- conf_unlock ();
- return v ? atoll (v) : def;
-}
-
-DB_conf_item_t *
-conf_find (const char *group, DB_conf_item_t *prev) {
- int l = strlen (group);
- for (DB_conf_item_t *it = prev ? prev->next : conf_items; it; it = it->next) {
- if (!strncasecmp (group, it->key, l)) {
- return it;
- }
- }
- return NULL;
-}
-
-void
-conf_set_str (const char *key, const char *val) {
- conf_lock ();
- DB_conf_item_t *prev = NULL;
- for (DB_conf_item_t *it = conf_items; it; it = it->next) {
- int cmp = strcasecmp (key, it->key);
- if (!cmp) {
- if (!strcmp (it->value, val)) {
- conf_unlock ();
- return;
- }
- free (it->value);
- it->value = strdup (val);
- conf_unlock ();
- changed = 1;
- return;
- }
- else if (cmp < 0) {
- break;
- }
- prev = it;
- }
- if (!val) {
- conf_unlock ();
- return;
- }
- DB_conf_item_t *it = malloc (sizeof (DB_conf_item_t));
- memset (it, 0, sizeof (DB_conf_item_t));
- it->key = strdup (key);
- it->value = strdup (val);
- changed = 1;
- if (prev) {
- DB_conf_item_t *next = prev->next;
- prev->next = it;
- it->next = next;
- }
- else {
- it->next = conf_items;
- conf_items = it;
- }
- conf_unlock ();
-}
-
-void
-conf_set_int (const char *key, int val) {
- char s10;
- snprintf (s, sizeof (s), "%d", val);
- conf_set_str (key, s);
-}
-
-void
-conf_set_int64 (const char *key, int64_t val) {
- char s20;
- snprintf (s, sizeof (s), "%"PRId64, val);
- conf_set_str (key, s);
-}
-
-void
-conf_set_float (const char *key, float val) {
- char s10;
- snprintf (s, sizeof (s), "%0.7f", val);
- conf_set_str (key, s);
-}
-
-int
-conf_ischanged (void) {
- return changed;
-}
-
-void
-conf_setchanged (int c) {
- changed = c;
-}
-
-void
-conf_remove_items (const char *key) {
- int l = strlen (key);
- conf_lock ();
- DB_conf_item_t *prev = NULL;
- DB_conf_item_t *it;
- for (it = conf_items; it; prev = it, it = it->next) {
- if (!strncasecmp (key, it->key, l)) {
- break;
- }
- }
- DB_conf_item_t *next = NULL;
- while (it) {
- next = it->next;
- conf_item_free (it);
- it = next;
- if (!it || strncasecmp (key, it->key, l)) {
- break;
- }
- }
- if (prev) {
- prev->next = next;
- }
- else {
- conf_items = next;
- }
- conf_unlock ();
-}

deadbeef-0.6.2.tar.bz2/conf.h Deleted

@@ -1,93 +0,0 @@
-/*
-  This file is part of Deadbeef Player source code
-  http://deadbeef.sourceforge.net
-
-  config file manager
-
-  Copyright (C) 2009-2013 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
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __CONF_H
-#define __CONF_H
-
-#include "deadbeef.h"
-
-int
-conf_load (void);
-
-int
-conf_save (void);
-
-void
-conf_init (void);
-
-void
-conf_free (void);
-
-void
-conf_lock (void);
-
-void
-conf_unlock (void);
-
-int
-conf_ischanged (void);
-
-void
-conf_setchanged (int c);
-
-void
-conf_get_str (const char *key, const char *def, char *buffer, int buffer_size);
-
-const char *
-conf_get_str_fast (const char *key, const char *def);
-
-float
-conf_get_float (const char *key, float def);
-
-int
-conf_get_int (const char *key, int def);
-
-int64_t
-conf_get_int64 (const char *key, int64_t def);
-
-void
-conf_set_str (const char *key, const char *val);
-
-void
-conf_set_int (const char *key, int val);
-
-void
-conf_set_int64 (const char *key, int64_t val);
-
-void
-conf_set_float (const char *key, float val);
-
-DB_conf_item_t *
-conf_find (const char *group, DB_conf_item_t *prev);
-
-// remove all items starting with key
-void
-conf_remove_items (const char *key);
-
-void
-conf_item_free (DB_conf_item_t *it);
-
-#endif // __CONF_H

deadbeef-0.6.2.tar.bz2/deadbeef.h Deleted

@@ -1,1465 +0,0 @@
-/*
- deadbeef.h -- plugin API of the DeaDBeeF audio player
- http://deadbeef.sourceforge.net
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-*/
-
-
-#ifndef __DEADBEEF_H
-#define __DEADBEEF_H
-
-#include <stdint.h>
-#include <time.h>
-#include <stdio.h>
-#include <dirent.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// every plugin must define the following entry-point:
-// extern "C" DB_plugin_t* $MODULENAME_load (DB_functions_t *api);
-// where $MODULENAME is a name of module
-// e.g. if your plugin is called "myplugin.so", $MODULENAME is "myplugin"
-// this function should return pointer to DB_plugin_t structure
-// that is enough for both static and dynamic modules
-
-// backwards compatibility is supported since API version 1.0
-// that means that the plugins which use the API 1.0 will work without recompiling until API 2.0.
-//
-// increments in the major version number mean that there are API breaks, and
-// plugins must be recompiled to be compatible.
-//
-// add DDB_REQUIRE_API_VERSION(x,y) macro when you define the plugin structure
-// like this:
-// static DB_decoder_t plugin = {
-// DDB_REQUIRE_API_VERSION(1,0)
-// ............
-// }
-// this is required for versioning
-// if you don't do it -- no version checking will be done (useful for debugging/development)
-//
-// please DON'T release plugins without version requirement
-//
-// to ensure compatibility, use the following before including deadbeef.h:
-// #define DDB_API_LEVEL x
-// where x is the minor API version number.
-// that way, you'll get errors or warnings when using incompatible stuff.
-//
-// if you also want to get the deprecation warnings, use the following:
-// #define DDB_WARN_DEPRECATED 1
-//
-// NOTE: deprecation doesn't mean the API is going to be removed, it just means
-// that there's a better replacement in the newer deadbeef versions.
-
-// api version history:
-// 9.9 -- devel
-// 1.7 -- deadbeef-0.6.2
-// 1.6 -- deadbeef-0.6.1
-// 1.5 -- deadbeef-0.6
-// 1.4 -- deadbeef-0.5.5
-// 1.3 -- deadbeef-0.5.3
-// 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
-// 0.10 -- deadbeef-0.4.4-portable-r1 (note: 0.4.4 uses api v0.9)
-// 0.9 -- deadbeef-0.4.3-portable-build3
-// 0.8 -- deadbeef-0.4.2
-// 0.7 -- deabdeef-0.4.0
-// 0.6 -- deadbeef-0.3.3
-// 0.5 -- deadbeef-0.3.2
-// 0.4 -- deadbeef-0.3.0
-// 0.3 -- deadbeef-0.2.3.2
-// 0.2 -- deadbeef-0.2.3
-// 0.1 -- deadbeef-0.2.0
-
-#define DB_API_VERSION_MAJOR 1
-#define DB_API_VERSION_MINOR 7
-
-#define DDB_DEPRECATED(x)
-
-#ifdef __GNUC__
-// avoid including glibc headers, this is not very portable
-#if defined __GNUC__ && defined __GNUC_MINOR__
-# define __GNUC_PREREQ(maj, min) \
-	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#else
-# define __GNUC_PREREQ(maj, min) 0
-#endif
-#undef DDB_DEPRECATED
-#if __GNUC_PREREQ(4,5)
-#define DDB_DEPRECATED(x) __attribute__ ((deprecated(x)))
-#else
-#define DDB_DEPRECATED(x) __attribute__ ((deprecated))
-#endif
-#endif
-
-
-#ifndef DDB_API_LEVEL
-#define DDB_API_LEVEL DB_API_VERSION_MINOR
-#endif
-
-#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 6)
-#define DEPRECATED_16 DDB_DEPRECATED("since deadbeef API 1.6")
-#else
-#define DEPRECATED_16
-#endif
-
-#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 5)
-#define DEPRECATED_15 DDB_DEPRECATED("since deadbeef API 1.5")
-#else
-#define DEPRECATED_15
-#endif
-
-#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 4)
-#define DEPRECATED_14 DDB_DEPRECATED("since deadbeef API 1.4")
-#else
-#define DEPRECATED_14
-#endif
-
-#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 3)
-#define DEPRECATED_13 DDB_DEPRECATED("since deadbeef API 1.3")
-#else
-#define DEPRECATED_13
-#endif
-
-#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 2)
-#define DEPRECATED_12 DDB_DEPRECATED("since deadbeef API 1.2")
-#else
-#define DEPRECATED_12
-#endif
-
-#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 1)
-#define DEPRECATED_11 DDB_DEPRECATED("since deadbeef API 1.1")
-#else
-#define DEPRECATED_11
-#endif
-
-#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 0)
-#define DEPRECATED DDB_DEPRECATED
-#else
-#define DEPRECATED
-#endif
-
-#define DDB_PLUGIN_SET_API_VERSION\
- .plugin.api_vmajor = DB_API_VERSION_MAJOR,\
- .plugin.api_vminor = DB_API_VERSION_MINOR,
-
-// backwards compat macro
-#define DB_PLUGIN_SET_API_VERSION DDB_PLUGIN_SET_API_VERSION
-
-#define PLUG_TEST_COMPAT(plug,x,y) ((plug)->version_major == (x) && (plug)->version_minor >= (y))
-
-#define DDB_REQUIRE_API_VERSION(x,y)\
- .plugin.api_vmajor = x,\
- .plugin.api_vminor = y,
-
-////////////////////////////
-// default values for some common config variables should go here
-
-// network.ctmapping : content-type to plugin mapping
-#define DDB_DEFAULT_CTMAPPING "audio/mpeg {stdmpg ffmpeg} audio/x-mpeg {stdmpg ffmpeg} application/ogg {stdogg ffmpeg} audio/ogg {stdogg ffmpeg} audio/aac {aac ffmpeg} audio/aacp {aac ffmpeg} audio/wma {wma ffmpeg}"
-
-////////////////////////////
-// playlist structures
-
-// that's a good candidate for redesign
-// short explanation: PL_MAIN and PL_SEARCH are used as "iter" argument in
-// playlist functions, to reference main or search playlist, respectively
-#define PL_MAIN 0
-#define PL_SEARCH 1
-
-enum {
- DDB_IS_SUBTRACK = (1<<0), // file is not single-track, might have metainfo in external file
- DDB_IS_READONLY = (1<<1), // check this flag to block tag writing (e.g. in iso.wv)
- DDB_HAS_EMBEDDED_CUESHEET = (1<<2),
-
- DDB_TAG_ID3V1 = (1<<8),
- DDB_TAG_ID3V22 = (1<<9),
- DDB_TAG_ID3V23 = (1<<10),
- DDB_TAG_ID3V24 = (1<<11),
- DDB_TAG_APEV2 = (1<<12),
- DDB_TAG_VORBISCOMMENTS = (1<<13),
- DDB_TAG_CUESHEET = (1<<14),
- DDB_TAG_ICY = (1<<15),
- DDB_TAG_ITUNES = (1<<16),
-
- DDB_TAG_MASK = 0x000fff00
-};
-
-// playlist item
-// these are "public" fields, available to plugins
-typedef struct DB_playItem_s {
- int startsample; // start sample of track, or -1 for auto
- int endsample; // end sample of track, or -1 for auto
- int shufflerating; // sort order for shuffle mode
-} ddb_playItem_t;
-
-typedef ddb_playItem_t DB_playItem_t;
-
-typedef struct {
-} ddb_playlist_t;
-
-typedef struct DB_metaInfo_s {
- struct DB_metaInfo_s *next;
- const char *key;
- const char *value;
-} DB_metaInfo_t;
-
-// FIXME: that needs to be in separate plugin
-
-#define JUNK_STRIP_ID3V2 1
-#define JUNK_STRIP_APEV2 2
-#define JUNK_STRIP_ID3V1 4
-#define JUNK_WRITE_ID3V2 8
-#define JUNK_WRITE_APEV2 16
-#define JUNK_WRITE_ID3V1 32
-
-typedef struct DB_id3v2_frame_s {
- struct DB_id3v2_frame_s *next;
- char id5;
- uint32_t size;
- uint8_t flags2;
- uint8_t data0;
-} DB_id3v2_frame_t;
-
-typedef struct DB_id3v2_tag_s {
- uint8_t version2;
- uint8_t flags;
- DB_id3v2_frame_t *frames;
-} DB_id3v2_tag_t;
-
-typedef struct DB_apev2_frame_s {
- struct DB_apev2_frame_s *next;
- uint32_t flags;
- char key256;
- uint32_t size; // size of data
- uint8_t data0;
-} DB_apev2_frame_t;
-
-typedef struct DB_apev2_tag_s {
- uint32_t version;
- uint32_t flags;
- DB_apev2_frame_t *frames;
-} DB_apev2_tag_t;
-
-// plugin types
-enum {
- DB_PLUGIN_DECODER = 1,
- DB_PLUGIN_OUTPUT = 2,
- DB_PLUGIN_DSP = 3,
- DB_PLUGIN_MISC = 4,
- DB_PLUGIN_VFS = 5,
- DB_PLUGIN_PLAYLIST = 6,
- DB_PLUGIN_GUI = 7,
-};
-
-// output plugin states
-enum output_state_t {
- OUTPUT_STATE_STOPPED = 0,
- OUTPUT_STATE_PLAYING = 1,
- OUTPUT_STATE_PAUSED = 2,
-};
-
-// playback order
-enum playback_order_t {
- PLAYBACK_ORDER_LINEAR = 0,
- PLAYBACK_ORDER_SHUFFLE_TRACKS = 1,
- PLAYBACK_ORDER_RANDOM = 2,
- PLAYBACK_ORDER_SHUFFLE_ALBUMS = 3,
-};
-
-// playback modes
-enum playback_mode_t {
- PLAYBACK_MODE_LOOP_ALL = 0, // loop playlist
- PLAYBACK_MODE_NOLOOP = 1, // don't loop
- PLAYBACK_MODE_LOOP_SINGLE = 2, // loop single track
-};
-
-typedef struct {
- int event;
- int size;
-} ddb_event_t;
-
-typedef struct {
- ddb_event_t ev;
- DB_playItem_t *track;
- float playtime; // for SONGFINISHED event -- for how many seconds track was playing
- time_t started_timestamp; // time when "track" started playing
-} ddb_event_track_t;
-
-typedef struct {
- ddb_event_t ev;
- DB_playItem_t *from;
- DB_playItem_t *to;
- float playtime; // for SONGCHANGED event -- for how many seconds prev track was playing
- time_t started_timestamp; // time when "from" started playing
-} ddb_event_trackchange_t;
-
-typedef struct {
- ddb_event_t ev;
- int state;
-} ddb_event_state_t;
-
-typedef struct {
- ddb_event_t ev;
- DB_playItem_t *track;
- float playpos;
-} ddb_event_playpos_t;
-
-typedef struct DB_conf_item_s {
- char *key;
- char *value;
- struct DB_conf_item_s *next;
-} DB_conf_item_t;
-
-// event callback type
-typedef int (*DB_callback_t)(ddb_event_t *, uintptr_t data);
-
-// events
-enum {
- DB_EV_NEXT = 1, // switch to next track
- DB_EV_PREV = 2, // switch to prev track
- DB_EV_PLAY_CURRENT = 3, // play current track (will start/unpause if stopped or paused)
- DB_EV_PLAY_NUM = 4, // play track nr. p1
- DB_EV_STOP = 5, // stop current track
- DB_EV_PAUSE = 6, // pause playback
- DB_EV_PLAY_RANDOM = 7, // play random track
- DB_EV_TERMINATE = 8, // must be sent to player thread to terminate
- DB_EV_PLAYLIST_REFRESH = 9, // save and redraw current playlist 
- DB_EV_REINIT_SOUND = 10, // reinitialize sound output with current output_plugin config value
- DB_EV_CONFIGCHANGED = 11, // one or more config options were changed
- DB_EV_TOGGLE_PAUSE = 12,
- DB_EV_ACTIVATED = 13, // will be fired every time player is activated
- DB_EV_PAUSED = 14, // player was paused or unpaused
- DB_EV_PLAYLISTCHANGED = 15, // playlist contents were changed
- DB_EV_VOLUMECHANGED = 16, // volume was changed
- DB_EV_OUTPUTCHANGED = 17, // sound output plugin changed
- DB_EV_PLAYLISTSWITCHED = 18, // playlist switch occured
- DB_EV_SEEK = 19, // seek current track to position p1 (ms)
- DB_EV_ACTIONSCHANGED = 20, // plugin actions were changed, e.g. for reinitializing gui
- DB_EV_DSPCHAINCHANGED = 21, // emitted when any parameter of the main dsp chain has been changed
-
- // since 1.5
-#if (DDB_API_LEVEL >= 5)
- DB_EV_SELCHANGED = 22, // selection changed in playlist p1 iter p2, ctx should be a pointer to playlist viewer instance, which caused the change, or NULL
- DB_EV_PLUGINSLOADED = 23, // after all plugins have been loaded and connected
-#endif
-
- // -----------------
- // structured events
-
- DB_EV_FIRST = 1000,
- DB_EV_SONGCHANGED = 1000, // current song changed from one to another, ctx=ddb_event_trackchange_t
- DB_EV_SONGSTARTED = 1001, // song started playing, ctx=ddb_event_track_t
- DB_EV_SONGFINISHED = 1002, // song finished playing, ctx=ddb_event_track_t
- DB_EV_TRACKINFOCHANGED = 1004, // trackinfo was changed (included medatata and playback status), ctx=ddb_event_track_t
- DB_EV_SEEKED = 1005, // seek happened, ctx=ddb_event_playpos_t
-
- // since 1.5
-#if (DDB_API_LEVEL >= 5)
- DB_EV_TRACKFOCUSCURRENT = 1006, // user wants to highlight/find the current playing track
-#endif
- DB_EV_MAX
-};
-
-// preset columns, working using IDs
-// DON'T add new ids in range 2-7, they are reserved for backwards compatibility
-enum pl_column_t {
- DB_COLUMN_FILENUMBER = 0,
- DB_COLUMN_PLAYING = 1,
- DB_COLUMN_ALBUM_ART = 8,
-};
-
-// replaygain constants
-enum {
- DDB_REPLAYGAIN_ALBUMGAIN,
- DDB_REPLAYGAIN_ALBUMPEAK,
- DDB_REPLAYGAIN_TRACKGAIN,
- DDB_REPLAYGAIN_TRACKPEAK,
-};
-
-// sort order constants
-enum ddb_sort_order_t {
- DDB_SORT_DESCENDING,
- DDB_SORT_ASCENDING,
-// since 1.3
-#if (DDB_API_LEVEL >= 3)
- DDB_SORT_RANDOM,
-#endif
-};
-
-// typecasting macros
-#define DB_PLUGIN(x) ((DB_plugin_t *)(x))
-#define DB_CALLBACK(x) ((DB_callback_t)(x))
-#define DB_EVENT(x) ((ddb_event_t *)(x))
-#define DB_PLAYITEM(x) ((DB_playItem_t *)(x))
-
-// FILE object wrapper for vfs access
-typedef struct {
- struct DB_vfs_s *vfs;
-} DB_FILE;
-
-// md5 calc control structure (see md5/md5.h)
-typedef struct DB_md5_s {
- char data88;
-} DB_md5_t;
-
-typedef struct {
- int bps;
- int channels;
- int samplerate;
- uint32_t channelmask;
- int is_float; // bps must be 32 if this is true
- int is_bigendian;
-} ddb_waveformat_t;
-
-// since 1.5
-#if (DDB_API_LEVEL >= 5)
-#define DDB_FREQ_BANDS 256
-#define DDB_FREQ_MAX_CHANNELS 9
-typedef struct ddb_audio_data_s {
- const ddb_waveformat_t *fmt;
- const float *data;
- int nframes;
-} ddb_audio_data_t;
-
-typedef struct ddb_fileadd_data_s {
- int visibility;
- ddb_playlist_t *plt;
- ddb_playItem_t *track;
-} ddb_fileadd_data_t;
-#endif
-
-// forward decl for plugin struct
-struct DB_plugin_s;
-
-// player api definition
-typedef struct {
- // versioning
- int vmajor;
- int vminor;
-
- // md5sum calc
- void (*md5) (uint8_t sig16, const char *in, int len);
- void (*md5_to_str) (char *str, const uint8_t sig16);
- void (*md5_init)(DB_md5_t *s);
- void (*md5_append)(DB_md5_t *s, const uint8_t *data, int nbytes);
- void (*md5_finish)(DB_md5_t *s, uint8_t digest16);
-
- // playback control
- struct DB_output_s* (*get_output) (void);
- float (*playback_get_pos) (void); // 0..100
- void (*playback_set_pos) (float pos); // 0..100
-
- // streamer access
- DB_playItem_t *(*streamer_get_playing_track) (void);
- DB_playItem_t *(*streamer_get_streaming_track) (void);
- float (*streamer_get_playpos) (void);
- int (*streamer_ok_to_read) (int len);
- void (*streamer_reset) (int full);
- int (*streamer_read) (char *bytes, int size);
- void (*streamer_set_bitrate) (int bitrate);
- int (*streamer_get_apx_bitrate) (void);
- struct DB_fileinfo_s *(*streamer_get_current_fileinfo) (void);
- int (*streamer_get_current_playlist) (void);
- struct ddb_dsp_context_s * (*streamer_get_dsp_chain) (void);
- void (*streamer_set_dsp_chain) (struct ddb_dsp_context_s *chain);
- void (*streamer_dsp_refresh) (void); // call after changing parameters
-
- // system folders
- // normally functions will return standard folders derived from --prefix
- // portable version will return pathes specified in comments below
- const char *(*get_config_dir) (void); // installdir/config | $XDG_CONFIG_HOME/.config/deadbeef
- const char *(*get_prefix) (void); // installdir | PREFIX
- const char *(*get_doc_dir) (void); // installdir/doc | DOCDIR
- const char *(*get_plugin_dir) (void); // installdir/plugins | LIBDIR/deadbeef
- const char *(*get_pixmap_dir) (void); // installdir/pixmaps | PREFIX "/share/deadbeef/pixmaps"
-
- // process control
- void (*quit) (void);
-
- // threading
- intptr_t (*thread_start) (void (*fn)(void *ctx), void *ctx);
- intptr_t (*thread_start_low_priority) (void (*fn)(void *ctx), void *ctx);
- int (*thread_join) (intptr_t tid);
- int (*thread_detach) (intptr_t tid);
- void (*thread_exit) (void *retval);
- uintptr_t (*mutex_create) (void);
- uintptr_t (*mutex_create_nonrecursive) (void);
- void (*mutex_free) (uintptr_t mtx);
- int (*mutex_lock) (uintptr_t mtx);
- int (*mutex_unlock) (uintptr_t mtx);
- uintptr_t (*cond_create) (void);
- void (*cond_free) (uintptr_t cond);
- int (*cond_wait) (uintptr_t cond, uintptr_t mutex);
- int (*cond_signal) (uintptr_t cond);
- int (*cond_broadcast) (uintptr_t cond);
-
- /////// playlist management //////
- void (*plt_ref) (ddb_playlist_t *plt);
- void (*plt_unref) (ddb_playlist_t *plt);
-
- // total number of playlists
- int (*plt_get_count) (void);
-
- // 1st item in playlist nr. 'plt'
- DB_playItem_t * (*plt_get_head) (int plt);
-
- // nr. of selected items in playlist nr. 'plt'
- int (*plt_get_sel_count) (int plt);
-
- // add new playlist into position before nr. 'before', with title='title'
- // returns index of new playlist
- int (*plt_add) (int before, const char *title);
-
- // remove playlist nr. plt
- void (*plt_remove) (int plt);
-
- // clear playlist
- void (*plt_clear) (ddb_playlist_t *plt);
- void (*pl_clear) (void);
-
- // set current playlist
- void (*plt_set_curr) (ddb_playlist_t *plt);
- void (*plt_set_curr_idx) (int plt);
-
- // get current playlist
- // note: caller is responsible to call plt_unref after using pointer
- // returned by plt_get_curr
- ddb_playlist_t *(*plt_get_curr) (void);
- int (*plt_get_curr_idx) (void);
-
- // move playlist nr. 'from' into position before nr. 'before', where
- // before=-1 means last position
- void (*plt_move) (int from, int before);
-
- // playlist saving and loading
- DB_playItem_t * (*plt_load) (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
- int (*plt_save) (ddb_playlist_t *plt, DB_playItem_t *first, DB_playItem_t *last, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data);
-
- ddb_playlist_t *(*plt_get_for_idx) (int idx);
- int (*plt_get_title) (ddb_playlist_t *plt, char *buffer, int bufsize);
- int (*plt_set_title) (ddb_playlist_t *plt, const char *title);
-
- // increments modification index
- void (*plt_modified) (ddb_playlist_t *handle);
-
- // returns modication index
- // the index is incremented by 1 every time playlist changes
- int (*plt_get_modification_idx) (ddb_playlist_t *handle);
-
- // return index of an item in specified playlist, or -1 if not found
- int (*plt_get_item_idx) (ddb_playlist_t *plt, DB_playItem_t *it, int iter);
-
- // playlist metadata
- // this kind of metadata is stored in playlist (dbpl) files
- // that is, this is the properties of playlist itself,
- // not of the tracks in the playlist.
- // for example, playlist tab color can be stored there, etc
-
- // add meta if it doesn't exist yet
- void (*plt_add_meta) (ddb_playlist_t *handle, const char *key, const char *value);
-
- // replace (or add) existing meta
- void (*plt_replace_meta) (ddb_playlist_t *handle, const char *key, const char *value);
-
- // append meta to existing one, or add if doesn't exist
- void (*plt_append_meta) (ddb_playlist_t *handle, const char *key, const char *value);
-
- // set integer meta (works same as replace)
- void (*plt_set_meta_int) (ddb_playlist_t *handle, const char *key, int value);
-
- // set float meta (works same as replace)
- void (*plt_set_meta_float) (ddb_playlist_t *handle, const char *key, float value);
-
- // plt_find_meta must always be used in the pl_lock/unlock block
- const char *(*plt_find_meta) (ddb_playlist_t *handle, const char *key);
-
- // returns head of metadata linked list, for direct access
- // remember pl_lock/unlock
- DB_metaInfo_t * (*plt_get_metadata_head) (ddb_playlist_t *handle);
-
- // delete meta item from list
- void (*plt_delete_metadata) (ddb_playlist_t *handle, DB_metaInfo_t *meta);
-
- // returns integer value of requested meta, def is the default value if not found
- int (*plt_find_meta_int) (ddb_playlist_t *handle, const char *key, int def);
-
- // returns float value of requested meta, def is the default value if not found
- float (*plt_find_meta_float) (ddb_playlist_t *handle, const char *key, float def);
-
- // delete all metadata
- void (*plt_delete_all_meta) (ddb_playlist_t *handle);
-
- // operating on playlist items
- DB_playItem_t * (*plt_insert_item) (ddb_playlist_t *playlist, DB_playItem_t *after, DB_playItem_t *it);
- DB_playItem_t * (*plt_insert_file) (ddb_playlist_t *playlist, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
- DB_playItem_t *(*plt_insert_dir) (ddb_playlist_t *plt, DB_playItem_t *after, const char *dirname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
- void (*plt_set_item_duration) (ddb_playlist_t *plt, DB_playItem_t *it, float duration);
- int (*plt_remove_item) (ddb_playlist_t *playlist, DB_playItem_t *it);
- int (*plt_getselcount) (ddb_playlist_t *playlist);
- float (*plt_get_totaltime) (ddb_playlist_t *plt);
- int (*plt_get_item_count) (ddb_playlist_t *plt, int iter);
- int (*plt_delete_selected) (ddb_playlist_t *plt);
- void (*plt_set_cursor) (ddb_playlist_t *plt, int iter, int cursor);
- int (*plt_get_cursor) (ddb_playlist_t *plt, int iter);
- void (*plt_select_all) (ddb_playlist_t *plt);
- void (*plt_crop_selected) (ddb_playlist_t *plt);
- DB_playItem_t *(*plt_get_first) (ddb_playlist_t *plt, int iter);
- DB_playItem_t *(*plt_get_last) (ddb_playlist_t *plt, int iter);
- DB_playItem_t * (*plt_get_item_for_idx) (ddb_playlist_t *playlist, int idx, int iter);
- void (*plt_move_items) (ddb_playlist_t *to, int iter, ddb_playlist_t *from, DB_playItem_t *drop_before, uint32_t *indexes, int count);
- void (*plt_copy_items) (ddb_playlist_t *to, int iter, ddb_playlist_t * from, DB_playItem_t *before, uint32_t *indices, int cnt);
- void (*plt_search_reset) (ddb_playlist_t *plt);
- void (*plt_search_process) (ddb_playlist_t *plt, const char *text);
- void (*plt_sort) (ddb_playlist_t *plt, int iter, int id, const char *format, int order);
-
- // add files and folders to current playlist
- int (*plt_add_file) (ddb_playlist_t *plt, const char *fname, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
- int (*plt_add_dir) (ddb_playlist_t *plt, const char *dirname, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
-
- // cuesheet support
- DB_playItem_t *(*plt_insert_cue_from_buffer) (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, const uint8_t *buffer, int buffersize, int numsamples, int samplerate);
- DB_playItem_t * (*plt_insert_cue) (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, int numsamples, int samplerate);
-
- // playlist locking
- void (*pl_lock) (void);
- void (*pl_unlock) (void);
-
- // playlist tracks access
- DB_playItem_t * (*pl_item_alloc) (void);
- DB_playItem_t * (*pl_item_alloc_init) (const char *fname, const char *decoder_id);
- void (*pl_item_ref) (DB_playItem_t *it);
- void (*pl_item_unref) (DB_playItem_t *it);
- void (*pl_item_copy) (DB_playItem_t *out, DB_playItem_t *in);
-
- // request lock for adding files to playlist
- // this function may return -1 if it is not possible to add files right now.
- // caller must cancel operation in this case,
- // or wait until previous operation finishes
- int (*pl_add_files_begin) (ddb_playlist_t *plt) DEPRECATED_15;
-
- // release the lock for adding files to playlist
- // end must be called when add files operation is finished
- void (*pl_add_files_end) (void) DEPRECATED_15;
-
- // most of this functions are self explanatory
- // if you don't get what they do -- look in the code
-
- // --- the following functions work with current playlist ---
-
- // get index of the track in MAIN
- int (*pl_get_idx_of) (DB_playItem_t *it);
-
- // get index of the track in MAIN or SEARCH
- int (*pl_get_idx_of_iter) (DB_playItem_t *it, int iter);
-
- // get track for index in MAIN
- DB_playItem_t * (*pl_get_for_idx) (int idx);
-
- // get track for index in MAIN or SEARCH
- DB_playItem_t * (*pl_get_for_idx_and_iter) (int idx, int iter);
-
- // get total play time of all tracks in MAIN
- float (*pl_get_totaltime) (void);
-
- // get number of tracks in MAIN or SEARCH
- int (*pl_getcount) (int iter);
-
- // delete selected tracks
- int (*pl_delete_selected) (void);
-
- // set cursor position in MAIN or SEARCH
- void (*pl_set_cursor) (int iter, int cursor);
-
- // get cursor position in MAIN
- int (*pl_get_cursor) (int iter);
-
- // remove all except selected tracks
- void (*pl_crop_selected) (void);
-
- // get number of selected tracks
- int (*pl_getselcount) (void);
-
- // get first track in MAIN or SEARCH
- DB_playItem_t *(*pl_get_first) (int iter);
-
- // get last track in MAIN or SEARCH
- DB_playItem_t *(*pl_get_last) (int iter);
-
- // --- misc functions ---
-
- // mark the track as selected or unselected (1 or 0 respectively)
- void (*pl_set_selected) (DB_playItem_t *it, int sel);
-
- // test whether the track is selected
- int (*pl_is_selected) (DB_playItem_t *it);
-
- // save current playlist
- int (*pl_save_current) (void);
-
- // save all playlists
- int (*pl_save_all) (void);
-
- // select all tracks in current playlist
- void (*pl_select_all) (void);
-
- // get next track
- DB_playItem_t *(*pl_get_next) (DB_playItem_t *it, int iter);
- 
- // get previous track
- DB_playItem_t *(*pl_get_prev) (DB_playItem_t *it, int iter);
-
- /*
- pl_format_title formats the line for display in playlist
- @it pointer to playlist item
- @idx number of that item in playlist (or -1)
- @s output buffer
- @size size of output buffer
- @id one of IDs defined in pl_column_id_t enum, can be -1
- @fmt format string, used if id is -1
- format is printf-alike. specification:
- %a artist
- %t title
- %b album
- %B band / album artist
- %n track
- %l length (duration)
- %y year
- %g genre
- %c comment
- %r copyright
- %T tags
- %f filename without path
- %F full pathname/uri
- %d directory without path (e.g. /home/user/file.mp3 -> user)
- %D directory name with full path (e.g. /home/user/file.mp3 -> /home/user)
- more to come
- */
- int (*pl_format_title) (DB_playItem_t *it, int idx, char *s, int size, int id, const char *fmt);
-
- // _escaped version wraps all conversions with '' and replaces every ' in conversions with \'
- int (*pl_format_title_escaped) (DB_playItem_t *it, int idx, char *s, int size, int id, const char *fmt);
-
- // format duration 't' (fractional seconds) into string, for display in playlist
- void (*pl_format_time) (float t, char *dur, int size);
-
- // find which playlist the specified item belongs to, returns NULL if none
- ddb_playlist_t * (*pl_get_playlist) (DB_playItem_t *it);
-
- // direct access to metadata structures
- // not thread-safe, make sure to wrap with pl_lock/pl_unlock
- DB_metaInfo_t * (*pl_get_metadata_head) (DB_playItem_t *it); // returns head of metadata linked list
- void (*pl_delete_metadata) (DB_playItem_t *it, DB_metaInfo_t *meta);
-
- // high-level access to metadata
- void (*pl_add_meta) (DB_playItem_t *it, const char *key, const char *value);
- void (*pl_append_meta) (DB_playItem_t *it, const char *key, const char *value);
- void (*pl_set_meta_int) (DB_playItem_t *it, const char *key, int value);
- void (*pl_set_meta_float) (DB_playItem_t *it, const char *key, float value);
- void (*pl_delete_meta) (DB_playItem_t *it, const char *key);
-
- // this function is not thread-safe
- // make sure to wrap it with pl_lock/pl_unlock block
- const char *(*pl_find_meta) (DB_playItem_t *it, const char *key);
-
- // following functions are thread-safe
- int (*pl_find_meta_int) (DB_playItem_t *it, const char *key, int def);
- float (*pl_find_meta_float) (DB_playItem_t *it, const char *key, float def);
- void (*pl_replace_meta) (DB_playItem_t *it, const char *key, const char *value);
- void (*pl_delete_all_meta) (DB_playItem_t *it);
- float (*pl_get_item_duration) (DB_playItem_t *it);
- uint32_t (*pl_get_item_flags) (DB_playItem_t *it);
- void (*pl_set_item_flags) (DB_playItem_t *it, uint32_t flags);
- void (*pl_items_copy_junk)(DB_playItem_t *from, DB_playItem_t *first, DB_playItem_t *last);
- // idx is one of DDB_REPLAYGAIN_* constants
- void (*pl_set_item_replaygain) (DB_playItem_t *it, int idx, float value);
- float (*pl_get_item_replaygain) (DB_playItem_t *it, int idx);
-
- // playqueue support
- int (*pl_playqueue_push) (DB_playItem_t *it);
- void (*pl_playqueue_clear) (void);
- void (*pl_playqueue_pop) (void);
- void (*pl_playqueue_remove) (DB_playItem_t *it);
- int (*pl_playqueue_test) (DB_playItem_t *it);
-
- // volume control
- void (*volume_set_db) (float dB);
- float (*volume_get_db) (void);
- void (*volume_set_amp) (float amp);
- float (*volume_get_amp) (void);
- float (*volume_get_min_db) (void);
-
- // 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, 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);
- int (*junk_id3v2_convert_24_to_23) (DB_id3v2_tag_t *tag24, DB_id3v2_tag_t *tag23);
- int (*junk_id3v2_convert_23_to_24) (DB_id3v2_tag_t *tag23, DB_id3v2_tag_t *tag24);
- int (*junk_id3v2_convert_22_to_24) (DB_id3v2_tag_t *tag22, DB_id3v2_tag_t *tag24);
- void (*junk_id3v2_free) (DB_id3v2_tag_t *tag);
- int (*junk_id3v2_write) (FILE *file, DB_id3v2_tag_t *tag);
- DB_id3v2_frame_t *(*junk_id3v2_add_text_frame) (DB_id3v2_tag_t *tag, const char *frame_id, const char *value); 
- int (*junk_id3v2_remove_frames) (DB_id3v2_tag_t *tag, const char *frame_id);
- int (*junk_apev2_read) (DB_playItem_t *it, DB_FILE *fp);
- int (*junk_apev2_read_mem) (DB_playItem_t *it, char *mem, int size);
- int (*junk_apev2_read_full) (DB_playItem_t *it, DB_apev2_tag_t *tag_store, DB_FILE *fp);
- int (*junk_apev2_read_full_mem) (DB_playItem_t *it, DB_apev2_tag_t *tag_store, char *mem, int memsize);
- int (*junk_apev2_find) (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems);
- int (*junk_apev2_remove_frames) (DB_apev2_tag_t *tag, const char *frame_id);
- DB_apev2_frame_t * (*junk_apev2_add_text_frame) (DB_apev2_tag_t *tag, const char *frame_id, const char *value);
- void (*junk_apev2_free) (DB_apev2_tag_t *tag);
- int (*junk_apev2_write) (FILE *fp, DB_apev2_tag_t *tag, int write_header, int write_footer);
- int (*junk_get_leading_size) (DB_FILE *fp);
- int (*junk_get_leading_size_stdio) (FILE *fp);
- void (*junk_copy) (DB_playItem_t *from, DB_playItem_t *first, DB_playItem_t *last);
- const char * (*junk_detect_charset) (const char *s);
- int (*junk_recode) (const char *in, int inlen, char *out, int outlen, const char *cs);
- int (*junk_iconv) (const char *in, int inlen, char *out, int outlen, const char *cs_in, const char *cs_out);
- int (*junk_rewrite_tags) (DB_playItem_t *it, uint32_t flags, int id3v2_version, const char *id3v1_encoding);
-
- // vfs
- DB_FILE* (*fopen) (const char *fname);
- void (*fclose) (DB_FILE *f);
- size_t (*fread) (void *ptr, size_t size, size_t nmemb, DB_FILE *stream);
- int (*fseek) (DB_FILE *stream, int64_t offset, int whence);
- int64_t (*ftell) (DB_FILE *stream);
- void (*rewind) (DB_FILE *stream);
- int64_t (*fgetlength) (DB_FILE *stream);
- const char *(*fget_content_type) (DB_FILE *stream);
- void (*fset_track) (DB_FILE *stream, DB_playItem_t *it);
- void (*fabort) (DB_FILE *stream);
-
- // message passing
- int (*sendmessage) (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
-
- // convenience functions to send events, uses sendmessage internally
- ddb_event_t *(*event_alloc) (uint32_t id);
- void (*event_free) (ddb_event_t *ev);
- int (*event_send) (ddb_event_t *ev, uint32_t p1, uint32_t p2);
-
- // configuration access
- //
- // conf_get_str_fast is not thread-safe, and
- // must only be used from within conf_lock/conf_unlock block
- // it should be preferred for fast non-blocking lookups
- //
- // all the other config access functions are thread safe
- void (*conf_lock) (void);
- void (*conf_unlock) (void);
- const char * (*conf_get_str_fast) (const char *key, const char *def);
- void (*conf_get_str) (const char *key, const char *def, char *buffer, int buffer_size);
- float (*conf_get_float) (const char *key, float def);
- int (*conf_get_int) (const char *key, int def);
- int64_t (*conf_get_int64) (const char *key, int64_t def);
- void (*conf_set_str) (const char *key, const char *val);
- void (*conf_set_int) (const char *key, int val);
- void (*conf_set_int64) (const char *key, int64_t val);
- void (*conf_set_float) (const char *key, float val);
- DB_conf_item_t * (*conf_find) (const char *group, DB_conf_item_t *prev);
- void (*conf_remove_items) (const char *key);
- int (*conf_save) (void);
-
- // plugin communication
- struct DB_decoder_s **(*plug_get_decoder_list) (void);
- struct DB_vfs_s **(*plug_get_vfs_list) (void);
- struct DB_output_s **(*plug_get_output_list) (void);
- struct DB_dsp_s **(*plug_get_dsp_list) (void);
- struct DB_playlist_s **(*plug_get_playlist_list) (void);
- struct DB_plugin_s **(*plug_get_list) (void);
- const char **(*plug_get_gui_names) (void);
- const char * (*plug_get_decoder_id) (const char *id);
- void (*plug_remove_decoder_id) (const char *id);
- struct DB_plugin_s *(*plug_get_for_id) (const char *id);
-
- // misc utilities
- // returns 1 if the track is represented as a local file
- // returns 0 if it's a remote file, e.g. a network stream
- // since API 1.5 it also returns 1 for vfs tracks, e.g. from ZIP files
- int (*is_local_file) (const char *fname);
-
- // pcm utilities
- int (*pcm_convert) (const ddb_waveformat_t * inputfmt, const char *input, const ddb_waveformat_t *outputfmt, char *output, int inputsize);
-
- // dsp preset management
- 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);
-
- // since 1.2
-#if (DDB_API_LEVEL >= 2)
- 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 '!')
- // it's not thread-safe, and must be used under the same conditions as the
- // pl_find_meta
- const char *(*pl_find_meta_raw) (DB_playItem_t *it, const char *key);
-#endif
-
- // since 1.3
-#if (DDB_API_LEVEL >= 3)
- int (*streamer_dsp_chain_save) (void);
-#endif
-
- // since 1.4
-#if (DDB_API_LEVEL >= 4)
- int (*pl_get_meta) (DB_playItem_t *it, const char *key, char *val, int size);
- int (*pl_get_meta_raw) (DB_playItem_t *it, const char *key, char *val, int size);
- int (*plt_get_meta) (ddb_playlist_t *handle, const char *key, char *val, int size);
-
- // fast way to test if a field exists in playitem
- int (*pl_meta_exists) (DB_playItem_t *it, const char *key);
-#endif
-
- // since 1.5
-#if (DDB_API_LEVEL >= 5)
- // register/unregister for getting continuous wave data
- // mainly for visualization
- // ctx must be unique
- // the waveform data can be arbitrary size
- // the samples are interleaved
- void (*vis_waveform_listen) (void *ctx, void (*callback)(void *ctx, ddb_audio_data_t *data));
- void (*vis_waveform_unlisten) (void *ctx);
-
- // register/unregister for getting continuous spectrum (frequency domain) data
- // mainly for visualization
- // ctx must be unique
- // the data always contains DDB_FREQ_BANDS frames
- // max number of channels is DDB_FREQ_MAX_CHANNELS
- // the samples are non-interleaved
- void (*vis_spectrum_listen) (void *ctx, void (*callback)(void *ctx, ddb_audio_data_t *data));
- void (*vis_spectrum_unlisten) (void *ctx);
-
- // this is useful to mute/unmute audio, and query the muted status, from
- // plugins, without touching the volume control
- void (*audio_set_mute) (int mute);
- int (*audio_is_mute) (void);
-
- // this is useful for prompting a user when he attempts to quit the player
- // while something is working in background, e.g. the Converter,
- // and let him finish or cancel the background jobs.
- void (*background_job_increment) (void);
- void (*background_job_decrement) (void);
- int (*have_background_jobs) (void);
-
- // utility function to get plt idx from handle
- int (*plt_get_idx) (ddb_playlist_t *plt);
-
- // save referenced playlist in config
- int (*plt_save_n) (int n);
- int (*plt_save_config) (ddb_playlist_t *plt);
-
- // register file added callback
- // the callback will be called for each file
- // the visibility is taken from plt_add_* arguments
- // the callback must return 0 to continue, or -1 to abort the operation.
- // returns ID
- int (*listen_file_added) (int (*callback)(ddb_fileadd_data_t *data, void *user_data), void *user_data);
- void (*unlisten_file_added) (int id);
-
- int (*listen_file_add_beginend) (void (*callback_begin) (ddb_fileadd_data_t *data, void *user_data), void (*callback_end)(ddb_fileadd_data_t *data, void *user_data), void *user_data);
- void (*unlisten_file_add_beginend) (int id);
-
- // visibility is a number, which tells listeners about the caller.
- // the value DDB_FILEADD_VISIBILITY_GUI (or 0) is reserved for callers which
- // want the GUI to intercept the calls and show visual updates.
- //
- // this is the default value passed from plt_load, plt_add_dir, plt_add_file.
- //
- // the values up to 10 are registered for deadbeef itself, so please avoid
- // using them in your plugins, unless you really know what you're doing.
- // any values above 10 are free for any use.
- //
- // the "callback", if not NULL, will be called with the passed "user_data",
- // for each track.
- //
- // the registered listeners will be called too, the ddb_fileadd_data_t
- // has the visibility
- DB_playItem_t * (*plt_load2) (int visibility, ddb_playlist_t *plt, ddb_playItem_t *after, const char *fname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data);
- int (*plt_add_file2) (int visibility, ddb_playlist_t *plt, const char *fname, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data);
- int (*plt_add_dir2) (int visibility, ddb_playlist_t *plt, const char *dirname, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data);
- ddb_playItem_t * (*plt_insert_file2) (int visibility, ddb_playlist_t *playlist, ddb_playItem_t *after, const char *fname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data);
- ddb_playItem_t *(*plt_insert_dir2) (int visibility, ddb_playlist_t *plt, ddb_playItem_t *after, const char *dirname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data);
-
- // request lock for adding files to playlist
- // returns 0 on success
- // this function may return -1 if it is not possible to add files right now.
- // caller must cancel operation in this case,
- // or wait until previous operation finishes
- // NOTE: it's not guaranteed that all deadbeef versions support
- // adding the files to different playlists in parallel.
- int (*plt_add_files_begin) (ddb_playlist_t *plt, int visibility);
-
- // release the lock for adding files to playlist
- // end must be called when add files operation is finished
- void (*plt_add_files_end) (ddb_playlist_t *plt, int visibility);
-
- // deselect all tracks in playlist
- void (*plt_deselect_all) (ddb_playlist_t *plt);
-#endif
- // since 1.6
-#if (DDB_API_LEVEL >= 6)
- void (*plt_set_scroll) (ddb_playlist_t *plt, int scroll);
- int (*plt_get_scroll) (ddb_playlist_t *plt);
-#endif
-} 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,
-
- /* Can handle single track */
- DB_ACTION_SINGLE_TRACK = 1 << 1,
-
- /* Can handle multiple tracks */
- DB_ACTION_MULTIPLE_TRACKS = 1 << 2,
-
- /* DEPRECATED in API 1.5 */
- DB_ACTION_ALLOW_MULTIPLE_TRACKS = 1 << 2,
-
- /* DEPRECATED in API 1.5, ignored in callback2 */
- /* Action can (and prefer) traverse multiple tracks by itself */
- DB_ACTION_CAN_MULTIPLE_TRACKS = 1 << 3,
- 
- /* Action is inactive */
- DB_ACTION_DISABLED = 1 << 4,
-
- /* DEPRECATED in API 1.5, ignored in callback2 */
- /* since 1.2 */
- /* Action for the playlist (tab) */
- DB_ACTION_PLAYLIST = 1 << 5,
-
- /* add item to menu(s), if contains slash symbol(s) */
- DB_ACTION_ADD_MENU = 1 << 6
-};
-
-// action contexts
-// since 1.5
-#if (DDB_API_LEVEL >= 5)
-enum {
- DDB_ACTION_CTX_MAIN,
- DDB_ACTION_CTX_SELECTION,
- DDB_ACTION_CTX_PLAYLIST,
- DDB_ACTION_CTX_NOWPLAYING,
- DDB_ACTION_CTX_COUNT
-};
-#endif
-
-struct DB_plugin_action_s;
-
-typedef int (*DB_plugin_action_callback_t) (struct DB_plugin_action_s *action, void *userdata);
-#if (DDB_API_LEVEL >= 5)
-typedef int (*DB_plugin_action_callback2_t) (struct DB_plugin_action_s *action, int ctx);
-#endif
-
-typedef struct DB_plugin_action_s {
- const char *title;
- const char *name;
- uint32_t flags;
- // the use of "callback" is deprecated, only use it if the code must be compatible with API 1.4
- // otherwise switch to callback2
- DB_plugin_action_callback_t callback;
- struct DB_plugin_action_s *next;
-#if (DDB_API_LEVEL >= 5)
- DB_plugin_action_callback2_t callback2;
-#endif
-} DB_plugin_action_t;
-
-// base plugin interface
-typedef struct DB_plugin_s {
- // type must be one of DB_PLUGIN_ types
- int32_t type;
- // api version
- int16_t api_vmajor;
- int16_t api_vminor;
- // plugin version
- int16_t version_major;
- int16_t version_minor;
-
- uint32_t flags; // currently unused
- uint32_t reserved1;
- uint32_t reserved2;
- uint32_t reserved3;
-
- // any of those can be left NULL
- // though it's much better to fill them with something useful
- const char *id; // id used for serialization and runtime binding
- const char *name; // short name
- const char *descr; // short description (what the plugin is doing)
- const char *copyright; // copyright notice(s), list of developers, links to original works, etc
- const char *website; // plugin website
-
- // plugin-specific command interface; can be NULL
- int (*command) (int cmd, ...);
-
- // start is called to start plugin; can be NULL
- int (*start) (void);
- 
- // stop is called to deinit plugin; can be NULL
- int (*stop) (void);
-
- // connect is called to setup connections between different plugins
- // it is called after all plugin's start method was executed
- // can be NULL
- // NOTE for GUI plugin developers: don't initialize your widgets/windows in
- // the connect method. look for up-to-date information on wiki:
- // http://github.com/Alexey-Yakovenko/deadbeef/wiki/Porting-GUI-plugins-to-deadbeef-from-0.5.x-to-0.6.0
- int (*connect) (void);
-
- // opposite of connect, will be called before stop, while all plugins are still
- // in "started" state
- int (*disconnect) (void);
- 
- // exec_cmdline may be called at any moment when user sends commandline to player
- // can be NULL if plugin doesn't support commandline processing
- // cmdline is 0-separated list of strings, guaranteed to have 0 at the end
- // cmdline_size is number of bytes pointed by cmdline
- int (*exec_cmdline) (const char *cmdline, int cmdline_size);
- 
- // @returns linked list of actions for the specified track
- // when it is NULL -- the plugin must return list of all actions
- DB_plugin_action_t* (*get_actions) (DB_playItem_t *it);
-
- // mainloop will call this function for every plugin
- // so that plugins may handle all events;
- // can be NULL
- int (*message) (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
-
- // plugin configuration dialog is constructed from this data
- // can be NULL
- const char *configdialog;
-} DB_plugin_t;
-
-// file format stuff
-
-// channel mask - combine following flags to tell streamer which channels are
-// present in input/output streams
-enum {
- DDB_SPEAKER_FRONT_LEFT = 0x1,
- DDB_SPEAKER_FRONT_RIGHT = 0x2,
- DDB_SPEAKER_FRONT_CENTER = 0x4,
- DDB_SPEAKER_LOW_FREQUENCY = 0x8,
- DDB_SPEAKER_BACK_LEFT = 0x10,
- DDB_SPEAKER_BACK_RIGHT = 0x20,
- DDB_SPEAKER_FRONT_LEFT_OF_CENTER = 0x40,
- DDB_SPEAKER_FRONT_RIGHT_OF_CENTER = 0x80,
- DDB_SPEAKER_BACK_CENTER = 0x100,
- DDB_SPEAKER_SIDE_LEFT = 0x200,
- DDB_SPEAKER_SIDE_RIGHT = 0x400,
- DDB_SPEAKER_TOP_CENTER = 0x800,
- DDB_SPEAKER_TOP_FRONT_LEFT = 0x1000,
- DDB_SPEAKER_TOP_FRONT_CENTER = 0x2000,
- DDB_SPEAKER_TOP_FRONT_RIGHT = 0x4000,
- DDB_SPEAKER_TOP_BACK_LEFT = 0x8000,
- DDB_SPEAKER_TOP_BACK_CENTER = 0x10000,
- DDB_SPEAKER_TOP_BACK_RIGHT = 0x20000
-};
-
-typedef struct DB_fileinfo_s {
- struct DB_decoder_s *plugin;
-
- // these parameters should be set in decoder->open
- ddb_waveformat_t fmt;
-
- // readpos should be updated to current decoder time (in seconds) 
- float readpos;
-
- // this is the (optional) file handle, that can be used by streamer to
- // request interruption of current read operation
- DB_FILE *file;
-} DB_fileinfo_t;
-
-enum {
- DDB_DECODER_HINT_16BIT = 0x1, // that flag means streamer prefers 16 bit streams for performance reasons
-};
-
-// decoder plugin
-typedef struct DB_decoder_s {
- DB_plugin_t plugin;
-
- DB_fileinfo_t *(*open) (uint32_t hints);
-
- // init is called to prepare song to be started
- int (*init) (DB_fileinfo_t *info, DB_playItem_t *it);
-
- // free is called after decoding is finished
- void (*free) (DB_fileinfo_t *info);
-
- // read is called by streamer to decode specified number of bytes
- // must return number of bytes that were successfully decoded (sample aligned)
- int (*read) (DB_fileinfo_t *info, char *buffer, int nbytes);
-
- int (*seek) (DB_fileinfo_t *info, float seconds);
-
- // perform seeking in samples (if possible)
- // return -1 if failed, or 0 on success
- // if -1 is returned, that will mean that streamer must skip that song
- int (*seek_sample) (DB_fileinfo_t *info, int sample);
-
- // 'insert' is called to insert new item to playlist
- // decoder is responsible to calculate duration, split it into subsongs, load cuesheet, etc
- // after==NULL means "prepend before 1st item in playlist"
- DB_playItem_t * (*insert) (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname); 
-
- int (*numvoices) (DB_fileinfo_t *info);
- void (*mutevoice) (DB_fileinfo_t *info, int voice, int mute);
-
- int (*read_metadata) (DB_playItem_t *it);
- int (*write_metadata) (DB_playItem_t *it);
-
- // NULL terminated array of all supported extensions
- const char **exts;
-
- // NULL terminated array of all supported prefixes (UADE support needs that)
- // e.g. "mod.song_title"
- const char **prefixes;
-
-#if (DDB_API_LEVEL >= 7)
- // This function's purpose is to open the file, so that the file handle is
- // immediately accessible via DB_fileinfo_t, and can be used with fabort.
- // If a plugin is using open2, it should not reopen the file from init.
- // Plugins _must_ implement open even if open2 is present,
- // because existing code may rely on it.
- DB_fileinfo_t *(*open2) (uint32_t hints, DB_playItem_t *it);
-#endif
-} DB_decoder_t;
-
-// output plugin
-typedef struct DB_output_s {
- DB_plugin_t plugin;
- // init is called once at plugin activation
- int (*init) (void);
- // free is called if output plugin was changed to another, or unload is about to happen
- int (*free) (void);
- // reconfigure output to another format
- int (*setformat) (ddb_waveformat_t *fmt);
- // play, stop, pause, unpause are called by deadbeef in response to user
- // events, or as part of streaming process
- int (*play) (void);
- int (*stop) (void);
- int (*pause) (void);
- int (*unpause) (void);
- // one of output_state_t enum values
- int (*state) (void);
- // soundcard enumeration (can be NULL)
- void (*enum_soundcards) (void (*callback)(const char *name, const char *desc, void*), void *userdata);
-
- // parameters of current output
- ddb_waveformat_t fmt;
-
- // set to 1 if volume control is done internally by plugin
- int has_volume;
-} DB_output_t;
-
-// dsp plugin
-// see also: examples/dsp_template.c in git
-#define DDB_INIT_DSP_CONTEXT(var,type,plug) {\
- memset(var,0,sizeof(type));\
- var->ctx.plugin=plug;\
- var->ctx.enabled=1;\
-}
-
-typedef struct ddb_dsp_context_s {
- // pointer to DSP plugin which created this context
- struct DB_dsp_s *plugin;
-
- // pointer to the next DSP plugin context in the chain
- struct ddb_dsp_context_s *next;
-
- // read only flag; set by DB_dsp_t::enable
- unsigned enabled : 1;
-} ddb_dsp_context_t;
-
-typedef struct DB_dsp_s {
- DB_plugin_t plugin;
-
- ddb_dsp_context_t* (*open) (void);
-
- void (*close) (ddb_dsp_context_t *ctx);
-
- // samples are always interleaved floating point
- // returned value is number of output frames (multichannel samples)
- // plugins are allowed to modify channels, samplerate, channelmask in the fmt structure
- // buffer size can fit up to maxframes frames
- // by default ratio=1, and plugins don't need to touch it unless they have to
- int (*process) (ddb_dsp_context_t *ctx, float *samples, int frames, int maxframes, ddb_waveformat_t *fmt, float *ratio);
-
- void (*reset) (ddb_dsp_context_t *ctx);
-
- // num_params can be NULL, to indicate that plugin doesn't expose any params
- //
- // if num_params is non-NULL -- get_param_name, set_param and get_param must
- // all be implemented
- //
- // param names are for display-only, and are allowed to contain spaces
- int (*num_params) (void);
- const char *(*get_param_name) (int p);
- void (*set_param) (ddb_dsp_context_t *ctx, int p, const char *val);
- void (*get_param) (ddb_dsp_context_t *ctx, int p, char *str, int len);
-
- // config dialog implementation uses set/get param, so they must be
- // implemented if this is nonzero
- const char *configdialog;
-
- // since 1.1
-#if (DDB_API_LEVEL >= 1)
- // can be NULL
- // should return 1 if the DSP plugin will not touch data with the current parameters;
- // 0 otherwise
- int (*can_bypass) (ddb_dsp_context_t *ctx, ddb_waveformat_t *fmt);
-#endif
-} DB_dsp_t;
-
-// misc plugin
-// purpose is to provide extra services
-// e.g. scrobbling, converting, tagging, custom gui, etc.
-// misc plugins should be mostly event driven, so no special entry points in them
-typedef struct {
- DB_plugin_t plugin;
-} DB_misc_t;
-
-// vfs plugin
-// provides means for reading, seeking, etc
-// api is based on stdio
-typedef struct DB_vfs_s {
- DB_plugin_t plugin;
-
-// capabilities
- const char **(*get_schemes) (void); // NULL-terminated list of supported schemes, e.g. {"http://", "ftp://", NULL}; can be NULL
-
- int (*is_streaming) (void); // return 1 if the plugin streaming data over slow connection, e.g. http; plugins will avoid scanning entire files if this is the case
-
- int (*is_container) (const char *fname); // should return 1 if this plugin can parse specified file
-
-// this allows interruption of hanging network streams
- void (*abort) (DB_FILE *stream);
-
-// file access, follows stdio API with few extension
- DB_FILE* (*open) (const char *fname);
- void (*close) (DB_FILE *f);
- size_t (*read) (void *ptr, size_t size, size_t nmemb, DB_FILE *stream);
- int (*seek) (DB_FILE *stream, int64_t offset, int whence);
- int64_t (*tell) (DB_FILE *stream);
- void (*rewind) (DB_FILE *stream);
- int64_t (*getlength) (DB_FILE *stream);
-
- // should return mime-type of a stream, if known; can be NULL
- const char * (*get_content_type) (DB_FILE *stream);
-
- // associates stream with a track, to allow dynamic metadata updating, like
- // in icy protocol
- void (*set_track) (DB_FILE *f, DB_playItem_t *it);
-
- // folder access, follows dirent API, and uses dirent data structures
- int (*scandir) (const char *dir, struct dirent ***namelist, int (*selector) (const struct dirent *), int (*cmp) (const struct dirent **, const struct dirent **));
-
-#if (DDB_API_LEVEL >= 6)
- // returns URI scheme for a given file name, e.g. "zip://"
- // can be NULL
- // can return NULL
- const char *(*get_scheme_for_name) (const char *fname);
-#endif
-} DB_vfs_t;
-
-// gui plugin
-// only one gui plugin can be running at the same time
-// should provide GUI services to other plugins
-
-// this structure represents a gui dialog with callbacks to set/get params
-// documentation should be available here:
-// http://github.com/Alexey-Yakovenko/deadbeef/wiki/GUI-Script-Syntax
-typedef struct {
- const char *title;
- const char *layout;
- void (*set_param) (const char *key, const char *value);
- void (*get_param) (const char *key, char *value, int len, const char *def);
-
- // parent was added in 1.4 API
- void *parent;
-} ddb_dialog_t;
-
-enum {
- ddb_button_ok,
- ddb_button_cancel,
- ddb_button_close,
- ddb_button_apply,
- ddb_button_yes,
- ddb_button_no,
- ddb_button_max,
-};
-
-typedef struct DB_gui_s {
- DB_plugin_t plugin;
-
- // returns response code (ddb_button_*)
- // buttons is a bitset, e.g. (1<<ddb_button_ok)|(1<<ddb_button_cancel)
- int (*run_dialog) (ddb_dialog_t *dlg, uint32_t buttons, int (*callback)(int button, void *ctx), void *ctx);
-} DB_gui_t;
-
-// playlist plugin
-typedef struct DB_playlist_s {
- DB_plugin_t plugin;
-
- DB_playItem_t * (*load) (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data);
-
- // will save items from first to last (inclusive)
- // format is determined by extension
- // playlist is protected from changes during the call
- int (*save) (ddb_playlist_t *plt, const char *fname, DB_playItem_t *first, DB_playItem_t *last);
-
- const char **extensions; // NULL-terminated list of supported file extensions, e.g. {"m3u", "pls", NULL}
- 
- // since 1.5
-#if (DDB_API_LEVEL >= 5)
- DB_playItem_t * (*load2) (int visibility, ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort);
-#endif
-} DB_playlist_t;
-
-#undef DDB_DEPRECATED
-#undef DEPRECATED
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __DEADBEEF_H

deadbeef-0.6.2.tar.bz2/depcomp Deleted

@@ -1,630 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: depcomp --help --version PROGRAM ARGS
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
- depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
- DEPDIR directory where to store dependencies.
- depfile Dependency file to output.
- tmpdepfile Temporary file to use when outputing dependencies.
- libtool Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "depcomp $scriptversion"
- exit $?
- ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
- exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
- sed 's|^\\/*$|'${DEPDIR-.deps}'/&|;s|\.$^.*$$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.$^.*$$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags. We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write. Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
- # HP compiler uses -M and no extra arg.
- gccflag=-M
- depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
- # This is just like dashmstdout with a different argument.
- dashmflag=-xM
- depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
- # This is just like msvisualcpp but w/o cygpath translation.
- # Just convert the backslash-escaped backslashes to single forward
- # slashes to satisfy depend.m4
- cygpath_u="sed s,\\\\\\\\,/,g"
- depmode=msvisualcpp
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want. Yay! Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff. Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am. Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
- for arg
- do
- case $arg in
- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
- *) set fnord "$@" "$arg" ;;
- esac
- shift # fnord
- shift # $arg
- done
- "$@"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- mv "$tmpdepfile" "$depfile"
- ;;
-
-gcc)
-## There are various ways to get dependency output from gcc. Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-## up in a subdir. Having to rename by hand is ugly.
-## (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-## -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-## than renaming).
- if test -z "$gccflag"; then
- gccflag=-MD,
- fi
- "$@" -Wp,"$gccflag$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
- sed -e 's/^^:*: / /' \
- -e 's/^'$alpha':\/^:*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header). We avoid this by adding
-## dummy dependencies for each header file. Too bad gcc doesn't do
-## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-sgi)
- if test "$libtool" = yes; then
- "$@" "-Wp,-MDupdate,$tmpdepfile"
- else
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
-
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
- # dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> "$depfile"
- echo >> "$depfile"
-
- # The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-aix)
- # The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
- # start of each line; $object doesn't have directory information.
- # Version 6 uses the directory in both cases.
- dir=`echo "$object" | sed -e 's|/^/*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$base.u
- tmpdepfile3=$dir.libs/$base.u
- "$@" -Wc,-M
- else
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$dir$base.u
- tmpdepfile3=$dir$base.u
- "$@" -M
- fi
- stat=$?
-
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^.*\.a-z*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the .
- sed -e 's,^.*\.a-z*:	 *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
- # "include basename.Plo" scheme.
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
- # ICC 7.0 will fill foo.d with something like
- # foo.o: sub/foo.c
- # foo.o: sub/foo.h
- # which is wrong. We want:
- # sub/foo.o: sub/foo.c
- # sub/foo.o: sub/foo.h
- # sub/foo.c:
- # sub/foo.h:
- # ICC 7.1 will output
- # foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
- # foo.o: sub/foo.c ... \
- # sub/foo.h ... \
- # ...
-
- "$@" -MD -MF "$tmpdepfile"
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- # Each line is of the form `foo.o: dependent.h',
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed "s,^^:*:,$object :," < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^^:*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-hp2)
- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
- # compilers, which have integrated preprocessors. The correct option
- # to use with these is +Maked; it writes dependencies to a file named
- # 'foo.d', which lands next to the object file, wherever that
- # happens to be.
- # Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/^/*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir.libs/$base.d
- "$@" -Wc,+Maked
- else
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir$base.d
- "$@" +Maked
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.a-z*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
- sed -ne '2,${
-	 s/^ *//
-	 s/ \\*$//
-	 s/$/:/
-	 p
-	 }' "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile" "$tmpdepfile2"
- ;;
-
-tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
- # Subdirectories are respected.
- dir=`echo "$object" | sed -e 's|/^/*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
- # automatically cleaned when .libs/ is deleted, while ignoring
- # the former would cause a distcleancheck panic.
- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
- tmpdepfile2=$dir$base.o.d # libtool 1.5
- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
- "$@" -Wc,-MD
- else
- tmpdepfile1=$dir$base.o.d
- tmpdepfile2=$dir$base.d
- tmpdepfile3=$dir$base.d
- tmpdepfile4=$dir$base.d
- "$@" -MD
- fi
-
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.a-z*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the .
- sed -e 's,^.*\.a-z*:	 *,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-
-#nosideeffect)
- # This comment above is used by automake to tell side-effect
- # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout, regardless of -o.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
- # in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
- "$@" $dashmflag |
- sed 's:^ *^: ^:^:*\: *:'"$object"'\: :' > "$tmpdepfile"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-dashXmstdout)
- # This case only exists to satisfy depend.m4. It is never actually
- # run, as this mode is specially recognized in the preamble.
- exit 1
- ;;
-
-makedepend)
- "$@" || exit $?
- # Remove any Libtool call
- if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
- # X makedepend
- shift
- cleared=no eat=no
- for arg
- do
- case $cleared in
- no)
- set ""; shift
- cleared=yes ;;
- esac
- if test $eat = yes; then
- eat=no
- continue
- fi
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift ;;
- # Strip any option that makedepend may not understand. Remove
- # the object too, otherwise makedepend will parse it as a source file.
- -arch)
- eat=yes ;;
- -*|$object)
- ;;
- *)
- set fnord "$@" "$arg"; shift ;;
- esac
- done
- obj_suffix=`echo "$object" | sed 's/^.*\././'`
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly. Breaking it into two sed invocations is a workaround.
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile" "$tmpdepfile".bak
- ;;
-
-cpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
-
- # Remove `-o $object'.
- IFS=" "
- for arg
- do
- case $arg in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- *)
- set fnord "$@" "$arg"
- shift # fnord
- shift # $arg
- ;;
- esac
- done
-
- "$@" -E |
- sed -n -e '/^# 0-90-9* "$^"*$".*/ s:: \1 \\:p' \
- -e '/^#line 0-90-9* "$^"*$".*/ s:: \1 \\:p' |
- sed '$ s: \\$::' > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
- # always write the preprocessed file to stdout.
- "$@" || exit $?
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
- while test "X$1" != 'X--mode=compile'; do
- shift
- done
- shift
- fi
-
- IFS=" "
- for arg
- do
- case "$arg" in
- -o)
- shift
- ;;
- $object)
- shift
- ;;
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
- *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
- esac
- done
- "$@" -E 2>/dev/null |
- sed -n '/^#line 0-90-9* "$^"*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
- echo "	" >> "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-msvcmsys)
- # This case exists only to let depend.m4 do its work. It works by
- # looking at the text of this script. This case will never be run,
- # since it is checked for above.
- exit 1
- ;;
-
-none)
- exec "$@"
- ;;
-
-*)
- echo "Unknown depmode $depmode" 1>&2
- exit 1
- ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

deadbeef-0.6.2.tar.bz2/dsppreset.c Deleted

@@ -1,148 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- dsp preset manager
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "deadbeef.h"
-#include "plugins.h"
-
-void
-dsp_preset_free (ddb_dsp_context_t *head) {
- while (head) {
- ddb_dsp_context_t *next = head->next;
- head->plugin->close (head);
- head = next;
- }
-}
-
-int
-dsp_preset_load (const char *fname, ddb_dsp_context_t **head) {
- if (!head) {
- return -1;
- }
- int err = 1;
- FILE *fp = fopen (fname, "rt");
- if (!fp) {
- return -1;
- }
-
- ddb_dsp_context_t *tail = NULL;
-
- char temp100;
- for (;;) {
- // plugin {
- int err = fscanf (fp, "%99s {\n", temp);
- if (err == EOF) {
- break;
- }
- else if (1 != err) {
- fprintf (stderr, "error plugin name\n");
- goto error;
- }
-
- DB_dsp_t *plug = (DB_dsp_t *)plug_get_for_id (temp);
- if (!plug) {
- fprintf (stderr, "ddb_dsp_preset_load: plugin %s not found. preset will not be loaded\n", temp);
- goto error;
- }
- ddb_dsp_context_t *ctx = plug->open ();
- if (!ctx) {
- fprintf (stderr, "ddb_dsp_preset_load: failed to open ctxance of plugin %s\n", temp);
- goto error;
- }
-
- if (tail) {
- tail->next = ctx;
- tail = ctx;
- }
- else {
- tail = *head = ctx;
- }
-
- int n = 0;
- for (;;) {
- char value1000;
- if (!fgets (temp, sizeof (temp), fp)) {
- fprintf (stderr, "unexpected eof while reading plugin params\n");
- goto error;
- }
- if (!strcmp (temp, "}\n")) {
- break;
- }
- else if (1 != sscanf (temp, "\t%1000^\n\n", value)) {
- fprintf (stderr, "error loading param %d\n", n);
- goto error;
- }
- if (plug->num_params) {
- plug->set_param (ctx, n, value);
- }
- n++;
- }
- }
-
- err = 0;
-error:
- if (err) {
- fprintf (stderr, "error loading %s\n", fname);
- }
- if (fp) {
- fclose (fp);
- }
- if (err && *head) {
- dsp_preset_free (*head);
- *head = NULL;
- }
- return err ? -1 : 0;
-}
-
-int
-dsp_preset_save (const char *path, ddb_dsp_context_t *head) {
- FILE *fp = fopen (path, "w+t");
- if (!fp) {
- return -1;
- }
-
- ddb_dsp_context_t *ctx = head;
- while (ctx) {
- fprintf (fp, "%s {\n", ctx->plugin->plugin.id);
- if (ctx->plugin->num_params) {
- int n = ctx->plugin->num_params ();
- int i;
- for (i = 0; i < n; i++) {
- char v1000;
- ctx->plugin->get_param (ctx, i, v, sizeof (v));
- fprintf (fp, "\t%s\n", v);
- }
- }
- fprintf (fp, "}\n");
- ctx = ctx->next;
- }
-
- fclose (fp);
- return 0;
-}

deadbeef-0.6.2.tar.bz2/dsppreset.h Deleted

@@ -1,39 +0,0 @@
-/*
-  This file is part of Deadbeef Player source code
-  http://deadbeef.sourceforge.net
-
-  dsp preset manager
-
-  Copyright (C) 2009-2013 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
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __DSPPRESET_H
-#define __DSPPRESET_H
-
-void
-dsp_preset_free (ddb_dsp_context_t *head);
-
-int
-dsp_preset_load (const char *fname, ddb_dsp_context_t **head);
-
-int
-dsp_preset_save (const char *path, ddb_dsp_context_t *head);
-
-#endif

deadbeef-0.6.2.tar.bz2/escape.h Deleted

@@ -1,29 +0,0 @@
-/*
-    DeaDBeeF -- the music player
-    Copyright (C) 2009-2014 Alexey Yakovenko and other contributors
-
-    This software is provided 'as-is', without any express or implied
-    warranty.  In no event will the authors be held liable for any damages
-    arising from the use of this software.
-
-    Permission is granted to anyone to use this software for any purpose,
-    including commercial applications, and to alter it and redistribute it
-    freely, subject to the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source distribution.
-*/
-#ifndef __ESCAPE_H
-#define __ESCAPE_H
-
-char *uri_escape(const char *string, int inlength);
-char *uri_unescape(const char *string, int inlength);
-
-#endif

deadbeef-0.6.2.tar.bz2/fastftoi.h Deleted

@@ -1,159 +0,0 @@
-// most of the code below was taken from libvorbis/vorbis/lib/os.h
-// under the conditions below
-/********************************************************************
- * *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
- * *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 *
- * by the Xiph.Org Foundation http://www.xiph.org/ *
- * *
- ********************************************************************
-
-contents of the libvorbis COPYING:
-
-Copyright (c) 2002-2008 Xiph.org Foundation
-
-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 name of the Xiph.org Foundation 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 FOUNDATION
-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.
- */
-#ifndef __OPTMATH_H
-#define __OPTMATH_H
-
-#include <math.h>
-
-#ifdef __SSE2__ // that comes from -msse2
-#define __FORCE_SSE2__
-#endif
-
-/* Special i386 GCC implementation */
-#if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__) && !defined(__FORCE_SSE2__)
-# define FPU_CONTROL
-/* both GCC and MSVC are kinda stupid about rounding/casting to int.
- Because of encapsulation constraints (GCC can't see inside the asm
- block and so we end up doing stupid things like a store/load that
- is collectively a noop), we do it this way */
-
-/* we must set up the fpu before this works!! */
-
-typedef int16_t fpu_control;
-
-static inline void fpu_setround(fpu_control *fpu){
- int16_t ret;
- int16_t temp;
- __asm__ __volatile__("fnstcw %0\n\t"
-	 "movw %0,%%dx\n\t"
-	 "orw $62463,%%dx\n\t"
-	 "movw %%dx,%1\n\t"
-	 "fldcw %1\n\t":"=m"(ret):"m"(temp): "dx");
- *fpu=ret;
-}
-
-static inline void fpu_restore(fpu_control fpu){
- __asm__ __volatile__("fldcw %0":: "m"(fpu));
-}
-
-/* assumes the FPU is in round mode! */
-static inline int ftoi(double f){ /* yes, double! Otherwise,
- we get extra fst/fld to
- truncate precision */
- int i;
- __asm__("fistl %0": "=m"(i) : "t"(f));
- return(i);
-}
-#endif /* Special i386 GCC implementation */
-
-
-/* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the
- * 64 bit compiler */
-#if defined(_MSC_VER) && !defined(_WIN64)
-# define FPU_CONTROL
-
-typedef int16_t fpu_control;
-
-static __inline int ftoi(double f){
-	int i;
-	__asm{
-		fld f
-		fistp i
-	}
-	return i;
-}
-
-static __inline void fpu_setround(fpu_control *fpu){
-}
-
-static __inline void fpu_restore(fpu_control fpu){
-}
-
-#endif /* Special MSVC 32 bit implementation */
-
-
-/* Optimized code path for x86_64 builds. Uses SSE2 intrinsics. This can be
- done safely because all x86_64 CPUs supports SSE2. */
-#if (defined(__FORCE_SSE2__)) || (defined(_MSC_VER) && defined(_WIN64)) || (defined(__GNUC__) && defined (__x86_64__))
-#pragma warning "using sse2 for ftoi"
-# define FPU_CONTROL
-
-typedef int16_t fpu_control;
-
-#include <emmintrin.h>
-static __inline int ftoi(double f){
- return _mm_cvtsd_si32(_mm_load_sd(&f));
-}
-
-static __inline void fpu_setround(fpu_control *fpu){
-}
-
-static __inline void fpu_restore(fpu_control fpu){
-}
-
-#endif /* Special MSVC x64 implementation */
-
-
-/* If no special implementation was found for the current compiler / platform,
- use the default implementation here: */
-#ifndef FPU_CONTROL
-
-typedef int fpu_control;
-
-static int ftoi(double f){
- /* Note: MSVC and GCC (at least on some systems) round towards zero, thus,
- the floor() call is required to ensure correct roudning of
- negative numbers */
- return (int)floor(f+.5);
-}
-
-/* We don't have special code for this compiler/arch, so do it the slow way */
-# define fpu_setround(fpu_control) {}
-# define fpu_restore(fpu_control) {}
-
-#endif /* default implementation */
-
-#endif // __OPTMATH_H

deadbeef-0.6.2.tar.bz2/fft.c Deleted

@@ -1,116 +0,0 @@
-/*
- * fft.c
- * Copyright 2011 John Lindgren
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions, and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions, and the following disclaimer in the documentation
- * provided with the distribution.
- *
- * This software is provided "as is" and without any warranty, express or
- * implied. In no event shall the authors be liable for any damages arising from
- * the use of this software.
- */
-
-// this version has few changes compared to the original audacious fft.c
-// please find the original file in audacious
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include "deadbeef.h"
-#include <math.h>
-#include <complex.h>
-
-#define N (DDB_FREQ_BANDS * 2)
-
-static float hammingN; /* hamming window, scaled to sum to 1 */
-static int reversedN; /* bit-reversal table */
-static float complex rootsN / 2; /* N-th roots of unity */
-static int generated = 0;
-static float LOGN; /* log N (base 2) */
-
-/* Reverse the order of the lowest LOGN bits in an integer. */
-
-static int bit_reverse (int x)
-{
- int y = 0;
-
- for (int n = LOGN; n --; )
- {
- y = (y << 1) | (x & 1);
- x >>= 1;
- }
-
- return y;
-}
-
-#ifndef HAVE_LOG2
-static inline float log2(float x) {return (float)log(x)/M_LN2;}
-#endif
-
-/* Generate lookup tables. */
-
-static void generate_tables (void)
-{
- if (generated)
- return;
-
- LOGN = log2(N);
- for (int n = 0; n < N; n ++)
- hammingn = 1 - 0.85 * cosf (2 * M_PI * n / N);
- for (int n = 0; n < N; n ++)
- reversedn = bit_reverse (n);
- for (int n = 0; n < N / 2; n ++)
- rootsn = cexpf (2 * M_PI * I * n / N);
-
- generated = 1;
-}
-
-static void do_fft (float complex aN)
-{
- int half = 1; /* (2^s)/2 */
- int inv = N / 2; /* N/(2^s) */
-
- /* loop through steps */
- while (inv)
- {
- /* loop through groups */
- for (int g = 0; g < N; g += half << 1)
- {
- /* loop through butterflies */
- for (int b = 0, r = 0; b < half; b ++, r += inv)
- {
- float complex even = ag + b;
- float complex odd = rootsr * ag + half + b;
- ag + b = even + odd;
- ag + half + b = even - odd;
- }
- }
-
- half <<= 1;
- inv >>= 1;
- }
-}
-
-void
-calc_freq (float *data, float *freq) {
- generate_tables ();
-
- // fft code shamelessly stolen from audacious
- // thanks, John
- float complex aN;
- for (int n = 0; n < N; n ++) {
- areversedn = datan * hammingn;
- }
- do_fft(a);
-
- for (int n = 0; n < N / 2 - 1; n ++)
- freqn = 2 * cabsf (a1 + n) / N;
- freqN / 2 - 1 = cabsf(aN / 2) / N;
-}

deadbeef-0.6.2.tar.bz2/fft.h Deleted

deadbeef-0.6.2.tar.bz2/handler.c Deleted

@@ -1,148 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- generic message queue implementation
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include "handler.h"
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <stdlib.h>
-#include "handler.h"
-#include "threading.h"
-
-typedef struct message_s {
- uint32_t id;
- uintptr_t ctx;
- uint32_t p1;
- uint32_t p2;
- struct message_s *next;
-} message_t;
-
-typedef struct handler_s {
- int queue_size;
- message_t *mfree;
- message_t *mqueue;
- message_t *mqtail;
- uintptr_t mutex;
- uintptr_t cond;
- message_t pool1;
-} handler_t;
-
-void
-handler_reset (handler_t *h) {
- h->mqueue = NULL;
- h->mfree = NULL;
- h->mqtail = NULL;
- memset (h->pool, 0, sizeof (message_t) * h->queue_size);
- for (int i = 0; i < h->queue_size; i++) {
- h->pooli.next = h->mfree;
- h->mfree = &h->pooli;
- }
-}
-
-handler_t *
-handler_alloc (int queue_size) {
- int sz = sizeof (handler_t) + (queue_size-1) * sizeof (message_t);
- handler_t *h = malloc (sz);
- memset (h, 0, sz);
- h->queue_size = queue_size;
- h->mutex = mutex_create ();
- h->cond = cond_create ();
- handler_reset (h);
- return h;
-}
-
-void
-handler_free (handler_t *h) {
- mutex_lock (h->mutex);
- handler_reset (h);
- mutex_unlock (h->mutex);
- mutex_free (h->mutex);
- cond_free (h->cond);
- free (h);
-}
-
-int
-handler_push (handler_t *h, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
- if (!h) {
- return -1;
- }
- if (!h->mfree) {
- return -1;
- }
- mutex_lock (h->mutex);
- message_t *msg = h->mfree;
- h->mfree = h->mfree->next;
- if (h->mqtail) {
- h->mqtail->next = msg;
- }
- h->mqtail = msg;
- if (!h->mqueue) {
- h->mqueue = msg;
- }
-
- msg->next = NULL;
- msg->id = id;
- msg->ctx = ctx;
- msg->p1 = p1;
- msg->p2 = p2;
- mutex_unlock (h->mutex);
- cond_signal (h->cond);
- return 0;
-}
-
-void
-handler_wait (handler_t *h) {
- cond_wait (h->cond, h->mutex);
- mutex_unlock (h->mutex);
-}
-
-int
-handler_pop (handler_t *h, uint32_t *id, uintptr_t *ctx, uint32_t *p1, uint32_t *p2) {
- mutex_lock (h->mutex);
- if (!h->mqueue) {
- mutex_unlock (h->mutex);
- return -1;
- }
- *id = h->mqueue->id;
- *ctx = h->mqueue->ctx;
- *p1 = h->mqueue->p1;
- *p2 = h->mqueue->p2;
- message_t *next = h->mqueue->next;
- h->mqueue->next = h->mfree;
- h->mfree = h->mqueue;
- h->mqueue = next;
- if (!h->mqueue) {
- h->mqtail = NULL;
- }
- mutex_unlock (h->mutex);
- return 0;
-}
-
-int
-handler_hasmessages (handler_t *h) {
- return h->mqueue ? 1 : 0;
-}
-

deadbeef-0.6.2.tar.bz2/handler.h Deleted

@@ -1,53 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- generic message queue implementation
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __HANDLER_H
-#define __HANDLER_H
-
-#include <stdint.h>
-
-struct handler_s *
-handler_alloc (int queue_size);
-
-void
-handler_reset (struct handler_s *h);
-
-void
-handler_free (struct handler_s *h);
-
-int
-handler_push (struct handler_s *h, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
-
-int
-handler_pop (struct handler_s *h, uint32_t *id, uintptr_t *ctx, uint32_t *p1, uint32_t *p2);
-
-void
-handler_wait (struct handler_s *h);
-
-int
-handler_hasmessages (struct handler_s *h);
-
-#endif // __HANDLER_H

deadbeef-0.6.2.tar.bz2/junklib.c Deleted

@@ -1,4477 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- library for reading tags from various audio files
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "junklib.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if HAVE_ICONV
- #define LIBICONV_PLUG
- #include <iconv.h>
-#elif HAVE_ICU
- #warning icu
- #include <unicode/utypes.h>
- #include <unicode/ucnv.h>
-#else
- #define DDB_RECODE
- #include "ConvertUTF/ConvertUTF.h"
-uint16_t sj_to_unicode = {
- #include "sj_to_unicode.h"
-};
-#endif
-#include <limits.h>
-#include <errno.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <assert.h>
-#include <fcntl.h>
-#ifndef __linux__
-#define O_LARGEFILE 0
-#endif
-#include <sys/stat.h>
-#include "playlist.h"
-#include "utf8.h"
-#include "plugins.h"
-#include "conf.h"
-
-int enable_cp1251_detection = 1;
-int enable_cp936_detection = 0;
-int enable_shift_jis_detection = 0;
-
-#define MAX_TEXT_FRAME_SIZE 1024
-#define MAX_CUESHEET_FRAME_SIZE 10000
-#define MAX_APEV2_FRAME_SIZE 2000000
-#define MAX_ID3V2_FRAME_SIZE 100000
-#define MAX_ID3V2_APIC_FRAME_SIZE 2000000
-
-#define UTF8_STR "utf-8"
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-
-#define min(x,y) ((x)<(y)?(x):(y))
-#define max(x,y) ((x)>(y)?(x):(y))
-
-
-// mapping between ddb metadata names and id3v2/apev2 names
-#define FRAME_MAPPINGS 5
-enum {
- MAP_DDB = 0,
- MAP_ID3V23 = 1,
- MAP_ID3V24 = 2,
- MAP_ID3V22 = 3,
- MAP_APEV2 = 4
-};
-
-// map of known id3v2 and apev2 text tags
-// order: ddb, id3-2.3, 2.4, 2.2, apev2
-static const char *frame_mapping = {
-// these tags will be displayed and edited uniformly for all tag types
- "artist", "TPE1", "TPE1", "TP1", "Artist",
- "disc", "TPOS", "TPOS", "TPA", "Disc",
- "title", "TIT2", "TIT2", "TT2", "Title",
- "album", "TALB", "TALB", "TAL", "Album",
- "copyright", "TCOP", "TCOP", "TCO", "Copyright",
- "genre", "TCON", "TCON", "TCO", "Genre",
- "composer", "TCOM", "TCOM", "TCM", "Composer",
- "year", "TYER", "TDRC", "TYE", "Year", // NOTE: TDRC and TYER are slightly different, and are converted on read/write
- "track", "TRCK", "TRCK", "TRK", "Track", // NOTE: this is special case when writing id3v2
-// misc id3v2 fields
-// these might or might not have appropriate fields in every tag type
- "BAND", "TPE2", "TPE2", "TP2", NULL,
- "ENCODER", "TENC", "TENC", "TEN", NULL,
- "BEATS_PER_MINUTE", "TBPM", "TBPM", "TBP", NULL,
- "PLAYLIST_DELAY", "TDLY", "TDLY", "TDY", NULL,
- "TEXT_WRITERS", "TEXT", "TEXT", "TXT", NULL,
- "FILE_TYPE", "TFLT", "TFLT", "TFT", NULL,
- "CONTENT_GROUP_DESCRIPTION", "TIT1", "TIT1", "TT1", NULL,
- "SUBTITLE", "TIT3", "TIT3", "TT3", NULL,
- "INITIAL_KEY", "TKEY", "TKEY", "TKE", NULL,
- "LANGUAGES", "TLAN", "TLAN", "TLA", NULL,
- "LENGTH", "TLEN", "TLEN", "TLE", NULL,
- "MEDIA_TYPE", "TMED", "TMED", "TMT", NULL,
- "ORIGINAL_ALBUM_TITLE", "TOAL", "TOAL", "TOT", NULL,
- "ORIGINAL_FILENAME", "TOFN", "TOFN", "TOF", NULL,
- "ORIGINAL_TEXT_WRITERS", "TOLY", "TOLY", "TOL", NULL,
- "ORIGINAL_ARTISTS", "TOPE", "TOPE", "TOA", NULL,
- "FILE_OWNER", "TOWN", "TOWN", NULL, NULL,
- "PERFORMER_REFINEMENT", "TPE3", "TPE3", "TP3", NULL,
- "MODIFIED_BY", "TPE4", "TPE4", "TP4", NULL,
- "PUBLISHER", "TPUB", "TPUB", "TPB", NULL,
- "INTERNET_RADIO_STATION_NAME", "TRSN", "TRSN", NULL, NULL,
- "INTERNET_RADIO_STATION_OWNER", "TRSO", "TRSO", NULL, NULL,
- "ISRC", "TSRC", "TSRC", NULL, NULL,
- "ENCODING_SOFTWARE_HARDWARE", "TSSE", "TSSE", "TSS", NULL,
- "RECORDING_TIME", NULL, "TDRC", NULL, NULL,
- "RELEASE_TIME", NULL, "TDRL", NULL, NULL,
- "TAGGING_TIME", NULL, "TDTG", NULL, NULL,
- "ALBUM_SORT_ORDER", NULL, "TSOA", NULL, NULL,
- "PERFORMER_SORT_ORDER", NULL, "TSOP", NULL, NULL,
- "TITLE_SORT_ORDER", NULL, "TSOT", NULL, NULL,
- "SIZE", "TSIZ", NULL, "TSI", NULL,
- "RECORDING_DATES", "TRDA", NULL, "TRD", NULL,
- "INVOLVED_PEOPLE_LIST", NULL, "TIPL", NULL, NULL,
- "MUSICIAN_CREDITS_LIST", NULL, "TMCL", NULL, NULL,
- "ENCODING_TIME", NULL, "TDEN", NULL, NULL,
- "ORIGINAL_RELEASE_TIME", NULL, "TDOR", NULL, NULL,
- "MOOD", NULL, "TMOO", NULL, NULL,
- "PRODUCED_NOTICE", NULL, "TPRO", NULL, NULL,
- "musicbrainz_trackid", NULL, NULL, NULL, NULL,
- NULL
-};
-
-static const char *txx_mapping = {
- "replaygain_album_gain", NULL,
- "replaygain_album_peak", NULL,
- "replaygain_track_gain", NULL,
- "replaygain_track_peak", NULL,
- NULL
-};
-
-static uint32_t
-extract_i32 (const uint8_t *buf)
-{
- uint32_t x;
- // big endian extract
-
- x = buf0;
- x <<= 8;
- x |= buf1;
- x <<= 8;
- x |= buf2;
- x <<= 8;
- x |= buf3;
-
- return x;
-}
-
-static inline uint32_t
-extract_i32_le (unsigned char *buf)
-{
- uint32_t x;
- // little endian extract
-
- x = buf3;
- x <<= 8;
- x |= buf2;
- x <<= 8;
- x |= buf1;
- x <<= 8;
- x |= buf0;
-
- return x;
-}
-
-static inline uint16_t
-extract_i16 (const uint8_t *buf)
-{
- uint16_t x;
- // big endian extract
-
- x = buf0;
- x <<= 8;
- x |= buf1;
-
- return x;
-}
-
-static inline float
-extract_f32 (unsigned char *buf) {
- float f;
- uint32_t *x = (uint32_t *)&f;
- *x = buf0;
- *x <<= 8;
- *x |= buf1;
- *x <<= 8;
- *x |= buf2;
- *x <<= 8;
- *x |= buf3;
- return f;
-}
-
-#ifdef DDB_RECODE
-
-static int
-cp1251_to_utf8(const uint8_t *in, int inlen, uint8_t *out, int outlen){
- int len = 0;
- while (inlen > 0 && outlen-len > 2) {
- uint8_t c=*in;
- if (c>=192 && c<=239) {
- *out++ = 208;
- *out++ = c - 48;
- len += 2;
- }
- else if (c>239) {
- *out++ = 209;
- *out++ = c - 112;
- len += 2;
- }
- else if (c==184) {
- *out++ = 0xd1;
- *out++ = 0x91;
- len += 2;
- }
- else if (c==168) {
- *out++ = 208;
- *out++ = 129;
- len += 2;
- }
- else {
- *out++ = c;
- len++;
- }
- in++;
- inlen--;
- }
- *out = 0;
- return len;
-}
-
-static int
-iso8859_1_to_utf8(const uint8_t *in, int inlen, uint8_t *out, int outlen){
- int len = 0;
- while (inlen > 0 && outlen-len > 2) {
- uint8_t c=*in;
-
- switch (c) {
- case 192 ... 255:
- *out++ = 195;
- *out++ = c - 64;
- len += 2;
- break;
- case 160 ... 191:
- *out++ = 0xc2;
- *out++ = c;
- len += 2;
- break;
-#define CONV2(x,y,z) case x:\
- *out++ = y;\
- *out++ = z;\
- len += 2;\
- break;
-#define CONV3(x,y,z,w) case x:\
- *out++ = y;\
- *out++ = z;\
- *out++ = w;\
- len += 3;\
- break;
- CONV2(0x9f,0xc5,0xb8);
- CONV2(0x9e,0xc5,0xbe);
- CONV3(0x9d,0xef,0xbf,0xbd);
- CONV3(0x80,0xe2,0x82,0xac);
- CONV3(0x81,0xef,0xbf,0xbd);
- CONV3(0x82,0xe2,0x80,0x9a);
- CONV2(0x83,0xc6,0x92);
- CONV3(0x84,0xe2,0x80,0x9e);
- CONV3(0x85,0xe2,0x80,0xa6);
- CONV3(0x86,0xe2,0x80,0xa0);
- CONV3(0x87,0xe2,0x80,0xa1);
- CONV2(0x88,0xcb,0x86);
- CONV3(0x89,0xe2,0x80,0xb0);
- CONV2(0x8a,0xc5,0xa0);
- CONV3(0x8b,0xe2,0x80,0xb9);
- CONV2(0x8c,0xc5,0x92);
- CONV3(0x8d,0xef,0xbf,0xbd);
- CONV2(0x8e,0xc5,0xbd);
- CONV3(0x8f,0xef,0xbf,0xbd);
- CONV3(0x90,0xef,0xbf,0xbd);
- CONV3(0x91,0xe2,0x80,0x98);
- CONV3(0x92,0xe2,0x80,0x99);
- CONV3(0x93,0xe2,0x80,0x9c);
- CONV3(0x94,0xe2,0x80,0x9d);
- CONV3(0x95,0xe2,0x80,0xa2);
- CONV3(0x96,0xe2,0x80,0x93);
- CONV3(0x97,0xe2,0x80,0x94);
- CONV2(0x98,0xcb,0x9c);
- CONV3(0x99,0xe2,0x84,0xa2);
- CONV2(0x9a,0xc5,0xa1);
- CONV3(0x9b,0xe2,0x80,0xba);
- CONV2(0x9c,0xc5,0x93);
-#undef CONV2
-#undef CONV3
- default:
- if (c >= 127) {
- trace ("iso8859 char: %d\n", c);
- }
- *out++ = c;
- len++;
- break;
- }
-
- in++;
- inlen--;
- }
- *out = 0;
- return len;
-}
-
-int ddb_iconv (const char *cs_out, const char *cs_in, char *out, int outlen, const char *in, int inlen) {
- int len = -1;
- *out = 0;
- if (inlen==0) {
- return 0;
- }
- // to utf8 branch
- if (!strcasecmp (cs_out, UTF8_STR)) {
- if (!strcasecmp (cs_in, UTF8_STR)) {
- memcpy (out, in, inlen);
- outinlen = 0;
- int valid = u8_valid (out, inlen, NULL);
- if (valid) {
- len = inlen;
- }
- }
- else if (!strcasecmp (cs_in, "cp1251")) {
- len = cp1251_to_utf8 (in, inlen, out, outlen);
- }
- else if (!strcasecmp (cs_in, "iso8859-1")) {
- len = iso8859_1_to_utf8 (in, inlen, out, outlen);
- }
- else if (!strcasecmp (cs_in, "UTF-16LE") || !strcasecmp (cs_in, "UCS-2LE")) {
- char *target = out;
- ConversionResult result = ConvertUTF16toUTF8 ((const UTF16**)&in, (const UTF16*)(in + inlen), (UTF8**)&target, (UTF8*)(out + outlen), strictConversion);
- if (result == conversionOK) {
- *target = 0;
- len = target - out;
- }
- }
- else if (!strcasecmp (cs_in, "UTF-16BE") || !strcasecmp (cs_in, "UCS-2BE")) {
- assert (0);
- // convert to big endian
- char tempinlen;
- for (int i = 0; i < inlen; i += 2) {
- tempi = ini+1;
- tempi+1 = ini;
- }
- char *target = out;
- char *src = temp;
- ConversionResult result = ConvertUTF16toUTF8 ((const UTF16**)&src, (const UTF16*)(temp + inlen), (UTF8**)&target, (UTF8*)(out + outlen), strictConversion);
- if (result == conversionOK) {
- *target = 0;
- len = target - out;
- }
- }
- else if (!strcasecmp (cs_in, "SHIFT-JIS")) {
- int len = 0;
- while (inlen > 0 && len < outlen) {
- if (*in > 0) {
- *out++ = *in++;
- inlen--;
- len++;
- }
- else if (inlen < 2) {
- return -1;
- }
- else {
- // find character in table
- uint16_t c = (((uint8_t*)in)0 << 8) | ((uint8_t*)in)1;
- int i;
- for (i = 0; sj_to_unicodei; i += 2) {
- if (c == sj_to_unicodei) {
- break;
- }
- }
- if (sj_to_unicodei) {
- // slow conversion!
- char unicode_val2 = { (sj_to_unicodei+1 & 0xff00) >> 8, sj_to_unicodei+1 & 0xff };
- char utf8_val5;
- char *src = unicode_val, *dst = utf8_val;
-
- ConversionResult res = ConvertUTF16toUTF8 ((const UTF16**)&src, (const UTF16 *)(src+2), (UTF8**)&dst, dst+5, strictConversion);
- if (res == conversionOK) {
- if (src - utf8_val < outlen-len) {
- memcpy (out, utf8_val, src - utf8_val);
- out += src - utf8_val;
- len += src - utf8_val;
- inlen -= 2;
- in += 2;
- }
- else {
- return -1;
- }
- }
- else {
- return -1;
- }
- }
- else {
- return -1; // error
- }
- }
- }
- }
- else {
- fprintf (stderr, "invalid conversion request: %s -> %s\n", cs_in, cs_out);
- }
- }
- else if (!strcasecmp (cs_in, UTF8_STR)) {
- if (!strcasecmp (cs_out, "UTF-16LE") || !strcasecmp (cs_out, "UCS-2LE")) {
- char *target = out;
- ConversionResult result = ConvertUTF8toUTF16 ((const UTF8**)&in, (const UTF8*)(in + inlen), (UTF16**)&target, (UTF16*)(out + outlen), strictConversion);
- if (result == conversionOK) {
- *target = 0;
- *(target+1) = 0;
- len = target - out;
- }
- }
- else if (!strcasecmp (cs_out, "UTF-16BE") || !strcasecmp (cs_out, "UCS-2BE")) {
- assert (0);
- char tempoutlen;
- char *target = temp;
- const char *src = in;
- ConversionResult result = ConvertUTF16toUTF8 ((const UTF16**)&src, (const UTF16*)(src + inlen), (UTF8**)&target, (UTF8*)(target + outlen), strictConversion);
- if (result == conversionOK) {
- len = target - temp;
- // convert to big endian
- for (int i = 0; i < len; i += 2) {
- outi = tempi+1;
- outi+1 = tempi;
- }
- }
- }
- else {
- fprintf (stderr, "invalid conversion request: %s -> %s\n", cs_in, cs_out);
- }
- }
- else {
- fprintf (stderr, "invalid conversion request: %s -> %s\n", cs_in, cs_out);
- }
- trace ("\0330;31mddb_iconv: %s -> %s, in: %s, out: %s\03337;0m\n", cs_in, cs_out, in, out);
- return len;
-}
-#endif
-
-int
-junk_iconv (const char *in, int inlen, char *out, int outlen, const char *cs_in, const char *cs_out) {
-// NOTE: this function must support utf8->utf8 conversion, used for validation
-#if HAVE_ICONV
- iconv_t cd = iconv_open (cs_out, cs_in);
- if (cd == (iconv_t)-1) {
- return -1;
- }
-#ifdef __linux__
- char *pin = (char*)in;
-#else
- const char *pin = in;
-#endif
-
- size_t inbytesleft = inlen;
- size_t outbytesleft = outlen;
-
- char *pout = out;
-
- size_t res = iconv (cd, &pin, &inbytesleft, &pout, &outbytesleft);
- int err = errno;
- iconv_close (cd);
-
- //trace ("iconv -f %s -t %s '%s': returned %d, inbytes %d/%d, outbytes %d/%d, errno=%d\n", cs_in, cs_out, in, (int)res, inlen, (int)inbytesleft, outlen, (int)outbytesleft, err);
- if (res == -1) {
- return -1;
- }
- outpout-out = 0;
- //trace ("iconv out: %s (len=%d)\n", out, pout - out);
- return pout - out;
-#elif defined(HAVE_ICU)
- int status = 0;
- trace ("ICU convert from %s to %s input %s\n", cs_in, cs_out, in);
- int32_t len = ucnv_convert (cs_out, cs_in, out, outlen, in, inlen, &status);
- outlen = 0;
- trace ("ICU out: %s\n", out);
- return len;
-#else
- int len = ddb_iconv (cs_out, cs_in, out, outlen, in, inlen);
- return len;
-#endif
-}
-
-
-static const char *junk_genretbl = {
- "Blues",
- "Classic Rock",
- "Country",
- "Dance",
- "Disco",
- "Funk",
- "Grunge",
- "Hip-Hop",
- "Jazz",
- "Metal",
- "New Age",
- "Oldies",
- "Other",
- "Pop",
- "R&B",
- "Rap",
- "Reggae",
- "Rock",
- "Techno",
- "Industrial",
- "Alternative",
- "Ska",
- "Death Metal",
- "Pranks",
- "Soundtrack",
- "Euro-Techno",
- "Ambient",
- "Trip-Hop",
- "Vocal",
- "Jazz+Funk",
- "Fusion",
- "Trance",
- "Classical",
- "Instrumental",
- "Acid",
- "House",
- "Game",
- "Sound Clip",
- "Gospel",
- "Noise",
- "AlternRock",
- "Bass",
- "Soul",
- "Punk",
- "Space",
- "Meditative",
- "Instrumental Pop",
- "Instrumental Rock",
- "Ethnic",
- "Gothic",
- "Darkwave",
- "Techno-Industrial",
- "Electronic",
- "Pop-Folk",
- "Eurodance",
- "Dream",
- "Southern Rock",
- "Comedy",
- "Cult",
- "Gangsta",
- "Top 40",
- "Christian Rap",
- "Pop/Funk",
- "Jungle",
- "Native American",
- "Cabaret",
- "New Wave",
- "Psychadelic",
- "Rave",
- "Showtunes",
- "Trailer",
- "Lo-Fi",
- "Tribal",
- "Acid Punk",
- "Acid Jazz",
- "Polka",
- "Retro",
- "Musical",
- "Rock & Roll",
- "Hard Rock",
- "Folk",
- "Folk-Rock",
- "National Folk",
- "Swing",
- "Fast Fusion",
- "Bebob",
- "Latin",
- "Revival",
- "Celtic",
- "Bluegrass",
- "Avantgarde",
- "Gothic Rock",
- "Progressive Rock",
- "Psychedelic Rock",
- "Symphonic Rock",
- "Slow Rock",
- "Big Band",
- "Chorus",
- "Easy Listening",
- "Acoustic",
- "Humour",
- "Speech",
- "Chanson",
- "Opera",
- "Chamber Music",
- "Sonata",
- "Symphony",
- "Booty Bass",
- "Primus",
- "Porn Groove",
- "Satire",
- "Slow Jam",
- "Club",
- "Tango",
- "Samba",
- "Folklore",
- "Ballad",
- "Power Ballad",
- "Rhythmic Soul",
- "Freestyle",
- "Duet",
- "Punk Rock",
- "Drum Solo",
- "Acapella",
- "Euro-House",
- "Dance Hall",
- "Goa",
- "Drum & Bass",
- "Club-House",
- "Hardcore",
- "Terror",
- "Indie",
- "BritPop",
- "Negerpunk",
- "Polsk Punk",
- "Beat",
- "Christian Gangsta",
- "Heavy Metal",
- "Black Metal",
- "Crossover",
- "Contemporary C",
- "Christian Rock",
- "Merengue",
- "Salsa",
- "Thrash Metal",
- "Anime",
- "JPop",
- "SynthPop",
- NULL
-};
-
-static int
-can_be_russian (const signed char *str, int size) {
- if (!enable_cp1251_detection) {
- return 0;
- }
- int latin = 0;
- int rus = 0;
- int rus_in_row = 0;
- int max_rus_row = 0;
- int n = 0;
- for (; n < size; str++, n++) {
- if ((*str >= 'A' && *str <= 'Z')
- || *str >= 'a' && *str <= 'z') {
- if (rus_in_row > max_rus_row) {
- max_rus_row = rus_in_row;
- }
- rus_in_row = 0;
- latin++;
- }
- else if (*str < 0) {
- rus_in_row++;
- rus++;
- }
- }
- if (rus > latin/2 || (max_rus_row > 4)) {
- return 1;
- }
- return 0;
-}
-
-static int
-can_be_chinese (const uint8_t *str, int sz) {
- if (!enable_cp936_detection) {
- return 0;
- }
- int len = strlen (str);
- for (int i = 0; i < sz; str++, i++) {
- if (i < len-3
- && (*str >= 0x81 && *str <= 0xFE )
- && (*(str+1) >= 0x30 && *(str+1) <= 0x39)
- && (*(str+2) >= 0x81 && *(str+2) <= 0xFE)
- && (*(str+3) >= 0x30 && *(str+3) <= 0x39)) {
- return 1;
- }
- if (i < len - 1
- && (*str >= 0x81 && *str <= 0xFE )
- && ((*(str+1) >= 0x40 && *(str+1) <= 0x7E)
- || (*(str+1) >= 0x80 && *(str+1) <= 0xFE))) {
- return 1;
- }
- }
- return 0;
-}
-
-static int
-can_be_shift_jis (const unsigned char *str, int size) {
- unsigned char outsize*4;
-
- if (size < 2) {
- return 0;
- }
-
- const unsigned char *p = str;
- int s = size;
- while (s >= 2) {
- if ((((p0 >= 0x81 && p0 <= 0x84) || (p0 >= 0x87 && p0 <= 0x9f))
- && ((p1 >= 0x40 && p1 <= 0x9e) || (p1 >= 0x9f && p1 <= 0xfc)))
- || ((p0 >= 0xe0 && p0 <= 0xef)
- && ((p1 >= 0x40 && p1 <= 0x9e) || (p1 >= 0x9f && p1 <= 0xfc)))) {
- break;
- }
- s--;
- p++;
- }
-
- if (s >= 2) {
- if (junk_iconv (str, size, out, sizeof (out), "shift-jis", UTF8_STR) >= 0) {
- return 1;
- }
- }
- return 0;
-
-}
-
-
-static char *
-convstr_id3v2 (int version, uint8_t encoding, const unsigned char* str, int sz) {
- char out2048 = "";
- const char *enc = NULL;
-
- // detect encoding
- if (version == 4 && encoding == 2) {
- enc = "UTF-16BE";
- }
- else if (version == 4 && encoding == 3) {
- enc = UTF8_STR;
- }
- else if (encoding == 0) {
- if (can_be_chinese (str, sz)) {
- // hack to add cp936 support
- enc = "cp936";
- }
- else if (can_be_russian (str, sz)) {
- // hack to add limited cp1251 recoding support
- enc = "cp1251";
- }
- else {
- enc = "iso8859-1";
- }
- }
- else if (encoding != 1 && !(version == 4 && encoding == 3)){
- return NULL; // invalid encoding
- }
-
- if (encoding == 1) { // detect kind of unicode used
- if (sz < 2) {
- return NULL;
- }
- if (version < 4) {
- if (str0 == 0xff && str1 == 0xfe) {
- enc = "UCS-2LE";
- str += 2;
- sz -= 2;
- }
- else if (str1 == 0xff && str0 == 0xfe) {
- enc = "UCS-2BE";
- str += 2;
- sz -= 2;
- }
- else {
- trace ("invalid ucs-2 signature %x %x\n", (int)str0, (int)str1);
- enc = "UCS-2LE";
- // NOTE: this is an assumption, might break in the future.
- }
- }
- else {
- enc = "UTF-16";
- }
- }
-
- trace ("encoding: %s\n", enc);
-
- int converted_sz = 0;
-
- if ((converted_sz = junk_iconv (str, sz, out, sizeof (out), enc, UTF8_STR)) < 0) {
- return NULL;
- }
-// trace ("%s -> %s\n", str, out);
- int n;
- for (n = 0; n < converted_sz; n++) {
- if (outn == 0 && n != converted_sz-1) {
- outn = '\n';
- }
- }
- // trim trailing linebreaks
- for (n = converted_sz-1; n >= 0; n--) {
- if ((uint8_t)outn <= 32) {
- outn = 0;
- }
- else {
- break;
- }
- }
- return strdup (out);
-}
-
-static const char *
-convstr_id3v1 (const char* str, int sz, const char *charset) {
- if (!charset) {
- return str;
- }
- static char out2048;
- int i;
- for (i = 0; i < sz; i++) {
- if (stri != ' ') {
- break;
- }
- }
- if (i == sz) {
- out0 = 0;
- return out;
- }
-
- int len = junk_iconv (str, sz, out, sizeof (out), charset, UTF8_STR);
- if (len >= 0) {
- return out;
- }
- return NULL;
-}
-
-static void
-str_trim_right (uint8_t *str, int len) {
- uint8_t *p = str + len - 1;
- while (p >= str && *p <= 0x20) {
- p--;
- }
- p++;
- *p = 0;
-}
-
-int
-junk_id3v1_read_int (playItem_t *it, char *buffer, const char **charset) {
- if (!buffer) {
- return -1;
- }
-
- if (it) {
- if (memcmp (buffer, "TAG", 3)) {
- return -1; // no tag
- }
- const char *cs = NULL;
- charset = &cs;
- int res = junk_id3v1_read_int (NULL, buffer, charset);
- if (res) {
- return res;
- }
- }
-
- if (!charset) {
- return -1;
- }
-
- char title31;
- char artist31;
- char album31;
- char year5;
- char comment31;
- uint8_t genreid;
- uint8_t tracknum;
- const char *genre = NULL;
- memset (title, 0, 31);
- memset (artist, 0, 31);
- memset (album, 0, 31);
- memset (year, 0, 5);
- memset (comment, 0, 31);
- memcpy (title, &buffer3, 30);
- str_trim_right (title, 30);
- memcpy (artist, &buffer3+30, 30);
- str_trim_right (artist, 30);
- memcpy (album, &buffer3+60, 30);
- str_trim_right (album, 30);
- memcpy (year, &buffer3+90, 4);
- str_trim_right (year, 4);
- memcpy (comment, &buffer3+94, 30);
- str_trim_right (comment, 30);
- genreid = buffer3+124;
- tracknum = 0;
- if (it) {
- if (comment28 == 0 && comment29 != 0) {
- tracknum = comment29;
- }
-
- // 255 = "None",
- // "CR" = "Cover" (id3v2)
- // "RX" = "Remix" (id3v2)
- if (genreid == 0xff) {
- //genre = "None";
- }
- else if (genreid <= 147) {
- genre = junk_genretblgenreid;
- }
- }
-
- // add meta
-// trace ("%s - %s - %s - %s - %s - %s\n", title, artist, album, year, comment, genre);
- if (!it) {
- char buf129;
- char *p = buf;
- strcpy (p, title);
- p += strlen (title);
- strcpy (p, artist);
- p += strlen (artist);
- strcpy (p, album);
- p += strlen (album);
- strcpy (p, year);
- p += strlen (year);
- strcpy (p, comment);
- *charset = junk_detect_charset (buf);
- return 0;
- }
-
- if (*title) {
- pl_add_meta (it, "title", convstr_id3v1 (title, strlen (title), *charset));
- }
- if (*artist) {
- pl_add_meta (it, "artist", convstr_id3v1 (artist, strlen (artist), *charset));
- }
- if (*album) {
- pl_add_meta (it, "album", convstr_id3v1 (album, strlen (album), *charset));
- }
- if (*year) {
- pl_add_meta (it, "year", year);
- }
- if (*comment) {
- pl_add_meta (it, "comment", convstr_id3v1 (comment, strlen (comment), *charset));
- }
- if (genre && *genre) {
- pl_add_meta (it, "genre", convstr_id3v1 (genre, strlen (genre), *charset));
- }
- if (tracknum != 0) {
- char s4;
- snprintf (s, 4, "%d", tracknum);
- pl_add_meta (it, "track", s);
- }
-
- uint32_t f = pl_get_item_flags (it);
- f |= DDB_TAG_ID3V1;
- pl_set_item_flags (it, f);
-
- return 0;
-}
-
-// should read both id3v1 and id3v1.1
-int
-junk_id3v1_read (playItem_t *it, DB_FILE *fp) {
- uint8_t id3128;
-
- if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
- return -1;
- }
- if (deadbeef->fread (id3, 1, 128, fp) != 128) {
- return -1;
- }
-
- return junk_id3v1_read_int (it, id3, NULL);
-}
-
-int
-junk_id3v1_write2 (int fd, playItem_t *it, const char *enc) {
- char title30 = "";
- char artist30 = "";
- char album30 = "";
- char year4 = "";
- char comment28 = "";
- uint8_t genreid = 0xff;
- uint8_t tracknum = 0;
-
- const char *meta;
-
- pl_lock ();
-
-#define conv(name, store) {\
- memset (store, 0x20, sizeof (store));\
- meta = pl_find_meta (it, name);\
- if (meta) {\
- char temp1000;\
- int l = junk_iconv (meta, strlen (meta), temp, sizeof (temp), UTF8_STR, enc);\
- if (l == -1) {\
- memset (store, 0, sizeof (store));\
- }\
- else {\
- strncpy (store, temp, sizeof (store));\
- }\
- char *cr = strchr (store, '\n');\
- if (cr) {\
- *cr = 0;\
- }\
- }\
-}
-
- conv ("title", title);
- conv ("artist", artist);
- conv ("album", album);
- conv ("year", year);
- conv ("comment", comment);
-
-#undef conv
-
- // tracknum
- meta = pl_find_meta (it, "track");
- if (meta) {
- tracknum = atoi (meta);
- }
-
- // find genre
- meta = pl_find_meta (it, "genre");
- if (meta) {
- for (int i = 0; junk_genretbli; i++) {
- if (!strcasecmp (meta, junk_genretbli)) {
- genreid = i;
- break;
- }
- }
- }
-
- pl_unlock ();
-
- if (write (fd, "TAG", 3) != 3) {
- trace ("junk_id3v1_write: failed to write signature\n");
- return -1;
- }
- if (write (fd, title, sizeof (title)) != sizeof (title)) {
- trace ("junk_id3v1_write: failed to write title\n");
- return -1;
- }
- if (write (fd, artist, sizeof (artist)) != sizeof (artist)) {
- trace ("junk_id3v1_write: failed to write artist\n");
- return -1;
- }
- if (write (fd, album, sizeof (album)) != sizeof (album)) {
- trace ("junk_id3v1_write: failed to write album\n");
- return -1;
- }
- if (write (fd, year, sizeof (year)) != sizeof (year)) {
- trace ("junk_id3v1_write: failed to write year\n");
- return -1;
- }
- if (write (fd, comment, sizeof (comment)) != sizeof (comment)) {
- trace ("junk_id3v1_write: failed to write comment\n");
- return -1;
- }
- uint8_t zero = 0;
- if (write (fd, &zero, 1) != 1) {
- trace ("junk_id3v1_write: failed to write id3v1.1 marker\n");
- return -1;
- }
- if (write (fd, &tracknum, 1) != 1) {
- trace ("junk_id3v1_write: failed to write track\n");
- return -1;
- }
- if (write (fd, &genreid, 1) != 1) {
- trace ("junk_id3v1_write: failed to write genre\n");
- return -1;
- }
- return 0;
-}
-
-int
-junk_id3v1_write (FILE *fp, playItem_t *it, const char *enc) {
- char title30 = "";
- char artist30 = "";
- char album30 = "";
- char year4 = "";
- char comment28 = "";
- uint8_t genreid = 0xff;
- uint8_t tracknum = 0;
-
- const char *meta;
-
- pl_lock ();
-
-#define conv(name, store) {\
- memset (store, 0x20, sizeof (store));\
- meta = pl_find_meta (it, name);\
- if (meta) {\
- char temp1000;\
- int l = junk_iconv (meta, strlen (meta), temp, sizeof (temp), UTF8_STR, enc);\
- if (l == -1) {\
- memset (store, 0, sizeof (store));\
- }\
- else {\
- strncpy (store, temp, sizeof (store));\
- }\
- char *cr = strchr (store, '\n');\
- if (cr) {\
- *cr = 0;\
- }\
- }\
-}
-
- conv ("title", title);
- conv ("artist", artist);
- conv ("album", album);
- conv ("year", year);
- conv ("comment", comment);
-
-#undef conv
-
- // tracknum
- meta = pl_find_meta (it, "track");
- if (meta) {
- tracknum = atoi (meta);
- }
-
- // find genre
- meta = pl_find_meta (it, "genre");
- if (meta) {
- for (int i = 0; junk_genretbli; i++) {
- if (!strcasecmp (meta, junk_genretbli)) {
- genreid = i;
- break;
- }
- }
- }
-
- pl_unlock ();
-
- if (fwrite ("TAG", 1, 3, fp) != 3) {
- trace ("junk_id3v1_write: failed to write signature\n");
- return -1;
- }
- if (fwrite (title, 1, sizeof (title), fp) != sizeof (title)) {
- trace ("junk_id3v1_write: failed to write title\n");
- return -1;
- }
- if (fwrite (artist, 1, sizeof (artist), fp) != sizeof (artist)) {
- trace ("junk_id3v1_write: failed to write artist\n");
- return -1;
- }
- if (fwrite (album, 1, sizeof (album), fp) != sizeof (album)) {
- trace ("junk_id3v1_write: failed to write album\n");
- return -1;
- }
- if (fwrite (year, 1, sizeof (year), fp) != sizeof (year)) {
- trace ("junk_id3v1_write: failed to write year\n");
- return -1;
- }
- if (fwrite (comment, 1, sizeof (comment), fp) != sizeof (comment)) {
- trace ("junk_id3v1_write: failed to write comment\n");
- return -1;
- }
- uint8_t zero = 0;
- if (fwrite (&zero, 1, 1, fp) != 1) {
- trace ("junk_id3v1_write: failed to write id3v1.1 marker\n");
- return -1;
- }
- if (fwrite (&tracknum, 1, 1, fp) != 1) {
- trace ("junk_id3v1_write: failed to write track\n");
- return -1;
- }
- if (fwrite (&genreid, 1, 1, fp) != 1) {
- trace ("junk_id3v1_write: failed to write genre\n");
- return -1;
- }
- return 0;
-}
-
-int64_t
-junk_id3v1_find2 (DB_FILE *fp) {
- uint8_t buffer3;
- if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
- return -1;
- }
- if (deadbeef->fread (buffer, 1, 3, fp) != 3) {
- return -1;
- }
- if (memcmp (buffer, "TAG", 3)) {
- return -1; // no tag
- }
- return deadbeef->ftell (fp) - 3;
-}
-
-int
-junk_id3v1_find (DB_FILE *fp) {
- int64_t pos = junk_id3v1_find2 (fp);
- // 32 bit overflow protection
- if (pos > 0x7fffffff) {
- return -1;
- }
- return pos;
-}
-
-int64_t
-junk_apev2_find2 (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems) {
- uint8_t header32;
- if (deadbeef->fseek (fp, -32, SEEK_END) == -1) {
- return -1; // something bad happened
- }
-
- if (deadbeef->fread (header, 1, 32, fp) != 32) {
- return -1; // something bad happened
- }
- if (strncmp (header, "APETAGEX", 8)) {
- // try to skip 128 bytes backwards (id3v1)
- if (deadbeef->fseek (fp, -128-32, SEEK_END) == -1) {
- return -1; // something bad happened
- }
- if (deadbeef->fread (header, 1, 32, fp) != 32) {
- return -1; // something bad happened
- }
- if (strncmp (header, "APETAGEX", 8)) {
- return -1; // no ape tag here
- }
- }
-
- uint32_t version = extract_i32_le (&header8);
- int32_t size = extract_i32_le (&header12);
- uint32_t numitems = extract_i32_le (&header16);
- uint32_t flags = extract_i32_le (&header20);
-
- trace ("APEv%d, size=%d, items=%d, flags=%x\n", version, size, numitems, flags);
-
- // size contains footer, but not header, so add header size
- if (flags & (1<<31)) {
- size += 32;
- }
-
- // seek to beginning of the tag/header
- if (deadbeef->fseek (fp, -size, SEEK_CUR) == -1) {
- trace ("failed to seek to tag start (-%d)\n", size);
- return -1;
- }
- *psize = size;
- *pflags = flags;
- *pnumitems = numitems;
- return deadbeef->ftell (fp);
-}
-
-int
-junk_apev2_find (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems) {
- int64_t pos = junk_apev2_find2 (fp, psize, pflags, pnumitems);
- // 32 bit overflow protection
- if (pos > 0x7fffffff) {
- return -1;
- }
- return pos;
-}
-
-int
-junk_find_id3v1 (DB_FILE *fp) {
- if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
- return -1;
- }
- char buffer3;
- if (deadbeef->fread (buffer, 1, 3, fp) != 3) {
- return -1;
- }
- if (memcmp (buffer, "TAG", 3)) {
- return -1; // no tag
- }
- return deadbeef->ftell (fp) - 3;
-}
-
-int
-junk_add_track_meta (playItem_t *it, const char *track) {
- char *slash = strchr (track, '/');
- if (slash) {
- // split into track/number
- *slash = 0;
- slash++;
- pl_add_meta (it, "numtracks", slash);
- }
- pl_add_meta (it, "track", track);
- return 0;
-}
-
-int
-junk_apev2_add_frame (playItem_t *it, DB_apev2_tag_t *tag_store, DB_apev2_frame_t **tail, uint32_t itemsize, uint32_t itemflags, const char *key, const uint8_t *value) {
- if (tag_store) {
- DB_apev2_frame_t *frm = malloc (sizeof (DB_apev2_frame_t) + itemsize);
- memset (frm, 0, sizeof (DB_apev2_tag_t));
- frm->flags = itemflags;
- strcpy (frm->key, key);
- trace ("*** stored frame %s flags %X\n", key, itemflags);
- frm->size = itemsize;
- memcpy (frm->data, value, itemsize);
- if (*tail) {
- (*tail)->next = frm;
- }
- else {
- tag_store->frames = frm;
- }
- *tail = frm;
- }
-
- if (it) {
- int valuetype = ((itemflags >> 1) & 3);
- // add metainfo only if it's textual
- if (valuetype == 0 && (itemsize < MAX_TEXT_FRAME_SIZE || (!strcasecmp (key, "cuesheet") && itemsize < MAX_CUESHEET_FRAME_SIZE))) {
- if (!u8_valid (value, itemsize, NULL)) {
- trace ("junk_read_ape_full: bad encoding in text frame %s\n", key);
- return -1;
- }
-
- int m;
- for (m = 0; frame_mappingm; m += FRAME_MAPPINGS) {
- if (frame_mappingm + MAP_APEV2 && !strcasecmp (key, frame_mappingm + MAP_APEV2)) {
- if (!strcmp (frame_mappingm+MAP_DDB, "track")) {
- junk_add_track_meta (it, value);
- }
- else {
- trace ("pl_append_meta %s %s\n", frame_mappingm+MAP_DDB, value);
- pl_append_meta (it, frame_mappingm+MAP_DDB, value);
- }
- break;
- }
- }
-
- trace ("apev2 %s=%s\n", key, value);
-
- if (!frame_mappingm) {
- if (!strncasecmp (key, "replaygain_album_gain", 21)) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, atof (value));
- trace ("album_gain=%s\n", value);
- }
- else if (!strncasecmp (key, "replaygain_album_peak", 21)) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, atof (value));
- trace ("album_peak=%s\n", value);
- }
- else if (!strncasecmp (key, "replaygain_track_gain", 21)) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, atof (value));
- trace ("track_gain=%s\n", value);
- }
- else if (!strncasecmp (key, "replaygain_track_peak", 21)) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, atof (value));
- trace ("track_peak=%s\n", value);
- }
- else {
- trace ("%s=%s\n", key, value);
- pl_append_meta (it, key, value);;
- }
- }
- }
- }
- return 0;
-}
-
-int
-junk_apev2_read_full_mem (playItem_t *it, DB_apev2_tag_t *tag_store, char *mem, int memsize) {
- char *end = mem+memsize;
-#define STEP(x,y) {mem+=(x);if(mem+(y)>end) {trace ("fail %d\n", (x));return -1;}}
-
- char *header = mem;
-
- DB_apev2_frame_t *tail = NULL;
-
- uint32_t version = extract_i32_le (&header0);
- int32_t size = extract_i32_le (&header4);
- uint32_t numitems = extract_i32_le (&header8);
- uint32_t flags = extract_i32_le (&header12);
-
- trace ("APEv%d, size=%d, items=%d, flags=%x\n", version, size, numitems, flags);
- if (it) {
- uint32_t f = pl_get_item_flags (it);
- f |= DDB_TAG_APEV2;
- pl_set_item_flags (it, f);
- }
-
- STEP(24, 8);
-
- int i;
- for (i = 0; i < numitems; i++) {
- trace ("reading item %d\n", i);
- uint8_t *buffer = mem;
-
- uint32_t itemsize = extract_i32_le (&buffer0);
- uint32_t itemflags = extract_i32_le (&buffer4);
-
- STEP(8, 1);
- trace ("size=%d, flags=%x\n", itemsize, itemflags);
-
- // read key until 0 (stupid and slow)
- char key256;
- int keysize = 0;
- while (keysize <= 255 && mem < end) {
- keykeysize = *mem;
- mem++;
- if (keykeysize == 0) {
- break;
- }
- if (keykeysize < 0x20) {
- trace ("nonascii chars\n");
- return -1; // non-ascii chars and chars with codes 0..0x1f not allowed in ape item keys
- }
- keysize++;
- }
- key255 = 0;
- trace ("item %d, size %d, flags %08x, keysize %d, key %s\n", i, itemsize, itemflags, keysize, key);
- // read value
- if (itemsize <= MAX_APEV2_FRAME_SIZE) // just a sanity check
- {
- STEP(0,itemsize);
- uint8_t *value = malloc (itemsize+1);
- if (!value) {
- trace ("junk_read_ape_full: failed to allocate %d bytes\n", itemsize+1);
- return -1;
- }
- memcpy (value, mem, itemsize);
- valueitemsize = 0;
-
- // replace 0s with \n
- uint8_t *p = value;
- while (p < value + itemsize - 1) {
- if (*p == 0) {
- *p = '\n';
- }
- p++;
- }
-
- junk_apev2_add_frame (it, tag_store, &tail, itemsize, itemflags, key, value);
-
- free (value);
- STEP(itemsize, 8);
- }
- else {
- STEP(itemsize,8);
- }
- }
- return 0;
-}
-
-int
-junk_apev2_read_full (playItem_t *it, DB_apev2_tag_t *tag_store, DB_FILE *fp) {
- // try to read footer, position must be already at the EOF right before
- // id3v1 (if present)
-
- DB_apev2_frame_t *tail = NULL;
-
- uint8_t header32;
- if (deadbeef->fseek (fp, -32, SEEK_END) == -1) {
- return -1; // something bad happened
- }
-
- if (deadbeef->fread (header, 1, 32, fp) != 32) {
- return -1; // something bad happened
- }
- if (strncmp (header, "APETAGEX", 8)) {
- // try to skip 128 bytes backwards (id3v1)
- if (deadbeef->fseek (fp, -128-32, SEEK_END) == -1) {
- return -1; // something bad happened
- }
- if (deadbeef->fread (header, 1, 32, fp) != 32) {
- return -1; // something bad happened
- }
- if (strncmp (header, "APETAGEX", 8)) {
- return -1; // no ape tag here
- }
- }
-
- // end of footer must be 0
-// if (memcmp (&header24, "\0\0\0\0\0\0\0\0", 8)) {
-// trace ("bad footer\n");
-// return -1;
-// }
-
- uint32_t version = extract_i32_le (&header8);
- int32_t size = extract_i32_le (&header12);
- uint32_t numitems = extract_i32_le (&header16);
- uint32_t flags = extract_i32_le (&header20);
-
- trace ("APEv%d, size=%d, items=%d, flags=%x\n", version, size, numitems, flags);
- if (it) {
- uint32_t f = pl_get_item_flags (it);
- f |= DDB_TAG_APEV2;
- pl_set_item_flags (it, f);
- }
-
- // now seek to beginning of the tag (exluding header)
- if (deadbeef->fseek (fp, -size, SEEK_CUR) == -1) {
- trace ("failed to seek to tag start (-%d)\n", size);
- return -1;
- }
-
- int i;
- for (i = 0; i < numitems; i++) {
- uint8_t buffer8;
- if (deadbeef->fread (buffer, 1, 8, fp) != 8) {
- return -1;
- }
- uint32_t itemsize = extract_i32_le (&buffer0);
- uint32_t itemflags = extract_i32_le (&buffer4);
-
- // read key until 0 (stupid and slow)
- char key256;
- int keysize = 0;
- while (keysize <= 255) {
- if (deadbeef->fread (&keykeysize, 1, 1, fp) != 1) {
- return -1;
- }
- if (keykeysize == 0) {
- break;
- }
- if (keykeysize < 0x20) {
- return -1; // non-ascii chars and chars with codes 0..0x1f not allowed in ape item keys
- }
- keysize++;
- }
- key255 = 0;
- trace ("item %d, size %d, flags %08x, keysize %d, key %s\n", i, itemsize, itemflags, keysize, key);
- // read value
- if (itemsize <= MAX_APEV2_FRAME_SIZE) // just a sanity check
- {
- uint8_t *value = malloc (itemsize+1);
- if (!value) {
- trace ("junk_read_ape_full: failed to allocate %d bytes\n", itemsize+1);
- return -1;
- }
- if (deadbeef->fread (value, 1, itemsize, fp) != itemsize) {
- trace ("junk_read_ape_full: failed to read %d bytes from file\n", itemsize);
- free (value);
- return -1;
- }
- valueitemsize = 0;
-
- if ((flags&6) == 0 && strncasecmp (key, "cover art ", 10)) {
- // replace 0s with \n
- uint8_t *p = value;
- while (p < value + itemsize - 1) {
- if (*p == 0) {
- *p = '\n';
- }
- p++;
- }
- }
-
- junk_apev2_add_frame (it, tag_store, &tail, itemsize, itemflags, key, value);
- free (value);
- }
- else {
- // try to skip
- int err = deadbeef->fseek (fp, itemsize, SEEK_CUR);
- if (0 != err) {
- perror ("junklib: corrupted APEv2 tag\n");
- return -1;
- }
- }
- }
-
- return 0;
-}
-
-int
-junk_apev2_read (playItem_t *it, DB_FILE *fp) {
- return junk_apev2_read_full (it, NULL, fp);
-}
-
-int
-junk_apev2_read_mem (playItem_t *it, char *mem, int size) {
- return junk_apev2_read_full_mem (it, NULL, mem, size);
-}
-
-int
-junk_id3v2_find (DB_FILE *fp, int *psize) {
- if (deadbeef->fseek (fp, 0, SEEK_SET) == -1) {
- trace ("junk_id3v2_find: seek error\n");
- return -1;
- }
- uint8_t header10;
- int pos = deadbeef->ftell (fp);
- if (pos == -1) {
- trace ("junk_id3v2_find: ftell error\n");
- return -1;
- }
- if (deadbeef->fread (header, 1, 10, fp) != 10) {
- trace ("junk_id3v2_find: read error\n");
- return -1; // too short
- }
- if (strncmp (header, "ID3", 3)) {
- return -1; // no tag
- }
- uint8_t flags = header5;
- if (flags & 15) {
- return -1; // unsupported
- }
- int footerpresent = (flags & (1<<4)) ? 1 : 0;
- // check for bad size
- if ((header9 & 0x80) || (header8 & 0x80) || (header7 & 0x80) || (header6 & 0x80)) {
- return -1; // bad header
- }
- uint32_t size = (header9 << 0) | (header8 << 7) | (header7 << 14) | (header6 << 21);
- //trace ("junklib: leading junk size %d\n", size);
- *psize = size + 10 + 10 * footerpresent;
- return pos;
-}
-
-int
-junk_get_leading_size_stdio (FILE *fp) {
- uint8_t header10;
- int pos = ftell (fp);
- if (fread (header, 1, 10, fp) != 10) {
- fseek (fp, pos, SEEK_SET);
- return -1; // too short
- }
- fseek (fp, pos, SEEK_SET);
- if (strncmp (header, "ID3", 3)) {
- return -1; // no tag
- }
- uint8_t flags = header5;
- if (flags & 15) {
- return -1; // unsupported
- }
- int footerpresent = (flags & (1<<4)) ? 1 : 0;
- // check for bad size
- if ((header9 & 0x80) || (header8 & 0x80) || (header7 & 0x80) || (header6 & 0x80)) {
- return -1; // bad header
- }
- uint32_t size = (header9 << 0) | (header8 << 7) | (header7 << 14) | (header6 << 21);
- //trace ("junklib: leading junk size %d\n", size);
- return size + 10 + 10 * footerpresent;
-}
-
-int
-junk_get_leading_size (DB_FILE *fp) {
- uint8_t header10;
- int pos = deadbeef->ftell (fp);
- if (deadbeef->fread (header, 1, 10, fp) != 10) {
- deadbeef->fseek (fp, pos, SEEK_SET);
- trace ("junk_get_leading_size: file is too short\n");
- return -1; // too short
- }
- deadbeef->fseek (fp, pos, SEEK_SET);
- if (strncmp (header, "ID3", 3)) {
- trace ("junk_get_leading_size: no id3v2 found\n");
- return -1; // no tag
- }
- uint8_t flags = header5;
- if (flags & 15) {
- trace ("unsupported flags in id3v2\n");
- return -1; // unsupported
- }
- int footerpresent = (flags & (1<<4)) ? 1 : 0;
- // check for bad size
- if ((header9 & 0x80) || (header8 & 0x80) || (header7 & 0x80) || (header6 & 0x80)) {
- trace ("bad header in id3v2\n");
- return -1; // bad header
- }
- uint32_t size = (header9 << 0) | (header8 << 7) | (header7 << 14) | (header6 << 21);
- //trace ("junklib: leading junk size %d\n", size);
- return size + 10 + 10 * footerpresent;
-}
-
-int
-junk_id3v2_unsync (uint8_t *out, int len, int maxlen) {
- uint8_t buf maxlen;
- uint8_t *p = buf;
- int res = -1;
- for (int i = 0; i < len; i++) {
- *p++ = outi;
- if (i < len - 1 && outi == 0xff && (outi+1 & 0xe0) == 0xe0) {
- *p++ = 0;
- res = 0;
- }
- }
- if (!res) {
- res = p-buf;
- memcpy (out, buf, res);
- }
- return res;
-}
-
-int
-junk_id3v2_remove_frames (DB_id3v2_tag_t *tag, const char *frame_id) {
- DB_id3v2_frame_t *prev = NULL;
- for (DB_id3v2_frame_t *f = tag->frames; f; ) {
- DB_id3v2_frame_t *next = f->next;
- if (!strcmp (f->id, frame_id)) {
- if (prev) {
- prev->next = f->next;
- }
- else {
- tag->frames = f->next;
- }
- free (f);
- }
- else {
- prev = f;
- }
- f = next;
- }
- return 0;
-}
-
-// this function will split multiline values into separate frames
-DB_id3v2_frame_t *
-junk_id3v2_add_text_frame (DB_id3v2_tag_t *tag, const char *frame_id, const char *value) {
- // copy value to handle multiline strings
- size_t inlen = strlen (value);
- char bufferinlen;
- char *pp = buffer;
- for (const char *p = value; *p; p++) {
- if (*p == '\n') {
- *pp++ = 0;
- if (tag->version0 == 3) {
- inlen = p - value;
- break;
- }
- }
- else {
- *pp++ = *p;
- }
- }
-
- if (!inlen) {
- return NULL;
- }
- uint8_t out2048;
-
- trace ("junklib: setting id3v2.%d text frame '%s' = '%s'\n", tag->version0, frame_id, value);
-
- int encoding = 0;
-
- size_t outlen = -1;
- if (tag->version0 == 4) {
- outlen = inlen;
- memcpy (out, value, inlen);
- encoding = 3;
- }
- else {
- outlen = junk_iconv (value, inlen, out, sizeof (out), UTF8_STR, "ISO-8859-1");
- if (outlen == -1) {
- outlen = junk_iconv (value, inlen, out+2, sizeof (out) - 2, UTF8_STR, "UCS-2LE");
- if (outlen <= 0) {
- return NULL;
- }
- out0 = 0xff;
- out1 = 0xfe;
- outlen += 2;
- trace ("successfully converted to ucs-2le (size=%d, bom: %x %x)\n", outlen, out0, out1);
- encoding = 1;
- }
- else {
- trace ("successfully converted to iso8859-1 (size=%d)\n", outlen);
- }
- }
-
- // make a frame
- int size = outlen + 1;
- trace ("calculated frame size = %d\n", size);
- DB_id3v2_frame_t *f = malloc (size + sizeof (DB_id3v2_frame_t));
- memset (f, 0, sizeof (DB_id3v2_frame_t));
- strcpy (f->id, frame_id);
- f->size = size;
- f->data0 = encoding;
- memcpy (f->data + 1, out, outlen);
- // append to tag
- DB_id3v2_frame_t *tail = NULL;
-
- for (tail = tag->frames; tail && tail->next; tail = tail->next);
-
- if (tail) {
- tail->next = f;
- }
- else {
- tag->frames = f;
- }
- tail = f;
-
- return tail;
-}
-
-DB_id3v2_frame_t *
-junk_id3v2_add_comment_frame (DB_id3v2_tag_t *tag, const char *lang, const char *descr, const char *value) {
- trace ("junklib: setting 2.3 COMM frame lang=%s, descr='%s', data='%s'\n", lang, descr, value);
-
- // make a frame
- int descrlen = strlen (descr);
- int outlen = strlen (value);
-
- char inputdescrlen+outlen+1;
- memcpy (input, descr, descrlen);
- inputdescrlen = 0;
- memcpy (input+descrlen+1, value, outlen);
-
- char buffer2048;
- int enc = 0;
- int l;
-
- if (tag->version0 == 4) {
- // utf8
- enc = 3;
- memcpy (buffer, input, sizeof (input));
- l = sizeof (input);
- }
- else {
- l = junk_iconv (input, sizeof (input), buffer, sizeof (buffer), UTF8_STR, "iso8859-1");
- if (l <= 0) {
- l = junk_iconv (input, sizeof (input), buffer+2, sizeof (buffer) - 2, UTF8_STR, "UCS-2LE");
- if (l <= 0) {
- trace ("failed to encode to ucs2 or iso8859-1\n");
- return NULL;
- }
- else {
- enc = 1;
- buffer0 = 0xff;
- buffer1 = 0xfe;
- l += 2;
- }
- }
- }
-
- trace ("calculated frame size = %d\n", l + 4);
- DB_id3v2_frame_t *f = malloc (l + 4 + sizeof (DB_id3v2_frame_t));
- memset (f, 0, sizeof (DB_id3v2_frame_t));
- strcpy (f->id, "COMM");
- // flags are all zero
- f->size = l + 4;
- f->data0 = enc; // encoding=utf8
- memcpy (&f->data1, lang, 3);
- memcpy (&f->data4, buffer, l);
- // append to tag
- DB_id3v2_frame_t *tail;
- for (tail = tag->frames; tail && tail->next; tail = tail->next);
- if (tail) {
- tail->next = f;
- }
- else {
- tag->frames = f;
- }
-
- return f;
-}
-
-int
-junk_id3v2_remove_txxx_frame (DB_id3v2_tag_t *tag, const char *key) {
- DB_id3v2_frame_t *prev = NULL;
- for (DB_id3v2_frame_t *f = tag->frames; f; ) {
- DB_id3v2_frame_t *next = f->next;
- if (!strcmp (f->id, "TXXX")) {
- char *txx = convstr_id3v2 (tag->version0, f->data0, f->data+1, f->size-1);
- if (txx && !strncasecmp (txx, key, strlen (key))) {
- if (prev) {
- prev->next = f->next;
- }
- else {
- tag->frames = f->next;
- }
- free (f);
- }
- if (txx) {
- free (txx);
- }
- }
- else {
- prev = f;
- }
- f = next;
- }
- return 0;
-}
-
-int
-junk_id3v2_remove_all_txxx_frames (DB_id3v2_tag_t *tag) {
- DB_id3v2_frame_t *prev = NULL;
- for (DB_id3v2_frame_t *f = tag->frames; f; ) {
- DB_id3v2_frame_t *next = f->next;
- if (!strcmp (f->id, "TXXX")) {
- if (prev) {
- prev->next = f->next;
- }
- else {
- tag->frames = f->next;
- }
- free (f);
- }
- else {
- prev = f;
- }
- f = next;
- }
- return 0;
-}
-
-DB_id3v2_frame_t *
-junk_id3v2_add_txxx_frame (DB_id3v2_tag_t *tag, const char *key, const char *value) {
- int keylen = strlen (key);
- int valuelen = strlen (value);
- int len = keylen + valuelen + 1;
- uint8_t bufferlen;
- memcpy (buffer, key, keylen);
- bufferkeylen = 0;
- memcpy (buffer+keylen+1, value, valuelen);
- 
- uint8_t out2048;
- int encoding = 0;
-
-
- int res;
-
- if (tag->version0 == 4) {
- res = len;
- encoding = 3;
- memcpy (out, key, keylen);
- outkeylen = 0;
- memcpy (out + keylen + 1, value, valuelen);
- }
- else { // version 3
- res = junk_iconv (buffer, len, out, sizeof (out), UTF8_STR, "ISO-8859-1");
- if (res == -1) {
- res = junk_iconv (buffer, len, out+2, sizeof (out) - 2, UTF8_STR, "UCS-2LE");
- if (res == -1) {
- return NULL;
- }
- out0 = 0xff;
- out1 = 0xfe;
- res += 2;
- trace ("successfully converted to ucs-2le (size=%d, bom: %x %x)\n", res, out0, out1);
- encoding = 1;
- }
- else {
- trace ("successfully converted to iso8859-1 (size=%d)\n", res);
- }
- }
-
- // make a frame
- int size = res + 1;
- trace ("calculated frame size = %d\n", size);
- DB_id3v2_frame_t *f = malloc (size + sizeof (DB_id3v2_frame_t));
- memset (f, 0, sizeof (DB_id3v2_frame_t));
- strcpy (f->id, "TXXX");
- f->size = size;
- f->data0 = encoding;
- memcpy (&f->data1, out, res);
- // append to tag
- DB_id3v2_frame_t *tail;
- for (tail = tag->frames; tail && tail->next; tail = tail->next);
- if (tail) {
- tail->next = f;
- }
- else {
- tag->frames = f;
- }
-
- return f;
-}
-
-// TODO: some non-Txxx frames might still need charset conversion
-// TODO: 2.4 TDTG frame (tagging time) should not be converted, but might be useful to create it
-int
-junk_id3v2_convert_24_to_23 (DB_id3v2_tag_t *tag24, DB_id3v2_tag_t *tag23) {
- DB_id3v2_frame_t *f24;
- DB_id3v2_frame_t *tail = tag23->frames;
- assert (tag24->version0 == 4);
- tag23->version0 = 3;
- tag23->version1 = 0;
-
- while (tail && tail->next) {
- tail = tail->next;
- }
-
- const char *copy_frames = {
- "AENC", "APIC",
- "COMR", "ENCR",
- "ETCO", "GEOB", "GRID",
- "LINK", "MCDI", "MLLT", "OWNE", "PRIV",
- "POPM", "POSS", "RBUF",
- "RVRB",
- "SYLT", "SYTC",
- "UFID", "USER", "USLT",
- NULL
- };
-
- // NOTE: 2.4 ASPI, EQU2, RVA2, SEEK, SIGN are discarded for 2.3
- // NOTE: 2.4 PCNT is discarded because it is useless
- // NOTE: all Wxxx frames are copy_frames, handled as special case
-
-
- // "TDRC" TDAT with conversion from ID3v2-strct timestamp to DDMM format
- // "TDOR" TORY with conversion from ID3v2-strct timestamp to year
- // TODO: "TIPL" IPLS with conversion to non-text format
-
- const char *text_frames = {
- "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TEXT", "TFLT", "TIT1", "TIT2", "TIT3", "TKEY", "TLAN", "TLEN", "TMED", "TOAL", "TOFN", "TOLY", "TOPE", "TOWN", "TPE1", "TPE2", "TPE3", "TPE4", "TPOS", "TPUB", "TRCK", "TRSN", "TRSO", "TSRC", "TSSE", "TXXX", "TDRC", NULL
- };
-
- // NOTE: 2.4 TMCL (musician credits list) is discarded for 2.3
- // NOTE: 2.4 TMOO (mood) is discarded for 2.3
- // NOTE: 2.4 TPRO (produced notice) is discarded for 2.3
- // NOTE: 2.4 TSOA (album sort order) is discarded for 2.3
- // NOTE: 2.4 TSOP (performer sort order) is discarded for 2.3
- // NOTE: 2.4 TSOT (title sort order) is discarded for 2.3
- // NOTE: 2.4 TSST (set subtitle) is discarded for 2.3
-
- for (f24 = tag24->frames; f24; f24 = f24->next) {
- DB_id3v2_frame_t *f23 = NULL;
- // we are altering the tag, so check for tag alter preservation
- if (tag24->flags & (1<<6)) {
- continue; // discard the frame
- }
-
- int simplecopy = 0; // means format is the same in 2.3 and 2.4
- int text = 0; // means this is a text frame
-
- int i;
-
- if (f24->id0 == 'W') { // covers all W000..WZZZ tags
- simplecopy = 1;
- }
-
- if (!simplecopy) {
- for (i = 0; copy_framesi; i++) {
- if (!strcmp (f24->id, copy_framesi)) {
- simplecopy = 1;
- break;
- }
- }
- }
-
- if (!simplecopy) {
- // check if this is a text frame
- for (i = 0; text_framesi; i++) {
- if (!strcmp (f24->id, text_framesi)) {
- text = 1;
- break;
- }
- }
- }
-
-
- if (!simplecopy && !text) {
- if (!strcmp (f24->id, "COMM")) {
- uint8_t enc = f24->data0;
- char lang4 = {f24->data1, f24->data2, f24->data3, 0};
- trace ("COMM enc is: %d\n", (int)enc);
- trace ("COMM language is: %s\n", lang);
-
- char *descr = convstr_id3v2 (4, enc, f24->data+4, f24->size-4);
- if (!descr) {
- trace ("failed to decode COMM frame, probably wrong encoding (%d)\n", enc);
- }
- else {
- // find value
- char *value = descr;
- while (*value && *value != '\n') {
- value++;
- }
- if (*value != '\n') {
- trace ("failed to parse COMM frame, descr was \"%s\"\n", descr);
- }
- else {
- *value = 0;
- value++;
- f23 = junk_id3v2_add_comment_frame (tag23, lang, descr, value);
- if (f23) {
- tail = f23;
- f23 = NULL;
- }
- }
- free (descr);
- }
- }
- continue; // unknown frame
- }
-
- // convert flags
- uint8_t flags2;
- // 1st byte (status flags) is the same, but shifted by 1 bit to the left
- flags0 = f24->flags0 << 1;
- 
- // 2nd byte (format flags) is quite different
- // 2.4 format is %0h00kmnp (6:grouping, 3:compression, 2:encryption, 1:unsync, 0:datalen)
- // 2.3 format is %ijk00000 (7:compression, 6:encryption, 5:grouping)
- flags1 = 0;
- if (f24->flags1 & (1 << 6)) {
- flags1 |= (1 << 5);
- }
- if (f24->flags1 & (1 << 3)) {
- flags1 |= (1 << 7);
- }
- if (f24->flags1 & (1 << 2)) {
- flags1 |= (1 << 6);
- }
- if (f24->flags1 & (1 << 1)) {
- // 2.3 doesn't support per-frame unsyncronyzation
- }
- if (f24->flags1 & (1 << 0)) {
- // 2.3 doesn't support data length, but remember to skip 4 bytes of
- // the frame
- }
-
- if (simplecopy) {
- f23 = malloc (sizeof (DB_id3v2_frame_t) + f24->size);
- memset (f23, 0, sizeof (DB_id3v2_frame_t) + f24->size);
- strcpy (f23->id, f24->id);
- if (f24->flags1 & (1<<0)) {
- // skip 1st 4 bytes (2.4 data length indicator)
- memcpy (f23->data, f24->data+4, f24->size-4);
- f23->size = f24->size-4;
- }
- else {
- f23->size = f24->size;
- memcpy (f23->data, f24->data, f24->size);
- }
- f23->flags0 = flags0;
- f23->flags1 = flags1;
- }
- else if (text) {
-
- char *decoded = convstr_id3v2 (4, f24->data0, f24->data+1, f24->size-1);
- if (!decoded) {
- trace ("junk_id3v2_convert_24_to_23: failed to decode text frame %s\n", f24->id);
- continue; // failed, discard it
- }
- if (!strcmp (f24->id, "TDRC")) {
- trace ("junk_id3v2_convert_24_to_23: TDRC text: %s\n", decoded);
- int year, month, day;
- int c = sscanf (decoded, "%4d-%2d-%2d", &year, &month, &day);
- if (c >= 1) {
- char s5;
- snprintf (s, sizeof (s), "%04d", year);
- f23 = junk_id3v2_add_text_frame (tag23, "TYER", s);
- if (f23) {
- tail = f23;
- f23 = NULL;
- }
- }
- if (c == 3) {
- char s5;
- snprintf (s, sizeof (s), "%02d%02d", month, day);
- f23 = junk_id3v2_add_text_frame (tag23, "TDAT", s);
- if (f23) {
- tail = f23;
- f23 = NULL;
- }
- }
- else {
- trace ("junk_id3v2_add_text_frame: 2.4 TDRC doesn't have month/day info; discarded\n");
- }
- }
- else if (!strcmp (f24->id, "TDOR")) {
- trace ("junk_id3v2_convert_24_to_23: TDOR text: %s\n", decoded);
- int year;
- int c = sscanf (decoded, "%4d", &year);
- if (c == 1) {
- char s5;
- snprintf (s, sizeof (s), "%04d", year);
- f23 = junk_id3v2_add_text_frame (tag23, "TORY", s);
- if (f23) {
- tail = f23;
- f23 = NULL;
- }
- }
- else {
- trace ("junk_id3v2_add_text_frame: 2.4 TDOR doesn't have month/day info; discarded\n");
- }
- }
- else {
- // encode for 2.3
- f23 = junk_id3v2_add_text_frame (tag23, f24->id, decoded);
- if (f23) {
- tail = f23;
- f23 = NULL;
- }
- }
- free (decoded);
- }
- if (f23) {
- if (tail) {
- tail->next = f23;
- }
- else {
- tag23->frames = f23;
- }
- tail = f23;
- }
- }
-
- // convert tag header
- tag23->flags = tag24->flags;
- tag23->flags &= ~(1<<4); // no footer (unsupported in 2.3)
- tag23->flags &= ~(1<<7); // no unsync
-
- return 0;
-}
-
-int
-junk_id3v2_convert_23_to_24 (DB_id3v2_tag_t *tag23, DB_id3v2_tag_t *tag24) {
- DB_id3v2_frame_t *f23;
- DB_id3v2_frame_t *tail = tag24->frames;
-
- while (tail && tail->next) {
- tail = tail->next;
- }
-
- const char *copy_frames = {
- "AENC", "APIC",
- "COMM", "COMR", "ENCR",
- "ETCO", "GEOB", "GRID",
- "LINK", "MCDI", "MLLT", "OWNE", "PRIV",
- "POPM", "POSS", "RBUF",
- "RVRB",
- "SYLT", "SYTC",
- "UFID", "USER", "USLT",
- NULL
- };
-
- // NOTE: all Wxxx frames are copy_frames, handled as special case
-
- // "TDRC" TDAT with conversion from ID3v2-strct timestamp to DDMM format
- // "TDOR" TORY with conversion from ID3v2-strct timestamp to year
- // TODO: "TIPL" IPLS with conversion to non-text format
-
- const char *text_frames = {
- "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TEXT", "TFLT", "TIT1", "TIT2", "TIT3", "TKEY", "TLAN", "TLEN", "TMED", "TOAL", "TOFN", "TOLY", "TOPE", "TOWN", "TPE1", "TPE2", "TPE3", "TPE4", "TPOS", "TPUB", "TRCK", "TRSN", "TRSO", "TSRC", "TSSE", "TXXX", "TDRC", NULL
- };
-
- for (f23 = tag23->frames; f23; f23 = f23->next) {
- // we are altering the tag, so check for tag alter preservation
- if (tag23->flags & (1<<7)) {
- continue; // discard the frame
- }
-
- int simplecopy = 0; // means format is the same in 2.3 and 2.4
- int text = 0; // means this is a text frame
-
- int i;
-
- if (f23->id0 == 'W') { // covers all W000..WZZZ tags
- simplecopy = 1;
- }
-
- if (!simplecopy) {
- for (i = 0; copy_framesi; i++) {
- if (!strcmp (f23->id, copy_framesi)) {
- simplecopy = 1;
- break;
- }
- }
- }
-
- if (!simplecopy) {
- // check if this is a text frame
- for (i = 0; text_framesi; i++) {
- if (!strcmp (f23->id, text_framesi)) {
- text = 1;
- break;
- }
- }
- }
-
-
- if (!simplecopy && !text) {
- continue; // unknown frame
- }
-
- // convert flags
- uint8_t flags2;
- // 1st byte (status flags) is the same, but shifted by 1 bit to the
- // right
- flags0 = f23->flags0 >> 1;
- 
- // 2nd byte (format flags) is quite different
- // 2.4 format is %0h00kmnp (6:grouping, 3:compression, 2:encryption, 1:unsync, 0:datalen)
- // 2.3 format is %ijk00000 (7:compression, 6:encryption, 5:grouping)
- flags1 = 0;
- if (f23->flags1 & (1 << 7)) {
- flags1 |= (1 << 3);
- }
- if (f23->flags1 & (1 << 6)) {
- flags1 |= (1 << 2);
- }
- if (f23->flags1 & (1 << 5)) {
- flags1 |= (1 << 6);
- }
-
- DB_id3v2_frame_t *f24 = NULL;
- if (simplecopy) {
- f24 = malloc (sizeof (DB_id3v2_frame_t) + f23->size);
- memset (f24, 0, sizeof (DB_id3v2_frame_t) + f23->size);
- strcpy (f24->id, f23->id);
- f24->size = f23->size;
- memcpy (f24->data, f23->data, f23->size);
- f24->flags0 = flags0;
- f24->flags1 = flags1;
- }
- else if (text) {
- // decode text into utf8
- char *decoded = convstr_id3v2 (3, f23->data0, f23->data+1, f23->size-1);
- if (!decoded) {
- trace ("junk_id3v2_convert_23_to_24: failed to decode text frame %s\n", f23->id);
- continue; // failed, discard it
- }
- if (!strcmp (f23->id, "TDRC")) {
- trace ("junk_id3v2_convert_23_to_24: TDRC text: %s\n", decoded);
- int year, month, day;
- int c = sscanf (decoded, "%4d-%2d-%2d", &year, &month, &day);
- if (c >= 1) {
- char s5;
- snprintf (s, sizeof (s), "%04d", year);
- f24 = junk_id3v2_add_text_frame (tag24, "TYER", s);
- if (f24) {
- tail = f24;
- f24 = NULL;
- }
- }
- if (c == 3) {
- char s5;
- snprintf (s, sizeof (s), "%02d%02d", month, day);
- f24 = junk_id3v2_add_text_frame (tag24, "TDAT", s);
- if (f24) {
- tail = f24;
- f24 = NULL;
- }
- }
- else {
- trace ("junk_id3v2_add_text_frame: 2.4 TDRC doesn't have month/day info; discarded\n");
- }
- }
- else if (!strcmp (f23->id, "TORY")) {
- trace ("junk_id3v2_convert_23_to_24: TDOR text: %s\n", decoded);
- int year;
- int c = sscanf (decoded, "%4d", &year);
- if (c == 1) {
- char s5;
- snprintf (s, sizeof (s), "%04d", year);
- f24 = junk_id3v2_add_text_frame (tag24, "TDOR", s);
- if (f24) {
- tail = f24;
- f24 = NULL;
- }
- }
- else {
- trace ("junk_id3v2_add_text_frame: 2.4 TDOR doesn't have month/day info; discarded\n");
- }
- }
- else {
- // encode for 2.4
- f24 = junk_id3v2_add_text_frame (tag24, f23->id, decoded);
- if (f24) {
- tail = f24;
- f24 = NULL;
- }
- }
- free (decoded);
- }
- if (f24) {
- if (tail) {
- tail->next = f24;
- }
- else {
- tag24->frames = f24;
- }
- tail = f24;
- }
- }
-
- // convert tag header
- tag24->version0 = 4;
- tag24->version1 = 0;
- tag24->flags = tag23->flags;
- tag24->flags &= ~(1<<4); // no footer (unsupported in 2.3)
- tag24->flags &= ~(1<<7); // no unsync
-
- return 0;
-}
-
-int
-junk_id3v2_convert_22_to_24 (DB_id3v2_tag_t *tag22, DB_id3v2_tag_t *tag24) {
- DB_id3v2_frame_t *f22;
- DB_id3v2_frame_t *tail = tag24->frames;
-
- while (tail && tail->next) {
- tail = tail->next;
- }
-
- const char *copy_frames = {
- "BUF", "COM", "CRA", "ETC", "GEO", "IPL", "MCI", "MLL", "POP", "REV", "SLT", "STC", "UFI", "ULT",
- NULL
- };
-
- const char *copy_frames_24 = {
- "RBUF", "COMM", "AENC", "ETCO", "GEOB", "TIPL", "MCDI", "MLLT", "POPM", "RVRB", "SYLT", "SYTC", "UFID", "USLT",
- NULL
- };
-
- // NOTE: BUF is discarded (no match in 2.4)
- // NOTE: CNT is discarded (useless)
- // NOTE: CRM is discarded (no match in 2.4)
- // NOTE: EQU is discarded (difficult to convert to EQU2)
- // NOTE: LNK is discarded (maybe later)
- // NOTE: PIC is discarded (needs conversion from custom image-format field to mime-type)
- // NOTE: RVA is discarded (subjective, and difficult to convert to RVA2)
-
- const char *text_frames = {
- "TAL", "TBP", "TCM", "TCO", "TCR", "TDY", "TEN", "TFT", "TKE", "TLA", "TLE", "TMT", "TOA", "TOF", "TOL", "TOT", "TP1", "TP2", "TP3", "TP4", "TPA", "TPB", "TRC", "TRK", "TSS", "TT1", "TT2", "TT3", "TXT", "TXX", "TOR", NULL
- };
-
- const char *text_frames_24 = {
- "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TFLT", "TKEY", "TLAN", "TLEN", "TMED", "TOPE", "TOFN", "TOLY", "TOAL", "TPE1", "TPE2", "TPE3", "TPE4", "TPOS", "TPUB", "TSRC", "TRCK", "TSSE", "TIT1", "TIT2", "TIT3", "TEXT", "TXXX", "TDOR"
- };
-
- // NOTE: TRD is discarded (no match in 2.4)
- // NOTE: TSI is discarded (no match in 2.4)
-
- int year = 0;
- int month = 0;
- int day = 0;
- int hour = 0;
- int minute = 0;
-
- for (f22 = tag22->frames; f22; f22 = f22->next) {
- int simplecopy = -1; // means format is the same in 2.2 and 2.4
- int text = -1; // means this is a text frame
-
- int i;
-
- if (f22->id0 == 'W') { // covers all W00..WZZ tags
- simplecopy = 0;
- }
-
- if (simplecopy == -1) {
- for (i = 0; copy_framesi; i++) {
- if (!strcmp (f22->id, copy_framesi)) {
- simplecopy = i;
- break;
- }
- }
- }
-
- if (simplecopy == -1) {
- // check if this is a text frame
- for (i = 0; text_framesi; i++) {
- if (!strcmp (f22->id, text_framesi)) {
- text = i;
- break;
- }
- }
- }
-
-
- if (simplecopy == -1 && text == -1) {
- continue; // unknown frame
- }
-
- // convert flags
- uint8_t flags2;
- // 1st byte (status flags) is the same, but shifted by 1 bit to the
- // right
- flags0 = f22->flags0 >> 1;
- 
- // 2nd byte (format flags) is quite different
- // 2.4 format is %0h00kmnp (grouping, compression, encryption, unsync)
- // 2.3 format is %ijk00000 (compression, encryption, grouping)
- flags1 = 0;
- if (f22->flags1 & (1 << 4)) {
- flags1 |= (1 << 6);
- }
- if (f22->flags1 & (1 << 7)) {
- flags1 |= (1 << 3);
- }
- if (f22->flags1 & (1 << 6)) {
- flags1 |= (1 << 2);
- }
- if (f22->flags1 & (1 << 5)) {
- flags1 |= (1 << 1);
- }
-
- DB_id3v2_frame_t *f24 = NULL;
- if (simplecopy != -1) {
- f24 = malloc (sizeof (DB_id3v2_frame_t) + f22->size);
- memset (f24, 0, sizeof (DB_id3v2_frame_t) + f22->size);
- if (f22->id0 == 'W') { // duplicate last letter of W00-WZZ frames
- strcpy (f24->id, f22->id);
- f24->id3 = f24->id2;
- f24->id4 = 0;
- }
- else {
- strcpy (f24->id, copy_frames_24simplecopy);
- }
- f24->size = f22->size;
- memcpy (f24->data, f22->data, f22->size);
- f24->flags0 = flags0;
- f24->flags1 = flags1;
- }
- else if (text != -1) {
- // decode text into utf8
- char *decoded = convstr_id3v2 (2, f22->data0, f22->data+1, f22->size-1);
- if (!decoded) {
- trace ("junk_id3v2_convert_23_to_24: failed to decode text frame %s\n", f22->id);
- continue; // failed, discard it
- }
- // encode for 2.4
- f24 = junk_id3v2_add_text_frame (tag24, text_frames_24text, decoded);
- if (f24) {
- tail = f24;
- f24 = NULL;
- }
- free (decoded);
- }
- else if (!strcmp (f22->id, "TYE")) {
- char *decoded = convstr_id3v2 (2, f22->data0, f22->data+1, f22->size-1);
- if (decoded) {
- year = atoi (decoded);
- free (decoded);
- }
- }
- else if (!strcmp (f22->id, "TDA")) {
- char *decoded = convstr_id3v2 (2, f22->data0, f22->data+1, f22->size-1);
- if (decoded) {
- sscanf (decoded, "%02d%02d", &month, &day);
- free (decoded);
- }
- }
- else if (!strcmp (f22->id, "TIM")) {
- char *decoded = convstr_id3v2 (2, f22->data0, f22->data+1, f22->size-1);
- if (decoded) {
- sscanf (decoded, "%02d%02d", &hour, &minute);
- free (decoded);
- }
- }
- if (f24) {
- if (tail) {
- tail->next = f24;
- }
- else {
- tag24->frames = f24;
- }
- tail = f24;
- }
- }
-
- char tdrc100;
- char *p = tdrc;
- if (year > 0) {
- int n = sprintf (p, "%04d", year);
- p += n;
- if (month) {
- n = sprintf (p, "-%02d", month);
- p += n;
- if (day) {
- n = sprintf (p, "-%02d", day);
- p += n;
- if (hour && minute) {
- n = sprintf (p, "-T%02d:%02d", hour, minute);
- p += n;
- }
- }
- }
- DB_id3v2_frame_t *f24 = junk_id3v2_add_text_frame (tag24, "TDRC", tdrc);
- if (f24) {
- tail = f24;
- }
- }
-
- // convert tag header
- tag24->version0 = 4;
- tag24->version1 = 0;
- tag24->flags = tag22->flags;
- tag24->flags &= ~(1<<4); // no footer (unsupported in 2.3)
- tag24->flags &= ~(1<<7); // no unsync
-
- return 0;
-}
-
-int
-junk_apev2_remove_frames (DB_apev2_tag_t *tag, const char *frame_id) {
- DB_apev2_frame_t *prev = NULL;
- for (DB_apev2_frame_t *f = tag->frames; f; ) {
- DB_apev2_frame_t *next = f->next;
- if (!strcasecmp (f->key, frame_id)) {
- if (prev) {
- prev->next = f->next;
- }
- else {
- tag->frames = f->next;
- }
- free (f);
- }
- else {
- prev = f;
- }
- f = next;
- }
- return 0;
-}
-
-int
-junk_apev2_remove_all_text_frames (DB_apev2_tag_t *tag) {
- DB_apev2_frame_t *prev = NULL;
- for (DB_apev2_frame_t *f = tag->frames; f; ) {
- DB_apev2_frame_t *next = f->next;
- int valuetype = ((f->flags >> 1) & 3);
- if (valuetype == 0) {
- if (prev) {
- prev->next = f->next;
- }
- else {
- tag->frames = f->next;
- }
- free (f);
- }
- else {
- prev = f;
- }
- f = next;
- }
- return 0;
-}
-DB_apev2_frame_t *
-junk_apev2_add_text_frame (DB_apev2_tag_t *tag, const char *frame_id, const char *value) {
- trace ("adding apev2 frame %s %s\n", frame_id, value);
- if (!*value) {
- return NULL;
- }
- DB_apev2_frame_t *tail = tag->frames;
- while (tail && tail->next) {
- tail = tail->next;
- }
-
-#if 0 // this will split every line into separate field
- const char *next = value;
- while (*value) {
- while (*next && *next != '\n') {
- next++;
- }
-
- //int size = strlen (value);
- int size = next - value;
- if (*next) {
- next++;
- }
-
- if (!size) {
- continue;
- }
-
- trace ("adding apev2 subframe %s len %d\n", value, size);
- DB_apev2_frame_t *f = malloc (sizeof (DB_apev2_frame_t) + size);
- if (!f) {
- trace ("junk_apev2_add_text_frame: failed to allocate %d bytes\n", size);
- return NULL;
- }
- memset (f, 0, sizeof (DB_apev2_frame_t));
- f->flags = 0;
- strcpy (f->key, frame_id);
- f->size = size;
- memcpy (f->data, value, size);
-
- if (tail) {
- tail->next = f;
- }
- else {
- tag->frames = f;
- }
- tail = f;
-
- value = next;
- }
-#endif
- size_t size = strlen (value);
- DB_apev2_frame_t *f = malloc (sizeof (DB_apev2_frame_t) + size);
- if (!f) {
- trace ("junk_apev2_add_text_frame: failed to allocate %d bytes\n", size);
- return NULL;
- }
- memset (f, 0, sizeof (DB_apev2_frame_t));
- f->flags = 0;
- strcpy (f->key, frame_id);
- f->size = size;
- memcpy (f->data, value, size);
-
- if (tail) {
- tail->next = f;
- }
- else {
- tag->frames = f;
- }
- tail = f;
- return tail;
-}
-
-int
-junk_id3v2_convert_apev2_to_24 (DB_apev2_tag_t *ape, DB_id3v2_tag_t *tag24) {
- DB_apev2_frame_t *f_ape;
- DB_id3v2_frame_t *tail = tag24->frames;
-
- while (tail && tail->next) {
- tail = tail->next;
- }
-
- const char *text_keys = {
- "Title", "Subtitle", "Artist", "Album", "Publisher", "Conductor", "Track", "Composer", "Copyright", "Genre", "Disc", "ISRC", "Language", "Year", NULL
- };
-
- const char *text_keys_24 = {
- "TIT2", "TIT3", "TPE1", "TALB", "TPUB", "TPE3", "TRCK", "TCOM", "TCOP", "TCON", "TPOS", "TSRC", "TLAN", "TDRC"
- };
-
- const char *comm_frames = {
- "Comment", "EAN/UPC", "ISBN", "Catalog", "LC", "Publicationright", "Record Location", "Related", "Abstract", "Bibliography", NULL
- };
-
- // FIXME: additional frames: File->WOAF 
- // converted to COMM: Comment, EAN/UPC, ISBN, Catalog, LC, Publicationright, Record Location, Related, Abstract, Bibliography
- // "Debut album" is discarded
- // "Index" is discarded
- // "Introplay" is discarded
-
- for (f_ape = ape->frames; f_ape; f_ape = f_ape->next) {
- int i;
-
- for (i = 0; text_keysi; i++) {
- if (!strcasecmp (text_keysi, f_ape->key)) {
- break;
- }
- }
-
- DB_id3v2_frame_t *f24 = NULL;
-
- if (text_keysi) {
- char strf_ape->size+1;
- memcpy (str, f_ape->data, f_ape->size);
- strf_ape->size = 0;
- f24 = junk_id3v2_add_text_frame (tag24, text_keys_24i, str);
- if (f24) {
- tail = f24;
- f24 = NULL;
- }
- }
- else {
- for (i = 0; comm_framesi; i++) {
- if (!strcasecmp (f_ape->key, comm_framesi)) {
- char strf_ape->size+1;
- memcpy (str, f_ape->data, f_ape->size);
- strf_ape->size = 0;
- if (!strcasecmp (f_ape->key, "Comment")) {
- junk_id3v2_add_comment_frame (tag24, "eng", "", str);
- }
- else {
- junk_id3v2_add_comment_frame (tag24, "eng", comm_framesi, str);
- }
- break;
- }
- }
- }
-
- if (f24) {
- if (tail) {
- tail->next = f24;
- }
- else {
- tag24->frames = f24;
- }
- tail = f24;
- }
- }
-
- // convert tag header
- tag24->version0 = 4;
- tag24->version1 = 0;
- tag24->flags = 0;
-
- return 0;
-}
-
-int
-junk_apev2_write_i32_le2 (int fd, uint32_t data) {
- int shift = 0;
- for (int i = 0; i < 4; i++) {
- uint8_t d = (data >> shift) & 0xff;
- if (write (fd, &d, 1) != 1) {
- return -1;
- }
- shift += 8;
- }
-
- return 0;
-}
-
-int
-junk_apev2_write_i32_le (FILE *fp, uint32_t data) {
- int shift = 0;
- for (int i = 0; i < 4; i++) {
- uint8_t d = (data >> shift) & 0xff;
- if (fwrite (&d, 1, 1, fp) != 1) {
- return -1;
- }
- shift += 8;
- }
-
- return 0;
-}
-
-int
-junk_apev2_write2 (int fd, DB_apev2_tag_t *tag, int write_header, int write_footer) {
- // calc size and numitems
- uint32_t numframes = 0;
- uint32_t size = 0;
- DB_apev2_frame_t *f = tag->frames;
- while (f) {
- size += 8 + strlen (f->key) + 1 + f->size;
- numframes++;
- f = f->next;
- }
- size += 32;
-
- trace ("junk_apev2_write2: writing apev2 tag, size=%d, numframes=%d\n", size, numframes);
-
-
- if (write_header) {
- if (write (fd, "APETAGEX", 8) != 8) {
- trace ("junk_apev2_write2: failed to write apev2 header signature\n");
- goto error;
- }
- uint32_t flags = (1 << 31) | (1 << 29); // contains header, this is header
- if (!write_footer) {
- flags |= 1 << 30; // contains no footer
- }
- uint32_t header4 = {
- 2000, // version
- size,
- numframes,
- flags
- };
- for (int i = 0; i < 4; i++) {
- if (junk_apev2_write_i32_le2 (fd, headeri) != 0) {
- trace ("junk_apev2_write_i32_le2: failed to write apev2 header\n");
- goto error;
- }
- }
- // write 8 bytes of padding
- header0 = header1 = 0;
- if (write (fd, header, 8) != 8) {
- trace ("junk_apev2_write2: failed to write apev2 header padding\n");
- goto error;
- }
- }
-
- // write items
- f = tag->frames;
- while (f) {
- if (junk_apev2_write_i32_le2 (fd, f->size) != 0) {
- trace ("junk_apev2_write_i32_le2: failed to write apev2 item size\n");
- goto error;
- }
- if (junk_apev2_write_i32_le2 (fd, f->flags) != 0) {
- trace ("junk_apev2_write_i32_le2: failed to write apev2 item flags\n");
- goto error;
- }
- int l = strlen (f->key) + 1;
- if (write (fd, f->key, l) != l) {
- trace ("junk_apev2_write2: failed to write apev2 item key\n");
- goto error;
- }
- if (write (fd, f->data, f->size) != f->size) {
- trace ("junk_apev2_write2: failed to write apev2 item value\n");
- goto error;
- }
- f = f->next;
- }
-
- if (write_footer) {
- if (write (fd, "APETAGEX", 8) != 8) {
- trace ("junk_apev2_write: failed to write apev2 footer signature\n");
- goto error;
- }
- uint32_t flags = 0;
- if (write_header) {
- flags |= 1 << 31;
- }
- uint32_t header4 = {
- 2000, // version
- size,
- numframes,
- flags
- };
- for (int i = 0; i < 4; i++) {
- if (junk_apev2_write_i32_le2 (fd, headeri) != 0) {
- trace ("junk_apev2_write_i32_le2: failed to write apev2 footer\n");
- goto error;
- }
- }
- // write 8 bytes of padding
- header0 = header1 = 0;
- if (write (fd, header, 8) != 8) {
- trace ("junk_apev2_write2: failed to write apev2 footer padding\n");
- goto error;
- }
- }
- return 0;
-error:
- return -1;
-}
-
-
-int
-junk_apev2_write (FILE *fp, DB_apev2_tag_t *tag, int write_header, int write_footer) {
- // calc size and numitems
- uint32_t numframes = 0;
- uint32_t size = 0;
- DB_apev2_frame_t *f = tag->frames;
- while (f) {
- size += 8 + strlen (f->key) + 1 + f->size;
- numframes++;
- f = f->next;
- }
- size += 32;
-
- trace ("junk_apev2_write: writing apev2 tag, size=%d, numframes=%d\n", size, numframes);
-
-
- if (write_header) {
- if (fwrite ("APETAGEX", 1, 8, fp) != 8) {
- trace ("junk_apev2_write: failed to write apev2 header signature\n");
- goto error;
- }
- uint32_t flags = (1 << 31) | (1 << 29); // contains header, this is header
- if (!write_footer) {
- flags |= 1 << 30; // contains no footer
- }
- uint32_t header4 = {
- 2000, // version
- size,
- numframes,
- flags
- };
- for (int i = 0; i < 4; i++) {
- if (junk_apev2_write_i32_le (fp, headeri) != 0) {
- trace ("junk_apev2_write_i32_le: failed to write apev2 header\n");
- goto error;
- }
- }
- // write 8 bytes of padding
- header0 = header1 = 0;
- if (fwrite (header, 1, 8, fp) != 8) {
- trace ("junk_apev2_write_i32_le: failed to write apev2 header padding\n");
- goto error;
- }
- }
-
- // write items
- f = tag->frames;
- while (f) {
- if (junk_apev2_write_i32_le (fp, f->size) != 0) {
- trace ("junk_apev2_write_i32_le: failed to write apev2 item size\n");
- goto error;
- }
- if (junk_apev2_write_i32_le (fp, f->flags) != 0) {
- trace ("junk_apev2_write_i32_le: failed to write apev2 item flags\n");
- goto error;
- }
- int l = strlen (f->key) + 1;
- if (fwrite (f->key, 1, l, fp) != l) {
- trace ("junk_apev2_write_i32_le: failed to write apev2 item key\n");
- goto error;
- }
- if (fwrite (f->data, 1, f->size, fp) != f->size) {
- trace ("junk_apev2_write_i32_le: failed to write apev2 item value\n");
- goto error;
- }
- f = f->next;
- }
-
- if (write_footer) {
- if (fwrite ("APETAGEX", 1, 8, fp) != 8) {
- trace ("junk_apev2_write: failed to write apev2 footer signature\n");
- goto error;
- }
- uint32_t flags = 0;
- if (write_header) {
- flags |= 1 << 31;
- }
- uint32_t header4 = {
- 2000, // version
- size,
- numframes,
- flags
- };
- for (int i = 0; i < 4; i++) {
- if (junk_apev2_write_i32_le (fp, headeri) != 0) {
- trace ("junk_apev2_write_i32_le: failed to write apev2 footer\n");
- goto error;
- }
- }
- // write 8 bytes of padding
- header0 = header1 = 0;
- if (fwrite (header, 1, 8, fp) != 8) {
- trace ("junk_apev2_write_i32_le: failed to write apev2 footer padding\n");
- goto error;
- }
- }
- return 0;
-error:
- return -1;
-}
-
-int
-junk_id3v2_write2 (int out, DB_id3v2_tag_t *tag) {
- if (tag->version0 < 3) {
- fprintf (stderr, "junk_write_id3v2: writing id3v2.2 is not supported\n");
- return -1;
- }
-
- FILE *fp = NULL;
- char *buffer = NULL;
- int err = -1;
-
- // write tag header
- if (write (out, "ID3", 3) != 3) {
- fprintf (stderr, "junk_write_id3v2: failed to write ID3 signature\n");
- goto error;
- }
-
- if (write (out, tag->version, 2) != 2) {
- fprintf (stderr, "junk_write_id3v2: failed to write tag version\n");
- goto error;
- }
- uint8_t flags = tag->flags;
- flags &= ~(1<<6); // we don't (yet?) write ext header
- flags &= ~(1<<4); // we don't write footer
-
- if (write (out, &flags, 1) != 1) {
- fprintf (stderr, "junk_write_id3v2: failed to write tag flags\n");
- goto error;
- }
- // run through list of frames, and calculate size
- uint32_t sz = 0;
- for (DB_id3v2_frame_t *f = tag->frames; f; f = f->next) {
- // each tag has 10 bytes header
- if (tag->version0 > 2) {
- sz += 10;
- }
- else {
- sz += 6;
- }
- sz += f->size;
- }
-
- trace ("calculated tag size: %d bytes\n", sz);
- uint8_t tagsize4;
- tagsize0 = (sz >> 21) & 0x7f;
- tagsize1 = (sz >> 14) & 0x7f;
- tagsize2 = (sz >> 7) & 0x7f;
- tagsize3 = sz & 0x7f;
- if (write (out, tagsize, 4) != 4) {
- fprintf (stderr, "junk_write_id3v2: failed to write tag size\n");
- goto error;
- }
-
- trace ("writing frames\n");
- // write frames
- for (DB_id3v2_frame_t *f = tag->frames; f; f = f->next) {
- trace ("writing frame %s size %d\n", f->id, f->size);
- int id_size = 3;
- uint8_t frame_size4;
- if (tag->version0 > 2) {
- id_size = 4;
- }
- if (tag->version0 == 3) {
- frame_size0 = (f->size >> 24) & 0xff;
- frame_size1 = (f->size >> 16) & 0xff;
- frame_size2 = (f->size >> 8) & 0xff;
- frame_size3 = f->size & 0xff;
- }
- else if (tag->version0 == 4) {
- frame_size0 = (f->size >> 21) & 0x7f;
- frame_size1 = (f->size >> 14) & 0x7f;
- frame_size2 = (f->size >> 7) & 0x7f;
- frame_size3 = f->size & 0x7f;
- }
- if (write (out, f->id, 4) != 4) {
- fprintf (stderr, "junk_write_id3v2: failed to write frame id %s\n", f->id);
- goto error;
- }
- if (write (out, frame_size, 4) != 4) {
- fprintf (stderr, "junk_write_id3v2: failed to write frame size, id %s, size %d\n", f->id, f->size);
- goto error;
- }
- if (write (out, f->flags, 2) != 2) {
- fprintf (stderr, "junk_write_id3v2: failed to write frame header flags, id %s, size %d\n", f->id, f->size);
- goto error;
- }
- if (write (out, f->data, f->size) != f->size) {
- fprintf (stderr, "junk_write_id3v2: failed to write frame data, id %s, size %d\n", f->id, f->size);
- goto error;
- }
- sz += f->size;
- }
-
- return 0;
-
-error:
- if (buffer) {
- free (buffer);
- }
- return err;
-}
-
-int
-junk_id3v2_write (FILE *out, DB_id3v2_tag_t *tag) {
- if (tag->version0 < 3) {
- fprintf (stderr, "junk_write_id3v2: writing id3v2.2 is not supported\n");
- return -1;
- }
-
- FILE *fp = NULL;
- char *buffer = NULL;
- int err = -1;
-
- // write tag header
- if (fwrite ("ID3", 1, 3, out) != 3) {
- fprintf (stderr, "junk_write_id3v2: failed to write ID3 signature\n");
- goto error;
- }
-
- if (fwrite (tag->version, 1, 2, out) != 2) {
- fprintf (stderr, "junk_write_id3v2: failed to write tag version\n");
- goto error;
- }
- uint8_t flags = tag->flags;
- flags &= ~(1<<6); // we don't (yet?) write ext header
- flags &= ~(1<<4); // we don't write footer
-
- if (fwrite (&flags, 1, 1, out) != 1) {
- fprintf (stderr, "junk_write_id3v2: failed to write tag flags\n");
- goto error;
- }
- // run through list of frames, and calculate size
- uint32_t sz = 0;
- for (DB_id3v2_frame_t *f = tag->frames; f; f = f->next) {
- // each tag has 10 bytes header
- if (tag->version0 > 2) {
- sz += 10;
- }
- else {
- sz += 6;
- }
- sz += f->size;
- }
-
- trace ("calculated tag size: %d bytes\n", sz);
- uint8_t tagsize4;
- tagsize0 = (sz >> 21) & 0x7f;
- tagsize1 = (sz >> 14) & 0x7f;
- tagsize2 = (sz >> 7) & 0x7f;
- tagsize3 = sz & 0x7f;
- if (fwrite (tagsize, 1, 4, out) != 4) {
- fprintf (stderr, "junk_write_id3v2: failed to write tag size\n");
- goto error;
- }
-
- trace ("writing frames\n");
- // write frames
- for (DB_id3v2_frame_t *f = tag->frames; f; f = f->next) {
- trace ("writing frame %s size %d\n", f->id, f->size);
- int id_size = 3;
- uint8_t frame_size4;
- if (tag->version0 > 2) {
- id_size = 4;
- }
- if (tag->version0 == 3) {
- frame_size0 = (f->size >> 24) & 0xff;
- frame_size1 = (f->size >> 16) & 0xff;
- frame_size2 = (f->size >> 8) & 0xff;
- frame_size3 = f->size & 0xff;
- }
- else if (tag->version0 == 4) {
- frame_size0 = (f->size >> 21) & 0x7f;
- frame_size1 = (f->size >> 14) & 0x7f;
- frame_size2 = (f->size >> 7) & 0x7f;
- frame_size3 = f->size & 0x7f;
- }
- if (fwrite (f->id, 1, 4, out) != 4) {
- fprintf (stderr, "junk_write_id3v2: failed to write frame id %s\n", f->id);
- goto error;
- }
- if (fwrite (frame_size, 1, 4, out) != 4) {
- fprintf (stderr, "junk_write_id3v2: failed to write frame size, id %s, size %d\n", f->id, f->size);
- goto error;
- }
- if (fwrite (f->flags, 1, 2, out) != 2) {
- fprintf (stderr, "junk_write_id3v2: failed to write frame header flags, id %s, size %d\n", f->id, f->size);
- goto error;
- }
- if (fwrite (f->data, 1, f->size, out) != f->size) {
- fprintf (stderr, "junk_write_id3v2: failed to write frame data, id %s, size %d\n", f->id, f->size);
- goto error;
- }
- sz += f->size;
- }
-
- return 0;
-
-error:
- if (buffer) {
- free (buffer);
- }
- return err;
-}
-
-void
-junk_id3v2_free (DB_id3v2_tag_t *tag) {
- while (tag->frames) {
- DB_id3v2_frame_t *next = tag->frames->next;
- free (tag->frames);
- tag->frames = next;
- }
-}
-
-void
-junk_apev2_free (DB_apev2_tag_t *tag) {
- while (tag->frames) {
- DB_apev2_frame_t *next = tag->frames->next;
- free (tag->frames);
- tag->frames = next;
- }
-}
-
-int
-junklib_id3v2_sync_frame (uint8_t *data, int size) {
- char *writeptr = data;
- int skipnext = 0;
- int written = 0;
- while (size > 0) {
- *writeptr = *data;
- if (data0 == 0xff && size >= 2 && data1 == 0) {
- data++;
- size--;
- }
- writeptr++;
- data++;
- size--;
- written++;
- }
- return written;
-}
-
-char *
-junk_append_meta (const char *old, const char *new) {
- int sz = strlen (old) + strlen (new) + 2;
- char *appended = malloc (sz);
- if (!appended) {
- trace ("junk_append_meta: failed to allocate %d bytes\n");
- return NULL;
- }
- snprintf (appended, sz, "%s\n%s", old, new);
- return appended;
-}
-
-int
-junk_load_comm_frame (int version_major, playItem_t *it, uint8_t *readptr, int synched_size) {
- uint8_t enc = readptr0;
- char lang4 = {readptr1, readptr2, readptr3, 0};
- trace ("COMM enc: %d\n", (int)enc);
- trace ("COMM language: %s\n", lang);
- trace ("COMM data size: %d\n", synched_size);
-
- char *descr = convstr_id3v2 (version_major, enc, readptr+4, synched_size-4);
- if (!descr) {
- trace ("failed to decode COMM frame, probably wrong encoding (%d)\n", enc);
- return -1;
- }
-
- trace ("COMM raw data: %s\n", descr);
- // find value
- char *value = descr;
- while (*value && *value != '\n') {
- value++;
- }
- if (*value != '\n') {
- trace ("failed to parse COMM frame, descr was \"%s\"\n", descr);
- free (descr);
- return -1;
- }
-
- *value = 0;
- value++;
-
- int len = strlen (descr) + strlen (value) + 3;
- char commentlen;
-
- if (*descr) {
- snprintf (comment, len, "%s: %s", descr, value);
- }
- else {
- strcpy (comment, value);
- }
-
- trace ("COMM combined: %s\n", comment);
- // skip utf8 BOM (can be produced by iconv FEFF/FFFE)
- int l = strlen (comment);
- uint8_t bom = { 0xEF, 0xBB, 0xBF };
- if (l >= 3 && !memcmp (comment, bom, 3)) {
- pl_append_meta (it, "comment", comment+3);
- }
- else {
- pl_append_meta (it, "comment", comment);
- }
-
- free (descr);
- return 0;
-}
-
-/* Parse RVA2 tag */
-/* Currently only supports tags wich set master volume and are labeled "track"
- * or "album". Also only supports peak value if stored as 16 bits. */
-static int junk_id3v2_load_rva2 (int version_major, playItem_t *it, uint8_t *readptr, int synched_size) {
- char *rva_desc = readptr;
- unsigned rva_desc_len = 0;
- const char *p = rva_desc;
- while (*p++ && rva_desc_len < synched_size) {
- rva_desc_len++;
- }
-
- if(rva_desc_len == synched_size) { /* tag too short */
- return -1;
- }
- if(rva_desc_len != 5) { /* only support track or album labeled ones */
- return 0;
- }
-
- if(synched_size < rva_desc_len + 1 + 4) return -1; /* at least 4 bytes after zero-terminated label */
-
- uint8_t *rva_data = rva_desc + rva_desc_len + 1;
-
- uint8_t vol_type = rva_data0;
-
- if(vol_type != 1) return 0;
-
- int16_t volume_adjust = (int16_t)(((int16_t)rva_data1 << 8) | rva_data2); /* this is little-endian safe :) */
- uint8_t peak_bits = rva_data3;
- uint16_t peak_val = 0;
-
- if(peak_bits == 16 && synched_size >= rva_desc_len + 1 + 6) {
- peak_val = (uint16_t)((rva_data4 << 8) | rva_data5);
- }
-
- if (!strcasecmp (rva_desc, "album")) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, (float)volume_adjust / 512.0);
- if(peak_val) pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, (float)peak_val / 32767.0); /* NOTE: this is a guess based on mp3gain 1.5.2 written tags */
- }
- else if (!strcasecmp (rva_desc, "track")) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, (float)volume_adjust / 512.0);
- if(peak_val) pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, (float)peak_val / 32767.0);
- }
-
- return 0;
-}
-
-int
-junk_id3v2_load_ufid (int version_major, playItem_t *it, uint8_t *readptr, int synched_size) {
- char *owner = readptr;
- while (*readptr && synched_size > 0) {
- readptr++;
- synched_size--;
- }
- if (!synched_size) {
- trace ("UFID owner is not null-terminated\n");
- return -1;
- }
- readptr++;
- synched_size--;
- char idsynched_size+1;
- memcpy (id, readptr, synched_size);
- idsynched_size = 0;
-
- // verify that owner is musicbrainz and that content is ascii
- if (strcmp (owner, "http://musicbrainz.org")) {
- return -1;
- }
- for (int i = 0; i < synched_size; i++) {
- if (!isascii (idi)) {
- return -1;
- }
- }
-
- pl_replace_meta (it, "musicbrainz_trackid", id);
- return 0;
-}
-
-int
-junk_id3v2_remove_ufid_frames (DB_id3v2_tag_t *tag, const char *frame_id, const char *owner) {
- DB_id3v2_frame_t *prev = NULL;
- for (DB_id3v2_frame_t *f = tag->frames; f; ) {
- DB_id3v2_frame_t *next = f->next;
- if (!strcmp (f->id, frame_id) && f->size >= strlen(owner) && !strcmp (f->data, owner)) {
- if (prev) {
- prev->next = f->next;
- }
- else {
- tag->frames = f->next;
- }
- free (f);
- }
- else {
- prev = f;
- }
- f = next;
- }
- return 0;
-}
-
-DB_id3v2_frame_t *
-junk_id3v2_add_ufid_frame (DB_id3v2_tag_t *tag, const char *owner, const char *id, int id_len) {
- int ownerlen = strlen (owner);
- int len = ownerlen + 1 + id_len;
-
- // make a frame
- trace ("calculated frame size = %d\n", len);
- DB_id3v2_frame_t *f = malloc (len + sizeof (DB_id3v2_frame_t));
- memset (f, 0, sizeof (DB_id3v2_frame_t));
- strcpy (f->id, "UFID");
- f->size = len;
- memcpy (f->data, owner, ownerlen+1);
- memcpy (f->data+ownerlen+1, id, id_len);
- // append to tag
- DB_id3v2_frame_t *tail;
- for (tail = tag->frames; tail && tail->next; tail = tail->next);
- if (tail) {
- tail->next = f;
- }
- else {
- tag->frames = f;
- }
-
- return f;
-}
-
-int
-junk_id3v2_load_txx (int version_major, playItem_t *it, uint8_t *readptr, int synched_size) {
- char *txx = convstr_id3v2 (version_major, *readptr, readptr+1, synched_size-1);
- if (!txx) {
- return -1;
- }
-
- char *val = NULL;
- if (txx) {
- char *p;
- for (p = txx; *p; p++) {
- if (*p == '\n') {
- *p = 0;
- val = p+1;
- break;
- }
- }
- }
-
- if (val) {
- // skip utf8 BOM (can be produced by iconv FEFF/FFFE)
- int l = strlen (val);
- uint8_t bom = { 0xEF, 0xBB, 0xBF };
- if (l >= 3 && !memcmp (val, bom, 3)) {
- val += 3;
- }
-
- if (!strcasecmp (txx, "replaygain_album_gain")) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, atof (val));
- }
- else if (!strcasecmp (txx, "replaygain_album_peak")) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, atof (val));
- }
- else if (!strcasecmp (txx, "replaygain_track_gain")) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, atof (val));
- }
- else if (!strcasecmp (txx, "replaygain_track_peak")) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, atof (val));
- }
- else if (!strcasecmp (txx, "date")) { // HACK: fb2k date support
- pl_append_meta (it, "year", val);
- }
- else {
- pl_append_meta (it, txx, val);
- }
- }
-
- free (txx);
-
- return 0;
-}
-
-int
-junk_id3v2_add_genre (playItem_t *it, char *genre) {
- int numeric = 0;
- if (genre0 == '(') {
- // find matching parenthesis
- char *p = &genre1;
- while (*p && *p != ')') {
- if (!isdigit (*p)) {
- break;
- }
- p++;
- }
- if (*p == ')') {
- *p = 0;
- memmove (genre, genre+1, p-genre);
- numeric = 1;
- }
- }
- if (!numeric) {
- // check if it is numeric
- const char *p = genre;
- while (*p) {
- if (!isdigit (*p)) {
- break;
- }
- p++;
- }
- if (*p == 0 && p > genre) {
- numeric = 1;
- }
- }
-
- if (numeric) {
- int genre_id = atoi (genre);
- if (genre_id >= 0) {
- const char *genre_str = NULL;
- if (genre_id <= 147) {
- genre_str = junk_genretblgenre_id;
- }
- else if (genre_id == 0xff) {
- // genre_str = "None";
- }
- if (genre_str) {
- pl_add_meta (it, "genre", genre_str);
- return 0;
- }
- }
- }
- else if (!strcmp (genre, "CR")) {
- pl_add_meta (it, "genre", "Cover");
- }
- else if (!strcmp (genre, "RX")) {
- pl_add_meta (it, "genre", "Remix");
- }
- else {
- pl_add_meta (it, "genre", genre);
- }
-
- return 0;
-}
-
-int
-junk_id3v2_read_full (playItem_t *it, DB_id3v2_tag_t *tag_store, DB_FILE *fp) {
- DB_id3v2_frame_t *tail = NULL;
- int title_added = 0;
- if (!fp) {
- trace ("bad call to junk_id3v2_read!\n");
- return -1;
- }
- deadbeef->rewind (fp);
- uint8_t header10;
- if (deadbeef->fread (header, 1, 10, fp) != 10) {
- return -1; // too short
- }
- if (strncmp (header, "ID3", 3)) {
- return -1; // no tag
- }
- uint8_t version_major = header3;
- uint8_t version_minor = header4;
- if (version_major > 4 || version_major < 2) {
- trace ("id3v2.%d.%d is unsupported\n", version_major, version_minor);
- return -1; // unsupported
- }
- uint8_t flags = header5;
- if (flags & 15) {
- trace ("unrecognized flags: one of low 15 bits is set, value=0x%x\n", (int)flags);
- return -1; // unsupported
- }
- int unsync = (flags & (1<<7)) ? 1 : 0;
- int extheader = (flags & (1<<6)) ? 1 : 0;
- int expindicator = (flags & (1<<5)) ? 1 : 0;
- int footerpresent = (flags & (1<<4)) ? 1 : 0;
- // check for bad size
- if ((header9 & 0x80) || (header8 & 0x80) || (header7 & 0x80) || (header6 & 0x80)) {
- trace ("bad header size\n");
- return -1; // bad header
- }
- uint32_t size = (header9 << 0) | (header8 << 7) | (header7 << 14) | (header6 << 21);
-
- trace ("tag size: %d\n", size);
- if (size == 0) {
- return -1;
- }
- if (tag_store) {
- tag_store->version0 = version_major;
- tag_store->version1 = version_minor;
- tag_store->flags = flags;
- // remove unsync flag
- tag_store->flags &= ~ (1<<7);
- }
-
- uint8_t *tag = malloc (size);
- if (!tag) {
- fprintf (stderr, "junklib: out of memory while reading id3v2, tried to alloc %d bytes\n", size);
- goto error;
- }
- if (deadbeef->fread (tag, 1, size, fp) != size) {
- goto error; // bad size
- }
- uint8_t *readptr = tag;
- int crcpresent = 0;
- trace ("version: 2.%d.%d, unsync: %d, extheader: %d, experimental: %d\n", version_major, version_minor, unsync, extheader, expindicator);
- 
- if (extheader) {
- uint32_t sz = (readptr3 << 0) | (readptr2 << 7) | (readptr1 << 14) | (readptr0 << 21);
- if (size < sz) {
- trace ("error: size of ext header (%d) is greater than tag size\n", sz);
- goto error; // bad size
- }
- readptr += sz;
- }
- int err = -1;
- while (readptr - tag <= size - 4 && *readptr) {
- if (version_major == 3 || version_major == 4) {
- trace ("pos %d of %d\n", readptr - tag, size);
- char frameid5;
- memcpy (frameid, readptr, 4);
- frameid4 = 0;
- readptr += 4;
- if (readptr - tag >= size - 4) {
- trace ("reached the end of tag\n");
- break;
- }
- uint32_t sz;
- if (version_major == 4) {
- sz = (readptr3 << 0) | (readptr2 << 7) | (readptr1 << 14) | (readptr0 << 21);
- }
- else if (version_major == 3) {
- sz = (readptr3 << 0) | (readptr2 << 8) | (readptr1 << 16) | (readptr0 << 24);
- }
- else {
- trace ("unknown id3v2 version (2.%d.%d)\n", version_major, version_minor);
- goto error;
- }
- readptr += 4;
- trace ("got frame %s, size %d, pos %d, tagsize %d\n", frameid, sz, readptr-tag, size);
- if (readptr - tag >= size - sz) {
- trace ("frame is out of tag bounds\n");
- err = -1;
- goto error; // size of frame is more than size of tag
- }
- if (sz < 1) {
-// err = 1;
- break; // frame must be at least 1 byte long
- }
- uint8_t flags1 = readptr0;
- uint8_t flags2 = readptr1;
- readptr += 2;
-
- if (!strcmp (frameid, "APIC")) {
- if (sz > MAX_ID3V2_APIC_FRAME_SIZE) {
- trace ("junk_id3v2_read_full: frame %s size is too big (%d), discarded\n", frameid, sz);
- readptr += sz;
- continue;
- }
- }
- else if (sz > MAX_ID3V2_FRAME_SIZE || readptr - tag + sz > size) {
- trace ("junk_id3v2_read_full: frame %s size is too big (%d), discarded\n", frameid, sz);
- readptr += sz;
- continue;
- }
- int synched_size = sz;
- if (unsync) {
- synched_size = junklib_id3v2_sync_frame (readptr, sz);
- trace ("size: %d/%d\n", synched_size, sz);
- }
-
- if (tag_store) {
- DB_id3v2_frame_t *frm = malloc (sizeof (DB_id3v2_frame_t) + sz);
- if (!frm) {
- fprintf (stderr, "junklib: failed to alloc %d bytes for id3v2 frame %s\n", (int)(sizeof (DB_id3v2_frame_t) + sz), frameid);
- goto error;
- }
- memset (frm, 0, sizeof (DB_id3v2_frame_t));
- if (tail) {
- tail->next = frm;
- }
- tail = frm;
- if (!tag_store->frames) {
- tag_store->frames = frm;
- }
- strcpy (frm->id, frameid);
- memcpy (frm->data, readptr, sz);
- frm->size = synched_size;
-
- frm->flags0 = flags1;
- frm->flags1 = flags2;
- }
- if (version_major == 4) {
- if (flags1 & 0x8f) {
- // unknown flags
- trace ("unknown status flags: %02x\n", flags1);
- readptr += sz;
- continue;
- }
- if (flags2 & 0xb0) {
- // unknown flags
- trace ("unknown format flags: %02x\n", flags2);
- readptr += sz;
- continue;
- }
-
- if (flags2 & 0x40) { // group id
- trace ("frame has group id\n");
- readptr++; // skip id
- sz--;
- }
- if (flags2 & 0x08) { // compressed frame, ignore
- trace ("frame is compressed, skipping\n");
- readptr += sz;
- continue;
- }
- if (flags2 & 0x04) { // encrypted frame, skip
- trace ("frame is encrypted, skipping\n");
- readptr += sz;
- continue;
- }
- if (flags2 & 0x02) { // unsync, just do nothing
- }
- if (flags2 & 0x01) { // data size
- synched_size = (readptr3 << 0) | (readptr2 << 7) | (readptr1 << 14) | (readptr0 << 21);
- trace ("frame has extra size field = %d\n", synched_size);
- readptr += 4;
- sz -= 4;
- }
- }
- else if (version_major == 3) {
- if (flags1 & 0x1F) {
- trace ("unknown status flags: %02x\n", flags1);
- readptr += sz;
- continue;
- }
- if (flags2 & 0x1F) {
- trace ("unknown format flags: %02x\n", flags2);
- readptr += sz;
- continue;
- }
- if (flags2 & 0x80) {
- trace ("frame is compressed, skipping\n");
- readptr += sz;
- continue;
- }
- if (flags2 & 0x40) {
- trace ("frame is encrypted, skipping\n");
- readptr += sz;
- continue;
- }
- if (flags2 & 0x20) {
- trace ("frame has group id\n");
- readptr++; // skip id
- sz--;
- }
- }
-
- // parse basic 2.3/2.4 text frames
- //const char *text_frames = { "TPE1", "TPE2", "TPOS", "TIT2", "TALB", "TCOP", "TCON", "TENC", "TPE3", "TCOM", "TRCK", "TYER", "TDRC", NULL };
- //char **text_holders = { &artist, &band, &disc, &title, &album, &copyright, &genre, &vendor, &performer, &composer, &track, version_major == 3 ? &year : NULL, version_major == 4 ? &year : NULL, };
- if (it) {
- int added = 0;
- if (strcmp (frameid, "TXXX")) {
- for (int f = 0; frame_mappingf; f += FRAME_MAPPINGS) {
- const char *frm_name = version_major == 3 ? frame_mappingf+MAP_ID3V23 : frame_mappingf+MAP_ID3V24;
- if (frm_name && !strcmp (frameid, frm_name)) {
- added = 1;
- if (synched_size > MAX_TEXT_FRAME_SIZE) {
- trace ("frame %s is too big, discard\n", frameid);
- break;
- }
-
- char *text = convstr_id3v2 (version_major, readptr0, readptr+1, synched_size-1);
-
- // couple of simple tests
- //char *text = convstr_id3v2 (4, 3, "текст1\0текст2", strlen ("текст1")*2+2);
- //const char ucstext = { 0x42, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x41, 0x04, 0x42, 0x04, 0x31, 0x00, 0x00, 0x00, 0x42, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, 0x00 };
- //char *text = convstr_id3v2 (4, 1, ucstext, sizeof (ucstext));
-
- if (text && *text) {
- if (!strcmp (frameid, "TRCK")) { // special case for track/totaltracks
- junk_add_track_meta (it, text);
- }
- else if (!strcmp (frameid, "TCON")) {
- junk_id3v2_add_genre (it, text);
- }
- else {
- pl_append_meta (it, frame_mappingf+MAP_DDB, text);
- }
-// if (text) {
-// trace ("%s = %s\n", frameid, text);
-// }
- }
- if (text) {
- free (text);
- }
- break;
- }
- }
- }
-
- if (added) {
- readptr += sz;
- continue;
- }
-
- if (!strcmp (frameid, "COMM")) {
- if (sz < 4) {
- trace ("COMM frame is too short, skipped\n");
- readptr += sz; // bad tag
- continue;
- }
-
- /*int res = */junk_load_comm_frame (version_major, it, readptr, synched_size);
- }
- else if (it && !strcmp (frameid, "RVA2")) {
- if (synched_size < 5) {
- trace ("RVA2 frame is too short, skipped\n");
- readptr += sz; // bad tag
- continue;
- }
-
- /*int res = */junk_id3v2_load_rva2(version_major, it, readptr, synched_size);
- }
- else if (it && !strcmp (frameid, "UFID")) {
- if (synched_size < 2) {
- trace ("UFID frame is too short, skipped\n");
- readptr += sz; // bad tag
- continue;
- }
- junk_id3v2_load_ufid (version_major, it, readptr, synched_size);
- }
- else if (it && !strcmp (frameid, "TXXX")) {
- if (synched_size < 2) {
- trace ("TXXX frame is too short, skipped\n");
- readptr += sz; // bad tag
- continue;
- }
- int res = junk_id3v2_load_txx (version_major, it, readptr, synched_size);
- }
- }
- readptr += sz;
- }
- else if (version_major == 2) {
- char frameid4;
- memcpy (frameid, readptr, 3);
- frameid3 = 0;
- readptr += 3;
- if (readptr - tag >= size - 3) {
- break;
- }
- uint32_t sz = (readptr2 << 0) | (readptr1 << 8) | (readptr0 << 16);
- readptr += 3;
- if (readptr - tag >= size - sz) {
- break; // size of frame is less than size of tag
- }
- if (sz < 1) {
- break; // frame must be at least 1 byte long
- }
- if (sz > MAX_ID3V2_FRAME_SIZE) {
- trace ("junk_id3v2_read_full: frame %s size is too big, discarded\n", frameid);
- readptr += sz;
- continue;
- }
- int synched_size = sz;
- if (unsync) {
- synched_size = junklib_id3v2_sync_frame (readptr, sz);
- }
-
- if (tag_store) {
- DB_id3v2_frame_t *frm = malloc (sizeof (DB_id3v2_frame_t) + sz);
- if (!frm) {
- fprintf (stderr, "junklib: failed to alloc %d bytes for id3v2.2 frame %s\n", (int)(sizeof (DB_id3v2_frame_t) + sz), frameid);
- goto error;
- }
- memset (frm, 0, sizeof (DB_id3v2_frame_t));
- if (tail) {
- tail->next = frm;
- }
- tail = frm;
- if (!tag_store->frames) {
- tag_store->frames = frm;
- }
- strcpy (frm->id, frameid);
- memcpy (frm->data, readptr, synched_size);
- frm->size = sz;
- }
-// trace ("found id3v2.2 frame: %s, size=%d\n", frameid, sz);
-
- // parse basic 2.2 text frames
- if (it) {
- int added = 0;
- if (strcmp (frameid, "TXX")) {
- for (int f = 0; frame_mappingf; f++) {
- if (frame_mappingf+MAP_ID3V22 && !strcmp (frameid, frame_mappingf+MAP_ID3V22)) {
- added = 1;
- if (synched_size > MAX_TEXT_FRAME_SIZE) {
- trace ("frame %s is too big, discard\n", frameid);
- break;
- }
- char *text = convstr_id3v2 (version_major, readptr0, readptr+1, synched_size-1);
- if (text && *text) {
- if (!strcmp (frameid, "TRCK")) { // special case for track/totaltracks
- junk_add_track_meta (it, text);
- }
- else if (!strcmp (frameid, "TCON")) {
- junk_id3v2_add_genre (it, text);
- }
- else {
- pl_append_meta (it, frame_mappingf+MAP_DDB, text);
- }
- free (text);
- }
- break;
- }
- }
- }
-
- if (added) {
- readptr += sz;
- continue;
- }
-
- if (!strcmp (frameid, "COM")) {
- if (synched_size < 6) {
- readptr += sz;
- continue;
- }
- /*int res = */junk_load_comm_frame (version_major, it, readptr, synched_size);
- }
- else if (it && !strcmp (frameid, "TXX")) {
- if (synched_size < 2) {
- trace ("TXX frame is too short, skipped\n");
- readptr += sz; // bad tag
- continue;
- }
- int res = junk_id3v2_load_txx (version_major, it, readptr, synched_size);
- }
- }
- readptr += sz;
- }
- else {
- trace ("id3v2.%d (unsupported!)\n", version_minor);
- }
- }
- if (it) {
- if (version_major == 2) {
- uint32_t f = pl_get_item_flags (it);
- f |= DDB_TAG_ID3V22;
- pl_set_item_flags (it, f);
- }
- else if (version_major == 3) {
- uint32_t f = pl_get_item_flags (it);
- f |= DDB_TAG_ID3V23;
- pl_set_item_flags (it, f);
- }
- else if (version_major == 4) {
- uint32_t f = pl_get_item_flags (it);
- f |= DDB_TAG_ID3V24;
- pl_set_item_flags (it, f);
- }
- }
- err = 0;
-error:
- if (err != 0) {
- trace ("error parsing id3v2\n");
- }
-
- if (tag) {
- free (tag);
- }
- if (tag_store && err != 0) {
- while (tag_store->frames) {
- DB_id3v2_frame_t *next = tag_store->frames->next;
- free (tag_store->frames);
- tag_store->frames = next;
- }
- }
- return err;
-}
-
-int
-junk_id3v2_read (playItem_t *it, DB_FILE *fp) {
- return junk_id3v2_read_full (it, NULL, fp);
-}
-
-const char *
-junk_detect_charset_len (const char *s, int len) {
- // check if that's already utf8
- if (u8_valid (s, len, NULL)) {
- return NULL; // means no recoding required
- }
- // try shift-jis
- if (enable_shift_jis_detection && can_be_shift_jis (s, len)) {
- return "shift-jis";
- }
- // hack to add cp936 support
- if (can_be_chinese (s, len)) {
- return "cp936";
- }
- // check if that could be non-latin1 (too many nonascii chars)
- if (can_be_russian (s, len)) {
- return "cp1251";
- }
-
- // if shift_jis detection is disabled, but russian and chinese failed,
- // try it anyway
- if (!enable_shift_jis_detection && can_be_shift_jis (s, len)) {
- return "shift_jis";
- }
-
- return "cp1252";
-}
-
-const char *
-junk_detect_charset (const char *s) {
- size_t len = strlen (s);
- return junk_detect_charset_len (s, len);
-}
-
-int
-junk_recode (const char *in, int inlen, char *out, int outlen, const char *cs) {
- return junk_iconv (in, inlen, out, outlen, cs, UTF8_STR);
-}
-
-int
-junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const char *id3v1_encoding) {
- trace ("junk_rewrite_tags %X\n", junk_flags);
- int err = -1;
- char *buffer = NULL;
- DB_FILE *fp = NULL;
- int out = -1;
-
- uint32_t item_flags = pl_get_item_flags (it);
-
- // get options
- int strip_id3v2 = junk_flags & JUNK_STRIP_ID3V2;
- int strip_id3v1 = junk_flags & JUNK_STRIP_ID3V1;
- int strip_apev2 = junk_flags & JUNK_STRIP_APEV2;
- int write_id3v2 = junk_flags & JUNK_WRITE_ID3V2;
- int write_id3v1 = junk_flags & JUNK_WRITE_ID3V1;
- int write_apev2 = junk_flags & JUNK_WRITE_APEV2;
-
- char tmppathPATH_MAX;
- // find the beginning and the end of audio data
- char fnamePATH_MAX;
- pl_get_meta (it, ":URI", fname, sizeof (fname));
- snprintf (tmppath, sizeof (tmppath), "%s.temp", fname);
- fp = deadbeef->fopen (fname);
- if (!fp) {
- trace ("file not found %s\n", fname);
- return -1;
- }
-
- int64_t fsize = deadbeef->fgetlength (fp);
- int id3v2_size = 0;
- int id3v2_start = deadbeef->junk_id3v2_find (fp, &id3v2_size);
- if (id3v2_start == -1) {
- id3v2_size = -1;
- }
-
- int32_t apev2_size;
- uint32_t flags, numitems;
- int64_t apev2_start = junk_apev2_find2 (fp, &apev2_size, &flags, &numitems);
- if (apev2_start == -1) {
- apev2_start = 0;
- }
-
- if (!strip_apev2 && !write_apev2) {
- apev2_start = 0;
- }
-
- int64_t id3v1_start = junk_id3v1_find2 (fp);
- if (id3v1_start == -1) {
- id3v1_start = 0;
- }
-
- int64_t header = 0;
- if (id3v2_size > 0) {
- header = id3v2_start + id3v2_size;
- }
-
- int64_t footer = fsize;
-
- if (id3v1_start > 0) {
- footer = id3v1_start;
- }
- if (apev2_start > 0) {
- footer = min (footer, apev2_start);
- }
-
- trace ("header size: %lld, footer size: %lld\n", header, fsize-footer);
-
- // "TRCK" -- special case
- // "TYER"/"TDRC" -- special case
-
- // open output file
- struct stat stat_struct;
- if (stat(fname, &stat_struct) != 0) {
- stat_struct.st_mode = 00640;
- }
- out = open (tmppath, O_CREAT | O_LARGEFILE | O_WRONLY, stat_struct.st_mode);
- trace ("will write tags into %s\n", tmppath);
- if (out < 0) {
- fprintf (stderr, "cmp3_write_metadata: failed to open temp file %s\n", tmppath);
- goto error;
- }
-
- DB_id3v2_tag_t id3v2;
- DB_apev2_tag_t apev2;
-
- memset (&id3v2, 0, sizeof (id3v2));
- memset (&apev2, 0, sizeof (apev2));
-
- if (!strip_id3v2 && !write_id3v2 && id3v2_size > 0) {
- if (deadbeef->fseek (fp, id3v2_start, SEEK_SET) == -1) {
- trace ("cmp3_write_metadata: failed to seek to original id3v2 tag position in %s\n", pl_find_meta (it, ":URI"));
- goto error;
- }
- uint8_t *buf = malloc (id3v2_size);
- if (!buf) {
- trace ("cmp3_write_metadata: failed to alloc %d bytes for id3v2 tag\n", id3v2_size);
- goto error;
- }
- if (deadbeef->fread (buf, 1, id3v2_size, fp) != id3v2_size) {
- trace ("cmp3_write_metadata: failed to read original id3v2 tag from %s\n", pl_find_meta (it, ":URI"));
- free (buf);
- goto error;
- }
- if (write (out, buf, id3v2_size) != id3v2_size) {
- trace ("cmp3_write_metadata: failed to copy original id3v2 tag from %s to temp file\n", pl_find_meta (it, ":URI"));
- free (buf);
- goto error;
- }
- free (buf);
- }
- else if (write_id3v2) {
- trace ("writing id3v2\n");
- if (id3v2_size <= 0 || strip_id3v2 || deadbeef->junk_id3v2_read_full (NULL, &id3v2, fp) != 0) {
- deadbeef->junk_id3v2_free (&id3v2);
- memset (&id3v2, 0, sizeof (id3v2));
- id3v2.version0 = id3v2_version;
- }
- // convert to required version
- while (id3v2.version0 != id3v2_version) {
- DB_id3v2_tag_t converted;
- memset (&converted, 0, sizeof (converted));
- if (id3v2.version0 == 2) {
- if (deadbeef->junk_id3v2_convert_22_to_24 (&id3v2, &converted) != 0) {
- goto error;
- }
- deadbeef->junk_id3v2_free (&id3v2);
- memcpy (&id3v2, &converted, sizeof (DB_id3v2_tag_t));
- continue;
- }
- else if (id3v2.version0 == 3) {
- if (deadbeef->junk_id3v2_convert_23_to_24 (&id3v2, &converted) != 0) {
- goto error;
- }
- deadbeef->junk_id3v2_free (&id3v2);
- memcpy (&id3v2, &converted, sizeof (DB_id3v2_tag_t));
- continue;
- }
- else if (id3v2.version0 == 4) {
- if (deadbeef->junk_id3v2_convert_24_to_23 (&id3v2, &converted) != 0) {
- goto error;
- }
- deadbeef->junk_id3v2_free (&id3v2);
- memcpy (&id3v2, &converted, sizeof (DB_id3v2_tag_t));
- continue;
- }
- }
-
- junk_id3v2_remove_all_txxx_frames (&id3v2);
-
- pl_lock ();
- {
- // COMM
- junk_id3v2_remove_frames (&id3v2, "COMM");
- const char *val = pl_find_meta (it, "comment");
- if (val && *val) {
- junk_id3v2_add_comment_frame (&id3v2, "eng", "", val);
- }
- // UFID
- junk_id3v2_remove_ufid_frames (&id3v2, "UFID", "http://musicbrainz.org");
- val = pl_find_meta (it, "musicbrainz_trackid");
- if (val && *val) {
- junk_id3v2_add_ufid_frame (&id3v2, "http://musicbrainz.org", val, strlen (val));
- }
- }
- pl_unlock ();
-
- // remove all known normal frames (they will be refilled from track metadata)
- int idx = id3v2.version0 == 3 ? MAP_ID3V23 : MAP_ID3V24;
- for (int i = 0; frame_mappingi; i += FRAME_MAPPINGS) {
- if (frame_mappingi+idx) {
- junk_id3v2_remove_frames (&id3v2, frame_mappingi+idx);
- trace ("removed frame %s\n", frame_mappingi+idx);
- }
- }
-
- DB_metaInfo_t *meta = pl_get_metadata_head (it);
- while (meta) {
- if (meta->value && *meta->value) {
- int i;
- for (i = 0; frame_mappingi; i += FRAME_MAPPINGS) {
- if (!strcasecmp (meta->key, frame_mappingi+MAP_DDB)) {
- const char *frm_name = id3v2_version == 3 ? frame_mappingi+MAP_ID3V23 : frame_mappingi+MAP_ID3V24;
- if (frm_name) {
- // field is known and supported for this tag version
- trace ("add_frame %s %s\n", frm_name, meta->value);
- junk_id3v2_add_text_frame (&id3v2, frm_name, meta->value);
- }
- break;
- }
- }
- if (!frame_mappingi
- && meta->key0 != ':'
- && strcasecmp (meta->key, "comment")
- && strcasecmp (meta->key, "track")
- && strcasecmp (meta->key, "numtracks")) {
- // add as txxx
- trace ("adding unknown frame as TXX %s=%s\n", meta->key, meta->value);
- junk_id3v2_remove_txxx_frame (&id3v2, meta->key);
- junk_id3v2_add_txxx_frame (&id3v2, meta->key, meta->value);
- }
- }
- meta = meta->next;
- }
-
- // add tracknumber/totaltracks
- pl_lock ();
- {
- const char *track = pl_find_meta (it, "track");
- const char *totaltracks = pl_find_meta (it, "numtracks");
- if (track && totaltracks) {
- char s100;
- snprintf (s, sizeof (s), "%s/%s", track, totaltracks);
- junk_id3v2_remove_frames (&id3v2, "TRCK");
- junk_id3v2_add_text_frame (&id3v2, "TRCK", s);
- }
- else if (track) {
- junk_id3v2_remove_frames (&id3v2, "TRCK");
- junk_id3v2_add_text_frame (&id3v2, "TRCK", track);
- }
- }
- pl_unlock ();
-
- // write tag
- if (junk_id3v2_write2 (out, &id3v2) != 0) {
- trace ("cmp3_write_metadata: failed to write id3v2 tag to %s\n", pl_find_meta (it, ":URI"))
- goto error;
- }
- }
-
- // now write audio data
- buffer = malloc (8192);
- deadbeef->fseek (fp, header, SEEK_SET);
- int64_t writesize = fsize;
- if (footer > 0) {
- writesize -= (fsize - footer);
- }
- writesize -= header;
- trace ("writesize: %d, id3v1_start: %d(%d), apev2_start: %d, footer: %d\n", writesize, id3v1_start, fsize-id3v1_start, apev2_start, footer);
-
- while (writesize > 0) {
- int rb = min (8192, writesize);
- rb = deadbeef->fread (buffer, 1, rb, fp);
- if (rb < 0) {
- fprintf (stderr, "junk_write_id3v2: error reading input data\n");
- goto error;
- }
- if (write (out, buffer, rb) != rb) {
- fprintf (stderr, "junk_write_id3v2: error writing output file\n");
- goto error;
- }
- if (rb == 0) {
- break; // eof
- }
- writesize -= rb;
- }
-
- if (!write_apev2 && !strip_apev2 && apev2_start != 0) {
- trace ("copying original apev2 tag\n");
- if (deadbeef->fseek (fp, apev2_start, SEEK_SET) == -1) {
- trace ("cmp3_write_metadata: failed to seek to original apev2 tag position in %s\n", pl_find_meta (it, ":URI"));
- goto error;
- }
- uint8_t *buf = malloc (apev2_size);
- if (!buf) {
- trace ("cmp3_write_metadata: failed to alloc %d bytes for apev2 tag\n", apev2_size);
- goto error;
- }
- if (deadbeef->fread (buf, 1, apev2_size, fp) != apev2_size) {
- trace ("cmp3_write_metadata: failed to read original apev2 tag from %s\n", pl_find_meta (it, ":URI"));
- free (buf);
- goto error;
- }
- if (write (out, buf, apev2_size) != apev2_size) {
- trace ("cmp3_write_metadata: failed to copy original apev2 tag from %s to temp file\n", pl_find_meta (it, ":URI"));
- free (buf);
- goto error;
- }
- free (buf);
- }
- else if (write_apev2) {
- trace ("writing new apev2 tag (strip=%d)\n", strip_apev2);
- if (strip_apev2 || junk_apev2_read_full (NULL, &apev2, fp) != 0) {
- deadbeef->junk_apev2_free (&apev2);
- memset (&apev2, 0, sizeof (apev2));
- }
-
- // remove all text frames
- junk_apev2_remove_all_text_frames (&apev2);
-
- // add all basic frames
- DB_metaInfo_t *meta = pl_get_metadata_head (it);
- while (meta) {
- if (meta->value && *meta->value) {
- int i;
- for (i = 0; frame_mappingi; i += FRAME_MAPPINGS) {
- if (!strcasecmp (meta->key, frame_mappingi+MAP_DDB) && frame_mappingi+MAP_APEV2) {
- trace ("apev2 writing known field: %s=%s\n", meta->key, meta->value);
- junk_apev2_add_text_frame (&apev2, frame_mappingi+MAP_APEV2, meta->value);
- break;
- }
- }
- if (!frame_mappingi
- && meta->key0 != ':'
- && strcasecmp (meta->key, "track")
- && strcasecmp (meta->key, "numtracks")) {
- trace ("apev2 writing unknown field: %s=%s\n", meta->key, meta->value);
- junk_apev2_add_text_frame (&apev2, meta->key, meta->value);
- }
- }
- meta = meta->next;
- }
-
- // add tracknumber/totaltracks
- pl_lock ();
- {
- const char *track = pl_find_meta (it, "track");
- const char *totaltracks = pl_find_meta (it, "numtracks");
- if (track && totaltracks) {
- char s100;
- snprintf (s, sizeof (s), "%s/%s", track, totaltracks);
- junk_apev2_remove_frames (&apev2, "Track");
- junk_apev2_add_text_frame (&apev2, "Track", s);
- }
- else if (track) {
- junk_apev2_remove_frames (&apev2, "Track");
- junk_apev2_add_text_frame (&apev2, "Track", track);
- }
- }
- pl_unlock ();
-
- // write tag
- if (junk_apev2_write2 (out, &apev2, 0, 1) != 0) {
- trace ("cmp3_write_metadata: failed to write apev2 tag to %s\n", pl_find_meta (it, ":URI"))
- goto error;
- }
- }
-
- if (!write_id3v1 && !strip_id3v1 && id3v1_start != 0) {
- trace ("copying original id3v1 tag %d %d %d\n", write_id3v1, strip_id3v1, id3v1_start);
- if (deadbeef->fseek (fp, id3v1_start, SEEK_SET) == -1) {
- trace ("cmp3_write_metadata: failed to seek to original id3v1 tag position in %s\n", pl_find_meta (it, ":URI"));
- goto error;
- }
- char buf128;
- if (deadbeef->fread (buf, 1, 128, fp) != 128) {
- trace ("cmp3_write_metadata: failed to read original id3v1 tag from %s\n", pl_find_meta (it, ":URI"));
- goto error;
- }
- if (write (out, buf, 128) != 128) {
- trace ("cmp3_write_metadata: failed to copy id3v1 tag from %s to temp file\n", pl_find_meta (it, ":URI"));
- goto error;
- }
- }
- else if (write_id3v1) {
- trace ("writing new id3v1 tag\n");
- if (junk_id3v1_write2 (out, it, id3v1_encoding) != 0) {
- trace ("cmp3_write_metadata: failed to write id3v1 tag to %s\n", pl_find_meta (it, ":URI"))
- goto error;
- }
- }
-
- if (strip_id3v1 && !write_id3v1) {
- item_flags &= ~DDB_TAG_ID3V1;
- }
- if (strip_id3v2 && !write_id3v2) {
- item_flags &= ~(DDB_TAG_ID3V22|DDB_TAG_ID3V23|DDB_TAG_ID3V24);
- }
- if (strip_apev2 && !write_apev2) {
- item_flags &= ~DDB_TAG_APEV2;
- }
-
- if (write_id3v1) {
- item_flags |= DDB_TAG_ID3V1;
- }
- if (write_id3v2) {
- item_flags &= ~(DDB_TAG_ID3V22|DDB_TAG_ID3V23|DDB_TAG_ID3V24);
- item_flags |= id3v2_version == 3 ? DDB_TAG_ID3V23 : DDB_TAG_ID3V24;
- }
- if (write_apev2) {
- item_flags |= DDB_TAG_APEV2;
- }
-
- pl_set_item_flags (it, item_flags);
- err = 0;
-error:
- if (fp) {
- deadbeef->fclose (fp);
- }
- if (out) {
- close (out);
- out = -1;
- }
- if (buffer) {
- free (buffer);
- }
- if (!err) {
- pl_lock ();
- rename (tmppath, fname);
- pl_unlock ();
- }
- else {
- unlink (tmppath);
- }
- return err;
-}
-
-void
-junk_enable_cp1251_detection (int enable) {
- enable_cp1251_detection = enable;
-}
-
-void
-junk_enable_cp936_detection (int enable) {
- enable_cp936_detection = enable;
-}
-
-void
-junk_enable_shift_jis_detection (int enable) {
- enable_shift_jis_detection = enable;
-}
-
-void
-junk_configchanged (void) {
- int cp1251 = conf_get_int ("junk.enable_cp1251_detection", 1);
- int cp936 = conf_get_int ("junk.enable_cp936_detection", 0);
- int shift_jis = conf_get_int ("junk.enable_shift_jis_detection", 0);
- junk_enable_cp1251_detection (cp1251);
- junk_enable_cp936_detection (cp936);
- junk_enable_shift_jis_detection (shift_jis);
-}

deadbeef-0.6.2.tar.bz2/junklib.h Deleted

@@ -1,131 +0,0 @@
-/* junklib -- library for reading tags from various audio files for deadbeef player
- http://deadbeef.sourceforge.net
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __JUNKLIB_H
-#define __JUNKLIB_H
-
-#include <stdio.h>
-#include "deadbeef.h"
-
-struct playItem_s;
-
-int
-junk_id3v1_read (struct playItem_s *it, DB_FILE *fp);
-
-int
-junk_id3v1_find (DB_FILE *fp);
-
-int
-junk_id3v1_write (FILE *fp, struct playItem_s *it, const char *enc);
-
-int
-junk_id3v2_find (DB_FILE *fp, int *psize);
-
-int
-junk_id3v2_read_full (struct playItem_s *it, DB_id3v2_tag_t *tag, DB_FILE *fp);
-
-int
-junk_id3v2_convert_24_to_23 (DB_id3v2_tag_t *tag24, DB_id3v2_tag_t *tag23);
-
-int
-junk_id3v2_convert_23_to_24 (DB_id3v2_tag_t *tag23, DB_id3v2_tag_t *tag24);
-
-int
-junk_id3v2_convert_22_to_24 (DB_id3v2_tag_t *tag22, DB_id3v2_tag_t *tag24);
-
-int
-junk_id3v2_convert_apev2_to_24 (DB_apev2_tag_t *ape, DB_id3v2_tag_t *tag24);
-
-DB_id3v2_frame_t *
-junk_id3v2_add_text_frame (DB_id3v2_tag_t *tag, const char *frame_id, const char *value);
-
-int
-junk_id3v2_remove_frames (DB_id3v2_tag_t *tag, const char *frame_id);
-
-int
-junk_id3v2_write (FILE *file, DB_id3v2_tag_t *tag);
-
-void
-junk_id3v2_free (DB_id3v2_tag_t *tag);
-
-int
-junk_id3v2_read (struct playItem_s *it, DB_FILE *fp);
-
-int
-junk_apev2_read_full (struct playItem_s *it, DB_apev2_tag_t *tag_store, DB_FILE *fp);
-
-int
-junk_apev2_read_full_mem (struct playItem_s *it, DB_apev2_tag_t *tag_store, char *mem, int memsize);
-
-int
-junk_apev2_read (struct playItem_s *it, DB_FILE *fp);
-
-int
-junk_apev2_read_mem (struct playItem_s *it, char *mem, int size);
-
-int
-junk_apev2_find (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems);
-
-DB_apev2_frame_t *
-junk_apev2_add_text_frame (DB_apev2_tag_t *tag, const char *frame_id, const char *value);
-
-int
-junk_apev2_remove_frames (DB_apev2_tag_t *tag, const char *frame_id);
-
-void
-junk_apev2_free (DB_apev2_tag_t *tag);
-
-int
-junk_apev2_write (FILE *fp, DB_apev2_tag_t *tag, int write_header, int write_footer);
-
-int
-junk_get_leading_size_stdio (FILE *fp);
-
-int
-junk_get_leading_size (DB_FILE *fp);
-
-const char *
-junk_detect_charset (const char *s);
-
-int
-junk_iconv (const char *in, int inlen, char *out, int outlen, const char *cs_in, const char *cs_out);
-
-int
-junk_recode (const char *in, int inlen, char *out, int outlen, const char *cs);
-
-int
-junk_rewrite_tags (struct playItem_s *it, uint32_t junk_flags, int id3v2_version, const char *id3v1_encoding);
-
-void
-junk_enable_cp1251_detection (int enable);
-
-void
-junk_configchanged (void);
-
-void
-junk_enable_cp936_detection (int enable);
-
-const char *
-junk_detect_charset_len (const char *s, int len);
-
-#endif // __JUNKLIB_H

deadbeef-0.6.2.tar.bz2/m4/intltool.m4 Deleted

@@ -1,237 +0,0 @@
-## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-## Copyright (C) 2001 Eazel, Inc.
-## Author: Maciej Stachowiak <mjs@noisehavoc.org>
-## Kenneth Christiansen <kenneth@gnu.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.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-dnl IT_PROG_INTLTOOL(MINIMUM-VERSION, no-xml)
-# serial 42 IT_PROG_INTLTOOL
-AC_DEFUN(IT_PROG_INTLTOOL, 
-AC_PREREQ(2.50)dnl
-AC_REQUIRE(AM_NLS)dnl
-
-case "$am__api_version" in
- 1.01234)
-	AC_MSG_ERROR(Automake 1.5 or newer is required to use intltool)
- ;;
- *)
- ;;
-esac
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "$1"; then
- AC_MSG_CHECKING(for intltool >= $1)
- AC_MSG_RESULT($INTLTOOL_APPLIED_VERSION found)
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR(Your intltool is too old. You need intltool $1 or later.)
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, intltool-update)
-AC_PATH_PROG(INTLTOOL_MERGE, intltool-merge)
-AC_PATH_PROG(INTLTOOL_EXTRACT, intltool-extract)
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- AC_MSG_ERROR(The intltool scripts were not found. Please install intltool.)
-fi
-
-if test -z "$AM_DEFAULT_VERBOSITY"; then
- AM_DEFAULT_VERBOSITY=1
-fi
-AC_SUBST(AM_DEFAULT_VERBOSITY)
-
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;'
-AC_SUBST(INTLTOOL_V_MERGE)
-AC_SUBST(INTLTOOL__v_MERGE_)
-AC_SUBST(INTLTOOL__v_MERGE_0)
-
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
-AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
-AC_SUBST(intltool__v_merge_options_)
-AC_SUBST(intltool__v_merge_options_0)
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
-else
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
-fi
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- AC_MSG_ERROR(GNU gettext tools not found; required for intltool)
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- AC_MSG_ERROR(GNU gettext tools not found; required for intltool)
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
- AC_MSG_ERROR(perl not found)
-fi
-AC_MSG_CHECKING(for perl >= 5.8.1)
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
- AC_MSG_ERROR(perl 5.8.1 is required for intltool)
-else
- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
- AC_MSG_RESULT($IT_PERL_VERSION)
-fi
-if test "x$2" != "xno-xml"; then
- AC_MSG_CHECKING(for XML::Parser)
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- AC_MSG_RESULT(ok)
- else
- AC_MSG_ERROR(XML::Parser perl module is required for intltool)
- fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- AC_LINK_IFELSE(
- AC_LANG_PROGRAM(,
- extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr),
- DATADIRNAME=share,
- case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share
- dnl in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- DATADIRNAME=share, DATADIRNAME=lib)
- ;;
- *)
- DATADIRNAME=lib
- ;;
- esac)
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR(po)
-
-)
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN(IT_PO_SUBDIR,
-AC_PREREQ(2.53)dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE(
- AC_CONFIG_COMMANDS($1/stamp-it, 
- if ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ; then
- AC_MSG_ERROR($1/Makefile.in.in was not created by intltoolize.)
- fi
- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
- >"$1/stamp-it.tmp"
- sed '/^#/d
-	 s/^.* *//
-	 /^ 	*$/d
-	'"s|^|	$ac_top_srcdir/|" \
- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
- 
- sed '/^POTFILES =/,/^\\$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	 }
-	 ' "$1/Makefile.in" >"$1/Makefile"
- rm -f "$1/Makefile.tmp"
- mv "$1/stamp-it.tmp" "$1/stamp-it"
- )
-)dnl
-)
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN(_IT_SUBST,
-
-AC_SUBST($1)
-m4_ifdef(_AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($1))
-
-)
-
-# deprecated macros
-AU_ALIAS(AC_PROG_INTLTOOL, IT_PROG_INTLTOOL)
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN(AC_PROG_INTLTOOL, ...)
-

deadbeef-0.6.2.tar.bz2/m4/libtool.m4 Deleted

@@ -1,8001 +0,0 @@
-# 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, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# 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.
-
-m4_define(_LT_COPYING, dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that 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 GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-)
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun(LT_PREREQ,
-m4_if(m4_version_compare(m4_defn(LT_PACKAGE_VERSION), $1), -1,
- m4_default($3,
-		 m4_fatal(Libtool version $1 or higher is required,
-		 63)),
- $2))
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun(_LT_CHECK_BUILDDIR,
-case `pwd` in
- *\ * | *\	*)
- AC_MSG_WARN(Libtool does not cope well with whitespace in `pwd`) ;;
-esac
-)
-
-
-# LT_INIT(OPTIONS)
-# ------------------
-AC_DEFUN(LT_INIT,
-AC_PREREQ(2.58)dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
-AC_BEFORE($0, LT_LANG)dnl
-AC_BEFORE($0, LT_OUTPUT)dnl
-AC_BEFORE($0, LTDL_INIT)dnl
-m4_require(_LT_CHECK_BUILDDIR)dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid(^_?LT_A-Z_+$)dnl
-m4_pattern_allow(^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$)dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE(LTOPTIONS_VERSION)dnl
-AC_REQUIRE(LTSUGAR_VERSION)dnl
-AC_REQUIRE(LTVERSION_VERSION)dnl
-AC_REQUIRE(LTOBSOLETE_VERSION)dnl
-m4_require(_LT_PROG_LTMAIN)dnl
-
-_LT_SHELL_INIT(SHELL=${CONFIG_SHELL-/bin/sh})
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS($0, $1)
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define(LT_INIT)
-)# LT_INIT
-
-# Old names:
-AU_ALIAS(AC_PROG_LIBTOOL, LT_INIT)
-AU_ALIAS(AM_PROG_LIBTOOL, LT_INIT)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_PROG_LIBTOOL, )
-dnl AC_DEFUN(AM_PROG_LIBTOOL, )
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-m4_defun(_LT_CC_BASENAME,
-for cc_temp in $1""; do
- case $cc_temp in
- compile | *\\/compile | ccache | *\\/ccache ) ;;
- distcc | *\\/distcc | purify | *\\/purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-)
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require(_LT_FILEUTILS_DEFAULTS)'.
-m4_defun(_LT_FILEUTILS_DEFAULTS,
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-)# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun(_LT_SETUP,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_CANONICAL_BUILD)dnl
-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
-dnl
-_LT_DECL(, build_alias, 0, The build system)dnl
-_LT_DECL(, build, 0)dnl
-_LT_DECL(, build_os, 0)dnl
-dnl
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_REQUIRE(LT_PATH_LD)dnl
-AC_REQUIRE(LT_PATH_NM)dnl
-dnl
-AC_REQUIRE(AC_PROG_LN_S)dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL(, LN_S, 1, Whether we need soft or hard links)dnl
-dnl
-AC_REQUIRE(LT_CMD_MAX_LEN)dnl
-_LT_DECL(objext, ac_objext, 0, Object file suffix (normally "o"))dnl
-_LT_DECL(, exeext, 0, Executable file suffix (normally ""))dnl
-dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_CHECK_SHELL_FEATURES)dnl
-m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
-m4_require(_LT_CMD_RELOAD)dnl
-m4_require(_LT_CHECK_MAGIC_METHOD)dnl
-m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
-m4_require(_LT_CMD_OLD_ARCHIVE)dnl
-m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
-m4_require(_LT_WITH_SYSROOT)dnl
-
-_LT_CONFIG_LIBTOOL_INIT(
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-)
-if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require(_LT_TAG_COMPILER)dnl
-
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME($compiler)
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- _LT_PATH_MAGIC
- fi
- ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG(CC)
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-)# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun(_LT_PREPARE_SED_QUOTE_VARS,
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/$"`$\\$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$"`\\$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-)
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun(_LT_PROG_LTMAIN,
-m4_ifdef(AC_REQUIRE_AUX_FILE, AC_REQUIRE_AUX_FILE(ltmain.sh))dnl
-_LT_CONFIG_LIBTOOL_INIT(ac_aux_dir='$ac_aux_dir')
-ltmain="$ac_aux_dir/ltmain.sh"
-)# _LT_PROG_LTMAIN
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT(INIT-COMMANDS)
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define(_LT_CONFIG_LIBTOOL_INIT,
-m4_ifval($1,
- m4_append(_LT_OUTPUT_LIBTOOL_INIT,
- $1
-)))
-
-# Initialize.
-m4_define(_LT_OUTPUT_LIBTOOL_INIT)
-
-
-# _LT_CONFIG_LIBTOOL(COMMANDS)
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define(_LT_CONFIG_LIBTOOL,
-m4_ifval($1,
- m4_append(_LT_OUTPUT_LIBTOOL_COMMANDS,
- $1
-)))
-
-# Initialize.
-m4_define(_LT_OUTPUT_LIBTOOL_COMMANDS)
-
-
-# _LT_CONFIG_SAVE_COMMANDS(COMMANDS, INIT_COMMANDS)
-# -----------------------------------------------------
-m4_defun(_LT_CONFIG_SAVE_COMMANDS,
-_LT_CONFIG_LIBTOOL($1)
-_LT_CONFIG_LIBTOOL_INIT($2)
-)
-
-
-# _LT_FORMAT_COMMENT(COMMENT)
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define(_LT_FORMAT_COMMENT,
-m4_ifval($1, 
-m4_bpatsubst(m4_bpatsubst($1, ^ *, # ),
- '`$\, \\\&)m4_bmatch($1, !?.$, , .)
-))
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL(CONFIGNAME, VARNAME, VALUE, DESCRIPTION, IS-TAGGED?)
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME. Any other value will be used directly.
-m4_define(_LT_DECL,
-lt_if_append_uniq(lt_decl_varnames, $2, , ,
- lt_dict_add_subkey(lt_decl_dict, $2, libtool_name,
-	m4_ifval($1, $1, $2))
- lt_dict_add_subkey(lt_decl_dict, $2, value, $3)
- m4_ifval($4,
-	lt_dict_add_subkey(lt_decl_dict, $2, description, $4))
- lt_dict_add_subkey(lt_decl_dict, $2,
-	tagged?, m4_ifval($5, yes, no)))
-)
-
-
-# _LT_TAGDECL(CONFIGNAME, VARNAME, VALUE, DESCRIPTION)
-# --------------------------------------------------------
-m4_define(_LT_TAGDECL, _LT_DECL($1, $2, $3, $4, yes))
-
-
-# lt_decl_tag_varnames(SEPARATOR, VARNAME1...)
-# ------------------------------------------------
-m4_define(lt_decl_tag_varnames,
-_lt_decl_filter(tagged?, yes, $@))
-
-
-# _lt_decl_filter(SUBKEY, VALUE, SEPARATOR, VARNAME1..)
-# ---------------------------------------------------------
-m4_define(_lt_decl_filter,
-m4_case($#,
- 0, m4_fatal($0: too few arguments: $#),
- 1, m4_fatal($0: too few arguments: $#: $1),
- 2, lt_dict_filter(lt_decl_dict, $1, $2, , lt_decl_varnames),
- 3, lt_dict_filter(lt_decl_dict, $1, $2, $3, lt_decl_varnames),
- lt_dict_filter(lt_decl_dict, $@))dnl
-)
-
-
-# lt_decl_quote_varnames(SEPARATOR, VARNAME1...)
-# --------------------------------------------------
-m4_define(lt_decl_quote_varnames,
-_lt_decl_filter(value, 1, $@))
-
-
-# lt_decl_dquote_varnames(SEPARATOR, VARNAME1...)
-# ---------------------------------------------------
-m4_define(lt_decl_dquote_varnames,
-_lt_decl_filter(value, 2, $@))
-
-
-# lt_decl_varnames_tagged(SEPARATOR, VARNAME1...)
-# ---------------------------------------------------
-m4_define(lt_decl_varnames_tagged,
-m4_assert($# <= 2)dnl
-_$0(m4_quote(m4_default($1, , )),
- m4_ifval($2, $2, m4_dquote(lt_decl_tag_varnames)),
- m4_split(m4_normalize(m4_quote(_LT_TAGS)), )))
-m4_define(_lt_decl_varnames_tagged,
-m4_ifval($3, lt_combine($1, $2, _, $3)))
-
-
-# lt_decl_all_varnames(SEPARATOR, VARNAME1...)
-# ------------------------------------------------
-m4_define(lt_decl_all_varnames,
-_$0(m4_quote(m4_default($1, , )),
- m4_if($2, ,
-	 m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))dnl
-)
-m4_define(_lt_decl_all_varnames,
-lt_join($@, lt_decl_varnames_tagged($1,
-			lt_decl_tag_varnames(, , m4_shift($@))))dnl
-)
-
-
-# _LT_CONFIG_STATUS_DECLARE(VARNAME)
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
-# must have a single quote delimited value for this to work.
-m4_define(_LT_CONFIG_STATUS_DECLARE,
-$1='`$ECHO "$$1" | $SED "$delay_single_quote_subst"`')
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly. In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun(_LT_CONFIG_STATUS_DECLARATIONS,
-m4_foreach(_lt_var, m4_quote(lt_decl_all_varnames),
- m4_n(_LT_CONFIG_STATUS_DECLARE(_lt_var))))
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun(_LT_LIBTOOL_TAGS,
-_LT_FORMAT_COMMENT(The names of the tagged configurations supported by this script)dnl
-available_tags="_LT_TAGS"dnl
-)
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, TAG)
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-# # Some comment about what VAR is for.
-# visible_name=$lt_internal_name
-m4_define(_LT_LIBTOOL_DECLARE,
-_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch(lt_decl_dict, $1,
-					 description)))dnl
-m4_pushdef(_libtool_name,
- m4_quote(lt_dict_fetch(lt_decl_dict, $1, libtool_name)))dnl
-m4_case(m4_quote(lt_dict_fetch(lt_decl_dict, $1, value)),
- 0, _libtool_name=$$1,
- 1, _libtool_name=$lt_$1,
- 2, _libtool_name=$lt_$1,
- _libtool_name=lt_dict_fetch(lt_decl_dict, $1, value))dnl
-m4_ifval($2, _$2)m4_popdef(_libtool_name)dnl
-)
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun(_LT_LIBTOOL_CONFIG_VARS,
-m4_foreach(_lt_var,
- m4_quote(_lt_decl_filter(tagged?, no, , lt_decl_varnames)),
- m4_n(_LT_LIBTOOL_DECLARE(_lt_var))))
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define(_LT_LIBTOOL_TAG_VARS,
-m4_foreach(_lt_var, m4_quote(lt_decl_tag_varnames),
- m4_n(_LT_LIBTOOL_DECLARE(_lt_var, $1))))
-
-
-# _LT_TAGVAR(VARNAME, TAGNAME)
-# ------------------------------
-m4_define(_LT_TAGVAR, m4_ifval($2, $1_$2, $1))
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun(_LT_CONFIG_COMMANDS,
-AC_PROVIDE_IFELSE(LT_OUTPUT,
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
- AC_CONFIG_COMMANDS(libtool,
- $SHELL $CONFIG_LT || AS_EXIT(1), CONFIG_LT='$CONFIG_LT'),
- dnl If the libtool generation code is destined for config.status,
- dnl expand the accumulated commands and init code now:
- AC_CONFIG_COMMANDS(libtool,
- _LT_OUTPUT_LIBTOOL_COMMANDS, _LT_OUTPUT_LIBTOOL_COMMANDS_INIT))
-)#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define(_LT_OUTPUT_LIBTOOL_COMMANDS_INIT,
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames( \
-, lt_decl_quote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *\\\\\\\`\\"\\\$*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames( \
-, lt_decl_dquote_varnames); do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *\\\\\\\`\\"\\\$*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
- ;;
- esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-)
-
-# _LT_GENERATED_FILE_INIT(FILE, COMMENT)
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script. The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef(AS_INIT_GENERATED,
-m4_defun(_LT_GENERATED_FILE_INIT,AS_INIT_GENERATED($@)),
-m4_defun(_LT_GENERATED_FILE_INIT,
-m4_require(AS_PREPARE)dnl
-m4_pushdef(AS_MESSAGE_LOG_FD)dnl
-lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1dnl
-m4_popdef(AS_MESSAGE_LOG_FD)))# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN(LT_OUTPUT,
-: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE(creating $CONFIG_LT)
-_LT_GENERATED_FILE_INIT("$CONFIG_LT",
-# Run this file to recreate a libtool stub with the current configuration.)
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
- echo
- AS_BOX(Running $as_me.)
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $0 OPTIONS
-
- -h, --help print this help, then exit
- -V, --version print version number, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset(AC_PACKAGE_NAME, AC_PACKAGE_NAME )config.ltdnl
-m4_ifset(AC_PACKAGE_VERSION, AC_PACKAGE_VERSION)
-configured by $0, generated by m4_PACKAGE_STRING.
-
-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."
-
-while test $# != 0
-do
- case $1 in
- --version | --v* | -V )
- echo "$lt_cl_version"; exit 0 ;;
- --help | --h* | -h )
- echo "$lt_cl_help"; exit 0 ;;
- --debug | --d* | -d )
- debug=: ;;
- --quiet | --q* | --silent | --s* | -q )
- lt_cl_silent=: ;;
-
- -*) AC_MSG_ERROR(unrecognized option: $1
-Try \`$0 --help' for more information.) ;;
-
- *) AC_MSG_ERROR(unrecognized argument: $1
-Try \`$0 --help' for more information.) ;;
- esac
- shift
-done
-
-if $lt_cl_silent; then
- exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE(creating $ofile)
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure. Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
- lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-)# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars. Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun(_LT_CONFIG,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-_LT_CONFIG_SAVE_COMMANDS(
- m4_define(_LT_TAG, m4_if($1, , C, $1))dnl
- m4_if(_LT_TAG, C, 
- # See if we are running on zsh, and set the options which allow our
- # commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
- setopt NO_GLOB_SUBST
- fi
-
- cfgfile="${ofile}T"
- trap "$RM \"$cfgfile\"; exit 1" 1 2 15
- $RM "$cfgfile"
-
- cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
- case $host_os in
- aix3*)
- cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program. For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
-fi
-_LT_EOF
- ;;
- esac
-
- _LT_PROG_LTMAIN
-
- # We use sed instead of cat because bash on DJGPP gets confused if
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
-
- _LT_PROG_REPLACE_SHELLFNS
-
- mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-,
-cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-)dnl /m4_if
-,
-m4_if($1, , 
- PACKAGE='$PACKAGE'
- VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
- RM='$RM'
- ofile='$ofile', )
-)dnl /_LT_CONFIG_SAVE_COMMANDS
-)# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-# autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN(LT_SUPPORTED_TAG, )
-
-
-# C support is built-in for now
-m4_define(_LT_LANG_C_enabled, )
-m4_define(_LT_TAGS, )
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN(LT_LANG,
-AC_BEFORE($0, LT_OUTPUT)dnl
-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),
- Windows Resource,	_LT_LANG(RC),
- m4_ifdef(_LT_LANG_$1_CONFIG,
- _LT_LANG($1),
- m4_fatal($0: unsupported language: "$1")))dnl
-)# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun(_LT_LANG,
-m4_ifdef(_LT_LANG_$1_enabled, ,
- LT_SUPPORTED_TAG($1)dnl
- m4_append(_LT_TAGS, $1 )dnl
- m4_define(_LT_LANG_$1_enabled, )dnl
- _LT_LANG_$1_CONFIG($1))dnl
-)# _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,
-AC_PROVIDE_IFELSE(AC_PROG_CXX,
- LT_LANG(CXX),
- m4_define(AC_PROG_CXX, defn(AC_PROG_CXX)LT_LANG(CXX)))
-
-AC_PROVIDE_IFELSE(AC_PROG_F77,
- LT_LANG(F77),
- m4_define(AC_PROG_F77, defn(AC_PROG_F77)LT_LANG(F77)))
-
-AC_PROVIDE_IFELSE(AC_PROG_FC,
- LT_LANG(FC),
- m4_define(AC_PROG_FC, defn(AC_PROG_FC)LT_LANG(FC)))
-
-dnl The call to AM_PROG_GCJ is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE(AC_PROG_GCJ,
- LT_LANG(GCJ),
- AC_PROVIDE_IFELSE(AM_PROG_GCJ,
- LT_LANG(GCJ),
- AC_PROVIDE_IFELSE(LT_PROG_GCJ,
- LT_LANG(GCJ),
- m4_ifdef(AC_PROG_GCJ,
-	m4_define(AC_PROG_GCJ, defn(AC_PROG_GCJ)LT_LANG(GCJ)))
- m4_ifdef(AM_PROG_GCJ,
-	m4_define(AM_PROG_GCJ, defn(AM_PROG_GCJ)LT_LANG(GCJ)))
- 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)))
-)# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN(AC_LIBTOOL_CXX, LT_LANG(C++))
-AU_DEFUN(AC_LIBTOOL_F77, LT_LANG(Fortran 77))
-AU_DEFUN(AC_LIBTOOL_FC, LT_LANG(Fortran))
-AU_DEFUN(AC_LIBTOOL_GCJ, LT_LANG(Java))
-AU_DEFUN(AC_LIBTOOL_RC, LT_LANG(Windows Resource))
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_CXX, )
-dnl AC_DEFUN(AC_LIBTOOL_F77, )
-dnl AC_DEFUN(AC_LIBTOOL_FC, )
-dnl AC_DEFUN(AC_LIBTOOL_GCJ, )
-dnl AC_DEFUN(AC_LIBTOOL_RC, )
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun(_LT_TAG_COMPILER,
-AC_REQUIRE(AC_PROG_CC)dnl
-
-_LT_DECL(LTCC, CC, 1, A C compiler)dnl
-_LT_DECL(LTCFLAGS, CFLAGS, 1, LTCC compiler flags)dnl
-_LT_TAGDECL(CC, compiler, 1, A language specific compiler)dnl
-_LT_TAGDECL(with_gcc, GCC, 0, Is the compiler the GNU compiler?)dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-)# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun(_LT_COMPILER_BOILERPLATE,
-m4_require(_LT_DECL_SED)dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-)# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun(_LT_LINKER_BOILERPLATE,
-m4_require(_LT_DECL_SED)dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-)# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once(_LT_REQUIRED_DARWIN_CHECKS,
- case $host_os in
- rhapsody* | darwin*)
- AC_CHECK_TOOL(DSYMUTIL, dsymutil, :)
- AC_CHECK_TOOL(NMEDIT, nmedit, :)
- AC_CHECK_TOOL(LIPO, lipo, :)
- AC_CHECK_TOOL(OTOOL, otool, :)
- AC_CHECK_TOOL(OTOOL64, otool64, :)
- _LT_DECL(, DSYMUTIL, 1,
- Tool to manipulate archived DWARF debug symbol files on Mac OS X)
- _LT_DECL(, NMEDIT, 1,
- Tool to change global to local symbols on Mac OS X)
- _LT_DECL(, LIPO, 1,
- Tool to manipulate fat objects and archives on Mac OS X)
- _LT_DECL(, OTOOL, 1,
- ldd/readelf like tool for Mach-O binaries on Mac OS X)
- _LT_DECL(, OTOOL64, 1,
- ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4)
-
- AC_CACHE_CHECK(for -single_module linker flag,lt_cv_apple_cc_single_mod,
- lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
- _lt_result=$?
-	# 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
-	fi
-	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
- save_LDFLAGS=$LDFLAGS
- echo "_main" > conftest.sym
- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
-	lt_cv_ld_exported_symbols_list=yes,
-	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
-int forced_loaded() { return 2;}
-_LT_EOF
- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
- cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
- 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 -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
- fi
- rm -f conftest.err libconftest.a conftest conftest.c
- rm -rf conftest.dSYM
- )
- case $host_os in
- rhapsody* | darwin1.012)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin91*)
-	 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.012*)
-	 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
- ;;
- esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
- else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
- _lt_dsymutil='~$DSYMUTIL $lib || :'
- else
- _lt_dsymutil=
- fi
- ;;
- esac
-)
-
-
-# _LT_DARWIN_LINKER_FEATURES(TAG)
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun(_LT_DARWIN_LINKER_FEATURES,
-
- m4_require(_LT_REQUIRED_DARWIN_CHECKS)
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_automatic, $1)=yes
- _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
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
- case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
- *) _lt_dar_can_shared=$GCC ;;
- esac
- if test "$_lt_dar_can_shared" = "yes"; then
- output_verbose_link_cmd=func_echo_all
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- m4_if($1, CXX,
- if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
- fi
-,)
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
-)
-
-# _LT_SYS_MODULE_PATH_AIX(TAGNAME)
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun(_LT_SYS_MODULE_PATH_AIX,
-m4_require(_LT_DECL_SED)dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
- aix_libpath=$lt_cv_aix_libpath
-else
- AC_CACHE_VAL(_LT_TAGVAR(lt_cv_aix_libpath_, $1),
- AC_LINK_IFELSE(AC_LANG_PROGRAM,
- lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
-	 /^0/ {
-	 s/^0 *$^ *$ *$/\1/
-	 p
-	 }
- }'
- _LT_TAGVAR(lt_cv_aix_libpath_, $1)=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
- if test -z "$_LT_TAGVAR(lt_cv_aix_libpath_, $1)"; then
- _LT_TAGVAR(lt_cv_aix_libpath_, $1)=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi,)
- if test -z "$_LT_TAGVAR(lt_cv_aix_libpath_, $1)"; then
- _LT_TAGVAR(lt_cv_aix_libpath_, $1)="/usr/lib:/lib"
- fi
- )
- aix_libpath=$_LT_TAGVAR(lt_cv_aix_libpath_, $1)
-fi
-)# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define(_LT_SHELL_INIT,
-m4_divert_text(M4SH-INIT, $1
-))# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun(_LT_PROG_ECHO_BACKSLASH,
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING(how to print strings)
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='printf %s\n'
-else
- # Use this function as a fallback that always works.
- func_fallback_echo ()
- {
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
- }
- ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*" 
-}
-
-case "$ECHO" in
- printf*) AC_MSG_RESULT(printf) ;;
- print*) AC_MSG_RESULT(print -r) ;;
- *) AC_MSG_RESULT(cat) ;;
-esac
-
-m4_ifdef(_AS_DETECT_SUGGESTED,
-_AS_DETECT_SUGGESTED(
- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- PATH=/empty FPATH=/empty; export PATH FPATH
- test "X`printf %s $ECHO`" = "X$ECHO" \
- || test "X`print -r -- $ECHO`" = "X$ECHO" )))
-
-_LT_DECL(, SHELL, 1, Shell to use when invoking shell scripts)
-_LT_DECL(, ECHO, 1, An echo program that protects backslashes)
-)# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN(_LT_WITH_SYSROOT,
-AC_MSG_CHECKING(for sysroot)
-AC_ARG_WITH(sysroot,
- --with-sysroot=DIR Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).,
-, with_sysroot=no)
-
-dnl lt_sysroot will always be passed unquoted. We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
- if test "$GCC" = yes; then
- lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- fi
- ;; #(
- /*)
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
- ;; #(
- no|'')
- ;; #(
- *)
- AC_MSG_RESULT(${with_sysroot})
- AC_MSG_ERROR(The sysroot must be an absolute path.)
- ;;
-esac
-
- AC_MSG_RESULT(${lt_sysroot:-no})
-_LT_DECL(, lt_sysroot, 0, The root where to search for dnl
-dependent libraries, and in which our libraries should be installed.))
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun(_LT_ENABLE_LOCK,
-AC_ARG_ENABLE(libtool-lock,
- AS_HELP_STRING(--disable-libtool-lock,
- avoid locking (might break parallel builds)))
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # 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.$ac_objext` in
- *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
- *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	 LD="${LD-ld} -melf32bsmip"
-	 ;;
-	*N32*)
-	 LD="${LD-ld} -melf32bmipn32"
-	 ;;
-	*64-bit*)
-	 LD="${LD-ld} -melf64bmip"
-	;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	 LD="${LD-ld} -32"
-	 ;;
-	*N32*)
-	 LD="${LD-ld} -n32"
-	 ;;
-	*64-bit*)
-	 LD="${LD-ld} -64"
-	 ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # 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
- *32-bit*)
-	case $host in
-	 x86_64-*kfreebsd*-gnu)
-	 LD="${LD-ld} -m elf_i386_fbsd"
-	 ;;
-	 x86_64-*linux*)
-	 LD="${LD-ld} -m elf_i386"
-	 ;;
-	 ppc64-*linux*|powerpc64-*linux*)
-	 LD="${LD-ld} -m elf32ppclinux"
-	 ;;
-	 s390x-*linux*)
-	 LD="${LD-ld} -m elf_s390"
-	 ;;
-	 sparc64-*linux*)
-	 LD="${LD-ld} -m elf32_sparc"
-	 ;;
-	esac
-	;;
- *64-bit*)
-	case $host in
-	 x86_64-*kfreebsd*-gnu)
-	 LD="${LD-ld} -m elf_x86_64_fbsd"
-	 ;;
-	 x86_64-*linux*)
-	 LD="${LD-ld} -m elf_x86_64"
-	 ;;
-	 ppc*-*linux*|powerpc*-*linux*)
-	 LD="${LD-ld} -m elf64ppc"
-	 ;;
-	 s390*-*linux*|s390*-*tpf*)
-	 LD="${LD-ld} -m elf64_s390"
-	 ;;
-	 sparc*-*linux*)
-	 LD="${LD-ld} -m elf64_sparc"
-	 ;;
-	esac
-	;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- AC_CACHE_CHECK(whether the C compiler needs -belf, lt_cv_cc_needs_belf,
- AC_LANG_PUSH(C)
- AC_LINK_IFELSE(AC_LANG_PROGRAM(,),lt_cv_cc_needs_belf=yes,lt_cv_cc_needs_belf=no)
- AC_LANG_POP)
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-*-*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*)
- 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"
-	fi
-	;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-esac
-
-need_locks="$enable_libtool_lock"
-)# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun(_LT_PROG_AR,
-AC_CHECK_TOOLS(AR, ar, false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL(, AR, 1, The archiver)
-_LT_DECL(, AR_FLAGS, 1, Flags to create an archive)
-
-AC_CACHE_CHECK(for archiver @FILE support, lt_cv_ar_at_file,
- lt_cv_ar_at_file=no
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM,
- echo conftest.$ac_objext > conftest.lst
- lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
- AC_TRY_EVAL(lt_ar_try)
- if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL(lt_ar_try)
-	if test "$ac_status" -ne 0; then
- lt_cv_ar_at_file=@
- fi
- fi
- rm -f conftest.* libconftest.a
- )
- )
-
-if test "x$lt_cv_ar_at_file" = xno; then
- archiver_list_spec=
-else
- archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL(, archiver_list_spec, 1,
- How to feed a file listing to the archiver)
-)# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun(_LT_CMD_OLD_ARCHIVE,
-_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL(, STRIP, 1, A symbol stripping program)
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL(, RANLIB, 1,
- Commands used to install an old-style archive)
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
- darwin*)
- lock_old_archive_extraction=yes ;;
- *)
- lock_old_archive_extraction=no ;;
-esac
-_LT_DECL(, old_postinstall_cmds, 2)
-_LT_DECL(, old_postuninstall_cmds, 2)
-_LT_TAGDECL(, old_archive_cmds, 2,
- Commands used to build an old-style archive)
-_LT_DECL(, lock_old_archive_extraction, 0,
- Whether to use a lock for old archive extraction)
-)# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		OUTPUT-FILE, ACTION-SUCCESS, ACTION-FAILURE)
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN(_LT_COMPILER_OPTION,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_SED)dnl
-AC_CACHE_CHECK($1, $2,
- $2=no
- m4_if($4, , ac_outfile=conftest.$ac_objext, ac_outfile=$4)
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- fi
- $RM conftest*
-)
-
-if test x"$$2" = xyes; then
- m4_if($5, , :, $5)
-else
- m4_if($6, , :, $6)
-fi
-)# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_COMPILER_OPTION, _LT_COMPILER_OPTION)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_COMPILER_OPTION, )
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# ACTION-SUCCESS, ACTION-FAILURE)
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN(_LT_LINKER_OPTION,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_SED)dnl
-AC_CACHE_CHECK($1, $2,
- $2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
- echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- else
- $2=yes
- fi
- fi
- $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
-)
-
-if test x"$$2" = xyes; then
- m4_if($4, , :, $4)
-else
- m4_if($5, , :, $5)
-fi
-)# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_LINKER_OPTION, _LT_LINKER_OPTION)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_LINKER_OPTION, )
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN(LT_CMD_MAX_LEN,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING(the maximum length of command line arguments)
-AC_CACHE_VAL(lt_cv_sys_max_cmd_len, dnl
- i=0
- teststring="ABCD"
-
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
- # (any single argument exceeding 2000 bytes causes a buffer overrun
- # during glob expansion). Even if it were fixed, the result of this
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-
- gnu*)
- # Under GNU Hurd, this test is not required because there is
- # no limit to the length of command line arguments.
- # Libtool will interpret -1 as no limit whatsoever
- lt_cv_sys_max_cmd_len=-1;
- ;;
-
- cygwin* | mingw* | cegcc*)
- # On Win9x/ME, this test blows up -- it succeeds, but takes
- # about 5 minutes as the teststring grows exponentially.
- # Worse, since 9x/ME are not pre-emptively multitasking,
- # you end up with a "frozen" computer, even though with patience
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- mint*)
- # On MiNT this can take a long time and run out of memory.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- amigaos*)
- # On AmigaOS with pdksh, this test takes hours, literally.
- # So we just punt and use a minimum line length of 8192.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
- if test -x /sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
- elif test -x /usr/sbin/sysctl; then
- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
- else
- lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
- fi
- # And add a safety zone
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
-
- interix*)
- # We know the value 262144 and hardcode it with a safety zone (like BSD)
- 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
- # nice to cause kernel panics so lets avoid the loop below.
- # First set a reasonable default.
- lt_cv_sys_max_cmd_len=16384
- #
- if test -x /sbin/sysconfig; then
- case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
- *1*) lt_cv_sys_max_cmd_len=-1 ;;
- esac
- fi
- ;;
- sco3.2v5*)
- lt_cv_sys_max_cmd_len=102400
- ;;
- sysv5* | sco5v6* | sysv4.2uw2*)
- kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
- if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
- else
- lt_cv_sys_max_cmd_len=32768
- fi
- ;;
- *)
- lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- else
- # Make teststring a little bigger before we do anything with it.
- # a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
- teststring=$teststring$teststring
- done
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- # 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"`env echo "$teststring$teststring" 2>/dev/null` \
-	 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	 test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- # Only check the string length outside the loop.
- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
- teststring=
- # Add a significant safety factor because C++ compilers can tack on
- # massive amounts of additional arguments before passing them to the
- # linker. It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- fi
- ;;
- esac
-)
-if test -n $lt_cv_sys_max_cmd_len ; then
- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
- AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL(, max_cmd_len, 0,
- What is the maximum length of a command?)
-)# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_SYS_MAX_CMD_LEN, LT_CMD_MAX_LEN)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_SYS_MAX_CMD_LEN, )
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun(_LT_HEADER_DLFCN,
-AC_CHECK_HEADERS(dlfcn.h, , , AC_INCLUDES_DEFAULT)dnl
-)# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun(_LT_TRY_DLOPEN_SELF,
-m4_require(_LT_HEADER_DLFCN)dnl
-if test "$cross_compiling" = yes; then :
- $4
-else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-# ifdef DL_GLOBAL
-# define LT_DLGLOBAL		DL_GLOBAL
-# else
-# define LT_DLGLOBAL		0
-# endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-# ifdef RTLD_LAZY
-# define LT_DLLAZY_OR_NOW		RTLD_LAZY
-# else
-# ifdef DL_LAZY
-# define LT_DLLAZY_OR_NOW		DL_LAZY
-# else
-# ifdef RTLD_NOW
-# define LT_DLLAZY_OR_NOW	RTLD_NOW
-# else
-# ifdef DL_NOW
-# define LT_DLLAZY_OR_NOW	DL_NOW
-# else
-# define LT_DLLAZY_OR_NOW	0
-# endif
-# endif
-# endif
-# endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
- else
- {
-	 if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- else puts (dlerror ());
-	}
- /* dlclose (self); */
- }
- else
- puts (dlerror ());
-
- return status;
-}
-_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
- (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
- x$lt_dlunknown|x*) $3 ;;
- esac
- else :
- # compilation failed
- $3
- fi
-fi
-rm -fr conftest*
-)# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN(LT_SYS_DLOPEN_SELF,
-m4_require(_LT_HEADER_DLFCN)dnl
-if test "x$enable_dlopen" != xyes; then
- enable_dlopen=unknown
- enable_dlopen_self=unknown
- enable_dlopen_self_static=unknown
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-
- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-
- mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-
- darwin*)
- # if libdl is installed we need to link against it
- AC_CHECK_LIB(dl, dlopen,
-		lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl",
- lt_cv_dlopen="dyld"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- )
- ;;
-
- *)
- AC_CHECK_FUNC(shl_load,
-	 lt_cv_dlopen="shl_load",
- AC_CHECK_LIB(dld, shl_load,
-	 lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld",
-	AC_CHECK_FUNC(dlopen,
-	 lt_cv_dlopen="dlopen",
-	 AC_CHECK_LIB(dl, dlopen,
-		lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl",
-	 AC_CHECK_LIB(svld, dlopen,
-		 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld",
-	 AC_CHECK_LIB(dld, dld_link,
-		 lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld")
-	 )
-	 )
-	 )
-	)
- )
- ;;
- esac
-
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
- fi
-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
- save_LDFLAGS="$LDFLAGS"
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-
- AC_CACHE_CHECK(whether a program can dlopen itself,
-	 lt_cv_dlopen_self, dnl
-	 _LT_TRY_DLOPEN_SELF(
-	 lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	 lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- )
-
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
- AC_CACHE_CHECK(whether a statically linked program can dlopen itself,
-	 lt_cv_dlopen_self_static, dnl
-	 _LT_TRY_DLOPEN_SELF(
-	 lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	 lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- )
- fi
-
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
- esac
-fi
-_LT_DECL(dlopen_support, enable_dlopen, 0,
-	 Whether dlopen is supported)
-_LT_DECL(dlopen_self, enable_dlopen_self, 0,
-	 Whether dlopen of programs is supported)
-_LT_DECL(dlopen_self_static, enable_dlopen_self_static, 0,
-	 Whether dlopen of statically linked programs is supported)
-)# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS(AC_LIBTOOL_DLOPEN_SELF, LT_SYS_DLOPEN_SELF)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, )
-
-
-# _LT_COMPILER_C_O(TAGNAME)
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun(_LT_COMPILER_C_O,
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_TAG_COMPILER)dnl
-AC_CACHE_CHECK(if $compiler supports -c -o file.$ac_objext,
- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1),
- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
- $RM -r conftest 2>/dev/null
- mkdir conftest
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- fi
- fi
- chmod u+w . 2>&AS_MESSAGE_LOG_FD
- $RM conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
- $RM out/* && rmdir out
- cd ..
- $RM -r conftest
- $RM conftest*
-)
-_LT_TAGDECL(compiler_c_o, lt_cv_prog_compiler_c_o, 1,
-	Does compiler simultaneously support -c and -o options?)
-)# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS(TAGNAME)
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun(_LT_COMPILER_FILE_LOCKS,
-m4_require(_LT_ENABLE_LOCK)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-_LT_COMPILER_C_O($1)
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
- AC_MSG_CHECKING(if we can lock with hard links)
- hard_links=yes
- $RM conftest*
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- touch conftest.a
- ln conftest.a conftest.b 2>&5 || hard_links=no
- ln conftest.a conftest.b 2>/dev/null && hard_links=no
- AC_MSG_RESULT($hard_links)
- if test "$hard_links" = no; then
- AC_MSG_WARN(`$CC' does not support `-c -o', so `make -j' may be unsafe)
- need_locks=warn
- fi
-else
- need_locks=no
-fi
-_LT_DECL(, need_locks, 1, Must we lock files when doing compilation?)
-)# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun(_LT_CHECK_OBJDIR,
-AC_CACHE_CHECK(for objdir, lt_cv_objdir,
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
- lt_cv_objdir=.libs
-else
- # MS-DOS does not allow filenames that begin with a dot.
- lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null)
-objdir=$lt_cv_objdir
-_LT_DECL(, objdir, 0,
- The name of the directory that contains temporary libtool files)dnl
-m4_pattern_allow(LT_OBJDIR)dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
- Define to the sub-directory in which libtool stores uninstalled libraries.)
-)# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH(TAGNAME)
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun(_LT_LINKER_HARDCODE_LIBPATH,
-AC_MSG_CHECKING(how to hardcode library paths into programs)
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
- test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
- # We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
- # Linking always hardcodes the temporary library directory.
- _LT_TAGVAR(hardcode_action, $1)=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- _LT_TAGVAR(hardcode_action, $1)=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT($_LT_TAGVAR(hardcode_action, $1))
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-_LT_TAGDECL(, hardcode_action, 0,
- How to hardcode a shared library path into an executable)
-)# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun(_LT_CMD_STRIPLIB,
-m4_require(_LT_DECL_EGREP)
-striplib=
-old_striplib=
-AC_MSG_CHECKING(whether stripping libraries is possible)
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT(yes)
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- old_striplib="$STRIP -S"
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
- ;;
- *)
- AC_MSG_RESULT(no)
- ;;
- esac
-fi
-_LT_DECL(, old_striplib, 1, Commands to strip libraries)
-_LT_DECL(, striplib, 1)
-)# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER(TAG)
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun(_LT_SYS_DYNAMIC_LINKER,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_OBJDUMP)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_CHECK_SHELL_FEATURES)dnl
-AC_MSG_CHECKING(dynamic linker characteristics)
-m4_if($1,
-	, 
-if test "$GCC" = yes; then
- case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
- esac
- case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=$A-Za-z:$,\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
- esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
- case $lt_search_path_spec in
- *\;*)
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
- ;;
- *)
- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
- ;;
- esac
- # Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
- lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
- for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
- test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
- fi
- done
- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
- for (lt_i = NF; lt_i > 0; lt_i--) {
- if ($lt_i != "" && $lt_i != ".") {
- if ($lt_i == "..") {
- lt_count++;
- } else {
- if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
- } else {
- lt_count--;
- }
- }
- }
- }
- if (lt_foo != "") { lt_freqlt_foo++; }
- if (lt_freqlt_foo == 1) { print lt_foo; }
-}'`
- # AWK program above erroneously prepends '/' to C:/dos/paths
- # for these hosts.
- case $host_os in
- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/$A-Za-z:$,\1,g'` ;;
- esac
- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi)
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
- 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
-
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-
-aix4-9*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
- # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- else
- # With GCC up to 2.95.x, collect2 would create an import file
- # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
- # development snapshots of GCC prior to 3.0.
- case $host_os in
- aix4 | aix4.01 | aix4.01.*)
- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	 echo ' yes '
-	 echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
- else
-	can_build_shared=no
- fi
- ;;
- esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
- # soname into executable. Probably we can add versioning support to
- # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
- # instead of lib<name>.a to let people know that these are not
- # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
- # We preserve .a as extension for shared libraries through AIX4.2
- # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
- shlibpath_var=LIBPATH
- fi
- ;;
-
-amigaos*)
- case $host_cpu in
- powerpc)
- # Since July 2007 AmigaOS4 officially supports .so libraries.
- # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- ;;
- m68k)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
- esac
- ;;
-
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
-
-bsdi45*)
- 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'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
- # the default ld.so.conf also contains /usr/contrib/lib and
- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
- # libtool to hard-code these into programs
- ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
- case $GCC,$cc_basename in
- yes,*)
- # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname~
- chmod a+x \$dldir/$dlname~
- if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
- eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
- fi'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
-
- case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-m4_if($1, ,
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api")
- ;;
- mingw* | cegcc*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- dynamic_linker='Win32 ld.exe'
- ;;
-
- *,cl*)
- # Native MSVC
- libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
-
- case $build_os in
- mingw*)
- sys_lib_search_path_spec=
- lt_save_ifs=$IFS
- IFS=';'
- for lt_path in $LIB
- do
- IFS=$lt_save_ifs
- # Let DOS variable expansion print the short 8.3 style file name.
- lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- done
- IFS=$lt_save_ifs
- # Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
- ;;
- cygwin*)
- # Convert to unix form, then to dos form, then back to unix form
- # but this time dos style (no spaces!) so that the unix form looks
- # like /cygdrive/c/PROGRA~1:/cygdr...
- sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- ;;
- *)
- sys_lib_search_path_spec="$LIB"
- if $ECHO "$sys_lib_search_path_spec" | $GREP ';c-zC-Z:/' >/dev/null; then
- # It is most probably a Windows format PATH.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
- # FIXME: find the short name or the path components, as spaces are
- # common. (e.g. "Program Files" -> "PROGRA~1")
- ;;
- esac
-
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
- $install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
- $RM \$dlpath'
- shlibpath_overrides_runpath=yes
- dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext} $libname.lib'
- dynamic_linker='Win32 ld.exe'
- ;;
- esac
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
-
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if($1, ,
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib")
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-dgux*)
- 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
- ;;
-
-freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
- if test -x /usr/bin/objformat; then
- objformat=`/usr/bin/objformat`
- else
- case $host_os in
- freebsd23.*) objformat=aout ;;
- *) objformat=elf ;;
- esac
- fi
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- need_version=no
- need_lib_prefix=no
- ;;
- freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
- need_version=yes
- ;;
- esac
- shlibpath_var=LD_LIBRARY_PATH
- case $host_os in
- freebsd2.*)
- shlibpath_overrides_runpath=yes
- ;;
- freebsd3.01* | freebsdelf3.01*)
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- freebsd3.2-9* | freebsdelf3.2-9* | \
- freebsd4.0-5 | freebsdelf4.0-5 | freebsd4.1.1 | freebsdelf4.1.1)
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
- *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
- esac
- ;;
-
-gnu*)
- 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 # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- dynamic_linker="$host_os runtime_loader"
- 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=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- case $host_cpu in
- ia64*)
- shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
- else
- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
- fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
- shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
- postinstall_cmds='chmod 555 $lib'
- # or fails outright, so override atomically:
- install_override_mode=555
- ;;
-
-interix3-9*)
- 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'
- dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
- esac
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
- case $host_os in
- irix5* | nonstopux*)
- libsuff= shlibsuff=
- ;;
- *)
- case $LD in # libtool.m4 will add one of these switches to LD
- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
- libsuff= shlibsuff= libmagic=32-bit;;
- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
- libsuff=32 shlibsuff=N32 libmagic=N32;;
- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
- libsuff=64 shlibsuff=64 libmagic=64-bit;;
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
- ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
- 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'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
-
- # Some binutils ld are patched to set DT_RUNPATH
- AC_CACHE_VAL(lt_cv_shlibpath_overrides_runpath,
- lt_cv_shlibpath_overrides_runpath=no
- save_LDFLAGS=$LDFLAGS
- save_libdir=$libdir
- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
- AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
- AS_IF( ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null,
-	 lt_cv_shlibpath_overrides_runpath=yes))
- LDFLAGS=$save_LDFLAGS
- libdir=$save_libdir
- )
- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
- # most powerpc-linux boxes support dynamic linking these days and
- # people can always --disable-shared, the test was removed, and we
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsdelf*-gnu)
- version_type=linux
- 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
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
- need_version=no
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-
-newsos6)
- 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
- ;;
-
-*nto* | *qnx*)
- version_type=qnx
- 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
- dynamic_linker='ldqnx.so'
- ;;
-
-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
- *)				need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.89 | openbsd2.89.*)
-	shlibpath_overrides_runpath=no
-	;;
- *)
-	shlibpath_overrides_runpath=yes
-	;;
- esac
- else
- shlibpath_overrides_runpath=yes
- fi
- ;;
-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-rdos*)
- dynamic_linker=no
- ;;
-
-solaris*)
- 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=yes
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- fi
- need_version=yes
- ;;
-
-sysv4 | sysv4.3*)
- 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
- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
- runpath_var=LD_RUN_PATH
- ;;
- siemens)
- need_lib_prefix=no
- ;;
- motorola)
- need_lib_prefix=no
- need_version=no
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
- esac
- ;;
-
-sysv4*MP*)
- if test -d /usr/nec ;then
- 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
- fi
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
- else
- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
- case $host_os in
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
- esac
- fi
- sys_lib_dlsearch_path_spec='/usr/lib'
- ;;
-
-tpf*)
- # TPF is a cross-target only. Preferred cross-host = GNU/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}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
-uts4*)
- 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
- ;;
-
-*)
- dynamic_linker=no
- ;;
-esac
-AC_MSG_RESULT($dynamic_linker)
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL(, variables_saved_for_relink, 1,
- Variables whose values should be saved in libtool wrapper scripts and
- restored at link time)
-_LT_DECL(, need_lib_prefix, 0,
- Do we need the "lib" prefix for modules?)
-_LT_DECL(, need_version, 0, Do we need a version for libraries?)
-_LT_DECL(, version_type, 0, Library versioning type)
-_LT_DECL(, runpath_var, 0, Shared library runtime path variable)
-_LT_DECL(, shlibpath_var, 0,Shared library path variable)
-_LT_DECL(, shlibpath_overrides_runpath, 0,
- Is shlibpath searched before the hard-coded library search path?)
-_LT_DECL(, libname_spec, 1, Format of library name prefix)
-_LT_DECL(, library_names_spec, 1,
- List of archive names. First name is the real one, the rest are links.
- The last name is the one that the linker finds with -lNAME)
-_LT_DECL(, soname_spec, 1,
- The coded name of the library, if different from the real name)
-_LT_DECL(, install_override_mode, 1,
- Permission mode override for installation of shared libraries)
-_LT_DECL(, postinstall_cmds, 2,
- Command to use after installation of a shared archive)
-_LT_DECL(, postuninstall_cmds, 2,
- Command to use after uninstallation of a shared archive)
-_LT_DECL(, finish_cmds, 2,
- Commands used to finish a libtool library installation in a directory)
-_LT_DECL(, finish_eval, 1,
- As "finish_cmds", except a single script fragment to be evaled but
- not shown)
-_LT_DECL(, hardcode_into_libs, 0,
- Whether we should hardcode library paths into libraries)
-_LT_DECL(, sys_lib_search_path_spec, 2,
- Compile-time system search path for libraries)
-_LT_DECL(, sys_lib_dlsearch_path_spec, 2,
- Run-time system search path for libraries)
-)# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN(_LT_PATH_TOOL_PREFIX,
-m4_require(_LT_DECL_EGREP)dnl
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-case $MAGIC_CMD in
-\\/* | ?:\\/*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word. This closes a longstanding sh security hole.
- ac_dummy="m4_if($2, , $PATH, $2)"
- for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
- if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	 file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	 $EGREP "$file_magic_regex" > /dev/null; then
-	 :
-	 else
-	 cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such. This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	 fi ;;
-	esac
- fi
- break
- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
- ;;
-esac)
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- AC_MSG_RESULT($MAGIC_CMD)
-else
- AC_MSG_RESULT(no)
-fi
-_LT_DECL(, MAGIC_CMD, 0,
-	 Used to examine libraries when file_magic_cmd begins with "file")dnl
-)# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS(AC_PATH_TOOL_PREFIX, _LT_PATH_TOOL_PREFIX)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_PATH_TOOL_PREFIX, )
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun(_LT_PATH_MAGIC,
-_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
- if test -n "$ac_tool_prefix"; then
- _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
- else
- MAGIC_CMD=:
- fi
-fi
-)# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN(LT_PATH_LD,
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_CANONICAL_BUILD)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_PROG_ECHO_BACKSLASH)dnl
-
-AC_ARG_WITH(gnu-ld,
- AS_HELP_STRING(--with-gnu-ld,
-	assume the C compiler uses GNU ld @<:@default=no@:>@),
- test "$withval" = no || with_gnu_ld=yes,
- with_gnu_ld=no)dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING(for ld used by $CC)
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- \\/* | ?:\\/*)
- re_direlt='/^/^/*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
- while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- AC_MSG_CHECKING(for GNU ld)
-else
- AC_MSG_CHECKING(for non-GNU ld)
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
- *)
-	test "$with_gnu_ld" != yes && break
-	;;
- esac
- fi
- done
- IFS="$lt_save_ifs"
-else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi)
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT($LD)
-else
- AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR(no acceptable ld found in \$PATH)
-_LT_PATH_LD_GNU
-AC_SUBST(LD)
-
-_LT_TAGDECL(, LD, 1, The linker used to build libraries)
-)# LT_PATH_LD
-
-# Old names:
-AU_ALIAS(AM_PROG_LD, LT_PATH_LD)
-AU_ALIAS(AC_PROG_LD, LT_PATH_LD)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_PROG_LD, )
-dnl AC_DEFUN(AC_PROG_LD, )
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun(_LT_PATH_LD_GNU,
-AC_CACHE_CHECK(if the linker ($LD) is GNU ld, lt_cv_prog_gnu_ld,
-# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- lt_cv_prog_gnu_ld=yes
- ;;
-*)
- lt_cv_prog_gnu_ld=no
- ;;
-esac)
-with_gnu_ld=$lt_cv_prog_gnu_ld
-)# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-# -- PORTME Some linkers may need a different reload flag.
-m4_defun(_LT_CMD_RELOAD,
-AC_CACHE_CHECK(for $LD option to reload object files,
- lt_cv_ld_reload_flag,
- lt_cv_ld_reload_flag='-r')
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
- reload_cmds=false
- fi
- ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- else
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
- ;;
-esac
-_LT_TAGDECL(, reload_flag, 1, How to create reloadable object files)dnl
-_LT_TAGDECL(, reload_cmds, 2)dnl
-)# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-# -- PORTME fill in with the dynamic library characteristics
-m4_defun(_LT_CHECK_MAGIC_METHOD,
-m4_require(_LT_DECL_EGREP)
-m4_require(_LT_DECL_OBJDUMP)
-AC_CACHE_CHECK(how to recognize dependent libraries,
-lt_cv_deplibs_check_method,
-lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic regex' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4-9*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-bsdi45*)
- lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
-cygwin*)
- # func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- ;;
-
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
- # unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- # Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
-
-cegcc*)
- # use the weaker test based on 'objdump'. See mingw*.
- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- ;;
-
-darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
- # Not sure whether the presence of OpenBSD here was a mistake.
- # Let's accept both of them until this is cleared up.
- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
- ;;
- esac
- else
- lt_cv_deplibs_check_method=pass_all
- fi
- ;;
-
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-haiku*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
- ia64*)
- lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF -0-90-9)(-bit)?( LMSB)? shared object( file)?, -* PA-RISC 0-9\.0-9'
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
- lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9\.0-9) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
- ;;
-
-interix3-9*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so|\.a)$'
- ;;
-
-irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so|_pic\.a)$'
- fi
- ;;
-
-newos6*)
- lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
-
-*nto* | *qnx*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|\.so|_pic\.a)$'
- else
- lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
- fi
- ;;
-
-osf3* | osf4* | osf5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-rdos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sysv4 | sysv4.3*)
- case $host_vendor in
- motorola)
- lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib) M0-90-9* Version 0-9'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
- ncr)
- lt_cv_deplibs_check_method=pass_all
- ;;
- sequent)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit LMSB (shared object|dynamic lib )'
- ;;
- sni)
- lt_cv_file_magic_cmd='/bin/file'
- lt_cv_deplibs_check_method="file_magic ELF 0-90-9*-bit LMSB dynamic lib"
- lt_cv_file_magic_test_file=/lib/libc.so
- ;;
- siemens)
- lt_cv_deplibs_check_method=pass_all
- ;;
- pc)
- lt_cv_deplibs_check_method=pass_all
- ;;
- esac
- ;;
-
-tpf*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-esac
-)
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
- case $host_os in
- mingw* | pw32*)
- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- want_nocaseglob=yes
- else
- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/\1\/\1\/g;/g"`
- fi
- ;;
- esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL(, deplibs_check_method, 1,
- Method to check whether dependent libraries are shared objects)
-_LT_DECL(, file_magic_cmd, 1,
- Command to use when deplibs_check_method = "file_magic")
-_LT_DECL(, file_magic_glob, 1,
- How to find potential files when deplibs_check_method = "file_magic")
-_LT_DECL(, want_nocaseglob, 1,
- Find potential files using nocaseglob when deplibs_check_method = "file_magic")
-)# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN(LT_PATH_NM,
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_CACHE_CHECK(for BSD- or MS-compatible name lister (nm), lt_cv_path_NM,
-if test -n "$NM"; then
- # Let the user override the test.
- lt_cv_path_NM="$NM"
-else
- lt_nm_to_check="${ac_tool_prefix}nm"
- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	# nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	 lt_cv_path_NM="$tmp_nm -B"
-	 break
-	 ;;
-	*)
-	 case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	 */dev/null*)
-	 lt_cv_path_NM="$tmp_nm -p"
-	 break
-	 ;;
-	 *)
-	 lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	 continue # so that we can try to find one that supports BSD flags
-	 ;;
-	 esac
-	 ;;
-	esac
- fi
- done
- IFS="$lt_save_ifs"
- done
- : ${lt_cv_path_NM=no}
-fi)
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
-else
- # Didn't find any BSD compatible name lister, look for dumpbin.
- if test -n "$DUMPBIN"; then :
- # Let the user override the test.
- else
- AC_CHECK_TOOLS(DUMPBIN, dumpbin "link -dump", :)
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
- *COFF*)
- DUMPBIN="$DUMPBIN -symbols"
- ;;
- *)
- DUMPBIN=:
- ;;
- esac
- fi
- AC_SUBST(DUMPBIN)
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
- fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST(NM)
-_LT_DECL(, NM, 1, A BSD- or MS-compatible name lister)dnl
-
-AC_CACHE_CHECK(the name lister ($NM) interface, lt_cv_nm_interface,
- lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&AS_MESSAGE_LOG_FD
- (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
- cat conftest.out >&AS_MESSAGE_LOG_FD
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
- fi
- rm -f conftest*)
-)# LT_PATH_NM
-
-# Old names:
-AU_ALIAS(AM_PROG_NM, LT_PATH_NM)
-AU_ALIAS(AC_PROG_NM, LT_PATH_NM)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_PROG_NM, )
-dnl AC_DEFUN(AC_PROG_NM, )
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-# -- PORTME fill in with the dynamic library characteristics
-m4_defun(_LT_CHECK_SHAREDLIB_FROM_LINKLIB,
-m4_require(_LT_DECL_EGREP)
-m4_require(_LT_DECL_OBJDUMP)
-m4_require(_LT_DECL_DLLTOOL)
-AC_CACHE_CHECK(how to associate runtime and link libraries,
-lt_cv_sharedlib_from_linklib_cmd,
-lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
- case `$DLLTOOL --help 2>&1` in
- *--identify-strict*)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- ;;
- *)
- lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- ;;
- esac
- ;;
-*)
- # fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- ;;
-esac
-)
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL(, sharedlib_from_linklib_cmd, 1,
- Command to associate shared and link libraries)
-)# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun(_LT_PATH_MANIFEST_TOOL,
-AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK(if $MANIFEST_TOOL is a manifest tool, lt_cv_path_mainfest_tool,
- lt_cv_path_mainfest_tool=no
- echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
- $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- cat conftest.err >&AS_MESSAGE_LOG_FD
- if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- lt_cv_path_mainfest_tool=yes
- fi
- rm -f conftest*)
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
- MANIFEST_TOOL=:
-fi
-_LT_DECL(, MANIFEST_TOOL, 1, Manifest tool)dnl
-)# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN(LT_LIB_M,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
- # These system don't have libm, or don't need it
- ;;
-*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
- ;;
-*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
- ;;
-esac
-AC_SUBST(LIBM)
-)# LT_LIB_M
-
-# Old name:
-AU_ALIAS(AC_CHECK_LIBM, LT_LIB_M)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_CHECK_LIBM, )
-
-
-# _LT_COMPILER_NO_RTTI(TAGNAME)
-# -------------------------------
-m4_defun(_LT_COMPILER_NO_RTTI,
-m4_require(_LT_TAG_COMPILER)dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
- case $cc_basename in
- nvcc*)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
- esac
-
- _LT_COMPILER_OPTION(if $compiler supports -fno-rtti -fno-exceptions,
- lt_cv_prog_compiler_rtti_exceptions,
- -fno-rtti -fno-exceptions, ,
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions")
-fi
-_LT_TAGDECL(no_builtin_flag, lt_prog_compiler_no_builtin_flag, 1,
-	Compiler flag to turn off builtin functions)
-)# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun(_LT_CMD_GLOBAL_SYMBOLS,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_PROG_CC)dnl
-AC_REQUIRE(AC_PROG_AWK)dnl
-AC_REQUIRE(LT_PATH_NM)dnl
-AC_REQUIRE(LT_PATH_LD)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_TAG_COMPILER)dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING(command to parse $NM output from $compiler object)
-AC_CACHE_VAL(lt_cv_sys_global_symbol_pipe,
-
-# These are sane defaults that work on at least a few old systems.
-# They come from Ultrix. What could be older than Ultrix?!! ;)
-
-# Character class describing NM global symbol codes.
-symcode='BCDEGRST'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='$_A-Za-z_A-Za-z0-9*$'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
- symcode='BCDT'
- ;;
-cygwin* | mingw* | pw32* | cegcc*)
- symcode='ABCDGISTW'
- ;;
-hpux*)
- if test "$host_cpu" = ia64; then
- symcode='ABCDEGRST'
- fi
- ;;
-irix* | nonstopux*)
- symcode='BCDEGRST'
- ;;
-osf*)
- symcode='BCDEGQRST'
- ;;
-solaris*)
- symcode='BDRT'
- ;;
-sco3.2v5*)
- symcode='DT'
- ;;
-sysv4.2uw2*)
- symcode='DT'
- ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
- symcode='ABDT'
- ;;
-sysv4)
- symcode='DFNSTU'
- ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='ABCDGIRSTW' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $^ *$ *$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $^ *$ $^ *$$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $^ *$ *$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $^ *$ $lib^ *$$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $^ *$ $^ *$$/ {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
- opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
- symxfrm="\\1 $ac_symprfx\\2 \\2"
-
- # Write the raw and C identifiers.
- if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
- # Also find C++ and __fastcall symbols from MSVC++,
- # which start with @ or ?.
- lt_cv_sys_global_symbol_pipe="$AWK '"\
-" {last_section=section; section=\$ 3};"\
-" /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
-" /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
-" \$ 0!~/External *\|/{next};"\
-" / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
-" {if(hidesection) next};"\
-" {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a2, s)};"\
-" s1~/^@?/{print s1, s1; next};"\
-" s1~prfx {split(s1,t,\"@\"); print t1, substr(t1,length(prfx))}"\
-" ' prfx=^$ac_symprfx"
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
-
- rm -f conftest*
- cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
- if AC_TRY_EVAL(ac_compile); then
- # Now try to grab the symbols.
- nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
- else
-	rm -f "$nlist"T
- fi
-
- # Make sure that we snagged all the symbols we need.
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	 cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
- relocations are performed -- see ld's documentation on pseudo-relocs. */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data. */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	 # Now generate the symbol file.
-	 eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	 cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols. */
-LT@&t@_DLSYM_CONST struct {
- const char *name;
- void *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols =
-{
- { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	 $SED "s/^$symcode$symcode* $.*$ $.*$$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	 cat <<\_LT_EOF >> conftest.$ac_ext
- {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
- return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	 # Now try linking the two files.
-	 mv conftest.$ac_objext conftstm.$ac_objext
-	 lt_globsym_save_LIBS=$LIBS
-	 lt_globsym_save_CFLAGS=$CFLAGS
-	 LIBS="conftstm.$ac_objext"
-	 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	 pipe_works=yes
-	 fi
-	 LIBS=$lt_globsym_save_LIBS
-	 CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
- else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
- fi
- else
- echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
- cat conftest.$ac_ext >&5
- fi
- rm -rf conftest* conftst*
-
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
- break
- else
- lt_cv_sys_global_symbol_pipe=
- fi
-done
-)
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
- lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
- AC_MSG_RESULT(failed)
-else
- AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '@FILE' >/dev/null; then
- nm_file_list_spec='@'
-fi
-
-_LT_DECL(global_symbol_pipe, lt_cv_sys_global_symbol_pipe, 1,
- Take the output of nm and produce a listing of raw symbols and C names)
-_LT_DECL(global_symbol_to_cdecl, lt_cv_sys_global_symbol_to_cdecl, 1,
- Transform the output of nm in a proper C declaration)
-_LT_DECL(global_symbol_to_c_name_address,
- lt_cv_sys_global_symbol_to_c_name_address, 1,
- Transform the output of nm in a C name address pair)
-_LT_DECL(global_symbol_to_c_name_address_lib_prefix,
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix, 1,
- Transform the output of nm in a C name address pair when lib prefix is needed)
-_LT_DECL(, nm_file_list_spec, 1,
- Specify filename containing input files for $NM)
-) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC(TAGNAME)
-# ---------------------------
-m4_defun(_LT_COMPILER_PIC,
-m4_require(_LT_TAG_COMPILER)dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if($1, CXX, 
- # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- m68k)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- esac
- ;;
-
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- m4_if($1, GCJ, ,
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
- ;;
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
- *djgpp*)
- # DJGPP does not support shared libraries at all
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
- interix3-9*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
- sysv4*MP*)
- if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
- hpux*)
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
- # sets the default TLS model and affects inlining.
- case $host_cpu in
- hppa*64*)
-	;;
- *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
- esac
- ;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
- else
- case $host_os in
- aix4-9*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	 # AIX 5 now supports IA64 processor
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
- chorus*)
-	case $cc_basename in
-	cxch68*)
-	 # Green Hills C++ Compiler
-	 # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	 ;;
-	esac
-	;;
- mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if($1, GCJ, ,
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
-	;;
- dgux*)
-	case $cc_basename in
-	 ec++*)
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 ;;
-	 ghcx*)
-	 # Green Hills C++ Compiler
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
- hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	 CC*)
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	 if test "$host_cpu" != ia64; then
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	 fi
-	 ;;
-	 aCC*)
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	 case $host_cpu in
-	 hppa*64*|ia64*)
-	 # +Z the default
-	 ;;
-	 *)
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	 ;;
-	 esac
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
- irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	 CC*)
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	 # CC pic flag -KPIC is the default.
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
-	case $cc_basename in
-	 KCC*)
-	 # KAI C++ Compiler
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	 ;;
-	 ecpc* )
-	 # old Intel C++ for x86_64 which still supported -KPIC.
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	 ;;
-	 icpc* )
-	 # Intel C++, used to be incompatible with GCC.
-	 # ICC 10 doesn't accept -KPIC any more.
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	 ;;
-	 pgCC* | pgcpp*)
-	 # Portland Group C++ compiler
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	 ;;
-	 cxx*)
-	 # Compaq C++
-	 # Make sure the PIC flag is empty. It appears that all Alpha
-	 # Linux and Compaq Tru64 Unix objects are PIC.
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	 ;;
-	 xlc* | xlC* | bgxlcC* | mpixlcC*)
-	 # IBM XL 8.0, 9.0 on PPC and BlueGene
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	 ;;
-	 *)
-	 case `$CC -V 2>&1 | sed 5q` in
-	 *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)='-Qoption ld '
-	 ;;
-	 esac
-	 ;;
-	esac
-	;;
- lynxos*)
-	;;
- m88k*)
-	;;
- mvs*)
-	case $cc_basename in
-	 cxx*)
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- netbsd* | netbsdelf*-gnu)
-	;;
- *qnx* | *nto*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
- osf3* | osf4* | osf5*)
-	case $cc_basename in
-	 KCC*)
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	 ;;
-	 RCC*)
-	 # Rational C++ 2.4.1
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	 ;;
-	 cxx*)
-	 # Digital/Compaq C++
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 # Make sure the PIC flag is empty. It appears that all Alpha
-	 # Linux and Compaq Tru64 Unix objects are PIC.
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- psos*)
-	;;
- solaris*)
-	case $cc_basename in
-	 CC* | sunCC*)
-	 # Sun C++ 4.2, 5.x and Centerline C++
-	 _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 '
-	 ;;
-	 gcx*)
-	 # Green Hills C++ Compiler
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- sunos4*)
-	case $cc_basename in
-	 CC*)
-	 # Sun C++ 4.x
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	 ;;
-	 lcc*)
-	 # Lucid
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	 CC*)
-	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	 ;;
-	esac
-	;;
- tandem*)
-	case $cc_basename in
-	 NCC*)
-	 # NonStop-UX NCC 3.20
-	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	 ;;
-	 *)
-	 ;;
-	esac
-	;;
- vxworks*)
-	;;
- *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
- esac
- fi
-,
-
- if test "$GCC" = yes; then
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
- case $host_os in
- aix*)
- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- m68k)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
- esac
- ;;
-
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
- mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- # Although the cygwin gcc ignores -fPIC, still need this for old-style
- # (--disable-auto-import) libraries
- m4_if($1, GCJ, ,
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
- ;;
-
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
- haiku*)
- # PIC is the default for Haiku.
- # The "-static" flag exists, but is broken.
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
-
- hpux*)
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
- # sets the default TLS model and affects inlining.
- case $host_cpu in
- hppa*64*)
-	# +Z the default
-	;;
- *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
- esac
- ;;
-
- interix3-9*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
- # on systems that don't support them.
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- enable_shared=no
- ;;
-
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
-
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- esac
-
- case $cc_basename in
- nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
- 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
- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
- aix*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
- ;;
-
- mingw* | cygwin* | pw32* | os2* | cegcc*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- m4_if($1, GCJ, ,
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
- ;;
-
- hpux9* | hpux10* | hpux11*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
- # not for PA HP-UX.
- case $host_cpu in
- hppa*64*|ia64*)
-	# +Z the default
-	;;
- *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
- esac
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- ;;
-
- irix5* | irix6* | nonstopux*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC (with -KPIC) is the default.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- # icc used to be incompatible with GCC.
- # ICC 10 doesn't accept -KPIC any more.
- icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
- # Lahey Fortran 8.1.
- lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
- nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
- ccc*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All Alpha code is PIC.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
- *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*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
- ;;
-
- newsos6)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *nto* | *qnx*)
- # QNX uses GNU C++, but need to define -shared option too, otherwise
- # it will coredump.
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
- ;;
-
- osf3* | osf4* | osf5*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All OSF/1 code is PIC.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- rdos*)
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- solaris*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- case $cc_basename in
- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
- *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
- esac
- ;;
-
- sunos4*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4 | sysv4.2uw2* | sysv4.3*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- unicos*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
-
- uts4*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
- *)
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
-)
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if($1,, -DPIC,m4_if($1,CXX, -DPIC,))"
- ;;
-esac
-
-AC_CACHE_CHECK(for $compiler option to produce PIC,
- _LT_TAGVAR(lt_cv_prog_compiler_pic, $1),
- _LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1))
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
- _LT_COMPILER_OPTION(if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works,
- _LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
- $_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if($1,, -DPIC,m4_if($1,CXX, -DPIC,)), ,
- case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
- "" | " "*) ;;
- *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
- esac,
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no)
-fi
-_LT_TAGDECL(pic_flag, lt_prog_compiler_pic, 1,
-	Additional compiler flags for building library objects)
-
-_LT_TAGDECL(wl, lt_prog_compiler_wl, 1,
-	How to pass a linker flag through the compiler)
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION(if $compiler static flag $lt_tmp_static_flag works,
- _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
- $lt_tmp_static_flag,
- ,
- _LT_TAGVAR(lt_prog_compiler_static, $1)=)
-_LT_TAGDECL(link_static_flag, lt_prog_compiler_static, 1,
-	Compiler flag to prevent dynamic linking)
-)# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS(TAGNAME)
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun(_LT_LINKER_SHLIBS,
-AC_REQUIRE(LT_PATH_LD)dnl
-AC_REQUIRE(LT_PATH_NM)dnl
-m4_require(_LT_PATH_MANIFEST_TOOL)dnl
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_DECL_SED)dnl
-m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
-m4_require(_LT_TAG_COMPILER)dnl
-AC_MSG_CHECKING(whether the $compiler linker ($LD) supports shared libraries)
-m4_if($1, CXX, 
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
- case $host_os in
- aix4-9*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- fi
- ;;
- pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
- cygwin* | mingw* | cegcc*)
- case $cc_basename in
- 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'
- ;;
- esac
- ;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- esac
-, 
- runpath_var=
- _LT_TAGVAR(allow_undefined_flag, $1)=
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(archive_cmds, $1)=
- _LT_TAGVAR(archive_expsym_cmds, $1)=
- _LT_TAGVAR(compiler_needs_object, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- _LT_TAGVAR(hardcode_automatic, $1)=no
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_direct_absolute, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_TAGVAR(hardcode_minus_L, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(inherit_rpath, $1)=no
- _LT_TAGVAR(link_all_deplibs, $1)=unknown
- _LT_TAGVAR(module_cmds, $1)=
- _LT_TAGVAR(module_expsym_cmds, $1)=
- _LT_TAGVAR(old_archive_from_new_cmds, $1)=
- _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
- _LT_TAGVAR(thread_safe_flag_spec, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- # include_expsyms should be a list of space-separated symbols to be *always*
- # included in the symbol list
- _LT_TAGVAR(include_expsyms, $1)=
- # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
- _LT_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
- # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
- # platforms (ab)use it in PIC code, but their linkers get confused if
- # the symbol is explicitly referenced. Since portable code cannot
- # rely on this symbol name, it's probably fine to never include it in
- # preloaded symbol tables.
- # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
- extract_expsyms_cmds=
-
- case $host_os in
- cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- if test "$GCC" != yes; then
- with_gnu_ld=no
- fi
- ;;
- interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
- with_gnu_ld=yes
- ;;
- openbsd*)
- with_gnu_ld=no
- ;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
-
- # On some targets, GNU ld is compatible enough with the native linker
- # that we're better off using the native interface for both.
- lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
- case $host_os in
- aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker. However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	 *\ $GNU\ Binutils$\ 2.19.5*) ;;
-	 *\ $GNU\ Binutils$\ 2.2-9*) ;;
-	 *\ $GNU\ Binutils$\ 3-9*) ;;
-	 *)
-	 lt_use_gnu_ld_interface=yes
-	 ;;
-	esac
-	;;
- *)
-	lt_use_gnu_ld_interface=yes
-	;;
- esac
- fi
-
- if test "$lt_use_gnu_ld_interface" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
- # here allows them to be overridden if necessary.
- runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- # ancient GNU ld didn't support --whole-archive et. al.
- if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
- *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
-
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix3-9*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)=''
- ;;
- m68k)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- ;;
-
- beos*)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined. This deserves some investigation. FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- else
-	_LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _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'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 cp $export_symbols $output_objdir/$soname.def;
-	else
-	 echo EXPORTS > $output_objdir/$soname.def;
-	 cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- else
-	_LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- interix3-9*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
- # Instead, shared libraries are loaded at an image base (0x10000000 by
- # default) and relocated if they conflict, which is a slow very memory
- # consuming and fragmenting process. To avoid this, we pick a random,
- # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	 diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
- fi
- if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
- then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
- pgcc*)				# Portland Group C compiler
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	 tmp_addflag=' $pic_flag'
-	 ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	 tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	 tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	 tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	 tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	 tmp_sharedflag='--shared' ;;
-	xlcC* | bgxlcC* | mpixlcC*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	 tmp_sharedflag='-qmkshrobj'
-	 tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	 _LT_TAGVAR(compiler_needs_object, $1)=yes
-	 ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	 _LT_TAGVAR(compiler_needs_object, $1)=yes
-	 tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	 tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test "x$supports_anon_versioning" = xyes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	 cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	 echo "local: *; };" >> $output_objdir/$libname.ver~
-	 $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- fi
-
-	case $cc_basename in
-	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)='${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~
-	 cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	 echo "local: *; };" >> $output_objdir/$libname.ver~
-	 $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	 fi
-	 ;;
-	esac
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
- else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- solaris*)
- if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
-	_LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ 01.* | *\ 2.0-9.* | *\ 2.10-5.*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
-*** is disabling shared libraries support. We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	 # For security reasons, it is highly recommended that you always
-	 # use absolute paths for naming shared libraries, and exclude the
-	 # DT_RUNPATH tag from executables and libraries. But doing so
-	 # requires that you compile everything twice, which is a pain.
-	 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	 else
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 fi
-	;;
- esac
- ;;
-
- sunos4*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- wlarc=
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
-	_LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
-
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
- runpath_var=
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- # PORTME fill in a description of your system's linker (not GNU ld)
- case $host_os in
- aix3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=yes
- _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
- # Note: this linker hardcodes the directories in LIBPATH if there
- # are no directories specified by -L.
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-
- aix4-9*)
- if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
- else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.23|aix4.23.*|aix5-9*)
-	 for ld_flag in $LDFLAGS; do
-	 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	 aix_use_runtimelinking=yes
-	 break
-	 fi
-	 done
-	 ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_TAGVAR(archive_cmds, $1)=''
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
- if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	 collect2name=`${CC} -print-prog-name=collect2`
-	 if test -f "$collect2name" &&
-	 strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	 then
-	 # We have reworked collect2
-	 :
-	 else
-	 # We have old collect2
-	 _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	 # It fails to find uninstalled libraries when the uninstalled
-	 # path is not listed in the libpath. Setting hardcode_minus_L
-	 # to unsupported forces relinking
-	 _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	 fi
-	 ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag="$shared_flag "'${wl}-G'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
- else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	 shared_flag='-G'
-	else
-	 if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag='${wl}-G'
-	 else
-	 shared_flag='${wl}-bM:SRE'
-	 fi
-	fi
- fi
-
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- _LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- _LT_SYS_MODULE_PATH_AIX($1)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
-	if test "$host_cpu" = ia64; then
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	 _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX($1)
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	 # Warning - without using the other run time loading flags,
-	 # -berok will link without error, but may produce a broken library.
-	 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	 if test "$with_gnu_ld" = yes; then
-	 # We only use this code for GNU lds that support --whole-archive.
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	 else
-	 # Exported symbols can be pulled into shared objects from archives
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	 fi
-	 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	 # This is similar to how AIX traditionally builds its shared libraries.
-	 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
- fi
- ;;
-
- amigaos*)
- case $host_cpu in
- powerpc)
- # see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)=''
- ;;
- m68k)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- ;;
- esac
- ;;
-
- bsdi45*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- case $cc_basename in
- cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	 else
-	 sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	 fi~
-	 $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	 linknames='
-	# 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'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	 lt_tool_outputfile="@TOOL_OUTPUT@"~
-	 case $lt_outputfile in
-	 *.exe|*.EXE) ;;
-	 *)
-	 lt_outputfile="$lt_outputfile.exe"
-	 lt_tool_outputfile="$lt_tool_outputfile.exe"
-	 ;;
-	 esac~
-	 if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	 $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	 $RM "$lt_outputfile.manifest";
-	 fi'
-	;;
- *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
- esac
- ;;
-
- darwin* | rhapsody*)
- _LT_DARWIN_LINKER_FEATURES($1)
- ;;
-
- dgux*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $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
- # extra space).
- freebsd2.2*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- 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
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- hpux9*)
- if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(hardcode_direct, $1)=yes
-
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
-
- hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
- fi
- ;;
-
- hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	ia64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	esac
- else
-	case $host_cpu in
-	hppa*64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	ia64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	*)
-	m4_if($1, , 
-	 # Older versions of the 11.00 compiler do not understand -b yet
-	 # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	 _LT_LINKER_OPTION(if $CC understands -b,
-	 _LT_TAGVAR(lt_cv_prog_compiler__b, $1), -b,
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags',
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'),
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags')
-	 ;;
-	esac
- fi
- if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	 _LT_TAGVAR(hardcode_direct, $1)=no
-	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	 ;;
-	*)
-	 _LT_TAGVAR(hardcode_direct, $1)=yes
-	 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	 # hardcode_minus_L: Not really in the search PATH,
-	 # but as the default location of the library.
-	 _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	 ;;
-	esac
- fi
- ;;
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK(whether the $host_os linker accepts -exported_symbol,
-	 lt_cv_irix_exported_symbol,
-	 save_LDFLAGS="$LDFLAGS"
-	 LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	 AC_LINK_IFELSE(
-	 AC_LANG_SOURCE(
-	 AC_LANG_CASE(C, int foo (void) { return 0; },
-			 C++, int foo (void) { return 0; },
-			 Fortran 77, 
- subroutine foo
- end,
-			 Fortran, 
- subroutine foo
- end)),
-	 lt_cv_irix_exported_symbol=yes,
-	 lt_cv_irix_exported_symbol=no)
- LDFLAGS="$save_LDFLAGS")
-	if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
- else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(inherit_rpath, $1)=yes
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- netbsd* | netbsdelf*-gnu)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
- else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- newsos6)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *nto* | *qnx*)
- ;;
-
- openbsd*)
- if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	 case $host_os in
-	 openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*)
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	 ;;
-	 *)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 ;;
-	 esac
-	fi
- else
-	_LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
- os2*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- osf4* | osf5*)	# as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- solaris*)
- _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	 wlarc=''
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	 ;;
-	*)
-	 wlarc='${wl}'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	 ;;
-	esac
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.0-5 | solaris2.0-5.*) ;;
- *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'. GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
- esac
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- sunos4*)
- if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
- fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4)
- case $host_vendor in
-	sni)
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	 _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	 ## LD is ld it makes a PLAMLIB
-	 ## CC just makes a GrossModule.
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	 _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	 _LT_TAGVAR(hardcode_direct, $1)=no
- ;;
-	motorola)
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	 _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
- esac
- runpath_var='LD_RUN_PATH'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- sysv4.3*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
- ;;
-
- sysv4*MP*)
- if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
- fi
- ;;
-
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
- # link with -lc, and that would cause any symbols used from libc to
- # always be unresolved, which means just about no library would
- # ever link correctly. If we're not using GNU ld we use -z text
- # though, which does catch some bad symbols but isn't as heavy-handed
- # as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
-
- if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
- ;;
-
- uts4*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- *)
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
-
- if test x$host_vendor = xsni; then
- case $host in
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
- esac
- fi
- fi
-)
-AC_MSG_RESULT($_LT_TAGVAR(ld_shlibs, $1))
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL(, libext, 0, Old archive suffix (normally "a"))dnl
-_LT_DECL(, shrext_cmds, 1, Shared library suffix (normally ".so"))dnl
-_LT_DECL(, extract_expsyms_cmds, 2,
- The commands to extract the exported symbol list from a shared archive)
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
- # Assume -lc should be added
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
- if test "$enable_shared" = yes && test "$GCC" = yes; then
- case $_LT_TAGVAR(archive_cmds, $1) in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
- ;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
- AC_CACHE_CHECK(whether -lc should be explicitly linked in,
-	lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1),
-	$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	 soname=conftest
-	 lib=conftest
-	 libobjs=conftest.$ac_objext
-	 deplibs=
-	 wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	 pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	 compiler_flags=-v
-	 linker_flags=-v
-	 verstring=
-	 output_objdir=.
-	 libname=conftest
-	 lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	 _LT_TAGVAR(allow_undefined_flag, $1)=
-	 if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	 then
-	 lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	 else
-	 lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	 fi
-	 _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	 cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	)
- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)
- ;;
- esac
- fi
- ;;
-esac
-
-_LT_TAGDECL(build_libtool_need_lc, archive_cmds_need_lc, 0,
- Whether or not to add -lc for building shared libraries)
-_LT_TAGDECL(allow_libtool_libs_with_static_runtimes,
- enable_shared_with_static_runtimes, 0,
- Whether or not to disallow shared libs when runtime libs are static)
-_LT_TAGDECL(, export_dynamic_flag_spec, 1,
- Compiler flag to allow reflexive dlopens)
-_LT_TAGDECL(, whole_archive_flag_spec, 1,
- Compiler flag to generate shared objects directly from archives)
-_LT_TAGDECL(, compiler_needs_object, 1,
- Whether the compiler copes with passing no objects directly)
-_LT_TAGDECL(, old_archive_from_new_cmds, 2,
- Create an old-style archive from a shared archive)
-_LT_TAGDECL(, old_archive_from_expsyms_cmds, 2,
- Create a temporary old-style archive to link instead of a shared archive)
-_LT_TAGDECL(, archive_cmds, 2, Commands used to build a shared archive)
-_LT_TAGDECL(, archive_expsym_cmds, 2)
-_LT_TAGDECL(, module_cmds, 2,
- Commands used to build a loadable module if different from building
- a shared archive.)
-_LT_TAGDECL(, module_expsym_cmds, 2)
-_LT_TAGDECL(, with_gnu_ld, 1,
- Whether we are building with GNU ld or not)
-_LT_TAGDECL(, allow_undefined_flag, 1,
- Flag that allows shared libraries with undefined symbols to be built)
-_LT_TAGDECL(, no_undefined_flag, 1,
- Flag that enforces no undefined symbols)
-_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_separator, 1,
- Whether we need a single "-rpath" flag with a separated argument)
-_LT_TAGDECL(, hardcode_direct, 0,
- Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
- DIR into the resulting binary)
-_LT_TAGDECL(, hardcode_direct_absolute, 0,
- Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
- DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e impossible to change by setting ${shlibpath_var} if the
- library is relocated)
-_LT_TAGDECL(, hardcode_minus_L, 0,
- Set to "yes" if using the -LDIR flag during linking hardcodes DIR
- into the resulting binary)
-_LT_TAGDECL(, hardcode_shlibpath_var, 0,
- Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
- into the resulting binary)
-_LT_TAGDECL(, hardcode_automatic, 0,
- Set to "yes" if building a shared library automatically hardcodes DIR
- into the library and all subsequent libraries and executables linked
- against it)
-_LT_TAGDECL(, inherit_rpath, 0,
- Set to yes if linker adds runtime paths of dependent libraries
- to runtime path list)
-_LT_TAGDECL(, link_all_deplibs, 0,
- Whether libtool must link a program against all its dependency libraries)
-_LT_TAGDECL(, always_export_symbols, 0,
- Set to "yes" if exported symbols are required)
-_LT_TAGDECL(, export_symbols_cmds, 2,
- The commands to list exported symbols)
-_LT_TAGDECL(, exclude_expsyms, 1,
- Symbols that should not be listed in the preloaded symbols)
-_LT_TAGDECL(, include_expsyms, 1,
- Symbols that must always be exported)
-_LT_TAGDECL(, prelink_cmds, 2,
- Commands necessary for linking programs (against libraries) with templates)
-_LT_TAGDECL(, postlink_cmds, 2,
- Commands necessary for finishing linking programs)
-_LT_TAGDECL(, file_list_spec, 1,
- Specify filename containing input files)
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL(, thread_safe_flag_spec, 1,
-dnl Compiler flag to generate thread safe objects)
-)# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG(TAG)
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_C_CONFIG,
-m4_require(_LT_DECL_EGREP)dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, ) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-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_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
- LT_SYS_DLOPEN_SELF
- _LT_CMD_STRIPLIB
-
- # Report which library types will actually be built
- AC_MSG_CHECKING(if libtool supports shared libraries)
- AC_MSG_RESULT($can_build_shared)
-
- AC_MSG_CHECKING(whether to build shared libraries)
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
-
- aix4-9*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
- fi
- ;;
- esac
- AC_MSG_RESULT($enable_shared)
-
- AC_MSG_CHECKING(whether to build static libraries)
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- AC_MSG_RESULT($enable_static)
-
- _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-)# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG(TAG)
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_CXX_CONFIG,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-m4_require(_LT_DECL_EGREP)dnl
-m4_require(_LT_PATH_MANIFEST_TOOL)dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- AC_PROG_CXXCPP
-else
- _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code='int main(int, char *) { return(0); }'
-
- # 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_LD=$LD
- lt_save_GCC=$GCC
- GCC=$GXX
- lt_save_with_gnu_ld=$with_gnu_ld
- lt_save_path_LD=$lt_cv_path_LD
- if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
- lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
- else
- $as_unset lt_cv_prog_gnu_ld
- fi
- if test -n "${lt_cv_path_LDCXX+set}"; then
- lt_cv_path_LD=$lt_cv_path_LDCXX
- else
- $as_unset lt_cv_path_LD
- fi
- test -z "${LDCXX+set}" || LD=$LDCXX
- CC=${CXX-"c++"}
- CFLAGS=$CXXFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME($compiler)
-
- if test -n "$compiler"; then
- # We don't want -fno-exception when compiling C++ code, so set the
- # no_builtin_flag separately
- if test "$GXX" = yes; then
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
- else
- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
- fi
-
- if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
-
- LT_PATH_LD
-
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
- # If archive_cmds runs LD, not CC, wlarc should be empty
- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
- # investigate it a little bit more. (MM)
- wlarc='${wl}'
-
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	 $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- fi
- else
- with_gnu_ld=no
- wlarc=
-
- # A generic and very simple default shared library creation
- # command for GNU C++ for the case where it uses the native
- # linker, instead of GNU ld. If possible, this setting should
- # overridden to take advantage of the native linker features on
- # the platform it is being used on.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- fi
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
- else
- GXX=no
- with_gnu_ld=no
- wlarc=
- fi
-
- # PORTME: fill in a description of your system's C++ link characteristics
- AC_MSG_CHECKING(whether the $compiler linker ($LD) supports shared libraries)
- _LT_TAGVAR(ld_shlibs, $1)=yes
- case $host_os in
- aix3*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- aix4-9*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
- aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
- else
- aix_use_runtimelinking=no
-
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
- case $host_os in aix4.23|aix4.23.*|aix5-9*)
-	 for ld_flag in $LDFLAGS; do
-	 case $ld_flag in
-	 *-brtl*)
-	 aix_use_runtimelinking=yes
-	 break
-	 ;;
-	 esac
-	 done
-	 ;;
- esac
-
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
- _LT_TAGVAR(archive_cmds, $1)=''
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
- if test "$GXX" = yes; then
- case $host_os in aix4.012|aix4.012.*)
- # We only want to do this on AIX 4.2 and lower, the check
- # below for broken collect2 doesn't work under 4.3+
-	 collect2name=`${CC} -print-prog-name=collect2`
-	 if test -f "$collect2name" &&
-	 strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	 then
-	 # We have reworked collect2
-	 :
-	 else
-	 # We have old collect2
-	 _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	 # It fails to find uninstalled libraries when the uninstalled
-	 # path is not listed in the libpath. Setting hardcode_minus_L
-	 # to unsupported forces relinking
-	 _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	 fi
- esac
- shared_flag='-shared'
-	 if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag="$shared_flag "'${wl}-G'
-	 fi
- else
- # not using gcc
- if test "$host_cpu" = ia64; then
-	 # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	 # chokes on -Wl,-G. The following line is correct:
-	 shared_flag='-G'
- else
-	 if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag='${wl}-G'
-	 else
-	 shared_flag='${wl}-bM:SRE'
-	 fi
- fi
- fi
-
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to
-	# export.
- _LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
- # Warning - without using the other runtime loading flags (-brtl),
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty
- # executable.
- _LT_SYS_MODULE_PATH_AIX($1)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	 _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
- else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX($1)
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	 # Warning - without using the other run time loading flags,
-	 # -berok will link without error, but may produce a broken library.
-	 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	 if test "$with_gnu_ld" = yes; then
-	 # We only use this code for GNU lds that support --whole-archive.
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	 else
-	 # Exported symbols can be pulled into shared objects from archives
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	 fi
-	 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	 # This is similar to how AIX traditionally builds its shared
-	 # libraries.
-	 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- fi
- fi
- ;;
-
- beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	 # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	 # support --undefined. This deserves some investigation. FIXME
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
- chorus*)
- case $cc_basename in
- *)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- esac
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	 # Native MSVC
-	 # hardcode_libdir_flag_spec is actually meaningless, as there is
-	 # no search path for DLLs.
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	 _LT_TAGVAR(always_export_symbols, $1)=yes
-	 _LT_TAGVAR(file_list_spec, $1)='@'
-	 # Tell ltmain to make .lib files, not .a files.
-	 libext=lib
-	 # Tell ltmain to make .dll files, not .so files.
-	 shrext_cmds=".dll"
-	 # FIXME: Setting linknames here is a bad hack.
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	 else
-	 $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	 fi~
-	 $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	 linknames='
-	 # 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
-	 # Don't use ranlib
-	 _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	 _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	 lt_tool_outputfile="@TOOL_OUTPUT@"~
-	 case $lt_outputfile in
-	 *.exe|*.EXE) ;;
-	 *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	 esac~
-	 func_to_tool_file "$lt_outputfile"~
-	 if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	 $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	 $RM "$lt_outputfile.manifest";
-	 fi'
-	 ;;
-	*)
-	 # g++
-	 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	 # as there is no search path for DLLs.
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-	 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	 _LT_TAGVAR(always_export_symbols, $1)=no
-	 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	 # If the export-symbols file already is a .def file (1st line
-	 # is EXPORTS), use it as is; otherwise, prepend...
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 cp $export_symbols $output_objdir/$soname.def;
-	 else
-	 echo EXPORTS > $output_objdir/$soname.def;
-	 cat $export_symbols >> $output_objdir/$soname.def;
-	 fi~
-	 $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	 else
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 fi
-	 ;;
-	esac
-	;;
- darwin* | rhapsody*)
- _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
- dgux*)
- case $cc_basename in
- ec++*)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- ghcx*)
-	 # Green Hills C++ Compiler
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- *)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- esac
- ;;
-
- freebsd2.*)
- # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- freebsd-elf*)
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
-
- freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- _LT_TAGVAR(ld_shlibs, $1)=yes
- ;;
-
- gnu*)
- ;;
-
- haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
- hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				 # but as the default
-				 # location of the library.
-
- case $cc_basename in
- CC*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- aCC*)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- ;;
- *)
- if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
- else
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
-
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
- case $host_cpu in
- hppa*64*|ia64*)
- ;;
- *)
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
- esac
- fi
- case $host_cpu in
- hppa*64*|ia64*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
- *)
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					 # but as the default
-					 # location of the library.
- ;;
- esac
-
- case $cc_basename in
- CC*)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- aCC*)
-	 case $host_cpu in
-	 hppa*64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 ia64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 *)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 esac
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 #
-	 # There doesn't appear to be a way to prevent this compiler from
-	 # explicitly linking system object files so we need to strip them
-	 # from the output so that they don't get included in the library
-	 # dependencies.
-	 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	 ;;
- *)
-	 if test "$GXX" = yes; then
-	 if test $with_gnu_ld = no; then
-	 case $host_cpu in
-	 hppa*64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 ia64*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 *)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 ;;
-	 esac
-	 fi
-	 else
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 fi
-	 ;;
- esac
- ;;
-
- interix3-9*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process. To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time. Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
- irix5* | irix6*)
- case $cc_basename in
- CC*)
-	 # SGI C++
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	 # Archives containing C++ object files must be created using
-	 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
-	 # necessary to make sure instantiated templates are included
-	 # in the archive.
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	 ;;
- *)
-	 if test "$GXX" = yes; then
-	 if test "$with_gnu_ld" = no; then
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	 else
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	 fi
-	 fi
-	 _LT_TAGVAR(link_all_deplibs, $1)=yes
-	 ;;
- esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(inherit_rpath, $1)=yes
- ;;
-
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
-	 # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	 # KCC will only create a shared library if the output file
-	 # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	 # to its proper name (with version) after linking.
-	 _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 #
-	 # There doesn't appear to be a way to prevent this compiler from
-	 # explicitly linking system object files so we need to strip them
-	 # from the output so that they don't get included in the library
-	 # dependencies.
-	 output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	 # Archives containing C++ object files must be created using
-	 # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	 ;;
-	 icpc* | ecpc* )
-	 # Intel C++
-	 with_gnu_ld=yes
-	 # version 8.0 and above of icpc choke on multiply defined symbols
-	 # if we add $predep_objects and $postdep_objects, however 7.1 and
-	 # earlier do not add the objects themselves.
-	 case `$CC -V 2>&1` in
-	 *"Version 7."*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	 *) # Version 8.0 or newer
-	 tmp_idyn=
-	 case $host_cpu in
-		 ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	 esac
-	 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	 ;;
- pgCC* | pgcpp*)
- # Portland Group C++ compiler
-	 case `$CC -V` in
-	 *pgCC\ 1-5.* | *pgcpp\ 1-5.*)
-	 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
-	 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	 ;;
-	 *) # Version 6 and above use weak symbols
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	 ;;
-	 esac
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- ;;
-	 cxx*)
-	 # Compaq C++
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	 runpath_var=LD_RUN_PATH
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 #
-	 # There doesn't appear to be a way to prevent this compiler from
-	 # explicitly linking system object files so we need to strip them
-	 # from the output so that they don't get included in the library
-	 # dependencies.
-	 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	 ;;
-	 xl* | mpixl* | bgxl*)
-	 # IBM XL 8.0 on PPC, with GNU ld
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	 if test "x$supports_anon_versioning" = xyes; then
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	 fi
-	 ;;
-	 *)
-	 case `$CC -V 2>&1 | sed 5q` in
-	 *Sun\ C*)
-	 # Sun C++ 5.9
-	 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	 _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	 # Not sure whether something based on
-	 # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	 # would be better.
-	 output_verbose_link_cmd='func_echo_all'
-
-	 # Archives containing C++ object files must be created using
-	 # "CC -xar", where "CC" is the Sun C++ compiler. This is
-	 # necessary to make sure instantiated templates are included
-	 # in the archive.
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	 ;;
-	 esac
-	 ;;
-	esac
-	;;
-
- lynxos*)
- # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
- m88k*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
- mvs*)
- case $cc_basename in
- cxx*)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
-	 *)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
-	esac
-	;;
-
- netbsd*)
- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	 wlarc=
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	 _LT_TAGVAR(hardcode_direct, $1)=yes
-	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
- *nto* | *qnx*)
- _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
- openbsd2*)
- # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
- openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	 _LT_TAGVAR(hardcode_direct, $1)=yes
-	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	 _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	 fi
-	 output_verbose_link_cmd=func_echo_all
-	else
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
- osf3* | osf4* | osf5*)
- case $cc_basename in
- KCC*)
-	 # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	 # KCC will only create a shared library if the output file
-	 # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	 # to its proper name (with version) after linking.
-	 _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	 # Archives containing C++ object files must be created using
-	 # the KAI C++ compiler.
-	 case $host in
-	 osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	 *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	 esac
-	 ;;
- RCC*)
-	 # Rational C++ 2.4.1
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- cxx*)
-	 case $host in
-	 osf3*)
-	 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	 *)
-	 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	 echo "-hidden">> $lib.exp~
-	 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	 $RM $lib.exp'
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	 esac
-
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 #
-	 # There doesn't appear to be a way to prevent this compiler from
-	 # explicitly linking system object files so we need to strip them
-	 # from the output so that they don't get included in the library
-	 # dependencies.
-	 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	 ;;
-	 *)
-	 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	 _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 case $host in
-	 osf3*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		 ;;
-	 *)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		 ;;
-	 esac
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	 else
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 fi
-	 ;;
- esac
- ;;
-
- psos*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- sunos4*)
- case $cc_basename in
- CC*)
-	 # Sun C++ 4.x
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- lcc*)
-	 # Lucid
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- *)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- esac
- ;;
-
- solaris*)
- case $cc_basename in
- CC* | sunCC*)
-	 # Sun C++ 4.2, 5.x and Centerline C++
- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	 case $host_os in
-	 solaris2.0-5 | solaris2.0-5.*) ;;
-	 *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	 # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	 ;;
-	 esac
-	 _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	 output_verbose_link_cmd='func_echo_all'
-
-	 # Archives containing C++ object files must be created using
-	 # "CC -xar", where "CC" is the Sun C++ compiler. This is
-	 # necessary to make sure instantiated templates are included
-	 # in the archive.
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	 ;;
- gcx*)
-	 # Green Hills C++ Compiler
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	 # The C++ compiler must be used to create the archive.
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	 ;;
- *)
-	 # GNU C++ compiler with Solaris linker
-	 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	 _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		 $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	 else
-	 # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	 # platform.
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		 $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	 # Commands to make compiler produce verbose output that lists
-	 # what "hidden" libraries, object files and flags are used when
-	 # linking a shared library.
-	 output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	 fi
-
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	 case $host_os in
-		solaris2.0-5 | solaris2.0-5.*) ;;
-		*)
-		 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		 ;;
-	 esac
-	 fi
-	 ;;
- esac
- ;;
-
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-
- case $cc_basename in
- CC*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
- esac
- ;;
-
- sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly. If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
- CC*)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	 '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	 _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	 '"$_LT_TAGVAR(reload_cmds, $1)"
-	 ;;
-	 *)
-	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 ;;
-	esac
- ;;
-
- tandem*)
- case $cc_basename in
- NCC*)
-	 # NonStop-UX NCC 3.20
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- *)
-	 # FIXME: insert proper C++ library support
-	 _LT_TAGVAR(ld_shlibs, $1)=no
-	 ;;
- esac
- ;;
-
- vxworks*)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- *)
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
-
- AC_MSG_RESULT($_LT_TAGVAR(ld_shlibs, $1))
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
- ## what you are doing...
- _LT_SYS_HIDDEN_LIBDEPS($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-
- CC=$lt_save_CC
- CFLAGS=$lt_save_CFLAGS
- LDCXX=$LD
- LD=$lt_save_LD
- GCC=$lt_save_GCC
- with_gnu_ld=$lt_save_with_gnu_ld
- lt_cv_path_LDCXX=$lt_cv_path_LD
- lt_cv_path_LD=$lt_save_path_LD
- lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
- lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-)# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun(_LT_FUNC_STRIPNAME_CNF,dnl
-AC_REQUIRE(_LT_DECL_SED)
-AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)
-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
-)# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS(TAGNAME)
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun(_LT_SYS_HIDDEN_LIBDEPS,
-m4_require(_LT_FILEUTILS_DEFAULTS)dnl
-AC_REQUIRE(_LT_FUNC_STRIPNAME_CNF)dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library. It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if($1, , cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-, $1, CXX, cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
- Foo (void) { a = 0; }
-private:
- int a;
-};
-_LT_EOF
-, $1, F77, cat > conftest.$ac_ext <<_LT_EOF
- subroutine foo
- implicit none
- integer*4 a
- a=0
- return
- end
-_LT_EOF
-, $1, FC, cat > conftest.$ac_ext <<_LT_EOF
- subroutine foo
- implicit none
- integer a
- a=0
- return
- end
-_LT_EOF
-, $1, GCJ, cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
- private int a;
- public void bar (void) {
- a = 0;
- }
-};
-_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
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
-
- # Sentinel used to keep track of whether or not we are before
- # the conftest object file.
- pre_test_object_deps_done=no
-
- for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
-	 prev=$p
-	 continue
- fi
-
- # Expand the sysroot to ease extracting the directories later.
- if test -z "$prev"; then
- case $p in
- -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
- -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
- -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
- esac
- fi
- case $p in
- =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
- esac
- if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	 # Internal compiler library paths should come after those
-	 # provided the user. The postdeps already come after the
-	 # user supplied libs so there is no need to process them.
-	 if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	 _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	 else
-	 _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	 fi
-	 ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
- else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	 _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
- fi
- prev=
- ;;
-
- *.lto.$objext) ;; # Ignore GCC LTO objects
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
- if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
- fi
-
- if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	 _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	 _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
- else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	 _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	 _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
- fi
- ;;
-
- *) ;; # Ignore the rest.
-
- esac
- done
-
- # Clean up.
- rm -f a.out a.exe
-else
- echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if($1, CXX,
-case $host_os in
-interix3-9*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- _LT_TAGVAR(predep_objects,$1)=
- _LT_TAGVAR(postdep_objects,$1)=
- _LT_TAGVAR(postdeps,$1)=
- ;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-esac
-)
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL(, compiler_lib_search_dirs, 1,
- The directories searched by this compiler when creating a shared library)
-_LT_TAGDECL(, predep_objects, 1,
- Dependencies to place before and after the objects being linked to
- create a shared library)
-_LT_TAGDECL(, postdep_objects, 1)
-_LT_TAGDECL(, predeps, 1)
-_LT_TAGDECL(, postdeps, 1)
-_LT_TAGDECL(, compiler_lib_search_path, 1,
- The library search path used internally by the compiler when linking
- a shared library)
-)# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG(TAG)
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_F77_CONFIG,
-AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
- _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="\
- subroutine t
- return
- end
-"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="\
- program t
- end
-"
-
- # 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_GCC=$GCC
- lt_save_CFLAGS=$CFLAGS
- CC=${F77-"f77"}
- CFLAGS=$FFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME($compiler)
- GCC=$G77
- if test -n "$compiler"; then
- AC_MSG_CHECKING(if libtool supports shared libraries)
- AC_MSG_RESULT($can_build_shared)
-
- AC_MSG_CHECKING(whether to build shared libraries)
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
- aix4-9*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	 test "$enable_shared" = yes && enable_static=no
-	fi
- ;;
- esac
- AC_MSG_RESULT($enable_shared)
-
- AC_MSG_CHECKING(whether to build static libraries)
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- AC_MSG_RESULT($enable_static)
-
- _LT_TAGVAR(GCC, $1)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
- ## what you are doing...
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-
- GCC=$lt_save_GCC
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-)# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG(TAG)
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_FC_CONFIG,
-AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
- _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working. Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
- # Code to be used in simple compile tests
- lt_simple_compile_test_code="\
- subroutine t
- return
- end
-"
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="\
- program t
- end
-"
-
- # 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_GCC=$GCC
- lt_save_CFLAGS=$CFLAGS
- CC=${FC-"f95"}
- CFLAGS=$FCFLAGS
- compiler=$CC
- GCC=$ac_cv_fc_compiler_gnu
-
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME($compiler)
-
- if test -n "$compiler"; then
- AC_MSG_CHECKING(if libtool supports shared libraries)
- AC_MSG_RESULT($can_build_shared)
-
- AC_MSG_CHECKING(whether to build shared libraries)
- test "$can_build_shared" = "no" && enable_shared=no
-
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
- case $host_os in
- aix3*)
- test "$enable_shared" = yes && enable_static=no
- if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
- postinstall_cmds='$RANLIB $lib'
- fi
- ;;
- aix4-9*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	 test "$enable_shared" = yes && enable_static=no
-	fi
- ;;
- esac
- AC_MSG_RESULT($enable_shared)
-
- AC_MSG_CHECKING(whether to build static libraries)
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
- AC_MSG_RESULT($enable_static)
-
- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
- _LT_TAGVAR(LD, $1)="$LD"
-
- ## CAVEAT EMPTOR:
- ## There is no encapsulation within the following macros, do not change
- ## the running order or otherwise move them around unless you know exactly
- ## what you are doing...
- _LT_SYS_HIDDEN_LIBDEPS($1)
- _LT_COMPILER_PIC($1)
- _LT_COMPILER_C_O($1)
- _LT_COMPILER_FILE_LOCKS($1)
- _LT_LINKER_SHLIBS($1)
- _LT_SYS_DYNAMIC_LINKER($1)
- _LT_LINKER_HARDCODE_LIBPATH($1)
-
- _LT_CONFIG($1)
- fi # test -n "$compiler"
-
- GCC=$lt_save_GCC
- CC=$lt_save_CC
- CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-)# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG(TAG)
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_GCJ_CONFIG,
-AC_REQUIRE(LT_PROG_GCJ)dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }'
-
-# 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=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME($compiler)
-
-# GCJ 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
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-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_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
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-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
-# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun(_LT_LANG_RC_CONFIG,
-AC_REQUIRE(LT_PROG_RC)dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# 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=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME($compiler)
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
- :
- _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-)# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN(LT_PROG_GCJ,
-m4_ifdef(AC_PROG_GCJ, AC_PROG_GCJ,
- m4_ifdef(AM_PROG_GCJ, AM_PROG_GCJ,
- AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
- AC_SUBST(GCJFLAGS)))dnl
-)
-
-# Old name:
-AU_ALIAS(LT_AC_PROG_GCJ, LT_PROG_GCJ)
-dnl aclocal-1.4 backwards compatibility:
-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,
-AC_CHECK_TOOL(RC, windres,)
-)
-
-# Old name:
-AU_ALIAS(LT_AC_PROG_RC, LT_PROG_RC)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(LT_AC_PROG_RC, )
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun(_LT_DECL_EGREP,
-AC_REQUIRE(AC_PROG_EGREP)dnl
-AC_REQUIRE(AC_PROG_FGREP)dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL(, GREP, 1, A grep program that handles long lines)
-_LT_DECL(, EGREP, 1, An ERE matcher)
-_LT_DECL(, FGREP, 1, A literal string matcher)
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST(GREP)
-)
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun(_LT_DECL_OBJDUMP,
-AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL(, OBJDUMP, 1, An object symbol dumper)
-AC_SUBST(OBJDUMP)
-)
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun(_LT_DECL_DLLTOOL,
-AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL(, DLLTOOL, 1, DLL creation program)
-AC_SUBST(DLLTOOL)
-)
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible. Prefer GNU sed if found.
-m4_defun(_LT_DECL_SED,
-AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL(, SED, 1, A sed program that does not truncate output)
-_LT_DECL(, Xsed, "\$SED -e 1s/^X//",
- Sed that helps us avoid accidentally triggering echo(1) options like -n)
-)# _LT_DECL_SED
-
-m4_ifndef(AC_PROG_SED, 
-############################################################
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
-# a released version of Autoconf we should remove this #
-# macro and use it instead. #
-############################################################
-
-m4_defun(AC_PROG_SED,
-AC_MSG_CHECKING(for a sed that does not truncate output)
-AC_CACHE_VAL(lt_cv_path_SED,
-# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
- cat /dev/null > conftest.in
- lt_ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >conftest.in
- # Check for GNU sed and select it if it is found.
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
- fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
- cp conftest.in conftest.nl
- echo >>conftest.nl
- $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
- cmp -s conftest.out conftest.nl || break
- # 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
- lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
- fi
- done
-done
-)
-SED=$lt_cv_path_SED
-AC_SUBST(SED)
-AC_MSG_RESULT($SED)
-)#AC_PROG_SED
-)#m4_ifndef
-
-# Old name:
-AU_ALIAS(LT_AC_PROG_SED, AC_PROG_SED)
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(LT_AC_PROG_SED, )
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun(_LT_CHECK_SHELL_FEATURES,
-AC_MSG_CHECKING(whether the shell understands some XSI constructs)
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-AC_MSG_RESULT($xsi_shell)
-_LT_CONFIG_LIBTOOL_INIT(xsi_shell='$xsi_shell')
-
-AC_MSG_CHECKING(whether the shell understands "+=")
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-AC_MSG_RESULT($lt_shell_append)
-_LT_CONFIG_LIBTOOL_INIT(lt_shell_append='$lt_shell_append')
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- lt_unset=unset
-else
- lt_unset=false
-fi
-_LT_DECL(, lt_unset, 0, whether the shell understands "unset")dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
- # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
- lt_SP2NL='tr \040 \012'
- lt_NL2SP='tr \015\012 \040\040'
- ;;
- *) # EBCDIC based system
- lt_SP2NL='tr \100 \n'
- lt_NL2SP='tr \r\n \100\100'
- ;;
-esac
-_LT_DECL(SP2NL, lt_SP2NL, 1, turn spaces into newlines)dnl
-_LT_DECL(NL2SP, lt_NL2SP, 1, turn newlines into spaces)dnl
-)# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun(_LT_PROG_FUNCTION_REPLACE,
-dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts($2, $, \\, ^, \\\1)
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-)
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun(_LT_PROG_REPLACE_SHELLFNS,
-if test x"$xsi_shell" = xyes; then
- _LT_PROG_FUNCTION_REPLACE(func_dirname, dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac)
-
- _LT_PROG_FUNCTION_REPLACE(func_basename, dnl
- func_basename_result="${1##*/}")
-
- _LT_PROG_FUNCTION_REPLACE(func_dirname_and_basename, dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}")
-
- _LT_PROG_FUNCTION_REPLACE(func_stripname, dnl
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"})
-
- _LT_PROG_FUNCTION_REPLACE(func_split_long_opt, dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=})
-
- _LT_PROG_FUNCTION_REPLACE(func_split_short_opt, dnl
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"})
-
- _LT_PROG_FUNCTION_REPLACE(func_lo2o, dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac)
-
- _LT_PROG_FUNCTION_REPLACE(func_xform, func_xform_result=${1%.*}.lo)
-
- _LT_PROG_FUNCTION_REPLACE(func_arith, func_arith_result=$(( $* )))
-
- _LT_PROG_FUNCTION_REPLACE(func_len, func_len_result=${#1})
-fi
-
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE(func_append, eval "${1}+=\\${2}")
-
- _LT_PROG_FUNCTION_REPLACE(func_append_quoted, dnl
- func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result")
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append $a-zA-Z_\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append $a-zA-Z_\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- AC_MSG_WARN(Unable to substitute extended shell functions in $ofile)
-fi
-)
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun(_LT_PATH_CONVERSION_FUNCTIONS,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-AC_REQUIRE(AC_CANONICAL_BUILD)dnl
-AC_MSG_CHECKING(how to convert $build file names to $host format)
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- ;;
- esac
- ;;
- *-*-cygwin* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- ;;
- *-*-cygwin* )
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
- * ) # otherwise, assume *nix
- lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- ;;
- esac
- ;;
- * ) # unhandled hosts (and "normal" native builds)
- lt_cv_to_host_file_cmd=func_convert_file_noop
- ;;
-esac
-)
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT($lt_cv_to_host_file_cmd)
-_LT_DECL(to_host_file_cmd, lt_cv_to_host_file_cmd,
- 0, convert $build file names to $host format)dnl
-
-AC_MSG_CHECKING(how to convert $build file names to toolchain format)
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
- *-*-mingw* )
- case $build in
- *-*-mingw* ) # actually msys
- lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- ;;
- esac
- ;;
-esac
-)
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT($lt_cv_to_tool_file_cmd)
-_LT_DECL(to_tool_file_cmd, lt_cv_to_tool_file_cmd,
- 0, convert $build files to toolchain format)dnl
-)# _LT_PATH_CONVERSION_FUNCTIONS

deadbeef-0.6.2.tar.bz2/m4/ltoptions.m4 Deleted

@@ -1,384 +0,0 @@
-# Helper functions for option handling. -*- Autoconf -*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# 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 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN(LTOPTIONS_VERSION, m4_if(1))
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define(_LT_MANGLE_OPTION,
-_LT_OPTION_m4_bpatsubst($1__$2, ^a-zA-Z0-9_, _))
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it. Other OPTION-NAMEs are
-# saved as a flag.
-m4_define(_LT_SET_OPTION,
-m4_define(_LT_MANGLE_OPTION($1, $2))dnl
-m4_ifdef(_LT_MANGLE_DEFUN($1, $2),
- _LT_MANGLE_DEFUN($1, $2),
- m4_warning(Unknown $1 option `$2'))dnl
-)
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, IF-NOT-SET)
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define(_LT_IF_OPTION,
-m4_ifdef(_LT_MANGLE_OPTION($1, $2), $3, $4))
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define(_LT_UNLESS_OPTIONS,
-m4_foreach(_LT_Option, m4_split(m4_normalize($2)),
-	 m4_ifdef(_LT_MANGLE_OPTION($1, _LT_Option),
-		 m4_define($0_found)))dnl
-m4_ifdef($0_found, m4_undefine($0_found), $3
-)dnl
-)
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME. If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun(_LT_SET_OPTIONS,
-# Set options
-m4_foreach(_LT_Option, m4_split(m4_normalize($2)),
- _LT_SET_OPTION($1, _LT_Option))
-
-m4_if($1,LT_INIT,
- dnl
- dnl Simply set some default values (i.e off) if boolean options were not
- dnl specified:
- _LT_UNLESS_OPTIONS(LT_INIT, dlopen, enable_dlopen=no
- )
- _LT_UNLESS_OPTIONS(LT_INIT, win32-dll, enable_win32_dll=no
- )
- dnl
- dnl If no reference was made to various pairs of opposing options, then
- dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
- dnl archives by default:
- _LT_UNLESS_OPTIONS(LT_INIT, shared disable-shared, _LT_ENABLE_SHARED)
- _LT_UNLESS_OPTIONS(LT_INIT, static disable-static, _LT_ENABLE_STATIC)
- _LT_UNLESS_OPTIONS(LT_INIT, pic-only no-pic, _LT_WITH_PIC)
- _LT_UNLESS_OPTIONS(LT_INIT, fast-install disable-fast-install,
- 		 _LT_ENABLE_FAST_INSTALL)
- )
-)# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define(_LT_MANGLE_DEFUN,
-_LT_OPTION_DEFUN_m4_bpatsubst(m4_toupper($1__$2), ^A-Z0-9_, _))
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define(LT_OPTION_DEFINE,
-m4_define(_LT_MANGLE_DEFUN($1, $2), $3)dnl
-)# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE(LT_INIT, dlopen, enable_dlopen=yes
-)
-
-AU_DEFUN(AC_LIBTOOL_DLOPEN,
-_LT_SET_OPTION(LT_INIT, dlopen)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_DLOPEN, )
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE(LT_INIT, win32-dll,
-enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
- ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL(, AS, 1, Assembler program)dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL(, DLLTOOL, 1, DLL creation program)dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL(, OBJDUMP, 1, Object dumper program)dnl
-)# win32-dll
-
-AU_DEFUN(AC_LIBTOOL_WIN32_DLL,
-AC_REQUIRE(AC_CANONICAL_HOST)dnl
-_LT_SET_OPTION(LT_INIT, win32-dll)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_WIN32_DLL, )
-
-
-# _LT_ENABLE_SHARED(DEFAULT)
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define(_LT_ENABLE_SHARED,
-m4_define(_LT_ENABLE_SHARED_DEFAULT, m4_if($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
- AS_HELP_STRING(--enable-shared@<:@=PKGS@:>@,
-	build shared libraries @<:@default=_LT_ENABLE_SHARED_DEFAULT@:>@),
- p=${PACKAGE-default}
- case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
- *)
- enable_shared=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	 enable_shared=yes
-	fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac,
- enable_shared=_LT_ENABLE_SHARED_DEFAULT)
-
- _LT_DECL(build_libtool_libs, enable_shared, 0,
-	Whether or not to build shared libraries)
-)# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE(LT_INIT, shared, _LT_ENABLE_SHARED(yes))
-LT_OPTION_DEFINE(LT_INIT, disable-shared, _LT_ENABLE_SHARED(no))
-
-# Old names:
-AC_DEFUN(AC_ENABLE_SHARED,
-_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)shared)
-)
-
-AC_DEFUN(AC_DISABLE_SHARED,
-_LT_SET_OPTION(LT_INIT, disable-shared)
-)
-
-AU_DEFUN(AM_ENABLE_SHARED, AC_ENABLE_SHARED($@))
-AU_DEFUN(AM_DISABLE_SHARED, AC_DISABLE_SHARED($@))
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_ENABLE_SHARED, )
-dnl AC_DEFUN(AM_DISABLE_SHARED, )
-
-
-
-# _LT_ENABLE_STATIC(DEFAULT)
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define(_LT_ENABLE_STATIC,
-m4_define(_LT_ENABLE_STATIC_DEFAULT, m4_if($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
- AS_HELP_STRING(--enable-static@<:@=PKGS@:>@,
-	build static libraries @<:@default=_LT_ENABLE_STATIC_DEFAULT@:>@),
- p=${PACKAGE-default}
- case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
- *)
- enable_static=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	 enable_static=yes
-	fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac,
- enable_static=_LT_ENABLE_STATIC_DEFAULT)
-
- _LT_DECL(build_old_libs, enable_static, 0,
-	Whether or not to build static libraries)
-)# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE(LT_INIT, static, _LT_ENABLE_STATIC(yes))
-LT_OPTION_DEFINE(LT_INIT, disable-static, _LT_ENABLE_STATIC(no))
-
-# Old names:
-AC_DEFUN(AC_ENABLE_STATIC,
-_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)static)
-)
-
-AC_DEFUN(AC_DISABLE_STATIC,
-_LT_SET_OPTION(LT_INIT, disable-static)
-)
-
-AU_DEFUN(AM_ENABLE_STATIC, AC_ENABLE_STATIC($@))
-AU_DEFUN(AM_DISABLE_STATIC, AC_DISABLE_STATIC($@))
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AM_ENABLE_STATIC, )
-dnl AC_DEFUN(AM_DISABLE_STATIC, )
-
-
-
-# _LT_ENABLE_FAST_INSTALL(DEFAULT)
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-m4_define(_LT_ENABLE_FAST_INSTALL,
-m4_define(_LT_ENABLE_FAST_INSTALL_DEFAULT, m4_if($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
- AS_HELP_STRING(--enable-fast-install@<:@=PKGS@:>@,
- optimize for fast installation @<:@default=_LT_ENABLE_FAST_INSTALL_DEFAULT@:>@),
- p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	 enable_fast_install=yes
-	fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac,
- enable_fast_install=_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL(fast_install, enable_fast_install, 0,
-	 Whether or not to optimize for fast installation)dnl
-)# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE(LT_INIT, fast-install, _LT_ENABLE_FAST_INSTALL(yes))
-LT_OPTION_DEFINE(LT_INIT, disable-fast-install, _LT_ENABLE_FAST_INSTALL(no))
-
-# Old names:
-AU_DEFUN(AC_ENABLE_FAST_INSTALL,
-_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)fast-install)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.)
-)
-
-AU_DEFUN(AC_DISABLE_FAST_INSTALL,
-_LT_SET_OPTION(LT_INIT, disable-fast-install)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_ENABLE_FAST_INSTALL, )
-dnl AC_DEFUN(AM_DISABLE_FAST_INSTALL, )
-
-
-# _LT_WITH_PIC(MODE)
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# 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@<:@=PKGS@:>@,
-	try to use only PIC/non-PIC objects @<:@default=use both@:>@),
- 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)
-
-_LT_DECL(, pic_mode, 0, What type of objects to build)dnl
-)# _LT_WITH_PIC
-
-LT_OPTION_DEFINE(LT_INIT, pic-only, _LT_WITH_PIC(yes))
-LT_OPTION_DEFINE(LT_INIT, no-pic, _LT_WITH_PIC(no))
-
-# Old name:
-AU_DEFUN(AC_LIBTOOL_PICMODE,
-_LT_SET_OPTION(LT_INIT, pic-only)
-AC_DIAGNOSE(obsolete,
-$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.)
-)
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN(AC_LIBTOOL_PICMODE, )
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define(_LTDL_MODE, )
-LT_OPTION_DEFINE(LTDL_INIT, nonrecursive,
-		 m4_define(_LTDL_MODE, nonrecursive))
-LT_OPTION_DEFINE(LTDL_INIT, recursive,
-		 m4_define(_LTDL_MODE, recursive))
-LT_OPTION_DEFINE(LTDL_INIT, subproject,
-		 m4_define(_LTDL_MODE, subproject))
-
-m4_define(_LTDL_TYPE, )
-LT_OPTION_DEFINE(LTDL_INIT, installable,
-		 m4_define(_LTDL_TYPE, installable))
-LT_OPTION_DEFINE(LTDL_INIT, convenience,
-		 m4_define(_LTDL_TYPE, convenience))

deadbeef-0.6.2.tar.bz2/m4/ltsugar.m4 Deleted

@@ -1,123 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# 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 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN(LTSUGAR_VERSION, m4_if(0.1))
-
-
-# lt_join(SEP, ARG1, ARG2...)
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting  arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define(lt_join,
-m4_if($#, 1, ,
-       $#, 2, $2,
-       m4_if($2, , , $2_)$0($1, m4_shift(m4_shift($@)))))
-m4_define(_lt_join,
-m4_if($#$2, 2, ,
-       m4_if($2, , , $1$2)$0($1, m4_shift(m4_shift($@)))))
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define(lt_car, $1)
-m4_define(lt_cdr,
-m4_if($#, 0, m4_fatal($0: cannot be called without arguments),
-       $#, 1, ,
-       m4_dquote(m4_shift($@))))
-m4_define(lt_unquote, $1)
-
-
-# lt_append(MACRO-NAME, STRING, SEPARATOR)
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define(lt_append,
-m4_define($1,
-	   m4_ifdef($1, m4_defn($1)$3)$2))
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, SUFFIX2...)
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define(lt_combine,
-m4_if(m4_eval($# > 3), 1,
-       m4_pushdef(_Lt_sep, m4_define(_Lt_sep, m4_defn(lt_car)))dnl
-m4_foreach(_Lt_prefix, $2,
-	     m4_foreach(_Lt_suffix,
-		m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@))))),
-	_Lt_sep($1)m4_defn(_Lt_prefix)$3m4_defn(_Lt_suffix)))))
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, SEPARATOR, UNIQ, NOT-UNIQ)
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define(lt_if_append_uniq,
-m4_ifdef($1,
-	  m4_if(m4_index($3m4_defn($1)$3, $3$2$3), -1,
-		 lt_append($1, $2, $3)$4,
-		 $5),
-	  lt_append($1, $2, $3)$4))
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define(lt_dict_add,
-m4_define($1($2), $3))
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define(lt_dict_add_subkey,
-m4_define($1($2:$3), $4))
-
-
-# lt_dict_fetch(DICT, KEY, SUBKEY)
-# ----------------------------------
-m4_define(lt_dict_fetch,
-m4_ifval($3,
-	m4_ifdef($1($2:$3), m4_defn($1($2:$3))),
-    m4_ifdef($1($2), m4_defn($1($2)))))
-
-
-# lt_if_dict_fetch(DICT, KEY, SUBKEY, VALUE, IF-TRUE, IF-FALSE)
-# -----------------------------------------------------------------
-m4_define(lt_if_dict_fetch,
-m4_if(lt_dict_fetch($1, $2, $3), $4,
-	$5,
-    $6))
-
-
-# lt_dict_filter(DICT, SUBKEY, VALUE, SEPARATOR, KEY, ...)
-# --------------------------------------------------------------
-m4_define(lt_dict_filter,
-m4_if($5, , ,
-  lt_join(m4_quote(m4_default($4, , )),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car(m4_shiftn(4, $@)),
-		      lt_if_dict_fetch($1, _Lt_key, $2, $3, _Lt_key )))))))dnl
-)

deadbeef-0.6.2.tar.bz2/m4/ltversion.m4 Deleted

deadbeef-0.6.2.tar.bz2/m4/lt~obsolete.m4 Deleted

@@ -1,98 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN(LTOBSOLETE_VERSION, m4_if(1))
-
-m4_ifndef(AC_LIBTOOL_LINKER_OPTION,	AC_DEFUN(AC_LIBTOOL_LINKER_OPTION))
-m4_ifndef(AC_PROG_EGREP,		AC_DEFUN(AC_PROG_EGREP))
-m4_ifndef(_LT_AC_PROG_ECHO_BACKSLASH,	AC_DEFUN(_LT_AC_PROG_ECHO_BACKSLASH))
-m4_ifndef(_LT_AC_SHELL_INIT,		AC_DEFUN(_LT_AC_SHELL_INIT))
-m4_ifndef(_LT_AC_SYS_LIBPATH_AIX,	AC_DEFUN(_LT_AC_SYS_LIBPATH_AIX))
-m4_ifndef(_LT_PROG_LTMAIN,		AC_DEFUN(_LT_PROG_LTMAIN))
-m4_ifndef(_LT_AC_TAGVAR,		AC_DEFUN(_LT_AC_TAGVAR))
-m4_ifndef(AC_LTDL_ENABLE_INSTALL,	AC_DEFUN(AC_LTDL_ENABLE_INSTALL))
-m4_ifndef(AC_LTDL_PREOPEN,		AC_DEFUN(AC_LTDL_PREOPEN))
-m4_ifndef(_LT_AC_SYS_COMPILER,	AC_DEFUN(_LT_AC_SYS_COMPILER))
-m4_ifndef(_LT_AC_LOCK,		AC_DEFUN(_LT_AC_LOCK))
-m4_ifndef(AC_LIBTOOL_SYS_OLD_ARCHIVE,	AC_DEFUN(AC_LIBTOOL_SYS_OLD_ARCHIVE))
-m4_ifndef(_LT_AC_TRY_DLOPEN_SELF,	AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF))
-m4_ifndef(AC_LIBTOOL_PROG_CC_C_O,	AC_DEFUN(AC_LIBTOOL_PROG_CC_C_O))
-m4_ifndef(AC_LIBTOOL_SYS_HARD_LINK_LOCKS, AC_DEFUN(AC_LIBTOOL_SYS_HARD_LINK_LOCKS))
-m4_ifndef(AC_LIBTOOL_OBJDIR,		AC_DEFUN(AC_LIBTOOL_OBJDIR))
-m4_ifndef(AC_LTDL_OBJDIR,		AC_DEFUN(AC_LTDL_OBJDIR))
-m4_ifndef(AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH, AC_DEFUN(AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH))
-m4_ifndef(AC_LIBTOOL_SYS_LIB_STRIP,	AC_DEFUN(AC_LIBTOOL_SYS_LIB_STRIP))
-m4_ifndef(AC_PATH_MAGIC,		AC_DEFUN(AC_PATH_MAGIC))
-m4_ifndef(AC_PROG_LD_GNU,		AC_DEFUN(AC_PROG_LD_GNU))
-m4_ifndef(AC_PROG_LD_RELOAD_FLAG,	AC_DEFUN(AC_PROG_LD_RELOAD_FLAG))
-m4_ifndef(AC_DEPLIBS_CHECK_METHOD,	AC_DEFUN(AC_DEPLIBS_CHECK_METHOD))
-m4_ifndef(AC_LIBTOOL_PROG_COMPILER_NO_RTTI, AC_DEFUN(AC_LIBTOOL_PROG_COMPILER_NO_RTTI))
-m4_ifndef(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE, AC_DEFUN(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE))
-m4_ifndef(AC_LIBTOOL_PROG_COMPILER_PIC, AC_DEFUN(AC_LIBTOOL_PROG_COMPILER_PIC))
-m4_ifndef(AC_LIBTOOL_PROG_LD_SHLIBS,	AC_DEFUN(AC_LIBTOOL_PROG_LD_SHLIBS))
-m4_ifndef(AC_LIBTOOL_POSTDEP_PREDEP,	AC_DEFUN(AC_LIBTOOL_POSTDEP_PREDEP))
-m4_ifndef(LT_AC_PROG_EGREP,		AC_DEFUN(LT_AC_PROG_EGREP))
-m4_ifndef(LT_AC_PROG_SED,		AC_DEFUN(LT_AC_PROG_SED))
-m4_ifndef(_LT_CC_BASENAME,		AC_DEFUN(_LT_CC_BASENAME))
-m4_ifndef(_LT_COMPILER_BOILERPLATE,	AC_DEFUN(_LT_COMPILER_BOILERPLATE))
-m4_ifndef(_LT_LINKER_BOILERPLATE,	AC_DEFUN(_LT_LINKER_BOILERPLATE))
-m4_ifndef(_AC_PROG_LIBTOOL,		AC_DEFUN(_AC_PROG_LIBTOOL))
-m4_ifndef(AC_LIBTOOL_SETUP,		AC_DEFUN(AC_LIBTOOL_SETUP))
-m4_ifndef(_LT_AC_CHECK_DLFCN,		AC_DEFUN(_LT_AC_CHECK_DLFCN))
-m4_ifndef(AC_LIBTOOL_SYS_DYNAMIC_LINKER,	AC_DEFUN(AC_LIBTOOL_SYS_DYNAMIC_LINKER))
-m4_ifndef(_LT_AC_TAGCONFIG,		AC_DEFUN(_LT_AC_TAGCONFIG))
-m4_ifndef(AC_DISABLE_FAST_INSTALL,	AC_DEFUN(AC_DISABLE_FAST_INSTALL))
-m4_ifndef(_LT_AC_LANG_CXX,		AC_DEFUN(_LT_AC_LANG_CXX))
-m4_ifndef(_LT_AC_LANG_F77,		AC_DEFUN(_LT_AC_LANG_F77))
-m4_ifndef(_LT_AC_LANG_GCJ,		AC_DEFUN(_LT_AC_LANG_GCJ))
-m4_ifndef(AC_LIBTOOL_LANG_C_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_C_CONFIG))
-m4_ifndef(_LT_AC_LANG_C_CONFIG,	AC_DEFUN(_LT_AC_LANG_C_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_CXX_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_CXX_CONFIG))
-m4_ifndef(_LT_AC_LANG_CXX_CONFIG,	AC_DEFUN(_LT_AC_LANG_CXX_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_F77_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_F77_CONFIG))
-m4_ifndef(_LT_AC_LANG_F77_CONFIG,	AC_DEFUN(_LT_AC_LANG_F77_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_GCJ_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_GCJ_CONFIG))
-m4_ifndef(_LT_AC_LANG_GCJ_CONFIG,	AC_DEFUN(_LT_AC_LANG_GCJ_CONFIG))
-m4_ifndef(AC_LIBTOOL_LANG_RC_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_RC_CONFIG))
-m4_ifndef(_LT_AC_LANG_RC_CONFIG,	AC_DEFUN(_LT_AC_LANG_RC_CONFIG))
-m4_ifndef(AC_LIBTOOL_CONFIG,		AC_DEFUN(AC_LIBTOOL_CONFIG))
-m4_ifndef(_LT_AC_FILE_LTDLL_C,	AC_DEFUN(_LT_AC_FILE_LTDLL_C))
-m4_ifndef(_LT_REQUIRED_DARWIN_CHECKS,	AC_DEFUN(_LT_REQUIRED_DARWIN_CHECKS))
-m4_ifndef(_LT_AC_PROG_CXXCPP,		AC_DEFUN(_LT_AC_PROG_CXXCPP))
-m4_ifndef(_LT_PREPARE_SED_QUOTE_VARS,	AC_DEFUN(_LT_PREPARE_SED_QUOTE_VARS))
-m4_ifndef(_LT_PROG_ECHO_BACKSLASH,	AC_DEFUN(_LT_PROG_ECHO_BACKSLASH))
-m4_ifndef(_LT_PROG_F77,		AC_DEFUN(_LT_PROG_F77))
-m4_ifndef(_LT_PROG_FC,		AC_DEFUN(_LT_PROG_FC))
-m4_ifndef(_LT_PROG_CXX,		AC_DEFUN(_LT_PROG_CXX))

deadbeef-0.6.2.tar.bz2/main.c Deleted

@@ -1,1049 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- application launcher, compatible with GNU/Linux and most other POSIX systems
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <time.h>
-#include <locale.h>
-#ifdef __linux__
-#include <sys/prctl.h>
-#endif
-#ifndef __linux__
-#define _POSIX_C_SOURCE 1
-#endif
-#include <limits.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/un.h>
-#include <sys/fcntl.h>
-#include <sys/errno.h>
-#include <signal.h>
-#ifdef __linux__
-#include <execinfo.h>
-#endif
-#include <unistd.h>
-#include "gettext.h"
-#include "playlist.h"
-#include "threading.h"
-#include "messagepump.h"
-#include "streamer.h"
-#include "conf.h"
-#include "volume.h"
-#include "plugins.h"
-#include "common.h"
-#include "junklib.h"
-
-#ifndef PREFIX
-#error PREFIX must be defined
-#endif
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-
-// some common global variables
-char sys_install_pathPATH_MAX; // see deadbeef->get_prefix
-char confdirPATH_MAX; // $HOME/.config
-char dbconfdirPATH_MAX; // $HOME/.config/deadbeef
-char dbinstalldirPATH_MAX; // see deadbeef->get_prefix
-char dbdocdirPATH_MAX; // see deadbeef->get_doc_dir
-char dbplugindirPATH_MAX; // see deadbeef->get_plugin_dir
-char dbpixmapdirPATH_MAX; // see deadbeef->get_pixmap_dir
-
-char use_gui_plugin100;
-
-static void
-print_help (void) {
-	bind_textdomain_codeset (PACKAGE, "");
- fprintf (stdout, _("Usage: deadbeef options -- file(s)\n"));
- fprintf (stdout, _("Options:\n"));
- fprintf (stdout, _(" --help or -h Print help (this message) and exit\n"));
- fprintf (stdout, _(" --quit Quit player\n"));
- fprintf (stdout, _(" --version Print version info and exit\n"));
- fprintf (stdout, _(" --play Start playback\n"));
- fprintf (stdout, _(" --stop Stop playback\n"));
- fprintf (stdout, _(" --pause Pause playback\n"));
- fprintf (stdout, _(" --toggle-pause Toggle pause\n"));
- fprintf (stdout, _(" --play-pause Start playback if stopped, toggle pause otherwise\n"));
- fprintf (stdout, _(" --next Next song in playlist\n"));
- fprintf (stdout, _(" --prev Previous song in playlist\n"));
- fprintf (stdout, _(" --random Random song in playlist\n"));
- fprintf (stdout, _(" --queue Append file(s) to existing playlist\n"));
- fprintf (stdout, _(" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"));
- fprintf (stdout, _(" --nowplaying FMT Print formatted track name to stdout\n"));
- fprintf (stdout, _(" FMT %%-syntax: artist, title, album,\n"
- " length, tracknumber, year, comment,\n"
- " copyright, elapsed\n"));
- fprintf (stdout, _(" e.g.: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"));
- fprintf (stdout, _(" for more info, see %s\n"), "http://github.com/Alexey-Yakovenko/deadbeef/wiki/Title-formatting");
-	bind_textdomain_codeset (PACKAGE, "UTF-8");
-}
-
-// Parse command line an return a single buffer with all
-// parameters concatenated (separated by \0). File names
-// are resolved.
-char*
-prepare_command_line (int argc, char *argv, int *size) {
- int seen_ddash = 0;
-
- // initial buffer limit, will expand if needed
- int limit = 4096;
- char *buf = (char*) malloc (limit);
-
- if (argc <= 1) {
- buf0 = 0;
- *size = 1;
- return buf;
- }
-
- int p = 0;
- for (int i = 1; i < argc; i++) {
- // if argument is a filename, try to resolve it
- char resolvedPATH_MAX;
- char *arg;
- if (!strncmp ("--", argvi, 2) && !seen_ddash || !realpath (argvi, resolved)) {
- arg = argvi;
- }
- else {
- arg = resolved;
- }
-
- // make sure that there is enough space in the buffer;
- // re-allocate, if needed
- int arglen = strlen(arg) + 1;
- while (p + arglen >= limit) {
- char *newbuf = (char*) malloc (limit * 2);
- memcpy (newbuf, buf, p);
- free (buf);
- limit *= 2;
- buf = newbuf;
- }
-
- memcpy (buf + p, arg, arglen);
- p += arglen;
-
- if (!strcmp("--", argvi)) {
- seen_ddash = 1;
- }
- }
-
- *size = p;
- return buf;
-}
-
-
-// this function executes server-side commands only
-// must be called only from within server
-// -1 error, program must exit with error code -1
-// 0 proceed normally as nothing happened
-// 1 no error, but program must exit with error code 0
-// 2 don't load playlist on startup
-// when executed in remote server -- error code will be ignored
-int
-server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsize) {
- if (sendback) {
- sendback0 = 0;
- }
- const uint8_t *parg = (const uint8_t *)cmdline;
- const uint8_t *pend = cmdline + len;
- int queue = 0;
- while (parg < pend) {
- if (!strcmp (parg, "--nowplaying")) {
- parg += strlen (parg);
- parg++;
- if (parg >= pend) {
- if (sendback) {
- snprintf (sendback, sbsize, "error --nowplaying expects format argument\n");
- return 0;
- }
- else {
- fprintf (stderr, "--nowplaying expects format argument\n");
- return -1;
- }
- }
- if (sendback) {
- playItem_t *curr = streamer_get_playing_track ();
- DB_fileinfo_t *dec = streamer_get_current_fileinfo ();
- if (curr && dec) {
- const char np = "nowplaying ";
- memcpy (sendback, np, sizeof (np)-1);
- pl_format_title (curr, -1, sendback+sizeof(np)-1, sbsize-sizeof(np)+1, -1, parg);
- }
- else {
- strcpy (sendback, "nowplaying nothing");
- }
- if (curr) {
- pl_item_unref (curr);
- }
- }
- else {
- char out2048;
- playItem_t *curr = streamer_get_playing_track ();
- DB_fileinfo_t *dec = streamer_get_current_fileinfo();
- if (curr && dec) {
- pl_format_title (curr, -1, out, sizeof (out), -1, parg);
- }
- else {
- strcpy (out, "nothing");
- }
- if (curr) {
- pl_item_unref (curr);
- }
- fwrite (out, 1, strlen (out), stdout);
- return 1; // exit
- }
- }
- else if (!strcmp (parg, "--next")) {
- messagepump_push (DB_EV_NEXT, 0, 0, 0);
- return 0;
- }
- else if (!strcmp (parg, "--prev")) {
- messagepump_push (DB_EV_PREV, 0, 0, 0);
- return 0;
- }
- else if (!strcmp (parg, "--play")) {
- messagepump_push (DB_EV_PLAY_CURRENT, 0, 0, 0);
- return 0;
- }
- else if (!strcmp (parg, "--stop")) {
- messagepump_push (DB_EV_STOP, 0, 0, 0);
- return 0;
- }
- else if (!strcmp (parg, "--pause")) {
- messagepump_push (DB_EV_PAUSE, 0, 0, 0);
- return 0;
- }
- else if (!strcmp (parg, "--toggle-pause")) {
- messagepump_push (DB_EV_TOGGLE_PAUSE, 0, 0, 0);
- return 0;
- }
- else if (!strcmp (parg, "--play-pause")) {
- int state = deadbeef->get_output ()->state ();
- if (state == OUTPUT_STATE_PLAYING) {
- deadbeef->sendmessage (DB_EV_PAUSE, 0, 0, 0);
- }
- else {
- deadbeef->sendmessage (DB_EV_PLAY_CURRENT, 0, 0, 0);
- }
- return 0;
- }
- else if (!strcmp (parg, "--random")) {
- messagepump_push (DB_EV_PLAY_RANDOM, 0, 0, 0);
- return 0;
- }
- else if (!strcmp (parg, "--queue")) {
- queue = 1;
- }
- else if (!strcmp (parg, "--quit")) {
- messagepump_push (DB_EV_TERMINATE, 0, 0, 0);
- }
- else if (!strcmp (parg, "--sm-client-id")) {
- parg += strlen (parg);
- parg++;
- if (parg < pend) {
- parg += strlen (parg);
- parg++;
- }
- continue;
- }
- else if (!strcmp (parg, "--gui")) {
- // need to skip --gui here, it is handled in the client cmdline
- parg += strlen (parg);
- parg++;
- if (parg >= pend) {
- break;
- }
- parg += strlen (parg);
- parg++;
- continue;
- }
- else if (parg0 != '-') {
- break; // unknown option is filename
- }
- parg += strlen (parg);
- parg++;
- }
- if (parg < pend) {
- if (conf_get_int ("cli_add_to_specific_playlist", 1)) {
- char str200;
- conf_get_str ("cli_add_playlist_name", "Default", str, sizeof (str));
- int idx = plt_find (str);
- if (idx < 0) {
- idx = plt_add (plt_get_count (), str);
- }
- if (idx >= 0) {
- plt_set_curr_idx (idx);
- }
- }
- playlist_t *curr_plt = plt_get_curr ();
- if (plt_add_files_begin (curr_plt, 0) != 0) {
- plt_unref (curr_plt);
- snprintf (sendback, sbsize, "it's not allowed to add files to playlist right now, because another file adding operation is in progress. please try again later.");
- return 0;
- }
- // add files
- if (!queue) {
- plt_clear (curr_plt);
- messagepump_push (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
- plt_reset_cursor (curr_plt);
- }
- while (parg < pend) {
- char resolvedPATH_MAX;
- const char *pname;
- if (realpath (parg, resolved)) {
- pname = resolved;
- }
- else {
- pname = parg;
- }
- if (deadbeef->plt_add_dir2 (0, (ddb_playlist_t*)curr_plt, pname, NULL, NULL) < 0) {
- if (deadbeef->plt_add_file2 (0, (ddb_playlist_t*)curr_plt, pname, NULL, NULL) < 0) {
- int ab = 0;
- playItem_t *it = plt_load2 (0, curr_plt, NULL, pname, &ab, NULL, NULL);
- if (!it) {
- fprintf (stderr, "failed to add file or folder %s\n", pname);
- }
- }
- }
- parg += strlen (parg);
- parg++;
- }
- messagepump_push (DB_EV_PLAYLIST_REFRESH, 0, 0, 0);
- plt_add_files_end (curr_plt, 0);
- plt_unref (curr_plt);
- if (!queue) {
- messagepump_push (DB_EV_PLAY_NUM, 0, 0, 0);
- return 2; // don't reload playlist at startup
- }
- }
- return 0;
-}
-
-static struct sockaddr_un srv_local;
-static struct sockaddr_un srv_remote;
-static unsigned srv_socket;
-
-#if USE_ABSTRACT_SOCKET_NAME
-static char server_id = "\0deadbeefplayer";
-#endif
-
-int
-server_start (void) {
- fprintf (stderr, "server_start\n");
- srv_socket = socket (AF_UNIX, SOCK_STREAM, 0);
- int flags;
- flags = fcntl (srv_socket, F_GETFL,0);
- if (flags == -1) {
- perror ("fcntl F_GETFL");
- return -1;
- }
- if (fcntl(srv_socket, F_SETFL, flags | O_NONBLOCK) < 0) {
- perror ("fcntl F_SETFL");
- return -1;
- }
- memset (&srv_local, 0, sizeof (srv_local));
- srv_local.sun_family = AF_UNIX;
-
-#if USE_ABSTRACT_SOCKET_NAME
- memcpy (srv_local.sun_path, server_id, sizeof (server_id));
- int len = offsetof(struct sockaddr_un, sun_path) + sizeof (server_id)-1;
-#else
- char *socketdirenv = getenv ("DDB_SOCKET_DIR");
- snprintf (srv_local.sun_path, sizeof (srv_local.sun_path), "%s/socket", socketdirenv ? socketdirenv : dbconfdir);
- if (unlink(srv_local.sun_path) < 0) {
- perror ("INFO: unlink socket");
- }
- int len = offsetof(struct sockaddr_un, sun_path) + strlen (srv_local.sun_path);
-#endif
-
- if (bind(srv_socket, (struct sockaddr *)&srv_local, len) < 0) {
- perror ("bind");
- return -1;
- }
-
- if (listen(srv_socket, 5) == -1) {
- perror("listen");
- return -1;
- }
- return 0;
-}
-
-void
-server_close (void) {
- if (srv_socket) {
- close (srv_socket);
- srv_socket = 0;
- }
-}
-
-// Read the whole message till end-of-stream
-char*
-read_entire_message (int sockfd, int *size) {
- int bufsize = 4096; // initial buffer size, will expand if
- // the actual package turns out to be bigger
- char *buf = (char*) malloc(bufsize);
- int rdp = 0;
-
- for (;;) {
- if (rdp >= bufsize) {
- int newsize = bufsize * 2;
- char *newbuf = (char*) malloc(newsize);
- memcpy(newbuf, buf, rdp);
- free(buf);
- buf = newbuf;
- bufsize = newsize;
- }
-
- int rd = recv(sockfd, buf + rdp, bufsize - rdp, 0);
- if (rd < 0) {
- if (errno == EAGAIN) {
- usleep (50000);
- continue;
- }
- free(buf);
- return NULL;
- }
- if (rd == 0) {
- break;
- }
- rdp += rd;
- }
-
- *size = rdp;
- return buf;
-}
-
-int
-server_update (void) {
- // handle remote stuff
- int t = sizeof (srv_remote);
- unsigned s2;
- s2 = accept(srv_socket, (struct sockaddr *)&srv_remote, &t);
- if (s2 == -1 && errno != EAGAIN && errno != EWOULDBLOCK) {
- perror("accept");
- return -1;
- }
- else if (s2 != -1) {
- int size = -1;
- char *buf = read_entire_message(s2, &size);
- char sendback1024 = "";
- if (size > 0) {
- if (size == 1 && buf0 == 0) {
- // FIXME: that should be called right after activation of gui plugin
- messagepump_push (DB_EV_ACTIVATED, 0, 0, 0);
- }
- else {
- server_exec_command_line (buf, size, sendback, sizeof (sendback));
- }
- }
- if (sendback0) {
- // send nowplaying back to client
- send (s2, sendback, strlen (sendback)+1, 0);
- }
- else {
- send (s2, "", 1, 0);
- }
- close(s2);
-
- if (buf) {
- free(buf);
- }
- }
- return 0;
-}
-
-static uintptr_t server_tid;
-static int server_terminate;
-
-void
-server_loop (void *ctx) {
-#ifdef __linux__
- prctl (PR_SET_NAME, "deadbeef-server", 0, 0, 0, 0);
-#endif
- fd_set rds;
- int ret;
- struct timeval timeout = {0, 0};
-
- FD_ZERO(&rds);
- while (!server_terminate) {
- FD_SET(srv_socket, &rds);
- timeout.tv_usec = 500000;
- if ((ret = select(srv_socket + 1, &rds, NULL, NULL, &timeout)) < 0 && errno != EINTR) {
- perror("select");
- exit (-1);
- }
- if (ret > 0) {
- if (server_update () < 0) {
- messagepump_push (DB_EV_TERMINATE, 0, 0, 0);
- }
- }
- }
-}
-
-void
-save_resume_state (void) {
- playItem_t *trk = streamer_get_playing_track ();
- DB_output_t *output = plug_get_output ();
- float playpos = -1;
- int playtrack = -1;
- int playlist = streamer_get_current_playlist ();
- int paused = (output->state () == OUTPUT_STATE_PAUSED);
- if (trk && playlist >= 0) {
- playtrack = str_get_idx_of (trk);
- playpos = streamer_get_playpos ();
- pl_item_unref (trk);
- }
-
- conf_set_float ("resume.position", playpos);
- conf_set_int ("resume.track", playtrack);
- conf_set_int ("resume.playlist", playlist);
- conf_set_int ("resume.paused", paused);
-}
-
-void
-player_mainloop (void) {
- for (;;) {
- uint32_t msg;
- uintptr_t ctx;
- uint32_t p1;
- uint32_t p2;
- int term = 0;
- while (messagepump_pop(&msg, &ctx, &p1, &p2) != -1) {
- // broadcast to all plugins
- DB_plugin_t **plugs = plug_get_list ();
- for (int n = 0; plugsn; n++) {
- if (plugsn->message) {
- plugsn->message (msg, ctx, p1, p2);
- }
- }
- if (!term) {
- DB_output_t *output = plug_get_output ();
- switch (msg) {
- case DB_EV_REINIT_SOUND:
- plug_reinit_sound ();
- streamer_reset (1);
- conf_save ();
- break;
- case DB_EV_TERMINATE:
- {
- save_resume_state ();
-
- pl_playqueue_clear ();
-
- // stop streaming and playback before unloading plugins
- DB_output_t *output = plug_get_output ();
- output->stop ();
- streamer_free ();
- output->free ();
- term = 1;
- }
- break;
- case DB_EV_PLAY_CURRENT:
- streamer_play_current_track ();
- break;
- case DB_EV_PLAY_NUM:
- pl_playqueue_clear ();
- streamer_set_nextsong (p1, 4);
- break;
- case DB_EV_STOP:
- streamer_set_nextsong (-2, 0);
- break;
- case DB_EV_NEXT:
- streamer_move_to_nextsong (1);
- break;
- case DB_EV_PREV:
- streamer_move_to_prevsong (1);
- break;
- case DB_EV_PAUSE:
- if (output->state () != OUTPUT_STATE_PAUSED) {
- output->pause ();
- messagepump_push (DB_EV_PAUSED, 0, 1, 0);
- }
- break;
- case DB_EV_TOGGLE_PAUSE:
- if (output->state () == OUTPUT_STATE_PAUSED) {
- streamer_play_current_track ();
- }
- else {
- output->pause ();
- messagepump_push (DB_EV_PAUSED, 0, 1, 0);
- }
- break;
- case DB_EV_PLAY_RANDOM:
- streamer_move_to_randomsong (1);
- break;
- case DB_EV_PLAYLIST_REFRESH:
- pl_save_current ();
- messagepump_push (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
- break;
- case DB_EV_CONFIGCHANGED:
- conf_save ();
- streamer_configchanged ();
- junk_configchanged ();
- break;
- case DB_EV_SEEK:
- streamer_set_seek (p1 / 1000.f);
- break;
- }
- }
- if (msg >= DB_EV_FIRST && ctx) {
- messagepump_event_free ((ddb_event_t *)ctx);
- }
- }
- if (term) {
- return;
- }
- messagepump_wait ();
- }
-}
-
-#ifdef __linux__
-void
-sigsegv_handler (int sig) {
- fprintf (stderr, "Segmentation Fault\n");
- int j, nptrs;
-#define SIZE 100
- void *buffer100;
- char **strings;
-
- nptrs = backtrace(buffer, SIZE);
- printf("backtrace() returned %d addresses\n", nptrs);
-
- /* The call
- * backtrace_symbols_fd(buffer,
- * nptrs,
- * STDOUT_FILENO)
- would produce similar output to the following: */
-
- strings = backtrace_symbols(buffer, nptrs);
- if (strings == NULL) {
- perror("backtrace_symbols");
- exit(EXIT_FAILURE);
- }
-
- for (j = 0; j < nptrs; j++)
- printf("%s\n", stringsj);
-
- free(strings);
- exit (0);
-}
-#endif
-
-void
-restore_resume_state (void) {
- DB_output_t *output = plug_get_output ();
- if (conf_get_int ("resume_last_session", 0) && output->state () == OUTPUT_STATE_STOPPED) {
- int plt = conf_get_int ("resume.playlist", -1);
- int track = conf_get_int ("resume.track", -1);
- float pos = conf_get_float ("resume.position", -1);
- int paused = conf_get_int ("resume.paused", 0);
- trace ("resume: track %d pos %f playlist %d\n", track, pos, plt);
- if (plt >= 0 && track >= 0 && pos >= 0) {
- streamer_lock (); // need to hold streamer thread to make the resume operation atomic
- streamer_set_current_playlist (plt);
- streamer_set_nextsong (track, paused ? 2 : 3);
- streamer_set_seek (pos);
- streamer_unlock ();
- }
- }
-}
-
-uintptr_t mainloop_tid;
-
-DB_plugin_t *
-plug_get_gui (void) {
- struct DB_plugin_s **plugs = plug_get_list ();
- for (int i = 0; plugsi; i++) {
- if (plugsi->type == DB_PLUGIN_GUI) {
- return plugsi;
- }
- }
- return NULL;
-}
-
-static void
-mainloop_thread (void *ctx) {
- // this runs until DB_EV_TERMINATE is sent (blocks right here)
- player_mainloop ();
-
- // tell the gui thread to finish
- DB_plugin_t *gui = plug_get_gui ();
- if (gui) {
- gui->stop ();
- }
- return;
-}
-
-int
-main (int argc, char *argv) {
- int portable = 0;
-#if STATICLINK
- int staticlink = 1;
-#else
- int staticlink = 0;
-#endif
-#if PORTABLE
- portable = 1;
- if (!realpath (argv0, dbinstalldir)) {
- strcpy (dbinstalldir, argv0);
- }
- char *e = strrchr (dbinstalldir, '/');
- if (e) {
- *e = 0;
- }
- else {
- fprintf (stderr, "couldn't determine install folder from path %s\n", argv0);
- exit (-1);
- }
-#else
- if (!realpath (argv0, dbinstalldir)) {
- strcpy (dbinstalldir, argv0);
- }
- char *e = strrchr (dbinstalldir, '/');
- if (e) {
- *e = 0;
- struct stat st;
- char checkpathPATH_MAX;
- snprintf (checkpath, sizeof (checkpath), "%s/.ddb_portable", dbinstalldir);
- if (!stat (checkpath, &st)) {
- if (S_ISREG (st.st_mode)) {
- portable = 1;
- }
- }
- }
- if (!portable) {
- strcpy (dbinstalldir, PREFIX);
- }
-#endif
-
-#ifdef __linux__
- signal (SIGSEGV, sigsegv_handler);
-#endif
- setlocale (LC_ALL, "");
- setlocale (LC_NUMERIC, "C");
-#ifdef ENABLE_NLS
-// fprintf (stderr, "enabling gettext support: package=" PACKAGE ", dir=" LOCALEDIR "...\n");
- if (portable) {
- char localedirPATH_MAX;
- snprintf (localedir, sizeof (localedir), "%s/locale", dbinstalldir);
- bindtextdomain (PACKAGE, localedir);
- }
- else {
- bindtextdomain (PACKAGE, LOCALEDIR);
- }
-	bind_textdomain_codeset (PACKAGE, "UTF-8");
-	textdomain (PACKAGE);
-#endif
-
- fprintf (stderr, "starting deadbeef " VERSION "%s%s\n", staticlink ? " static" : "", portable ? " portable" : "");
- srand (time (NULL));
-#ifdef __linux__
- prctl (PR_SET_NAME, "deadbeef-main", 0, 0, 0, 0);
-#endif
-
-#if PORTABLE_FULL
- if (snprintf (confdir, sizeof (confdir), "%s/config", dbinstalldir) > sizeof (confdir)) {
- fprintf (stderr, "fatal: too long install path %s\n", dbinstalldir);
- return -1;
- }
-
- strcpy (dbconfdir, confdir);
-#else
- char *homedir = getenv ("HOME");
- if (!homedir) {
- fprintf (stderr, "unable to find home directory. stopping.\n");
- return -1;
- }
-
- char *xdg_conf_dir = getenv ("XDG_CONFIG_HOME");
- if (xdg_conf_dir) {
- if (snprintf (confdir, sizeof (confdir), "%s", xdg_conf_dir) > sizeof (confdir)) {
- fprintf (stderr, "fatal: XDG_CONFIG_HOME value is too long: %s\n", xdg_conf_dir);
- return -1;
- }
- }
- else {
- if (snprintf (confdir, sizeof (confdir), "%s/.config", homedir) > sizeof (confdir)) {
- fprintf (stderr, "fatal: HOME value is too long: %s\n", homedir);
- return -1;
- }
- }
- if (snprintf (dbconfdir, sizeof (dbconfdir), "%s/deadbeef", confdir) > sizeof (dbconfdir)) {
- fprintf (stderr, "fatal: out of memory while configuring\n");
- return -1;
- }
- mkdir (confdir, 0755);
-#endif
-
-
- if (portable) {
- if (snprintf (dbdocdir, sizeof (dbdocdir), "%s/doc", dbinstalldir) > sizeof (dbdocdir)) {
- fprintf (stderr, "fatal: too long install path %s\n", dbinstalldir);
- return -1;
- }
- if (snprintf (dbplugindir, sizeof (dbplugindir), "%s/plugins", dbinstalldir) > sizeof (dbplugindir)) {
- fprintf (stderr, "fatal: too long install path %s\n", dbinstalldir);
- return -1;
- }
- if (snprintf (dbpixmapdir, sizeof (dbpixmapdir), "%s/pixmaps", dbinstalldir) > sizeof (dbpixmapdir)) {
- fprintf (stderr, "fatal: too long install path %s\n", dbinstalldir);
- return -1;
- }
- mkdir (dbplugindir, 0755);
- }
- else {
- if (snprintf (dbdocdir, sizeof (dbdocdir), "%s", DOCDIR) > sizeof (dbdocdir)) {
- fprintf (stderr, "fatal: too long install path %s\n", dbinstalldir);
- return -1;
- }
- if (snprintf (dbplugindir, sizeof (dbplugindir), "%s/deadbeef", LIBDIR) > sizeof (dbplugindir)) {
- fprintf (stderr, "fatal: too long install path %s\n", dbinstalldir);
- return -1;
- }
- if (snprintf (dbpixmapdir, sizeof (dbpixmapdir), "%s/share/deadbeef/pixmaps", PREFIX) > sizeof (dbpixmapdir)) {
- fprintf (stderr, "fatal: too long install path %s\n", dbinstalldir);
- return -1;
- }
- }
-
- for (int i = 1; i < argc; i++) {
- // help, version and nowplaying are executed with any filter
- if (!strcmp (argvi, "--help") || !strcmp (argvi, "-h")) {
- print_help ();
- return 0;
- }
- else if (!strcmp (argvi, "--version")) {
- fprintf (stderr, "DeaDBeeF " VERSION " Copyright © 2009-2013 Alexey Yakovenko\n");
- return 0;
- }
- else if (!strcmp (argvi, "--gui")) {
- if (i == argc-1) {
- break;
- }
- i++;
- strncpy (use_gui_plugin, argvi, sizeof(use_gui_plugin) - 1);
- use_gui_pluginsizeof(use_gui_plugin) - 1 = 0;
- }
- }
-
- trace ("installdir: %s\n", dbinstalldir);
- trace ("confdir: %s\n", confdir);
- trace ("docdir: %s\n", dbdocdir);
- trace ("plugindir: %s\n", dbplugindir);
- trace ("pixmapdir: %s\n", dbpixmapdir);
-
- mkdir (dbconfdir, 0755);
-
- int size = 0;
- char *cmdline = prepare_command_line (argc, argv, &size);
-
- // try to connect to remote player
- int s, len;
- struct sockaddr_un remote;
-
- if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
- perror("socket");
- exit(1);
- }
-
- memset (&remote, 0, sizeof (remote));
- remote.sun_family = AF_UNIX;
-#if USE_ABSTRACT_SOCKET_NAME
- memcpy (remote.sun_path, server_id, sizeof (server_id));
- len = offsetof(struct sockaddr_un, sun_path) + sizeof (server_id)-1;
-#else
- char *socketdirenv = getenv ("DDB_SOCKET_DIR");
- snprintf (remote.sun_path, sizeof (remote.sun_path), "%s/socket", socketdirenv ? socketdirenv : dbconfdir);
- len = offsetof(struct sockaddr_un, sun_path) + strlen (remote.sun_path);
-#endif
- if (connect(s, (struct sockaddr *)&remote, len) == 0) {
- // pass args to remote and exit
- if (send(s, cmdline, size, 0) == -1) {
- perror ("send");
- exit (-1);
- }
- // end of message
- shutdown(s, SHUT_WR);
-
- int sz = -1;
- char *out = read_entire_message(s, &sz);
- if (sz == -1) {
- fprintf (stderr, "failed to pass args to remote!\n");
- exit (-1);
- }
- else {
- // check if that's nowplaying response
- const char np = "nowplaying ";
- const char err = "error ";
- if (!strncmp (out, np, sizeof (np)-1)) {
- const char *prn = &outsizeof (np)-1;
- fwrite (prn, 1, strlen (prn), stdout);
- }
- else if (!strncmp (out, err, sizeof (err)-1)) {
- const char *prn = &outsizeof (err)-1;
- fwrite (prn, 1, strlen (prn), stderr);
- }
- else if (sz > 0 && out0) {
- fprintf (stderr, "%s\n", out);
- }
- }
- if (out) {
- free (out);
- }
- close (s);
- exit (0);
- }
-// else {
-// perror ("INFO: failed to connect to existing session:");
-// }
- close(s);
-
- // become a server
- if (server_start () < 0) {
- exit (-1);
- }
-
- // hack: report nowplaying
- if (!strcmp (cmdline, "--nowplaying")) {
- char nothing = "nothing";
- fwrite (nothing, 1, sizeof (nothing)-1, stdout);
- return 0;
- }
-
- pl_init ();
- conf_init ();
- conf_load (); // required by some plugins at startup
-
- if (use_gui_plugin0) {
- conf_set_str ("gui_plugin", use_gui_plugin);
- }
-
- conf_set_str ("deadbeef_version", VERSION);
-
- volume_set_db (conf_get_float ("playback.volume", 0)); // volume need to be initialized before plugins start
-
- messagepump_init (); // required to push messages while handling commandline
- if (plug_load_all ()) { // required to add files to playlist from commandline
- exit (-1);
- }
- pl_load_all ();
- plt_set_curr_idx (conf_get_int ("playlist.current", 0));
-
- // execute server commands in local context
- int noloadpl = 0;
- if (argc > 1) {
- int res = server_exec_command_line (cmdline, size, NULL, 0);
- // some of the server commands ran on 1st instance should terminate it
- if (res == 2) {
- noloadpl = 1;
- }
- else if (res > 0) {
- exit (0);
- }
- else if (res < 0) {
- exit (-1);
- }
- }
-
- free (cmdline);
-
-#if 0
- signal (SIGTERM, sigterm_handler);
- atexit (atexit_handler); // helps to save in simple cases
-#endif
-
- streamer_init ();
-
- plug_connect_all ();
- messagepump_push (DB_EV_PLUGINSLOADED, 0, 0, 0);
-
- if (!noloadpl) {
- restore_resume_state ();
- }
-
- server_tid = thread_start (server_loop, NULL);
-
- mainloop_tid = thread_start (mainloop_thread, NULL);
-
- DB_plugin_t *gui = plug_get_gui ();
- if (gui) {
- gui->start ();
- }
-
- fprintf (stderr, "gui plugin has quit; waiting for mainloop thread to finish\n");
- thread_join (mainloop_tid);
-
- // terminate server and wait for completion
- if (server_tid) {
- server_terminate = 1;
- thread_join (server_tid);
- server_tid = 0;
- }
-
- // save config
- pl_save_all ();
- conf_save ();
-
- // delete legacy session file
- {
- char sessfile1024; // $HOME/.config/deadbeef/session
- if (snprintf (sessfile, sizeof (sessfile), "%s/deadbeef/session", confdir) < sizeof (sessfile)) {
- unlink (sessfile);
- }
- }
-
- // stop receiving messages from outside
- server_close ();
-
- // plugins might still hold references to playitems,
- // and query configuration in background
- // so unload everything 1st before final cleanup
- plug_disconnect_all ();
- plug_unload_all ();
-
- // at this point we can simply do exit(0), but let's clean up for debugging
- pl_free (); // may access conf_*
- conf_free ();
-
- fprintf (stderr, "messagepump_free\n");
- messagepump_free ();
- fprintf (stderr, "plug_cleanup\n");
- plug_cleanup ();
-
- fprintf (stderr, "hej-hej!\n");
-
- return 0;
-}
-

deadbeef-0.6.2.tar.bz2/md5 Deleted

deadbeef-0.6.2.tar.bz2/messagepump.c Deleted

@@ -1,211 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- message pump implementation
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <stdlib.h>
-#include "messagepump.h"
-#include "threading.h"
-#include "playlist.h"
-
-typedef struct message_s {
- uint32_t id;
- uintptr_t ctx;
- uint32_t p1;
- uint32_t p2;
- struct message_s *next;
-} message_t;
-
-enum { MAX_MESSAGES = 100 };
-static message_t poolMAX_MESSAGES;
-static message_t *mfree;
-static message_t *mqueue;
-static message_t *mqtail;
-static uintptr_t mutex;
-static uintptr_t cond;
-
-static void
-messagepump_reset (void);
-
-int
-messagepump_init (void) {
- messagepump_reset ();
- mutex = mutex_create ();
- cond = cond_create ();
- return 0;
-}
-
-void
-messagepump_free () {
- mutex_lock (mutex);
- messagepump_reset ();
- mutex_unlock (mutex);
- mutex_free (mutex);
- cond_free (cond);
-}
-
-static void
-messagepump_reset (void) {
- mqueue = NULL;
- mfree = NULL;
- mqtail = NULL;
- memset (pool, 0, sizeof (pool));
- for (int i = 0; i < MAX_MESSAGES; i++) {
- pooli.next = mfree;
- mfree = &pooli;
- }
-}
-
-int
-messagepump_push (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
- if (!mfree) {
- //fprintf (stderr, "WARNING: message queue is full! message ignored (%d %p %d %d)\n", id, (void*)ctx, p1, p2);
- if (id >= DB_EV_FIRST && ctx) {
- messagepump_event_free ((ddb_event_t *)ctx);
- }
- return -1;
- }
- mutex_lock (mutex);
- message_t *msg = mfree;
- mfree = mfree->next;
- if (mqtail) {
- mqtail->next = msg;
- }
- mqtail = msg;
- if (!mqueue) {
- mqueue = msg;
- }
-
- msg->next = NULL;
- msg->id = id;
- msg->ctx = ctx;
- msg->p1 = p1;
- msg->p2 = p2;
- mutex_unlock (mutex);
- cond_signal (cond);
- return 0;
-}
-
-void
-messagepump_wait (void) {
- cond_wait (cond, mutex);
- mutex_unlock (mutex);
-}
-
-int
-messagepump_pop (uint32_t *id, uintptr_t *ctx, uint32_t *p1, uint32_t *p2) {
- mutex_lock (mutex);
- if (!mqueue) {
- mutex_unlock (mutex);
- return -1;
- }
- *id = mqueue->id;
- *ctx = mqueue->ctx;
- *p1 = mqueue->p1;
- *p2 = mqueue->p2;
- message_t *next = mqueue->next;
- mqueue->next = mfree;
- mfree = mqueue;
- mqueue = next;
- if (!mqueue) {
- mqtail = NULL;
- }
- mutex_unlock (mutex);
- return 0;
-}
-
-int
-messagepump_hasmessages (void) {
- return mqueue ? 1 : 0;
-}
-
-ddb_event_t *
-messagepump_event_alloc (uint32_t id) {
- int sz = 0;
- ddb_event_t *ev;
- switch (id) {
- case DB_EV_SONGCHANGED:
- sz = sizeof (ddb_event_trackchange_t);
- break;
- case DB_EV_SONGSTARTED:
- case DB_EV_SONGFINISHED:
- case DB_EV_TRACKINFOCHANGED:
- sz = sizeof (ddb_event_track_t);
- break;
- case DB_EV_SEEKED:
- sz = sizeof (ddb_event_playpos_t);
- break;
- }
- assert (("Invalid event %d to use with messagepump_event_alloc, use sendmessage instead\n", id));
- ev = malloc (sz);
- memset (ev, 0, sz);
- ev->event = id;
- ev->size = sz;
- return ev;
-}
-
-void
-messagepump_event_free (ddb_event_t *ev) {
- switch (ev->event) {
- case DB_EV_SONGCHANGED:
- {
- ddb_event_trackchange_t *tc = (ddb_event_trackchange_t*)ev;
- if (tc->from) {
- pl_item_unref ((playItem_t *)tc->from);
- }
- if (tc->to) {
- pl_item_unref ((playItem_t *)tc->to);
- }
- }
- break;
- case DB_EV_SONGSTARTED:
- case DB_EV_SONGFINISHED:
- case DB_EV_TRACKINFOCHANGED:
- {
- ddb_event_track_t *tc = (ddb_event_track_t*)ev;
- if (tc->track) {
- pl_item_unref ((playItem_t *)tc->track);
- }
- }
- break;
- case DB_EV_SEEKED:
- {
- ddb_event_playpos_t *tc = (ddb_event_playpos_t*)ev;
- if (tc->track) {
- pl_item_unref ((playItem_t *)tc->track);
- }
- }
- break;
- }
- free (ev);
-}
-
-int
-messagepump_push_event (ddb_event_t *ev, uint32_t p1, uint32_t p2) {
- return messagepump_push (ev->event, (uintptr_t)ev, p1, p2);
-}
-

deadbeef-0.6.2.tar.bz2/messagepump.h Deleted

@@ -1,43 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- message pump implementation
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __MESSAGEPUMP_H
-#define __MESSAGEPUMP_H
-
-#include <stdint.h>
-#include "deadbeef.h"
-
-int messagepump_init (void);
-void messagepump_free (void);
-int messagepump_push (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
-int messagepump_pop (uint32_t *id, uintptr_t *ctx, uint32_t *p1, uint32_t *p2);
-void messagepump_wait (void);
-
-ddb_event_t *messagepump_event_alloc (uint32_t id);
-void messagepump_event_free (ddb_event_t *ev);
-int messagepump_push_event (ddb_event_t *ev, uint32_t p1, uint32_t p2);
-
-#endif // __MESSAGEPUMP_H

deadbeef-0.6.2.tar.bz2/metacache.c Deleted

@@ -1,136 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- metadata string cache/database
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include <string.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-typedef struct metacache_str_s {
- struct metacache_str_s *next;
- uint32_t refcount;
- char cmpidx; // positive means "equals", negative means "notequals"
- char str1;
-} metacache_str_t;
-
-typedef struct {
-// uint32_t hash;
- metacache_str_t *chain;
-} metacache_hash_t;
-
-#define HASH_SIZE 4096
-
-static metacache_hash_t hashHASH_SIZE;
-
-uint32_t
-metacache_get_hash_sdbm (const char *str) {
- uint32_t hash = 0;
- int c;
-
- while (c = *str++)
- hash = c + (hash << 6) + (hash << 16) - hash;
-
- return hash;
-}
-
-metacache_str_t *
-metacache_find_in_bucket (uint32_t h, const char *str) {
- metacache_hash_t *bucket = &hashh;
- metacache_str_t *chain = bucket->chain;
- while (chain) {
- if (!strcmp (chain->str, str)) {
- return chain;
- }
- chain = chain->next;
- }
- return NULL;
-}
-
-static int n_strings = 0;
-static int n_inserts = 0;
-static int n_buckets = 0;
-
-const char *
-metacache_add_string (const char *str) {
-// printf ("n_strings=%d, n_inserts=%d, n_buckets=%d\n", n_strings, n_inserts, n_buckets);
- uint32_t h = metacache_get_hash_sdbm (str);
- metacache_str_t *data = metacache_find_in_bucket (h % HASH_SIZE, str);
- n_inserts++;
- if (data) {
- data->refcount++;
- return data->str;
- }
- metacache_hash_t *bucket = &hashh % HASH_SIZE;
- if (!bucket->chain) {
- n_buckets++;
- }
- size_t len = strlen (str);
- data = malloc (sizeof (metacache_str_t) + len);
- memset (data, 0, sizeof (metacache_str_t) + len);
- data->refcount = 1;
- memcpy (data->str, str, len+1);
- data->next = bucket->chain;
- bucket->chain = data;
- n_strings++;
- return data->str;
-}
-
-void
-metacache_remove_string (const char *str) {
- uint32_t h = metacache_get_hash_sdbm (str);
- metacache_hash_t *bucket = &hashh % HASH_SIZE;
- metacache_str_t *chain = bucket->chain;
- metacache_str_t *prev = NULL;
- while (chain) {
- if (!strcmp (chain->str, str)) {
- chain->refcount--;
- if (chain->refcount == 0) {
- if (prev) {
- prev->next = chain->next;
- }
- else {
- bucket->chain = chain->next;
- }
- free (chain);
- }
- break;
- }
- prev = chain;
- chain = chain->next;
- }
-}
-
-void
-metacache_ref (const char *str) {
- uint32_t *refc = (uint32_t *)(str-5);
- *refc++;
-}
-
-void
-metacache_unref (const char *str) {
- uint32_t *refc = (uint32_t *)(str-5);
- *refc--;
-}

deadbeef-0.6.2.tar.bz2/metacache.h Deleted

@@ -1,42 +0,0 @@
-/*
-  This file is part of Deadbeef Player source code
-  http://deadbeef.sourceforge.net
-
-  metadata string cache/database
-
-  Copyright (C) 2009-2013 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
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __METACACHE_H
-#define __METACACHE_H
-
-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);
-
-#endif

deadbeef-0.6.2.tar.bz2/moduleconf.h Deleted

deadbeef-0.6.2.tar.bz2/playlist.c Deleted

@@ -1,4252 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- playlist management
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#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>
-#include <fnmatch.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <assert.h>
-#include <time.h>
-#include <sys/time.h>
-#ifndef __linux__
-#define _POSIX_C_SOURCE 1
-#endif
-#include <limits.h>
-#include <errno.h>
-#include "gettext.h"
-#include "playlist.h"
-#include "streamer.h"
-#include "messagepump.h"
-#include "plugins.h"
-#include "junklib.h"
-#include "vfs.h"
-#include "conf.h"
-#include "utf8.h"
-#include "common.h"
-#include "threading.h"
-#include "metacache.h"
-#include "volume.h"
-#include "pltmeta.h"
-#include "escape.h"
-#include "strdupa.h"
-
-// disable custom title function, until we have new title formatting (0.7)
-#define DISABLE_CUSTOM_TITLE
-
-#define DISABLE_LOCKING 0
-#define DEBUG_LOCKING 0
-#define DETECT_PL_LOCK_RC 0
-
-// file format revision history
-// 1.1->1.2 changelog:
-// added flags field
-// 1.0->1.1 changelog:
-// added sample-accurate seek positions for sub-tracks
-// 1.1->1.2 changelog:
-// added flags field
-// 1.2->1.3 changelog:
-// removed legacy data used for compat with 0.4.4
-// note: ddb-0.5.0 should keep using 1.2 playlist format
-// 1.3 support is designed for transition to ddb-0.6.0
-#define PLAYLIST_MAJOR_VER 1
-#define PLAYLIST_MINOR_VER 2
-
-#if (PLAYLIST_MINOR_VER<2)
-#error writing playlists in format <1.2 is not supported
-#endif
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-
-#define SKIP_BLANK_CUE_TRACKS 0
-#define MAX_CUE_TRACKS 99
-
-#define min(x,y) ((x)<(y)?(x):(y))
-
-#define PLAYQUEUE_SIZE 100
-static playItem_t *playqueue100;
-static int playqueue_count = 0;
-
-static int playlists_count = 0;
-static playlist_t *playlists_head = NULL;
-static playlist_t *playlist = NULL; // current playlist
-static int plt_loading = 0; // disable sending event about playlist switch, config regen, etc
-
-#if !DISABLE_LOCKING
-static uintptr_t mutex;
-#endif
-
-#define LOCK {pl_lock();}
-#define UNLOCK {pl_unlock();}
-
-// used at startup to prevent crashes
-static playlist_t dummy_playlist = {
- .refc = 1
-}; 
-
-static int pl_order = -1; // mirrors "playback.order" config variable
-
-static int no_remove_notify;
-
-static playlist_t *addfiles_playlist; // current playlist for adding files/folders; set in pl_add_files_begin
-
-typedef struct ddb_fileadd_listener_s {
- int id;
- int (*callback)(ddb_fileadd_data_t *data, void *user_data);
- void *user_data;
- struct ddb_fileadd_listener_s *next;
-} ddb_fileadd_listener_t;
-
-static ddb_fileadd_listener_t *file_add_listeners;
-
-typedef struct ddb_fileadd_beginend_listener_s {
- int id;
- void (*callback_begin)(ddb_fileadd_data_t *data, void *user_data);
- void (*callback_end)(ddb_fileadd_data_t *data, void *user_data);
- void *user_data;
- struct ddb_fileadd_beginend_listener_s *next;
-} ddb_fileadd_beginend_listener_t;
-
-static ddb_fileadd_beginend_listener_t *file_add_beginend_listeners;
-
-void
-pl_set_order (int order) {
- 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
-pl_get_order (void) {
- return pl_order;
-}
-
-int
-pl_init (void) {
- playlist = &dummy_playlist;
-#if !DISABLE_LOCKING
- mutex = mutex_create ();
-#endif
- return 0;
-}
-
-void
-pl_free (void) {
- trace ("pl_free\n");
- LOCK;
- pl_playqueue_clear ();
- plt_loading = 1;
- while (playlists_head) {
-
- for (playItem_t *it = playlists_head->headPL_MAIN; it; it = it->nextPL_MAIN) {
- if (it->_refc > 1) {
- fprintf (stderr, "\0330;31mWARNING: playitem %p %s(%s) has refc=%d at delete time\03337;0m\n", it, pl_find_meta_raw (it, ":URI"), pl_find_meta_raw (it, "track"), it->_refc);
- }
- }
-
- //fprintf (stderr, "\0330;31mplt refc %d\03337;0m\n", playlists_head->refc);
-
- plt_remove (0);
- }
- plt_loading = 0;
- UNLOCK;
-#if !DISABLE_LOCKING
- if (mutex) {
- mutex_free (mutex);
- mutex = 0;
- }
-#endif
- playlist = NULL;
-}
-
-#if DEBUG_LOCKING
-volatile int pl_lock_cnt = 0;
-#endif
-#if DETECT_PL_LOCK_RC
-static pthread_t tids1000;
-static int ntids = 0;
-pthread_t pl_lock_tid = 0;
-#endif
-void
-pl_lock (void) {
-#if !DISABLE_LOCKING
- mutex_lock (mutex);
-#if DETECT_PL_LOCK_RC
- pl_lock_tid = pthread_self ();
- tidsntids++ = pl_lock_tid;
-#endif
-
-#if DEBUG_LOCKING
- pl_lock_cnt++;
- printf ("pcnt: %d\n", pl_lock_cnt);
-#endif
-#endif
-}
-
-void
-pl_unlock (void) {
-#if !DISABLE_LOCKING
-#if DETECT_PL_LOCK_RC
- if (ntids > 0) {
- ntids--;
- }
- if (ntids > 0) {
- pl_lock_tid = tidsntids-1;
- }
- else {
- pl_lock_tid = 0;
- }
-#endif
- mutex_unlock (mutex);
-#if DEBUG_LOCKING
- pl_lock_cnt--;
- printf ("pcnt: %d\n", pl_lock_cnt);
-#endif
-#endif
-}
-
-static void
-pl_item_free (playItem_t *it);
-
-static void
-plt_gen_conf (void) {
- if (plt_loading) {
- return;
- }
- LOCK;
- int cnt = plt_get_count ();
- int i;
- conf_remove_items ("playlist.tab.");
-
- playlist_t *p = playlists_head;
- for (i = 0; i < cnt; i++, p = p->next) {
- char s100;
- snprintf (s, sizeof (s), "playlist.tab.%05d", i);
- conf_set_str (s, p->title);
- snprintf (s, sizeof (s), "playlist.cursor.%d", i);
- conf_set_int (s, p->current_rowPL_MAIN);
- snprintf (s, sizeof (s), "playlist.scroll.%d", i);
- conf_set_int (s, p->scroll);
- }
- UNLOCK;
-}
-
-playlist_t *
-plt_get_list (void) {
- return playlists_head;
-}
-
-playlist_t *
-plt_get_curr (void) {
- LOCK;
- playlist_t *plt = playlist;
- if (plt) {
- plt_ref (plt);
- assert (plt->refc > 1);
- }
- UNLOCK;
- return plt;
-}
-
-playlist_t *
-plt_get_for_idx (int idx) {
- LOCK;
- playlist_t *p = playlists_head;
- for (int i = 0; p && i <= idx; i++, p = p->next) {
- if (i == idx) {
- plt_ref (p);
- UNLOCK;
- return p;
- }
- }
- UNLOCK;
- return NULL;
-}
-
-void
-plt_ref (playlist_t *plt) {
- LOCK;
- plt->refc++;
- UNLOCK;
-}
-
-void
-plt_unref (playlist_t *plt) {
- LOCK;
- assert (plt->refc > 0);
- plt->refc--;
- if (plt->refc < 0) {
- trace ("\0330;31mplaylist: bad refcount on playlist %p (%s)\03337;0m\n", plt, plt->title);
- }
- if (plt->refc <= 0) {
- plt_free (plt);
- }
- UNLOCK;
-}
-
-int
-plt_get_count (void) {
- return playlists_count;
-}
-
-playItem_t *
-plt_get_head (int plt) {
- playlist_t *p = playlists_head;
- for (int i = 0; p && i <= plt; i++, p = p->next) {
- if (i == plt) {
- if (p->headPL_MAIN) {
- pl_item_ref (p->headPL_MAIN);
- }
- return p->headPL_MAIN;
- }
- }
- return NULL;
-}
-
-int
-plt_get_sel_count (int plt) {
- playlist_t *p = playlists_head;
- for (int i = 0; p && i <= plt; i++, p = p->next) {
- if (i == plt) {
- int cnt = 0;
- LOCK;
- for (playItem_t *it = p->headPL_MAIN; it; it = it->nextPL_MAIN) {
- if (it->selected) {
- cnt++;
- }
- }
- UNLOCK;
- return cnt;
- }
- }
- 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);
- trace ("plt_add\n");
- playlist_t *plt = plt_alloc (title);
- plt_modified (plt);
-
- LOCK;
- playlist_t *p_before = NULL;
- playlist_t *p_after = playlists_head;
-
- int i;
- for (i = 0; i < before; i++) {
- if (i >= before+1) {
- break;
- }
- p_before = p_after;
- if (p_after) {
- p_after = p_after->next;
- }
- else {
- p_after = playlists_head;
- }
- }
- 
- if (p_before) {
- p_before->next = plt;
- }
- else {
- playlists_head = plt;
- }
- plt->next = p_after;
- playlists_count++;
-
- if (!playlist) {
- playlist = plt;
- if (!plt_loading) {
- // shift files
- for (int i = playlists_count-1; i >= before+1; i--) {
- char path1PATH_MAX;
- char path2PATH_MAX;
- if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path1)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- continue;
- }
- if (snprintf (path2, sizeof (path2), "%s/playlists/%d.dbpl", dbconfdir, i+1) > sizeof (path2)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- continue;
- }
- int err = rename (path1, path2);
- if (err != 0) {
- fprintf (stderr, "playlist rename failed: %s\n", strerror (errno));
- }
- }
- }
- }
- UNLOCK;
-
- plt_gen_conf ();
- if (!plt_loading) {
- plt_save_n (before);
- conf_save ();
- messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
- }
- return before;
-}
-
-// NOTE: caller must ensure that configuration is saved after that call
-void
-plt_remove (int plt) {
- int i;
- assert (plt >= 0 && plt < playlists_count);
- LOCK;
-
- // find playlist and notify streamer
- playlist_t *p = playlists_head;
- playlist_t *prev = NULL;
- for (i = 0; p && i < plt; i++) {
- prev = p;
- p = p->next;
- }
- streamer_notify_playlist_deleted (p);
- if (!plt_loading) {
- // move files (will decrease number of files by 1)
- for (int i = plt+1; i < playlists_count; i++) {
- char path1PATH_MAX;
- char path2PATH_MAX;
- if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, i-1) > sizeof (path1)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- continue;
- }
- if (snprintf (path2, sizeof (path2), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path2)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- continue;
- }
- int err = rename (path2, path1);
- if (err != 0) {
- fprintf (stderr, "playlist rename failed: %s\n", strerror (errno));
- }
- }
- }
-
- if (!plt_loading && (playlists_head && !playlists_head->next)) {
- trace ("warning: deleting last playlist\n");
- pl_clear ();
- free (playlist->title);
- playlist->title = strdup (_("Default"));
- UNLOCK;
- plt_gen_conf ();
- conf_save ();
- plt_save_n (0);
- messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
- return;
- }
- if (i != plt) {
- trace ("plt_remove %d failed\n", i);
- }
- if (p) {
- if (!prev) {
- playlists_head = p->next;
- }
- else {
- prev->next = p->next;
- }
- }
- playlist_t *next = p->next;
- playlist_t *old = playlist;
- playlist = p;
- playlist = old;
- if (p == playlist) {
- if (next) {
- playlist = next;
- }
- else {
- playlist = prev ? prev : playlists_head;
- }
- }
-
- plt_unref (p);
- playlists_count--;
- UNLOCK;
-
- plt_gen_conf ();
- conf_save ();
- if (!plt_loading) {
- messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
- }
-}
-
-int
-plt_find (const char *name) {
- playlist_t *p = playlists_head;
- int i = -1;
- for (i = 0; p; i++, p = p->next) {
- if (!strcmp (p->title, name)) {
- return i;
- }
- }
- return -1;
-}
-
-
-void
-plt_set_curr (playlist_t *plt) {
- LOCK;
- if (plt != playlist) {
- playlist = plt;
- if (!plt_loading) {
- messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
- conf_set_int ("playlist.current", plt_get_curr_idx ());
- conf_save ();
- }
- }
- UNLOCK;
-}
-
-void
-plt_set_curr_idx (int plt) {
- int i;
- LOCK;
- playlist_t *p = playlists_head;
- for (i = 0; p && p->next && i < plt; i++) {
- p = p->next;
- }
- if (p != playlist) {
- playlist = p;
- if (!plt_loading) {
- messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
- conf_set_int ("playlist.current", plt);
- conf_save ();
- }
- }
- UNLOCK;
-}
-
-int
-plt_get_curr_idx(void) {
- int i;
- LOCK;
- playlist_t *p = playlists_head;
- for (i = 0; p && i < playlists_count; i++) {
- if (p == playlist) {
- UNLOCK;
- return i;
- }
- p = p->next;
- }
- UNLOCK;
- return -1;
-}
-
-int
-plt_get_idx_of (playlist_t *plt) {
- int i;
- LOCK;
- playlist_t *p = playlists_head;
- for (i = 0; p && i < playlists_count; i++) {
- if (p == plt) {
- UNLOCK;
- return i;
- }
- p = p->next;
- }
- UNLOCK;
- return -1;
-}
-
-int
-plt_get_title (playlist_t *p, char *buffer, int bufsize) {
- int i;
- LOCK;
- if (!buffer) {
- int l = strlen (p->title);
- UNLOCK;
- return l;
- }
- strncpy (buffer, p->title, bufsize);
- bufferbufsize-1 = 0;
- UNLOCK;
- return 0;
-}
-
-int
-plt_set_title (playlist_t *p, const char *title) {
- int i;
- LOCK;
- free (p->title);
- p->title = strdup (title);
- plt_gen_conf ();
- UNLOCK;
- conf_save ();
- if (!plt_loading) {
- messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
- }
- return 0;
-}
-
-void
-plt_modified (playlist_t *plt) {
- pl_lock ();
- plt->modification_idx++;
- pl_unlock ();
-}
-
-int
-plt_get_modification_idx (playlist_t *plt) {
- pl_lock ();
- int idx = plt->modification_idx;
- pl_unlock ();
- return idx;
-}
-
-void
-plt_free (playlist_t *plt) {
- LOCK;
- plt_clear (plt);
- free (plt->title);
-
- while (plt->meta) {
- DB_metaInfo_t *m = plt->meta;
- plt->meta = m->next;
- metacache_remove_string (m->key);
- metacache_remove_string (m->value);
- free (m);
- }
-
- free (plt);
- UNLOCK;
-}
-
-void
-plt_move (int from, int to) {
- trace ("%d -> %d\n", from, to);
- if (from == to) {
- return;
- }
- trace ("plt_move %d -> %d\n", from, to);
- int i;
- LOCK;
- playlist_t *p = playlists_head;
-
- playlist_t *pfrom = NULL;
- playlist_t *prev = NULL;
- playlist_t *ins = NULL;
-
- // move 'from' to temp file
- char path1PATH_MAX;
- char tempPATH_MAX;
- if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, from) > sizeof (path1)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- UNLOCK;
- return;
- }
- if (snprintf (temp, sizeof (temp), "%s/playlists/temp.dbpl", dbconfdir) > sizeof (temp)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- UNLOCK;
- return;
- }
-
-// trace ("will rename %s->%s\n", path1, temp);
- struct stat st;
- int err = stat (path1, &st);
- if (!err) {
- trace ("rename %s->%s\n", path1, temp);
-
- int err = rename (path1, temp);
- if (err != 0) {
- fprintf (stderr, "playlist rename %s->%s failed: %s\n", path1, temp, strerror (errno));
- UNLOCK;
- return;
- }
- }
-
- // remove 'from' from list
- for (i = 0; p && i <= from; i++) {
- if (i == from) {
- pfrom = p;
- if (prev) {
- prev->next = p->next;
- }
- else {
- playlists_head = p->next;
- }
- break;
- }
- prev = p;
- p = p->next;
- }
-
- // shift files to fill the gap
- for (int i = from; i < playlists_count-1; i++) {
- char path2PATH_MAX;
- if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path1)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- continue;
- }
- if (snprintf (path2, sizeof (path2), "%s/playlists/%d.dbpl", dbconfdir, i+1) > sizeof (path2)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- continue;
- }
-// trace ("will rename %s->%s\n", path2, path1);
- int err = stat (path2, &st);
- if (!err) {
- trace ("rename %s->%s\n", path2, path1);
- int err = rename (path2, path1);
- if (err != 0) {
- fprintf (stderr, "playlist rename %s->%s failed: %s\n", path2, path1, strerror (errno));
- }
- }
- }
- // open new gap
- for (int i = playlists_count-2; i >= to; i--) {
- char path2PATH_MAX;
- if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path1)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- continue;
- }
- if (snprintf (path2, sizeof (path2), "%s/playlists/%d.dbpl", dbconfdir, i+1) > sizeof (path2)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- continue;
- }
- trace ("will rename %s->%s\n", path1, path2);
- int err = stat (path1, &st);
- if (!err) {
- trace ("rename %s->%s\n", path1, path2);
- int err = rename (path1, path2);
- if (err != 0) {
- fprintf (stderr, "playlist rename %s->%s failed: %s\n", path1, path2, strerror (errno));
- }
- }
- }
- // move temp file
- if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, to) > sizeof (path1)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- }
- else {
- int err = stat (temp, &st);
- if (!err) {
- trace ("move %s->%s\n", temp, path1);
- int err = rename (temp, path1);
- if (err != 0) {
- fprintf (stderr, "playlist rename %s->%s failed: %s\n", temp, path1, strerror (errno));
- }
- }
- }
-
- // move pointers
- if (to == 0) {
- // insert 'from' as head
- pfrom->next = playlists_head;
- playlists_head = pfrom;
- }
- else {
- // insert 'from' in the middle
- p = playlists_head;
- for (i = 0; p && i < to; i++) {
- if (i == to-1) {
- playlist_t *next = p->next;
- p->next = pfrom;
- pfrom->next = next;
- break;
- }
- prev = p;
- p = p->next;
- }
- }
-
- UNLOCK;
- plt_gen_conf ();
- conf_save ();
-}
-
-void
-plt_clear (playlist_t *plt) {
- pl_lock ();
- while (plt->headPL_MAIN) {
- plt_remove_item (plt, plt->headPL_MAIN);
- }
- plt->current_rowPL_MAIN = -1;
- plt->current_rowPL_SEARCH = -1;
- plt_modified (plt);
- pl_unlock ();
-}
-
-void
-pl_clear (void) {
- LOCK;
- plt_clear (playlist);
- UNLOCK;
-}
-
-static const uint8_t *
-pl_str_skipspaces (const uint8_t *p, const uint8_t *end) {
- while (p < end && *p <= ' ') {
- p++;
- }
- return p;
-}
-static const uint8_t *
-pl_cue_skipspaces (const uint8_t *p) {
- while (*p && *p <= ' ') {
- p++;
- }
- return p;
-}
-
-static void
-pl_get_qvalue_from_cue (const uint8_t *p, int sz, char *out, const char *charset) {
- char *str = out;
- if (*p == 0) {
- *out = 0;
- return;
- }
- p = pl_cue_skipspaces (p);
- if (*p == 0) {
- *out = 0;
- return;
- }
-
- if (*p == '"') {
- p++;
- p = pl_cue_skipspaces (p);
- while (*p && *p != '"' && sz > 1) {
- sz--;
- *out++ = *p++;
- }
- *out = 0;
- }
- else {
- while (*p && *p >= 0x20) {
- sz--;
- *out++ = *p++;
- }
- out--;
- while (out > str && *out == 0x20) {
- out--;
- }
- out++;
- *out = 0;
- }
-
- if (!charset) {
- return;
- }
-
- // recode
- int l = strlen (str);
- char recbufl*10;
- int res = junk_recode (str, l, recbuf, sizeof (recbuf)-1, charset);
- if (res > 0) {
- strcpy (str, recbuf);
- }
- else
- {
- strcpy (str, "<UNRECOGNIZED CHARSET>");
- }
-}
-
-static void
-pl_get_value_from_cue (const char *p, int sz, char *out) {
- while (*p >= ' ' && sz > 1) {
- sz--;
- *out++ = *p++;
- }
- while (out > p && (*(out-1) == 0x20 || *(out-1) == 0x8)) {
- out--;
- }
- *out = 0;
-}
-
-static float
-pl_cue_parse_time (const char *p) {
- char *endptr;
- long mins = strtol(p, &endptr, 10);
- if (endptr - p < 1 || *endptr != ':') {
- return -1;
- }
- p = endptr + 1;
- long sec = strtol(p, &endptr, 10);
- if (endptr - p != 2 || *endptr != ':') {
- return -1;
- }
- p = endptr + 1;
- long frm = strtol(p, &endptr, 10);
- if (endptr - p != 2 || *endptr != '\0') {
- return -1;
- }
- return mins * 60.f + sec + frm / 75.f;
-}
-
-static playItem_t *
-plt_process_cue_track (playlist_t *playlist, const char *fname, const int startsample, 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 (!track0) {
- trace ("pl_process_cue_track: invalid track (file=%s, title=%s)\n", fname, title);
- return NULL;
- }
- if (!index000 && !index010) {
- trace ("pl_process_cue_track: invalid index (file=%s, title=%s, track=%s)\n", fname, title, track);
- return NULL;
- }
-#if SKIP_BLANK_CUE_TRACKS
- if (!title0) {
- trace ("pl_process_cue_track: invalid title (file=%s, title=%s, track=%s)\n", fname, title, track);
- return NULL;
- }
-#endif
- // fix track number
- char *p = track;
- while (*p && isdigit (*p)) {
- p++;
- }
- *p = 0;
- // check that indexes have valid timestamps
- //float f_index00 = index000 ? pl_cue_parse_time (index00) : 0;
- float f_index01 = index010 ? pl_cue_parse_time (index01) : 0;
- float f_pregap = pregap0 ? pl_cue_parse_time (pregap) : 0;
- if (*prev) {
- float prevtime = 0;
- if (pregap0 && index010) {
- // PREGAP command
- prevtime = f_index01 - f_pregap;
- }
-// else if (index000 && index010) {
-// // pregap in index 00
-// prevtime = f_index00;
-// }
- else if (index010) {
- // no pregap
- prevtime = f_index01;
- }
- else {
- trace ("pl_process_cue_track: invalid pregap or index01 (pregap=%s, index01=%s)\n", pregap, index01);
- return NULL;
- }
- (*prev)->endsample = startsample + (prevtime * samplerate) - 1;
- plt_set_item_duration (playlist, *prev, (float)((*prev)->endsample - (*prev)->startsample + 1) / samplerate);
- if (pl_get_item_duration (*prev) < 0) {
- // might be bad cuesheet file, try to fix
- trace ("cuesheet seems to be corrupted, trying workaround\n");
- //trace ("bad: calc endsample=%d, prevtime=%f, samplerate=%d, prev track duration=%f\n", (*prev)->endsample, prevtime, samplerate, (*prev)->duration);
- prevtime = f_index01;
- (*prev)->endsample = startsample + (prevtime * samplerate) - 1;
- float dur = (float)((*prev)->endsample - (*prev)->startsample + 1) / samplerate;
- plt_set_item_duration (playlist, *prev, dur);
- if (dur > 0) {
- trace ("success :-D\n");
- }
- else {
- trace ("fail :-(\n");
- }
- }
- trace ("startsample=%d, endsample=%d, prevtime=%f, samplerate=%d, prev track duration=%f\n", (*prev)->startsample, (*prev)->endsample, prevtime, samplerate, (*prev)->_duration);
- }
- // non-compliant hack to handle tracks which only store pregap info
- if (!index010) {
- *prev = NULL;
- trace ("pl_process_cue_track: invalid index01 (pregap=%s, index01=%s)\n", pregap, index01);
- return NULL;
- }
- playItem_t *it = pl_item_alloc_init (fname, decoder_id);
- pl_set_meta_int (it, ":TRACKNUM", atoi (track));
- it->startsample = index010 ? startsample + f_index01 * samplerate : startsample;
- it->endsample = -1; // will be filled by next read, or by decoder
- pl_replace_meta (it, ":FILETYPE", ftype);
- if (performer0) {
- pl_add_meta (it, "artist", performer);
- if (albumperformer0) {
- pl_add_meta (it, "album artist", albumperformer);
- }
- }
- else if (albumperformer0) {
- pl_add_meta (it, "artist", albumperformer);
- }
- if (albumtitle0) {
- pl_add_meta (it, "album", albumtitle);
- }
- if (track0) {
- pl_add_meta (it, "track", track);
- }
- if (title0) {
- pl_add_meta (it, "title", title);
- }
- if (genre0) {
- pl_add_meta (it, "genre", genre);
- }
- if (date0) {
- pl_add_meta (it, "year", date);
- }
- if (replaygain_album_gain0) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, atof (replaygain_album_gain));
- }
- if (replaygain_album_peak0) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, atof (replaygain_album_peak));
- }
- if (replaygain_track_gain0) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, atof (replaygain_track_gain));
- }
- if (replaygain_track_peak0) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, atof (replaygain_track_peak));
- }
- it->_flags |= DDB_IS_SUBTRACK | DDB_TAG_CUESHEET;
- *prev = it;
- return it;
-}
-
-playItem_t *
-plt_insert_cue_from_buffer (playlist_t *playlist, playItem_t *after, playItem_t *origin, const uint8_t *buffer, int buffersize, int numsamples, int samplerate) {
- if (buffersize >= 3 && buffer0 == 0xef && buffer1 == 0xbb && buffer2 == 0xbf) {
- buffer += 3;
- buffersize -= 3;
- }
-
- // go through the file, and verify that it's not for multiple tracks
- int fcount = 0;
- uint8_t *p = (uint8_t *)buffer;
- uint8_t *e = (uint8_t *)(buffer + buffersize);
- while (*p) {
- while (*p <= 0x20 && *p) {
- p++;
- }
- if (e-p > 4 && !memcmp ((char *)p, "FILE", 4) && p4 == 0x20) {
- fcount++;
- if (fcount > 1) {
- return NULL;
- }
- }
- while (*p >= 0x20 && *p) {
- p++;
- }
- }
-
- const char *charset = junk_detect_charset_len (buffer, buffersize);
-
- LOCK;
- playItem_t *ins = after;
- trace ("plt_insert_cue_from_buffer numsamples=%d, samplerate=%d\n", numsamples, samplerate);
- char albumperformer256 = "";
- char performer256 = "";
- char albumtitle256 = "";
- char genre256 = "";
- char date256 = "";
- char track256 = "";
- char title256 = "";
- char pregap256 = "";
- char index00256 = "";
- char index01256 = "";
- char replaygain_album_gain256 = "";
- char replaygain_album_peak256 = "";
- char replaygain_track_gain256 = "";
- char replaygain_track_peak256 = "";
- const char *uri = pl_find_meta_raw (origin, ":URI");
- const char *dec = pl_find_meta_raw (origin, ":DECODER");
- const char *filetype = pl_find_meta_raw (origin, ":FILETYPE");
-
- playItem_t *cuetracksMAX_CUE_TRACKS;
- int ncuetracks = 0;
-
- playItem_t *prev = NULL;
- while (buffersize > 0) {
- const uint8_t *p = buffer;
- // find end of line
- while (p - buffer < buffersize && *p >= 0x20) {
- p++;
- }
- // skip linebreak(s)
- while (p - buffer < buffersize && *p < 0x20) {
- p++;
- }
- if (p-buffer > 2048) { // huge string, ignore
- buffersize -= p-buffer;
- buffer = p;
- continue;
- }
- char strp-buffer+1;
- strncpy (str, buffer, p-buffer);
- strp-buffer = 0;
- buffersize -= p-buffer;
- buffer = p;
- p = pl_cue_skipspaces (str);
-// trace ("cue line: %s\n", p);
- if (!strncmp (p, "PERFORMER ", 10)) {
- if (!track0) {
- pl_get_qvalue_from_cue (p + 10, sizeof (albumperformer), albumperformer, charset);
- }
- else {
- pl_get_qvalue_from_cue (p + 10, sizeof (performer), performer, charset);
- }
- trace ("cue: got performer: %s\n", performer);
- }
- else if (!strncmp (p, "TITLE ", 6)) {
- if (str0 > ' ' && !albumtitle0) {
- pl_get_qvalue_from_cue (p + 6, sizeof (albumtitle), albumtitle, charset);
- trace ("cue: got albumtitle: %s\n", albumtitle);
- }
- else {
- pl_get_qvalue_from_cue (p + 6, sizeof (title), title, charset);
- trace ("cue: got title: %s\n", title);
- }
- }
- else if (!strncmp (p, "REM GENRE ", 10)) {
- pl_get_qvalue_from_cue (p + 10, sizeof (genre), genre, charset);
- }
- else if (!strncmp (p, "REM DATE ", 9)) {
- pl_get_value_from_cue (p + 9, sizeof (date), date);
- }
- else if (!strncmp (p, "TRACK ", 6)) {
- trace ("cue: adding track: %s %s %s\n", uri, title, track);
- if (title0) {
- // add previous track
- playItem_t *it = plt_process_cue_track (playlist, uri, origin->startsample, &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, dec, filetype, samplerate);
- trace ("cue: added %p\n", it);
- if (it) {
- if ((it->startsample-origin->startsample) >= numsamples || (it->endsample-origin->startsample) >= numsamples) {
- trace ("cue: the track is shorter than cue timeline\n");
- goto error;
- }
- cuetracksncuetracks++ = it;
- }
- }
-
- track0 = 0;
- title0 = 0;
- pregap0 = 0;
- index000 = 0;
- index010 = 0;
- replaygain_track_gain0 = 0;
- replaygain_track_peak0 = 0;
- performer0 = 0;
- pl_get_value_from_cue (p + 6, sizeof (track), track);
- trace ("cue: got track: %s\n", track);
- }
- else if (!strncmp (p, "REM REPLAYGAIN_ALBUM_GAIN ", 26)) {
- pl_get_value_from_cue (p + 26, sizeof (replaygain_album_gain), replaygain_album_gain);
- }
- else if (!strncmp (p, "REM REPLAYGAIN_ALBUM_PEAK ", 26)) {
- pl_get_value_from_cue (p + 26, sizeof (replaygain_album_peak), replaygain_album_peak);
- }
- else if (!strncmp (p, "REM REPLAYGAIN_TRACK_GAIN ", 26)) {
- pl_get_value_from_cue (p + 26, sizeof (replaygain_track_gain), replaygain_track_gain);
- }
- else if (!strncmp (p, "REM REPLAYGAIN_TRACK_PEAK ", 26)) {
- pl_get_value_from_cue (p + 26, sizeof (replaygain_track_peak), replaygain_track_peak);
- }
- else if (!strncmp (p, "PREGAP ", 7)) {
- pl_get_value_from_cue (p + 7, sizeof (pregap), pregap);
- }
- else if (!strncmp (p, "INDEX 00 ", 9)) {
- pl_get_value_from_cue (p + 9, sizeof (index00), index00);
- }
- else if (!strncmp (p, "INDEX 01 ", 9)) {
- pl_get_value_from_cue (p + 9, sizeof (index01), index01);
- }
- else {
-// fprintf (stderr, "got unknown line:\n%s\n", p);
- }
- }
- if (title0) {
- // handle last track
- playItem_t *it = plt_process_cue_track (playlist, uri, origin->startsample, &prev, track, index00, index01, pregap, title, albumperformer, performer, albumtitle, genre, date, replaygain_album_gain, replaygain_album_peak, replaygain_track_gain, replaygain_track_peak, dec, filetype, samplerate);
- if (it) {
- trace ("last track endsample: %d\n", origin->startsample+numsamples-1);
- it->endsample = origin->startsample + numsamples - 1;
- if ((it->endsample-origin->startsample) >= numsamples || (it->startsample-origin->startsample) >= numsamples) {
- goto error;
- }
- plt_set_item_duration (playlist, it, (float)(it->endsample - it->startsample + 1) / samplerate);
- cuetracksncuetracks++ = it;
- }
- }
-
- if (!ncuetracks) {
- UNLOCK;
- return NULL;
- }
-
- playItem_t *last = cuetracksncuetracks-1;
- pl_item_ref (last);
-
- for (int i = 0; i < ncuetracks; i++) {
- after = plt_insert_item (playlist, after, cuetracksi);
- pl_item_unref (cuetracksi);
- }
- playItem_t *first = ins ? ins->nextPL_MAIN : playlist->headPL_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_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 (cuetracksi);
- }
- 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);
- pl_lock ();
- const char *fname = pl_find_meta_raw (origin, ":URI");
- int len = strlen (fname);
- char cuenamelen+5;
- strcpy (cuename, fname);
- pl_unlock ();
- strcpy (cuename+len, ".cue");
- DB_FILE *fp = vfs_fopen (cuename);
- if (!fp) {
- strcpy (cuename+len, ".CUE");
- fp = vfs_fopen (cuename);
- }
- if (!fp) {
- char *ptr = cuename + len-1;
- while (ptr >= cuename && *ptr != '.') {
- ptr--;
- }
- if (ptr < cuename) {
- return NULL;
- }
- strcpy (ptr+1, "cue");
- fp = vfs_fopen (cuename);
- if (!fp) {
- strcpy (ptr+1, "CUE");
- fp = vfs_fopen (cuename);
- }
- }
- if (!fp) {
- return NULL;
- }
- size_t sz = vfs_fgetlength (fp);
- if (sz == 0) {
- vfs_fclose (fp);
- return NULL;
- }
- uint8_t *buf = alloca(sz);
- if (!buf) {
- vfs_fclose (fp);
- return NULL;
- }
- if (vfs_fread (buf, 1, sz, fp) != sz) {
- vfs_fclose (fp);
- return NULL;
- }
- vfs_fclose (fp);
- return plt_insert_cue_from_buffer (plt, after, origin, buf, sz, numsamples, samplerate);
-}
-
-static int follow_symlinks = 0;
-static int ignore_archives = 0;
-
-static playItem_t *
-plt_insert_dir_int (int visibility, playlist_t *playlist, DB_vfs_t *vfs, playItem_t *after, const char *dirname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data);
-
-static playItem_t *
-plt_load_int (int visibility, playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data);
-
-static playItem_t *
-plt_insert_file_int (int visibility, playlist_t *playlist, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
- trace ("count: %d\n", playlist->countPL_MAIN);
- trace ("pl_insert_file %s\n", fname);
- if (!fname || !(*fname)) {
- return NULL;
- }
-
- // check if that is supported container format
- if (!ignore_archives) {
- DB_vfs_t **vfsplugs = plug_get_vfs_list ();
- for (int i = 0; vfsplugsi; i++) {
- if (vfsplugsi->is_container) {
- if (vfsplugsi->is_container (fname)) {
- trace ("inserting %s via vfs %s\n", fname, vfsplugsi->plugin.id);
- playItem_t *it = plt_insert_dir_int (visibility, playlist, vfsplugsi, after, fname, pabort, cb, user_data);
- if (it) {
- return it;
- }
- }
- }
- }
- }
-
- const char *fn = strrchr (fname, '/');
- if (!fn) {
- fn = fname;
- }
- else {
- fn++;
- }
-
- // 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
- // update decoder and filetype fields
- if (strncasecmp (fname, "file://", 7)) {
- const char *p = fname;
- int detect_on_access = 1;
-
- // check if it's URI
- for (; *p; p++) {
- if (!strncmp (p, "://", 3)) {
- break;
- }
- if (!isalpha (*p)) {
- detect_on_access = 0;
- break;
- }
- }
-
- if (detect_on_access) {
- // find vfs plugin
- DB_vfs_t **vfsplugs = plug_get_vfs_list ();
- for (int i = 0; vfsplugsi; i++) {
- if (vfsplugsi->get_schemes) {
- const char **sch = vfsplugsi->get_schemes ();
- int s = 0;
- for (s = 0; schs; s++) {
- if (!strncasecmp (schs, fname, strlen (schs))) {
- break;
- }
- }
- if (schs) {
- if (!vfsplugsi->is_streaming || !vfsplugsi->is_streaming()) {
- detect_on_access = 0;
- }
- break;
- }
- }
- }
- }
-
- if (detect_on_access && *p == ':') {
- // check for wrong chars like CR/LF, TAB, etc
- // they are not allowed and might lead to corrupt display in GUI
- int32_t i = 0;
- while (fnamei) {
- uint32_t c = u8_nextchar (fname, &i);
- if (c < 0x20) {
- return NULL;
- }
- }
- 
- playItem_t *it = pl_item_alloc_init (fname, NULL);
- pl_replace_meta (it, ":FILETYPE", "content");
- after = plt_insert_item (addfiles_playlist ? addfiles_playlist : playlist, after, it);
- pl_item_unref (it);
- return after;
- }
- }
- else {
- char *escaped = uri_unescape (fname, strlen (fname));
- if (escaped) {
- fname = strdupa (escaped);
- free (escaped);
- }
- fname += 7;
- }
-
- // detect decoder
- const char *eol = strrchr (fname, '.');
- if (!eol) {
- return NULL;
- }
- eol++;
-
- ddb_fileadd_data_t d;
- memset (&d, 0, sizeof (d));
- d.visibility = visibility;
- d.plt = (ddb_playlist_t *)playlist;
-
- DB_decoder_t **decoders = plug_get_decoder_list ();
- // match by decoder
- for (int i = 0; decodersi; i++) {
- trace ("matching decoder %d(%s)...\n", i, decodersi->plugin.id);
- if (decodersi->exts && decodersi->insert) {
- const char **exts = decodersi->exts;
- for (int e = 0; extse; e++) {
- if (!strcasecmp (extse, eol)) {
- playItem_t *inserted = (playItem_t *)decodersi->insert ((ddb_playlist_t *)playlist, DB_PLAYITEM (after), fname);
- if (inserted != NULL) {
- if (cb && cb (inserted, user_data) < 0) {
- *pabort = 1;
- }
- if (file_add_listeners) {
- d.track = (ddb_playItem_t *)inserted;
- for (ddb_fileadd_listener_t *l = file_add_listeners; l; l = l->next) {
- if (l->callback (&d, l->user_data) < 0) {
- *pabort = 1;
- break;
- }
- }
- }
- trace ("file has been added by decoder: %s\n", decodersi->plugin.id);
- return inserted;
- }
- }
- }
- }
- if (decodersi->prefixes && decodersi->insert) {
- const char **prefixes = decodersi->prefixes;
- for (int e = 0; prefixese; e++) {
- if (!strncasecmp (prefixese, fn, strlen(prefixese)) && *(fn + strlen (prefixese)) == '.') {
- playItem_t *inserted = (playItem_t *)decodersi->insert ((ddb_playlist_t *)playlist, DB_PLAYITEM (after), fname);
- if (inserted != NULL) {
- if (cb && cb (inserted, user_data) < 0) {
- *pabort = 1;
- }
- if (file_add_listeners) {
- d.track = (ddb_playItem_t *)inserted;
- for (ddb_fileadd_listener_t *l = file_add_listeners; l; l = l->next) {
- if (l->callback (&d, l->user_data) < 0) {
- *pabort = 1;
- break;
- }
- }
- }
- return inserted;
- }
- }
- }
- }
- }
- trace ("no decoder found for %s\n", fname);
- return NULL;
-}
-
-playItem_t *
-plt_insert_file (playlist_t *playlist, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
- return plt_insert_file_int (0, playlist, after, fname, pabort, cb, user_data);
-}
-
-static int dirent_alphasort (const struct dirent **a, const struct dirent **b) {
- return strcmp ((*a)->d_name, (*b)->d_name);
-}
-
-static playItem_t *
-plt_insert_dir_int (int visibility, playlist_t *playlist, DB_vfs_t *vfs, playItem_t *after, const char *dirname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
- if (!strncmp (dirname, "file://", 7)) {
- dirname += 7;
- }
- if (!follow_symlinks && !vfs) {
- struct stat buf;
- lstat (dirname, &buf);
- if (S_ISLNK(buf.st_mode)) {
- return NULL;
- }
- }
- struct dirent **namelist = NULL;
- int n;
-
- if (vfs && vfs->scandir) {
- n = vfs->scandir (dirname, &namelist, NULL, dirent_alphasort);
- }
- else {
- n = scandir (dirname, &namelist, NULL, dirent_alphasort);
- }
- if (n < 0)
- {
- if (namelist)
- free (namelist);
- return NULL;	// not a dir or no read access
- }
- else
- {
- int i;
- for (i = 0; i < n; i++)
- {
- // no hidden files
- if (namelisti->d_name0 != '.')
- {
- playItem_t *inserted = NULL;
- if (!vfs) {
- char fullnamePATH_MAX;
- snprintf (fullname, sizeof (fullname), "%s/%s", dirname, namelisti->d_name);
- inserted = plt_insert_dir_int (visibility, playlist, vfs, after, fullname, pabort, cb, user_data);
- if (!inserted) {
- inserted = plt_insert_file_int (visibility, playlist, after, fullname, pabort, cb, user_data);
- }
- }
- else {
- char fullnamePATH_MAX;
- const char *sch = NULL;
- if (vfs->plugin.api_vminor >= 6 && vfs->get_scheme_for_name) {
- sch = vfs->get_scheme_for_name (dirname);
- }
- if (sch && strncmp (sch, namelisti->d_name, strlen (sch))) {
- snprintf (fullname, sizeof (fullname), "%s%s:%s", sch, dirname, namelisti->d_name);
- }
- else {
- strcpy (fullname, namelisti->d_name);
- }
- inserted = plt_insert_file_int (visibility, playlist, after, fullname, pabort, cb, user_data);
- // NOTE: adding archive to playlist is the same as adding a
- // folder, so we don't load any playlists.
- // the code below is kept for reference
-// if (!inserted) {
-// // special case for loading playlists in zip files
-// inserted = plt_load_int (visibility, playlist, after, fullname, pabort, cb, user_data);
-// }
- }
- if (inserted) {
- after = inserted;
- }
- if (*pabort) {
- break;
- }
- }
- free (namelisti);
- }
- free (namelist);
- }
- return after;
-}
-
-playItem_t *
-plt_insert_dir (playlist_t *playlist, playItem_t *after, const char *dirname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
- follow_symlinks = conf_get_int ("add_folders_follow_symlinks", 0);
- ignore_archives = conf_get_int ("ignore_archives", 1);
-
- playItem_t *ret = plt_insert_dir_int (0, playlist, NULL, after, dirname, pabort, cb, user_data);
-
- ignore_archives = 0;
-
- return ret;
-}
-
-static int
-plt_add_file_int (int visibility, playlist_t *plt, const char *fname, int (*cb)(playItem_t *it, void *data), void *user_data) {
- int abort = 0;
- playItem_t *it = plt_insert_file_int (visibility, plt, plt->tailPL_MAIN, fname, &abort, cb, user_data);
- if (it) {
- // pl_insert_file doesn't hold reference, don't unref here
- return 0;
- }
- return -1;
-}
-
-int
-plt_add_file (playlist_t *plt, const char *fname, int (*cb)(playItem_t *it, void *data), void *user_data) {
- return plt_add_file_int (0, plt, fname, cb, user_data);
-}
-
-int
-plt_add_dir (playlist_t *plt, const char *dirname, int (*cb)(playItem_t *it, void *data), void *user_data) {
- int abort = 0;
- playItem_t *it = plt_insert_dir (plt, plt->tailPL_MAIN, dirname, &abort, cb, user_data);
- if (it) {
- // pl_insert_file doesn't hold reference, don't unref here
- return 0;
- }
- return -1;
-}
-
-int
-pl_add_files_begin (playlist_t *plt) {
- return plt_add_files_begin (plt, 0);
-}
-
-void
-pl_add_files_end (void) {
- return plt_add_files_end (addfiles_playlist, 0);
-}
-
-int
-plt_remove_item (playlist_t *playlist, playItem_t *it) {
- if (!it)
- return -1;
-
- if (!no_remove_notify) {
- streamer_song_removed_notify (it);
- pl_playqueue_remove (it);
- }
-
- // remove from both lists
- LOCK;
- for (int iter = PL_MAIN; iter <= PL_SEARCH; iter++) {
- if (it->previter || it->nextiter || playlist->headiter == it || playlist->tailiter == it) {
- playlist->countiter--;
- }
- if (it->previter) {
- it->previter->nextiter = it->nextiter;
- }
- else {
- playlist->headiter = it->nextiter;
- }
- if (it->nextiter) {
- it->nextiter->previter = it->previter;
- }
- else {
- playlist->tailiter = it->previter;
- }
- }
-
- // totaltime
- float dur = pl_get_item_duration (it);
- if (dur > 0) {
- playlist->totaltime -= dur;
- if (playlist->totaltime < 0) {
- playlist->totaltime = 0;
- }
- }
- plt_modified (playlist);
- pl_item_unref (it);
- UNLOCK;
- return 0;
-}
-
-int
-plt_get_item_count (playlist_t *plt, int iter) {
- return plt->countiter;
-}
-
-int
-pl_getcount (int iter) {
- LOCK;
- if (!playlist) {
- UNLOCK;
- return 0;
- }
-
- int cnt = playlist->countiter;
- UNLOCK;
- return cnt;
-}
-
-int
-plt_getselcount (playlist_t *playlist) {
- // FIXME: slow!
- int cnt = 0;
- for (playItem_t *it = playlist->headPL_MAIN; it; it = it->nextPL_MAIN) {
- if (it->selected) {
- cnt++;
- }
- }
- return cnt;
-}
-
-int
-pl_getselcount (void) {
- LOCK;
- int cnt = plt_getselcount (playlist);
- UNLOCK;
- return cnt;
-}
-
-playItem_t *
-plt_get_item_for_idx (playlist_t *playlist, int idx, int iter) {
- LOCK;
- playItem_t *it = playlist->headiter;
- while (idx--) {
- if (!it) {
- UNLOCK;
- return NULL;
- }
- it = it->nextiter;
- }
- if (it) {
- pl_item_ref (it);
- }
- UNLOCK;
- return it;
-}
-
-playItem_t *
-pl_get_for_idx_and_iter (int idx, int iter) {
- LOCK;
- playItem_t *it = plt_get_item_for_idx (playlist, idx, iter);
- UNLOCK;
- return it;
-}
-
-playItem_t *
-pl_get_for_idx (int idx) {
- return pl_get_for_idx_and_iter (idx, PL_MAIN);
-}
-
-int
-plt_get_item_idx (playlist_t *playlist, playItem_t *it, int iter) {
- LOCK;
- playItem_t *c = playlist->headiter;
- int idx = 0;
- while (c && c != it) {
- c = c->nextiter;
- idx++;
- }
- if (!c) {
- UNLOCK;
- return -1;
- }
- UNLOCK;
- return idx;
-}
-
-int
-pl_get_idx_of (playItem_t *it) {
- return pl_get_idx_of_iter (it, PL_MAIN);
-}
-
-int
-pl_get_idx_of_iter (playItem_t *it, int iter) {
- LOCK;
- int idx = plt_get_item_idx (playlist, it, iter);
- UNLOCK;
- return idx;
-}
-
-playItem_t *
-plt_insert_item (playlist_t *playlist, playItem_t *after, playItem_t *it) {
- LOCK;
- pl_item_ref (it);
- if (!after) {
- it->nextPL_MAIN = playlist->headPL_MAIN;
- it->prevPL_MAIN = NULL;
- if (playlist->headPL_MAIN) {
- playlist->headPL_MAIN->prevPL_MAIN = it;
- }
- else {
- playlist->tailPL_MAIN = it;
- }
- playlist->headPL_MAIN = it;
- }
- else {
- it->prevPL_MAIN = after;
- it->nextPL_MAIN = after->nextPL_MAIN;
- if (after->nextPL_MAIN) {
- after->nextPL_MAIN->prevPL_MAIN = it;
- }
- after->nextPL_MAIN = it;
- if (after == playlist->tailPL_MAIN) {
- playlist->tailPL_MAIN = it;
- }
- }
- it->in_playlist = 1;
-
- playlist->countPL_MAIN++;
-
- // shuffle
- playItem_t *prev = it->prevPL_MAIN;
- 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 {
- it->shufflerating = rand ();
- }
- it->played = 0;
-
- // totaltime
- float dur = pl_get_item_duration (it);
- if (dur > 0) {
- playlist->totaltime += dur;
- }
- 
- plt_modified (playlist);
- 
- UNLOCK;
- return it;
-}
-
-playItem_t *
-pl_insert_item (playItem_t *after, playItem_t *it) {
- return plt_insert_item (addfiles_playlist ? addfiles_playlist : playlist, after, it);
-}
-
-void
-pl_item_copy (playItem_t *out, playItem_t *it) {
- LOCK;
- out->startsample = it->startsample;
- out->endsample = it->endsample;
- out->shufflerating = it->shufflerating;
- out->_duration = it->_duration;
- out->nextPL_MAIN = it->nextPL_MAIN;
- out->prevPL_MAIN = it->prevPL_MAIN;
- out->nextPL_SEARCH = it->nextPL_SEARCH;
- out->prevPL_SEARCH = it->prevPL_SEARCH;
- out->_refc = 1;
- // copy metainfo
- DB_metaInfo_t *prev = NULL;
- DB_metaInfo_t *meta = it->meta;
- while (meta) {
- DB_metaInfo_t *m = malloc (sizeof (DB_metaInfo_t));
- memset (m, 0, sizeof (DB_metaInfo_t));
- m->key = metacache_add_string (meta->key);
- m->value = metacache_add_string (meta->value);
- m->next = NULL;
- if (prev) {
- prev->next = m;
- }
- else {
- out->meta = m;
- }
- prev = m;
- meta = meta->next;
- }
- UNLOCK;
-}
-
-playItem_t *
-pl_item_alloc (void) {
- playItem_t *it = malloc (sizeof (playItem_t));
- memset (it, 0, sizeof (playItem_t));
- it->_duration = -1;
- it->_refc = 1;
- return it;
-}
-
-playItem_t *
-pl_item_alloc_init (const char *fname, const char *decoder_id) {
- playItem_t *it = pl_item_alloc ();
- pl_add_meta (it, ":URI", fname);
- pl_add_meta (it, ":DECODER", decoder_id);
- return it;
-}
-
-void
-pl_item_ref (playItem_t *it) {
- LOCK;
- it->_refc++;
- //fprintf (stderr, "\0330;34m+it %p: refc=%d: %s\03337;0m\n", it, it->_refc, pl_find_meta_raw (it, ":URI"));
- UNLOCK;
-}
-
-static void
-pl_item_free (playItem_t *it) {
- LOCK;
- if (it) {
- while (it->meta) {
- DB_metaInfo_t *m = it->meta;
- it->meta = m->next;
- metacache_remove_string (m->key);
- metacache_remove_string (m->value);
- free (m);
- }
- free (it);
- }
- UNLOCK;
-}
-
-void
-pl_item_unref (playItem_t *it) {
- LOCK;
- it->_refc--;
- //trace ("\0330;31m-it %p: refc=%d: %s\03337;0m\n", it, it->_refc, pl_find_meta_raw (it, ":URI"));
- if (it->_refc < 0) {
- trace ("\0330;31mplaylist: bad refcount on item %p\03337;0m\n", it);
- }
- if (it->_refc <= 0) {
- //printf ("\0330;31mdeleted %s\03337;0m\n", pl_find_meta_raw (it, ":URI"));
- pl_item_free (it);
- }
- UNLOCK;
-}
-
-int
-plt_delete_selected (playlist_t *playlist) {
- LOCK;
- int i = 0;
- int ret = -1;
- playItem_t *next = NULL;
- for (playItem_t *it = playlist->headPL_MAIN; it; it = next, i++) {
- next = it->nextPL_MAIN;
- if (it->selected) {
- if (ret == -1) {
- ret = i;
- }
- plt_remove_item (playlist, it);
- }
- }
- if (playlist->current_rowPL_MAIN >= playlist->countPL_MAIN) {
- playlist->current_rowPL_MAIN = playlist->countPL_MAIN - 1;
- }
- if (playlist->current_rowPL_SEARCH >= playlist->countPL_SEARCH) {
- playlist->current_rowPL_SEARCH = playlist->countPL_SEARCH - 1;
- }
- UNLOCK;
- return ret;
-}
-
-int
-pl_delete_selected (void) {
- LOCK;
- int ret = plt_delete_selected (playlist);
- UNLOCK;
- return ret;
-}
-
-void
-plt_crop_selected (playlist_t *playlist) {
- LOCK;
- playItem_t *next = NULL;
- for (playItem_t *it = playlist->headPL_MAIN; it; it = next) {
- next = it->nextPL_MAIN;
- if (!it->selected) {
- plt_remove_item (playlist, it);
- }
- }
- UNLOCK;
-}
-
-void
-pl_crop_selected (void) {
- LOCK;
- plt_crop_selected (playlist);
- UNLOCK;
-}
-
-int
-plt_save (playlist_t *plt, playItem_t *first, playItem_t *last, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
- LOCK;
- plt->last_save_modification_idx = plt->last_save_modification_idx;
- const char *ext = strrchr (fname, '.');
- if (ext) {
- DB_playlist_t **plug = deadbeef->plug_get_playlist_list ();
- for (int i = 0; plugi; i++) {
- if (plugi->extensions && plugi->load) {
- const char **exts = plugi->extensions;
- if (exts && plugi->save) {
- for (int e = 0; extse; e++) {
- if (!strcasecmp (extse, ext+1)) {
- int res = plugi->save ((ddb_playlist_t *)plt, fname, (DB_playItem_t *)playlist->headPL_MAIN, NULL);
- UNLOCK;
- return res;
- }
- }
- }
- }
- }
- }
-
- char tempfilePATH_MAX;
- snprintf (tempfile, sizeof (tempfile), "%s.tmp", fname);
- const char magic = "DBPL";
- uint8_t majorver = PLAYLIST_MAJOR_VER;
- uint8_t minorver = PLAYLIST_MINOR_VER;
- FILE *fp = fopen (tempfile, "w+b");
- if (!fp) {
- UNLOCK;
- return -1;
- }
- if (fwrite (magic, 1, 4, fp) != 4) {
- goto save_fail;
- }
- if (fwrite (&majorver, 1, 1, fp) != 1) {
- goto save_fail;
- }
- if (fwrite (&minorver, 1, 1, fp) != 1) {
- goto save_fail;
- }
- uint32_t cnt = plt->countPL_MAIN;
- if (fwrite (&cnt, 1, 4, fp) != 4) {
- goto save_fail;
- }
- for (playItem_t *it = plt->headPL_MAIN; it; it = it->nextPL_MAIN) {
- uint16_t l;
- uint8_t ll;
- if (cb) {
- cb(it, user_data);
- }
-#if (PLAYLIST_MINOR_VER==2)
- const char *fname = pl_find_meta_raw (it, ":URI");
- l = strlen (fname);
- if (fwrite (&l, 1, 2, fp) != 2) {
- goto save_fail;
- }
- if (fwrite (fname, 1, l, fp) != l) {
- goto save_fail;
- }
- const char *decoder_id = pl_find_meta_raw (it, ":DECODER");
- if (decoder_id) {
- ll = strlen (decoder_id);
- if (fwrite (&ll, 1, 1, fp) != 1) {
- goto save_fail;
- }
- if (fwrite (decoder_id, 1, ll, fp) != ll) {
- goto save_fail;
- }
- }
- else
- {
- ll = 0;
- if (fwrite (&ll, 1, 1, fp) != 1) {
- goto save_fail;
- }
- }
- l = pl_find_meta_int (it, ":TRACKNUM", 0);
- if (fwrite (&l, 1, 2, fp) != 2) {
- goto save_fail;
- }
-#endif
- if (fwrite (&it->startsample, 1, 4, fp) != 4) {
- goto save_fail;
- }
- if (fwrite (&it->endsample, 1, 4, fp) != 4) {
- goto save_fail;
- }
- if (fwrite (&it->_duration, 1, 4, fp) != 4) {
- goto save_fail;
- }
-#if (PLAYLIST_MINOR_VER==2)
- const char *filetype = pl_find_meta_raw (it, ":FILETYPE");
- if (!filetype) {
- filetype = "";
- }
- uint8_t ft = strlen (filetype);
- if (fwrite (&ft, 1, 1, fp) != 1) {
- goto save_fail;
- }
- if (ft) {
- if (fwrite (filetype, 1, ft, fp) != ft) {
- goto save_fail;
- }
- }
- float rg_albumgain = pl_get_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN);
- float rg_albumpeak = pl_get_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK);
- float rg_trackgain = pl_get_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN);
- float rg_trackpeak = pl_get_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK);
- if (fwrite (&rg_albumgain, 1, 4, fp) != 4) {
- goto save_fail;
- }
- if (fwrite (&rg_albumpeak, 1, 4, fp) != 4) {
- goto save_fail;
- }
- if (fwrite (&rg_trackgain, 1, 4, fp) != 4) {
- goto save_fail;
- }
- if (fwrite (&rg_trackpeak, 1, 4, fp) != 4) {
- goto save_fail;
- }
-#endif
- if (fwrite (&it->_flags, 1, 4, fp) != 4) {
- goto save_fail;
- }
-
- int16_t nm = 0;
- DB_metaInfo_t *m;
- for (m = it->meta; m; m = m->next) {
- if (m->key0 == '_' || m->key0 == '!') {
- continue; // skip reserved names
- }
- nm++;
- }
- if (fwrite (&nm, 1, 2, fp) != 2) {
- goto save_fail;
- }
- for (m = it->meta; m; m = m->next) {
- if (m->key0 == '_' || m->key0 == '!') {
- continue; // skip reserved names
- }
-
- l = strlen (m->key);
- if (fwrite (&l, 1, 2, fp) != 2) {
- goto save_fail;
- }
- if (l) {
- if (fwrite (m->key, 1, l, fp) != l) {
- goto save_fail;
- }
- }
- l = strlen (m->value);
- if (fwrite (&l, 1, 2, fp) != 2) {
- goto save_fail;
- }
- if (l) {
- if (fwrite (m->value, 1, l, fp) != l) {
- goto save_fail;
- }
- }
- }
- }
-
- // write playlist metadata
- int16_t nm = 0;
- DB_metaInfo_t *m;
- for (m = plt->meta; m; m = m->next) {
- nm++;
- }
- if (fwrite (&nm, 1, 2, fp) != 2) {
- goto save_fail;
- }
-
- for (m = plt->meta; m; m = m->next) {
- uint16_t l;
- l = strlen (m->key);
- if (fwrite (&l, 1, 2, fp) != 2) {
- goto save_fail;
- }
- if (l) {
- if (fwrite (m->key, 1, l, fp) != l) {
- goto save_fail;
- }
- }
- l = strlen (m->value);
- if (fwrite (&l, 1, 2, fp) != 2) {
- goto save_fail;
- }
- if (l) {
- if (fwrite (m->value, 1, l, fp) != l) {
- goto save_fail;
- }
- }
- }
-
- UNLOCK;
- fclose (fp);
- if (rename (tempfile, fname) != 0) {
- fprintf (stderr, "playlist rename %s -> %s failed: %s\n", tempfile, fname, strerror (errno));
- return -1;
- }
- return 0;
-save_fail:
- UNLOCK;
- fclose (fp);
- unlink (tempfile);
- return -1;
-}
-
-int
-plt_save_n (int n) {
- char pathPATH_MAX;
- if (snprintf (path, sizeof (path), "%s/playlists", dbconfdir) > sizeof (path)) {
- fprintf (stderr, "error: failed to make path string for playlists folder\n");
- return -1;
- }
- // make folder
- mkdir (path, 0755);
-
- LOCK;
- int err = 0;
-
- plt_loading = 1;
- if (snprintf (path, sizeof (path), "%s/playlists/%d.dbpl", dbconfdir, n) > sizeof (path)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- UNLOCK;
- return -1;
- }
-
- int i;
- playlist_t *plt;
- for (i = 0, plt = playlists_head; plt && i < n; i++, plt = plt->next);
- err = plt_save (plt, NULL, NULL, path, NULL, NULL, NULL);
- plt_loading = 0;
- UNLOCK;
- return err;
-}
-
-int
-pl_save_current (void) {
- return plt_save_n (plt_get_curr_idx ());
-}
-
-int
-pl_save_all (void) {
- trace ("pl_save_all\n");
- char pathPATH_MAX;
- if (snprintf (path, sizeof (path), "%s/playlists", dbconfdir) > sizeof (path)) {
- fprintf (stderr, "error: failed to make path string for playlists folder\n");
- return -1;
- }
- // make folder
- mkdir (path, 0755);
-
- LOCK;
- playlist_t *p = playlists_head;
- int i;
- int cnt = plt_get_count ();
- int curr = plt_get_curr_idx ();
- int err = 0;
-
- plt_gen_conf ();
- plt_loading = 1;
- for (i = 0; i < cnt; i++, p = p->next) {
- if (snprintf (path, sizeof (path), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path)) {
- fprintf (stderr, "error: failed to make path string for playlist file\n");
- err = -1;
- break;
- }
- if (p->last_save_modification_idx == p->modification_idx) {
- continue;
- }
- err = plt_save (p, NULL, NULL, path, NULL, NULL, NULL);
- if (err < 0) {
- break;
- }
- }
- plt_loading = 0;
- UNLOCK;
- return err;
-}
-
-static playItem_t *
-plt_load_int (int visibility, playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
- // 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;
- for (p = 0; plugp; p++) {
- for (e = 0; plugp->extensionse; e++) {
- if (plugp->load && !strcasecmp (ext, plugp->extensionse)) {
- DB_playItem_t *it = NULL;
- if (cb || (plugp->load && !plugp->load2)) {
- it = plugp->load ((ddb_playlist_t *)plt, (DB_playItem_t *)after, fname, pabort, (int (*)(DB_playItem_t *, void *))cb, user_data);
- }
- else if (plugp->load2) {
- plugp->load2 (visibility, (ddb_playlist_t *)plt, (DB_playItem_t *)after, fname, pabort);
- }
- return (playItem_t *)it;
- }
- }
- }
- }
- trace ("plt_load: loading dbpl\n");
- FILE *fp = fopen (fname, "rb");
- if (!fp) {
- trace ("plt_load: failed to open %s\n", fname);
- return NULL;
- }
-
- playItem_t *last_added = NULL;
-
- uint8_t majorver;
- uint8_t minorver;
- playItem_t *it = NULL;
- char magic4;
- if (fread (magic, 1, 4, fp) != 4) {
- trace ("failed to read magic\n");
- goto load_fail;
- }
- if (strncmp (magic, "DBPL", 4)) {
- trace ("bad signature\n");
- goto load_fail;
- }
- if (fread (&majorver, 1, 1, fp) != 1) {
- goto load_fail;
- }
- if (majorver != PLAYLIST_MAJOR_VER) {
- trace ("bad majorver=%d\n", majorver);
- goto load_fail;
- }
- if (fread (&minorver, 1, 1, fp) != 1) {
- goto load_fail;
- }
- if (minorver < 1) {
- trace ("bad minorver=%d\n", minorver);
- goto load_fail;
- }
- trace ("playlist version=%d.%d\n", majorver, minorver);
- uint32_t cnt;
- if (fread (&cnt, 1, 4, fp) != 4) {
- goto load_fail;
- }
-
- for (uint32_t i = 0; i < cnt; i++) {
- it = pl_item_alloc ();
- if (!it) {
- goto load_fail;
- }
- uint16_t l;
- int16_t tracknum = 0;
- if (minorver <= 2) {
- // fname
- if (fread (&l, 1, 2, fp) != 2) {
- goto load_fail;
- }
- char fnamel+1;
- if (fread (fname, 1, l, fp) != l) {
- goto load_fail;
- }
- fnamel = 0;
- pl_add_meta (it, ":URI", fname);
- // decoder
- uint8_t ll;
- if (fread (&ll, 1, 1, fp) != 1) {
- goto load_fail;
- }
- if (ll >= 20) {
- goto load_fail;
- }
- char decoder_id20 = "";
- if (ll) {
- if (fread (decoder_id, 1, ll, fp) != ll) {
- goto load_fail;
- }
- decoder_idll = 0;
- pl_add_meta (it, ":DECODER", decoder_id);
- }
- // tracknum
- if (fread (&tracknum, 1, 2, fp) != 2) {
- goto load_fail;
- }
- pl_set_meta_int (it, ":TRACKNUM", tracknum);
- }
- // startsample
- if (fread (&it->startsample, 1, 4, fp) != 4) {
- goto load_fail;
- }
- // endsample
- if (fread (&it->endsample, 1, 4, fp) != 4) {
- goto load_fail;
- }
- // duration
- if (fread (&it->_duration, 1, 4, fp) != 4) {
- goto load_fail;
- }
- char s100;
- pl_format_time (it->_duration, s, sizeof(s));
- pl_replace_meta (it, ":DURATION", s);
-
- if (minorver <= 2) {
- // legacy filetype support
- uint8_t ft;
- if (fread (&ft, 1, 1, fp) != 1) {
- goto load_fail;
- }
- if (ft) {
- char ftypeft+1;
- if (fread (ftype, 1, ft, fp) != ft) {
- goto load_fail;
- }
- ftypeft = 0;
- pl_replace_meta (it, ":FILETYPE", ftype);
- }
- 
- float f;
-
- if (fread (&f, 1, 4, fp) != 4) {
- goto load_fail;
- }
- if (f != 0) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, f);
- }
-
- if (fread (&f, 1, 4, fp) != 4) {
- goto load_fail;
- }
- if (f == 0) {
- f = 1;
- }
- if (f != 1) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, f);
- }
-
- if (fread (&f, 1, 4, fp) != 4) {
- goto load_fail;
- }
- if (f != 0) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, f);
- }
-
- if (fread (&f, 1, 4, fp) != 4) {
- goto load_fail;
- }
- if (f == 0) {
- f = 1;
- }
- if (f != 1) {
- pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, f);
- }
- }
-
- uint32_t flg = 0;
- if (minorver >= 2) {
- if (fread (&flg, 1, 4, fp) != 4) {
- goto load_fail;
- }
- }
- else {
- if (it->startsample > 0 || it->endsample > 0 || tracknum > 0) {
- flg |= DDB_IS_SUBTRACK;
- }
- }
- pl_set_item_flags (it, flg);
-
- int16_t nm = 0;
- if (fread (&nm, 1, 2, fp) != 2) {
- goto load_fail;
- }
- for (int i = 0; i < nm; i++) {
- if (fread (&l, 1, 2, fp) != 2) {
- goto load_fail;
- }
- if (l >= 20000) {
- goto load_fail;
- }
- char keyl+1;
- if (fread (key, 1, l, fp) != l) {
- goto load_fail;
- }
- keyl = 0;
- if (fread (&l, 1, 2, fp) != 2) {
- goto load_fail;
- }
- if (l >= 20000) {
- // skip
- fseek (fp, l, SEEK_CUR);
- }
- else {
- char valuel+1;
- int res = fread (value, 1, l, fp);
- if (res != l) {
- trace ("read error: requested %d, got %d\n", l, res);
- goto load_fail;
- }
- valuel = 0;
- if (key0 == ':') {
- // to avoid storage conflicts -- give more priority to metadata
- pl_replace_meta (it, key, value);
- }
- else {
- pl_add_meta (it, key, value);
- }
- }
- }
- plt_insert_item (plt, plt->tailPL_MAIN, it);
- if (last_added) {
- pl_item_unref (last_added);
- }
- last_added = it;
- }
-
- // load playlist metadata
- int16_t nm = 0;
- // for backwards format compatibility, don't fail if metadata is not found
- if (fread (&nm, 1, 2, fp) == 2) {
- for (int i = 0; i < nm; i++) {
- int16_t l;
- if (fread (&l, 1, 2, fp) != 2) {
- goto load_fail;
- }
- if (l < 0 || l >= 20000) {
- goto load_fail;
- }
- char keyl+1;
- if (fread (key, 1, l, fp) != l) {
- goto load_fail;
- }
- keyl = 0;
- if (fread (&l, 1, 2, fp) != 2) {
- goto load_fail;
- }
- if (l<0 || l >= 20000) {
- // skip
- fseek (fp, l, SEEK_CUR);
- }
- else {
- char valuel+1;
- int res = fread (value, 1, l, fp);
- if (res != l) {
- trace ("read error: requested %d, got %d\n", l, res);
- goto load_fail;
- }
- valuel = 0;
- plt_add_meta (plt, key, value);
- }
- }
- }
-
- if (fp) {
- fclose (fp);
- }
- trace ("plt_load: success\n");
- if (last_added) {
- pl_item_unref (last_added);
- }
- return last_added;
-load_fail:
- plt_clear (plt);
- fprintf (stderr, "playlist load fail (%s)!\n", fname);
- if (fp) {
- fclose (fp);
- }
- if (last_added) {
- pl_item_unref (last_added);
- }
- return last_added;
-}
-
-
-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) {
- return plt_load_int (0, plt, after, fname, pabort, cb, user_data);
-}
-
-int
-pl_load_all (void) {
- int i = 0;
- int err = 0;
- char path1024;
- DB_conf_item_t *it = conf_find ("playlist.tab.", NULL);
- if (!it) {
- // legacy (0.3.3 and earlier)
- char defpl1024; // $HOME/.config/deadbeef/default.dbpl
- if (snprintf (defpl, sizeof (defpl), "%s/default.dbpl", dbconfdir) > sizeof (defpl)) {
- fprintf (stderr, "error: cannot make string with default playlist path\n");
- return -1;
- }
- if (plt_add (plt_get_count (), _("Default")) < 0) {
- return -1;
- }
-
- playlist_t *plt = plt_get_for_idx (0);
- playItem_t *it = plt_load (plt, NULL, defpl, NULL, NULL, NULL);
- plt_unref (plt);
- return 0;
- }
- trace ("pl_load_all started\n");
- LOCK;
- trace ("locked\n");
- plt_loading = 1;
- while (it) {
- fprintf (stderr, "INFO: loading playlist %s\n", it->value);
- if (!err) {
- if (plt_add (plt_get_count (), it->value) < 0) {
- return -1;
- }
- plt_set_curr_idx (plt_get_count () - 1);
- }
- err = 0;
- if (snprintf (path, sizeof (path), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path)) {
- fprintf (stderr, "error: failed to make path string for playlist filename\n");
- err = -1;
- }
- else {
- fprintf (stderr, "INFO: from file %s\n", path);
-
- playlist_t *plt = plt_get_curr ();
- playItem_t *trk = plt_load (plt, NULL, path, NULL, NULL, NULL);
- char conf100;
- snprintf (conf, sizeof (conf), "playlist.cursor.%d", i);
- plt->current_rowPL_MAIN = deadbeef->conf_get_int (conf, -1);
- snprintf (conf, sizeof (conf), "playlist.scroll.%d", i);
- plt->scroll = deadbeef->conf_get_int (conf, 0);
- plt->last_save_modification_idx = plt->modification_idx = 0;
- plt_unref (plt);
-
- if (!it) {
- fprintf (stderr, "WARNING: there were errors while loading playlist '%s' (%s)\n", it->value, path);
- }
- }
- it = conf_find ("playlist.tab.", it);
- trace ("conf_find returned %p (%s)\n", it, it ? it->value : "null");
- i++;
- }
- plt_set_curr (0);
- plt_loading = 0;
- plt_gen_conf ();
- messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
- UNLOCK;
- trace ("pl_load_all finished\n");
- return err;
-}
-
-void
-plt_select_all (playlist_t *playlist) {
- LOCK;
- for (playItem_t *it = playlist->headPL_MAIN; it; it = it->nextPL_MAIN) {
- it->selected = 1;
- }
- UNLOCK;
-}
-
-void
-pl_select_all (void) {
- LOCK;
- plt_select_all (playlist);
- UNLOCK;
-}
-
-void
-plt_reshuffle (playlist_t *playlist, playItem_t **ppmin, playItem_t **ppmax) {
- LOCK;
- 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->headPL_MAIN; it; it = it->nextPL_MAIN) {
- 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;
- }
- if (!pmax || it->shufflerating > pmax->shufflerating) {
- pmax = it;
- }
- it->played = 0;
- }
- if (ppmin) {
- *ppmin = pmin;
- }
- if (ppmax) {
- *ppmax = pmax;
- }
- UNLOCK;
-}
-
-void
-plt_set_item_duration (playlist_t *playlist, playItem_t *it, float duration) {
- LOCK;
- if (it->in_playlist && playlist) {
- if (it->_duration > 0) {
- playlist->totaltime -= it->_duration;
- }
- if (duration > 0) {
- playlist->totaltime += duration;
- }
- if (playlist->totaltime < 0) {
- playlist->totaltime = 0;
- }
- }
- it->_duration = duration;
- char s100;
- pl_format_time (it->_duration, s, sizeof(s));
- pl_replace_meta (it, ":DURATION", s);
- UNLOCK;
-}
-
-float
-pl_get_item_duration (playItem_t *it) {
- return it->_duration;
-}
-
-static const char *rg_keys = {
- ":REPLAYGAIN_ALBUMGAIN",
- ":REPLAYGAIN_ALBUMPEAK",
- ":REPLAYGAIN_TRACKGAIN",
- ":REPLAYGAIN_TRACKPEAK"
-};
-
-void
-pl_set_item_replaygain (playItem_t *it, int idx, float value) {
- char s100;
- switch (idx) {
- case DDB_REPLAYGAIN_ALBUMGAIN:
- case DDB_REPLAYGAIN_TRACKGAIN:
- snprintf (s, sizeof (s), "%0.2f dB", value);
- break;
- case DDB_REPLAYGAIN_ALBUMPEAK:
- case DDB_REPLAYGAIN_TRACKPEAK:
- snprintf (s, sizeof (s), "%0.6f", value);
- break;
- default:
- return;
- }
- pl_replace_meta (it, rg_keysidx, s);
-}
-
-float
-pl_get_item_replaygain (playItem_t *it, int idx) {
- if (idx < 0 || idx > DDB_REPLAYGAIN_TRACKPEAK) {
- return 0;
- }
- 
- switch (idx) {
- case DDB_REPLAYGAIN_ALBUMGAIN:
- case DDB_REPLAYGAIN_TRACKGAIN:
- return pl_find_meta_float (it, rg_keysidx, 0);
- case DDB_REPLAYGAIN_ALBUMPEAK:
- case DDB_REPLAYGAIN_TRACKPEAK:
- return pl_find_meta_float (it, rg_keysidx, 1);
- }
- return 0;
-}
-
-int
-pl_format_item_queue (playItem_t *it, char *s, int size) {
- LOCK;
- *s = 0;
- int initsize = size;
- const char *val = pl_find_meta_raw (it, "_playing");
- while (val && *val) {
- while (*val && *val != '=') {
- val++;
- }
- if (*val == '=') {
- // found value
- val++;
- if (!(*val)) {
- break;
- }
- const char *e = NULL;
- if (*val == '"') {
- val++;
- e = val;
- while (*e && *e != '"') {
- e++;
- }
- }
- else {
- e = val;
- while (*e && *e != ' ') {
- e++;
- }
- }
- int n = e - val;
- if (n > size-1) {
- n = size-1;
- }
- strncpy (s, val, n);
- s += n;
- *s++ = ' ';
- *s = 0;
- size -= n+1;
- val = e;
- if (*val) {
- val++;
- }
- while (*val && *val == ' ') {
- val++;
- }
- }
- }
-
- if (!playqueue_count) {
- UNLOCK;
- return 0;
- }
-
- int qinitsize = size;
- int init = 1;
- int len;
- for (int i = 0; i < playqueue_count; i++) {
- if (size <= 0) {
- break;
- }
- if (playqueuei == it) {
- if (init) {
- init = 0;
- s0 = '(';
- s++;
- size--;
- len = snprintf (s, size, "%d", i+1);
- }
- else {
- len = snprintf (s, size, ",%d", i+1);
- }
- s += len;
- size -= len;
- }
- }
- if (size != qinitsize && size > 0) {
- len = snprintf (s, size, ")");
- s += len;
- size -= len;
- }
- UNLOCK;
- return initsize-size;
-}
-
-void
-pl_format_time (float t, char *dur, int size) {
- if (t >= 0) {
- int hourdur = t / (60 * 60);
- int mindur = (t - hourdur * 60 * 60) / 60;
- int secdur = t - hourdur*60*60 - mindur * 60;
-
- if (hourdur) {
- snprintf (dur, size, "%d:%02d:%02d", hourdur, mindur, secdur);
- }
- else {
- snprintf (dur, size, "%d:%02d", mindur, secdur);
- }
- }
- else {
- strcpy (dur, "∞");
- }
-}
-
-static const char *
-pl_format_duration (playItem_t *it, const char *ret, char *dur, int size) {
- if (ret) {
- return ret;
- }
- pl_format_time (pl_get_item_duration (it), dur, size);
- return dur;
-}
-
-static const char *
-pl_format_elapsed (const char *ret, char *elapsed, int size) {
- if (ret) {
- return ret;
- }
- float playpos = streamer_get_playpos ();
- pl_format_time (playpos, elapsed, size);
- return elapsed;
-}
-
-// this function allows to escape special chars substituted for conversions
-// @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 tmp50;
- char tags200;
- char dirnamePATH_MAX;
- const char *duration = NULL;
- const char *elapsed = NULL;
- int escape_slash = 0;
-
- char *ss = s;
-
- LOCK;
- if (id != -1 && it) {
- const char *text = NULL;
- switch (id) {
- case DB_COLUMN_FILENUMBER:
- if (idx == -1) {
- idx = pl_get_idx_of (it);
- }
- snprintf (tmp, sizeof (tmp), "%d", idx+1);
- text = tmp;
- break;
- case DB_COLUMN_PLAYING:
- UNLOCK;
- return pl_format_item_queue (it, s, size);
- }
- if (text) {
- strncpy (s, text, size);
- UNLOCK;
- for (ss = s; *ss; ss++) {
- if (*ss == '\n') {
- *ss = ';';
- }
- }
- return strlen (s);
- }
- else {
- s0 = 0;
- }
- UNLOCK;
- return 0;
- }
- int n = size-1;
- while (*fmt && n > 0) {
- if (*fmt != '%') {
- *s++ = *fmt;
- n--;
- }
- else {
- fmt++;
- const char *meta = NULL;
- if (*fmt == 0) {
- break;
- }
- else if (!it && *fmt != 'V') {
- // only %V (version) works without track pointer
- }
- else if (*fmt == '@') {
- const char *e = fmt;
- e++;
- while (*e && *e != '@') {
- e++;
- }
- if (*e == '@') {
- char nm100;
- int l = e-fmt-1;
- l = min (l, sizeof (nm)-1);
- strncpy (nm, fmt+1, l);
- nml = 0;
- meta = pl_find_meta_raw (it, nm);
- if (!meta) {
- meta = "";
- }
- fmt = e;
- }
- }
- else if (*fmt == '/') {
- // this means all '/' in the ongoing fields must be replaced with '\'
- escape_slash = 1;
- }
- else if (*fmt == 'a') {
- meta = pl_find_meta_raw (it, "artist");
-#ifndef DISABLE_CUSTOM_TITLE
- const char *custom = pl_find_meta_raw (it, ":CUSTOM_TITLE");
-#endif
- if (!meta
-#ifndef DISABLE_CUSTOM_TITLE
- && !custom
-#endif
- ) {
- meta = "Unknown artist";
- }
-
-#ifndef DISABLE_CUSTOM_TITLE
- if (custom) {
- if (!meta) {
- meta = custom;
- }
- else {
- int l = strlen (custom) + strlen (meta) + 4;
- char *out = alloca (l);
- snprintf (out, l, "%s %s", custom, meta);
- meta = out;
- }
- }
-#endif
- }
- else if (*fmt == 't') {
- meta = pl_find_meta_raw (it, "title");
- if (!meta) {
- const char *f = pl_find_meta_raw (it, ":URI");
- if (f) {
- const char *start = strrchr (f, '/');
- if (start) {
- start++;
- }
- else {
- start = f;
- }
- const char *end = strrchr (start, '.');
- if (end) {
- int n = end-start;
- n = min (end-start, sizeof (dirname)-1);
- strncpy (dirname, start, n);
- dirnamen = 0;
- meta = dirname;
- }
- else {
- meta = "";
- }
- }
- else {
- meta = "";
- }
- }
- }
- else if (*fmt == 'b') {
- meta = pl_find_meta_raw (it, "album");
- if (!meta) {
- meta = "Unknown album";
- }
- }
- else if (*fmt == 'B') {
- meta = pl_find_meta_raw (it, "band");
- if (!meta) {
- meta = pl_find_meta_raw (it, "album artist");
- if (!meta) {
- meta = pl_find_meta_raw (it, "albumartist");
- if (!meta) {
- meta = pl_find_meta_raw (it, "artist");
- }
- }
- }
-
-#ifndef DISABLE_CUSTOM_TITLE
- const char *custom = pl_find_meta_raw (it, ":CUSTOM_TITLE");
- if (custom) {
- if (!meta) {
- meta = custom;
- }
- else {
- int l = strlen (custom) + strlen (meta) + 4;
- char *out = alloca (l);
- snprintf (out, l, "%s %s", custom, meta);
- meta = out;
- }
- }
-#endif
- }
- else if (*fmt == 'C') {
- meta = pl_find_meta_raw (it, "composer");
- }
- else if (*fmt == 'n') {
- meta = pl_find_meta_raw (it, "track");
- if (meta) {
- // check if it's numbers only
- const char *p = meta;
- while (*p) {
- if (!isdigit (*p)) {
- break;
- }
- p++;
- }
- if (!(*p)) {
- snprintf (tmp, sizeof (tmp), "%02d", atoi (meta));
- meta = tmp;
- }
- }
- }
- else if (*fmt == 'N') {
- meta = pl_find_meta_raw (it, "numtracks");
- }
- else if (*fmt == 'y') {
- meta = pl_find_meta_raw (it, "year");
- }
- else if (*fmt == 'g') {
- meta = pl_find_meta_raw (it, "genre");
- }
- else if (*fmt == 'c') {
- meta = pl_find_meta_raw (it, "comment");
- }
- else if (*fmt == 'r') {
- meta = pl_find_meta_raw (it, "copyright");
- }
- else if (*fmt == 'l') {
- const char *value = (duration = pl_format_duration (it, duration, tmp, sizeof (tmp)));
- while (n > 0 && *value) {
- *s++ = *value++;
- n--;
- }
- }
- else if (*fmt == 'e') {
- // what a hack..
- 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_raw (it, ":URI");
- meta = strrchr (f, '/');
- if (meta) {
- meta++;
- }
- else {
- meta = f;
- }
- }
- else if (*fmt == 'F') {
- meta = pl_find_meta_raw (it, ":URI");
- }
- else if (*fmt == 'T') {
- char *t = tags;
- char *e = tags + sizeof (tags);
- int c;
- *t = 0;
-
- if (it->_flags & DDB_TAG_ID3V1) {
- c = snprintf (t, e-t, "ID3v1 | ");
- t += c;
- }
- if (it->_flags & DDB_TAG_ID3V22) {
- c = snprintf (t, e-t, "ID3v2.2 | ");
- t += c;
- }
- if (it->_flags & DDB_TAG_ID3V23) {
- c = snprintf (t, e-t, "ID3v2.3 | ");
- t += c;
- }
- if (it->_flags & DDB_TAG_ID3V24) {
- c = snprintf (t, e-t, "ID3v2.4 | ");
- t += c;
- }
- if (it->_flags & DDB_TAG_APEV2) {
- c = snprintf (t, e-t, "APEv2 | ");
- t += c;
- }
- if (it->_flags & DDB_TAG_VORBISCOMMENTS) {
- c = snprintf (t, e-t, "VorbisComments | ");
- t += c;
- }
- if (it->_flags & DDB_TAG_CUESHEET) {
- c = snprintf (t, e-t, "CueSheet | ");
- t += c;
- }
- if (it->_flags & DDB_TAG_ICY) {
- c = snprintf (t, e-t, "Icy | ");
- t += c;
- }
- if (it->_flags & DDB_TAG_ITUNES) {
- c = snprintf (t, e-t, "iTunes | ");
- t += c;
- }
- if (t != tags) {
- *(t - 3) = 0;
- }
- meta = tags;
- }
- else if (*fmt == 'd') {
- // directory
- 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)
- }
- else {
- const char *start = end;
- start--;
- while (start > f && (*start != '/')) {
- start--;
- }
-
- if (*start == '/') {
- start++;
- }
-
- // copy
- int len = end-start;
- len = min (len, sizeof (dirname)-1);
- strncpy (dirname, start, len);
- dirnamelen = 0;
- meta = dirname;
- }
- }
- else if (*fmt == 'D') {
- const char *f = pl_find_meta_raw (it, ":URI");
- // directory with path
- const char *end = strrchr (f, '/');
- if (!end) {
- meta = ""; // got relative path without folder (should not happen)
- }
- else {
- // copy
- int len = end - f;
- len = min (len, sizeof (dirname)-1);
- strncpy (dirname, f, len);
- dirnamelen = 0;
- meta = dirname;
- }
- }
- else if (*fmt == 'L') {
- float l = 0;
- for (playItem_t *it = playlist->headPL_MAIN; it; it = it->nextPL_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->headPL_MAIN; it; it = it->nextPL_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) {
- 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;
- }
- else {
- *s++ = *fmt;
- n--;
- }
-
- if (meta) {
- const char *value = meta;
- if (escape_chars) {
- // need space for at least 2 single-quotes
- if (n < 2) {
- goto error;
- }
- *s++ = '\'';
- n--;
- while (n > 2 && *value) {
- const char *e = escape_chars;
- if (strchr (escape_chars, *value)) {
- *s++ = '\\';
- n--;
- *s++ = *value++;
- n--;
- }
- else if (escape_slash && *value == '/') {
- *s++ = '\\';
- n--;
- *s++ = '\\';
- n--;
- break;
- }
- else {
- *s++ = *value++;
- }
- }
- if (n < 1) {
- fprintf (stderr, "pl_format_title_int: got unpredicted state while formatting escaped string. please report a bug.\n");
- *ss = 0; // should never happen
- return -1; 
- }
- *s++ = '\'';
- n--;
- }
- else {
- while (n > 0 && *value) {
- if (escape_slash && *value == '/') {
- *s++ = '\\';
- n--;
- value++;
- }
- else {
- *s++ = *value++;
- n--;
- }
- }
- }
- }
- }
- fmt++;
- }
-error:
- *s = 0;
- UNLOCK;
-
- // replace all \n with ;
- while (*ss) {
- if (*ss == '\n') {
- *ss = ';';
- }
- ss++;
- }
-
- return size - n - 1;
-}
-
-int
-pl_format_title (playItem_t *it, int idx, char *s, int size, int id, const char *fmt) {
- return pl_format_title_int (NULL, it, idx, s, size, id, fmt);
-}
-
-int
-pl_format_title_escaped (playItem_t *it, int idx, char *s, int size, int id, const char *fmt) {
- return pl_format_title_int ("'", it, idx, s, size, id, fmt);
-}
-
-static int pl_sort_is_duration;
-static int pl_sort_is_track;
-static int pl_sort_ascending;
-static int pl_sort_id;
-static const char *pl_sort_format;
-
-int
-strcasecmp_numeric (const char *a, const char *b) {
- if (isdigit (*a) && isdigit (*b)) {
- int anum = *a-'0';
- const char *ae = a+1;
- while (*ae && isdigit (*ae)) {
- anum *= 10;
- anum += *ae-'0';
- ae++;
- }
- int bnum = *b-'0';
- const char *be = b+1;
- while (*be && isdigit (*be)) {
- bnum *= 10;
- bnum += *be-'0';
- be++;
- }
- if (anum == bnum) {
- return u8_strcasecmp (ae, be);
- }
- return anum - bnum;
- }
- return u8_strcasecmp (a,b);
-}
-
-static int
-pl_sort_compare_str (playItem_t *a, playItem_t *b) {
- if (pl_sort_is_duration) {
- float dur_a = a->_duration * 100000;
- float dur_b = b->_duration * 100000;
- return !pl_sort_ascending ? dur_b - dur_a : dur_a - dur_b;
- }
- else if (pl_sort_is_track) {
- int t1;
- int t2;
- const char *t;
- t = pl_find_meta_raw (a, "track");
- if (t && !isdigit (*t)) {
- t1 = 999999;
- }
- else {
- t1 = t ? atoi (t) : -1;
- }
- t = pl_find_meta_raw (b, "track");
- if (t && !isdigit (*t)) {
- t2 = 999999;
- }
- else {
- t2 = t ? atoi (t) : -1;
- }
- return !pl_sort_ascending ? t2 - t1 : t1 - t2;
- }
- else {
- char tmp11024;
- char tmp21024;
- pl_format_title (a, -1, tmp1, sizeof (tmp1), pl_sort_id, pl_sort_format);
- pl_format_title (b, -1, tmp2, sizeof (tmp2), pl_sort_id, pl_sort_format);
- int res = strcasecmp_numeric (tmp1, tmp2);
- if (!pl_sort_ascending) {
- res = -res;
- }
- return res;
- }
-}
-
-static int
-qsort_cmp_func (const void *a, const void *b) {
- playItem_t *aa = *((playItem_t **)a);
- playItem_t *bb = *((playItem_t **)b);
- return pl_sort_compare_str (aa, bb);
-}
-
-void
-plt_sort (playlist_t *playlist, int iter, int id, const char *format, int order) {
- if (order == DDB_SORT_RANDOM) {
- plt_sort_random (playlist, iter);
- return;
- }
- int ascending = order == DDB_SORT_DESCENDING ? 0 : 1;
-
- if (id == DB_COLUMN_FILENUMBER || !playlist->headiter || !playlist->headiter->nextiter) {
- return;
- }
- LOCK;
- struct timeval tm1;
- gettimeofday (&tm1, NULL);
- pl_sort_ascending = ascending;
- trace ("ascending: %d\n", ascending);
- pl_sort_id = id;
- pl_sort_format = format;
- if (format && id == -1 && !strcmp (format, "%l")) {
- pl_sort_is_duration = 1;
- }
- else {
- pl_sort_is_duration = 0;
- }
- if (format && id == -1 && !strcmp (format, "%n")) {
- pl_sort_is_track = 1;
- }
- else {
- pl_sort_is_track = 0;
- }
-
- playItem_t **array = malloc (playlist->countiter * sizeof (playItem_t *));
- int idx = 0;
- for (playItem_t *it = playlist->headiter; it; it = it->nextiter, idx++) {
- arrayidx = it;
- }
- qsort (array, playlist->countiter, sizeof (playItem_t *), qsort_cmp_func);
- playItem_t *prev = NULL;
- playlist->headiter = 0;
- for (idx = 0; idx < playlist->countiter; idx++) {
- playItem_t *it = arrayidx;
- it->previter = prev;
- it->nextiter = NULL;
- if (!prev) {
- playlist->headiter = it;
- }
- else {
- prev->nextiter = it;
- }
- prev = it;
- }
-
- playlist->tailiter = arrayplaylist->countiter-1;
-
- free (array);
-
- struct timeval tm2;
- gettimeofday (&tm2, NULL);
- int ms = (tm2.tv_sec*1000+tm2.tv_usec/1000) - (tm1.tv_sec*1000+tm1.tv_usec/1000);
- trace ("sort time: %f seconds\n", ms / 1000.f);
-
- plt_modified (playlist);
-
- UNLOCK;
-}
-
-void
-plt_sort_random (playlist_t *playlist, int iter) {
- if (!playlist->headiter || !playlist->headiter->nextiter) {
- return;
- }
-
- LOCK;
-
- const int playlist_count = playlist->countiter;
- playItem_t **array = malloc (playlist_count * sizeof (playItem_t *));
- int idx = 0;
- for (playItem_t *it = playlist->headiter; it; it = it->nextiter, idx++) {
- arrayidx = it;
- }
-
- //randomize array
- for (int swap_a = 0; swap_a < playlist_count - 1; swap_a++) {
- //select random item above swap_a-1
- const int swap_b = swap_a + (rand() / (float)RAND_MAX * (playlist_count - swap_a));
-
- //swap a with b
- playItem_t* const swap_temp = arrayswap_a;
- arrayswap_a = arrayswap_b;
- arrayswap_b = swap_temp;
-
- }
-
- playItem_t *prev = NULL;
- playlist->headiter = 0;
- for (idx = 0; idx < playlist->countiter; idx++) {
- playItem_t *it = arrayidx;
- it->previter = prev;
- it->nextiter = NULL;
- if (!prev) {
- playlist->headiter = it;
- }
- else {
- prev->nextiter = it;
- }
- prev = it;
- }
- playlist->tailiter = arrayplaylist->countiter-1;
-
- free (array);
-
- plt_modified (playlist);
-
- UNLOCK;
-}
-
-void
-plt_reset_cursor (playlist_t *playlist) {
- int i;
- LOCK;
- for (i = 0; i < PL_MAX_ITERATORS; i++) {
- playlist->current_rowi = -1;
- }
- UNLOCK;
-}
-
-float
-plt_get_totaltime (playlist_t *playlist) {
- if (!playlist) {
- return 0;
- }
- return playlist->totaltime;
-}
-
-float
-pl_get_totaltime (void) {
- LOCK;
- float t = plt_get_totaltime (playlist);
- UNLOCK;
- return t;
-}
-
-void
-pl_set_selected (playItem_t *it, int sel) {
- LOCK;
- it->selected = sel;
- UNLOCK;
-}
-
-int
-pl_is_selected (playItem_t *it) {
- return it->selected;
-}
-
-playItem_t *
-plt_get_first (playlist_t *playlist, int iter) {
- if (!playlist) {
- return NULL;
- }
- playItem_t *p = playlist->headiter;
- if (p) {
- pl_item_ref (p);
- }
- return p;
-}
-
-playItem_t *
-pl_get_first (int iter) {
- LOCK;
- playItem_t *it = plt_get_first (playlist, iter);
- UNLOCK;
- return it;
-}
-
-playItem_t *
-plt_get_last (playlist_t *playlist, int iter) {
- playItem_t *p = playlist->tailiter;
- if (p) {
- pl_item_ref (p);
- }
- return p;
-}
-
-playItem_t *
-pl_get_last (int iter) {
- LOCK;
- playItem_t *it = plt_get_last (playlist, iter);
- UNLOCK;
- return it;
-}
-
-playItem_t *
-pl_get_next (playItem_t *it, int iter) {
- playItem_t *next = it ? it->nextiter : NULL;
- if (next) {
- pl_item_ref (next);
- }
- return next;
-}
-
-playItem_t *
-pl_get_prev (playItem_t *it, int iter) {
- playItem_t *prev = it ? it->previter : NULL;
- if (prev) {
- pl_item_ref (prev);
- }
- return prev;
-}
-
-int
-plt_get_cursor (playlist_t *playlist, int iter) {
- if (!playlist) {
- return -1;
- }
- return playlist->current_rowiter;
-}
-
-int
-pl_get_cursor (int iter) {
- LOCK;
- int c = plt_get_cursor (playlist, iter);
- UNLOCK;
- return c;
-}
-
-void
-plt_set_cursor (playlist_t *playlist, int iter, int cursor) {
- playlist->current_rowiter = cursor;
-}
-
-void
-pl_set_cursor (int iter, int cursor) {
- LOCK;
- plt_set_cursor (playlist, iter, cursor);
- UNLOCK;
-}
-
-// this function must move items in playlist
-// list of items is indexescount
-// drop_before is insertion point
-void
-plt_move_items (playlist_t *to, int iter, playlist_t *from, playItem_t *drop_before, uint32_t *indexes, int count) {
- LOCK;
-
- if (!from || !to) {
- UNLOCK;
- return;
- }
-
- // don't let streamer think that current song was removed
- no_remove_notify = 1;
-
- // unlink items from from, and link together
- playItem_t *head = NULL;
- playItem_t *tail = NULL;
- int processed = 0;
- int idx = 0;
- playItem_t *next = NULL;
-
- // find insertion point
- playItem_t *drop_after = NULL;
- if (drop_before) {
- drop_after = drop_before->previter;
- }
- else {
- drop_after = to->tailiter;
- }
-
- playItem_t *playing = streamer_get_playing_track ();
-
- for (playItem_t *it = from->headiter; it && processed < count; it = next, idx++) {
- next = it->nextiter;
- if (idx == indexesprocessed) {
- if (it == playing && to != from) {
- streamer_set_streamer_playlist (to);
- }
- pl_item_ref (it);
- if (drop_after == it) {
- drop_after = it->prevPL_MAIN;
- }
- plt_remove_item (from, it);
- plt_insert_item (to, drop_after, it);
- pl_item_unref (it);
- drop_after = it;
- processed++;
- }
- }
-
- if (playing) {
- pl_item_unref (playing);
- }
-
-
- no_remove_notify = 0;
- UNLOCK;
-}
-
-void
-plt_copy_items (playlist_t *to, int iter, playlist_t *from, playItem_t *before, uint32_t *indices, int cnt) {
- pl_lock ();
-
- if (!from || !to) {
- pl_unlock ();
- return;
- }
-
- for (int i = 0; i < cnt; i++) {
- playItem_t *it = from->headiter;
- int idx = 0;
- while (it && idx < indicesi) {
- it = it->nextiter;
- idx++;
- }
- if (!it) {
- trace ("pl_copy_items: warning: item %d not found in source plt_to\n", indicesi);
- continue;
- }
- playItem_t *it_new = pl_item_alloc ();
- pl_item_copy (it_new, it);
-
- playItem_t *after = before ? before->previter : to->tailiter;
- pl_insert_item (after, it_new);
- pl_item_unref (it_new);
-
- }
- pl_unlock ();
-}
-
-void
-plt_search_reset (playlist_t *playlist) {
- LOCK;
- while (playlist->headPL_SEARCH) {
- playItem_t *next = playlist->headPL_SEARCH->nextPL_SEARCH;
- playlist->headPL_SEARCH->selected = 0;
- playlist->headPL_SEARCH->nextPL_SEARCH = NULL;
- playlist->headPL_SEARCH->prevPL_SEARCH = NULL;
- playlist->headPL_SEARCH = next;
- }
- playlist->tailPL_SEARCH = NULL;
- playlist->countPL_SEARCH = 0;
- UNLOCK;
-}
-
-void
-plt_search_process (playlist_t *playlist, const char *text) {
- LOCK;
- plt_search_reset (playlist);
-
- // convert text to lowercase, to save some cycles
- char lc1000;
- int n = sizeof (lc)-1;
- const char *p = text;
- char *out = lc;
- while (*p) {
- int32_t i = 0;
- char s10;
- const char *next;
- u8_nextchar (p, &i);
- int l = u8_tolower (p, i, s);
- n -= l;
- if (n < 0) {
- break;
- }
- memcpy (out, s, l);
- p += i;
- out += l;
- }
- *out = 0;
-
- static int cmpidx = 0;
- cmpidx++;
- if (cmpidx > 127) {
- cmpidx = 1;
- }
-
- for (playItem_t *it = playlist->headPL_MAIN; it; it = it->nextPL_MAIN) {
- it->selected = 0;
- if (*text) {
- DB_metaInfo_t *m = NULL;
- for (m = it->meta; m; m = m->next) {
- int is_uri = !strcmp (m->key, ":URI");
- if ((m->key0 == ':' && !is_uri) || m->key0 == '_' || m->key0 == '!') {
- break;
- }
- const char *value = m->value;
- if (is_uri) {
- value = strrchr (value, '/');
- if (value) {
- value++;
- }
- else {
- value = m->value;
- }
- }
- if (strcasecmp(m->key, "cuesheet") && strcasecmp (m->key, "log")) {
- char cmp = *(m->value-1);
-
- if (abs (cmp) == cmpidx) {
- if (cmp > 0) {
- it->nextPL_SEARCH = NULL;
- it->prevPL_SEARCH = playlist->tailPL_SEARCH;
- if (playlist->tailPL_SEARCH) {
- playlist->tailPL_SEARCH->nextPL_SEARCH = it;
- playlist->tailPL_SEARCH = it;
- }
- else {
- playlist->headPL_SEARCH = playlist->tailPL_SEARCH = it;
- }
- it->selected = 1;
- playlist->countPL_SEARCH++;
- break;
- }
- }
- else if (u8_valid(value, strlen(value), NULL) && u8_valid(lc, strlen(lc), NULL) && utfcasestr_fast (value, lc)) {
- //fprintf (stderr, "%s -> %s match (%s.%s)\n", text, value, pl_find_meta_raw (it, ":URI"), m->key);
- // add to list
- it->nextPL_SEARCH = NULL;
- it->prevPL_SEARCH = playlist->tailPL_SEARCH;
- if (playlist->tailPL_SEARCH) {
- playlist->tailPL_SEARCH->nextPL_SEARCH = it;
- playlist->tailPL_SEARCH = it;
- }
- else {
- playlist->headPL_SEARCH = playlist->tailPL_SEARCH = it;
- }
- it->selected = 1;
- playlist->countPL_SEARCH++;
- *((char *)m->value-1) = cmpidx;
- break;
- }
- else {
- *((char *)m->value-1) = -cmpidx;
- }
- }
- }
- }
- }
- UNLOCK;
-}
-
-static void
-send_trackinfochanged (playItem_t *track) {
- ddb_event_track_t *ev = (ddb_event_track_t *)messagepump_event_alloc (DB_EV_TRACKINFOCHANGED);
- ev->track = DB_PLAYITEM (track);
- if (track) {
- pl_item_ref (track);
- }
- messagepump_push_event ((ddb_event_t*)ev, 0, 0);
-}
-
-int
-pl_playqueue_push (playItem_t *it) {
- if (playqueue_count == PLAYQUEUE_SIZE) {
- trace ("playqueue is full\n");
- return -1;
- }
- LOCK;
- pl_item_ref (it);
- playqueueplayqueue_count++ = it;
- for (int i = 0; i < playqueue_count; i++) {
- send_trackinfochanged (playqueuei);
- }
- UNLOCK;
- return 0;
-}
-
-void
-pl_playqueue_clear (void) {
- LOCK;
- int cnt = playqueue_count;
- playqueue_count = 0;
- int i;
- for (i = 0; i < cnt; i++) {
- send_trackinfochanged (playqueuei);
- }
- for (i = 0; i < cnt; i++) {
- pl_item_unref (playqueuei);
- playqueuei = NULL;
- }
- UNLOCK;
-}
-
-void
-pl_playqueue_pop (void) {
- if (!playqueue_count) {
- return;
- }
- LOCK;
- if (playqueue_count == 1) {
- playqueue_count = 0;
- send_trackinfochanged (playqueue0);
- pl_item_unref (playqueue0);
- UNLOCK;
- return;
- }
- playItem_t *it = playqueue0;
- memmove (&playqueue0, &playqueue1, (playqueue_count-1) * sizeof (playItem_t*));
- playqueue_count--;
- send_trackinfochanged (it);
- for (int i = 0; i < playqueue_count; i++) {
- send_trackinfochanged (playqueuei);
- }
- pl_item_unref (it);
- UNLOCK;
-}
-
-void
-pl_playqueue_remove (playItem_t *it) {
- LOCK;
- for (;;) {
- int i;
- for (i = 0; i < playqueue_count; i++) {
- if (playqueuei == it) {
- if (i < playqueue_count-1) {
- memmove (&playqueuei, &playqueuei+1, (playqueue_count-i) * sizeof (playItem_t*));
- }
- send_trackinfochanged (it);
- pl_item_unref (it);
- playqueue_count--;
- break;
- }
- }
- if (i == playqueue_count) {
- break;
- }
- }
- for (int i = 0; i < playqueue_count; i++) {
- send_trackinfochanged (playqueuei);
- }
- UNLOCK;
-}
-
-int
-pl_playqueue_test (playItem_t *it) {
- LOCK;
- for (int i = 0; i < playqueue_count; i++) {
- if (playqueuei == it) {
- UNLOCK;
- return i;
- }
- }
- UNLOCK;
- return -1;
-}
-
-playItem_t *
-pl_playqueue_getnext (void) {
- LOCK;
- if (playqueue_count > 0) {
- playItem_t *val = playqueue0;
- pl_item_ref (val);
- UNLOCK;
- return val;
- }
- UNLOCK;
- return NULL;
-}
-
-int
-pl_playqueue_getcount (void) {
- return playqueue_count;
-}
-
-void
-pl_items_copy_junk (playItem_t *from, playItem_t *first, playItem_t *last) {
- LOCK;
- DB_metaInfo_t *meta = from->meta;
- while (meta) {
- playItem_t *i;
- for (i = first; i; i = i->nextPL_MAIN) {
- i->_flags = from->_flags;
- pl_add_meta (i, meta->key, meta->value);
- if (i == last) {
- break;
- }
- }
- meta = meta->next;
- }
- UNLOCK;
-}
-
-uint32_t
-pl_get_item_flags (playItem_t *it) {
- LOCK;
- uint32_t flags = it->_flags;
- UNLOCK;
- return flags;
-}
-
-void
-pl_set_item_flags (playItem_t *it, uint32_t flags) {
- LOCK;
- it->_flags = flags;
-
- char s200;
- pl_format_title (it, -1, s, sizeof (s), -1, "%T");
- pl_replace_meta (it, ":TAGS", s);
- pl_replace_meta (it, ":HAS_EMBEDDED_CUESHEET", (flags & DDB_HAS_EMBEDDED_CUESHEET) ? _("Yes") : _("No"));
- UNLOCK;
-}
-
-playlist_t *
-pl_get_playlist (playItem_t *it) {
- LOCK;
- playlist_t *p = playlists_head;
- while (p) {
- int idx = plt_get_item_idx (p, it, PL_MAIN);
- if (idx != -1) {
- plt_ref (p);
- UNLOCK;
- return p;
- }
- p = p->next;
- }
- UNLOCK;
- return NULL;
-}
-
-// this function must be called when the user starts track manually in shuffle albums mode
-// r is an index of current track
-// mark previous songs in the album as played
-void
-plt_init_shuffle_albums (playlist_t *plt, int r) {
- pl_lock ();
- playItem_t *first = plt_get_item_for_idx (plt, r, PL_MAIN);
- if (!first) {
- pl_unlock ();
- return;
- }
- if (first->played) {
- plt_reshuffle (plt, NULL, NULL);
- }
- if (first) {
- int rating = first->shufflerating;
- playItem_t *it = first->prevPL_MAIN;
- pl_item_unref (first);
- while (it && rating == it->shufflerating) {
- it->played = 1;
- it = it->prevPL_MAIN;
- }
- }
- 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;
-}
-
-void
-pl_ensure_lock (void) {
-#if DETECT_PL_LOCK_RC
- pthread_t tid = pthread_self ();
- for (int i = 0; i < ntids; i++) {
- if (tidsi == tid) {
- return;
- }
- }
- fprintf (stderr, "\0330;31mnon-thread-safe playlist access function was called outside of pl_lock. please make a backtrace and post a bug. thank you.\03337;0m\n");
- assert(0);
-#endif
-}
-
-int
-plt_get_idx (playlist_t *plt) {
- int i;
- playlist_t *p;
- for (i = 0, p = playlists_head; p && p != plt; i++, p = p->next);
- if (p == 0) {
- return -1;
- }
- return i;
-}
-
-int
-plt_save_config (playlist_t *plt) {
- int i = plt_get_idx (plt);
- if (i == -1) {
- return -1;
- }
- return plt_save_n (i);
-}
-
-int
-listen_file_added (int (*callback)(ddb_fileadd_data_t *data, void *user_data), void *user_data) {
- ddb_fileadd_listener_t *l;
-
- int id = 1;
- for (l = file_add_listeners; l; l = l->next) {
- if (l->id > id) {
- id = l->id+1;
- }
- }
-
- l = malloc (sizeof (ddb_fileadd_listener_t));
- memset (l, 0, sizeof (ddb_fileadd_listener_t));
- l->id = id;
- l->callback = callback;
- l->user_data = user_data;
- l->next = file_add_listeners;
- file_add_listeners = l;
- return id;
-}
-
-void
-unlisten_file_added (int id) {
- ddb_fileadd_listener_t *prev = NULL;
- for (ddb_fileadd_listener_t *l = file_add_listeners; l; prev = l, l = l->next) {
- if (l->id == id) {
- if (prev) {
- prev->next = l->next;
- }
- else {
- file_add_listeners = l->next;
- }
- free (l);
- break;
- }
- }
-}
-
-int
-listen_file_add_beginend (void (*callback_begin) (ddb_fileadd_data_t *data, void *user_data), void (*callback_end)(ddb_fileadd_data_t *data, void *user_data), void *user_data) {
- ddb_fileadd_beginend_listener_t *l;
-
- int id = 1;
- for (l = file_add_beginend_listeners; l; l = l->next) {
- if (l->id > id) {
- id = l->id+1;
- }
- }
-
- l = malloc (sizeof (ddb_fileadd_beginend_listener_t));
- memset (l, 0, sizeof (ddb_fileadd_beginend_listener_t));
- l->id = id;
- l->callback_begin = callback_begin;
- l->callback_end = callback_end;
- l->user_data = user_data;
- l->next = file_add_beginend_listeners;
- file_add_beginend_listeners = l;
- return id;
-}
-
-void
-unlisten_file_add_beginend (int id) {
- ddb_fileadd_beginend_listener_t *prev = NULL;
- for (ddb_fileadd_beginend_listener_t *l = file_add_beginend_listeners; l; prev = l, l = l->next) {
- if (l->id == id) {
- if (prev) {
- prev->next = l->next;
- }
- else {
- file_add_beginend_listeners = l->next;
- }
- free (l);
- break;
- }
- }
-}
-
-playItem_t *
-plt_load2 (int visibility, playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data) {
- return plt_load_int (visibility, plt, after, fname, pabort, callback, user_data);
-}
-
-int
-plt_add_file2 (int visibility, playlist_t *plt, const char *fname, int (*callback)(playItem_t *it, void *user_data), void *user_data) {
- return plt_add_file_int (visibility, plt, fname, callback, user_data);
-}
-
-int
-plt_add_dir2 (int visibility, playlist_t *plt, const char *dirname, int (*callback)(playItem_t *it, void *user_data), void *user_data) {
- follow_symlinks = conf_get_int ("add_folders_follow_symlinks", 0);
- ignore_archives = conf_get_int ("ignore_archives", 1);
- int abort = 0;
- playItem_t *it = plt_insert_dir_int (visibility, plt, NULL, plt->tailPL_MAIN, dirname, &abort, callback, user_data);
- if (it) {
- // pl_insert_file doesn't hold reference, don't unref here
- return 0;
- }
- return -1;
-}
-
-playItem_t *
-plt_insert_file2 (int visibility, playlist_t *playlist, playItem_t *after, const char *fname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data) {
- return plt_insert_file_int (visibility, playlist, after, fname, pabort, callback, user_data);
-}
-
-playItem_t *
-plt_insert_dir2 (int visibility, playlist_t *plt, playItem_t *after, const char *dirname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data) {
- follow_symlinks = conf_get_int ("add_folders_follow_symlinks", 0);
- ignore_archives = conf_get_int ("ignore_archives", 1);
-
- playItem_t *ret = plt_insert_dir_int (visibility, plt, NULL, after, dirname, pabort, callback, user_data);
- ignore_archives = 0;
- return ret;
-}
-
-int
-plt_add_files_begin (playlist_t *plt, int visibility) {
- pl_lock ();
- if (addfiles_playlist) {
- pl_unlock ();
- return -1;
- }
- if (plt->files_adding) {
- pl_unlock ();
- return -1;
- }
- addfiles_playlist = plt;
- plt_ref (addfiles_playlist);
- plt->files_adding = 1;
- plt->files_add_visibility = visibility;
- pl_unlock ();
- ddb_fileadd_data_t d;
- memset (&d, 0, sizeof (d));
- d.visibility = visibility;
- d.plt = (ddb_playlist_t *)plt;
- for (ddb_fileadd_beginend_listener_t *l = file_add_beginend_listeners; l; l = l->next) {
- l->callback_begin (&d, l->user_data);
- }
- background_job_increment ();
- return 0;
-}
-
-void
-plt_add_files_end (playlist_t *plt, int visibility) {
- pl_lock ();
- if (addfiles_playlist) {
- plt_unref (addfiles_playlist);
- }
- addfiles_playlist = NULL;
- messagepump_push (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
- plt->files_adding = 0;
- pl_unlock ();
- ddb_fileadd_data_t d;
- memset (&d, 0, sizeof (d));
- d.visibility = visibility;
- d.plt = (ddb_playlist_t *)plt;
- for (ddb_fileadd_beginend_listener_t *l = file_add_beginend_listeners; l; l = l->next) {
- l->callback_end (&d, l->user_data);
- }
- background_job_decrement ();
-}
-
-void
-plt_deselect_all (playlist_t *playlist) {
- LOCK;
- for (playItem_t *it = playlist->headPL_MAIN; it; it = it->nextPL_MAIN) {
- it->selected = 0;
- }
- UNLOCK;
-}
-
-void
-plt_set_scroll (playlist_t *plt, int scroll) {
- plt->scroll = scroll;
-}
-
-int
-plt_get_scroll (playlist_t *plt) {
- return plt->scroll;
-}
-

deadbeef-0.6.2.tar.bz2/playlist.h Deleted

@@ -1,535 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- playlist management
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-
-#ifndef __PLAYLIST_H
-#define __PLAYLIST_H
-
-#include <stdint.h>
-#include <time.h>
-#include "deadbeef.h"
-
-#define PL_MAX_ITERATORS 2
-
-// predefined properties stored in metadata for storage unification:
-// :URI - full pathname
-// :DECODER - decoder id
-// :TRACKNUM - subsong index (sid, nsf, cue, etc)
-// :DURATION - length in seconds
-
-typedef struct playItem_s {
- int startsample;
- int endsample;
- int shufflerating; // sort order for shuffle mode
- // private area, must not be visible to plugins
- float _duration;
- uint32_t _flags;
- int _refc;
- struct playItem_s *nextPL_MAX_ITERATORS; // next item in linked list
- struct playItem_s *prevPL_MAX_ITERATORS; // prev item in linked list
- struct DB_metaInfo_s *meta; // linked list storing metainfo
- unsigned selected : 1;
- unsigned played : 1; // mark as played in shuffle mode
- unsigned in_playlist : 1; // 1 if item is in playlist
-} playItem_t;
-
-typedef struct playlist_s {
- char *title;
- struct playlist_s *next;
- int count2;
- float totaltime;
- int modification_idx;
- int last_save_modification_idx;
- playItem_t *headPL_MAX_ITERATORS; // head of linked list
- playItem_t *tailPL_MAX_ITERATORS; // tail of linked list
- int current_rowPL_MAX_ITERATORS; // current row (cursor)
- int scroll;
- struct DB_metaInfo_s *meta; // linked list storing metainfo
- int refc;
- int files_add_visibility;
- unsigned fast_mode : 1;
- unsigned files_adding : 1;
-} playlist_t;
-
-// global playlist control functions
-int
-pl_init (void);
-
-void
-pl_free (void);
-
-void
-pl_lock (void);
-
-void
-pl_unlock (void);
-
-//void
-//plt_lock (void);
-//
-//void
-//plt_unlock (void);
-
-// playlist management functions
-
-// it is highly recommended to access that from inside plt_lock/unlock block
-playlist_t *
-plt_get_curr_ptr (void);
-
-playlist_t *
-plt_get_for_idx (int idx);
-
-void
-plt_ref (playlist_t *plt);
-
-void
-plt_unref (playlist_t *plt);
-
-playlist_t *
-plt_alloc (const char *title);
-
-void
-plt_free (playlist_t *plt);
-
-int
-plt_get_count (void);
-
-playlist_t *
-plt_get_list (void);
-
-playItem_t *
-plt_get_head (int plt);
-
-int
-plt_get_sel_count (int plt);
-
-int
-plt_add (int before, const char *title);
-
-void
-plt_remove (int plt);
-
-int
-plt_find (const char *name);
-
-void
-plt_set_curr_idx (int plt);
-
-int
-plt_get_curr_idx (void);
-
-void
-plt_set_curr (playlist_t *plt);
-
-playlist_t *
-plt_get_curr (void);
-
-int
-plt_get_idx_of (playlist_t *plt);
-
-int
-plt_get_title (playlist_t *plt, char *buffer, int bufsize);
-
-int
-plt_set_title (playlist_t *plt, const char *title);
-
-void
-plt_modified (playlist_t *plt);
-
-int
-plt_get_modification_idx (playlist_t *plt);
-
-// moves playlist #from to position #to
-void
-plt_move (int from, int to);
-
-// playlist access functions
-void
-pl_clear (void);
-
-void
-plt_clear (playlist_t *plt);
-
-int
-plt_add_dir (playlist_t *plt, const char *dirname, int (*cb)(playItem_t *it, void *data), void *user_data);
-
-int
-plt_add_file (playlist_t *plt, const char *fname, int (*cb)(playItem_t *it, void *data), void *user_data);
-
-int
-pl_add_files_begin (playlist_t *plt);
-
-void
-pl_add_files_end (void);
-
-playItem_t *
-plt_insert_dir (playlist_t *plt, playItem_t *after, const char *dirname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data);
-
-playItem_t *
-plt_insert_file (playlist_t *playlist, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data);
-
-playItem_t *
-pl_insert_item (playItem_t *after, playItem_t *it);
-
-playItem_t *
-plt_insert_item (playlist_t *playlist, playItem_t *after, playItem_t *it);
-
-int
-plt_remove_item (playlist_t *playlist, playItem_t *it);
-
-playItem_t *
-pl_item_alloc (void);
-
-playItem_t *
-pl_item_alloc_init (const char *fname, const char *decoder_id);
-
-void
-pl_item_ref (playItem_t *it);
-
-void
-pl_item_unref (playItem_t *it);
-
-void
-pl_item_copy (playItem_t *out, playItem_t *it);
-
-int
-pl_getcount (int iter);
-
-int
-plt_get_item_count (playlist_t *plt, int iter);
-
-int
-pl_getselcount (void);
-
-int
-plt_getselcount (playlist_t *playlist);
-
-playItem_t *
-pl_get_for_idx (int idx);
-
-playItem_t *
-plt_get_item_for_idx (playlist_t *playlist, int idx, int iter);
-
-playItem_t *
-pl_get_for_idx_and_iter (int idx, int iter);
-
-int
-plt_get_item_idx (playlist_t *playlist, playItem_t *it, int iter);
-
-int
-pl_get_idx_of (playItem_t *it);
-
-int
-pl_get_idx_of_iter (playItem_t *it, int iter);
-
-playItem_t *
-plt_insert_cue_from_buffer (playlist_t *plt, playItem_t *after, playItem_t *origin, const uint8_t *buffer, int buffersize, int numsamples, int samplerate);
-
-playItem_t *
-plt_insert_cue (playlist_t *plt, playItem_t *after, playItem_t *origin, int numsamples, int samplerate);
-
-void
-pl_add_meta (playItem_t *it, const char *key, const char *value);
-
-void
-pl_append_meta (playItem_t *it, const char *key, const char *value);
-
-// must be used in explicit pl_lock/unlock block
-// that makes it possible to avoid copying metadata on every access
-// pl_find_meta may return overriden value (where the key is prefixed with '!')
-const char *
-pl_find_meta (playItem_t *it, const char *key);
-
-const char *
-pl_find_meta_raw (playItem_t *it, const char *key);
-
-int
-pl_find_meta_int (playItem_t *it, const char *key, int def);
-
-float
-pl_find_meta_float (playItem_t *it, const char *key, float def);
-
-void
-pl_replace_meta (playItem_t *it, const char *key, const char *value);
-
-void
-pl_set_meta_int (playItem_t *it, const char *key, int value);
-
-void
-pl_set_meta_float (playItem_t *it, const char *key, float value);
-
-void
-pl_delete_meta (playItem_t *it, const char *key);
-
-void
-pl_delete_all_meta (playItem_t *it);
-
-// returns index of 1st deleted item
-int
-plt_delete_selected (playlist_t *plt);
-
-int
-pl_delete_selected (void);
-
-void
-plt_crop_selected (playlist_t *playlist);
-
-void
-pl_crop_selected (void);
-
-int
-plt_save (playlist_t *plt, playItem_t *first, playItem_t *last, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data);
-
-int
-plt_save_n (int n);
-
-int
-pl_save_current (void);
-
-int
-pl_save_all (void);
-
-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);
-
-int
-pl_load_all (void);
-
-void
-plt_select_all (playlist_t *plt);
-
-void
-pl_select_all (void);
-
-void
-plt_reshuffle (playlist_t *playlist, playItem_t **ppmin, playItem_t **ppmax);
-
-// required to calculate total playtime
-void
-plt_set_item_duration (playlist_t *playlist, playItem_t *it, float duration);
-
-float
-pl_get_item_duration (playItem_t *it);
-
-void
-pl_set_item_replaygain (playItem_t *it, int idx, float value);
-
-float
-pl_get_item_replaygain (playItem_t *it, int idx);
-
-uint32_t
-pl_get_item_flags (playItem_t *it);
-
-void
-pl_set_item_flags (playItem_t *it, uint32_t flags);
-
-// returns number of characters printed, not including trailing 0
-// artist, title, album, length, tracknumber
-int
-pl_format_title (playItem_t *it, int idx, char *s, int size, int id, const char *fmt);
-
-int
-pl_format_title_escaped (playItem_t *it, int idx, char *s, int size, int id, const char *fmt);
-
-void
-pl_format_time (float t, char *dur, int size);
-
-void
-plt_reset_cursor (playlist_t *plt);
-
-float
-plt_get_totaltime (playlist_t *plt);
-
-float
-pl_get_totaltime (void);
-
-void
-pl_set_selected (playItem_t *it, int sel);
-
-int
-pl_is_selected (playItem_t *it);
-
-playItem_t *
-plt_get_first (playlist_t *playlist, int iter);
-
-playItem_t *
-pl_get_first (int iter);
-
-playItem_t *
-plt_get_last (playlist_t *playlist, int iter);
-
-playItem_t *
-pl_get_last (int iter);
-
-playItem_t *
-pl_get_next (playItem_t *it, int iter);
-
-playItem_t *
-pl_get_prev (playItem_t *it, int iter);
-
-int
-plt_get_cursor (playlist_t *plt, int iter);
-
-int
-pl_get_cursor (int iter);
-
-void
-plt_set_cursor (playlist_t *plt, int iter, int cursor);
-
-void
-pl_set_cursor (int iter, int cursor);
-
-void
-plt_move_items (playlist_t *to, int iter, playlist_t *from, playItem_t *drop_before, uint32_t *indexes, int count);
-
-void
-plt_copy_items (playlist_t *to, int iter, playlist_t *from, playItem_t *before, uint32_t *indices, int cnt);
-
-void
-plt_search_reset (playlist_t *plt);
-
-void
-plt_search_process (playlist_t *plt, const char *text);
-
-void
-plt_sort (playlist_t *plt, int iter, int id, const char *format, int order);
-
-void
-plt_sort_random (playlist_t *plt, int iter);
-
-// playqueue support functions
-int
-pl_playqueue_push (playItem_t *it);
-
-void
-pl_playqueue_clear (void);
-
-void
-pl_playqueue_pop (void);
-
-void
-pl_playqueue_remove (playItem_t *it);
-
-int
-pl_playqueue_test (playItem_t *it);
-
-playItem_t *
-pl_playqueue_getnext (void);
-
-int
-pl_playqueue_getcount (void);
-
-void
-pl_items_copy_junk (struct playItem_s *from, struct playItem_s *first, struct playItem_s *last);
-
-struct DB_metaInfo_s *
-pl_get_metadata_head (playItem_t *it);
-
-void
-pl_delete_metadata (playItem_t *it, struct DB_metaInfo_s *meta);
-
-void
-pl_set_order (int order);
-
-int
-pl_get_order (void);
-
-playlist_t *
-pl_get_playlist (playItem_t *it);
-
-void
-plt_init_shuffle_albums (playlist_t *plt, int r);
-
-void
-plt_set_fast_mode (playlist_t *plt, int fast);
-
-int
-plt_is_fast_mode (playlist_t *plt);
-
-void
-pl_ensure_lock (void);
-
-int
-pl_get_meta (playItem_t *it, const char *key, char *val, int size);
-
-int
-pl_get_meta_raw (playItem_t *it, const char *key, char *val, int size);
-
-int
-pl_meta_exists (playItem_t *it, const char *key);
-
-int
-plt_get_meta (playlist_t *handle, const char *key, char *val, int size);
-
-int
-plt_get_idx (playlist_t *plt);
-
-int
-plt_save_config (playlist_t *plt);
-
-int
-listen_file_added (int (*callback)(ddb_fileadd_data_t *data, void *user_data), void *user_data);
-
-void
-unlisten_file_added (int id);
-
-int
-listen_file_add_beginend (void (*callback_begin) (ddb_fileadd_data_t *data, void *user_data), void (*callback_end)(ddb_fileadd_data_t *data, void *user_data), void *user_data);
-
-void
-unlisten_file_add_beginend (int id);
-
-playItem_t *
-plt_load2 (int visibility, playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data);
-
-int
-plt_add_file2 (int visibility, playlist_t *plt, const char *fname, int (*callback)(playItem_t *it, void *user_data), void *user_data);
-
-int
-plt_add_dir2 (int visibility, playlist_t *plt, const char *dirname, int (*callback)(playItem_t *it, void *user_data), void *user_data);
-
-playItem_t *
-plt_insert_file2 (int visibility, playlist_t *playlist, playItem_t *after, const char *fname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data);
-
-playItem_t *
-plt_insert_dir2 (int visibility, playlist_t *plt, playItem_t *after, const char *dirname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data);
-
-int
-plt_add_files_begin (playlist_t *plt, int visibility);
-
-void
-plt_add_files_end (playlist_t *plt, int visibility);
-
-void
-plt_deselect_all (playlist_t *plt);
-
-void
-plt_set_scroll (playlist_t *plt, int scroll);
-
-int
-plt_get_scroll (playlist_t *plt);
-
-#endif // __PLAYLIST_H

deadbeef-0.6.2.tar.bz2/plmeta.c Deleted

@@ -1,346 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- track metadata management
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-
-#include <string.h>
-#include <stdlib.h>
-#include "playlist.h"
-#include "deadbeef.h"
-#include "metacache.h"
-
-#define LOCK {pl_lock();}
-#define UNLOCK {pl_unlock();}
-
-void
-pl_add_meta (playItem_t *it, const char *key, const char *value) {
- if (!value || !*value) {
- return;
- }
- LOCK;
- // check if it's already set
- DB_metaInfo_t *normaltail = NULL;
- DB_metaInfo_t *propstart = NULL;
- DB_metaInfo_t *tail = NULL;
- DB_metaInfo_t *m = it->meta;
- while (m) {
- if (!strcasecmp (key, m->key)) {
- // duplicate key
- UNLOCK;
- return;
- }
- // find end of normal metadata
- if (!normaltail && (!m->next || m->key0 == ':' || m->key0 == '_' || m->key0 == '!')) {
- normaltail = tail;
- propstart = m;
- if (key0 != ':' && key0 != '_' && key0 != '!') {
- break;
- }
- }
- // find end of properties
- tail = m;
- m = m->next;
- }
- // add
- char str256;
- m = malloc (sizeof (DB_metaInfo_t));
- memset (m, 0, sizeof (DB_metaInfo_t));
- m->key = metacache_add_string (key);
- m->value = metacache_add_string (value);
-
- if (key0 == ':' || key0 == '_' || key0 == '!') {
- if (tail) {
- tail->next = m;
- }
- else {
- it->meta = m;
- }
- }
- else {
- m->next = propstart;
- if (normaltail) {
- normaltail->next = m;
- }
- else {
- it->meta = m;
- }
- }
- UNLOCK;
-}
-
-void
-pl_append_meta (playItem_t *it, const char *key, const char *value) {
- pl_lock ();
- const char *old = pl_find_meta_raw (it, key);
-
- if (old && (!strcasecmp (key, "cuesheet") || !strcasecmp (key, "log"))) {
- pl_unlock ();
- return;
- }
-
- size_t newlen = strlen (value);
- if (!old) {
- pl_add_meta (it, key, value);
- }
- else {
- // check for duplicate data
- const char *str = old;
- int len;
- while (str) {
- char *next = strchr (str, '\n');
-
- if (next) {
- len = next - str;
- next++;
- }
- else {
- len = strlen (str);
- }
-
- if (len == newlen && !memcmp (str, value, len)) {
- pl_unlock ();
- return;
- }
-
- str = next;
- }
- int sz = strlen (old) + newlen + 2;
- char outsz;
- snprintf (out, sz, "%s\n%s", old, value);
- pl_replace_meta (it, key, out);
- }
- pl_unlock ();
-}
-
-void
-pl_replace_meta (playItem_t *it, const char *key, const char *value) {
- LOCK;
- // check if it's already set
- DB_metaInfo_t *m = it->meta;
- while (m) {
- if (!strcasecmp (key, m->key)) {
- break;
- }
- m = m->next;
- }
- if (m) {
- metacache_remove_string (m->value);
- m->value = metacache_add_string (value);
- UNLOCK;
- return;
- }
- else {
- pl_add_meta (it, key, value);
- }
- UNLOCK;
-}
-
-void
-pl_set_meta_int (playItem_t *it, const char *key, int value) {
- char s20;
- snprintf (s, sizeof (s), "%d", value);
- pl_replace_meta (it, key, s);
-}
-
-void
-pl_set_meta_float (playItem_t *it, const char *key, float value) {
- char s20;
- snprintf (s, sizeof (s), "%f", value);
- pl_replace_meta (it, key, s);
-}
-
-void
-pl_delete_meta (playItem_t *it, const char *key) {
- pl_lock ();
- DB_metaInfo_t *prev = NULL;
- DB_metaInfo_t *m = it->meta;
- while (m) {
- if (!strcasecmp (key, m->key)) {
- if (prev) {
- prev->next = m->next;
- }
- else {
- it->meta = m->next;
- }
- metacache_remove_string (m->key);
- metacache_remove_string (m->value);
- free (m);
- break;
- }
- prev = m;
- m = m->next;
- }
- pl_unlock ();
-}
-
-const char *
-pl_find_meta (playItem_t *it, const char *key) {
- pl_ensure_lock ();
- DB_metaInfo_t *m = it->meta;
-
- if (key && key0 == ':') {
- // try to find an override
- while (m) {
- if (m->key0 == '!' && !strcasecmp (key+1, m->key+1)) {
- return m->value;
- }
- m = m->next;
- }
- }
-
- m = it->meta;
- while (m) {
- if (!strcasecmp (key, m->key)) {
- return m->value;
- }
- m = m->next;
- }
- return NULL;
-}
-
-const char *
-pl_find_meta_raw (playItem_t *it, const char *key) {
- pl_ensure_lock ();
- DB_metaInfo_t *m = it->meta;
- while (m) {
- if (!strcasecmp (key, m->key)) {
- return m->value;
- }
- m = m->next;
- }
- return NULL;
-}
-
-int
-pl_find_meta_int (playItem_t *it, const char *key, int def) {
- pl_lock ();
- const char *val = pl_find_meta (it, key);
- int res = val ? atoi (val) : def;
- pl_unlock ();
- return res;
-}
-
-float
-pl_find_meta_float (playItem_t *it, const char *key, float def) {
- pl_lock ();
- const char *val = pl_find_meta (it, key);
- float res = val ? atof (val) : def;
- pl_unlock ();
- return res;
-}
-
-DB_metaInfo_t *
-pl_get_metadata_head (playItem_t *it) {
- return it->meta;
-}
-
-void
-pl_delete_metadata (playItem_t *it, DB_metaInfo_t *meta) {
- pl_lock ();
- DB_metaInfo_t *prev = NULL;
- DB_metaInfo_t *m = it->meta;
- while (m) {
- if (m == meta) {
- if (prev) {
- prev->next = m->next;
- }
- else {
- it->meta = m->next;
- }
- metacache_remove_string (m->key);
- metacache_remove_string (m->value);
- free (m);
- break;
- }
- prev = m;
- m = m->next;
- }
- pl_unlock ();
-}
-
-void
-pl_delete_all_meta (playItem_t *it) {
- LOCK;
- DB_metaInfo_t *m = it->meta;
- DB_metaInfo_t *prev = NULL;
- while (m) {
- DB_metaInfo_t *next = m->next;
- if (m->key0 == ':' || m->key0 == '_' || m->key0 == '!') {
- prev = m;
- }
- else {
- if (prev) {
- prev->next = next;
- }
- else {
- it->meta = next;
- }
- metacache_remove_string (m->key);
- metacache_remove_string (m->value);
- free (m);
- }
- m = next;
- }
- uint32_t f = pl_get_item_flags (it);
- f &= ~DDB_TAG_MASK;
- pl_set_item_flags (it, f);
- UNLOCK;
-}
-
-int
-pl_get_meta (playItem_t *it, const char *key, char *val, int size) {
- *val = 0;
- pl_lock ();
- const char *v = pl_find_meta (it, key);
- if (!v) {
- pl_unlock ();
- return 0;
- }
- strncpy (val, v, size);
- pl_unlock ();
- return 1;
-}
-
-int
-pl_get_meta_raw (playItem_t *it, const char *key, char *val, int size) {
- *val = 0;
- pl_lock ();
- const char *v = pl_find_meta_raw (it, key);
- if (!v) {
- pl_unlock ();
- return 0;
- }
- strncpy (val, v, size);
- pl_unlock ();
- return 1;
-}
-
-int
-pl_meta_exists (playItem_t *it, const char *key) {
- pl_lock ();
- const char *v = pl_find_meta (it, key);
- pl_unlock ();
- return v ? 1 : 0;
-}

deadbeef-0.6.2.tar.bz2/pltmeta.c Deleted

@@ -1,266 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- playlist metadata management
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-
-#include <string.h>
-#include <stdlib.h>
-#include "playlist.h"
-#include "deadbeef.h"
-#include "metacache.h"
-#include "pltmeta.h"
-
-#define LOCK {pl_lock();}
-#define UNLOCK {pl_unlock();}
-
-void
-plt_add_meta (playlist_t *it, const char *key, const char *value) {
- LOCK;
- // check if it's already set
- DB_metaInfo_t *tail = NULL;
- DB_metaInfo_t *m = it->meta;
- while (m) {
- if (!strcasecmp (key, m->key)) {
- // duplicate key
- UNLOCK;
- return;
- }
- tail = m;
- m = m->next;
- }
- // add
- char str256;
- if (!value || !*value) {
- UNLOCK;
- return;
- }
- m = malloc (sizeof (DB_metaInfo_t));
- memset (m, 0, sizeof (DB_metaInfo_t));
- m->key = metacache_add_string (key); //key;
- m->value = metacache_add_string (value); //strdup (value);
-
- if (tail) {
- tail->next = m;
- }
- else {
- it->meta = m;
- }
- UNLOCK;
-}
-
-void
-plt_append_meta (playlist_t *it, const char *key, const char *value) {
- pl_lock ();
- const char *old = plt_find_meta (it, key);
- size_t newlen = strlen (value);
- if (!old) {
- plt_add_meta (it, key, value);
- }
- else {
- // check for duplicate data
- const char *str = old;
- int len;
- while (str) {
- char *next = strchr (str, '\n');
-
- if (next) {
- len = next - str;
- next++;
- }
- else {
- len = strlen (str);
- }
-
- if (len == newlen && !memcmp (str, value, len)) {
- pl_unlock ();
- return;
- }
-
- str = next;
- }
- int sz = strlen (old) + newlen + 2;
- char outsz;
- snprintf (out, sz, "%s\n%s", old, value);
- plt_replace_meta (it, key, out);
- }
- pl_unlock ();
-}
-
-void
-plt_replace_meta (playlist_t *it, const char *key, const char *value) {
- LOCK;
- // check if it's already set
- DB_metaInfo_t *m = it->meta;
- while (m) {
- if (!strcasecmp (key, m->key)) {
- break;
- }
- m = m->next;
- }
- if (m) {
- metacache_remove_string (m->value);
- m->value = metacache_add_string (value);
- UNLOCK;
- return;
- }
- else {
- plt_add_meta (it, key, value);
- }
- UNLOCK;
-}
-
-void
-plt_set_meta_int (playlist_t *it, const char *key, int value) {
- char s20;
- snprintf (s, sizeof (s), "%d", value);
- plt_replace_meta (it, key, s);
-}
-
-void
-plt_set_meta_float (playlist_t *it, const char *key, float value) {
- char s20;
- snprintf (s, sizeof (s), "%f", value);
- plt_replace_meta (it, key, s);
-}
-
-void
-plt_delete_meta (playlist_t *it, const char *key) {
- DB_metaInfo_t *prev = NULL;
- DB_metaInfo_t *m = it->meta;
- while (m) {
- if (!strcasecmp (key, m->key)) {
- if (prev) {
- prev->next = m->next;
- }
- else {
- it->meta = m->next;
- }
- metacache_remove_string (m->key);
- metacache_remove_string (m->value);
- free (m);
- break;
- }
- prev = m;
- m = m->next;
- }
-}
-
-const char *
-plt_find_meta (playlist_t *it, const char *key) {
- DB_metaInfo_t *m = it->meta;
- while (m) {
- if (!strcasecmp (key, m->key)) {
- return m->value;
- }
- m = m->next;
- }
- return NULL;
-}
-
-int
-plt_find_meta_int (playlist_t *it, const char *key, int def) {
- pl_lock ();
- const char *val = plt_find_meta (it, key);
- int res = val ? atoi (val) : def;
- pl_unlock ();
- return res;
-}
-
-float
-plt_find_meta_float (playlist_t *it, const char *key, float def) {
- pl_lock ();
- const char *val = plt_find_meta (it, key);
- float res = val ? atof (val) : def;
- pl_unlock ();
- return res;
-}
-
-DB_metaInfo_t *
-plt_get_metadata_head (playlist_t *it) {
- return it->meta;
-}
-
-void
-plt_delete_metadata (playlist_t *it, DB_metaInfo_t *meta) {
- DB_metaInfo_t *prev = NULL;
- DB_metaInfo_t *m = it->meta;
- while (m) {
- if (m == meta) {
- if (prev) {
- prev->next = m->next;
- }
- else {
- it->meta = m->next;
- }
- metacache_remove_string (m->key);
- metacache_remove_string (m->value);
- free (m);
- break;
- }
- prev = m;
- m = m->next;
- }
-}
-
-
-void
-plt_delete_all_meta (playlist_t *it) {
- LOCK;
- DB_metaInfo_t *m = it->meta;
- DB_metaInfo_t *prev = NULL;
- while (m) {
- DB_metaInfo_t *next = m->next;
- if (m->key0 == ':') {
- prev = m;
- }
- else {
- if (prev) {
- prev->next = next;
- }
- else {
- it->meta = next;
- }
- metacache_remove_string (m->key);
- metacache_remove_string (m->value);
- free (m);
- }
- m = next;
- }
- UNLOCK;
-}
-
-int
-plt_get_meta (playlist_t *handle, const char *key, char *val, int size) {
- *val = 0;
- LOCK;
- const char *v = plt_find_meta (handle, key);
- if (!v) {
- UNLOCK;
- return 0;
- }
- strncpy (val, v, size);
- UNLOCK;
- return 1;
-}

deadbeef-0.6.2.tar.bz2/pltmeta.h Deleted

@@ -1,66 +0,0 @@
-/*
-  This file is part of Deadbeef Player source code
-  http://deadbeef.sourceforge.net
-
-  playlist metadata management
-
-  Copyright (C) 2009-2013 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
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __PLMETA_H
-#define __PLMETA_H
-
-void
-plt_add_meta (playlist_t *it, const char *key, const char *value);
-
-void
-plt_append_meta (playlist_t *it, const char *key, const char *value);
-
-void
-plt_replace_meta (playlist_t *it, const char *key, const char *value);
-
-void
-plt_set_meta_int (playlist_t *it, const char *key, int value);
-
-void
-plt_set_meta_float (playlist_t *it, const char *key, float value);
-
-void
-plt_delete_meta (playlist_t *it, const char *key);
-
-const char *
-plt_find_meta (playlist_t *it, const char *key);
-
-int
-plt_find_meta_int (playlist_t *it, const char *key, int def);
-
-float
-plt_find_meta_float (playlist_t *it, const char *key, float def);
-
-DB_metaInfo_t *
-plt_get_metadata_head (playlist_t *it);
-
-void
-plt_delete_metadata (playlist_t *it, DB_metaInfo_t *meta);
-
-void
-plt_delete_all_meta (playlist_t *it);
-
-#endif

deadbeef-0.6.2.tar.bz2/plugins.c Deleted

@@ -1,1349 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- plugin management
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include <dirent.h>
-#include <dlfcn.h>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#ifndef __linux__
-#define _POSIX_C_SOURCE 1
-#endif
-#include <limits.h>
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include "gettext.h"
-#include "plugins.h"
-#include "md5/md5.h"
-#include "messagepump.h"
-#include "threading.h"
-#include "playlist.h"
-#include "volume.h"
-#include "streamer.h"
-#include "common.h"
-#include "conf.h"
-#include "junklib.h"
-#include "vfs.h"
-#include "premix.h"
-#include "dsppreset.h"
-#include "pltmeta.h"
-#include "metacache.h"
-
-#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-//#define trace(fmt,...)
-
-//#define DISABLE_VERSIONCHECK 1
-
-// deadbeef api
-static DB_functions_t deadbeef_api = {
- .vmajor = DB_API_VERSION_MAJOR,
- .vminor = DB_API_VERSION_MINOR,
- .md5 = plug_md5,
- .md5_to_str = plug_md5_to_str,
- .md5_init = (void (*)(DB_md5_t *s))md5_init,
- .md5_append = (void (*)(DB_md5_t *s, const uint8_t *daya, int nbytes))md5_append,
- .md5_finish = (void (*)(DB_md5_t *s, uint8_t digest16))md5_finish,
- .get_output = plug_get_output,
- .playback_get_pos = plug_playback_get_pos,
- .playback_set_pos = plug_playback_set_pos,
- // streamer access
- .streamer_get_playing_track = (DB_playItem_t *(*) (void))streamer_get_playing_track,
- .streamer_get_streaming_track = (DB_playItem_t *(*) (void))streamer_get_streaming_track,
- .streamer_get_playpos = streamer_get_playpos,
- .streamer_ok_to_read = streamer_ok_to_read,
- .streamer_reset = streamer_reset,
- .streamer_read = streamer_read,
- .streamer_set_bitrate = streamer_set_bitrate,
- .streamer_get_apx_bitrate = streamer_get_apx_bitrate,
- .streamer_get_current_fileinfo = streamer_get_current_fileinfo,
- .streamer_get_current_playlist = streamer_get_current_playlist,
- .streamer_get_dsp_chain = streamer_get_dsp_chain,
- .streamer_set_dsp_chain = streamer_set_dsp_chain,
- .streamer_dsp_refresh = streamer_dsp_refresh,
- // folders
- .get_config_dir = plug_get_config_dir,
- .get_prefix = plug_get_prefix,
- .get_doc_dir = plug_get_doc_dir,
- .get_plugin_dir = plug_get_plugin_dir,
- .get_pixmap_dir = plug_get_pixmap_dir,
- // threading
- .thread_start = thread_start,
- .thread_start_low_priority = thread_start_low_priority,
- .thread_join = thread_join,
- .thread_detach = thread_detach,
- .thread_exit = thread_exit,
- .mutex_create = mutex_create,
- .mutex_create_nonrecursive = mutex_create_nonrecursive,
- .mutex_free = mutex_free,
- .mutex_lock = mutex_lock,
- .mutex_unlock = mutex_unlock,
- .cond_create = cond_create,
- .cond_free = cond_free,
- .cond_wait = cond_wait,
- .cond_signal = cond_signal,
- .cond_broadcast = cond_broadcast,
- // playlist management
- .plt_ref = (void (*) (ddb_playlist_t *plt))plt_ref,
- .plt_unref = (void (*) (ddb_playlist_t *plt))plt_unref,
- .plt_get_count = plt_get_count,
- .plt_get_head = (DB_playItem_t * (*) (int plt))plt_get_head,
- .plt_get_sel_count = plt_get_sel_count,
- .plt_add = plt_add,
- .plt_remove = plt_remove,
- .plt_clear = (void (*)(ddb_playlist_t *))plt_clear,
- .pl_clear = pl_clear,
- .plt_set_curr = (void (*) (ddb_playlist_t *plt))plt_set_curr,
- .plt_get_curr = (ddb_playlist_t *(*) (void))plt_get_curr,
- .plt_set_curr_idx = (void (*) (int plt))plt_set_curr_idx,
- .plt_get_curr_idx = (int (*) (void))plt_get_curr_idx,
- .plt_move = plt_move,
- // playlist saving and loading
- .plt_load = (DB_playItem_t * (*) (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data))plt_load,
- .plt_save = (int (*)(ddb_playlist_t *plt, DB_playItem_t *first, DB_playItem_t *last, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data))plt_save,
- // getting and working with a handle must be guarded using plt_lock/unlock
- .plt_get_for_idx = (ddb_playlist_t *(*)(int idx))plt_get_for_idx,
- .plt_get_title = (int (*)(ddb_playlist_t *handle, char *buffer, int sz))plt_get_title,
- .plt_set_title = (int (*)(ddb_playlist_t *handle, const char *buffer))plt_set_title,
- .plt_modified = (void (*) (ddb_playlist_t *handle))plt_modified,
- .plt_get_modification_idx = (int (*) (ddb_playlist_t *handle))plt_get_modification_idx,
- .plt_get_item_idx = (int (*) (ddb_playlist_t *plt, DB_playItem_t *it, int iter))plt_get_item_idx,
-
- // playlist metadata
- .plt_add_meta = (void (*) (ddb_playlist_t *handle, const char *key, const char *value))plt_add_meta,
- .plt_replace_meta = (void (*) (ddb_playlist_t *handle, const char *key, const char *value))plt_replace_meta,
- .plt_append_meta = (void (*) (ddb_playlist_t *handle, const char *key, const char *value))plt_append_meta,
- .plt_set_meta_int = (void (*) (ddb_playlist_t *handle, const char *key, int value))plt_set_meta_int,
- .plt_set_meta_float = (void (*) (ddb_playlist_t *handle, const char *key, float value))plt_set_meta_float,
- .plt_find_meta = (const char *(*) (ddb_playlist_t *handle, const char *key))plt_find_meta,
- .plt_get_metadata_head = (DB_metaInfo_t * (*) (ddb_playlist_t *handle))plt_get_metadata_head,
- .plt_delete_metadata = (void (*) (ddb_playlist_t *handle, DB_metaInfo_t *meta))plt_delete_metadata,
- .plt_find_meta_int = (int (*) (ddb_playlist_t *handle, const char *key, int def))plt_find_meta_int,
- .plt_find_meta_float = (float (*) (ddb_playlist_t *handle, const char *key, float def))plt_find_meta_float,
- .plt_delete_all_meta = (void (*) (ddb_playlist_t *handle))plt_delete_all_meta,
-
- // operating on playlist items
- .plt_insert_item = (DB_playItem_t *(*) (ddb_playlist_t *playlist, DB_playItem_t *after, DB_playItem_t *it))plt_insert_item,
- .plt_insert_file = (DB_playItem_t *(*) (ddb_playlist_t *playlist, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data))plt_insert_file,
- .plt_insert_dir = (DB_playItem_t *(*) (ddb_playlist_t *plt, DB_playItem_t *after, const char *dirname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data))plt_insert_dir,
- .plt_set_item_duration = (void (*) (ddb_playlist_t *plt, DB_playItem_t *it, float duration))plt_set_item_duration,
- .plt_remove_item = (int (*) (ddb_playlist_t *playlist, DB_playItem_t *it))plt_remove_item,
- .plt_getselcount = (int (*) (ddb_playlist_t *playlist))plt_getselcount,
-
- // playlist access
- .pl_lock = pl_lock,
- .pl_unlock = pl_unlock,
- //.plt_lock = plt_lock,
- //.plt_unlock = plt_unlock,
- .pl_item_alloc = (DB_playItem_t* (*)(void))pl_item_alloc,
- .pl_item_alloc_init = (DB_playItem_t* (*)(const char *fname, const char *decoder_id))pl_item_alloc_init,
- .pl_item_ref = (void (*)(DB_playItem_t *))pl_item_ref,
- .pl_item_unref = (void (*)(DB_playItem_t *))pl_item_unref,
- .pl_item_copy = (void (*)(DB_playItem_t *, DB_playItem_t *))pl_item_copy,
- .plt_add_file = (int (*) (ddb_playlist_t *plt, const char *, int (*cb)(DB_playItem_t *it, void *data), void *))plt_add_file,
- .plt_add_dir = (int (*) (ddb_playlist_t *plt, const char *dirname, int (*cb)(DB_playItem_t *it, void *data), void *user_data))plt_add_dir,
- .pl_add_files_begin = (int (*) (ddb_playlist_t *plt))pl_add_files_begin,
- .pl_add_files_end = pl_add_files_end,
- .pl_get_idx_of = (int (*) (DB_playItem_t *it))pl_get_idx_of,
- .pl_get_idx_of_iter = (int (*) (DB_playItem_t *it, int iter))pl_get_idx_of_iter,
- .pl_get_for_idx = (DB_playItem_t * (*)(int))pl_get_for_idx,
- .pl_get_for_idx_and_iter = (DB_playItem_t * (*) (int idx, int iter))pl_get_for_idx_and_iter,
- .pl_get_item_duration = (float (*) (DB_playItem_t *it))pl_get_item_duration,
- .pl_get_item_flags = (uint32_t (*) (DB_playItem_t *it))pl_get_item_flags,
- .pl_set_item_flags = (void (*) (DB_playItem_t *it, uint32_t flags))pl_set_item_flags,
- .plt_sort = (void (*) (ddb_playlist_t *plt, int iter, int id, const char *format, int order))plt_sort,
- .pl_items_copy_junk = (void (*)(DB_playItem_t *from, DB_playItem_t *first, DB_playItem_t *last))pl_items_copy_junk,
- .pl_set_item_replaygain = (void (*)(DB_playItem_t *it, int idx, float value))pl_set_item_replaygain,
- .pl_get_item_replaygain = (float (*)(DB_playItem_t *it, int idx))pl_get_item_replaygain,
- .plt_get_totaltime = (float (*) (ddb_playlist_t *plt))plt_get_totaltime,
- .plt_get_item_idx = (int (*) (ddb_playlist_t *playlist, DB_playItem_t *it, int iter))plt_get_item_idx,
- .plt_get_item_for_idx = (DB_playItem_t * (*) (ddb_playlist_t *playlist, int idx, int iter))plt_get_item_for_idx,
- .pl_get_totaltime = pl_get_totaltime,
- .pl_getcount = pl_getcount,
- .plt_get_item_count = (int (*)(ddb_playlist_t *plt, int iter))plt_get_item_count,
- .plt_delete_selected = (int (*) (ddb_playlist_t *plt))plt_delete_selected,
- .pl_delete_selected = pl_delete_selected,
- .plt_set_cursor = (void (*)(ddb_playlist_t *plt, int iter, int cursor))plt_set_cursor,
- .pl_set_cursor = pl_set_cursor,
- .plt_get_cursor = (int (*)(ddb_playlist_t *plt, int iter))plt_get_cursor,
- .pl_get_cursor = pl_get_cursor,
- .pl_set_selected = (void (*) (DB_playItem_t *, int))pl_set_selected,
- .pl_is_selected = (int (*) (DB_playItem_t *))pl_is_selected,
- .pl_save_current = pl_save_current,
- .pl_save_all = pl_save_all,
- .plt_select_all = (void (*) (ddb_playlist_t *plt))plt_select_all,
- .pl_select_all = pl_select_all,
- .plt_crop_selected = (void (*) (ddb_playlist_t *plt))plt_crop_selected,
- .pl_crop_selected = pl_crop_selected,
- .pl_getselcount = pl_getselcount,
- .plt_get_first = (DB_playItem_t *(*) (ddb_playlist_t *plt, int))plt_get_first,
- .pl_get_first = (DB_playItem_t *(*) (int))pl_get_first,
- .plt_get_last = (DB_playItem_t *(*) (ddb_playlist_t *plt, int))plt_get_last,
- .pl_get_last = (DB_playItem_t *(*) (int))pl_get_last,
- .pl_get_next = (DB_playItem_t *(*) (DB_playItem_t *, int))pl_get_next,
- .pl_get_prev = (DB_playItem_t *(*) (DB_playItem_t *, int))pl_get_prev,
- .pl_format_title = (int (*) (DB_playItem_t *it, int idx, char *s, int size, int id, const char *fmt))pl_format_title,
- .pl_format_title_escaped = (int (*) (DB_playItem_t *it, int idx, char *s, int size, int id, const char *fmt))pl_format_title_escaped,
- .pl_format_time = pl_format_time,
- .plt_move_items = (void (*) (ddb_playlist_t *to, int iter, ddb_playlist_t *from, DB_playItem_t *drop_before, uint32_t *indexes, int count))plt_move_items,
- .plt_copy_items = (void (*) (ddb_playlist_t *to, int iter, ddb_playlist_t *from, DB_playItem_t *before, uint32_t *indices, int cnt))plt_copy_items,
- .plt_search_reset = (void (*)(ddb_playlist_t *plt))plt_search_reset,
- .plt_search_process = (void (*)(ddb_playlist_t *plt, const char *t))plt_search_process,
- .pl_get_playlist = (ddb_playlist_t * (*) (DB_playItem_t *it))pl_get_playlist,
- // metainfo
- .pl_add_meta = (void (*) (DB_playItem_t *, const char *, const char *))pl_add_meta,
- .pl_append_meta = (void (*) (DB_playItem_t *, const char *, const char *))pl_append_meta,
- .pl_set_meta_int = (void (*) (DB_playItem_t *it, const char *key, int value))pl_set_meta_int,
- .pl_set_meta_float = (void (*) (DB_playItem_t *it, const char *key, float value))pl_set_meta_float,
- .pl_delete_meta = (void (*)(DB_playItem_t *, const char *key))pl_delete_meta,
- .pl_find_meta = (const char *(*) (DB_playItem_t *, const char *))pl_find_meta,
- .pl_find_meta_int = (int (*) (DB_playItem_t *it, const char *key, int def))pl_find_meta_int,
- .pl_find_meta_float = (float (*) (DB_playItem_t *it, const char *key, float def))pl_find_meta_float,
- .pl_replace_meta = (void (*) (DB_playItem_t *, const char *, const char *))pl_replace_meta,
- .pl_delete_all_meta = (void (*) (DB_playItem_t *it))pl_delete_all_meta,
- .pl_get_metadata_head = (DB_metaInfo_t *(*)(DB_playItem_t *it))pl_get_metadata_head,
- .pl_delete_metadata = (void (*)(DB_playItem_t *, DB_metaInfo_t *))pl_delete_metadata,
- // cuesheet support
- .plt_insert_cue_from_buffer = (DB_playItem_t *(*) (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, const uint8_t *buffer, int buffersize, int numsamples, int samplerate))plt_insert_cue_from_buffer,
- .plt_insert_cue = (DB_playItem_t *(*)(ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, int numsamples, int samplerate))plt_insert_cue,
- // playqueue support
- .pl_playqueue_push = (int (*) (DB_playItem_t *))pl_playqueue_push,
- .pl_playqueue_clear = pl_playqueue_clear,
- .pl_playqueue_pop = pl_playqueue_pop,
- .pl_playqueue_remove = (void (*) (DB_playItem_t *))pl_playqueue_remove,
- .pl_playqueue_test = (int (*) (DB_playItem_t *))pl_playqueue_test,
- // volume control
- .volume_set_db = plug_volume_set_db,
- .volume_get_db = volume_get_db,
- .volume_set_amp = plug_volume_set_amp,
- .volume_get_amp = volume_get_amp,
- .volume_get_min_db = volume_get_min_db,
- // junk reading
- .junk_id3v1_read = (int (*)(DB_playItem_t *it, DB_FILE *fp))junk_id3v1_read,
- .junk_id3v1_find = junk_id3v1_find,
- .junk_id3v1_write = (int (*) (FILE *, DB_playItem_t *, const char *))junk_id3v1_write,
- .junk_id3v2_find = junk_id3v2_find,
- .junk_id3v2_read = (int (*)(DB_playItem_t *it, DB_FILE *fp))junk_id3v2_read,
- .junk_id3v2_read_full = (int (*)(DB_playItem_t *, DB_id3v2_tag_t *tag, DB_FILE *fp))junk_id3v2_read_full,
- .junk_id3v2_convert_24_to_23 = junk_id3v2_convert_24_to_23,
- .junk_id3v2_convert_23_to_24 = junk_id3v2_convert_23_to_24,
- .junk_id3v2_convert_22_to_24 = junk_id3v2_convert_22_to_24,
- .junk_id3v2_free = junk_id3v2_free,
- .junk_id3v2_write = junk_id3v2_write,
- .junk_id3v2_remove_frames = junk_id3v2_remove_frames,
- .junk_id3v2_add_text_frame = junk_id3v2_add_text_frame,
- .junk_apev2_read = (int (*)(DB_playItem_t *it, DB_FILE *fp))junk_apev2_read,
- .junk_apev2_read_mem = (int (*) (DB_playItem_t *it, char *mem, int size))junk_apev2_read_mem,
- .junk_apev2_read_full = (int (*) (DB_playItem_t *it, DB_apev2_tag_t *tag_store, DB_FILE *fp))junk_apev2_read_full,
- .junk_apev2_read_full_mem = (int (*) (DB_playItem_t *it, DB_apev2_tag_t *tag_store, char *mem, int memsize))junk_apev2_read_full_mem,
- .junk_apev2_find = junk_apev2_find,
- .junk_apev2_remove_frames = junk_apev2_remove_frames,
- .junk_apev2_add_text_frame = junk_apev2_add_text_frame,
- .junk_apev2_free = junk_apev2_free,
- .junk_apev2_write = junk_apev2_write,
- .junk_get_leading_size = junk_get_leading_size,
- .junk_get_leading_size_stdio = junk_get_leading_size_stdio,
- .junk_detect_charset = junk_detect_charset,
- .junk_recode = junk_recode,
- .junk_iconv = junk_iconv,
- .junk_rewrite_tags = (int (*) (DB_playItem_t *it, uint32_t flags, int id3v2_version, const char *id3v1_encoding))junk_rewrite_tags,
- // vfs
- .fopen = vfs_fopen,
- .fclose = vfs_fclose,
- .fread = vfs_fread,
- .fseek = vfs_fseek,
- .ftell = vfs_ftell,
- .rewind = vfs_rewind,
- .fgetlength = vfs_fgetlength,
- .fget_content_type = vfs_get_content_type,
- .fset_track = (void (*) (DB_FILE *stream, DB_playItem_t *it))vfs_set_track,
- .fabort = vfs_fabort,
- // message passing
- .sendmessage = messagepump_push,
- .event_alloc = messagepump_event_alloc,
- .event_free = messagepump_event_free,
- .event_send = messagepump_push_event,
- // configuration access
- .conf_lock = conf_lock,
- .conf_unlock = conf_unlock,
- .conf_get_str_fast = conf_get_str_fast,
- .conf_get_str = conf_get_str,
- .conf_get_float = conf_get_float,
- .conf_get_int = conf_get_int,
- .conf_get_int64 = conf_get_int64,
- .conf_set_str = conf_set_str,
- .conf_set_int = conf_set_int,
- .conf_set_int64 = conf_set_int64,
- .conf_set_float = conf_set_float,
- .conf_find = conf_find,
- .conf_remove_items = conf_remove_items,
- .conf_save = conf_save,
- // plugin communication
- .plug_get_decoder_list = plug_get_decoder_list,
- .plug_get_vfs_list = plug_get_vfs_list,
- .plug_get_output_list = plug_get_output_list,
- .plug_get_dsp_list = plug_get_dsp_list,
- .plug_get_playlist_list = plug_get_playlist_list,
- .plug_get_list = plug_get_list,
- .plug_get_gui_names = plug_get_gui_names,
- .plug_get_decoder_id = plug_get_decoder_id,
- .plug_remove_decoder_id = plug_remove_decoder_id,
- .plug_get_for_id = plug_get_for_id,
- // misc utilities
- .is_local_file = plug_is_local_file,
- // pcm utilities
- .pcm_convert = pcm_convert,
- // dsp preset management
- .dsp_preset_load = dsp_preset_load,
- .dsp_preset_save = dsp_preset_save,
- .dsp_preset_free = dsp_preset_free,
- // new 1.2 APIs
- .plt_alloc = (ddb_playlist_t *(*)(const char *title))plt_alloc,
- .plt_free = (void (*)(ddb_playlist_t *plt))plt_free,
- //.plt_insert = plt_insert,
- .plt_set_fast_mode = (void (*)(ddb_playlist_t *plt, int fast))plt_set_fast_mode,
- .plt_is_fast_mode = (int (*)(ddb_playlist_t *plt))plt_is_fast_mode,
- .metacache_add_string = metacache_add_string,
- .metacache_remove_string = metacache_remove_string,
- .metacache_ref = metacache_ref,
- .metacache_unref = metacache_unref,
- .pl_find_meta_raw = (const char *(*) (DB_playItem_t *it, const char *key))pl_find_meta_raw,
- // ******* new 1.3 APIs ********
- .streamer_dsp_chain_save = streamer_dsp_chain_save,
- // ******* new 1.4 APIs ********
- .pl_get_meta = (int (*) (DB_playItem_t *it, const char *key, char *val, int size))pl_get_meta,
- .pl_get_meta_raw = (int (*) (DB_playItem_t *it, const char *key, char *val, int size))pl_get_meta_raw,
- .plt_get_meta = (int (*) (ddb_playlist_t *handle, const char *key, char *val, int size))plt_get_meta,
- .pl_meta_exists = (int (*) (DB_playItem_t *it, const char *key))pl_meta_exists,
- // ******* new 1.5 APIs ********
- .vis_waveform_listen = vis_waveform_listen,
- .vis_waveform_unlisten = vis_waveform_unlisten,
- .vis_spectrum_listen = vis_spectrum_listen,
- .vis_spectrum_unlisten = vis_spectrum_unlisten,
- .audio_set_mute = audio_set_mute,
- .audio_is_mute = audio_is_mute,
- .background_job_increment = background_job_increment,
- .background_job_decrement = background_job_decrement,
- .have_background_jobs = have_background_jobs,
- .plt_get_idx = (int (*)(ddb_playlist_t *))plt_get_idx,
- .plt_save_n = plt_save_n,
- .plt_save_config = (int (*)(ddb_playlist_t *))plt_save_config,
- .listen_file_added = listen_file_added,
- .unlisten_file_added = unlisten_file_added,
- .listen_file_add_beginend = listen_file_add_beginend,
- .unlisten_file_add_beginend = unlisten_file_add_beginend,
- .plt_load2 = (DB_playItem_t * (*) (int visibility, ddb_playlist_t *plt, ddb_playItem_t *after, const char *fname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data))plt_load2,
- .plt_add_file2 = (int (*) (int visibility, ddb_playlist_t *plt, const char *fname, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data))plt_add_file2,
- .plt_add_dir2 = (int (*) (int visibility, ddb_playlist_t *plt, const char *dirname, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data))plt_add_dir2,
- .plt_insert_file2 = (ddb_playItem_t * (*) (int visibility, ddb_playlist_t *playlist, ddb_playItem_t *after, const char *fname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data))plt_insert_file2,
- .plt_insert_dir2 = (ddb_playItem_t *(*) (int visibility, ddb_playlist_t *plt, ddb_playItem_t *after, const char *dirname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data))plt_insert_dir2,
- .plt_add_files_begin = (int (*) (ddb_playlist_t *plt, int visibility))plt_add_files_begin,
- .plt_add_files_end = (void (*) (ddb_playlist_t *plt, int visibility))plt_add_files_end,
- .plt_deselect_all = (void (*) (ddb_playlist_t *plt))plt_deselect_all,
- // ******* new 1.6 APIs ********
- .plt_set_scroll = (void (*) (ddb_playlist_t *plt, int scroll))plt_set_scroll,
- .plt_get_scroll = (int (*) (ddb_playlist_t *plt))plt_get_scroll,
-};
-
-DB_functions_t *deadbeef = &deadbeef_api;
-
-const char *
-plug_get_config_dir (void) {
- return dbconfdir;
-}
-
-const char *
-plug_get_prefix (void) {
- return dbinstalldir;
-}
-
-const char *
-plug_get_doc_dir (void) {
- return dbdocdir;
-}
-
-const char *
-plug_get_plugin_dir (void) {
- return dbplugindir;
-}
-
-const char *
-plug_get_pixmap_dir (void) {
- return dbpixmapdir;
-}
-
-void
-plug_volume_set_db (float db) {
- volume_set_db (db);
- messagepump_push (DB_EV_VOLUMECHANGED, 0, 0, 0);
-}
-
-void
-plug_volume_set_amp (float amp) {
- volume_set_amp (amp);
- messagepump_push (DB_EV_VOLUMECHANGED, 0, 0, 0);
-}
-
-#define MAX_PLUGINS 100
-DB_plugin_t *g_pluginsMAX_PLUGINS+1;
-
-#define MAX_GUI_PLUGINS 10
-char *g_gui_namesMAX_GUI_PLUGINS+1;
-int g_num_gui_names;
-
-#define MAX_DECODER_PLUGINS 50
-DB_decoder_t *g_decoder_pluginsMAX_DECODER_PLUGINS+1;
-
-#define MAX_VFS_PLUGINS 10
-DB_vfs_t *g_vfs_pluginsMAX_VFS_PLUGINS+1;
-
-#define MAX_DSP_PLUGINS 10
-DB_dsp_t *g_dsp_pluginsMAX_DSP_PLUGINS+1;
-
-#define MAX_OUTPUT_PLUGINS 10
-DB_output_t *g_output_pluginsMAX_OUTPUT_PLUGINS+1;
-DB_output_t *output_plugin = NULL;
-
-#define MAX_PLAYLIST_PLUGINS 10
-DB_playlist_t *g_playlist_pluginsMAX_PLAYLIST_PLUGINS+1;
-
-static uintptr_t background_jobs_mutex;
-static int num_background_jobs;
-
-void
-plug_md5 (uint8_t sig16, const char *in, int len) {
- md5_state_t st;
- md5_init (&st);
- md5_append (&st, in, len);
- md5_finish (&st, sig);
-}
-
-void
-plug_md5_to_str (char *str, const uint8_t sig16) {
- int i = 0;
- static const char hex = "0123456789abcdef";
- for (i = 0; i < 16; i++) {
- *str++ = hex(sigi&0xf0)>>4;
- *str++ = hexsigi&0xf;
- }
- *str = 0;
-}
-
-// plugin control structures
-typedef struct plugin_s {
- void *handle;
- DB_plugin_t *plugin;
- struct plugin_s *next;
-} plugin_t;
-
-plugin_t *plugins;
-plugin_t *plugins_tail;
-
-float
-plug_playback_get_pos (void) {
- playItem_t *trk = streamer_get_playing_track ();
- float dur = trk ? pl_get_item_duration (trk) : -1;
- if (!trk || dur <= 0) {
- if (trk) {
- pl_item_unref (trk);
- }
- return 0;
- }
- if (trk) {
- pl_item_unref (trk);
- }
- return streamer_get_playpos () * 100 / dur;
-}
-
-void
-plug_playback_set_pos (float pos) {
- playItem_t *trk = streamer_get_playing_track ();
- float dur = trk ? pl_get_item_duration (trk) : -1;
- if (!trk || dur <= 0) {
- if (trk) {
- pl_item_unref (trk);
- }
- return;
- }
- float t = pos * dur / 100.f;
- if (trk) {
- pl_item_unref (trk);
- }
- streamer_set_seek (t);
-}
-
-int
-plug_init_plugin (DB_plugin_t* (*loadfunc)(DB_functions_t *), void *handle) {
- DB_plugin_t *plugin_api = loadfunc (&deadbeef_api);
- if (!plugin_api) {
- return -1;
- }
-
- // check if same plugin with the same or bigger version is loaded already
- plugin_t *prev = NULL;
- for (plugin_t *p = plugins; p; prev = p, p = p->next) {
- int same_id = p->plugin->id && plugin_api->id && !strcmp (p->plugin->id, plugin_api->id);
- int same_name = (!p->plugin->id || !plugin_api->id) && p->plugin->name && plugin_api->name && !strcmp (p->plugin->name, plugin_api->name);
- if (same_id || same_name) {
- if (plugin_api->version_major > p->plugin->version_major || (plugin_api->version_major == p->plugin->version_major && plugin_api->version_minor > p->plugin->version_minor)) {
- trace ("found newer version of plugin \"%s\" (%s), replacing\n", plugin_api->id, plugin_api->name);
- // unload older plugin before replacing
- dlclose (p->handle);
- if (prev) {
- prev->next = p->next;
- }
- else {
- plugins = p->next;
- }
- if (p->handle) {
- dlclose (p->handle);
- }
- free (p);
- }
- else {
- trace ("found copy of plugin \"%s\" (%s), but newer version is already loaded\n", plugin_api->id, plugin_api->name)
- return -1;
- }
- }
- }
-
-#if !DISABLE_VERSIONCHECK
- if (plugin_api->api_vmajor != 0 || plugin_api->api_vminor != 0) {
- // version check enabled
- if (DB_API_VERSION_MAJOR != 9 && DB_API_VERSION_MINOR != 9) {
- if (plugin_api->api_vmajor != DB_API_VERSION_MAJOR || plugin_api->api_vminor > DB_API_VERSION_MINOR) {
- trace ("\0330;31mWARNING: plugin \"%s\" wants API v%d.%d (got %d.%d), will not be loaded\0330;m\n", plugin_api->name, plugin_api->api_vmajor, plugin_api->api_vminor, DB_API_VERSION_MAJOR, DB_API_VERSION_MINOR);
- return -1;
- }
- }
- }
- else {
- trace ("\0330;31mWARNING: plugin \"%s\" has disabled version check. please don't distribute it!\0330;m\n", plugin_api->name);
- }
-#endif
-
- plugin_t *plug = malloc (sizeof (plugin_t));
- memset (plug, 0, sizeof (plugin_t));
- plug->plugin = plugin_api;
- plug->handle = handle;
- if (plugins_tail) {
- plugins_tail->next = plug;
- plugins_tail = plug;
- }
- else {
- plugins = plugins_tail = plug;
- }
- return 0;
-}
-
-static int dirent_alphasort (const struct dirent **a, const struct dirent **b) {
- return strcmp ((*a)->d_name, (*b)->d_name);
-}
-
-void
-plug_remove_plugin (void *p) {
- int i;
- for (i = 0; g_pluginsi; i++) {
- if (g_pluginsi == p) {
- memmove (&g_pluginsi, &g_pluginsi+1, (MAX_PLUGINS+1-i-1) * sizeof (void*));
- }
- }
- for (i = 0; g_decoder_pluginsi; i++) {
- if (g_decoder_pluginsi == p) {
- memmove (&g_decoder_pluginsi, &g_decoder_pluginsi+1, (MAX_DECODER_PLUGINS+1-i-1) * sizeof (void*));
- break;
- }
- }
- for (i = 0; g_vfs_pluginsi; i++) {
- if (g_vfs_pluginsi == p) {
- memmove (&g_vfs_pluginsi, &g_vfs_pluginsi+1, (MAX_VFS_PLUGINS+1-i-1) * sizeof (void*));
- break;
- }
- }
- for (i = 0; g_dsp_pluginsi; i++) {
- if (g_dsp_pluginsi == p) {
- memmove (&g_dsp_pluginsi, &g_dsp_pluginsi+1, (MAX_DSP_PLUGINS+1-i-1) * sizeof (void*));
- break;
- }
- }
- for (i = 0; g_output_pluginsi; i++) {
- if (g_output_pluginsi == p) {
- memmove (&g_output_pluginsi, &g_output_pluginsi+1, (MAX_OUTPUT_PLUGINS+1-i-1) * sizeof (void*));
- break;
- }
- }
- for (i = 0; g_playlist_pluginsi; i++) {
- if (g_playlist_pluginsi == p) {
- memmove (&g_playlist_pluginsi, &g_playlist_pluginsi+1, (MAX_PLAYLIST_PLUGINS+1-i-1) * sizeof (void*));
- break;
- }
- }
-}
-
-// d_name must be writable w/o sideeffects; contain valid .so name
-// l must be strlen(d_name)
-static int
-load_plugin (const char *plugdir, char *d_name, int l) {
- // hack for osx to skip *.0.so files
- if (strstr (d_name, ".0.so")) {
- return -1;
- }
- char fullnamePATH_MAX;
- snprintf (fullname, PATH_MAX, "%s/%s", plugdir, d_name);
-
- // check if the file exists, to avoid printing bogus errors
- struct stat s;
- if (0 != stat (fullname, &s)) {
- return -1;
- }
-
- trace ("loading plugin %s/%s\n", plugdir, d_name);
- void *handle = dlopen (fullname, RTLD_NOW);
- if (!handle) {
- trace ("dlopen error: %s\n", dlerror ());
-#ifdef ANDROID
- return -1;
-#else
- strcpy (fullname + strlen(fullname) - 3, ".fallback.so");
- trace ("trying %s...\n", fullname);
- handle = dlopen (fullname, RTLD_NOW);
- if (!handle) {
- //trace ("dlopen error: %s\n", dlerror ());
- return -1;
- }
- else {
- fprintf (stderr, "successfully started fallback plugin %s\n", fullname);
- }
-#endif
- }
- d_namel-3 = 0;
- strcat (d_name, "_load");
-#ifndef ANDROID
- DB_plugin_t *(*plug_load)(DB_functions_t *api) = dlsym (handle, d_name);
-#else
- DB_plugin_t *(*plug_load)(DB_functions_t *api) = dlsym (handle, d_name+3);
-#endif
- if (!plug_load) {
- trace ("dlsym error: %s\n", dlerror ());
- dlclose (handle);
- return -1;
- }
- if (plug_init_plugin (plug_load, handle) < 0) {
- d_namel-3 = 0;
- dlclose (handle);
- return -1;
- }
- return 0;
-}
-
-static int
-load_gui_plugin (const char **plugdirs) {
- char conf_gui_plug100;
- conf_get_str ("gui_plugin", "GTK2", conf_gui_plug, sizeof (conf_gui_plug));
- char name100;
-
- // try to load selected plugin
- for (int i = 0; g_gui_namesi; i++) {
- trace ("checking GUI plugin: %s\n", g_gui_namesi);
- if (!strcmp (g_gui_namesi, conf_gui_plug)) {
- trace ("found selected GUI plugin: %s\n", g_gui_namesi);
- for (int n = 0; plugdirsn; n++) {
- snprintf (name, sizeof (name), "ddb_gui_%s.so", conf_gui_plug);
- if (!load_plugin (plugdirsn, name, strlen (name))) {
- return 0;
- }
- }
- break;
- }
- }
- trace ("selected GUI plugin not found or failed to load, trying to find another GUI plugin\n");
-
- // try any plugin
- for (int i = 0; g_gui_namesi; i++) {
- for (int n = 0; plugdirsn; n++) {
- snprintf (name, sizeof (name), "ddb_gui_%s.so", g_gui_namesi);
- if (!load_plugin (plugdirsn, name, strlen (name))) {
- return 0;
- }
- else {
- trace ("plugin not found or failed to load\n");
- }
- }
- }
- return -1;
-}
-
-static int
-load_plugin_dir (const char *plugdir, int gui_scan) {
- int n = 0;
- char conf_blacklist_plugins1000;
- conf_get_str ("blacklist_plugins", "", conf_blacklist_plugins, sizeof (conf_blacklist_plugins));
- if (gui_scan) {
- trace ("searching for GUI plugins in %s\n", plugdir);
- }
- else {
- trace ("loading plugins from %s\n", plugdir);
- }
- struct dirent **namelist = NULL;
- n = scandir (plugdir, &namelist, NULL, dirent_alphasort);
- if (n < 0)
- {
- if (namelist) {
- free (namelist);
- }
- return 0;
- }
- else
- {
- trace ("plug_load_all: scandir found %d files\n", n);
- int i;
- for (i = 0; i < n; i++)
- {
- // skip hidden files and fallback plugins
- while (namelisti->d_name0 != '.'
-#ifndef ANDROID
- && !strstr (namelisti->d_name, ".fallback.")
-#else
- && !strstr (namelisti->d_name, "libdeadbeef")
-#endif
- )
- {
- int l = strlen (namelisti->d_name);
- if (l < 3) {
- break;
- }
- if (strcasecmp (&namelisti->d_namel-3, ".so")) {
- break;
- }
- char d_name256;
- memcpy (d_name, namelisti->d_name, l+1);
-#ifndef ANDROID
- // no blacklisted
- const uint8_t *p = conf_blacklist_plugins;
- while (*p) {
- const uint8_t *e = p;
- while (*e && *e > 0x20) {
- e++;
- }
- if (l-3 == e-p) {
- if (!strncmp (p, d_name, e-p)) {
- p = NULL;
- break;
- }
- }
- p = e;
- while (*p && *p <= 0x20) {
- p++;
- }
- }
- if (!p) {
- trace ("plugin %s is blacklisted in config file\n", d_name);
- break;
- }
-#endif
-
- // add gui plugin names
- if (!strncmp (d_name, "ddb_gui_", 8)) {
- if (gui_scan) {
- trace ("found gui plugin %s\n", d_name);
- if (g_num_gui_names >= MAX_GUI_PLUGINS) {
- fprintf (stderr, "too many gui plugins\n");
- break; // no more gui plugins allowed
- }
- char *nm = d_name + 8;
- char *e = strrchr (nm, '.');
- if (!e) {
- break;
- }
- if (strcmp (e, ".so")) {
- break;
- }
- *e = 0;
- // ignore fallbacks
- e = strrchr (nm, '.');
- if (e && !strcasecmp (e, ".fallback")) {
- break;
- }
- // add to list
- // FIXME check for gui plugins dupes
- g_gui_namesg_num_gui_names++ = strdup (nm);
- g_gui_namesg_num_gui_names = NULL;
- trace ("added %s gui plugin\n", nm);
- }
- break;
- }
-
- if (!gui_scan) {
- if (0 != load_plugin (plugdir, d_name, l)) {
- trace ("plugin not found or failed to load\n");
- }
- }
- break;
- }
- free (namelisti);
- }
- free (namelist);
- }
- return 0;
-}
-
-int
-plug_load_all (void) {
-#if DISABLE_VERSIONCHECK
- trace ("\0330;31mDISABLE_VERSIONCHECK=1! do not distribute!\0330;m\n");
-#endif
-
- background_jobs_mutex = mutex_create ();
-
- const char *dirname = deadbeef->get_plugin_dir ();
-
-#ifndef ANDROID
- char *xdg_local_home = getenv ("XDG_LOCAL_HOME");
- char xdg_plugin_dir1024;
- char xdg_plugin_dir_explicit_arch1024;
-
- if (xdg_local_home) {
- strncpy (xdg_plugin_dir, xdg_local_home, sizeof (xdg_plugin_dir));
- xdg_plugin_dirsizeof(xdg_plugin_dir)-1 = 0;
- } else {
- char *homedir = getenv ("HOME");
-
- if (!homedir) {
- trace ("plug_load_all: warning: unable to find home directory\n");
- xdg_plugin_dir0 = 0;
- }
- else {
- // multilib support:
- // 1. load from lib$ARCH if present
- // 2. load from lib if present
- int written = snprintf (xdg_plugin_dir, sizeof (xdg_plugin_dir), "%s/.local/lib/deadbeef", homedir);
- if (written > sizeof (xdg_plugin_dir)) {
- trace ("warning: XDG_LOCAL_HOME value is too long: %s. Ignoring.", xdg_local_home);
- xdg_plugin_dir0 = 0;
- }
- written = snprintf (xdg_plugin_dir_explicit_arch, sizeof (xdg_plugin_dir_explicit_arch), "%s/.local/lib%d/deadbeef", homedir, (int)(sizeof (long) * 8));
- if (written > sizeof (xdg_plugin_dir_explicit_arch)) {
- trace ("warning: XDG_LOCAL_HOME value is too long: %s. Ignoring.", xdg_local_home);
- xdg_plugin_dir_explicit_arch0 = 0;
- }
- }
- }
-
- // load from HOME 1st, than replace from installdir if needed
- const char *plugins_dirs = { xdg_plugin_dir_explicit_arch, xdg_plugin_dir, dirname, NULL };
-
- // If xdg_plugin_dir and dirname is the same, we should avoid each plugin
- // to be load twice.
- // XXX: Here absolute path is assumed, however if dirname is a relative
- // path it won't work.
- if (strcmp(xdg_plugin_dir, dirname) == 0) {
- plugins_dirs1 = NULL;
- }
-#else
- const char *plugins_dirs = { dirname, NULL };
-#endif
-
- int k = 0;
-#ifndef ANDROID
- // load gui plugin before others
- while (plugins_dirsk) {
- const char *plugdir = plugins_dirsk++;
- if (!(*plugdir)) {
- continue;
- }
- load_plugin_dir (plugdir, 1);
- }
- printf ("load gui plugin\n");
- load_gui_plugin (plugins_dirs);
-#endif
-
- k = 0;
- while (plugins_dirsk) {
- const char *plugdir = plugins_dirsk++;
- if (!(*plugdir)) {
- continue;
- }
- load_plugin_dir (plugdir, 0);
- }
-
-#ifdef ANDROID
- char plugin_path1000;
- strncpy (plugin_path, conf_get_str_fast ("android.plugin_path", ""), sizeof (plugin_path)-1);
- plugin_pathsizeof(plugin_path)-1 = 0;
- char *p = plugin_path;
- while (*p) {
- while (*p == ':') {
- p++;
- }
- if (!(*p)) {
- break;
- }
- char *e = strchr (p, ':');
- if (e) {
- *e = 0;
- }
-
- char pathPATH_MAX;
- snprintf (path, sizeof (path), "/data/data/%s/lib", p);
- load_plugin_dir (path);
- if (!e) {
- break;
- }
- p = e+1;
- }
-#endif
-
-// load all compiled-in modules
-#define PLUG(n) extern DB_plugin_t * n##_load (DB_functions_t *api);
-#include "moduleconf.h"
-#undef PLUG
-#define PLUG(n) plug_init_plugin (n##_load, NULL);
-#include "moduleconf.h"
-#undef PLUG
-#ifdef ANDROID
-#define PLUG(n) extern DB_plugin_t * n##_load (DB_functions_t *api);
-#include "moduleconf-android.h"
-#undef PLUG
-#define PLUG(n) plug_init_plugin (n##_load, NULL);
-#include "moduleconf-android.h"
-#undef PLUG
-#endif
-
- plugin_t *plug;
- // categorize plugins
- int numplugins = 0;
- int numdecoders = 0;
- int numvfs = 0;
- int numoutput = 0;
- int numdsp = 0;
- int numplaylist = 0;
- for (plug = plugins; plug; plug = plug->next) {
- g_pluginsnumplugins++ = plug->plugin;
- if (plug->plugin->type == DB_PLUGIN_DECODER) {
-// trace ("found decoder plugin %s\n", plug->plugin->name);
- if (numdecoders >= MAX_DECODER_PLUGINS) {
- break;
- }
- g_decoder_pluginsnumdecoders++ = (DB_decoder_t *)plug->plugin;
- }
- else if (plug->plugin->type == DB_PLUGIN_VFS) {
-// trace ("found vfs plugin %s\n", plug->plugin->name);
- if (numvfs >= MAX_VFS_PLUGINS) {
- break;
- }
- g_vfs_pluginsnumvfs++ = (DB_vfs_t *)plug->plugin;
- }
- else if (plug->plugin->type == DB_PLUGIN_OUTPUT) {
-// trace ("found output plugin %s\n", plug->plugin->name);
- if (numoutput >= MAX_OUTPUT_PLUGINS) {
- break;
- }
- g_output_pluginsnumoutput++ = (DB_output_t *)plug->plugin;
- }
- else if (plug->plugin->type == DB_PLUGIN_DSP) {
-// trace ("found dsp plugin %s\n", plug->plugin->name);
- if (numdsp >= MAX_DSP_PLUGINS) {
- break;
- }
- g_dsp_pluginsnumdsp++ = (DB_dsp_t *)plug->plugin;
- }
- else if (plug->plugin->type == DB_PLUGIN_PLAYLIST) {
- if (numplaylist >= MAX_PLAYLIST_PLUGINS) {
- break;
- }
- g_playlist_pluginsnumplaylist++ = (DB_playlist_t *)plug->plugin;
- }
- }
- // start plugins
- plugin_t *prev = NULL;
- for (plug = plugins; plug;) {
- if (plug->plugin->type != DB_PLUGIN_GUI && plug->plugin->start) {
- if (plug->plugin->start () < 0) {
- fprintf (stderr, "plugin %s failed to start, deactivated.\n", plug->plugin->name);
- if (plug->plugin->stop) {
- plug->plugin->stop ();
- }
- if (plug->handle) {
- dlclose (plug->handle);
- }
- plug_remove_plugin (plug->plugin);
- if (prev) {
- prev->next = plug->next;
- }
- else {
- plugins = plug->next;
- }
- plugin_t *next = plug->next;
- free (plug);
- plug = next;
- continue;
- }
- }
- prev = plug;
- plug = plug->next;
- }
-// trace ("numplugins: %d, numdecoders: %d, numvfs: %d\n", numplugins, numdecoders, numvfs);
- g_pluginsnumplugins = NULL;
- g_decoder_pluginsnumdecoders = NULL;
- g_vfs_pluginsnumvfs = NULL;
- g_output_pluginsnumoutput = NULL;
- g_dsp_pluginsnumdsp = NULL;
- g_playlist_pluginsnumplaylist = NULL;
-
- // select output plugin
- if (plug_select_output () < 0) {
- trace ("failed to find output plugin!\n");
- return -1;
- }
- return 0;
-}
-
-void
-plug_connect_all (void) {
- plugin_t *plug;
- plugin_t *prev = NULL;
- for (plug = plugins; plug;) {
- if (plug->plugin->connect) {
- if (plug->plugin->connect () < 0) {
- fprintf (stderr, "plugin %s failed to connect to dependencies, deactivated.\n", plug->plugin->name);
-
- if (plug->plugin->disconnect) {
- plug->plugin->disconnect ();
- }
- if (plug->plugin->type != DB_PLUGIN_GUI && plug->plugin->stop) {
- plug->plugin->stop ();
- }
- if (plug->handle) {
- dlclose (plug->handle);
- }
- plug_remove_plugin (plug->plugin);
-
- if (prev) {
- prev->next = plug->next;
- }
- else {
- plugins = plug->next;
- }
- plugin_t *next = plug->next;
- free (plug);
- plug = next;
- continue;
- }
- }
- prev = plug;
- plug = plug->next;
- }
-
-}
-
-void
-plug_disconnect_all (void) {
- trace ("plug_disconnect_all\n");
- plugin_t *plug;
- plugin_t *prev = NULL;
- for (plug = plugins; plug;) {
- if (plug->plugin->disconnect) {
- if (plug->plugin->disconnect () < 0) {
- trace ("plugin %s failed to disconnect\n", plug->plugin->name);
- }
- }
- prev = plug;
- plug = plug->next;
- }
-}
-
-void
-plug_unload_all (void) {
- trace ("plug_unload_all\n");
- plugin_t *p;
- for (p = plugins; p; p = p->next) {
- if (p->plugin->stop) {
- trace ("stopping %s...\n", p->plugin->name);
- fflush (stderr);
- p->plugin->stop ();
- }
- }
- trace ("stopped all plugins\n");
- while (plugins) {
- plugin_t *next = plugins->next;
- if (plugins->handle) {
- dlclose (plugins->handle);
- }
- free (plugins);
- plugins = next;
- }
- for (int i = 0; g_gui_namesi; i++) {
- free (g_gui_namesi);
- g_gui_namesi = NULL;
- }
- plugins_tail = NULL;
-
- memset (g_plugins, 0, sizeof (g_plugins));
- memset (g_gui_names, 0, sizeof (g_gui_names));
- g_num_gui_names = 0;
- memset (g_decoder_plugins, 0, sizeof (g_decoder_plugins));
- memset (g_vfs_plugins, 0, sizeof (g_vfs_plugins));
- memset (g_dsp_plugins, 0, sizeof (g_dsp_plugins));
- memset (g_output_plugins, 0, sizeof (g_output_plugins));
- output_plugin = NULL;
- memset (g_playlist_plugins, 0, sizeof (g_playlist_plugins));
-
- trace ("all plugins had been unloaded\n");
- if (background_jobs_mutex) {
- mutex_free (background_jobs_mutex);
- background_jobs_mutex = 0;
- }
-}
-
-void
-plug_cleanup (void) {
- plug_free_decoder_ids ();
-}
-
-struct DB_decoder_s **
-plug_get_decoder_list (void) {
- return g_decoder_plugins;
-}
-
-struct DB_vfs_s **
-plug_get_vfs_list (void) {
- return g_vfs_plugins;
-}
-
-struct DB_output_s **
-plug_get_output_list (void) {
- return g_output_plugins;
-}
-
-struct DB_dsp_s **
-plug_get_dsp_list (void) {
- return g_dsp_plugins;
-}
-
-struct DB_playlist_s **
-plug_get_playlist_list (void) {
- return g_playlist_plugins;
-}
-
-struct DB_plugin_s **
-plug_get_list (void) {
- return g_plugins;
-}
-
-const char **
-plug_get_gui_names (void) {
- return (const char **)g_gui_names;
-}
-
-DB_output_t *
-plug_get_output (void) {
- return output_plugin;
-}
-
-int
-plug_select_output (void) {
-#ifdef ANDROID
- return 0;
-#else
- char outplugname100;
- conf_get_str ("output_plugin", "ALSA output plugin", outplugname, sizeof (outplugname));
- for (int i = 0; g_output_pluginsi; i++) {
- DB_output_t *p = g_output_pluginsi;
- if (!strcmp (p->plugin.name, outplugname)) {
- trace ("selected output plugin: %s\n", outplugname);
- output_plugin = p;
- break;
- }
- }
- if (!output_plugin) {
- output_plugin = g_output_plugins0;
- if (output_plugin) {
- trace ("selected output plugin: %s\n", output_plugin->plugin.name);
- conf_set_str ("output_plugin", output_plugin->plugin.name);
- }
- }
- if (!output_plugin) {
- return -1;
- }
- messagepump_push (DB_EV_OUTPUTCHANGED, 0, 0, 0);
- return 0;
-#endif
-}
-
-void
-plug_reinit_sound (void) {
- DB_output_t *prev = plug_get_output ();
- int state = OUTPUT_STATE_STOPPED;
-
- ddb_waveformat_t fmt = {0};
-
- streamer_get_output_format (&fmt);
- if (prev) {
- state = prev->state ();
- if (!fmt.channels) {
- memcpy (&fmt, &prev->fmt, sizeof (fmt));
- }
- prev->free ();
- }
-
- if (plug_select_output () < 0) {
- char outplugname100;
- conf_get_str ("output_plugin", "ALSA output plugin", outplugname, sizeof (outplugname));
- trace ("failed to select output plugin %s\nreverted to %s\n", outplugname, prev->plugin.name);
- output_plugin = prev;
- }
- DB_output_t *output = plug_get_output ();
- if (fmt.channels) {
- output->setformat (&fmt);
- }
- if (output->init () < 0) {
- streamer_reset (1);
- streamer_set_nextsong (-2, 0);
- return;
- }
-
- if (state != OUTPUT_STATE_PAUSED && state != OUTPUT_STATE_STOPPED) {
- if (output->play () < 0) {
- trace ("failed to reinit sound output\n");
- streamer_set_nextsong (-2, 0);
- }
- }
-}
-
-// list of all unique decoder ids used in current session
-static char *decoder_idsMAX_DECODER_PLUGINS;
-
-const char *
-plug_get_decoder_id (const char *id) {
- int i;
- char **lastnull = NULL;
- for (i = 0; i < MAX_DECODER_PLUGINS; i++) {
- if (decoder_idsi && !strcmp (id, decoder_idsi)) {
- return decoder_idsi;
- }
- else if (!lastnull && !decoder_idsi) {
- lastnull = &decoder_idsi;
- }
- }
- if (!lastnull) {
- return NULL;
- }
- char *newid = strdup (id);
- *lastnull = newid;
- return newid;
-}
-
-void
-plug_remove_decoder_id (const char *id) {
- int i;
- for (i = 0; i < MAX_DECODER_PLUGINS; i++) {
- if (decoder_idsi && !strcmp (decoder_idsi, id)) {
- free (decoder_idsi);
- decoder_idsi = NULL;
- }
- }
-}
-
-void
-plug_free_decoder_ids (void) {
- int i;
- for (i = 0; i < MAX_DECODER_PLUGINS; i++) {
- if (decoder_idsi) {
- free (decoder_idsi);
- decoder_idsi = NULL;
- }
- }
-}
-
-DB_decoder_t *
-plug_get_decoder_for_id (const char *id) {
- DB_decoder_t **plugins = plug_get_decoder_list ();
- for (int c = 0; pluginsc; c++) {
- if (!strcmp (id, pluginsc->plugin.id)) {
- return pluginsc;
- }
- }
- return NULL;
-}
-
-DB_plugin_t *
-plug_get_for_id (const char *id) {
- DB_plugin_t **plugins = plug_get_list ();
- for (int c = 0; pluginsc; c++) {
- if (pluginsc->id && !strcmp (id, pluginsc->id)) {
- return pluginsc;
- }
- }
- return NULL;
-}
-
-int
-plug_is_local_file (const char *fname) {
- if (!strncasecmp (fname, "file://", 7)) {
- return 1;
- }
-
- const char *f = fname;
- for (; *f; f++) {
- if (!strncmp (f, "://", 3)) {
- DB_vfs_t **plug = plug_get_vfs_list ();
- for (int i = 0; plugi; i++) {
- if (plugi->get_schemes && plugi->is_streaming && plugi->is_streaming()) {
- const char **sch = plugi->get_schemes ();
- for (int k = 0; schk; k++) {
- if (!strncmp (schk, fname, strlen (schk))) {
- return 0;
- }
- }
- }
- }
- break;
- }
- }
-
- return 1;
-}
-
-void
-background_job_increment (void) {
- mutex_lock (background_jobs_mutex);
- num_background_jobs++;
- mutex_unlock (background_jobs_mutex);
-}
-
-void
-background_job_decrement (void) {
- mutex_lock (background_jobs_mutex);
- num_background_jobs--;
- mutex_unlock (background_jobs_mutex);
-}
-
-int
-have_background_jobs (void) {
- return num_background_jobs;
-}

deadbeef-0.6.2.tar.bz2/plugins.h Deleted

@@ -1,148 +0,0 @@
-/*
-  This file is part of Deadbeef Player source code
-  http://deadbeef.sourceforge.net
-
-  plugin management
-
-  Copyright (C) 2009-2013 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
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __PLUGINS_H
-#define __PLUGINS_H
-#include "deadbeef.h"
-
-extern DB_functions_t *deadbeef;
-
-struct playItem_s;
-
-int
-plug_load_all (void);
-
-void
-plug_unload_all (void);
-
-void
-plug_connect_all (void);
-
-void
-plug_disconnect_all (void);
-
-void
-plug_cleanup (void);
-
-void
-plug_ev_subscribe (DB_plugin_t *plugin, int ev, DB_callback_t callback, uintptr_t data);
-
-void
-plug_ev_unsubscribe (DB_plugin_t *plugin, int ev, DB_callback_t callback, uintptr_t data);
-
-void
-plug_md5 (uint8_t sig16, const char *in, int len);
-
-void
-plug_md5_to_str (char *str, const uint8_t sig16);
-
-float
-plug_playback_get_pos (void);
-
-void
-plug_playback_set_pos (float pos);
-
-struct DB_plugin_s **
-plug_get_list (void);
-
-struct DB_decoder_s **
-plug_get_decoder_list (void);
-
-struct DB_output_s **
-plug_get_output_list (void);
-
-struct DB_vfs_s **
-plug_get_vfs_list (void);
-
-struct DB_dsp_s **
-plug_get_dsp_list (void);
-
-struct DB_playlist_s **
-plug_get_playlist_list (void);
-
-void
-plug_volume_set_db (float db);
-
-void
-plug_volume_set_amp (float amp);
-
-const char *
-plug_get_config_dir (void);
-const char *
-plug_get_prefix (void);
-const char *
-plug_get_doc_dir (void);
-const char *
-plug_get_plugin_dir (void);
-const char *
-plug_get_pixmap_dir (void);
-
-int
-plug_activate (DB_plugin_t *plug, int activate);
-
-DB_output_t *
-plug_get_output (void);
-
-void
-plug_reinit_sound (void);
-
-int
-plug_select_output (void);
-
-const char *
-plug_get_decoder_id (const char *id);
-
-void
-plug_remove_decoder_id (const char *id);
-
-void
-plug_free_decoder_ids (void);
-
-DB_decoder_t *
-plug_get_decoder_for_id (const char *id);
-
-DB_plugin_t *
-plug_get_for_id (const char *id);
-
-int
-plug_is_local_file (const char *fname);
-
-const char **
-plug_get_gui_names (void);
-
-void
-plug_event_call (ddb_event_t *ev);
-
-void
-background_job_increment (void);
-
-void
-background_job_decrement (void);
-
-int
-have_background_jobs (void);
-
-#endif // __PLUGINS_H

deadbeef-0.6.2.tar.bz2/plugins/alac/demux.c Deleted

@@ -1,673 +0,0 @@
-/*
- * ALAC (Apple Lossless Audio Codec) decoder
- * Copyright (c) 2005 David Hammerton
- * All rights reserved.
- *
- * This is the quicktime container demuxer.
- *
- * http://crazney.net/programs/itunes/alac.html
- * 
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _WIN32
-	#include "stdint_win.h"
-#else
-	#include <stdint.h>
-#endif
-
-#include "stream.h"
-#include "demux.h"
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-
-typedef struct
-{
- stream_t *stream;
- demux_res_t *res;
- long saved_mdat_pos;
-} qtmovie_t;
-
-
-/* chunk handlers */
-static void read_chunk_ftyp(qtmovie_t *qtmovie, size_t chunk_len)
-{
- fourcc_t type;
- uint32_t minor_ver;
- size_t size_remaining = chunk_len - 8; /* FIXME: can't hardcode 8, size may be 64bit */
-
- type = stream_read_uint32(qtmovie->stream);
- size_remaining-=4;
- if ((type != MAKEFOURCC('M','4','A',' ')) &&
- (type != MAKEFOURCC('m','4','a',' ')) &&
- (type != MAKEFOURCC('M','4','B',' ')) &&
- (type != MAKEFOURCC('m','p','4','2')) &&
- (type != MAKEFOURCC('3','g','p','6')) &&
- (type != MAKEFOURCC('q','t',' ',' ')) &&
- (type != MAKEFOURCC('i','s','o','m')))
- {
- trace ("not M4A file\n");
- return;
- }
- minor_ver = stream_read_uint32(qtmovie->stream);
- size_remaining-=4;
-
- /* compatible brands */
- while (size_remaining)
- {
- /* unused */
- /*fourcc_t cbrand =*/ stream_read_uint32(qtmovie->stream);
- size_remaining-=4;
- }
-}
-
-static void read_chunk_tkhd(qtmovie_t *qtmovie, size_t chunk_len)
-{
- /* don't need anything from here atm, skip */
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- stream_skip(qtmovie->stream, size_remaining);
-}
-
-static void read_chunk_edts(qtmovie_t *qtmovie, size_t chunk_len)
-{
- /* don't need anything from here atm, skip */
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- stream_skip(qtmovie->stream, size_remaining);
-}
-
-static void read_chunk_elst(qtmovie_t *qtmovie, size_t chunk_len)
-{
- /* don't need anything from here atm, skip */
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- stream_skip(qtmovie->stream, size_remaining);
-}
-
-static int read_chunk_stsd(qtmovie_t *qtmovie, size_t chunk_len)
-{
- unsigned int i;
- uint32_t numentries;
- size_t size_remaining = chunk_len - 8;
-
- /* version */
- stream_read_uint8(qtmovie->stream);
- size_remaining -= 1;
- /* flags */
- stream_read_uint8(qtmovie->stream);
- stream_read_uint8(qtmovie->stream);
- stream_read_uint8(qtmovie->stream);
- size_remaining -= 3;
-
- numentries = stream_read_uint32(qtmovie->stream);
- size_remaining -= 4;
-
-// if (numentries != 1)
-// {
-// trace ("only expecting one entry in sample description atom!\n");
-// return 0;
-// }
-
- for (i = 0; i < numentries; i++)
- {
- uint32_t entry_size;
-
- uint32_t entry_remaining;
-
- entry_size = stream_read_uint32(qtmovie->stream);
- qtmovie->res->format = stream_read_uint32(qtmovie->stream);
- trace ("format: %c%c%c%c\n",SPLITFOURCC(qtmovie->res->format));
- entry_remaining = entry_size;
- entry_remaining -= 8;
-
-
- /* sound info: */
-
- /* reserved + data reference index + sound version + reserved */
- stream_skip(qtmovie->stream, 6 + 2 + 2 + 6);
- entry_remaining -= 6 + 2 + 2 + 6;
-
- qtmovie->res->num_channels = stream_read_uint16(qtmovie->stream);
- qtmovie->res->sample_size = stream_read_uint16(qtmovie->stream);
- entry_remaining -= 4;
-
- /* packet size */
- stream_skip(qtmovie->stream, 2);
- qtmovie->res->sample_rate = stream_read_uint32(qtmovie->stream);
- /* reserved size */
- stream_skip(qtmovie->stream, 2);
- entry_remaining -= 8;
-
- /* remaining is codec data */
- /* 12 = audio format atom, 8 = padding */
- qtmovie->res->codecdata_len = entry_remaining + 12 + 8;
- if (qtmovie->res->codecdata_len > 64)
- {
- trace ("codecdata too large (%d) in stsd\n", 
- (int)qtmovie->res->codecdata_len);
- return 0;
- }
-
- memset(qtmovie->res->codecdata, 0, qtmovie->res->codecdata_len);
- /* audio format atom */
-#if 0
- /* The ALAC decoder skips these bytes, so there is no need to store them,
- and this code isn't endian/alignment safe */
- ((unsigned int*)qtmovie->res->codecdata)0 = 0x0c000000;
- ((unsigned int*)qtmovie->res->codecdata)1 = MAKEFOURCC('a','m','r','f');
- ((unsigned int*)qtmovie->res->codecdata)2 = MAKEFOURCC('c','a','l','a');
-#endif
-
- stream_read(qtmovie->stream,
- entry_remaining,
- ((char*)qtmovie->res->codecdata) + 12);
- entry_remaining -= entry_remaining;
-
- if (entry_remaining)
- stream_skip(qtmovie->stream, entry_remaining);
-
-
- qtmovie->res->format_read = 1;
- if (qtmovie->res->format != MAKEFOURCC('a','l','a','c'))
- {
- /*trace ("expecting 'alac' data format, got %c%c%c%c\n",
- SPLITFOURCC(qtmovie->res->format));*/
- return 0;
- }
- }
-
- return 1;
-}
-
-static void read_chunk_stts(qtmovie_t *qtmovie, size_t chunk_len)
-{
- unsigned int i;
- uint32_t numentries;
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- /* version */
- stream_read_uint8(qtmovie->stream);
- size_remaining -= 1;
- /* flags */
- stream_read_uint8(qtmovie->stream);
- stream_read_uint8(qtmovie->stream);
- stream_read_uint8(qtmovie->stream);
- size_remaining -= 3;
-
- numentries = stream_read_uint32(qtmovie->stream);
- size_remaining -= 4;
-
- qtmovie->res->num_time_to_samples = numentries;
- qtmovie->res->time_to_sample = malloc(numentries * sizeof(*qtmovie->res->time_to_sample));
-
- for (i = 0; i < numentries; i++)
- {
- qtmovie->res->time_to_samplei.sample_count = stream_read_uint32(qtmovie->stream);
- qtmovie->res->time_to_samplei.sample_duration = stream_read_uint32(qtmovie->stream);
- size_remaining -= 8;
- }
-
- if (size_remaining)
- {
- trace ("ehm, size remianing?\n");
- stream_skip(qtmovie->stream, size_remaining);
- }
-}
-
-static void read_chunk_stsz(qtmovie_t *qtmovie, size_t chunk_len)
-{
- unsigned int i;
- uint32_t numentries;
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- /* version */
- stream_read_uint8(qtmovie->stream);
- size_remaining -= 1;
- /* flags */
- stream_read_uint8(qtmovie->stream);
- stream_read_uint8(qtmovie->stream);
- stream_read_uint8(qtmovie->stream);
- size_remaining -= 3;
-
- /* default sample size */
- if (stream_read_uint32(qtmovie->stream) != 0)
- {
- trace ("i was expecting variable samples sizes\n");
- stream_read_uint32(qtmovie->stream);
- size_remaining -= 4;
- return;
- }
- size_remaining -= 4;
-
- numentries = stream_read_uint32(qtmovie->stream);
- size_remaining -= 4;
-
- qtmovie->res->num_sample_byte_sizes = numentries;
- qtmovie->res->sample_byte_size = malloc(numentries * sizeof(*qtmovie->res->sample_byte_size));
-
- for (i = 0; i < numentries; i++)
- {
- qtmovie->res->sample_byte_sizei = stream_read_uint32(qtmovie->stream);
- size_remaining -= 4;
- }
-
- if (size_remaining)
- {
- trace ("ehm, size remianing?\n");
- stream_skip(qtmovie->stream, size_remaining);
- }
-}
-
-static int read_chunk_stbl(qtmovie_t *qtmovie, size_t chunk_len)
-{
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- while (size_remaining)
- {
- size_t sub_chunk_len;
- fourcc_t sub_chunk_id;
-
- sub_chunk_len = stream_read_uint32(qtmovie->stream);
- if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining)
- {
- trace ("strange size for chunk inside stbl (%lu) (remaining: %lu)\n",
- sub_chunk_len, size_remaining);
- return 0;
- }
-
- sub_chunk_id = stream_read_uint32(qtmovie->stream);
-
- switch (sub_chunk_id)
- {
- case MAKEFOURCC('s','t','s','d'):
- if (read_chunk_stsd(qtmovie, sub_chunk_len) == 0)
- return 0;
- break;
- case MAKEFOURCC('s','t','t','s'):
- read_chunk_stts(qtmovie, sub_chunk_len);
- break;
- case MAKEFOURCC('s','t','s','z'):
- read_chunk_stsz(qtmovie, sub_chunk_len);
- break;
- case MAKEFOURCC('s','t','s','c'):
- case MAKEFOURCC('s','t','c','o'):
- /* skip these, no indexing for us! */
- stream_skip(qtmovie->stream, sub_chunk_len - 8);
- break;
- default:
- trace ("(stbl) unknown chunk id: %c%c%c%c\n",
- SPLITFOURCC(sub_chunk_id));
- return 0;
- }
-
- size_remaining -= sub_chunk_len;
- }
-
- return 1;
-}
-
-static int read_chunk_minf(qtmovie_t *qtmovie, size_t chunk_len)
-{
- size_t dinf_size, stbl_size;
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- /**** SOUND HEADER CHUNK ****/
- if (stream_read_uint32(qtmovie->stream) != 16)
- {
- trace ("unexpected size in media info\n");
- return 0;
- }
- if (stream_read_uint32(qtmovie->stream) != MAKEFOURCC('s','m','h','d'))
- {
- trace ("not a sound header! can't handle this.\n");
- return 0;
- }
- /* now skip the rest */
- stream_skip(qtmovie->stream, 16 - 8);
- size_remaining -= 16;
- /****/
-
- /**** DINF CHUNK ****/
- dinf_size = stream_read_uint32(qtmovie->stream);
- if (stream_read_uint32(qtmovie->stream) != MAKEFOURCC('d','i','n','f'))
- {
- trace ("expected dinf, didn't get it.\n");
- return 0;
- }
- /* skip it */
- stream_skip(qtmovie->stream, dinf_size - 8);
- size_remaining -= dinf_size;
- /****/
-
-
- /**** SAMPLE TABLE ****/
- stbl_size = stream_read_uint32(qtmovie->stream);
- if (stream_read_uint32(qtmovie->stream) != MAKEFOURCC('s','t','b','l'))
- {
- trace ("expected stbl, didn't get it.\n");
- return 0;
- }
- if (read_chunk_stbl(qtmovie, stbl_size) == 0)
- return 0;
- size_remaining -= stbl_size;
-
- if (size_remaining)
- {
- trace ("oops\n");
- stream_skip(qtmovie->stream, size_remaining);
- }
-
- return 1;
-}
-
-static int read_chunk_mdia(qtmovie_t *qtmovie, size_t chunk_len)
-{
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- while (size_remaining)
- {
- size_t sub_chunk_len;
- fourcc_t sub_chunk_id;
-
- sub_chunk_len = stream_read_uint32(qtmovie->stream);
- if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining)
- {
- trace ("strange size for chunk inside mdia\n");
- return 0;
- }
-
- sub_chunk_id = stream_read_uint32(qtmovie->stream);
-
- switch (sub_chunk_id)
- {
- case MAKEFOURCC('m','i','n','f'):
- if (read_chunk_minf(qtmovie, sub_chunk_len) == 0)
- return 0;
- break;
- default:
- trace ("(mdia) unknown chunk id: %c%c%c%c\n",
- SPLITFOURCC(sub_chunk_id));
- stream_skip(qtmovie->stream, sub_chunk_len - 8);
- break;;
- }
-
- size_remaining -= sub_chunk_len;
- }
-
- return 1;
-}
-
-/* 'trak' - a movie track - contains other atoms */
-static int read_chunk_trak(qtmovie_t *qtmovie, size_t chunk_len)
-{
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- while (size_remaining)
- {
- size_t sub_chunk_len;
- fourcc_t sub_chunk_id;
-
- sub_chunk_len = stream_read_uint32(qtmovie->stream);
- if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining)
- {
- trace ("strange size for chunk inside trak\n");
- return 0;
- }
-
- sub_chunk_id = stream_read_uint32(qtmovie->stream);
-
- switch (sub_chunk_id)
- {
- case MAKEFOURCC('t','k','h','d'):
- read_chunk_tkhd(qtmovie, sub_chunk_len);
- break;
- case MAKEFOURCC('m','d','i','a'):
- if (read_chunk_mdia(qtmovie, sub_chunk_len) == 0)
- return 0;
- break;
- case MAKEFOURCC('e','d','t','s'):
- read_chunk_edts(qtmovie, sub_chunk_len);
- break;
- default:
- trace ("(trak) unknown chunk id: %c%c%c%c\n",
- SPLITFOURCC(sub_chunk_id));
- return 0;
- }
-
- size_remaining -= sub_chunk_len;
- }
-
- return 1;
-}
-
-/* 'mvhd' movie header atom */
-static void read_chunk_mvhd(qtmovie_t *qtmovie, size_t chunk_len)
-{
- /* don't need anything from here atm, skip */
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- stream_skip(qtmovie->stream, size_remaining);
-}
-
-/* 'udta' user data.. contains tag info */
-static void read_chunk_udta(qtmovie_t *qtmovie, size_t chunk_len)
-{
- /* don't need anything from here atm, skip */
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- stream_skip(qtmovie->stream, size_remaining);
-}
-
-/* 'iods' */
-static void read_chunk_iods(qtmovie_t *qtmovie, size_t chunk_len)
-{
- /* don't need anything from here atm, skip */
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- stream_skip(qtmovie->stream, size_remaining);
-}
-
-/* 'moov' movie atom - contains other atoms */
-static int read_chunk_moov(qtmovie_t *qtmovie, size_t chunk_len)
-{
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- while (size_remaining)
- {
- size_t sub_chunk_len;
- fourcc_t sub_chunk_id;
-
- sub_chunk_len = stream_read_uint32(qtmovie->stream);
- if (sub_chunk_len <= 1 || sub_chunk_len > size_remaining)
- {
- trace ("strange size for chunk inside moov\n");
- return 0;
- }
-
- sub_chunk_id = stream_read_uint32(qtmovie->stream);
-
- switch (sub_chunk_id)
- {
- case MAKEFOURCC('m','v','h','d'):
- read_chunk_mvhd(qtmovie, sub_chunk_len);
- break;
- case MAKEFOURCC('t','r','a','k'):
- if (read_chunk_trak(qtmovie, sub_chunk_len) == 0)
- return 0;
- break;
- case MAKEFOURCC('u','d','t','a'):
- read_chunk_udta(qtmovie, sub_chunk_len);
- break;
- case MAKEFOURCC('e','l','s','t'):
- read_chunk_elst(qtmovie, sub_chunk_len);
- break;
- case MAKEFOURCC('i','o','d','s'):
- read_chunk_iods(qtmovie, sub_chunk_len);
- break;
- default:
- trace ("(moov) unknown chunk id: %c%c%c%c\n",
- SPLITFOURCC(sub_chunk_id));
- return 0;
- }
-
- size_remaining -= sub_chunk_len;
- }
-
- return 1;
-}
-
-static void read_chunk_mdat(qtmovie_t *qtmovie, size_t chunk_len, int skip_mdat)
-{
- size_t size_remaining = chunk_len - 8; /* FIXME WRONG */
-
- if (size_remaining == 0) return;
-
- qtmovie->res->mdat_len = (uint32_t)size_remaining;
- if (skip_mdat)
- {
- qtmovie->saved_mdat_pos = stream_tell(qtmovie->stream);
- stream_skip(qtmovie->stream, size_remaining);
- }
-#if 0
- qtmovie->res->mdat = malloc(size_remaining);
-
- stream_read(qtmovie->stream, size_remaining, qtmovie->res->mdat);
-#endif
-}
-
-static int set_saved_mdat(qtmovie_t *qtmovie)
-{
- if (qtmovie->saved_mdat_pos == -1)
- {
- trace ("stream contains mdat before moov but is not seekable\n");
- return 0;
- }
-
- if (stream_setpos(qtmovie->stream, qtmovie->saved_mdat_pos))
- {
- trace ("error while seeking stream to mdat pos\n");
- return 0;
- }
-
- return 1;
-}
-
-int qtmovie_read(stream_t *file, demux_res_t *demux_res)
-{
- int found_moov = 0;
- int found_mdat = 0;
- qtmovie_t *qtmovie;
-
- qtmovie = (qtmovie_t*)malloc(sizeof(qtmovie_t));
- memset (qtmovie, 0, sizeof (qtmovie_t));
-
- /* construct the stream */
- qtmovie->stream = file;
-
- qtmovie->res = demux_res;
-
- memset(demux_res, 0, sizeof(demux_res_t));
-
- /* read the chunks */
- while (1)
- {
- size_t chunk_len;
- fourcc_t chunk_id;
-
- chunk_len = stream_read_uint32(qtmovie->stream);
- if (stream_eof(qtmovie->stream))
- {
- free (qtmovie);
- return 0;
- }
-
- if (chunk_len == 1)
- {
- trace ("need 64bit support\n");
- free (qtmovie);
- return 0;
- }
- chunk_id = stream_read_uint32(qtmovie->stream);
-
- switch (chunk_id)
- {
- case MAKEFOURCC('f','t','y','p'):
- read_chunk_ftyp(qtmovie, chunk_len);
- break;
- case MAKEFOURCC('m','o','o','v'):
- if (read_chunk_moov(qtmovie, chunk_len) == 0) {
- free (qtmovie);
- return 0; /* failed to read moov, can't do anything */
- }
- if (found_mdat)
- {
- int res = set_saved_mdat(qtmovie);
- free (qtmovie);
- return res;
- }
- found_moov = 1;
- break;
- /* if we hit mdat before we've found moov, record the position
- * and move on. We can then come back to mdat later.
- * This presumes the stream supports seeking backwards.
- */
- case MAKEFOURCC('m','d','a','t'):
- read_chunk_mdat(qtmovie, chunk_len, !found_moov);
- if (found_moov) {
- free (qtmovie);
- return 1;
- }
- found_mdat = 1;
- break;
-
- /* these following atoms can be skipped !!!! */
- case MAKEFOURCC('f','r','e','e'):
- stream_skip(qtmovie->stream, chunk_len - 8); /* FIXME not 8 */
- break;
- default:
- trace ("(top) unknown chunk id: %c%c%c%c\n",
- SPLITFOURCC(chunk_id));
- free (qtmovie);
- return 0;
- }
-
- }
- free (qtmovie);
- return 0;
-}
-
-
-void qtmovie_free_demux (demux_res_t *demux_res) {
- if (demux_res->time_to_sample) {
- free (demux_res->time_to_sample);
- }
- if (demux_res->sample_byte_size) {
- free (demux_res->sample_byte_size);
- }
- memset (demux_res, 0, sizeof (demux_res_t));
-}

deadbeef-0.6.2.tar.bz2/plugins/alac/demux.h Deleted

@@ -1,64 +0,0 @@
-#ifndef DEMUX_H
-#define DEMUX_H
-
-#ifdef _WIN32
-	#include "stdint_win.h"
-#else
-	#include <stdint.h>
-#endif
-
-#include "stream.h"
-
-typedef uint32_t fourcc_t;
-
-typedef struct
-{
- int format_read;
-
- uint16_t num_channels;
- uint16_t sample_size;
- uint32_t sample_rate;
- fourcc_t format;
- void *buf;
-
- struct {
- uint32_t sample_count;
- uint32_t sample_duration;
- } *time_to_sample;
- uint32_t num_time_to_samples;
-
- uint32_t *sample_byte_size;
- uint32_t num_sample_byte_sizes;
-
- uint32_t codecdata_len;
- char codecdata64;
-
- uint32_t mdat_len;
-#if 0
- void *mdat;
-#endif
-} demux_res_t;
-
-int qtmovie_read(stream_t *stream, demux_res_t *demux_res);
-
-#ifndef MAKEFOURCC
-#define MAKEFOURCC(ch0, ch1, ch2, ch3) ( \
- ( (int32_t)(char)(ch0) << 24 ) | \
- ( (int32_t)(char)(ch1) << 16 ) | \
- ( (int32_t)(char)(ch2) << 8 ) | \
- ( (int32_t)(char)(ch3) ) )
-#endif
-
-#ifndef SLPITFOURCC
-/* splits it into ch0, ch1, ch2, ch3 - use for printf's */
-#define SPLITFOURCC(code) \
- (char)((int32_t)code >> 24), \
- (char)((int32_t)code >> 16), \
- (char)((int32_t)code >> 8), \
- (char)code
-#endif
-
-void qtmovie_free_demux (demux_res_t *demux_res);
-
-#endif /* DEMUX_H */
-

deadbeef-0.6.2.tar.bz2/plugins/alac/stream.c Deleted

@@ -1,186 +0,0 @@
-/*
- * ALAC (Apple Lossless Audio Codec) decoder
- * Copyright (c) 2005 David Hammerton
- * All rights reserved.
- *
- * Basic stream reading
- *
- * http://crazney.net/programs/itunes/alac.html
- * 
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#ifdef _WIN32
-	#include "stdint_win.h"
-#else
-	#include <stdint.h>
-#endif
-
-#include "stream.h"
-
-extern DB_functions_t *deadbeef;
-
-#define _Swap32(v) do { \
- v = (((v) & 0x000000FF) << 0x18) | \
- (((v) & 0x0000FF00) << 0x08) | \
- (((v) & 0x00FF0000) >> 0x08) | \
- (((v) & 0xFF000000) >> 0x18); } while(0)
-
-#define _Swap16(v) do { \
- v = (((v) & 0x00FF) << 0x08) | \
- (((v) & 0xFF00) >> 0x08); } while (0)
-
-extern int host_bigendian;
-
-struct stream_tTAG {
- DB_FILE *f;
- int bigendian;
- int eof;
- int64_t junk_offset;
-};
-
-void stream_read(stream_t *stream, size_t size, void *buf)
-{
- size_t ret;
-
- ret = deadbeef->fread(buf, 4, size >> 2, stream->f) * 4;
- ret += deadbeef->fread((char*)buf + ret, 1, size - ret, stream->f);
-
- if (ret == 0 && size != 0) stream->eof = 1;
-}
-
-int32_t stream_read_int32(stream_t *stream)
-{
- int32_t v;
- stream_read(stream, 4, &v);
- if ((stream->bigendian && !host_bigendian) ||
- (!stream->bigendian && host_bigendian))
- {
- _Swap32(v);
- }
- return v;
-}
-
-uint32_t stream_read_uint32(stream_t *stream)
-{
- uint32_t v;
- stream_read(stream, 4, &v);
- if ((stream->bigendian && !host_bigendian) ||
- (!stream->bigendian && host_bigendian))
- {
- _Swap32(v);
- }
- return v;
-}
-
-int16_t stream_read_int16(stream_t *stream)
-{
- int16_t v;
- stream_read(stream, 2, &v);
- if ((stream->bigendian && !host_bigendian) ||
- (!stream->bigendian && host_bigendian))
- {
- _Swap16(v);
- }
- return v;
-}
-
-uint16_t stream_read_uint16(stream_t *stream)
-{
- uint16_t v;
- stream_read(stream, 2, &v);
- if ((stream->bigendian && !host_bigendian) ||
- (!stream->bigendian && host_bigendian))
- {
- _Swap16(v);
- }
- return v;
-}
-
-int8_t stream_read_int8(stream_t *stream)
-{
- int8_t v;
- stream_read(stream, 1, &v);
- return v;
-}
-
-uint8_t stream_read_uint8(stream_t *stream)
-{
- uint8_t v;
- stream_read(stream, 1, &v);
- return v;
-}
-
-
-void stream_skip(stream_t *stream, int64_t skip)
-{
- if (deadbeef->fseek(stream->f, skip, SEEK_CUR) == 0) return;
- if (errno == ESPIPE)
- {
- char *buffer = malloc(skip);
- stream_read(stream, skip, buffer);
- free(buffer);
- }
-}
-
-int stream_eof(stream_t *stream)
-{
- return stream->eof;
-}
-
-int64_t stream_tell(stream_t *stream)
-{
- int64_t res = deadbeef->ftell(stream->f); /* returns -1 on error */
- if (res < 0) {
- return res;
- }
- return res - stream->junk_offset;
-}
-
-int64_t stream_setpos(stream_t *stream, int64_t pos)
-{
- return deadbeef->fseek(stream->f, pos + stream->junk_offset, SEEK_SET);
-}
-
-stream_t *stream_create_file(DB_FILE *file, int bigendian, int64_t junk_offset)
-{
- stream_t *new_stream;
-
- new_stream = (stream_t*)malloc(sizeof(stream_t));
- memset (new_stream, 0, sizeof (new_stream));
- new_stream->f = file;
- new_stream->bigendian = bigendian;
- new_stream->eof = 0;
- new_stream->junk_offset = 0;//junk_offset;
-
- return new_stream;
-}
-
-void stream_destroy(stream_t *stream)
-{
- free(stream);
-}
-

deadbeef-0.6.2.tar.bz2/plugins/alac/stream.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/ao Deleted

deadbeef-0.6.2.tar.bz2/plugins/ao/COPYING Deleted

@@ -1,255 +0,0 @@
-AudioOverload DeaDBeeF plugin
-Copyright (C) 2009-2014 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.
-
-
-
-Here is a list of the licenses each file in this package are under, and their text.
-
-The upshot is this: if you create anything from this SDK and include any MAME licensed components
-(which are an integral part of each engine supplied) you must distribute the source code to your
-derivative program.
-
-
-=====================================================================================
-
-BSD license:
-
-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.
-
-=====================================================================================
-
-MAME license:
-
-Copyright (c) 1997-2008, Nicola Salmoria and the MAME team
-All rights reserved.
-
-Redistribution and use of this code or any derivative works are permitted provided that the following conditions are met:
-
- * Redistributions may not be sold, nor may they be used in a commercial product or activity.
- * Redistributions that are modified from the original source must include the complete source code, including the source code for all components used by a binary built from the modified sources. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
- * Redistributions 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.
-
-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.
-
-=====================================================================================
-
-GPL license:
-
-Too long to include here.
-
-See eng_psf/peops/License.txt or eng_psf/peops2/License.txt for the complete text.
-
-While legally combining GPL with BSD and MAME licensed software is unclear, Pete Bernert 
-will probably be OK with anything you do as long as you distribute the source for your
-AOSDK based creations.
-										 
-=====================================================================================
-
-ZLIB license:
-
-/* zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.2, October 3rd, 2004
-
- Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Jean-loup Gailly jloup@gzip.org
- Mark Adler madler@alumni.caltech.edu
-
-*/
-
-=====================================================================================
-
-List of files and their licenses:
-
-ao.h			BSD
-corlett.c		BSD 
-corlett.h		BSD 
-cpuintrf.h		BSD 
-dsnd.c			BSD 
-eng_protos.h		BSD 
-main.c			BSD 
-Makefile		BSD 
-mem.h			BSD 
-osd_cpu.h		MAME
-oss.c			BSD 
-oss.h			BSD 
-
-eng_dsf:
-
-aica.c			MAME
-aica.h			MAME
-aicadsp.c		MAME
-aicadsp.h		MAME
-aicalfo.c		MAME
-arm7.c			MAME
-arm7.h			MAME
-arm7i.c			MAME
-arm7i.h			MAME
-arm7memil.c		MAME
-eng_dsf.c		BSD
-dc_hw.c			BSD
-dc_hw.h			BSD
-
-eng_qsf:
-
-eng_qsf.c		BSD
-kabuki.c		MAME
-qsound.c		MAME
-qsound.h		MAME
-z80.c			MAME
-z80dasm.c		MAME
-z80dasm.h		MAME
-z80.h			MAME
-
-eng_ssf:
-
-eng_ssf.c		BSD
-m68kconf.h		MAME
-m68kcpu.c		MAME
-m68kcpu.h		MAME
-m68k.h			MAME
-m68k_in.c		MAME
-m68kmake.c		MAME
-m68kmame.h		MAME
-m68kopac.c		MAME
-m68kopdm.c		MAME
-m68kopnz.c		MAME
-m68kops.c		MAME
-m68kops.h		MAME
-sat_hw.c		BSD
-sat_hw.h		BSD
-scsp.c			MAME
-scspdsp.c		MAME
-scspdsp.h		MAME
-scsp.h			MAME
-scsplfo.c		MAME
-
-eng_psf:
-
-eng_psf2.c		BSD
-eng_psf.c		BSD
-eng_spu.c		BSD
-psx_hw.c		BSD
-psx.c			MAME
-psx.h			MAME
-cpuintrf.h		MAME
-mamemem.h		MAME
-
-eng_psf/peops:
-
-adsr.c			GPL
-adsr.h			GPL
-dma.c			GPL
-dma.h			GPL
-externals.h		GPL
-gauss_i.h		GPL
-registers.c		GPL
-registers.h		GPL
-regs.h			GPL
-reverb.c		GPL
-spu.c			GPL
-spu.h			GPL
-stdafx.h		GPL
-
-
-eng_psf/peops2:
-
-adsr.c			GPL
-adsr.h			GPL
-dma.c			GPL
-dma.h			GPL
-externals.h		GPL
-gauss_i.h		GPL
-psemuxa.h		GPL
-registers.c		GPL
-registers.h		GPL
-regs.h			GPL
-reverb.c		GPL
-reverb.h		GPL
-spu.c			GPL
-spu.h			GPL
-stdafx.h		GPL
-xa.c			GPL
-
-
-
-zlib:
-
-adler32.c		ZLIB
-compress.c		ZLIB
-crc32.c			ZLIB
-crc32.h			ZLIB
-crypt.h			ZLIB
-deflate.c		ZLIB
-deflate.h		ZLIB
-gzio.c			ZLIB
-infback.c		ZLIB
-inffast.c		ZLIB
-inffast.h		ZLIB
-inffixed.h		ZLIB
-inflate.c		ZLIB
-inflate.h		ZLIB
-inftrees.c		ZLIB
-inftrees.h		ZLIB
-ioapi.c			ZLIB
-ioapi.h			ZLIB
-trees.c			ZLIB
-trees.h			ZLIB
-uncompr.c		ZLIB
-unzip.c			ZLIB
-unzip.h			ZLIB
-zconf.h			ZLIB
-zlib.h			ZLIB
-zutil.c			ZLIB
-zutil.h			ZLIB
-

deadbeef-0.6.2.tar.bz2/plugins/ao/Makefile.am Deleted

@@ -1,27 +0,0 @@
-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 -avoid-version $(ZLIB_LIBS)
-
-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) $(ZLIB_CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC 
-endif
-

deadbeef-0.6.2.tar.bz2/plugins/ao/Makefile.in Deleted

@@ -1,1071 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 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@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\\ \	*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -dEDm) skip_next=yes;; \
- -JT) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/depcomp COPYING
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/intmax.m4 \
-	$(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(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, filesdir }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-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_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-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)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-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_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 = 
-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_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 = 
-SOURCES = $(ddb_ao_la_SOURCES)
-DIST_SOURCES = $(am__ddb_ao_la_SOURCES_DIST)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items$$0 = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-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_CFLAGS = @CDDA_CFLAGS@
-CDDA_LIBS = @CDDA_LIBS@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-COREAUDIO_LIBS = @COREAUDIO_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURL_CFLAGS = @CURL_CFLAGS@
-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_CFLAGS = @FAAD2_CFLAGS@
-FAAD2_LIBS = @FAAD2_LIBS@
-FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
-FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
-FGREP = @FGREP@
-FLAC_CFLAGS = @FLAC_CFLAGS@
-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@
-GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
-GTK_MAC_LIBS = @GTK_MAC_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_CFLAGS = @HOTKEYS_CFLAGS@
-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@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBS = @INTL_LIBS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JPEG_DEPS_CFLAGS = @JPEG_DEPS_CFLAGS@
-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_CFLAGS = @MAD_CFLAGS@
-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@
-NOCPPLIB = @NOCPPLIB@
-NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
-NOTIFY_LIBS = @NOTIFY_LIBS@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_CFLAGS = @OGG_CFLAGS@
-OGG_LIBS = @OGG_LIBS@
-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_CFLAGS = @PNG_DEPS_CFLAGS@
-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_CFLAGS = @SNDFILE_CFLAGS@
-SNDFILE_LIBS = @SNDFILE_LIBS@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
-VFS_CURL_LIBS = @VFS_CURL_LIBS@
-VORBIS_CFLAGS = @VORBIS_CFLAGS@
-VORBIS_LIBS = @VORBIS_LIBS@
-WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
-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_CFLAGS = @ZIP_CFLAGS@
-ZIP_LIBS = @ZIP_LIBS@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
-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@
-ac_ct_OBJC = @ac_ct_OBJC@
-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@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-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 -avoid-version $(ZLIB_LIBS)
-@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) $(ZLIB_CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC 
-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)
-	@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 " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
-	 $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
-	 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)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
-	 sort -u`; \
-	test -z "$$locs" || { \
-	 echo rm -f $${locs}; \
-	 rm -f $${locs}; \
-	}
-
-ddb_ao.la: $(ddb_ao_la_OBJECTS) $(ddb_ao_la_DEPENDENCIES) $(EXTRA_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_dsf/aica.c' object='aica.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_dsf/aicadsp.c' object='aicadsp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_dsf/arm7.c' object='arm7.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_dsf/arm7i.c' object='arm7i.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/m68kcpu.c' object='m68kcpu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/m68kopac.c' object='m68kopac.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/m68kopdm.c' object='m68kopdm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/m68kopnz.c' object='m68kopnz.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/m68kops.c' object='m68kops.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/scsp.c' object='scsp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_ssf/scspdsp.c' object='scspdsp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_qsf/kabuki.c' object='kabuki.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_qsf/qsound.c' object='qsound.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_qsf/z80.c' object='z80.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_qsf/z80dasm.c' object='z80dasm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='eng_psf/psx.c' object='psx.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	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-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	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"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	 *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	 if test -f "$$i"; then \
-	 echo "$(subdir)/$$i"; \
-	 else \
-	 echo "$$sdir/$$i"; \
-	 fi; \
-	done >> $(top_builddir)/cscope.files
-
-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:
-	if test -z '$(STRIP)'; then \
-	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 install; \
-	else \
-	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-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 TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
-	ctags-am 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 tags-am 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.6.2.tar.bz2/plugins/ao/ao.h Deleted

@@ -1,231 +0,0 @@
-//
-// 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 title9MAX_DISP_INFO_LENGTH;
-	char info9MAX_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.6.2.tar.bz2/plugins/ao/eng_dsf Deleted

deadbeef-0.6.2.tar.bz2/plugins/ao/eng_dsf/aica.c Deleted

@@ -1,1281 +0,0 @@
-/*
- 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.data0x0>>0x0)&0x8000)
-#define KEYONB(slot)		((slot->udata.data0x0>>0x0)&0x4000)
-#define SSCTL(slot)		((slot->udata.data0x0>>0xA)&0x0001)
-#define LPCTL(slot)		((slot->udata.data0x0>>0x9)&0x0001)
-#define PCMS(slot)		((slot->udata.data0x0>>0x7)&0x0003)
-
-#define SA(slot)		(((slot->udata.data0x0&0x7F)<<16)|(slot->udata.data0x4/2))
-
-#define LSA(slot)		(slot->udata.data0x8/2)
-
-#define LEA(slot)		(slot->udata.data0xc/2)
-
-#define D2R(slot)		((slot->udata.data0x10/2>>0xB)&0x001F)
-#define D1R(slot)		((slot->udata.data0x10/2>>0x6)&0x001F)
-#define AR(slot)		((slot->udata.data0x10/2>>0x0)&0x001F)
-
-#define LPSLNK(slot)		((slot->udata.data0x14/2>>0x0)&0x4000)
-#define KRS(slot)		((slot->udata.data0x14/2>>0xA)&0x000F)
-#define DL(slot)		((slot->udata.data0x14/2>>0x5)&0x001F)
-#define RR(slot)		((slot->udata.data0x14/2>>0x0)&0x001F)
-
-#define TL(slot)		((slot->udata.data0x28/2>>0x8)&0x00FF)
-
-#define OCT(slot)		((slot->udata.data0x18/2>>0xB)&0x000F)
-#define FNS(slot)		((slot->udata.data0x18/2>>0x0)&0x03FF)
-
-#define LFORE(slot)		((slot->udata.data0x1c/2>>0x0)&0x8000)
-#define LFOF(slot)		((slot->udata.data0x1c/2>>0xA)&0x001F)
-#define PLFOWS(slot)		((slot->udata.data0x1c/2>>0x8)&0x0003)
-#define PLFOS(slot)		((slot->udata.data0x1c/2>>0x5)&0x0007)
-#define ALFOWS(slot)		((slot->udata.data0x1c/2>>0x3)&0x0003)
-#define ALFOS(slot)		((slot->udata.data0x1c/2>>0x0)&0x0007)
-
-#define ISEL(slot)		((slot->udata.data0x20/2>>0x0)&0x000F)
-#define IMXL(slot)		((slot->udata.data0x20/2>>0x4)&0x000F)
-
-#define DISDL(slot)		((slot->udata.data0x24/2>>0x8)&0x000F)
-#define DIPAN(slot)		((slot->udata.data0x24/2>>0x0)&0x001F)
-
-#define EFSDL(slot)		((AICA->EFSPANslot*4>>8)&0x000f)
-#define EFPAN(slot)		((AICA->EFSPANslot*4>>0)&0x001f) 
-
-//Envelope times in ms
-static const double ARTimes64={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 DRTimes64={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_Table0x400;
-static INT32 EG_TABLE0x400;
-
-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 data0x40;	//only 0x1a bytes used
-		UINT8 datab0x80;
-	} 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.data0>>0x0)&0x0200)
-#define DAC18B(aica)		((aica->udata.data0>>0x0)&0x0100)
-#define MVOL(aica)		((aica->udata.data0>>0x0)&0x000F)
-#define RBL(aica)		((aica->udata.data2>>0xD)&0x0003)
-#define RBP(aica)		((aica->udata.data2>>0x0)&0x0fff)
-#define MOFULL(aica) 		((aica->udata.data4>>0x0)&0x1000)
-#define MOEMPTY(aica)		((aica->udata.data4>>0x0)&0x0800)
-#define MIOVF(aica)		((aica->udata.data4>>0x0)&0x0400)
-#define MIFULL(aica)		((aica->udata.data4>>0x0)&0x0200)
-#define MIEMPTY(aica)		((aica->udata.data4>>0x0)&0x0100)
-
-#define AFSEL(aica)		((aica->udata.data6>>0x0)&0x4000)
-#define MSLC(aica)		((aica->udata.data6>>0x8)&0x3F)
-
-#define SCILV0(aica) 	((aica->udata.data0xa8/2>>0x0)&0xff)
-#define SCILV1(aica) 	((aica->udata.data0xac/2>>0x0)&0xff)
-#define SCILV2(aica) 	((aica->udata.data0xb0/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 data0xc0/2;
-		UINT8 datab0xc0;
-	} udata;
-	UINT16 IRQL, IRQR;
-	UINT16 EFSPAN0x48;
-	struct _SLOT Slots64;
-	signed short RINGBUF64;
-	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 MidiStack16;
-	UINT8 MidiW,MidiR;
-
-	int LPANTABLE0x20000;
-	int RPANTABLE0x20000;
-
-	int TimPris3;
-	int TimCnt3;
-
-	// DMA stuff
-	UINT32 aica_dmea;
-	UINT16 aica_drga;
-	UINT16 aica_dtlg;
-
-	int ARTABLE64, DRTABLE64;
-
-	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 SDLT16={-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.data0xa4/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.data0xa0/2;
-	UINT32 en=AICA->udata.data0x9c/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->ARTABLERate;
-}
-
-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->DRTABLERate;
-}
-
-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->DRTABLERate;
-}
-
-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_TableFNS(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 TableQuant8={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_mul16= { 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;
-}
-
-static 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*TableQuantDelta&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->AICARAMstart_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.data0xc/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.data0&=~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_ram0;
-			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_Tablei=(float) (1<<SHIFT) *fcent;
-	}
-
-	for(i=0;i<0x400;++i)
-	{
-		float envDB=((float)(3*(i-0x3ff)))/32.0;
-		float scale=(float)(1<<SHIFT);
-		EG_TABLEi=(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,(SDLTiSDL)/20.0);
-		else
-			fSDL=0.0;
-
-		AICA->LPANTABLEi=FIX((4.0*LPAN*TL*fSDL));
-		AICA->RPANTABLEi=FIX((4.0*RPAN*TL*fSDL));
-	}
-
-	AICA->ARTABLE0=AICA->DRTABLE0=0;	//Infinite time
-	AICA->ARTABLE1=AICA->DRTABLE1=0;	//Infinite time
-	for(i=2;i<64;++i)
-	{
-		double t,step,scale;
-		t=ARTimesi;	//In ms
-		if(t!=0.0)
-		{
-			step=(1023*1000.0)/((float) 44100.0f*t);
-			scale=(double) (1<<EG_SHIFT);
-			AICA->ARTABLEi=(int) (step*scale);
-		}
-		else
-			AICA->ARTABLEi=1024<<EG_SHIFT;
-
-		t=DRTimesi;	//In ms
-		step=(1023*1000.0)/((float) 44100.0f*t);
-		scale=(double) (1<<EG_SHIFT);
-		AICA->DRTABLEi=(int) (step*scale);
-	}
-
-	// make sure all the slots are off
-	for(i=0;i<64;++i)
-	{
-		AICA->Slotsi.slot=i;
-		AICA->Slotsi.active=0;
-		AICA->Slotsi.base=NULL;
-		AICA->Slotsi.EG.state=RELEASE;
-		AICA->Slotsi.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"
-	AICA0.udata.data0xa0/2 = 0;
-	//AICA1.udata.data0x20/2 = 0;
-	AICA->TimCnt0 = 0xffff;
-	AICA->TimCnt1 = 0xffff;
-	AICA->TimCnt2 = 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.data0x10 &= 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.data0&=~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.data0x24/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.data0x8/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->TimPris0=1<<((AICA->udata.data0x90/2>>8)&0x7);
-				AICA->TimCnt0=(AICA->udata.data0x90/2&0xff)<<8;
-			}
-			break;
-		case 0x94:
-		case 0x95:
-			if(AICA->Master)
-			{
-				AICA->TimPris1=1<<((AICA->udata.data0x94/2>>8)&0x7);
-				AICA->TimCnt1=(AICA->udata.data0x94/2&0xff)<<8;
-			}
-			break;
-		case 0x98:
-		case 0x99:
-			if(AICA->Master)
-			{
-				AICA->TimPris2=1<<((AICA->udata.data0x98/2>>8)&0x7);
-				AICA->TimCnt2=(AICA->udata.data0x98/2&0xff)<<8;
-			}
-			break;
-		case 0xa4:	//SCIRE
-		case 0xa5:
-
-			if(AICA->Master)		 
-			{
-				AICA->udata.data0xa0/2 &= ~AICA->udata.data0xa4/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->TimCnt0 >= 0xff00)
-				{
-					AICA->udata.data0xa0/2 |= 0x40;
-				}
-				if (AICA->TimCnt1 >= 0xff00)
-				{
-					AICA->udata.data0xa0/2 |= 0x80;
-				}
-				if (AICA->TimCnt2 >= 0xff00)
-				{
-					AICA->udata.data0xa0/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.data0x8/2;
-				v&=0xff00;
-				v|=AICA->MidiStackAICA->MidiR;
-				AICA->IntARMCB(AICA->cpu, 0);	// cancel the IRQ
-				if(AICA->MidiR!=AICA->MidiW)
-				{
-					++AICA->MidiR;
-					AICA->MidiR&=15;
-				}
-				AICA->udata.data0x8/2=v;
-			}
-			break;
-
-		case 0x10:	// LP check
-		case 0x11:
-			{
-				//int MSLC = (AICA->udata.data0xc/2>>8) & 0x3f;	// which slot are we monitoring?
-			}
-			break;
-			
-		case 0x14:	// CA (slot address)
-		case 0x15:
-			{
-				int MSLC = (AICA->udata.data0xc/2>>8) & 0x3f;	// which slot are we monitoring?
-				unsigned int CA = AICA->SlotsMSLC.cur_addr>>(SHIFT+12);
-
-				AICA->udata.data0x14/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->Slotsslot.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->EFSPANaddr&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->Slotsslot.udata.datab+(addr)));
-	}
-	else if(addr<0x3000)
-	{
-		if (addr <= 0x2044)
-		{
-			v = AICA->EFSPANaddr&0x7f;
-		}
-		else if (addr < 0x28be)
-		{
-			AICA_UpdateRegR(AICA, addr&0xff);
-			v= *((unsigned short *) (AICA->udata.datab+((addr&0xff))));
-			if((addr&0xfe)==0x10) AICA->udata.data0x10/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->TimCnt0<=0xff00)
-	{
- 		AICA->TimCnt0 += ticks << (8-((AICA->udata.data0x90/2>>8)&0x7));
-		if (AICA->TimCnt0 >= 0xFF00)
-		{
-			AICA->TimCnt0 = 0xFFFF;
-			AICA->udata.data0xa0/2|=0x40;
-		}
-		AICA->udata.data0x90/2&=0xff00;
-		AICA->udata.data0x90/2|=AICA->TimCnt0>>8;
-	}
-
-	if(AICA->TimCnt1<=0xff00)
-	{
-		AICA->TimCnt1 += ticks << (8-((AICA->udata.data0x94/2>>8)&0x7));
-		if (AICA->TimCnt1 >= 0xFF00)
-		{
-			AICA->TimCnt1 = 0xFFFF;
-			AICA->udata.data0xa0/2|=0x80;
-		}
-		AICA->udata.data0x94/2&=0xff00;
-		AICA->udata.data0x94/2|=AICA->TimCnt1>>8;
-	}
-
-	if(AICA->TimCnt2<=0xff00)
-	{
-		AICA->TimCnt2 += ticks << (8-((AICA->udata.data0x98/2>>8)&0x7));
-		if (AICA->TimCnt2 >= 0xFF00)
-		{
-			AICA->TimCnt2 = 0xFFFF;
-			AICA->udata.data0xa0/2|=0x100;
-		}
-		AICA->udata.data0x98/2&=0xff00;
-		AICA->udata.data0x98/2|=AICA->TimCnt2>>8;
-	}
-}
-
-static 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 = p10 << 8;
-		nxt_sample = p20 << 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(p10);
-		nxt_sample = LE16(p20);
-	}
-	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.data8 |= 0x8000;
-		AICA_StopSlot(slot,0);
-		}
-		break;
-	case 1: //normal loop
-		if(addr2>=LEA(slot))
-		{
-			INT32 rem_addr;
-			if(slot->mslc) AICA->udata.data8 |= 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->AICARAMSA(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_TABLEEG_Update(slot)>>(SHIFT-10))>>SHIFT;
-		
-	if(slot->mslc) 
-	{
-		AICA->udata.data0x14/2 = addr1;
-		if (!(AFSEL(AICA)))
-		{
-			UINT16 res;
-
-			AICA->udata.data0x10/2 |= slot->EG.state<<13;
-
-			res = 0x3FF - (slot->EG.volume>>EG_SHIFT);
-
-			res *= 959;
-			res /= 1024;
-
-			if (res > 959) res = 959;
-
-			AICA->udata.data0x10/2 = res;
-
-			//AICA->udata.data0x10/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->Slotssl.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->LPANTABLEEnc)>>(SHIFT-2),ISEL(slot),IMXL(slot));
-				Enc=((TL(slot))<<0x0)|((DIPAN(slot))<<0x8)|((DISDL(slot))<<0xd);
-				{
-					smpl+=(sample*AICA->LPANTABLEEnc)>>SHIFT;
-					smpr+=(sample*AICA->RPANTABLEEnc)>>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.EFREGi*AICA->LPANTABLEEnc)>>SHIFT;
-				smpr+=(AICA->DSP.EFREGi*AICA->RPANTABLEEnc)>>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 = buf0;
-	AICA->bufferr = buf1;
-	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_callback0;
-
-//		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->MidiStackAICA->MidiW++=data;
-	AICA->MidiW &= 15;
-}
-
-READ16_HANDLER( AICA_MidiOutR )
-{
-	unsigned char val;
-
-	val=AICA->MidiStackAICA->MidiR++;
-	AICA->MidiR&=7;
-	return val;
-}
-

deadbeef-0.6.2.tar.bz2/plugins/ao/eng_psf Deleted

deadbeef-0.6.2.tar.bz2/plugins/ao/eng_psf/eng_psf.c Deleted

@@ -1,494 +0,0 @@
-/*
-	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 psfby256;
- 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);
- libpathe-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 = file0x18 | file0x19<<8 | file0x1a<<16 | file0x1b<<24;
-	printf("Text section start: %x\n", offset);
-	offset = file0x1c | file0x1d<<8 | file0x1e<<16 | file0x1f<<24;
-	printf("Text section size: %x\n", offset);
-	printf("Region: %s\n", &file0x4c);
-	printf("refresh: %s\n", c->inf_refresh);			
-	#endif
-
-	PC = file0x10 | file0x11<<8 | file0x12<<16 | file0x13<<24;
-	GP = file0x14 | file0x15<<8 | file0x16<<16 | file0x17<<24;
-	SP = file0x30 | file0x31<<8 | file0x32<<16 | file0x33<<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_refresh0 == '5')
-	{
-		s->mips_cpu->psf_refresh = 50;
-	}
-	if (s->c->inf_refresh0 == '6')
-	{
-		s->mips_cpu->psf_refresh = 60;
-	}
-
-	// Get the library file, if any
-	if (s->c->lib0 != 0)
-	{
-		uint64 tmp_length;
- char libpathPATH_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_decoded0x18 | lib_decoded0x19<<8 | lib_decoded0x1a<<16 | lib_decoded0x1b<<24;
-		printf("Text section start: %x\n", offset);
-		offset = lib_decoded0x1c | lib_decoded0x1d<<8 | lib_decoded0x1e<<16 | lib_decoded0x1f<<24;
-		printf("Text section size: %x\n", offset);
-		printf("Region: %s\n", &lib_decoded0x4c);
-		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_refresh0 == '5')
-			{
-				s->mips_cpu->psf_refresh = 50;
-			}
-			if (lib->inf_refresh0 == '6')
-			{
-				s->mips_cpu->psf_refresh = 60;
-			}
-		}
-
-		PC = lib_decoded0x10 | lib_decoded0x11<<8 | lib_decoded0x12<<16 | lib_decoded0x13<<24;
-		GP = lib_decoded0x14 | lib_decoded0x15<<8 | lib_decoded0x16<<16 | lib_decoded0x17<<24;
-		SP = lib_decoded0x30 | lib_decoded0x31<<8 | lib_decoded0x32<<16 | lib_decoded0x33<<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_decoded0x18 | lib_decoded0x19<<8 | lib_decoded0x1a<<16 | lib_decoded0x1b<<24;
-		offset &= 0x3fffffff;	// kill any MIPS cache segment indicators
-		plength = lib_decoded0x1c | lib_decoded0x1d<<8 | lib_decoded0x1e<<16 | lib_decoded0x1f<<24;
-		#if DEBUG_LOADER
-		printf("library offset: %x plength: %d\n", offset, plength);
-		#endif
-		memcpy(&s->mips_cpu->psx_ramoffset/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 = file0x18 | file0x19<<8 | file0x1a<<16 | file0x1b<<24;
-	offset &= 0x3fffffff;	// kill any MIPS cache segment indicators
-	plength = file0x1c | file0x1d<<8 | file0x1e<<16 | file0x1f<<24;
-
-	// Philosoma has an illegal "plength". *sigh*
-	if (plength > (file_len-2048))
-	{
-		plength = file_len-2048;
-	}
-	memcpy(&s->mips_cpu->psx_ramoffset/4, file+2048, plength);
-
-	// load any auxiliary libraries now
-	for (i = 0; i < 8; i++)
-	{
-		if (s->c->libauxi0 != 0)
-		{
-			uint64 tmp_length;
- char libpathPATH_MAX;
- ao_getlibpath (path, s->c->libauxi, 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_decoded0x18 | alib_decoded0x19<<8 | alib_decoded0x1a<<16 | alib_decoded0x1b<<24;
-			printf("Text section start: %x\n", offset);
-			offset = alib_decoded0x1c | alib_decoded0x1d<<8 | alib_decoded0x1e<<16 | alib_decoded0x1f<<24;
-			printf("Text section size: %x\n", offset);
-			printf("Region: %s\n", &alib_decoded0x4c);
-			#endif
-
-			// now patch the file into RAM
-			offset = alib_decoded0x18 | alib_decoded0x19<<8 | alib_decoded0x1a<<16 | alib_decoded0x1b<<24;
-			offset &= 0x3fffffff;	// kill any MIPS cache segment indicators
-			plength = alib_decoded0x1c | alib_decoded0x1d<<8 | alib_decoded0x1e<<16 | alib_decoded0x1f<<24;
-			memcpy(&s->mips_cpu->psx_ramoffset/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_namei, "psfby"))
-				strcpy(s->psfby, s->c->tag_datai);
-		}
-	}
-
-	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_ram0xbc090/4 == LE32(0x0802f040))
-			{
-		 		s->mips_cpu->psx_ram0xbc090/4 = LE32(0);
-				s->mips_cpu->psx_ram0xbc094/4 = LE32(0x0802f040);
-				s->mips_cpu->psx_ram0xbc098/4 = LE32(0);
-			}
-		}
-	}
-
-//	psx_ram0x118b8/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->title1, "Name: ");
-	sprintf(info->info1, "%s", s->c->inf_title);
-
-	strcpy(info->title2, "Game: ");
-	sprintf(info->info2, "%s", s->c->inf_game);
-	
-	strcpy(info->title3, "Artist: ");
-	sprintf(info->info3, "%s", s->c->inf_artist);
-
-	strcpy(info->title4, "Copyright: ");
-	sprintf(info->info4, "%s", s->c->inf_copy);
-
-	strcpy(info->title5, "Year: ");
-	sprintf(info->info5, "%s", s->c->inf_year);
-
-	strcpy(info->title6, "Length: ");
-	sprintf(info->info6, "%s", s->c->inf_length);
-
-	strcpy(info->title7, "Fade: ");
-	sprintf(info->info7, "%s", s->c->inf_fade);
-
-	strcpy(info->title8, "Ripper: ");
-	sprintf(info->info8, "%s", s->psfby);
-
-	return AO_SUCCESS;
-}

deadbeef-0.6.2.tar.bz2/plugins/ao/eng_psf/peops Deleted

deadbeef-0.6.2.tar.bz2/plugins/ao/eng_psf/peops2 Deleted

deadbeef-0.6.2.tar.bz2/plugins/ao/eng_psf/psx_hw.c Deleted

@@ -1,3393 +0,0 @@
-/*
-	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->threadstateNamesTS_MAXSTATE = { "RUNNING", "READY", "WAITEVFLAG", "WAITSEMA", "WAITDELAY", "SLEEPING", "CREATED" };
-#endif
-
-#if DEBUG_HLE_IOP
-static char *seek_types3 = { "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->threadsiThread.save_regsi = mipsinfo.i;
-	}
-	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
-	cpu->threadsiThread.save_regs32 = mipsinfo.i;
-	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
-	cpu->threadsiThread.save_regs33 = mipsinfo.i;
-	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
-	cpu->threadsiThread.save_regs35 = mipsinfo.i;
-	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
-	cpu->threadsiThread.save_regs36 = 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->threadsiThread.save_regs34 = mipsinfo.i;
-
-	#if DEBUG_THREADING
-	{
-		char buffer256;
-
-		DasmMIPS(buffer, mipsinfo.i, &psx_ram(mipsinfo.i & 0x7fffffff)/4);
-
-		printf("IOP: FreezeThread(%d) => %08x %s\n", iThread, cpu->threadsiThread.save_regs34, buffer);
-	}
-	#endif
-
-	// if thread was running, now it's ready
-	if (cpu->threadsiThread.iState == TS_RUNNING)
-	{
-		cpu->threadsiThread.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->threadsiThread.iState == TS_CREATED)
-	{
-		// PC = starting routine
-		cpu->threadsiThread.save_regs34 = cpu->threadsiThread.routine-4;	// compensate for weird delay slot effects
-		// SP = thread's stack area
-		cpu->threadsiThread.save_regs29 = (cpu->threadsiThread.stackloc + cpu->threadsiThread.stacksize) - 16;
-		cpu->threadsiThread.save_regs29 |= 0x80000000;
-
-		cpu->threadsiThread.save_regs35 = cpu->threadsiThread.save_regs36 = 0;
-
-		#if DEBUG_THREADING
-//		printf("IOP: Initial setup for thread %d => PC %x SP %x\n", iThread, cpu->threadsiThread.save_regs34+4, cpu->threadsiThread.save_regs29);
-		#endif
-	}
-											 
-	#if DEBUG_THREADING
-	{
-		char buffer256;
-
-		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->threadsiThread.save_regs34, buffer, wakecount);
-	}
-	#endif
-
-	for (i = 0; i < 32; i++)
-	{
-		mipsinfo.i = cpu->threadsiThread.save_regsi;
-		mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
-	}
-
-	mipsinfo.i = cpu->threadsiThread.save_regs32;
-	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
-	mipsinfo.i = cpu->threadsiThread.save_regs33;
-	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
-	mipsinfo.i = cpu->threadsiThread.save_regs34;
-	mips_set_info(cpu, CPUINFO_INT_PC, &mipsinfo);
-	mipsinfo.i = cpu->threadsiThread.save_regs35;
-	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
-	mipsinfo.i = cpu->threadsiThread.save_regs36;
-	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
-
-	cpu->threadsiThread.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->threadsi.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->threadsi.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->threadstateNamescpu->threadsi.iState);
-		}
-		#endif
-
-		if (cpu->iCurThread != -1)
-		{
-			FreezeThread(cpu, cpu->iCurThread, 0);
-		}
-		ThawThread(cpu, iNextThread);
-		cpu->iCurThread = iNextThread;
-		cpu->threadscpu->iCurThread.iState = TS_RUNNING;
-	}
-	else
-	{
-		// no thread to switch to, is the current one still running?
-		if (cpu->iCurThread != -1)
-		{
-			if (cpu->threadscpu->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->threadstateNamescpu->threadsi.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_ramoffset>>2);
-	}
-
-	if (offset >= 0x80000000 && offset <= 0x807fffff)
-	{
-		offset &= 0x1fffff;
-		return LE32(cpu->psx_ramoffset>>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_cntscnt.count);
-				return cpu->root_cntscnt.count;
-				break;
-			case 4:
-//				printf("RC: read counter %d mode\n", cnt);
-				return cpu->root_cntscnt.mode;
-				break;
-			case 8:
-//				printf("RC: read counter %d target\n", cnt);
-				return cpu->root_cntscnt.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_ramoffset>>2 &= LE32(mem_mask);
-		cpu->psx_ramoffset>>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_ramoffset>>2 &= LE32(mem_mask);
-		cpu->psx_ramoffset>>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_cntscnt.count = data;
-//				printf("RC: counter %d count = %x\n", cnt, data);
-				break;
-			case 4:
-				cpu->root_cntscnt.mode = data;
-//				printf("RC: counter %d mode = %x\n", cnt, data);
-				break;
-			case 8:
-				cpu->root_cntscnt.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_regsj = mipsinfo.i;
-	}
-	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
-	cpu->irq_regs32 = mipsinfo.i;
-	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
-	cpu->irq_regs33 = mipsinfo.i;
-	mips_get_info(cpu, CPUINFO_INT_PC, &mipsinfo);
-	cpu->irq_regs34 = mipsinfo.i;
-	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
-	cpu->irq_regs35 = mipsinfo.i;
-	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
-	cpu->irq_regs36 = 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_ram0x1000/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_regsj;
-		mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_R0 + j, &mipsinfo);
-	}
-
-	mipsinfo.i = cpu->irq_regs32;
-	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
-	mipsinfo.i = cpu->irq_regs33;
-	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
-	mipsinfo.i = cpu->irq_regs34;
-	mips_set_info(cpu, CPUINFO_INT_PC, &mipsinfo);
-	mipsinfo.i = cpu->irq_regs35;
-	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
-	mipsinfo.i = cpu->irq_regs36;
-	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_regsi = mipsinfo.i;
-			}
-			mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
-			cpu->irq_regs32 = mipsinfo.i;
-			mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
-			cpu->irq_regs33 = mipsinfo.i;
-
-			// check BIOS-driven interrupts
-			if (cpu->irq_data & 1)	// VSync
-			{
-				if (cpu->CounterEvent31.status == LE32(EvStACTIVE))
-				{
-					// run the handler
-					mipsinfo.i = LE32(cpu->CounterEvent31.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_ram0x1000/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->CounterEventi1.status == LE32(EvStACTIVE))
-						{
-							// run the handler
-							mipsinfo.i = LE32(cpu->CounterEventi1.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_ram0x1000/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_regsi;
-					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
-				}
-
-				mipsinfo.i = cpu->irq_regs32;
-				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
-				mipsinfo.i = cpu->irq_regs33;
-				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->threads0.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_ram0xa0/4 = LE32(FUNCT_HLECALL);
-	cpu->psx_ram0xb0/4 = LE32(FUNCT_HLECALL);
-	cpu->psx_ram0xc0/4 = LE32(FUNCT_HLECALL);
-
-	cpu->Event = (EvtCtrlBlk *)&cpu->psx_ram0x1000/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_cnts0.mode = RC_EN;
-	cpu->root_cnts1.mode = RC_EN;
-	cpu->root_cnts2.mode = RC_EN;
-	cpu->root_cnts0.sysclock = 0;
-	cpu->root_cnts1.sysclock = 0;
-	cpu->root_cnts2.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->Eventevspec.status != LE32(EvStACTIVE))
-						{
-							#if DEBUG_HLE_BIOS
-							printf("event not active\n");
-							#endif
-							return;
-						}
-
-						// if interrupt mode, do the call
-						if (cpu->Eventevspec.mode == LE32(EvMdINTR))
-						{
-							#if DEBUG_HLE_BIOS
-							printf("INTR type, need to call handler %x\n", LE32(Eventevspec.fhandler));
-							#endif
-						}
-						else
-						{
-							cpu->Eventevspec.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->Eventevspec.status = LE32(EvStWAIT);
-						cpu->Eventevspec.mode = LE32(a2);
-						cpu->Eventevspec.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->Eventevspec.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->Eventevspec.status == LE32(EvStALREADY))
-						{
-							cpu->Eventevspec.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->Eventevspec.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->Eventevspec.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_regsi;
-						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
-					}
-
-					mipsinfo.i = cpu->irq_regs32;
-					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
-					mipsinfo.i = cpu->irq_regs33;
-					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->threadsi.iState == TS_WAITDELAY)
-			{
-				if (cpu->threadsi.waitparm > CLOCK_DIV)
-				{
-					cpu->threadsi.waitparm -= CLOCK_DIV;
-				}
-				else	// time's up
-				{
-					cpu->threadsi.waitparm = 0;
-					cpu->threadsi.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_timersi.iActive > 0)
-				{
-					cpu->iop_timersi.count += 836;
-					if (cpu->iop_timersi.count >= cpu->iop_timersi.target)
-					{
-						cpu->iop_timersi.count -= cpu->iop_timersi.target;
-
-	//					printf("Timer %d: handler = %08x, param = %08x\n", i, cpu->iop_timersi.handler, cpu->iop_timersi.hparam);
-						call_irq_routine(cpu, cpu->iop_timersi.handler, cpu->iop_timersi.hparam);
-
-						cpu->timerexp = 1;
-					} 
-				}
-			}
-		}
-	}
-
-// PS1 root counters
-	for (i = 0; i < 3; i++)
-	{
-		if ((!(cpu->root_cntsi.mode & RC_EN)) && (cpu->root_cntsi.mode != 0))
-		{
-			if (cpu->root_cntsi.mode & RC_DIV8)
-			{
-				cpu->root_cntsi.count += 768/8;
-			}
-			else
-			{
-				cpu->root_cntsi.count += 768;
-			}
-
-			if (cpu->root_cntsi.count >= cpu->root_cntsi.target)
-			{
-				if (!(cpu->root_cntsi.mode & RC_RESET))
-				{
-					cpu->root_cntsi.mode |= RC_EN;
-				}
-				else
-				{
-					cpu->root_cntsi.count %= cpu->root_cntsi.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 temp64, tfmt64;
-	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++;
-
-			tfmt0 = '%';
-			fp = 1;
-			while (((*cf >= '0') && (*cf <= '9')) || (*cf == '.'))
-			{
-				tfmtfp = *cf;
-				fp++;
-				cf++;
-			}
-
-			tfmtfp = *cf;
-			tfmtfp+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 = &temp0;
-			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 name9, out512;
-	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_ramscan != LE32(0x41e00000)) && (scan >= (0x10000/4)))
-	{
-		scan--;
-	}
-
-	if (cpu->psx_ramscan != LE32(0x41e00000))
-	{
-		printf("FATAL ERROR: couldn't find IOP link signature\n");
-		return;
-	}
-
-	scan += 3;	// skip zero and version
-	memcpy(name, &cpu->psx_ramscan, 8);
-	name8 = '\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 (outstrlen(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_rama0, cpu->psx_rama0+1, cpu->psx_rama0+2, cpu->psx_rama0+3, cpu->psx_rama0+4);
-				#endif
-
-				newAlloc = psf2_get_loadaddr();
-				// force 16-byte alignment
-				if (newAlloc & 0xf)
-				{
-					newAlloc &= ~0xf;
-					newAlloc += 16;
-				}
-				psf2_set_loadaddr(newAlloc + LE32(cpu->psx_rama0+3));
-				
-				cpu->threadscpu->iNumThreads.iState = TS_CREATED;
-				cpu->threadscpu->iNumThreads.stackloc = newAlloc;
-				cpu->threadscpu->iNumThreads.flags = LE32(cpu->psx_rama0);
-				cpu->threadscpu->iNumThreads.routine = LE32(cpu->psx_rama0+2);
-				cpu->threadscpu->iNumThreads.stacksize = LE32(cpu->psx_rama0+3);
-				cpu->threadscpu->iNumThreads.refCon = LE32(cpu->psx_rama0+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->threadscpu->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->threadsa0.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->threadsa0.iState != TS_RUNNING)
-				{
-					cpu->threadsa0.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->threadscpu->iCurThread.iState = TS_WAITDELAY;
-					dTicks /= (double)1000000.0;
-					dTicks *= (double)36864000.0;	// 768*48000 = IOP native-mode clock rate
-					cpu->threadscpu->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_rama0 = LE32(cpu->sys_time & 0xffffffff); 	// low
-				cpu->psx_rama0+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_rama0);
-					temp |= (uint64)LE32(cpu->psx_rama0+1)<<32;
-
-					temp *= (uint64)1000000;
-					temp /= (uint64)36864000;
-
-					// temp now is USec
-					seconds = (temp / 1000000) & 0xffffffff;
-					usec = (temp % 1000000) & 0xffffffff;
-
-					cpu->psx_rama1 = LE32(seconds);
-					cpu->psx_rama2 = 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->evflagscpu->iNumFlags.type = LE32(cpu->psx_rama0);
-				cpu->evflagscpu->iNumFlags.value = LE32(cpu->psx_rama0+1);
-				cpu->evflagscpu->iNumFlags.param = LE32(cpu->psx_rama0+2);
-				cpu->evflagscpu->iNumFlags.inUse = 1;
-
-				#if DEBUG_HLE_IOP
-				printf(" Flag %02d: type %d init %08x param %08x\n", cpu->iNumFlags, cpu->evflagscpu->iNumFlags.type, cpu->evflagscpu->iNumFlags.value, cpu->evflagscpu->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->evflagsa0.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->evflagsa0.value |= a1;
-
-				mipsinfo.i = 0;
-				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
-
-				for (i=0; i < cpu->iNumThreads; i++)
-				{
-					if ((cpu->threadsi.iState == TS_WAITEVFLAG) && (cpu->threadsi.waitparm == a0))
-					{
-						cpu->threadsi.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->evflagsa0.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->evflagsa0.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->evflagsa0.value & a1))
-				{
-					FreezeThread(cpu, cpu->iCurThread, 1);
-					cpu->threadscpu->iCurThread.iState = TS_WAITEVFLAG;
-					cpu->threadscpu->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->semaphoresi.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_rama0, cpu->psx_rama0+1, cpu->psx_rama0+2, cpu->psx_rama0+3);
-	
-				if (mipsinfo.i != -1)
-				{
-					cpu->semaphoresmipsinfo.i.attr = LE32(cpu->psx_rama0);
-					cpu->semaphoresmipsinfo.i.option = LE32(cpu->psx_rama0+1);
-					cpu->semaphoresmipsinfo.i.init = LE32(cpu->psx_rama0+2);
-					cpu->semaphoresmipsinfo.i.max = LE32(cpu->psx_rama0+3);
-
-					cpu->semaphoresmipsinfo.i.current = cpu->semaphoresmipsinfo.i.init;
-
-					cpu->semaphoresmipsinfo.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->semaphoresa0.current);
-				#endif
-
-				foundthread = 0;
-				for (i=0; i < cpu->iNumThreads; i++)
-				{
-					if ((cpu->threadsi.iState == TS_WAITSEMA) && (cpu->threadsi.waitparm == a0))
-					{
-						cpu->threadsi.iState = TS_READY;	
-						cpu->semaphoresa0.threadsWaiting--;
-						foundthread = 1;
-						break;
-					}
-				}
-
-				mipsinfo.i = 0;
-
-				if (!foundthread)
-				{
-					if (cpu->semaphoresa0.current < cpu->semaphoresa0.max)
-					{
-						cpu->semaphoresa0.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->threadsi.iState == TS_WAITSEMA) && (cpu->threadsi.waitparm == a0))
-					{
-						cpu->threadsi.iState = TS_READY;	
-						cpu->semaphoresa0.threadsWaiting--;
-						foundthread = 1;
-						break;
-					}
-				}
-
-				mipsinfo.i = 0;
-
-				if (!foundthread)
-				{
-					if (cpu->semaphoresa0.current < cpu->semaphoresa0.max)
-					{
-						cpu->semaphoresa0.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->semaphoresa0.current, mipsinfo.i);
-				#endif
-		
-				if (cpu->semaphoresa0.current > 0)
-				{
-					cpu->semaphoresa0.current--;
-				}
-				else
-				{
-					FreezeThread(cpu,cpu->iCurThread, 1);
-					cpu->threadscpu->iCurThread.iState = TS_WAITSEMA;
-					cpu->threadscpu->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_timerscpu->iNumTimers.source = a0;
-				cpu->iop_timerscpu->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_timersa0-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_timersa0-1.target = a1;
-				cpu->iop_timersa0-1.handler = a2;
-				cpu->iop_timersa0-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_timersa0-1.source = a1;
-				cpu->iop_timersa0-1.mode = a2;
-				cpu->iop_timersa0-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_timersa0-1.iActive = 1;
-				cpu->iop_timersa0-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_timersa0-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_rama0/4 == LE32(0x41c00000))
-				{
-					a0 += 3*4;
-					memcpy(&cpu->reglibscpu->iNumLibs.name, &cpu->psx_rama0/4, 8);
-					cpu->reglibscpu->iNumLibs.name8 = '\0';
-					#if DEBUG_HLE_IOP
-					printf("Lib name %s\n", &cpu->reglibscpu->iNumLibs.name);
-					#endif
-					a0 += 2*4;
-					cpu->reglibscpu->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 (outstrlen(out)-1 != '\n')
-				{
-					strcat(out, "\n");
-				}
-
-				// filter out ESC characters
-				{
-					int ch;
-
-					for (ch = 0; ch < strlen(out); ch++)
-					{
-						if (outch == 27)
-						{
-							outch = '';
-						}
-					}
-				}
-
-				#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 args20, numargs = 1, argofs;
-						uint8 *argwalk = (uint8 *)cpu->psx_ram, *argbase;
-						
-						argwalk += (a2 & 0x1fffff);
-						argbase = argwalk;
-
-						args0 = a0;	// program name is argc0
-
-						argofs = 0;
-
-						if (a1 > 0)
-						{
-							argsnumargs = a2;
-							numargs++;
-
-							while (a1)
-							{
-								if ((*argwalk == 0) && (a1 > 1))
-								{
-									argsnumargs = a2 + argofs + 1;
-									numargs++;
-								}
-								argwalk++;
-								argofs++;
-								a1--;
-							}
-						}
-
-						for (i = 0; i < numargs; i++) 
-						{
-							#if DEBUG_HLE_IOP
-//							printf("Arg %d: %08x %s\n", i, argsi, &argbaseargsi-a2); 
-							#endif
-							cpu->psx_ram(newAlloc/4)+i = LE32(argsi);
-						}
-
-						// 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->filestati == 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->filedataslot2use = malloc(6*1024*1024);
-					cpu->filesizeslot2use = psf2_load_file(cpu, mname, cpu->filedataslot2use, 6*1024*1024);
-					cpu->fileposslot2use = 0;
-					cpu->filestatslot2use = 1;
-
-					if (cpu->filesizeslot2use == 0xffffffff)
-					{
-						mipsinfo.i = cpu->filesizeslot2use;
-					}
-					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->filedataa0);
-				cpu->filedataa0 = (uint8 *)NULL;
-				cpu->fileposa0 = 0;
-				cpu->filesizea0 = 0;
-				cpu->filestata0 = 0;
-				break;
-
-			case 6:	// read
-				#if DEBUG_HLE_IOP
-				printf("IOP: read(%x %x %d) pos %d size %d\n", a0, a1, a2, cpu->fileposa0, cpu->filesizea0);
-				#endif
-
-				if (cpu->fileposa0 >= cpu->filesizea0)
-				{
-					mipsinfo.i = 0;
-				}
-				else
-				{
-					uint8 *rp;
-
-					if ((cpu->fileposa0 + a2) > cpu->filesizea0)
-					{
-						a2 = cpu->filesizea0 - cpu->fileposa0;
-					}
-
-					rp = (uint8 *)cpu->psx_ram;
-					rp += (a1 & 0x1fffff);
-					memcpy(rp, &cpu->filedataa0cpu->fileposa0, a2);
-
-					cpu->fileposa0 += 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_typesa2, mipsinfo.i);
-				#endif
-
-				switch (a2)
-				{
-					case 0:	// SEEK_SET
-						if (a1 <= cpu->filesizea0)
-						{
-							cpu->fileposa0 = a1;
-						}
-						break;
-					case 1:	// SEEK_CUR
-						if ((a1 + cpu->fileposa0) < cpu->filesizea0)
-						{
-							cpu->fileposa0 += a1;
-						}
-						break;
-					case 2:	// SEEK_END
-						cpu->fileposa0 = cpu->filesizea0 - a1;
-						break;
-				}
-
-				mipsinfo.i = cpu->fileposa0;
-				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->reglibslib.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->reglibslib.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->reglibslib.name, 
-							 lib,
-							 callnum, 
-							 (uint32)mipsinfo.i, 
-							 a0, a1, a2, a3, PC);
-					#endif
-
-					#if 0
-					if (!strcmp(cpu->reglibslib.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.6.2.tar.bz2/plugins/ao/eng_qsf Deleted

deadbeef-0.6.2.tar.bz2/plugins/ao/eng_qsf/eng_qsf.c Deleted

@@ -1,520 +0,0 @@
-/*
-	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 qsfby256;
- uint32 skey1, skey2;
- uint16 akey;
- uint8 xkey;
- int32 uses_kabuki;
- char *Z80ROM, *QSamples;
- char RAM0x1000, RAM20x1000;
- char initRAM0x1000, initRAM20x1000;
- 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 = cbuf3 | cbuf4<<8 | cbuf5<<16 | cbuf6<<24;
-		length = cbuf7 | cbuf8<<8 | cbuf9<<16 | cbuf10<<24;
-
-		#if DEBUG_LOADER				
-		printf("Tag: %c%c%c @ %08x, length %08x\n", cbuf0, cbuf1, cbuf2, offset, length);
-		#endif
-
-		switch (cbuf0)
-		{
-			case 'Z':
-				memcpy(&s->Z80ROMoffset, &cbuf11, length);
-				break;
-
-			case 'S':
-				memcpy(&s->QSamplesoffset, &cbuf11, length);
-				break;
-
-			case 'K':
-				s->skey1 = cbuf11<<24 | cbuf12<<16 | cbuf13<<8 | cbuf14;
-				s->skey2 = cbuf15<<24 | cbuf16<<16 | cbuf17<<8 | cbuf18;
-				s->akey = cbuf19<<8 | cbuf20;
-				s->xkey = cbuf20;
-				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->lib0 != 0)
-	{
-		uint64 tmp_length;
-	
- char libpathPATH_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_namei, "qsfby"))
-			{
-				strcpy(s->qsfby, s->c->tag_datai);
-			}
-		}
-	}
-
-	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 output44100/30, output244100/30;
-	int16 *stereo2;
-	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);
-		stereo0 = &outputopos;
-		stereo1 = &output2opos;
-		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));
-		stereo0 = &outputopos;
-		stereo1 = &output2opos;
-		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++ = outputi;
-		*outp++ = output2i;
-	}
-
-	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->title1, "Name: ");
-	sprintf(info->info1, "%s", s->c->inf_title);
-
-	strcpy(info->title2, "Game: ");
-	sprintf(info->info2, "%s", s->c->inf_game);
-	
-	strcpy(info->title3, "Artist: ");
-	sprintf(info->info3, "%s", s->c->inf_artist);
-
-	strcpy(info->title4, "Copyright: ");
-	sprintf(info->info4, "%s", s->c->inf_copy);
-
-	strcpy(info->title5, "Year: ");
-	sprintf(info->info5, "%s", s->c->inf_year);
-
-	strcpy(info->title6, "Length: ");
-	sprintf(info->info6, "%s", s->c->inf_length);
-
-	strcpy(info->title7, "Fade: ");
-	sprintf(info->info7, "%s", s->c->inf_fade);
-
-	strcpy(info->title8, "Ripper: ");
-	sprintf(info->info8, "%s", s->qsfby);
-
-	return AO_SUCCESS;
-}
-
-uint8 qsf_memory_read(qsf_synth_t *s, uint16 addr)
-{
-	if (addr < 0x8000)
-	{
-		return s->Z80ROMaddr;
-	}
-	else if (addr < 0xc000)
-	{
-		return s->Z80ROM(addr - 0x8000) + s->cur_bank;
-	}
-	else if (addr <= 0xcfff)
-	{
-		return s->RAMaddr - 0xc000;
-	}
-	else if (addr == 0xd007)
-	{
-		return qsound_status_r(s->qs);
-	}
-	else if (addr >= 0xf000)
-	{
-		return s->RAM2addr-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->Z80ROMaddr + (256*1024);
-	}
-
-	return qsf_memory_read(s, addr);
-}
-
-uint8 qsf_memory_readport(qsf_synth_t *s, uint16 addr)
-{
-	return s->Z80ROM0x11;
-}
-
-void qsf_memory_write(qsf_synth_t *s, uint16 addr, uint8 byte)
-{
-	if (addr >= 0xc000 && addr <= 0xcfff)
-	{
-		
-		s->RAMaddr-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->RAM2addr-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.6.2.tar.bz2/plugins/ao/eng_ssf Deleted

deadbeef-0.6.2.tar.bz2/plugins/ao/eng_ssf/eng_ssf.c Deleted

@@ -1,347 +0,0 @@
-/*
-	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 		psfby256;
- uint32		decaybegin, decayend, total_samples;
- uint8 init_sat_ram512*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->libauxi-1 : s->c->lib;
-		if (libfile0 != 0)
-		{
-			uint64 tmp_length;
-	
- char libpathPATH_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_decoded0 | lib_decoded1<<8 | lib_decoded2<<16 | lib_decoded3<<24;
-
-			// guard against invalid data
-			if ((offset + (lib_len-4)) > 0x7ffff)
-			{
-				lib_len = 0x80000-offset+4;
-			}
-			memcpy(&s->cpu->sat_ramoffset, 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 = file3<<24 | file2<<16 | file1<<8 | file0;
-
-	// guard against invalid data
-	if ((offset + (file_len-4)) > 0x7ffff)
-	{
-		file_len = 0x80000-offset+4;
-	}
-
-	memcpy(&s->cpu->sat_ramoffset, 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_namei, "psfby"))
-				strcpy(s->psfby, s->c->tag_datai);
-		}
-	}
-
-	#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_rami;
-		s->cpu->sat_rami = s->cpu->sat_rami+1;
-		s->cpu->sat_rami+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 outputsamples, output2samples;
-	int16 *stereo2;
-	int16 *outp = buffer;
-
-	for (i = 0; i < samples; i++)
-	{
-		m68k_execute(s->cpu, (11300000/60)/735);
-		stereo0 = &outputi;
-		stereo1 = &output2i;
-		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
-				outputi = 0;
-				output2i = 0;
-			}
-			else
-			{
-				int32 fader = 256 - (256*(s->total_samples - s->decaybegin)/(s->decayend-s->decaybegin));
-				outputi = (outputi * fader)>>8;
-				output2i = (output2i * fader)>>8;
-
-				s->total_samples++;
-			}
-		}
-		else
-		{
-			s->total_samples++;
-		}
-
-		*outp++ = outputi;
-		*outp++ = output2i;
-	}
-
-	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->title1, "Name: ");
-	sprintf(info->info1, "%s", s->c->inf_title);
-
-	strcpy(info->title2, "Game: ");
-	sprintf(info->info2, "%s", s->c->inf_game);
-	
-	strcpy(info->title3, "Artist: ");
-	sprintf(info->info3, "%s", s->c->inf_artist);
-
-	strcpy(info->title4, "Copyright: ");
-	sprintf(info->info4, "%s", s->c->inf_copy);
-
-	strcpy(info->title5, "Year: ");
-	sprintf(info->info5, "%s", s->c->inf_year);
-
-	strcpy(info->title6, "Length: ");
-	sprintf(info->info6, "%s", s->c->inf_length);
-
-	strcpy(info->title7, "Fade: ");
-	sprintf(info->info7, "%s", s->c->inf_fade);
-
-	strcpy(info->title8, "Ripper: ");
-	sprintf(info->info8, "%s", s->psfby);
-
-	return AO_SUCCESS;
-}

deadbeef-0.6.2.tar.bz2/plugins/ao/eng_ssf/m68kops.h Deleted

@@ -1,1986 +0,0 @@
-#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_table0x10000)(m68ki_cpu_core *cpu); /* opcode handler jump table */
-extern unsigned char m68ki_cycles0x10000;
-
-
-/* ======================================================================== */
-/* ============================== END OF FILE ============================= */
-/* ======================================================================== */
-
-#endif /* M68KOPS__HEADER */
-
-

deadbeef-0.6.2.tar.bz2/plugins/ao/eng_ssf/scsp.c Deleted

@@ -1,1277 +0,0 @@
-/*
- 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.data0x0>>0x0)&0x1000)
-#define KEYONB(slot)		((slot->udata.data0x0>>0x0)&0x0800)
-#define SBCTL(slot)		((slot->udata.data0x0>>0x9)&0x0003)
-#define SSCTL(slot)		((slot->udata.data0x0>>0x7)&0x0003)
-#define LPCTL(slot)		((slot->udata.data0x0>>0x5)&0x0003)
-#define PCM8B(slot)		((slot->udata.data0x0>>0x0)&0x0010)
-
-#define SA(slot)		(((slot->udata.data0x0&0xF)<<16)|(slot->udata.data0x1))
-
-#define LSA(slot)		(slot->udata.data0x2)
-
-#define LEA(slot)		(slot->udata.data0x3)
-
-#define D2R(slot)		((slot->udata.data0x4>>0xB)&0x001F)
-#define D1R(slot)		((slot->udata.data0x4>>0x6)&0x001F)
-#define EGHOLD(slot)		((slot->udata.data0x4>>0x0)&0x0020)
-#define AR(slot)		((slot->udata.data0x4>>0x0)&0x001F)
-
-#define LPSLNK(slot)		((slot->udata.data0x5>>0x0)&0x4000)
-#define KRS(slot)		((slot->udata.data0x5>>0xA)&0x000F)
-#define DL(slot)		((slot->udata.data0x5>>0x5)&0x001F)
-#define RR(slot)		((slot->udata.data0x5>>0x0)&0x001F)
-
-#define STWINH(slot)		((slot->udata.data0x6>>0x0)&0x0200)
-#define SDIR(slot)		((slot->udata.data0x6>>0x0)&0x0100)
-#define TL(slot)		((slot->udata.data0x6>>0x0)&0x00FF)
-
-#define MDL(slot)		((slot->udata.data0x7>>0xC)&0x000F)
-#define MDXSL(slot)		((slot->udata.data0x7>>0x6)&0x003F)
-#define MDYSL(slot)		((slot->udata.data0x7>>0x0)&0x003F)
-
-#define OCT(slot)		((slot->udata.data0x8>>0xB)&0x000F)
-#define FNS(slot)		((slot->udata.data0x8>>0x0)&0x03FF)
-
-#define LFORE(slot)		((slot->udata.data0x9>>0x0)&0x8000)
-#define LFOF(slot)		((slot->udata.data0x9>>0xA)&0x001F)
-#define PLFOWS(slot)		((slot->udata.data0x9>>0x8)&0x0003)
-#define PLFOS(slot)		((slot->udata.data0x9>>0x5)&0x0007)
-#define ALFOWS(slot)		((slot->udata.data0x9>>0x3)&0x0003)
-#define ALFOS(slot)		((slot->udata.data0x9>>0x0)&0x0007)
-
-#define ISEL(slot)		((slot->udata.data0xA>>0x3)&0x000F)
-#define IMXL(slot)		((slot->udata.data0xA>>0x0)&0x0007)
-
-#define DISDL(slot)		((slot->udata.data0xB>>0xD)&0x0007)
-#define DIPAN(slot)		((slot->udata.data0xB>>0x8)&0x001F)
-#define EFSDL(slot)		((slot->udata.data0xB>>0x5)&0x0007)
-#define EFPAN(slot)		((slot->udata.data0xB>>0x0)&0x001F)
-
-//Envelope times in ms
-static const double ARTimes64={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 DRTimes64={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_Table0x400;
-static INT32 EG_TABLE0x400;
-
-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 data0x10;	//only 0x1a bytes used
-		UINT8 datab0x20;
-	} 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.data0>>0x0)&0x0200)
-#define DAC18B(scsp)		((scsp->udata.data0>>0x0)&0x0100)
-#define MVOL(scsp)		((scsp->udata.data0>>0x0)&0x000F)
-#define RBL(scsp)		((scsp->udata.data1>>0x7)&0x0003)
-#define RBP(scsp)		((scsp->udata.data1>>0x0)&0x003F)
-#define MOFULL(scsp) 		((scsp->udata.data2>>0x0)&0x1000)
-#define MOEMPTY(scsp)		((scsp->udata.data2>>0x0)&0x0800)
-#define MIOVF(scsp)		((scsp->udata.data2>>0x0)&0x0400)
-#define MIFULL(scsp)		((scsp->udata.data2>>0x0)&0x0200)
-#define MIEMPTY(scsp)		((scsp->udata.data2>>0x0)&0x0100)
-
-#define SCILV0(scsp) 	((scsp->udata.data0x24/2>>0x0)&0xff)
-#define SCILV1(scsp) 	((scsp->udata.data0x26/2>>0x0)&0xff)
-#define SCILV2(scsp) 	((scsp->udata.data0x28/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 data0x30/2;
-		UINT8 datab0x30;
-	} udata;
-	struct _SLOT Slots32;
-	signed short RINGBUF64;
-	unsigned char BUFPTR;
-#if FM_DELAY
-	signed short DELAYBUFFM_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 MidiStack16;
-	UINT8 MidiW,MidiR;
-
-	int LPANTABLE0x10000;
-	int RPANTABLE0x10000;
-
-	int TimPris3;
-	int TimCnt3;
-
-	// DMA stuff
-	UINT32 scsp_dmea;
-	UINT16 scsp_drga;
-	UINT16 scsp_dtlg;
-
-	int ARTABLE64, DRTABLE64;
-
- 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_regs0x16/2 & 0x4000
-#define	scsp_ddir		scsp_regs0x16/2 & 0x2000
-#define scsp_dexe 		scsp_regs0x16/2 & 0x1000
-#define dma_transfer_end	((scsp_regs0x24/2 & 0x10)>>4)|(((scsp_regs0x26/2 & 0x10)>>4)<<1)|(((scsp_regs0x28/2 & 0x10)>>4)<<2)
-
-static const float SDLT8={-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.data0x22/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.data0x20/2;
-	UINT32 en=SCSP->udata.data0x1e/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->ARTABLERate;
-}
-
-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->DRTABLERate;
-}
-
-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->DRTABLERate;
-}
-
-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_TableFNS(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.data0&=~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->region0;
-			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_Tablei=(float) (1<<SHIFT) *fcent;
-	}
-	
-	for(i=0;i<0x400;++i)
-	{
-		float envDB=((float)(3*(i-0x3ff)))/32.0;
-		float scale=(float)(1<<SHIFT);
-		EG_TABLEi=(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,(SDLTiSDL)/20.0);
-		else
-			fSDL=0.0;
-
-		SCSP->LPANTABLEi=FIX((4.0*LPAN*TL*fSDL));
-		SCSP->RPANTABLEi=FIX((4.0*RPAN*TL*fSDL));
-	}
-
-	SCSP->ARTABLE0=SCSP->DRTABLE0=0;	//Infinite time
-	SCSP->ARTABLE1=SCSP->DRTABLE1=0;	//Infinite time
-	for(i=2;i<64;++i)
-	{
-		double t,step,scale;
-		t=ARTimesi;	//In ms
-		if(t!=0.0)
-		{
-			step=(1023*1000.0)/((float) 44100.0f*t);
-			scale=(double) (1<<EG_SHIFT);
-			SCSP->ARTABLEi=(int) (step*scale);
-		}
-		else
-			SCSP->ARTABLEi=1024<<EG_SHIFT;
-
-		t=DRTimesi;	//In ms
-		step=(1023*1000.0)/((float) 44100.0f*t);
-		scale=(double) (1<<EG_SHIFT);
-		SCSP->DRTABLEi=(int) (step*scale);
-	}
-
-	// make sure all the slots are off
-	for(i=0;i<32;++i)
-	{
-		SCSP->Slotsi.slot=i;
-		SCSP->Slotsi.active=0;
-		SCSP->Slotsi.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"
-	SCSP0.udata.data0x20/2 = 0;
-	//SCSP1.udata.data0x20/2 = 0;
-	SCSP->TimCnt0 = 0xffff;
-	SCSP->TimCnt1 = 0xffff;
-	SCSP->TimCnt2 = 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.data0&=~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.data0x6/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->TimPris0=1<<((SCSP->udata.data0x18/2>>8)&0x7);
-				SCSP->TimCnt0=(SCSP->udata.data0x18/2&0xff)<<8;
-			}
-			break;
-		case 0x1a:
-		case 0x1b:
-			if(SCSP->Master)
-			{
-				SCSP->TimPris1=1<<((SCSP->udata.data0x1A/2>>8)&0x7);
-				SCSP->TimCnt1=(SCSP->udata.data0x1A/2&0xff)<<8;
-			}
-			break;
-		case 0x1C:
-		case 0x1D:
-			if(SCSP->Master)
-			{
-				SCSP->TimPris2=1<<((SCSP->udata.data0x1C/2>>8)&0x7);
-				SCSP->TimCnt2=(SCSP->udata.data0x1C/2&0xff)<<8;
-			}
-			break;
-		case 0x22:	//SCIRE
-		case 0x23:
-
-			if(SCSP->Master)		 
-			{
-				SCSP->udata.data0x20/2&=~SCSP->udata.data0x22/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->TimCnt0 >= 0xff00)
-				{
-					SCSP->udata.data0x20/2 |= 0x40;
-				}
-				if (SCSP->TimCnt1 >= 0xff00)
-				{
-					SCSP->udata.data0x20/2 |= 0x80;
-				}
-				if (SCSP->TimCnt2 >= 0xff00)
-				{
-					SCSP->udata.data0x20/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.data0x5/2;
-				v&=0xff00;
-				v|=SCSP->MidiStackSCSP->MidiR;
-				SCSP->Int68kCB(SCSP->cpu, 0);	// cancel the IRQ
-				if(SCSP->MidiR!=SCSP->MidiW)
-				{
-					++SCSP->MidiR;
-					SCSP->MidiR&=15;
-				}
-				SCSP->udata.data0x5/2=v;
-			}
-			break;
-		case 8:
-		case 9:
-			{
-				unsigned char slot=SCSP->udata.data0x8/2>>11;
-				unsigned int CA=SCSP->Slotsslot&0x1f.cur_addr>>(SHIFT+12);
-				SCSP->udata.data0x8/2&=~(0x780);
-				SCSP->udata.data0x8/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->Slotsslot.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->Slotsslot.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->TimCnt0<=0xff00)
-	{
- 		SCSP->TimCnt0 += ticks << (8-((SCSP->udata.data0x18/2>>8)&0x7));
-		if (SCSP->TimCnt0 > 0xFF00)
-		{
-			SCSP->TimCnt0 = 0xFFFF;
-			SCSP->udata.data0x20/2|=0x40;
-		}
-		SCSP->udata.data0x18/2&=0xff00;
-		SCSP->udata.data0x18/2|=SCSP->TimCnt0>>8;
-	}
-
-	if(SCSP->TimCnt1<=0xff00)
-	{
-		SCSP->TimCnt1 += ticks << (8-((SCSP->udata.data0x1a/2>>8)&0x7));
-		if (SCSP->TimCnt1 > 0xFF00)
-		{
-			SCSP->TimCnt1 = 0xFFFF;
-			SCSP->udata.data0x20/2|=0x80;
-		}
-		SCSP->udata.data0x1a/2&=0xff00;
-		SCSP->udata.data0x1a/2|=SCSP->TimCnt1>>8;
-	}
-
-	if(SCSP->TimCnt2<=0xff00)
-	{
-		SCSP->TimCnt2 += ticks << (8-((SCSP->udata.data0x1c/2>>8)&0x7));
-		if (SCSP->TimCnt2 > 0xFF00)
-		{
-			SCSP->TimCnt2 = 0xFFFF;
-			SCSP->udata.data0x20/2|=0x100;
-		}
-		SCSP->udata.data0x1c/2&=0xff00;
-		SCSP->udata.data0x1c/2|=SCSP->TimCnt2>>8;
-	}
-}
-
-static 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 *addr2 = {&addr1, &addr2}; // used for linear interpolation
-	UINT32 *slot_addr2 = {&(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=(p0)<<8;
-		INT32 s;
-		INT32 fpart=slot->cur_addr&((1<<SHIFT)-1);
-		s=(int) (p10<<8)*((1<<SHIFT)-fpart)+(int) (p20<<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(p0);
-		INT32 s;
-		INT32 fpart=slot->cur_addr&((1<<SHIFT)-1);
-		s=(int) LE16(p10)*((1<<SHIFT)-fpart)+(int) LE16(p20)*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(*addraddr_select>=LSA(slot) && *addraddr_select>=LEA(slot))
-			{
-			//slot->active=0;
-			SCSP_StopSlot(slot,0);
-			}
-			break;
-		case 1: //normal loop
-			if(*addraddr_select>=LEA(slot))
-			{
-				rem_addr = *slot_addraddr_select - (LEA(slot)<<SHIFT);
-				*slot_addraddr_select=(LSA(slot)<<SHIFT) + rem_addr;
-			}
-			break;
-		case 2:	//reverse loop
-			if((*addraddr_select>=LSA(slot)) && !(slot->Backwards))
-			{
-				rem_addr = *slot_addraddr_select - (LSA(slot)<<SHIFT);
-				*slot_addraddr_select=(LEA(slot)<<SHIFT) - rem_addr;
-				slot->Backwards=1;
-			}
-			else if((*addraddr_select<LSA(slot) || (*slot_addraddr_select&0x80000000)) && slot->Backwards)
-			{
-				rem_addr = (LSA(slot)<<SHIFT) - *slot_addraddr_select;
-				*slot_addraddr_select=(LEA(slot)<<SHIFT) - rem_addr;
-			}
-			break;
-		case 3: //ping-pong
-			if(*addraddr_select>=LEA(slot)) //reached end, reverse till start
-			{
-				rem_addr = *slot_addraddr_select - (LEA(slot)<<SHIFT); 
-				*slot_addraddr_select=(LEA(slot)<<SHIFT) - rem_addr;
-				slot->Backwards=1;
-			}
-			else if((*addraddr_select<LSA(slot) || (*slot_addraddr_select&0x80000000)) && slot->Backwards)//reached start or negative
-			{
-				rem_addr = (LSA(slot)<<SHIFT) - *slot_addraddr_select;
-				*slot_addraddr_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_TABLEEG_Update(slot)>>(SHIFT-10))>>SHIFT;
-
-	if(!STWINH(slot))
-	{
-		unsigned short Enc=((TL(slot))<<0x0)|(0x7<<0xd);
-		*SCSP->RBUFDST=(sample*SCSP->LPANTABLEEnc)>>(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->Slotssl.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->LPANTABLEEnc)>>(SHIFT-2),ISEL(slot),IMXL(slot));
-				Enc=((TL(slot))<<0x0)|((DIPAN(slot))<<0x8)|((DISDL(slot))<<0xd);
-				{
-					smpl+=(sample*SCSP->LPANTABLEEnc)>>SHIFT;
-					smpr+=(sample*SCSP->RPANTABLEEnc)>>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.EFREGi*SCSP->LPANTABLEEnc)>>SHIFT;
-				smpr+=(SCSP->DSP.EFREGi*SCSP->RPANTABLEEnc)>>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_dma3, *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_dma0 = scsp_regs0x12/2;
-		tmp_dma1 = scsp_regs0x14/2;
-		tmp_dma2 = scsp_regs0x16/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_regs0x12/2 = tmp_dma0;
-		scsp_regs0x14/2 = tmp_dma1;
-		scsp_regs0x16/2 = tmp_dma2;
-	}
-
-	/*Job done,request a dma end irq*/
-//	if(scsp_regs0x1e/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 = buf0;
-	SCSP->bufferr = buf1;
-	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_callback0;
-
-//		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_regs0x14/2 & 0xf000)>>12)*0x10000) | (scsp_regs0x12/2 & 0xfffe);
-		break;
-		case 0x414:
-		/*DMEA 19:16*/
-		SCSP->scsp_dmea = (((scsp_regs0x14/2 & 0xf000)>>12)*0x10000) | (scsp_regs0x12/2 & 0xfffe);
-		/*DRGA 11:1*/
-		/*Register memory address*/
-		SCSP->scsp_drga = scsp_regs0x14/2 & 0x0ffe;
-		break;
-		case 0x416:
-		/*DGATE14*/
-		/*DDIR13*/
-		/*if 0 sound_mem -> reg*/
-		/*if 1 sound_mem <- reg*/
-		/*DEXE12*/
-		/*starting bit*/
-		/*DTLG11:1*/
-		/*size of transfer*/
-		SCSP->scsp_dtlg = scsp_regs0x16/2 & 0x0ffe;
-		if(scsp_dexe)
-		{
-			dma_scsp(SCSP);
-			scsp_regs0x16/2^=0x1000;//disable starting bit
-		}
-		break;
-		//check main cpu IRQ
-		case 0x42a:
-#if 0
- extern UINT32* stv_scu;
-
-			if(stv_scu && !(stv_scu40 & 0x40) /*&& scsp_regs0x42c/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->MidiStackSCSP->MidiW++=data;
-	SCSP->MidiW &= 15;
-}
-
-READ16_HANDLER( SCSP_MidiOutR )
-{
-	struct _SCSP *SCSP = param; 
-	unsigned char val;
-
-	val=SCSP->MidiStackSCSP->MidiR++;
-	SCSP->MidiR&=7;
-	return val;
-}
-

deadbeef-0.6.2.tar.bz2/plugins/ao/main.c Deleted

@@ -1,262 +0,0 @@
-/*
-	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;
-
-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
-/* file types */
-static uint32 type;
-
-static void do_frame(uint32 size, int16 *buffer)
-{
-	(*typestype.gen)(buffer, size);
-}
-
-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(argc1, "rb");
-
-	if (!file)
-	{
-		printf("ERROR: could not open file %s\n", argc1);
-		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 = buffer0<<24 | buffer1<<16 | buffer2<<8 | buffer3;
-	while (typestype.sig != 0xffffffff)
-	{
-		if (filesig == typestype.sig)
-		{
-			break;
-		}
-		else
-		{
-			type++;
-		}
-	}
-
-	// now did we identify it above or just fall through?
-	if (typestype.sig != 0xffffffff)
-	{
-		printf("File identified as %s\n", typestype.name);
-	}
-	else
-	{
-		printf("ERROR: File is unknown, signature bytes are %02x %02x %02x %02x\n", buffer0, buffer1, buffer2, buffer3);
-		free(buffer);
-		return -1;
-	}
-
- void *handle = (*typestype.start)(argc1, 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;
-}
-#endif
-
-// stub for MAME stuff
-int change_pc(int foo)
-{
- return 0;
-}
-
-int
-ao_identify (char *buffer) {
- uint32 filesig;
- uint32 type = 0;
-
-	filesig = buffer0<<24 | buffer1<<16 | buffer2<<8 | buffer3;
-	while (typestype.sig != 0xffffffff)
-	{
-		if (filesig == typestype.sig)
-		{
-			break;
-		}
-		else
-		{
-			type++;
-		}
-	}
-
-	// now did we identify it above or just fall through?
-	if (typestype.sig != 0xffffffff)
-	{
-		trace ("psf: File identified as %s\n", typestype.name);
-	}
-	else
-	{
-		trace ("psf: File is unknown, signature bytes are %02x %02x %02x %02x\n", buffer0, buffer1, buffer2, buffer3);
-		return -1;
- }
- return type;
-}
-
-void *
-ao_start (uint32 type, const char *path, uint8 *buffer, uint32 size) {
-	return (*typestype.start)(path, buffer, size);
-}
-
-int
-ao_stop (uint32 type, void *handle) {
-	return (*typestype.stop)(handle);
-}
-
-int
-ao_get_info (uint32 type, void *handle, ao_display_info *info) {
-	return (*typestype.fillinfo)(handle, info);
-}
-
-int
-ao_decode (uint32 type, void *handle, int16 *buffer, uint32 size) {
-	(*typestype.gen)(handle, buffer, size);
-	return size;
-}
-
-int
-ao_command (uint32 type, void *handle, int32 command, int32 param) {
-	return (*typestype.command)(handle, command, param);
-}

deadbeef-0.6.2.tar.bz2/plugins/ao/plugin.c Deleted

@@ -1,401 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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 buffer735*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);
-
- deadbeef->pl_lock ();
- DB_FILE *file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
- 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) {
- deadbeef->pl_lock ();
-		fprintf(stderr, "psf: file read error: %s\n", deadbeef->pl_find_meta (it, ":URI"));
-		deadbeef->pl_unlock ();
-		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;
- }
-
- deadbeef->pl_lock ();
- info->decoder = ao_start (info->type, deadbeef->pl_find_meta (it, ":URI"), (uint8 *)info->filebuffer, info->filesize);
- deadbeef->pl_unlock ();
- 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 tmp200;
- // 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 s1024;
-// 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);
- free (buffer);
-		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.titlei, "Length: ", 8)) {
- int min;
- float sec;
- if (sscanf (info.infoi, "%d:%f", &min, &sec) == 2) {
- duration = min * 60 + sec;
- }
- else if (sscanf (info.infoi, "%f", &sec) == 1) {
- duration = sec;
- }
- aoplug_add_meta (it, NULL, info.infoi, info.titlei);
- }
- else if (!strncasecmp (info.titlei, "Name: ", 6) || !strncasecmp (info.titlei, "Song: ", 6)) {
- aoplug_add_meta (it, "title", info.infoi, info.titlei);
- }
- else if (!strncasecmp (info.titlei, "Game: ", 6)) {
- aoplug_add_meta (it, "album", info.infoi, info.titlei);
- }
- else if (!strncasecmp (info.titlei, "Artist: ", 8)) {
- aoplug_add_meta (it, "artist", info.infoi, info.titlei);
- }
- else if (!strncasecmp (info.titlei, "Copyright: ", 11)) {
- aoplug_add_meta (it, "copyright", info.infoi, info.titlei);
- }
- else if (!strncasecmp (info.titlei, "Year: ", 6)) {
- aoplug_add_meta (it, "year", info.infoi, info.titlei);
- }
- else if (!strncasecmp (info.titlei, "Fade: ", 6)) {
- fade = atof (info.infoi);
- aoplug_add_meta (it, "fade", info.infoi, info.titlei);
- }
- else {
- char *colon = strchr (info.titlei, ':');
- char namecolon-info.titlei+1;
- memcpy (name, info.titlei, colon-info.titlei);
- namecolon-info.titlei = 0;
- aoplug_add_meta (it, name, info.infoi, info.titlei);
- }
- }
- }
- 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-2013 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.6.2.tar.bz2/plugins/converter/presets Deleted

deadbeef-0.6.2.tar.bz2/plugins/converter/presets/AAC_(Nero_FAAC).txt Deleted

deadbeef-0.6.2.tar.bz2/plugins/converter/presets/ALAC.txt Deleted

deadbeef-0.6.2.tar.bz2/plugins/converter/presets/MS_RIFF_WAV.txt Deleted

deadbeef-0.6.2.tar.bz2/plugins/converter/presets/Ogg_Vorbis_(-q_5).txt Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/include/aldumb.h Deleted

@@ -1,98 +0,0 @@
-/* _______ ____ __ ___ ___
- * \ _ \ \ / \ / \ \ / / ' ' '
- * | | \ \ | | || | \/ | . .
- * | | | | | | || ||\ /| |
- * | | | | | | || || \/ | | ' ' '
- * | | | | | | || || | | . .
- * | |_/ / \ \__// || | |
- * /_______/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.6.2.tar.bz2/plugins/dumb/dumb-kode54/include/internal/aldumb.h Deleted

@@ -1,34 +0,0 @@
-/* _______ ____ __ ___ ___
- * \ _ \ \ / \ / \ \ / / ' ' '
- * | | \ \ | | || | \/ | . .
- * | | | | | | || ||\ /| |
- * | | | | | | || || \/ | | ' ' '
- * | | | | | | || || | | . .
- * | |_/ / \ \__// || | |
- * /_______/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.6.2.tar.bz2/plugins/dumb/dumb-kode54/studio Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/dumbdesk.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/dumbgui.h Deleted

@@ -1,82 +0,0 @@
-#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.6.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/dumbmenu.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/guiproc.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/guitop.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/main.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/options.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/studio/include/subclip.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/winamp Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/winamp/gui.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/winamp/in2.h Deleted

@@ -1,123 +0,0 @@
-/* _______ ____ __ ___ ___
- * \ _ \ \ / \ / \ \ / / ' ' '
- * | | \ \ | | || | \/ | . .
- * | | | | | | || ||\ /| |
- * | | | | | | || || \/ | | ' ' '
- * | | | | | | || || | | . .
- * | |_/ / \ \__// || | |
- * /_______/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 data10, 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.6.2.tar.bz2/plugins/dumb/dumb-kode54/winamp/in_duh.h Deleted

@@ -1,40 +0,0 @@
-/* _______ ____ __ ___ ___
- * \ _ \ \ / \ / \ \ / / ' ' '
- * | | \ \ | | || | \/ | . .
- * | | | | | | || ||\ /| |
- * | | | | | | || || \/ | | ' ' '
- * | | | | | | || || | | . .
- * | |_/ / \ \__// || | |
- * /_______/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.6.2.tar.bz2/plugins/dumb/dumb-kode54/winamp/out.h Deleted

@@ -1,71 +0,0 @@
-/* _______ ____ __ ___ ___
- * \ _ \ \ / \ / \ \ / / ' ' '
- * | | \ \ | | || | \/ | . .
- * | | | | | | || ||\ /| |
- * | | | | | | || || \/ | | ' ' '
- * | | | | | | || || | | . .
- * | |_/ / \ \__// || | |
- * /_______/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.6.2.tar.bz2/plugins/dumb/dumb-kode54/winamp/resource.h Deleted

@@ -1,36 +0,0 @@
-//{{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.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Snes_Spc.cpp Deleted

@@ -1,378 +0,0 @@
-// SPC emulation support: init, sample buffering, reset, SPC loading
-
-// snes_spc 0.9.0. http://www.slack.net/~ant/
-
-#include "Snes_Spc.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 blargg_ok;
-}
-
-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 = NULL;
-	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 blargg_ok;
-}
-
-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 = NULL;
-	
-	dsp.set_output( NULL, 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 = NULL;
-	return err;
-}
-
-blargg_err_t Snes_Spc::skip( int count )
-{
-	#if SPC_LESS_ACCURATE
-	if ( count > 2 * sample_rate * 2 )
-	{
-		set_output( NULL, 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, NULL );
-}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Snes_Spc.h Deleted

@@ -1,291 +0,0 @@
-// SNES SPC-700 APU emulator
-
-// snes_spc 0.9.0
-#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.
-	void disable_surround( bool disable = true );
-
-	// If true, enables cubic interpolation
-	void interpolation_level( int level = 0 );
-	
-	// 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 * 1024 }; // 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 ); }
-
-inline void Snes_Spc::interpolation_level( int level ) { dsp.interpolation_level( level ); }
-
-#if !SPC_NO_COPY_STATE_FUNCS
-inline bool Snes_Spc::check_kon() { return dsp.check_kon(); }
-#endif
-
-#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Cpu.cpp Deleted

@@ -1,562 +0,0 @@
-// Core SPC emulation: CPU, timers, SMP registers, memory
-
-// snes_spc 0.9.0. http://www.slack.net/~ant/
-
-#include "Snes_Spc.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
-
-
-//// 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;
-	
-	/* Fast DSP only runs every 32nd clock. By adjusting the end time based
-	on which register is being accessed, in most cases the register access
-	is emulated at the precise time. */
-	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 )
-		dprintf( "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 )
-				{
-					//dprintf( "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 )
-			dprintf( "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 )
-			dprintf( "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.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Cpu.h Deleted

@@ -1,1225 +0,0 @@
-// snes_spc 0.9.0. 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 ) dprintf( "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
-
-// Flags with hex value for clarity when used as mask.
-// 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
-	
-	#ifdef CPU_INSTR_HOOK
-		CPU_INSTR_HOOK( GET_PC(), pc, a, x, y, GET_SP(), rel_time );
-	#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 );
-			dprintf( "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 )
-		dprintf( "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.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Dsp.cpp Deleted

@@ -1,1387 +0,0 @@
-// snes_spc 0.9.0. 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.
-
-// Gaussian interpolation
-
-static short const gauss 512 =
-{
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
- 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5,
- 6, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10,
- 11, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 15, 16, 16, 17, 17,
- 18, 19, 19, 20, 20, 21, 21, 22, 23, 23, 24, 24, 25, 26, 27, 27,
- 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 36, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 58, 59, 60, 61, 62, 64, 65, 66, 67, 69, 70, 71, 73, 74, 76, 77,
- 78, 80, 81, 83, 84, 86, 87, 89, 90, 92, 94, 95, 97, 99, 100, 102,
- 104, 106, 107, 109, 111, 113, 115, 117, 118, 120, 122, 124, 126, 128, 130, 132,
- 134, 137, 139, 141, 143, 145, 147, 150, 152, 154, 156, 159, 161, 163, 166, 168,
- 171, 173, 175, 178, 180, 183, 186, 188, 191, 193, 196, 199, 201, 204, 207, 210,
- 212, 215, 218, 221, 224, 227, 230, 233, 236, 239, 242, 245, 248, 251, 254, 257,
- 260, 263, 267, 270, 273, 276, 280, 283, 286, 290, 293, 297, 300, 304, 307, 311,
- 314, 318, 321, 325, 328, 332, 336, 339, 343, 347, 351, 354, 358, 362, 366, 370,
- 374, 378, 381, 385, 389, 393, 397, 401, 405, 410, 414, 418, 422, 426, 430, 434,
- 439, 443, 447, 451, 456, 460, 464, 469, 473, 477, 482, 486, 491, 495, 499, 504,
- 508, 513, 517, 522, 527, 531, 536, 540, 545, 550, 554, 559, 563, 568, 573, 577,
- 582, 587, 592, 596, 601, 606, 611, 615, 620, 625, 630, 635, 640, 644, 649, 654,
- 659, 664, 669, 674, 678, 683, 688, 693, 698, 703, 708, 713, 718, 723, 728, 732,
- 737, 742, 747, 752, 757, 762, 767, 772, 777, 782, 787, 792, 797, 802, 806, 811,
- 816, 821, 826, 831, 836, 841, 846, 851, 855, 860, 865, 870, 875, 880, 884, 889,
- 894, 899, 904, 908, 913, 918, 923, 927, 932, 937, 941, 946, 951, 955, 960, 965,
- 969, 974, 978, 983, 988, 992, 997,1001,1005,1010,1014,1019,1023,1027,1032,1036,
-1040,1045,1049,1053,1057,1061,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,
-1106,1109,1113,1117,1121,1125,1128,1132,1136,1139,1143,1146,1150,1153,1157,1160,
-1164,1167,1170,1174,1177,1180,1183,1186,1190,1193,1196,1199,1202,1205,1207,1210,
-1213,1216,1219,1221,1224,1227,1229,1232,1234,1237,1239,1241,1244,1246,1248,1251,
-1253,1255,1257,1259,1261,1263,1265,1267,1269,1270,1272,1274,1275,1277,1279,1280,
-1282,1283,1284,1286,1287,1288,1290,1291,1292,1293,1294,1295,1296,1297,1297,1298,
-1299,1300,1300,1301,1302,1302,1303,1303,1303,1304,1304,1304,1304,1304,1305,1305,
-};
-
-static short const cubic 514 =
-{
- 0, -4, -8, -12, -16, -20, -23, -27, -30, -34, -37, -41, -44, -47, -50, -53,
- -56, -59, -62, -65, -68, -71, -73, -76, -78, -81, -84, -87, -89, -91, -93, -95,
- -98,-100,-102,-104,-106,-109,-110,-112,-113,-116,-117,-119,-121,-122,-123,-125,
--126,-128,-129,-131,-132,-134,-134,-136,-136,-138,-138,-140,-141,-141,-142,-143,
--144,-144,-145,-146,-147,-148,-147,-148,-148,-149,-149,-150,-150,-150,-150,-151,
--151,-151,-151,-151,-152,-152,-151,-152,-151,-152,-151,-151,-151,-151,-150,-150,
--150,-149,-149,-149,-149,-148,-147,-147,-146,-146,-145,-145,-144,-144,-143,-142,
--141,-141,-140,-139,-139,-138,-137,-136,-135,-135,-133,-133,-132,-131,-130,-129,
--128,-127,-126,-125,-124,-123,-121,-121,-119,-118,-117,-116,-115,-114,-112,-111,
--110,-109,-107,-106,-105,-104,-102,-102,-100, -99, -97, -97, -95, -94, -92, -91,
- -90, -88, -87, -86, -85, -84, -82, -81, -79, -78, -76, -76, -74, -73, -71, -70,
- -68, -67, -66, -65, -63, -62, -60, -60, -58, -57, -55, -55, -53, -52, -50, -49,
- -48, -46, -45, -44, -43, -42, -40, -39, -38, -37, -36, -35, -34, -32, -31, -30,
- -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -19, -17, -16, -15, -14,
- -14, -13, -12, -11, -11, -10, -9, -9, -8, -8, -7, -7, -6, -5, -4, -4,
- -3, -3, -3, -2, -2, -2, -1, -1, 0, -1, 0, -1, 0, 0, 0, 0,
- 0,
-2048,2048,2048,2048,2047,2047,2046,2045,2043,2042,2041,2039,2037,2035,2033,2031,
-2028,2026,2024,2021,2018,2015,2012,2009,2005,2002,1999,1995,1991,1987,1982,1978,
-1974,1969,1965,1960,1955,1951,1946,1940,1934,1929,1924,1918,1912,1906,1900,1895,
-1888,1882,1875,1869,1862,1856,1849,1842,1835,1828,1821,1814,1806,1799,1791,1783,
-1776,1768,1760,1753,1744,1737,1728,1720,1711,1703,1695,1686,1677,1668,1659,1651,
-1641,1633,1623,1614,1605,1596,1587,1577,1567,1559,1549,1539,1529,1520,1510,1499,
-1490,1480,1470,1460,1450,1440,1430,1420,1408,1398,1389,1378,1367,1357,1346,1336,
-1325,1315,1304,1293,1282,1272,1261,1250,1239,1229,1218,1207,1196,1185,1174,1163,
-1152,1141,1130,1119,1108,1097,1086,1075,1063,1052,1042,1030,1019,1008, 997, 986,
- 974, 964, 952, 941, 930, 919, 908, 897, 886, 875, 864, 853, 842, 831, 820, 809,
- 798, 787, 776, 765, 754, 744, 733, 722, 711, 700, 690, 679, 668, 658, 647, 637,
- 626, 616, 605, 595, 584, 574, 564, 554, 543, 534, 524, 514, 503, 494, 483, 473,
- 464, 454, 444, 435, 425, 416, 407, 397, 387, 378, 370, 360, 351, 342, 333, 325,
- 315, 307, 298, 290, 281, 273, 265, 256, 248, 241, 233, 225, 216, 209, 201, 193,
- 186, 178, 171, 164, 157, 150, 143, 137, 129, 123, 117, 110, 103, 97, 91, 85,
- 79, 74, 68, 62, 56, 51, 46, 41, 35, 31, 27, 22, 17, 13, 8, 4,
- 0
-};
-
-static short const sinc 2048 =
-{
- 39, -315, 666, 15642, 666, -315, 39, -38,
- 38, -302, 613, 15642, 718, -328, 41, -38,
- 36, -288, 561, 15641, 772, -342, 42, -38,
- 35, -275, 510, 15639, 826, -355, 44, -38,
- 33, -263, 459, 15636, 880, -369, 46, -38,
- 32, -250, 408, 15632, 935, -383, 47, -38,
- 31, -237, 358, 15628, 990, -396, 49, -38,
- 29, -224, 309, 15622, 1046, -410, 51, -38,
- 28, -212, 259, 15616, 1103, -425, 53, -38,
- 27, -200, 211, 15609, 1159, -439, 54, -38,
- 25, -188, 163, 15601, 1216, -453, 56, -38,
- 24, -175, 115, 15593, 1274, -467, 58, -38,
- 23, -164, 68, 15583, 1332, -482, 60, -38,
- 22, -152, 22, 15573, 1391, -496, 62, -37,
- 21, -140, -24, 15562, 1450, -511, 64, -37,
- 19, -128, -70, 15550, 1509, -526, 66, -37,
- 18, -117, -115, 15538, 1569, -540, 68, -37,
- 17, -106, -159, 15524, 1629, -555, 70, -37,
- 16, -94, -203, 15510, 1690, -570, 72, -36,
- 15, -83, -247, 15495, 1751, -585, 74, -36,
- 14, -72, -289, 15479, 1813, -600, 76, -36,
- 13, -62, -332, 15462, 1875, -616, 79, -36,
- 12, -51, -374, 15445, 1937, -631, 81, -35,
- 11, -40, -415, 15426, 2000, -646, 83, -35,
- 11, -30, -456, 15407, 2063, -662, 85, -35,
- 10, -20, -496, 15387, 2127, -677, 88, -34,
- 9, -9, -536, 15366, 2191, -693, 90, -34,
- 8, 1, -576, 15345, 2256, -708, 92, -34,
- 7, 10, -614, 15323, 2321, -724, 95, -33,
- 7, 20, -653, 15300, 2386, -740, 97, -33,
- 6, 30, -690, 15276, 2451, -755, 99, -33,
- 5, 39, -728, 15251, 2517, -771, 102, -32,
- 5, 49, -764, 15226, 2584, -787, 104, -32,
- 4, 58, -801, 15200, 2651, -803, 107, -32,
- 3, 67, -836, 15173, 2718, -819, 109, -31,
- 3, 76, -871, 15145, 2785, -835, 112, -31,
- 2, 85, -906, 15117, 2853, -851, 115, -30,
- 2, 93, -940, 15087, 2921, -867, 117, -30,
- 1, 102, -974, 15057, 2990, -883, 120, -29,
- 1, 110, -1007, 15027, 3059, -899, 122, -29,
- 0, 118, -1039, 14995, 3128, -915, 125, -29,
- 0, 127, -1071, 14963, 3198, -931, 128, -28,
- -1, 135, -1103, 14930, 3268, -948, 131, -28,
- -1, 142, -1134, 14896, 3338, -964, 133, -27,
- -1, 150, -1164, 14862, 3409, -980, 136, -27,
- -2, 158, -1194, 14827, 3480, -996, 139, -26,
- -2, 165, -1224, 14791, 3551, -1013, 142, -26,
- -3, 172, -1253, 14754, 3622, -1029, 144, -25,
- -3, 179, -1281, 14717, 3694, -1045, 147, -25,
- -3, 187, -1309, 14679, 3766, -1062, 150, -24,
- -3, 193, -1337, 14640, 3839, -1078, 153, -24,
- -4, 200, -1363, 14601, 3912, -1094, 156, -23,
- -4, 207, -1390, 14561, 3985, -1110, 159, -23,
- -4, 213, -1416, 14520, 4058, -1127, 162, -22,
- -4, 220, -1441, 14479, 4131, -1143, 165, -22,
- -4, 226, -1466, 14437, 4205, -1159, 168, -22,
- -5, 232, -1490, 14394, 4279, -1175, 171, -21,
- -5, 238, -1514, 14350, 4354, -1192, 174, -21,
- -5, 244, -1537, 14306, 4428, -1208, 177, -20,
- -5, 249, -1560, 14261, 4503, -1224, 180, -20,
- -5, 255, -1583, 14216, 4578, -1240, 183, -19,
- -5, 260, -1604, 14169, 4653, -1256, 186, -19,
- -5, 265, -1626, 14123, 4729, -1272, 189, -18,
- -5, 271, -1647, 14075, 4805, -1288, 192, -18,
- -5, 276, -1667, 14027, 4881, -1304, 195, -17,
- -6, 280, -1687, 13978, 4957, -1320, 198, -17,
- -6, 285, -1706, 13929, 5033, -1336, 201, -16,
- -6, 290, -1725, 13879, 5110, -1352, 204, -16,
- -6, 294, -1744, 13829, 5186, -1368, 207, -15,
- -6, 299, -1762, 13777, 5263, -1383, 210, -15,
- -6, 303, -1779, 13726, 5340, -1399, 213, -14,
- -6, 307, -1796, 13673, 5418, -1414, 216, -14,
- -6, 311, -1813, 13620, 5495, -1430, 219, -13,
- -5, 315, -1829, 13567, 5573, -1445, 222, -13,
- -5, 319, -1844, 13512, 5651, -1461, 225, -13,
- -5, 322, -1859, 13458, 5728, -1476, 229, -12,
- -5, 326, -1874, 13402, 5806, -1491, 232, -12,
- -5, 329, -1888, 13347, 5885, -1506, 235, -11,
- -5, 332, -1902, 13290, 5963, -1521, 238, -11,
- -5, 335, -1915, 13233, 6041, -1536, 241, -10,
- -5, 338, -1928, 13176, 6120, -1551, 244, -10,
- -5, 341, -1940, 13118, 6199, -1566, 247, -10,
- -5, 344, -1952, 13059, 6277, -1580, 250, -9,
- -5, 347, -1964, 13000, 6356, -1595, 253, -9,
- -5, 349, -1975, 12940, 6435, -1609, 256, -8,
- -4, 352, -1986, 12880, 6514, -1623, 259, -8,
- -4, 354, -1996, 12819, 6594, -1637, 262, -8,
- -4, 356, -2005, 12758, 6673, -1651, 265, -7,
- -4, 358, -2015, 12696, 6752, -1665, 268, -7,
- -4, 360, -2024, 12634, 6831, -1679, 271, -7,
- -4, 362, -2032, 12572, 6911, -1693, 274, -6,
- -4, 364, -2040, 12509, 6990, -1706, 277, -6,
- -4, 366, -2048, 12445, 7070, -1719, 280, -6,
- -3, 367, -2055, 12381, 7149, -1732, 283, -5,
- -3, 369, -2062, 12316, 7229, -1745, 286, -5,
- -3, 370, -2068, 12251, 7308, -1758, 289, -5,
- -3, 371, -2074, 12186, 7388, -1771, 291, -4,
- -3, 372, -2079, 12120, 7467, -1784, 294, -4,
- -3, 373, -2084, 12054, 7547, -1796, 297, -4,
- -3, 374, -2089, 11987, 7626, -1808, 300, -4,
- -2, 375, -2094, 11920, 7706, -1820, 303, -3,
- -2, 376, -2098, 11852, 7785, -1832, 305, -3,
- -2, 376, -2101, 11785, 7865, -1844, 308, -3,
- -2, 377, -2104, 11716, 7944, -1855, 311, -3,
- -2, 377, -2107, 11647, 8024, -1866, 313, -2,
- -2, 378, -2110, 11578, 8103, -1877, 316, -2,
- -2, 378, -2112, 11509, 8182, -1888, 318, -2,
- -1, 378, -2113, 11439, 8262, -1899, 321, -2,
- -1, 378, -2115, 11369, 8341, -1909, 323, -2,
- -1, 378, -2116, 11298, 8420, -1920, 326, -2,
- -1, 378, -2116, 11227, 8499, -1930, 328, -1,
- -1, 378, -2116, 11156, 8578, -1940, 331, -1,
- -1, 378, -2116, 11084, 8656, -1949, 333, -1,
- -1, 377, -2116, 11012, 8735, -1959, 335, -1,
- -1, 377, -2115, 10940, 8814, -1968, 337, -1,
- -1, 377, -2114, 10867, 8892, -1977, 340, -1,
- -1, 376, -2112, 10795, 8971, -1985, 342, -1,
- 0, 375, -2111, 10721, 9049, -1994, 344, -1,
- 0, 375, -2108, 10648, 9127, -2002, 346, 0,
- 0, 374, -2106, 10574, 9205, -2010, 348, 0,
- 0, 373, -2103, 10500, 9283, -2018, 350, 0,
- 0, 372, -2100, 10426, 9360, -2025, 352, 0,
- 0, 371, -2097, 10351, 9438, -2032, 354, 0,
- 0, 370, -2093, 10276, 9515, -2039, 355, 0,
- 0, 369, -2089, 10201, 9592, -2046, 357, 0,
- 0, 367, -2084, 10126, 9669, -2052, 359, 0,
- 0, 366, -2080, 10050, 9745, -2058, 360, 0,
- 0, 365, -2075, 9974, 9822, -2064, 362, 0,
- 0, 363, -2070, 9898, 9898, -2070, 363, 0,
- 0, 362, -2064, 9822, 9974, -2075, 365, 0,
- 0, 360, -2058, 9745, 10050, -2080, 366, 0,
- 0, 359, -2052, 9669, 10126, -2084, 367, 0,
- 0, 357, -2046, 9592, 10201, -2089, 369, 0,
- 0, 355, -2039, 9515, 10276, -2093, 370, 0,
- 0, 354, -2032, 9438, 10351, -2097, 371, 0,
- 0, 352, -2025, 9360, 10426, -2100, 372, 0,
- 0, 350, -2018, 9283, 10500, -2103, 373, 0,
- 0, 348, -2010, 9205, 10574, -2106, 374, 0,
- 0, 346, -2002, 9127, 10648, -2108, 375, 0,
- -1, 344, -1994, 9049, 10721, -2111, 375, 0,
- -1, 342, -1985, 8971, 10795, -2112, 376, -1,
- -1, 340, -1977, 8892, 10867, -2114, 377, -1,
- -1, 337, -1968, 8814, 10940, -2115, 377, -1,
- -1, 335, -1959, 8735, 11012, -2116, 377, -1,
- -1, 333, -1949, 8656, 11084, -2116, 378, -1,
- -1, 331, -1940, 8578, 11156, -2116, 378, -1,
- -1, 328, -1930, 8499, 11227, -2116, 378, -1,
- -2, 326, -1920, 8420, 11298, -2116, 378, -1,
- -2, 323, -1909, 8341, 11369, -2115, 378, -1,
- -2, 321, -1899, 8262, 11439, -2113, 378, -1,
- -2, 318, -1888, 8182, 11509, -2112, 378, -2,
- -2, 316, -1877, 8103, 11578, -2110, 378, -2,
- -2, 313, -1866, 8024, 11647, -2107, 377, -2,
- -3, 311, -1855, 7944, 11716, -2104, 377, -2,
- -3, 308, -1844, 7865, 11785, -2101, 376, -2,
- -3, 305, -1832, 7785, 11852, -2098, 376, -2,
- -3, 303, -1820, 7706, 11920, -2094, 375, -2,
- -4, 300, -1808, 7626, 11987, -2089, 374, -3,
- -4, 297, -1796, 7547, 12054, -2084, 373, -3,
- -4, 294, -1784, 7467, 12120, -2079, 372, -3,
- -4, 291, -1771, 7388, 12186, -2074, 371, -3,
- -5, 289, -1758, 7308, 12251, -2068, 370, -3,
- -5, 286, -1745, 7229, 12316, -2062, 369, -3,
- -5, 283, -1732, 7149, 12381, -2055, 367, -3,
- -6, 280, -1719, 7070, 12445, -2048, 366, -4,
- -6, 277, -1706, 6990, 12509, -2040, 364, -4,
- -6, 274, -1693, 6911, 12572, -2032, 362, -4,
- -7, 271, -1679, 6831, 12634, -2024, 360, -4,
- -7, 268, -1665, 6752, 12696, -2015, 358, -4,
- -7, 265, -1651, 6673, 12758, -2005, 356, -4,
- -8, 262, -1637, 6594, 12819, -1996, 354, -4,
- -8, 259, -1623, 6514, 12880, -1986, 352, -4,
- -8, 256, -1609, 6435, 12940, -1975, 349, -5,
- -9, 253, -1595, 6356, 13000, -1964, 347, -5,
- -9, 250, -1580, 6277, 13059, -1952, 344, -5,
- -10, 247, -1566, 6199, 13118, -1940, 341, -5,
- -10, 244, -1551, 6120, 13176, -1928, 338, -5,
- -10, 241, -1536, 6041, 13233, -1915, 335, -5,
- -11, 238, -1521, 5963, 13290, -1902, 332, -5,
- -11, 235, -1506, 5885, 13347, -1888, 329, -5,
- -12, 232, -1491, 5806, 13402, -1874, 326, -5,
- -12, 229, -1476, 5728, 13458, -1859, 322, -5,
- -13, 225, -1461, 5651, 13512, -1844, 319, -5,
- -13, 222, -1445, 5573, 13567, -1829, 315, -5,
- -13, 219, -1430, 5495, 13620, -1813, 311, -6,
- -14, 216, -1414, 5418, 13673, -1796, 307, -6,
- -14, 213, -1399, 5340, 13726, -1779, 303, -6,
- -15, 210, -1383, 5263, 13777, -1762, 299, -6,
- -15, 207, -1368, 5186, 13829, -1744, 294, -6,
- -16, 204, -1352, 5110, 13879, -1725, 290, -6,
- -16, 201, -1336, 5033, 13929, -1706, 285, -6,
- -17, 198, -1320, 4957, 13978, -1687, 280, -6,
- -17, 195, -1304, 4881, 14027, -1667, 276, -5,
- -18, 192, -1288, 4805, 14075, -1647, 271, -5,
- -18, 189, -1272, 4729, 14123, -1626, 265, -5,
- -19, 186, -1256, 4653, 14169, -1604, 260, -5,
- -19, 183, -1240, 4578, 14216, -1583, 255, -5,
- -20, 180, -1224, 4503, 14261, -1560, 249, -5,
- -20, 177, -1208, 4428, 14306, -1537, 244, -5,
- -21, 174, -1192, 4354, 14350, -1514, 238, -5,
- -21, 171, -1175, 4279, 14394, -1490, 232, -5,
- -22, 168, -1159, 4205, 14437, -1466, 226, -4,
- -22, 165, -1143, 4131, 14479, -1441, 220, -4,
- -22, 162, -1127, 4058, 14520, -1416, 213, -4,
- -23, 159, -1110, 3985, 14561, -1390, 207, -4,
- -23, 156, -1094, 3912, 14601, -1363, 200, -4,
- -24, 153, -1078, 3839, 14640, -1337, 193, -3,
- -24, 150, -1062, 3766, 14679, -1309, 187, -3,
- -25, 147, -1045, 3694, 14717, -1281, 179, -3,
- -25, 144, -1029, 3622, 14754, -1253, 172, -3,
- -26, 142, -1013, 3551, 14791, -1224, 165, -2,
- -26, 139, -996, 3480, 14827, -1194, 158, -2,
- -27, 136, -980, 3409, 14862, -1164, 150, -1,
- -27, 133, -964, 3338, 14896, -1134, 142, -1,
- -28, 131, -948, 3268, 14930, -1103, 135, -1,
- -28, 128, -931, 3198, 14963, -1071, 127, 0,
- -29, 125, -915, 3128, 14995, -1039, 118, 0,
- -29, 122, -899, 3059, 15027, -1007, 110, 1,
- -29, 120, -883, 2990, 15057, -974, 102, 1,
- -30, 117, -867, 2921, 15087, -940, 93, 2,
- -30, 115, -851, 2853, 15117, -906, 85, 2,
- -31, 112, -835, 2785, 15145, -871, 76, 3,
- -31, 109, -819, 2718, 15173, -836, 67, 3,
- -32, 107, -803, 2651, 15200, -801, 58, 4,
- -32, 104, -787, 2584, 15226, -764, 49, 5,
- -32, 102, -771, 2517, 15251, -728, 39, 5,
- -33, 99, -755, 2451, 15276, -690, 30, 6,
- -33, 97, -740, 2386, 15300, -653, 20, 7,
- -33, 95, -724, 2321, 15323, -614, 10, 7,
- -34, 92, -708, 2256, 15345, -576, 1, 8,
- -34, 90, -693, 2191, 15366, -536, -9, 9,
- -34, 88, -677, 2127, 15387, -496, -20, 10,
- -35, 85, -662, 2063, 15407, -456, -30, 11,
- -35, 83, -646, 2000, 15426, -415, -40, 11,
- -35, 81, -631, 1937, 15445, -374, -51, 12,
- -36, 79, -616, 1875, 15462, -332, -62, 13,
- -36, 76, -600, 1813, 15479, -289, -72, 14,
- -36, 74, -585, 1751, 15495, -247, -83, 15,
- -36, 72, -570, 1690, 15510, -203, -94, 16,
- -37, 70, -555, 1629, 15524, -159, -106, 17,
- -37, 68, -540, 1569, 15538, -115, -117, 18,
- -37, 66, -526, 1509, 15550, -70, -128, 19,
- -37, 64, -511, 1450, 15562, -24, -140, 21,
- -37, 62, -496, 1391, 15573, 22, -152, 22,
- -38, 60, -482, 1332, 15583, 68, -164, 23,
- -38, 58, -467, 1274, 15593, 115, -175, 24,
- -38, 56, -453, 1216, 15601, 163, -188, 25,
- -38, 54, -439, 1159, 15609, 211, -200, 27,
- -38, 53, -425, 1103, 15616, 259, -212, 28,
- -38, 51, -410, 1046, 15622, 309, -224, 29,
- -38, 49, -396, 990, 15628, 358, -237, 31,
- -38, 47, -383, 935, 15632, 408, -250, 32,
- -38, 46, -369, 880, 15636, 459, -263, 33,
- -38, 44, -355, 826, 15639, 510, -275, 35,
- -38, 42, -342, 772, 15641, 561, -288, 36,
- -38, 41, -328, 718, 15642, 613, -302, 38,
-};
-
-inline int Spc_Dsp::interpolate( voice_t const* v )
-{
-	// Make pointers into gaussian based on fractional position between samples
-	int offset = v->interp_pos >> 4 & 0xFF;
-	short const* fwd = gauss + 255 - offset;
-	short const* rev = gauss + offset; // mirror left half of gaussian
-	
-	int const* in = &v->buf (v->interp_pos >> 12) + v->buf_pos;
-	int out;
-	out = (fwd 0 * in 0) >> 11;
-	out += (fwd 256 * in 1) >> 11;
-	out += (rev 256 * in 2) >> 11;
-	out = (int16_t) out;
-	out += (rev 0 * in 3) >> 11;
-	
-	CLAMP16( out );
-	out &= ~1;
-	return out;
-}
-
-inline int Spc_Dsp::interpolate_cubic( voice_t const* v )
-{
-	// Make pointers into cubic based on fractional position between samples
-	int offset = v->interp_pos >> 4 & 0xFF;
-	short const* fwd = cubic + offset;
-	short const* rev = cubic + 256 - offset; // mirror left half of cubic
-	
-	int const* in = &v->buf (v->interp_pos >> 12) + v->buf_pos;
-	int out;
-	out = fwd 0 * in 0;
-	out += fwd 257 * in 1;
-	out += rev 257 * in 2;
-	out += rev 0 * in 3;
-	out >>= 11;
-	
-	CLAMP16( out );
-	out &= ~1;
-	return out;
-}
-
-inline int Spc_Dsp::interpolate_sinc( voice_t const* v )
-{
-	// Make pointers into cubic based on fractional position between samples
-	int offset = v->interp_pos & 0xFF0;
-	short const* filt = (short const*) (((char const*)sinc) + offset);
-	
-	int const* in = &v->buf (v->interp_pos >> 12) + v->buf_pos;
-	int out;
-	out = filt 0 * in 0;
-	out += filt 1 * in 1;
-	out += filt 2 * in 2;
-	out += filt 3 * in 3;
-	out += filt 4 * in 4;
-	out += filt 5 * in 5;
-	out += filt 6 * in 6;
-	out += filt 7 * in 7;
-	out >>= 14;
-	
-	CLAMP16( out );
-	out &= ~1;
-	return out;
-}
-
-//// Counters
-
-int const simple_counter_range = 2048 * 5 * 3; // 30720
-
-static unsigned const counter_rates 32 =
-{
- simple_counter_range + 1, // never fires
- 2048, 1536,
-	1280, 1024, 768,
-	 640, 512, 384,
-	 320, 256, 192,
-	 160, 128, 96,
-	 80, 64, 48,
-	 40, 32, 24,
-	 20, 16, 12,
-	 10, 8, 6,
-	 5, 4, 3,
-	 2,
-	 1
-};
-
-static unsigned const counter_offsets 32 =
-{
-	 1, 0, 1040,
-	536, 0, 1040,
-	536, 0, 1040,
-	536, 0, 1040,
-	536, 0, 1040,
-	536, 0, 1040,
-	536, 0, 1040,
-	536, 0, 1040,
-	536, 0, 1040,
-	536, 0, 1040,
-	 0,
-	 0
-};
-
-inline void Spc_Dsp::init_counter()
-{
-	m.counter = 0;
-}
-
-inline void Spc_Dsp::run_counters()
-{
-	if ( --m.counter < 0 )
-		m.counter = simple_counter_range - 1;
-}
-
-inline unsigned Spc_Dsp::read_counter( int rate )
-{
-	return ((unsigned) m.counter + counter_offsets rate) % counter_rates rate;
-}
-
-
-//// Envelope
-
-inline void Spc_Dsp::run_envelope( voice_t* const v )
-{
-	int env = v->env;
-	if ( v->env_mode == env_release ) // 60%
-	{
-		if ( (env -= 0x8) < 0 )
-			env = 0;
-		v->env = env;
-	}
-	else
-	{
-		int rate;
-		int env_data = VREG(v->regs,adsr1);
-		if ( m.t_adsr0 & 0x80 ) // 99% ADSR
-		{
-			if ( v->env_mode >= env_decay ) // 99%
-			{
-				env--;
-				env -= env >> 8;
-				rate = env_data & 0x1F;
-				if ( v->env_mode == env_decay ) // 1%
-					rate = (m.t_adsr0 >> 3 & 0x0E) + 0x10;
-			}
-			else // env_attack
-			{
-				rate = (m.t_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
-	}
-}
-
-
-//// BRR Decoding
-
-inline void Spc_Dsp::decode_brr( voice_t* v )
-{
-	// Arrange the four input nybbles in 0xABCD order for easy decoding
-	int nybbles = m.t_brr_byte * 0x100 + m.ram (v->brr_addr + v->brr_offset + 1) & 0xFFFF;
-	
-	int const header = m.t_brr_header;
-	
-	// Write to next four samples in circular buffer
-	int* pos = &v->buf v->buf_pos;
-	int* end;
-	if ( (v->buf_pos += 4) >= brr_buf_size )
-		v->buf_pos = 0;
-	
-	// Decode four samples
-	for ( end = pos + 4; pos < end; pos++, nybbles <<= 4 )
-	{
-		// Extract nybble and sign-extend
-		int s = (int16_t) nybbles >> 12;
-		
-		// Shift sample based on header
-		int const shift = header >> 4;
-		s = (s << shift) >> 1;
-		if ( shift >= 0xD ) // handle invalid range
-			s = (s >> 25) << 11; // same as: s = (s < 0 ? -0x800 : 0)
-		
-		// Apply IIR filter (8 is the most commonly used)
-		int const filter = 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
-	}
-}
-
-
-//// Misc
-
-#define MISC_CLOCK( n ) inline void Spc_Dsp::misc_##n()
-
-MISC_CLOCK( 27 )
-{
-	m.t_pmon = REG(pmon) & 0xFE; // voice 0 doesn't support PMON
-}
-MISC_CLOCK( 28 )
-{
-	m.t_non = REG(non);
-	m.t_eon = REG(eon);
-	m.t_dir = REG(dir);
-}
-MISC_CLOCK( 29 )
-{
-	if ( (m.every_other_sample ^= 1) != 0 )
-		m.new_kon &= ~m.kon; // clears KON 63 clocks after it was last read
-}
-MISC_CLOCK( 30 )
-{
-	if ( m.every_other_sample )
-	{
-		m.kon = m.new_kon;
-		m.t_koff = REG(koff) | m.mute_mask; 
-	}
-	
-	run_counters();
-	
-	// Noise
-	if ( !read_counter( REG(flg) & 0x1F ) )
-	{
-		int feedback = (m.noise << 13) ^ (m.noise << 14);
-		m.noise = (feedback & 0x4000) ^ (m.noise >> 1);
-	}
-}
-
-
-//// Voices
-
-#define VOICE_CLOCK( n ) void Spc_Dsp::voice_##n( voice_t* const v )
-
-inline VOICE_CLOCK( V1 )
-{
-	m.t_dir_addr = m.t_dir * 0x100 + m.t_srcn * 4;
-	m.t_srcn = VREG(v->regs,srcn);
-}
-inline VOICE_CLOCK( V2 )
-{
-	// Read sample pointer (ignored if not needed)
-	uint8_t const* entry = &m.ram m.t_dir_addr;
-	if ( !v->kon_delay )
-		entry += 2;
-	m.t_brr_next_addr = GET_LE16A( entry );
-	
-	m.t_adsr0 = VREG(v->regs,adsr0);
-	
-	// Read pitch, spread over two clocks
-	m.t_pitch = VREG(v->regs,pitchl);
-}
-inline VOICE_CLOCK( V3a )
-{
-	m.t_pitch += (VREG(v->regs,pitchh) & 0x3F) << 8;
-}
-inline VOICE_CLOCK( V3b )
-{
-	// Read BRR header and byte
-	m.t_brr_byte = m.ram (v->brr_addr + v->brr_offset) & 0xFFFF;
-	m.t_brr_header = m.ram v->brr_addr; // brr_addr doesn't need masking
-}
-VOICE_CLOCK( V3c )
-{
-	// Pitch modulation using previous voice's output
-	if ( m.t_pmon & v->vbit )
-		m.t_pitch += ((m.t_output >> 5) * m.t_pitch) >> 10;
-	
-	if ( v->kon_delay )
-	{
-		// Get ready to start BRR decoding on next sample
-		if ( v->kon_delay == 5 )
-		{
-			v->brr_addr = m.t_brr_next_addr;
-			v->brr_offset = 1;
-			v->buf_pos = 0;
-			m.t_brr_header = 0; // header is ignored on this sample
-			m.kon_check = true;
-		}
-		
-		// Envelope is never run during KON
-		v->env = 0;
-		v->hidden_env = 0;
-		
-		// Disable BRR decoding until last three samples
-		v->interp_pos = 0;
-		if ( --v->kon_delay & 3 )
-			v->interp_pos = 0x4000;
-		
-		// Pitch is never added during KON
-		m.t_pitch = 0;
-	}
-	
-	// Gaussian interpolation
-	{
-		int output;
-		
-		switch ( m.interpolation_level )
-		{
-		case 0:
-		default:
-			output = interpolate( v );
-			break;
-
-		case 1:
-			output = interpolate_cubic( v );
-			break;
-
-		case 2:
-			output = interpolate_sinc( v );
-			break;
-		}
-		
-		// Noise
-		if ( m.t_non & v->vbit )
-			output = (int16_t) (m.noise * 2);
-		
-		// Apply envelope
-		m.t_output = (output * v->env) >> 11 & ~1;
-		v->t_envx_out = (uint8_t) (v->env >> 4);
-	}
-	
-	// Immediate silence due to end of sample or soft reset
-	if ( REG(flg) & 0x80 || (m.t_brr_header & 3) == 1 )
-	{
-		v->env_mode = env_release;
-		v->env = 0;
-	}
-	
-	if ( m.every_other_sample )
-	{
-		// KOFF
-		if ( m.t_koff & v->vbit )
-			v->env_mode = env_release;
-		
-		// KON
-		if ( m.kon & v->vbit )
-		{
-			v->kon_delay = 5;
-			v->env_mode = env_attack;
-		}
-	}
-	
-	// Run envelope for next sample
-	if ( !v->kon_delay )
-		run_envelope( v );
-}
-inline void Spc_Dsp::voice_output( voice_t const* v, int ch )
-{
-	// Check surround removal
-	int vol = (int8_t) VREG(v->regs,voll + ch);
-	int voln = (int8_t) VREG(v->regs,voll + ch ^ 1);
-	if ( vol * voln < m.surround_threshold )
-		vol ^= vol >> 7;
-	
-	// Apply left/right volume
-	int amp = (m.t_output * vol) >> 7;
-	
-	// Add to output total
-	m.t_main_out ch += amp;
-	CLAMP16( m.t_main_out ch );
-	
-	// Optionally add to echo total
-	if ( m.t_eon & v->vbit )
-	{
-		m.t_echo_out ch += amp;
-		CLAMP16( m.t_echo_out ch );
-	}
-}
-VOICE_CLOCK( V4 )
-{
-	// Decode BRR
-	m.t_looped = 0;
-	if ( v->interp_pos >= 0x4000 )
-	{
-		decode_brr( v );
-		
-		if ( (v->brr_offset += 2) >= brr_block_size )
-		{
-			// Start decoding next BRR block
-			assert( v->brr_offset == brr_block_size );
-			v->brr_addr = (v->brr_addr + brr_block_size) & 0xFFFF;
-			if ( m.t_brr_header & 1 )
-			{
-				v->brr_addr = m.t_brr_next_addr;
-				m.t_looped = v->vbit;
-			}
-			v->brr_offset = 1;
-		}
-	}
-	
-	// Apply pitch
-	v->interp_pos = (v->interp_pos & 0x3FFF) + m.t_pitch;
-	
-	// Keep from getting too far ahead (when using pitch modulation)
-	if ( v->interp_pos > 0x7FFF )
-		v->interp_pos = 0x7FFF;
-	
-	// Output left
-	voice_output( v, 0 );
-}
-inline VOICE_CLOCK( V5 )
-{
-	// Output right
-	voice_output( v, 1 );
-	
-	// ENDX, OUTX, and ENVX won't update if you wrote to them 1-2 clocks earlier
-	int endx_buf = REG(endx) | m.t_looped;
-	
-	// Clear bit in ENDX if KON just began
-	if ( v->kon_delay == 5 )
-		endx_buf &= ~v->vbit;
-	m.endx_buf = (uint8_t) endx_buf;
-}
-inline VOICE_CLOCK( V6 )
-{
-	(void) v; // avoid compiler warning about unused v
-	m.outx_buf = (uint8_t) (m.t_output >> 8);
-}
-inline VOICE_CLOCK( V7 )
-{
-	// Update ENDX
-	REG(endx) = m.endx_buf;
-	
-	m.envx_buf = v->t_envx_out;
-}
-inline VOICE_CLOCK( V8 )
-{
-	// Update OUTX
-	VREG(v->regs,outx) = m.outx_buf;
-}
-inline VOICE_CLOCK( V9 )
-{
-	// Update ENVX
-	VREG(v->regs,envx) = m.envx_buf;
-}
-
-// Most voices do all these in one clock, so make a handy composite
-inline VOICE_CLOCK( V3 )
-{
-	voice_V3a( v );
-	voice_V3b( v );
-	voice_V3c( v );
-}
-
-// Common combinations of voice steps on different voices. This greatly reduces
-// code size and allows everything to be inlined in these functions.
-VOICE_CLOCK(V7_V4_V1) { voice_V7(v); voice_V1(v+3); voice_V4(v+1); }
-VOICE_CLOCK(V8_V5_V2) { voice_V8(v); voice_V5(v+1); voice_V2(v+2); }
-VOICE_CLOCK(V9_V6_V3) { voice_V9(v); voice_V6(v+1); voice_V3(v+2); }
-
-
-//// Echo
-
-// Current echo buffer pointer for left/right channel
-#define ECHO_PTR( ch ) (&m.ram m.t_echo_ptr + ch * 2)
-
-// Sample in echo history buffer, where 0 is the oldest
-#define ECHO_FIR( i ) (m.echo_hist_pos i)
-
-// Calculate FIR point for left/right channel
-#define CALC_FIR( i, ch ) ((ECHO_FIR( i + 1 ) ch * (int8_t) REG(fir + i * 0x10)) >> 6)
-
-#define ECHO_CLOCK( n ) inline void Spc_Dsp::echo_##n()
-
-inline void Spc_Dsp::echo_read( int ch )
-{
-	int s = GET_LE16SA( ECHO_PTR( ch ) );
-	// second copy simplifies wrap-around handling
-	ECHO_FIR( 0 ) ch = ECHO_FIR( 8 ) ch = s >> 1;
-}
-
-ECHO_CLOCK( 22 )
-{
-	// History
-	if ( ++m.echo_hist_pos >= &m.echo_hist echo_hist_size )
-		m.echo_hist_pos = m.echo_hist;
-	
-	m.t_echo_ptr = (m.t_esa * 0x100 + m.echo_offset) & 0xFFFF;
-	echo_read( 0 );
-	
-	// FIR (using l and r temporaries below helps compiler optimize)
-	int l = CALC_FIR( 0, 0 );
-	int r = CALC_FIR( 0, 1 );
-	
-	m.t_echo_in 0 = l;
-	m.t_echo_in 1 = r;
-}
-ECHO_CLOCK( 23 )
-{
-	int l = CALC_FIR( 1, 0 ) + CALC_FIR( 2, 0 );
-	int r = CALC_FIR( 1, 1 ) + CALC_FIR( 2, 1 );
-	
-	m.t_echo_in 0 += l;
-	m.t_echo_in 1 += r;
-	
-	echo_read( 1 );
-}
-ECHO_CLOCK( 24 )
-{
-	int l = CALC_FIR( 3, 0 ) + CALC_FIR( 4, 0 ) + CALC_FIR( 5, 0 );
-	int r = CALC_FIR( 3, 1 ) + CALC_FIR( 4, 1 ) + CALC_FIR( 5, 1 );
-	
-	m.t_echo_in 0 += l;
-	m.t_echo_in 1 += r;
-}
-ECHO_CLOCK( 25 )
-{
-	int l = m.t_echo_in 0 + CALC_FIR( 6, 0 );
-	int r = m.t_echo_in 1 + CALC_FIR( 6, 1 );
-	
-	l = (int16_t) l;
-	r = (int16_t) r;
-	
-	l += (int16_t) CALC_FIR( 7, 0 );
-	r += (int16_t) CALC_FIR( 7, 1 );
-	
-	CLAMP16( l );
-	CLAMP16( r );
-	
-	m.t_echo_in 0 = l & ~1;
-	m.t_echo_in 1 = r & ~1;
-}
-inline int Spc_Dsp::echo_output( int ch )
-{
-	// Check surround removal
-	int vol = (int8_t) REG(mvoll + ch * 0x10);
-	int voln = (int8_t) REG(mvoll + ch * 0x10 ^ 0x10);
-	if ( vol * voln < m.surround_threshold )
-		vol ^= vol >> 7;
-	
-	int out = (int16_t) ((m.t_main_out ch * vol) >> 7) +
-			(int16_t) ((m.t_echo_in ch * (int8_t) REG(evoll + ch * 0x10)) >> 7);
-	CLAMP16( out );
-	return out;
-}
-ECHO_CLOCK( 26 )
-{
-	// Left output volumes
-	// (save sample for next clock so we can output both together)
-	m.t_main_out 0 = echo_output( 0 );
-	
-	// Echo feedback
-	int l = m.t_echo_out 0 + (int16_t) ((m.t_echo_in 0 * (int8_t) REG(efb)) >> 7);
-	int r = m.t_echo_out 1 + (int16_t) ((m.t_echo_in 1 * (int8_t) REG(efb)) >> 7);
-	
-	CLAMP16( l );
-	CLAMP16( r );
-	
-	m.t_echo_out 0 = l & ~1;
-	m.t_echo_out 1 = r & ~1;
-}
-ECHO_CLOCK( 27 )
-{
-	// Output
-	int l = m.t_main_out 0;
-	int r = echo_output( 1 );
-	m.t_main_out 0 = 0;
-	m.t_main_out 1 = 0;
-	
-	// TODO: global muting isn't this simple (turns DAC on and off
-	// or something, causing small ~37-sample pulse when first muted)
-	if ( REG(flg) & 0x40 )
-	{
-		l = 0;
-		r = 0;
-	}
-	
-	// Output sample to DAC
-	#ifdef SPC_DSP_OUT_HOOK
-		SPC_DSP_OUT_HOOK( l, r );
-	#else
-		sample_t* out = m.out;
-		WRITE_SAMPLES( l, r, out );
-		m.out = out;
-	#endif
-}
-ECHO_CLOCK( 28 )
-{
-	m.t_echo_enabled = REG(flg);
-}
-inline void Spc_Dsp::echo_write( int ch )
-{
-	if ( !(m.t_echo_enabled & 0x20) )
-		SET_LE16A( ECHO_PTR( ch ), m.t_echo_out ch );
-	m.t_echo_out ch = 0;
-}
-ECHO_CLOCK( 29 )
-{
-	m.t_esa = REG(esa);
-	
-	if ( !m.echo_offset )
-		m.echo_length = (REG(edl) & 0x0F) * 0x800;
-	
-	m.echo_offset += 4;
-	if ( m.echo_offset >= m.echo_length )
-		m.echo_offset = 0;
-	
-	// Write left echo
-	echo_write( 0 );
-	
-	m.t_echo_enabled = REG(flg);
-}
-ECHO_CLOCK( 30 )
-{
-	// Write right echo
-	echo_write( 1 );
-}
-
-
-//// Timing
-
-// Execute clock for a particular voice
-#define V( clock, voice ) voice_##clock( &m.voices voice );
-
-/* The most common sequence of clocks uses composite operations
-for efficiency. For example, the following are equivalent to the
-individual steps on the right:
-
-V(V7_V4_V1,2) -> V(V7,2) V(V4,3) V(V1,5)
-V(V8_V5_V2,2) -> V(V8,2) V(V5,3) V(V2,4)
-V(V9_V6_V3,2) -> V(V9,2) V(V6,3) V(V3,4) */
-
-// Voice 0 1 2 3 4 5 6 7
-#define GEN_DSP_TIMING \
-PHASE( 0) V(V5,0)V(V2,1)\
-PHASE( 1) V(V6,0)V(V3,1)\
-PHASE( 2) V(V7_V4_V1,0)\
-PHASE( 3) V(V8_V5_V2,0)\
-PHASE( 4) V(V9_V6_V3,0)\
-PHASE( 5) V(V7_V4_V1,1)\
-PHASE( 6) V(V8_V5_V2,1)\
-PHASE( 7) V(V9_V6_V3,1)\
-PHASE( 8) V(V7_V4_V1,2)\
-PHASE( 9) V(V8_V5_V2,2)\
-PHASE(10) V(V9_V6_V3,2)\
-PHASE(11) V(V7_V4_V1,3)\
-PHASE(12) V(V8_V5_V2,3)\
-PHASE(13) V(V9_V6_V3,3)\
-PHASE(14) V(V7_V4_V1,4)\
-PHASE(15) V(V8_V5_V2,4)\
-PHASE(16) V(V9_V6_V3,4)\
-PHASE(17) V(V1,0) V(V7,5)V(V4,6)\
-PHASE(18) V(V8_V5_V2,5)\
-PHASE(19) V(V9_V6_V3,5)\
-PHASE(20) V(V1,1) V(V7,6)V(V4,7)\
-PHASE(21) V(V8,6)V(V5,7) V(V2,0) /* t_brr_next_addr order dependency */\
-PHASE(22) V(V3a,0) V(V9,6)V(V6,7) echo_22();\
-PHASE(23) V(V7,7) echo_23();\
-PHASE(24) V(V8,7) echo_24();\
-PHASE(25) V(V3b,0) V(V9,7) echo_25();\
-PHASE(26) echo_26();\
-PHASE(27) misc_27(); echo_27();\
-PHASE(28) misc_28(); echo_28();\
-PHASE(29) misc_29(); echo_29();\
-PHASE(30) misc_30();V(V3c,0) echo_30();\
-PHASE(31) V(V4,0) V(V1,2)\
-
-#if !SPC_DSP_CUSTOM_RUN
-
-void Spc_Dsp::run( int clocks_remain )
-{
-	require( clocks_remain > 0 );
-	
-	int const phase = m.phase;
-	m.phase = (phase + clocks_remain) & 31;
-	switch ( phase )
-	{
-	loop:
-	
-		#define PHASE( n ) if ( n && !--clocks_remain ) break; case n:
-		GEN_DSP_TIMING
-		#undef PHASE
-	
-		if ( --clocks_remain )
-			goto loop;
-	}
-}
-
-#endif
-
-
-//// Setup
-
-void Spc_Dsp::init( void* ram_64k )
-{
-	m.ram = (uint8_t*) ram_64k;
-	mute_voices( 0 );
-	disable_surround( false );
-	interpolation_level( 0 );
-	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
-	for ( int i = voice_count; --i >= 0; )
-	{
-		voice_t* v = &m.voices i;
-		v->brr_offset = 1;
-		v->vbit = 1 << i;
-		v->regs = &m.regs i * 0x10;
-	}
-	m.new_kon = REG(kon);
-	m.t_dir = REG(dir);
-	m.t_esa = REG(esa);
-	
-	soft_reset_common();
-}
-
-void Spc_Dsp::reset() { load( initial_regs ); }
-
-
-//// State save/load
-
-#if !SPC_NO_COPY_STATE_FUNCS
-
-void SPC_State_Copier::copy( void* state, size_t size )
-{
-	func( buf, state, size );
-}
-
-int SPC_State_Copier::copy_int( int state, int size )
-{
-	BOOST::uint8_t s 2;
-	SET_LE16( s, state );
-	func( buf, &s, size );
-	return GET_LE16( s );
-}
-
-void SPC_State_Copier::skip( int count )
-{
-	if ( count > 0 )
-	{
-		char temp 64;
-		memset( temp, 0, sizeof temp );
-		do
-		{
-			int n = sizeof temp;
-			if ( n > count )
-				n = count;
-			count -= n;
-			func( buf, temp, n );
-		}
-		while ( count );
-	}
-}
-
-void SPC_State_Copier::extra()
-{
-	int n = 0;
-	SPC_State_Copier& copier = *this;
-	SPC_COPY( uint8_t, n );
-	skip( n );
-}
-
-void Spc_Dsp::copy_state( unsigned char** io, copy_func_t copy )
-{
-	SPC_State_Copier copier( io, copy );
-	
-	// DSP registers
-	copier.copy( m.regs, register_count );
-	
-	// Internal state
-	
-	// Voices
-	int i;
-	for ( i = 0; i < voice_count; i++ )
-	{
-		voice_t* v = &m.voices i;
-		
-		// BRR buffer
-		int i;
-		for ( i = 0; i < brr_buf_size; i++ )
-		{
-			int s = v->buf i;
-			SPC_COPY( int16_t, s );
-			v->buf i = v->buf i + brr_buf_size = s;
-		}
-		
-		SPC_COPY( uint16_t, v->interp_pos );
-		SPC_COPY( uint16_t, v->brr_addr );
-		SPC_COPY( uint16_t, v->env );
-		SPC_COPY( int16_t, v->hidden_env );
-		SPC_COPY( uint8_t, v->buf_pos );
-		SPC_COPY( uint8_t, v->brr_offset );
-		SPC_COPY( uint8_t, v->kon_delay );
-		{
-			int m = v->env_mode;
-			SPC_COPY( uint8_t, m );
-			v->env_mode = (enum env_mode_t) m;
-		}
-		SPC_COPY( uint8_t, v->t_envx_out );
-		
-		copier.extra();
-	}
-	
-	// Echo history
-	for ( i = 0; i < echo_hist_size; i++ )
-	{
-		int j;
-		for ( j = 0; j < 2; j++ )
-		{
-			int s = m.echo_hist_pos i j;
-			SPC_COPY( int16_t, s );
-			m.echo_hist i j = s; // write back at offset 0
-		}
-	}
-	m.echo_hist_pos = m.echo_hist;
-	memcpy( &m.echo_hist echo_hist_size, m.echo_hist, echo_hist_size * sizeof m.echo_hist 0 );
-	
-	// Misc
-	SPC_COPY( uint8_t, m.every_other_sample );
-	SPC_COPY( uint8_t, m.kon );
-	
-	SPC_COPY( uint16_t, m.noise );
-	SPC_COPY( uint16_t, m.counter );
-	SPC_COPY( uint16_t, m.echo_offset );
-	SPC_COPY( uint16_t, m.echo_length );
-	SPC_COPY( uint8_t, m.phase );
-	
-	SPC_COPY( uint8_t, m.new_kon );
-	SPC_COPY( uint8_t, m.endx_buf );
-	SPC_COPY( uint8_t, m.envx_buf );
-	SPC_COPY( uint8_t, m.outx_buf );
-	
-	SPC_COPY( uint8_t, m.t_pmon );
-	SPC_COPY( uint8_t, m.t_non );
-	SPC_COPY( uint8_t, m.t_eon );
-	SPC_COPY( uint8_t, m.t_dir );
-	SPC_COPY( uint8_t, m.t_koff );
-	
-	SPC_COPY( uint16_t, m.t_brr_next_addr );
-	SPC_COPY( uint8_t, m.t_adsr0 );
-	SPC_COPY( uint8_t, m.t_brr_header );
-	SPC_COPY( uint8_t, m.t_brr_byte );
-	SPC_COPY( uint8_t, m.t_srcn );
-	SPC_COPY( uint8_t, m.t_esa );
-	SPC_COPY( uint8_t, m.t_echo_enabled );
-	
-	SPC_COPY( int16_t, m.t_main_out 0 );
-	SPC_COPY( int16_t, m.t_main_out 1 );
-	SPC_COPY( int16_t, m.t_echo_out 0 );
-	SPC_COPY( int16_t, m.t_echo_out 1 );
-	SPC_COPY( int16_t, m.t_echo_in 0 );
-	SPC_COPY( int16_t, m.t_echo_in 1 );
-	
-	SPC_COPY( uint16_t, m.t_dir_addr );
-	SPC_COPY( uint16_t, m.t_pitch );
-	SPC_COPY( int16_t, m.t_output );
-	SPC_COPY( uint16_t, m.t_echo_ptr );
-	SPC_COPY( uint8_t, m.t_looped );
-	
-	copier.extra();
-}
-#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Dsp.h Deleted

@@ -1,315 +0,0 @@
-// Highly accurate SNES SPC-700 DSP emulator
-
-// snes_spc 0.9.0
-#ifndef SPC_DSP_H
-#define SPC_DSP_H
-
-#include "blargg_common.h"
-
-extern "C" { typedef void (*dsp_copy_func_t)( unsigned char** io, void* state, size_t ); }
-
-class 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 run()
-	// 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 (issues repeated KOFF events).
-	// Reduces emulation accuracy.
-	enum { voice_count = 8 };
-	void mute_voices( int mask );
-
-// State
-	
-	// Resets DSP and uses supplied values to initialize registers
-	enum { register_count = 128 };
-	void load( uint8_t const regs register_count );
-
-	// Saves/loads exact emulator state
-	enum { state_size = 640 }; // maximum space needed when saving
-	typedef dsp_copy_func_t copy_func_t;
-	void copy_state( unsigned char** io, copy_func_t );
-
-	// Returns non-zero if new key-on events occurred since last call
-	bool check_kon();
-	
-// 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; }
-	void disable_surround( bool disable = true );
-	void interpolation_level( int level = 0 ) { m.interpolation_level = level; }
-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
-		uint8_t* regs; // pointer to voice's DSP registers
-		int vbit; // bitmask for voice: 0x01 for voice 0, 0x02 for voice 1, etc.
-		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
-		uint8_t t_envx_out;
-	};
-
-private:
-	enum { brr_block_size = 9 };
-	
-	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 counter;
-		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)
-		bool kon_check; // set when a new KON occurs
-		
-		// Hidden registers also written to when main register is written to
-		int new_kon;
-		uint8_t endx_buf;
-		uint8_t envx_buf;
-		uint8_t outx_buf;
-		
-		// Temporary state between clocks
-		
-		// read once per sample
-		int t_pmon;
-		int t_non;
-		int t_eon;
-		int t_dir;
-		int t_koff;
-		
-		// read a few clocks ahead then used
-		int t_brr_next_addr;
-		int t_adsr0;
-		int t_brr_header;
-		int t_brr_byte;
-		int t_srcn;
-		int t_esa;
-		int t_echo_enabled;
-		
-		// internal state that is recalculated every sample
-		int t_dir_addr;
-		int t_pitch;
-		int t_output;
-		int t_looped;
-		int t_echo_ptr;
-		
-		// left/right sums
-		int t_main_out 2;
-		int t_echo_out 2;
-		int t_echo_in 2;
-		
-		voice_t voices voice_count;
-		
-		// non-emulation state
-		uint8_t* ram; // 64K shared RAM between DSP and SMP
-		int mute_mask;
-		int surround_threshold;
-		int interpolation_level;
-		sample_t* out;
-		sample_t* out_end;
-		sample_t* out_begin;
-		sample_t extra extra_size;
-	};
-	state_t m;
-	
-	void init_counter();
-	void run_counters();
-	unsigned read_counter( int rate );
-	
-	int interpolate( voice_t const* v );
-	int interpolate_cubic( voice_t const* v );
-	int interpolate_sinc( voice_t const* v );
-	void run_envelope( voice_t* const v );
-	void decode_brr( voice_t* v );
-
-	void misc_27();
-	void misc_28();
-	void misc_29();
-	void misc_30();
-
-	void voice_output( voice_t const* v, int ch );
-	void voice_V1( voice_t* const );
-	void voice_V2( voice_t* const );
-	void voice_V3( voice_t* const );
-	void voice_V3a( voice_t* const );
-	void voice_V3b( voice_t* const );
-	void voice_V3c( voice_t* const );
-	void voice_V4( voice_t* const );
-	void voice_V5( voice_t* const );
-	void voice_V6( voice_t* const );
-	void voice_V7( voice_t* const );
-	void voice_V8( voice_t* const );
-	void voice_V9( voice_t* const );
-	void voice_V7_V4_V1( voice_t* const );
-	void voice_V8_V5_V2( voice_t* const );
-	void voice_V9_V6_V3( voice_t* const );
-
-	void echo_read( int ch );
-	int echo_output( int ch );
-	void echo_write( int ch );
-	void echo_22();
-	void echo_23();
-	void echo_24();
-	void echo_25();
-	void echo_26();
-	void echo_27();
-	void echo_28();
-	void echo_29();
-	void echo_30();
-	
-	void soft_reset_common();
-};
-
-#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::write( int addr, int data )
-{
-	assert( (unsigned) addr < register_count );
-	
-	m.regs addr = (uint8_t) data;
-	switch ( addr & 0x0F )
-	{
-	case v_envx:
-		m.envx_buf = (uint8_t) data;
-		break;
-		
-	case v_outx:
-		m.outx_buf = (uint8_t) data;
-		break;
-	
-	case 0x0C:
-		if ( addr == r_kon )
-			m.new_kon = (uint8_t) data;
-		
-		if ( addr == r_endx ) // always cleared, regardless of data written
-		{
-			m.endx_buf = 0;
-			m.regs r_endx = 0;
-		}
-		break;
-	}
-}
-
-inline void Spc_Dsp::mute_voices( int mask ) { m.mute_mask = mask; }
-
-inline void Spc_Dsp::disable_surround( bool disable )
-{
-	m.surround_threshold = disable ? 0 : -0x4000;
-}
-
-inline bool Spc_Dsp::check_kon()
-{
-	bool old = m.kon_check;
-	m.kon_check = 0;
-	return old;
-}
-
-#if !SPC_NO_COPY_STATE_FUNCS
-
-class SPC_State_Copier {
-	Spc_Dsp::copy_func_t func;
-	unsigned char** buf;
-public:
-	SPC_State_Copier( unsigned char** p, Spc_Dsp::copy_func_t f ) { func = f; buf = p; }
-	void copy( void* state, size_t size );
-	int copy_int( int state, int size );
-	void skip( int count );
-	void extra();
-};
-
-#define SPC_COPY( type, state )\
-{\
-	state = (BOOST::type) copier.copy_int( state, sizeof (BOOST::type) );\
-	assert( (BOOST::type) state == state );\
-}
-
-#endif
-
-#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/divfix.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/emu2413.cpp Deleted

@@ -1,742 +0,0 @@
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications. To alter this software and redistribute it freely,
-// if the origin of this software is not misrepresented.
-
-// written by Mitsutaka Okazaki 2001
-// Modified by xodnizel to remove code not needed for the VRC7, among other things.
-// Optimized performance and code size - Shay Green
-
-// References: 
-// fmopl.c -- 1999,2000 written by Tatsuyuki Satoh (MAME development).
-// fmopl.c(fixed) -- (C) 2002 Jarek Burczynski.
-// s_opl.c -- 2001 written by Mamiya (NEZplug development).
-// fmgen.cpp -- 1999,2000 written by cisc.
-// fmpac.ill -- 2000 created by NARUTO.
-// MSX-Datapack
-// YMU757 data sheet
-// YM2143 data sheet
-
-#include <assert.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include "emu2413.h"
-
-#undef PI
-#define PI 3.14159265358979323846
-
-static const unsigned char default_inst158 =
-{
-// VRC7 instruments, January 17, 2004 update -Xodnizel
- {0x03, 0x21, 0x04, 0x06, 0x8D, 0xF2, 0x42, 0x17}, 
- {0x13, 0x41, 0x05, 0x0E, 0x99, 0x96, 0x63, 0x12}, 
- {0x31, 0x11, 0x10, 0x0A, 0xF0, 0x9C, 0x32, 0x02}, 
- {0x21, 0x61, 0x1D, 0x07, 0x9F, 0x64, 0x20, 0x27}, 
- {0x22, 0x21, 0x1E, 0x06, 0xF0, 0x76, 0x08, 0x28}, 
- {0x02, 0x01, 0x06, 0x00, 0xF0, 0xF2, 0x03, 0x95}, 
- {0x21, 0x61, 0x1C, 0x07, 0x82, 0x81, 0x16, 0x07}, 
- {0x23, 0x21, 0x1A, 0x17, 0xEF, 0x82, 0x25, 0x15}, 
- {0x25, 0x11, 0x1F, 0x00, 0x86, 0x41, 0x20, 0x11}, 
- {0x85, 0x01, 0x1F, 0x0F, 0xE4, 0xA2, 0x11, 0x12}, 
- {0x07, 0xC1, 0x2B, 0x45, 0xB4, 0xF1, 0x24, 0xF4},
- {0x61, 0x23, 0x11, 0x06, 0x96, 0x96, 0x13, 0x16}, 
- {0x01, 0x02, 0xD3, 0x05, 0x82, 0xA2, 0x31, 0x51}, 
- {0x61, 0x22, 0x0D, 0x02, 0xC3, 0x7F, 0x24, 0x05},
- {0x21, 0x62, 0x0E, 0x00, 0xA1, 0xA0, 0x44, 0x17},
-
-};
-
-#define EG2DB(d) ((d)*(e_int32)(EG_STEP/DB_STEP))
-#define TL2EG(d) ((d)*(e_int32)(TL_STEP/EG_STEP))
-#define SL2EG(d) ((d)*(e_int32)(SL_STEP/EG_STEP))
-
-// Bits for liner value
-#define DB2LIN_AMP_BITS 11
-#define SLOT_AMP_BITS (DB2LIN_AMP_BITS)
-
-// Bits for envelope phase incremental counter
-#define EG_DP_BITS 22
-#define EG_DP_WIDTH (1<<EG_DP_BITS)
-
-// PM table is calcurated by PM_AMP * pow(2,PM_DEPTH*sin(x)/1200)
-#define PM_AMP_BITS 8
-#define PM_AMP (1<<PM_AMP_BITS)
-
-// PM speed(Hz) and depth(cent)
-#define PM_SPEED 6.4
-#define PM_DEPTH 13.75
-
-// AM speed(Hz) and depth(dB)
-#define AM_SPEED 3.7
-//#define AM_DEPTH 4.8
-#define AM_DEPTH 2.4
-
-// Cut the lower b bit(s) off.
-#define HIGHBITS(c,b) ((c)>>(b))
-
-// Expand x which is s bits to d bits.
-#define EXPAND_BITS(x,s,d) ((x)<<((d)-(s)))
-
-#define CAR_OFFSET 1
-#define MOD_CAR( o, x, sel ) (&((o)->slot + (sel)) (x) << 1)
-#define MOD(o,x) MOD_CAR( o, x, 0 )
-#define CAR(o,x) MOD_CAR( o, x, 1 )
-
-// Definition of envelope mode
-enum { SUSHOLD, SETTLE, ATTACK, DECAY, SUSTINE, RELEASE, FINISH };
-
-inline static void update_eg_dphase_inl ( OPLL* opll, OPLL_SLOT* slot, e_int32 slot_eg_mode )
-{
-	e_uint32 result = 0;
-	int index = slot->patch.RR;
-	switch ( slot_eg_mode )
-	{
-	case ATTACK:
-		result = opll->dphaseARTableslot->patch.ARslot->rks;
-		break;
-
-	case DECAY:
-		index = slot->patch.DR;
-		goto common;
-
-	case RELEASE:
-		if (slot->sustine)
-			index = 5;
-		else if (!slot->patch.EG)
-			index = 7;
-	case SUSTINE:
-	common:
-		result = opll->dphaseDRTable index slot->rks;
-	case SUSHOLD:
-	case FINISH:
-	default:
-		break;
-	}
-	
-	slot->eg_dphase = result;
-}
-
-// out = in, then verify that value wasn't truncated
-#define ASSIGN( out, in )\
-	((out = in), assert( out == in ))
-
-static void maketables ( OPLL* opll )
-{
-	e_int32 i;
-	
-	// Table for Pitch Modulator
-	for (i = 0; i < PM_PG_WIDTH; i++)
-		ASSIGN( opll->pmtablei,
-				(e_int32) ((double) PM_AMP * pow (2, (double) PM_DEPTH * sin (2.0 * PI * i / PM_PG_WIDTH) / 1200)) );
-	
-	// Table for Amp Modulator
-	for ( i = 0; i < AM_PG_WIDTH; i++)
-		ASSIGN( opll->amtablei,
-				(e_int32) ((double) AM_DEPTH / 2 / DB_STEP * (1.0 + sin (2.0 * PI * i / PM_PG_WIDTH))) );
-	
-	// Table for dB(0 -- (1<<DB_BITS)-1) to Liner(0 -- DB2LIN_AMP_WIDTH)
-	for (i = 0; i < DB_MUTE; i++)
-		ASSIGN( opll->DB2LIN_TABLEi,
-				(e_int16) ((double) ((1 << DB2LIN_AMP_BITS) - 1) * pow (10, -(double) i * DB_STEP / 20)) );
-	
-	// TODO: remove (calloc already ensures zero fill)
-	//for (i = DB_MUTE; i < 2 * DB_MUTE; i++)
-	//	opll->DB2LIN_TABLEi = 0;
-	
-	for (i = 0; i < 2 * DB_MUTE; i++)
-		ASSIGN( opll->DB2LIN_TABLEi + DB_MUTE + DB_MUTE,
-				(e_int16) (-opll->DB2LIN_TABLEi) );
-	
-	// Table for AR to LogCurve.
-	{
-		ASSIGN( opll->AR_ADJUST_TABLE0, (1 << EG_BITS) );
-		for (int i = 1; i < 128; i++)
-			ASSIGN( opll->AR_ADJUST_TABLEi,
-					(e_uint16) ((double) (1 << EG_BITS) - 1 - (1 << EG_BITS) * log ((double)i) / log (128.)) );
-	}
-	
-	{
-		#define dB2(x) ((x)*2)
-		static const double kltable16 = {
-			dB2 (0.000), dB2 (9.000), dB2 (12.000), dB2 (13.875), dB2 (15.000), dB2 (16.125), dB2 (16.875), dB2 (17.625),
-			dB2 (18.000), dB2 (18.750), dB2 (19.125), dB2 (19.500), dB2 (19.875), dB2 (20.250), dB2 (20.625), dB2 (21.000)
-		};
-
-		for (int fnum = 0; fnum < 16; fnum++)
-		{
-			for (int block = 0; block < 8; block++)
-			{
-				for (int TL = 0; TL < 64; TL++)
-				{
-					e_uint32 eg = TL2EG( TL );
-					ASSIGN( opll->tllTablefnumblockTL0, eg );
-					for (int KL = 1; KL < 4; KL++)
-					{
-						e_int32 tmp = (e_int32) (kltablefnum - dB2 (3.000) * (7 - block));
-						e_uint32 n = eg;
-						if ( tmp > 0 )
-							n += (e_uint32) ((tmp >> (3 - KL)) / EG_STEP);
-						ASSIGN( opll->tllTablefnumblockTLKL, n );
-					}
-				}
-			}
-		}
-	}
-
-	{
-		for (int fnum8 = 0; fnum8 < 2; fnum8++)
-		{
-			for (int block = 0; block < 8; block++)
-			{
-				ASSIGN( opll->rksTablefnum8block0, block >> 1 );
-				for (int KR = 1; KR < 2; KR++)
-					ASSIGN( opll->rksTablefnum8blockKR, (block << 1) + fnum8 );
-			}
-		}
-	}
-
-	// Sin Table
-	for (i = 0; i < PG_WIDTH / 4; i++)
-	{
-		double d = sin (2.0 * PI / PG_WIDTH * i);
-		
-		// Liner(+0.0 - +1.0) to dB((1<<DB_BITS) - 1 -- 0)
-		e_int32 x = DB_MUTE - 1;
-		if ( d )
-		{
-			e_int32 y = -(e_int32) (20.0 / DB_STEP * log10 (d));
-			if ( x > y )
-				x = y;
-		}
-
-		ASSIGN( opll->sintable 0 i, (e_uint32) x );
-	}
-
-	for (i = 0; i < PG_WIDTH / 4; i++)
-		ASSIGN( opll->sintable 0 PG_WIDTH / 2 - 1 - i, opll->sintable 0 i );
-
-	for (i = 0; i < PG_WIDTH / 2; i++)
-		ASSIGN( opll->sintable 0 PG_WIDTH / 2 + i, (e_uint32) (DB_MUTE + DB_MUTE + opll->sintable 0 i) );
-
-	for (i = 0; i < PG_WIDTH / 2; i++)
-		ASSIGN( opll->sintable 1 i, opll->sintable 0 i );
-	
-	for (i = PG_WIDTH / 2; i < PG_WIDTH; i++)
-		ASSIGN( opll->sintable 1 i, opll->sintable 0 0 );
-
-	//makeDefaultPatch ();
-	
-	// internal refresh
-	
-	// Phase increment counter table
-	{
-		static int const mltable16 = {
-			1, 1 * 2, 2 * 2, 3 * 2, 4 * 2, 5 * 2, 6 * 2, 7 * 2, 8 * 2,
-			9 * 2, 10 * 2, 10 * 2, 12 * 2, 12 * 2, 15 * 2, 15 * 2
-		};
-		for (int fnum = 0; fnum < 512; fnum++)
-			for (int block = 0; block < 8; block++)
-				for (int ML = 0; ML < 16; ML++)
-					ASSIGN( opll->dphaseTablefnumblockML,
-							(((fnum * mltableML) << block) >> (20 - DP_BITS)) );
-	}
-
-	// Rate Table for Attack
-	{
-		for (int Rks = 0; Rks < 16; Rks++)
-		{
-			// TODO: remove (calloc already ensures zero fill)
-			//opll->dphaseARTable 0Rks = 0;
-			//opll->dphaseARTable15Rks = 0;
-			int RL = (Rks & 3) * 3 + 12;
-			for (int AR = 1; AR < 15; AR++)
-			{
-				int RM = AR + (Rks >> 2);
-				if (RM > 15)
-					RM = 15;
-				ASSIGN( opll->dphaseARTableARRks, RL << (RM + 1) );
-			}
-		}
-	}
-
-	// Rate Table for Decay and Release
-	{
-		for (int Rks = 0; Rks < 16; Rks++)
-		{
-			// TODO: remove (calloc already ensures zero fill)
-			//opll->dphaseDRTable0Rks = 0;
-			int RL = (Rks & 3) + 4;
-			for (int DR = 1; DR < 16; DR++)
-			{
-				int RM = DR + (Rks >> 2);
-				if (RM > 15)
-					RM = 15;
-				ASSIGN( opll->dphaseDRTableDRRks, RL << (RM - 1) );
-			}
-		}
-	}
-}
-
-OPLL* VRC7_new( long clock_rate )
-{
-	OPLL* opll = (OPLL*) calloc( sizeof *opll, 1 );
-	if ( opll )
-	{
-		maketables( opll );
-		ASSIGN( opll->pm_dphase, (e_uint32) (PM_SPEED * PM_DP_WIDTH / (clock_rate / 72)) );
-		ASSIGN( opll->am_dphase, (e_uint32) (AM_SPEED * AM_DP_WIDTH / (clock_rate / 72)) );
-		
-		VRC7_reset (opll);
-	}
-	return opll;
-}
-
-void VRC7_delete( OPLL* opll )
-{
-	free (opll);
-}
-
-// Reset whole of OPLL except patch datas.
-void VRC7_reset( OPLL* opll )
-{
-	opll->pm_phase = opll->pm_dphase;
-	opll->am_phase = opll->am_dphase;
-	
-	int i;
-	for ( i = 0; i < 12; i++)
-	{
-		OPLL_SLOT* slot = &opll->sloti;
-		memset( slot, 0, offsetof (OPLL_SLOT,patch) );
-		slot->sintbl = opll->sintable 0;
-		slot->eg_mode = SETTLE;
-		slot->eg_phase = EG_DP_WIDTH;
-	}
-
-	for (i = 0; i < 0x40; i++)
-		VRC7_writeReg (opll, i, 0);
-}
-
-// Force Refresh (When external program changes some parameters).
-/*
-void VRC7_forceRefresh( OPLL* opll )
-{
-	for (e_int32 i = 0; i < 12; i++)
-		UPDATE_ALL( opll, &opll->sloti, i & 1 );
-}
-*/
-
-// Convert Amp(0 to EG_HEIGHT) to Phase(0 to 2PI).
-#if ( SLOT_AMP_BITS - PG_BITS ) > 0
-#define wave2_2pi(e) ( (e) >> ( SLOT_AMP_BITS - PG_BITS ))
-#else
-#define wave2_2pi(e) ( (e) << ( PG_BITS - SLOT_AMP_BITS ))
-#endif
-
-// Convert Amp(0 to EG_HEIGHT) to Phase(0 to 4PI).
-#if ( SLOT_AMP_BITS - PG_BITS - 1 ) == 0
-#define wave2_4pi(e) (e)
-#elif ( SLOT_AMP_BITS - PG_BITS - 1 ) > 0
-#define wave2_4pi(e) ( (e) >> ( SLOT_AMP_BITS - PG_BITS - 1 ))
-#else
-#define wave2_4pi(e) ( (e) << ( 1 + PG_BITS - SLOT_AMP_BITS ))
-#endif
-
-// Convert Amp(0 to EG_HEIGHT) to Phase(0 to 8PI).
-#if ( SLOT_AMP_BITS - PG_BITS - 2 ) == 0
-#define wave2_8pi(e) (e)
-#elif ( SLOT_AMP_BITS - PG_BITS - 2 ) > 0
-#define wave2_8pi(e) ( (e) >> ( SLOT_AMP_BITS - PG_BITS - 2 ))
-#else
-#define wave2_8pi(e) ( (e) << ( 2 + PG_BITS - SLOT_AMP_BITS ))
-#endif
-
-void VRC7_run( OPLL* opll )
-{
-	// PM
-	int const opll_lfo_pm = opll->pmtable HIGHBITS( opll->pm_phase, PM_DP_BITS - PM_PG_BITS );
-	opll->pm_phase = (opll->pm_phase + opll->pm_dphase) & (PM_DP_WIDTH - 1);
-	
-	{
-		int n = 12;
-		OPLL_SLOT* slot = opll->slot;
-		do
-		{
-			// phase
-			int step = slot->dphase;
-			if ( slot->patch.PM ) // 36%
-				step = (step * opll_lfo_pm) >> PM_AMP_BITS;
-			
-			e_uint32 slot_phase = (slot->phase + step) & (DP_WIDTH - 1);
-			slot->phase = slot_phase;
-			slot->pgout = HIGHBITS( slot_phase, DP_BASE_BITS );
-			
-			slot++;
-		}
-		while ( --n );
-	}
-	
-	// AM
-	int const opll_lfo_am = opll->amtable HIGHBITS( opll->am_phase, AM_DP_BITS - AM_PG_BITS );
-	opll->am_phase = (opll->am_phase + opll->am_dphase) & (AM_DP_WIDTH - 1);
-	
-	int n = 12;
-	OPLL_SLOT* slot = opll->slot;
-	do
-	{
-		// envelope
-		e_uint32 egout = HIGHBITS( slot->eg_phase, EG_DP_BITS - EG_BITS );
-		
-		switch ( slot->eg_mode )
-		{
-		case SUSHOLD: // 54%
-			if ( slot->patch.EG ) // 99%
-				break;
-			slot->eg_mode = SUSTINE;
-			update_eg_dphase_inl( opll, slot, SUSTINE );
-			break;
-
-		case DECAY:{// 23%
-			#define S2E(x) (SL2EG((e_int32)(x/SL_STEP))<<(EG_DP_BITS-EG_BITS))
-			static const e_uint32 SL16 = {
-				S2E (0.0), S2E (3.0), S2E (6.0), S2E (9.0), S2E (12.0), S2E (15.0), S2E (18.0), S2E (21.0),
-				S2E (24.0), S2E (27.0), S2E (30.0), S2E (33.0), S2E (36.0), S2E (39.0), S2E (42.0), S2E (48.0)
-			};
-			slot->eg_phase += slot->eg_dphase;
-			if ( slot->eg_phase >= SL slot->patch.SL )
-			{
-				slot->eg_phase = SL slot->patch.SL;
-				if ( slot->patch.EG )
-				{
-					slot->eg_mode = SUSHOLD;
-					update_eg_dphase_inl( opll, slot, SUSHOLD );
-				}
-				else
-				{
-					slot->eg_mode = SUSTINE;
-					update_eg_dphase_inl( opll, slot, SUSTINE );
-				}
-			}
-			break;
-		}
-
-		case ATTACK: // 3%
-			egout = opll->AR_ADJUST_TABLEegout;
-			slot->eg_phase += slot->eg_dphase;
-			if((EG_DP_WIDTH & slot->eg_phase)||(slot->patch.AR==15))
-			{
-				egout = 0;
-				slot->eg_phase = 0;
-				slot->eg_mode = DECAY;
-				update_eg_dphase_inl( opll, slot, DECAY );
-			}
-			break;
-
-		case SUSTINE:
-		case RELEASE: // 18%
-			slot->eg_phase += slot->eg_dphase;
-			if ( egout < (1 << EG_BITS) )
-				break;
-			slot->eg_mode = FINISH;
-		case FINISH: // 2%
-		default:
-			egout = (1 << EG_BITS) - 1;
-			break;
-		}
-		
-		egout = EG2DB( egout + slot->tll );
-		if ( slot->patch.AM )
-			egout += opll_lfo_am;
-
-		if ( egout > DB_MUTE - 1 )
-			egout = DB_MUTE;
-		
-		slot->egout = egout;
-		
-		slot++;
-	}
-	while ( --n );
-}
-
-e_uint32 VRC7_calcCh( OPLL* opll, e_uint32 ch )
-{
-	OPLL_SLOT* slot = MOD( opll, ch );
-	
-	// modulator
-	e_int32 feedback;
-	{
-		e_int32 fm = wave2_4pi( slot->feedback ) >> slot->patch.FB_shift;
-		int index = (slot->pgout + fm) & (PG_WIDTH - 1);
-		feedback = opll->DB2LIN_TABLE slot->sintbl index + slot->egout;
-		assert( slot->egout < DB_MUTE || feedback == 0 ); // was DB_MUTE - 1 in original
-		
-		e_int32 slot_output_1 = slot->output 0;
-		
-		if ( slot CAR_OFFSET.eg_mode == FINISH ) // 3%
-			return 0;
-		
-		slot->output 0 = feedback;
-		slot->output 1 = slot_output_1;
-		
-		feedback = (feedback + slot_output_1) >> 1;
-		slot->feedback = feedback;
-	}
-	slot += CAR_OFFSET;
-	
-	// carrier
-	e_int32 output = opll->DB2LIN_TABLE 
-			slot->sintbl (slot->pgout + wave2_8pi( feedback )) & (PG_WIDTH-1) + slot->egout;
-	assert( slot->egout < DB_MUTE || output == 0 ); // was DB_MUTE - 1 in original
-	
-	e_int32 slot_output_1 = slot->output 0;
-	slot->output 0 = output;
-	slot->output 1 = slot_output_1;
-	
-	return (output + slot_output_1) >> 1;
-}
-
-static void setInstrument( OPLL* opll, unsigned i, unsigned inst )
-{
-	opll->patch_numberi=inst;
-	
-	const e_uint8* src = opll->CustInst;
-	if(inst)
-		src=default_instinst-1;
-
-	OPLL_PATCH* modp=&MOD(opll,i)->patch;
-	OPLL_PATCH* carp=&CAR(opll,i)->patch;
-	
-	int src_0 = src 0;
-	modp->AM=(src_0>>7)&1;
-	modp->PM=(src_0>>6)&1;
-	modp->EG=(src_0>>5&1);
-	modp->KR=(src_0>>4)&1;
-	modp->ML=(src_0&0xF);
-
-	int src_1 = src 1;
-	carp->AM=(src_1>>7)&1;
-	carp->PM=(src_1>>6)&1;
-	carp->EG=(src_1>>5&1);
-	carp->KR=(src_1>>4)&1;
-	carp->ML=(src_1&0xF); 
-
-	int src_2 = src 2;
-	modp->KL=(src_2>>6)&3;
-	modp->TL=(src_2&0x3F);
-
-	int src_3 = src 3;
-	carp->KL = (src_3 >> 6) & 3; 
-	carp->WF = (src_3 >> 4) & 1;
-
-	modp->WF = (src_3 >> 3) & 1;
-	
-	int FB = (src_3) & 7;
-	modp->FB_shift = (FB ? 7 - FB : 31);
-	
-	int src_4 = src 4;
-	modp->AR = (src_4>>4)&0xF;
-	modp->DR = (src_4&0xF);
-
-	int src_5 = src 5;
-	carp->AR = (src_5>>4)&0xF;
-	carp->DR = (src_5&0xF);
-
-	int src_6 = src 6;
-	modp->SL = (src_6>>4)&0xF;
-	modp->RR = (src_6&0xF);
-
-	int src_7 = src 7;
-	carp->SL = (src_7>>4)&0xF;
-	carp->RR = (src_7&0xF);
-}
-
-static void update_eg_dphase( OPLL* opll, OPLL_SLOT* slot )
-{
-	update_eg_dphase_inl( opll, slot, slot->eg_mode );
-}
-
-#define UPDATE_PG(S) (S)->dphase = opll->dphaseTable(S)->fnum(S)->block(S)->patch.ML
-#define UPDATE_RKS(S) (S)->rks = opll->rksTable((S)->fnum)>>8(S)->block(S)->patch.KR
-#define UPDATE_WF(S) (S)->sintbl = opll->sintable (S)->patch.WF
-#define UPDATE_EG(S) update_eg_dphase( opll, S )
-
-inline static void UPDATE_TLL( OPLL* opll, OPLL_SLOT* S, int type )
-{
-	int index = (type ? (S)->volume : (S)->patch.TL);
-	(S)->tll = opll->tllTable (S)->fnum >> 5 (S)->block index (S)->patch.KL;
-}
-
-static void UPDATE_ALL( OPLL* opll, OPLL_SLOT* S, int type )
-{
-	UPDATE_PG(S);
-	UPDATE_TLL(opll, S, type);
-	UPDATE_RKS(S);
-	UPDATE_WF(S);
-	UPDATE_EG(S); // must be done last
-}
-
-static void UPDATE_ALL_BOTH( OPLL* opll, OPLL_SLOT* slot )
-{
-	UPDATE_ALL( opll, slot, 0 );
-	UPDATE_ALL( opll, slot + CAR_OFFSET, 1 );
-}
-
-inline static void slotOn( OPLL_SLOT* slot )
-{
-	slot->eg_mode = ATTACK;
-	slot->eg_phase = 0;
-	slot->phase = 0;
-}
-
-inline static void setFnumber( OPLL_SLOT* slot, e_int32 fnum )
-{
-	slot 0.fnum = fnum;
-	slot CAR_OFFSET.fnum = fnum;
-}
-
-inline static void setBlock( OPLL_SLOT* slot, e_int32 block )
-{
-	slot 0.block = block;
-	slot CAR_OFFSET.block = block;
-}
-
-void VRC7_writeReg( OPLL* opll, int addr, e_uint32 data )
-{
-	e_int32 i;
-	
-	data &= 0xFF;
-	addr &= 0x3F;
-
-	switch ( addr )
-	{
-	case 0x00:
-	case 0x01:
-		opll->CustInstaddr=data;
-		for (i = 0; i < 6; i++)
-		{
-			if (opll->patch_numberi == 0)
-			{
-				setInstrument(opll, i, 0);
-				OPLL_SLOT* slot = MOD_CAR( opll, i, addr & 1 );
-				UPDATE_PG ( slot );
-				UPDATE_RKS( slot );
-				UPDATE_EG ( slot );
-			}
-		}
-		break;
-
-	case 0x02:
-		opll->CustInst2=data;
-		for (i = 0; i < 6; i++)
-		{
-			if (opll->patch_numberi == 0)
-			{
-				setInstrument(opll, i, 0);
-				UPDATE_TLL(opll, MOD(opll,i), 0 );
-			}
-		}
-		break;
-
-	case 0x03:
-		opll->CustInst3=data;
-		for (i = 0; i < 6; i++)
-		{
-			if (opll->patch_numberi == 0)
-			{
-				setInstrument(opll, i, 0);
-				UPDATE_WF(MOD(opll,i));
-				UPDATE_WF(CAR(opll,i));
-			}
-		}
-		break;
-
-	case 0x04:
-	case 0x05:
-	case 0x06:
-	case 0x07:
-		opll->CustInstaddr=data;
-		for ( i = 0; i < 6; i++ )
-		{
-			if ( opll->patch_number i == 0 )
-			{
-				setInstrument( opll, i, 0 );
-				UPDATE_EG( MOD_CAR( opll, i, addr & 1 ) );
-			}
-		}
-		break;
-	
-	case 0x10:
-	case 0x11:
-	case 0x12:
-	case 0x13:
-	case 0x14:
-	case 0x15: {
-		int ch = addr - 0x10;
-		opll->LowFreq ch = data;
-		OPLL_SLOT* slot = MOD( opll, ch );
-		
-		setFnumber( slot, data + ((opll->HiFreqch & 1) << 8));
-		UPDATE_ALL_BOTH( opll, slot );
-		break;
-	}
-	
-	case 0x20:
-	case 0x21:
-	case 0x22:
-	case 0x23:
-	case 0x24:
-	case 0x25: {
-		int ch = addr - 0x20;
-		opll->HiFreq ch = data;
-		OPLL_SLOT* slot = MOD( opll, ch );
-		
-		setFnumber( slot, ((data & 1) << 8) + opll->LowFreqch);
-		setBlock( slot, (data >> 1) & 7);
-		slot CAR_OFFSET.sustine = (data >> 5) & 1;
-		if (data & 0x10)
-		{
-			if ( !slot->slot_on_flag )
-				slotOn( slot );
-			
-			if ( !slot CAR_OFFSET.slot_on_flag )
-				slotOn( slot + CAR_OFFSET );
-		}
-		else if ( slot CAR_OFFSET.slot_on_flag )
-		{
-			if (slot CAR_OFFSET.eg_mode == ATTACK)
-				slot CAR_OFFSET.eg_phase = EXPAND_BITS (opll->AR_ADJUST_TABLEHIGHBITS (slot CAR_OFFSET.eg_phase, EG_DP_BITS - EG_BITS), EG_BITS, EG_DP_BITS);
-			slot CAR_OFFSET.eg_mode = RELEASE;
-		}
-		UPDATE_ALL_BOTH( opll, slot );
-		
-		//inline static void update_key_status (OPLL * opll)
-		for (ch = 0; ch < 6; ch++)
-		{
-			int flag = (opll->HiFreq ch) & 0x10;
-			OPLL_SLOT* slot = MOD( opll, ch );
-			slot 0.slot_on_flag = flag;
-			slot CAR_OFFSET.slot_on_flag = flag;
-		}
-		break;
-	}
-
-	case 0x30:
-	case 0x31:
-	case 0x32:
-	case 0x33:
-	case 0x34:
-	case 0x35: {
-		int ch = addr - 0x30;
-		opll->InstVol ch = data;
-		
-		setInstrument( opll, ch, data >> 4 & 0x0F );
-		OPLL_SLOT* slot = MOD( opll, ch );
-		slot CAR_OFFSET.volume = (data & 0x0F) << 2;
-		UPDATE_ALL_BOTH( opll, slot );
-		break;
-	}
-	
-	default:
-		break;
-	}
-}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/emu2413.h Deleted

@@ -1,143 +0,0 @@
-#ifndef EMU2413_H
-#define EMU2413_H
-
-typedef unsigned char e_uint8;
-typedef signed short e_int16;
-typedef unsigned short e_uint16;
-typedef signed int e_int32;
-typedef unsigned int e_uint32;
-
-// Size of Sintable ( 8 -- 18 can be used. 9 recommended.)
-#define PG_BITS 9 
-#define PG_WIDTH (1<<PG_BITS)
-
-// Phase increment counter
-#define DP_BITS 18
-#define DP_WIDTH (1<<DP_BITS)
-#define DP_BASE_BITS (DP_BITS - PG_BITS)
-														
-// Dynamic range (Accuracy of sin table)
-#define DB_BITS 8
-#define DB_STEP (48.0/(1<<DB_BITS))
-#define DB_MUTE (1<<DB_BITS)
-
-// Dynamic range of envelope
-#define EG_STEP 0.375
-#define EG_BITS 7
-#define EG_MUTE (1<<EG_BITS)
-
-// Dynamic range of total level
-#define TL_STEP 0.75
-#define TL_BITS 6 
-#define TL_MUTE (1<<TL_BITS)
-
-// Dynamic range of sustine level
-#define SL_STEP 3.0
-#define SL_BITS 4 
-#define SL_MUTE (1<<SL_BITS)
-
-// Bits for Pitch and Amp modulator
-#define PM_PG_BITS 8
-#define PM_PG_WIDTH (1<<PM_PG_BITS)
-#define PM_DP_BITS 16
-#define PM_DP_WIDTH (1<<PM_DP_BITS)
-#define AM_PG_BITS 8
-#define AM_PG_WIDTH (1<<AM_PG_BITS)
-#define AM_DP_BITS 16
-#define AM_DP_WIDTH (1<<AM_DP_BITS)
-
-struct OPLL_PATCH
-{
-	e_uint32 TL,FB_shift,EG,ML,AR,DR,SL,RR,KR,KL,AM,PM,WF;
-};
-
-struct OPLL_SLOT
-{
-	// OUTPUT
-	e_int32 feedback;
-	e_int32 output2; // Output value of slot
-
-	// for Phase Generator (PG)
-	e_uint16 const* sintbl; // Wavetable
-	e_uint32 phase; // Phase
-	e_uint32 dphase; // Phase increment amount
-	e_uint32 pgout; // output
-
-	// for Envelope Generator (EG)
-	e_int32 fnum; // F-Number
-	e_int32 block; // Block
-	e_int32 volume; // Current volume
-	e_int32 sustine; // Sustine 1 = ON, 0 = OFF
-	e_uint32 tll;	 // Total Level + Key scale level
-	e_uint32 rks; // Key scale offset (Rks)
-	e_int32 eg_mode; // Current state
-	e_uint32 eg_phase; // Phase
-	e_uint32 eg_dphase; // Phase increment amount
-	e_uint32 egout; // output
-
-	OPLL_PATCH patch;
-	e_uint8 slot_on_flag;
-	e_uint8 filler 7;
-};
-
-#define OPLL_MASK_CH(x) (1<<(x))
-
-struct OPLL
-{
-	OPLL_SLOT slot 6 * 2;
-
-	// Register
-	e_uint8 LowFreq 6;
-	e_uint8 HiFreq 6;
-	e_uint8 InstVol 6;
-
-	// Channel Data
-	e_uint8 patch_number 6;
-	
-	e_uint8 CustInst 8;
-	
-	// LFO
-	e_uint32 pm_phase;
-	e_uint32 am_phase;
-	
-	e_uint32 pm_dphase;
-	e_uint32 am_dphase;
-	
-	e_int16 pmtable PM_PG_WIDTH;
-	e_uint8 amtable AM_PG_WIDTH;
-		
-	e_uint16 sintable 2 PG_WIDTH; // 0 = full, 1 = half
-
-	// dB to Liner table
-	e_int16 DB2LIN_TABLE 4 * DB_MUTE; 
-
-	// Liner to Log curve conversion table (for Attack rate).
-	e_uint8 AR_ADJUST_TABLE 1 << EG_BITS;
-
-	// Phase incr table for Attack
-	e_uint32 dphaseARTable 16 16;
-
-	// Phase incr table for Decay and Release
-	e_uint32 dphaseDRTable 16 16;
-
-	// KSL + TL Table
-	e_uint8 tllTable 16 8 1 << TL_BITS 4;
-	e_uint8 rksTable 2 8 2;
-
-	// Phase incr table for PG 
-	e_uint32 dphaseTable 512 8 16;
-};
-
-OPLL* VRC7_new( long clock_rate );
-void VRC7_delete( OPLL* );
-void VRC7_reset( OPLL* );
-
-void VRC7_writeReg( OPLL*, int addr, e_uint32 data );
-
-// Run for one clock
-void VRC7_run( OPLL* );
-
-// Generate sample for a channel
-e_uint32 VRC7_calcCh( OPLL*, e_uint32 channel );
-
-#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/fmopl.cpp Deleted

@@ -1,2617 +0,0 @@
-/*
-**
-** File: fmopl.c - software implementation of FM sound generator
-** types OPL and OPL2
-**
-** Copyright Jarek Burczynski (bujar at mame dot net)
-** Copyright Tatsuyuki Satoh , MultiArcadeMachineEmulator development
-**
-** Version 0.72
-**
-
-Revision History:
-
-04-08-2003 Jarek Burczynski:
- - removed BFRDY hack. BFRDY is busy flag, and it should be 0 only when the chip
- handles memory read/write or during the adpcm synthesis when the chip
- requests another byte of ADPCM data.
-
-24-07-2003 Jarek Burczynski:
- - added a small hack for Y8950 status BFRDY flag (bit 3 should be set after
- some (unknown) delay). Right now it's always set.
-
-14-06-2003 Jarek Burczynski:
- - implemented all of the status register flags in Y8950 emulation
- - renamed y8950_set_delta_t_memory() parameters from _rom_ to _mem_ since
- they can be either RAM or ROM
-
-08-10-2002 Jarek Burczynski (thanks to Dox for the YM3526 chip)
- - corrected ym3526_read() to always set bit 2 and bit 1
- to HIGH state - identical to ym3812_read (verified on real YM3526)
-
-04-28-2002 Jarek Burczynski:
- - binary exact Envelope Generator (verified on real YM3812);
- compared to YM2151: the EG clock is equal to internal_clock,
- rates are 2 times slower and volume resolution is one bit less
- - modified interface functions (they no longer return pointer -
- that's internal to the emulator now):
- - new wrapper functions for OPLCreate: ym3526_init(), ym3812_init() and y8950_init()
- - corrected 'off by one' error in feedback calculations (when feedback is off)
- - enabled waveform usage (credit goes to Vlad Romascanu and zazzal22)
- - speeded up noise generator calculations (Nicola Salmoria)
-
-03-24-2002 Jarek Burczynski (thanks to Dox for the YM3812 chip)
- Complete rewrite (all verified on real YM3812):
- - corrected sin_tab and tl_tab data
- - corrected operator output calculations
- - corrected waveform_select_enable register;
- simply: ignore all writes to waveform_select register when
- waveform_select_enable == 0 and do not change the waveform previously selected.
- - corrected KSR handling
- - corrected Envelope Generator: attack shape, Sustain mode and
- Percussive/Non-percussive modes handling
- - Envelope Generator rates are two times slower now
- - LFO amplitude (tremolo) and phase modulation (vibrato)
- - rhythm sounds phase generation
- - white noise generator (big thanks to Olivier Galibert for mentioning Berlekamp-Massey algorithm)
- - corrected key on/off handling (the 'key' signal is ORed from three sources: FM, rhythm and CSM)
- - funky details (like ignoring output of operator 1 in BD rhythm sound when connect == 1)
-
-12-28-2001 Acho A. Tang
- - reflected Delta-T EOS status on Y8950 status port.
- - fixed subscription range of attack/decay tables
-
-
- To do:
- add delay before key off in CSM mode (see CSMKeyControll)
- verify volume of the FM part on the Y8950
-*/
-
-#include <stdlib.h>
-#include <string.h>
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include "fmopl.h"
-#include "ymdeltat.h"
-
-#define INLINE __inline
-#ifndef NULL
-	#define NULL ((void *)0)
-#endif
-#define logerror (void)
-
-#ifndef M_PI
-	#define M_PI 3.14159265358979323846
-#endif
-
-/* output final shift */
-#if (OPL_SAMPLE_BITS==16)
-	#define FINAL_SH	(0)
-	#define MAXOUT		(+32767)
-	#define MINOUT		(-32768)
-#else
-	#define FINAL_SH	(8)
-	#define MAXOUT		(+127)
-	#define MINOUT		(-128)
-#endif
-
-
-#define FREQ_SH			16 /* 16.16 fixed point (frequency calculations) */
-#define EG_SH			16 /* 16.16 fixed point (EG timing) */
-#define LFO_SH			24 /* 8.24 fixed point (LFO calculations) */
-#define TIMER_SH		16 /* 16.16 fixed point (timers calculations) */
-
-#define FREQ_MASK		((1<<FREQ_SH)-1)
-
-/* envelope output entries */
-#define ENV_BITS		10
-#define ENV_LEN			(1<<ENV_BITS)
-#define ENV_STEP		(128.0/ENV_LEN)
-
-#define MAX_ATT_INDEX	((1<<(ENV_BITS-1))-1) /*511*/
-#define MIN_ATT_INDEX	(0)
-
-/* sinwave entries */
-#define SIN_BITS		10
-#define SIN_LEN			(1<<SIN_BITS)
-#define SIN_MASK		(SIN_LEN-1)
-
-#define TL_RES_LEN		(256)	/* 8 bits addressing (real chip) */
-
-
-
-/* register number to channel number , slot offset */
-#define SLOT1 0
-#define SLOT2 1
-
-/* Envelope Generator phases */
-
-#define EG_ATT			4
-#define EG_DEC			3
-#define EG_SUS			2
-#define EG_REL			1
-#define EG_OFF			0
-
-
-/* save output as raw 16-bit sample */
-
-/*#define SAVE_SAMPLE*/
-
-#ifdef SAVE_SAMPLE
-INLINE signed int acc_calc(signed int value)
-{
-	if (value>=0)
-	{
-		if (value < 0x0200)
-			return (value & ~0);
-		if (value < 0x0400)
-			return (value & ~1);
-		if (value < 0x0800)
-			return (value & ~3);
-		if (value < 0x1000)
-			return (value & ~7);
-		if (value < 0x2000)
-			return (value & ~15);
-		if (value < 0x4000)
-			return (value & ~31);
-		return (value & ~63);
-	}
-	/*else value < 0*/
-	if (value > -0x0200)
-		return (~abs(value) & ~0);
-	if (value > -0x0400)
-		return (~abs(value) & ~1);
-	if (value > -0x0800)
-		return (~abs(value) & ~3);
-	if (value > -0x1000)
-		return (~abs(value) & ~7);
-	if (value > -0x2000)
-		return (~abs(value) & ~15);
-	if (value > -0x4000)
-		return (~abs(value) & ~31);
-	return (~abs(value) & ~63);
-}
-
-
-static FILE *sample1;
-	#if 1	/*save to MONO file */
-		#define SAVE_ALL_CHANNELS \
-		{	signed int pom = acc_calc(lt); \
-			fputc((unsigned short)pom&0xff,sample0); \
-			fputc(((unsigned short)pom>>8)&0xff,sample0); \
-		}
-	#else	/*save to STEREO file */
-		#define SAVE_ALL_CHANNELS \
-		{	signed int pom = lt; \
-			fputc((unsigned short)pom&0xff,sample0); \
-			fputc(((unsigned short)pom>>8)&0xff,sample0); \
-			pom = rt; \
-			fputc((unsigned short)pom&0xff,sample0); \
-			fputc(((unsigned short)pom>>8)&0xff,sample0); \
-		}
-	#endif
-#endif
-
-#define LOG_CYM_FILE 0
-//static FILE * cymfile = NULL;
-
-
-
-#define OPL_TYPE_WAVESEL 0x01 /* waveform select */
-#define OPL_TYPE_ADPCM 0x02 /* DELTA-T ADPCM unit */
-#define OPL_TYPE_KEYBOARD 0x04 /* keyboard interface */
-#define OPL_TYPE_IO 0x08 /* I/O port */
-
-/* ---------- Generic interface section ---------- */
-#define OPL_TYPE_YM3526 (0)
-#define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL)
-#define OPL_TYPE_Y8950 (OPL_TYPE_ADPCM|OPL_TYPE_KEYBOARD|OPL_TYPE_IO)
-
-
-
-typedef struct{
-	UINT32	ar;			/* attack rate: AR<<2 */
-	UINT32	dr;			/* decay rate: DR<<2 */
-	UINT32	rr;			/* release rate:RR<<2 */
-	UINT8	KSR;		/* key scale rate */
-	UINT8	ksl;		/* keyscale level */
-	UINT8	ksr;		/* key scale rate: kcode>>KSR */
-	UINT8	mul;		/* multiple: mul_tabML */
-
-	/* Phase Generator */
-	UINT32	Cnt;		/* frequency counter */
-	UINT32	Incr;		/* frequency counter step */
-	UINT8 FB;			/* feedback shift value */
-	INT32 *connect1;	/* slot1 output pointer */
-	INT32 op1_out2;	/* slot1 output for feedback */
-	UINT8 CON;		/* connection (algorithm) type */
-
-	/* Envelope Generator */
-	UINT8	eg_type;	/* percussive/non-percussive mode */
-	UINT8	state;		/* phase type */
-	UINT32	TL;			/* total level: TL << 2 */
-	INT32	TLL;		/* adjusted now TL */
-	INT32	volume;		/* envelope counter */
-	UINT32	sl;			/* sustain level: sl_tabSL */
-	UINT8	eg_sh_ar;	/* (attack state) */
-	UINT8	eg_sel_ar;	/* (attack state) */
-	UINT8	eg_sh_dr;	/* (decay state) */
-	UINT8	eg_sel_dr;	/* (decay state) */
-	UINT8	eg_sh_rr;	/* (release state) */
-	UINT8	eg_sel_rr;	/* (release state) */
-	UINT32	key;		/* 0 = KEY OFF, >0 = KEY ON */
-
-	/* LFO */
-	UINT32	AMmask;		/* LFO Amplitude Modulation enable mask */
-	UINT8	vib;		/* LFO Phase Modulation enable flag (active high)*/
-
-	/* waveform select */
-	UINT16	wavetable;
-} OPL_SLOT;
-
-typedef struct{
-	OPL_SLOT SLOT2;
-	/* phase generator state */
-	UINT32 block_fnum;	/* block+fnum */
-	UINT32 fc;			/* Freq. Increment base */
-	UINT32 ksl_base;	/* KeyScaleLevel Base step */
-	UINT8 kcode;		/* key code (for key scaling) */
-} OPL_CH;
-
-/* OPL state */
-typedef struct fm_opl_f {
-	/* FM channel slots */
-	OPL_CH	P_CH9;				/* OPL/OPL2 chips have 9 channels*/
-
-	UINT32	eg_cnt;					/* global envelope generator counter */
-	UINT32	eg_timer;				/* global envelope generator counter works at frequency = chipclock/72 */
-	UINT32	eg_timer_add;			/* step of eg_timer */
-	UINT32	eg_timer_overflow;		/* envelope generator timer overlfows every 1 sample (on real chip) */
-
-	UINT8	rhythm;					/* Rhythm mode */
-
-	UINT32	fn_tab1024;			/* fnumber->increment counter */
-
-	/* LFO */
-	UINT8	lfo_am_depth;
-	UINT8	lfo_pm_depth_range;
-	UINT32	lfo_am_cnt;
-	UINT32	lfo_am_inc;
-	UINT32	lfo_pm_cnt;
-	UINT32	lfo_pm_inc;
-
-	UINT32	noise_rng;				/* 23 bit noise shift register */
-	UINT32	noise_p;				/* current noise 'phase' */
-	UINT32	noise_f;				/* current noise period */
-
-	UINT8	wavesel;				/* waveform select enable flag */
-
-	UINT32	T2;					/* timer counters */
-	UINT8	st2;					/* timer enable */
-
-#if BUILD_Y8950
-	/* Delta-T ADPCM unit (Y8950) */
-
-	YM_DELTAT *deltat;
-
-	/* Keyboard and I/O ports interface */
-	UINT8	portDirection;
-	UINT8	portLatch;
-	OPL_PORTHANDLER_R porthandler_r;
-	OPL_PORTHANDLER_W porthandler_w;
-	void *	port_param;
-	OPL_PORTHANDLER_R keyboardhandler_r;
-	OPL_PORTHANDLER_W keyboardhandler_w;
-	void *	keyboard_param;
-#endif
-
-	/* external event callback handlers */
-	//OPL_TIMERHANDLER timer_handler;	/* TIMER handler */
-	void *TimerParam;					/* TIMER parameter */
-	OPL_IRQHANDLER IRQHandler;	/* IRQ handler */
-	void *IRQParam;					/* IRQ parameter */
-	OPL_UPDATEHANDLER UpdateHandler;/* stream update handler */
-	void *UpdateParam;				/* stream update parameter */
-
-	UINT8 type;						/* chip type */
-	UINT8 address;					/* address register */
-	UINT8 status;					/* status flag */
-	UINT8 statusmask;				/* status mask */
-	UINT8 mode;						/* Reg.08 : CSM,notesel,etc. */
-
-	UINT32 clock;					/* master clock (Hz) */
-	UINT32 rate;					/* sampling rate (Hz) */
-	double freqbase;				/* frequency base */
-	//attotime TimerBase;			/* Timer base time (==sampling time)*/
-
-	OPL_SLOT *SLOT7_1, *SLOT7_2, *SLOT8_1, *SLOT8_2;
-
-	signed int phase_modulation;	/* phase modulation input (SLOT 2) */
-	signed int output1;
-
-#if BUILD_Y8950
-	INT32 output_deltat4;		/* for Y8950 DELTA-T, chip is mono, that 4 here is just for safety */
-#endif
-
-	UINT32	LFO_AM;
-	INT32	LFO_PM;
-} FM_OPL;
-
-
-
-/* mapping of register number (offset) to slot number used by the emulator */
-static const int slot_array32=
-{
-	 0, 2, 4, 1, 3, 5,-1,-1,
-	 6, 8,10, 7, 9,11,-1,-1,
-	12,14,16,13,15,17,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1
-};
-
-/* key scale level */
-/* table is 3dB/octave , DV converts this into 6dB/octave */
-/* 0.1875 is bit 0 weight of the envelope counter (volume) expressed in the 'decibel' scale */
-#define DV (0.1875/2.0)
-static const UINT32 ksl_tab8*16=
-{
-	/* OCT 0 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	/* OCT 1 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV,
-	 1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV,
-	/* OCT 2 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV,
-	 3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV,
-	 4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV,
-	/* OCT 3 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV,
-	 3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV,
-	 6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV,
-	 7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV,
-	/* OCT 4 */
-	 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
-	 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
-	 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
-	10.875/DV,11.250/DV,11.625/DV,12.000/DV,
-	/* OCT 5 */
-	 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
-	 9.000/DV,10.125/DV,10.875/DV,11.625/DV,
-	12.000/DV,12.750/DV,13.125/DV,13.500/DV,
-	13.875/DV,14.250/DV,14.625/DV,15.000/DV,
-	/* OCT 6 */
-	 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
-	12.000/DV,13.125/DV,13.875/DV,14.625/DV,
-	15.000/DV,15.750/DV,16.125/DV,16.500/DV,
-	16.875/DV,17.250/DV,17.625/DV,18.000/DV,
-	/* OCT 7 */
-	 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
-	15.000/DV,16.125/DV,16.875/DV,17.625/DV,
-	18.000/DV,18.750/DV,19.125/DV,19.500/DV,
-	19.875/DV,20.250/DV,20.625/DV,21.000/DV
-};
-#undef DV
-
-/* sustain level table (3dB per step) */
-/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
-#define SC(db) (UINT32) ( db * (2.0/ENV_STEP) )
-static const UINT32 sl_tab16={
- SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
- SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)
-};
-#undef SC
-
-
-#define RATE_STEPS (8)
-static const unsigned char eg_inc15*RATE_STEPS={
-
-/*cycle:0 1 2 3 4 5 6 7*/
-
-/* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..12 0 (increment by 0 or 1) */
-/* 1 */ 0,1, 0,1, 1,1, 0,1, /* rates 00..12 1 */
-/* 2 */ 0,1, 1,1, 0,1, 1,1, /* rates 00..12 2 */
-/* 3 */ 0,1, 1,1, 1,1, 1,1, /* rates 00..12 3 */
-
-/* 4 */ 1,1, 1,1, 1,1, 1,1, /* rate 13 0 (increment by 1) */
-/* 5 */ 1,1, 1,2, 1,1, 1,2, /* rate 13 1 */
-/* 6 */ 1,2, 1,2, 1,2, 1,2, /* rate 13 2 */
-/* 7 */ 1,2, 2,2, 1,2, 2,2, /* rate 13 3 */
-
-/* 8 */ 2,2, 2,2, 2,2, 2,2, /* rate 14 0 (increment by 2) */
-/* 9 */ 2,2, 2,4, 2,2, 2,4, /* rate 14 1 */
-/*10 */ 2,4, 2,4, 2,4, 2,4, /* rate 14 2 */
-/*11 */ 2,4, 4,4, 2,4, 4,4, /* rate 14 3 */
-
-/*12 */ 4,4, 4,4, 4,4, 4,4, /* rates 15 0, 15 1, 15 2, 15 3 (increment by 4) */
-/*13 */ 8,8, 8,8, 8,8, 8,8, /* rates 15 2, 15 3 for attack */
-/*14 */ 0,0, 0,0, 0,0, 0,0, /* infinity rates for attack and decay(s) */
-};
-
-
-#define O(a) (a*RATE_STEPS)
-
-/*note that there is no O(13) in this table - it's directly in the code */
-static const unsigned char eg_rate_select16+64+16={	/* Envelope Generator rates (16 + 64 rates + 16 RKS) */
-/* 16 infinite time rates */
-O(14),O(14),O(14),O(14),O(14),O(14),O(14),O(14),
-O(14),O(14),O(14),O(14),O(14),O(14),O(14),O(14),
-
-/* rates 00-12 */
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-
-/* rate 13 */
-O( 4),O( 5),O( 6),O( 7),
-
-/* rate 14 */
-O( 8),O( 9),O(10),O(11),
-
-/* rate 15 */
-O(12),O(12),O(12),O(12),
-
-/* 16 dummy rates (same as 15 3) */
-O(12),O(12),O(12),O(12),O(12),O(12),O(12),O(12),
-O(12),O(12),O(12),O(12),O(12),O(12),O(12),O(12),
-
-};
-#undef O
-
-/*rate 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 */
-/*shift 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0 */
-/*mask 4095, 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1, 0, 0, 0, 0 */
-
-#define O(a) (a*1)
-static const unsigned char eg_rate_shift16+64+16={	/* Envelope Generator counter shifts (16 + 64 rates + 16 RKS) */
-/* 16 infinite time rates */
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
-
-/* rates 00-12 */
-O(12),O(12),O(12),O(12),
-O(11),O(11),O(11),O(11),
-O(10),O(10),O(10),O(10),
-O( 9),O( 9),O( 9),O( 9),
-O( 8),O( 8),O( 8),O( 8),
-O( 7),O( 7),O( 7),O( 7),
-O( 6),O( 6),O( 6),O( 6),
-O( 5),O( 5),O( 5),O( 5),
-O( 4),O( 4),O( 4),O( 4),
-O( 3),O( 3),O( 3),O( 3),
-O( 2),O( 2),O( 2),O( 2),
-O( 1),O( 1),O( 1),O( 1),
-O( 0),O( 0),O( 0),O( 0),
-
-/* rate 13 */
-O( 0),O( 0),O( 0),O( 0),
-
-/* rate 14 */
-O( 0),O( 0),O( 0),O( 0),
-
-/* rate 15 */
-O( 0),O( 0),O( 0),O( 0),
-
-/* 16 dummy rates (same as 15 3) */
-O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
-O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
-
-};
-#undef O
-
-
-/* multiple table */
-#define ML 2
-static const UINT8 mul_tab16= {
-/* 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,12,12,15,15 */
- 0.50*ML, 1.00*ML, 2.00*ML, 3.00*ML, 4.00*ML, 5.00*ML, 6.00*ML, 7.00*ML,
- 8.00*ML, 9.00*ML,10.00*ML,10.00*ML,12.00*ML,12.00*ML,15.00*ML,15.00*ML
-};
-#undef ML
-
-/* TL_TAB_LEN is calculated as:
-* 12 - sinus amplitude bits (Y axis)
-* 2 - sinus sign bit (Y axis)
-* TL_RES_LEN - sinus resolution (X axis)
-*/
-#define TL_TAB_LEN (12*2*TL_RES_LEN)
-static signed int tl_tabTL_TAB_LEN;
-
-#define ENV_QUIET		(TL_TAB_LEN>>4)
-
-/* sin waveform table in 'decibel' scale */
-/* four waveforms on OPL2 type chips */
-static unsigned int sin_tabSIN_LEN * 4;
-
-
-/* LFO Amplitude Modulation table (verified on real YM3812)
- 27 output levels (triangle waveform); 1 level takes one of: 192, 256 or 448 samples
-
- Length: 210 elements.
-
- Each of the elements has to be repeated
- exactly 64 times (on 64 consecutive samples).
- The whole table takes: 64 * 210 = 13440 samples.
-
- When AM = 1 data is used directly
- When AM = 0 data is divided by 4 before being used (loosing precision is important)
-*/
-
-#define LFO_AM_TAB_ELEMENTS 210
-
-static const UINT8 lfo_am_tableLFO_AM_TAB_ELEMENTS = {
-0,0,0,0,0,0,0,
-1,1,1,1,
-2,2,2,2,
-3,3,3,3,
-4,4,4,4,
-5,5,5,5,
-6,6,6,6,
-7,7,7,7,
-8,8,8,8,
-9,9,9,9,
-10,10,10,10,
-11,11,11,11,
-12,12,12,12,
-13,13,13,13,
-14,14,14,14,
-15,15,15,15,
-16,16,16,16,
-17,17,17,17,
-18,18,18,18,
-19,19,19,19,
-20,20,20,20,
-21,21,21,21,
-22,22,22,22,
-23,23,23,23,
-24,24,24,24,
-25,25,25,25,
-26,26,26,
-25,25,25,25,
-24,24,24,24,
-23,23,23,23,
-22,22,22,22,
-21,21,21,21,
-20,20,20,20,
-19,19,19,19,
-18,18,18,18,
-17,17,17,17,
-16,16,16,16,
-15,15,15,15,
-14,14,14,14,
-13,13,13,13,
-12,12,12,12,
-11,11,11,11,
-10,10,10,10,
-9,9,9,9,
-8,8,8,8,
-7,7,7,7,
-6,6,6,6,
-5,5,5,5,
-4,4,4,4,
-3,3,3,3,
-2,2,2,2,
-1,1,1,1
-};
-
-/* LFO Phase Modulation table (verified on real YM3812) */
-static const INT8 lfo_pm_table8*8*2 = {
-
-/* FNUM2/FNUM = 00 0xxxxxxx (0x0000) */
-0, 0, 0, 0, 0, 0, 0, 0,	/*LFO PM depth = 0*/
-0, 0, 0, 0, 0, 0, 0, 0,	/*LFO PM depth = 1*/
-
-/* FNUM2/FNUM = 00 1xxxxxxx (0x0080) */
-0, 0, 0, 0, 0, 0, 0, 0,	/*LFO PM depth = 0*/
-1, 0, 0, 0,-1, 0, 0, 0,	/*LFO PM depth = 1*/
-
-/* FNUM2/FNUM = 01 0xxxxxxx (0x0100) */
-1, 0, 0, 0,-1, 0, 0, 0,	/*LFO PM depth = 0*/
-2, 1, 0,-1,-2,-1, 0, 1,	/*LFO PM depth = 1*/
-
-/* FNUM2/FNUM = 01 1xxxxxxx (0x0180) */
-1, 0, 0, 0,-1, 0, 0, 0,	/*LFO PM depth = 0*/
-3, 1, 0,-1,-3,-1, 0, 1,	/*LFO PM depth = 1*/
-
-/* FNUM2/FNUM = 10 0xxxxxxx (0x0200) */
-2, 1, 0,-1,-2,-1, 0, 1,	/*LFO PM depth = 0*/
-4, 2, 0,-2,-4,-2, 0, 2,	/*LFO PM depth = 1*/
-
-/* FNUM2/FNUM = 10 1xxxxxxx (0x0280) */
-2, 1, 0,-1,-2,-1, 0, 1,	/*LFO PM depth = 0*/
-5, 2, 0,-2,-5,-2, 0, 2,	/*LFO PM depth = 1*/
-
-/* FNUM2/FNUM = 11 0xxxxxxx (0x0300) */
-3, 1, 0,-1,-3,-1, 0, 1,	/*LFO PM depth = 0*/
-6, 3, 0,-3,-6,-3, 0, 3,	/*LFO PM depth = 1*/
-
-/* FNUM2/FNUM = 11 1xxxxxxx (0x0380) */
-3, 1, 0,-1,-3,-1, 0, 1,	/*LFO PM depth = 0*/
-7, 3, 0,-3,-7,-3, 0, 3	/*LFO PM depth = 1*/
-};
-
-
-/* lock level of common table */
-//static int num_lock = 0;
-
-
-//static void *cur_chip = NULL;	/* current chip pointer */
-
-INLINE int limit( int val, int max, int min ) {
-	if ( val > max )
-		val = max;
-	else if ( val < min )
-		val = min;
-
-	return val;
-}
-
-
-/* status set and IRQ handling */
-INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag)
-{
-	/* set status flag */
-	OPL->status |= flag;
-	if(!(OPL->status & 0x80))
-	{
-		if(OPL->status & OPL->statusmask)
-		{	/* IRQ on */
-			OPL->status |= 0x80;
-			/* callback user interrupt handler (IRQ is OFF to ON) */
-			if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,1);
-		}
-	}
-}
-
-/* status reset and IRQ handling */
-INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
-{
-	/* reset status flag */
-	OPL->status &=~flag;
-	if((OPL->status & 0x80))
-	{
-		if (!(OPL->status & OPL->statusmask) )
-		{
-			OPL->status &= 0x7f;
-			/* callback user interrupt handler (IRQ is ON to OFF) */
-			if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,0);
-		}
-	}
-}
-
-/* IRQ mask set */
-INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
-{
-	OPL->statusmask = flag;
-	/* IRQ handling check */
-	OPL_STATUS_SET(OPL,0);
-	OPL_STATUS_RESET(OPL,0);
-}
-
-
-/* advance LFO to next sample */
-INLINE void advance_lfo(FM_OPL *OPL)
-{
-	UINT8 tmp;
-
-	/* LFO */
-	OPL->lfo_am_cnt += OPL->lfo_am_inc;
-	if (OPL->lfo_am_cnt >= ((UINT32)LFO_AM_TAB_ELEMENTS<<LFO_SH) )	/* lfo_am_table is 210 elements long */
-		OPL->lfo_am_cnt -= ((UINT32)LFO_AM_TAB_ELEMENTS<<LFO_SH);
-
-	tmp = lfo_am_table OPL->lfo_am_cnt >> LFO_SH ;
-
-	if (OPL->lfo_am_depth)
-		OPL->LFO_AM = tmp;
-	else
-		OPL->LFO_AM = tmp>>2;
-
-	OPL->lfo_pm_cnt += OPL->lfo_pm_inc;
-	OPL->LFO_PM = ((OPL->lfo_pm_cnt>>LFO_SH) & 7) | OPL->lfo_pm_depth_range;
-}
-
-/* advance to next sample */
-INLINE void advance(FM_OPL *OPL)
-{
-	OPL_CH *CH;
-	OPL_SLOT *op;
-	int i;
-
-	OPL->eg_timer += OPL->eg_timer_add;
-
-	while (OPL->eg_timer >= OPL->eg_timer_overflow)
-	{
-		OPL->eg_timer -= OPL->eg_timer_overflow;
-
-		OPL->eg_cnt++;
-
-		for (i=0; i<9*2; i++)
-		{
-			CH = &OPL->P_CHi/2;
-			op = &CH->SLOTi&1;
-
-			/* Envelope Generator */
-			switch(op->state)
-			{
-			case EG_ATT:		/* attack phase */
-				if ( !(OPL->eg_cnt & ((1<<op->eg_sh_ar)-1) ) )
-				{
-					op->volume += (~op->volume *
-	 		 (eg_incop->eg_sel_ar + ((OPL->eg_cnt>>op->eg_sh_ar)&7))
- 			 ) >>3;
-
-					if (op->volume <= MIN_ATT_INDEX)
-					{
-						op->volume = MIN_ATT_INDEX;
-						op->state = EG_DEC;
-					}
-
-				}
-			break;
-
-			case EG_DEC:	/* decay phase */
-				if ( !(OPL->eg_cnt & ((1<<op->eg_sh_dr)-1) ) )
-				{
-					op->volume += eg_incop->eg_sel_dr + ((OPL->eg_cnt>>op->eg_sh_dr)&7);
-
-					if ( op->volume >= op->sl )
-						op->state = EG_SUS;
-
-				}
-			break;
-
-			case EG_SUS:	/* sustain phase */
-
-				/* this is important behaviour:
- one can change percusive/non-percussive modes on the fly and
- the chip will remain in sustain phase - verified on real YM3812 */
-
-				if(op->eg_type)		/* non-percussive mode */
-				{
-									/* do nothing */
-				}
-				else				/* percussive mode */
-				{
-					/* during sustain phase chip adds Release Rate (in percussive mode) */
-					if ( !(OPL->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
-					{
-						op->volume += eg_incop->eg_sel_rr + ((OPL->eg_cnt>>op->eg_sh_rr)&7);
-
-						if ( op->volume >= MAX_ATT_INDEX )
-							op->volume = MAX_ATT_INDEX;
-					}
-					/* else do nothing in sustain phase */
-				}
-			break;
-
-			case EG_REL:	/* release phase */
-				if ( !(OPL->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
-				{
-					op->volume += eg_incop->eg_sel_rr + ((OPL->eg_cnt>>op->eg_sh_rr)&7);
-
-					if ( op->volume >= MAX_ATT_INDEX )
-					{
-						op->volume = MAX_ATT_INDEX;
-						op->state = EG_OFF;
-					}
-
-				}
-			break;
-
-			default:
-			break;
-			}
-		}
-	}
-
-	for (i=0; i<9*2; i++)
-	{
-		CH = &OPL->P_CHi/2;
-		op = &CH->SLOTi&1;
-
-		/* Phase Generator */
-		if(op->vib)
-		{
-			UINT8 block;
-			unsigned int block_fnum = CH->block_fnum;
-
-			unsigned int fnum_lfo = (block_fnum&0x0380) >> 7;
-
-			signed int lfo_fn_table_index_offset = lfo_pm_tableOPL->LFO_PM + 16*fnum_lfo ;
-
-			if (lfo_fn_table_index_offset)	/* LFO phase modulation active */
-			{
-				block_fnum += lfo_fn_table_index_offset;
-				block = (block_fnum&0x1c00) >> 10;
-				op->Cnt += (OPL->fn_tabblock_fnum&0x03ff >> (7-block)) * op->mul;
-			}
-			else	/* LFO phase modulation = zero */
-			{
-				op->Cnt += op->Incr;
-			}
-		}
-		else	/* LFO phase modulation disabled for this operator */
-		{
-			op->Cnt += op->Incr;
-		}
-	}
-
-	/* The Noise Generator of the YM3812 is 23-bit shift register.
- * Period is equal to 2^23-2 samples.
- * Register works at sampling frequency of the chip, so output
- * can change on every sample.
- *
- * Output of the register and input to the bit 22 is:
- * bit0 XOR bit14 XOR bit15 XOR bit22
- *
- * Simply use bit 22 as the noise output.
- */
-
-	OPL->noise_p += OPL->noise_f;
-	i = OPL->noise_p >> FREQ_SH;		/* number of events (shifts of the shift register) */
-	OPL->noise_p &= FREQ_MASK;
-	while (i)
-	{
-		/*
- UINT32 j;
- j = ( (OPL->noise_rng) ^ (OPL->noise_rng>>14) ^ (OPL->noise_rng>>15) ^ (OPL->noise_rng>>22) ) & 1;
- OPL->noise_rng = (j<<22) | (OPL->noise_rng>>1);
- */
-
-		/*
- Instead of doing all the logic operations above, we
- use a trick here (and use bit 0 as the noise output).
- The difference is only that the noise bit changes one
- step ahead. This doesn't matter since we don't know
- what is real state of the noise_rng after the reset.
- */
-
-		if (OPL->noise_rng & 1) OPL->noise_rng ^= 0x800302;
-		OPL->noise_rng >>= 1;
-
-		i--;
-	}
-}
-
-
-INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
-{
-	UINT32 p;
-
-	p = (env<<4) + sin_tabwave_tab + ((((signed int)((phase & ~FREQ_MASK) + (pm<<16))) >> FREQ_SH ) & SIN_MASK) ;
-
-	if (p >= TL_TAB_LEN)
-		return 0;
-	return tl_tabp;
-}
-
-INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
-{
-	UINT32 p;
-
-	p = (env<<4) + sin_tabwave_tab + ((((signed int)((phase & ~FREQ_MASK) + pm )) >> FREQ_SH ) & SIN_MASK) ;
-
-	if (p >= TL_TAB_LEN)
-		return 0;
-	return tl_tabp;
-}
-
-
-#define volume_calc(OP) ((OP)->TLL + ((UINT32)(OP)->volume) + (OPL->LFO_AM & (OP)->AMmask))
-
-/* calculate output */
-INLINE void OPL_CALC_CH( FM_OPL *OPL, OPL_CH *CH )
-{
-	OPL_SLOT *SLOT;
-	unsigned int env;
-	signed int out;
-
-	OPL->phase_modulation = 0;
-
-	/* SLOT 1 */
-	SLOT = &CH->SLOTSLOT1;
-	env = volume_calc(SLOT);
-	out = SLOT->op1_out0 + SLOT->op1_out1;
-	SLOT->op1_out0 = SLOT->op1_out1;
-	*SLOT->connect1 += SLOT->op1_out0;
-	SLOT->op1_out1 = 0;
-	if( env < ENV_QUIET )
-	{
-		if (!SLOT->FB)
-			out = 0;
-		SLOT->op1_out1 = op_calc1(SLOT->Cnt, env, (out<<SLOT->FB), SLOT->wavetable );
-	}
-
-	/* SLOT 2 */
-	SLOT++;
-	env = volume_calc(SLOT);
-	if( env < ENV_QUIET )
-		OPL->output0 += op_calc(SLOT->Cnt, env, OPL->phase_modulation, SLOT->wavetable);
-}
-
-/*
- operators used in the rhythm sounds generation process:
-
- Envelope Generator:
-
-channel operator register number Bass High Snare Tom Top
-/ slot number TL ARDR SLRR Wave Drum Hat Drum Tom Cymbal
- 6 / 0 12 50 70 90 f0 +
- 6 / 1 15 53 73 93 f3 +
- 7 / 0 13 51 71 91 f1 +
- 7 / 1 16 54 74 94 f4 +
- 8 / 0 14 52 72 92 f2 +
- 8 / 1 17 55 75 95 f5 +
-
- Phase Generator:
-
-channel operator register number Bass High Snare Tom Top
-/ slot number MULTIPLE Drum Hat Drum Tom Cymbal
- 6 / 0 12 30 +
- 6 / 1 15 33 +
- 7 / 0 13 31 + + +
- 7 / 1 16 34 ----- n o t u s e d -----
- 8 / 0 14 32 +
- 8 / 1 17 35 + +
-
-channel operator register number Bass High Snare Tom Top
-number number BLK/FNUM2 FNUM Drum Hat Drum Tom Cymbal
- 6 12,15 B6 A6 +
-
- 7 13,16 B7 A7 + + +
-
- 8 14,17 B8 A8 + + +
-
-*/
-
-/* calculate rhythm */
-
-INLINE void OPL_CALC_RH( FM_OPL *OPL, OPL_CH *CH, unsigned int noise )
-{
-	OPL_SLOT *SLOT;
-	signed int out;
-	unsigned int env;
-
-
-	/* Bass Drum (verified on real YM3812):
- - depends on the channel 6 'connect' register:
- when connect = 0 it works the same as in normal (non-rhythm) mode (op1->op2->out)
- when connect = 1 _only_ operator 2 is present on output (op2->out), operator 1 is ignored
- - output sample always is multiplied by 2
- */
-
-	OPL->phase_modulation = 0;
-	/* SLOT 1 */
-	SLOT = &CH6.SLOTSLOT1;
-	env = volume_calc(SLOT);
-
-	out = SLOT->op1_out0 + SLOT->op1_out1;
-	SLOT->op1_out0 = SLOT->op1_out1;
-
-	if (!SLOT->CON)
-		OPL->phase_modulation = SLOT->op1_out0;
-	/* else ignore output of operator 1 */
-
-	SLOT->op1_out1 = 0;
-	if( env < ENV_QUIET )
-	{
-		if (!SLOT->FB)
-			out = 0;
-		SLOT->op1_out1 = op_calc1(SLOT->Cnt, env, (out<<SLOT->FB), SLOT->wavetable );
-	}
-
-	/* SLOT 2 */
-	SLOT++;
-	env = volume_calc(SLOT);
-	if( env < ENV_QUIET )
-		OPL->output0 += op_calc(SLOT->Cnt, env, OPL->phase_modulation, SLOT->wavetable) * 2;
-
-
-	/* Phase generation is based on: */
-	/* HH (13) channel 7->slot 1 combined with channel 8->slot 2 (same combination as TOP CYMBAL but different output phases) */
-	/* SD (16) channel 7->slot 1 */
-	/* TOM (14) channel 8->slot 1 */
-	/* TOP (17) channel 7->slot 1 combined with channel 8->slot 2 (same combination as HIGH HAT but different output phases) */
-
-	/* Envelope generation based on: */
-	/* HH channel 7->slot1 */
-	/* SD channel 7->slot2 */
-	/* TOM channel 8->slot1 */
-	/* TOP channel 8->slot2 */
-
-
-	/* The following formulas can be well optimized.
- I leave them in direct form for now (in case I've missed something).
- */
-
-	/* High Hat (verified on real YM3812) */
-	env = volume_calc(OPL->SLOT7_1);
-	if( env < ENV_QUIET )
-	{
-
-		/* high hat phase generation:
- phase = d0 or 234 (based on frequency only)
- phase = 34 or 2d0 (based on noise)
- */
-
-		/* base frequency derived from operator 1 in channel 7 */
-		unsigned char bit7 = ((OPL->SLOT7_1->Cnt>>FREQ_SH)>>7)&1;
-		unsigned char bit3 = ((OPL->SLOT7_1->Cnt>>FREQ_SH)>>3)&1;
-		unsigned char bit2 = ((OPL->SLOT7_1->Cnt>>FREQ_SH)>>2)&1;
-
-		unsigned char res1 = (bit2 ^ bit7) | bit3;
-
-		/* when res1 = 0 phase = 0x000 | 0xd0; */
-		/* when res1 = 1 phase = 0x200 | (0xd0>>2); */
-		UINT32 phase = res1 ? (0x200|(0xd0>>2)) : 0xd0;
-
-		/* enable gate based on frequency of operator 2 in channel 8 */
-		unsigned char bit5e= ((OPL->SLOT8_2->Cnt>>FREQ_SH)>>5)&1;
-		unsigned char bit3e= ((OPL->SLOT8_2->Cnt>>FREQ_SH)>>3)&1;
-
-		unsigned char res2 = (bit3e ^ bit5e);
-
-		/* when res2 = 0 pass the phase from calculation above (res1); */
-		/* when res2 = 1 phase = 0x200 | (0xd0>>2); */
-		if (res2)
-			phase = (0x200|(0xd0>>2));
-
-
-		/* when phase & 0x200 is set and noise=1 then phase = 0x200|0xd0 */
-		/* when phase & 0x200 is set and noise=0 then phase = 0x200|(0xd0>>2), ie no change */
-		if (phase&0x200)
-		{
-			if (noise)
-				phase = 0x200|0xd0;
-		}
-		else
-		/* when phase & 0x200 is clear and noise=1 then phase = 0xd0>>2 */
-		/* when phase & 0x200 is clear and noise=0 then phase = 0xd0, ie no change */
-		{
-			if (noise)
-				phase = 0xd0>>2;
-		}
-
-		OPL->output0 += op_calc(phase<<FREQ_SH, env, 0, OPL->SLOT7_1->wavetable) * 2;
-	}
-
-	/* Snare Drum (verified on real YM3812) */
-	env = volume_calc(OPL->SLOT7_2);
-	if( env < ENV_QUIET )
-	{
-		/* base frequency derived from operator 1 in channel 7 */
-		unsigned char bit8 = ((OPL->SLOT7_1->Cnt>>FREQ_SH)>>8)&1;
-
-		/* when bit8 = 0 phase = 0x100; */
-		/* when bit8 = 1 phase = 0x200; */
-		UINT32 phase = bit8 ? 0x200 : 0x100;
-
-		/* Noise bit XOR'es phase by 0x100 */
-		/* when noisebit = 0 pass the phase from calculation above */
-		/* when noisebit = 1 phase ^= 0x100; */
-		/* in other words: phase ^= (noisebit<<8); */
-		if (noise)
-			phase ^= 0x100;
-
-		OPL->output0 += op_calc(phase<<FREQ_SH, env, 0, OPL->SLOT7_2->wavetable) * 2;
-	}
-
-	/* Tom Tom (verified on real YM3812) */
-	env = volume_calc(OPL->SLOT8_1);
-	if( env < ENV_QUIET )
-		OPL->output0 += op_calc(OPL->SLOT8_1->Cnt, env, 0, OPL->SLOT8_1->wavetable) * 2;
-
-	/* Top Cymbal (verified on real YM3812) */
-	env = volume_calc(OPL->SLOT8_2);
-	if( env < ENV_QUIET )
-	{
-		/* base frequency derived from operator 1 in channel 7 */
-		unsigned char bit7 = ((OPL->SLOT7_1->Cnt>>FREQ_SH)>>7)&1;
-		unsigned char bit3 = ((OPL->SLOT7_1->Cnt>>FREQ_SH)>>3)&1;
-		unsigned char bit2 = ((OPL->SLOT7_1->Cnt>>FREQ_SH)>>2)&1;
-
-		unsigned char res1 = (bit2 ^ bit7) | bit3;
-
-		/* when res1 = 0 phase = 0x000 | 0x100; */
-		/* when res1 = 1 phase = 0x200 | 0x100; */
-		UINT32 phase = res1 ? 0x300 : 0x100;
-
-		/* enable gate based on frequency of operator 2 in channel 8 */
-		unsigned char bit5e= ((OPL->SLOT8_2->Cnt>>FREQ_SH)>>5)&1;
-		unsigned char bit3e= ((OPL->SLOT8_2->Cnt>>FREQ_SH)>>3)&1;
-
-		unsigned char res2 = (bit3e ^ bit5e);
-		/* when res2 = 0 pass the phase from calculation above (res1); */
-		/* when res2 = 1 phase = 0x200 | 0x100; */
-		if (res2)
-			phase = 0x300;
-
-		OPL->output0 += op_calc(phase<<FREQ_SH, env, 0, OPL->SLOT8_2->wavetable) * 2;
-	}
-
-}
-
-
-/* generic table initialize */
-static int init_tables(void)
-{
-	signed int i,x;
-	signed int n;
-	double o,m;
-
-
-	for (x=0; x<TL_RES_LEN; x++)
-	{
-		m = (1<<16) / pow(2, (x+1) * (ENV_STEP/4.0) / 8.0);
-		m = floor(m);
-
-		/* we never reach (1<<16) here due to the (x+1) */
-		/* result fits within 16 bits at maximum */
-
-		n = (int)m;		/* 16 bits here */
-		n >>= 4;		/* 12 bits here */
-		if (n&1)		/* round to nearest */
-			n = (n>>1)+1;
-		else
-			n = n>>1;
-						/* 11 bits here (rounded) */
-		n <<= 1;		/* 12 bits here (as in real chip) */
-		tl_tab x*2 + 0 = n;
-		tl_tab x*2 + 1 = -tl_tab x*2 + 0 ;
-
-		for (i=1; i<12; i++)
-		{
-			tl_tab x*2+0 + i*2*TL_RES_LEN = tl_tab x*2+0 >>i;
-			tl_tab x*2+1 + i*2*TL_RES_LEN = -tl_tab x*2+0 + i*2*TL_RES_LEN ;
-		}
-	#if 0
-			logerror("tl %04i", x*2);
-			for (i=0; i<12; i++)
-				logerror(", %02i %5i", i*2, tl_tab x*2 /*+1*/ + i*2*TL_RES_LEN );
-			logerror("\n");
-	#endif
-	}
-	/*logerror("FMOPL.C: TL_TAB_LEN = %i elements (%i bytes)\n",TL_TAB_LEN, (int)sizeof(tl_tab));*/
-
-
-	for (i=0; i<SIN_LEN; i++)
-	{
-		/* non-standard sinus */
-		m = sin( ((i*2)+1) * M_PI / SIN_LEN ); /* checked against the real chip */
-
-		/* we never reach zero here due to ((i*2)+1) */
-
-		if (m>0.0)
-			o = 8*log(1.0/m)/log(2.0);	/* convert to 'decibels' */
-		else
-			o = 8*log(-1.0/m)/log(2.0);	/* convert to 'decibels' */
-
-		o = o / (ENV_STEP/4);
-
-		n = (int)(2.0*o);
-		if (n&1)						/* round to nearest */
-			n = (n>>1)+1;
-		else
-			n = n>>1;
-
-		sin_tab i = n*2 + (m>=0.0? 0: 1 );
-
-		/*logerror("FMOPL.C: sin %4i (hex=%03x)= %4i (tl_tab value=%5i)\n", i, i, sin_tabi, tl_tabsin_tabi );*/
-	}
-
-	for (i=0; i<SIN_LEN; i++)
-	{
-		/* waveform 1: __ __ */
-		/* / \____/ \____*/
-		/* output only first half of the sinus waveform (positive one) */
-
-		if (i & (1<<(SIN_BITS-1)) )
-			sin_tab1*SIN_LEN+i = TL_TAB_LEN;
-		else
-			sin_tab1*SIN_LEN+i = sin_tabi;
-
-		/* waveform 2: __ __ __ __ */
-		/* / \/ \/ \/ \*/
-		/* abs(sin) */
-
-		sin_tab2*SIN_LEN+i = sin_tabi & (SIN_MASK>>1) ;
-
-		/* waveform 3: _ _ _ _ */
-		/* / |_/ |_/ |_/ |_*/
-		/* abs(output only first quarter of the sinus waveform) */
-
-		if (i & (1<<(SIN_BITS-2)) )
-			sin_tab3*SIN_LEN+i = TL_TAB_LEN;
-		else
-			sin_tab3*SIN_LEN+i = sin_tabi & (SIN_MASK>>2);
-
-		/*logerror("FMOPL.C: sin1%4i= %4i (tl_tab value=%5i)\n", i, sin_tab1*SIN_LEN+i, tl_tabsin_tab1*SIN_LEN+i );
- logerror("FMOPL.C: sin2%4i= %4i (tl_tab value=%5i)\n", i, sin_tab2*SIN_LEN+i, tl_tabsin_tab2*SIN_LEN+i );
- logerror("FMOPL.C: sin3%4i= %4i (tl_tab value=%5i)\n", i, sin_tab3*SIN_LEN+i, tl_tabsin_tab3*SIN_LEN+i );*/
-	}
-	/*logerror("FMOPL.C: ENV_QUIET= %08x (dec*8=%i)\n", ENV_QUIET, ENV_QUIET*8 );*/
-
-
-#ifdef SAVE_SAMPLE
-	sample0=fopen("sampsum.pcm","wb");
-#endif
-
-	return 1;
-}
-
-static void OPLCloseTable( void )
-{
-#ifdef SAVE_SAMPLE
-	fclose(sample0);
-#endif
-}
-
-
-
-static void OPL_initalize(FM_OPL *OPL)
-{
-	int i;
-
-	/* frequency base */
-	OPL->freqbase = (OPL->rate) ? ((double)OPL->clock / 72.0) / OPL->rate : 0;
-#if 0
-	OPL->rate = (double)OPL->clock / 72.0;
-	OPL->freqbase = 1.0;
-#endif
-
-	/*logerror("freqbase=%f\n", OPL->freqbase);*/
-
-	/* Timer base time */
-	//OPL->TimerBase = attotime_mul(ATTOTIME_IN_HZ(OPL->clock), 72);
-
-	/* make fnumber -> increment counter table */
-	for( i=0 ; i < 1024 ; i++ )
-	{
-		/* opn phase increment counter = 20bit */
-		OPL->fn_tabi = (UINT32)( (double)i * 64 * OPL->freqbase * (1<<(FREQ_SH-10)) ); /* -10 because chip works with 10.10 fixed point, while we use 16.16 */
-#if 0
-		logerror("FMOPL.C: fn_tab%4i = %08x (dec=%8i)\n",
-				 i, OPL->fn_tabi>>6, OPL->fn_tabi>>6 );
-#endif
-	}
-
-#if 0
-	for( i=0 ; i < 16 ; i++ )
-	{
-		logerror("FMOPL.C: sl_tab%i = %08x\n",
-			i, sl_tabi );
-	}
-	for( i=0 ; i < 8 ; i++ )
-	{
-		int j;
-		logerror("FMOPL.C: ksl_taboct=%2i =",i);
-		for (j=0; j<16; j++)
-		{
-			logerror("%08x ", ksl_tabi*16+j );
-		}
-		logerror("\n");
-	}
-#endif
-
-
-	/* Amplitude modulation: 27 output levels (triangle waveform); 1 level takes one of: 192, 256 or 448 samples */
-	/* One entry from LFO_AM_TABLE lasts for 64 samples */
-	OPL->lfo_am_inc = (1.0 / 64.0 ) * (1<<LFO_SH) * OPL->freqbase;
-
-	/* Vibrato: 8 output levels (triangle waveform); 1 level takes 1024 samples */
-	OPL->lfo_pm_inc = (1.0 / 1024.0) * (1<<LFO_SH) * OPL->freqbase;
-
-	/*logerror ("OPL->lfo_am_inc = %8x ; OPL->lfo_pm_inc = %8x\n", OPL->lfo_am_inc, OPL->lfo_pm_inc);*/
-
-	/* Noise generator: a step takes 1 sample */
-	OPL->noise_f = (1.0 / 1.0) * (1<<FREQ_SH) * OPL->freqbase;
-
-	OPL->eg_timer_add = (1<<EG_SH) * OPL->freqbase;
-	OPL->eg_timer_overflow = ( 1 ) * (1<<EG_SH);
-	/*logerror("OPLinit eg_timer_add=%8x eg_timer_overflow=%8x\n", OPL->eg_timer_add, OPL->eg_timer_overflow);*/
-
-}
-
-INLINE void FM_KEYON(OPL_SLOT *SLOT, UINT32 key_set)
-{
-	if( !SLOT->key )
-	{
-		/* restart Phase Generator */
-		SLOT->Cnt = 0;
-		/* phase -> Attack */
-		SLOT->state = EG_ATT;
-	}
-	SLOT->key |= key_set;
-}
-
-INLINE void FM_KEYOFF(OPL_SLOT *SLOT, UINT32 key_clr)
-{
-	if( SLOT->key )
-	{
-		SLOT->key &= key_clr;
-
-		if( !SLOT->key )
-		{
-			/* phase -> Release */
-			if (SLOT->state>EG_REL)
-				SLOT->state = EG_REL;
-		}
-	}
-}
-
-/* update phase increment counter of operator (also update the EG rates if necessary) */
-static INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
-{
-	int ksr;
-
-	/* (frequency) phase increment counter */
-	SLOT->Incr = CH->fc * SLOT->mul;
-	ksr = CH->kcode >> SLOT->KSR;
-
-	if( SLOT->ksr != ksr )
-	{
-		SLOT->ksr = ksr;
-
-		/* calculate envelope generator rates */
-		if ((SLOT->ar + SLOT->ksr) < 16+62)
-		{
-			SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
-			SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
-		}
-		else
-		{
-			SLOT->eg_sh_ar = 0;
-			SLOT->eg_sel_ar = 13*RATE_STEPS;
-		}
-		SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
-		SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
-		SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
-		SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
-	}
-}
-
-/* set multi,am,vib,EG-TYP,KSR,mul */
-INLINE void set_mul(FM_OPL *OPL,int slot,int v)
-{
-	OPL_CH *CH = &OPL->P_CHslot/2;
-	OPL_SLOT *SLOT = &CH->SLOTslot&1;
-
-	SLOT->mul = mul_tabv&0x0f;
-	SLOT->KSR = (v&0x10) ? 0 : 2;
-	SLOT->eg_type = (v&0x20);
-	SLOT->vib = (v&0x40);
-	SLOT->AMmask = (v&0x80) ? ~0 : 0;
-	CALC_FCSLOT(CH,SLOT);
-}
-
-/* set ksl & tl */
-INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v)
-{
-	OPL_CH *CH = &OPL->P_CHslot/2;
-	OPL_SLOT *SLOT = &CH->SLOTslot&1;
-	int ksl = v>>6; /* 0 / 1.5 / 3.0 / 6.0 dB/OCT */
-
-	SLOT->ksl = ksl ? 3-ksl : 31;
-	SLOT->TL = (v&0x3f)<<(ENV_BITS-1-7); /* 7 bits TL (bit 6 = always 0) */
-
-	SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
-}
-
-/* set attack rate & decay rate */
-INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v)
-{
-	OPL_CH *CH = &OPL->P_CHslot/2;
-	OPL_SLOT *SLOT = &CH->SLOTslot&1;
-
-	SLOT->ar = (v>>4) ? 16 + ((v>>4) <<2) : 0;
-
-	if ((SLOT->ar + SLOT->ksr) < 16+62)
-	{
-		SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
-		SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
-	}
-	else
-	{
-		SLOT->eg_sh_ar = 0;
-		SLOT->eg_sel_ar = 13*RATE_STEPS;
-	}
-
-	SLOT->dr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
-	SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
-	SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
-}
-
-/* set sustain level & release rate */
-INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v)
-{
-	OPL_CH *CH = &OPL->P_CHslot/2;
-	OPL_SLOT *SLOT = &CH->SLOTslot&1;
-
-	SLOT->sl = sl_tab v>>4 ;
-
-	SLOT->rr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
-	SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
-	SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
-}
-
-
-/* write a value v to register r on OPL chip */
-static void OPLWriteReg(FM_OPL *OPL, int r, int v)
-{
-	OPL_CH *CH;
-	int slot;
-	int block_fnum;
-
-
-	/* adjust bus to 8 bits */
-	r &= 0xff;
-	v &= 0xff;
-
-	/*if (LOG_CYM_FILE && (cymfile) && (r!=0) )
-	{
-		fputc( (unsigned char)r, cymfile );
-		fputc( (unsigned char)v, cymfile );
-	}*/
-
-
-	switch(r&0xe0)
-	{
-	case 0x00:	/* 00-1f:control */
-		switch(r&0x1f)
-		{
-		case 0x01:	/* waveform select enable */
-			if(OPL->type&OPL_TYPE_WAVESEL)
-			{
-				OPL->wavesel = v&0x20;
-				/* do not change the waveform previously selected */
-			}
-			break;
-		case 0x02:	/* Timer 1 */
-			OPL->T0 = (256-v)*4;
-			break;
-		case 0x03:	/* Timer 2 */
-			OPL->T1 = (256-v)*16;
-			break;
-		case 0x04:	/* IRQ clear / mask and Timer enable */
-			if(v&0x80)
-			{	/* IRQ flag clear */
-				OPL_STATUS_RESET(OPL,0x7f-0x08); /* don't reset BFRDY flag or we will have to call deltat module to set the flag */
-			}
-			else
-			{	/* set IRQ mask ,timer enable*/
-				UINT8 st1 = v&1;
-				UINT8 st2 = (v>>1)&1;
-
-				/* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */
-				OPL_STATUS_RESET(OPL, v & (0x78-0x08) );
-				OPL_STATUSMASK_SET(OPL, (~v) & 0x78 );
-
-				/* timer 2 */
-				/*if(OPL->st1 != st2)
-				{
-					attotime period = st2 ? attotime_mul(OPL->TimerBase, OPL->T1) : attotime_zero;
-					OPL->st1 = st2;
-					if (OPL->timer_handler) (OPL->timer_handler)(OPL->TimerParam,1,period);
-				}*/
-				/* timer 1 */
-				/*if(OPL->st0 != st1)
-				{
-					attotime period = st1 ? attotime_mul(OPL->TimerBase, OPL->T0) : attotime_zero;
-					OPL->st0 = st1;
-					if (OPL->timer_handler) (OPL->timer_handler)(OPL->TimerParam,0,period);
-				}*/
-			}
-			break;
-#if BUILD_Y8950
-		case 0x06:		/* Key Board OUT */
-			if(OPL->type&OPL_TYPE_KEYBOARD)
-			{
-				if(OPL->keyboardhandler_w)
-					OPL->keyboardhandler_w(OPL->keyboard_param,v);
-				else
-					logerror("Y8950: write unmapped KEYBOARD port\n");
-			}
-			break;
-		case 0x07:	/* DELTA-T control 1 : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
-			if(OPL->type&OPL_TYPE_ADPCM)
-				YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
-			break;
-#endif
-		case 0x08:	/* MODE,DELTA-T control 2 : CSM,NOTESEL,x,x,smpl,da/ad,64k,rom */
-			OPL->mode = v;
-#if BUILD_Y8950
-			if(OPL->type&OPL_TYPE_ADPCM)
-				YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v&0x0f); /* mask 4 LSBs in register 08 for DELTA-T unit */
-#endif
-			break;
-
-#if BUILD_Y8950
-		case 0x09:		/* START ADD */
-		case 0x0a:
-		case 0x0b:		/* STOP ADD */
-		case 0x0c:
-		case 0x0d:		/* PRESCALE */
-		case 0x0e:
-		case 0x0f:		/* ADPCM data write */
-		case 0x10: 		/* DELTA-N */
-		case 0x11: 		/* DELTA-N */
-		case 0x12: 		/* ADPCM volume */
-			if(OPL->type&OPL_TYPE_ADPCM)
-				YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
-			break;
-
-		case 0x15:		/* DAC data high 8 bits (F7,F6...F2) */
-		case 0x16:		/* DAC data low 2 bits (F1, F0 in bits 7,6) */
-		case 0x17:		/* DAC data shift (S2,S1,S0 in bits 2,1,0) */
-			logerror("FMOPL.C: DAC data register written, but not implemented reg=%02x val=%02x\n",r,v);
-			break;
-
-		case 0x18:		/* I/O CTRL (Direction) */
-			if(OPL->type&OPL_TYPE_IO)
-				OPL->portDirection = v&0x0f;
-			break;
-		case 0x19:		/* I/O DATA */
-			if(OPL->type&OPL_TYPE_IO)
-			{
-				OPL->portLatch = v;
-				if(OPL->porthandler_w)
-					OPL->porthandler_w(OPL->port_param,v&OPL->portDirection);
-			}
-			break;
-#endif
-		default:
-			logerror("FMOPL.C: write to unknown register: %02x\n",r);
-			break;
-		}
-		break;
-	case 0x20:	/* am ON, vib ON, ksr, eg_type, mul */
-		slot = slot_arrayr&0x1f;
-		if(slot < 0) return;
-		set_mul(OPL,slot,v);
-		break;
-	case 0x40:
-		slot = slot_arrayr&0x1f;
-		if(slot < 0) return;
-		set_ksl_tl(OPL,slot,v);
-		break;
-	case 0x60:
-		slot = slot_arrayr&0x1f;
-		if(slot < 0) return;
-		set_ar_dr(OPL,slot,v);
-		break;
-	case 0x80:
-		slot = slot_arrayr&0x1f;
-		if(slot < 0) return;
-		set_sl_rr(OPL,slot,v);
-		break;
-	case 0xa0:
-		if (r == 0xbd)			/* am depth, vibrato depth, r,bd,sd,tom,tc,hh */
-		{
-			OPL->lfo_am_depth = v & 0x80;
-			OPL->lfo_pm_depth_range = (v&0x40) ? 8 : 0;
-
-			OPL->rhythm = v&0x3f;
-
-			if(OPL->rhythm&0x20)
-			{
-				/* BD key on/off */
-				if(v&0x10)
-				{
-					FM_KEYON (&OPL->P_CH6.SLOTSLOT1, 2);
-					FM_KEYON (&OPL->P_CH6.SLOTSLOT2, 2);
-				}
-				else
-				{
-					FM_KEYOFF(&OPL->P_CH6.SLOTSLOT1,~2);
-					FM_KEYOFF(&OPL->P_CH6.SLOTSLOT2,~2);
-				}
-				/* HH key on/off */
-				if(v&0x01) FM_KEYON (&OPL->P_CH7.SLOTSLOT1, 2);
-				else FM_KEYOFF(&OPL->P_CH7.SLOTSLOT1,~2);
-				/* SD key on/off */
-				if(v&0x08) FM_KEYON (&OPL->P_CH7.SLOTSLOT2, 2);
-				else FM_KEYOFF(&OPL->P_CH7.SLOTSLOT2,~2);
-				/* TOM key on/off */
-				if(v&0x04) FM_KEYON (&OPL->P_CH8.SLOTSLOT1, 2);
-				else FM_KEYOFF(&OPL->P_CH8.SLOTSLOT1,~2);
-				/* TOP-CY key on/off */
-				if(v&0x02) FM_KEYON (&OPL->P_CH8.SLOTSLOT2, 2);
-				else FM_KEYOFF(&OPL->P_CH8.SLOTSLOT2,~2);
-			}
-			else
-			{
-				/* BD key off */
-				FM_KEYOFF(&OPL->P_CH6.SLOTSLOT1,~2);
-				FM_KEYOFF(&OPL->P_CH6.SLOTSLOT2,~2);
-				/* HH key off */
-				FM_KEYOFF(&OPL->P_CH7.SLOTSLOT1,~2);
-				/* SD key off */
-				FM_KEYOFF(&OPL->P_CH7.SLOTSLOT2,~2);
-				/* TOM key off */
-				FM_KEYOFF(&OPL->P_CH8.SLOTSLOT1,~2);
-				/* TOP-CY off */
-				FM_KEYOFF(&OPL->P_CH8.SLOTSLOT2,~2);
-			}
-			return;
-		}
-		/* keyon,block,fnum */
-		if( (r&0x0f) > 8) return;
-		CH = &OPL->P_CHr&0x0f;
-		if(!(r&0x10))
-		{	/* a0-a8 */
-			block_fnum = (CH->block_fnum&0x1f00) | v;
-		}
-		else
-		{	/* b0-b8 */
-			block_fnum = ((v&0x1f)<<8) | (CH->block_fnum&0xff);
-
-			if(v&0x20)
-			{
-				FM_KEYON (&CH->SLOTSLOT1, 1);
-				FM_KEYON (&CH->SLOTSLOT2, 1);
-			}
-			else
-			{
-				FM_KEYOFF(&CH->SLOTSLOT1,~1);
-				FM_KEYOFF(&CH->SLOTSLOT2,~1);
-			}
-		}
-		/* update */
-		if(CH->block_fnum != block_fnum)
-		{
-			UINT8 block = block_fnum >> 10;
-
-			CH->block_fnum = block_fnum;
-
-			CH->ksl_base = ksl_tabblock_fnum>>6;
-			CH->fc = OPL->fn_tabblock_fnum&0x03ff >> (7-block);
-
-			/* BLK 2,1,0 bits -> bits 3,2,1 of kcode */
-			CH->kcode = (CH->block_fnum&0x1c00)>>9;
-
-			 /* the info below is actually opposite to what is stated in the Manuals (verifed on real YM3812) */
-			/* if notesel == 0 -> lsb of kcode is bit 10 (MSB) of fnum */
-			/* if notesel == 1 -> lsb of kcode is bit 9 (MSB-1) of fnum */
-			if (OPL->mode&0x40)
-				CH->kcode |= (CH->block_fnum&0x100)>>8;	/* notesel == 1 */
-			else
-				CH->kcode |= (CH->block_fnum&0x200)>>9;	/* notesel == 0 */
-
-			/* refresh Total Level in both SLOTs of this channel */
-			CH->SLOTSLOT1.TLL = CH->SLOTSLOT1.TL + (CH->ksl_base>>CH->SLOTSLOT1.ksl);
-			CH->SLOTSLOT2.TLL = CH->SLOTSLOT2.TL + (CH->ksl_base>>CH->SLOTSLOT2.ksl);
-
-			/* refresh frequency counter in both SLOTs of this channel */
-			CALC_FCSLOT(CH,&CH->SLOTSLOT1);
-			CALC_FCSLOT(CH,&CH->SLOTSLOT2);
-		}
-		break;
-	case 0xc0:
-		/* FB,C */
-		if( (r&0x0f) > 8) return;
-		CH = &OPL->P_CHr&0x0f;
-		CH->SLOTSLOT1.FB = (v>>1)&7 ? ((v>>1)&7) + 7 : 0;
-		CH->SLOTSLOT1.CON = v&1;
-		CH->SLOTSLOT1.connect1 = CH->SLOTSLOT1.CON ? &OPL->output0 : &OPL->phase_modulation;
-		break;
-	case 0xe0: /* waveform select */
-		/* simply ignore write to the waveform select register if selecting not enabled in test register */
-		if(OPL->wavesel)
-		{
-			slot = slot_arrayr&0x1f;
-			if(slot < 0) return;
-			CH = &OPL->P_CHslot/2;
-
-			CH->SLOTslot&1.wavetable = (v&0x03)*SIN_LEN;
-		}
-		break;
-	}
-}
-
-/*static TIMER_CALLBACK( cymfile_callback )
-{
-	if (cymfile)
-	{
-		fputc( (unsigned char)0, cymfile );
-	}
-}*/
-
-/* lock/unlock for common table */
-#if 0
-static int OPL_LockTable(/*const device_config *device*/)
-{
-	num_lock++;
-	if(num_lock>1) return 0;
-
-	/* first time */
-
-	cur_chip = NULL;
-	/* allocate total level table (128kb space) */
-	if( !init_tables() )
-	{
-		num_lock--;
-		return -1;
-	}
-
-#if 0
-	if (LOG_CYM_FILE)
-	{
-		cymfile = fopen("3812_.cym","wb");
-		if (cymfile)
-			timer_pulse ( device->machine, ATTOTIME_IN_HZ(110), NULL, 0, cymfile_callback); /*110 Hz pulse timer*/
-		else
-			logerror("Could not create file 3812_.cym\n");
-	}
-#endif
-
-	return 0;
-}
-
-static void OPL_UnLockTable(void)
-{
-	if(num_lock) num_lock--;
-	if(num_lock) return;
-
-	/* last time */
-
-	cur_chip = NULL;
-	OPLCloseTable();
-
-	/*if (cymfile)
-		fclose (cymfile);
-	cymfile = NULL;*/
-}
-#endif
-
-static void OPLResetChip(FM_OPL *OPL)
-{
-	int c,s;
-	int i;
-
-	OPL->eg_timer = 0;
-	OPL->eg_cnt = 0;
-
-	OPL->noise_rng = 1;	/* noise shift register */
-	OPL->mode = 0;	/* normal mode */
-	OPL_STATUS_RESET(OPL,0x7f);
-
-	/* reset with register write */
-	OPLWriteReg(OPL,0x01,0); /* wavesel disable */
-	OPLWriteReg(OPL,0x02,0); /* Timer1 */
-	OPLWriteReg(OPL,0x03,0); /* Timer2 */
-	OPLWriteReg(OPL,0x04,0); /* IRQ mask clear */
-	for(i = 0xff ; i >= 0x20 ; i-- ) OPLWriteReg(OPL,i,0);
-
-	/* reset operator parameters */
-	for( c = 0 ; c < 9 ; c++ )
-	{
-		OPL_CH *CH = &OPL->P_CHc;
-		for(s = 0 ; s < 2 ; s++ )
-		{
-			/* wave table */
-			CH->SLOTs.wavetable = 0;
-			CH->SLOTs.state = EG_OFF;
-			CH->SLOTs.volume = MAX_ATT_INDEX;
-		}
-	}
-#if BUILD_Y8950
-	if(OPL->type&OPL_TYPE_ADPCM)
-	{
-		YM_DELTAT *DELTAT = OPL->deltat;
-
-		DELTAT->freqbase = OPL->freqbase;
-		DELTAT->output_pointer = &OPL->output_deltat0;
-		DELTAT->portshift = 5;
-		DELTAT->output_range = 1<<23;
-		YM_DELTAT_ADPCM_Reset(DELTAT,0,YM_DELTAT_EMULATION_MODE_NORMAL);
-	}
-#endif
-}
-
-
-#if 0
-static STATE_POSTLOAD( OPL_postload )
-{
-	FM_OPL *OPL = (FM_OPL *)param;
-	int slot, ch;
-
-	for( ch=0 ; ch < 9 ; ch++ )
-	{
-		OPL_CH *CH = &OPL->P_CHch;
-
-		/* Look up key scale level */
-		UINT32 block_fnum = CH->block_fnum;
-		CH->ksl_base = ksl_tabblock_fnum >> 6;
-		CH->fc = OPL->fn_tabblock_fnum & 0x03ff >> (7 - (block_fnum >> 10));
-
-		for( slot=0 ; slot < 2 ; slot++ )
-		{
-			OPL_SLOT *SLOT = &CH->SLOTslot;
-
-			/* Calculate key scale rate */
-			SLOT->ksr = CH->kcode >> SLOT->KSR;
-
-			/* Calculate attack, decay and release rates */
-			if ((SLOT->ar + SLOT->ksr) < 16+62)
-			{
-				SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
-				SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
-			}
-			else
-			{
-				SLOT->eg_sh_ar = 0;
-				SLOT->eg_sel_ar = 13*RATE_STEPS;
-			}
-			SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
-			SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
-			SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
-			SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
-
-			/* Calculate phase increment */
-			SLOT->Incr = CH->fc * SLOT->mul;
-
-			/* Total level */
-			SLOT->TLL = SLOT->TL + (CH->ksl_base >> SLOT->ksl);
-
-			/* Connect output */
-			SLOT->connect1 = SLOT->CON ? &OPL->output0 : &OPL->phase_modulation;
-		}
-	}
-#if BUILD_Y8950
-	if ( (OPL->type & OPL_TYPE_ADPCM) && (OPL->deltat) )
-	{
-		// We really should call the postlod function for the YM_DELTAT, but it's hard without registers
-		// (see the way the YM2610 does it)
-		//YM_DELTAT_postload(OPL->deltat, REGS);
-	}
-#endif
-}
-
-
-static void OPLsave_state_channel(const device_config *device, OPL_CH *CH)
-{
-	int slot, ch;
-
-	for( ch=0 ; ch < 9 ; ch++, CH++ )
-	{
-		/* channel */
-		state_save_register_device_item(device, ch, CH->block_fnum);
-		state_save_register_device_item(device, ch, CH->kcode);
-		/* slots */
-		for( slot=0 ; slot < 2 ; slot++ )
-		{
-			OPL_SLOT *SLOT = &CH->SLOTslot;
-
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->ar);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->dr);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->rr);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->KSR);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->ksl);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->mul);
-
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->Cnt);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->FB);
-			state_save_register_device_item_array(device, ch * 2 + slot, SLOT->op1_out);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->CON);
-
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->eg_type);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->state);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->TL);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->volume);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->sl);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->key);
-
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->AMmask);
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->vib);
-
-			state_save_register_device_item(device, ch * 2 + slot, SLOT->wavetable);
-		}
-	}
-}
-
-
-/* Register savestate for a virtual YM3812/YM3526Y8950 */
-
-static void OPL_save_state(FM_OPL *OPL, const device_config *device)
-{
-	OPLsave_state_channel(device, OPL->P_CH);
-
-	state_save_register_device_item(device, 0, OPL->eg_cnt);
-	state_save_register_device_item(device, 0, OPL->eg_timer);
-
-	state_save_register_device_item(device, 0, OPL->rhythm);
-
-	state_save_register_device_item(device, 0, OPL->lfo_am_depth);
-	state_save_register_device_item(device, 0, OPL->lfo_pm_depth_range);
-	state_save_register_device_item(device, 0, OPL->lfo_am_cnt);
-	state_save_register_device_item(device, 0, OPL->lfo_pm_cnt);
-
-	state_save_register_device_item(device, 0, OPL->noise_rng);
-	state_save_register_device_item(device, 0, OPL->noise_p);
-
-	if( OPL->type & OPL_TYPE_WAVESEL )
-	{
-		state_save_register_device_item(device, 0, OPL->wavesel);
-	}
-
-	state_save_register_device_item_array(device, 0, OPL->T);
-	state_save_register_device_item_array(device, 0, OPL->st);
-
-#if BUILD_Y8950
-	if ( (OPL->type & OPL_TYPE_ADPCM) && (OPL->deltat) )
-	{
-		YM_DELTAT_savestate(device, OPL->deltat);
-	}
-
-	if ( OPL->type & OPL_TYPE_IO )
-	{
-		state_save_register_device_item(device, 0, OPL->portDirection);
-		state_save_register_device_item(device, 0, OPL->portLatch);
-	}
-#endif
-
-	state_save_register_device_item(device, 0, OPL->address);
-	state_save_register_device_item(device, 0, OPL->status);
-	state_save_register_device_item(device, 0, OPL->statusmask);
-	state_save_register_device_item(device, 0, OPL->mode);
-
-	state_save_register_postload(device->machine, OPL_postload, OPL);
-}
-#endif
-
-
-/* Create one of virtual YM3812/YM3526/Y8950 */
-/* 'clock' is chip clock in Hz */
-/* 'rate' is sampling rate */
-static FM_OPL *OPLCreate(UINT32 clock, UINT32 rate, int type)
-{
-	char *ptr;
-	FM_OPL *OPL;
-	int state_size;
-
-	//if (OPL_LockTable(device) == -1) return NULL;
-	init_tables();
-
-	/* calculate OPL state size */
-	state_size = sizeof(FM_OPL);
-
-#if BUILD_Y8950
-	if (type&OPL_TYPE_ADPCM) state_size+= sizeof(YM_DELTAT);
-#endif
-
-	/* allocate memory block */
-	ptr = (char *)malloc(state_size);
-
-	if (ptr==NULL)
-		return 0;
-
-	/* clear */
-	memset(ptr,0,state_size);
-
-	OPL = (FM_OPL *)ptr;
-
-	ptr += sizeof(FM_OPL);
-
-#if BUILD_Y8950
-	if (type&OPL_TYPE_ADPCM)
-	{
-		OPL->deltat = (YM_DELTAT *)ptr;
-	}
-	ptr += sizeof(YM_DELTAT);
-#endif
-
-	OPL->type = type;
-	OPL->clock = clock;
-	OPL->rate = rate;
-
-	/* init global tables */
-	OPL_initalize(OPL);
-
-	return OPL;
-}
-
-/* Destroy one of virtual YM3812 */
-static void OPLDestroy(FM_OPL *OPL)
-{
-	//OPL_UnLockTable();
-	free(OPL);
-}
-
-/* Optional handlers */
-
-/*static void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER timer_handler,void *param)
-{
-	OPL->timer_handler = timer_handler;
-	OPL->TimerParam = param;
-}*/
-static void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,void *param)
-{
-	OPL->IRQHandler = IRQHandler;
-	OPL->IRQParam = param;
-}
-static void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,void *param)
-{
-	OPL->UpdateHandler = UpdateHandler;
-	OPL->UpdateParam = param;
-}
-
-static int OPLWrite(FM_OPL *OPL,int a,int v)
-{
-	if( !(a&1) )
-	{	/* address port */
-		OPL->address = v & 0xff;
-	}
-	else
-	{	/* data port */
-		if(OPL->UpdateHandler) OPL->UpdateHandler(OPL->UpdateParam,0);
-		OPLWriteReg(OPL,OPL->address,v);
-	}
-	return OPL->status>>7;
-}
-
-static unsigned char OPLRead(FM_OPL *OPL,int a)
-{
-	if( !(a&1) )
-	{
-		/* status port */
-
-		#if BUILD_Y8950
-
-		if(OPL->type&OPL_TYPE_ADPCM)	/* Y8950 */
-		{
-			return (OPL->status & (OPL->statusmask|0x80)) | (OPL->deltat->PCM_BSY&1);
-		}
-
-		#endif
-
-		/* OPL and OPL2 */
-		return OPL->status & (OPL->statusmask|0x80);
-	}
-
-#if BUILD_Y8950
-	/* data port */
-	switch(OPL->address)
-	{
-	case 0x05: /* KeyBoard IN */
-		if(OPL->type&OPL_TYPE_KEYBOARD)
-		{
-			if(OPL->keyboardhandler_r)
-				return OPL->keyboardhandler_r(OPL->keyboard_param);
-			else
-				logerror("Y8950: read unmapped KEYBOARD port\n");
-		}
-		return 0;
-
-	case 0x0f: /* ADPCM-DATA */
-		if(OPL->type&OPL_TYPE_ADPCM)
-		{
-			UINT8 val;
-
-			val = YM_DELTAT_ADPCM_Read(OPL->deltat);
-			/*logerror("Y8950: read ADPCM value read=%02x\n",val);*/
-			return val;
-		}
-		return 0;
-
-	case 0x19: /* I/O DATA */
-		if(OPL->type&OPL_TYPE_IO)
-		{
-			if(OPL->porthandler_r)
-				return OPL->porthandler_r(OPL->port_param);
-			else
-				logerror("Y8950:read unmapped I/O port\n");
-		}
-		return 0;
-	case 0x1a: /* PCM-DATA */
-		if(OPL->type&OPL_TYPE_ADPCM)
-		{
-			logerror("Y8950 A/D convertion is accessed but not implemented !\n");
-			return 0x80; /* 2's complement PCM data - result from A/D convertion */
-		}
-		return 0;
-	}
-#endif
-
-	return 0xff;
-}
-
-/* CSM Key Controll */
-INLINE void CSMKeyControll(OPL_CH *CH)
-{
-	FM_KEYON (&CH->SLOTSLOT1, 4);
-	FM_KEYON (&CH->SLOTSLOT2, 4);
-
-	/* The key off should happen exactly one sample later - not implemented correctly yet */
-
-	FM_KEYOFF(&CH->SLOTSLOT1, ~4);
-	FM_KEYOFF(&CH->SLOTSLOT2, ~4);
-}
-
-
-static int OPLTimerOver(FM_OPL *OPL,int c)
-{
-	if( c )
-	{	/* Timer B */
-		OPL_STATUS_SET(OPL,0x20);
-	}
-	else
-	{	/* Timer A */
-		OPL_STATUS_SET(OPL,0x40);
-		/* CSM mode key,TL controll */
-		if( OPL->mode & 0x80 )
-		{	/* CSM mode total level latch and auto key on */
-			int ch;
-			if(OPL->UpdateHandler) OPL->UpdateHandler(OPL->UpdateParam,0);
-			for(ch=0; ch<9; ch++)
-				CSMKeyControll( &OPL->P_CHch );
-		}
-	}
-	/* reload timer */
-	//if (OPL->timer_handler) (OPL->timer_handler)(OPL->TimerParam,c,attotime_mul(OPL->TimerBase, OPL->Tc));
-	return OPL->status>>7;
-}
-
-
-#define MAX_OPL_CHIPS 2
-
-
-#if (BUILD_YM3812)
-
-void * ym3812_init(UINT32 clock, UINT32 rate)
-{
-	/* emulator create */
-	FM_OPL *YM3812 = OPLCreate(clock,rate,OPL_TYPE_YM3812);
-	if (YM3812)
-	{
-		//OPL_save_state(YM3812);
-		ym3812_reset_chip(YM3812);
-	}
-	return YM3812;
-}
-
-void ym3812_shutdown(void *chip)
-{
-	FM_OPL *YM3812 = (FM_OPL *)chip;
-
-	/* emulator shutdown */
-	OPLDestroy(YM3812);
-}
-void ym3812_reset_chip(void *chip)
-{
-	FM_OPL *YM3812 = (FM_OPL *)chip;
-	OPLResetChip(YM3812);
-}
-
-int ym3812_write(void *chip, int a, int v)
-{
-	FM_OPL *YM3812 = (FM_OPL *)chip;
-	return OPLWrite(YM3812, a, v);
-}
-
-unsigned char ym3812_read(void *chip, int a)
-{
-	FM_OPL *YM3812 = (FM_OPL *)chip;
-	/* YM3812 always returns bit2 and bit1 in HIGH state */
-	return OPLRead(YM3812, a) | 0x06 ;
-}
-int ym3812_timer_over(void *chip, int c)
-{
-	FM_OPL *YM3812 = (FM_OPL *)chip;
-	return OPLTimerOver(YM3812, c);
-}
-
-/*void ym3812_set_timer_handler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
-{
-	FM_OPL *YM3812 = (FM_OPL *)chip;
-	OPLSetTimerHandler(YM3812, timer_handler, param);
-}*/
-void ym3812_set_irq_handler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
-{
-	FM_OPL *YM3812 = (FM_OPL *)chip;
-	OPLSetIRQHandler(YM3812, IRQHandler, param);
-}
-void ym3812_set_update_handler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
-{
-	FM_OPL *YM3812 = (FM_OPL *)chip;
-	OPLSetUpdateHandler(YM3812, UpdateHandler, param);
-}
-
-
-/*
-** Generate samples for one of the YM3812's
-**
-** 'which' is the virtual YM3812 number
-** '*buffer' is the output buffer pointer
-** 'length' is the number of samples that should be generated
-*/
-void ym3812_update_one(void *chip, OPLSAMPLE *buffer, int length)
-{
-	FM_OPL		*OPL = (FM_OPL *)chip;
-	UINT8		rhythm = OPL->rhythm&0x20;
-	OPLSAMPLE	*buf = buffer;
-	int i;
-
-	/* rhythm slots */
-	OPL->SLOT7_1 = &OPL->P_CH7.SLOTSLOT1;
-	OPL->SLOT7_2 = &OPL->P_CH7.SLOTSLOT2;
-	OPL->SLOT8_1 = &OPL->P_CH8.SLOTSLOT1;
-	OPL->SLOT8_2 = &OPL->P_CH8.SLOTSLOT2;
-	for( i=0; i < length ; i++ )
-	{
-		int lt;
-
-		OPL->output0 = 0;
-
-		advance_lfo(OPL);
-
-		/* FM part */
-		OPL_CALC_CH(OPL, &OPL->P_CH0);
-		OPL_CALC_CH(OPL, &OPL->P_CH1);
-		OPL_CALC_CH(OPL, &OPL->P_CH2);
-		OPL_CALC_CH(OPL, &OPL->P_CH3);
-		OPL_CALC_CH(OPL, &OPL->P_CH4);
-		OPL_CALC_CH(OPL, &OPL->P_CH5);
-
-		if(!rhythm)
-		{
-			OPL_CALC_CH(OPL, &OPL->P_CH6);
-			OPL_CALC_CH(OPL, &OPL->P_CH7);
-			OPL_CALC_CH(OPL, &OPL->P_CH8);
-		}
-		else		/* Rhythm part */
-		{
-			OPL_CALC_RH(OPL, &OPL->P_CH0, (OPL->noise_rng>>0)&1 );
-		}
-
-		lt = OPL->output0;
-
-		lt >>= FINAL_SH;
-
-		/* limit check */
-		lt = limit( lt , MAXOUT, MINOUT );
-
-		#ifdef SAVE_SAMPLE
-		if (which==0)
-		{
-			SAVE_ALL_CHANNELS
-		}
-		#endif
-
-		/* store to sound buffer */
-		bufi = lt;
-
-		advance(OPL);
-	}
-
-}
-#endif /* BUILD_YM3812 */
-
-
-
-#if (BUILD_YM3526)
-
-void *ym3526_init(UINT32 clock, UINT32 rate)
-{
-	/* emulator create */
-	FM_OPL *YM3526 = OPLCreate(clock,rate,OPL_TYPE_YM3526);
-	if (YM3526)
-	{
-		/*OPL_save_state(YM3526);*/
-		ym3526_reset_chip(YM3526);
-	}
-	return YM3526;
-}
-
-void ym3526_shutdown(void *chip)
-{
-	FM_OPL *YM3526 = (FM_OPL *)chip;
-	/* emulator shutdown */
-	OPLDestroy(YM3526);
-}
-void ym3526_reset_chip(void *chip)
-{
-	FM_OPL *YM3526 = (FM_OPL *)chip;
-	OPLResetChip(YM3526);
-}
-
-int ym3526_write(void *chip, int a, int v)
-{
-	FM_OPL *YM3526 = (FM_OPL *)chip;
-	return OPLWrite(YM3526, a, v);
-}
-
-unsigned char ym3526_read(void *chip, int a)
-{
-	FM_OPL *YM3526 = (FM_OPL *)chip;
-	/* YM3526 always returns bit2 and bit1 in HIGH state */
-	return OPLRead(YM3526, a) | 0x06 ;
-}
-int ym3526_timer_over(void *chip, int c)
-{
-	FM_OPL *YM3526 = (FM_OPL *)chip;
-	return OPLTimerOver(YM3526, c);
-}
-
-/*void ym3526_set_timer_handler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
-{
-	FM_OPL *YM3526 = (FM_OPL *)chip;
-	OPLSetTimerHandler(YM3526, timer_handler, param);
-}*/
-void ym3526_set_irq_handler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
-{
-	FM_OPL *YM3526 = (FM_OPL *)chip;
-	OPLSetIRQHandler(YM3526, IRQHandler, param);
-}
-void ym3526_set_update_handler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
-{
-	FM_OPL *YM3526 = (FM_OPL *)chip;
-	OPLSetUpdateHandler(YM3526, UpdateHandler, param);
-}
-
-
-/*
-** Generate samples for one of the YM3526's
-**
-** 'which' is the virtual YM3526 number
-** '*buffer' is the output buffer pointer
-** 'length' is the number of samples that should be generated
-*/
-void ym3526_update_one(void *chip, OPLSAMPLE *buffer, int length)
-{
-	FM_OPL		*OPL = (FM_OPL *)chip;
-	UINT8		rhythm = OPL->rhythm&0x20;
-	OPLSAMPLE	*buf = buffer;
-	int i;
-
-	/* rhythm slots */
-	OPL->SLOT7_1 = &OPL->P_CH7.SLOTSLOT1;
-	OPL->SLOT7_2 = &OPL->P_CH7.SLOTSLOT2;
-	OPL->SLOT8_1 = &OPL->P_CH8.SLOTSLOT1;
-	OPL->SLOT8_2 = &OPL->P_CH8.SLOTSLOT2;
-	for( i=0; i < length ; i++ )
-	{
-		int lt;
-
-		OPL->output0 = 0;
-
-		advance_lfo(OPL);
-
-		/* FM part */
-		OPL_CALC_CH(OPL, &OPL->P_CH0);
-		OPL_CALC_CH(OPL, &OPL->P_CH1);
-		OPL_CALC_CH(OPL, &OPL->P_CH2);
-		OPL_CALC_CH(OPL, &OPL->P_CH3);
-		OPL_CALC_CH(OPL, &OPL->P_CH4);
-		OPL_CALC_CH(OPL, &OPL->P_CH5);
-
-		if(!rhythm)
-		{
-			OPL_CALC_CH(OPL, &OPL->P_CH6);
-			OPL_CALC_CH(OPL, &OPL->P_CH7);
-			OPL_CALC_CH(OPL, &OPL->P_CH8);
-		}
-		else		/* Rhythm part */
-		{
-			OPL_CALC_RH(OPL, &OPL->P_CH0, (OPL->noise_rng>>0)&1 );
-		}
-
-		lt = OPL->output0;
-
-		lt >>= FINAL_SH;
-
-		/* limit check */
-		lt = limit( lt , MAXOUT, MINOUT );
-
-		#ifdef SAVE_SAMPLE
-		if (which==0)
-		{
-			SAVE_ALL_CHANNELS
-		}
-		#endif
-
-		/* store to sound buffer */
-		bufi = lt;
-
-		advance(OPL);
-	}
-
-}
-#endif /* BUILD_YM3526 */
-
-
-
-
-#if BUILD_Y8950
-
-static void Y8950_deltat_status_set(void *chip, UINT8 changebits)
-{
-	FM_OPL *Y8950 = (FM_OPL *)chip;
-	OPL_STATUS_SET(Y8950, changebits);
-}
-static void Y8950_deltat_status_reset(void *chip, UINT8 changebits)
-{
-	FM_OPL *Y8950 = (FM_OPL *)chip;
-	OPL_STATUS_RESET(Y8950, changebits);
-}
-
-void *y8950_init(UINT32 clock, UINT32 rate)
-{
-	/* emulator create */
-	FM_OPL *Y8950 = OPLCreate(clock,rate,OPL_TYPE_Y8950);
-	if (Y8950)
-	{
-		Y8950->deltat->status_set_handler = Y8950_deltat_status_set;
-		Y8950->deltat->status_reset_handler = Y8950_deltat_status_reset;
-		Y8950->deltat->status_change_which_chip = Y8950;
-		Y8950->deltat->status_change_EOS_bit = 0x10;		/* status flag: set bit4 on End Of Sample */
-		Y8950->deltat->status_change_BRDY_bit = 0x08;	/* status flag: set bit3 on BRDY (End Of: ADPCM analysis/synthesis, memory reading/writing) */
-
-		/*Y8950->deltat->write_time = 10.0 / clock;*/		/* a single byte write takes 10 cycles of main clock */
-		/*Y8950->deltat->read_time = 8.0 / clock;*/		/* a single byte read takes 8 cycles of main clock */
-		/* reset */
-		/*OPL_save_state(Y8950);*/
-		y8950_reset_chip(Y8950);
-	}
-
-	return Y8950;
-}
-
-void y8950_shutdown(void *chip)
-{
-	FM_OPL *Y8950 = (FM_OPL *)chip;
-	/* emulator shutdown */
-	OPLDestroy(Y8950);
-}
-void y8950_reset_chip(void *chip)
-{
-	FM_OPL *Y8950 = (FM_OPL *)chip;
-	OPLResetChip(Y8950);
-}
-
-int y8950_write(void *chip, int a, int v)
-{
-	FM_OPL *Y8950 = (FM_OPL *)chip;
-	return OPLWrite(Y8950, a, v);
-}
-
-unsigned char y8950_read(void *chip, int a)
-{
-	FM_OPL *Y8950 = (FM_OPL *)chip;
-	return OPLRead(Y8950, a);
-}
-int y8950_timer_over(void *chip, int c)
-{
-	FM_OPL *Y8950 = (FM_OPL *)chip;
-	return OPLTimerOver(Y8950, c);
-}
-
-/*void y8950_set_timer_handler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
-{
-	FM_OPL *Y8950 = (FM_OPL *)chip;
-	OPLSetTimerHandler(Y8950, timer_handler, param);
-}*/
-void y8950_set_irq_handler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
-{
-	FM_OPL *Y8950 = (FM_OPL *)chip;
-	OPLSetIRQHandler(Y8950, IRQHandler, param);
-}
-void y8950_set_update_handler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
-{
-	FM_OPL *Y8950 = (FM_OPL *)chip;
-	OPLSetUpdateHandler(Y8950, UpdateHandler, param);
-}
-
-void y8950_set_delta_t_memory(void *chip, void * deltat_mem_ptr, int deltat_mem_size )
-{
-	FM_OPL		*OPL = (FM_OPL *)chip;
-	OPL->deltat->memory = (UINT8 *)(deltat_mem_ptr);
-	OPL->deltat->memory_size = deltat_mem_size;
-}
-
-/*
-** Generate samples for one of the Y8950's
-**
-** 'which' is the virtual Y8950 number
-** '*buffer' is the output buffer pointer
-** 'length' is the number of samples that should be generated
-*/
-void y8950_update_one(void *chip, OPLSAMPLE *buffer, int length)
-{
-	int i;
-	FM_OPL		*OPL = (FM_OPL *)chip;
-	UINT8		rhythm = OPL->rhythm&0x20;
-	YM_DELTAT	*DELTAT = OPL->deltat;
-	OPLSAMPLE	*buf = buffer;
-
-	/* rhythm slots */
-	OPL->SLOT7_1 = &OPL->P_CH7.SLOTSLOT1;
-	OPL->SLOT7_2 = &OPL->P_CH7.SLOTSLOT2;
-	OPL->SLOT8_1 = &OPL->P_CH8.SLOTSLOT1;
-	OPL->SLOT8_2 = &OPL->P_CH8.SLOTSLOT2;
-
-	for( i=0; i < length ; i++ )
-	{
-		int lt;
-
-		OPL->output0 = 0;
-		OPL->output_deltat0 = 0;
-
-		advance_lfo(OPL);
-
-		/* deltaT ADPCM */
-		if( DELTAT->portstate&0x80 )
-			YM_DELTAT_ADPCM_CALC(DELTAT);
-
-		/* FM part */
-		OPL_CALC_CH(OPL, &OPL->P_CH0);
-		OPL_CALC_CH(OPL, &OPL->P_CH1);
-		OPL_CALC_CH(OPL, &OPL->P_CH2);
-		OPL_CALC_CH(OPL, &OPL->P_CH3);
-		OPL_CALC_CH(OPL, &OPL->P_CH4);
-		OPL_CALC_CH(OPL, &OPL->P_CH5);
-
-		if(!rhythm)
-		{
-			OPL_CALC_CH(OPL, &OPL->P_CH6);
-			OPL_CALC_CH(OPL, &OPL->P_CH7);
-			OPL_CALC_CH(OPL, &OPL->P_CH8);
-		}
-		else		/* Rhythm part */
-		{
-			OPL_CALC_RH(OPL, &OPL->P_CH0, (OPL->noise_rng>>0)&1 );
-		}
-
-		lt = OPL->output0 + (OPL->output_deltat0>>11);
-
-		lt >>= FINAL_SH;
-
-		/* limit check */
-		lt = limit( lt , MAXOUT, MINOUT );
-
-		#ifdef SAVE_SAMPLE
-		if (which==0)
-		{
-			SAVE_ALL_CHANNELS
-		}
-		#endif
-
-		/* store to sound buffer */
-		bufi = lt;
-
-		advance(OPL);
-	}
-
-}
-
-void y8950_set_port_handler(void *chip,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,void * param)
-{
-	FM_OPL		*OPL = (FM_OPL *)chip;
-	OPL->porthandler_w = PortHandler_w;
-	OPL->porthandler_r = PortHandler_r;
-	OPL->port_param = param;
-}
-
-void y8950_set_keyboard_handler(void *chip,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,void * param)
-{
-	FM_OPL		*OPL = (FM_OPL *)chip;
-	OPL->keyboardhandler_w = KeyboardHandler_w;
-	OPL->keyboardhandler_r = KeyboardHandler_r;
-	OPL->keyboard_param = param;
-}
-
-#endif
-

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/fmopl.h Deleted

@@ -1,116 +0,0 @@
-#pragma once
-
-#ifndef __FMOPL_H__
-#define __FMOPL_H__
-
-/* --- select emulation chips --- */
-#define BUILD_YM3812 (1)
-#define BUILD_YM3526 (1)
-#define BUILD_Y8950  (1)
-
-/* select output bits size of output : 8 or 16 */
-#define OPL_SAMPLE_BITS 16
-
-/* compiler dependence */
-#ifndef __OSDCOMM_H__
-#define __OSDCOMM_H__
-typedef unsigned char	UINT8;   /* unsigned  8bit */
-typedef unsigned short	UINT16;  /* unsigned 16bit */
-typedef unsigned int	UINT32;  /* unsigned 32bit */
-typedef signed char		INT8;    /* signed  8bit   */
-typedef signed short	INT16;   /* signed 16bit   */
-typedef signed int		INT32;   /* signed 32bit   */
-
-typedef INT32 stream_sample_t;
-
-#endif /* __OSDCOMM_H__ */
-
-typedef stream_sample_t OPLSAMPLE;
-/*
-#if (OPL_SAMPLE_BITS==16)
-typedef INT16 OPLSAMPLE;
-#endif
-#if (OPL_SAMPLE_BITS==8)
-typedef INT8 OPLSAMPLE;
-#endif
-*/
-
-//typedef void (*OPL_TIMERHANDLER)(void *param,int timer,attotime period);
-typedef void (*OPL_IRQHANDLER)(void *param,int irq);
-typedef void (*OPL_UPDATEHANDLER)(void *param,int min_interval_us);
-typedef void (*OPL_PORTHANDLER_W)(void *param,unsigned char data);
-typedef unsigned char (*OPL_PORTHANDLER_R)(void *param);
-
-
-#if BUILD_YM3812
-
-void *ym3812_init(UINT32 clock, UINT32 rate);
-void ym3812_shutdown(void *chip);
-void ym3812_reset_chip(void *chip);
-int  ym3812_write(void *chip, int a, int v);
-unsigned char ym3812_read(void *chip, int a);
-int  ym3812_timer_over(void *chip, int c);
-void ym3812_update_one(void *chip, OPLSAMPLE *buffer, int length);
-
-//void ym3812_set_timer_handler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
-void ym3812_set_irq_handler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
-void ym3812_set_update_handler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
-
-#endif /* BUILD_YM3812 */
-
-
-#if BUILD_YM3526
-
-/*
-** Initialize YM3526 emulator(s).
-**
-** 'num' is the number of virtual YM3526's to allocate
-** 'clock' is the chip clock in Hz
-** 'rate' is sampling rate
-*/
-void *ym3526_init(UINT32 clock, UINT32 rate);
-/* shutdown the YM3526 emulators*/
-void ym3526_shutdown(void *chip);
-void ym3526_reset_chip(void *chip);
-int  ym3526_write(void *chip, int a, int v);
-unsigned char ym3526_read(void *chip, int a);
-int  ym3526_timer_over(void *chip, int c);
-/*
-** Generate samples for one of the YM3526's
-**
-** 'which' is the virtual YM3526 number
-** '*buffer' is the output buffer pointer
-** 'length' is the number of samples that should be generated
-*/
-void ym3526_update_one(void *chip, OPLSAMPLE *buffer, int length);
-
-//void ym3526_set_timer_handler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
-void ym3526_set_irq_handler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
-void ym3526_set_update_handler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
-
-#endif /* BUILD_YM3526 */
-
-
-#if BUILD_Y8950
-
-/* Y8950 port handlers */
-void y8950_set_port_handler(void *chip, OPL_PORTHANDLER_W PortHandler_w, OPL_PORTHANDLER_R PortHandler_r, void *param);
-void y8950_set_keyboard_handler(void *chip, OPL_PORTHANDLER_W KeyboardHandler_w, OPL_PORTHANDLER_R KeyboardHandler_r, void *param);
-void y8950_set_delta_t_memory(void *chip, void * deltat_mem_ptr, int deltat_mem_size );
-
-void * y8950_init(UINT32 clock, UINT32 rate);
-void y8950_shutdown(void *chip);
-void y8950_reset_chip(void *chip);
-int  y8950_write(void *chip, int a, int v);
-unsigned char y8950_read (void *chip, int a);
-int  y8950_timer_over(void *chip, int c);
-void y8950_update_one(void *chip, OPLSAMPLE *buffer, int length);
-
-//void y8950_set_timer_handler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
-void y8950_set_irq_handler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
-void y8950_set_update_handler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
-
-#endif /* BUILD_Y8950 */
-
-
-#endif /* __FMOPL_H__ */

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/i_fmpac.h Deleted

@@ -1,38 +0,0 @@
-	0x49, 0x4C, 0x4C, 0x32, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x33, 0x21, 0x09, 0x0E, 0x94, 0x90, 0x48, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x13, 0x41, 0x0F, 0x0D, 0xCE, 0xD3, 0x43, 0x13, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x12, 0x1B, 0x06, 0xFF, 0xD2, 0x00, 0x32, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x61, 0x1B, 0x07, 0xAF, 0x63, 0x20, 0x28, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x22, 0x21, 0x1E, 0x06, 0xF0, 0x76, 0x08, 0x28, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x66, 0x21, 0x15, 0x00, 0x93, 0x94, 0x20, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x21, 0x61, 0x1C, 0x07, 0x82, 0x81, 0x10, 0x17, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x23, 0x21, 0x20, 0x1F, 0xC0, 0x71, 0x07, 0x47, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x25, 0x31, 0x26, 0x05, 0x64, 0x41, 0x18, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x17, 0x21, 0x28, 0x07, 0xFF, 0x83, 0x02, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x97, 0x81, 0x25, 0x07, 0xCF, 0xC8, 0x02, 0x14, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x21, 0x21, 0x54, 0x0F, 0x80, 0x7F, 0x07, 0x07, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x56, 0x03, 0xD3, 0xB2, 0x43, 0x58, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x31, 0x21, 0x0C, 0x03, 0x82, 0xC0, 0x40, 0x07, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x21, 0x01, 0x0C, 0x03, 0xD4, 0xD3, 0x40, 0x84, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x21, 0x28, 0x00, 0xDF, 0xF8, 0xFF, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x23, 0x22, 0x00, 0x00, 0xA8, 0xF8, 0xF8, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x25, 0x18, 0x00, 0x00, 0xF8, 0xA9, 0xF8, 0x55, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/i_fmunit.h Deleted

@@ -1,38 +0,0 @@
-	0x49, 0x4C, 0x4C, 0x32, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x61, 0x1E, 0x07, 0xF0, 0x7E, 0x07, 0x17, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x13, 0x41, 0x0F, 0x1D, 0xCE, 0xD2, 0x43, 0x13, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x03, 0x01, 0x99, 0x04, 0xFF, 0xC3, 0x03, 0x73, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x21, 0x61, 0x1B, 0x07, 0xAF, 0x63, 0x40, 0x28, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x22, 0x21, 0x1E, 0x06, 0xF0, 0x76, 0x08, 0x28, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x31, 0x22, 0x16, 0x05, 0x90, 0x71, 0x00, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x31, 0x61, 0x1D, 0x07, 0x32, 0x81, 0x10, 0x17, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x23, 0x21, 0x2D, 0x16, 0xC0, 0x70, 0x07, 0x07, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x21, 0x1B, 0x06, 0x64, 0x65, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x61, 0x0C, 0x18, 0x85, 0xA0, 0x79, 0x07, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x23, 0x21, 0x87, 0x11, 0xF0, 0xA4, 0x00, 0xF7, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x97, 0xE1, 0x28, 0x07, 0xFF, 0xF3, 0x02, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x10, 0x0C, 0x05, 0xF2, 0xC4, 0x40, 0xC8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x56, 0x03, 0xB4, 0xB2, 0x23, 0x58, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x41, 0x89, 0x03, 0xF1, 0xF4, 0xF0, 0x13, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x21, 0x28, 0x00, 0xDF, 0xF8, 0xFF, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x0F, 0x02, 0x00, 0x00, 0xA7, 0xF7, 0x07, 0x07, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x1F, 0x00, 0x00, 0xF8, 0xA9, 0x08, 0x05, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/i_vrc7.h Deleted

@@ -1,38 +0,0 @@
-	0x49, 0x4C, 0x4C, 0x32, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x61, 0x1E, 0x07, 0xF0, 0x7E, 0x07, 0x17, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x13, 0x41, 0x0F, 0x1D, 0xCE, 0xD2, 0x43, 0x13, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x03, 0x01, 0x99, 0x04, 0xFF, 0xC3, 0x03, 0x73, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x21, 0x61, 0x1B, 0x07, 0xAF, 0x63, 0x40, 0x28, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x22, 0x21, 0x1E, 0x06, 0xF0, 0x76, 0x08, 0x28, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x31, 0x22, 0x16, 0x05, 0x90, 0x71, 0x00, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x31, 0x61, 0x1D, 0x07, 0x32, 0x81, 0x10, 0x17, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x23, 0x21, 0x2D, 0x16, 0xC0, 0x70, 0x07, 0x07, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x21, 0x1B, 0x06, 0x64, 0x65, 0x18, 0x18, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x61, 0x0C, 0x18, 0x85, 0xA0, 0x79, 0x07, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x23, 0x21, 0x87, 0x11, 0xF0, 0xA4, 0x00, 0xF7, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x97, 0xE1, 0x28, 0x07, 0xFF, 0xF3, 0x02, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x10, 0x0C, 0x05, 0xF2, 0xC4, 0x40, 0xC8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x56, 0x03, 0xB4, 0xB2, 0x23, 0x58, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x61, 0x41, 0x89, 0x03, 0xF1, 0xF4, 0xF0, 0x13, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x04, 0x21, 0x28, 0x00, 0xDF, 0xF8, 0xFF, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x28, 0x21, 0x00, 0x00, 0xA8, 0xF8, 0xF8, 0xF8, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x25, 0x18, 0x00, 0x00, 0xF8, 0xA9, 0xF8, 0x55, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/kmsnddev.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/nestypes.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/s_deltat.c Deleted

@@ -1,281 +0,0 @@
-#include "kmsnddev.h"
-#include "divfix.h"
-#include "s_logtbl.h"
-#include "s_deltat.h"
-#include <string.h>
-
-#define CPS_SHIFT 16
-#define PHASE_SHIFT 16 /* 16(fix) */
-
-typedef struct {
-	KMIF_SOUND_DEVICE kmif;
-	KMIF_LOGTABLE *logtbl;
-	struct YMDELTATPCMSOUND_COMMON_TAG {
-		Int32 mastervolume;
-		Int32 step;
-		Int32 output;
-		Uint32 cnt;
-		Uint32 cps;
-		Uint32 phase;
-		Uint32 deltan;
-		Uint32 scale;
-		Uint32 mem;
-		Uint32 play;
-		Uint32 start;
-		Uint32 stop;
-		Int32 level32;
-		Uint8 key;
-		Uint8 level;
-		Uint8 granuality;
-		Uint8 pad4_3;
-		Uint8 regs0x10;
-	} common;
-	Uint8 *romrambuf;
-	Uint32 romrammask;
-	Uint8 *rambuf;
-	Uint32 rammask;
-	Uint8 *rombuf;
-	Uint32 rommask;
-	Uint8 ymdeltatpcm_type;
-	Uint8 memshift;
-} YMDELTATPCMSOUND;
-
-const static Uint8 table_step8 =
-{
-	 1, 3, 5, 7, 9, 11, 13, 15,
-};
-const static Uint8 table_scale16 =
-{
-	 57, 57, 57, 57, 77, 102, 128, 153,
-	 57, 57, 57, 57, 77, 102, 128, 153,
-};
-
-__inline static void writeram(YMDELTATPCMSOUND *sndp, Uint32 v)
-{
-	sndp->rambuf(sndp->common.mem >> 1) & sndp->rammask = v;
-	sndp->common.mem += 1 << 1;
-}
-
-__inline static Uint32 readram(YMDELTATPCMSOUND *sndp)
-{
-	Uint32 v;
-	v = sndp->romrambuf(sndp->common.play >> 1) & sndp->romrammask;
-	if (sndp->common.play & 1)
-		v &= 0x0F;
-	else
-		v >>= 4;
-	sndp->common.play += 1;
-	if (sndp->common.play >= sndp->common.stop)
-	{
-		if (sndp->common.regs0 & 0x10)
-		{
-			sndp->common.play = sndp->common.start;
-			sndp->common.step = 0;
-			sndp->common.scale = 127;
-		}
-		else
-		{
-			sndp->common.key = 0;
-		}
-	}
-	return v;
-}
-
-__inline static void DelrtatStep(YMDELTATPCMSOUND *sndp, Uint32 data)
-{
-	if (data & 8)
-		sndp->common.step -= (table_stepdata & 7 * sndp->common.scale) >> 3;
-	else
-		sndp->common.step += (table_stepdata & 7 * sndp->common.scale) >> 3;
-	if (sndp->common.step > ((1 << 15) - 1)) sndp->common.step = ((1 << 15) - 1);
-	if (sndp->common.step < -(1 << 15)) sndp->common.step = -(1 << 15);
-	sndp->common.scale = (sndp->common.scale * table_scaledata) >> 6;
-	if (sndp->common.scale > 24576) sndp->common.scale = 24576;
-	if (sndp->common.scale < 127) sndp->common.scale = 127;
-}
-
-#if (((-1) >> 1) == -1)
-#define SSR(x, y) (((Int32)x) >> (y))
-#else
-#define SSR(x, y) (((x) >= 0) ? ((x) >> (y)) : (-((-(x) - 1) >> (y)) - 1))
-#endif
-
-static int sndsynth(YMDELTATPCMSOUND *sndp )
-{
-	if (!sndp->common.key)
-		return 0;
-	{
-		Uint32 step;
-		sndp->common.cnt += sndp->common.cps;
-		step = sndp->common.cnt >> CPS_SHIFT;
-		sndp->common.cnt &= (1 << CPS_SHIFT) - 1;
-		sndp->common.phase += step * sndp->common.deltan;
-		step = sndp->common.phase >> PHASE_SHIFT;
-		sndp->common.phase &= (1 << PHASE_SHIFT) - 1;
-		if (step)
-		{
-			do
-			{
-				DelrtatStep(sndp, readram(sndp));
-			} while (--step);
-			sndp->common.output = sndp->common.step * sndp->common.level32;
-			sndp->common.output = SSR(sndp->common.output, 8 + 2);
-		}
-	}
-	return sndp->common.output;
-}
-
-
-
-static void sndwrite(YMDELTATPCMSOUND *sndp, Uint32 a, Uint32 v)
-{
-	sndp->common.regsa = v;
-	switch (a)
-	{
-		/* START,REC,MEMDATA,REPEAT,SPOFF,--,--,RESET */
-		case 0x00: /* Control Register 1 */
-			if ((v & 0x80) && !sndp->common.key)
-			{
-				sndp->common.key = 1;
-				sndp->common.play = sndp->common.start;
-				sndp->common.step = 0;
-				sndp->common.scale = 127;
-			}
-			if (v & 1) sndp->common.key = 0;
-			break;
-		/* L,R,-,-,SAMPLE,DA/AD,RAMTYPE,ROM */
-		case 0x01: /* Control Register 2 */
-			sndp->romrambuf = (sndp->common.regs1 & 1) ? sndp->rombuf : sndp->rambuf;
-			sndp->romrammask = (sndp->common.regs1 & 1) ? sndp->rommask : sndp->rammask;
-			break;
-		case 0x02: /* Start Address L */
-		case 0x03: /* Start Address H */
-			sndp->common.granuality = (v & 2) ? 1 : 4;
-			sndp->common.start = ((sndp->common.regs3 << 8) + sndp->common.regs2) << (sndp->memshift + 1);
-			sndp->common.mem = sndp->common.start;
-			break;
-		case 0x04: /* Stop Address L */
-		case 0x05: /* Stop Address H */
-			sndp->common.stop = ((sndp->common.regs5 << 8) + sndp->common.regs4) << (sndp->memshift + 1);
-			break;
-		case 0x06: /* Prescale L */
-		case 0x07: /* Prescale H */
-			break;
-		case 0x08: /* Data */
-			if ((sndp->common.regs0 & 0x60) == 0x60) writeram(sndp, v);
-			break;
-		case 0x09: /* Delta-N L */
-		case 0x0A: /* Delta-N H */
-			sndp->common.deltan = (sndp->common.regs0xA << 8) + sndp->common.regs0x9;
-			if (sndp->common.deltan < 0x100) sndp->common.deltan = 0x100;
-			break;
-		case 0x0B: /* Level Control */
-			sndp->common.level = v;
-			sndp->common.level32 = ((Int32)(sndp->common.level * LogToLin(sndp->logtbl, sndp->common.mastervolume, LOG_LIN_BITS - 15))) >> 7;
-			sndp->common.output = sndp->common.step * sndp->common.level32;
-			sndp->common.output = SSR(sndp->common.output, 8 + 2);
-			break;
-	}
-}
-
-static Uint32 sndread(YMDELTATPCMSOUND *sndp, Uint32 a)
-{
-	return 0;
-}
-
-static void sndreset(YMDELTATPCMSOUND *sndp, Uint32 clock, Uint32 freq)
-{
-	XMEMSET(&sndp->common, 0, sizeof(sndp->common));
-	sndp->common.cps = DivFix(clock, 72 * freq, CPS_SHIFT);
-	sndp->romrambuf = (sndp->common.regs1 & 1) ? sndp->rombuf : sndp->rambuf;
-	sndp->romrammask = (sndp->common.regs1 & 1) ? sndp->rommask : sndp->rammask;
-	sndp->common.granuality = 4;
-}
-
-static void sndvolume(YMDELTATPCMSOUND *sndp, Int32 volume)
-{
-	volume = (volume << (LOG_BITS - 8)) << 1;
-	sndp->common.mastervolume = volume;
-	sndp->common.level32 = ((Int32)(sndp->common.level * LogToLin(sndp->logtbl, sndp->common.mastervolume, LOG_LIN_BITS - 15))) >> 7;
-	sndp->common.output = sndp->common.step * sndp->common.level32;
-	sndp->common.output = SSR(sndp->common.output, 8 + 2);
-}
-
-static void sndrelease(YMDELTATPCMSOUND *sndp)
-{
-	if (sndp->logtbl) sndp->logtbl->release(sndp->logtbl->ctx);
-	XFREE(sndp);
-}
-
-static void setinst(YMDELTATPCMSOUND *sndp, Uint32 n, void *p, Uint32 l)
-{
-	if (n) return;
-	if (p)
-	{
-		sndp->rombuf = (Uint8*) p;
-		sndp->rommask = l - 1;
-		sndp->romrambuf = (sndp->common.regs1 & 1) ? sndp->rombuf : sndp->rambuf;
-		sndp->romrammask = (sndp->common.regs1 & 1) ? sndp->rommask : sndp->rammask;
-	}
-	else
-	{
-		sndp->rombuf = 0;
-		sndp->rommask = 0;
-	}
-
-}
-
-KMIF_SOUND_DEVICE *YMDELTATPCMSoundAlloc(Uint32 ymdeltatpcm_type)
-{
-	Uint32 ram_size;
-	YMDELTATPCMSOUND *sndp;
-	switch (ymdeltatpcm_type)
-	{
-		case YMDELTATPCM_TYPE_Y8950:
-			ram_size = 32 * 1024;
-			break;
-		case YMDELTATPCM_TYPE_YM2608:
-			ram_size = 256 * 1024;
-			break;
-		default:
-			ram_size = 0;
-			break;
-	}
-	sndp = (YMDELTATPCMSOUND*) XMALLOC(sizeof(YMDELTATPCMSOUND) + ram_size);
-	if (!sndp) return 0;
-	sndp->ymdeltatpcm_type = ymdeltatpcm_type;
-	switch (ymdeltatpcm_type)
-	{
-		case YMDELTATPCM_TYPE_Y8950:
-			sndp->memshift = 2;
-			break;
-		case YMDELTATPCM_TYPE_YM2608:
-			/* OPNA */
-			sndp->memshift = 6;
-			break;
-		case YMDELTATPCM_TYPE_YM2610:
-			sndp->memshift = 9;
-			break;
-	}
-	sndp->kmif.ctx = sndp;
-	sndp->kmif.release = (void (*)( void* )) sndrelease;
-	sndp->kmif.synth = (int (*)( void* )) sndsynth;
-	sndp->kmif.volume = (void (*)( void*, int )) sndvolume;
-	sndp->kmif.reset = (void (*)( void*, Uint32, Uint32 )) sndreset;
-	sndp->kmif.write = (void (*)( void*, Uint32, Uint32 )) sndwrite;
-	sndp->kmif.read = (Uint32 (*)( void*, Uint32 )) sndread;
-	sndp->kmif.setinst = (void (*)( void*, Uint32, void*, Uint32 )) setinst;
-	/* RAM */
-	sndp->rambuf = ram_size ? (Uint8 *)(sndp + 1) : 0;
-	sndp->rammask = ram_size ? (ram_size - 1) : 0;
-	/* ROM */
-	sndp->rombuf = 0;
-	sndp->rommask = 0;
-	sndp->logtbl = LogTableAddRef();
-	if (!sndp->logtbl)
-	{
-		sndrelease(sndp);
-		return 0;
-	}
-	return &sndp->kmif;
-}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/s_deltat.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/s_logtbl.c Deleted

@@ -1,88 +0,0 @@
-#include "nestypes.h"
-#include "s_logtbl.h"
-
-#if STATIC_TABLES
-
-static void LogTableRelease(void *ctx)
-{
-}
-
-static KMIF_LOGTABLE log_static_tables = {
-	&log_static_tables;
-	LogTableRelease,
-#include "s_logt.h"
-};
-
-
-KMIF_LOGTABLE *LogTableAddRef(void)
-{
-	log_static_tables.release = LogTableRelease;
-	return &log_static_tables;
-}
-
-#else
-
-#include <math.h>
-
-static volatile Uint32 log_tables_mutex = 0;
-static Uint32 log_tables_refcount = 0;
-static KMIF_LOGTABLE *log_tables = 0;
-
-static void LogTableRelease(void *ctx)
-{
-	++log_tables_mutex;
-	while (log_tables_mutex != 1)
-	{
-		XSLEEP(0);
-	}
-	log_tables_refcount--;
-	if (!log_tables_refcount)
-	{
-		XFREE(ctx);
-		log_tables = 0;
-	}
-	--log_tables_mutex;
-}
-
-static void LogTableCalc(KMIF_LOGTABLE *kmif_lt)
-{
-	Uint32 i;
-	double a;
-	for (i = 0; i < (1 << LOG_BITS); i++)
-	{
-		a = (1 << LOG_LIN_BITS) / pow(2, i / (double)(1 << LOG_BITS));
-		kmif_lt->logtbli = (Uint32)a;
-	}
-	kmif_lt->lineartbl0 = LOG_LIN_BITS << LOG_BITS;
-	for (i = 1; i < (1 << LIN_BITS) + 1; i++)
-	{
-		Uint32 ua;
-		a = i << (LOG_LIN_BITS - LIN_BITS);
-		ua = (Uint32)((LOG_LIN_BITS - (log(a) / log(2))) * (1 << LOG_BITS));
-		kmif_lt->lineartbli = ua << 1;
-	}
-}
-
-KMIF_LOGTABLE *LogTableAddRef(void)
-{
-	++log_tables_mutex;
-	while (log_tables_mutex != 1)
-	{
-		XSLEEP(0);
-	}
-	if (!log_tables_refcount)
-	{
-		log_tables = (KMIF_LOGTABLE*) XMALLOC(sizeof(KMIF_LOGTABLE));
-		if (log_tables)
-		{
-			log_tables->ctx = log_tables;
-			log_tables->release = LogTableRelease;
-			LogTableCalc(log_tables);
-		}
-	}
-	if (log_tables) log_tables_refcount++;
-	--log_tables_mutex;
-	return log_tables;
-}
-
-#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/s_logtbl.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/s_opl.c Deleted

@@ -1,1244 +0,0 @@
-/*
- s_opl.c -- YM2413/Y8950/YM3526/YM3812 emulator by Mamiya, 2001.
-
- References: 
- fmopl.c -- 1999,2000 written by Tatsuyuki Satoh (MAME development).
- fmopl.c(fixed) -- 2000 modified by mamiya (NEZplug development).
- fmgen.cpp -- 1999-2001 written by cisc.
- emu2413.c -- a YM2413 emulator : written by Mitsutaka Okazaki 2001
- fmpac.ill -- 2000 created by sama. 
- fmpac.ill -- 2000 created by NARUTO. 
- fmpac.ill -- 2001 created by Okazaki. 
- YM2413 application manual
-*/
-
-#include "kmsnddev.h"
-#include "divfix.h"
-#include "s_logtbl.h"
-#include "s_opltbl.h"
-#include "s_opl.h"
-#include "s_deltat.h"
-#include <string.h>
-
-#define PG_SHIFT 10 /* fix */
-#define CPS_SHIFTE 20
-#define CPS_SHIFTP 14
-#define LFO_SHIFT 16
-
-#define OPLL_INST_WORK 0x40
-#define OPLL_INST_WORK2 (OPLL_INST_WORK + 8 * 0x13)
-
-#define AR_BITS 6 /* fix */
-#define AR_SHIFT 14 /* fix */
-#define EG_SHIFT 15 /* fix */
-
-#define AR_PHASEMAX (((1 << AR_BITS) - 1) << AR_SHIFT)
-#define EG_PHASEMAX (127 << EG_SHIFT)
-#define EG_KEYOFF (128 << EG_SHIFT)
-#define LOG_KEYOFF (31 << (LOG_BITS + 1))
-
-#if 0
- 0-48dB
- AR_BITS=6
- AR_SHIFT=14
- x = FC000h(20.7618(sec) * 3579545 / 72)cycles 63 * 4000h
- x / 3 * 4 1730.15(ms)
- x / 3 * 256 27.03(ms)
-
- EG_BITS=7
- EG_SHIFT=15
- x = 3F8000h(83.7064(sec) * 3579545 / 72)cycles 127 * 8000h
- x / 4 = 20926.6(ms)
-#endif
-
-
-#define TESTING_OPTIMIZE_AME 1
-#define USE_FBBUF 1
-
-typedef struct
-{
-	Uint32 phase;
-	Uint32 spd;
-	Uint32 rng;
-} OPL_PG;
-
-enum {
-	EG_MODE_ATTACK,
-	EG_MODE_DECAY,
-	EG_MODE_SUSTINE,
-	EG_MODE_RELEASE,
-	EG_MODE_NUM,
-	EG_MODE_SUSHOLD,
-	EG_MODE_OFF = EG_MODE_NUM
-};
-
-typedef struct
-{
-	Uint32 phasear;
-	Uint32 phase;
-	Uint32 spd EG_MODE_NUM;
-	Uint32 dr_phasemax;
-	Uint8 mode;
-	Uint8 pad4_1;
-	Uint8 pad4_2;
-	Uint8 pad4_3;
-} OPL_EG;
-
-enum
-{
-	FLAG_AME = (1 << 0),
-	FLAG_PME = (1 << 1),
-	FLAG_EGT = (1 << 2),
-	FLAG_KSR = (1 << 3)
-};
-
-typedef struct
-{
-	OPL_PG pg;
-	OPL_EG eg;
-	Int32 input;
-#if USE_FBBUF
-	Int32 fbbuf;
-#endif
-#if TESTING_OPTIMIZE_AME
-	Uint32* amin;
-#endif
-	Uint32 tl_ofs;
-	Uint32* sintable;
-
-	Uint8 modcar; /* 1:m 0:c */
-	Uint8 fb;
-	Uint8 lvl;
-	Uint8 nst;
-
-	Uint8 tll;
-	Uint8 key;
-	Uint8 rkey;
-	Uint8 prevkey;
-
-	Uint8 enable;
-	Uint8 __enablehold__;
-	Uint8 flag;
-	Uint8 ksr;
-
-	Uint8 mul;
-	Uint8 ksl;
-	Uint8 ar;
-	Uint8 dr;
-	Uint8 sl;
-	Uint8 rr;
-	Uint8 tl;
-	Uint8 wf;
-} OPL_OP;
-
-typedef struct
-{
-	OPL_OP op 2;
-	Uint8 con;
-	Uint8 freql;
-	Uint8 freqh;
-	Uint8 blk;
-	Uint8 kcode;
-	Uint8 sus;
-	Uint8 ksb;
-	Uint8 pad4_3;
-} OPL_CH;
-
-enum
-{
-	LFO_UNIT_AM,
-	LFO_UNIT_PM,
-	LFO_UNIT_NUM
-};
-
-typedef struct
-{
-	Uint32 output;
-	Uint32 cnt;
-	Uint32 sps; /* step per sample */
-	Uint32 adr;
-	Uint32 adrmask;
-	Uint32* table;
-} OPL_LFO;
-
-typedef struct
-{
-	KMIF_SOUND_DEVICE kmif;
-	KMIF_SOUND_DEVICE* deltatpcm;
-	KMIF_LOGTABLE* logtbl;
-	KMIF_OPLTABLE* opltbl;
-	OPL_CH ch 9;
-	OPL_LFO lfo LFO_UNIT_NUM;
-	struct OPLSOUND_COMMON_TAG
-	{
-		Uint32 cpsp;
-		Uint32 cnt;
-		Uint32* ar_table;
-		Uint32* tll2logtbl;
-#if TESTING_OPTIMIZE_AME
-		Uint32 amzero;
-#endif
-		Int32 mastervolume;
-		Uint32 sintablemask;
-		Uint32 ratetbla 4;
-		Uint32 ratetbl 4;
-		Uint8 adr;
-		Uint8 wfe;
-		Uint8 rc;
-		Uint8 rmode;
-		Uint8 enable;
-	} common;
-	Uint8 regs 0x100;
-	Uint8 opl_type;
-} OPLSOUND;
-
-static Uint8 romtone 3 16 * 19 =
-{
-	{
-#include "i_fmpac.h"
-	},
-	{
-#include "i_fmunit.h"
-	},
-	{
-#include "i_vrc7.h"
-	},
-};
-
-static void SetOpOff(OPL_OP* opp )
-{
-	opp->eg.mode = EG_MODE_OFF;
-	opp->eg.phase = EG_KEYOFF;
-	opp->enable = 0;
-}
-
-inline static void EgStep( OPLSOUND* sndp, OPL_OP* opp )
-{
-	switch ( opp->eg.mode )
-	{
-	default:
-		NEVER_REACH
-	
-	case EG_MODE_ATTACK:
-		opp->eg.phase = sndp->common.ar_table opp->eg.phasear >> (AR_SHIFT + AR_BITS - ARTBL_BITS) >> (ARTBL_SHIFT - EG_SHIFT);
-		opp->eg.phasear += opp->eg.spd EG_MODE_ATTACK;
-		if ( opp->eg.phasear >= AR_PHASEMAX )
-		{
-			opp->eg.mode = EG_MODE_DECAY;
-			opp->eg.phase = 0;
-		}
-		break;
-	
-	case EG_MODE_DECAY:
-		opp->eg.phase += opp->eg.spd EG_MODE_DECAY;
-		if ( opp->eg.phase >= opp->eg.dr_phasemax )
-		{
-			opp->eg.phase = opp->eg.dr_phasemax;
-			opp->eg.mode = (opp->flag & FLAG_EGT) ? EG_MODE_SUSHOLD : EG_MODE_SUSTINE;
-		}
-		break;
-	
-	case EG_MODE_SUSTINE:
-	case EG_MODE_RELEASE:
-		opp->eg.phase += opp->eg.spd opp->eg.mode;
-		if ( opp->eg.phase >= EG_PHASEMAX )
-			SetOpOff(opp);
-		break;
-	
-	case EG_MODE_SUSHOLD:
-	case EG_MODE_OFF:
-		break;
-	}
-}
-
-static void OpStep( OPLSOUND* sndp, OPL_OP* opp )
-{
-	int step;
-	EgStep(sndp, opp);
-	step = opp->pg.spd;
-	if ( opp->flag & FLAG_PME )
-		step = (step * sndp->lfo LFO_UNIT_PM.output) >> PM_SHIFT;
-	opp->pg.phase += step;
-}
-
-__inline static void OpStepNG( OPLSOUND* sndp, OPL_OP* opp )
-{
-	Uint32 step;
-	EgStep(sndp, opp);
-	opp->pg.phase += opp->pg.spd;
-	step = opp->pg.phase >> opp->nst/*(PG_SHIFT + 5)*/;
-	opp->pg.phase &= (1 << opp->nst/*(PG_SHIFT + 5)*/) - 1;
-	while ( step-- )
-	{
-		opp->pg.rng ^= ((opp->pg.rng & 1) << 16) + ((opp->pg.rng & 1) << 13);
-		opp->pg.rng >>= 1;
-	}
-}
-
-#if -1 >> 1 == -1
-/* RIGHT SHIFT IS SIGNED */
-#define SSR(x, y) ((Int32)(x) >> (y))
-#else
-/* RIGHT SHIFT IS UNSIGNED */
-#define SSR(x, y) (((x) >= 0) ? ((x) >> (y)) : (-((-(x) - 1) >> (y)) - 1))
-#endif
-
-
-inline static void OpSynthMod( OPLSOUND* sndp, OPL_OP* opp )
-{
-	if ( opp->enable )
-	{
-		Uint32 tll;
-		Int32 output;
-		OpStep(sndp, opp);
-		tll = opp->tll + (opp->eg.phase >> EG_SHIFT);
-		tll = (tll >= (1 << TLLTBL_BITS)) ? LOG_KEYOFF : sndp->common.tll2logtbl tll;
-		tll += opp->tl_ofs;
-#if TESTING_OPTIMIZE_AME
-		tll += *opp->amin;
-#else
-		if ( opp->flag & FLAG_AME )
-			tll += sndp->lfo LFO_UNIT_AM.output;
-#endif
-		tll += opp->sintable sndp->common.sintablemask & (opp->input + (opp->pg.phase >> PG_SHIFT));
-		output = LogToLin(sndp->logtbl, tll, -8 + ((LOG_LIN_BITS + 1) - (SINTBL_BITS + 2)));
-		if ( opp->fb )
-		{
-#if USE_FBBUF
-			Int32 fbtmp;
-			fbtmp = opp->fbbuf + output;
-			opp->fbbuf = output;
-			opp->input = SSR(fbtmp, (9 - opp->fb));
-#else
-			opp->input = SSR(output, (8 - opp->fb));
-#endif
-		}
-		opp 1.input = output;
-	}
-}
-
-inline static Int32 OpSynthCarFb( OPLSOUND* sndp, OPL_OP* opp )
-{
-	if ( opp->enable )
-	{
-		Uint32 tll;
-		OpStep(sndp, opp);
-		tll = opp->tll + (opp->eg.phase >> EG_SHIFT);
-		tll = (tll >= (1 << TLLTBL_BITS)) ? LOG_KEYOFF : sndp->common.tll2logtbl tll;
-		tll += opp->tl_ofs;
-#if TESTING_OPTIMIZE_AME
-		tll +=* opp->amin;
-#else
-		if ( opp->flag & FLAG_AME) tll += sndp->lfo LFO_UNIT_AM.output;
-#endif
-		tll += opp->sintable sndp->common.sintablemask & (opp->input + (opp->pg.phase >> PG_SHIFT));
-		if ( opp->fb )
-		{
-#if USE_FBBUF
-			Int32 output, fbtmp;
-			output = LogToLin(sndp->logtbl, tll, -8 + ((LOG_LIN_BITS + 1) - (SINTBL_BITS + 2)));
-			fbtmp = opp->fbbuf + output;
-			opp->fbbuf = output;
-			opp->input = SSR(fbtmp, (9 - opp->fb));
-#else
-			Int32 output;
-			output = LogToLin(sndp->logtbl, tll, -8 + ((LOG_LIN_BITS + 1) - (SINTBL_BITS + 2)));
-			opp->input = SSR(output, (8 - opp->fb));
-#endif
-		}
-		return LogToLin(sndp->logtbl, tll + sndp->common.mastervolume, -8 + LOG_LIN_BITS - 19 - opp->lvl);
-	}
-	return 0;
-}
-
-inline static Int32 OpSynthCar( OPLSOUND* sndp, OPL_OP* opp )
-{
-	if ( opp->enable )
-	{
-		Uint32 tll;
-		OpStep(sndp, opp);
-		tll = opp->tll + (opp->eg.phase >> EG_SHIFT);
-		tll = (tll >= (1 << TLLTBL_BITS)) ? LOG_KEYOFF : sndp->common.tll2logtbl tll;
-		tll += opp->tl_ofs;
-#if TESTING_OPTIMIZE_AME
-		tll += *opp->amin;
-#else
-		if ( opp->flag & FLAG_AME )
-			tll += sndp->lfo LFO_UNIT_AM.output;
-#endif
-		tll += opp->sintable sndp->common.sintablemask & (opp->input + (opp->pg.phase >> PG_SHIFT));
-		return LogToLin(sndp->logtbl, tll + sndp->common.mastervolume, -8 + LOG_LIN_BITS - 19 - opp->lvl);
-	}
-	return 0;
-}
-
-inline static Int32 OpSynthTom( OPLSOUND* sndp, OPL_OP* opp )
-{
-	if ( opp->enable )
-	{
-		Uint32 tll;
-		OpStep(sndp, opp);
-		tll = opp->tll + (opp->eg.phase >> EG_SHIFT);
-		tll = (tll >= 128 - 16) ? LOG_KEYOFF : sndp->common.tll2logtbl tll;
-		tll += opp->tl_ofs;
-		tll += opp->sintable sndp->common.sintablemask & (opp->pg.phase >> PG_SHIFT);
-		return LogToLin(sndp->logtbl, tll + sndp->common.mastervolume, -8 + LOG_LIN_BITS - 19 - opp->lvl);
-	}
-	return 0;
-}
-
-
-static Int32 OpSynthRym( OPLSOUND* sndp, OPL_OP* opp )
-{
-	if ( opp->enable )
-	{
-		Uint32 tll;
-		OpStepNG(sndp, opp);
-		tll = opp->tll + (opp->eg.phase >> EG_SHIFT) + 0x10/* +6dB */;
-		tll = (tll >= (1 << TLLTBL_BITS)) ? LOG_KEYOFF : sndp->common.tll2logtbl tll;
-		tll += opp->tl_ofs;
-		tll += (opp->pg.rng & 1);
-		return LogToLin(sndp->logtbl, tll + sndp->common.mastervolume, -8 + LOG_LIN_BITS - 19 - opp->lvl);
-	}
-	return 0;
-}
-
-inline static void LfoStep(OPL_LFO* lfop )
-{
-	lfop->cnt += lfop->sps;
-	lfop->adr += lfop->cnt >> LFO_SHIFT;
-	lfop->cnt &= (1 << LFO_SHIFT) - 1;
-	lfop->output = lfop->table lfop->adr & lfop->adrmask;
-}
-
-static int sndsynth( OPLSOUND* sndp )
-{
-	Int32 accum = 0;
-	if ( sndp->common.enable )
-	{
-		Uint32 i, rch;
-		for ( i = 0; i < LFO_UNIT_NUM; i++ )
-			LfoStep(&sndp->lfo i);
-		
-		rch = sndp->common.rmode ? 7 : 9;
-		for ( i = 0; i < rch; i++ )
-		{
-			if ( sndp->ch i.op 0.modcar )
-				OpSynthMod(sndp, &sndp->ch i.op 0);
-			else
-				accum += OpSynthCarFb(sndp, &sndp->ch i.op 0);
-			accum += OpSynthCar(sndp, &sndp->ch i.op 1);
-		}
-		if ( sndp->common.rmode )
-		{
-			accum += OpSynthRym(sndp, &sndp->ch 7.op 0);
-			accum += OpSynthRym(sndp, &sndp->ch 7.op 1);
-			accum += OpSynthTom(sndp, &sndp->ch 8.op 0);
-			accum += OpSynthRym(sndp, &sndp->ch 8.op 1);
-		}
-	}
-	if ( sndp->deltatpcm )
-	{
-		accum += sndp->deltatpcm->synth(sndp->deltatpcm->ctx);
-	}
-#if 0
-	/* NISE DAC */
-	if ( accum >= 0 )
-		accum = (Int32)(((Uint32) accum) & (((1 << 8) - 1) << (23 - 8)));
-	else
-		accum = -(Int32)(((Uint32)-accum) & (((1 << 8) - 1) << (23 - 8)));
-#endif
-	return accum;
-}
-
-static void sndvolume( OPLSOUND* sndp, Int32 volume )
-{
-	if ( sndp->deltatpcm) sndp->deltatpcm->volume(sndp->deltatpcm->ctx, volume);
-	volume = (volume << (LOG_BITS - 8)) << 1;
-	sndp->common.mastervolume = volume;
-}
-
-const static Uint8 op_table 0x20=
-{
-	 0, 2, 4, 1, 3, 5,0xFF,0xFF,
-	 6, 8, 10, 7, 9, 11,0xFF,0xFF,
-	 12, 14, 16, 13, 15, 17,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-const static Uint8 mul_table 0x10=
-{
-	 1+0, 2+0, 4+0, 2+4, 8+0, 8+2, 8+4,16-2,
-	16+0,16+2,16+4,16+4,16+8,16+8,32-2,32-2,
-};
-
-#define DB2TLL(x) (x * 2 / 375 )
-const static Uint8 ksl_table 8 16=
-{
-	{
-		DB2TLL( 0), DB2TLL( 0), DB2TLL( 0), DB2TLL( 0),
-		DB2TLL( 0), DB2TLL( 0), DB2TLL( 0), DB2TLL( 0),
-		DB2TLL( 0), DB2TLL( 0), DB2TLL( 0), DB2TLL( 0),
-		DB2TLL( 0), DB2TLL( 0), DB2TLL( 0), DB2TLL( 0),
-	},{
-		DB2TLL( 0), DB2TLL( 0), DB2TLL( 0), DB2TLL( 0),
-		DB2TLL( 0), DB2TLL( 0), DB2TLL( 0), DB2TLL( 0),
-		DB2TLL( 0), DB2TLL( 750), DB2TLL( 1125), DB2TLL( 1500),
-		DB2TLL( 1875), DB2TLL( 2250), DB2TLL( 2625), DB2TLL( 3000),
-	},{
-		DB2TLL( 0), DB2TLL( 0), DB2TLL( 0), DB2TLL( 0),
-		DB2TLL( 0), DB2TLL( 1125), DB2TLL( 1875), DB2TLL( 2625),
-		DB2TLL( 3000), DB2TLL( 3750), DB2TLL( 4125), DB2TLL( 4500),
-		DB2TLL( 4875), DB2TLL( 5250), DB2TLL( 5625), DB2TLL( 6000),
-	},{
-		DB2TLL( 0), DB2TLL( 0), DB2TLL( 0), DB2TLL( 1875),
-		DB2TLL( 3000), DB2TLL( 4125), DB2TLL( 4875), DB2TLL( 5625),
-		DB2TLL( 6000), DB2TLL( 6750), DB2TLL( 7125), DB2TLL( 7500),
-		DB2TLL( 7875), DB2TLL( 8250), DB2TLL( 8625), DB2TLL( 9000),
-	},{
-		DB2TLL( 0), DB2TLL( 0), DB2TLL( 3000), DB2TLL( 4875),
-		DB2TLL( 6000), DB2TLL( 7125), DB2TLL( 7875), DB2TLL( 8625),
-		DB2TLL( 9000), DB2TLL( 9750), DB2TLL(10125), DB2TLL(10500),
-		DB2TLL(10875), DB2TLL(11250), DB2TLL(11625), DB2TLL(12000),
-	},{
-		DB2TLL( 0), DB2TLL( 3000), DB2TLL( 6000), DB2TLL( 7875),
-		DB2TLL( 9000), DB2TLL(10125), DB2TLL(10875), DB2TLL(11625),
-		DB2TLL(12000), DB2TLL(12750), DB2TLL(13125), DB2TLL(13500),
-		DB2TLL(13875), DB2TLL(14250), DB2TLL(14625), DB2TLL(15000),
-	},{
-		DB2TLL( 0), DB2TLL( 6000), DB2TLL( 9000), DB2TLL(10875),
-		DB2TLL(12000), DB2TLL(13125), DB2TLL(13875), DB2TLL(14625),
-		DB2TLL(15000), DB2TLL(15750), DB2TLL(16125), DB2TLL(16500),
-		DB2TLL(16875), DB2TLL(17250), DB2TLL(17625), DB2TLL(18000),
-	},{
-		DB2TLL( 0), DB2TLL( 9000), DB2TLL(12000), DB2TLL(13875),
-		DB2TLL(15000), DB2TLL(16125), DB2TLL(16875), DB2TLL(17625),
-		DB2TLL(18000), DB2TLL(18750), DB2TLL(19125), DB2TLL(19500),
-		DB2TLL(19875), DB2TLL(20250), DB2TLL(20625), DB2TLL(21000),
-	}
-};
-#undef DB2TLL
-
-static Uint32 rateconvAR( OPLSOUND* sndp, Uint32 rrr, Uint32 ksr )
-{
-	if ( !rrr )
-		return 0;
-	rrr = rrr + (ksr >> 2);
-	if ( rrr >= 15)
-		return AR_PHASEMAX;
-	return sndp->common.ratetbla ksr & 3 >> (CPS_SHIFTE + 1 - rrr);
-}
-
-static Uint32 rateconv( OPLSOUND* sndp, Uint32 rrr, Uint32 ksr )
-{
-	if ( !rrr )
-		return 0;
-	rrr = rrr + (ksr >> 2);
-	if ( rrr > 15 )
-		rrr = 15;
-	return sndp->common.ratetbl ksr & 3 >> (CPS_SHIFTE + 1 - rrr);
-}
-
-static void OpUpdateWF( OPLSOUND* sndp, OPL_OP* opp )
-{
-	opp->sintable = sndp->opltbl->sin_table opp->wf & sndp->common.wfe;
-}
-
-static void OpUpdatePG( OPLSOUND* sndp, OPL_CH* chp, OPL_OP* opp )
-{
-	opp->pg.spd = (((chp->freqh << 8) + chp->freql) * opp->mul * sndp->common.cpsp) >> (CPS_SHIFTP - chp->blk);
-}
-
-static void OpUpdateEG( OPLSOUND* sndp, OPL_CH* chp, OPL_OP* opp )
-{
-	Uint32 sr, rr;
-	opp->ksr = chp->kcode >> ((opp->flag & FLAG_KSR) ? 0 : 2);
-	opp->eg.dr_phasemax = opp->sl << (1 + 2 + EG_SHIFT); /* 3dB->eg */
-	opp->eg.spd EG_MODE_ATTACK = rateconvAR(sndp, opp->ar, opp->ksr);
-	opp->eg.spd EG_MODE_DECAY = rateconv(sndp, opp->dr, opp->ksr);
-	if ( opp->flag & FLAG_EGT )
-	{
-		if ( opp->eg.mode == EG_MODE_SUSTINE )
-			opp->eg.mode = EG_MODE_SUSHOLD;
-		sr = 0;
-		rr = opp->rr;
-	}
-	else
-	{
-		if ( opp->eg.mode == EG_MODE_SUSHOLD )
-			opp->eg.mode = EG_MODE_SUSTINE;
-		sr = opp->rr;
-		rr = 7;
-	}
-	if ( chp->sus )
-	{
-		rr = 5;
-	}
-	opp->eg.spd EG_MODE_SUSTINE = rateconv(sndp, sr, opp->ksr);
-	opp->eg.spd EG_MODE_RELEASE = rateconv(sndp, rr, opp->ksr);
-}
-
-static void OpUpdateTLL( OPLSOUND* sndp, OPL_CH* chp, OPL_OP* opp )
-{
-	opp->tll = (opp->tl + (chp->ksb >> opp->ksl)) << 1;
-}
-
-
-
-static void oplsetopmul( OPLSOUND* sndp, OPL_CH* chp, OPL_OP* opp, Uint32 v )
-{
-	opp->flag &= ~(FLAG_AME | FLAG_PME | FLAG_EGT | FLAG_KSR);
-#if TESTING_OPTIMIZE_AME
-	if ( v & 0x80 )
-		opp->amin = &sndp->lfo LFO_UNIT_AM.output; else opp->amin = &sndp->common.amzero;
-#else
-	if ( v & 0x80 )
-		opp->flag |= FLAG_AME;
-#endif
-	if ( v & 0x40 ) opp->flag |= FLAG_PME;
-	if ( v & 0x20 ) opp->flag |= FLAG_EGT;
-	if ( v & 0x10 ) opp->flag |= FLAG_KSR;
-	opp->mul = mul_table v & 0x0F;
-	OpUpdateEG(sndp, chp, opp);
-	OpUpdatePG(sndp, chp, opp);
-}
-
-static void oplsetopkstl( OPLSOUND* sndp, OPL_CH* chp, OPL_OP* opp, Uint32 v )
-{
-	opp->ksl = (v >> 6) ? (3 - (v >> 6)) : 15; /* 0 / 1.5 / 3 / 6 db/OCT */
-	opp->tl = v & 0x3F; /* 0.75 db */
-	OpUpdateTLL(sndp, chp, opp);
-}
-
-static void oplsetopardr( OPLSOUND* sndp, OPL_CH* chp, OPL_OP* opp, Uint32 v )
-{
-	opp->ar = v >> 4;
-	opp->dr = v & 0xF;
-	OpUpdateEG(sndp, chp, opp);
-}
-
-static void oplsetopslrr( OPLSOUND* sndp, OPL_CH* chp, OPL_OP* opp, Uint32 v )
-{
-	opp->sl = v >> 4;
-	opp->rr = v & 0xF;
-	OpUpdateEG(sndp, chp, opp);
-}
-
-static void oplsetopwf( OPLSOUND* sndp, OPL_CH* chp, OPL_OP* opp, Uint32 v )
-{
-	opp->wf = v & 0x3;
-	OpUpdateWF(sndp, opp);
-}
-
-static void oplsetopkey( OPLSOUND* sndp, OPL_OP* opp )
-{
-	Uint8 nextkey = ((sndp->common.rmode) && opp->rkey) || opp->key;
-	if ( opp->prevkey ^ nextkey )
-	{
-		opp->prevkey = nextkey;
-		if ( nextkey )
-		{
-			sndp->common.enable = 1;
-			opp->eg.mode = EG_MODE_ATTACK;
-			opp->eg.phase = EG_KEYOFF;
-			opp->enable = 1;
-			opp->eg.phasear = 0;
-		}
-		else if ( !opp->modcar && opp->eg.mode != EG_MODE_OFF )
-			opp->eg.mode = EG_MODE_RELEASE;
-	}
-}
-
-static void oplsetchfreql( OPLSOUND* sndp, OPL_CH* chp, Uint32 v )
-{
-	chp->freql = v & 0xFF;
-	chp->ksb = ksl_table chp->blk (chp->freqh << 2) + (chp->freql >> 6);
-	OpUpdatePG(sndp, chp, &chp->op 0);
-	OpUpdatePG(sndp, chp, &chp->op 1);
-	OpUpdateTLL(sndp, chp, &chp->op 0);
-	OpUpdateTLL(sndp, chp, &chp->op 1);
-}
-
-static void oplsetchfreqh( OPLSOUND* sndp, OPL_CH* chp, Uint32 v )
-{
-	Uint32 key = v & 0x20;
-	chp->kcode = (v >> 1) & 15;
-	chp->freqh = v & 3;
-	chp->blk = (v >> 2) & 7;
-	chp->op 0.key = chp->op 1.key = key;
-	oplsetopkey(sndp, &chp->op 0);
-	oplsetopkey(sndp, &chp->op 1);
-	chp->sus = 0;
-	chp->ksb = ksl_table chp->blk (chp->freqh << 2) + (chp->freql >> 6);
-	OpUpdateEG(sndp, chp, &chp->op 0);
-	OpUpdateEG(sndp, chp, &chp->op 1);
-	OpUpdatePG(sndp, chp, &chp->op 0);
-	OpUpdatePG(sndp, chp, &chp->op 1);
-	OpUpdateTLL(sndp, chp, &chp->op 0);
-	OpUpdateTLL(sndp, chp, &chp->op 1);
-}
-
-static void oplsetchfbcon( OPLSOUND* sndp, OPL_CH* chp, Uint32 v )
-{
-	chp->op 0.fb = (v >> 1) & 7;
-#if USE_FBBUF
-	chp->op 0.fbbuf = 0;
-#endif
-	chp->con = v & 1;
-	chp->op 0.modcar = (chp->con) ? 0 : 1;
-	OpUpdateEG(sndp, chp, &chp->op 0);
-	chp->op 1.input = 0;
-}
-
-static void opllsetopvolume( OPLSOUND* sndp, OPL_CH* chp, OPL_OP* opp, Uint32 v )
-{
-	opp->tl = v;
-	OpUpdateTLL(sndp, chp, opp);
-}
-
-static void opllsetchfreql( OPLSOUND* sndp, OPL_CH* chp, Uint32 v )
-{
-	chp->freql = v & 0xFF;
-	chp->ksb = ksl_table chp->blk (chp->freqh << 3) + (chp->freql >> 5);
-	OpUpdatePG(sndp, chp, &chp->op 0);
-	OpUpdatePG(sndp, chp, &chp->op 1);
-	OpUpdateTLL(sndp, chp, &chp->op 0);
-	OpUpdateTLL(sndp, chp, &chp->op 1);
-}
-
-static void opllsetchfreqh( OPLSOUND* sndp, OPL_CH* chp, Uint32 v )
-{
-	Uint32 key = v & 0x10;
-	chp->kcode = v & 15;
-	chp->freqh = v & 1;
-	chp->blk = (v >> 1) & 7;
-	chp->op 0.key = chp->op 1.key = key;
-	oplsetopkey(sndp, &chp->op 0);
-	oplsetopkey(sndp, &chp->op 1);
-	chp->sus = v & 0x20;
-	chp->ksb = ksl_table chp->blk (chp->freqh << 3) + (chp->freql >> 5);
-	OpUpdateEG(sndp, chp, &chp->op 0);
-	OpUpdateEG(sndp, chp, &chp->op 1);
-	OpUpdatePG(sndp, chp, &chp->op 0);
-	OpUpdatePG(sndp, chp, &chp->op 1);
-	OpUpdateTLL(sndp, chp, &chp->op 0);
-	OpUpdateTLL(sndp, chp, &chp->op 1);
-}
-
-static void SetOpTone( OPLSOUND* sndp, OPL_OP* opp, Uint8* tonep )
-{
-	opp->flag &= ~(FLAG_AME | FLAG_PME | FLAG_EGT | FLAG_KSR);
-#if TESTING_OPTIMIZE_AME
-	if ( tonep 0 & 0x80 ) opp->amin = &sndp->lfo LFO_UNIT_AM.output; else opp->amin = &sndp->common.amzero;
-#else
-	if ( tonep 0 & 0x80 ) opp->flag |= FLAG_AME;
-#endif
-	if ( tonep 0 & 0x40 ) opp->flag |= FLAG_PME;
-	if ( tonep 0 & 0x20 ) opp->flag |= FLAG_EGT;
-	if ( tonep 0 & 0x10 ) opp->flag |= FLAG_KSR;
-	opp->mul = mul_table tonep 0 & 0x0F << 1;
-	opp->ksl = (tonep 2 >> 6) ? (3 - (tonep 2 >> 6)) : 15;
-	opp->ar = tonep 4 >> 4;
-	opp->dr = tonep 4 & 0xF;
-	opp->sl = tonep 6 >> 4;
-	opp->rr = tonep 6 & 0xF;
-}
-static void SetChTone( OPLSOUND* sndp, OPL_CH* chp, Uint8* tonep, Uint8* tlofsp )
-{
-	Uint32 op;
-	for ( op = 0; op < 2; op++ )
-		SetOpTone(sndp, &chp->op op, &tonep op);
-	chp->op 0.tl_ofs = (tlofsp 0 ^ 0x80) << (LOG_BITS - 4 + 1);
-	chp->op 1.tl_ofs = (tlofsp 1 ^ 0x80) << (LOG_BITS - 4 + 1);
-	chp->op 0.tl = tonep 2 & 0x3F;
-	chp->op 0.fb = tonep 3 & 0x7;
-	chp->op 0.wf = (tonep 3 >> 3) & 1;
-	chp->op 1.wf = (tonep 3 >> 4) & 1;
-#if USE_FBBUF
-	chp->op 0.fbbuf = 0;
-#endif
-	chp->op 1.input = 0;
-	OpUpdateWF(sndp, &chp->op 0);
-	OpUpdateWF(sndp, &chp->op 1);
-	OpUpdateEG(sndp, chp, &chp->op 0);
-	OpUpdateEG(sndp, chp, &chp->op 1);
-	OpUpdatePG(sndp, chp, &chp->op 0);
-	OpUpdatePG(sndp, chp, &chp->op 1);
-	OpUpdateTLL(sndp, chp, &chp->op 0);
-	OpUpdateTLL(sndp, chp, &chp->op 1);
-}
-
-static void opllsetchtone( OPLSOUND* sndp, OPL_CH* chp, Uint32 tone )
-{
-	SetChTone(sndp, chp, &sndp->regs OPLL_INST_WORK + (tone << 3), &sndp->regs OPLL_INST_WORK2 + (tone << 1) + 0);
-}
-
-static void recovercon( OPLSOUND* sndp, OPL_CH* chp )
-{
-	chp->op 0.modcar = (chp->con) ? 0 : 1;
-	chp->op 0.lvl = chp->con ? 1 : 0;
-	chp->op 1.lvl = 1;
-	OpUpdateEG(sndp, chp, &chp->op 0);
-	chp->op 1.input = 0;
-}
-
-static void initrc_common( OPLSOUND* sndp, Uint32 rmode )
-{
-	if ( rmode )
-	{
-		/* BD */
-		sndp->ch 6.op 0.modcar = 1;
-		sndp->ch 6.op 0.lvl = 0;
-		OpUpdateEG(sndp, &sndp->ch 6, &sndp->ch 6.op 0);
-		sndp->ch 6.op 1.input = 0;
-		sndp->ch 6.op 1.lvl = 2;
-		/* CYM */
-		sndp->ch 7.op 0.modcar = 0;
-		sndp->ch 7.op 0.lvl = 1;
-		OpUpdateEG(sndp, &sndp->ch 7, &sndp->ch 7.op 0);
-		/* SD */
-		sndp->ch 7.op 1.input = 0;
-		sndp->ch 7.op 1.lvl = 2;
-		/* TOM */
-		sndp->ch 8.op 0.modcar = 0;
-		sndp->ch 8.op 0.lvl = 2;
-		OpUpdateEG(sndp, &sndp->ch 8, &sndp->ch 8.op 0);
-		/* HH */
-		sndp->ch 8.op 1.input = 0;
-		sndp->ch 8.op 1.lvl = 1;
-	}
-	else
-	{
-		recovercon(sndp, &sndp->ch 6);
-		if ( !sndp->ch 6.op 0.key ) SetOpOff(&sndp->ch 6.op 0);
-		if ( !sndp->ch 6.op 1.key ) SetOpOff(&sndp->ch 6.op 1);
-		recovercon(sndp, &sndp->ch 7);
-		if ( !sndp->ch 7.op 0.key ) SetOpOff(&sndp->ch 7.op 0);
-		if ( !sndp->ch 7.op 1.key ) SetOpOff(&sndp->ch 7.op 1);
-		recovercon(sndp, &sndp->ch 8);
-		if ( !sndp->ch 8.op 0.key ) SetOpOff(&sndp->ch 8.op 0);
-		if ( !sndp->ch 8.op 1.key ) SetOpOff(&sndp->ch 8.op 1);
-	}
-}
-
-static void oplsetrc( OPLSOUND* sndp, Uint32 rc )
-{
-	sndp->lfo LFO_UNIT_AM.table = (rc & 0x80) ? sndp->opltbl->am_table1 : sndp->opltbl->am_table2;
-	sndp->lfo LFO_UNIT_PM.table = (rc & 0x40) ? sndp->opltbl->pm_table1 : sndp->opltbl->pm_table2;
-	if ( (sndp->common.rmode ^ rc) & 0x20 )
-	{
-		if ( rc & 0x20 )
-		{
-#if 0
-			static Uint8 volini 2 = { 0, 0 };
-			static Uint8 bdtone 8 = { 0x04, 0x20, 0x28, 0x00, 0xDF, 0xF8, 0xFF, 0xF8 };
-			SetChTone(sndp, &sndp->ch 6, bdtone, volini);
-			SetChTone(sndp, &sndp->ch 7, &romtone 0 0x11 << 4, volini);
-			SetChTone(sndp, &sndp->ch 8, &romtone 0 0x12 << 4, volini);
-#endif
-			sndp->ch 7.op 0.nst = PG_SHIFT + 4;
-			sndp->ch 7.op 1.nst = PG_SHIFT + 6;
-			sndp->ch 8.op 1.nst = PG_SHIFT + 5;
-		}
-		initrc_common(sndp, rc & 0x20);
-	}
-	sndp->common.rmode = rc & 0x20;
-	sndp->common.rc = rc & 0x1F;
-	/* BD */
-	sndp->ch 6.op 0.rkey = sndp->ch 6.op 1.rkey = rc & 0x10;
-	oplsetopkey(sndp, &sndp->ch 6.op 0);
-	oplsetopkey(sndp, &sndp->ch 6.op 1);
-	/* CYM */
-	sndp->ch 7.op 0.rkey = rc & 0x01;
-	oplsetopkey(sndp, &sndp->ch 7.op 0);
-	/* SD */
-	sndp->ch 7.op 1.rkey = rc & 0x08;
-	oplsetopkey(sndp, &sndp->ch 7.op 1);
-	/* TOM */
-	sndp->ch 8.op 0.rkey = rc & 0x04;
-	oplsetopkey(sndp, &sndp->ch 8.op 0);
-	/* HH */
-	sndp->ch 8.op 1.rkey = rc & 0x02;
-	oplsetopkey(sndp, &sndp->ch 8.op 1);
-}
-
-static void opllsetrc( OPLSOUND* sndp, Uint32 rc )
-{
-	if ( (sndp->common.rmode ^ rc) & 0x20 )
-	{
-		if ( rc & 0x20 )
-		{
-			opllsetchtone(sndp, &sndp->ch 6, 0x10);
-			opllsetchtone(sndp, &sndp->ch 7, 0x11);
-			opllsetchtone(sndp, &sndp->ch 8, 0x12);
-			opllsetopvolume(sndp, &sndp->ch 7, &sndp->ch 7.op 0, (sndp->regs 0x37 & 0xF0) >> 2);
-			opllsetopvolume(sndp, &sndp->ch 8, &sndp->ch 8.op 0, (sndp->regs 0x38 & 0xF0) >> 2);
-			sndp->ch 7.op 0.nst = PG_SHIFT + 5;
-			sndp->ch 7.op 1.nst = PG_SHIFT + 5;
-			sndp->ch 8.op 1.nst = PG_SHIFT + 5;
-		}
-		else
-		{
-			opllsetchtone(sndp, &sndp->ch 6, sndp->regs 0x36>>4);
-			opllsetchtone(sndp, &sndp->ch 7, sndp->regs 0x37>>4);
-			opllsetchtone(sndp, &sndp->ch 8, sndp->regs 0x38>>4);
-		}
-		initrc_common(sndp, rc & 0x20);
-	}
-	sndp->common.rmode = rc & 0x20;
-	sndp->common.rc = rc & 0x1F;
-	/* BD */
-	sndp->ch 6.op 0.rkey = sndp->ch 6.op 1.rkey = rc & 0x10;
-	oplsetopkey(sndp, &sndp->ch 6.op 0);
-	oplsetopkey(sndp, &sndp->ch 6.op 1);
-	/* CYM */
-	sndp->ch 7.op 0.rkey = rc & 0x01;
-	oplsetopkey(sndp, &sndp->ch 7.op 0);
-	/* SD */
-	sndp->ch 7.op 1.rkey = rc & 0x08;
-	oplsetopkey(sndp, &sndp->ch 7.op 1);
-	/* TOM */
-	sndp->ch 8.op 0.rkey = rc & 0x04;
-	oplsetopkey(sndp, &sndp->ch 8.op 0);
-	/* HH */
-	sndp->ch 8.op 1.rkey = rc & 0x02;
-	oplsetopkey(sndp, &sndp->ch 8.op 1);
-}
-
-#define OPLSETOP(func) { \
-	Uint32 op = op_table a & 0x1F; \
-	if ( op != 0xFF) func(sndp, &sndp->ch op >> 1, &sndp->ch op >> 1.op op & 1, v); \
-}
-
-__inline static void oplwritereg( OPLSOUND* sndp, Uint32 a, Uint32 v )
-{
-	switch ( a >> 5 )
-	{
-	default:
-		NEVER_REACH
-	
-	case 0:
-		switch ( a & 0x1F )
-		{
-		case 0x01:
-			if ( sndp->opl_type == OPL_TYPE_OPL2 )
-			{
-				Uint32 i;
-				sndp->common.wfe = (v & 0x20) ? 3 : 0;
-				for ( i = 0; i < 9; i++ )
-				{
-					OpUpdateWF(sndp, &sndp->ch i.op 0);
-					OpUpdateWF(sndp, &sndp->ch i.op 1);
-				}
-			}
-			break;
-		
-		case 0x08:
-			/* CSM mode */
-		case 0x07: case 0x09: case 0x0A: case 0x0B: case 0x0C:
-		case 0x0D: case 0x0E: case 0x0F: case 0x10: case 0x11: case 0x12:
-			if ( sndp->deltatpcm )
-				sndp->deltatpcm->write(sndp->deltatpcm->ctx, a - 0x07, v);
-			break;
-		}
-		break;
-	
-	case 1: OPLSETOP(oplsetopmul); break;
-	case 2: OPLSETOP(oplsetopkstl); break;
-	case 3: OPLSETOP(oplsetopardr); break;
-	case 4: OPLSETOP(oplsetopslrr); break;
-	case 7: OPLSETOP(oplsetopwf); break;
-	case 5:
-		if ( (a & 0x1F) == (0xBD & 0x1F) )
-			oplsetrc(sndp, v);
-		else if ( (a & 0x1F) < 9 )
-			oplsetchfreql(sndp, &sndp->ch a & 0xF, v);
-		else if ( (a & 0xF) < 9 )
-			oplsetchfreqh(sndp, &sndp->ch a & 0xF, v);
-		break;
-	
-	case 6:
-		if ( (a & 0x1F) < 9) oplsetchfbcon(sndp, &sndp->ch a & 0xF, v);
-		break;
-	}
-}
-
-static void oplwrite( OPLSOUND* sndp, Uint32 a, Uint32 v )
-{
-	if ( a & 1 )
-	{
-		sndp->regs sndp->common.adr = v;
-		oplwritereg(sndp, sndp->common.adr, v);
-	}
-	else
-		sndp->common.adr = v;
-}
-
-static Uint32 oplread( OPLSOUND* sndp, Uint32 a )
-{
-	if ( a & 1 )
-		return sndp->regs sndp->common.adr;
-	else
-		return 0x80;
-}
-
-__inline static void opllwritereg( OPLSOUND* sndp, Uint32 a, Uint32 v )
-{
-	switch ( a >> 3 )
-	{
-	default:
-		NEVER_REACH
-	case 0:
-		sndp->regs OPLL_INST_WORK + (a & 7) = v;
-		break;
-	
-	case 1:
-		if ( a == 0xE) opllsetrc(sndp, v & 0x3F);
-		break;
-	
-	case 2:
-	case 3:
-		a &= 0xF;
-		if ( a < 9) opllsetchfreql(sndp, &sndp->ch a, v);
-		break;
-	
-	case 4:
-	case 5:
-		a &= 0xF;
-		if ( a < 9) opllsetchfreqh(sndp, &sndp->ch a, v);
-		break;
-	
-	case 6:
-	case 7:
-		a &= 0xF;
-		if ( a < 9 )
-		{
-			if ( (sndp->common.rmode) && (a >= 6) )
-			{
-				if ( a != 6) opllsetopvolume(sndp, &sndp->ch a, &sndp->ch a.op 0, (v & 0xF0) >> 2);
-			}
-			else
-			{
-				opllsetchtone(sndp, &sndp->ch a, (v & 0xF0) >> 4);
-			}
-			opllsetopvolume(sndp, &sndp->ch a, &sndp->ch a.op 1, (v & 0xF) << 2);
-		}
-		break;
-	}
-}
-
-static void opllwrite( OPLSOUND* sndp, Uint32 a, Uint32 v )
-{
-	if ( a & 1 )
-	{
-		if ( sndp->common.adr < 0x40 )
-		{
-			sndp->regs sndp->common.adr = v;
-			opllwritereg(sndp, sndp->common.adr, v);
-		}
-	}
-	else
-		sndp->common.adr = v;
-}
-
-static Uint32 opllread( OPLSOUND* sndp, Uint32 a )
-{
-	return 0xFF;
-}
-
-static void opreset( OPLSOUND* sndp, OPL_OP* opp )
-{
-	/* XMEMSET(opp, 0, sizeof(OPL_OP)); */
-	SetOpOff(opp);
-	opp->tl_ofs = 0x80 << (LOG_BITS - 4 + 1);
-#if TESTING_OPTIMIZE_AME
-	opp->amin = &sndp->common.amzero;
-#endif
-	opp->pg.rng = 0xFFFF;
-}
-
-static void chreset( OPLSOUND* sndp, OPL_CH* chp, Uint32 clock, Uint32 freq )
-{
-	Uint32 op;
-	XMEMSET(chp, 0, sizeof(OPL_CH));
-	for ( op = 0; op < 2; op++ )
-	{
-		opreset(sndp, &chp->op op);
-	}
-	recovercon(sndp, chp);
-}
-
-static void sndreset( OPLSOUND* sndp, Uint32 clock, Uint32 freq )
-{
-	Uint32 i, cpse;
-	XMEMSET(&sndp->common, 0, sizeof(sndp->common));
-	XMEMSET(&sndp->lfo LFO_UNIT_AM, 0, sizeof(OPL_LFO));
-	sndp->lfo LFO_UNIT_AM.sps = DivFix(37 * (1 << AMTBL_BITS), freq * 10, LFO_SHIFT);
-	sndp->lfo LFO_UNIT_AM.adrmask = (1 << AMTBL_BITS) - 1;
-	sndp->lfo LFO_UNIT_AM.table = sndp->opltbl->am_table1;
-	XMEMSET(&sndp->lfo LFO_UNIT_PM, 0, sizeof(OPL_LFO));
-	sndp->lfo LFO_UNIT_PM.sps = DivFix(64 * (1 << PMTBL_BITS), freq * 10, LFO_SHIFT);
-	sndp->lfo LFO_UNIT_PM.adrmask = (1 << PMTBL_BITS) - 1;
-	sndp->lfo LFO_UNIT_PM.table = sndp->opltbl->pm_table1;
-	sndp->common.cpsp = DivFix(clock, 72 * freq, CPS_SHIFTP);
-	cpse = DivFix(clock, 72 * freq, CPS_SHIFTE);
-	for ( i = 0; i < 4; i++ )
-	{
-		sndp->common.ratetbl i = (i + 4) * cpse;
-		sndp->common.ratetbla i = 3 * sndp->common.ratetbl i;
-	}
-	sndp->common.tll2logtbl = sndp->opltbl->tll2log_table;
-	sndp->common.sintablemask = (1 << SINTBL_BITS) - 1;
-	
-	for ( i = 0; i < 9; i++ )
-		chreset(sndp, &sndp->ch i, clock, freq);
-	
-	if ( sndp->deltatpcm )
-		sndp->deltatpcm->reset(sndp->deltatpcm->ctx, clock, freq);
-	
-	if ( sndp->opl_type & OPL_TYPE_OPL )
-	{
-		XMEMSET(&sndp->regs, 0, 0x100);
-		sndp->common.ar_table = sndp->opltbl->ar_tablepow;
-		sndp->common.sintablemask -= (1 << (SINTBL_BITS - 11)) - 1;
-		for ( i = 0x0; i < 0x100; i++ )
-		{
-			oplwrite(sndp, 0, i);
-			oplwrite(sndp, 1, 0x00);
-		}
-		for ( i = 0xA0; i < 0xA9; i++ )
-		{
-			oplwrite(sndp, 0, 0xA0 + i);
-			oplwrite(sndp, 1, 0x40);
-			oplwrite(sndp, 0, 0xB0 + i);
-			oplwrite(sndp, 1, 0x0E);
-		}
-	}
-	else
-	{
-		const static Uint8 fmbios_initdata 9 = "\x30\x10\x20\x20\xfb\xb2\xf3\xf3";
-		XMEMSET(&sndp->regs, 0, 0x40);
-		sndp->common.ar_table = sndp->opltbl->ar_tablelog;
-		sndp->common.wfe = 1;
-		sndp->common.sintablemask -= (1 << (SINTBL_BITS - 8)) - 1;
-		for ( i = 0; i < sizeof(fmbios_initdata)-1; i++ )
-		{
-			opllwrite(sndp, 0, i);
-			opllwrite(sndp, 1, fmbios_initdata i);
-		}
-		opllwrite(sndp, 0, 0x0E);
-		opllwrite(sndp, 1, 0x00);
-		opllwrite(sndp, 0, 0x0F);
-		opllwrite(sndp, 1, 0x00);
-		for ( i = 0; i < 9; i++ )
-		{
-			opllwrite(sndp, 0, 0x10 + i);
-			opllwrite(sndp, 1, 0x20);
-			opllwrite(sndp, 0, 0x20 + i);
-			opllwrite(sndp, 1, 0x07);
-			opllwrite(sndp, 0, 0x30 + i);
-			opllwrite(sndp, 1, 0xB3);
-		}
-	}
-}
-
-static void oplsetinst( OPLSOUND* sndp, Uint32 n, void* p, Uint32 l )
-{
-	if ( sndp->deltatpcm) sndp->deltatpcm->setinst(sndp->deltatpcm->ctx, n, p, l);
-}
-
-__inline static Uint32 GetDwordLE(Uint8* p )
-{
-	return p 0 | (p 1 << 8) | (p 2 << 16) | (p 3 << 24);
-}
-#define GetDwordLEM(p) (Uint32)((((Uint8* )p) 0 | (((Uint8* )p) 1 << 8) | (((Uint8* )p) 2 << 16) | (((Uint8* )p) 3 << 24)) )
-
-static void opllsetinst( OPLSOUND* sndp, Uint32 n, Uint8* p, Uint32 l )
-{
-	Int32 i, j, sb = 9;
-	if ( n )
-		return;
-	if ( (GetDwordLE(p) & 0xF0FFFFFF) == GetDwordLEM("ILL0") )
-	{
-		if ( 0 regs OPLL_INST_WORK + (j << 3) + i = p (j << 4) + i;
-		for ( j = 0; j < 16 + 3; j++ )
-		{
-			sndp->regs OPLL_INST_WORK2 + (j << 1) + 0 = p (j << 4) + 8;
-			sndp->regs OPLL_INST_WORK2 + (j << 1) + 1 = p (j << 4) + 9;
-		}
-	}
-	else
-	{
-		for ( j = 1; j < 16; j++ )
-			for ( i = 0; i < 8; i++ )
-				sndp->regs OPLL_INST_WORK + (j << 3) + i = p ((j - 1) << 3) + i;
-	}
-	sndp->common.sintablemask = (1 << SINTBL_BITS) - 1;
-	sndp->common.sintablemask -= (1 << (SINTBL_BITS - sb)) - 1;
-}
-
-static void sndrelease( OPLSOUND* sndp )
-{
-	if ( sndp->logtbl) sndp->logtbl->release(sndp->logtbl->ctx);
-	if ( sndp->opltbl) sndp->opltbl->release(sndp->opltbl->ctx);
-	if ( sndp->deltatpcm) sndp->deltatpcm->release(sndp->deltatpcm->ctx);
-	XFREE(sndp);
-}
-
-KMIF_SOUND_DEVICE* OPLSoundAlloc(Uint32 opl_type )
-{
-	OPLSOUND* sndp;
-	sndp = (OPLSOUND*) XMALLOC(sizeof(OPLSOUND));
-	if ( !sndp) return 0;
-	sndp->opl_type = opl_type;
-	sndp->kmif.ctx = sndp;
-	sndp->kmif.release = (void (*)( void* )) sndrelease;
-	sndp->kmif.volume = (void (*)( void*, int )) sndvolume;
-	sndp->kmif.reset = (void (*)( void*, Uint32, Uint32 )) sndreset;
-	sndp->kmif.synth = (int (*)( void* )) sndsynth;
-	if ( sndp->opl_type == OPL_TYPE_MSXAUDIO )
-	{
-		sndp->deltatpcm = YMDELTATPCMSoundAlloc(YMDELTATPCM_TYPE_Y8950);
-	}
-	else
-		sndp->deltatpcm = 0;
-	if ( sndp->opl_type & OPL_TYPE_OPL )
-	{
-		sndp->kmif.write = (void (*)( void*, Uint32, Uint32 )) oplwrite;
-		sndp->kmif.read = (Uint32 (*)( void*, Uint32 )) oplread;
-		sndp->kmif.setinst = (void (*)( void*, Uint32, void*, Uint32 )) oplsetinst;
-	}
-	else
-	{
-		sndp->kmif.write = (void (*)( void*, Uint32, Uint32 )) opllwrite;
-		sndp->kmif.read = (Uint32 (*)( void*, Uint32 )) opllread;
-		sndp->kmif.setinst = (void (*)( void*, Uint32, void*, Uint32 )) opllsetinst;
-		switch ( sndp->opl_type )
-		{
-		case OPL_TYPE_OPLL:
-		case OPL_TYPE_MSXMUSIC:
-			opllsetinst(sndp, 0, romtone 0, 16 * 19);
-			break;
-		
-		case OPL_TYPE_SMSFMUNIT:
-			opllsetinst(sndp, 0, romtone 1, 16 * 19);
-			break;
-		
-		case OPL_TYPE_VRC7:
-			opllsetinst(sndp, 0, romtone 2, 16 * 19);
-			break;
-		}
-	}
-	sndp->logtbl = LogTableAddRef();
-	sndp->opltbl = OplTableAddRef();
-	if ( !sndp->logtbl || !sndp->opltbl )
-	{
-		sndrelease(sndp);
-		return 0;
-	}
-
-	return &sndp->kmif;
-}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/s_opl.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/s_opltbl.c Deleted

@@ -1,136 +0,0 @@
-#include "nestypes.h"
-#include "s_logtbl.h"
-#include "s_opltbl.h"
-
-#if STATIC_TABLES
-
-static void OplTableRelease(void *ctx)
-{
-}
-
-static KMIF_OPLTABLE opl_static_tables = {
-	&opl_static_tables;
-	OplTableRelease,
-#include "s_oplt.h"
-};
-
-KMIF_OPLTABLE *OplTableAddRef(void)
-{
-	opl_static_tables.release = OplTableRelease;
-	return &opl_static_tables;
-}
-
-#else
-
-#include <math.h>
-#ifndef M_PI
-#ifdef PI
-#define M_PI PI
-#else
-#define M_PI 3.14159265358979323846
-#endif
-#endif
-
-#define AM_DEPTH1 4.8 /* dB */
-#define AM_DEPTH2 1.0 /* dB */
-#define PM_DEPTH1 14.0 /* cent */
-#define PM_DEPTH2 7.0 /* cent */
-#define LOG_KEYOFF (15 << (LOG_BITS + 1))
-
-#define DB0375_TO_LOG(x) ((Uint32)(0.375 * (1 << (LOG_BITS + x)) / 10))
-
-#define AR_OFF (128 << ARTBL_SHIFT)
-#define AR_MAX (127 << ARTBL_SHIFT)
-
-
-static volatile Uint32 opl_tables_mutex = 0;
-static Uint32 opl_tables_refcount = 0;
-static KMIF_OPLTABLE *opl_tables = 0;
-
-static void OplTableRelease(void *ctx)
-{
-	++opl_tables_mutex;
-	while (opl_tables_mutex != 1)
-	{
-		XSLEEP(0);
-	}
-	opl_tables_refcount--;
-	if (!opl_tables_refcount)
-	{
-		XFREE(ctx);
-		opl_tables = 0;
-	}
-	--opl_tables_mutex;
-}
-
-static void OplTableCalc(KMIF_OPLTABLE *tbl)
-{
-	Uint32 u, u2, i;
-	tbl->sin_table00 = tbl->sin_table01 << (SINTBL_BITS - 1) = LOG_KEYOFF;
-	for (i = 1 ;i < (1 << (SINTBL_BITS - 1)); i++)
-	{
-		double d;
-		d = (1 << LOG_BITS) * -(log(sin(2.0 * M_PI * ((double)i) / (1 << SINTBL_BITS))) / log(2));
-		if (d > (LOG_KEYOFF >> 1)) d = (LOG_KEYOFF >> 1);
-		tbl->sin_table0i = ((Uint32)d) << 1;
-		tbl->sin_table0i + (1 << (SINTBL_BITS - 1)) = (((Uint32)d) << 1) + 1;
-	}
-	for (i = 0 ;i < (1 << SINTBL_BITS); i++)
-	{
-		tbl->sin_table1i = (tbl->sin_table0i & 1) ? tbl->sin_table00 : tbl->sin_table0i;
-		tbl->sin_table2i = tbl->sin_table0i & ~1;
-		tbl->sin_table3i = (i & (1 << (SINTBL_BITS - 2))) ? LOG_KEYOFF : tbl->sin_table2i;
-	}
-	for (i = 0; i < (1 << TLLTBL_BITS); i++)
-	{
-		tbl->tll2log_tablei = (i * DB0375_TO_LOG(0)) << 1;
-	}
-	for (i = 0; i < (1 << AMTBL_BITS); i++)
-	{
-		u = (Uint32)((1 + sin(2 * M_PI * ((double)i) / (1 << AMTBL_BITS))) * ((1 << LOG_BITS) * AM_DEPTH1 / 20.0));
-		u2 = (Uint32)((1 + sin(2 * M_PI * ((double)i) / (1 << AMTBL_BITS))) * ((1 << LOG_BITS) * AM_DEPTH2 / 20.0));
-		tbl->am_table1i = u << 1;
-		tbl->am_table2i = u2 << 1;
-	}
-	for (i = 0; i < (1 << PMTBL_BITS); i++)
-	{
-		u = (Uint32)((1 << PM_SHIFT) * pow(2, sin(2 * M_PI * ((double)i) / (1 << PMTBL_BITS)) * PM_DEPTH1 / 1200.0));
-		u2 = (Uint32)((1 << PM_SHIFT) * pow(2, sin(2 * M_PI * ((double)i) / (1 << PMTBL_BITS)) * PM_DEPTH2 / 1200.0));
-		tbl->pm_table1i = u;
-		tbl->pm_table2i = u2;
-	}
-
-	for (i = 0; i < (1 << ARTBL_BITS); i++)
-	{
-		u = (Uint32)(((double)AR_MAX) * (1 - log(1 + i) / log(1 << ARTBL_BITS)));
-		tbl->ar_tablelogi = u;
-#if 1
-		u = (Uint32)(((double)AR_MAX) * (pow(1 - i / (double)(1 << ARTBL_BITS), 8)));
-		tbl->ar_tablepowi = u;
-#endif
-	}
-}
-
-KMIF_OPLTABLE *OplTableAddRef(void)
-{
-	++opl_tables_mutex;
-	while (opl_tables_mutex != 1)
-	{
-		XSLEEP(0);
-	}
-	if (!opl_tables_refcount)
-	{
-		opl_tables = (KMIF_OPLTABLE*) XMALLOC(sizeof(KMIF_OPLTABLE));
-		if (opl_tables)
-		{
-			opl_tables->ctx = opl_tables;
-			opl_tables->release = OplTableRelease;
-			OplTableCalc(opl_tables);
-		}
-	}
-	if (opl_tables) opl_tables_refcount++;
-	--opl_tables_mutex;
-	return opl_tables;
-}
-
-#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/s_opltbl.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/ym2413.c Deleted

@@ -1,2107 +0,0 @@
-/*
-**
-** File: ym2413.c - software implementation of YM2413
-** FM sound generator type OPLL
-**
-** Copyright Jarek Burczynski
-**
-** Version 1.0
-**
-
- Features as listed in LSI-212413A2 data sheet:
- 1. FM Sound Generator for real sound creation.
- 2. Two Selectable modes: 9 simultaneous sounds or 6 melody sounds plus 5 rhythm sounds
- (different tones can be used together in either case).
- 3. Built-in Instruments data (15 melody tones, 5 rhythm tones, "CAPTAIN and TELETEXT applicalbe tones).
- 4. Built-in DA Converter.
- 5. Built-in Quartz Oscillator.
- 6. Built-in Vibrato Oscillator/AM Oscillator
- 7. TTL Compatible Input.
- 8. Si-Gate NMOS LSI
- 9. A single 5V power source.
-
-to do:
-
-- make sure of the sinus amplitude bits
-
-- make sure of the EG resolution bits (looks like the biggest
- modulation index generated by the modulator is 123, 124 = no modulation)
-- find proper algorithm for attack phase of EG
-
-- tune up instruments ROM
-
-- support sample replay in test mode (it is NOT as simple as setting bit 0
- in register 0x0f and using register 0x10 for sample data).
- Which games use this feature ?
-
-
-*/
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include "ym2413.h"
-
-#define INLINE static __inline
-#ifndef NULL
-	#define NULL ((void *)0)
-#endif
-#define logerror (void)
-
-#ifndef M_PI
-	#define M_PI 3.14159265358979323846
-#endif
-
-/* output final shift */
-#if (SAMPLE_BITS==16)
-	#define FINAL_SH	(0)
-	#define MAXOUT		(+32767)
-	#define MINOUT		(-32768)
-#else
-	#define FINAL_SH	(8)
-	#define MAXOUT		(+127)
-	#define MINOUT		(-128)
-#endif
-
-
-#define FREQ_SH			16 /* 16.16 fixed point (frequency calculations) */
-#define EG_SH			16 /* 16.16 fixed point (EG timing) */
-#define LFO_SH			24 /* 8.24 fixed point (LFO calculations) */
-
-#define FREQ_MASK		((1<<FREQ_SH)-1)
-
-/* envelope output entries */
-#define ENV_BITS		10
-#define ENV_LEN			(1<<ENV_BITS)
-#define ENV_STEP		(128.0/ENV_LEN)
-
-#define MAX_ATT_INDEX	((1<<(ENV_BITS-2))-1) /*255*/
-#define MIN_ATT_INDEX	(0)
-
-/* sinwave entries */
-#define SIN_BITS		10
-#define SIN_LEN			(1<<SIN_BITS)
-#define SIN_MASK		(SIN_LEN-1)
-
-#define TL_RES_LEN		(256)	/* 8 bits addressing (real chip) */
-
-
-
-/* register number to channel number , slot offset */
-#define SLOT1 0
-#define SLOT2 1
-
-/* Envelope Generator phases */
-
-#define EG_DMP			5
-#define EG_ATT			4
-#define EG_DEC			3
-#define EG_SUS			2
-#define EG_REL			1
-#define EG_OFF			0
-
-
-typedef struct{
-	UINT32	ar;			/* attack rate: AR<<2 */
-	UINT32	dr;			/* decay rate: DR<<2 */
-	UINT32	rr;			/* release rate:RR<<2 */
-	UINT8	KSR;		/* key scale rate */
-	UINT8	ksl;		/* keyscale level */
-	UINT8	ksr;		/* key scale rate: kcode>>KSR */
-	UINT8	mul;		/* multiple: mul_tabML */
-
-	/* Phase Generator */
-	UINT32	phase;		/* frequency counter */
-	UINT32	freq;		/* frequency counter step */
-	UINT8 fb_shift;	/* feedback shift value */
-	INT32 op1_out2;	/* slot1 output for feedback */
-
-	/* Envelope Generator */
-	UINT8	eg_type;	/* percussive/nonpercussive mode*/
-	UINT8	state;		/* phase type */
-	UINT32	TL;			/* total level: TL << 2 */
-	INT32	TLL;		/* adjusted now TL */
-	INT32	volume;		/* envelope counter */
-	UINT32	sl;			/* sustain level: sl_tabSL */
-
-	UINT8	eg_sh_dp;	/* (dump state) */
-	UINT8	eg_sel_dp;	/* (dump state) */
-	UINT8	eg_sh_ar;	/* (attack state) */
-	UINT8	eg_sel_ar;	/* (attack state) */
-	UINT8	eg_sh_dr;	/* (decay state) */
-	UINT8	eg_sel_dr;	/* (decay state) */
-	UINT8	eg_sh_rr;	/* (release state for non-perc.)*/
-	UINT8	eg_sel_rr;	/* (release state for non-perc.)*/
-	UINT8	eg_sh_rs;	/* (release state for perc.mode)*/
-	UINT8	eg_sel_rs;	/* (release state for perc.mode)*/
-
-	UINT32	key;		/* 0 = KEY OFF, >0 = KEY ON */
-
-	/* LFO */
-	UINT32	AMmask;		/* LFO Amplitude Modulation enable mask */
-	UINT8	vib;		/* LFO Phase Modulation enable flag (active high)*/
-
-	/* waveform select */
-	unsigned int wavetable;
-} OPLL_SLOT;
-
-#define OPLL_MASK_CH(x) (1<<(x))
-#define OPLL_MASK_HH (1<<(9))
-#define OPLL_MASK_CYM (1<<(10))
-#define OPLL_MASK_TOM (1<<(11))
-#define OPLL_MASK_SD (1<<(12))
-#define OPLL_MASK_BD (1<<(13))
-#define OPLL_MASK_RHYTHM ( OPLL_MASK_HH | OPLL_MASK_CYM | OPLL_MASK_TOM | OPLL_MASK_SD | OPLL_MASK_BD )
-
-typedef struct{
-	OPLL_SLOT SLOT2;
-	/* phase generator state */
-	UINT32 block_fnum;	/* block+fnum */
-	UINT32 fc;			/* Freq. freqement base */
-	UINT32 ksl_base;	/* KeyScaleLevel Base step */
-	UINT8 kcode;		/* key code (for key scaling) */
-	UINT8 sus;		/* sus on/off (release speed in percussive mode)*/
-} OPLL_CH;
-
-/* chip state */
-typedef struct {
-	OPLL_CH	P_CH9;				/* OPLL chips have 9 channels*/
-	UINT8	instvol_r9;			/* instrument/volume (or volume/volume in percussive mode)*/
-
-	UINT32	eg_cnt;					/* global envelope generator counter */
-	UINT32	eg_timer;				/* global envelope generator counter works at frequency = chipclock/72 */
-	UINT32	eg_timer_add;			/* step of eg_timer */
-	UINT32	eg_timer_overflow;		/* envelope generator timer overlfows every 1 sample (on real chip) */
-
-	UINT8	rhythm;					/* Rhythm mode */
-
-	/* LFO */
-	UINT32	lfo_am_cnt;
-	UINT32	lfo_am_inc;
-	UINT32	lfo_pm_cnt;
-	UINT32	lfo_pm_inc;
-
-	UINT32	noise_rng;				/* 23 bit noise shift register */
-	UINT32	noise_p;				/* current noise 'phase' */
-	UINT32	noise_f;				/* current noise period */
-
-
-/* instrument settings */
-/*
- 0-user instrument
- 1-15 - fixed instruments
- 16 -bass drum settings
- 17,18 - other percussion instruments
-*/
-	UINT8 inst_tab198;
-
-	/* external event callback handlers */
-	OPLL_UPDATEHANDLER UpdateHandler; /* stream update handler */
-	void * UpdateParam;				/* stream update parameter */
-
-	UINT32	fn_tab1024;			/* fnumber->increment counter */
-
-	UINT8 address;					/* address register */
-	UINT8 status;					/* status flag */
-
-	int clock;						/* master clock (Hz) */
-	int rate;						/* sampling rate (Hz) */
-	double freqbase;				/* frequency base */
-
-	/* work table */
-	OPLL_SLOT *SLOT7_1,*SLOT7_2,*SLOT8_1,*SLOT8_2;
-
-	signed int output2;
-
-	UINT32	LFO_AM;
-	INT32	LFO_PM;
-
-	int chip_type;
-	UINT32 mask;
-} YM2413;
-
-/* key scale level */
-/* table is 3dB/octave, DV converts this into 6dB/octave */
-/* 0.1875 is bit 0 weight of the envelope counter (volume) expressed in the 'decibel' scale */
-#define DV (0.1875/1.0)
-static const UINT32 ksl_tab8*16=
-{
-	/* OCT 0 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	/* OCT 1 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV,
-	 1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV,
-	/* OCT 2 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV,
-	 3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV,
-	 4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV,
-	/* OCT 3 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV,
-	 3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV,
-	 6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV,
-	 7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV,
-	/* OCT 4 */
-	 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
-	 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
-	 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
-	10.875/DV,11.250/DV,11.625/DV,12.000/DV,
-	/* OCT 5 */
-	 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
-	 9.000/DV,10.125/DV,10.875/DV,11.625/DV,
-	12.000/DV,12.750/DV,13.125/DV,13.500/DV,
-	13.875/DV,14.250/DV,14.625/DV,15.000/DV,
-	/* OCT 6 */
-	 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
-	12.000/DV,13.125/DV,13.875/DV,14.625/DV,
-	15.000/DV,15.750/DV,16.125/DV,16.500/DV,
-	16.875/DV,17.250/DV,17.625/DV,18.000/DV,
-	/* OCT 7 */
-	 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
-	15.000/DV,16.125/DV,16.875/DV,17.625/DV,
-	18.000/DV,18.750/DV,19.125/DV,19.500/DV,
-	19.875/DV,20.250/DV,20.625/DV,21.000/DV
-};
-#undef DV
-
-/* sustain level table (3dB per step) */
-/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,45 (dB)*/
-#define SC(db) (UINT32) ( db * (1.0/ENV_STEP) )
-static const UINT32 sl_tab16={
- SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
- SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(15)
-};
-#undef SC
-
-
-#define RATE_STEPS (8)
-static const unsigned char eg_inc15*RATE_STEPS={
-
-/*cycle:0 1 2 3 4 5 6 7*/
-
-/* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..12 0 (increment by 0 or 1) */
-/* 1 */ 0,1, 0,1, 1,1, 0,1, /* rates 00..12 1 */
-/* 2 */ 0,1, 1,1, 0,1, 1,1, /* rates 00..12 2 */
-/* 3 */ 0,1, 1,1, 1,1, 1,1, /* rates 00..12 3 */
-
-/* 4 */ 1,1, 1,1, 1,1, 1,1, /* rate 13 0 (increment by 1) */
-/* 5 */ 1,1, 1,2, 1,1, 1,2, /* rate 13 1 */
-/* 6 */ 1,2, 1,2, 1,2, 1,2, /* rate 13 2 */
-/* 7 */ 1,2, 2,2, 1,2, 2,2, /* rate 13 3 */
-
-/* 8 */ 2,2, 2,2, 2,2, 2,2, /* rate 14 0 (increment by 2) */
-/* 9 */ 2,2, 2,4, 2,2, 2,4, /* rate 14 1 */
-/*10 */ 2,4, 2,4, 2,4, 2,4, /* rate 14 2 */
-/*11 */ 2,4, 4,4, 2,4, 4,4, /* rate 14 3 */
-
-/*12 */ 4,4, 4,4, 4,4, 4,4, /* rates 15 0, 15 1, 15 2, 15 3 (increment by 4) */
-/*13 */ 8,8, 8,8, 8,8, 8,8, /* rates 15 2, 15 3 for attack */
-/*14 */ 0,0, 0,0, 0,0, 0,0, /* infinity rates for attack and decay(s) */
-};
-
-
-#define O(a) (a*RATE_STEPS)
-
-/*note that there is no O(13) in this table - it's directly in the code */
-static const unsigned char eg_rate_select16+64+16={	/* Envelope Generator rates (16 + 64 rates + 16 RKS) */
-/* 16 infinite time rates */
-O(14),O(14),O(14),O(14),O(14),O(14),O(14),O(14),
-O(14),O(14),O(14),O(14),O(14),O(14),O(14),O(14),
-
-/* rates 00-12 */
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-
-/* rate 13 */
-O( 4),O( 5),O( 6),O( 7),
-
-/* rate 14 */
-O( 8),O( 9),O(10),O(11),
-
-/* rate 15 */
-O(12),O(12),O(12),O(12),
-
-/* 16 dummy rates (same as 15 3) */
-O(12),O(12),O(12),O(12),O(12),O(12),O(12),O(12),
-O(12),O(12),O(12),O(12),O(12),O(12),O(12),O(12),
-
-};
-#undef O
-
-/*rate 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 */
-/*shift 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0 */
-/*mask 8191, 4095, 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1, 0, 0, 0 */
-
-#define O(a) (a*1)
-static const unsigned char eg_rate_shift16+64+16={	/* Envelope Generator counter shifts (16 + 64 rates + 16 RKS) */
-/* 16 infinite time rates */
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
-
-/* rates 00-12 */
-O(13),O(13),O(13),O(13),
-O(12),O(12),O(12),O(12),
-O(11),O(11),O(11),O(11),
-O(10),O(10),O(10),O(10),
-O( 9),O( 9),O( 9),O( 9),
-O( 8),O( 8),O( 8),O( 8),
-O( 7),O( 7),O( 7),O( 7),
-O( 6),O( 6),O( 6),O( 6),
-O( 5),O( 5),O( 5),O( 5),
-O( 4),O( 4),O( 4),O( 4),
-O( 3),O( 3),O( 3),O( 3),
-O( 2),O( 2),O( 2),O( 2),
-O( 1),O( 1),O( 1),O( 1),
-
-/* rate 13 */
-O( 0),O( 0),O( 0),O( 0),
-
-/* rate 14 */
-O( 0),O( 0),O( 0),O( 0),
-
-/* rate 15 */
-O( 0),O( 0),O( 0),O( 0),
-
-/* 16 dummy rates (same as 15 3) */
-O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
-O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
-
-};
-#undef O
-
-
-/* multiple table */
-#define ML 2
-static const UINT8 mul_tab16= {
-/* 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,12,12,15,15 */
- 0.50*ML, 1.00*ML, 2.00*ML, 3.00*ML, 4.00*ML, 5.00*ML, 6.00*ML, 7.00*ML,
- 8.00*ML, 9.00*ML,10.00*ML,10.00*ML,12.00*ML,12.00*ML,15.00*ML,15.00*ML
-};
-#undef ML
-
-/* TL_TAB_LEN is calculated as:
-* 11 - sinus amplitude bits (Y axis)
-* 2 - sinus sign bit (Y axis)
-* TL_RES_LEN - sinus resolution (X axis)
-*/
-#define TL_TAB_LEN (11*2*TL_RES_LEN)
-static signed int tl_tabTL_TAB_LEN;
-
-#define ENV_QUIET		(TL_TAB_LEN>>5)
-
-/* sin waveform table in 'decibel' scale */
-/* two waveforms on OPLL type chips */
-static unsigned int sin_tabSIN_LEN * 2;
-
-
-/* LFO Amplitude Modulation table (verified on real YM3812)
- 27 output levels (triangle waveform); 1 level takes one of: 192, 256 or 448 samples
-
- Length: 210 elements.
-
- Each of the elements has to be repeated
- exactly 64 times (on 64 consecutive samples).
- The whole table takes: 64 * 210 = 13440 samples.
-
-We use data>>1, until we find what it really is on real chip...
-
-*/
-
-#define LFO_AM_TAB_ELEMENTS 210
-
-static const UINT8 lfo_am_tableLFO_AM_TAB_ELEMENTS = {
-0,0,0,0,0,0,0,
-1,1,1,1,
-2,2,2,2,
-3,3,3,3,
-4,4,4,4,
-5,5,5,5,
-6,6,6,6,
-7,7,7,7,
-8,8,8,8,
-9,9,9,9,
-10,10,10,10,
-11,11,11,11,
-12,12,12,12,
-13,13,13,13,
-14,14,14,14,
-15,15,15,15,
-16,16,16,16,
-17,17,17,17,
-18,18,18,18,
-19,19,19,19,
-20,20,20,20,
-21,21,21,21,
-22,22,22,22,
-23,23,23,23,
-24,24,24,24,
-25,25,25,25,
-26,26,26,
-25,25,25,25,
-24,24,24,24,
-23,23,23,23,
-22,22,22,22,
-21,21,21,21,
-20,20,20,20,
-19,19,19,19,
-18,18,18,18,
-17,17,17,17,
-16,16,16,16,
-15,15,15,15,
-14,14,14,14,
-13,13,13,13,
-12,12,12,12,
-11,11,11,11,
-10,10,10,10,
-9,9,9,9,
-8,8,8,8,
-7,7,7,7,
-6,6,6,6,
-5,5,5,5,
-4,4,4,4,
-3,3,3,3,
-2,2,2,2,
-1,1,1,1
-};
-
-/* LFO Phase Modulation table (verified on real YM2413) */
-static const INT8 lfo_pm_table8*8 = {
-
-/* FNUM2/FNUM = 0 00xxxxxx (0x0000) */
-0, 0, 0, 0, 0, 0, 0, 0,
-
-/* FNUM2/FNUM = 0 01xxxxxx (0x0040) */
-1, 0, 0, 0,-1, 0, 0, 0,
-
-/* FNUM2/FNUM = 0 10xxxxxx (0x0080) */
-2, 1, 0,-1,-2,-1, 0, 1,
-
-/* FNUM2/FNUM = 0 11xxxxxx (0x00C0) */
-3, 1, 0,-1,-3,-1, 0, 1,
-
-/* FNUM2/FNUM = 1 00xxxxxx (0x0100) */
-4, 2, 0,-2,-4,-2, 0, 2,
-
-/* FNUM2/FNUM = 1 01xxxxxx (0x0140) */
-5, 2, 0,-2,-5,-2, 0, 2,
-
-/* FNUM2/FNUM = 1 10xxxxxx (0x0180) */
-6, 3, 0,-3,-6,-3, 0, 3,
-
-/* FNUM2/FNUM = 1 11xxxxxx (0x01C0) */
-7, 3, 0,-3,-7,-3, 0, 3,
-};
-
-
-
-
-
-
-/* This is not 100% perfect yet but very close */
-/*
- - multi parameters are 100% correct (instruments and drums)
- - LFO PM and AM enable are 100% correct
- - waveform DC and DM select are 100% correct
-*/
-
-static const unsigned char table198 = {
-/* MULT MULT modTL DcDmFb AR/DR AR/DR SL/RR SL/RR */
-/* 0 1 2 3 4 5 6 7 */
- {0x49, 0x4c, 0x4c, 0x12, 0x00, 0x00, 0x00, 0x00 },	/* 0 */
-
- {0x61, 0x61, 0x1e, 0x17, 0xf0, 0x78, 0x00, 0x17 },	/* 1 */
- {0x13, 0x41, 0x1e, 0x0d, 0xd7, 0xf7, 0x13, 0x13 },	/* 2 */
- {0x13, 0x01, 0x99, 0x04, 0xf2, 0xf4, 0x11, 0x23 },	/* 3 */
- {0x21, 0x61, 0x1b, 0x07, 0xaf, 0x64, 0x40, 0x27 },	/* 4 */
-
-/* {0x22, 0x21, 0x1e, 0x09, 0xf0, 0x76, 0x08, 0x28 }, //5 */
- {0x22, 0x21, 0x1e, 0x06, 0xf0, 0x75, 0x08, 0x18 },	/* 5 */
-
-/* {0x31, 0x22, 0x16, 0x09, 0x90, 0x7f, 0x00, 0x08 }, //6 */
- {0x31, 0x22, 0x16, 0x05, 0x90, 0x71, 0x00, 0x13 },	/* 6 */
-
- {0x21, 0x61, 0x1d, 0x07, 0x82, 0x80, 0x10, 0x17 },	/* 7 */
- {0x23, 0x21, 0x2d, 0x16, 0xc0, 0x70, 0x07, 0x07 },	/* 8 */
- {0x61, 0x61, 0x1b, 0x06, 0x64, 0x65, 0x10, 0x17 },	/* 9 */
-
-/* {0x61, 0x61, 0x0c, 0x08, 0x85, 0xa0, 0x79, 0x07 }, //A */
- {0x61, 0x61, 0x0c, 0x18, 0x85, 0xf0, 0x70, 0x07 },	/* A */
-
- {0x23, 0x01, 0x07, 0x11, 0xf0, 0xa4, 0x00, 0x22 },	/* B */
- {0x97, 0xc1, 0x24, 0x07, 0xff, 0xf8, 0x22, 0x12 },	/* C */
-
-/* {0x61, 0x10, 0x0c, 0x08, 0xf2, 0xc4, 0x40, 0xc8 }, //D */
- {0x61, 0x10, 0x0c, 0x05, 0xf2, 0xf4, 0x40, 0x44 },	/* D */
-
- {0x01, 0x01, 0x55, 0x03, 0xf3, 0x92, 0xf3, 0xf3 },	/* E */
- {0x61, 0x41, 0x89, 0x03, 0xf1, 0xf4, 0xf0, 0x13 },	/* F */
-
-/* drum instruments definitions */
-/* MULTI MULTI modTL xxx AR/DR AR/DR SL/RR SL/RR */
-/* 0 1 2 3 4 5 6 7 */
- {0x01, 0x01, 0x16, 0x00, 0xfd, 0xf8, 0x2f, 0x6d },/* BD(multi verified, modTL verified, mod env - verified(close), carr. env verifed) */
- {0x01, 0x01, 0x00, 0x00, 0xd8, 0xd8, 0xf9, 0xf8 },/* HH(multi verified), SD(multi not used) */
- {0x05, 0x01, 0x00, 0x00, 0xf8, 0xba, 0x49, 0x55 },/* TOM(multi,env verified), TOP CYM(multi verified, env verified) */
-};
-
-static const unsigned char table_vrc7158 =
-{
-/* VRC7 instruments, January 17, 2004 update -Xodnizel */
- {0x03, 0x21, 0x04, 0x06, 0x8D, 0xF2, 0x42, 0x17}, 
- {0x13, 0x41, 0x05, 0x0E, 0x99, 0x96, 0x63, 0x12}, 
- {0x31, 0x11, 0x10, 0x0A, 0xF0, 0x9C, 0x32, 0x02}, 
- {0x21, 0x61, 0x1D, 0x07, 0x9F, 0x64, 0x20, 0x27}, 
- {0x22, 0x21, 0x1E, 0x06, 0xF0, 0x76, 0x08, 0x28}, 
- {0x02, 0x01, 0x06, 0x00, 0xF0, 0xF2, 0x03, 0x95}, 
- {0x21, 0x61, 0x1C, 0x07, 0x82, 0x81, 0x16, 0x07}, 
- {0x23, 0x21, 0x1A, 0x17, 0xEF, 0x82, 0x25, 0x15}, 
- {0x25, 0x11, 0x1F, 0x00, 0x86, 0x41, 0x20, 0x11}, 
- {0x85, 0x01, 0x1F, 0x0F, 0xE4, 0xA2, 0x11, 0x12}, 
- {0x07, 0xC1, 0x2B, 0x45, 0xB4, 0xF1, 0x24, 0xF4},
- {0x61, 0x23, 0x11, 0x06, 0x96, 0x96, 0x13, 0x16}, 
- {0x01, 0x02, 0xD3, 0x05, 0x82, 0xA2, 0x31, 0x51}, 
- {0x61, 0x22, 0x0D, 0x02, 0xC3, 0x7F, 0x24, 0x05},
- {0x21, 0x62, 0x0E, 0x00, 0xA1, 0xA0, 0x44, 0x17},
-
-};
-
-INLINE int limit( int val, int max, int min ) {
-	if ( val > max )
-		val = max;
-	else if ( val < min )
-		val = min;
-
-	return val;
-}
-
-
-/* advance LFO to next sample */
-INLINE void advance_lfo(YM2413 *chip)
-{
-	/* LFO */
-	chip->lfo_am_cnt += chip->lfo_am_inc;
-	if (chip->lfo_am_cnt >= ((UINT32)LFO_AM_TAB_ELEMENTS<<LFO_SH) )	/* lfo_am_table is 210 elements long */
-		chip->lfo_am_cnt -= ((UINT32)LFO_AM_TAB_ELEMENTS<<LFO_SH);
-
-	chip->LFO_AM = lfo_am_table chip->lfo_am_cnt >> LFO_SH >> 1;
-
-	chip->lfo_pm_cnt += chip->lfo_pm_inc;
-	chip->LFO_PM = (chip->lfo_pm_cnt>>LFO_SH) & 7;
-}
-
-/* advance to next sample */
-INLINE void advance(YM2413 *chip)
-{
-	OPLL_CH *CH;
-	OPLL_SLOT *op;
-	unsigned int i;
-
-	/* Envelope Generator */
-	chip->eg_timer += chip->eg_timer_add;
-
-	while (chip->eg_timer >= chip->eg_timer_overflow)
-	{
-		chip->eg_timer -= chip->eg_timer_overflow;
-
-		chip->eg_cnt++;
-
-		for (i=0; i<9*2; i++)
-		{
-			CH = &chip->P_CHi/2;
-
-			op = &CH->SLOTi&1;
-
-			switch(op->state)
-			{
-
-			case EG_DMP:		/* dump phase */
-			/*dump phase is performed by both operators in each channel*/
-			/*when CARRIER envelope gets down to zero level,
- ** phases in BOTH opearators are reset (at the same time ?)
- */
-				if ( !(chip->eg_cnt & ((1<<op->eg_sh_dp)-1) ) )
-				{
-					op->volume += eg_incop->eg_sel_dp + ((chip->eg_cnt>>op->eg_sh_dp)&7);
-
-					if ( op->volume >= MAX_ATT_INDEX )
-					{
-						op->volume = MAX_ATT_INDEX;
-						op->state = EG_ATT;
-						/* restart Phase Generator */
-						op->phase = 0;
-					}
-				}
-			break;
-
-			case EG_ATT:		/* attack phase */
-				if ( !(chip->eg_cnt & ((1<<op->eg_sh_ar)-1) ) )
-				{
-					op->volume += (~op->volume *
-	 		 (eg_incop->eg_sel_ar + ((chip->eg_cnt>>op->eg_sh_ar)&7))
- 			 ) >>2;
-
-					if (op->volume <= MIN_ATT_INDEX)
-					{
-						op->volume = MIN_ATT_INDEX;
-						op->state = EG_DEC;
-					}
-				}
-			break;
-
-			case EG_DEC:	/* decay phase */
-				if ( !(chip->eg_cnt & ((1<<op->eg_sh_dr)-1) ) )
-				{
-					op->volume += eg_incop->eg_sel_dr + ((chip->eg_cnt>>op->eg_sh_dr)&7);
-
-					if ( op->volume >= op->sl )
-						op->state = EG_SUS;
-				}
-			break;
-
-			case EG_SUS:	/* sustain phase */
-				/* this is important behaviour:
- one can change percusive/non-percussive modes on the fly and
- the chip will remain in sustain phase - verified on real YM3812 */
-
-				if(op->eg_type)		/* non-percussive mode (sustained tone) */
-				{
-									/* do nothing */
-				}
-				else				/* percussive mode */
-				{
-					/* during sustain phase chip adds Release Rate (in percussive mode) */
-					if ( !(chip->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
-					{
-						op->volume += eg_incop->eg_sel_rr + ((chip->eg_cnt>>op->eg_sh_rr)&7);
-
-						if ( op->volume >= MAX_ATT_INDEX )
-							op->volume = MAX_ATT_INDEX;
-					}
-					/* else do nothing in sustain phase */
-				}
-			break;
-
-			case EG_REL:	/* release phase */
-			/* exclude modulators in melody channels from performing anything in this mode*/
-			/* allowed are only carriers in melody mode and rhythm slots in rhythm mode */
-
-			/*This table shows which operators and on what conditions are allowed to perform EG_REL:
- (a) - always perform EG_REL
- (n) - never perform EG_REL
- (r) - perform EG_REL in Rhythm mode ONLY
- 0: 0 (n), 1 (a)
- 1: 2 (n), 3 (a)
- 2: 4 (n), 5 (a)
- 3: 6 (n), 7 (a)
- 4: 8 (n), 9 (a)
- 5: 10(n), 11(a)
- 6: 12(r), 13(a)
- 7: 14(r), 15(a)
- 8: 16(r), 17(a)
- */
-				if ( (i&1) || ((chip->rhythm&0x20) && (i>=12)) )/* exclude modulators */
-				{
-					if(op->eg_type)		/* non-percussive mode (sustained tone) */
-					/*this is correct: use RR when SUS = OFF*/
-					/*and use RS when SUS = ON*/
-					{
-						if (CH->sus)
-						{
-							if ( !(chip->eg_cnt & ((1<<op->eg_sh_rs)-1) ) )
-							{
-								op->volume += eg_incop->eg_sel_rs + ((chip->eg_cnt>>op->eg_sh_rs)&7);
-								if ( op->volume >= MAX_ATT_INDEX )
-								{
-									op->volume = MAX_ATT_INDEX;
-									op->state = EG_OFF;
-								}
-							}
-						}
-						else
-						{
-							if ( !(chip->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
-							{
-								op->volume += eg_incop->eg_sel_rr + ((chip->eg_cnt>>op->eg_sh_rr)&7);
-								if ( op->volume >= MAX_ATT_INDEX )
-								{
-									op->volume = MAX_ATT_INDEX;
-									op->state = EG_OFF;
-								}
-							}
-						}
-					}
-					else				/* percussive mode */
-					{
-						if ( !(chip->eg_cnt & ((1<<op->eg_sh_rs)-1) ) )
-						{
-							op->volume += eg_incop->eg_sel_rs + ((chip->eg_cnt>>op->eg_sh_rs)&7);
-							if ( op->volume >= MAX_ATT_INDEX )
-							{
-								op->volume = MAX_ATT_INDEX;
-								op->state = EG_OFF;
-							}
-						}
-					}
-				}
-			break;
-
-			default:
-			break;
-			}
-		}
-	}
-
-	for (i=0; i<9*2; i++)
-	{
-		CH = &chip->P_CHi/2;
-		op = &CH->SLOTi&1;
-
-		/* Phase Generator */
-		if(op->vib)
-		{
-			UINT8 block;
-
-			unsigned int fnum_lfo = 8*((CH->block_fnum&0x01c0) >> 6);
-			unsigned int block_fnum = CH->block_fnum * 2;
-			signed int lfo_fn_table_index_offset = lfo_pm_tablechip->LFO_PM + fnum_lfo ;
-
-			if (lfo_fn_table_index_offset)	/* LFO phase modulation active */
-			{
-				block_fnum += lfo_fn_table_index_offset;
-				block = (block_fnum&0x1c00) >> 10;
-				op->phase += (chip->fn_tabblock_fnum&0x03ff >> (7-block)) * op->mul;
-			}
-			else	/* LFO phase modulation = zero */
-			{
-				op->phase += op->freq;
-			}
-		}
-		else	/* LFO phase modulation disabled for this operator */
-		{
-			op->phase += op->freq;
-		}
-	}
-
-	/* The Noise Generator of the YM3812 is 23-bit shift register.
- * Period is equal to 2^23-2 samples.
- * Register works at sampling frequency of the chip, so output
- * can change on every sample.
- *
- * Output of the register and input to the bit 22 is:
- * bit0 XOR bit14 XOR bit15 XOR bit22
- *
- * Simply use bit 22 as the noise output.
- */
-
-	chip->noise_p += chip->noise_f;
-	i = chip->noise_p >> FREQ_SH;		/* number of events (shifts of the shift register) */
-	chip->noise_p &= FREQ_MASK;
-	while (i)
-	{
-		/*
- UINT32 j;
- j = ( (chip->noise_rng) ^ (chip->noise_rng>>14) ^ (chip->noise_rng>>15) ^ (chip->noise_rng>>22) ) & 1;
- chip->noise_rng = (j<<22) | (chip->noise_rng>>1);
- */
-
-		/*
- Instead of doing all the logic operations above, we
- use a trick here (and use bit 0 as the noise output).
- The difference is only that the noise bit changes one
- step ahead. This doesn't matter since we don't know
- what is real state of the noise_rng after the reset.
- */
-
-		if (chip->noise_rng & 1) chip->noise_rng ^= 0x800302;
-		chip->noise_rng >>= 1;
-
-		i--;
-	}
-}
-
-
-INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
-{
-	UINT32 p;
-
-	p = (env<<5) + sin_tabwave_tab + ((((signed int)((phase & ~FREQ_MASK) + (pm<<17))) >> FREQ_SH ) & SIN_MASK) ;
-
-	if (p >= TL_TAB_LEN)
-		return 0;
-	return tl_tabp;
-}
-
-INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
-{
-	UINT32 p;
-	INT32 i;
-
-	i = (phase & ~FREQ_MASK) + pm;
-
-/*logerror("i=%08x (i>>16)&511=%8i phase=%i pm=%08x ",i, (i>>16)&511, phase>>FREQ_SH, pm);*/
-
-	p = (env<<5) + sin_tab wave_tab + ((i>>FREQ_SH) & SIN_MASK);
-
-/*logerror("(p&255=%i p>>8=%i) out= %i\n", p&255,p>>8, tl_tabp&255>>(p>>8) );*/
-
-	if (p >= TL_TAB_LEN)
-		return 0;
-	return tl_tabp;
-}
-
-
-#define volume_calc(OP) ((OP)->TLL + ((UINT32)(OP)->volume) + (chip->LFO_AM & (OP)->AMmask))
-
-/* calculate output */
-INLINE void chan_calc( YM2413 *chip, OPLL_CH *CH )
-{
-	OPLL_SLOT *SLOT;
-	unsigned int env;
-	signed int out;
-	signed int phase_modulation;	/* phase modulation input (SLOT 2) */
-
-
-	/* SLOT 1 */
-	SLOT = &CH->SLOTSLOT1;
-	env = volume_calc(SLOT);
-	out = SLOT->op1_out0 + SLOT->op1_out1;
-
-	SLOT->op1_out0 = SLOT->op1_out1;
-	phase_modulation = SLOT->op1_out0;
-
-	SLOT->op1_out1 = 0;
-
-	if( env < ENV_QUIET )
-	{
-		if (!SLOT->fb_shift)
-			out = 0;
-		SLOT->op1_out1 = op_calc1(SLOT->phase, env, (out<<SLOT->fb_shift), SLOT->wavetable );
-	}
-
-	/* SLOT 2 */
-
-	SLOT++;
-	env = volume_calc(SLOT);
-	if( env < ENV_QUIET )
-	{
-		signed int outp = op_calc(SLOT->phase, env, phase_modulation, SLOT->wavetable);
-		chip->output0 += outp;
-		/* output0 += op_calc(SLOT->phase, env, phase_modulation, SLOT->wavetable); */
-	}
-}
-
-/*
- operators used in the rhythm sounds generation process:
-
- Envelope Generator:
-
-channel operator register number Bass High Snare Tom Top
-/ slot number TL ARDR SLRR Wave Drum Hat Drum Tom Cymbal
- 6 / 0 12 50 70 90 f0 +
- 6 / 1 15 53 73 93 f3 +
- 7 / 0 13 51 71 91 f1 +
- 7 / 1 16 54 74 94 f4 +
- 8 / 0 14 52 72 92 f2 +
- 8 / 1 17 55 75 95 f5 +
-
- Phase Generator:
-
-channel operator register number Bass High Snare Tom Top
-/ slot number MULTIPLE Drum Hat Drum Tom Cymbal
- 6 / 0 12 30 +
- 6 / 1 15 33 +
- 7 / 0 13 31 + + +
- 7 / 1 16 34 ----- n o t u s e d -----
- 8 / 0 14 32 +
- 8 / 1 17 35 + +
-
-channel operator register number Bass High Snare Tom Top
-number number BLK/FNUM2 FNUM Drum Hat Drum Tom Cymbal
- 6 12,15 B6 A6 +
-
- 7 13,16 B7 A7 + + +
-
- 8 14,17 B8 A8 + + +
-
-*/
-
-/* calculate rhythm */
-
-INLINE void rhythm_calc( YM2413 *chip, OPLL_CH *CH, unsigned int noise )
-{
-	OPLL_SLOT *SLOT;
-	signed int out;
-	unsigned int env;
-	signed int phase_modulation;	/* phase modulation input (SLOT 2) */
-
-
-	/* Bass Drum (verified on real YM3812):
- - depends on the channel 6 'connect' register:
- when connect = 0 it works the same as in normal (non-rhythm) mode (op1->op2->out)
- when connect = 1 _only_ operator 2 is present on output (op2->out), operator 1 is ignored
- - output sample always is multiplied by 2
- */
-
-
-	/* SLOT 1 */
-	if ( !(chip->mask & OPLL_MASK_BD) )
-	{
-		SLOT = &CH6.SLOTSLOT1;
-		env = volume_calc(SLOT);
-
-		out = SLOT->op1_out0 + SLOT->op1_out1;
-		SLOT->op1_out0 = SLOT->op1_out1;
-
-		phase_modulation = SLOT->op1_out0;
-
-		SLOT->op1_out1 = 0;
-		if( env < ENV_QUIET )
-		{
-			if (!SLOT->fb_shift)
-				out = 0;
-			SLOT->op1_out1 = op_calc1(SLOT->phase, env, (out<<SLOT->fb_shift), SLOT->wavetable );
-		}
-
-		/* SLOT 2 */
-		SLOT++;
-		env = volume_calc(SLOT);
-		if( env < ENV_QUIET )
-			chip->output1 += op_calc(SLOT->phase, env, phase_modulation, SLOT->wavetable) * 2;
-	}
-
-
-	/* Phase generation is based on:
-	HH (13) channel 7->slot 1 combined with channel 8->slot 2 (same combination as TOP CYMBAL but different output phases)
-	SD (16) channel 7->slot 1
-	TOM (14) channel 8->slot 1
-	TOP (17) channel 7->slot 1 combined with channel 8->slot 2 (same combination as HIGH HAT but different output phases) */
-
-	/* Envelope generation based on:
-	HH channel 7->slot1
-	SD channel 7->slot2
-	TOM channel 8->slot1
-	TOP channel 8->slot2 */
-
-
-	/* The following formulas can be well optimized.
- I leave them in direct form for now (in case I've missed something).
- */
-
-	/* High Hat (verified on real YM3812) */
-	if ( !(chip->mask & OPLL_MASK_HH) )
-	{
-		env = volume_calc(chip->SLOT7_1);
-		if( env < ENV_QUIET )
-		{
-
-			/* high hat phase generation:
-			phase = d0 or 234 (based on frequency only)
-			phase = 34 or 2d0 (based on noise)
-			*/
-
-			/* base frequency derived from operator 1 in channel 7 */
-			unsigned char bit7 = ((chip->SLOT7_1->phase>>FREQ_SH)>>7)&1;
-			unsigned char bit3 = ((chip->SLOT7_1->phase>>FREQ_SH)>>3)&1;
-			unsigned char bit2 = ((chip->SLOT7_1->phase>>FREQ_SH)>>2)&1;
-
-			unsigned char res1 = (bit2 ^ bit7) | bit3;
-
-			/* when res1 = 0 phase = 0x000 | 0xd0; */
-			/* when res1 = 1 phase = 0x200 | (0xd0>>2); */
-			UINT32 phase = res1 ? (0x200|(0xd0>>2)) : 0xd0;
-
-			/* enable gate based on frequency of operator 2 in channel 8 */
-			unsigned char bit5e= ((chip->SLOT8_2->phase>>FREQ_SH)>>5)&1;
-			unsigned char bit3e= ((chip->SLOT8_2->phase>>FREQ_SH)>>3)&1;
-
-			unsigned char res2 = (bit3e | bit5e);
-
-			/* when res2 = 0 pass the phase from calculation above (res1); */
-			/* when res2 = 1 phase = 0x200 | (0xd0>>2); */
-			if (res2)
-				phase = (0x200|(0xd0>>2));
-
-
-			/* when phase & 0x200 is set and noise=1 then phase = 0x200|0xd0 */
-			/* when phase & 0x200 is set and noise=0 then phase = 0x200|(0xd0>>2), ie no change */
-			if (phase&0x200)
-			{
-				if (noise)
-					phase = 0x200|0xd0;
-			}
-			else
-				/* when phase & 0x200 is clear and noise=1 then phase = 0xd0>>2 */
-				/* when phase & 0x200 is clear and noise=0 then phase = 0xd0, ie no change */
-			{
-				if (noise)
-					phase = 0xd0>>2;
-			}
-
-			chip->output1 += op_calc(phase<<FREQ_SH, env, 0, chip->SLOT7_1->wavetable) * 2;
-		}
-	}
-
-	/* Snare Drum (verified on real YM3812) */
-	if ( !(chip->mask & OPLL_MASK_SD) )
-	{
-		env = volume_calc(chip->SLOT7_2);
-		if( env < ENV_QUIET )
-		{
-			/* base frequency derived from operator 1 in channel 7 */
-			unsigned char bit8 = ((chip->SLOT7_1->phase>>FREQ_SH)>>8)&1;
-
-			/* when bit8 = 0 phase = 0x100; */
-			/* when bit8 = 1 phase = 0x200; */
-			UINT32 phase = bit8 ? 0x200 : 0x100;
-
-			/* Noise bit XOR'es phase by 0x100 */
-			/* when noisebit = 0 pass the phase from calculation above */
-			/* when noisebit = 1 phase ^= 0x100; */
-			/* in other words: phase ^= (noisebit<<8); */
-			if (noise)
-				phase ^= 0x100;
-
-			chip->output1 += op_calc(phase<<FREQ_SH, env, 0, chip->SLOT7_2->wavetable) * 2;
-		}
-	}
-
-	/* Tom Tom (verified on real YM3812) */
-	if ( !(chip->mask & OPLL_MASK_TOM) )
-	{
-		env = volume_calc(chip->SLOT8_1);
-		if( env < ENV_QUIET )
-			chip->output1 += op_calc(chip->SLOT8_1->phase, env, 0, chip->SLOT8_1->wavetable) * 2;
-	}
-
-	/* Top Cymbal (verified on real YM2413) */
-	if ( !(chip->mask & OPLL_MASK_CYM) )
-	{
-		env = volume_calc(chip->SLOT8_2);
-		if( env < ENV_QUIET )
-		{
-			/* base frequency derived from operator 1 in channel 7 */
-			unsigned char bit7 = ((chip->SLOT7_1->phase>>FREQ_SH)>>7)&1;
-			unsigned char bit3 = ((chip->SLOT7_1->phase>>FREQ_SH)>>3)&1;
-			unsigned char bit2 = ((chip->SLOT7_1->phase>>FREQ_SH)>>2)&1;
-
-			unsigned char res1 = (bit2 ^ bit7) | bit3;
-
-			/* when res1 = 0 phase = 0x000 | 0x100; */
-			/* when res1 = 1 phase = 0x200 | 0x100; */
-			UINT32 phase = res1 ? 0x300 : 0x100;
-
-			/* enable gate based on frequency of operator 2 in channel 8 */
-			unsigned char bit5e= ((chip->SLOT8_2->phase>>FREQ_SH)>>5)&1;
-			unsigned char bit3e= ((chip->SLOT8_2->phase>>FREQ_SH)>>3)&1;
-
-			unsigned char res2 = (bit3e | bit5e);
-			/* when res2 = 0 pass the phase from calculation above (res1); */
-			/* when res2 = 1 phase = 0x200 | 0x100; */
-			if (res2)
-				phase = 0x300;
-
-			chip->output1 += op_calc(phase<<FREQ_SH, env, 0, chip->SLOT8_2->wavetable) * 2;
-		}
-	}
-}
-
-
-/* generic table initialize */
-static int init_tables(void)
-{
-	signed int i,x;
-	signed int n;
-	double o,m;
-
-
-	for (x=0; x<TL_RES_LEN; x++)
-	{
-		m = (1<<16) / pow(2, (x+1) * (ENV_STEP/4.0) / 8.0);
-		m = floor(m);
-
-		/* we never reach (1<<16) here due to the (x+1) */
-		/* result fits within 16 bits at maximum */
-
-		n = (int)m;		/* 16 bits here */
-		n >>= 4;		/* 12 bits here */
-		if (n&1)		/* round to nearest */
-			n = (n>>1)+1;
-		else
-			n = n>>1;
-						/* 11 bits here (rounded) */
-		tl_tab x*2 + 0 = n;
-		tl_tab x*2 + 1 = -tl_tab x*2 + 0 ;
-
-		for (i=1; i<11; i++)
-		{
-			tl_tab x*2+0 + i*2*TL_RES_LEN = tl_tab x*2+0 >>i;
-			tl_tab x*2+1 + i*2*TL_RES_LEN = -tl_tab x*2+0 + i*2*TL_RES_LEN ;
-		}
-	#if 0
-			logerror("tl %04i", x*2);
-			for (i=0; i<11; i++)
-				logerror(", %02i %5i", i*2, tl_tab x*2 /*+1*/ + i*2*TL_RES_LEN );
-			logerror("\n");
-	#endif
-	}
-	/*logerror("ym2413.c: TL_TAB_LEN = %i elements (%i bytes)\n",TL_TAB_LEN, (int)sizeof(tl_tab));*/
-
-
-	for (i=0; i<SIN_LEN; i++)
-	{
-		/* non-standard sinus */
-		m = sin( ((i*2)+1) * M_PI / SIN_LEN ); /* checked against the real chip */
-
-		/* we never reach zero here due to ((i*2)+1) */
-
-		if (m>0.0)
-			o = 8*log(1.0/m)/log(2.0);	/* convert to 'decibels' */
-		else
-			o = 8*log(-1.0/m)/log(2.0);	/* convert to 'decibels' */
-
-		o = o / (ENV_STEP/4);
-
-		n = (int)(2.0*o);
-		if (n&1)						/* round to nearest */
-			n = (n>>1)+1;
-		else
-			n = n>>1;
-
-		/* waveform 0: standard sinus */
-		sin_tab i = n*2 + (m>=0.0? 0: 1 );
-
-		/*logerror("ym2413.c: sin %4i (hex=%03x)= %4i (tl_tab value=%5i)\n", i, i, sin_tabi, tl_tabsin_tabi );*/
-
-
-		/* waveform 1: __ __ */
-		/* / \____/ \____*/
-		/* output only first half of the sinus waveform (positive one) */
-		if (i & (1<<(SIN_BITS-1)) )
-			sin_tab1*SIN_LEN+i = TL_TAB_LEN;
-		else
-			sin_tab1*SIN_LEN+i = sin_tabi;
-
-		/*logerror("ym2413.c: sin1%4i= %4i (tl_tab value=%5i)\n", i, sin_tab1*SIN_LEN+i, tl_tabsin_tab1*SIN_LEN+i );*/
-	}
-#if 0
-	logerror("YM2413.C: ENV_QUIET= %08x (*32=%08x)\n", ENV_QUIET, ENV_QUIET*32 );
-	for (i=0; i<ENV_QUIET; i++)
-	{
-		logerror("tl_tb%4x(%4i)=%8x\n", i<<5, i, tl_tabi<<5 );
-	}
-#endif
-#ifdef SAVE_SAMPLE
-	sample0=fopen("sampsum.pcm","wb");
-#endif
-
-	return 1;
-}
-
-static void OPLL_initalize(YM2413 *chip)
-{
-	int i;
-
-	/* frequency base */
-	chip->freqbase = (chip->rate) ? ((double)chip->clock / 72.0) / chip->rate : 0;
-	if ( fabs( chip->freqbase - 1.0 ) < 0.0000001 )
-		chip->freqbase = 1.0;
-#if 0
-	chip->rate = (double)chip->clock / 72.0;
-	chip->freqbase = 1.0;
-	logerror("freqbase=%f\n", chip->freqbase);
-#endif
-
-
-
-	/* make fnumber -> increment counter table */
-	for( i = 0 ; i < 1024; i++ )
-	{
-		/* OPLL (YM2413) phase increment counter = 18bit */
-
-		chip->fn_tabi = (UINT32)( (double)i * 64 * chip->freqbase * (1<<(FREQ_SH-10)) ); /* -10 because chip works with 10.10 fixed point, while we use 16.16 */
-#if 0
-		logerror("ym2413.c: fn_tab%4i = %08x (dec=%8i)\n",
-				 i, chip->fn_tabi>>6, chip->fn_tabi>>6 );
-#endif
-	}
-
-#if 0
-	for( i=0 ; i < 16 ; i++ )
-	{
-		logerror("ym2413.c: sl_tab%i = %08x\n", i, sl_tabi );
-	}
-	for( i=0 ; i < 8 ; i++ )
-	{
-		int j;
-		logerror("ym2413.c: ksl_taboct=%2i =",i);
-		for (j=0; j<16; j++)
-		{
-			logerror("%08x ", ksl_tabi*16+j );
-		}
-		logerror("\n");
-	}
-#endif
-
-
-	/* Amplitude modulation: 27 output levels (triangle waveform); 1 level takes one of: 192, 256 or 448 samples */
-	/* One entry from LFO_AM_TABLE lasts for 64 samples */
-	chip->lfo_am_inc = (1.0 / 64.0 ) * (1<<LFO_SH) * chip->freqbase;
-
-	/* Vibrato: 8 output levels (triangle waveform); 1 level takes 1024 samples */
-	chip->lfo_pm_inc = (1.0 / 1024.0) * (1<<LFO_SH) * chip->freqbase;
-
-	/*logerror ("chip->lfo_am_inc = %8x ; chip->lfo_pm_inc = %8x\n", chip->lfo_am_inc, chip->lfo_pm_inc);*/
-
-	/* Noise generator: a step takes 1 sample */
-	chip->noise_f = (1.0 / 1.0) * (1<<FREQ_SH) * chip->freqbase;
-	/*logerror("YM2413init noise_f=%8x\n", chip->noise_f);*/
-
-	chip->eg_timer_add = (1<<EG_SH) * chip->freqbase;
-	chip->eg_timer_overflow = ( 1 ) * (1<<EG_SH);
-	/*logerror("YM2413init eg_timer_add=%8x eg_timer_overflow=%8x\n", chip->eg_timer_add, chip->eg_timer_overflow);*/
-}
-
-INLINE void KEY_ON(OPLL_SLOT *SLOT, UINT32 key_set)
-{
-	if( !SLOT->key )
-	{
-		/* do NOT restart Phase Generator (verified on real YM2413)*/
-		/* phase -> Dump */
-		SLOT->state = EG_DMP;
-	}
-	SLOT->key |= key_set;
-}
-
-INLINE void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr)
-{
-	if( SLOT->key )
-	{
-		SLOT->key &= key_clr;
-
-		if( !SLOT->key )
-		{
-			/* phase -> Release */
-			if (SLOT->state>EG_REL)
-				SLOT->state = EG_REL;
-		}
-	}
-}
-
-/* update phase increment counter of operator (also update the EG rates if necessary) */
-INLINE void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT)
-{
-	int ksr;
-	UINT32 SLOT_rs;
-	UINT32 SLOT_dp;
-
-	/* (frequency) phase increment counter */
-	SLOT->freq = CH->fc * SLOT->mul;
-	ksr = CH->kcode >> SLOT->KSR;
-
-	if( SLOT->ksr != ksr )
-	{
-		SLOT->ksr = ksr;
-
-		/* calculate envelope generator rates */
-		if ((SLOT->ar + SLOT->ksr) < 16+62)
-		{
-			SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
-			SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
-		}
-		else
-		{
-			SLOT->eg_sh_ar = 0;
-			SLOT->eg_sel_ar = 13*RATE_STEPS;
-		}
-		SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
-		SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
-		SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
-		SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
-
-	}
-
-	if (CH->sus)
-		SLOT_rs = 16 + (5<<2);
-	else
-		SLOT_rs = 16 + (7<<2);
-
-	SLOT->eg_sh_rs = eg_rate_shift SLOT_rs + SLOT->ksr ;
-	SLOT->eg_sel_rs = eg_rate_selectSLOT_rs + SLOT->ksr ;
-
-	SLOT_dp = 16 + (13<<2);
-	SLOT->eg_sh_dp = eg_rate_shift SLOT_dp + SLOT->ksr ;
-	SLOT->eg_sel_dp = eg_rate_selectSLOT_dp + SLOT->ksr ;
-}
-
-/* set multi,am,vib,EG-TYP,KSR,mul */
-INLINE void set_mul(YM2413 *chip,int slot,int v)
-{
-	OPLL_CH *CH = &chip->P_CHslot/2;
-	OPLL_SLOT *SLOT = &CH->SLOTslot&1;
-
-	SLOT->mul = mul_tabv&0x0f;
-	SLOT->KSR = (v&0x10) ? 0 : 2;
-	SLOT->eg_type = (v&0x20);
-	SLOT->vib = (v&0x40);
-	SLOT->AMmask = (v&0x80) ? ~0 : 0;
-	CALC_FCSLOT(CH,SLOT);
-}
-
-/* set ksl, tl */
-INLINE void set_ksl_tl(YM2413 *chip,int chan,int v)
-{
-	int ksl;
-	OPLL_CH *CH = &chip->P_CHchan;
-/* modulator */
-	OPLL_SLOT *SLOT = &CH->SLOTSLOT1;
-
-	ksl = v>>6; /* 0 / 1.5 / 3.0 / 6.0 dB/OCT */
-
-	SLOT->ksl = ksl ? 3-ksl : 31;
-	SLOT->TL = (v&0x3f)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
-	SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
-}
-
-/* set ksl , waveforms, feedback */
-INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v)
-{
-	int ksl;
-	OPLL_CH *CH = &chip->P_CHchan;
-/* modulator */
-	OPLL_SLOT *SLOT = &CH->SLOTSLOT1;
-	SLOT->wavetable = ((v&0x08)>>3)*SIN_LEN;
-	SLOT->fb_shift = (v&7) ? (v&7) + 8 : 0;
-
-/*carrier*/
-	SLOT = &CH->SLOTSLOT2;
-	ksl = v>>6; /* 0 / 1.5 / 3.0 / 6.0 dB/OCT */
-
-	SLOT->ksl = ksl ? 3-ksl : 31;
-	SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
-
-	SLOT->wavetable = ((v&0x10)>>4)*SIN_LEN;
-}
-
-/* set attack rate & decay rate */
-INLINE void set_ar_dr(YM2413 *chip,int slot,int v)
-{
-	OPLL_CH *CH = &chip->P_CHslot/2;
-	OPLL_SLOT *SLOT = &CH->SLOTslot&1;
-
-	SLOT->ar = (v>>4) ? 16 + ((v>>4) <<2) : 0;
-
-	if ((SLOT->ar + SLOT->ksr) < 16+62)
-	{
-		SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
-		SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
-	}
-	else
-	{
-		SLOT->eg_sh_ar = 0;
-		SLOT->eg_sel_ar = 13*RATE_STEPS;
-	}
-
-	SLOT->dr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
-	SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
-	SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
-}
-
-/* set sustain level & release rate */
-INLINE void set_sl_rr(YM2413 *chip,int slot,int v)
-{
-	OPLL_CH *CH = &chip->P_CHslot/2;
-	OPLL_SLOT *SLOT = &CH->SLOTslot&1;
-
-	SLOT->sl = sl_tab v>>4 ;
-
-	SLOT->rr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
-	SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
-	SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
-}
-
-static void load_instrument(YM2413 *chip, UINT32 chan, UINT32 slot, UINT8* inst )
-{
-	set_mul			(chip, slot, inst0);
-	set_mul			(chip, slot+1, inst1);
-	set_ksl_tl		(chip, chan, inst2);
-	set_ksl_wave_fb	(chip, chan, inst3);
-	set_ar_dr		(chip, slot, inst4);
-	set_ar_dr		(chip, slot+1, inst5);
-	set_sl_rr		(chip, slot, inst6);
-	set_sl_rr		(chip, slot+1, inst7);
-}
-static void update_instrument_zero(YM2413 *chip, UINT8 r )
-{
-	UINT8* inst = &chip->inst_tab00; /* point to user instrument */
-	UINT32 chan;
-	UINT32 chan_max;
-
-	chan_max = 9;
-	if (chip->rhythm & 0x20)
-		chan_max=6;
-
-	switch(r)
-	{
-	case 0:
-		for (chan=0; chan<chan_max; chan++)
-		{
-			if ((chip->instvol_rchan&0xf0)==0)
-			{
-				set_mul			(chip, chan*2, inst0);
-			}
-		}
- break;
-	case 1:
-		for (chan=0; chan<chan_max; chan++)
-		{
-			if ((chip->instvol_rchan&0xf0)==0)
-			{
-				set_mul			(chip, chan*2+1,inst1);
-			}
-		}
- break;
-	case 2:
-		for (chan=0; chan<chan_max; chan++)
-		{
-			if ((chip->instvol_rchan&0xf0)==0)
-			{
-				set_ksl_tl		(chip, chan, inst2);
-			}
-		}
- break;
-	case 3:
-		for (chan=0; chan<chan_max; chan++)
-		{
-			if ((chip->instvol_rchan&0xf0)==0)
-			{
-				set_ksl_wave_fb	(chip, chan, inst3);
-			}
-		}
- break;
-	case 4:
-		for (chan=0; chan<chan_max; chan++)
-		{
-			if ((chip->instvol_rchan&0xf0)==0)
-			{
-				set_ar_dr		(chip, chan*2, inst4);
-			}
-		}
- break;
-	case 5:
-		for (chan=0; chan<chan_max; chan++)
-		{
-			if ((chip->instvol_rchan&0xf0)==0)
-			{
-				set_ar_dr		(chip, chan*2+1,inst5);
-			}
-		}
- break;
-	case 6:
-		for (chan=0; chan<chan_max; chan++)
-		{
-			if ((chip->instvol_rchan&0xf0)==0)
-			{
-				set_sl_rr		(chip, chan*2, inst6);
-			}
-		}
- break;
-	case 7:
-		for (chan=0; chan<chan_max; chan++)
-		{
-			if ((chip->instvol_rchan&0xf0)==0)
-			{
-				set_sl_rr		(chip, chan*2+1,inst7);
-			}
-		}
- break;
- }
-}
-
-/* write a value v to register r on chip chip */
-static void OPLLWriteReg(YM2413 *chip, int r, int v)
-{
-	OPLL_CH *CH;
-	OPLL_SLOT *SLOT;
-	UINT8 *inst;
-	int chan;
-	int slot;
-
-	/* adjust bus to 8 bits */
-	r &= 0xff;
-	v &= 0xff;
-
-
-	switch(r&0xf0)
-	{
-	case 0x00:	/* 00-0f:control */
-	{
-		switch(r&0x0f)
-		{
-		case 0x00:	/* AM/VIB/EGTYP/KSR/MULTI (modulator) */
-		case 0x01:	/* AM/VIB/EGTYP/KSR/MULTI (carrier) */
-		case 0x02:	/* Key Scale Level, Total Level (modulator) */
-		case 0x03:	/* Key Scale Level, carrier waveform, modulator waveform, Feedback */
-		case 0x04:	/* Attack, Decay (modulator) */
-		case 0x05:	/* Attack, Decay (carrier) */
-		case 0x06:	/* Sustain, Release (modulator) */
-		case 0x07:	/* Sustain, Release (carrier) */
-			chip->inst_tab0r & 0x07 = v;
-			update_instrument_zero(chip,r&7);
-		break;
-
-		case 0x0e:	/* x, x, r,bd,sd,tom,tc,hh */
-		{
-			if(v&0x20)
-			{
-				if ((chip->rhythm&0x20)==0)
-				/*rhythm off to on*/
-				{
-					logerror("YM2413: Rhythm mode enable\n");
-
-	/* Load instrument settings for channel seven(chan=6 since we're zero based). (Bass drum) */
-					chan = 6;
-					inst = &chip->inst_tab160;
-					slot = chan*2;
-
-					load_instrument(chip, chan, slot, inst);
-
-	/* Load instrument settings for channel eight. (High hat and snare drum) */
-					chan = 7;
-					inst = &chip->inst_tab170;
-					slot = chan*2;
-
-					load_instrument(chip, chan, slot, inst);
-
-					CH = &chip->P_CHchan;
-					SLOT = &CH->SLOTSLOT1; /* modulator envelope is HH */
-					SLOT->TL = ((chip->instvol_rchan>>4)<<2)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
-					SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
-
-	/* Load instrument settings for channel nine. (Tom-tom and top cymbal) */
-					chan = 8;
-					inst = &chip->inst_tab180;
-					slot = chan*2;
-
-					load_instrument(chip, chan, slot, inst);
-
-					CH = &chip->P_CHchan;
-					SLOT = &CH->SLOTSLOT1; /* modulator envelope is TOM */
-					SLOT->TL = ((chip->instvol_rchan>>4)<<2)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
-					SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
-				}
-				/* BD key on/off */
-				if(v&0x10)
-				{
-					KEY_ON (&chip->P_CH6.SLOTSLOT1, 2);
-					KEY_ON (&chip->P_CH6.SLOTSLOT2, 2);
-				}
-				else
-				{
-					KEY_OFF(&chip->P_CH6.SLOTSLOT1,~2);
-					KEY_OFF(&chip->P_CH6.SLOTSLOT2,~2);
-				}
-				/* HH key on/off */
-				if(v&0x01) KEY_ON (&chip->P_CH7.SLOTSLOT1, 2);
-				else KEY_OFF(&chip->P_CH7.SLOTSLOT1,~2);
-				/* SD key on/off */
-				if(v&0x08) KEY_ON (&chip->P_CH7.SLOTSLOT2, 2);
-				else KEY_OFF(&chip->P_CH7.SLOTSLOT2,~2);
-				/* TOM key on/off */
-				if(v&0x04) KEY_ON (&chip->P_CH8.SLOTSLOT1, 2);
-				else KEY_OFF(&chip->P_CH8.SLOTSLOT1,~2);
-				/* TOP-CY key on/off */
-				if(v&0x02) KEY_ON (&chip->P_CH8.SLOTSLOT2, 2);
-				else KEY_OFF(&chip->P_CH8.SLOTSLOT2,~2);
-			}
-			else
-			{
-				if ((chip->rhythm&0x20)==1)
-				/*rhythm on to off*/
-				{
-					logerror("YM2413: Rhythm mode disable\n");
-	/* Load instrument settings for channel seven(chan=6 since we're zero based).*/
-					chan = 6;
-					inst = &chip->inst_tabchip->instvol_rchan>>40;
-					slot = chan*2;
-
-					load_instrument(chip, chan, slot, inst);
-
-	/* Load instrument settings for channel eight.*/
-					chan = 7;
-					inst = &chip->inst_tabchip->instvol_rchan>>40;
-					slot = chan*2;
-
-					load_instrument(chip, chan, slot, inst);
-
-	/* Load instrument settings for channel nine.*/
-					chan = 8;
-					inst = &chip->inst_tabchip->instvol_rchan>>40;
-					slot = chan*2;
-
-					load_instrument(chip, chan, slot, inst);
-				}
-				/* BD key off */
-				KEY_OFF(&chip->P_CH6.SLOTSLOT1,~2);
-				KEY_OFF(&chip->P_CH6.SLOTSLOT2,~2);
-				/* HH key off */
-				KEY_OFF(&chip->P_CH7.SLOTSLOT1,~2);
-				/* SD key off */
-				KEY_OFF(&chip->P_CH7.SLOTSLOT2,~2);
-				/* TOM key off */
-				KEY_OFF(&chip->P_CH8.SLOTSLOT1,~2);
-				/* TOP-CY off */
-				KEY_OFF(&chip->P_CH8.SLOTSLOT2,~2);
-			}
-			chip->rhythm = v&0x3f;
-		}
-		break;
-		}
-	}
-	break;
-
-	case 0x10:
-	case 0x20:
-	{
-		int block_fnum;
-
-		chan = r&0x0f;
-
-		if (chan >= 9)
-			chan -= 9;	/* verified on real YM2413 */
-
-		CH = &chip->P_CHchan;
-
-		if(r&0x10)
-		{	/* 10-18: FNUM 0-7 */
-			block_fnum = (CH->block_fnum&0x0f00) | v;
-		}
-		else
-		{	/* 20-28: suson, keyon, block, FNUM 8 */
-			block_fnum = ((v&0x0f)<<8) | (CH->block_fnum&0xff);
-
-			if(v&0x10)
-			{
-				KEY_ON (&CH->SLOTSLOT1, 1);
-				KEY_ON (&CH->SLOTSLOT2, 1);
-			}
-			else
-			{
-				KEY_OFF(&CH->SLOTSLOT1,~1);
-				KEY_OFF(&CH->SLOTSLOT2,~1);
-			}
-
-
-			if (CH->sus!=(v&0x20))
-				logerror("chan=%i sus=%2x\n",chan,v&0x20);
-
-			CH->sus = v & 0x20;
-		}
-		/* update */
-		if(CH->block_fnum != block_fnum)
-		{
-			UINT8 block;
-
-			CH->block_fnum = block_fnum;
-
-			/* BLK 2,1,0 bits -> bits 3,2,1 of kcode, FNUM MSB -> kcode LSB */
-			CH->kcode = (block_fnum&0x0f00)>>8;
-
-			CH->ksl_base = ksl_tabblock_fnum>>5;
-
-			block_fnum = block_fnum * 2;
-			block = (block_fnum&0x1c00) >> 10;
-			CH->fc = chip->fn_tabblock_fnum&0x03ff >> (7-block);
-
-			/* refresh Total Level in both SLOTs of this channel */
-			CH->SLOTSLOT1.TLL = CH->SLOTSLOT1.TL + (CH->ksl_base>>CH->SLOTSLOT1.ksl);
-			CH->SLOTSLOT2.TLL = CH->SLOTSLOT2.TL + (CH->ksl_base>>CH->SLOTSLOT2.ksl);
-
-			/* refresh frequency counter in both SLOTs of this channel */
-			CALC_FCSLOT(CH,&CH->SLOTSLOT1);
-			CALC_FCSLOT(CH,&CH->SLOTSLOT2);
-		}
-	}
-	break;
-
-	case 0x30:	/* inst 4 MSBs, VOL 4 LSBs */
-	{
-		UINT8 old_instvol;
-
-		chan = r&0x0f;
-
-		if (chan >= 9)
-			chan -= 9;	/* verified on real YM2413 */
-
-		old_instvol = chip->instvol_rchan;
-		chip->instvol_rchan = v;	/* store for later use */
-
-		CH = &chip->P_CHchan;
-		SLOT = &CH->SLOTSLOT2; /* carrier */
-		SLOT->TL = ((v&0x0f)<<2)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
-		SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
-
-
-		/*check wether we are in rhythm mode and handle instrument/volume register accordingly*/
-		if ((chan>=6) && (chip->rhythm&0x20))
-		{
-			/* we're in rhythm mode*/
-
-			if (chan>=7) /* only for channel 7 and 8 (channel 6 is handled in usual way)*/
-			{
-				SLOT = &CH->SLOTSLOT1; /* modulator envelope is HH(chan=7) or TOM(chan=8) */
-				SLOT->TL = ((chip->instvol_rchan>>4)<<2)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
-				SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
-			}
-		}
-		else
-		{
-			if ( (old_instvol&0xf0) == (v&0xf0) )
-				return;
-
-			inst = &chip->inst_tabchip->instvol_rchan>>40;
-			slot = chan*2;
-
-			load_instrument(chip, chan, slot, inst);
-
-		#if 0
-			logerror("YM2413: chan#%02i inst=%02i: (r=%2x, v=%2x)\n",chan,v>>4,r,v);
-			logerror(" 0:%2x 1:%2x\n",inst0,inst1);	logerror(" 2:%2x 3:%2x\n",inst2,inst3);
-			logerror(" 4:%2x 5:%2x\n",inst4,inst5);	logerror(" 6:%2x 7:%2x\n",inst6,inst7);
-		#endif
-		}
-	}
-	break;
-
-	default:
-	break;
-	}
-}
-
-/* lock/unlock for common table */
-static void OPLLResetChip(YM2413 *chip)
-{
-	int c,s;
-	int i;
-
-	chip->eg_timer = 0;
-	chip->eg_cnt = 0;
-
-	chip->noise_rng = 1;	/* noise shift register */
-
-	chip->mask = 0;
-
-	/* setup instruments table */
-	if (!chip->chip_type)
-	{
-		for (i=0; i<19; i++)
-		{
-			for (c=0; c<8; c++)
-			{
-				chip->inst_tabic = tableic;
-			}
-		}
-	}
-	else
-	{
-		memset( &chip->inst_tab, 0, sizeof(chip->inst_tab) );
-
-		for (i=0; i<15; i++)
-		{
-			for (c=0; c<8; c++)
-			{
-				chip->inst_tabi+1c = table_vrc7ic;
-			}
-		}
-	}
-
-
-	/* reset with register write */
-	OPLLWriteReg(chip,0x0f,0); /*test reg*/
-	for(i = 0x3f ; i >= 0x10 ; i-- ) OPLLWriteReg(chip,i,0x00);
-
-	/* reset operator parameters */
-	for( c = 0 ; c < 9 ; c++ )
-	{
-		OPLL_CH *CH = &chip->P_CHc;
-		for(s = 0 ; s < 2 ; s++ )
-		{
-			/* wave table */
-			CH->SLOTs.wavetable = 0;
-			CH->SLOTs.state = EG_OFF;
-			CH->SLOTs.volume = MAX_ATT_INDEX;
-		}
-	}
-}
-
-/* Create one of virtual YM2413 */
-/* 'clock' is chip clock in Hz */
-/* 'rate' is sampling rate */
-static YM2413 *OPLLCreate(int clock, int rate, int type)
-{
-	char *ptr;
-	YM2413 *chip;
-	int state_size;
-
-	init_tables();
-
-	/* calculate chip state size */
-	state_size = sizeof(YM2413);
-
-	/* allocate memory block */
-	ptr = (char *)malloc(state_size);
-
-	if (ptr==NULL)
-		return NULL;
-
-	/* clear */
-	memset(ptr,0,state_size);
-
-	chip = (YM2413 *)ptr;
-
-	chip->clock = clock;
-	chip->rate = rate;
-
-	chip->chip_type = type;
-
-	chip->mask = 0;
-
-	/* init global tables */
-	OPLL_initalize(chip);
-
-	/* reset chip */
-	OPLLResetChip(chip);
-	return chip;
-}
-
-/* Destroy one of virtual YM3812 */
-static void OPLLDestroy(YM2413 *chip)
-{
-	free(chip);
-}
-
-/* Option handlers */
-
-static void OPLLSetUpdateHandler(YM2413 *chip,OPLL_UPDATEHANDLER UpdateHandler,void * param)
-{
-	chip->UpdateHandler = UpdateHandler;
-	chip->UpdateParam = param;
-}
-
-/* YM3812 I/O interface */
-static void OPLLWrite(YM2413 *chip,int a,int v)
-{
-	if( !(a&1) )
-	{	/* address port */
-		chip->address = v & 0xff;
-	}
-	else
-	{	/* data port */
-		if(chip->UpdateHandler) chip->UpdateHandler(chip->UpdateParam,0);
-		OPLLWriteReg(chip,chip->address,v);
-	}
-}
-
-static unsigned char OPLLRead(YM2413 *chip,int a)
-{
-	if( !(a&1) )
-	{
-		/* status port */
-		return chip->status;
-	}
-	return 0xff;
-}
-
-
-
-
-
-void * ym2413_init(int clock, int rate, int type)
-{
-	/* emulator create */
-	return OPLLCreate(clock, rate, type);
-}
-
-void ym2413_shutdown(void *chip)
-{
-	YM2413 *OPLL = (YM2413 *)chip;
-
-	/* emulator shutdown */
-	OPLLDestroy(OPLL);
-}
-
-void ym2413_reset_chip(void *chip)
-{
-	YM2413 *OPLL = (YM2413 *)chip;
-	OPLLResetChip(OPLL);
-}
-
-void ym2413_write(void *chip, int a, int v)
-{
-	YM2413 *OPLL = (YM2413 *)chip;
-	OPLLWrite(OPLL, a, v);
-}
-
-unsigned char ym2413_read(void *chip, int a)
-{
-	YM2413 *OPLL = (YM2413 *)chip;
-	return OPLLRead(OPLL, a) & 0x03 ;
-}
-
-void ym2413_set_update_handler(void *chip,OPLL_UPDATEHANDLER UpdateHandler,void *param)
-{
-	YM2413 *OPLL = (YM2413 *)chip;
-	OPLLSetUpdateHandler(OPLL, UpdateHandler, param);
-}
-
-
-/*
-** Generate samples for one of the YM2413's
-**
-** 'which' is the virtual YM2413 number
-** '*buffer' is the output buffer pointer
-** 'length' is the number of samples that should be generated
-*/
-void ym2413_update_one(void *_chip, SAMP **buffers, int length)
-{
-	YM2413		*chip = (YM2413 *)_chip;
-	UINT8		rhythm = chip->rhythm&0x20;
-	SAMP		*bufMO = buffers0;
-	SAMP		*bufRO = buffers1;
-
-	int i,j;
-
-	chip->SLOT7_1 = &chip->P_CH7.SLOTSLOT1;
-	chip->SLOT7_2 = &chip->P_CH7.SLOTSLOT2;
-	chip->SLOT8_1 = &chip->P_CH8.SLOTSLOT1;
-	chip->SLOT8_2 = &chip->P_CH8.SLOTSLOT2;
-
-
-	for( i=0; i < length ; i++ )
-	{
-		int mo,ro;
-
-		chip->output0 = 0;
-		chip->output1 = 0;
-
-		advance_lfo(chip);
-
-#if 0
-		/* FM part */
-		chan_calc(chip,&chip->P_CH0);
-/* SAVE_SEPARATE_CHANNEL(0); */
-		chan_calc(chip,&chip->P_CH1);
-		chan_calc(chip,&chip->P_CH2);
-		chan_calc(chip,&chip->P_CH3);
-		chan_calc(chip,&chip->P_CH4);
-		chan_calc(chip,&chip->P_CH5);
-#else
-		for ( j=0; j < 6; j++ )
-		{
-			if (!(chip->mask & OPLL_MASK_CH(j))) chan_calc(chip, &chip->P_CHj);
-		}
-#endif
-
-		if(!rhythm)
-		{
-#if 0
-			chan_calc(chip,&chip->P_CH6);
-			chan_calc(chip,&chip->P_CH7);
-			chan_calc(chip,&chip->P_CH8);
-#else
-			for ( j=6; j < 9; j++ )
-			{
-				if (!(chip->mask & OPLL_MASK_CH(j))) chan_calc(chip, &chip->P_CHj);
-			}
-#endif
-		}
-		else		/* Rhythm part */
-		{
-			if ( ( chip->mask & OPLL_MASK_RHYTHM ) != OPLL_MASK_RHYTHM )
-				rhythm_calc(chip,&chip->P_CH0, (chip->noise_rng>>0)&1 );
-		}
-
-		mo = chip->output0;
-		ro = chip->output1;
-
-		mo >>= FINAL_SH;
-		ro >>= FINAL_SH;
-
-		/* limit check */
-		mo = limit( mo , MAXOUT, MINOUT );
-		ro = limit( ro , MAXOUT, MINOUT );
-
-		/* store to sound buffer */
-		bufMOi = mo;
-		bufROi = ro;
-
-		advance(chip);
-	}
-
-}
-
-void ym2413_advance_lfo(void *_chip)
-{
-	YM2413		*chip = (YM2413 *)_chip;
-	advance_lfo(chip);
-}
-
-void ym2413_advance(void *_chip)
-{
-	YM2413		*chip = (YM2413 *)_chip;
-	advance(chip);
-}
-
-SAMP ym2413_calcch(void *_chip, int ch)
-{
-	YM2413		*chip = (YM2413 *)_chip;
-
-	int output;
-
-	chip->output0 = 0;
-	chip->output1 = 0;
-
-	if (ch >= 0 && ch < 6) chan_calc( chip, &chip->P_CHch );
-	else if (ch >= 6 && ch < 9)
-	{
-		UINT8		rhythm = chip->rhythm&0x20;
-		if (!rhythm) chan_calc( chip, &chip->P_CHch );
-		else if (ch == 6) rhythm_calc(chip,&chip->P_CH0, (chip->noise_rng>>0)&1 );
-	}
-
-	output = chip->output0;
-	output += chip->output1;
-
-	return output;
-}
-
-void * ym2413_get_inst0(void *_chip)
-{
-	YM2413		*chip = (YM2413 *)_chip;
-
-	return &chip->inst_tab;
-}
-
-void ym2413_set_mask(void *_chip, UINT32 mask)
-{
-	YM2413		*chip = (YM2413 *)_chip;
-
-	chip->mask = mask;
-}
-

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/ym2413.h Deleted

@@ -1,61 +0,0 @@
-#pragma once
-
-#ifndef __YM2413_H__
-#define __YM2413_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* select output bits size of output : 8 or 16 */
-#define SAMPLE_BITS 16
-
-/* compiler dependence */
-#ifndef __OSDCOMM_H__
-#define __OSDCOMM_H__
-typedef unsigned char	UINT8;   /* unsigned  8bit */
-typedef unsigned short	UINT16;  /* unsigned 16bit */
-typedef unsigned int	UINT32;  /* unsigned 32bit */
-typedef signed char		INT8;    /* signed  8bit   */
-typedef signed short	INT16;   /* signed 16bit   */
-typedef signed int		INT32;   /* signed 32bit   */
-
-typedef INT32           stream_sample_t;
-#endif
-
-typedef stream_sample_t SAMP;
-/*
-#if (SAMPLE_BITS==16)
-typedef INT16 SAMP;
-#endif
-#if (SAMPLE_BITS==8)
-typedef INT8 SAMP;
-#endif
-*/
-
-
-
-void *ym2413_init(int clock, int rate, int type);
-void ym2413_shutdown(void *chip);
-void ym2413_reset_chip(void *chip);
-void ym2413_write(void *chip, int a, int v);
-unsigned char ym2413_read(void *chip, int a);
-void ym2413_update_one(void *chip, SAMP **buffers, int length);
-
-void ym2413_advance_lfo(void *chip);    /* call this once */
-SAMP ym2413_calcch(void *chip, int ch); /* then call this for each channel */
-void ym2413_advance(void *chip);        /* then call this */
-
-void * ym2413_get_inst0(void *chip);
-
-void ym2413_set_mask(void *chip, UINT32 mask);
-
-typedef void (*OPLL_UPDATEHANDLER)(void *param,int min_interval_us);
-
-void ym2413_set_update_handler(void *chip, OPLL_UPDATEHANDLER UpdateHandler, void *param);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__YM2413_H__*/

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/ymdeltat.cpp Deleted

@@ -1,655 +0,0 @@
-/*
-**
-** File: ymdeltat.c
-**
-** YAMAHA DELTA-T adpcm sound emulation subroutine
-** used by fmopl.c (Y8950) and fm.c (YM2608 and YM2610/B)
-**
-** Base program is YM2610 emulator by Hiromitsu Shioya.
-** Written by Tatsuyuki Satoh
-** Improvements by Jarek Burczynski (bujar at mame dot net)
-**
-**
-** History:
-**
-** 03-08-2003 Jarek Burczynski:
-** - fixed BRDY flag implementation.
-**
-** 24-07-2003 Jarek Burczynski, Frits Hilderink:
-** - fixed delault value for control2 in YM_DELTAT_ADPCM_Reset
-**
-** 22-07-2003 Jarek Burczynski, Frits Hilderink:
-** - fixed external memory support
-**
-** 15-06-2003 Jarek Burczynski:
-** - implemented CPU -> AUDIO ADPCM synthesis (via writes to the ADPCM data reg $08)
-** - implemented support for the Limit address register
-** - supported two bits from the control register 2 ($01): RAM TYPE (x1 bit/x8 bit), ROM/RAM
-** - implemented external memory access (read/write) via the ADPCM data reg reads/writes
-** Thanks go to Frits Hilderink for the example code.
-**
-** 14-06-2003 Jarek Burczynski:
-** - various fixes to enable proper support for status register flags: BSRDY, PCM BSY, ZERO
-** - modified EOS handling
-**
-** 05-04-2003 Jarek Burczynski:
-** - implemented partial support for external/processor memory on sample replay
-**
-** 01-12-2002 Jarek Burczynski:
-** - fixed first missing sound in gigandes thanks to previous fix (interpolator) by ElSemi
-** - renamed/removed some YM_DELTAT struct fields
-**
-** 28-12-2001 Acho A. Tang
-** - added EOS status report on ADPCM playback.
-**
-** 05-08-2001 Jarek Burczynski:
-** - now_step is initialized with 0 at the start of play.
-**
-** 12-06-2001 Jarek Burczynski:
-** - corrected end of sample bug in YM_DELTAT_ADPCM_CALC.
-** Checked on real YM2610 chip - address register is 24 bits wide.
-** Thanks go to Stefan Jokisch (stefan.jokisch@gmx.de) for tracking down the problem.
-**
-** TO DO:
-** Check size of the address register on the other chips....
-**
-** Version 0.72
-**
-** sound chips that have this unit:
-** YM2608 OPNA
-** YM2610/B OPNB
-** Y8950 MSX AUDIO
-**
-*/
-
-#include "ymdeltat.h"
-#define INLINE __inline
-#define logerror (void)
-
-#define YM_DELTAT_DELTA_MAX (24576)
-#define YM_DELTAT_DELTA_MIN (127)
-#define YM_DELTAT_DELTA_DEF (127)
-
-#define YM_DELTAT_DECODE_RANGE 32768
-#define YM_DELTAT_DECODE_MIN (-(YM_DELTAT_DECODE_RANGE))
-#define YM_DELTAT_DECODE_MAX ((YM_DELTAT_DECODE_RANGE)-1)
-
-
-/* Forecast to next Forecast (rate = *8) */
-/* 1/8 , 3/8 , 5/8 , 7/8 , 9/8 , 11/8 , 13/8 , 15/8 */
-static const INT32 ym_deltat_decode_tableB116 = {
- 1, 3, 5, 7, 9, 11, 13, 15,
- -1, -3, -5, -7, -9, -11, -13, -15,
-};
-/* delta to next delta (rate= *64) */
-/* 0.9 , 0.9 , 0.9 , 0.9 , 1.2 , 1.6 , 2.0 , 2.4 */
-static const INT32 ym_deltat_decode_tableB216 = {
- 57, 57, 57, 57, 77, 102, 128, 153,
- 57, 57, 57, 57, 77, 102, 128, 153
-};
-
-#if 0
-void YM_DELTAT_BRDY_callback(YM_DELTAT *DELTAT)
-{
-	logerror("BRDY_callback reached (flag set) !\n");
-
-	/* set BRDY bit in status register */
-	if(DELTAT->status_set_handler)
-		if(DELTAT->status_change_BRDY_bit)
-			(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
-}
-#endif
-
-UINT8 YM_DELTAT_ADPCM_Read(YM_DELTAT *DELTAT)
-{
-	UINT8 v = 0;
-
-	/* external memory read */
-	if ( (DELTAT->portstate & 0xe0)==0x20 )
-	{
-		/* two dummy reads */
-		if (DELTAT->memread)
-		{
-			DELTAT->now_addr = DELTAT->start << 1;
-			DELTAT->memread--;
-			return 0;
-		}
-
-
-		if ( DELTAT->now_addr != (DELTAT->end<<1) )
-		{
-			v = DELTAT->memoryDELTAT->now_addr>>1;
-
-			/*logerror("YM Delta-T memory read $%08x, v=$%02x\n", DELTAT->now_addr >> 1, v);*/
-
-			DELTAT->now_addr+=2; /* two nibbles at a time */
-
-			/* reset BRDY bit in status register, which means we are reading the memory now */
-			if(DELTAT->status_reset_handler)
-				if(DELTAT->status_change_BRDY_bit)
-					(DELTAT->status_reset_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
-
-	/* setup a timer that will callback us in 10 master clock cycles for Y8950
- * in the callback set the BRDY flag to 1 , which means we have another data ready.
- * For now, we don't really do this; we simply reset and set the flag in zero time, so that the IRQ will work.
- */
-			/* set BRDY bit in status register */
-			if(DELTAT->status_set_handler)
-				if(DELTAT->status_change_BRDY_bit)
-					(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
-		}
-		else
-		{
-			/* set EOS bit in status register */
-			if(DELTAT->status_set_handler)
-				if(DELTAT->status_change_EOS_bit)
-					(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_EOS_bit);
-		}
-	}
-
-	return v;
-}
-
-
-/* 0-DRAM x1, 1-ROM, 2-DRAM x8, 3-ROM (3 is bad setting - not allowed by the manual) */
-static const UINT8 dram_rightshift4={3,0,0,0};
-
-/* DELTA-T ADPCM write register */
-void YM_DELTAT_ADPCM_Write(YM_DELTAT *DELTAT,int r,int v)
-{
-	if(r>=0x10) return;
-	DELTAT->regr = v; /* stock data */
-
-	switch( r )
-	{
-	case 0x00:
-/*
-START:
- Accessing *external* memory is started when START bit (D7) is set to "1", so
- you must set all conditions needed for recording/playback before starting.
- If you access *CPU-managed* memory, recording/playback starts after
- read/write of ADPCM data register $08.
-
-REC:
- 0 = ADPCM synthesis (playback)
- 1 = ADPCM analysis (record)
-
-MEMDATA:
- 0 = processor (*CPU-managed*) memory (means: using register $08)
- 1 = external memory (using start/end/limit registers to access memory: RAM or ROM)
-
-
-SPOFF:
- controls output pin that should disable the speaker while ADPCM analysis
-
-RESET and REPEAT only work with external memory.
-
-
-some examples:
-value: START, REC, MEMDAT, REPEAT, SPOFF, x,x,RESET meaning:
- C8 1 1 0 0 1 0 0 0 Analysis (recording) from AUDIO to CPU (to reg $08), sample rate in PRESCALER register
- E8 1 1 1 0 1 0 0 0 Analysis (recording) from AUDIO to EXT.MEMORY, sample rate in PRESCALER register
- 80 1 0 0 0 0 0 0 0 Synthesis (playing) from CPU (from reg $08) to AUDIO,sample rate in DELTA-N register
- a0 1 0 1 0 0 0 0 0 Synthesis (playing) from EXT.MEMORY to AUDIO, sample rate in DELTA-N register
-
- 60 0 1 1 0 0 0 0 0 External memory write via ADPCM data register $08
- 20 0 0 1 0 0 0 0 0 External memory read via ADPCM data register $08
-
-*/
-		/* handle emulation mode */
-		if(DELTAT->emulation_mode == YM_DELTAT_EMULATION_MODE_YM2610)
-		{
-			v |= 0x20;		/* YM2610 always uses external memory and doesn't even have memory flag bit. */
-		}
-
-		DELTAT->portstate = v & (0x80|0x40|0x20|0x10|0x01); /* start, rec, memory mode, repeat flag copy, reset(bit0) */
-
-		if( DELTAT->portstate&0x80 )/* START,REC,MEMDATA,REPEAT,SPOFF,--,--,RESET */
-		{
-			/* set PCM BUSY bit */
-			DELTAT->PCM_BSY = 1;
-
-			/* start ADPCM */
-			DELTAT->now_step = 0;
-			DELTAT->acc = 0;
-			DELTAT->prev_acc = 0;
-			DELTAT->adpcml = 0;
-			DELTAT->adpcmd = YM_DELTAT_DELTA_DEF;
-			DELTAT->now_data = 0;
-
-		}
-
-		if( DELTAT->portstate&0x20 ) /* do we access external memory? */
-		{
-			DELTAT->now_addr = DELTAT->start << 1;
-			DELTAT->memread = 2;	/* two dummy reads needed before accesing external memory via register $08*/
-
-			/* if yes, then let's check if ADPCM memory is mapped and big enough */
-			if(DELTAT->memory == 0)
-			{
-				logerror("YM Delta-T ADPCM rom not mapped\n");
-				DELTAT->portstate = 0x00;
-				DELTAT->PCM_BSY = 0;
-			}
-			else
-			{
-				if( DELTAT->end >= DELTAT->memory_size )	/* Check End in Range */
-				{
-					logerror("YM Delta-T ADPCM end out of range: $%08x\n", DELTAT->end);
-					DELTAT->end = DELTAT->memory_size - 1;
-				}
-				if( DELTAT->start >= DELTAT->memory_size )	/* Check Start in Range */
-				{
-					logerror("YM Delta-T ADPCM start out of range: $%08x\n", DELTAT->start);
-					DELTAT->portstate = 0x00;
-					DELTAT->PCM_BSY = 0;
-				}
-			}
-		}
-		else	/* we access CPU memory (ADPCM data register $08) so we only reset now_addr here */
-		{
-			DELTAT->now_addr = 0;
-		}
-
-		if( DELTAT->portstate&0x01 )
-		{
-			DELTAT->portstate = 0x00;
-
-			/* clear PCM BUSY bit (in status register) */
-			DELTAT->PCM_BSY = 0;
-
-			/* set BRDY flag */
-			if(DELTAT->status_set_handler)
-				if(DELTAT->status_change_BRDY_bit)
-					(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
-		}
-		break;
-	case 0x01:	/* L,R,-,-,SAMPLE,DA/AD,RAMTYPE,ROM */
-		/* handle emulation mode */
-		if(DELTAT->emulation_mode == YM_DELTAT_EMULATION_MODE_YM2610)
-		{
-			v |= 0x01;		/* YM2610 always uses ROM as an external memory and doesn't tave ROM/RAM memory flag bit. */
-		}
-
-		DELTAT->pan = &DELTAT->output_pointer(v>>6)&0x03;
-		if ((DELTAT->control2 & 3) != (v & 3))
-		{
-			/*0-DRAM x1, 1-ROM, 2-DRAM x8, 3-ROM (3 is bad setting - not allowed by the manual) */
-			if (DELTAT->DRAMportshift != dram_rightshiftv&3)
-			{
-				DELTAT->DRAMportshift = dram_rightshiftv&3;
-
-				/* final shift value depends on chip type and memory type selected:
- 8 for YM2610 (ROM only),
- 5 for ROM for Y8950 and YM2608,
- 5 for x8bit DRAMs for Y8950 and YM2608,
- 2 for x1bit DRAMs for Y8950 and YM2608.
- */
-
-				/* refresh addresses */
-				DELTAT->start = (DELTAT->reg0x3*0x0100 | DELTAT->reg0x2) << (DELTAT->portshift - DELTAT->DRAMportshift);
-				DELTAT->end = (DELTAT->reg0x5*0x0100 | DELTAT->reg0x4) << (DELTAT->portshift - DELTAT->DRAMportshift);
-				DELTAT->end += (1 << (DELTAT->portshift-DELTAT->DRAMportshift) ) - 1;
-				DELTAT->limit = (DELTAT->reg0xd*0x0100 | DELTAT->reg0xc) << (DELTAT->portshift - DELTAT->DRAMportshift);
-			}
-		}
-		DELTAT->control2 = v;
-		break;
-	case 0x02:	/* Start Address L */
-	case 0x03:	/* Start Address H */
-		DELTAT->start = (DELTAT->reg0x3*0x0100 | DELTAT->reg0x2) << (DELTAT->portshift - DELTAT->DRAMportshift);
-		/*logerror("DELTAT start: 02=%2x 03=%2x addr=%8x\n",DELTAT->reg0x2, DELTAT->reg0x3,DELTAT->start );*/
-		break;
-	case 0x04:	/* Stop Address L */
-	case 0x05:	/* Stop Address H */
-		DELTAT->end = (DELTAT->reg0x5*0x0100 | DELTAT->reg0x4) << (DELTAT->portshift - DELTAT->DRAMportshift);
-		DELTAT->end += (1 << (DELTAT->portshift-DELTAT->DRAMportshift) ) - 1;
-		/*logerror("DELTAT end : 04=%2x 05=%2x addr=%8x\n",DELTAT->reg0x4, DELTAT->reg0x5,DELTAT->end );*/
-		break;
-	case 0x06:	/* Prescale L (ADPCM and Record frq) */
-	case 0x07:	/* Prescale H */
-		break;
-	case 0x08:	/* ADPCM data */
-
-/*
-some examples:
-value: START, REC, MEMDAT, REPEAT, SPOFF, x,x,RESET meaning:
- C8 1 1 0 0 1 0 0 0 Analysis (recording) from AUDIO to CPU (to reg $08), sample rate in PRESCALER register
- E8 1 1 1 0 1 0 0 0 Analysis (recording) from AUDIO to EXT.MEMORY, sample rate in PRESCALER register
- 80 1 0 0 0 0 0 0 0 Synthesis (playing) from CPU (from reg $08) to AUDIO,sample rate in DELTA-N register
- a0 1 0 1 0 0 0 0 0 Synthesis (playing) from EXT.MEMORY to AUDIO, sample rate in DELTA-N register
-
- 60 0 1 1 0 0 0 0 0 External memory write via ADPCM data register $08
- 20 0 0 1 0 0 0 0 0 External memory read via ADPCM data register $08
-
-*/
-
-		/* external memory write */
-		if ( (DELTAT->portstate & 0xe0)==0x60 )
-		{
-			if (DELTAT->memread)
-			{
-				DELTAT->now_addr = DELTAT->start << 1;
-				DELTAT->memread = 0;
-			}
-
-			/*logerror("YM Delta-T memory write $%08x, v=$%02x\n", DELTAT->now_addr >> 1, v);*/
-
-			if ( DELTAT->now_addr != (DELTAT->end<<1) )
-			{
-				DELTAT->memoryDELTAT->now_addr>>1 = v;
-			 	DELTAT->now_addr+=2; /* two nibbles at a time */
-
-				/* reset BRDY bit in status register, which means we are processing the write */
-				if(DELTAT->status_reset_handler)
-					if(DELTAT->status_change_BRDY_bit)
-						(DELTAT->status_reset_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
-
-	/* setup a timer that will callback us in 10 master clock cycles for Y8950
- * in the callback set the BRDY flag to 1 , which means we have written the data.
- * For now, we don't really do this; we simply reset and set the flag in zero time, so that the IRQ will work.
- */
-				/* set BRDY bit in status register */
-				if(DELTAT->status_set_handler)
-					if(DELTAT->status_change_BRDY_bit)
-						(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
-
-			}
-			else
-			{
-				/* set EOS bit in status register */
-				if(DELTAT->status_set_handler)
-					if(DELTAT->status_change_EOS_bit)
-						(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_EOS_bit);
-			}
-
-			return;
-		}
-
-		/* ADPCM synthesis from CPU */
-		if ( (DELTAT->portstate & 0xe0)==0x80 )
-		{
-			DELTAT->CPU_data = v;
-
-			/* Reset BRDY bit in status register, which means we are full of data */
-			if(DELTAT->status_reset_handler)
-				if(DELTAT->status_change_BRDY_bit)
-					(DELTAT->status_reset_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
-			return;
-		}
-
-	 break;
-	case 0x09:	/* DELTA-N L (ADPCM Playback Prescaler) */
-	case 0x0a:	/* DELTA-N H */
-		DELTAT->delta = (DELTAT->reg0xa*0x0100 | DELTAT->reg0x9);
-		DELTAT->step = (UINT32)( (double)(DELTAT->delta /* *(1<<(YM_DELTAT_SHIFT-16)) */ ) * (DELTAT->freqbase) );
-		/*logerror("DELTAT deltan:09=%2x 0a=%2x\n",DELTAT->reg0x9, DELTAT->reg0xa);*/
-		break;
-	case 0x0b:	/* Output level control (volume, linear) */
-		{
-			INT32 oldvol = DELTAT->volume;
-			DELTAT->volume = (v&0xff) * (DELTAT->output_range/256) / YM_DELTAT_DECODE_RANGE;
-/* v * ((1<<16)>>8) >> 15;
-* thus: v * (1<<8) >> 15;
-* thus: output_range must be (1 << (15+8)) at least
-* v * ((1<<23)>>8) >> 15;
-* v * (1<<15) >> 15;
-*/
-			/*logerror("DELTAT vol = %2x\n",v&0xff);*/
-			if( oldvol != 0 )
-			{
-				DELTAT->adpcml = (int)((double)DELTAT->adpcml / (double)oldvol * (double)DELTAT->volume);
-			}
-		}
-		break;
-	case 0x0c:	/* Limit Address L */
-	case 0x0d:	/* Limit Address H */
-		DELTAT->limit = (DELTAT->reg0xd*0x0100 | DELTAT->reg0xc) << (DELTAT->portshift - DELTAT->DRAMportshift);
-		/*logerror("DELTAT limit: 0c=%2x 0d=%2x addr=%8x\n",DELTAT->reg0xc, DELTAT->reg0xd,DELTAT->limit );*/
-		break;
-	}
-}
-
-void YM_DELTAT_ADPCM_Reset(YM_DELTAT *DELTAT,int pan,int emulation_mode)
-{
-	DELTAT->now_addr = 0;
-	DELTAT->now_step = 0;
-	DELTAT->step = 0;
-	DELTAT->start = 0;
-	DELTAT->end = 0;
-	DELTAT->limit = ~0; /* this way YM2610 and Y8950 (both of which don't have limit address reg) will still work */
-	DELTAT->volume = 0;
-	DELTAT->pan = &DELTAT->output_pointerpan;
-	DELTAT->acc = 0;
-	DELTAT->prev_acc = 0;
-	DELTAT->adpcmd = 127;
-	DELTAT->adpcml = 0;
-	DELTAT->emulation_mode = (UINT8)emulation_mode;
-	DELTAT->portstate = (emulation_mode == YM_DELTAT_EMULATION_MODE_YM2610) ? 0x20 : 0;
-	DELTAT->control2 = (emulation_mode == YM_DELTAT_EMULATION_MODE_YM2610) ? 0x01 : 0;	/* default setting depends on the emulation mode. MSX demo called "facdemo_4" doesn't setup control2 register at all and still works */
-	DELTAT->DRAMportshift = dram_rightshiftDELTAT->control2 & 3;
-
-	/* The flag mask register disables the BRDY after the reset, however
- ** as soon as the mask is enabled the flag needs to be set. */
-
-	/* set BRDY bit in status register */
-	if(DELTAT->status_set_handler)
-		if(DELTAT->status_change_BRDY_bit)
-			(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
-}
-
-#if 0
-void YM_DELTAT_postload(YM_DELTAT *DELTAT,UINT8 *regs)
-{
-	int r;
-
-	/* to keep adpcml */
-	DELTAT->volume = 0;
-	/* update */
-	for(r=1;r<16;r++)
-		YM_DELTAT_ADPCM_Write(DELTAT,r,regsr);
-	DELTAT->reg0 = regs0;
-
-	/* current rom data */
-	if (DELTAT->memory)
-		DELTAT->now_data = *(DELTAT->memory + (DELTAT->now_addr>>1) );
-
-}
-void YM_DELTAT_savestate(const device_config *device,YM_DELTAT *DELTAT)
-{
-#ifdef __STATE_H__
-	state_save_register_device_item(device, 0, DELTAT->portstate);
-	state_save_register_device_item(device, 0, DELTAT->now_addr);
-	state_save_register_device_item(device, 0, DELTAT->now_step);
-	state_save_register_device_item(device, 0, DELTAT->acc);
-	state_save_register_device_item(device, 0, DELTAT->prev_acc);
-	state_save_register_device_item(device, 0, DELTAT->adpcmd);
-	state_save_register_device_item(device, 0, DELTAT->adpcml);
-#endif
-}
-#endif
-
-
-#define YM_DELTAT_Limit(val,max,min)	\
-{										\
-	if ( val > max ) val = max;			\
-	else if ( val < min ) val = min;	\
-}
-
-INLINE void YM_DELTAT_synthesis_from_external_memory(YM_DELTAT *DELTAT)
-{
-	UINT32 step;
-	int data;
-
-	DELTAT->now_step += DELTAT->step;
-	if ( DELTAT->now_step >= (1<<YM_DELTAT_SHIFT) )
-	{
-		step = DELTAT->now_step >> YM_DELTAT_SHIFT;
-		DELTAT->now_step &= (1<<YM_DELTAT_SHIFT)-1;
-		do{
-
-			if ( DELTAT->now_addr == (DELTAT->limit<<1) )
-				DELTAT->now_addr = 0;
-
-			if ( DELTAT->now_addr == (DELTAT->end<<1) ) {	/* 12-06-2001 JB: corrected comparison. Was > instead of == */
-				if( DELTAT->portstate&0x10 ){
-					/* repeat start */
-					DELTAT->now_addr = DELTAT->start<<1;
-					DELTAT->acc = 0;
-					DELTAT->adpcmd = YM_DELTAT_DELTA_DEF;
-					DELTAT->prev_acc = 0;
-				}else{
-					/* set EOS bit in status register */
-					if(DELTAT->status_set_handler)
-						if(DELTAT->status_change_EOS_bit)
-							(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_EOS_bit);
-
-					/* clear PCM BUSY bit (reflected in status register) */
-					DELTAT->PCM_BSY = 0;
-
-					DELTAT->portstate = 0;
-					DELTAT->adpcml = 0;
-					DELTAT->prev_acc = 0;
-					return;
-				}
-			}
-
-			if( DELTAT->now_addr&1 ) data = DELTAT->now_data & 0x0f;
-			else
-			{
-				DELTAT->now_data = *(DELTAT->memory + (DELTAT->now_addr>>1));
-				data = DELTAT->now_data >> 4;
-			}
-
-			DELTAT->now_addr++;
-			/* 12-06-2001 JB: */
-			/* YM2610 address register is 24 bits wide.*/
-			/* The "+1" is there because we use 1 bit more for nibble calculations.*/
-			/* WARNING: */
-			/* Side effect: we should take the size of the mapped ROM into account */
-			DELTAT->now_addr &= ( (1<<(24+1))-1);
-
-			/* store accumulator value */
-			DELTAT->prev_acc = DELTAT->acc;
-
-			/* Forecast to next Forecast */
-			DELTAT->acc += (ym_deltat_decode_tableB1data * DELTAT->adpcmd / 8);
-			YM_DELTAT_Limit(DELTAT->acc,YM_DELTAT_DECODE_MAX, YM_DELTAT_DECODE_MIN);
-
-			/* delta to next delta */
-			DELTAT->adpcmd = (DELTAT->adpcmd * ym_deltat_decode_tableB2data ) / 64;
-			YM_DELTAT_Limit(DELTAT->adpcmd,YM_DELTAT_DELTA_MAX, YM_DELTAT_DELTA_MIN );
-
-			/* ElSemi: Fix interpolator. */
-			/*DELTAT->prev_acc = prev_acc + ((DELTAT->acc - prev_acc) / 2 );*/
-
-		}while(--step);
-
-	}
-
-	/* ElSemi: Fix interpolator. */
-	DELTAT->adpcml = DELTAT->prev_acc * (int)((1<<YM_DELTAT_SHIFT)-DELTAT->now_step);
-	DELTAT->adpcml += (DELTAT->acc * (int)DELTAT->now_step);
-	DELTAT->adpcml = (DELTAT->adpcml>>YM_DELTAT_SHIFT) * (int)DELTAT->volume;
-
-	/* output for work of output channels (outdOPNxxxx)*/
-	*(DELTAT->pan) += DELTAT->adpcml;
-}
-
-
-
-INLINE void YM_DELTAT_synthesis_from_CPU_memory(YM_DELTAT *DELTAT)
-{
-	UINT32 step;
-	int data;
-
-	DELTAT->now_step += DELTAT->step;
-	if ( DELTAT->now_step >= (1<<YM_DELTAT_SHIFT) )
-	{
-		step = DELTAT->now_step >> YM_DELTAT_SHIFT;
-		DELTAT->now_step &= (1<<YM_DELTAT_SHIFT)-1;
-		do{
-
-			if( DELTAT->now_addr&1 )
-			{
-				data = DELTAT->now_data & 0x0f;
-
-				DELTAT->now_data = DELTAT->CPU_data;
-
-				/* after we used CPU_data, we set BRDY bit in status register,
- * which means we are ready to accept another byte of data */
-				if(DELTAT->status_set_handler)
-					if(DELTAT->status_change_BRDY_bit)
-						(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
-			}
-			else
-			{
-				data = DELTAT->now_data >> 4;
-			}
-
-			DELTAT->now_addr++;
-
-			/* store accumulator value */
-			DELTAT->prev_acc = DELTAT->acc;
-
-			/* Forecast to next Forecast */
-			DELTAT->acc += (ym_deltat_decode_tableB1data * DELTAT->adpcmd / 8);
-			YM_DELTAT_Limit(DELTAT->acc,YM_DELTAT_DECODE_MAX, YM_DELTAT_DECODE_MIN);
-
-			/* delta to next delta */
-			DELTAT->adpcmd = (DELTAT->adpcmd * ym_deltat_decode_tableB2data ) / 64;
-			YM_DELTAT_Limit(DELTAT->adpcmd,YM_DELTAT_DELTA_MAX, YM_DELTAT_DELTA_MIN );
-
-
-		}while(--step);
-
-	}
-
-	/* ElSemi: Fix interpolator. */
-	DELTAT->adpcml = DELTAT->prev_acc * (int)((1<<YM_DELTAT_SHIFT)-DELTAT->now_step);
-	DELTAT->adpcml += (DELTAT->acc * (int)DELTAT->now_step);
-	DELTAT->adpcml = (DELTAT->adpcml>>YM_DELTAT_SHIFT) * (int)DELTAT->volume;
-
-	/* output for work of output channels (outdOPNxxxx)*/
-	*(DELTAT->pan) += DELTAT->adpcml;
-}
-
-
-
-/* ADPCM B (Delta-T control type) */
-void YM_DELTAT_ADPCM_CALC(YM_DELTAT *DELTAT)
-{
-
-/*
-some examples:
-value: START, REC, MEMDAT, REPEAT, SPOFF, x,x,RESET meaning:
- 80 1 0 0 0 0 0 0 0 Synthesis (playing) from CPU (from reg $08) to AUDIO,sample rate in DELTA-N register
- a0 1 0 1 0 0 0 0 0 Synthesis (playing) from EXT.MEMORY to AUDIO, sample rate in DELTA-N register
- C8 1 1 0 0 1 0 0 0 Analysis (recording) from AUDIO to CPU (to reg $08), sample rate in PRESCALER register
- E8 1 1 1 0 1 0 0 0 Analysis (recording) from AUDIO to EXT.MEMORY, sample rate in PRESCALER register
-
- 60 0 1 1 0 0 0 0 0 External memory write via ADPCM data register $08
- 20 0 0 1 0 0 0 0 0 External memory read via ADPCM data register $08
-
-*/
-
-	if ( (DELTAT->portstate & 0xe0)==0xa0 )
-	{
-		YM_DELTAT_synthesis_from_external_memory(DELTAT);
-		return;
-	}
-
-	if ( (DELTAT->portstate & 0xe0)==0x80 )
-	{
-		/* ADPCM synthesis from CPU-managed memory (from reg $08) */
-		YM_DELTAT_synthesis_from_CPU_memory(DELTAT);	/* change output based on data in ADPCM data reg ($08) */
-		return;
-	}
-
-//todo: ADPCM analysis
-// if ( (DELTAT->portstate & 0xe0)==0xc0 )
-// if ( (DELTAT->portstate & 0xe0)==0xe0 )
-
-	return;
-}
-

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/ymdeltat.h Deleted

@@ -1,98 +0,0 @@
-#pragma once
-
-#ifndef __YMDELTAT_H__
-#define __YMDELTAT_H__
-
-/* compiler dependence */
-#ifndef __OSDCOMM_H__
-#define __OSDCOMM_H__
-typedef unsigned char	UINT8;   /* unsigned  8bit */
-typedef unsigned short	UINT16;  /* unsigned 16bit */
-typedef unsigned int	UINT32;  /* unsigned 32bit */
-typedef signed char		INT8;    /* signed  8bit   */
-typedef signed short	INT16;   /* signed 16bit   */
-typedef signed int		INT32;   /* signed 32bit   */
-
-typedef INT32 stream_sample_t;
-
-#endif /* __OSDCOMM_H__ */
-
-#define YM_DELTAT_SHIFT    (16)
-
-#define YM_DELTAT_EMULATION_MODE_NORMAL	0
-#define YM_DELTAT_EMULATION_MODE_YM2610	1
-
-
-typedef void (*STATUS_CHANGE_HANDLER)(void *chip, UINT8 status_bits);
-
-
-/* DELTA-T (adpcm type B) struct */
-typedef struct deltat_adpcm_state {     /* AT: rearranged and tigntened structure */
-	UINT8	*memory;
-	INT32	*output_pointer;/* pointer of output pointers   */
-	INT32	*pan;			/* pan : &output_pointerpan   */
-	double	freqbase;
-#if 0
-	double	write_time;		/* Y8950: 10 cycles of main clock; YM2608: 20 cycles of main clock */
-	double	read_time;		/* Y8950: 8 cycles of main clock;  YM2608: 18 cycles of main clock */
-#endif
-	UINT32	memory_size;
-	int		output_range;
-	UINT32	now_addr;		/* current address      */
-	UINT32	now_step;		/* currect step         */
-	UINT32	step;			/* step                 */
-	UINT32	start;			/* start address        */
-	UINT32	limit;			/* limit address        */
-	UINT32	end;			/* end address          */
-	UINT32	delta;			/* delta scale          */
-	INT32	volume;			/* current volume       */
-	INT32	acc;			/* shift Measurement value*/
-	INT32	adpcmd;			/* next Forecast        */
-	INT32	adpcml;			/* current value        */
-	INT32	prev_acc;		/* leveling value       */
-	UINT8	now_data;		/* current rom data     */
-	UINT8	CPU_data;		/* current data from reg 08 */
-	UINT8	portstate;		/* port status          */
-	UINT8	control2;		/* control reg: SAMPLE, DA/AD, RAM TYPE (x8bit / x1bit), ROM/RAM */
-	UINT8	portshift;		/* address bits shift-left:
-                            ** 8 for YM2610,
-                            ** 5 for Y8950 and YM2608 */
-
-	UINT8	DRAMportshift;	/* address bits shift-right:
-                            ** 0 for ROM and x8bit DRAMs,
-                            ** 3 for x1 DRAMs */
-
-	UINT8	memread;		/* needed for reading/writing external memory */
-
-	/* handlers and parameters for the status flags support */
-	STATUS_CHANGE_HANDLER	status_set_handler;
-	STATUS_CHANGE_HANDLER	status_reset_handler;
-
-	/* note that different chips have these flags on different
-    ** bits of the status register
-    */
-	void *	status_change_which_chip;	/* this chip id */
-	UINT8	status_change_EOS_bit;		/* 1 on End Of Sample (record/playback/cycle time of AD/DA converting has passed)*/
-	UINT8	status_change_BRDY_bit;		/* 1 after recording 2 datas (2x4bits) or after reading/writing 1 data */
-	UINT8	status_change_ZERO_bit;		/* 1 if silence lasts for more than 290 miliseconds on ADPCM recording */
-
-	/* neither Y8950 nor YM2608 can generate IRQ when PCMBSY bit changes, so instead of above,
-    ** the statusflag gets ORed with PCM_BSY (below) (on each read of statusflag of Y8950 and YM2608)
-    */
-	UINT8	PCM_BSY;		/* 1 when ADPCM is playing; Y8950/YM2608 only */
-
-	UINT8	reg16;		/* adpcm registers      */
-	UINT8	emulation_mode;	/* which chip we're emulating */
-}YM_DELTAT;
-
-/*void YM_DELTAT_BRDY_callback(YM_DELTAT *DELTAT);*/
-
-UINT8 YM_DELTAT_ADPCM_Read(YM_DELTAT *DELTAT);
-void YM_DELTAT_ADPCM_Write(YM_DELTAT *DELTAT,int r,int v);
-void YM_DELTAT_ADPCM_Reset(YM_DELTAT *DELTAT,int pan,int emulation_mode);
-void YM_DELTAT_ADPCM_CALC(YM_DELTAT *DELTAT);
-
-/*void YM_DELTAT_postload(YM_DELTAT *DELTAT,UINT8 *regs);
-void YM_DELTAT_savestate(const device_config *device,YM_DELTAT *DELTAT);*/
-
-#endif /* __YMDELTAT_H__ */

deadbeef-0.6.2.tar.bz2/plugins/gtkui/coverart.c Deleted

@@ -1,438 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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 <gtk/gtk.h>
-#include <sys/time.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <assert.h>
-#ifdef __linux__
-#include <sys/prctl.h>
-#endif
-#include "coverart.h"
-#include "../artwork/artwork.h"
-#include "gtkui.h"
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(...)
-
-extern DB_artwork_plugin_t *coverart_plugin;
-
-
-GdkPixbuf *pixbuf_default;
-
-#define MAX_ID 256
-#define CACHE_SIZE 20
-
-typedef struct {
- struct timeval tm;
- time_t file_time;
- char *fname;
- int width;
- GdkPixbuf *pixbuf;
-} cached_pixbuf_t;
-
-#define MAX_CALLBACKS 200
-
-typedef struct cover_callback_s {
- void (*cb) (void*ud);
- void *ud;
-} cover_callback_t;
-
-typedef struct load_query_s {
- char *fname;
- int width;
- cover_callback_t callbacksMAX_CALLBACKS;
- int numcb;
- struct load_query_s *next;
-} load_query_t;
-
-static cached_pixbuf_t cacheCACHE_SIZE;
-static int terminate = 0;
-static uintptr_t mutex;
-static uintptr_t cond;
-static uintptr_t tid;
-load_query_t *queue;
-load_query_t *tail;
-
-static int64_t artwork_reset_time;
-
-static void
-queue_add (const char *fname, int width, void (*callback) (void *user_data), void *user_data) {
- deadbeef->mutex_lock (mutex);
- load_query_t *q;
- if (fname) {
- for (q = queue; q; q = q->next) {
- if (q->fname && !strcmp (q->fname, fname) && width == q->width) {
- if (q->numcb < MAX_CALLBACKS && callback) {
- q->callbacksq->numcb.cb = callback;
- q->callbacksq->numcb.ud = user_data;
- q->numcb++;
- }
- deadbeef->mutex_unlock (mutex);
- return;
- }
- }
- }
- q = malloc (sizeof (load_query_t));
- memset (q, 0, sizeof (load_query_t));
- if (fname) {
- q->fname = strdup (fname);
- }
- q->width = width;
- q->callbacksq->numcb.cb = callback;
- q->callbacksq->numcb.ud = user_data;
- q->numcb++;
- if (tail) {
- tail->next = q;
- tail = q;
- }
- else {
- queue = tail = q;
- }
- deadbeef->mutex_unlock (mutex);
- deadbeef->cond_signal (cond);
-}
-
-static void
-queue_pop (void) {
- deadbeef->mutex_lock (mutex);
- load_query_t *next = queue->next;
- if (queue->fname) {
- free (queue->fname);
- }
- free (queue);
- queue = next;
- if (!queue) {
- tail = NULL;
- }
- deadbeef->mutex_unlock (mutex);
-}
-
-void
-loading_thread (void *none) {
-#ifdef __linux__
- prctl (PR_SET_NAME, "deadbeef-gtkui-artwork", 0, 0, 0, 0);
-#endif
- for (;;) {
- trace ("covercache: waiting for signal\n");
- deadbeef->cond_wait (cond, mutex);
- trace ("covercache: signal received (terminate=%d, queue=%p)\n", terminate, queue);
- deadbeef->mutex_unlock (mutex);
- while (!terminate && queue) {
- int cache_min = 0;
- deadbeef->mutex_lock (mutex);
- for (int i = 0; i < CACHE_SIZE; i++) {
- if (!cachei.pixbuf) {
- cache_min = i;
- break;
- }
- if (cachecache_min.pixbuf && cachei.pixbuf) {
- if (cachecache_min.tm.tv_sec > cachei.tm.tv_sec) {
- cache_min = i;
- }
- }
- }
- if (cache_min != -1) {
- if (cachecache_min.pixbuf) {
- g_object_unref (cachecache_min.pixbuf);
- cachecache_min.pixbuf = NULL;
- }
- if (cachecache_min.fname) {
- free (cachecache_min.fname);
- cachecache_min.fname = NULL;
- }
- }
- deadbeef->mutex_unlock (mutex);
- if (!queue->fname) {
- for (int i = 0; i < queue->numcb; i++) {
- if (queue->callbacksi.cb) {
- queue->callbacksi.cb (queue->callbacksi.ud);
- }
- }
- queue_pop ();
- continue;
- }
-
- if (cache_min == -1) {
- trace ("coverart pixbuf cache overflow, waiting...\n");
- usleep (500000);
- continue;
- }
- GdkPixbuf *pixbuf = NULL;
- GError *error = NULL;
- struct stat stat_buf;
- if (!stat (queue->fname, &stat_buf)) {
- pixbuf = gdk_pixbuf_new_from_file_at_scale (queue->fname, queue->width, queue->width, TRUE, &error);
- if (error) {
- //fprintf (stderr, "gdk_pixbuf_new_from_file_at_scale %s %d failed, error: %s\n", queue->fname, queue->width, error ? error->message : "n/a");
- g_error_free (error);
- error = NULL;
- }
- }
- if (!pixbuf) {
- pixbuf = pixbuf_default;
- g_object_ref (pixbuf);
- }
- if (cache_min != -1) {
- deadbeef->mutex_lock (mutex);
- cachecache_min.pixbuf = pixbuf;
- cachecache_min.fname = strdup (queue->fname);
- cachecache_min.file_time = stat_buf.st_mtime;
- gettimeofday (&cachecache_min.tm, NULL);
- cachecache_min.width = queue->width;
- deadbeef->mutex_unlock (mutex);
- }
-
- for (int i = 0; i < queue->numcb; i++) {
- if (queue->callbacksi.cb) {
- queue->callbacksi.cb (queue->callbacksi.ud);
- }
- }
- queue_pop ();
- }
- if (terminate) {
- break;
- }
- }
-}
-
-typedef struct {
- int width;
- void (*callback)(void *user_data);
- void *user_data;
-} cover_avail_info_t;
-
-static void
-cover_avail_callback (const char *fname, const char *artist, const char *album, void *user_data) {
- if (!fname) {
- free (user_data);
- return;
- }
- cover_avail_info_t *dt = user_data;
- // means requested image is now in disk cache
- // load it into main memory
- GdkPixbuf *pb = get_cover_art_callb (fname, artist, album, dt->width, dt->callback, dt->user_data);
- if (pb) {
- g_object_unref (pb);
- }
- free (dt);
-}
-
-static GdkPixbuf *
-get_pixbuf (const char *fname, int width, void (*callback)(void *user_data), void *user_data) {
- int requested_width = width;
- // find in cache
- deadbeef->mutex_lock (mutex);
- for (int i = 0; i < CACHE_SIZE; i++) {
- if (cachei.pixbuf) {
- if (!strcmp (fname, cachei.fname) && cachei.width == width) {
- gettimeofday (&cachei.tm, NULL);
- GdkPixbuf *pb = cachei.pixbuf;
- g_object_ref (pb);
- deadbeef->mutex_unlock (mutex);
- return pb;
- }
- }
- }
-#if 0
- printf ("cache miss: %s/%d\n", fname, width);
- for (int i = 0; i < CACHE_SIZE; i++) {
- if (cachei.pixbuf) {
- printf (" cache line %d: %s/%d\n", i, cachei.fname, cachei.width);
- }
- }
-#endif
- deadbeef->mutex_unlock (mutex);
- queue_add (fname, width, callback, user_data);
- return NULL;
-}
-
-void
-queue_cover_callback (void (*callback)(void *user_data), void *user_data) {
- queue_add (NULL, -1, callback, user_data);
-}
-
-
-GdkPixbuf *
-get_cover_art_callb (const char *fname, const char *artist, const char *album, int width, void (*callback) (void *user_data), void *user_data) {
- if (!coverart_plugin) {
- return NULL;
- }
-
- if (width == -1) {
- char path2048;
- coverart_plugin->make_cache_path2 (path, sizeof (path), fname, album, artist, -1);
- deadbeef->mutex_lock (mutex);
- int i_largest = -1;
- int size_largest = -1;
- for (int i = 0; i < CACHE_SIZE; i++) {
- if (!cachei.pixbuf) {
- continue;
- }
- if (!strcmp (cachei.fname, path)) {
- gettimeofday (&cachei.tm, NULL);
- if (cachei.width > size_largest) {
- size_largest = cachei.width;
- i_largest = i;
- }
- }
- }
- if (i_largest != -1) {
- GdkPixbuf *pb = cachei_largest.pixbuf;
- g_object_ref (pb);
- deadbeef->mutex_unlock (mutex);
- return pb;
- }
- deadbeef->mutex_unlock (mutex);
- return NULL;
- }
-
- cover_avail_info_t *dt = malloc (sizeof (cover_avail_info_t));
- dt->width = width;
- dt->callback = callback;
- dt->user_data = user_data;
- char *image_fname = coverart_plugin->get_album_art (fname, artist, album, -1, cover_avail_callback, dt);
- if (image_fname) {
- GdkPixbuf *pb = get_pixbuf (image_fname, width, callback, user_data);
- free (image_fname);
- return pb;
- }
- return NULL;
-}
-
-void
-coverart_reset_queue (void) {
- deadbeef->mutex_lock (mutex);
- if (queue) {
- load_query_t *q = queue->next;
- while (q) {
- load_query_t *next = q->next;
- if (q->fname) {
- free (q->fname);
- }
- free (q);
- q = next;
- }
- queue->next = NULL;
- tail = queue;
- }
- deadbeef->mutex_unlock (mutex);
- if (coverart_plugin) {
- coverart_plugin->reset (1);
- }
-}
-
-void
-cover_art_init (void) {
- terminate = 0;
- mutex = deadbeef->mutex_create_nonrecursive ();
- cond = deadbeef->cond_create ();
- tid = deadbeef->thread_start_low_priority (loading_thread, NULL);
-}
-
-void
-cover_art_free (void) {
- trace ("terminating cover art loader...\n");
-
- if (coverart_plugin) {
- trace ("resetting artwork plugin...\n");
- coverart_plugin->reset (0);
- }
- 
- if (tid) {
- terminate = 1;
- trace ("sending terminate signal to art loader thread...\n");
- deadbeef->cond_signal (cond);
- deadbeef->thread_join (tid);
- tid = 0;
- }
- while (queue) {
- queue_pop ();
- }
- for (int i = 0; i < CACHE_SIZE; i++) {
- if (cachei.pixbuf) {
- g_object_unref (cachei.pixbuf);
- }
- }
- memset (cache, 0, sizeof (cache));
- if (pixbuf_default) {
- g_object_unref (pixbuf_default);
- pixbuf_default = NULL;
- }
- deadbeef->cond_free (cond);
- cond = 0;
- deadbeef->mutex_free (mutex);
- mutex = 0;
-}
-
-GdkPixbuf *
-cover_get_default_pixbuf (void) {
- if (!coverart_plugin) {
- return NULL;
- }
- if (!pixbuf_default) {
- GError *error = NULL;
- const char *defpath = coverart_plugin->get_default_cover ();
- pixbuf_default = gdk_pixbuf_new_from_file (defpath, &error);
- if (!pixbuf_default) {
- fprintf (stderr, "default cover: gdk_pixbuf_new_from_file %s failed, error: %s\n", defpath, error->message);
- }
- if (error) {
- g_error_free (error);
- error = NULL;
- }
- if (!pixbuf_default) {
- pixbuf_default = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 2, 2);
- }
- assert (pixbuf_default);
- }
-
- g_object_ref (pixbuf_default);
- return pixbuf_default;
-}
-
-int
-gtkui_is_default_pixbuf (GdkPixbuf *pb) {
- return pb == pixbuf_default;
-}
-
-int
-gtkui_cover_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
- switch (id) {
- case DB_EV_PLAYLIST_REFRESH:
- {
- int64_t reset_time = deadbeef->conf_get_int64 ("artwork.cache_reset_time", 0);;
- if (reset_time != artwork_reset_time) {
- artwork_reset_time = reset_time;
- deadbeef->mutex_lock (mutex);
- for (int i = 0; i < CACHE_SIZE; i++) {
- if (cachei.pixbuf) {
- g_object_unref (cachei.pixbuf);
- }
- }
- memset (cache, 0, sizeof (cache));
- deadbeef->mutex_unlock (mutex);
- }
- }
- break;
- }
- return 0;
-}

deadbeef-0.6.2.tar.bz2/plugins/gtkui/coverart.h Deleted

@@ -1,58 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
-*/
-#ifndef __COVERART_H
-#define __COVERART_H
-
-#include <gtk/gtk.h>
-#include "../../deadbeef.h"
-
-// this function puts request for cover art into queue, or returns default image
-// of specific size
-//
-// if the image is not available immediately -- callback will be called later
-//
-// if cover art loader plugin is not available -- NULL will be returned
-GdkPixbuf *
-get_cover_art_callb (const char *fname, const char *artist, const char *album, int width, void (*cover_avail_callback) (void *user_data), void *user_data);
-
-void
-coverart_reset_queue (void);
-
-void
-cover_art_init (void);
-
-void
-cover_art_free (void);
-
-// simply inserts callback point into queue
-// the callback will be called when the loading queue reaches this request
-void
-queue_cover_callback (void (*callback)(void *user_data), void *user_data);
-
-GdkPixbuf *
-cover_get_default_pixbuf (void);
-
-int
-gtkui_is_default_pixbuf (GdkPixbuf *pb);
-
-int
-gtkui_cover_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
-
-#endif
-

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddblistview.c Deleted

@@ -1,3352 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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/>.
-*/
-#ifdef HAVE_CONFIG_H
-# include "../../config.h"
-#endif
-
-#include <gtk/gtk.h>
-#include <math.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "ddblistview.h"
-#include "drawing.h"
-#include "gtkui.h"
-#include "support.h"
-#include "actionhandlers.h"
-
-#define min(x,y) ((x)<(y)?(x):(y))
-#define max(x,y) ((x)>(y)?(x):(y))
-
-#define DEFAULT_GROUP_TITLE_HEIGHT 30
-#define SCROLL_STEP 20
-#define AUTOSCROLL_UPDATE_FREQ 0.01f
-#define NUM_CHANGED_ROWS_BEFORE_FULL_REDRAW 10
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-
-#define PL_NEXT(it) (ps->binding->next (it))
-#define PL_PREV(it) (ps->binding->prev (it))
-//#define REF(it) {if (it) ps->binding->ref (it);}
-#define UNREF(it) {if (it) ps->binding->unref(it);}
-
-// HACK!!
-extern GtkWidget *theme_treeview;
-extern GtkWidget *theme_button;
-
-G_DEFINE_TYPE (DdbListview, ddb_listview, GTK_TYPE_TABLE);
-
-struct _DdbListviewColumn {
- char *title;
- int width;
- float fwidth; // only in autoresize mode
- int minheight;
- struct _DdbListviewColumn *next;
- void *user_data;
- unsigned align_right : 1;
- unsigned sort_order : 2; // 0=none, 1=asc, 2=desc
-};
-typedef struct _DdbListviewColumn DdbListviewColumn;
-
-static void ddb_listview_class_init(DdbListviewClass *klass);
-static void ddb_listview_init(DdbListview *listview);
-//static void ddb_listview_size_request(GtkWidget *widget, GtkRequisition *requisition);
-//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(GObject *object);
-
-void
-ddb_listview_build_groups (DdbListview *listview);
-
-static void
-ddb_listview_resize_groups (DdbListview *listview);
-// fwd decls
-void
-ddb_listview_free_groups (DdbListview *listview);
-
-//static inline void
-//draw_drawable (GdkDrawable *window, GdkGC *gc, GdkDrawable *drawable, int x1, int y1, int x2, int y2, int w, int h);
-
-////// list functions ////
-void
-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, 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, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int even, int cursor, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h);
-void
-ddb_listview_list_render_album_art (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h);
-void
-ddb_listview_list_track_dragdrop (DdbListview *ps, int y);
-int
-ddb_listview_dragdrop_get_row_from_coord (DdbListview *listview, int y);
-void
-ddb_listview_list_mousemove (DdbListview *ps, GdkEventMotion *event, int x, int y);
-void
-ddb_listview_list_setup_vscroll (DdbListview *ps);
-void
-ddb_listview_list_setup_hscroll (DdbListview *ps);
-void
-ddb_listview_list_set_hscroll (DdbListview *ps, int newscroll);
-void
-ddb_listview_set_cursor (DdbListview *pl, int cursor);
-int
-ddb_listview_get_row_pos (DdbListview *listview, int pos);
-
-////// header functions ////
-void
-ddb_listview_header_render (DdbListview *ps, cairo_t *cr);
-
-////// column management functions ////
-void
-ddb_listview_column_move (DdbListview *listview, DdbListviewColumn *which, int inspos);
-void
-ddb_listview_column_free (DdbListview *listview, DdbListviewColumn *c);
-
-
-// signal handlers
-void
-ddb_listview_vscroll_value_changed (GtkRange *widget,
- gpointer user_data);
-void
-ddb_listview_hscroll_value_changed (GtkRange *widget,
- gpointer user_data);
-
-void
-ddb_listview_list_drag_data_received (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x,
- gint y,
- GtkSelectionData *data,
- guint info,
- guint time,
- 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,
- GdkEventConfigure *event,
- gpointer user_data);
-
-void
-ddb_listview_header_realize (GtkWidget *widget,
- gpointer user_data);
-
-gboolean
-ddb_listview_header_motion_notify_event (GtkWidget *widget,
- GdkEventMotion *event,
- gpointer user_data);
-
-gboolean
-ddb_listview_header_button_press_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data);
-
-gboolean
-ddb_listview_header_button_release_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data);
-
-gboolean
-ddb_listview_list_configure_event (GtkWidget *widget,
- GdkEventConfigure *event,
- gpointer user_data);
-
-gboolean
-ddb_listview_list_expose_event (GtkWidget *widget,
- 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);
-
-gboolean
-ddb_listview_list_button_press_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data);
-
-gboolean
-ddb_listview_list_popup_menu (GtkWidget *widget, gpointer user_data);
-
-gboolean
-ddb_listview_list_drag_motion (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x,
- gint y,
- guint time,
- gpointer user_data);
-
-gboolean
-ddb_listview_list_drag_drop (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x,
- gint y,
- guint time,
- gpointer user_data);
-
-void
-ddb_listview_list_drag_data_get (GtkWidget *widget,
- GdkDragContext *drag_context,
- GtkSelectionData *data,
- guint info,
- guint time,
- gpointer user_data);
-
-void
-ddb_listview_list_drag_end (GtkWidget *widget,
- GdkDragContext *drag_context,
- gpointer user_data);
-
-gboolean
-ddb_listview_list_drag_failed (GtkWidget *widget,
- GdkDragContext *arg1,
- GtkDragResult arg2,
- gpointer user_data);
-
-void
-ddb_listview_list_drag_leave (GtkWidget *widget,
- GdkDragContext *drag_context,
- guint time,
- gpointer user_data);
-
-gboolean
-ddb_listview_list_button_release_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data);
-
-gboolean
-ddb_listview_motion_notify_event (GtkWidget *widget,
- GdkEventMotion *event,
- gpointer user_data);
-gboolean
-ddb_listview_list_button_press_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data);
-
-gboolean
-ddb_listview_vscroll_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data);
-
-gboolean
-ddb_listview_list_button_release_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data);
-
-gboolean
-ddb_listview_motion_notify_event (GtkWidget *widget,
- GdkEventMotion *event,
- gpointer user_data);
-
-gboolean
-ddb_listview_list_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data);
-
-static void
-ddb_listview_class_init(DdbListviewClass *class)
-{
- GtkTableClass *widget_class = (GtkTableClass *) class;
- 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
- drawctx_init (&listview->listctx);
- drawctx_init (&listview->hdrctx);
- listview->rowheight = -1;
-
- listview->col_movepos = -1;
- listview->drag_motion_y = -1;
-
- listview->ref_point = -1;
- listview->ref_point_offset = -1;
-
- listview->scroll_mode = 0;
- listview->scroll_pointer_y = -1;
- listview->scroll_direction = 0;
- listview->scroll_active = 0;
- memset (&listview->tm_prevscroll, 0, sizeof (listview->tm_prevscroll));
- listview->scroll_sleep_time = 0;
-
- listview->areaselect = 0;
-// listview->areaselect_x = -1;
- listview->areaselect_y = -1;
-// listview->areaselect_dx = -1;
-// listview->areaselect_dy = -1;
- listview->dragwait = 0;
- listview->drag_source_playlist = -1;
- listview->shift_sel_anchor = -1;
-
- listview->header_dragging = -1;
- listview->header_sizing = -1;
- listview->header_dragpt0 = 0;
- listview->header_dragpt1 = 0;
- listview->last_header_motion_ev = -1; //is it subject to remove?
- listview->prev_header_x = -1;
- listview->header_prepare = 0;
- listview->header_width = -1;
-
- listview->columns = NULL;
- listview->lock_columns = 1;
- listview->groups = NULL;
-
- listview->block_redraw_on_scroll = 0;
- listview->calculated_grouptitle_height = DEFAULT_GROUP_TITLE_HEIGHT;
-
- listview->cursor_sz = NULL;
- listview->cursor_drag = NULL;
-
- listview->area_selection_start = 0;
- listview->area_selection_end = 0;
-
- listview->cover_size = -1;
- listview->new_cover_size = -1;
- listview->cover_refresh_timeout_id = 0;
-
- GtkWidget *hbox;
- GtkWidget *vbox;
-
- gtk_table_resize (GTK_TABLE (listview), 2, 2);
- listview->scrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 1, 1, 0, 0)));
- gtk_widget_show (listview->scrollbar);
- gtk_table_attach (GTK_TABLE (listview), listview->scrollbar, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
-
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox);
- gtk_table_attach (GTK_TABLE (listview), hbox, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
-
- vbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (vbox);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
-
- GtkWidget *sepbox = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (sepbox);
- gtk_container_set_border_width (GTK_CONTAINER (sepbox), 1);
- gtk_box_pack_start (GTK_BOX (vbox), sepbox, FALSE, TRUE, 0);
-
- GtkWidget *hsep = gtk_hseparator_new ();
- gtk_widget_show (hsep);
- gtk_box_pack_start (GTK_BOX (sepbox), hsep, FALSE, TRUE, 0);
-
- listview->header = gtk_drawing_area_new ();
- gtk_widget_show (listview->header);
- gtk_box_pack_start (GTK_BOX (vbox), listview->header, FALSE, TRUE, 0);
- gtk_widget_set_events (listview->header, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
-
- listview->list = gtk_drawing_area_new ();
- gtk_widget_show (listview->list);
- gtk_box_pack_start (GTK_BOX (vbox), listview->list, TRUE, TRUE, 0);
- gtk_widget_set_can_focus (listview->list, TRUE);
- gtk_widget_set_can_default (listview->list, TRUE);
- int events = GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK;
-#if GTK_CHECK_VERSION(3,0,0)
- events |= GDK_SCROLL_MASK;
-#endif
-#if GTK_CHECK_VERSION(3,4,0)
- events |= GDK_SMOOTH_SCROLL_MASK;
-#endif
- gtk_widget_set_events (listview->list, events);
-
- listview->hscrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 0, 0, 0, 0)));
- gtk_widget_show (listview->hscrollbar);
- gtk_table_attach (GTK_TABLE (listview), listview->hscrollbar, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
-
-
- g_object_set_data (G_OBJECT (listview->list), "owner", listview);
- g_object_set_data (G_OBJECT (listview->header), "owner", listview);
- g_object_set_data (G_OBJECT (listview->scrollbar), "owner", listview);
- g_object_set_data (G_OBJECT (listview->hscrollbar), "owner", listview);
-
- g_signal_connect ((gpointer) listview->list, "configure_event",
- G_CALLBACK (ddb_listview_list_configure_event),
- NULL);
-
- 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);
- g_signal_connect ((gpointer) listview->header, "realize",
- G_CALLBACK (ddb_listview_header_realize),
- NULL);
- g_signal_connect ((gpointer) listview->header, "motion_notify_event",
- G_CALLBACK (ddb_listview_header_motion_notify_event),
- NULL);
- g_signal_connect_after ((gpointer) listview->header, "button_press_event",
- G_CALLBACK (ddb_listview_header_button_press_event),
- NULL);
- 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);
- g_signal_connect_after ((gpointer) listview->list, "button_press_event",
- G_CALLBACK (ddb_listview_list_button_press_event),
- NULL);
- g_signal_connect ((gpointer) listview->list, "popup_menu",
- G_CALLBACK (ddb_listview_list_popup_menu),
- NULL);
- g_signal_connect ((gpointer) listview->list, "scroll_event",
- G_CALLBACK (ddb_listview_vscroll_event),
- NULL);
-// g_signal_connect ((gpointer) listview->list, "drag_begin",
-// G_CALLBACK (on_list_drag_begin),
-// NULL);
- g_signal_connect ((gpointer) listview->list, "drag_motion",
- G_CALLBACK (ddb_listview_list_drag_motion),
- NULL);
- g_signal_connect ((gpointer) listview->list, "drag_drop",
- G_CALLBACK (ddb_listview_list_drag_drop),
- NULL);
- g_signal_connect ((gpointer) listview->list, "drag_data_get",
- G_CALLBACK (ddb_listview_list_drag_data_get),
- NULL);
- g_signal_connect ((gpointer) listview->list, "drag_end",
- G_CALLBACK (ddb_listview_list_drag_end),
- NULL);
- g_signal_connect ((gpointer) listview->list, "drag_failed",
- G_CALLBACK (ddb_listview_list_drag_failed),
- NULL);
- g_signal_connect ((gpointer) listview->list, "drag_leave",
- G_CALLBACK (ddb_listview_list_drag_leave),
- NULL);
- g_signal_connect ((gpointer) listview->list, "button_release_event",
- G_CALLBACK (ddb_listview_list_button_release_event),
- NULL);
- g_signal_connect ((gpointer) listview->list, "motion_notify_event",
- G_CALLBACK (ddb_listview_motion_notify_event),
- NULL);
- g_signal_connect ((gpointer) listview->list, "drag_data_received",
- G_CALLBACK (ddb_listview_list_drag_data_received),
- NULL);
- g_signal_connect ((gpointer) listview->hscrollbar, "value_changed",
- G_CALLBACK (ddb_listview_hscroll_value_changed),
- NULL);
-
- g_signal_connect ((gpointer)listview->list, "key_press_event", G_CALLBACK (ddb_listview_list_key_press_event), NULL);
-}
-
-GtkWidget * ddb_listview_new()
-{
- return g_object_newv (ddb_listview_get_type(), 0, NULL);//GTK_WIDGET(gtk_type_new(ddb_listview_get_type()));
-}
-
-static void
-ddb_listview_destroy(GObject *object)
-{
- DdbListview *listview;
-
- g_return_if_fail(object != NULL);
- g_return_if_fail(DDB_IS_LISTVIEW(object));
-
- listview = DDB_LISTVIEW(object);
-
- ddb_listview_free_groups (listview);
-
- while (listview->columns) {
- DdbListviewColumn *next = listview->columns->next;
- ddb_listview_column_free (listview, listview->columns);
- listview->columns = next;
- }
-
- if (listview->cursor_sz) {
- gdk_cursor_unref (listview->cursor_sz);
- listview->cursor_sz = NULL;
- }
- if (listview->cursor_drag) {
- gdk_cursor_unref (listview->cursor_drag);
- listview->cursor_drag = NULL;
- }
- draw_free (&listview->listctx);
- draw_free (&listview->hdrctx);
-}
-
-void
-ddb_listview_refresh (DdbListview *listview, uint32_t flags) {
- if (flags & DDB_LIST_CHANGED) {
- ddb_listview_build_groups (listview);
- }
- if (flags & DDB_REFRESH_LIST) {
- gtk_widget_queue_draw (listview->list);
- }
- if (flags & DDB_REFRESH_VSCROLL) {
- ddb_listview_list_setup_vscroll (listview);
- }
- if (flags & DDB_REFRESH_HSCROLL) {
- ddb_listview_list_setup_hscroll (listview);
- }
- if (flags & DDB_REFRESH_COLUMNS) {
- gtk_widget_queue_draw (listview->header);
- }
-}
-
-void
-ddb_listview_list_realize (GtkWidget *widget,
- gpointer user_data)
-{
- GtkTargetEntry entry = {
- .target = "DDB_URI_LIST",
- .flags = GTK_TARGET_SAME_APP,
- .info = TARGET_SAMEWIDGET
- };
- // setup drag-drop target
- gtk_drag_dest_set (widget, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, &entry, 1, GDK_ACTION_COPY | GDK_ACTION_MOVE);
- gtk_drag_dest_add_uri_targets (widget);
-// gtk_drag_dest_set_track_motion (widget, TRUE);
-}
-
-static gboolean
-ddb_listview_reconf_scrolling (void *ps) {
- ddb_listview_list_setup_vscroll (ps);
- ddb_listview_list_setup_hscroll (ps);
- return FALSE;
-}
-
-static void
-ddb_listview_list_update_total_width (DdbListview *lv, int size) {
- GtkAllocation a;
- gtk_widget_get_allocation (GTK_WIDGET (lv->list), &a);
- lv->totalwidth = size;
- if (lv->totalwidth < a.width) {
- lv->totalwidth = a.width;
- }
-}
-
-gboolean
-ddb_listview_list_configure_event (GtkWidget *widget,
- GdkEventConfigure *event,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
-
- draw_init_font (&ps->listctx, gtk_widget_get_style (widget));
- int height = draw_get_listview_rowheight (&ps->listctx);
- if (height != ps->rowheight) {
- ps->rowheight = height;
- ps->calculated_grouptitle_height = height * 1.2;
- ddb_listview_build_groups (ps);
- }
-
- 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;
- }
- ddb_listview_list_update_total_width (ps, size);
- g_idle_add (ddb_listview_reconf_scrolling, ps);
-
- return FALSE;
-}
-
-void
-ddb_listview_groupcheck (DdbListview *listview) {
- int idx = listview->binding->modification_idx ();
- if (idx != listview->groups_build_idx) {
- ddb_listview_build_groups (listview);
- }
-}
-
-// returns 1 if X coordinate in list belongs to album art column and 0 if not
-int
-ddb_listview_is_album_art_column (DdbListview *listview, int x)
-{
- int album_art_column = 0;
- int col_x = -listview->hscrollpos;
- int cnt = ddb_listview_column_get_count (listview);
- for (int i = 0; i < cnt, col_x <= x; i++) {
- const char *title;
- int width;
- int align_right;
- col_info_t *info;
- int minheight;
- int res = ddb_listview_column_get_info (listview, i, &title, &width, &align_right, &minheight, (void **)&info);
- if (res != -1 && x <= col_x + width && info->id == DB_COLUMN_ALBUM_ART) {
- return 1;
- }
- col_x += width;
- }
- return 0;
-}
-
-// returns 1 if column is album art column
-int
-ddb_listview_is_album_art_column_idx (DdbListview *listview, int cidx)
-{
- const char *title;
- int width;
- int align_right;
- col_info_t *info;
- int minheight;
- int res = ddb_listview_column_get_info (listview, cidx, &title, &width, &align_right, &minheight, (void **)&info);
- if (res != -1 && info->id == DB_COLUMN_ALBUM_ART) {
- return 1;
- }
- return 0;
-}
-
-// returns Y coordinate of an item by its index
-int
-ddb_listview_get_row_pos (DdbListview *listview, int row_idx) {
- int y = 0;
- int idx = 0;
- deadbeef->pl_lock ();
- ddb_listview_groupcheck (listview);
- DdbListviewGroup *grp = listview->groups;
- while (grp) {
- if (idx + grp->num_items > row_idx) {
- int i = y + listview->grouptitle_height + (row_idx - idx) * listview->rowheight;
- deadbeef->pl_unlock ();
- return i;
- }
- y += grp->height;
- idx += grp->num_items;
- grp = grp->next;
- }
- deadbeef->pl_unlock ();
- return y;
-}
-
-// input: absolute y coord in list (not in window)
-// returns -1 if nothing was hit, otherwise returns pointer to a group, and item idx
-// item idx may be set to -1 if group title was hit
-static int
-ddb_listview_list_pickpoint_y (DdbListview *listview, int y, DdbListviewGroup **group, int *group_idx, int *global_idx) {
- int idx = 0;
- int grp_y = 0;
- int gidx = 0;
- deadbeef->pl_lock ();
- ddb_listview_groupcheck (listview);
- DdbListviewGroup *grp = listview->groups;
- while (grp) {
- int h = grp->height;
- if (y >= grp_y && y < grp_y + h) {
- *group = grp;
- y -= grp_y;
- if (y < listview->grouptitle_height) {
- *group_idx = -1;
- *global_idx = idx;
- }
- else if (y >= listview->grouptitle_height + grp->num_items * listview->rowheight) {
- *group_idx = (y - listview->grouptitle_height) / listview->rowheight;
- *global_idx = -1;
- }
- else {
- *group_idx = (y - listview->grouptitle_height) / listview->rowheight;
- *global_idx = idx + *group_idx;
- }
- deadbeef->pl_unlock ();
- return 0;
- }
- grp_y += grp->height;
- idx += grp->num_items;
- grp = grp->next;
- gidx++;
- }
- deadbeef->pl_unlock ();
- return -1;
-}
-
-int render_idx = 0;
-
-void
-ddb_listview_list_render (DdbListview *listview, cairo_t *cr, int x, int y, int w, int h) {
- render_idx = 0;
- cairo_set_line_width (cr, 1);
- cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
- GtkWidget *treeview = theme_treeview;
-
-#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 ();
- ddb_listview_groupcheck (listview);
- // find 1st group
- DdbListviewGroup *grp = listview->groups;
- int grp_y = 0;
- int grp_next_y = 0;
- DdbListviewGroup *pinned_grp = NULL;
-
- while (grp && grp_y + grp->height < y + listview->scrollpos) {
- if (grp_y < listview->scrollpos && grp_y + grp->height >= listview->scrollpos) {
- pinned_grp = grp;
- grp->pinned = 1;
- }
- grp_y += grp->height;
- idx += grp->num_items + 1;
- abs_idx += grp->num_items;
- grp = grp->next;
- }
-
- draw_begin (&listview->listctx, cr);
-
- if (grp && !pinned_grp && grp_y < listview->scrollpos) {
- grp->pinned = 1;
- pinned_grp = grp;
- }
- else if (grp && pinned_grp && pinned_grp->next == grp) {
- grp->pinned = 2;
- }
-
- int ii = 0;
- while (grp && grp_y < y + h + listview->scrollpos) {
- int grp_height = listview->grouptitle_height + grp->num_items * listview->rowheight;
- // render title
- DdbListviewIter it = grp->head;
- int grp_height_total = grp->height;
- int pushback = 0;
- int group_idx = idx;
-
- if (grp_y >= y + h + listview->scrollpos) {
- break;
- }
- 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, 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, cr, it, -listview->hscrollpos, grp_y - listview->scrollpos, listview->totalwidth, listview->grouptitle_height);
- }
- }
-
- grp_next_y = grp_y + grp_height_total;
- for (int i = 0; i < grp->num_items; i++) {
- ii++;
- int grp_row_y = grp_y + listview->grouptitle_height + i * listview->rowheight;
- if (grp_row_y >= y + h + listview->scrollpos) {
- break;
- }
- if (grp->pinned == 1 && gtkui_groups_pinned && grp_next_y - listview->scrollpos <= listview->grouptitle_height) {
- pushback = listview->grouptitle_height - (grp_next_y - listview->scrollpos);
- }
- if (grp_y + listview->grouptitle_height + (i+1) * listview->rowheight >= y + listview->scrollpos
- && grp_row_y < y + h + listview->scrollpos) {
- GtkStyle *st = gtk_widget_get_style (listview->list);
- gdk_cairo_set_source_color (cr, &st->bgGTK_STATE_NORMAL);
- cairo_rectangle (cr, -listview->hscrollpos, grp_row_y - 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_row_y - 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, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_row_y - listview->scrollpos, listview->totalwidth, listview->rowheight);
- }
- DdbListviewIter next = listview->binding->next (it);
- listview->binding->unref (it);
- it = next;
- if (!it) {
- break; // sanity check, in case groups were not rebuilt yet
- }
- }
- idx += grp->num_items + 1;
- abs_idx += grp->num_items;
-
- DdbListviewIter prev = listview->binding->prev (it);
- int filler = grp_height_total - (grp_height);
- if (filler > 0) {
- int theming = !gtkui_override_listview_colors ();
- if (theming) {
-#if GTK_CHECK_VERSION(3,0,0)
- gtk_paint_flat_box (gtk_widget_get_style (treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, treeview, "cell_even_ruled", x, grp_y - listview->scrollpos + grp_height, 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 + grp_height, w, filler);
-#endif
- }
- else {
- GdkColor clr;
- gtkui_get_listview_even_row_color (&clr);
- gdk_cairo_set_source_color (cr, &clr);
- cairo_rectangle (cr, x, grp_y - listview->scrollpos + grp_height, w, filler);
- cairo_fill (cr);
- }
- //ddb_listview_list_render_row_foreground (listview, cr, NULL, grp->head, 0, 0, grp->num_items * listview->rowheight, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_y - listview->scrollpos + grp_height, listview->totalwidth, filler);
- }
-
- // draw album art
- ddb_listview_list_render_album_art (listview, cr, it, grp->head, 0, grp->height, grp->pinned, grp_next_y - listview->scrollpos, -listview->hscrollpos, grp_y + listview->grouptitle_height - listview->scrollpos, listview->totalwidth, grp_height_total);
- // draw pinned group title
- if (grp->pinned == 1 && gtkui_groups_pinned && y <= 0) {
- ddb_listview_list_render_row_background (listview, cr, NULL, group_idx & 1, 0, -listview->hscrollpos, y, listview->totalwidth, listview->grouptitle_height);
- if (listview->binding->draw_group_title && listview->grouptitle_height > 0) {
- listview->binding->draw_group_title (listview, cr, grp->head, -listview->hscrollpos, y - pushback, listview->totalwidth, listview->grouptitle_height);
- }
- }
-
- if (prev) {
- listview->binding->unref (prev);
- }
- if (it) {
- listview->binding->unref (it);
- }
- grp_y += grp_height_total;
- if (grp->pinned == 1) {
- grp = grp->next;
- if (grp) {
- grp->pinned = 2;
- }
- }
- else {
- grp = grp->next;
- if (grp) {
- grp->pinned = 0;
- }
- }
- }
- if (grp_y < y + h + listview->scrollpos) {
- int hh = y + h - (grp_y - listview->scrollpos);
-// gdk_draw_rectangle (listview->list->window, listview->list->style->bg_gcGTK_STATE_NORMAL, TRUE, x, grp_y - listview->scrollpos, w, hh);
- int theming = !gtkui_override_listview_colors ();
- if (theming) {
-#if GTK_CHECK_VERSION(3,0,0)
- gtk_paint_flat_box (gtk_widget_get_style (treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, treeview, "cell_even_ruled", 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;
- 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 ();
- draw_end (&listview->listctx);
-}
-
-static void
-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);
- 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,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- widget = ps->list;
- 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, cr);
- }
- cairo_destroy (cr);
- return FALSE;
-}
-#endif
-
-gboolean
-ddb_listview_vscroll_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
-
-	GdkEventScroll *ev = (GdkEventScroll*)event;
-
- GtkWidget *rangeh = ps->hscrollbar;
- GtkWidget *rangev = ps->scrollbar;
-
- gdouble deltah = SCROLL_STEP * 2;
- gdouble deltav = SCROLL_STEP * 2;
- gdouble scrollh = gtk_range_get_value (GTK_RANGE (rangeh));
- gdouble scrollv = gtk_range_get_value (GTK_RANGE (rangev));
- // pass event to scrollbar
- if (ev->direction == GDK_SCROLL_UP) {
- gtk_range_set_value (GTK_RANGE (rangev), scrollv - deltav);
- }
- else if (ev->direction == GDK_SCROLL_DOWN) {
- gtk_range_set_value (GTK_RANGE (rangev), scrollv + deltav);
- }
- else if (ev->direction == GDK_SCROLL_LEFT) {
- gtk_range_set_value (GTK_RANGE (rangeh), scrollh - deltah);
- }
- else if (ev->direction == GDK_SCROLL_RIGHT) {
- gtk_range_set_value (GTK_RANGE (rangeh), scrollh + deltah);
- }
-#if GTK_CHECK_VERSION(3,4,0)
- else if (ev->direction == GDK_SCROLL_SMOOTH) {
- gdouble x, y;
- if (gdk_event_get_scroll_deltas(event, &x, &y)) {
- gtk_range_set_value (GTK_RANGE (rangeh), scrollh + deltah * x);
- gtk_range_set_value (GTK_RANGE (rangev), scrollv + deltav * y);
- }
- }
-#endif
-
- return FALSE;
-}
-
-void
-ddb_listview_vscroll_value_changed (GtkRange *widget,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- int newscroll = gtk_range_get_value (GTK_RANGE (widget));
- if (ps->binding->vscroll_changed) {
- ps->binding->vscroll_changed (newscroll);
- }
- if (ps->block_redraw_on_scroll) {
- ps->scrollpos = newscroll; 
- return;
- }
- if (newscroll != ps->scrollpos) {
- ps->scrollpos = newscroll;
- gtk_widget_queue_draw (ps->list);
- }
-}
-
-void
-ddb_listview_hscroll_value_changed (GtkRange *widget,
- gpointer user_data)
-{
- DdbListview *pl = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- int newscroll = gtk_range_get_value (GTK_RANGE (widget));
- ddb_listview_list_set_hscroll (pl, newscroll);
-}
-
-gboolean
-ddb_listview_list_drag_motion (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x,
- gint y,
- guint time,
- gpointer user_data)
-{
- DdbListview *pl = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- ddb_listview_list_track_dragdrop (pl, y);
- 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 (targets, i));
- gchar *nm = gdk_atom_name (a);
- if (!strcmp (nm, "text/uri-list")) {
- g_free (nm);
- break;
- }
- g_free (nm);
- }
- if (i != cnt) {
- gdk_drag_status (drag_context, GDK_ACTION_COPY, time);
- }
- else {
- GdkModifierType mask;
-
- gdk_window_get_pointer (gtk_widget_get_window (widget),
- NULL, NULL, &mask);
- if (mask & GDK_CONTROL_MASK) {
- gdk_drag_status (drag_context, GDK_ACTION_COPY, time);
- }
- else {
- gdk_drag_status (drag_context, GDK_ACTION_MOVE, time);
- }
- }
- return FALSE;
-}
-
-
-gboolean
-ddb_listview_list_drag_drop (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x,
- gint y,
- guint time,
- gpointer user_data)
-{
- return TRUE;
-}
-
-
-void
-ddb_listview_list_drag_data_get (GtkWidget *widget,
- GdkDragContext *drag_context,
- GtkSelectionData *selection_data,
- guint target_type,
- guint time,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- switch (target_type) {
- case TARGET_SAMEWIDGET:
- {
- // format as "STRING" consisting of array of pointers
- int nsel = deadbeef->plt_get_sel_count (ps->drag_source_playlist);
- if (!nsel) {
- break; // something wrong happened
- }
- uint32_t *ptr = malloc ((nsel+1) * sizeof (uint32_t));
- *ptr = ps->drag_source_playlist;
- int idx = 0;
- int i = 1;
- DdbListviewIter it = deadbeef->plt_get_head (ps->drag_source_playlist);
- for (; it; idx++) {
- if (ps->binding->is_selected (it)) {
- ptri = idx;
- i++;
- }
- DdbListviewIter next = ps->binding->next (it);
- ps->binding->unref (it);
- it = next;
- }
- 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;
- default:
- g_assert_not_reached ();
- }
-}
-
-
-void
-ddb_listview_list_drag_data_received (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x,
- gint y,
- GtkSelectionData *data,
- guint target_type,
- guint time,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- ps->scroll_direction = 0; // interrupt autoscrolling, if on
- ps->scroll_active = 0;
- ps->drag_motion_y = -1;
- if (!ps->binding->external_drag_n_drop || !ps->binding->drag_n_drop) {
- gtk_drag_finish (drag_context, TRUE, FALSE, time);
- return;
- }
- int sel = ddb_listview_dragdrop_get_row_from_coord (ps, y);
- DdbListviewIter it = NULL;
- if (sel == -1) {
- if (ps->binding->count () != 0) {
- sel = ps->binding->count ();
- }
- }
- if (sel != -1) {
- it = ps->binding->get_for_idx (sel);
- }
- 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 (len+1);
- memcpy (mem, ptr, len);
- memlen = 0;
- // we don't pass control structure, but there's only one drag-drop view currently
- ps->binding->external_drag_n_drop (it, mem, len);
- if (it) {
- UNREF (it);
- }
- }
- 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 = (len/4)-1;
- DdbListviewIter drop_before = it;
- // find last selected
- while (drop_before && ps->binding->is_selected (drop_before)) {
- DdbListviewIter next = PL_NEXT(drop_before);
- UNREF (drop_before);
- drop_before = next;
- }
- ddb_playlist_t *p = deadbeef->plt_get_for_idx (plt);
- if (p) {
- // 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) {
- UNREF (drop_before);
- }
- }
- gtk_drag_finish (drag_context, TRUE, FALSE, time);
-}
-
-gboolean
-ddb_listview_list_drag_failed (GtkWidget *widget,
- GdkDragContext *arg1,
- GtkDragResult arg2,
- gpointer user_data)
-{
- return TRUE;
-}
-
-
-void
-ddb_listview_list_drag_leave (GtkWidget *widget,
- GdkDragContext *drag_context,
- guint time,
- gpointer user_data)
-{
- DdbListview *pl = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- ddb_listview_list_track_dragdrop (pl, -1);
-}
-
-// debug function for gdk_draw_drawable
-//static inline void
-//draw_drawable (GdkDrawable *window, GdkGC *gc, GdkDrawable *drawable, int x1, int y1, int x2, int y2, int w, int h) {
-// gint width1, height1;
-// gint width2, height2;
-// gdk_drawable_get_size (window, &width1, &height1);
-// gdk_drawable_get_size (drawable, &width2, &height2);
-//// assert (y1 >= 0 && y1 + h < height2);
-//// assert (y2 >= 0 && y2 + h < height1);
-//// printf ("dd: %p %p %p %d %d %d %d %d %d\n", window, gc, drawable, x1, y1, x2, y2, w, h);
-// gdk_draw_drawable (window, gc, drawable, x1, y1, x2, y2, w, h);
-//}
-
-int
-ddb_listview_get_vscroll_pos (DdbListview *listview) {
- return listview->scrollpos;
-}
-
-int
-ddb_listview_get_hscroll_pos (DdbListview *listview) {
- return listview->hscrollpos;
-}
-
-#define MIN_COLUMN_WIDTH 16
-#define COLHDR_ANIM_TIME 0.2f
-
-void
-ddb_listview_list_setup_vscroll (DdbListview *ps) {
- ddb_listview_groupcheck (ps);
- GtkWidget *list = ps->list;
- GtkWidget *scroll = ps->scrollbar;
- int vheight = ps->fullheight;
- 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);
- }
- else {
- gtk_widget_show (scroll);
- if (ps->scrollpos >= vheight - a.height) {
- ps->scrollpos = vheight - a.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);
-}
-
-void
-ddb_listview_list_setup_hscroll (DdbListview *ps) {
- GtkWidget *list = ps->list;
- 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;
- }
- ddb_listview_list_update_total_width (ps, size);
- GtkWidget *scroll = ps->hscrollbar;
- if (w >= size) {
- gtk_widget_hide (scroll);
- ps->hscrollpos = 0;
- gtk_widget_queue_draw (ps->list);
- }
- else {
- if (ps->hscrollpos >= size-w) {
- int n = size-w-1;
- ps->hscrollpos = max (0, n);
- gtk_range_set_value (GTK_RANGE (scroll), ps->hscrollpos);
- }
- GtkAdjustment *adj = (GtkAdjustment*)gtk_adjustment_new (gtk_range_get_value (GTK_RANGE (scroll)), 0, size, 1, w, w);
- gtk_range_set_adjustment (GTK_RANGE (scroll), adj);
- gtk_widget_show (scroll);
- }
-}
-
-// returns -1 if row not found
-int
-ddb_listview_list_get_drawinfo (DdbListview *listview, int row, DdbListviewGroup **pgrp, int *even, int *cursor, int *group_y, int *x, int *y, int *w, int *h) {
- deadbeef->pl_lock ();
- ddb_listview_groupcheck (listview);
- DdbListviewGroup *grp = listview->groups;
- int idx = 0;
- int idx2 = 0;
- *y = -listview->scrollpos;
- while (grp) {
- int grpheight = grp->height;
- if (idx <= row && idx + grp->num_items > row) {
- // found
- int idx_in_group = row - idx;
- *pgrp = grp;
- *even = (idx2 + 1 + idx_in_group) & 1;
- *cursor = (row == listview->binding->cursor ()) ? 1 : 0;
- *group_y = idx_in_group * listview->rowheight;
- *x = -listview->hscrollpos;
- *y += listview->grouptitle_height + (row - idx) * listview->rowheight;
- *w = listview->totalwidth;
- *h = listview->rowheight;
- deadbeef->pl_unlock ();
- return 0;
- }
- *y += grpheight;
- idx += grp->num_items;
- idx2 += grp->num_items + 1;
- grp = grp->next;
- }
- deadbeef->pl_unlock ();
- return -1;
-}
-
-void
-ddb_listview_draw_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;
- }
-
- 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, a.width, h);
-}
-
-// coords passed are window-relative
-void
-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 !GTK_CHECK_VERSION(3,0,0)
- if (gtk_widget_get_style (treeview)->depth == -1) {
- return; // drawing was called too early
- }
-#endif
- }
- int sel = it && ps->binding->is_selected (it);
- if (theming || !sel) {
- if (theming) {
- // draw background for selection -- workaround for New Wave theme (translucency)
-#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 ? "cell_even_ruled" : "cell_odd_ruled", 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;
- 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) {
-#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 ? "cell_even_ruled" : "cell_odd_ruled", x-1, y-1, w+1, h+1);
-#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);
-// if (gtk_widget_has_focus (ps->list)) {
-// gtk_paint_focus (gtk_widget_get_style (treeview), ps->list->window, GTK_STATE_SELECTED, NULL, treeview, "treeview", x, y, w, h);
-// }
-#endif
- }
- else {
- GdkColor clr;
-#if !GTK_CHECK_VERSION(3,0,0)
- 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);
-
-#else
- 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);
-#endif
- }
- }
-	if (cursor && gtk_widget_has_focus (ps->list)) {
- // not all gtk engines/themes render focus rectangle in treeviews
- // but we want it anyway
- //treeview->style->fg_gcGTK_STATE_NORMAL
- GdkColor clr;
-#if !GTK_CHECK_VERSION(3,0,0)
- 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);
-#else
- 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);
-#endif
- }
-}
-
-void
-ddb_listview_list_render_row_foreground (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int even, int cursor, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h) {
- int 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 = &gtk_widget_get_style (theme_treeview)->fgGTK_STATE_SELECTED;
- float rgb3 = { clr->red/65535.f, clr->green/65535.f, clr->blue/65535.f };
- draw_set_fg_color (&ps->listctx, rgb);
- }
- else {
- GdkColor *clr = &gtk_widget_get_style (theme_treeview)->fgGTK_STATE_NORMAL;
- float rgb3 = { clr->red/65535.f, clr->green/65535.f, clr->blue/65535.f };
- draw_set_fg_color (&ps->listctx, rgb);
- }
- DdbListviewColumn *c;
- int cidx = 0;
- for (c = ps->columns; c; c = c->next, cidx++) {
- int cw = c->width;
- if (!ddb_listview_is_album_art_column_idx (ps, cidx)) {
- ps->binding->draw_column_data (ps, cr, it, ps->grouptitle_height > 0 ? group_it : NULL, cidx, group_y, group_height, group_pinned, grp_next_y, x, y, cw, h);
- }
- x += cw;
- }
-}
-
-void
-ddb_listview_list_render_album_art (DdbListview *ps, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int w, int h) {
- DdbListviewColumn *c;
- int cidx = 0;
- for (c = ps->columns; c; c = c->next, cidx++) {
- int cw = c->width;
- if (ddb_listview_is_album_art_column_idx (ps, cidx)) {
- ps->binding->draw_column_data (ps, cr, it, ps->grouptitle_height > 0 ? group_it : NULL, cidx, group_y, group_height, group_pinned, grp_next_y, x, y, cw, h);
- }
- x += cw;
- }
-}
-
-void
-ddb_listview_header_expose (DdbListview *ps, cairo_t *cr, int x, int y, int w, int h) {
- ddb_listview_header_render (ps, cr);
-}
-
-void
-ddb_listview_select_single (DdbListview *ps, int sel) {
- int nchanged = 0;
- deadbeef->pl_lock ();
-
- DdbListviewIter sel_it = ps->binding->get_for_idx (sel);
- if (!sel_it) {
- deadbeef->pl_unlock ();
- return;
- }
-
- DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
- while (it) {
- int selected = deadbeef->pl_is_selected (it);
- if (selected) {
- deadbeef->pl_set_selected (it, 0);
- }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- UNREF (it);
- it = next;
- }
- UNREF (it);
-
- ps->binding->select (sel_it, 1);
-
- UNREF (sel_it);
- deadbeef->pl_unlock ();
-
- ddb_listview_refresh (ps, DDB_REFRESH_LIST);
- ps->binding->selection_changed (ps, NULL, -1); // that means "selection changed a lot, redraw everything"
- ps->area_selection_start = sel;
- ps->area_selection_end = sel;
-}
-
-void
-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);
-
- // clicked album art column?
- int album_art_column = ddb_listview_is_album_art_column (ps, ex);
-
- if (sel == -1 && !album_art_column && (!grp || (ey > ps->grouptitle_height && grp_index >= grp->num_items))) {
- // clicked empty space, deselect everything
- DdbListviewIter it;
- int idx = 0;
- for (it = ps->binding->head (); it; idx++) {
- if (ps->binding->is_selected (it)) {
- ps->binding->select (it, 0);
- ddb_listview_draw_row (ps, idx, it);
- ps->binding->selection_changed (ps, it, idx);
- }
- DdbListviewIter next = ps->binding->next (it);
- ps->binding->unref (it);
- it = next;
- }
- }
- else if ((sel != -1 && grp && grp_index == -1) || (ey <= ps->grouptitle_height && gtkui_groups_pinned) || album_art_column) {
- // clicked group title, select group
- DdbListviewIter it;
- int idx = 0;
- int cnt = -1;
- for (it = ps->binding->head (); it; idx++) {
- if (it == grp->head) {
- cnt = grp->num_items;
- }
- if (cnt > 0) {
- if (!ps->binding->is_selected (it)) {
- ps->binding->select (it, 1);
- ddb_listview_draw_row (ps, idx, it);
- ps->binding->selection_changed (ps, it, idx);
- }
- cnt--;
- }
- else {
- if (ps->binding->is_selected (it)) {
- ps->binding->select (it, 0);
- ddb_listview_draw_row (ps, idx, it);
- ps->binding->selection_changed (ps, it, idx);
- }
- }
- DdbListviewIter next = ps->binding->next (it);
- ps->binding->unref (it);
- it = next;
- }
- }
- 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 && 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) {
- ps->areaselect = 1;
- ps->areaselect_y = ey + ps->scrollpos;
- ps->shift_sel_anchor = ps->binding->cursor ();
- }
- }
- else if (dnd) {
- ps->dragwait = 1;
- }
- UNREF (it);
- }
- deadbeef->pl_unlock ();
-}
-
-// {{{ expected behaviour for mouse1 without modifiers:
-// {{{ + if clicked unselected item:
-// unselect all
-// select clicked item
-// deadbeef->pl_get_cursor (ps->iterator) = clicked
-// redraw
-// start 'area selection' mode
-// }}}
-// {{{ + if clicked selected item:
-// deadbeef->pl_get_cursor (ps->iterator) = clicked
-// redraw
-// wait until next release or motion event, whichever is 1st
-// if release is 1st:
-// unselect all except clicked, redraw
-// else if motion is 1st:
-// enter drag-drop mode
-// }}}
-// }}}
-void
-ddb_listview_list_mouse1_pressed (DdbListview *ps, int state, int ex, int ey, GdkEventType type) {
- // cursor must be set here, but selection must be handled in keyrelease
- deadbeef->pl_lock ();
- ddb_listview_groupcheck (ps);
- int cnt = ps->binding->count ();
- if (cnt == 0) {
- deadbeef->pl_unlock ();
- return;
- }
- // remember mouse coords for doubleclick detection
- ps->lastpos0 = ex;
- ps->lastpos1 = ey;
- // select item
- DdbListviewGroup *grp;
- int grp_index;
- int sel;
- if (ddb_listview_list_pickpoint_y (ps, ey + ps->scrollpos, &grp, &grp_index, &sel) == -1) {
- deadbeef->pl_unlock ();
- return;
- }
-
- int cursor = ps->binding->cursor ();
- if (type == GDK_2BUTTON_PRESS
- && fabs(ps->lastpos0 - ex) < 3
- && fabs(ps->lastpos1 - ey) < 3) {
- // doubleclick - play this item
- if (sel != -1 && cursor != -1) {
- int idx = cursor;
- DdbListviewIter it = ps->binding->get_for_idx (idx);
- if (ps->binding->handle_doubleclick && it) {
- ps->binding->handle_doubleclick (ps, it, idx);
- }
- if (it) {
- ps->binding->unref (it);
- }
- deadbeef->pl_unlock ();
- return;
- }
- }
-
- int prev = cursor;
- if (sel != -1) {
- // pick 1st item in group in case album art column was clicked
- if (ddb_listview_is_album_art_column (ps, ex) && grp_index != -1) {
- sel -= grp_index;
- }
-
- ps->binding->set_cursor (sel);
- DdbListviewIter it = ps->binding->get_for_idx (sel);
- if (it) {
- ddb_listview_draw_row (ps, sel, it);
- UNREF (it);
- }
- ps->shift_sel_anchor = ps->binding->cursor ();
- }
- // handle multiple selection
-#ifndef __APPLE__
- int selmask = GDK_CONTROL_MASK;
-#else
- int selmask = GDK_MOD2_MASK;
-#endif
- if (!(state & (selmask|GDK_SHIFT_MASK)))
- {
- ddb_listview_click_selection (ps, ex, ey, grp, grp_index, sel, 1, 1);
- }
- else if (state & selmask) {
- // toggle selection
- if (sel != -1) {
- DdbListviewIter it = ps->binding->get_for_idx (sel);
- if (it) {
- ps->binding->select (it, 1 - ps->binding->is_selected (it));
- ddb_listview_draw_row (ps, sel, it);
- ps->binding->selection_changed (ps, it, sel);
- UNREF (it);
- }
- }
- }
- else if (state & GDK_SHIFT_MASK) {
- // select range
- int cursor = sel;//ps->binding->cursor ();
- if (cursor == -1) {
- // find group
- ddb_listview_groupcheck (ps);
- DdbListviewGroup *g = ps->groups;
- int idx = 0;
- while (g) {
- if (g == grp) {
- cursor = idx - 1;
- break;
- }
- idx += g->num_items;
- g = g->next;
- }
- }
- int start = min (prev, cursor);
- int end = max (prev, cursor);
- int idx = 0;
- for (DdbListviewIter it = ps->binding->head (); it; idx++) {
- if (idx >= start && idx <= end) {
- if (!ps->binding->is_selected (it)) {
- ps->binding->select (it, 1);
- ddb_listview_draw_row (ps, idx, it);
- ps->binding->selection_changed (ps, it, idx);
- }
- }
- else {
- if (ps->binding->is_selected (it)) {
- ps->binding->select (it, 0);
- ddb_listview_draw_row (ps, idx, it);
- ps->binding->selection_changed (ps, it, idx);
- }
- }
- DdbListviewIter next = PL_NEXT (it);
- UNREF (it);
- it = next;
- }
- }
- cursor = ps->binding->cursor ();
- if (cursor != -1 && sel == -1) {
- DdbListviewIter it = ps->binding->get_for_idx (cursor);
- ddb_listview_draw_row (ps, cursor, it);
- UNREF (it);
- }
- if (prev != -1 && prev != cursor) {
- DdbListviewIter it = ps->binding->get_for_idx (prev);
- ddb_listview_draw_row (ps, prev, it);
- UNREF (it);
- }
- deadbeef->pl_unlock ();
-}
-
-void
-ddb_listview_list_mouse1_released (DdbListview *ps, int state, int ex, int ey, double time) {
- if (ps->dragwait) {
- ps->dragwait = 0;
- DdbListviewGroup *grp;
- int grp_index;
- int sel;
- if (!ddb_listview_list_pickpoint_y (ps, ey + ps->scrollpos, &grp, &grp_index, &sel)) {
- ddb_listview_select_single (ps, sel);
- }
- else {
- ps->binding->set_cursor (-1);
- DdbListviewIter it = ps->binding->head ();
- int idx = 0;
- while (it) {
- if (ps->binding->is_selected (it)) {
- ps->binding->select (it, 0);
- ddb_listview_draw_row (ps, idx, it);
- ps->binding->selection_changed (ps, it, idx);
- it = PL_NEXT (it);
- }
- idx++;
- }
- }
- }
- else if (ps->areaselect) {
- ps->scroll_direction = 0;
- ps->scroll_pointer_y = -1;
- ps->areaselect = 0;
- }
-}
-
-#if 0
-void
-ddb_listview_list_dbg_draw_areasel (GtkWidget *widget, int x, int y) {
- // erase previous rect using 4 blits from ps->list->windowfer
- if (areaselect_dx != -1) {
- int sx = min (areaselect_x, areaselect_dx);
- int sy = min (areaselect_y, areaselect_dy);
- int dx = max (areaselect_x, areaselect_dx);
- int dy = max (areaselect_y, areaselect_dy);
- int w = dx - sx + 1;
- int h = dy - sy + 1;
- //draw_drawable (widget->window, widget->style->black_gc, ps->list->window, sx, sy, sx, sy, dx - sx + 1, dy - sy + 1);
- draw_drawable (widget->window, widget->style->black_gc, ps->list->window, sx, sy, sx, sy, w, 1);
- draw_drawable (widget->window, widget->style->black_gc, ps->list->window, sx, sy, sx, sy, 1, h);
- draw_drawable (widget->window, widget->style->black_gc, ps->list->window, sx, sy + h - 1, sx, sy + h - 1, w, 1);
- draw_drawable (widget->window, widget->style->black_gc, ps->list->window, sx + w - 1, sy, sx + w - 1, sy, 1, h);
- }
- areaselect_dx = x;
- areaselect_dy = y;
-	cairo_t *cr;
-	cr = gdk_cairo_create (widget->window);
-	if (!cr) {
-		return;
-	}
- cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
- cairo_set_line_width (cr, 1);
- int sx = min (areaselect_x, x);
- int sy = min (areaselect_y, y);
- int dx = max (areaselect_x, x);
- int dy = max (areaselect_y, y);
- cairo_rectangle (cr, sx, sy, dx-sx, dy-sy);
- cairo_stroke (cr);
- cairo_destroy (cr);
-}
-#endif
-
-static gboolean
-ddb_listview_list_scroll_cb (gpointer data) {
- DdbListview *ps = (DdbListview *)data;
- ps->scroll_active = 1;
- struct timeval tm;
- gettimeofday (&tm, NULL);
- float dt = tm.tv_sec - ps->tm_prevscroll.tv_sec + (tm.tv_usec - ps->tm_prevscroll.tv_usec) / 1000000.0;
- if (dt < ps->scroll_sleep_time) {
- return TRUE;
- }
- memcpy (&ps->tm_prevscroll, &tm, sizeof (tm));
- if (ps->scroll_pointer_y == -1) {
- ps->scroll_active = 0;
- return FALSE;
- }
- if (ps->scroll_direction == 0) {
- ps->scroll_active = 0;
- return FALSE;
- }
- int sc = ps->scrollpos + (ps->scroll_direction * 100 * dt);
- if (sc < 0) {
- ps->scroll_active = 0;
- return FALSE;
- }
-// trace ("scroll to %d speed %f\n", sc, ps->scroll_direction);
- gtk_range_set_value (GTK_RANGE (ps->scrollbar), sc);
- if (ps->scroll_mode == 0) {
- ddb_listview_list_mousemove (ps, NULL, 0, ps->scroll_pointer_y);
- }
- else if (ps->scroll_mode == 1) {
- ddb_listview_list_track_dragdrop (ps, ps->scroll_pointer_y);
- }
- if (ps->scroll_direction < 0) {
- ps->scroll_direction -= (10 * dt);
- if (ps->scroll_direction < -30) {
- ps->scroll_direction = -30;
- }
- }
- else {
- ps->scroll_direction += (10 * dt);
- if (ps->scroll_direction > 30) {
- ps->scroll_direction = 30;
- }
- }
- return TRUE;
-}
-
-void
-ddb_listview_list_mousemove (DdbListview *ps, GdkEventMotion *ev, int ex, int ey) {
- deadbeef->pl_lock ();
- if (ps->dragwait) {
- GtkWidget *widget = ps->list;
- if (gtk_drag_check_threshold (widget, ps->lastpos0, ps->lastpos1, ex, ey)) {
- ps->dragwait = 0;
- ps->drag_source_playlist = deadbeef->plt_get_curr_idx ();
- GtkTargetEntry entry = {
- .target = "DDB_URI_LIST",
- .flags = GTK_TARGET_SAME_WIDGET,
- .info = TARGET_SAMEWIDGET
- };
- GtkTargetList *lst = gtk_target_list_new (&entry, 1);
- gtk_drag_begin (widget, lst, GDK_ACTION_COPY | GDK_ACTION_MOVE, 1, (GdkEvent *)ev);
- }
- }
- else if (ps->areaselect) {
- DdbListviewGroup *grp;
- int grp_index;
- int sel;
- if (ddb_listview_list_pickpoint_y (ps, ey + ps->scrollpos, &grp, &grp_index, &sel) == -1) {
- // past playlist bounds -> set to last track
- sel = ps->binding->count () - 1;
- }
- else if (sel == -1) {
- if (grp_index == -1) {
- if (ps->areaselect_y < ey + ps->scrollpos) {
- // below anchor, take last track in prev group
- sel = ps->binding->get_idx (grp->head) - 1;
- }
- else if (ps->areaselect_y > ey + ps->scrollpos) {
- // above, select 1st track in group
- sel = ps->binding->get_idx (grp->head);
- }
- else {
- sel = ps->shift_sel_anchor;
- }
- }
- else {
- if (ps->areaselect_y < ey + ps->scrollpos) {
- // below anchor, take last track in group
- sel = ps->binding->get_idx (grp->head) + grp->num_items - 1;
- }
- else if (ps->areaselect_y > ey + ps->scrollpos) {
- // above, select 1st track in next group
- if (grp->next) {
- sel = ps->binding->get_idx (grp->next->head);
- }
- }
- else {
- sel = ps->shift_sel_anchor;
- }
- }
- }
- int prev = ps->binding->cursor ();
- if (sel != -1) {
- ps->binding->set_cursor (sel);
- }
- {
- // select range of items
- int y = sel;
- int idx = 0;
- if (y == -1) {
- // find group
- ddb_listview_groupcheck (ps);
- DdbListviewGroup *g = ps->groups;
- while (g) {
- if (g == grp) {
- y = idx - 1;
- break;
- }
- idx += g->num_items;
- g = g->next;
- }
- }
- int start = min (y, ps->shift_sel_anchor);
- int end = max (y, ps->shift_sel_anchor);
-
- int nchanged = 0;
-
- // don't touch anything in process_start/end range
- int process_start = min (start, ps->area_selection_start);
- int process_end = max (end, ps->area_selection_end);
-
- idx=process_start;
- DdbListviewIter it = ps->binding->get_for_idx (idx);
- for (; it && idx <= process_end; idx++) {
- int selected = ps->binding->is_selected (it);
- if (idx >= start && idx <= end) {
- if (!selected) {
- ps->binding->select (it, 1);
- nchanged++;
- if (nchanged < NUM_CHANGED_ROWS_BEFORE_FULL_REDRAW) {
- ddb_listview_draw_row (ps, idx, it);
- ps->binding->selection_changed (ps, it, idx);
- }
- }
- }
- else if (selected) {
- ps->binding->select (it, 0);
- nchanged++;
- if (nchanged < NUM_CHANGED_ROWS_BEFORE_FULL_REDRAW) {
- ddb_listview_draw_row (ps, idx, it);
- ps->binding->selection_changed (ps, it, idx);
- }
- }
- DdbListviewIter next = PL_NEXT(it);
- UNREF (it);
- it = next;
- }
- UNREF (it);
- if (nchanged >= NUM_CHANGED_ROWS_BEFORE_FULL_REDRAW) {
- ddb_listview_refresh (ps, DDB_REFRESH_LIST);
- ps->binding->selection_changed (ps, it, -1); // that means "selection changed a lot, redraw everything"
- }
- ps->area_selection_start = start;
- ps->area_selection_end = end;
- }
- if (sel != -1 && sel != prev) {
- if (prev != -1) {
- DdbListviewIter it = ps->binding->get_for_idx (prev);
- if (it) {
- ddb_listview_draw_row (ps, prev, it);
- UNREF (it);
- }
- }
- DdbListviewIter it = ps->binding->get_for_idx (sel);
- if (it) {
- ddb_listview_draw_row (ps, sel, it);
- UNREF (it);
- }
- }
-
- GtkAllocation a;
- gtk_widget_get_allocation (ps->list, &a);
-
- if (ey < 10) {
- ps->scroll_mode = 0;
- ps->scroll_pointer_y = ey;
- // start scrolling up
- if (!ps->scroll_active) {
- ps->scroll_direction = -1;
- ps->scroll_sleep_time = AUTOSCROLL_UPDATE_FREQ;
- gettimeofday (&ps->tm_prevscroll, NULL);
- g_idle_add (ddb_listview_list_scroll_cb, ps);
- }
- }
- else if (ey > a.height-10) {
- ps->scroll_mode = 0;
- ps->scroll_pointer_y = ey;
- // start scrolling down
- if (!ps->scroll_active) {
- ps->scroll_direction = 1;
- ps->scroll_sleep_time = AUTOSCROLL_UPDATE_FREQ;
- gettimeofday (&ps->tm_prevscroll, NULL);
- g_idle_add (ddb_listview_list_scroll_cb, ps);
- }
- }
- else {
- ps->scroll_direction = 0;
- ps->scroll_pointer_y = -1;
- }
- // debug only
- // ddb_listview_list_dbg_draw_areasel (widget, event->x, event->y);
- }
- deadbeef->pl_unlock ();
-}
-
-void
-ddb_listview_list_set_hscroll (DdbListview *ps, int newscroll) {
- if (ps->block_redraw_on_scroll) {
- ps->hscrollpos = newscroll; 
- return;
- }
-// if (newscroll != ps->hscrollpos)
- // need to redraw because this might be window resize
- {
- ps->hscrollpos = newscroll;
- GtkWidget *widget = ps->list;
- gtk_widget_queue_draw (ps->header);
- gtk_widget_queue_draw (ps->list);
- }
-}
-
-gboolean
-ddb_listview_handle_keypress (DdbListview *ps, int keyval, int state) {
- int prev = ps->binding->cursor ();
- int cursor = prev;
- GtkWidget *range = ps->scrollbar;
- GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (range));
-
- state &= (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK);
-
- if (state & ~GDK_SHIFT_MASK) {
- return FALSE;
- }
-
- if (keyval == GDK_Down) {
- if (cursor < ps->binding->count () - 1) {
- cursor++;
- }
- else {
- gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_upper (adj));
- }
- }
- else if (keyval == GDK_Up) {
- if (cursor > 0) {
- cursor--;
- }
- else {
- gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_lower (adj));
- if (cursor < 0 && ps->binding->count () > 0) {
- cursor = 0;
- }
- }
- }
- else if (keyval == GDK_Page_Down) {
- if (cursor < ps->binding->count () - 1) {
- cursor += 10;
- if (cursor >= ps->binding->count ()) {
- cursor = ps->binding->count () - 1;
- }
- }
- else {
- 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), gtk_adjustment_get_upper (adj));
- cursor = 0;
- }
- }
- else {
- if (cursor < 0 && ps->binding->count () > 0) {
- cursor = 0;
- }
- 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), gtk_adjustment_get_upper (adj));
- }
- else if (keyval == GDK_Home) {
- cursor = 0;
- gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_lower (adj));
- }
- else {
- return FALSE;
- }
-
- 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 + a.height) {
- newscroll = cursor_scroll - a.height + 1;
- if (newscroll < 0) {
- newscroll = 0;
- }
- }
- if (ps->scrollpos != newscroll) {
- GtkWidget *range = ps->scrollbar;
- gtk_range_set_value (GTK_RANGE (range), newscroll);
- }
-
- ps->binding->set_cursor (cursor);
- // select all between shift_sel_anchor and deadbeef->pl_get_cursor (ps->iterator)
- int start = min (cursor, ps->shift_sel_anchor);
- int end = max (cursor, ps->shift_sel_anchor);
-
- int nchanged = 0;
- int idx=0;
-
- DdbListviewIter it;
- for (it = ps->binding->head (); it; idx++) {
- if (idx >= start && idx <= end) {
- ps->binding->select (it, 1);
- if (nchanged < NUM_CHANGED_ROWS_BEFORE_FULL_REDRAW) {
- ddb_listview_draw_row (ps, idx, it);
- ps->binding->selection_changed (ps, it, idx);
- }
- }
- else if (ps->binding->is_selected (it))
- {
- ps->binding->select (it, 0);
- if (nchanged < NUM_CHANGED_ROWS_BEFORE_FULL_REDRAW) {
- ddb_listview_draw_row (ps, idx, it);
- ps->binding->selection_changed (ps, it, idx);
- }
- }
- DdbListviewIter next = PL_NEXT(it);
- UNREF (it);
- it = next;
- }
- UNREF (it);
- if (nchanged >= NUM_CHANGED_ROWS_BEFORE_FULL_REDRAW) {
- ddb_listview_refresh (ps, DDB_REFRESH_LIST);
- ps->binding->selection_changed (ps, it, -1); // that means "selection changed a lot, redraw everything"
- }
- }
- }
- else {
- ps->shift_sel_anchor = cursor;
- ddb_listview_set_cursor (ps, cursor);
- }
- return TRUE;
-}
-
-gboolean
-ddb_listview_list_popup_menu (GtkWidget *widget, gpointer user_data) {
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- DdbListviewIter it = ps->binding->head ();
- while (it && !ps->binding->is_selected (it)) {
- DdbListviewIter next = ps->binding->next (it);
- ps->binding->unref (it);
- it = next;
- }
- if (it) {
- int sel = ps->binding->get_idx (it);
- ps->binding->list_context_menu (ps, it, sel);
- ps->binding->unref (it);
- }
- return TRUE;
-}
-
-int
-ddb_listview_dragdrop_get_row_from_coord (DdbListview *listview, int y) {
- if (y == -1) {
- return -1;
- }
- DdbListviewGroup *grp;
- int grp_index;
- int sel;
- if (ddb_listview_list_pickpoint_y (listview, y + listview->scrollpos, &grp, &grp_index, &sel) == -1) {
- return -1;
- }
- else {
- if (sel == -1) {
- if (grp_index == -1) {
- sel = listview->binding->get_idx (grp->head);
- }
- else {
- sel = listview->binding->get_idx (grp->head) + grp->num_items;
- }
- }
- }
- if (sel != -1) {
- int it_y = ddb_listview_get_row_pos (listview, sel) - listview->scrollpos;
- if (y > it_y + listview->rowheight/2 && y < it_y + listview->rowheight) {
- sel++;
- }
- }
- return sel;
-}
-
-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, a.width, 7);
-
- }
- if (y == -1) {
- ps->drag_motion_y = -1;
- ps->scroll_active = 0;
- ps->scroll_direction = 0;
- return;
- }
- int sel = ddb_listview_dragdrop_get_row_from_coord (ps, y);
- if (sel == -1) {
- if (ps->binding->count () == 0) {
- ps->drag_motion_y = 0;
- }
- else {
- // after last row
- ps->drag_motion_y = ddb_listview_get_row_pos (ps, ps->binding->count ()-1) + ps->rowheight;
- }
- }
- else {
- ps->drag_motion_y = ddb_listview_get_row_pos (ps, sel);
- }
-
-#if !GTK_CHECK_VERSION(3,0,0)
- // FIXME
-// ddb_listview_draw_dnd_marker (ps, cr);
-#endif
- 
- if (y < 10) {
- ps->scroll_pointer_y = y;
- ps->scroll_mode = 1;
- // start scrolling up
- if (!ps->scroll_active) {
- ps->scroll_direction = -1;
- ps->scroll_sleep_time = AUTOSCROLL_UPDATE_FREQ;
- gettimeofday (&ps->tm_prevscroll, NULL);
- g_idle_add (ddb_listview_list_scroll_cb, ps);
- }
- }
- else if (y > a.height-10) {
- ps->scroll_mode = 1;
- ps->scroll_pointer_y = y;
- // start scrolling up
- if (!ps->scroll_active) {
- ps->scroll_direction = 1;
- ps->scroll_sleep_time = AUTOSCROLL_UPDATE_FREQ;
- gettimeofday (&ps->tm_prevscroll, NULL);
- g_idle_add (ddb_listview_list_scroll_cb, ps);
- }
- }
- else {
- ps->scroll_direction = 0;
- ps->scroll_pointer_y = -1;
- }
-}
-
-void
-ddb_listview_list_drag_end (GtkWidget *widget,
- GdkDragContext *drag_context,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
- ps->scroll_direction = 0;
- ps->scroll_pointer_y = -1;
-}
-
-// #define HEADERS_GTKTHEME
-
-void
-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;
- 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
- GdkColor clr;
- 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
-#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)->midGTK_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 (&ps->hdrctx, cr);
- x = -ps->hscrollpos;
- DdbListviewColumn *c;
- int need_draw_moving = 0;
- int idx = 0;
- for (c = ps->columns; c; c = c->next, idx++) {
- w = c->width;
- int xx = x;
-#if 0
- if (colhdr_anim.anim_active) {
- if (idx == colhdr_anim.c2) {
- xx = colhdr_anim.ax1;
- }
- else if (idx == colhdr_anim.c1) {
- xx = colhdr_anim.ax2;
- }
- }
-#endif
- if (ps->header_dragging < 0 || idx != ps->header_dragging) {
- if (xx >= a.width) {
- continue;
- }
- int arrow_sz = 10;
- int sort = c->sort_order;
- if (w > 0) {
-#if !HEADERS_GTKTHEME
- 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 - 3);
-#else
- gtk_paint_vline (widget->style, ps->header->window, GTK_STATE_NORMAL, NULL, widget, NULL, 2, h-4, xx+w - 3);
-#endif
-#endif
- GdkColor *gdkfg = &gtk_widget_get_style (theme_button)->fg0;
- float fg3 = {(float)gdkfg->red/0xffff, (float)gdkfg->green/0xffff, (float)gdkfg->blue/0xffff};
- draw_set_fg_color (&ps->hdrctx, fg);
- int ww = w-10;
- if (sort) {
- ww -= arrow_sz;
- if (ww < 0) {
- ww = 0;
- }
- }
- draw_text (&ps->hdrctx, xx + 5, 3, ww, 0, c->title);
- }
- if (sort) {
- int dir = sort == 1 ? GTK_ARROW_DOWN : GTK_ARROW_UP;
-#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 {
- need_draw_moving = 1;
- }
- x += w;
- }
- if (need_draw_moving) {
- x = -ps->hscrollpos;
- idx = 0;
- for (c = ps->columns; c; c = c->next, idx++) {
- w = c->width;
- if (idx == ps->header_dragging) {
-#if 0
- if (colhdr_anim.anim_active) {
- if (idx == colhdr_anim.c2) {
- x = colhdr_anim.ax1;
- }
- else if (idx == colhdr_anim.c1) {
- x = colhdr_anim.ax2;
- }
- }
-#endif
- // draw empty slot
- 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 >= 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);
-#endif
- GdkColor *gdkfg = &gtk_widget_get_style (theme_button)->fgGTK_STATE_SELECTED;
- float fg3 = {(float)gdkfg->red/0xffff, (float)gdkfg->green/0xffff, (float)gdkfg->blue/0xffff};
- draw_set_fg_color (&ps->hdrctx, fg);
- draw_text (&ps->hdrctx, x + 5, 3, c->width-10, 0, c->title);
- }
- break;
- }
- x += w;
- }
- }
- draw_end (&ps->hdrctx);
-}
-
-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"));
- 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
-ddb_listview_header_configure_event (GtkWidget *widget,
- GdkEventConfigure *event,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- draw_init_font (&ps->hdrctx, gtk_widget_get_style (widget));
- int height = draw_get_listview_rowheight (&ps->hdrctx);
- GtkAllocation a;
- gtk_widget_get_allocation (widget, &a);
- if (height != a.height) {
- gtk_widget_set_size_request (widget, -1, height);
- }
- GtkAllocation lva;
- gtk_widget_get_allocation (GTK_WIDGET (ps), &lva);
- int totalwidth = lva.width;
-
- // col_autoresize flag indicates whether fwidth is valid
- if (!ps->lock_columns) {
- DdbListviewColumn *c;
- if (deadbeef->conf_get_int ("gtkui.autoresize_columns", 0)) {
- if (ps->header_width != totalwidth) {
- if (!ps->col_autoresize) {
- for (c = ps->columns; c; c = c->next) {
- c->fwidth = (float)c->width / (float)totalwidth;
- }
- ps->col_autoresize = 1;
- }
- // use the fwidth
- int changed = 0;
- int i = 0;
- for (c = ps->columns; c; c = c->next, i++) {
- int newwidth = totalwidth * c->fwidth;
- if (newwidth != c->width) {
- c->width = newwidth;
- changed = 1;
- ps->binding->column_size_changed (ps, i);
- } 
- }
- if (changed) {
- ps->binding->columns_changed (ps);
- }
- }
- }
- else {
- for (c = ps->columns; c; c = c->next) {
- c->fwidth = (float)c->width / (float)totalwidth;
- }
- ps->col_autoresize = 1;
- }
- ps->header_width = totalwidth;
- }
-
- return FALSE;
-}
-
-void
-ddb_listview_lock_columns (DdbListview *lv, gboolean lock) {
- lv->lock_columns = lock;
-
- // NOTE: at this point, it's still not guaranteed that the allocation contains
- // the final size, so we don't calc initial autoresize state here
-}
-
-
-void
-ddb_listview_header_realize (GtkWidget *widget,
- gpointer user_data)
-{
- // create cursor for sizing headers
- DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- listview->cursor_sz = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
- listview->cursor_drag = gdk_cursor_new (GDK_FLEUR);
-}
-
-gboolean
-ddb_listview_header_motion_notify_event (GtkWidget *widget,
- GdkEventMotion *event,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- int ev_x, ev_y;
- GdkModifierType ev_state;
-
- ev_x = event->x;
- ev_y = event->y;
- ev_state = event->state;
-#if GTK_CHECK_VERSION(2,12,0)
- gdk_event_request_motions (event);
-#endif
-
- if ((ev_state & GDK_BUTTON1_MASK) && ps->header_prepare) {
- if (gtk_drag_check_threshold (widget, ev_x, ps->prev_header_x, 0, 0)) {
- ps->header_prepare = 0;
- }
- }
- if (!ps->header_prepare && ps->header_dragging >= 0) {
- 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++);
- ps->col_movepos = ev_x - ps->header_dragpt0 + ps->hscrollpos;
- // find closest column to the left
- int inspos = -1;
- DdbListviewColumn *cc;
- int x = 0;
- int idx = 0;
- int x1 = -1, x2 = -1;
- for (cc = ps->columns; cc; cc = cc->next, idx++) {
- if (x < ps->col_movepos && x + c->width > ps->col_movepos) {
- inspos = idx;
- x1 = x;
- }
- else if (idx == ps->header_dragging) {
- x2 = x;
- }
- x += cc->width;
- }
- if (inspos >= 0 && inspos != ps->header_dragging) {
- ddb_listview_column_move (ps, c, inspos);
-// ps->binding->col_move (c, inspos);
- ps->header_dragging = inspos;
-// colhdr_anim_swap (ps, c1, c2, x1, x2);
- // force redraw of everything
-// ddb_listview_list_setup_hscroll (ps);
- gtk_widget_queue_draw (ps->list);
- }
- else {
- // only redraw that if not animating
- gtk_widget_queue_draw (ps->header);
- }
- }
- else if (ps->header_sizing >= 0) {
- ps->last_header_motion_ev = event->time;
- ps->prev_header_x = ev_x;
- gdk_window_set_cursor (gtk_widget_get_window (widget), ps->cursor_sz);
- // get column start pos
- int x = -ps->hscrollpos;
- int i = 0;
- int size = 0;
- DdbListviewColumn *c;
- for (c = ps->columns; c; c = c->next) {
- size += c->width;
- }
- for (c = ps->columns; c && i < ps->header_sizing; c = c->next, i++) {
- x += c->width;
- }
-
- int newx = ev_x > x + MIN_COLUMN_WIDTH ? ev_x : x + MIN_COLUMN_WIDTH;
- c->width = newx-x;
- if (ps->col_autoresize) {
- c->fwidth = (float)c->width / ps->header_width;
- }
- if (c->minheight) {
- ddb_listview_resize_groups (ps);
- }
- ps->block_redraw_on_scroll = 1;
- ddb_listview_list_setup_vscroll (ps);
- ddb_listview_list_setup_hscroll (ps);
- ps->block_redraw_on_scroll = 0;
- gtk_widget_queue_draw (ps->header);
- gtk_widget_queue_draw (ps->list);
- ps->binding->column_size_changed (ps, ps->header_sizing);
- ddb_listview_list_update_total_width (ps, size);
- }
- else {
- int x = -ps->hscrollpos;
- DdbListviewColumn *c;
- for (c = ps->columns; c; c = c->next) {
- int w = c->width;
- if (w > 0) { // ignore collapsed columns (hack for search window)
- if (ev_x >= x + w - 4 && ev_x <= x + w) {
- gdk_window_set_cursor (gtk_widget_get_window (widget), ps->cursor_sz);
- break;
- }
- else {
- gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
- }
- }
- else {
- gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
- }
- x += w;
- }
- }
- return FALSE;
-}
-
-static int
-ddb_listview_header_get_column_idx_for_coord (DdbListview *pl, int click_x) {
- int x = -pl->hscrollpos;
- DdbListviewColumn *c;
- int idx = 0;
- for (c = pl->columns; c; c = c->next, idx++) {
- int w = c->width;
- if (click_x >= x && click_x < x + w) {
- return idx;
- }
- x += w;
- }
- return -1;
-}
-
-gboolean
-ddb_listview_header_button_press_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
-// ps->active_column = ddb_listview_header_get_column_for_coord (ps, event->x);
- if (TEST_LEFT_CLICK (event)) {
-
- ddb_listview_groupcheck (ps);
- DdbListviewGroup *grp = ps->groups;
- DdbListviewGroup *grp_next;
-
- if (grp && ps->scrollpos > 0) {
- int abs_idx = 0;
- int grp_y = 0;
-
- GtkAllocation a;
- gtk_widget_get_allocation (ps->list, &a);
- int cursor_pos = ddb_listview_get_row_pos (ps, ps->binding->cursor ());
- ps->ref_point = 0;
- ps->ref_point_offset = 0;
-
- // find 1st group
- while (grp && grp_y + grp->height < ps->scrollpos) {
- grp_y += grp->height;
- abs_idx += grp->num_items;
- grp = grp->next;
- }
- // choose cursor_pos as anchor
- if (ps->scrollpos < cursor_pos && cursor_pos < ps->scrollpos + a.height && cursor_pos < ps->fullheight) {
- ps->ref_point = ps->binding->cursor ();
- ps->ref_point_offset = cursor_pos - ps->scrollpos;
- }
- // choose first group as anchor
- else if (ps->scrollpos < grp_y + ps-> grouptitle_height + (grp->num_items * ps->rowheight) && grp_y + ps-> grouptitle_height + (grp->num_items * ps->rowheight) < ps->scrollpos + a.height) {
- ps->ref_point = abs_idx;
- ps->ref_point_offset = (grp_y + ps->grouptitle_height) - ps->scrollpos;
- }
- // choose next group as anchor
- else {
- grp_y += grp->height;
- abs_idx += grp->num_items;
- ps->ref_point = abs_idx;
- ps->ref_point_offset = (grp_y + ps->grouptitle_height) - ps->scrollpos;
- }
- }
- // start sizing/dragging
- ps->header_dragging = -1;
- ps->header_sizing = -1;
- ps->header_dragpt0 = event->x;
- ps->header_dragpt1 = event->y;
- int x = -ps->hscrollpos;
- int i = 0;
- DdbListviewColumn *c;
- for (c = ps->columns; c; c = c->next, i++) {
- int w = c->width;
- if (event->x >= x + w - 4 && event->x <= x + w) {
- ps->header_sizing = i;
- ps->header_dragging = -1;
- break;
- }
- else if (event->x > x && event->x < x + w - 4) {
- // prepare to drag or sort
- ps->header_dragpt0 = event->x - x;
- ps->header_prepare = 1;
- ps->header_dragging = i;
- ps->header_sizing = -1;
- ps->prev_header_x = event->x;
- break;
- }
- x += w;
- }
- }
- else if (TEST_RIGHT_CLICK (event)) {
- int idx = ddb_listview_header_get_column_idx_for_coord (ps, event->x);
- ps->binding->header_context_menu (ps, idx);
- }
- ps->prev_header_x = -1;
- ps->last_header_motion_ev = -1;
- return TRUE;
-}
-
-gboolean
-ddb_listview_header_button_release_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- if (event->button == 1) {
- if (ps->header_prepare) {
- ps->header_sizing = -1;
- ps->header_dragging = -1;
- ps->header_prepare = 0;
- // sort
- DdbListviewColumn *c;
- int i = 0;
- int x = -ps->hscrollpos;
- int sorted = 0;
- for (c = ps->columns; c; c = c->next, i++) {
- int w = c->width;
- if (event->x > x + 2 && event->x < x + w - 2) {
- int sort_order = c->sort_order;
- if (!sort_order) {
- c->sort_order = 1;
- }
- else if (sort_order == 1) {
- c->sort_order = 2;
- }
- else if (sort_order == 2) {
- c->sort_order = 1;
- }
- ps->binding->col_sort (i, c->sort_order-1, c->user_data);
- sorted = 1;
- }
- else {
- c->sort_order = 0;
- }
- x += w;
- }
- ddb_listview_refresh (ps, DDB_REFRESH_LIST | DDB_REFRESH_COLUMNS);
- }
- else {
- ps->header_sizing = -1;
- int x = 0;
- DdbListviewColumn *c;
- for (c = ps->columns; c; c = c->next) {
- int w = c->width;
- if (event->x >= x + w - 4 && event->x <= x + w) {
- gdk_window_set_cursor (gtk_widget_get_window (widget), ps->cursor_sz);
- break;
- }
- else {
- gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
- }
- x += w;
- }
- if (ps->header_dragging >= 0) {
- ps->header_dragging = -1;
- ddb_listview_refresh (ps, DDB_REFRESH_LIST | DDB_REFRESH_COLUMNS | DDB_REFRESH_HSCROLL);
- }
- }
- ps->binding->columns_changed (ps);
- }
- return FALSE;
-}
-
-struct set_cursor_t {
- int cursor;
- int prev;
- DdbListview *pl;
- int noscroll;
-};
-
-static gboolean
-ddb_listview_set_cursor_cb (gpointer data) {
- struct set_cursor_t *sc = (struct set_cursor_t *)data;
-
- DdbListviewIter prev_it = sc->pl->binding->get_for_idx (sc->prev);
- sc->pl->binding->set_cursor (sc->cursor);
- int prev_selected = 0;
-
- if (prev_it) {
- prev_selected = sc->pl->binding->is_selected (prev_it);
- }
-
- ddb_listview_select_single (sc->pl, sc->cursor);
-
- if (prev_it && !prev_selected) {
- ddb_listview_draw_row (sc->pl, sc->prev, prev_it);
- }
-
- if (prev_it) {
- sc->pl->binding->unref (prev_it);
- }
-
- if (!sc->noscroll) {
- DdbListviewIter it;
- DdbListview *ps = sc->pl;
-
- 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 (!gtkui_groups_pinned && cursor_scroll < sc->pl->scrollpos) {
- newscroll = cursor_scroll;
- }
- else if (gtkui_groups_pinned && cursor_scroll < sc->pl->scrollpos + ps->grouptitle_height) {
- newscroll = cursor_scroll - ps->grouptitle_height;
- }
- 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;
- }
- }
- if (sc->pl->scrollpos != newscroll) {
- GtkWidget *range = sc->pl->scrollbar;
- gtk_range_set_value (GTK_RANGE (range), newscroll);
- }
-
- free (data);
- }
- return FALSE;
-}
-
-void
-ddb_listview_set_cursor (DdbListview *pl, int cursor) {
- int prev = pl->binding->cursor ();
- struct set_cursor_t *data = malloc (sizeof (struct set_cursor_t));
- data->prev = prev;
- data->cursor = cursor;
- data->pl = pl;
- data->noscroll = 0;
- g_idle_add (ddb_listview_set_cursor_cb, data);
-}
-
-void
-ddb_listview_set_cursor_noscroll (DdbListview *pl, int cursor) {
- int prev = pl->binding->cursor ();
- struct set_cursor_t *data = malloc (sizeof (struct set_cursor_t));
- data->prev = prev;
- data->cursor = cursor;
- data->pl = pl;
- data->noscroll = 1;
- g_idle_add (ddb_listview_set_cursor_cb, data);
-}
-
-gboolean
-ddb_listview_list_button_press_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data)
-{
- gtk_widget_grab_focus (widget);
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- if (TEST_LEFT_CLICK (event)) {
- ddb_listview_list_mouse1_pressed (ps, event->state, event->x, event->y, event->type);
- }
- else if (TEST_RIGHT_CLICK(event)) {
- // get item under cursor
- DdbListviewGroup *grp;
- int grp_index;
- int sel;
- DdbListviewIter it = NULL;
- int prev = ps->binding->cursor ();
- if (ddb_listview_list_pickpoint_y (ps, event->y + ps->scrollpos, &grp, &grp_index, &sel) != -1) {
- if (sel != -1) {
- ps->binding->set_cursor (sel);
- }
- 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);
- }
- if (sel != -1) {
- it = ps->binding->get_for_idx (sel);
- }
- }
- if (it) {
- ps->binding->list_context_menu (ps, it, sel);
- }
- int cursor = ps->binding->cursor ();
- if (cursor != -1 && sel != -1) {
- DdbListviewIter it = ps->binding->get_for_idx (cursor);
- ddb_listview_draw_row (ps, cursor, it);
- UNREF (it);
- }
- if (prev != -1 && prev != cursor) {
- DdbListviewIter it = ps->binding->get_for_idx (prev);
- ddb_listview_draw_row (ps, prev, it);
- UNREF (it);
- }
- if (it) {
- UNREF (it);
- }
- }
- return TRUE;
-}
-
-gboolean
-ddb_listview_list_button_release_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data)
-{
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- if (event->button == 1) {
- ddb_listview_list_mouse1_released (ps, event->state, event->x, event->y, event->time);
- }
- return FALSE;
-}
-
-gboolean
-ddb_listview_motion_notify_event (GtkWidget *widget,
- GdkEventMotion *event,
- gpointer user_data)
-{
- int x = event->x;
- int y = event->y;
-#if GTK_CHECK_VERSION(2,12,0)
- gdk_event_request_motions (event);
-#endif
- DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- ddb_listview_list_mousemove (ps, event, x, y);
- return FALSE;
-}
-
-void
-ddb_listview_set_binding (DdbListview *listview, DdbListviewBinding *binding) {
- listview->binding = binding;
-}
-
-DdbListviewIter
-ddb_listview_get_iter_from_coord (DdbListview *listview, int x, int y) {
- DdbListviewGroup *grp;
- int grp_index;
- int sel;
- DdbListviewIter it = NULL;
- if (ddb_listview_list_pickpoint_y (listview, y + listview->scrollpos, &grp, &grp_index, &sel) != -1) {
- if (sel == -1) {
- sel = listview->binding->get_idx (grp->head);
- }
- it = listview->binding->get_for_idx (sel);
- }
- return it;
-}
-
-void
-ddb_listview_scroll_to (DdbListview *listview, int pos) {
- pos = ddb_listview_get_row_pos (listview, pos);
- 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
-ddb_listview_is_scrolling (DdbListview *listview) {
- return listview->dragwait;
-}
-
-/////// column management code
-
-DdbListviewColumn * 
-ddb_listview_column_alloc (const char *title, int width, int align_right, int minheight, void *user_data) {
- DdbListviewColumn * c = malloc (sizeof (DdbListviewColumn));
- memset (c, 0, sizeof (DdbListviewColumn));
- c->title = strdup (title);
- c->width = width;
- c->align_right = align_right;
- c->minheight = minheight;
- c->user_data = user_data;
- return c;
-}
-
-int
-ddb_listview_column_get_count (DdbListview *listview) {
- int cnt = 0;
- DdbListviewColumn *c = listview->columns;
- while (c) {
- cnt++;
- c = c->next;
- }
- return cnt;
-}
-
-void
-ddb_listview_column_append (DdbListview *listview, const char *title, int width, int align_right, int minheight, void *user_data) {
- DdbListviewColumn* c = ddb_listview_column_alloc (title, width, align_right, minheight, user_data);
- if (listview->col_autoresize) {
- c->fwidth = (float)c->width / listview->header_width;
- }
- int idx = 0;
- DdbListviewColumn * columns = listview->columns;
- if (columns) {
- idx++;
- DdbListviewColumn * tail = listview->columns;
- while (tail->next) {
- tail = tail->next;
- idx++;
- }
- tail->next = c;
- }
- else {
- listview->columns = c;
- }
- listview->binding->columns_changed (listview);
-}
-
-void
-ddb_listview_column_insert (DdbListview *listview, int before, const char *title, int width, int align_right, int minheight, void *user_data) {
- DdbListviewColumn *c = ddb_listview_column_alloc (title, width, align_right, minheight ,user_data);
- if (listview->col_autoresize) {
- c->fwidth = (float)c->width / listview->header_width;
- }
- if (listview->columns) {
- DdbListviewColumn * prev = NULL;
- DdbListviewColumn * next = listview->columns;
- int idx = 0;
- while (next) {
- if (idx == before) {
- break;
- }
- prev = next;
- next = next->next;
- idx++;
- }
- c->next = next;
- if (prev) {
- prev->next = c;
- }
- else {
- listview->columns = c;
- }
- }
- else {
- listview->columns = c;
- }
- listview->binding->columns_changed (listview);
-}
-
-void
-ddb_listview_column_free (DdbListview *listview, DdbListviewColumn * c) {
- if (c->title) {
- free (c->title);
- }
- listview->binding->col_free_user_data (c->user_data);
- free (c);
-}
-
-void
-ddb_listview_column_remove (DdbListview *listview, int idx) {
- DdbListviewColumn *c;
- if (idx == 0) {
- c = listview->columns;
- assert (c);
- listview->columns = c->next;
- ddb_listview_column_free (listview, c);
- listview->binding->columns_changed (listview);
- return;
- }
- c = listview->columns;
- int i = 0;
- while (c) {
- if (i+1 == idx) {
- assert (c->next);
- DdbListviewColumn *next = c->next->next;
- ddb_listview_column_free (listview, c->next);
- c->next = next;
- listview->binding->columns_changed (listview);
- return;
- }
- c = c->next;
- i++;
- }
-
- if (!c) {
- trace ("ddblv: attempted to remove column that is not in list\n");
- }
-}
-
-void
-ddb_listview_column_move (DdbListview *listview, DdbListviewColumn *which, int inspos) {
- // remove c from list
- DdbListviewColumn *c = (DdbListviewColumn *)which;
- if (c == listview->columns) {
- listview->columns = c->next;
- }
- else {
- DdbListviewColumn *cc;
- for (cc = listview->columns; cc; cc = cc->next) {
- if (cc->next == c) {
- cc->next = c->next;
- break;
- }
- }
- }
- c->next = NULL;
- // reinsert c at position inspos update header_dragging to new idx
- if (inspos == 0) {
- c->next = listview->columns;
- listview->columns = c;
- }
- else {
- int idx = 0;
- DdbListviewColumn *prev = NULL;
- DdbListviewColumn *cc = NULL;
- for (cc = listview->columns; cc; cc = cc->next, idx++, prev = cc) {
- if (idx+1 == inspos) {
- DdbListviewColumn *next = cc->next;
- cc->next = c;
- c->next = next;
- break;
- }
- }
- }
- listview->binding->columns_changed (listview);
-}
-
-int
-ddb_listview_column_get_info (DdbListview *listview, int col, const char **title, int *width, int *align_right, int *minheight, void **user_data) {
- DdbListviewColumn *c;
- int idx = 0;
- for (c = listview->columns; c; c = c->next, idx++) {
- if (idx == col) {
- *title = c->title;
- *width = c->width;
- *align_right = c->align_right;
- *minheight = c->minheight;
- *user_data = c->user_data;
- return 0;
- }
- }
- return -1;
-}
-
-int
-ddb_listview_column_set_info (DdbListview *listview, int col, const char *title, int width, int align_right, int minheight, void *user_data) {
- DdbListviewColumn *c;
- int idx = 0;
- for (c = listview->columns; c; c = c->next, idx++) {
- if (idx == col) {
- free (c->title);
- c->title = strdup (title);
- c->width = width;
- if (listview->col_autoresize) {
- c->fwidth = (float)c->width / listview->header_width;
- }
- c->align_right = align_right;
- c->minheight = minheight;
- c->user_data = user_data;
- listview->binding->columns_changed (listview);
- return 0;
- }
- }
- return -1;
-}
-/////// end of column management code
-
-/////// grouping /////
-void
-ddb_listview_free_groups (DdbListview *listview) {
- DdbListviewGroup *next;
- while (listview->groups) {
- next = listview->groups->next;
- if (listview->groups->head) {
- listview->binding->unref (listview->groups->head);
- }
- free (listview->groups);
- listview->groups = next;
- }
-}
-
-void
-ddb_listview_build_groups (DdbListview *listview) {
- deadbeef->pl_lock ();
- int old_height = listview->fullheight;
- listview->groups_build_idx = listview->binding->modification_idx ();
- ddb_listview_free_groups (listview);
- listview->fullheight = 0;
-
- DdbListviewGroup *grp = NULL;
- char str1024;
- char curr1024;
-
- int min_height= 0;
- DdbListviewColumn *c;
- for (c = listview->columns; c; c = c->next) {
- if (c->minheight && c->width > min_height) {
- min_height = c->width;
- }
- }
-
- listview->grouptitle_height = listview->calculated_grouptitle_height;
- DdbListviewIter it = listview->binding->head ();
- while (it) {
- int res = listview->binding->get_group (it, curr, sizeof (curr));
- if (res == -1) {
- grp = malloc (sizeof (DdbListviewGroup));
- listview->groups = grp;
- memset (grp, 0, sizeof (DdbListviewGroup));
- grp->head = it;
- grp->num_items = listview->binding->count ();
- listview->grouptitle_height = 0;
- grp->height = listview->grouptitle_height + grp->num_items * listview->rowheight;
-// if (grp->height < min_height) {
-// grp->height = min_height;
-// }
- listview->fullheight = grp->height;
- listview->fullheight += listview->grouptitle_height;
- deadbeef->pl_unlock ();
- if (old_height != listview->fullheight) {
- ddb_listview_refresh (listview, DDB_REFRESH_VSCROLL);
- }
- return;
- }
- if (!grp || strcmp (str, curr)) {
- strcpy (str, curr);
- DdbListviewGroup *newgroup = malloc (sizeof (DdbListviewGroup));
- if (grp) {
- if (grp->height - listview->grouptitle_height < min_height) {
- grp->height = min_height + listview->grouptitle_height;
- }
- listview->fullheight += grp->height;
- grp->next = newgroup;
- }
- else {
- listview->groups = newgroup;
- }
- grp = newgroup;
- memset (grp, 0, sizeof (DdbListviewGroup));
- grp->head = it;
- listview->binding->ref (it);
- grp->num_items = 0;
- grp->height = listview->grouptitle_height;
- }
- grp->height += listview->rowheight;
- grp->num_items++;
- DdbListviewIter next = listview->binding->next (it);
- listview->binding->unref (it);
- it = next;
- }
- if (grp) {
- if (grp->height - listview->grouptitle_height < min_height) {
- grp->height = min_height + listview->grouptitle_height;
- }
- listview->fullheight += grp->height;
- }
- deadbeef->pl_unlock ();
- if (old_height != listview->fullheight) {
- ddb_listview_refresh (listview, DDB_REFRESH_VSCROLL);
- }
-}
-
-void
-ddb_listview_resize_groups (DdbListview *listview) {
- deadbeef->pl_lock ();
- int old_height = listview->fullheight;
- int grp_height_old = 0;
- listview->fullheight = 0;
-
- int min_height= 0;
- DdbListviewColumn *c;
- for (c = listview->columns; c; c = c->next) {
- if (c->minheight && c->width > min_height) {
- min_height = c->width;
- }
- }
-
- DdbListviewGroup *grp = listview->groups;
- while (grp) {
- grp->height = listview->grouptitle_height + grp->num_items * listview->rowheight;
- if (grp->height - listview->grouptitle_height < min_height) {
- grp_height_old = grp->height;
- grp->height = min_height + listview->grouptitle_height;
- }
- listview->fullheight += grp->height;
- grp = grp->next;
- }
-
- deadbeef->pl_unlock ();
- if (old_height != listview->fullheight) {
- ddb_listview_refresh (listview, DDB_REFRESH_VSCROLL);
- }
-}
-
-void
-ddb_listview_set_vscroll (DdbListview *listview, int scroll) {
- GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (listview->scrollbar));
- gtk_range_set_value (GTK_RANGE (listview->scrollbar), scroll);
-}
-
-void
-ddb_listview_show_header (DdbListview *listview, int show) {
- show ? gtk_widget_show (listview->header) : gtk_widget_hide (listview->header);
-}
-
-void
-ddb_listview_clear_sort (DdbListview *listview) {
- DdbListviewColumn *c;
- for (c = listview->columns; c; c = c->next) {
- c->sort_order = 0;
- }
- gtk_widget_queue_draw (listview->header);
-}
-
-gboolean
-ddb_listview_list_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) {
- DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- if (!ddb_listview_handle_keypress (listview, event->keyval, event->state)) {
- return on_mainwin_key_press_event (widget, event, user_data);
- }
- return TRUE;
-}
-

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddblistview.h Deleted

@@ -1,306 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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/>.
-*/
-#ifndef __DDBLISTVIEW_H
-#define __DDBLISTVIEW_H
-
-#include <gtk/gtk.h>
-#include <sys/time.h>
-#include <stdint.h>
-#include "drawing.h"
-
-// drag and drop targets
-enum {
- TARGET_URILIST,
- TARGET_SAMEWIDGET,
-};
-
-G_BEGIN_DECLS
-
-#define DDB_TYPE_LISTVIEW (ddb_listview_get_type ())
-#define DDB_LISTVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), DDB_TYPE_LISTVIEW, DdbListview))
-#define DDB_LISTVIEW_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST((obj), DDB_TYPE_LISTVIEW, DdbListviewClass))
-#define DDB_IS_LISTVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DDB_TYPE_LISTVIEW))
-#define DDB_IS_LISTVIEW_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), DDB_TYPE_LISTVIEW))
-#define DDB_LISTVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DDB_TYPE_LISTVIEW, DdbListviewClass))
-
-typedef struct {
- int id;
- char *format;
-} col_info_t;
-
-typedef struct _DdbListview DdbListview;
-typedef struct _DdbListviewClass DdbListviewClass;
-
-typedef void * DdbListviewIter;
-typedef void * DdbPlaylistHandle;
-
-struct _DdbListviewGroup {
- DdbListviewIter head;
- int32_t height;
- int32_t min_height;
- int32_t num_items;
- int pinned;
- struct _DdbListviewGroup *next;
-};
-
-typedef struct _DdbListviewGroup DdbListviewGroup;
-//typedef void * DdbListviewColIter;
-
-typedef struct {
- // rows
- int (*count) (void);
- int (*sel_count) (void);
-
- int (*cursor) (void);
- void (*set_cursor) (int cursor);
-
- DdbListviewIter (*head) (void);
- DdbListviewIter (*tail) (void);
- DdbListviewIter (*next) (DdbListviewIter);
- DdbListviewIter (*prev) (DdbListviewIter);
-
- DdbListviewIter (*get_for_idx) (int idx);
- int (*get_idx) (DdbListviewIter);
-
- void (*ref) (DdbListviewIter);
- void (*unref) (DdbListviewIter);
-
- void (*select) (DdbListviewIter, int sel);
- int (*is_selected) (DdbListviewIter);
-
- int (*get_group) (DdbListviewIter it, char *str, int size);
-
- // drag-n-drop
- void (*drag_n_drop) (DdbListviewIter before, DdbPlaylistHandle playlist_from, uint32_t *indices, int length, int copy);
- void (*external_drag_n_drop) (DdbListviewIter before, char *mem, int length);
-
- // callbacks
- void (*draw_group_title) (DdbListview *listview, cairo_t *drawable, DdbListviewIter iter, int x, int y, int width, int height);
- void (*draw_column_data) (DdbListview *listview, cairo_t *drawable, DdbListviewIter iter, DdbListviewIter group_iter, int column, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int width, int height);
- void (*list_context_menu) (DdbListview *listview, DdbListviewIter iter, int idx);
- void (*header_context_menu) (DdbListview *listview, int col);
- void (*handle_doubleclick) (DdbListview *listview, DdbListviewIter iter, int idx);
- void (*selection_changed) (DdbListview *listview, DdbListviewIter it, int idx);
- void (*delete_selected) (void);
- void (*columns_changed) (DdbListview *listview);
- void (*column_size_changed) (DdbListview *listview, int col);
- void (*col_sort) (int col, int sort_order, void *user_data);
- void (*col_free_user_data) (void *user_data);
- void (*vscroll_changed) (int pos);
- void (*cursor_changed) (int pos);
- int (*modification_idx) (void);
-} DdbListviewBinding;
-
-struct _DdbListviewColumn;
-struct _DdbListviewGroup;
-
-struct _DdbListview {
- GtkTable parent;
-
- // interaction with client
- DdbListviewBinding *binding;
-
- // cached gtk/gdk object pointers
- GtkWidget *list;
- GtkWidget *header;
- GtkWidget *scrollbar;
- GtkWidget *hscrollbar;
-
- int totalwidth; // width of listview, including invisible (scrollable) part
- const char *title; // unique id, used for config writing, etc
- int lastpos2; // last mouse position (for list widget)
- // current state
- int scrollpos;
- int hscrollpos;
- int rowheight;
-
- int col_movepos;
-
- int drag_motion_y;
-
- int ref_point; // idx of anchor when columns are resized
- int ref_point_offset; // y pixel-coordinate of anchor relative to view
-
- // scrolling
- int scroll_mode; // 0=select, 1=dragndrop
- int scroll_pointer_y;
- float scroll_direction;
- int scroll_active;
- struct timeval tm_prevscroll;
- float scroll_sleep_time;
-
- // selection
- int areaselect; // boolean, whether area selection is active (1), or not (0)
- int areaselect_y; // pixel-coordinate of anchor click relative to playlist origin
- int dragwait;
- int drag_source_playlist;
- int shift_sel_anchor;
-
- // header
- int header_dragging;
- int header_sizing;
- int header_dragpt2;
- float last_header_motion_ev; //is it subject to remove?
- int prev_header_x;
- int header_prepare;
- int header_width; // previous width before resize
- int col_autoresize;
-
- struct _DdbListviewColumn *columns;
- gboolean lock_columns;
-
- struct _DdbListviewGroup *groups;
- int groups_build_idx; // must be the same as playlist modification idx
- int fullheight;
- int block_redraw_on_scroll;
- int grouptitle_height;
- int calculated_grouptitle_height;
-
- // previous area selection range
- int area_selection_start;
- int area_selection_end;
-
- GdkCursor *cursor_sz;
- GdkCursor *cursor_drag;
-
- // drawing contexts
- drawctx_t listctx;
- drawctx_t hdrctx;
-
- // cover art size
- int cover_size;
- int new_cover_size;
- guint cover_refresh_timeout_id;
-};
-
-struct _DdbListviewClass {
- GtkTableClass parent_class;
-};
-
-GType ddb_listview_get_type(void);
-
-GtkWidget * ddb_listview_new();
-
-void
-ddb_listview_set_binding (DdbListview *listview, DdbListviewBinding *binding);
-void
-ddb_listview_draw_row (DdbListview *listview, int idx, DdbListviewIter iter);
-int
-ddb_listview_get_vscroll_pos (DdbListview *listview);
-int
-ddb_listview_get_hscroll_pos (DdbListview *listview);
-DdbListviewIter
-ddb_listview_get_iter_from_coord (DdbListview *listview, int x, int y);
-int
-ddb_listview_handle_keypress (DdbListview *ps, int keyval, int state);
-void
-ddb_listview_set_cursor (DdbListview *pl, int cursor);
-void
-ddb_listview_set_cursor_noscroll (DdbListview *pl, int cursor);
-void
-ddb_listview_scroll_to (DdbListview *listview, int rowpos);
-void
-ddb_listview_set_vscroll (DdbListview *listview, int scroll);
-int
-ddb_listview_is_scrolling (DdbListview *listview);
-int
-ddb_listview_column_get_count (DdbListview *listview);
-void
-ddb_listview_column_append (DdbListview *listview, const char *title, int width, int align_right, int minheight, void *user_data);
-void
-ddb_listview_column_insert (DdbListview *listview, int before, const char *title, int width, int align_right, int minheight, void *user_data);
-void
-ddb_listview_column_remove (DdbListview *listview, int idx);
-int
-ddb_listview_column_get_info (DdbListview *listview, int col, const char **title, int *width, int *align_right, int *minheight, void **user_data);
-int
-ddb_listview_column_set_info (DdbListview *listview, int col, const char *title, int width, int align_right, int minheight, void *user_data);
-
-void
-ddb_listview_show_header (DdbListview *listview, int show);
-
-enum {
- DDB_REFRESH_COLUMNS = 1,
- DDB_REFRESH_HSCROLL = 2,
- DDB_REFRESH_VSCROLL = 4,
- DDB_REFRESH_LIST = 8,
- DDB_LIST_CHANGED = 16,
-};
-
-void ddb_listview_refresh (DdbListview *listview, uint32_t flags);
-
-gboolean
-ddb_listview_list_drag_drop (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x,
- gint y,
- guint time,
- gpointer user_data);
-
-void
-ddb_listview_list_drag_data_get (GtkWidget *widget,
- GdkDragContext *drag_context,
- GtkSelectionData *data,
- guint info,
- guint time,
- gpointer user_data);
-
-void
-ddb_listview_list_drag_end (GtkWidget *widget,
- GdkDragContext *drag_context,
- gpointer user_data);
-
-void
-ddb_listview_list_drag_data_received (GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x,
- gint y,
- GtkSelectionData *data,
- guint target_type,
- guint time,
- gpointer user_data);
-
-void
-ddb_listview_list_drag_leave (GtkWidget *widget,
- GdkDragContext *drag_context,
- guint time,
- gpointer user_data);
-
-void
-ddb_listview_list_drag_end (GtkWidget *widget,
- GdkDragContext *drag_context,
- gpointer user_data);
-
-void
-ddb_listview_clear_sort (DdbListview *listview);
-
-void
-ddb_listview_lock_columns (DdbListview *lv, gboolean lock);
-
-int
-ddb_listview_get_row_pos (DdbListview *listview, int row_idx);
-
-void
-ddb_listview_groupcheck (DdbListview *listview);
-
-int
-ddb_listview_is_album_art_column (DdbListview *listview, int x);
-
-G_END_DECLS
-
-#endif // __DDBLISTVIEW_H

deadbeef-0.6.2.tar.bz2/plugins/gtkui/gtkuigl.c Deleted

@@ -1,58 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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 "../../deadbeef.h"
-#include "gtkui.h"
-#include "support.h"
-#ifdef __APPLE__
-#undef USE_OPENGL
-#endif
-
-#ifdef USE_OPENGL
-#include "gtkuigl.h"
-
-static int gl_initialized;
-static int gl_init_state;
-//PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI;
-
-int
-gtkui_gl_init (void) {
- if (gl_initialized) {
- return gl_init_state;
- }
- gl_initialized = 1;
- int argc = 1;
- const char **argv = alloca (sizeof (char *) * argc);
- argv0 = "deadbeef";
- gboolean success = gdk_gl_init_check (&argc, (char ***)&argv);
- if (!success) {
- fprintf (stderr, "gdk_gl_init_check failed\n");
- gl_init_state = -1;
- return -1;
- }
-// glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC) glXGetProcAddressARB((const GLubyte*)"glXSwapIntervalSGI");
- fprintf (stderr, "gdk_gl_init_check success\n");
- gl_init_state = 0;
- return 0;
-}
-
-void
-gtkui_gl_free (void) {
- // ???
-}
-#endif

deadbeef-0.6.2.tar.bz2/plugins/gtkui/gtkuigl.h Deleted

@@ -1,47 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
-*/
-#ifndef __GTKUIGL_H
-#define __GTKUIGL_H
-
-#ifdef __APPLE__
-#undef USE_OPENGL
-#endif
-
-#ifdef USE_OPENGL
-#include <gtk/gtkgl.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
-//#include <GL/glx.h>
-//#include <GL/glxext.h>
-//
-//#ifndef GLX_SGI_swap_control
-//typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
-//#endif
-//extern PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI;
-
-int
-gtkui_gl_init (void);
-
-#if GTK_CHECK_VERSION(3,0,0)
-#define gdk_gl_context_destroy g_object_unref
-#endif
-
-
-#endif
-#endif

deadbeef-0.6.2.tar.bz2/plugins/gtkui/mainplaylist.c Deleted

@@ -1,395 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
-*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-#include "../../gettext.h"
-#include "../libparser/parser.h"
-#include "gtkui.h"
-#include "ddblistview.h"
-#include "mainplaylist.h"
-#include "search.h"
-#include "interface.h"
-#include "support.h"
-#include "drawing.h"
-#include "trkproperties.h"
-#include "coverart.h"
-#include "plcommon.h"
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-
-#define min(x,y) ((x)<(y)?(x):(y))
-
-GdkPixbuf *play16_pixbuf;
-GdkPixbuf *pause16_pixbuf;
-GdkPixbuf *buffering16_pixbuf;
-
-
-// HACK!!
-extern GtkWidget *theme_treeview;
-
-static int
-main_get_count (void) {
- return deadbeef->pl_getcount (PL_MAIN);
-}
-
-static int
-main_get_sel_count (void) {
- return deadbeef->pl_getselcount ();
-}
-
-static int
-main_get_cursor (void) {
- return deadbeef->pl_get_cursor (PL_MAIN);
-}
-
-static void
-main_set_cursor (int cursor) {
- return deadbeef->pl_set_cursor (PL_MAIN, cursor);
-}
-
-static DdbListviewIter main_head (void) {
- return (DdbListviewIter)deadbeef->pl_get_first (PL_MAIN);
-}
-
-static DdbListviewIter main_tail (void) {
- return (DdbListviewIter)deadbeef->pl_get_last(PL_MAIN);
-}
-
-static DdbListviewIter main_next (DdbListviewIter it) {
- return (DdbListviewIter)deadbeef->pl_get_next(it, PL_MAIN);
-}
-
-static DdbListviewIter main_prev (DdbListviewIter it) {
- return (DdbListviewIter)deadbeef->pl_get_prev(it, PL_MAIN);
-}
-
-static DdbListviewIter main_get_for_idx (int idx) {
- return deadbeef->pl_get_for_idx_and_iter (idx, PL_MAIN);
-}
-
-int main_get_idx (DdbListviewIter it) {
- DB_playItem_t *c = deadbeef->pl_get_first (PL_MAIN);
- int idx = 0;
- while (c && c != it) {
- DB_playItem_t *next = deadbeef->pl_get_next (c, PL_MAIN); 
- deadbeef->pl_item_unref (c);
- c = next;
- idx++;
- }
- if (!c) {
- return -1;
- }
- deadbeef->pl_item_unref (c);
- return idx;
-}
-
-void
-main_drag_n_drop (DdbListviewIter before, DdbPlaylistHandle from_playlist, uint32_t *indices, int length, int copy) {
- deadbeef->pl_lock ();
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (copy) {
- deadbeef->plt_copy_items (plt, PL_MAIN, (ddb_playlist_t *)from_playlist, (DB_playItem_t *)before, indices, length);
- }
- else {
- deadbeef->plt_move_items (plt, PL_MAIN, (ddb_playlist_t *)from_playlist, (DB_playItem_t *)before, indices, length);
- }
- if (!copy && from_playlist != plt) {
- deadbeef->plt_save_config (from_playlist);
- }
- deadbeef->plt_save_config (plt);
- deadbeef->plt_unref (plt);
- deadbeef->pl_unlock ();
-}
-
-void main_external_drag_n_drop (DdbListviewIter before, char *mem, int length) {
- gtkui_receive_fm_drop ((DB_playItem_t *)before, mem, length);
-}
-
-gboolean
-playlist_tooltip_handler (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer unused)
-{
- DdbListview *pl = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
- DB_playItem_t *it = (DB_playItem_t *)ddb_listview_get_iter_from_coord (pl, 0, y);
- if (it) {
- deadbeef->pl_lock ();
- gtk_tooltip_set_text (tooltip, deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
- deadbeef->pl_item_unref (it);
- return TRUE;
- }
- return FALSE;
-}
-
-// columns
-
-void
-main_col_sort (int col, int sort_order, void *user_data) {
- col_info_t *c = (col_info_t*)user_data;
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- deadbeef->plt_sort (plt, PL_MAIN, c->id, c->format, sort_order-1);
- deadbeef->plt_unref (plt);
-}
-void main_handle_doubleclick (DdbListview *listview, DdbListviewIter iter, int idx) {
- deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, idx, 0);
-}
-
-void main_selection_changed (DdbListview *ps, DdbListviewIter it, int idx) {
- DdbListview *search = DDB_LISTVIEW (lookup_widget (searchwin, "searchlist"));
- if (idx == -1) {
- ddb_listview_refresh (search, DDB_REFRESH_LIST);
- }
- else {
- ddb_listview_draw_row (search, search_get_idx ((DB_playItem_t *)it), it);
- }
- deadbeef->sendmessage (DB_EV_SELCHANGED, (uintptr_t)ps, deadbeef->plt_get_curr_idx (), PL_MAIN);
-}
-
-void main_draw_group_title (DdbListview *listview, cairo_t *drawable, DdbListviewIter it, int x, int y, int width, int height) {
- if (group_by_str && group_by_str0) {
- char str1024;
- deadbeef->pl_format_title ((DB_playItem_t *)it, -1, str, sizeof (str), -1, group_by_str);
- char *lb = strchr (str, '\r');
- if (lb) {
- *lb = 0;
- }
- lb = strchr (str, '\n');
- if (lb) {
- *lb = 0;
- }
- int theming = !gtkui_override_listview_colors ();
- if (theming) {
- GdkColor *clr = &gtk_widget_get_style(theme_treeview)->fgGTK_STATE_NORMAL;
- float rgb = {clr->red/65535.f, clr->green/65535.f, clr->blue/65535.f};
- draw_set_fg_color (&listview->listctx, rgb);
- }
- else {
- GdkColor clr;
- gtkui_get_listview_text_color (&clr);
- float rgb = {clr.red/65535.f, clr.green/65535.f, clr.blue/65535.f};
- draw_set_fg_color (&listview->listctx, rgb);
- }
- int ew, eh;
- draw_get_text_extents (&listview->listctx, str, -1, &ew, &eh);
- draw_text (&listview->listctx, x + 5, y + height/2 - draw_get_listview_rowheight (&listview->listctx)/2 + 3, ew+5, 0, str);
- draw_line (&listview->listctx, x + 5 + ew + 3, y+height/2, x + width, y+height/2);
- }
-}
-void
-main_delete_selected (void) {
- deadbeef->pl_delete_selected ();
- deadbeef->pl_save_current();
- main_refresh ();
- search_refresh ();
-}
-
-void
-main_select (DdbListviewIter it, int sel) {
- deadbeef->pl_set_selected ((DB_playItem_t *)it, sel);
-}
-
-int
-main_is_selected (DdbListviewIter it) {
- return deadbeef->pl_is_selected ((DB_playItem_t *)it);
-}
-
-int
-main_get_group (DdbListviewIter it, char *str, int size) {
- if (!group_by_str || !group_by_str0) {
- return -1;
- }
- deadbeef->pl_format_title ((DB_playItem_t *)it, -1, str, size, -1, group_by_str);
- char *lb = strchr (str, '\r');
- if (lb) {
- *lb = 0;
- }
- lb = strchr (str, '\n');
- if (lb) {
- *lb = 0;
- }
- return 0;
-}
-
-static int lock_column_config = 0;
-
-void
-main_columns_changed (DdbListview *listview) {
- if (!lock_column_config) {
- rewrite_column_config (listview, "playlist");
- }
-}
-
-void
-main_column_size_changed (DdbListview *listview, int col) {
- const char *title;
- int width;
- int align_right;
- col_info_t *inf;
- int minheight;
- int res = ddb_listview_column_get_info (listview, col, &title, &width, &align_right, &minheight, (void **)&inf);
- if (res == -1) {
- return;
- }
- if (inf->id == DB_COLUMN_ALBUM_ART) {
- if (listview->scrollpos > 0) {
- int pos = ddb_listview_get_row_pos (listview, listview->ref_point);
- gtk_range_set_value (GTK_RANGE (listview->scrollbar), pos - listview->ref_point_offset);
- }
- coverart_reset_queue ();
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- deadbeef->plt_modified (plt);
- deadbeef->plt_unref (plt);
- }
- }
-}
-
-void main_col_free_user_data (void *data) {
- if (data) {
- col_info_t *inf = data;
- if (inf->format) {
- free (inf->format);
- }
- free (data);
- }
-}
-
-void
-main_vscroll_changed (int pos) {
- coverart_reset_queue ();
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- deadbeef->plt_set_scroll (plt, pos);
- deadbeef->plt_unref (plt);
- }
-}
-
-void
-main_header_context_menu (DdbListview *ps, int column) {
- GtkWidget *menu = create_headermenu (1);
- set_last_playlist_cm (ps); // playlist ptr for context menu
- set_active_column_cm (column);
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, ps, 3, gtk_get_current_event_time());
-}
-
-DdbListviewBinding main_binding = {
- // rows
- .count = main_get_count,
- .sel_count = main_get_sel_count,
-
- .cursor = main_get_cursor,
- .set_cursor = main_set_cursor,
-
- .head = main_head,
- .tail = main_tail,
- .next = main_next,
- .prev = main_prev,
-
- .get_for_idx = main_get_for_idx,
- .get_idx = main_get_idx,
-
- .is_selected = main_is_selected,
- .select = main_select,
-
- .get_group = main_get_group,
-
- .drag_n_drop = main_drag_n_drop,
- .external_drag_n_drop = main_external_drag_n_drop,
-
- .draw_column_data = draw_column_data,
- .draw_group_title = main_draw_group_title,
-
- // columns
- .col_sort = main_col_sort,
- .columns_changed = main_columns_changed,
- .column_size_changed = main_column_size_changed,
- .col_free_user_data = main_col_free_user_data,
-
- // callbacks
- .handle_doubleclick = main_handle_doubleclick,
- .selection_changed = main_selection_changed,
- .header_context_menu = main_header_context_menu,
- .list_context_menu = list_context_menu,
- .delete_selected = main_delete_selected,
- .vscroll_changed = main_vscroll_changed,
- .modification_idx = gtkui_get_curr_playlist_mod,
-};
-
-void
-main_playlist_init (GtkWidget *widget) {
- play16_pixbuf = create_pixbuf ("play_16.png");
- pause16_pixbuf = create_pixbuf ("pause_16.png");
- buffering16_pixbuf = create_pixbuf ("buffering_16.png");
-
- // make listview widget and bind it to data
- DdbListview *listview = DDB_LISTVIEW(widget);
- main_binding.ref = (void (*) (DdbListviewIter))deadbeef->pl_item_ref;
- main_binding.unref = (void (*) (DdbListviewIter))deadbeef->pl_item_unref;
- ddb_listview_set_binding (listview, &main_binding);
- lock_column_config = 1;
- DB_conf_item_t *col = deadbeef->conf_find ("playlist.column.", NULL);
- if (!col) {
- // create default set of columns
- add_column_helper (listview, "♫", 50, DB_COLUMN_PLAYING, NULL, 0);
- add_column_helper (listview, _("Artist / Album"), 150, -1, "%a - %b", 0);
- add_column_helper (listview, _("Track No"), 50, -1, "%n", 1);
- add_column_helper (listview, _("Title"), 150, -1, "%t", 0);
- add_column_helper (listview, _("Duration"), 50, -1, "%l", 0);
- }
- else {
- while (col) {
- append_column_from_textdef (listview, col->value);
- col = deadbeef->conf_find ("playlist.column.", col);
- }
- }
- lock_column_config = 0;
-
- // FIXME: filepath should be in properties dialog, while tooltip should be
- // used to show text that doesn't fit in column width
- if (deadbeef->conf_get_int ("listview.showpathtooltip", 0)) {
- GValue value = {0, };
- g_value_init (&value, G_TYPE_BOOLEAN);
- g_value_set_boolean (&value, TRUE);
- DdbListview *pl = DDB_LISTVIEW (widget);
- g_object_set_property (G_OBJECT (pl->list), "has-tooltip", &value);
- g_signal_connect (G_OBJECT (pl->list), "query-tooltip", G_CALLBACK (playlist_tooltip_handler), NULL);
- }
- deadbeef->conf_lock ();
- strncpy (group_by_str, deadbeef->conf_get_str_fast ("playlist.group_by", ""), sizeof (group_by_str));
- deadbeef->conf_unlock ();
- group_by_strsizeof (group_by_str)-1 = 0;
-
- gtkui_groups_pinned = deadbeef->conf_get_int ("playlist.pin.groups", 0);
-}
-
-void
-main_playlist_free (void) {
- g_object_unref (play16_pixbuf);
- g_object_unref (pause16_pixbuf);
- g_object_unref (buffering16_pixbuf);
-}
-
-void
-main_refresh (void) {
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-}
-

deadbeef-0.6.2.tar.bz2/plugins/gtkui/mainplaylist.h Deleted

@@ -1,39 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
-*/
-#ifndef __MAINPLAYLIST_H
-#define __MAINPLAYLIST_H
-
-#include "ddblistview.h"
-
-void
-main_playlist_init (GtkWidget *widget);
-
-void
-main_playlist_free (void);
-
-void
-main_refresh (void);
-
-int
-main_get_idx (DdbListviewIter it);
-
-void
-main_drag_n_drop (DdbListviewIter before, DdbPlaylistHandle from_playlist, uint32_t *indices, int length, int copy);
-
-#endif

deadbeef-0.6.2.tar.bz2/plugins/gtkui/plcommon.c Deleted

@@ -1,1307 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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 <unistd.h>
-#include <gdk/gdkkeysyms.h>
-#include "gtkui.h"
-#include "plcommon.h"
-#include "coverart.h"
-#include "drawing.h"
-#include "trkproperties.h"
-#include "mainplaylist.h"
-#include "support.h"
-#include "interface.h"
-#include "../libparser/parser.h"
-#include "actions.h"
-#include "search.h"
-#include "actionhandlers.h"
-#include "../../strdupa.h"
-
-#define min(x,y) ((x)<(y)?(x):(y))
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-
-// disable custom title function, until we have new title formatting (0.7)
-#define DISABLE_CUSTOM_TITLE
-
-char group_by_strMAX_GROUP_BY_STR;
-
-extern GtkWidget *theme_treeview;
-extern GdkPixbuf *play16_pixbuf;
-extern GdkPixbuf *pause16_pixbuf;
-extern GdkPixbuf *buffering16_pixbuf;
-
-static int clicked_idx = -1;
-
-void
-write_column_config (const char *name, int idx, const char *title, int width, int align_right, int id, const char *format) {
- char key128;
- char value128;
- snprintf (key, sizeof (key), "%s.column.%02d", name, idx);
- snprintf (value, sizeof (value), "\"%s\" \"%s\" %d %d %d", title, format ? format : "", id, width, align_right);
- deadbeef->conf_set_str (key, value);
-}
-
-void
-rewrite_column_config (DdbListview *listview, const char *name) {
- char key128;
- snprintf (key, sizeof (key), "%s.column.", name);
- deadbeef->conf_remove_items (key);
-
- int cnt = ddb_listview_column_get_count (listview);
- for (int i = 0; i < cnt; i++) {
- const char *title;
- int width;
- int align_right;
- col_info_t *info;
- int minheight;
- ddb_listview_column_get_info (listview, i, &title, &width, &align_right, &minheight, (void **)&info);
- write_column_config (name, i, title, width, align_right, info->id, info->format);
- }
-}
-
-static gboolean
-redraw_playlist_cb (gpointer user_data) {
- DDB_LISTVIEW(user_data)->cover_size = DDB_LISTVIEW(user_data)->new_cover_size;
- gtk_widget_queue_draw (GTK_WIDGET(user_data));
- return FALSE;
-}
-
-static void
-redraw_playlist (void *user_data) {
- g_idle_add (redraw_playlist_cb, user_data);
-}
-
-static gboolean
-redraw_playlist_single_cb (gpointer user_data) {
- gtk_widget_queue_draw (GTK_WIDGET(user_data));
- g_object_unref (GTK_WIDGET (user_data));
- return FALSE;
-}
-
-static void
-redraw_playlist_single (void *user_data) {
- g_object_ref (GTK_WIDGET (user_data));
- g_idle_add (redraw_playlist_single_cb, user_data);
-}
-
-#define ART_PADDING_HORZ 8
-#define ART_PADDING_VERT 0
-
-static gboolean
-deferred_cover_load_cb (void *ctx) {
- DdbListview *lv = ctx;
- lv->cover_refresh_timeout_id = 0;
- deadbeef->pl_lock ();
- ddb_listview_groupcheck (lv);
- // find 1st group
- DdbListviewGroup *grp = lv->groups;
- int idx = 0;
- int abs_idx = 0;
- int grp_y = 0;
- while (grp && grp_y + grp->height < lv->scrollpos) {
- grp_y += grp->height;
- idx += grp->num_items + 1;
- abs_idx += grp->num_items;
- grp = grp->next;
- }
- GtkAllocation a;
- gtk_widget_get_allocation (GTK_WIDGET (lv), &a);
- while (grp && grp_y < a.height + lv->scrollpos) {
- // render title
- DdbListviewIter group_it = grp->head;
- int grpheight = grp->height;
- if (grp_y >= a.height + lv->scrollpos) {
- break;
- }
- const char *album = deadbeef->pl_find_meta (group_it, "album");
- const char *artist = deadbeef->pl_find_meta (group_it, "artist");
- if (!album || !*album) {
- album = deadbeef->pl_find_meta (group_it, "title");
- }
-
- grp_y += grpheight;
- grp = grp->next;
- int last = 0;
- if (!grp || grp_y >= a.height + lv->scrollpos) {
- last = 1;
- }
- GdkPixbuf *pixbuf = get_cover_art_callb (deadbeef->pl_find_meta (((DB_playItem_t *)group_it), ":URI"), artist, album, lv->new_cover_size, NULL, NULL);
- if (last) {
- queue_cover_callback (redraw_playlist, lv);
- }
- if (pixbuf) {
- g_object_unref (pixbuf);
- }
- }
- deadbeef->pl_unlock ();
-
- return FALSE;
-}
-
-void draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, DdbListviewIter group_it, int column, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int width, int height) {
- const char *ctitle;
- int cwidth;
- int calign_right;
- col_info_t *cinf;
- int minheight;
- int res = ddb_listview_column_get_info (listview, column, &ctitle, &cwidth, &calign_right, &minheight, (void **)&cinf);
- if (res == -1) {
- return;
- }
-
- DB_playItem_t *playing_track = deadbeef->streamer_get_playing_track ();
-	int theming = !gtkui_override_listview_colors ();
-
- if (cinf->id == DB_COLUMN_ALBUM_ART) {
- if (theming) {
-#if GTK_CHECK_VERSION(3,0,0)
- cairo_rectangle (cr, x, y, width, MAX (height,minheight));
- cairo_clip (cr);
- gtk_paint_flat_box (gtk_widget_get_style (theme_treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, theme_treeview, "cell_even_ruled", x-1, y, width+2, MAX (height,minheight));
- cairo_reset_clip (cr);
-#else
- GdkRectangle clip = {
- .x = x,
- .y = y,
- .width = width,
- .height = MAX (height,minheight),
- };
- gtk_paint_flat_box (gtk_widget_get_style (theme_treeview), gtk_widget_get_window (listview->list), GTK_STATE_NORMAL, GTK_SHADOW_NONE, &clip, theme_treeview, "cell_even_ruled", x-1, y, width+2, height);
-#endif
- }
- else {
- GdkColor clr;
- 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, y, width, height);
- cairo_fill (cr);
- }
- int real_art_width = width - ART_PADDING_HORZ * 2;
- if (real_art_width > 0 && group_it) {
- const char *album = deadbeef->pl_find_meta (group_it, "album");
- const char *artist = deadbeef->pl_find_meta (group_it, "artist");
- if (!album || !*album) {
- album = deadbeef->pl_find_meta (group_it, "title");
- }
- if (listview->new_cover_size != real_art_width) {
- listview->new_cover_size = real_art_width;
- if (listview->cover_refresh_timeout_id) {
- g_source_remove (listview->cover_refresh_timeout_id);
- listview->cover_refresh_timeout_id = 0;
- }
- if (listview->cover_size == -1) {
- listview->cover_size = real_art_width;
- }
- else {
- if (!listview->cover_refresh_timeout_id) {
- listview->cover_refresh_timeout_id = g_timeout_add (1000, deferred_cover_load_cb, listview);
- }
- }
- }
- int art_width = listview->cover_size;
- int art_y = y; // dest y
- int art_h = height;
- int sy; // source y
- if (group_y < ART_PADDING_VERT) {
- art_y = y - group_y + ART_PADDING_VERT;
- art_h = height - (art_y - y);
- sy = group_y;
- }
- else {
- sy = group_y - ART_PADDING_VERT;
- }
- int h = cwidth - group_y;
- h = min (height, art_h);
-
- int hq = 0;
- GdkPixbuf *pixbuf = get_cover_art_callb (deadbeef->pl_find_meta (((DB_playItem_t *)group_it), ":URI"), artist, album, real_art_width == art_width ? art_width : -1, redraw_playlist_single, listview);
- if (!pixbuf) {
- pixbuf = cover_get_default_pixbuf ();
- }
- if (pixbuf) {
- art_width = gdk_pixbuf_get_width (pixbuf);
- float art_scale = (float)real_art_width / art_width;
- int pw = real_art_width;
- int ph = pw;
- if (gdk_pixbuf_get_width (pixbuf) < gdk_pixbuf_get_height (pixbuf)) {
- art_scale *= (float)gdk_pixbuf_get_width (pixbuf) / gdk_pixbuf_get_height (pixbuf);
- }
-
- int draw_pinned = (y - listview->grouptitle_height < ph && group_pinned == 1 && gtkui_groups_pinned) ? 1 : 0;
- if (art_y > -(ph + listview->grouptitle_height) || draw_pinned) {
- cairo_save (cr);
- if (draw_pinned) {
- int ph_real = gdk_pixbuf_get_height (pixbuf) * art_scale;
- if (grp_next_y <= ph_real + listview->grouptitle_height) {
- cairo_rectangle (cr, x + ART_PADDING_HORZ, grp_next_y - ph_real, pw, ph_real);
- cairo_translate (cr, (x + ART_PADDING_HORZ)-0, grp_next_y - ph_real);
- }
- else {
- cairo_rectangle (cr, x + ART_PADDING_HORZ, listview->grouptitle_height, pw, ph_real);
- cairo_translate (cr, (x + ART_PADDING_HORZ)-0, listview->grouptitle_height);
- }
- }
- else {
- ph -= sy;
- ph = min (ph, h);
- cairo_rectangle (cr, x + ART_PADDING_HORZ, art_y, pw, ph);
- cairo_translate (cr, (x + ART_PADDING_HORZ)-0, art_y - sy);
- }
- cairo_scale (cr, art_scale, art_scale);
- gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
- cairo_pattern_set_filter (cairo_get_source(cr), gtkui_is_default_pixbuf (pixbuf) ? CAIRO_FILTER_GAUSSIAN : CAIRO_FILTER_FAST);
- cairo_fill (cr);
- cairo_restore (cr);
- }
- g_object_unref (pixbuf);
- }
- }
- }
- else if (!gtkui_unicode_playstate && it && it == playing_track && cinf->id == DB_COLUMN_PLAYING) {
- int paused = deadbeef->get_output ()->state () == OUTPUT_STATE_PAUSED;
- int buffering = !deadbeef->streamer_ok_to_read (-1);
- GdkPixbuf *pixbuf;
- if (paused) {
- pixbuf = pause16_pixbuf;
- }
- else if (!buffering) {
- pixbuf = play16_pixbuf;
- }
- else {
- pixbuf = buffering16_pixbuf;
- }
- gdk_cairo_set_source_pixbuf (cr, pixbuf, x + cwidth/2 - 8, y + height/2 - 8);
- cairo_rectangle (cr, x + cwidth/2 - 8, y + height/2 - 8, 16, 16);
- cairo_fill (cr);
- }
- else if (it) {
- char text1024 = "";
- if (it == playing_track && cinf->id == DB_COLUMN_PLAYING) {
- int paused = deadbeef->get_output ()->state () == OUTPUT_STATE_PAUSED;
- int buffering = !deadbeef->streamer_ok_to_read (-1);
- if (paused) {
- strcpy (text, "||");
- }
- else if (!buffering) {
- strcpy (text, "►");
- }
- else {
- strcpy (text, "⋯⋯⋯");
- }
- }
- else {
- deadbeef->pl_format_title (it, -1, text, sizeof (text), cinf->id, cinf->format);
- char *lb = strchr (text, '\r');
- if (lb) {
- *lb = 0;
- }
- lb = strchr (text, '\n');
- if (lb) {
- *lb = 0;
- }
- }
- GdkColor *color = NULL;
- if (theming) {
- if (deadbeef->pl_is_selected (it)) {
- color = &gtk_widget_get_style (theme_treeview)->textGTK_STATE_SELECTED;
- }
- else {
- color = &gtk_widget_get_style (theme_treeview)->textGTK_STATE_NORMAL;
- }
- }
- else {
- GdkColor clr;
- if (deadbeef->pl_is_selected (it)) {
- color = (gtkui_get_listview_selected_text_color (&clr), &clr);
- }
- else {
- color = (gtkui_get_listview_text_color (&clr), &clr);
- }
- }
- float fg3 = {(float)color->red/0xffff, (float)color->green/0xffff, (float)color->blue/0xffff};
- draw_set_fg_color (&listview->listctx, fg);
-
- draw_init_font (&listview->listctx, gtk_widget_get_style (GTK_WIDGET (listview)));
- if (gtkui_embolden_current_track && it && it == playing_track) {
- draw_init_font_bold (&listview->listctx);
- }
- if (calign_right) {
- draw_text (&listview->listctx, x + 5, y + 3, cwidth-10, 1, text);
- }
- else {
- draw_text (&listview->listctx, x + 5, y + 3, cwidth-10, 0, text);
- }
- if (gtkui_embolden_current_track && it && it == playing_track) {
- draw_init_font_normal (&listview->listctx);
- }
- }
- if (playing_track) {
- deadbeef->pl_item_unref (playing_track);
- }
-}
-
-void
-main_add_to_playback_queue_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
- while (it) {
- if (deadbeef->pl_is_selected (it)) {
- deadbeef->pl_playqueue_push (it);
- }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
- }
- deadbeef->sendmessage (DB_EV_PLAYLIST_REFRESH, 0, 0, 0);
-}
-
-void
-main_remove_from_playback_queue_activate
- (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
- while (it) {
- if (deadbeef->pl_is_selected (it)) {
- deadbeef->pl_playqueue_remove (it);
- }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
- }
- deadbeef->sendmessage (DB_EV_PLAYLIST_REFRESH, 0, 0, 0);
-}
-
-void
-main_reload_metadata_activate
- (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
- while (it) {
- deadbeef->pl_lock ();
- char decoder_id100;
- const char *dec = deadbeef->pl_find_meta (it, ":DECODER");
- if (dec) {
- strncpy (decoder_id, dec, sizeof (decoder_id));
- }
- int match = deadbeef->pl_is_selected (it) && deadbeef->is_local_file (deadbeef->pl_find_meta (it, ":URI")) && dec;
- deadbeef->pl_unlock ();
-
- if (match) {
- uint32_t f = deadbeef->pl_get_item_flags (it);
- if (!(f & DDB_IS_SUBTRACK)) {
- f &= ~DDB_TAG_MASK;
- deadbeef->pl_set_item_flags (it, f);
- DB_decoder_t **decoders = deadbeef->plug_get_decoder_list ();
- for (int i = 0; decodersi; i++) {
- if (!strcmp (decodersi->plugin.id, decoder_id)) {
- if (decodersi->read_metadata) {
- decodersi->read_metadata (it);
- }
- break;
- }
- }
- }
- }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
- }
- deadbeef->sendmessage (DB_EV_PLAYLIST_REFRESH, 0, 0, 0);
-}
-
-void
-main_properties_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- action_show_track_properties_handler_cb ((void *)(intptr_t)DDB_ACTION_CTX_SELECTION);
-}
-
-void
-on_clear1_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- deadbeef->pl_clear ();
- deadbeef->pl_save_current ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-}
-
-void
-on_remove1_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- action_remove_from_playlist_handler (NULL, DDB_ACTION_CTX_SELECTION);
-}
-
-
-void
-on_crop1_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- action_crop_selected_handler (NULL, 0);
-}
-
-void
-on_remove2_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- int cursor = deadbeef->pl_delete_selected ();
- deadbeef->pl_save_current ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-}
-
-static void
-on_toggle_set_custom_title (GtkToggleButton *togglebutton, gpointer user_data) {
- gboolean active = gtk_toggle_button_get_active (togglebutton);
- deadbeef->conf_set_int ("gtkui.location_set_custom_title", active);
-
- GtkWidget *ct = lookup_widget (GTK_WIDGET (user_data), "custom_title");
- gtk_widget_set_sensitive (ct, active);
-
- deadbeef->conf_save ();
-}
-
-#ifndef DISABLE_CUSTOM_TITLE
-void
-on_set_custom_title_activate (GtkMenuItem *menuitem, gpointer user_data)
-{
- DdbListview *lv = user_data;
- int idx = lv->binding->cursor ();
- if (idx < 0) {
- return;
- }
- DdbListviewIter it = lv->binding->get_for_idx (idx);
- if (!it) {
- return;
- }
-
- GtkWidget *dlg = create_setcustomtitledlg ();
- GtkWidget *sct = lookup_widget (dlg, "set_custom_title");
- GtkWidget *ct = lookup_widget (dlg, "custom_title");
- if (deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sct), TRUE);
- gtk_widget_set_sensitive (ct, TRUE);
- }
- else {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sct), FALSE);
- gtk_widget_set_sensitive (ct, FALSE);
- }
- deadbeef->pl_lock ();
- const char *custom_title = deadbeef->pl_find_meta ((DB_playItem_t *)it, ":CUSTOM_TITLE");
- if (custom_title) {
- custom_title = strdupa (custom_title);
- }
- else {
- custom_title = "";
- }
- deadbeef->pl_unlock ();
-
- g_signal_connect ((gpointer) sct, "toggled",
- G_CALLBACK (on_toggle_set_custom_title),
- dlg);
- gtk_entry_set_text (GTK_ENTRY (ct), custom_title);
-
- gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
- gint response = gtk_dialog_run (GTK_DIALOG (dlg));
- if (response == GTK_RESPONSE_OK) {
- if (it && deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
- deadbeef->pl_replace_meta ((DB_playItem_t *)it, ":CUSTOM_TITLE", gtk_entry_get_text (GTK_ENTRY (ct)));
- }
- else {
- deadbeef->pl_delete_meta ((DB_playItem_t *)it, ":CUSTOM_TITLE");
- }
- }
- gtk_widget_destroy (dlg);
- lv->binding->unref (it);
-}
-#endif
-
-void
-on_remove_from_disk_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- action_delete_from_disk_handler_cb ((void *)(intptr_t)DDB_ACTION_CTX_SELECTION);
-}
-
-void
-actionitem_activate (GtkMenuItem *menuitem,
- DB_plugin_action_t *action)
-{
- if (action->callback) {
- gtkui_exec_action_14 (action, clicked_idx);
- }
- else {
- action->callback2 (action, DDB_ACTION_CTX_SELECTION);
- }
-}
-
-#define HOOKUP_OBJECT(component,widget,name) \
- g_object_set_data_full (G_OBJECT (component), name, \
- g_object_ref (widget), (GDestroyNotify) g_object_unref)
-
-
-static GtkWidget*
-find_popup (GtkWidget *widget,
- const gchar *widget_name)
-{
- GtkWidget *parent, *found_widget;
-
- for (;;)
- {
- if (GTK_IS_MENU (widget))
- parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
- else
- parent = gtk_widget_get_parent (widget);
- if (!parent)
- parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
- if (parent == NULL)
- break;
- widget = parent;
- }
-
- found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
- widget_name);
- return found_widget;
-}
-
-#if 0
-// experimental code to position the popup at the item
-static void
-popup_menu_position_func (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data) {
- // find 1st selected item
- DdbListview *lv = user_data;
- int winx, winy;
- gdk_window_get_position (gtk_widget_get_window (GTK_WIDGET (lv->list)), &winx, &winy);
- DdbListviewIter it = lv->binding->head ();
- int idx = 0;
- while (it) {
- if (lv->binding->is_selected (it)) {
- break;
- }
- DdbListviewIter next = lv->binding->next (it);
- lv->binding->unref (it);
- it = next;
- idx++;
- }
- if (it) {
- // get Y position
- *y = ddb_listview_get_row_pos (lv, idx) + winy;
- lv->binding->unref (it);
- }
- else {
- *y = winy; // mouse_y
- }
- *x = winx; // mouse_x
- *push_in = TRUE;
-}
-#endif
-
-void
-list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
- clicked_idx = deadbeef->pl_get_idx_of (it);
- int inqueue = deadbeef->pl_playqueue_test (it);
- GtkWidget *playlist_menu;
- GtkWidget *add_to_playback_queue1;
- GtkWidget *remove_from_playback_queue1;
- GtkWidget *separator;
- GtkWidget *remove2;
- GtkWidget *remove_from_disk;
- GtkWidget *separator8;
- GtkWidget *properties1;
- GtkWidget *reload_metadata;
-#ifndef DISABLE_CUSTOM_TITLE
- GtkWidget *set_custom_title;
-#endif
-
- playlist_menu = gtk_menu_new ();
- add_to_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Add To Playback Queue"));
- gtk_widget_show (add_to_playback_queue1);
- gtk_container_add (GTK_CONTAINER (playlist_menu), add_to_playback_queue1);
- g_object_set_data (G_OBJECT (add_to_playback_queue1), "ps", listview);
-
- remove_from_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Remove From Playback Queue"));
- if (inqueue == -1) {
- gtk_widget_set_sensitive (remove_from_playback_queue1, FALSE);
- }
- gtk_widget_show (remove_from_playback_queue1);
- gtk_container_add (GTK_CONTAINER (playlist_menu), remove_from_playback_queue1);
- g_object_set_data (G_OBJECT (remove_from_playback_queue1), "ps", listview);
-
- reload_metadata = gtk_menu_item_new_with_mnemonic (_("Reload Metadata"));
- gtk_widget_show (reload_metadata);
- gtk_container_add (GTK_CONTAINER (playlist_menu), reload_metadata);
- g_object_set_data (G_OBJECT (reload_metadata), "ps", listview);
-
- separator = gtk_separator_menu_item_new ();
- gtk_widget_show (separator);
- gtk_container_add (GTK_CONTAINER (playlist_menu), separator);
- gtk_widget_set_sensitive (separator, FALSE);
-
- remove2 = gtk_menu_item_new_with_mnemonic (_("Remove"));
- gtk_widget_show (remove2);
- gtk_container_add (GTK_CONTAINER (playlist_menu), remove2);
- g_object_set_data (G_OBJECT (remove2), "ps", listview);
-
- int hide_remove_from_disk = deadbeef->conf_get_int ("gtkui.hide_remove_from_disk", 0);
-
- if (!hide_remove_from_disk) {
- remove_from_disk = gtk_menu_item_new_with_mnemonic (_("Remove From Disk"));
- gtk_widget_show (remove_from_disk);
- gtk_container_add (GTK_CONTAINER (playlist_menu), remove_from_disk);
- g_object_set_data (G_OBJECT (remove_from_disk), "ps", listview);
- }
-
- separator = gtk_separator_menu_item_new ();
- gtk_widget_show (separator);
- gtk_container_add (GTK_CONTAINER (playlist_menu), separator);
- gtk_widget_set_sensitive (separator, FALSE);
-
- int selected_count = 0;
- DB_playItem_t *pit = deadbeef->pl_get_first (PL_MAIN);
- DB_playItem_t *selected = NULL;
- while (pit) {
- if (deadbeef->pl_is_selected (pit))
- {
- if (!selected)
- selected = pit;
- selected_count++;
- }
- DB_playItem_t *next = deadbeef->pl_get_next (pit, PL_MAIN);
- deadbeef->pl_item_unref (pit);
- pit = next;
- }
-
- DB_plugin_t **plugins = deadbeef->plug_get_list();
- int i;
- int added_entries = 0;
- for (i = 0; pluginsi; i++)
- {
- if (!pluginsi->get_actions)
- continue;
-
- DB_plugin_action_t *actions = pluginsi->get_actions (selected);
- DB_plugin_action_t *action;
-
- int count = 0;
- for (action = actions; action; action = action->next)
- {
- if ((action->flags & DB_ACTION_COMMON) || !((action->callback2 && (action->flags & DB_ACTION_ADD_MENU)) || action->callback) || !(action->flags & (DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_SINGLE_TRACK)))
- continue;
-
- // create submenus (separated with '/')
- const char *prev = action->title;
- while (*prev && *prev == '/') {
- prev++;
- }
-
- GtkWidget *popup = NULL;
-
- for (;;) {
- const char *slash = strchr (prev, '/');
- if (slash && *(slash-1) != '\\') {
- char nameslash-prev+1;
- // replace \/ with /
- const char *p = prev;
- char *t = name;
- while (*p && p < slash) {
- if (*p == '\\' && *(p+1) == '/') {
- *t++ = '/';
- p += 2;
- }
- else {
- *t++ = *p++;
- }
- }
- *t = 0;
-
- // add popup
- GtkWidget *prev_menu = popup ? popup : playlist_menu;
-
- popup = find_popup (prev_menu, name);
- if (!popup) {
- GtkWidget *item = gtk_image_menu_item_new_with_mnemonic (_(name));
- gtk_widget_show (item);
- gtk_container_add (GTK_CONTAINER (prev_menu), item);
- popup = gtk_menu_new ();
- HOOKUP_OBJECT (prev_menu, popup, name);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), popup);
- }
- }
- else {
- break;
- }
- prev = slash+1;
- }
-
-
- count++;
- added_entries++;
- GtkWidget *actionitem;
-
- // replace \/ with /
- const char *p = popup ? prev : action->title;
- char titlestrlen (p)+1;
- char *t = title;
- while (*p) {
- if (*p == '\\' && *(p+1) == '/') {
- *t++ = '/';
- p += 2;
- }
- else {
- *t++ = *p++;
- }
- }
- *t = 0;
-
- actionitem = gtk_menu_item_new_with_mnemonic (_(title));
- gtk_widget_show (actionitem);
- gtk_container_add (popup ? GTK_CONTAINER (popup) : GTK_CONTAINER (playlist_menu), actionitem);
- g_object_set_data (G_OBJECT (actionitem), "ps", listview);
-
- g_signal_connect ((gpointer) actionitem, "activate",
- G_CALLBACK (actionitem_activate),
- action);
- if ((selected_count > 1 && !(action->flags & DB_ACTION_MULTIPLE_TRACKS)) ||
- (action->flags & DB_ACTION_DISABLED)) {
- gtk_widget_set_sensitive (GTK_WIDGET (actionitem), FALSE);
- }
- }
- if (count > 0 && deadbeef->conf_get_int ("gtkui.action_separators", 0))
- {
- separator8 = gtk_separator_menu_item_new ();
- gtk_widget_show (separator8);
- gtk_container_add (GTK_CONTAINER (playlist_menu), separator8);
- gtk_widget_set_sensitive (separator8, FALSE);
- }
- }
- if (added_entries > 0 && !deadbeef->conf_get_int ("gtkui.action_separators", 0))
- {
- separator8 = gtk_separator_menu_item_new ();
- gtk_widget_show (separator8);
- gtk_container_add (GTK_CONTAINER (playlist_menu), separator8);
- gtk_widget_set_sensitive (separator8, FALSE);
- }
-
-#ifndef DISABLE_CUSTOM_TITLE
- set_custom_title = gtk_menu_item_new_with_mnemonic (_("Set Custom Title"));
- gtk_widget_show (set_custom_title);
- gtk_container_add (GTK_CONTAINER (playlist_menu), set_custom_title);
- if (selected_count != 1) {
- gtk_widget_set_sensitive (GTK_WIDGET (set_custom_title), FALSE);
- }
-
- separator = gtk_separator_menu_item_new ();
- gtk_widget_show (separator);
- gtk_container_add (GTK_CONTAINER (playlist_menu), separator);
- gtk_widget_set_sensitive (separator, FALSE);
-#endif
-
- properties1 = gtk_menu_item_new_with_mnemonic (_("Track Properties"));
- gtk_widget_show (properties1);
- gtk_container_add (GTK_CONTAINER (playlist_menu), properties1);
- g_object_set_data (G_OBJECT (properties1), "ps", listview);
-
- g_signal_connect ((gpointer) add_to_playback_queue1, "activate",
- G_CALLBACK (main_add_to_playback_queue_activate),
- NULL);
- g_signal_connect ((gpointer) remove_from_playback_queue1, "activate",
- G_CALLBACK (main_remove_from_playback_queue_activate),
- NULL);
- g_signal_connect ((gpointer) reload_metadata, "activate",
- G_CALLBACK (main_reload_metadata_activate),
- NULL);
- g_signal_connect ((gpointer) remove2, "activate",
- G_CALLBACK (on_remove2_activate),
- NULL);
- if (!hide_remove_from_disk) {
- g_signal_connect ((gpointer) remove_from_disk, "activate",
- G_CALLBACK (on_remove_from_disk_activate),
- NULL);
- }
-#ifndef DISABLE_CUSTOM_TITLE
- g_signal_connect ((gpointer) set_custom_title, "activate",
- G_CALLBACK (on_set_custom_title_activate),
- listview);
-#endif
- g_signal_connect ((gpointer) properties1, "activate",
- G_CALLBACK (main_properties_activate),
- NULL);
- gtk_menu_popup (GTK_MENU (playlist_menu), NULL, NULL, NULL/*popup_menu_position_func*/, listview, 0, gtk_get_current_event_time());
-}
-
-void
-on_group_by_none_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- strcpy (group_by_str, "");
- deadbeef->conf_set_str ("playlist.group_by", group_by_str);
-
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- deadbeef->plt_modified (plt);
- deadbeef->plt_unref (plt);
- }
- main_refresh ();
-}
-
-void
-on_pin_groups_active (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- int old_val = deadbeef->conf_get_int ("playlist.pin.groups", 0);
- deadbeef->conf_set_int ("playlist.pin.groups", old_val ? 0 : 1);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtk_check_menu_item_toggled(GTK_CHECK_MENU_ITEM(menuitem));
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- deadbeef->plt_modified (plt);
- deadbeef->plt_unref(plt);
- }
- main_refresh ();
-}
-
-void
-on_group_by_artist_date_album_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- strcpy (group_by_str, "%a - %y %b");
- deadbeef->conf_set_str ("playlist.group_by", group_by_str);
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- deadbeef->plt_modified (plt);
- deadbeef->plt_unref (plt);
- }
- main_refresh ();
-}
-
-void
-on_group_by_artist_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- strcpy (group_by_str, "%a");
- deadbeef->conf_set_str ("playlist.group_by", group_by_str);
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- deadbeef->plt_modified (plt);
- deadbeef->plt_unref (plt);
- }
- main_refresh ();
-}
-
-void
-on_group_by_custom_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- GtkWidget *dlg = create_groupbydlg ();
-
- gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
- GtkWidget *entry = lookup_widget (dlg, "format");
- gtk_entry_set_text (GTK_ENTRY (entry), group_by_str);
-// gtk_window_set_title (GTK_WINDOW (dlg), "Group by");
- gint response = gtk_dialog_run (GTK_DIALOG (dlg));
-
- if (response == GTK_RESPONSE_OK) {
- const gchar *text = gtk_entry_get_text (GTK_ENTRY (entry));
- strncpy (group_by_str, text, sizeof (group_by_str));
- group_by_strsizeof (group_by_str)-1 = 0;
- deadbeef->conf_set_str ("playlist.group_by", group_by_str);
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- deadbeef->plt_modified (plt);
- deadbeef->plt_unref (plt);
- }
- main_refresh ();
- }
- gtk_widget_destroy (dlg);
-}
-
-static DdbListview *last_playlist;
-static int active_column;
-
-void
-set_last_playlist_cm (DdbListview *pl) {
- last_playlist = pl;
-}
-
-void
-set_active_column_cm (int col) {
- active_column = col;
-}
-
-void
-append_column_from_textdef (DdbListview *listview, const uint8_t *def) {
- // syntax: "title" "format" id width alignright
- char tokenMAX_TOKEN;
- const char *p = def;
- char titleMAX_TOKEN;
- int id;
- char fmtMAX_TOKEN;
- int width;
- int align;
-
- parser_init ();
-
- p = gettoken_warn_eof (p, token);
- if (!p) {
- return;
- }
- strcpy (title, token);
-
- p = gettoken_warn_eof (p, token);
- if (!p) {
- return;
- }
- strcpy (fmt, token);
-
- p = gettoken_warn_eof (p, token);
- if (!p) {
- return;
- }
- id = atoi (token);
-
- p = gettoken_warn_eof (p, token);
- if (!p) {
- return;
- }
- width = atoi (token);
-
- p = gettoken_warn_eof (p, token);
- if (!p) {
- return;
- }
- align = atoi (token);
-
- col_info_t *inf = malloc (sizeof (col_info_t));
- memset (inf, 0, sizeof (col_info_t));
-
- enum {
- DB_COLUMN_ARTIST_ALBUM = 2,
- DB_COLUMN_ARTIST = 3,
- DB_COLUMN_ALBUM = 4,
- DB_COLUMN_TITLE = 5,
- DB_COLUMN_DURATION = 6,
- DB_COLUMN_TRACK = 7,
- };
-
- inf->id = -1;
- // convert IDs from pre-0.4
- switch (id) {
- case DB_COLUMN_ARTIST_ALBUM:
- inf->format = strdup ("%a - %b");
- break;
- case DB_COLUMN_ARTIST:
- inf->format = strdup ("%a");
- break;
- case DB_COLUMN_ALBUM:
- inf->format = strdup ("%b");
- break;
- case DB_COLUMN_TITLE:
- inf->format = strdup ("%t");
- break;
- case DB_COLUMN_DURATION:
- inf->format = strdup ("%l");
- break;
- case DB_COLUMN_TRACK:
- inf->format = strdup ("%n");
- break;
- default:
- inf->format = *fmt ? strdup (fmt) : NULL;
- inf->id = id;
- break;
- }
- ddb_listview_column_append (listview, title, width, align, id == DB_COLUMN_ALBUM_ART ? width : 0, inf);
-}
-
-static void
-init_column (col_info_t *inf, int id, const char *format) {
- if (inf->format) {
- free (inf->format);
- inf->format = NULL;
- }
-
- inf->id = -1;
-
- switch (id) {
- case 0:
- inf->id = DB_COLUMN_FILENUMBER;
- break;
- case 1:
- inf->id = DB_COLUMN_PLAYING;
- break;
- case 2:
- inf->id = DB_COLUMN_ALBUM_ART;
- break;
- case 3:
- inf->format = strdup ("%a - %b");
- break;
- case 4:
- inf->format = strdup ("%a");
- break;
- case 5:
- inf->format = strdup ("%b");
- break;
- case 6:
- inf->format = strdup ("%t");
- break;
- case 7:
- inf->format = strdup ("%l");
- break;
- case 8:
- inf->format = strdup ("%n");
- break;
- case 9:
- inf->format = strdup ("%B");
- break;
- default:
- inf->format = strdup (format);
- }
-}
-
-int editcolumn_title_changed = 0;
-
-void
-on_add_column_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- editcolumn_title_changed = 0;
- GtkWidget *dlg = create_editcolumndlg ();
- gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
- gtk_window_set_title (GTK_WINDOW (dlg), _("Add column"));
- gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "id")), 0);
- gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "align")), 0);
- gint response = gtk_dialog_run (GTK_DIALOG (dlg));
- if (response == GTK_RESPONSE_OK) {
- const gchar *title = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "title")));
- const gchar *format = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "format")));
- int sel = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (dlg, "id")));
-
- col_info_t *inf = malloc (sizeof (col_info_t));
- memset (inf, 0, sizeof (col_info_t));
-
- init_column (inf, sel, format);
-
- int align = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (dlg, "align")));
- ddb_listview_column_insert (last_playlist, active_column, title, 100, align, inf->id == DB_COLUMN_ALBUM_ART ? 100 : 0, inf);
- ddb_listview_refresh (last_playlist, DDB_LIST_CHANGED | DDB_REFRESH_COLUMNS | DDB_REFRESH_LIST | DDB_REFRESH_HSCROLL);
- }
- gtk_widget_destroy (dlg);
-}
-
-
-void
-on_edit_column_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- if (active_column == -1)
- return;
- GtkWidget *dlg = create_editcolumndlg ();
- gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
- gtk_window_set_title (GTK_WINDOW (dlg), _("Edit column"));
-
- const char *title;
- int width;
- int align_right;
- col_info_t *inf;
- int minheight;
- int res = ddb_listview_column_get_info (last_playlist, active_column, &title, &width, &align_right, &minheight, (void **)&inf);
- if (res == -1) {
- trace ("attempted to edit non-existing column\n");
- return;
- }
-
- int idx = 10;
- if (inf->id == -1) {
- if (inf->format) {
- if (!strcmp (inf->format, "%a - %b")) {
- idx = 3;
- }
- else if (!strcmp (inf->format, "%a")) {
- idx = 4;
- }
- else if (!strcmp (inf->format, "%b")) {
- idx = 5;
- }
- else if (!strcmp (inf->format, "%t")) {
- idx = 6;
- }
- else if (!strcmp (inf->format, "%l")) {
- idx = 7;
- }
- else if (!strcmp (inf->format, "%n")) {
- idx = 8;
- }
- else if (!strcmp (inf->format, "%B")) {
- idx = 9;
- }
- }
- }
- else if (inf->id <= DB_COLUMN_PLAYING) {
- idx = inf->id;
- }
- else if (inf->id == DB_COLUMN_ALBUM_ART) {
- idx = 2;
- }
- gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "id")), idx);
- if (idx == 10) {
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "format")), inf->format);
- }
- gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "align")), align_right);
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "title")), title);
- editcolumn_title_changed = 0;
- gint response = gtk_dialog_run (GTK_DIALOG (dlg));
- if (response == GTK_RESPONSE_OK) {
- const gchar *title = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "title")));
- const gchar *format = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "format")));
- int id = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (dlg, "id")));
- int align = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (dlg, "align")));
-
- init_column (inf, id, format);
- ddb_listview_column_set_info (last_playlist, active_column, title, width, align, inf->id == DB_COLUMN_ALBUM_ART ? width : 0, inf);
-
- ddb_listview_refresh (last_playlist, DDB_LIST_CHANGED | DDB_REFRESH_COLUMNS | DDB_REFRESH_LIST);
- }
- gtk_widget_destroy (dlg);
-}
-
-
-void
-on_remove_column_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- if (active_column == -1)
- return;
-
- ddb_listview_column_remove (last_playlist, active_column);
- ddb_listview_refresh (last_playlist, DDB_LIST_CHANGED | DDB_REFRESH_COLUMNS | DDB_REFRESH_LIST | DDB_REFRESH_HSCROLL);
-}
-
-GtkWidget*
-create_headermenu (int groupby)
-{
- GtkWidget *headermenu;
- GtkWidget *add_column;
- GtkWidget *edit_column;
- GtkWidget *remove_column;
- GtkWidget *separator;
- GtkWidget *group_by;
- GtkWidget *pin_groups;
- GtkWidget *group_by_menu;
- GtkWidget *none;
- GtkWidget *artist_date_album;
- GtkWidget *artist;
- GtkWidget *custom;
-
- headermenu = gtk_menu_new ();
-
- add_column = gtk_menu_item_new_with_mnemonic (_("Add column"));
- gtk_widget_show (add_column);
- gtk_container_add (GTK_CONTAINER (headermenu), add_column);
-
- edit_column = gtk_menu_item_new_with_mnemonic (_("Edit column"));
- gtk_widget_show (edit_column);
- gtk_container_add (GTK_CONTAINER (headermenu), edit_column);
-
- remove_column = gtk_menu_item_new_with_mnemonic (_("Remove column"));
- gtk_widget_show (remove_column);
- gtk_container_add (GTK_CONTAINER (headermenu), remove_column);
-
- if (groupby) {
- separator = gtk_separator_menu_item_new ();
- gtk_widget_show (separator);
- gtk_container_add (GTK_CONTAINER (headermenu), separator);
- gtk_widget_set_sensitive (separator, FALSE);
-
- pin_groups = gtk_check_menu_item_new_with_mnemonic(_("Pin groups when scrolling"));
- gtk_widget_show (pin_groups);
- gtk_container_add (GTK_CONTAINER (headermenu), pin_groups);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (pin_groups), (gboolean)deadbeef->conf_get_int("playlist.pin.groups",0));
-
- group_by = gtk_menu_item_new_with_mnemonic (_("Group by"));
- gtk_widget_show (group_by);
- gtk_container_add (GTK_CONTAINER (headermenu), group_by);
-
- group_by_menu = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (group_by), group_by_menu);
-
- none = gtk_menu_item_new_with_mnemonic (_("None"));
- gtk_widget_show (none);
- gtk_container_add (GTK_CONTAINER (group_by_menu), none);
-
- artist_date_album = gtk_menu_item_new_with_mnemonic (_("Artist/Date/Album"));
- gtk_widget_show (artist_date_album);
- gtk_container_add (GTK_CONTAINER (group_by_menu), artist_date_album);
-
- artist = gtk_menu_item_new_with_mnemonic (_("Artist"));
- gtk_widget_show (artist);
- gtk_container_add (GTK_CONTAINER (group_by_menu), artist);
-
- custom = gtk_menu_item_new_with_mnemonic (_("Custom"));
- gtk_widget_show (custom);
- gtk_container_add (GTK_CONTAINER (group_by_menu), custom);
-
- g_signal_connect ((gpointer) none, "activate",
- G_CALLBACK (on_group_by_none_activate),
- NULL);
-
- g_signal_connect ((gpointer) pin_groups, "activate",
- G_CALLBACK (on_pin_groups_active),
- NULL);
-
- g_signal_connect ((gpointer) artist_date_album, "activate",
- G_CALLBACK (on_group_by_artist_date_album_activate),
- NULL);
-
- g_signal_connect ((gpointer) artist, "activate",
- G_CALLBACK (on_group_by_artist_activate),
- NULL);
-
- g_signal_connect ((gpointer) custom, "activate",
- G_CALLBACK (on_group_by_custom_activate),
- NULL);
- }
-
- g_signal_connect ((gpointer) add_column, "activate",
- G_CALLBACK (on_add_column_activate),
- NULL);
- g_signal_connect ((gpointer) edit_column, "activate",
- G_CALLBACK (on_edit_column_activate),
- NULL);
- g_signal_connect ((gpointer) remove_column, "activate",
- G_CALLBACK (on_remove_column_activate),
- NULL);
-
- return headermenu;
-}
-
-void
-add_column_helper (DdbListview *listview, const char *title, int width, int id, const char *format, int align_right) {
- if (!format) {
- format = "";
- }
- col_info_t *inf = malloc (sizeof (col_info_t));
- memset (inf, 0, sizeof (col_info_t));
- inf->id = id;
- inf->format = strdup (format);
- ddb_listview_column_append (listview, title, width, align_right, id == DB_COLUMN_ALBUM_ART ? width : 0, inf);
-}
-

deadbeef-0.6.2.tar.bz2/plugins/gtkui/plcommon.h Deleted

@@ -1,53 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
-*/
-#ifndef __PLCOLUMNS_H
-#define __PLCOLUMNS_H
-
-#include "ddblistview.h"
-
-#define MAX_GROUP_BY_STR 100
-extern char group_by_strMAX_GROUP_BY_STR;
-
-void
-write_column_config (const char *name, int idx, const char *title, int width, int align_right, int id, const char *format);
-
-void
-rewrite_column_config (DdbListview *listview, const char *name);
-
-void draw_column_data (DdbListview *listview, cairo_t *drawable, DdbListviewIter it, DdbListviewIter group_it, int column, int group_y, int group_height, int group_pinned, int grp_next_y, int x, int y, int width, int height);
-
-void
-list_context_menu (DdbListview *listview, DdbListviewIter it, int idx);
-
-void
-append_column_from_textdef (DdbListview *listview, const uint8_t *def);
-
-void
-add_column_helper (DdbListview *listview, const char *title, int width, int id, const char *format, int align_right);
-
-GtkWidget*
-create_headermenu (int groupby);
-
-void
-set_last_playlist_cm (DdbListview *pl);
-
-void
-set_active_column_cm (int col);
-
-#endif // __PLCOLUMNS_H

deadbeef-0.6.2.tar.bz2/plugins/gtkui/prefwin.c Deleted

@@ -1,1112 +0,0 @@
-/*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
-*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include <gtk/gtk.h>
-#include <string.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <gdk/gdkkeysyms.h>
-#include "../../gettext.h"
-#include "gtkui.h"
-#include "support.h"
-#include "interface.h"
-#include "callbacks.h"
-#include "drawing.h"
-#include "eq.h"
-#include "ddblistview.h"
-#include "pluginconf.h"
-#include "dspconfig.h"
-#include "wingeom.h"
-#include "hotkeys.h"
-
-#define GLADE_HOOKUP_OBJECT(component,widget,name) \
- g_object_set_data_full (G_OBJECT (component), name, \
- 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)
-
-static GtkWidget *prefwin;
-
-static char alsa_device_names10064;
-static int num_alsa_devices;
-
-static void
-gtk_enum_sound_callback (const char *name, const char *desc, void *userdata) {
- if (num_alsa_devices >= 100) {
- fprintf (stderr, "wtf!! more than 100 alsa devices??\n");
- return;
- }
- GtkComboBox *combobox = GTK_COMBO_BOX (userdata);
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), desc);
-
- deadbeef->conf_lock ();
- if (!strcmp (deadbeef->conf_get_str_fast ("alsa_soundcard", "default"), name)) {
- gtk_combo_box_set_active (combobox, num_alsa_devices);
- }
- deadbeef->conf_unlock ();
-
- strncpy (alsa_device_namesnum_alsa_devices, name, 63);
- alsa_device_namesnum_alsa_devices63 = 0;
- num_alsa_devices++;
-}
-
-void
-preferences_fill_soundcards (void) {
- if (!prefwin) {
- return;
- }
- GtkComboBox *combobox = GTK_COMBO_BOX (lookup_widget (prefwin, "pref_soundcard"));
- GtkTreeModel *mdl = gtk_combo_box_get_model (combobox);
- gtk_list_store_clear (GTK_LIST_STORE (mdl));
-
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Default Audio Device"));
-
- deadbeef->conf_lock ();
- const char *s = deadbeef->conf_get_str_fast ("alsa_soundcard", "default");
- if (!strcmp (s, "default")) {
- gtk_combo_box_set_active (combobox, 0);
- }
- deadbeef->conf_unlock ();
-
- num_alsa_devices = 1;
- strcpy (alsa_device_names0, "default");
- if (deadbeef->get_output ()->enum_soundcards) {
- deadbeef->get_output ()->enum_soundcards (gtk_enum_sound_callback, combobox);
- gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
- }
- else {
- gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
- }
-}
-
-void
-prefwin_init_theme_colors (void) {
- GdkColor clr;
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "bar_background")), (gtkui_get_bar_background_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "bar_foreground")), (gtkui_get_bar_foreground_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_dark")), (gtkui_get_tabstrip_dark_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_mid")), (gtkui_get_tabstrip_mid_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_light")), (gtkui_get_tabstrip_light_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_base")), (gtkui_get_tabstrip_base_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_text")), (gtkui_get_tabstrip_text_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_even_row")), (gtkui_get_listview_even_row_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_odd_row")), (gtkui_get_listview_odd_row_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_selected_row")), (gtkui_get_listview_selection_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_text")), (gtkui_get_listview_text_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_selected_text")), (gtkui_get_listview_selected_text_color (&clr), &clr));
- gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_cursor")), (gtkui_get_listview_cursor_color (&clr), &clr));
-}
-
-static void
-unescape_forward_slash (const char *src, char *dst, int size) {
- char *start = dst;
- while (*src) {
- if (dst - start >= size - 1) {
- break;
- }
- if (*src == '\\' && *(src+1) == '/') {
- src++;
- }
- *dst++ = *src++;
- }
- *dst = 0;
-}
-
-void
-gtkui_run_preferences_dlg (void) {
- if (prefwin) {
- return;
- }
- deadbeef->conf_lock ();
- GtkWidget *w = prefwin = create_prefwin ();
- gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (mainwin));
-
- GtkComboBox *combobox = NULL;
-
- // output plugin selection
- combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_output_plugin"));
-
- const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", "ALSA output plugin");
- DB_output_t **out_plugs = deadbeef->plug_get_output_list ();
- for (int i = 0; out_plugsi; i++) {
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), out_plugsi->plugin.name);
- if (!strcmp (outplugname, out_plugsi->plugin.name)) {
- gtk_combo_box_set_active (combobox, i);
- }
- }
-
- // soundcard (output device) selection
- preferences_fill_soundcards ();
-
- g_signal_connect ((gpointer) combobox, "changed",
- G_CALLBACK (on_pref_output_plugin_changed),
- NULL);
- GtkWidget *pref_soundcard = lookup_widget (prefwin, "pref_soundcard");
- g_signal_connect ((gpointer) pref_soundcard, "changed",
- G_CALLBACK (on_pref_soundcard_changed),
- NULL);
-
- // replaygain_mode
- combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_replaygain_mode"));
- gtk_combo_box_set_active (combobox, deadbeef->conf_get_int ("replaygain_mode", 0));
-
- // replaygain_scale
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "pref_replaygain_scale")), deadbeef->conf_get_int ("replaygain_scale", 1));
-
- // replaygain_preamp
- gtk_range_set_value (GTK_RANGE (lookup_widget (w, "replaygain_preamp")), deadbeef->conf_get_int ("replaygain_preamp", 0));
-
- // global_preamp
- gtk_range_set_value (GTK_RANGE (lookup_widget (w, "global_preamp")), deadbeef->conf_get_int ("global_preamp", 0));
-
- // 8_to_16
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "convert8to16")), deadbeef->conf_get_int ("streamer.8_to_16", 1));
-
- // 16_to_24
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "convert16to24")), deadbeef->conf_get_int ("streamer.16_to_24", 0));
-
- // dsp
- dsp_setup_init (prefwin);
-
- // close_send_to_tray
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "pref_close_send_to_tray")), deadbeef->conf_get_int ("close_send_to_tray", 0));
-
- // hide tray icon
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "hide_tray_icon")), deadbeef->conf_get_int ("gtkui.hide_tray_icon", 0));
-
- // mmb_delete_playlist
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "mmb_delete_playlist")), deadbeef->conf_get_int ("gtkui.mmb_delete_playlist", 1));
-
- // embolden current track
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "embolden_current")), deadbeef->conf_get_int ("gtkui.embolden_current_track", 0));
-
- // hide_delete_from_disk
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "hide_delete_from_disk")), deadbeef->conf_get_int ("gtkui.hide_remove_from_disk", 0));
-
- // auto-rename playlist from folder name
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "auto_name_playlist_from_folder")), deadbeef->conf_get_int ("gtkui.name_playlist_from_folder", 1));
-
- // refresh rate
- int val = deadbeef->conf_get_int ("gtkui.refresh_rate", 10);
- gtk_range_set_value (GTK_RANGE (lookup_widget (w, "gui_fps")), val);
-
- // add from archives
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "ignore_archives")), deadbeef->conf_get_int ("ignore_archives", 1));
-
- // reset autostop
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "reset_autostop")), deadbeef->conf_get_int ("playlist.stop_after_current_reset", 0));
-
- // reset album autostop
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "reset_autostopalbum")), deadbeef->conf_get_int ("playlist.stop_after_album_reset", 0));
-
- // titlebar text
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "titlebar_format_playing")), deadbeef->conf_get_str_fast ("gtkui.titlebar_playing", "%a - %t - DeaDBeeF-%V"));
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "titlebar_format_stopped")), deadbeef->conf_get_str_fast ("gtkui.titlebar_stopped", "DeaDBeeF-%V"));
-
- // cli playlist
- int active = deadbeef->conf_get_int ("cli_add_to_specific_playlist", 1);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (prefwin, "cli_add_to_playlist")), active);
- gtk_widget_set_sensitive (lookup_widget (prefwin, "cli_playlist_name"), active);
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (prefwin, "cli_playlist_name")), deadbeef->conf_get_str_fast ("cli_add_playlist_name", "Default"));
-
- // resume last session
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "resume_last_session")), deadbeef->conf_get_int ("resume_last_session", 0));
-
- // enable shift-jis recoding
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "enable_shift_jis_recoding")), deadbeef->conf_get_int ("junk.enable_shift_jis_detection", 0));
-
- // enable cp1251 recoding
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "enable_cp1251_recoding")), deadbeef->conf_get_int ("junk.enable_cp1251_detection", 1));
-
- // enable cp936 recoding
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "enable_cp936_recoding")), deadbeef->conf_get_int ("junk.enable_cp936_detection", 0));
-
- // enable auto-sizing of columns
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "auto_size_columns")), deadbeef->conf_get_int ("gtkui.autoresize_columns", 0));
-
- // fill gui plugin list
- combobox = GTK_COMBO_BOX (lookup_widget (w, "gui_plugin"));
- const char **names = deadbeef->plug_get_gui_names ();
- for (int i = 0; namesi; i++) {
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), namesi);
- if (!strcmp (namesi, deadbeef->conf_get_str_fast ("gui_plugin", "GTK2"))) {
- gtk_combo_box_set_active (combobox, i);
- }
- }
-
- // override bar colors
- int override = deadbeef->conf_get_int ("gtkui.override_bar_colors", 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (prefwin, "override_bar_colors")), override);
- gtk_widget_set_sensitive (lookup_widget (prefwin, "bar_colors_group"), override);
-
- // override tabstrip colors
- override = deadbeef->conf_get_int ("gtkui.override_tabstrip_colors", 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (prefwin, "override_tabstrip_colors")), override);
- gtk_widget_set_sensitive (lookup_widget (prefwin, "tabstrip_colors_group"), override);
-
- // override listview colors
- override = deadbeef->conf_get_int ("gtkui.override_listview_colors", 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (prefwin, "override_listview_colors")), override);
- gtk_widget_set_sensitive (lookup_widget (prefwin, "listview_colors_group"), override);
-
- // colors
- prefwin_init_theme_colors ();
-
- // network
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (w, "pref_network_enableproxy")), deadbeef->conf_get_int ("network.proxy", 0));
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "pref_network_proxyaddress")), deadbeef->conf_get_str_fast ("network.proxy.address", ""));
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "pref_network_proxyport")), deadbeef->conf_get_str_fast ("network.proxy.port", "8080"));
- combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_network_proxytype"));
- const char *type = deadbeef->conf_get_str_fast ("network.proxy.type", "HTTP");
- if (!strcasecmp (type, "HTTP")) {
- gtk_combo_box_set_active (combobox, 0);
- }
- else if (!strcasecmp (type, "HTTP_1_0")) {
- gtk_combo_box_set_active (combobox, 1);
- }
- else if (!strcasecmp (type, "SOCKS4")) {
- gtk_combo_box_set_active (combobox, 2);
- }
- else if (!strcasecmp (type, "SOCKS5")) {
- gtk_combo_box_set_active (combobox, 3);
- }
- else if (!strcasecmp (type, "SOCKS4A")) {
- gtk_combo_box_set_active (combobox, 4);
- }
- else if (!strcasecmp (type, "SOCKS5_HOSTNAME")) {
- gtk_combo_box_set_active (combobox, 5);
- }
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "proxyuser")), deadbeef->conf_get_str_fast ("network.proxy.username", ""));
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "proxypassword")), deadbeef->conf_get_str_fast ("network.proxy.password", ""));
-
- char ua100;
- deadbeef->conf_get_str ("network.http_user_agent", "deadbeef", ua, sizeof (ua));
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "useragent")), ua);
-
- // list of plugins
- GtkTreeView *tree = GTK_TREE_VIEW (lookup_widget (w, "pref_pluginlist"));
- GtkCellRenderer *rend_text = gtk_cell_renderer_text_new ();
-#if 0
- GtkCellRenderer *rend_toggle = gtk_cell_renderer_toggle_new ();
- GtkListStore *store = gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_BOOLEAN);
- g_signal_connect ((gpointer)rend_toggle, "toggled",
- G_CALLBACK (on_plugin_active_toggled),
- store);
- GtkTreeViewColumn *col1 = gtk_tree_view_column_new_with_attributes ("Active", rend_toggle, "active", 0, "activatable", 2, NULL);
- GtkTreeViewColumn *col2 = gtk_tree_view_column_new_with_attributes ("Title", rend_text, "text", 1, NULL);
- gtk_tree_view_append_column (tree, col1);
- gtk_tree_view_append_column (tree, col2);
- DB_plugin_t **plugins = deadbeef->plug_get_list ();
- int i;
- for (i = 0; pluginsi; i++) {
- GtkTreeIter it;
- gtk_list_store_append (store, &it);
- gtk_list_store_set (store, &it, 0, pluginsi->inactive ? FALSE : TRUE, 1, pluginsi->name, 2, pluginsi->nostop ? FALSE : TRUE, -1);
- }
-#else
- GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
- GtkTreeViewColumn *col2 = gtk_tree_view_column_new_with_attributes (_("Title"), rend_text, "text", 0, NULL);
- gtk_tree_view_append_column (tree, col2);
- DB_plugin_t **plugins = deadbeef->plug_get_list ();
- int i;
- for (i = 0; pluginsi; i++) {
- GtkTreeIter it;
- gtk_list_store_append (store, &it);
- gtk_list_store_set (store, &it, 0, pluginsi->name, -1);
- }
-#endif
- gtk_tree_view_set_model (tree, GTK_TREE_MODEL (store));
-
- gtk_widget_set_sensitive (lookup_widget (prefwin, "configure_plugin"), FALSE);
-
- // hotkeys
- prefwin_init_hotkeys (prefwin);
-
- deadbeef->conf_unlock ();
- for (;;) {
- gtk_dialog_run (GTK_DIALOG (prefwin));
- if (gtkui_hotkeys_changed) {
- GtkWidget *dlg = gtk_message_dialog_new (GTK_WINDOW (prefwin), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("You modified the hotkeys settings, but didn't save your changes."));
- gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefwin));
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), _("Are you sure you want to continue without saving?"));
- gtk_window_set_title (GTK_WINDOW (dlg), _("Warning"));
- int response = gtk_dialog_run (GTK_DIALOG (dlg));
- gtk_widget_destroy (dlg);
- if (response == GTK_RESPONSE_YES) {
- break;
- }
- }
- else {
- break;
- }
- }
- dsp_setup_free ();
- gtk_widget_destroy (prefwin);
- deadbeef->conf_save ();
- prefwin = NULL;
-}
-
-void
-on_pref_soundcard_changed (GtkComboBox *combobox,
- gpointer user_data)
-{
- int active = gtk_combo_box_get_active (combobox);
- if (active >= 0 && active < num_alsa_devices) {
- deadbeef->conf_lock ();
- const char *soundcard = deadbeef->conf_get_str_fast ("alsa_soundcard", "default");
- if (strcmp (soundcard, alsa_device_namesactive)) {
- deadbeef->conf_set_str ("alsa_soundcard", alsa_device_namesactive);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- }
- deadbeef->conf_unlock ();
- }
-}
-
-void
-on_pref_output_plugin_changed (GtkComboBox *combobox,
- gpointer user_data)
-{
- int active = gtk_combo_box_get_active (combobox);
-
- DB_output_t **out_plugs = deadbeef->plug_get_output_list ();
- DB_output_t *prev = NULL;
- DB_output_t *new = NULL;
-
- deadbeef->conf_lock ();
- const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", "ALSA output plugin");
- for (int i = 0; out_plugsi; i++) {
- if (!strcmp (out_plugsi->plugin.name, outplugname)) {
- prev = out_plugsi;
- }
- if (i == active) {
- new = out_plugsi;
- }
- }
- deadbeef->conf_unlock ();
-
- if (!new) {
- fprintf (stderr, "failed to find output plugin selected in preferences window\n");
- }
- else {
- if (prev != new) {
- deadbeef->conf_set_str ("output_plugin", new->plugin.name);
- deadbeef->sendmessage (DB_EV_REINIT_SOUND, 0, 0, 0);
- }
- }
-}
-
-void
-on_pref_replaygain_mode_changed (GtkComboBox *combobox,
- gpointer user_data)
-{
- int active = gtk_combo_box_get_active (combobox);
- deadbeef->conf_set_int ("replaygain_mode", active == -1 ? 0 : active);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_pref_replaygain_scale_clicked (GtkButton *button,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
- deadbeef->conf_set_int ("replaygain_scale", active);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_replaygain_preamp_value_changed (GtkRange *range,
- gpointer user_data)
-{
- float val = gtk_range_get_value (range);
- deadbeef->conf_set_float ("replaygain_preamp", val);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_global_preamp_value_changed (GtkRange *range,
- gpointer user_data)
-{
- float val = gtk_range_get_value (range);
- deadbeef->conf_set_float ("global_preamp", val);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_pref_close_send_to_tray_clicked (GtkButton *button,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
- deadbeef->conf_set_int ("close_send_to_tray", active);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_hide_tray_icon_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (togglebutton);
- deadbeef->conf_set_int ("gtkui.hide_tray_icon", active);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_mmb_delete_playlist_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- deadbeef->conf_set_int ("gtkui.mmb_delete_playlist", gtk_toggle_button_get_active (togglebutton));
-}
-
-void
-on_pref_pluginlist_cursor_changed (GtkTreeView *treeview,
- gpointer user_data)
-{
- GtkTreePath *path;
- GtkTreeViewColumn *col;
- gtk_tree_view_get_cursor (treeview, &path, &col);
- if (!path || !col) {
- // reset
- return;
- }
- int *indices = gtk_tree_path_get_indices (path);
- DB_plugin_t **plugins = deadbeef->plug_get_list ();
- DB_plugin_t *p = plugins*indices;
- g_free (indices);
- assert (p);
- GtkWidget *w = prefwin;
- assert (w);
-
- char s20;
- snprintf (s, sizeof (s), "%d.%d", p->version_major, p->version_minor);
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "plug_version")), s);
-
- if (p->descr) {
- GtkTextView *tv = GTK_TEXT_VIEW (lookup_widget (w, "plug_description"));
-
- GtkTextBuffer *buffer = gtk_text_buffer_new (NULL);
-
- gtk_text_buffer_set_text (buffer, p->descr, strlen(p->descr));
- gtk_text_view_set_buffer (GTK_TEXT_VIEW (tv), buffer);
- g_object_unref (buffer);
- }
-
- GtkWidget *link = lookup_widget (w, "weblink");
- if (p->website) {
- gtk_link_button_set_uri (GTK_LINK_BUTTON(link), p->website);
- gtk_widget_set_sensitive (link, TRUE);
- }
- else {
- gtk_link_button_set_uri (GTK_LINK_BUTTON(link), "");
- gtk_widget_set_sensitive (link, FALSE);
- }
-
- GtkWidget *cpr = lookup_widget (w, "plug_copyright");
- if (p->copyright) {
- gtk_widget_set_sensitive (cpr, TRUE);
- }
- else {
- gtk_widget_set_sensitive (cpr, FALSE);
- }
-
- gtk_widget_set_sensitive (lookup_widget (prefwin, "configure_plugin"), p->configdialog ? TRUE : FALSE);
-}
-
-void
-gtkui_conf_get_str (const char *key, char *value, int len, const char *def) {
- deadbeef->conf_get_str (key, def, value, len);
-}
-
-void
-on_configure_plugin_clicked (GtkButton *button,
- gpointer user_data)
-{
- GtkWidget *w = prefwin;
- GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (w, "pref_pluginlist"));
- GtkTreePath *path;
- GtkTreeViewColumn *col;
- gtk_tree_view_get_cursor (treeview, &path, &col);
- if (!path || !col) {
- // reset
- return;
- }
- int *indices = gtk_tree_path_get_indices (path);
- DB_plugin_t **plugins = deadbeef->plug_get_list ();
- DB_plugin_t *p = plugins*indices;
- if (p->configdialog) {
- ddb_dialog_t conf = {
- .title = p->name,
- .layout = p->configdialog,
- .set_param = deadbeef->conf_set_str,
- .get_param = gtkui_conf_get_str,
- };
- gtkui_run_dialog (prefwin, &conf, 0, NULL, NULL);
- }
-}
-
-void
-on_tabstrip_light_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.tabstrip_light", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- gtk_widget_queue_draw (mainwin);
-}
-
-
-void
-on_tabstrip_mid_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.tabstrip_mid", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- gtk_widget_queue_draw (mainwin);
-}
-
-
-void
-on_tabstrip_dark_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.tabstrip_dark", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- gtk_widget_queue_draw (mainwin);
-}
-
-void
-on_tabstrip_base_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.tabstrip_base", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- gtk_widget_queue_draw (mainwin);
-}
-
-void
-on_tabstrip_text_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.tabstrip_text", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- gtk_widget_queue_draw (mainwin);
-}
-
-void
-on_bar_foreground_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.bar_foreground", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- gtk_widget_queue_draw (mainwin);
-}
-
-
-void
-on_bar_background_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.bar_background", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- gtk_widget_queue_draw (mainwin);
-}
-
-void
-on_override_listview_colors_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (togglebutton);
- deadbeef->conf_set_int ("gtkui.override_listview_colors", active);
- gtk_widget_set_sensitive (lookup_widget (prefwin, "listview_colors_group"), active);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- prefwin_init_theme_colors ();
- playlist_refresh ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-}
-
-
-void
-on_listview_even_row_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.listview_even_row", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- playlist_refresh ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-}
-
-void
-on_listview_odd_row_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.listview_odd_row", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- playlist_refresh ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-}
-
-void
-on_listview_selected_row_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.listview_selection", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- playlist_refresh ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-}
-
-void
-on_listview_text_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.listview_text", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- playlist_refresh ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-}
-
-
-void
-on_listview_selected_text_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.listview_selected_text", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- playlist_refresh ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-}
-
-void
-on_listview_cursor_color_set (GtkColorButton *colorbutton,
- gpointer user_data)
-{
- GdkColor clr;
- gtk_color_button_get_color (colorbutton, &clr);
- char str100;
- snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
- deadbeef->conf_set_str ("gtkui.color.listview_cursor", str);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- playlist_refresh ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
-}
-
-
-void
-on_override_bar_colors_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (togglebutton);
- deadbeef->conf_set_int ("gtkui.override_bar_colors", active);
- gtk_widget_set_sensitive (lookup_widget (prefwin, "bar_colors_group"), active);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- prefwin_init_theme_colors ();
- eq_redraw ();
-}
-
-void
-on_override_tabstrip_colors_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (togglebutton);
- deadbeef->conf_set_int ("gtkui.override_tabstrip_colors", active);
- gtk_widget_set_sensitive (lookup_widget (prefwin, "tabstrip_colors_group"), active);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- gtkui_init_theme_colors ();
- prefwin_init_theme_colors ();
- gtk_widget_queue_draw (mainwin);
-}
-
-void
-on_pref_network_proxyaddress_changed (GtkEditable *editable,
- gpointer user_data)
-{
- deadbeef->conf_set_str ("network.proxy.address", gtk_entry_get_text (GTK_ENTRY (editable)));
-}
-
-
-void
-on_pref_network_enableproxy_clicked (GtkButton *button,
- gpointer user_data)
-{
- deadbeef->conf_set_int ("network.proxy", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)));
-}
-
-
-void
-on_pref_network_proxyport_changed (GtkEditable *editable,
- gpointer user_data)
-{
- deadbeef->conf_set_int ("network.proxy.port", atoi (gtk_entry_get_text (GTK_ENTRY (editable))));
-}
-
-
-void
-on_pref_network_proxytype_changed (GtkComboBox *combobox,
- gpointer user_data)
-{
-
- int active = gtk_combo_box_get_active (combobox);
- switch (active) {
- case 0:
- deadbeef->conf_set_str ("network.proxy.type", "HTTP");
- break;
- case 1:
- deadbeef->conf_set_str ("network.proxy.type", "HTTP_1_0");
- break;
- case 2:
- deadbeef->conf_set_str ("network.proxy.type", "SOCKS4");
- break;
- case 3:
- deadbeef->conf_set_str ("network.proxy.type", "SOCKS5");
- break;
- case 4:
- deadbeef->conf_set_str ("network.proxy.type", "SOCKS4A");
- break;
- case 5:
- deadbeef->conf_set_str ("network.proxy.type", "SOCKS5_HOSTNAME");
- break;
- default:
- deadbeef->conf_set_str ("network.proxy.type", "HTTP");
- break;
- }
-}
-
-void
-on_proxyuser_changed (GtkEditable *editable,
- gpointer user_data)
-{
- deadbeef->conf_set_str ("network.proxy.username", gtk_entry_get_text (GTK_ENTRY (editable)));
-}
-
-
-void
-on_proxypassword_changed (GtkEditable *editable,
- gpointer user_data)
-{
- deadbeef->conf_set_str ("network.proxy.password", gtk_entry_get_text (GTK_ENTRY (editable)));
-}
-
-
-void
-on_embolden_current_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
- deadbeef->conf_set_int ("gtkui.embolden_current_track", active);
- gtkui_embolden_current_track = active;
- playlist_refresh ();
-}
-
-void
-on_hide_delete_from_disk_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
- deadbeef->conf_set_int ("gtkui.hide_remove_from_disk", active);
-}
-
-void
-on_titlebar_format_playing_changed (GtkEditable *editable,
- gpointer user_data)
-{
- deadbeef->conf_set_str ("gtkui.titlebar_playing", gtk_entry_get_text (GTK_ENTRY (editable)));
- gtkui_set_titlebar (NULL);
-}
-
-
-void
-on_titlebar_format_stopped_changed (GtkEditable *editable,
- gpointer user_data)
-{
- deadbeef->conf_set_str ("gtkui.titlebar_stopped", gtk_entry_get_text (GTK_ENTRY (editable)));
- gtkui_set_titlebar (NULL);
-}
-
-void
-on_cli_add_to_playlist_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
- deadbeef->conf_set_int ("cli_add_to_specific_playlist", active);
- gtk_widget_set_sensitive (lookup_widget (prefwin, "cli_playlist_name"), active);
-}
-
-
-void
-on_cli_playlist_name_changed (GtkEditable *editable,
- gpointer user_data)
-{
- deadbeef->conf_set_str ("cli_add_playlist_name", gtk_entry_get_text (GTK_ENTRY (editable)));
-}
-
-void
-on_resume_last_session_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
- deadbeef->conf_set_int ("resume_last_session", active);
-}
-
-void
-on_enable_shift_jis_recoding_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
- deadbeef->conf_set_int ("junk.enable_shift_jis_detection", active);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_enable_cp1251_recoding_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
- deadbeef->conf_set_int ("junk.enable_cp1251_detection", active);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-
-void
-on_enable_cp936_recoding_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
- deadbeef->conf_set_int ("junk.enable_cp936_detection", active);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-
-void
-on_auto_name_playlist_from_folder_toggled
- (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
- deadbeef->conf_set_int ("gtkui.name_playlist_from_folder", active);
-}
-
-static void
-show_copyright_window (const char *text, const char *title, GtkWidget **pwindow) {
- if (*pwindow) {
- return;
- }
- GtkWidget *widget = *pwindow = create_helpwindow ();
- g_object_set_data (G_OBJECT (widget), "pointer", pwindow);
- g_signal_connect (widget, "delete_event", G_CALLBACK (on_gtkui_info_window_delete), pwindow);
- gtk_window_set_title (GTK_WINDOW (widget), title);
- gtk_window_set_transient_for (GTK_WINDOW (widget), GTK_WINDOW (prefwin));
- GtkWidget *txt = lookup_widget (widget, "helptext");
- GtkTextBuffer *buffer = gtk_text_buffer_new (NULL);
-
- gtk_text_buffer_set_text (buffer, text, strlen(text));
- gtk_text_view_set_buffer (GTK_TEXT_VIEW (txt), buffer);
- g_object_unref (buffer);
- gtk_widget_show (widget);
-}
-
-static GtkWidget *copyright_window;
-
-void
-on_plug_copyright_clicked (GtkButton *button,
- gpointer user_data)
-{
- GtkTreeView *treeview = GTK_TREE_VIEW(lookup_widget (prefwin, "pref_pluginlist"));
- GtkTreePath *path;
- GtkTreeViewColumn *col;
- gtk_tree_view_get_cursor (treeview, &path, &col);
- if (!path || !col) {
- // reset
- return;
- }
- int *indices = gtk_tree_path_get_indices (path);
- DB_plugin_t **plugins = deadbeef->plug_get_list ();
- DB_plugin_t *p = plugins*indices;
- g_free (indices);
- assert (p);
-
- if (p->copyright) {
- show_copyright_window (p->copyright, "Copyright", &copyright_window);
- }
-}
-
-gboolean
-on_prefwin_configure_event (GtkWidget *widget,
- GdkEventConfigure *event,
- gpointer user_data)
-{
- wingeom_save (widget, "prefwin");
- return FALSE;
-}
-
-
-gboolean
-on_prefwin_window_state_event (GtkWidget *widget,
- GdkEventWindowState *event,
- gpointer user_data)
-{
- wingeom_save_max (event, widget, "prefwin");
- return FALSE;
-}
-
-
-void
-on_prefwin_realize (GtkWidget *widget,
- gpointer user_data)
-{
- wingeom_restore (widget, "prefwin", -1, -1, -1, -1, 0);
-}
-
-void
-on_gui_plugin_changed (GtkComboBox *combobox,
- gpointer user_data)
-{
- gchar *txt = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combobox));
- if (txt) {
- deadbeef->conf_set_str ("gui_plugin", txt);
- g_free (txt);
- }
-}
-
-void
-on_gui_fps_value_changed (GtkRange *range,
- gpointer user_data)
-{
- int val = gtk_range_get_value (range);
- deadbeef->conf_set_int ("gtkui.refresh_rate", val);
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_ignore_archives_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
-
- deadbeef->conf_set_int ("ignore_archives", gtk_toggle_button_get_active (togglebutton));
-}
-
-void
-on_reset_autostop_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- deadbeef->conf_set_int ("playlist.stop_after_current_reset", gtk_toggle_button_get_active (togglebutton));
-}
-
-void
-on_reset_autostopalbum_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- deadbeef->conf_set_int ("playlist.stop_after_album_reset", gtk_toggle_button_get_active (togglebutton));
-}
-
-
-
-void
-on_convert8to16_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- deadbeef->conf_set_int ("streamer.8_to_16", gtk_toggle_button_get_active (togglebutton));
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_convert16to24_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- deadbeef->conf_set_int ("streamer.16_to_24", gtk_toggle_button_get_active (togglebutton));
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_useragent_changed (GtkEditable *editable,
- gpointer user_data)
-{
- deadbeef->conf_set_str ("network.http_user_agent", gtk_entry_get_text (GTK_ENTRY (editable)));
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
-}
-
-void
-on_auto_size_columns_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- deadbeef->conf_set_int ("gtkui.autoresize_columns", gtk_toggle_button_get_active (togglebutton));
-}
-

deadbeef-0.6.2.tar.bz2/plugins/gtkui/retina.m Deleted

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff Deleted

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/AUTHORS Deleted

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/COPYING Deleted

@@ -1,352 +0,0 @@
-This copy of libmp4ff has been modified specifically for DeaDBeeF Player.
-Modifications (C) 2009-20014 Alexey Yakovenko.
-
-Any non-GPL usage of this software or parts of this software is strictly
-forbidden.
-
-Commercial non-GPL licensing of this software is possible.
-For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
-
-
-
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-&#xc;
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-&#xc;
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-&#xc;
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-&#xc;
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-&#xc;
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- 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
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/Makefile.am Deleted

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/Makefile.in Deleted

@@ -1,741 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 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@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\\ \	*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -dEDm) skip_next=yes;; \
- -JT) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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/libmp4ff
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/depcomp AUTHORS COPYING README
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/intmax.m4 \
-	$(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(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 =
-LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
-AM_V_AR = $(am__v_AR_@AM_V@)
-am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo " AR " $@;
-am__v_AR_1 = 
-libmp4ff_a_AR = $(AR) $(ARFLAGS)
-libmp4ff_a_LIBADD =
-am_libmp4ff_a_OBJECTS = mp4atom.$(OBJEXT) mp4ff.$(OBJEXT) \
-	mp4meta.$(OBJEXT) mp4sample.$(OBJEXT) mp4tagupdate.$(OBJEXT) \
-	mp4util.$(OBJEXT)
-libmp4ff_a_OBJECTS = $(am_libmp4ff_a_OBJECTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-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)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-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_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 = 
-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_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 = 
-SOURCES = $(libmp4ff_a_SOURCES)
-DIST_SOURCES = $(libmp4ff_a_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items$$0 = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-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_CFLAGS = @CDDA_CFLAGS@
-CDDA_LIBS = @CDDA_LIBS@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-COREAUDIO_LIBS = @COREAUDIO_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURL_CFLAGS = @CURL_CFLAGS@
-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_CFLAGS = @FAAD2_CFLAGS@
-FAAD2_LIBS = @FAAD2_LIBS@
-FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
-FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
-FGREP = @FGREP@
-FLAC_CFLAGS = @FLAC_CFLAGS@
-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@
-GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
-GTK_MAC_LIBS = @GTK_MAC_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_CFLAGS = @HOTKEYS_CFLAGS@
-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@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBS = @INTL_LIBS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JPEG_DEPS_CFLAGS = @JPEG_DEPS_CFLAGS@
-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_CFLAGS = @MAD_CFLAGS@
-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@
-NOCPPLIB = @NOCPPLIB@
-NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
-NOTIFY_LIBS = @NOTIFY_LIBS@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_CFLAGS = @OGG_CFLAGS@
-OGG_LIBS = @OGG_LIBS@
-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_CFLAGS = @PNG_DEPS_CFLAGS@
-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_CFLAGS = @SNDFILE_CFLAGS@
-SNDFILE_LIBS = @SNDFILE_LIBS@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
-VFS_CURL_LIBS = @VFS_CURL_LIBS@
-VORBIS_CFLAGS = @VORBIS_CFLAGS@
-VORBIS_LIBS = @VORBIS_LIBS@
-WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
-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_CFLAGS = @ZIP_CFLAGS@
-ZIP_LIBS = @ZIP_LIBS@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
-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@
-ac_ct_OBJC = @ac_ct_OBJC@
-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@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-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@
-noinst_LIBRARIES = libmp4ff.a
-libmp4ff_a_SOURCES = \
-	mp4atom.c\
-	mp4ff.c\
-	mp4ff.h\
-	mp4ffint.h\
-	mp4ff_int_types.h\
-	mp4meta.c\
-	mp4sample.c\
-	mp4tagupdate.c\
-	mp4util.c
-
-AM_CFLAGS = -fPIC -DUSE_TAGGING
-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/libmp4ff/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu plugins/libmp4ff/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):
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-libmp4ff.a: $(libmp4ff_a_OBJECTS) $(libmp4ff_a_DEPENDENCIES) $(EXTRA_libmp4ff_a_DEPENDENCIES) 
-	$(AM_V_at)-rm -f libmp4ff.a
-	$(AM_V_AR)$(libmp4ff_a_AR) libmp4ff.a $(libmp4ff_a_OBJECTS) $(libmp4ff_a_LIBADD)
-	$(AM_V_at)$(RANLIB) libmp4ff.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp4atom.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp4ff.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp4meta.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp4sample.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp4tagupdate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp4util.Po@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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	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-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	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"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	 *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	 if test -f "$$i"; then \
-	 echo "$(subdir)/$$i"; \
-	 else \
-	 echo "$$sdir/$$i"; \
-	 fi; \
-	done >> $(top_builddir)/cscope.files
-
-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 $(LIBRARIES)
-installdirs:
-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:
-	if test -z '$(STRIP)'; then \
-	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 install; \
-	else \
-	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-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-noinstLIBRARIES \
-	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-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:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
-	ctags-am 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-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 tags-am uninstall uninstall-am
-
-
-# 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.6.2.tar.bz2/plugins/libmp4ff/README Deleted

@@ -1,97 +0,0 @@
-
-Freeware Advanced Audio (AAC) Decoder including SBR decoding
-http://www.audiocoding.com/
-
-FAAD2 is a HE, LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder.
-FAAD2 includes code for SBR (HE AAC) decoding.
-FAAD2 is licensed under the GPL.
-
-
-__________
-COPYRIGHTS
-
-For FAAD2 the following license applies:
-
-******************************************************************************
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-******************************************************************************
-
-
-Please note that the use of this software may require the payment of
-patent royalties. You need to consider this issue before you start
-building derivative works. We are not warranting or indemnifying you in
-any way for patent royalities! YOU ARE SOLELY RESPONSIBLE FOR YOUR OWN
-ACTIONS!
-
-
-______
-PEOPLE
-
-FAAD2 is written by:
- - M. Bakker (mbakker(at)nero.com).
-
-
-_______________
-VERSION HISTORY
-
-Sorry, try building a ChangeLog from CVS.
-
-___________________
-DIRECTORY STRUCTURE
-
-faad2 - top level directory.
-
-   aacDECdrop - windows decoder/player with drag'n'drop functionality
-
-   common - generally used libraries and code.
-
-      faad - general common functions like filereading and streaming
-             as well as getting info from aac files.
-
-      mp4ff - Small MP4 file format library (includes tagging abilities).
-      
-   frontend - command line frontend to the FAAD2 library, also supports
-              MPEG-4 file decoding.
-
-   include - inlude file for the FAAD2 library.
-
-   libfaad - the FAAD2 AAC decoder library including SBR.
-   
-      codebook - Huffman codebooks
-
-   plugins - plugins for all kinds of pograms.
-   
-      in_mp4 - winamp MPEG-4 AAC file input plugin.
-      
-      QCD - Quintessential player AAC plugin.
-
-      QCDMp4 - Quintessential player MP4 plugin.
-
-      xmms - xmms AAC plugin
-
-      mpeg4ip - plugin for the mpeg4ip player
-

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/mp4atom.c Deleted

@@ -1,1216 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-** 
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: mp4atom.c,v 1.29 2009/01/19 23:56:30 menno Exp $
-**/
-
-#include <stdlib.h>
-#ifndef _WIN32
-#include "config.h"
-#else
-#include <tchar.h>
-#include <windows.h>
-#endif
-#ifdef HAVE_GETPWUID
-# include <pwd.h>
-#endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#include "mp4ffint.h"
-#include <stdio.h>
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-#define min(x,y) ((x)<(y)?(x):(y))
-
-#define COPYRIGHT_SYMBOL ((int8_t)0xA9)
-
-/* parse atom header size */
-static int32_t mp4ff_atom_get_size(const int8_t *data)
-{
- uint32_t result;
- uint32_t a, b, c, d;
-
- a = (uint8_t)data0;
- b = (uint8_t)data1;
- c = (uint8_t)data2;
- d = (uint8_t)data3;
-
- result = (a<<24) | (b<<16) | (c<<8) | d;
- //if (result > 0 && result < 8) result = 8;
-
- return (int32_t)result;
-}
-
-/* comnapre 2 atom names, returns 1 for equal, 0 for unequal */
-static int32_t mp4ff_atom_compare(const int8_t a1, const int8_t b1, const int8_t c1, const int8_t d1,
- const int8_t a2, const int8_t b2, const int8_t c2, const int8_t d2)
-{
- if (a1 == a2 && b1 == b2 && c1 == c2 && d1 == d2)
- return 1;
- else
- return 0;
-}
-
-static uint8_t mp4ff_atom_name_to_type(const int8_t a, const int8_t b,
- const int8_t c, const int8_t d)
-{
- if (a == 'm')
- {
- if (mp4ff_atom_compare(a,b,c,d, 'm','o','o','v'))
- return ATOM_MOOV;
- else if (mp4ff_atom_compare(a,b,c,d, 'm','i','n','f'))
- return ATOM_MINF;
- else if (mp4ff_atom_compare(a,b,c,d, 'm','d','i','a'))
- return ATOM_MDIA;
- else if (mp4ff_atom_compare(a,b,c,d, 'm','d','a','t'))
- return ATOM_MDAT;
- else if (mp4ff_atom_compare(a,b,c,d, 'm','d','h','d'))
- return ATOM_MDHD;
- else if (mp4ff_atom_compare(a,b,c,d, 'm','v','h','d'))
- return ATOM_MVHD;
- else if (mp4ff_atom_compare(a,b,c,d, 'm','p','4','a'))
- return ATOM_MP4A;
- else if (mp4ff_atom_compare(a,b,c,d, 'm','p','4','v'))
- return ATOM_MP4V;
- else if (mp4ff_atom_compare(a,b,c,d, 'm','p','4','s'))
- return ATOM_MP4S;
- else if (mp4ff_atom_compare(a,b,c,d, 'm','e','t','a'))
- return ATOM_META;
- } else if (a == 't') {
- if (mp4ff_atom_compare(a,b,c,d, 't','r','a','k'))
- return ATOM_TRAK;
- else if (mp4ff_atom_compare(a,b,c,d, 't','k','h','d'))
- return ATOM_TKHD;
- else if (mp4ff_atom_compare(a,b,c,d, 't','r','e','f'))
- return ATOM_TREF;
- else if (mp4ff_atom_compare(a,b,c,d, 't','r','k','n'))
- return ATOM_TRACK;
- else if (mp4ff_atom_compare(a,b,c,d, 't','m','p','o'))
- return ATOM_TEMPO;
- else if (mp4ff_atom_compare(a,b,c,d, 't','v','n','n'))
- return ATOM_NETWORK;
- else if (mp4ff_atom_compare(a,b,c,d, 't','v','s','h'))
- return ATOM_SHOW;
- else if (mp4ff_atom_compare(a,b,c,d, 't','v','e','n'))
- return ATOM_EPISODENAME;
- else if (mp4ff_atom_compare(a,b,c,d, 't','v','s','n'))
- return ATOM_SEASON;
- else if (mp4ff_atom_compare(a,b,c,d, 't','v','e','s'))
- return ATOM_EPISODE;
- } else if (a == 's') {
- if (mp4ff_atom_compare(a,b,c,d, 's','t','b','l'))
- return ATOM_STBL;
- else if (mp4ff_atom_compare(a,b,c,d, 's','m','h','d'))
- return ATOM_SMHD;
- else if (mp4ff_atom_compare(a,b,c,d, 's','t','s','d'))
- return ATOM_STSD;
- else if (mp4ff_atom_compare(a,b,c,d, 's','t','t','s'))
- return ATOM_STTS;
- else if (mp4ff_atom_compare(a,b,c,d, 's','t','c','o'))
- return ATOM_STCO;
- else if (mp4ff_atom_compare(a,b,c,d, 'c','o','6','4'))
- return ATOM_STCO;
- else if (mp4ff_atom_compare(a,b,c,d, 's','t','s','c'))
- return ATOM_STSC;
- else if (mp4ff_atom_compare(a,b,c,d, 's','t','s','z'))
- return ATOM_STSZ;
- else if (mp4ff_atom_compare(a,b,c,d, 's','t','z','2'))
- return ATOM_STZ2;
- else if (mp4ff_atom_compare(a,b,c,d, 's','k','i','p'))
- return ATOM_SKIP;
- else if (mp4ff_atom_compare(a,b,c,d, 's','i','n','f'))
- return ATOM_SINF;
- else if (mp4ff_atom_compare(a,b,c,d, 's','c','h','i'))
- return ATOM_SCHI;
- else if (mp4ff_atom_compare(a,b,c,d, 's','o','n','m'))
- return ATOM_SORTTITLE;
- else if (mp4ff_atom_compare(a,b,c,d, 's','o','a','l'))
- return ATOM_SORTALBUM;
- else if (mp4ff_atom_compare(a,b,c,d, 's','o','a','r'))
- return ATOM_SORTARTIST;
- else if (mp4ff_atom_compare(a,b,c,d, 's','o','a','a'))
- return ATOM_SORTALBUMARTIST;
- else if (mp4ff_atom_compare(a,b,c,d, 's','o','c','o'))
- return ATOM_SORTWRITER;
- else if (mp4ff_atom_compare(a,b,c,d, 's','o','s','n'))
- return ATOM_SORTSHOW;
- } else if (a == COPYRIGHT_SYMBOL) {
- if (mp4ff_atom_compare(a,b,c,d, COPYRIGHT_SYMBOL,'n','a','m'))
- return ATOM_TITLE;
- else if (mp4ff_atom_compare(a,b,c,d, COPYRIGHT_SYMBOL,'A','R','T'))
- return ATOM_ARTIST;
- else if (mp4ff_atom_compare(a,b,c,d, COPYRIGHT_SYMBOL,'w','r','t'))
- return ATOM_WRITER;
- else if (mp4ff_atom_compare(a,b,c,d, COPYRIGHT_SYMBOL,'a','l','b'))
- return ATOM_ALBUM;
- else if (mp4ff_atom_compare(a,b,c,d, COPYRIGHT_SYMBOL,'d','a','y'))
- return ATOM_DATE;
- else if (mp4ff_atom_compare(a,b,c,d, COPYRIGHT_SYMBOL,'t','o','o'))
- return ATOM_TOOL;
- else if (mp4ff_atom_compare(a,b,c,d, COPYRIGHT_SYMBOL,'c','m','t'))
- return ATOM_COMMENT;
- else if (mp4ff_atom_compare(a,b,c,d, COPYRIGHT_SYMBOL,'g','e','n'))
- return ATOM_GENRE1;
- else if (mp4ff_atom_compare(a,b,c,d, COPYRIGHT_SYMBOL,'g','r','p'))
- return ATOM_CONTENTGROUP;
- else if (mp4ff_atom_compare(a,b,c,d, COPYRIGHT_SYMBOL,'l','y','r'))
- return ATOM_LYRICS;
- }
-
- if (mp4ff_atom_compare(a,b,c,d, 'e','d','t','s'))
- return ATOM_EDTS;
- else if (mp4ff_atom_compare(a,b,c,d, 'e','s','d','s'))
- return ATOM_ESDS;
- else if (mp4ff_atom_compare(a,b,c,d, 'f','t','y','p'))
- return ATOM_FTYP;
- else if (mp4ff_atom_compare(a,b,c,d, 'f','r','e','e'))
- return ATOM_FREE;
- else if (mp4ff_atom_compare(a,b,c,d, 'h','m','h','d'))
- return ATOM_HMHD;
- else if (mp4ff_atom_compare(a,b,c,d, 'v','m','h','d'))
- return ATOM_VMHD;
- else if (mp4ff_atom_compare(a,b,c,d, 'u','d','t','a'))
- return ATOM_UDTA;
- else if (mp4ff_atom_compare(a,b,c,d, 'i','l','s','t'))
- return ATOM_ILST;
- else if (mp4ff_atom_compare(a,b,c,d, 'n','a','m','e'))
- return ATOM_NAME;
- else if (mp4ff_atom_compare(a,b,c,d, 'd','a','t','a'))
- return ATOM_DATA;
- else if (mp4ff_atom_compare(a,b,c,d, 'd','i','s','k'))
- return ATOM_DISC;
- else if (mp4ff_atom_compare(a,b,c,d, 'g','n','r','e'))
- return ATOM_GENRE2;
- else if (mp4ff_atom_compare(a,b,c,d, 'c','o','v','r'))
- return ATOM_COVER;
- else if (mp4ff_atom_compare(a,b,c,d, 'c','p','i','l'))
- return ATOM_COMPILATION;
- else if (mp4ff_atom_compare(a,b,c,d, 'c','t','t','s'))
- return ATOM_CTTS;
- else if (mp4ff_atom_compare(a,b,c,d, 'd','r','m','s'))
- return ATOM_DRMS;
- else if (mp4ff_atom_compare(a,b,c,d, 'f','r','m','a'))
- return ATOM_FRMA;
- else if (mp4ff_atom_compare(a,b,c,d, 'p','r','i','v'))
- return ATOM_PRIV;
- else if (mp4ff_atom_compare(a,b,c,d, 'i','v','i','v'))
- return ATOM_IVIV;
- else if (mp4ff_atom_compare(a,b,c,d, 'u','s','e','r'))
- return ATOM_USER;
- else if (mp4ff_atom_compare(a,b,c,d, 'k','e','y',' '))
- return ATOM_KEY;
- else if (mp4ff_atom_compare(a,b,c,d, 'a','A','R','T'))
- return ATOM_ALBUM_ARTIST;
- else if (mp4ff_atom_compare(a,b,c,d, 'd','e','s','c'))
- return ATOM_DESCRIPTION;
- else if (mp4ff_atom_compare(a,b,c,d, 'p','c','s','t'))
- return ATOM_PODCAST;
- else if (mp4ff_atom_compare(a,b,c,d, '-','-','-','-'))
- return ATOM_CUSTOM;
- else if (mp4ff_atom_compare(a,b,c,d, 'c','h','p','l'))
- return ATOM_CHPL;
- else if (mp4ff_atom_compare(a,b,c,d, 'c','h','a','p'))
- return ATOM_CHAP;
- else if (mp4ff_atom_compare(a,b,c,d, 't','e','x','t'))
- return ATOM_TEXT;
- else if (mp4ff_atom_compare(a,b,c,d, 's','u','b','p'))
- return ATOM_TEXT;
- else if (mp4ff_atom_compare(a,b,c,d, 't','x','3','g'))
- return ATOM_TEXT;
- else if (mp4ff_atom_compare(a,b,c,d, 's','b','t','l'))
- return ATOM_TEXT;
- else if (mp4ff_atom_compare(a,b,c,d, 'e','l','s','t'))
- return ATOM_ELST;
- else
- return ATOM_UNKNOWN;
-}
-
-/* read atom header, return atom size, atom size is with header included */
-uint64_t mp4ff_atom_read_header(mp4ff_t *f, uint8_t *atom_type, uint8_t *header_size)
-{
- uint64_t size;
- int32_t ret;
- int8_t atom_header8;
-
- ret = mp4ff_read_data(f, atom_header, 8);
- if (ret != 8)
- return 0;
-
- size = mp4ff_atom_get_size(atom_header);
- *header_size = 8;
-
- /* check for 64 bit atom size */
- if (size == 1)
- {
- *header_size = 16;
- size = mp4ff_read_int64(f);
- }
-
-// printf("%c%c%c%c\n", atom_header4, atom_header5, atom_header6, atom_header7);
-
- *atom_type = mp4ff_atom_name_to_type(atom_header4, atom_header5, atom_header6, atom_header7);
-
- return size;
-}
-
-static int32_t mp4ff_read_stsz(mp4ff_t *f)
-{
- trace ("mp4ff_read_stsz\n");
- mp4ff_read_char(f); /* version */
- mp4ff_read_int24(f); /* flags */
- f->trackf->total_tracks - 1->stsz_sample_size = mp4ff_read_int32(f);
- f->trackf->total_tracks - 1->stsz_sample_count = mp4ff_read_int32(f);
-
- if (f->trackf->total_tracks - 1->stsz_sample_size == 0)
- {
- int32_t i;
- f->trackf->total_tracks - 1->stsz_table = (int32_t*)malloc(f->trackf->total_tracks - 1->stsz_sample_count*sizeof(int32_t));
-
- for (i = 0; i < f->trackf->total_tracks - 1->stsz_sample_count; i++)
- {
- f->trackf->total_tracks - 1->stsz_tablei = mp4ff_read_int32(f);
- }
- }
-
- return 0;
-}
-
-static int32_t mp4ff_read_esds(mp4ff_t *f)
-{
- uint8_t tag;
- uint32_t temp;
-
- mp4ff_read_char(f); /* version */
- mp4ff_read_int24(f); /* flags */
-
- /* get and verify ES_DescrTag */
- tag = mp4ff_read_char(f);
- if (tag == 0x03)
- {
- /* read length */
- if (mp4ff_read_mp4_descr_length(f) < 5 + 15)
- {
- return 1;
- }
- /* skip 3 bytes */
- mp4ff_read_int24(f);
- } else {
- /* skip 2 bytes */
- mp4ff_read_int16(f);
- }
-
- /* get and verify DecoderConfigDescrTab */
- if (mp4ff_read_char(f) != 0x04)
- {
- return 1;
- }
-
- /* read length */
- temp = mp4ff_read_mp4_descr_length(f);
- if (temp < 13) return 1;
-
- f->trackf->total_tracks - 1->audioType = mp4ff_read_char(f);
- mp4ff_read_int32(f);//0x15000414 ????
- f->trackf->total_tracks - 1->maxBitrate = mp4ff_read_int32(f);
- f->trackf->total_tracks - 1->avgBitrate = mp4ff_read_int32(f);
-
- /* get and verify DecSpecificInfoTag */
- if (mp4ff_read_char(f) != 0x05)
- {
- return 1;
- }
-
- /* read length */
- f->trackf->total_tracks - 1->decoderConfigLen = mp4ff_read_mp4_descr_length(f);
-
- if (f->trackf->total_tracks - 1->decoderConfig)
- free(f->trackf->total_tracks - 1->decoderConfig);
- f->trackf->total_tracks - 1->decoderConfig = malloc(f->trackf->total_tracks - 1->decoderConfigLen);
- if (f->trackf->total_tracks - 1->decoderConfig)
- {
- mp4ff_read_data(f, f->trackf->total_tracks - 1->decoderConfig, f->trackf->total_tracks - 1->decoderConfigLen);
- } else {
- f->trackf->total_tracks - 1->decoderConfigLen = 0;
- }
-
- /* will skip the remainder of the atom */
- return 0;
-}
-
-static int32_t mp4ff_read_mp4a(mp4ff_t *f)
-{
- uint64_t size;
- int32_t i;
- uint8_t atom_type = 0;
- uint8_t header_size = 0;
-
- for (i = 0; i < 6; i++)
- {
- mp4ff_read_char(f); /* reserved */
- }
- /* data_reference_index */ mp4ff_read_int16(f);
-
- mp4ff_read_int32(f); /* reserved */
- mp4ff_read_int32(f); /* reserved */
-
- f->trackf->total_tracks - 1->channelCount = mp4ff_read_int16(f);
- f->trackf->total_tracks - 1->sampleSize = mp4ff_read_int16(f);
-
- mp4ff_read_int16(f);
- mp4ff_read_int16(f);
-
- f->trackf->total_tracks - 1->sampleRate = mp4ff_read_int16(f);
-
- mp4ff_read_int16(f);
-
- size = mp4ff_atom_read_header(f, &atom_type, &header_size);
- if (atom_type == ATOM_ESDS)
- {
- mp4ff_read_esds(f);
- }
-
- return 0;
-}
-
-static int32_t mp4ff_read_stsd(mp4ff_t *f)
-{
- int32_t i;
- uint8_t header_size = 0;
-
- mp4ff_read_char(f); /* version */
- mp4ff_read_int24(f); /* flags */
-
- f->trackf->total_tracks - 1->stsd_entry_count = mp4ff_read_int32(f);
-
- for (i = 0; i < f->trackf->total_tracks - 1->stsd_entry_count; i++)
- {
- uint64_t skip = mp4ff_position(f);
- uint64_t size;
- uint8_t atom_type = 0;
- size = mp4ff_atom_read_header(f, &atom_type, &header_size);
- skip += size;
-
- if (atom_type == ATOM_MP4A)
- {
- f->trackf->total_tracks - 1->type = TRACK_AUDIO;
- mp4ff_read_mp4a(f);
- } else if (atom_type == ATOM_MP4V) {
- f->trackf->total_tracks - 1->type = TRACK_VIDEO;
- } else if (atom_type == ATOM_MP4S) {
- f->trackf->total_tracks - 1->type = TRACK_SYSTEM;
- } else if (atom_type == ATOM_TEXT) {
- f->trackf->total_tracks - 1->type = TRACK_TEXT;
- } else {
- f->trackf->total_tracks - 1->type = TRACK_UNKNOWN;
- }
-
- mp4ff_set_position(f, skip);
- }
-
- return 0;
-}
-
-static int32_t mp4ff_read_stsc(mp4ff_t *f)
-{
- trace ("mp4ff_read_stsc\n");
- int32_t i;
-
- mp4ff_read_char(f); /* version */
- mp4ff_read_int24(f); /* flags */
- f->trackf->total_tracks - 1->stsc_entry_count = mp4ff_read_int32(f);
-
- f->trackf->total_tracks - 1->stsc_first_chunk =
- (int32_t*)malloc(f->trackf->total_tracks - 1->stsc_entry_count*sizeof(int32_t));
- f->trackf->total_tracks - 1->stsc_samples_per_chunk =
- (int32_t*)malloc(f->trackf->total_tracks - 1->stsc_entry_count*sizeof(int32_t));
- f->trackf->total_tracks - 1->stsc_sample_desc_index =
- (int32_t*)malloc(f->trackf->total_tracks - 1->stsc_entry_count*sizeof(int32_t));
-
- for (i = 0; i < f->trackf->total_tracks - 1->stsc_entry_count; i++)
- {
- f->trackf->total_tracks - 1->stsc_first_chunki = mp4ff_read_int32(f);
- f->trackf->total_tracks - 1->stsc_samples_per_chunki = mp4ff_read_int32(f);
- f->trackf->total_tracks - 1->stsc_sample_desc_indexi = mp4ff_read_int32(f);
- }
-
- return 0;
-}
-
-static int32_t mp4ff_read_stco(mp4ff_t *f)
-{
- int32_t i;
-
- mp4ff_read_char(f); /* version */
- mp4ff_read_int24(f); /* flags */
- f->trackf->total_tracks - 1->stco_entry_count = mp4ff_read_int32(f);
-
- f->trackf->total_tracks - 1->stco_chunk_offset =
- (int32_t*)malloc(f->trackf->total_tracks - 1->stco_entry_count*sizeof(int32_t));
-
- for (i = 0; i < f->trackf->total_tracks - 1->stco_entry_count; i++)
- {
- f->trackf->total_tracks - 1->stco_chunk_offseti = mp4ff_read_int32(f);
- }
-
- return 0;
-}
-
-static int32_t mp4ff_read_ctts(mp4ff_t *f)
-{
- int32_t i;
- mp4ff_track_t * p_track = f->trackf->total_tracks - 1;
-
- if (p_track->ctts_entry_count) return 0;
-
- mp4ff_read_char(f); /* version */
- mp4ff_read_int24(f); /* flags */
- p_track->ctts_entry_count = mp4ff_read_int32(f);
-
- p_track->ctts_sample_count = (int32_t*)malloc(p_track->ctts_entry_count * sizeof(int32_t));
- p_track->ctts_sample_offset = (int32_t*)malloc(p_track->ctts_entry_count * sizeof(int32_t));
-
- if (p_track->ctts_sample_count == 0 || p_track->ctts_sample_offset == 0)
- {
- if (p_track->ctts_sample_count) {free(p_track->ctts_sample_count);p_track->ctts_sample_count=0;}
- if (p_track->ctts_sample_offset) {free(p_track->ctts_sample_offset);p_track->ctts_sample_offset=0;}
- p_track->ctts_entry_count = 0;
- return 0;
- }
- else
- {
- for (i = 0; i < f->trackf->total_tracks - 1->ctts_entry_count; i++)
- {
- p_track->ctts_sample_counti = mp4ff_read_int32(f);
- p_track->ctts_sample_offseti = mp4ff_read_int32(f);
- }
- return 1;
- }
-}
-
-static int32_t mp4ff_read_stts(mp4ff_t *f)
-{
- trace ("mp4ff_read_stts\n");
- int32_t i;
- mp4ff_track_t * p_track = f->trackf->total_tracks - 1;
-
- if (p_track->stts_entry_count) return 0;
-
- mp4ff_read_char(f); /* version */
- mp4ff_read_int24(f); /* flags */
- p_track->stts_entry_count = mp4ff_read_int32(f);
-
- p_track->stts_sample_count = (int32_t*)malloc(p_track->stts_entry_count * sizeof(int32_t));
- p_track->stts_sample_delta = (int32_t*)malloc(p_track->stts_entry_count * sizeof(int32_t));
-
- if (p_track->stts_sample_count == 0 || p_track->stts_sample_delta == 0)
- {
- if (p_track->stts_sample_count) {free(p_track->stts_sample_count);p_track->stts_sample_count=0;}
- if (p_track->stts_sample_delta) {free(p_track->stts_sample_delta);p_track->stts_sample_delta=0;}
- p_track->stts_entry_count = 0;
- return 0;
- }
- else
- {
- for (i = 0; i < f->trackf->total_tracks - 1->stts_entry_count; i++)
- {
- p_track->stts_sample_counti = mp4ff_read_int32(f);
- p_track->stts_sample_deltai = mp4ff_read_int32(f);
- }
- return 1;
- }
-}
-
-static int32_t mp4ff_read_mvhd(mp4ff_t *f)
-{
- int32_t i;
-
- mp4ff_read_char(f); /* version */
- mp4ff_read_int24(f); /* flags */
- /* creation_time */ mp4ff_read_int32(f);
- /* modification_time */ mp4ff_read_int32(f);
- f->time_scale = mp4ff_read_int32(f);
- f->duration = mp4ff_read_int32(f);
- /* preferred_rate */ mp4ff_read_int32(f); /*mp4ff_read_fixed32(f);*/
- /* preferred_volume */ mp4ff_read_int16(f); /*mp4ff_read_fixed16(f);*/
- for (i = 0; i < 10; i++)
- {
- /* reserved */ mp4ff_read_char(f);
- }
- for (i = 0; i < 9; i++)
- {
- mp4ff_read_int32(f); /* matrix */
- }
- /* preview_time */ mp4ff_read_int32(f);
- /* preview_duration */ mp4ff_read_int32(f);
- /* poster_time */ mp4ff_read_int32(f);
- /* selection_time */ mp4ff_read_int32(f);
- /* selection_duration */ mp4ff_read_int32(f);
- /* current_time */ mp4ff_read_int32(f);
- /* next_track_id */ mp4ff_read_int32(f);
-
- return 0;
-}
-
-static int32_t mp4ff_read_tkhd(mp4ff_t *f)
-{
- uint8_t version;
- uint32_t flags;
- version = mp4ff_read_char(f); /* version */
- flags = mp4ff_read_int24(f); /* flags */
- if (version==1)
- {
- mp4ff_read_int64(f);//creation-time
- mp4ff_read_int64(f);//modification-time
- f->trackf->total_tracks - 1->id = mp4ff_read_int32(f);//track-id
- mp4ff_read_int32(f);//reserved
-// f->trackf->total_tracks - 1->duration = mp4ff_read_int64(f);//duration
- }
- else //version == 0
- {
- mp4ff_read_int32(f);//creation-time
- mp4ff_read_int32(f);//modification-time
- f->trackf->total_tracks - 1->id = mp4ff_read_int32(f);//track-id
- mp4ff_read_int32(f);//reserved
-// f->trackf->total_tracks - 1->duration = mp4ff_read_int32(f);//duration
-// if (f->trackf->total_tracks - 1->duration == 0xFFFFFFFF)
-// f->trackf->total_tracks - 1->duration = 0xFFFFFFFFFFFFFFFF;
-
- }
-#if 0
- mp4ff_read_int32(f);//reserved
- mp4ff_read_int32(f);//reserved
- mp4ff_read_int16(f);//layer
- mp4ff_read_int16(f);//pre-defined
- mp4ff_read_int16(f);//volume
- mp4ff_read_int16(f);//reserved
-
- //matrix
- mp4ff_read_int32(f); mp4ff_read_int32(f); mp4ff_read_int32(f);
- mp4ff_read_int32(f); mp4ff_read_int32(f); mp4ff_read_int32(f);
- mp4ff_read_int32(f); mp4ff_read_int32(f); mp4ff_read_int32(f);
- mp4ff_read_int32(f);//width
- mp4ff_read_int32(f);//height
-#endif
- return 1;
-}
-
-static int32_t mp4ff_read_mdhd(mp4ff_t *f)
-{
- uint32_t version;
-
- version = mp4ff_read_int32(f);
- if (version==1)
- {
- mp4ff_read_int64(f);//creation-time
- mp4ff_read_int64(f);//modification-time
- f->trackf->total_tracks - 1->timeScale = mp4ff_read_int32(f);//timescale
- f->trackf->total_tracks - 1->duration = mp4ff_read_int64(f);//duration
- }
- else //version == 0
- {
- uint32_t temp;
-
- mp4ff_read_int32(f);//creation-time
- mp4ff_read_int32(f);//modification-time
- f->trackf->total_tracks - 1->timeScale = mp4ff_read_int32(f);//timescale
- temp = mp4ff_read_int32(f);
- f->trackf->total_tracks - 1->duration = (temp == (uint32_t)(-1)) ? (uint64_t)(-1) : (uint64_t)(temp);
- }
- mp4ff_read_int16(f);
- mp4ff_read_int16(f);
- return 1;
-}
-#ifdef USE_TAGGING
-static int32_t mp4ff_read_meta(mp4ff_t *f, const uint64_t size)
-{
- uint64_t subsize, sumsize = 0;
- uint8_t atom_type;
- uint8_t header_size = 0;
-
- mp4ff_read_char(f); /* version */
- mp4ff_read_int24(f); /* flags */
-
- while (sumsize < (size-(header_size+4)))
- {
- subsize = mp4ff_atom_read_header(f, &atom_type, &header_size);
- if (subsize <= header_size+4)
- return 1;
- if (atom_type == ATOM_ILST)
- {
- mp4ff_parse_metadata(f, (uint32_t)(subsize-(header_size+4)));
- } else {
- mp4ff_set_position(f, mp4ff_position(f)+subsize-header_size);
- }
- sumsize += subsize;
- }
-
- return 0;
-}
-#endif
-
-static int32_t mp4ff_read_chpl(mp4ff_t *f, const uint64_t size)
-{
- int i;
- int i_read = size;
-
- mp4ff_read_char(f); /* version */
- mp4ff_read_int24(f); /* flags */
-
- mp4ff_chapterdata_t *p_chpl = &f->chapters;
-
- p_chpl->i_chapter = mp4ff_read_char (f);
- i_read -= 5;
-
- for( i = 0; i < p_chpl->i_chapter; i++ )
- {
- uint64_t i_start;
- uint8_t i_len;
- int i_copy;
- i_start = mp4ff_read_int64 (f);
- i_read -= 8;
- i_len = mp4ff_read_char (f);
- i_read -= 1;
-
- p_chpl->chapteri.psz_name = malloc( i_len + 1 );
- if( !p_chpl->chapteri.psz_name )
- goto error;
-
- i_copy = i_len < i_read ? i_len : i_read;
- if( i_copy > 0 )
- mp4ff_read_data (f, p_chpl->chapteri.psz_name, i_copy);
- p_chpl->chapteri.psz_namei_copy = '\0';
- p_chpl->chapteri.i_start = i_start;
-
- i_read -= i_copy;
- }
- /* Bubble sort by increasing start date */
- do
- {
- for( i = 0; i < p_chpl->i_chapter - 1; i++ )
- {
- if( p_chpl->chapteri.i_start > p_chpl->chapteri+1.i_start )
- {
- char *psz = p_chpl->chapteri+1.psz_name;
- int64_t i64 = p_chpl->chapteri+1.i_start;
-
- p_chpl->chapteri+1.psz_name = p_chpl->chapteri.psz_name;
- p_chpl->chapteri+1.i_start = p_chpl->chapteri.i_start;
-
- p_chpl->chapteri.psz_name = psz;
- p_chpl->chapteri.i_start = i64;
-
- i = -1;
- break;
- }
- }
- } while( i == -1 );
-
- return 0;
-
-error:
- return -1;
-}
-
-int32_t mp4ff_chapters_get_num_items (mp4ff_t *f)
-{
- return f->chapters.i_chapter;
-}
-
-const char *mp4ff_chapters_get_item (mp4ff_t *f, int i)
-{
- return f->chapters.chapteri.psz_name;
-}
-
-void mp4ff_chapters_free (mp4ff_t *f)
-{
- int i;
- for (i = 0; i < f->chapters.i_chapter; i++)
- {
- free (f->chapters.chapteri.psz_name);
- f->chapters.chapteri.psz_name = NULL;
- }
-}
-
-static int32_t mp4ff_read_tref(mp4ff_t *f, const uint64_t size)
-{
- int i;
-
- mp4ff_trefdata_t *p_tref = &f->tref;
-
- p_tref->i_track_ID = NULL;
- p_tref->i_entry_count = (size-8)/ sizeof(uint32_t);
- if( p_tref->i_entry_count > 0 ) {
- p_tref->i_track_ID = calloc( p_tref->i_entry_count, sizeof(uint32_t) );
- }
- if( p_tref->i_track_ID == NULL )
- return -1;
-
- for( i = 0; i < p_tref->i_entry_count; i++ )
- {
- p_tref->i_track_IDi = mp4ff_read_int32 (f);
- }
-
- return 0;
-}
-
-void mp4ff_tref_free (mp4ff_t *f)
-{
- if (f->tref.i_track_ID) {
- free (f->tref.i_track_ID);
- f->tref.i_track_ID = NULL;
- }
-}
-
-int32_t mp4ff_chap_get_num_tracks (mp4ff_t *f)
-{
- return f->tref.i_entry_count;
-}
-
-int32_t mp4ff_chap_get_track_id (mp4ff_t *f, int t)
-{
- return f->tref.i_track_IDt;
-}
-
-int32_t mp4ff_atom_read(mp4ff_t *f, const int32_t size, const uint8_t atom_type)
-{
- uint64_t dest_position = mp4ff_position(f)+size-8;
- if (atom_type == ATOM_STSZ)
- {
- /* sample size box */
- mp4ff_read_stsz(f);
- } else if (atom_type == ATOM_STTS) {
- /* time to sample box */
- mp4ff_read_stts(f);
- } else if (atom_type == ATOM_CTTS) {
- /* composition offset box */
- mp4ff_read_ctts(f);
- } else if (atom_type == ATOM_STSC) {
- /* sample to chunk box */
- mp4ff_read_stsc(f);
- } else if (atom_type == ATOM_STCO) {
- /* chunk offset box */
- mp4ff_read_stco(f);
- } else if (atom_type == ATOM_STSD) {
- /* sample description box */
- mp4ff_read_stsd(f);
- } else if (atom_type == ATOM_MVHD) {
- /* movie header box */
- mp4ff_read_mvhd(f);
- } else if (atom_type == ATOM_MDHD) {
- /* track header */
- mp4ff_read_mdhd(f);
-#ifdef USE_TAGGING
- } else if (atom_type == ATOM_META) {
- /* iTunes Metadata box */
- mp4ff_read_meta(f, size);
-#endif
- } else if (atom_type == ATOM_CHPL) {
- mp4ff_read_chpl(f, size);
- } else if (atom_type == ATOM_CHAP) {
- mp4ff_read_tref(f, size);
- } else if (atom_type == ATOM_TKHD) {
- mp4ff_read_tkhd(f);
- }
-
- mp4ff_set_position(f, dest_position);
-
-
- return 0;
-}
-
-#if 0
-int mp4ff_track_create_chunks_index(mp4ff_t *f, mp4ff_track_t *trk)
-{
- unsigned int i_chunk;
- unsigned int i_index, i_last;
-
- // handle case when ( (!stco && !co64) || !stsc )
- // NOTE: stco and co64 have the same data
-
- if (!trk->stco_entry_count || !trk->stsc_entry_count)
- {
- trace ("no chunks\n");
- return -1;
- }
-
- trk->i_chunk_count = trk->stco_entry_count;
-
- trace ("\0330;31mchunk count %d\03337;0m\n", trk->i_chunk_count);
- trk->chunk_sample_first = malloc (sizeof (int32_t) * trk->i_chunk_count);
- trk->chunk_first_dts = malloc (sizeof (int32_t) * trk->i_chunk_count);
- trk->chunk_last_dts = malloc (sizeof (int32_t) * trk->i_chunk_count);
- trk->p_sample_count_dts = malloc (sizeof (int32_t *) * trk->i_chunk_count);
- trk->p_sample_delta_dts = malloc (sizeof (int32_t *) * trk->i_chunk_count);
- trk->p_sample_count_pts = malloc (sizeof (int32_t *) * trk->i_chunk_count);
- trk->p_sample_offset_pts = malloc (sizeof (int32_t *) * trk->i_chunk_count);
-
- /* first we read chunk offset */
- for( i_chunk = 0; i_chunk < trk->i_chunk_count; i_chunk++ )
- {
- // chunk.i_offset = stco_chunk_offseti_chunk
- trk->chunk_first_dtsi_chunk = 0;
- trk->p_sample_count_dtsi_chunk = NULL;
- trk->p_sample_delta_dtsi_chunk = NULL;
- trk->p_sample_count_ptsi_chunk = NULL;
- trk->p_sample_offset_ptsi_chunk = NULL;
- }
-
- /* now we read index for SampleEntry( soun vide mp4a mp4v ...)
- to be used for the sample XXX begin to 1
- We construct it begining at the end */
- i_last = trk->i_chunk_count; /* last chunk proceded */
- i_index = trk->stsc_entry_count;
- if( !i_index )
- {
- trace ("cannot read chunk table or table empty\n");
- return -1;
- }
- trk->chunk_sample_first0 = 0;
- trace ("\0330;35mchunk_sample_first%d=%d\03337;0m\n", 0, trk->chunk_sample_first0);
- for (int i = 1; i < trk->i_chunk_count; i++)
- {
- trk->chunk_sample_firsti = 
- trk->chunk_sample_firsti-1 +
- trk->stsc_samples_per_chunki-1;
- trace ("\0330;35mchunk_sample_first%d=%d\03337;0m\n", i, trk->chunk_sample_firsti);
- }
-
- trace ("trackId 0x%x read %d chunks\n", trk->id, trk->i_chunk_count);
- return 0;
-}
-
-int mp4ff_track_create_samples_index (mp4ff_t *f, mp4ff_track_t *trk)
-{
- /* TODO use also stss and stsh table for seeking */
- /* FIXME use edit table */
- int64_t i_sample;
- int64_t i_chunk;
-
- int64_t i_index;
- int64_t i_index_sample_used;
-
- int64_t i_next_dts;
-
- if (trk->stsz_sample_count == 0) {
- trace ("stsz not found\n");
- return -1;
- }
- if (trk->stts_entry_count == 0) {
- trace ("stts not found\n");
- return -1;
- }
-
- // we already have the table, don't construct anything
- // sample_size = stsz_sample_size == 0 ? stsz_tablei_sample : stsz_sample_size
-
- /* Use stts table to create a sample number -> dts table.
- * XXX: if we don't want to waste too much memory, we can't expand
- * the box! so each chunk will contain an "extract" of this table
- * for fast research (problem with raw stream where a sample is sometime
- * just channels*bits_per_sample/8 */
-
- i_next_dts = 0;
- i_index = 0; i_index_sample_used = 0;
- for( i_chunk = 0; i_chunk < trk->i_chunk_count; i_chunk++ )
- {
- trace ("calculating first/last dts for chunk %d\n", i_chunk);
- int64_t i_entry, i_sample_count, i;
-
- /* save first dts */
- trk->chunk_first_dtsi_chunk = i_next_dts;
- trk->chunk_last_dtsi_chunk = i_next_dts;
- trace ("init %lld\n", i_next_dts);
-
- /* count how many entries are needed for this chunk
- * for p_sample_delta_dts and p_sample_count_dts */
- i_sample_count = trk->stsc_samples_per_chunki_chunk;
- trace ("init i_sample_count %d\n", i_sample_count);
-
- i_entry = 0;
- while( i_sample_count > 0 )
- {
- i_sample_count -= trk->stts_sample_counti_index+i_entry;
- trace ("- i_sample_count %d\n", i_sample_count);
- /* don't count already used sample in this entry */
- if( i_entry == 0 ) {
- i_sample_count += i_index_sample_used;
- trace ("+ i_sample_count %d\n", i_sample_count);
- }
-
- i_entry++;
- }
- trace ("+ i_entry %d\n", i_entry);
- /* allocate them */
- trace ("alloc mem for chunk %d (%d entries, %d samples-per-chunk)\n", i_chunk, i_entry, trk->stsc_samples_per_chunki_chunk);
- trk->p_sample_count_dtsi_chunk = calloc( i_entry, sizeof( uint32_t ) );
- trk->p_sample_delta_dtsi_chunk = calloc( i_entry, sizeof( uint32_t ) );
-
- if( !trk->p_sample_count_dtsi_chunk || !trk->p_sample_delta_dtsi_chunk ) {
- trace ("out of memory allocating p_sample_count_dts or p_sample_delta_dts\n");
- return -1; // oom
- }
-
- /* now copy */
- i_sample_count = trk->stsc_samples_per_chunki_chunk;
- for( i = 0; i < i_entry; i++ )
- {
- int64_t i_used;
- int64_t i_rest;
-
- i_rest = trk->stts_sample_counti_index - i_index_sample_used;
-
- i_used = min( i_rest, i_sample_count );
-
- i_index_sample_used += i_used;
- i_sample_count -= i_used;
- i_next_dts += i_used * trk->stts_sample_deltai_index;
-
- trk->p_sample_count_dtsi_chunki = i_used;
- trk->p_sample_delta_dtsi_chunki = trk->stts_sample_deltai_index;
- if( i_used > 0 )
- trk->chunk_last_dtsi_chunk = i_next_dts - trk->p_sample_delta_dtsi_chunki;
-
- if( i_index_sample_used >= trk->stts_sample_counti_index )
- {
- i_index++;
- i_index_sample_used = 0;
- }
- }
- }
-
- /* Find ctts
- * Gives the delta between decoding time (dts) and composition table (pts)
- */
- if (trk->ctts_entry_count)
- {
- /* Create pts-dts table per chunk */
- i_index = 0; i_index_sample_used = 0;
- for( i_chunk = 0; i_chunk < trk->i_chunk_count; i_chunk++ )
- {
- int64_t i_entry, i_sample_count, i;
-
- /* count how many entries are needed for this chunk
- * for p_sample_delta_dts and p_sample_count_dts */
- i_sample_count = trk->stsc_samples_per_chunki_chunk;
-
- i_entry = 0;
- while( i_sample_count > 0 )
- {
- i_sample_count -= trk->ctts_sample_counti_index+i_entry;
-
- /* don't count already used sample in this entry */
- if( i_entry == 0 )
- i_sample_count += i_index_sample_used;
-
- i_entry++;
- }
- if (i_entry == 0) {
- continue;
- }
-
- /* allocate them */
- trk->p_sample_count_ptsi_chunk = calloc( i_entry, sizeof( uint32_t ) );
- trk->p_sample_offset_ptsi_chunk = calloc( i_entry, sizeof( int32_t ) );
- if( !trk->p_sample_count_ptsi_chunk || !trk->p_sample_offset_ptsi_chunk ) {
- trace ("out of memory allocating p_sample_count_pts or p_sample_offset_pts\n");
- return -1; // oom
- }
-
- /* now copy */
- i_sample_count = trk->stsc_samples_per_chunki_chunk;
- for( i = 0; i < i_entry; i++ )
- {
- int64_t i_used;
- int64_t i_rest;
-
- i_rest = trk->ctts_sample_counti_index -
- i_index_sample_used;
-
- i_used = min( i_rest, i_sample_count );
-
- i_index_sample_used += i_used;
- i_sample_count -= i_used;
-
- trk->p_sample_count_ptsi_chunki = i_used;
- trk->p_sample_offset_ptsi_chunki = trk->ctts_sample_offseti_index;
-
- if( i_index_sample_used >= trk->ctts_sample_counti_index )
- {
- i_index++;
- i_index_sample_used = 0;
- }
- }
- }
- }
-
- trace ("trackId 0x%x read %d samples length:%llds\n",
- trk->id, trk->stsz_sample_count,
- i_next_dts / trk->timeScale );
-
- return 0;
-}
-
-int64_t mp4ff_get_track_dts (mp4ff_t *f, int t, int s)
-{
- mp4ff_track_t *p_track = f->trackt;
- // find chunk for the sample
- int i_chunk = 0;
- for (i_chunk = 0; i_chunk < p_track->i_chunk_count-1; i_chunk++) {
- if (p_track->chunk_sample_firsti_chunk+1 > s) {
- break;
- }
- }
-// trace ("i_chunk for sample %d: %d (out of %d)\n", s, i_chunk, p_track->i_chunk_count);
-
- unsigned int i_index = 0;
- unsigned int i_sample = s - p_track->chunk_sample_firsti_chunk;
- int64_t i_dts = p_track->chunk_first_dtsi_chunk;
- trace ("start dts: %lld (i_sample: %d)\n", i_dts, i_sample);
-
- while( i_sample > 0 )
- {
- if( i_sample > p_track->p_sample_count_dtsi_chunki_index )
- {
- i_dts += p_track->p_sample_count_dtsi_chunki_index *
- p_track->p_sample_delta_dtsi_chunki_index;
- i_sample -= p_track->p_sample_count_dtsi_chunki_index;
- i_index++;
- }
- else
- {
- i_dts += i_sample * p_track->p_sample_delta_dtsi_chunki_index;
- break;
- }
- }
-
-
-#if 0
- // we don't need elst
- /* now handle elst */
- if (p_track->elst_entry_count)
- {
- /* convert to offset */
- if( ( p_track->elst_media_rate_integerp_track->i_elst > 0 ||
- p_track->elst_media_rate_fractionp_track->i_elst > 0 ) &&
- p_track->elst_media_timep_track->i_elst > 0 )
- {
- i_dts -= p_track->elst_media_timep_track->i_elst;
- }
-
- /* add i_elst_time */
- i_dts += p_track->i_elst_time * p_track->timeScale /
- f->time_scale;
-
- if( i_dts < 0 ) i_dts = 0;
- }
-#endif
-
- return (int64_t)1000000 * i_dts / p_track->timeScale;
-}
-
-int64_t mp4ff_get_track_pts_delta(mp4ff_t *f, int t, int i_sample)
-{
- mp4ff_track_t *p_track = f->trackt;
- // find chunk for the sample
- int i_chunk = 0;
- for (i_chunk = 0; i_chunk < p_track->i_chunk_count-1; i_chunk++) {
- if (p_track->chunk_sample_firsti_chunk+1 > i_sample) {
- break;
- }
- }
-// trace ("i_chunk for sample %d: %d (out of %d)\n", i_sample, i_chunk, p_track->i_chunk_count);
- unsigned int i_index = 0;
- i_sample = i_sample - p_track->chunk_sample_firsti_chunk;
-
- if( p_track->p_sample_count_ptsi_chunk == NULL || p_track->p_sample_offset_ptsi_chunk == NULL ) {
- trace ("pts info not found :(\n");
- return -1;
- }
-
- for( i_index = 0;; i_index++ )
- {
- if( i_sample < p_track->p_sample_count_ptsi_chunki_index )
- return p_track->p_sample_offset_ptsi_chunki_index * (int64_t)1000000 /
- (int64_t)p_track->timeScale;
-
- i_sample -= p_track->p_sample_count_ptsi_chunki_index;
- }
- return 0;
-}
-
-int mp4ff_get_track_sample_size(mp4ff_t *f, int t, int s)
-{
- mp4ff_track_t *p_track = f->trackt;
- int i_size;
-
- if( p_track->stsz_sample_size == 0 )
- {
- /* most simple case */
- return p_track->stsz_tables;
- }
- if(p_track->type != TRACK_AUDIO)
- {
- return p_track->stsz_sample_size;
- }
-
-// that's all we need for chapters, sound length is calculated differently for now
- return 0;
-#if 0
- p_soun = p_track->p_sample->data.p_sample_soun;
-
- if( p_soun->i_qt_version == 1 )
- {
- int i_samples = p_track->chunkp_track->i_chunk.i_sample_count;
- if( p_track->fmt.audio.i_blockalign > 1 )
- i_samples = p_soun->i_sample_per_packet;
-
- i_size = i_samples / p_soun->i_sample_per_packet * p_soun->i_bytes_per_frame;
- }
- else if( p_track->i_sample_size > 256 )
- {
- /* We do that so we don't read too much data
- * (in this case we are likely dealing with compressed data) */
- i_size = p_track->i_sample_size;
- }
- else
- {
- /* Read a bunch of samples at once */
- int i_samples = p_track->chunkp_track->i_chunk.i_sample_count -
- ( p_track->i_sample -
- p_track->chunkp_track->i_chunk.i_sample_first );
-
- i_samples = __MIN( QT_V0_MAX_SAMPLES, i_samples );
- i_size = i_samples * p_track->i_sample_size;
- }
-
- //fprintf( stderr, "size=%d\n", i_size );
- return i_size;
-#endif
-}
-#endif

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/mp4ff.c Deleted

@@ -1,580 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-** 
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: mp4ff.c,v 1.22 2009/01/26 23:01:40 menno Exp $
-**/
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include "mp4ffint.h"
-
-#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-//#define trace(fmt,...)
-
-mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f)
-{
- mp4ff_t *ff = malloc(sizeof(mp4ff_t));
-
- memset(ff, 0, sizeof(mp4ff_t));
-
- ff->stream = f;
-
- parse_atoms(ff,0);
-
- return ff;
-}
-
-mp4ff_t *mp4ff_open_read_metaonly(mp4ff_callback_t *f)
-{
- mp4ff_t *ff = malloc(sizeof(mp4ff_t));
-
- memset(ff, 0, sizeof(mp4ff_t));
-
- ff->stream = f;
-
- parse_atoms(ff,1);
-
- return ff;
-}
-
-void mp4ff_track_free (mp4ff_track_t *trk) {
-#if 0
- if (trk->chunk_sample_first) {
- free (trk->chunk_sample_first);
- }
- if (trk->chunk_first_dts) {
- free (trk->chunk_first_dts);
- }
- if (trk->chunk_last_dts) {
- free (trk->chunk_last_dts);
- }
- if (trk->p_sample_count_dts) {
- for (int i = 0; i < trk->stsc_entry_count; i++) {
- free (trk->p_sample_count_dtsi);
- }
- free (trk->p_sample_count_dts);
- }
- if (trk->p_sample_delta_dts) {
- for (int i = 0; i < trk->stsc_entry_count; i++) {
- free (trk->p_sample_delta_dtsi);
- }
- free (trk->p_sample_delta_dts);
- }
- if (trk->p_sample_count_pts) {
- for (int i = 0; i < trk->stsc_entry_count; i++) {
- free (trk->p_sample_count_ptsi);
- }
- free (trk->p_sample_count_pts);
- }
- if (trk->p_sample_offset_pts) {
- for (int i = 0; i < trk->stsc_entry_count; i++) {
- free (trk->p_sample_offset_ptsi);
- }
- free (trk->p_sample_offset_pts);
- }
-#endif
- free (trk);
-}
-
-void mp4ff_close(mp4ff_t *ff)
-{
- int32_t i;
-
- for (i = 0; i < ff->total_tracks; i++)
- {
- if (ff->tracki)
- {
- if (ff->tracki->stsz_table)
- free(ff->tracki->stsz_table);
- if (ff->tracki->stts_sample_count)
- free(ff->tracki->stts_sample_count);
- if (ff->tracki->stts_sample_delta)
- free(ff->tracki->stts_sample_delta);
- if (ff->tracki->stsc_first_chunk)
- free(ff->tracki->stsc_first_chunk);
- if (ff->tracki->stsc_samples_per_chunk)
- free(ff->tracki->stsc_samples_per_chunk);
- if (ff->tracki->stsc_sample_desc_index)
- free(ff->tracki->stsc_sample_desc_index);
- if (ff->tracki->stco_chunk_offset)
- free(ff->tracki->stco_chunk_offset);
- if (ff->tracki->decoderConfig)
- free(ff->tracki->decoderConfig);
-			if (ff->tracki->ctts_sample_count)
-				free(ff->tracki->ctts_sample_count);
-			if (ff->tracki->ctts_sample_offset)
-				free(ff->tracki->ctts_sample_offset);
-#ifdef ITUNES_DRM
- if (ff->tracki->p_drms)
- drms_free(ff->tracki->p_drms);
-#endif
- mp4ff_track_free (ff->tracki);
- }
- }
-
-#ifdef USE_TAGGING
- mp4ff_tag_delete(&(ff->tags));
-#endif
-
- mp4ff_chapters_free (ff);
- mp4ff_tref_free (ff);
-
- if (ff) free(ff);
-}
-
-void mp4ff_track_add(mp4ff_t *f)
-{
- f->total_tracks++;
-
- f->trackf->total_tracks - 1 = malloc(sizeof(mp4ff_track_t));
-
- memset(f->trackf->total_tracks - 1, 0, sizeof(mp4ff_track_t));
-}
-
-static int need_parse_when_meta_only(uint8_t atom_type)
-{
-	switch(atom_type)
-	{
-	case ATOM_EDTS:
-//	case ATOM_MDIA:
-//	case ATOM_MINF:
-	case ATOM_DRMS:
-	case ATOM_SINF:
-	case ATOM_SCHI:
-//	case ATOM_STBL:
-//	case ATOM_STSD:
-	case ATOM_STTS:
-	case ATOM_STSZ:
-	case ATOM_STZ2:
-	case ATOM_STCO:
-	case ATOM_STSC:
-//	case ATOM_CTTS:
-	case ATOM_FRMA:
-	case ATOM_IVIV:
-	case ATOM_PRIV:
-		return 0;
-	default:
-		return 1;
-	}
-}
-
-/* parse atoms that are sub atoms of other atoms */
-int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size,int meta_only)
-{
- uint64_t size;
- uint8_t atom_type = 0;
- uint64_t counted_size = 0;
- uint8_t header_size = 0;
-
- while (counted_size < total_size)
- {
- size = mp4ff_atom_read_header(f, &atom_type, &header_size);
- counted_size += size;
-
- /* check for end of file */
- if (size == 0)
- break;
-
- /* we're starting to read a new track, update index,
- * so that all data and tables get written in the right place
- */
- if (atom_type == ATOM_TRAK)
- {
- mp4ff_track_add(f);
- }
-
- /* parse subatoms */
-		if (meta_only && !need_parse_when_meta_only(atom_type))
-		{
-			mp4ff_set_position(f, mp4ff_position(f)+size-header_size);
-		} else if (atom_type < SUBATOMIC)
- {
- parse_sub_atoms(f, size-header_size,meta_only);
- } else {
- mp4ff_atom_read(f, (uint32_t)size, atom_type);
- }
-#if 0
- if (atom_type == ATOM_TRAK)
- {
- trace ("mp4ff_track_create_chunks_index\n");
- mp4ff_track_create_chunks_index (f, f->trackf->total_tracks-1);
- trace ("mp4ff_track_create_samples_index\n");
- mp4ff_track_create_samples_index (f, f->trackf->total_tracks-1);
- }
-#endif
- }
-
- return 0;
-}
-
-/* parse root atoms */
-int32_t parse_atoms(mp4ff_t *f,int meta_only)
-{
- uint64_t size;
- uint8_t atom_type = 0;
- uint8_t header_size = 0;
-
- f->file_size = 0;
-
- while ((size = mp4ff_atom_read_header(f, &atom_type, &header_size)) != 0)
- {
- f->file_size += size;
- f->last_atom = atom_type;
-
- if (atom_type == ATOM_MDAT && f->moov_read)
- {
- /* moov atom is before mdat, we can stop reading when mdat is encountered */
- /* file position will stay at beginning of mdat data */
-// break;
- }
-
- if (atom_type == ATOM_MOOV && size > header_size)
- {
- f->moov_read = 1;
- f->moov_offset = mp4ff_position(f)-header_size;
- f->moov_size = size;
- }
-
- /* parse subatoms */
-		if (meta_only && !need_parse_when_meta_only(atom_type))
-		{
-			mp4ff_set_position(f, mp4ff_position(f)+size-header_size);
-		} else if (atom_type < SUBATOMIC)
- {
- parse_sub_atoms(f, size-header_size,meta_only);
- } else {
- /* skip this atom */
- mp4ff_set_position(f, mp4ff_position(f)+size-header_size);
- }
- }
-
- return 0;
-}
-
-int32_t mp4ff_get_decoder_config(const mp4ff_t *f, const int32_t track,
- uint8_t** ppBuf, uint32_t* pBufSize)
-{
- if (track >= f->total_tracks)
- {
- *ppBuf = NULL;
- *pBufSize = 0;
- return 1;
- }
-
- if (f->tracktrack->decoderConfig == NULL || f->tracktrack->decoderConfigLen == 0)
- {
- *ppBuf = NULL;
- *pBufSize = 0;
- } else {
- *ppBuf = malloc(f->tracktrack->decoderConfigLen);
- if (*ppBuf == NULL)
- {
- *pBufSize = 0;
- return 1;
- }
- memcpy(*ppBuf, f->tracktrack->decoderConfig, f->tracktrack->decoderConfigLen);
- *pBufSize = f->tracktrack->decoderConfigLen;
- }
-
- return 0;
-}
-
-int32_t mp4ff_get_track_type(const mp4ff_t *f, const int track)
-{
-	return f->tracktrack->type;
-}
-
-int32_t mp4ff_get_track_id(const mp4ff_t *f, const int track)
-{
-	return f->tracktrack->id;
-}
-
-int32_t mp4ff_total_tracks(const mp4ff_t *f)
-{
- return f->total_tracks;
-}
-
-int32_t mp4ff_time_scale(const mp4ff_t *f, const int32_t track)
-{
- return f->tracktrack->timeScale;
-}
-
-uint32_t mp4ff_get_avg_bitrate(const mp4ff_t *f, const int32_t track)
-{
-	return f->tracktrack->avgBitrate;
-}
-
-uint32_t mp4ff_get_max_bitrate(const mp4ff_t *f, const int32_t track)
-{
-	return f->tracktrack->maxBitrate;
-}
-
-int64_t mp4ff_get_track_duration(const mp4ff_t *f, const int32_t track)
-{
-	return f->tracktrack->duration;
-}
-
-int64_t mp4ff_get_track_duration_use_offsets(const mp4ff_t *f, const int32_t track)
-{
-	int64_t duration = mp4ff_get_track_duration(f,track);
-	if (duration!=-1)
-	{
-		int64_t offset = mp4ff_get_sample_offset(f,track,0);
-		if (offset > duration) duration = 0;
-		else duration -= offset;
-	}
-	return duration;
-}
-
-
-int32_t mp4ff_num_samples(const mp4ff_t *f, const int32_t track)
-{
- int32_t i;
- int32_t total = 0;
-
- for (i = 0; i < f->tracktrack->stts_entry_count; i++)
- {
- total += f->tracktrack->stts_sample_counti;
- }
- return total;
-}
-
-
-
-
-uint32_t mp4ff_get_sample_rate(const mp4ff_t *f, const int32_t track)
-{
-	return f->tracktrack->sampleRate;
-}
-
-uint32_t mp4ff_get_channel_count(const mp4ff_t * f,const int32_t track)
-{
-	return f->tracktrack->channelCount;
-}
-
-uint32_t mp4ff_get_audio_type(const mp4ff_t * f,const int32_t track)
-{
-	return f->tracktrack->audioType;
-}
-
-int32_t mp4ff_get_sample_duration_use_offsets(const mp4ff_t *f, const int32_t track, const int32_t sample)
-{
-	int32_t d,o;
-	d = mp4ff_get_sample_duration(f,track,sample);
-	if (d!=-1)
-	{
-		o = mp4ff_get_sample_offset(f,track,sample);
-		if (o>d) d = 0;
-		else d -= o;
-	}
-	return d;
-}
-
-int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample)
-{
- int32_t i, co = 0;
-
- for (i = 0; i < f->tracktrack->stts_entry_count; i++)
- {
-		int32_t delta = f->tracktrack->stts_sample_counti;
-		if (sample < co + delta)
-			return f->tracktrack->stts_sample_deltai;
-		co += delta;
- }
- return (int32_t)(-1);
-}
-
-int32_t mp4ff_get_num_sample_byte_sizes (const mp4ff_t *f, const int32_t track) {
- return f->tracktrack->stsz_sample_count;
-}
-
-int32_t mp4ff_get_sample_info(const mp4ff_t *f, const int32_t track, const int32_t samplenum, uint32_t *sample_duration, uint32_t *sample_byte_size) {
-// num_sample_byte_sizes --- stsz_sample_count
-// num_time_to_samples --- stts_entry_count
-// time_to_samplei.sample_count --- p_track->stts_sample_counti
-// time_to_samplei.sample_duration --- p_track->stts_sample_deltai
-// sample_byte_sizei --- p_track->stsz_tablei
- unsigned int duration_index_accum = 0;
- unsigned int duration_cur_index = 0;
-
- if (samplenum >= f->tracktrack->stsz_sample_count)
- {
- fprintf(stderr, "sample %i does not exist\n", samplenum);
- return 0;
- }
-
- if (!f->tracktrack->stts_entry_count)
- {
- fprintf(stderr, "no time to samples\n");
- return 0;
- }
- while ((f->tracktrack->stts_sample_countduration_cur_index + duration_index_accum) <= samplenum)
- {
- duration_index_accum += f->tracktrack->stts_sample_countduration_cur_index;
- duration_cur_index++;
- if (duration_cur_index >= f->tracktrack->stts_entry_count)
- {
- fprintf(stderr, "sample %i does not have a duration\n", samplenum);
- return 0;
- }
- }
-
- *sample_duration = f->tracktrack->stts_sample_deltaduration_cur_index;
- *sample_byte_size = f->tracktrack->stsz_tablesamplenum;
-
- return 1;
-}
-
-int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample)
-{
- int32_t i, co = 0;
-	int64_t acc = 0;
-
- for (i = 0; i < f->tracktrack->stts_entry_count; i++)
- {
-		int32_t delta = f->tracktrack->stts_sample_counti;
-		if (sample < co + delta)
-		{
-			acc += f->tracktrack->stts_sample_deltai * (sample - co);
-			return acc;
-		}
-		else
-		{
-			acc += f->tracktrack->stts_sample_deltai * delta;
-		}
-		co += delta;
- }
- return (int64_t)(-1);
-}
-
-int32_t mp4ff_get_sample_offset(const mp4ff_t *f, const int32_t track, const int32_t sample)
-{
- int32_t i, co = 0;
-
- for (i = 0; i < f->tracktrack->ctts_entry_count; i++)
- {
-		int32_t delta = f->tracktrack->ctts_sample_counti;
-		if (sample < co + delta)
-			return f->tracktrack->ctts_sample_offseti;
-		co += delta;
- }
- return 0;
-}
-
-int32_t mp4ff_find_sample(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip)
-{
-	int32_t i, co = 0;
-	int64_t offset_total = 0;
-	mp4ff_track_t * p_track = f->tracktrack;
-
-	for (i = 0; i < p_track->stts_entry_count; i++)
-	{
-		int32_t sample_count = p_track->stts_sample_counti;
-		int32_t sample_delta = p_track->stts_sample_deltai;
-		int64_t offset_delta = (int64_t)sample_delta * (int64_t)sample_count;
-		if (offset < offset_total + offset_delta)
-		{
-			int64_t offset_fromstts = offset - offset_total;
-			if (toskip) *toskip = (int32_t)(offset_fromstts % sample_delta);
-			return co + (int32_t)(offset_fromstts / sample_delta);
-		}
-		else
-		{
-			offset_total += offset_delta;
-		}
-		co += sample_count;
-	}
-	return (int32_t)(-1);
-}
-
-int32_t mp4ff_find_sample_use_offsets(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip)
-{
-	return mp4ff_find_sample(f,track,offset + mp4ff_get_sample_offset(f,track,0),toskip);
-}
-
-int32_t mp4ff_read_sample(mp4ff_t *f, const int32_t track, const int32_t sample,
- uint8_t **audio_buffer, uint32_t *bytes)
-{
- int32_t result = 0;
-
- *bytes = mp4ff_audio_frame_size(f, track, sample);
-
-	if (*bytes==0) return 0;
-
- *audio_buffer = (uint8_t*)malloc(*bytes);
- if (!(*audio_buffer)) {
- //fprintf (stderr, "mp4ff_read_sample: malloc failure (tried to alloc %d bytes). possible mp4ff bug or memleak! please report a bug to deadbeef developers (i'm serious).\n", *bytes);
- return 0;
- }
-
- mp4ff_set_sample_position(f, track, sample);
-
- result = mp4ff_read_data(f, *audio_buffer, *bytes);
-
- if (!result)
-	{
-		free(*audio_buffer);
-		*audio_buffer = 0;
- return 0;
-	}
-
-#ifdef ITUNES_DRM
- if (f->tracktrack->p_drms != NULL)
- {
- drms_decrypt(f->tracktrack->p_drms, (uint32_t*)*audio_buffer, *bytes);
- }
-#endif
-
- return *bytes;
-}
-
-
-int32_t mp4ff_read_sample_v2(mp4ff_t *f, const int track, const int sample,unsigned char *buffer)
-{
- int32_t result = 0;
-	int32_t size = mp4ff_audio_frame_size(f,track,sample);
-	if (size<=0) return 0;
-	mp4ff_set_sample_position(f, track, sample);
-	result = mp4ff_read_data(f,buffer,size);
-
-#ifdef ITUNES_DRM
- if (f->tracktrack->p_drms != NULL)
- {
- drms_decrypt(f->tracktrack->p_drms, (uint32_t*)buffer, size);
- }
-#endif
-
- return result;
-}
-
-int32_t mp4ff_read_sample_getsize(mp4ff_t *f, const int track, const int sample)
-{
-	int32_t temp = mp4ff_audio_frame_size(f, track, sample);
-	if (temp<0) temp = 0;
-	return temp;
-}

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/mp4ff.h Deleted

@@ -1,127 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-** 
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: mp4ff.h,v 1.27 2009/01/29 00:41:08 menno Exp $
-**/
-
-#ifndef MP4FF_H
-#define MP4FF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#else
-#include "mp4ff_int_types.h"
-#endif
-#include "mp4ffint.h"
-
-/* API */
-
-mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f);
-mp4ff_t *mp4ff_open_read_metaonly(mp4ff_callback_t *f);
-void mp4ff_close(mp4ff_t *f);
-int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_num_sample_byte_sizes (const mp4ff_t *f, const int32_t track);
-int32_t mp4ff_get_sample_info(const mp4ff_t *f, const int32_t track, const int32_t samplenum, uint32_t *sample_duration, uint32_t *sample_byte_size);
-int32_t mp4ff_get_sample_duration_use_offsets(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_find_sample(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-int32_t mp4ff_find_sample_use_offsets(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-
-int32_t mp4ff_read_sample(mp4ff_t *f, const int track, const int sample,
- unsigned char **audio_buffer, unsigned int *bytes);
-
-int32_t mp4ff_read_sample_v2(mp4ff_t *f, const int track, const int sample,unsigned char *buffer);//returns 0 on error, number of bytes read on success, use mp4ff_read_sample_getsize() to check buffer size needed
-int32_t mp4ff_read_sample_getsize(mp4ff_t *f, const int track, const int sample);//returns 0 on error, buffer size needed for mp4ff_read_sample_v2() on success
-
-
-
-int32_t mp4ff_get_decoder_config(const mp4ff_t *f, const int track,
- unsigned char** ppBuf, unsigned int* pBufSize);
-int32_t mp4ff_get_track_type(const mp4ff_t *f, const int track);
-int32_t mp4ff_get_track_id(const mp4ff_t *f, const int track);
-int32_t mp4ff_get_track_fmt_cat(const mp4ff_t *f, const int track);
-int32_t mp4ff_get_track_fmt_codec(const mp4ff_t *f, const int track);
-int32_t mp4ff_total_tracks(const mp4ff_t *f);
-int32_t mp4ff_num_samples(const mp4ff_t *f, const int track);
-int32_t mp4ff_time_scale(const mp4ff_t *f, const int track);
-
-uint32_t mp4ff_get_avg_bitrate(const mp4ff_t *f, const int32_t track);
-uint32_t mp4ff_get_max_bitrate(const mp4ff_t *f, const int32_t track);
-int64_t mp4ff_get_track_duration(const mp4ff_t *f, const int32_t track); //returns (-1) if unknown
-int64_t mp4ff_get_track_duration_use_offsets(const mp4ff_t *f, const int32_t track); //returns (-1) if unknown
-uint32_t mp4ff_get_sample_rate(const mp4ff_t *f, const int32_t track);
-uint32_t mp4ff_get_channel_count(const mp4ff_t * f,const int32_t track);
-uint32_t mp4ff_get_audio_type(const mp4ff_t * f,const int32_t track);
-
-
-/* metadata */
-int mp4ff_meta_get_num_items(const mp4ff_t *f);
-int mp4ff_meta_get_by_index(const mp4ff_t *f, unsigned int index,
- char **item, char **value);
-int mp4ff_meta_find_by_name(const mp4ff_t *f, const char *item, char **value);
-int mp4ff_meta_get_title(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_artist(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_writer(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_album(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_date(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_tool(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_comment(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_genre(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_track(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_disc(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_totaltracks(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_totaldiscs(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_compilation(const mp4ff_t *f, char **value);
-int mp4ff_meta_get_tempo(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_coverart(const mp4ff_t *f, char **value);
-#ifdef USE_TAGGING
-
-int32_t mp4ff_chapters_get_num_items (mp4ff_t *f);
-const char *mp4ff_chapters_get_item (mp4ff_t *f, int i);
-int32_t mp4ff_chap_get_num_tracks (mp4ff_t *f);
-int32_t mp4ff_chap_get_track_id (mp4ff_t *f, int t);
-#if 0
-int64_t mp4ff_get_track_dts (mp4ff_t *f, int t, int s);
-int64_t mp4ff_get_track_pts_delta(mp4ff_t *f, int t, int s);
-int mp4ff_get_track_sample_size(mp4ff_t *f, int t, int s);
-#endif
-
-int32_t mp4ff_meta_update(mp4ff_callback_t *f,const mp4ff_metadata_t * data);
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/mp4ff_int_types.h Deleted

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/mp4ffint.h Deleted

@@ -1,404 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-** 
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: mp4ffint.h,v 1.26 2009/01/25 20:14:34 menno Exp $
-**/
-
-#ifndef MP4FF_INTERNAL_H
-#define MP4FF_INTERNAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "mp4ff_int_types.h"
-#include <stdlib.h>
-
-#define MAX_TRACKS 1024
-#define TRACK_UNKNOWN 0
-#define TRACK_AUDIO 1
-#define TRACK_VIDEO 2
-#define TRACK_SYSTEM 3
-#define TRACK_TEXT 4
-
-#define ATOM_TREF 100
-
-#define SUBATOMIC 128
-
-/* atoms without subatoms */
-#define ATOM_FTYP 129
-#define ATOM_MDAT 130
-#define ATOM_MVHD 131
-#define ATOM_TKHD 132
-#define ATOM_MDHD 134
-#define ATOM_VMHD 135
-#define ATOM_SMHD 136
-#define ATOM_HMHD 137
-#define ATOM_STSD 138
-#define ATOM_STTS 139
-#define ATOM_STSZ 140
-#define ATOM_STZ2 141
-#define ATOM_STCO 142
-#define ATOM_STSC 143
-#define ATOM_MP4A 144
-#define ATOM_MP4V 145
-#define ATOM_MP4S 146
-#define ATOM_ESDS 147
-#define ATOM_META 148 /* iTunes Metadata box */
-#define ATOM_NAME 149 /* iTunes Metadata name box */
-#define ATOM_DATA 150 /* iTunes Metadata data box */
-#define ATOM_CTTS 151
-#define ATOM_FRMA 152
-#define ATOM_IVIV 153
-#define ATOM_PRIV 154
-#define ATOM_USER 155
-#define ATOM_KEY 156
-
-#define ATOM_ALBUM_ARTIST	157
-#define ATOM_CONTENTGROUP 158
-#define ATOM_LYRICS 159
-#define ATOM_DESCRIPTION 160
-#define ATOM_NETWORK 161
-#define ATOM_SHOW 162
-#define ATOM_EPISODENAME 163
-#define ATOM_SORTTITLE 164
-#define ATOM_SORTALBUM 165
-#define ATOM_SORTARTIST 166
-#define ATOM_SORTALBUMARTIST 167
-#define ATOM_SORTWRITER 168
-#define ATOM_SORTSHOW 169
-#define ATOM_SEASON 170
-#define ATOM_EPISODE 171
-#define ATOM_PODCAST 172
-#define ATOM_CUSTOM 173
-#define ATOM_CHPL 174
-#define ATOM_CHAP 175
-#define ATOM_TEXT 176
-#define ATOM_ELST 176
-
-#define ATOM_UNKNOWN 255
-#define ATOM_FREE ATOM_UNKNOWN
-#define ATOM_SKIP ATOM_UNKNOWN
-
-/* atoms with subatoms */
-#define ATOM_MOOV 1
-#define ATOM_TRAK 2
-#define ATOM_EDTS 3
-#define ATOM_MDIA 4
-#define ATOM_MINF 5
-#define ATOM_STBL 6
-#define ATOM_UDTA 7
-#define ATOM_ILST 8 /* iTunes Metadata list */
-#define ATOM_TITLE 9
-#define ATOM_ARTIST 10
-#define ATOM_WRITER 11
-#define ATOM_ALBUM 12
-#define ATOM_DATE 13
-#define ATOM_TOOL 14
-#define ATOM_COMMENT 15
-#define ATOM_GENRE1 16
-#define ATOM_TRACK 17
-#define ATOM_DISC 18
-#define ATOM_COMPILATION 19
-#define ATOM_GENRE2 20
-#define ATOM_TEMPO 21
-#define ATOM_COVER 22
-#define ATOM_DRMS 23
-#define ATOM_SINF 24
-#define ATOM_SCHI 25
-
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"
-#endif
-
-#if !(defined(_WIN32) || defined(_WIN32_WCE))
-#define stricmp strcasecmp
-#else
-#define stricmp _stricmp
-#define strdup _strdup
-#endif
-
-/* file callback structure */
-typedef struct
-{
- uint32_t (*read)(void *user_data, void *buffer, uint32_t length);
- uint32_t (*write)(void *udata, void *buffer, uint32_t length);
- uint32_t (*seek)(void *user_data, uint64_t position);
- uint32_t (*truncate)(void *user_data);
- void *user_data;
-} mp4ff_callback_t;
-
-
-/* metadata tag structure */
-typedef struct
-{
- char *item;
- char *value;
-} mp4ff_tag_t;
-
-/* metadata list structure */
-typedef struct
-{
- mp4ff_tag_t *tags;
- uint32_t count;
-} mp4ff_metadata_t;
-
-
-typedef struct
-{
- int32_t type;
- int32_t id;
- int32_t channelCount;
- int32_t sampleSize;
- uint16_t sampleRate;
- int32_t audioType;
-
- /* stsd */
- int32_t stsd_entry_count;
-
- /* stsz */
- int32_t stsz_sample_size;
- int32_t stsz_sample_count;
- int32_t *stsz_table;
-
- /* stts */
- int32_t stts_entry_count;
- int32_t *stts_sample_count;
- int32_t *stts_sample_delta;
-
-#if 0
-// experimental support for indexing chunks samples based on VLC code
- /* chunk index generated in mp4ff_create_chunks_index */
- // chunk->i_sample_count = stsc_samples_per_chunki_chunk
- // chunk->i_sample_description_index = stsc_sample_desc_indexchunk
- // trk->p_sample_sizei_sample = stsz_sample_size ? stsz_sample_size : stsz_tablei_sample
- int32_t i_chunk_count; // stco_entry_count
- int32_t *chunk_sample_first;
- int32_t *chunk_first_dts;
- int32_t *chunk_last_dts;
- int32_t **p_sample_count_dts;
- int32_t **p_sample_delta_dts;
- int32_t **p_sample_count_pts;
- int32_t **p_sample_offset_pts;
-#endif
- /* stsc */
- int32_t stsc_entry_count;
- int32_t *stsc_first_chunk;
- int32_t *stsc_samples_per_chunk;
- int32_t *stsc_sample_desc_index;
-
- /* stsc */
- int32_t stco_entry_count;
- int32_t *stco_chunk_offset;
-
- /* ctts */
- int32_t ctts_entry_count;
- int32_t *ctts_sample_count;
- int32_t *ctts_sample_offset;
-
-
-#if 0
- /* elst */
- int i_elst; /* current elst */
- int64_t i_elst_time; /* current elst start time (in movie time scale)*/
- uint32_t elst_entry_count;
- uint64_t *elst_segment_duration;
- int64_t *elst_media_time;
- uint16_t *elst_media_rate_integer;
- uint16_t *elst_media_rate_fraction;
-#endif
-
- /* esde */
- uint8_t *decoderConfig;
- int32_t decoderConfigLen;
-
- uint32_t maxBitrate;
- uint32_t avgBitrate;
-
- uint32_t timeScale; // FIXME: check calculation
- uint64_t duration;
-
-} mp4ff_track_t;
-
-typedef struct
-{
- uint8_t i_chapter;
- struct
- {
- char *psz_name;
- int64_t i_start;
- } chapter256;
-} mp4ff_chapterdata_t;
-
-typedef struct
-{
- uint32_t i_entry_count;
- uint32_t *i_track_ID;
-} mp4ff_trefdata_t;
-
-/* mp4 main file structure */
-typedef struct
-{
- /* stream to read from */
- mp4ff_callback_t *stream;
- int64_t current_position;
-
- int32_t moov_read;
- uint64_t moov_offset;
- uint64_t moov_size;
- uint8_t last_atom;
- uint64_t file_size;
-
- /* mvhd */
- int32_t time_scale;
- int32_t duration;
-
- /* incremental track index while reading the file */
- int32_t total_tracks;
-
- /* track data */
- mp4ff_track_t *trackMAX_TRACKS;
-
- /* metadata */
- mp4ff_metadata_t tags;
-
- /* chapters */
- mp4ff_chapterdata_t chapters;
- mp4ff_trefdata_t tref;
-} mp4ff_t;
-
-
-
-
-/* mp4util.c */
-int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size);
-int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size);
-uint64_t mp4ff_read_int64(mp4ff_t *f);
-uint32_t mp4ff_read_int32(mp4ff_t *f);
-uint32_t mp4ff_read_int24(mp4ff_t *f);
-uint16_t mp4ff_read_int16(mp4ff_t *f);
-uint8_t mp4ff_read_char(mp4ff_t *f);
-int32_t mp4ff_write_int32(mp4ff_t *f,const uint32_t data);
-uint32_t mp4ff_read_mp4_descr_length(mp4ff_t *f);
-int64_t mp4ff_position(const mp4ff_t *f);
-int32_t mp4ff_set_position(mp4ff_t *f, const int64_t position);
-int32_t mp4ff_truncate(mp4ff_t * f);
-char * mp4ff_read_string(mp4ff_t * f,uint32_t length);
-
-/* mp4atom.c */
-static int32_t mp4ff_atom_get_size(const int8_t *data);
-static int32_t mp4ff_atom_compare(const int8_t a1, const int8_t b1, const int8_t c1, const int8_t d1,
- const int8_t a2, const int8_t b2, const int8_t c2, const int8_t d2);
-static uint8_t mp4ff_atom_name_to_type(const int8_t a, const int8_t b, const int8_t c, const int8_t d);
-uint64_t mp4ff_atom_read_header(mp4ff_t *f, uint8_t *atom_type, uint8_t *header_size);
-static int32_t mp4ff_read_stsz(mp4ff_t *f);
-static int32_t mp4ff_read_esds(mp4ff_t *f);
-static int32_t mp4ff_read_mp4a(mp4ff_t *f);
-static int32_t mp4ff_read_stsd(mp4ff_t *f);
-static int32_t mp4ff_read_stsc(mp4ff_t *f);
-static int32_t mp4ff_read_stco(mp4ff_t *f);
-static int32_t mp4ff_read_stts(mp4ff_t *f);
-#ifdef USE_TAGGING
-static int32_t mp4ff_read_meta(mp4ff_t *f, const uint64_t size);
-#endif
-int32_t mp4ff_atom_read(mp4ff_t *f, const int32_t size, const uint8_t atom_type);
-
-/* mp4sample.c */
-static int32_t mp4ff_chunk_of_sample(const mp4ff_t *f, const int32_t track, const int32_t sample,
- int32_t *chunk_sample, int32_t *chunk);
-static int32_t mp4ff_chunk_to_offset(const mp4ff_t *f, const int32_t track, const int32_t chunk);
-static int32_t mp4ff_sample_range_size(const mp4ff_t *f, const int32_t track,
- const int32_t chunk_sample, const int32_t sample);
-static int32_t mp4ff_sample_to_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_audio_frame_size(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_set_sample_position(mp4ff_t *f, const int32_t track, const int32_t sample);
-
-#ifdef USE_TAGGING
-/* mp4meta.c */
-static int32_t mp4ff_tag_add_field(mp4ff_metadata_t *tags, const char *item, const char *value);
-static int32_t mp4ff_tag_set_field(mp4ff_metadata_t *tags, const char *item, const char *value);
-static int32_t mp4ff_set_metadata_name(mp4ff_t *f, const uint8_t atom_type, char **name);
-static int32_t mp4ff_parse_tag(mp4ff_t *f, const uint8_t parent_atom_type, const int32_t size);
-int32_t mp4ff_meta_find_by_name(const mp4ff_t *f, const char *item, char **value);
-int32_t mp4ff_parse_metadata(mp4ff_t *f, const int32_t size);
-int32_t mp4ff_tag_delete(mp4ff_metadata_t *tags);
-int32_t mp4ff_meta_get_num_items(const mp4ff_t *f);
-int32_t mp4ff_meta_get_by_index(const mp4ff_t *f, uint32_t index,
- char **item, char **value);
-int32_t mp4ff_meta_get_title(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_artist(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_writer(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_album(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_date(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_tool(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_comment(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_genre(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_track(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_disc(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_compilation(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_tempo(const mp4ff_t *f, char **value);
-int32_t mp4ff_meta_get_coverart(const mp4ff_t *f, char **value);
-#endif
-
-/* mp4ff.c */
-mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f);
-#ifdef USE_TAGGING
-mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f);
-#endif
-void mp4ff_close(mp4ff_t *ff);
-//void mp4ff_track_add(mp4ff_t *f);
-#if 0
-int mp4ff_track_create_chunks_index(mp4ff_t *f, mp4ff_track_t *trk);
-int mp4ff_track_create_samples_index (mp4ff_t *f, mp4ff_track_t *trk);
-#endif
-int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size,int meta_only);
-int32_t parse_atoms(mp4ff_t *f,int meta_only);
-
-int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_get_sample_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);
-int32_t mp4ff_find_sample(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip);
-
-int32_t mp4ff_read_sample(mp4ff_t *f, const int32_t track, const int32_t sample,
- uint8_t **audio_buffer, uint32_t *bytes);
-int32_t mp4ff_get_decoder_config(const mp4ff_t *f, const int32_t track,
- uint8_t** ppBuf, uint32_t* pBufSize);
-int32_t mp4ff_total_tracks(const mp4ff_t *f);
-int32_t mp4ff_time_scale(const mp4ff_t *f, const int32_t track);
-int32_t mp4ff_num_samples(const mp4ff_t *f, const int32_t track);
-
-uint32_t mp4ff_meta_genre_to_index(const char * genrestr);//returns 1-based index, 0 if not found
-const char * mp4ff_meta_index_to_genre(uint32_t idx);//returns pointer to static string
-
-void mp4ff_chapters_free (mp4ff_t *f);
-void mp4ff_tref_free (mp4ff_t *f);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/mp4meta.c Deleted

@@ -1,467 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-** 
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: mp4meta.c,v 1.21 2009/01/19 23:56:30 menno Exp $
-**/
-
-#ifdef USE_TAGGING
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "mp4ffint.h"
-
-
-
-static int32_t mp4ff_tag_add_field(mp4ff_metadata_t *tags, const char *item, const char *value)
-{
- void *backup = (void *)tags->tags;
-
- if (!item || (item && !*item) || !value) return 0;
-
- tags->tags = (mp4ff_tag_t*)realloc(tags->tags, (tags->count+1) * sizeof(mp4ff_tag_t));
- if (!tags->tags)
- {
- if (backup) free(backup);
- return 0;
- } else {
- tags->tagstags->count.item = strdup(item);
- tags->tagstags->count.value = strdup(value);
-
- if (!tags->tagstags->count.item || !tags->tagstags->count.value)
- {
- if (!tags->tagstags->count.item) free (tags->tagstags->count.item);
- if (!tags->tagstags->count.value) free (tags->tagstags->count.value);
- tags->tagstags->count.item = NULL;
- tags->tagstags->count.value = NULL;
- return 0;
- }
-
- tags->count++;
- return 1;
- }
-}
-
-static int32_t mp4ff_tag_set_field(mp4ff_metadata_t *tags, const char *item, const char *value)
-{
- unsigned int i;
-
- if (!item || (item && !*item) || !value) return 0;
-
- for (i = 0; i < tags->count; i++)
- {
- if (!stricmp(tags->tagsi.item, item))
- {
-			free(tags->tagsi.value);
-			tags->tagsi.value = strdup(value);
- return 1;
- }
- }
-
- return mp4ff_tag_add_field(tags, item, value);
-}
-
-int32_t mp4ff_tag_delete(mp4ff_metadata_t *tags)
-{
- uint32_t i;
-
- for (i = 0; i < tags->count; i++)
- {
- if (tags->tagsi.item) free(tags->tagsi.item);
- if (tags->tagsi.value) free(tags->tagsi.value);
- }
-
- if (tags->tags) free(tags->tags);
-
- tags->tags = NULL;
- tags->count = 0;
-
- return 0;
-}
-
-static const char* ID3v1GenreList = {
- "Blues", "Classic Rock", "Country", "Dance", "Disco", "Funk",
- "Grunge", "Hip-Hop", "Jazz", "Metal", "New Age", "Oldies",
- "Other", "Pop", "R&B", "Rap", "Reggae", "Rock",
- "Techno", "Industrial", "Alternative", "Ska", "Death Metal", "Pranks",
- "Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop", "Vocal", "Jazz+Funk",
- "Fusion", "Trance", "Classical", "Instrumental", "Acid", "House",
- "Game", "Sound Clip", "Gospel", "Noise", "AlternRock", "Bass",
- "Soul", "Punk", "Space", "Meditative", "Instrumental Pop", "Instrumental Rock",
- "Ethnic", "Gothic", "Darkwave", "Techno-Industrial", "Electronic", "Pop-Folk",
- "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta",
- "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native American", "Cabaret",
- "New Wave", "Psychadelic", "Rave", "Showtunes", "Trailer", "Lo-Fi",
- "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical",
- "Rock & Roll", "Hard Rock", "Folk", "Folk/Rock", "National Folk", "Swing",
- "Fast-Fusion", "Bebob", "Latin", "Revival", "Celtic", "Bluegrass", "Avantgarde",
- "Gothic Rock", "Progressive Rock", "Psychedelic Rock", "Symphonic Rock", "Slow Rock", "Big Band",
- "Chorus", "Easy Listening", "Acoustic", "Humour", "Speech", "Chanson",
- "Opera", "Chamber Music", "Sonata", "Symphony", "Booty Bass", "Primus",
- "Porn Groove", "Satire", "Slow Jam", "Club", "Tango", "Samba",
- "Folklore", "Ballad", "Power Ballad", "Rhythmic Soul", "Freestyle", "Duet",
- "Punk Rock", "Drum Solo", "A capella", "Euro-House", "Dance Hall",
- "Goa", "Drum & Bass", "Club House", "Hardcore", "Terror",
- "Indie", "BritPop", "NegerPunk", "Polsk Punk", "Beat",
- "Christian Gangsta", "Heavy Metal", "Black Metal", "Crossover", "Contemporary C",
- "Christian Rock", "Merengue", "Salsa", "Thrash Metal", "Anime", "JPop",
- "SynthPop",
-};
-
-uint32_t mp4ff_meta_genre_to_index(const char * genrestr)
-{
-	unsigned n;
-	for(n=0;n<sizeof(ID3v1GenreList)/sizeof(ID3v1GenreList0);n++)
-	{
-		if (!stricmp(genrestr,ID3v1GenreListn)) return n+1;
-	}
-	return 0;
-}
-
-const char * mp4ff_meta_index_to_genre(uint32_t idx)
-{
-	if (idx>0 && idx<=sizeof(ID3v1GenreList)/sizeof(ID3v1GenreList0))
-	{
-		return ID3v1GenreListidx-1;
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-
-static int32_t TrackToString(char** str, const uint16_t track, const uint16_t totalTracks)
-{
-	char temp32;
- sprintf(temp, "%.5u of %.5u", track, totalTracks);
-	*str = strdup(temp);
- return 0;
-}
-
-static int32_t mp4ff_set_metadata_name(mp4ff_t *f, const uint8_t atom_type, char **name)
-{
- static char *tag_names = {
- "unknown", "title", "artist", "writer", "album",
- "date", "tool", "comment", "genre", "track",
- "disc", "compilation", "genre", "tempo", "cover",
-		"album_artist", "contentgroup", "lyrics", "description",
- "network", "show", "episodename",
- "sorttitle", "sortalbum", "sortartist", "sortalbumartist",
- "sortwriter", "sortshow",
- "season", "episode", "podcast"
-
- };
- uint8_t tag_idx = 0;
-
- switch (atom_type)
- {
- case ATOM_TITLE: tag_idx = 1; break;
- case ATOM_ARTIST: tag_idx = 2; break;
- case ATOM_WRITER: tag_idx = 3; break;
- case ATOM_ALBUM: tag_idx = 4; break;
- case ATOM_DATE: tag_idx = 5; break;
- case ATOM_TOOL: tag_idx = 6; break;
- case ATOM_COMMENT: tag_idx = 7; break;
- case ATOM_GENRE1: tag_idx = 8; break;
- case ATOM_TRACK: tag_idx = 9; break;
- case ATOM_DISC: tag_idx = 10; break;
- case ATOM_COMPILATION: tag_idx = 11; break;
- case ATOM_GENRE2: tag_idx = 12; break;
- case ATOM_TEMPO: tag_idx = 13; break;
- case ATOM_COVER: tag_idx = 14; break;
-	case ATOM_ALBUM_ARTIST: tag_idx = 15; break;
- case ATOM_CONTENTGROUP: tag_idx = 16; break;
- case ATOM_LYRICS: tag_idx = 17; break;
- case ATOM_DESCRIPTION: tag_idx = 18; break;
- case ATOM_NETWORK: tag_idx = 19; break;
- case ATOM_SHOW: tag_idx = 20; break;
- case ATOM_EPISODENAME: tag_idx = 21; break;
- case ATOM_SORTTITLE: tag_idx = 22; break;
- case ATOM_SORTALBUM: tag_idx = 23; break;
- case ATOM_SORTARTIST: tag_idx = 24; break;
- case ATOM_SORTALBUMARTIST: tag_idx = 25; break;
- case ATOM_SORTWRITER: tag_idx = 26; break;
- case ATOM_SORTSHOW: tag_idx = 27; break;
- case ATOM_SEASON: tag_idx = 28; break;
- case ATOM_EPISODE: tag_idx = 29; break;
- case ATOM_PODCAST: tag_idx = 30; break;
- default: tag_idx = 0; break;
- }
-
-	*name = strdup(tag_namestag_idx);
-
- return 0;
-}
-
-static int32_t mp4ff_parse_tag(mp4ff_t *f, const uint8_t parent_atom_type, const int32_t size)
-{
- uint8_t atom_type;
- uint8_t header_size = 0;
- uint64_t subsize, sumsize = 0;
- char * name = NULL;
-	char * data = NULL;
-	uint32_t done = 0;
-
-
- while (sumsize < size)
- {
-		uint64_t destpos;
- subsize = mp4ff_atom_read_header(f, &atom_type, &header_size);
-		destpos = mp4ff_position(f)+subsize-header_size;
-		if (!done)
-		{
-			if (atom_type == ATOM_DATA)
-			{
-				mp4ff_read_char(f); /* version */
-				mp4ff_read_int24(f); /* flags */
-				mp4ff_read_int32(f); /* reserved */
-
-				/* some need special attention */
-				if (parent_atom_type == ATOM_GENRE2 || parent_atom_type == ATOM_TEMPO)
-				{
-					if (subsize - header_size >= 8 + 2)
-					{
-						uint16_t val = mp4ff_read_int16(f);
-
-						if (parent_atom_type == ATOM_TEMPO)
-						{
-							char temp16;
-							sprintf(temp, "%.5u BPM", val);
-							mp4ff_tag_add_field(&(f->tags), "tempo", temp);
-						}
-						else
-						{
-							const char * temp = mp4ff_meta_index_to_genre(val);
-							if (temp)
-							{
-								mp4ff_tag_add_field(&(f->tags), "genre", temp);
-							}
-						}
-						done = 1;
-					}
-				} else if (parent_atom_type == ATOM_TRACK || parent_atom_type == ATOM_DISC) {
-					/* if (!done && subsize - header_size >= 8 + 8) */
-					/* modified by AJS */
-					if ( !done && (subsize - header_size) >=
-						(sizeof(char) + sizeof(uint8_t)*3 + sizeof(uint32_t) + /* version + flags + reserved */
-						+ sizeof(uint16_t) /* leading uint16_t */
-						+ sizeof(uint16_t) /* track / disc */
-						+ sizeof(uint16_t)) /* totaltracks / totaldiscs */
-						)
-					{
-						uint16_t index,total;
-						char temp32;
-						mp4ff_read_int16(f);
-						index = mp4ff_read_int16(f);
-						total = mp4ff_read_int16(f);
- 						/* modified by AJS */
-						/* mp4ff_read_int16(f); */
-
-						sprintf(temp,"%d",index);
-						mp4ff_tag_add_field(&(f->tags), parent_atom_type == ATOM_TRACK ? "track" : "disc", temp);
-						if (total>0)
-						{
-							sprintf(temp,"%d",total);
-							mp4ff_tag_add_field(&(f->tags), parent_atom_type == ATOM_TRACK ? "totaltracks" : "totaldiscs", temp);
-						}
-						done = 1;
-					}
-				} else
-				{
-					if (data) {free(data);data = NULL;}
-					data = mp4ff_read_string(f,(uint32_t)(subsize-(header_size+8)));
-				}
-			} else if (atom_type == ATOM_NAME) {
-				if (!done)
-				{
-					mp4ff_read_char(f); /* version */
-					mp4ff_read_int24(f); /* flags */
-					if (name) free(name);
-					name = mp4ff_read_string(f,(uint32_t)(subsize-(header_size+4)));
-				}
-			}
-			mp4ff_set_position(f, destpos);
-			sumsize += subsize;
-		}
- }
-
-	if (data)
-	{
-		if (!done)
-		{
-			if (name == NULL) mp4ff_set_metadata_name(f, parent_atom_type, &name);
-			if (name) mp4ff_tag_add_field(&(f->tags), name, data);
-		}
-
-		free(data);
-	}
-	if (name) free(name);
- return 1;
-}
-
-int32_t mp4ff_parse_metadata(mp4ff_t *f, const int32_t size)
-{
- uint64_t subsize, sumsize = 0;
- uint8_t atom_type;
- uint8_t header_size = 0;
-
- while (sumsize < size)
- {
- subsize = mp4ff_atom_read_header(f, &atom_type, &header_size);
- if (subsize == 0)
- break;
- if (atom_type == ATOM_UNKNOWN) {
- // don't try to read unknown atoms
-			mp4ff_set_position(f, mp4ff_position(f)+subsize-header_size);
- }
- else {
- mp4ff_parse_tag(f, atom_type, (uint32_t)(subsize-header_size));
- }
- sumsize += subsize;
- }
-
- return 0;
-}
-
-/* find a metadata item by name */
-/* returns 0 if item found, 1 if no such item */
-int32_t mp4ff_meta_find_by_name(const mp4ff_t *f, const char *item, char **value)
-{
- uint32_t i;
-
- for (i = 0; i < f->tags.count; i++)
- {
- if (!stricmp(f->tags.tagsi.item, item))
- {
-			*value = strdup(f->tags.tagsi.value);
- return 1;
- }
- }
-
- *value = NULL;
-
- /* not found */
- return 0;
-}
-
-int32_t mp4ff_meta_get_num_items(const mp4ff_t *f)
-{
- return f->tags.count;
-}
-
-int32_t mp4ff_meta_get_by_index(const mp4ff_t *f, uint32_t index,
- char **item, char **value)
-{
- if (index >= f->tags.count)
- {
- *item = NULL;
- *value = NULL;
- return 0;
- } else {
-		*item = strdup(f->tags.tagsindex.item);
-		*value = strdup(f->tags.tagsindex.value);
-		return 1;
- }
-}
-
-int32_t mp4ff_meta_get_title(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "title", value);
-}
-
-int32_t mp4ff_meta_get_artist(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "artist", value);
-}
-
-int32_t mp4ff_meta_get_writer(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "writer", value);
-}
-
-int32_t mp4ff_meta_get_album(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "album", value);
-}
-
-int32_t mp4ff_meta_get_date(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "date", value);
-}
-
-int32_t mp4ff_meta_get_tool(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "tool", value);
-}
-
-int32_t mp4ff_meta_get_comment(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "comment", value);
-}
-
-int32_t mp4ff_meta_get_genre(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "genre", value);
-}
-
-int32_t mp4ff_meta_get_track(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "track", value);
-}
-
-int32_t mp4ff_meta_get_totaltracks(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "totaltracks", value);
-}
-
-int32_t mp4ff_meta_get_disc(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "disc", value);
-}
-
-int32_t mp4ff_meta_get_totaldiscs(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "totaldiscs", value);
-}
-
-int32_t mp4ff_meta_get_compilation(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "compilation", value);
-}
-
-int32_t mp4ff_meta_get_tempo(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "tempo", value);
-}
-
-int32_t mp4ff_meta_get_coverart(const mp4ff_t *f, char **value)
-{
- return mp4ff_meta_find_by_name(f, "cover", value);
-}
-
-#endif

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/mp4sample.c Deleted

@@ -1,155 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-** 
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: mp4sample.c,v 1.20 2007/11/01 12:33:29 menno Exp $
-**/
-
-#include <stdlib.h>
-#include "mp4ffint.h"
-
-
-static int32_t mp4ff_chunk_of_sample(const mp4ff_t *f, const int32_t track, const int32_t sample,
- int32_t *chunk_sample, int32_t *chunk)
-{
- int32_t total_entries = 0;
- int32_t chunk2entry;
- int32_t chunk1, chunk2, chunk1samples, range_samples, total = 0;
-
- if (f->tracktrack == NULL)
- {
- return -1;
- }
-
- total_entries = f->tracktrack->stsc_entry_count;
-
- chunk1 = 1;
- chunk1samples = 0;
- chunk2entry = 0;
-
- do
- {
- chunk2 = f->tracktrack->stsc_first_chunkchunk2entry;
- *chunk = chunk2 - chunk1;
- range_samples = *chunk * chunk1samples;
-
- if (sample < total + range_samples) break;
-
- chunk1samples = f->tracktrack->stsc_samples_per_chunkchunk2entry;
- chunk1 = chunk2;
-
- if(chunk2entry < total_entries)
- {
- chunk2entry++;
- total += range_samples;
- }
- } while (chunk2entry < total_entries);
-
- if (chunk1samples)
- *chunk = (sample - total) / chunk1samples + chunk1;
- else
- *chunk = 1;
-
- *chunk_sample = total + (*chunk - chunk1) * chunk1samples;
-
- return 0;
-}
-
-static int32_t mp4ff_chunk_to_offset(const mp4ff_t *f, const int32_t track, const int32_t chunk)
-{
- const mp4ff_track_t * p_track = f->tracktrack;
-
- if (p_track->stco_entry_count && (chunk > p_track->stco_entry_count))
- {
- return p_track->stco_chunk_offsetp_track->stco_entry_count - 1;
- } else if (p_track->stco_entry_count) {
- return p_track->stco_chunk_offsetchunk - 1;
- } else {
- return 8;
- }
-
- return 0;
-}
-
-static int32_t mp4ff_sample_range_size(const mp4ff_t *f, const int32_t track,
- const int32_t chunk_sample, const int32_t sample)
-{
- int32_t i, total;
- const mp4ff_track_t * p_track = f->tracktrack;
-
- if (p_track->stsz_sample_size)
- {
- return (sample - chunk_sample) * p_track->stsz_sample_size;
- }
- else
- {
- if (sample>=p_track->stsz_sample_count) return 0;//error
-
- for(i = chunk_sample, total = 0; i < sample; i++)
- {
- total += p_track->stsz_tablei;
- }
- }
-
- return total;
-}
-
-static int32_t mp4ff_sample_to_offset(const mp4ff_t *f, const int32_t track, const int32_t sample)
-{
- int32_t chunk, chunk_sample, chunk_offset1, chunk_offset2;
-
- mp4ff_chunk_of_sample(f, track, sample, &chunk_sample, &chunk);
-
- chunk_offset1 = mp4ff_chunk_to_offset(f, track, chunk);
- chunk_offset2 = chunk_offset1 + mp4ff_sample_range_size(f, track, chunk_sample, sample);
-
- return chunk_offset2;
-}
-
-int32_t mp4ff_audio_frame_size(const mp4ff_t *f, const int32_t track, const int32_t sample)
-{
- int32_t bytes;
- const mp4ff_track_t * p_track = f->tracktrack;
-
- if (p_track->stsz_sample_size)
- {
- bytes = p_track->stsz_sample_size;
- } else {
- bytes = p_track->stsz_tablesample;
- }
-
- return bytes;
-}
-
-int32_t mp4ff_set_sample_position(mp4ff_t *f, const int32_t track, const int32_t sample)
-{
- int32_t offset;
-
- offset = mp4ff_sample_to_offset(f, track, sample);
- mp4ff_set_position(f, offset);
-
- return 0;
-}

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/mp4tagupdate.c Deleted

@@ -1,656 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include "mp4ffint.h"
-
-#ifdef USE_TAGGING
-
-static uint32_t fix_byte_order_32(uint32_t src)
-{
- uint32_t result;
- uint32_t a, b, c, d;
- int8_t data4;
- 
- memcpy(data,&src,sizeof(src));
- a = (uint8_t)data0;
- b = (uint8_t)data1;
- c = (uint8_t)data2;
- d = (uint8_t)data3;
-
- result = (a<<24) | (b<<16) | (c<<8) | d;
- return (uint32_t)result;
-}
-
-static uint16_t fix_byte_order_16(uint16_t src)
-{
- uint16_t result;
- uint16_t a, b;
- int8_t data2;
- 
- memcpy(data,&src,sizeof(src));
- a = (uint8_t)data0;
- b = (uint8_t)data1;
-
- result = (a<<8) | b;
- return (uint16_t)result;
-}
-
-
-typedef struct
-{
-	void * data;
-	unsigned written;
-	unsigned allocated;
-	unsigned error;
-} membuffer;
-
-unsigned membuffer_write(membuffer * buf,const void * ptr,unsigned bytes)
-{
-	unsigned dest_size = buf->written + bytes;
-
-	if (buf->error) return 0;
-	if (dest_size > buf->allocated)
-	{
-		do
-		{
-			buf->allocated <<= 1;
-		} while(dest_size > buf->allocated);
-		
-		{
-			void * newptr = realloc(buf->data,buf->allocated);
-			if (newptr==0)
-			{
-				free(buf->data);
-				buf->data = 0;
-				buf->error = 1;
-				return 0;
-			}
-			buf->data = newptr;
-		}
-	}
-
-	if (ptr) memcpy((char*)buf->data + buf->written,ptr,bytes);
-	buf->written += bytes;
-	return bytes;
-}
-
-#define membuffer_write_data membuffer_write
-
-unsigned membuffer_write_int32(membuffer * buf,uint32_t data)
-{
-	uint8_t temp4 = {(uint8_t)(data>>24),(uint8_t)(data>>16),(uint8_t)(data>>8),(uint8_t)data};	
-	return membuffer_write_data(buf,temp,4);
-}
-
-unsigned membuffer_write_int24(membuffer * buf,uint32_t data)
-{
-	uint8_t temp3 = {(uint8_t)(data>>16),(uint8_t)(data>>8),(uint8_t)data};
-	return membuffer_write_data(buf,temp,3);
-}
-
-unsigned membuffer_write_int16(membuffer * buf,uint16_t data)
-{
-	uint8_t temp2 = {(uint8_t)(data>>8),(uint8_t)data};
-	return membuffer_write_data(buf,temp,2);
-}
-
-unsigned membuffer_write_atom_name(membuffer * buf,const char * data)
-{
-	return membuffer_write_data(buf,data,4)==4 ? 1 : 0;
-}
-
-void membuffer_write_atom(membuffer * buf,const char * name,unsigned size,const void * data)
-{
-	membuffer_write_int32(buf,size + 8);
-	membuffer_write_atom_name(buf,name);
-	membuffer_write_data(buf,data,size);
-}
-
-unsigned membuffer_write_string(membuffer * buf,const char * data)
-{
-	return membuffer_write_data(buf,data,strlen(data));
-}
-
-unsigned membuffer_write_int8(membuffer * buf,uint8_t data)
-{
-	return membuffer_write_data(buf,&data,1);
-}
-
-void * membuffer_get_ptr(const membuffer * buf)
-{
-	return buf->data;
-}
-
-unsigned membuffer_get_size(const membuffer * buf)
-{
-	return buf->written;
-}
-
-unsigned membuffer_error(const membuffer * buf)
-{
-	return buf->error;
-}
-
-void membuffer_set_error(membuffer * buf) {buf->error = 1;}
-
-unsigned membuffer_transfer_from_file(membuffer * buf,mp4ff_t * src,unsigned bytes)
-{
-	unsigned oldsize;
-	void * bufptr;
-	
-	oldsize = membuffer_get_size(buf);
-	if (membuffer_write_data(buf,0,bytes) != bytes) return 0;
-
-	bufptr = membuffer_get_ptr(buf);
-	if (bufptr==0) return 0;
-	
-	if ((unsigned)mp4ff_read_data(src,(char*)bufptr + oldsize,bytes)!=bytes)
-	{
-		membuffer_set_error(buf);
-		return 0;
-	}
-	
-	return bytes;
-}
-
-
-membuffer * membuffer_create()
-{
-	const unsigned initial_size = 256;
-
-	membuffer * buf = (membuffer *) malloc(sizeof(membuffer));
-	buf->data = malloc(initial_size);
-	buf->written = 0;
-	buf->allocated = initial_size;
-	buf->error = buf->data == 0 ? 1 : 0;
-
-	return buf;
-}
-
-void membuffer_free(membuffer * buf)
-{
-	if (buf->data) free(buf->data);
-	free(buf);
-}
-
-void * membuffer_detach(membuffer * buf)
-{
-	void * ret;
-
-	if (buf->error) return 0;
-
-	ret = realloc(buf->data,buf->written);
-	
-	if (ret == 0) free(buf->data);
-
-	buf->data = 0;
-	buf->error = 1;
-	
-	return ret;
-}
-
-#if 0
-/* metadata tag structure */
-typedef struct
-{
- char *item;
- char *value;
-} mp4ff_tag_t;
-
-/* metadata list structure */
-typedef struct
-{
- mp4ff_tag_t *tags;
- uint32_t count;
-} mp4ff_metadata_t;
-#endif
-
-typedef struct
-{
-	const char * atom;
-	const char * name;	
-} stdmeta_entry;
-
-static stdmeta_entry stdmetas = 
-{
-	{"\xA9" "nam","title"},
-	{"\xA9" "ART","artist"},
-	{"\xA9" "wrt","writer"},
-	{"\xA9" "alb","album"},
-	{"\xA9" "day","date"},
-	{"\xA9" "too","tool"},
-	{"\xA9" "cmt","comment"},
-//	{"\xA9" "gen","genre"},
-	{"cpil","compilation"},
-//	{"trkn","track"},
-//	{"disk","disc"},
-//	{"gnre","genre"},
-	{"covr","cover"},
-	/* added by AJS */
-	{"aART","album_artist"},
-};
-
-
-static const char* find_standard_meta(const char * name) //returns atom name if found, 0 if not
-{
-	unsigned n;
-	for(n=0;n<sizeof(stdmetas)/sizeof(stdmetas0);n++)
-	{
-		if (!stricmp(name,stdmetasn.name)) return stdmetasn.atom;
-	}
- return 0;
-}
-
-static void membuffer_write_track_tag(membuffer * buf,const char * name,uint32_t index,uint32_t total)
-{
-	membuffer_write_int32(buf,8 /*atom header*/ + 8 /*data atom header*/ + 8 /*flags + reserved*/ + 8 /*actual data*/ );
-	membuffer_write_atom_name(buf,name);
-	membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + 8 /*actual data*/ );
-	membuffer_write_atom_name(buf,"data");
-	membuffer_write_int32(buf,0);//flags
-	membuffer_write_int32(buf,0);//reserved
-	membuffer_write_int16(buf,0);
-	membuffer_write_int16(buf,(uint16_t)index);//track number
-	membuffer_write_int16(buf,(uint16_t)total);//total tracks
-	membuffer_write_int16(buf,0);
-}
-
-static void membuffer_write_int16_tag(membuffer * buf,const char * name,uint16_t value)
-{
-	membuffer_write_int32(buf,8 /*atom header*/ + 8 /*data atom header*/ + 8 /*flags + reserved*/ + 2 /*actual data*/ );
-	membuffer_write_atom_name(buf,name);
-	membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + 2 /*actual data*/ );
-	membuffer_write_atom_name(buf,"data");
-	membuffer_write_int32(buf,0);//flags
-	membuffer_write_int32(buf,0);//reserved
-	membuffer_write_int16(buf,value);//value
-}
-
-static void membuffer_write_std_tag(membuffer * buf,const char * name,const char * value)
-{
-	/* added by AJS */
-	uint32_t flags = 1;
-
-	/* special check for compilation flag */
-	if ( strcmp(name, "cpil") == 0)
-	{
-		flags = 21;
-	}
-
-	membuffer_write_int32(buf,8 /*atom header*/ + 8 /*data atom header*/ + 8 /*flags + reserved*/ + strlen(value) );
-	membuffer_write_atom_name(buf,name);
-	membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + strlen(value));
-	membuffer_write_atom_name(buf,"data");
-	membuffer_write_int32(buf,flags);//flags
-	membuffer_write_int32(buf,0);//reserved
-	membuffer_write_data(buf,value,strlen(value));
-}
-
-static void membuffer_write_custom_tag(membuffer * buf,const char * name,const char * value)
-{
-	membuffer_write_int32(buf,8 /*atom header*/ + 0x1C /*weirdo itunes atom*/ + 12 /*name atom header*/ + strlen(name) + 16 /*data atom header + flags*/ + strlen(value) );
-	membuffer_write_atom_name(buf,"----");
-	membuffer_write_int32(buf,0x1C);//weirdo itunes atom
-	membuffer_write_atom_name(buf,"mean");
-	membuffer_write_int32(buf,0);
-	membuffer_write_data(buf,"com.apple.iTunes",16);
-	membuffer_write_int32(buf,12 + strlen(name));
-	membuffer_write_atom_name(buf,"name");
-	membuffer_write_int32(buf,0);
-	membuffer_write_data(buf,name,strlen(name));
-	membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + strlen(value));
-	membuffer_write_atom_name(buf,"data");
-	membuffer_write_int32(buf,1);//flags
-	membuffer_write_int32(buf,0);//reserved
-	membuffer_write_data(buf,value,strlen(value));
-
-}
-
-static uint32_t myatoi(const char * param)
-{
-	return param ? atoi(param) : 0;
-}
-
-static uint32_t create_ilst(const mp4ff_metadata_t * data,void ** out_buffer,uint32_t * out_size)
-{
-	membuffer * buf = membuffer_create();
-	unsigned metaptr;
-	char * mask = (char*)malloc(data->count);
-	memset(mask,0,data->count);
-
-	{
-		const char * tracknumber_ptr = 0, * totaltracks_ptr = 0;
-		const char * discnumber_ptr = 0, * totaldiscs_ptr = 0;
-		const char * genre_ptr = 0, * tempo_ptr = 0;
-		for(metaptr = 0; metaptr < data->count; metaptr++)
-		{
-			mp4ff_tag_t * tag = &data->tagsmetaptr;
-			if (!stricmp(tag->item,"tracknumber") || !stricmp(tag->item,"track"))
-			{
-				if (tracknumber_ptr==0) tracknumber_ptr = tag->value;
-				maskmetaptr = 1;
-			}
-			else if (!stricmp(tag->item,"totaltracks"))
-			{
-				if (totaltracks_ptr==0) totaltracks_ptr = tag->value;
-				maskmetaptr = 1;
-			}
-			else if (!stricmp(tag->item,"discnumber") || !stricmp(tag->item,"disc"))
-			{
-				if (discnumber_ptr==0) discnumber_ptr = tag->value;
-				maskmetaptr = 1;
-			}
-			else if (!stricmp(tag->item,"totaldiscs"))
-			{
-				if (totaldiscs_ptr==0) totaldiscs_ptr = tag->value;
-				maskmetaptr = 1;
-			}
-			else if (!stricmp(tag->item,"genre"))
-			{
-				if (genre_ptr==0) genre_ptr = tag->value;
-				maskmetaptr = 1;
-			}
-			else if (!stricmp(tag->item,"tempo"))
-			{
-				if (tempo_ptr==0) tempo_ptr = tag->value;
-				maskmetaptr = 1;
-			}
-
-		}
-
-		if (tracknumber_ptr) membuffer_write_track_tag(buf,"trkn",myatoi(tracknumber_ptr),myatoi(totaltracks_ptr));
-		if (discnumber_ptr) membuffer_write_track_tag(buf,"disk",myatoi(discnumber_ptr),myatoi(totaldiscs_ptr));
-		if (tempo_ptr) membuffer_write_int16_tag(buf,"tmpo",(uint16_t)myatoi(tempo_ptr));
-
-		if (genre_ptr)
-		{
-			uint32_t index = mp4ff_meta_genre_to_index(genre_ptr);
-			if (index==0)
-				membuffer_write_std_tag(buf,"©gen",genre_ptr);
-			else
-				membuffer_write_int16_tag(buf,"gnre",(uint16_t)index);
-		}
-	}
-	
-	for(metaptr = 0; metaptr < data->count; metaptr++)
-	{
-		if (!maskmetaptr)
-		{
-			mp4ff_tag_t * tag = &data->tagsmetaptr;
-			const char * std_meta_atom = find_standard_meta(tag->item);
-			if (std_meta_atom)
-			{
-				membuffer_write_std_tag(buf,std_meta_atom,tag->value);
-			}
-			else
-			{
-				membuffer_write_custom_tag(buf,tag->item,tag->value);
-			}
-		}
-	}
-
-	free(mask);
-
-	if (membuffer_error(buf))
-	{
-		membuffer_free(buf);
-		return 0;
-	}
-
-	*out_size = membuffer_get_size(buf);
-	*out_buffer = membuffer_detach(buf);
-	membuffer_free(buf);
-
-	return 1;
-}
-
-static uint32_t find_atom(mp4ff_t * f,uint64_t base,uint32_t size,const char * name)
-{
-	uint32_t remaining = size;
-	uint64_t atom_offset = base;
-	for(;;)
-	{
-		char atom_name4;
-		uint32_t atom_size;
-
-		mp4ff_set_position(f,atom_offset);
-		
-		if (remaining < 8) break;
-		atom_size = mp4ff_read_int32(f);
-		if (atom_size > remaining || atom_size < 8) break;
-		mp4ff_read_data(f,atom_name,4);
-		
-		if (!memcmp(atom_name,name,4))
-		{
-			mp4ff_set_position(f,atom_offset);
-			return 1;
-		}
-		
-		remaining -= atom_size;
-		atom_offset += atom_size;
-	}
-	return 0;
-}
-
-static uint32_t find_atom_v2(mp4ff_t * f,uint64_t base,uint32_t size,const char * name,uint32_t extraheaders,const char * name_inside)
-{
-	uint64_t first_base = (uint64_t)(-1);
-	while(find_atom(f,base,size,name))//try to find atom <name> with atom <name_inside> in it
-	{
-		uint64_t mybase = mp4ff_position(f);
-		uint32_t mysize = mp4ff_read_int32(f);
-
-		if (first_base == (uint64_t)(-1)) first_base = mybase;
-
-		if (mysize < 8 + extraheaders) break;
-
-		if (find_atom(f,mybase+(8+extraheaders),mysize-(8+extraheaders),name_inside))
-		{
-			mp4ff_set_position(f,mybase);
-			return 2;
-		}
-		base += mysize;
-		if (size<=mysize) {size=0;break;}
-		size -= mysize;
-	}
-
-	if (first_base != (uint64_t)(-1))//wanted atom inside not found
-	{
-		mp4ff_set_position(f,first_base);
-		return 1;
-	}
-	else return 0;	
-}
-
-static uint32_t create_meta(const mp4ff_metadata_t * data,void ** out_buffer,uint32_t * out_size)
-{
-	membuffer * buf;
-	uint32_t ilst_size;
-	void * ilst_buffer;
-
-	if (!create_ilst(data,&ilst_buffer,&ilst_size)) return 0;
-
-	buf = membuffer_create();
-
-	membuffer_write_int32(buf,0);
-	membuffer_write_atom(buf,"ilst",ilst_size,ilst_buffer);
-	free(ilst_buffer);
-
-	*out_size = membuffer_get_size(buf);
-	*out_buffer = membuffer_detach(buf);
-	membuffer_free(buf);
-	return 1;
-}
-
-static uint32_t create_udta(const mp4ff_metadata_t * data,void ** out_buffer,uint32_t * out_size)
-{
-	membuffer * buf;
-	uint32_t meta_size;
-	void * meta_buffer;
-
-	if (!create_meta(data,&meta_buffer,&meta_size)) return 0;
-
-	buf = membuffer_create();
-
-	membuffer_write_atom(buf,"meta",meta_size,meta_buffer);
-
-	free(meta_buffer);
-
-	*out_size = membuffer_get_size(buf);
-	*out_buffer = membuffer_detach(buf);
-	membuffer_free(buf);
-	return 1;
-}
-
-static uint32_t modify_moov(mp4ff_t * f,const mp4ff_metadata_t * data,void ** out_buffer,uint32_t * out_size)
-{
-	uint64_t total_base = f->moov_offset + 8;
-	uint32_t total_size = (uint32_t)(f->moov_size - 8);
-
-	uint64_t udta_offset,meta_offset,ilst_offset;
-	uint32_t udta_size, meta_size, ilst_size;
-	
-	uint32_t new_ilst_size;
-	void * new_ilst_buffer;
-	
-	uint8_t * p_out;
-	int32_t size_delta;
-	
-	
-	if (!find_atom_v2(f,total_base,total_size,"udta",0,"meta"))
-	{
-		membuffer * buf;
-		void * new_udta_buffer;
-		uint32_t new_udta_size;
-		if (!create_udta(data,&new_udta_buffer,&new_udta_size)) return 0;
-		
-		buf = membuffer_create();
-		mp4ff_set_position(f,total_base);
-		membuffer_transfer_from_file(buf,f,total_size);
-		
-		membuffer_write_atom(buf,"udta",new_udta_size,new_udta_buffer);
-
-		free(new_udta_buffer);
-	
-		*out_size = membuffer_get_size(buf);
-		*out_buffer = membuffer_detach(buf);
-		membuffer_free(buf);
-		return 1;		
-	}
-	else
-	{
-		udta_offset = mp4ff_position(f);
-		udta_size = mp4ff_read_int32(f);
-		if (!find_atom_v2(f,udta_offset+8,udta_size-8,"meta",4,"ilst"))
-		{
-			membuffer * buf;
-			void * new_meta_buffer;
-			uint32_t new_meta_size;
-			if (!create_meta(data,&new_meta_buffer,&new_meta_size)) return 0;
-			
-			buf = membuffer_create();
-			mp4ff_set_position(f,total_base);
-			membuffer_transfer_from_file(buf,f,(uint32_t)(udta_offset - total_base));
-			
-			membuffer_write_int32(buf,udta_size + 8 + new_meta_size);
-			membuffer_write_atom_name(buf,"udta");
-			membuffer_transfer_from_file(buf,f,udta_size);
-						
-			membuffer_write_atom(buf,"meta",new_meta_size,new_meta_buffer);
-			free(new_meta_buffer);
-		
-			*out_size = membuffer_get_size(buf);
-			*out_buffer = membuffer_detach(buf);
-			membuffer_free(buf);
-			return 1;		
-		}
-		meta_offset = mp4ff_position(f);
-		meta_size = mp4ff_read_int32(f);
-		if (!find_atom(f,meta_offset+12,meta_size-12,"ilst")) return 0;//shouldn't happen, find_atom_v2 above takes care of it
-		ilst_offset = mp4ff_position(f);
-		ilst_size = mp4ff_read_int32(f);
-
-		if (!create_ilst(data,&new_ilst_buffer,&new_ilst_size)) return 0;
-		
-		size_delta = new_ilst_size - (ilst_size - 8);
-
-		*out_size = total_size + size_delta;
-		*out_buffer = malloc(*out_size);
-		if (*out_buffer == 0)
-		{
-			free(new_ilst_buffer);
-			return 0;
-		}
-
-		p_out = (uint8_t*)*out_buffer;
-		
-		mp4ff_set_position(f,total_base);
-		mp4ff_read_data(f,p_out,(uint32_t)(udta_offset - total_base )); p_out += (uint32_t)(udta_offset - total_base );
-		*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
-		mp4ff_read_data(f,p_out,4); p_out += 4;
-		mp4ff_read_data(f,p_out,(uint32_t)(meta_offset - udta_offset - 8)); p_out += (uint32_t)(meta_offset - udta_offset - 8);
-		*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
-		mp4ff_read_data(f,p_out,4); p_out += 4;
-		mp4ff_read_data(f,p_out,(uint32_t)(ilst_offset - meta_offset - 8)); p_out += (uint32_t)(ilst_offset - meta_offset - 8);
-		*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
-		mp4ff_read_data(f,p_out,4); p_out += 4;
-
-		memcpy(p_out,new_ilst_buffer,new_ilst_size);
-		p_out += new_ilst_size;
-
-		mp4ff_set_position(f,ilst_offset + ilst_size);
-		mp4ff_read_data(f,p_out,(uint32_t)(total_size - (ilst_offset - total_base) - ilst_size));
-
-		free(new_ilst_buffer);
-	}
-	return 1;
-
-}
-
-int32_t mp4ff_meta_update(mp4ff_callback_t *f,const mp4ff_metadata_t * data)
-{
-	void * new_moov_data;
-	uint32_t new_moov_size;
-
- mp4ff_t *ff = malloc(sizeof(mp4ff_t));
-
- memset(ff, 0, sizeof(mp4ff_t));
- ff->stream = f;
-	mp4ff_set_position(ff,0);
-
- parse_atoms(ff,1);
-
-
-	if (!modify_moov(ff,data,&new_moov_data,&new_moov_size))
-	{
-		mp4ff_close(ff);
-		return 0;
-	}
-
- /* copy moov atom to end of the file */
- if (ff->last_atom != ATOM_MOOV)
- {
- char *free_data = "free";
-
- /* rename old moov to free */
- mp4ff_set_position(ff, ff->moov_offset + 4);
- mp4ff_write_data(ff, free_data, 4);
-	
- mp4ff_set_position(ff, ff->file_size);
-		mp4ff_write_int32(ff,new_moov_size + 8);
-		mp4ff_write_data(ff,"moov",4);
-		mp4ff_write_data(ff, new_moov_data, new_moov_size);
- }
-	else
-	{
- mp4ff_set_position(ff, ff->moov_offset);
-		mp4ff_write_int32(ff,new_moov_size + 8);
-		mp4ff_write_data(ff,"moov",4);
-		mp4ff_write_data(ff, new_moov_data, new_moov_size);
-	}
-
-	mp4ff_truncate(ff);
-
-	mp4ff_close(ff);
- return 1;
-}
-#endif

deadbeef-0.6.2.tar.bz2/plugins/libmp4ff/mp4util.c Deleted

@@ -1,191 +0,0 @@
-/*
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-** 
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-** 
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-**
-** $Id: mp4util.c,v 1.20 2007/11/01 12:33:29 menno Exp $
-**/
-
-#include "mp4ffint.h"
-#include <stdlib.h>
-
-int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size)
-{
- int32_t result = 1;
-
- result = f->stream->read(f->stream->user_data, data, size);
-
- f->current_position += size;
-
- return result;
-}
-
-int32_t mp4ff_truncate(mp4ff_t * f)
-{
-	return f->stream->truncate(f->stream->user_data);
-}
-
-int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size)
-{
- int32_t result = 1;
-
- result = f->stream->write(f->stream->user_data, data, size);
-
- f->current_position += size;
-
- return result;
-}
-
-int32_t mp4ff_write_int32(mp4ff_t *f,const uint32_t data)
-{
-	uint32_t result;
- uint32_t a, b, c, d;
- int8_t temp4;
- 
- *(uint32_t*)temp = data;
- a = (uint8_t)temp0;
- b = (uint8_t)temp1;
- c = (uint8_t)temp2;
- d = (uint8_t)temp3;
-
- result = (a<<24) | (b<<16) | (c<<8) | d;
-
- return mp4ff_write_data(f,(uint8_t*)&result,sizeof(result));
-}
-
-int32_t mp4ff_set_position(mp4ff_t *f, const int64_t position)
-{
- f->stream->seek(f->stream->user_data, position);
- f->current_position = position;
-
- return 0;
-}
-
-int64_t mp4ff_position(const mp4ff_t *f)
-{
- return f->current_position;
-}
-
-uint64_t mp4ff_read_int64(mp4ff_t *f)
-{
- uint8_t data8;
- uint64_t result = 0;
- int8_t i;
-
- mp4ff_read_data(f, data, 8);
-
- for (i = 0; i < 8; i++)
- {
- result |= ((uint64_t)datai) << ((7 - i) * 8);
- }
-
- return result;
-}
-
-uint32_t mp4ff_read_int32(mp4ff_t *f)
-{
- uint32_t result;
- uint32_t a, b, c, d;
- int8_t data4;
- 
- mp4ff_read_data(f, data, 4);
- a = (uint8_t)data0;
- b = (uint8_t)data1;
- c = (uint8_t)data2;
- d = (uint8_t)data3;
-
- result = (a<<24) | (b<<16) | (c<<8) | d;
- return (uint32_t)result;
-}
-
-uint32_t mp4ff_read_int24(mp4ff_t *f)
-{
- uint32_t result;
- uint32_t a, b, c;
- int8_t data4;
- 
- mp4ff_read_data(f, data, 3);
- a = (uint8_t)data0;
- b = (uint8_t)data1;
- c = (uint8_t)data2;
-
- result = (a<<16) | (b<<8) | c;
- return (uint32_t)result;
-}
-
-uint16_t mp4ff_read_int16(mp4ff_t *f)
-{
- uint32_t result;
- uint32_t a, b;
- int8_t data2;
- 
- mp4ff_read_data(f, data, 2);
- a = (uint8_t)data0;
- b = (uint8_t)data1;
-
- result = (a<<8) | b;
- return (uint16_t)result;
-}
-
-char * mp4ff_read_string(mp4ff_t * f,uint32_t length)
-{
-	char * str = (char*)malloc(length + 1);
-	if (str!=0)
-	{
-		if ((uint32_t)mp4ff_read_data(f,str,length)!=length)
-		{
-			free(str);
-			str = 0;
-		}
-		else
-		{
-			strlength = 0;
-		}
-	}
-	return str;	
-}
-
-uint8_t mp4ff_read_char(mp4ff_t *f)
-{
- uint8_t output;
- mp4ff_read_data(f, &output, 1);
- return output;
-}
-
-uint32_t mp4ff_read_mp4_descr_length(mp4ff_t *f)
-{
- uint8_t b;
- uint8_t numBytes = 0;
- uint32_t length = 0;
-
- do
- {
- b = mp4ff_read_char(f);
- numBytes++;
- length = (length << 7) | (b & 0x7F);
- } while ((b & 0x80) && numBytes < 4);
-
- return length;
-}

deadbeef-0.6.2.tar.bz2/plugins/mpgmad Deleted

deadbeef-0.6.2.tar.bz2/plugins/mpgmad/COPYING Deleted

@@ -1,40 +0,0 @@
-MPEG decoder plugin based on libmad
-Copyright (C) 2009-2014 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
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source distribution.
-
-
-
-libmad - MPEG audio decoder library
-Copyright (C) 2000-2004 Underbit Technologies, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 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
-

deadbeef-0.6.2.tar.bz2/plugins/mpgmad/Makefile.am Deleted

deadbeef-0.6.2.tar.bz2/plugins/mpgmad/Makefile.in Deleted

@@ -1,789 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 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@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\\ \	*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -dEDm) skip_next=yes;; \
- -JT) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-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/mpgmad
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/depcomp COPYING
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
-	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/intmax.m4 \
-	$(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(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, filesdir }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-@HAVE_MPGMAD_TRUE@mpgmad_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__mpgmad_la_SOURCES_DIST = mpgmad.c
-@HAVE_MPGMAD_TRUE@am_mpgmad_la_OBJECTS = mpgmad.lo
-mpgmad_la_OBJECTS = $(am_mpgmad_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-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)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-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_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 = 
-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_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 = 
-SOURCES = $(mpgmad_la_SOURCES)
-DIST_SOURCES = $(am__mpgmad_la_SOURCES_DIST)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items$$0 = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-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_CFLAGS = @CDDA_CFLAGS@
-CDDA_LIBS = @CDDA_LIBS@
-CFLAGS = @CFLAGS@
-CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
-COREAUDIO_LIBS = @COREAUDIO_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CURL_CFLAGS = @CURL_CFLAGS@
-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_CFLAGS = @FAAD2_CFLAGS@
-FAAD2_LIBS = @FAAD2_LIBS@
-FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
-FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
-FGREP = @FGREP@
-FLAC_CFLAGS = @FLAC_CFLAGS@
-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@
-GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
-GTK_MAC_LIBS = @GTK_MAC_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_CFLAGS = @HOTKEYS_CFLAGS@
-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@
-INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
-INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
-INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
-INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBS = @INTL_LIBS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JPEG_DEPS_CFLAGS = @JPEG_DEPS_CFLAGS@
-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_CFLAGS = @MAD_CFLAGS@
-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@
-NOCPPLIB = @NOCPPLIB@
-NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
-NOTIFY_LIBS = @NOTIFY_LIBS@
-OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_CFLAGS = @OGG_CFLAGS@
-OGG_LIBS = @OGG_LIBS@
-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_CFLAGS = @PNG_DEPS_CFLAGS@
-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_CFLAGS = @SNDFILE_CFLAGS@
-SNDFILE_LIBS = @SNDFILE_LIBS@
-STRIP = @STRIP@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
-VFS_CURL_LIBS = @VFS_CURL_LIBS@
-VORBIS_CFLAGS = @VORBIS_CFLAGS@
-VORBIS_LIBS = @VORBIS_LIBS@
-WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
-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_CFLAGS = @ZIP_CFLAGS@
-ZIP_LIBS = @ZIP_LIBS@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
-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@
-ac_ct_OBJC = @ac_ct_OBJC@
-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@
-intltool__v_merge_options_ = @intltool__v_merge_options_@
-intltool__v_merge_options_0 = @intltool__v_merge_options_0@
-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_MPGMAD_TRUE@mpgmaddir = $(libdir)/$(PACKAGE)
-@HAVE_MPGMAD_TRUE@pkglib_LTLIBRARIES = mpgmad.la
-@HAVE_MPGMAD_TRUE@mpgmad_la_SOURCES = mpgmad.c
-@HAVE_MPGMAD_TRUE@mpgmad_la_LDFLAGS = -module -avoid-version
-@HAVE_MPGMAD_TRUE@mpgmad_la_LIBADD = $(LDADD) $(MAD_LIBS)
-@HAVE_MPGMAD_TRUE@AM_CFLAGS = $(CFLAGS) $(MAD_CFLAGS) -std=c99 -fPIC
-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/mpgmad/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu plugins/mpgmad/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)
-	@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 " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
-	 $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
-	 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)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
-	 sort -u`; \
-	test -z "$$locs" || { \
-	 echo rm -f $${locs}; \
-	 rm -f $${locs}; \
-	}
-
-mpgmad.la: $(mpgmad_la_OBJECTS) $(mpgmad_la_DEPENDENCIES) $(EXTRA_mpgmad_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(mpgmad_la_LINK) $(am_mpgmad_la_rpath) $(mpgmad_la_OBJECTS) $(mpgmad_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpgmad.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	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-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	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"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
-	 *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	 if test -f "$$i"; then \
-	 echo "$(subdir)/$$i"; \
-	 else \
-	 echo "$$sdir/$$i"; \
-	 fi; \
-	done >> $(top_builddir)/cscope.files
-
-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:
-	if test -z '$(STRIP)'; then \
-	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 install; \
-	else \
-	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-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 TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
-	ctags-am 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 tags-am 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.6.2.tar.bz2/plugins/mpgmad/mpgmad.c Deleted

@@ -1,1501 +0,0 @@
-/*
- MPEG decoder plugin based on libmad
- Copyright (C) 2009-2014 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-
- 3. This notice may not be removed or altered from any source distribution.
-*/
-
-
-#include <string.h>
-#include <stdio.h>
-#include <mad.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include "../../deadbeef.h"
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-
-//#define WRITE_DUMP 1
-
-#if WRITE_DUMP
-FILE *out;
-#endif
-
-#define min(x,y) ((x)<(y)?(x):(y))
-#define max(x,y) ((x)>(y)?(x):(y))
-
-#define likely(x) __builtin_expect((x),1)
-#define unlikely(x) __builtin_expect((x),0)
-
-static DB_decoder_t plugin;
-static DB_functions_t *deadbeef;
-
-#define READBUFFER 0x2800 // 10k is enough for single frame
-
-// vbrmethod constants
-#define XING_CBR 1 
-#define XING_ABR 2
-#define XING_VBR1 3
-#define XING_VBR2 4
-#define XING_VBR3 5
-#define XING_VBR4 6
-#define XING_CBR2 8
-#define XING_ABR2 9
-#define DETECTED_VBR 100
-
-// xing header flags
-#define FRAMES_FLAG 0x0001
-#define BYTES_FLAG 0x0002
-#define TOC_FLAG 0x0004
-#define VBR_SCALE_FLAG 0x0008
-
-typedef struct {
- DB_FILE *file;
- DB_playItem_t *it;
-
- // input buffer, for MPEG data
- char inputREADBUFFER;
- int remaining;
-
- // output buffer, supplied by player
- int readsize;
- int decode_remaining; // number of decoded samples of current mpeg frame
- char *out;
-
- // information, filled by cmp3_scan_stream
- int version;
- int layer;
- int bitrate;
- int samplerate;
- int packetlength;
- int bitspersample;
- int channels;
- float duration;
-
- // currentsample and totalsamples are in the entire file scope (delay/padding inclusive)
- int currentsample;
- int totalsamples;
-
- int skipsamples;
-
- int64_t startoffset; // in bytes (id3v2, xing/lame)
- int64_t endoffset; // in bytes (apev2, id3v1)
-
- // startsample and endsample exclude delay/padding
- int startsample;
- int endsample;
-
- // number of samples to skip at the start/end of file
- int delay;
- int padding;
-
- float avg_packetlength;
- int avg_samplerate;
- int avg_samples_per_frame;
- int nframes;
- int last_comment_update;
- int vbr;
- int have_xing_header;
- int lead_in_frames;
-} buffer_t;
-
-typedef struct {
- DB_fileinfo_t info;
- buffer_t buffer;
- struct mad_stream stream;
- struct mad_frame frame;
- struct mad_synth synth;
-} mpgmad_info_t;
-
-
-static uint32_t
-extract_i32 (unsigned char *buf)
-{
- uint32_t x;
- // big endian extract
-
- x = buf0;
- x <<= 8;
- x |= buf1;
- x <<= 8;
- x |= buf2;
- x <<= 8;
- x |= buf3;
-
- return x;
-}
-
-static inline uint32_t
-extract_i32_le (unsigned char *buf)
-{
- uint32_t x;
- // little endian extract
-
- x = buf3;
- x <<= 8;
- x |= buf2;
- x <<= 8;
- x |= buf1;
- x <<= 8;
- x |= buf0;
-
- return x;
-}
-static inline uint16_t
-extract_i16 (unsigned char *buf)
-{
- uint16_t x;
- // big endian extract
-
- x = buf0;
- x <<= 8;
- x |= buf1;
- x <<= 8;
-
- return x;
-}
-
-static inline float
-extract_f32 (unsigned char *buf) {
- float f;
- uint32_t *x = (uint32_t *)&f;
- *x = buf0;
- *x <<= 8;
- *x |= buf1;
- *x <<= 8;
- *x |= buf2;
- *x <<= 8;
- *x |= buf3;
- return f;
-}
-
-// sample=-1: scan entire stream, calculate precise duration
-// sample=0: read headers/tags, calculate approximate duration
-// sample>0: seek to the frame with the sample, update skipsamples
-// return value: -1 on error
-static int
-cmp3_scan_stream (buffer_t *buffer, int sample) {
- trace ("cmp3_scan_stream %d (offs: %lld)\n", sample, deadbeef->ftell (buffer->file));
-
-// {{{ prepare for scan - seek, reset averages, etc
- int initpos = deadbeef->ftell (buffer->file);
- trace ("initpos: %d\n", initpos);
- int packetlength = 0;
- int nframe = 0;
- int scansamples = 0;
- buffer->currentsample = 0;
- buffer->skipsamples = 0;
-// int avg_bitrate = 0;
- int valid_frames = 0;
- int prev_bitrate = -1;
- buffer->samplerate = 0;
- int64_t fsize = deadbeef->fgetlength (buffer->file);
-
- if (sample <= 0) {
- buffer->totalsamples = 0;
- }
- if (sample <= 0 && buffer->avg_packetlength == 0) {
- buffer->avg_packetlength = 0;
- buffer->avg_samplerate = 0;
- buffer->avg_samples_per_frame = 0;
- buffer->nframes = 0;
- trace ("setting startoffset to %d\n", initpos);
- buffer->startoffset = initpos;
- }
-
- int lastframe_valid = 0;
- int64_t offs = -1;
-// }}}
-
- int64_t lead_in_frame_pos = buffer->startoffset;
- int64_t lead_in_frame_no = 0;
-
-#define MAX_LEAD_IN_FRAMES 10
- int64_t frame_positionsMAX_LEAD_IN_FRAMES; // positions of nframe-9, nframe-8, nframe-7, ...
- for (int i = 0; i < MAX_LEAD_IN_FRAMES; i++) {
- frame_positionsi = buffer->startoffset;
- }
-
- for (;;) {
- uint32_t hdr;
- uint8_t sync;
-// {{{ parse frame header, sync stream
- if (!lastframe_valid && offs >= 0) {
- deadbeef->fseek (buffer->file, offs+1, SEEK_SET);
- }
- offs = deadbeef->ftell (buffer->file);
- //uint8_t fb4+2+2; // 4b frame header + 2b crc + 2b sideinfo main_data_begin
- uint8_t fb4; // just the header
- if (deadbeef->fread (fb, 1, sizeof(fb), buffer->file) != sizeof(fb)) {
- break; // eof
- }
-
-retry_sync:
-
- sync = fb0;
- if (sync != 0xff) {
-// trace ("1frame %d didn't seek to frame end\n", nframe);
- lastframe_valid = 0;
- memmove (fb, fb+1, 3);
- if (deadbeef->fread (fb+3, 1, 1, buffer->file) != 1) {
- break; // eof
- }
- offs++;
- goto retry_sync; // not an mpeg frame
- }
- else {
- // 2nd sync byte
- sync = fb1;
- if ((sync >> 5) != 7) {
-// trace ("2frame %d didn't seek to frame end\n", nframe);
- lastframe_valid = 0;
- memmove (fb, fb+1, 3);
- if (deadbeef->fread (fb+3, 1, 1, buffer->file) != 1) {
- break; // eof
- }
- offs++;
- goto retry_sync; // not an mpeg frame
- }
- }
- // found frame
- hdr = (0xff<<24) | (sync << 16);
- sync = fb2;
- hdr |= sync << 8;
- sync = fb3;
- hdr |= sync;
-
- // parse header
- 
- // sync bits
- int usync = hdr & 0xffe00000;
- if (usync != 0xffe00000) {
- fprintf (stderr, "fatal error: mp3 header parser is broken\n");
- }
-
- // mpeg version
- static const int vertbl = {3, -1, 2, 1}; // 3 is 2.5
- int ver = (hdr & (3<<19)) >> 19;
- ver = vertblver;
- if (ver < 0) {
- trace ("frame %d bad mpeg version %d\n", nframe, (hdr & (3<<19)) >> 19);
- lastframe_valid = 0;
- continue; // invalid frame
- }
-
- // layer info
- static const int ltbl = { -1, 3, 2, 1 };
- int layer = (hdr & (3<<17)) >> 17;
- layer = ltbllayer;
- if (layer < 0) {
- trace ("frame %d bad layer %d\n", nframe, (hdr & (3<<17)) >> 17);
- lastframe_valid = 0;
- continue; // invalid frame
- }
-
- // protection bit (crc)
-// int prot = (hdr & (1<<16)) >> 16;
-
- // bitrate
- static const int brtable516 = {
- { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1 },
- { 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1 },
- { 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1 },
- { 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1 },
- { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1 }
- };
- int bitrate = (hdr & (0x0f<<12)) >> 12;
- int idx = 0;
- if (ver == 1) {
- idx = layer - 1;
- }
- else {
- idx = layer == 1 ? 3 : 4;
- }
- bitrate = brtableidxbitrate;
- if (bitrate <= 0) {
- trace ("frame %d bad bitrate %d\n", nframe, (hdr & (0x0f<<12)) >> 12);
- lastframe_valid = 0;
- continue; // invalid frame
- }
-
- // samplerate
- static const int srtable34 = {
- {44100, 48000, 32000, -1},
- {22050, 24000, 16000, -1},
- {11025, 12000, 8000, -1},
- };
- int samplerate = (hdr & (0x03<<10))>>10;
- samplerate = srtablever-1samplerate;
- if (samplerate < 0) {
- trace ("frame %d bad samplerate %d\n", nframe, (hdr & (0x03<<10))>>10);
- lastframe_valid = 0;
- continue; // invalid frame
- }
-
- // padding
- int padding = (hdr & (0x1 << 9)) >> 9;
-
- static const int chantbl4 = { 2, 2, 2, 1 };
- int nchannels = (hdr & (0x3 << 6)) >> 6;
- nchannels = chantblnchannels;
-
- // check if channel/bitrate combination is valid for layer2
- if (layer == 2) {
- if ((bitrate <= 56 || bitrate == 80) && nchannels != 1) {
- trace ("mpgmad: bad frame %d: layer %d, channels %d, bitrate %d\n", nframe, layer, nchannels, bitrate);
- lastframe_valid = 0;
- continue; // bad frame
- }
- if (bitrate >= 224 && nchannels == 1) {
- trace ("mpgmad: bad frame %d: layer %d, channels %d, bitrate %d\n", nframe, layer, nchannels, bitrate);
- lastframe_valid = 0;
- continue; // bad frame
- }
- }
-// }}}
-
-// {{{ get side info ptr
-// uint8_t *si = fb + 4;
-// if (prot) {
-// si += 2;
-// }
-// int data_ptr = ((uint16_t)si1) | (((uint16_t)si1&0)<<8);
-// }}}
-
-// {{{ calc packet length, number of samples in a frame
- // packetlength
- packetlength = 0;
- bitrate *= 1000;
- int samples_per_frame = 0;
- if (samplerate > 0 && bitrate > 0) {
- if (layer == 1) {
- samples_per_frame = 384;
- }
- else if (layer == 2) {
- samples_per_frame = 1152;
- }
- else if (layer == 3) {
- if (ver == 1) {
- samples_per_frame = 1152;
- }
- else {
- samples_per_frame = 576;
- }
- }
- packetlength = samples_per_frame / 8 * bitrate / samplerate + padding;
-// if (sample > 0) {
-// printf ("frame: %d, crc: %d, layer: %d, bitrate: %d, samplerate: %d, filepos: 0x%llX, dataoffs: 0x%X, size: 0x%X\n", nframe, prot, layer, bitrate, samplerate, deadbeef->ftell (buffer->file)-8, data_ptr, packetlength);
-// }
- }
- else {
- trace ("frame %d samplerate or bitrate is invalid\n", nframe);
- lastframe_valid = 0;
- continue;
- }
-// }}}
-
-// {{{ vbr adjustement
- if (!buffer->have_xing_header && prev_bitrate != -1 && prev_bitrate != bitrate) {
- buffer->vbr = DETECTED_VBR;
- }
- prev_bitrate = bitrate;
-// }}}
-
- valid_frames++;
-
-// {{{ update stream parameters, only when sample!=0 or 1st frame
- if (sample != 0 || nframe == 0)
- {
- if (sample == 0 && lastframe_valid) {
- return 0;
- }
- // don't get parameters from frames coming after any bad frame
- buffer->version = ver;
- buffer->layer = layer;
- buffer->bitrate = bitrate;
- buffer->samplerate = samplerate;
- buffer->packetlength = packetlength;
- if (nchannels > buffer->channels) {
- buffer->channels = nchannels;
- }
- buffer->bitspersample = 16;
-// trace ("frame %d mpeg v%d layer %d bitrate %d samplerate %d packetlength %d channels %d\n", nframe, ver, layer, bitrate, samplerate, packetlength, nchannels);
- }
-// }}}
-
- lastframe_valid = 1;
-
- int64_t framepos = deadbeef->ftell (buffer->file)-(int)sizeof(fb);
-
- // allow at least 10 lead-in frames, to fill bit-reservoir
- if (nframe - lead_in_frame_no > MAX_LEAD_IN_FRAMES) {
- lead_in_frame_pos = frame_positions0;
- lead_in_frame_no++;
- }
- memmove (frame_positions, &frame_positions1, sizeof (int64_t) * (MAX_LEAD_IN_FRAMES-1));
- frame_positionsMAX_LEAD_IN_FRAMES-1 = framepos;
-
-// {{{ detect/load xing frame, only on 1st pass
- // try to read xing/info tag (only on initial scans)
- if (sample <= 0 && !buffer->have_xing_header)
- {
- if (!buffer->file->vfs->is_streaming ()) {
- // trace ("trying to read xing header at pos %d\n", framepos);
- if (ver == 1) {
- deadbeef->fseek (buffer->file, 32/*-2-2*prot*/, SEEK_CUR);
- }
- else if (ver == 2) {
- // in mpeg2 streams, sideinfo is 17 bytes
- deadbeef->fseek (buffer->file, 17/*-2-prot*2*/, SEEK_CUR);
- }
- const char xing = "Xing";
- const char info = "Info";
- char magic4;
- if (deadbeef->fread (magic, 1, 4, buffer->file) != 4) {
- trace ("cmp3_scan_stream: EOF while checking for Xing header\n");
- return -1; // EOF
- }
-
- // trace ("xing magic: %c%c%c%c\n", magic0, magic1, magic2, magic3);
-
- if (!strncmp (xing, magic, 4) || !strncmp (info, magic, 4)) {
- trace ("xing/info frame found\n");
- buffer->startoffset += packetlength;
- // read flags
- uint32_t flags;
- uint8_t buf4;
- if (deadbeef->fread (buf, 1, 4, buffer->file) != 4) {
- trace ("cmp3_scan_stream: EOF while parsing Xing header\n");
- return -1; // EOF
- }
- flags = extract_i32 (buf);
- if (flags & FRAMES_FLAG) {
- // read number of frames
- if (deadbeef->fread (buf, 1, 4, buffer->file) != 4) {
- trace ("cmp3_scan_stream: EOF while parsing Xing header\n");
- return -1; // EOF
- }
- uint32_t nframes = extract_i32 (buf);
- if (sample == 0) {
- buffer->duration = (((uint64_t)nframes * (uint64_t)samples_per_frame) - buffer->delay - buffer->padding)/ (float)samplerate;
- }
- trace ("xing totalsamples: %d, nframes: %d, samples_per_frame: %d\n", nframes*samples_per_frame, nframes, samples_per_frame);
- if (nframes <= 0 || samples_per_frame <= 0) {
- trace ("bad xing header\n");
- continue;
- }
- buffer->totalsamples = nframes * samples_per_frame;
- buffer->samplerate = samplerate;
- }
- if (flags & BYTES_FLAG) {
- deadbeef->fseek (buffer->file, 4, SEEK_CUR);
- }
- if (flags & TOC_FLAG) {
- deadbeef->fseek (buffer->file, 100, SEEK_CUR);
- }
- if (flags & VBR_SCALE_FLAG) {
- deadbeef->fseek (buffer->file, 4, SEEK_CUR);
- }
- // lame header
- if (deadbeef->fread (buf, 1, 4, buffer->file) != 4) {
- trace ("cmp3_scan_stream: EOF while reading LAME header\n");
- return -1; // EOF
- }
- // trace ("tell=%x, %c%c%c%c\n", deadbeef->ftell(buffer->file), buf0, buf1, buf2, buf3);
-
- deadbeef->fseek (buffer->file, 5, SEEK_CUR);
- uint8_t rev = 0;
- if (deadbeef->fread (&rev, 1, 1, buffer->file) != 1) {
- trace ("cmp3_scan_stream: EOF while reading info tag revision / vbr method\n");
- }
- switch (rev & 0x0f) {
- case XING_ABR ... XING_VBR4:
- case XING_ABR2:
- buffer->vbr = rev & 0x0f;
- break;
- default:
- buffer->vbr = DETECTED_VBR;
- break;
- }
- if (!memcmp (buf, "LAME", 4)) {
- trace ("lame header found\n");
-
- // FIXME: that can be optimized by single read
- uint8_t lpf;
- deadbeef->fread (&lpf, 1, 1, buffer->file);
- //3 floats: replay gain
- deadbeef->fread (buf, 1, 4, buffer->file);
- // float rg_peaksignalamp = extract_f32 (buf);
- deadbeef->fread (buf, 1, 2, buffer->file);
- // uint16_t rg_radio = extract_i16 (buf);
-
- deadbeef->fread (buf, 1, 2, buffer->file);
- // uint16_t rg_audiophile = extract_i16 (buf);
-
- // skip
- deadbeef->fseek (buffer->file, 2, SEEK_CUR);
- deadbeef->fread (buf, 1, 3, buffer->file);
- buffer->delay = (((uint32_t)buf0) << 4) | ((((uint32_t)buf1) & 0xf0)>>4);
- buffer->padding = ((((uint32_t)buf1)&0x0f)<<8) | ((uint32_t)buf2);
- // skip
- deadbeef->fseek (buffer->file, 1, SEEK_CUR);
- // mp3gain
- uint8_t mp3gain;
- deadbeef->fread (&mp3gain, 1, 1, buffer->file);
- // skip
- deadbeef->fseek (buffer->file, 2, SEEK_CUR);
- // musiclen
- deadbeef->fread (buf, 1, 4, buffer->file);
- // uint32_t musiclen = extract_i32 (buf);
-
- //trace ("lpf: %d, peaksignalamp: %f, radiogain: %d, audiophile: %d, delay: %d, padding: %d, mp3gain: %d, musiclen: %d\n", lpf, rg_peaksignalamp, rg_radio, rg_audiophile, delay, padding, mp3gain, musiclen);
- // skip crc
- //deadbeef->fseek (buffer->file, 4, SEEK_CUR);
- trace ("lame totalsamples: %d\n", buffer->totalsamples);
- }
- if (sample <= 0 && (flags&FRAMES_FLAG)) {
- buffer->have_xing_header = 1;
- buffer->startoffset = framepos+packetlength;
- deadbeef->fseek (buffer->file, buffer->startoffset, SEEK_SET);
- if (fsize >= 0) {
- buffer->bitrate = (fsize - buffer->startoffset - buffer->endoffset)/ buffer->samplerate * 1000;
- }
- }
- }
- }
- if (sample == 0) {
- if (buffer->file->vfs->is_streaming ()) {
- // only suitable for cbr files, used if streaming
- int sz = deadbeef->fgetlength (buffer->file);
- if (sz > 0) {
- sz -= buffer->startoffset + buffer->endoffset;
- if (sz < 0) {
- trace ("cmp3_scan_stream: bad file headers\n");
- return -1;
- }
- }
- if (sz < 0) {
- // unable to determine duration
- buffer->duration = -1;
- buffer->totalsamples = -1;
- if (sample == 0) {
- trace ("check validity of the next frame...\n");
- deadbeef->fseek (buffer->file, framepos+packetlength, SEEK_SET);
- continue;
- }
- trace ("cmp3_scan_stream: unable to determine duration");
- return 0;
- }
- buffer->nframes = sz / packetlength;
- buffer->avg_packetlength = packetlength;
- buffer->avg_samplerate = samplerate;
- buffer->avg_samples_per_frame = samples_per_frame;
- buffer->duration = (((uint64_t)buffer->nframes * (uint64_t)samples_per_frame) - buffer->delay - buffer->padding)/ (float)samplerate;
- buffer->totalsamples = buffer->nframes * samples_per_frame;
- trace ("totalsamples: %d, samplesperframe: %d, fsize=%lld\n", buffer->totalsamples, samples_per_frame, fsize);
-// trace ("bitrate=%d, layer=%d, packetlength=%d, fsize=%d, nframes=%d, samples_per_frame=%d, samplerate=%d, duration=%f, totalsamples=%d\n", bitrate, layer, packetlength, sz, nframe, samples_per_frame, samplerate, buffer->duration, buffer->totalsamples);
-
- if (sample == 0) {
- deadbeef->fseek (buffer->file, framepos, SEEK_SET);
- return 0;
- }
- }
- else {
- deadbeef->fseek (buffer->file, framepos, SEEK_SET);
- }
- }
- else {
- deadbeef->fseek (buffer->file, framepos+packetlength, SEEK_SET);
- buffer->have_xing_header = 1;
- }
- }
-// }}}
-
- if (sample == 0) {
-// {{{ update averages, interrupt scan on frame #100
- if (fsize <= 0) {
- trace ("cmp3_scan_stream: negative file size\n");
- return -1;
- }
- // calculating apx duration based on 1st 100 frames
- buffer->avg_packetlength += packetlength;
- buffer->avg_samplerate += samplerate;
- buffer->avg_samples_per_frame += samples_per_frame;
- //avg_bitrate += bitrate;
- if (nframe >= 100) {
- goto end_scan;
- }
-// }}}
- }
- else {
- // seeking to particular sample, interrupt if reached
- if (sample > 0 && scansamples + samples_per_frame >= sample) {
- deadbeef->fseek (buffer->file, lead_in_frame_pos, SEEK_SET);
- buffer->lead_in_frames = nframe-lead_in_frame_no;
- buffer->currentsample = sample;
- buffer->skipsamples = sample - scansamples;
- trace ("scan: cursample=%d, frame: %d, skipsamples: %d, filepos: %llX, lead-in frames: %d\n", buffer->currentsample, nframe, buffer->skipsamples, deadbeef->ftell (buffer->file), buffer->lead_in_frames);
- return 0;
- }
- }
- scansamples += samples_per_frame;
- nframe++;
- if (packetlength > 0) {
- deadbeef->fseek (buffer->file, packetlength-(int)sizeof(fb), SEEK_CUR);
- }
- }
-end_scan:
- if (nframe == 0) {
- trace ("cmp3_scan_stream: couldn't find mpeg frames in file\n");
- return -1;
- }
- if (sample == 0) {
-// {{{ calculate final averages
- buffer->avg_packetlength /= (float)valid_frames;
- buffer->avg_samplerate /= valid_frames;
- buffer->avg_samples_per_frame /= valid_frames;
-// avg_bitrate /= valid_frames;
- //trace ("valid_frames=%d, avg_bitrate=%d, avg_packetlength=%f, avg_samplerate=%d, avg_samples_per_frame=%d\n", valid_frames, avg_bitrate, buffer->avg_packetlength, buffer->avg_samplerate, buffer->avg_samples_per_frame);
- trace ("startoffs: %lld, endoffs: %lld\n", buffer->startoffset, buffer->endoffset);
-
- buffer->nframes = (fsize - buffer->startoffset - buffer->endoffset) / buffer->avg_packetlength;
- if (!buffer->have_xing_header) {
- buffer->totalsamples = buffer->nframes * buffer->avg_samples_per_frame;
- buffer->duration = (buffer->totalsamples - buffer->delay - buffer->padding) / (float)buffer->avg_samplerate;
- }
- buffer->bitrate = (fsize - buffer->startoffset - buffer->endoffset) / buffer->duration * 8;
- trace ("nframes: %d, fsize: %lld, spf: %d, smp: %d, totalsamples: %d\n", buffer->nframes, fsize, buffer->avg_samples_per_frame, buffer->avg_samplerate, buffer->totalsamples);
-// }}}
- return 0;
- }
-
- buffer->totalsamples = scansamples;
- buffer->duration = (buffer->totalsamples - buffer->delay - buffer->padding) / (float)buffer->samplerate;
-// printf ("nframes=%d, totalsamples=%d, samplerate=%d, dur=%f\n", nframe, scansamples, buffer->samplerate, buffer->duration);
- return 0;
-}
-
-int
-cmp3_seek_stream (DB_fileinfo_t *_info, int sample) {
- mpgmad_info_t *info = (mpgmad_info_t *)_info;
- if (sample == 0) {
- _info->readpos = 0;
- info->buffer.currentsample = 0;
- info->buffer.skipsamples = 0;
- return 0;
-
- }
-#if WRITE_DUMP
- if (out) {
- fclose (out);
- out = fopen ("out.raw", "w+b");
- }
-#endif
-
- int res = cmp3_scan_stream (&info->buffer, sample);
- return res;
-}
-
-
-static DB_fileinfo_t *
-cmp3_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (mpgmad_info_t));
- mpgmad_info_t *info = (mpgmad_info_t *)_info;
- memset (info, 0, sizeof (mpgmad_info_t));
- return _info;
-}
-
-void
-cmp3_set_extra_properties (buffer_t *buffer, int fake) {
- char s100;
- int64_t size = deadbeef->fgetlength (buffer->file);
- if (size >= 0) {
- snprintf (s, sizeof (s), "%lld", size);
- deadbeef->pl_replace_meta (buffer->it, ":FILE_SIZE", s);
- }
- else {
- deadbeef->pl_replace_meta (buffer->it, ":FILE_SIZE", "∞");
- }
- if (buffer->bitrate > 0) {
- snprintf (s, sizeof (s), "%d", buffer->bitrate/1000);
- deadbeef->pl_replace_meta (buffer->it, ":BITRATE", s);
- }
- deadbeef->pl_replace_meta (buffer->it, ":BPS", "16");
- snprintf (s, sizeof (s), "%d", buffer->channels);
- deadbeef->pl_replace_meta (buffer->it, ":CHANNELS", s);
- snprintf (s, sizeof (s), "%d", buffer->samplerate);
- deadbeef->pl_replace_meta (buffer->it, ":SAMPLERATE", s);
-
- // set codec profile (cbr or vbr) and mp3 vbr method (guessed, or from Xing/Info header)
-
- switch (buffer->vbr) {
- case XING_ABR:
- deadbeef->pl_replace_meta (buffer->it, ":CODEC_PROFILE", "VBR");
- deadbeef->pl_replace_meta (buffer->it, ":MP3_VBR_METHOD", "ABR");
- break;
- case XING_VBR1:
- deadbeef->pl_replace_meta (buffer->it, ":CODEC_PROFILE", "VBR");
- deadbeef->pl_replace_meta (buffer->it, ":MP3_VBR_METHOD", "full VBR method 1");
- break;
- case XING_VBR2:
- deadbeef->pl_replace_meta (buffer->it, ":CODEC_PROFILE", "VBR");
- deadbeef->pl_replace_meta (buffer->it, ":MP3_VBR_METHOD", "full VBR method 2");
- break;
- case XING_VBR3:
- deadbeef->pl_replace_meta (buffer->it, ":CODEC_PROFILE", "VBR");
- deadbeef->pl_replace_meta (buffer->it, ":MP3_VBR_METHOD", "full VBR method 3");
- break;
- case XING_VBR4:
- deadbeef->pl_replace_meta (buffer->it, ":CODEC_PROFILE", "VBR");
- deadbeef->pl_replace_meta (buffer->it, ":MP3_VBR_METHOD", "full VBR method 4");
- break;
- case XING_CBR2:
- deadbeef->pl_replace_meta (buffer->it, ":CODEC_PROFILE", "CBR");
- break;
- case XING_ABR2:
- deadbeef->pl_replace_meta (buffer->it, ":CODEC_PROFILE", "VBR");
- deadbeef->pl_replace_meta (buffer->it, ":MP3_VBR_METHOD", "ABR 2 pass");
- break;
- case DETECTED_VBR:
- deadbeef->pl_replace_meta (buffer->it, ":CODEC_PROFILE", "VBR");
- deadbeef->pl_replace_meta (buffer->it, ":MP3_VBR_METHOD", "unspecified");
- break;
- default:
- deadbeef->pl_replace_meta (buffer->it, ":CODEC_PROFILE", "CBR");
- break;
- }
- const char *versions = {"1", "2", "2.5"};
- snprintf (s, sizeof (s), "MPEG%s layer%d", versionsbuffer->version-1, buffer->layer);
- deadbeef->pl_replace_meta (buffer->it, ":MPEG_VERSION", s);
- deadbeef->pl_replace_meta (buffer->it, ":XING_HEADER", buffer->have_xing_header ? "Yes" : "No");
- deadbeef->pl_replace_meta (buffer->it, fake ? "!FILETYPE" : ":FILETYPE", "MP3");
-}
-
-static int
-cmp3_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
- mpgmad_info_t *info = (mpgmad_info_t *)_info;
- _info->plugin = &plugin;
- memset (&info->buffer, 0, sizeof (info->buffer));
- deadbeef->pl_lock ();
- info->buffer.file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
- if (!info->buffer.file) {
- return -1;
- }
- info->info.file = info->buffer.file;
- deadbeef->pl_item_ref (it);
- info->buffer.it = it;
- info->info.readpos = 0;
- if (!info->buffer.file->vfs->is_streaming ()) {
- int skip = deadbeef->junk_get_leading_size (info->buffer.file);
- if (skip > 0) {
- trace ("mpgmad: skipping %d(%xH) bytes of junk\n", skip, skip);
- deadbeef->fseek (info->buffer.file, skip, SEEK_SET);
- }
- int res = cmp3_scan_stream (&info->buffer, deadbeef->conf_get_int ("mp3.disable_gapless", 0) ? 0 : -1);
- if (res < 0) {
- trace ("mpgmad: cmp3_init: initial cmp3_scan_stream failed\n");
- return -1;
- }
- info->buffer.delay += 529;
- if (info->buffer.padding >= 529) {
- info->buffer.padding -= 529;
- }
- if (it->endsample > 0) {
- info->buffer.startsample = it->startsample + info->buffer.delay;
- info->buffer.endsample = it->endsample + info->buffer.delay;
- // that comes from cue, don't calc duration, just seek and play
- trace ("mp3 totalsamples: %d\n", info->buffer.endsample-info->buffer.startsample+1);
- }
- else {
- ddb_playlist_t *plt = deadbeef->pl_get_playlist (it);
- deadbeef->plt_set_item_duration (plt, it, info->buffer.duration);
- if (plt) {
- deadbeef->plt_unref (plt);
- }
- info->buffer.startsample = info->buffer.delay;
- info->buffer.endsample = info->buffer.totalsamples-info->buffer.padding-1;
- trace ("mp3 totalsamples: %d (%d, %d, %d | %d %d)\n", info->buffer.endsample-info->buffer.startsample+1, info->buffer.totalsamples, info->buffer.delay, info->buffer.padding, info->buffer.startsample, info->buffer.endsample);
- trace ("mpgmad: seeking to %d(%xH) start offset\n", info->buffer.startoffset, info->buffer.startoffset);
- deadbeef->fseek (info->buffer.file, info->buffer.startoffset, SEEK_SET);
- }
- plugin.seek_sample (_info, 0);
- trace ("mp3: startsample: %d, endsample: %d, currentsample: %d\n", info->buffer.startsample, info->buffer.endsample, info->buffer.currentsample);
- }
- else {
- deadbeef->fset_track (info->buffer.file, it);
- deadbeef->pl_add_meta (it, "title", NULL);
- int res = cmp3_scan_stream (&info->buffer, 0);
- if (res < 0) {
- trace ("mpgmad: cmp3_init: initial cmp3_scan_stream failed\n");
- return -1;
- }
- deadbeef->fseek (info->buffer.file, 0, SEEK_SET);
-
- cmp3_set_extra_properties (&info->buffer, 1);
-
- ddb_playlist_t *plt = deadbeef->pl_get_playlist (it);
- deadbeef->plt_set_item_duration (plt, it, info->buffer.duration);
- if (plt) {
- deadbeef->plt_unref (plt);
- }
- if (info->buffer.duration >= 0) {
- info->buffer.endsample = info->buffer.totalsamples - 1;
- }
- else {
-// info->buffer.duration = 200;
-// info->buffer.totalsamples = 10000000;
-// info->buffer.endsample = info->buffer.totalsamples-1;
- info->buffer.endsample = -1;
- info->buffer.totalsamples = -1;
- }
- info->buffer.skipsamples = 0;
- info->buffer.currentsample = 0;
- if (info->buffer.duration < 0) {
- info->buffer.duration = -1;
- info->buffer.totalsamples = -1;
- info->buffer.endsample = -1;
- }
- trace ("duration=%f, endsample=%d, totalsamples=%d\n", info->buffer.duration, info->buffer.endsample, info->buffer.totalsamples);
- }
- if (info->buffer.samplerate == 0) {
- trace ("bad mpeg file: %s\n", deadbeef->pl_find_meta (it, ":URI"));
- return -1;
- }
- _info->fmt.bps = info->buffer.bitspersample;
- _info->fmt.samplerate = info->buffer.samplerate;
- _info->fmt.channels = info->buffer.channels;
- _info->fmt.channelmask = _info->fmt.channels == 1 ? DDB_SPEAKER_FRONT_LEFT : (DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT);
- trace ("mp3 format: bps:%d sr:%d channels:%d\n", _info->fmt.bps, _info->fmt.samplerate, _info->fmt.channels);
-
-	mad_stream_init(&info->stream);
-	mad_stream_options (&info->stream, MAD_OPTION_IGNORECRC);
-	mad_frame_init(&info->frame);
-	mad_synth_init(&info->synth);
-
- return 0;
-}
-
-/****************************************************************************
- * Converts a sample from libmad's fixed point number format to a signed	*
- * short (16 bits).															*
- ****************************************************************************/
-static inline int16_t
-MadFixedToSshort(mad_fixed_t Fixed)
-{
-	/* A fixed point number is formed of the following bit pattern:
-	 *
-	 * SWWWFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-	 * MSB LSB
-	 * S ==> Sign (0 is positive, 1 is negative)
-	 * W ==> Whole part bits
-	 * F ==> Fractional part bits
-	 *
-	 * This pattern contains MAD_F_FRACBITS fractional bits, one
-	 * should alway use this macro when working on the bits of a fixed
-	 * point number. It is not guaranteed to be constant over the
-	 * different platforms supported by libmad.
-	 *
-	 * The signed short value is formed, after clipping, by the least
-	 * significant whole part bit, followed by the 15 most significant
-	 * fractional part bits. Warning: this is a quick and dirty way to
-	 * compute the 16-bit number, madplay includes much better
-	 * algorithms.
-	 */
-
-	/* Clipping */
-	if(Fixed>=MAD_F_ONE)
-		return(32767);
-	if(Fixed<=-MAD_F_ONE)
-		return(-32768);
-
-	/* Conversion. */
-	Fixed=Fixed>>(MAD_F_FRACBITS-15);
-	return((signed short)Fixed);
-}
-
-static inline float
-MadFixedToFloat (mad_fixed_t Fixed) {
- return (float)((Fixed) / (float)(1L << MAD_F_FRACBITS));
-}
-
-#define MadErrorString(x) mad_stream_errorstr(x)
-
-static inline void
-cmp3_skip (mpgmad_info_t *info) {
- if (info->buffer.skipsamples > 0) {
- int skip = min (info->buffer.skipsamples, info->buffer.decode_remaining);
-// printf ("skip %d / %d\n", skip, info->buffer.skipsamples);
- info->buffer.skipsamples -= skip;
- info->buffer.decode_remaining -= skip;
- }
-}
-
-#if 0
-static void
-dump_buffer (buffer_t *buffer) {
- printf ("*** DUMP ***\n");
- printf ("remaining: %d\n", buffer->remaining);
-
- printf ("readsize: %d\n", buffer->readsize);
- printf ("decode_remaining: %d\n", buffer->decode_remaining);
-
- // information, filled by cmp3_scan_stream
- printf ("%d\n", buffer->version);
- printf ("%d\n", buffer->layer);
- printf ("%d\n", buffer->bitrate);
- printf ("%d\n", buffer->samplerate);
- printf ("%d\n", buffer->packetlength);
- printf ("%d\n", buffer->bitspersample);
- printf ("%d\n", buffer->channels);
- printf ("%f\n", buffer->duration);
-
- printf ("%d\n", buffer->currentsample);
- printf ("%d\n", buffer->totalsamples);
- printf ("%d\n", buffer->skipsamples);
- printf ("%d\n", buffer->startoffset);
- printf ("%d\n", buffer->endoffset);
- printf ("%d\n", buffer->startsample);
- printf ("%d\n", buffer->endsample);
- printf ("%d\n", buffer->delay);
- printf ("%d\n", buffer->padding);
-
- printf ("%f\n", buffer->avg_packetlength);
- printf ("%d\n", buffer->avg_samplerate);
- printf ("%d\n", buffer->avg_samples_per_frame);
- printf ("%d\n", buffer->nframes);
- printf ("%d\n", buffer->last_comment_update);
- printf ("%d\n", buffer->vbr);
- printf ("%d\n", buffer->have_xing_header);
- printf ("%d\n", buffer->current_decode_frame);
- printf ("%lld\n", buffer->lastframe_filepos);
-
- printf ("*** END ***\n");
-}
-#endif
-
-// decoded requested number of samples to int16 format
-static void
-cmp3_decode_requested_int16 (mpgmad_info_t *info) {
- cmp3_skip (info);
- if (info->buffer.skipsamples > 0) {
- return;
- }
- // copy synthesized samples into readbuffer
- int idx = info->synth.pcm.length-info->buffer.decode_remaining;
-
- // stereo
- if (MAD_NCHANNELS(&info->frame.header) == 2 && info->info.fmt.channels == 2) {
- while (info->buffer.decode_remaining > 0 && info->buffer.readsize > 0) {
- *((int16_t*)info->buffer.out) = MadFixedToSshort (info->synth.pcm.samples0idx);
- info->buffer.readsize -= 2;
- info->buffer.out += 2;
- *((int16_t*)info->buffer.out) = MadFixedToSshort (info->synth.pcm.samples1idx);
- info->buffer.readsize -= 2;
- info->buffer.out += 2;
- info->buffer.decode_remaining--;
- idx++;
- }
- }
- // mono
- else if (MAD_NCHANNELS(&info->frame.header) == 1 && info->info.fmt.channels == 1){
- while (info->buffer.decode_remaining > 0 && info->buffer.readsize > 0) {
- *((int16_t*)info->buffer.out) = MadFixedToSshort (info->synth.pcm.samples0idx);
- info->buffer.readsize -= 2;
- info->buffer.out += 2;
- info->buffer.decode_remaining--;
- idx++;
- }
- }
- // workaround for bad mp3s that have both mono and stereo frames
- else if (MAD_NCHANNELS(&info->frame.header) == 1 && info->info.fmt.channels == 2) {
- while (info->buffer.decode_remaining > 0 && info->buffer.readsize > 0) {
- int16_t sample = MadFixedToSshort (info->synth.pcm.samples0idx);
- *((int16_t*)info->buffer.out) = sample;
- info->buffer.readsize -= 2;
- info->buffer.out += 2;
- *((int16_t*)info->buffer.out) = sample;
- info->buffer.readsize -= 2;
- info->buffer.out += 2;
- info->buffer.decode_remaining--;
- idx++;
- }
- }
- else if (MAD_NCHANNELS(&info->frame.header) == 2 && info->info.fmt.channels == 1) {
- while (info->buffer.decode_remaining > 0 && info->buffer.readsize > 0) {
- int16_t sample = MadFixedToSshort (info->synth.pcm.samples0idx);
- *((int16_t*)info->buffer.out) = sample;
- info->buffer.readsize -= 2;
- info->buffer.out += 2;
- info->buffer.decode_remaining--;
- idx++;
- }
- }
- assert (info->buffer.readsize >= 0);
-}
-
-static int
-cmp3_stream_frame (mpgmad_info_t *info) {
- int eof = 0;
- while (!eof && (info->stream.buffer == NULL || info->buffer.decode_remaining <= 0)) {
- // read more MPEG data if needed
- if(info->stream.buffer==NULL || info->stream.error==MAD_ERROR_BUFLEN) {
- // copy part of last frame to beginning
- if (info->stream.next_frame && info->stream.bufend <= info->stream.next_frame) {
- eof = 1;
- break;
- }
- if (info->stream.next_frame != NULL) {
- info->buffer.remaining = info->stream.bufend - info->stream.next_frame;
- memmove (info->buffer.input, info->stream.next_frame, info->buffer.remaining);
- }
- int size = READBUFFER - info->buffer.remaining;
- int bytesread = 0;
- uint8_t *bytes = info->buffer.input + info->buffer.remaining;
- bytesread = deadbeef->fread (bytes, 1, size, info->buffer.file);
- if (!bytesread) {
- // add guard
- eof = 1;
- memset (bytes, 0, 8);
- bytesread = 8;
- }
- if (bytesread < size) {
- // end of file
- size -= bytesread;
- bytes += bytesread;
- }
- bytesread += info->buffer.remaining;
- mad_stream_buffer(&info->stream,info->buffer.input,bytesread);
- if (info->stream.buffer==NULL) {
- // check sync bits
- if (bytes0 != 0xff || (bytes1&(3<<5)) != (3<<5)) {
- trace ("mpgmad: read didn't start at frame boundary!\ncmp3_scan_stream is broken\n");
- }
- else {
- trace ("mpgmad: streambuffer=NULL\n");
- }
- }
- }
- info->stream.error=0;
-
- // decode next frame
- if(mad_frame_decode(&info->frame,&info->stream))
- {
- if(MAD_RECOVERABLE(info->stream.error))
- {
- if(info->stream.error!=MAD_ERROR_LOSTSYNC) {
-// printf ("mpgmad: recoverable frame level error (%s)\n", MadErrorString(&info->stream));
- }
- if (info->buffer.lead_in_frames > 0) {
- info->buffer.lead_in_frames--;
- }
- continue;
- }
- else {
- if(info->stream.error==MAD_ERROR_BUFLEN) {
-// printf ("mpgmad: recoverable frame level error (%s)\n", MadErrorString(&info->stream));
- continue;
- }
- else
- {
-// printf ("mpgmad: unrecoverable frame level error (%s).\n", MadErrorString(&info->stream));
- return -1; // fatal error
- }
- }
- }
- mad_synth_frame(&info->synth,&info->frame);
- if (info->buffer.lead_in_frames > 0) {
- info->buffer.lead_in_frames--;
- info->buffer.decode_remaining = 0;
- continue;
- }
-
- info->info.fmt.samplerate = info->frame.header.samplerate;
-
- // synthesize single frame
- info->buffer.decode_remaining = info->synth.pcm.length;
- deadbeef->streamer_set_bitrate (info->frame.header.bitrate/1000);
- break;
- }
-
- return eof;
-}
-
-static int
-cmp3_decode_int16 (mpgmad_info_t *info) {
- int eof = 0;
- while (!eof) {
- eof = cmp3_stream_frame (info);
- if (info->buffer.decode_remaining > 0) {
- int readsize = info->buffer.readsize;
- cmp3_decode_requested_int16 (info);
- if (info->buffer.readsize == 0) {
- return 0;
- }
- }
- }
- return 0;
-}
-
-static void
-cmp3_free (DB_fileinfo_t *_info) {
- mpgmad_info_t *info = (mpgmad_info_t *)_info;
- if (info->buffer.it) {
- deadbeef->pl_item_unref (info->buffer.it);
- }
- if (info->buffer.file) {
- deadbeef->fclose (info->buffer.file);
- info->buffer.file = NULL;
- info->info.file = NULL;
- mad_synth_finish (&info->synth);
- mad_frame_finish (&info->frame);
- mad_stream_finish (&info->stream);
- }
- free (info);
-}
-
-static int
-cmp3_read (DB_fileinfo_t *_info, char *bytes, int size) {
-#if WRITE_DUMP
- if (!out) {
- out = fopen ("out.raw", "w+b");
- }
-#endif
- int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
- mpgmad_info_t *info = (mpgmad_info_t *)_info;
- if (info->buffer.duration >= 0 && !info->buffer.file->vfs->is_streaming ()) {
- int curr = info->buffer.currentsample;
- //printf ("curr: %d -> end %d, padding: %d\n", curr, info->buffer.endsample, info->buffer.padding);
- if (size / samplesize + curr > info->buffer.endsample) {
- size = (info->buffer.endsample - curr + 1) * samplesize;
- trace ("\0330;32mmp3: size truncated to %d bytes (%d samples), cursample=%d, endsample=%d\03337;0m\n", size, info->buffer.endsample - curr + 1, curr, info->buffer.endsample);
- if (size <= 0) {
- return 0;
- }
- }
- }
- int initsize = size;
- info->buffer.readsize = size;
- info->buffer.out = bytes;
- cmp3_decode_int16 (info);
- info->buffer.currentsample += (size - info->buffer.readsize) / samplesize;
- _info->readpos = (float)(info->buffer.currentsample - info->buffer.startsample) / info->buffer.samplerate;
-#if WRITE_DUMP
- if (size - info->buffer.readsize > 0) {
- fwrite (bytes, 1, size - info->buffer.readsize, out);
- }
-#endif
-// if (initsize-info->buffer.readsize != size) {
-// printf ("\0330;31meof at sample %d\03337;0m\n", info->buffer.currentsample);
-// }
- return initsize - info->buffer.readsize;
-}
-
-static int
-cmp3_seek_sample (DB_fileinfo_t *_info, int sample) {
- mpgmad_info_t *info = (mpgmad_info_t *)_info;
- if (!info->buffer.file) {
- return -1;
- }
-
-// {{{ handle net streaming case
- if (info->buffer.file->vfs->is_streaming ()) {
- if (info->buffer.totalsamples > 0 && info->buffer.avg_samples_per_frame > 0 && info->buffer.avg_packetlength > 0) { // that means seekable remote stream, like podcast
- trace ("seeking is possible!\n");
- // get length excluding id3v2
- int64_t l = deadbeef->fgetlength (info->buffer.file) - info->buffer.startoffset - info->buffer.endoffset;
- 
- int r;
-
- // seek to beginning of the frame
- int64_t frm = sample / info->buffer.avg_samples_per_frame;
- r = deadbeef->fseek (info->buffer.file, frm * info->buffer.avg_packetlength + info->buffer.startoffset, SEEK_SET);
-
-// l = l * sample / buffer.totalsamples;
-// r = deadbeef->fseek (buffer.file, l, SEEK_SET);
-
- if (!r) {
- info->buffer.skipsamples = sample - frm * info->buffer.avg_samples_per_frame;
-
- info->buffer.currentsample = sample;
- _info->readpos = (float)(info->buffer.currentsample - info->buffer.startsample) / info->buffer.samplerate;
-
- // reset mad
- mad_synth_finish (&info->synth);
- mad_frame_finish (&info->frame);
- mad_stream_finish (&info->stream);
- info->buffer.remaining = 0;
- info->buffer.decode_remaining = 0;
- mad_stream_init(&info->stream);
- mad_stream_options (&info->stream, MAD_OPTION_IGNORECRC);
- mad_frame_init(&info->frame);
- mad_synth_init(&info->synth);
-
- return 0;
- }
- trace ("seek failed!\n");
- return -1;
- }
- trace ("seek is impossible (avg_samples_per_frame=%d, avg_packetlength=%f)!\n", info->buffer.avg_samples_per_frame, info->buffer.avg_packetlength);
- return 0;
- }
-// }}}
-
- sample += info->buffer.startsample;
- if (sample > info->buffer.endsample) {
- trace ("seek sample %d is beyond end of track (%d)\n", sample, info->buffer.endsample);
- return -1; // eof
- }
- // restart file, and load until we hit required pos
- deadbeef->fseek (info->buffer.file, info->buffer.startoffset, SEEK_SET);
- mad_synth_finish (&info->synth);
- mad_frame_finish (&info->frame);
- mad_stream_finish (&info->stream);
- info->buffer.remaining = 0;
- info->buffer.readsize = 0;
- info->buffer.decode_remaining = 0;
-	mad_stream_init(&info->stream);
-	mad_stream_options (&info->stream, MAD_OPTION_IGNORECRC);
-	mad_frame_init(&info->frame);
-	mad_synth_init(&info->synth);
-
-// struct timeval tm1;
-// gettimeofday (&tm1, NULL);
- if (cmp3_seek_stream (_info, sample) == -1) {
- trace ("failed to seek to sample %d\n", sample);
- _info->readpos = 0;
- return -1;
- }
-// struct timeval tm2;
-// gettimeofday (&tm2, NULL);
-// int ms = (tm2.tv_sec*1000+tm2.tv_usec/1000) - (tm1.tv_sec*1000+tm1.tv_usec/1000);
-// printf ("cmp3_scan_stream took %d ms\n", ms);
-	trace ("seeked to %d\n", info->buffer.currentsample);
- _info->readpos = (float)(info->buffer.currentsample - info->buffer.startsample) / info->buffer.samplerate;
- return 0;
-}
-
-static int
-cmp3_seek (DB_fileinfo_t *_info, float time) {
- mpgmad_info_t *info = (mpgmad_info_t *)_info;
- int sample = time * info->buffer.samplerate;
- return cmp3_seek_sample (_info, sample);
-}
-
-static DB_playItem_t *
-cmp3_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
- trace ("cmp3_insert %s\n", fname);
- DB_FILE *fp = deadbeef->fopen (fname);
- if (!fp) {
- trace ("failed to open file %s\n", fname);
- return NULL;
- }
- if (fp->vfs->is_streaming ()) {
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
- deadbeef->fclose (fp);
- deadbeef->pl_add_meta (it, "title", NULL);
- deadbeef->plt_set_item_duration (plt, it, -1);
- after = deadbeef->plt_insert_item (plt, after, it);
- deadbeef->pl_item_unref (it);
- return after;
- }
- buffer_t buffer;
- memset (&buffer, 0, sizeof (buffer));
- buffer.file = fp;
- int skip = deadbeef->junk_get_leading_size (buffer.file);
- if (skip > 0) {
- trace ("mpgmad: skipping %d bytes (tag)\n", skip);
- deadbeef->fseek(buffer.file, skip, SEEK_SET);
- }
- // calc approx. mp3 duration 
- int res = cmp3_scan_stream (&buffer, 0);
- if (res < 0) {
- trace ("mpgmad: cmp3_scan_stream returned error\n");
- deadbeef->fclose (fp);
- return NULL;
- }
-
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
-
- deadbeef->rewind (fp);
- // reset tags
- uint32_t f = deadbeef->pl_get_item_flags (it);
- f &= ~DDB_TAG_MASK;
- deadbeef->pl_set_item_flags (it, f);
- /*int apeerr = */deadbeef->junk_apev2_read (it, fp);
- /*int v2err = */deadbeef->junk_id3v2_read (it, fp);
- /*int v1err = */deadbeef->junk_id3v1_read (it, fp);
- deadbeef->pl_set_meta_int (it, ":MP3_DELAY", buffer.delay);
- deadbeef->pl_set_meta_int (it, ":MP3_PADDING", buffer.padding);
-
- buffer.it = it;
- cmp3_set_extra_properties (&buffer, 0);
-
- deadbeef->plt_set_item_duration (plt, it, buffer.duration);
- deadbeef->fclose (fp);
-
- deadbeef->pl_lock ();
- {
- const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
- if (cuesheet) {
- DB_playItem_t *last = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), buffer.totalsamples-buffer.delay-buffer.padding, buffer.samplerate);
- if (last) {
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (last);
- deadbeef->pl_unlock ();
- return last;
- }
- }
- }
- deadbeef->pl_unlock ();
-
-
- // FIXME! bad numsamples passed to cue
- DB_playItem_t *cue_after = deadbeef->plt_insert_cue (plt, after, it, buffer.totalsamples-buffer.delay-buffer.padding, buffer.samplerate);
- if (cue_after) {
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue_after);
- return cue_after;
- }
-
- after = deadbeef->plt_insert_item (plt, after, it);
- deadbeef->pl_item_unref (it);
- return after;
-}
-
-int
-cmp3_read_metadata (DB_playItem_t *it) {
- deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
- if (!fp) {
- return -1;
- }
- deadbeef->pl_delete_all_meta (it);
- /*int apeerr = */deadbeef->junk_apev2_read (it, fp);
- /*int v2err = */deadbeef->junk_id3v2_read (it, fp);
- /*int v1err = */deadbeef->junk_id3v1_read (it, fp);
- deadbeef->pl_add_meta (it, "title", NULL);
- deadbeef->fclose (fp);
- return 0;
-}
-
-int
-cmp3_write_metadata (DB_playItem_t *it) {
- // get options
-
- int strip_id3v2 = deadbeef->conf_get_int ("mp3.strip_id3v2", 0);
- int strip_id3v1 = deadbeef->conf_get_int ("mp3.strip_id3v1", 0);
- int strip_apev2 = deadbeef->conf_get_int ("mp3.strip_apev2", 0);
- int write_id3v2 = deadbeef->conf_get_int ("mp3.write_id3v2", 1);
- int write_id3v1 = deadbeef->conf_get_int ("mp3.write_id3v1", 1);
- int write_apev2 = deadbeef->conf_get_int ("mp3.write_apev2", 0);
-
- uint32_t junk_flags = 0;
- if (strip_id3v2) {
- junk_flags |= JUNK_STRIP_ID3V2;
- }
- if (strip_id3v1) {
- junk_flags |= JUNK_STRIP_ID3V1;
- }
- if (strip_apev2) {
- junk_flags |= JUNK_STRIP_APEV2;
- }
- if (write_id3v2) {
- junk_flags |= JUNK_WRITE_ID3V2;
- }
- if (write_id3v1) {
- junk_flags |= JUNK_WRITE_ID3V1;
- }
- if (write_apev2) {
- junk_flags |= JUNK_WRITE_APEV2;
- }
-
- int id3v2_version = deadbeef->conf_get_int ("mp3.id3v2_version", 3);
- if (id3v2_version != 3 && id3v2_version != 4) {
- id3v2_version = 3;
- }
- char id3v1_encoding50;
- deadbeef->conf_get_str ("mp3.id3v1_encoding", "iso8859-1", id3v1_encoding, sizeof (id3v1_encoding));
- return deadbeef->junk_rewrite_tags (it, junk_flags, id3v2_version, id3v1_encoding);
-}
-
-static const char *exts = {
-	"mp1", "mp2", "mp3", "mpga", NULL
-};
-
-static const char settings_dlg =
- "property \"Disable gapless playback (faster scanning)\" checkbox mp3.disable_gapless 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 = "stdmpg",
- .plugin.name = "MPEG decoder",
- .plugin.descr = "MPEG v1/2 layer1/2/3 decoder based on libmad",
- .plugin.copyright = 
- "MPEG decoder plugin based on libmad\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
- "\n"
- "This software is provided 'as-is', without any express or implied\n"
- "warranty. In no event will the authors be held liable for any damages\n"
- "arising from the use of this software.\n"
- "\n"
- "Permission is granted to anyone to use this software for any purpose,\n"
- "including commercial applications, and to alter it and redistribute it\n"
- "freely, subject to the following restrictions:\n"
- "\n"
- "1. The origin of this software must not be misrepresented; you must not\n"
- " claim that you wrote the original software. If you use this software\n"
- " in a product, an acknowledgment in the product documentation would be\n"
- " appreciated but is not required.\n"
- "\n"
- "2. Altered source versions must be plainly marked as such, and must not be\n"
- " misrepresented as being the original software.\n"
- "\n"
- "3. This notice may not be removed or altered from any source distribution.\n"
- ,
- .plugin.website = "http://deadbeef.sf.net",
- .plugin.configdialog = settings_dlg,
- .open = cmp3_open,
- .init = cmp3_init,
- .free = cmp3_free,
- .read = cmp3_read,
- .seek = cmp3_seek,
- .seek_sample = cmp3_seek_sample,
- .insert = cmp3_insert,
- .read_metadata = cmp3_read_metadata,
- .write_metadata = cmp3_write_metadata,
- .exts = exts,
-};
-
-DB_plugin_t *
-mpgmad_load (DB_functions_t *api) {
- deadbeef = api;
- return DB_PLUGIN (&plugin);
-}

deadbeef-0.6.2.tar.bz2/po/ru.po Deleted

@@ -1,2436 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Translators:
-# Alexey Yakovenko <wakeroid@gmail.com>, 2013-2014
-# Andrei Stepanov, 2014
-# Andrei Stepanov, 2014
-# Dmitriy Simbiriatin <slpiv@mail.ru>, 2010
-# Alexey Yakovenko <wakeroid@gmail.com>, 2013
-msgid ""
-msgstr ""
-"Project-Id-Version: DeaDBeeF Player\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:30+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/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"
-
-#: ../plugins/gtkui/callbacks.c:353
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr "О программе DeaDBeeF %s"
-
-#: ../plugins/gtkui/callbacks.c:366
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Изменения в DeaDBeeF %s"
-
-#: ../plugins/gtkui/callbacks.c:626
-#, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Переводчики DeaDBeeF "
-
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Сохранить предустановку эквалайзера DeaDBeeF"
-
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Файлы предустановок DeaDBeeF (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Загрузить предустановку эквалайзера DeaDBeeF..."
-
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Предустановки эквалайзера DeaDBeeF (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Импортировать предустановку эквалайзера Foobar2000..."
-
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Предустановки эквалайзера Foobar2000 (*.feq)"
-
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Сохранить"
-
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Загрузить"
-
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Импортировать предустановку Foobar2000"
-
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Включить"
-
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Обнулить все"
-
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Обнулить предусиление"
-
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Обнулить частоты"
-
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Предустановки"
-
-#: ../plugins/gtkui/gtkui.c:167
-#, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 день %d:%02d:%02d"
-
-#: ../plugins/gtkui/gtkui.c:170
-#, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d дней %d:%02d:%02d"
-
-#: ../plugins/gtkui/gtkui.c:179
-#, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Стоп | %d дорожек | %s общее время"
-
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Моно"
-
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Стерео"
-
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d кбит/с "
-
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Пауза | "
-
-#: ../plugins/gtkui/gtkui.c:226
-#, 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:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Новый плейлист"
-
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Новый плейлист (%d)"
-
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Плейлист с вкладками"
-
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Плейлист"
-
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Разделитель (верх и низ)"
-
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Разделитель (лево и право)"
-
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Вкладки плейлистов"
-
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Свойства выделенного"
-
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Отображение обложки альбома"
-
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Scope"
-
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Спектральный анализатор"
-
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
-
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
-
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Кнопка"
-
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr "Полоса перемотки"
-
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr "Элементы управления проигрыванием"
-
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "Регулятор громкости"
-
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr "Управление каналами chiptunes"
-
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Не удалось прочитать файл справки"
-
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Не удалось загрузить файл справки"
-
-#: ../plugins/gtkui/gtkui.c:1171
-msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
-"В данный момент, проигрыватель выполняет фоновые задачи. Если вы завершите "
-"его сейчас, задачи могут быть отменены или прерваны. Это может привести к "
-"потере данных."
-
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Вы все еще хотите выйти?"
-
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Предупреждение"
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Файл"
-
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Открыть файл(ы)"
-
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Добавить файл(ы)"
-
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Добавить каталог(и)"
-
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Добавить расположение"
-
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Новый плейлист"
-
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Загрузить плейлист"
-
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Сохранить плейлист"
-
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Выход"
-
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Правка"
-
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Очистить"
-
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Выделить всё"
-
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Снять выделение"
-
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Обратить выделение"
-
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Выделенное"
-
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Удалить"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Оставить выделенное"
-
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Найти"
-
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr "Сортировать по"
-
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Название"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "Номер дорожки"
-
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Альбом"
-
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Исполнитель"
-
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Дата"
-
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Случайно"
-
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Пользовательский"
-
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Настройки"
-
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Вид"
-
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Строка состояния"
-
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Эквалайзер"
-
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr "Режим дизайна"
-
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "Воспр_оизведение"
-
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Порядок"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "По очереди"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Перемешивать дорожки"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Перемешивать альбомы"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Повторять"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Зациклить все"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Зациклить одиночную песню"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Не зацикливать"
-
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Прокручивать плейлист автоматически"
-
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Выделять текущую дорожку"
-
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
-msgstr "Останавливать после текущей дорожки"
-
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
-msgstr "Остановить после текущего альбома"
-
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Перейти на текущую дорожку"
-
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Справка"
-
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_Изменения"
-
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
-
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
-
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_О программе"
-
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "_Переводчики"
-
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Поиск"
-
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Стоп"
-
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Воспроизвести"
-
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Пауза"
-
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Предыдущая"
-
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Следующая"
-
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Играть вразброс"
-
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "О программе"
-
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Выход"
-
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Справка"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Свойства дорожки"
-
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
-msgstr "Расположение:"
-
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "Настройки"
-
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Применить"
-
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Закрыть"
-
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Метаданные"
-
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Свойства"
-
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Название:"
-
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Введите название нового столбца"
-
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Тип:"
-
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Порядковый номер"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Воспроизводится"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Обложка альбома"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Исполнитель - Альбом"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Продолжительность"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Номер дорожки"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Группа / Исполнитель альбома"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Формат:"
-
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Выравнивание:"
-
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "По левому краю"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "По правому краю"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Отмена"
-
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_ОК"
-
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Модуль вывода:"
-
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Устройство вывода:"
-
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Всегда преобразовывать 8-битный звук в 16-битный"
-
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
-msgstr "Всегда преобразовывать 16-битный звук в 24-битный"
-
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Звук"
-
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Режим автовыравнивания громкости:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Отключён"
-
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Дорожка"
-
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Использовать пиковое значение"
-
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
-msgstr "-12 дБ"
-
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
-msgstr "+12 дБ"
-
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Предусиление автовыравнивания громкости:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Общее предусиление громкости:"
-
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-"Добавлять файлы из командной строки\n"
-"(или файлового менеджера) в этот плейлист:"
-
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "Восстанавливать предыдущую сессию при запуске"
-
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
-msgstr "Не добавлять из архивов при добавлении каталогов"
-
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
-"Опция \"Останавливать после текущей дорожки\" будет отключаться после "
-"срабатывания"
-
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
-"Опция \"Останавливать после текущего альбома\" будет отключаться после "
-"срабатывания"
-
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Воспроизведение"
-
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Настроить"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
-msgstr "Предустановка для цепочки DSP"
-
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
-msgstr "_Загрузить"
-
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
-msgstr "DSP"
-
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Сворачивать в трей при закрытии"
-
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Не показывать значок в трее"
-
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
-"Включить авто-определение и перекодирование японской кодировки SHIFT-JIS"
-
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Включить определение и перекодирование русской CP1251"
-
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
-msgstr "Включить определение и перекодирование китайской CP936"
-
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
-msgstr "Частота обновления интерфейса (раз за секунду):"
-
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "Текст заголовка при проигрывании:"
-
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Текст заголовка при остановке:"
-
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
-msgstr "Графический интерфейс (для изменения необходим перезапуск):"
-
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
-msgstr "Проигрыватель"
-
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
-msgstr "Закрывать плейлисты средней кнопкой мыши"
-
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Рисовать текущий трек жирным шрифтом"
-
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr "Скрыть опцию контекстного меню \"Удалить с диска\""
-
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
-msgstr "Автоматически именовать плейлисты при добавлении одного каталога"
-
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
-msgstr "Автоматический размер колонок под размер окна"
-
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
-msgstr "Интерфейс/Разное"
-
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Заменить"
-
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Передний план"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Фон"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Основные цвета"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Средний"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Светлый"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Тёмный"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Базовый"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Текст"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Цвета вкладок"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr ""
-"Заменить (теряются настройки темы GTK , но увеличивается скорость "
-"визуализации)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr ""
-" Чётная \n"
-" строка"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr ""
-" Нечётная \n"
-" строка"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr ""
-" Выделенная \n"
-" строка"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr ""
-" Выделенный \n"
-" текст"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Курсор"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Цвета плейлиста"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Цвета"
-
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Включить прокси-сервер"
-
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Адрес:"
-
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Порт:"
-
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Тип прокси:"
-
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Имя пользователя:"
-
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Пароль:"
-
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
-msgstr "HTTP User Agent:"
-
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
-msgstr "Редактирование ассоциаций Content-Type"
-
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Сеть"
-
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
-msgstr "Назначенные горячие клавиши:"
-
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
-msgstr "Действие:"
-
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
-msgstr "<Пусто>"
-
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
-msgstr "Сочетание клавиш:"
-
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
-msgstr "Глобальная горячая клавиша"
-
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
-msgstr ""
-"Используйте кнопку Применить для сохранения изменений,\n"
-"либо кнопку Восстановить для отмены изменений.\n"
-"Изменения НЕ сохранятся до тех пор,\n"
-"пока вы не нажмете Применить."
-
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
-msgstr "_Умолчания"
-
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
-msgstr "Горячие клавиши"
-
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Версия:"
-
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Авторские права"
-
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Расширения"
-
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "Адрес:"
-
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
-msgstr "Присвоить собственное название"
-
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
-msgstr "Группировать по ..."
-
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
-msgstr "Сортировать по ..."
-
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Формат"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "По возрастанию"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "По убыванию"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Выберите расширение DSP"
-
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Расширение"
-
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
-msgstr "Настройки редактора тегов"
-
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Писать ID3v2"
-
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Писать ID3v1"
-
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Писать APEv2"
-
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "Вырезать ID3v2"
-
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "Вырезать ID3v1"
-
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "Вырезать APEv2"
-
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "Версия ID3v2"
-
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Рекомендуемая)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
-
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "Кодировка ID3v1 (по умолчанию iso8859-1)"
-
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "Писать ID3v2.4"
-
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
-msgstr "Ассоциации Content-Type"
-
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
-msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"Эта таблица определяет соответствие между типами сетевых потоков (content-"
-"type) и декодерами DeaDBeeF. Например, mp3 файлы могут иметь content-type "
-"\"audio/x-mpeg\", и должны раскодироваться одним из плагинов \"stdmpg\" либо "
-"\"ffmpeg\"."
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Сбросить в умолчание"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
-msgstr "Content-Type:"
-
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
-msgstr "Плагины:"
-
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
-msgstr "Свойства кнопки"
-
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
-msgstr "Цвет:"
-
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Цвет текста:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
-msgstr "Иконка:"
-
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
-msgstr "Надпись:"
-
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
-msgstr "Выбор действия"
-
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
-"Этот диалог позволяет установить собственное название для любого трека. Это "
-"наиболее полезно для радиостанций. Такая же опция присутствует в диалоге "
-"\"Добавить расположение\". Переопределенное название появится в колонках, "
-"отображающих поле \"Artist\" (Исполнитель), и будет выглядеть как "
-"\"переопределенное название исполнитель\", если присутствует поле Artist, "
-"либо просто \"переопределенное название\", если его нет."
-
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Исполнитель / Альбом"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "№"
-
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr "Добавить в очередь воспроизведения"
-
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr "Удалить из очереди воспроизведения"
-
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr "Обновить метаданные"
-
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr "Удалить с диска"
-
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Добавить колонку"
-
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Редактировать колонку"
-
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Удалить колонку"
-
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr "Прикреплять группы во время скроллинга"
-
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Группировать по"
-
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Отсутствует"
-
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Исполнитель/Дата/Альбом"
-
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Открыть файл..."
-
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Настроить %s"
-
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Аудио устройство по умолчанию"
-
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr "Вы изменили настройки горячих клавиш, но не сохранили изменения."
-
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr "Вы уверены, что хотите продолжить без сохранения?"
-
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Добавление файлов..."
-
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Загрузка..."
-
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Данные для этой дорожки были изменены."
-
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Закрыть окно?"
-
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Несколько значений "
-
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Ключ"
-
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Значение"
-
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Много значений"
-
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Запись тегов..."
-
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Название поля"
-
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Название:"
-
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Имена полей не должны начинаться с \":\" или \"_\""
-
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Не удаётся добавить поле"
-
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Поле с таким же именем уже сущестует, пожалуйста, выберите другое имя."
-
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Добавить поле"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Удалить поле"
-
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Использование: deadbeef options -- file(s)\n"
-
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Опции:\n"
-
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr ""
-" --help или -h Вывести на экран справку (это сообщение) и выйти\n"
-
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Выйти из плеера\n"
-
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr ""
-" --version Вывести на экран информацию о версии программы и "
-"выйти\n"
-
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Начать воспроизведение\n"
-
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Остановить воспроизведение\n"
-
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Приостановить воспроизведение\n"
-
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Приостановить воспроизведение\n"
-
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
-" --play-pause Начать воспроизведение если остановлено, в противном "
-"случае - приостановить\n"
-
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Следующая дорожка в плейлисте\n"
-
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Предыдущая дорожка в плейлисте\n"
-
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Воспроизведение случайной дорожки в плейлисте\n"
-
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Добавить файл(ы) в существующий плейлист\n"
-
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
-" --gui PLUGIN выбор плагина интерфейса, по-умолчанию \"GTK2\"\n"
-
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr ""
-" --nowplaying FMT Вывести на экран форматированное название дорожки\n"
-
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-синтаксис: %%a-исполнитель, %%t-название, %%b-"
-"альбом,\n"
-" %%l-длина, %%n-номер дорожки, %%y-год, %%c-"
-"комментарий,\n"
-" %%r-авторские права, %%e-время, которое прошло \n"
-
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr ""
-" Например: --nowplaying \"%%a - %%t\" должна вывести "
-"на экран \"artist - title\"\n"
-
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
-msgstr " для дополнительной информации, см. %s\n"
-
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Плейлист"
-
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Да"
-
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Нет"
-
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Левый\n"
-"правый"
-
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Отключить\n"
-"Дорожка\n"
-"Альбом"
-
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
-msgstr ""
-"По возрастанию\n"
-"По убыванию"
-
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
-msgstr ""
-"2.3 (Рекомендуемая)\n"
-"2.4"
-
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, 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:55
-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 "Адрес для скробблинга"
-
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Предпочитать поле \"Исполнитель Альбома\" перед полем \"Исполнитель\""
-
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Файл устройства"
-
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Исправление для ошибки частоты дискретизации в OSS4"
-
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Период обновления кэша (часы)"
-
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Получать из встроенных тегов"
-
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Получать из локальной директории"
-
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Файловая маска для локальных обложек"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Получать из last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Получать из albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Масштабировать обложку относительно более длинной стороны"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Использовать CDDB/FreeDB"
-
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Использовать CD-Text вместо CDDB"
-
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "Адрес CDDB (например, 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Номер порта CDDB (например, '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Использовать протокол CDDB вместо HTTP"
-
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Включить поддержку образов NRG"
-
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Качество передискретизации (0..2, выше - лучше)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-битный вывод (по-умолчанию 16)"
-
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Максимальная длина дорожки (в минутах)"
-
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Продолжительность затухания громкости (в секундах)"
-
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Сколько раз играть циклы (loops), если они есть"
-
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Запрашивать подтверждение на удаление файлов с жёсткого диска"
-
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Чувствительность регулятора громкости в значке статуса"
-
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Пользовательский значок статуса"
-
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Запускать gtk_init с ключом --sync (режим отладки)"
-
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Добавить разделители между элементами контекстного меню"
-
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Формат заголовка уведомления"
-
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Формат содержимого уведомления"
-
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Показывать обложку"
-
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Размер обложки (px)"
-
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Сервер PulseAudio"
-
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Частота дискретизации"
-
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Относительный путь таблицы поиска"
-
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Абсолютный путь таблицы поиска"
-
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Переставить местами аудио байты"
-
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Включить HVSC Songlength DB"
-
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (из HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Разрядность (8 или 16)"
-
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Длина дорожки по умолчанию (сек)"
-
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Файл конфигурации для банка Timidity++"
-
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Название дорожки"
-
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Исполнитель(и)"
-
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Всего дорожек"
-
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Жанр"
-
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Композитор"
-
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Номер диска"
-
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Комментарий"
-
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Кодер / Продавец"
-
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Расположение"
-
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Номер вложенной дорожки"
-
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Тип(ы) тегов"
-
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Встроенный файл cue"
-
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Кодек"
-
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Расширения файлов (разделять с помощью ';')"
-
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Конвертировать"
-
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Частота дискретизации"
-
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Качество / Алгоритм"
-
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr ""
-"Автоматическая частота дискретизации (переопределяет частоту дискретизации)"
-
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr "Настройка собственных шелл-команд"
-
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Отключить бесшовное воспроизведение (ускоряет сканирование)"
-
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Предпочитать эмулятор Ken над Satoh (surround не будет работать)"
-
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Включить surround"
-
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr "Встроенный %s"
-
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Файл уже существует. Перезаписать?"
-
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Converter предупреждение"
-
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Пожалуйста, выберите кодировщик"
-
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Converter ошибка"
-
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Конвертирование..."
-
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Выберите каталог..."
-
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Не удалось сохранить предустановку кодировщика"
-
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
-msgstr ""
-"Проверьте права доступа на папку, в которой находится предустановка, "
-"выберите другое имя или освободите место на диске"
-
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "Предустановка с таким же именем уже существует. Выберите другое имя."
-
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Ошибка"
-
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Добавить кодировщик"
-
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Редактировать кодировщик"
-
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Удалить предустановку"
-
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Это действие приведёт к удалению выбранной предустановки. Вы уверены? "
-
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Кодировщики"
-
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Добавить расширение в цепочку DSP"
-
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Не удалось сохранить предустановку DSP"
-
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Новая предустановка DSP"
-
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Редактировать предустановку DSP "
-
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Предустановки DSP"
-
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Выходной каталог:"
-
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Писать в папку исходного трека"
-
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Сохранить структуру каталогов"
-
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Имя выходного файла:"
-
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
-#, no-c-format
-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:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Кодировщик:"
-
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Предустановка DSP:"
-
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Количество потоков:"
-
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Выходной формат сэмплов:"
-
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Оставить исходный формат"
-
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 бит целочисленный"
-
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 бит целочисленный"
-
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 бит целочисленный"
-
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 бит целочисленный"
-
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 бит вещественный"
-
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Если файл существует:"
-
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Спросить"
-
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Заменить"
-
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Редактировать предустановки"
-
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Безымянный кодировщик"
-
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Расширение выходного файла:"
-
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Например mp3"
-
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Командная строка"
-
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-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:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
-msgstr ""
-"\"%o\" - имя выходного файла\n"
-"\"%i\" - имя временного входного файла"
-
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Метод:"
-
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Конвейер"
-
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Временный файл"
-
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
-
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
-
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
-
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
-
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
-
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Запись тегов"
-
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Редактор предустановок DSP"
-
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Безымянная предустановка DSP"
-
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Добавить"
-
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не удалось найти файл изображения : %s"
-
-#: ../plugins/converter/converter.glade.h:12
-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 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:19
-msgid ""
-"Prompt\n"
-"Overwrite"
-msgstr ""
-"Спросить\n"
-"Перезаписать"
-
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
-"Pipe\n"
-"Временный файл"
-
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
-msgstr "Собственные shell-команды"
-
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Редактировать"
-
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
-msgstr "Закрыть"
-
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
-msgstr "Редактировать Команду"
-
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
-msgstr "Команда:"
-
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
-#, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
-msgstr ""
-"Произвольная shell-команда. Будет выполнена в том же контексте, из которого "
-"было запущено основное приложение. Может применяться title formatting. "
-"Пример: xdg-open %D"
-
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
-msgstr "ID:"
-
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
-msgstr "Произвольное название, например \"Моя shell-команда\""
-
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"ID команды, обычно это короткий идентификатор, например \"youtube_open\". "
-"Должен быть уникален."
-
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
-msgstr "Одиночные Треки"
-
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
-msgstr "Работает с одним выделенным треком."
-
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
-msgstr "Много треков"
-
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
-msgstr "Работает когда выделено много треков."
-
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
-msgstr "Локальный"
-
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
-msgstr "Работает с локальными файлами."
-
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
-msgstr "Удаленные"
-
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
-msgstr "Работает с сетевыми файлами (например потоки http://)"
-
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
-msgstr "Общая (Главное меню)"
-
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
-msgstr "Команда появится в главном меню"
-
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
-msgstr ""
-"Если вы хотите добавить команду в главное меню, убидитесь что "
-"название команды содержит путь меню, как здесь: \"File/Моя команда\", где "
-"File -- название меню из английской версии."
-
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
-msgstr "Добавить команду"
-
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Удалить"
-
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "Это действие удалит выбранную shell-команду. Вы уверены?"
-
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
-msgstr "Подтверждение удаление"
-
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
-msgstr "ID должен быть не пустым и уникальным\n"
-
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
-msgstr "Название должно быть непустым.\n"
-
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
-msgstr "Shell-команда должна быть непустой.\n"
-
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
-msgstr "Недопустимые Значения"
-
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Поддерживаемые звуковые форматы"
-
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Все файлы (*)"
-
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Открыть файл(ы)..."
-
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Добавить файл(ы) в плейлист..."
-
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Добавить папки в плейлист..."
-
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Следовать по symlink'ам"
-
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.ru.txt"
-
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Удалить файлы с диска"
-
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
-msgstr ""
-"Файлы будут потеряны. Продолжить?\n"
-"(Этот диалог может быть отключен в настройках плагина GTKUI)"
-
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Загрузить плейлист"
-
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Другие файлы (*)"
-
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Сохранить плейлист как"
-
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Файлы плейлистов DeaDBeeF (*.dbpl)"
-
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Content-Type"
-
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Недопустимые значения."
-
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
-msgstr ""
-"Поля Content-type и Плагины должны быть непустыми, и соответствовать "
-"правилам.\n"
-"Пример content-type: 'audio/mpeg'.\n"
-"Пример ID плагинов: 'stdmpg ffmpeg'.\n"
-"Используйте пробелы как разделители в списке плагинов.\n"
-"Content-type должен содержать только латинские буквы, цифры и знак '-'.\n"
-"ID плагинов могут содержать только латинские буквы и цифры."
-
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Ничего не выбрано."
-
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr "Виджет \"%s\" недоступен"
-
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Заменить на..."
-
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Вставить..."
-
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Вырезать"
-
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Скопировать"
-
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Вставить"
-
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr ""
-"Одновременное отображение нескольких виджетов данного типа не поддерживается."
-
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Заблокировать перемещение"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Передвинуть вкладку влево"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Передвинуть вкладку вправо"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Удалить вкладку"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Переименовать вкладку"
-
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Добавить новую вкладку"
-
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Показывать заголовки колонок"
-
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Расширить этот бокс на 1 элемент"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "Сузить этот бокс на 1 элемент"
-
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Равномерный"
-
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Расширять"
-
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Заполнять"
-
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Настроить кнопку"
-
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr "Голоса:"
-
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Редактировать плейлист"
-
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Переименовать плейлист"
-
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Удалить плейлист"
-
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Добавить новый плейлист"
-
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Название"
-
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Браузер плейлистов"

deadbeef-0.6.2.tar.bz2/premix.c Deleted

@@ -1,513 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- routines for converting between wave formats and channel configurations
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include "deadbeef.h"
-#include "premix.h"
-#include "fastftoi.h"
-
-#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-//#define trace(fmt,...)
-
-
-static inline void
-pcm_write_samples_8_to_8 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- *(output + c) = *(input + channelmapc);
- }
- input += inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_8_to_16 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- *((int16_t*)(output + 2 * c)) = (int16_t)(*(input + channelmapc)) << 8;
- }
- input += inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_8_to_24 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- char *out = output + 3 * c;
- out0 = 0;
- out1 = 0;
- out2 = *(input + channelmapc);
- }
- input += inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_8_to_32 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- char *out = output + 4 * c;
- out0 = 0;
- out1 = 0;
- out2 = 0;
- out3 = *(input + channelmapc);
- }
- input += inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_8_to_float (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- float sample = (*(input+channelmapc)) / (float)0x7f;
- *((float *)(output + 4 * c)) = sample;
- }
- input += inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_16_to_16 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- *((int16_t*)(output + 2 * c)) = *((int16_t*)(input + channelmapc*2));
- }
- input += 2 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_16_to_8 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- *((int8_t*)(output + c)) = *((int16_t*)(input + channelmapc*2)) >> 8;
- }
- input += 2 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_16_to_24 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- char *out = output + 3 * c;
- const char *in = input + channelmapc*2;
- out0 = 0;
- out1 = in0;
- out2 = in1;
- }
- input += 2 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_16_to_32 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- char *out = output + 4 * c;
- const char *in = input + channelmapc*2;
- out0 = 0;
- out1 = 0;
- out2 = in0;
- out3 = in1;
- }
- input += 2 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_16_to_float (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- float sample = (*((int16_t*)(input + channelmapc*2))) / (float)0x7fff;
- *((float *)(output + 4 * c)) = sample;
- }
- input += 2 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_24_to_8 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- char *out = output + c;
- *out = (input + channelmapc * 3)2;
- }
- input += 3 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_24_to_24 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- char *out = output + 3 * c;
- const char *in = input + channelmapc * 3;
- out0 = in0;
- out1 = in1;
- out2 = in2;
- }
- input += 3 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_24_to_32 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- char *out = output + 4 * c;
- const char *in = input + 3 * channelmapc;
- out0 = 0;
- out1 = in0;
- out2 = in1;
- out3 = in2;
- }
- input += inputfmt->channels * 3;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_24_to_16 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- char *out = output + 2 * c;
- const char *in = input + 3 * channelmapc;
- out0 = in1;
- out1 = in2;
- }
- input += inputfmt->channels * 3;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_24_to_float (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- float *out = (float *)(output + 4 * c);
- const char *in = input + 3 * channelmapc;
- int32_t sample = ((unsigned char)in0) | ((unsigned char)in1<<8) | (in2<<16);
- *out = sample / (float)0x7fffff;
- }
- input += inputfmt->channels * 3;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_32_to_8 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- int8_t *out = (int8_t*)(output + c);
- int32_t sample = *((int32_t*)(input + 4 * channelmapc));
- *out = (int8_t)(sample>>24);
- }
- input += 4 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_32_to_16 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- int16_t *out = (int16_t*)(output + 2 * c);
- int32_t sample = *((int32_t*)(input + 4 * channelmapc));
- *out = (int16_t)(sample>>16);
- }
- input += 4 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_32_to_24 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- char *out = output + 3 * c;
- const char *in = input + 4 * channelmapc;
- out0 = in1;
- out1 = in2;
- out2 = in3;
- }
- input += 4 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-static inline void
-pcm_write_samples_32_to_32 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- *((int32_t*)(output + 4 * c)) = *((int32_t*)(input + channelmapc * 4));
- }
- input += 4 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-
-static inline void
-pcm_write_samples_32_to_float (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- float *out = (float *)(output + 4 * c);
- int32_t sample = *((int32_t*)(input + channelmapc * 4));
- *out = sample / (float)0x7fffffff;
- }
- input += 4 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-static inline void
-pcm_write_samples_float_to_8 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- fpu_control ctl;
- fpu_setround (&ctl);
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- int8_t *out = (int8_t*)(output + c);
- float sample = *((float*)(input + channelmapc * 4));
- // FIXME: sse optimize
- if (sample > 1) {
- sample = 1;
- }
- if (sample < -1) {
- sample = -1;
- }
- *out = (int8_t)ftoi (sample*0x7f);
- }
- input += 4 * inputfmt->channels;
- output += outputsamplesize;
- }
- fpu_restore (ctl);
-}
-
-static inline void
-pcm_write_samples_float_to_16 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- fpu_control ctl;
- fpu_setround (&ctl);
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- int16_t *out = (int16_t*)(output + 2 * c);
- float sample = *((float*)(input + 4 * channelmapc));
- // FIXME: sse optimize
- if (sample > 1) {
- sample = 1;
- }
- if (sample < -1) {
- sample = -1;
- }
- *out = (int16_t)ftoi (sample*0x7fff);
- }
- input += 4 * inputfmt->channels;
- output += outputsamplesize;
- }
- fpu_restore (ctl);
-}
-
-static inline void
-pcm_write_samples_float_to_24 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- fpu_control ctl;
- fpu_setround (&ctl);
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- char *out = output + 3 * c;
- float sample = *((float*)(input + channelmapc * 4));
- // FIXME: sse optimize
- if (sample > 1) {
- sample = 1;
- }
- if (sample < -1) {
- sample = -1;
- }
- int32_t outsample = (int32_t)ftoi (sample * 0x7fffff);
- out0 = (outsample&0x0000ff);
- out1 = (outsample&0x00ff00)>>8;
- out2 = (outsample&0xff0000)>>16;
- }
- input += 4 * inputfmt->channels;
- output += outputsamplesize;
- }
- fpu_restore (ctl);
-}
-
-
-static inline void
-pcm_write_samples_float_to_32 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
- for (int s = 0; s < nsamples; s++) {
- for (int c = 0; c < outputfmt->channels; c++) {
- float fsample = (*((float*)(input + channelmapc * 4)));
- if (fsample > 0.999f) {
- fsample = 0.999f;
- }
- else if (fsample < -0.999f) {
- fsample = -0.999f;
- }
- int sample = fsample * (float)0x7fffffff;
- *((int32_t *)(output + 4 * c)) = sample;
- }
- input += 4 * inputfmt->channels;
- output += outputsamplesize;
- }
-}
-
-typedef void (*remap_fn_t) (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize);
-
-
-remap_fn_t remappers88 = {
- {
- pcm_write_samples_8_to_8,
- pcm_write_samples_8_to_16,
- pcm_write_samples_8_to_24,
- pcm_write_samples_8_to_32,
- NULL,
- NULL,
- NULL,
- pcm_write_samples_8_to_float,
- },
- {
- pcm_write_samples_16_to_8,
- pcm_write_samples_16_to_16,
- pcm_write_samples_16_to_24,
- pcm_write_samples_16_to_32,
- NULL,
- NULL,
- NULL,
- pcm_write_samples_16_to_float,
- },
- {
- pcm_write_samples_24_to_8,
- pcm_write_samples_24_to_16,
- pcm_write_samples_24_to_24,
- pcm_write_samples_24_to_32,
- NULL,
- NULL,
- NULL,
- pcm_write_samples_24_to_float,
- },
- {
- pcm_write_samples_32_to_8,
- pcm_write_samples_32_to_16,
- pcm_write_samples_32_to_24,
- pcm_write_samples_32_to_32,
- NULL,
- NULL,
- NULL,
- pcm_write_samples_32_to_float,
- },
- {
- },
- {
- },
- {
- },
- {
- pcm_write_samples_float_to_8,
- pcm_write_samples_float_to_16,
- pcm_write_samples_float_to_24,
- pcm_write_samples_float_to_32,
- NULL,
- NULL,
- NULL,
- pcm_write_samples_32_to_32,
- }
-};
-
-int
-pcm_convert (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int inputsize) {
- // calculate output size
- int inputsamplesize = (inputfmt->bps >> 3) * inputfmt->channels;
- int outputsamplesize = (outputfmt->bps >> 3) * outputfmt->channels;
- int nsamples = inputsize / inputsamplesize;
-
- uint32_t outchannels = 0;
-
- if (output) {
- // build channelmap
- int channelmap32 = {0};
- uint32_t inputbitmask = 1;
- for (int i = 0; i < inputfmt->channels; i++) {
- // find next input channel
- while (inputbitmask < 0x80000000 && !(inputfmt->channelmask & inputbitmask)) {
- inputbitmask <<= 1;
- }
- if (!(inputfmt->channelmask & inputbitmask)) {
- trace ("pcm_convert: channelmask doesn't correspond inputfmt (channels=%d, channelmask=%X)!\n", inputfmt->channels, inputfmt->channelmask);
- break;
- }
- if (outputfmt->channelmask & inputbitmask) {
- int o = 0;
- uint32_t outputbitmask = 1;
- while (outputbitmask < 0x80000000 && (outputfmt->channelmask & outputbitmask) != inputbitmask) {
- outputbitmask <<= 1;
- o++;
- }
- if (!(inputfmt->channelmask & outputbitmask)) {
- // no corresponding output channel -- ignore
- continue;
- }
- outchannels |= outputbitmask;
- channelmapi = o; // input channel i going to output channel o
- //trace ("channelmap%d=%d\n", i, o);
- }
- inputbitmask <<= 1;
- }
-
- if (outchannels != outputfmt->channelmask) {
- // some of the channels are not used
- memset (output, 0, nsamples * outputsamplesize);
- }
-
- int outidx = ((outputfmt->bps >> 3) - 1) | (outputfmt->is_float << 2);
- int inidx = ((inputfmt->bps >> 3) - 1) | (inputfmt->is_float << 2);
- if (remappersinidxoutidx) {
- remappersinidxoutidx (inputfmt, input, outputfmt, output, nsamples, channelmap, outputsamplesize);
- }
- else {
- trace ("no converter from %d %s to %d %s (%d%d)\n", inputfmt->bps, inputfmt->is_float ? "float" : "", outputfmt->bps, outputfmt->is_float ? "float" : "", inidx, outidx);
- }
- }
- return nsamples * outputsamplesize;
-}
-

deadbeef-0.6.2.tar.bz2/premix.h Deleted

@@ -1,35 +0,0 @@
-/*
-  This file is part of Deadbeef Player source code
-  http://deadbeef.sourceforge.net
-
-  routines for converting between wave formats and channel configurations
-
-  Copyright (C) 2009-2013 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
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Alexey Yakovenko waker@users.sourceforge.net
-*/
-
-#ifndef __PREMIX_H
-#define __PREMIX_H
-
-// @returns number of output bytes
-int
-pcm_convert (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int inputsize);
-
-#endif

deadbeef-0.6.2.tar.bz2/replaygain.c Deleted

@@ -1,261 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- replaygain support
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include "playlist.h"
-#include "volume.h"
-#include "replaygain.h"
-
-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_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) {
- // FIXME: separate replaygain DSP plugin?
- if (fmt->bps == 16) {
- apply_replay_gain_int16 (it, bytes, bytesread);
- }
- else if (fmt->bps == 24) {
- apply_replay_gain_int24 (it, bytes, bytesread);
- }
- else if (fmt->bps == 8) {
- apply_replay_gain_int16 (it, bytes, bytesread);
- }
- else if (fmt->bps == 32 && !fmt->is_float) {
- apply_replay_gain_int32 (it, bytes, bytesread);
- }
- else if (fmt->bps == 32 && fmt->is_float) {
- apply_replay_gain_float32 (it, bytes, bytesread);
- }
-}
-
-void
-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);
- 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
-replaygain_set_values (float albumgain, float albumpeak, float trackgain, float trackpeak) {
- if (albumgain > 100 && trackgain <= 100) {
- albumgain = trackgain;
- albumpeak = trackpeak;
- }
- else if (albumgain <= 100 && trackgain > 100) {
- trackgain = albumgain;
- trackpeak = albumpeak;
- }
- else if (albumgain > 100 && trackgain > 100) {
- trackgain = albumgain = 0;
- }
- rg_albumgain = db_to_amp (albumgain);
- rg_trackgain = db_to_amp (trackgain);
- 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;
-}
-
-static inline int
-get_int_volume (void) {
- int vol = 1000;
- if (conf_replaygain_mode == 1) {
- if (rg_trackgain == 1) {
- vol = rg_trackgain_global_preamp * 1000;
- } else {
- vol = rg_trackgain_full_preamp * 1000;
- }
- if (conf_replaygain_scale) {
- if (vol * rg_trackpeak > 1000) {
- vol = 1000 / rg_trackpeak;
- }
- }
- }
- else if (conf_replaygain_mode == 2) {
- if (rg_albumgain == 1) {
- vol = rg_albumgain_global_preamp * 1000;
- } else {
- vol = rg_albumgain_full_preamp * 1000;
- }
- if (conf_replaygain_scale) {
- if (vol * rg_albumpeak > 1000) {
- vol = 1000 / rg_albumpeak;
- }
- }
- }
- return vol;
-}
-
-void
-apply_replay_gain_int8 (playItem_t *it, char *bytes, int size) {
- if (!conf_replaygain_mode) {
- return;
- }
- int vol = get_int_volume ();
- if (vol < 0) {
- return;
- }
- int8_t *s = (int8_t*)bytes;
- for (int j = 0; j < size; j++) {
- int32_t sample = ((int8_t)(*s)) * vol / 1000;
- if (sample > 0x7f) {
- sample = 0x7f;
- }
- else if (sample < -0x80) {
- sample = -0x80;
- }
- *s = (int8_t)sample;
- s++;
- }
-}
-
-void
-apply_replay_gain_int16 (playItem_t *it, char *bytes, int size) {
- if (!conf_replaygain_mode) {
- return;
- }
- int vol = get_int_volume ();
- if (vol < 0) {
- return;
- }
- int16_t *s = (int16_t*)bytes;
- for (int j = 0; j < size/2; j++) {
- int32_t sample = ((int32_t)(*s)) * vol / 1000;
- if (sample > 0x7fff) {
- sample = 0x7fff;
- }
- else if (sample < -0x8000) {
- sample = -0x8000;
- }
- *s = (int16_t)sample;
- s++;
- }
-}
-
-void
-apply_replay_gain_int24 (playItem_t *it, char *bytes, int size) {
- if (!conf_replaygain_mode) {
- return;
- }
- int64_t vol = get_int_volume ();
- if (vol < 0) {
- return;
- }
- char *s = (char*)bytes;
- for (int j = 0; j < size/3; j++) {
- int32_t sample = ((unsigned char)s0) | ((unsigned char)s1<<8) | (s2<<16);
- sample = sample * vol / 1000;
- if (sample > 0x7fffff) {
- sample = 0x7fffff;
- }
- else if (sample < -0x800000) {
- sample = -0x800000;
- }
- s0 = (sample&0x0000ff);
- s1 = (sample&0x00ff00)>>8;
- s2 = (sample&0xff0000)>>16;
- s += 3;
- }
-}
-
-void
-apply_replay_gain_int32 (playItem_t *it, char *bytes, int size) {
- if (!conf_replaygain_mode) {
- return;
- }
- int64_t vol = get_int_volume ();
- if (vol < 0) {
- return;
- }
- int32_t *s = (int32_t*)bytes;
- for (int j = 0; j < size/4; j++) {
- int64_t sample = ((int32_t)(*s)) * vol / 1000;
- *s = (int32_t)sample;
- s++;
- }
-}
-
-void
-apply_replay_gain_float32 (playItem_t *it, char *bytes, int size) {
- if (!conf_replaygain_mode) {
- return;
- }
- float vol = 1.f;
- if (conf_replaygain_mode == 1) {
- if (rg_trackgain == 1) {
- vol = rg_trackgain_global_preamp;
- } else {
- vol = rg_trackgain_full_preamp;
- }
- if (conf_replaygain_scale) {
- if (vol * rg_trackpeak > 1.f) {
- vol = 1.f / rg_trackpeak;
- }
- }
- }
- else if (conf_replaygain_mode == 2) {
- if (rg_albumgain == 1) {
- vol = rg_albumgain_global_preamp;
- } else {
- vol = rg_albumgain_full_preamp;
- }
- if (conf_replaygain_scale) {
- if (vol * rg_albumpeak > 1.f) {
- vol = 1.f / rg_albumpeak;
- }
- }
- }
- float *s = (float*)bytes;
- for (int j = 0; j < size/4; j++) {
- float sample = ((float)*s) * vol;
- if (sample > 1.f) {
- sample = 1.f;
- }
- else if (sample < -1.f) {
- sample = -1.f;
- }
- *s = sample;
- s++;
- }
-}

deadbeef-0.6.2.tar.bz2/replaygain.h Deleted

@@ -1,56 +0,0 @@
-/*
-  This file is part of Deadbeef Player source code
-  http://deadbeef.sourceforge.net
-
-  replaygain support
-
-  Copyright (C) 2009-2013 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
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __REPLAYGAIN_H
-#define __REPLAYGAIN_H
-
-#include "deadbeef.h"
-
-void
-replaygain_apply (ddb_waveformat_t *fmt, playItem_t *it, char *bytes, int bytesread);
-
-void
-replaygain_set (int mode, int scale, float preamp, float global_preamp);
-
-void
-replaygain_set_values (float albumgain, float albumpeak, float trackgain, float trackpeak);
-
-void
-apply_replay_gain_int8 (playItem_t *it, char *bytes, int size);
-
-void
-apply_replay_gain_int16 (playItem_t *it, char *bytes, int size);
-
-void
-apply_replay_gain_int24 (playItem_t *it, char *bytes, int size);
-
-void
-apply_replay_gain_int32 (playItem_t *it, char *bytes, int size);
-
-void
-apply_replay_gain_float32 (playItem_t *it, char *bytes, int size);
-
-#endif

deadbeef-0.6.2.tar.bz2/ringbuf.c Deleted

@@ -1,93 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- basic ring buffer implementation
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-
-#include <string.h>
-#include "ringbuf.h"
-
-void
-ringbuf_init (ringbuf_t *p, char *buffer, size_t size) {
- memset (p, 0, sizeof (ringbuf_t));
- p->bytes = buffer;
- p->cursor = 0;
- p->size = size;
- p->remaining = 0;
-}
-
-int
-ringbuf_write (ringbuf_t *p, char *bytes, size_t size) {
- if (p->size - p->remaining < size) {
- return -1;
- }
-
- size_t cursor = p->cursor + p->remaining;
- cursor %= p->size;
-
- if (p->size - cursor >= size) { // split
- memcpy (p->bytes + cursor, bytes, size);
- p->remaining += size;
- }
- else {
- size_t n = p->size - cursor;
- if (n > 0) {
- memcpy (p->bytes + cursor, bytes, n);
- p->remaining += n;
- size -= n;
- bytes += n;
- }
- memcpy (p->bytes, bytes, size);
- p->remaining += size;
- }
- return 0;
-}
-
-int
-ringbuf_read (ringbuf_t *p, char *bytes, size_t size) {
- if (p->remaining < size) {
- size = p->remaining;
- }
- int rb = size;
-
- if (p->size - p->cursor >= size) {
- memcpy (bytes, p->bytes + p->cursor, size);
- p->cursor += size;
- p->remaining -= size;
- }
- else {
- size_t n = p->size - p->cursor;
- if (n > 0) {
- memcpy (bytes, p->bytes + p->cursor, n);
- p->cursor += n;
- p->remaining -= n;
- bytes += n;
- size -= n;
- }
- memcpy (bytes, p->bytes, size);
- p->cursor = size;
- p->remaining -= size;
- }
- return rb;
-}

deadbeef-0.6.2.tar.bz2/ringbuf.h Deleted

@@ -1,48 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- basic ring buffer implementation
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __RINGBUF_H
-#define __RINGBUF_H
-
-#include <sys/types.h>
-
-typedef struct {
- char *bytes;
- size_t size;
- size_t cursor;
- size_t remaining;
-} ringbuf_t;
-
-void
-ringbuf_init (ringbuf_t *p, char *buffer, size_t size);
-
-int
-ringbuf_write (ringbuf_t *p, char *bytes, size_t size);
-
-int
-ringbuf_read (ringbuf_t *p, char *bytes, size_t size);
-
-#endif

deadbeef-0.6.2.tar.bz2/strdupa.h Deleted

@@ -1,39 +0,0 @@
-/*
- DeaDBeeF -- the music player
- Copyright (C) 2009-2014 Alexey Yakovenko and other contributors
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-
- 3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef __DDB_STRDUPA_H
-#define __DDB_STRDUPA_H
-
-#include <string.h>
-
-#ifndef strdupa
-# define strdupa(s)							 \
- ({									 \
- const char *old = (s);					 \
- size_t len = strlen (old) + 1;				 \
- char *new = (char *) alloca (len);			 \
- (char *) memcpy (new, old, len);				 \
- })
-#endif
-
-#endif

deadbeef-0.6.2.tar.bz2/streamer.c Deleted

@@ -1,3001 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- streamer implementation
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-#include <unistd.h>
-#ifdef __linux__
-#include <sys/prctl.h>
-#endif
-#include <sys/time.h>
-#include <errno.h>
-#include "threading.h"
-#include "playlist.h"
-#include "common.h"
-#include "streamer.h"
-#include "messagepump.h"
-#include "conf.h"
-#include "plugins.h"
-#include "fastftoi.h"
-#include "volume.h"
-#include "vfs.h"
-#include "premix.h"
-#include "ringbuf.h"
-#include "replaygain.h"
-#include "fft.h"
-#include "handler.h"
-#include "plugins/libparser/parser.h"
-#include "strdupa.h"
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-
-//#define WRITE_DUMP 1
-//#define DETECT_PL_LOCK_RC 1
-
-#if WRITE_DUMP
-FILE *out;
-#endif
-
-#define MAX_PLAYLIST_DOWNLOAD_SIZE 25000
-
-static int
-streamer_read_async (char *bytes, int size);
-
-static int
-streamer_set_output_format (void);
-
-static intptr_t streamer_tid;
-static ddb_dsp_context_t *dsp_chain;
-static float dsp_ratio = 1;
-
-static DB_dsp_t *eqplug;
-static ddb_dsp_context_t *eq;
-
-static int dsp_on = 0;
-
-static int autoconv_8_to_16 = 1;
-
-static int autoconv_16_to_24 = 0;
-
-static int trace_bufferfill = 0;
-
-static int stop_after_current = 0;
-static int stop_after_album = 0;
-
-static int streaming_terminate;
-
-// buffer up to 3 seconds at 44100Hz stereo
-#define STREAM_BUFFER_SIZE 0x80000 // slightly more than 3 seconds of 44100 stereo
-
-// how much bigger should read-buffer be to allow upsampling.
-// e.g. 8000Hz -> 192000Hz upsampling requires 24x buffer size,
-// so if we originally request 4096 bytes blocks -
-// that will require 24x buffer size, which is 98304 bytes buffer
-#define MAX_DSP_RATIO 24
-
-#define MIN_BLOCK_SIZE 4096
-#define MAX_BLOCK_SIZE 16384
-#define READBUFFER_SIZE (MAX_BLOCK_SIZE * MAX_DSP_RATIO)
-static char readbufferREADBUFFER_SIZE;
-
-static ringbuf_t streamer_ringbuf;
-static char streambufferSTREAM_BUFFER_SIZE;
-
-static int bytes_until_next_song = 0;
-static uintptr_t mutex;
-static uintptr_t decodemutex;
-static uintptr_t wdl_mutex; // wavedata listener
-
-static int nextsong = -1;
-static int nextsong_pstate = -1;
-static int badsong = -1;
-
-static float last_seekpos = -1;
-
-static float playpos = 0; // play position of current song
-static int avg_bitrate = -1; // avg bitrate of current song
-static int last_bitrate = -1; // last bitrate of current song
-
-static playlist_t *streamer_playlist;
-static playItem_t *playing_track;
-static float playtime; // total playtime of playing track
-static time_t started_timestamp; // result of calling time(NULL)
-static playItem_t *streaming_track;
-static playItem_t *playlist_track;
-
-static ddb_waveformat_t output_format; // format that was requested after DSP
-static ddb_waveformat_t orig_output_format; // format that was requested before DSP
-static int formatchanged;
-
-static DB_fileinfo_t *fileinfo;
-static DB_FILE *fileinfo_file;
-static DB_fileinfo_t *new_fileinfo;
-static DB_FILE *new_fileinfo_file;
-
-static int streamer_buffering;
-
-// to allow interruption of stall file requests
-static DB_FILE *streamer_file;
-
-// for vis plugins
-static float freq_dataDDB_FREQ_BANDS * DDB_FREQ_MAX_CHANNELS;
-static float audio_dataDDB_FREQ_BANDS * 2 * DDB_FREQ_MAX_CHANNELS;
-static int audio_data_fill = 0;
-static int audio_data_channels = 0;
-
-// message queue
-static struct handler_s *handler;
-
-// visualization stuff
-typedef struct wavedata_listener_s {
- void *ctx;
- void (*callback)(void *ctx, ddb_audio_data_t *data);
- struct wavedata_listener_s *next;
-} wavedata_listener_t;
-
-static wavedata_listener_t *waveform_listeners;
-static wavedata_listener_t *spectrum_listeners;
-
-#if DETECT_PL_LOCK_RC
-volatile pthread_t streamer_lock_tid = 0;
-#endif
-void
-streamer_lock (void) {
-#if DETECT_PL_LOCK_RC
- extern pthread_t pl_lock_tid;
- assert (pl_lock_tid != pthread_self()); // not permitted to lock streamer from inside of pl_lock
-#endif
- mutex_lock (mutex);
-#if DETECT_PL_LOCK_RC
- streamer_lock_tid = pthread_self();
-#endif
-}
-
-void
-streamer_unlock (void) {
-#if DETECT_PL_LOCK_RC
- streamer_lock_tid = 0;
-#endif
- mutex_unlock (mutex);
-}
-
-static void
-streamer_set_nextsong_real (int song, int pstate);
-
-static int
-streamer_move_to_nextsong_real (int r);
-
-static int
-streamer_move_to_prevsong_real (int r);
-
-static int
-streamer_move_to_randomsong_real (int r);
-
-static void
-streamer_play_current_track_real (void);
-
-static void
-streamer_set_current_playlist_real (int plt);
-
-
-static void
-streamer_abort_files (void) {
- DB_FILE *file = fileinfo_file;
- DB_FILE *newfile = new_fileinfo_file;
- DB_FILE *strfile = streamer_file;
- trace ("\0330;33mstreamer_abort_files\03337;0m\n");
- trace ("%p %p %p\n", file, newfile, strfile);
-
- if (file) {
- deadbeef->fabort (file);
- }
- if (newfile) {
- deadbeef->fabort (newfile);
- }
- if (strfile) {
- deadbeef->fabort (strfile);
- }
-
-}
-
-static void
-streamer_set_replaygain (playItem_t *it) {
- // setup replaygain
- pl_lock ();
- const char *gain;
- gain = pl_find_meta (it, ":REPLAYGAIN_ALBUMGAIN");
- float albumgain = gain ? atof (gain) : 1000;
- float albumpeak = pl_get_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK);
-
- gain = pl_find_meta (it, ":REPLAYGAIN_TRACKGAIN");
- float trackgain = gain ? atof (gain) : 1000;
- float trackpeak = pl_get_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK);
- pl_unlock ();
- replaygain_set_values (albumgain, albumpeak, trackgain, trackpeak);
-}
-
-static void
-send_songstarted (playItem_t *trk) {
- ddb_event_track_t *pev = (ddb_event_track_t *)messagepump_event_alloc (DB_EV_SONGSTARTED);
- pev->track = DB_PLAYITEM (trk);
- pl_item_ref (trk);
- pev->playtime = 0;
- pev->started_timestamp = time(NULL);
- messagepump_push_event ((ddb_event_t*)pev, 0, 0);
-}
-
-static void
-send_songfinished (playItem_t *trk) {
- ddb_event_track_t *pev = (ddb_event_track_t *)messagepump_event_alloc (DB_EV_SONGFINISHED);
- pev->track = DB_PLAYITEM (trk);
- pl_item_ref (trk);
- pev->playtime = playtime;
- pev->started_timestamp = started_timestamp;
- messagepump_push_event ((ddb_event_t*)pev, 0, 0);
-}
-
-static void
-send_trackchanged (playItem_t *from, playItem_t *to) {
- ddb_event_trackchange_t *event = (ddb_event_trackchange_t *)messagepump_event_alloc (DB_EV_SONGCHANGED);
- event->playtime = playtime;
- event->started_timestamp = started_timestamp;
- if (from) {
- pl_item_ref (from);
- }
- if (to) {
- pl_item_ref (to);
- }
- event->from = (DB_playItem_t *)from;
- event->to = (DB_playItem_t *)to;
- messagepump_push_event ((ddb_event_t *)event, 0, 0);
-}
-
-static void
-streamer_start_playback (playItem_t *from, playItem_t *it) {
- if (from) {
- pl_item_ref (from);
- }
- if (it) {
- pl_item_ref (it);
- }
- // free old copy of playing
- if (playing_track) {
- pl_item_unref (playing_track);
- playing_track = NULL;
- }
- pl_lock ();
- playlist_track = it;
- pl_unlock ();
- // assign new
- playing_track = it;
- if (playing_track) {
- pl_item_ref (playing_track);
-
- playing_track->played = 1;
- trace ("from=%p (%s), to=%p (%s) 2\n", from, from ? pl_find_meta (from, ":URI") : "null", it, it ? pl_find_meta (it, ":URI") : "null");
- send_trackchanged (from, it);
- started_timestamp = time (NULL);
- }
- if (from) {
- pl_item_unref (from);
- }
- if (it) {
- pl_item_unref (it);
- }
- trace ("streamer_start_playback %s\n", playing_track ? pl_find_meta (playing_track, ":URI") : "null");
-}
-
-playItem_t *
-streamer_get_streaming_track (void) {
- if (streaming_track) {
- pl_item_ref (streaming_track);
- }
- return streaming_track;
-}
-
-playItem_t *
-streamer_get_playing_track (void) {
- playItem_t *it = playing_track;// ? playing_track : playlist_track;
- if (it) {
- pl_item_ref (it);
- }
- return it;
-}
-
-int
-str_get_idx_of (playItem_t *it) {
- pl_lock ();
- if (!streamer_playlist) {
- streamer_playlist = plt_get_curr ();
- }
- playItem_t *c = streamer_playlist->headPL_MAIN;
- int idx = 0;
- while (c && c != it) {
- c = c->nextPL_MAIN;
- idx++;
- }
- if (!c) {
- pl_unlock ();
- return -1;
- }
- pl_unlock ();
- return idx;
-}
-
-playItem_t *
-str_get_for_idx (int idx) {
- pl_lock ();
- if (!streamer_playlist) {
- streamer_playlist = plt_get_curr ();
- }
- playItem_t *it = streamer_playlist->headPL_MAIN;
- while (idx--) {
- if (!it) {
- pl_unlock ();
- return NULL;
- }
- it = it->nextPL_MAIN;
- }
- if (it) {
- pl_item_ref (it);
- }
- pl_unlock ();
- return it;
-}
-
-static void
-send_trackinfochanged (playItem_t *track) {
- ddb_event_track_t *ev = (ddb_event_track_t *)messagepump_event_alloc (DB_EV_TRACKINFOCHANGED);
- ev->track = DB_PLAYITEM (track);
- if (track) {
- pl_item_ref (track);
- }
- messagepump_push_event ((ddb_event_t*)ev, 0, 0);
-}
-
-static int
-stop_after_album_check (playItem_t *cur, playItem_t *next) {
- if (!stop_after_album) {
- return 0;
- }
-
- if (!cur) {
- return 0;
- }
-
- if (!next) {
- streamer_buffering = 0;
- streamer_set_nextsong_real (-2, -2);
- if (conf_get_int ("playlist.stop_after_album_reset", 0)) {
- conf_set_int ("playlist.stop_after_album", 0);
- stop_after_album = 0;
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- }
- return 1;
- }
-
- const char *cur_artist = pl_find_meta_raw (cur, "artist");
- const char *next_artist = pl_find_meta_raw (next, "artist");
-
- const char *cur_album = pl_find_meta_raw (cur, "album");
- const char *next_album = pl_find_meta_raw (next, "album");
-
- const char *cur_aa = pl_find_meta_raw (cur, "band");
- if (!cur_aa) {
- cur_aa = pl_find_meta_raw (cur, "album artist");
- }
- if (!cur_aa) {
- cur_aa = pl_find_meta_raw (cur, "albumartist");
- }
- const char *next_aa = pl_find_meta_raw (next, "band");
- if (!next_aa) {
- next_aa = pl_find_meta_raw (next, "album artist");
- }
- if (!next_aa) {
- next_aa = pl_find_meta_raw (next, "albumartist");
- }
-
- if ((cur_artist == next_artist) && (cur_album == next_album) && (cur_aa == next_aa)) {
- return 0;
- }
-
- streamer_buffering = 0;
- streamer_set_nextsong_real (-2, -2);
- if (conf_get_int ("playlist.stop_after_album_reset", 0)) {
- conf_set_int ("playlist.stop_after_album", 0);
- stop_after_album = 0;
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- }
-
- return 1;
-}
-
-static int
-streamer_move_to_nextsong_real (int reason) {
- if (reason) {
- plug_get_output ()->stop ();
- }
- trace ("streamer_move_to_nextsong (%d)\n", reason);
- pl_lock ();
- if (!streamer_playlist) {
- streamer_playlist = plt_get_curr ();
- }
-
- playItem_t *curr = playlist_track;
-
- while (pl_playqueue_getcount ()) {
- trace ("pl_playqueue_getnext\n");
- playItem_t *it = pl_playqueue_getnext ();
- if (it) {
- if (stop_after_album_check(curr, it)) {
- pl_unlock ();
- return -1;
- }
-
- pl_playqueue_pop ();
- int r = str_get_idx_of (it);
- if (r >= 0) {
- pl_item_unref (it);
- pl_unlock ();
- streamer_set_nextsong_real (r, 1);
- return 0;
- }
- else {
- trace ("%s not found in current streaming playlist\n", pl_find_meta (it, ":URI"));
-
- playlist_t *p = pl_get_playlist (it);
- if (p) {
- if (streamer_playlist) {
- plt_unref (streamer_playlist);
- }
- streamer_playlist = p;
- int r = str_get_idx_of (it);
- if (r >= 0) {
- pl_item_unref (it);
- pl_unlock ();
- streamer_set_nextsong_real (r, 3);
- return 0;
- }
- }
- trace ("%s not found in any playlists\n", pl_find_meta (it, ":URI"));
- pl_item_unref (it);
- }
- }
- }
-
- if (reason == 1) {
- if (streamer_playlist) {
- plt_unref (streamer_playlist);
- }
- streamer_playlist = plt_get_curr ();
- // check if prev song is in this playlist
- if (-1 == str_get_idx_of (curr)) {
- curr = NULL;
- }
- }
-
- playlist_t *plt = streamer_playlist;
- if (!plt->headPL_MAIN) {
- pl_unlock ();
- streamer_set_nextsong_real (-2, 1);
- return 0;
- }
- int pl_order = pl_get_order ();
-
- int pl_loop_mode = conf_get_int ("playback.loop", 0);
-
- if (reason == 0 && pl_loop_mode == PLAYBACK_MODE_LOOP_SINGLE) { // song finished, loop mode is "loop 1 track"
- int r = str_get_idx_of (playing_track);
- pl_unlock ();
- if (r == -1) {
- streamer_set_nextsong_real (-2, 1);
- }
- else {
- streamer_set_nextsong_real (r, 1);
- }
- return 0;
- }
-
- if (pl_order == PLAYBACK_ORDER_SHUFFLE_TRACKS || pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS) { // shuffle
- if (!curr || pl_order == PLAYBACK_ORDER_SHUFFLE_TRACKS) {
- // find minimal notplayed
- playItem_t *pmin = NULL; // notplayed minimum
- for (playItem_t *i = plt->headPL_MAIN; i; i = i->nextPL_MAIN) {
- if (i->played) {
- continue;
- }
- if (!pmin || i->shufflerating < pmin->shufflerating) {
- pmin = i;
- }
- }
- playItem_t *it = pmin;
- // although it is possible that, although it == NULL, reshuffling the playlist
- // will result in the next track belonging to the same album as this one, this
- // is most likely not what the user wants.
- if (stop_after_album_check(curr, it)) {
- pl_unlock ();
- return -1;
- }
- if (!it) {
- // all songs played, reshuffle and try again
- if (pl_loop_mode == PLAYBACK_MODE_LOOP_ALL) { // loop
- plt_reshuffle (streamer_playlist, &it, NULL);
- }
- }
- if (!it) {
- streamer_buffering = 0;
- send_trackinfochanged (streaming_track);
- playItem_t *temp;
- plt_reshuffle (streamer_playlist, &temp, NULL);
- pl_unlock ();
- streamer_set_nextsong_real (-2, -2);
- return -1;
- }
- int r = str_get_idx_of (it);
- pl_unlock ();
- streamer_set_nextsong_real (r, 1);
- return 0;
- }
- else {
- trace ("pl_next_song: reason=%d, loop=%d\n", reason, pl_loop_mode);
- // find minimal notplayed above current
- int rating = curr->shufflerating;
- playItem_t *pmin = NULL; // notplayed minimum
- for (playItem_t *i = plt->headPL_MAIN; i; i = i->nextPL_MAIN) {
- if (i->played || i->shufflerating < rating) {
- continue;
- }
- if (!pmin || i->shufflerating < pmin->shufflerating) {
- pmin = i;
- }
- }
- playItem_t *it = pmin;
- if (stop_after_album_check(curr, it)) {
- pl_unlock ();
- return -1;
- }
- if (!it) {
- // all songs played, reshuffle and try again
- if (pl_loop_mode == PLAYBACK_MODE_LOOP_ALL || reason == 1) { // loop
- trace ("all songs played! reshuffle\n");
- plt_reshuffle (streamer_playlist, &it, NULL);
- }
- }
- if (!it) {
- streamer_buffering = 0;
- send_trackinfochanged (streaming_track);
- playItem_t *temp;
- plt_reshuffle (streamer_playlist, &temp, NULL);
- pl_unlock ();
- streamer_set_nextsong_real (-2, -2);
- return -1;
- }
- int r = str_get_idx_of (it);
- pl_unlock ();
- streamer_set_nextsong_real (r, 1);
- return 0;
- }
- }
- else if (pl_order == PLAYBACK_ORDER_LINEAR) { // linear
- playItem_t *it = NULL;
- if (!curr) {
- int cur = plt_get_cursor (streamer_playlist, PL_MAIN);
- if (cur != -1) {
- curr = plt_get_item_for_idx (streamer_playlist, cur, PL_MAIN);
- pl_item_unref (curr);
- }
- }
- if (curr) {
- it = curr->nextPL_MAIN;
- }
- else {
- it = streamer_playlist->headPL_MAIN;
- }
- if (stop_after_album_check(curr, it)) {
- pl_unlock ();
- return -1;
- }
- if (!it) {
- trace ("streamer_move_nextsong: was last track\n");
- if (pl_loop_mode == PLAYBACK_MODE_LOOP_ALL) {
- it = plt->headPL_MAIN;
- }
- else {
- streamer_buffering = 0;
- send_trackinfochanged (streaming_track);
- badsong = -1;
- pl_unlock ();
- streamer_set_nextsong_real (-2, -2);
- return 0;
- }
- }
- if (!it) {
- pl_unlock ();
- return -1;
- }
- int r = str_get_idx_of (it);
- pl_unlock ();
- streamer_set_nextsong_real (r, 1);
- return 0;
- }
- else if (pl_order == PLAYBACK_ORDER_RANDOM) { // random
- pl_unlock ();
- int res = streamer_move_to_randomsong_real (0);
- if (res == -1) {
- trace ("streamer_move_to_randomsong error\n");
- streamer_set_nextsong_real (-2, 1);
- return -1;
- }
- return 0;
- }
- pl_unlock ();
- return -1;
-}
-
-static int
-streamer_move_to_prevsong_real (int r) {
- if (r) {
- plug_get_output ()->stop ();
- }
- pl_lock ();
- if (streamer_playlist) {
- plt_unref (streamer_playlist);
- }
- streamer_playlist = plt_get_curr ();
- // check if prev song is in this playlist
- if (-1 == str_get_idx_of (playlist_track)) {
- playlist_track = NULL;
- }
-
- playlist_t *plt = streamer_playlist;
- pl_playqueue_clear ();
- if (!plt->headPL_MAIN) {
- pl_unlock ();
- streamer_set_nextsong_real (-2, 1);
- return 0;
- }
- int pl_order = conf_get_int ("playback.order", 0);
- int pl_loop_mode = conf_get_int ("playback.loop", 0);
- if (pl_order == PLAYBACK_ORDER_SHUFFLE_TRACKS || pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS) { // shuffle
- if (!playlist_track) {
- pl_unlock ();
- return streamer_move_to_nextsong_real (0);
- }
- else {
- playlist_track->played = 0;
- // find already played song with maximum shuffle rating below prev song
- int rating = playlist_track->shufflerating;
- playItem_t *pmax = NULL; // played maximum
- playItem_t *amax = NULL; // absolute maximum
- for (playItem_t *i = plt->headPL_MAIN; i; i = i->nextPL_MAIN) {
- if (i != playlist_track && i->played && (!amax || i->shufflerating > amax->shufflerating)) {
- amax = i;
- }
- if (i == playlist_track || i->shufflerating > rating || !i->played) {
- continue;
- }
- if (!pmax || i->shufflerating > pmax->shufflerating) {
- pmax = i;
- }
- }
-
- if (pmax && pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
- while (pmax && pmax->nextPL_MAIN && pmax->nextPL_MAIN->played && pmax->shufflerating == pmax->nextPL_MAIN->shufflerating) {
- pmax = pmax->nextPL_MAIN;
- }
- }
-
- playItem_t *it = pmax;
- if (!it) {
- // that means 1st in playlist, take amax
- if (pl_loop_mode == PLAYBACK_MODE_LOOP_ALL) {
- if (!amax) {
- plt_reshuffle (streamer_playlist, NULL, &amax);
- }
- it = amax;
- }
- }
-
- if (!it) {
- pl_unlock ();
- streamer_set_nextsong_real (-2, 1);
- return -1;
- }
- int r = str_get_idx_of (it);
- pl_unlock ();
- streamer_set_nextsong_real (r, 1);
- return 0;
- }
- }
- else if (pl_order == PLAYBACK_ORDER_LINEAR) { // linear
- playItem_t *it = NULL;
- if (!playlist_track) {
- int cur = plt_get_cursor (streamer_playlist, PL_MAIN);
- if (cur != -1) {
- playlist_track = plt_get_item_for_idx (streamer_playlist, cur, PL_MAIN);
- pl_item_unref (playlist_track);
- }
- }
- if (playlist_track) {
- it = playlist_track->prevPL_MAIN;
- }
- if (!it) {
- if (pl_loop_mode == PLAYBACK_MODE_LOOP_ALL) {
- it = plt->tailPL_MAIN;
- }
- }
- if (!it) {
- pl_unlock ();
- streamer_set_nextsong_real (-2, 1);
- return -1;
- }
- int r = str_get_idx_of (it);
- pl_unlock ();
- streamer_set_nextsong_real (r, 1);
- return 0;
- }
- else if (pl_order == PLAYBACK_ORDER_RANDOM) { // random
- pl_unlock ();
- int res = streamer_move_to_randomsong_real (0);
- if (res == -1) {
- streamer_set_nextsong_real (-2, 1);
- trace ("streamer_move_to_randomsong error\n");
- return -1;
- }
- return 0;
- }
- pl_unlock ();
- return -1;
-}
-
-static int
-streamer_move_to_randomsong_real (int reason) {
- if (reason) {
- plug_get_output ()->stop ();
- }
- if (!streamer_playlist) {
- streamer_playlist = plt_get_curr ();
- }
- playlist_t *plt = streamer_playlist;
- int cnt = plt->countPL_MAIN;
- if (!cnt) {
- trace ("empty playlist\n");
- return -1;
- }
- int curr = str_get_idx_of (playing_track);
- int r = rand () / (float)RAND_MAX * cnt;
- if (r == curr) {
- r++;
- if (r >= cnt) {
- r = 0;
- }
- }
-
- streamer_set_nextsong_real (r, 1);
- return 0;
-}
-
-int
-streamer_move_to_nextsong (int r) {
- if (r) {
- streamer_abort_files ();
- }
- handler_push (handler, STR_EV_NEXT, 0, r, 0);
-}
-
-int
-streamer_move_to_prevsong (int r) {
- if (r) {
- streamer_abort_files ();
- }
- handler_push (handler, STR_EV_PREV, 0, r, 0);
-}
-
-int
-streamer_move_to_randomsong (int r) {
- if (r) {
- streamer_abort_files ();
- }
- handler_push (handler, STR_EV_RAND, 0, r, 0);
-}
-
-// playlist must call that whenever item was removed
-void
-streamer_song_removed_notify (playItem_t *it) {
- if (!mutex) {
- return; // streamer is not running
- }
- if (it == playlist_track) {
- playlist_track = playlist_track->prevPL_MAIN;
- }
-}
-
-#define CTMAP_MAX_PLUGINS 5
-
-typedef struct ctmap_s {
- char *ct;
- char *pluginsCTMAP_MAX_PLUGINS;
- struct ctmap_s *next;
-} ctmap_t;
-
-static ctmap_t *streamer_ctmap;
-static char conf_network_ctmapping2048;
-static uintptr_t ctmap_mutex;
-
-static void
-ctmap_init_mutex (void) {
- ctmap_mutex = mutex_create ();
-}
-
-static void
-ctmap_free_mutex (void) {
- if (ctmap_mutex) {
- mutex_free (ctmap_mutex);
- ctmap_mutex = 0;
- }
-}
-
-static void
-ctmap_lock (void) {
- mutex_lock (ctmap_mutex);
-}
-
-static void
-ctmap_unlock (void) {
- mutex_unlock (ctmap_mutex);
-}
-
-static void
-ctmap_free (void) {
- while (streamer_ctmap) {
- ctmap_t *ct = streamer_ctmap;
- free (ct->ct);
- for (int i = 0; ct->pluginsi; i++) {
- free (ct->pluginsi);
- }
- streamer_ctmap = ct->next;
- free (ct);
- }
-}
-
-static void
-ctmap_init (void) {
- ctmap_free ();
- char *mapstr = conf_network_ctmapping;
-
- const char *p = mapstr;
- char tMAX_TOKEN;
- char ctMAX_TOKEN;
- char pluginsMAX_TOKEN*5;
-
- ctmap_t *tail = NULL;
-
- for (;;) {
- p = gettoken (p, t);
-
- if (!p) {
- break;
- }
-
- ctmap_t *ctmap = malloc (sizeof (ctmap_t));
- memset (ctmap, 0, sizeof (ctmap_t));
- ctmap->ct = strdup (t);
-
- int n = 0;
-
- p = gettoken (p, t);
- if (!p || strcmp (t, "{")) {
- free (ctmap->ct);
- free (ctmap);
- break;
- }
-
- plugins0 = 0;
- for (;;) {
- p = gettoken (p, t);
- if (!p || !strcmp (t, "}") || n >= CTMAP_MAX_PLUGINS-1) {
- break;
- }
-
- ctmap->pluginsn++ = strdup (t);
- }
- ctmap->pluginsn = NULL;
- if (tail) {
- tail->next = ctmap;
- }
- tail = ctmap;
- if (!streamer_ctmap) {
- streamer_ctmap = ctmap;
- }
- }
-}
-
-static int
-is_remote_stream (playItem_t *it) {
- int remote = 0;
- pl_lock ();
- const char *uri = pl_find_meta (it, ":URI");
- if (uri && !plug_is_local_file (uri)) {
- remote = 1;
- }
- pl_unlock ();
- return remote;
-}
-
-static DB_fileinfo_t *dec_open (DB_decoder_t *dec, uint32_t hints, playItem_t *it) {
- if (dec->plugin.api_vminor >= 7 && dec->open2) {
- DB_fileinfo_t *fi = dec->open2 (hints, DB_PLAYITEM (it));
- return fi;
- }
- return dec->open (hints);
-}
-
-// that must be called after last sample from str_playing_song was done reading
-static int
-streamer_set_current (playItem_t *it) {
- trace ("streamer_set_current %s\n", playing_track ? pl_find_meta (playing_track, ":URI") : "null");
- DB_output_t *output = plug_get_output ();
- int err = 0;
- int do_songstarted = 0;
- playItem_t *from, *to;
- // need to add refs here, because streamer_start_playback can destroy items
- from = playing_track;
- to = it;
- if (from) {
- pl_item_ref (from);
- }
- if (to) {
- pl_item_ref (to);
- }
- trace ("\0330;35mstreamer_set_current from %p to %p\03337;0m\n", from, it);
- trace ("\0330;35moutput state: %d\03337;0m\n", output->state ());
- if (!playing_track || output->state () == OUTPUT_STATE_STOPPED) {
- streamer_buffering = 1;
- trace ("\0330;35mstreamer_start_playback1 from %p to %p\03337;0m\n", from, it);
- do_songstarted = 1;
- streamer_start_playback (from, it);
- bytes_until_next_song = -1;
- }
-
- trace ("streamer_set_current %p, buns=%d\n", it, bytes_until_next_song);
- mutex_lock (decodemutex);
- if (streaming_track) {
- pl_item_unref (streaming_track);
- streaming_track = NULL;
- }
-
- mutex_unlock (decodemutex);
-
- int paused_stream = 0;
- if (it && nextsong_pstate == 2) {
- paused_stream = is_remote_stream (it);
- }
-
- if (!it || paused_stream) {
- goto success;
- }
- if (to) {
- trace ("draw before init: %p->%p, playing_track=%p, playlist_track=%p\n", from, to, playing_track, playlist_track);
- send_trackinfochanged (to);
- }
- if (from) {
- send_trackinfochanged (from);
- }
- char decoder_id100 = "";
- char filetype100 = "";
- pl_lock ();
- const char *dec = pl_find_meta (it, ":DECODER");
- if (dec) {
- strncpy (decoder_id, dec, sizeof (decoder_id));
- }
- const char *ft = pl_find_meta (it, ":FILETYPE");
- if (ft) {
- strncpy (filetype, ft, sizeof (filetype));
- }
- pl_unlock ();
- char *plugsCTMAP_MAX_PLUGINS = {NULL};
- if (!decoder_id0 && (!strcmp (filetype, "content") || !filetype0)) {
- // try to get content-type
- mutex_lock (decodemutex);
- trace ("\0330;34mopening file %s\03337;0m\n", pl_find_meta (it, ":URI"));
- pl_lock ();
- DB_FILE *fp = streamer_file = vfs_fopen (pl_find_meta (it, ":URI"));
- pl_unlock ();
- mutex_unlock (decodemutex);
- trace ("\0330;34mgetting content-type\03337;0m\n");
- if (!fp) {
- err = -1;
- goto error;
- }
- const char *ct = vfs_get_content_type (fp);
- if (!ct) {
- vfs_fclose (fp);
- fp = NULL;
- streamer_file = NULL;
- err = -1;
- goto error;
- }
- trace ("got content-type: %s\n", ct);
- char *cct = strdupa (ct);
- char *sc = strchr (cct, ';');
- if (sc) {
- *sc = 0;
- }
-
- ctmap_lock ();
- ctmap_t *ctmap = streamer_ctmap;
- while (ctmap) {
- if (!strcmp (cct, ctmap->ct)) {
- break;
- }
- ctmap = ctmap->next;
- }
- if (ctmap) {
- int i;
- for (i = 0; ctmap->pluginsi; i++) {
- plugsi = strdupa (ctmap->pluginsi);
- }
- plugsi = NULL;
- }
- ctmap_unlock ();
-
- if (!plugs0 && (!strcmp (cct, "audio/x-mpegurl") || !strncmp (cct, "text/html", 9) || !strncmp (cct, "audio/x-scpls", 13) || !strncmp (cct, "application/octet-stream", 9))) {
- // download playlist into temp file
- trace ("downloading playlist into temp file...\n");
- char *buf = NULL;
- int fd = -1;
- FILE *out = NULL;
- char tempfile1000 = "";
-
- int size = vfs_fgetlength (fp);
- if (size <= 0) {
- size = MAX_PLAYLIST_DOWNLOAD_SIZE;
- }
- buf = malloc (size);
- if (!buf) {
- trace ("failed to alloc %d bytes for playlist buffer\n", size);
- goto m3u_error;
- }
- trace ("reading %d bytes\n", size);
- int rd = vfs_fread (buf, 1, size, fp);
- if (rd <= 0) {
- trace ("failed to download %d bytes (got %d bytes)\n", size, rd);
- goto m3u_error;
- }
- const char *tmpdir = getenv ("TMPDIR");
- if (!tmpdir) {
- tmpdir = "/tmp";
- }
- snprintf (tempfile, sizeof (tempfile), "%s/ddbm3uXXXXXX", tmpdir);
-
- fd = mkstemp (tempfile);
- if (fd == -1) {
- trace ("failed to open temp file %s\n", tempfile);
- goto m3u_error;
- }
- trace ("writing to %s\n", tempfile);
- out = fdopen (fd, "w+b");
- if (!out) {
- trace ("fdopen failed for %s\n", tempfile);
- goto m3u_error;
- }
- int rw = fwrite (buf, 1, rd, out);
- if (rw != rd) {
- trace ("failed to write %d bytes into file %s\n", size, tempfile);
- goto m3u_error;
- }
- fclose (out);
- fd = -1;
- out = NULL;
-
- trace ("loading playlist from %s\n", tempfile);
- // load playlist
- playlist_t *plt = plt_alloc ("temp");
- DB_playlist_t **plug = plug_get_playlist_list ();
- int p, e;
- DB_playItem_t *m3u = NULL;
- for (p = 0; plugp; p++) {
- if (plugp->load) {
- m3u = plugp->load ((ddb_playlist_t *)plt, NULL, tempfile, NULL, NULL, NULL);
- if (m3u) {
- break;
- }
- }
- }
- if (!m3u) {
- trace ("failed to load playlist from %s using any of the installed playlist plugins\n", tempfile);
- plt_free (plt);
- goto m3u_error;
- }
-
- // hack: need to sleep here, some servers like to reject frequent connections
- usleep(conf_get_int ("streamer.wait_ms_after_m3u_link", 400000));
-
- // for every playlist uri: override stream uri with the one from playlist, and try to play it
- playItem_t *i = (playItem_t *)m3u;
- pl_item_ref (i);
- int res = -1;
- while (i) {
- pl_lock ();
- pl_replace_meta (it, "!URI", pl_find_meta_raw (i, ":URI"));
- pl_unlock ();
- res = streamer_set_current (it);
- if (!res) {
- pl_item_unref (i);
- break;
- }
- playItem_t *next = pl_get_next (i, PL_MAIN);
- pl_item_unref (i);
- i = next;
- }
- plt_free (plt);
- if (res == 0) {
- // succeeded -- playing now
- if (from) {
- pl_item_unref (from);
- }
- if (to) {
- pl_item_unref (to);
- }
- if (buf) {
- free (buf);
- }
- unlink (tempfile);
- return res;
- }
-
-m3u_error:
- if (*tempfile) {
- unlink (tempfile);
- }
- err = -1;
- if (buf) {
- free (buf);
- }
- if (out) {
- fclose (out);
- }
- else if (fd != -1) {
- close (fd);
- }
- goto error;
- }
- mutex_lock (decodemutex);
- streamer_file = NULL;
- vfs_fclose (fp);
- mutex_unlock (decodemutex);
- }
- playlist_track = it;
-
- int plug_idx = 0;
- for (;;) {
- if (!decoder_id0 && plugs0 && !plugsplug_idx) {
- it->played = 1;
- trace ("decoder->init returned %p\n", new_fileinfo);
- streamer_buffering = 0;
- if (playlist_track == it) {
- trace ("redraw track %p; playing_track=%p; playlist_track=%p\n", to, playing_track, playlist_track);
- send_trackinfochanged (to);
- }
- err = -1;
- goto error;
- }
-
- DB_decoder_t *dec = NULL;
-
- if (decoder_id0) {
- dec = plug_get_decoder_for_id (decoder_id);
- decoder_id0 = 0;
- if (!dec) {
- // find new decoder by file extension
- pl_lock ();
- const char *fname = pl_find_meta (it, ":URI");
- const char *ext = strrchr (fname, '.');
- if (ext) {
- ext++;
- DB_decoder_t **decs = plug_get_decoder_list ();
- for (int i = 0; decsi; i++) {
- const char **exts = decsi->exts;
- if (exts) {
- for (int j = 0; extsj; j++) {
- if (!strcasecmp (extsj, ext)) {
- fprintf (stderr, "streamer: %s : changed decoder plugin to %s\n", fname, decsi->plugin.id);
- pl_replace_meta (it, "!DECODER", decsi->plugin.id);
- pl_replace_meta (it, "!FILETYPE", ext);
- dec = decsi;
- break;
- }
- }
- }
- }
- }
- pl_unlock ();
- }
- }
- else if (plugs0) {
- // match by decoder
- dec = plug_get_decoder_for_id (plugsplug_idx);
- if (dec) {
- pl_replace_meta (it, "!DECODER", dec->plugin.id);
- }
- plug_idx++;
- }
-
- if (!dec) {
- trace ("no decoder in playitem!\n");
- it->played = 1;
- streamer_buffering = 0;
- if (playlist_track == it) {
- send_trackinfochanged (to);
- }
- if (from) {
- pl_item_unref (from);
- }
- if (to) {
- pl_item_unref (to);
- }
- return -1;
- }
-
- trace ("\0330;33minit decoder for %s (%s)\03337;0m\n", pl_find_meta (it, ":URI"), dec->plugin.id);
- mutex_lock (decodemutex);
- new_fileinfo = dec_open (dec, 0, it);
- if (new_fileinfo->file) {
- new_fileinfo_file = new_fileinfo->file;
- }
- mutex_unlock (decodemutex);
- if (new_fileinfo && dec->init (new_fileinfo, DB_PLAYITEM (it)) != 0) {
- trace ("\0330;31mfailed to init decoder\03337;0m\n");
- pl_delete_meta (it, "!DECODER");
- mutex_lock (decodemutex);
- dec->free (new_fileinfo);
- new_fileinfo = NULL;
- new_fileinfo_file = NULL;
- mutex_unlock (decodemutex);
- }
-
- if (!new_fileinfo) {
- trace ("decoder %s failed\n", dec->plugin.id);
- continue;
- }
- else {
- mutex_lock (decodemutex);
- new_fileinfo_file = new_fileinfo->file;
- if (streaming_track) {
- pl_item_unref (streaming_track);
- }
- streaming_track = it;
- if (streaming_track) {
- pl_item_ref (streaming_track);
- streamer_set_replaygain (streaming_track);
- }
-
- mutex_unlock (decodemutex);
- trace ("bps=%d, channels=%d, samplerate=%d\n", new_fileinfo->fmt.bps, new_fileinfo->fmt.channels, new_fileinfo->fmt.samplerate);
- break;
- }
- }
-success:
- mutex_lock (decodemutex);
- if (fileinfo) {
- fileinfo->plugin->free (fileinfo);
- fileinfo = NULL;
- fileinfo_file = NULL;
- }
- if (new_fileinfo) {
- fileinfo = new_fileinfo;
- new_fileinfo = NULL;
- new_fileinfo_file = NULL;
- }
- mutex_unlock (decodemutex);
- if (do_songstarted && playing_track) {
- trace ("songstarted %s\n", playing_track ? pl_find_meta (playing_track, ":URI") : "null");
- playtime = 0;
- send_songstarted (playing_track);
- }
- send_trackinfochanged (to);
-
- trace ("\0330;32mstr: %p (%s), ply: %p (%s)\03337;0m\n", streaming_track, streaming_track ? pl_find_meta (streaming_track, ":URI") : "null", playing_track, playing_track ? pl_find_meta (playing_track, ":URI") : "null");
-
-error:
- if (from) {
- pl_item_unref (from);
- }
- if (to) {
- pl_item_unref (to);
- }
-
- return err;
-}
-
-float
-streamer_get_playpos (void) {
- float seek = last_seekpos;
- if (seek >= 0) {
- return seek;
- }
- return playpos;
-}
-
-void
-streamer_set_bitrate (int bitrate) {
- if (bytes_until_next_song <= 0) { // prevent next track from resetting current playback bitrate
- last_bitrate = bitrate;
- }
-}
-
-int
-streamer_get_apx_bitrate (void) {
- return avg_bitrate;
-}
-
-void
-streamer_set_nextsong (int song, int pstate) {
-// pthread_t tid = pthread_self ();
-// assert (tid != streamer_tid);
- if (pstate == 0) {
- // this is a stop query -- clear the queue
- handler_reset (handler);
- }
- streamer_abort_files ();
- handler_push (handler, STR_EV_PLAY_TRACK_IDX, 0, song, pstate);
-}
-
-static void
-streamer_set_nextsong_real (int song, int pstate) {
- DB_output_t *output = plug_get_output ();
- if (pstate != 4) {
- int n = 0;
- }
- trace ("\0330;35mstreamer_set_nextsong %d %d\03337;0m\n", song, pstate);
- if (pstate == 4) {
- pstate = 1;
- output->stop ();
- }
- streamer_lock ();
- nextsong = song;
- nextsong_pstate = pstate;
- if (output->state () == OUTPUT_STATE_STOPPED) {
- if (pstate == 1) { // means user initiated this
- pl_lock ();
- if (streamer_playlist) {
- plt_unref (streamer_playlist);
- }
- streamer_playlist = plt_get_curr ();
- pl_unlock ();
- }
- // no sense to wait until end of previous song, reset buffer
- bytes_until_next_song = 0;
- playpos = 0;
- last_seekpos = -1;
- }
- if (pl_get_order () == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
- plt_init_shuffle_albums (streamer_playlist, song);
- }
- streamer_unlock ();
-}
-
-static void
-streamer_set_generic_output_format (void) {
- output_format.bps = 16;
- output_format.is_float = 0;
- output_format.channels = 2;
- output_format.samplerate = 44100;
- output_format.channelmask = 3;
- streamer_set_output_format ();
-}
-
-void
-streamer_set_seek (float pos) {
- last_seekpos = pos;
- handler_push (handler, STR_EV_SEEK, 0, *((uint32_t *)&pos), 0);
-}
-
-static void
-streamer_start_new_song (void) {
- trace ("nextsong=%d (badsong=%d)\n", nextsong, badsong);
- streamer_lock ();
- DB_output_t *output = plug_get_output ();
- int sng = nextsong;
- int initsng = nextsong;
- int pstate = nextsong_pstate;
- nextsong = -1;
- streamer_unlock ();
- if (badsong == sng) {
- trace ("looped to bad file. stopping...\n");
- streamer_set_nextsong_real (-2, -2);
- badsong = -1;
- return;
- }
- playItem_t *try = str_get_for_idx (sng);
- if (!try) { // track is not in playlist
- trace ("track #%d is not in playlist; stopping playback\n", sng);
- output->stop ();
-
- mutex_lock (decodemutex);
- if (playing_track) {
- pl_item_unref (playing_track);
- playing_track = NULL;
- }
- if (streaming_track) {
- pl_item_unref (streaming_track);
- streaming_track = NULL;
- }
- mutex_unlock (decodemutex);
-
- send_trackchanged (NULL, NULL);
- return;
- }
- int ret = streamer_set_current (try);
-
- if (ret < 0) {
- trace ("\0330;31mfailed to play track %s, skipping (current=%p/%p)...\03337;0m\n", pl_find_meta (try, ":URI"), streaming_track, playlist_track);
- pl_item_unref (try);
- try = NULL;
- // remember bad song number in case of looping
- if (badsong == -1) {
- badsong = sng;
- }
- trace ("\0330;34mbadsong=%d\03337;0m\n", badsong);
- // try jump to next song
- if (nextsong == -1) {
- trace ("streamer_move_to_nextsong after skip\n");
- streamer_move_to_nextsong_real (1);
- usleep (50000);
- }
- else {
- trace ("nextsong changed from %d to %d by another thread, reinit\n", initsng, nextsong);
- badsong = -1;
- }
- return;
- }
- pl_item_unref (try);
- try = NULL;
- badsong = -1;
- trace ("pstate = %d\n", pstate);
- trace ("playback state = %d\n", output->state ());
- if (pstate == 0) {
- output->stop ();
- }
- else if (pstate == 1 || pstate == 3) {
- last_bitrate = -1;
- avg_bitrate = -1;
- if (output->state () != OUTPUT_STATE_PLAYING) {
- streamer_reset (1);
- if (fileinfo && memcmp (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t))) {
- memcpy (&output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- memcpy (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
-// fprintf (stderr, "streamer_set_output_format %dbit %s %dch %dHz channelmask=%X\n", output_format.bps, output_format.is_float ? "float" : "int", output_format.channels, output_format.samplerate, output_format.channelmask);
- streamer_set_output_format ();
- }
- if (0 != output->play ()) {
- // give a chance to DSP plugins to convert format to something
- // supported
- streamer_set_generic_output_format ();
- if (0 != output->play ()) {
- memset (&orig_output_format, 0, sizeof (orig_output_format));
- fprintf (stderr, "streamer: failed to start playback (start track)\n");
- streamer_set_nextsong_real (-2, 0);
- }
- }
- }
- }
- else if (pstate == 2) {
- if (output->state () == OUTPUT_STATE_STOPPED) {
- last_bitrate = -1;
- avg_bitrate = -1;
- streamer_reset (1);
- if (fileinfo && memcmp (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t))) {
- memcpy (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- formatchanged = 1;
- }
- // we need to start playback before we can pause it
- if (0 != output->play ()) {
- memset (&orig_output_format, 0, sizeof (orig_output_format));
- fprintf (stderr, "streamer: failed to start playback (start track)\n");
- streamer_set_nextsong_real (-2, 0);
- }
- }
- output->pause ();
- }
-}
-
-static void
-streamer_next (int bytesread) {
- streamer_lock ();
- bytes_until_next_song = streamer_ringbuf.remaining + bytesread;
- streamer_unlock ();
- if (stop_after_current) {
- streamer_buffering = 0;
- streamer_set_nextsong_real (-2, -2);
- if (conf_get_int ("playlist.stop_after_current_reset", 0)) {
- conf_set_int ("playlist.stop_after_current", 0);
- stop_after_current = 0;
- deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
- }
- }
- else {
- trace ("streamer_move_to_nextsong (0) called from streamer_next\n");
- streamer_move_to_nextsong_real (0);
- }
-}
-
-void
-streamer_thread (void *ctx) {
-#ifdef __linux__
- prctl (PR_SET_NAME, "deadbeef-stream", 0, 0, 0, 0);
-#endif
-
- while (!streaming_terminate) {
- float seekpos = -1;
-
- struct timeval tm1;
- DB_output_t *output = plug_get_output ();
- gettimeofday (&tm1, NULL);
-
- uint32_t id;
- uintptr_t ctx;
- uint32_t p1, p2;
- if (!handler_pop (handler, &id, &ctx, &p1, &p2)) {
- switch (id) {
- case STR_EV_PLAY_TRACK_IDX:
- streamer_set_nextsong_real (p1, p2);
- break;
- case STR_EV_PLAY_CURR:
- streamer_play_current_track_real ();
- break;
- case STR_EV_NEXT:
- streamer_move_to_nextsong_real (p1);
- break;
- case STR_EV_PREV:
- streamer_move_to_prevsong_real (p1);
- break;
- case STR_EV_RAND:
- streamer_move_to_randomsong_real (p1);
- break;
- case STR_EV_SEEK:
- seekpos = *((float *)&p1);
- break;
- case STR_EV_SET_CURR_PLT:
- streamer_set_current_playlist_real (p1);
- break;
- }
- }
-
- if (nextsong >= 0) { // start streaming next song
- trace ("\0330;34mnextsong=%d\03337;0m\n", nextsong);
- if (playing_track) {
- trace ("sending songfinished to plugins 3\n");
- send_songfinished (playing_track);
- }
- streamer_start_new_song ();
- if (nextsong_pstate == 2) {
- nextsong_pstate = -1;
- }
- // it's totally possible that song was switched
- // while streamer_set_current was running,
- // so we need to restart here
- continue;
- }
- else if (nextsong == -2 && (nextsong_pstate==0 || bytes_until_next_song == 0)) {
- streamer_lock ();
- playItem_t *from = playing_track;
- bytes_until_next_song = -1;
- trace ("nextsong=-2\n");
- nextsong = -1;
- if (playing_track) {
- trace ("sending songfinished to plugins 1\n");
- send_songfinished (playing_track);
- }
- if (from) {
- pl_item_ref (from);
- }
- streamer_set_current (NULL);
- if (playing_track) {
- pl_item_unref (playing_track);
- playing_track = NULL;
- }
- send_trackchanged (from, NULL);
- if (from) {
- pl_item_unref (from);
- }
- streamer_unlock ();
- output->stop ();
- continue;
- }
- else if (output->state () == OUTPUT_STATE_STOPPED) {
- usleep (50000);
- continue;
- }
-
- if (bytes_until_next_song == 0) {
- streamer_lock ();
- if (!streaming_track) {
- // means last song was deleted during final drain
- nextsong = -1;
- output->stop ();
- streamer_set_current (NULL);
- streamer_unlock ();
- continue;
- }
- trace ("bytes_until_next_song=0, starting playback of new song\n");
- //playItem_t *from = playing_track;
- //playItem_t *to = streaming_track;
- trace ("sending songchanged\n");
- bytes_until_next_song = -1;
- // plugin will get pointer to str_playing_song
- if (playing_track) {
- trace ("sending songfinished to plugins 2\n");
- send_songfinished (playing_track);
- }
- // copy streaming into playing
- trace ("\0330;35mstreamer_start_playback2 from %p to %p\03337;0m\n", playing_track, streaming_track);
- streamer_start_playback (playing_track, streaming_track);
- trace ("songstarted %s\n", playing_track ? pl_find_meta (playing_track, ":URI") : "null");
- playtime = 0;
- send_songstarted (playing_track);
- last_bitrate = -1;
- avg_bitrate = -1;
- playlist_track = playing_track;
- playpos = 0;
- last_seekpos = -1;
- seekpos = -1;
-
- // don't switch if unchanged
- ddb_waveformat_t prevfmt;
- memcpy (&prevfmt, &output->fmt, sizeof (ddb_waveformat_t));
- if (memcmp (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t))) {
- memcpy (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- memcpy (&output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- formatchanged = 1;
- }
- streamer_unlock ();
- }
-
- float seek = seekpos;
- if (seek >= 0 && pl_get_item_duration (playing_track) > 0) {
- playpos = seek;
- trace ("seeking to %f\n", seek);
- float pos = seek;
-
- if (playing_track != streaming_track) {
- trace ("streamer already switched to next track\n");
- 
- // restart playing from new position
- 
- mutex_lock (decodemutex);
- if(fileinfo) {
- fileinfo->plugin->free (fileinfo);
- fileinfo = NULL;
- fileinfo_file = NULL;
- pl_item_unref (streaming_track);
- streaming_track = NULL;
- }
- streaming_track = playing_track;
- if (streaming_track) {
- pl_item_ref (streaming_track);
- streamer_set_replaygain (streaming_track);
- }
- mutex_unlock (decodemutex);
-
- bytes_until_next_song = -1;
- streamer_buffering = 1;
- if (streaming_track) {
- send_trackinfochanged (streaming_track);
- }
-
- mutex_lock (decodemutex);
- DB_decoder_t *dec = NULL;
- pl_lock ();
- const char *decoder_id = pl_find_meta (streaming_track, ":DECODER");
- if (decoder_id) {
- dec = plug_get_decoder_for_id (decoder_id);
- }
- pl_unlock ();
- if (dec) {
- fileinfo = dec_open (dec, 0, streaming_track);
- mutex_unlock (decodemutex);
- if (fileinfo && dec->init (fileinfo, DB_PLAYITEM (streaming_track)) != 0) {
- mutex_lock (decodemutex);
- dec->free (fileinfo);
- fileinfo = NULL;
- fileinfo_file = NULL;
- mutex_unlock (decodemutex);
- }
- }
- else {
- if (fileinfo) {
- fileinfo_file = fileinfo->file;
- }
- mutex_unlock (decodemutex);
- }
-
- if (!dec || !fileinfo) {
- if (streaming_track) {
- send_trackinfochanged (streaming_track);
- }
- trace ("failed to restart prev track on seek, trying to jump to next track\n");
- trace ("streamer_move_to_nextsong from seek\n");
- streamer_move_to_nextsong (0);
- usleep (50000);
- continue;
- }
- }
-
- bytes_until_next_song = -1;
- streamer_buffering = 1;
- if (streaming_track) {
- send_trackinfochanged (streaming_track);
- }
- float dur = pl_get_item_duration (playing_track);
- if (fileinfo && playing_track && dur > 0) {
- if (pos >= dur) {
- output->stop ();
- streamer_move_to_nextsong (1);
- continue;
- }
- streamer_lock ();
- streamer_reset (1);
- if (fileinfo->plugin->seek (fileinfo, pos) >= 0) {
- playpos = fileinfo->readpos;
- }
- last_bitrate = -1;
- avg_bitrate = -1;
- streamer_unlock();
- }
- ddb_event_playpos_t *ev = (ddb_event_playpos_t *)messagepump_event_alloc (DB_EV_SEEKED);
- ev->track = DB_PLAYITEM (playing_track);
- if (playing_track) {
- pl_item_ref (playing_track);
- }
- ev->playpos = playpos;
- messagepump_push_event ((ddb_event_t*)ev, 0, 0);
- }
- last_seekpos = -1;
-
- // read ahead at 2x speed of output samplerate, in 4k blocks
- int rate = output->fmt.samplerate;
- if (!rate) {
- trace ("str: got 0 output samplerate\n");
- usleep(20000);
- continue;
- }
- int channels = output->fmt.channels;
- int bytes_in_one_second = rate * (output->fmt.bps>>3) * channels;
- int blocksize = bytes_in_one_second / 120;
-
- if (blocksize < MIN_BLOCK_SIZE) {
- blocksize = MIN_BLOCK_SIZE;
- }
- else if (blocksize > MAX_BLOCK_SIZE) {
- blocksize = MAX_BLOCK_SIZE;
- }
-
- blocksize &= ~3; // 4byte alignment is required
-
- int alloc_time = 1000 / (bytes_in_one_second / blocksize);
-
- int skip = 0;
- if (bytes_until_next_song >= 0) {
- // check if streaming format differs from output
- if (memcmp(&fileinfo->fmt, &orig_output_format, sizeof (ddb_waveformat_t))) {
- skip = 1;
- streamer_buffering = 0;
- }
- }
- streamer_lock ();
-
- if (!formatchanged && !skip && streamer_ringbuf.remaining < (STREAM_BUFFER_SIZE-blocksize * MAX_DSP_RATIO)) {
- int sz = STREAM_BUFFER_SIZE - streamer_ringbuf.remaining;
- int minsize = blocksize;
-
- // speed up buffering when empty
- if (streamer_ringbuf.remaining < MAX_BLOCK_SIZE) {
- minsize *= 4;
- alloc_time *= 4;
- }
- sz = min (minsize, sz);
- assert ((sz&3) == 0);
- // buffer must be larger enough to accomodate resamplers/pitchers/...
- // FIXME: bounds checking
- streamer_unlock ();
-
- // ensure that size is possible with current format
- int samplesize = output->fmt.channels * (output->fmt.bps>>3);
- if (sz % samplesize) {
- sz -= (sz % samplesize);
- }
- int bytesread = 0;
- do {
- int prev_buns = bytes_until_next_song;
- int nb = streamer_read_async (readbuffer+bytesread,sz-bytesread);
- if (nb <= 0) {
- break;
- }
- bytesread += nb;
- struct timeval tm2;
- gettimeofday (&tm2, NULL);
- int ms = (tm2.tv_sec*1000+tm2.tv_usec/1000) - (tm1.tv_sec*1000+tm1.tv_usec/1000);
- if (ms >= alloc_time) {
- break;
- }
- if (prev_buns != bytes_until_next_song) {
- break;
- }
- } while (bytesread < sz-100);
- streamer_lock ();
-
- if (bytesread > 0) {
- ringbuf_write (&streamer_ringbuf, readbuffer, bytesread);
- }
-
- if (trace_bufferfill >= 1) {
- fprintf (stderr, "fill: %d, read: %d, size=%d, blocksize=%d\n", (int)streamer_ringbuf.remaining, (int)bytesread, (int)STREAM_BUFFER_SIZE, (int)blocksize);
- }
- }
- streamer_unlock ();
- if ((streamer_ringbuf.remaining > 128000 && streamer_buffering) || !streaming_track) {
- streamer_buffering = 0;
- if (streaming_track) {
- send_trackinfochanged (streaming_track);
- }
- }
- struct timeval tm2;
- gettimeofday (&tm2, NULL);
-
- int ms = (tm2.tv_sec*1000+tm2.tv_usec/1000) - (tm1.tv_sec*1000+tm1.tv_usec/1000);
- if (trace_bufferfill >= 2) {
- fprintf (stderr, "slept %dms (alloc=%dms, bytespersec=%d, chan=%d, blocksize=%d), fill: %d/%d (cursor=%d)\n", (int)(alloc_time-ms), (int)alloc_time, (int)bytes_in_one_second, output->fmt.channels, blocksize, (int)streamer_ringbuf.remaining, STREAM_BUFFER_SIZE, (int)streamer_ringbuf.cursor);
- }
-
- // add 1ms here to compensate the rounding error
- // and another 1ms to buffer slightly faster then playing
- alloc_time -= ms+2;
- if (streamer_buffering) {
- alloc_time = 0;
- }
- else if (streamer_ringbuf.remaining < STREAM_BUFFER_SIZE / 2) {
- alloc_time >>= 2; // speed-up loading a little
- }
-
- //printf ("sleep: %d, buffering: %d, buffer_starving: %d (%d/%d)\n", alloc_time, streamer_buffering, streamer_ringbuf.remaining < STREAM_BUFFER_SIZE / 2, streamer_ringbuf.remaining, STREAM_BUFFER_SIZE / 2);
-
- if (alloc_time > 0) {
- usleep (alloc_time * 1000);
- }
- else if (bytes_until_next_song > 0) {
- usleep (20000);
- }
- }
-
- // stop streaming song
- mutex_lock (decodemutex);
- if (fileinfo) {
- fileinfo->plugin->free (fileinfo);
- fileinfo = NULL;
- fileinfo_file = NULL;
- }
- if (streaming_track) {
- pl_item_unref (streaming_track);
- streaming_track = NULL;
- }
- if (playing_track) {
- pl_item_unref (playing_track);
- playing_track = NULL;
- }
- mutex_unlock (decodemutex);
-}
-
-void
-streamer_dsp_chain_free (ddb_dsp_context_t *dsp_chain) {
- while (dsp_chain) {
- ddb_dsp_context_t *next = dsp_chain->next;
- dsp_chain->plugin->close (dsp_chain);
- dsp_chain = next;
- }
-}
-
-ddb_dsp_context_t *
-streamer_dsp_chain_load (const char *fname) {
- int err = 1;
- FILE *fp = fopen (fname, "rt");
- if (!fp) {
- return NULL;
- }
-
- char temp100;
- ddb_dsp_context_t *chain = NULL;
- ddb_dsp_context_t *tail = NULL;
- for (;;) {
- // plugin enabled {
- int enabled = 0;
- int err = fscanf (fp, "%99s %d {\n", temp, &enabled);
- if (err == EOF) {
- break;
- }
- else if (2 != err) {
- fprintf (stderr, "error plugin name\n");
- goto error;
- }
-
- DB_dsp_t *plug = (DB_dsp_t *)deadbeef->plug_get_for_id (temp);
- if (!plug) {
- fprintf (stderr, "streamer_dsp_chain_load: plugin %s not found. preset will not be loaded\n", temp);
- goto error;
- }
- ddb_dsp_context_t *ctx = plug->open ();
- if (!ctx) {
- fprintf (stderr, "streamer_dsp_chain_load: failed to open ctxance of plugin %s\n", temp);
- goto error;
- }
-
- if (tail) {
- tail->next = ctx;
- tail = ctx;
- }
- else {
- tail = chain = ctx;
- }
-
- int n = 0;
- for (;;) {
- char value1000;
- if (!fgets (temp, sizeof (temp), fp)) {
- fprintf (stderr, "streamer_dsp_chain_load: unexpected eof while reading plugin params\n");
- goto error;
- }
- if (!strcmp (temp, "}\n")) {
- break;
- }
- else if (1 != sscanf (temp, "\t%1000^\n\n", value)) {
- fprintf (stderr, "streamer_dsp_chain_load: error loading param %d\n", n);
- goto error;
- }
- if (plug->num_params) {
- plug->set_param (ctx, n, value);
- }
- n++;
- }
- ctx->enabled = enabled;
- }
-
- err = 0;
-error:
- if (err) {
- fprintf (stderr, "streamer_dsp_chain_load: error loading %s\n", fname);
- }
- if (fp) {
- fclose (fp);
- }
- if (err && chain) {
- streamer_dsp_chain_free (chain);
- chain = NULL;
- }
- return chain;
-}
-
-int
-streamer_dsp_chain_save_internal (const char *fname, ddb_dsp_context_t *chain) {
- char tempfilePATH_MAX;
- snprintf (tempfile, sizeof (tempfile), "%s.tmp", fname);
- FILE *fp = fopen (tempfile, "w+t");
- if (!fp) {
- return -1;
- }
-
- ddb_dsp_context_t *ctx = chain;
- while (ctx) {
- if (fprintf (fp, "%s %d {\n", ctx->plugin->plugin.id, (int)ctx->enabled) < 0) {
- fprintf (stderr, "write to %s failed (%s)\n", tempfile, strerror (errno));
- goto error;
- }
- if (ctx->plugin->num_params) {
- int n = ctx->plugin->num_params ();
- int i;
- for (i = 0; i < n; i++) {
- char v1000;
- ctx->plugin->get_param (ctx, i, v, sizeof (v));
- if (fprintf (fp, "\t%s\n", v) < 0) {
- fprintf (stderr, "write to %s failed (%s)\n", tempfile, strerror (errno));
- goto error;
- }
- }
- }
- if (fprintf (fp, "}\n") < 0) {
- fprintf (stderr, "write to %s failed (%s)\n", tempfile, strerror (errno));
- goto error;
- }
- ctx = ctx->next;
- }
-
- fclose (fp);
- if (rename (tempfile, fname) != 0) {
- fprintf (stderr, "dspconfig rename %s -> %s failed: %s\n", tempfile, fname, strerror (errno));
- return -1;
- }
- return 0;
-error:
- fclose (fp);
- return -1;
-}
-
-int
-streamer_dsp_chain_save (void) {
- char fnamePATH_MAX;
- snprintf (fname, sizeof (fname), "%s/dspconfig", plug_get_config_dir ());
- return streamer_dsp_chain_save_internal (fname, dsp_chain);
-}
-
-static void
-streamer_dsp_postinit (void) {
- // note about EQ hack:
- // we 1st check if there's an EQ in dsp chain, and just use it
- // if not -- we add our own
-
- // eq plug
- if (eqplug) {
- ddb_dsp_context_t *p;
-
- for (p = dsp_chain; p; p = p->next) {
- if (!strcmp (p->plugin->plugin.id, "supereq")) {
- break;
- }
- }
- if (p) {
- eq = p;
- }
- else {
- eq = eqplug->open ();
- eq->enabled = 0;
- eq->next = dsp_chain;
- dsp_chain = eq;
- }
-
- }
- ddb_dsp_context_t *ctx = dsp_chain;
- while (ctx) {
- if (ctx->enabled) {
- break;
- }
- ctx = ctx->next;
- }
- if (!ctx && fileinfo) {
- if (memcmp (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t))) {
- memcpy (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- memcpy (&output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- formatchanged = 1;
- }
- dsp_on = 0;
- }
- else if (ctx) {
- dsp_on = 1;
- // set some very generic format, this will allow playback of weird
- // formats after fixing them with dsp plugins
- streamer_set_generic_output_format ();
- }
- else if (!ctx) {
- dsp_on = 0;
- }
-}
-
-void
-streamer_dsp_refresh (void) {
- mutex_lock (decodemutex);
- streamer_dsp_postinit ();
- mutex_unlock (decodemutex);
-}
-
-static void
-streamer_dsp_init (void) {
- // load dsp chain from file
- char fnamePATH_MAX;
- snprintf (fname, sizeof (fname), "%s/dspconfig", plug_get_config_dir ());
- dsp_chain = streamer_dsp_chain_load (fname);
- if (!dsp_chain) {
- // first run, let's add resampler
- DB_dsp_t *src = (DB_dsp_t *)plug_get_for_id ("SRC");
- if (src) {
- ddb_dsp_context_t *inst = src->open ();
- inst->enabled = 1;
- src->set_param (inst, 0, "48000"); // samplerate
- src->set_param (inst, 1, "2"); // quality=SINC_FASTEST
- src->set_param (inst, 2, "1"); // auto
- inst->next = dsp_chain;
- dsp_chain = inst;
- }
- }
-
- eqplug = (DB_dsp_t *)plug_get_for_id ("supereq");
- streamer_dsp_postinit ();
-
- // load legacy eq settings from pre-0.5
- if (eq && eqplug && conf_find ("eq.", NULL)) {
- eq->enabled = deadbeef->conf_get_int ("eq.enable", 0);
- char s50;
-
- // 0.4.4 was writing buggy settings, need to multiply by 2 to compensate
- conf_get_str ("eq.preamp", "0", s, sizeof (s));
- snprintf (s, sizeof (s), "%f", atof(s)*2);
- eqplug->set_param (eq, 0, s);
- for (int i = 0; i < 18; i++) {
- char key100;
- snprintf (key, sizeof (key), "eq.band%d", i);
- conf_get_str (key, "0", s, sizeof (s));
- snprintf (s, sizeof (s), "%f", atof(s)*2);
- eqplug->set_param (eq, 1+i, s);
- }
- // delete obsolete settings
- conf_remove_items ("eq.");
- }
-}
-
-int
-streamer_init (void) {
- streaming_terminate = 0;
- handler = handler_alloc (100);
-#if WRITE_DUMP
- out = fopen ("out.raw", "w+b");
-#endif
- mutex = mutex_create ();
- decodemutex = mutex_create ();
- wdl_mutex = mutex_create ();
-
- ringbuf_init (&streamer_ringbuf, streambuffer, STREAM_BUFFER_SIZE);
-
- pl_set_order (conf_get_int ("playback.order", 0));
-
- streamer_dsp_init ();
- 
- replaygain_set (conf_get_int ("replaygain_mode", 0), conf_get_int ("replaygain_scale", 1), conf_get_float ("replaygain_preamp", 0), conf_get_float ("global_preamp", 0));
-
- ctmap_init_mutex ();
- deadbeef->conf_get_str ("network.ctmapping", DDB_DEFAULT_CTMAPPING, conf_network_ctmapping, sizeof (conf_network_ctmapping));
- ctmap_init ();
-
- streamer_tid = thread_start (streamer_thread, NULL);
- return 0;
-}
-
-void
-streamer_free (void) {
-#if WRITE_DUMP
- fclose (out);
-#endif
-
- if (playing_track) {
- send_trackchanged (playing_track, NULL);
- }
- streamer_abort_files ();
- streaming_terminate = 1;
- thread_join (streamer_tid);
-
- if (streaming_track) {
- pl_item_unref (streaming_track);
- streaming_track = NULL;
- }
- if (playing_track) {
- pl_item_unref (playing_track);
- playing_track = NULL;
- }
- if (playlist_track) {
- playlist_track = NULL;
- }
- if (streamer_playlist) {
- plt_unref (streamer_playlist);
- streamer_playlist = NULL;
- }
-
- ctmap_free ();
- ctmap_free_mutex ();
-
- mutex_free (decodemutex);
- decodemutex = 0;
- mutex_free (mutex);
- mutex = 0;
- mutex_free (wdl_mutex);
- wdl_mutex = 0;
-
- streamer_dsp_chain_save();
-
- streamer_dsp_chain_free (dsp_chain);
- dsp_chain = NULL;
-
- eqplug = NULL;
- eq = NULL;
-
- if (handler) {
- handler_free (handler);
- handler = NULL;
- }
-}
-
-void
-streamer_reset (int full) { // must be called when current song changes by external reasons
- if (!mutex) {
- fprintf (stderr, "ERROR: someone called streamer_reset after exit\n");
- return; // failsafe, in case someone calls streamer reset after deinit
- }
- if (full) {
- streamer_lock ();
- streamer_ringbuf.remaining = 0;
- streamer_unlock ();
- }
-
- // reset dsp
- ddb_dsp_context_t *dsp = dsp_chain;
- while (dsp) {
- if (dsp->plugin->reset) {
- dsp->plugin->reset (dsp);
- }
- dsp = dsp->next;
- }
-}
-
-static int
-streamer_set_output_format (void) {
- DB_output_t *output = plug_get_output ();
- int playing = (output->state () == OUTPUT_STATE_PLAYING);
-
- trace ("streamer_set_output_format %dbit %s %dch %dHz channelmask=%X, bufferfill: %d\n", output_format.bps, output_format.is_float ? "float" : "int", output_format.channels, output_format.samplerate, output_format.channelmask, streamer_ringbuf.remaining);
- ddb_waveformat_t fmt;
- memcpy (&fmt, &output_format, sizeof (ddb_waveformat_t));
- if (autoconv_8_to_16) {
- if (fmt.bps == 8) {
- fmt.bps = 16;
- }
- }
- if (autoconv_16_to_24) {
- if (fmt.bps == 16) {
- fmt.bps = 24;
- }
- }
- output->setformat (&fmt);
- streamer_buffering = 1;
- if (playing && output->state () != OUTPUT_STATE_PLAYING) {
- if (0 != output->play ()) {
- memset (&output_format, 0, sizeof (output_format));
- fprintf (stderr, "streamer: failed to start playback (streamer_read format change)\n");
- streamer_set_nextsong_real (-2, 0);
- return -1;
- }
- }
- return 0;
-}
-
-// decodes data and converts to current output format
-// returns number of bytes been read
-static int
-streamer_read_async (char *bytes, int size) {
- DB_output_t *output = plug_get_output ();
- int initsize = size;
- int bytesread = 0;
- mutex_lock (decodemutex);
- if (!fileinfo) {
- // means there's nothing left to stream, so just do nothing
- mutex_unlock (decodemutex);
- return 0;
- }
- int is_eof = 0;
-
- if (fileinfo->fmt.samplerate != -1) {
- int outputsamplesize = output->fmt.channels * output->fmt.bps / 8;
- int inputsamplesize = fileinfo->fmt.channels * fileinfo->fmt.bps / 8;
-
- ddb_waveformat_t dspfmt;
- memcpy (&dspfmt, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- dspfmt.bps = 32;
- dspfmt.is_float = 1;
- int can_bypass = 0;
- if (dsp_on) {
- // check if DSP can be passed through
- ddb_dsp_context_t *dsp = dsp_chain;
- while (dsp) {
- if (dsp->enabled) {
- if (dsp->plugin->plugin.api_vminor >= 1) {
- if (dsp->plugin->can_bypass && !dsp->plugin->can_bypass (dsp, &dspfmt)) {
- break;
- }
- }
- else {
- break;
- }
- }
- dsp = dsp->next;
- }
- if (!dsp) {
- can_bypass = 1;
- }
- }
-
- if (!memcmp (&fileinfo->fmt, &output->fmt, sizeof (ddb_waveformat_t)) && (!dsp_on || can_bypass)) {
- // pass through from input to output
- bytesread = fileinfo->plugin->read (fileinfo, bytes, size);
-
- if (bytesread != size) {
- is_eof = 1;
- }
- }
- else if (dsp_on) {
- // convert to float, pass through streamer DSP chain
- int dspsamplesize = fileinfo->fmt.channels * sizeof (float);
- int dsp_num_frames = size / (output->fmt.channels * output->fmt.bps / 8);
-
- char outbufdsp_num_frames * dspsamplesize;
-
- int inputsize = dsp_num_frames * inputsamplesize;
- char inputinputsize;
-
- // decode pcm
- int nb = fileinfo->plugin->read (fileinfo, input, inputsize);
- if (nb != inputsize) {
- is_eof = 1;
- }
- inputsize = nb;
-
- if (inputsize > 0) {
- // make *MAX_DSP_RATIO sized buffer for float data
- char tempbufinputsize/inputsamplesize * dspsamplesize * MAX_DSP_RATIO;
-
- // convert to float
- int tempsize = pcm_convert (&fileinfo->fmt, input, &dspfmt, tempbuf, inputsize);
- int nframes = inputsize / inputsamplesize;
- ddb_dsp_context_t *dsp = dsp_chain;
- float ratio = 1.f;
- int maxframes = sizeof (tempbuf) / dspsamplesize;
- while (dsp) {
- if (dsp->enabled) {
- float r = 1;
- nframes = dsp->plugin->process (dsp, (float *)tempbuf, nframes, maxframes, &dspfmt, &r);
- ratio *= r;
- }
- dsp = dsp->next;
- }
- dsp_ratio = ratio;
-
- ddb_waveformat_t outfmt;
- // preserve sampleformat, but take channels, samplerate
- outfmt.bps = fileinfo->fmt.bps;
- outfmt.is_float = fileinfo->fmt.is_float;
- // channelmask from dsp chain
- outfmt.channels = dspfmt.channels;
- outfmt.samplerate = dspfmt.samplerate;
- outfmt.channelmask = dspfmt.channelmask;
- outfmt.is_bigendian = fileinfo->fmt.is_bigendian;
- if (memcmp (&output_format, &outfmt, sizeof (ddb_waveformat_t)) && bytes_until_next_song <= 0) {
- memcpy (&output_format, &outfmt, sizeof (ddb_waveformat_t));
- streamer_set_output_format ();
- }
-
- //printf ("convert from %dbit %s %dch %dHz channelmask=%X to %dbit %s %dch %dHz channelmask=%X\n", dspfmt.bps, dspfmt.is_float ? "float" : "int", dspfmt.channels, dspfmt.samplerate, dspfmt.channelmask, output->fmt.bps, output->fmt.is_float ? "float" : "int", output->fmt.channels, output->fmt.samplerate, output->fmt.channelmask);
-
- int n = pcm_convert (&dspfmt, tempbuf, &output->fmt, bytes, nframes * dspfmt.channels * sizeof (float));
-
- bytesread = n;
- }
- }
- else {
-#ifdef ANDROID
- // if we not compensate here, the streamer loop will go crazy
- if (fileinfo->fmt.samplerate != output->fmt.samplerate) {
- if ((fileinfo->fmt.samplerate / output->fmt.samplerate) == 2 && (fileinfo->fmt.samplerate % output->fmt.samplerate) == 0) {
- size <<= 1;
- }
- else if ((fileinfo->fmt.samplerate / output->fmt.samplerate) == 4 && (fileinfo->fmt.samplerate % output->fmt.samplerate) == 0) {
- size <<= 2;
- }
- }
-#endif
- // convert from input fmt to output fmt
- int inputsize = size/outputsamplesize*inputsamplesize;
- char inputinputsize;
- int nb = fileinfo->plugin->read (fileinfo, input, inputsize);
- if (nb != inputsize) {
- bytesread = nb;
- is_eof = 1;
- }
- inputsize = nb;
-// trace ("convert %d|%d|%d|%d|%d|%d to %d|%d|%d|%d|%d|%d\n"
-// , fileinfo->fmt.bps, fileinfo->fmt.channels, fileinfo->fmt.samplerate, fileinfo->fmt.channelmask, fileinfo->fmt.is_float, fileinfo->fmt.is_bigendian
-// , output->fmt.bps, output->fmt.channels, output->fmt.samplerate, output->fmt.channelmask, output->fmt.is_float, output->fmt.is_bigendian);
- bytesread = pcm_convert (&fileinfo->fmt, input, &output->fmt, bytes, inputsize);
-
-#ifdef ANDROID
- // downsample
- if (fileinfo->fmt.samplerate != output->fmt.samplerate) {
- if ((fileinfo->fmt.samplerate / output->fmt.samplerate) == 2 && (fileinfo->fmt.samplerate % output->fmt.samplerate) == 0) {
- // clip to multiple of 2 samples
- int outsamplesize = output->fmt.channels * (output->fmt.bps>>3) * 2;
- if ((bytesread % outsamplesize) != 0) {
- bytesread -= (bytesread % outsamplesize);
- }
-
-
- // 2x downsample
- int nframes = bytesread / (output->fmt.bps >> 3) / output->fmt.channels;
- int16_t *in = (int16_t *)bytes;
- int16_t *out = in;
- for (int f = 0; f < nframes/2; f++) {
- for (int c = 0; c < output->fmt.channels; c++) {
- outf*output->fmt.channels+c = (inf*2*output->fmt.channels+c + in(f*2+1)*output->fmt.channels+c) >> 1;
- }
- }
- bytesread >>= 1;
- }
- else if ((fileinfo->fmt.samplerate / output->fmt.samplerate) == 4 && (fileinfo->fmt.samplerate % output->fmt.samplerate) == 0) {
- // clip to multiple of 4 samples
- int outsamplesize = output->fmt.channels * (output->fmt.bps>>3) * 4;
- if ((bytesread % outsamplesize) != 0) {
- bytesread -= (bytesread % outsamplesize);
- }
-
-
- // 4x downsample
- int nframes = bytesread / (output->fmt.bps >> 3) / output->fmt.channels;
- assert (bytesread % ((output->fmt.bps >> 3) * output->fmt.channels) == 0);
- int16_t *in = (int16_t *)bytes;
- for (int f = 0; f < nframes/4; f++) {
- for (int c = 0; c < output->fmt.channels; c++) {
- inf*output->fmt.channels+c = (inf*4*output->fmt.channels+c
- + in(f*4+1)*output->fmt.channels+c
- + in(f*4+2)*output->fmt.channels+c
- + in(f*4+3)*output->fmt.channels+c) >> 2;
- }
- }
- bytesread >>= 2;
- }
- }
- assert ((bytesread%2) == 0);
-#endif
-
- }
-#if WRITE_DUMP
- if (bytesread) {
- fwrite (bytes, 1, bytesread, out);
- }
-#endif
-
- replaygain_apply (&output->fmt, streaming_track, bytes, bytesread);
- }
- mutex_unlock (decodemutex);
- if (!is_eof) {
- return bytesread;
- }
- else {
- // that means EOF
- // trace ("streamer: EOF! buns: %d, bytesread: %d, buffering: %d, bufferfill: %d\n", bytes_until_next_song, bytesread, streamer_buffering, streamer_ringbuf.remaining);
-
- // EOF or error while buffering -- stop buffering
- if (bytesread <= 0 && bytes_until_next_song >= 0 && streamer_buffering) {
- streamer_buffering = 0;
- return bytesread;
- }
-
- // if track finished playing -- go to next
- if (bytes_until_next_song < 0) {
- streamer_next (bytesread);
- }
- }
- return bytesread;
-}
-
-int
-streamer_read (char *bytes, int size) {
-#if 0
- struct timeval tm1;
- gettimeofday (&tm1, NULL);
-#endif
- if (!playing_track) {
- return -1;
- }
- DB_output_t *output = plug_get_output ();
- if (formatchanged && bytes_until_next_song <= 0) {
- streamer_set_output_format ();
- formatchanged = 0;
- }
- streamer_lock ();
- int sz = min (size, streamer_ringbuf.remaining);
- if (sz) {
- ringbuf_read (&streamer_ringbuf, bytes, sz);
- playpos += (float)sz/output->fmt.samplerate/((output->fmt.bps>>3)*output->fmt.channels) * dsp_ratio;
- playtime += (float)sz/output->fmt.samplerate/((output->fmt.bps>>3)*output->fmt.channels);
- if (bytes_until_next_song > 0) {
- bytes_until_next_song -= sz;
- if (bytes_until_next_song < 0) {
- bytes_until_next_song = 0;
- }
- }
- }
- streamer_unlock ();
-
- // approximate bitrate
- if (last_bitrate != -1) {
- if (avg_bitrate == -1) {
- avg_bitrate = last_bitrate;
- }
- else {
- if (avg_bitrate < last_bitrate) {
- avg_bitrate += 5;
- if (avg_bitrate > last_bitrate) {
- avg_bitrate = last_bitrate;
- }
- }
- else if (avg_bitrate > last_bitrate) {
- avg_bitrate -= 5;
- if (avg_bitrate < last_bitrate) {
- avg_bitrate = last_bitrate;
- }
- }
- }
-// printf ("apx bitrate: %d (last %d)\n", avg_bitrate, last_bitrate);
- }
- else {
- avg_bitrate = -1;
- }
-
-#if 0
- struct timeval tm2;
- gettimeofday (&tm2, NULL);
-
- int ms = (tm2.tv_sec*1000+tm2.tv_usec/1000) - (tm1.tv_sec*1000+tm1.tv_usec/1000);
- printf ("streamer_read took %d ms\n", ms);
-#endif
-
- if (waveform_listeners || spectrum_listeners) {
- int in_frame_size = (output->fmt.bps >> 3) * output->fmt.channels;
- int in_frames = sz / in_frame_size;
- ddb_waveformat_t out_fmt = {
- .bps = 32,
- .channels = output->fmt.channels,
- .samplerate = output->fmt.samplerate,
- .channelmask = output->fmt.channelmask,
- .is_float = 1,
- .is_bigendian = 0
- };
-
- float temp_audio_datain_frames * out_fmt.channels;
- pcm_convert (&output->fmt, bytes, &out_fmt, (char *)temp_audio_data, sz);
- ddb_audio_data_t data;
- data.fmt = &out_fmt;
- data.data = temp_audio_data;
- data.nframes = in_frames;
- mutex_lock (wdl_mutex);
- for (wavedata_listener_t *l = waveform_listeners; l; l = l->next) {
- l->callback (l->ctx, &data);
- }
- mutex_unlock (wdl_mutex);
-
- if (out_fmt.channels != audio_data_channels || !spectrum_listeners) {
- audio_data_fill = 0;
- audio_data_channels = out_fmt.channels;
- }
-
- if (spectrum_listeners) {
- int remaining = in_frames;
- do {
- int sz = DDB_FREQ_BANDS * 2 -audio_data_fill;
- sz = min (sz, remaining);
- for (int c = 0; c < audio_data_channels; c++) {
- for (int s = 0; s < sz; s++) {
- audio_dataDDB_FREQ_BANDS * 2 * c + audio_data_fill + s = temp_audio_data(in_frames-remaining + s) * audio_data_channels + c;
- }
- }
- // memcpy (&audio_dataaudio_data_fill, &temp_audio_datain_frames-remaining, sz * sizeof (float));
- audio_data_fill += sz;
- remaining -= sz;
- if (audio_data_fill == DDB_FREQ_BANDS * 2) {
- for (int c = 0; c < audio_data_channels; c++) {
- calc_freq (&audio_dataDDB_FREQ_BANDS * 2 * c, &freq_dataDDB_FREQ_BANDS * c);
- }
- ddb_audio_data_t data;
- data.fmt = &out_fmt;
- data.data = freq_data;
- data.nframes = DDB_FREQ_BANDS;
- mutex_lock (wdl_mutex);
- for (wavedata_listener_t *l = spectrum_listeners; l; l = l->next) {
- l->callback (l->ctx, &data);
- }
- mutex_unlock (wdl_mutex);
- audio_data_fill = 0;
- }
- } while (remaining > 0);
- }
- }
-
- if (!output->has_volume) {
- int mult = 1-audio_is_mute ();
- char *stream = bytes;
- int bytesread = sz;
- if (output->fmt.bps == 16) {
- mult *= 1000;
- int16_t ivolume = volume_get_amp () * mult;
- for (int i = 0; i < bytesread/2; i++) {
- int16_t sample = *((int16_t*)stream);
- *((int16_t*)stream) = (int16_t)(((int32_t)sample) * ivolume / 1000);
- stream += 2;
- }
- }
- else if (output->fmt.bps == 8) {
- mult *= 255;
- int16_t ivolume = volume_get_amp () * mult;
- for (int i = 0; i < bytesread; i++) {
- *stream = (int8_t)(((int32_t)(*stream)) * ivolume / 1000);
- stream++;
- }
- }
- else if (output->fmt.bps == 24) {
- mult *= 1000;
- int16_t ivolume = volume_get_amp () * mult;
- for (int i = 0; i < bytesread/3; i++) {
- int32_t sample = ((unsigned char)stream0) | ((unsigned char)stream1<<8) | (stream2<<16);
- int32_t newsample = (int64_t)sample * ivolume / 1000;
- stream0 = (newsample&0x0000ff);
- stream1 = (newsample&0x00ff00)>>8;
- stream2 = (newsample&0xff0000)>>16;
- stream += 3;
- }
- }
- else if (output->fmt.bps == 32 && !output->fmt.is_float) {
- mult *= 1000;
- int16_t ivolume = volume_get_amp () * mult;
- for (int i = 0; i < bytesread/4; i++) {
- int32_t sample = *((int32_t*)stream);
- int32_t newsample = (int64_t)sample * ivolume / 1000;
- *((int32_t*)stream) = newsample;
- stream += 4;
- }
- }
- else if (output->fmt.bps == 32 && output->fmt.is_float) {
- float fvolume = volume_get_amp () * (1-audio_is_mute ());
- for (int i = 0; i < bytesread/4; i++) {
- *((float*)stream) = (*((float*)stream)) * fvolume;
- stream += 4;
- }
- }
- }
-
- return sz;
-}
-
-static int
-streamer_get_fill (void) {
- return streamer_ringbuf.remaining;
-}
-
-int
-streamer_ok_to_read (int len) {
- DB_output_t *output = plug_get_output ();
- if (formatchanged && bytes_until_next_song <= 0) {
- streamer_set_output_format ();
- formatchanged = 0;
- }
- if (len >= 0 && (bytes_until_next_song > 0 || streamer_ringbuf.remaining >= (len*2))) {
- return 1;
- }
- else {
- return 1-streamer_buffering;
- }
- return 0;
-}
-
-void
-streamer_configchanged (void) {
- replaygain_set (conf_get_int ("replaygain_mode", 0), conf_get_int ("replaygain_scale", 1), conf_get_float ("replaygain_preamp", 0), conf_get_float ("global_preamp", 0));
- pl_set_order (conf_get_int ("playback.order", 0));
- if (playing_track) {
- playing_track->played = 1;
- }
- int conf_autoconv_8_to_16 = conf_get_int ("streamer.8_to_16", 1);
- if (conf_autoconv_8_to_16 != autoconv_8_to_16) {
- autoconv_8_to_16 = conf_autoconv_8_to_16;
- formatchanged = 1;
- streamer_reset (1);
- }
- int conf_autoconv_16_to_24 = conf_get_int ("streamer.16_to_24",0);
- if (conf_autoconv_16_to_24 != autoconv_16_to_24) {
- autoconv_16_to_24 = conf_autoconv_16_to_24;
- formatchanged = 1;
- streamer_reset (1);
- }
-
- trace_bufferfill = conf_get_int ("streamer.trace_buffer_fill",0);
-
- stop_after_current = conf_get_int ("playlist.stop_after_current", 0);
- stop_after_album = conf_get_int ("playlist.stop_after_album", 0);
-
- char mapstr2048;
- deadbeef->conf_get_str ("network.ctmapping", DDB_DEFAULT_CTMAPPING, mapstr, sizeof (mapstr));
- if (strcmp (mapstr, conf_network_ctmapping)) {
- ctmap_init ();
- }
-}
-
-static void
-streamer_play_current_track_real (void) {
- playlist_t *plt = plt_get_curr ();
- DB_output_t *output = plug_get_output ();
- if (output->state () == OUTPUT_STATE_PAUSED && playing_track) {
- if (is_remote_stream (playing_track)) {
- streamer_reset (1);
- streamer_set_current (NULL);
- streamer_set_current (playing_track);
- if (fileinfo && memcmp (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t))) {
- memcpy (&output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- memcpy (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- streamer_set_output_format ();
- }
- }
- // unpause currently paused track
- output->unpause ();
- messagepump_push (DB_EV_PAUSED, 0, 0, 0);
- }
- else if (plt->current_rowPL_MAIN != -1) {
- // play currently selected track in current playlist
- output->stop ();
- // get next song in queue
- int idx = -1;
- playItem_t *next = pl_playqueue_getnext ();
- if (next) {
- idx = str_get_idx_of (next);
- pl_playqueue_pop ();
- pl_item_unref (next);
- }
- else {
- idx = plt->current_rowPL_MAIN;
- }
-
- streamer_set_nextsong_real (idx, 1);
- pl_lock ();
- if (streamer_playlist) {
- plt_unref (streamer_playlist);
- }
- streamer_playlist = plt;
- pl_unlock ();
- return;
- }
- else {
- output->stop ();
- streamer_move_to_nextsong (1);
- }
- if (plt) {
- plt_unref (plt);
- }
-}
-
-void
-streamer_play_current_track (void) {
- handler_push (handler, STR_EV_PLAY_CURR, 0, 0, 0);
-}
-
-struct DB_fileinfo_s *
-streamer_get_current_fileinfo (void) {
- return fileinfo;
-}
-
-static void
-streamer_set_current_playlist_real (int plt) {
- pl_lock ();
- if (streamer_playlist) {
- plt_unref (streamer_playlist);
- }
- streamer_playlist = plt_get_for_idx (plt);
- pl_unlock ();
-}
-
-void
-streamer_set_current_playlist (int plt) {
- handler_push (handler, STR_EV_SET_CURR_PLT, 0, plt, 0);
-}
-
-int
-streamer_get_current_playlist (void) {
- pl_lock ();
- if (!streamer_playlist) {
- streamer_playlist = plt_get_curr ();
- }
- int idx = plt_get_idx_of (streamer_playlist);
- pl_unlock ();
- return idx;
-}
-
-void
-streamer_notify_playlist_deleted (playlist_t *plt) {
- // this is only called from playlist code, no lock required
- if (plt == streamer_playlist) {
- plt_unref (streamer_playlist);
- streamer_playlist = NULL;
- }
-}
-
-ddb_dsp_context_t *
-streamer_get_dsp_chain (void) {
- return dsp_chain;
-}
-
-static ddb_dsp_context_t *
-dsp_clone (ddb_dsp_context_t *from) {
- ddb_dsp_context_t *dsp = from->plugin->open ();
- char param2000;
- if (from->plugin->num_params) {
- int n = from->plugin->num_params ();
- for (int i = 0; i < n; i++) {
- from->plugin->get_param (from, i, param, sizeof (param));
- dsp->plugin->set_param (dsp, i, param);
- }
- }
- dsp->enabled = from->enabled;
- return dsp;
-}
-
-void
-streamer_set_dsp_chain (ddb_dsp_context_t *chain) {
- mutex_lock (decodemutex);
- streamer_dsp_chain_free (dsp_chain);
-
- dsp_chain = NULL;
- eq = NULL;
-
- ddb_dsp_context_t *tail = NULL;
- while (chain) {
- ddb_dsp_context_t *new = dsp_clone (chain);
- if (tail) {
- tail->next = new;
- tail = new;
- }
- else {
- dsp_chain = tail = new;
- }
- chain = chain->next;
- }
-
- streamer_dsp_postinit ();
- if (fileinfo) {
- memcpy (&orig_output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- memcpy (&output_format, &fileinfo->fmt, sizeof (ddb_waveformat_t));
- formatchanged = 1;
- }
-
- streamer_dsp_chain_save();
- streamer_reset (1);
-
- mutex_unlock (decodemutex);
- DB_output_t *output = plug_get_output ();
- if (playing_track && output->state () != OUTPUT_STATE_STOPPED) {
- streamer_set_seek (playpos);
- }
- messagepump_push (DB_EV_DSPCHAINCHANGED, 0, 0, 0);
-}
-
-void
-streamer_get_output_format (ddb_waveformat_t *fmt) {
- memcpy (fmt, &output_format, sizeof (ddb_waveformat_t));
-}
-
-void
-streamer_notify_order_changed (int prev_order, int new_order) {
- if (prev_order != PLAYBACK_ORDER_SHUFFLE_ALBUMS && new_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS) {
- streamer_lock ();
- playItem_t *curr = playing_track;
- if (curr) {
-
- pl_lock ();
- const char *alb = pl_find_meta_raw (curr, "album");
- const char *art = pl_find_meta_raw (curr, "artist");
- playItem_t *next = curr->prevPL_MAIN;
- while (next) {
- if (alb == pl_find_meta_raw (next, "album") && art == pl_find_meta_raw (next, "artist")) {
- next->played = 1;
- next = next->prevPL_MAIN;
- }
- else {
- break;
- }
- }
- pl_unlock ();
- }
- streamer_unlock ();
- }
-}
-
-void
-vis_waveform_listen (void *ctx, void (*callback)(void *ctx, ddb_audio_data_t *data)) {
- mutex_lock (wdl_mutex);
- wavedata_listener_t *l = malloc (sizeof (wavedata_listener_t));
- memset (l, 0, sizeof (wavedata_listener_t));
- l->ctx = ctx;
- l->callback = callback;
- l->next = waveform_listeners;
- waveform_listeners = l;
- mutex_unlock (wdl_mutex);
-}
-
-void
-vis_waveform_unlisten (void *ctx) {
- mutex_lock (wdl_mutex);
- wavedata_listener_t *l, *prev = NULL;
- for (l = waveform_listeners; l; prev = l, l = l->next) {
- if (l->ctx == ctx) {
- if (prev) {
- prev->next = l->next;
- }
- else {
- waveform_listeners = l->next;
- }
- free (l);
- break;
- }
- }
- mutex_unlock (wdl_mutex);
-}
-
-void
-vis_spectrum_listen (void *ctx, void (*callback)(void *ctx, ddb_audio_data_t *data)) {
- mutex_lock (wdl_mutex);
- wavedata_listener_t *l = malloc (sizeof (wavedata_listener_t));
- memset (l, 0, sizeof (wavedata_listener_t));
- l->ctx = ctx;
- l->callback = callback;
- l->next = spectrum_listeners;
- spectrum_listeners = l;
- mutex_unlock (wdl_mutex);
-}
-
-void
-vis_spectrum_unlisten (void *ctx) {
- mutex_lock (wdl_mutex);
- wavedata_listener_t *l, *prev = NULL;
- for (l = spectrum_listeners; l; prev = l, l = l->next) {
- if (l->ctx == ctx) {
- if (prev) {
- prev->next = l->next;
- }
- else {
- spectrum_listeners = l->next;
- }
- free (l);
- break;
- }
- }
- mutex_unlock (wdl_mutex);
-}
-
-void
-streamer_set_streamer_playlist (playlist_t *plt) {
- if (streamer_playlist) {
- plt_unref (streamer_playlist);
- }
- streamer_playlist = plt;
- if (streamer_playlist) {
- plt_ref (streamer_playlist);
- }
-}
-
-struct handler_s *
-streamer_get_handler (void) {
- return handler;
-}

deadbeef-0.6.2.tar.bz2/streamer.h Deleted

@@ -1,172 +0,0 @@
-/*
-  This file is part of Deadbeef Player source code
-  http://deadbeef.sourceforge.net
-
-  streamer implementation
-
-  Copyright (C) 2009-2013 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
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __STREAMER_H
-#define __STREAMER_H
-
-#include "playlist.h"
-#include "deadbeef.h"
-
-// events to pass to streamer thread
-enum {
-    STR_EV_PLAY_TRACK_IDX, // p1 = idx, p2 = pstate; see streamer_set_nextsong semantics
-    STR_EV_PLAY_CURR, // will play the current streamer track (playing_track), see more details in streamer_play_current_track
-    STR_EV_NEXT, // streamer_move_to_nextsong
-    STR_EV_PREV, // streamer_move_to_prevsong
-    STR_EV_RAND, // streamer_move_to_randomsong
-    STR_EV_SEEK, // streamer_set_seek; p1: float pos
-    STR_EV_SET_CURR_PLT, // streamer_set_current_playlist
-};
-
-int
-streamer_init (void);
-
-void
-streamer_free (void);
-
-int
-streamer_read (char *bytes, int size);
-
-void
-streamer_reset (int full);
-
-void
-streamer_lock (void);
-
-void
-streamer_unlock (void);
-
-// pstate indicates what to do with playback
-// -1 means "don't do anything"
-// -2 means "end of playlist"
-// 0 stop
-// 1 switch to current (gui) playlist, play if not playing
-// 2 pause
-// 3 play if not playing, don't switch playlist
-// 4 same as 1, but stops playback before proceeding
-void
-streamer_set_nextsong (int song, int pstate);
-
-void
-streamer_set_seek (float pos);
-
-int
-streamer_ok_to_read (int len);
-
-float
-streamer_get_playpos (void);
-
-void
-streamer_song_removed_notify (playItem_t *it);
-
-playItem_t *
-streamer_get_streaming_track (void);
-
-playItem_t *
-streamer_get_playing_track (void);
-
-void
-streamer_configchanged (void);
-
-// if paused -- resume
-// else, if have cursor track -- stop current, play cursor
-// else, play next
-void
-streamer_play_current_track (void);
-
-void
-streamer_set_bitrate (int bitrate);
-
-int
-streamer_get_apx_bitrate (void);
-
-// returns -1 if theres no next song, or playlist finished
-// reason 0 means "prev song finished", 1 means "interrupt"
-int
-streamer_move_to_nextsong (int r);
-
-int
-streamer_move_to_prevsong (int r);
-
-int
-streamer_move_to_randomsong (int r);
-
-struct DB_fileinfo_s *
-streamer_get_current_fileinfo (void);
-
-void
-streamer_set_current_playlist (int plt);
-
-int
-streamer_get_current_playlist (void);
-
-// returns track index in current streamer playlist
-int
-str_get_idx_of (playItem_t *it);
-
-void
-streamer_notify_playlist_deleted (playlist_t *plt);
-
-struct ddb_dsp_context_s *
-streamer_get_dsp_chain (void);
-
-void
-streamer_set_dsp_chain (struct ddb_dsp_context_s *chain);
-
-void
-streamer_dsp_refresh (void);
-
-void
-streamer_get_output_format (ddb_waveformat_t *fmt);
-
-int
-streamer_dsp_chain_save (void);
-
-void
-streamer_notify_order_changed (int prev_order, int new_order);
-
-void
-audio_get_waveform_data (int type, float *data);
-
-void
-streamer_set_streamer_playlist (playlist_t *plt);
-
-struct handler_s *
-streamer_get_handler (void);
-
-void
-vis_waveform_listen (void *ctx, void (*callback)(void *ctx, ddb_audio_data_t *data));
-
-void
-vis_waveform_unlisten (void *ctx);
-
-void
-vis_spectrum_listen (void *ctx, void (*callback)(void *ctx, ddb_audio_data_t *data));
-
-void
-vis_spectrum_unlisten (void *ctx);
-
-#endif // __STREAMER_H

deadbeef-0.6.2.tar.bz2/threading.h Deleted

@@ -1,78 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- threading functions wrapper
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __THREADING_H
-#define __THREADING_H
-
-#include <stdint.h>
-
-intptr_t
-thread_start (void (*fn)(void *ctx), void *ctx);
-
-intptr_t
-thread_start_low_priority (void (*fn)(void *ctx), void *ctx);
-
-int
-thread_join (intptr_t tid);
-
-int
-thread_detach (intptr_t tid);
-
-void
-thread_exit (void *retval);
-
-uintptr_t
-mutex_create (void);
-
-uintptr_t
-mutex_create_nonrecursive (void);
-
-void
-mutex_free (uintptr_t mtx);
-
-int
-mutex_lock (uintptr_t mtx);
-
-int
-mutex_unlock (uintptr_t mtx);
-
-uintptr_t
-cond_create (void);
-
-void
-cond_free (uintptr_t cond);
-
-int
-cond_wait (uintptr_t cond, uintptr_t mutex);
-
-int
-cond_signal (uintptr_t cond);
-
-int
-cond_broadcast (uintptr_t cond);
-
-#endif
-

deadbeef-0.6.2.tar.bz2/threading_pthread.c Deleted

@@ -1,242 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- pthread wrapper
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include <stdio.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include "threading.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-intptr_t
-thread_start (void (*fn)(void *ctx), void *ctx) {
- pthread_t tid;
- pthread_attr_t attr;
- int s = pthread_attr_init (&attr);
- if (s != 0) {
- fprintf (stderr, "pthread_attr_init failed: %s\n", strerror (s));
- return 0;
- }
-
- s = pthread_create (&tid, &attr, (void *(*)(void *))fn, (void*)ctx);
- if (s != 0) {
- fprintf (stderr, "pthread_create failed: %s\n", strerror (s));
- return 0;
- }
- s = pthread_attr_destroy (&attr);
- if (s != 0) {
- fprintf (stderr, "pthread_attr_destroy failed: %s\n", strerror (s));
- return 0;
- }
- return tid;
-}
-
-intptr_t
-thread_start_low_priority (void (*fn)(void *ctx), void *ctx) {
-#ifdef __linux__
- pthread_t tid;
- pthread_attr_t attr;
- int s = pthread_attr_init (&attr);
- if (s != 0) {
- fprintf (stderr, "pthread_attr_init failed: %s\n", strerror (s));
- return 0;
- }
-#if !STATICLINK && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 4
- int policy;
- s = pthread_attr_getschedpolicy (&attr, &policy);
- if (s != 0) {
- fprintf (stderr, "pthread_attr_getschedpolicy failed: %s\n", strerror (s));
- return 0;
- }
- int minprio = sched_get_priority_min (policy);
-#endif
-
- s = pthread_create (&tid, &attr, (void *(*)(void *))fn, (void*)ctx);
- if (s != 0) {
- fprintf (stderr, "pthread_create failed: %s\n", strerror (s));
- return 0;
- }
-#if !STATICLINK && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 4
- s = pthread_setschedprio (tid, minprio);
- if (s != 0) {
- fprintf (stderr, "pthread_setschedprio failed: %s\n", strerror (s));
- pthread_cancel (tid);
- return 0;
- }
-#endif
-
- s = pthread_attr_destroy (&attr);
- if (s != 0) {
- fprintf (stderr, "pthread_attr_destroy failed: %s\n", strerror (s));
- pthread_cancel (tid);
- return 0;
- }
- return tid;
-#else
- return thread_start (fn, ctx);
-#endif
-}
-
-int
-thread_join (intptr_t tid) {
- void *retval;
- int s = pthread_join ((pthread_t)tid, &retval);
- if (s) {
- fprintf (stderr, "pthread_join failed: %s\n", strerror (s));
- return -1;
- }
- return 0;
-}
-
-int
-thread_detach (intptr_t tid) {
- int s = pthread_detach ((pthread_t)tid);
- if (s) {
- fprintf (stderr, "pthread_detach failed: %s\n", strerror (s));
- return -1;
- }
- return 0;
-}
-
-void
-thread_exit (void *retval) {
- pthread_exit (retval);
-}
-
-uintptr_t
-mutex_create_nonrecursive (void) {
- pthread_mutex_t *mtx = malloc (sizeof (pthread_mutex_t));
- pthread_mutexattr_t attr = {0};
- pthread_mutexattr_init (&attr);
- pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_NORMAL);
- int err = pthread_mutex_init (mtx, &attr);
- if (err != 0) {
- fprintf (stderr, "pthread_mutex_init failed: %s\n", strerror (err));
- return 0;
- }
- pthread_mutexattr_destroy (&attr);
- return (uintptr_t)mtx;
-}
-
-uintptr_t
-mutex_create (void) {
- pthread_mutex_t *mtx = malloc (sizeof (pthread_mutex_t));
- pthread_mutexattr_t attr = {0};
- pthread_mutexattr_init (&attr);
- pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
- int err = pthread_mutex_init (mtx, &attr);
- if (err != 0) {
- fprintf (stderr, "pthread_mutex_init failed: %s\n", strerror (err));
- return 0;
- }
- pthread_mutexattr_destroy (&attr);
- return (uintptr_t)mtx;
-}
-
-void
-mutex_free (uintptr_t _mtx) {
- pthread_mutex_t *mtx = (pthread_mutex_t *)_mtx;
- pthread_mutex_destroy (mtx);
- free (mtx);
-}
-
-int
-mutex_lock (uintptr_t _mtx) {
- pthread_mutex_t *mtx = (pthread_mutex_t *)_mtx;
- int err = pthread_mutex_lock (mtx);
- if (err != 0) {
- fprintf (stderr, "pthread_mutex_lock failed: %s\n", strerror (err));
- }
- return err;
-}
-
-int
-mutex_unlock (uintptr_t _mtx) {
- pthread_mutex_t *mtx = (pthread_mutex_t *)_mtx;
- int err = pthread_mutex_unlock (mtx);
- if (err != 0) {
- fprintf (stderr, "pthread_mutex_unlock failed: %s\n", strerror (err));
- }
- return err;
-}
-
-uintptr_t
-cond_create (void) {
- pthread_cond_t *cond = malloc (sizeof (pthread_cond_t));
- int err = pthread_cond_init (cond, NULL);
- if (err != 0) {
- fprintf (stderr, "pthread_cond_init failed: %s\n", strerror (err));
- return 0;
- }
- return (uintptr_t)cond;
-}
-
-void
-cond_free (uintptr_t c) {
- if (c) {
- pthread_cond_t *cond = (pthread_cond_t *)c;
- pthread_cond_destroy (cond);
- free (cond);
- }
-}
-
-int
-cond_wait (uintptr_t c, uintptr_t m) {
- pthread_cond_t *cond = (pthread_cond_t *)c;
- pthread_mutex_t *mutex = (pthread_mutex_t *)m;
- int err = mutex_lock (m);
- if (err != 0) {
- return err;
- }
- err = pthread_cond_wait (cond, mutex);
- if (err != 0) {
- fprintf (stderr, "pthread_cond_wait failed: %s\n", strerror (err));
- }
- return err;
-}
-
-int
-cond_signal (uintptr_t c) {
- pthread_cond_t *cond = (pthread_cond_t *)c;
- int err = pthread_cond_signal (cond);
- if (err != 0) {
- fprintf (stderr, "pthread_cond_signal failed: %s\n", strerror (err));
- }
- return err;
-}
-
-int
-cond_broadcast (uintptr_t c) {
- pthread_cond_t *cond = (pthread_cond_t *)c;
- int err = pthread_cond_broadcast (cond);
- if (err != 0) {
- fprintf (stderr, "pthread_cond_broadcast failed: %s\n", strerror (err));
- }
- return err;
-}

deadbeef-0.6.2.tar.bz2/translation/help.pt_BR.txt Deleted

@@ -1,56 +0,0 @@
-arquivo de ajuda para o tocador DeaDBeeF
-
-* LINKS
-
- website: http://deadbeef.sf.net
- wiki: http://github.com/Alexey-Yakovenko/deadbeef/wiki
- website de desenvolvimento: http://github.com/Alexey-Yakovenko/deadbeef
- info para contribuintes: http://contributing.appspot.com/deadbeef
-
-* ATALHOS DE TECLADO ÚTEIS
-
- você pode navegar pela lista de reprodução com as setas.
-
- PgUp, PgDn, Home, End também funcionam.
-
- use as teclas acima + Shift para selecionar múltiplas faixas.
-
- o controle de reprodução é ao estilo do Winamp™.
- as teclas Z, X, C, V, B e N estão mapeadas para as seguintes ações:
- anterior, reproduzir, pausar, parar, próxima e aleatória.
-
- note também as dicas de atalho nos menus.
-
- (ainda?) não é possível remapear as teclas.
-
-* CONFIGURAÇÃO
-
- desde a versão 0.3.0, toda a configuração é armazenada em um único arquivo:
- $HOME/.config/deadbeef/config
-
- é preciso fechar o tocador antes de editar esse arquivo ou suas mudanças serão sobrescritas.
-
- muita coisa pode ser configurada pelo menu Editar -> Preferências.
-
-* EXIBIÇÃO DA CAPA DO ÁLBUM
-
- para exibir a capa do álbum é preciso seguir os passos abaixo
-
- 1. adicionar uma nova coluna, selecionar tipo "Capa do álbum"
- 2. clicar com o botão direito no cabeçalho das colunas da lista de reprodução, no menu de contexto selecionar o submenu "Agrupar por" e escolher "Artista/Data/Álbum".
-
-* NOTIFICAÇÕES OSD
-
- você pode habilitá-las/configurá-las pelas opções do plugin "OSD Notify"
-
-* CUE
-
- para carregar cópias de imagem + cue, é preciso abrir/adicionar arquivos de imagem e o Deadbeef encontrará o arquivo .cue correto automaticamente.
-
- você não deve tentar adicionar arquivos .cue à lista de reprodução
-
- exemplo:
-
- Artista Desconhecido - Álbum Desconhecido.flac <---- abrir este arquivo
- Artista Desconhecido - Álbum Desconhecido.cue <---- este arquivo será usado automaticamente
-

deadbeef-0.6.2.tar.bz2/translation/help.ru.txt Deleted

@@ -1,53 +0,0 @@
-Файл справки для плеера DeaDBeeF
-
-* ССЫЛКИ
-
- официальный сайт: http://deadbeef.sf.net
- wiki: http://github.com/Alexey-Yakovenko/deadbeef/wiki
- ресурсы для разработчиков: http://github.com/Alexey-Yakovenko/deadbeef
- информация для спонсоров: http://contributing.appspot.com/deadbeef
-
-* ПОЛЕЗНЫЕ СОЧЕТАНИЯ КЛАВИШ
-
- вы можете перемещаться по списку воспроизведения используя курсорные клавиши, а также клавиши PgUp, PgDn, Home и End.
-
- для выделения нескольких дорожек используются вышеперечисленные клавиши совметно с клавишей Shift.
-
- управление воспроизведением выполнено в стиле плеера Winamp™.
- Клавиши Z, X, C, V, B, N используются для следующих действий:
- переход на предыдущую дорожку, воспроизведение, пауза, остановка, переход на следующую дорожку, воспроизведение в случайном порядке.
-
- дополнительные комбинации клавиш вы сможете найти в меню плеера.
-
- возможность переназначения клавиш всё ещё не доступна.
-
-* НАСТРОЙКА
-
- начиная с версии 0.3.0 все настройки хранятся в отдельном файле:
- $HOME/.config/deadbeef/config
-
- перед редактированием файла конфигурации необходимо завершить работу с плеером, иначе настройки будут перезаписаны.
-
- большинство настроек могут быть изменены через диалоговое окно (Правка -> Параметры).
-
-* ОБЛОЖКИ АЛЬБОМОВ
-
- для отображения обложек альбомов необходимо выполнить следующие шаги:
-
- 1. Добавить новый столбец, затем выбрать тип "Обложка альбома"
- 2. Нажать правой кнопкой мыши на столбце списка воспроизведения, и выбрать пункт контекстного меню "Группировать по" -> "Исполнитель/Дата/Альбом".
-
-* ЭКРАННЫЕ УВЕДОМЛЕНИЯ
-
- вы можете включить и настроить уведомления в настройках расширения "OSD Notify" (Экранные уведомления).
-
-* МЕТАДАННЫЕ
-
- для загрузки рипов образ+cue необходимо открыть/добавить существующие файлы образа, и DeadBeef автоматически найдет корректный файл метаданных (.cue).
-
- вы не должны самостоятельно добавлять файлы метаданных (.cue) в список воспроизведения.
-
- пример:
-
- Неизвестный Исполнитель - Неизвестный Альбом.flac <---- откройте этот файл
- Неизвестный Исполнитель - Неизвестный Альбом.cue <---- этот файл будет использоваться автоматически

deadbeef-0.6.2.tar.bz2/u8_lc_map.h Deleted

@@ -1,2709 +0,0 @@
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -c -t -H u8_lc_hash -N u8_lc_in_word_set u8_lc_map.txt */
-/* Computed positions: -k'1-2,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
- && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
- && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
- && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
- && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
- && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
- && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
- && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
- && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
- && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
- && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
- && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
- && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
- && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
- && ('Z' == 90) && ('' == 91) && ('\\' == 92) && ('' == 93) \
- && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
- && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
- && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
- && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
- && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
- && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
- && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
- && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646. */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 1 "u8_lc_map.txt"
-struct u8_case_map_t {
- const char *name;
- const char *lower;
-};
-
-#define TOTAL_KEYWORDS 1007
-#define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 4
-#define MIN_HASH_VALUE 1
-#define MAX_HASH_VALUE 2519
-/* maximum key range = 2519, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-u8_lc_hash (str, len)
- register const char *str;
- register unsigned int len;
-{
- static unsigned short asso_values =
- {
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 135, 130, 125, 120, 115,
- 110, 105, 100, 95, 90, 85, 80, 75, 70, 65,
- 60, 55, 50, 45, 40, 35, 30, 25, 20, 15,
- 0, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 973, 70,
- 3, 662, 532, 480, 232, 540, 137, 920, 155, 785,
- 215, 421, 405, 275, 42, 420, 20, 665, 2, 475,
- 512, 765, 201, 860, 135, 720, 195, 961, 370, 882,
- 676, 991, 310, 825, 6, 858, 136, 876, 835, 85,
- 75, 362, 40, 10, 345, 1015, 741, 770, 901, 50,
- 406, 500, 976, 511, 900, 742, 645, 257, 81, 457,
- 975, 775, 191, 796, 25, 15, 170, 425, 620, 750,
- 5, 0, 565, 460, 875, 867, 105, 550, 405, 580,
- 155, 320, 765, 660, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 0, 390, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 5, 2520, 2520, 2520, 2520, 340,
- 30, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
- 2520, 2520
- };
- register int hval = len;
-
- switch (hval)
- {
- default:
- hval += asso_values(unsigned char)str1+16;
- /*FALLTHROUGH*/
- case 1:
- hval += asso_values(unsigned char)str0;
- break;
- }
- return hval + asso_values(unsigned char)strlen - 1;
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-struct u8_case_map_t *
-u8_lc_in_word_set (str, len)
- register const char *str;
- register unsigned int len;
-{
- static struct u8_case_map_t wordlist =
- {
- {""},
-#line 31 "u8_lc_map.txt"
- {"Z", "z"},
- {""}, {""}, {""},
-#line 539 "u8_lc_map.txt"
- {"\341\271\224", "ṕ"},
-#line 530 "u8_lc_map.txt"
- {"\341\271\202", "ṃ"},
- {""}, {""},
-#line 547 "u8_lc_map.txt"
- {"\341\271\244", "ṥ"},
-#line 507 "u8_lc_map.txt"
- {"\341\270\224", "ḕ"},
-#line 498 "u8_lc_map.txt"
- {"\341\270\202", "ḃ"},
- {""}, {""},
-#line 515 "u8_lc_map.txt"
- {"\341\270\244", "ḥ"},
-#line 194 "u8_lc_map.txt"
- {"\310\224", "ȕ"},
- {""}, {""}, {""}, {""},
-#line 917 "u8_lc_map.txt"
- {"\352\235\224", "ꝕ"},
-#line 908 "u8_lc_map.txt"
- {"\352\235\202", "ꝃ"},
- {""},
-#line 538 "u8_lc_map.txt"
- {"\341\271\222", "ṓ"},
-#line 925 "u8_lc_map.txt"
- {"\352\235\244", "ꝥ"},
-#line 52 "u8_lc_map.txt"
- {"\303\224", "ô"},
- {""}, {""},
-#line 506 "u8_lc_map.txt"
- {"\341\270\222", "ḓ"},
-#line 463 "u8_lc_map.txt"
- {"\341\202\244", "ⴄ"},
-#line 185 "u8_lc_map.txt"
- {"\310\202", "ȃ"},
-#line 30 "u8_lc_map.txt"
- {"Y", "y"},
- {""},
-#line 472 "u8_lc_map.txt"
- {"\341\202\255", "ⴍ"},
- {""}, {""}, {""}, {""},
-#line 916 "u8_lc_map.txt"
- {"\352\235\222", "ꝓ"},
- {""},
-#line 34 "u8_lc_map.txt"
- {"\303\202", "â"},
-#line 29 "u8_lc_map.txt"
- {"X", "x"},
- {""},
-#line 551 "u8_lc_map.txt"
- {"\341\271\254", "ṭ"},
- {""},
-#line 537 "u8_lc_map.txt"
- {"\341\271\220", "ṑ"},
- {""}, {""},
-#line 519 "u8_lc_map.txt"
- {"\341\270\254", "ḭ"},
- {""},
-#line 505 "u8_lc_map.txt"
- {"\341\270\220", "ḑ"},
-#line 28 "u8_lc_map.txt"
- {"W", "w"},
- {""}, {""},
-#line 894 "u8_lc_map.txt"
- {"\352\234\244", "ꜥ"},
- {""}, {""}, {""},
-#line 929 "u8_lc_map.txt"
- {"\352\235\254", "ꝭ"},
- {""},
-#line 915 "u8_lc_map.txt"
- {"\352\235\220", "ꝑ"},
-#line 27 "u8_lc_map.txt"
- {"V", "v"},
- {""},
-#line 471 "u8_lc_map.txt"
- {"\341\202\254", "ⴌ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 26 "u8_lc_map.txt"
- {"U", "u"},
- {""},
-#line 478 "u8_lc_map.txt"
- {"\341\202\263", "ⴓ"},
- {""}, {""}, {""}, {""},
-#line 550 "u8_lc_map.txt"
- {"\341\271\252", "ṫ"},
- {""}, {""},
-#line 25 "u8_lc_map.txt"
- {"T", "t"},
- {""},
-#line 518 "u8_lc_map.txt"
- {"\341\270\252", "ḫ"},
-#line 559 "u8_lc_map.txt"
- {"\341\271\274", "ṽ"},
-#line 891 "u8_lc_map.txt"
- {"\352\232\224", "ꚕ"},
-#line 882 "u8_lc_map.txt"
- {"\352\232\202", "ꚃ"},
- {""},
-#line 898 "u8_lc_map.txt"
- {"\352\234\254", "ꜭ"},
-#line 527 "u8_lc_map.txt"
- {"\341\270\274", "ḽ"},
- {""},
-#line 24 "u8_lc_map.txt"
- {"S", "s"},
- {""},
-#line 928 "u8_lc_map.txt"
- {"\352\235\252", "ꝫ"},
- {""},
-#line 868 "u8_lc_map.txt"
- {"\352\231\224", "ꙕ"},
-#line 859 "u8_lc_map.txt"
- {"\352\231\202", "ꙃ"},
- {""},
-#line 469 "u8_lc_map.txt"
- {"\341\202\252", "ⴊ"},
-#line 876 "u8_lc_map.txt"
- {"\352\231\244", "ꙥ"},
- {""},
-#line 23 "u8_lc_map.txt"
- {"R", "r"},
- {""},
-#line 890 "u8_lc_map.txt"
- {"\352\232\222", "ꚓ"},
-#line 487 "u8_lc_map.txt"
- {"\341\202\274", "ⴜ"},
- {""}, {""}, {""},
-#line 468 "u8_lc_map.txt"
- {"\341\202\251", "ⴉ"},
- {""}, {""},
-#line 22 "u8_lc_map.txt"
- {"Q", "q"},
- {""},
-#line 867 "u8_lc_map.txt"
- {"\352\231\222", "ꙓ"},
- {""},
-#line 236 "u8_lc_map.txt"
- {"\316\224", "δ"},
- {""}, {""},
-#line 690 "u8_lc_map.txt"
- {"\341\276\255", "ᾥ"},
- {""}, {""},
-#line 21 "u8_lc_map.txt"
- {"P", "p"},
- {""},
-#line 897 "u8_lc_map.txt"
- {"\352\234\252", "ꜫ"},
- {""},
-#line 889 "u8_lc_map.txt"
- {"\352\232\220", "ꚑ"},
- {""}, {""},
-#line 206 "u8_lc_map.txt"
- {"\310\254", "ȭ"},
-#line 905 "u8_lc_map.txt"
- {"\352\234\274", "ꜽ"},
- {""},
-#line 20 "u8_lc_map.txt"
- {"O", "o"},
- {""},
-#line 880 "u8_lc_map.txt"
- {"\352\231\254", "ꙭ"},
- {""},
-#line 866 "u8_lc_map.txt"
- {"\352\231\220", "ꙑ"},
- {""}, {""},
-#line 542 "u8_lc_map.txt"
- {"\341\271\232", "ṛ"},
-#line 548 "u8_lc_map.txt"
- {"\341\271\246", "ṧ"},
-#line 533 "u8_lc_map.txt"
- {"\341\271\210", "ṉ"},
-#line 19 "u8_lc_map.txt"
- {"N", "n"},
- {""},
-#line 510 "u8_lc_map.txt"
- {"\341\270\232", "ḛ"},
-#line 516 "u8_lc_map.txt"
- {"\341\270\246", "ḧ"},
-#line 501 "u8_lc_map.txt"
- {"\341\270\210", "ḉ"},
- {""}, {""},
-#line 689 "u8_lc_map.txt"
- {"\341\276\254", "ᾤ"},
- {""}, {""},
-#line 18 "u8_lc_map.txt"
- {"M", "m"},
- {""},
-#line 920 "u8_lc_map.txt"
- {"\352\235\232", "ꝛ"},
-#line 926 "u8_lc_map.txt"
- {"\352\235\246", "ꝧ"},
-#line 911 "u8_lc_map.txt"
- {"\352\235\210", "ꝉ"},
- {""}, {""},
-#line 534 "u8_lc_map.txt"
- {"\341\271\212", "ṋ"},
-#line 465 "u8_lc_map.txt"
- {"\341\202\246", "ⴆ"},
- {""},
-#line 17 "u8_lc_map.txt"
- {"L", "l"},
- {""},
-#line 502 "u8_lc_map.txt"
- {"\341\270\212", "ḋ"},
- {""},
-#line 348 "u8_lc_map.txt"
- {"\322\224", "ҕ"},
- {""}, {""},
-#line 879 "u8_lc_map.txt"
- {"\352\231\252", "ꙫ"},
- {""}, {""},
-#line 16 "u8_lc_map.txt"
- {"K", "k"},
- {""},
-#line 912 "u8_lc_map.txt"
- {"\352\235\212", "ꝋ"},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 72 "u8_lc_map.txt"
- {"\304\224", "ĕ"},
-#line 15 "u8_lc_map.txt"
- {"J", "j"},
- {""},
-#line 687 "u8_lc_map.txt"
- {"\341\276\252", "ᾢ"},
-#line 895 "u8_lc_map.txt"
- {"\352\234\246", "ꜧ"},
- {""}, {""}, {""}, {""},
-#line 697 "u8_lc_map.txt"
- {"\341\276\274", "ᾳ"},
- {""},
-#line 14 "u8_lc_map.txt"
- {"I", "i"},
- {""},
-#line 686 "u8_lc_map.txt"
- {"\341\276\251", "ᾡ"},
- {""},
-#line 63 "u8_lc_map.txt"
- {"\304\202", "ă"},
- {""}, {""},
-#line 543 "u8_lc_map.txt"
- {"\341\271\234", "ṝ"},
- {""}, {""},
-#line 13 "u8_lc_map.txt"
- {"H", "h"},
- {""},
-#line 511 "u8_lc_map.txt"
- {"\341\270\234", "ḝ"},
-#line 541 "u8_lc_map.txt"
- {"\341\271\230", "ṙ"},
- {""}, {""}, {""}, {""},
-#line 509 "u8_lc_map.txt"
- {"\341\270\230", "ḙ"},
- {""},
-#line 12 "u8_lc_map.txt"
- {"G", "g"},
- {""},
-#line 921 "u8_lc_map.txt"
- {"\352\235\234", "ꝝ"},
- {""}, {""}, {""},
-#line 197 "u8_lc_map.txt"
- {"\310\232", "ț"},
-#line 535 "u8_lc_map.txt"
- {"\341\271\214", "ṍ"},
-#line 919 "u8_lc_map.txt"
- {"\352\235\230", "ꝙ"},
-#line 885 "u8_lc_map.txt"
- {"\352\232\210", "ꚉ"},
-#line 11 "u8_lc_map.txt"
- {"F", "f"},
- {""},
-#line 503 "u8_lc_map.txt"
- {"\341\270\214", "ḍ"},
- {""}, {""}, {""},
-#line 57 "u8_lc_map.txt"
- {"\303\232", "ú"},
-#line 871 "u8_lc_map.txt"
- {"\352\231\232", "ꙛ"},
-#line 877 "u8_lc_map.txt"
- {"\352\231\246", "ꙧ"},
-#line 862 "u8_lc_map.txt"
- {"\352\231\210", "ꙉ"},
-#line 10 "u8_lc_map.txt"
- {"E", "e"},
- {""},
-#line 913 "u8_lc_map.txt"
- {"\352\235\214", "ꝍ"},
- {""},
-#line 532 "u8_lc_map.txt"
- {"\341\271\206", "ṇ"},
- {""}, {""},
-#line 886 "u8_lc_map.txt"
- {"\352\232\212", "ꚋ"},
- {""},
-#line 500 "u8_lc_map.txt"
- {"\341\270\206", "ḇ"},
-#line 9 "u8_lc_map.txt"
- {"D", "d"},
-#line 198 "u8_lc_map.txt"
- {"\310\234", "ȝ"},
-#line 679 "u8_lc_map.txt"
- {"\341\276\232", "ᾒ"},
- {""},
-#line 669 "u8_lc_map.txt"
- {"\341\276\210", "ᾀ"},
- {""}, {""},
-#line 863 "u8_lc_map.txt"
- {"\352\231\212", "ꙋ"},
- {""},
-#line 910 "u8_lc_map.txt"
- {"\352\235\206", "ꝇ"},
-#line 8 "u8_lc_map.txt"
- {"C", "c"},
-#line 59 "u8_lc_map.txt"
- {"\303\234", "ü"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 7 "u8_lc_map.txt"
- {"B", "b"},
- {""},
-#line 671 "u8_lc_map.txt"
- {"\341\276\212", "ᾂ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 6 "u8_lc_map.txt"
- {"A", "a"},
- {""}, {""}, {""},
-#line 932 "u8_lc_map.txt"
- {"\352\235\273", "ꝼ"},
- {""}, {""},
-#line 360 "u8_lc_map.txt"
- {"\322\254", "ҭ"},
- {""},
-#line 486 "u8_lc_map.txt"
- {"\341\202\273", "ⴛ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 872 "u8_lc_map.txt"
- {"\352\231\234", "ꙝ"},
- {""}, {""}, {""},
-#line 220 "u8_lc_map.txt"
- {"\311\212", "ɋ"},
-#line 84 "u8_lc_map.txt"
- {"\304\254", "ĭ"},
-#line 870 "u8_lc_map.txt"
- {"\352\231\230", "ꙙ"},
- {""}, {""},
-#line 189 "u8_lc_map.txt"
- {"\310\212", "ȋ"},
-#line 887 "u8_lc_map.txt"
- {"\352\232\214", "ꚍ"},
- {""}, {""}, {""}, {""},
-#line 681 "u8_lc_map.txt"
- {"\341\276\234", "ᾔ"},
- {""}, {""}, {""},
-#line 42 "u8_lc_map.txt"
- {"\303\212", "ê"},
-#line 864 "u8_lc_map.txt"
- {"\352\231\214", "ꙍ"},
-#line 677 "u8_lc_map.txt"
- {"\341\276\230", "ᾐ"},
- {""}, {""}, {""},
-#line 546 "u8_lc_map.txt"
- {"\341\271\242", "ṣ"},
- {""},
-#line 884 "u8_lc_map.txt"
- {"\352\232\206", "ꚇ"},
- {""},
-#line 242 "u8_lc_map.txt"
- {"\316\232", "κ"},
-#line 514 "u8_lc_map.txt"
- {"\341\270\242", "ḣ"},
- {""}, {""}, {""}, {""},
-#line 673 "u8_lc_map.txt"
- {"\341\276\214", "ᾄ"},
- {""},
-#line 861 "u8_lc_map.txt"
- {"\352\231\206", "ꙇ"},
- {""}, {""},
-#line 924 "u8_lc_map.txt"
- {"\352\235\242", "ꝣ"},
- {""},
-#line 379 "u8_lc_map.txt"
- {"\323\224", "ӕ"},
- {""}, {""},
-#line 461 "u8_lc_map.txt"
- {"\341\202\242", "ⴂ"},
- {""}, {""}, {""},
-#line 193 "u8_lc_map.txt"
- {"\310\222", "ȓ"},
- {""}, {""},
-#line 219 "u8_lc_map.txt"
- {"\311\210", "ɉ"},
- {""},
-#line 244 "u8_lc_map.txt"
- {"\316\234", "μ"},
- {""}, {""},
-#line 188 "u8_lc_map.txt"
- {"\310\210", "ȉ"},
- {""},
-#line 50 "u8_lc_map.txt"
- {"\303\222", "ò"},
-#line 552 "u8_lc_map.txt"
- {"\341\271\256", "ṯ"},
- {""}, {""}, {""}, {""},
-#line 520 "u8_lc_map.txt"
- {"\341\270\256", "ḯ"},
- {""},
-#line 40 "u8_lc_map.txt"
- {"\303\210", "è"},
-#line 936 "u8_lc_map.txt"
- {"\352\236\202", "ꞃ"},
- {""},
-#line 893 "u8_lc_map.txt"
- {"\352\234\242", "ꜣ"},
-#line 944 "u8_lc_map.txt"
- {"\352\236\244", "ꞥ"},
- {""}, {""}, {""},
-#line 930 "u8_lc_map.txt"
- {"\352\235\256", "ꝯ"},
- {""},
-#line 696 "u8_lc_map.txt"
- {"\341\276\273", "ά"},
- {""},
-#line 351 "u8_lc_map.txt"
- {"\322\232", "қ"},
-#line 473 "u8_lc_map.txt"
- {"\341\202\256", "ⴎ"},
- {""}, {""}, {""}, {""},
-#line 544 "u8_lc_map.txt"
- {"\341\271\236", "ṟ"},
- {""}, {""}, {""}, {""},
-#line 512 "u8_lc_map.txt"
- {"\341\270\236", "ḟ"},
- {""}, {""}, {""},
-#line 75 "u8_lc_map.txt"
- {"\304\232", "ě"},
-#line 676 "u8_lc_map.txt"
- {"\341\276\217", "ᾇ"},
- {""},
-#line 470 "u8_lc_map.txt"
- {"\341\202\253", "ⴋ"},
- {""}, {""},
-#line 922 "u8_lc_map.txt"
- {"\352\235\236", "ꝟ"},
- {""}, {""}, {""},
-#line 352 "u8_lc_map.txt"
- {"\322\234", "ҝ"},
-#line 899 "u8_lc_map.txt"
- {"\352\234\256", "ꜯ"},
- {""},
-#line 941 "u8_lc_map.txt"
- {"\352\236\220", "ꞑ"},
- {""},
-#line 229 "u8_lc_map.txt"
- {"\316\212", "ί"},
- {""}, {""}, {""}, {""}, {""},
-#line 875 "u8_lc_map.txt"
- {"\352\231\242", "ꙣ"},
- {""}, {""}, {""},
-#line 76 "u8_lc_map.txt"
- {"\304\234", "ĝ"},
-#line 536 "u8_lc_map.txt"
- {"\341\271\216", "ṏ"},
-#line 555 "u8_lc_map.txt"
- {"\341\271\264", "ṵ"},
-#line 848 "u8_lc_map.txt"
- {"\342\263\224", "ⳕ"},
-#line 839 "u8_lc_map.txt"
- {"\342\263\202", "ⳃ"},
-#line 221 "u8_lc_map.txt"
- {"\311\214", "ɍ"},
-#line 504 "u8_lc_map.txt"
- {"\341\270\216", "ḏ"},
-#line 523 "u8_lc_map.txt"
- {"\341\270\264", "ḵ"},
-#line 298 "u8_lc_map.txt"
- {"\320\224", "д"},
- {""},
-#line 190 "u8_lc_map.txt"
- {"\310\214", "ȍ"},
-#line 857 "u8_lc_map.txt"
- {"\342\263\255", "ⳮ"},
-#line 202 "u8_lc_map.txt"
- {"\310\244", "ȥ"},
-#line 816 "u8_lc_map.txt"
- {"\342\262\224", "ⲕ"},
-#line 807 "u8_lc_map.txt"
- {"\342\262\202", "ⲃ"},
- {""},
-#line 914 "u8_lc_map.txt"
- {"\352\235\216", "ꝏ"},
-#line 824 "u8_lc_map.txt"
- {"\342\262\244", "ⲥ"},
- {""}, {""},
-#line 44 "u8_lc_map.txt"
- {"\303\214", "ì"},
-#line 847 "u8_lc_map.txt"
- {"\342\263\222", "ⳓ"},
-#line 479 "u8_lc_map.txt"
- {"\341\202\264", "ⴔ"},
-#line 280 "u8_lc_map.txt"
- {"\320\202", "ђ"},
- {""}, {""}, {""}, {""},
-#line 103 "u8_lc_map.txt"
- {"\305\224", "ŕ"},
- {""},
-#line 234 "u8_lc_map.txt"
- {"\316\222", "β"},
-#line 815 "u8_lc_map.txt"
- {"\342\262\222", "ⲓ"},
- {""}, {""}, {""}, {""},
-#line 391 "u8_lc_map.txt"
- {"\323\254", "ӭ"},
- {""},
-#line 227 "u8_lc_map.txt"
- {"\316\210", "έ"},
- {""},
-#line 343 "u8_lc_map.txt"
- {"\322\212", "ҋ"},
- {""}, {""},
-#line 846 "u8_lc_map.txt"
- {"\342\263\220", "ⳑ"},
- {""}, {""},
-#line 691 "u8_lc_map.txt"
- {"\341\276\256", "ᾦ"},
-#line 901 "u8_lc_map.txt"
- {"\352\234\264", "ꜵ"},
- {""}, {""}, {""},
-#line 828 "u8_lc_map.txt"
- {"\342\262\254", "ⲭ"},
- {""},
-#line 814 "u8_lc_map.txt"
- {"\342\262\220", "ⲑ"},
- {""},
-#line 67 "u8_lc_map.txt"
- {"\304\212", "ċ"},
-#line 873 "u8_lc_map.txt"
- {"\352\231\236", "ꙟ"},
- {""},
-#line 599 "u8_lc_map.txt"
- {"\341\273\224", "ổ"},
-#line 590 "u8_lc_map.txt"
- {"\341\273\202", "ể"},
- {""}, {""},
-#line 607 "u8_lc_map.txt"
- {"\341\273\244", "ụ"},
-#line 688 "u8_lc_map.txt"
- {"\341\276\253", "ᾣ"},
- {""}, {""}, {""}, {""},
-#line 933 "u8_lc_map.txt"
- {"\352\235\275", "ᵹ"},
- {""}, {""},
-#line 683 "u8_lc_map.txt"
- {"\341\276\236", "ᾖ"},
- {""},
-#line 488 "u8_lc_map.txt"
- {"\341\202\275", "ⴝ"},
- {""}, {""},
-#line 598 "u8_lc_map.txt"
- {"\341\273\222", "ồ"},
- {""}, {""}, {""},
-#line 347 "u8_lc_map.txt"
- {"\322\222", "ғ"},
-#line 888 "u8_lc_map.txt"
- {"\352\232\216", "ꚏ"},
-#line 945 "u8_lc_map.txt"
- {"\352\236\246", "ꞧ"},
- {""}, {""},
-#line 214 "u8_lc_map.txt"
- {"\311\201", "ɂ"},
-#line 827 "u8_lc_map.txt"
- {"\342\262\252", "ⲫ"},
- {""}, {""}, {""}, {""},
-#line 865 "u8_lc_map.txt"
- {"\352\231\216", "ꙏ"},
-#line 836 "u8_lc_map.txt"
- {"\342\262\274", "ⲽ"},
- {""}, {""},
-#line 71 "u8_lc_map.txt"
- {"\304\222", "ē"},
-#line 611 "u8_lc_map.txt"
- {"\341\273\254", "ử"},
- {""},
-#line 597 "u8_lc_map.txt"
- {"\341\273\220", "ố"},
- {""},
-#line 33 "u8_lc_map.txt"
- {"\303\201", "á"},
- {""}, {""},
-#line 66 "u8_lc_map.txt"
- {"\304\210", "ĉ"},
- {""}, {""},
-#line 675 "u8_lc_map.txt"
- {"\341\276\216", "ᾆ"},
- {""},
-#line 540 "u8_lc_map.txt"
- {"\341\271\226", "ṗ"},
- {""},
-#line 230 "u8_lc_map.txt"
- {"\316\214", "ό"},
- {""},
-#line 251 "u8_lc_map.txt"
- {"\316\244", "τ"},
-#line 508 "u8_lc_map.txt"
- {"\341\270\226", "ḗ"},
- {""}, {""},
-#line 480 "u8_lc_map.txt"
- {"\341\202\265", "ⴕ"},
- {""}, {""}, {""}, {""},
-#line 322 "u8_lc_map.txt"
- {"\320\254", "ь"},
-#line 674 "u8_lc_map.txt"
- {"\341\276\215", "ᾅ"},
-#line 918 "u8_lc_map.txt"
- {"\352\235\226", "ꝗ"},
- {""},
-#line 382 "u8_lc_map.txt"
- {"\323\232", "ӛ"},
- {""},
-#line 482 "u8_lc_map.txt"
- {"\341\202\267", "ⴗ"},
-#line 531 "u8_lc_map.txt"
- {"\341\271\204", "ṅ"},
-#line 216 "u8_lc_map.txt"
- {"\311\204", "ʉ"},
- {""},
-#line 610 "u8_lc_map.txt"
- {"\341\273\252", "ừ"},
- {""},
-#line 499 "u8_lc_map.txt"
- {"\341\270\204", "ḅ"},
-#line 186 "u8_lc_map.txt"
- {"\310\204", "ȅ"},
- {""},
-#line 851 "u8_lc_map.txt"
- {"\342\263\232", "ⳛ"},
-#line 619 "u8_lc_map.txt"
- {"\341\273\274", "ỽ"},
-#line 842 "u8_lc_map.txt"
- {"\342\263\210", "ⳉ"},
- {""}, {""},
-#line 115 "u8_lc_map.txt"
- {"\305\254", "ŭ"},
- {""},
-#line 909 "u8_lc_map.txt"
- {"\352\235\204", "ꝅ"},
-#line 36 "u8_lc_map.txt"
- {"\303\204", "ä"},
- {""},
-#line 819 "u8_lc_map.txt"
- {"\342\262\232", "ⲛ"},
-#line 825 "u8_lc_map.txt"
- {"\342\262\246", "ⲧ"},
-#line 810 "u8_lc_map.txt"
- {"\342\262\210", "ⲉ"},
- {""},
-#line 383 "u8_lc_map.txt"
- {"\323\234", "ӝ"},
- {""}, {""}, {""}, {""}, {""},
-#line 843 "u8_lc_map.txt"
- {"\342\263\212", "ⳋ"},
- {""}, {""}, {""},
-#line 344 "u8_lc_map.txt"
- {"\322\214", "ҍ"},
- {""},
-#line 356 "u8_lc_map.txt"
- {"\322\244", "ҥ"},
-#line 571 "u8_lc_map.txt"
- {"\341\272\224", "ẕ"},
-#line 562 "u8_lc_map.txt"
- {"\341\272\202", "ẃ"},
- {""},
-#line 811 "u8_lc_map.txt"
- {"\342\262\212", "ⲋ"},
-#line 575 "u8_lc_map.txt"
- {"\341\272\244", "ấ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 68 "u8_lc_map.txt"
- {"\304\214", "č"},
- {""},
-#line 80 "u8_lc_map.txt"
- {"\304\244", "ĥ"},
-#line 938 "u8_lc_map.txt"
- {"\352\236\206", "ꞇ"},
-#line 764 "u8_lc_map.txt"
- {"\342\260\224", "ⱄ"},
-#line 746 "u8_lc_map.txt"
- {"\342\260\202", "ⰲ"},
-#line 570 "u8_lc_map.txt"
- {"\341\272\222", "ẓ"},
- {""},
-#line 780 "u8_lc_map.txt"
- {"\342\260\244", "ⱔ"},
- {""}, {""},
-#line 711 "u8_lc_map.txt"
- {"\341\277\254", "ῥ"},
-#line 789 "u8_lc_map.txt"
- {"\342\260\255", "ⱝ"},
-#line 892 "u8_lc_map.txt"
- {"\352\232\226", "ꚗ"},
- {""}, {""},
-#line 602 "u8_lc_map.txt"
- {"\341\273\232", "ớ"},
-#line 608 "u8_lc_map.txt"
- {"\341\273\246", "ủ"},
-#line 593 "u8_lc_map.txt"
- {"\341\273\210", "ỉ"},
- {""}, {""},
-#line 852 "u8_lc_map.txt"
- {"\342\263\234", "ⳝ"},
-#line 762 "u8_lc_map.txt"
- {"\342\260\222", "ⱂ"},
-#line 869 "u8_lc_map.txt"
- {"\352\231\226", "ꙗ"},
- {""}, {""},
-#line 579 "u8_lc_map.txt"
- {"\341\272\254", "ậ"},
-#line 850 "u8_lc_map.txt"
- {"\342\263\230", "ⳙ"},
-#line 569 "u8_lc_map.txt"
- {"\341\272\220", "ẑ"},
- {""}, {""},
-#line 820 "u8_lc_map.txt"
- {"\342\262\234", "ⲝ"},
- {""},
-#line 883 "u8_lc_map.txt"
- {"\352\232\204", "ꚅ"},
- {""},
-#line 304 "u8_lc_map.txt"
- {"\320\232", "к"},
-#line 594 "u8_lc_map.txt"
- {"\341\273\212", "ị"},
-#line 818 "u8_lc_map.txt"
- {"\342\262\230", "ⲙ"},
- {""}, {""}, {""},
-#line 844 "u8_lc_map.txt"
- {"\342\263\214", "ⳍ"},
-#line 788 "u8_lc_map.txt"
- {"\342\260\254", "ⱜ"},
-#line 860 "u8_lc_map.txt"
- {"\352\231\204", "ꙅ"},
-#line 760 "u8_lc_map.txt"
- {"\342\260\220", "ⱀ"},
- {""},
-#line 709 "u8_lc_map.txt"
- {"\341\277\252", "ὺ"},
- {""},
-#line 138 "u8_lc_map.txt"
- {"\306\224", "ɣ"},
- {""}, {""},
-#line 812 "u8_lc_map.txt"
- {"\342\262\214", "ⲍ"},
-#line 716 "u8_lc_map.txt"
- {"\341\277\274", "ῳ"},
- {""}, {""},
-#line 106 "u8_lc_map.txt"
- {"\305\232", "ś"},
-#line 708 "u8_lc_map.txt"
- {"\341\277\251", "ῡ"},
- {""},
-#line 841 "u8_lc_map.txt"
- {"\342\263\206", "ⳇ"},
- {""},
-#line 306 "u8_lc_map.txt"
- {"\320\234", "м"},
-#line 578 "u8_lc_map.txt"
- {"\341\272\252", "ẫ"},
- {""},
-#line 126 "u8_lc_map.txt"
- {"\306\202", "ƃ"},
- {""}, {""},
-#line 558 "u8_lc_map.txt"
- {"\341\271\272", "ṻ"},
-#line 587 "u8_lc_map.txt"
- {"\341\272\274", "ẽ"},
-#line 809 "u8_lc_map.txt"
- {"\342\262\206", "ⲇ"},
- {""},
-#line 378 "u8_lc_map.txt"
- {"\323\222", "ӓ"},
-#line 526 "u8_lc_map.txt"
- {"\341\270\272", "ḻ"},
-#line 745 "u8_lc_map.txt"
- {"\342\260\201", "ⰱ"},
-#line 195 "u8_lc_map.txt"
- {"\310\226", "ȗ"},
- {""}, {""},
-#line 603 "u8_lc_map.txt"
- {"\341\273\234", "ờ"},
-#line 786 "u8_lc_map.txt"
- {"\342\260\252", "ⱚ"},
- {""}, {""},
-#line 107 "u8_lc_map.txt"
- {"\305\234", "ŝ"},
-#line 943 "u8_lc_map.txt"
- {"\352\236\242", "ꞣ"},
-#line 601 "u8_lc_map.txt"
- {"\341\273\230", "ộ"},
-#line 54 "u8_lc_map.txt"
- {"\303\226", "ö"},
- {""}, {""},
-#line 485 "u8_lc_map.txt"
- {"\341\202\272", "ⴚ"},
-#line 785 "u8_lc_map.txt"
- {"\342\260\251", "ⱙ"},
-#line 456 "u8_lc_map.txt"
- {"\325\224", "ք"},
-#line 493 "u8_lc_map.txt"
- {"\341\203\202", "ⴢ"},
- {""},
-#line 269 "u8_lc_map.txt"
- {"\317\254", "ϭ"},
- {""}, {""}, {""}, {""},
-#line 595 "u8_lc_map.txt"
- {"\341\273\214", "ọ"},
-#line 545 "u8_lc_map.txt"
- {"\341\271\240", "ṡ"},
- {""}, {""}, {""}, {""},
-#line 513 "u8_lc_map.txt"
- {"\341\270\240", "ḡ"},
-#line 438 "u8_lc_map.txt"
- {"\325\202", "ղ"},
- {""},
-#line 155 "u8_lc_map.txt"
- {"\306\263", "ƴ"},
-#line 705 "u8_lc_map.txt"
- {"\341\277\232", "ὶ"},
- {""},
-#line 698 "u8_lc_map.txt"
- {"\341\277\210", "ὲ"},
- {""}, {""},
-#line 904 "u8_lc_map.txt"
- {"\352\234\272", "ꜻ"},
-#line 923 "u8_lc_map.txt"
- {"\352\235\240", "ꝡ"},
-#line 592 "u8_lc_map.txt"
- {"\341\273\206", "ệ"},
- {""},
-#line 288 "u8_lc_map.txt"
- {"\320\212", "њ"},
- {""},
-#line 459 "u8_lc_map.txt"
- {"\341\202\240", "ⴀ"},
- {""}, {""}, {""},
-#line 332 "u8_lc_map.txt"
- {"\321\254", "ѭ"},
-#line 576 "u8_lc_map.txt"
- {"\341\272\246", "ầ"},
-#line 565 "u8_lc_map.txt"
- {"\341\272\210", "ẉ"},
-#line 64 "u8_lc_map.txt"
- {"\304\204", "ą"},
- {""},
-#line 700 "u8_lc_map.txt"
- {"\341\277\212", "ὴ"},
- {""}, {""}, {""},
-#line 993 "u8_lc_map.txt"
- {"\360\220\220\224", "𐐼"},
-#line 975 "u8_lc_map.txt"
- {"\360\220\220\202", "𐐪"},
- {""}, {""},
-#line 1009 "u8_lc_map.txt"
- {"\360\220\220\244", "𐑌"},
-#line 98 "u8_lc_map.txt"
- {"\305\212", "ŋ"},
-#line 855 "u8_lc_map.txt"
- {"\342\263\242", "ⳣ"},
-#line 770 "u8_lc_map.txt"
- {"\342\260\232", "ⱊ"},
-#line 782 "u8_lc_map.txt"
- {"\342\260\246", "ⱖ"},
-#line 752 "u8_lc_map.txt"
- {"\342\260\210", "ⰸ"},
-#line 199 "u8_lc_map.txt"
- {"\310\236", "ȟ"},
-#line 566 "u8_lc_map.txt"
- {"\341\272\212", "ẋ"},
-#line 211 "u8_lc_map.txt"
- {"\310\273", "ȼ"},
-#line 192 "u8_lc_map.txt"
- {"\310\220", "ȑ"},
-#line 258 "u8_lc_map.txt"
- {"\316\253", "ϋ"},
-#line 205 "u8_lc_map.txt"
- {"\310\252", "ȫ"},
-#line 823 "u8_lc_map.txt"
- {"\342\262\242", "ⲣ"},
- {""},
-#line 991 "u8_lc_map.txt"
- {"\360\220\220\222", "𐐺"},
- {""},
-#line 61 "u8_lc_map.txt"
- {"\303\236", "þ"},
-#line 364 "u8_lc_map.txt"
- {"\322\264", "ҵ"},
-#line 387 "u8_lc_map.txt"
- {"\323\244", "ӥ"},
-#line 48 "u8_lc_map.txt"
- {"\303\220", "ð"},
- {""},
-#line 296 "u8_lc_map.txt"
- {"\320\222", "в"},
-#line 492 "u8_lc_map.txt"
- {"\341\203\201", "ⴡ"},
-#line 754 "u8_lc_map.txt"
- {"\342\260\212", "ⰺ"},
- {""}, {""}, {""},
-#line 150 "u8_lc_map.txt"
- {"\306\254", "ƭ"},
-#line 553 "u8_lc_map.txt"
- {"\341\271\260", "ṱ"},
-#line 286 "u8_lc_map.txt"
- {"\320\210", "ј"},
-#line 218 "u8_lc_map.txt"
- {"\311\206", "ɇ"},
- {""},
-#line 88 "u8_lc_map.txt"
- {"\304\264", "ĵ"},
-#line 521 "u8_lc_map.txt"
- {"\341\270\260", "ḱ"},
- {""},
-#line 187 "u8_lc_map.txt"
- {"\310\206", "ȇ"},
-#line 989 "u8_lc_map.txt"
- {"\360\220\220\220", "𐐸"},
-#line 695 "u8_lc_map.txt"
- {"\341\276\272", "ὰ"},
-#line 703 "u8_lc_map.txt"
- {"\341\277\230", "ῐ"},
-#line 238 "u8_lc_map.txt"
- {"\316\226", "ζ"},
- {""},
-#line 102 "u8_lc_map.txt"
- {"\305\222", "œ"},
- {""}, {""},
-#line 931 "u8_lc_map.txt"
- {"\352\235\271", "ꝺ"},
-#line 38 "u8_lc_map.txt"
- {"\303\206", "æ"},
-#line 260 "u8_lc_map.txt"
- {"\317\232", "ϛ"},
-#line 829 "u8_lc_map.txt"
- {"\342\262\256", "ⲯ"},
-#line 475 "u8_lc_map.txt"
- {"\341\202\260", "ⴐ"},
-#line 484 "u8_lc_map.txt"
- {"\341\202\271", "ⴙ"},
- {""}, {""},
-#line 702 "u8_lc_map.txt"
- {"\341\277\214", "ῃ"},
-#line 874 "u8_lc_map.txt"
- {"\352\231\240", "ꙡ"},
-#line 856 "u8_lc_map.txt"
- {"\342\263\253", "ⳬ"},
- {""}, {""},
-#line 606 "u8_lc_map.txt"
- {"\341\273\242", "ợ"},
-#line 940 "u8_lc_map.txt"
- {"\352\236\215", "ɥ"},
-#line 411 "u8_lc_map.txt"
- {"\324\224", "ԕ"},
- {""},
-#line 222 "u8_lc_map.txt"
- {"\311\216", "ɏ"},
-#line 853 "u8_lc_map.txt"
- {"\342\263\236", "ⳟ"},
-#line 772 "u8_lc_map.txt"
- {"\342\260\234", "ⱌ"},
-#line 974 "u8_lc_map.txt"
- {"\360\220\220\201", "𐐩"},
- {""},
-#line 191 "u8_lc_map.txt"
- {"\310\216", "ȏ"},
-#line 567 "u8_lc_map.txt"
- {"\341\272\214", "ẍ"},
-#line 724 "u8_lc_map.txt"
- {"\342\222\274", "ⓖ"},
-#line 768 "u8_lc_map.txt"
- {"\342\260\230", "ⱈ"},
- {""},
-#line 261 "u8_lc_map.txt"
- {"\317\234", "ϝ"},
-#line 821 "u8_lc_map.txt"
- {"\342\262\236", "ⲟ"},
- {""},
-#line 402 "u8_lc_map.txt"
- {"\324\202", "ԃ"},
- {""},
-#line 46 "u8_lc_map.txt"
- {"\303\216", "î"},
-#line 476 "u8_lc_map.txt"
- {"\341\202\261", "ⴑ"},
- {""}, {""}, {""}, {""},
-#line 490 "u8_lc_map.txt"
- {"\341\202\277", "ⴟ"},
-#line 756 "u8_lc_map.txt"
- {"\342\260\214", "ⰼ"},
-#line 564 "u8_lc_map.txt"
- {"\341\272\206", "ẇ"},
- {""}, {""}, {""}, {""},
-#line 349 "u8_lc_map.txt"
- {"\322\226", "җ"},
- {""}, {""},
-#line 612 "u8_lc_map.txt"
- {"\341\273\256", "ữ"},
- {""},
-#line 715 "u8_lc_map.txt"
- {"\341\277\273", "ώ"},
- {""},
-#line 370 "u8_lc_map.txt"
- {"\323\201", "ӂ"},
-#line 845 "u8_lc_map.txt"
- {"\342\263\216", "ⳏ"},
- {""}, {""},
-#line 750 "u8_lc_map.txt"
- {"\342\260\206", "ⰶ"},
-#line 290 "u8_lc_map.txt"
- {"\320\214", "ќ"},
- {""},
-#line 314 "u8_lc_map.txt"
- {"\320\244", "ф"},
-#line 73 "u8_lc_map.txt"
- {"\304\226", "ė"},
- {""},
-#line 246 "u8_lc_map.txt"
- {"\316\236", "ξ"},
-#line 813 "u8_lc_map.txt"
- {"\342\262\216", "ⲏ"},
-#line 832 "u8_lc_map.txt"
- {"\342\262\264", "ⲵ"},
- {""}, {""},
-#line 257 "u8_lc_map.txt"
- {"\316\252", "ϊ"},
-#line 680 "u8_lc_map.txt"
- {"\341\276\233", "ᾓ"},
- {""}, {""}, {""},
-#line 423 "u8_lc_map.txt"
- {"\324\263", "գ"},
-#line 604 "u8_lc_map.txt"
- {"\341\273\236", "ở"},
- {""}, {""}, {""},
-#line 99 "u8_lc_map.txt"
- {"\305\214", "ō"},
-#line 549 "u8_lc_map.txt"
- {"\341\271\250", "ṩ"},
-#line 111 "u8_lc_map.txt"
- {"\305\244", "ť"},
- {""}, {""}, {""},
-#line 517 "u8_lc_map.txt"
- {"\341\270\250", "ḩ"},
- {""},
-#line 999 "u8_lc_map.txt"
- {"\360\220\220\232", "𐑂"},
-#line 1011 "u8_lc_map.txt"
- {"\360\220\220\246", "𐑎"},
-#line 981 "u8_lc_map.txt"
- {"\360\220\220\210", "𐐰"},
-#line 462 "u8_lc_map.txt"
- {"\341\202\243", "ⴃ"},
- {""},
-#line 694 "u8_lc_map.txt"
- {"\341\276\271", "ᾱ"},
-#line 226 "u8_lc_map.txt"
- {"\316\206", "ά"},
- {""},
-#line 927 "u8_lc_map.txt"
- {"\352\235\250", "ꝩ"},
- {""}, {""}, {""},
-#line 142 "u8_lc_map.txt"
- {"\306\234", "ɯ"},
-#line 467 "u8_lc_map.txt"
- {"\341\202\250", "ⴈ"},
-#line 759 "u8_lc_map.txt"
- {"\342\260\217", "ⰿ"},
- {""}, {""}, {""}, {""}, {""},
-#line 983 "u8_lc_map.txt"
- {"\360\220\220\212", "𐐲"},
- {""}, {""},
-#line 596 "u8_lc_map.txt"
- {"\341\273\216", "ỏ"},
-#line 615 "u8_lc_map.txt"
- {"\341\273\264", "ỵ"},
- {""}, {""},
-#line 353 "u8_lc_map.txt"
- {"\322\236", "ҟ"},
-#line 175 "u8_lc_map.txt"
- {"\307\254", "ǭ"},
-#line 323 "u8_lc_map.txt"
- {"\320\255", "э"},
-#line 346 "u8_lc_map.txt"
- {"\322\220", "ґ"},
- {""},
-#line 359 "u8_lc_map.txt"
- {"\322\252", "ҫ"},
-#line 574 "u8_lc_map.txt"
- {"\341\272\242", "ả"},
- {""},
-#line 666 "u8_lc_map.txt"
- {"\341\275\255", "ὥ"},
-#line 464 "u8_lc_map.txt"
- {"\341\202\245", "ⴅ"},
-#line 231 "u8_lc_map.txt"
- {"\316\216", "ύ"},
-#line 896 "u8_lc_map.txt"
- {"\352\234\250", "ꜩ"},
- {""},
-#line 937 "u8_lc_map.txt"
- {"\352\236\204", "ꞅ"},
- {""},
-#line 77 "u8_lc_map.txt"
- {"\304\236", "ğ"},
-#line 640 "u8_lc_map.txt"
- {"\341\274\255", "ἥ"},
-#line 91 "u8_lc_map.txt"
- {"\304\273", "ļ"},
-#line 70 "u8_lc_map.txt"
- {"\304\220", "đ"},
- {""},
-#line 83 "u8_lc_map.txt"
- {"\304\252", "ī"},
-#line 672 "u8_lc_map.txt"
- {"\341\276\213", "ᾃ"},
-#line 778 "u8_lc_map.txt"
- {"\342\260\242", "ⱒ"},
- {""}, {""},
-#line 279 "u8_lc_map.txt"
- {"\320\201", "ё"},
-#line 395 "u8_lc_map.txt"
- {"\323\264", "ӵ"},
-#line 466 "u8_lc_map.txt"
- {"\341\202\247", "ⴇ"},
- {""}, {""}, {""},
-#line 557 "u8_lc_map.txt"
- {"\341\271\270", "ṹ"},
-#line 554 "u8_lc_map.txt"
- {"\341\271\262", "ṳ"},
-#line 1001 "u8_lc_map.txt"
- {"\360\220\220\234", "𐑄"},
- {""}, {""},
-#line 525 "u8_lc_map.txt"
- {"\341\270\270", "ḹ"},
-#line 522 "u8_lc_map.txt"
- {"\341\270\262", "ḳ"},
-#line 665 "u8_lc_map.txt"
- {"\341\275\254", "ὤ"},
-#line 997 "u8_lc_map.txt"
- {"\360\220\220\230", "𐑀"},
-#line 131 "u8_lc_map.txt"
- {"\306\212", "ɗ"},
-#line 580 "u8_lc_map.txt"
- {"\341\272\256", "ắ"},
-#line 90 "u8_lc_map.txt"
- {"\304\271", "ĺ"},
-#line 710 "u8_lc_map.txt"
- {"\341\277\253", "ύ"},
-#line 65 "u8_lc_map.txt"
- {"\304\206", "ć"},
-#line 94 "u8_lc_map.txt"
- {"\305\201", "ł"},
-#line 639 "u8_lc_map.txt"
- {"\341\274\254", "ἤ"},
- {""},
-#line 849 "u8_lc_map.txt"
- {"\342\263\226", "ⳗ"},
- {""}, {""},
-#line 483 "u8_lc_map.txt"
- {"\341\202\270", "ⴘ"},
-#line 477 "u8_lc_map.txt"
- {"\341\202\262", "ⴒ"},
-#line 985 "u8_lc_map.txt"
- {"\360\220\220\214", "𐐴"},
- {""}, {""},
-#line 878 "u8_lc_map.txt"
- {"\352\231\250", "ꙩ"},
-#line 790 "u8_lc_map.txt"
- {"\342\260\256", "ⱞ"},
-#line 817 "u8_lc_map.txt"
- {"\342\262\226", "ⲗ"},
- {""},
-#line 345 "u8_lc_map.txt"
- {"\322\216", "ҏ"},
-#line 209 "u8_lc_map.txt"
- {"\310\262", "ȳ"},
-#line 256 "u8_lc_map.txt"
- {"\316\251", "ω"},
- {""}, {""}, {""},
-#line 572 "u8_lc_map.txt"
- {"\341\272\236", "ß"},
-#line 208 "u8_lc_map.txt"
- {"\310\260", "ȱ"},
-#line 840 "u8_lc_map.txt"
- {"\342\263\204", "ⳅ"},
-#line 282 "u8_lc_map.txt"
- {"\320\204", "є"},
-#line 979 "u8_lc_map.txt"
- {"\360\220\220\206", "𐐮"},
-#line 685 "u8_lc_map.txt"
- {"\341\276\250", "ᾠ"},
- {""},
-#line 663 "u8_lc_map.txt"
- {"\341\275\252", "ὢ"},
-#line 787 "u8_lc_map.txt"
- {"\342\260\253", "ⱛ"},
-#line 69 "u8_lc_map.txt"
- {"\304\216", "ď"},
-#line 903 "u8_lc_map.txt"
- {"\352\234\270", "ꜹ"},
-#line 900 "u8_lc_map.txt"
- {"\352\234\262", "ꜳ"},
-#line 808 "u8_lc_map.txt"
- {"\342\262\204", "ⲅ"},
- {""},
-#line 446 "u8_lc_map.txt"
- {"\325\212", "պ"},
-#line 637 "u8_lc_map.txt"
- {"\341\274\252", "ἢ"},
-#line 774 "u8_lc_map.txt"
- {"\342\260\236", "ⱎ"},
-#line 662 "u8_lc_map.txt"
- {"\341\275\251", "ὡ"},
- {""},
-#line 217 "u8_lc_map.txt"
- {"\311\205", "ʌ"},
- {""},
-#line 647 "u8_lc_map.txt"
- {"\341\274\274", "ἴ"},
-#line 723 "u8_lc_map.txt"
- {"\342\222\273", "ⓕ"},
- {""},
-#line 56 "u8_lc_map.txt"
- {"\303\231", "ù"},
-#line 636 "u8_lc_map.txt"
- {"\341\274\251", "ἡ"},
-#line 265 "u8_lc_map.txt"
- {"\317\244", "ϥ"},
- {""}, {""}, {""},
-#line 678 "u8_lc_map.txt"
- {"\341\276\231", "ᾑ"},
- {""},
-#line 380 "u8_lc_map.txt"
- {"\323\226", "ӗ"},
- {""},
-#line 37 "u8_lc_map.txt"
- {"\303\205", "å"},
-#line 568 "u8_lc_map.txt"
- {"\341\272\216", "ẏ"},
-#line 583 "u8_lc_map.txt"
- {"\341\272\264", "ẵ"},
-#line 600 "u8_lc_map.txt"
- {"\341\273\226", "ỗ"},
-#line 529 "u8_lc_map.txt"
- {"\341\271\200", "ṁ"},
-#line 414 "u8_lc_map.txt"
- {"\324\232", "ԛ"},
-#line 560 "u8_lc_map.txt"
- {"\341\271\276", "ṿ"},
-#line 556 "u8_lc_map.txt"
- {"\341\271\266", "ṷ"},
- {""},
-#line 497 "u8_lc_map.txt"
- {"\341\270\200", "ḁ"},
-#line 250 "u8_lc_map.txt"
- {"\316\243", "σ"},
-#line 528 "u8_lc_map.txt"
- {"\341\270\276", "ḿ"},
-#line 524 "u8_lc_map.txt"
- {"\341\270\266", "ḷ"},
-#line 988 "u8_lc_map.txt"
- {"\360\220\220\217", "𐐷"},
- {""}, {""},
-#line 60 "u8_lc_map.txt"
- {"\303\235", "ý"},
-#line 758 "u8_lc_map.txt"
- {"\342\260\216", "ⰾ"},
-#line 684 "u8_lc_map.txt"
- {"\341\276\237", "ᾗ"},
-#line 907 "u8_lc_map.txt"
- {"\352\235\200", "ꝁ"},
-#line 454 "u8_lc_map.txt"
- {"\325\222", "ւ"},
-#line 934 "u8_lc_map.txt"
- {"\352\235\276", "ꝿ"},
-#line 328 "u8_lc_map.txt"
- {"\321\244", "ѥ"},
-#line 591 "u8_lc_map.txt"
- {"\341\273\204", "ễ"},
- {""}, {""},
-#line 489 "u8_lc_map.txt"
- {"\341\202\276", "ⴞ"},
-#line 481 "u8_lc_map.txt"
- {"\341\202\266", "ⴖ"},
-#line 444 "u8_lc_map.txt"
- {"\325\210", "ո"},
- {""},
-#line 415 "u8_lc_map.txt"
- {"\324\234", "ԝ"},
-#line 119 "u8_lc_map.txt"
- {"\305\264", "ŵ"},
-#line 761 "u8_lc_map.txt"
- {"\342\260\221", "ⱁ"},
-#line 757 "u8_lc_map.txt"
- {"\342\260\215", "ⰽ"},
- {""},
-#line 651 "u8_lc_map.txt"
- {"\341\275\210", "ὀ"},
-#line 693 "u8_lc_map.txt"
- {"\341\276\270", "ᾰ"},
- {""}, {""}, {""}, {""},
-#line 631 "u8_lc_map.txt"
- {"\341\274\232", "ἒ"},
-#line 460 "u8_lc_map.txt"
- {"\341\202\241", "ⴁ"},
-#line 621 "u8_lc_map.txt"
- {"\341\274\210", "ἀ"},
- {""}, {""}, {""}, {""},
-#line 1007 "u8_lc_map.txt"
- {"\360\220\220\242", "𐑊"},
- {""},
-#line 184 "u8_lc_map.txt"
- {"\310\200", "ȁ"},
-#line 906 "u8_lc_map.txt"
- {"\352\234\276", "ꜿ"},
-#line 902 "u8_lc_map.txt"
- {"\352\234\266", "ꜷ"},
-#line 653 "u8_lc_map.txt"
- {"\341\275\212", "ὂ"},
-#line 321 "u8_lc_map.txt"
- {"\320\253", "ы"},
- {""},
-#line 670 "u8_lc_map.txt"
- {"\341\276\211", "ᾁ"},
-#line 942 "u8_lc_map.txt"
- {"\352\236\240", "ꞡ"},
- {""}, {""},
-#line 32 "u8_lc_map.txt"
- {"\303\200", "à"},
-#line 623 "u8_lc_map.txt"
- {"\341\274\212", "ἂ"},
-#line 147 "u8_lc_map.txt"
- {"\306\244", "ƥ"},
- {""}, {""},
-#line 384 "u8_lc_map.txt"
- {"\323\236", "ӟ"},
-#line 474 "u8_lc_map.txt"
- {"\341\202\257", "ⴏ"},
- {""},
-#line 377 "u8_lc_map.txt"
- {"\323\220", "ӑ"},
- {""},
-#line 390 "u8_lc_map.txt"
- {"\323\252", "ӫ"},
-#line 196 "u8_lc_map.txt"
- {"\310\230", "ș"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 241 "u8_lc_map.txt"
- {"\316\231", "ι"},
-#line 55 "u8_lc_map.txt"
- {"\303\230", "ø"},
- {""},
-#line 300 "u8_lc_map.txt"
- {"\320\226", "ж"},
-#line 881 "u8_lc_map.txt"
- {"\352\232\200", "ꚁ"},
-#line 406 "u8_lc_map.txt"
- {"\324\212", "ԋ"},
- {""},
-#line 765 "u8_lc_map.txt"
- {"\342\260\225", "ⱅ"},
- {""}, {""},
-#line 366 "u8_lc_map.txt"
- {"\322\270", "ҹ"},
-#line 835 "u8_lc_map.txt"
- {"\342\262\272", "ⲻ"},
-#line 749 "u8_lc_map.txt"
- {"\342\260\205", "ⰵ"},
- {""},
-#line 858 "u8_lc_map.txt"
- {"\352\231\200", "ꙁ"},
- {""}, {""},
-#line 682 "u8_lc_map.txt"
- {"\341\276\235", "ᾕ"},
- {""}, {""},
-#line 448 "u8_lc_map.txt"
- {"\325\214", "ռ"},
-#line 633 "u8_lc_map.txt"
- {"\341\274\234", "ἔ"},
- {""},
-#line 104 "u8_lc_map.txt"
- {"\305\226", "ŗ"},
- {""}, {""},
-#line 245 "u8_lc_map.txt"
- {"\316\235", "ν"},
-#line 629 "u8_lc_map.txt"
- {"\341\274\230", "ἐ"},
-#line 1003 "u8_lc_map.txt"
- {"\360\220\220\236", "𐑆"},
- {""}, {""},
-#line 363 "u8_lc_map.txt"
- {"\322\262", "ҳ"},
-#line 854 "u8_lc_map.txt"
- {"\342\263\240", "ⳡ"},
-#line 655 "u8_lc_map.txt"
- {"\341\275\214", "ὄ"},
- {""},
-#line 213 "u8_lc_map.txt"
- {"\310\276", "ⱦ"},
- {""},
-#line 362 "u8_lc_map.txt"
- {"\322\260", "ұ"},
- {""}, {""}, {""},
-#line 625 "u8_lc_map.txt"
- {"\341\274\214", "ἄ"},
-#line 822 "u8_lc_map.txt"
- {"\342\262\240", "ⲡ"},
- {""},
-#line 766 "u8_lc_map.txt"
- {"\342\260\226", "ⱆ"},
-#line 410 "u8_lc_map.txt"
- {"\324\222", "ԓ"},
-#line 87 "u8_lc_map.txt"
- {"\304\262", "ĳ"},
-#line 58 "u8_lc_map.txt"
- {"\303\233", "û"},
-#line 563 "u8_lc_map.txt"
- {"\341\272\204", "ẅ"},
- {""}, {""}, {""},
-#line 86 "u8_lc_map.txt"
- {"\304\260", "i"},
-#line 405 "u8_lc_map.txt"
- {"\324\210", "ԉ"},
- {""}, {""},
-#line 618 "u8_lc_map.txt"
- {"\341\273\272", "ỻ"},
- {""}, {""}, {""},
-#line 125 "u8_lc_map.txt"
- {"\306\201", "ɓ"},
-#line 368 "u8_lc_map.txt"
- {"\322\274", "ҽ"},
- {""},
-#line 987 "u8_lc_map.txt"
- {"\360\220\220\216", "𐐶"},
-#line 748 "u8_lc_map.txt"
- {"\342\260\204", "ⰴ"},
- {""}, {""},
-#line 203 "u8_lc_map.txt"
- {"\310\246", "ȧ"},
- {""}, {""},
-#line 308 "u8_lc_map.txt"
- {"\320\236", "о"},
-#line 692 "u8_lc_map.txt"
- {"\341\276\257", "ᾧ"},
-#line 751 "u8_lc_map.txt"
- {"\342\260\207", "ⰷ"},
-#line 294 "u8_lc_map.txt"
- {"\320\220", "а"},
- {""},
-#line 320 "u8_lc_map.txt"
- {"\320\252", "ъ"},
-#line 271 "u8_lc_map.txt"
- {"\317\264", "θ"},
- {""},
-#line 990 "u8_lc_map.txt"
- {"\360\220\220\221", "𐐹"},
-#line 986 "u8_lc_map.txt"
- {"\360\220\220\215", "𐐵"},
- {""}, {""}, {""},
-#line 646 "u8_lc_map.txt"
- {"\341\274\273", "ἳ"},
- {""}, {""},
-#line 939 "u8_lc_map.txt"
- {"\352\236\213", "ꞌ"},
-#line 605 "u8_lc_map.txt"
- {"\341\273\240", "ỡ"},
- {""}, {""},
-#line 108 "u8_lc_map.txt"
- {"\305\236", "ş"},
-#line 240 "u8_lc_map.txt"
- {"\316\230", "θ"},
-#line 123 "u8_lc_map.txt"
- {"\305\273", "ż"},
-#line 101 "u8_lc_map.txt"
- {"\305\220", "ő"},
- {""},
-#line 114 "u8_lc_map.txt"
- {"\305\252", "ū"},
-#line 496 "u8_lc_map.txt"
- {"\341\203\205", "ⴥ"},
- {""}, {""},
-#line 284 "u8_lc_map.txt"
- {"\320\206", "і"},
-#line 437 "u8_lc_map.txt"
- {"\325\201", "ձ"},
-#line 628 "u8_lc_map.txt"
- {"\341\274\217", "ἇ"},
- {""}, {""},
-#line 127 "u8_lc_map.txt"
- {"\306\204", "ƅ"},
- {""},
-#line 336 "u8_lc_map.txt"
- {"\321\264", "ѵ"},
-#line 830 "u8_lc_map.txt"
- {"\342\262\260", "ⲱ"},
-#line 725 "u8_lc_map.txt"
- {"\342\222\275", "ⓗ"},
- {""}, {""}, {""},
-#line 171 "u8_lc_map.txt"
- {"\307\244", "ǥ"},
- {""}, {""}, {""}, {""},
-#line 122 "u8_lc_map.txt"
- {"\305\271", "ź"},
- {""}, {""},
-#line 342 "u8_lc_map.txt"
- {"\322\200", "ҁ"},
- {""},
-#line 47 "u8_lc_map.txt"
- {"\303\217", "ï"},
- {""}, {""},
-#line 407 "u8_lc_map.txt"
- {"\324\214", "ԍ"},
- {""},
-#line 419 "u8_lc_map.txt"
- {"\324\244", "ԥ"},
- {""}, {""},
-#line 292 "u8_lc_map.txt"
- {"\320\216", "ў"},
- {""}, {""},
-#line 994 "u8_lc_map.txt"
- {"\360\220\220\225", "𐐽"},
- {""},
-#line 62 "u8_lc_map.txt"
- {"\304\200", "ā"},
-#line 946 "u8_lc_map.txt"
- {"\352\236\250", "ꞩ"},
-#line 243 "u8_lc_map.txt"
- {"\316\233", "λ"},
-#line 978 "u8_lc_map.txt"
- {"\360\220\220\205", "𐐭"},
- {""}, {""},
-#line 350 "u8_lc_map.txt"
- {"\322\230", "ҙ"},
- {""},
-#line 794 "u8_lc_map.txt"
- {"\342\261\244", "ɽ"},
-#line 440 "u8_lc_map.txt"
- {"\325\204", "մ"},
- {""},
-#line 714 "u8_lc_map.txt"
- {"\341\277\272", "ὼ"},
-#line 798 "u8_lc_map.txt"
- {"\342\261\255", "ɑ"},
-#line 495 "u8_lc_map.txt"
- {"\341\203\204", "ⴤ"},
- {""},
-#line 100 "u8_lc_map.txt"
- {"\305\216", "ŏ"},
- {""},
-#line 613 "u8_lc_map.txt"
- {"\341\273\260", "ự"},
- {""}, {""}, {""},
-#line 74 "u8_lc_map.txt"
- {"\304\230", "ę"},
- {""}, {""}, {""}, {""},
-#line 586 "u8_lc_map.txt"
- {"\341\272\272", "ẻ"},
-#line 719 "u8_lc_map.txt"
- {"\342\222\267", "ⓑ"},
-#line 667 "u8_lc_map.txt"
- {"\341\275\256", "ὦ"},
- {""},
-#line 210 "u8_lc_map.txt"
- {"\310\272", "ⱥ"},
-#line 201 "u8_lc_map.txt"
- {"\310\242", "ȣ"},
-#line 253 "u8_lc_map.txt"
- {"\316\246", "φ"},
- {""},
-#line 730 "u8_lc_map.txt"
- {"\342\223\202", "ⓜ"},
-#line 995 "u8_lc_map.txt"
- {"\360\220\220\226", "𐐾"},
-#line 641 "u8_lc_map.txt"
- {"\341\274\256", "ἦ"},
-#line 950 "u8_lc_map.txt"
- {"\357\274\244", "ｄ"},
- {""}, {""},
-#line 397 "u8_lc_map.txt"
- {"\323\270", "ӹ"},
-#line 959 "u8_lc_map.txt"
- {"\357\274\255", "ｍ"},
- {""}, {""}, {""},
-#line 664 "u8_lc_map.txt"
- {"\341\275\253", "ὣ"},
- {""},
-#line 319 "u8_lc_map.txt"
- {"\320\251", "щ"},
- {""}, {""},
-#line 369 "u8_lc_map.txt"
- {"\322\276", "ҿ"},
- {""}, {""},
-#line 638 "u8_lc_map.txt"
- {"\341\274\253", "ἣ"},
- {""},
-#line 977 "u8_lc_map.txt"
- {"\360\220\220\204", "𐐬"},
- {""},
-#line 573 "u8_lc_map.txt"
- {"\341\272\240", "ạ"},
- {""},
-#line 747 "u8_lc_map.txt"
- {"\342\260\203", "ⰳ"},
- {""},
-#line 394 "u8_lc_map.txt"
- {"\323\262", "ӳ"},
-#line 763 "u8_lc_map.txt"
- {"\342\260\223", "ⱃ"},
-#line 980 "u8_lc_map.txt"
- {"\360\220\220\207", "𐐯"},
- {""}, {""},
-#line 826 "u8_lc_map.txt"
- {"\342\262\250", "ⲩ"},
-#line 393 "u8_lc_map.txt"
- {"\323\260", "ӱ"},
- {""}, {""}, {""},
-#line 958 "u8_lc_map.txt"
- {"\357\274\254", "ｌ"},
- {""},
-#line 776 "u8_lc_map.txt"
- {"\342\260\240", "ⱐ"},
- {""}, {""}, {""},
-#line 232 "u8_lc_map.txt"
- {"\316\217", "ώ"},
- {""}, {""},
-#line 262 "u8_lc_map.txt"
- {"\317\236", "ϟ"},
-#line 965 "u8_lc_map.txt"
- {"\357\274\263", "ｓ"},
-#line 357 "u8_lc_map.txt"
- {"\322\246", "ҧ"},
-#line 139 "u8_lc_map.txt"
- {"\306\226", "ɩ"},
- {""},
-#line 268 "u8_lc_map.txt"
- {"\317\252", "ϫ"},
-#line 706 "u8_lc_map.txt"
- {"\341\277\233", "ί"},
-#line 796 "u8_lc_map.txt"
- {"\342\261\251", "ⱪ"},
- {""}, {""},
-#line 372 "u8_lc_map.txt"
- {"\323\205", "ӆ"},
-#line 399 "u8_lc_map.txt"
- {"\323\274", "ӽ"},
- {""}, {""}, {""},
-#line 313 "u8_lc_map.txt"
- {"\320\243", "у"},
-#line 627 "u8_lc_map.txt"
- {"\341\274\216", "ἆ"},
-#line 81 "u8_lc_map.txt"
- {"\304\246", "ħ"},
- {""}, {""}, {""},
-#line 729 "u8_lc_map.txt"
- {"\342\223\201", "ⓛ"},
- {""}, {""},
-#line 656 "u8_lc_map.txt"
- {"\341\275\215", "ὅ"},
- {""},
-#line 956 "u8_lc_map.txt"
- {"\357\274\252", "ｊ"},
-#line 273 "u8_lc_map.txt"
- {"\317\271", "ϲ"},
-#line 713 "u8_lc_map.txt"
- {"\341\277\271", "ό"},
-#line 717 "u8_lc_map.txt"
- {"\342\204\262", "ⅎ"},
- {""},
-#line 609 "u8_lc_map.txt"
- {"\341\273\250", "ứ"},
-#line 626 "u8_lc_map.txt"
- {"\341\274\215", "ἅ"},
- {""},
-#line 403 "u8_lc_map.txt"
- {"\324\204", "ԅ"},
-#line 331 "u8_lc_map.txt"
- {"\321\252", "ѫ"},
-#line 955 "u8_lc_map.txt"
- {"\357\274\251", "ｉ"},
-#line 771 "u8_lc_map.txt"
- {"\342\260\233", "ⱋ"},
- {""}, {""}, {""}, {""},
-#line 581 "u8_lc_map.txt"
- {"\341\272\260", "ằ"},
-#line 458 "u8_lc_map.txt"
- {"\325\226", "ֆ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 834 "u8_lc_map.txt"
- {"\342\262\270", "ⲹ"},
-#line 831 "u8_lc_map.txt"
- {"\342\262\262", "ⲳ"},
- {""}, {""},
-#line 39 "u8_lc_map.txt"
- {"\303\207", "ç"},
- {""}, {""}, {""},
-#line 935 "u8_lc_map.txt"
- {"\352\236\200", "ꞁ"},
-#line 207 "u8_lc_map.txt"
- {"\310\256", "ȯ"},
-#line 177 "u8_lc_map.txt"
- {"\307\264", "ǵ"},
-#line 215 "u8_lc_map.txt"
- {"\311\203", "ƀ"},
-#line 494 "u8_lc_map.txt"
- {"\341\203\203", "ⴣ"},
-#line 212 "u8_lc_map.txt"
- {"\310\275", "ƚ"},
-#line 121 "u8_lc_map.txt"
- {"\305\270", "ÿ"},
- {""}, {""},
-#line 648 "u8_lc_map.txt"
- {"\341\274\275", "ἵ"},
- {""}, {""},
-#line 701 "u8_lc_map.txt"
- {"\341\277\213", "ή"},
- {""},
-#line 135 "u8_lc_map.txt"
- {"\306\220", "ɛ"},
- {""}, {""},
-#line 424 "u8_lc_map.txt"
- {"\324\264", "դ"},
-#line 35 "u8_lc_map.txt"
- {"\303\203", "ã"},
- {""}, {""}, {""},
-#line 722 "u8_lc_map.txt"
- {"\342\222\272", "ⓔ"},
-#line 767 "u8_lc_map.txt"
- {"\342\260\227", "ⱇ"},
-#line 53 "u8_lc_map.txt"
- {"\303\225", "õ"},
- {""},
-#line 303 "u8_lc_map.txt"
- {"\320\231", "й"},
-#line 118 "u8_lc_map.txt"
- {"\305\262", "ų"},
-#line 952 "u8_lc_map.txt"
- {"\357\274\246", "ｆ"},
-#line 736 "u8_lc_map.txt"
- {"\342\223\210", "ⓢ"},
- {""}, {""},
-#line 381 "u8_lc_map.txt"
- {"\323\230", "ә"},
-#line 117 "u8_lc_map.txt"
- {"\305\260", "ű"},
- {""}, {""},
-#line 283 "u8_lc_map.txt"
- {"\320\205", "ѕ"},
-#line 617 "u8_lc_map.txt"
- {"\341\273\270", "ỹ"},
-#line 614 "u8_lc_map.txt"
- {"\341\273\262", "ỳ"},
- {""},
-#line 128 "u8_lc_map.txt"
- {"\306\206", "ɔ"},
-#line 367 "u8_lc_map.txt"
- {"\322\272", "һ"},
-#line 355 "u8_lc_map.txt"
- {"\322\242", "ң"},
-#line 755 "u8_lc_map.txt"
- {"\342\260\213", "ⰻ"},
- {""}, {""},
-#line 976 "u8_lc_map.txt"
- {"\360\220\220\203", "𐐫"},
-#line 738 "u8_lc_map.txt"
- {"\342\223\212", "ⓤ"},
- {""},
-#line 992 "u8_lc_map.txt"
- {"\360\220\220\223", "𐐻"},
- {""}, {""},
-#line 307 "u8_lc_map.txt"
- {"\320\235", "н"},
- {""},
-#line 452 "u8_lc_map.txt"
- {"\325\220", "ր"},
-#line 838 "u8_lc_map.txt"
- {"\342\263\200", "ⳁ"},
-#line 96 "u8_lc_map.txt"
- {"\305\205", "ņ"},
-#line 79 "u8_lc_map.txt"
- {"\304\242", "ģ"},
- {""}, {""},
-#line 1005 "u8_lc_map.txt"
- {"\360\220\220\240", "𐑈"},
- {""},
-#line 707 "u8_lc_map.txt"
- {"\341\277\250", "ῠ"},
- {""}, {""},
-#line 806 "u8_lc_map.txt"
- {"\342\262\200", "ⲁ"},
- {""},
-#line 837 "u8_lc_map.txt"
- {"\342\262\276", "ⲿ"},
-#line 833 "u8_lc_map.txt"
- {"\342\262\266", "ⲷ"},
- {""}, {""},
-#line 133 "u8_lc_map.txt"
- {"\306\216", "ǝ"},
- {""},
-#line 45 "u8_lc_map.txt"
- {"\303\215", "í"},
- {""}, {""},
-#line 400 "u8_lc_map.txt"
- {"\323\276", "ӿ"},
-#line 577 "u8_lc_map.txt"
- {"\341\272\250", "ẩ"},
- {""}, {""},
-#line 442 "u8_lc_map.txt"
- {"\325\206", "ն"},
- {""}, {""},
-#line 779 "u8_lc_map.txt"
- {"\342\260\243", "ⱓ"},
- {""}, {""}, {""},
-#line 704 "u8_lc_map.txt"
- {"\341\277\231", "ῑ"},
- {""},
-#line 412 "u8_lc_map.txt"
- {"\324\226", "ԗ"},
- {""}, {""}, {""},
-#line 784 "u8_lc_map.txt"
- {"\342\260\250", "ⱘ"},
- {""}, {""},
-#line 278 "u8_lc_map.txt"
- {"\320\200", "ѐ"},
- {""},
-#line 200 "u8_lc_map.txt"
- {"\310\240", "ƞ"},
- {""}, {""}, {""},
-#line 49 "u8_lc_map.txt"
- {"\303\221", "ñ"},
- {""},
-#line 1000 "u8_lc_map.txt"
- {"\360\220\220\233", "𐑃"},
- {""}, {""},
-#line 740 "u8_lc_map.txt"
- {"\342\223\214", "ⓦ"},
-#line 388 "u8_lc_map.txt"
- {"\323\246", "ӧ"},
- {""},
-#line 589 "u8_lc_map.txt"
- {"\341\273\200", "ề"},
-#line 450 "u8_lc_map.txt"
- {"\325\216", "վ"},
-#line 620 "u8_lc_map.txt"
- {"\341\273\276", "ỿ"},
-#line 616 "u8_lc_map.txt"
- {"\341\273\266", "ỷ"},
-#line 237 "u8_lc_map.txt"
- {"\316\225", "ε"},
- {""},
-#line 781 "u8_lc_map.txt"
- {"\342\260\245", "ⱕ"},
-#line 302 "u8_lc_map.txt"
- {"\320\230", "и"},
-#line 769 "u8_lc_map.txt"
- {"\342\260\231", "ⱉ"},
-#line 721 "u8_lc_map.txt"
- {"\342\222\271", "ⓓ"},
- {""}, {""}, {""},
-#line 149 "u8_lc_map.txt"
- {"\306\251", "ʃ"},
-#line 734 "u8_lc_map.txt"
- {"\342\223\206", "ⓠ"},
- {""}, {""},
-#line 712 "u8_lc_map.txt"
- {"\341\277\270", "ὸ"},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 783 "u8_lc_map.txt"
- {"\342\260\247", "ⱗ"},
- {""}, {""},
-#line 105 "u8_lc_map.txt"
- {"\305\230", "ř"},
- {""},
-#line 252 "u8_lc_map.txt"
- {"\316\245", "υ"},
-#line 775 "u8_lc_map.txt"
- {"\342\260\237", "ⱏ"},
-#line 168 "u8_lc_map.txt"
- {"\307\236", "ǟ"},
-#line 585 "u8_lc_map.txt"
- {"\341\272\270", "ẹ"},
-#line 582 "u8_lc_map.txt"
- {"\341\272\262", "ẳ"},
- {""}, {""},
-#line 174 "u8_lc_map.txt"
- {"\307\252", "ǫ"},
-#line 699 "u8_lc_map.txt"
- {"\341\277\211", "έ"},
- {""},
-#line 996 "u8_lc_map.txt"
- {"\360\220\220\227", "𐐿"},
- {""},
-#line 361 "u8_lc_map.txt"
- {"\322\256", "ү"},
-#line 727 "u8_lc_map.txt"
- {"\342\222\277", "ⓙ"},
- {""}, {""}, {""},
-#line 416 "u8_lc_map.txt"
- {"\324\236", "ԟ"},
- {""},
-#line 431 "u8_lc_map.txt"
- {"\324\273", "ի"},
-#line 409 "u8_lc_map.txt"
- {"\324\220", "ԑ"},
- {""},
-#line 338 "u8_lc_map.txt"
- {"\321\270", "ѹ"},
- {""},
-#line 305 "u8_lc_map.txt"
- {"\320\233", "л"},
- {""}, {""},
-#line 85 "u8_lc_map.txt"
- {"\304\256", "į"},
-#line 743 "u8_lc_map.txt"
- {"\342\223\217", "ⓩ"},
-#line 254 "u8_lc_map.txt"
- {"\316\247", "χ"},
-#line 984 "u8_lc_map.txt"
- {"\360\220\220\213", "𐐳"},
-#line 92 "u8_lc_map.txt"
- {"\304\275", "ľ"},
-#line 93 "u8_lc_map.txt"
- {"\304\277", "ŀ"},
- {""},
-#line 792 "u8_lc_map.txt"
- {"\342\261\242", "ɫ"},
- {""}, {""}, {""}, {""},
-#line 753 "u8_lc_map.txt"
- {"\342\260\211", "ⰹ"},
- {""}, {""},
-#line 51 "u8_lc_map.txt"
- {"\303\223", "ó"},
-#line 335 "u8_lc_map.txt"
- {"\321\262", "ѳ"},
-#line 429 "u8_lc_map.txt"
- {"\324\271", "թ"},
- {""},
-#line 404 "u8_lc_map.txt"
- {"\324\206", "ԇ"},
- {""}, {""},
-#line 334 "u8_lc_map.txt"
- {"\321\260", "ѱ"},
- {""}, {""}, {""},
-#line 233 "u8_lc_map.txt"
- {"\316\221", "α"},
-#line 316 "u8_lc_map.txt"
- {"\320\246", "ц"},
- {""}, {""},
-#line 43 "u8_lc_map.txt"
- {"\303\213", "ë"},
-#line 645 "u8_lc_map.txt"
- {"\341\274\272", "ἲ"},
-#line 248 "u8_lc_map.txt"
- {"\316\240", "π"},
- {""}, {""},
-#line 158 "u8_lc_map.txt"
- {"\306\270", "ƹ"},
-#line 948 "u8_lc_map.txt"
- {"\357\274\242", "ｂ"},
- {""}, {""}, {""},
-#line 398 "u8_lc_map.txt"
- {"\323\272", "ӻ"},
-#line 386 "u8_lc_map.txt"
- {"\323\242", "ӣ"},
-#line 799 "u8_lc_map.txt"
- {"\342\261\256", "ɱ"},
-#line 1008 "u8_lc_map.txt"
- {"\360\220\220\243", "𐑋"},
- {""}, {""},
-#line 340 "u8_lc_map.txt"
- {"\321\274", "ѽ"},
-#line 112 "u8_lc_map.txt"
- {"\305\246", "ŧ"},
- {""},
-#line 561 "u8_lc_map.txt"
- {"\341\272\200", "ẁ"},
-#line 408 "u8_lc_map.txt"
- {"\324\216", "ԏ"},
-#line 588 "u8_lc_map.txt"
- {"\341\272\276", "ế"},
-#line 584 "u8_lc_map.txt"
- {"\341\272\266", "ặ"},
-#line 773 "u8_lc_map.txt"
- {"\342\260\235", "ⱍ"},
- {""},
-#line 156 "u8_lc_map.txt"
- {"\306\265", "ƶ"},
-#line 154 "u8_lc_map.txt"
- {"\306\262", "ʋ"},
- {""}, {""},
-#line 797 "u8_lc_map.txt"
- {"\342\261\253", "ⱬ"},
- {""}, {""}, {""}, {""}, {""},
-#line 744 "u8_lc_map.txt"
- {"\342\260\200", "ⰰ"},
- {""}, {""}, {""}, {""}, {""},
-#line 960 "u8_lc_map.txt"
- {"\357\274\256", "ｎ"},
-#line 293 "u8_lc_map.txt"
- {"\320\217", "џ"},
- {""}, {""}, {""},
-#line 1010 "u8_lc_map.txt"
- {"\360\220\220\245", "𐑍"},
- {""},
-#line 998 "u8_lc_map.txt"
- {"\360\220\220\231", "𐑁"},
- {""}, {""}, {""},
-#line 354 "u8_lc_map.txt"
- {"\322\240", "ҡ"},
-#line 777 "u8_lc_map.txt"
- {"\342\260\241", "ⱑ"},
- {""}, {""},
-#line 159 "u8_lc_map.txt"
- {"\306\274", "ƽ"},
- {""},
-#line 957 "u8_lc_map.txt"
- {"\357\274\253", "ｋ"},
- {""}, {""}, {""}, {""}, {""},
-#line 1012 "u8_lc_map.txt"
- {"\360\220\220\247", "𐑏"},
- {""}, {""},
-#line 78 "u8_lc_map.txt"
- {"\304\240", "ġ"},
-#line 658 "u8_lc_map.txt"
- {"\341\275\233", "ὓ"},
- {""},
-#line 1004 "u8_lc_map.txt"
- {"\360\220\220\237", "𐑇"},
-#line 143 "u8_lc_map.txt"
- {"\306\235", "ɲ"},
- {""}, {""}, {""},
-#line 235 "u8_lc_map.txt"
- {"\316\223", "γ"},
-#line 632 "u8_lc_map.txt"
- {"\341\274\233", "ἓ"},
- {""}, {""}, {""}, {""},
-#line 720 "u8_lc_map.txt"
- {"\342\222\270", "ⓒ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""},
-#line 441 "u8_lc_map.txt"
- {"\325\205", "յ"},
-#line 312 "u8_lc_map.txt"
- {"\320\242", "т"},
- {""},
-#line 644 "u8_lc_map.txt"
- {"\341\274\271", "ἱ"},
- {""}, {""},
-#line 742 "u8_lc_map.txt"
- {"\342\223\216", "ⓨ"},
-#line 966 "u8_lc_map.txt"
- {"\357\274\264", "ｔ"},
- {""}, {""},
-#line 373 "u8_lc_map.txt"
- {"\323\207", "ӈ"},
- {""}, {""},
-#line 982 "u8_lc_map.txt"
- {"\360\220\220\211", "𐐱"},
- {""},
-#line 276 "u8_lc_map.txt"
- {"\317\276", "ͼ"},
- {""}, {""}, {""}, {""}, {""},
-#line 110 "u8_lc_map.txt"
- {"\305\242", "ţ"},
-#line 741 "u8_lc_map.txt"
- {"\342\223\215", "ⓧ"},
- {""},
-#line 491 "u8_lc_map.txt"
- {"\341\203\200", "ⴠ"},
-#line 392 "u8_lc_map.txt"
- {"\323\256", "ӯ"},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 371 "u8_lc_map.txt"
- {"\323\203", "ӄ"},
- {""}, {""}, {""},
-#line 650 "u8_lc_map.txt"
- {"\341\274\277", "ἷ"},
- {""},
-#line 654 "u8_lc_map.txt"
- {"\341\275\213", "ὃ"},
- {""},
-#line 180 "u8_lc_map.txt"
- {"\307\270", "ǹ"},
-#line 141 "u8_lc_map.txt"
- {"\306\230", "ƙ"},
- {""}, {""}, {""},
-#line 341 "u8_lc_map.txt"
- {"\321\276", "ѿ"},
-#line 624 "u8_lc_map.txt"
- {"\341\274\213", "ἃ"},
-#line 266 "u8_lc_map.txt"
- {"\317\246", "ϧ"},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 1002 "u8_lc_map.txt"
- {"\360\220\220\235", "𐑅"},
-#line 428 "u8_lc_map.txt"
- {"\324\270", "ը"},
- {""}, {""}, {""}, {""},
-#line 436 "u8_lc_map.txt"
- {"\325\200", "հ"},
-#line 726 "u8_lc_map.txt"
- {"\342\222\276", "ⓘ"},
-#line 718 "u8_lc_map.txt"
- {"\342\222\266", "ⓐ"},
- {""}, {""}, {""},
-#line 973 "u8_lc_map.txt"
- {"\360\220\220\200", "𐐨"},
- {""}, {""}, {""}, {""}, {""},
-#line 803 "u8_lc_map.txt"
- {"\342\261\265", "ⱶ"},
- {""}, {""},
-#line 425 "u8_lc_map.txt"
- {"\324\265", "ե"},
-#line 422 "u8_lc_map.txt"
- {"\324\262", "բ"},
-#line 329 "u8_lc_map.txt"
- {"\321\246", "ѧ"},
- {""}, {""},
-#line 166 "u8_lc_map.txt"
- {"\307\231", "ǚ"},
-#line 733 "u8_lc_map.txt"
- {"\342\223\205", "ⓟ"},
- {""}, {""},
-#line 1006 "u8_lc_map.txt"
- {"\360\220\220\241", "𐑉"},
- {""}, {""},
-#line 376 "u8_lc_map.txt"
- {"\323\215", "ӎ"},
-#line 661 "u8_lc_map.txt"
- {"\341\275\250", "ὠ"},
- {""}, {""},
-#line 182 "u8_lc_map.txt"
- {"\307\274", "ǽ"},
-#line 259 "u8_lc_map.txt"
- {"\317\217", "ϗ"},
- {""}, {""},
-#line 285 "u8_lc_map.txt"
- {"\320\207", "ї"},
-#line 635 "u8_lc_map.txt"
- {"\341\274\250", "ἠ"},
- {""}, {""}, {""}, {""},
-#line 967 "u8_lc_map.txt"
- {"\357\274\265", "ｕ"},
- {""}, {""}, {""}, {""},
-#line 432 "u8_lc_map.txt"
- {"\324\274", "լ"},
- {""}, {""}, {""},
-#line 324 "u8_lc_map.txt"
- {"\320\256", "ю"},
- {""},
-#line 969 "u8_lc_map.txt"
- {"\357\274\267", "ｗ"},
-#line 657 "u8_lc_map.txt"
- {"\341\275\231", "ὑ"},
- {""},
-#line 97 "u8_lc_map.txt"
- {"\305\207", "ň"},
- {""},
-#line 281 "u8_lc_map.txt"
- {"\320\203", "ѓ"},
- {""}, {""}, {""},
-#line 630 "u8_lc_map.txt"
- {"\341\274\231", "ἑ"},
-#line 385 "u8_lc_map.txt"
- {"\323\240", "ӡ"},
-#line 299 "u8_lc_map.txt"
- {"\320\225", "е"},
- {""},
-#line 204 "u8_lc_map.txt"
- {"\310\250", "ȩ"},
- {""}, {""}, {""}, {""},
-#line 116 "u8_lc_map.txt"
- {"\305\256", "ů"},
-#line 239 "u8_lc_map.txt"
- {"\316\227", "η"},
- {""},
-#line 732 "u8_lc_map.txt"
- {"\342\223\204", "ⓞ"},
-#line 124 "u8_lc_map.txt"
- {"\305\275", "ž"},
-#line 660 "u8_lc_map.txt"
- {"\341\275\237", "ὗ"},
-#line 365 "u8_lc_map.txt"
- {"\322\266", "ҷ"},
-#line 95 "u8_lc_map.txt"
- {"\305\203", "ń"},
- {""}, {""}, {""},
-#line 735 "u8_lc_map.txt"
- {"\342\223\207", "ⓡ"},
- {""}, {""}, {""},
-#line 274 "u8_lc_map.txt"
- {"\317\272", "ϻ"},
-#line 264 "u8_lc_map.txt"
- {"\317\242", "ϣ"},
- {""},
-#line 315 "u8_lc_map.txt"
- {"\320\245", "х"},
- {""}, {""},
-#line 89 "u8_lc_map.txt"
- {"\304\266", "ķ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 643 "u8_lc_map.txt"
- {"\341\274\270", "ἰ"},
-#line 134 "u8_lc_map.txt"
- {"\306\217", "ə"},
- {""}, {""},
-#line 401 "u8_lc_map.txt"
- {"\324\200", "ԁ"},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 291 "u8_lc_map.txt"
- {"\320\215", "ѝ"},
-#line 652 "u8_lc_map.txt"
- {"\341\275\211", "ὁ"},
- {""},
-#line 339 "u8_lc_map.txt"
- {"\321\272", "ѻ"},
-#line 327 "u8_lc_map.txt"
- {"\321\242", "ѣ"},
-#line 317 "u8_lc_map.txt"
- {"\320\247", "ч"},
-#line 224 "u8_lc_map.txt"
- {"\315\262", "ͳ"},
- {""},
-#line 41 "u8_lc_map.txt"
- {"\303\211", "é"},
-#line 622 "u8_lc_map.txt"
- {"\341\274\211", "ἁ"},
- {""}, {""},
-#line 223 "u8_lc_map.txt"
- {"\315\260", "ͱ"},
- {""},
-#line 413 "u8_lc_map.txt"
- {"\324\230", "ԙ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 272 "u8_lc_map.txt"
- {"\317\267", "ϸ"},
- {""}, {""}, {""}, {""},
-#line 295 "u8_lc_map.txt"
- {"\320\221", "б"},
-#line 451 "u8_lc_map.txt"
- {"\325\217", "տ"},
- {""}, {""}, {""}, {""},
-#line 310 "u8_lc_map.txt"
- {"\320\240", "р"},
- {""}, {""},
-#line 375 "u8_lc_map.txt"
- {"\323\213", "ӌ"},
- {""}, {""}, {""},
-#line 659 "u8_lc_map.txt"
- {"\341\275\235", "ὕ"},
-#line 183 "u8_lc_map.txt"
- {"\307\276", "ǿ"},
-#line 146 "u8_lc_map.txt"
- {"\306\242", "ƣ"},
-#line 167 "u8_lc_map.txt"
- {"\307\233", "ǜ"},
- {""}, {""}, {""}, {""},
-#line 634 "u8_lc_map.txt"
- {"\341\274\235", "ἕ"},
- {""}, {""},
-#line 255 "u8_lc_map.txt"
- {"\316\250", "ψ"},
- {""},
-#line 109 "u8_lc_map.txt"
- {"\305\240", "š"},
- {""}, {""},
-#line 434 "u8_lc_map.txt"
- {"\324\276", "ծ"},
- {""}, {""}, {""}, {""}, {""},
-#line 649 "u8_lc_map.txt"
- {"\341\274\276", "ἶ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 972 "u8_lc_map.txt"
- {"\357\274\272", "ｚ"},
-#line 172 "u8_lc_map.txt"
- {"\307\246", "ǧ"},
-#line 791 "u8_lc_map.txt"
- {"\342\261\240", "ⱡ"},
- {""}, {""},
-#line 249 "u8_lc_map.txt"
- {"\316\241", "ρ"},
- {""}, {""}, {""},
-#line 270 "u8_lc_map.txt"
- {"\317\256", "ϯ"},
- {""}, {""}, {""},
-#line 275 "u8_lc_map.txt"
- {"\317\275", "ͻ"},
-#line 277 "u8_lc_map.txt"
- {"\317\277", "ͽ"},
- {""},
-#line 420 "u8_lc_map.txt"
- {"\324\246", "ԧ"},
-#line 731 "u8_lc_map.txt"
- {"\342\223\203", "ⓝ"},
- {""}, {""},
-#line 157 "u8_lc_map.txt"
- {"\306\267", "ʒ"},
- {""},
-#line 668 "u8_lc_map.txt"
- {"\341\275\257", "ὧ"},
- {""},
-#line 228 "u8_lc_map.txt"
- {"\316\211", "ή"},
- {""}, {""}, {""}, {""},
-#line 358 "u8_lc_map.txt"
- {"\322\250", "ҩ"},
-#line 642 "u8_lc_map.txt"
- {"\341\274\257", "ἧ"},
- {""}, {""}, {""},
-#line 297 "u8_lc_map.txt"
- {"\320\223", "г"},
- {""}, {""}, {""}, {""},
-#line 333 "u8_lc_map.txt"
- {"\321\256", "ѯ"},
- {""}, {""}, {""}, {""},
-#line 82 "u8_lc_map.txt"
- {"\304\250", "ĩ"},
- {""},
-#line 161 "u8_lc_map.txt"
- {"\307\217", "ǐ"},
- {""}, {""},
-#line 289 "u8_lc_map.txt"
- {"\320\213", "ћ"},
- {""}, {""}, {""}, {""}, {""},
-#line 396 "u8_lc_map.txt"
- {"\323\266", "ӷ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 129 "u8_lc_map.txt"
- {"\306\207", "ƈ"},
- {""}, {""},
-#line 801 "u8_lc_map.txt"
- {"\342\261\260", "ɒ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""},
-#line 151 "u8_lc_map.txt"
- {"\306\256", "ʈ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 962 "u8_lc_map.txt"
- {"\357\274\260", "ｐ"},
-#line 971 "u8_lc_map.txt"
- {"\357\274\271", "ｙ"},
- {""},
-#line 181 "u8_lc_map.txt"
- {"\307\272", "ǻ"},
-#line 170 "u8_lc_map.txt"
- {"\307\242", "ǣ"},
-#line 805 "u8_lc_map.txt"
- {"\342\261\277", "ɀ"},
- {""}, {""},
-#line 443 "u8_lc_map.txt"
- {"\325\207", "շ"},
- {""},
-#line 263 "u8_lc_map.txt"
- {"\317\240", "ϡ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 430 "u8_lc_map.txt"
- {"\324\272", "ժ"},
-#line 418 "u8_lc_map.txt"
- {"\324\242", "ԣ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 963 "u8_lc_map.txt"
- {"\357\274\261", "ｑ"},
-#line 439 "u8_lc_map.txt"
- {"\325\203", "ճ"},
- {""}, {""}, {""}, {""}, {""},
-#line 457 "u8_lc_map.txt"
- {"\325\225", "օ"},
- {""}, {""}, {""},
-#line 326 "u8_lc_map.txt"
- {"\321\240", "ѡ"},
- {""}, {""}, {""},
-#line 739 "u8_lc_map.txt"
- {"\342\223\213", "ⓥ"},
-#line 247 "u8_lc_map.txt"
- {"\316\237", "ο"},
- {""}, {""}, {""}, {""},
-#line 148 "u8_lc_map.txt"
- {"\306\247", "ƨ"},
- {""}, {""}, {""},
-#line 179 "u8_lc_map.txt"
- {"\307\267", "ƿ"},
-#line 793 "u8_lc_map.txt"
- {"\342\261\243", "ᵽ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 120 "u8_lc_map.txt"
- {"\305\266", "ŷ"},
- {""}, {""}, {""}, {""},
-#line 427 "u8_lc_map.txt"
- {"\324\267", "է"},
- {""}, {""}, {""}, {""},
-#line 136 "u8_lc_map.txt"
- {"\306\221", "ƒ"},
- {""}, {""}, {""}, {""}, {""},
-#line 145 "u8_lc_map.txt"
- {"\306\240", "ơ"},
- {""}, {""}, {""},
-#line 949 "u8_lc_map.txt"
- {"\357\274\243", "ｃ"},
-#line 449 "u8_lc_map.txt"
- {"\325\215", "ս"},
- {""}, {""}, {""},
-#line 301 "u8_lc_map.txt"
- {"\320\227", "з"},
- {""}, {""}, {""}, {""},
-#line 954 "u8_lc_map.txt"
- {"\357\274\250", "ｈ"},
- {""}, {""}, {""},
-#line 389 "u8_lc_map.txt"
- {"\323\250", "ө"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 795 "u8_lc_map.txt"
- {"\342\261\247", "ⱨ"},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 176 "u8_lc_map.txt"
- {"\307\256", "ǯ"},
-#line 453 "u8_lc_map.txt"
- {"\325\221", "ց"},
- {""}, {""},
-#line 951 "u8_lc_map.txt"
- {"\357\274\245", "ｅ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 164 "u8_lc_map.txt"
- {"\307\225", "ǖ"},
- {""}, {""}, {""}, {""},
-#line 802 "u8_lc_map.txt"
- {"\342\261\262", "ⱳ"},
-#line 433 "u8_lc_map.txt"
- {"\324\275", "խ"},
-#line 435 "u8_lc_map.txt"
- {"\324\277", "կ"},
- {""},
-#line 953 "u8_lc_map.txt"
- {"\357\274\247", "ｇ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 374 "u8_lc_map.txt"
- {"\323\211", "ӊ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 137 "u8_lc_map.txt"
- {"\306\223", "ɠ"},
- {""}, {""}, {""}, {""}, {""},
-#line 970 "u8_lc_map.txt"
- {"\357\274\270", "ｘ"},
-#line 964 "u8_lc_map.txt"
- {"\357\274\262", "ｒ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 132 "u8_lc_map.txt"
- {"\306\213", "ƌ"},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 160 "u8_lc_map.txt"
- {"\307\215", "ǎ"},
- {""}, {""}, {""},
-#line 737 "u8_lc_map.txt"
- {"\342\223\211", "ⓣ"},
- {""}, {""}, {""},
-#line 318 "u8_lc_map.txt"
- {"\320\250", "ш"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 455 "u8_lc_map.txt"
- {"\325\223", "փ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 113 "u8_lc_map.txt"
- {"\305\250", "ũ"},
-#line 162 "u8_lc_map.txt"
- {"\307\221", "ǒ"},
-#line 804 "u8_lc_map.txt"
- {"\342\261\276", "ȿ"},
- {""}, {""},
-#line 447 "u8_lc_map.txt"
- {"\325\213", "ջ"},
-#line 311 "u8_lc_map.txt"
- {"\320\241", "с"},
-#line 169 "u8_lc_map.txt"
- {"\307\240", "ǡ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 337 "u8_lc_map.txt"
- {"\321\266", "ѷ"},
- {""}, {""}, {""}, {""}, {""},
-#line 417 "u8_lc_map.txt"
- {"\324\240", "ԡ"},
- {""}, {""},
-#line 287 "u8_lc_map.txt"
- {"\320\211", "љ"},
-#line 153 "u8_lc_map.txt"
- {"\306\261", "ʊ"},
- {""}, {""},
-#line 728 "u8_lc_map.txt"
- {"\342\223\200", "ⓚ"},
- {""}, {""},
-#line 968 "u8_lc_map.txt"
- {"\357\274\266", "ｖ"},
- {""}, {""},
-#line 325 "u8_lc_map.txt"
- {"\320\257", "я"},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 800 "u8_lc_map.txt"
- {"\342\261\257", "ɐ"},
- {""}, {""}, {""}, {""},
-#line 947 "u8_lc_map.txt"
- {"\357\274\241", "ａ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""},
-#line 961 "u8_lc_map.txt"
- {"\357\274\257", "ｏ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 163 "u8_lc_map.txt"
- {"\307\223", "ǔ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""},
-#line 140 "u8_lc_map.txt"
- {"\306\227", "ɨ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""},
-#line 267 "u8_lc_map.txt"
- {"\317\250", "ϩ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 309 "u8_lc_map.txt"
- {"\320\237", "п"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""},
-#line 330 "u8_lc_map.txt"
- {"\321\250", "ѩ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 421 "u8_lc_map.txt"
- {"\324\261", "ա"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""},
-#line 178 "u8_lc_map.txt"
- {"\307\266", "ƕ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""},
-#line 426 "u8_lc_map.txt"
- {"\324\266", "զ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""},
-#line 165 "u8_lc_map.txt"
- {"\307\227", "ǘ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 130 "u8_lc_map.txt"
- {"\306\211", "ɖ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 152 "u8_lc_map.txt"
- {"\306\257", "ư"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""},
-#line 445 "u8_lc_map.txt"
- {"\325\211", "չ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""},
-#line 225 "u8_lc_map.txt"
- {"\315\266", "ͷ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""},
-#line 173 "u8_lc_map.txt"
- {"\307\250", "ǩ"},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""},
-#line 144 "u8_lc_map.txt"
- {"\306\237", "ɵ"}
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = u8_lc_hash (str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
- {
- register const char *s = wordlistkey.name;
-
- if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && slen == '\0')
- return &wordlistkey;
- }
- }
- return 0;
-}

deadbeef-0.6.2.tar.bz2/utf8.c Deleted

@@ -1,790 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- utf8 string manipulation
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-
-/* 
- based on Basic UTF-8 manipulation routines
- by Jeff Bezanson
- placed in the public domain Fall 2005
-*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-//#include <alloca.h>
-#include "ctype.h"
-#include "utf8.h"
-#include "u8_lc_map.h"
-
-static const uint32_t offsetsFromUTF86 = {
- 0x00000000UL, 0x00003080UL, 0x000E2080UL,
- 0x03C82080UL, 0xFA082080UL, 0x82082080UL
-};
-
-static const char trailingBytesForUTF8256 = {
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
- 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-/* conversions without error checking
- only works for valid UTF-8, i.e. no 5- or 6-byte sequences
- srcsz = source size in bytes, or -1 if 0-terminated
- sz = dest size in # of wide characters
-
- returns # characters converted
- dest will always be L'\0'-terminated, even if there isn't enough room
- for all the characters.
- if sz = srcsz+1 (i.e. 4*srcsz+4 bytes), there will always be enough space.
-*/
-int u8_toucs(uint32_t *dest, int32_t sz, const char *src, int32_t srcsz)
-{
- uint32_t ch;
- const char *src_end = src + srcsz;
- int32_t nb;
- int32_t i=0;
-
- while (i < sz-1) {
- nb = trailingBytesForUTF8(unsigned char)*src;
- if (srcsz == -1) {
- if (*src == 0)
- goto done_toucs;
- }
- else {
- if (src + nb >= src_end)
- goto done_toucs;
- }
- ch = 0;
- switch (nb) {
- /* these fall through deliberately */
- case 3: ch += (unsigned char)*src++; ch <<= 6;
- case 2: ch += (unsigned char)*src++; ch <<= 6;
- case 1: ch += (unsigned char)*src++; ch <<= 6;
- case 0: ch += (unsigned char)*src++;
- }
- ch -= offsetsFromUTF8nb;
- desti++ = ch;
- }
- done_toucs:
- desti = 0;
- return i;
-}
-
-/* srcsz = number of source characters, or -1 if 0-terminated
- sz = size of dest buffer in bytes
-
- returns # characters converted
- dest will only be '\0'-terminated if there is enough space. this is
- for consistency; imagine there are 2 bytes of space left, but the next
- character requires 3 bytes. in this case we could NUL-terminate, but in
- general we can't when there's insufficient space. therefore this function
- only NUL-terminates if all the characters fit, and there's space for
- the NUL as well.
- the destination string will never be bigger than the source string.
-*/
-int u8_toutf8(char *dest, int32_t sz, uint32_t *src, int32_t srcsz)
-{
- uint32_t ch;
- int32_t i = 0;
- char *dest_end = dest + sz;
-
- while (srcsz<0 ? srci!=0 : i < srcsz) {
- ch = srci;
- if (ch < 0x80) {
- if (dest >= dest_end)
- return i;
- *dest++ = (char)ch;
- }
- else if (ch < 0x800) {
- if (dest >= dest_end-1)
- return i;
- *dest++ = (ch>>6) | 0xC0;
- *dest++ = (ch & 0x3F) | 0x80;
- }
- else if (ch < 0x10000) {
- if (dest >= dest_end-2)
- return i;
- *dest++ = (ch>>12) | 0xE0;
- *dest++ = ((ch>>6) & 0x3F) | 0x80;
- *dest++ = (ch & 0x3F) | 0x80;
- }
- else if (ch < 0x200000) {
- if (dest >= dest_end-3)
- return i;
- *dest++ = (ch>>18) | 0xF0;
- *dest++ = ((ch>>12) & 0x3F) | 0x80;
- *dest++ = ((ch>>6) & 0x3F) | 0x80;
- *dest++ = (ch & 0x3F) | 0x80;
- }
- i++;
- }
- if (dest < dest_end)
- *dest = '\0';
- return i;
-}
-
-int u8_wc_toutf8(char *dest, wchar_t ch)
-{
- if (ch < 0x80) {
- dest0 = (char)ch;
- return 1;
- }
- if (ch < 0x800) {
- dest0 = (ch>>6) | 0xC0;
- dest1 = (ch & 0x3F) | 0x80;
- return 2;
- }
- if (ch < 0x10000) {
- dest0 = (ch>>12) | 0xE0;
- dest1 = ((ch>>6) & 0x3F) | 0x80;
- dest2 = (ch & 0x3F) | 0x80;
- return 3;
- }
- if (ch < 0x200000) {
- dest0 = (ch>>18) | 0xF0;
- dest1 = ((ch>>12) & 0x3F) | 0x80;
- dest2 = ((ch>>6) & 0x3F) | 0x80;
- dest3 = (ch & 0x3F) | 0x80;
- return 4;
- }
- return 0;
-}
-
-/* charnum => byte offset */
-int u8_offset(char *str, int32_t charnum)
-{
- int32_t offs=0;
-
- while (charnum > 0 && stroffs) {
- (void)(isutf(str++offs) || isutf(str++offs) ||
- isutf(str++offs) || ++offs);
- charnum--;
- }
- return offs;
-}
-
-/* byte offset => charnum */
-int u8_charnum(char *s, int32_t offset)
-{
- int32_t charnum = 0, offs=0;
-
- while (offs < offset && soffs) {
- (void)(isutf(s++offs) || isutf(s++offs) ||
- isutf(s++offs) || ++offs);
- charnum++;
- }
- return charnum;
-}
-
-/* number of characters */
-int u8_strlen(char *s)
-{
- int32_t count = 0;
- int32_t i = 0;
-
- while (u8_nextchar(s, &i) != 0)
- count++;
-
- return count;
-}
-
-/* reads the next utf-8 sequence out of a string, updating an index */
-uint32_t u8_nextchar(const char *s, int32_t *i)
-{
- uint32_t ch = 0;
- int32_t sz = 0;
-
- do {
- ch <<= 6;
- ch += (unsigned char)s(*i)++;
- sz++;
- } while (s*i && !isutf(s*i));
- ch -= offsetsFromUTF8sz-1;
-
- return ch;
-}
-
-void u8_inc(const char *s, int32_t *i)
-{
- (void)(isutf(s++(*i)) || isutf(s++(*i)) ||
- isutf(s++(*i)) || ++(*i));
-}
-
-void u8_dec(const char *s, int32_t *i)
-{
- (void)(isutf(s--(*i)) || isutf(s--(*i)) ||
- isutf(s--(*i)) || --(*i));
-}
-
-int octal_digit(char c)
-{
- return (c >= '0' && c <= '7');
-}
-
-int hex_digit(char c)
-{
- return ((c >= '0' && c <= '9') ||
- (c >= 'A' && c <= 'F') ||
- (c >= 'a' && c <= 'f'));
-}
-
-/* assumes that src points to the character after a backslash
- returns number of input characters processed */
-int u8_read_escape_sequence(const char *str, uint32_t *dest)
-{
- uint32_t ch;
- char digs="\0\0\0\0\0\0\0\0\0";
- int32_t dno=0, i=1;
-
- ch = (uint32_t)str0; /* take literal character */
- if (str0 == 'n')
- ch = L'\n';
- else if (str0 == 't')
- ch = L'\t';
- else if (str0 == 'r')
- ch = L'\r';
- else if (str0 == 'b')
- ch = L'\b';
- else if (str0 == 'f')
- ch = L'\f';
- else if (str0 == 'v')
- ch = L'\v';
- else if (str0 == 'a')
- ch = L'\a';
- else if (octal_digit(str0)) {
- i = 0;
- do {
- digsdno++ = stri++;
- } while (octal_digit(stri) && dno < 3);
- ch = strtol(digs, NULL, 8);
- }
- else if (str0 == 'x') {
- while (hex_digit(stri) && dno < 2) {
- digsdno++ = stri++;
- }
- if (dno > 0)
- ch = strtol(digs, NULL, 16);
- }
- else if (str0 == 'u') {
- while (hex_digit(stri) && dno < 4) {
- digsdno++ = stri++;
- }
- if (dno > 0)
- ch = strtol(digs, NULL, 16);
- }
- else if (str0 == 'U') {
- while (hex_digit(stri) && dno < 8) {
- digsdno++ = stri++;
- }
- if (dno > 0)
- ch = strtol(digs, NULL, 16);
- }
- *dest = ch;
-
- return i;
-}
-
-// convert a string with literal \uxxxx or \Uxxxxxxxx characters to UTF-8
-// example: u8_unescape(mybuf, 256, "hello\\u220e")
-// note the double backslash is needed if called on a C string literal
-int u8_unescape(char *buf, int32_t sz, const char *src)
-{
- int32_t c=0, amt;
- uint32_t ch;
- char temp4;
-
- while (*src && c < sz) {
- if (*src == '\\') {
- src++;
- amt = u8_read_escape_sequence(src, &ch);
- }
- else {
- ch = (uint32_t)*src;
- amt = 1;
- }
- src += amt;
- amt = u8_wc_toutf8(temp, ch);
- if (amt > sz-c)
- break;
- memcpy(&bufc, temp, amt);
- c += amt;
- }
- if (c < sz)
- bufc = '\0';
- return c;
-}
-
-int u8_escape_wchar(char *buf, int32_t sz, uint32_t ch)
-{
- if (ch == L'\n')
- return snprintf(buf, sz, "\\n");
- else if (ch == L'\t')
- return snprintf(buf, sz, "\\t");
- else if (ch == L'\r')
- return snprintf(buf, sz, "\\r");
- else if (ch == L'\b')
- return snprintf(buf, sz, "\\b");
- else if (ch == L'\f')
- return snprintf(buf, sz, "\\f");
- else if (ch == L'\v')
- return snprintf(buf, sz, "\\v");
- else if (ch == L'\a')
- return snprintf(buf, sz, "\\a");
- else if (ch == L'\\')
- return snprintf(buf, sz, "\\\\");
- else if (ch < 32 || ch == 0x7f)
- return snprintf(buf, sz, "\\x%hhX", (unsigned char)ch);
- else if (ch > 0xFFFF)
- return snprintf(buf, sz, "\\U%.8X", (uint32_t)ch);
- else if (ch >= 0x80 && ch <= 0xFFFF)
- return snprintf(buf, sz, "\\u%.4hX", (unsigned short)ch);
-
- return snprintf(buf, sz, "%c", (char)ch);
-}
-
-int u8_escape(char *buf, int32_t sz, const char *src, int32_t escape_quotes)
-{
- int32_t c=0, i=0, amt;
-
- while (srci && c < sz) {
- if (escape_quotes && srci == '"') {
- amt = snprintf(buf, sz - c, "\\\"");
- i++;
- }
- else {
- amt = u8_escape_wchar(buf, sz - c, u8_nextchar(src, &i));
- }
- c += amt;
- buf += amt;
- }
- if (c < sz)
- *buf = '\0';
- return c;
-}
-
-char *u8_strchr(char *s, uint32_t ch, int32_t *charn)
-{
- int32_t i = 0, lasti=0;
- uint32_t c;
-
- *charn = 0;
- while (si) {
- c = u8_nextchar(s, &i);
- if (c == ch) {
- return &slasti;
- }
- lasti = i;
- (*charn)++;
- }
- return NULL;
-}
-
-char *u8_memchr(char *s, uint32_t ch, size_t sz, int32_t *charn)
-{
- int32_t i = 0, lasti=0;
- uint32_t c;
- int32_t csz;
-
- *charn = 0;
- while (i < sz) {
- c = csz = 0;
- do {
- c <<= 6;
- c += (unsigned char)si++;
- csz++;
- } while (i < sz && !isutf(si));
- c -= offsetsFromUTF8csz-1;
-
- if (c == ch) {
- return &slasti;
- }
- lasti = i;
- (*charn)++;
- }
- return NULL;
-}
-
-int u8_is_locale_utf8(char *locale)
-{
- /* this code based on libutf8 */
- const char* cp = locale;
-
- for (; *cp != '\0' && *cp != '@' && *cp != '+' && *cp != ','; cp++) {
- if (*cp == '.') {
- const char* encoding = ++cp;
- for (; *cp != '\0' && *cp != '@' && *cp != '+' && *cp != ','; cp++)
- ;
- if ((cp-encoding == 5 && !strncmp(encoding, "UTF-8", 5))
- || (cp-encoding == 4 && !strncmp(encoding, "utf8", 4)))
- return 1; /* it's UTF-8 */
- break;
- }
- }
- return 0;
-}
-
-int u8_vprintf(char *fmt, va_list ap)
-{
- int32_t cnt, sz=0;
- char *buf;
- uint32_t *wcs;
-
- sz = 512;
- buf = (char*)alloca(sz);
- try_print:
- cnt = vsnprintf(buf, sz, fmt, ap);
- if (cnt >= sz) {
- buf = (char*)alloca(cnt - sz + 1);
- sz = cnt + 1;
- goto try_print;
- }
- wcs = (uint32_t*)alloca((cnt+1) * sizeof(uint32_t));
- cnt = u8_toucs(wcs, cnt+1, buf, cnt);
- printf("%ls", (wchar_t*)wcs);
- return cnt;
-}
-
-int u8_printf(char *fmt, ...)
-{
- int32_t cnt;
- va_list args;
-
- va_start(args, fmt);
-
- cnt = u8_vprintf(fmt, args);
-
- va_end(args);
- return cnt;
-}
-
-// adaptation of g_utf8_validate
-
-#define UTF8_COMPUTE(Char, Mask, Len) \
- if (Char < 128) \
- { \
- Len = 1; \
- Mask = 0x7f; \
- } \
- else if ((Char & 0xe0) == 0xc0) \
- { \
- Len = 2; \
- Mask = 0x1f; \
- } \
- else if ((Char & 0xf0) == 0xe0) \
- { \
- Len = 3; \
- Mask = 0x0f; \
- } \
- else if ((Char & 0xf8) == 0xf0) \
- { \
- Len = 4; \
- Mask = 0x07; \
- } \
- else if ((Char & 0xfc) == 0xf8) \
- { \
- Len = 5; \
- Mask = 0x03; \
- } \
- else if ((Char & 0xfe) == 0xfc) \
- { \
- Len = 6; \
- Mask = 0x01; \
- } \
- else \
- Len = -1;
-
-#define UTF8_LENGTH(Char) \
- ((Char) < 0x80 ? 1 : \
- ((Char) < 0x800 ? 2 : \
- ((Char) < 0x10000 ? 3 : \
- ((Char) < 0x200000 ? 4 : \
- ((Char) < 0x4000000 ? 5 : 6)))))
-
-
-#define UTF8_GET(Result, Chars, Count, Mask, Len) \
- (Result) = (Chars)0 & (Mask); \
- for ((Count) = 1; (Count) < (Len); ++(Count)) \
- { \
- if (((Chars)(Count) & 0xc0) != 0x80) \
- { \
- (Result) = -1; \
- break; \
- } \
- (Result) <<= 6; \
- (Result) |= ((Chars)(Count) & 0x3f); \
- }
-
-#define UNICODE_VALID(Char) \
- ((Char) < 0x110000 && \
- (((Char) & 0xFFFFF800) != 0xD800) && \
- ((Char) < 0xFDD0 || (Char) > 0xFDEF) && \
- ((Char) & 0xFFFE) != 0xFFFE)
-
-
-int u8_valid (const char *str,
- int max_len,
- const char **end)
-{
-
- const char *p;
-
- if (!str) {
- return 0;
- }
-
- if (end)
- *end = str;
-
- p = str;
-
- while ((max_len < 0 || (p - str) < max_len) && *p)
- {
- int i, mask = 0, len;
- int32_t result;
- unsigned char c = (unsigned char) *p;
-
- UTF8_COMPUTE (c, mask, len);
-
- if (len == -1)
- break;
-
- /* check that the expected number of bytes exists in str */
- if (max_len >= 0 &&
- ((max_len - (p - str)) < len))
- break;
-
- UTF8_GET (result, p, i, mask, len);
-
- if (UTF8_LENGTH (result) != len) /* Check for overlong UTF-8 */
- break;
-
- if (result == (int32_t)-1)
- break;
-
- if (!UNICODE_VALID (result))
- break;
-
- p += len;
- }
-
- if (end)
- *end = p;
-
- /* See that we covered the entire length if a length was
- * passed in, or that we ended on a nul if not
- */
- if (max_len >= 0 && p != (str + max_len) && *p != 0) {
- return 0;
- }
- else if (max_len < 0 && *p != '\0') {
- return 0;
- }
- return 1;
-}
-
-#if 0
-static const char lowerchars = "áéíñóúüäöåæøàçèêабвгдеёжзийклмнорпстуфхцчшщъыьэюя";
-static const char upperchars = "ÁÉÍÑÓÚÜÄÖÅÆØÀÇÈÊАБВГДЕЁЖЗИЙКЛМНОРПСТУФХЦЧШЩЪЫЬЭЮЯ";
-#endif
-
-int
-u8_tolower_slow (const char *input, int len, char *out) {
- struct u8_case_map_t *lc = u8_lc_in_word_set (input, len);
- if (lc) {
- int ll = strlen (lc->lower);
- memcpy (out, lc->lower, ll);
- outll = 0;
- return ll;
- }
- return 0;
-}
-
-int
-u8_tolower (const signed char *c, int l, char *out) {
- if (*c >= 65 && *c <= 90) {
- *out = *c + 0x20;//tolower (*c);
- out1 = 0;
- return 1;
- }
- else if (*c > 0) {
- *out = *c;
- out1 = 0;
- return 1;
- }
- else {
- int ll = u8_tolower_slow (c, l, out);
- if (ll) {
- return ll;
- }
- memcpy (out, c, l);
- outl = 0;
- return l;
- }
-}
-
-const char *
-utfcasestr (const char *s1, const char *s2) {
-#if 0 // small u8_tolower test
- while (*s2) {
- int32_t i = 0;
- u8_nextchar (s2, &i);
- const char *next = s2 + i;
- char lw10;
- int l = u8_tolower (s2, next-s2, lw);
- s2 = next;
- fprintf (stderr, "%s", lw);
- }
- fprintf (stderr, "\n");
- return NULL;
-#endif
- while (*s1) {
- const char *p1 = s1;
- const char *p2 = s2;
- while (*p2 && *p1) {
- int32_t i1 = 0;
- int32_t i2 = 0;
- char lw110;
- char lw210;
- const char *next;
- u8_nextchar (p1, &i1);
- u8_nextchar (p2, &i2);
- int l1 = u8_tolower (p1, i1, lw1);
- int l2 = u8_tolower (p2, i2, lw2);
- //fprintf (stderr, "comparing %s to %s\n", lw1, lw2);
- if (strcmp (lw1, lw2)) {
- //fprintf (stderr, "fail\n");
- break;
- }
- p1 += i1;
- p2 += i2;
- }
- if (*p2 == 0) {
- //fprintf (stderr, "%s found in %s\n", s2, s1);
- return p1;
- }
- int32_t i = 0;
- u8_nextchar (s1, &i);
- s1 += i;
- }
- return NULL;
-}
-
-#define min(x,y) ((x)<(y)?(x):(y))
-// s2 must be lowercase
-const char *
-utfcasestr_fast (const char *s1, const char *s2) {
- while (*s1) {
- const char *p1 = s1;
- const char *p2 = s2;
- while (*p2 && *p1) {
- int32_t i1 = 0;
- int32_t i2 = 0;
- char lw110;
- const char *next;
- u8_nextchar (p1, &i1);
- u8_nextchar (p2, &i2);
- int l1 = u8_tolower (p1, i1, lw1);
- if (memcmp (lw1, p2, min(i2,l1))) {
- break;
- }
- p1 += i1;
- p2 += i2;
- }
- if (*p2 == 0) {
- return p1;
- }
- int32_t i = 0;
- u8_nextchar (s1, &i);
- s1 += i;
- }
- return NULL;
-}
-
-int
-u8_strcasecmp (const char *a, const char *b) {
- const char *p1 = a, *p2 = b;
- while (*p1 && *p2) {
- int32_t i1 = 0;
- int32_t i2 = 0;
- char s110, s210;
- const char *next;
- u8_nextchar (p1, &i1);
- u8_nextchar (p2, &i2);
- int l1 = u8_tolower (p1, i1, s1);
- int l2 = u8_tolower (p2, i2, s2);
- int res = 0;
- if (l1 != l2) {
- res = l1-l2;
- }
- else {
- res = memcmp (s1, s2, l1);
- }
- if (res) {
- return res;
- }
- p1 += i1;
- p2 += i2;
- }
-
- if (*p1 == 0) {
- return -1;
- }
- else if (*p2 == 0) {
- return 1;
- }
-
- return 0;
-}
-
-void
-u8_lc_map_test (void) {
- struct u8_case_map_t *lc;
- lc = u8_lc_in_word_set ("Á", 2);
- printf ("%s -> %s\n", lc->name, lc->lower);
- lc = u8_lc_in_word_set ("É", 2);
- printf ("%s -> %s\n", lc->name, lc->lower);
- lc = u8_lc_in_word_set ("Í", 2);
- printf ("%s -> %s\n", lc->name, lc->lower);
- lc = u8_lc_in_word_set ("Ñ", 2);
- printf ("%s -> %s\n", lc->name, lc->lower);
- lc = u8_lc_in_word_set ("П", 2);
- printf ("%s -> %s\n", lc->name, lc->lower);
- lc = u8_lc_in_word_set ("Л", 2);
- printf ("%s -> %s\n", lc->name, lc->lower);
- lc = u8_lc_in_word_set ("А", 2);
- printf ("%s -> %s\n", lc->name, lc->lower);
-}

deadbeef-0.6.2.tar.bz2/utf8.h Deleted

@@ -1,126 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- utf8 string manipulation
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-
-/* 
- based on Basic UTF-8 manipulation routines
- by Jeff Bezanson
- placed in the public domain Fall 2005
-*/
-
-#ifndef __UTF8_H
-#define __UTF8_H
-
-#include <stdint.h>
-#include <stdarg.h>
-
-/* is c the start of a utf8 sequence? */
-#define isutf(c) (((c)&0xC0)!=0x80)
-
-/* convert UTF-8 data to wide character */
-int u8_toucs(uint32_t *dest, int32_t sz, const char *src, int32_t srcsz);
-
-/* the opposite conversion */
-int u8_toutf8(char *dest, int32_t sz, uint32_t *src, int32_t srcsz);
-
-/* single character to UTF-8 */
-int u8_wc_toutf8(char *dest, wchar_t ch);
-
-/* character number to byte offset */
-int u8_offset(char *str, int32_t charnum);
-
-/* byte offset to character number */
-int u8_charnum(char *s, int32_t offset);
-
-/* return next character, updating an index variable */
-uint32_t u8_nextchar(const char *s, int32_t *i);
-
-/* move to next character */
-void u8_inc(const char *s, int32_t *i);
-
-/* move to previous character */
-void u8_dec(const char *s, int32_t *i);
-
-/* assuming src points to the character after a backslash, read an
- escape sequence, storing the result in dest and returning the number of
- input characters processed */
-int u8_read_escape_sequence(const char *src, uint32_t *dest);
-
-/* given a wide character, convert it to an ASCII escape sequence stored in
- buf, where buf is "sz" bytes. returns the number of characters output. */
-int u8_escape_wchar(char *buf, int32_t sz, uint32_t ch);
-
-/* convert a string "src" containing escape sequences to UTF-8 */
-int u8_unescape(char *buf, int32_t sz, const char *src);
-
-/* convert UTF-8 "src" to ASCII with escape sequences.
- if escape_quotes is nonzero, quote characters will be preceded by
- backslashes as well. */
-int u8_escape(char *buf, int32_t sz, const char *src, int32_t escape_quotes);
-
-/* utility predicates used by the above */
-int octal_digit(char c);
-int hex_digit(char c);
-
-/* return a pointer to the first occurrence of ch in s, or NULL if not
- found. character index of found character returned in *charn. */
-char *u8_strchr(char *s, uint32_t ch, int32_t *charn);
-
-/* same as the above, but searches a buffer of a given size instead of
- a NUL-terminated string. */
-char *u8_memchr(char *s, uint32_t ch, size_t sz, int32_t *charn);
-
-/* count the number of characters in a UTF-8 string */
-int u8_strlen(char *s);
-
-int u8_is_locale_utf8(char *locale);
-
-/* printf where the format string and arguments may be in UTF-8.
- you can avoid this function and just use ordinary printf() if the current
- locale is UTF-8. */
-int u8_vprintf(char *fmt, va_list ap);
-int u8_printf(char *fmt, ...);
-
-// validate utf8 string
-// returns 1 if valid, 0 otherwise
-int u8_valid (const char *str,
- int max_len,
- const char **end);
-
-int
-u8_tolower (const signed char *c, int l, char *out);
-
-int
-u8_strcasecmp (const char *a, const char *b);
-
-const char *
-utfcasestr (const char *s1, const char *s2);
-
-// s2 must be lowercase
-const char *
-utfcasestr_fast (const char *s1, const char *s2);
-
-#endif

deadbeef-0.6.2.tar.bz2/vfs.c Deleted

@@ -1,108 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- high-level vfs access interface
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include <string.h>
-#include <stdio.h>
-#include "vfs.h"
-#include "plugins.h"
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
-
-DB_FILE *
-vfs_fopen (const char *fname) {
- trace ("vfs_open %s\n", fname);
- DB_vfs_t **plugs = plug_get_vfs_list ();
- DB_vfs_t *fallback = NULL;
- int i;
- for (i = 0; plugsi; i++) {
- DB_vfs_t *p = plugsi;
- if (!p->get_schemes) {
- fallback = p;
- continue;
- }
- int n;
- const char **scheme_names = p->get_schemes ();
- for (n = 0; scheme_namesn; n++) {
- size_t l = strlen (scheme_namesn);
- if (!strncasecmp (scheme_namesn, fname, l)) {
- return p->open (fname);
- }
- }
- }
- if (fallback) {
- return fallback->open (fname);
- }
- return NULL;
-}
-
-void vfs_set_track (DB_FILE *stream, DB_playItem_t *it) {
- if (stream->vfs->set_track) {
- stream->vfs->set_track (stream, it);
- }
-}
-
-void
-vfs_fclose (DB_FILE *stream) {
- return stream->vfs->close (stream);
-}
-
-size_t
-vfs_fread (void *ptr, size_t size, size_t nmemb, DB_FILE *stream) {
- return stream->vfs->read (ptr, size, nmemb, stream);
-}
-
-int
-vfs_fseek (DB_FILE *stream, int64_t offset, int whence) {
- return stream->vfs->seek (stream, offset, whence);
-}
-
-int64_t
-vfs_ftell (DB_FILE *stream) {
- return stream->vfs->tell (stream);
-}
-
-void
-vfs_rewind (DB_FILE *stream) {
- stream->vfs->rewind (stream);
-}
-
-int64_t
-vfs_fgetlength (DB_FILE *stream) {
- return stream->vfs->getlength (stream);
-}
-
-const char *
-vfs_get_content_type (DB_FILE *stream) {
- return stream->vfs->get_content_type (stream);
-}
-
-void
-vfs_fabort (DB_FILE *stream) {
- if (stream->vfs->abort) {
- stream->vfs->abort (stream);
- }
-}

deadbeef-0.6.2.tar.bz2/vfs.h Deleted

@@ -1,44 +0,0 @@
-/*
-  This file is part of Deadbeef Player source code
-  http://deadbeef.sourceforge.net
-
-  high-level vfs access interface
-
-  Copyright (C) 2009-2013 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
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Alexey Yakovenko waker@users.sourceforge.net
-*/
-
-#ifndef __VFS_H
-#define __VFS_H
-
-#include "deadbeef.h"
-
-DB_FILE* vfs_fopen (const char *fname);
-void vfs_set_track (DB_FILE *stream, DB_playItem_t *it);
-void vfs_fclose (DB_FILE *f);
-size_t vfs_fread (void *ptr, size_t size, size_t nmemb, DB_FILE *stream);
-int vfs_fseek (DB_FILE *stream, int64_t offset, int whence);
-int64_t vfs_ftell (DB_FILE *stream);
-void vfs_rewind (DB_FILE *stream);
-int64_t vfs_fgetlength (DB_FILE *stream);
-const char *vfs_get_content_type (DB_FILE *stream);
-void vfs_fabort (DB_FILE *stream);
-
-#endif // __VFS_H

deadbeef-0.6.2.tar.bz2/vfs_stdio.c Deleted

@@ -1,216 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- standard file vfs implementation
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include "deadbeef.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#ifndef __linux__
-#define off64_t off_t
-#define lseek64 lseek
-#define O_LARGEFILE 0
-#endif
-
-//#define USE_STDIO
-
-static DB_functions_t *deadbeef;
-typedef struct {
- DB_vfs_t *vfs;
-#ifdef USE_STDIO
- FILE *stream;
-#else
- int stream;
- int64_t offs;
-#endif
-} STDIO_FILE;
-
-static DB_vfs_t plugin;
-
-static DB_FILE *
-stdio_open (const char *fname) {
- if (!memcmp (fname, "file://", 7)) {
- fname += 7;
- }
-#ifdef USE_STDIO
- FILE *file = fopen (fname, "rb");
- if (!file) {
- return NULL;
- }
-#else
- int file = open (fname, O_LARGEFILE);
- if (file == -1) {
- return NULL;
- }
-#endif
- STDIO_FILE *fp = malloc (sizeof (STDIO_FILE));
- fp->vfs = &plugin;
- fp->stream = file;
-#ifndef USE_STDIO
- fp->offs = 0;
-#endif
- return (DB_FILE*)fp;
-}
-
-static void
-stdio_close (DB_FILE *stream) {
- assert (stream);
-#ifdef USE_STDIO
- fclose (((STDIO_FILE *)stream)->stream);
-#else
- close (((STDIO_FILE *)stream)->stream);
-#endif
- free (stream);
-}
-
-static size_t
-stdio_read (void *ptr, size_t size, size_t nmemb, DB_FILE *stream) {
- assert (stream);
- assert (ptr);
-#ifdef USE_STDIO
- return fread (ptr, size, nmemb, ((STDIO_FILE*)stream)->stream);
-#else
- int res = read (((STDIO_FILE*)stream)->stream, ptr, size*nmemb);
- if (res == -1) {
- return 0;
- }
- ((STDIO_FILE*)stream)->offs += res;
- return res / size;
-#endif
-}
-
-static int
-stdio_seek (DB_FILE *stream, int64_t offset, int whence) {
- assert (stream);
-#ifdef USE_STDIO
- return fseek (((STDIO_FILE *)stream)->stream, offset, whence);
-#else
- off64_t res = lseek64 (((STDIO_FILE *)stream)->stream, offset, whence);
- if (res == -1) {
- return -1;
- }
-// printf ("lseek res: %lld (%lld, %d, prev=%lld)\n", res, offset, whence, ((STDIO_FILE*)stream)->offs);
- ((STDIO_FILE*)stream)->offs = res; 
-#endif
- return 0;
-}
-
-static int64_t
-stdio_tell (DB_FILE *stream) {
- assert (stream);
-#ifdef USE_STDIO
- return ftell (((STDIO_FILE*)stream)->stream);
-#else
- return ((STDIO_FILE*)stream)->offs;
-#endif
-}
-
-static void
-stdio_rewind (DB_FILE *stream) {
- assert (stream);
-#ifdef USE_STDIO
- rewind (((STDIO_FILE*)stream)->stream);
-#else
- stdio_seek (stream, 0, SEEK_SET);
-#endif
-}
-
-static int64_t
-stdio_getlength (DB_FILE *stream) {
- assert (stream);
- STDIO_FILE *f = (STDIO_FILE *)stream;
-#ifdef USE_STDIO
- size_t offs = ftell (f->stream);
- fseek (f->stream, 0, SEEK_END);
- size_t l = ftell (f->stream);
- fseek (f->stream, offs, SEEK_SET);
- return l;
-#else
- int64_t size = lseek64 (f->stream, 0, SEEK_END);
- lseek64 (f->stream, f->offs, SEEK_SET);
- return size;
-#endif
-}
-
-const char *
-stdio_get_content_type (DB_FILE *stream) {
- return NULL;
-}
-
-int
-stdio_is_streaming (void) {
- return 0;
-}
-
-// standard stdio vfs
-static DB_vfs_t plugin = {
- DB_PLUGIN_SET_API_VERSION
- .plugin.version_major = 1,
- .plugin.version_minor = 0,
- .plugin.type = DB_PLUGIN_VFS,
- .plugin.name = "stdio vfs",
- .plugin.id = "vfs_stdio",
- .plugin.descr = "Standard IO plugin\nUsed for reading normal local files\nIt is statically linked, so you can't delete it.",
- .plugin.copyright = 
- "Copyright (C) 2009-2013 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",
- .open = stdio_open,
- .close = stdio_close,
- .read = stdio_read,
- .seek = stdio_seek,
- .tell = stdio_tell,
- .rewind = stdio_rewind,
- .getlength = stdio_getlength,
- .get_content_type = stdio_get_content_type,
- .is_streaming = stdio_is_streaming
-};
-
-DB_plugin_t *
-stdio_load (DB_functions_t *api) {
- deadbeef = api;
- return DB_PLUGIN (&plugin);
-}
-

deadbeef-0.6.2.tar.bz2/volume.c Deleted

@@ -1,102 +0,0 @@
-/*
- This file is part of Deadbeef Player source code
- http://deadbeef.sourceforge.net
-
- pcm volume manipulation routines
-
- Copyright (C) 2009-2013 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
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Alexey Yakovenko waker@users.sourceforge.net
-*/
-#include <math.h>
-#include <stdio.h>
-#include "volume.h"
-#include "conf.h"
-
-#define VOLUME_MIN (-50.f)
-
-static float volume_db = 0; // in dB
-static float volume_amp = 1; // amplitude 0..1
-static int audio_mute = 0;
-
-void
-volume_set_db (float dB) {
- if (dB < VOLUME_MIN) {
- dB = VOLUME_MIN;
- }
- if (dB > 0) {
- dB = 0;
- }
- conf_set_float ("playback.volume", dB);
- volume_db = dB;
- volume_amp = dB > VOLUME_MIN ? db_to_amp (dB) : 0;
- audio_mute = 0;
-}
-
-float
-volume_get_db (void) {
- return volume_db;
-}
-
-void
-volume_set_amp (float amp) {
- if (amp < 0) {
- amp = 0;
- }
- if (amp > 1) {
- amp = 1;
- }
- volume_amp = amp;
- volume_db = amp > 0 ? amp_to_db (amp) : VOLUME_MIN;
- conf_set_float ("playback.volume", volume_db);
- audio_mute = 0;
-}
-
-float
-volume_get_amp (void) {
- return volume_amp;
-}
-
-float
-db_to_amp (float dB) {
-// return pow (10, dB/20.f);
- // thanks to he for this hack
- const float ln10=2.3025850929940002f;
- return exp(ln10*dB/20.f);
-}
-
-float
-amp_to_db (float amp) {
- return 20*log10 (amp);
-}
-
-float
-volume_get_min_db (void) {
- return VOLUME_MIN;
-}
-
-void
-audio_set_mute (int mute) {
- audio_mute = mute;
-}
-
-int
-audio_is_mute (void) {
- return audio_mute;
-}

deadbeef-0.6.2.tar.bz2/volume.h Deleted

@@ -1,57 +0,0 @@
-/*
-  This file is part of Deadbeef Player source code
-  http://deadbeef.sourceforge.net
-
-  pcm volume manipulation routines
-
-  Copyright (C) 2009-2013 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
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Alexey Yakovenko waker@users.sourceforge.net
-*/
-#ifndef __VOLUME_H
-#define __VOLUME_H
-
-void
-volume_set_db (float dB);
-
-float
-volume_get_db (void);
-
-void
-volume_set_amp (float amp);
-
-float
-volume_get_amp (void);
-
-float
-db_to_amp (float dB);
-
-float
-amp_to_db (float amp);
-
-float
-volume_get_min_db (void);
-
-void
-audio_set_mute (int mute);
-
-int
-audio_is_mute (void);
-
-#endif // __VOLUME_H

deadbeef-0.6.2.tar.bz2/AUTHORS -> deadbeef-1.9.6.tar.bz2/AUTHORS Changed

deadbeef-0.6.2.tar.bz2/COPYING -> deadbeef-1.9.6.tar.bz2/COPYING Changed

@@ -1,13 +1,21 @@
 DeaDBeeF Player and DeaDBeeF Plugin SDK
-Copyright (C) 2009-2014 Alexey Yakovenko and contributors
+Copyright (C) 2009-2020 Oleksiy Yakovenko and contributors
 
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use of
+this software.
 
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
+the following restrictions:
 
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+1. The origin of this software must not be misrepresented; you must not claim
+that you wrote the original software. If you use this software in a product, an
+acknowledgment in the product documentation would be appreciated but is not
+required.
 
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
 
 3. This notice may not be removed or altered from any source distribution.
 
@@ -15,7 +23,8 @@
 
 DeaDBeeF Plugins
 
-For plugin copying information, please see COPYING in plugin subdirectory.
+For plugin copyright information, please look for license files in each
+individual plugin's directory.

deadbeef-0.6.2.tar.bz2/ChangeLog -> deadbeef-1.9.6.tar.bz2/ChangeLog Changed

@@ -1,3 +1,452 @@
+version 1.9.6
+	Fixed: Drawing spectrum analyzer in discrete frequencies mode
+	Fixed: Handling the option to enter archives when scanning folders (fudanchii)
+	Fixed: Playback performance issue when searching in large playlist
+	Fixed: Possible crash when starting playback with ALSA plugin
+	Fixed: Shuffle albums was not using Album Artist
+	Fixed: Title formatting failure with large calculated values
+	Fixed: Loading of small album art image files
+	Fixed: MP4 parser failing to read/write certain tags correctly
+	Fixed: Handling of title-formatted paths
+	Fixed: A bug when editing metadata in multiple selected tracks
+	Fixed: OSD notification reuse by default, with an option to disable
+	Added: Bit depth override option (HiFiPhile)
+	Added: DSD DoP support for ALSA/FFMPEG plugins (HiFiPhile)
+	Added: $put, $puts, $get title formatting functions (Robin Ekman)
+
+version 1.9.5
+	Fixed: GME chiptune voice muting was affecting converter / replaygain scanner
+	Fixed: SID chiptune voice muting was affecting converter / replaygain scanner
+	Fixed: SID stereo was not working the way it was intended
+	Fixed: Wave format conversion regressions, which could lead to wrong channels mapping
+	Fixed: Converter race condition bug when checking whether a directory exists (dakeryas)
+	Fixed: Album art fetching for tracks with multiple artists
+	Fixed: GTK warning when opening track properties
+	Fixed: Prompting before deleting playlist via middle mouse button
+	Fixed: Album art left/right/center alignment in GTKUI
+	Fixed: Removed embedded album art size limit for ID3v2 tags
+	Fixed: Deadlock when trying to delete files from disk
+	Fixed: Mute functionality for output plugins with their own volume control
+	Fixed: Switching to previous/next track after the current track is removed
+	Fixed: Incorrect playlist affected by hotkeys
+	Fixed: Unsynchronized ID3v2 tag loading (credit: Robin Seth Ekman)
+	Fixed: Spectrum analyzer buffer overflow
+	Fixed: Deadlock when removing multiple selected tracks while one of them is playing
+	Added: Pipewire output plugin (saivert)
+	Added: LibRetro resampling plugin (toadking)
+	Added: Chiptune voice muting in DUMB plugin
+	Added: Improved drawing of spectrum analyzer
+	Added: $itematindex(index,value) function to title formatting, get value by index from multivalue fields
+	
+version 1.9.4
+	Fixed: Deadlock when playing network streams
+	Fixed: Handling multi-value genre in ID3v2
+	Fixed: Will fully reinitialize ALSA device when changing output format, to be compatible with more DACs
+	Fixed: Duplicate playlist menu item was not showing
+	Fixed: A random crash in visualization code
+	Added: Customizable visualization background color for GTKUI
+	Added: 64-bit seeking support in AAC, ALAC, Sndfile, Musepack, MP3, WMA, Vorbis
+	Added: Embedded album art from OGG files
+	Added: When double clicking a playlist in Playlist browser, will play the first track in the shuffle queue, according to current settings (pappnu)
+
+version 1.9.3
+	Fixed: OpenBSD compatibility / warnings (Brad Smith)
+	Fixed: Crash when loading certain malformed cuesheets
+	Fixed: API behavior change regression causing certain plugins to malfunction
+	Added: Support for building with FFMPEG 5.0 (xuzhen)
+
+version 1.9.2
+	Fixed: Many race conditions, deadlocks and crashes
+	Fixed: Crash when reading metadata of some .SPU files
+	Fixed: Config file content was repeated twice
+	Fixed: Default album art max file size increased to 40MB (Dakeryas)
+	Fixed: Reading some DTS files which require a larger buffer when probing
+	Fixed: Noise was played in the beginning of DTS files
+	Fixed: Default cddb server changed to gnudb.gnudb.org:8880
+	Fixed: Crash when playing certain .AY files
+	Fixed: Playlist corruption when sorting by random
+	Fixed: Crash in the sndfile plugin
+	Fixed: Spectrum analyzer samplerate bug
+	Fixed: Visualization buffer out-of-bounds access
+	Fixed: Multichannel down-mixing bug
+	Added: Notification displaying compatibility with KDE 5.23.5
+	Added: GTKUI oscilloscope rendering with anti-aliasing
+	Added: Selection Properties widget configurable to display metadata, properties, or both (elementdavv)
+	Added: Toggle Pause action in the Deadbeef.desktop file
+	Added: Confirmation dialog when removing a playlist using hotkey (Johannes Wikner)
+	Added: Improved Sort By -> Custom dialog (Robin Seth Ekman)
+
+version 1.9.1
+	Fixed: The release tarball was missing some required files
+	Fixed: Restored Belarussian language support - thanks to @gimrock, @kai3341 and others for changing my mind about people of Belarus. Fuck lukashenko.
+
+version 1.9.0
+	Fixed: WMA regression which caused corrupt playback
+	Fixed: Deadlock in ALSA plugin
+	Fixed: Mis-detection of raw AAC files as MP4 files
+	Fixed: Handling empty title formatting scripts
+	Fixed: Memory error when dragging playlist via Playlist Browser
+	Fixed: Keyboard nagivation issues across playlist tabs (Saivert)
+	Fixed: Playlist tabs and playlist customized colors bugs (Saivert)
+	Fixed: Paused state was not persisted correctly after force-quitting
+	Fixed: Regression which broke musepack seeking
+	Fixed: Crash when notification artwork could not be found
+	Fixed: Poor performance when saving playlist and configuration files
+	Fixed: sndfile not opening files because of uninitialized memory access bug
+	Fixed: Crash when removing tracks from playlist while they're playing
+	Fixed: Rendering group titles with blank text
+	Fixed: Delay activation of a playlist tab during drag-drop over the tab bar
+	Fixed: ᵣussian and ᵦelarussian languages are no longer supported
+	Added: Long file seeking support for Opus and FFMPEG
+	Added: HTTPS support for vfs_curl in portable builds, via libmbedtls
+	Added: Design mode for CocoaUI
+	Added: New Scope and Spectrum Analyzer visualizations
+	Added: Visualization appearance preferences pane
+	Added: New album art loader
+	Added: Configurable volume bar scale (dB, linear, cubic) via context menu (Saivert)
+	Added: Title formatting $year(time) function
+	Added: GTK UI for editing a chosen field of multiple selected tracks, in a table interface
+	Added: Creating new playlist via clicking the "+" button in the playlist tab strip (Saivert)
+	Added: Improved DSP preferences GTK UI (Saivert)
+	Added: Improved handling of invalid MP3 files
+	Added: Last.fm scrobbler will use HTTPS by default
+	Glory to Ukraine! 💛💙
+
+version 1.8.8
+	Fixed: A crash and file path issues in PSF plugin (greedysky)
+	Fixed: A crash when reading certain AAC files
+	Fixed: Reading and writing metadata in certain MP4 files, which didn't work before
+	Fixed: Finding a cuesheet when the path contains symlink
+	Fixed: %isplaying% and %ispaused% title formatting behavior
+	Fixed: Playback of raw AAC files with ID3v2 tags
+	Fixed: Infinite loop when trying to $replace an empty string using title formatting
+	Added: Handling of Disc subtitle frames in ID3v2 and APE tags (Toad King)
+	Added: New improved plugin preferences UI (Nicolai Syvertsen)
+	Added: Non-modal preferences window (Nicolai Syvertsen)
+	Added: `$rgb()` title formatting function (Nicolai Syvertsen)
+	Added: Group title colorization support via title formatting (Nicolai Syvertsen)
+	Added: Plugin report and filtering in Plugin list (Nicolai Syvertsen)
+	Added: Focusable playlist tabs with keyboard navigation support (Nicolai Syvertsen)
+	Added: Sorting plugin list alphabetically (Nicolai Syvertsen)
+	Added: Reading of WAV RIFF tags (Xinya Zhang)
+	Added: Improved album path handling, especially for Windows (Keith-Cancel)
+	Added: Drag-and-drop on the main window (Nicolai Syvertsen)
+	Added: Using scroll wheel with seek bar (Nicolai Syvertsen)
+	Added: "Play Next" context menu action (Natalie Stewart)
+	Added: Handling samplerates higher than 192KHz to pulseaudio
+	Added: Delete from disk dialog will highlight the Delete button as destructive action
+
+version 1.8.7
+	Fixed: Pulseaudio crash after a non-critical recoverable error
+	Fixed: Hotkeys were sometimes not connecting to the correct UI plugins
+	Fixed: Hotkey action "Sort by title" was missing
+	Fixed: Unsupported ID3v2 frames are converted to supported frames instead of discarding
+	Fixed: MP4 crash when encountering unknown metadata fields
+	Fixed: Writing MP4 tags would corrupt the metadata, if the moov box is moving to the end of file
+	Fixed: Off-by-one error when loading unsynchronized ID3v2.3 and 2.2 tags (sktt@github)
+	Fixed: Parsing ALAC M4A files without relying on legacy 24-byte magic cookie
+	Fixed: Saving the player resume state whenever a song finishes playing
+	Fixed: ALSA deadlock / distortion bug caused by changing audio format at a wrong moment
+	Fixed: WMA+CUE crash
+
+version 1.8.6
+	Fixed loading encoder presets in non-portable builds
+	Fixed truncation of long group titles in the playlist
+
+version 1.8.5
+	Added the new ISO/IEC Base Media File Format library MP4P for working with MP4 files, which removes MP4FF dependency
+	Added support for additional per-track metadata in cuesheets
+	Added updating titlebar when displaying playback position (Nicolai Syvertsen)
+	Added a more convenient way to edit container widgets in design mode (Nicolai Syvertsen)
+	Fixed ALAC bug which caused division by zero exception
+	Fixed cuesheet parser bug caused by unknown/unsupported field names
+	Fixed a series of bugs in the Adplug plugin
+	Fixed a bug when parsing MP3 Xing/Info header, reading incorrect packet count
+	Fixed a number of bugs in artwork plugin, especially affecting the Windows version (Jakub Wasylków, Keith Cancel)
+	Fixed a SHIFT-JIS detection bug which caused memory corruption
+	Fixed a bug when configuring keyboard shortcut involving Shift key
+	Fixed a bug with playlist becoming to small in certain UI layouts
+	Fixed a crash when deadbeef window becomes too small when using certain UI layouts
+	Fixed drawing playlist column separators in certain newer GTK themes
+	Fixed on-screen notification bug when too many notifications accumulated at the same time, spawning too many threads
+	Fixed a bug, causing the Band field to be missing from %artist% specifier when using title formatting
+	Fixed bugs leaking file handles in AAC and ALAC plugins (Thomas Jepp)
+	Fixed handling certain non-conformant S3M files
+	Fixed a bug where resizing the log window caused the auto-scroll to stop working (Nicolai Syvertsen)
+	Fixed album shuffle bug, causing the same album to repeat after the last track of the album has finished
+	Fixed shuffle bug causing short tracks to repeat
+
+version 1.8.4
+	Soundtouch plugin has been updated, and is now included in the releases
+	Added %last_modified% title formatting keyword (Cristian Ciocaltea)
+	Fixed stack overflow bug in converter
+	Fixed buffer overflow bug in mp3 parser
+	Fixed handling of leading forward shash character in zipper file names
+	Fixed handling user-specified file mask in artwork plugin
+	Fixed CBR MP3 scanning performance
+	Fixed stack overflow in title formatting tint range calculation
+	Fixed pulseaudio plugin configuration backwards compatibility issue
+	Fixed last.fm scrobbling of streaming shoutcast tracks
+	Fixed deadlock when loading cuesheets which recursively reference themselves
+	Fixed a false-positive when detecting free format MP3 files
+	Fixed skipping unsupported fields in cuesheets
+	Fixed a regression which caused MP3 tag editing to crash when text can't be represented as CP1252
+	Fixed playback of certain network streams
+	Fixed handling of ID3v2 COMM frame content description data
+
+version 1.8.3
+	Fixed a CD Text reading issue
+	Added title formatting functions: len2, longer, longest, padcut, padcut_right, progress, progress2, right, roman, rot13, shortest, strchr, stricmp, strrchr, strstr, substr, tab, trim (esainane@github)
+	Fixed a bunch of memory bugs in title formatting (esainane@github)
+	Added optional automatic playlist sorting (kpcee@github)
+	Added title formatting value %playback_time_ms% (nonoo@github)
+	Added an option to start deadbeef hidden / minimized to tray (kpcee@github)
+	Fixed %_path_raw% to always produce an URI (Evgeny Kravchenko)
+	Fixed rounding of %selection_playback_time% (kpcee@github)
+	Fixed a memory leak in AAC plugin
+	Fixed crash when removing playlist from UI layout (Nicolai Syvertsen)
+	Added logging of plugin load errors
+	Added an option to replaygain scan all unscanned files in playlist (kpcee@github)
+	Added detecting and ignoring freeformat MP3 files
+	Removed logging of playlist load debug messages
+	Fixed playback stuttering after deleting files
+	Fixed deleting files using playlist tab context menu
+	Fixed saving playlist after deleting files
+	Fixed saving playlist after replaygain scan
+	Fixed a bunch of crashes and memory leaks when opening playlist context menu (Christian Boxdörfer)
+	Fixed a performance issue when seeking in MP3 files
+	Fixed a bunch of issues with Repeat and Shuffle implementation
+	Fixed handling of in-stream HTTP headers for streaming audio
+	Fixed a bunch of bugs in HTTP stream interruption
+	Fixed semicolon-separated values handling in track properties dialog
+	Fixed choosing next track when the currently playing track was removed
+	Fixed seeking out of bounds using hotkeys
+	Fixed saving opus header gain when no replaygain info is present
+	Improved remove from disk dialog (kpcee@github)
+	Fixed ID3v2 TLAN (LANGUAGE) and TMED (MEDIA TYPE) mapping to be consistent with other formats
+	Fixed replaygain bug causing it to be ON by default
+	Fixed bug in elapsed time calculation in replaygain scanner UI
+	Fixed a stack overflow bug when writing ID3v1
+	Added ID3v2 POPM rating support, both reading and writing
+	Fixed an issue with splitters not reaching the view edges
+	Fixed single-quote escaping issue in ShellExec
+	Fixed Add Location dialog not adding URLs
+	Fixed ffmpeg file handle leak
+	Added remove playlist confirmation dialog in GTK UI (kpcee@github)
+	Fixed DTS channel count metadata
+	Fixed loading MP3 album art of APIC type=0 (Other)
+	Added album art fallback to png (jakesfr@github)
+	Fixed ALSA hanging after audio format change
+	Fixed handling "ICY 200 OK" status in vfs-curl (thesame)
+	Improved EQ UI layout in the DSP settings
+	Fixed streamer being stuck in buffering mode when trying to play deleted files
+
+version 1.8.2
+	Volume control from command line supports increment syntax (by eauno1re@github)
+	Fixed writing multi-value fields into FLAC tags
+	Map ALBUMARTIST field to ALBUM ARTIST field in FLAC
+	Fixed sound output plugin selection bug in GTK UI
+	Fixed crash when opening files of 0 size
+	Fixed UI freeze when nullout plugin is selected
+	Fixed a regression in restoring the last selected folder in GTK file chooser
+
+version 1.8.1
+	Fixed audio freeze while sorting
+	Fixed crash when resuming playback of a file that's been deleted
+	Fixed error messages when loading PLS playlist with relative paths
+	Fixed adjusting shuffle queue after a user initiated track change
+	Write Album Artist field into Ogg files as "ALBUMARTIST"
+	Load external album covers before embedded
+	Removed the unmaintained sndio plugin
+	Fixed localization of status bar
+	Added experimental subgrouping support in playlist, via using `|||` separator for each subsequent nested group, when using Group by -> Custom (by ToadKing)
+	Added new title formatting functions `$stripprefix` and `$swapprefix` (by ToadKing)
+	Changed supereq DSP configuration to be more compact horizontally and to have more slider precision
+	Updated Repeat and Shuffle hotkey names to match the menus
+	Fixed rounding bug of total playtime in statusbar
+	Fixed design mode splitter handles dragging beyond the window edges
+	Fixed setting album art size based on larger dimension (by ToadKing)
+	Fixed regression causing custom layouts with splitters look wrong
+	Added FLAC plugin option to ignore corrupted stream errors
+	Fixed supereq reentrancy bug, potentially causing crash after changing audio output configuration
+	Fixed reloading replaygain info
+	Fixed writing replaygain info to APEv2 tags
+
+version 1.8.0
+	added Opus support
+	added ReplayGain Scanner
+	added proper tracks+cue support (in cooperation with wdlkmpx)
+	added/improved MP4 tag reading and writing
+	added loading embedded album art from MP4 files
+	added File Copy and File Move converter presets
+	added Log Window displaying error information from various sources (in cooperation with Saivert)
+	improved replaygain configuration and runtime behavior
+	fixed replaygain support in Converter
+	improved reading, storing and editing multi-value tag fields
+	added GBS support to Game_Music_Emu (kode54)
+	added SGC support to Game_Music_Emu
+	fixed clipping prevention for mp3, replaygain is applied before clipping
+	fixed vfz_zip handling of colons in filenames
+	fixed wma decoding precision error
+	fixed issues with playing very short files
+	fixed a number of known issues in the Converter
+	UI splitter proportional resizing (cboxdoerfer)
+	added to title formatting: $num, %_path_raw%, %_playlist_name%, $replace, $upper, $lower, %playback_bitrate%, $repeat, $insert, $len, <<<>>>, >>><<<, $pad, $pad_right (saivert)
+	added support for dim and bright text in playlist columns (saivert)
+	improved detecting GTK theme colors for custom widgets
+	added new multiline tag editing dialog for individual values
+	added Copy&Paste in playlist (cboxdoerfer)
+	added localization support for plugin UI
+	added Drag'n'drop support from deadbeef to other applications (cboxdoerfer)
+	fixed a number of ogg file tagging issues (kode54)
+	fixed multiple crash bugs in AdPlug plugin
+	added UMX module support, ported from foo_dumb
+	updated Game_Music_Emu and VGMplay (kode54)
+	added an option to Converter, to copy the files if the format doesn't change
+	added a configuration option `gtkui.start_hidden`, to start the player with hidden main window (Radics Péter)
+	added a converter option to retag the files after copying
+	added a context menu action for duplicating playlists (Alex Couture-Beil)
+	fixed a number of fadeout issues in Game_Music_Emu
+	fixed musepack seeking issue
+	fixed loading album covers from ID3v2.2
+	fixed mp3 bitrate calculation bug for incomplete files with LAME header
+	improved large file support with many internal values converted to use 64 bits for sample counts
+	use title formatting for displaying status bar text
+	added %seltime% title formatting value, for displaying playback time of selected tracks (Thomas Ross)
+	added reading SONGWRITER field from cue sheets (wdlkmpx)
+	added playlist group spacing configuration (saivert)
+	improved mp3 USLT lyrics support (in copperation with Ignat Loskutov)
+	improved playlist browser configurability (Jakub Wasylków)
+	added hotkey action for opening track properties (Jakub Wasylków)
+	added hotkey actions for add/remove/toggle in playqueue (Jakub Wasylków)
+	added --volume command line option (Saivert)
+	improved ISRC and subindex handling in CUE (wdlkmpx)
+	added hotkey actions to move selected tracks up/down (Jakub Wasylków)
+	fixed memory access bugs in config handling and supereq (github/tsowa)
+	added charset detection based on the whole ID3v2 tag content
+	added automatic charset detection for cdtext (Jakub Wasylków)
+	added configuration for output samplerate setting
+	removed fast scanning mp3 option, since it was too inaccurate
+	improved detection of PSF files, to disambiguate them against other files which use the same extension
+	added Edit In Place and Crop options to the track properties menu
+	fixed WildMidi playback of some MID files playing more than 1024 simultaneous notes
+	fixed playing stereo APE files with single-channel silence
+	added wavpack version 5 support with DSD
+	fixed performance issue when reading AdPlug's HSC files
+	fixed loading audio files from GVFS volumes
+	fixed handling of cuesheets in zip files
+	fixed writing tags into tiny ogg files
+	fixed handling FLAC files with huge block sizes over 100KB
+	replaced mp3 parsing code with the new library, which is more reliable and tested, and can handle even more obscure mp3 files
+	renamed Looping and Order menus to Repeat and Shuffle, respectively
+	fixed loading larger Songlenths.txt in sid plugin, and added support for Songlengths.md5
+
+version 0.7.2 
+	fixed title formatting %filename% crash
+	fixed streaming of aac content in mp4 container
+	added https:// support to vfs_curl (Viktor Semykin)
+	added zh_TW translation to deadbeef.desktop (laichiaheng)
+	fixed loading cue sheets without any metadata fields
+	fixed file close bug in VTX plugin
+	fixed evaluating nested square brackets syntax in title formatting
+	improved support for large fields in ID3v2 tags
+	fixed potential crash bug in artwork plugin
+	fixed path separator '/' escaping regression in converter
+	moved ffmpeg plugin to the end of plugin list, to prevent conflicts with other input plugins
+	added $fix_eol, $hex title formatting
+	fixed importing \, \ and \n characters from old configuration files
+	fixed "Group by artist/date/title" title formatting
+	added enumerating/exposing of all supported file extensions to ffmpeg plugin (Xinya Zhang)
+	fixed handling of ':' in file path in vfs_zip plugin
+	fixed old ffmpeg versions support
+	fixed wma decoder loudness issue
+	fixed DCA buffer allocation, to make it more musl-friendly
+	added $num implementation to title formatting (Peter Lamby)
+	fixed --nowplaying-tf behavior when player is stopped
+
+version 0.7.1
+	fixed GTKUI maximized window layout saving/restoring
+	fixed GTKUI maximized window column autoresize saving/restoring
+	fixed artwork plugin version checks
+	disabled bogus shift-jis detection, which was overriding cp1252
+	fixed mp3 bitrate calculation regression
+	fixed wrong padding of formatted time
+	fixed importing legacy title formatting fields bug
+	fixed incorrect output format after resuming paused session
+	fixed $ext title formatting bug
+	fixed %tracknumber% title formatting bug
+	fixed auto-updating title formatting fields
+	fixed FreeBSD compile issues
+	fixed cache cleaner crash bug
+	fixed crash when trying to play GYM files
+	fixed importing legacy playlist grouping config
+	fixed FLAC metadata field mapping
+	fixed FLAC metadata track/total and disc/total splitting
+
+version 0.7.0
+	converter: fixed bug overwriting the source file with destination (Ian Nartowicz)
+	artwork: added cache cleaner, MusicBrainz backend,
+		configurable default picture, numerous bugfixes,
+		performance improvements, more customization options (Ian Nartowicz)
+	playlist browser: improved drag-n-drop,
+		double-click / middle-click on empty area to create new playlist,
+		middle-click on playlist to remove it,
+		highlight current playlist, configurable columns,
+		sort columns by clicking their headers,
+		performance optimizations (Christian Boxdörfer)
+	various selection properties improvements (Christian Boxdörfer)
+	added "Skip to ..." next/prev album/genre/composer actions (Christian Boxdörfer)
+	more appearance customization options in GTKUI (Christian Boxdörfer)
+	initial OS X support, with cocoaui, coreaudio and xcode project, only in GIT sources
+	added center-alignment option to playlist columns (Christian Boxdörfer)
+	added 1 and 5 second "Seek forward/backward" actions
+	fixed random gtkui crash when closing playlist via menu
+	new title formatting implementation, aiming to be compatible with fb2k, replacing the old one
+	added grouping to search window (Ian Nartowicz)
+	improved error handling in vfs_curl (Ian Nartowicz)
+	fixed volume control via mouse scroll when using GTK3
+	fixed unwanted restarting when unpausing streaming tracks of known length
+	sid: use stereo by default, with an option to force mono; fixed performance issues
+	cdda: improved cddb support, libcdparanoia, multiple CD drives, speed selection (Ian Nartowicz)
+	gtkui: added selection focus, such that the found tracks will be focused while using the search window
+	tags: use cp1252 instead of iso8859-1 everywhere
+	fixed resuming network streams after losing network connection
+	fixed cuesheet charset detection crash bug
+	renamed mpgmad plugin to be "mp3"
+	added libmpg123 support as a 2nd backend to mp3 plugin, as default
+	mp3: fixed xing header parsing, length calculation issues
+	favor album artist over artist in "stop after current album" mode
+	gme: fixed SAP file duration and improved looping handling
+	sid: automatic detection of HVSC SongLengths.txt from sid file paths
+	gtkui: added Tabs widget in Design mode (Christian Boxdörfer)
+	added sc68 plugin for playing Atari ST music
+	added on-demand initialization to wild-midi, to speed up player init
+	flac: fixed legacy cuesheet handling
+	added writing updated replaygain info to all supported tag formats
+	fixed setting focus on the main window / playlist on startup
+	changed volume up/down actions to have a step of 1dB instead of 2dB
+	fixed bigendian support in the converter
+	updated DUMB and GME to the newest versions (kode54)
+	fixed handling of several formats in sndfile plugin (kode54)
+	added support for ORIGINAL_RELEASE_TIME and ORIGINAL_RELEASE_YEAR metadata fields (Giulio Bernardi)
+	added loading plugins from a $DEADBEEF_PLUGIN_DIR directory (Nikolay Amiantov)
+	fixed a bug which was skipping next track after deleting current track
+	DUMB and GME can now do their own proper infinite looping in "Loop single" mode (kode54)
+	alac: Fix bits per sample varying from what the MP4 container specifies (kode54)
+	psf: fixed crash after format probing failure
+	search window title will show the number of search results
+	SRC resampler: fixed very rare buffer overflow crash
+	mp3: added LAME preset support
+	album art: fixed scaling of non-square images (Ian Nartowicz)
+	ffmpeg: updated to support new library versions
+	gtkui: improved playlist column drag-n-drop (Ian Nartowicz)
+	configuration file is now written with 0600 permissions
+	added tracktotal and disctotal support for many tagging formats
+	added extended ID3v1 genres
+	fixed int-float conversion off-by-one precision bug
+	fixed sorting algorithm u8_strcasecmp stability issue (Ian Nartowicz)
+	fixed playlist context menu actions to work on clicked playlist, instead of the current one
+
 version 0.6.2
 	added "Stop playback after current album finished" (Aleksejs Popovs)
 	added ALAC, OPUS, OggFlac encoder presets (Ian Nartowicz)
@@ -80,7 +529,7 @@
 	fixed mp3 duration rounding bug
 	fixed incorrect scroll/cursor after deleting playlists
 	added support for loading plugins from ~/.local/lib{32|64}/deadbeef, depending on running deadbeef build version
-	fixed bug imposing 256 byte limit on file pathes in archives
+	fixed bug imposing 256 byte limit on file paths in archives
 	fixed column autoresize issues
 	removed libstdc++ hacks from C++ plugins
 	fixed "Remove from disk" menu item not being hidden by corresponding option
@@ -155,7 +604,7 @@
 	show blank instead of "?" when a metadata field is absent
 	fixed local album cover files search order, it's alphabetical now
 	alsa: added a hack/work-around to prevent releasing sound device when a user switches between tracks
-	m3u: improved handling of relative file pathes
+	m3u: improved handling of relative file paths
 	converter: fixed handling "/" in filenames; fixed tag-writing to files which have special characters
 	fixed resuming last session in shuffle albums mode
 	fixed several libmms freeze/hang/crash bugs
@@ -541,7 +990,7 @@
 	fixed sse2 issues on i686 architecture
 	added 24-bit ape support (thanks to Rockbox project)
 	added support for custom scrobbler url to last.fm plugin (e.g. libre.fm)
-	added Play Queue funtionality to playlist (context menu)
+	added Play Queue functionality to playlist (context menu)
 	added average/approximate bitrate display to statusbar
 	new "cursor follows playback" feature
 	new "stop after current track" feature

deadbeef-0.6.2.tar.bz2/Makefile.am -> deadbeef-1.9.6.tar.bz2/Makefile.am Changed

@@ -1,10 +1,12 @@
-SUBDIRS = pixmaps\
-		  icons\
+SUBDIRS = \
+		  external\
+		  shared\
 		  ${PLUGINS_DIRS}\
 		  po\
-		  intl
-
-bin_PROGRAMS = deadbeef
+		  intl\
+		  pixmaps\
+		  icons\
+		  src
 
 INTLTOOL_FILES = \
 		intltool-extract.in \
@@ -16,52 +18,18 @@
 		intltool-merge \
 		intltool-update
 
-deadbeef_SOURCES =\
-	main.c common.h deadbeef.h\
-	plugins.c plugins.h moduleconf.h\
-	playlist.c playlist.h \
-	plmeta.c pltmeta.c pltmeta.h\
-	streamer.c streamer.h\
-	premix.c premix.h\
-	messagepump.c messagepump.h\
-	conf.c  conf.h\
-	threading_pthread.c threading.h\
-	volume.c volume.h\
-	junklib.h junklib.c utf8.c utf8.h\
-	u8_lc_map.h\
-	fastftoi.h\
-	vfs.c vfs.h vfs_stdio.c\
-	md5/md5.c md5/md5.h\
-	metacache.c metacache.h\
-	gettext.h\
-	ringbuf.c ringbuf.h\
-	dsppreset.c dsppreset.h\
-	replaygain.c replaygain.h\
-	fft.c fft.h\
-	handler.c handler.h\
-	strdupa.h\
-	escape.c escape.h
-	
-#	ConvertUTF/ConvertUTF.c ConvertUTF/ConvertUTF.h
-
-sdkdir = $(pkgincludedir)
-sdk_HEADERS = deadbeef.h
-
-deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) $(ICONV_LIB) $(DL_LIBS) -lm -lpthread $(INTL_LIBS) plugins/libparser/libparser.a
-
-AM_CFLAGS = $(DEPS_CFLAGS) -std=c99
-AM_CPPFLAGS = $(DEPS_CFLAGS)
-
 docsdir = $(docdir)
 
 docs_DATA = README help.txt about.txt translators.txt ChangeLog\
-	COPYING.GPLv2 COPYING.LGPLv2.1\
-	translation/help.ru.txt\
-	translation/help.pt_BR.txt
+	COPYING.GPLv2 COPYING.LGPLv2.1
 
 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 yasmwrapper.sh
+EXTRA_DIST = $(docs_DATA) $(desktop_DATA) $(INTLTOOL_FILES) translation/extra.c translation/plugins.c examples/decoder_template.c examples/dsp_template.c yasmwrapper.sh\
+	include/deadbeef/deadbeef.h include/deadbeef/common.h include/deadbeef/fastftoi.h include/deadbeef/strdupa.h\
+	gettext.h
+sdkdir = $(pkgincludedir)
+sdk_HEADERS = include/deadbeef/deadbeef.h
 
 ACLOCAL_AMFLAGS = -I m4

deadbeef-0.6.2.tar.bz2/Makefile.in -> deadbeef-1.9.6.tar.bz2/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/README -> deadbeef-1.9.6.tar.bz2/README Changed

@@ -1,39 +1,57 @@
 TABLE OF CONTENTS
 
-1. compiling, dependencies, etc
-2. licensing
+1. Build dependencies
+2. Runtime dependencies
+3. Licensing
 
 ==========================================================
 
-1. compiling, dependencies, etc
+1. Build dependencies
 
-* first you need to install dependencies. full list is provided at the end of this section for your convenience
+Here's the bare minimum list of things which are expected to be installed to build Deadbeef.
+Usually, you also need to install all runtime dependencies before building as well, see the next section for details.
 
-* you will need intltool to be installed. if you don't need translations -- run ./configure --disable-nls (in this case you won't need to install intltool, as long as the configure script is already generated)
+* Clang: GCC is not supported, you need clang
+* libdispatch
+* libblockruntime
+* Yasm: required to build assembly portions of ffap plugin on supported platforms (x86, x86_64)
+* intltool: required for localization. If you don't need translations -- run ./configure --disable-nls (in this case you won't need to install intltool, as long as the configure script is already generated)
 
-* if you want to build from git - install autoconf, automake, libtool, intltool, autopoint, then run ./autogen.sh to bootstrap
+1.1 Compiling from git
 
-* run "./configure --help", and read it.
+If you're building from git, more things are needed:
 
-* now you're ready to configure the build process -- run "./configure --prefix=/usr", and wait until it finishes. you may want to change prefix to another value. consult INSTALL file for more info.
+* autoconf
+* automake,
+* libtool,
+* autopoint
 
-* make sure all plugins which you want have "Yes" status in the list that's printed by configure. if not -- install missing dependencies, and rerun configure. that is especially important for GTKUI, and ALSA or OSS plugins. make sure you have both. otherwise you won't get GUI and/or sound output.
+Run ./autogen.sh to generate configure script
 
-* after satisfying all dependencies, run "make -j5" (change -j number to suit your number of CPUs/cores, e.g. 5 is quite good for single CPU dual-core machines). it is a good idea to do it as normal user (this step doesn't require root privileges).
+1.2 Compiling
 
-* after build finishes, run "make install" as root
+* Set CC and CXX environment variables to clang and clang++ respectively.
+* Run `./configure --prefix=/usr`, and wait until it finishes. you may want to change prefix to another value. consult INSTALL file for more info. If you're new to the process, it may help to run `./configure --help`.
+* Make sure all desired plugins have "Yes" status in the list that's printed by configure. If not -- install missing dependencies, and rerun configure. This is especially important for GTKUI, and ALSA or OSS plugins. Otherwise you won't get GUI and/or sound output.
+* After satisfying all dependencies, run "make -j5" (change -j number to suit your number of CPUs/cores, e.g. 5 is quite good for single CPU dual-core machines).
+* After the build finishes, run "make install" as root
 
-full list of dependencies is below.
-most of them are optional, which means deadbeef will build and run without them, but to make it useful - you'd probably need at least GTK UI plugin and some audio codecs built.
+2. Runtime dependencies
+
+Many of the dependencies listed here are optional, which means deadbeef will build and run without them, but to make it useful - you'd probably need at least GTK UI plugin and some audio codecs built.
 
     libsamplerate: for dsp_libsrc plugin (resampler)
-    gtk+-2.0 >= 2.12 (+ gthread, + glib): GTK+ 2.0 user interface
+    gtk+-2.0 >= 2.16 (+ gthread, + glib): GTK+ 2.0 user interface
+    gtk+-3.0 >= 3.10 (+ gthread, + glib): GTK+ 3.0 user interface
+    jansson: mandatory for both gtk2 and gtk3 UIs, used for column configuration loading
     alsa-lib: ALSA support
     libvorbis and libogg: for ogg vorbis plugin, and for ogg container metadata in other formats, such as OggFlac
     libcurl >= 7.10: for last.fm, vfs_curl (shoutcast/icecast), artwork plugins
     imlib2: for artwork plugin; see libjpeg and libpng below
     libjpeg and libpng: for artwork plugin (when imlib2 is not installed, or --disable-artwork-imlib2 is used)
-    libmad: for mp3 plugin (mpeg1,2 layers1,2,3)
+    libmad (optional): for mp3 plugin
+    libmpg123 (optional): for mp3 plugin
+        NOTE: the mp3 plugin has multiple backends since deadbeef 0.7, both libmad and libmpg123 are supported at the same time, and can be selected by the user from plugin configuration dialog. At least one of them is required to satisfy mp3 plugin dependencies. But having both is preferred. 
     libFLAC: for flac plugin
     wavpack: for wavpack plugin
     libsndfile: for sndfile plugin
@@ -45,11 +63,11 @@
     faad2: for AAC plugin
     zlib: for Audio Overload plugin (psf, psf2, etc), GME (for vgz)
     libzip: for vfs_zip plugin
-    yasm: required to build assembly portions of ffap plugin on supported platforms (x86, x86_64)
-
-actual package names for your Linux distribution may vary.
+    libdispatch
+    libblockruntime
 
+The actual package names for your Linux distribution may vary.
 
-2. licensing
+3. Licensing
 
 DeaDBeeF core uses ZLIB license. See COPYING in each subdirectory for details.

deadbeef-0.6.2.tar.bz2/about.txt -> deadbeef-1.9.6.tar.bz2/about.txt Changed

@@ -1,45 +1,34 @@
-DeaDBeeF - The Ultimate Music Player
-Copyright © 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
-http://deadbeef.sf.net
+💛💙
 
-Contributors:
+DeaDBeeF - The Music Player
+Copyright © 2009-2023 Oleksiy Yakovenko and contributors
+https://deadbeef.sourceforge.io
 
- Alexey A. Smirnov <alexey.smirnov@gmx.com>
- Debian packaging, patches
+Some of the most significant contributors in alphabetical order:
 
+ Alex Dedul <rotmer@gmail.com>
+ Alexey A. Smirnov <alexey.smirnov@gmx.com>
 Anton Novikov <tonn.post@gmail.com>
- PulseAudio plugin
-
+ Christian Boxdörfer <christian.boxdoerfer@posteo.de>
+ David Bryant <david@wavpack.com>
+ Derreck <sarumyanxxl@users.sourceforge.net>
+ Ian Nartowicz
+ Igor Murzov <igor@gplsoft.org>
+ Igor Rudchenko <igor@thinkpads.net>
+ Jakub Wasylków <kuba_160@protonmail.com>
+ Jan D. Behrens <zykure@web.de>
+ Kryksyh <druid@foobar2000.ru>
+ Martin Panter
+ Nicolai Syvertsen <saivert@saivert.com>
+ Serghey Kotlyarov <shadowsbrother@gmail.com>
 Sofias <sofias@radikalismus.com>
- Icon
-
 starws <starws.box@gmail.com>
- The best QA dude in the world
-
 Stas Akimushkin <uncle.lag@gmail.com>
- Original artwork
-
+ Themaister <maister@archlinux.us>
+ Veniamin Gvozdikov <g.veniamin@googlemail.com>
 Viktor Semykin <thesame.ml@gmail.com>
- Global Hotkeys, CD Audio, Cover Art, ShellExec plugins, lots of patches and suggestions, and the default cover art image
 
- These people have also contributed significantly to the project by sending patches, testing, etc:
- 
- Alex Dedul <rotmer@gmail.com>
- Christian Boxdörfer <christian.boxdoerfer@posteo.de>
- David Bryant <david@wavpack.com>
- Derreck <sarumyanxxl@users.sourceforge.net>
- Ian Nartowicz
- Igor Murzov <igor@gplsoft.org>
- Igor Rudchenko <igor@thinkpads.net>
- Jan D. Behrens <zykure@web.de>
- Kryksyh <druid@foobar2000.ru>
- Martin Panter
- Serghey Kotlyarov <shadowsbrother@gmail.com>
- Themaister <maister@archlinux.us>
- Veniamin Gvozdikov <g.veniamin@googlemail.com>
- 
-
- If you think your name is missing here, or needs to be removed, please send an email to Alexey Yakovenko <waker@users.sf.net>
+If you think your name is missing here, or needs to be removed, please send an email to Oleksiy Yakovenko <waker@users.sf.net>
 
 Special Thanks To:
 
@@ -47,10 +36,8 @@
 Jan Marguc
 Olga Belozerova
 
- and to all the people and anonymous creatures hanging at #deadbeef-player and #deadbeef-ru
-
 
-Bundled libraries:
+The bundled 3rd party libraries:
 
 
 Independent implementation of MD5 (RFC 1321).
@@ -67,4 +54,4 @@
 placed in the public domain Fall 2005
 
 
-For information on libraries used in plugins -- see specific plugin's copyright information.
+For information on the libraries used by the plugins -- please see the specific plugin's copyright information.

deadbeef-0.6.2.tar.bz2/acinclude.m4 -> deadbeef-1.9.6.tar.bz2/acinclude.m4 Changed

deadbeef-0.6.2.tar.bz2/aclocal.m4 -> deadbeef-1.9.6.tar.bz2/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,32 +20,9301 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+
+dnl IT_PROG_INTLTOOL(MINIMUM-VERSION, no-xml)
+# serial 42 IT_PROG_INTLTOOL
+AC_DEFUN(IT_PROG_INTLTOOL, 
+AC_PREREQ(2.50)dnl
+AC_REQUIRE(AM_NLS)dnl
+
+case "$am__api_version" in
+ 1.01234)
+	AC_MSG_ERROR(Automake 1.5 or newer is required to use intltool)
+ ;;
+ *)
+ ;;
+esac
+
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+if test -n "$1"; then
+ AC_MSG_CHECKING(for intltool >= $1)
+ AC_MSG_RESULT($INTLTOOL_APPLIED_VERSION found)
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	AC_MSG_ERROR(Your intltool is too old. You need intltool $1 or later.)
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, intltool-update)
+AC_PATH_PROG(INTLTOOL_MERGE, intltool-merge)
+AC_PATH_PROG(INTLTOOL_EXTRACT, intltool-extract)
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+ AC_MSG_ERROR(The intltool scripts were not found. Please install intltool.)
+fi
+
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST(AM_DEFAULT_VERBOSITY)
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+else
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+fi
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+ AC_MSG_ERROR(GNU gettext tools not found; required for intltool)
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+ AC_MSG_ERROR(GNU gettext tools not found; required for intltool)
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR(perl not found)
+fi
+AC_MSG_CHECKING(for perl >= 5.8.1)
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+ AC_MSG_ERROR(perl 5.8.1 is required for intltool)
+else
+ IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+ AC_MSG_RESULT($IT_PERL_VERSION)
+fi
+if test "x$2" != "xno-xml"; then
+ AC_MSG_CHECKING(for XML::Parser)
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+ AC_MSG_RESULT(ok)
+ else
+ AC_MSG_ERROR(XML::Parser perl module is required for intltool)
+ fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+IT_PO_SUBDIR(po)
+
+)
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN(IT_PO_SUBDIR,
+AC_PREREQ(2.53)dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE(
+ AC_CONFIG_COMMANDS($1/stamp-it, 
+ if ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ; then
+ AC_MSG_ERROR($1/Makefile.in.in was not created by intltoolize.)
+ fi
+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+ >"$1/stamp-it.tmp"
+ sed '/^#/d
+	 s/^.* *//
+	 /^ 	*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+ 
+ sed '/^POTFILES =/,/^\\$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	 }
+	 ' "$1/Makefile.in" >"$1/Makefile"
+ rm -f "$1/Makefile.tmp"
+ mv "$1/stamp-it.tmp" "$1/stamp-it"
+ )
+)dnl
+)
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
 #
-# This program is free software; you can redistribute it and/or modify
+AC_DEFUN(_IT_SUBST,
+
+AC_SUBST($1)
+m4_ifdef(_AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($1))
+
+)
+
+# deprecated macros
+AU_ALIAS(AC_PROG_INTLTOOL, IT_PROG_INTLTOOL)
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN(AC_PROG_INTLTOOL, ...)
+
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# 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.
+
+m4_define(_LT_COPYING, dnl
+# Copyright (C) 2014 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.
+
+# GNU Libtool 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
+# the Free Software Foundation; either version 2 of of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that 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.
+# 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.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+)
+
+# serial 58 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun(LT_PREREQ,
+m4_if(m4_version_compare(m4_defn(LT_PACKAGE_VERSION), $1), -1,
+ m4_default($3,
+		 m4_fatal(Libtool version $1 or higher is required,
+		 63)),
+ $2))
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun(_LT_CHECK_BUILDDIR,
+case `pwd` in
+ *\ * | *\	*)
+ AC_MSG_WARN(Libtool does not cope well with whitespace in `pwd`) ;;
+esac
+)
+
+
+# LT_INIT(OPTIONS)
+# ------------------
+AC_DEFUN(LT_INIT,
+AC_PREREQ(2.62)dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
+AC_BEFORE($0, LT_LANG)dnl
+AC_BEFORE($0, LT_OUTPUT)dnl
+AC_BEFORE($0, LTDL_INIT)dnl
+m4_require(_LT_CHECK_BUILDDIR)dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid(^_?LT_A-Z_+$)dnl
+m4_pattern_allow(^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$)dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE(LTOPTIONS_VERSION)dnl
+AC_REQUIRE(LTSUGAR_VERSION)dnl
+AC_REQUIRE(LTVERSION_VERSION)dnl
+AC_REQUIRE(LTOBSOLETE_VERSION)dnl
+m4_require(_LT_PROG_LTMAIN)dnl
+
+_LT_SHELL_INIT(SHELL=${CONFIG_SHELL-/bin/sh})
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS($0, $1)
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define(LT_INIT)
+)# LT_INIT
+
+# Old names:
+AU_ALIAS(AC_PROG_LIBTOOL, LT_INIT)
+AU_ALIAS(AM_PROG_LIBTOOL, LT_INIT)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_PROG_LIBTOOL, )
+dnl AC_DEFUN(AM_PROG_LIBTOOL, )
+
+
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun(_LT_PREPARE_CC_BASENAME, 
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in @S|@*""; do
+ case $cc_temp in
+ compile | *\\/compile | ccache | *\\/ccache ) ;;
+ distcc | *\\/distcc | purify | *\\/purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+)# _LT_PREPARE_CC_BASENAME
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
+m4_defun(_LT_CC_BASENAME,
+m4_require(_LT_PREPARE_CC_BASENAME)dnl
+AC_REQUIRE(_LT_DECL_SED)dnl
+AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
+)
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after 'm4_require(_LT_FILEUTILS_DEFAULTS)'.
+m4_defun(_LT_FILEUTILS_DEFAULTS,
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+)# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun(_LT_SETUP,
+AC_REQUIRE(AC_CANONICAL_HOST)dnl
+AC_REQUIRE(AC_CANONICAL_BUILD)dnl
+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
+dnl
+_LT_DECL(, build_alias, 0, The build system)dnl
+_LT_DECL(, build, 0)dnl
+_LT_DECL(, build_os, 0)dnl
+dnl
+AC_REQUIRE(AC_PROG_CC)dnl
+AC_REQUIRE(LT_PATH_LD)dnl
+AC_REQUIRE(LT_PATH_NM)dnl
+dnl
+AC_REQUIRE(AC_PROG_LN_S)dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL(, LN_S, 1, Whether we need soft or hard links)dnl
+dnl
+AC_REQUIRE(LT_CMD_MAX_LEN)dnl
+_LT_DECL(objext, ac_objext, 0, Object file suffix (normally "o"))dnl
+_LT_DECL(, exeext, 0, Executable file suffix (normally ""))dnl
+dnl
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+m4_require(_LT_CHECK_SHELL_FEATURES)dnl
+m4_require(_LT_PATH_CONVERSION_FUNCTIONS)dnl
+m4_require(_LT_CMD_RELOAD)dnl
+m4_require(_LT_CHECK_MAGIC_METHOD)dnl
+m4_require(_LT_CHECK_SHAREDLIB_FROM_LINKLIB)dnl
+m4_require(_LT_CMD_OLD_ARCHIVE)dnl
+m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
+m4_require(_LT_WITH_SYSROOT)dnl
+m4_require(_LT_CMD_TRUNCATE)dnl
+
+_LT_CONFIG_LIBTOOL_INIT(
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+ setopt NO_GLOB_SUBST
+fi
+)
+if test -n "${ZSH_VERSION+set}"; then
+ setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require(_LT_TAG_COMPILER)dnl
+
+case $host_os in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test set != "${COLLECT_NAMES+set}"; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+ ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME($compiler)
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ _LT_PATH_MAGIC
+ fi
+ ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG(CC)
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+)# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun(_LT_PREPARE_SED_QUOTE_VARS,
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$"`$\\$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$"`\\$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+)
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from 'configure', and 'config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun(_LT_PROG_LTMAIN,
+m4_ifdef(AC_REQUIRE_AUX_FILE, AC_REQUIRE_AUX_FILE(ltmain.sh))dnl
+_LT_CONFIG_LIBTOOL_INIT(ac_aux_dir='$ac_aux_dir')
+ltmain=$ac_aux_dir/ltmain.sh
+)# _LT_PROG_LTMAIN
+
+
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the 'libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT(INIT-COMMANDS)
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define(_LT_CONFIG_LIBTOOL_INIT,
+m4_ifval($1,
+ m4_append(_LT_OUTPUT_LIBTOOL_INIT,
+ $1
+)))
+
+# Initialize.
+m4_define(_LT_OUTPUT_LIBTOOL_INIT)
+
+
+# _LT_CONFIG_LIBTOOL(COMMANDS)
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define(_LT_CONFIG_LIBTOOL,
+m4_ifval($1,
+ m4_append(_LT_OUTPUT_LIBTOOL_COMMANDS,
+ $1
+)))
+
+# Initialize.
+m4_define(_LT_OUTPUT_LIBTOOL_COMMANDS)
+
+
+# _LT_CONFIG_SAVE_COMMANDS(COMMANDS, INIT_COMMANDS)
+# -----------------------------------------------------
+m4_defun(_LT_CONFIG_SAVE_COMMANDS,
+_LT_CONFIG_LIBTOOL($1)
+_LT_CONFIG_LIBTOOL_INIT($2)
+)
+
+
+# _LT_FORMAT_COMMENT(COMMENT)
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define(_LT_FORMAT_COMMENT,
+m4_ifval($1, 
+m4_bpatsubst(m4_bpatsubst($1, ^ *, # ),
+ '`$\, \\\&)m4_bmatch($1, !?.$, , .)
+))
+
+
+
+
+
+# _LT_DECL(CONFIGNAME, VARNAME, VALUE, DESCRIPTION, IS-TAGGED?)
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME. Any other value will be used directly.
+m4_define(_LT_DECL,
+lt_if_append_uniq(lt_decl_varnames, $2, , ,
+ lt_dict_add_subkey(lt_decl_dict, $2, libtool_name,
+	m4_ifval($1, $1, $2))
+ lt_dict_add_subkey(lt_decl_dict, $2, value, $3)
+ m4_ifval($4,
+	lt_dict_add_subkey(lt_decl_dict, $2, description, $4))
+ lt_dict_add_subkey(lt_decl_dict, $2,
+	tagged?, m4_ifval($5, yes, no)))
+)
+
+
+# _LT_TAGDECL(CONFIGNAME, VARNAME, VALUE, DESCRIPTION)
+# --------------------------------------------------------
+m4_define(_LT_TAGDECL, _LT_DECL($1, $2, $3, $4, yes))
+
+
+# lt_decl_tag_varnames(SEPARATOR, VARNAME1...)
+# ------------------------------------------------
+m4_define(lt_decl_tag_varnames,
+_lt_decl_filter(tagged?, yes, $@))
+
+
+# _lt_decl_filter(SUBKEY, VALUE, SEPARATOR, VARNAME1..)
+# ---------------------------------------------------------
+m4_define(_lt_decl_filter,
+m4_case($#,
+ 0, m4_fatal($0: too few arguments: $#),
+ 1, m4_fatal($0: too few arguments: $#: $1),
+ 2, lt_dict_filter(lt_decl_dict, $1, $2, , lt_decl_varnames),
+ 3, lt_dict_filter(lt_decl_dict, $1, $2, $3, lt_decl_varnames),
+ lt_dict_filter(lt_decl_dict, $@))dnl
+)
+
+
+# lt_decl_quote_varnames(SEPARATOR, VARNAME1...)
+# --------------------------------------------------
+m4_define(lt_decl_quote_varnames,
+_lt_decl_filter(value, 1, $@))
+
+
+# lt_decl_dquote_varnames(SEPARATOR, VARNAME1...)
+# ---------------------------------------------------
+m4_define(lt_decl_dquote_varnames,
+_lt_decl_filter(value, 2, $@))
+
+
+# lt_decl_varnames_tagged(SEPARATOR, VARNAME1...)
+# ---------------------------------------------------
+m4_define(lt_decl_varnames_tagged,
+m4_assert($# <= 2)dnl
+_$0(m4_quote(m4_default($1, , )),
+ m4_ifval($2, $2, m4_dquote(lt_decl_tag_varnames)),
+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), )))
+m4_define(_lt_decl_varnames_tagged,
+m4_ifval($3, lt_combine($1, $2, _, $3)))
+
+
+# lt_decl_all_varnames(SEPARATOR, VARNAME1...)
+# ------------------------------------------------
+m4_define(lt_decl_all_varnames,
+_$0(m4_quote(m4_default($1, , )),
+ m4_if($2, ,
+	 m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))dnl
+)
+m4_define(_lt_decl_all_varnames,
+lt_join($@, lt_decl_varnames_tagged($1,
+			lt_decl_tag_varnames(, , m4_shift($@))))dnl
+)
+
+
+# _LT_CONFIG_STATUS_DECLARE(VARNAME)
+# ------------------------------------
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'. VARNAME
+# must have a single quote delimited value for this to work.
+m4_define(_LT_CONFIG_STATUS_DECLARE,
+$1='`$ECHO "$$1" | $SED "$delay_single_quote_subst"`')
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly. In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun(_LT_CONFIG_STATUS_DECLARATIONS,
+m4_foreach(_lt_var, m4_quote(lt_decl_all_varnames),
+ m4_n(_LT_CONFIG_STATUS_DECLARE(_lt_var))))
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun(_LT_LIBTOOL_TAGS,
+_LT_FORMAT_COMMENT(The names of the tagged configurations supported by this script)dnl
+available_tags='_LT_TAGS'dnl
+)
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, TAG)
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+# # Some comment about what VAR is for.
+# visible_name=$lt_internal_name
+m4_define(_LT_LIBTOOL_DECLARE,
+_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch(lt_decl_dict, $1,
+					 description)))dnl
+m4_pushdef(_libtool_name,
+ m4_quote(lt_dict_fetch(lt_decl_dict, $1, libtool_name)))dnl
+m4_case(m4_quote(lt_dict_fetch(lt_decl_dict, $1, value)),
+ 0, _libtool_name=$$1,
+ 1, _libtool_name=$lt_$1,
+ 2, _libtool_name=$lt_$1,
+ _libtool_name=lt_dict_fetch(lt_decl_dict, $1, value))dnl
+m4_ifval($2, _$2)m4_popdef(_libtool_name)dnl
+)
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun(_LT_LIBTOOL_CONFIG_VARS,
+m4_foreach(_lt_var,
+ m4_quote(_lt_decl_filter(tagged?, no, , lt_decl_varnames)),
+ m4_n(_LT_LIBTOOL_DECLARE(_lt_var))))
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define(_LT_LIBTOOL_TAG_VARS,
+m4_foreach(_lt_var, m4_quote(lt_decl_tag_varnames),
+ m4_n(_LT_LIBTOOL_DECLARE(_lt_var, $1))))
 
-# PKG_PROG_PKG_CONFIG(MIN-VERSION)
+
+# _LT_TAGVAR(VARNAME, TAGNAME)
+# ------------------------------
+m4_define(_LT_TAGVAR, m4_ifval($2, $1_$2, $1))
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'. Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun(_LT_CONFIG_COMMANDS,
+AC_PROVIDE_IFELSE(LT_OUTPUT,
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+ AC_CONFIG_COMMANDS(libtool,
+ $SHELL $CONFIG_LT || AS_EXIT(1), CONFIG_LT='$CONFIG_LT'),
+ dnl If the libtool generation code is destined for config.status,
+ dnl expand the accumulated commands and init code now:
+ AC_CONFIG_COMMANDS(libtool,
+ _LT_OUTPUT_LIBTOOL_COMMANDS, _LT_OUTPUT_LIBTOOL_COMMANDS_INIT))
+)#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define(_LT_OUTPUT_LIBTOOL_COMMANDS_INIT,
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames( \
+, lt_decl_quote_varnames); do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *\\\\\\\`\\"\\\$*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames( \
+, lt_decl_dquote_varnames); do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *\\\\\\\`\\"\\\$*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+)
+
+# _LT_GENERATED_FILE_INIT(FILE, COMMENT)
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable. If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins. After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script. The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef(AS_INIT_GENERATED,
+m4_defun(_LT_GENERATED_FILE_INIT,AS_INIT_GENERATED($@)),
+m4_defun(_LT_GENERATED_FILE_INIT,
+m4_require(AS_PREPARE)dnl
+m4_pushdef(AS_MESSAGE_LOG_FD)dnl
+lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1dnl
+m4_popdef(AS_MESSAGE_LOG_FD)))# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN(LT_OUTPUT,
+: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE(creating $CONFIG_LT)
+_LT_GENERATED_FILE_INIT("$CONFIG_LT",
+# Run this file to recreate a libtool stub with the current configuration.)
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+ echo
+ AS_BOX(Running $as_me.)
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+'$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $0 OPTIONS
+
+ -h, --help print this help, then exit
+ -V, --version print version number, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset(AC_PACKAGE_NAME, AC_PACKAGE_NAME )config.ltdnl
+m4_ifset(AC_PACKAGE_VERSION, AC_PACKAGE_VERSION)
+configured by $0, generated by m4_PACKAGE_STRING.
+
+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."
+
+while test 0 != $#
+do
+ case $1 in
+ --version | --v* | -V )
+ echo "$lt_cl_version"; exit 0 ;;
+ --help | --h* | -h )
+ echo "$lt_cl_help"; exit 0 ;;
+ --debug | --d* | -d )
+ debug=: ;;
+ --quiet | --q* | --silent | --s* | -q )
+ lt_cl_silent=: ;;
+
+ -*) AC_MSG_ERROR(unrecognized option: $1
+Try '$0 --help' for more information.) ;;
+
+ *) AC_MSG_ERROR(unrecognized argument: $1
+Try '$0 --help' for more information.) ;;
+ esac
+ shift
+done
+
+if $lt_cl_silent; then
+ exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE(creating $ofile)
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure. Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test yes = "$silent" &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+)# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars. Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun(_LT_CONFIG,
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+_LT_CONFIG_SAVE_COMMANDS(
+ m4_define(_LT_TAG, m4_if($1, , C, $1))dnl
+ m4_if(_LT_TAG, C, 
+ # See if we are running on zsh, and set the options that allow our
+ # commands through without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}"; then
+ setopt NO_GLOB_SUBST
+ fi
+
+ cfgfile=${ofile}T
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
+
+ cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program. For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+fi
+_LT_EOF
+ ;;
+ esac
+
+ _LT_PROG_LTMAIN
+
+ # We use sed instead of cat because bash on DJGPP gets confused if
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+,
+cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+)dnl /m4_if
+,
+m4_if($1, , 
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
+ RM='$RM'
+ ofile='$ofile', )
+)dnl /_LT_CONFIG_SAVE_COMMANDS
+)# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+# autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN(LT_SUPPORTED_TAG, )
+
+
+# C support is built-in for now
+m4_define(_LT_LANG_C_enabled, )
+m4_define(_LT_TAGS, )
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN(LT_LANG,
+AC_BEFORE($0, LT_OUTPUT)dnl
+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),
+ Windows Resource,	_LT_LANG(RC),
+ m4_ifdef(_LT_LANG_$1_CONFIG,
+ _LT_LANG($1),
+ m4_fatal($0: unsupported language: "$1")))dnl
+)# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun(_LT_LANG,
+m4_ifdef(_LT_LANG_$1_enabled, ,
+ LT_SUPPORTED_TAG($1)dnl
+ m4_append(_LT_TAGS, $1 )dnl
+ m4_define(_LT_LANG_$1_enabled, )dnl
+ _LT_LANG_$1_CONFIG($1))dnl
+)# _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,
+AC_PROVIDE_IFELSE(AC_PROG_CXX,
+ LT_LANG(CXX),
+ m4_define(AC_PROG_CXX, defn(AC_PROG_CXX)LT_LANG(CXX)))
+
+AC_PROVIDE_IFELSE(AC_PROG_F77,
+ LT_LANG(F77),
+ m4_define(AC_PROG_F77, defn(AC_PROG_F77)LT_LANG(F77)))
+
+AC_PROVIDE_IFELSE(AC_PROG_FC,
+ LT_LANG(FC),
+ m4_define(AC_PROG_FC, defn(AC_PROG_FC)LT_LANG(FC)))
+
+dnl The call to AM_PROG_GCJ is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE(AC_PROG_GCJ,
+ LT_LANG(GCJ),
+ AC_PROVIDE_IFELSE(AM_PROG_GCJ,
+ LT_LANG(GCJ),
+ AC_PROVIDE_IFELSE(LT_PROG_GCJ,
+ LT_LANG(GCJ),
+ m4_ifdef(AC_PROG_GCJ,
+	m4_define(AC_PROG_GCJ, defn(AC_PROG_GCJ)LT_LANG(GCJ)))
+ m4_ifdef(AM_PROG_GCJ,
+	m4_define(AM_PROG_GCJ, defn(AM_PROG_GCJ)LT_LANG(GCJ)))
+ 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)))
+)# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN(AC_LIBTOOL_CXX, LT_LANG(C++))
+AU_DEFUN(AC_LIBTOOL_F77, LT_LANG(Fortran 77))
+AU_DEFUN(AC_LIBTOOL_FC, LT_LANG(Fortran))
+AU_DEFUN(AC_LIBTOOL_GCJ, LT_LANG(Java))
+AU_DEFUN(AC_LIBTOOL_RC, LT_LANG(Windows Resource))
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_LIBTOOL_CXX, )
+dnl AC_DEFUN(AC_LIBTOOL_F77, )
+dnl AC_DEFUN(AC_LIBTOOL_FC, )
+dnl AC_DEFUN(AC_LIBTOOL_GCJ, )
+dnl AC_DEFUN(AC_LIBTOOL_RC, )
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun(_LT_TAG_COMPILER,
+AC_REQUIRE(AC_PROG_CC)dnl
+
+_LT_DECL(LTCC, CC, 1, A C compiler)dnl
+_LT_DECL(LTCFLAGS, CFLAGS, 1, LTCC compiler flags)dnl
+_LT_TAGDECL(CC, compiler, 1, A language specific compiler)dnl
+_LT_TAGDECL(with_gcc, GCC, 0, Is the compiler the GNU compiler?)dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+)# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun(_LT_COMPILER_BOILERPLATE,
+m4_require(_LT_DECL_SED)dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+)# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun(_LT_LINKER_BOILERPLATE,
+m4_require(_LT_DECL_SED)dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+)# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once(_LT_REQUIRED_DARWIN_CHECKS,
+ case $host_os in
+ rhapsody* | darwin*)
+ AC_CHECK_TOOL(DSYMUTIL, dsymutil, :)
+ AC_CHECK_TOOL(NMEDIT, nmedit, :)
+ AC_CHECK_TOOL(LIPO, lipo, :)
+ AC_CHECK_TOOL(OTOOL, otool, :)
+ AC_CHECK_TOOL(OTOOL64, otool64, :)
+ _LT_DECL(, DSYMUTIL, 1,
+ Tool to manipulate archived DWARF debug symbol files on Mac OS X)
+ _LT_DECL(, NMEDIT, 1,
+ Tool to change global to local symbols on Mac OS X)
+ _LT_DECL(, LIPO, 1,
+ Tool to manipulate fat objects and archives on Mac OS X)
+ _LT_DECL(, OTOOL, 1,
+ ldd/readelf like tool for Mach-O binaries on Mac OS X)
+ _LT_DECL(, OTOOL64, 1,
+ ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4)
+
+ AC_CACHE_CHECK(for -single_module linker flag,lt_cv_apple_cc_single_mod,
+ lt_cv_apple_cc_single_mod=no
+ if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	 -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+	# 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 0 = "$_lt_result"; then
+	 lt_cv_apple_cc_single_mod=yes
+	else
+	 cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	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
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
+	lt_cv_ld_exported_symbols_list=yes,
+	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
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ 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 -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+ else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+ )
+ case $host_os in
+ rhapsody* | darwin1.012)
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin91*)
+	 _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.012,.*)
+	 _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	 _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+ else
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+ fi
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+)
+
+
+# _LT_DARWIN_LINKER_FEATURES(TAG)
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun(_LT_DARWIN_LINKER_FEATURES,
+
+ m4_require(_LT_REQUIRED_DARWIN_CHECKS)
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ if test yes = "$lt_cv_ld_force_load"; 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
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
+ case $cc_basename in
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test yes = "$_lt_dar_can_shared"; then
+ output_verbose_link_cmd=func_echo_all
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+ m4_if($1, CXX,
+ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+ fi
+,)
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+)
+
+# _LT_SYS_MODULE_PATH_AIX(TAGNAME)
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun(_LT_SYS_MODULE_PATH_AIX,
+m4_require(_LT_DECL_SED)dnl
+if test set = "${lt_cv_aix_libpath+set}"; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ AC_CACHE_VAL(_LT_TAGVAR(lt_cv_aix_libpath_, $1),
+ AC_LINK_IFELSE(AC_LANG_PROGRAM,
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+	 /^0/ {
+	 s/^0 *$^ *$ *$/\1/
+	 p
+	 }
+ }'
+ _LT_TAGVAR(lt_cv_aix_libpath_, $1)=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$_LT_TAGVAR(lt_cv_aix_libpath_, $1)"; then
+ _LT_TAGVAR(lt_cv_aix_libpath_, $1)=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi,)
+ if test -z "$_LT_TAGVAR(lt_cv_aix_libpath_, $1)"; then
+ _LT_TAGVAR(lt_cv_aix_libpath_, $1)=/usr/lib:/lib
+ fi
+ )
+ aix_libpath=$_LT_TAGVAR(lt_cv_aix_libpath_, $1)
+fi
+)# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define(_LT_SHELL_INIT,
+m4_divert_text(M4SH-INIT, $1
+))# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
+m4_defun(_LT_PROG_ECHO_BACKSLASH,
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING(how to print strings)
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
+else
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
+case $ECHO in
+ printf*) AC_MSG_RESULT(printf) ;;
+ print*) AC_MSG_RESULT(print -r) ;;
+ *) AC_MSG_RESULT(cat) ;;
+esac
+
+m4_ifdef(_AS_DETECT_SUGGESTED,
+_AS_DETECT_SUGGESTED(
+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test "X`printf %s $ECHO`" = "X$ECHO" \
+ || test "X`print -r -- $ECHO`" = "X$ECHO" )))
+
+_LT_DECL(, SHELL, 1, Shell to use when invoking shell scripts)
+_LT_DECL(, ECHO, 1, An echo program that protects backslashes)
+)# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN(_LT_WITH_SYSROOT,
+AC_MSG_CHECKING(for sysroot)
+AC_ARG_WITH(sysroot,
+AS_HELP_STRING(--with-sysroot@<:@=DIR@:>@,
+ Search for dependent libraries within DIR (or the compiler's sysroot
+ if not specified).),
+, with_sysroot=no)
+
+dnl lt_sysroot will always be passed unquoted. We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+ if test yes = "$GCC"; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+ /*)
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+ ;; #(
+ no|'')
+ ;; #(
+ *)
+ AC_MSG_RESULT($with_sysroot)
+ AC_MSG_ERROR(The sysroot must be an absolute path.)
+ ;;
+esac
+
+ AC_MSG_RESULT(${lt_sysroot:-no})
+_LT_DECL(, lt_sysroot, 0, The root where to search for dnl
+dependent libraries, and where our libraries should be installed.))
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun(_LT_ENABLE_LOCK,
+AC_ARG_ENABLE(libtool-lock,
+ AS_HELP_STRING(--disable-libtool-lock,
+ avoid locking (might break parallel builds)))
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+ *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+*-*-irix6*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
+ case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	 LD="${LD-ld} -melf32bsmip"
+	 ;;
+	*N32*)
+	 LD="${LD-ld} -melf32bmipn32"
+	 ;;
+	*64-bit*)
+	 LD="${LD-ld} -melf64bmip"
+	;;
+ esac
+ else
+ case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	 LD="${LD-ld} -32"
+	 ;;
+	*N32*)
+	 LD="${LD-ld} -n32"
+	 ;;
+	*64-bit*)
+	 LD="${LD-ld} -64"
+	 ;;
+ esac
+ fi
+ fi
+ rm -rf conftest*
+ ;;
+
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+	emul="${emul}32"
+	;;
+ *64-bit*)
+	emul="${emul}64"
+	;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+	emul="${emul}btsmip"
+	;;
+ *LSB*)
+	emul="${emul}ltsmip"
+	;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+	emul="${emul}n32"
+	;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+	case $host in
+	 x86_64-*kfreebsd*-gnu)
+	 LD="${LD-ld} -m elf_i386_fbsd"
+	 ;;
+	 x86_64-*linux*)
+	 case `/usr/bin/file conftest.o` in
+	 *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	 *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	 esac
+	 ;;
+	 powerpc64le-*linux*)
+	 LD="${LD-ld} -m elf32lppclinux"
+	 ;;
+	 powerpc64-*linux*)
+	 LD="${LD-ld} -m elf32ppclinux"
+	 ;;
+	 s390x-*linux*)
+	 LD="${LD-ld} -m elf_s390"
+	 ;;
+	 sparc64-*linux*)
+	 LD="${LD-ld} -m elf32_sparc"
+	 ;;
+	esac
+	;;
+ *64-bit*)
+	case $host in
+	 x86_64-*kfreebsd*-gnu)
+	 LD="${LD-ld} -m elf_x86_64_fbsd"
+	 ;;
+	 x86_64-*linux*)
+	 LD="${LD-ld} -m elf_x86_64"
+	 ;;
+	 powerpcle-*linux*)
+	 LD="${LD-ld} -m elf64lppc"
+	 ;;
+	 powerpc-*linux*)
+	 LD="${LD-ld} -m elf64ppc"
+	 ;;
+	 s390*-*linux*|s390*-*tpf*)
+	 LD="${LD-ld} -m elf64_s390"
+	 ;;
+	 sparc*-*linux*)
+	 LD="${LD-ld} -m elf64_sparc"
+	 ;;
+	esac
+	;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -belf"
+ AC_CACHE_CHECK(whether the C compiler needs -belf, lt_cv_cc_needs_belf,
+ AC_LANG_PUSH(C)
+ AC_LINK_IFELSE(AC_LANG_PROGRAM(,),lt_cv_cc_needs_belf=yes,lt_cv_cc_needs_belf=no)
+ AC_LANG_POP)
+ if test yes != "$lt_cv_cc_needs_belf"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS=$SAVE_CFLAGS
+ fi
+ ;;
+*-*solaris*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ 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*)
+ case $host in
+ i?86-*-solaris*|x86_64-*-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"
+	fi
+	;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+esac
+
+need_locks=$enable_libtool_lock
+)# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun(_LT_PROG_AR,
+AC_CHECK_TOOLS(AR, ar, false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL(, AR, 1, The archiver)
+_LT_DECL(, AR_FLAGS, 1, Flags to create an archive)
+
+AC_CACHE_CHECK(for archiver @FILE support, lt_cv_ar_at_file,
+ lt_cv_ar_at_file=no
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM,
+ echo conftest.$ac_objext > conftest.lst
+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL(lt_ar_try)
+ if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL(lt_ar_try)
+	if test 0 -ne "$ac_status"; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+ rm -f conftest.* libconftest.a
+ )
+ )
+
+if test no = "$lt_cv_ar_at_file"; then
+ archiver_list_spec=
+else
+ archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL(, archiver_list_spec, 1,
+ How to feed a file listing to the archiver)
+)# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun(_LT_CMD_OLD_ARCHIVE,
+_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL(, STRIP, 1, A symbol stripping program)
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL(, RANLIB, 1,
+ Commands used to install an old-style archive)
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+ case $host_os in
+ bitrig* | openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
+_LT_DECL(, old_postinstall_cmds, 2)
+_LT_DECL(, old_postuninstall_cmds, 2)
+_LT_TAGDECL(, old_archive_cmds, 2,
+ Commands used to build an old-style archive)
+_LT_DECL(, lock_old_archive_extraction, 0,
+ Whether to use a lock for old archive extraction)
+)# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		OUTPUT-FILE, ACTION-SUCCESS, ACTION-FAILURE)
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN(_LT_COMPILER_OPTION,
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+m4_require(_LT_DECL_SED)dnl
+AC_CACHE_CHECK($1, $2,
+ $2=no
+ m4_if($4, , ac_outfile=conftest.$ac_objext, ac_outfile=$4)
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ fi
+ $RM conftest*
+)
+
+if test yes = "$$2"; then
+ m4_if($5, , :, $5)
+else
+ m4_if($6, , :, $6)
+fi
+)# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS(AC_LIBTOOL_COMPILER_OPTION, _LT_COMPILER_OPTION)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_LIBTOOL_COMPILER_OPTION, )
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# ACTION-SUCCESS, ACTION-FAILURE)
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN(_LT_LINKER_OPTION,
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+m4_require(_LT_DECL_SED)dnl
+AC_CACHE_CHECK($1, $2,
+ $2=no
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS $3"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ else
+ $2=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS=$save_LDFLAGS
+)
+
+if test yes = "$$2"; then
+ m4_if($4, , :, $4)
+else
+ m4_if($5, , :, $5)
+fi
+)# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS(AC_LIBTOOL_LINKER_OPTION, _LT_LINKER_OPTION)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_LIBTOOL_LINKER_OPTION, )
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN(LT_CMD_MAX_LEN,
+AC_REQUIRE(AC_CANONICAL_HOST)dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING(the maximum length of command line arguments)
+AC_CACHE_VAL(lt_cv_sys_max_cmd_len, dnl
+ i=0
+ teststring=ABCD
+
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
+ # (any single argument exceeding 2000 bytes causes a buffer overrun
+ # during glob expansion). Even if it were fixed, the result of this
+ # check would be larger than it should be.
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
+
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
+ # Libtool will interpret -1 as no limit whatsoever
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+ cygwin* | mingw* | cegcc*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+ # you end up with a "frozen" computer, even though with patience
+ # the test eventually succeeds (with a max line length of 256k).
+ # Instead, let's just punt: use the minimum linelength reported by
+ # all of the supported platforms: 8192 (on NT/2K/XP).
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ 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
+ # nice to cause kernel panics so lets avoid the loop below.
+ # First set a reasonable default.
+ lt_cv_sys_max_cmd_len=16384
+ #
+ if test -x /sbin/sysconfig; then
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
+ esac
+ fi
+ ;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*	 //'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+ for i in 1 2 3 4 5 6 7 8; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # 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`env echo "$teststring$teststring" 2>/dev/null` \
+	 = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	 test 17 != "$i" # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ # Only check the string length outside the loop.
+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on
+ # massive amounts of additional arguments before passing them to the
+ # linker. It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
+ ;;
+ esac
+)
+if test -n "$lt_cv_sys_max_cmd_len"; then
+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+ AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL(, max_cmd_len, 0,
+ What is the maximum length of a command?)
+)# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS(AC_LIBTOOL_SYS_MAX_CMD_LEN, LT_CMD_MAX_LEN)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_LIBTOOL_SYS_MAX_CMD_LEN, )
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun(_LT_HEADER_DLFCN,
+AC_CHECK_HEADERS(dlfcn.h, , , AC_INCLUDES_DEFAULT)dnl
+)# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun(_LT_TRY_DLOPEN_SELF,
+m4_require(_LT_HEADER_DLFCN)dnl
+if test yes = "$cross_compiling"; then :
+ $4
+else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LT_DLGLOBAL		DL_GLOBAL
+# else
+# define LT_DLGLOBAL		0
+# endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LT_DLLAZY_OR_NOW		RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LT_DLLAZY_OR_NOW		DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LT_DLLAZY_OR_NOW	RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LT_DLLAZY_OR_NOW	DL_NOW
+# else
+# define LT_DLLAZY_OR_NOW	0
+# endif
+# endif
+# endif
+# endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
+
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else
+ {
+	 if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+	}
+ /* dlclose (self); */
+ }
+ else
+ puts (dlerror ());
+
+ return status;
+}
+_LT_EOF
+ if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+ x$lt_dlneed_uscore) $2 ;;
+ x$lt_dlunknown|x*) $3 ;;
+ esac
+ else :
+ # compilation failed
+ $3
+ fi
+fi
+rm -fr conftest*
+)# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN(LT_SYS_DLOPEN_SELF,
+m4_require(_LT_HEADER_DLFCN)dnl
+if test yes != "$enable_dlopen"; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+else
+ lt_cv_dlopen=no
+ lt_cv_dlopen_libs=
+
+ case $host_os in
+ beos*)
+ lt_cv_dlopen=load_add_on
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+ mingw* | pw32* | cegcc*)
+ lt_cv_dlopen=LoadLibrary
+ lt_cv_dlopen_libs=
+ ;;
+
+ cygwin*)
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ ;;
+
+ darwin*)
+ # if libdl is installed we need to link against it
+ AC_CHECK_LIB(dl, dlopen,
+		lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl,
+ lt_cv_dlopen=dyld
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ )
+ ;;
+
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
+ *)
+ AC_CHECK_FUNC(shl_load,
+	 lt_cv_dlopen=shl_load,
+ AC_CHECK_LIB(dld, shl_load,
+	 lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld,
+	AC_CHECK_FUNC(dlopen,
+	 lt_cv_dlopen=dlopen,
+	 AC_CHECK_LIB(dl, dlopen,
+		lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl,
+	 AC_CHECK_LIB(svld, dlopen,
+		 lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld,
+	 AC_CHECK_LIB(dld, dld_link,
+		 lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld)
+	 )
+	 )
+	 )
+	)
+ )
+ ;;
+ esac
+
+ if test no = "$lt_cv_dlopen"; then
+ enable_dlopen=no
+ else
+ enable_dlopen=yes
+ fi
+
+ case $lt_cv_dlopen in
+ dlopen)
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS=$LDFLAGS
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS=$LIBS
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ AC_CACHE_CHECK(whether a program can dlopen itself,
+	 lt_cv_dlopen_self, dnl
+	 _LT_TRY_DLOPEN_SELF(
+	 lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	 lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+ )
+
+ if test yes = "$lt_cv_dlopen_self"; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ AC_CACHE_CHECK(whether a statically linked program can dlopen itself,
+	 lt_cv_dlopen_self_static, dnl
+	 _LT_TRY_DLOPEN_SELF(
+	 lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	 lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
+ )
+ fi
+
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
+ ;;
+ esac
+
+ case $lt_cv_dlopen_self in
+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+ *) enable_dlopen_self=unknown ;;
+ esac
+
+ case $lt_cv_dlopen_self_static in
+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+ *) enable_dlopen_self_static=unknown ;;
+ esac
+fi
+_LT_DECL(dlopen_support, enable_dlopen, 0,
+	 Whether dlopen is supported)
+_LT_DECL(dlopen_self, enable_dlopen_self, 0,
+	 Whether dlopen of programs is supported)
+_LT_DECL(dlopen_self_static, enable_dlopen_self_static, 0,
+	 Whether dlopen of statically linked programs is supported)
+)# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS(AC_LIBTOOL_DLOPEN_SELF, LT_SYS_DLOPEN_SELF)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, )
+
+
+# _LT_COMPILER_C_O(TAGNAME)
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun(_LT_COMPILER_C_O,
+m4_require(_LT_DECL_SED)dnl
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+m4_require(_LT_TAG_COMPILER)dnl
+AC_CACHE_CHECK(if $compiler supports -c -o file.$ac_objext,
+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1),
+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ fi
+ fi
+ chmod u+w . 2>&AS_MESSAGE_LOG_FD
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+)
+_LT_TAGDECL(compiler_c_o, lt_cv_prog_compiler_c_o, 1,
+	Does compiler simultaneously support -c and -o options?)
+)# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS(TAGNAME)
 # ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun(_LT_COMPILER_FILE_LOCKS,
+m4_require(_LT_ENABLE_LOCK)dnl
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+_LT_COMPILER_C_O($1)
+
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
+ # do not overwrite the value of need_locks provided by the user
+ AC_MSG_CHECKING(if we can lock with hard links)
+ hard_links=yes
+ $RM conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ AC_MSG_RESULT($hard_links)
+ if test no = "$hard_links"; then
+ AC_MSG_WARN('$CC' does not support '-c -o', so 'make -j' may be unsafe)
+ need_locks=warn
+ fi
+else
+ need_locks=no
+fi
+_LT_DECL(, need_locks, 1, Must we lock files when doing compilation?)
+)# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun(_LT_CHECK_OBJDIR,
+AC_CACHE_CHECK(for objdir, lt_cv_objdir,
+rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+ lt_cv_objdir=.libs
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null)
+objdir=$lt_cv_objdir
+_LT_DECL(, objdir, 0,
+ The name of the directory that contains temporary libtool files)dnl
+m4_pattern_allow(LT_OBJDIR)dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+ Define to the sub-directory where libtool stores uninstalled libraries.)
+)# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH(TAGNAME)
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun(_LT_LINKER_HARDCODE_LIBPATH,
+AC_MSG_CHECKING(how to hardcode library paths into programs)
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+ test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+ test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
+
+ # We can hardcode non-existent directories.
+ if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+ test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
+ # Linking always hardcodes the temporary library directory.
+ _LT_TAGVAR(hardcode_action, $1)=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ _LT_TAGVAR(hardcode_action, $1)=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT($_LT_TAGVAR(hardcode_action, $1))
+
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+ test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+_LT_TAGDECL(, hardcode_action, 0,
+ How to hardcode a shared library path into an executable)
+)# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun(_LT_CMD_STRIPLIB,
+m4_require(_LT_DECL_EGREP)
+striplib=
+old_striplib=
+AC_MSG_CHECKING(whether stripping libraries is possible)
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ AC_MSG_RESULT(yes)
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP"; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ ;;
+ *)
+ AC_MSG_RESULT(no)
+ ;;
+ esac
+fi
+_LT_DECL(, old_striplib, 1, Commands to strip libraries)
+_LT_DECL(, striplib, 1)
+)# _LT_CMD_STRIPLIB
+
+
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun(_LT_PREPARE_MUNGE_PATH_LIST,
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR:DIR:"
+# string "DIR DIR" will be prepended to VARIABLE
+# ":DIR:DIR"
+# string "DIR DIR" will be appended to VARIABLE
+# "DIRP:DIRP::DIRA:DIRA"
+# string "DIRP DIRP" will be prepended to VARIABLE and string
+# "DIRA DIRA" will be appended to VARIABLE
+# "DIR:DIR"
+# VARIABLE will be replaced by "DIR DIR"
+func_munge_path_list ()
+{
+ case x@S|@2 in
+ x)
+ ;;
+ *:)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+ ;;
+ x:*)
+ eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+ ;;
+ *)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+)# _LT_PREPARE_PATH_LIST
+
+
+# _LT_SYS_DYNAMIC_LINKER(TAG)
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun(_LT_SYS_DYNAMIC_LINKER,
+AC_REQUIRE(AC_CANONICAL_HOST)dnl
+m4_require(_LT_DECL_EGREP)dnl
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+m4_require(_LT_DECL_OBJDUMP)dnl
+m4_require(_LT_DECL_SED)dnl
+m4_require(_LT_CHECK_SHELL_FEATURES)dnl
+m4_require(_LT_PREPARE_MUNGE_PATH_LIST)dnl
+AC_MSG_CHECKING(dynamic linker characteristics)
+m4_if($1,
+	, 
+if test yes = "$GCC"; then
+ case $host_os in
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
+ esac
+ case $host_os in
+ mingw* | cegcc*) lt_sed_strip_eq='s|=$A-Za-z:$|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+ *\;*)
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary...
+ lt_tmp_lt_search_path_spec=
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
+ test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo = "/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ if (lt_foo != "") { lt_freqlt_foo++; }
+ if (lt_freqlt_foo == 1) { print lt_foo; }
+}'`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ $SED 's|/$A-Za-z:$|\1|g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi)
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+AC_ARG_VAR(LT_SYS_LIBRARY_PATH,
+User-defined run-time library search path.)
+
+case $host_os in
+aix3*)
+ 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
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+
+aix4-9*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+ if test ia64 = "$host_cpu"; then
+ # AIX 5 supports IA64
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.01 | aix4.01.*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	 echo ' yes '
+	 echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+ else
+	can_build_shared=no
+ fi
+ ;;
+ esac
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+
+amigaos*)
+ case $host_cpu in
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+
+beos*)
+ library_names_spec='$libname$shared_ext'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+bsdi45*)
+ 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'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ # the default ld.so.conf also contains /usr/contrib/lib and
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+ # libtool to hard-code these into programs
+ ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+m4_if($1, ,
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api")
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+ ;;
+ esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$a-zA-Z\$:| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ *)
+ sys_lib_search_path_spec=$LIB
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';c-zC-Z:/' >/dev/null; then
+ # It is most probably a Windows format PATH.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ esac
+
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
+ ;;
+
+ *)
+ # Assume MSVC wrapper
+ library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
+ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if($1, ,
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib")
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+dgux*)
+ 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
+ ;;
+
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd23.*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ need_version=yes
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.01* | freebsdelf3.01*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ freebsd3.2-9* | freebsdelf3.2-9* | \
+ freebsd4.0-5 | freebsdelf4.0-5 | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ esac
+ ;;
+
+haiku*)
+ 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"
+ 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=LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ case $host_cpu in
+ ia64*)
+ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+ fi
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+ postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
+ ;;
+
+interix3-9*)
+ 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'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+ esac
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+ libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
+ *) libsuff= shlibsuff= libmagic=never-match;;
+ esac
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+ hardcode_into_libs=yes
+ ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ 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'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+
+ # Some binutils ld are patched to set DT_RUNPATH
+ AC_CACHE_VAL(lt_cv_shlibpath_overrides_runpath,
+ lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+ AC_LINK_IFELSE(AC_LANG_PROGRAM(,),
+ AS_IF( ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null,
+	 lt_cv_shlibpath_overrides_runpath=yes))
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+ )
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;s/"//g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+ # most powerpc-linux boxes support dynamic linking these days and
+ # people can always --disable-shared, the test was removed, and we
+ # assume the GNU/Linux dynamic linker is in use.
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+netbsdelf*-gnu)
+ version_type=linux
+ 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
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+
+newsos6)
+ 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
+ ;;
+
+*nto* | *qnx*)
+ version_type=qnx
+ 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
+ dynamic_linker='ldqnx.so'
+ ;;
+
+openbsd* | bitrig*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec=/usr/lib
+ need_lib_prefix=no
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
+ else
+ need_version=yes
+ fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+
+os2*)
+ libname_spec='$name'
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
+ need_lib_prefix=no
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ ;;
+
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+
+rdos*)
+ dynamic_linker=no
+ ;;
+
+solaris*)
+ 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=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
+
+sunos4*)
+ version_type=sunos
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test yes = "$with_gnu_ld"; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
+
+sysv4 | sysv4.3*)
+ 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
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
+
+sysv4*MP*)
+ if test -d /usr/nec; then
+ 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
+ fi
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=sco
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ if test yes = "$with_gnu_ld"; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/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'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+uts4*)
+ 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
+ ;;
+
+*)
+ dynamic_linker=no
+ ;;
+esac
+AC_MSG_RESULT($dynamic_linker)
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+_LT_DECL(, variables_saved_for_relink, 1,
+ Variables whose values should be saved in libtool wrapper scripts and
+ restored at link time)
+_LT_DECL(, need_lib_prefix, 0,
+ Do we need the "lib" prefix for modules?)
+_LT_DECL(, need_version, 0, Do we need a version for libraries?)
+_LT_DECL(, version_type, 0, Library versioning type)
+_LT_DECL(, runpath_var, 0, Shared library runtime path variable)
+_LT_DECL(, shlibpath_var, 0,Shared library path variable)
+_LT_DECL(, shlibpath_overrides_runpath, 0,
+ Is shlibpath searched before the hard-coded library search path?)
+_LT_DECL(, libname_spec, 1, Format of library name prefix)
+_LT_DECL(, library_names_spec, 1,
+ List of archive names. First name is the real one, the rest are links.
+ The last name is the one that the linker finds with -lNAME)
+_LT_DECL(, soname_spec, 1,
+ The coded name of the library, if different from the real name)
+_LT_DECL(, install_override_mode, 1,
+ Permission mode override for installation of shared libraries)
+_LT_DECL(, postinstall_cmds, 2,
+ Command to use after installation of a shared archive)
+_LT_DECL(, postuninstall_cmds, 2,
+ Command to use after uninstallation of a shared archive)
+_LT_DECL(, finish_cmds, 2,
+ Commands used to finish a libtool library installation in a directory)
+_LT_DECL(, finish_eval, 1,
+ As "finish_cmds", except a single script fragment to be evaled but
+ not shown)
+_LT_DECL(, hardcode_into_libs, 0,
+ Whether we should hardcode library paths into libraries)
+_LT_DECL(, sys_lib_search_path_spec, 2,
+ Compile-time system search path for libraries)
+_LT_DECL(sys_lib_dlsearch_path_spec, configure_time_dlsearch_path, 2,
+ Detected run-time system search path for libraries)
+_LT_DECL(, configure_time_lt_sys_library_path, 2,
+ Explicit LT_SYS_LIBRARY_PATH set during ./configure time)
+)# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program that can recognize shared library
+AC_DEFUN(_LT_PATH_TOOL_PREFIX,
+m4_require(_LT_DECL_EGREP)dnl
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+case $MAGIC_CMD in
+\\/* | ?:\\/*)
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+ ;;
+*)
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word. This closes a longstanding sh security hole.
+ ac_dummy="m4_if($2, , $PATH, $2)"
+ for ac_dir in $ac_dummy; do
+ IFS=$lt_save_ifs
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$1"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
+ if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	 file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
+	 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	 $EGREP "$file_magic_regex" > /dev/null; then
+	 :
+	 else
+	 cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such. This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem. Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	 fi ;;
+	esac
+ fi
+ break
+ fi
+ done
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
+ ;;
+esac)
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+ AC_MSG_RESULT($MAGIC_CMD)
+else
+ AC_MSG_RESULT(no)
+fi
+_LT_DECL(, MAGIC_CMD, 0,
+	 Used to examine libraries when file_magic_cmd begins with "file")dnl
+)# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS(AC_PATH_TOOL_PREFIX, _LT_PATH_TOOL_PREFIX)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_PATH_TOOL_PREFIX, )
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program that can recognize a shared library
+m4_defun(_LT_PATH_MAGIC,
+_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+ else
+ MAGIC_CMD=:
+ fi
+fi
+)# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN(LT_PATH_LD,
+AC_REQUIRE(AC_PROG_CC)dnl
+AC_REQUIRE(AC_CANONICAL_HOST)dnl
+AC_REQUIRE(AC_CANONICAL_BUILD)dnl
+m4_require(_LT_DECL_SED)dnl
+m4_require(_LT_DECL_EGREP)dnl
+m4_require(_LT_PROG_ECHO_BACKSLASH)dnl
+
+AC_ARG_WITH(gnu-ld,
+ AS_HELP_STRING(--with-gnu-ld,
+	assume the C compiler uses GNU ld @<:@default=no@:>@),
+ test no = "$withval" || with_gnu_ld=yes,
+ with_gnu_ld=no)dnl
+
+ac_prog=ld
+if test yes = "$GCC"; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING(for ld used by $CC)
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return, which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ \\/* | ?:\\/*)
+ re_direlt='/^/^/*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD=$ac_prog
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test yes = "$with_gnu_ld"; then
+ AC_MSG_CHECKING(for GNU ld)
+else
+ AC_MSG_CHECKING(for non-GNU ld)
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+if test -z "$LD"; then
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS=$lt_save_ifs
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD=$ac_dir/$ac_prog
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+ *)
+	test yes != "$with_gnu_ld" && break
+	;;
+ esac
+ fi
+ done
+ IFS=$lt_save_ifs
+else
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi)
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+else
+ AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR(no acceptable ld found in \$PATH)
+_LT_PATH_LD_GNU
+AC_SUBST(LD)
+
+_LT_TAGDECL(, LD, 1, The linker used to build libraries)
+)# LT_PATH_LD
+
+# Old names:
+AU_ALIAS(AM_PROG_LD, LT_PATH_LD)
+AU_ALIAS(AC_PROG_LD, LT_PATH_LD)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AM_PROG_LD, )
+dnl AC_DEFUN(AC_PROG_LD, )
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun(_LT_PATH_LD_GNU,
+AC_CACHE_CHECK(if the linker ($LD) is GNU ld, lt_cv_prog_gnu_ld,
+# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+ ;;
+*)
+ lt_cv_prog_gnu_ld=no
+ ;;
+esac)
+with_gnu_ld=$lt_cv_prog_gnu_ld
+)# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+# -- PORTME Some linkers may need a different reload flag.
+m4_defun(_LT_CMD_RELOAD,
+AC_CACHE_CHECK(for $LD option to reload object files,
+ lt_cv_ld_reload_flag,
+ lt_cv_ld_reload_flag='-r')
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ if test yes != "$GCC"; then
+ reload_cmds=false
+ fi
+ ;;
+ darwin*)
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+ ;;
+esac
+_LT_TAGDECL(, reload_flag, 1, How to create reloadable object files)dnl
+_LT_TAGDECL(, reload_cmds, 2)dnl
+)# _LT_CMD_RELOAD
+
+
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun(_LT_PATH_DD,
+AC_CACHE_CHECK(for a working dd, ac_cv_path_lt_DD,
+printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK(lt_DD, dd,
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi)
+rm -f conftest.i conftest2.i conftest.out)
+)# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun(_LT_CMD_TRUNCATE,
+m4_require(_LT_PATH_DD)
+AC_CACHE_CHECK(how to truncate binary pipes, lt_cv_truncate_bin,
+printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q")
+_LT_DECL(lt_truncate_bin, lt_cv_truncate_bin, 1,
+ Command to truncate a binary pipe)
+)# _LT_CMD_TRUNCATE
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+# -- PORTME fill in with the dynamic library characteristics
+m4_defun(_LT_CHECK_MAGIC_METHOD,
+m4_require(_LT_DECL_EGREP)
+m4_require(_LT_DECL_OBJDUMP)
+AC_CACHE_CHECK(how to recognize dependent libraries,
+lt_cv_deplibs_check_method,
+lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic regex' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix4-9*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+beos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+bsdi45*)
+ lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+cygwin*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
+
+mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
+ ;;
+
+cegcc*)
+ # use the weaker test based on 'objdump'. See mingw*.
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ ;;
+
+darwin* | rhapsody*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+freebsd* | dragonfly*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i3-986 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+ esac
+ else
+ lt_cv_deplibs_check_method=pass_all
+ fi
+ ;;
+
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF-0-90-9) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ ;;
+ hppa*64*)
+ lt_cv_deplibs_check_method='file_magic (s0-90-90-9|ELF -0-90-9)(-bit)?( LMSB)? shared object( file)?, -* PA-RISC 0-9\.0-9'
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
+ *)
+ lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9\.0-9) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+ ;;
+
+interix3-9*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so|\.a)$'
+ ;;
+
+irix5* | irix6* | nonstopux*)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+ *-n32|*"-n32 ") libmagic=N32;;
+ *-64|*"-64 ") libmagic=64-bit;;
+ *) libmagic=never-match;;
+ esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so|_pic\.a)$'
+ fi
+ ;;
+
+newos6*)
+ lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (executable|dynamic lib)'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ ;;
+
+*nto* | *qnx*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
+ fi
+ ;;
+
+osf3* | osf4* | osf5*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+solaris*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit MLSB (shared object|dynamic lib) M0-90-9* Version 0-9'
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+ ;;
+ ncr)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ sequent)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method='file_magic ELF 0-90-9*-bit LMSB (shared object|dynamic lib )'
+ ;;
+ sni)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method="file_magic ELF 0-90-9*-bit LMSB dynamic lib"
+ lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+ ;;
+
+tpf*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+esac
+)
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+ case $host_os in
+ mingw* | pw32*)
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+ want_nocaseglob=yes
+ else
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/\1\/\1\/g;/g"`
+ fi
+ ;;
+ esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL(, deplibs_check_method, 1,
+ Method to check whether dependent libraries are shared objects)
+_LT_DECL(, file_magic_cmd, 1,
+ Command to use when deplibs_check_method = "file_magic")
+_LT_DECL(, file_magic_glob, 1,
+ How to find potential files when deplibs_check_method = "file_magic")
+_LT_DECL(, want_nocaseglob, 1,
+ Find potential files using nocaseglob when deplibs_check_method = "file_magic")
+)# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN(LT_PATH_NM,
+AC_REQUIRE(AC_PROG_CC)dnl
+AC_CACHE_CHECK(for BSD- or MS-compatible name lister (nm), lt_cv_path_NM,
+if test -n "$NM"; then
+ # Let the user override the test.
+ lt_cv_path_NM=$NM
+else
+ lt_nm_to_check=${ac_tool_prefix}nm
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+ IFS=$lt_save_ifs
+ test -z "$ac_dir" && ac_dir=.
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	# nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	 lt_cv_path_NM="$tmp_nm -B"
+	 break 2
+	 ;;
+	*)
+	 case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	 */dev/null*)
+	 lt_cv_path_NM="$tmp_nm -p"
+	 break 2
+	 ;;
+	 *)
+	 lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	 continue # so that we can try to find one that supports BSD flags
+	 ;;
+	 esac
+	 ;;
+	esac
+ fi
+ done
+ IFS=$lt_save_ifs
+ done
+ : ${lt_cv_path_NM=no}
+fi)
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
+else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ AC_CHECK_TOOLS(DUMPBIN, dumpbin "link -dump", :)
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols -headers"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
+ AC_SUBST(DUMPBIN)
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
+ fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST(NM)
+_LT_DECL(, NM, 1, A BSD- or MS-compatible name lister)dnl
+
+AC_CACHE_CHECK(the name lister ($NM) interface, lt_cv_nm_interface,
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+ cat conftest.out >&AS_MESSAGE_LOG_FD
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+ fi
+ rm -f conftest*)
+)# LT_PATH_NM
+
+# Old names:
+AU_ALIAS(AM_PROG_NM, LT_PATH_NM)
+AU_ALIAS(AC_PROG_NM, LT_PATH_NM)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AM_PROG_NM, )
+dnl AC_DEFUN(AC_PROG_NM, )
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+# -- PORTME fill in with the dynamic library characteristics
+m4_defun(_LT_CHECK_SHAREDLIB_FROM_LINKLIB,
+m4_require(_LT_DECL_EGREP)
+m4_require(_LT_DECL_OBJDUMP)
+m4_require(_LT_DECL_DLLTOOL)
+AC_CACHE_CHECK(how to associate runtime and link libraries,
+lt_cv_sharedlib_from_linklib_cmd,
+lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
+ case `$DLLTOOL --help 2>&1` in
+ *--identify-strict*)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+ ;;
+ *)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+ ;;
+ esac
+ ;;
+*)
+ # fallback: assume linklib IS sharedlib
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
+ ;;
+esac
+)
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL(, sharedlib_from_linklib_cmd, 1,
+ Command to associate shared and link libraries)
+)# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun(_LT_PATH_MANIFEST_TOOL,
+AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK(if $MANIFEST_TOOL is a manifest tool, lt_cv_path_mainfest_tool,
+ lt_cv_path_mainfest_tool=no
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*)
+if test yes != "$lt_cv_path_mainfest_tool"; then
+ MANIFEST_TOOL=:
+fi
+_LT_DECL(, MANIFEST_TOOL, 1, Manifest tool)dnl
+)# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P(FILE)
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN(_LT_DLL_DEF_P,
+dnl
+ test DEF = "`$SED -n dnl
+ -e '\''s/^	 *//'\'' dnl Strip leading whitespace
+ -e '\''/^$;.*$*$/d'\'' dnl Delete empty lines and comments
+ -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\'' dnl
+ -e q dnl Only consider the first "real" line
+ $1`" dnl
+)# _LT_DLL_DEF_P
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN(LT_LIB_M,
+AC_REQUIRE(AC_CANONICAL_HOST)dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+ # These system don't have libm, or don't need it
+ ;;
+*-ncr-sysv4.3*)
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+ ;;
+*)
+ AC_CHECK_LIB(m, cos, LIBM=-lm)
+ ;;
+esac
+AC_SUBST(LIBM)
+)# LT_LIB_M
+
+# Old name:
+AU_ALIAS(AC_CHECK_LIBM, LT_LIB_M)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_CHECK_LIBM, )
+
+
+# _LT_COMPILER_NO_RTTI(TAGNAME)
+# -------------------------------
+m4_defun(_LT_COMPILER_NO_RTTI,
+m4_require(_LT_TAG_COMPILER)dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test yes = "$GCC"; then
+ case $cc_basename in
+ nvcc*)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+ esac
+
+ _LT_COMPILER_OPTION(if $compiler supports -fno-rtti -fno-exceptions,
+ lt_cv_prog_compiler_rtti_exceptions,
+ -fno-rtti -fno-exceptions, ,
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions")
+fi
+_LT_TAGDECL(no_builtin_flag, lt_prog_compiler_no_builtin_flag, 1,
+	Compiler flag to turn off builtin functions)
+)# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun(_LT_CMD_GLOBAL_SYMBOLS,
+AC_REQUIRE(AC_CANONICAL_HOST)dnl
+AC_REQUIRE(AC_PROG_CC)dnl
+AC_REQUIRE(AC_PROG_AWK)dnl
+AC_REQUIRE(LT_PATH_NM)dnl
+AC_REQUIRE(LT_PATH_LD)dnl
+m4_require(_LT_DECL_SED)dnl
+m4_require(_LT_DECL_EGREP)dnl
+m4_require(_LT_TAG_COMPILER)dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING(command to parse $NM output from $compiler object)
+AC_CACHE_VAL(lt_cv_sys_global_symbol_pipe,
+
+# These are sane defaults that work on at least a few old systems.
+# They come from Ultrix. What could be older than Ultrix?!! ;)
+
+# Character class describing NM global symbol codes.
+symcode='BCDEGRST'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='$_A-Za-z_A-Za-z0-9*$'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+ symcode='BCDT'
+ ;;
+cygwin* | mingw* | pw32* | cegcc*)
+ symcode='ABCDGISTW'
+ ;;
+hpux*)
+ if test ia64 = "$host_cpu"; then
+ symcode='ABCDEGRST'
+ fi
+ ;;
+irix* | nonstopux*)
+ symcode='BCDEGRST'
+ ;;
+osf*)
+ symcode='BCDEGQRST'
+ ;;
+solaris*)
+ symcode='BDRT'
+ ;;
+sco3.2v5*)
+ symcode='DT'
+ ;;
+sysv4.2uw2*)
+ symcode='DT'
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='ABDT'
+ ;;
+sysv4)
+ symcode='DFNSTU'
+ ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+ symcode='ABCDGIRSTW' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* $.*$$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* $lib.*$$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* $.*$$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* $.*$$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* $lib.*$$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/ {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+ ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+ symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+ # Write the raw and C identifiers.
+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
+ # Also find C++ and __fastcall symbols from MSVC++,
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK '"\
+" {last_section=section; section=\$ 3};"\
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
+" /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn2,2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+" \$ 0!~/External *\|/{next};"\
+" / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
+" {if(hidesection) next};"\
+" {f=\"D\"}; \$ 0~/.*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a2,s)};"\
+" s1~/^@?/{print f,s1,s1; next};"\
+" s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
+" ' prfx=^$ac_symprfx"
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ fi
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+
+ rm -f conftest*
+ cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+ if AC_TRY_EVAL(ac_compile); then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+ # Try sorting and uniquifying the output.
+ if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+ else
+	rm -f "$nlist"T
+ fi
+
+ # Make sure that we snagged all the symbols we need.
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	 cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT@&t@_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data. */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	 # Now generate the symbol file.
+	 eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	 cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols. */
+LT@&t@_DLSYM_CONST struct {
+ const char *name;
+ void *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols =
+{
+ { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	 $SED "s/^$symcode$symcode* .* $.*$$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	 cat <<\_LT_EOF >> conftest.$ac_ext
+ {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	 # Now try linking the two files.
+	 mv conftest.$ac_objext conftstm.$ac_objext
+	 lt_globsym_save_LIBS=$LIBS
+	 lt_globsym_save_CFLAGS=$CFLAGS
+	 LIBS=conftstm.$ac_objext
+	 CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	 if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+	 pipe_works=yes
+	 fi
+	 LIBS=$lt_globsym_save_LIBS
+	 CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	 echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+ else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+ fi
+ else
+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+ fi
+ else
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test yes = "$pipe_works"; then
+ break
+ else
+ lt_cv_sys_global_symbol_pipe=
+ fi
+done
+)
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+ lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+ AC_MSG_RESULT(failed)
+else
+ AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '@FILE' >/dev/null; then
+ nm_file_list_spec='@'
+fi
+
+_LT_DECL(global_symbol_pipe, lt_cv_sys_global_symbol_pipe, 1,
+ Take the output of nm and produce a listing of raw symbols and C names)
+_LT_DECL(global_symbol_to_cdecl, lt_cv_sys_global_symbol_to_cdecl, 1,
+ Transform the output of nm in a proper C declaration)
+_LT_DECL(global_symbol_to_import, lt_cv_sys_global_symbol_to_import, 1,
+ Transform the output of nm into a list of symbols to manually relocate)
+_LT_DECL(global_symbol_to_c_name_address,
+ lt_cv_sys_global_symbol_to_c_name_address, 1,
+ Transform the output of nm in a C name address pair)
+_LT_DECL(global_symbol_to_c_name_address_lib_prefix,
+ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix, 1,
+ Transform the output of nm in a C name address pair when lib prefix is needed)
+_LT_DECL(nm_interface, lt_cv_nm_interface, 1,
+ The name lister interface)
+_LT_DECL(, nm_file_list_spec, 1,
+ Specify filename containing input files for $NM)
+) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC(TAGNAME)
+# ---------------------------
+m4_defun(_LT_COMPILER_PIC,
+m4_require(_LT_TAG_COMPILER)dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if($1, CXX, 
+ # C++ specific cases for pic, static, wl, etc.
+ if test yes = "$GXX"; then
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+ if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+ ;;
+
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ m4_if($1, GCJ, ,
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
+ case $host_os in
+ os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+ esac
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+ *djgpp*)
+ # DJGPP does not support shared libraries at all
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ ;;
+ interix3-9*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+ fi
+ ;;
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
+ case $host_cpu in
+ hppa*64*)
+	;;
+ *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+ esac
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+ else
+ case $host_os in
+ aix4-9*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	 # AIX 5 now supports IA64 processor
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+ chorus*)
+	case $cc_basename in
+	cxch68*)
+	 # Green Hills C++ Compiler
+	 # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	 ;;
+	esac
+	;;
+ mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if($1, GCJ, ,
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
+	;;
+ dgux*)
+	case $cc_basename in
+	 ec++*)
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	 ;;
+	 ghcx*)
+	 # Green Hills C++ Compiler
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	 ;;
+	 *)
+	 ;;
+	esac
+	;;
+ freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+ hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	 CC*)
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	 if test ia64 != "$host_cpu"; then
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	 fi
+	 ;;
+	 aCC*)
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	 case $host_cpu in
+	 hppa*64*|ia64*)
+	 # +Z the default
+	 ;;
+	 *)
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	 ;;
+	 esac
+	 ;;
+	 *)
+	 ;;
+	esac
+	;;
+ interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+ irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	 CC*)
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	 # CC pic flag -KPIC is the default.
+	 ;;
+	 *)
+	 ;;
+	esac
+	;;
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	 KCC*)
+	 # KAI C++ Compiler
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	 ;;
+	 ecpc* )
+	 # old Intel C++ for x86_64, which still supported -KPIC.
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	 ;;
+	 icpc* )
+	 # Intel C++, used to be incompatible with GCC.
+	 # ICC 10 doesn't accept -KPIC any more.
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	 ;;
+	 pgCC* | pgcpp*)
+	 # Portland Group C++ compiler
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	 ;;
+	 cxx*)
+	 # Compaq C++
+	 # Make sure the PIC flag is empty. It appears that all Alpha
+	 # Linux and Compaq Tru64 Unix objects are PIC.
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	 ;;
+	 xlc* | xlC* | bgxlcC* | mpixlcC*)
+	 # IBM XL 8.0, 9.0 on PPC and BlueGene
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	 ;;
+	 *)
+	 case `$CC -V 2>&1 | sed 5q` in
+	 *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)='-Qoption ld '
+	 ;;
+	 esac
+	 ;;
+	esac
+	;;
+ lynxos*)
+	;;
+ m88k*)
+	;;
+ mvs*)
+	case $cc_basename in
+	 cxx*)
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	 ;;
+	 *)
+	 ;;
+	esac
+	;;
+ netbsd* | netbsdelf*-gnu)
+	;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+ ;;
+ osf3* | osf4* | osf5*)
+	case $cc_basename in
+	 KCC*)
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	 ;;
+	 RCC*)
+	 # Rational C++ 2.4.1
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	 ;;
+	 cxx*)
+	 # Digital/Compaq C++
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 # Make sure the PIC flag is empty. It appears that all Alpha
+	 # Linux and Compaq Tru64 Unix objects are PIC.
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	 ;;
+	 *)
+	 ;;
+	esac
+	;;
+ psos*)
+	;;
+ solaris*)
+	case $cc_basename in
+	 CC* | sunCC*)
+	 # Sun C++ 4.2, 5.x and Centerline C++
+	 _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 '
+	 ;;
+	 gcx*)
+	 # Green Hills C++ Compiler
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	 ;;
+	 *)
+	 ;;
+	esac
+	;;
+ sunos4*)
+	case $cc_basename in
+	 CC*)
+	 # Sun C++ 4.x
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	 ;;
+	 lcc*)
+	 # Lucid
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	 ;;
+	 *)
+	 ;;
+	esac
+	;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	 CC*)
+	 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	 _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	 ;;
+	esac
+	;;
+ tandem*)
+	case $cc_basename in
+	 NCC*)
+	 # NonStop-UX NCC 3.20
+	 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	 ;;
+	 *)
+	 ;;
+	esac
+	;;
+ vxworks*)
+	;;
+ *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+ esac
+ fi
+,
+
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+ if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+ ;;
+
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ m4_if($1, GCJ, ,
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
+ case $host_os in
+ os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+ esac
+ ;;
+
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=
+ ;;
+
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
+ case $host_cpu in
+ hppa*64*)
+	# +Z the default
+	;;
+ *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+ esac
+ ;;
+
+ interix3-9*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ enable_shared=no
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+ fi
+ ;;
+
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+ 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
+ # PORTME Check for flag to pass linker flags through the system compiler.
+ case $host_os in
+ aix*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
+
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
+ ;;
+
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ m4_if($1, GCJ, ,
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT')
+ case $host_os in
+ os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+ esac
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+ case $host_cpu in
+ hppa*64*|ia64*)
+	# +Z the default
+	;;
+ *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC (with -KPIC) is the default.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ # old Intel for x86_64, which still supported -KPIC.
+ ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ # icc used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+ # Lahey Fortran 8.1.
+ lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+ nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+ tcc*)
+	# Fabrice Bellard et al's Tiny C 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'
+	;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ ccc*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All Alpha code is PIC.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+ *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*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
+ ;;
+
+ newsos6)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+ ;;
+
+ osf3* | osf4* | osf5*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All OSF/1 code is PIC.
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ rdos*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ solaris*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+ *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+ esac
+ ;;
+
+ sunos4*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ sysv4 | sysv4.2uw2* | sysv4.3*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+ ;;
+
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ unicos*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
+
+ uts4*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+ *)
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
+ esac
+ fi
+)
+case $host_os in
+ # For platforms that do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
+ *)
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if($1,, -DPIC,m4_if($1,CXX, -DPIC,))"
+ ;;
+esac
+
+AC_CACHE_CHECK(for $compiler option to produce PIC,
+ _LT_TAGVAR(lt_cv_prog_compiler_pic, $1),
+ _LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1))
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ _LT_COMPILER_OPTION(if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works,
+ _LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ $_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if($1,, -DPIC,m4_if($1,CXX, -DPIC,)), ,
+ case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+ esac,
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no)
+fi
+_LT_TAGDECL(pic_flag, lt_prog_compiler_pic, 1,
+	Additional compiler flags for building library objects)
+
+_LT_TAGDECL(wl, lt_prog_compiler_wl, 1,
+	How to pass a linker flag through the compiler)
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION(if $compiler static flag $lt_tmp_static_flag works,
+ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ ,
+ _LT_TAGVAR(lt_prog_compiler_static, $1)=)
+_LT_TAGDECL(link_static_flag, lt_prog_compiler_static, 1,
+	Compiler flag to prevent dynamic linking)
+)# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS(TAGNAME)
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun(_LT_LINKER_SHLIBS,
+AC_REQUIRE(LT_PATH_LD)dnl
+AC_REQUIRE(LT_PATH_NM)dnl
+m4_require(_LT_PATH_MANIFEST_TOOL)dnl
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+m4_require(_LT_DECL_EGREP)dnl
+m4_require(_LT_DECL_SED)dnl
+m4_require(_LT_CMD_GLOBAL_SYMBOLS)dnl
+m4_require(_LT_TAG_COMPILER)dnl
+AC_MSG_CHECKING(whether the $compiler linker ($LD) supports shared libraries)
+m4_if($1, CXX, 
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
+ case $host_os in
+ aix4-9*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+ else
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+ fi
+ ;;
+ pw32*)
+ _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
+ ;;
+ cygwin* | mingw* | cegcc*)
+ case $cc_basename in
+ 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'
+ ;;
+ esac
+ ;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
+, 
+ runpath_var=
+ _LT_TAGVAR(allow_undefined_flag, $1)=
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(archive_cmds, $1)=
+ _LT_TAGVAR(archive_expsym_cmds, $1)=
+ _LT_TAGVAR(compiler_needs_object, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(hardcode_automatic, $1)=no
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_TAGVAR(inherit_rpath, $1)=no
+ _LT_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_TAGVAR(module_cmds, $1)=
+ _LT_TAGVAR(module_expsym_cmds, $1)=
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+ _LT_TAGVAR(thread_safe_flag_spec, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ # include_expsyms should be a list of space-separated symbols to be *always*
+ # included in the symbol list
+ _LT_TAGVAR(include_expsyms, $1)=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
+ _LT_TAGVAR(exclude_expsyms, $1)='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+ extract_expsyms_cmds=
+
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ if test yes != "$GCC"; then
+ with_gnu_ld=no
+ fi
+ ;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+ openbsd* | bitrig*)
+ with_gnu_ld=no
+ ;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
+ esac
+
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
+ if test yes = "$with_gnu_ld"; then
+ case $host_os in
+ aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker. However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	 *\ $GNU\ Binutils$\ 2.19.5*) ;;
+	 *\ $GNU\ Binutils$\ 2.2-9*) ;;
+	 *\ $GNU\ Binutils$\ 3-9*) ;;
+	 *)
+	 lt_use_gnu_ld_interface=yes
+	 ;;
+	esac
+	;;
+ *)
+	lt_use_gnu_ld_interface=yes
+	;;
+ esac
+ fi
+
+ if test yes = "$lt_use_gnu_ld_interface"; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='$wl'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ supports_anon_versioning=no
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3-9*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test ia64 != "$host_cpu"; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support. If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
+ ;;
+ m68k)
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ esac
+ ;;
+
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined. This deserves some investigation. FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=no
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _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'
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	 prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ interix3-9*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	 diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+ then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+ pgcc*)				# Portland Group C compiler
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	 tmp_addflag=' $pic_flag'
+	 ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	 tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	 tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	 tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	 tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	 tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
+	xlcC* | bgxlcC* | mpixlcC*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	 tmp_sharedflag='-qmkshrobj'
+	 tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	 _LT_TAGVAR(compiler_needs_object, $1)=yes
+	 ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	 _LT_TAGVAR(compiler_needs_object, $1)=yes
+	 tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	 tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+ if test yes = "$supports_anon_versioning"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+ fi
+
+	case $cc_basename in
+	tcc*)
+	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	 ;;
+	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)='$wl-rpath $wl$libdir'
+	 _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	 if test yes = "$supports_anon_versioning"; then
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	 fi
+	 ;;
+	esac
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+ else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+ solaris*)
+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ 01.* | *\ 2.0-9.* | *\ 2.10-5.*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	 # For security reasons, it is highly recommended that you always
+	 # use absolute paths for naming shared libraries, and exclude the
+	 # DT_RUNPATH tag from executables and libraries. But doing so
+	 # requires that you compile everything twice, which is a pain.
+	 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	 else
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 fi
+	;;
+ esac
+ ;;
+
+ sunos4*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+
+ if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
+ runpath_var=
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+ case $host_os in
+ aix3*)
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+ fi
+ ;;
+
+ aix4-9*)
+ if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+ else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	 _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	 _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+	# "aix,yes" lib.so shared, rtl:yes, for executables
+	# lib.a static archive
+	# "both,no" lib.so.V(shr.o) shared, rtl:yes
+	# lib.a(lib.so.V) shared, rtl:no, for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	# lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+	# lib.a static archive
+	case $host_os in aix4.23|aix4.23.*|aix5-9*)
+	 for ld_flag in $LDFLAGS; do
+	 if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	 aix_use_runtimelinking=yes
+	 break
+	 fi
+	 done
+	 if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	 # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	 # so we don't have lib.a shared libs to link our executables.
+	 # We have to force runtime linking in this case.
+	 aix_use_runtimelinking=yes
+	 LDFLAGS="$LDFLAGS -Wl,-brtl"
+	 fi
+	 ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+ fi
+
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+ _LT_TAGVAR(archive_cmds, $1)=''
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+ esac
+
+ if test yes = "$GCC"; then
+	case $host_os in aix4.012|aix4.012.*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	 collect2name=`$CC -print-prog-name=collect2`
+	 if test -f "$collect2name" &&
+	 strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	 then
+	 # We have reworked collect2
+	 :
+	 else
+	 # We have old collect2
+	 _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	 # It fails to find uninstalled libraries when the uninstalled
+	 # path is not listed in the libpath. Setting hardcode_minus_L
+	 # to unsupported forces relinking
+	 _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	 _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	 fi
+	 ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	 shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+ else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	 shared_flag='-G'
+	else
+	 if test yes = "$aix_use_runtimelinking"; then
+	 shared_flag='$wl-G'
+	 else
+	 shared_flag='$wl-bM:SRE'
+	 fi
+	 shared_flag_aix='$wl-bM:SRE'
+	 shared_flag_svr4='$wl-G'
+	fi
+ fi
+
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ _LT_SYS_MODULE_PATH_AIX($1)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+ else
+	if test ia64 = "$host_cpu"; then
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	 _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX($1)
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	 # Warning - without using the other run time loading flags,
+	 # -berok will link without error, but may produce a broken library.
+	 _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	 _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	 if test yes = "$with_gnu_ld"; then
+	 # We only use this code for GNU lds that support --whole-archive.
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	 else
+	 # Exported symbols can be pulled into shared objects from archives
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	 fi
+	 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	 # -brtl affects multiple linker settings, -berok does not and is overridden later
+	 compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\$, \$%-berok\\1%g"`'
+	 if test svr4 != "$with_aix_soname"; then
+	 # This is similar to how AIX traditionally builds its shared libraries.
+	 _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	 fi
+	 if test aix != "$with_aix_soname"; then
+	 _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	 else
+	 # used by -dlpreopen to get the symbols
+	 _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+	 fi
+	 _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+	fi
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)=''
+ ;;
+ m68k)
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ esac
+ ;;
+
+ bsdi45*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ case $cc_basename in
+ cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+	# 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'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+	;;
+ *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+ esac
+ ;;
+
+ darwin* | rhapsody*)
+ _LT_DARWIN_LINKER_FEATURES($1)
+ ;;
+
+ dgux*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $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
+ # extra space).
+ freebsd2.2*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+ 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
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ hpux9*)
+ if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+ else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+ fi
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+ ;;
+
+ hpux10*)
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 ;;
+	ia64*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	 ;;
+	*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	 ;;
+	esac
+ else
+	case $host_cpu in
+	hppa*64*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 ;;
+	ia64*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	 ;;
+	*)
+	m4_if($1, , 
+	 # Older versions of the 11.00 compiler do not understand -b yet
+	 # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	 _LT_LINKER_OPTION(if $CC understands -b,
+	 _LT_TAGVAR(lt_cv_prog_compiler__b, $1), -b,
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags',
+	 _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'),
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags')
+	 ;;
+	esac
+ fi
+ if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	 _LT_TAGVAR(hardcode_direct, $1)=no
+	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	 ;;
+	*)
+	 _LT_TAGVAR(hardcode_direct, $1)=yes
+	 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+
+	 # hardcode_minus_L: Not really in the search PATH,
+	 # but as the default location of the library.
+	 _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	 ;;
+	esac
+ fi
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+ if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK(whether the $host_os linker accepts -exported_symbol,
+	 lt_cv_irix_exported_symbol,
+	 save_LDFLAGS=$LDFLAGS
+	 LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	 AC_LINK_IFELSE(
+	 AC_LANG_SOURCE(
+	 AC_LANG_CASE(C, int foo (void) { return 0; },
+			 C++, int foo (void) { return 0; },
+			 Fortran 77, 
+ subroutine foo
+ end,
+			 Fortran, 
+ subroutine foo
+ end)),
+	 lt_cv_irix_exported_symbol=yes,
+	 lt_cv_irix_exported_symbol=no)
+ LDFLAGS=$save_LDFLAGS)
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
+ else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+ linux*)
+ case $cc_basename in
+ tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+ esac
+ ;;
+
+ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+ fi
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ newsos6)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ *nto* | *qnx*)
+ ;;
+
+ openbsd* | bitrig*)
+ if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	else
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	fi
+ else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	 prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ osf3*)
+ if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+ osf4* | osf5*)	# as osf3* with the addition of -msym flag
+ if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ fi
+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+ solaris*)
+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+ if test yes = "$GCC"; then
+	wlarc='$wl'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	 wlarc=''
+	 _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	 ;;
+	*)
+	 wlarc='$wl'
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	 ;;
+	esac
+ fi
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.0-5 | solaris2.0-5.*) ;;
+ *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'. GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+ esac
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+ sunos4*)
+ if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ sysv4)
+ case $host_vendor in
+	sni)
+	 _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	 _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	 ## LD is ld it makes a PLAMLIB
+	 ## CC just makes a GrossModule.
+	 _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	 _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	 _LT_TAGVAR(hardcode_direct, $1)=no
+ ;;
+	motorola)
+	 _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	 _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+ esac
+ runpath_var='LD_RUN_PATH'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ sysv4.3*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+ fi
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+ if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We CANNOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ uts4*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+ *)
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+
+ if test sni = "$host_vendor"; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
+	;;
+ esac
+ fi
+ fi
+)
+AC_MSG_RESULT($_LT_TAGVAR(ld_shlibs, $1))
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL(, libext, 0, Old archive suffix (normally "a"))dnl
+_LT_DECL(, shrext_cmds, 1, Shared library suffix (normally ".so"))dnl
+_LT_DECL(, extract_expsyms_cmds, 2,
+ The commands to extract the exported symbol list from a shared archive)
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+ # Assume -lc should be added
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+ if test yes,yes = "$GCC,$enable_shared"; then
+ case $_LT_TAGVAR(archive_cmds, $1) in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+ ;;
+ '$CC '*)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+ AC_CACHE_CHECK(whether -lc should be explicitly linked in,
+	lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1),
+	$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	 soname=conftest
+	 lib=conftest
+	 libobjs=conftest.$ac_objext
+	 deplibs=
+	 wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	 pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	 compiler_flags=-v
+	 linker_flags=-v
+	 verstring=
+	 output_objdir=.
+	 libname=conftest
+	 lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	 _LT_TAGVAR(allow_undefined_flag, $1)=
+	 if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	 then
+	 lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	 else
+	 lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	 fi
+	 _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	 cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	)
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv__LT_TAGVAR(archive_cmds_need_lc, $1)
+ ;;
+ esac
+ fi
+ ;;
+esac
+
+_LT_TAGDECL(build_libtool_need_lc, archive_cmds_need_lc, 0,
+ Whether or not to add -lc for building shared libraries)
+_LT_TAGDECL(allow_libtool_libs_with_static_runtimes,
+ enable_shared_with_static_runtimes, 0,
+ Whether or not to disallow shared libs when runtime libs are static)
+_LT_TAGDECL(, export_dynamic_flag_spec, 1,
+ Compiler flag to allow reflexive dlopens)
+_LT_TAGDECL(, whole_archive_flag_spec, 1,
+ Compiler flag to generate shared objects directly from archives)
+_LT_TAGDECL(, compiler_needs_object, 1,
+ Whether the compiler copes with passing no objects directly)
+_LT_TAGDECL(, old_archive_from_new_cmds, 2,
+ Create an old-style archive from a shared archive)
+_LT_TAGDECL(, old_archive_from_expsyms_cmds, 2,
+ Create a temporary old-style archive to link instead of a shared archive)
+_LT_TAGDECL(, archive_cmds, 2, Commands used to build a shared archive)
+_LT_TAGDECL(, archive_expsym_cmds, 2)
+_LT_TAGDECL(, module_cmds, 2,
+ Commands used to build a loadable module if different from building
+ a shared archive.)
+_LT_TAGDECL(, module_expsym_cmds, 2)
+_LT_TAGDECL(, with_gnu_ld, 1,
+ Whether we are building with GNU ld or not)
+_LT_TAGDECL(, allow_undefined_flag, 1,
+ Flag that allows shared libraries with undefined symbols to be built)
+_LT_TAGDECL(, no_undefined_flag, 1,
+ Flag that enforces no undefined symbols)
+_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_separator, 1,
+ Whether we need a single "-rpath" flag with a separated argument)
+_LT_TAGDECL(, hardcode_direct, 0,
+ Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+ DIR into the resulting binary)
+_LT_TAGDECL(, hardcode_direct_absolute, 0,
+ Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+ DIR into the resulting binary and the resulting library dependency is
+ "absolute", i.e impossible to change by setting $shlibpath_var if the
+ library is relocated)
+_LT_TAGDECL(, hardcode_minus_L, 0,
+ Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+ into the resulting binary)
+_LT_TAGDECL(, hardcode_shlibpath_var, 0,
+ Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+ into the resulting binary)
+_LT_TAGDECL(, hardcode_automatic, 0,
+ Set to "yes" if building a shared library automatically hardcodes DIR
+ into the library and all subsequent libraries and executables linked
+ against it)
+_LT_TAGDECL(, inherit_rpath, 0,
+ Set to yes if linker adds runtime paths of dependent libraries
+ to runtime path list)
+_LT_TAGDECL(, link_all_deplibs, 0,
+ Whether libtool must link a program against all its dependency libraries)
+_LT_TAGDECL(, always_export_symbols, 0,
+ Set to "yes" if exported symbols are required)
+_LT_TAGDECL(, export_symbols_cmds, 2,
+ The commands to list exported symbols)
+_LT_TAGDECL(, exclude_expsyms, 1,
+ Symbols that should not be listed in the preloaded symbols)
+_LT_TAGDECL(, include_expsyms, 1,
+ Symbols that must always be exported)
+_LT_TAGDECL(, prelink_cmds, 2,
+ Commands necessary for linking programs (against libraries) with templates)
+_LT_TAGDECL(, postlink_cmds, 2,
+ Commands necessary for finishing linking programs)
+_LT_TAGDECL(, file_list_spec, 1,
+ Specify filename containing input files)
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL(, thread_safe_flag_spec, 1,
+dnl Compiler flag to generate thread safe objects)
+)# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG(TAG)
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined. These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun(_LT_LANG_C_CONFIG,
+m4_require(_LT_DECL_EGREP)dnl
+lt_save_CC=$CC
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, ) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+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_SYS_DYNAMIC_LINKER($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+ LT_SYS_DLOPEN_SELF
+ _LT_CMD_STRIPLIB
+
+ # Report what library types will actually be built
+ AC_MSG_CHECKING(if libtool supports shared libraries)
+ AC_MSG_RESULT($can_build_shared)
+
+ AC_MSG_CHECKING(whether to build shared libraries)
+ test no = "$can_build_shared" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+ test yes = "$enable_shared" && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+
+ aix4-9*)
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;;			# shared object as lib.so file only
+ yes,svr4,*) ;;			# shared object as lib.so archive member only
+ yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+ esac
+ fi
+ ;;
+ esac
+ AC_MSG_RESULT($enable_shared)
+
+ AC_MSG_CHECKING(whether to build static libraries)
+ # Make sure either enable_shared or enable_static is yes.
+ test yes = "$enable_shared" || enable_static=yes
+ AC_MSG_RESULT($enable_static)
+
+ _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC=$lt_save_CC
+)# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG(TAG)
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined. These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun(_LT_LANG_CXX_CONFIG,
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+m4_require(_LT_DECL_EGREP)dnl
+m4_require(_LT_PATH_MANIFEST_TOOL)dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
+ AC_PROG_CXXCPP
+else
+ _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code='int main(int, char *) { return(0); }'
+
+ # 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_LD=$LD
+ lt_save_GCC=$GCC
+ GCC=$GXX
+ lt_save_with_gnu_ld=$with_gnu_ld
+ lt_save_path_LD=$lt_cv_path_LD
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ CFLAGS=$CXXFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME($compiler)
+
+ if test -n "$compiler"; then
+ # We don't want -fno-exception when compiling C++ code, so set the
+ # no_builtin_flag separately
+ if test yes = "$GXX"; then
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ else
+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ fi
+
+ if test yes = "$GXX"; then
+ # Set up default GNU C++ configuration
+
+ LT_PATH_LD
+
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test yes = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+ # investigate it a little bit more. (MM)
+ wlarc='$wl'
+
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	 $GREP 'no-whole-archive' > /dev/null; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ with_gnu_ld=no
+ wlarc=
+
+ # A generic and very simple default shared library creation
+ # command for GNU C++ for the case where it uses the native
+ # linker, instead of GNU ld. If possible, this setting should
+ # overridden to take advantage of the native linker features on
+ # the platform it is being used on.
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ fi
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+ else
+ GXX=no
+ with_gnu_ld=no
+ wlarc=
+ fi
+
+ # PORTME: fill in a description of your system's C++ link characteristics
+ AC_MSG_CHECKING(whether the $compiler linker ($LD) supports shared libraries)
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ case $host_os in
+ aix3*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aix4-9*)
+ if test ia64 = "$host_cpu"; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+ no_entry_flag=
+ else
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
+ case $host_os in aix4.23|aix4.23.*|aix5-9*)
+	 for ld_flag in $LDFLAGS; do
+	 case $ld_flag in
+	 *-brtl*)
+	 aix_use_runtimelinking=yes
+	 break
+	 ;;
+	 esac
+	 done
+	 if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	 # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	 # so we don't have lib.a shared libs to link our executables.
+	 # We have to force runtime linking in this case.
+	 aix_use_runtimelinking=yes
+	 LDFLAGS="$LDFLAGS -Wl,-brtl"
+	 fi
+	 ;;
+ esac
+
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+ _LT_TAGVAR(archive_cmds, $1)=''
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;;	# no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
+
+ if test yes = "$GXX"; then
+ case $host_os in aix4.012|aix4.012.*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+	 collect2name=`$CC -print-prog-name=collect2`
+	 if test -f "$collect2name" &&
+	 strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	 then
+	 # We have reworked collect2
+	 :
+	 else
+	 # We have old collect2
+	 _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	 # It fails to find uninstalled libraries when the uninstalled
+	 # path is not listed in the libpath. Setting hardcode_minus_L
+	 # to unsupported forces relinking
+	 _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	 _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	 fi
+ esac
+ shared_flag='-shared'
+	 if test yes = "$aix_use_runtimelinking"; then
+	 shared_flag=$shared_flag' $wl-G'
+	 fi
+	 # Need to ensure runtime linking is disabled for the traditional
+	 # shared library, or the linker may eventually find shared libraries
+	 # /with/ Import File - we do not want to mix them.
+	 shared_flag_aix='-shared'
+	 shared_flag_svr4='-shared $wl-G'
+ else
+ # not using gcc
+ if test ia64 = "$host_cpu"; then
+	 # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	 # chokes on -Wl,-G. The following line is correct:
+	 shared_flag='-G'
+ else
+	 if test yes = "$aix_use_runtimelinking"; then
+	 shared_flag='$wl-G'
+	 else
+	 shared_flag='$wl-bM:SRE'
+	 fi
+	 shared_flag_aix='$wl-bM:SRE'
+	 shared_flag_svr4='$wl-G'
+ fi
+ fi
+
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to
+	# export.
+ _LT_TAGVAR(always_export_symbols, $1)=yes
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ # The "-G" linker flag allows undefined symbols.
+ _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
+ # Determine the default libpath from the value encoded in an empty
+ # executable.
+ _LT_SYS_MODULE_PATH_AIX($1)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+ else
+ if test ia64 = "$host_cpu"; then
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	 _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	 _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+ else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX($1)
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	 # Warning - without using the other run time loading flags,
+	 # -berok will link without error, but may produce a broken library.
+	 _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	 _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	 if test yes = "$with_gnu_ld"; then
+	 # We only use this code for GNU lds that support --whole-archive.
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	 else
+	 # Exported symbols can be pulled into shared objects from archives
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	 fi
+	 _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	 # -brtl affects multiple linker settings, -berok does not and is overridden later
+	 compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\$, \$%-berok\\1%g"`'
+	 if test svr4 != "$with_aix_soname"; then
+	 # This is similar to how AIX traditionally builds its shared
+	 # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	 _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	 fi
+	 if test aix != "$with_aix_soname"; then
+	 _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	 else
+	 # used by -dlpreopen to get the symbols
+	 _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+	 fi
+	 _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+ fi
+ fi
+ ;;
+
+ beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	 # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	 # support --undefined. This deserves some investigation. FIXME
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+ chorus*)
+ case $cc_basename in
+ *)
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ esac
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	 # Native MSVC
+	 # hardcode_libdir_flag_spec is actually meaningless, as there is
+	 # no search path for DLLs.
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	 _LT_TAGVAR(always_export_symbols, $1)=yes
+	 _LT_TAGVAR(file_list_spec, $1)='@'
+	 # Tell ltmain to make .lib files, not .a files.
+	 libext=lib
+	 # Tell ltmain to make .dll files, not .so files.
+	 shrext_cmds=.dll
+	 # FIXME: Setting linknames here is a bad hack.
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+	 # 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
+	 # Don't use ranlib
+	 _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	 _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+	 ;;
+	*)
+	 # g++
+	 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	 # as there is no search path for DLLs.
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+	 _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	 _LT_TAGVAR(always_export_symbols, $1)=no
+	 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	 # If the export-symbols file already is a .def file, use it as
+	 # is; otherwise, prepend EXPORTS...
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P($export_symbols); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	 else
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 fi
+	 ;;
+	esac
+	;;
+ darwin* | rhapsody*)
+ _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+ os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	 $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	 $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	 $ECHO EXPORTS >> $output_objdir/$libname.def~
+	 emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	 $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	 emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	 $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	 $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	 $ECHO EXPORTS >> $output_objdir/$libname.def~
+	 prefix_cmds="$SED"~
+	 if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	 prefix_cmds="$prefix_cmds -e 1d";
+	 fi~
+	 prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	 cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	 $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	 emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+
+ dgux*)
+ case $cc_basename in
+ ec++*)
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ ghcx*)
+	 # Green Hills C++ Compiler
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ *)
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ esac
+ ;;
+
+ freebsd2.*)
+ # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ freebsd-elf*)
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ ;;
+
+ freebsd* | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
+
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+ hpux9*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				 # but as the default
+				 # location of the library.
+
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ aCC*)
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ #
+ # There doesn't appear to be a way to prevent this compiler from
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ ;;
+ *)
+ if test yes = "$GXX"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+ ;;
+
+ hpux10*|hpux11*)
+ if test no = "$with_gnu_ld"; then
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+ ;;
+ esac
+ fi
+ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+ *)
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					 # but as the default
+					 # location of the library.
+ ;;
+ esac
+
+ case $cc_basename in
+ CC*)
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ aCC*)
+	 case $host_cpu in
+	 hppa*64*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 ;;
+	 ia64*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 ;;
+	 *)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 ;;
+	 esac
+	 # Commands to make compiler produce verbose output that lists
+	 # what "hidden" libraries, object files and flags are used when
+	 # linking a shared library.
+	 #
+	 # There doesn't appear to be a way to prevent this compiler from
+	 # explicitly linking system object files so we need to strip them
+	 # from the output so that they don't get included in the library
+	 # dependencies.
+	 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	 ;;
+ *)
+	 if test yes = "$GXX"; then
+	 if test no = "$with_gnu_ld"; then
+	 case $host_cpu in
+	 hppa*64*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 ;;
+	 ia64*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 ;;
+	 *)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 ;;
+	 esac
+	 fi
+	 else
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 fi
+	 ;;
+ esac
+ ;;
+
+ interix3-9*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process. To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time. Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+ irix5* | irix6*)
+ case $cc_basename in
+ CC*)
+	 # SGI C++
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	 # Archives containing C++ object files must be created using
+	 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+	 # necessary to make sure instantiated templates are included
+	 # in the archive.
+	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	 ;;
+ *)
+	 if test yes = "$GXX"; then
+	 if test no = "$with_gnu_ld"; then
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	 else
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	 fi
+	 fi
+	 _LT_TAGVAR(link_all_deplibs, $1)=yes
+	 ;;
+ esac
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ KCC*)
+	 # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	 # KCC will only create a shared library if the output file
+	 # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	 # to its proper name (with version) after linking.
+	 _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	 # Commands to make compiler produce verbose output that lists
+	 # what "hidden" libraries, object files and flags are used when
+	 # linking a shared library.
+	 #
+	 # There doesn't appear to be a way to prevent this compiler from
+	 # explicitly linking system object files so we need to strip them
+	 # from the output so that they don't get included in the library
+	 # dependencies.
+	 output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+	 # Archives containing C++ object files must be created using
+	 # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	 ;;
+	 icpc* | ecpc* )
+	 # Intel C++
+	 with_gnu_ld=yes
+	 # version 8.0 and above of icpc choke on multiply defined symbols
+	 # if we add $predep_objects and $postdep_objects, however 7.1 and
+	 # earlier do not add the objects themselves.
+	 case `$CC -V 2>&1` in
+	 *"Version 7."*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	 *) # Version 8.0 or newer
+	 tmp_idyn=
+	 case $host_cpu in
+		 ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	 esac
+	 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	 ;;
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+	 case `$CC -V` in
+	 *pgCC\ 1-5.* | *pgcpp\ 1-5.*)
+	 _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	 _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
+	 _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	 ;;
+	 *) # Version 6 and above use weak symbols
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	 ;;
+	 esac
+
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+ ;;
+	 cxx*)
+	 # Compaq C++
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	 runpath_var=LD_RUN_PATH
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	 # Commands to make compiler produce verbose output that lists
+	 # what "hidden" libraries, object files and flags are used when
+	 # linking a shared library.
+	 #
+	 # There doesn't appear to be a way to prevent this compiler from
+	 # explicitly linking system object files so we need to strip them
+	 # from the output so that they don't get included in the library
+	 # dependencies.
+	 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	 ;;
+	 xl* | mpixl* | bgxl*)
+	 # IBM XL 8.0 on PPC, with GNU ld
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	 if test yes = "$supports_anon_versioning"; then
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+	 fi
+	 ;;
+	 *)
+	 case `$CC -V 2>&1 | sed 5q` in
+	 *Sun\ C*)
+	 # Sun C++ 5.9
+	 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	 _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	 # Not sure whether something based on
+	 # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	 # would be better.
+	 output_verbose_link_cmd='func_echo_all'
+
+	 # Archives containing C++ object files must be created using
+	 # "CC -xar", where "CC" is the Sun C++ compiler. This is
+	 # necessary to make sure instantiated templates are included
+	 # in the archive.
+	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	 ;;
+	 esac
+	 ;;
+	esac
+	;;
+
+ lynxos*)
+ # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+ m88k*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+ mvs*)
+ case $cc_basename in
+ cxx*)
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+	 *)
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+	esac
+	;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	 _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	 wlarc=
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	 _LT_TAGVAR(hardcode_direct, $1)=yes
+	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+ *nto* | *qnx*)
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+ openbsd* | bitrig*)
+	if test -f /usr/libexec/ld.so; then
+	 _LT_TAGVAR(hardcode_direct, $1)=yes
+	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	 _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	 _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	 _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	 fi
+	 output_verbose_link_cmd=func_echo_all
+	else
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+ KCC*)
+	 # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	 # KCC will only create a shared library if the output file
+	 # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	 # to its proper name (with version) after linking.
+	 _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	 # Archives containing C++ object files must be created using
+	 # the KAI C++ compiler.
+	 case $host in
+	 osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	 *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	 esac
+	 ;;
+ RCC*)
+	 # Rational C++ 2.4.1
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ cxx*)
+	 case $host in
+	 osf3*)
+	 _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+		;;
+	 *)
+	 _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+ $RM $lib.exp'
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	 esac
+
+	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	 # Commands to make compiler produce verbose output that lists
+	 # what "hidden" libraries, object files and flags are used when
+	 # linking a shared library.
+	 #
+	 # There doesn't appear to be a way to prevent this compiler from
+	 # explicitly linking system object files so we need to strip them
+	 # from the output so that they don't get included in the library
+	 # dependencies.
+	 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	 ;;
+	 *)
+	 if test yes,no = "$GXX,$with_gnu_ld"; then
+	 _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	 case $host in
+	 osf3*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		 ;;
+	 *)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		 ;;
+	 esac
+
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	 _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	 # Commands to make compiler produce verbose output that lists
+	 # what "hidden" libraries, object files and flags are used when
+	 # linking a shared library.
+	 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	 else
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 fi
+	 ;;
+ esac
+ ;;
+
+ psos*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ sunos4*)
+ case $cc_basename in
+ CC*)
+	 # Sun C++ 4.x
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ lcc*)
+	 # Lucid
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ *)
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ esac
+ ;;
+
+ solaris*)
+ case $cc_basename in
+ CC* | sunCC*)
+	 # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	 _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	 case $host_os in
+	 solaris2.0-5 | solaris2.0-5.*) ;;
+	 *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	 # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	 ;;
+	 esac
+	 _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	 output_verbose_link_cmd='func_echo_all'
+
+	 # Archives containing C++ object files must be created using
+	 # "CC -xar", where "CC" is the Sun C++ compiler. This is
+	 # necessary to make sure instantiated templates are included
+	 # in the archive.
+	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	 ;;
+ gcx*)
+	 # Green Hills C++ Compiler
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	 # The C++ compiler must be used to create the archive.
+	 _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	 ;;
+ *)
+	 # GNU C++ compiler with Solaris linker
+	 if test yes,no = "$GXX,$with_gnu_ld"; then
+	 _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
+	 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	 # Commands to make compiler produce verbose output that lists
+	 # what "hidden" libraries, object files and flags are used when
+	 # linking a shared library.
+	 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	 else
+	 # g++ 2.7 appears to require '-G' NOT '-shared' on this
+	 # platform.
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	 # Commands to make compiler produce verbose output that lists
+	 # what "hidden" libraries, object files and flags are used when
+	 # linking a shared library.
+	 output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	 fi
+
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
+	 case $host_os in
+		solaris2.0-5 | solaris2.0-5.*) ;;
+		*)
+		 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		 ;;
+	 esac
+	 fi
+	 ;;
+ esac
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
+
+ case $cc_basename in
+ CC*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 ;;
+	*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 ;;
+ esac
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We CANNOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly. If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+ CC*)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	 _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+ '"$_LT_TAGVAR(reload_cmds, $1)"
+	 ;;
+	 *)
+	 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 ;;
+	esac
+ ;;
+
+ tandem*)
+ case $cc_basename in
+ NCC*)
+	 # NonStop-UX NCC 3.20
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ *)
+	 # FIXME: insert proper C++ library support
+	 _LT_TAGVAR(ld_shlibs, $1)=no
+	 ;;
+ esac
+ ;;
+
+ vxworks*)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+ *)
+ # FIXME: insert proper C++ library support
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
+
+ AC_MSG_RESULT($_LT_TAGVAR(ld_shlibs, $1))
+ test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+ _LT_TAGVAR(GCC, $1)=$GXX
+ _LT_TAGVAR(LD, $1)=$LD
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ _LT_SYS_HIDDEN_LIBDEPS($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_SYS_DYNAMIC_LINKER($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+ fi # test -n "$compiler"
+
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+ LDCXX=$LD
+ LD=$lt_save_LD
+ GCC=$lt_save_GCC
+ with_gnu_ld=$lt_save_with_gnu_ld
+ lt_cv_path_LDCXX=$lt_cv_path_LD
+ lt_cv_path_LD=$lt_save_path_LD
+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+AC_LANG_POP
+)# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun(_LT_FUNC_STRIPNAME_CNF,dnl
+AC_REQUIRE(_LT_DECL_SED)
+AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)
+func_stripname_cnf ()
+{
+ case @S|@2 in
+ .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+ *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
+ esac
+} # func_stripname_cnf
+)# _LT_FUNC_STRIPNAME_CNF
+
+
+# _LT_SYS_HIDDEN_LIBDEPS(TAGNAME)
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun(_LT_SYS_HIDDEN_LIBDEPS,
+m4_require(_LT_FILEUTILS_DEFAULTS)dnl
+AC_REQUIRE(_LT_FUNC_STRIPNAME_CNF)dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library. It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if($1, , cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+, $1, CXX, cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+ Foo (void) { a = 0; }
+private:
+ int a;
+};
+_LT_EOF
+, $1, F77, cat > conftest.$ac_ext <<_LT_EOF
+ subroutine foo
+ implicit none
+ integer*4 a
+ a=0
+ return
+ end
+_LT_EOF
+, $1, FC, cat > conftest.$ac_ext <<_LT_EOF
+ subroutine foo
+ implicit none
+ integer a
+ a=0
+ return
+ end
+_LT_EOF
+, $1, GCJ, cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+ private int a;
+ public void bar (void) {
+ a = 0;
+ }
+};
+_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
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+
+ # Sentinel used to keep track of whether or not we are before
+ # the conftest object file.
+ pre_test_object_deps_done=no
+
+ for p in `eval "$output_verbose_link_cmd"`; do
+ case $prev$p in
+
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+ # Remove the space.
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
+	 prev=$p
+	 continue
+ fi
+
+ # Expand the sysroot to ease extracting the directories later.
+ if test -z "$prev"; then
+ case $p in
+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+ esac
+ fi
+ case $p in
+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+ esac
+ if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
+	 # Internal compiler library paths should come after those
+	 # provided the user. The postdeps already come after the
+	 # user supplied libs so there is no need to process them.
+	 if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	 _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
+	 else
+	 _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
+	 fi
+	 ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+ else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	 _LT_TAGVAR(postdeps, $1)=$prev$p
+	 else
+	 _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
+	 fi
+ fi
+ prev=
+ ;;
+
+ *.lto.$objext) ;; # Ignore GCC LTO objects
+ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+ if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+ fi
+
+ if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	 _LT_TAGVAR(predep_objects, $1)=$p
+	 else
+	 _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+ else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	 _LT_TAGVAR(postdep_objects, $1)=$p
+	 else
+	 _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+ fi
+ ;;
+
+ *) ;; # Ignore the rest.
+
+ esac
+ done
+
+ # Clean up.
+ rm -f a.out a.exe
+else
+ echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if($1, CXX,
+case $host_os in
+interix3-9*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ _LT_TAGVAR(predep_objects,$1)=
+ _LT_TAGVAR(postdep_objects,$1)=
+ _LT_TAGVAR(postdeps,$1)=
+ ;;
+esac
+)
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL(, compiler_lib_search_dirs, 1,
+ The directories searched by this compiler when creating a shared library)
+_LT_TAGDECL(, predep_objects, 1,
+ Dependencies to place before and after the objects being linked to
+ create a shared library)
+_LT_TAGDECL(, postdep_objects, 1)
+_LT_TAGDECL(, predeps, 1)
+_LT_TAGDECL(, postdeps, 1)
+_LT_TAGDECL(, compiler_lib_search_path, 1,
+ The library search path used internally by the compiler when linking
+ a shared library)
+)# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG(TAG)
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun(_LT_LANG_F77_CONFIG,
+AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+ _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_F77"; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+ return
+ end
+"
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="\
+ program t
+ end
+"
+
+ # 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_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
+ CC=${F77-"f77"}
+ CFLAGS=$FFLAGS
+ compiler=$CC
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME($compiler)
+ GCC=$G77
+ if test -n "$compiler"; then
+ AC_MSG_CHECKING(if libtool supports shared libraries)
+ AC_MSG_RESULT($can_build_shared)
+
+ AC_MSG_CHECKING(whether to build shared libraries)
+ test no = "$can_build_shared" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+ test yes = "$enable_shared" && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix4-9*)
+	if test ia64 != "$host_cpu"; then
+	 case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	 yes,aix,yes) ;;		# shared object as lib.so file only
+	 yes,svr4,*) ;;		# shared object as lib.so archive member only
+	 yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	 esac
+	fi
+ ;;
+ esac
+ AC_MSG_RESULT($enable_shared)
+
+ AC_MSG_CHECKING(whether to build static libraries)
+ # Make sure either enable_shared or enable_static is yes.
+ test yes = "$enable_shared" || enable_static=yes
+ AC_MSG_RESULT($enable_static)
+
+ _LT_TAGVAR(GCC, $1)=$G77
+ _LT_TAGVAR(LD, $1)=$LD
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_SYS_DYNAMIC_LINKER($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+ fi # test -n "$compiler"
+
+ GCC=$lt_save_GCC
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
+
+AC_LANG_POP
+)# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG(TAG)
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun(_LT_LANG_FC_CONFIG,
+AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+ _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working. Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_FC"; then
+ # Code to be used in simple compile tests
+ lt_simple_compile_test_code="\
+ subroutine t
+ return
+ end
+"
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="\
+ program t
+ end
+"
+
+ # 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_GCC=$GCC
+ lt_save_CFLAGS=$CFLAGS
+ CC=${FC-"f95"}
+ CFLAGS=$FCFLAGS
+ compiler=$CC
+ GCC=$ac_cv_fc_compiler_gnu
+
+ _LT_TAGVAR(compiler, $1)=$CC
+ _LT_CC_BASENAME($compiler)
+
+ if test -n "$compiler"; then
+ AC_MSG_CHECKING(if libtool supports shared libraries)
+ AC_MSG_RESULT($can_build_shared)
+
+ AC_MSG_CHECKING(whether to build shared libraries)
+ test no = "$can_build_shared" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+ test yes = "$enable_shared" && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+ aix4-9*)
+	if test ia64 != "$host_cpu"; then
+	 case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	 yes,aix,yes) ;;		# shared object as lib.so file only
+	 yes,svr4,*) ;;		# shared object as lib.so archive member only
+	 yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	 esac
+	fi
+ ;;
+ esac
+ AC_MSG_RESULT($enable_shared)
+
+ AC_MSG_CHECKING(whether to build static libraries)
+ # Make sure either enable_shared or enable_static is yes.
+ test yes = "$enable_shared" || enable_static=yes
+ AC_MSG_RESULT($enable_static)
+
+ _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+ _LT_TAGVAR(LD, $1)=$LD
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+ ## what you are doing...
+ _LT_SYS_HIDDEN_LIBDEPS($1)
+ _LT_COMPILER_PIC($1)
+ _LT_COMPILER_C_O($1)
+ _LT_COMPILER_FILE_LOCKS($1)
+ _LT_LINKER_SHLIBS($1)
+ _LT_SYS_DYNAMIC_LINKER($1)
+ _LT_LINKER_HARDCODE_LIBPATH($1)
+
+ _LT_CONFIG($1)
+ fi # test -n "$compiler"
+
+ GCC=$lt_save_GCC
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
+
+AC_LANG_POP
+)# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG(TAG)
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun(_LT_LANG_GCJ_CONFIG,
+AC_REQUIRE(LT_PROG_GCJ)dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }'
+
+# 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=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME($compiler)
+
+# GCJ 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_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
+# are suitably defined. These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun(_LT_LANG_RC_CONFIG,
+AC_REQUIRE(LT_PROG_RC)dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code=$lt_simple_compile_test_code
+
+# 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=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME($compiler)
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+ :
+ _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+)# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN(LT_PROG_GCJ,
+m4_ifdef(AC_PROG_GCJ, AC_PROG_GCJ,
+ m4_ifdef(AM_PROG_GCJ, AM_PROG_GCJ,
+ AC_CHECK_TOOL(GCJ, gcj,)
+ test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
+ AC_SUBST(GCJFLAGS)))dnl
+)
+
+# Old name:
+AU_ALIAS(LT_AC_PROG_GCJ, LT_PROG_GCJ)
+dnl aclocal-1.4 backwards compatibility:
+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,
+AC_CHECK_TOOL(RC, windres,)
+)
+
+# Old name:
+AU_ALIAS(LT_AC_PROG_RC, LT_PROG_RC)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(LT_AC_PROG_RC, )
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun(_LT_DECL_EGREP,
+AC_REQUIRE(AC_PROG_EGREP)dnl
+AC_REQUIRE(AC_PROG_FGREP)dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL(, GREP, 1, A grep program that handles long lines)
+_LT_DECL(, EGREP, 1, An ERE matcher)
+_LT_DECL(, FGREP, 1, A literal string matcher)
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST(GREP)
+)
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun(_LT_DECL_OBJDUMP,
+AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL(, OBJDUMP, 1, An object symbol dumper)
+AC_SUBST(OBJDUMP)
+)
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun(_LT_DECL_DLLTOOL,
+AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL(, DLLTOOL, 1, DLL creation program)
+AC_SUBST(DLLTOOL)
+)
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible. Prefer GNU sed if found.
+m4_defun(_LT_DECL_SED,
+AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL(, SED, 1, A sed program that does not truncate output)
+_LT_DECL(, Xsed, "\$SED -e 1s/^X//",
+ Sed that helps us avoid accidentally triggering echo(1) options like -n)
+)# _LT_DECL_SED
+
+m4_ifndef(AC_PROG_SED, 
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_SED. When it is available in #
+# a released version of Autoconf we should remove this #
+# macro and use it instead. #
+
+m4_defun(AC_PROG_SED,
+AC_MSG_CHECKING(for a sed that does not truncate output)
+AC_CACHE_VAL(lt_cv_path_SED,
+# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+ test ! -f "$lt_ac_sed" && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+ # Check for GNU sed and select it if it is found.
+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+ lt_cv_path_SED=$lt_ac_sed
+ break
+ fi
+ while true; do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo >>conftest.nl
+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+ cmp -s conftest.out conftest.nl || break
+ # 10000 chars as input seems more than enough
+ test 10 -lt "$lt_ac_count" && break
+ lt_ac_count=`expr $lt_ac_count + 1`
+ if test "$lt_ac_count" -gt "$lt_ac_max"; then
+ lt_ac_max=$lt_ac_count
+ lt_cv_path_SED=$lt_ac_sed
+ fi
+ done
+done
+)
+SED=$lt_cv_path_SED
+AC_SUBST(SED)
+AC_MSG_RESULT($SED)
+)#AC_PROG_SED
+)#m4_ifndef
+
+# Old name:
+AU_ALIAS(LT_AC_PROG_SED, AC_PROG_SED)
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(LT_AC_PROG_SED, )
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun(_LT_CHECK_SHELL_FEATURES,
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
+else
+ lt_unset=false
+fi
+_LT_DECL(, lt_unset, 0, whether the shell understands "unset")dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+ lt_SP2NL='tr \040 \012'
+ lt_NL2SP='tr \015\012 \040\040'
+ ;;
+ *) # EBCDIC based system
+ lt_SP2NL='tr \100 \n'
+ lt_NL2SP='tr \r\n \100\100'
+ ;;
+esac
+_LT_DECL(SP2NL, lt_SP2NL, 1, turn spaces into newlines)dnl
+_LT_DECL(NL2SP, lt_NL2SP, 1, turn newlines into spaces)dnl
+)# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun(_LT_PATH_CONVERSION_FUNCTIONS,
+AC_REQUIRE(AC_CANONICAL_HOST)dnl
+AC_REQUIRE(AC_CANONICAL_BUILD)dnl
+AC_MSG_CHECKING(how to convert $build file names to $host format)
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+ ;;
+ esac
+ ;;
+ *-*-cygwin* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+ ;;
+ esac
+ ;;
+ * ) # unhandled hosts (and "normal" native builds)
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+esac
+)
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT($lt_cv_to_host_file_cmd)
+_LT_DECL(to_host_file_cmd, lt_cv_to_host_file_cmd,
+ 0, convert $build file names to $host format)dnl
+
+AC_MSG_CHECKING(how to convert $build file names to toolchain format)
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ esac
+ ;;
+esac
+)
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT($lt_cv_to_tool_file_cmd)
+_LT_DECL(to_tool_file_cmd, lt_cv_to_tool_file_cmd,
+ 0, convert $build files to toolchain format)dnl
+)# _LT_PATH_CONVERSION_FUNCTIONS
+
+# Helper functions for option handling. -*- Autoconf -*-
+#
+# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+# Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# 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 8 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN(LTOPTIONS_VERSION, m4_if(1))
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define(_LT_MANGLE_OPTION,
+_LT_OPTION_m4_bpatsubst($1__$2, ^a-zA-Z0-9_, _))
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it. Other OPTION-NAMEs are
+# saved as a flag.
+m4_define(_LT_SET_OPTION,
+m4_define(_LT_MANGLE_OPTION($1, $2))dnl
+m4_ifdef(_LT_MANGLE_DEFUN($1, $2),
+ _LT_MANGLE_DEFUN($1, $2),
+ m4_warning(Unknown $1 option '$2'))dnl
+)
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, IF-NOT-SET)
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define(_LT_IF_OPTION,
+m4_ifdef(_LT_MANGLE_OPTION($1, $2), $3, $4))
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define(_LT_UNLESS_OPTIONS,
+m4_foreach(_LT_Option, m4_split(m4_normalize($2)),
+	 m4_ifdef(_LT_MANGLE_OPTION($1, _LT_Option),
+		 m4_define($0_found)))dnl
+m4_ifdef($0_found, m4_undefine($0_found), $3
+)dnl
+)
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME. If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun(_LT_SET_OPTIONS,
+# Set options
+m4_foreach(_LT_Option, m4_split(m4_normalize($2)),
+ _LT_SET_OPTION($1, _LT_Option))
+
+m4_if($1,LT_INIT,
+ dnl
+ dnl Simply set some default values (i.e off) if boolean options were not
+ dnl specified:
+ _LT_UNLESS_OPTIONS(LT_INIT, dlopen, enable_dlopen=no
+ )
+ _LT_UNLESS_OPTIONS(LT_INIT, win32-dll, enable_win32_dll=no
+ )
+ dnl
+ dnl If no reference was made to various pairs of opposing options, then
+ dnl we run the default mode handler for the pair. For example, if neither
+ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
+ dnl archives by default:
+ _LT_UNLESS_OPTIONS(LT_INIT, shared disable-shared, _LT_ENABLE_SHARED)
+ _LT_UNLESS_OPTIONS(LT_INIT, static disable-static, _LT_ENABLE_STATIC)
+ _LT_UNLESS_OPTIONS(LT_INIT, pic-only no-pic, _LT_WITH_PIC)
+ _LT_UNLESS_OPTIONS(LT_INIT, fast-install disable-fast-install,
+		 _LT_ENABLE_FAST_INSTALL)
+ _LT_UNLESS_OPTIONS(LT_INIT, aix-soname=aix aix-soname=both aix-soname=svr4,
+		 _LT_WITH_AIX_SONAME(aix))
+ )
+)# _LT_SET_OPTIONS
+
+
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define(_LT_MANGLE_DEFUN,
+_LT_OPTION_DEFUN_m4_bpatsubst(m4_toupper($1__$2), ^A-Z0-9_, _))
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define(LT_OPTION_DEFINE,
+m4_define(_LT_MANGLE_DEFUN($1, $2), $3)dnl
+)# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE(LT_INIT, dlopen, enable_dlopen=yes
+)
+
+AU_DEFUN(AC_LIBTOOL_DLOPEN,
+_LT_SET_OPTION(LT_INIT, dlopen)
+AC_DIAGNOSE(obsolete,
+$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.)
+)
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_LIBTOOL_DLOPEN, )
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE(LT_INIT, win32-dll,
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+ AC_CHECK_TOOL(AS, as, false)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
+ ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL(, AS, 1, Assembler program)dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL(, DLLTOOL, 1, DLL creation program)dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL(, OBJDUMP, 1, Object dumper program)dnl
+)# win32-dll
+
+AU_DEFUN(AC_LIBTOOL_WIN32_DLL,
+AC_REQUIRE(AC_CANONICAL_HOST)dnl
+_LT_SET_OPTION(LT_INIT, win32-dll)
+AC_DIAGNOSE(obsolete,
+$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.)
+)
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_LIBTOOL_WIN32_DLL, )
+
+
+# _LT_ENABLE_SHARED(DEFAULT)
+# ----------------------------
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
+m4_define(_LT_ENABLE_SHARED,
+m4_define(_LT_ENABLE_SHARED_DEFAULT, m4_if($1, no, no, yes))dnl
+AC_ARG_ENABLE(shared,
+ AS_HELP_STRING(--enable-shared@<:@=PKGS@:>@,
+	build shared libraries @<:@default=_LT_ENABLE_SHARED_DEFAULT@:>@),
+ p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	 enable_shared=yes
+	fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac,
+ enable_shared=_LT_ENABLE_SHARED_DEFAULT)
+
+ _LT_DECL(build_libtool_libs, enable_shared, 0,
+	Whether or not to build shared libraries)
+)# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE(LT_INIT, shared, _LT_ENABLE_SHARED(yes))
+LT_OPTION_DEFINE(LT_INIT, disable-shared, _LT_ENABLE_SHARED(no))
+
+# Old names:
+AC_DEFUN(AC_ENABLE_SHARED,
+_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)shared)
+)
+
+AC_DEFUN(AC_DISABLE_SHARED,
+_LT_SET_OPTION(LT_INIT, disable-shared)
+)
+
+AU_DEFUN(AM_ENABLE_SHARED, AC_ENABLE_SHARED($@))
+AU_DEFUN(AM_DISABLE_SHARED, AC_DISABLE_SHARED($@))
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AM_ENABLE_SHARED, )
+dnl AC_DEFUN(AM_DISABLE_SHARED, )
+
+
+
+# _LT_ENABLE_STATIC(DEFAULT)
+# ----------------------------
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
+m4_define(_LT_ENABLE_STATIC,
+m4_define(_LT_ENABLE_STATIC_DEFAULT, m4_if($1, no, no, yes))dnl
+AC_ARG_ENABLE(static,
+ AS_HELP_STRING(--enable-static@<:@=PKGS@:>@,
+	build static libraries @<:@default=_LT_ENABLE_STATIC_DEFAULT@:>@),
+ p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	 enable_static=yes
+	fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac,
+ enable_static=_LT_ENABLE_STATIC_DEFAULT)
+
+ _LT_DECL(build_old_libs, enable_static, 0,
+	Whether or not to build static libraries)
+)# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE(LT_INIT, static, _LT_ENABLE_STATIC(yes))
+LT_OPTION_DEFINE(LT_INIT, disable-static, _LT_ENABLE_STATIC(no))
+
+# Old names:
+AC_DEFUN(AC_ENABLE_STATIC,
+_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)static)
+)
+
+AC_DEFUN(AC_DISABLE_STATIC,
+_LT_SET_OPTION(LT_INIT, disable-static)
+)
+
+AU_DEFUN(AM_ENABLE_STATIC, AC_ENABLE_STATIC($@))
+AU_DEFUN(AM_DISABLE_STATIC, AC_DISABLE_STATIC($@))
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AM_ENABLE_STATIC, )
+dnl AC_DEFUN(AM_DISABLE_STATIC, )
+
+
+
+# _LT_ENABLE_FAST_INSTALL(DEFAULT)
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
+m4_define(_LT_ENABLE_FAST_INSTALL,
+m4_define(_LT_ENABLE_FAST_INSTALL_DEFAULT, m4_if($1, no, no, yes))dnl
+AC_ARG_ENABLE(fast-install,
+ AS_HELP_STRING(--enable-fast-install@<:@=PKGS@:>@,
+ optimize for fast installation @<:@default=_LT_ENABLE_FAST_INSTALL_DEFAULT@:>@),
+ p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	 enable_fast_install=yes
+	fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac,
+ enable_fast_install=_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL(fast_install, enable_fast_install, 0,
+	 Whether or not to optimize for fast installation)dnl
+)# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE(LT_INIT, fast-install, _LT_ENABLE_FAST_INSTALL(yes))
+LT_OPTION_DEFINE(LT_INIT, disable-fast-install, _LT_ENABLE_FAST_INSTALL(no))
+
+# Old names:
+AU_DEFUN(AC_ENABLE_FAST_INSTALL,
+_LT_SET_OPTION(LT_INIT, m4_if($1, no, disable-)fast-install)
+AC_DIAGNOSE(obsolete,
+$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.)
+)
+
+AU_DEFUN(AC_DISABLE_FAST_INSTALL,
+_LT_SET_OPTION(LT_INIT, disable-fast-install)
+AC_DIAGNOSE(obsolete,
+$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.)
+)
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_ENABLE_FAST_INSTALL, )
+dnl AC_DEFUN(AM_DISABLE_FAST_INSTALL, )
+
+
+# _LT_WITH_AIX_SONAME(DEFAULT)
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+m4_define(_LT_WITH_AIX_SONAME,
+m4_define(_LT_WITH_AIX_SONAME_DEFAULT, m4_if($1, svr4, svr4, m4_if($1, both, both, aix)))dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix5-9*,yes)
+ AC_MSG_CHECKING(which variant of shared library versioning to provide)
+ AC_ARG_WITH(aix-soname,
+ AS_HELP_STRING(--with-aix-soname=aix|svr4|both,
+ shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=_LT_WITH_AIX_SONAME_DEFAULT@:>@.),
+ case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR(Unknown argument to --with-aix-soname)
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname,
+ AC_CACHE_VAL(lt_cv_with_aix_soname,
+ lt_cv_with_aix_soname=_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname)
+ AC_MSG_RESULT($with_aix_soname)
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+_LT_DECL(, shared_archive_member_spec, 0,
+ Shared archive member basename, for filename based shared library versioning on AIX)dnl
+)# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE(LT_INIT, aix-soname=aix, _LT_WITH_AIX_SONAME(aix))
+LT_OPTION_DEFINE(LT_INIT, aix-soname=both, _LT_WITH_AIX_SONAME(both))
+LT_OPTION_DEFINE(LT_INIT, aix-soname=svr4, _LT_WITH_AIX_SONAME(svr4))
+
+
+# _LT_WITH_PIC(MODE)
+# --------------------
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
+# LT_INIT options.
+# 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@<:@=PKGS@:>@,
+	try to use only PIC/non-PIC objects @<:@default=use both@:>@),
+ 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=m4_default($1, default))
+
+_LT_DECL(, pic_mode, 0, What type of objects to build)dnl
+)# _LT_WITH_PIC
+
+LT_OPTION_DEFINE(LT_INIT, pic-only, _LT_WITH_PIC(yes))
+LT_OPTION_DEFINE(LT_INIT, no-pic, _LT_WITH_PIC(no))
+
+# Old name:
+AU_DEFUN(AC_LIBTOOL_PICMODE,
+_LT_SET_OPTION(LT_INIT, pic-only)
+AC_DIAGNOSE(obsolete,
+$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.)
+)
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN(AC_LIBTOOL_PICMODE, )
+
+
+m4_define(_LTDL_MODE, )
+LT_OPTION_DEFINE(LTDL_INIT, nonrecursive,
+		 m4_define(_LTDL_MODE, nonrecursive))
+LT_OPTION_DEFINE(LTDL_INIT, recursive,
+		 m4_define(_LTDL_MODE, recursive))
+LT_OPTION_DEFINE(LTDL_INIT, subproject,
+		 m4_define(_LTDL_MODE, subproject))
+
+m4_define(_LTDL_TYPE, )
+LT_OPTION_DEFINE(LTDL_INIT, installable,
+		 m4_define(_LTDL_TYPE, installable))
+LT_OPTION_DEFINE(LTDL_INIT, convenience,
+		 m4_define(_LTDL_TYPE, convenience))
+
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# 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 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN(LTSUGAR_VERSION, m4_if(0.1))
+
+
+# lt_join(SEP, ARG1, ARG2...)
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define(lt_join,
+m4_if($#, 1, ,
+ $#, 2, $2,
+ m4_if($2, , , $2_)$0($1, m4_shift(m4_shift($@)))))
+m4_define(_lt_join,
+m4_if($#$2, 2, ,
+ m4_if($2, , , $1$2)$0($1, m4_shift(m4_shift($@)))))
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59, which quotes differently.
+m4_define(lt_car, $1)
+m4_define(lt_cdr,
+m4_if($#, 0, m4_fatal($0: cannot be called without arguments),
+ $#, 1, ,
+ m4_dquote(m4_shift($@))))
+m4_define(lt_unquote, $1)
+
+
+# lt_append(MACRO-NAME, STRING, SEPARATOR)
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define(lt_append,
+m4_define($1,
+	 m4_ifdef($1, m4_defn($1)$3)$2))
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, SUFFIX2...)
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define(lt_combine,
+m4_if(m4_eval($# > 3), 1,
+ m4_pushdef(_Lt_sep, m4_define(_Lt_sep, m4_defn(lt_car)))dnl
+m4_foreach(_Lt_prefix, $2,
+	 m4_foreach(_Lt_suffix,
+		m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@))))),
+	_Lt_sep($1)m4_defn(_Lt_prefix)$3m4_defn(_Lt_suffix)))))
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, SEPARATOR, UNIQ, NOT-UNIQ)
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define(lt_if_append_uniq,
+m4_ifdef($1,
+	 m4_if(m4_index($3m4_defn($1)$3, $3$2$3), -1,
+		 lt_append($1, $2, $3)$4,
+		 $5),
+	 lt_append($1, $2, $3)$4))
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define(lt_dict_add,
+m4_define($1($2), $3))
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define(lt_dict_add_subkey,
+m4_define($1($2:$3), $4))
+
+
+# lt_dict_fetch(DICT, KEY, SUBKEY)
+# ----------------------------------
+m4_define(lt_dict_fetch,
+m4_ifval($3,
+	m4_ifdef($1($2:$3), m4_defn($1($2:$3))),
+ m4_ifdef($1($2), m4_defn($1($2)))))
+
+
+# lt_if_dict_fetch(DICT, KEY, SUBKEY, VALUE, IF-TRUE, IF-FALSE)
+# -----------------------------------------------------------------
+m4_define(lt_if_dict_fetch,
+m4_if(lt_dict_fetch($1, $2, $3), $4,
+	$5,
+ $6))
+
+
+# lt_dict_filter(DICT, SUBKEY, VALUE, SEPARATOR, KEY, ...)
+# --------------------------------------------------------------
+m4_define(lt_dict_filter,
+m4_if($5, , ,
+ lt_join(m4_quote(m4_default($4, , )),
+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car(m4_shiftn(4, $@)),
+		 lt_if_dict_fetch($1, _Lt_key, $2, $3, _Lt_key )))))))dnl
+)
+
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+# Written by Scott James Remnant, 2004
+#
+# 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.
+
+# @configure_input@
+
+# serial 4179 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define(LT_PACKAGE_VERSION, 2.4.6)
+m4_define(LT_PACKAGE_REVISION, 2.4.6)
+
+AC_DEFUN(LTVERSION_VERSION,
+macro_version='2.4.6'
+macro_revision='2.4.6'
+_LT_DECL(, macro_version, 0, Which release of libtool.m4 was used?)
+_LT_DECL(, macro_revision, 0)
+)
+
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+# Foundation, Inc.
+# Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else. This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN(LTOBSOLETE_VERSION, m4_if(1))
+
+m4_ifndef(AC_LIBTOOL_LINKER_OPTION,	AC_DEFUN(AC_LIBTOOL_LINKER_OPTION))
+m4_ifndef(AC_PROG_EGREP,		AC_DEFUN(AC_PROG_EGREP))
+m4_ifndef(_LT_AC_PROG_ECHO_BACKSLASH,	AC_DEFUN(_LT_AC_PROG_ECHO_BACKSLASH))
+m4_ifndef(_LT_AC_SHELL_INIT,		AC_DEFUN(_LT_AC_SHELL_INIT))
+m4_ifndef(_LT_AC_SYS_LIBPATH_AIX,	AC_DEFUN(_LT_AC_SYS_LIBPATH_AIX))
+m4_ifndef(_LT_PROG_LTMAIN,		AC_DEFUN(_LT_PROG_LTMAIN))
+m4_ifndef(_LT_AC_TAGVAR,		AC_DEFUN(_LT_AC_TAGVAR))
+m4_ifndef(AC_LTDL_ENABLE_INSTALL,	AC_DEFUN(AC_LTDL_ENABLE_INSTALL))
+m4_ifndef(AC_LTDL_PREOPEN,		AC_DEFUN(AC_LTDL_PREOPEN))
+m4_ifndef(_LT_AC_SYS_COMPILER,	AC_DEFUN(_LT_AC_SYS_COMPILER))
+m4_ifndef(_LT_AC_LOCK,		AC_DEFUN(_LT_AC_LOCK))
+m4_ifndef(AC_LIBTOOL_SYS_OLD_ARCHIVE,	AC_DEFUN(AC_LIBTOOL_SYS_OLD_ARCHIVE))
+m4_ifndef(_LT_AC_TRY_DLOPEN_SELF,	AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF))
+m4_ifndef(AC_LIBTOOL_PROG_CC_C_O,	AC_DEFUN(AC_LIBTOOL_PROG_CC_C_O))
+m4_ifndef(AC_LIBTOOL_SYS_HARD_LINK_LOCKS, AC_DEFUN(AC_LIBTOOL_SYS_HARD_LINK_LOCKS))
+m4_ifndef(AC_LIBTOOL_OBJDIR,		AC_DEFUN(AC_LIBTOOL_OBJDIR))
+m4_ifndef(AC_LTDL_OBJDIR,		AC_DEFUN(AC_LTDL_OBJDIR))
+m4_ifndef(AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH, AC_DEFUN(AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH))
+m4_ifndef(AC_LIBTOOL_SYS_LIB_STRIP,	AC_DEFUN(AC_LIBTOOL_SYS_LIB_STRIP))
+m4_ifndef(AC_PATH_MAGIC,		AC_DEFUN(AC_PATH_MAGIC))
+m4_ifndef(AC_PROG_LD_GNU,		AC_DEFUN(AC_PROG_LD_GNU))
+m4_ifndef(AC_PROG_LD_RELOAD_FLAG,	AC_DEFUN(AC_PROG_LD_RELOAD_FLAG))
+m4_ifndef(AC_DEPLIBS_CHECK_METHOD,	AC_DEFUN(AC_DEPLIBS_CHECK_METHOD))
+m4_ifndef(AC_LIBTOOL_PROG_COMPILER_NO_RTTI, AC_DEFUN(AC_LIBTOOL_PROG_COMPILER_NO_RTTI))
+m4_ifndef(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE, AC_DEFUN(AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE))
+m4_ifndef(AC_LIBTOOL_PROG_COMPILER_PIC, AC_DEFUN(AC_LIBTOOL_PROG_COMPILER_PIC))
+m4_ifndef(AC_LIBTOOL_PROG_LD_SHLIBS,	AC_DEFUN(AC_LIBTOOL_PROG_LD_SHLIBS))
+m4_ifndef(AC_LIBTOOL_POSTDEP_PREDEP,	AC_DEFUN(AC_LIBTOOL_POSTDEP_PREDEP))
+m4_ifndef(LT_AC_PROG_EGREP,		AC_DEFUN(LT_AC_PROG_EGREP))
+m4_ifndef(LT_AC_PROG_SED,		AC_DEFUN(LT_AC_PROG_SED))
+m4_ifndef(_LT_CC_BASENAME,		AC_DEFUN(_LT_CC_BASENAME))
+m4_ifndef(_LT_COMPILER_BOILERPLATE,	AC_DEFUN(_LT_COMPILER_BOILERPLATE))
+m4_ifndef(_LT_LINKER_BOILERPLATE,	AC_DEFUN(_LT_LINKER_BOILERPLATE))
+m4_ifndef(_AC_PROG_LIBTOOL,		AC_DEFUN(_AC_PROG_LIBTOOL))
+m4_ifndef(AC_LIBTOOL_SETUP,		AC_DEFUN(AC_LIBTOOL_SETUP))
+m4_ifndef(_LT_AC_CHECK_DLFCN,		AC_DEFUN(_LT_AC_CHECK_DLFCN))
+m4_ifndef(AC_LIBTOOL_SYS_DYNAMIC_LINKER,	AC_DEFUN(AC_LIBTOOL_SYS_DYNAMIC_LINKER))
+m4_ifndef(_LT_AC_TAGCONFIG,		AC_DEFUN(_LT_AC_TAGCONFIG))
+m4_ifndef(AC_DISABLE_FAST_INSTALL,	AC_DEFUN(AC_DISABLE_FAST_INSTALL))
+m4_ifndef(_LT_AC_LANG_CXX,		AC_DEFUN(_LT_AC_LANG_CXX))
+m4_ifndef(_LT_AC_LANG_F77,		AC_DEFUN(_LT_AC_LANG_F77))
+m4_ifndef(_LT_AC_LANG_GCJ,		AC_DEFUN(_LT_AC_LANG_GCJ))
+m4_ifndef(AC_LIBTOOL_LANG_C_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_C_CONFIG))
+m4_ifndef(_LT_AC_LANG_C_CONFIG,	AC_DEFUN(_LT_AC_LANG_C_CONFIG))
+m4_ifndef(AC_LIBTOOL_LANG_CXX_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_CXX_CONFIG))
+m4_ifndef(_LT_AC_LANG_CXX_CONFIG,	AC_DEFUN(_LT_AC_LANG_CXX_CONFIG))
+m4_ifndef(AC_LIBTOOL_LANG_F77_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_F77_CONFIG))
+m4_ifndef(_LT_AC_LANG_F77_CONFIG,	AC_DEFUN(_LT_AC_LANG_F77_CONFIG))
+m4_ifndef(AC_LIBTOOL_LANG_GCJ_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_GCJ_CONFIG))
+m4_ifndef(_LT_AC_LANG_GCJ_CONFIG,	AC_DEFUN(_LT_AC_LANG_GCJ_CONFIG))
+m4_ifndef(AC_LIBTOOL_LANG_RC_CONFIG,	AC_DEFUN(AC_LIBTOOL_LANG_RC_CONFIG))
+m4_ifndef(_LT_AC_LANG_RC_CONFIG,	AC_DEFUN(_LT_AC_LANG_RC_CONFIG))
+m4_ifndef(AC_LIBTOOL_CONFIG,		AC_DEFUN(AC_LIBTOOL_CONFIG))
+m4_ifndef(_LT_AC_FILE_LTDLL_C,	AC_DEFUN(_LT_AC_FILE_LTDLL_C))
+m4_ifndef(_LT_REQUIRED_DARWIN_CHECKS,	AC_DEFUN(_LT_REQUIRED_DARWIN_CHECKS))
+m4_ifndef(_LT_AC_PROG_CXXCPP,		AC_DEFUN(_LT_AC_PROG_CXXCPP))
+m4_ifndef(_LT_PREPARE_SED_QUOTE_VARS,	AC_DEFUN(_LT_PREPARE_SED_QUOTE_VARS))
+m4_ifndef(_LT_PROG_ECHO_BACKSLASH,	AC_DEFUN(_LT_PROG_ECHO_BACKSLASH))
+m4_ifndef(_LT_PROG_F77,		AC_DEFUN(_LT_PROG_F77))
+m4_ifndef(_LT_PROG_FC,		AC_DEFUN(_LT_PROG_FC))
+m4_ifndef(_LT_PROG_CXX,		AC_DEFUN(_LT_PROG_CXX))
+
+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef(PKG_PREREQ,
+dnl m4_fatal(must install pkg-config 0.29 or later before running autoconf/autogen))
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun(PKG_PREREQ,
+m4_define(PKG_MACROS_VERSION, 0.29.1)
+m4_if(m4_version_compare(PKG_MACROS_VERSION, $1), -1,
+ m4_fatal(pkg.m4 version $1 or higher is required but PKG_MACROS_VERSION found))
+)dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG(MIN-VERSION)
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN(PKG_PROG_PKG_CONFIG,
 m4_pattern_forbid(^_?PKG_A-Z_+$)
 m4_pattern_allow(^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$)
@@ -67,18 +9336,19 @@
 		PKG_CONFIG=""
 	fi
 fidnl
-)# PKG_PROG_PKG_CONFIG
+)dnl PKG_PROG_PKG_CONFIG
 
-# PKG_CHECK_EXISTS(MODULES, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE(PKG_PROG_PKG_CONFIG)
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN(PKG_CHECK_EXISTS,
 AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
 if test -n "$PKG_CONFIG" && \
@@ -88,8 +9358,10 @@
 $3)dnl
 fi)
 
-# _PKG_CONFIG(VARIABLE, COMMAND, MODULES)
-# ---------------------------------------------
+dnl _PKG_CONFIG(VARIABLE, COMMAND, MODULES)
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define(_PKG_CONFIG,
 if test -n "$$1"; then
 pkg_cv_$1="$$1"
@@ -101,10 +9373,11 @@
 else
 pkg_failed=untried
 fidnl
-)# _PKG_CONFIG
+)dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN(_PKG_SHORT_ERRORS_SUPPORTED,
 AC_REQUIRE(PKG_PROG_PKG_CONFIG)
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -112,19 +9385,17 @@
 else
 _pkg_short_errors_supported=no
 fidnl
-)# _PKG_SHORT_ERRORS_SUPPORTED
+)dnl _PKG_SHORT_ERRORS_SUPPORTED
 
 
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
-# ACTION-IF-NOT-FOUND)
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
+dnl ACTION-IF-NOT-FOUND)
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN(PKG_CHECK_MODULES,
 AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
 AC_ARG_VAR($1_CFLAGS, C compiler flags for $1, overriding pkg-config)dnl
@@ -178,9 +9449,92 @@
 AC_MSG_RESULT(yes)
 	$3
 fidnl
-)# PKG_CHECK_MODULES
+)dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, ACTION-IF-FOUND,
+dnl ACTION-IF-NOT-FOUND)
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN(PKG_CHECK_MODULES_STATIC,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIGdnl
+)dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR(DIRECTORY)
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN(PKG_INSTALLDIR,
+m4_pushdef(pkg_default, m4_default($1, '${libdir}/pkgconfig'))
+m4_pushdef(pkg_description,
+ pkg-config installation directory @<:@pkg_default@:>@)
+AC_ARG_WITH(pkgconfigdir,
+ AS_HELP_STRING(--with-pkgconfigdir, pkg_description),,
+ with_pkgconfigdir=pkg_default)
+AC_SUBST(pkgconfigdir, $with_pkgconfigdir)
+m4_popdef(pkg_default)
+m4_popdef(pkg_description)
+)dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR(DIRECTORY)
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN(PKG_NOARCH_INSTALLDIR,
+m4_pushdef(pkg_default, m4_default($1, '${datadir}/pkgconfig'))
+m4_pushdef(pkg_description,
+ pkg-config arch-independent installation directory @<:@pkg_default@:>@)
+AC_ARG_WITH(noarch-pkgconfigdir,
+ AS_HELP_STRING(--with-noarch-pkgconfigdir, pkg_description),,
+ with_noarch_pkgconfigdir=pkg_default)
+AC_SUBST(noarch_pkgconfigdir, $with_noarch_pkgconfigdir)
+m4_popdef(pkg_default)
+m4_popdef(pkg_description)
+)dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN(PKG_CHECK_VAR,
+AC_REQUIRE(PKG_PROG_PKG_CONFIG)dnl
+AC_ARG_VAR($1, value of $3 for $2, overriding pkg-config)dnl
+
+_PKG_CONFIG($1, variable="$3", $2)
+AS_VAR_COPY($1, pkg_cv_$1)
+
+AS_VAR_IF($1, "", $5, $4)dnl
+)dnl PKG_CHECK_VAR
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -192,10 +9546,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN(AM_AUTOMAKE_VERSION,
-am__api_version='1.14'
+am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version. Point them to the right macro.
-m4_if($1, 1.14.1, ,
+m4_if($1, 1.15, ,
 AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -211,14 +9565,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
-AM_AUTOMAKE_VERSION(1.14.1)dnl
+AM_AUTOMAKE_VERSION(1.15)dnl
 m4_ifndef(AC_AUTOCONF_VERSION,
 m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
 
 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -263,15 +9617,14 @@
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN(AM_AUX_DIR_EXPAND,
-dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ(2.50)dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+AC_REQUIRE(AC_CONFIG_AUX_DIR_DEFAULT)dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 )
 
 # AM_CONDITIONAL -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -302,274 +9655,9 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999-2013 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.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN(_AM_DEPENDENCIES,
-AC_REQUIRE(AM_SET_DEPDIR)dnl
-AC_REQUIRE(AM_OUTPUT_DEPENDENCY_COMMANDS)dnl
-AC_REQUIRE(AM_MAKE_INCLUDE)dnl
-AC_REQUIRE(AM_DEP_TRACK)dnl
-
-m4_if($1, CC, depcc="$CC" am_compiler_list=,
- $1, CXX, depcc="$CXX" am_compiler_list=,
- $1, OBJC, depcc="$OBJC" am_compiler_list='gcc3 gcc',
- $1, OBJCXX, depcc="$OBJCXX" am_compiler_list='gcc3 gcc',
- $1, UPC, depcc="$UPC" am_compiler_list=,
- $1, GCJ, depcc="$GCJ" am_compiler_list='gcc3 gcc',
- depcc="$$1" am_compiler_list=)
-
-AC_CACHE_CHECK(dependency style of $depcc,
- am_cv_$1_dependencies_compiler_type,
-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".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- 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_$1_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
- m4_case($1, CC,
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac,
- CXX,
- 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 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # 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
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- 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_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-)
-AC_SUBST($1DEPMODE, depmode=$am_cv_$1_dependencies_compiler_type)
-AM_CONDITIONAL(am__fastdep$1, 
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3)
-)
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN(AM_SET_DEPDIR,
-AC_REQUIRE(AM_SET_LEADING_DOT)dnl
-AC_SUBST(DEPDIR, "${am__leading_dot}deps")dnl
-)
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN(AM_DEP_TRACK,
-AC_ARG_ENABLE(dependency-tracking, dnl
-AS_HELP_STRING(
- --enable-dependency-tracking,
- do not reject slow dependency extractors)
-AS_HELP_STRING(
- --disable-dependency-tracking,
- speeds up one-time build))
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- am__nodep='_no'
-fi
-AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
-AC_SUBST(AMDEPBACKSLASH)dnl
-_AM_SUBST_NOTMAKE(AMDEPBACKSLASH)dnl
-AC_SUBST(am__nodep)dnl
-_AM_SUBST_NOTMAKE(am__nodep)dnl
-)
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999-2013 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.
-
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN(_AM_OUTPUT_DEPENDENCY_COMMANDS,
-{
- # Older Autoconf quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME("$file")`
- AS_MKDIR_P($dirpart/$fdir)
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
-}
-)# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,
-AC_CONFIG_COMMANDS(depfiles,
- test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS,
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir")
-)
-
 # Do all the work for Automake. -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -659,8 +9747,8 @@
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST(mkdir_p, '$(MKDIR_P)')
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
 AC_REQUIRE(AC_PROG_AWK)dnl
 AC_REQUIRE(AC_PROG_MAKE_SET)dnl
 AC_REQUIRE(AM_SET_LEADING_DOT)dnl
@@ -733,7 +9821,11 @@
 END
 AC_MSG_ERROR(Your 'rm' program is bad, sorry.)
 fi
-fi)
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+)
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -762,7 +9854,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -773,7 +9865,7 @@
 # Define $install_sh.
 AC_DEFUN(AM_PROG_INSTALL_SH,
 AC_REQUIRE(AM_AUX_DIR_EXPAND)dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
 case $am_aux_dir in
 *\ * | *\	*)
 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -783,7 +9875,7 @@
 fi
 AC_SUBST(install_sh))
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -805,7 +9897,7 @@
 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -838,59 +9930,9 @@
 
 )
 
-# Check to see how 'make' treats includes.	 -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 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.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN(AM_MAKE_INCLUDE,
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING(for style of include used by $am_make)
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
-rm -f confinc confmf
-)
-
 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -927,7 +9969,7 @@
 fi
 )
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -961,7 +10003,7 @@
 
 # Helper functions for option handling. -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -990,7 +10032,7 @@
 AC_DEFUN(_AM_IF_OPTION,
 m4_ifset(_AM_MANGLE_OPTION($1), $2, $3))
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1037,7 +10079,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE(AM_PROG_CC_C_O, AC_REQUIRE(AC_PROG_CC))
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1056,7 +10098,7 @@
 
 # Check to make sure that the build environment is sane. -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1137,7 +10179,7 @@
 rm -f conftest.file
 )
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1197,7 +10239,7 @@
 _AM_SUBST_NOTMAKE(AM_BACKSLASH)dnl
 )
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1225,7 +10267,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST(INSTALL_STRIP_PROGRAM))
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1244,7 +10286,7 @@
 
 # Check how to create a tarball. -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1384,7 +10426,6 @@
 m4_include(m4/intdiv0.m4)
 m4_include(m4/intl.m4)
 m4_include(m4/intlmacosx.m4)
-m4_include(m4/intltool.m4)
 m4_include(m4/intmax.m4)
 m4_include(m4/inttypes-pri.m4)
 m4_include(m4/inttypes_h.m4)
@@ -1392,13 +10433,8 @@
 m4_include(m4/lib-ld.m4)
 m4_include(m4/lib-link.m4)
 m4_include(m4/lib-prefix.m4)
-m4_include(m4/libtool.m4)
 m4_include(m4/lock.m4)
 m4_include(m4/longlong.m4)
-m4_include(m4/ltoptions.m4)
-m4_include(m4/ltsugar.m4)
-m4_include(m4/ltversion.m4)
-m4_include(m4/lt~obsolete.m4)
 m4_include(m4/nls.m4)
 m4_include(m4/po.m4)
 m4_include(m4/printf-posix.m4)

deadbeef-0.6.2.tar.bz2/compile -> deadbeef-1.9.6.tar.bz2/compile Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -79,6 +78,53 @@
 esac
 }
 
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
 # func_cl_wrapper cl arg...
 # Adjust compile command to suit cl
 func_cl_wrapper ()
@@ -109,43 +155,34 @@
 	 ;;
 	 esac
 	 ;;
+	-I)
+	 eat=1
+	 func_file_conv "$2" mingw
+	 set x "$@" -I"$file"
+	 shift
+	 ;;
 	-I*)
 	 func_file_conv "${1#-I}" mingw
 	 set x "$@" -I"$file"
 	 shift
 	 ;;
+	-l)
+	 eat=1
+	 func_cl_dashl "$2"
+	 set x "$@" "$lib"
+	 shift
+	 ;;
 	-l*)
-	 lib=${1#-l}
-	 found=no
-	 save_IFS=$IFS
-	 IFS=';'
-	 for dir in $lib_path $LIB
-	 do
-	 IFS=$save_IFS
-	 if $shared && test -f "$dir/$lib.dll.lib"; then
-	 found=yes
-	 set x "$@" "$dir/$lib.dll.lib"
-	 break
-	 fi
-	 if test -f "$dir/$lib.lib"; then
-	 found=yes
-	 set x "$@" "$dir/$lib.lib"
-	 break
-	 fi
-	 done
-	 IFS=$save_IFS
-
-	 test "$found" != yes && set x "$@" "$lib.lib"
+	 func_cl_dashl "${1#-l}"
+	 set x "$@" "$lib"
 	 shift
 	 ;;
+	-L)
+	 eat=1
+	 func_cl_dashL "$2"
+	 ;;
 	-L*)
-	 func_file_conv "${1#-L}"
-	 if test -z "$lib_path"; then
-	 lib_path=$file
-	 else
-	 lib_path="$lib_path;$file"
-	 fi
-	 linker_opts="$linker_opts -LIBPATH:$file"
+	 func_cl_dashL "${1#-L}"
 	 ;;
 	-static)
 	 shared=false

deadbeef-0.6.2.tar.bz2/config.guess -> deadbeef-1.9.6.tar.bz2/config.guess Changed

@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2015-08-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@
 # 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# Please send patches to <config-patches@gnu.org>.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,12 +132,33 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format. This provides both forward
@@ -154,23 +168,30 @@
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name. We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	 /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	 /sbin/$sysctl 2>/dev/null || \
+	 /usr/sbin/$sysctl 2>/dev/null || \
+	 echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	 armeb) machine=armeb-unknown ;;
 	 arm*) machine=arm-unknown ;;
 	 sh3el) machine=shl-unknown ;;
 	 sh3eb) machine=sh-unknown ;;
 	 sh5el) machine=sh5le-unknown ;;
+	 earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e$armv0-9$.*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*$eb$$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE_ARCH}" in
-	 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	 arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		 # Return netbsd for either. FIX?
@@ -180,7 +201,14 @@
 		fi
 		;;
 	 *)
-	 os=netbsd
+		os=netbsd
+		;;
+	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	 earm*)
+		expr='s/^earmv0-9/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
 		;;
 	esac
 	# The OS release
@@ -193,13 +221,17 @@
 		release='-gnu'
 		;;
 	 *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/-_.*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/-_.*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
+	exit ;;
+ *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
 	exit ;;
 *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
@@ -217,13 +249,16 @@
 *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+ *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
 alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +304,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^PVTX//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
 Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,12 +333,12 @@
 	echo s390-ibm-zvmoe
 	exit ;;
 *:OS400:*:*)
- echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
 arm:RISC*:1.012*:*|arm:riscix:1.012*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -333,6 +371,9 @@
 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/^.*//'`
 	exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -391,23 +432,23 @@
 # MiNT. But MiNT is downward compatible to TOS, so this should
 # be no problem.
 atariste:*MiNT:*:* | atariste:*mint:*:* | atariste:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
 atari*:*MiNT:*:* | atari*:*mint:*:* | atariste:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+	exit ;;
 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
 m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -477,8 +518,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
 AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if $UNAME_PROCESSOR = mc88100 || $UNAME_PROCESSOR = mc88110 
 	then
 	 if ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx || \
@@ -491,7 +532,7 @@
 	else
 	 echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
 M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -548,15 +589,16 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
- *:AIX:*:456)
+ *:AIX:*:4567)
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
 	fi
-	if -x /usr/bin/oslevel ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if -x /usr/bin/lslpp ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			 awk -F: '{ print $3 }' | sed s/0-9*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -591,52 +633,52 @@
 	 9000/6780-90-9)
 		if -x /usr/bin/getconf ; then
 		 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+		 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		 case "${sc_cpu_version}" in
+		 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		 532) # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			 32) HP_ARCH="hppa2.0n" ;;
+			 64) HP_ARCH="hppa2.0w" ;;
 			 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+			esac ;;
+		 esac
 		fi
 		if "${HP_ARCH}" = "" ; then
 		 eval $set_cc_for_build
-		 sed 's/^ //' << EOF >$dummy.c
+		 sed 's/^		//' << EOF >$dummy.c
 
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		 long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		 long cpu = sysconf (_SC_CPU_VERSION);
 
- switch (cpu)
- 	{
- 	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- 	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- 	case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- 	 switch (bits)
- 		{
- 		case 64: puts ("hppa2.0w"); break;
- 		case 32: puts ("hppa2.0n"); break;
- 		default: puts ("hppa2.0"); break;
- 		} break;
- #else /* !defined(_SC_KERNEL_BITS) */
- 	 puts ("hppa2.0"); break;
- #endif
- 	default: puts ("hppa1.0"); break;
- 	}
- exit (0);
- }
+		 switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			 switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else /* !defined(_SC_KERNEL_BITS) */
+			 puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		 exit (0);
+		}
 EOF
 		 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		 test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -656,7 +698,7 @@
 	 # => hppa64-hp-hpux11.23
 
 	 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	 then
 		HP_ARCH="hppa2.0w"
 	 else
@@ -727,22 +769,22 @@
 	exit ;;
 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
- exit ;;
+	exit ;;
 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
- exit ;;
+	exit ;;
 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
- exit ;;
+	exit ;;
 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
- exit ;;
+	exit ;;
 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
- exit ;;
+	exit ;;
 CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.^.*$/.X/'
 	exit ;;
@@ -766,14 +808,14 @@
 	exit ;;
 F3001:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -785,34 +827,39 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
 *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	 pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	 amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	 *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	esac
 	exit ;;
 i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+ *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
 *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+ *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
 i*:windows32*:*)
- 	# uname -m includes "-pc" on this system.
- 	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
 i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
- *:Interix*:3456*)
- 	case ${UNAME_MACHINE} in
+ *:Interix*:*)
+	case ${UNAME_MACHINE} in
 	 x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	 EM64T | authenticamd | genuineintel)
+	 authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	 IA64)
@@ -822,6 +869,9 @@
 34586:Windows_95:* | 34586:Windows_98:* | 34586:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+ 8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -842,210 +892,160 @@
 	exit ;;
 *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,-/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,-/.*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
 *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^^/*/,,' | tr 'A-Z' 'a-z'``echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^^/*/,,' | tr 'A-Z' 'a-z'``echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`-${LIBC}
 	exit ;;
 i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+ aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	 EV5) UNAME_MACHINE=alphaev5 ;;
+	 EV56) UNAME_MACHINE=alphaev56 ;;
+	 PCA56) UNAME_MACHINE=alphapca56 ;;
+	 PCA57) UNAME_MACHINE=alphapca56 ;;
+	 EV6) UNAME_MACHINE=alphaev6 ;;
+	 EV67) UNAME_MACHINE=alphaev67 ;;
+	 EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
 arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	 | grep -q __ARM_EABI__
 	then
-	 echo ${UNAME_MACHINE}-unknown-linux-gnu
+	 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
-	 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	 then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	 else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	 fi
 	fi
 	exit ;;
 avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
 crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+ e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 frv:Linux:*:*)
- 	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
 ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
- mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
- mips64:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^CPU/{
-		s: ::g
-		p
-	 }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
- or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
- ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
- ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+ openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
- alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-	 EV5) UNAME_MACHINE=alphaev5 ;;
-	 EV56) UNAME_MACHINE=alphaev56 ;;
-	 PCA56) UNAME_MACHINE=alphapca56 ;;
-	 PCA57) UNAME_MACHINE=alphapca56 ;;
-	 EV6) UNAME_MACHINE=alphaev6 ;;
-	 EV67) UNAME_MACHINE=alphaev67 ;;
-	 EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
 parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu^a-z*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	 PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	 PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	 *) echo hppa-unknown-linux-gnu ;;
+	 PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	 PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	 *) echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+ ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+ ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+ ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+ ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
 s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
 sh64*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
 x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
 xtensa*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
- i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				 s/ 	 	*/ /g
-				 s/.*supported targets: *//
-				 s/ .*//
-				 p'`
- case "$ld_supported_targets" in
-	 elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	 a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	 "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	# if __GLIBC__ >= 2
-	LIBC=gnu
-	# else
-	LIBC=gnulibc1
-	# endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	 /^LIBC/{
-		s: ::g
-		p
-	 }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
 i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1053,11 +1053,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
 i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
 i*86:OS/2:*:*)
@@ -1074,7 +1074,7 @@
 i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.0*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.01*:* | i*86:LynxOS:4.02*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
 i*86:*DOS:*:*)
@@ -1089,7 +1089,7 @@
 	fi
 	exit ;;
 i*86:*:5:678*)
- 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	 *486*)	 UNAME_MACHINE=i486 ;;
 	 *Pentium)	 UNAME_MACHINE=i586 ;;
@@ -1117,13 +1117,13 @@
 	exit ;;
 pc:*:*:*)
 	# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
- exit ;;
+	exit ;;
 Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1158,8 +1158,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 334??:*:4.0:* | 334??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	 && { echo i486-ncr-sysv4; exit; } ;;
 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1182,7 +1182,7 @@
 rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.0*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.01*:* | PowerPC:LynxOS:4.02*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
 SMBES:UNIX_SV:*:*)
@@ -1202,10 +1202,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
 *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1231,11 +1231,11 @@
 	exit ;;
 R34000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if -d /usr/nec ; then
-	 echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	 echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
- exit ;;
+	exit ;;
 BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1248,6 +1248,9 @@
 BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+ x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
 SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1274,9 +1277,31 @@
 	exit ;;
 *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	 unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	 UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	 if "$CC_FOR_BUILD" != 'no_compiler_found' ; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		 grep IS_64BIT_ARCH >/dev/null
+		then
+		 case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		 esac
+		fi
+	 fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	 # Avoid executing cc on OS X 10.9, as it ships with a stub
+	 # that puts up a graphical alert prompting to install
+	 # developer tools. Any system running Mac OS X 10.7 or
+	 # later (Darwin 11 and later) is required to have a 64-bit
+	 # processor. This is not true of the ARM version of Darwin
+	 # that Apple uses in portable devices.
+	 UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
 *:procnto*:*:* | *:QNX:0123456789*:*)
@@ -1290,7 +1315,10 @@
 *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+ NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
 NSR-?:NONSTOP_KERNEL:*:*)
@@ -1335,13 +1363,13 @@
 	echo pdp10-unknown-its
 	exit ;;
 SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
 *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'`
 	exit ;;
 *:*VMS:*:*)
- 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	 A*) echo alpha-dec-vms ; exit ;;
 	 I*) echo ia64-dec-vms ; exit ;;
@@ -1359,158 +1387,10 @@
 i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
-	 ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach $0-9*$.*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if -x /usr/convex/getsysinfo 
-then
- case `getsysinfo -f cpu_type` in
- c1*)
-	echo c1-convex-bsd
-	exit ;;
- c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
- c34*)
-	echo c34-convex-bsd
+ x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
- c38*)
-	echo c38-convex-bsd
-	exit ;;
- c4*)
-	echo c4-convex-bsd
-	exit ;;
- esac
-fi
+esac
 
 cat >&2 <<EOF
 $0: unable to guess system type

deadbeef-0.6.2.tar.bz2/config.h.in -> deadbeef-1.9.6.tar.bz2/config.h.in Changed

@@ -157,6 +157,9 @@
 /* Define to 1 if you have the `mempcpy' function. */
 #undef HAVE_MEMPCPY
 
+/* Define to 1 if you have the `mkstemps' function. */
+#undef HAVE_MKSTEMPS
+
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
@@ -242,6 +245,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/wait.h> header file. */
+#undef HAVE_SYS_WAIT_H
+
 /* Define to 1 if you have the `tsearch' function. */
 #undef HAVE_TSEARCH
 
@@ -291,11 +297,7 @@
 /* Define if integer division by zero raises signal SIGFPE. */
 #undef INTDIV0_RAISES_SIGFPE
 
-/* Name of gettext locale directory */
-#undef LOCALEDIR
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Name of package */
@@ -415,6 +417,17 @@
 # endif
 #endif
 
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
 /* Define to 1 if on MINIX. */
 #undef _MINIX

deadbeef-0.6.2.tar.bz2/config.sub -> deadbeef-1.9.6.tar.bz2/config.sub Changed

deadbeef-0.6.2.tar.bz2/configure -> deadbeef-1.9.6.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for deadbeef 0.6.2.
+# Generated by GNU Autoconf 2.69 for deadbeef 1.9.6.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='deadbeef'
 PACKAGE_TARNAME='deadbeef'
-PACKAGE_VERSION='0.6.2'
-PACKAGE_STRING='deadbeef 0.6.2'
+PACKAGE_VERSION='1.9.6'
+PACKAGE_STRING='deadbeef 1.9.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -636,6 +636,12 @@
 LTLIBOBJS
 LIBOBJS
 PLUGINS_DIRS
+HAVE_SOUNDTOUCH_FALSE
+HAVE_SOUNDTOUCH_TRUE
+HAVE_RGSCANNER_FALSE
+HAVE_RGSCANNER_TRUE
+HAVE_SSE2_FALSE
+HAVE_SSE2_TRUE
 USE_ABSTRACT_SOCKET_NAME_FALSE
 USE_ABSTRACT_SOCKET_NAME_TRUE
 PORTABLE_FULL_FALSE
@@ -644,6 +650,8 @@
 PORTABLE_TRUE
 STATICLINK_FALSE
 STATICLINK_TRUE
+HAVE_SC68_FALSE
+HAVE_SC68_TRUE
 HAVE_PLTBROWSER_FALSE
 HAVE_PLTBROWSER_TRUE
 HAVE_WMA_FALSE
@@ -660,12 +668,6 @@
 HAVE_DUMB_TRUE
 HAVE_YASM_FALSE
 HAVE_YASM_TRUE
-HAVE_PNG_FALSE
-HAVE_PNG_TRUE
-HAVE_JPEG_FALSE
-HAVE_JPEG_TRUE
-HAVE_IMLIB2_FALSE
-HAVE_IMLIB2_TRUE
 HAVE_CONVERTER_FALSE
 HAVE_CONVERTER_TRUE
 HAVE_VFS_ZIP_FALSE
@@ -696,14 +698,20 @@
 HAVE_SUPEREQ_TRUE
 HAVE_OSS_FALSE
 HAVE_OSS_TRUE
-HAVE_MPGMAD_FALSE
-HAVE_MPGMAD_TRUE
+HAVE_LIBMPG123_FALSE
+HAVE_LIBMPG123_TRUE
+HAVE_LIBMAD_FALSE
+HAVE_LIBMAD_TRUE
+HAVE_MP3_FALSE
+HAVE_MP3_TRUE
 HAVE_HOTKEYS_FALSE
 HAVE_HOTKEYS_TRUE
 HAVE_VFS_CURL_FALSE
 HAVE_VFS_CURL_TRUE
 HAVE_LASTFM_FALSE
 HAVE_LASTFM_TRUE
+HAVE_LIBRETRO_FALSE
+HAVE_LIBRETRO_TRUE
 HAVE_GME_FALSE
 HAVE_GME_TRUE
 HAVE_VTX_FALSE
@@ -722,6 +730,8 @@
 HAVE_ARTWORK_TRUE
 HAVE_PULSE_FALSE
 HAVE_PULSE_TRUE
+HAVE_PIPEWIRE_FALSE
+HAVE_PIPEWIRE_TRUE
 HAVE_FFMPEG_FALSE
 HAVE_FFMPEG_TRUE
 HAVE_COREAUDIO_FALSE
@@ -732,6 +742,8 @@
 HAVE_GTK3_TRUE
 HAVE_GTK2_FALSE
 HAVE_GTK2_TRUE
+USE_CDPARANOIA_FALSE
+USE_CDPARANOIA_TRUE
 HAVE_CDDA_FALSE
 HAVE_CDDA_TRUE
 HAVE_SNDFILE_FALSE
@@ -744,6 +756,8 @@
 HAVE_OGG_STREAM_FLUSH_FILL_TRUE
 HAVE_OGG_FALSE
 HAVE_OGG_TRUE
+HAVE_OPUS_FALSE
+HAVE_OPUS_TRUE
 HAVE_VORBIS_FALSE
 HAVE_VORBIS_TRUE
 APE_USE_YASM_FALSE
@@ -755,19 +769,11 @@
 NOTIFY_LIBS
 LIBSAMPLERATE_DEPS_LIBS
 LIBSAMPLERATE_DEPS_CFLAGS
-IMLIB2_DEPS_LIBS
-IMLIB2_DEPS_CFLAGS
-PNG_DEPS_LIBS
-PNG_DEPS_CFLAGS
-JPEG_DEPS_LIBS
-JPEG_DEPS_CFLAGS
 OSS_CFLAGS
 HOTKEYS_LIBS
 HOTKEYS_CFLAGS
 CDDA_CFLAGS
 CDDA_LIBS
-VFS_CURL_CFLAGS
-VFS_CURL_LIBS
 SNDFILE_LIBS
 SNDFILE_CFLAGS
 WAVPACK_LIBS
@@ -776,13 +782,19 @@
 FLAC_CFLAGS
 OGG_CFLAGS
 OGG_LIBS
+OPUS_CFLAGS
+OPUS_LIBS
 VORBIS_CFLAGS
 VORBIS_LIBS
+MPG123_LIBS
+MPG123_CFLAGS
 MAD_LIBS
 MAD_CFLAGS
 CURL_CFLAGS
 CURL_LIBS
 ICONV_LIB
+PIPEWIRE_DEPS_LIBS
+PIPEWIRE_DEPS_CFLAGS
 PULSE_DEPS_LIBS
 PULSE_DEPS_CFLAGS
 DBUS_DEPS_CFLAGS
@@ -794,19 +806,22 @@
 ALSA_DEPS_CFLAGS
 GTK2_DEPS_LIBS
 GTK2_DEPS_CFLAGS
+DISPATCH_LIBS
+DISPATCH_CFLAGS
+JANSSON_LIBS
+JANSSON_CFLAGS
 OS_OSX_FALSE
 OS_OSX_TRUE
-GTK_MAC_LIBS
-GTK_MAC_CFLAGS
+GLIB_COMPILE_RESOURCES
 GTK3_DEPS_LIBS
 GTK3_DEPS_CFLAGS
 ZIP_LIBS
 ZIP_CFLAGS
 ZLIB_LIBS
 ZLIB_CFLAGS
+ALLOCA_H_CFLAGS
 DL_LIBS
 HAVE_YASM
-INTL_LIBS
 NOCPPLIB
 INSANE_CXXFLAGS
 INSANE_CFLAGS
@@ -895,19 +910,14 @@
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
-am__fastdepOBJC_FALSE
-am__fastdepOBJC_TRUE
-OBJCDEPMODE
 ac_ct_OBJC
 OBJCFLAGS
 OBJC
 CXXCPP
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
 ac_ct_CXX
 CXXFLAGS
 CXX
+LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
@@ -938,16 +948,6 @@
 EGREP
 GREP
 CPP
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -1004,6 +1004,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1028,14 +1029,15 @@
 enable_option_checking
 enable_silent_rules
 enable_maintainer_mode
-enable_dependency_tracking
-enable_shared
 enable_static
+enable_shared
 with_pic
 enable_fast_install
+with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+enable_largefile
 enable_nls
 enable_threads
 enable_rpath
@@ -1046,27 +1048,33 @@
 enable_nullout
 enable_alsa
 enable_oss
+enable_pipewire
 enable_pulse
 enable_coreaudio
 enable_gtk3
 enable_gtk2
 enable_vfs_curl
+enable_libretro
 enable_lfm
 enable_artwork
 enable_artwork_network
 enable_supereq
 enable_sid
-enable_mad
+enable_mp3
+enable_libmad
+enable_libmpg123
 enable_ffap
 enable_vtx
 enable_adplug
 enable_hotkeys
 enable_vorbis
+enable_opus
 enable_ffmpeg
 enable_flac
 enable_sndfile
 enable_wavpack
 enable_cdda
+enable_cdda_paranoia
 enable_gme
 enable_notify
 enable_shellexec
@@ -1082,7 +1090,6 @@
 enable_m3u
 enable_vfs_zip
 enable_converter
-enable_artwork_imlib2
 enable_dumb
 enable_shn
 enable_psf
@@ -1091,7 +1098,10 @@
 enable_alac
 enable_wma
 enable_pltbrowser
+enable_sc68
 enable_abstract_socket
+enable_rgscanner
+enable_soundtouch
 '
 ac_precious_vars='build_alias
 host_alias
@@ -1102,6 +1112,7 @@
 LIBS
 CPPFLAGS
 CPP
+LT_SYS_LIBRARY_PATH
 CXX
 CXXFLAGS
 CCC
@@ -1115,8 +1126,8 @@
 ZIP_LIBS
 GTK3_DEPS_CFLAGS
 GTK3_DEPS_LIBS
-GTK_MAC_CFLAGS
-GTK_MAC_LIBS
+JANSSON_CFLAGS
+JANSSON_LIBS
 GTK2_DEPS_CFLAGS
 GTK2_DEPS_LIBS
 ALSA_DEPS_CFLAGS
@@ -1127,8 +1138,10 @@
 DBUS_DEPS_LIBS
 PULSE_DEPS_CFLAGS
 PULSE_DEPS_LIBS
-IMLIB2_DEPS_CFLAGS
-IMLIB2_DEPS_LIBS
+PIPEWIRE_DEPS_CFLAGS
+PIPEWIRE_DEPS_LIBS
+OPUS_CFLAGS
+OPUS_LIBS
 LIBSAMPLERATE_DEPS_CFLAGS
 LIBSAMPLERATE_DEPS_LIBS'
 
@@ -1169,6 +1182,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1421,6 +1435,15 @@
 | -silent | --silent | --silen | --sile | --sil)
 silent=yes ;;
 
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
 ac_prev=sbindir ;;
 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1558,7 +1581,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
 eval ac_val=\$$ac_var
 # Remove trailing slashes.
@@ -1671,7 +1694,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.6.2 to adapt to many kinds of systems.
+\`configure' configures deadbeef 1.9.6 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1711,6 +1734,7 @@
 --sysconfdir=DIR read-only single-machine data PREFIX/etc
 --sharedstatedir=DIR modifiable architecture-independent data PREFIX/com
 --localstatedir=DIR modifiable single-machine data PREFIX/var
+ --runstatedir=DIR modifiable per-process data LOCALSTATEDIR/run
 --libdir=DIR object code libraries EPREFIX/lib
 --includedir=DIR C header files PREFIX/include
 --oldincludedir=DIR C header files for non-gcc /usr/include
@@ -1741,7 +1765,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of deadbeef 0.6.2:";;
+ short | recursive ) echo "Configuration of deadbeef 1.9.6:";;
 esac
 cat <<\_ACEOF
 
@@ -1754,15 +1778,12 @@
 --enable-maintainer-mode
 enable make rules and dependencies not useful (and
 sometimes confusing) to the casual installer
- --enable-dependency-tracking
- do not reject slow dependency extractors
- --disable-dependency-tracking
- speeds up one-time build
+ --enable-static=PKGS build static libraries default=no
 --enable-shared=PKGS build shared libraries default=yes
- --enable-static=PKGS build static libraries default=yes
 --enable-fast-install=PKGS
 optimize for fast installation default=yes
 --disable-libtool-lock avoid locking (might break parallel builds)
+ --disable-largefile omit support for large files
 --disable-nls do not use Native Language Support
 --enable-threads={posix|solaris|pth|win32}
 specify multithreading API
@@ -1772,6 +1793,7 @@
 --disable-alsa disable ALSA output plugin (default: enabled)
 --disable-oss disable Open Sound System output plugin (default:
 enabled)
+ --disable-pipewire disable Pipewire output plugin (default: enabled)
 --disable-pulse disable PulseAudio output plugin (default: enabled)
 --disable-coreaudio disable CoreAudio output plugin (default: enabled)
 --disable-gtk3 disable GTK3 version of gtkui plugin (default:
@@ -1779,6 +1801,7 @@
 --disable-gtk2 disable GTK2 version of gtkui plugin (default:
 enabled)
 --disable-vfs-curl disable HTTP streaming vfs plugin (default: enabled)
+ --disable-libretro disable Libretro resampler plugin (default: enabled)
 --disable-lfm disable last.fm/libre.fm scrobbler plugin (default:
 enabled)
 --disable-artwork disable album art loader plugin (default: enabled)
@@ -1788,13 +1811,18 @@
 --disable-supereq disable SuperEQ DSP plugin (default: enabled)
 --disable-sid disable commodore64 SID music player plugin
 (default: enabled)
- --disable-mad disable mpeg (mad) plugin (default: enabled)
+ --disable-mp3 disable mp3 plugin (default: enabled)
+ --disable-libmad disable libmad support in mp3 plugin (default: auto)
+ --disable-libmpg123
+ disable libmpg123 support in mp3 plugin (default:
+ auto)
 --disable-ffap disable Monkey's Audio plugin (default: enabled)
 --disable-vtx disable libayemy VTX ZX-Spectrum music player plugin
 (default: enabled)
 --disable-adplug disable adplug plugin (default: enabled)
 --disable-hotkeys disable global hotkeys plugin (default: enabled)
 --disable-vorbis disable Ogg Vorbis player plugin (default: enabled)
+ --disable-opus disable Ogg Opus player plugin (default: enabled)
 --disable-ffmpeg disable FFMPEG plugin for WMA, AMR, etc (default:
 enabled)
 --disable-flac disable FLAC player plugin (default: enabled)
@@ -1802,6 +1830,9 @@
 (default: enabled)
 --disable-wavpack disable wavpack plugin (default: enabled)
 --disable-cdda disable CD-Audio plugin (default: enabled)
+ --disable-cdda-paranoia
+ disable CD-Audio error correction during ripping
+ (default: enabled)
 --disable-gme disable Game Music Emu plugin for NSF, AY, etc
 (default: enabled)
 --disable-notify disable notification-daemon support plugin (default:
@@ -1822,8 +1853,6 @@
 --enable-vfs-zip build vfs_zip plugin (default: auto)
 --enable-converter
 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:
@@ -1836,17 +1865,24 @@
 --enable-wma build WMA plugin (default: auto)
 --enable-pltbrowser
 build playlist browser gui plugin (default: auto)
+ --enable-sc68 build sc68 Atari ST and Amiga music player (default:
+ auto)
 --enable-abstract-socket
 use abstract UNIX socket for IPC (default: disabled)
+ --disable-rgscanner build ReplayGain scanner plugin (default: enabled)
+ --disable-soundtouch disable soundtouch plugin (default: enabled)
 
 Optional Packages:
 --with-PACKAGE=ARG use PACKAGE ARG=yes
 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
 --with-pic=PKGS try to use only PIC/non-PIC objects default=use
 both
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, default=aix.
 --with-gnu-ld assume the C compiler uses GNU ld default=no
- --with-sysroot=DIR Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).
+ --with-sysroot=DIR Search for dependent libraries within DIR (or the
+ compiler's sysroot if not specified).
 --with-gnu-ld assume the C compiler uses GNU ld default=no
 --with-libpth-prefix=DIR search for libpth in DIR/include and DIR/lib
 --without-libpth-prefix don't search for libpth in includedir and libdir
@@ -1865,6 +1901,8 @@
 CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
 you have headers in a nonstandard directory <include dir>
 CPP C preprocessor
+ LT_SYS_LIBRARY_PATH
+ User-defined run-time library search path.
 CXX C++ compiler command
 CXXFLAGS C++ compiler flags
 CXXCPP C++ preprocessor
@@ -1881,10 +1919,10 @@
 C compiler flags for GTK3_DEPS, overriding pkg-config
 GTK3_DEPS_LIBS
 linker flags for GTK3_DEPS, overriding pkg-config
- GTK_MAC_CFLAGS
- C compiler flags for GTK_MAC, overriding pkg-config
- GTK_MAC_LIBS
- linker flags for GTK_MAC, overriding pkg-config
+ JANSSON_CFLAGS
+ C compiler flags for JANSSON, overriding pkg-config
+ JANSSON_LIBS
+ linker flags for JANSSON, overriding pkg-config
 GTK2_DEPS_CFLAGS
 C compiler flags for GTK2_DEPS, overriding pkg-config
 GTK2_DEPS_LIBS
@@ -1905,10 +1943,12 @@
 C compiler flags for PULSE_DEPS, overriding pkg-config
 PULSE_DEPS_LIBS
 linker flags for PULSE_DEPS, overriding pkg-config
- IMLIB2_DEPS_CFLAGS
- C compiler flags for IMLIB2_DEPS, overriding pkg-config
- IMLIB2_DEPS_LIBS
- linker flags for IMLIB2_DEPS, overriding pkg-config
+ PIPEWIRE_DEPS_CFLAGS
+ C compiler flags for PIPEWIRE_DEPS, overriding pkg-config
+ PIPEWIRE_DEPS_LIBS
+ linker flags for PIPEWIRE_DEPS, overriding pkg-config
+ OPUS_CFLAGS C compiler flags for OPUS, overriding pkg-config
+ OPUS_LIBS linker flags for OPUS, overriding pkg-config
 LIBSAMPLERATE_DEPS_CFLAGS
 C compiler flags for LIBSAMPLERATE_DEPS, overriding pkg-config
 LIBSAMPLERATE_DEPS_LIBS
@@ -1980,7 +2020,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-deadbeef configure 0.6.2
+deadbeef configure 1.9.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2741,7 +2781,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.6.2, which was
+It was created by deadbeef $as_me 1.9.6, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
 $ $0 $@
@@ -3097,7 +3137,7 @@
 ac_config_headers="$ac_config_headers config.h"
 
 
-am__api_version='1.14'
+am__api_version='1.15'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -3298,8 +3338,8 @@
 ac_script='s/\\$/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
 case $am_aux_dir in
@@ -3318,7 +3358,7 @@
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
 case $am_aux_dir in
 *\ * | *\	*)
 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3612,7 +3652,7 @@
 
 # Define the identity of the package.
 PACKAGE='deadbeef'
- VERSION='0.6.2'
+ VERSION='1.9.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3646,8 +3686,8 @@
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility. Yes, it's still used
 # in the wild :-( We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -3821,6 +3861,46 @@
 fi
 fi
 
+# 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_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+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; }
 # Check whether --enable-maintainer-mode was given.
@@ -3843,70 +3923,6 @@
 MAINT=$MAINTAINER_MODE_TRUE
 
 
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
- enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
-fi
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4755,134 +4771,6 @@
 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".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- 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 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # 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
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- 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=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5350,8 +5238,8 @@
 
 
 
-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4.6'
+macro_revision='2.4.6'
 
 
 
@@ -5365,7 +5253,7 @@
 
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -5485,7 +5373,7 @@
 $ECHO ""
 }
 
-case "$ECHO" in
+case $ECHO in
 printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
 $as_echo "printf" >&6; } ;;
 print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
@@ -5678,19 +5566,19 @@
 
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 else
 with_gnu_ld=no
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
 # Check if gcc -print-prog-name=ld gives a path.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
 case $host in
 *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
 ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
 *)
 ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -5704,7 +5592,7 @@
 while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
 done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
 ;;
 "")
 # If it fails, then pretend we aren't using GCC.
@@ -5715,7 +5603,7 @@
 with_gnu_ld=unknown
 ;;
 esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
@@ -5726,32 +5614,32 @@
 $as_echo_n "(cached) " >&6
 else
 if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 test -z "$ac_dir" && ac_dir=.
 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
 # Check to see if the program is GNU ld. I'd rather use --version,
 # but apparently some variants of GNU ld only accept -v.
 # Break only if it was the GNU/non-GNU ld that we prefer.
 case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
+	test no != "$with_gnu_ld" && break
 	;;
 *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
 esac
 fi
 done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
@@ -5794,33 +5682,38 @@
 else
 if test -n "$NM"; then
 # Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
 else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
 if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
 lt_nm_to_check="$lt_nm_to_check nm"
 fi
 for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
 	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 	# nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
 	 lt_cv_path_NM="$tmp_nm -B"
-	 break
+	 break 2
 	 ;;
 	*)
 	 case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	 */dev/null*)
 	 lt_cv_path_NM="$tmp_nm -p"
-	 break
+	 break 2
 	 ;;
 	 *)
 	 lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -5831,15 +5724,15 @@
 	esac
 fi
 done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 done
 : ${lt_cv_path_NM=no}
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
 else
 # Didn't find any BSD compatible name lister, look for dumpbin.
 if test -n "$DUMPBIN"; then :
@@ -5945,9 +5838,9 @@
 fi
 fi
 
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
 *COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
 ;;
 *)
 DUMPBIN=:
@@ -5955,8 +5848,8 @@
 esac
 fi
 
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
 fi
 fi
 test -z "$NM" && NM=nm
@@ -6007,7 +5900,7 @@
 $as_echo_n "(cached) " >&6
 else
 i=0
- teststring="ABCD"
+ teststring=ABCD
 
 case $build_os in
 msdosdjgpp*)
@@ -6047,7 +5940,7 @@
 lt_cv_sys_max_cmd_len=8192;
 ;;
 
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
 # This has been around since 386BSD, at least. Likely further.
 if test -x /sbin/sysctl; then
 lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6097,22 +5990,23 @@
 ;;
 *)
 lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
 else
 # Make teststring a little bigger before we do anything with it.
 # a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
 teststring=$teststring$teststring
 done
 SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
 # 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"`env 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
+	 test 17 != "$i" # 1/2 MB should be enough
 do
 i=`expr $i + 1`
 teststring=$teststring$teststring
@@ -6130,7 +6024,7 @@
 
 fi
 
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
@@ -6148,30 +6042,6 @@
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 lt_unset=unset
 else
@@ -6294,13 +6164,13 @@
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
 cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
 reload_cmds=false
 fi
 ;;
 darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
 else
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 fi
@@ -6428,13 +6298,13 @@
 # Need to set the preceding variable on all platforms that support
 # interlibrary dependencies.
 # 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic regex' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
 
 case $host_os in
 aix4-9*)
@@ -6461,8 +6331,7 @@
 # Base MSYS/MinGW do not provide the 'file' command needed by
 # func_win32_libid shell function, so use a weaker test based on 'objdump',
 # unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
 lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 lt_cv_file_magic_cmd='func_win32_libid'
 else
@@ -6498,10 +6367,6 @@
 fi
 ;;
 
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
 haiku*)
 lt_cv_deplibs_check_method=pass_all
 ;;
@@ -6540,7 +6405,7 @@
 ;;
 
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 lt_cv_deplibs_check_method=pass_all
 ;;
 
@@ -6562,8 +6427,8 @@
 lt_cv_deplibs_check_method=pass_all
 ;;
 
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|\.so|_pic\.a)$'
 else
 lt_cv_deplibs_check_method='match_pattern /lib^/+(\.so\.0-9+\.0-9+|_pic\.a)$'
@@ -6616,6 +6481,9 @@
 tpf*)
 lt_cv_deplibs_check_method=pass_all
 ;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
 esac
 
 fi
@@ -6773,8 +6641,8 @@
 
 case $host_os in
 cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
 case `$DLLTOOL --help 2>&1` in
 *--identify-strict*)
 lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -6786,7 +6654,7 @@
 ;;
 *)
 # fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
 ;;
 esac
 
@@ -6940,7 +6808,7 @@
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
 	rm -f conftest.$ac_objext libconftest.a
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
@@ -6948,7 +6816,7 @@
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
+	if test 0 -ne "$ac_status"; then
 lt_cv_ar_at_file=@
 fi
 fi
@@ -6961,7 +6829,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 $as_echo "$lt_cv_ar_at_file" >&6; }
 
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
 archiver_list_spec=
 else
 archiver_list_spec=$lt_cv_ar_at_file
@@ -7178,7 +7046,7 @@
 
 if test -n "$RANLIB"; then
 case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
 old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
 ;;
 *)
@@ -7268,7 +7136,7 @@
 symcode='ABCDGISTW'
 ;;
 hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
 symcode='ABCDEGRST'
 fi
 ;;
@@ -7301,14 +7169,44 @@
 symcode='ABCDGIRSTW' ;;
 esac
 
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* $.*$$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* $lib.*$$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* $.*$$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* $.*$$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $^ *$ *$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $^ *$ $^ *$$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: $^ *$ *$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $^ *$ $lib^ *$$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* $^ *$ $^ *$$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* $lib.*$$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* $.*$$/ {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -7326,21 +7224,24 @@
 
 # Write the raw and C identifiers.
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
 # Also find C++ and __fastcall symbols from MSVC++,
 # which start with @ or ?.
 lt_cv_sys_global_symbol_pipe="$AWK '"\
 " {last_section=section; section=\$ 3};"\
 " /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
 " /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn2,2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 " \$ 0!~/External *\|/{next};"\
 " / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
 " {if(hidesection) next};"\
-" {f=0}; \$ 0~/.*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a2, s)};"\
-" s1~/^@?/{print s1, s1; next};"\
-" s1~prfx {split(s1,t,\"@\"); print t1, substr(t1,length(prfx))}"\
+" {f=\"D\"}; \$ 0~/.*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a2,s)};"\
+" s1~/^@?/{print f,s1,s1; next};"\
+" s1~prfx {split(s1,t,\"@\"); print f,t1,substr(t1,length(prfx))}"\
 " ' prfx=^$ac_symprfx"
 else
 lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*	 $$symcode$symcode*$	 	 *$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -7388,11 +7289,11 @@
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	 cat <<_LT_EOF > conftest.$ac_ext
 /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
 relocations are performed -- see ld's documentation on pseudo-relocs. */
 # define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data. */
 # define LT_DLSYM_CONST
 #else
@@ -7418,7 +7319,7 @@
 {
 { "@PROGRAM@", (void *) 0 },
 _LT_EOF
-	 $SED "s/^$symcode$symcode* $.*$ $.*$$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	 $SED "s/^$symcode$symcode* .* $.*$$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	 cat <<\_LT_EOF >> conftest.$ac_ext
 {0, (void *) 0}
 };
@@ -7438,13 +7339,13 @@
 	 mv conftest.$ac_objext conftstm.$ac_objext
 	 lt_globsym_save_LIBS=$LIBS
 	 lt_globsym_save_CFLAGS=$CFLAGS
-	 LIBS="conftstm.$ac_objext"
+	 LIBS=conftstm.$ac_objext
 	 CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
 (eval $ac_link) 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	 pipe_works=yes
 	 fi
 	 LIBS=$lt_globsym_save_LIBS
@@ -7465,7 +7366,7 @@
 rm -rf conftest* conftst*
 
 # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
 break
 else
 lt_cv_sys_global_symbol_pipe=
@@ -7518,6 +7419,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 $as_echo_n "checking for sysroot... " >&6; }
 
@@ -7530,9 +7441,9 @@
 
 
 lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
 yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
 fi
 ;; #(
@@ -7542,8 +7453,8 @@
 no|'')
 ;; #(
 *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
 ;;
 esac
@@ -7555,18 +7466,99 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+ ac_path_lt_DD_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ 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_prog in dd; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+ $ac_path_lt_DD_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_lt_DD"; then
+ :
+ fi
+else
+ ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *\\/compile | ccache | *\\/ccache ) ;;
+ distcc | *\\/distcc | purify | *\\/purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
 enableval=$enable_libtool_lock;
 fi
 
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 case $host in
 ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
 echo 'int i;' > conftest.$ac_ext
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
@@ -7575,24 +7567,25 @@
 test $ac_status = 0; }; then
 case `/usr/bin/file conftest.$ac_objext` in
 *ELF-32*)
-	HPUX_IA64_MODE="32"
+	HPUX_IA64_MODE=32
 	;;
 *ELF-64*)
-	HPUX_IA64_MODE="64"
+	HPUX_IA64_MODE=64
 	;;
 esac
 fi
 rm -rf conftest*
 ;;
 *-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
 echo '#line '$LINENO' "configure"' > conftest.$ac_ext
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
 case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	 LD="${LD-ld} -melf32bsmip"
@@ -7621,9 +7614,50 @@
 rm -rf conftest*
 ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+	emul="${emul}32"
+	;;
+ *64-bit*)
+	emul="${emul}64"
+	;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+	emul="${emul}btsmip"
+	;;
+ *LSB*)
+	emul="${emul}ltsmip"
+	;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+	emul="${emul}n32"
+	;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
 echo 'int i;' > conftest.$ac_ext
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
@@ -7637,9 +7671,19 @@
 	 LD="${LD-ld} -m elf_i386_fbsd"
 	 ;;
 	 x86_64-*linux*)
-	 LD="${LD-ld} -m elf_i386"
+	 case `/usr/bin/file conftest.o` in
+	 *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	 *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	 esac
+	 ;;
+	 powerpc64le-*linux*)
+	 LD="${LD-ld} -m elf32lppclinux"
 	 ;;
-	 ppc64-*linux*|powerpc64-*linux*)
+	 powerpc64-*linux*)
 	 LD="${LD-ld} -m elf32ppclinux"
 	 ;;
 	 s390x-*linux*)
@@ -7658,7 +7702,10 @@
 	 x86_64-*linux*)
 	 LD="${LD-ld} -m elf_x86_64"
 	 ;;
-	 ppc*-*linux*|powerpc*-*linux*)
+	 powerpcle-*linux*)
+	 LD="${LD-ld} -m elf64lppc"
+	 ;;
+	 powerpc-*linux*)
 	 LD="${LD-ld} -m elf64ppc"
 	 ;;
 	 s390*-*linux*|s390*-*tpf*)
@@ -7676,7 +7723,7 @@
 
 *-*-sco3.2v5*)
 # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -belf"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -7716,13 +7763,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 $as_echo "$lt_cv_cc_needs_belf" >&6; }
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
 # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
 fi
 ;;
 *-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
 echo 'int i;' > conftest.$ac_ext
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
@@ -7734,7 +7782,7 @@
 case $lt_cv_prog_gnu_ld in
 yes*)
 case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
 LD="${LD-ld} -m elf_x86_64"
 ;;
 sparc*-*-solaris*)
@@ -7743,7 +7791,7 @@
 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"
+ LD=${LD-ld}_sol2
 fi
 ;;
 *)
@@ -7759,7 +7807,7 @@
 ;;
 esac
 
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
 
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
@@ -7870,7 +7918,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
 $as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
 MANIFEST_TOOL=:
 fi
 
@@ -8373,7 +8421,7 @@
 $as_echo_n "(cached) " >&6
 else
 lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
 	# By default we will add the -single_module flag. You can override
 	# by either setting the environment variable LT_MULTI_MODULE
 	# non-empty at configure time, or by adding -multi_module to the
@@ -8391,7 +8439,7 @@
 	 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
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	 lt_cv_apple_cc_single_mod=yes
 	else
 	 cat conftest.err >&5
@@ -8430,7 +8478,7 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
+	LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
@@ -8459,7 +8507,7 @@
 _lt_result=$?
 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
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 	lt_cv_ld_force_load=yes
 else
 	cat conftest.err >&5
@@ -8472,32 +8520,32 @@
 $as_echo "$lt_cv_ld_force_load" >&6; }
 case $host_os in
 rhapsody* | darwin1.012)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
 darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 darwin*) # darwin 5.x on
 # if running on 10.5 or later, the deployment target defaults
 # to the OS version, if on x86, and 10.4, the deployment
 # target defaults to 10.4. Don't you love it?
 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 	10.0,*86*-darwin8*|10.0,*-darwin91*)
-	 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.012*)
-	 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	 _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.012,.*)
+	 _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 	10.*)
-	 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	 _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 esac
 ;;
 esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
 _lt_dar_single_mod='$single_module'
 fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
 else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
 fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
 _lt_dsymutil='~$DSYMUTIL $lib || :'
 else
 _lt_dsymutil=
@@ -8505,6 +8553,41 @@
 ;;
 esac
 
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR:DIR:"
+# string "DIR DIR" will be prepended to VARIABLE
+# ":DIR:DIR"
+# string "DIR DIR" will be appended to VARIABLE
+# "DIRP:DIRP::DIRA:DIRA"
+# string "DIRP DIRP" will be prepended to VARIABLE and string
+# "DIRA DIRA" will be appended to VARIABLE
+# "DIR:DIR"
+# VARIABLE will be replaced by "DIR DIR"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
 for ac_header in dlfcn.h
 do :
 ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
@@ -8523,36 +8606,27 @@
 
 
 # Set options
-
-
-
- enable_dlopen=no
-
-
- enable_win32_dll=no
-
-
- # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
- enableval=$enable_shared; p=${PACKAGE-default}
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+ enableval=$enable_static; p=${PACKAGE-default}
 case $enableval in
- yes) enable_shared=yes ;;
- no) enable_shared=no ;;
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
 *)
- enable_shared=no
+ enable_static=no
 # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
-	 enable_shared=yes
+	 enable_static=yes
 	fi
 done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 ;;
 esac
 else
- enable_shared=yes
+ enable_static=no
 fi
 
 
@@ -8563,27 +8637,34 @@
 
 
 
- # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
- enableval=$enable_static; p=${PACKAGE-default}
+
+ enable_dlopen=no
+
+
+ enable_win32_dll=no
+
+
+ # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+ enableval=$enable_shared; p=${PACKAGE-default}
 case $enableval in
- yes) enable_static=yes ;;
- no) enable_static=no ;;
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
 *)
- enable_static=no
+ enable_shared=no
 # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
-	 enable_static=yes
+	 enable_shared=yes
 	fi
 done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 ;;
 esac
 else
- enable_static=yes
+ enable_shared=yes
 fi
 
 
@@ -8595,6 +8676,7 @@
 
 
 
+
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
 withval=$with_pic; lt_p=${PACKAGE-default}
@@ -8603,14 +8685,14 @@
 *)
 pic_mode=default
 # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$lt_pkg" = "X$lt_p"; then
 	 pic_mode=yes
 	fi
 done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 ;;
 esac
 else
@@ -8618,8 +8700,6 @@
 fi
 
 
-test -z "$pic_mode" && pic_mode=default
-
 
 
 
@@ -8635,14 +8715,14 @@
 *)
 enable_fast_install=no
 # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
 for pkg in $enableval; do
-	IFS="$lt_save_ifs"
+	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	 enable_fast_install=yes
 	fi
 done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 ;;
 esac
 else
@@ -8656,11 +8736,63 @@
 
 
 
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix5-9*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
 
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -8709,7 +8841,7 @@
 
 
 
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
 setopt NO_GLOB_SUBST
 fi
 
@@ -8748,7 +8880,7 @@
 # AIX sometimes has problems with the GCC collect2 program. For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
 COLLECT_NAMES=
 export COLLECT_NAMES
 fi
@@ -8759,14 +8891,14 @@
 ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
 
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
@@ -8775,15 +8907,8 @@
 test -z "$LD" && LD=ld
 test -z "$ac_objext" && ac_objext=o
 
-for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *\\/compile | ccache | *\\/ccache ) ;;
- distcc | *\\/distcc | purify | *\\/purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
 # Only perform the check for file, if the check method requires it
@@ -8798,22 +8923,22 @@
 else
 case $MAGIC_CMD in
 \\/* | ?:\\/*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
 ;;
 *)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
 for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/${ac_tool_prefix}file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+ if test -f "$ac_dir/${ac_tool_prefix}file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
 if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	 file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	 $EGREP "$file_magic_regex" > /dev/null; then
 	 :
@@ -8836,13 +8961,13 @@
 break
 fi
 done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
 ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
@@ -8864,22 +8989,22 @@
 else
 case $MAGIC_CMD in
 \\/* | ?:\\/*)
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
 ;;
 *)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
 for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/file; then
- lt_cv_path_MAGIC_CMD="$ac_dir/file"
+ if test -f "$ac_dir/file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"file"
 if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	 file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
-	 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	 if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	 $EGREP "$file_magic_regex" > /dev/null; then
 	 :
@@ -8902,13 +9027,13 @@
 break
 fi
 done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
 ;;
 esac
 fi
 
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
@@ -8929,7 +9054,7 @@
 
 # Use C for the default configuration in the libtool script
 
-lt_save_CC="$CC"
+lt_save_CC=$CC
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8983,15 +9108,11 @@
 $RM -r conftest*
 
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
 case $cc_basename in
 nvcc*)
 lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
@@ -9007,7 +9128,7 @@
 lt_cv_prog_compiler_rtti_exceptions=no
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
+ lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
 # Insert the option either (1) after the last *FLAGS variable, or
 # (2) before a word containing "conftest.", or (3) at the end.
 # Note that $ac_compile itself does not contain backslashes and begins
@@ -9037,7 +9158,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
 lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
 else
 :
@@ -9055,17 +9176,18 @@
 lt_prog_compiler_static=
 
 
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
 lt_prog_compiler_wl='-Wl,'
 lt_prog_compiler_static='-static'
 
 case $host_os in
 aix*)
 # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
 fi
+ lt_prog_compiler_pic='-fPIC'
 ;;
 
 amigaos*)
@@ -9076,8 +9198,8 @@
 ;;
 m68k)
 # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
 lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
 ;;
 esac
@@ -9093,6 +9215,11 @@
 # Although the cygwin gcc ignores -fPIC, still need this for old-style
 # (--disable-auto-import) libraries
 lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+ esac
 ;;
 
 darwin* | rhapsody*)
@@ -9163,7 +9290,7 @@
 case $host_os in
 aix*)
 lt_prog_compiler_wl='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
 else
@@ -9171,10 +9298,29 @@
 fi
 ;;
 
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ esac
+ ;;
+
 mingw* | cygwin* | pw32* | os2* | cegcc*)
 # This hack is so that the source file can tell whether it is being
 # built for inclusion in a dll (and should export symbols for example).
 lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+	lt_prog_compiler_static='$wl-static'
+	;;
+ esac
 ;;
 
 hpux9* | hpux10* | hpux11*)
@@ -9190,7 +9336,7 @@
 	;;
 esac
 # Is there a better lt_prog_compiler_static that works with the bundled CC?
- lt_prog_compiler_static='${wl}-a ${wl}archive'
+ lt_prog_compiler_static='$wl-a ${wl}archive'
 ;;
 
 irix5* | irix6* | nonstopux*)
@@ -9199,9 +9345,9 @@
 lt_prog_compiler_static='-non_shared'
 ;;
 
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
 ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
@@ -9226,6 +9372,12 @@
 	lt_prog_compiler_pic='-PIC'
 	lt_prog_compiler_static='-Bstatic'
 	;;
+ tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+	;;
 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -9323,7 +9475,7 @@
 ;;
 
 sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
 	lt_prog_compiler_pic='-Kconform_pic'
 	lt_prog_compiler_static='-Bstatic'
 fi
@@ -9352,7 +9504,7 @@
 fi
 
 case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
 *djgpp*)
 lt_prog_compiler_pic=
 ;;
@@ -9384,7 +9536,7 @@
 lt_cv_prog_compiler_pic_works=no
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
 # Insert the option either (1) after the last *FLAGS variable, or
 # (2) before a word containing "conftest.", or (3) at the end.
 # Note that $ac_compile itself does not contain backslashes and begins
@@ -9414,7 +9566,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
 case $lt_prog_compiler_pic in
 "" | " "*) ;;
 *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -9446,7 +9598,7 @@
 $as_echo_n "(cached) " >&6
 else
 lt_cv_prog_compiler_static_works=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
 echo "$lt_simple_link_test_code" > conftest.$ac_ext
 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -9465,13 +9617,13 @@
 fi
 fi
 $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works"; then
 :
 else
 lt_prog_compiler_static=
@@ -9591,8 +9743,8 @@
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
 # do not overwrite the value of need_locks provided by the user
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -9604,9 +9756,9 @@
 ln conftest.a conftest.b 2>/dev/null && hard_links=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
 need_locks=warn
 fi
 else
@@ -9649,9 +9801,9 @@
 # included in the symbol list
 include_expsyms=
 # exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
 exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
 # platforms (ab)use it in PIC code, but their linkers get confused if
@@ -9666,7 +9818,7 @@
 # FIXME: the MSVC++ port hasn't been tested in a loooong time
 # When not using gcc, we currently assume that we are using
 # Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
 with_gnu_ld=no
 fi
 ;;
@@ -9674,7 +9826,7 @@
 # we just hope/assume this is gcc and not c89 (= MSVC++)
 with_gnu_ld=yes
 ;;
- openbsd*)
+ openbsd* | bitrig*)
 with_gnu_ld=no
 ;;
 linux* | k*bsd*-gnu | gnu*)
@@ -9687,7 +9839,7 @@
 # On some targets, GNU ld is compatible enough with the native linker
 # that we're better off using the native interface for both.
 lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
 case $host_os in
 aix*)
 	# The AIX port of GNU ld has always aspired to compatibility
@@ -9709,24 +9861,24 @@
 esac
 fi
 
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
 # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
 
 # Set some defaults for GNU ld with shared library support. These
 # are reset later if shared libraries are not supported. Putting them
 # here allows them to be overridden if necessary.
 runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec='$wl--export-dynamic'
 # ancient GNU ld didn't support --whole-archive et. al.
 if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 else
 whole_archive_flag_spec=
 fi
 supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
 *GNU\ gold*) supports_anon_versioning=yes ;;
 *\ 01.* | *\ 2.0-9.* | *\ 2.10.*) ;; # catch versions < 2.11
 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -9739,7 +9891,7 @@
 case $host_os in
 aix3-9*)
 # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
@@ -9758,7 +9910,7 @@
 case $host_cpu in
 powerpc)
 # see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 archive_expsym_cmds=''
 ;;
 m68k)
@@ -9774,7 +9926,7 @@
 	allow_undefined_flag=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined. This deserves some investigation. FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 else
 	ld_shlibs=no
 fi
@@ -9784,7 +9936,7 @@
 # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
 # as there is no search path for DLLs.
 hardcode_libdir_flag_spec='-L$libdir'
- export_dynamic_flag_spec='${wl}--export-all-symbols'
+ export_dynamic_flag_spec='$wl--export-all-symbols'
 allow_undefined_flag=unsupported
 always_export_symbols=no
 enable_shared_with_static_runtimes=yes
@@ -9792,61 +9944,89 @@
 exclude_expsyms='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
 
 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 cp $export_symbols $output_objdir/$soname.def;
-	else
-	 echo EXPORTS > $output_objdir/$soname.def;
-	 cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^	 *//'\'' -e '\''/^$;.*$*$/d'\'' -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 else
 	ld_shlibs=no
 fi
 ;;
 
 haiku*)
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 link_all_deplibs=yes
 ;;
 
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	 prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
 interix3-9*)
 hardcode_direct=no
 hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
 # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 # Instead, shared libraries are loaded at an image base (0x10000000 by
 # default) and relocated if they conflict, which is a slow very memory
 # consuming and fragmenting process. To avoid this, we pick a random,
 # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 ;;
 
 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	 diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
 fi
 if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
+	 && test no = "$tmp_diet"
 then
 	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
 pgcc*)				# Portland Group C compiler
-	 whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	 whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	 tmp_addflag=' $pic_flag'
 	 ;;
 	pgf77* | pgf90* | pgf95* | pgfortran*)
 					# Portland Group f77 and f90 compilers
-	 whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	 whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	 tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	 tmp_addflag=' -i_dynamic' ;;
@@ -9857,42 +10037,47 @@
 	lf95*)				# Lahey Fortran 8.1
 	 whole_archive_flag_spec=
 	 tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
 	xlcC* | bgxlcC* | mpixlcC*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	 tmp_sharedflag='-qmkshrobj'
 	 tmp_addflag= ;;
 	nvcc*)	# Cuda Compiler Driver 2.2
-	 whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	 whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	 compiler_needs_object=yes
 	 ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	 whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	 compiler_needs_object=yes
 	 tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	 tmp_sharedflag='-G' ;;
 	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	 cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	 echo "local: *; };" >> $output_objdir/$libname.ver~
-	 $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 fi
 
 	case $cc_basename in
+	tcc*)
+	 export_dynamic_flag_spec='-rdynamic'
+	 ;;
 	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='${wl}-rpath ${wl}$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
+	 if test yes = "$supports_anon_versioning"; then
 	 archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	 cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-	 echo "local: *; };" >> $output_objdir/$libname.ver~
-	 $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	 fi
 	 ;;
 	esac
@@ -9906,8 +10091,8 @@
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
 else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 fi
 ;;
 
@@ -9925,8 +10110,8 @@
 
 _LT_EOF
 elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 else
 	ld_shlibs=no
 fi
@@ -9938,7 +10123,7 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** reliably create shared libraries on SCO systems. Therefore, libtool
 *** is disabling shared libraries support. We urge you to upgrade GNU
 *** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -9953,9 +10138,9 @@
 	 # DT_RUNPATH tag from executables and libraries. But doing so
 	 # requires that you compile everything twice, which is a pain.
 	 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	 hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+	 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	 archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	 else
 	 ld_shlibs=no
 	 fi
@@ -9972,15 +10157,15 @@
 
 *)
 if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 else
 	ld_shlibs=no
 fi
 ;;
 esac
 
- if test "$ld_shlibs" = no; then
+ if test no = "$ld_shlibs"; then
 runpath_var=
 hardcode_libdir_flag_spec=
 export_dynamic_flag_spec=
@@ -9996,7 +10181,7 @@
 # Note: this linker hardcodes the directories in LIBPATH if there
 # are no directories specified by -L.
 hardcode_minus_L=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct=unsupported
@@ -10004,34 +10189,57 @@
 ;;
 
 aix4-9*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
 	aix_use_runtimelinking=no
 	exp_sym_flag='-Bexport'
-	no_entry_flag=""
+	no_entry_flag=
 else
 	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	 export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	 export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
-	 export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	 export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+	# "aix,yes" lib.so shared, rtl:yes, for executables
+	# lib.a static archive
+	# "both,no" lib.so.V(shr.o) shared, rtl:yes
+	# lib.a(lib.so.V) shared, rtl:no, for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	# lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+	# lib.a static archive
 	case $host_os in aix4.23|aix4.23.*|aix5-9*)
 	 for ld_flag in $LDFLAGS; do
-	 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	 if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	 aix_use_runtimelinking=yes
 	 break
 	 fi
 	 done
+	 if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	 # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	 # so we don't have lib.a shared libs to link our executables.
+	 # We have to force runtime linking in this case.
+	 aix_use_runtimelinking=yes
+	 LDFLAGS="$LDFLAGS -Wl,-brtl"
+	 fi
 	 ;;
 	esac
 
@@ -10050,13 +10258,21 @@
 hardcode_direct_absolute=yes
 hardcode_libdir_separator=':'
 link_all_deplibs=yes
- file_list_spec='${wl}-f,'
+ file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	hardcode_direct=no
+	hardcode_direct_absolute=no
+	;;
+ esac
 
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
 	case $host_os in aix4.012|aix4.012.*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
-	 collect2name=`${CC} -print-prog-name=collect2`
+	 collect2name=`$CC -print-prog-name=collect2`
 	 if test -f "$collect2name" &&
 	 strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	 then
@@ -10075,36 +10291,42 @@
 	 ;;
 	esac
 	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag="$shared_flag "'${wl}-G'
+	if test yes = "$aix_use_runtimelinking"; then
+	 shared_flag="$shared_flag "'$wl-G'
 	fi
-	link_all_deplibs=no
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
 else
 	# not using gcc
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	# chokes on -Wl,-G. The following line is correct:
 	 shared_flag='-G'
 	else
-	 if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag='${wl}-G'
+	 if test yes = "$aix_use_runtimelinking"; then
+	 shared_flag='$wl-G'
 	 else
-	 shared_flag='${wl}-bM:SRE'
+	 shared_flag='$wl-bM:SRE'
 	 fi
+	 shared_flag_aix='$wl-bM:SRE'
+	 shared_flag_svr4='$wl-G'
 	fi
 fi
 
- export_dynamic_flag_spec='${wl}-bexpall'
+ export_dynamic_flag_spec='$wl-bexpall'
 # It seems that -bexpall does not export symbols beginning with
 # underscore (_), so it is better to generate a list of symbols to export.
 always_export_symbols=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
 # Determine the default libpath from the value encoded in an
 # empty executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
 aix_libpath=$lt_cv_aix_libpath
 else
 if ${lt_cv_aix_libpath_+:} false; then :
@@ -10139,7 +10361,7 @@
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
 fi
 
 fi
@@ -10147,17 +10369,17 @@
 aix_libpath=$lt_cv_aix_libpath_
 fi
 
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
 else
-	if test "$host_cpu" = ia64; then
-	 hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	if test ia64 = "$host_cpu"; then
+	 hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
 	 allow_undefined_flag="-z nodefs"
-	 archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	 archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
+	 if test set = "${lt_cv_aix_libpath+set}"; then
 aix_libpath=$lt_cv_aix_libpath
 else
 if ${lt_cv_aix_libpath_+:} false; then :
@@ -10192,7 +10414,7 @@
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 if test -z "$lt_cv_aix_libpath_"; then
- lt_cv_aix_libpath_="/usr/lib:/lib"
+ lt_cv_aix_libpath_=/usr/lib:/lib
 fi
 
 fi
@@ -10200,21 +10422,33 @@
 aix_libpath=$lt_cv_aix_libpath_
 fi
 
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
 	 # Warning - without using the other run time loading flags,
 	 # -berok will link without error, but may produce a broken library.
-	 no_undefined_flag=' ${wl}-bernotok'
-	 allow_undefined_flag=' ${wl}-berok'
-	 if test "$with_gnu_ld" = yes; then
+	 no_undefined_flag=' $wl-bernotok'
+	 allow_undefined_flag=' $wl-berok'
+	 if test yes = "$with_gnu_ld"; then
 	 # We only use this code for GNU lds that support --whole-archive.
-	 whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	 whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
 	 else
 	 # Exported symbols can be pulled into shared objects from archives
 	 whole_archive_flag_spec='$convenience'
 	 fi
 	 archive_cmds_need_lc=yes
-	 # This is similar to how AIX traditionally builds its shared libraries.
-	 archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	 archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	 # -brtl affects multiple linker settings, -berok does not and is overridden later
+	 compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\$, \$%-berok\\1%g"`'
+	 if test svr4 != "$with_aix_soname"; then
+	 # This is similar to how AIX traditionally builds its shared libraries.
+	 archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	 fi
+	 if test aix != "$with_aix_soname"; then
+	 archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	 else
+	 # used by -dlpreopen to get the symbols
+	 archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+	 fi
+	 archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
 	fi
 fi
 ;;
@@ -10223,7 +10457,7 @@
 case $host_cpu in
 powerpc)
 # see comment about AmigaOS4 .so support
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 archive_expsym_cmds=''
 ;;
 m68k)
@@ -10253,16 +10487,17 @@
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	 else
-	 sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	 fi~
-	 $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	 linknames='
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^	 *//'\'' -e '\''/^$;.*$*$/d'\'' -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
 	# 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
@@ -10271,18 +10506,18 @@
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
 	postlink_cmds='lt_outputfile="@OUTPUT@"~
-	 lt_tool_outputfile="@TOOL_OUTPUT@"~
-	 case $lt_outputfile in
-	 *.exe|*.EXE) ;;
-	 *)
-	 lt_outputfile="$lt_outputfile.exe"
-	 lt_tool_outputfile="$lt_tool_outputfile.exe"
-	 ;;
-	 esac~
-	 if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	 $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	 $RM "$lt_outputfile.manifest";
-	 fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
 	;;
 *)
 	# Assume MSVC wrapper
@@ -10291,7 +10526,7 @@
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
+	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
 	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
@@ -10310,24 +10545,24 @@
 hardcode_direct=no
 hardcode_automatic=yes
 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\"`'
+ if test yes = "$lt_cv_ld_force_load"; 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
 link_all_deplibs=yes
- allow_undefined_flag="$_lt_dar_allow_undefined"
+ allow_undefined_flag=$_lt_dar_allow_undefined
 case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 *) _lt_dar_can_shared=$GCC ;;
 esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
 output_verbose_link_cmd=func_echo_all
- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
 else
 ld_shlibs=no
@@ -10369,33 +10604,33 @@
 ;;
 
 hpux9*)
- if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 fi
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 hardcode_libdir_separator=:
 hardcode_direct=yes
 
 # hardcode_minus_L: Not really in the search PATH,
 # but as the default location of the library.
 hardcode_minus_L=yes
- export_dynamic_flag_spec='${wl}-E'
+ export_dynamic_flag_spec='$wl-E'
 ;;
 
 hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 fi
- if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
+	export_dynamic_flag_spec='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	hardcode_minus_L=yes
@@ -10403,25 +10638,25 @@
 ;;
 
 hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
-	 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	 ;;
 	ia64*)
-	 archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	 ;;
 	*)
-	 archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	 ;;
 	esac
 else
 	case $host_cpu in
 	hppa*64*)
-	 archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	 ;;
 	ia64*)
-	 archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	 ;;
 	*)
 
@@ -10433,7 +10668,7 @@
 $as_echo_n "(cached) " >&6
 else
 lt_cv_prog_compiler__b=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
 LDFLAGS="$LDFLAGS -b"
 echo "$lt_simple_link_test_code" > conftest.$ac_ext
 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -10452,14 +10687,14 @@
 fi
 fi
 $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
 $as_echo "$lt_cv_prog_compiler__b" >&6; }
 
-if test x"$lt_cv_prog_compiler__b" = xyes; then
- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+if test yes = "$lt_cv_prog_compiler__b"; then
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 else
 archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 fi
@@ -10467,8 +10702,8 @@
 	 ;;
 	esac
 fi
- if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 
 	case $host_cpu in
@@ -10479,7 +10714,7 @@
 	*)
 	 hardcode_direct=yes
 	 hardcode_direct_absolute=yes
-	 export_dynamic_flag_spec='${wl}-E'
+	 export_dynamic_flag_spec='$wl-E'
 
 	 # hardcode_minus_L: Not really in the search PATH,
 	 # but as the default location of the library.
@@ -10490,8 +10725,8 @@
 ;;
 
 irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
@@ -10501,8 +10736,8 @@
 if ${lt_cv_irix_exported_symbol+:} false; then :
 $as_echo_n "(cached) " >&6
 else
- save_LDFLAGS="$LDFLAGS"
-	 LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ save_LDFLAGS=$LDFLAGS
+	 LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 int foo (void) { return 0; }
@@ -10514,24 +10749,35 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
 $as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
+	link_all_deplibs=no
 else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
 fi
 archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 hardcode_libdir_separator=:
 inherit_rpath=yes
 link_all_deplibs=yes
 ;;
 
+ linux*)
+ case $cc_basename in
+ tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	ld_shlibs=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+ esac
+ ;;
+
 netbsd* | netbsdelf*-gnu)
 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -10546,7 +10792,7 @@
 newsos6)
 archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 hardcode_direct=yes
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 hardcode_libdir_separator=:
 hardcode_shlibpath_var=no
 ;;
@@ -10554,27 +10800,19 @@
 *nto* | *qnx*)
 ;;
 
- openbsd*)
+ openbsd* | bitrig*)
 if test -f /usr/libexec/ld.so; then
 	hardcode_direct=yes
 	hardcode_shlibpath_var=no
 	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	 archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	 archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	 export_dynamic_flag_spec='${wl}-E'
+	 archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	 hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+	 export_dynamic_flag_spec='$wl-E'
 	else
-	 case $host_os in
-	 openbsd01.* | openbsd2.0-7 | openbsd2.0-7.*)
-	 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	 hardcode_libdir_flag_spec='-R$libdir'
-	 ;;
-	 *)
-	 archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	 ;;
-	 esac
+	 archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	 hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	fi
 else
 	ld_shlibs=no
@@ -10585,33 +10823,53 @@
 hardcode_libdir_flag_spec='-L$libdir'
 hardcode_minus_L=yes
 allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	 prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
 ;;
 
 osf3*)
- if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 fi
 archive_cmds_need_lc='no'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 hardcode_libdir_separator=:
 ;;
 
 osf4* | osf5*)	# as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10622,24 +10880,24 @@
 
 solaris*)
 no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+	wlarc='$wl'
+	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	 wlarc=''
-	 archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	 archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	 ;;
 	*)
-	 wlarc='${wl}'
-	 archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	 wlarc='$wl'
+	 archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	 ;;
 	esac
 fi
@@ -10649,11 +10907,11 @@
 solaris2.0-5 | solaris2.0-5.*) ;;
 *)
 	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'. GCC discards it without `$wl',
+	# but understands '-z linker_flag'. GCC discards it without '$wl',
 	# but is careful enough not to reorder.
 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	 whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	if test yes = "$GCC"; then
+	 whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	 whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
 	fi
@@ -10663,10 +10921,10 @@
 ;;
 
 sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
 else
 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
 fi
@@ -10715,43 +10973,43 @@
 ;;
 
 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
- no_undefined_flag='${wl}-z,text'
+ no_undefined_flag='$wl-z,text'
 archive_cmds_need_lc=no
 hardcode_shlibpath_var=no
 runpath_var='LD_RUN_PATH'
 
- if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 fi
 ;;
 
 sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
 # link with -lc, and that would cause any symbols used from libc to
 # always be unresolved, which means just about no library would
 # ever link correctly. If we're not using GNU ld we use -z text
 # though, which does catch some bad symbols but isn't as heavy-handed
 # as -z defs.
- no_undefined_flag='${wl}-z,text'
- allow_undefined_flag='${wl}-z,nodefs'
+ no_undefined_flag='$wl-z,text'
+ allow_undefined_flag='$wl-z,nodefs'
 archive_cmds_need_lc=no
 hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-R,$libdir'
+ hardcode_libdir_flag_spec='$wl-R,$libdir'
 hardcode_libdir_separator=':'
 link_all_deplibs=yes
- export_dynamic_flag_spec='${wl}-Bexport'
+ export_dynamic_flag_spec='$wl-Bexport'
 runpath_var='LD_RUN_PATH'
 
- if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 fi
 ;;
 
@@ -10766,10 +11024,10 @@
 ;;
 esac
 
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
 case $host in
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	export_dynamic_flag_spec='$wl-Blargedynsym'
 	;;
 esac
 fi
@@ -10777,7 +11035,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
+test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
 
@@ -10803,7 +11061,7 @@
 # Assume -lc should be added
 archive_cmds_need_lc=yes
 
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
 case $archive_cmds in
 *'~'*)
 # FIXME: we may have to deal with multi-command sequences.
@@ -11018,14 +11276,14 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
 case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
 esac
 case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=$A-Za-z:$,\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=$A-Za-z:$|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
 esac
 lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
 case $lt_search_path_spec in
@@ -11041,28 +11299,35 @@
 ;;
 esac
 # Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
 lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
 for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
 test -d "$lt_sys_path" && \
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
 fi
 done
 lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
 for (lt_i = NF; lt_i > 0; lt_i--) {
 if ($lt_i != "" && $lt_i != ".") {
 if ($lt_i == "..") {
 lt_count++;
 } else {
 if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
 } else {
 lt_count--;
 }
@@ -11076,7 +11341,7 @@
 # for these hosts.
 case $host_os in
 mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/$A-Za-z:$,\1,g'` ;;
+ $SED 's|/$A-Za-z:$|\1|g'` ;;
 esac
 sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
@@ -11085,7 +11350,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -11102,14 +11367,16 @@
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
 version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
 shlibpath_var=LIBPATH
 
 # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
 ;;
 
 aix4-9*)
@@ -11117,41 +11384,91 @@
 need_lib_prefix=no
 need_version=no
 hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
 # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
 shlibpath_var=LD_LIBRARY_PATH
 else
 # With GCC up to 2.95.x, collect2 would create an import file
 # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
 # development snapshots of GCC prior to 3.0.
 case $host_os in
 aix4 | aix4.01 | aix4.01.*)
 if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	 echo ' yes '
-	 echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	 echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
 else
 	can_build_shared=no
 fi
 ;;
 esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
 # soname into executable. Probably we can add versioning support to
 # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
 # If using run time linking (on AIX 4.2 or later) use lib<name>.so
 # instead of lib<name>.a to let people know that these are not
 # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
 # We preserve .a as extension for shared libraries through AIX4.2
 # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
 shlibpath_var=LIBPATH
 fi
 ;;
@@ -11161,18 +11478,18 @@
 powerpc)
 # Since July 2007 AmigaOS4 officially supports .so libraries.
 # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 ;;
 m68k)
 library_names_spec='$libname.ixlibrary $libname.a'
 # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 ;;
 esac
 ;;
 
 beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
 dynamic_linker="$host_os ld.so"
 shlibpath_var=LIBRARY_PATH
 ;;
@@ -11180,8 +11497,8 @@
 bsdi45*)
 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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
 shlibpath_var=LD_LIBRARY_PATH
 sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -11193,7 +11510,7 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
 version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
 need_version=no
 need_lib_prefix=no
 
@@ -11202,8 +11519,8 @@
 # gcc
 library_names_spec='$libname.dll.a'
 # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 dldir=$destdir/`dirname \$dlpath`~
 test -d \$dldir || mkdir -p \$dldir~
 $install_prog $dir/$dlname \$dldir/$dlname~
@@ -11219,17 +11536,17 @@
 case $host_os in
 cygwin*)
 # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 
 sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
 ;;
 mingw* | cegcc*)
 # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 ;;
 pw32*)
 # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 ;;
 esac
 dynamic_linker='Win32 ld.exe'
@@ -11238,8 +11555,8 @@
 *,cl*)
 # Native MSVC
 libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
 
 case $build_os in
 mingw*)
@@ -11266,7 +11583,7 @@
 sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 ;;
 *)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
 if $ECHO "$sys_lib_search_path_spec" | $GREP ';c-zC-Z:/' >/dev/null; then
 # It is most probably a Windows format PATH.
 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -11279,8 +11596,8 @@
 esac
 
 # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 dldir=$destdir/`dirname \$dlpath`~
 test -d \$dldir || mkdir -p \$dldir~
 $install_prog $dir/$dlname \$dldir/$dlname'
@@ -11293,7 +11610,7 @@
 
 *)
 # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
 dynamic_linker='Win32 ld.exe'
 ;;
 esac
@@ -11306,8 +11623,8 @@
 version_type=darwin
 need_lib_prefix=no
 need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
 shlibpath_overrides_runpath=yes
 shlibpath_var=DYLD_LIBRARY_PATH
 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -11320,8 +11637,8 @@
 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'
+ 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
 ;;
 
@@ -11339,12 +11656,13 @@
 version_type=freebsd-$objformat
 case $version_type in
 freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 need_version=no
 need_lib_prefix=no
 ;;
 freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 need_version=yes
 ;;
 esac
@@ -11369,26 +11687,15 @@
 esac
 ;;
 
-gnu*)
- 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 # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
 sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 hardcode_into_libs=yes
 ;;
@@ -11406,14 +11713,15 @@
 dynamic_linker="$host_os dld.so"
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
 sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
 else
 sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
 fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 ;;
 hppa*64*)
 shrext_cmds='.sl'
@@ -11421,8 +11729,8 @@
 dynamic_linker="$host_os dld.sl"
 shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
 shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
 sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 ;;
@@ -11431,8 +11739,8 @@
 dynamic_linker="$host_os dld.sl"
 shlibpath_var=SHLIB_PATH
 shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 ;;
 esac
 # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -11445,8 +11753,8 @@
 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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=no
@@ -11457,7 +11765,7 @@
 case $host_os in
 nonstopux*) version_type=nonstopux ;;
 *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
+	if test yes = "$lt_cv_prog_gnu_ld"; then
 		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
@@ -11465,8 +11773,8 @@
 esac
 need_lib_prefix=no
 need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
 case $host_os in
 irix5* | nonstopux*)
 libsuff= shlibsuff=
@@ -11485,8 +11793,8 @@
 esac
 shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
 shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
 hardcode_into_libs=yes
 ;;
 
@@ -11495,13 +11803,33 @@
 dynamic_linker=no
 ;;
 
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=no
@@ -11545,7 +11873,12 @@
 # before this can be enabled.
 hardcode_into_libs=yes
 
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
 if test -f /etc/ld.so.conf; then
 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;s/"//g;/^$/d' | tr '\n' ' '`
 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -11577,12 +11910,12 @@
 need_lib_prefix=no
 need_version=no
 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 dynamic_linker='NetBSD (a.out) ld.so'
 else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 dynamic_linker='NetBSD ld.elf_so'
 fi
 shlibpath_var=LD_LIBRARY_PATH
@@ -11592,7 +11925,7 @@
 
 newsos6)
 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}'
+ 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
 ;;
@@ -11601,58 +11934,68 @@
 version_type=qnx
 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'
+ 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
 dynamic_linker='ldqnx.so'
 ;;
 
-openbsd*)
+openbsd* | bitrig*)
 version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
 need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
- *)				need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.89 | openbsd2.89.*)
-	shlibpath_overrides_runpath=no
-	;;
- *)
-	shlibpath_overrides_runpath=yes
-	;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
 else
- shlibpath_overrides_runpath=yes
+ need_version=yes
 fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
 ;;
 
 os2*)
 libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
 need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
 dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
 ;;
 
 osf3* | osf4* | osf5*)
 version_type=osf
 need_lib_prefix=no
 need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 shlibpath_var=LD_LIBRARY_PATH
 sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 ;;
 
 rdos*)
@@ -11663,8 +12006,8 @@
 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'
+ 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=yes
 hardcode_into_libs=yes
@@ -11674,11 +12017,11 @@
 
 sunos4*)
 version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
 need_lib_prefix=no
 fi
 need_version=yes
@@ -11686,8 +12029,8 @@
 
 sysv4 | sysv4.3*)
 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'
+ 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
 case $host_vendor in
 sni)
@@ -11708,24 +12051,24 @@
 ;;
 
 sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
 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'
+ 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
 fi
 ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
 need_lib_prefix=no
 need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=yes
 hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
 sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
 else
 sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -11743,7 +12086,7 @@
 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}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=no
 hardcode_into_libs=yes
@@ -11751,8 +12094,8 @@
 
 uts4*)
 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'
+ 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
 ;;
 
@@ -11762,20 +12105,35 @@
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
+
+
+
 
 
 
@@ -11872,15 +12230,15 @@
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
 test -n "$runpath_var" ||
- test "X$hardcode_automatic" = "Xyes" ; then
+ test yes = "$hardcode_automatic"; then
 
 # We can hardcode non-existent directories.
- if test "$hardcode_direct" != no &&
+ if test no != "$hardcode_direct" &&
 # If the only mechanism to avoid hardcoding is shlibpath_var, we
 # have to relink, otherwise we might link with an installed library
 # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+ test no != "$hardcode_minus_L"; then
 # Linking always hardcodes the temporary library directory.
 hardcode_action=relink
 else
@@ -11895,12 +12253,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink ||
- test "$inherit_rpath" = yes; then
+if test relink = "$hardcode_action" ||
+ test yes = "$inherit_rpath"; then
 # Fast installation is not supported
 enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
 # Fast installation is not necessary
 enable_fast_install=needless
 fi
@@ -11910,7 +12268,7 @@
 
 
 
- if test "x$enable_dlopen" != xyes; then
+ if test yes != "$enable_dlopen"; then
 enable_dlopen=unknown
 enable_dlopen_self=unknown
 enable_dlopen_self_static=unknown
@@ -11920,23 +12278,23 @@
 
 case $host_os in
 beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
 lt_cv_dlopen_libs=
 lt_cv_dlopen_self=yes
 ;;
 
 mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
 lt_cv_dlopen_libs=
 ;;
 
 cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
 lt_cv_dlopen_libs=
 ;;
 
 darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
@@ -11974,10 +12332,10 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
 
- lt_cv_dlopen="dyld"
+ lt_cv_dlopen=dyld
 lt_cv_dlopen_libs=
 lt_cv_dlopen_self=yes
 
@@ -11985,10 +12343,18 @@
 
 ;;
 
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
 *)
 ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
 if test "x$ac_cv_func_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load"
+ lt_cv_dlopen=shl_load
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
@@ -12027,11 +12393,11 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
 else
 ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -12070,7 +12436,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
@@ -12109,7 +12475,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
@@ -12148,7 +12514,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
 
@@ -12169,21 +12535,21 @@
 ;;
 esac
 
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
 enable_dlopen=no
+ else
+ enable_dlopen=yes
 fi
 
 case $lt_cv_dlopen in
 dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
 wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
 LIBS="$lt_cv_dlopen_libs $LIBS"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
@@ -12191,7 +12557,7 @@
 if ${lt_cv_dlopen_self+:} false; then :
 $as_echo_n "(cached) " >&6
 else
- 	 if test "$cross_compiling" = yes; then :
+ 	 if test yes = "$cross_compiling"; then :
 lt_cv_dlopen_self=cross
 else
 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -12238,9 +12604,9 @@
 # endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
 correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
@@ -12270,7 +12636,7 @@
 (eval $ac_link) 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
 (./conftest; exit; ) >&5 2>/dev/null
 lt_status=$?
 case x$lt_status in
@@ -12290,14 +12656,14 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
 wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if ${lt_cv_dlopen_self_static+:} false; then :
 $as_echo_n "(cached) " >&6
 else
- 	 if test "$cross_compiling" = yes; then :
+ 	 if test yes = "$cross_compiling"; then :
 lt_cv_dlopen_self_static=cross
 else
 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -12344,9 +12710,9 @@
 # endif
 #endif
 
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
 correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
@@ -12376,7 +12742,7 @@
 (eval $ac_link) 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
 (./conftest; exit; ) >&5 2>/dev/null
 lt_status=$?
 case x$lt_status in
@@ -12397,9 +12763,9 @@
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
 fi
 
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
 ;;
 esac
 
@@ -12443,7 +12809,7 @@
 # FIXME - insert some real tests, host_os isn't really good enough
 case $host_os in
 darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
 striplib="$STRIP -x"
 old_striplib="$STRIP -S"
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -12471,7 +12837,7 @@
 
 
 
- # Report which library types will actually be built
+ # Report what library types will actually be built
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
@@ -12479,13 +12845,13 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
 case $host_os in
 aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
 if test -n "$RANLIB"; then
 archive_cmds="$archive_cmds~\$RANLIB \$lib"
 postinstall_cmds='$RANLIB $lib'
@@ -12493,8 +12859,12 @@
 ;;
 
 aix4-9*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;;			# shared object as lib.so file only
+ yes,svr4,*) ;;			# shared object as lib.so archive member only
+ yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+ esac
 fi
 ;;
 esac
@@ -12504,7 +12874,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
@@ -12518,7 +12888,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-CC="$lt_save_CC"
+CC=$lt_save_CC
 
 
 
@@ -12548,197 +12918,7 @@
 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- 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
+ for ac_prog in clang
 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
@@ -12782,7 +12962,7 @@
 fi
 if test -z "$CC"; then
 ac_ct_CC=$CC
- for ac_prog in cl.exe
+ for ac_prog in clang
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -12837,8 +13017,6 @@
 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;}
@@ -13140,134 +13318,6 @@
 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".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- 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 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # 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
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- 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'
@@ -13525,147 +13575,19 @@
 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".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- 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 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # 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
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- 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}\$%%"`;;
+ 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
+ if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13844,7 +13766,7 @@
 # the CXX compiler isn't working. Some variables (like enable_shared)
 # are currently assumed to apply to all compilers on this platform,
 # and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
 # Code to be used in simple compile tests
 lt_simple_compile_test_code="int some_variable = 0;"
 
@@ -13905,46 +13827,39 @@
 CFLAGS=$CXXFLAGS
 compiler=$CC
 compiler_CXX=$CC
- for cc_temp in $compiler""; do
- case $cc_temp in
- compile | *\\/compile | ccache | *\\/ccache ) ;;
- distcc | *\\/distcc | purify | *\\/purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+ func_cc_basename $compiler
+cc_basename=$func_cc_basename_result
 
 
 if test -n "$compiler"; then
 # We don't want -fno-exception when compiling C++ code, so set the
 # no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
 lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
 else
 lt_prog_compiler_no_builtin_flag_CXX=
 fi
 
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
 # Set up default GNU C++ configuration
 
 
 
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
- withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 else
 with_gnu_ld=no
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
 # Check if gcc -print-prog-name=ld gives a path.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
 case $host in
 *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
 ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
 *)
 ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -13958,7 +13873,7 @@
 while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
 done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
 ;;
 "")
 # If it fails, then pretend we aren't using GCC.
@@ -13969,7 +13884,7 @@
 with_gnu_ld=unknown
 ;;
 esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
@@ -13980,32 +13895,32 @@
 $as_echo_n "(cached) " >&6
 else
 if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
 for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 test -z "$ac_dir" && ac_dir=.
 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
 # Check to see if the program is GNU ld. I'd rather use --version,
 # but apparently some variants of GNU ld only accept -v.
 # Break only if it was the GNU/non-GNU ld that we prefer.
 case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
+	test no != "$with_gnu_ld" && break
 	;;
 *)
-	test "$with_gnu_ld" != yes && break
+	test yes != "$with_gnu_ld" && break
 	;;
 esac
 fi
 done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
 else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
 if test -n "$LD"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
@@ -14041,22 +13956,22 @@
 
 # Check if GNU C++ uses GNU ld as the underlying linker, since the
 # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec_CXX='$wl--export-dynamic'
 
 # If archive_cmds runs LD, not CC, wlarc should be empty
 # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
 # investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
 
 # ancient GNU ld didn't support --whole-archive et. al.
 if eval "`$CC -print-prog-name=ld` --help 2>&1" |
 	 $GREP 'no-whole-archive' > /dev/null; then
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 else
 whole_archive_flag_spec_CXX=
 fi
@@ -14093,18 +14008,30 @@
 ld_shlibs_CXX=no
 ;;
 aix4-9*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
 # On IA64, the linker does run time linking by default, so we don't
 # have to do anything special.
 aix_use_runtimelinking=no
 exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
 else
 aix_use_runtimelinking=no
 
 # Test if we are trying to use run time linking or normal
 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
 case $host_os in aix4.23|aix4.23.*|aix5-9*)
 	 for ld_flag in $LDFLAGS; do
 	 case $ld_flag in
@@ -14114,6 +14041,13 @@
 	 ;;
 	 esac
 	 done
+	 if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	 # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	 # so we don't have lib.a shared libs to link our executables.
+	 # We have to force runtime linking in this case.
+	 aix_use_runtimelinking=yes
+	 LDFLAGS="$LDFLAGS -Wl,-brtl"
+	 fi
 	 ;;
 esac
 
@@ -14132,13 +14066,21 @@
 hardcode_direct_absolute_CXX=yes
 hardcode_libdir_separator_CXX=':'
 link_all_deplibs_CXX=yes
- file_list_spec_CXX='${wl}-f,'
+ file_list_spec_CXX='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;;	# no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct_CXX=no
+ hardcode_direct_absolute_CXX=no
+ ;;
+ esac
 
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
 case $host_os in aix4.012|aix4.012.*)
 # We only want to do this on AIX 4.2 and lower, the check
 # below for broken collect2 doesn't work under 4.3+
-	 collect2name=`${CC} -print-prog-name=collect2`
+	 collect2name=`$CC -print-prog-name=collect2`
 	 if test -f "$collect2name" &&
 	 strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	 then
@@ -14156,36 +14098,44 @@
 	 fi
 esac
 shared_flag='-shared'
-	 if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag="$shared_flag "'${wl}-G'
+	 if test yes = "$aix_use_runtimelinking"; then
+	 shared_flag=$shared_flag' $wl-G'
 	 fi
+	 # Need to ensure runtime linking is disabled for the traditional
+	 # shared library, or the linker may eventually find shared libraries
+	 # /with/ Import File - we do not want to mix them.
+	 shared_flag_aix='-shared'
+	 shared_flag_svr4='-shared $wl-G'
 else
 # not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
 	 # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	 # chokes on -Wl,-G. The following line is correct:
 	 shared_flag='-G'
 else
-	 if test "$aix_use_runtimelinking" = yes; then
-	 shared_flag='${wl}-G'
+	 if test yes = "$aix_use_runtimelinking"; then
+	 shared_flag='$wl-G'
 	 else
-	 shared_flag='${wl}-bM:SRE'
+	 shared_flag='$wl-bM:SRE'
 	 fi
+	 shared_flag_aix='$wl-bM:SRE'
+	 shared_flag_svr4='$wl-G'
 fi
 fi
 
- export_dynamic_flag_spec_CXX='${wl}-bexpall'
+ export_dynamic_flag_spec_CXX='$wl-bexpall'
 # It seems that -bexpall does not export symbols beginning with
 # underscore (_), so it is better to generate a list of symbols to
 	# export.
 always_export_symbols_CXX=yes
- if test "$aix_use_runtimelinking" = yes; then
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 # Warning - without using the other runtime loading flags (-brtl),
 # -berok will link without error, but may produce a broken library.
- allow_undefined_flag_CXX='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ no_undefined_flag_CXX='-bernotok'
 # Determine the default libpath from the value encoded in an empty
 # executable.
- if test "${lt_cv_aix_libpath+set}" = set; then
+ if test set = "${lt_cv_aix_libpath+set}"; then
 aix_libpath=$lt_cv_aix_libpath
 else
 if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -14220,7 +14170,7 @@
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 if test -z "$lt_cv_aix_libpath__CXX"; then
- lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
 fi
 
 fi
@@ -14228,18 +14178,18 @@
 aix_libpath=$lt_cv_aix_libpath__CXX
 fi
 
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+ hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
 
- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
 else
- if test "$host_cpu" = ia64; then
-	 hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+	 hardcode_libdir_flag_spec_CXX='$wl-R $libdir:/usr/lib:/lib'
 	 allow_undefined_flag_CXX="-z nodefs"
-	 archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	 archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
+	 if test set = "${lt_cv_aix_libpath+set}"; then
 aix_libpath=$lt_cv_aix_libpath
 else
 if ${lt_cv_aix_libpath__CXX+:} false; then :
@@ -14274,7 +14224,7 @@
 rm -f core conftest.err conftest.$ac_objext \
 conftest$ac_exeext conftest.$ac_ext
 if test -z "$lt_cv_aix_libpath__CXX"; then
- lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+ lt_cv_aix_libpath__CXX=/usr/lib:/lib
 fi
 
 fi
@@ -14282,22 +14232,34 @@
 aix_libpath=$lt_cv_aix_libpath__CXX
 fi
 
-	 hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 hardcode_libdir_flag_spec_CXX='$wl-blibpath:$libdir:'"$aix_libpath"
 	 # Warning - without using the other run time loading flags,
 	 # -berok will link without error, but may produce a broken library.
-	 no_undefined_flag_CXX=' ${wl}-bernotok'
-	 allow_undefined_flag_CXX=' ${wl}-berok'
-	 if test "$with_gnu_ld" = yes; then
+	 no_undefined_flag_CXX=' $wl-bernotok'
+	 allow_undefined_flag_CXX=' $wl-berok'
+	 if test yes = "$with_gnu_ld"; then
 	 # We only use this code for GNU lds that support --whole-archive.
-	 whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	 whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
 	 else
 	 # Exported symbols can be pulled into shared objects from archives
 	 whole_archive_flag_spec_CXX='$convenience'
 	 fi
 	 archive_cmds_need_lc_CXX=yes
-	 # This is similar to how AIX traditionally builds its shared
-	 # libraries.
-	 archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	 archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	 # -brtl affects multiple linker settings, -berok does not and is overridden later
+	 compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\$, \$%-berok\\1%g"`'
+	 if test svr4 != "$with_aix_soname"; then
+	 # This is similar to how AIX traditionally builds its shared
+	 # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	 archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	 fi
+	 if test aix != "$with_aix_soname"; then
+	 archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	 else
+	 # used by -dlpreopen to get the symbols
+	 archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+	 fi
+	 archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
 fi
 fi
 ;;
@@ -14307,7 +14269,7 @@
 	 allow_undefined_flag_CXX=unsupported
 	 # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	 # support --undefined. This deserves some investigation. FIXME
-	 archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	 archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	else
 	 ld_shlibs_CXX=no
 	fi
@@ -14335,57 +14297,58 @@
 	 # Tell ltmain to make .lib files, not .a files.
 	 libext=lib
 	 # Tell ltmain to make .dll files, not .so files.
-	 shrext_cmds=".dll"
+	 shrext_cmds=.dll
 	 # FIXME: Setting linknames here is a bad hack.
-	 archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	 archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	 else
-	 $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	 fi~
-	 $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	 linknames='
+	 archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	 archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^	 *//'\'' -e '\''/^$;.*$*$/d'\'' -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
 	 # The linker will not automatically build a static lib if we build a DLL.
 	 # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
 	 enable_shared_with_static_runtimes_CXX=yes
 	 # Don't use ranlib
 	 old_postinstall_cmds_CXX='chmod 644 $oldlib'
 	 postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
-	 lt_tool_outputfile="@TOOL_OUTPUT@"~
-	 case $lt_outputfile in
-	 *.exe|*.EXE) ;;
-	 *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	 esac~
-	 func_to_tool_file "$lt_outputfile"~
-	 if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	 $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	 $RM "$lt_outputfile.manifest";
-	 fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
 	 ;;
 	*)
 	 # g++
 	 # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
 	 # as there is no search path for DLLs.
 	 hardcode_libdir_flag_spec_CXX='-L$libdir'
-	 export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+	 export_dynamic_flag_spec_CXX='$wl--export-all-symbols'
 	 allow_undefined_flag_CXX=unsupported
 	 always_export_symbols_CXX=no
 	 enable_shared_with_static_runtimes_CXX=yes
 
 	 if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	 archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	 # If the export-symbols file already is a .def file (1st line
-	 # is EXPORTS), use it as is; otherwise, prepend...
-	 archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	 cp $export_symbols $output_objdir/$soname.def;
-	 else
-	 echo EXPORTS > $output_objdir/$soname.def;
-	 cat $export_symbols >> $output_objdir/$soname.def;
-	 fi~
-	 $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	 archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	 # If the export-symbols file already is a .def file, use it as
+	 # is; otherwise, prepend EXPORTS...
+	 archive_expsym_cmds_CXX='if test DEF = "`$SED -n -e '\''s/^	 *//'\'' -e '\''/^$;.*$*$/d'\'' -e '\''s/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	 else
 	 ld_shlibs_CXX=no
 	 fi
@@ -14399,27 +14362,27 @@
 hardcode_direct_CXX=no
 hardcode_automatic_CXX=yes
 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\"`'
+ if test yes = "$lt_cv_ld_force_load"; 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
 link_all_deplibs_CXX=yes
- allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ allow_undefined_flag_CXX=$_lt_dar_allow_undefined
 case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 *) _lt_dar_can_shared=$GCC ;;
 esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
 output_verbose_link_cmd=func_echo_all
- archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
- if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
 fi
 
 else
@@ -14428,6 +14391,34 @@
 
 	;;
 
+ os2*)
+	hardcode_libdir_flag_spec_CXX='-L$libdir'
+	hardcode_minus_L_CXX=yes
+	allow_undefined_flag_CXX=unsupported
+	shrext_cmds=.dll
+	archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	 $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	 $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	 $ECHO EXPORTS >> $output_objdir/$libname.def~
+	 emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	 $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	 emximp -o $lib $output_objdir/$libname.def'
+	archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	 $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	 $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	 $ECHO EXPORTS >> $output_objdir/$libname.def~
+	 prefix_cmds="$SED"~
+	 if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	 prefix_cmds="$prefix_cmds -e 1d";
+	 fi~
+	 prefix_cmds="$prefix_cmds -e \"s/^$.*$$/_\1/g\""~
+	 cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	 $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	 emximp -o $lib $output_objdir/$libname.def'
+	old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	enable_shared_with_static_runtimes_CXX=yes
+	;;
+
 dgux*)
 case $cc_basename in
 ec++*)
@@ -14462,18 +14453,15 @@
 ld_shlibs_CXX=yes
 ;;
 
- gnu*)
- ;;
-
 haiku*)
- archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 link_all_deplibs_CXX=yes
 ;;
 
 hpux9*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
 hardcode_libdir_separator_CXX=:
- export_dynamic_flag_spec_CXX='${wl}-E'
+ export_dynamic_flag_spec_CXX='$wl-E'
 hardcode_direct_CXX=yes
 hardcode_minus_L_CXX=yes # Not in the search PATH,
 				 # but as the default
@@ -14485,7 +14473,7 @@
 ld_shlibs_CXX=no
 ;;
 aCC*)
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 # Commands to make compiler produce verbose output that lists
 # what "hidden" libraries, object files and flags are used when
 # linking a shared library.
@@ -14494,11 +14482,11 @@
 # explicitly linking system object files so we need to strip them
 # from the output so that they don't get included in the library
 # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 ;;
 *)
- if test "$GXX" = yes; then
- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GXX"; then
+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 else
 # FIXME: insert proper C++ library support
 ld_shlibs_CXX=no
@@ -14508,15 +14496,15 @@
 ;;
 
 hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
-	 hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+	 hardcode_libdir_flag_spec_CXX='$wl+b $wl$libdir'
 	 hardcode_libdir_separator_CXX=:
 
 case $host_cpu in
 hppa*64*|ia64*)
 ;;
 *)
-	 export_dynamic_flag_spec_CXX='${wl}-E'
+	 export_dynamic_flag_spec_CXX='$wl-E'
 ;;
 esac
 fi
@@ -14542,13 +14530,13 @@
 aCC*)
 	 case $host_cpu in
 	 hppa*64*)
-	 archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 archive_cmds_CXX='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	 ;;
 	 ia64*)
-	 archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	 ;;
 	 *)
-	 archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 archive_cmds_CXX='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	 ;;
 	 esac
 	 # Commands to make compiler produce verbose output that lists
@@ -14559,20 +14547,20 @@
 	 # explicitly linking system object files so we need to strip them
 	 # from the output so that they don't get included in the library
 	 # dependencies.
-	 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	 output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	 ;;
 *)
-	 if test "$GXX" = yes; then
-	 if test $with_gnu_ld = no; then
+	 if test yes = "$GXX"; then
+	 if test no = "$with_gnu_ld"; then
 	 case $host_cpu in
 	 hppa*64*)
-	 archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 archive_cmds_CXX='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	 ;;
 	 ia64*)
-	 archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	 ;;
 	 *)
-	 archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 archive_cmds_CXX='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	 ;;
 	 esac
 	 fi
@@ -14587,22 +14575,22 @@
 interix3-9*)
 	hardcode_direct_CXX=no
 	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}-E'
+	hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='$wl-E'
 	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 	# Instead, shared libraries are loaded at an image base (0x10000000 by
 	# default) and relocated if they conflict, which is a slow very memory
 	# consuming and fragmenting process. To avoid this, we pick a random,
 	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 	# time. Moving up from 0x10000000 also allows more sbrk(2) space.
-	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 	;;
 irix5* | irix6*)
 case $cc_basename in
 CC*)
 	 # SGI C++
-	 archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	 archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 
 	 # Archives containing C++ object files must be created using
 	 # "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -14611,22 +14599,22 @@
 	 old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
 	 ;;
 *)
-	 if test "$GXX" = yes; then
-	 if test "$with_gnu_ld" = no; then
-	 archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	 if test yes = "$GXX"; then
+	 if test no = "$with_gnu_ld"; then
+	 archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	 else
-	 archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	 archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
 	 fi
 	 fi
 	 link_all_deplibs_CXX=yes
 	 ;;
 esac
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
 hardcode_libdir_separator_CXX=:
 inherit_rpath_CXX=yes
 ;;
 
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 case $cc_basename in
 KCC*)
 	 # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -14634,8 +14622,8 @@
 	 # KCC will only create a shared library if the output file
 	 # ends with ".so" (or ".sl" for HP-UX), so rename the library
 	 # to its proper name (with version) after linking.
-	 archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	 archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	 archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	 archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
 	 # Commands to make compiler produce verbose output that lists
 	 # what "hidden" libraries, object files and flags are used when
 	 # linking a shared library.
@@ -14644,10 +14632,10 @@
 	 # explicitly linking system object files so we need to strip them
 	 # from the output so that they don't get included in the library
 	 # dependencies.
-	 output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	 output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 
-	 hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	 hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	 export_dynamic_flag_spec_CXX='$wl--export-dynamic'
 
 	 # Archives containing C++ object files must be created using
 	 # "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -14661,59 +14649,59 @@
 	 # earlier do not add the objects themselves.
 	 case `$CC -V 2>&1` in
 	 *"Version 7."*)
-	 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 		;;
 	 *) # Version 8.0 or newer
 	 tmp_idyn=
 	 case $host_cpu in
 		 ia64*) tmp_idyn=' -i_dynamic';;
 		esac
-	 archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	 archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 		;;
 	 esac
 	 archive_cmds_need_lc_CXX=no
-	 hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	 whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	 hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	 export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	 whole_archive_flag_spec_CXX='$wl--whole-archive$convenience $wl--no-whole-archive'
 	 ;;
 pgCC* | pgcpp*)
 # Portland Group C++ compiler
 	 case `$CC -V` in
 	 *pgCC\ 1-5.* | *pgcpp\ 1-5.*)
 	 prelink_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 	 old_archive_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
 	 archive_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
 	 archive_expsym_cmds_CXX='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	 ;;
 	 *) # Version 6 and above use weak symbols
-	 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	 archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	 archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	 ;;
 	 esac
 
-	 hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	 whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	 hardcode_libdir_flag_spec_CXX='$wl--rpath $wl$libdir'
+	 export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	 whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 ;;
 	 cxx*)
 	 # Compaq C++
-	 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	 archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+	 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	 archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
 
 	 runpath_var=LD_RUN_PATH
 	 hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -14727,18 +14715,18 @@
 	 # explicitly linking system object files so we need to strip them
 	 # from the output so that they don't get included in the library
 	 # dependencies.
-	 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 	 ;;
 	 xl* | mpixl* | bgxl*)
 	 # IBM XL 8.0 on PPC, with GNU ld
-	 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	 export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	 archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	 if test "x$supports_anon_versioning" = xyes; then
+	 hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
+	 export_dynamic_flag_spec_CXX='$wl--export-dynamic'
+	 archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	 if test yes = "$supports_anon_versioning"; then
 	 archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 	 fi
 	 ;;
 	 *)
@@ -14746,10 +14734,10 @@
 	 *Sun\ C*)
 	 # Sun C++ 5.9
 	 no_undefined_flag_CXX=' -zdefs'
-	 archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	 archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	 archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
 	 hardcode_libdir_flag_spec_CXX='-R$libdir'
-	 whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	 whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	 compiler_needs_object_CXX=yes
 
 	 # Not sure whether something based on
@@ -14807,22 +14795,17 @@
 ld_shlibs_CXX=yes
 	;;
 
- openbsd2*)
- # C++ shared libraries are fairly broken
-	ld_shlibs_CXX=no
-	;;
-
- openbsd*)
+ openbsd* | bitrig*)
 	if test -f /usr/libexec/ld.so; then
 	 hardcode_direct_CXX=yes
 	 hardcode_shlibpath_var_CXX=no
 	 hardcode_direct_absolute_CXX=yes
 	 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	 hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	 archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	 export_dynamic_flag_spec_CXX='${wl}-E'
-	 whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	 hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
+	 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	 archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	 export_dynamic_flag_spec_CXX='$wl-E'
+	 whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 	 fi
 	 output_verbose_link_cmd=func_echo_all
 	else
@@ -14838,9 +14821,9 @@
 	 # KCC will only create a shared library if the output file
 	 # ends with ".so" (or ".sl" for HP-UX), so rename the library
 	 # to its proper name (with version) after linking.
-	 archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	 archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/$^()0-9A-Za-z{}$/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 
-	 hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	 hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
 	 hardcode_libdir_separator_CXX=:
 
 	 # Archives containing C++ object files must be created using
@@ -14858,17 +14841,17 @@
 cxx*)
 	 case $host in
 	 osf3*)
-	 allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	 allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
+	 archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	 hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
 		;;
 	 *)
 	 allow_undefined_flag_CXX=' -expect_unresolved \*'
-	 archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	 archive_cmds_CXX='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	 archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	 echo "-hidden">> $lib.exp~
-	 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	 $RM $lib.exp'
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+ $RM $lib.exp'
 	 hardcode_libdir_flag_spec_CXX='-rpath $libdir'
 		;;
 	 esac
@@ -14883,21 +14866,21 @@
 	 # explicitly linking system object files so we need to strip them
 	 # from the output so that they don't get included in the library
 	 # dependencies.
-	 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	 output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	 ;;
 	 *)
-	 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	 allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	 if test yes,no = "$GXX,$with_gnu_ld"; then
+	 allow_undefined_flag_CXX=' $wl-expect_unresolved $wl\*'
 	 case $host in
 	 osf3*)
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	 archive_cmds_CXX='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		 ;;
 	 *)
-	 archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	 archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 		 ;;
 	 esac
 
-	 hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	 hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
 	 hardcode_libdir_separator_CXX=:
 
 	 # Commands to make compiler produce verbose output that lists
@@ -14943,9 +14926,9 @@
 	 # Sun C++ 4.2, 5.x and Centerline C++
 archive_cmds_need_lc_CXX=yes
 	 no_undefined_flag_CXX=' -zdefs'
-	 archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	 archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	 $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	 hardcode_libdir_flag_spec_CXX='-R$libdir'
 	 hardcode_shlibpath_var_CXX=no
@@ -14953,7 +14936,7 @@
 	 solaris2.0-5 | solaris2.0-5.*) ;;
 	 *)
 		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
+		# but understands '-z linker_flag'.
 	 # Supported since Solaris 2.6 (maybe 2.5.1?)
 		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 	 ;;
@@ -14970,30 +14953,30 @@
 	 ;;
 gcx*)
 	 # Green Hills C++ Compiler
-	 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	 archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 
 	 # The C++ compiler must be used to create the archive.
 	 old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 	 ;;
 *)
 	 # GNU C++ compiler with Solaris linker
-	 if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	 no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	 if test yes,no = "$GXX,$with_gnu_ld"; then
+	 no_undefined_flag_CXX=' $wl-z ${wl}defs'
 	 if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	 archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	 archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 	 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		 $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	 # Commands to make compiler produce verbose output that lists
 	 # what "hidden" libraries, object files and flags are used when
 	 # linking a shared library.
 	 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	 else
-	 # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	 # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	 # platform.
-	 archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	 archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 	 archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		 $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	 # Commands to make compiler produce verbose output that lists
 	 # what "hidden" libraries, object files and flags are used when
@@ -15001,11 +14984,11 @@
 	 output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	 fi
 
-	 hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	 hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'
 	 case $host_os in
 		solaris2.0-5 | solaris2.0-5.*) ;;
 		*)
-		 whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		 whole_archive_flag_spec_CXX='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 		 ;;
 	 esac
 	 fi
@@ -15014,52 +14997,52 @@
 ;;
 
 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.01.10* | unixware7* | sco3.2v5.0.024*)
- no_undefined_flag_CXX='${wl}-z,text'
+ no_undefined_flag_CXX='$wl-z,text'
 archive_cmds_need_lc_CXX=no
 hardcode_shlibpath_var_CXX=no
 runpath_var='LD_RUN_PATH'
 
 case $cc_basename in
 CC*)
-	 archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	 ;;
 	*)
-	 archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	 ;;
 esac
 ;;
 
 sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
+	# Note: We CANNOT use -z defs as we might desire, because we do not
 	# link with -lc, and that would cause any symbols used from libc to
 	# always be unresolved, which means just about no library would
 	# ever link correctly. If we're not using GNU ld we use -z text
 	# though, which does catch some bad symbols but isn't as heavy-handed
 	# as -z defs.
-	no_undefined_flag_CXX='${wl}-z,text'
-	allow_undefined_flag_CXX='${wl}-z,nodefs'
+	no_undefined_flag_CXX='$wl-z,text'
+	allow_undefined_flag_CXX='$wl-z,nodefs'
 	archive_cmds_need_lc_CXX=no
 	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+	hardcode_libdir_flag_spec_CXX='$wl-R,$libdir'
 	hardcode_libdir_separator_CXX=':'
 	link_all_deplibs_CXX=yes
-	export_dynamic_flag_spec_CXX='${wl}-Bexport'
+	export_dynamic_flag_spec_CXX='$wl-Bexport'
 	runpath_var='LD_RUN_PATH'
 
 	case $cc_basename in
 CC*)
-	 archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_cmds_CXX='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_expsym_cmds_CXX='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	 old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-	 '"$old_archive_cmds_CXX"
+ '"$old_archive_cmds_CXX"
 	 reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-	 '"$reload_cmds_CXX"
+ '"$reload_cmds_CXX"
 	 ;;
 	 *)
-	 archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	 archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_cmds_CXX='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	 archive_expsym_cmds_CXX='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	 ;;
 	esac
 ;;
@@ -15091,10 +15074,10 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
+ test no = "$ld_shlibs_CXX" && can_build_shared=no
 
- GCC_CXX="$GXX"
- LD_CXX="$LD"
+ GCC_CXX=$GXX
+ LD_CXX=$LD
 
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
@@ -15138,13 +15121,13 @@
 pre_test_object_deps_done=no
 
 for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
 
 -L* | -R* | -l*)
 # Some compilers place space between "-{L,R}" and the path.
 # Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
 	 prev=$p
 	 continue
 fi
@@ -15160,16 +15143,16 @@
 case $p in
 =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
 esac
- if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
 	 -L | -R)
 	 # Internal compiler library paths should come after those
 	 # provided the user. The postdeps already come after the
 	 # user supplied libs so there is no need to process them.
 	 if test -z "$compiler_lib_search_path_CXX"; then
-	 compiler_lib_search_path_CXX="${prev}${p}"
+	 compiler_lib_search_path_CXX=$prev$p
 	 else
-	 compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	 compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} $prev$p"
 	 fi
 	 ;;
 	 # The "-l" case would never come before the object being
@@ -15177,9 +15160,9 @@
 	 esac
 else
 	 if test -z "$postdeps_CXX"; then
-	 postdeps_CXX="${prev}${p}"
+	 postdeps_CXX=$prev$p
 	 else
-	 postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	 postdeps_CXX="${postdeps_CXX} $prev$p"
 	 fi
 fi
 prev=
@@ -15194,15 +15177,15 @@
 	 continue
 fi
 
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
 	 if test -z "$predep_objects_CXX"; then
-	 predep_objects_CXX="$p"
+	 predep_objects_CXX=$p
 	 else
 	 predep_objects_CXX="$predep_objects_CXX $p"
 	 fi
 else
 	 if test -z "$postdep_objects_CXX"; then
-	 postdep_objects_CXX="$p"
+	 postdep_objects_CXX=$p
 	 else
 	 postdep_objects_CXX="$postdep_objects_CXX $p"
 	 fi
@@ -15232,51 +15215,6 @@
 postdep_objects_CXX=
 postdeps_CXX=
 ;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- postdeps_CXX='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
 esac
 
 
@@ -15285,7 +15223,7 @@
 esac
 compiler_lib_search_dirs_CXX=
 if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 fi
 
 
@@ -15324,17 +15262,18 @@
 
 
 # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
 lt_prog_compiler_wl_CXX='-Wl,'
 lt_prog_compiler_static_CXX='-static'
 
 case $host_os in
 aix*)
 # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static_CXX='-Bstatic'
 fi
+ lt_prog_compiler_pic_CXX='-fPIC'
 ;;
 
 amigaos*)
@@ -15345,8 +15284,8 @@
 ;;
 m68k)
 # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
 lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
 ;;
 esac
@@ -15361,6 +15300,11 @@
 # Although the cygwin gcc ignores -fPIC, still need this for old-style
 # (--disable-auto-import) libraries
 lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+	lt_prog_compiler_static_CXX='$wl-static'
+	;;
+ esac
 ;;
 darwin* | rhapsody*)
 # PIC is the default on this platform
@@ -15410,7 +15354,7 @@
 case $host_os in
 aix4-9*)
 	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
+	if test ia64 = "$host_cpu"; then
 	 # AIX 5 now supports IA64 processor
 	 lt_prog_compiler_static_CXX='-Bstatic'
 	else
@@ -15450,14 +15394,14 @@
 	case $cc_basename in
 	 CC*)
 	 lt_prog_compiler_wl_CXX='-Wl,'
-	 lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	 if test "$host_cpu" != ia64; then
+	 lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
+	 if test ia64 != "$host_cpu"; then
 	 lt_prog_compiler_pic_CXX='+Z'
 	 fi
 	 ;;
 	 aCC*)
 	 lt_prog_compiler_wl_CXX='-Wl,'
-	 lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	 lt_prog_compiler_static_CXX='$wl-a ${wl}archive'
 	 case $host_cpu in
 	 hppa*64*|ia64*)
 	 # +Z the default
@@ -15486,7 +15430,7 @@
 	 ;;
 	esac
 	;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	 KCC*)
 	 # KAI C++ Compiler
@@ -15494,7 +15438,7 @@
 	 lt_prog_compiler_pic_CXX='-fPIC'
 	 ;;
 	 ecpc* )
-	 # old Intel C++ for x86_64 which still supported -KPIC.
+	 # old Intel C++ for x86_64, which still supported -KPIC.
 	 lt_prog_compiler_wl_CXX='-Wl,'
 	 lt_prog_compiler_pic_CXX='-KPIC'
 	 lt_prog_compiler_static_CXX='-static'
@@ -15639,7 +15583,7 @@
 fi
 
 case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
 *djgpp*)
 lt_prog_compiler_pic_CXX=
 ;;
@@ -15671,7 +15615,7 @@
 lt_cv_prog_compiler_pic_works_CXX=no
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" ## exclude from sc_useless_quotes_in_assignment
 # Insert the option either (1) after the last *FLAGS variable, or
 # (2) before a word containing "conftest.", or (3) at the end.
 # Note that $ac_compile itself does not contain backslashes and begins
@@ -15701,7 +15645,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then
 case $lt_prog_compiler_pic_CXX in
 "" | " "*) ;;
 *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -15727,7 +15671,7 @@
 $as_echo_n "(cached) " >&6
 else
 lt_cv_prog_compiler_static_works_CXX=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
 LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
 echo "$lt_simple_link_test_code" > conftest.$ac_ext
 if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -15746,13 +15690,13 @@
 fi
 fi
 $RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
 $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then
 :
 else
 lt_prog_compiler_static_CXX=
@@ -15866,8 +15810,8 @@
 
 
 
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then
 # do not overwrite the value of need_locks provided by the user
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
@@ -15879,9 +15823,9 @@
 ln conftest.a conftest.b 2>/dev/null && hard_links=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
- if test "$hard_links" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
 need_locks=warn
 fi
 else
@@ -15898,17 +15842,21 @@
 case $host_os in
 aix4-9*)
 # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 else
- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B$^B*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 fi
 ;;
 pw32*)
- export_symbols_cmds_CXX="$ltdll_cmds"
+ export_symbols_cmds_CXX=$ltdll_cmds
 ;;
 cygwin* | mingw* | cegcc*)
 case $cc_basename in
@@ -15931,7 +15879,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
+test no = "$ld_shlibs_CXX" && can_build_shared=no
 
 with_gnu_ld_CXX=$with_gnu_ld
 
@@ -15948,7 +15896,7 @@
 # Assume -lc should be added
 archive_cmds_need_lc_CXX=yes
 
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
 case $archive_cmds_CXX in
 *'~'*)
 # FIXME: we may have to deal with multi-command sequences.
@@ -16076,7 +16024,7 @@
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -16093,14 +16041,16 @@
 # flags to be left without arguments
 need_version=unknown
 
+
+
 case $host_os in
 aix3*)
 version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
 shlibpath_var=LIBPATH
 
 # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
 ;;
 
 aix4-9*)
@@ -16108,41 +16058,91 @@
 need_lib_prefix=no
 need_version=no
 hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
 # AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
 shlibpath_var=LD_LIBRARY_PATH
 else
 # With GCC up to 2.95.x, collect2 would create an import file
 # for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
 # development snapshots of GCC prior to 3.0.
 case $host_os in
 aix4 | aix4.01 | aix4.01.*)
 if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	 echo ' yes '
-	 echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	 echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
 else
 	can_build_shared=no
 fi
 ;;
 esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
 # soname into executable. Probably we can add versioning support to
 # collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
 # If using run time linking (on AIX 4.2 or later) use lib<name>.so
 # instead of lib<name>.a to let people know that these are not
 # typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
 # We preserve .a as extension for shared libraries through AIX4.2
 # and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
 shlibpath_var=LIBPATH
 fi
 ;;
@@ -16152,18 +16152,18 @@
 powerpc)
 # Since July 2007 AmigaOS4 officially supports .so libraries.
 # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 ;;
 m68k)
 library_names_spec='$libname.ixlibrary $libname.a'
 # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$^/*$\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 ;;
 esac
 ;;
 
 beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
 dynamic_linker="$host_os ld.so"
 shlibpath_var=LIBRARY_PATH
 ;;
@@ -16171,8 +16171,8 @@
 bsdi45*)
 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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
 shlibpath_var=LD_LIBRARY_PATH
 sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -16184,7 +16184,7 @@
 
 cygwin* | mingw* | pw32* | cegcc*)
 version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
 need_version=no
 need_lib_prefix=no
 
@@ -16193,8 +16193,8 @@
 # gcc
 library_names_spec='$libname.dll.a'
 # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 dldir=$destdir/`dirname \$dlpath`~
 test -d \$dldir || mkdir -p \$dldir~
 $install_prog $dir/$dlname \$dldir/$dlname~
@@ -16210,16 +16210,16 @@
 case $host_os in
 cygwin*)
 # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 
 ;;
 mingw* | cegcc*)
 # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 ;;
 pw32*)
 # pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
 ;;
 esac
 dynamic_linker='Win32 ld.exe'
@@ -16228,8 +16228,8 @@
 *,cl*)
 # Native MSVC
 libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
 
 case $build_os in
 mingw*)
@@ -16256,7 +16256,7 @@
 sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 ;;
 *)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
 if $ECHO "$sys_lib_search_path_spec" | $GREP ';c-zC-Z:/' >/dev/null; then
 # It is most probably a Windows format PATH.
 sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -16269,8 +16269,8 @@
 esac
 
 # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 dldir=$destdir/`dirname \$dlpath`~
 test -d \$dldir || mkdir -p \$dldir~
 $install_prog $dir/$dlname \$dldir/$dlname'
@@ -16283,7 +16283,7 @@
 
 *)
 # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/./-/g'`$versuffix$shared_ext $libname.lib'
 dynamic_linker='Win32 ld.exe'
 ;;
 esac
@@ -16296,8 +16296,8 @@
 version_type=darwin
 need_lib_prefix=no
 need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
 shlibpath_overrides_runpath=yes
 shlibpath_var=DYLD_LIBRARY_PATH
 shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16309,8 +16309,8 @@
 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'
+ 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
 ;;
 
@@ -16328,12 +16328,13 @@
 version_type=freebsd-$objformat
 case $version_type in
 freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 need_version=no
 need_lib_prefix=no
 ;;
 freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 need_version=yes
 ;;
 esac
@@ -16358,26 +16359,15 @@
 esac
 ;;
 
-gnu*)
- 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 # correct to gnu/linux during the next big refactor
 need_lib_prefix=no
 need_version=no
 dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ 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=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
 sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 hardcode_into_libs=yes
 ;;
@@ -16395,14 +16385,15 @@
 dynamic_linker="$host_os dld.so"
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
 sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
 else
 sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
 fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 ;;
 hppa*64*)
 shrext_cmds='.sl'
@@ -16410,8 +16401,8 @@
 dynamic_linker="$host_os dld.sl"
 shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
 shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
 sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 ;;
@@ -16420,8 +16411,8 @@
 dynamic_linker="$host_os dld.sl"
 shlibpath_var=SHLIB_PATH
 shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 ;;
 esac
 # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -16434,8 +16425,8 @@
 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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=no
@@ -16446,7 +16437,7 @@
 case $host_os in
 nonstopux*) version_type=nonstopux ;;
 *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
+	if test yes = "$lt_cv_prog_gnu_ld"; then
 		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
@@ -16454,8 +16445,8 @@
 esac
 need_lib_prefix=no
 need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
 case $host_os in
 irix5* | nonstopux*)
 libsuff= shlibsuff=
@@ -16474,8 +16465,8 @@
 esac
 shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
 shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
 hardcode_into_libs=yes
 ;;
 
@@ -16484,13 +16475,33 @@
 dynamic_linker=no
 ;;
 
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ ;;
+
 # This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 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'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=no
@@ -16534,7 +16545,12 @@
 # before this can be enabled.
 hardcode_into_libs=yes
 
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
 if test -f /etc/ld.so.conf; then
 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^	 *hwcap	 /d;s/:,	/ /g;s/=^=*$//;s/=^= * / /g;s/"//g;/^$/d' | tr '\n' ' '`
 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
@@ -16566,12 +16582,12 @@
 need_lib_prefix=no
 need_version=no
 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 dynamic_linker='NetBSD (a.out) ld.so'
 else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 dynamic_linker='NetBSD ld.elf_so'
 fi
 shlibpath_var=LD_LIBRARY_PATH
@@ -16581,7 +16597,7 @@
 
 newsos6)
 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}'
+ 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
 ;;
@@ -16590,58 +16606,68 @@
 version_type=qnx
 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'
+ 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
 dynamic_linker='ldqnx.so'
 ;;
 
-openbsd*)
+openbsd* | bitrig*)
 version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
 need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
- *)				need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.89 | openbsd2.89.*)
-	shlibpath_overrides_runpath=no
-	;;
- *)
-	shlibpath_overrides_runpath=yes
-	;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
 else
- shlibpath_overrides_runpath=yes
+ need_version=yes
 fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
 ;;
 
 os2*)
 libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
 need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
 dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
 ;;
 
 osf3* | osf4* | osf5*)
 version_type=osf
 need_lib_prefix=no
 need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 shlibpath_var=LD_LIBRARY_PATH
 sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 ;;
 
 rdos*)
@@ -16652,8 +16678,8 @@
 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'
+ 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=yes
 hardcode_into_libs=yes
@@ -16663,11 +16689,11 @@
 
 sunos4*)
 version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
 need_lib_prefix=no
 fi
 need_version=yes
@@ -16675,8 +16701,8 @@
 
 sysv4 | sysv4.3*)
 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'
+ 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
 case $host_vendor in
 sni)
@@ -16697,24 +16723,24 @@
 ;;
 
 sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
 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'
+ 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
 fi
 ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
 need_lib_prefix=no
 need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=yes
 hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
 sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
 else
 sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -16732,7 +16758,7 @@
 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}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 shlibpath_var=LD_LIBRARY_PATH
 shlibpath_overrides_runpath=no
 hardcode_into_libs=yes
@@ -16740,8 +16766,8 @@
 
 uts4*)
 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'
+ 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
 ;;
 
@@ -16751,20 +16777,32 @@
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+
+
 
 
 
@@ -16807,15 +16845,15 @@
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" ||
 test -n "$runpath_var_CXX" ||
- test "X$hardcode_automatic_CXX" = "Xyes" ; then
+ test yes = "$hardcode_automatic_CXX"; then
 
 # We can hardcode non-existent directories.
- if test "$hardcode_direct_CXX" != no &&
+ if test no != "$hardcode_direct_CXX" &&
 # If the only mechanism to avoid hardcoding is shlibpath_var, we
 # have to relink, otherwise we might link with an installed library
 # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
- test "$hardcode_minus_L_CXX" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" &&
+ test no != "$hardcode_minus_L_CXX"; then
 # Linking always hardcodes the temporary library directory.
 hardcode_action_CXX=relink
 else
@@ -16830,12 +16868,12 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
 $as_echo "$hardcode_action_CXX" >&6; }
 
-if test "$hardcode_action_CXX" = relink ||
- test "$inherit_rpath_CXX" = yes; then
+if test relink = "$hardcode_action_CXX" ||
+ test yes = "$inherit_rpath_CXX"; then
 # Fast installation is not supported
 enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
 # Fast installation is not necessary
 enable_fast_install=needless
 fi
@@ -16858,7 +16896,7 @@
 lt_cv_path_LD=$lt_save_path_LD
 lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
 lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -17118,132 +17156,6 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-depcc="$OBJC" am_compiler_list='gcc3 gcc'
-
-{ $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_OBJC_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".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- 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_OBJC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*$a-zA-Z0-9*$)$/\1/p' < ./depcomp`
- fi
- am__universal=false
-
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
- # Solaris 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # 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
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- 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_OBJC_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_OBJC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_OBJC_dependencies_compiler_type" >&6; }
-OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type
-
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_OBJC_dependencies_compiler_type" = gcc3; then
- am__fastdepOBJC_TRUE=
- am__fastdepOBJC_FALSE='#'
-else
- am__fastdepOBJC_TRUE='#'
- am__fastdepOBJC_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 :
@@ -17357,6 +17269,206 @@
 fi
 
 
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+ enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_sys_largefile_CC=no
+ if test "$GCC" != yes; then
+ ac_save_CC=$CC
+ while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+ int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
+		 && LARGE_OFF_T % 2147483647 == 1)
+		 ? 1 : -1;
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+ break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+ done
+ CC=$ac_save_CC
+ rm -f conftest.$ac_ext
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+ if test "$ac_cv_sys_largefile_CC" != no; then
+ CC=$CC$ac_cv_sys_largefile_CC
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+ int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
+		 && LARGE_OFF_T % 2147483647 == 1)
+		 ? 1 : -1;
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+ int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
+		 && LARGE_OFF_T % 2147483647 == 1)
+		 ? 1 : -1;
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_file_offset_bits=64; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_file_offset_bits=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+ if test $ac_cv_sys_file_offset_bits = unknown; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ while :; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+ int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
+		 && LARGE_OFF_T % 2147483647 == 1)
+		 ? 1 : -1;
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_large_files=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_OFF_T to be 9223372036854775807,
+ since some C++ compilers masquerading as C compilers
+ incorrectly reject 9223372036854775807. */
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+ int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
+		 && LARGE_OFF_T % 2147483647 == 1)
+		 ? 1 : -1;
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_sys_large_files=unknown
+ break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+ no | unknown) ;;
+ *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+ fi
+
+
+fi
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
@@ -22846,6 +22958,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.
@@ -22962,6 +23075,278 @@
 
 
 
+
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if ${am_cv_func_iconv+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <iconv.h>
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$am_save_LIBS"
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if ${am_cv_func_iconv_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+ fi
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+ /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+ returns. */
+ {
+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+ if (cd_utf8_to_88591 != (iconv_t)(-1))
+ {
+ static const char input = "\342\202\254"; /* EURO SIGN */
+ char buf10;
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_utf8_to_88591,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ return 1;
+ }
+ }
+ /* Test against Solaris 10 bug: Failures are not distinguishable from
+ successful returns. */
+ {
+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+ if (cd_ascii_to_88591 != (iconv_t)(-1))
+ {
+ static const char input = "\263";
+ char buf10;
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_ascii_to_88591,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ return 1;
+ }
+ }
+#if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static const char input = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ char buf50;
+ const char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_88591_to_utf8,
+ (char **) &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if ((int)res > 0)
+ return 1;
+ }
+ }
+#endif
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ if (/* Try standardized names. */
+ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+ /* Try IRIX, OSF/1 names. */
+ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+ /* Try AIX names. */
+ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+ /* Try HP-UX names. */
+ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+ return 1;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ am_cv_func_iconv_works=yes
+else
+ am_cv_func_iconv_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ LIBS="$am_save_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+ case "$am_cv_func_iconv_works" in
+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+ *) am_func_iconv=yes ;;
+ esac
+ else
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
+
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+ if ${am_cv_proto_iconv+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ am_cv_proto_iconv_arg1=""
+else
+ am_cv_proto_iconv_arg1="const"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
+fi
+
+ am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
+ $am_cv_proto_iconv" >&5
+$as_echo "
+ $am_cv_proto_iconv" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
+_ACEOF
+
+ fi
+
+
+
 case "$am__api_version" in
 1.01234)
 	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
@@ -23484,44 +23869,6 @@
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 
 
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- DATADIRNAME=share
-else
- case $host in
- *-*-solaris*)
- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
- DATADIRNAME=share
-else
- DATADIRNAME=lib
-fi
-
- ;;
- *)
- DATADIRNAME=lib
- ;;
- esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-
 
 
 
@@ -23530,11 +23877,6 @@
 
 test "$prefix" = NONE && prefix=/usr/local
 
-cat >>confdefs.h <<_ACEOF
-#define LOCALEDIR "${prefix}/${DATADIRNAME}/locale"
-_ACEOF
-
-
 case "$host" in
 i686-apple-*)
 
@@ -23597,6 +23939,44 @@
 
 
 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fblocks" >&5
+$as_echo_n "checking whether C compiler accepts -fblocks... " >&6; }
+if ${ax_cv_c_flags__fblocks+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ ax_save_FLAGS=$CFLAGS
+ CFLAGS="-fblocks "
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ax_cv_c_flags__fblocks=yes
+else
+ ax_cv_c_flags__fblocks=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS=$ax_save_FLAGS
+fi
+
+eval ax_check_compiler_flags=$ax_cv_c_flags__fblocks
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_check_compiler_flags" >&5
+$as_echo "$ax_check_compiler_flags" >&6; }
+if test "x$ax_check_compiler_flags" = xyes; then
+	:
+else
+	as_fn_error $? "Clang is required to build DeaDBeeF. Please check the README file." "$LINENO" 5
+fi
+
+
 # Check whether --enable-nullout was given.
 if test "${enable_nullout+set}" = set; then :
 enableval=$enable_nullout; enable_nullout=$enableval
@@ -23618,6 +23998,13 @@
 enable_oss=yes
 fi
 
+# Check whether --enable-pipewire was given.
+if test "${enable_pipewire+set}" = set; then :
+ enableval=$enable_pipewire; enable_pipewire=$enableval
+else
+ enable_pipewire=yes
+fi
+
 # Check whether --enable-pulse was given.
 if test "${enable_pulse+set}" = set; then :
 enableval=$enable_pulse; enable_pulse=$enableval
@@ -23653,6 +24040,13 @@
 enable_vfs_curl=yes
 fi
 
+# Check whether --enable-libretro was given.
+if test "${enable_libretro+set}" = set; then :
+ enableval=$enable_libretro; enable_libretro=$enableval
+else
+ enable_libretro=yes
+fi
+
 # Check whether --enable-lfm was given.
 if test "${enable_lfm+set}" = set; then :
 enableval=$enable_lfm; enable_lfm=$enableval
@@ -23688,11 +24082,25 @@
 enable_sid=yes
 fi
 
-# Check whether --enable-mad was given.
-if test "${enable_mad+set}" = set; then :
- enableval=$enable_mad; enable_mpgmad=$enableval
+# Check whether --enable-mp3 was given.
+if test "${enable_mp3+set}" = set; then :
+ enableval=$enable_mp3; enable_mp3=$enableval
 else
- enable_mpgmad=yes
+ enable_mp3=yes
+fi
+
+# Check whether --enable-libmad was given.
+if test "${enable_libmad+set}" = set; then :
+ enableval=$enable_libmad; enable_libmad=$enableval
+else
+ enable_libmad=yes
+fi
+
+# Check whether --enable-libmpg123 was given.
+if test "${enable_libmpg123+set}" = set; then :
+ enableval=$enable_libmpg123; enable_libmpg123=$enableval
+else
+ enable_libmpg123=yes
 fi
 
 # Check whether --enable-ffap was given.
@@ -23730,6 +24138,13 @@
 enable_vorbis=yes
 fi
 
+# Check whether --enable-opus was given.
+if test "${enable_opus+set}" = set; then :
+ enableval=$enable_opus; enable_opus=$enableval
+else
+ enable_opus=yes
+fi
+
 # Check whether --enable-ffmpeg was given.
 if test "${enable_ffmpeg+set}" = set; then :
 enableval=$enable_ffmpeg; enable_ffmpeg=$enableval
@@ -23765,6 +24180,13 @@
 enable_cdda=yes
 fi
 
+# Check whether --enable-cdda-paranoia was given.
+if test "${enable_cdda_paranoia+set}" = set; then :
+ enableval=$enable_cdda_paranoia; enable_cdda_paranoia=$enableval
+else
+ enable_cdda_paranoia=yes
+fi
+
 # Check whether --enable-gme was given.
 if test "${enable_gme+set}" = set; then :
 enableval=$enable_gme; enable_gme=$enableval
@@ -23870,13 +24292,6 @@
 enable_converter=yes
 fi
 
-# Check whether --enable-artwork-imlib2 was given.
-if test "${enable_artwork_imlib2+set}" = set; then :
- enableval=$enable_artwork_imlib2; enable_artwork_imlib2=$enableval
-else
- enable_artwork_imlib2=yes
-fi
-
 # Check whether --enable-dumb was given.
 if test "${enable_dumb+set}" = set; then :
 enableval=$enable_dumb; enable_dumb=$enableval
@@ -23933,6 +24348,13 @@
 enable_pltbrowser=yes
 fi
 
+# Check whether --enable-sc68 was given.
+if test "${enable_sc68+set}" = set; then :
+ enableval=$enable_sc68; enable_sc68=$enableval
+else
+ enable_sc68=yes
+fi
+
 # Check whether --enable-abstract_socket was given.
 if test "${enable_abstract_socket+set}" = set; then :
 enableval=$enable_abstract_socket; enable_abstract_socket=$enableval
@@ -23940,6 +24362,20 @@
 enable_abstract_socket=no
 fi
 
+# Check whether --enable-rgscanner was given.
+if test "${enable_rgscanner+set}" = set; then :
+ enableval=$enable_rgscanner; enable_rgscanner=$enableval
+else
+ enable_rgscanner=yes
+fi
+
+# Check whether --enable-soundtouch was given.
+if test "${enable_soundtouch+set}" = set; then :
+ enableval=$enable_soundtouch; enable_soundtouch=$enableval
+else
+ enable_soundtouch=yes
+fi
+
 
 if test "${enable_staticlink}" != "no"; then :
 
@@ -23967,7 +24403,7 @@
 *-*-gnu )
 if test "${enable_staticlink}" != "no"; then :
 
- NOCPPLIB="-nostdlib ../../$LIB/lib/libsupc++.a"
+ NOCPPLIB="-nostdlib -lstdc++"
 
 else
 
@@ -23978,41 +24414,6 @@
 ;;
 esac
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lintl" >&5
-$as_echo_n "checking for main in -lintl... " >&6; }
-if ${ac_cv_lib_intl_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $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_intl_main=yes
-else
- ac_cv_lib_intl_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_intl_main" >&5
-$as_echo "$ac_cv_lib_intl_main" >&6; }
-if test "x$ac_cv_lib_intl_main" = xyes; then :
- INTL_LIBS="-lintl";
-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
@@ -24095,6 +24496,39 @@
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mkstemps" >&5
+$as_echo_n "checking for mkstemps... " >&6; }
+if ${xpdf_cv_func_mkstemps+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <unistd.h>
+int
+main ()
+{
+mkstemps("foo", 0);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ xpdf_cv_func_mkstemps=yes
+else
+ xpdf_cv_func_mkstemps=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xpdf_cv_func_mkstemps" >&5
+$as_echo "$xpdf_cv_func_mkstemps" >&6; }
+if test "$xpdf_cv_func_mkstemps" = yes; then
+
+$as_echo "#define HAVE_MKSTEMPS 1" >>confdefs.h
+
+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 :
@@ -24166,7 +24600,7 @@
 
 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 :
-
+ ALLOCA_H_CFLAGS="-DHAVE_ALLOCA_H";
 else
 alloca.h not found.
 fi
@@ -24196,6 +24630,18 @@
 
 done
 
+for ac_header in sys/wait.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_wait_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_WAIT_H 1
+_ACEOF
+
+fi
+
+done
+
 
 if test "${enable_portable}" != "no" -a "${enable_staticlink}" != "no"; then :
 
@@ -24226,8 +24672,11 @@
 
 fi
 
-CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
-CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
+test $ac_cv_safe_to_define___extensions__ = yes && CFLAGS_EXTENSIONS="-D__EXTENSIONS__"
+
+CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
+CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
+
 
 if test "${enable_staticlink}" != "no"; then :
 
@@ -24366,8 +24815,8 @@
 
 if test "${enable_staticlink}" != "no"; then :
 
- GTK3_DEPS_CFLAGS="-I../../${LIB}/gtk-3.0.0/include/gtk-3.0 -I../../${LIB}/gtk-3.0.0/include/pango-1.0 -I../../${LIB}/gtk-3.0.0/include/gio-unix-2.0/ -I../../${LIB}/gtk-3.0.0/include/atk-1.0 -I../../${LIB}/gtk-3.0.0/include/cairo -I../../${LIB}/gtk-3.0.0/include/gdk-pixbuf-2.0 -I../../${LIB}/gtk-3.0.0/include/freetype2 -I../../${LIB}/gtk-3.0.0/include/glib-2.0 -I../../${LIB}/gtk-3.0.0/lib/glib-2.0/include"
- GTK3_DEPS_LIBS="-L${GTK_ROOT_300}/lib -lgtk-3 -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+ GTK3_DEPS_CFLAGS="${GTK3_310_CFLAGS}"
+ GTK3_DEPS_LIBS="${GTK3_310_LIBS}"
 
 
 HAVE_GTK3=yes
@@ -24383,12 +24832,12 @@
 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
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0 gio-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0 gio-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`
+ pkg_cv_GTK3_DEPS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0 gio-2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -24400,12 +24849,12 @@
 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
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0 gio-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0 gio-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`
+ pkg_cv_GTK3_DEPS_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0 gio-2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -24426,9 +24875,9 @@
 _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`
+	 GTK3_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0 gio-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`
+	 GTK3_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0 gio-2.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK3_DEPS_PKG_ERRORS" >&5
@@ -24447,22 +24896,88 @@
 fi
 
 fi
- if test "$OS_OSX" = "yes"; then
+ # Extract the first word of "glib-compile-resources", so it can be a program name with args.
+set dummy glib-compile-resources; 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_GLIB_COMPILE_RESOURCES+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GLIB_COMPILE_RESOURCES in
+ \\/* | ?:\\/*)
+ ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GLIB_COMPILE_RESOURCES="$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
+GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES
+if test -n "$GLIB_COMPILE_RESOURCES"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5
+$as_echo "$GLIB_COMPILE_RESOURCES" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+else
+
+ HAVE_GTK3=no
+
+fi
+ if test "x$OS_OSX" = "xyes"; then
+ OS_OSX_TRUE=
+ OS_OSX_FALSE='#'
+else
+ OS_OSX_TRUE='#'
+ OS_OSX_FALSE=
+fi
+
+
+
+if test "${enable_gtk2}" = "yes" -o "${enable_gtk3}" = "yes" -o "${enable_shellexec}" = "yes"; then :
+
+ if test "${enable_staticlink}" != "no"; then :
+
+ JANSSON_CFLAGS="-I../../$LIB/include"
+ JANSSON_LIBS=-ljansson
+
+
+
+else
+
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_MAC" >&5
-$as_echo_n "checking for GTK_MAC... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5
+$as_echo_n "checking for JANSSON... " >&6; }
 
-if test -n "$GTK_MAC_CFLAGS"; then
- pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS"
+if test -n "$JANSSON_CFLAGS"; then
+ pkg_cv_JANSSON_CFLAGS="$JANSSON_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-mac-integration\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "jansson") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration" 2>/dev/null`
+ pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -24470,16 +24985,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$GTK_MAC_LIBS"; then
- pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS"
+if test -n "$JANSSON_LIBS"; then
+ pkg_cv_JANSSON_LIBS="$JANSSON_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-mac-integration\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "jansson") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration" 2>/dev/null`
+ pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -24500,22 +25015,22 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-mac-integration" 2>&1`
+	 JANSSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jansson" 2>&1`
 else
-	 GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-mac-integration" 2>&1`
+	 JANSSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jansson" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$GTK_MAC_PKG_ERRORS" >&5
+	echo "$JANSSON_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gtk-mac-integration) were not met:
+	as_fn_error $? "Package requirements (jansson) were not met:
 
-$GTK_MAC_PKG_ERRORS
+$JANSSON_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables GTK_MAC_CFLAGS
-and GTK_MAC_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables JANSSON_CFLAGS
+and JANSSON_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -24526,44 +25041,76 @@
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables GTK_MAC_CFLAGS
-and GTK_MAC_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables JANSSON_CFLAGS
+and JANSSON_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	GTK_MAC_CFLAGS=$pkg_cv_GTK_MAC_CFLAGS
-	GTK_MAC_LIBS=$pkg_cv_GTK_MAC_LIBS
+	JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS
+	JANSSON_LIBS=$pkg_cv_JANSSON_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
 
+fi
 
- fi
+fi
+
+if test "${enable_staticlink}" != "no"; then :
 
 
 else
 
- HAVE_GTK3=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldispatch" >&5
+$as_echo_n "checking for main in -ldispatch... " >&6; }
+if ${ac_cv_lib_dispatch_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldispatch $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
 
-fi
- if test "x$OS_OSX" = "xyes"; then
- OS_OSX_TRUE=
- OS_OSX_FALSE='#'
+
+int
+main ()
+{
+return main ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dispatch_main=yes
 else
- OS_OSX_TRUE='#'
- OS_OSX_FALSE=
+ ac_cv_lib_dispatch_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_dispatch_main" >&5
+$as_echo "$ac_cv_lib_dispatch_main" >&6; }
+if test "x$ac_cv_lib_dispatch_main" = xyes; then :
+ HAVE_DISPATCH=yes
+fi
+
+
 fi
+DISPATCH_CFLAGS=-fblocks
+DISPATCH_LIBS="-ldispatch -lBlocksRuntime"
+
 
 
 if test "${enable_gtk2}" = "yes"; then :
 
 if test "${enable_staticlink}" != "no"; then :
 
- GTK2_DEPS_CFLAGS="-I${GTK_ROOT_216}/include/gtk-2.0 -I${GTK_ROOT_216}/lib/gtk-2.0/include -I${GTK_ROOT_216}/include/atk-1.0 -I${GTK_ROOT_216}/include/cairo -I${GTK_ROOT_216}/include/pango-1.0 -I${GTK_ROOT_216}/include -I${GTK_ROOT_216}/include/glib-2.0 -I${GTK_ROOT_216}/lib/glib-2.0/include"
- GTK2_DEPS_LIBS="-L${GTK_ROOT_216}/lib -lgtk-x11-2.0 -lpango-1.0 -lcairo -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+ GTK2_DEPS_CFLAGS="${GTK2_216_CFLAGS}"
+ GTK2_DEPS_LIBS="${GTK2_216_LIBS}"
 
 
 HAVE_GTK2=yes
@@ -24579,12 +25126,12 @@
 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
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16 gthread-2.0 glib-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16 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_GTK2_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.16 gthread-2.0 glib-2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -24596,12 +25143,12 @@
 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
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16 gthread-2.0 glib-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16 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_GTK2_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.16 gthread-2.0 glib-2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -24622,9 +25169,9 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 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`
+	 GTK2_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.16 gthread-2.0 glib-2.0" 2>&1`
 else
-	 GTK2_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "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.16 gthread-2.0 glib-2.0" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK2_DEPS_PKG_ERRORS" >&5
@@ -24851,7 +25398,7 @@
 
 HAVE_DBUS=yes
 DBUS_DEPS_LIBS="../../$LIB/lib/libdbus-1.a ../../$LIB/lib/libexpat.a -lrt"
- DBUS_DEPS_CFLAGS="-I../../$LIB/include/dbus-1"
+ DBUS_DEPS_CFLAGS="-I../../$LIB/include/dbus-1.0 -I../../$LIB/lib/dbus-1.0/include/"
 
 
 else
@@ -25018,6 +25565,100 @@
 
 fi
 
+if test "${enable_pipewire}" != "no"; then :
+
+ if test "${enable_staticlink}" != "no"; then :
+
+ HAVE_PIPEWIRE=yes
+ PIPEWIRE_DEPS_LIBS="-lpipewire-0.3"
+ PIPEWIRE_DEPS_CFLAGS="-D_REENTRANT -I../../$LIB/include/pipewire-0.3 -I../../$LIB/include/spa-0.2"
+
+
+
+else
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PIPEWIRE_DEPS" >&5
+$as_echo_n "checking for PIPEWIRE_DEPS... " >&6; }
+
+if test -n "$PIPEWIRE_DEPS_CFLAGS"; then
+ pkg_cv_PIPEWIRE_DEPS_CFLAGS="$PIPEWIRE_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 \"libpipewire-0.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpipewire-0.3") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PIPEWIRE_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpipewire-0.3" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$PIPEWIRE_DEPS_LIBS"; then
+ pkg_cv_PIPEWIRE_DEPS_LIBS="$PIPEWIRE_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 \"libpipewire-0.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpipewire-0.3") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_PIPEWIRE_DEPS_LIBS=`$PKG_CONFIG --libs "libpipewire-0.3" 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
+	 PIPEWIRE_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpipewire-0.3" 2>&1`
+ else
+	 PIPEWIRE_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpipewire-0.3" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PIPEWIRE_DEPS_PKG_ERRORS" >&5
+
+	HAVE_PIPEWIRE=no
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_PIPEWIRE=no
+else
+	PIPEWIRE_DEPS_CFLAGS=$pkg_cv_PIPEWIRE_DEPS_CFLAGS
+	PIPEWIRE_DEPS_LIBS=$pkg_cv_PIPEWIRE_DEPS_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_PIPEWIRE=yes
+fi
+
+fi
+
+fi
+
+if test "${enable_libretro}" != "no"; then :
+
+ HAVE_LIBRETRO=yes
+
+fi
+
 ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
 if test "x$ac_cv_header_iconv_h" = xyes; then :
 
@@ -25080,7 +25721,7 @@
 else
 
 ax_save_FLAGS=$CFLAGS
- CFLAGS="-msse2"
+ CFLAGS="-msse2 -Werror"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
@@ -25121,7 +25762,7 @@
 if test "${enable_staticlink}" != "no"; then :
 
 HAVE_CURL=yes
- CURL_LIBS="../../$LIB/lib/libcurl.a -lrt"
+ CURL_LIBS="-lpthread -lrt -lcurl ../../$LIB/lib/libz.a"
 CURL_CFLAGS="-I../../$LIB/include"
 
 
@@ -25168,19 +25809,27 @@
 fi
 
 
-if test "${enable_mpgmad}" != "no"; then :
+if test "${enable_mp3}" != "no"; then :
 
 if test "${enable_staticlink}" != "no"; then :
 
- HAVE_MPGMAD=yes
+ HAVE_MP3=yes
+ HAVE_LIBMAD=yes
 MAD_CFLAGS="-I../../$LIB/include"
 MAD_LIBS="../../$LIB/lib/libmad.a"
 
 
+ HAVE_LIBMPG123=yes
+ MPG123_CFLAGS="-I../../$LIB/include"
+ MPG123_LIBS="../../$LIB/lib/libmpg123.a"
+
+
 
 else
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmad" >&5
+ if test "${enable_libmad}" != "no"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmad" >&5
 $as_echo_n "checking for main in -lmad... " >&6; }
 if ${ac_cv_lib_mad_main+:} false; then :
 $as_echo_n "(cached) " >&6
@@ -25214,13 +25863,65 @@
 HAVE_LIBMAD=yes
 fi
 
+
+fi
+ if test "${enable_libmpg123}" != "no"; then :
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmpg123" >&5
+$as_echo_n "checking for main in -lmpg123... " >&6; }
+if ${ac_cv_lib_mpg123_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmpg123 $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_mpg123_main=yes
+else
+ ac_cv_lib_mpg123_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_mpg123_main" >&5
+$as_echo "$ac_cv_lib_mpg123_main" >&6; }
+if test "x$ac_cv_lib_mpg123_main" = xyes; then :
+ HAVE_LIBMPG123=yes
+fi
+
+
+fi
+ HAVE_MP3=yes
 if test "${HAVE_LIBMAD}" = "yes"; then :
 
- HAVE_MPGMAD=yes
 MAD_LIBS="-lmad"
 
 
 fi
+ if test "${HAVE_LIBMPG123}" = "yes"; then :
+
+ MPG123_LIBS="-lmpg123"
+
+
+fi
+ if test "${HAVE_LIBMAD}" != "yes" -a "${HAVE_LIBMPG123}" != "yes"; then :
+
+ echo "MP3 plugin is disabled: can't find either libmad of libmpg123"
+ HAVE_MP3=no
+
+fi
 
 fi
 
@@ -25318,6 +26019,100 @@
 
 fi
 
+if test "${enable_opus}" != "no"; then :
+
+ if test "${enable_staticlink}" != "no"; then :
+
+ HAVE_OPUSPLUGIN=yes
+ OPUS_LIBS="-lopusfile -lopus -lm -logg"
+ OPUS_CFLAGS="-I../../$LIB/include -I../../$LIB/include/opus"
+
+
+
+else
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPUS" >&5
+$as_echo_n "checking for OPUS... " >&6; }
+
+if test -n "$OPUS_CFLAGS"; then
+ pkg_cv_OPUS_CFLAGS="$OPUS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opusfile\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "opusfile") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_OPUS_CFLAGS=`$PKG_CONFIG --cflags "opusfile" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$OPUS_LIBS"; then
+ pkg_cv_OPUS_LIBS="$OPUS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opusfile\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "opusfile") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_OPUS_LIBS=`$PKG_CONFIG --libs "opusfile" 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
+	 OPUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "opusfile" 2>&1`
+ else
+	 OPUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "opusfile" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$OPUS_PKG_ERRORS" >&5
+
+	HAVE_OPUS=no
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	HAVE_OPUS=no
+else
+	OPUS_CFLAGS=$pkg_cv_OPUS_CFLAGS
+	OPUS_LIBS=$pkg_cv_OPUS_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_OPUS=yes
+fi
+ if test "$HAVE_OPUS" = "yes"; then :
+
+ HAVE_OPUSPLUGIN=yes
+
+
+
+fi
+
+fi
+
+fi
 if test "${enable_staticlink}" != "no"; then :
 
 HAVE_OGG=yes
@@ -25364,7 +26159,6 @@
 
 if test "$HAVE_OGG" = "yes"; then :
 
- HAVE_VORBISPLUGIN=yes
 OGG_LIBS="-logg"
 
 
@@ -25592,10 +26386,6 @@
 if test "${HAVE_CURL}" = "yes"; then :
 
 HAVE_VFS_CURL=yes
- VFS_CURL_LIBS="$CURL_LIBS"
-
- VFS_CURL_CFLAGS="$CURL_CFLAGS"
-
 
 fi
 
@@ -25606,8 +26396,8 @@
 if test "${enable_staticlink}" != "no"; then :
 
 HAVE_CDDAPLUGIN=yes
- CDDA_LIBS="../../$LIB/lib/libcdio.a ../../$LIB/lib/libudf.a ../../$LIB/lib/libiso9660.a ../../$LIB/lib/libcddb.a"
- CDDA_CFLAGS="-I../../$LIB/include"
+ CDDA_LIBS="../../$LIB/lib/libcdio.a ../../$LIB/lib/libcdio_cdda.a ../../$LIB/lib/libcdio_paranoia.a ../../$LIB/lib/libudf.a ../../$LIB/lib/libiso9660.a ../../$LIB/lib/libcddb.a"
+ CDDA_CFLAGS="-I../../$LIB/include -DUSE_PARANOIA -DUSE_PARANOIA_10_2"
 
 
 
@@ -25684,7 +26474,91 @@
 if test "${HAVE_CDIO}" = "yes" -a "${HAVE_CDDB}" = "yes"; then :
 
 HAVE_CDDAPLUGIN=yes
- CDDA_LIBS="-lcdio -lcddb"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcdda_interface" >&5
+$as_echo_n "checking for main in -lcdda_interface... " >&6; }
+if ${ac_cv_lib_cdda_interface_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcdda_interface $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_cdda_interface_main=yes
+else
+ ac_cv_lib_cdda_interface_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_cdda_interface_main" >&5
+$as_echo "$ac_cv_lib_cdda_interface_main" >&6; }
+if test "x$ac_cv_lib_cdda_interface_main" = xyes; then :
+ HAVE_CDDA_INTERFACE=yes
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcdda_paranoia" >&5
+$as_echo_n "checking for main in -lcdda_paranoia... " >&6; }
+if ${ac_cv_lib_cdda_paranoia_main+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcdda_paranoia $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_cdda_paranoia_main=yes
+else
+ ac_cv_lib_cdda_paranoia_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_cdda_paranoia_main" >&5
+$as_echo "$ac_cv_lib_cdda_paranoia_main" >&6; }
+if test "x$ac_cv_lib_cdda_paranoia_main" = xyes; then :
+ HAVE_CDDA_PARANOIA=yes
+fi
+
+ if test "${enable_cdda_paranoia}" != "no" -a "${HAVE_CDDA_INTERFACE}" = "yes" -a "${HAVE_CDDA_PARANOIA}" = "yes"; then :
+
+ CDDA_CFLAGS="-DUSE_PARANOIA"
+ ac_fn_c_check_header_mongrel "$LINENO" "cdda/cdda_interface.h" "ac_cv_header_cdda_cdda_interface_h" "$ac_includes_default"
+if test "x$ac_cv_header_cdda_cdda_interface_h" = xyes; then :
+ CDDA_CFLAGS="-DUSE_CDDA_SUBDIR $CDDA_CFLAGS"
+fi
+
+
+
+ CDDA_LIBS="-lcdio -lcdda_interface -lcdda_paranoia -lcddb"
+
+else
+
+ CDDA_LIBS="-lcdio -lcddb"
+
+fi
 
 
 fi
@@ -25776,7 +26650,7 @@
 t=`echo $i | sed -e 's/OSSLIBDIR=//'`
 if test "${i}" != "${t}"; then :
 
- if test -f "${t}/include/sys/soundcard.h" -o -f "${i}/include/soundcard.h"; then :
+ if test -f "${t}/include/sys/soundcard.h"; then :
 
 OSS_CFLAGS="-I$t/include/sys"
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSS_CFLAGS" >&5
@@ -25846,6 +26720,16 @@
 
 fi
 
+if test "${enable_pipewire}" != "no"; then :
+
+ if test "${HAVE_PIPEWIRE}" = "yes"; then :
+
+ HAVE_PIPEWIRE_PLUGIN=yes
+
+fi
+
+fi
+
 if test "${enable_lfm}" != "no"; then :
 
 if test "${HAVE_CURL}" = "yes" -a "${enable_lastfm}" != "no"; then :
@@ -25874,173 +26758,6 @@
 
 if test "${enable_artwork}" != "no"; then :
 
- if test "${enable_staticlink}" != "no"; then :
-
- HAVE_JPEG=yes
- JPEG_DEPS_LIBS="../../$LIB/lib/libjpeg.a"
- JPEG_DEPS_CFLAGS="-I../../$LIB/include"
-
-
- HAVE_PNG=yes
- PNG_DEPS_CFLAGS="-I../../$LIB/include/libpng15"
- PNG_DEPS_LIBS="../../$LIB/lib/libpng.a ../../$LIB/lib/libz.a"
-
-
- HAVE_IMLIB2=no
-
-else
-
- if test "${enable_artwork_imlib2}" != "no"; then :
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMLIB2_DEPS" >&5
-$as_echo_n "checking for IMLIB2_DEPS... " >&6; }
-
-if test -n "$IMLIB2_DEPS_CFLAGS"; then
- pkg_cv_IMLIB2_DEPS_CFLAGS="$IMLIB2_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 \"imlib2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "imlib2") 2>&5
- ac_status=$?
- $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
- else
- pkg_failed=untried
-fi
-if test -n "$IMLIB2_DEPS_LIBS"; then
- pkg_cv_IMLIB2_DEPS_LIBS="$IMLIB2_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 \"imlib2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "imlib2") 2>&5
- ac_status=$?
- $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
- 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
-	 IMLIB2_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "imlib2" 2>&1`
- else
-	 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
-
-	HAVE_IMLIB2=no
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	HAVE_IMLIB2=no
-else
-	IMLIB2_DEPS_CFLAGS=$pkg_cv_IMLIB2_DEPS_CFLAGS
-	IMLIB2_DEPS_LIBS=$pkg_cv_IMLIB2_DEPS_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	HAVE_IMLIB2=yes
-fi
-
-fi
-
- if test "${enable_artwork_imlib2}" = "no" -o "${HAVE_IMLIB2}" = "no"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
-$as_echo_n "checking for main in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ljpeg $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_jpeg_main=yes
-else
- ac_cv_lib_jpeg_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_jpeg_main" >&5
-$as_echo "$ac_cv_lib_jpeg_main" >&6; }
-if test "x$ac_cv_lib_jpeg_main" = xyes; then :
- HAVE_JPEG=yes;JPEG_DEPS_LIBS="-ljpeg";
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpng" >&5
-$as_echo_n "checking for main in -lpng... " >&6; }
-if ${ac_cv_lib_png_main+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng $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_png_main=yes
-else
- ac_cv_lib_png_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_png_main" >&5
-$as_echo "$ac_cv_lib_png_main" >&6; }
-if test "x$ac_cv_lib_png_main" = xyes; then :
- HAVE_PNG=yes;PNG_DEPS_LIBS="-lpng -lz";
-fi
-
-
-fi
-
-fi
-
 if test "${enable_artwork_network}" = "yes"; then :
 
 ARTWORK_USE_VFS_CURL=yes
@@ -26049,11 +26766,7 @@
 
 if test "${HAVE_VFS_CURL}" = "yes" -o "${enable_artwork_network}" = "no" ; then :
 
- if test "${HAVE_JPEG}" = "yes" -o "${HAVE_IMLIB2}" = "yes"; then :
-
- HAVE_ARTWORK=yes
-
-fi
+ HAVE_ARTWORK=yes
 
 fi
 
@@ -26192,7 +26905,7 @@
 
 fi
 
-if test "${enable_gme}" != "no"; then :
+if test "${enable_gme}" != "no" -a "${HAVE_ZLIB}" = "yes"; then :
 
 HAVE_GME=yes
 
@@ -26324,7 +27037,6 @@
 
 fi
 
-
 if test "${enable_dumb}" != "no"; then :
 
 HAVE_DUMB=yes
@@ -26337,7 +27049,7 @@
 
 fi
 
-if test "${enable_psf}" != "no"; then :
+if test "${enable_psf}" != "no" -a "${HAVE_ZLIB}" = "yes"; then :
 
 HAVE_PSF=yes
 
@@ -26367,7 +27079,26 @@
 
 fi
 
-PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser 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/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
+if test "${enable_sc68}" != "no" -a "${HAVE_ZLIB}" = "yes"; then :
+
+ HAVE_SC68=yes
+
+fi
+
+
+if test "${enable_rgscanner}" != "no"; then :
+
+ HAVE_RGSCANNER=yes
+
+fi
+
+if test "${enable_soundtouch}" != "no"; then :
+
+ HAVE_SOUNDTOUCH=yes
+
+fi
+
+PLUGINS_DIRS="plugins/liboggedit plugins/libparser plugins/lastfm plugins/mp3 plugins/vorbis plugins/opus 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/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/psf plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sc68 plugins/rg_scanner plugins/soundtouch"
 
 if test "x$APE_USE_YASM" = "xyes"; then
 APE_USE_YASM_TRUE=
@@ -26385,6 +27116,14 @@
 HAVE_VORBIS_FALSE=
 fi
 
+ if test "x$HAVE_OPUSPLUGIN" = "xyes"; then
+ HAVE_OPUS_TRUE=
+ HAVE_OPUS_FALSE='#'
+else
+ HAVE_OPUS_TRUE='#'
+ HAVE_OPUS_FALSE=
+fi
+
 if test "x$HAVE_OGG" = "xyes"; then
 HAVE_OGG_TRUE=
 HAVE_OGG_FALSE='#'
@@ -26433,6 +27172,14 @@
 HAVE_CDDA_FALSE=
 fi
 
+ if test "x$HAVE_CDDAPLUGIN" = "xyes"; then
+ USE_CDPARANOIA_TRUE=
+ USE_CDPARANOIA_FALSE='#'
+else
+ USE_CDPARANOIA_TRUE='#'
+ USE_CDPARANOIA_FALSE=
+fi
+
 if test "x$HAVE_GTK2" = "xyes"; then
 HAVE_GTK2_TRUE=
 HAVE_GTK2_FALSE='#'
@@ -26473,6 +27220,14 @@
 HAVE_FFMPEG_FALSE=
 fi
 
+ if test "x$HAVE_PIPEWIRE_PLUGIN" = "xyes"; then
+ HAVE_PIPEWIRE_TRUE=
+ HAVE_PIPEWIRE_FALSE='#'
+else
+ HAVE_PIPEWIRE_TRUE='#'
+ HAVE_PIPEWIRE_FALSE=
+fi
+
 if test "x$HAVE_PULSEPLUGIN" = "xyes"; then
 HAVE_PULSE_TRUE=
 HAVE_PULSE_FALSE='#'
@@ -26545,6 +27300,14 @@
 HAVE_GME_FALSE=
 fi
 
+ if test "x$HAVE_LIBRETRO" = "xyes"; then
+ HAVE_LIBRETRO_TRUE=
+ HAVE_LIBRETRO_FALSE='#'
+else
+ HAVE_LIBRETRO_TRUE='#'
+ HAVE_LIBRETRO_FALSE=
+fi
+
 if test "x$HAVE_LASTFM" = "xyes"; then
 HAVE_LASTFM_TRUE=
 HAVE_LASTFM_FALSE='#'
@@ -26569,12 +27332,28 @@
 HAVE_HOTKEYS_FALSE=
 fi
 
- if test "x$HAVE_MPGMAD" = "xyes"; then
- HAVE_MPGMAD_TRUE=
- HAVE_MPGMAD_FALSE='#'
+ if test "x$HAVE_MP3" = "xyes"; then
+ HAVE_MP3_TRUE=
+ HAVE_MP3_FALSE='#'
+else
+ HAVE_MP3_TRUE='#'
+ HAVE_MP3_FALSE=
+fi
+
+ if test "x$HAVE_LIBMAD" = "xyes"; then
+ HAVE_LIBMAD_TRUE=
+ HAVE_LIBMAD_FALSE='#'
 else
- HAVE_MPGMAD_TRUE='#'
- HAVE_MPGMAD_FALSE=
+ HAVE_LIBMAD_TRUE='#'
+ HAVE_LIBMAD_FALSE=
+fi
+
+ if test "x$HAVE_LIBMPG123" = "xyes"; then
+ HAVE_LIBMPG123_TRUE=
+ HAVE_LIBMPG123_FALSE='#'
+else
+ HAVE_LIBMPG123_TRUE='#'
+ HAVE_LIBMPG123_FALSE=
 fi
 
 if test "x$HAVE_OSS" = "xyes"; then
@@ -26697,30 +27476,6 @@
 HAVE_CONVERTER_FALSE=
 fi
 
- if test "x$HAVE_IMLIB2" = "xyes"; then
- HAVE_IMLIB2_TRUE=
- HAVE_IMLIB2_FALSE='#'
-else
- HAVE_IMLIB2_TRUE='#'
- HAVE_IMLIB2_FALSE=
-fi
-
- if test "x$HAVE_JPEG" = "xyes"; then
- HAVE_JPEG_TRUE=
- HAVE_JPEG_FALSE='#'
-else
- HAVE_JPEG_TRUE='#'
- HAVE_JPEG_FALSE=
-fi
-
- if test "x$HAVE_PNG" = "xyes"; then
- HAVE_PNG_TRUE=
- HAVE_PNG_FALSE='#'
-else
- HAVE_PNG_TRUE='#'
- HAVE_PNG_FALSE=
-fi
-
 if test "x$HAVE_YASM" = "xyes"; then
 HAVE_YASM_TRUE=
 HAVE_YASM_FALSE='#'
@@ -26785,6 +27540,14 @@
 HAVE_PLTBROWSER_FALSE=
 fi
 
+ if test "x$HAVE_SC68" = "xyes"; then
+ HAVE_SC68_TRUE=
+ HAVE_SC68_FALSE='#'
+else
+ HAVE_SC68_TRUE='#'
+ HAVE_SC68_FALSE=
+fi
+
 if test "x$STATICLINK" = "xyes"; then
 STATICLINK_TRUE=
 STATICLINK_FALSE='#'
@@ -26817,388 +27580,34 @@
 USE_ABSTRACT_SOCKET_NAME_FALSE=
 fi
 
-
-
-
-if test "${USE_MAINTAINER_MODE}" = "yes"; then :
-
-echo
-echo "Build Configuration:"
-echo
-echo "* Maintainer Mode: $USE_MAINTAINER_MODE"
-
+ if test "${HAVE_SSE2}"; then
+ HAVE_SSE2_TRUE=
+ HAVE_SSE2_FALSE='#'
+else
+ HAVE_SSE2_TRUE='#'
+ HAVE_SSE2_FALSE=
 fi
 
-echo
-echo "Plugin Summary:"
-echo
-
-
-
-
- if true ; then
- echo " stdio: yes - Standard IO plugin"
- else
- echo " stdio: no - Standard IO plugin"
- fi
-
-
-
- if test "x$HAVE_GME" = "xyes" ; then
- echo " gme: yes - chiptune music player based on GME"
- else
- echo " gme: no - chiptune music player based on GME"
- fi
-
-
-
- if test "x$HAVE_NULLOUT" = "xyes" ; then
- echo " nullout: yes - NULL output"
- else
- echo " nullout: no - NULL output"
- fi
-
-
-
- if test "x$HAVE_ALSA" = "xyes" ; then
- echo " alsa: yes - ALSA output"
- else
- echo " alsa: no - ALSA output"
- fi
-
-
-
- if test "x$HAVE_OSS" = "xyes" ; then
- echo " oss: yes - oss output plugin"
- else
- echo " oss: no - oss output plugin"
- fi
-
-
-
- if test "x$HAVE_PULSEPLUGIN" = "xyes" ; then
- echo " pulse: yes - PulseAudio output plugin"
- else
- echo " pulse: no - PulseAudio output plugin"
- fi
-
-
-
- if test "x$HAVE_COREAUDIO" = "xyes" ; then
- echo " coreaudio: yes - CoreAudio output plugin"
- else
- echo " coreaudio: no - CoreAudio output plugin"
- fi
-
-
-
- if test "x$HAVE_SID" = "xyes" ; then
- echo " sid: yes - SID player based on libsidplay2"
- else
- echo " sid: no - SID player based on libsidplay2"
- fi
-
-
-
- if test "x$HAVE_FFAP" = "xyes" ; then
- echo " ffap: yes - Monkey's audio (APE) decoder"
- else
- echo " ffap: no - Monkey's audio (APE) decoder"
- fi
-
-
-
- if test "x$HAVE_LASTFM" = "xyes" ; then
- echo " lastfm: yes - last.fm scrobbler"
- else
- echo " lastfm: no - last.fm scrobbler"
- fi
-
-
-
- if test "x$HAVE_MPGMAD" = "xyes" ; then
- echo " mpgmad: yes - mpeg player based on libmad"
- else
- echo " mpgmad: no - mpeg player based on libmad"
- fi
-
-
-
- if test "x$HAVE_VORBISPLUGIN" = "xyes" ; then
- echo " vorbis: yes - ogg vorbis player"
- else
- echo " vorbis: no - ogg vorbis player"
- fi
-
-
-
- if test "x$HAVE_FLACPLUGIN" = "xyes" ; then
- echo " flac: yes - flac player"
- else
- echo " flac: no - flac player"
- fi
-
-
-
- if test "x$HAVE_WAVPACKPLUGIN" = "xyes" ; then
- echo " wavpack: yes - wavpack player"
- else
- echo " wavpack: no - wavpack player"
- fi
-
-
-
- if test "x$HAVE_SNDFILEPLUGIN" = "xyes" ; then
- echo " sndfile: yes - PCM (wav,aiff,etc) player based on libsndfile"
- else
- echo " sndfile: no - PCM (wav,aiff,etc) player based on libsndfile"
- fi
-
-
-
- if test "x$HAVE_VTX" = "xyes" ; then
- echo " vtx: yes - vtx file player (ay8910/12 emulation)"
- else
- echo " vtx: no - vtx file player (ay8910/12 emulation)"
- fi
-
-
-
- if test "x$HAVE_ADPLUG" = "xyes" ; then
- echo " adplug: yes - adplug player (OPL2/OPL3 emulation)"
- else
- echo " adplug: no - adplug player (OPL2/OPL3 emulation)"
- fi
-
-
-
- if test "x$HAVE_VFS_CURL" = "xyes" ; then
- echo " vfs_curl: yes - http/ftp streaming support"
- else
- echo " vfs_curl: no - http/ftp streaming support"
- fi
-
-
-
- if test "x$HAVE_CDDAPLUGIN" = "xyes" ; then
- echo " cdda: yes - cd audio player"
- else
- echo " cdda: no - cd audio player"
- fi
-
-
-
- if test "x$HAVE_GTK2" = "xyes" ; then
- echo " gtkui: yes - GTK2 user interface"
- else
- echo " gtkui: no - GTK2 user interface"
- fi
-
-
-
- if test "x$HAVE_GTK3" = "xyes" ; then
- echo " gtkui3: yes - GTK3 user interface"
- else
- echo " gtkui3: no - GTK3 user interface"
- fi
-
-
-
- if test "x$HAVE_HOTKEYS" = "xyes" ; then
- echo " hotkeys: yes - Local and global hotkeys support"
- else
- echo " hotkeys: no - Local and global hotkeys support"
- fi
-
-
-
- if test "x$HAVE_FFMPEGPLUGIN" = "xyes" ; then
- echo " ffmpeg: yes - ffmpeg codecs"
- else
- echo " ffmpeg: no - ffmpeg codecs"
- fi
-
-
-
- if test "x$HAVE_ARTWORK" = "xyes" ; then
- echo " artwork: yes - Cover art plugin"
- else
- echo " artwork: no - Cover art plugin"
- fi
-
-
-
- if test "x$HAVE_SUPEREQ" = "xyes" ; then
- echo " supereq: yes - Equalizer based on Super EQ library by Naoki Shibata"
- else
- echo " supereq: no - Equalizer based on Super EQ library by Naoki Shibata"
- fi
-
-
-
- if test "x$HAVE_NOTIFY" = "xyes" ; then
- echo " notify: yes - notification-daemon support plugin"
- else
- echo " notify: no - notification-daemon support plugin"
- fi
-
-
-
- if test "x$HAVE_SHELLEXEC" = "xyes" ; then
- echo " shellexec: yes - shell commands plugin"
- else
- echo " shellexec: no - shell commands plugin"
- fi
-
-
-
- if test "x$HAVE_SHELLEXECUI" = "xyes" ; then
- echo " shellexecui: yes - GTK user interface for setting up shellexec plugin"
- else
- echo " shellexecui: no - GTK user interface for setting up shellexec plugin"
- fi
-
-
-
- if test "x$HAVE_MUSEPACK" = "xyes" ; then
- echo " musepack: yes - musepack player plugin"
- else
- echo " musepack: no - musepack player plugin"
- fi
-
-
-
- if test "x$HAVE_WILDMIDI" = "xyes" ; then
- echo " wildmidi: yes - WildMidi player plugin"
- else
- echo " wildmidi: no - WildMidi player plugin"
- fi
-
-
-
- if test "x$HAVE_TTA" = "xyes" ; then
- echo " tta: yes - TTA player plugin"
- else
- echo " tta: no - TTA player plugin"
- fi
-
-
-
- if test "x$HAVE_DCA" = "xyes" ; then
- echo " dca: yes - libdca (DTS Audio) player plugin"
- else
- echo " dca: no - libdca (DTS Audio) player plugin"
- fi
-
-
-
- if test "x$HAVE_AAC" = "xyes" ; then
- echo " aac: yes - AAC player (m4a, aac, mp4) based on FAAD2"
- else
- echo " aac: no - AAC player (m4a, aac, mp4) based on FAAD2"
- fi
-
-
-
- if test "x$HAVE_MMS" = "xyes" ; then
- echo " mms: yes - mms streaming support"
- else
- echo " mms: no - mms streaming support"
- fi
-
-
-
- if test "x$HAVE_DSP_SRC" = "xyes" ; then
- echo " dsp_src: yes - High quality samplerate conversion using libsamplerate"
- else
- echo " dsp_src: no - High quality samplerate conversion using libsamplerate"
- fi
-
-
-
- if test "x$HAVE_M3U" = "xyes" ; then
- echo " m3u: yes - M3U and PLS playlist support"
- else
- echo " m3u: no - M3U and PLS playlist support"
- fi
-
-
-
- if test "x$HAVE_VFS_ZIP" = "xyes" ; then
- echo " vfs_zip: yes - zip archive support"
- else
- echo " vfs_zip: no - zip archive support"
- fi
-
-
-
- if test "x$HAVE_CONVERTER" = "xyes" ; then
- echo " converter: yes - plugin for converting files to any formats"
- else
- echo " converter: no - plugin for converting files to any formats"
- fi
-
-
-
- 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
-
-
-
- if test "x$HAVE_ALAC" = "xyes" ; then
- echo " alac: yes - ALAC plugin"
- else
- echo " alac: no - ALAC plugin"
- fi
-
-
-
- if test "x$HAVE_WMA" = "xyes" ; then
- echo " wma: yes - WMA plugin"
- else
- echo " wma: no - WMA plugin"
- fi
-
-
+ if test "x$HAVE_RGSCANNER" = "xyes"; then
+ HAVE_RGSCANNER_TRUE=
+ HAVE_RGSCANNER_FALSE='#'
+else
+ HAVE_RGSCANNER_TRUE='#'
+ HAVE_RGSCANNER_FALSE=
+fi
 
- if test "x$HAVE_PLTBROWSER" = "xyes" ; then
- echo " pltbrowser: yes - playlist browser gui plugin"
- else
- echo " pltbrowser: no - playlist browser gui plugin"
- fi
+ if test "x$HAVE_SOUNDTOUCH" = "xyes"; then
+ HAVE_SOUNDTOUCH_TRUE=
+ HAVE_SOUNDTOUCH_FALSE='#'
+else
+ HAVE_SOUNDTOUCH_TRUE='#'
+ HAVE_SOUNDTOUCH_FALSE=
+fi
 
 
 
-echo
 
-ac_config_files="$ac_config_files Makefile pixmaps/Makefile icons/Makefile plugins/liboggedit/Makefile plugins/libmp4ff/Makefile plugins/libparser/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 plugins/shellexecui/Makefile plugins/alac/Makefile plugins/wma/Makefile plugins/pltbrowser/Makefile plugins/coreaudio/Makefile intl/Makefile po/Makefile.in deadbeef.desktop"
+ac_config_files="$ac_config_files Makefile src/Makefile shared/Makefile shared/analyzer/Makefile shared/scope/Makefile external/Makefile external/ddb_dsp_libretro/Makefile external/ddb_output_pw/Makefile pixmaps/Makefile icons/Makefile plugins/liboggedit/Makefile plugins/libparser/Makefile plugins/gme/Makefile plugins/alsa/Makefile plugins/hotkeys/Makefile plugins/lastfm/Makefile plugins/ffap/Makefile plugins/mp3/Makefile plugins/vorbis/Makefile plugins/opus/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/psf/Makefile plugins/shn/Makefile plugins/mono2stereo/Makefile plugins/shellexecui/Makefile plugins/alac/Makefile plugins/wma/Makefile plugins/pltbrowser/Makefile plugins/sc68/Makefile plugins/coreaudio/Makefile plugins/rg_scanner/Makefile plugins/soundtouch/Makefile po/Makefile.in intl/Makefile deadbeef.desktop"
 
 
 cat >confcache <<\_ACEOF
@@ -27330,26 +27739,6 @@
 as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 
 ac_config_commands="$ac_config_commands po/stamp-it"
@@ -27367,6 +27756,10 @@
 as_fn_error $? "conditional \"HAVE_VORBIS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_OPUS_TRUE}" && test -z "${HAVE_OPUS_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_OPUS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_OGG_TRUE}" && test -z "${HAVE_OGG_FALSE}"; then
 as_fn_error $? "conditional \"HAVE_OGG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27391,6 +27784,10 @@
 as_fn_error $? "conditional \"HAVE_CDDA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${USE_CDPARANOIA_TRUE}" && test -z "${USE_CDPARANOIA_FALSE}"; then
+ as_fn_error $? "conditional \"USE_CDPARANOIA\" 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
@@ -27411,6 +27808,10 @@
 as_fn_error $? "conditional \"HAVE_FFMPEG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_PIPEWIRE_TRUE}" && test -z "${HAVE_PIPEWIRE_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_PIPEWIRE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_PULSE_TRUE}" && test -z "${HAVE_PULSE_FALSE}"; then
 as_fn_error $? "conditional \"HAVE_PULSE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27447,6 +27848,10 @@
 as_fn_error $? "conditional \"HAVE_GME\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_LIBRETRO_TRUE}" && test -z "${HAVE_LIBRETRO_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LIBRETRO\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_LASTFM_TRUE}" && test -z "${HAVE_LASTFM_FALSE}"; then
 as_fn_error $? "conditional \"HAVE_LASTFM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27459,8 +27864,16 @@
 as_fn_error $? "conditional \"HAVE_HOTKEYS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_MPGMAD_TRUE}" && test -z "${HAVE_MPGMAD_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_MPGMAD\" was never defined.
+if test -z "${HAVE_MP3_TRUE}" && test -z "${HAVE_MP3_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_MP3\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_LIBMAD_TRUE}" && test -z "${HAVE_LIBMAD_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LIBMAD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_LIBMPG123_TRUE}" && test -z "${HAVE_LIBMPG123_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_LIBMPG123\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_OSS_TRUE}" && test -z "${HAVE_OSS_FALSE}"; then
@@ -27523,18 +27936,6 @@
 as_fn_error $? "conditional \"HAVE_CONVERTER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_IMLIB2_TRUE}" && test -z "${HAVE_IMLIB2_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_IMLIB2\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_JPEG_TRUE}" && test -z "${HAVE_JPEG_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_JPEG\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PNG_TRUE}" && test -z "${HAVE_PNG_FALSE}"; then
- 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
@@ -27567,6 +27968,10 @@
 as_fn_error $? "conditional \"HAVE_PLTBROWSER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_SC68_TRUE}" && test -z "${HAVE_SC68_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_SC68\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${STATICLINK_TRUE}" && test -z "${STATICLINK_FALSE}"; then
 as_fn_error $? "conditional \"STATICLINK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -27583,6 +27988,18 @@
 as_fn_error $? "conditional \"USE_ABSTRACT_SOCKET_NAME\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_SSE2_TRUE}" && test -z "${HAVE_SSE2_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_SSE2\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_RGSCANNER_TRUE}" && test -z "${HAVE_RGSCANNER_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_RGSCANNER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_SOUNDTOUCH_TRUE}" && test -z "${HAVE_SOUNDTOUCH_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_SOUNDTOUCH\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -27980,7 +28397,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.6.2, which was
+This file was extended by deadbeef $as_me 1.9.6, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -28046,7 +28463,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.6.2
+deadbeef config.status 1.9.6
 configured by $0, generated by GNU Autoconf 2.69,
 with options \\"\$ac_cs_config\\"
 
@@ -28165,7 +28582,6 @@
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -28177,10 +28593,11 @@
 delay_variable_subst='$delay_variable_subst'
 macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $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"`'
@@ -28230,10 +28647,13 @@
 GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
 nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
 lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
@@ -28298,7 +28718,8 @@
 finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
 hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
 sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
+configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
 hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
 enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
 enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
@@ -28403,9 +28824,12 @@
 compiler \
 lt_cv_sys_global_symbol_pipe \
 lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
 nm_file_list_spec \
+lt_cv_truncate_bin \
 lt_prog_compiler_no_builtin_flag \
 lt_prog_compiler_pic \
 lt_prog_compiler_wl \
@@ -28471,7 +28895,7 @@
 compiler_lib_search_path_CXX; do
 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 *\\\\\\\`\\"\\\$*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
 ;;
 *)
 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -28498,7 +28922,8 @@
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
+configure_time_dlsearch_path \
+configure_time_lt_sys_library_path \
 reload_cmds_CXX \
 old_archive_cmds_CXX \
 old_archive_from_new_cmds_CXX \
@@ -28512,7 +28937,7 @@
 postlink_cmds_CXX; do
 case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 *\\\\\\\`\\"\\\$*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
 ;;
 *)
 eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -28521,19 +28946,16 @@
 done
 
 ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
 
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
 setopt NO_GLOB_SUBST
 fi
 
 
 PACKAGE='$PACKAGE'
 VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
 RM='$RM'
 ofile='$ofile'
 
@@ -28558,22 +28980,28 @@
 do
 case $ac_config_target in
 "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
 "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;;
+ "shared/analyzer/Makefile") CONFIG_FILES="$CONFIG_FILES shared/analyzer/Makefile" ;;
+ "shared/scope/Makefile") CONFIG_FILES="$CONFIG_FILES shared/scope/Makefile" ;;
+ "external/Makefile") CONFIG_FILES="$CONFIG_FILES external/Makefile" ;;
+ "external/ddb_dsp_libretro/Makefile") CONFIG_FILES="$CONFIG_FILES external/ddb_dsp_libretro/Makefile" ;;
+ "external/ddb_output_pw/Makefile") CONFIG_FILES="$CONFIG_FILES external/ddb_output_pw/Makefile" ;;
 "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
 "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
 "plugins/liboggedit/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/liboggedit/Makefile" ;;
- "plugins/libmp4ff/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/libmp4ff/Makefile" ;;
 "plugins/libparser/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/libparser/Makefile" ;;
 "plugins/gme/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/gme/Makefile" ;;
 "plugins/alsa/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/alsa/Makefile" ;;
 "plugins/hotkeys/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/hotkeys/Makefile" ;;
 "plugins/lastfm/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/lastfm/Makefile" ;;
 "plugins/ffap/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/ffap/Makefile" ;;
- "plugins/mpgmad/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mpgmad/Makefile" ;;
+ "plugins/mp3/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mp3/Makefile" ;;
 "plugins/vorbis/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/vorbis/Makefile" ;;
+ "plugins/opus/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/opus/Makefile" ;;
 "plugins/flac/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/flac/Makefile" ;;
 "plugins/wavpack/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/wavpack/Makefile" ;;
 "plugins/sndfile/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/sndfile/Makefile" ;;
@@ -28602,16 +29030,19 @@
 "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/psf/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/psf/Makefile" ;;
 "plugins/shn/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/shn/Makefile" ;;
 "plugins/mono2stereo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/mono2stereo/Makefile" ;;
 "plugins/shellexecui/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/shellexecui/Makefile" ;;
 "plugins/alac/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/alac/Makefile" ;;
 "plugins/wma/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/wma/Makefile" ;;
 "plugins/pltbrowser/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/pltbrowser/Makefile" ;;
+ "plugins/sc68/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/sc68/Makefile" ;;
 "plugins/coreaudio/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/coreaudio/Makefile" ;;
- "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+ "plugins/rg_scanner/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/rg_scanner/Makefile" ;;
+ "plugins/soundtouch/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/soundtouch/Makefile" ;;
 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
 "deadbeef.desktop") CONFIG_FILES="$CONFIG_FILES deadbeef.desktop" ;;
 "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
@@ -29209,150 +29640,55 @@
 
 
 case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Older Autoconf quotes --file arguments for eval, but not when files
- # are listed without --file. Let's play safe and only enable the eval
- # if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$mf" : 'X$//$^/' \| \
-	 X"$mf" : 'X$//$$' \| \
-	 X"$mf" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$mf" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X$.*^/$//*^/^/*/*$' \| \
-	 X"$file" : 'X$//$^/' \| \
-	 X"$file" : 'X$//$$' \| \
-	 X"$file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$file" |
- sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$^/.*/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/\/$$/{
-	 s//\1/
-	 q
-	 }
-	 /^X$\/$.*/{
-	 s//\1/
-	 q
-	 }
-	 s/.*/./; q'`
- as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
-}
- ;;
 "libtool":C)
 
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
 setopt NO_GLOB_SUBST
 fi
 
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
 trap "$RM \"$cfgfile\"; exit 1" 1 2 15
 $RM "$cfgfile"
 
 cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 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.
+
+# GNU Libtool 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 of the License, or
+# (at your option) any later version.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
 #
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that 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 GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
 # The names of the tagged configurations supported by this script.
-available_tags="CXX "
+available_tags='CXX '
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 
 # ### BEGIN LIBTOOL CONFIG
 
@@ -29360,18 +29696,21 @@
 macro_version=$macro_version
 macro_revision=$macro_revision
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
 # Whether or not to build static libraries.
 build_old_libs=$enable_static
 
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
 # What type of objects to build.
 pic_mode=$pic_mode
 
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
 # Shell to use when invoking shell scripts.
 SHELL=$lt_SHELL
 
@@ -29489,18 +29828,27 @@
 # Transform the output of nm in a proper C declaration.
 global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
 # Transform the output of nm in a C name address pair.
 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
 # Specify filename containing input files for \$NM.
 nm_file_list_spec=$lt_nm_file_list_spec
 
-# The root where to search for dependent libraries,and in which our libraries should be installed.
+# The root where to search for dependent libraries,and where our libraries should be installed.
 lt_sysroot=$lt_sysroot
 
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
@@ -29591,8 +29939,11 @@
 # Compile-time system search path for libraries.
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# Detected run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
+
+# Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
+configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
@@ -29685,13 +30036,13 @@
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute
 
@@ -29757,13 +30108,72 @@
 
 _LT_EOF
 
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR:DIR:"
+# string "DIR DIR" will be prepended to VARIABLE
+# ":DIR:DIR"
+# string "DIR DIR" will be appended to VARIABLE
+# "DIRP:DIRP::DIRA:DIRA"
+# string "DIRP DIRP" will be prepended to VARIABLE and string
+# "DIRA DIRA" will be appended to VARIABLE
+# "DIR:DIR"
+# VARIABLE will be replaced by "DIR DIR"
+func_munge_path_list ()
+{
+ case x$2 in
+ x)
+ ;;
+ *:)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
+ ;;
+ x:*)
+ eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
+ ;;
+ *)
+ eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+
+
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in $*""; do
+ case $cc_temp in
+ compile | *\\/compile | ccache | *\\/ccache ) ;;
+ distcc | *\\/distcc | purify | *\\/purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
 case $host_os in
 aix3*)
 cat <<\_LT_EOF >> "$cfgfile"
 # AIX sometimes has problems with the GCC collect2 program. For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
 COLLECT_NAMES=
 export COLLECT_NAMES
 fi
@@ -29772,7 +30182,7 @@
 esac
 
 
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
 
 
 # We use sed instead of cat because bash on DJGPP gets confused if
@@ -29782,165 +30192,6 @@
 sed '$q' "$ltmain" >> "$cfgfile" \
 || (rm -f "$cfgfile"; exit 1)
 
- if test x"$xsi_shell" = xyes; then
- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\ case ${1} in\
-\ */*) func_dirname_result="${1%/*}${2}" ;;\
-\ * ) func_dirname_result="${3}" ;;\
-\ esac\
-\ func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\ # positional parameters, so assign one to ordinary parameter first.\
-\ func_stripname_result=${3}\
-\ func_stripname_result=${func_stripname_result#"${1}"}\
-\ func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\ func_split_long_opt_name=${1%%=*}\
-\ func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\ func_split_short_opt_arg=${1#??}\
-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\ case ${1} in\
-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\ *) func_lo2o_result=${1} ;;\
-\ esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
- func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
- func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
- func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
- sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
- eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\ func_quote_for_eval "${2}"\
-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append $a-zA-Z_\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append $a-zA-Z_\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
 mv -f "$cfgfile" "$ofile" ||
 (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 chmod +x "$ofile"
@@ -30027,13 +30278,13 @@
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct_CXX
 
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute_CXX
 
@@ -30270,3 +30521,445 @@
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
+if test "${USE_MAINTAINER_MODE}" = "yes"; then :
+
+echo
+echo "Build Configuration:"
+echo
+echo "* Maintainer Mode: $USE_MAINTAINER_MODE"
+
+fi
+
+echo
+echo "Plugin Summary:"
+echo
+
+
+
+
+ if test "x$HAVE_AAC" = "xyes" ; then
+ echo " aac: yes - AAC player (m4a, aac, mp4) based on FAAD2"
+ else
+ echo " aac: no - AAC player (m4a, aac, mp4) based on FAAD2"
+ fi
+
+
+
+ if test "x$HAVE_ADPLUG" = "xyes" ; then
+ echo " adplug: yes - adplug player (OPL2/OPL3 emulation)"
+ else
+ echo " adplug: no - adplug player (OPL2/OPL3 emulation)"
+ fi
+
+
+
+ if test "x$HAVE_ALAC" = "xyes" ; then
+ echo " alac: yes - ALAC plugin"
+ else
+ echo " alac: no - ALAC plugin"
+ fi
+
+
+
+ if test "x$HAVE_ALSA" = "xyes" ; then
+ echo " alsa: yes - ALSA output"
+ else
+ echo " alsa: no - ALSA output"
+ fi
+
+
+
+ if test "x$HAVE_ARTWORK" = "xyes" ; then
+ echo " artwork: yes - Cover art plugin"
+ else
+ echo " artwork: no - Cover art plugin"
+ fi
+
+
+
+ if test "x$HAVE_CDDAPLUGIN" = "xyes" ; then
+ echo " cdda: yes - cd audio player"
+ else
+ echo " cdda: no - cd audio player"
+ fi
+
+
+
+ if test "x$HAVE_CONVERTER" = "xyes" ; then
+ echo " converter: yes - plugin for converting files to any formats"
+ else
+ echo " converter: no - plugin for converting files to any formats"
+ fi
+
+
+
+ if test "x$HAVE_COREAUDIO" = "xyes" ; then
+ echo " coreaudio: yes - CoreAudio output plugin"
+ else
+ echo " coreaudio: no - CoreAudio output plugin"
+ fi
+
+
+
+ if test "x$HAVE_DCA" = "xyes" ; then
+ echo " dca: yes - libdca (DTS Audio) player plugin"
+ else
+ echo " dca: no - libdca (DTS Audio) player plugin"
+ fi
+
+
+
+ if test "x$HAVE_DSP_SRC" = "xyes" ; then
+ echo " dsp_src: yes - High quality samplerate conversion using libsamplerate"
+ else
+ echo " dsp_src: no - High quality samplerate conversion using libsamplerate"
+ 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_FFAP" = "xyes" ; then
+ echo " ffap: yes - Monkey's audio (APE) decoder"
+ else
+ echo " ffap: no - Monkey's audio (APE) decoder"
+ fi
+
+
+
+ if test "x$HAVE_FFMPEGPLUGIN" = "xyes" ; then
+ echo " ffmpeg: yes - ffmpeg codecs"
+ else
+ echo " ffmpeg: no - ffmpeg codecs"
+ fi
+
+
+
+ if test "x$HAVE_FLACPLUGIN" = "xyes" ; then
+ echo " flac: yes - flac player"
+ else
+ echo " flac: no - flac player"
+ fi
+
+
+
+ if test "x$HAVE_GME" = "xyes" ; then
+ echo " gme: yes - chiptune music player based on GME"
+ else
+ echo " gme: no - chiptune music player based on GME"
+ fi
+
+
+
+ if test "x$HAVE_GTK3" = "xyes" ; then
+ echo " gtkui3: yes - GTK3 user interface"
+ else
+ echo " gtkui3: no - GTK3 user interface"
+ fi
+
+
+
+ if test "x$HAVE_GTK2" = "xyes" ; then
+ echo " gtkui: yes - GTK2 user interface"
+ else
+ echo " gtkui: no - GTK2 user interface"
+ fi
+
+
+
+ if test "x$HAVE_HOTKEYS" = "xyes" ; then
+ echo " hotkeys: yes - Local and global hotkeys support"
+ else
+ echo " hotkeys: no - Local and global hotkeys support"
+ fi
+
+
+
+ if test "x$HAVE_LASTFM" = "xyes" ; then
+ echo " lastfm: yes - last.fm scrobbler"
+ else
+ echo " lastfm: no - last.fm scrobbler"
+ fi
+
+
+
+ if test "x$HAVE_LIBRETRO" = "xyes" ; then
+ echo " libretro: yes - Libretro resampler plugin"
+ else
+ echo " libretro: no - Libretro resampler plugin"
+ fi
+
+
+
+ if test "x$HAVE_M3U" = "xyes" ; then
+ echo " m3u: yes - M3U and PLS playlist support"
+ else
+ echo " m3u: no - M3U and PLS playlist support"
+ fi
+
+
+
+ if test "x$HAVE_MMS" = "xyes" ; then
+ echo " mms: yes - mms streaming support"
+ else
+ echo " mms: no - mms streaming support"
+ fi
+
+
+
+ if test "x$HAVE_MONO2STEREO" = "xyes" ; then
+ echo " mono2stereo: yes - mono2stereo DSP plugin"
+ else
+ echo " mono2stereo: no - mono2stereo DSP plugin"
+ fi
+
+
+
+ if test "x$HAVE_MP3" = "xyes" ; then
+ echo " mp3: yes - mp3 plugin"
+ else
+ echo " mp3: no - mp3 plugin"
+ fi
+
+
+
+ if test "x$HAVE_LIBMAD" = "xyes" ; then
+ echo " libmad: yes - libmad backend for mp3 plugin"
+ else
+ echo " libmad: no - libmad backend for mp3 plugin"
+ fi
+
+
+
+ if test "x$HAVE_LIBMPG123" = "xyes" ; then
+ echo " libmpg123: yes - libmpg123 backend for mp3 plugin"
+ else
+ echo " libmpg123: no - libmpg123 backend for mp3 plugin"
+ fi
+
+
+
+ if test "x$HAVE_MUSEPACK" = "xyes" ; then
+ echo " musepack: yes - musepack player plugin"
+ else
+ echo " musepack: no - musepack player plugin"
+ fi
+
+
+
+ if test "x$HAVE_NOTIFY" = "xyes" ; then
+ echo " notify: yes - notification-daemon support plugin"
+ else
+ echo " notify: no - notification-daemon support plugin"
+ fi
+
+
+
+ if test "x$HAVE_NULLOUT" = "xyes" ; then
+ echo " nullout: yes - NULL output"
+ else
+ echo " nullout: no - NULL output"
+ fi
+
+
+
+ if test "x$HAVE_OPUSPLUGIN" = "xyes" ; then
+ echo " opus: yes - ogg opus player"
+ else
+ echo " opus: no - ogg opus player"
+ fi
+
+
+
+ if test "x$HAVE_OSS" = "xyes" ; then
+ echo " oss: yes - oss output plugin"
+ else
+ echo " oss: no - oss output plugin"
+ fi
+
+
+
+ if test "x$HAVE_PLTBROWSER" = "xyes" ; then
+ echo " pltbrowser: yes - playlist browser gui plugin"
+ else
+ echo " pltbrowser: no - playlist browser gui plugin"
+ fi
+
+
+
+ if test "x$HAVE_PSF" = "xyes" ; then
+ echo " psf: yes - PSF player, using Audio Overload SDK"
+ else
+ echo " psf: no - PSF player, using Audio Overload SDK"
+ fi
+
+
+
+ if test "x$HAVE_PIPEWIRE_PLUGIN" = "xyes" ; then
+ echo " pipewire: yes - Pipewire output plugin"
+ else
+ echo " pipewire: no - Pipewire output plugin"
+ fi
+
+
+
+ if test "x$HAVE_PULSEPLUGIN" = "xyes" ; then
+ echo " pulse: yes - PulseAudio output plugin"
+ else
+ echo " pulse: no - PulseAudio output plugin"
+ fi
+
+
+
+ if test "x$HAVE_RGSCANNER" = "xyes" ; then
+ echo " rgscanner: yes - plugin for ReplayGain scanner support"
+ else
+ echo " rgscanner: no - plugin for ReplayGain scanner support"
+ fi
+
+
+
+ if test "x$HAVE_SC68" = "xyes" ; then
+ echo " sc68: yes - sc68 Atari ST And Amiga player"
+ else
+ echo " sc68: no - sc68 Atari ST And Amiga player"
+ fi
+
+
+
+ if test "x$HAVE_SHELLEXEC" = "xyes" ; then
+ echo " shellexec: yes - shell commands plugin"
+ else
+ echo " shellexec: no - shell commands plugin"
+ fi
+
+
+
+ if test "x$HAVE_SHELLEXECUI" = "xyes" ; then
+ echo " shellexecui: yes - GTK user interface for setting up shellexec plugin"
+ else
+ echo " shellexecui: no - GTK user interface for setting up shellexec plugin"
+ 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_SID" = "xyes" ; then
+ echo " sid: yes - SID player based on libsidplay2"
+ else
+ echo " sid: no - SID player based on libsidplay2"
+ fi
+
+
+
+ if test "x$HAVE_SNDFILEPLUGIN" = "xyes" ; then
+ echo " sndfile: yes - PCM (wav,aiff,etc) player based on libsndfile"
+ else
+ echo " sndfile: no - PCM (wav,aiff,etc) player based on libsndfile"
+ fi
+
+
+
+ if test "x$HAVE_SOUNDTOUCH" = "xyes" ; then
+ echo " soundtouch: yes - SoundTouch plugin used for time stretching and pitch shifting"
+ else
+ echo " soundtouch: no - SoundTouch plugin used for time stretching and pitch shifting"
+ fi
+
+
+
+ if true ; then
+ echo " stdio: yes - Standard IO plugin"
+ else
+ echo " stdio: no - Standard IO plugin"
+ fi
+
+
+
+ if test "x$HAVE_SUPEREQ" = "xyes" ; then
+ echo " supereq: yes - Equalizer based on Super EQ library by Naoki Shibata"
+ else
+ echo " supereq: no - Equalizer based on Super EQ library by Naoki Shibata"
+ fi
+
+
+
+ if test "x$HAVE_TTA" = "xyes" ; then
+ echo " tta: yes - TTA player plugin"
+ else
+ echo " tta: no - TTA player plugin"
+ fi
+
+
+
+ if test "x$HAVE_VFS_CURL" = "xyes" ; then
+ echo " vfs_curl: yes - http/ftp streaming support"
+ else
+ echo " vfs_curl: no - http/ftp streaming support"
+ fi
+
+
+
+ if test "x$HAVE_VFS_ZIP" = "xyes" ; then
+ echo " vfs_zip: yes - zip archive support"
+ else
+ echo " vfs_zip: no - zip archive support"
+ fi
+
+
+
+ if test "x$HAVE_VORBISPLUGIN" = "xyes" ; then
+ echo " vorbis: yes - ogg vorbis player"
+ else
+ echo " vorbis: no - ogg vorbis player"
+ fi
+
+
+
+ if test "x$HAVE_VTX" = "xyes" ; then
+ echo " vtx: yes - vtx file player (ay8910/12 emulation)"
+ else
+ echo " vtx: no - vtx file player (ay8910/12 emulation)"
+ fi
+
+
+
+ if test "x$HAVE_WAVPACKPLUGIN" = "xyes" ; then
+ echo " wavpack: yes - wavpack player"
+ else
+ echo " wavpack: no - wavpack player"
+ fi
+
+
+
+ if test "x$HAVE_WILDMIDI" = "xyes" ; then
+ echo " wildmidi: yes - WildMidi player plugin"
+ else
+ echo " wildmidi: no - WildMidi player plugin"
+ fi
+
+
+
+ if test "x$HAVE_WMA" = "xyes" ; then
+ echo " wma: yes - WMA plugin"
+ else
+ echo " wma: no - WMA plugin"
+ fi
+
+
+
+echo

deadbeef-0.6.2.tar.bz2/configure.ac -> deadbeef-1.9.6.tar.bz2/configure.ac Changed

@@ -1,31 +1,32 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(deadbeef, 0.6.2)
+AC_INIT(deadbeef, 1.9.6)
 
 AC_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(1.11 dist-bzip2 tar-ustar)
-dnl AM_SILENT_RULES(yes)
+AM_INIT_AUTOMAKE(1.11 dist-bzip2 tar-ustar silent-rules subdir-objects no-dependencies)
+AM_SILENT_RULES(yes)
 AM_MAINTAINER_MODE()
-
 AC_USE_SYSTEM_EXTENSIONS
-LT_INIT
-AC_PROG_CC
+LT_INIT(disable-static)
+AC_PROG_CC(clang)
 AC_PROG_CXX
 AC_PROG_OBJC
 AC_STDC_HEADERS
 AC_PROG_INSTALL
+AC_SYS_LARGEFILE
 dnl AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR(m4)
 AC_C_BIGENDIAN
 AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION(0.18)
 PKG_PROG_PKG_CONFIG
-
+AM_PROG_CC_C_O
+AM_ICONV
 IT_PROG_INTLTOOL(0.40.0)
 GETTEXT_PACKAGE=deadbeef
 AC_SUBST(GETTEXT_PACKAGE)
 
 test "$prefix" = NONE && prefix=/usr/local
-AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/${DATADIRNAME}/locale", Name of gettext locale directory)
 
 case "$host" in
 i686-apple-*)
@@ -77,30 +78,39 @@
 AC_SUBST(INSANE_CFLAGS)
 AC_SUBST(INSANE_CXXFLAGS)
 
+dnl Check for clang availability
+AX_CHECK_COMPILER_FLAGS(-fblocks,,AC_MSG_ERROR(Clang is required to build DeaDBeeF. Please check the README file.))
+
 AC_ARG_ENABLE(nullout, AS_HELP_STRING(--disable-nullout , disable NULL output plugin (default: enabled)), enable_nullout=$enableval, enable_nullout=yes)
 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(pipewire, AS_HELP_STRING(--disable-pipewire , disable Pipewire output plugin (default: enabled)), enable_pipewire=$enableval, enable_pipewire=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(coreaudio,AS_HELP_STRING(--disable-coreaudio, disable CoreAudio output plugin (default: enabled)), enable_coreaudio=$enableval, enable_coreaudio=yes)
 AC_ARG_ENABLE(gtk3, AS_HELP_STRING(--disable-gtk3 , disable GTK3 version of gtkui plugin (default: enabled)), enable_gtk3=$enableval, enable_gtk3=yes)
 AC_ARG_ENABLE(gtk2, AS_HELP_STRING(--disable-gtk2 , disable 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(libretro, AS_HELP_STRING(--disable-libretro , disable Libretro resampler plugin (default: enabled)), enable_libretro=$enableval, enable_libretro=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)
 AC_ARG_ENABLE(artwork-network, AS_HELP_STRING(--disable-artwork-network , disable album art network loading support (default: enabled)), enable_artwork_network=$enableval, enable_artwork_network=yes)
 AC_ARG_ENABLE(supereq, AS_HELP_STRING(--disable-supereq , disable SuperEQ DSP plugin (default: enabled)), enable_supereq=$enableval, enable_supereq=yes)
 AC_ARG_ENABLE(sid, AS_HELP_STRING(--disable-sid , disable commodore64 SID music player plugin (default: enabled)), enable_sid=$enableval, enable_sid=yes)
-AC_ARG_ENABLE(mad, AS_HELP_STRING(--disable-mad , disable mpeg (mad) plugin (default: enabled)), enable_mpgmad=$enableval, enable_mpgmad=yes)
+AC_ARG_ENABLE(mp3, AS_HELP_STRING(--disable-mp3 , disable mp3 plugin (default: enabled)), enable_mp3=$enableval, enable_mp3=yes)
+AC_ARG_ENABLE(libmad, AS_HELP_STRING(--disable-libmad , disable libmad support in mp3 plugin (default: auto)), enable_libmad=$enableval, enable_libmad=yes)
+AC_ARG_ENABLE(libmpg123,AS_HELP_STRING(--disable-libmpg123 , disable libmpg123 support in mp3 plugin (default: auto)), enable_libmpg123=$enableval, enable_libmpg123=yes)
 AC_ARG_ENABLE(ffap, AS_HELP_STRING(--disable-ffap , disable Monkey's Audio plugin (default: enabled)), enable_ffap=$enableval, enable_ffap=yes)
 AC_ARG_ENABLE(vtx, AS_HELP_STRING(--disable-vtx , disable libayemy VTX ZX-Spectrum music player plugin (default: enabled)), enable_vtx=$enableval, enable_vtx=yes)
 AC_ARG_ENABLE(adplug, AS_HELP_STRING(--disable-adplug , disable adplug plugin (default: enabled)), enable_adplug=$enableval, enable_adplug=yes)
 AC_ARG_ENABLE(hotkeys, AS_HELP_STRING(--disable-hotkeys , disable global hotkeys plugin (default: enabled)), enable_hotkeys=$enableval, enable_hotkeys=yes)
 AC_ARG_ENABLE(vorbis, AS_HELP_STRING(--disable-vorbis , disable Ogg Vorbis player plugin (default: enabled)), enable_vorbis=$enableval, enable_vorbis=yes)
+AC_ARG_ENABLE(opus, AS_HELP_STRING(--disable-opus , disable Ogg Opus player plugin (default: enabled)), enable_opus=$enableval, enable_opus=yes)
 AC_ARG_ENABLE(ffmpeg, AS_HELP_STRING(--disable-ffmpeg , disable FFMPEG plugin for WMA, AMR, etc (default: enabled)), enable_ffmpeg=$enableval, enable_ffmpeg=yes)
 AC_ARG_ENABLE(flac, AS_HELP_STRING(--disable-flac , disable FLAC player plugin (default: enabled)), enable_flac=$enableval, enable_flac=yes)
 AC_ARG_ENABLE(sndfile, AS_HELP_STRING(--disable-sndfile , disable libsndfile plugin for PCM wave files (default: enabled)), enable_sndfile=$enableval, enable_sndfile=yes)
 AC_ARG_ENABLE(wavpack, AS_HELP_STRING(--disable-wavpack , disable wavpack plugin (default: enabled)), enable_wavpack=$enableval, enable_wavpack=yes)
 AC_ARG_ENABLE(cdda, AS_HELP_STRING(--disable-cdda , disable CD-Audio plugin (default: enabled)), enable_cdda=$enableval, enable_cdda=yes)
+AC_ARG_ENABLE(cdda-paranoia, AS_HELP_STRING(--disable-cdda-paranoia , disable CD-Audio error correction during ripping (default: enabled)), enable_cdda_paranoia=$enableval, enable_cdda_paranoia=yes)
 AC_ARG_ENABLE(gme, AS_HELP_STRING(--disable-gme , disable Game Music Emu plugin for NSF, AY, etc (default: enabled)), enable_gme=$enableval, enable_gme=yes)
 AC_ARG_ENABLE(notify, AS_HELP_STRING(--disable-notify , disable notification-daemon support plugin (default: enabled)), enable_notify=$enableval, enable_notify=yes)
 AC_ARG_ENABLE(shellexec, AS_HELP_STRING(--disable-shellexec, disable shell commands plugin (default: enabled)), enable_shellexec=$enableval, enable_shellexec=yes)
@@ -116,8 +126,6 @@
 AC_ARG_ENABLE(m3u, AS_HELP_STRING(--enable-m3u , build m3u plugin (default: auto)), enable_m3u=$enableval, enable_m3u=yes)
 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)
-dnl AC_ARG_ENABLE(medialib, AS_HELP_STRING(--enable-medialib , build medialibrary plugin (default: auto)), enable_medialib=$enableval, enable_medialib=no)
 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)
@@ -126,7 +134,11 @@
 AC_ARG_ENABLE(alac, AS_HELP_STRING(--enable-alac , build ALAC plugin (default: auto)), enable_alac=$enableval, enable_alac=yes)
 AC_ARG_ENABLE(wma, AS_HELP_STRING(--enable-wma , build WMA plugin (default: auto)), enable_wma=$enableval, enable_wma=yes)
 AC_ARG_ENABLE(pltbrowser, AS_HELP_STRING(--enable-pltbrowser , build playlist browser gui plugin (default: auto)), enable_pltbrowser=$enableval, enable_pltbrowser=yes)
+AC_ARG_ENABLE(sc68, AS_HELP_STRING(--enable-sc68 , build sc68 Atari ST and Amiga music player (default: auto)), enable_sc68=$enableval, enable_sc68=yes)
 AC_ARG_ENABLE(abstract_socket, AS_HELP_STRING(--enable-abstract-socket , use abstract UNIX socket for IPC (default: disabled)), enable_abstract_socket=$enableval, enable_abstract_socket=no)
+dnl AC_ARG_ENABLE(statusnotifier, AS_HELP_STRING(--enable-statusnotifier, KDE status notifier plugin for tray icon (default: disabled)), enable_statusnotifier=$enableval, enable_statusnotifier=no)
+AC_ARG_ENABLE(rgscanner, AS_HELP_STRING(--disable-rgscanner, build ReplayGain scanner plugin (default: enabled)), enable_rgscanner=$enableval, enable_rgscanner=yes)
+AC_ARG_ENABLE(soundtouch, AS_HELP_STRING(--disable-soundtouch , disable soundtouch plugin (default: enabled)), enable_soundtouch=$enableval, enable_soundtouch=yes)
 
 AS_IF(test "${enable_staticlink}" != "no", 
 AC_DEFINE_UNQUOTED(STATICLINK, 1, Define if building static version)
@@ -141,7 +153,7 @@
 case "$host" in
 *-*-gnu )
 AS_IF(test "${enable_staticlink}" != "no", 
- NOCPPLIB="-nostdlib ../../$LIB/lib/libsupc++.a"
+ NOCPPLIB="-nostdlib -lstdc++"
 , 
 NOCPPLIB=""
 )
@@ -149,24 +161,35 @@
 ;;
 esac
 
-AC_CHECK_LIB(intl, main, INTL_LIBS="-lintl";AC_SUBST(INTL_LIBS))
-
 dnl check for yasm
 AC_CHECK_PROG(HAVE_YASM, yasm, yes, no)
 
 dnl check for log2
 AC_CHECK_LIB(m, log2, AC_DEFINE(HAVE_LOG2, , Define to 1 if the system has log2 in libm))
 
+dnl check for mkstemps
+dnl AC_DEFINE_UNQUOTED(HAVE_MKSTEMPS, 0, Define if mkstemps is available)
+AC_CACHE_CHECK(for mkstemps,
+xpdf_cv_func_mkstemps,
+AC_TRY_LINK(#include <stdlib.h>
+#include <unistd.h>,
+mkstemps("foo", 0);,
+xpdf_cv_func_mkstemps=yes, xpdf_cv_func_mkstemps=no))
+if test "$xpdf_cv_func_mkstemps" = yes; then
+ AC_DEFINE(HAVE_MKSTEMPS, 1, Define to 1 if you have the `mkstemps' function.)
+fi
+
 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.)
+dnl check for separate alloca.h (OpenIndiana)
+AC_CHECK_HEADER(alloca.h,ALLOCA_H_CFLAGS="-DHAVE_ALLOCA_H";AC_SUBST(ALLOCA_H_CFLAGS),alloca.h not found.)
 dnl check for syslimits.h (BSD)
 AC_CHECK_HEADERS(sys/syslimits.h)
 AC_CHECK_HEADERS(sys/cdefs.h)
+AC_CHECK_HEADERS(sys/wait.h)
 
 AS_IF(test "${enable_portable}" != "no" -a "${enable_staticlink}" != "no", 
 AC_DEFINE_UNQUOTED(PORTABLE, 1, Define if building portable version)
@@ -183,8 +206,12 @@
 PREFIXFLAGS=" -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\""
 )
 
-CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
-CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
+dnl HACK: using undocumented variable to check whether it's safe to define __EXTENSIONS__
+test $ac_cv_safe_to_define___extensions__ = yes && CFLAGS_EXTENSIONS="-D__EXTENSIONS__"
+
+CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
+CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
+
 
 AS_IF(test "${enable_staticlink}" != "no", 
 HAVE_ZLIB=yes
@@ -210,36 +237,50 @@
 
 AS_IF(test "${enable_gtk3}" = "yes", 
 AS_IF(test "${enable_staticlink}" != "no", 
- GTK3_DEPS_CFLAGS="-I../../${LIB}/gtk-3.0.0/include/gtk-3.0 -I../../${LIB}/gtk-3.0.0/include/pango-1.0 -I../../${LIB}/gtk-3.0.0/include/gio-unix-2.0/ -I../../${LIB}/gtk-3.0.0/include/atk-1.0 -I../../${LIB}/gtk-3.0.0/include/cairo -I../../${LIB}/gtk-3.0.0/include/gdk-pixbuf-2.0 -I../../${LIB}/gtk-3.0.0/include/freetype2 -I../../${LIB}/gtk-3.0.0/include/glib-2.0 -I../../${LIB}/gtk-3.0.0/lib/glib-2.0/include"
- GTK3_DEPS_LIBS="-L${GTK_ROOT_300}/lib -lgtk-3 -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+ GTK3_DEPS_CFLAGS="${GTK3_310_CFLAGS}"
+ GTK3_DEPS_LIBS="${GTK3_310_LIBS}"
 AC_SUBST(GTK3_DEPS_CFLAGS)
 AC_SUBST(GTK3_DEPS_LIBS)
 HAVE_GTK3=yes
 , 
- PKG_CHECK_MODULES(GTK3_DEPS, gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0, HAVE_GTK3=yes, HAVE_GTK3=no)
+ PKG_CHECK_MODULES(GTK3_DEPS, gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0 gio-2.0, HAVE_GTK3=yes, HAVE_GTK3=no)
 )
-dnl AC_CHECK_LIB(SM, main, HAVE_SM=yes;SM_LIBS="-lSM";AC_SUBST(SM_LIBS))
-dnl AC_CHECK_LIB(ICE, main, HAVE_ICE=yes;ICE_LIBS="-lICE";AC_SUBST(ICE_LIBS))
- if test "$OS_OSX" = "yes"; then
- PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration)
- AC_SUBST(GTK_MAC_LIBS)
- AC_SUBST(GTK_MAC_CFLAGS)
- fi
- 
+ AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 , 
 HAVE_GTK3=no
 )
 AM_CONDITIONAL(OS_OSX, test "x$OS_OSX" = "xyes")
 
+
+AS_IF(test "${enable_gtk2}" = "yes" -o "${enable_gtk3}" = "yes" -o "${enable_shellexec}" = "yes", 
+ AS_IF(test "${enable_staticlink}" != "no", 
+ JANSSON_CFLAGS="-I../../$LIB/include"
+ JANSSON_LIBS=-ljansson
+ AC_SUBST(JANSSON_CFLAGS)
+ AC_SUBST(JANSSON_LIBS)
+ , 
+ PKG_CHECK_MODULES(JANSSON, jansson)
+ )
+)
+
+AS_IF(test "${enable_staticlink}" != "no", 
+ , 
+ AC_CHECK_LIB(dispatch, main, HAVE_DISPATCH=yes)
+)
+DISPATCH_CFLAGS=-fblocks
+DISPATCH_LIBS="-ldispatch -lBlocksRuntime"
+AC_SUBST(DISPATCH_CFLAGS)
+AC_SUBST(DISPATCH_LIBS)
+
 AS_IF(test "${enable_gtk2}" = "yes", 
 AS_IF(test "${enable_staticlink}" != "no", 
- GTK2_DEPS_CFLAGS="-I${GTK_ROOT_216}/include/gtk-2.0 -I${GTK_ROOT_216}/lib/gtk-2.0/include -I${GTK_ROOT_216}/include/atk-1.0 -I${GTK_ROOT_216}/include/cairo -I${GTK_ROOT_216}/include/pango-1.0 -I${GTK_ROOT_216}/include -I${GTK_ROOT_216}/include/glib-2.0 -I${GTK_ROOT_216}/lib/glib-2.0/include"
- GTK2_DEPS_LIBS="-L${GTK_ROOT_216}/lib -lgtk-x11-2.0 -lpango-1.0 -lcairo -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0"
+ GTK2_DEPS_CFLAGS="${GTK2_216_CFLAGS}"
+ GTK2_DEPS_LIBS="${GTK2_216_LIBS}"
 AC_SUBST(GTK2_DEPS_CFLAGS)
 AC_SUBST(GTK2_DEPS_LIBS)
 HAVE_GTK2=yes
 , 
- PKG_CHECK_MODULES(GTK2_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK2=yes, HAVE_GTK2=no)
+ PKG_CHECK_MODULES(GTK2_DEPS, gtk+-2.0 >= 2.16 gthread-2.0 glib-2.0, HAVE_GTK2=yes, HAVE_GTK2=no)
 )
 dnl AC_CHECK_LIB(SM, main, HAVE_SM=yes;SM_LIBS="-lSM";AC_SUBST(SM_LIBS))
 dnl AC_CHECK_LIB(ICE, main, HAVE_ICE=yes;ICE_LIBS="-lICE";AC_SUBST(ICE_LIBS))
@@ -285,7 +326,7 @@
 AS_IF(test "${enable_staticlink}" != "no", 
 HAVE_DBUS=yes
 DBUS_DEPS_LIBS="../../$LIB/lib/libdbus-1.a ../../$LIB/lib/libexpat.a -lrt"
- DBUS_DEPS_CFLAGS="-I../../$LIB/include/dbus-1"
+ DBUS_DEPS_CFLAGS="-I../../$LIB/include/dbus-1.0 -I../../$LIB/lib/dbus-1.0/include/"
 AC_SUBST(DBUS_DEPS_LIBS)
 , 
 PKG_CHECK_MODULES(DBUS_DEPS, dbus-1, HAVE_DBUS=yes, HAVE_DBUS=no)
@@ -296,13 +337,29 @@
 HAVE_PULSE=yes
 PULSE_DEPS_LIBS="-lpulse-simple"
 PULSE_DEPS_CFLAGS="-I../../$LIB/include/"
- AC_SUBST(DBUS_DEPS_CFLAGS)
- AC_SUBST(DBUS_DEPS_LIBS)
+ AC_SUBST(PULSE_DEPS_CFLAGS)
+ AC_SUBST(PULSE_DEPS_LIBS)
 , 
 PKG_CHECK_MODULES(PULSE_DEPS, libpulse-simple, HAVE_PULSE=yes, HAVE_PULSE=no)
 )
 )
 
+AS_IF(test "${enable_pipewire}" != "no", 
+ AS_IF(test "${enable_staticlink}" != "no", 
+ HAVE_PIPEWIRE=yes
+ PIPEWIRE_DEPS_LIBS="-lpipewire-0.3"
+ PIPEWIRE_DEPS_CFLAGS="-D_REENTRANT -I../../$LIB/include/pipewire-0.3 -I../../$LIB/include/spa-0.2"
+ AC_SUBST(PIPEWIRE_DEPS_CFLAGS)
+ AC_SUBST(PIPEWIRE_DEPS_LIBS)
+ , 
+ PKG_CHECK_MODULES(PIPEWIRE_DEPS, libpipewire-0.3, HAVE_PIPEWIRE=yes, HAVE_PIPEWIRE=no)
+ )
+)
+
+AS_IF(test "${enable_libretro}" != "no", 
+ HAVE_LIBRETRO=yes
+)
+
 AC_CHECK_HEADER(iconv.h,,iconv.h not found.)
 
 AC_CHECK_LIB(iconv, main, have_iconv=yes, have_iconv=no)
@@ -312,7 +369,7 @@
 AC_DEFINE(HAVE_LIBICONV,1,Use libiconv instead of glibc iconv)
 )
 
-AX_CHECK_COMPILER_FLAGS(-msse2, HAVE_SSE2=1, )
+AX_CHECK_COMPILER_FLAGS(-msse2, HAVE_SSE2=1, , -Werror)
 AS_IF(test "${HAVE_SSE2}", 
 AC_DEFINE(HAVE_SSE2,1,Support SSE2 instructions)
 )
@@ -320,7 +377,7 @@
 dnl curl lib
 AS_IF(test "${enable_staticlink}" != "no", 
 HAVE_CURL=yes
- CURL_LIBS="../../$LIB/lib/libcurl.a -lrt"
+ CURL_LIBS="-lpthread -lrt -lcurl ../../$LIB/lib/libz.a"
 CURL_CFLAGS="-I../../$LIB/include"
 AC_SUBST(CURL_LIBS)
 AC_SUBST(CURL_CFLAGS)
@@ -330,22 +387,41 @@
 AC_SUBST(CURL_LIBS)
 )
 
-dnl mpgmad plugin
+dnl mpg3 plugin
 
-AS_IF(test "${enable_mpgmad}" != "no", 
+AS_IF(test "${enable_mp3}" != "no", 
 AS_IF(test "${enable_staticlink}" != "no", 
- HAVE_MPGMAD=yes
+ HAVE_MP3=yes
+ HAVE_LIBMAD=yes
 MAD_CFLAGS="-I../../$LIB/include"
 MAD_LIBS="../../$LIB/lib/libmad.a"
 AC_SUBST(MAD_CFLAGS)
 AC_SUBST(MAD_LIBS)
+ HAVE_LIBMPG123=yes
+ MPG123_CFLAGS="-I../../$LIB/include"
+ MPG123_LIBS="../../$LIB/lib/libmpg123.a"
+ AC_SUBST(MPG123_CFLAGS)
+ AC_SUBST(MPG123_LIBS)
 , 
- AC_CHECK_LIB(mad, main, HAVE_LIBMAD=yes)
+ AS_IF(test "${enable_libmad}" != "no", 
+ AC_CHECK_LIB(mad, main, HAVE_LIBMAD=yes)
+ )
+ AS_IF(test "${enable_libmpg123}" != "no", 
+ AC_CHECK_LIB(mpg123, main, HAVE_LIBMPG123=yes)
+ )
+ HAVE_MP3=yes
 AS_IF(test "${HAVE_LIBMAD}" = "yes", 
- HAVE_MPGMAD=yes
 MAD_LIBS="-lmad"
 AC_SUBST(MAD_LIBS)
 )
+ AS_IF(test "${HAVE_LIBMPG123}" = "yes", 
+ MPG123_LIBS="-lmpg123"
+ AC_SUBST(MPG123_LIBS)
+ )
+ AS_IF(test "${HAVE_LIBMAD}" != "yes" -a "${HAVE_LIBMPG123}" != "yes", 
+ echo "MP3 plugin is disabled: can't find either libmad of libmpg123"
+ HAVE_MP3=no
+ )
 )
 )
 
@@ -368,6 +444,23 @@
 )
 )
 
+dnl opus plugin
+AS_IF(test "${enable_opus}" != "no", 
+ AS_IF(test "${enable_staticlink}" != "no", 
+ HAVE_OPUSPLUGIN=yes
+ OPUS_LIBS="-lopusfile -lopus -lm -logg"
+ OPUS_CFLAGS="-I../../$LIB/include -I../../$LIB/include/opus"
+ AC_SUBST(OPUS_LIBS)
+ AC_SUBST(OPUS_CFLAGS)
+ , 
+ PKG_CHECK_MODULES(OPUS, opusfile, HAVE_OPUS=yes, HAVE_OPUS=no)
+ AS_IF(test "$HAVE_OPUS" = "yes", 
+ HAVE_OPUSPLUGIN=yes
+ AC_SUBST(OPUS_CFLAGS)
+ AC_SUBST(OPUS_LIBS)
+ )
+ )
+)
 dnl libogg for oggedit
 AS_IF(test "${enable_staticlink}" != "no", 
 HAVE_OGG=yes
@@ -378,7 +471,6 @@
 , 
 AC_CHECK_LIB(ogg, main, HAVE_OGG=yes)
 AS_IF(test "$HAVE_OGG" = "yes", 
- HAVE_VORBISPLUGIN=yes
 OGG_LIBS="-logg"
 AC_SUBST(OGG_LIBS)
 )
@@ -444,10 +536,6 @@
 AS_IF(test "${enable_vfs_curl}" != "no", 
 AS_IF(test "${HAVE_CURL}" = "yes", 
 HAVE_VFS_CURL=yes
- VFS_CURL_LIBS="$CURL_LIBS"
- AC_SUBST(VFS_CURL_LIBS)
- VFS_CURL_CFLAGS="$CURL_CFLAGS"
- AC_SUBST(VFS_CURL_CFLAGS)
 )
 )
 
@@ -455,8 +543,8 @@
 AS_IF(test "${enable_cdda}" != "no", 
 AS_IF(test "${enable_staticlink}" != "no", 
 HAVE_CDDAPLUGIN=yes
- CDDA_LIBS="../../$LIB/lib/libcdio.a ../../$LIB/lib/libudf.a ../../$LIB/lib/libiso9660.a ../../$LIB/lib/libcddb.a"
- CDDA_CFLAGS="-I../../$LIB/include"
+ CDDA_LIBS="../../$LIB/lib/libcdio.a ../../$LIB/lib/libcdio_cdda.a ../../$LIB/lib/libcdio_paranoia.a ../../$LIB/lib/libudf.a ../../$LIB/lib/libiso9660.a ../../$LIB/lib/libcddb.a"
+ CDDA_CFLAGS="-I../../$LIB/include -DUSE_PARANOIA -DUSE_PARANOIA_10_2"
 AC_SUBST(CDDA_LIBS)
 AC_SUBST(CDDA_CFLAGS)
 , 
@@ -464,7 +552,16 @@
 AC_CHECK_LIB(cddb, main, HAVE_CDDB=yes)
 AS_IF(test "${HAVE_CDIO}" = "yes" -a "${HAVE_CDDB}" = "yes", 
 HAVE_CDDAPLUGIN=yes
- CDDA_LIBS="-lcdio -lcddb"
+ AC_CHECK_LIB(cdda_interface, main, HAVE_CDDA_INTERFACE=yes)
+ AC_CHECK_LIB(cdda_paranoia, main, HAVE_CDDA_PARANOIA=yes)
+ AS_IF(test "${enable_cdda_paranoia}" != "no" -a "${HAVE_CDDA_INTERFACE}" = "yes" -a "${HAVE_CDDA_PARANOIA}" = "yes", 
+ CDDA_CFLAGS="-DUSE_PARANOIA"
+ AC_CHECK_HEADER(cdda/cdda_interface.h, CDDA_CFLAGS="-DUSE_CDDA_SUBDIR $CDDA_CFLAGS")
+ AC_SUBST(CDDA_CFLAGS)
+ CDDA_LIBS="-lcdio -lcdda_interface -lcdda_paranoia -lcddb"
+ , 
+ CDDA_LIBS="-lcdio -lcddb"
+ )
 AC_SUBST(CDDA_LIBS)
 )
 )
@@ -520,7 +617,7 @@
 for i in `cat /etc/oss.conf`; do
 t=`echo $i | sed -e 's/OSSLIBDIR=//'`
 AS_IF(test "${i}" != "${t}", 
- AS_IF(test -f "${t}/include/sys/soundcard.h" -o -f "${i}/include/soundcard.h", 
+ AS_IF(test -f "${t}/include/sys/soundcard.h", 
 OSS_CFLAGS="-I$t/include/sys"
 AC_MSG_RESULT($OSS_CFLAGS)
 have_oss=yes
@@ -555,6 +652,12 @@
 )
 )
 
+AS_IF(test "${enable_pipewire}" != "no", 
+ AS_IF(test "${HAVE_PIPEWIRE}" = "yes", 
+ HAVE_PIPEWIRE_PLUGIN=yes
+ )
+)
+
 dnl lastfm plugin
 AS_IF(test "${enable_lfm}" != "no", 
 AS_IF(test "${HAVE_CURL}" = "yes" -a "${enable_lastfm}" != "no", 
@@ -574,37 +677,12 @@
 )
 
 AS_IF(test "${enable_artwork}" != "no", 
- AS_IF(test "${enable_staticlink}" != "no", 
- HAVE_JPEG=yes
- JPEG_DEPS_LIBS="../../$LIB/lib/libjpeg.a"
- JPEG_DEPS_CFLAGS="-I../../$LIB/include"
- AC_SUBST(JPEG_DEPS_CFLAGS)
- AC_SUBST(JPEG_DEPS_LIBS)
- HAVE_PNG=yes
- PNG_DEPS_CFLAGS="-I../../$LIB/include/libpng15"
- PNG_DEPS_LIBS="../../$LIB/lib/libpng.a ../../$LIB/lib/libz.a"
- AC_SUBST(PNG_DEPS_CFLAGS)
- AC_SUBST(PNG_DEPS_LIBS)
- HAVE_IMLIB2=no
- , 
- AS_IF(test "${enable_artwork_imlib2}" != "no", 
- PKG_CHECK_MODULES(IMLIB2_DEPS, imlib2, HAVE_IMLIB2=yes, HAVE_IMLIB2=no)
- )
-
- AS_IF(test "${enable_artwork_imlib2}" = "no" -o "${HAVE_IMLIB2}" = "no", 
- AC_CHECK_LIB(jpeg, main, HAVE_JPEG=yes;JPEG_DEPS_LIBS="-ljpeg";AC_SUBST(JPEG_DEPS_LIBS))
- AC_CHECK_LIB(png, main, HAVE_PNG=yes;PNG_DEPS_LIBS="-lpng -lz";AC_SUBST(PNG_DEPS_LIBS))
- )
- )
-
 AS_IF(test "${enable_artwork_network}" = "yes", 
 ARTWORK_USE_VFS_CURL=yes
 )
 
 AS_IF(test "${HAVE_VFS_CURL}" = "yes" -o "${enable_artwork_network}" = "no" , 
- AS_IF(test "${HAVE_JPEG}" = "yes" -o "${HAVE_IMLIB2}" = "yes", 
- HAVE_ARTWORK=yes
- )
+ HAVE_ARTWORK=yes
 )
 )
 
@@ -649,7 +727,7 @@
 HAVE_VTX=yes
 )
 
-AS_IF(test "${enable_gme}" != "no", 
+AS_IF(test "${enable_gme}" != "no" -a "${HAVE_ZLIB}" = "yes", 
 HAVE_GME=yes
 )
 
@@ -716,10 +794,6 @@
 )
 )
 
-dnl AS_IF(test "${enable_medialib}" != "no", 
-dnl HAVE_MEDIALIB=yes
-dnl )
-
 AS_IF(test "${enable_dumb}" != "no", 
 HAVE_DUMB=yes
 )
@@ -728,7 +802,7 @@
 HAVE_SHN=yes
 )
 
-AS_IF(test "${enable_psf}" != "no", 
+AS_IF(test "${enable_psf}" != "no" -a "${HAVE_ZLIB}" = "yes", 
 HAVE_PSF=yes
 )
 
@@ -748,21 +822,49 @@
 HAVE_PLTBROWSER=yes
 )
 
-PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser 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/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio"
+AS_IF(test "${enable_sc68}" != "no" -a "${HAVE_ZLIB}" = "yes", 
+ HAVE_SC68=yes
+)
+
+dnl AS_IF(test "${enable_statusnotifier}" != "no", 
+dnl echo "Checking statusnotifier deps..."
+dnl AS_IF(test "${enable_staticlink}" != "no", 
+dnl HAVE_STATUSNOTIFIER=yes
+dnl STATUSNOTIFIER_DEPS_CFLAGS="${GTK3_310_CFLAGS}"
+dnl STATUSNOTIFIER_DEPS_LIBS="${GTK3_310_LIBS}"
+dnl AC_SUBST(STATUSNOTIFIER_DEPS_CFLAGS)
+dnl AC_SUBST(STATUSNOTIFIER_DEPS_LIBS)
+dnl , 
+dnl PKG_CHECK_MODULES(STATUSNOTIFIER_DEPS, glib-2.0 >= 2.26 gio-2.0 gdk-pixbuf-2.0, HAVE_STATUSNOTIFIER=yes, HAVE_STATUSNOTIFIER=no)
+dnl )
+dnl )
+
+AS_IF(test "${enable_rgscanner}" != "no", 
+ HAVE_RGSCANNER=yes
+)
+
+AS_IF(test "${enable_soundtouch}" != "no", 
+ HAVE_SOUNDTOUCH=yes
+)
+
+PLUGINS_DIRS="plugins/liboggedit plugins/libparser plugins/lastfm plugins/mp3 plugins/vorbis plugins/opus 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/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/psf plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sc68 plugins/rg_scanner plugins/soundtouch"
 
 AM_CONDITIONAL(APE_USE_YASM, test "x$APE_USE_YASM" = "xyes")
 AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_OPUS, test "x$HAVE_OPUSPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_OGG, test "x$HAVE_OGG" = "xyes")
 AM_CONDITIONAL(HAVE_OGG_STREAM_FLUSH_FILL, test "x$HAVE_OGG_STREAM_FLUSH_FILL" = "xyes")
 AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACKPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_SNDFILE, test "x$HAVE_SNDFILEPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_CDDA, test "x$HAVE_CDDAPLUGIN" = "xyes")
+AM_CONDITIONAL(USE_CDPARANOIA, test "x$HAVE_CDDAPLUGIN" = "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_COREAUDIO, test "x$HAVE_COREAUDIO" = "xyes")
 AM_CONDITIONAL(HAVE_FFMPEG, test "x$HAVE_FFMPEGPLUGIN" = "xyes")
+AM_CONDITIONAL(HAVE_PIPEWIRE, test "x$HAVE_PIPEWIRE_PLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_PULSE, test "x$HAVE_PULSEPLUGIN" = "xyes")
 AM_CONDITIONAL(HAVE_ARTWORK, test "x$HAVE_ARTWORK" = "xyes")
 AM_CONDITIONAL(ARTWORK_USE_VFS_CURL, test "x$ARTWORK_USE_VFS_CURL" = "xyes")
@@ -772,10 +874,13 @@
 AM_CONDITIONAL(HAVE_NULLOUT, test "x$HAVE_NULLOUT" = "xyes")
 AM_CONDITIONAL(HAVE_VTX, test "x$HAVE_VTX" = "xyes")
 AM_CONDITIONAL(HAVE_GME, test "x$HAVE_GME" = "xyes")
+AM_CONDITIONAL(HAVE_LIBRETRO, test "x$HAVE_LIBRETRO" = "xyes")
 AM_CONDITIONAL(HAVE_LASTFM, test "x$HAVE_LASTFM" = "xyes")
 AM_CONDITIONAL(HAVE_VFS_CURL, test "x$HAVE_VFS_CURL" = "xyes")
 AM_CONDITIONAL(HAVE_HOTKEYS, test "x$HAVE_HOTKEYS" = "xyes")
-AM_CONDITIONAL(HAVE_MPGMAD, test "x$HAVE_MPGMAD" = "xyes")
+AM_CONDITIONAL(HAVE_MP3, test "x$HAVE_MP3" = "xyes")
+AM_CONDITIONAL(HAVE_LIBMAD, test "x$HAVE_LIBMAD" = "xyes")
+AM_CONDITIONAL(HAVE_LIBMPG123, test "x$HAVE_LIBMPG123" = "xyes")
 AM_CONDITIONAL(HAVE_OSS, test "x$HAVE_OSS" = "xyes")
 AM_CONDITIONAL(HAVE_SUPEREQ, test "x$HAVE_SUPEREQ" = "xyes")
 AM_CONDITIONAL(HAVE_NOTIFY, test "x$HAVE_NOTIFY" = "xyes")
@@ -791,11 +896,7 @@
 AM_CONDITIONAL(HAVE_M3U, test "x$HAVE_M3U" = "xyes")
 AM_CONDITIONAL(HAVE_VFS_ZIP, test "x$HAVE_VFS_ZIP" = "xyes")
 AM_CONDITIONAL(HAVE_CONVERTER, test "x$HAVE_CONVERTER" = "xyes")
-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")
-dnl AM_CONDITIONAL(HAVE_MEDIALIB, test "x$HAVE_MEDIALIB" = "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")
@@ -805,98 +906,39 @@
 AM_CONDITIONAL(HAVE_ALAC, test "x$HAVE_ALAC" = "xyes")
 AM_CONDITIONAL(HAVE_WMA, test "x$HAVE_WMA" = "xyes")
 AM_CONDITIONAL(HAVE_PLTBROWSER, test "x$HAVE_PLTBROWSER" = "xyes")
+AM_CONDITIONAL(HAVE_SC68, test "x$HAVE_SC68" = "xyes")
 AM_CONDITIONAL(STATICLINK, test "x$STATICLINK" = "xyes")
 AM_CONDITIONAL(PORTABLE, test "x$PORTABLE" = "xyes")
 AM_CONDITIONAL(PORTABLE_FULL, test "x$PORTABLE_FULL" = "xyes")
 AM_CONDITIONAL(USE_ABSTRACT_SOCKET_NAME, test "x$USE_ABSTRACT_SOCKET_NAME" = "xyes")
+AM_CONDITIONAL(HAVE_SSE2, test "${HAVE_SSE2}")
+dnl AM_CONDITIONAL(HAVE_STATUSNOTIFIER, test "x$HAVE_STATUSNOTIFIER" = "xyes")
+AM_CONDITIONAL(HAVE_RGSCANNER, test "x$HAVE_RGSCANNER" = "xyes")
+AM_CONDITIONAL(HAVE_SOUNDTOUCH, test "x$HAVE_SOUNDTOUCH" = "xyes")
 
 AC_SUBST(PLUGINS_DIRS)
 
-AS_IF(test "${USE_MAINTAINER_MODE}" = "yes", 
-echo
-echo "Build Configuration:"
-echo
-echo "* Maintainer Mode: $USE_MAINTAINER_MODE"
-)
-
-dnl print summary
-echo
-echo "Plugin Summary:"
-echo
-
-AC_DEFUN(PRINT_PLUGIN_INFO,
- 
- if $3 ; then
- echo " $1: yes - $2"
- else
- echo " $1: no - $2"
- fi
- 
-)
-
-PRINT_PLUGIN_INFO(stdio,Standard IO plugin,true)
-PRINT_PLUGIN_INFO(gme,chiptune music player based on GME,test "x$HAVE_GME" = "xyes")
-PRINT_PLUGIN_INFO(nullout,NULL output,test "x$HAVE_NULLOUT" = "xyes")
-PRINT_PLUGIN_INFO(alsa,ALSA output,test "x$HAVE_ALSA" = "xyes")
-PRINT_PLUGIN_INFO(oss,oss output plugin,test "x$HAVE_OSS" = "xyes")
-PRINT_PLUGIN_INFO(pulse,PulseAudio output plugin,test "x$HAVE_PULSEPLUGIN" = "xyes")
-PRINT_PLUGIN_INFO(coreaudio,CoreAudio output plugin,test "x$HAVE_COREAUDIO" = "xyes")
-PRINT_PLUGIN_INFO(sid,SID player based on libsidplay2,test "x$HAVE_SID" = "xyes")
-PRINT_PLUGIN_INFO(ffap,Monkey's audio (APE) decoder,test "x$HAVE_FFAP" = "xyes")
-PRINT_PLUGIN_INFO(lastfm,last.fm scrobbler,test "x$HAVE_LASTFM" = "xyes")
-PRINT_PLUGIN_INFO(mpgmad,mpeg player based on libmad,test "x$HAVE_MPGMAD" = "xyes")
-PRINT_PLUGIN_INFO(vorbis,ogg vorbis player,test "x$HAVE_VORBISPLUGIN" = "xyes")
-PRINT_PLUGIN_INFO(flac,flac player,test "x$HAVE_FLACPLUGIN" = "xyes")
-PRINT_PLUGIN_INFO(wavpack,wavpack player,test "x$HAVE_WAVPACKPLUGIN" = "xyes")
-PRINT_PLUGIN_INFO(sndfile,PCM (wav,aiff,etc) player based on libsndfile,test "x$HAVE_SNDFILEPLUGIN" = "xyes")
-PRINT_PLUGIN_INFO(vtx,vtx file player (ay8910/12 emulation),test "x$HAVE_VTX" = "xyes")
-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,GTK2 user interface,test "x$HAVE_GTK2" = "xyes")
-PRINT_PLUGIN_INFO(gtkui3,GTK3 user interface,test "x$HAVE_GTK3" = "xyes")
-PRINT_PLUGIN_INFO(hotkeys,Local and global hotkeys support,test "x$HAVE_HOTKEYS" = "xyes")
-PRINT_PLUGIN_INFO(ffmpeg,ffmpeg codecs,test "x$HAVE_FFMPEGPLUGIN" = "xyes")
-PRINT_PLUGIN_INFO(artwork,Cover art plugin,test "x$HAVE_ARTWORK" = "xyes")
-PRINT_PLUGIN_INFO(supereq,Equalizer based on Super EQ library by Naoki Shibata,test "x$HAVE_SUPEREQ" = "xyes")
-PRINT_PLUGIN_INFO(notify,notification-daemon support plugin,test "x$HAVE_NOTIFY" = "xyes")
-PRINT_PLUGIN_INFO(shellexec,shell commands plugin,test "x$HAVE_SHELLEXEC" = "xyes")
-PRINT_PLUGIN_INFO(shellexecui,GTK user interface for setting up shellexec plugin,test "x$HAVE_SHELLEXECUI" = "xyes")
-PRINT_PLUGIN_INFO(musepack,musepack player plugin,test "x$HAVE_MUSEPACK" = "xyes")
-PRINT_PLUGIN_INFO(wildmidi,WildMidi player plugin,test "x$HAVE_WILDMIDI" = "xyes")
-PRINT_PLUGIN_INFO(tta,TTA player plugin,test "x$HAVE_TTA" = "xyes")
-PRINT_PLUGIN_INFO(dca,libdca (DTS Audio) player plugin,test "x$HAVE_DCA" = "xyes")
-PRINT_PLUGIN_INFO(aac,AAC player (m4a, aac, mp4) based on FAAD2,test "x$HAVE_AAC" = "xyes")
-PRINT_PLUGIN_INFO(mms,mms streaming support,test "x$HAVE_MMS" = "xyes")
-PRINT_PLUGIN_INFO(dsp_src,High quality samplerate conversion using libsamplerate,test "x$HAVE_DSP_SRC" = "xyes")
-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")
-dnl PRINT_PLUGIN_INFO(medialib,media library support plugin,test "x$HAVE_MEDIALIB" = "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")
-PRINT_PLUGIN_INFO(alac,ALAC plugin,test "x$HAVE_ALAC" = "xyes")
-PRINT_PLUGIN_INFO(wma,WMA plugin,test "x$HAVE_WMA" = "xyes")
-PRINT_PLUGIN_INFO(pltbrowser,playlist browser gui plugin,test "x$HAVE_PLTBROWSER" = "xyes")
-
-echo
-
 AC_CONFIG_FILES(
 Makefile
+src/Makefile
+shared/Makefile
+shared/analyzer/Makefile
+shared/scope/Makefile
+external/Makefile
+external/ddb_dsp_libretro/Makefile
+external/ddb_output_pw/Makefile
 pixmaps/Makefile
 icons/Makefile
 plugins/liboggedit/Makefile
-plugins/libmp4ff/Makefile
 plugins/libparser/Makefile
 plugins/gme/Makefile
 plugins/alsa/Makefile
 plugins/hotkeys/Makefile
 plugins/lastfm/Makefile
 plugins/ffap/Makefile
-plugins/mpgmad/Makefile
+plugins/mp3/Makefile
 plugins/vorbis/Makefile
+plugins/opus/Makefile
 plugins/flac/Makefile
 plugins/wavpack/Makefile
 plugins/sndfile/Makefile
@@ -925,17 +967,99 @@
 plugins/vfs_zip/Makefile
 plugins/converter/Makefile
 plugins/dumb/Makefile
-plugins/ao/Makefile
+plugins/psf/Makefile
 plugins/shn/Makefile
 plugins/mono2stereo/Makefile
 plugins/shellexecui/Makefile
 plugins/alac/Makefile
 plugins/wma/Makefile
 plugins/pltbrowser/Makefile
+plugins/sc68/Makefile
 plugins/coreaudio/Makefile
-intl/Makefile
+plugins/rg_scanner/Makefile
+plugins/soundtouch/Makefile
 po/Makefile.in
+intl/Makefile
 deadbeef.desktop
 )
 
 AC_OUTPUT
+
+AS_IF(test "${USE_MAINTAINER_MODE}" = "yes", 
+echo
+echo "Build Configuration:"
+echo
+echo "* Maintainer Mode: $USE_MAINTAINER_MODE"
+)
+
+dnl print summary
+echo
+echo "Plugin Summary:"
+echo
+
+AC_DEFUN(PRINT_PLUGIN_INFO,
+ 
+ if $3 ; then
+ echo " $1: yes - $2"
+ else
+ echo " $1: no - $2"
+ fi
+ 
+)
+
+PRINT_PLUGIN_INFO(aac,AAC player (m4a, aac, mp4) based on FAAD2,test "x$HAVE_AAC" = "xyes")
+PRINT_PLUGIN_INFO(adplug,adplug player (OPL2/OPL3 emulation),test "x$HAVE_ADPLUG" = "xyes")
+PRINT_PLUGIN_INFO(alac,ALAC plugin,test "x$HAVE_ALAC" = "xyes")
+PRINT_PLUGIN_INFO(alsa,ALSA output,test "x$HAVE_ALSA" = "xyes")
+PRINT_PLUGIN_INFO(artwork,Cover art plugin,test "x$HAVE_ARTWORK" = "xyes")
+PRINT_PLUGIN_INFO(cdda,cd audio player,test "x$HAVE_CDDAPLUGIN" = "xyes")
+PRINT_PLUGIN_INFO(converter,plugin for converting files to any formats,test "x$HAVE_CONVERTER" = "xyes")
+PRINT_PLUGIN_INFO(coreaudio,CoreAudio output plugin,test "x$HAVE_COREAUDIO" = "xyes")
+PRINT_PLUGIN_INFO(dca,libdca (DTS Audio) player plugin,test "x$HAVE_DCA" = "xyes")
+PRINT_PLUGIN_INFO(dsp_src,High quality samplerate conversion using libsamplerate,test "x$HAVE_DSP_SRC" = "xyes")
+PRINT_PLUGIN_INFO(dumb,DUMB module plugin, for MOD, S3M, etc,test "x$HAVE_DUMB" = "xyes")
+PRINT_PLUGIN_INFO(ffap,Monkey's audio (APE) decoder,test "x$HAVE_FFAP" = "xyes")
+PRINT_PLUGIN_INFO(ffmpeg,ffmpeg codecs,test "x$HAVE_FFMPEGPLUGIN" = "xyes")
+PRINT_PLUGIN_INFO(flac,flac player,test "x$HAVE_FLACPLUGIN" = "xyes")
+PRINT_PLUGIN_INFO(gme,chiptune music player based on GME,test "x$HAVE_GME" = "xyes")
+PRINT_PLUGIN_INFO(gtkui3,GTK3 user interface,test "x$HAVE_GTK3" = "xyes")
+PRINT_PLUGIN_INFO(gtkui,GTK2 user interface,test "x$HAVE_GTK2" = "xyes")
+PRINT_PLUGIN_INFO(hotkeys,Local and global hotkeys support,test "x$HAVE_HOTKEYS" = "xyes")
+PRINT_PLUGIN_INFO(lastfm,last.fm scrobbler,test "x$HAVE_LASTFM" = "xyes")
+PRINT_PLUGIN_INFO(libretro,Libretro resampler plugin,test "x$HAVE_LIBRETRO" = "xyes")
+PRINT_PLUGIN_INFO(m3u,M3U and PLS playlist support,test "x$HAVE_M3U" = "xyes")
+PRINT_PLUGIN_INFO(mms,mms streaming support,test "x$HAVE_MMS" = "xyes")
+PRINT_PLUGIN_INFO(mono2stereo,mono2stereo DSP plugin,test "x$HAVE_MONO2STEREO" = "xyes")
+PRINT_PLUGIN_INFO(mp3,mp3 plugin,test "x$HAVE_MP3" = "xyes")
+PRINT_PLUGIN_INFO( libmad,libmad backend for mp3 plugin,test "x$HAVE_LIBMAD" = "xyes")
+PRINT_PLUGIN_INFO( libmpg123,libmpg123 backend for mp3 plugin,test "x$HAVE_LIBMPG123" = "xyes")
+PRINT_PLUGIN_INFO(musepack,musepack player plugin,test "x$HAVE_MUSEPACK" = "xyes")
+PRINT_PLUGIN_INFO(notify,notification-daemon support plugin,test "x$HAVE_NOTIFY" = "xyes")
+PRINT_PLUGIN_INFO(nullout,NULL output,test "x$HAVE_NULLOUT" = "xyes")
+PRINT_PLUGIN_INFO(opus,ogg opus player,test "x$HAVE_OPUSPLUGIN" = "xyes")
+PRINT_PLUGIN_INFO(oss,oss output plugin,test "x$HAVE_OSS" = "xyes")
+PRINT_PLUGIN_INFO(pltbrowser,playlist browser gui plugin,test "x$HAVE_PLTBROWSER" = "xyes")
+PRINT_PLUGIN_INFO(psf,PSF player, using Audio Overload SDK,test "x$HAVE_PSF" = "xyes")
+PRINT_PLUGIN_INFO(pipewire,Pipewire output plugin,test "x$HAVE_PIPEWIRE_PLUGIN" = "xyes")
+PRINT_PLUGIN_INFO(pulse,PulseAudio output plugin,test "x$HAVE_PULSEPLUGIN" = "xyes")
+PRINT_PLUGIN_INFO(rgscanner,plugin for ReplayGain scanner support,test "x$HAVE_RGSCANNER" = "xyes")
+PRINT_PLUGIN_INFO(sc68,sc68 Atari ST And Amiga player,test "x$HAVE_SC68" = "xyes")
+PRINT_PLUGIN_INFO(shellexec,shell commands plugin,test "x$HAVE_SHELLEXEC" = "xyes")
+PRINT_PLUGIN_INFO(shellexecui,GTK user interface for setting up shellexec plugin,test "x$HAVE_SHELLEXECUI" = "xyes")
+PRINT_PLUGIN_INFO(shn,SHN plugin based on xmms-shn,test "x$HAVE_SHN" = "xyes")
+PRINT_PLUGIN_INFO(sid,SID player based on libsidplay2,test "x$HAVE_SID" = "xyes")
+PRINT_PLUGIN_INFO(sndfile,PCM (wav,aiff,etc) player based on libsndfile,test "x$HAVE_SNDFILEPLUGIN" = "xyes")
+PRINT_PLUGIN_INFO(soundtouch,SoundTouch plugin used for time stretching and pitch shifting,test "x$HAVE_SOUNDTOUCH" = "xyes")
+PRINT_PLUGIN_INFO(stdio,Standard IO plugin,true)
+PRINT_PLUGIN_INFO(supereq,Equalizer based on Super EQ library by Naoki Shibata,test "x$HAVE_SUPEREQ" = "xyes")
+PRINT_PLUGIN_INFO(tta,TTA player plugin,test "x$HAVE_TTA" = "xyes")
+PRINT_PLUGIN_INFO(vfs_curl,http/ftp streaming support,test "x$HAVE_VFS_CURL" = "xyes")
+PRINT_PLUGIN_INFO(vfs_zip,zip archive support,test "x$HAVE_VFS_ZIP" = "xyes")
+PRINT_PLUGIN_INFO(vorbis,ogg vorbis player,test "x$HAVE_VORBISPLUGIN" = "xyes")
+PRINT_PLUGIN_INFO(vtx,vtx file player (ay8910/12 emulation),test "x$HAVE_VTX" = "xyes")
+PRINT_PLUGIN_INFO(wavpack,wavpack player,test "x$HAVE_WAVPACKPLUGIN" = "xyes")
+PRINT_PLUGIN_INFO(wildmidi,WildMidi player plugin,test "x$HAVE_WILDMIDI" = "xyes")
+PRINT_PLUGIN_INFO(wma,WMA plugin,test "x$HAVE_WMA" = "xyes")
+dnl PRINT_PLUGIN_INFO(statusnotifier,plugin for KDE tray icon support,test "x$HAVE_STATUSNOTIFIER" = "xyes")
+
+echo

deadbeef-0.6.2.tar.bz2/deadbeef.desktop -> deadbeef-1.9.6.tar.bz2/deadbeef.desktop Changed

@@ -1,62 +1,57 @@
 Desktop Entry
+Type=Application
 Name=DeaDBeeF
 GenericName=Audio Player
 GenericNamept_BR=Reprodutor de áudio
 GenericNameru=Аудио плеер
+GenericNamezh_CN=音频播放器
+GenericNamezh_TW=音樂播放器
 Comment=Listen to music
 Commentpt_BR=Escute músicas
 Commentru=Слушай музыку
+Commentzh_CN=倾听音乐
+Commentzh_TW=聆聽音樂
+Icon=deadbeef
 Exec=deadbeef %F
-MimeType=application/ogg;audio/x-vorbis+ogg;application/x-ogg;audio/mp3;audio/prs.sid;audio/x-flac;audio/mpeg;audio/x-mpeg;audio/x-mod;audio/x-it;audio/x-s3m;audio/x-xm;audio/x-mpegurl;audio/x-scpls;
-Categories=AudioVideo;Player;GTK;
 Terminal=false
-Type=Application
-Icon=deadbeef
-X-PulseAudio-Properties=media.role=music
-
-X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Next;Prev
-
-Play Shortcut Group
-Name=Play
-Exec=deadbeef --play
-TargetEnvironment=Unity
-
-Pause Shortcut Group
-Name=Pause
-Exec=deadbeef --pause
-TargetEnvironment=Unity
-
-Stop Shortcut Group
-Name=Stop
-Exec=deadbeef --stop
-TargetEnvironment=Unity
+Actions=Play;Pause;Toggle Pause;Stop;Next;Prev;
+MimeType=application/ogg;audio/x-vorbis+ogg;application/x-ogg;audio/mp3;audio/prs.sid;audio/x-flac;audio/mpeg;audio/x-mpeg;audio/x-mod;audio/x-it;audio/x-s3m;audio/x-xm;audio/x-mpegurl;audio/x-scpls;application/x-cue;
+Categories=Audio;AudioVideo;Player;GTK;
+Keywords=Sound;Music;Audio;Player;Musicplayer;MP3;
+Keywordszh_TW=Sound;Music;Audio;Player;Musicplayer;MP3;音樂;音樂播放器;播放器;音訊;
 
-Next Shortcut Group
-Name=Next
-Exec=deadbeef --next
-TargetEnvironment=Unity
-
-Prev Shortcut Group
-Name=Prev
-Exec=deadbeef --prev
-TargetEnvironment=Unity
+X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Next;Prev;
+X-PulseAudio-Properties=media.role=music
 
 Desktop Action Play
 Name=Play
+Namezh_CN=播放
+Namezh_TW=播放
 Exec=deadbeef --play
 
 Desktop Action Pause
 Name=Pause
+Namezh_CN=暂停
+Namezh_TW=暫停
 Exec=deadbeef --pause
 
+Desktop Action Toggle Pause
+Name=Toggle Pause
+Namezh_CN=播放/暂停
+Namezh_TW=播放/暫停
+Exec=deadbeef --toggle-pause
+
 Desktop Action Stop
 Name=Stop
+Namezh_TW=停止
 Exec=deadbeef --stop
 
 Desktop Action Next
 Name=Next
+Namezh_TW=下一首
 Exec=deadbeef --next
 
-Desktop Action Previous
+Desktop Action Prev
 Name=Prev
+Namezh_TW=上一首
 Exec=deadbeef --prev

deadbeef-0.6.2.tar.bz2/deadbeef.desktop.in -> deadbeef-1.9.6.tar.bz2/deadbeef.desktop.in Changed

deadbeef-0.6.2.tar.bz2/examples/decoder_template.c -> deadbeef-1.9.6.tar.bz2/examples/decoder_template.c Changed

@@ -12,8 +12,7 @@
 
 typedef struct {
 DB_fileinfo_t info;
- int startsample;
- int endsample;
+ DB_playItem_t *it;
 int currentsample;
 } example_info_t;
 
@@ -33,6 +32,8 @@
 static int
 example_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
 example_info_t *info = (example_info_t *)_info;
+ info->it = it;
+ deadbeef->pl_item_ref (it);
 
 // take this parameters from your input file
 // we set constants for clarity sake
@@ -45,16 +46,21 @@
 _info->readpos = 0;
 _info->plugin = &plugin;
 
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
- plugin.seek_sample (_info, 0);
+ if (info->file->vfs->is_streaming ()) {
+ deadbeef->pl_item_set_startsample (it, 0);
+ if (deadbeef->pl_get_item_duration (it) < 0) {
+ deadbeef->pl_item_set_endsample (it, -1);
+ }
+ else {
+ deadbeef->pl_item_set_endsample (it, TOTALSAMPLES);
+ }
+
+ deadbeef->pl_set_meta_int(it, ":TRACKNUM", 0);
 }
 else {
- info->startsample = 0;
- int TOTALSAMPLES = 1000; // calculate from file
- info->endsample = TOTALSAMPLES-1;
+ example_seek_sample (_info, 0);
 }
+
 return 0;
 }
 
@@ -63,6 +69,7 @@
 example_free (DB_fileinfo_t *_info) {
 example_info_t *info = (example_info_t *)_info;
 if (info) {
+ deadbeef->pl_item_unref (info->it);
 free (info);
 }
 }
@@ -74,7 +81,22 @@
 static int
 example_read (DB_fileinfo_t *_info, char *bytes, int size) {
 example_info_t *info = (example_info_t *)_info;
- info->currentsample += size / (_info->fmt.channels * _info->fmt.bps/8);
+
+ // CUE track switching support
+ int samplesize = _info->fmt.bps / 8 * _info->fmt.channels;
+
+ if (info->currentsample + size / samplesize > deadbeef->pl_item_get_endsample (info->it)) {
+ size = (deadbeef->pl_item_get_endsample (info->it) - info->currentsample + 1) * samplesize;
+ if (size <= 0) {
+ return 0;
+ }
+ }
+
+ int nblocks = size / samplesize;
+
+ // ... decode nblocks blocks here ...
+
+ info->currentsample += nblocks;
 return size;
 }
 
@@ -85,7 +107,7 @@
 example_seek_sample (DB_fileinfo_t *_info, int sample) {
 example_info_t *info = (example_info_t *)_info;
 
- info->currentsample = sample + info->startsample;
+ info->currentsample = sample + deadbeef->pl_item_get_startsample (info->it);
 _info->readpos = (float)sample / _info->fmt.samplerate;
 return 0;
 }
@@ -210,6 +232,7 @@
 .plugin.copyright = "copyright message - author(s), license, etc",
 .plugin.start = example_start,
 .plugin.stop = example_stop,
+ .open = example_open,
 .init = example_init,
 .free = example_free,
 .read = example_read,

deadbeef-1.9.6.tar.bz2/external Added

deadbeef-1.9.6.tar.bz2/external/Makefile.am Added

deadbeef-1.9.6.tar.bz2/external/Makefile.in Added

@@ -0,0 +1,856 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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 = external
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libmp4p_la_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libmp4p_la_OBJECTS = mp4p/src/libmp4p_la-mp4p.lo \
+	mp4p/src/libmp4p_la-mp4patomdata.lo \
+	mp4p/src/libmp4p_la-mp4pfile.lo
+libmp4p_la_OBJECTS = $(am_libmp4p_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmp4p_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmp4p_la_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmp4p_la_SOURCES)
+DIST_SOURCES = $(libmp4p_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+ distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^$^/*$/.*$$,\1,'; \
+ sed_rest='s,^^/*/*,,'; \
+ sed_last='s,^.*/$^/*$$$,\1,'; \
+ sed_butlast='s,/*^/*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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@
+noinst_LTLIBRARIES = libmp4p.la
+libmp4p_la_SOURCES = mp4p/src/mp4p.c mp4p/src/mp4patomdata.c mp4p/src/mp4pfile.c\
+				 	mp4p/include/mp4p/mp4p.h mp4p/include/mp4p/mp4patomdata.h mp4p/include/mp4p/mp4pfile.h 
+
+libmp4p_la_CFLAGS = -fPIC -std=c99 -I@top_srcdir@/external/mp4p/include -I@top_srcdir@/include
+SUBDIRS = ddb_output_pw ddb_dsp_libretro
+all: all-recursive
+
+.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 --ignore-deps external/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps external/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):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+mp4p/src/$(am__dirstamp):
+	@$(MKDIR_P) mp4p/src
+	@: > mp4p/src/$(am__dirstamp)
+mp4p/src/libmp4p_la-mp4p.lo: mp4p/src/$(am__dirstamp)
+mp4p/src/libmp4p_la-mp4patomdata.lo: mp4p/src/$(am__dirstamp)
+mp4p/src/libmp4p_la-mp4pfile.lo: mp4p/src/$(am__dirstamp)
+
+libmp4p.la: $(libmp4p_la_OBJECTS) $(libmp4p_la_DEPENDENCIES) $(EXTRA_libmp4p_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmp4p_la_LINK) $(libmp4p_la_OBJECTS) $(libmp4p_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f mp4p/src/*.$(OBJEXT)
+	-rm -f mp4p/src/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+mp4p/src/libmp4p_la-mp4p.lo: mp4p/src/mp4p.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4p_la_CFLAGS) $(CFLAGS) -c -o mp4p/src/libmp4p_la-mp4p.lo `test -f 'mp4p/src/mp4p.c' || echo '$(srcdir)/'`mp4p/src/mp4p.c
+
+mp4p/src/libmp4p_la-mp4patomdata.lo: mp4p/src/mp4patomdata.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4p_la_CFLAGS) $(CFLAGS) -c -o mp4p/src/libmp4p_la-mp4patomdata.lo `test -f 'mp4p/src/mp4patomdata.c' || echo '$(srcdir)/'`mp4p/src/mp4patomdata.c
+
+mp4p/src/libmp4p_la-mp4pfile.lo: mp4p/src/mp4pfile.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4p_la_CFLAGS) $(CFLAGS) -c -o mp4p/src/libmp4p_la-mp4pfile.lo `test -f 'mp4p/src/mp4pfile.c' || echo '$(srcdir)/'`mp4p/src/mp4pfile.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf mp4p/src/.libs mp4p/src/_libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	 failcom='fail=yes'; \
+	else \
+	 failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	 *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	 echo "Making $$target in $$subdir"; \
+	 if test "$$subdir" = "."; then \
+	 dot_seen=yes; \
+	 local_target="$$target-am"; \
+	 else \
+	 local_target="$$target"; \
+	 fi; \
+	 ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	 || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	 include_option=--etags-include; \
+	 empty_fix=.; \
+	else \
+	 include_option=--include; \
+	 empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	 if test "$$subdir" = .; then :; else \
+	 test ! -f $$subdir/TAGS || \
+	 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	 fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	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-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	 if test "$$subdir" = .; then :; else \
+	 $(am__make_dryrun) \
+	 || test -d "$(distdir)/$$subdir" \
+	 || $(MKDIR_P) "$(distdir)/$$subdir" \
+	 || exit 1; \
+	 dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	 $(am__relativize); \
+	 new_distdir=$$reldir; \
+	 dir1=$$subdir; dir2="$(top_distdir)"; \
+	 $(am__relativize); \
+	 new_top_distdir=$$reldir; \
+	 echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	 echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	 ($(am__cd) $$subdir && \
+	 $(MAKE) $(AM_MAKEFLAGS) \
+	 top_distdir="$$new_top_distdir" \
+	 distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	 distdir) \
+	 || exit 1; \
+	 fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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)
+	-rm -f mp4p/src/$(am__dirstamp)
+
+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-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am 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-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/external/ddb_dsp_libretro Added

deadbeef-1.9.6.tar.bz2/external/ddb_dsp_libretro/COPYING Added

@@ -0,0 +1,62 @@
+ddb_dsp_libretro resampler plugin for DeaDBeeF player
+Copyright (C) 2021 Michael Lelli <toadking@toadking.com>
+based on SRC resampler plugin code
+Copyright (C) 2009-2022 Oleksiy 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.
+
+
+sinc_resampler.h
+Copyright (C) 2010-2018 The RetroArch team
+
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Modified by Janne Hyvärinen
+Modified some more by Peter Pawlowski
+
+
+
+ppsimd
+Copyright (C) 2002-2021 Peter Pawlowski
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.

deadbeef-1.9.6.tar.bz2/external/ddb_dsp_libretro/Makefile.am Added

deadbeef-1.9.6.tar.bz2/external/ddb_dsp_libretro/Makefile.in Added

@@ -0,0 +1,800 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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 = external/ddb_dsp_libretro
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+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, filesdir }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ddb_dsp_libretro_la_LIBADD =
+am__ddb_dsp_libretro_la_SOURCES_DIST = libretro.cpp ppsimd/ppsimd.h \
+	sinc_resampler.h
+@HAVE_LIBRETRO_TRUE@am_ddb_dsp_libretro_la_OBJECTS = \
+@HAVE_LIBRETRO_TRUE@	ddb_dsp_libretro_la-libretro.lo
+ddb_dsp_libretro_la_OBJECTS = $(am_ddb_dsp_libretro_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ddb_dsp_libretro_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(ddb_dsp_libretro_la_CXXFLAGS) $(CXXFLAGS) \
+	$(ddb_dsp_libretro_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_LIBRETRO_TRUE@am_ddb_dsp_libretro_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+CXXCOMPILE = $(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_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+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_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 = 
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(ddb_dsp_libretro_la_SOURCES)
+DIST_SOURCES = $(am__ddb_dsp_libretro_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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_LIBRETRO_TRUE@ppsimdpath = @top_srcdir@/external/ddb_dsp_libretro/ppsimd
+@HAVE_LIBRETRO_TRUE@EXTRA_DIST = COPYING $(ppsimdpath)/ppsimd-license.txt
+@HAVE_LIBRETRO_TRUE@pkglib_LTLIBRARIES = ddb_dsp_libretro.la
+@HAVE_LIBRETRO_TRUE@ddb_dsp_libretro_la_SOURCES = libretro.cpp ppsimd/ppsimd.h sinc_resampler.h
+@HAVE_LIBRETRO_TRUE@ddb_dsp_libretro_la_LDFLAGS = -module -avoid-version
+@HAVE_LIBRETRO_TRUE@ddb_dsp_libretro_la_CXXFLAGS = $(CFLAGS) -msse3 -std=c++11 -I@top_srcdir@/include
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .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 --ignore-deps external/ddb_dsp_libretro/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps external/ddb_dsp_libretro/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)
+	@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 " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
+	 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)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+
+ddb_dsp_libretro.la: $(ddb_dsp_libretro_la_OBJECTS) $(ddb_dsp_libretro_la_DEPENDENCIES) $(EXTRA_ddb_dsp_libretro_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(ddb_dsp_libretro_la_LINK) $(am_ddb_dsp_libretro_la_rpath) $(ddb_dsp_libretro_la_OBJECTS) $(ddb_dsp_libretro_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.cpp.o:
+	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+	$(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $<
+
+ddb_dsp_libretro_la-libretro.lo: libretro.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_dsp_libretro_la_CXXFLAGS) $(CXXFLAGS) -c -o ddb_dsp_libretro_la-libretro.lo `test -f 'libretro.cpp' || echo '$(srcdir)/'`libretro.cpp
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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 -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 -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 TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am 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 tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/external/ddb_dsp_libretro/libretro.cpp Added

@@ -0,0 +1,390 @@
+/*
+ ddb_dsp_libretro resampler plugin for DeaDBeeF player
+ Copyright (C) 2021 Michael Lelli <toadking@toadking.com>
+ based on SRC resampler plugin code
+ Copyright (C) 2009-2022 Oleksiy 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 "sinc_resampler.h"
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <deadbeef/deadbeef.h>
+
+static DB_dsp_t *_plugin;
+
+#define trace(...) { deadbeef->log_detailed (&_plugin->plugin, 0, __VA_ARGS__); }
+
+static DB_functions_t *deadbeef;
+
+enum {
+ LIBRETRO_PARAM_SAMPLERATE = 0,
+ LIBRETRO_PARAM_QUALITY = 1,
+ LIBRETRO_PARAM_AUTOSAMPLERATE = 2,
+ LIBRETRO_PARAM_COUNT
+};
+
+#define LIBRETRO_BUFFER 16000
+#define LIBRETRO_MAX_CHANNELS 8
+
+typedef struct {
+ ddb_dsp_context_t ctx;
+
+ int channels;
+ enum resampler_quality quality;
+ float samplerate;
+ int autosamplerate;
+ rarch_sinc_resampler_t *resampler;
+ int in_samplerate;
+ int out_samplerate;
+ int remaining; // number of input samples in the buffer
+ float *outbuf;
+ int outsize;
+ int buffersize;
+ __attribute__((__aligned__(16))) char in_fbuffersizeof(float)*LIBRETRO_BUFFER*LIBRETRO_MAX_CHANNELS;
+ unsigned quality_changed : 1;
+ unsigned need_reset : 1;
+} ddb_libretro_t;
+
+static void
+ddb_libretro_close (ddb_dsp_context_t *_libretro) {
+ ddb_libretro_t *libretro = (ddb_libretro_t*)_libretro;
+ if (libretro->resampler) {
+ resampler_sinc_free (libretro->resampler);
+ libretro->resampler = NULL;
+ }
+ if (libretro->outbuf) {
+ free (libretro->outbuf);
+ libretro->outbuf = NULL;
+ }
+ free (libretro);
+}
+
+static void
+ddb_libretro_reset (ddb_dsp_context_t *_libretro) {
+ ddb_libretro_t *libretro = (ddb_libretro_t*)_libretro;
+ libretro->need_reset = 1;
+}
+
+static int
+_get_target_samplerate (ddb_libretro_t *libretro, ddb_waveformat_t *fmt) {
+ if (libretro->autosamplerate) {
+ DB_output_t *output = deadbeef->get_output ();
+ return output->fmt.samplerate;
+ }
+ else {
+ return libretro->samplerate;
+ }
+}
+
+static int
+ddb_libretro_can_bypass (ddb_dsp_context_t *_libretro, ddb_waveformat_t *fmt) {
+ ddb_libretro_t *libretro = (ddb_libretro_t*)_libretro;
+
+ int samplerate = _get_target_samplerate(libretro, fmt);
+
+ return fmt->samplerate == samplerate;
+}
+
+static int
+ddb_libretro_process (ddb_dsp_context_t *_libretro, float *samples, int nframes, int maxframes, ddb_waveformat_t *fmt, float *r) {
+ ddb_libretro_t *libretro = (ddb_libretro_t*)_libretro;
+
+ int samplerate = _get_target_samplerate(libretro, fmt);
+
+ if (fmt->samplerate == samplerate) {
+ return nframes;
+ }
+
+ int new_samplerates = libretro->in_samplerate != fmt->samplerate || libretro->out_samplerate != samplerate;
+
+ libretro->in_samplerate = fmt->samplerate;
+ libretro->out_samplerate = samplerate;
+
+ fmt->samplerate = samplerate;
+
+ if (libretro->need_reset || new_samplerates || libretro->channels != fmt->channels || libretro->quality_changed || !libretro->resampler) {
+ libretro->quality_changed = 0;
+ libretro->remaining = 0;
+ libretro->channels = fmt->channels;
+ if (libretro->resampler) {
+ resampler_sinc_free(libretro->resampler);
+ libretro->resampler = nullptr;
+ }
+ libretro->resampler = (rarch_sinc_resampler_t *)resampler_sinc_new (libretro->in_samplerate, libretro->out_samplerate, libretro->channels, libretro->quality);
+
+ if (libretro->resampler == NULL) {
+ trace("libretro_process failed to create resampler\n"
+ "in_samplerate=%d, out_samplerate=%d, channels=%d, quality=%d\n", libretro->in_samplerate, libretro->out_samplerate, libretro->channels, libretro->quality);
+ return 0;
+ }
+
+ libretro->need_reset = 0;
+ }
+
+ int numoutframes = 0;
+ int outsize = nframes*24;
+ int buffersize = outsize * fmt->channels * sizeof (float);
+ if (!libretro->outbuf || libretro->outsize != outsize || libretro->buffersize != buffersize) {
+ if (libretro->outbuf) {
+ free (libretro->outbuf);
+ libretro->outbuf = NULL;
+ }
+ libretro->outsize = outsize;
+ libretro->buffersize = buffersize;
+ libretro->outbuf = (float*)malloc (buffersize);
+ }
+ char *output = (char *)libretro->outbuf;
+ memset (output, 0, buffersize);
+ float *input = samples;
+ int inputsize = nframes;
+
+ int samplesize = fmt->channels * sizeof (float);
+
+ do {
+ // add more frames to input buffer
+ int n = inputsize;
+ if (n >= LIBRETRO_BUFFER - libretro->remaining) {
+ n = LIBRETRO_BUFFER - libretro->remaining;
+ }
+
+ if (n > 0) {
+ memcpy (&libretro->in_fbufferlibretro->remaining*samplesize, samples, n * samplesize);
+
+ libretro->remaining += n;
+ samples += n * fmt->channels;
+ }
+ if (!libretro->remaining) {
+ trace ("WARNING: LIBRETRO input buffer starved\n");
+ break;
+ }
+
+ // call resampler
+ struct resampler_data data = {0};
+ data.data_in = (float *)libretro->in_fbuffer;
+ data.data_out = (float *)output;
+ data.input_frames = libretro->remaining;
+ libretro->resampler->process(libretro->resampler, &data);
+
+ inputsize -= n;
+ output += data.output_frames * samplesize;
+ numoutframes += data.output_frames;
+ outsize -= data.output_frames;
+
+ // calculate how many unused input samples left
+ libretro->remaining -= data.input_frames;
+ // copy spare samples for next update
+ if (libretro->remaining > 0 && data.input_frames > 0) {
+ memmove (libretro->in_fbuffer, &libretro->in_fbufferdata.input_frames*samplesize, libretro->remaining * samplesize);
+ }
+ if (data.output_frames == 0) {
+ trace ("dsp_libretro: output_frames_gen=0, interrupt\n");
+ break;
+ }
+ } while (inputsize > 0 && outsize > 0);
+
+ memcpy (input, libretro->outbuf, numoutframes * fmt->channels * sizeof (float));
+ //static FILE *out = NULL;
+ //if (!out) {
+ // out = fopen ("out.raw", "w+b");
+ //}
+ //fwrite (input, 1, numoutframes*sizeof(float)*(*nchannels), out);
+
+ return numoutframes;
+}
+
+static int
+ddb_libretro_num_params (void) {
+ return LIBRETRO_PARAM_COUNT;
+}
+
+static const char *
+ddb_libretro_get_param_name (int p) {
+ switch (p) {
+ case LIBRETRO_PARAM_QUALITY:
+ return "Quality";
+ case LIBRETRO_PARAM_SAMPLERATE:
+ return "Samplerate";
+ case LIBRETRO_PARAM_AUTOSAMPLERATE:
+ return "Auto samplerate";
+ default:
+ trace("ddb_libretro_get_param_name: invalid param index (%d)\n", p);
+ }
+ return NULL;
+}
+
+static void
+ddb_libretro_set_param (ddb_dsp_context_t *ctx, int p, const char *val) {
+ switch (p) {
+ case LIBRETRO_PARAM_SAMPLERATE:
+ ((ddb_libretro_t*)ctx)->samplerate = atof (val);
+ if (((ddb_libretro_t*)ctx)->samplerate < 8000) {
+ ((ddb_libretro_t*)ctx)->samplerate = 8000;
+ }
+ if (((ddb_libretro_t*)ctx)->samplerate > 192000) {
+ ((ddb_libretro_t*)ctx)->samplerate = 192000;
+ }
+ break;
+ case LIBRETRO_PARAM_QUALITY:
+ ((ddb_libretro_t*)ctx)->quality = (enum resampler_quality) atoi (val);
+ ((ddb_libretro_t*)ctx)->quality_changed = 1;
+ break;
+ case LIBRETRO_PARAM_AUTOSAMPLERATE:
+ ((ddb_libretro_t*)ctx)->autosamplerate = atoi (val);
+ break;
+ default:
+ trace("ddb_libretro_set_param: invalid param index (%d)\n", p);
+ }
+}
+
+static void
+ddb_libretro_get_param (ddb_dsp_context_t *ctx, int p, char *val, int sz) {
+ switch (p) {
+ case LIBRETRO_PARAM_SAMPLERATE:
+ snprintf (val, sz, "%f", ((ddb_libretro_t*)ctx)->samplerate);
+ break;
+ case LIBRETRO_PARAM_QUALITY:
+ snprintf (val, sz, "%d", ((ddb_libretro_t*)ctx)->quality);
+ break;
+ case LIBRETRO_PARAM_AUTOSAMPLERATE:
+ snprintf (val, sz, "%d", ((ddb_libretro_t*)ctx)->autosamplerate);
+ break;
+ default:
+ trace("ddb_libretro_get_param: invalid param index (%d)\n", p);
+ }
+}
+
+static const char settings_dlg =
+ "property \"Autodetect samplerate from output device\" checkbox 2 0;\n"
+ "property \"Set samplerate directly\" spinbtn8000,192000,1 0 44100;\n"
+ "property \"Resampler quality\" select5 1 2 Lowest Lower Normal Higher Highest;\n"
+;
+
+static ddb_dsp_context_t *ddb_libretro_open(void);
+
+static DB_dsp_t plugin = {
+ .plugin = {
+ .type = DB_PLUGIN_DSP,
+ .api_vmajor = DB_API_VERSION_MAJOR,
+ .api_vminor = DB_API_VERSION_MINOR,
+ .version_major = 1,
+ .version_minor = 0,
+ .flags = DDB_PLUGIN_FLAG_LOGGING,
+ .id = "resampler_libretro",
+ .name = "Resampler (Libretro)",
+ .descr =
+ "Samplerate converter using the sinc resampler from Libretro/RetroArch.\n"
+ "\n"
+ "Based on foobar2000 modifications:\n"
+ "https://www.foobar2000.org/sinc-resampler",
+ .copyright =
+ "ddb_dsp_libretro resampler plugin for DeaDBeeF player\n"
+ "Copyright (C) 2021 Michael Lelli <toadking@toadking.com>\n"
+ "based on SRC resampler plugin code\n"
+ "Copyright (C) 2009-2022 Oleksiy 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"
+ "\n"
+ "\n"
+ "sinc_resampler.h\n"
+ "Copyright (C) 2010-2018 The RetroArch team\n"
+ "\n"
+ "Permission is hereby granted, free of charge,\n"
+ "to any person obtaining a copy of this software and associated documentation files (the \"Software\"),\n"
+ "to deal in the Software without restriction, including without limitation the rights to\n"
+ "use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,\n"
+ "and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n"
+ "\n"
+ "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n"
+ "\n"
+ "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,\n"
+ "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
+ "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\n"
+ "IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\n"
+ "WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n"
+ "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n"
+ "\n"
+ "\n"
+ "Modified by Janne Hyvärinen\n"
+ "Modified some more by Peter Pawlowski\n"
+ "\n"
+ "\n"
+ "\n"
+ "ppsimd\n"
+ "Copyright (C) 2002-2021 Peter Pawlowski\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\n"
+ "\n"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\n"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\n"
+ "3. This notice may not be removed or altered from any source distribution.\n"
+ ,
+ .website = "https://github.com/ToadKing/ddb_dsp_libretro",
+ },
+ .open = ddb_libretro_open,
+ .close = ddb_libretro_close,
+ .process = ddb_libretro_process,
+ .reset = ddb_libretro_reset,
+ .num_params = ddb_libretro_num_params,
+ .get_param_name = ddb_libretro_get_param_name,
+ .set_param = ddb_libretro_set_param,
+ .get_param = ddb_libretro_get_param,
+ .configdialog = settings_dlg,
+ .can_bypass = ddb_libretro_can_bypass,
+};
+
+extern "C" DB_plugin_t *ddb_dsp_libretro_load (DB_functions_t *f);
+
+DB_plugin_t *
+ddb_dsp_libretro_load (DB_functions_t *f) {
+ deadbeef = f;
+ _plugin = &plugin;
+ return &plugin.plugin;
+}
+
+ddb_dsp_context_t*
+ddb_libretro_open (void) {
+ ddb_libretro_t *libretro = (ddb_libretro_t*)malloc (sizeof (ddb_libretro_t));
+ DDB_INIT_DSP_CONTEXT (libretro,ddb_libretro_t, &plugin);
+
+ libretro->autosamplerate = 0;
+ libretro->samplerate = 44100;
+ libretro->quality = RESAMPLER_QUALITY_NORMAL;
+ libretro->channels = -1;
+ return (ddb_dsp_context_t *)libretro;
+}

deadbeef-1.9.6.tar.bz2/external/ddb_dsp_libretro/ppsimd Added

deadbeef-1.9.6.tar.bz2/external/ddb_dsp_libretro/ppsimd/ppsimd-license.txt Added

deadbeef-1.9.6.tar.bz2/external/ddb_dsp_libretro/ppsimd/ppsimd.h Added

@@ -0,0 +1,409 @@
+#pragma once
+
+#include <assert.h>
+
+#if 0
+// NO OPTIMIZATIONS MODE, FOR TESTING ONLY
+#elif (defined(_M_IX86_FP) && _M_IX86_FP >= 2) || defined(_M_X64) || defined(__x86_64__) || defined(__SSE2__)
+// ==== SSE2 ====
+#define PPSIMD_SSE
+
+#include <emmintrin.h>
+
+#if defined(__SSE3__) || defined(__AVX__) || (defined(_M_IX86_FP) && _M_IX86_FP > 2)
+#define PPSIMD_ALLOW_SSE3 1
+#include <pmmintrin.h>
+#else
+#define PPSIMD_ALLOW_SSE3 0
+#endif
+
+#elif defined(__aarch64__)
+// ==== ARM Neon ====
+
+#define PPSIMD_NEON
+#define PPSIMD_NEON64
+#include <arm_neon.h>
+
+#elif defined(__ARM_NEON__)
+
+#define PPSIMD_NEON
+#include <arm_neon.h>
+
+#endif
+
+namespace ppsimd {
+#ifdef PPSIMD_SSE
+ // ======================================================
+ // SSE CODE
+ // ======================================================
+#define PPSIMD_FLOAT32_NATIVE
+#define PPSIMD_FLOAT64_NATIVE
+ typedef __m128 float32x4;
+ typedef __m128d float64x2;
+
+ inline float64x2 pmul(float64x2 f1, float64x2 f2) { return _mm_mul_pd(f1, f2); }
+ inline float64x2 padd(float64x2 f1, float64x2 f2) { return _mm_add_pd(f1, f2); }
+ inline float64x2 psub(float64x2 f1, float64x2 f2) { return _mm_sub_pd(f1, f2); }
+ inline float64x2 ploadf64x2(const double* from) { return _mm_loadu_pd(from); }
+ inline float64x2 ploadf64x2a(const double* from) { return _mm_load_pd(from); }
+ inline float64x2 ploadf64x2(double lo, double hi) { return _mm_set_pd(hi, lo); };
+ inline double pstorelo(float64x2 v) { return _mm_cvtsd_f64(v); }
+#ifdef _MSC_VER
+ inline double pstorehi(float64x2 v) { return v.m128d_f641; }
+#else
+ inline double pstorehi(float64x2 v) { return v1; }
+#endif
+ inline float64x2 punplo(float64x2 v) { return _mm_unpacklo_pd(v, v); }
+ inline float64x2 punphi(float64x2 v) { return _mm_unpackhi_pd(v, v); }
+ inline float64x2 pswap(float64x2 f) { return _mm_shuffle_pd(f, f, _MM_SHUFFLE2(0, 1)); };
+ inline void pstore(double* to, float64x2 f) { _mm_storeu_pd(to, f); }
+
+ inline float64x2 pneg(float64x2 v) {
+ return _mm_xor_pd(v, _mm_castsi128_pd(_mm_set_epi64x(0x8000000000000000ULL, 0x8000000000000000ULL)));
+ }
+ inline float64x2 pneghi(float64x2 v) {
+ return _mm_xor_pd(v, _mm_castsi128_pd(_mm_set_epi64x(0x8000000000000000ULL, 0x0000000000000000ULL)));
+ }
+ inline float64x2 pneglo(float64x2 v) {
+ return _mm_xor_pd(v, _mm_castsi128_pd(_mm_set_epi64x(0x0000000000000000ULL, 0x8000000000000000ULL)));
+ }
+
+ inline float64x2 paddsub(float64x2 v1, float64x2 v2) {
+#if 0 // not faster
+ return pswap(_mm_addsub_pd(pswap(v1), pswap(v2)));
+#else
+ return padd(v1, pneghi(v2));
+#endif
+ }
+ inline float64x2 psubadd(float64x2 v1, float64x2 v2) {
+#if PPSIMD_ALLOW_SSE3
+ // Poor naming on Intel's side, addsub subtracts low adds high
+ return _mm_addsub_pd(v1, v2);
+#else
+ return padd(v1, pneglo(v2));
+#endif
+ }
+
+ inline double paddelems(float64x2 v1) {
+#if PPSIMD_ALLOW_SSE3
+ return pstorelo(_mm_hadd_pd(v1, v1));
+#else
+ return pstorelo(v1) + pstorehi(v1);
+#endif
+ }
+
+ inline float32x4 pmul(float32x4 f1, float32x4 f2) { return _mm_mul_ps(f1, f2); }
+ inline float32x4 padd(float32x4 f1, float32x4 f2) { return _mm_add_ps(f1, f2); }
+ inline float32x4 psub(float32x4 f1, float32x4 f2) { return _mm_sub_ps(f1, f2); }
+ inline float32x4 ploadf32x4(const float* from) { return _mm_loadu_ps(from); }
+ inline float32x4 ploadf32x4a(const float* from) { return _mm_load_ps(from); }
+ inline float32x4 ploadf32x4(float arg1, float arg2, float arg3, float arg4) { return _mm_set_ps(arg4, arg3, arg2, arg1); }
+ inline void pstore(float* to, float32x4 f) { _mm_storeu_ps(to, f); }
+ inline float32x4 pneg(float32x4 v) {
+ return _mm_xor_ps(v, _mm_castsi128_ps(_mm_set_epi32(0x80000000, 0x80000000, 0x80000000, 0x80000000)));
+ }
+ inline float32x4 pswap(float32x4 v) {
+ return _mm_shuffle_ps(v, v, _MM_SHUFFLE(1, 0, 3, 2));
+ }
+ inline float32x4 preverse(float32x4 v) {
+ return _mm_shuffle_ps(v, v, _MM_SHUFFLE(0, 1, 2, 3));
+ }
+ inline bool pequals(float64x2 v1, float64x2 v2) {
+ return _mm_movemask_pd( _mm_cmpeq_pd(v1, v2) ) == 0x3;
+ }
+ inline bool pequals(float32x4 v1, float32x4 v2) {
+ return _mm_movemask_ps( _mm_cmpeq_ps(v1, v2) ) == 0xF;
+ }
+ inline float64x2 pzerof64x2() { return _mm_setzero_pd(); }
+ inline float32x4 pzerof32x4() { return _mm_setzero_ps(); }
+ inline float64x2 pset1f64x2(double v) { return _mm_set1_pd(v); }
+ inline float32x4 pset1f32x4(float v) { return _mm_set1_ps(v); }
+
+ inline float pstorelo(float32x4 f) { return _mm_cvtss_f32(f); }
+
+ inline float pstoren(float32x4 f, int which) {
+#ifdef _MSC_VER
+ return f.m128_f32which;
+#else
+ return fwhich;
+#endif
+ }
+
+ inline float paddelems(float32x4 v) {
+#if PPSIMD_ALLOW_SSE3
+ auto temp = _mm_hadd_ps(v, v);
+ temp = _mm_hadd_ps(temp, temp);
+ return pstorelo(temp);
+#else
+ return pstorelo(v) + pstoren(v, 1) + pstoren(v, 2) + pstoren(v, 3);
+#endif
+ }
+ // ======================================================
+ // END SSE CODE
+ // ======================================================
+#endif
+
+#ifdef PPSIMD_NEON64
+ // ======================================================
+ // ARM64 NEON CODE
+ // ======================================================
+ typedef ::float64x2_t float64x2;
+#define PPSIMD_FLOAT64_NATIVE
+
+ inline float64x2 pmul(float64x2 f1, float64x2 f2) { return vmulq_f64(f1, f2); }
+ inline float64x2 padd(float64x2 f1, float64x2 f2) { return vaddq_f64(f1, f2); }
+ inline float64x2 psub(float64x2 f1, float64x2 f2) { return vsubq_f64(f1, f2); }
+
+ inline float64x2 ploadf64x2(const double* from) { return vld1q_f64(from); }
+ inline float64x2 ploadf64x2a(const double* from) { return vld1q_f64(from); }
+ inline float64x2 ploadf64x2(double lo, double hi) { double temp2 = { lo, hi }; return vld1q_f64(temp); } // optimize me?
+ inline float64x2 pset1f64x2(double v) { return vdupq_n_f64(v); }
+ inline float64x2 pzerof64x2() { return pset1f64x2(0); }
+ inline double pstorelo(float64x2 v) { return v0; }
+ inline double pstorehi(float64x2 v) { return v1; }
+ inline float64x2 punplo(float64x2 v) { return pset1f64x2( pstorelo(v)); } // optimize me?
+ inline float64x2 punphi(float64x2 v) { return pset1f64x2( pstorehi(v)); } // optimize me?
+ inline float64x2 pswap(float64x2 v) { return ploadf64x2(pstorehi(v), pstorelo(v)); } // optimize me?
+ inline void pstore(double* to, float64x2 f) { vst1q_f64(to, f); }
+
+ inline float64x2 pneg(float64x2 v) {
+ uint64x2_t raw = vreinterpretq_u64_f64(v);
+ raw = veorq_u64(raw, uint64x2_t{ 0x8000000000000000ULL, 0x8000000000000000ULL });
+ return vreinterpretq_f64_u64(raw);
+ }
+ inline float64x2 pneghi(float64x2 v) {
+ uint64x2_t raw = vreinterpretq_u64_f64(v);
+ raw = veorq_u64(raw, uint64x2_t{ 0x0000000000000000ULL, 0x8000000000000000ULL });
+ return vreinterpretq_f64_u64(raw);
+ }
+ inline float64x2 pneglo(float64x2 v) {
+ uint64x2_t raw = vreinterpretq_u64_f64(v);
+ raw = veorq_u64(raw, uint64x2_t{ 0x8000000000000000ULL, 0x0000000000000000ULL });
+ return vreinterpretq_f64_u64(raw);
+ }
+
+ inline float64x2 paddsub(float64x2 v1, float64x2 v2) { return padd(v1, pneghi(v2)); }
+ inline float64x2 psubadd(float64x2 v1, float64x2 v2) { return padd(v1, pneglo(v2)); }
+
+ inline bool pequals(float64x2 v1, float64x2 v2) {
+ auto c = vceqq_f64(v1, v2);
+ return (c0 & c1) != 0;
+ }
+ inline double paddelems(float64x2 v) { return v0 + v1; }
+
+ // ======================================================
+ // END ARM64 NEON CODE
+ // ======================================================
+#endif
+
+#ifdef PPSIMD_NEON
+ // ======================================================
+ // ARM NEON CODE
+ // ======================================================
+ typedef ::float32x4_t float32x4;
+#define PPSIMD_FLOAT32_NATIVE
+
+
+ inline bool pequals(float32x4 v1, float32x4 v2) {
+ auto c = vceqq_f32(v1, v2);
+ return (c0 & c1 & c2 & c3) != 0;
+ }
+
+ inline float32x4 pmul(float32x4 f1, float32x4 f2) { return vmulq_f32(f1,f2);}
+ inline float32x4 padd(float32x4 f1, float32x4 f2) { return vaddq_f32(f1,f2);}
+ inline float32x4 psub(float32x4 f1, float32x4 f2) { return vsubq_f32(f1,f2);}
+
+ inline float32x4 ploadf32x4(const float * from ) { return vld1q_f32(from); }
+ inline float32x4 ploadf32x4a(const float * from ) { return vld1q_f32(from); }
+ inline float32x4 ploadf32x4(float v1, float v2, float v3, float v4) { float temp4 = {v1, v2, v3, v4}; return vld1q_f32(temp); } // optimize me?
+ inline float32x4 pset1f32x4(float v) { return vdupq_n_f32(v); }
+ inline float32x4 pzerof32x4() { return pset1f32x4(0); }
+
+ inline float pstorelo(float32x4 f) { return f0; }
+ inline float pstoren(float32x4 f, int which) { return fwhich; }
+
+ inline float32x4 pneg(float32x4 v) {
+ uint32x4_t raw = vreinterpretq_u32_f32(v);
+ raw = veorq_u32(raw, uint32x4_t{ 0x80000000, 0x80000000, 0x80000000, 0x80000000 });
+ return vreinterpretq_f32_u32(raw);
+ }
+
+ inline float paddelems(float32x4 v) { return v0 + v1 + v2 + v3; }
+ inline float32x4 pswap(float32x4 v) { return ploadf32x4( v2, v3, v0, v1 ); }; // optimize me?
+ inline float32x4 preverse(float32x4 v) { return ploadf32x4( v3, v2, v1, v0 ); }; // optimize me?
+
+ // ======================================================
+ // END ARM NEON CODE
+ // ======================================================
+#endif
+
+#ifndef PPSIMD_FLOAT32_NATIVE
+ // ======================================================
+ // GENERIC CODE
+ // ======================================================
+ struct float32x4 { float v4; };
+
+ inline float32x4 pmul(float32x4 f1, float32x4 f2) { return { f1.v0 * f2.v0, f1.v1 * f2.v1, f1.v2 * f2.v2, f1.v3 * f2.v3 }; }
+ inline float32x4 padd(float32x4 f1, float32x4 f2) { return { f1.v0 + f2.v0, f1.v1 + f2.v1, f1.v2 + f2.v2, f1.v3 + f2.v3 }; }
+ inline float32x4 psub(float32x4 f1, float32x4 f2) { return { f1.v0 - f2.v0, f1.v1 - f2.v1, f1.v2 - f2.v2, f1.v3 - f2.v3 }; }
+ inline float32x4 ploadf32x4(const float* from) { return { from0, from1, from2, from3 }; }
+ inline float32x4 ploadf32x4a(const float* from) { return { from0, from1, from2, from3 }; }
+ inline float32x4 ploadf32x4(float arg1, float arg2, float arg3, float arg4) { return { arg1, arg2, arg3, arg4 }; }
+ inline void pstore(float* to, float32x4 f) { to0 = f.v0; to1 = f.v1; to2 = f.v2; to3 = f.v3; }
+ inline float32x4 pneg(float32x4 v) { return { -v.v0, -v.v1, -v.v2, -v.v3 }; }
+ inline float32x4 pswap(float32x4 f) { return { f.v2, f.v3, f.v0, f.v1 }; };
+ inline float32x4 preverse(float32x4 f) { return { f.v3, f.v2, f.v1, f.v0 }; };
+
+ inline bool pequals(float32x4 v1, float32x4 v2) { return v1.v0 == v2.v0 && v1.v1 == v2.v1 && v1.v2 == v2.v2 && v1.v3 == v2.v3; }
+
+ inline float32x4 pzerof32x4() { return {}; }
+
+
+ inline float32x4 pset1f32x4(float v) { return { v,v,v,v }; }
+
+ inline float pstorelo(float32x4 f) { return f.v0; }
+ inline float pstoren(float32x4 f, int which) { return f.vwhich; }
+
+
+ inline float paddelems(float32x4 v) { return v.v0 + v.v1 + v.v2 + v.v3; }
+
+#endif
+
+#ifndef PPSIMD_FLOAT64_NATIVE
+ // ======================================================
+ // GENERIC CODE
+ // ======================================================
+ struct float64x2 { double v2; };
+
+ inline float64x2 pmul(float64x2 f1, float64x2 f2) { return { f1.v0 * f2.v0, f1.v1 * f2.v1 }; }
+ inline float64x2 padd(float64x2 f1, float64x2 f2) { return { f1.v0 + f2.v0, f1.v1 + f2.v1 }; }
+ inline float64x2 psub(float64x2 f1, float64x2 f2) { return { f1.v0 - f2.v0, f1.v1 - f2.v1 }; }
+ inline float64x2 ploadf64x2(const double* from) { return { from0, from1 }; }
+ inline float64x2 ploadf64x2a(const double* from) { return { from0, from1 }; }
+ inline float64x2 ploadf64x2(double lo, double hi) { return { lo, hi }; }
+ inline double pstorelo(float64x2 v) { return v.v0; }
+ inline double pstorehi(float64x2 v) { return v.v1; }
+ inline float64x2 punplo(float64x2 v) { return { v.v0, v.v0 }; }
+ inline float64x2 punphi(float64x2 v) { return { v.v1, v.v1 }; }
+ inline float64x2 pswap(float64x2 f) { return { f.v1, f.v0 }; };
+ inline void pstore(double* to, float64x2 f) { to0 = f.v0; to1 = f.v1; }
+
+ inline float64x2 paddsub(float64x2 v1, float64x2 v2) { return { v1.v0 + v2.v0, v1.v1 - v2.v1 }; }
+ inline float64x2 psubadd(float64x2 v1, float64x2 v2) { return { v1.v0 - v2.v0, v1.v1 + v2.v1 }; }
+ inline float64x2 pneg(float64x2 v) { return { -v.v0, -v.v1 }; }
+ inline float64x2 pneghi(float64x2 v) { return { v.v0, -v.v1 }; }
+ inline float64x2 pneglo(float64x2 v) { return { -v.v0, v.v1 }; }
+
+ inline bool pequals(float64x2 v1, float64x2 v2) { return v1.v0 == v2.v0 && v1.v1 == v2.v1; }
+
+ inline float64x2 pzerof64x2() { return {}; }
+ inline float64x2 pset1f64x2(double v) { return { v,v }; }
+
+ inline double paddelems(float64x2 v) { return v.v0 + v.v1; }
+#endif
+
+
+
+ inline float64x2 pload(double v1, double v2) { return ploadf64x2(v1, v2); }
+ inline float32x4 pload(float v1, float v2, float v3, float v4) { return ploadf32x4(v1, v2, v3, v4); }
+ inline float64x2 pload(const double * v) { return ploadf64x2(v); }
+ inline float32x4 pload(const float* v) { return ploadf32x4(v); }
+
+ inline void selftest() {
+#ifndef NDEBUG
+
+ {
+ auto v1 = ploadf64x2(1, 2);
+ auto v2 = ploadf64x2(3, 4);
+ assert(pstorelo(v1) == 1);
+ assert(pstorehi(v1) == 2);
+ assert(pstorelo(v2) == 3);
+ assert(pstorehi(v2) == 4);
+
+ assert(!pequals(v1, v2));
+ assert(pequals(v1, v1));
+ assert(pequals(v2, v2));
+
+ assert(!pequals(v1, ploadf64x2(1,1)));
+ assert(!pequals(v1, ploadf64x2(2,2)));
+
+ float64x2 v3;
+ v3 = padd(v1, v2);
+ assert(pstorelo(v3) == 4 && pstorehi(v3) == 6);
+ v3 = paddsub(v1, v2);
+ assert(pstorelo(v3) == 4 && pstorehi(v3) == -2);
+ v3 = psubadd(v1, v2);
+ assert(pstorelo(v3) == -2 && pstorehi(v3) == 6);
+ v3 = pswap(v1);
+ assert(pstorelo(v3) == 2 && pstorehi(v3) == 1);
+ v3 = pmul(v1, v2);
+ assert(pstorelo(v3) == 3 && pstorehi(v3) == 8);
+ v3 = punplo(v1);
+ assert(pstorelo(v3) == 1 && pstorehi(v3) == 1);
+ v3 = punphi(v1);
+ assert(pstorelo(v3) == 2 && pstorehi(v3) == 2);
+ v3 = pneg(v1);
+ assert(pstorelo(v3) == -1 && pstorehi(v3) == -2);
+ v3 = pneglo(v1);
+ assert(pstorelo(v3) == -1 && pstorehi(v3) == 2);
+ v3 = pneghi(v1);
+ assert(pstorelo(v3) == 1 && pstorehi(v3) == -2);
+
+ v3 = pset1f64x2(42);
+ assert(pequals(v3, ploadf64x2(42, 42)));
+
+ v3 = pzerof64x2();
+ assert(pequals(v3, ploadf64x2(0, 0)));
+
+ assert(paddelems(v1) == 3);
+ assert(paddelems(v2) == 7);
+ }
+ {
+ float32x4 v1 = ploadf32x4(1, 2, 3, 4);
+ float32x4 v2 = ploadf32x4(5, 6, 7, 8);
+
+ assert(pstorelo(v1) == 1);
+ assert(pstoren(v1, 0) == 1);
+ assert(pstoren(v1, 1) == 2);
+ assert(pstoren(v1, 2) == 3);
+ assert(pstoren(v1, 3) == 4);
+ assert(!pequals(v1, v2));
+ assert(pequals(v1, v1));
+ assert(pequals(v2, v2));
+
+ assert(!pequals(v1, ploadf32x4(0,2,3,4) ));
+ assert(!pequals(v1, ploadf32x4(1,0,3,4) ));
+ assert(!pequals(v1, ploadf32x4(1,2,0,4) ));
+ assert(!pequals(v1, ploadf32x4(1,2,3,0) ));
+
+ assert(pequals(pswap(v1), pload(3, 4, 1, 2)));
+ assert(pequals(preverse(v1), pload(4, 3, 2, 1)));
+
+
+
+ float32x4 v3 = padd(v1, v2);
+ assert(pequals(v3, pload(6, 8, 10, 12)));
+ v3 = pmul(v1, v2);
+ assert(pequals(v3, pload(5, 12, 21, 32)));
+
+ v3 = pneg(v1);
+ assert(pequals(v3, pload(-1, -2, -3, -4)));
+
+ v3 = pset1f32x4(42);
+ assert(pequals(v3, ploadf32x4(42, 42, 42, 42)));
+
+ v3 = pzerof32x4();
+ assert(pequals(v3, ploadf32x4(0, 0, 0, 0)));
+
+ v3 = pswap(v1);
+ assert(pequals(v3, ploadf32x4(3, 4, 1, 2)));
+ v3 = preverse(v1);
+ assert(pequals(v3, ploadf32x4(4, 3, 2, 1)));
+
+ assert(paddelems(v1) == 10);
+ }
+#endif
+
+
+ }
+}

deadbeef-1.9.6.tar.bz2/external/ddb_dsp_libretro/sinc_resampler.h Added

@@ -0,0 +1,622 @@
+/* Copyright (C) 2010-2018 The RetroArch team
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+ /* Modified by Janne Hyvärinen */
+ /* Modified some more by Peter Pawlowski */
+
+#pragma once
+
+#define __forceinline
+
+#include "ppsimd/ppsimd.h"
+#include <stdint.h>
+#include <stdlib.h>
+#include <math.h>
+#if !__APPLE__
+#include <malloc.h>
+#endif
+
+#ifdef _MSC_VER
+#define _NOALIAS __declspec(noalias)
+#define _RESTRICT __declspec(restrict)
+#endif
+
+#ifndef _NOALIAS
+#define _NOALIAS
+#endif
+#ifndef _RESTRICT
+#define _RESTRICT
+#endif
+
+/* API definitions */
+
+enum resampler_quality { /* Rough SNR values for upsampling: */
+ RESAMPLER_QUALITY_LOWEST = 0, /* LOWEST: 40 dB */
+ RESAMPLER_QUALITY_LOWER, /* LOWER: 55 dB */
+ RESAMPLER_QUALITY_NORMAL, /* NORMAL: 70 dB */
+ RESAMPLER_QUALITY_HIGHER, /* HIGHER: 110 dB */
+ RESAMPLER_QUALITY_HIGHEST /* HIGHEST: 140 dB */
+};
+
+struct resampler_data {
+ const float *data_in;
+ float *data_out;
+
+ size_t input_frames;
+ size_t output_frames;
+};
+
+static bool resampler_sinc_ratio_supported(unsigned int srate_source, unsigned int srate_target, enum resampler_quality quality);
+/* returns pointer to rarch_sinc_resampler_t */
+static void *resampler_sinc_new(unsigned int srate_source, unsigned int srate_target, unsigned int num_channels, enum resampler_quality quality);
+static void resampler_sinc_flush(void *data);
+static void resampler_sinc_free(void *data);
+
+/* end of API definitions */
+
+typedef void (*resampler_sinc_process_t)(void *re_, struct resampler_data *data);
+
+enum class sinc_window {
+ NONE = 0,
+ KAISER,
+ LANCZOS
+};
+
+typedef struct rarch_sinc_resampler {
+ resampler_sinc_process_t process;
+ unsigned int num_channels;
+ double ratio;
+ unsigned int phase_bits;
+ unsigned int subphase_bits;
+ unsigned int subphase_mask;
+ unsigned int taps;
+ unsigned int ptr;
+ unsigned int skip;
+ unsigned int initial_skip;
+ uint32_t time;
+ float subphase_mod;
+ float kaiser_beta;
+ enum sinc_window window_type;
+
+ /* A buffer for phase_table, buffer_l and buffer_r
+ * are created in a single calloc().
+ * Ensure that we get as good cache locality as we can hope for. */
+ float *main_buffer;
+ float *phase_table;
+ float *buffer_l; /* left channel or beginning of channel buffer when num_channels > 2 */
+ float *buffer_r;
+} rarch_sinc_resampler_t;
+
+struct resampler_quality_settings {
+ double cutoff;
+ unsigned int sidelobes;
+ unsigned int phase_bits;
+ unsigned int subphase_bits;
+ float kaiser_beta;
+ enum sinc_window window_type;
+};
+
+static const resampler_quality_settings resampler_quality_levels5 = {
+ { 0.980, 2, 12, 10, 0.0f, sinc_window::LANCZOS }, /* RESAMPLER_QUALITY_LOWEST /*/
+ { 0.980, 4, 12, 10, 0.0f, sinc_window::LANCZOS }, /* RESAMPLER_QUALITY_LOWER /*/
+ { 0.825, 8, 8, 16, 5.5f, sinc_window::KAISER }, /* RESAMPLER_QUALITY_NORMAL /*/
+ { 0.900, 32, 10, 14, 10.5f, sinc_window::KAISER }, /* RESAMPLER_QUALITY_HIGHER /*/
+ { 0.962, 128, 10, 14, 14.5f, sinc_window::KAISER } /* RESAMPLER_QUALITY_HIGHEST /*/
+};
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846264338327
+#endif
+
+static __forceinline double sinc(double val)
+{
+ if (fabs(val) < 0.00001) return 1.0;
+ return sin(val) / val;
+}
+
+static __forceinline double besseli0(double x)
+{
+ unsigned i;
+ double sum = 0.0;
+ double factorial = 1.0;
+ double factorial_mult = 0.0;
+ double x_pow = 1.0;
+ double two_div_pow = 1.0;
+ double x_sqr = x * x;
+
+ /* Approximate. This is an infinite sum.
+ * Luckily, it converges rather fast. */
+ for (i = 0; i < 18; i++) {
+ sum += x_pow * two_div_pow / (factorial * factorial);
+
+ factorial_mult += 1.0;
+ x_pow *= x_sqr;
+ two_div_pow *= 0.25;
+ factorial *= factorial_mult;
+ }
+
+ return sum;
+}
+
+static __forceinline double kaiser_window_function(double index, double beta)
+{
+ return besseli0(beta * sqrtf((float)(1 - (index * index))));
+}
+
+static __forceinline double lanzcos_window_function(double index)
+{
+ return sinc(M_PI * index);
+}
+
+/* sinc resampler */
+template<bool bKaiser>
+static _NOALIAS void resampler_sinc_process_simd_stereo(void *re_, struct resampler_data *data)
+{
+ rarch_sinc_resampler_t *resamp = (rarch_sinc_resampler_t*)re_;
+ unsigned phases = 1 << (resamp->phase_bits + resamp->subphase_bits);
+
+ uint32_t ratio = (uint32_t)(phases / resamp->ratio + 0.5);
+ const float *input = data->data_in;
+ float *output = data->data_out;
+ size_t frames = data->input_frames;
+ size_t out_frames = 0;
+
+ while (frames) {
+ while (frames && resamp->time >= phases) {
+ /* Push in reverse to make filter more obvious. */
+ if (!resamp->ptr) resamp->ptr = resamp->taps;
+ resamp->ptr--;
+
+ resamp->buffer_lresamp->ptr + resamp->taps = resamp->buffer_lresamp->ptr = *input++;
+ resamp->buffer_rresamp->ptr + resamp->taps = resamp->buffer_rresamp->ptr = *input++;
+
+ resamp->time -= phases;
+ frames--;
+ }
+
+ while (resamp->time < phases) {
+
+ if (resamp->skip == 0) {
+ using namespace ppsimd;
+ unsigned i;
+ float32x4 sum_l, sum_r, delta;
+ float* phase_table = NULL;
+ float* delta_table = NULL;
+ const float* buffer_l = resamp->buffer_l + resamp->ptr;
+ const float* buffer_r = resamp->buffer_r + resamp->ptr;
+ unsigned taps = resamp->taps;
+ unsigned phase = resamp->time >> resamp->subphase_bits;
+
+ if (/*resamp->window_type == sinc_window::KAISER*/ bKaiser) {
+ phase_table = resamp->phase_table + phase * taps * 2;
+ delta_table = phase_table + taps;
+ delta = pset1f32x4((float)(resamp->time & resamp->subphase_mask) * resamp->subphase_mod);
+ } else {
+ phase_table = resamp->phase_table + phase * taps;
+ }
+
+ sum_r = sum_l = pzerof32x4();
+
+ for (i = 0; i < taps; i += 4) {
+ float32x4 _sinc;
+ float32x4 buf_l = ploadf32x4(buffer_l + i);
+ float32x4 buf_r = ploadf32x4(buffer_r + i);
+
+ if (/*resamp->window_type == sinc_window::KAISER*/ bKaiser) {
+ auto deltas = ploadf32x4a(delta_table + i);
+ _sinc = padd(ploadf32x4((const float*)phase_table + i), pmul(deltas, delta));
+ } else {
+ _sinc = ploadf32x4a((const float*)phase_table + i);
+ }
+ sum_l = padd(sum_l, pmul(buf_l, _sinc));
+ sum_r = padd(sum_r, pmul(buf_r, _sinc));
+ }
+
+
+#ifdef PPSIMD_SSE
+ // Original libretro SSE shuffle party
+ auto sum = _mm_add_ps(_mm_shuffle_ps(sum_l, sum_r, _MM_SHUFFLE(1, 0, 1, 0)), _mm_shuffle_ps(sum_l, sum_r, _MM_SHUFFLE(3, 2, 3, 2)));
+ sum = _mm_add_ps(_mm_shuffle_ps(sum, sum, _MM_SHUFFLE(3, 3, 1, 1)), sum);
+ _mm_store_ss(output++, sum);
+ _mm_store_ss(output++, _mm_movehl_ps(sum, sum));
+#else
+ * (output++) = paddelems(sum_l);
+ *(output++) = paddelems(sum_r);
+#endif
+
+ out_frames++;
+ } else {
+ resamp->skip--;
+ }
+ resamp->time += ratio;
+ }
+ }
+
+ data->output_frames = out_frames;
+}
+
+template<bool bKaiser>
+static _NOALIAS void resampler_sinc_process_simd(void* re_, struct resampler_data* data)
+{
+ rarch_sinc_resampler_t* resamp = (rarch_sinc_resampler_t*)re_;
+ unsigned phases = 1 << (resamp->phase_bits + resamp->subphase_bits);
+
+ uint32_t ratio = (uint32_t)(phases / resamp->ratio + 0.5);
+ const float* input = data->data_in;
+ float* output = data->data_out;
+ size_t frames = data->input_frames;
+ unsigned int channels = resamp->num_channels;
+ unsigned int taps = resamp->taps;
+ size_t out_frames = 0;
+
+ while (frames) {
+ unsigned int c;
+ while (frames && resamp->time >= phases) {
+ /* Push in reverse to make filter more obvious. */
+ if (!resamp->ptr) resamp->ptr = resamp->taps;
+ resamp->ptr--;
+
+ for (c = 0; c < channels; ++c) {
+ resamp->buffer_l(resamp->ptr + resamp->taps) + (c * 2 * resamp->taps) = resamp->buffer_l(resamp->ptr) + (c * 2 * resamp->taps) = *input++;
+ }
+
+ resamp->time -= phases;
+ frames--;
+ }
+
+ while (resamp->time < phases) {
+
+ if (resamp->skip == 0) {
+ using namespace ppsimd;
+ unsigned i;
+ float32x4 delta;
+ float* phase_table, * delta_table;
+ const float* buffer_l = resamp->buffer_l + resamp->ptr;
+ unsigned int phase = resamp->time >> resamp->subphase_bits;
+ if (bKaiser) {
+ phase_table = resamp->phase_table + phase * taps * 2;
+ delta_table = phase_table + taps;
+ delta = pset1f32x4((float)(resamp->time & resamp->subphase_mask) * resamp->subphase_mod);
+ } else {
+ phase_table = resamp->phase_table + phase * taps;
+ }
+
+ for (c = 0; c < channels; c++) {
+
+ const float* pbuf_l = buffer_l + (c * 2 * taps);
+ float32x4 sum = pzerof32x4();
+
+ for (i = 0; i < taps; i += 4) {
+ auto sinc_val = ploadf32x4a(&phase_tablei);
+ if (bKaiser) sinc_val = padd(sinc_val, pmul(ploadf32x4a(&delta_tablei), delta));
+
+ sum = padd(sum, pmul(ploadf32x4(pbuf_l), sinc_val));
+ pbuf_l += 4;
+ }
+
+ *output++ = paddelems(sum);
+ }
+ out_frames++;
+ } else {
+ resamp->skip--;
+ }
+
+ resamp->time += ratio;
+ }
+ }
+
+ data->output_frames = out_frames;
+}
+
+static _NOALIAS void resampler_sinc_process_c(void *re_, struct resampler_data *data)
+{
+ rarch_sinc_resampler_t *resamp = (rarch_sinc_resampler_t*)re_;
+ unsigned phases = 1 << (resamp->phase_bits + resamp->subphase_bits);
+
+ uint32_t ratio = (uint32_t)(phases / resamp->ratio + 0.5);
+ const float *input = data->data_in;
+ float *output = data->data_out;
+ size_t frames = data->input_frames;
+ unsigned int channels = resamp->num_channels;
+ unsigned int taps = resamp->taps;
+ size_t out_frames = 0;
+
+ while (frames) {
+ unsigned int c;
+ while (frames && resamp->time >= phases) {
+ /* Push in reverse to make filter more obvious. */
+ if (!resamp->ptr) resamp->ptr = resamp->taps;
+ resamp->ptr--;
+
+ for (c = 0; c < channels; ++c) {
+ resamp->buffer_l(resamp->ptr + resamp->taps) + (c*2*resamp->taps) = resamp->buffer_l(resamp->ptr) + (c*2*resamp->taps) = *input++;
+ }
+
+ resamp->time -= phases;
+ frames--;
+ }
+
+ while (resamp->time < phases) {
+ unsigned i;
+ float delta = 0.0;
+ float *phase_table, *delta_table = nullptr;
+ const float *buffer_l = resamp->buffer_l + resamp->ptr;
+ unsigned int phase = resamp->time >> resamp->subphase_bits;
+
+ if (resamp->window_type == sinc_window::KAISER) {
+ phase_table = resamp->phase_table + phase * taps * 2;
+ delta_table = phase_table + taps;
+ delta = (float)(resamp->time & resamp->subphase_mask) * resamp->subphase_mod;
+ } else {
+ phase_table = resamp->phase_table + phase * taps;
+ }
+
+ for (c = 0; c < channels; c++) {
+ float sum = 0.0f;
+
+ for (i = 0; i < taps; i++) {
+ float sinc_val = phase_tablei;
+ if (resamp->window_type == sinc_window::KAISER) sinc_val += delta_tablei * delta;
+ sum += buffer_li + (c*2*taps) * sinc_val;
+ }
+
+ if (resamp->skip == 0) *output++ = sum;
+ }
+
+ if (resamp->skip == 0) {
+ out_frames++;
+ } else {
+ resamp->skip--;
+ }
+
+ resamp->time += ratio;
+ }
+ }
+
+ data->output_frames = out_frames;
+}
+
+static _NOALIAS void sinc_init_table_kaiser(rarch_sinc_resampler_t *resamp, double cutoff, float *phase_table, int phases, int taps, bool calculate_delta)
+{
+ int i, j;
+ double window_mod = kaiser_window_function(0.0, resamp->kaiser_beta); /* Need to normalize w(0) to 1.0. */
+ int stride = calculate_delta ? 2 : 1;
+ double sidelobes = taps / 2.0;
+
+ for (i = 0; i < phases; i++) {
+ for (j = 0; j < taps; j++) {
+ double sinc_phase;
+ float val;
+ int n = j * phases + i;
+ double window_phase = (double)n / (phases * taps); /* 0, 1). */
+ window_phase = 2.0 * window_phase - 1.0; /* -1, 1) */
+ sinc_phase = sidelobes * window_phase;
+ val = (float)(cutoff * sinc(M_PI * sinc_phase * cutoff) * kaiser_window_function(window_phase, resamp->kaiser_beta) / window_mod);
+ phase_tablei * stride * taps + j = val;
+ }
+ }
+
+ if (calculate_delta) {
+ int phase;
+ int p;
+
+ for (p = 0; p < phases - 1; p++) {
+ for (j = 0; j < taps; j++) {
+ float delta = phase_table(p + 1) * stride * taps + j - phase_tablep * stride * taps + j;
+ phase_table(p * stride + 1) * taps + j = delta;
+ }
+ }
+
+ phase = phases - 1;
+ for (j = 0; j < taps; j++) {
+ float val, delta;
+ double sinc_phase;
+ int n = j * phases + (phase + 1);
+ double window_phase = (double)n / (phases * taps); /* (0, 1. */
+ window_phase = 2.0 * window_phase - 1.0; /* (-1, 1 */
+ sinc_phase = sidelobes * window_phase;
+
+ val = (float)(cutoff * sinc(M_PI * sinc_phase * cutoff) * kaiser_window_function(window_phase, resamp->kaiser_beta) / window_mod);
+ delta = (val - phase_tablephase * stride * taps + j);
+ phase_table(phase * stride + 1) * taps + j = delta;
+ }
+ }
+}
+
+static _NOALIAS void sinc_init_table_lanczos(rarch_sinc_resampler_t *resamp, double cutoff, float *phase_table, int phases, int taps, bool calculate_delta)
+{
+ int i, j;
+ double window_mod = lanzcos_window_function(0.0); /* Need to normalize w(0) to 1.0. */
+ int stride = calculate_delta ? 2 : 1;
+ double sidelobes = taps / 2.0;
+
+ for (i = 0; i < phases; i++) {
+ for (j = 0; j < taps; j++) {
+ double sinc_phase;
+ float val;
+ int n = j * phases + i;
+ double window_phase = (double)n / (phases * taps); /* 0, 1). */
+ window_phase = 2.0 * window_phase - 1.0; /* -1, 1) */
+ sinc_phase = sidelobes * window_phase;
+ val = (float)(cutoff * sinc(M_PI * sinc_phase * cutoff) * lanzcos_window_function(window_phase) / window_mod);
+ phase_tablei * stride * taps + j = val;
+ }
+ }
+
+ if (calculate_delta) {
+ int phase;
+ int p;
+
+ for (p = 0; p < phases - 1; p++) {
+ for (j = 0; j < taps; j++) {
+ float delta = phase_table(p + 1) * stride * taps + j - phase_tablep * stride * taps + j;
+ phase_table(p * stride + 1) * taps + j = delta;
+ }
+ }
+
+ phase = phases - 1;
+ for (j = 0; j < taps; j++) {
+ float val, delta;
+ double sinc_phase;
+ int n = j * phases + (phase + 1);
+ double window_phase = (double)n / (phases * taps); /* (0, 1. */
+ window_phase = 2.0 * window_phase - 1.0; /* (-1, 1 */
+ sinc_phase = sidelobes * window_phase;
+
+ val = (float)(cutoff * sinc(M_PI * sinc_phase * cutoff) * lanzcos_window_function(window_phase) / window_mod);
+ delta = (val - phase_tablephase * stride * taps + j);
+ phase_table(phase * stride + 1) * taps + j = delta;
+ }
+ }
+}
+
+static bool resampler_sinc_ratio_supported(unsigned int srate_source, unsigned int srate_target, enum resampler_quality quality)
+{
+ if (srate_source > 0 && srate_target > 0) {
+ double ratio;
+ unsigned int taps, phase_bits, subphase_bits, phases;
+ if (quality < RESAMPLER_QUALITY_LOWEST || quality > RESAMPLER_QUALITY_HIGHEST) quality = RESAMPLER_QUALITY_NORMAL;
+
+ taps = resampler_quality_levelsquality.sidelobes * 2;
+ phase_bits = resampler_quality_levelsquality.phase_bits;
+ subphase_bits = resampler_quality_levelsquality.subphase_bits;
+
+ ratio = (double)srate_target / (double)srate_source;
+ if (ratio < 1.0) {
+ double new_taps = ceil(taps / ratio);
+ if (new_taps >= (UINT32_MAX-4)) return false;
+ taps = (unsigned int)new_taps;
+ }
+
+ phases = 1 << (phase_bits + subphase_bits);
+ ratio = (double)phases / ratio;
+ if (ratio >= UINT32_MAX) return false;
+
+ return true;
+ }
+
+ return false;
+}
+
+#ifdef _WIN32
+static void *resampler_buffer_alloc(size_t alignment, size_t size) {
+ return _aligned_malloc(size, alignment);
+}
+static void resampler_buffer_free(void *buffer) {
+ _aligned_free (buffer);
+}
+#else
+static void *resampler_buffer_alloc(size_t alignment, size_t size) {
+ void *ptr = nullptr;
+ if (0 != posix_memalign(&ptr, alignment, size)) {
+ return nullptr;
+ }
+ return ptr;
+}
+static void resampler_buffer_free(void *buffer) {
+ free (buffer);
+}
+#endif
+
+static _NOALIAS _RESTRICT void *resampler_sinc_new(unsigned int srate_source, unsigned int srate_target, unsigned int num_channels, enum resampler_quality quality)
+{
+ ppsimd::selftest();
+ rarch_sinc_resampler_t *re;
+ double cutoff;
+ size_t phase_elems, elems, i;
+ if (!resampler_sinc_ratio_supported(srate_source, srate_target, quality)) return NULL;
+
+ re = (rarch_sinc_resampler_t *)calloc(1, sizeof(*re));
+ if (!re) return NULL;
+
+ if (quality < RESAMPLER_QUALITY_LOWEST || quality > RESAMPLER_QUALITY_HIGHEST) quality = RESAMPLER_QUALITY_NORMAL;
+
+ cutoff = resampler_quality_levelsquality.cutoff;
+ re->taps = resampler_quality_levelsquality.sidelobes * 2;
+ re->phase_bits = resampler_quality_levelsquality.phase_bits;
+ re->subphase_bits = resampler_quality_levelsquality.subphase_bits;
+ re->kaiser_beta = resampler_quality_levelsquality.kaiser_beta;
+ re->window_type = resampler_quality_levelsquality.window_type;
+
+ re->subphase_mask = (1 << re->subphase_bits) - 1;
+ re->subphase_mod = 1.0f / (1 << re->subphase_bits);
+ re->num_channels = num_channels;
+ re->ratio = (double)srate_target / (double)srate_source;
+ re->initial_skip = re->taps / 2;
+ re->skip = re->initial_skip;
+
+ /* Downsampling, must lower cutoff, and extend number of
+ * taps accordingly to keep same stopband attenuation. */
+ if (re->ratio < 1.0) {
+ cutoff *= re->ratio;
+ re->taps = (unsigned)ceil(re->taps / re->ratio);
+ }
+
+ /* Be SIMD-friendly. */
+ re->taps = (re->taps + 3) & ~3;
+
+ phase_elems = ((1 << re->phase_bits) * re->taps);
+ if (re->window_type == sinc_window::KAISER) phase_elems *= 2;
+ elems = phase_elems + (2*num_channels) * re->taps;
+
+ re->main_buffer = (float *)resampler_buffer_alloc(128, sizeof(float) * elems);
+ if (!re->main_buffer) {
+ resampler_sinc_free(re);
+ return NULL;
+ }
+
+ for (i = 0; i < elems; ++i) {
+ re->main_bufferi = 0.0f;
+ }
+
+ re->phase_table = re->main_buffer;
+ re->buffer_l = re->main_buffer + phase_elems;
+ if (num_channels == 2) re->buffer_r = re->buffer_l + 2 * re->taps;
+
+ switch (re->window_type) {
+ default:
+ case sinc_window::LANCZOS:
+ sinc_init_table_lanczos(re, cutoff, re->phase_table, 1 << re->phase_bits, re->taps, false);
+ break;
+ case sinc_window::KAISER:
+ sinc_init_table_kaiser(re, cutoff, re->phase_table, 1 << re->phase_bits, re->taps, true);
+ break;
+ }
+ const bool bKaiser = (re->window_type == sinc_window::KAISER);
+ re->process = bKaiser ? resampler_sinc_process_simd<true> : resampler_sinc_process_simd<false>;
+ if (num_channels == 2) {
+ re->process = bKaiser ? resampler_sinc_process_simd_stereo<true> : resampler_sinc_process_simd_stereo<false>;
+ }
+
+ return re;
+}
+
+static _NOALIAS void resampler_sinc_flush(void *data)
+{
+ rarch_sinc_resampler_t *resamp = (rarch_sinc_resampler_t*)data;
+ resamp->ptr = 0;
+ resamp->time = 0;
+ resamp->skip = resamp->initial_skip;
+}
+
+static _NOALIAS void resampler_sinc_free(void *data)
+{
+ rarch_sinc_resampler_t *resamp = (rarch_sinc_resampler_t*)data;
+ if (resamp) resampler_buffer_free((void *)resamp->main_buffer);
+ free(resamp);
+}

deadbeef-1.9.6.tar.bz2/external/ddb_output_pw Added

deadbeef-1.9.6.tar.bz2/external/ddb_output_pw/Makefile.am Added

deadbeef-1.9.6.tar.bz2/external/ddb_output_pw/Makefile.in Added

@@ -0,0 +1,780 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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 = external/ddb_output_pw
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+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, filesdir }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+@HAVE_PIPEWIRE_TRUE@ddb_out_pw_la_DEPENDENCIES = \
+@HAVE_PIPEWIRE_TRUE@	$(am__DEPENDENCIES_1)
+am__ddb_out_pw_la_SOURCES_DIST = pw.c
+@HAVE_PIPEWIRE_TRUE@am_ddb_out_pw_la_OBJECTS = ddb_out_pw_la-pw.lo
+ddb_out_pw_la_OBJECTS = $(am_ddb_out_pw_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ddb_out_pw_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ddb_out_pw_la_CFLAGS) \
+	$(CFLAGS) $(ddb_out_pw_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_PIPEWIRE_TRUE@am_ddb_out_pw_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(ddb_out_pw_la_SOURCES)
+DIST_SOURCES = $(am__ddb_out_pw_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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_PIPEWIRE_TRUE@pkglib_LTLIBRARIES = ddb_out_pw.la
+@HAVE_PIPEWIRE_TRUE@ddb_out_pw_la_SOURCES = pw.c
+@HAVE_PIPEWIRE_TRUE@ddb_out_pw_la_LDFLAGS = -module -avoid-version
+@HAVE_PIPEWIRE_TRUE@ddb_out_pw_la_CFLAGS = $(CFLAGS) $(PIPEWIRE_DEPS_CFLAGS) -DPW_ENABLE_DEPRECATED -std=c99 -I@top_srcdir@/include
+@HAVE_PIPEWIRE_TRUE@ddb_out_pw_la_LIBADD = $(LDADD) $(PIPEWIRE_DEPS_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 --ignore-deps external/ddb_output_pw/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps external/ddb_output_pw/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)
+	@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 " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
+	 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)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+
+ddb_out_pw.la: $(ddb_out_pw_la_OBJECTS) $(ddb_out_pw_la_DEPENDENCIES) $(EXTRA_ddb_out_pw_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(ddb_out_pw_la_LINK) $(am_ddb_out_pw_la_rpath) $(ddb_out_pw_la_OBJECTS) $(ddb_out_pw_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+ddb_out_pw_la-pw.lo: pw.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_out_pw_la_CFLAGS) $(CFLAGS) -c -o ddb_out_pw_la-pw.lo `test -f 'pw.c' || echo '$(srcdir)/'`pw.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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 -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 -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 TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am 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 tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/external/ddb_output_pw/pw.c Added

@@ -0,0 +1,833 @@
+/*
+ PipeWire output plugin for DeaDBeeF Player
+ Copyright (C) 2020 Nicolai Syvertsen <saivert@saivert.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/>.
+*/
+
+#include <spa/param/audio/format-utils.h>
+#include <spa/param/props.h>
+#include <pipewire/pipewire.h>
+
+#include <errno.h>
+#include <string.h>
+#include <stdbool.h>
+#include <deadbeef/deadbeef.h>
+
+#define OP_ERROR_SUCCESS 0
+#define OP_ERROR_INTERNAL -1
+
+#define CONFSTR_DDBPW_VOLUMECONTROL "pipewire.volumecontrol"
+#define DDBPW_DEFAULT_VOLUMECONTROL 0
+#define CONFSTR_DDBPW_REMOTENAME "pipewire.remotename"
+#define CONFSTR_DDBPW_PROPS "pipewire.properties"
+#define DDBPW_DEFAULT_REMOTENAME ""
+
+#ifdef DDBPW_DEBUG
+#define trace(...) { fprintf(stdout, __VA_ARGS__); }
+#else
+#define trace(fmt,...)
+#endif
+
+#define log_err(...) { deadbeef->log_detailed (&plugin.plugin, DDB_LOG_LAYER_DEFAULT, __VA_ARGS__); }
+
+DB_functions_t * deadbeef;
+static DB_output_t plugin;
+static char plugin_description1024;
+
+#define PW_PLUGIN_ID "pipewire"
+
+static const char application_title = "DeaDBeeF Music Player";
+static const char application_id = "music.deadbeef.player";
+
+static char *tfbytecode;
+
+static ddb_waveformat_t requested_fmt;
+static ddb_playback_state_t state=DDB_PLAYBACK_STATE_STOPPED;
+static uintptr_t mutex;
+static int _setformat_requested;
+static float _initialvol;
+static int _buffersize;
+
+struct data {
+ struct pw_thread_loop *loop;
+ struct pw_stream *stream;
+ int pw_has_init;
+};
+
+struct data data = { 0, };
+
+static int ddbpw_init(void);
+
+static int ddbpw_free(void);
+
+static int ddbpw_setformat(ddb_waveformat_t *fmt);
+
+static int ddbpw_play(void);
+
+static int ddbpw_stop(void);
+
+static int ddbpw_pause(void);
+
+static int ddbpw_unpause(void);
+
+static int ddbpw_set_spec(ddb_waveformat_t *fmt);
+
+static void my_pw_init(void) {
+ if (data.pw_has_init || state != DDB_PLAYBACK_STATE_STOPPED) {
+ return;
+ }
+ pw_init(NULL, NULL);
+ data.pw_has_init = 1;
+}
+
+static void my_pw_deinit(void) {
+ if (!data.pw_has_init || state != DDB_PLAYBACK_STATE_STOPPED) {
+ return;
+ }
+ pw_deinit();
+ data.pw_has_init = 0;
+}
+
+static int _apply_format(struct spa_loop *loop,
+ bool async,
+ uint32_t seq,
+ const void *_data,
+ size_t size,
+ void *user_data) {
+ deadbeef->mutex_lock(mutex);
+
+ pw_stream_disconnect(data.stream);
+ ddbpw_set_spec(&requested_fmt);
+ _setformat_requested = 0;
+
+ deadbeef->mutex_unlock(mutex);
+
+ trace("From inside loop invoke function! %d\n", seq);
+ return 0;
+}
+
+static void on_process(void *userdata) {
+ struct data *data = userdata;
+ struct pw_buffer *b = NULL;
+ struct spa_buffer *buf = NULL;
+ int16_t *dst = NULL;
+
+ if (!_setformat_requested) {
+ if ((b = pw_stream_dequeue_buffer(data->stream)) == NULL) {
+ pw_log_warn("out of buffers: %m");
+ return;
+ }
+
+ buf = b->buffer;
+ if ((dst = buf->datas0.data) == NULL) {
+ return;
+ }
+
+ int len = _buffersize;
+ if (len > buf->datas0.maxsize) {
+ len = buf->datas0.maxsize;
+ }
+ int bytesread=0;
+ if (deadbeef->streamer_ok_to_read(-1)) {
+ bytesread = deadbeef->streamer_read (buf->datas0.data , len);
+ } 
+
+ buf->datas0.chunk->offset = 0;
+ buf->datas0.chunk->stride = 1;
+ buf->datas0.chunk->size = bytesread;
+ pw_stream_queue_buffer(data->stream, b);
+ if (bytesread <= 0) {
+ pw_stream_flush(data->stream, 0);
+ }
+ }
+}
+
+static void
+set_volume(int dolock, float volume) {
+ if (data.stream && state != DDB_PLAYBACK_STATE_STOPPED) {
+ float volSPA_AUDIO_MAX_CHANNELS = {0};
+
+ for (int i = 0; i < plugin.fmt.channels; i++) {
+ voli = volume;
+ }
+
+ if (dolock) {
+ pw_thread_loop_lock(data.loop);
+ }
+ pw_stream_set_control(data.stream, SPA_PROP_channelVolumes, plugin.fmt.channels, vol, 0);
+ if (dolock) {
+ pw_thread_loop_unlock(data.loop);
+ }
+ }
+}
+
+static void on_state_changed(void *_data, enum pw_stream_state old,
+ enum pw_stream_state pwstate, const char *error) {
+ trace("PipeWire: Stream state %s\n", pw_stream_state_as_string(pwstate));
+
+ if (_setformat_requested) {
+ return;
+ }
+
+ if (pwstate == PW_STREAM_STATE_ERROR || (state == DDB_PLAYBACK_STATE_PLAYING && pwstate == PW_STREAM_STATE_UNCONNECTED ) ) {
+ log_err("PipeWire: Stream error: %s\n", error);
+ deadbeef->sendmessage(DB_EV_STOP, 0, 0, 0);
+ }
+}
+
+static void on_control_info(void *_data, uint32_t id, const struct pw_stream_control *control) {
+#ifdef DDBPW_DEBUG
+
+ fprintf(stderr, "PipeWire: Control %s", control->name);
+ for (int i = 0; i < control->n_values; i++) {
+ fprintf(stderr, " value%d = %f", i, control->valuesi);
+ }
+ fprintf(stderr, "\n");
+#endif
+
+ if (id == SPA_PROP_channelVolumes && plugin.has_volume) {
+ float dbvol = deadbeef->volume_get_amp();
+ int changedvolume = 0;
+ for (int i = 0; i < control->n_values; i++) {
+ if (control->valuesi != dbvol) {
+ changedvolume = i;
+ break;
+ }
+ }
+
+ deadbeef->volume_set_amp(control->valueschangedvolume);
+ }
+}
+
+static void on_param_changed(void *userdata, uint32_t id, const struct spa_pod *param) {
+ if (id != SPA_PARAM_Format || param == NULL) {
+ return;
+ }
+
+ if (plugin.has_volume) {
+ set_volume(0, _initialvol);
+ }
+}
+
+static const struct pw_stream_events stream_events = {
+ PW_VERSION_STREAM_EVENTS,
+ .process = on_process,
+ .state_changed = on_state_changed,
+ .control_info = on_control_info,
+ .param_changed = on_param_changed,
+};
+
+static void do_update_media_props(DB_playItem_t *track, struct pw_properties *props) {
+ int rc = 0, notrackgiven=0;
+
+ ddb_tf_context_t ctx = {
+ ._size = sizeof(ddb_tf_context_t),
+ .flags = DDB_TF_CONTEXT_NO_DYNAMIC,
+ .plt = NULL,
+ .iter = PL_MAIN
+ };
+
+ if (!track) {
+ track = deadbeef->streamer_get_playing_track_safe();
+ if (track == NULL) {
+ return;
+ }
+ notrackgiven = 1;
+ }
+
+ struct spa_dict_item items3 = {0};
+ int n_items = 0;
+
+ char buf1000 = {0};
+ const char *artist = NULL;
+ const char *title = NULL;
+
+ ctx.it = track;
+ if (deadbeef->tf_eval(&ctx, tfbytecode, buf, sizeof(buf)) > 0) {
+ itemsn_items++ = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_NAME, buf);
+ }
+
+ deadbeef->pl_lock();
+ artist = deadbeef->pl_find_meta(track, "artist");
+ title = deadbeef->pl_find_meta(track, "title");
+
+ if (artist) {
+ itemsn_items++ = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_ARTIST, artist);
+ }
+
+ if (title) {
+ itemsn_items++ = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_TITLE, title);
+ }
+
+ if (props) {
+ pw_properties_update(props, &SPA_DICT_INIT(items, n_items));
+ } else {
+ rc = pw_stream_update_properties(data.stream, &SPA_DICT_INIT(items, n_items));
+ if (rc < 0) {
+ trace("PipeWire: Error updating properties!\n");
+ }
+ }
+
+ deadbeef->pl_unlock();
+ if (notrackgiven) {
+ deadbeef->pl_item_unref(track);
+ }
+}
+
+static int ddbpw_init(void) {
+ trace ("ddbpw_init\n");
+
+ my_pw_init();
+
+ state = DDB_PLAYBACK_STATE_STOPPED;
+ _setformat_requested = 0;
+ _buffersize = 0;
+
+ if (requested_fmt.samplerate != 0) {
+ memcpy (&plugin.fmt, &requested_fmt, sizeof (ddb_waveformat_t));
+ }
+
+ data.loop = pw_thread_loop_new("ddb_out_pw", NULL);
+
+ char dev256 = {0};
+ char remote256 = {0};
+ char propstr256 = {0};
+ deadbeef->conf_get_str (PW_PLUGIN_ID "_soundcard", "default", dev, sizeof(dev));
+
+ deadbeef->conf_get_str(CONFSTR_DDBPW_REMOTENAME, DDBPW_DEFAULT_REMOTENAME, remote, sizeof(remote));
+
+ deadbeef->conf_get_str(CONFSTR_DDBPW_PROPS, "", propstr, sizeof(propstr));
+
+ struct pw_properties *props = pw_properties_new(
+ PW_KEY_REMOTE_NAME, (remote0 ? remote: NULL),
+ PW_KEY_NODE_NAME, application_title,
+ PW_KEY_APP_NAME, application_title,
+ PW_KEY_APP_ID, application_id,
+ PW_KEY_APP_ICON_NAME, "deadbeef",
+ PW_KEY_MEDIA_TYPE, "Audio",
+ PW_KEY_MEDIA_CATEGORY, "Playback",
+ PW_KEY_MEDIA_ROLE, "Music",
+ PW_KEY_NODE_TARGET, (!strcmp(dev, "default")) ? NULL: dev,
+ NULL);
+ do_update_media_props(NULL, props);
+ pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%u", plugin.fmt.samplerate);
+
+ pw_properties_update_string(props, propstr, strlen(propstr));
+
+ data.stream = pw_stream_new_simple(
+ pw_thread_loop_get_loop(data.loop),
+ application_title,
+ props,
+ &stream_events,
+ &data);
+
+ if (!data.stream) {
+ log_err("PipeWire: Error creating stream!");
+ return OP_ERROR_INTERNAL;
+ }
+
+
+ return OP_ERROR_SUCCESS;
+}
+
+static int ddbpw_setformat (ddb_waveformat_t *fmt) {
+ trace("Pipewire: setformat called!\n");
+ deadbeef->mutex_lock(mutex);
+ _setformat_requested = 1;
+ memcpy (&requested_fmt, fmt, sizeof (ddb_waveformat_t));
+
+ if (data.stream == 0) {
+ deadbeef->mutex_unlock(mutex);
+ return 0;
+ }
+ pw_thread_loop_lock(data.loop);
+ pw_stream_set_active(data.stream, false);
+ pw_loop_invoke(pw_thread_loop_get_loop(data.loop), _apply_format, 1, NULL, 0, false, NULL);
+ pw_thread_loop_unlock(data.loop);
+
+ deadbeef->mutex_unlock(mutex);
+ return 0;
+}
+
+static int ddbpw_free(void) {
+ trace("ddbpw_free\n");
+
+ state = DDB_PLAYBACK_STATE_STOPPED;
+
+ if (!data.loop) {
+ return 0;
+ }
+ deadbeef->mutex_lock(mutex);
+
+ pw_thread_loop_stop(data.loop);
+
+ pw_stream_destroy(data.stream);
+ data.stream = NULL;
+
+ pw_thread_loop_destroy(data.loop);
+ data.loop = NULL;
+ deadbeef->mutex_unlock(mutex);
+ my_pw_deinit();
+ return OP_ERROR_SUCCESS;
+}
+
+static void set_channel_map(int channels, struct spa_audio_info_raw* audio_info) {
+ /* Following http://www.microsoft.com/whdc/device/audio/multichaud.mspx#EKLAC */
+
+ switch (channels) {
+ case 1:
+ audio_info->position0 = SPA_AUDIO_CHANNEL_MONO;
+ return;
+
+ case 18:
+ audio_info->position15 = SPA_AUDIO_CHANNEL_TRL;
+ audio_info->position16 = SPA_AUDIO_CHANNEL_TRC;
+ audio_info->position17 = SPA_AUDIO_CHANNEL_TRR;
+ /* Fall through */
+
+ case 15:
+ audio_info->position12 = SPA_AUDIO_CHANNEL_TFL;
+ audio_info->position13 = SPA_AUDIO_CHANNEL_TFC;
+ audio_info->position14 = SPA_AUDIO_CHANNEL_TFR;
+ /* Fall through */
+
+ case 12:
+ audio_info->position11 = SPA_AUDIO_CHANNEL_TC;
+ /* Fall through */
+
+ case 11:
+ audio_info->position9 = SPA_AUDIO_CHANNEL_SL;
+ audio_info->position10 = SPA_AUDIO_CHANNEL_SR;
+ /* Fall through */
+
+ case 9:
+ audio_info->position8 = SPA_AUDIO_CHANNEL_RC;
+ /* Fall through */
+
+ case 8:
+ audio_info->position6 = SPA_AUDIO_CHANNEL_FLC;
+ audio_info->position7 = SPA_AUDIO_CHANNEL_FRC;
+ /* Fall through */
+
+ case 6:
+ audio_info->position4 = SPA_AUDIO_CHANNEL_RL;
+ audio_info->position5 = SPA_AUDIO_CHANNEL_RR;
+ /* Fall through */
+
+ case 4:
+ audio_info->position3 = SPA_AUDIO_CHANNEL_LFE;
+ /* Fall through */
+
+ case 3:
+ audio_info->position2 = SPA_AUDIO_CHANNEL_FC;
+ /* Fall through */
+
+ case 2:
+ audio_info->position0 = SPA_AUDIO_CHANNEL_FL;
+ audio_info->position1 = SPA_AUDIO_CHANNEL_FR;
+
+ }
+}
+
+static struct spa_pod * makeformat(ddb_waveformat_t *fmt, uint8_t *buffer, size_t buffer_size) {
+
+ enum spa_audio_format pwfmt = 0;
+
+ switch (fmt->bps) {
+ case 8:
+ pwfmt = SPA_AUDIO_FORMAT_S8;
+ break;
+ case 16:
+ pwfmt = SPA_AUDIO_FORMAT_S16_LE;
+ break;
+ case 24:
+ pwfmt = SPA_AUDIO_FORMAT_S24_LE;
+ break;
+ case 32:
+ if (fmt->is_float) {
+ pwfmt = SPA_AUDIO_FORMAT_F32_LE;
+ }
+ else {
+ pwfmt = SPA_AUDIO_FORMAT_S32_LE;
+ }
+ break;
+ default:
+ return NULL;
+ };
+
+
+
+ struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, buffer_size);
+
+ struct spa_audio_info_raw rawinfo = SPA_AUDIO_INFO_RAW_INIT(
+ .flags = 0,
+ .format = pwfmt,
+ .channels = fmt->channels,
+ .rate = fmt->samplerate
+ );
+
+ set_channel_map(fmt->channels, &rawinfo);
+
+ return spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat, &rawinfo);
+
+}
+
+static int ddbpw_set_spec(ddb_waveformat_t *fmt) {
+ memcpy (&plugin.fmt, fmt, sizeof (ddb_waveformat_t));
+ if (!plugin.fmt.channels) {
+ // generic format
+ plugin.fmt.bps = 16;
+ plugin.fmt.is_float = 0;
+ plugin.fmt.channels = 2;
+ plugin.fmt.samplerate = 44100;
+ plugin.fmt.channelmask = 3;
+ }
+
+ trace ("format %dbit %s %dch %dHz channelmask=%X\n", plugin.fmt.bps, plugin.fmt.is_float ? "float" : "int", plugin.fmt.channels, plugin.fmt.samplerate, plugin.fmt.channelmask);
+ _buffersize = plugin.fmt.bps/8 * plugin.fmt.channels * 25 * (plugin.fmt.samplerate/1000);
+
+ uint8_t spa_buffer1024;
+ const struct spa_pod *params1 = {
+ makeformat(&plugin.fmt, spa_buffer, sizeof (spa_buffer))
+ };
+
+ struct pw_properties *props = pw_properties_new(NULL, NULL);
+ pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%u", plugin.fmt.samplerate);
+ pw_stream_update_properties(data.stream, &props->dict);
+ pw_properties_free(props);
+
+ if (0 != pw_stream_connect(data.stream,
+ PW_DIRECTION_OUTPUT,
+ PW_ID_ANY,
+ PW_STREAM_FLAG_AUTOCONNECT |
+ PW_STREAM_FLAG_MAP_BUFFERS |
+ PW_STREAM_FLAG_RT_PROCESS,
+ params, 1)) {
+ log_err("PipeWire: Error connecting stream!\n");
+ if (pw_properties_get(pw_stream_get_properties(data.stream), PW_KEY_REMOTE_NAME)) {
+ log_err("PipeWire: Please check if remote daemon name is valid and daemon is up.\n")
+ }
+ return OP_ERROR_INTERNAL;
+ };
+
+
+ state = DDB_PLAYBACK_STATE_PLAYING;
+
+ return OP_ERROR_SUCCESS;
+}
+
+static void update_has_volume(void) {
+ plugin.has_volume = deadbeef->conf_get_int(CONFSTR_DDBPW_VOLUMECONTROL, DDBPW_DEFAULT_VOLUMECONTROL);
+}
+
+static int ddbpw_play(void) {
+ trace ("ddbpw_play\n");
+
+ deadbeef->mutex_lock(mutex);
+
+ update_has_volume();
+ _initialvol = plugin.has_volume ? deadbeef->volume_get_amp() : 1.0f;
+
+ if (!data.loop) {
+ ddbpw_init();
+ }
+
+
+ int ret = ddbpw_set_spec(&plugin.fmt);
+ pw_thread_loop_start(data.loop);
+ if (ret != 0) {
+ ddbpw_free();
+ }
+ deadbeef->mutex_unlock(mutex);
+ return ret;
+}
+
+static int ddbpw_stop(void) {
+ ddbpw_free();
+
+ return OP_ERROR_SUCCESS;
+}
+
+static int ddbpw_pause(void) {
+ if (!data.loop && ddbpw_play() != OP_ERROR_SUCCESS) {
+ return OP_ERROR_INTERNAL;
+ }
+
+ // set pause state
+ state = DDB_PLAYBACK_STATE_PAUSED;
+ pw_thread_loop_lock(data.loop);
+ pw_stream_flush(data.stream, 0);
+ pw_stream_set_active(data.stream, 0);
+ pw_thread_loop_unlock(data.loop);
+ return OP_ERROR_SUCCESS;
+}
+
+static int ddbpw_unpause(void) {
+ // unset pause state
+ if (state == DDB_PLAYBACK_STATE_PAUSED) {
+ state = DDB_PLAYBACK_STATE_PLAYING;
+ }
+ pw_thread_loop_lock(data.loop);
+ pw_stream_set_active(data.stream, 1);
+ pw_thread_loop_unlock(data.loop);
+ return OP_ERROR_SUCCESS;
+}
+
+
+static ddb_playback_state_t ddbpw_get_state(void) {
+ return state;
+}
+
+
+
+static int ddbpw_plugin_start(void) {
+ mutex = deadbeef->mutex_create();
+
+ tfbytecode = deadbeef->tf_compile("%artist% - %title%");
+ return 0;
+}
+
+static int ddbpw_plugin_stop(void) {
+ deadbeef->mutex_free(mutex);
+ deadbeef->tf_free(tfbytecode);
+ return 0;
+}
+
+DB_plugin_t * ddb_out_pw_load(DB_functions_t *api) {
+ deadbeef = api;
+ snprintf(plugin_description, sizeof(plugin_description),
+ "This is a PipeWire plugin.\nLinked to library version %s\n", pw_get_library_version());
+ plugin.plugin.descr = plugin_description;
+ return DB_PLUGIN (&plugin);
+}
+
+static int
+ddbpw_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ switch (id) {
+ case DB_EV_SONGSTARTED:
+ if (state == DDB_PLAYBACK_STATE_PLAYING) {
+ pw_thread_loop_lock(data.loop);
+ do_update_media_props(((ddb_event_track_t *)ctx)->track, NULL);
+ pw_thread_loop_unlock(data.loop);
+ }
+ break;
+ case DB_EV_VOLUMECHANGED:
+ if (plugin.has_volume) {
+ set_volume(1, deadbeef->volume_get_amp());
+ }
+ break;
+ case DB_EV_CONFIGCHANGED:
+ update_has_volume();
+ if (plugin.has_volume) {
+ set_volume(1, deadbeef->volume_get_amp());
+ } else {
+ set_volume(1, 1.0f);
+ }
+ break;
+ }
+ return 0;
+}
+
+struct enum_card_userdata {
+ void (*callback)(const char *name, const char *desc, void *);
+ void *userdata;
+};
+
+static void registry_event_global(void *data, uint32_t id,
+ uint32_t permissions, const char *type, uint32_t version,
+ const struct spa_dict *props) {
+ struct enum_card_userdata *enumuserdata = (struct enum_card_userdata *)data;
+
+ if (!strcmp(type, PW_TYPE_INTERFACE_Node) && props) {
+ const char *media_class = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS);
+
+ if (media_class && (!strcmp(media_class, "Audio/Sink") || !strcmp(media_class, "Audio/Duplex"))) {
+ const char *desc = spa_dict_lookup(props, PW_KEY_NODE_DESCRIPTION);
+ const char *name = spa_dict_lookup(props, PW_KEY_NODE_NAME);
+ char name_buf64;
+ if (!name) {
+ snprintf(name_buf, sizeof(name_buf), "%d", id);
+ name = name_buf;
+ }
+
+ if (!desc) {
+ desc = name;
+ }
+
+ // Avoid crazy long descriptions, they grow the GTK dropdown box in deadbeef GUI
+ // Truncate with a middle ellipsis so we catch output port names that are always at the end
+ char buf256 = { 0 };
+ if (strlen(desc) > 80) {
+ strncpy (buf, desc, 38);
+ strcat(buf, "...");
+ strcat (buf, desc+strlen(desc)-38);
+
+ }
+ else {
+ strcpy(buf, desc ? desc : "");
+ }
+
+ enumuserdata->callback(name, buf, enumuserdata->userdata);
+ }
+ }
+}
+
+static const struct pw_registry_events registry_events = {
+ PW_VERSION_REGISTRY_EVENTS,
+ .global = registry_event_global,
+};
+
+struct donedata {
+ int pending;
+ int done;
+ struct pw_main_loop *loop;
+};
+
+void core_event_done(void *object, uint32_t id, int seq) {
+ struct donedata *donedata = (struct donedata *)object;
+ if (id == PW_ID_CORE && seq == donedata->pending) {
+ donedata->done = 1;
+ pw_main_loop_quit(donedata->loop);
+ }
+}
+
+static int roundtrip(struct pw_core *core, struct pw_main_loop *loop) {
+ struct spa_hook core_listener;
+ struct donedata donedata = {0,0, loop};
+
+ const struct pw_core_events core_events = {
+ PW_VERSION_CORE_EVENTS,
+ .done = core_event_done,
+ };
+
+ spa_zero(core_listener);
+ pw_core_add_listener(core, &core_listener,
+ &core_events, &donedata);
+
+ donedata.pending = pw_core_sync(core, PW_ID_CORE, 0);
+
+ while (!donedata.done) {
+ pw_main_loop_run(loop);
+ }
+ spa_hook_remove(&core_listener);
+ return 0;
+}
+
+static void
+ddbpw_enum_soundcards(void (*callback)(const char *name, const char *desc, void *), void *userdata) {
+ struct pw_main_loop *loop = NULL;
+ struct pw_context *context = NULL;
+ struct pw_core *core = NULL;
+ struct pw_registry *registry = NULL;
+ struct spa_hook registry_listener = {0};
+ struct enum_card_userdata enumuserdata = {0};
+
+ my_pw_init();
+
+ loop = pw_main_loop_new(NULL /* properties */);
+ context = pw_context_new(pw_main_loop_get_loop(loop),
+ NULL /* properties */,
+ 0 /* user_data size */);
+ if (!context) {
+ return;
+ }
+
+ char remote256 = { 0 };
+ deadbeef->conf_get_str(CONFSTR_DDBPW_REMOTENAME, DDBPW_DEFAULT_REMOTENAME, remote, sizeof(remote));
+
+ core = pw_context_connect(context,
+ pw_properties_new(
+ PW_KEY_REMOTE_NAME, (remote0 ? remote: NULL),
+ NULL),
+ 0 /* user_data size */);
+ if (!core) {
+ return;
+ }
+
+ registry = pw_core_get_registry(core, PW_VERSION_REGISTRY,
+ 0 /* user_data size */);
+ if (!registry) {
+ return;
+ }
+
+ enumuserdata.callback = callback;
+ enumuserdata.userdata = userdata;
+
+ spa_zero(registry_listener);
+ pw_registry_add_listener(registry, &registry_listener,
+ &registry_events, &enumuserdata);
+
+ roundtrip(core, loop);
+
+ pw_proxy_destroy((struct pw_proxy *)registry);
+ pw_core_disconnect(core);
+ pw_context_destroy(context);
+ pw_main_loop_destroy(loop);
+ my_pw_deinit();
+}
+
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+
+static const char settings_dlg =
+"property \"PipeWire remote daemon name (empty for default)\" entry " CONFSTR_DDBPW_REMOTENAME " " STR(DDBPW_DEFAULT_REMOTENAME) ";\n"
+"property \"Custom properties (overrides existing ones):\" label l;\n"
+"property \"\" entry " CONFSTR_DDBPW_PROPS " \"\" ;\n"
+"property \"Use PipeWire volume control\" checkbox " CONFSTR_DDBPW_VOLUMECONTROL " " STR(DDBPW_DEFAULT_VOLUMECONTROL) ";\n";
+
+
+static DB_output_t plugin = {
+ .plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .plugin.api_vminor = DB_API_VERSION_MINOR,
+ .plugin.version_major = 0,
+ .plugin.version_minor = 1,
+ .plugin.flags = DDB_PLUGIN_FLAG_LOGGING,
+ .plugin.type = DB_PLUGIN_OUTPUT,
+ .plugin.id = PW_PLUGIN_ID,
+ .plugin.name = "PipeWire output plugin",
+ //.plugin.descr = "This is a new PipeWire plugin",
+ .plugin.copyright =
+ "Pipewire output plugin for DeaDBeeF Player\n"
+ "Copyright (C) 2020-2021 Nicolai Syvertsen <saivert@saivert.com>\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://saivert.com",
+ .plugin.start = ddbpw_plugin_start,
+ .plugin.stop = ddbpw_plugin_stop,
+ .plugin.configdialog = settings_dlg,
+ .plugin.message = ddbpw_message,
+ .init = ddbpw_init,
+ .free = ddbpw_free,
+ .setformat = ddbpw_setformat,
+ .play = ddbpw_play,
+ .stop = ddbpw_stop,
+ .pause = ddbpw_pause,
+ .unpause = ddbpw_unpause,
+ .state = ddbpw_get_state,
+ .enum_soundcards = ddbpw_enum_soundcards,
+ .has_volume = DDBPW_DEFAULT_VOLUMECONTROL,
+};

deadbeef-1.9.6.tar.bz2/external/mp4p Added

deadbeef-1.9.6.tar.bz2/external/mp4p/include Added

deadbeef-1.9.6.tar.bz2/external/mp4p/include/mp4p Added

deadbeef-1.9.6.tar.bz2/external/mp4p/include/mp4p/mp4p.h Added

@@ -0,0 +1,148 @@
+#ifndef mp4parser_h
+#define mp4parser_h
+
+#include <stdint.h>
+#include <mp4p/mp4pfile.h>
+#include <mp4p/mp4patomdata.h>
+
+
+typedef size_t (*mp4p_atom_data_write_func_t) (void *atom_data, uint8_t *buffer, uint32_t buffer_size);
+typedef void (*mp4p_atom_data_free_func_t) (void *atom_data);
+
+typedef struct mp4p_atom_s {
+ uint64_t pos;
+ uint32_t size;
+ char type4;
+ void *data;
+ struct mp4p_atom_s *subatoms;
+ struct mp4p_atom_s *next;
+
+ /// If `free` is not null, if will be called with the `data` passed as argument, to free the data
+ mp4p_atom_data_free_func_t free;
+
+ /// If `write` is null, data must point to a plain buffer of size-8 bytes, that can be saved directly
+ mp4p_atom_data_write_func_t write;
+
+ /// Special case for `meta` atom, which has both the common header and subatoms.
+ /// For this case, the version_flags is stored in data, and is written before subatoms.
+ unsigned write_data_before_subatoms : 1;
+} mp4p_atom_t;
+
+
+void
+mp4p_atom_free (mp4p_atom_t *atom);
+
+void
+mp4p_atom_free_list (mp4p_atom_t *atom);
+
+// Loading starts from the current position in the stream.
+mp4p_atom_t *
+mp4p_open (mp4p_file_callbacks_t *callbacks);
+
+mp4p_atom_t *
+mp4p_atom_find (mp4p_atom_t *root, const char *path);
+
+uint64_t
+mp4p_stts_total_num_samples (mp4p_atom_t *stts_atom);
+
+uint32_t
+mp4p_stts_sample_duration (mp4p_atom_t *stts_atom, uint32_t mp4sample);
+
+uint32_t
+mp4p_stts_mp4sample_containing_sample (mp4p_atom_t *stts_atom, uint64_t sample, uint64_t *mp4sample_startingsample);
+
+uint64_t
+mp4p_stts_total_sample_duration (mp4p_atom_t *stts_atom);
+
+uint32_t
+mp4p_sample_size (mp4p_atom_t *stsz_atom, uint32_t sample);
+
+uint64_t
+mp4p_sample_offset (mp4p_atom_t *stbl_atom, uint32_t sample);
+
+const char *
+mp4p_genre_name_for_index (uint16_t index);
+
+void
+mp4p_atom_remove_sibling(mp4p_atom_t *atom, mp4p_atom_t *sibling, int free);
+
+void
+mp4p_atom_remove_subatom (mp4p_atom_t *atom, mp4p_atom_t *subatom);
+
+mp4p_atom_t *
+mp4p_atom_new (const char *type);
+
+mp4p_atom_t *
+mp4p_atom_clone (mp4p_atom_t *src);
+
+mp4p_atom_t *
+mp4p_atom_clone_list (mp4p_atom_t *src);
+
+uint32_t
+mp4p_atom_subatom_count (mp4p_atom_t *atom);
+
+void
+mp4p_atom_update_size (mp4p_atom_t *atom);
+
+void
+mp4p_rebuild_positions (mp4p_atom_t *atom, uint64_t init_pos);
+
+mp4p_atom_t *
+mp4p_atom_insert (mp4p_atom_t *parent, mp4p_atom_t *before, mp4p_atom_t *atom);
+
+mp4p_atom_t *
+mp4p_atom_append (mp4p_atom_t *parent, mp4p_atom_t *atom);
+
+mp4p_atom_t *
+mp4p_meta_create_atom (void);
+
+mp4p_atom_t *
+mp4p_ilst_create_genre (const char *text);
+
+mp4p_atom_t *
+mp4p_ilst_create_track_disc (const char *type, uint16_t index, uint16_t total);
+
+mp4p_atom_t *
+mp4p_ilst_create_text (const char *type, const char *text);
+
+mp4p_atom_t *
+mp4p_ilst_create_custom (const char *name, const char *text);
+
+void
+mp4p_atom_dump (mp4p_atom_t *atom);
+
+void
+mp4p_hdlr_init (mp4p_atom_t *hdlr_atom, const char *type, const char *subtype, const char *manufacturer);
+
+/// @returns memcmp result of comparison of type and the atom's typs
+int
+mp4p_atom_type_compare (mp4p_atom_t *atom, const char *type);
+
+int
+mp4p_fourcc_compare (const char *value1, const char *value2);
+
+uint32_t
+mp4p_atom_to_buffer (mp4p_atom_t *atom, uint8_t *buffer, uint32_t buffer_size);
+
+int
+mp4p_update_metadata (mp4p_file_callbacks_t *callbacks, mp4p_atom_t *mp4file);
+
+mp4p_atom_t *
+mp4p_atom_meta_find_custom (mp4p_atom_t *ilst, const char *key);
+
+int
+mp4p_trak_playable (mp4p_atom_t *trak_atom);
+
+int
+mp4p_trak_has_chapters (mp4p_atom_t *trak_atom);
+
+void
+mp4p_dbg_dump_atom (mp4p_atom_t *atom);
+
+//! Project version number for mp4p.
+extern double mp4pVersionNumber;
+
+//! Project version string for mp4p.
+extern const unsigned char mp4pVersionString;
+
+#endif /* mp4parser_h */

deadbeef-1.9.6.tar.bz2/external/mp4p/include/mp4p/mp4patomdata.h Added

@@ -0,0 +1,442 @@
+//
+//  mp4patomdata.h
+//  MP4P
+//
+//  Created by Oleksiy Yakovenko on 4/7/20.
+//  Copyright © 2020 Oleksiy Yakovenko. All rights reserved.
+//
+
+#ifndef mp4patomdata_h
+#define mp4patomdata_h
+
+struct mp4p_atom_s;
+
+typedef struct {
+    uint32_t version_flags; // uint8 version and uint24 flags
+} mp4p_common_header_t;
+
+typedef struct {
+    char major_brand4;
+    char version4;
+    char compat_brand_14;
+    char compat_brand_24;
+} mp4p_mtyp_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t creation_time;
+    uint32_t modification_time;
+    uint32_t time_scale;
+    uint32_t duration;
+    uint32_t preferred_rate;
+    uint16_t preferred_volume;
+    uint8_t reserved10;
+    uint8_t matrix_structure36;
+    uint32_t preview_time;
+    uint32_t preview_duration;
+    uint32_t poster_time;
+    uint32_t selection_time;
+    uint32_t selection_duration;
+    uint32_t current_time;
+    uint32_t next_track_id;
+} mp4p_mvhd_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t creation_time;
+    uint32_t modification_time;
+    uint32_t track_id;
+    uint8_t reserved4;
+    uint32_t duration;
+    uint8_t reserved28;
+    uint16_t layer;
+    uint16_t alternate_group;
+    uint16_t volume;
+    uint8_t reserved32;
+    uint8_t matrix_structure36;
+    uint32_t track_width;
+    uint32_t track_height;
+} mp4p_tkhd_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t creation_time;
+    uint32_t modification_time;
+    uint32_t time_scale;
+    uint32_t duration;
+    uint16_t language;
+    uint16_t quality;
+} mp4p_mdhd_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    char component_type4;
+    char component_subtype4;
+    char component_manufacturer4;
+    uint32_t component_flags;
+    uint32_t component_flags_mask;
+    uint16_t buf_len;
+    char *buf;
+} mp4p_hdlr_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint16_t balance;
+    uint16_t reserved;
+} mp4p_smhd_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t number_of_entries;
+} mp4p_stsd_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t sample_count;
+    uint32_t sample_duration;
+} mp4p_stts_entry_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t number_of_entries;
+    mp4p_stts_entry_t *entries;
+} mp4p_stts_t;
+
+typedef struct {
+    uint32_t first_chunk;
+    uint32_t samples_per_chunk;
+    uint32_t sample_description_id;
+} mp4p_stsc_entry_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t number_of_entries;
+    mp4p_stsc_entry_t *entries;
+} mp4p_stsc_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t sample_size;
+} mp4p_stsz_entry_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t sample_size;
+    uint32_t number_of_entries;
+    mp4p_stsz_entry_t *entries;
+} mp4p_stsz_t;
+
+typedef struct {
+    uint64_t offset;
+} mp4p_stco_entry_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t number_of_entries;
+    mp4p_stco_entry_t *entries;
+} mp4p_stco_t;
+
+typedef mp4p_stco_t mp4p_co64_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t number_of_entries;
+} mp4p_dref_t;
+
+typedef struct {
+    uint8_t reserved6;
+    uint16_t data_reference_index;
+    uint8_t reserved28;
+    uint8_t *asc;
+    // end of actual atom data, begin of parsed values
+
+    uint32_t asc_size;
+
+    uint16_t channel_count;
+    uint16_t bps;
+    uint16_t packet_size;
+    uint32_t sample_rate;
+    uint8_t reserved32;
+} mp4p_alac_t;
+
+typedef struct {
+    uint8_t reserved6;
+    uint16_t data_reference_index;
+    uint8_t reserved28;
+    uint16_t channel_count;
+    uint16_t bps;
+    uint16_t packet_size;
+    uint32_t sample_rate;
+    uint8_t reserved32;
+} mp4p_mp4a_t;
+
+
+// opus encapsulated in mp4 https://vfrmaniac.fushizen.eu/contents/opus_in_isobmff.html
+typedef struct {
+    uint8_t reserved6;
+    uint16_t data_reference_index;
+    uint8_t reserved28;
+    uint16_t channel_count;
+    uint16_t bps;
+    uint16_t packet_size;
+    uint32_t sample_rate;
+    uint8_t reserved32;
+    // followed by dOps
+} mp4p_Opus_t;
+
+typedef struct {
+    uint8_t stream_count;
+    uint8_t coupled_count;
+    uint8_t *channel_mapping; // output_channel_count
+} mp4p_opus_channel_mapping_table_t;
+
+typedef struct {
+    uint8_t version; // 0
+    uint8_t output_channel_count;
+    uint16_t pre_skip;
+    uint32_t input_sample_rate;
+    int16_t output_gain;
+    uint8_t channel_mapping_family;
+    mp4p_opus_channel_mapping_table_t *channel_mapping_table; // output_channel_count if channel_mapping_family!=0
+} mp4p_dOps_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint32_t es_tag;
+    uint32_t es_tag_size;
+    uint8_t ignored1;
+    uint8_t ignored2;
+    uint8_t ignored3;
+    uint8_t dc_tag;
+    uint32_t dc_tag_size;
+    uint8_t dc_audiotype;
+    uint8_t dc_audiostream;
+    uint8_t dc_buffersize_db3;
+    uint32_t dc_max_bitrate;
+    uint32_t dc_avg_bitrate;
+    uint32_t ds_tag;
+
+    uint32_t asc_size;
+    char *asc;
+
+    // FIXME: what is supposed to be there?
+    uint8_t *remainder;
+    uint32_t remainder_size;
+} mp4p_esds_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+} mp4p_meta_t;
+
+typedef struct {
+    /// Tells the loader to load `mean` and `name` subatoms
+    unsigned custom : 1;
+
+    /// data_size is the size of the data atom minus the header.
+    /// it contains either the string length without 0,
+    /// or byte size of the numeric values
+    uint32_t data_size;
+    uint32_t data_version_flags;
+
+    /// The name is optional, only present in `----` atoms
+    /// If it's not null, the atom will be written with mean and name subatoms
+    char *name;
+    char *text;
+    uint16_t *values;
+    uint8_t *blob;
+} mp4p_ilst_meta_t;
+
+typedef struct {
+    uint64_t start_time;
+    uint8_t name_len;
+    char *name;
+} mp4p_chpl_entry_t;
+
+typedef struct {
+    mp4p_common_header_t ch;
+    uint8_t number_of_entries;
+    uint32_t ignore1; // FIXME: this is not in the spec, but all test files have 4 zero bytes there
+    mp4p_chpl_entry_t *entries;
+} mp4p_chpl_t;
+
+typedef struct {
+    uint32_t number_of_entries;
+    uint32_t *entries;
+} mp4p_chap_t;
+
+
+// mvhd
+int
+mp4p_mvhd_atomdata_read (mp4p_mvhd_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_mvhd_atomdata_write (mp4p_mvhd_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_mvhd_atomdata_free (void *atom_data);
+
+// tkhd
+int
+mp4p_tkhd_atomdata_read (mp4p_tkhd_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_tkhd_atomdata_write (mp4p_tkhd_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_tkhd_atomdata_free (void *atom_data);
+
+// mdhd
+int
+mp4p_mdhd_atomdata_read (mp4p_mdhd_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_mdhd_atomdata_write (mp4p_mdhd_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_mdhd_atomdata_free (void *atom_data);
+
+// hdlr
+int
+mp4p_hdlr_atomdata_read (mp4p_hdlr_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_hdlr_atomdata_write (mp4p_hdlr_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_hdlr_atomdata_free (void *atom_data);
+void
+mp4p_hdlr_init (struct mp4p_atom_s *hdlr_atom, const char *type, const char *subtype, const char *manufacturer);
+
+// smhd
+int
+mp4p_smhd_atomdata_read (mp4p_smhd_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_smhd_atomdata_write (mp4p_smhd_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_smhd_atomdata_free (void *atom_data);
+
+// stsd
+int
+mp4p_stsd_atomdata_read (mp4p_stsd_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_stsd_atomdata_write (mp4p_stsd_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_stsd_atomdata_free (void *atom_data);
+
+// stts
+int
+mp4p_stts_atomdata_read (mp4p_stts_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_stts_atomdata_write (mp4p_stts_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_stts_atomdata_free (void *data);
+
+// stsc
+int
+mp4p_stsc_atomdata_read (mp4p_stsc_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_stsc_atomdata_write (mp4p_stsc_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_stsc_atomdata_free (void *data);
+
+// stsz
+int
+mp4p_stsz_atomdata_read (mp4p_stsz_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_stsz_atomdata_write (mp4p_stsz_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_stsz_atomdata_free (void *data);
+
+// stco
+int
+mp4p_stco_atomdata_read (mp4p_stco_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_stco_atomdata_write (mp4p_stco_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_stco_atomdata_free (void *data);
+
+// co64
+int
+mp4p_co64_atomdata_read (mp4p_co64_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_co64_atomdata_write (mp4p_co64_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_co64_atomdata_free (void *data);
+
+// dref
+int
+mp4p_dref_atomdata_read (mp4p_dref_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_dref_atomdata_write (mp4p_dref_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_dref_atomdata_free (void *data);
+
+// alac
+int
+mp4p_alac_atomdata_read (mp4p_alac_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_alac_atomdata_write (mp4p_alac_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_alac_atomdata_free (void *data);
+
+// mp4a
+int
+mp4p_mp4a_atomdata_read (mp4p_mp4a_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_mp4a_atomdata_write (mp4p_mp4a_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_mp4a_atomdata_free (void *data);
+
+// Opus
+int
+mp4p_Opus_atomdata_read (mp4p_Opus_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_Opus_atomdata_write (mp4p_Opus_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_Opus_atomdata_free (void *data);
+
+// dOps
+int
+mp4p_dOps_atomdata_read (mp4p_dOps_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_dOps_atomdata_write (mp4p_dOps_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_dOps_atomdata_free (void *data);
+
+// esds
+int
+mp4p_esds_atomdata_read (mp4p_esds_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_esds_atomdata_write (mp4p_esds_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_esds_atomdata_free (void *data);
+
+// chpl
+int
+mp4p_chpl_atomdata_read (mp4p_chpl_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_chpl_atomdata_write (mp4p_chpl_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_chpl_atomdata_free (void *data);
+
+// chap
+int
+mp4p_chap_atomdata_read (mp4p_chap_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_chap_atomdata_write (mp4p_chap_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_chap_atomdata_free (void *data);
+
+// ilst_custom
+
+/// If subatoms can't be interpreted, and the function returns -1,
+/// the caller should then reinterpret this atom as opaque to preserve it.
+/// Be careful with casting the data pointer to mp4p_ilst_meta_t.
+int
+mp4p_ilst_meta_atomdata_read (mp4p_ilst_meta_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_ilst_meta_atomdata_write (mp4p_ilst_meta_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_ilst_meta_atomdata_free (void *data);
+
+// meta
+int
+mp4p_meta_atomdata_read (mp4p_meta_t *atom_data, uint8_t *buffer, size_t buffer_size);
+size_t
+mp4p_meta_atomdata_write (mp4p_meta_t *atom_data, uint8_t *buffer, size_t buffer_size);
+void
+mp4p_meta_atomdata_free (void *data);
+
+#endif /* mp4patomdata_h */

deadbeef-1.9.6.tar.bz2/external/mp4p/include/mp4p/mp4pfile.h Added

@@ -0,0 +1,36 @@
+//
+// mp4file.h
+// MP4P
+//
+// Created by Oleksiy Yakovenko on 4/6/20.
+// Copyright © 2020 Oleksiy Yakovenko. All rights reserved.
+//
+
+#ifndef mp4file_h
+#define mp4file_h
+
+#include <stdio.h>
+
+typedef struct mp4p_file_callbacks_s {
+ union {
+ void *ptrhandle;
+ int handle;
+ };
+ ssize_t (*read) (struct mp4p_file_callbacks_s *stream, void *ptr, size_t size);
+ ssize_t (*write) (struct mp4p_file_callbacks_s *stream, void *ptr, size_t size);
+ off_t (*seek) (struct mp4p_file_callbacks_s *stream, off_t offset, int whence);
+ off_t (*tell) (struct mp4p_file_callbacks_s *stream); // could be implemented via `lseek(fd, 0, SEEK_CUR)`
+ int (*truncate) (struct mp4p_file_callbacks_s *stream, off_t length);
+} mp4p_file_callbacks_t;
+
+mp4p_file_callbacks_t *
+mp4p_file_open_read (const char *fname);
+
+// Use to read and write the file transactionally -- supports reading, writing and resizing
+mp4p_file_callbacks_t *
+mp4p_file_open_readwrite (const char *fname);
+
+int
+mp4p_file_close (mp4p_file_callbacks_t *callbacks);
+
+#endif /* mp4file_h */

deadbeef-1.9.6.tar.bz2/external/mp4p/src Added

deadbeef-1.9.6.tar.bz2/external/mp4p/src/mp4p.c Added

@@ -0,0 +1,1191 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <mp4p/mp4p.h>
+
+static __thread int _dbg_indent = 0;
+
+static mp4p_atom_t *
+_atom_load (mp4p_atom_t *parent_atom, mp4p_file_callbacks_t *fp);
+
+void
+mp4p_atom_free (mp4p_atom_t *atom) {
+ if (atom->subatoms) {
+ mp4p_atom_free_list (atom->subatoms);
+ }
+
+ if (atom->free) {
+ atom->free (atom->data);
+ }
+ free (atom);
+}
+
+void
+mp4p_atom_free_list (mp4p_atom_t *atom) {
+ while (atom) {
+ mp4p_atom_t *next = atom->next;
+ mp4p_atom_free (atom);
+ atom = next;
+ }
+}
+
+int
+mp4p_fourcc_compare (const char *value1, const char *value2) {
+ return strncmp (value1, value2, 4);
+}
+
+int
+mp4p_atom_type_compare (mp4p_atom_t *atom, const char *type) {
+ return mp4p_fourcc_compare(atom->type, type);
+}
+
+static void
+_dbg_print_fourcc (const char *fourcc) {
+ printf ("%c%c%c%c", fourcc0, fourcc1, fourcc2, fourcc3);
+}
+
+static void
+_dbg_print_indent (void) {
+ for (int i = 0; i < _dbg_indent; i++) {
+ printf (" ");
+ }
+}
+
+static void
+_dbg_print_atom (mp4p_atom_t *atom) {
+ _dbg_print_indent();
+ _dbg_print_fourcc(atom->type);
+ printf (" pos=%x size=%x", (int)atom->pos, (int)atom->size);
+ printf ("\n");
+}
+
+static int
+_load_subatoms (mp4p_atom_t *atom, mp4p_file_callbacks_t *fp) {
+ _dbg_indent += 4;
+ mp4p_atom_t *tail = NULL;
+ while (fp->tell (fp) < atom->pos + atom->size) {
+ mp4p_atom_t *c = _atom_load (atom, fp);
+ if (!c) {
+// FIXME: add proper error reporting
+// fprintf (stderr, "Failed to read child atom\n");
+ break;
+ }
+ if (!atom->subatoms) {
+ atom->subatoms = tail = c;
+ }
+ else {
+ if (tail) {
+ tail->next = c;
+ }
+ tail = c;
+ }
+ }
+ _dbg_indent -= 4;
+ return 0;
+}
+
+#if 0
+static int
+_load_fourcc_atom (mp4p_atom_t *atom, const char *expected, mp4p_file_callbacks_t *fp) {
+ char fourcc4;
+ if (4 != fp->fread (fourcc, 1, 4, fp->data)) {
+ return -1;
+ }
+ if (_str_type_compare(fourcc, expected)) {
+ return -1;
+ }
+ return _load_subatoms (atom, fp);
+}
+#endif
+
+static int
+_read_uint32 (mp4p_file_callbacks_t *fp, uint32_t *value) {
+ uint8_t csize4;
+ if (4 != fp->read (fp, csize, 4)) {
+ return -1;
+ }
+ *value = (uint32_t)csize3 | ((uint32_t)csize2<<8) | ((uint32_t)csize1<<16) | ((uint32_t)csize0<<24);
+ return 0;
+}
+
+#define READ_UINT8(fp) ({uint8_t _temp8; if (1 != fp->read (fp, &_temp8, 1)) return -1; _temp8;})
+#define READ_UINT32(fp) ({ uint32_t _temp32; if (_read_uint32 (fp, &_temp32) < 0) return -1; _temp32;})
+#define READ_BUF(fp,buf,size) {if (size != fp->read(fp, buf, size)) return -1;}
+
+// read/skip uint8 version and uint24 flags
+#define READ_COMMON_HEADER() {atom_data->ch.version_flags = READ_UINT32(fp);}
+
+#define WRITE_UINT8(x) {if (buffer_size < 1) return 0; *buffer++ = x; buffer_size--; }
+#define WRITE_UINT16(x) {if (buffer_size < 2) return 0; *buffer++ = (x>>8); *buffer++ = (x & 0xff); buffer_size -= 2;}
+#define WRITE_UINT32(x) {if (buffer_size < 4) return 0; *buffer++ = ((x>>24)); *buffer++ = ((x>>16)&0xff); *buffer++ = ((x>>8)&0xff); *buffer++ = (x & 0xff); buffer_size -=4 ;}
+#define WRITE_BUF(buf,size) {if (buffer_size < size) return 0; if (!buf) return -1; memcpy (buffer, buf, size); buffer += size; buffer_size -= size; }
+#define WRITE_COMMON_HEADER() {WRITE_UINT32(0);}
+
+#define READ_ATOM_BUFFER(headersize) uint8_t *atombuf = (uint8_t *)malloc (headersize); if (fp->read(fp, atombuf, headersize) != headersize) { res = -1; goto error; }
+#define FREE_ATOM_BUFFER() free (atombuf);
+
+#define ATOM_DEF_INNER(atomname,headersize)\
+ mp4p_##atomname##_t *atom_data = calloc (1, sizeof (mp4p_##atomname##_t));\
+ atom->data = atom_data;\
+ atom->free = mp4p_##atomname##_atomdata_free;\
+ atom->write = (mp4p_atom_data_write_func_t)mp4p_##atomname##_atomdata_write;\
+ READ_ATOM_BUFFER(headersize);\
+ res = mp4p_##atomname##_atomdata_read (atom_data, atombuf, headersize);\
+ FREE_ATOM_BUFFER();
+
+
+#define ATOM_DEF(atomname) else if (!mp4p_atom_type_compare(atom, #atomname)) {\
+ ATOM_DEF_INNER(atomname,atom->size-8)\
+}
+
+#define ATOM_DEF_WITH_SUBATOMS(atomname,headersize) else if (!mp4p_atom_type_compare(atom, #atomname)) {\
+ ATOM_DEF_INNER(atomname,headersize)\
+ if (!res) {\
+ atom->write_data_before_subatoms = 1;\
+ res = _load_subatoms(atom, fp);\
+ }\
+}
+
+#define ATOM_DEF_WITH_SUBATOMS_SYNC_ENTRY_COUNT(atomname,headersize) else if (!mp4p_atom_type_compare(atom, #atomname)) {\
+ ATOM_DEF_INNER(atomname,headersize)\
+ if (!res) {\
+ atom->write_data_before_subatoms = 1;\
+ res = _load_subatoms(atom, fp);\
+ uint32_t count = mp4p_atom_subatom_count (atom);\
+ if (atom_data->number_of_entries != count) {\
+ atom_data->number_of_entries = count;\
+ }\
+ }\
+}
+
+/// Known container atoms, which can contain known sub-atoms.
+/// Unknown atoms will be loaded as opaque blobs, even if they're technically containers.
+static const char *container_atoms = {
+ "moov",
+ "trak",
+ "mdia",
+ "minf",
+ "dinf",
+ "stbl",
+ "udta",
+ "tref",
+ "ilst",
+ NULL
+};
+
+#define COPYRIGHT_SYM "\xa9"
+
+int
+mp4p_atom_type_invalid (mp4p_atom_t *atom) {
+ for (int i = 0; i < 4; i++) {
+ if (atom->typei <= 0 && (uint8_t)atom->typei != 0xa9) {
+ return 1;
+ }
+ }
+ return 0;
+}
+
+uint8_t
+_adjust_varstring_len (char *buf, uint8_t len) {
+ for (uint8_t i = 0; i < len; i++) {
+ if (bufi == 0) {
+ return i+1;
+ }
+ }
+ return len;
+}
+
+uint32_t
+mp4p_atom_subatom_count (mp4p_atom_t *atom) {
+ uint32_t count = 0;
+ for (mp4p_atom_t *subatom = atom->subatoms; subatom; subatom = subatom->next) {
+ count++;
+ }
+ return count;
+}
+
+/// @return The function may return -1 on parser failures,
+/// but this should not be considered a critical failure.
+int
+mp4p_atom_init (mp4p_atom_t *parent_atom, mp4p_atom_t *atom, mp4p_file_callbacks_t *fp) {
+ int res = 0;
+
+ for (int i = 0; container_atomsi; i++) {
+ if (!mp4p_atom_type_compare (atom, container_atomsi)) {
+ return _load_subatoms(atom, fp);
+ }
+ }
+
+
+ if (mp4p_atom_type_invalid (atom)) {
+ return -1;
+ }
+ else if (!mp4p_atom_type_compare (atom, "ftyp")) {
+ mp4p_mtyp_t *mtyp = calloc (atom->size - 8, 1);
+ atom->data = mtyp;
+ atom->free = free;
+ READ_BUF(fp, mtyp, atom->size-8);
+ }
+ else if (!mp4p_atom_type_compare (atom, "mdat")) {
+ return 0; // special atom, that's not loaded into memory
+ }
+ else if (parent_atom && !mp4p_atom_type_compare(parent_atom, "ilst")) {
+ mp4p_ilst_meta_t *atom_data = calloc (1, sizeof (mp4p_ilst_meta_t));
+ // custom fields contain extra "mean" and "name" subatoms
+ if (!mp4p_atom_type_compare(atom, "----")) {
+ atom_data->custom = 1;
+ }
+ atom->data = atom_data;
+ atom->write = (mp4p_atom_data_write_func_t)mp4p_ilst_meta_atomdata_write;
+ atom->free = mp4p_ilst_meta_atomdata_free;
+ READ_ATOM_BUFFER(atom->size - 8);
+ res = mp4p_ilst_meta_atomdata_read (atom_data, atombuf, atom->size - 8);
+ if (res < 0) {
+ // unknown? load as opaque
+ mp4p_ilst_meta_atomdata_free (atom->data);
+ atom->write = NULL;
+ atom->free = NULL;
+ atom->data = atombuf;
+ res = 0;
+ }
+ else {
+ FREE_ATOM_BUFFER();
+ }
+ }
+ ATOM_DEF(mvhd)
+ ATOM_DEF(tkhd)
+ ATOM_DEF(mdhd)
+ ATOM_DEF(hdlr)
+ ATOM_DEF(smhd)
+ ATOM_DEF_WITH_SUBATOMS_SYNC_ENTRY_COUNT(stsd,sizeof (mp4p_stsd_t))
+ ATOM_DEF(stts)
+ ATOM_DEF(stsc)
+ ATOM_DEF(stsz)
+ ATOM_DEF(stco)
+ ATOM_DEF(co64)
+ ATOM_DEF_WITH_SUBATOMS_SYNC_ENTRY_COUNT(dref,sizeof (mp4p_dref_t))
+ ATOM_DEF(alac)
+ ATOM_DEF_WITH_SUBATOMS(mp4a,28)
+ ATOM_DEF_WITH_SUBATOMS(Opus,28)
+ ATOM_DEF(dOps)
+ ATOM_DEF(esds)
+ ATOM_DEF_WITH_SUBATOMS(meta,4)
+ ATOM_DEF(chpl)
+ ATOM_DEF(chap)
+ else {
+ // don't allow weird atom types with out of range characters
+ for (int i = 0; i < 4; i++) {
+ if (atom->typei != COPYRIGHT_SYM0 && atom->typei != ' ' && (atom->typei < '-' || atom->typei > 'z')) {
+ return -1;
+ }
+ }
+ // don't load large atoms into RAM
+ if (atom->size > 2*1024*1024) {
+ return 0;
+ }
+ atom->data = malloc (atom->size - 8);
+ atom->free = free;
+ READ_BUF(fp, atom->data, atom->size - 8);
+ }
+
+ if (!res) {
+ // validate position
+ off_t offs = fp->tell (fp);
+ if (offs != atom->pos + atom->size) {
+// res = -1;
+ }
+ }
+
+error:
+ return res;
+}
+
+static mp4p_atom_t *
+_atom_load (mp4p_atom_t *parent_atom, mp4p_file_callbacks_t *fp) {
+ size_t fpos = fp->tell (fp);
+
+ mp4p_atom_t *atom = calloc (1, sizeof (mp4p_atom_t));
+
+ atom->pos = fpos;
+
+ if (_read_uint32 (fp, &atom->size) < 0) {
+ goto error;
+ }
+
+ if (4 != fp->read (fp, &atom->type, 4)) {
+ goto error;
+ }
+
+ if (mp4p_atom_init (parent_atom, atom, fp) < 0) {
+ goto error;
+ }
+
+ fp->seek (fp, fpos + atom->size, SEEK_SET);
+
+ goto success;
+error:
+ if (atom) {
+ mp4p_atom_free (atom);
+ atom = NULL;
+ }
+success:
+ return atom;
+}
+
+mp4p_atom_t *
+mp4p_open (mp4p_file_callbacks_t *callbacks) {
+ mp4p_atom_t *head = NULL;
+ mp4p_atom_t *tail = NULL;
+
+ for (;;) {
+ mp4p_atom_t *atom = _atom_load (NULL, callbacks);
+ if (!atom) {
+ break;
+ }
+
+ if (!head) {
+ head = tail = atom;
+ }
+ else {
+ tail->next = atom;
+ tail = atom;
+ }
+ }
+
+ return head;
+}
+
+mp4p_atom_t *
+mp4p_atom_find (mp4p_atom_t *root, const char *path) {
+ if (strlen (path) < 4) {
+ return NULL;
+ }
+
+ mp4p_atom_t *a = root;
+ while (a) {
+ if (!strncmp (a->type, path, 4)) {
+ break;
+ }
+ a = a->next;
+ }
+ if (a && !path4) {
+ return a;
+ }
+ if (a && path4 == '/') {
+ return mp4p_atom_find (a->subatoms, path+5);
+ }
+ return NULL;
+}
+
+uint64_t
+mp4p_stts_total_num_samples (mp4p_atom_t *stts_atom) {
+ mp4p_stts_t *stts = stts_atom->data;
+ if (!stts) {
+ return 0;
+ }
+ uint64_t total = 0;
+ for (uint32_t i = 0; i < stts->number_of_entries; i++) {
+ total += stts->entriesi.sample_count;
+ }
+ return total;
+}
+
+uint32_t
+mp4p_stts_sample_duration (mp4p_atom_t *stts_atom, uint32_t mp4sample) {
+ mp4p_stts_t *stts = stts_atom->data;
+ if (!stts) {
+ return 0;
+ }
+ uint32_t n = 0;
+ for (uint32_t i = 0; i < stts->number_of_entries; i++) {
+ int nsamples = stts->entriesi.sample_count;
+ while (nsamples--) {
+ if (n >= mp4sample) {
+ return stts->entriesi.sample_duration;
+ }
+ n++;
+ }
+ }
+ return 0;
+}
+
+uint32_t
+mp4p_stts_mp4sample_containing_sample (mp4p_atom_t *stts_atom, uint64_t sample, uint64_t *mp4sample_startingsample) {
+ mp4p_stts_t *stts = stts_atom->data;
+ if (!stts) {
+ return 0;
+ }
+ int mp4sample = 0;
+ int pos = 0;
+ for (int i = 0; i < stts->number_of_entries; i++) {
+ int64_t total = stts->entriesi.sample_duration * stts->entriesi.sample_count;
+ if (pos + total >= sample) {
+ uint32_t idx = (uint32_t)((sample - pos) / stts->entriesi.sample_duration);
+ *mp4sample_startingsample = pos + idx * stts->entriesi.sample_duration;
+ return mp4sample + idx;
+ }
+ pos += total;
+ mp4sample += stts->entriesi.sample_count;
+ }
+ return 0;
+}
+
+uint64_t
+mp4p_stts_total_sample_duration (mp4p_atom_t *stts_atom) {
+ mp4p_stts_t *stts = stts_atom->data;
+ if (!stts) {
+ return 0;
+ }
+ uint64_t total = 0;
+ for (uint32_t i = 0; i < stts->number_of_entries; i++) {
+ total += stts->entriesi.sample_duration * stts->entriesi.sample_count;
+ }
+ return total;
+}
+
+uint32_t
+mp4p_sample_size (mp4p_atom_t *stbl_atom, uint32_t sample)
+{
+ mp4p_atom_t *stsz_atom = mp4p_atom_find(stbl_atom, "stbl/stsz");
+ mp4p_stsz_t *stsz = stsz_atom->data;
+ if (stsz->sample_size) {
+ return stsz->sample_size;
+ }
+ else if (sample < stsz->number_of_entries) {
+ return stsz->entriessample.sample_size;
+ }
+ return 0;
+}
+
+uint64_t
+mp4p_sample_offset (mp4p_atom_t *stbl_atom, uint32_t sample) {
+ // get chunk idx from sample (stsc table)
+ mp4p_atom_t *stsc_atom = mp4p_atom_find(stbl_atom, "stbl/stsc");
+ mp4p_stsc_t *stsc = stsc_atom->data;
+
+ if (!stsc->number_of_entries) {
+ return 0;
+ }
+
+ // get chunk offset (stco/co64 table)
+ mp4p_atom_t *stco_atom = mp4p_atom_find(stbl_atom, "stbl/co64");
+ if (!stco_atom) {
+ stco_atom = mp4p_atom_find(stbl_atom, "stbl/stco");
+ }
+
+ if (!stco_atom) {
+ return 0;
+ }
+
+ mp4p_stco_t *stco = stco_atom->data;
+
+ // walk over chunk table, and find the chunk containing the sample
+ uint32_t chunk = 0;
+ uint32_t subchunk = 0; // repeated chunk index within stsc item
+
+ uint32_t chunk_first_sample = 0;
+ uint64_t offs = 0;
+
+ for (;;) {
+ if (chunk == stsc->number_of_entries-1) {
+ // last chunk entry is repeated infinitely
+ break;
+ }
+
+ if (chunk_first_sample + stsc->entrieschunk.samples_per_chunk > sample) {
+ // sample belongs to "chunk"
+ break;
+ }
+
+ chunk_first_sample += stsc->entrieschunk.samples_per_chunk;
+ subchunk++;
+ if (subchunk >= stsc->entrieschunk+1.first_chunk - stsc->entrieschunk.first_chunk) {
+ subchunk = 0;
+ chunk++;
+ }
+ }
+
+ // skip N samples in the chunk, until we get to the needed one
+ mp4p_atom_t *stsz_atom = mp4p_atom_find(stbl_atom, "stbl/stsz");
+ mp4p_stsz_t *stsz = stsz_atom->data;
+
+ offs = stco->entriesstsc->entrieschunk.first_chunk+subchunk-1.offset;
+ if (stsz->sample_size) {
+ offs += stsz->sample_size * (sample-chunk_first_sample);
+ }
+ else {
+ for (int i = chunk_first_sample; i < sample; i++) {
+ offs += stsz->entriesi.sample_size;
+ }
+ }
+
+ return offs;
+}
+
+#define _GENRE_COUNT (sizeof(_genretbl) / sizeof (char *) - 1)
+static const char *_genretbl = {
+ "Blues",
+ "Classic Rock",
+ "Country",
+ "Dance",
+ "Disco",
+ "Funk",
+ "Grunge",
+ "Hip-Hop",
+ "Jazz",
+ "Metal",
+ "New Age",
+ "Oldies",
+ "Other",
+ "Pop",
+ "R&B",
+ "Rap",
+ "Reggae",
+ "Rock",
+ "Techno",
+ "Industrial",
+ "Alternative",
+ "Ska",
+ "Death Metal",
+ "Pranks",
+ "Soundtrack",
+ "Euro-Techno",
+ "Ambient",
+ "Trip-Hop",
+ "Vocal",
+ "Jazz+Funk",
+ "Fusion",
+ "Trance",
+ "Classical",
+ "Instrumental",
+ "Acid",
+ "House",
+ "Game",
+ "Sound Clip",
+ "Gospel",
+ "Noise",
+ "AlternRock",
+ "Bass",
+ "Soul",
+ "Punk",
+ "Space",
+ "Meditative",
+ "Instrumental Pop",
+ "Instrumental Rock",
+ "Ethnic",
+ "Gothic",
+ "Darkwave",
+ "Techno-Industrial",
+ "Electronic",
+ "Pop-Folk",
+ "Eurodance",
+ "Dream",
+ "Southern Rock",
+ "Comedy",
+ "Cult",
+ "Gangsta",
+ "Top 40",
+ "Christian Rap",
+ "Pop/Funk",
+ "Jungle",
+ "Native American",
+ "Cabaret",
+ "New Wave",
+ "Psychedelic",
+ "Rave",
+ "Showtunes",
+ "Trailer",
+ "Lo-Fi",
+ "Tribal",
+ "Acid Punk",
+ "Acid Jazz",
+ "Polka",
+ "Retro",
+ "Musical",
+ "Rock & Roll",
+ "Hard Rock",
+ "Folk",
+ "Folk-Rock",
+ "National Folk",
+ "Swing",
+ "Fast Fusion",
+ "Bebob",
+ "Latin",
+ "Revival",
+ "Celtic",
+ "Bluegrass",
+ "Avantgarde",
+ "Gothic Rock",
+ "Progressive Rock",
+ "Psychedelic Rock",
+ "Symphonic Rock",
+ "Slow Rock",
+ "Big Band",
+ "Chorus",
+ "Easy Listening",
+ "Acoustic",
+ "Humour",
+ "Speech",
+ "Chanson",
+ "Opera",
+ "Chamber Music",
+ "Sonata",
+ "Symphony",
+ "Booty Bass",
+ "Primus",
+ "Porn Groove",
+ "Satire",
+ "Slow Jam",
+ "Club",
+ "Tango",
+ "Samba",
+ "Folklore",
+ "Ballad",
+ "Power Ballad",
+ "Rhythmic Soul",
+ "Freestyle",
+ "Duet",
+ "Punk Rock",
+ "Drum Solo",
+ "Acapella",
+ "Euro-House",
+ "Dance Hall",
+ "Goa",
+ "Drum & Bass",
+ "Club-House",
+ "Hardcore",
+ "Terror",
+ "Indie",
+ "BritPop",
+ "Negerpunk",
+ "Polsk Punk",
+ "Beat",
+ "Christian Gangsta",
+ "Heavy Metal",
+ "Black Metal",
+ "Crossover",
+ "Contemporary C",
+ "Christian Rock",
+ "Merengue",
+ "Salsa",
+ "Thrash Metal",
+ "Anime",
+ "JPop",
+ "SynthPop",
+ "Abstract",
+ "Art Rock",
+ "Baroque",
+ "Bhangra",
+ "Big Beat",
+ "Breakbeat",
+ "Chillout",
+ "Downtempo",
+ "Dub",
+ "EBM",
+ "Eclectic",
+ "Electro",
+ "Electroclash",
+ "Emo",
+ "Experimental",
+ "Garage",
+ "Global",
+ "IDM",
+ "Illbient",
+ "Industro-Goth",
+ "Jam Band",
+ "Krautrock",
+ "Leftfield",
+ "Lounge",
+ "Math Rock",
+ "New Romantic",
+ "Nu-Breakz",
+ "Post-Punk",
+ "Post-Rock",
+ "Psytrance",
+ "Shoegaze",
+ "Space Rock",
+ "Trop Rock",
+ "World Music",
+ "Neoclassical",
+ "Audiobook",
+ "Audio Theatre",
+ "Neue Deutsche Welle",
+ "Podcast",
+ "Indie Rock",
+ "G-Funk",
+ "Dubstep",
+ "Garage Rock",
+ "Psybient",
+ NULL
+};
+
+const char *
+mp4p_genre_name_for_index (uint16_t genreid) {
+ if (genreid-1 < _GENRE_COUNT) {
+ return _genretblgenreid-1;
+ }
+ return NULL;
+}
+
+uint16_t
+mp4p_genre_index_for_name (const char *name) {
+ for (uint16_t i = 0; _genretbli; i++) {
+ if (!strcasecmp (name, _genretbli)) {
+ return i+1;
+ }
+ }
+ return 0;
+}
+
+mp4p_atom_t *
+mp4p_ilst_create_custom (const char *name, const char *text) {
+ mp4p_atom_t *atom = calloc (1, sizeof (mp4p_atom_t));
+ mp4p_ilst_meta_t *meta = calloc (1, sizeof (mp4p_ilst_meta_t));
+ meta->custom = 1;
+ atom->data = meta;
+ atom->free = mp4p_ilst_meta_atomdata_free;
+ atom->write = (mp4p_atom_data_write_func_t)mp4p_ilst_meta_atomdata_write;
+
+ memcpy (atom->type, "----", 4);
+ atom->size = 8;
+ atom->size += 28; // mean
+ atom->size += 12 + (uint32_t)strlen(name); // name
+ atom->size += 16 + (uint32_t)strlen(text); // data
+ meta->name = strdup (name);
+ meta->data_version_flags = 1;
+ meta->text = strdup (text);
+ meta->data_size = (uint32_t)strlen(text);
+ return atom;
+}
+
+mp4p_atom_t *
+mp4p_ilst_create_genre (const char *text) {
+ mp4p_atom_t *atom = calloc (1, sizeof (mp4p_atom_t));
+ mp4p_ilst_meta_t *meta = calloc (1, sizeof (mp4p_ilst_meta_t));
+ atom->data = meta;
+ atom->free = mp4p_ilst_meta_atomdata_free;
+ atom->write = (mp4p_atom_data_write_func_t)mp4p_ilst_meta_atomdata_write;
+
+ uint16_t genre_id = mp4p_genre_index_for_name (text);
+ if (genre_id) {
+ memcpy (atom->type, "gnre", 4);
+ atom->size = 24+2;
+ meta->data_version_flags = 0;
+ meta->values = malloc (2);
+ meta->values0 = genre_id;
+ meta->data_size = 2;
+ }
+ else {
+ memcpy (atom->type, COPYRIGHT_SYM "gen", 4);
+ atom->size = 24 + (uint32_t)strlen(text);
+ meta->data_version_flags = 1;
+ meta->text = strdup (text);
+ meta->data_size = (uint32_t)strlen(text);
+ }
+ return atom;
+}
+
+mp4p_atom_t *
+mp4p_ilst_create_track_disc (const char *type, uint16_t index, uint16_t total) {
+ mp4p_atom_t *atom = calloc (1, sizeof (mp4p_atom_t));
+ mp4p_ilst_meta_t *meta = calloc (1, sizeof (mp4p_ilst_meta_t));
+ atom->data = meta;
+ atom->free = mp4p_ilst_meta_atomdata_free;
+ atom->write = (mp4p_atom_data_write_func_t)mp4p_ilst_meta_atomdata_write;
+ atom->size = 32;
+
+ memcpy (atom->type, type, 4);
+ meta->data_version_flags = 0;
+ meta->data_size = 8;
+ meta->values = calloc (4, 2);
+ meta->values0 = 0; // FIXME: what is this?
+ meta->values1 = index;
+ meta->values2 = total;
+ meta->values3 = 0; // FIXME: what is this?
+ return atom;
+}
+
+mp4p_atom_t *
+mp4p_ilst_create_text (const char *type, const char *text) {
+ mp4p_atom_t *atom = calloc (1, sizeof (mp4p_atom_t));
+ mp4p_ilst_meta_t *meta = calloc (1, sizeof (mp4p_ilst_meta_t));
+ atom->data = meta;
+ atom->free = mp4p_ilst_meta_atomdata_free;
+ atom->write = (mp4p_atom_data_write_func_t)mp4p_ilst_meta_atomdata_write;
+ meta->data_size = (uint32_t)strlen(text);
+ atom->size = 24+meta->data_size;
+
+ memcpy (atom->type, type, 4);
+ meta->data_version_flags = 1;
+ meta->text = strdup (text);
+ return atom;
+}
+
+void
+mp4p_atom_remove_sibling(mp4p_atom_t *atom, mp4p_atom_t *sibling, int free) {
+ mp4p_atom_t *prev = NULL;
+ mp4p_atom_t *curr = atom;
+
+ while (curr) {
+ if (curr == sibling) {
+ if (prev) {
+ prev->next = sibling->next;
+ }
+ if (free) {
+ mp4p_atom_free (sibling);
+ }
+ else {
+ sibling->next = NULL;
+ }
+ break;
+ }
+ prev = curr;
+ curr = curr->next;
+ }
+}
+
+void
+mp4p_atom_remove_subatom (mp4p_atom_t *atom, mp4p_atom_t *subatom) {
+ mp4p_atom_t *c = atom->subatoms;
+ mp4p_atom_t *prev = NULL;
+ while (c) {
+ mp4p_atom_t *next = c->next;
+ if (c == subatom) {
+ mp4p_atom_free (subatom);
+ if (prev) {
+ prev->next = next;
+ }
+ else {
+ atom->subatoms = next;
+ }
+ return;
+ }
+ prev = c;
+ c = next;
+ }
+}
+
+mp4p_atom_t *
+mp4p_atom_new (const char *type) {
+ mp4p_atom_t *atom = calloc (1, sizeof (mp4p_atom_t));
+ memcpy (atom->type, type, 4);
+ return atom;
+}
+
+mp4p_atom_t *
+mp4p_atom_clone (mp4p_atom_t *src) {
+ mp4p_atom_t *dest = mp4p_atom_new (src->type);
+ dest->pos = src->pos;
+ dest->size = src->size;
+ dest->write = src->write;
+ // data is not duplicated, so not freeing it in the clone
+
+ dest->write_data_before_subatoms = src->write_data_before_subatoms;
+
+ if (dest->size > 0) {
+ dest->data = src->data;
+ }
+
+ if (src->subatoms) {
+ dest->subatoms = mp4p_atom_clone_list (src->subatoms);
+ }
+ return dest;
+}
+
+// NOTE: the cloned atom's data is a direct pointer to src data.
+// The downside is that the source must exist until the dest is deleted.
+mp4p_atom_t *
+mp4p_atom_clone_list (mp4p_atom_t *src) {
+ mp4p_atom_t *clone = NULL;
+ mp4p_atom_t *tail = NULL;
+ mp4p_atom_t *next = src;
+ while (next) {
+ mp4p_atom_t *next_copy = mp4p_atom_clone(next);
+
+ if (tail) {
+ tail = tail->next = next_copy;
+ }
+ else {
+ tail = clone = next_copy;
+ }
+ next = next->next;
+ }
+
+ return clone;
+}
+
+mp4p_atom_t *
+mp4p_meta_create_atom (void) {
+ mp4p_atom_t *atom = mp4p_atom_new ("meta");
+ atom->write = (mp4p_atom_data_write_func_t)mp4p_meta_atomdata_write;
+ atom->write_data_before_subatoms = 1;
+ atom->data = calloc (4, 1);
+ atom->free = mp4p_meta_atomdata_free;
+ return atom;
+}
+
+void
+mp4p_atom_update_size (mp4p_atom_t *atom) {
+ if (!atom->write && !atom->subatoms) {
+ return;
+ }
+ atom->size = 8; // type+size = 8 bytes
+ if (!atom->subatoms || atom->write_data_before_subatoms) {
+ if (atom->write) {
+ atom->size += (uint32_t)atom->write (atom->data, NULL, 0);
+ }
+ }
+ for (mp4p_atom_t *subatom = atom->subatoms; subatom; subatom = subatom->next) {
+ mp4p_atom_update_size(subatom);
+ atom->size += subatom->size;
+ }
+}
+
+void
+mp4p_rebuild_positions (mp4p_atom_t *atom, uint64_t init_pos) {
+ atom->pos = init_pos;
+ if (atom->data) {
+ init_pos += atom->size;
+ }
+ else {
+ init_pos += 8;
+
+ for (mp4p_atom_t *subatom = atom->subatoms; subatom; subatom = subatom->next) {
+ mp4p_rebuild_positions(subatom, init_pos);
+ init_pos += subatom->size;
+ }
+ }
+
+ for (mp4p_atom_t *next = atom->next; next; next = next->next) {
+ mp4p_rebuild_positions(next, init_pos);
+ init_pos += next->size;
+ }
+}
+
+mp4p_atom_t *
+mp4p_atom_insert (mp4p_atom_t *parent, mp4p_atom_t *before, mp4p_atom_t *atom) {
+ mp4p_atom_t *prev = NULL;
+ mp4p_atom_t *subatom = parent->subatoms;
+ while (subatom && subatom != before) {
+ prev = subatom;
+ subatom = subatom->next;
+ }
+
+ if (!subatom) { // `before` not found
+ return NULL;
+ }
+
+ if (prev) {
+ prev->next = atom;
+ }
+ else {
+ parent->subatoms = atom;
+ }
+ atom->next = before;
+
+ return atom;
+}
+
+mp4p_atom_t *
+mp4p_atom_append (mp4p_atom_t *parent, mp4p_atom_t *atom) {
+ mp4p_atom_t *prev = NULL;
+ mp4p_atom_t *c = parent->subatoms;
+ while (c) {
+ prev = c;
+ c = c->next;
+ }
+ if (prev) {
+ prev->next = atom;
+ }
+ else {
+ parent->subatoms = atom;
+ }
+ return atom;
+}
+
+void
+mp4p_atom_dump (mp4p_atom_t *atom) {
+ _dbg_print_atom(atom);
+ _dbg_indent += 4;
+ for (mp4p_atom_t *c = atom->subatoms; c; c = c->next) {
+ mp4p_atom_dump (c);
+ }
+ _dbg_indent -= 4;
+}
+
+uint32_t
+mp4p_atom_to_buffer (mp4p_atom_t *atom, uint8_t *buffer, uint32_t buffer_size) {
+ uint32_t init_size = buffer_size;
+
+ // calculate the size including sub-atoms
+ if (atom->subatoms) {
+ if (!buffer) {
+ return atom->size;
+ }
+
+ WRITE_UINT32(atom->size);
+ WRITE_BUF(atom->type, 4);
+
+ if (atom->write_data_before_subatoms && atom->write) {
+ size_t len = atom->write (atom->data, buffer, buffer_size);
+ buffer += len;
+ buffer_size -= len;
+ }
+
+ for (mp4p_atom_t *c = atom->subatoms; c; c = c->next) {
+ uint32_t subsize = mp4p_atom_to_buffer (c, buffer, buffer_size);
+ if (subsize != c->size) {
+ break;
+ }
+ buffer += subsize;
+ buffer_size -= subsize;
+ }
+ }
+ else {
+ if (!buffer) {
+ return atom->size;
+ }
+ if (atom->size == 0) {
+ _dbg_print_fourcc(atom->type);
+ return 0;
+ }
+ WRITE_UINT32(atom->size);
+ WRITE_BUF(atom->type, 4);
+ if (!atom->write) {
+ if (!memcmp (atom->type, "free", 4)) {
+ size_t size = atom->size - 8;
+ if (size > buffer_size) { // prevent buffer overflow - this would still cause an error
+ size = buffer_size;
+ }
+ memset (buffer, 0, size);
+ buffer += size;
+ buffer_size -= size;
+ }
+ else if (atom->data) {
+ WRITE_BUF(atom->data, atom->size - 8);
+ }
+ }
+ else {
+ size_t written_size = atom->write (atom->data, buffer, buffer_size);
+ buffer_size -= written_size;
+ }
+ }
+ return init_size - buffer_size;
+}
+
+static int
+_atom_write(mp4p_file_callbacks_t *file, mp4p_atom_t *atom) {
+ uint32_t atom_size = mp4p_atom_to_buffer (atom, NULL, 0);
+ uint8_t *buffer = malloc (atom_size);
+ uint32_t written_size = mp4p_atom_to_buffer(atom, buffer, atom_size);
+ if (written_size != atom_size) {
+ free (buffer);
+ return -1;
+ }
+ file->seek (file, atom->pos, SEEK_SET);
+ if (file->write (file, buffer, atom_size) != atom_size) {
+ free (buffer);
+ return -1;
+ }
+
+ free (buffer);
+ return 0;
+}
+
+int
+mp4p_update_metadata (mp4p_file_callbacks_t *callbacks, mp4p_atom_t *mp4file) {
+ // resize
+ for (mp4p_atom_t *tail = mp4file; tail; tail = tail->next) {
+ if (!tail->next) {
+ if (callbacks->truncate (callbacks, tail->pos + tail->size) < 0) {
+ return -1;
+ }
+
+ }
+ }
+
+ // write moov
+ mp4p_atom_t *moov = mp4p_atom_find (mp4file, "moov");
+ if (_atom_write(callbacks, moov) < 0) {
+ return -1;
+ }
+
+ // write padding
+ mp4p_atom_t *padding = mp4p_atom_find (mp4file, "free");
+ if (padding) {
+ if (_atom_write(callbacks, padding) < 0) {
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+mp4p_atom_t *
+mp4p_atom_meta_find_custom (mp4p_atom_t *ilst, const char *key) {
+ for (mp4p_atom_t *subatom = ilst->subatoms; subatom; subatom = subatom->next) {
+ if (!mp4p_atom_type_compare(subatom, "----")) {
+ mp4p_ilst_meta_t *meta = subatom->data;
+ if (!strcmp (meta->name, key)) {
+ return subatom;
+ }
+ }
+ }
+ return NULL;
+}
+
+int
+mp4p_trak_playable (mp4p_atom_t *trak_atom) {
+ const char *atom_list = {
+ "trak/mdia/minf/stbl/stts",
+ "trak/mdia/mdhd",
+ "trak/mdia/minf/stbl",
+ "trak/mdia/minf/stbl/stsz",
+ NULL
+ };
+
+ for (int i = 0; atom_listi; i++) {
+ if (!mp4p_atom_find(trak_atom, atom_listi)) {
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
+int
+mp4p_trak_has_chapters (mp4p_atom_t *trak_atom) {
+ const char *atom_list = {
+ "trak/mdia/minf/stbl/stsd/text",
+ "trak/tkhd",
+ "trak/mdia/minf/stbl",
+ "trak/mdia/minf/stbl/stts",
+ "trak/mdia/minf/stbl/stsz",
+ "trak/mdia/mdhd",
+ NULL
+ };
+
+ for (int i = 0; atom_listi; i++) {
+ if (!mp4p_atom_find(trak_atom, atom_listi)) {
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
+static void mp4p_dbg_dump_subatoms(mp4p_atom_t *atom) {
+ _dbg_print_atom(atom);
+ _dbg_indent += 4;
+ for (mp4p_atom_t *sub = atom->subatoms; sub; sub = sub->next) {
+ mp4p_dbg_dump_subatoms(sub);
+ }
+ _dbg_indent -= 4;
+}
+
+void
+mp4p_dbg_dump_atom (mp4p_atom_t *atom) {
+ for (; atom; atom = atom->next) {
+ mp4p_dbg_dump_subatoms(atom);
+ }
+}

deadbeef-1.9.6.tar.bz2/external/mp4p/src/mp4patomdata.c Added

@@ -0,0 +1,1378 @@
+//
+// mp4patomdata.c
+// MP4P
+//
+// Created by Oleksiy Yakovenko on 4/7/20.
+// Copyright © 2020 Oleksiy Yakovenko. All rights reserved.
+//
+
+#include <stdlib.h>
+#include <string.h>
+#include <mp4p/mp4p.h>
+#include <mp4p/mp4patomdata.h>
+
+#define READ_UINT8() ({if (buffer_size < 1) return -1; uint8_t _temp8 = *buffer; buffer++; buffer_size--; _temp8;})
+#define READ_UINT16() ({if (buffer_size < 2) return -1; uint16_t _temp16 = (buffer1) | (buffer0<<8); buffer+=2, buffer_size -= 2; _temp16;})
+#define READ_INT16() ({if (buffer_size < 2) return -1; int16_t _temp16 = (((int8_t *)buffer)1) | (buffer0<<8); buffer+=2; buffer_size-=2; _temp16;})
+#define READ_UINT32() ({if (buffer_size < 4) return -1; uint32_t _temp32 = (uint32_t)buffer3 | ((uint32_t)buffer2<<8) | ((uint32_t)buffer1<<16) | ((uint32_t)buffer0<<24); buffer+=4; buffer_size-=4; _temp32;})
+#define READ_INT32() ({if (buffer_size < 4) return -1; int32_t _temp32 = (int32_t)buffer3 | ((uint32_t)buffer2<<8) | ((uint32_t)buffer1<<16) | ((uint32_t)buffer0<<24); buffer+=4; buffer_size-=4; _temp32;})
+#define READ_UINT64() ({if (buffer_size < 8) return -1; uint64_t _temp64 = (uint64_t)buffer7 | ((uint64_t)buffer6<<8) | ((uint64_t)buffer5<<16) | ((uint64_t)buffer4<<24) | ((uint64_t)buffer3<<32) | ((uint64_t)buffer2<<40) | ((uint64_t)buffer1 << 48) | ((uint64_t)buffer0 << 56); buffer+=8; buffer_size-=8; _temp64;})
+#define READ_INT64() ({if (buffer_size < 8) return -1; uint64_t _temp64 = (int64_t)csize7 | ((uint64_t)csize6<<8) | ((uint64_t)csize5<<16) | ((uint64_t)csize4<<24) | ((uint64_t)csize3<<32) | ((uint64_t)csize2<<40) | ((uint64_t)csize1 << 48) | ((uint64_t)csize0 << 56); buffer+=8; buffer_size-=8; _temp64;})
+#define READ_BUF(buf,size) {if (buffer_size < size) return -1; memcpy (buf, buffer, size); buffer += size; buffer_size -= size; }
+
+// read/skip uint8 version and uint24 flags
+#define READ_COMMON_HEADER() {atom_data->ch.version_flags = READ_UINT32();}
+
+#define WRITE_UINT8(x) {if (buffer_size < 1) return 0; *buffer++ = x; buffer_size--; }
+#define WRITE_UINT16(x) {if (buffer_size < 2) return 0; *buffer++ = (x>>8); *buffer++ = (x & 0xff); buffer_size -= 2;}
+#define WRITE_INT16(x) {if (buffer_size < 2) return 0; *buffer++ = (x>>8); *buffer++ = (uint8_t)(x & 0xff); buffer_size -= 2;}
+#define WRITE_UINT32(x) {if (buffer_size < 4) return 0; *buffer++ = ((x>>24)); *buffer++ = ((x>>16)&0xff); *buffer++ = ((x>>8)&0xff); *buffer++ = (x & 0xff); buffer_size -=4 ;}
+#define WRITE_UINT64(x) {if (buffer_size < 8) return 0; *buffer++ = ((x>>56)); *buffer++ = ((x>>48)&0xff); *buffer++ = ((x>>40)); *buffer++ = ((x>>32)&0xff); *buffer++ = ((x>>24)); *buffer++ = ((x>>16)&0xff); *buffer++ = ((x>>8)&0xff); *buffer++ = (x & 0xff); buffer_size -= 8 ;}
+#define WRITE_BUF(buf,size) {if (buffer_size < size) return 0; memcpy (buffer, buf, size); buffer += size; buffer_size -= size; }
+#define WRITE_COMMON_HEADER() {WRITE_UINT32(atom_data->ch.version_flags);}
+
+#pragma mark mvhd
+
+int
+mp4p_mvhd_atomdata_read (mp4p_mvhd_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->creation_time = READ_UINT32();
+ atom_data->modification_time = READ_UINT32();
+ atom_data->time_scale = READ_UINT32();
+ atom_data->duration = READ_UINT32();
+ atom_data->preferred_rate = READ_UINT32();
+ atom_data->preferred_volume = READ_UINT16();
+ READ_BUF(atom_data->reserved, 10);
+ READ_BUF(atom_data->matrix_structure, 36);
+ atom_data->preview_time = READ_UINT32();
+ atom_data->preview_duration = READ_UINT32();
+ atom_data->poster_time = READ_UINT32();
+ atom_data->selection_time = READ_UINT32();
+ atom_data->selection_duration = READ_UINT32();
+ atom_data->current_time = READ_UINT32();
+ atom_data->next_track_id = READ_UINT32();
+ return 0;
+ }
+
+size_t
+mp4p_mvhd_atomdata_write (mp4p_mvhd_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 100;
+ }
+ uint8_t *origin = buffer;
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT32(atom_data->creation_time);
+ WRITE_UINT32(atom_data->modification_time);
+ WRITE_UINT32(atom_data->time_scale);
+ WRITE_UINT32(atom_data->duration);
+ WRITE_UINT32(atom_data->preferred_rate);
+ WRITE_UINT16(atom_data->preferred_volume);
+ WRITE_BUF(atom_data->reserved, 10);
+ WRITE_BUF(atom_data->matrix_structure, 36);
+ WRITE_UINT32(atom_data->preview_time);
+ WRITE_UINT32(atom_data->preview_duration);
+ WRITE_UINT32(atom_data->poster_time);
+ WRITE_UINT32(atom_data->selection_time);
+ WRITE_UINT32(atom_data->selection_duration);
+ WRITE_UINT32(atom_data->current_time);
+ WRITE_UINT32(atom_data->next_track_id);
+
+ return buffer - origin;
+}
+
+void
+mp4p_mvhd_atomdata_free (void *atom_data) {
+ free (atom_data);
+}
+
+#pragma mark tkhd
+
+int
+mp4p_tkhd_atomdata_read (mp4p_tkhd_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->creation_time = READ_UINT32();
+ atom_data->modification_time = READ_UINT32();
+ atom_data->track_id = READ_UINT32();
+ READ_BUF(atom_data->reserved, 4);
+ atom_data->duration = READ_UINT32();
+ READ_BUF(atom_data->reserved2, 8);
+ atom_data->layer = READ_UINT16();
+ atom_data->alternate_group = READ_UINT16();
+ atom_data->volume = READ_UINT16();
+ READ_BUF(atom_data->reserved3, 2);
+ READ_BUF(atom_data->matrix_structure, 36);
+ atom_data->track_width = READ_UINT32();
+ atom_data->track_height = READ_UINT32();
+
+ return 0;
+}
+
+size_t
+mp4p_tkhd_atomdata_write (mp4p_tkhd_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 84;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT32(atom_data->creation_time);
+ WRITE_UINT32(atom_data->modification_time);
+ WRITE_UINT32(atom_data->track_id);
+ WRITE_BUF(atom_data->reserved, 4);
+ WRITE_UINT32(atom_data->duration);
+ WRITE_BUF(atom_data->reserved2, 8);
+ WRITE_UINT16(atom_data->layer);
+ WRITE_UINT16(atom_data->alternate_group);
+ WRITE_UINT16(atom_data->volume);
+ WRITE_BUF(atom_data->reserved3, 2);
+ WRITE_BUF(atom_data->matrix_structure, 36);
+ WRITE_UINT32(atom_data->track_width);
+ WRITE_UINT32(atom_data->track_height);
+
+ return buffer - origin;
+}
+
+void
+mp4p_tkhd_atomdata_free (void *atom_data) {
+ free (atom_data);
+}
+
+#pragma mark mdhd
+
+int
+mp4p_mdhd_atomdata_read (mp4p_mdhd_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->creation_time = READ_UINT32();
+ atom_data->modification_time = READ_UINT32();
+ atom_data->time_scale = READ_UINT32();
+ atom_data->duration = READ_UINT32();
+ atom_data->language = READ_UINT16();
+ atom_data->quality = READ_UINT16();
+
+ return 0;
+}
+
+size_t
+mp4p_mdhd_atomdata_write (mp4p_mdhd_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 24;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT32(atom_data->creation_time);
+ WRITE_UINT32(atom_data->modification_time);
+ WRITE_UINT32(atom_data->time_scale);
+ WRITE_UINT32(atom_data->duration);
+ WRITE_UINT16(atom_data->language);
+ WRITE_UINT16(atom_data->quality);
+
+ return buffer - origin;
+}
+
+void
+mp4p_mdhd_atomdata_free (void *atom_data) {
+ free (atom_data);
+}
+
+#pragma mark hdlr
+
+int
+mp4p_hdlr_atomdata_read (mp4p_hdlr_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ // NOTE: in the udta/meta/hdlr,
+ // type is "\0\0\0\0"
+ // the subtype is "mdir"
+ // and manufacturer is "appl"
+ READ_BUF(atom_data->component_type, 4);
+ READ_BUF(atom_data->component_subtype, 4);
+ READ_BUF(atom_data->component_manufacturer, 4);
+
+ atom_data->component_flags = READ_UINT32();
+ atom_data->component_flags_mask = READ_UINT32();
+
+ atom_data->buf_len = buffer_size;
+ if (atom_data->buf_len) {
+ atom_data->buf = malloc (atom_data->buf_len);
+ READ_BUF(atom_data->buf, atom_data->buf_len);
+ }
+
+ return 0;
+}
+
+size_t
+mp4p_hdlr_atomdata_write (mp4p_hdlr_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 24 + atom_data->buf_len;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_COMMON_HEADER();
+
+ WRITE_BUF(atom_data->component_type, 4);
+ WRITE_BUF(atom_data->component_subtype, 4);
+ WRITE_BUF(atom_data->component_manufacturer, 4);
+
+ WRITE_UINT32(atom_data->component_flags);
+ WRITE_UINT32(atom_data->component_flags_mask);
+
+ if (atom_data->buf_len) {
+ WRITE_BUF(atom_data->buf, atom_data->buf_len);
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_hdlr_atomdata_free (void *atom_data) {
+ mp4p_hdlr_t *hdlr = atom_data;
+ if (hdlr->buf) {
+ free (hdlr->buf);
+ }
+ free (hdlr);
+}
+
+void
+mp4p_hdlr_init (mp4p_atom_t *hdlr_atom, const char *type, const char *subtype, const char *manufacturer) {
+ mp4p_hdlr_t *hdlr = calloc(1, sizeof (mp4p_hdlr_t));
+ hdlr_atom->size = 33;
+ hdlr_atom->data = hdlr;
+ hdlr_atom->free = mp4p_hdlr_atomdata_free;
+ hdlr_atom->write = (mp4p_atom_data_write_func_t)mp4p_hdlr_atomdata_write;
+ memcpy (hdlr->component_type, type, 4);
+ memcpy (hdlr->component_subtype, subtype, 4);
+ memcpy (hdlr->component_manufacturer, manufacturer, 4);
+}
+
+#pragma mark smhd
+
+int
+mp4p_smhd_atomdata_read (mp4p_smhd_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->balance = READ_UINT16();
+ atom_data->reserved = READ_UINT16();
+
+ return 0;
+}
+
+size_t
+mp4p_smhd_atomdata_write (mp4p_smhd_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 8;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT16(atom_data->balance);
+ WRITE_UINT16(atom_data->reserved);
+
+
+ return buffer - origin;
+}
+
+void
+mp4p_smhd_atomdata_free (void *atom_data) {
+ free (atom_data);
+}
+
+#pragma mark stsd
+
+int
+mp4p_stsd_atomdata_read (mp4p_stsd_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->number_of_entries = READ_UINT32();
+
+ return 0;
+}
+
+size_t
+mp4p_stsd_atomdata_write (mp4p_stsd_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 8;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT32(atom_data->number_of_entries);
+
+ return buffer - origin;
+}
+
+void
+mp4p_stsd_atomdata_free (void *atom_data) {
+ free (atom_data);
+}
+
+#pragma mark stts
+
+int
+mp4p_stts_atomdata_read (mp4p_stts_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->number_of_entries = READ_UINT32();
+ if (atom_data->number_of_entries) {
+ atom_data->entries = calloc (atom_data->number_of_entries, sizeof (mp4p_stts_entry_t));
+ }
+ for (uint32_t i = 0; i < atom_data->number_of_entries; i++) {
+ atom_data->entriesi.sample_count = READ_UINT32();
+ atom_data->entriesi.sample_duration = READ_UINT32();
+ }
+
+ return 0;
+}
+
+size_t
+mp4p_stts_atomdata_write (mp4p_stts_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 8 + atom_data->number_of_entries * 8;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT32(atom_data->number_of_entries);
+ for (uint32_t i = 0; i < atom_data->number_of_entries; i++) {
+ WRITE_UINT32(atom_data->entriesi.sample_count);
+ WRITE_UINT32(atom_data->entriesi.sample_duration);
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_stts_atomdata_free (void *data) {
+ mp4p_stts_t *stts = data;
+ if (stts->entries) {
+ free (stts->entries);
+ }
+ free (stts);
+}
+
+#pragma mark stsc
+
+int
+mp4p_stsc_atomdata_read (mp4p_stsc_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->number_of_entries = READ_UINT32();
+ if (atom_data->number_of_entries) {
+ atom_data->entries = calloc (atom_data->number_of_entries, sizeof (mp4p_stsc_entry_t));
+ }
+ for (uint32_t i = 0; i < atom_data->number_of_entries; i++) {
+ atom_data->entriesi.first_chunk = READ_UINT32();
+ atom_data->entriesi.samples_per_chunk = READ_UINT32();
+ atom_data->entriesi.sample_description_id = READ_UINT32();
+ }
+
+ return 0;
+}
+
+size_t
+mp4p_stsc_atomdata_write (mp4p_stsc_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 8 + atom_data->number_of_entries * 12;
+ }
+ uint8_t *origin = buffer;
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT32(atom_data->number_of_entries);
+ for (uint32_t i = 0; i < atom_data->number_of_entries; i++) {
+ WRITE_UINT32(atom_data->entriesi.first_chunk);
+ WRITE_UINT32(atom_data->entriesi.samples_per_chunk);
+ WRITE_UINT32(atom_data->entriesi.sample_description_id);
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_stsc_atomdata_free (void *data) {
+ mp4p_stsc_t *stsc = data;
+ if (stsc->entries) {
+ free (stsc->entries);
+ }
+ free (stsc);
+}
+
+#pragma mark stsz
+
+int
+mp4p_stsz_atomdata_read (mp4p_stsz_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->sample_size = READ_UINT32();
+ atom_data->number_of_entries = READ_UINT32();
+ if (buffer_size < atom_data->number_of_entries * 4) {
+ atom_data->number_of_entries = (uint32_t)(buffer_size / 4);
+ }
+ if (atom_data->number_of_entries) {
+ atom_data->entries = calloc (atom_data->number_of_entries, sizeof (mp4p_stsz_entry_t));
+ }
+ for (uint32_t i = 0; i < atom_data->number_of_entries; i++) {
+ atom_data->entriesi.sample_size = READ_UINT32();
+ }
+
+ return 0;
+}
+
+size_t
+mp4p_stsz_atomdata_write (mp4p_stsz_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 12 + atom_data->number_of_entries * 4;
+ }
+ uint8_t *origin = buffer;
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT32(atom_data->sample_size);
+ WRITE_UINT32(atom_data->number_of_entries);
+ for (uint32_t i = 0; i < atom_data->number_of_entries; i++) {
+ WRITE_UINT32(atom_data->entriesi.sample_size);
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_stsz_atomdata_free (void *data) {
+ mp4p_stsz_t *stsz = data;
+ if (stsz->entries) {
+ free (stsz->entries);
+ }
+ free (stsz);
+}
+
+#pragma mark stco
+
+int
+mp4p_stco_atomdata_read (mp4p_stco_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->number_of_entries = READ_UINT32();
+ if (atom_data->number_of_entries) {
+ atom_data->entries = calloc (atom_data->number_of_entries, sizeof (mp4p_stco_entry_t));
+ }
+ for (uint32_t i = 0; i < atom_data->number_of_entries; i++) {
+ atom_data->entriesi.offset = (uint64_t)READ_UINT32();
+ }
+
+ return 0;
+}
+
+size_t
+mp4p_stco_atomdata_write (mp4p_stco_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 8 + atom_data->number_of_entries * 4;
+ }
+ uint8_t *origin = buffer;
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT32(atom_data->number_of_entries);
+ for (uint32_t i = 0; i < atom_data->number_of_entries; i++) {
+ WRITE_UINT32((uint32_t)atom_data->entriesi.offset);
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_stco_atomdata_free (void *data) {
+ mp4p_stco_t *stco = data;
+ if (stco->entries) {
+ free (stco->entries);
+ }
+ free (stco);
+}
+
+#pragma mark co64
+
+int
+mp4p_co64_atomdata_read (mp4p_co64_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->number_of_entries = READ_UINT32();
+ if (atom_data->number_of_entries) {
+ atom_data->entries = calloc (atom_data->number_of_entries, sizeof (mp4p_stco_entry_t));
+ }
+ for (uint32_t i = 0; i < atom_data->number_of_entries; i++) {
+ atom_data->entriesi.offset = READ_UINT64();
+ }
+
+ return 0;
+}
+
+size_t
+mp4p_co64_atomdata_write (mp4p_co64_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 8 + atom_data->number_of_entries * 8;
+ }
+ uint8_t *origin = buffer;
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT32(atom_data->number_of_entries);
+ for (uint32_t i = 0; i < atom_data->number_of_entries; i++) {
+ WRITE_UINT64(atom_data->entriesi.offset);
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_co64_atomdata_free (void *data) {
+ mp4p_co64_t *co64 = data;
+ if (co64->entries) {
+ free (co64->entries);
+ }
+ free (co64);
+}
+
+#pragma mark dref
+
+int
+mp4p_dref_atomdata_read (mp4p_dref_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->number_of_entries = READ_UINT32();
+
+ return 0;
+}
+
+size_t
+mp4p_dref_atomdata_write (mp4p_dref_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 8;
+ }
+ uint8_t *origin = buffer;
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT32(atom_data->number_of_entries);
+
+ return buffer - origin;
+}
+
+void
+mp4p_dref_atomdata_free (void *data) {
+ mp4p_dref_t *dref = data;
+ free (dref);
+}
+
+#pragma mark alac
+
+int
+mp4p_alac_atomdata_read (mp4p_alac_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ size_t atomdata_size = buffer_size;
+
+ if (atomdata_size < 32) {
+ return -1;
+ }
+
+ READ_BUF(atom_data->reserved, 6);
+ atom_data->data_reference_index = READ_UINT16();
+
+ READ_BUF(atom_data->reserved2, 8);
+
+ atom_data->asc_size = (uint32_t)(atomdata_size - 16);
+ if (atom_data->asc_size > 64) {
+ atom_data->asc_size = 64;
+ }
+ atom_data->asc = calloc (atom_data->asc_size, 1);
+ READ_BUF(atom_data->asc, atom_data->asc_size);
+
+ // These values are parsed from the ASC blob
+ buffer = atom_data->asc;
+ buffer_size = atom_data->asc_size;
+
+ if (buffer_size == 24) { // backwards compatibility with 24 byte ALACSpecificConfig
+ atom_data->channel_count = READ_UINT16();
+ atom_data->packet_size = READ_UINT16();
+ atom_data->bps = READ_UINT16();
+ atom_data->sample_rate = READ_UINT32();
+ }
+ else if (buffer_size == 48) {
+ buffer += 24;
+ buffer_size -= 24;
+ atom_data->packet_size = READ_UINT32(); // frameLength
+ READ_UINT8(); // compatibleVersion
+ atom_data->bps = READ_UINT8(); // bitDepth
+ READ_UINT8(); // pb
+ READ_UINT8(); // mb
+ READ_UINT8(); // kb
+ atom_data->channel_count = READ_UINT8(); // numChannels
+ READ_UINT16(); // maxRun
+ READ_UINT32(); // maxFrameBytes
+ READ_UINT32(); // avgBitRate
+ atom_data->sample_rate = READ_UINT32(); // sampleRate
+ }
+
+ return 0;
+}
+
+size_t
+mp4p_alac_atomdata_write (mp4p_alac_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (atom_data->asc_size < 24) {
+ return -1;
+ }
+ if (!buffer) {
+ return 16+atom_data->asc_size;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_BUF(atom_data->reserved, 6);
+ WRITE_UINT16(atom_data->data_reference_index);
+
+ WRITE_BUF(atom_data->reserved2, 8);
+ WRITE_BUF(atom_data->asc, atom_data->asc_size);
+
+ return buffer - origin;
+}
+
+void
+mp4p_alac_atomdata_free (void *data) {
+ mp4p_alac_t *alac = data;
+ free (alac->asc);
+ free (alac);
+}
+
+#pragma mark mp4a
+
+int
+mp4p_mp4a_atomdata_read (mp4p_mp4a_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_BUF(atom_data->reserved, 6);
+ atom_data->data_reference_index = READ_UINT16();
+
+ READ_BUF(atom_data->reserved2, 8);
+
+ atom_data->channel_count = READ_UINT16();
+ atom_data->bps = READ_UINT16();
+ atom_data->packet_size = READ_UINT16();
+ atom_data->sample_rate = READ_UINT32();
+
+ READ_BUF(atom_data->reserved3, 2);
+
+ return 0;
+}
+
+size_t
+mp4p_mp4a_atomdata_write (mp4p_mp4a_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 28;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_BUF(atom_data->reserved, 6);
+ WRITE_UINT16(atom_data->data_reference_index);
+
+ WRITE_BUF(atom_data->reserved2, 8);
+
+ WRITE_UINT16(atom_data->channel_count);
+ WRITE_UINT16(atom_data->bps);
+ WRITE_UINT16(atom_data->packet_size);
+ WRITE_UINT32(atom_data->sample_rate);
+
+ WRITE_BUF(atom_data->reserved3, 2);
+
+ return buffer - origin;
+}
+
+void
+mp4p_mp4a_atomdata_free (void *data) {
+ mp4p_mp4a_t *mp4a = data;
+ free (mp4a);
+}
+
+#pragma mark Opus
+
+int
+mp4p_Opus_atomdata_read (mp4p_Opus_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_BUF(atom_data->reserved, 6);
+ atom_data->data_reference_index = READ_UINT16();
+
+ READ_BUF(atom_data->reserved2, 8);
+
+ atom_data->channel_count = READ_UINT16();
+ atom_data->bps = READ_UINT16();
+ if (atom_data->bps != 16) {
+ return -1;
+ }
+ atom_data->packet_size = READ_UINT16();
+ atom_data->sample_rate = READ_UINT32();
+ if (atom_data->sample_rate != 48000) {
+ return -1;
+ }
+ READ_BUF(atom_data->reserved3, 2);
+
+ return 0;
+}
+
+size_t
+mp4p_Opus_atomdata_write (mp4p_Opus_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 28;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_BUF(atom_data->reserved, 6);
+ WRITE_UINT16(atom_data->data_reference_index);
+
+ WRITE_BUF(atom_data->reserved2, 8);
+
+ WRITE_UINT16(atom_data->channel_count);
+ WRITE_UINT16(atom_data->bps);
+ WRITE_UINT16(atom_data->packet_size);
+ WRITE_UINT32(atom_data->sample_rate);
+ WRITE_BUF(atom_data->reserved3, 2);
+
+ return buffer - origin;
+}
+
+void
+mp4p_Opus_atomdata_free (void *data) {
+ mp4p_Opus_t *Opus = data;
+ free (Opus);
+}
+
+#pragma mark dOps
+
+int
+mp4p_dOps_atomdata_read (mp4p_dOps_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ atom_data->version = READ_UINT8();
+ if (atom_data->version != 0) {
+ return -1;
+ }
+ atom_data->output_channel_count = READ_UINT8();
+ atom_data->pre_skip = READ_UINT16();
+ atom_data->input_sample_rate = READ_UINT32();
+ atom_data->output_gain = READ_INT16();
+ atom_data->channel_mapping_family = READ_UINT8();
+ if (atom_data->channel_mapping_family != 0) {
+ atom_data->channel_mapping_table = calloc (atom_data->output_channel_count, sizeof (mp4p_opus_channel_mapping_table_t));
+ for (int i = 0; i < atom_data->output_channel_count; i++) {
+ atom_data->channel_mapping_tablei.channel_mapping = calloc(1, atom_data->output_channel_count);
+ atom_data->channel_mapping_tablei.stream_count = READ_UINT8();
+ atom_data->channel_mapping_tablei.coupled_count = READ_UINT8();
+ for (int j = 0; j < atom_data->output_channel_count; j++) {
+ atom_data->channel_mapping_tablei.channel_mappingj = READ_UINT8();
+ }
+ }
+ }
+
+ return 0;
+}
+
+size_t
+mp4p_dOps_atomdata_write (mp4p_dOps_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 11 + (2+atom_data->output_channel_count) * atom_data->output_channel_count;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_UINT8(atom_data->version);
+ WRITE_UINT8(atom_data->output_channel_count);
+ WRITE_UINT16(atom_data->pre_skip);
+ WRITE_UINT32(atom_data->input_sample_rate);
+ WRITE_INT16(atom_data->output_gain);
+ WRITE_UINT8(atom_data->channel_mapping_family);
+ for (int i = 0; i < atom_data->output_channel_count; i++) {
+ WRITE_UINT8(atom_data->channel_mapping_tablei.stream_count);
+ WRITE_UINT8(atom_data->channel_mapping_tablei.coupled_count);
+ for (int j = 0; j < atom_data->output_channel_count; j++) {
+ WRITE_UINT8(atom_data->channel_mapping_tablei.channel_mappingj);
+ }
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_dOps_atomdata_free (void *data) {
+ mp4p_dOps_t *dOps = data;
+ if (dOps->channel_mapping_table) {
+ for (int i = 0; i < dOps->output_channel_count; i++) {
+ if (dOps->channel_mapping_tablei.channel_mapping) {
+ free (dOps->channel_mapping_tablei.channel_mapping);
+ }
+ }
+ free (dOps->channel_mapping_table);
+ }
+ free (dOps);
+}
+
+#pragma mark esds
+
+// read tag size, encoded in a 1-4 byte sequence, terminated when high bit is 0
+int
+read_esds_tag_size (uint8_t *buffer, size_t buffer_size, uint32_t *retval) {
+ size_t initial_size = buffer_size;
+ uint32_t num = 0;
+ for (int i = 0; i < 4; i++) {
+ uint8_t val = READ_UINT8();
+ num <<= 7;
+ num |= (val & 0x7f);
+ if (!(val & 0x80)) {
+ break;
+ }
+ }
+ *retval = num;
+ return (int)(initial_size - buffer_size);
+}
+
+int
+mp4p_esds_atomdata_read (mp4p_esds_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->es_tag = READ_UINT8();
+ if (atom_data->es_tag == 3)
+ {
+ int res = read_esds_tag_size (buffer, buffer_size, &atom_data->es_tag_size);
+ if (res < 0) {
+ return -1;
+ }
+ if (atom_data->es_tag_size < 20) {
+ return -1;
+ }
+
+ buffer += res;
+ buffer_size -= res;
+
+ atom_data->ignored1 = READ_UINT8();
+ }
+
+ // FIXME: validate against spec -- could be that this is tag_size
+ atom_data->ignored2 = READ_UINT8();
+ atom_data->ignored3 = READ_UINT8();
+
+ atom_data->dc_tag = READ_UINT8();
+ if (atom_data->dc_tag != 4) {
+ return -1;
+ }
+
+ int res = read_esds_tag_size (buffer, buffer_size, &atom_data->dc_tag_size);
+ if (res < 0) {
+ return -1;
+ }
+ if (atom_data->dc_tag_size < 13) {
+ return -1;
+ }
+ buffer += res;
+ buffer_size -= res;
+
+ atom_data->dc_audiotype = READ_UINT8();
+ atom_data->dc_audiostream = READ_UINT8();
+ READ_BUF(atom_data->dc_buffersize_db, 3);
+
+ atom_data->dc_max_bitrate = READ_UINT32();
+ atom_data->dc_avg_bitrate = READ_UINT32();
+
+ atom_data->ds_tag = READ_UINT8();
+ if (atom_data->ds_tag != 5) {
+ return -1;
+ }
+
+ res = read_esds_tag_size(buffer, buffer_size, &atom_data->asc_size);
+ if (res < 0) {
+ return -1;
+ }
+ buffer += res;
+ buffer_size -= res;
+
+ // FIXME: validate asc_size
+ if (atom_data->asc_size) {
+ atom_data->asc = malloc (atom_data->asc_size);
+ READ_BUF(atom_data->asc, atom_data->asc_size);
+ }
+
+ if (buffer_size > 0) {
+ atom_data->remainder_size = (uint32_t)buffer_size;
+ atom_data->remainder = calloc (1, buffer_size);
+ READ_BUF(atom_data->remainder, buffer_size);
+ }
+
+ return 0;
+}
+
+#define ESDS_TAG_SIZE_WRITE_4B 1
+
+int
+write_esds_tag_size (uint8_t *buffer, size_t buffer_size, uint32_t num) {
+ uint8_t data4 = {0};
+ int count = 0;
+ size_t initial_size = buffer_size;
+ while (num
+#if ESDS_TAG_SIZE_WRITE_4B
+ || count < 4
+#endif
+ ) {
+ if (count >= 4) {
+ return -1;
+ }
+ datacount++ = num & 0x7f;
+ num >>= 7;
+ }
+ if (count == 0) {
+ count = 1;
+ }
+
+ for (int i = count-1; i >= 0; i--) {
+ uint8_t val = datai;
+ if (i != 0) {
+ val |= 0x80;
+ }
+ WRITE_UINT8(val);
+ }
+ return (int)(initial_size - buffer_size);
+}
+
+size_t
+_esds_tag_written_size (uint32_t tag) {
+ uint8_t buffer4;
+ size_t buffer_size = 4;
+ return (size_t)write_esds_tag_size(buffer, buffer_size, tag);
+}
+
+size_t
+mp4p_esds_atomdata_write (mp4p_esds_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ size_t size = 5;
+ if (atom_data->es_tag == 3) {
+ size += _esds_tag_written_size (atom_data->es_tag_size);
+ size++;
+ }
+
+ size += 3;
+ size += _esds_tag_written_size (atom_data->dc_tag_size);
+
+ size += 14;
+
+ size += _esds_tag_written_size (atom_data->asc_size);
+ size += atom_data->asc_size;
+
+ size += atom_data->remainder_size;
+ return size;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_COMMON_HEADER();
+
+ WRITE_UINT8(atom_data->es_tag);
+ if (atom_data->es_tag == 3)
+ {
+ int res = write_esds_tag_size (buffer, buffer_size, atom_data->es_tag_size);
+ if (res < 0) {
+ return 0;
+ }
+
+ buffer += res;
+ buffer_size -= res;
+
+ WRITE_UINT8(atom_data->ignored1);
+ }
+
+ WRITE_UINT8(atom_data->ignored2);
+ WRITE_UINT8(atom_data->ignored3);
+
+ WRITE_UINT8(atom_data->dc_tag);
+ if (atom_data->dc_tag != 4) {
+ return 0;
+ }
+
+ int res = write_esds_tag_size (buffer, buffer_size, atom_data->dc_tag_size);
+ if (res < 0) {
+ return 0;
+ }
+
+ buffer += res;
+ buffer_size -= res;
+
+ WRITE_UINT8(atom_data->dc_audiotype);
+ WRITE_UINT8(atom_data->dc_audiostream);
+ WRITE_BUF(atom_data->dc_buffersize_db, 3);
+
+ WRITE_UINT32(atom_data->dc_max_bitrate);
+ WRITE_UINT32(atom_data->dc_avg_bitrate);
+
+ WRITE_UINT8(atom_data->ds_tag);
+
+ res = write_esds_tag_size(buffer, buffer_size, atom_data->asc_size);
+ if (res < 0) {
+ return 0;
+ }
+ buffer += res;
+ buffer_size -= res;
+
+ if (atom_data->asc_size) {
+ WRITE_BUF(atom_data->asc, atom_data->asc_size);
+ }
+
+ if (atom_data->remainder_size) {
+ WRITE_BUF(atom_data->remainder, atom_data->remainder_size);
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_esds_atomdata_free (void *data) {
+ mp4p_esds_t *esds = data;
+ free (esds->asc);
+ free (esds->remainder);
+ free (esds);
+}
+
+#pragma mark chpl
+
+int
+mp4p_chpl_atomdata_read (mp4p_chpl_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+
+ atom_data->ignore1 = READ_UINT32();
+
+ int i;
+
+ atom_data->number_of_entries = READ_UINT8();
+
+ if (atom_data->number_of_entries) {
+ atom_data->entries = calloc (atom_data->number_of_entries, sizeof (mp4p_chpl_entry_t));
+ }
+ for(i = 0; i < atom_data->number_of_entries; i++)
+ {
+ atom_data->entriesi.start_time = READ_UINT64();
+ uint8_t name_len = READ_UINT8();
+ if (name_len > buffer_size) {
+ name_len = buffer_size;
+ }
+ atom_data->entriesi.name_len = name_len;
+ if (name_len) {
+ atom_data->entriesi.name = malloc(name_len+1);
+ READ_BUF(atom_data->entriesi.name, name_len);
+ atom_data->entriesi.namename_len = 0;
+ }
+ }
+ // FIXME: convert to qsort
+ /* Bubble sort by increasing start date */
+ do {
+ for (i = 0; i < atom_data->number_of_entries - 1; i++) {
+ if (atom_data->entriesi.start_time > atom_data->entriesi+1.start_time ) {
+
+ mp4p_chpl_entry_t temp;
+
+ memcpy (&temp, atom_data->entries+i+1, sizeof (mp4p_chpl_entry_t));
+
+ memcpy (atom_data->entries+i+1, atom_data->entries+i, sizeof (mp4p_chpl_entry_t));
+
+ memcpy (atom_data->entries+i, &temp, sizeof (mp4p_chpl_entry_t));
+
+ i = -1;
+ break;
+ }
+ }
+ } while( i == -1 );
+
+ return 0;
+}
+
+size_t
+mp4p_chpl_atomdata_write (mp4p_chpl_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ size_t size = 5 + 4;
+ for (int i = 0; i < atom_data->number_of_entries; i++) {
+ size += 8 + 1 + atom_data->entriesi.name_len;
+ }
+ return size;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_COMMON_HEADER();
+ WRITE_UINT32(atom_data->ignore1);
+
+ int i;
+
+ WRITE_UINT8(atom_data->number_of_entries);
+
+ for(i = 0; i < atom_data->number_of_entries; i++)
+ {
+ WRITE_UINT64(atom_data->entriesi.start_time);
+ WRITE_UINT8(atom_data->entriesi.name_len);
+ if (atom_data->entriesi.name_len) {
+ WRITE_BUF(atom_data->entriesi.name, atom_data->entriesi.name_len);
+ }
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_chpl_atomdata_free (void *data) {
+ mp4p_chpl_t *chpl = data;
+ for (int i = 0; i < chpl->number_of_entries; i++) {
+ free (chpl->entriesi.name);
+ }
+ free (chpl->entries);
+ free (data);
+}
+
+#pragma mark chap
+
+int
+mp4p_chap_atomdata_read (mp4p_chap_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ atom_data->number_of_entries = (uint32_t)(buffer_size / sizeof(uint32_t));
+ if (atom_data->number_of_entries > 0) {
+ atom_data->entries = calloc (atom_data->number_of_entries, sizeof(uint32_t));
+ }
+ else {
+ return -1;
+ }
+
+ for (int i = 0; i < atom_data->number_of_entries; i++) {
+ atom_data->entriesi = READ_UINT32();
+ }
+
+ return 0;
+}
+
+size_t
+mp4p_chap_atomdata_write (mp4p_chap_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return atom_data->number_of_entries * 4;
+ }
+ uint8_t *origin = buffer;
+
+ for (int i = 0; i < atom_data->number_of_entries; i++) {
+ WRITE_UINT32(atom_data->entriesi);
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_chap_atomdata_free (void *atom_data) {
+ mp4p_chap_t *chap = atom_data;
+ free (chap->entries);
+ free (atom_data);
+}
+
+#pragma mark ilst_custom
+
+int
+mp4p_ilst_meta_atomdata_read (mp4p_ilst_meta_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (atom_data->custom) {
+ // mean subatom
+ uint32_t mean_size = READ_UINT32();
+ if (mean_size < 12) {
+ return -1;
+ }
+ mean_size -= 12;
+
+ char mean_type4;
+ READ_BUF(mean_type, 4);
+ if (strncasecmp (mean_type, "mean", 4)) {
+ return -1; // FIXME: Unsupported fields must be loaded as blobs, and preserved when rewriting the ilst
+ }
+ READ_UINT32(); // version_flags always 0
+ if (buffer_size < mean_size + 1) {
+ return -1;
+ }
+ char *mean_data = malloc (mean_size + 1);
+
+ memcpy (mean_data, buffer, mean_size);
+ buffer += mean_size;
+ buffer_size -= mean_size;
+
+ mean_datamean_size = 0;
+
+ free (mean_data);
+ mean_data = NULL;
+
+ // name subatom
+ uint32_t name_size = READ_UINT32();
+ if (name_size < 12) {
+ return -1;
+ }
+ name_size -= 12;
+
+ char name_type4;
+ READ_BUF(name_type, 4);
+ if (strncasecmp (name_type, "name", 4)) {
+ return -1;
+ }
+
+ READ_UINT32(); // version_flags always 0
+
+ atom_data->name = malloc (name_size + 1);
+ READ_BUF(atom_data->name, name_size);
+ atom_data->namename_size = 0;
+ }
+
+ // data subatom
+ uint32_t data_size = READ_UINT32();
+ if (data_size < 16) {
+ return -1;
+ }
+ data_size -= 16;
+ atom_data->data_size = data_size;
+
+ char data_type4;
+ READ_BUF(data_type, 4);
+ if (strncasecmp (data_type, "data", 4)) {
+ return -1;
+ }
+
+ atom_data->data_version_flags = READ_UINT32();
+ uint32_t flag = atom_data->data_version_flags & 0xff;
+
+ READ_UINT32(); // what is this?
+
+ if (flag == 0) {
+ // array of numbers
+ atom_data->values = calloc (atom_data->data_size / 2, sizeof (uint16_t));
+ for (int i = 0; i < atom_data->data_size/2; i++) {
+ atom_data->valuesi = READ_UINT16();
+ }
+ }
+ else if (flag == 1) {
+ // text
+ atom_data->text = calloc (atom_data->data_size+1, 1);
+ READ_BUF(atom_data->text, atom_data->data_size);
+ atom_data->textatom_data->data_size = 0;
+
+ // printf ("%s\n", meta->text);
+ }
+ else {
+ // blob
+ // FIXME: make it optional, i.e. skip and don't load to memory
+ atom_data->blob = calloc (1, atom_data->data_size);
+ READ_BUF(atom_data->blob, atom_data->data_size);
+ }
+ return 0;
+}
+
+size_t
+mp4p_ilst_meta_atomdata_write (mp4p_ilst_meta_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ size_t size = 0;
+ if (atom_data->custom) {
+ size += 28; // mean
+ size += 12 + strlen (atom_data->name); // name
+ }
+ size += 16 + atom_data->data_size;
+ return size;
+ }
+ uint8_t *origin = buffer;
+
+ // mean + name
+ if (atom_data->name) {
+ uint32_t mean_size = 28;
+ WRITE_UINT32(mean_size);
+ WRITE_BUF("mean", 4);
+ WRITE_UINT32(0); // version_flags always 0
+ WRITE_BUF("com.apple.iTunes", 16);
+
+ uint32_t name_size = 12 + (uint32_t)strlen(atom_data->name);
+ WRITE_UINT32(name_size);
+ WRITE_BUF("name", 4);
+ WRITE_UINT32(0); // version_flags always 0
+ WRITE_BUF(atom_data->name, (uint32_t)strlen(atom_data->name));
+ }
+ // data atom
+ if (atom_data->text || atom_data->values || atom_data->blob) {
+ uint32_t data_atom_size = atom_data->data_size+16;
+ WRITE_UINT32(data_atom_size);
+ WRITE_BUF("data", 4);
+ }
+ WRITE_UINT32(atom_data->data_version_flags);
+ WRITE_UINT32(0); // what is this?
+
+ if (atom_data->data_version_flags == 0) {
+ if (!atom_data->values) {
+ return 0;
+ }
+ for (int i = 0; i < atom_data->data_size/2; i++) {
+ WRITE_UINT16(atom_data->valuesi);
+ }
+ }
+ else if (atom_data->data_version_flags == 1) {
+ if (!atom_data->text) {
+ return 0;
+ }
+ WRITE_BUF(atom_data->text, atom_data->data_size);
+ }
+ else if (atom_data->blob) {
+ WRITE_BUF(atom_data->blob,atom_data->data_size);
+ }
+ else {
+ return 0;
+ }
+
+ return buffer - origin;
+}
+
+void
+mp4p_ilst_meta_atomdata_free (void *atom_data) {
+ mp4p_ilst_meta_t *meta = atom_data;
+ free (meta->name);
+ free (meta->values);
+ free (meta->text);
+ free (meta->blob);
+ free (atom_data);
+}
+
+#pragma mark meta
+
+int
+mp4p_meta_atomdata_read (mp4p_meta_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ READ_COMMON_HEADER();
+ return 0;
+}
+
+size_t
+mp4p_meta_atomdata_write (mp4p_meta_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 4;
+ }
+ uint8_t *origin = buffer;
+
+ WRITE_COMMON_HEADER();
+
+ return buffer - origin;
+}
+
+void
+mp4p_meta_atomdata_free (void *atom_data) {
+ free (atom_data);
+}
+
+
+#if 0
+#pragma mark tmpl
+
+int
+mp4p_tmpl_atomdata_read (mp4p_tmpl_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ return 0;
+}
+
+size_t
+mp4p_tmpl_atomdata_write (mp4p_tmpl_t *atom_data, uint8_t *buffer, size_t buffer_size) {
+ if (!buffer) {
+ return 100;
+ }
+ uint8_t *origin = buffer;
+
+
+ return buffer - origin;
+}
+
+void
+mp4p_tmpl_atomdata_free (void *atom_data) {
+ free (atom_data);
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/external/mp4p/src/mp4pfile.c Added

@@ -0,0 +1,85 @@
+//
+// mp4file.c
+// MP4P
+//
+// Created by Oleksiy Yakovenko on 4/6/20.
+// Copyright © 2020 Oleksiy Yakovenko. All rights reserved.
+//
+
+#include <fcntl.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <mp4p/mp4pfile.h>
+
+#ifndef __linux__
+#define O_LARGEFILE 0
+#endif
+
+static ssize_t
+_file_read (mp4p_file_callbacks_t *stream, void *ptr, size_t size) {
+ return read (stream->handle, ptr, size);
+}
+
+static ssize_t
+_file_write (mp4p_file_callbacks_t *stream, void *ptr, size_t size) {
+ return write (stream->handle, ptr, size);
+}
+
+static off_t
+_file_seek (mp4p_file_callbacks_t *stream, off_t offset, int whence) {
+ return lseek (stream->handle, offset, whence);
+}
+
+static off_t
+_file_tell (mp4p_file_callbacks_t *stream) {
+ return (off_t)lseek(stream->handle, 0, SEEK_CUR);
+}
+
+static int
+_file_truncate (mp4p_file_callbacks_t *stream, off_t length) {
+ return ftruncate (stream->handle, length);
+}
+
+static void
+_init_file_callbacks (mp4p_file_callbacks_t *file) {
+ file->read = _file_read;
+ file->write = _file_write;
+ file->seek = _file_seek;
+ file->tell = _file_tell;
+ file->truncate = _file_truncate;
+}
+
+mp4p_file_callbacks_t *
+mp4p_file_open_read (const char *fname) {
+ int fd = open (fname, O_RDONLY|O_LARGEFILE);
+ if (fd < 0) {
+ return NULL;
+ }
+
+ mp4p_file_callbacks_t *file = calloc (1, sizeof (mp4p_file_callbacks_t));
+ file->handle = fd;
+ _init_file_callbacks(file);
+ return file;
+}
+
+mp4p_file_callbacks_t *
+mp4p_file_open_readwrite (const char *fname) {
+ int fd = open (fname, O_RDWR|O_LARGEFILE);
+ if (fd < 0) {
+ return NULL;
+ }
+
+ mp4p_file_callbacks_t *file = calloc (1, sizeof (mp4p_file_callbacks_t));
+ file->handle = fd;
+ _init_file_callbacks(file);
+ return file;
+}
+
+int
+mp4p_file_close (mp4p_file_callbacks_t *file) {
+ int res = close (file->handle);
+ free (file);
+ return res;
+}
+

deadbeef-1.9.6.tar.bz2/external/wcwidth Added

deadbeef-1.9.6.tar.bz2/external/wcwidth/wcwidth.c Added

@@ -0,0 +1,309 @@
+/*
+ * This is an implementation of wcwidth() and wcswidth() (defined in
+ * IEEE Std 1002.1-2001) for Unicode.
+ *
+ * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html
+ * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html
+ *
+ * In fixed-width output devices, Latin characters all occupy a single
+ * "cell" position of equal width, whereas ideographic CJK characters
+ * occupy two such cells. Interoperability between terminal-line
+ * applications and (teletype-style) character terminals using the
+ * UTF-8 encoding requires agreement on which character should advance
+ * the cursor by how many cell positions. No established formal
+ * standards exist at present on which Unicode character shall occupy
+ * how many cell positions on character terminals. These routines are
+ * a first attempt of defining such behavior based on simple rules
+ * applied to data provided by the Unicode Consortium.
+ *
+ * For some graphical characters, the Unicode standard explicitly
+ * defines a character-cell width via the definition of the East Asian
+ * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes.
+ * In all these cases, there is no ambiguity about which width a
+ * terminal shall use. For characters in the East Asian Ambiguous (A)
+ * class, the width choice depends purely on a preference of backward
+ * compatibility with either historic CJK or Western practice.
+ * Choosing single-width for these characters is easy to justify as
+ * the appropriate long-term solution, as the CJK practice of
+ * displaying these characters as double-width comes from historic
+ * implementation simplicity (8-bit encoded characters were displayed
+ * single-width and 16-bit ones double-width, even for Greek,
+ * Cyrillic, etc.) and not any typographic considerations.
+ *
+ * Much less clear is the choice of width for the Not East Asian
+ * (Neutral) class. Existing practice does not dictate a width for any
+ * of these characters. It would nevertheless make sense
+ * typographically to allocate two character cells to characters such
+ * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be
+ * represented adequately with a single-width glyph. The following
+ * routines at present merely assign a single-cell width to all
+ * neutral characters, in the interest of simplicity. This is not
+ * entirely satisfactory and should be reconsidered before
+ * establishing a formal standard in this area. At the moment, the
+ * decision which Not East Asian (Neutral) characters should be
+ * represented by double-width glyphs cannot yet be answered by
+ * applying a simple rule from the Unicode database content. Setting
+ * up a proper standard for the behavior of UTF-8 character terminals
+ * will require a careful analysis not only of each Unicode character,
+ * but also of each presentation form, something the author of these
+ * routines has avoided to do so far.
+ *
+ * http://www.unicode.org/unicode/reports/tr11/
+ *
+ * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
+ *
+ * Permission to use, copy, modify, and distribute this software
+ * for any purpose and without fee is hereby granted. The author
+ * disclaims all warranties with regard to this software.
+ *
+ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
+ */
+
+#include <wchar.h>
+
+struct interval {
+ int first;
+ int last;
+};
+
+/* auxiliary function for binary search in interval table */
+static int bisearch(wchar_t ucs, const struct interval *table, int max) {
+ int min = 0;
+ int mid;
+
+ if (ucs < table0.first || ucs > tablemax.last)
+ return 0;
+ while (max >= min) {
+ mid = (min + max) / 2;
+ if (ucs > tablemid.last)
+ min = mid + 1;
+ else if (ucs < tablemid.first)
+ max = mid - 1;
+ else
+ return 1;
+ }
+
+ return 0;
+}
+
+
+/* The following two functions define the column width of an ISO 10646
+ * character as follows:
+ *
+ * - The null character (U+0000) has a column width of 0.
+ *
+ * - Other C0/C1 control characters and DEL will lead to a return
+ * value of -1.
+ *
+ * - Non-spacing and enclosing combining characters (general
+ * category code Mn or Me in the Unicode database) have a
+ * column width of 0.
+ *
+ * - SOFT HYPHEN (U+00AD) has a column width of 1.
+ *
+ * - Other format characters (general category code Cf in the Unicode
+ * database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
+ *
+ * - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
+ * have a column width of 0.
+ *
+ * - Spacing characters in the East Asian Wide (W) or East Asian
+ * Full-width (F) category as defined in Unicode Technical
+ * Report #11 have a column width of 2.
+ *
+ * - All remaining characters (including all printable
+ * ISO 8859-1 and WGL4 characters, Unicode control characters,
+ * etc.) have a column width of 1.
+ *
+ * This implementation assumes that wchar_t characters are encoded
+ * in ISO 10646.
+ */
+
+int mk_wcwidth(wchar_t ucs)
+{
+ /* sorted list of non-overlapping intervals of non-spacing characters */
+ /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
+ static const struct interval combining = {
+ { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
+ { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
+ { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
+ { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
+ { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
+ { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
+ { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
+ { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
+ { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
+ { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
+ { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
+ { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
+ { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
+ { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
+ { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
+ { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
+ { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
+ { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
+ { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
+ { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
+ { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
+ { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
+ { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
+ { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
+ { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
+ { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
+ { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
+ { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
+ { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
+ { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
+ { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
+ { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
+ { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
+ { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
+ { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
+ { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
+ { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
+ { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
+ { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
+ { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
+ { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
+ { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
+ { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
+ { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
+ { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
+ { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
+ { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
+ { 0xE0100, 0xE01EF }
+ };
+
+ /* test for 8-bit control characters */
+ if (ucs == 0)
+ return 0;
+ if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
+ return -1;
+
+ /* binary search in table of non-spacing characters */
+ if (bisearch(ucs, combining,
+	 sizeof(combining) / sizeof(struct interval) - 1))
+ return 0;
+
+ /* if we arrive here, ucs is not a combining or C0/C1 control character */
+
+ return 1 + 
+ (ucs >= 0x1100 &&
+ (ucs <= 0x115f || /* Hangul Jamo init. consonants */
+ ucs == 0x2329 || ucs == 0x232a ||
+ (ucs >= 0x2e80 && ucs <= 0xa4cf &&
+ ucs != 0x303f) || /* CJK ... Yi */
+ (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
+ (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
+ (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
+ (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
+ (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
+ (ucs >= 0xffe0 && ucs <= 0xffe6) ||
+ (ucs >= 0x20000 && ucs <= 0x2fffd) ||
+ (ucs >= 0x30000 && ucs <= 0x3fffd)));
+}
+
+
+int mk_wcswidth(const wchar_t *pwcs, size_t n)
+{
+ int w, width = 0;
+
+ for (;*pwcs && n-- > 0; pwcs++)
+ if ((w = mk_wcwidth(*pwcs)) < 0)
+ return -1;
+ else
+ width += w;
+
+ return width;
+}
+
+
+/*
+ * The following functions are the same as mk_wcwidth() and
+ * mk_wcswidth(), except that spacing characters in the East Asian
+ * Ambiguous (A) category as defined in Unicode Technical Report #11
+ * have a column width of 2. This variant might be useful for users of
+ * CJK legacy encodings who want to migrate to UCS without changing
+ * the traditional terminal character-width behaviour. It is not
+ * otherwise recommended for general use.
+ */
+int mk_wcwidth_cjk(wchar_t ucs)
+{
+ /* sorted list of non-overlapping intervals of East Asian Ambiguous
+ * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
+ static const struct interval ambiguous = {
+ { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 },
+ { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 },
+ { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 },
+ { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 },
+ { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED },
+ { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA },
+ { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 },
+ { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B },
+ { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 },
+ { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 },
+ { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 },
+ { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE },
+ { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 },
+ { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA },
+ { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 },
+ { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB },
+ { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB },
+ { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0391, 0x03A1 },
+ { 0x03A3, 0x03A9 }, { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 },
+ { 0x0401, 0x0401 }, { 0x0410, 0x044F }, { 0x0451, 0x0451 },
+ { 0x2010, 0x2010 }, { 0x2013, 0x2016 }, { 0x2018, 0x2019 },
+ { 0x201C, 0x201D }, { 0x2020, 0x2022 }, { 0x2024, 0x2027 },
+ { 0x2030, 0x2030 }, { 0x2032, 0x2033 }, { 0x2035, 0x2035 },
+ { 0x203B, 0x203B }, { 0x203E, 0x203E }, { 0x2074, 0x2074 },
+ { 0x207F, 0x207F }, { 0x2081, 0x2084 }, { 0x20AC, 0x20AC },
+ { 0x2103, 0x2103 }, { 0x2105, 0x2105 }, { 0x2109, 0x2109 },
+ { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 },
+ { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 },
+ { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 },
+ { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 },
+ { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 },
+ { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B },
+ { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 },
+ { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 },
+ { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E },
+ { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 },
+ { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 },
+ { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F },
+ { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 },
+ { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF },
+ { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B },
+ { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 },
+ { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 },
+ { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 },
+ { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 },
+ { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 },
+ { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 },
+ { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 },
+ { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 },
+ { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F },
+ { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF },
+ { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD }
+ };
+
+ /* binary search in table of non-spacing characters */
+ if (bisearch(ucs, ambiguous,
+	 sizeof(ambiguous) / sizeof(struct interval) - 1))
+ return 2;
+
+ return mk_wcwidth(ucs);
+}
+
+
+int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n)
+{
+ int w, width = 0;
+
+ for (;*pwcs && n-- > 0; pwcs++)
+ if ((w = mk_wcwidth_cjk(*pwcs)) < 0)
+ return -1;
+ else
+ width += w;
+
+ return width;
+}

deadbeef-1.9.6.tar.bz2/external/wcwidth/wcwidth.h Added

deadbeef-0.6.2.tar.bz2/help.txt -> deadbeef-1.9.6.tar.bz2/help.txt Changed

@@ -1,51 +1,40 @@
-help file for deadbeef player
+💛💙
 
-* LINKS
+Help file for GTK version of Deadbeef Player (Linux/*BSD and friends)
 
- main website: http://deadbeef.sf.net
- wiki: http://github.com/Alexey-Yakovenko/deadbeef/wiki
- development website: http://github.com/Alexey-Yakovenko/deadbeef
- info for contributors: http://contributing.appspot.com/deadbeef
+* LINKS
 
-* USEFUL HOTKEYS
+ main website: https://deadbeef.sourceforge.io
+ wiki: https://github.com/DeaDBeeF-Player/deadbeef/wiki
+ development website: https://github.com/DeaDBeeF-Player/deadbeef
+ info for contributors: https://github.com/DeaDBeeF-Player/deadbeef/blob/master/CONTRIBUTING.md
 
- when you run the player for the first time, a number of hotkeys will be automatically assigned.
+* CUESHEETS
 
- playlist can be navigated with arrow keys, as well as PgUp, PgDn, Home, End, etc.
- use above with Shift key to select multiple tracks.
+ To use cuesheets, just open/add the cue files, select audio + cue files in the file dialog, or add whole folders with audio and cue files to playlist.
 
- you can view, change, remove or add any key mappings in the Edit->Preferences->Hotkeys tab.
+ Adding a single audio file would not load a cuesheet, unless it's embedded in the file.
 
 * CONFIGURATION
 
- since 0.3.0 release, all configuration is stored in single file:
- $HOME/.config/deadbeef/config
+ Most settings can be configured through the Edit->Preferences dialog.
 
- you need to exit player before editing this file, or your changes will be overwritten.
+ All configuration is stored in the $HOME/.config/deadbeef folder.
+ Individual settings can be tweaked in the $HOME/.config/deadbeef/config text file.
 
- most stuff can be configured through edit->preferences dialog.
+ You should exit the player before editing this file, or your changes will be overwritten.
 
 * ALBUM ART DISPLAY
 
- to display album artwork, you need to follow the steps below
+ To display album art in the playlist, you need to perform the following steps:
 
- 1. add new column, select Album Art type
- 2. right click on the playlist column headers, and in context menu select "group by" submenu. click "Artist/Date/Album".
+ 1. Add a new column, and choose "Album Art" column type
+ 2. Right click on the playlist column headers, and in the context menu select "Group by" submenu. Click "Artist/Date/Album", or another option which you prefer.
 
- another option is to use the album art widget in design mode (View -> Design mode)
+ Another option is to use the album art widget in design mode (View -> Design mode)
 
 * OSD NOTIFICATIONS
 
- you can enable/configure them in "OSD Notify" plugin options
-
-* CUESHEETS
-
- to load image+cue rips, you need to open/add actual image files, and Deadbeef will find the right .cue file automatically.
-
- you should not try to add .cue files to playlist
-
- example:
-
- Unknown Artist - Unknown Album.flac <---- open this file
- Unknown Artist - Unknown Album.cue <---- this file will be used automatically
+ You can enable/configure them in "OSD Notify" plugin options.
+ The plugin requires notification daemon to be installed and enabled.

deadbeef-0.6.2.tar.bz2/icons/Makefile.in -> deadbeef-1.9.6.tar.bz2/icons/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/icons/scalable/deadbeef.svg -> deadbeef-1.9.6.tar.bz2/icons/scalable/deadbeef.svg Changed

@@ -1,418 +1,47 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="512px"
- height="512px"
- id="svg2"
- version="1.1"
- inkscape:version="0.48pre1 r9509"
- enable-background="new"
- sodipodi:docname="deadbeef3.svg"
- inkscape:export-filename="/glry/my/pic/icons/deadbeef3.png"
- inkscape:export-xdpi="720"
- inkscape:export-ydpi="720">
- <defs
- id="defs4">
- <linearGradient
- inkscape:collect="always"
- id="linearGradient3878">
- <stop
- style="stop-color:#ffffff;stop-opacity:0.5"
- offset="0"
- id="stop3880" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.251"
- offset="1"
- id="stop3882" />
- </linearGradient>
- <linearGradient
- id="linearGradient3830">
- <stop
- id="stop3832"
- offset="0"
- style="stop-color:#404040;stop-opacity:1" />
- <stop
- id="stop3834"
- offset="1"
- style="stop-color:#000000;stop-opacity:1" />
- </linearGradient>
- <linearGradient
- id="linearGradient5241">
- <stop
- style="stop-color:#606060;stop-opacity:1;"
- offset="0"
- id="stop5243" />
- <stop
- style="stop-color:#202020;stop-opacity:1;"
- offset="1"
- id="stop5245" />
- </linearGradient>
- <linearGradient
- id="linearGradient5211">
- <stop
- style="stop-color:#40406d;stop-opacity:0.73858923;"
- offset="0"
- id="stop5213" />
- <stop
- style="stop-color:#000000;stop-opacity:1"
- offset="0"
- id="stop5215" />
- </linearGradient>
- <linearGradient
- id="linearGradient5203">
- <stop
- id="stop5205"
- offset="0"
- style="stop-color:#40406d;stop-opacity:0.73858923;" />
- <stop
- id="stop5209"
- offset="0"
- style="stop-color:#000000;stop-opacity:1" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient3894">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop3896" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3898" />
- </linearGradient>
- <linearGradient
- id="linearGradient3881">
- <stop
- style="stop-color:#404040;stop-opacity:1"
- offset="0"
- id="stop3883" />
- <stop
- id="stop3892"
- offset="0.5"
- style="stop-color:#404040;stop-opacity:1" />
- <stop
- style="stop-color:#000000;stop-opacity:1"
- offset="1"
- id="stop3885" />
- </linearGradient>
- <radialGradient
- r="128"
- fy="320"
- fx="160"
- cy="320"
- cx="160"
- gradientTransform="matrix(1.5,0,0,1.5,-80,-224)"
- gradientUnits="userSpaceOnUse"
- id="radialGradient4303"
- xlink:href="#linearGradient4247"
- inkscape:collect="always" />
- <radialGradient
- r="128"
- fy="320"
- fx="160"
- cy="320"
- cx="160"
- gradientTransform="matrix(1.5,0,0,1.5,-80,-224)"
- gradientUnits="userSpaceOnUse"
- id="radialGradient4298"
- xlink:href="#linearGradient4247"
- inkscape:collect="always" />
- <radialGradient
- r="128"
- fy="320"
- fx="160"
- cy="320"
- cx="160"
- gradientTransform="matrix(-1.5,0,0,-1.5,592,736)"
- gradientUnits="userSpaceOnUse"
- id="radialGradient4257"
- xlink:href="#linearGradient4259"
- inkscape:collect="always" />
- <radialGradient
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.5,0,0,1.5,-80,-224)"
- r="128"
- fy="320"
- fx="160"
- cy="320"
- cx="160"
- id="radialGradient4253"
- xlink:href="#linearGradient4247"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3293">
- <stop
- style="stop-color:#48a821;stop-opacity:1;"
- offset="0"
- id="stop3295" />
- <stop
- id="stop3301"
- offset="0.79104477"
- style="stop-color:#48a821;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#48a821;stop-opacity:0;"
- offset="1"
- id="stop3297" />
- </linearGradient>
- <inkscape:perspective
- id="perspective2756"
- inkscape:persp3d-origin="256 : 170.66667 : 1"
- inkscape:vp_z="512 : 256 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 256 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- id="linearGradient4221">
- <stop
- id="stop4223"
- offset="0"
- style="stop-color:#ff0080;stop-opacity:1;" />
- <stop
- id="stop4225"
- offset="1"
- style="stop-color:#ff0080;stop-opacity:0;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4233">
- <stop
- style="stop-color:#ff8000;stop-opacity:1;"
- offset="0"
- id="stop4235" />
- <stop
- style="stop-color:#ff8000;stop-opacity:0;"
- offset="1"
- id="stop4237" />
- </linearGradient>
- <linearGradient
- id="linearGradient4247"
- inkscape:collect="always">
- <stop
- id="stop4249"
- offset="0"
- style="stop-color:#ff8000;stop-opacity:1;" />
- <stop
- id="stop4251"
- offset="1"
- style="stop-color:#ff8000;stop-opacity:0;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4259">
- <stop
- style="stop-color:#ff0080;stop-opacity:1;"
- offset="0"
- id="stop4261" />
- <stop
- style="stop-color:#ff0080;stop-opacity:0;"
- offset="1"
- id="stop4263" />
- </linearGradient>
- <linearGradient
- id="linearGradient3670">
- <stop
- id="stop3672"
- offset="0"
- style="stop-color:#808080;stop-opacity:1;" />
- <stop
- id="stop3674"
- offset="1"
- style="stop-color:#000000;stop-opacity:1;" />
- </linearGradient>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3881"
- id="radialGradient3887"
- cx="256"
- cy="128"
- fx="256"
- fy="128"
- r="256"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2,0,0,1.5,-256,-64)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3894"
- id="radialGradient3902"
- cx="256"
- cy="-42.666668"
- fx="256"
- fy="-42.666668"
- r="256"
- gradientTransform="matrix(1.5,0,0,1.5,-128,64)"
- gradientUnits="userSpaceOnUse" />
- <filter
- color-interpolation-filters="sRGB"
- inkscape:collect="always"
- id="filter5095-9"
- x="-0.175"
- width="1.35"
- y="-0.13124999"
- height="1.2625">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="17.5"
- id="feGaussianBlur5097-0" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter5127">
- <feBlend
- inkscape:collect="always"
- mode="screen"
- in2="BackgroundImage"
- id="feBlend5129" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter5190">
- <feBlend
- inkscape:collect="always"
- mode="multiply"
- in2="BackgroundImage"
- id="feBlend5192" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter5237">
- <feBlend
- inkscape:collect="always"
- mode="lighten"
- in2="BackgroundImage"
- id="feBlend5239" />
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="512" height="512" viewBox="0, 0, 512, 512">
+ <defs>
+ <radialGradient id="Gradient_1" gradientUnits="userSpaceOnUse" cx="256" cy="128" r="256" gradientTransform="matrix(2, 0, 0, 1.5, -256, -64)">
+ <stop offset="0" stop-color="#606060"/>
+ <stop offset="1" stop-color="#202020"/>
+ </radialGradient>
+ <linearGradient id="Gradient_2" gradientUnits="userSpaceOnUse" x1="256" y1="0" x2="256" y2="512">
+ <stop offset="0" stop-color="#FFFFFF" stop-opacity="0.5"/>
+ <stop offset="1" stop-color="#FFFFFF" stop-opacity="0.251"/>
+ </linearGradient>
+ <radialGradient id="Gradient_3" gradientUnits="userSpaceOnUse" cx="256" cy="128" r="256" gradientTransform="matrix(2, 0, 0, 1.5, -256, -64)">
+ <stop offset="0" stop-color="#404040"/>
+ <stop offset="1" stop-color="#000000"/>
+ </radialGradient>
+ <radialGradient id="Gradient_4" gradientUnits="userSpaceOnUse" cx="256" cy="-42.667" r="256" gradientTransform="matrix(1.5, 0, 0, 1.5, -128, 64)">
+ <stop offset="0" stop-color="#FFFFFF"/>
+ <stop offset="1" stop-color="#FFFFFF" stop-opacity="0"/>
+ </radialGradient>
+ <clipPath id="Clip_1">
+ <path d="M157,69 L451,69 L451,443 L157,443 z M184,96 L184,256 L274,196 L364,256 L184,376 L184,416 L424,256 L184,96 z"/>
+ </clipPath>
+ <filter id="Shadow_2">
+ <feGaussianBlur in="SourceAlpha" stdDeviation="13"/>
+ <feOffset dx="0" dy="0" result="offsetblur"/>
+ <feFlood flood-color="#ABD582"/>
+ <feComposite in2="offsetblur" operator="in"/>
 </filter>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5241"
- id="radialGradient5249"
- cx="256"
- cy="128"
- fx="256"
- fy="128"
- r="256"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2,0,0,1.5,-256,-64)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3830"
- id="radialGradient3824"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2,0,0,1.5,-256,-64)"
- cx="256"
- cy="128"
- fx="256"
- fy="128"
- r="256" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3878"
- id="linearGradient3884"
- x1="256"
- y1="0"
- x2="256"
- y2="512"
- gradientUnits="userSpaceOnUse" />
 </defs>
- <inkscape:grid
- type="xygrid"
- id="grid2985"
- empspacing="4"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true"
- spacingx="16px"
- spacingy="16px" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="0"
- inkscape:zoom="0.5"
- inkscape:cx="377.58922"
- inkscape:cy="281.73901"
- inkscape:document-units="px"
- inkscape:current-layer="layer2"
- showgrid="true"
- inkscape:window-width="1024"
- inkscape:window-height="521"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="1">
- <inkscape:grid
- type="xygrid"
- id="grid2986"
- empspacing="4"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true"
- spacingx="16px"
- spacingy="16px" />
- </sodipodi:namedview>
- <metadata
- id="metadata8">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Ebene 1"
- inkscape:groupmode="layer"
- id="layer1"
- style="filter:url(#filter5237)">
- <path
- style="fill:url(#radialGradient5249);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
- d="M 256 8 C 244 8 220.06555 18.902945 193.59375 37.53125 C 167.12195 56.159555 137.38688 81.925624 109.65625 109.65625 C 81.92562 137.38688 56.15956 167.12195 37.53125 193.59375 C 18.90294 220.06555 8 244 8 256 C 8 268 18.90294 291.93445 37.53125 318.40625 C 56.15956 344.87805 81.92562 374.61312 109.65625 402.34375 C 137.38688 430.07438 167.12195 455.84044 193.59375 474.46875 C 220.06555 493.09706 244 504 256 504 C 268 504 291.93445 493.09706 318.40625 474.46875 C 344.87805 455.84044 374.61312 430.07438 402.34375 402.34375 C 430.0744 374.61312 455.84035 344.87805 474.46875 318.40625 C 493.09705 291.93445 504 268 504 256 C 504 244 493.09705 220.06555 474.46875 193.59375 C 455.84035 167.12195 430.0744 137.38688 402.34375 109.65625 C 374.61312 81.925624 344.87805 56.159555 318.40625 37.53125 C 291.93445 18.902945 268 8 256 8 z "
- id="path2988" />
- <path
- style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3884);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:46;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;opacity:0.98"
- d="m 256,8 c -12,0 -35.93445,10.902945 -62.40625,29.53125 -26.4718,18.628305 -56.20687,44.394374 -83.9375,72.125 -27.73063,27.73063 -53.49669,57.4657 -72.125,83.9375 C 18.90294,220.06555 8,244 8,256 c 0,12 10.90294,35.93445 29.53125,62.40625 18.62831,26.4718 44.39437,56.20687 72.125,83.9375 27.73063,27.73063 57.4657,53.49669 83.9375,72.125 C 220.06555,493.09706 244,504 256,504 c 12,0 35.93445,-10.90294 62.40625,-29.53125 26.4718,-18.62831 56.20687,-44.39437 83.9375,-72.125 27.73055,-27.73063 53.49665,-57.4657 72.12505,-83.9375 C 493.0971,291.93445 504,268 504,256 c 0,-12 -10.9029,-35.93445 -29.5312,-62.40625 -18.6283,-26.4718 -44.3945,-56.20687 -72.12505,-83.9375 -27.73063,-27.730626 -57.4657,-53.496695 -83.9375,-72.125 C 291.93445,18.902945 268,8 256,8 z m 0,15 c 4.5,0 28.26857,8.881123 53.75,26.8125 25.48143,17.931377 54.77445,43.21195 82,70.4375 27.22555,27.22555 52.5061,56.51857 70.4375,82 C 480.1189,227.73143 489,251.5 489,256 c 0,4.5 -8.8811,28.26857 -26.8125,53.75 -17.9314,25.48143 -43.21195,54.77445 -70.4375,82 -27.22555,27.22555 -56.51857,52.50612 -82,70.4375 C 284.26857,480.11888 260.5,489 256,489 c -4.5,0 -28.26857,-8.88112 -53.75,-26.8125 -25.48143,-17.93138 -54.77445,-43.21195 -82,-70.4375 C 93.02445,364.52445 67.74388,335.23143 49.8125,309.75 31.88112,284.26857 23,260.5 23,256 c 0,-4.5 8.88112,-28.26857 26.8125,-53.75 17.93138,-25.48143 43.21195,-54.77445 70.4375,-82 27.22555,-27.22555 56.51857,-52.506123 82,-70.4375 C 227.73143,31.881123 251.5,23 256,23 z"
- id="path3826"
- inkscape:connector-curvature="0" />
- <path
- style="fill:url(#radialGradient3824);fill-opacity:1.0;stroke:none"
- d="M 256,0 C 192,0 0,192 0,256 0,320 192,512 256,512 320,512 512,320 512,256 512,192 320,0 256,0 z m 0,16 c 8,0 31.83765,9.83714 57.78125,28.09375 25.9436,18.25661 55.445,43.757498 82.90625,71.21875 27.4613,27.46125 52.9622,56.96265 71.2187,82.90625 C 486.163,224.16235 496,248 496,256 c 0,8 -9.837,31.83765 -28.0938,57.78125 -18.2565,25.9436 -43.7574,55.445 -71.2187,82.90625 -27.46125,27.46125 -56.96265,52.96214 -82.90625,71.21875 C 287.83765,486.16286 264,496 256,496 c -8,0 -31.83765,-9.83714 -57.78125,-28.09375 -25.9436,-18.25661 -55.445,-43.7575 -82.90625,-71.21875 C 87.85125,369.22625 62.35036,339.72485 44.09375,313.78125 25.83714,287.83765 16,264 16,256 c 0,-8 9.83714,-31.83765 28.09375,-57.78125 18.25661,-25.9436 43.7575,-55.445 71.21875,-82.90625 C 142.77375,87.851248 172.27515,62.35036 198.21875,44.09375 224.16235,25.83714 248,16 256,16 z"
- id="path3043"
- inkscape:connector-curvature="0" />
- <path
- style="fill:url(#radialGradient3902);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:0.25000000000000000;fill-opacity:1"
- d="M 256 0 C 192 0 -8.5543551e-17 192 0 256 C 64 256 128 128 256 128 C 384 128 448 256 512 256 C 512 192 320 -8.5543551e-17 256 0 z "
- id="path3875" />
+ <g id="Ebene_1">
+ <path d="M256,8 C244,8 220.066,18.903 193.594,37.531 C167.122,56.16 137.387,81.926 109.656,109.656 C81.926,137.387 56.16,167.122 37.531,193.594 C18.903,220.066 8,244 8,256 C8,268 18.903,291.934 37.531,318.406 C56.16,344.878 81.926,374.613 109.656,402.344 C137.387,430.074 167.122,455.84 193.594,474.469 C220.066,493.097 244,504 256,504 C268,504 291.934,493.097 318.406,474.469 C344.878,455.84 374.613,430.074 402.344,402.344 C430.074,374.613 455.84,344.878 474.469,318.406 C493.097,291.934 504,268 504,256 C504,244 493.097,220.066 474.469,193.594 C455.84,167.122 430.074,137.387 402.344,109.656 C374.613,81.926 344.878,56.16 318.406,37.531 C291.934,18.903 268,8 256,8 z" fill="url(#Gradient_1)" id="path2988"/>
+ <path d="M256,8 C244,8 220.066,18.903 193.594,37.531 C167.122,56.16 137.387,81.926 109.656,109.656 C81.926,137.387 56.16,167.122 37.531,193.594 C18.903,220.066 8,244 8,256 C8,268 18.903,291.934 37.531,318.406 C56.16,344.878 81.926,374.613 109.656,402.344 C137.387,430.074 167.122,455.84 193.594,474.469 C220.066,493.097 244,504 256,504 C268,504 291.934,493.097 318.406,474.469 C344.878,455.84 374.613,430.074 402.344,402.344 C430.074,374.613 455.84,344.878 474.469,318.406 C493.097,291.934 504,268 504,256 C504,244 493.097,220.066 474.469,193.594 C455.841,167.122 430.074,137.387 402.344,109.656 C374.613,81.926 344.878,56.16 318.406,37.531 C291.934,18.903 268,8 256,8 z M256,23 C260.5,23 284.269,31.881 309.75,49.812 C335.231,67.744 364.524,93.024 391.75,120.25 C418.976,147.476 444.256,176.769 462.188,202.25 C480.119,227.731 489,251.5 489,256 C489,260.5 480.119,284.269 462.188,309.75 C444.256,335.231 418.976,364.524 391.75,391.75 C364.524,418.976 335.231,444.256 309.75,462.188 C284.269,480.119 260.5,489 256,489 C251.5,489 227.731,480.119 202.25,462.188 C176.769,444.256 147.476,418.976 120.25,391.75 C93.024,364.524 67.744,335.231 49.812,309.75 C31.881,284.269 23,260.5 23,256 C23,251.5 31.881,227.731 49.812,202.25 C67.744,176.769 93.024,147.476 120.25,120.25 C147.476,93.024 176.769,67.744 202.25,49.812 C227.731,31.881 251.5,23 256,23 z" fill="url(#Gradient_2)" id="path3826" opacity="0.98"/>
+ <path d="M256,0 C192,0 0,192 0,256 C0,320 192,512 256,512 C320,512 512,320 512,256 C512,192 320,0 256,0 z M256,16 C264,16 287.838,25.837 313.781,44.094 C339.725,62.35 369.226,87.851 396.688,115.312 C424.149,142.774 449.65,172.275 467.906,198.219 C486.163,224.162 496,248 496,256 C496,264 486.163,287.838 467.906,313.781 C449.65,339.725 424.149,369.226 396.688,396.688 C369.226,424.149 339.725,449.65 313.781,467.906 C287.838,486.163 264,496 256,496 C248,496 224.162,486.163 198.219,467.906 C172.275,449.65 142.774,424.149 115.312,396.688 C87.851,369.226 62.35,339.725 44.094,313.781 C25.837,287.838 16,264 16,256 C16,248 25.837,224.162 44.094,198.219 C62.35,172.275 87.851,142.774 115.312,115.312 C142.774,87.851 172.275,62.35 198.219,44.094 C224.162,25.837 248,16 256,16 z" fill="url(#Gradient_3)" id="path3043"/>
+ <path d="M256,0 C192,0 0,192 0,256 C64,256 128,128 256,128 C384,128 448,256 512,256 C512,192 320,0 256,0 z" fill="url(#Gradient_4)" id="path3875" opacity="0.25"/>
 </g>
- <g
- inkscape:groupmode="layer"
- id="layer2"
- inkscape:label="add"
- style="filter:url(#filter5127)">
- <path
- id="path5093"
- d="m 184,96 0,40 0,120 90,-60 90,60 -180,120 0,40 L 424,256 304,176 184,96 z"
- style="fill:#80ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5095-9)"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- style="fill:#80c040;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter3929);stroke-opacity:1"
- d="m 184,96 0,40 0,120 90,-60 90,60 -180,120 0,40 L 424,256 304,176 184,96 z"
- id="path3906" />
+ <g id="add">
+ <g>
+ <path d="M184,96 L184,136 L184,256 L274,196 L364,256 L184,376 L184,416 L424,256 L304,176 L184,96 z" fill="#ABD582"/>
+ <g>
+ <path d="M184,96 L424,256 L184,416 L184,376 L364,256 L274,196 L184,256 L184,96 z" fill="rgba(0,0,0,1)" clip-path="url(#Clip_1)" filter="url(#Shadow_2)"/>
+ <path d="M180.394,101.408 L420.394,261.408 L420.394,250.592 L180.394,410.592 L190.5,416 L190.5,376 L187.606,381.408 L367.606,261.408 C371.465,258.835 371.465,253.165 367.606,250.592 L277.606,190.592 C275.422,189.136 272.578,189.136 270.394,190.592 L180.394,250.592 L190.5,256 L190.5,96 L180.394,101.408 z M187.606,90.592 C183.286,87.712 177.5,90.808 177.5,96 L177.5,256 C177.5,261.192 183.286,264.288 187.606,261.408 L277.606,201.408 L270.394,201.408 L360.394,261.408 L360.394,250.592 L180.394,370.592 C178.586,371.797 177.5,373.827 177.5,376 L177.5,416 C177.5,421.192 183.286,424.288 187.606,421.408 L427.606,261.408 C431.465,258.835 431.465,253.165 427.606,250.592 L187.606,90.592 z" fill="rgba(0,0,0,1)" clip-path="url(#Clip_1)" filter="url(#Shadow_2)"/>
+ </g>
+ </g>
+ <g/>
 </g>
- <g
- inkscape:groupmode="layer"
- id="layer3"
- inkscape:label="sub"
- style="filter:url(#filter5190)" />
 </svg>

deadbeef-1.9.6.tar.bz2/include Added

deadbeef-1.9.6.tar.bz2/include/deadbeef Added

deadbeef-1.9.6.tar.bz2/include/deadbeef/common.h Added

@@ -0,0 +1,95 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ utility routines and global variables
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __COMMON_H
+#define __COMMON_H
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <limits.h>
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define max(x,y) ((x)>(y)?(x):(y))
+
+// specific directories
+#ifdef __MINGW32__
+#define HOMEDIR "USERPROFILE"
+#define LOCALDIR "XDG_LOCAL_HOME"
+#define CONFIGDIR "APPDATA"
+#define CACHEDIR "LOCALAPPDATA"
+#define RUNTIMEDIR "NORUNTIMEDIR"
+// used in plugins.c (%s is home directory, %d is arch bit number)
+#define LOCAL_PLUGINS_DIR "%s/AppData/Roaming/deadbeef/plugins"
+#define LOCAL_ARCH_PLUGINS_DIR "%s/AppData/Roaming/deadbeef/plugins%d"
+#else
+#define HOMEDIR "HOME"
+#define LOCALDIR "XDG_LOCAL_HOME"
+#define CONFIGDIR "XDG_CONFIG_HOME"
+#define CACHEDIR "XDG_CACHE_HOME"
+#define RUNTIMEDIR "XDG_RUNTIME_DIR"
+// used in plugins.c (%s is home directory, %d is arch bit number)
+#define LOCAL_PLUGINS_DIR "%s/.local/lib/deadbeef"
+#define LOCAL_ARCH_PLUGINS_DIR "%s/.local/lib%d/deadbeef"
+#endif
+
+// those are defined in main.c
+extern char confdirPATH_MAX; // $HOME/.config
+extern char dbconfdirPATH_MAX; // $HOME/.config/deadbeef
+extern char dbinstalldirPATH_MAX; // see deadbeef->get_prefix
+extern char dbdocdirPATH_MAX; // see deadbeef->get_doc_dir
+extern char dbplugindirPATH_MAX; // see deadbeef->get_plugin_dir
+extern char dbpixmapdirPATH_MAX; // see deadbeef->get_pixmap_dir
+extern char dbcachedirPATH_MAX;
+extern char dbresourcedirPATH_MAX;
+
+// parses a list of paths and adds them to playlist
+// 0 - no error, files loaded
+// 1 - no error, but files not loaded
+int
+add_paths(const char *paths, int len, int queue, char *sendback, int sbsize);
+
+// This is a fake plugin, representing the deadbeef core module.
+// The intention is that it's only used in combination with logger,
+// which is based on the plugin interface.
+extern DB_plugin_t main_plugin;
+
+// In the core, we want the "trace" to be low priority messages,
+// and "trace_err" is for criticals, needing extra attention
+extern DB_functions_t *deadbeef;
+#define trace(...) { deadbeef->log_detailed (&main_plugin, DDB_LOG_LAYER_INFO, __VA_ARGS__); }
+#define trace_err(...) { deadbeef->log_detailed (&main_plugin, DDB_LOG_LAYER_DEFAULT, __VA_ARGS__); }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __COMMON_H

deadbeef-1.9.6.tar.bz2/include/deadbeef/deadbeef.h Added

@@ -0,0 +1,2399 @@
+/*
+ deadbeef.h -- plugin API of the DeaDBeeF audio player
+ http://deadbeef.sourceforge.net
+
+ Copyright (C) 2009-2022 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+#ifndef __DEADBEEF_H
+#define __DEADBEEF_H
+
+#include <stdint.h>
+#include <time.h>
+#include <stdio.h>
+#include <dirent.h>
+#include <stdarg.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// every plugin must define the following entry-point:
+// extern "C" DB_plugin_t* $MODULENAME_load (DB_functions_t *api);
+// where $MODULENAME is a name of module
+// e.g. if your plugin is called "myplugin.so", $MODULENAME is "myplugin"
+// this function should return pointer to DB_plugin_t structure
+// that is enough for both static and dynamic modules
+
+// backwards compatibility is supported since API version 1.0
+// that means that the plugins which use the API 1.0 will work without recompiling until API 2.0.
+//
+// increments in the major version number mean that there are API breaks, and
+// plugins must be recompiled to be compatible.
+//
+// add DDB_REQUIRE_API_VERSION(x,y) macro when you define the plugin structure
+// like this:
+// static DB_decoder_t plugin = {
+// DDB_REQUIRE_API_VERSION(1,0)
+// ............
+// }
+// this is required for versioning
+// if you don't do it -- no version checking will be done (useful for debugging/development)
+//
+// please DON'T release plugins without version requirement
+//
+// to ensure compatibility, use the following before including deadbeef.h:
+// #define DDB_API_LEVEL x
+// where x is the minor API version number.
+// that way, you'll get errors or warnings when using incompatible stuff.
+//
+// if you also want to get the deprecation warnings, use the following:
+// #define DDB_WARN_DEPRECATED 1
+//
+// NOTE: deprecation doesn't mean the API is going to be removed, it just means
+// that there's a better replacement in the newer deadbeef versions.
+
+// API version history:
+// 1.17 -- deadbeef-1.9.6
+// 1.16 -- deadbeef-1.9.4
+// 1.15 -- deadbeef-1.9.0
+// 1.14 -- deadbeef-1.8.8
+// 1.12 -- deadbeef-1.8.4
+// 1.11 -- deadbeef-1.8.3
+// 1.10 -- deadbeef-1.8.0
+// 1.9 -- deadbeef-0.7.2
+// 1.8 -- deadbeef-0.7.0
+// 1.7 -- deadbeef-0.6.2
+// 1.6 -- deadbeef-0.6.1
+// 1.5 -- deadbeef-0.6
+// 1.4 -- deadbeef-0.5.5
+// 1.3 -- deadbeef-0.5.3
+// 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
+// 0.10 -- deadbeef-0.4.4-portable-r1 (note: 0.4.4 uses api v0.9)
+// 0.9 -- deadbeef-0.4.3-portable-build3
+// 0.8 -- deadbeef-0.4.2
+// 0.7 -- deabdeef-0.4.0
+// 0.6 -- deadbeef-0.3.3
+// 0.5 -- deadbeef-0.3.2
+// 0.4 -- deadbeef-0.3.0
+// 0.3 -- deadbeef-0.2.3.2
+// 0.2 -- deadbeef-0.2.3
+// 0.1 -- deadbeef-0.2.0
+
+#define DB_API_VERSION_MAJOR 1
+#define DB_API_VERSION_MINOR 17
+
+#if defined(__clang__)
+
+# define DDB_DEPRECATED(x) __attribute__ ((deprecated(x)))
+
+#elif defined(__GNUC__)
+
+ #if !defined(__GNUC_PREREQ)
+ // avoid including glibc headers, this is not very portable
+ #if defined __GNUC_MINOR__
+ # define __GNUC_PREREQ(maj, min) \
+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+ #else
+ # define __GNUC_PREREQ(maj, min) 0
+ #endif
+
+ #endif
+
+ // Deprecating of enum values requires GCC 6+.
+ // Older GCC can still be used to build.
+ #if __GNUC_PREREQ(6,0)
+ # define DDB_DEPRECATED(x) __attribute__ ((deprecated(x)))
+ #else
+ # define DDB_DEPRECATED(x)
+ #endif
+
+#else
+
+ #define DDB_DEPRECATED(x)
+
+#endif
+
+#ifndef DDB_API_LEVEL
+#define DDB_API_LEVEL DB_API_VERSION_MINOR
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 17)
+#define DEPRECATED_117 DDB_DEPRECATED("since deadbeef API 1.17")
+#else
+#define DEPRECATED_117
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 16)
+#define DEPRECATED_116 DDB_DEPRECATED("since deadbeef API 1.16")
+#else
+#define DEPRECATED_116
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 15)
+#define DEPRECATED_115 DDB_DEPRECATED("since deadbeef API 1.15")
+#else
+#define DEPRECATED_115
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 14)
+#define DEPRECATED_114 DDB_DEPRECATED("since deadbeef API 1.14")
+#else
+#define DEPRECATED_114
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 13)
+#define DEPRECATED_113 DDB_DEPRECATED("since deadbeef API 1.13")
+#else
+#define DEPRECATED_113
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 12)
+#define DEPRECATED_112 DDB_DEPRECATED("since deadbeef API 1.12")
+#else
+#define DEPRECATED_112
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 11)
+#define DEPRECATED_111 DDB_DEPRECATED("since deadbeef API 1.11")
+#else
+#define DEPRECATED_111
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 10)
+#define DEPRECATED_110 DDB_DEPRECATED("since deadbeef API 1.10")
+#else
+#define DEPRECATED_110
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 9)
+#define DEPRECATED_19 DDB_DEPRECATED("since deadbeef API 1.9")
+#else
+#define DEPRECATED_19
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 8)
+#define DEPRECATED_18 DDB_DEPRECATED("since deadbeef API 1.8")
+#else
+#define DEPRECATED_18
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 7)
+#define DEPRECATED_17 DDB_DEPRECATED("since deadbeef API 1.7")
+#else
+#define DEPRECATED_17
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 6)
+#define DEPRECATED_16 DDB_DEPRECATED("since deadbeef API 1.6")
+#else
+#define DEPRECATED_16
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 5)
+#define DEPRECATED_15 DDB_DEPRECATED("since deadbeef API 1.5")
+#else
+#define DEPRECATED_15
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 4)
+#define DEPRECATED_14 DDB_DEPRECATED("since deadbeef API 1.4")
+#else
+#define DEPRECATED_14
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 3)
+#define DEPRECATED_13 DDB_DEPRECATED("since deadbeef API 1.3")
+#else
+#define DEPRECATED_13
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 2)
+#define DEPRECATED_12 DDB_DEPRECATED("since deadbeef API 1.2")
+#else
+#define DEPRECATED_12
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 1)
+#define DEPRECATED_11 DDB_DEPRECATED("since deadbeef API 1.1")
+#else
+#define DEPRECATED_11
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_API_LEVEL >= 0)
+#define DEPRECATED DDB_DEPRECATED("since deadbeef API 1.0")
+#else
+#define DEPRECATED
+#endif
+
+#define DDB_PLUGIN_SET_API_VERSION\
+ .plugin.api_vmajor = DB_API_VERSION_MAJOR,\
+ .plugin.api_vminor = DB_API_VERSION_MINOR,
+
+// backwards compat macro
+#define DB_PLUGIN_SET_API_VERSION DDB_PLUGIN_SET_API_VERSION
+
+#define PLUG_TEST_COMPAT(plug,x,y) ((plug)->version_major == (x) && (plug)->version_minor >= (y))
+
+#define DDB_REQUIRE_API_VERSION(x,y)\
+ .plugin.api_vmajor = x,\
+ .plugin.api_vminor = y,
+
+////////////////////////////
+// default values for some common config variables should go here
+
+// network.ctmapping : content-type to plugin mapping
+#define DDB_DEFAULT_CTMAPPING "audio/mpeg {stdmpg ffmpeg} audio/x-mpeg {stdmpg ffmpeg} application/ogg {stdogg opus ffmpeg} audio/ogg {stdogg opus ffmpeg} audio/aac {aac ffmpeg} audio/aacp {aac ffmpeg} audio/x-m4a {aac ffmpeg} audio/wma {wma ffmpeg}"
+
+////////////////////////////
+// playlist structures
+
+// that's a good candidate for redesign
+// short explanation: PL_MAIN and PL_SEARCH are used as "iter" argument in
+// playlist functions, to reference main or search playlist, respectively
+#define PL_MAIN 0
+#define PL_SEARCH 1
+
+enum {
+ DDB_IS_SUBTRACK = (1<<0), // file is not single-track, might have metainfo in external file
+ DDB_IS_READONLY = (1<<1), // check this flag to block tag writing (e.g. in iso.wv)
+ DDB_HAS_EMBEDDED_CUESHEET = (1<<2),
+
+ DDB_TAG_ID3V1 = (1<<8),
+ DDB_TAG_ID3V22 = (1<<9),
+ DDB_TAG_ID3V23 = (1<<10),
+ DDB_TAG_ID3V24 = (1<<11),
+ DDB_TAG_APEV2 = (1<<12),
+ DDB_TAG_VORBISCOMMENTS = (1<<13),
+ DDB_TAG_CUESHEET = (1<<14),
+ DDB_TAG_ICY = (1<<15),
+ DDB_TAG_ITUNES = (1<<16),
+
+ DDB_TAG_MASK = 0x000fff00
+};
+
+// playlist item
+// these are "public" fields, available to plugins
+typedef struct DB_playItem_s {
+ // NOTE: the startsample and endsample fields are 32 bit, and are kept for
+ // compatibility. Please use pl_item_get_startsample and friends instead.
+ int32_t startsample DEPRECATED_110;
+ int32_t endsample DEPRECATED_110;
+ int32_t shufflerating; // sort order for shuffle mode
+} ddb_playItem_t;
+
+typedef ddb_playItem_t DB_playItem_t;
+
+typedef struct {
+ char unused; // to shut up C++ warning
+} ddb_playlist_t;
+
+typedef struct DB_metaInfo_s {
+ struct DB_metaInfo_s *next;
+ const char *key;
+ const char *value;
+
+#if (DDB_API_LEVEL >= 10)
+ int valuesize;
+#endif
+} DB_metaInfo_t;
+
+/// These flags should be used with `junk_rewrite_tags`
+#define JUNK_STRIP_ID3V2 1
+#define JUNK_STRIP_APEV2 2
+#define JUNK_STRIP_ID3V1 4
+#define JUNK_WRITE_ID3V2 8
+#define JUNK_WRITE_APEV2 16
+#define JUNK_WRITE_ID3V1 32
+
+typedef struct DB_id3v2_frame_s {
+ struct DB_id3v2_frame_s *next;
+ char id5;
+ uint32_t size;
+ uint8_t flags2;
+ uint8_t data0;
+} DB_id3v2_frame_t;
+
+typedef struct DB_id3v2_tag_s {
+ uint8_t version2;
+ uint8_t flags;
+ DB_id3v2_frame_t *frames;
+} DB_id3v2_tag_t;
+
+typedef struct DB_apev2_frame_s {
+ struct DB_apev2_frame_s *next;
+ uint32_t flags;
+ char key256;
+ uint32_t size; // size of data
+ uint8_t data0;
+} DB_apev2_frame_t;
+
+typedef struct DB_apev2_tag_s {
+ uint32_t version;
+ uint32_t flags;
+ DB_apev2_frame_t *frames;
+} DB_apev2_tag_t;
+
+// plugin types
+enum {
+ DB_PLUGIN_DECODER = 1,
+ DB_PLUGIN_OUTPUT = 2,
+ DB_PLUGIN_DSP = 3,
+ DB_PLUGIN_MISC = 4,
+ DB_PLUGIN_VFS = 5,
+ DB_PLUGIN_PLAYLIST = 6,
+ DB_PLUGIN_GUI = 7,
+#if (DDB_API_LEVEL >= 15)
+ DB_PLUGIN_MEDIASOURCE = 8,
+#endif
+};
+
+// output plugin states
+enum output_state_t {
+ OUTPUT_STATE_STOPPED DEPRECATED_111 = 0,
+ OUTPUT_STATE_PLAYING DEPRECATED_111 = 1,
+ OUTPUT_STATE_PAUSED DEPRECATED_111 = 2,
+};
+
+#if (DDB_API_LEVEL >= 11)
+
+typedef enum ddb_playback_state_e {
+ DDB_PLAYBACK_STATE_STOPPED = 0,
+ DDB_PLAYBACK_STATE_PLAYING = 1,
+ DDB_PLAYBACK_STATE_PAUSED = 2,
+} ddb_playback_state_t;
+
+#endif
+
+// playback order
+enum playback_order_t {
+ PLAYBACK_ORDER_LINEAR DEPRECATED_111 = 0,
+ PLAYBACK_ORDER_SHUFFLE_TRACKS DEPRECATED_111 = 1,
+ PLAYBACK_ORDER_RANDOM DEPRECATED_111 = 2,
+ PLAYBACK_ORDER_SHUFFLE_ALBUMS DEPRECATED_111 = 3,
+};
+
+// playback modes
+enum playback_mode_t {
+ PLAYBACK_MODE_LOOP_ALL DEPRECATED_111 = 0, // loop playlist
+ PLAYBACK_MODE_NOLOOP DEPRECATED_111 = 1, // don't loop
+ PLAYBACK_MODE_LOOP_SINGLE DEPRECATED_111 = 2, // loop single track
+};
+
+#if (DDB_API_LEVEL >= 11)
+
+typedef enum ddb_shuffle_e {
+ DDB_SHUFFLE_OFF = 0,
+ DDB_SHUFFLE_TRACKS = 1,
+ DDB_SHUFFLE_RANDOM = 2,
+ DDB_SHUFFLE_ALBUMS = 3,
+} ddb_shuffle_t;
+
+typedef enum ddb_repeat_e {
+ DDB_REPEAT_ALL = 0,
+ DDB_REPEAT_OFF = 1,
+ DDB_REPEAT_SINGLE = 2,
+} ddb_repeat_t;
+
+#endif
+
+#if (DDB_API_LEVEL >= 8)
+// playlist change info, used in the DB_EV_PLAYLISTCHANGED p1 argument
+// NOTE: these events can only be sent individually, and can't be ORed.
+enum ddb_playlist_change_t {
+ DDB_PLAYLIST_CHANGE_CONTENT, // this is the most generic one, will work for the cases when p1 was omitted (0)
+ DDB_PLAYLIST_CHANGE_CREATED,
+ DDB_PLAYLIST_CHANGE_DELETED,
+ DDB_PLAYLIST_CHANGE_POSITION,
+ DDB_PLAYLIST_CHANGE_TITLE,
+ // When handling DDB_PLAYLIST_CHANGE_SELECTION,
+ // `ctx` is assumed to be a unique ID of the event sender,
+ // for example a UI view pointer which caused the selection change,
+ // but it should not be expected to point to a specific type.
+ // This is used to filter the events when they hit the same
+ // view which sent them.
+ DDB_PLAYLIST_CHANGE_SELECTION,
+ DDB_PLAYLIST_CHANGE_SEARCHRESULT,
+ DDB_PLAYLIST_CHANGE_PLAYQUEUE,
+};
+#endif
+
+typedef struct {
+ int event;
+ int size;
+} ddb_event_t;
+
+typedef struct {
+ ddb_event_t ev;
+ DB_playItem_t *track;
+ float playtime; // for SONGFINISHED event -- for how many seconds track was playing
+ time_t started_timestamp; // time when "track" started playing
+} ddb_event_track_t;
+
+typedef struct {
+ ddb_event_t ev;
+ DB_playItem_t *from;
+ DB_playItem_t *to;
+ float playtime; // for SONGCHANGED event -- for how many seconds prev track was playing
+ time_t started_timestamp; // time when "from" started playing
+} ddb_event_trackchange_t;
+
+typedef struct {
+ ddb_event_t ev;
+ int state;
+} ddb_event_state_t;
+
+typedef struct {
+ ddb_event_t ev;
+ DB_playItem_t *track;
+ float playpos;
+} ddb_event_playpos_t;
+
+typedef struct DB_conf_item_s {
+ char *key;
+ char *value;
+ struct DB_conf_item_s *next;
+} DB_conf_item_t;
+
+// events
+enum {
+ DB_EV_NEXT = 1, // switch to next track
+ DB_EV_PREV = 2, // switch to prev track
+ DB_EV_PLAY_CURRENT = 3, // play current track (will start/unpause if stopped or paused)
+ DB_EV_PLAY_NUM = 4, // play track nr. p1
+ DB_EV_STOP = 5, // stop current track
+ DB_EV_PAUSE = 6, // pause playback
+ DB_EV_PLAY_RANDOM = 7, // play random track
+ DB_EV_TERMINATE = 8, // must be sent to player thread to terminate
+ DB_EV_PLAYLIST_REFRESH DEPRECATED_18 = 9, // use DB_EV_PLAYLISTCHANGED instead
+ DB_EV_REINIT_SOUND = 10, // reinitialize sound output with current output_plugin config value
+ DB_EV_CONFIGCHANGED = 11, // one or more config options were changed
+ DB_EV_TOGGLE_PAUSE = 12,
+ DB_EV_ACTIVATED = 13, // will be fired every time player is activated
+ DB_EV_PAUSED = 14, // player was paused (p1=1) or unpaused (p1=0)
+
+ DB_EV_PLAYLISTCHANGED = 15, // playlist contents were changed (e.g. metadata in any track)
+ // DB_EV_PLAYLISTCHANGED NOTE: it's usually sent on LARGE changes,
+ // when multiple tracks are affected, while for single tracks
+ // the DB_EV_TRACKINFOCHANGED is preferred
+ // added in API level 8:
+ // p1 is one of ddb_playlist_change_t enum values, detailing what exactly has been changed.
+
+ DB_EV_VOLUMECHANGED = 16, // volume was changed
+ DB_EV_OUTPUTCHANGED = 17, // sound output plugin changed
+ DB_EV_PLAYLISTSWITCHED = 18, // playlist switch occurred
+ DB_EV_SEEK = 19, // seek current track to position p1 (ms)
+ DB_EV_ACTIONSCHANGED = 20, // plugin actions were changed, e.g. for reinitializing gui
+ DB_EV_DSPCHAINCHANGED = 21, // emitted when any parameter of the main dsp chain has been changed
+
+ // since 1.5
+#if (DDB_API_LEVEL >= 5)
+ // DB_EV_SELCHANGED is obsolete and isn't emitted; DB_EV_PLAYLISTCHANGED with DDB_PLAYLIST_CHANGE_SELECTION should be used instead.
+ DB_EV_SELCHANGED = 22,
+ DB_EV_PLUGINSLOADED = 23, // after all plugins have been loaded and connected
+#endif
+
+#if (DDB_API_LEVEL >= 8)
+ // A caller sends this event, to ask playlist viewer(s) to focus on selected track.
+ DB_EV_FOCUS_SELECTION = 24, 
+#endif
+
+#if (DDB_API_LEVEL >= 17)
+ // Notify about playback state change,
+ // which includes a switch to another output plugin.
+ // p1 contains the new state.
+ DB_EV_PLAYBACK_STATE_DID_CHANGE = 25,
+#endif
+
+ // -----------------
+ // structured events
+
+ DB_EV_FIRST = 1000, // this is not an event id by itself, but used for checking which events are structured (>=DB_EV_FIRST)
+
+ DB_EV_SONGCHANGED = 1000, // current song changed from one to another, ctx=ddb_event_trackchange_t
+ DB_EV_SONGSTARTED = 1001, // song started playing, ctx=ddb_event_track_t
+ DB_EV_SONGFINISHED = 1002, // song finished playing, ctx=ddb_event_track_t
+
+ DB_EV_TRACKINFOCHANGED = 1004, // trackinfo was changed (included medatata, playback status, playqueue state, etc), ctx=ddb_event_track_t
+ // DB_EV_TRACKINFOCHANGED NOTE: when multiple tracks change, DB_EV_PLAYLISTCHANGED may be sent instead,
+ // for speed reasons, so always handle both events.
+
+ DB_EV_SEEKED = 1005, // seek happened, ctx=ddb_event_playpos_t
+
+ // since 1.5
+#if (DDB_API_LEVEL >= 5)
+ // NOTE: this is not a structured event, but too late to fix, needs to stay here for backwards compat
+ DB_EV_TRACKFOCUSCURRENT = 1006, // user wants to highlight/find the current playing track
+#endif
+
+#if (DDB_API_LEVEL >= 10)
+ DB_EV_CURSOR_MOVED = 1007, // used for syncing cursor position between playlist views, p1 = PL_MAIN or PL_SEARCH, ctx is a ddb_event_track_t, containing the new track under cursor
+#endif
+
+ DB_EV_MAX
+};
+
+// preset columns, working using IDs
+// DON'T add new ids in range 2-7, they are reserved for backwards compatibility
+enum pl_column_t {
+#if (DDB_API_LEVEL >= 10)
+ DB_COLUMN_STANDARD = -1,
+#endif
+ DB_COLUMN_FILENUMBER = 0,
+ DB_COLUMN_PLAYING = 1,
+ DB_COLUMN_ALBUM_ART = 8,
+#if (DDB_API_LEVEL >= 10)
+ DB_COLUMN_CUSTOM = 9
+#endif
+};
+
+// replaygain constants
+enum {
+ DDB_REPLAYGAIN_ALBUMGAIN,
+ DDB_REPLAYGAIN_ALBUMPEAK,
+ DDB_REPLAYGAIN_TRACKGAIN,
+ DDB_REPLAYGAIN_TRACKPEAK,
+};
+
+#if (DDB_API_LEVEL >= 10)
+#if (DDB_API_LEVEL >= 11)
+typedef enum ddb_rg_source_mode_e {
+#else
+enum {
+#endif
+
+ DDB_RG_SOURCE_MODE_PLAYBACK_ORDER = 0,
+ DDB_RG_SOURCE_MODE_TRACK = 1,
+ DDB_RG_SOURCE_MODE_ALBUM = 2,
+
+#if (DDB_API_LEVEL >= 11)
+} ddb_rg_source_mode_t;
+#else
+};
+#endif
+
+#if (DDB_API_LEVEL >= 11)
+typedef enum ddb_rg_processing_e {
+#else
+ enum {
+#endif
+
+ DDB_RG_PROCESSING_NONE = 0,
+ DDB_RG_PROCESSING_GAIN = 1,
+ DDB_RG_PROCESSING_PREVENT_CLIPPING = 2,
+
+#if (DDB_API_LEVEL >= 11)
+} ddb_rg_processing_t;
+#else
+};
+#endif
+
+typedef struct {
+ int _size;
+ int source_mode;
+ uint32_t processing_flags;
+ float preamp_with_rg;
+ float preamp_without_rg;
+ int has_album_gain;
+ int has_track_gain;
+ float albumgain;
+ float albumpeak;
+ float trackgain;
+ float trackpeak;
+} ddb_replaygain_settings_t;
+#endif
+
+// sort order constants
+enum ddb_sort_order_t {
+ DDB_SORT_DESCENDING,
+ DDB_SORT_ASCENDING,
+// since 1.3
+#if (DDB_API_LEVEL >= 3)
+ DDB_SORT_RANDOM,
+#endif
+};
+
+enum ddb_sys_directory_t {
+ DDB_SYS_DIR_CONFIG = 1,
+ DDB_SYS_DIR_PREFIX = 2,
+ DDB_SYS_DIR_DOC = 3,
+ DDB_SYS_DIR_PLUGIN = 4,
+ DDB_SYS_DIR_PIXMAP = 5,
+ DDB_SYS_DIR_CACHE = 6,
+#if (DDB_API_LEVEL >= 13)
+ DDB_SYS_DIR_PLUGIN_RESOURCES = 7,
+#endif
+};
+
+// typecasting macros
+#define DB_PLUGIN(x) ((DB_plugin_t *)(x))
+#define DB_EVENT(x) ((ddb_event_t *)(x))
+#define DB_PLAYITEM(x) ((DB_playItem_t *)(x))
+
+// FILE object wrapper for vfs access
+typedef struct {
+ struct DB_vfs_s *vfs;
+} DB_FILE;
+
+// md5 calc control structure (see md5/md5.h)
+typedef struct DB_md5_s {
+ char data88;
+} DB_md5_t;
+
+typedef struct {
+ int bps;
+ int channels;
+ int samplerate;
+ uint32_t channelmask;
+ int is_float; // bps must be 32 if this is true
+#if (DDB_API_LEVEL >= 17)
+ uint32_t flags;
+#else
+ int is_bigendian;
+#endif
+} ddb_waveformat_t;
+
+#if (DDB_API_LEVEL >= 17)
+enum {
+ DDB_WAVEFORMAT_FLAG_IS_DOP = 0x01,
+};
+#endif
+
+// since 1.5
+#if (DDB_API_LEVEL >= 5)
+
+/// NOTE: The @c DDB_FREQ_BANDS and the related @c vis_spectrum_listen is no longer used / supported.
+/// They do not do anything, just allowing to build old code.
+/// Use the nframes field instead. Your code should adapt to any
+/// number of bands produced by the visualization engine.
+static const int DDB_FREQ_BANDS DEPRECATED_115 = 256;
+
+/// Max number of channels allowed in the ddb_audio_data_t for frequency data
+static const int DDB_FREQ_MAX_CHANNELS = 9;
+
+typedef struct ddb_audio_data_s {
+ ddb_waveformat_t *fmt;
+ float *data;
+ int nframes;
+} ddb_audio_data_t;
+
+typedef struct ddb_fileadd_data_s {
+ int visibility;
+ ddb_playlist_t *plt;
+ ddb_playItem_t *track;
+} ddb_fileadd_data_t;
+#endif
+
+// since 1.8
+#if (DDB_API_LEVEL >= 8)
+enum {
+ DDB_TF_CONTEXT_HAS_INDEX = 1,
+ DDB_TF_CONTEXT_HAS_ID = 2,
+ DDB_TF_CONTEXT_NO_DYNAMIC = 4, // skip dynamic fields (%playback_time%)
+// since 1.9
+#if (DDB_API_LEVEL >= 9)
+ // By default, non-printable characters will be replaced with underscores.
+ // In multiline mode, they stay as they are in the input.
+ DDB_TF_CONTEXT_MULTILINE = 8,
+#endif
+// since 1.10
+#if (DDB_API_LEVEL >= 10)
+ // the caller supports text dimming functions
+ DDB_TF_CONTEXT_TEXT_DIM = 16,
+#endif
+ // since 1.13
+#if (DDB_API_LEVEL >= 13)
+ // the caller guarantees that metadata access is thread safe
+ DDB_TF_CONTEXT_NO_MUTEX_LOCK = 32,
+#endif
+};
+
+// since 1.10
+#if (DDB_API_LEVEL >= 10)
+enum {
+ DDB_TF_ESC_DIM = 1,
+#if DDB_API_LEVEL >= 14
+ DDB_TF_ESC_RGB = 2,
+#endif
+};
+#endif
+
+// since 1.10
+#if (DDB_API_LEVEL >= 10)
+typedef struct ddb_file_found_data_s {
+ ddb_playlist_t *plt;
+ const char *filename;
+ int is_dir;
+} ddb_file_found_data_t;
+#endif
+
+// context for title formatting interpreter
+typedef struct ddb_tf_context_s {
+ int _size; // must be set to sizeof(tf_context_t)
+ uint32_t flags; // DDB_TF_CONTEXT_ flags
+ ddb_playItem_t *it; // track to get information from, or NULL
+ ddb_playlist_t *plt; // playlist in which the track resides, or NULL
+
+ // NOTE: when plt is NULL, it means that the track is not in any playlist,
+ // that is -- playlist will never be automatically guessed, for performance
+ // reasons.
+
+ // index of the track in playlist the track belongs to
+ // if present, DDB_TF_CONTEXT_HAS_INDEX flag must be set
+ int idx;
+
+ // predefined column id, one of the DB_COLUMN_
+ // if present, DDB_TF_CONTEXT_HAS_ID flag must be set
+ int id;
+
+ int iter; // playlist iteration (PL_MAIN, PL_SEARCH)
+
+ // update is a returned value
+ // meaning:
+ // 0: no automatic updates
+ // <0: updates on every call
+ // >0: number of milliseconds between updates / until next update
+ int update;
+
+#if (DDB_API_LEVEL >= 10)
+ // Return value, is set to non-zero if text was <<<dimmed>>> or >>>brightened<<<
+ // It's used to determine whether the text needs to be searched for the corresponding esc sequences
+ int dimmed;
+#endif
+#if (DDB_API_LEVEL >= 17)
+ void (*metadata_transformer)(struct ddb_tf_context_s *ctx, char *data, size_t size);
+#endif
+} ddb_tf_context_t;
+#endif
+
+#if (DDB_API_LEVEL>=10)
+enum {
+ // Layer 0 means it's always on, and important.
+ // This layer is suitable for critical error messages,
+ // but it's also useful for plugin-specific messages,
+ // which can be turned on and off in the settings.
+ // It is expected that the UI plugins will auto-show the Log View,
+ // when any message is logged on this layer
+ DDB_LOG_LAYER_DEFAULT = 0,
+
+ // Layer 1 should contain informational non-critical messages, like boot log.
+ // This layer is always on.
+ // UI should not auto-show the Log View for this layer.
+ DDB_LOG_LAYER_INFO = 1,
+};
+#endif
+
+#if (DDB_API_LEVEL>=15)
+typedef enum {
+ DDB_INSERT_FILE_RESULT_SUCCESS = 0,
+ DDB_INSERT_FILE_RESULT_UNRECOGNIZED_FILE = 1, // File was not unrecognized
+ DDB_INSERT_FILE_RESULT_RECOGNIZED_FAILED = 2, // File extension was recognized, but could not be loaded by decoder
+ DDB_INSERT_FILE_RESULT_RELATIVE_PATH = 3, // File path is relative: unsupported
+ DDB_INSERT_FILE_RESULT_NULL_FILENAME = 4, // File name is NULL
+ DDB_INSERT_FILE_RESULT_ESCAPE_CHARACTERS_IN_FILENAME = 5, // Escape characters are not allowed in filenames
+ DDB_INSERT_FILE_RESULT_NO_FILE_EXTENSION = 6, // File doesn't have an extension
+ DDB_INSERT_FILE_RESULT_CUESHEET_ERROR = 7, // Error while loading cuesheet
+} ddb_insert_file_result_t;
+
+typedef enum {
+ DDB_INSERT_FILE_FLAG_FOLLOW_SYMLINKS = 1<<0,
+ DDB_INSERT_FILE_FLAG_ENTER_ARCHIVES = 1<<1,
+} ddb_insert_file_flags_t;
+#endif
+
+// forward decl for plugin struct
+struct DB_plugin_s;
+
+// player api definition
+typedef struct {
+ // versioning
+ int vmajor;
+ int vminor;
+
+ // md5sum calc
+ void (*md5) (uint8_t sig16, const char *in, int len);
+ void (*md5_to_str) (char *str, const uint8_t sig16);
+ void (*md5_init)(DB_md5_t *s);
+ void (*md5_append)(DB_md5_t *s, const uint8_t *data, int nbytes);
+ void (*md5_finish)(DB_md5_t *s, uint8_t digest16);
+
+ // playback control
+ struct DB_output_s* (*get_output) (void);
+ float (*playback_get_pos) (void); // 0..100
+ void (*playback_set_pos) (float pos); // 0..100
+
+ // streamer access
+ /// This function is unsafe, and has been deprecated in favor of @c streamer_get_playing_track_safe
+ DB_playItem_t *(*streamer_get_playing_track) (void) DEPRECATED_16;
+ DB_playItem_t *(*streamer_get_streaming_track) (void);
+ float (*streamer_get_playpos) (void);
+ int (*streamer_ok_to_read) (int len);
+ void (*streamer_reset) (int full);
+ int (*streamer_read) (char *bytes, int size);
+ void (*streamer_set_bitrate) (int bitrate);
+ int (*streamer_get_apx_bitrate) (void);
+ struct DB_fileinfo_s *(*streamer_get_current_fileinfo) (void);
+ int (*streamer_get_current_playlist) (void);
+ struct ddb_dsp_context_s * (*streamer_get_dsp_chain) (void);
+ void (*streamer_set_dsp_chain) (struct ddb_dsp_context_s *chain);
+ void (*streamer_dsp_refresh) (void); // call after changing parameters
+
+ // system folders
+ // normally functions will return standard folders derived from --prefix
+ // portable version will return pathes specified in comments below
+ // DEPRECATED IN API LEVEL 8, use get_system_dir instead
+ const char *(*get_config_dir) (void) DEPRECATED_18; // installdir/config | $XDG_CONFIG_HOME/.config/deadbeef
+ const char *(*get_prefix) (void) DEPRECATED_18; // installdir | PREFIX
+ const char *(*get_doc_dir) (void) DEPRECATED_18; // installdir/doc | DOCDIR
+ const char *(*get_plugin_dir) (void) DEPRECATED_18; // installdir/plugins | LIBDIR/deadbeef
+ const char *(*get_pixmap_dir) (void) DEPRECATED_18; // installdir/pixmaps | PREFIX "/share/deadbeef/pixmaps"
+
+ // This function is not implemented, and should not be called. A remnant
+ // from old API before 0.5.0.
+ void (*do_not_call) (void) DEPRECATED;
+
+ // threading
+ intptr_t (*thread_start) (void (*fn)(void *ctx), void *ctx);
+ intptr_t (*thread_start_low_priority) (void (*fn)(void *ctx), void *ctx);
+ int (*thread_join) (intptr_t tid);
+ int (*thread_detach) (intptr_t tid);
+ void (*thread_exit) (void *retval);
+ uintptr_t (*mutex_create) (void);
+ uintptr_t (*mutex_create_nonrecursive) (void);
+ void (*mutex_free) (uintptr_t mtx);
+ int (*mutex_lock) (uintptr_t mtx);
+ int (*mutex_unlock) (uintptr_t mtx);
+ uintptr_t (*cond_create) (void);
+ void (*cond_free) (uintptr_t cond);
+ int (*cond_wait) (uintptr_t cond, uintptr_t mutex);
+ int (*cond_signal) (uintptr_t cond);
+ int (*cond_broadcast) (uintptr_t cond);
+
+ /////// playlist management //////
+ void (*plt_ref) (ddb_playlist_t *plt);
+ void (*plt_unref) (ddb_playlist_t *plt);
+
+ // total number of playlists
+ int (*plt_get_count) (void);
+
+ // 1st item in playlist nr. 'plt'
+ DB_playItem_t * (*plt_get_head) (int plt) DEPRECATED_113;
+
+ // nr. of selected items in playlist nr. 'plt'
+ int (*plt_get_sel_count) (int plt);
+
+ // add new playlist into position before nr. 'before', with title='title'
+ // returns index of new playlist
+ int (*plt_add) (int before, const char *title);
+
+ // remove playlist nr. plt
+ void (*plt_remove) (int plt);
+
+ // clear playlist
+ void (*plt_clear) (ddb_playlist_t *plt);
+ void (*pl_clear) (void);
+
+ // set current playlist
+ void (*plt_set_curr) (ddb_playlist_t *plt);
+ void (*plt_set_curr_idx) (int plt);
+
+ // get current playlist
+ // note: caller is responsible to call plt_unref after using pointer
+ // returned by plt_get_curr
+ ddb_playlist_t *(*plt_get_curr) (void);
+ int (*plt_get_curr_idx) (void);
+
+ // move playlist nr. 'from' into position before nr. 'before', where
+ // before=-1 means last position
+ void (*plt_move) (int from, int before);
+
+ // playlist saving and loading
+ DB_playItem_t * (*plt_load) (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
+ int (*plt_save) (ddb_playlist_t *plt, DB_playItem_t *first, DB_playItem_t *last, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data);
+
+ ddb_playlist_t *(*plt_get_for_idx) (int idx);
+ int (*plt_get_title) (ddb_playlist_t *plt, char *buffer, int bufsize);
+ int (*plt_set_title) (ddb_playlist_t *plt, const char *title);
+
+ // Increments modification index.
+ // This would mark playlist as "dirty" -- meaning it needs to be saved when `pl_save_all` is called.
+ // The flag is reset as soon as playlist is saved.
+ // This is called automatically when playlists are created / cleared / removed, and when items are added/removed to them.
+ // However, other changes -- like changing track metadata -- would not call this function.
+ // You need to call it yourself, to make sure the playlist gets saved on exit.
+ // It doesn't need to be called if you save the playlist via direct call to `plt_save_*`, or `pl_save_current`
+ void (*plt_modified) (ddb_playlist_t *handle);
+
+ // returns modification index
+ // the index is incremented by 1 every time playlist changes
+ int (*plt_get_modification_idx) (ddb_playlist_t *handle);
+
+ // return index of an item in specified playlist, or -1 if not found
+ int (*plt_get_item_idx) (ddb_playlist_t *plt, DB_playItem_t *it, int iter);
+
+ // playlist metadata
+ // this kind of metadata is stored in playlist (dbpl) files
+ // that is, this is the properties of playlist itself,
+ // not of the tracks in the playlist.
+ // for example, playlist tab color can be stored there, etc
+
+ // add meta if it doesn't exist yet
+ void (*plt_add_meta) (ddb_playlist_t *handle, const char *key, const char *value);
+
+ // replace (or add) existing meta
+ void (*plt_replace_meta) (ddb_playlist_t *handle, const char *key, const char *value);
+
+ // append meta to existing one, or add if doesn't exist
+ void (*plt_append_meta) (ddb_playlist_t *handle, const char *key, const char *value);
+
+ // set integer meta (works same as replace)
+ void (*plt_set_meta_int) (ddb_playlist_t *handle, const char *key, int value);
+
+ // set float meta (works same as replace)
+ void (*plt_set_meta_float) (ddb_playlist_t *handle, const char *key, float value);
+
+ // plt_find_meta must always be used in the pl_lock/unlock block
+ const char *(*plt_find_meta) (ddb_playlist_t *handle, const char *key);
+
+ // returns head of metadata linked list, for direct access
+ // remember pl_lock/unlock
+ DB_metaInfo_t * (*plt_get_metadata_head) (ddb_playlist_t *handle);
+
+ // delete meta item from list
+ void (*plt_delete_metadata) (ddb_playlist_t *handle, DB_metaInfo_t *meta);
+
+ // returns integer value of requested meta, def is the default value if not found
+ int (*plt_find_meta_int) (ddb_playlist_t *handle, const char *key, int def);
+
+ // returns float value of requested meta, def is the default value if not found
+ float (*plt_find_meta_float) (ddb_playlist_t *handle, const char *key, float def);
+
+ // delete all metadata
+ void (*plt_delete_all_meta) (ddb_playlist_t *handle);
+
+ // operating on playlist items
+ DB_playItem_t * (*plt_insert_item) (ddb_playlist_t *playlist, DB_playItem_t *after, DB_playItem_t *it);
+ DB_playItem_t * (*plt_insert_file) (ddb_playlist_t *playlist, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
+ DB_playItem_t *(*plt_insert_dir) (ddb_playlist_t *plt, DB_playItem_t *after, const char *dirname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
+ void (*plt_set_item_duration) (ddb_playlist_t *plt, DB_playItem_t *it, float duration);
+ int (*plt_remove_item) (ddb_playlist_t *playlist, DB_playItem_t *it);
+ int (*plt_getselcount) (ddb_playlist_t *playlist);
+ float (*plt_get_totaltime) (ddb_playlist_t *plt);
+ int (*plt_get_item_count) (ddb_playlist_t *plt, int iter);
+ int (*plt_delete_selected) (ddb_playlist_t *plt);
+ void (*plt_set_cursor) (ddb_playlist_t *plt, int iter, int cursor);
+ int (*plt_get_cursor) (ddb_playlist_t *plt, int iter);
+ void (*plt_select_all) (ddb_playlist_t *plt);
+ void (*plt_crop_selected) (ddb_playlist_t *plt);
+ DB_playItem_t *(*plt_get_first) (ddb_playlist_t *plt, int iter);
+ DB_playItem_t *(*plt_get_last) (ddb_playlist_t *plt, int iter);
+ DB_playItem_t * (*plt_get_item_for_idx) (ddb_playlist_t *playlist, int idx, int iter);
+ void (*plt_move_items) (ddb_playlist_t *to, int iter, ddb_playlist_t *from, DB_playItem_t *drop_before, uint32_t *indexes, int count);
+ void (*plt_copy_items) (ddb_playlist_t *to, int iter, ddb_playlist_t * from, DB_playItem_t *before, uint32_t *indices, int cnt);
+
+ // Empty the PL_SEARCH list, and mark the previous results as unselected.
+ void (*plt_search_reset) (ddb_playlist_t *plt);
+
+ // Find the specified text in playlist, and populate the PL_SEARCH linked
+ // list. The results are also marked as selected.
+ void (*plt_search_process) (ddb_playlist_t *plt, const char *text);
+
+ // sort using the title formatting v1 (deprecated)
+ void (*plt_sort) (ddb_playlist_t *plt, int iter, int id, const char *format, int order) DEPRECATED_18;
+
+ // add files and folders to current playlist
+ int (*plt_add_file) (ddb_playlist_t *plt, const char *fname, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
+ int (*plt_add_dir) (ddb_playlist_t *plt, const char *dirname, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
+
+ // cuesheet support
+ DB_playItem_t *(*plt_insert_cue_from_buffer) (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, const uint8_t *buffer, int buffersize, int numsamples, int samplerate) DEPRECATED_110;
+ DB_playItem_t * (*plt_insert_cue) (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, int numsamples, int samplerate) DEPRECATED_110;
+
+ // playlist locking
+ void (*pl_lock) (void);
+ void (*pl_unlock) (void);
+
+ // playlist tracks access
+ DB_playItem_t * (*pl_item_alloc) (void);
+ DB_playItem_t * (*pl_item_alloc_init) (const char *fname, const char *decoder_id);
+ void (*pl_item_ref) (DB_playItem_t *it);
+ void (*pl_item_unref) (DB_playItem_t *it);
+ void (*pl_item_copy) (DB_playItem_t *out, DB_playItem_t *in);
+
+ // request lock for adding files to playlist
+ // this function may return -1 if it is not possible to add files right now.
+ // caller must cancel operation in this case,
+ // or wait until previous operation finishes
+ int (*pl_add_files_begin) (ddb_playlist_t *plt) DEPRECATED_15;
+
+ // release the lock for adding files to playlist
+ // end must be called when add files operation is finished
+ void (*pl_add_files_end) (void) DEPRECATED_15;
+
+ // most of this functions are self explanatory
+ // if you don't get what they do -- look in the code
+
+ // --- the following functions work with current playlist ---
+
+ // get index of the track in MAIN
+ int (*pl_get_idx_of) (DB_playItem_t *it);
+
+ // get index of the track in MAIN or SEARCH
+ int (*pl_get_idx_of_iter) (DB_playItem_t *it, int iter);
+
+ // get track for index in MAIN
+ DB_playItem_t * (*pl_get_for_idx) (int idx);
+
+ // get track for index in MAIN or SEARCH
+ DB_playItem_t * (*pl_get_for_idx_and_iter) (int idx, int iter);
+
+ // get total play time of all tracks in MAIN
+ float (*pl_get_totaltime) (void);
+
+ // get number of tracks in MAIN or SEARCH
+ int (*pl_getcount) (int iter);
+
+ // delete selected tracks
+ int (*pl_delete_selected) (void);
+
+ // set cursor position in MAIN or SEARCH
+ void (*pl_set_cursor) (int iter, int cursor);
+
+ // get cursor position in MAIN
+ int (*pl_get_cursor) (int iter);
+
+ // remove all except selected tracks
+ void (*pl_crop_selected) (void);
+
+ // get number of selected tracks
+ int (*pl_getselcount) (void);
+
+ // get first track in MAIN or SEARCH
+ DB_playItem_t *(*pl_get_first) (int iter);
+
+ // get last track in MAIN or SEARCH
+ DB_playItem_t *(*pl_get_last) (int iter);
+
+ // --- misc functions ---
+
+ // mark the track as selected or unselected (1 or 0 respectively)
+ void (*pl_set_selected) (DB_playItem_t *it, int sel);
+
+ // test whether the track is selected
+ int (*pl_is_selected) (DB_playItem_t *it);
+
+ // save current playlist
+ int (*pl_save_current) (void);
+
+ // save all playlists
+ // Remember to call `plt_modified` on playlists which need saving.
+ // See more information near the `plt_modified` declaration
+ int (*pl_save_all) (void);
+
+ // select all tracks in current playlist
+ void (*pl_select_all) (void);
+
+ // get next track
+ DB_playItem_t *(*pl_get_next) (DB_playItem_t *it, int iter);
+
+ // get previous track
+ DB_playItem_t *(*pl_get_prev) (DB_playItem_t *it, int iter);
+
+ /*
+ pl_format_title formats the line for display in playlist
+ @it pointer to playlist item
+ @idx number of that item in playlist (or -1)
+ @s output buffer
+ @size size of output buffer
+ @id one of IDs defined in pl_column_id_t enum, can be -1
+ @fmt format string, used if id is -1
+ format is printf-alike. specification:
+ %a artist
+ %t title
+ %b album
+ %B band / album artist
+ %n track
+ %l length (duration)
+ %y year
+ %g genre
+ %c comment
+ %r copyright
+ %T tags
+ %f filename without path
+ %F full pathname/uri
+ %d directory without path (e.g. /home/user/file.mp3 -> user)
+ %D directory name with full path (e.g. /home/user/file.mp3 -> /home/user)
+ more to come
+ */
+ int (*pl_format_title) (DB_playItem_t *it, int idx, char *s, int size, int id, const char *fmt) DEPRECATED_18;
+
+ // _escaped version wraps all conversions with '' and replaces every ' in conversions with \'
+ int (*pl_format_title_escaped) (DB_playItem_t *it, int idx, char *s, int size, int id, const char *fmt) DEPRECATED_18;
+
+ // format duration 't' (fractional seconds) into string, for display in playlist
+ void (*pl_format_time) (float t, char *dur, int size);
+
+ // find which playlist the specified item belongs to, returns NULL if none
+ ddb_playlist_t * (*pl_get_playlist) (DB_playItem_t *it);
+
+ // direct access to metadata structures
+ // not thread-safe, make sure to wrap with pl_lock/pl_unlock
+ DB_metaInfo_t * (*pl_get_metadata_head) (DB_playItem_t *it); // returns head of metadata linked list
+ void (*pl_delete_metadata) (DB_playItem_t *it, DB_metaInfo_t *meta);
+
+ // high-level access to metadata
+ void (*pl_add_meta) (DB_playItem_t *it, const char *key, const char *value);
+ void (*pl_append_meta) (DB_playItem_t *it, const char *key, const char *value);
+ void (*pl_set_meta_int) (DB_playItem_t *it, const char *key, int value);
+ void (*pl_set_meta_float) (DB_playItem_t *it, const char *key, float value);
+ void (*pl_delete_meta) (DB_playItem_t *it, const char *key);
+
+ // this function is not thread-safe
+ // make sure to wrap it with pl_lock/pl_unlock block
+ const char *(*pl_find_meta) (DB_playItem_t *it, const char *key);
+
+ // following functions are thread-safe
+ int (*pl_find_meta_int) (DB_playItem_t *it, const char *key, int def);
+ float (*pl_find_meta_float) (DB_playItem_t *it, const char *key, float def);
+ void (*pl_replace_meta) (DB_playItem_t *it, const char *key, const char *value);
+ void (*pl_delete_all_meta) (DB_playItem_t *it);
+ float (*pl_get_item_duration) (DB_playItem_t *it);
+ uint32_t (*pl_get_item_flags) (DB_playItem_t *it);
+ void (*pl_set_item_flags) (DB_playItem_t *it, uint32_t flags);
+ void (*pl_items_copy_junk)(DB_playItem_t *from, DB_playItem_t *first, DB_playItem_t *last);
+ // idx is one of DDB_REPLAYGAIN_* constants
+ void (*pl_set_item_replaygain) (DB_playItem_t *it, int idx, float value);
+ float (*pl_get_item_replaygain) (DB_playItem_t *it, int idx);
+
+ // playqueue support (obsolete since API 1.8)
+ int (*pl_playqueue_push) (DB_playItem_t *it) DEPRECATED_18;
+ void (*pl_playqueue_clear) (void) DEPRECATED_18;
+ void (*pl_playqueue_pop) (void) DEPRECATED_18;
+ void (*pl_playqueue_remove) (DB_playItem_t *it) DEPRECATED_18;
+ int (*pl_playqueue_test) (DB_playItem_t *it) DEPRECATED_18;
+
+ // volume control
+ void (*volume_set_db) (float dB);
+ float (*volume_get_db) (void);
+ void (*volume_set_amp) (float amp);
+ float (*volume_get_amp) (void);
+ float (*volume_get_min_db) (void);
+
+ // 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, 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);
+ int (*junk_id3v2_convert_24_to_23) (DB_id3v2_tag_t *tag24, DB_id3v2_tag_t *tag23);
+ int (*junk_id3v2_convert_23_to_24) (DB_id3v2_tag_t *tag23, DB_id3v2_tag_t *tag24);
+ int (*junk_id3v2_convert_22_to_24) (DB_id3v2_tag_t *tag22, DB_id3v2_tag_t *tag24);
+ void (*junk_id3v2_free) (DB_id3v2_tag_t *tag);
+ int (*junk_id3v2_write) (FILE *file, DB_id3v2_tag_t *tag);
+ DB_id3v2_frame_t *(*junk_id3v2_add_text_frame) (DB_id3v2_tag_t *tag, const char *frame_id, const char *value);
+ int (*junk_id3v2_remove_frames) (DB_id3v2_tag_t *tag, const char *frame_id);
+ int (*junk_apev2_read) (DB_playItem_t *it, DB_FILE *fp);
+ int (*junk_apev2_read_mem) (DB_playItem_t *it, char *mem, int size);
+ int (*junk_apev2_read_full) (DB_playItem_t *it, DB_apev2_tag_t *tag_store, DB_FILE *fp);
+ int (*junk_apev2_read_full_mem) (DB_playItem_t *it, DB_apev2_tag_t *tag_store, char *mem, int memsize);
+ int (*junk_apev2_find) (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems);
+ int (*junk_apev2_remove_frames) (DB_apev2_tag_t *tag, const char *frame_id);
+ DB_apev2_frame_t * (*junk_apev2_add_text_frame) (DB_apev2_tag_t *tag, const char *frame_id, const char *value);
+ void (*junk_apev2_free) (DB_apev2_tag_t *tag);
+ int (*junk_apev2_write) (FILE *fp, DB_apev2_tag_t *tag, int write_header, int write_footer);
+
+ // Returns an offset to the audio packets, after ID3v2 and APEv2 tags.
+ // Only the values >=0 can be returned.
+ // The position is relative to the current file offset, at the time of the call.
+ int (*junk_get_leading_size) (DB_FILE *fp);
+ int (*junk_get_leading_size_stdio) (FILE *fp);
+
+ // This is an API bug that was introduced during 0.7.0 development cycle.
+ // The function was accidentally removed from the codebase, so this pointer is always NULL.
+ void (*do_not_call2) (DB_playItem_t *, DB_playItem_t *, DB_playItem_t *);
+
+ const char * (*junk_detect_charset) (const char *s);
+ int (*junk_recode) (const char *in, int inlen, char *out, int outlen, const char *cs);
+ int (*junk_iconv) (const char *in, int inlen, char *out, int outlen, const char *cs_in, const char *cs_out);
+ int (*junk_rewrite_tags) (DB_playItem_t *it, uint32_t flags, int id3v2_version, const char *id3v1_encoding);
+
+ // vfs
+ DB_FILE* (*fopen) (const char *fname);
+ void (*fclose) (DB_FILE *f);
+ size_t (*fread) (void *ptr, size_t size, size_t nmemb, DB_FILE *stream);
+ int (*fseek) (DB_FILE *stream, int64_t offset, int whence);
+ int64_t (*ftell) (DB_FILE *stream);
+ void (*rewind) (DB_FILE *stream);
+ int64_t (*fgetlength) (DB_FILE *stream);
+ const char *(*fget_content_type) (DB_FILE *stream);
+ void (*fset_track) (DB_FILE *stream, DB_playItem_t *it);
+ void (*fabort) (DB_FILE *stream);
+
+ // message passing
+ int (*sendmessage) (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
+
+ // convenience functions to send events, uses sendmessage internally
+ ddb_event_t *(*event_alloc) (uint32_t id);
+ void (*event_free) (ddb_event_t *ev);
+ int (*event_send) (ddb_event_t *ev, uint32_t p1, uint32_t p2);
+
+ // configuration access
+ //
+ // conf_get_str_fast is not thread-safe, and
+ // must only be used from within conf_lock/conf_unlock block
+ // it should be preferred for fast non-blocking lookups
+ //
+ // all the other config access functions are thread safe
+ void (*conf_lock) (void);
+ void (*conf_unlock) (void);
+ const char * (*conf_get_str_fast) (const char *key, const char *def);
+ void (*conf_get_str) (const char *key, const char *def, char *buffer, int buffer_size);
+ float (*conf_get_float) (const char *key, float def);
+ int (*conf_get_int) (const char *key, int def);
+ int64_t (*conf_get_int64) (const char *key, int64_t def);
+ void (*conf_set_str) (const char *key, const char *val);
+ void (*conf_set_int) (const char *key, int val);
+ void (*conf_set_int64) (const char *key, int64_t val);
+ void (*conf_set_float) (const char *key, float val);
+ DB_conf_item_t * (*conf_find) (const char *group, DB_conf_item_t *prev);
+ void (*conf_remove_items) (const char *key);
+ int (*conf_save) (void);
+
+ // plugin communication
+ struct DB_decoder_s **(*plug_get_decoder_list) (void);
+ struct DB_vfs_s **(*plug_get_vfs_list) (void);
+ struct DB_output_s **(*plug_get_output_list) (void);
+ struct DB_dsp_s **(*plug_get_dsp_list) (void);
+ struct DB_playlist_s **(*plug_get_playlist_list) (void);
+ struct DB_plugin_s **(*plug_get_list) (void);
+ const char **(*plug_get_gui_names) (void);
+ const char * (*plug_get_decoder_id) (const char *id);
+ void (*plug_remove_decoder_id) (const char *id);
+ struct DB_plugin_s *(*plug_get_for_id) (const char *id);
+
+ // misc utilities
+ // returns 1 if the track is represented as a local file
+ // returns 0 if it's a remote file, e.g. a network stream
+ // since API 1.5 it also returns 1 for vfs tracks, e.g. from ZIP files
+ int (*is_local_file) (const char *fname);
+
+ // pcm utilities
+ int (*pcm_convert) (const ddb_waveformat_t * inputfmt, const char *input, const ddb_waveformat_t *outputfmt, char *output, int inputsize);
+
+ // dsp preset management
+ 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);
+
+ // since 1.2
+#if (DDB_API_LEVEL >= 2)
+ 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);
+
+ // These functions are broken, and should not be used.
+ // Use metacache_add_string/metacache_remove_string instead.
+ void (*metacache_ref) (const char *str) DEPRECATED_113;
+ void (*metacache_unref) (const char *str) DEPRECATED_113;
+
+ // this function must return original un-overridden value (ignoring the keys prefixed with '!')
+ // it's not thread-safe, and must be used under the same conditions as the
+ // pl_find_meta
+ const char *(*pl_find_meta_raw) (DB_playItem_t *it, const char *key);
+#endif
+
+ // since 1.3
+#if (DDB_API_LEVEL >= 3)
+ int (*streamer_dsp_chain_save) (void);
+#endif
+
+ // since 1.4
+#if (DDB_API_LEVEL >= 4)
+ int (*pl_get_meta) (DB_playItem_t *it, const char *key, char *val, int size);
+ int (*pl_get_meta_raw) (DB_playItem_t *it, const char *key, char *val, int size);
+ int (*plt_get_meta) (ddb_playlist_t *handle, const char *key, char *val, int size);
+
+ // fast way to test if a field exists in playitem
+ int (*pl_meta_exists) (DB_playItem_t *it, const char *key);
+#endif
+
+ // since 1.5
+#if (DDB_API_LEVEL >= 5)
+ /// Register for getting continuous visualization wave data.
+ /// Incoming waveform data can be arbitrary size.
+ /// Samples are stored in interleaved layout.
+ /// @param ctx Unique pointer identifying your listener.
+ void (*vis_waveform_listen) (void *ctx, void (*callback)(void *ctx, const ddb_audio_data_t *data));
+
+ /// Unregister from getting visualization wave data.
+ /// @param ctx The pointer used with the matching @c vis_waveform_listen call.
+ void (*vis_waveform_unlisten) (void *ctx);
+
+ /// This method does nothing starting with API 1.15.
+ /// Please use @c vis_spectrum_listen2 instead.
+ void (*vis_spectrum_listen) (void *ctx, void (*callback)(void *ctx, const ddb_audio_data_t *data)) DEPRECATED_115;
+
+ void (*vis_spectrum_unlisten) (void *ctx);
+
+ /// Mute/unmute audio without touching volume control.
+ void (*audio_set_mute) (int mute);
+
+ /// @return the value set with @c audio_set_mute
+ int (*audio_is_mute) (void);
+
+ // this is useful for prompting a user when he attempts to quit the player
+ // while something is working in background, e.g. the Converter,
+ // and let him finish or cancel the background jobs.
+ void (*background_job_increment) (void);
+ void (*background_job_decrement) (void);
+ int (*have_background_jobs) (void);
+
+ // utility function to get plt idx from handle
+ int (*plt_get_idx) (ddb_playlist_t *plt);
+
+ // save referenced playlist in config
+ // same as pl_save_current, but for index
+ int (*plt_save_n) (int n);
+
+ // same as pl_save_current, but for playlist pointer
+ int (*plt_save_config) (ddb_playlist_t *plt);
+
+ // register file added callback
+ // the callback will be called for each file
+ // the visibility is taken from plt_add_* arguments
+ // the callback must return 0 to continue, or -1 to abort the operation.
+ // returns ID
+ int (*listen_file_added) (int (*callback)(ddb_fileadd_data_t *data, void *user_data), void *user_data);
+ void (*unlisten_file_added) (int id);
+
+ int (*listen_file_add_beginend) (void (*callback_begin) (ddb_fileadd_data_t *data, void *user_data), void (*callback_end)(ddb_fileadd_data_t *data, void *user_data), void *user_data);
+ void (*unlisten_file_add_beginend) (int id);
+
+ // visibility is a number, which tells listeners about the caller.
+ // the value DDB_FILEADD_VISIBILITY_GUI (or 0) is reserved for callers which
+ // want the GUI to intercept the calls and show visual updates.
+ //
+ // To skip UI, it is recommended to use visibility=-1
+ //
+ // this is the default value passed from plt_load, plt_add_dir, plt_add_file.
+ //
+ // the values up to 10 are registered for deadbeef itself, so please avoid
+ // using them in your plugins, unless you really know what you're doing.
+ // any values above 10 are free for any use.
+ //
+ // the "callback", if not NULL, will be called with the passed "user_data",
+ // for each track.
+ //
+ // the registered listeners will be called too, the ddb_fileadd_data_t
+ // has the visibility
+ DB_playItem_t * (*plt_load2) (int visibility, ddb_playlist_t *plt, ddb_playItem_t *after, const char *fname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data);
+ int (*plt_add_file2) (int visibility, ddb_playlist_t *plt, const char *fname, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data);
+ int (*plt_add_dir2) (int visibility, ddb_playlist_t *plt, const char *dirname, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data);
+ ddb_playItem_t * (*plt_insert_file2) (int visibility, ddb_playlist_t *playlist, ddb_playItem_t *after, const char *fname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data);
+ ddb_playItem_t *(*plt_insert_dir2) (int visibility, ddb_playlist_t *plt, ddb_playItem_t *after, const char *dirname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data);
+
+ // request lock for adding files to playlist
+ // returns 0 on success
+ // this function may return -1 if it is not possible to add files right now.
+ // caller must cancel operation in this case,
+ // or wait until previous operation finishes
+ // NOTE: it's not guaranteed that all deadbeef versions support
+ // adding the files to different playlists in parallel.
+ int (*plt_add_files_begin) (ddb_playlist_t *plt, int visibility);
+
+ // release the lock for adding files to playlist
+ // end must be called when add files operation is finished
+ void (*plt_add_files_end) (ddb_playlist_t *plt, int visibility);
+
+ // deselect all tracks in playlist
+ void (*plt_deselect_all) (ddb_playlist_t *plt);
+#endif
+ // since 1.6
+#if (DDB_API_LEVEL >= 6)
+ void (*plt_set_scroll) (ddb_playlist_t *plt, int scroll);
+ int (*plt_get_scroll) (ddb_playlist_t *plt);
+#endif
+ // since 1.8
+#if (DDB_API_LEVEL >= 8)
+ // **** title formatting v2 ****
+
+ // compile the input title formatting string into bytecode
+ // script: freeform string with title formatting special characters in it
+ // returns the pointer to compiled bytecode, which must be tf_free'd by the caller.
+ char *(*tf_compile) (const char *script);
+
+ // free the code returned by tf_compile
+ void (*tf_free) (char *code);
+
+ // Evaluate the compiled titleformatting script in the given context
+ // ctx: a pointer to ddb_tf_context_t structure initialized by the caller
+ // code: the bytecode data created by tf_compile
+ // out: buffer allocated by the caller, must be big enough to fit the output string
+ // outlen: the size of out buffer
+ // returns -1 on failure, output size on success
+ int (*tf_eval) (ddb_tf_context_t *ctx, const char *code, char *out, int outlen);
+
+ // sort using title formatting v2
+ void (*plt_sort_v2) (ddb_playlist_t *plt, int iter, int id, const char *format, int order);
+
+ // playqueue APIs
+ int (*playqueue_push) (DB_playItem_t *it);
+ void (*playqueue_pop) (void);
+ void (*playqueue_remove) (DB_playItem_t *it);
+ void (*playqueue_clear) (void);
+ int (*playqueue_test) (DB_playItem_t *it);
+ int (*playqueue_get_count) (void);
+ DB_playItem_t *(*playqueue_get_item) (int n);
+ int (*playqueue_remove_nth) (int n);
+ void (*playqueue_insert_at) (int n, DB_playItem_t *it);
+
+ // system directory API, returns path by id from ddb_sys_directory_t enum
+ const char *(*get_system_dir) (int dir_id);
+
+ // set the selected playlist for the ongoing plugin action.
+ // the "set" function is expected to be called by the UI plugin,
+ // while the "get" is expected to be called by the action code.
+ void (*action_set_playlist) (ddb_playlist_t *plt);
+
+ // returns one of:
+ // selected playlist for context menu for the DDB_ACTION_CTX_PLAYLIST,
+ // or the current active playlist for any other context.
+ // returned value cannot be NULL
+ // returned value is refcounted, so remember to call plt_unref.
+ ddb_playlist_t *(*action_get_playlist) (void);
+
+ // convert legacy title formatting to the new format, usable with tf_compile
+ void (*tf_import_legacy) (const char *fmt, char *out, int outsize);
+#endif
+
+ // since 1.10
+#if (DDB_API_LEVEL >= 10)
+ // same as plt_search_process, but allows to choose whether to select the
+ // search results, or not
+ void (*plt_search_process2) (ddb_playlist_t *plt, const char *text, int select_results);
+
+ // try loading external and embedded cuesheet, using the configured order (cue.prefer_embedded, default=0)
+ DB_playItem_t * (*plt_process_cue) (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *it, uint64_t numsamples, int samplerate);
+
+ // return direct-access metadata structure for the given track and key
+ DB_metaInfo_t * (*pl_meta_for_key) (DB_playItem_t *it, const char *key);
+
+ //////////// Logging ///////////
+
+ // The recommended usage in plugins:
+ // #define trace(...) { deadbeef->log_detailed (&plugin.plugin, 0, __VA_ARGS__); }
+ // Then use trace () as you would use printf
+ // The user would be able to enable/disable logging in your plugin via the standard UI features.
+ // Remember to set plugin.api_vminor = 10 or higher
+
+ // Low level log function, where plugin and level can be specified.
+ // Plugin defines the scope, so logging can be toggled per plugin
+ // Layers is a combination of bits, which define the priority/visibility of the message.
+ // See DDB_LOG_LAYER_* for details
+ void (*log_detailed) (struct DB_plugin_s *plugin, uint32_t layers, const char *fmt, ...);
+
+ // Same as log_detailed but uses va_list
+ void (*vlog_detailed) (struct DB_plugin_s *plugin, uint32_t layer, const char *fmt, va_list ap);
+
+ // High level easy-to-use log function, with no scope
+ // These log messages cannot be disabled, and will always appear in the Log Viewers
+ void (*log) (const char *fmt, ...);
+
+ // Same as log but uses va_list
+ void (*vlog) (const char *fmt, va_list ap);
+
+ // Custom log viewers, for use in UI plugins and similar
+ void (*log_viewer_register) (void (*callback)(struct DB_plugin_s *plugin, uint32_t layers, const char *text, void *ctx), void *ctx);
+ void (*log_viewer_unregister) (void (*callback)(struct DB_plugin_s *plugin, uint32_t layers, const char *text, void *ctx), void *ctx);
+
+ ///////// File add filtering ///////
+
+ // It works by calling the filter right after a file or folder was found, but before it's open / processed
+ // Then if the filter returns a negative value -- the file/folder will be skipped
+ // It's designed to work with plt_insert_dir and plt_insert_file.
+ // In case of plt_insert_file, the filter will only be used for recursive plt_insert_dir calls (e.g. for VFS containers)
+
+ // Registers the file add filter, and returns the filter ID, which can be used to unregister the filter
+ // Calls the callback before each file is processed
+ // The callback must return 0 to continue, or a negative value to skip the file
+ int (*register_fileadd_filter) (int (*callback)(ddb_file_found_data_t *data, void *user_data), void *user_data);
+
+ // Unregisters the filter by ID, returned by register_file_filter
+ void (*unregister_fileadd_filter) (int id);
+
+ ////// MetaCache APIs available from 1.10+ //////
+
+ // Returns an existing NULL-terminated string, or NULL if it doesn't exist
+ const char * (*metacache_get_string) (const char *str);
+
+ // Adds a new value of specified size, or finds an existing one
+ const char * (*metacache_add_value) (const char *value, size_t valuesize);
+
+ // Returns an existing value of specified size, or NULL if it doesn't exist
+ const char *(*metacache_get_value) (const char *value, size_t valuesize);
+
+ // Removes an existing value of specified size, ignoring refcount
+ void (*metacache_remove_value) (const char *value, size_t valuesize);
+
+ ////// ReplayGain APIs available from 1.10+ //////
+
+ // Apply replaygain according to the current settings.
+ // NOTE: This only works for the current streaming_track,
+ // as the current settings are controlled by the streamer.
+ // Can be used to apply replaygain in decoders, but the appropriate flags
+ // need to be checked, e.g. the DDB_DECODER_HINT_RAW_SIGNAL.
+ // Make sure to set the DDB_PLUGIN_FLAG_REPLAYGAIN bit in plugin.flags,
+ // otherwise replaygain could be applied twice.
+ void (*replaygain_apply) (ddb_waveformat_t *fmt, char *bytes, int numbytes);
+
+ // Same as replaygain_apply, but with specified settings.
+ // Suitable to use from the converter and for other similar uses.
+ void (*replaygain_apply_with_settings) (ddb_replaygain_settings_t *settings, ddb_waveformat_t *fmt, char *bytes, int numbytes);
+
+ // Utility function to init the replaygain settings from the current
+ // player configuration, and the supplied track.
+ // After initializing the settings, pass the pointer to replaygain_apply_with_settings
+ void (*replaygain_init_settings) (ddb_replaygain_settings_t *settings, DB_playItem_t *it);
+
+ ////// Sort APIs available from 1.10+ //////
+
+ // Sort a plain array of tracks, according to specified title formatting v2 script and column id.
+ // The sorting is applied in-place, i.e. the input array is modified.
+ // `playlist` can be NULL, otherwise must point to the playlist which ALL of the tracks belong to;
+ // `tracks` and `numtracks` specify the array of tracks;
+ // `format` is title formatting v2 script;
+ // `order` can be one of DDB_SORT_ASCENDING or DDB_SORT_DESCENDING (no random).
+ void (*sort_track_array) (ddb_playlist_t *playlist, DB_playItem_t **tracks, int num_tracks, const char *format, int order);
+
+ // initialize playitem, same as plt_add_file, except do not add to any playlist
+ DB_playItem_t *(*pl_item_init) (const char *fname);
+
+ int64_t (*pl_item_get_startsample) (DB_playItem_t *it);
+
+ int64_t (*pl_item_get_endsample) (DB_playItem_t *it);
+
+ void (*pl_item_set_startsample) (DB_playItem_t *it, int64_t sample);
+
+ void (*pl_item_set_endsample) (DB_playItem_t *it, int64_t sample);
+
+ // get total playback time of selected tracks
+ float (*plt_get_selection_playback_time) (ddb_playlist_t *plt);
+
+ // get the size of known tags at the end of file, or -1 on error
+ int (*junk_get_tail_size) (DB_FILE *fp);
+
+ // get the sizes of known tags at the beginning and end of file
+ // no error is reported
+ void (*junk_get_tag_offsets) (DB_FILE *fp, uint32_t *head, uint32_t *tail);
+
+ // returns 1 to tell that cuesheet is being loaded now.
+ // this should be called by plugins to prevent running cuesheet code at a wrong time.
+ int (*plt_is_loading_cue) (ddb_playlist_t *plt);
+#endif
+
+// since 1.11
+#if (DDB_API_LEVEL >= 11)
+ // Set and get shuffle / repeat modes.
+
+ void (*streamer_set_shuffle) (ddb_shuffle_t shuffle);
+
+ ddb_shuffle_t (*streamer_get_shuffle) (void);
+
+ void (*streamer_set_repeat) (ddb_repeat_t repeat);
+
+ ddb_repeat_t (*streamer_get_repeat) (void);
+#endif
+
+// since 1.12
+#if (DDB_API_LEVEL >= 12)
+ DB_metaInfo_t *(*pl_meta_for_key_with_override) (ddb_playItem_t *it, const char *key);
+ const char *(*pl_find_meta_with_override) (DB_playItem_t *it, const char *key);
+ int (*pl_get_meta_with_override) (ddb_playItem_t *it, const char *key, char *val, size_t size);
+ int (*pl_meta_exists_with_override) (DB_playItem_t *it, const char *key);
+#endif
+
+// since 1.13
+#if (DDB_API_LEVEL >= 13)
+ void (*plt_item_set_selected)(ddb_playlist_t *plt, ddb_playItem_t *it, int sel);
+ ddb_playlist_t * (*plt_find_by_name) (const char *name);
+
+ /// Append a playlist, and return the pointer
+ ///
+ /// NOTE: Before API level 15, this function had a bug and didn't increment reference count.
+ /// It's not recommended to use it unless API level 15 is available.
+ ddb_playlist_t * (*plt_append) (const char *title);
+ ddb_playItem_t * (*plt_get_head_item) (ddb_playlist_t *p, int iter);
+ ddb_playItem_t * (*plt_get_tail_item) (ddb_playlist_t *p, int iter);
+#endif
+
+// since 1.14
+#if (DDB_API_LEVEL >= 14)
+ // Get full filesystem path to the specified plugin file (.so/.dll/.dylib)
+ const char* (*plug_get_path_for_plugin_ptr) (struct DB_plugin_s *plugin_ptr);
+#endif
+
+#if (DDB_API_LEVEL >= 15)
+ /// Register for getting spectrum (frequency domain) visualization data.
+ ///
+ /// Use the @c nframes field in the @c data to get the number of frequency samples.
+ ///
+ /// Max number of channels is @c DDB_FREQ_MAX_CHANNELS.
+ ///
+ /// The samples are planar-ordered (non-interleaved).
+ ///
+ /// Use @c vis_spectrum_unlisten to unregister.
+ ///
+ /// Callback will run on a background thread, so make sure to synchronize the data access.
+ /// @param ctx Associated context, must be unique
+ /// @param callback The callback which will be called every time new fft data is ready
+ void (*vis_spectrum_listen2) (void *ctx, void (*callback)(void *ctx, const ddb_audio_data_t *data));
+
+ /// This method will inserts directory contents at the specified point in playlist.
+ /// Improvements from previous revision: flags, and callback with result parameter.
+ /// @param visibility See @c plt_load2 summary.
+ /// @param flags A combination of flags from @c ddb_insert_file_flags_t enum.
+ /// @param plt Playlist to insert files to.
+ /// @param after The item to insert new items after. Must exist in the playlist.
+ /// @param dirname Directory path.
+ /// @param pabort A pointer to an integer, which can be set to 1 to abort the execution. Can be NULL.
+ /// @param callback The callback function that will be called for each file. It must return 0 to insert the file, or -1 to skip the file. Can be NULL.
+ /// @param user_data A pointer to arbitrary data to pass to the callback.
+ /// @return the last inserted item.
+ ddb_playItem_t *(*plt_insert_dir3) (
+ int visibility,
+ uint32_t flags,
+ ddb_playlist_t *plt,
+ ddb_playItem_t *after,
+ const char *dirname,
+ int *pabort,
+ int (*callback)(ddb_insert_file_result_t result, const char *filename, void *user_data),
+ void *user_data
+ );
+#endif
+
+#if (DDB_API_LEVEL >= 16)
+ /// @return The currently playing track
+ /// Please ensure that this function is not called from within @c pl_lock,
+ /// since this function internally uses streamer_lock, which may cause a deadlock against pl_lock.
+ ddb_playItem_t * (*streamer_get_playing_track_safe) (void);
+#endif
+} 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 {
+ // An menu item for this action should be added to the main menu (ex. Playback/Skip to/Previous genre)
+ DB_ACTION_COMMON = 1 << 0,
+
+ // Indicates that this action can work when a single track is selected
+ DB_ACTION_SINGLE_TRACK = 1 << 1,
+
+ // Indicates that this action can work when multiple tracks are selected
+ DB_ACTION_MULTIPLE_TRACKS = 1 << 2,
+
+ // Use DB_ACTION_MULTIPLE_TRACKS instead
+ DB_ACTION_ALLOW_MULTIPLE_TRACKS DEPRECATED_15 = 1 << 2,
+
+ // Ignored in callback2
+ // Action will get the track list by itself, instead of getting the list as argument.
+ // This is the default behavior when using callback2
+ DB_ACTION_CAN_MULTIPLE_TRACKS DEPRECATED_15 = 1 << 3,
+
+ // Action is inactive
+ DB_ACTION_DISABLED = 1 << 4,
+
+#if (DDB_API_LEVEL >= 2)
+ // Action is compatible with action context is DDB_ACTION_CTX_PLAYLIST,
+ // I.e. it should show up in the playlist tab context menu.
+ // Example "Duplicate playlist".
+ DB_ACTION_PLAYLIST = (1 << 5),
+#endif
+
+#if (DDB_API_LEVEL >= 5)
+ // Add item to the menus.
+ // When constructing the main menu, only add if the action name contains a slash.
+ DB_ACTION_ADD_MENU = 1 << 6,
+#endif
+
+#if (DDB_API_LEVEL >= 10)
+ // Don't allow running this action in playlist context, even if it supports multiple selection
+ DB_ACTION_EXCLUDE_FROM_CTX_PLAYLIST = 1 << 7
+#endif
+};
+
+// action contexts
+// since 1.5
+#if (DDB_API_LEVEL >= 5)
+#if (DDB_API_LEVEL >= 11)
+typedef enum ddb_action_context_e {
+#else
+enum {
+#endif
+ DDB_ACTION_CTX_MAIN,
+ DDB_ACTION_CTX_SELECTION,
+ // NOTE: starting with API 1.8, plugins should be using the
+ // action_get_playlist function for getting the playlist pointer.
+ DDB_ACTION_CTX_PLAYLIST,
+ DDB_ACTION_CTX_NOWPLAYING,
+ DDB_ACTION_CTX_COUNT
+#if (DDB_API_LEVEL >= 11)
+} ddb_action_context_t;
+#else
+};
+#endif
+#endif
+
+struct DB_plugin_action_s;
+
+typedef int (*DB_plugin_action_callback_t) (struct DB_plugin_action_s *action, void *userdata);
+
+#if (DDB_API_LEVEL >= 11)
+typedef int (*DB_plugin_action_callback2_t) (struct DB_plugin_action_s *action, ddb_action_context_t ctx);
+#elif (DDB_API_LEVEL >= 5)
+typedef int (*DB_plugin_action_callback2_t) (struct DB_plugin_action_s *action, int ctx);
+#endif
+
+typedef struct DB_plugin_action_s {
+ const char *title;
+ const char *name;
+ uint32_t flags;
+ // Only use it if the code must be compatible with API 1.4,
+ // otherwise switch to callback2
+ DB_plugin_action_callback_t callback DEPRECATED_14;
+ struct DB_plugin_action_s *next;
+#if (DDB_API_LEVEL >= 5)
+ DB_plugin_action_callback2_t callback2;
+#endif
+} DB_plugin_action_t;
+
+#if (DDB_API_LEVEL >= 10)
+enum {
+ // Tells the system to capture the logs from this plugin.
+ DDB_PLUGIN_FLAG_LOGGING = 1,
+
+ // Tells the system that the plugin supports replaygain, and streamer should not do it.
+ DDB_PLUGIN_FLAG_REPLAYGAIN = 2,
+
+#if (DDB_API_LEVEL >= 14)
+ // Tells that the plugin implements ddb_decoder2_t interface
+ DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2 = 4,
+#endif
+
+#if (DDB_API_LEVEL >= 15)
+ DDB_PLUGIN_FLAG_ASYNC_STOP = 8,
+#endif
+};
+#endif
+
+#if (DDB_API_LEVEL >= 15)
+/// Reserved command IDs, usable with @c plugin.command method.
+/// The commands with numbers 1000 and up are reserved for internal use.
+enum {
+ // Stop plugin asynchronously.
+ // The plugin is expected to handle this command, if it has the flag @c DDB_PLUGIN_FLAG_ASYNC_STOP.
+ // The command 2nd argument is a void (^completion_block)(void).
+ DDB_COMMAND_PLUGIN_ASYNC_STOP = 1000,
+};
+
+typedef struct ddb_response_s {
+ size_t _size;
+ int (*append)(struct ddb_response_s *response, char *bytes, size_t size);
+} ddb_response_t;
+
+#endif
+
+// base plugin interface
+typedef struct DB_plugin_s {
+ // type must be one of DB_PLUGIN_ types
+ int32_t type;
+ // api version
+ int16_t api_vmajor;
+ int16_t api_vminor;
+ // plugin version
+ int16_t version_major;
+ int16_t version_minor;
+
+ uint32_t flags; // DDB_PLUGIN_FLAG_*
+ uint32_t reserved1;
+ uint32_t reserved2;
+ uint32_t reserved3;
+
+ // any of those can be left NULL
+ // though it's much better to fill them with something useful
+ const char *id; // id used for serialization and runtime binding
+ const char *name; // short name
+ const char *descr; // short description (what the plugin is doing)
+ const char *copyright; // copyright notice(s), list of developers, links to original works, etc
+ const char *website; // plugin website
+
+ // plugin-specific command interface; can be NULL
+ int (*command) (int cmd, ...);
+
+ // start is called to start plugin; can be NULL
+ int (*start) (void);
+
+ // stop is called to deinit plugin; can be NULL
+ int (*stop) (void);
+
+ // connect is called to setup connections between different plugins
+ // it is called after all plugin's start method was executed
+ // can be NULL
+ // NOTE for GUI plugin developers: don't initialize your widgets/windows in
+ // the connect method.
+ int (*connect) (void);
+
+ // opposite of connect, will be called before stop, while all plugins are still
+ // in "started" state
+ int (*disconnect) (void);
+
+#if (DDB_API_LEVEL >= 15)
+ /// Ask the plugin to execute an arbitrary command line
+ ///
+ /// @c exec_cmdline may be called at any moment when the user sends commandline to player.
+ /// A plugin must have api_vminor>=15 in order to use this API.
+ /// The method can be NULL if plugin doesn't support commandline processing.
+ /// @param cmdline is 0-separated list of strings, guaranteed to have 0 at the end
+ /// @param cmdline_size is number of bytes pointed by cmdline
+ /// @param response the interface to create a response for the caller
+ /// @return 0 on success or error code on failure
+ int (*exec_cmdline) (const char *cmdline, int cmdline_size, ddb_response_t *response);
+#else
+ /// Don't use this API.
+ /// It is kept here to guarantee the API-level backwards compatibility, but this method will never be called.
+ int (*exec_cmdline) (const char *cmdline, int cmdline_size);
+#endif
+
+ // @return linked list of actions for the specified track
+ // when it is NULL -- the plugin must return list of all actions
+ DB_plugin_action_t* (*get_actions) (DB_playItem_t *it);
+
+ // mainloop will call this function for every plugin
+ // so that plugins may handle all events;
+ // can be NULL
+ int (*message) (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
+
+ // plugin configuration dialog is constructed from this data
+ // can be NULL
+ const char *configdialog;
+} DB_plugin_t;
+
+// file format stuff
+
+// channel mask - combine following flags to tell streamer which channels are
+// present in input/output streams
+enum {
+ DDB_SPEAKER_FRONT_LEFT = 0x1,
+ DDB_SPEAKER_FRONT_RIGHT = 0x2,
+ DDB_SPEAKER_FRONT_CENTER = 0x4,
+ DDB_SPEAKER_LOW_FREQUENCY = 0x8,
+ DDB_SPEAKER_BACK_LEFT = 0x10,
+ DDB_SPEAKER_BACK_RIGHT = 0x20,
+ DDB_SPEAKER_FRONT_LEFT_OF_CENTER = 0x40,
+ DDB_SPEAKER_FRONT_RIGHT_OF_CENTER = 0x80,
+ DDB_SPEAKER_BACK_CENTER = 0x100,
+ DDB_SPEAKER_SIDE_LEFT = 0x200,
+ DDB_SPEAKER_SIDE_RIGHT = 0x400,
+ DDB_SPEAKER_TOP_CENTER = 0x800,
+ DDB_SPEAKER_TOP_FRONT_LEFT = 0x1000,
+ DDB_SPEAKER_TOP_FRONT_CENTER = 0x2000,
+ DDB_SPEAKER_TOP_FRONT_RIGHT = 0x4000,
+ DDB_SPEAKER_TOP_BACK_LEFT = 0x8000,
+ DDB_SPEAKER_TOP_BACK_CENTER = 0x10000,
+ DDB_SPEAKER_TOP_BACK_RIGHT = 0x20000
+};
+
+typedef struct DB_fileinfo_s {
+ struct DB_decoder_s *plugin;
+
+ // these parameters should be set in decoder->open
+ ddb_waveformat_t fmt;
+
+ // readpos should be updated to current decoder time (in seconds)
+ float readpos;
+
+ // this is the (optional) file handle, that can be used by streamer to
+ // request interruption of current read operation
+ DB_FILE *file;
+} DB_fileinfo_t;
+
+enum {
+ // Decoders should try to output 16 bit stream when this flag is set, for
+ // performance reasons.
+ DDB_DECODER_HINT_16BIT = 0x1,
+#if (DDB_API_LEVEL >= 8)
+ // Decoders should only call the streamer_set_bitrate from plugin.read function,
+ // and only when this flag is set.
+ DDB_DECODER_HINT_NEED_BITRATE = 0x2,
+ // Decoders can do their own infinite looping when this flag is set, in the
+ // "Loop Single" looping mode.
+ DDB_DECODER_HINT_CAN_LOOP = 0x4,
+#endif
+#if (DDB_API_LEVEL >= 10)
+ // Don't modify the stream (e.g. no replaygain, clipping, etc), provide the maximum possible precision, preferably in float32.
+ // Supposed to be used by converter, replaygain scanner, etc.
+ DDB_DECODER_HINT_RAW_SIGNAL = 0x8,
+#endif
+};
+
+// decoder plugin
+typedef struct DB_decoder_s {
+ DB_plugin_t plugin;
+
+ DB_fileinfo_t *(*open) (uint32_t hints);
+
+ // init is called to prepare song to be started
+ int (*init) (DB_fileinfo_t *info, DB_playItem_t *it);
+
+ // free is called after decoding is finished
+ void (*free) (DB_fileinfo_t *info);
+
+ // read is called by streamer to decode specified number of bytes
+ // must return number of bytes that were successfully decoded (sample aligned)
+ int (*read) (DB_fileinfo_t *info, char *buffer, int nbytes);
+
+ int (*seek) (DB_fileinfo_t *info, float seconds);
+
+ // perform seeking in samples (if possible)
+ // return -1 if failed, or 0 on success
+ // if -1 is returned, that will mean that streamer must skip that song
+ int (*seek_sample) (DB_fileinfo_t *info, int sample);
+
+ // 'insert' is called to insert new item to playlist
+ // decoder is responsible to calculate duration, split it into subsongs, load cuesheet, etc
+ // after==NULL means "prepend before 1st item in playlist"
+ DB_playItem_t * (*insert) (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname);
+
+ int (*numvoices) (DB_fileinfo_t *info);
+ void (*mutevoice) (DB_fileinfo_t *info, int voice, int mute);
+
+ int (*read_metadata) (DB_playItem_t *it);
+ int (*write_metadata) (DB_playItem_t *it);
+
+ // NULL terminated array of all supported extensions
+ // examples:
+ // { "aac", "wma", "tak", NULL } -- supports 3 file extensions
+ // since API 1.9: { "*", NULL } -- supports any file extensions
+ const char **exts;
+
+ // NULL terminated array of all supported prefixes (UADE support needs that)
+ // e.g. "mod.song_title"
+ const char **prefixes;
+
+#if (DDB_API_LEVEL >= 7)
+ // This function's purpose is to open the file, so that the file handle is
+ // immediately accessible via DB_fileinfo_t, and can be used with fabort.
+ // If a plugin is using open2, it should not reopen the file from init.
+ // Plugins _must_ implement open even if open2 is present,
+ // because existing code may rely on it.
+ DB_fileinfo_t *(*open2) (uint32_t hints, DB_playItem_t *it);
+#endif
+} DB_decoder_t;
+
+#if (DDB_API_LEVEL >= 14)
+/// Extended decoder interface, with 64 bit seeking support.
+/// Usage:
+/// Use ddb_decoder2_t as your base plugin type
+/// Add DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2 to your plugin's flags field.
+typedef struct ddb_decoder2_s {
+ DB_decoder_t decoder;
+
+ // perform seeking in samples (if possible)
+ // return -1 if failed, or 0 on success
+ // if -1 is returned, that will mean that streamer must skip that song
+ int (*seek_sample64) (DB_fileinfo_t *info, int64_t sample);
+
+ void *padding8;
+} ddb_decoder2_t;
+#endif
+
+// output plugin
+typedef struct DB_output_s {
+ DB_plugin_t plugin;
+ // init is called once at plugin activation
+ int (*init) (void);
+ // free is called if output plugin was changed to another, or unload is about to happen
+ int (*free) (void);
+ // reconfigure output to another format
+ int (*setformat) (ddb_waveformat_t *fmt);
+ // play, stop, pause, unpause are called by deadbeef in response to user
+ // events, or as part of streaming process
+ int (*play) (void);
+ int (*stop) (void);
+ int (*pause) (void);
+ int (*unpause) (void);
+#if (DDB_API_LEVEL >= 11)
+ ddb_playback_state_t (*state) (void);
+#else
+ int (*state) (void);
+#endif
+ // soundcard enumeration (can be NULL)
+ void (*enum_soundcards) (void (*callback)(const char *name, const char *desc, void*), void *userdata);
+
+ // parameters of current output
+ ddb_waveformat_t fmt;
+
+ // set to 1 if volume control is done internally by plugin
+ int has_volume;
+} DB_output_t;
+
+// dsp plugin
+// see also: examples/dsp_template.c in git
+#define DDB_INIT_DSP_CONTEXT(var,type,plug) {\
+ memset(var,0,sizeof(type));\
+ var->ctx.plugin=plug;\
+ var->ctx.enabled=1;\
+}
+
+typedef struct ddb_dsp_context_s {
+ // pointer to DSP plugin which created this context
+ struct DB_dsp_s *plugin;
+
+ // pointer to the next DSP plugin context in the chain
+ struct ddb_dsp_context_s *next;
+
+ // read only flag; set by DB_dsp_t::enable
+ unsigned enabled : 1;
+} ddb_dsp_context_t;
+
+typedef struct DB_dsp_s {
+ DB_plugin_t plugin;
+
+ ddb_dsp_context_t* (*open) (void);
+
+ void (*close) (ddb_dsp_context_t *ctx);
+
+ // samples are always interleaved floating point
+ // returned value is number of output frames (multichannel samples)
+ // plugins are allowed to modify channels, samplerate, channelmask in the fmt structure
+ // buffer size can fit up to maxframes frames
+ // by default ratio=1, and plugins don't need to touch it unless they have to
+ int (*process) (ddb_dsp_context_t *ctx, float *samples, int frames, int maxframes, ddb_waveformat_t *fmt, float *ratio);
+
+ void (*reset) (ddb_dsp_context_t *ctx);
+
+ // num_params can be NULL, to indicate that plugin doesn't expose any params
+ //
+ // if num_params is non-NULL -- get_param_name, set_param and get_param must
+ // all be implemented
+ //
+ // param names are for display-only, and are allowed to contain spaces
+ int (*num_params) (void);
+ const char *(*get_param_name) (int p);
+ void (*set_param) (ddb_dsp_context_t *ctx, int p, const char *val);
+ void (*get_param) (ddb_dsp_context_t *ctx, int p, char *str, int len);
+
+ // config dialog implementation uses set/get param, so they must be
+ // implemented if this is nonzero
+ const char *configdialog;
+
+ // since 1.1
+#if (DDB_API_LEVEL >= 1)
+ // can be NULL
+ // should return 1 if the DSP plugin will not touch data with the current parameters;
+ // 0 otherwise
+ int (*can_bypass) (ddb_dsp_context_t *ctx, ddb_waveformat_t *fmt);
+#endif
+} DB_dsp_t;
+
+// misc plugin
+// purpose is to provide extra services
+// e.g. scrobbling, converting, tagging, custom gui, etc.
+// misc plugins should be mostly event driven, so no special entry points in them
+typedef struct {
+ DB_plugin_t plugin;
+} DB_misc_t;
+
+// vfs plugin
+// provides means for reading, seeking, etc
+// api is based on stdio
+typedef struct DB_vfs_s {
+ DB_plugin_t plugin;
+
+// capabilities
+ const char **(*get_schemes) (void); // NULL-terminated list of supported schemes, e.g. {"http://", "ftp://", NULL}; can be NULL
+
+ int (*is_streaming) (void); // return 1 if the plugin streaming data over slow connection, e.g. http; plugins will avoid scanning entire files if this is the case
+
+ int (*is_container) (const char *fname); // should return 1 if this plugin can parse specified file
+
+// Was used to interrupt hanging network streams, but not used since API 1.11.
+// Use get_identifier / abort_with_identifier instead
+ void (*abort) (DB_FILE *stream) DEPRECATED_111;
+
+// file access, follows stdio API with few extension
+ DB_FILE* (*open) (const char *fname);
+ void (*close) (DB_FILE *f);
+ size_t (*read) (void *ptr, size_t size, size_t nmemb, DB_FILE *stream);
+ int (*seek) (DB_FILE *stream, int64_t offset, int whence);
+ int64_t (*tell) (DB_FILE *stream);
+ void (*rewind) (DB_FILE *stream);
+ int64_t (*getlength) (DB_FILE *stream);
+
+ // should return mime-type of a stream, if known; can be NULL
+ const char * (*get_content_type) (DB_FILE *stream);
+
+ // associates stream with a track, to allow dynamic metadata updating, like
+ // in icy protocol
+ void (*set_track) (DB_FILE *f, DB_playItem_t *it);
+
+ // folder access, follows dirent API, and uses dirent data structures
+ int (*scandir) (const char *dir, struct dirent ***namelist, int (*selector) (const struct dirent *), int (*cmp) (const struct dirent **, const struct dirent **));
+
+#if (DDB_API_LEVEL >= 6)
+ // returns URI scheme for a given file name, e.g. "zip://"
+ // can be NULL
+ // can return NULL
+ const char *(*get_scheme_for_name) (const char *fname);
+#endif
+
+#if (DDB_API_LEVEL >= 11)
+ // Optional method, which should return a unique ID associated with the file
+ uint64_t (*get_identifier) (DB_FILE *f);
+
+ // Optional method to abort any file / stream operation on a file with specified identifier
+ void (*abort_with_identifier) (uint64_t identifier);
+#endif
+} DB_vfs_t;
+
+// gui plugin
+// only one gui plugin can be running at the same time
+// should provide GUI services to other plugins
+
+// this structure represents a gui dialog with callbacks to set/get params
+// documentation should be available here:
+// http://github.com/DeaDBeeF-Player/deadbeef/wiki/GUI-Script-Syntax
+typedef struct {
+ const char *title;
+ const char *layout;
+ void (*set_param) (const char *key, const char *value);
+ void (*get_param) (const char *key, char *value, int len, const char *def);
+
+#if (DDB_API_LEVEL >= 4)
+ void *parent;
+#endif
+} ddb_dialog_t;
+
+enum {
+ ddb_button_ok,
+ ddb_button_cancel,
+ ddb_button_close,
+ ddb_button_apply,
+ ddb_button_yes,
+ ddb_button_no,
+ ddb_button_max,
+};
+
+typedef struct DB_gui_s {
+ DB_plugin_t plugin;
+
+ // returns response code (ddb_button_*)
+ // buttons is a bitset, e.g. (1<<ddb_button_ok)|(1<<ddb_button_cancel)
+ int (*run_dialog) (ddb_dialog_t *dlg, uint32_t buttons, int (*callback)(int button, void *ctx), void *ctx);
+} DB_gui_t;
+
+// playlist plugin
+typedef struct DB_playlist_s {
+ DB_plugin_t plugin;
+
+ DB_playItem_t * (*load) (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data);
+
+ // will save items from first to last (inclusive)
+ // format is determined by extension
+ // playlist is protected from changes during the call
+ int (*save) (ddb_playlist_t *plt, const char *fname, DB_playItem_t *first, DB_playItem_t *last);
+
+ const char **extensions; // NULL-terminated list of supported file extensions, e.g. {"m3u", "pls", NULL}
+
+ // since 1.5
+#if (DDB_API_LEVEL >= 5)
+ // NOTE: load2 is not used by any existing plugins, and its purpose it lost in history.
+ // Supposedly, it was added to support plugins which could implement cuesheet loading
+ // as a playlist format, which didn't work out.
+ // Generally, it's not recommended to use this, as the behavior is undefined.
+ DB_playItem_t * (*load2) (int visibility, ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort);
+#endif
+} DB_playlist_t;
+
+// NOTE: Media source API is a work in progress, and is disabled in this version of source code.
+// This is to prevent plugin devs from releasing media source plugins, before this API is finalized.
+// Please use the appropriate development branch to test media source plugins.
+// The media source API is a subject to change.
+#if (DDB_API_LEVEL >= 15)
+
+// Mediasource plugin
+// The purpose is to provide access to external media sources.
+// It's used for the built-in media library plugin.
+
+/// Numbers from 0 to 1023 are reserved to base interface, as declared in deadbeef.h
+typedef enum {
+ DDB_MEDIASOURCE_EVENT_CONTENT_DID_CHANGE = 0,
+ DDB_MEDIASOURCE_EVENT_STATE_DID_CHANGE = 1,
+ DDB_MEDIASOURCE_EVENT_ENABLED_DID_CHANGE = 2,
+ DDB_MEDIASOURCE_EVENT_SELECTORS_DID_CHANGE = 3,
+ DDB_MEDIASOURCE_EVENT_OUT_OF_SYNC = 4, // Needs refresh -- e.g. if there are new files in music folders
+} ddb_mediasource_event_type_t;
+
+/// Numbers from 1024 and up can be used by the plugins for additional events.
+#define DDB_MEDIASOURCE_EVENT_MAX 1023
+
+typedef enum {
+ DDB_MEDIASOURCE_STATE_IDLE,
+ DDB_MEDIASOURCE_STATE_LOADING,
+ DDB_MEDIASOURCE_STATE_SCANNING,
+ DDB_MEDIASOURCE_STATE_INDEXING,
+ DDB_MEDIASOURCE_STATE_SAVING,
+} ddb_mediasource_state_t;
+
+typedef void (* ddb_medialib_listener_t)(ddb_mediasource_event_type_t event, void *user_data);
+
+/// Each media source plugin can create source instances for you, by calling @c create_source.
+typedef void *ddb_mediasource_source_t;
+
+/// Abstract type representing a selector for media source query (e.g. Albums, Artists, Genres)
+/// Use @c get_selectors_list method to get the list of available selectors.
+/// Use the values to specify the selector when calling @c create_item_tree.
+typedef struct ddb_mediasource_list_selector_s *ddb_mediasource_list_selector_t;
+
+/// Opaque struct representing the extended API of the underlying plugin. Use @c get_extended_api method to get it.
+typedef struct ddb_mediasource_api_s ddb_mediasource_api_t;
+
+/// Opaque struct representing the item in a tree. Use tree_item_* set of functions to access the values.
+typedef struct ddb_medialib_item_s ddb_medialib_item_t;
+
+/// NOTE: never "subclass" the DB_mediasource_t struct - this is not backwards compatible.
+/// Instead, implement the get_extended_api method to provide access to the plugin API.
+typedef struct {
+ DB_plugin_t plugin;
+
+ /// Get access to the underlying plugin API.
+ /// The returned pointer would have to be cast to the plugin's API structure type.
+ ddb_mediasource_api_t *(*get_extended_api) (void);
+
+ /// The name of the source (e.g. "Media Library").
+ /// This could be used by a UI plugin to display in a list of all available sources.
+ const char *(*source_name) (void);
+
+ /// Create a media source instance. It must be freed after use by calling the @c free_source
+ /// @param source_path a unique name to identify the instance, this will be used to prefix individual instance configuration files, caches, etc.
+ ddb_mediasource_source_t (*create_source) (const char *source_path);
+
+ /// Free the @c source created by @c create_source
+ void (*free_source) (ddb_mediasource_source_t source);
+
+ /// Enable or disable the source
+ void (*set_source_enabled) (ddb_mediasource_source_t source, int enabled);
+
+ /// Get the enabled state
+ int (*is_source_enabled) (ddb_mediasource_source_t source);
+
+ /// This tells the source to start operating with the current configuration.
+ /// It may cancel any current operation, and get the new state with the new settings.
+ /// For example, the medialib plugin is supposed to start the scanner with the current / new settings.
+ /// This source is not supposed to run any operations automatically, and the caller is expected to call refresh
+ /// every time when the plugin configuration changes.
+ /// However, when the source is created - it's may load its initial state.
+ void (*refresh) (ddb_mediasource_source_t source);
+
+ /// A selector is a token, which can be used to find out all top level items that can be queried from the library.
+ /// For example - Folders, Albums, Artists, Genres.
+ /// @return the list of selectors. The caller must free the list after use, by calling @c free_selectors
+ ddb_mediasource_list_selector_t *(*get_selectors_list) (ddb_mediasource_source_t source);
+
+ /// Free the selector list
+ void (*free_selectors_list) (ddb_mediasource_source_t source, ddb_mediasource_list_selector_t *selectors);
+
+ /// Get selector name
+ const char *(*selector_name) (ddb_mediasource_source_t source, ddb_mediasource_list_selector_t selector);
+
+ /// Add event listener. Your callback function will be called every time some event occurs. Such as state change, content update, and so on.
+ /// The callback function may be executed on background thread, so make sure to dispatch to main to update UI.
+ int (*add_listener) (ddb_mediasource_source_t source, ddb_medialib_listener_t listener, void *user_data);
+
+ /// Remove event listener
+ void (*remove_listener) (ddb_mediasource_source_t source, int listener_id);
+
+ /// Create a tree of items for the given @c selector.
+ /// The tree is immutable, and can be used by the caller in any way it needs.
+ /// The caller must free the returned object by calling the @c free_list
+ ddb_medialib_item_t * (*create_item_tree) (ddb_mediasource_source_t source, ddb_mediasource_list_selector_t selector, const char *filter);
+
+ /// Free the tree created by the @c create_list
+ void (*free_item_tree) (ddb_mediasource_source_t source, ddb_medialib_item_t *list);
+
+ /// Whether the scanner/indexer is active
+ ddb_mediasource_state_t (*scanner_state) (ddb_mediasource_source_t source);
+
+ // It is recommended to use the select/expand methods below
+ // to preserve selected/expanded state across medialib refreshes.
+
+ /// Returns 1 if the specified item is selected, 0 otherwise.
+ int (*is_tree_item_selected) (ddb_mediasource_source_t source, const ddb_medialib_item_t *item);
+
+ /// Select/delesect the specified item
+ void (*set_tree_item_selected) (ddb_mediasource_source_t source, const ddb_medialib_item_t *item, int selected);
+
+ /// Returns 1 if the specified item is expanded, 0 otherwise
+ int (*is_tree_item_expanded) (ddb_mediasource_source_t source, const ddb_medialib_item_t *item);
+
+ /// Expand/collapse the specified item
+ void (*set_tree_item_expanded) (ddb_mediasource_source_t source, const ddb_medialib_item_t *item, int expanded);
+
+ /// Returns the text associated with the item, e.g. a genre value, or the artist, etc.
+ const char *(*tree_item_get_text) (const ddb_medialib_item_t *item);
+
+ /// Returns the track associated with the item. Can be null - typically for non-leaf nodes.
+ ddb_playItem_t *(*tree_item_get_track) (const ddb_medialib_item_t *item);
+
+ /// Returns the next item in the list.
+ const ddb_medialib_item_t *(*tree_item_get_next) (const ddb_medialib_item_t *item);
+
+ /// Returns the first item in the list of child items.
+ const ddb_medialib_item_t *(*tree_item_get_children) (const ddb_medialib_item_t *item);
+
+ /// Returns the number of children of this item.
+ int (*tree_item_get_children_count) (const ddb_medialib_item_t *item);
+} DB_mediasource_t;
+
+#endif
+
+#undef DDB_DEPRECATED
+#undef DEPRECATED
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __DEADBEEF_H

deadbeef-1.9.6.tar.bz2/include/deadbeef/fastftoi.h Added

@@ -0,0 +1,180 @@
+// most of the code below was taken from libvorbis/vorbis/lib/os.h
+// under the conditions below
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 *
+ * by the Xiph.Org Foundation http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+contents of the libvorbis COPYING:
+
+Copyright (c) 2002-2008 Xiph.org Foundation
+
+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 name of the Xiph.org Foundation 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 FOUNDATION
+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.
+ */
+#ifndef __OPTMATH_H
+#define __OPTMATH_H
+
+#include <math.h>
+#include <stdint.h>
+
+#ifdef __SSE2__ // that comes from -msse2
+#define __FORCE_SSE2__
+#endif
+
+#ifdef __SSE3__ // that comes from -msse3
+#define __FORCE_SSE3__
+#endif
+
+/* Special i386 GCC implementation */
+#if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__) && !defined(__FORCE_SSE2__)
+# define FPU_CONTROL
+/* both GCC and MSVC are kinda stupid about rounding/casting to int.
+ Because of encapsulation constraints (GCC can't see inside the asm
+ block and so we end up doing stupid things like a store/load that
+ is collectively a noop), we do it this way */
+
+/* we must set up the fpu before this works!! */
+
+typedef int16_t fpu_control;
+
+static inline void fpu_setround(fpu_control *fpu){
+ int16_t ret;
+ int16_t temp;
+ __asm__ __volatile__("fnstcw %0\n\t"
+	 "movw %0,%%dx\n\t"
+	 "orw $62463,%%dx\n\t"
+	 "movw %%dx,%1\n\t"
+	 "fldcw %1\n\t":"=m"(ret):"m"(temp): "dx");
+ *fpu=ret;
+}
+
+static inline void fpu_restore(fpu_control fpu){
+ __asm__ __volatile__("fldcw %0":: "m"(fpu));
+}
+
+/* assumes the FPU is in round mode! */
+static inline int ftoi(double f){ /* yes, double! Otherwise,
+ we get extra fst/fld to
+ truncate precision */
+ int i;
+ __asm__("fistl %0": "=m"(i) : "t"(f));
+ return(i);
+}
+#endif /* Special i386 GCC implementation */
+
+
+/* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the
+ * 64 bit compiler */
+#if defined(_MSC_VER) && !defined(_WIN64)
+# define FPU_CONTROL
+
+typedef int16_t fpu_control;
+
+static __inline int ftoi(double f){
+	int i;
+	__asm{
+		fld f
+		fistp i
+	}
+	return i;
+}
+
+static __inline void fpu_setround(fpu_control *fpu){
+}
+
+static __inline void fpu_restore(fpu_control fpu){
+}
+
+#endif /* Special MSVC 32 bit implementation */
+
+
+#if (defined(__FORCE_SSE3__)) || (defined(_MSC_VER) && defined(_WIN64)) || (defined(__GNUC__) && defined (__x86_64__))
+# define FPU_CONTROL
+
+typedef int16_t fpu_control;
+
+#include <emmintrin.h>
+static __inline int ftoi(float f){
+ return _mm_cvtt_ss2si(_mm_load_ss(&f));
+}
+
+static __inline void fpu_setround(fpu_control *fpu){
+}
+
+static __inline void fpu_restore(fpu_control fpu){
+}
+
+
+/* Optimized code path for x86_64 builds. Uses SSE2 intrinsics. This can be
+ done safely because all x86_64 CPUs supports SSE2. */
+#elif (defined(__FORCE_SSE2__)) || (defined(_MSC_VER) && defined(_WIN64)) || (defined(__GNUC__) && defined (__x86_64__))
+# define FPU_CONTROL
+
+typedef int16_t fpu_control;
+
+#include <emmintrin.h>
+static __inline int ftoi(float f){
+ return _mm_cvtt_ss2si(_mm_load_ss(&f));
+}
+
+static __inline void fpu_setround(fpu_control *fpu){
+}
+
+static __inline void fpu_restore(fpu_control fpu){
+}
+
+#endif /* Special MSVC x64 implementation */
+
+
+/* If no special implementation was found for the current compiler / platform,
+ use the default implementation here: */
+#ifndef FPU_CONTROL
+
+typedef int fpu_control;
+
+static int ftoi(double f){
+ /* Note: MSVC and GCC (at least on some systems) round towards zero, thus,
+ the floor() call is required to ensure correct roudning of
+ negative numbers */
+ return (int)floor(f+.5);
+}
+
+/* We don't have special code for this compiler/arch, so do it the slow way */
+# define fpu_setround(fpu_control) {}
+# define fpu_restore(fpu_control) {}
+
+#endif /* default implementation */
+
+#endif // __OPTMATH_H

deadbeef-1.9.6.tar.bz2/include/deadbeef/strdupa.h Added

@@ -0,0 +1,39 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2014 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __DDB_STRDUPA_H
+#define __DDB_STRDUPA_H
+
+#include <string.h>
+
+#ifndef strdupa
+# define strdupa(s)							 \
+ ({									 \
+ const char *old = (s);					 \
+ size_t len = strlen (old) + 1;				 \
+ char *newstr = (char *) alloca (len);			 \
+ (char *) memcpy (newstr, old, len);				 \
+ })
+#endif
+
+#endif

deadbeef-0.6.2.tar.bz2/install-sh -> deadbeef-1.9.6.tar.bz2/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2014-09-12.12; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,25 +35,21 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 OPTION... -T SRCFILE DSTFILE
@@ -137,42 +122,57 @@
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *''*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *''*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | =!) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -186,6 +186,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | =!) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +198,26 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -211,16 +228,16 @@
 
     *0-7)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -228,9 +245,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | =!) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,51 +269,20 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X$.*^/$//*^/^/*/*$' \| \
-	     X"$dst" : 'X$//$^/' \| \
-	     X"$dst" : 'X$//$$' \| \
-	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X$.*^/$\/\/*^/^/*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$^/.*/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/$.*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
@@ -307,74 +293,81 @@
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *23672367) mkdir_umask=$umask;;
-	  .*00202 | .0202 | .02) mkdir_umask=22;;
-
-	  *0-7)
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *1235670-70-7)
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *23672367) mkdir_umask=$umask;;
+          .*00202 | .0202 | .02) mkdir_umask=22;;
+
+          *0-7)
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *1235670-70-7)
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
+            # lower collision chance
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
+            # that nobody tries to guess the $tmpdir name.
+            if (umask $mkdir_umask &&
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
@@ -384,53 +377,51 @@
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        -=!*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -465,15 +456,12 @@
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -486,24 +474,24 @@
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1

deadbeef-0.6.2.tar.bz2/ltmain.sh -> deadbeef-1.9.6.tar.bz2/ltmain.sh Changed

@@ -1,9 +1,12 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+## by inline-source v2014-01-03.01
 
-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
 # 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, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 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.
 
@@ -23,881 +26,2112 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-# Usage: $progname OPTION... MODE-ARG...
-#
-# Provide generalized library-building support services.
-#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --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
-# --version print version information
-# -h, --help, --help-all print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE. When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-# host-triplet:	$host
-# shell:		$SHELL
-# compiler:		$LTCC
-# compiler flags:		$LTCFLAGS
-# linker:		$LD (gnu? $with_gnu_ld)
-# $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
-# automake:	$automake_version
-# autoconf:	$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
-TIMESTAMP=""
-package_revision=1.3337
+VERSION="2.4.6 Debian-2.4.6-0.1"
+package_revision=2.4.6
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 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.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES 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/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+# . `echo "$0" | ${SED-sed} 's|^/*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
 emulate sh
 NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 # is contrary to our usage. Disable this feature.
 alias -g '${1+"$@"}'='"$@"'
 setopt NO_GLOB_SUBST
 else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
 
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
-	 export $lt_var
-	 lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	 lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ eval "if test set = \"\${$_G_var+set}\"; then
+ save_$_G_var=\$$_G_var
+ $_G_var=C
+	 export $_G_var
+	 _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+	 _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
 	fi"
 done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
 
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp	$nl"
 
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
+
+
+
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
 
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
 
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+}
 
 
+# func_path_progs PROGS_LIST CHECK_FUNC PATH
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+ _G_progs_list=$1
+ _G_check_func=$2
+ _G_PATH=${3-"$PATH"}
+
+ _G_path_prog_max=0
+ _G_path_prog_found=false
+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+ for _G_dir in $_G_PATH; do
+ IFS=$_G_save_IFS
+ test -z "$_G_dir" && _G_dir=.
+ for _G_prog_name in $_G_progs_list; do
+ for _exeext in '' .EXE; do
+ _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+ func_executable_p "$_G_path_prog" || continue
+ case `"$_G_path_prog" --version 2>&1` in
+ *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+ *) $_G_check_func $_G_path_prog
+		 func_path_progs_result=$func_check_prog_result
+		 ;;
+ esac
+ $_G_path_prog_found && break 3
+ done
+ done
+ done
+ IFS=$_G_save_IFS
+ test -z "$func_path_progs_result" && {
+ echo "no acceptable sed could be found in \$PATH" >&2
+ exit 1
+ }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+ _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for _G_i in 1 2 3 4 5 6 7; do
+ _G_sed_script=$_G_sed_script$nl$_G_sed_script
+ done
+ echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+ _G_sed_script=
+
+ func_check_prog_sed ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo '' >> conftest.nl
+ "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+ rm -f conftest.sed
+ SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+ func_check_prog_grep ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ _G_path_prog_max=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo 'GREP' >> conftest.nl
+ "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+ GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables. These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
+
 : ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	 # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
 
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
 
-dirname="s,/^/*$,,"
-basename="s,^.*/,,"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-} # func_dirname may be replaced by extended shell implementation
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
 
+sed_dirname='s|/^/*$||'
+sed_basename='s|^.*/||'
 
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|$`"$\\$|\\\1|g'
 
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/$"`\\$/\\\1/g'
 
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|.^$\\*\/|\\&|g'
 
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes. A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
 
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- 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 may be replaced by extended shell implementation
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same. If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion. Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+ s/$_G_bs4/&\\
+/g
+ s/^$_G_bs2$_G_dollar/$_G_bs&/
+ s/\$^$_G_bs\$$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+ s/\n//g"
 
 
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/$^/*$.*$,\1,'
-pathcdr='s,^/^/*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
+
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
 
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-# value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
- # Start from root dir and reassemble the path.
- func_normal_abspath_result=
- func_normal_abspath_tpath=$1
- func_normal_abspath_altnamespace=
- case $func_normal_abspath_tpath in
- "")
- # Empty path, that just means $cwd.
- func_stripname '' '/' "`pwd`"
- func_normal_abspath_result=$func_stripname_result
- return
- ;;
- # The next three entries are used to spot a run of precisely
- # two leading slashes without using negated character classes;
- # we take advantage of case's first-match behaviour.
- ///*)
- # Unusual form of absolute path, do nothing.
- ;;
- //*)
- # Not necessarily an ordinary path; POSIX reserves leading '//'
- # and for example Cygwin uses it to access remote file shares
- # over CIFS/SMB, so we conserve a leading double slash if found.
- func_normal_abspath_altnamespace=/
- ;;
- /*)
- # Absolute path, do nothing.
- ;;
- *)
- # Relative path, prepend $cwd.
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
- ;;
- esac
- # Cancel out all the simple stuff to save iterations. We also want
- # the path to end with a slash for ease of parsing, so make sure
- # there is one (and only one) here.
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
- while :; do
- # Processed it all yet?
- if test "$func_normal_abspath_tpath" = / ; then
- # If we ascended to the root using ".." the result may be empty now.
- if test -z "$func_normal_abspath_result" ; then
- func_normal_abspath_result=/
- fi
- break
- fi
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcar"`
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcdr"`
- # Figure out what to do with it
- case $func_normal_abspath_tcomponent in
- "")
- # Trailing empty path component, ignore it.
- ;;
- ..)
- # Parent dir; strip last assembled component from result.
- func_dirname "$func_normal_abspath_result"
- func_normal_abspath_result=$func_dirname_result
- ;;
- *)
- # Actual path component, append it.
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
- ;;
- esac
- done
- # Restore leading double-slash if one was found on entry.
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	 # $? = 77 is used to indicate a skipped test to automake.
 
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-# value returned in "$func_relative_path_result"
-func_relative_path ()
-{
- func_relative_path_result=
- func_normal_abspath "$1"
- func_relative_path_tlibdir=$func_normal_abspath_result
- func_normal_abspath "$2"
- func_relative_path_tbindir=$func_normal_abspath_result
-
- # Ascend the tree starting from libdir
- while :; do
- # check if we have found a prefix of bindir
- case $func_relative_path_tbindir in
- $func_relative_path_tlibdir)
- # found an exact match
- func_relative_path_tcancelled=
- break
- ;;
- $func_relative_path_tlibdir*)
- # found a matching prefix
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
- func_relative_path_tcancelled=$func_stripname_result
- if test -z "$func_relative_path_result"; then
- func_relative_path_result=.
- fi
- break
- ;;
- *)
- func_dirname $func_relative_path_tlibdir
- func_relative_path_tlibdir=${func_dirname_result}
- if test "x$func_relative_path_tlibdir" = x ; then
- # Have to descend all the way to the root!
- func_relative_path_result=../$func_relative_path_result
- func_relative_path_tcancelled=$func_relative_path_tbindir
- break
- fi
- func_relative_path_result=../$func_relative_path_result
- ;;
- esac
- done
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+# debug_cmd='eval echo "${FUNCNAME0} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
 
- # Now calculate path; take care to avoid doubling-up slashes.
- func_stripname '' '/' "$func_relative_path_result"
- func_relative_path_result=$func_stripname_result
- func_stripname '/' '/' "$func_relative_path_tcancelled"
- if test "x$func_stripname_result" != x ; then
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
- fi
+# By convention, finish your script with:
+#
+# exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
 
- # Normalisation. If bindir is libdir, return empty string,
- # else relative path ending with a slash; either way, target
- # file name can be directly appended.
- if test ! -z "$func_relative_path_result"; then
- func_stripname './' '' "$func_relative_path_result/"
- func_relative_path_result=$func_stripname_result
- fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
 
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
 
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
 case $progpath in
 \\/*|A-Za-z:\\*) ;;
 *\\/*)
- progdir=$func_dirname_result
+ progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
 progdir=`cd "$progdir" && pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
 ;;
 *)
- save_IFS="$IFS"
+ _G_IFS=$IFS
 IFS=${PATH_SEPARATOR-:}
 for progdir in $PATH; do
- IFS="$save_IFS"
+ IFS=$_G_IFS
 test -x "$progdir/$progname" && break
 done
- IFS="$save_IFS"
+ IFS=$_G_IFS
 test -n "$progdir" || progdir=`pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
 ;;
 esac
 
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/$`"$\\$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$"`\\$/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,.^$\\*\/,\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes. A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
 
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
- s/$bs4/&\\
-/g
- s/^$bs2$dollar/$bs&/
- s/\$^$bs\$$bs2$dollar/\\1$bs2$bs$dollar/g
- s/\n//g"
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
+
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
 
-# Standard options:
 opt_dry_run=false
-opt_help=false
 opt_quiet=false
 opt_verbose=false
-opt_warning=:
 
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+# Categories 'all' and 'none' are always available. Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
+
+# By default, display warnings according to 'opt_warning_types'. Set
+# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
+
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
+
+
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
+
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
+
+
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
+{
+ $debug_cmd
+
+ test -t 1 && {
+ # COLORTERM and USE_ANSI_COLORS environment variables take
+ # precedence, because most terminfo databases neglect to describe
+ # whether color sequences are supported.
+ test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+ if test 1 = "$USE_ANSI_COLORS"; then
+ # Standard ANSI escape sequences
+ tc_reset='&#x1b;0m'
+ tc_bold='&#x1b;1m'; tc_standout='&#x1b;7m'
+ tc_red='&#x1b;31m'; tc_green='&#x1b;32m'
+ tc_blue='&#x1b;34m'; tc_cyan='&#x1b;36m'
+ else
+ # Otherwise trust the terminfo database after all.
+ test -n "`tput sgr0 2>/dev/null`" && {
+ tc_reset=`tput sgr0`
+ test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+ tc_standout=$tc_bold
+ test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+ test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+ test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+ test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+ test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+ }
+ fi
+ }
+
+ require_term_colors=:
 }
 
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
+
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+ # We should try to minimise forks, especially on Windows where they are
+ # unreasonably slow, so skip the feature probes when bash or zsh are
+ # being used:
+ if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+ : ${_G_HAVE_ARITH_OP="yes"}
+ : ${_G_HAVE_XSI_OPS="yes"}
+ # The += operator was introduced in bash 3.1
+ case $BASH_VERSION in
+ 12.* | 3.0 | 3.0*) ;;
+ *)
+ : ${_G_HAVE_PLUSEQ_OP="yes"}
+ ;;
+ esac
+ fi
+
+ # _G_HAVE_PLUSEQ_OP
+ # Can be empty, in which case the shell is probed, "yes" if += is
+ # useable or anything else if it does not work.
+ test -z "$_G_HAVE_PLUSEQ_OP" \
+ && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+ && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_append ()
+ {
+ $debug_cmd
+
+ eval "$1+=\$2"
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_append ()
+ {
+ $debug_cmd
+
+ eval "$1=\$$1\$2"
+ }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+ eval 'func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1+=\\ \$func_quote_for_eval_result"
+ }'
+else
+ func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
+ }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE. For example:
+#
+# func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+ $debug_cmd
+
+ eval _G_current_value='`$ECHO $'$1'`'
+ _G_delim=`expr "$2" : '$.$'`
+
+ case $_G_delim$_G_current_value$_G_delim in
+ *"$2$_G_delim"*) ;;
+ *) func_append "$@" ;;
+ esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+ test -z "$_G_HAVE_ARITH_OP" \
+ && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+ && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+ eval 'func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=$(( $* ))
+ }'
+else
+ func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=`expr "$@"`
+ }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ # If this shell supports suffix pattern removal, then use it to avoid
+ # forking. Hide the definitions single quotes in case the shell chokes
+ # on unsupported syntax...
+ _b='func_basename_result=${1##*/}'
+ _d='case $1 in
+ */*) func_dirname_result=${1%/*}$2 ;;
+ * ) func_dirname_result=$3 ;;
+ esac'
+
+else
+ # ...otherwise fall back to using sed.
+ _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+ _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
+ if test "X$func_dirname_result" = "X$1"; then
+ func_dirname_result=$3
+ else
+ func_append func_dirname_result "$2"
+ fi'
+fi
+
+eval 'func_basename ()
 {
- $opt_verbose && func_echo ${1+"$@"}
+ $debug_cmd
 
- # A bug in bash halts the script if the last line of a function
- # fails when set -e is in force, so we need another command to
- # work around that:
- :
+ '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+ $debug_cmd
+
+ '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+ '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+ $debug_cmd
+
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname: $_G_line"
+ done
+ IFS=$func_echo_IFS
 }
 
-# func_echo_all arg...
+
+# func_echo_all ARG...
+# --------------------
 # Invoke $ECHO with all args, space-separated.
 func_echo_all ()
 {
 $ECHO "$*"
 }
 
-# func_error arg...
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ _G_infix=$1; shift
+ _G_indent=$_G_infix
+ _G_prefix="$progname: $_G_infix: "
+ _G_message=$*
+
+ # Strip color escape sequences before counting printable length
+ for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+ do
+ test -n "$_G_tc" && {
+ _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+ _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+ }
+ done
+ _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
+
+ func_echo_infix_1_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_infix_1_IFS
+ $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+ _G_prefix=$_G_indent
+ done
+ IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
 # Echo program name prefixed message to standard error.
 func_error ()
 {
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
+ $debug_cmd
 
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+ $require_term_colors
 
- # bash bug again:
- :
+ func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
 }
 
-# func_fatal_error arg...
+
+# func_fatal_error ARG...
+# -----------------------
 # Echo program name prefixed message to standard error, and exit.
 func_fatal_error ()
 {
- func_error ${1+"$@"}
- exit $EXIT_FAILURE
-}
+ $debug_cmd
 
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
- func_error ${1+"$@"}
- func_fatal_error "$help"
+ func_error "$*"
+ exit $EXIT_FAILURE
 }
-help="Try \`$progname --help' for more information." ## default
 
 
-# func_grep expression filename
+# func_grep EXPRESSION FILENAME
+# -----------------------------
 # Check whether EXPRESSION matches any line of FILENAME, without output.
 func_grep ()
 {
+ $debug_cmd
+
 $GREP "$1" "$2" >/dev/null 2>&1
 }
 
 
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+ test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=${#1}
+ }'
+else
+ func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+ }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
 # Make sure the entire path to DIRECTORY-PATH is available.
 func_mkdir_p ()
 {
- my_directory_path="$1"
- my_dir_list=
+ $debug_cmd
+
+ _G_directory_path=$1
+ _G_dir_list=
 
- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+ if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
 
- # Protect directory names starting with `-'
- case $my_directory_path in
- -*) my_directory_path="./$my_directory_path" ;;
+ # Protect directory names starting with '-'
+ case $_G_directory_path in
+ -*) _G_directory_path=./$_G_directory_path ;;
 esac
 
 # While some portion of DIR does not yet exist...
- while test ! -d "$my_directory_path"; do
+ while test ! -d "$_G_directory_path"; do
 # ...make a list in topmost first order. Use a colon delimited
 	# list incase some portion of path contains whitespace.
- my_dir_list="$my_directory_path:$my_dir_list"
+ _G_dir_list=$_G_directory_path:$_G_dir_list
 
 # If the last portion added has no slash in it, the list is done
- case $my_directory_path in */*) ;; *) break ;; esac
+ case $_G_directory_path in */*) ;; *) break ;; esac
 
 # ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
 done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
 
- save_mkdir_p_IFS="$IFS"; IFS=':'
- for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
- # mkdir can fail with a `File exist' error if two processes
+ func_mkdir_p_IFS=$IFS; IFS=:
+ for _G_dir in $_G_dir_list; do
+	IFS=$func_mkdir_p_IFS
+ # mkdir can fail with a 'File exist' error if two processes
 # try to create one of the directories concurrently. Don't
 # stop in that case!
- $MKDIR "$my_dir" 2>/dev/null || :
+ $MKDIR "$_G_dir" 2>/dev/null || :
 done
- IFS="$save_mkdir_p_IFS"
+ IFS=$func_mkdir_p_IFS
 
 # Bail out if we (or some other process) failed to create a directory.
- test -d "$my_directory_path" || \
- func_fatal_error "Failed to create \`$1'"
+ test -d "$_G_directory_path" || \
+ func_fatal_error "Failed to create '$1'"
 fi
 }
 
 
-# func_mktempdir string
+# func_mktempdir BASENAME
+# -------------------------
 # Make a temporary directory that won't clash with other running
 # libtool processes, and avoids race conditions if possible. If
-# given, STRING is the basename for that directory.
+# given, BASENAME is the basename for that directory.
 func_mktempdir ()
 {
- my_template="${TMPDIR-/tmp}/${1-$progname}"
+ $debug_cmd
 
- if test "$opt_dry_run" = ":"; then
+ _G_template=${TMPDIR-/tmp}/${1-$progname}
+
+ if test : = "$opt_dry_run"; then
 # Return a directory name, but don't create it in dry-run mode
- my_tmpdir="${my_template}-$$"
+ _G_tmpdir=$_G_template-$$
 else
 
 # If mktemp works, use that first and foremost
- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+ _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
 
- if test ! -d "$my_tmpdir"; then
+ if test ! -d "$_G_tmpdir"; then
 # Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ _G_tmpdir=$_G_template-${RANDOM-0}$$
 
- save_mktempdir_umask=`umask`
+ func_mktempdir_umask=`umask`
 umask 0077
- $MKDIR "$my_tmpdir"
- umask $save_mktempdir_umask
+ $MKDIR "$_G_tmpdir"
+ umask $func_mktempdir_umask
 fi
 
 # If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || \
- func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ test -d "$_G_tmpdir" || \
+ func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
 fi
 
- $ECHO "$my_tmpdir"
+ $ECHO "$_G_tmpdir"
 }
 
 
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
 {
- case $1 in
- *\\\`\"\$*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
- *)
- func_quote_for_eval_unquoted_result="$1" ;;
- esac
+ $debug_cmd
 
- case $func_quote_for_eval_unquoted_result in
- # Double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and and variable
- # expansion for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+ # These SED scripts presuppose an absolute path with a trailing slash.
+ _G_pathcar='s|^/$^/*$.*$|\1|'
+ _G_pathcdr='s|^/^/*||'
+ _G_removedotparts=':dotsl
+		s|/\./|/|g
+		t dotsl
+		s|/\.$|/|'
+ _G_collapseslashes='s|/\{1,\}|/|g'
+ _G_finalslash='s|/*$|/|'
+
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
 ;;
 *)
- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
 esac
+
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test / = "$func_normal_abspath_tpath"; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result"; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+ $debug_cmd
+
+ $opt_quiet || func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+ $debug_cmd
+
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=$func_dirname_result
+ if test -z "$func_relative_path_tlibdir"; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test -n "$func_stripname_result"; then
+ func_append func_relative_path_result "/$func_stripname_result"
+ fi
+
+ # Normalisation. If bindir is libdir, return '.' else relative path.
+ if test -n "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ fi
+
+ test -n "$func_relative_path_result" || func_relative_path_result=.
+
+ :
 }
 
 
-# func_quote_for_expand arg
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+# i) func_quote_for_eval_result
+# double-quoted, suitable for a subsequent eval
+# ii) func_quote_for_eval_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified.
+func_quote_for_eval ()
+{
+ $debug_cmd
+
+ func_quote_for_eval_unquoted_result=
+ func_quote_for_eval_result=
+ while test 0 -lt $#; do
+ case $1 in
+ *\\\`\"\$*)
+	 _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
+ if test -n "$func_quote_for_eval_unquoted_result"; then
+	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+ else
+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ fi
+
+ case $_G_unquoted_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
+ _G_quoted_arg=\"$_G_unquoted_arg\"
+ ;;
+ *)
+ _G_quoted_arg=$_G_unquoted_arg
+	 ;;
+ esac
+
+ if test -n "$func_quote_for_eval_result"; then
+	func_append func_quote_for_eval_result " $_G_quoted_arg"
+ else
+ func_append func_quote_for_eval_result "$_G_quoted_arg"
+ fi
+ shift
+ done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
 # Aesthetically quote ARG to be evaled later; same as above,
 # but do not quote variable references.
 func_quote_for_expand ()
 {
+ $debug_cmd
+
 case $1 in
 *\\\`\"*)
-	my_arg=`$ECHO "$1" | $SED \
-	 -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+	_G_arg=`$ECHO "$1" | $SED \
+	 -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
 *)
- my_arg="$1" ;;
+ _G_arg=$1 ;;
 esac
 
- case $my_arg in
+ case $_G_arg in
 # Double-quote args containing shell metacharacters to delay
 # word splitting and command substitution for a subsequent eval.
 # Many Bourne shells cannot handle close brackets correctly
 # in scan sets, so we specify it separately.
 *\\~\#\^\&\*\{\}\|\;\<\>\?\'\ \	*|**|"")
- my_arg="\"$my_arg\""
+ _G_arg=\"$_G_arg\"
 ;;
 esac
 
- func_quote_for_expand_result="$my_arg"
+ func_quote_for_expand_result=$_G_arg
 }
 
 
-# func_show_eval cmd fail_exp
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_stripname ()
+ {
+ $debug_cmd
+
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary variable first.
+ func_stripname_result=$3
+ func_stripname_result=${func_stripname_result#"$1"}
+ func_stripname_result=${func_stripname_result%"$2"}
+ }'
+else
+ func_stripname ()
+ {
+ $debug_cmd
+
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+ esac
+ }
+fi
+
+
+# func_show_eval CMD FAIL_EXP
+# -----------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
 # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it.
 func_show_eval ()
 {
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
 
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ func_quote_for_expand "$_G_cmd"
+ eval "func_notquiet $func_quote_for_expand_result"
 
- if ${opt_dry_run-false}; then :; else
- eval "$my_cmd"
- my_status=$?
- if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
+ $opt_dry_run || {
+ eval "$_G_cmd"
+ _G_status=$?
+ if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
 fi
- fi
+ }
 }
 
 
-# func_show_eval_locale cmd fail_exp
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
+# func_show_eval_locale CMD FAIL_EXP
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
 # not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
 # is given, then evaluate it. Use the saved locale for evaluation.
 func_show_eval_locale ()
 {
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
 
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
+ $opt_quiet || {
+ func_quote_for_expand "$_G_cmd"
 eval "func_echo $func_quote_for_expand_result"
 }
 
- if ${opt_dry_run-false}; then :; else
- eval "$lt_user_locale
-	 $my_cmd"
- my_status=$?
- eval "$lt_safe_locale"
- if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
+ $opt_dry_run || {
+ eval "$_G_user_locale
+	 $_G_cmd"
+ _G_status=$?
+ eval "$_G_safe_locale"
+ if test 0 -ne "$_G_status"; then
+	eval "(exit $_G_status); $_G_fail_exp"
 fi
- fi
+ }
 }
 
+
 # func_tr_sh
+# ----------
 # Turn $1 into a string suitable for a shell variable name.
 # Result is stored in $func_tr_sh_result. All characters
 # not in the set a-zA-Z0-9_ are replaced with '_'. Further,
 # if $1 begins with a digit, a '_' is prepended as well.
 func_tr_sh ()
 {
- case $1 in
- 0-9* | *!a-zA-Z0-9_*)
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^$0-9$/_\1/; s/^a-zA-Z0-9_/_/g'`
- ;;
- * )
- func_tr_sh_result=$1
- ;;
- esac
+ $debug_cmd
+
+ case $1 in
+ 0-9* | *!a-zA-Z0-9_*)
+ func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^$0-9$/_\1/' -e 's/^a-zA-Z0-9_/_/g'`
+ ;;
+ * )
+ func_tr_sh_result=$1
+ ;;
+ esac
 }
 
 
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
 {
- $opt_debug
+ $debug_cmd
 
- $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	 N
-	 s/\n# / /
-	 b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //
-	s/^# *$//
- s/$(C)$ 0-9,-*$ 1-90-9*$/\1\2/
- p
- }' < "$progpath"
- exit $?
+ $opt_verbose && func_echo "$*"
+
+ :
 }
 
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
 {
- $opt_debug
+ $debug_cmd
 
- $SED -n '/^# Usage:/,/^# *.*--help/ {
- s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
- }' < "$progpath"
- echo
- $ECHO "run \`$progname --help | more' for full usage"
- exit $?
+ $require_term_colors
+
+ func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+ $debug_cmd
+
+ # CATEGORY must be in the warning_categories list!
+ case " $warning_categories " in
+ *" $1 "*) ;;
+ *) func_internal_error "invalid warning category '$1'" ;;
+ esac
+
+ _G_category=$1
+ shift
+
+ case " $opt_warning_types " in
+ *" $_G_category "*) $warning_func ${1+"$@"} ;;
+ esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+ $debug_cmd
+
+ printf '%s\n%s\n' "$1" "$2" \
+ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false. Use it like this:
+#
+# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+ $debug_cmd
+
+ test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 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.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+# #!/bin/sh
+# . relative/path/to/funclib.sh
+# . relative/path/to/options-parser
+# scriptversion=1.0
+# func_options ${1+"$@"}
+# eval set dummy "$func_options_result"; shift
+# ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath OPTION...'
+
+# Short help message in response to '-h' and '--help'. Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+ --debug enable verbose shell tracing
+ -W, --warnings=CATEGORY
+ report the warnings falling in CATEGORY all
+ -v, --verbose verbosely report processing
+ --version print version information and exit
+ -h, --help print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+ 'all' show all warnings
+ 'none' turn off all the warnings
+ 'error' warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code. A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+ $debug_cmd
+
+ func_append hookable_fns " $1"
 }
 
-# func_help NOEXIT
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not accept hook functions." ;;
+ esac
+
+ eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+ $debug_cmd
+
+ eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME ARG...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+ esac
+
+ eval _G_hook_fns=\$$1_hooks; shift
+
+ for _G_hook in $_G_hook_fns; do
+ eval $_G_hook '"$@"'
+
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
+ done
+
+ func_quote_for_eval ${1+"$@"}
+ func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'. Like this:
+#
+# my_options_prep ()
+# {
+# $debug_cmd
+#
+# # Extend the existing usage message.
+# usage_message=$usage_message'
+# -s, --silent don'\''t print informational messages
+# '
+#
+# func_quote_for_eval ${1+"$@"}
+# my_options_prep_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_options_prep my_options_prep
+#
+#
+# my_silent_option ()
+# {
+# $debug_cmd
+#
+# # Note that for efficiency, we parse as many options as we can
+# # recognise in a loop before passing the remainder back to the
+# # caller on the first unrecognised argument we encounter.
+# while test $# -gt 0; do
+# opt=$1; shift
+# case $opt in
+# --silent|-s) opt_silent=: ;;
+# # Separate non-argument short options:
+# -s*) func_split_short_opt "$_G_opt"
+# set dummy "$func_split_short_opt_name" \
+# "-$func_split_short_opt_arg" ${1+"$@"}
+# shift
+# ;;
+# *) set dummy "$_G_opt" "$*"; shift; break ;;
+# esac
+# done
+#
+# func_quote_for_eval ${1+"$@"}
+# my_silent_option_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_parse_options my_silent_option
+#
+#
+# my_option_validation ()
+# {
+# $debug_cmd
+#
+# $opt_silent && $opt_verbose && func_fatal_help "\
+# '--silent' and '--verbose' options are mutually exclusive."
+#
+# func_quote_for_eval ${1+"$@"}
+# my_option_validation_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse. It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options ARG...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+ $debug_cmd
+
+ func_options_prep ${1+"$@"}
+ eval func_parse_options \
+ ${func_options_prep_result+"$func_options_prep_result"}
+ eval func_validate_options \
+ ${func_parse_options_result+"$func_parse_options_result"}
+
+ eval func_run_hooks func_options \
+ ${func_validate_options_result+"$func_validate_options_result"}
+
+ # save modified positional parameters for caller
+ func_options_result=$func_run_hooks_result
+}
+
+
+# func_options_prep ARG...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters. If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
+{
+ $debug_cmd
+
+ # Option defaults:
+ opt_verbose=false
+ opt_warning_types=
+
+ func_run_hooks func_options_prep ${1+"$@"}
+
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
+}
+
+
+# func_parse_options ARG...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
+{
+ $debug_cmd
+
+ func_parse_options_result=
+
+ # this just eases exit handling
+ while test $# -gt 0; do
+ # Defer to hook functions for initial option parsing, so they
+ # get priority in the event of reusing an option name.
+ func_run_hooks func_parse_options ${1+"$@"}
+
+ # Adjust func_parse_options positional parameters to match
+ eval set dummy "$func_run_hooks_result"; shift
+
+ # Break out of the loop if we already parsed every option.
+ test $# -gt 0 || break
+
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --debug|-x) debug_cmd='set -x'
+ func_echo "enabling shell trace mode"
+ $debug_cmd
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ set dummy --warnings none ${1+"$@"}
+ shift
+		 ;;
+
+ --warnings|--warning|-W)
+ test $# = 0 && func_missing_arg $_G_opt && break
+ case " $warning_categories $1" in
+ *" $1 "*)
+ # trailing space prevents matching last $1 above
+ func_append_uniq opt_warning_types " $1"
+ ;;
+ *all)
+ opt_warning_types=$warning_categories
+ ;;
+ *none)
+ opt_warning_types=none
+ warning_func=:
+ ;;
+ *error)
+ opt_warning_types=$warning_categories
+ warning_func=func_fatal_error
+ ;;
+ *)
+ func_fatal_error \
+ "unsupported warning category: '$1'"
+ ;;
+ esac
+ shift
+ ;;
+
+ --verbose|-v) opt_verbose=: ;;
+ --version) func_version ;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+
+	# Separate optargs to long options (plugins may need this):
+	--*=*) func_split_equals "$_G_opt"
+	 set dummy "$func_split_equals_lhs" \
+ "$func_split_equals_rhs" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate optargs to short options:
+ -W*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate non-argument short options:
+ -\?*|-h*|-v*|-x*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "-$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ --) break ;;
+ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
+
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ func_parse_options_result=$func_quote_for_eval_result
+}
+
+
+# func_validate_options ARG...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
+{
+ $debug_cmd
+
+ # Display all warnings if -W was not given.
+ test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
+
+ func_run_hooks func_validate_options ${1+"$@"}
+
+ # Bail if the options were screwed!
+ $exit_cmd $EXIT_FAILURE
+
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
+}
+
+
+
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
+
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+ $debug_cmd
+
+ eval \$ECHO \""Usage: $usage"\"
+ eval \$ECHO \""$fatal_help"\"
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
+}
+
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
 func_help ()
 {
- $opt_debug
+ $debug_cmd
 
- $SED -n '/^# Usage:/,/# Report bugs to/ {
-	:print
- s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
-	p
-	d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ func_usage_message
+ $ECHO "$long_help_message"
+ exit 0
 }
 
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
 # Echo program name prefixed message to standard error and set global
 # exit_cmd.
 func_missing_arg ()
 {
- $opt_debug
+ $debug_cmd
 
- func_error "missing argument for $1."
+ func_error "Missing argument for '$1'."
 exit_cmd=exit
 }
 
 
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=${1%%=*}
+ func_split_equals_rhs=${1#*=}
+ test "x$func_split_equals_lhs" = "x$1" \
+ && func_split_equals_rhs=
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=`expr "x$1" : 'x$^=*$'`
+ func_split_equals_rhs=
+ test "x$func_split_equals_lhs" = "x$1" \
+ || func_split_equals_rhs=`expr "x$1" : 'x^=*=$.*$$'`
+ }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
 # Set func_split_short_opt_name and func_split_short_opt_arg shell
 # variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_arg=${1#??}
+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_name=`expr "x$1" : 'x-$.$'`
+ func_split_short_opt_arg=`expr "x$1" : 'x-.$.*$$'`
+ }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
 {
- my_sed_short_opt='1s/^$..$.*$/\1/;q'
- my_sed_short_rest='1s/^..$.*$$/\1/;q'
+ $debug_cmd
 
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+ func_usage_message
+ $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+ exit 0
+}
 
 
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
 {
- my_sed_long_opt='1s/^$--^=*$=.*/\1/;q'
- my_sed_long_arg='1s/^--^=*=//'
+ $debug_cmd
 
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
+ eval \$ECHO \""Usage: $usage"\"
+ echo
+ $SED -n 's|^# ||
+ /^Written by/{
+ x;p;x
+ }
+	h
+	/^Written by/q' < "$progpath"
+ echo
+ eval \$ECHO \""$usage_message"\"
+}
 
-exit_cmd=:
 
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $debug_cmd
 
+ printf '%s\n' "$progname $scriptversion"
+ $SED -n '
+ /(C)/!b go
+ :more
+ /\./!{
+ N
+ s|\n# | |
+ b more
+ }
+ :go
+ /^# Written by /,/# warranty; / {
+ s|^# ||
+ s|^# *$||
+ s|$(C)$ 0-9,-* ,-$1-90-9* $|\1 \2|
+ p
+ }
+ /^# Written by / {
+ s|^# ||
+ p
+ }
+ /^warranty; /q' < "$progpath"
 
+ exit $?
+}
 
 
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
 
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
 
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
 
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
 {
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+ $debug_cmd
 
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
 
 
-# func_arith arithmetic-term...
-func_arith ()
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
 {
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+ $debug_cmd
 
+ $warning_func ${1+"$@"}
+}
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
 
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath OPTION... MODE-ARG...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+ --config show all configuration variables
+ --debug enable verbose shell tracing
+ -n, --dry-run display commands without modifying any files
+ --features display basic configuration information and exit
+ --mode=MODE use operation mode MODE
+ --no-warnings equivalent to '-Wnone'
+ --preserve-dup-deps don't remove duplicate dependency libraries
+ --quiet, --silent don't print informational messages
+ --tag=TAG use configuration variables from tag TAG
+ -v, --verbose print more informational messages than default
+ --version print version information
+ -W, --warnings=CATEGORY report the warnings falling in CATEGORY all
+ -h, --help, --help-all print short, long, or detailed help message
+"
 
-# func_lo2o object
-func_lo2o ()
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
 {
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+ $debug_cmd
 
+ func_usage_message
+ $ECHO "$long_help_message
 
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.^.*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+MODE must be one of the following:
 
+ clean remove files from the build directory
+ compile compile a source file into a libtool object
+ execute automatically set library path, then run a program
+ finish complete the installation of libtool libraries
+ install install libraries or executables
+ link create a library or an executable
+ uninstall remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE. When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+ host-triplet: $host
+ shell: $SHELL
+ compiler: $LTCC
+ compiler flags: $LTCFLAGS
+ linker: $LD (gnu? $with_gnu_ld)
+ version: $progname (GNU libtool) 2.4.6
+ automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+ autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+ exit 0
+}
+
+
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_lo2o ()
+ {
+ case $1 in
+ *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+ * ) func_lo2o_result=$1 ;;
+ esac
+ }'
 
-# func_fatal_configuration arg...
+ # func_xform LIBOBJ-OR-SOURCE
+ # ---------------------------
+ # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+ # suffix to a '.lo' libtool-object suffix.
+ eval 'func_xform ()
+ {
+ func_xform_result=${1%.*}.lo
+ }'
+else
+ # ...otherwise fall back to using sed.
+ func_lo2o ()
+ {
+ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+ }
+
+ func_xform ()
+ {
+ func_xform_result=`$ECHO "$1" | $SED 's|\.^.*$|.lo|'`
+ }
+fi
+
+
+# func_fatal_configuration ARG...
+# -------------------------------
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
 func_fatal_configuration ()
 {
- func_error ${1+"$@"}
- func_error "See the $PACKAGE documentation for more information."
- func_fatal_error "Fatal configuration error."
+ func__fatal_error ${1+"$@"} \
+ "See the $PACKAGE documentation for more information." \
+ "Fatal configuration error."
 }
 
 
 # func_config
+# -----------
 # Display the configuration for all the tags in this script.
 func_config ()
 {
@@ -915,17 +2149,19 @@
 exit $?
 }
 
+
 # func_features
+# -------------
 # Display the features supported by this script.
 func_features ()
 {
 echo "host: $host"
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
 echo "enable shared libraries"
 else
 echo "disable shared libraries"
 fi
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
 echo "enable static libraries"
 else
 echo "disable static libraries"
@@ -934,314 +2170,350 @@
 exit $?
 }
 
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
 # Verify that TAGNAME is valid, and either flag an error and exit, or
 # enable the TAGNAME tag. We also add TAGNAME to the global $taglist
 # variable here.
 func_enable_tag ()
 {
- # Global variable:
- tagname="$1"
+ # Global variable:
+ tagname=$1
 
- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
- sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
- # Validate tagname.
- case $tagname in
- *!-_A-Za-z0-9,/*)
- func_fatal_error "invalid tag name: $tagname"
- ;;
- esac
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf=/$re_begincf/,/$re_endcf/p
+
+ # Validate tagname.
+ case $tagname in
+ *!-_A-Za-z0-9,/*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
 
- # Don't test for the "default" C tag, as we know it's
- # there but not specially marked.
- case $tagname in
- CC) ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
 *)
- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	 taglist="$taglist $tagname"
 
-	# Evaluate the configuration. Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
- else
-	func_error "ignoring unknown tag $tagname"
- fi
- ;;
- esac
+	 # Evaluate the configuration. Be careful to quote the path
+	 # and the sed script, to avoid splitting on whitespace, but
+	 # also don't use non-portable quotes within backquotes within
+	 # quotes we have to do it in 2 steps:
+	 extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	 eval "$extractedcf"
+ else
+	 func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ esac
 }
 
+
 # func_check_version_match
+# ------------------------
 # Ensure that we are using m4 macros, and libtool script from the same
 # release of libtool.
 func_check_version_match ()
 {
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
 $progname: Version mismatch error. This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from an older release.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
- else
- cat >&2 <<_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
 $progname: Version mismatch error. This is $PACKAGE $VERSION, but the
 $progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
 $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 $progname: and run autoconf again.
 _LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
 $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
 $progname: but the definition of this LT_INIT comes from revision $macro_revision.
 $progname: You should recreate aclocal.m4 with macros from revision $package_revision
 $progname: of $PACKAGE $VERSION and run autoconf again.
 _LT_EOF
- fi
+ fi
 
- exit $EXIT_MISMATCH
- fi
+ exit $EXIT_MISMATCH
+ fi
 }
 
 
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
-compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
-execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
-finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
-install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
-link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-esac
+# libtool_options_prep ARG...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+ $debug_mode
 
+ # Option defaults:
+ opt_config=false
+ opt_dlopen=
+ opt_dry_run=false
+ opt_help=false
+ opt_mode=
+ opt_preserve_dup_deps=false
+ opt_quiet=false
 
+ nonopt=
+ preserve_args=
 
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+ esac
 
+ # Pass back the list of options.
+ func_quote_for_eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
 
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
- # this just eases exit handling
- while test $# -gt 0; do
- opt="$1"
- shift
- case $opt in
- --debug|-x)	opt_debug='set -x'
-			func_echo "enabling shell trace mode"
-			$opt_debug
-			;;
- --dry-run|--dryrun|-n)
-			opt_dry_run=:
-			;;
- --config)
-			opt_config=:
-func_config
-			;;
- --dlopen|-dlopen)
-			optarg="$1"
-			opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
-			shift
-			;;
- --preserve-dup-deps)
-			opt_preserve_dup_deps=:
-			;;
- --features)
-			opt_features=:
-func_features
-			;;
- --finish)
-			opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-			;;
- --help)
-			opt_help=:
-			;;
- --help-all)
-			opt_help_all=:
-opt_help=': help-all'
-			;;
- --mode)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_mode="$optarg"
-case $optarg in
- # Valid mode arguments:
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
-esac
-			shift
-			;;
- --no-silent|--no-quiet)
-			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"
-			;;
- --silent|--quiet)
-			opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
-			;;
- --verbose|-v)
-			opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
-			;;
- --tag)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
-			shift
-			;;
-
- -\?|-h)		func_usage				;;
- --help)		func_help				;;
- --version)	func_version				;;
-
- # Separate optargs to long options:
- --*=*)
-			func_split_long_opt "$opt"
-			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-			shift
-			;;
-
- # Separate non-argument short options:
- -\?*|-h*|-n*|-v*)
-			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-			shift
-			;;
-
- --)		break					;;
- -*)		func_fatal_help "unrecognized option \`$opt'" ;;
- *)		set dummy "$opt" ${1+"$@"};	shift; break ;;
- esac
- done
 
- # Validate options:
+# libtool_parse_options ARG...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
+{
+ $debug_cmd
 
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
+ # Perform our own loop to consume as many options as possible in
+ # each iteration.
+ while test $# -gt 0; do
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
+ ;;
+
+ --config) func_config ;;
+
+ --dlopen|-dlopen)
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_preserve_dup_deps=: ;;
+
+ --features) func_features ;;
+
+ --finish) set dummy --mode finish ${1+"$@"}; shift ;;
+
+ --help) opt_help=: ;;
+
+ --help-all) opt_help=': help-all' ;;
+
+ --mode) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_mode=$1
+ case $1 in
+ # Valid mode arguments:
+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $_G_opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+ shift
+ ;;
+
+ --no-silent|--no-quiet)
+ opt_quiet=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ opt_warning=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-verbose)
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --silent|--quiet)
+ opt_quiet=:
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --tag) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_tag=$1
+ func_append preserve_args " $_G_opt $1"
+ func_enable_tag "$1"
+ shift
+ ;;
+
+ --verbose|-v) opt_quiet=false
+ opt_verbose=:
+ func_append preserve_args " $_G_opt"
+ ;;
 
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
+	# An option not handled by this hook function:
+ *)		set dummy "$_G_opt" ${1+"$@"};	shift; break ;;
+ esac
+ done
 
- case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
- ;;
- esac
 
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
 
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
- fi
 
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
 
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
+# libtool_validate_options ARG...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+ # save first non-option argument
+ if test 0 -lt $#; then
+ nonopt=$1
+ shift
 fi
 
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
+ # preserve --debug
+ test : = "$debug_cmd" || func_append preserve_args " --debug"
+
+ case $host in
+ # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+ # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ ;;
+ esac
 
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+
+ test yes != "$build_libtool_libs" \
+ && test yes != "$build_old_libs" \
+ && func_fatal_configuration "not configured to build any kind of library"
+
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+ func_error "unrecognized option '-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+ generic_help=$help
+ help="Try '$progname --help --mode=$opt_mode' for more information."
+ }
 
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
+ # Pass back the unparsed argument list
+ func_quote_for_eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_for_eval_result
 }
+func_add_hook func_validate_options libtool_validate_options
 
 
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
 
 
 ## ----------- ##
 ## Main. ##
 ## ----------- ##
 
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+ $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
 # func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function is only a basic sanity check; it will hardly flush out
 # determined imposters.
 func_lalib_p ()
 {
 test -f "$1" &&
- $SED -e 4q "$1" 2>/dev/null \
- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+ $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
 # This function implements the same check as func_lalib_p without
 # resorting to external programs. To this end, it redirects stdin and
 # closes it afterwards, without saving the original file descriptor.
 # As a safety measure, use it only where a negative result would be
-# fatal anyway. Works if `file' does not exist.
+# fatal anyway. Works if 'file' does not exist.
 func_lalib_unsafe_p ()
 {
 lalib_p=no
@@ -1249,13 +2521,13 @@
 	for lalib_p_l in 1 2 3 4
 	do
 	 read lalib_p_line
-	 case "$lalib_p_line" in
+	 case $lalib_p_line in
 		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
 	 esac
 	done
 	exec 0<&5 5<&-
 fi
- test "$lalib_p" = yes
+ test yes = "$lalib_p"
 }
 
 # func_ltwrapper_script_p file
@@ -1264,7 +2536,8 @@
 # determined imposters.
 func_ltwrapper_script_p ()
 {
- func_lalib_p "$1"
+ test -f "$1" &&
+ $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
 }
 
 # func_ltwrapper_executable_p file
@@ -1289,7 +2562,7 @@
 {
 func_dirname_and_basename "$1" "" "."
 func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
 }
 
 # func_ltwrapper_p file
@@ -1308,11 +2581,13 @@
 # FAIL_CMD may read-access the current command in variable CMD!
 func_execute_cmds ()
 {
- $opt_debug
+ $debug_cmd
+
 save_ifs=$IFS; IFS='~'
 for cmd in $1; do
- IFS=$save_ifs
+ IFS=$sp$nl
 eval cmd=\"$cmd\"
+ IFS=$save_ifs
 func_show_eval "$cmd" "${2-:}"
 done
 IFS=$save_ifs
@@ -1324,10 +2599,11 @@
 # Note that it is not necessary on cygwin/mingw to append a dot to
 # FILE even if both FILE and FILE.exe exist: automatic-append-.exe
 # behavior happens only for exec(3), not for open(2)! Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
 func_source ()
 {
- $opt_debug
+ $debug_cmd
+
 case $1 in
 */* | *\\*)	. "$1" ;;
 *)		. "./$1" ;;
@@ -1354,10 +2630,10 @@
 # store the result into func_replace_sysroot_result.
 func_replace_sysroot ()
 {
- case "$lt_sysroot:$1" in
+ case $lt_sysroot:$1 in
 ?*:"$lt_sysroot"*)
 func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
+ func_replace_sysroot_result='='$func_stripname_result
 ;;
 *)
 # Including no sysroot.
@@ -1374,7 +2650,8 @@
 # arg is usually of the form 'gcc ...'
 func_infer_tag ()
 {
- $opt_debug
+ $debug_cmd
+
 if test -n "$available_tags" && test -z "$tagname"; then
 CC_quoted=
 for arg in $CC; do
@@ -1393,7 +2670,7 @@
 	for z in $available_tags; do
 	 if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
 	 # Evaluate the configuration.
-	 eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	 eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
 	 CC_quoted=
 	 for arg in $CC; do
 	 # Double-quote args containing other shell metacharacters.
@@ -1418,7 +2695,7 @@
 	# line option must be used.
 	if test -z "$tagname"; then
 	 func_echo "unable to infer tagged configuration"
-	 func_fatal_error "specify a tag with \`--tag'"
+	 func_fatal_error "specify a tag with '--tag'"
 #	else
 #	 func_verbose "using $tagname tagged configuration"
 	fi
@@ -1434,15 +2711,15 @@
 # but don't create it if we're doing a dry run.
 func_write_libtool_object ()
 {
- write_libobj=${1}
- if test "$build_libtool_libs" = yes; then
- write_lobj=\'${2}\'
+ write_libobj=$1
+ if test yes = "$build_libtool_libs"; then
+ write_lobj=\'$2\'
 else
 write_lobj=none
 fi
 
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
+ if test yes = "$build_old_libs"; then
+ write_oldobj=\'$3\'
 else
 write_oldobj=none
 fi
@@ -1450,7 +2727,7 @@
 $opt_dry_run || {
 cat >${write_libobj}T <<EOF
 # $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -1462,7 +2739,7 @@
 non_pic_object=$write_oldobj
 
 EOF
- $MV "${write_libobj}T" "${write_libobj}"
+ $MV "${write_libobj}T" "$write_libobj"
 }
 }
 
@@ -1482,8 +2759,9 @@
 # be empty on error (or when ARG is empty)
 func_convert_core_file_wine_to_w32 ()
 {
- $opt_debug
- func_convert_core_file_wine_to_w32_result="$1"
+ $debug_cmd
+
+ func_convert_core_file_wine_to_w32_result=$1
 if test -n "$1"; then
 # Unfortunately, winepath does not exit with a non-zero error code, so we
 # are forced to check the contents of stdout. On the other hand, if the
@@ -1491,9 +2769,9 @@
 # *an error message* to stdout. So we must check for both error code of
 # zero AND non-empty stdout, which explains the odd construction:
 func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+ if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
 func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- $SED -e "$lt_sed_naive_backslashify"`
+ $SED -e "$sed_naive_backslashify"`
 else
 func_convert_core_file_wine_to_w32_result=
 fi
@@ -1514,18 +2792,19 @@
 # are convertible, then the result may be empty.
 func_convert_core_path_wine_to_w32 ()
 {
- $opt_debug
+ $debug_cmd
+
 # unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
+ func_convert_core_path_wine_to_w32_result=
 if test -n "$1"; then
 oldIFS=$IFS
 IFS=:
 for func_convert_core_path_wine_to_w32_f in $1; do
 IFS=$oldIFS
 func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+ if test -n "$func_convert_core_file_wine_to_w32_result"; then
 if test -z "$func_convert_core_path_wine_to_w32_result"; then
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+ func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
 else
 func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
 fi
@@ -1554,7 +2833,8 @@
 # environment variable; do not put it in $PATH.
 func_cygpath ()
 {
- $opt_debug
+ $debug_cmd
+
 if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
 func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
 if test "$?" -ne 0; then
@@ -1563,7 +2843,7 @@
 fi
 else
 func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
 fi
 }
 #end: func_cygpath
@@ -1574,10 +2854,11 @@
 # result in func_convert_core_msys_to_w32_result.
 func_convert_core_msys_to_w32 ()
 {
- $opt_debug
+ $debug_cmd
+
 # awkward: cmd appends spaces to result
 func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/ *$//' -e "$lt_sed_naive_backslashify"`
+ $SED -e 's/ *$//' -e "$sed_naive_backslashify"`
 }
 #end: func_convert_core_msys_to_w32
 
@@ -1588,13 +2869,14 @@
 # func_to_host_file_result to ARG1).
 func_convert_file_check ()
 {
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
+ $debug_cmd
+
+ if test -z "$2" && test -n "$1"; then
 func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
+ func_error " '$1'"
 func_error "Continuing, but uninstalled executables may not work."
 # Fallback:
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
 fi
 }
 # end func_convert_file_check
@@ -1606,10 +2888,11 @@
 # func_to_host_file_result to a simplistic fallback value (see below).
 func_convert_path_check ()
 {
- $opt_debug
+ $debug_cmd
+
 if test -z "$4" && test -n "$3"; then
 func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
+ func_error " '$3'"
 func_error "Continuing, but uninstalled executables may not work."
 # Fallback. This is a deliberately simplistic "conversion" and
 # should not be "improved". See libtool.info.
@@ -1618,7 +2901,7 @@
 func_to_host_path_result=`echo "$3" |
 $SED -e "$lt_replace_pathsep_chars"`
 else
- func_to_host_path_result="$3"
+ func_to_host_path_result=$3
 fi
 fi
 }
@@ -1630,9 +2913,10 @@
 # and appending REPL if ORIG matches BACKPAT.
 func_convert_path_front_back_pathsep ()
 {
- $opt_debug
+ $debug_cmd
+
 case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ $1 ) func_to_host_path_result=$3$func_to_host_path_result
 ;;
 esac
 case $4 in
@@ -1646,7 +2930,7 @@
 ##################################################
 # $build to $host FILE NAME CONVERSION FUNCTIONS #
 ##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
 #
 # In each case, ARG is the path to be converted from $build to $host format.
 # Result will be available in $func_to_host_file_result.
@@ -1657,7 +2941,8 @@
 # in func_to_host_file_result.
 func_to_host_file ()
 {
- $opt_debug
+ $debug_cmd
+
 $to_host_file_cmd "$1"
 }
 # end func_to_host_file
@@ -1669,7 +2954,8 @@
 # in (the comma separated) LAZY, no conversion takes place.
 func_to_tool_file ()
 {
- $opt_debug
+ $debug_cmd
+
 case ,$2, in
 *,"$to_tool_file_cmd",*)
 func_to_tool_file_result=$1
@@ -1687,7 +2973,7 @@
 # Copy ARG to func_to_host_file_result.
 func_convert_file_noop ()
 {
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
 }
 # end func_convert_file_noop
 
@@ -1698,11 +2984,12 @@
 # func_to_host_file_result.
 func_convert_file_msys_to_w32 ()
 {
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
 if test -n "$1"; then
 func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result=$func_convert_core_msys_to_w32_result
 fi
 func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1714,8 +3001,9 @@
 # func_to_host_file_result.
 func_convert_file_cygwin_to_w32 ()
 {
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
 if test -n "$1"; then
 # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
 # LT_CYGPATH in this case.
@@ -1731,11 +3019,12 @@
 # and a working winepath. Returns result in func_to_host_file_result.
 func_convert_file_nix_to_w32 ()
 {
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
 if test -n "$1"; then
 func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
 fi
 func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1747,12 +3036,13 @@
 # Returns result in func_to_host_file_result.
 func_convert_file_msys_to_cygwin ()
 {
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
 if test -n "$1"; then
 func_convert_core_msys_to_w32 "$1"
 func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
 fi
 func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1765,13 +3055,14 @@
 # in func_to_host_file_result.
 func_convert_file_nix_to_cygwin ()
 {
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
 if test -n "$1"; then
 # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
 func_convert_core_file_wine_to_w32 "$1"
 func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
 fi
 func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -1781,7 +3072,7 @@
 #############################################
 # $build to $host PATH CONVERSION FUNCTIONS #
 #############################################
-# invoked via `$to_host_path_cmd ARG'
+# invoked via '$to_host_path_cmd ARG'
 #
 # In each case, ARG is the path to be converted from $build to $host format.
 # The result will be available in $func_to_host_path_result.
@@ -1805,10 +3096,11 @@
 to_host_path_cmd=
 func_init_to_host_path_cmd ()
 {
- $opt_debug
+ $debug_cmd
+
 if test -z "$to_host_path_cmd"; then
 func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ to_host_path_cmd=func_convert_path_$func_stripname_result
 fi
 }
 
@@ -1818,7 +3110,8 @@
 # in func_to_host_path_result.
 func_to_host_path ()
 {
- $opt_debug
+ $debug_cmd
+
 func_init_to_host_path_cmd
 $to_host_path_cmd "$1"
 }
@@ -1829,7 +3122,7 @@
 # Copy ARG to func_to_host_path_result.
 func_convert_path_noop ()
 {
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
 }
 # end func_convert_path_noop
 
@@ -1840,8 +3133,9 @@
 # func_to_host_path_result.
 func_convert_path_msys_to_w32 ()
 {
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
 if test -n "$1"; then
 # Remove leading and trailing path separator characters from ARG. MSYS
 # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1849,7 +3143,7 @@
 func_stripname : : "$1"
 func_to_host_path_tmp1=$func_stripname_result
 func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result=$func_convert_core_msys_to_w32_result
 func_convert_path_check : ";" \
 "$func_to_host_path_tmp1" "$func_to_host_path_result"
 func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1863,8 +3157,9 @@
 # func_to_host_file_result.
 func_convert_path_cygwin_to_w32 ()
 {
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
 if test -n "$1"; then
 # See func_convert_path_msys_to_w32:
 func_stripname : : "$1"
@@ -1883,14 +3178,15 @@
 # a working winepath. Returns result in func_to_host_file_result.
 func_convert_path_nix_to_w32 ()
 {
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
 if test -n "$1"; then
 # See func_convert_path_msys_to_w32:
 func_stripname : : "$1"
 func_to_host_path_tmp1=$func_stripname_result
 func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
 func_convert_path_check : ";" \
 "$func_to_host_path_tmp1" "$func_to_host_path_result"
 func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1904,15 +3200,16 @@
 # Returns result in func_to_host_file_result.
 func_convert_path_msys_to_cygwin ()
 {
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
 if test -n "$1"; then
 # See func_convert_path_msys_to_w32:
 func_stripname : : "$1"
 func_to_host_path_tmp1=$func_stripname_result
 func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
 func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
 func_convert_path_check : : \
 "$func_to_host_path_tmp1" "$func_to_host_path_result"
 func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1927,8 +3224,9 @@
 # func_to_host_file_result.
 func_convert_path_nix_to_cygwin ()
 {
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
 if test -n "$1"; then
 # Remove leading and trailing path separator characters from
 # ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1937,7 +3235,7 @@
 func_to_host_path_tmp1=$func_stripname_result
 func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
 func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
 func_convert_path_check : : \
 "$func_to_host_path_tmp1" "$func_to_host_path_result"
 func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1946,13 +3244,31 @@
 # end func_convert_path_nix_to_cygwin
 
 
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+ $debug_cmd
+
+ func_dll_def_p_tmp=`$SED -n \
+ -e 's/^	 *//' \
+ -e '/^$;.*$*$/d' \
+ -e 's/^$EXPORTS\|LIBRARY$$	 .*$*$/DEF/p' \
+ -e q \
+ "$1"`
+ test DEF = "$func_dll_def_p_tmp"
+}
+
+
 # func_mode_compile arg...
 func_mode_compile ()
 {
- $opt_debug
+ $debug_cmd
+
 # Get the compilation command and the source file.
 base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ srcfile=$nonopt # always keep a non-empty value in "srcfile"
 suppress_opt=yes
 suppress_output=
 arg_mode=normal
@@ -1965,12 +3281,12 @@
 case $arg_mode in
 arg )
 	# do not "continue". Instead, add this to base_compile
-	lastarg="$arg"
+	lastarg=$arg
 	arg_mode=normal
 	;;
 
 target )
-	libobj="$arg"
+	libobj=$arg
 	arg_mode=normal
 	continue
 	;;
@@ -1980,7 +3296,7 @@
 	case $arg in
 	-o)
 	 test -n "$libobj" && \
-	 func_fatal_error "you cannot specify \`-o' more than once"
+	 func_fatal_error "you cannot specify '-o' more than once"
 	 arg_mode=target
 	 continue
 	 ;;
@@ -2009,12 +3325,12 @@
 	 func_stripname '-Wc,' '' "$arg"
 	 args=$func_stripname_result
 	 lastarg=
-	 save_ifs="$IFS"; IFS=','
+	 save_ifs=$IFS; IFS=,
 	 for arg in $args; do
-	 IFS="$save_ifs"
+	 IFS=$save_ifs
 	 func_append_quoted lastarg "$arg"
 	 done
-	 IFS="$save_ifs"
+	 IFS=$save_ifs
 	 func_stripname ' ' '' "$lastarg"
 	 lastarg=$func_stripname_result
 
@@ -2027,8 +3343,8 @@
 	 # Accept the current argument as the source file.
 	 # The previous "srcfile" becomes the current argument.
 	 #
-	 lastarg="$srcfile"
-	 srcfile="$arg"
+	 lastarg=$srcfile
+	 srcfile=$arg
 	 ;;
 	esac # case $arg
 	;;
@@ -2043,13 +3359,13 @@
 func_fatal_error "you must specify an argument for -Xcompile"
 ;;
 target)
- func_fatal_error "you must specify a target with \`-o'"
+ func_fatal_error "you must specify a target with '-o'"
 ;;
 *)
 # Get the name of the library object.
 test -z "$libobj" && {
 	func_basename "$srcfile"
-	libobj="$func_basename_result"
+	libobj=$func_basename_result
 }
 ;;
 esac
@@ -2069,7 +3385,7 @@
 case $libobj in
 *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
 *)
- func_fatal_error "cannot determine name of library object from \`$libobj'"
+ func_fatal_error "cannot determine name of library object from '$libobj'"
 ;;
 esac
 
@@ -2078,8 +3394,8 @@
 for arg in $later; do
 case $arg in
 -shared)
-	test "$build_libtool_libs" != yes && \
-	 func_fatal_configuration "can not build a shared library"
+	test yes = "$build_libtool_libs" \
+	 || func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	continue
 	;;
@@ -2105,17 +3421,17 @@
 func_quote_for_eval "$libobj"
 test "X$libobj" != "X$func_quote_for_eval_result" \
 && $ECHO "X$libobj" | $GREP '~#^*{};<>?"'"'"'	 &()|`$' \
- && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ && func_warning "libobj name '$libobj' may not contain shell special characters."
 func_dirname_and_basename "$obj" "/" ""
- objname="$func_basename_result"
- xdir="$func_dirname_result"
- lobj=${xdir}$objdir/$objname
+ objname=$func_basename_result
+ xdir=$func_dirname_result
+ lobj=$xdir$objdir/$objname
 
 test -z "$base_compile" && \
 func_fatal_help "you must specify a compilation command"
 
 # Delete any leftover library objects.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
 removelist="$obj $lobj $libobj ${libobj}T"
 else
 removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3443,16 @@
 pic_mode=default
 ;;
 esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
 # non-PIC code in shared libraries is not supported
 pic_mode=default
 fi
 
 # Calculate the filename of the output object if compiler does
 # not support -o with -c
- if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.^.*$%%'`.${objext}
- lockfile="$output_obj.lock"
+ if test no = "$compiler_c_o"; then
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.^.*$%%'`.$objext
+ lockfile=$output_obj.lock
 else
 output_obj=
 need_locks=no
@@ -2145,12 +3461,12 @@
 
 # Lock this critical section if it is needed
 # We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
+ if test yes = "$need_locks"; then
 until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 	func_echo "Waiting for $lockfile to be removed"
 	sleep 2
 done
- elif test "$need_locks" = warn; then
+ elif test warn = "$need_locks"; then
 if test -f "$lockfile"; then
 	$ECHO "\
 *** ERROR, $lockfile exists and contains:
@@ -2158,7 +3474,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2180,11 +3496,11 @@
 qsrcfile=$func_quote_for_eval_result
 
 # Only build a PIC object if we are building libtool libraries.
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
 # Without this assignment, base_compile gets emptied.
 fbsd_hideous_sh_bug=$base_compile
 
- if test "$pic_mode" != no; then
+ if test no != "$pic_mode"; then
 	command="$base_compile $qsrcfile $pic_flag"
 else
 	# Don't build PIC code
@@ -2201,7 +3517,7 @@
 func_show_eval_locale "$command"	\
 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -2212,7 +3528,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2228,20 +3544,20 @@
 fi
 
 # Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
+ if test yes = "$suppress_opt"; then
 	suppress_output=' >/dev/null 2>&1'
 fi
 fi
 
 # Only build a position-dependent object if we build old libraries.
- if test "$build_old_libs" = yes; then
- if test "$pic_mode" != yes; then
+ if test yes = "$build_old_libs"; then
+ if test yes != "$pic_mode"; then
 	# Don't build PIC code
 	command="$base_compile $qsrcfile$pie_flag"
 else
 	command="$base_compile $qsrcfile $pic_flag"
 fi
- if test "$compiler_c_o" = yes; then
+ if test yes = "$compiler_c_o"; then
 	func_append command " -o $obj"
 fi
 
@@ -2250,7 +3566,7 @@
 func_show_eval_locale "$command" \
 '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 	$ECHO "\
 *** ERROR, $lockfile contains:
@@ -2261,7 +3577,7 @@
 
 This indicates that another process is trying to use the same
 temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
 repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
@@ -2281,7 +3597,7 @@
 func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
 
 # Unlock the critical section if it was locked
- if test "$need_locks" != no; then
+ if test no != "$need_locks"; then
 	removelist=$lockfile
 $RM "$lockfile"
 fi
@@ -2291,7 +3607,7 @@
 }
 
 $opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
@@ -2311,7 +3627,7 @@
 Remove files from the build directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3646,16 @@
 -no-suppress do not suppress compiler output for multiple passes
 -prefer-pic try to build PIC objects only
 -prefer-non-pic try to build non-PIC objects only
- -shared do not build a \`.o' file suitable for static linking
- -static only build a \`.o' file suitable for static linking
+ -shared do not build a '.o' file suitable for static linking
+ -static only build a '.o' file suitable for static linking
 -Wc,FLAG pass FLAG directly to the compiler
 
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
 from the given SOURCEFILE.
 
 The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
 ;;
 
 execute)
@@ -2352,7 +3668,7 @@
 
 -dlopen FILE add the directory containing FILE to the library path
 
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
 flags.
 
 If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3687,7 @@
 Each LIBDIR is a directory that contains libtool libraries.
 
 The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
 ;;
 
 install)
@@ -2381,7 +3697,7 @@
 Install executables or libraries.
 
 INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
 
 The following components of INSTALL-COMMAND are treated specially:
 
@@ -2407,7 +3723,7 @@
 -avoid-version do not add a version suffix if possible
 -bindir BINDIR specify path to binaries directory (for systems where
 libraries must be found in the PATH setting at runtime)
- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime
 -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
 -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
 -export-symbols SYMFILE
@@ -2421,7 +3737,8 @@
 -no-install link a not-installable executable
 -no-undefined declare that a library does not refer to external symbols
 -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
+ -objectlist FILE use a list of object files found in FILE to specify objects
+ -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
 -precious-files-regex REGEX
 don't remove output files matching REGEX
 -release RELEASE specify package release information
@@ -2441,20 +3758,20 @@
 -Xlinker FLAG pass linker-specific FLAG directly to the linker
 -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
 
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
 
-Every other argument is treated as a filename. Files ending in \`.la' are
+Every other argument is treated as a filename. Files ending in '.la' are
 treated as uninstalled libtool libraries, other files are standard or library
 object files.
 
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
 required, except when creating a convenience library.
 
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
 
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
 is created, otherwise an executable program is created."
 ;;
 
@@ -2465,7 +3782,7 @@
 Remove libraries from an installation directory.
 
 RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
 to RM.
 
 If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3790,17 @@
 ;;
 
 *)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
 ;;
 esac
 
 echo
- $ECHO "Try \`$progname --help' for more information about other modes."
+ $ECHO "Try '$progname --help' for more information about other modes."
 }
 
 # Now that we've collected a possible --mode arg, show help if necessary
 if $opt_help; then
- if test "$opt_help" = :; then
+ if test : = "$opt_help"; then
 func_mode_help
 else
 {
@@ -2491,7 +3808,7 @@
 for opt_mode in compile link execute install finish uninstall clean; do
 	func_mode_help
 done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ } | $SED -n '1p; 2,$s/^Usage:/ or: /p'
 {
 func_help noexit
 for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3816,7 @@
 	func_mode_help
 done
 } |
- sed '1d
+ $SED '1d
 /^When reporting/,/^Report/{
 	H
 	d
@@ -2516,16 +3833,17 @@
 # func_mode_execute arg...
 func_mode_execute ()
 {
- $opt_debug
+ $debug_cmd
+
 # The first argument is the command name.
- cmd="$nonopt"
+ cmd=$nonopt
 test -z "$cmd" && \
 func_fatal_help "you must specify a COMMAND"
 
 # Handle -dlopen flags immediately.
 for file in $opt_dlopen; do
 test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
+	|| func_fatal_help "'$file' is not a file"
 
 dir=
 case $file in
@@ -2535,7 +3853,7 @@
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	 || func_fatal_help "\`$lib' is not a valid libtool archive"
+	 || func_fatal_help "'$lib' is not a valid libtool archive"
 
 	# Read the libtool library.
 	dlname=
@@ -2546,18 +3864,18 @@
 	if test -z "$dlname"; then
 	 # Warn if it was a shared library.
 	 test -n "$library_names" && \
-	 func_warning "\`$file' was not linked with \`-export-dynamic'"
+	 func_warning "'$file' was not linked with '-export-dynamic'"
 	 continue
 	fi
 
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 
 	if test -f "$dir/$objdir/$dlname"; then
 	 func_append dir "/$objdir"
 	else
 	 if test ! -f "$dir/$dlname"; then
-	 func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	 func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
 	 fi
 	fi
 	;;
@@ -2565,18 +3883,18 @@
 *.lo)
 	# Just add the directory containing the .lo file.
 	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 	;;
 
 *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
 	continue
 	;;
 esac
 
 # Get the absolute pathname.
 absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
+ test -n "$absdir" && dir=$absdir
 
 # Now add the directory to shlibpath_var.
 if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3906,7 @@
 
 # This variable tells wrapper scripts just to set shlibpath_var
 # rather than running their programs.
- libtool_execute_magic="$magic"
+ libtool_execute_magic=$magic
 
 # Check if any of the arguments is a wrapper script.
 args=
@@ -2601,12 +3919,12 @@
 	if func_ltwrapper_script_p "$file"; then
 	 func_source "$file"
 	 # Transform arg to wrapped name.
-	 file="$progdir/$program"
+	 file=$progdir/$program
 	elif func_ltwrapper_executable_p "$file"; then
 	 func_ltwrapper_scriptname "$file"
 	 func_source "$func_ltwrapper_scriptname_result"
 	 # Transform arg to wrapped name.
-	 file="$progdir/$program"
+	 file=$progdir/$program
 	fi
 	;;
 esac
@@ -2614,7 +3932,15 @@
 func_append_quoted args "$file"
 done
 
- if test "X$opt_dry_run" = Xfalse; then
+ if $opt_dry_run; then
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ else
 if test -n "$shlibpath_var"; then
 	# Export the shlibpath_var.
 	eval "export $shlibpath_var"
@@ -2631,25 +3957,18 @@
 done
 
 # Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
+ exec_cmd=\$cmd$args
 fi
 }
 
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
- $opt_debug
+ $debug_cmd
+
 libs=
 libdirs=
 admincmds=
@@ -2663,11 +3982,11 @@
 	if func_lalib_unsafe_p "$opt"; then
 	 func_append libs " $opt"
 	else
-	 func_warning "\`$opt' is not a valid libtool archive"
+	 func_warning "'$opt' is not a valid libtool archive"
 	fi
 
 else
-	func_fatal_error "invalid argument \`$opt'"
+	func_fatal_error "invalid argument '$opt'"
 fi
 done
 
@@ -2682,12 +4001,12 @@
 # Remove sysroot references
 if $opt_dry_run; then
 for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+ echo "removing references to $lt_sysroot and '=' prefixes from $lib"
 done
 else
 tmpdir=`func_mktempdir`
 for lib in $libs; do
-	 sed -e "${sysroot_cmd} s/$ '-LR$=/\1/g; s/$ '$=/\1/g" $lib \
+	 $SED -e "$sysroot_cmd s/$ '-LR$=/\1/g; s/$ '$=/\1/g" $lib \
 	 > $tmpdir/tmp-la
 	 mv -f $tmpdir/tmp-la $lib
 	done
@@ -2712,7 +4031,7 @@
 fi
 
 # Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
+ $opt_quiet && exit $EXIT_SUCCESS
 
 if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
 echo "----------------------------------------------------------------------"
@@ -2723,27 +4042,27 @@
 echo
 echo "If you ever happen to want to link against installed libraries"
 echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "specify the full pathname of the library, or use the '-LLIBDIR'"
 echo "flag during linking and do at least one of the following:"
 if test -n "$shlibpath_var"; then
-	echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo " - add LIBDIR to the '$shlibpath_var' environment variable"
 	echo " during execution"
 fi
 if test -n "$runpath_var"; then
-	echo " - add LIBDIR to the \`$runpath_var' environment variable"
+	echo " - add LIBDIR to the '$runpath_var' environment variable"
 	echo " during linking"
 fi
 if test -n "$hardcode_libdir_flag_spec"; then
 	libdir=LIBDIR
 	eval flag=\"$hardcode_libdir_flag_spec\"
 
-	$ECHO " - use the \`$flag' linker flag"
+	$ECHO " - use the '$flag' linker flag"
 fi
 if test -n "$admincmds"; then
 	$ECHO " - have your system administrator run these commands:$admincmds"
 fi
 if test -f /etc/ld.so.conf; then
-	echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+	echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
 fi
 echo
 
@@ -2762,18 +4081,20 @@
 exit $EXIT_SUCCESS
 }
 
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
 func_mode_install ()
 {
- $opt_debug
+ $debug_cmd
+
 # There may be an optional sh(1) argument at the beginning of
 # install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
 # Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ case $nonopt in *shtool*) :;; *) false;; esac
+ then
 # Aesthetically quote it.
 func_quote_for_eval "$nonopt"
 install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4121,7 @@
 opts=
 prev=
 install_type=
- isdir=no
+ isdir=false
 stripme=
 no_mode=:
 for arg
@@ -2813,7 +4134,7 @@
 fi
 
 case $arg in
- -d) isdir=yes ;;
+ -d) isdir=: ;;
 -f)
 	if $install_cp; then :; else
 	 prev=$arg
@@ -2831,7 +4152,7 @@
 *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
-	 if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	 if test X-m = "X$prev" && test -n "$install_override_mode"; then
 	 arg2=$install_override_mode
 	 no_mode=false
 	 fi
@@ -2856,7 +4177,7 @@
 func_fatal_help "you must specify an install program"
 
 test -n "$prev" && \
- func_fatal_help "the \`$prev' option requires an argument"
+ func_fatal_help "the '$prev' option requires an argument"
 
 if test -n "$install_override_mode" && $no_mode; then
 if $install_cp; then :; else
@@ -2878,19 +4199,19 @@
 dest=$func_stripname_result
 
 # Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
+ test -d "$dest" && isdir=:
+ if $isdir; then
+ destdir=$dest
 destname=
 else
 func_dirname_and_basename "$dest" "" "."
- destdir="$func_dirname_result"
- destname="$func_basename_result"
+ destdir=$func_dirname_result
+ destname=$func_basename_result
 
 # Not a directory, so check to see that there is only one file specified.
 set dummy $files; shift
 test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
+	func_fatal_help "'$dest' is not a directory"
 fi
 case $destdir in
 \\/* | A-Za-z:\\/*) ;;
@@ -2899,7 +4220,7 @@
 	case $file in
 	*.lo) ;;
 	*)
-	 func_fatal_help "\`$destdir' must be an absolute directory name"
+	 func_fatal_help "'$destdir' must be an absolute directory name"
 	 ;;
 	esac
 done
@@ -2908,7 +4229,7 @@
 
 # This variable tells wrapper scripts just to set variables rather
 # than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
 
 staticlibs=
 future_libdirs=
@@ -2928,7 +4249,7 @@
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
-	 || func_fatal_help "\`$file' is not a valid libtool archive"
+	 || func_fatal_help "'$file' is not a valid libtool archive"
 
 	library_names=
 	old_library=
@@ -2950,7 +4271,7 @@
 	fi
 
 	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
+	dir=$func_dirname_result
 	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
@@ -2964,7 +4285,7 @@
 	 # are installed into $libdir/../bin (currently, that works fine)
 	 # but it's something to keep an eye on.
 	 test "$inst_prefix_dir" = "$destdir" && \
-	 func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+	 func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
 
 	 if test -n "$inst_prefix_dir"; then
 	 # Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4294,36 @@
 	 relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	 fi
 
-	 func_warning "relinking \`$file'"
+	 func_warning "relinking '$file'"
 	 func_show_eval "$relink_command" \
-	 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
 	fi
 
 	# See the names of the shared library.
 	set dummy $library_names; shift
 	if test -n "$1"; then
-	 realname="$1"
+	 realname=$1
 	 shift
 
-	 srcname="$realname"
-	 test -n "$relink_command" && srcname="$realname"T
+	 srcname=$realname
+	 test -n "$relink_command" && srcname=${realname}T
 
 	 # Install the shared library and build the symlinks.
 	 func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 	 'exit $?'
-	 tstripme="$stripme"
+	 tstripme=$stripme
 	 case $host_os in
 	 cygwin* | mingw* | pw32* | cegcc*)
 	 case $realname in
 	 *.dll.a)
-	 tstripme=""
+	 tstripme=
+	 ;;
+	 esac
+	 ;;
+	 os2*)
+	 case $realname in
+	 *_dll.a)
+	 tstripme=
 	 ;;
 	 esac
 	 ;;
@@ -3006,7 +4334,7 @@
 
 	 if test "$#" -gt 0; then
 	 # Delete the old symlinks, and create new ones.
-	 # Try `ln -sf' first, because the `ln' binary might depend on
+	 # Try 'ln -sf' first, because the 'ln' binary might depend on
 	 # the symlink we replace! Solaris /bin/ln does not understand -f,
 	 # so we also need to try rm && ln -s.
 	 for linkname
@@ -3017,14 +4345,14 @@
 	 fi
 
 	 # Do each command in the postinstall commands.
-	 lib="$destdir/$realname"
+	 lib=$destdir/$realname
 	 func_execute_cmds "$postinstall_cmds" 'exit $?'
 	fi
 
 	# Install the pseudo-library for information purposes.
 	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
+	name=$func_basename_result
+	instname=$dir/${name}i
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
@@ -3036,11 +4364,11 @@
 
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	 destfile="$destdir/$destname"
+	 destfile=$destdir/$destname
 	else
 	 func_basename "$file"
-	 destfile="$func_basename_result"
-	 destfile="$destdir/$destfile"
+	 destfile=$func_basename_result
+	 destfile=$destdir/$destfile
 	fi
 
 	# Deduce the name of the destination old-style object file.
@@ -3050,11 +4378,11 @@
 	 staticdest=$func_lo2o_result
 	 ;;
 	*.$objext)
-	 staticdest="$destfile"
+	 staticdest=$destfile
 	 destfile=
 	 ;;
 	*)
-	 func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	 func_fatal_help "cannot copy a libtool object to '$destfile'"
 	 ;;
 	esac
 
@@ -3063,7 +4391,7 @@
 	 func_show_eval "$install_prog $file $destfile" 'exit $?'
 
 	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
+	if test yes = "$build_old_libs"; then
 	 # Deduce the name of the old-style object file.
 	 func_lo2o "$file"
 	 staticobj=$func_lo2o_result
@@ -3075,23 +4403,23 @@
 *)
 	# Figure out destination file name, if it wasn't already specified.
 	if test -n "$destname"; then
-	 destfile="$destdir/$destname"
+	 destfile=$destdir/$destname
 	else
 	 func_basename "$file"
-	 destfile="$func_basename_result"
-	 destfile="$destdir/$destfile"
+	 destfile=$func_basename_result
+	 destfile=$destdir/$destfile
 	fi
 
 	# If the file is missing, and there is a .exe on the end, strip it
 	# because it is most likely a libtool script we actually want to
 	# install
-	stripped_ext=""
+	stripped_ext=
 	case $file in
 	 *.exe)
 	 if test ! -f "$file"; then
 	 func_stripname '' '.exe' "$file"
 	 file=$func_stripname_result
-	 stripped_ext=".exe"
+	 stripped_ext=.exe
 	 fi
 	 ;;
 	esac
@@ -3119,19 +4447,19 @@
 
 	 # Check the variables that should have been set.
 	 test -z "$generated_by_libtool_version" && \
-	 func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+	 func_fatal_error "invalid libtool wrapper script '$wrapper'"
 
-	 finalize=yes
+	 finalize=:
 	 for lib in $notinst_deplibs; do
 	 # Check to see that each library is installed.
 	 libdir=
 	 if test -f "$lib"; then
 	 func_source "$lib"
 	 fi
-	 libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	 libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
 	 if test -n "$libdir" && test ! -f "$libfile"; then
-	 func_warning "\`$lib' has not been installed in \`$libdir'"
-	 finalize=no
+	 func_warning "'$lib' has not been installed in '$libdir'"
+	 finalize=false
 	 fi
 	 done
 
@@ -3139,29 +4467,29 @@
 	 func_source "$wrapper"
 
 	 outputname=
-	 if test "$fast_install" = no && test -n "$relink_command"; then
+	 if test no = "$fast_install" && test -n "$relink_command"; then
 	 $opt_dry_run || {
-	 if test "$finalize" = yes; then
+	 if $finalize; then
 	 tmpdir=`func_mktempdir`
 		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	 outputname="$tmpdir/$file"
+		file=$func_basename_result
+	 outputname=$tmpdir/$file
 	 # Replace the output file specification.
 	 relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
-	 $opt_silent || {
+	 $opt_quiet || {
 	 func_quote_for_expand "$relink_command"
 		 eval "func_echo $func_quote_for_expand_result"
 	 }
 	 if eval "$relink_command"; then :
 	 else
-		 func_error "error: relink \`$file' with the above command before installing it"
+		 func_error "error: relink '$file' with the above command before installing it"
 		 $opt_dry_run || ${RM}r "$tmpdir"
 		 continue
 	 fi
-	 file="$outputname"
+	 file=$outputname
 	 else
-	 func_warning "cannot relink \`$file'"
+	 func_warning "cannot relink '$file'"
 	 fi
 	 }
 	 else
@@ -3198,10 +4526,10 @@
 
 for file in $staticlibs; do
 func_basename "$file"
- name="$func_basename_result"
+ name=$func_basename_result
 
 # Set up the ranlib parameters.
- oldlib="$destdir/$name"
+ oldlib=$destdir/$name
 func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
 tool_oldlib=$func_to_tool_file_result
 
@@ -3216,18 +4544,18 @@
 done
 
 test -n "$future_libdirs" && \
- func_warning "remember to run \`$progname --finish$future_libdirs'"
+ func_warning "remember to run '$progname --finish$future_libdirs'"
 
 if test -n "$current_libdirs"; then
 # Maybe just do a dry run.
 $opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
 else
 exit $EXIT_SUCCESS
 fi
 }
 
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4563,17 @@
 # a dlpreopen symbol table.
 func_generate_dlsyms ()
 {
- $opt_debug
- my_outputname="$1"
- my_originator="$2"
- my_pic_p="${3-no}"
- my_prefix=`$ECHO "$my_originator" | sed 's%^a-zA-Z0-9%_%g'`
+ $debug_cmd
+
+ my_outputname=$1
+ my_originator=$2
+ my_pic_p=${3-false}
+ my_prefix=`$ECHO "$my_originator" | $SED 's%^a-zA-Z0-9%_%g'`
 my_dlsyms=
 
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
 if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
+	my_dlsyms=${my_outputname}S.c
 else
 	func_error "not configured to extract global symbols from dlpreopened files"
 fi
@@ -3255,7 +4584,7 @@
 "") ;;
 *.c)
 	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
+	nlist=$output_objdir/$my_outputname.nm
 
 	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
 
@@ -3263,34 +4592,36 @@
 	func_verbose "creating $output_objdir/$my_dlsyms"
 
 	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
 
 #ifdef __cplusplus
 extern \"C\" {
 #endif
 
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
 #endif
 
 /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
 relocations are performed -- see ld's documentation on pseudo-relocs. */
 # define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
 /* This system does not cope well with relocations in const data. */
 # define LT_DLSYM_CONST
 #else
 # define LT_DLSYM_CONST const
 #endif
 
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
 /* External symbol declarations for the compiler. */\
 "
 
-	if test "$dlself" = yes; then
-	 func_verbose "generating symbol list for \`$output'"
+	if test yes = "$dlself"; then
+	 func_verbose "generating symbol list for '$output'"
 
 	 $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
@@ -3298,7 +4629,7 @@
 	 progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	 for progfile in $progfiles; do
 	 func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	 func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	 func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
 	 $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	 done
 
@@ -3318,10 +4649,10 @@
 
 	 # Prepare the list of exported symbols
 	 if test -z "$export_symbols"; then
-	 export_symbols="$output_objdir/$outputname.exp"
+	 export_symbols=$output_objdir/$outputname.exp
 	 $opt_dry_run || {
 	 $RM $export_symbols
-	 eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
+	 eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'
 	 case $host in
 	 *cygwin* | *mingw* | *cegcc* )
 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4662,7 @@
 	 }
 	 else
 	 $opt_dry_run || {
-	 eval "${SED} -e 's/$.*^$$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	 eval "$SED -e 's/$.*^$$/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
 	 eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	 eval '$MV "$nlist"T "$nlist"'
 	 case $host in
@@ -3345,22 +4676,22 @@
 	fi
 
 	for dlprefile in $dlprefiles; do
-	 func_verbose "extracting global C symbols from \`$dlprefile'"
+	 func_verbose "extracting global C symbols from '$dlprefile'"
 	 func_basename "$dlprefile"
-	 name="$func_basename_result"
+	 name=$func_basename_result
 case $host in
 	 *cygwin* | *mingw* | *cegcc* )
 	 # if an import library, we need to obtain dlname
 	 if func_win32_import_lib_p "$dlprefile"; then
 	 func_tr_sh "$dlprefile"
 	 eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	 dlprefile_dlbasename=""
+	 dlprefile_dlbasename=
 	 if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
 	 # Use subshell, to avoid clobbering current variable values
 	 dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	 if test -n "$dlprefile_dlname" ; then
+	 if test -n "$dlprefile_dlname"; then
 	 func_basename "$dlprefile_dlname"
-	 dlprefile_dlbasename="$func_basename_result"
+	 dlprefile_dlbasename=$func_basename_result
 	 else
 	 # no lafile. user explicitly requested -dlpreopen <import library>.
 	 $sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4699,7 @@
 	 fi
 	 fi
 	 $opt_dry_run || {
-	 if test -n "$dlprefile_dlbasename" ; then
+	 if test -n "$dlprefile_dlbasename"; then
 	 eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
 	 else
 	 func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4755,11 @@
 	 echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
 	 fi
 
+	 func_show_eval '$RM "${nlist}I"'
+	 if test -n "$global_symbol_to_import"; then
+	 eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+	 fi
+
 	 echo >> "$output_objdir/$my_dlsyms" "\
 
 /* The mapping between symbol names and symbols. */
@@ -3432,11 +4768,30 @@
 void *address;
 } lt_dlsymlist;
 extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols;
+lt_${my_prefix}_LTX_preloaded_symbols;\
+"
+
+	 if test -s "$nlist"I; then
+	 echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+ LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+ for (; symbol->name; ++symbol)
+ {"
+	 $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+	 echo >> "$output_objdir/$my_dlsyms" "\
+ }
+}"
+	 fi
+	 echo >> "$output_objdir/$my_dlsyms" "\
 LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols =
-{\
- { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+	 if test -s "$nlist"I; then
+	 echo >> "$output_objdir/$my_dlsyms" "\
+ {\"@INIT@\", (void *) &lt_syminit},"
+	 fi
 
 	 case $need_lib_prefix in
 	 no)
@@ -3478,9 +4833,7 @@
 	 *-*-hpux*)
 	 pic_flag_for_symtable=" $pic_flag" ;;
 	 *)
-	 if test "X$my_pic_p" != Xno; then
-	 pic_flag_for_symtable=" $pic_flag"
-	 fi
+	 $my_pic_p && pic_flag_for_symtable=" $pic_flag"
 	 ;;
 	 esac
 	 ;;
@@ -3497,10 +4850,10 @@
 	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
 
 	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
 
 	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	symfileobj=$output_objdir/${my_outputname}S.$objext
 	case $host in
 	*cygwin* | *mingw* | *cegcc* )
 	 if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4871,7 @@
 	esac
 	;;
 *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	func_fatal_error "unknown suffix for '$my_dlsyms'"
 	;;
 esac
 else
@@ -3532,6 +4885,32 @@
 fi
 }
 
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_A-Za-z0-9_+_adl*|A-Za-z0-9_+_adl*_iname)$'`
+ test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n "$func_cygming_ms_implib_tmp"
+}
+
 # func_win32_libid arg
 # return the library type of file 'arg'
 #
@@ -3541,8 +4920,9 @@
 # Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
- $opt_debug
- win32_libid_type="unknown"
+ $debug_cmd
+
+ win32_libid_type=unknown
 win32_fileres=`file -L $1 2>/dev/null`
 case $win32_fileres in
 *ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +4932,29 @@
 # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
 if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
 $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	$SED -n -e '
+ case $nm_interface in
+ "MS dumpbin")
+	if func_cygming_ms_implib_p "$1" ||
+	 func_cygming_gnu_implib_p "$1"
+	then
+	 win32_nmres=import
+	else
+	 win32_nmres=
+	fi
+	;;
+ *)
+	func_to_tool_file "$1" func_convert_file_msys_to_w32
+	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	 $SED -n -e '
 	 1,100{
 		/ I /{
-		 s,.*,import,
+		 s|.*|import|
 		 p
 		 q
 		}
 	 }'`
+	;;
+ esac
 case $win32_nmres in
 import*) win32_libid_type="x86 archive import";;
 *) win32_libid_type="x86 archive static";;
@@ -3593,7 +4986,8 @@
 # $sharedlib_from_linklib_result
 func_cygming_dll_for_implib ()
 {
- $opt_debug
+ $debug_cmd
+
 sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
 }
 
@@ -3610,7 +5004,8 @@
 # specified import library.
 func_cygming_dll_for_implib_fallback_core ()
 {
- $opt_debug
+ $debug_cmd
+
 match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
 $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
 $SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5041,8 @@
 /./p' |
 # we now have a list, one entry per line, of the stringified
 # contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
+ # archive that possess that section. Heuristic: eliminate
+ # all those that have a first or second character that is
 # a '.' (that is, objdump's representation of an unprintable
 # character.) This should work for all archives with less than
 # 0x302f exports -- but will fail for DLLs whose name actually
@@ -3658,30 +5053,6 @@
 $SED -e '/^\./d;/^.\./d;q'
 }
 
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_A-Za-z0-9_+_adl*|A-Za-z0-9_+_adl*_iname)$'`
- test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- test -n "$func_cygming_ms_implib_tmp"
-}
-
 # func_cygming_dll_for_implib_fallback ARG
 # Platform-specific function to extract the
 # name of the DLL associated with the specified
@@ -3695,16 +5066,17 @@
 # $sharedlib_from_linklib_result
 func_cygming_dll_for_implib_fallback ()
 {
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
+ $debug_cmd
+
+ if func_cygming_gnu_implib_p "$1"; then
 # binutils import library
 sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- elif func_cygming_ms_implib_p "$1" ; then
+ elif func_cygming_ms_implib_p "$1"; then
 # ms-generated import library
 sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
 else
 # unknown
- sharedlib_from_linklib_result=""
+ sharedlib_from_linklib_result=
 fi
 }
 
@@ -3712,10 +5084,11 @@
 # func_extract_an_archive dir oldlib
 func_extract_an_archive ()
 {
- $opt_debug
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
- if test "$lock_old_archive_extraction" = yes; then
+ $debug_cmd
+
+ f_ex_an_ar_dir=$1; shift
+ f_ex_an_ar_oldlib=$1
+ if test yes = "$lock_old_archive_extraction"; then
 lockfile=$f_ex_an_ar_oldlib.lock
 until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 	func_echo "Waiting for $lockfile to be removed"
@@ -3724,7 +5097,7 @@
 fi
 func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
 		 'stat=$?; rm -f "$lockfile"; exit $stat'
- if test "$lock_old_archive_extraction" = yes; then
+ if test yes = "$lock_old_archive_extraction"; then
 $opt_dry_run || rm -f "$lockfile"
 fi
 if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5111,23 @@
 # func_extract_archives gentop oldlib ...
 func_extract_archives ()
 {
- $opt_debug
- my_gentop="$1"; shift
+ $debug_cmd
+
+ my_gentop=$1; shift
 my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
+ my_oldobjs=
+ my_xlib=
+ my_xabs=
+ my_xdir=
 
 for my_xlib in $my_oldlibs; do
 # Extract the objects.
 case $my_xlib in
-	\\/* | A-Za-z:\\/*) my_xabs="$my_xlib" ;;
+	\\/* | A-Za-z:\\/*) my_xabs=$my_xlib ;;
 	*) my_xabs=`pwd`"/$my_xlib" ;;
 esac
 func_basename "$my_xlib"
- my_xlib="$func_basename_result"
+ my_xlib=$func_basename_result
 my_xlib_u=$my_xlib
 while :; do
 case " $extracted_archives " in
@@ -3765,7 +5139,7 @@
 	esac
 done
 extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
+ my_xdir=$my_gentop/$my_xlib_u
 
 func_mkdir_p "$my_xdir"
 
@@ -3778,22 +5152,23 @@
 	 cd $my_xdir || exit $?
 	 darwin_archive=$my_xabs
 	 darwin_curdir=`pwd`
-	 darwin_base_archive=`basename "$darwin_archive"`
+	 func_basename "$darwin_archive"
+	 darwin_base_archive=$func_basename_result
 	 darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
 	 if test -n "$darwin_arches"; then
 	 darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
 	 darwin_arch=
 	 func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	 for darwin_arch in $darwin_arches ; do
-	 func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	 $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	 cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	 func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	 for darwin_arch in $darwin_arches; do
+	 func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+	 $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+	 cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+	 func_extract_an_archive "`pwd`" "$darwin_base_archive"
 	 cd "$darwin_curdir"
-	 $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	 $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
 	 done # $darwin_arches
 ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	 darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	 darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
 	 darwin_file=
 	 darwin_files=
 	 for darwin_file in $darwin_filelist; do
@@ -3815,7 +5190,7 @@
 my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
 done
 
- func_extract_archives_result="$my_oldobjs"
+ func_extract_archives_result=$my_oldobjs
 }
 
 
@@ -3830,7 +5205,7 @@
 #
 # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
 # variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
 # the $objdir directory. This is a cygwin/mingw-specific
 # behavior.
 func_emit_wrapper ()
@@ -3841,7 +5216,7 @@
 #! $SHELL
 
 # $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # The $output program cannot be directly executed until all the libtool
 # libraries that it depends on are installed.
@@ -3898,9 +5273,9 @@
 
 # Very basic option parsing. These options are (a) specific to
 # the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
 # windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
 # this pattern).
 #
 # There are only two supported options: --lt-debug and
@@ -3933,7 +5308,7 @@
 
 # Print the debug banner immediately:
 if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
 fi
 }
 
@@ -3944,7 +5319,7 @@
 lt_dump_args_N=1;
 for lt_arg
 do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv\$lt_dump_args_N: \$lt_arg\"
+ \$ECHO \"$outputname:$output:\$LINENO: newargv\$lt_dump_args_N: \$lt_arg\"
 lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
 done
 }
@@ -3958,7 +5333,7 @@
 *-*-mingw | *-*-os2* | *-cegcc*)
 $ECHO "\
 if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv0: \$progdir\\\\\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv0: \$progdir\\\\\$program\" 1>&2
 func_lt_dump_args \${1+\"\$@\"} 1>&2
 fi
 exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5343,7 @@
 *)
 $ECHO "\
 if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv0: \$progdir/\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv0: \$progdir/\$program\" 1>&2
 func_lt_dump_args \${1+\"\$@\"} 1>&2
 fi
 exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5418,13 @@
 test -n \"\$absdir\" && thisdir=\"\$absdir\"
 "
 
-	if test "$fast_install" = yes; then
+	if test yes = "$fast_install"; then
 	 $ECHO "\
 program=lt-'$outputname'$exeext
 progdir=\"\$thisdir/$objdir\"
 
 if test ! -f \"\$progdir/\$program\" ||
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
 test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 
 file=\"\$\$-\$program\"
@@ -4066,7 +5441,7 @@
 if test -n \"\$relink_command\"; then
 if relink_command_output=\`eval \$relink_command 2>&1\`; then :
 else
-	$ECHO \"\$relink_command_output\" >&2
+	\$ECHO \"\$relink_command_output\" >&2
 	$RM \"\$progdir/\$file\"
 	exit 1
 fi
@@ -4101,7 +5476,7 @@
 	fi
 
 	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	 $ECHO "\
 # Add our own library path to $shlibpath_var
 $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5496,7 @@
 fi
 else
 # The program doesn't exist.
- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
 exit 1
@@ -4140,7 +5515,7 @@
 	cat <<EOF
 
 /* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 
 The $output program cannot be directly executed until all the libtool
 libraries that it depends on are installed.
@@ -4175,47 +5550,45 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
 /* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
 # ifdef __STRICT_ANSI__
 int _putenv (const char *);
 # endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
 # ifdef __STRICT_ANSI__
 char *realpath (const char *, char *);
 int putenv (char *);
 int setenv (const char *, const char *, int);
 # endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
 #endif
 
 /* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#if defined _MSC_VER
 # define setmode _setmode
 # define stat _stat
 # define chmod _chmod
 # define getcwd _getcwd
 # define putenv _putenv
 # define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-# define _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#elif defined __MINGW32__
 # define setmode _setmode
 # define stat _stat
 # define chmod _chmod
 # define getcwd _getcwd
 # define putenv _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
 # define HAVE_SETENV
 # define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
 #endif
 
-#if defined(PATH_MAX)
+#if defined PATH_MAX
 # define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
 # define LT_PATHMAX MAXPATHLEN
 #else
 # define LT_PATHMAX 1024
@@ -4234,8 +5607,8 @@
 # define PATH_SEPARATOR ':'
 #endif
 
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+ defined __OS2__
 # define HAVE_DOS_BASED_FILE_SYSTEM
 # define FOPEN_WB "wb"
 # ifndef DIR_SEPARATOR_2
@@ -4268,10 +5641,10 @@
 
 #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
 #define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
+ if (stale) { free (stale); stale = 0; } \
 } while (0)
 
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
 static int lt_debug = 1;
 #else
 static int lt_debug = 0;
@@ -4300,11 +5673,16 @@
 EOF
 
 	 cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
-	 if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	 if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 func_to_host_path "$temp_rpath"
 	 cat <<EOF
 const char * LIB_PATH_VALUE = "$func_to_host_path_result";
@@ -4328,7 +5706,7 @@
 EOF
 	 fi
 
-	 if test "$fast_install" = yes; then
+	 if test yes = "$fast_install"; then
 	 cat <<EOF
 const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
 EOF
@@ -4357,12 +5735,12 @@
 char *actual_cwrapper_name;
 char *target_name;
 char *lt_argv_zero;
- intptr_t rval = 127;
+ int rval = 127;
 
 int i;
 
 program_name = (char *) xstrdup (base_name (argv0));
- newargz = XMALLOC (char *, argc + 1);
+ newargz = XMALLOC (char *, (size_t) argc + 1);
 
 /* very simple arg parsing; don't want to rely on getopt
 * also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5749,10 @@
 newargc=0;
 for (i = 1; i < argc; i++)
 {
- if (strcmp (argvi, dumpscript_opt) == 0)
+ if (STREQ (argvi, dumpscript_opt))
 	{
 EOF
-	 case "$host" in
+	 case $host in
 	 *mingw* | *cygwin* )
 		# make stdout use "unix" line endings
 		echo " setmode(1,_O_BINARY);"
@@ -4385,12 +5763,12 @@
 	 lt_dump_script (stdout);
 	 return 0;
 	}
- if (strcmp (argvi, debug_opt) == 0)
+ if (STREQ (argvi, debug_opt))
 	{
 lt_debug = 1;
 continue;
 	}
- if (strcmp (argvi, ltwrapper_option_prefix) == 0)
+ if (STREQ (argvi, ltwrapper_option_prefix))
 {
 /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
 namespace, but it is not one of the ones we know about and
@@ -4413,7 +5791,7 @@
 EOF
 	 cat <<EOF
 /* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
 EOF
 	 cat <<"EOF"
 lt_debugprintf (__FILE__, __LINE__, "(main) argv0: %s\n", argv0);
@@ -4524,7 +5902,7 @@
 		cat <<"EOF"
 /* execv doesn't actually work on mingw as expected on unix */
 newargz = prepare_spawn (newargz);
- rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
 if (rval == -1)
 {
 /* failed to start process */
@@ -4569,7 +5947,7 @@
 {
 const char *base;
 
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
 /* Skip over the disk name in MSDOS pathnames. */
 if (isalpha ((unsigned char) name0) && name1 == ':')
 name += 2;
@@ -4628,7 +6006,7 @@
 const char *p_next;
 /* static buffer for getcwd */
 char tmpLT_PATHMAX + 1;
- int tmp_len;
+ size_t tmp_len;
 char *concat_name;
 
 lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6016,7 @@
 return NULL;
 
 /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
 if (isalpha ((unsigned char) wrapper0) && wrapper1 == ':')
 {
 concat_name = xstrdup (wrapper);
@@ -4656,7 +6034,7 @@
 	 return concat_name;
 	 XFREE (concat_name);
 	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
 }
 #endif
 
@@ -4679,7 +6057,7 @@
 	 for (q = p; *q; q++)
 		if (IS_PATH_SEPARATOR (*q))
 		 break;
-	 p_len = q - p;
+	 p_len = (size_t) (q - p);
 	 p_next = (*q == '\0' ? q : q + 1);
 	 if (p_len == 0)
 		{
@@ -4798,7 +6176,7 @@
 if (patlen <= len)
 {
 str += len - patlen;
- if (strcmp (str, pat) == 0)
+ if (STREQ (str, pat))
 	*str = '\0';
 }
 return str;
@@ -4863,7 +6241,7 @@
 char *str = xstrdup (value);
 setenv (name, str, 1);
 #else
- int len = strlen (name) + 1 + strlen (value) + 1;
+ size_t len = strlen (name) + 1 + strlen (value) + 1;
 char *str = XMALLOC (char, len);
 sprintf (str, "%s=%s", name, value);
 if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6258,8 @@
 char *new_value;
 if (orig_value && *orig_value)
 {
- int orig_value_len = strlen (orig_value);
- int add_len = strlen (add);
+ size_t orig_value_len = strlen (orig_value);
+ size_t add_len = strlen (add);
 new_value = XMALLOC (char, add_len + orig_value_len + 1);
 if (to_end)
 {
@@ -4912,10 +6290,10 @@
 {
 char *new_value = lt_extend_str (getenv (name), value, 0);
 /* some systems can't cope with a ':'-terminated path #' */
- int len = strlen (new_value);
- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_valuelen-1))
+ size_t len = strlen (new_value);
+ while ((len > 0) && IS_PATH_SEPARATOR (new_valuelen-1))
 {
- new_valuelen-1 = '\0';
+ new_value--len = '\0';
 }
 lt_setenv (name, new_value);
 XFREE (new_value);
@@ -5082,27 +6460,47 @@
 # True if ARG is an import lib, as indicated by $file_magic_cmd
 func_win32_import_lib_p ()
 {
- $opt_debug
+ $debug_cmd
+
 case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
 *import*) : ;;
 *) false ;;
 esac
 }
 
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+ $debug_cmd
+
+ case " $compile_command " in
+ *" -compat=g "*|*\ -std=c++0-90-9\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+ suncc_use_cstd_abi=no
+ ;;
+ *)
+ suncc_use_cstd_abi=yes
+ ;;
+ esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
- $opt_debug
+ $debug_cmd
+
 case $host in
 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
 # It is impossible to link a dll without this setting, and
 # we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
+ # what system we are compiling for in order to pass an extra
 # flag for every libtool invocation.
 # allow_undefined=no
 
 # FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
+ # to make a dll that has undefined symbols, in which case not
 # even a static library is built. For now, we need to specify
 # -no-undefined on the libtool link line when we can be certain
 # that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6544,11 @@
 module=no
 no_install=no
 objs=
+ os2dllname=
 non_pic_objects=
 precious_files_regex=
 prefer_static_libs=no
- preload=no
+ preload=false
 prev=
 prevarg=
 release=
@@ -5161,7 +6560,7 @@
 vinfo=
 vinfo_number=no
 weak_libs=
- single_module="${wl}-single_module"
+ single_module=$wl-single_module
 func_infer_tag $base_compile
 
 # We need to know -static, to get the right output filenames.
@@ -5169,15 +6568,15 @@
 do
 case $arg in
 -shared)
-	test "$build_libtool_libs" != yes && \
-	 func_fatal_configuration "can not build a shared library"
+	test yes != "$build_libtool_libs" \
+	 && func_fatal_configuration "cannot build a shared library"
 	build_old_libs=no
 	break
 	;;
 -all-static | -static | -static-libtool-libs)
 	case $arg in
 	-all-static)
-	 if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	 if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
 	 func_warning "complete static linking is impossible in this configuration"
 	 fi
 	 if test -n "$link_static_flag"; then
@@ -5210,7 +6609,7 @@
 
 # Go through the arguments, transforming them on the way.
 while test "$#" -gt 0; do
- arg="$1"
+ arg=$1
 shift
 func_quote_for_eval "$arg"
 qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6626,21 @@
 
 	case $prev in
 	bindir)
-	 bindir="$arg"
+	 bindir=$arg
 	 prev=
 	 continue
 	 ;;
 	dlfiles|dlprefiles)
-	 if test "$preload" = no; then
+	 $preload || {
 	 # Add the symbol object into the linking commands.
 	 func_append compile_command " @SYMFILE@"
 	 func_append finalize_command " @SYMFILE@"
-	 preload=yes
-	 fi
+	 preload=:
+	 }
 	 case $arg in
 	 *.la | *.lo) ;; # We handle these cases below.
 	 force)
-	 if test "$dlself" = no; then
+	 if test no = "$dlself"; then
 	 dlself=needless
 	 export_dynamic=yes
 	 fi
@@ -5249,9 +6648,9 @@
 	 continue
 	 ;;
 	 self)
-	 if test "$prev" = dlprefiles; then
+	 if test dlprefiles = "$prev"; then
 	 dlself=yes
-	 elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	 elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
 	 dlself=yes
 	 else
 	 dlself=needless
@@ -5261,7 +6660,7 @@
 	 continue
 	 ;;
 	 *)
-	 if test "$prev" = dlfiles; then
+	 if test dlfiles = "$prev"; then
 	 func_append dlfiles " $arg"
 	 else
 	 func_append dlprefiles " $arg"
@@ -5272,14 +6671,14 @@
 	 esac
 	 ;;
 	expsyms)
-	 export_symbols="$arg"
+	 export_symbols=$arg
 	 test -f "$arg" \
-	 || func_fatal_error "symbol file \`$arg' does not exist"
+	 || func_fatal_error "symbol file '$arg' does not exist"
 	 prev=
 	 continue
 	 ;;
 	expsyms_regex)
-	 export_symbols_regex="$arg"
+	 export_symbols_regex=$arg
 	 prev=
 	 continue
 	 ;;
@@ -5297,7 +6696,13 @@
 	 continue
 	 ;;
 	inst_prefix)
-	 inst_prefix_dir="$arg"
+	 inst_prefix_dir=$arg
+	 prev=
+	 continue
+	 ;;
+	mllvm)
+	 # Clang does not use LLVM to link, so we can simply discard any
+	 # '-mllvm $arg' options when doing the link step.
 	 prev=
 	 continue
 	 ;;
@@ -5321,21 +6726,21 @@
 
 		if test -z "$pic_object" ||
 		 test -z "$non_pic_object" ||
-		 test "$pic_object" = none &&
-		 test "$non_pic_object" = none; then
-		 func_fatal_error "cannot find name of object for \`$arg'"
+		 test none = "$pic_object" &&
+		 test none = "$non_pic_object"; then
+		 func_fatal_error "cannot find name of object for '$arg'"
 		fi
 
 		# Extract subdirectory from the argument.
 		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
+		xdir=$func_dirname_result
 
-		if test "$pic_object" != none; then
+		if test none != "$pic_object"; then
 		 # Prepend the subdirectory the object is found in.
-		 pic_object="$xdir$pic_object"
+		 pic_object=$xdir$pic_object
 
-		 if test "$prev" = dlfiles; then
-		 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		 if test dlfiles = "$prev"; then
+		 if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
 		 func_append dlfiles " $pic_object"
 		 prev=
 		 continue
@@ -5346,7 +6751,7 @@
 		 fi
 
 		 # CHECK ME: I think I busted this. -Ossama
-		 if test "$prev" = dlprefiles; then
+		 if test dlprefiles = "$prev"; then
 		 # Preload the old-style object.
 		 func_append dlprefiles " $pic_object"
 		 prev=
@@ -5354,23 +6759,23 @@
 
 		 # A PIC object.
 		 func_append libobjs " $pic_object"
-		 arg="$pic_object"
+		 arg=$pic_object
 		fi
 
 		# Non-PIC object.
-		if test "$non_pic_object" != none; then
+		if test none != "$non_pic_object"; then
 		 # Prepend the subdirectory the object is found in.
-		 non_pic_object="$xdir$non_pic_object"
+		 non_pic_object=$xdir$non_pic_object
 
 		 # A standard non-PIC object
 		 func_append non_pic_objects " $non_pic_object"
-		 if test -z "$pic_object" || test "$pic_object" = none ; then
-		 arg="$non_pic_object"
+		 if test -z "$pic_object" || test none = "$pic_object"; then
+		 arg=$non_pic_object
 		 fi
 		else
 		 # If the PIC object exists, use it instead.
 		 # $xdir was prepended to $pic_object above.
-		 non_pic_object="$pic_object"
+		 non_pic_object=$pic_object
 		 func_append non_pic_objects " $non_pic_object"
 		fi
 	 else
@@ -5378,7 +6783,7 @@
 		if $opt_dry_run; then
 		 # Extract subdirectory from the argument.
 		 func_dirname "$arg" "/" ""
-		 xdir="$func_dirname_result"
+		 xdir=$func_dirname_result
 
 		 func_lo2o "$arg"
 		 pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6791,29 @@
 		 func_append libobjs " $pic_object"
 		 func_append non_pic_objects " $non_pic_object"
 	 else
-		 func_fatal_error "\`$arg' is not a valid libtool object"
+		 func_fatal_error "'$arg' is not a valid libtool object"
 		fi
 	 fi
 	 done
 	 else
-	 func_fatal_error "link input file \`$arg' does not exist"
+	 func_fatal_error "link input file '$arg' does not exist"
 	 fi
 	 arg=$save_arg
 	 prev=
 	 continue
 	 ;;
+	os2dllname)
+	 os2dllname=$arg
+	 prev=
+	 continue
+	 ;;
 	precious_regex)
-	 precious_files_regex="$arg"
+	 precious_files_regex=$arg
 	 prev=
 	 continue
 	 ;;
 	release)
-	 release="-$arg"
+	 release=-$arg
 	 prev=
 	 continue
 	 ;;
@@ -5415,7 +6825,7 @@
 	 func_fatal_error "only absolute run-paths are allowed"
 	 ;;
 	 esac
-	 if test "$prev" = rpath; then
+	 if test rpath = "$prev"; then
 	 case "$rpath " in
 	 *" $arg "*) ;;
 	 *) func_append rpath " $arg" ;;
@@ -5430,7 +6840,7 @@
 	 continue
 	 ;;
 	shrext)
-	 shrext_cmds="$arg"
+	 shrext_cmds=$arg
 	 prev=
 	 continue
 	 ;;
@@ -5470,7 +6880,7 @@
 	esac
 fi # test -n "$prev"
 
- prevarg="$arg"
+ prevarg=$arg
 
 case $arg in
 -all-static)
@@ -5484,7 +6894,7 @@
 
 -allow-undefined)
 	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	func_fatal_error "'-allow-undefined' must not be used because it is the default"
 	;;
 
 -avoid-version)
@@ -5516,7 +6926,7 @@
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 	 func_fatal_error "more than one -exported-symbols argument is not allowed"
 	fi
-	if test "X$arg" = "X-export-symbols"; then
+	if test X-export-symbols = "X$arg"; then
 	 prev=expsyms
 	else
 	 prev=expsyms_regex
@@ -5550,9 +6960,9 @@
 	func_stripname "-L" '' "$arg"
 	if test -z "$func_stripname_result"; then
 	 if test "$#" -gt 0; then
-	 func_fatal_error "require no space between \`-L' and \`$1'"
+	 func_fatal_error "require no space between '-L' and '$1'"
 	 else
-	 func_fatal_error "need path for \`-L' option"
+	 func_fatal_error "need path for '-L' option"
 	 fi
 	fi
 	func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +6973,8 @@
 	*)
 	 absdir=`cd "$dir" && pwd`
 	 test -z "$absdir" && \
-	 func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	 dir="$absdir"
+	 func_fatal_error "cannot determine absolute directory name of '$dir'"
+	 dir=$absdir
 	 ;;
 	esac
 	case "$deplibs " in
@@ -5599,7 +7009,7 @@
 	;;
 
 -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
 	 case $host in
 	 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	 # These systems don't actually have a C or math library (as such)
@@ -5607,11 +7017,11 @@
 	 ;;
 	 *-*-os2*)
 	 # These systems don't actually have a C library (as such)
-	 test "X$arg" = "X-lc" && continue
+	 test X-lc = "X$arg" && continue
 	 ;;
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	 # Do not include libc due to us having libc/libc_r.
-	 test "X$arg" = "X-lc" && continue
+	 test X-lc = "X$arg" && continue
 	 ;;
 	 *-*-rhapsody* | *-*-darwin1.012)
 	 # Rhapsody C and math libraries are in the System framework
@@ -5620,16 +7030,16 @@
 	 ;;
 	 *-*-sco3.2v5* | *-*-sco5v6*)
 	 # Causes problems with __ctype
-	 test "X$arg" = "X-lc" && continue
+	 test X-lc = "X$arg" && continue
 	 ;;
 	 *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 	 # Compiler inserts libc in the correct place for threads to work
-	 test "X$arg" = "X-lc" && continue
+	 test X-lc = "X$arg" && continue
 	 ;;
 	 esac
-	elif test "X$arg" = "X-lc_r"; then
+	elif test X-lc_r = "X$arg"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 	 # Do not include libc_r directly, use -pthread flag.
 	 continue
 	 ;;
@@ -5639,6 +7049,11 @@
 	continue
 	;;
 
+ -mllvm)
+	prev=mllvm
+	continue
+	;;
+
 -module)
 	module=yes
 	continue
@@ -5668,7 +7083,7 @@
 	;;
 
 -multi_module)
-	single_module="${wl}-multi_module"
+	single_module=$wl-multi_module
 	continue
 	;;
 
@@ -5682,8 +7097,8 @@
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	 # The PATH hackery in wrapper scripts is required on Windows
 	 # and Darwin in order for the loader to find any dlls it needs.
-	 func_warning "\`-no-install' is ignored for $host"
-	 func_warning "assuming \`-no-fast-install' instead"
+	 func_warning "'-no-install' is ignored for $host"
+	 func_warning "assuming '-no-fast-install' instead"
 	 fast_install=no
 	 ;;
 	*) no_install=yes ;;
@@ -5701,6 +7116,11 @@
 	continue
 	;;
 
+ -os2dllname)
+	prev=os2dllname
+	continue
+	;;
+
 -o) prev=output ;;
 
 -precious-files-regex)
@@ -5788,14 +7208,14 @@
 	func_stripname '-Wc,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	 IFS="$save_ifs"
+	 IFS=$save_ifs
 func_quote_for_eval "$flag"
 	 func_append arg " $func_quote_for_eval_result"
 	 func_append compiler_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -5804,15 +7224,15 @@
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
 	arg=
-	save_ifs="$IFS"; IFS=','
+	save_ifs=$IFS; IFS=,
 	for flag in $args; do
-	 IFS="$save_ifs"
+	 IFS=$save_ifs
 func_quote_for_eval "$flag"
 	 func_append arg " $wl$func_quote_for_eval_result"
 	 func_append compiler_flags " $wl$func_quote_for_eval_result"
 	 func_append linker_flags " $func_quote_for_eval_result"
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
 	arg=$func_stripname_result
 	;;
@@ -5835,7 +7255,7 @@
 # -msg_* for osf cc
 -msg_*)
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
 # Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7267,49 @@
 # -m*, -t45*, -txscale* architecture-specific flags for GCC
 # -F/path path to uninstalled frameworks, gcc on darwin
 # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # -fstack-protector* stack protector flags for GCC
 # @file GCC response files
 # -tp=* Portland pgcc target processor selection
 # --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -specs=* GCC specs files
+ # -stdlib=* select c++ std lib with clang
+ # -fsanitize=* Clang/GCC memory and address sanitizer
 -64|-mips0-9|-r0-90-9*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
 -t45*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+ -specs=*|-fsanitize=*)
 func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 func_append compile_command " $arg"
 func_append finalize_command " $arg"
 func_append compiler_flags " $arg"
 continue
 ;;
 
+ -Z*)
+ if test os2 = "`expr $host : '.*$os2$'`"; then
+ # OS/2 uses -Zxxx to specify OS/2-specific options
+	 compiler_flags="$compiler_flags $arg"
+	 func_append compile_command " $arg"
+	 func_append finalize_command " $arg"
+	 case $arg in
+	 -Zlinker | -Zstack)
+	 prev=xcompiler
+	 ;;
+	 esac
+	 continue
+ else
+	 # Otherwise treat like 'Some other compiler flag' below
+	 func_quote_for_eval "$arg"
+	 arg=$func_quote_for_eval_result
+ fi
+	;;
+
 # Some other compiler flag.
 -* | +*)
 func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 
 *.$objext)
@@ -5886,21 +7330,21 @@
 
 	 if test -z "$pic_object" ||
 	 test -z "$non_pic_object" ||
-	 test "$pic_object" = none &&
-	 test "$non_pic_object" = none; then
-	 func_fatal_error "cannot find name of object for \`$arg'"
+	 test none = "$pic_object" &&
+	 test none = "$non_pic_object"; then
+	 func_fatal_error "cannot find name of object for '$arg'"
 	 fi
 
 	 # Extract subdirectory from the argument.
 	 func_dirname "$arg" "/" ""
-	 xdir="$func_dirname_result"
+	 xdir=$func_dirname_result
 
-	 if test "$pic_object" != none; then
+	 test none = "$pic_object" || {
 	 # Prepend the subdirectory the object is found in.
-	 pic_object="$xdir$pic_object"
+	 pic_object=$xdir$pic_object
 
-	 if test "$prev" = dlfiles; then
-	 if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+	 if test dlfiles = "$prev"; then
+	 if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
 		func_append dlfiles " $pic_object"
 		prev=
 		continue
@@ -5911,7 +7355,7 @@
 	 fi
 
 	 # CHECK ME: I think I busted this. -Ossama
-	 if test "$prev" = dlprefiles; then
+	 if test dlprefiles = "$prev"; then
 	 # Preload the old-style object.
 	 func_append dlprefiles " $pic_object"
 	 prev=
@@ -5919,23 +7363,23 @@
 
 	 # A PIC object.
 	 func_append libobjs " $pic_object"
-	 arg="$pic_object"
-	 fi
+	 arg=$pic_object
+	 }
 
 	 # Non-PIC object.
-	 if test "$non_pic_object" != none; then
+	 if test none != "$non_pic_object"; then
 	 # Prepend the subdirectory the object is found in.
-	 non_pic_object="$xdir$non_pic_object"
+	 non_pic_object=$xdir$non_pic_object
 
 	 # A standard non-PIC object
 	 func_append non_pic_objects " $non_pic_object"
-	 if test -z "$pic_object" || test "$pic_object" = none ; then
-	 arg="$non_pic_object"
+	 if test -z "$pic_object" || test none = "$pic_object"; then
+	 arg=$non_pic_object
 	 fi
 	 else
 	 # If the PIC object exists, use it instead.
 	 # $xdir was prepended to $pic_object above.
-	 non_pic_object="$pic_object"
+	 non_pic_object=$pic_object
 	 func_append non_pic_objects " $non_pic_object"
 	 fi
 	else
@@ -5943,7 +7387,7 @@
 	 if $opt_dry_run; then
 	 # Extract subdirectory from the argument.
 	 func_dirname "$arg" "/" ""
-	 xdir="$func_dirname_result"
+	 xdir=$func_dirname_result
 
 	 func_lo2o "$arg"
 	 pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7395,7 @@
 	 func_append libobjs " $pic_object"
 	 func_append non_pic_objects " $non_pic_object"
 	 else
-	 func_fatal_error "\`$arg' is not a valid libtool object"
+	 func_fatal_error "'$arg' is not a valid libtool object"
 	 fi
 	fi
 	;;
@@ -5967,11 +7411,11 @@
 	# A libtool-controlled library.
 
 	func_resolve_sysroot "$arg"
-	if test "$prev" = dlfiles; then
+	if test dlfiles = "$prev"; then
 	 # This library was specified with -dlopen.
 	 func_append dlfiles " $func_resolve_sysroot_result"
 	 prev=
-	elif test "$prev" = dlprefiles; then
+	elif test dlprefiles = "$prev"; then
 	 # The library was specified with -dlpreopen.
 	 func_append dlprefiles " $func_resolve_sysroot_result"
 	 prev=
@@ -5986,7 +7430,7 @@
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
 	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
+	arg=$func_quote_for_eval_result
 	;;
 esac # arg
 
@@ -5998,9 +7442,9 @@
 done # argument parsing loop
 
 test -n "$prev" && \
- func_fatal_help "the \`$prevarg' option requires an argument"
+ func_fatal_help "the '$prevarg' option requires an argument"
 
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
 eval arg=\"$export_dynamic_flag_spec\"
 func_append compile_command " $arg"
 func_append finalize_command " $arg"
@@ -6009,20 +7453,23 @@
 oldlibs=
 # calculate the name of the file, without its directory
 func_basename "$output"
- outputname="$func_basename_result"
- libobjs_save="$libobjs"
+ outputname=$func_basename_result
+ libobjs_save=$libobjs
 
 if test -n "$shlibpath_var"; then
 # get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
 else
 shlib_search_path=
 fi
 eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
 eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
+ # Definition is injected by LT_CONFIG during libtool generation.
+ func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
 func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
+ output_objdir=$func_dirname_result$objdir
 func_to_tool_file "$output_objdir/"
 tool_output_objdir=$func_to_tool_file_result
 # Create the object directory.
@@ -6045,7 +7492,7 @@
 # Find all interdependent deplibs by searching for libraries
 # that are linked more than once (e.g. -la -lb -la)
 for deplib in $deplibs; do
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
 	case "$libs " in
 	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
@@ -6053,7 +7500,7 @@
 func_append libs " $deplib"
 done
 
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
 libs="$predeps $libs $compiler_lib_search_path $postdeps"
 
 # Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7532,7 @@
 	 case $file in
 	 *.la) ;;
 	 *)
-	 func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	 func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
 	 ;;
 	 esac
 	done
@@ -6093,7 +7540,7 @@
 prog)
 	compile_deplibs=
 	finalize_deplibs=
-	alldeplibs=no
+	alldeplibs=false
 	newdlfiles=
 	newdlprefiles=
 	passes="conv scan dlopen dlpreopen link"
@@ -6105,32 +7552,32 @@
 for pass in $passes; do
 # The preopen pass in lib mode reverses $deplibs; put it back here
 # so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
+ if test lib,link = "$linkmode,$pass"; then
 	## FIXME: Find the place where the list is rebuilt in the wrong
 	## order, and fix it there properly
 tmp_deplibs=
 	for deplib in $deplibs; do
 	 tmp_deplibs="$deplib $tmp_deplibs"
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
 fi
 
- if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
+ if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass"; then
+	libs=$deplibs
 	deplibs=
 fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
 	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
+	dlopen) libs=$dlfiles ;;
+	dlpreopen) libs=$dlprefiles ;;
 	link)
 	 libs="$deplibs %DEPLIBS%"
 	 test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
 	 ;;
 	esac
 fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ if test lib,dlpreopen = "$linkmode,$pass"; then
 	# Collect and forward deplibs of preopened libtool libs
 	for lib in $dlprefiles; do
 	 # Ignore non-libtool-libs
@@ -6151,26 +7598,26 @@
 	 esac
 	 done
 	done
-	libs="$dlprefiles"
+	libs=$dlprefiles
 fi
- if test "$pass" = dlopen; then
+ if test dlopen = "$pass"; then
 	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
+	save_deplibs=$deplibs
 	deplibs=
 fi
 
 for deplib in $libs; do
 	lib=
-	found=no
+	found=false
 	case $deplib in
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
 |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	 if test "$linkmode,$pass" = "prog,link"; then
+	 if test prog,link = "$linkmode,$pass"; then
 	 compile_deplibs="$deplib $compile_deplibs"
 	 finalize_deplibs="$deplib $finalize_deplibs"
 	 else
 	 func_append compiler_flags " $deplib"
-	 if test "$linkmode" = lib ; then
+	 if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		 *" $deplib "*) ;;
 		 * ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6180,13 +7627,13 @@
 	 continue
 	 ;;
 	-l*)
-	 if test "$linkmode" != lib && test "$linkmode" != prog; then
-	 func_warning "\`-l' is ignored for archives/objects"
+	 if test lib != "$linkmode" && test prog != "$linkmode"; then
+	 func_warning "'-l' is ignored for archives/objects"
 	 continue
 	 fi
 	 func_stripname '-l' '' "$deplib"
 	 name=$func_stripname_result
-	 if test "$linkmode" = lib; then
+	 if test lib = "$linkmode"; then
 	 searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
 	 else
 	 searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6194,31 +7641,22 @@
 	 for searchdir in $searchdirs; do
 	 for search_ext in .la $std_shrext .so .a; do
 	 # Search the libtool library
-	 lib="$searchdir/lib${name}${search_ext}"
+	 lib=$searchdir/lib$name$search_ext
 	 if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		 found=yes
+		if test .la = "$search_ext"; then
+		 found=:
 		else
-		 found=no
+		 found=false
 		fi
 		break 2
 	 fi
 	 done
 	 done
-	 if test "$found" != yes; then
-	 # deplib doesn't seem to be a libtool library
-	 if test "$linkmode,$pass" = "prog,link"; then
-	 compile_deplibs="$deplib $compile_deplibs"
-	 finalize_deplibs="$deplib $finalize_deplibs"
-	 else
-	 deplibs="$deplib $deplibs"
-	 test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	 fi
-	 continue
-	 else # deplib is a libtool library
+	 if $found; then
+	 # deplib is a libtool library
 	 # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
 	 # We need to do some special things here, and not later.
-	 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	 if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 	 case " $predeps $postdeps " in
 	 *" $deplib "*)
 		if func_lalib_p "$lib"; then
@@ -6226,19 +7664,19 @@
 		 old_library=
 		 func_source "$lib"
 		 for l in $old_library $library_names; do
-		 ll="$l"
+		 ll=$l
 		 done
-		 if test "X$ll" = "X$old_library" ; then # only static version available
-		 found=no
+		 if test "X$ll" = "X$old_library"; then # only static version available
+		 found=false
 		 func_dirname "$lib" "" "."
-		 ladir="$func_dirname_result"
+		 ladir=$func_dirname_result
 		 lib=$ladir/$old_library
-		 if test "$linkmode,$pass" = "prog,link"; then
+		 if test prog,link = "$linkmode,$pass"; then
 		 compile_deplibs="$deplib $compile_deplibs"
 		 finalize_deplibs="$deplib $finalize_deplibs"
 		 else
 		 deplibs="$deplib $deplibs"
-		 test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		 test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
 		 fi
 		 continue
 		 fi
@@ -6247,15 +7685,25 @@
 	 *) ;;
 	 esac
 	 fi
+	 else
+	 # deplib doesn't seem to be a libtool library
+	 if test prog,link = "$linkmode,$pass"; then
+	 compile_deplibs="$deplib $compile_deplibs"
+	 finalize_deplibs="$deplib $finalize_deplibs"
+	 else
+	 deplibs="$deplib $deplibs"
+	 test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+	 fi
+	 continue
 	 fi
 	 ;; # -l
 	*.ltframework)
-	 if test "$linkmode,$pass" = "prog,link"; then
+	 if test prog,link = "$linkmode,$pass"; then
 	 compile_deplibs="$deplib $compile_deplibs"
 	 finalize_deplibs="$deplib $finalize_deplibs"
 	 else
 	 deplibs="$deplib $deplibs"
-	 if test "$linkmode" = lib ; then
+	 if test lib = "$linkmode"; then
 		case "$new_inherited_linker_flags " in
 		 *" $deplib "*) ;;
 		 * ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6268,18 +7716,18 @@
 	 case $linkmode in
 	 lib)
 	 deplibs="$deplib $deplibs"
-	 test "$pass" = conv && continue
+	 test conv = "$pass" && continue
 	 newdependency_libs="$deplib $newdependency_libs"
 	 func_stripname '-L' '' "$deplib"
 	 func_resolve_sysroot "$func_stripname_result"
 	 func_append newlib_search_path " $func_resolve_sysroot_result"
 	 ;;
 	 prog)
-	 if test "$pass" = conv; then
+	 if test conv = "$pass"; then
 	 deplibs="$deplib $deplibs"
 	 continue
 	 fi
-	 if test "$pass" = scan; then
+	 if test scan = "$pass"; then
 	 deplibs="$deplib $deplibs"
 	 else
 	 compile_deplibs="$deplib $compile_deplibs"
@@ -6290,13 +7738,13 @@
 	 func_append newlib_search_path " $func_resolve_sysroot_result"
 	 ;;
 	 *)
-	 func_warning "\`-L' is ignored for archives/objects"
+	 func_warning "'-L' is ignored for archives/objects"
 	 ;;
 	 esac # linkmode
 	 continue
 	 ;; # -L
 	-R*)
-	 if test "$pass" = link; then
+	 if test link = "$pass"; then
 	 func_stripname '-R' '' "$deplib"
 	 func_resolve_sysroot "$func_stripname_result"
 	 dir=$func_resolve_sysroot_result
@@ -6314,7 +7762,7 @@
 	 lib=$func_resolve_sysroot_result
 	 ;;
 	*.$libext)
-	 if test "$pass" = conv; then
+	 if test conv = "$pass"; then
 	 deplibs="$deplib $deplibs"
 	 continue
 	 fi
@@ -6325,21 +7773,26 @@
 	 case " $dlpreconveniencelibs " in
 	 *" $deplib "*) ;;
 	 *)
-	 valid_a_lib=no
+	 valid_a_lib=false
 	 case $deplibs_check_method in
 		match_pattern*)
 		 set dummy $deplibs_check_method; shift
 		 match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`
 		 if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 		 | $EGREP "$match_pattern_regex" > /dev/null; then
-		 valid_a_lib=yes
+		 valid_a_lib=:
 		 fi
 		;;
 		pass_all)
-		 valid_a_lib=yes
+		 valid_a_lib=:
 		;;
 	 esac
-	 if test "$valid_a_lib" != yes; then
+	 if $valid_a_lib; then
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	 else
 		echo
 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
 		echo "*** I have the capability to make that library automatically link in when"
@@ -6347,18 +7800,13 @@
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because the file extensions .$libext of this argument makes me believe"
 		echo "*** that it is just a static archive that I should not use here."
-	 else
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
 	 fi
 	 ;;
 	 esac
 	 continue
 	 ;;
 	 prog)
-	 if test "$pass" != link; then
+	 if test link != "$pass"; then
 	 deplibs="$deplib $deplibs"
 	 else
 	 compile_deplibs="$deplib $compile_deplibs"
@@ -6369,10 +7817,10 @@
 	 esac # linkmode
 	 ;; # *.$libext
 	*.lo | *.$objext)
-	 if test "$pass" = conv; then
+	 if test conv = "$pass"; then
 	 deplibs="$deplib $deplibs"
-	 elif test "$linkmode" = prog; then
-	 if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	 elif test prog = "$linkmode"; then
+	 if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
 	 # If there is no dlopen support or we're linking statically,
 	 # we need to preload.
 	 func_append newdlprefiles " $deplib"
@@ -6385,22 +7833,20 @@
 	 continue
 	 ;;
 	%DEPLIBS%)
-	 alldeplibs=yes
+	 alldeplibs=:
 	 continue
 	 ;;
 	esac # case $deplib
 
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	 func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
+	$found || test -f "$lib" \
+	 || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
 
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$lib" \
-	 || func_fatal_error "\`$lib' is not a valid libtool archive"
+	 || func_fatal_error "'$lib' is not a valid libtool archive"
 
 	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
+	ladir=$func_dirname_result
 
 	dlname=
 	dlopen=
@@ -6430,19 +7876,19 @@
 	 done
 	fi
 	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan" ||
-	 { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	if test lib,link = "$linkmode,$pass" ||
+	 test prog,scan = "$linkmode,$pass" ||
+	 { test prog != "$linkmode" && test lib != "$linkmode"; }; then
 	 test -n "$dlopen" && func_append dlfiles " $dlopen"
 	 test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
-	if test "$pass" = conv; then
+	if test conv = "$pass"; then
 	 # Only check for convenience libraries
 	 deplibs="$lib $deplibs"
 	 if test -z "$libdir"; then
 	 if test -z "$old_library"; then
-	 func_fatal_error "cannot find name of link library for \`$lib'"
+	 func_fatal_error "cannot find name of link library for '$lib'"
 	 fi
 	 # It is a libtool convenience library, so add in its objects.
 	 func_append convenience " $ladir/$objdir/$old_library"
@@ -6450,15 +7896,15 @@
 	 tmp_libs=
 	 for deplib in $dependency_libs; do
 	 deplibs="$deplib $deplibs"
-	 if $opt_preserve_dup_deps ; then
+	 if $opt_preserve_dup_deps; then
 		case "$tmp_libs " in
 		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 		esac
 	 fi
 	 func_append tmp_libs " $deplib"
 	 done
-	 elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	 func_fatal_error "\`$lib' is not a convenience library"
+	 elif test prog != "$linkmode" && test lib != "$linkmode"; then
+	 func_fatal_error "'$lib' is not a convenience library"
 	 fi
 	 continue
 	fi # $pass = conv
@@ -6467,26 +7913,26 @@
 	# Get the name of the library we link against.
 	linklib=
 	if test -n "$old_library" &&
-	 { test "$prefer_static_libs" = yes ||
-	 test "$prefer_static_libs,$installed" = "built,no"; }; then
+	 { test yes = "$prefer_static_libs" ||
+	 test built,no = "$prefer_static_libs,$installed"; }; then
 	 linklib=$old_library
 	else
 	 for l in $old_library $library_names; do
-	 linklib="$l"
+	 linklib=$l
 	 done
 	fi
 	if test -z "$linklib"; then
-	 func_fatal_error "cannot find name of link library for \`$lib'"
+	 func_fatal_error "cannot find name of link library for '$lib'"
 	fi
 
 	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	 if test -z "$libdir"; then
-	 func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	 fi
+	if test dlopen = "$pass"; then
+	 test -z "$libdir" \
+	 && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
 	 if test -z "$dlname" ||
-	 test "$dlopen_support" != yes ||
-	 test "$build_libtool_libs" = no; then
+	 test yes != "$dlopen_support" ||
+	 test no = "$build_libtool_libs"
+	 then
 	 # If there is no dlname, no dlopen support or we're linking
 	 # statically, we need to preload. We also need to preload any
 	 # dependent libraries so libltdl's deplib preloader doesn't
@@ -6500,40 +7946,40 @@
 
 	# We need an absolute path.
 	case $ladir in
-	\\/* | A-Za-z:\\/*) abs_ladir="$ladir" ;;
+	\\/* | A-Za-z:\\/*) abs_ladir=$ladir ;;
 	*)
 	 abs_ladir=`cd "$ladir" && pwd`
 	 if test -z "$abs_ladir"; then
-	 func_warning "cannot determine absolute directory name of \`$ladir'"
+	 func_warning "cannot determine absolute directory name of '$ladir'"
 	 func_warning "passing it literally to the linker, although it might fail"
-	 abs_ladir="$ladir"
+	 abs_ladir=$ladir
 	 fi
 	 ;;
 	esac
 	func_basename "$lib"
-	laname="$func_basename_result"
+	laname=$func_basename_result
 
 	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
+	if test yes = "$installed"; then
 	 if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	 func_warning "library \`$lib' was moved."
-	 dir="$ladir"
-	 absdir="$abs_ladir"
-	 libdir="$abs_ladir"
+	 func_warning "library '$lib' was moved."
+	 dir=$ladir
+	 absdir=$abs_ladir
+	 libdir=$abs_ladir
 	 else
-	 dir="$lt_sysroot$libdir"
-	 absdir="$lt_sysroot$libdir"
+	 dir=$lt_sysroot$libdir
+	 absdir=$lt_sysroot$libdir
 	 fi
-	 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	 test yes = "$hardcode_automatic" && avoidtemprpath=yes
 	else
 	 if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	 dir="$ladir"
-	 absdir="$abs_ladir"
+	 dir=$ladir
+	 absdir=$abs_ladir
 	 # Remove this search path later
 	 func_append notinst_path " $abs_ladir"
 	 else
-	 dir="$ladir/$objdir"
-	 absdir="$abs_ladir/$objdir"
+	 dir=$ladir/$objdir
+	 absdir=$abs_ladir/$objdir
 	 # Remove this search path later
 	 func_append notinst_path " $abs_ladir"
 	 fi
@@ -6542,11 +7988,11 @@
 	name=$func_stripname_result
 
 	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	 if test -z "$libdir" && test "$linkmode" = prog; then
-	 func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	if test dlpreopen = "$pass"; then
+	 if test -z "$libdir" && test prog = "$linkmode"; then
+	 func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
 	 fi
-	 case "$host" in
+	 case $host in
 	 # special handling for platforms with PE-DLLs.
 	 *cygwin* | *mingw* | *cegcc* )
 	 # Linker will automatically link against shared library if both
@@ -6590,9 +8036,9 @@
 
 	if test -z "$libdir"; then
 	 # Link the convenience library
-	 if test "$linkmode" = lib; then
+	 if test lib = "$linkmode"; then
 	 deplibs="$dir/$old_library $deplibs"
-	 elif test "$linkmode,$pass" = "prog,link"; then
+	 elif test prog,link = "$linkmode,$pass"; then
 	 compile_deplibs="$dir/$old_library $compile_deplibs"
 	 finalize_deplibs="$dir/$old_library $finalize_deplibs"
 	 else
@@ -6602,14 +8048,14 @@
 	fi
 
 
-	if test "$linkmode" = prog && test "$pass" != link; then
+	if test prog = "$linkmode" && test link != "$pass"; then
 	 func_append newlib_search_path " $ladir"
 	 deplibs="$lib $deplibs"
 
-	 linkalldeplibs=no
-	 if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	 test "$build_libtool_libs" = no; then
-	 linkalldeplibs=yes
+	 linkalldeplibs=false
+	 if test no != "$link_all_deplibs" || test -z "$library_names" ||
+	 test no = "$build_libtool_libs"; then
+	 linkalldeplibs=:
 	 fi
 
 	 tmp_libs=
@@ -6621,14 +8067,14 @@
 		 ;;
 	 esac
 	 # Need to link against all dependency_libs?
-	 if test "$linkalldeplibs" = yes; then
+	 if $linkalldeplibs; then
 	 deplibs="$deplib $deplibs"
 	 else
 	 # Need to hardcode shared library paths
 	 # or/and link against static libraries
 	 newdependency_libs="$deplib $newdependency_libs"
 	 fi
-	 if $opt_preserve_dup_deps ; then
+	 if $opt_preserve_dup_deps; then
 	 case "$tmp_libs " in
 	 *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	 esac
@@ -6638,15 +8084,15 @@
 	 continue
 	fi # $linkmode = prog...
 
-	if test "$linkmode,$pass" = "prog,link"; then
+	if test prog,link = "$linkmode,$pass"; then
 	 if test -n "$library_names" &&
-	 { { test "$prefer_static_libs" = no ||
-	 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	 { { test no = "$prefer_static_libs" ||
+	 test built,yes = "$prefer_static_libs,$installed"; } ||
 	 test -z "$old_library"; }; then
 	 # We need to hardcode the library path
-	 if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	 if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
 	 # Make sure the rpath contains only unique directories.
-	 case "$temp_rpath:" in
+	 case $temp_rpath: in
 	 *"$absdir:"*) ;;
 	 *) func_append temp_rpath "$absdir:" ;;
 	 esac
@@ -6675,9 +8121,9 @@
 	 esac
 	 fi # $linkmode,$pass = prog,link...
 
-	 if test "$alldeplibs" = yes &&
-	 { test "$deplibs_check_method" = pass_all ||
-	 { test "$build_libtool_libs" = yes &&
+	 if $alldeplibs &&
+	 { test pass_all = "$deplibs_check_method" ||
+	 { test yes = "$build_libtool_libs" &&
 		 test -n "$library_names"; }; }; then
 	 # We only need to search for static libraries
 	 continue
@@ -6686,19 +8132,19 @@
 
 	link_static=no # Whether the deplib will be linked statically
 	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
+	if test built = "$use_static_libs" && test yes = "$installed"; then
 	 use_static_libs=no
 	fi
 	if test -n "$library_names" &&
-	 { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	 { test no = "$use_static_libs" || test -z "$old_library"; }; then
 	 case $host in
-	 *cygwin* | *mingw* | *cegcc*)
+	 *cygwin* | *mingw* | *cegcc* | *os2*)
 	 # No point in relinking DLLs because paths are not encoded
 	 func_append notinst_deplibs " $lib"
 	 need_relink=no
 	 ;;
 	 *)
-	 if test "$installed" = no; then
+	 if test no = "$installed"; then
 	 func_append notinst_deplibs " $lib"
 	 need_relink=yes
 	 fi
@@ -6708,24 +8154,24 @@
 
 	 # Warn about portability, can't link against -module's on some
 	 # systems (darwin). Don't bleat about dlopened modules though!
-	 dlopenmodule=""
+	 dlopenmodule=
 	 for dlpremoduletest in $dlprefiles; do
 	 if test "X$dlpremoduletest" = "X$lib"; then
-	 dlopenmodule="$dlpremoduletest"
+	 dlopenmodule=$dlpremoduletest
 	 break
 	 fi
 	 done
-	 if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	 if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
 	 echo
-	 if test "$linkmode" = prog; then
+	 if test prog = "$linkmode"; then
 	 $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	 else
 	 $ECHO "*** Warning: Linking the shared library $output against the loadable module"
 	 fi
 	 $ECHO "*** $linklib is not portable!"
 	 fi
-	 if test "$linkmode" = lib &&
-	 test "$hardcode_into_libs" = yes; then
+	 if test lib = "$linkmode" &&
+	 test yes = "$hardcode_into_libs"; then
 	 # Hardcode the library path.
 	 # Skip directories that are in the system default run-time
 	 # search path.
@@ -6753,43 +8199,43 @@
 	 # figure out the soname
 	 set dummy $library_names
 	 shift
-	 realname="$1"
+	 realname=$1
 	 shift
 	 libname=`eval "\\$ECHO \"$libname_spec\""`
 	 # use dlname if we got it. it's perfectly good, no?
 	 if test -n "$dlname"; then
-	 soname="$dlname"
+	 soname=$dlname
 	 elif test -n "$soname_spec"; then
 	 # bleh windows
 	 case $host in
-	 *cygwin* | mingw* | *cegcc*)
+	 *cygwin* | mingw* | *cegcc* | *os2*)
 	 func_arith $current - $age
 		major=$func_arith_result
-		versuffix="-$major"
+		versuffix=-$major
 		;;
 	 esac
 	 eval soname=\"$soname_spec\"
 	 else
-	 soname="$realname"
+	 soname=$realname
 	 fi
 
 	 # Make a new name for the extract_expsyms_cmds to use
-	 soroot="$soname"
+	 soroot=$soname
 	 func_basename "$soroot"
-	 soname="$func_basename_result"
+	 soname=$func_basename_result
 	 func_stripname 'lib' '.dll' "$soname"
 	 newlib=libimp-$func_stripname_result.a
 
 	 # If the library has no export list, then create one now
 	 if test -f "$output_objdir/$soname-def"; then :
 	 else
-	 func_verbose "extracting exported symbol list from \`$soname'"
+	 func_verbose "extracting exported symbol list from '$soname'"
 	 func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 	 fi
 
 	 # Create $newlib
 	 if test -f "$output_objdir/$newlib"; then :; else
-	 func_verbose "generating import library for \`$soname'"
+	 func_verbose "generating import library for '$soname'"
 	 func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 	 fi
 	 # make sure the library variables are pointing to the new library
@@ -6797,58 +8243,58 @@
 	 linklib=$newlib
 	 fi # test -n "$old_archive_from_expsyms_cmds"
 
-	 if test "$linkmode" = prog || test "$opt_mode" != relink; then
+	 if test prog = "$linkmode" || test relink != "$opt_mode"; then
 	 add_shlibpath=
 	 add_dir=
 	 add=
 	 lib_linked=yes
 	 case $hardcode_action in
 	 immediate | unsupported)
-	 if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
+	 if test no = "$hardcode_direct"; then
+		add=$dir/$linklib
 		case $host in
-		 *-*-sco3.2v5.0.024*) add_dir="-L$dir" ;;
-		 *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		 *-*-sco3.2v5.0.024*) add_dir=-L$dir ;;
+		 *-*-sysv4*uw2*) add_dir=-L$dir ;;
 		 *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.01.10* | \
-		 *-*-unixware7*) add_dir="-L$dir" ;;
+		 *-*-unixware7*) add_dir=-L$dir ;;
 		 *-*-darwin* )
-		 # if the lib is a (non-dlopened) module then we can not
+		 # if the lib is a (non-dlopened) module then we cannot
 		 # link against it, someone is ignoring the earlier warnings
 		 if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": ^:* bundle" >/dev/null ; then
+			 $GREP ": ^:* bundle" >/dev/null; then
 		 if test "X$dlopenmodule" != "X$lib"; then
 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
+			if test -z "$old_library"; then
 			 echo
 			 echo "*** And there doesn't seem to be a static archive available"
 			 echo "*** The link will probably fail, sorry"
 			else
-			 add="$dir/$old_library"
+			 add=$dir/$old_library
 			fi
 		 elif test -n "$old_library"; then
-			add="$dir/$old_library"
+			add=$dir/$old_library
 		 fi
 		 fi
 		esac
-	 elif test "$hardcode_minus_L" = no; then
+	 elif test no = "$hardcode_minus_L"; then
 		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
+		*-*-sunos*) add_shlibpath=$dir ;;
 		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	 elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add_dir=-L$dir
+		add=-l$name
+	 elif test no = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	 else
 		lib_linked=no
 	 fi
 	 ;;
 	 relink)
-	 if test "$hardcode_direct" = yes &&
-	 test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	 elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$absdir"
+	 if test yes = "$hardcode_direct" &&
+	 test no = "$hardcode_direct_absolute"; then
+		add=$dir/$linklib
+	 elif test yes = "$hardcode_minus_L"; then
+		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
@@ -6857,10 +8303,10 @@
 		 ;;
 		 esac
 		fi
-		add="-l$name"
-	 elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
+		add=-l$name
+	 elif test yes = "$hardcode_shlibpath_var"; then
+		add_shlibpath=$dir
+		add=-l$name
 	 else
 		lib_linked=no
 	 fi
@@ -6868,7 +8314,7 @@
 	 *) lib_linked=no ;;
 	 esac
 
-	 if test "$lib_linked" != yes; then
+	 if test yes != "$lib_linked"; then
 	 func_fatal_configuration "unsupported hardcode properties"
 	 fi
 
@@ -6878,15 +8324,15 @@
 	 *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	 esac
 	 fi
-	 if test "$linkmode" = prog; then
+	 if test prog = "$linkmode"; then
 	 test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
 	 test -n "$add" && compile_deplibs="$add $compile_deplibs"
 	 else
 	 test -n "$add_dir" && deplibs="$add_dir $deplibs"
 	 test -n "$add" && deplibs="$add $deplibs"
-	 if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
+	 if test yes != "$hardcode_direct" &&
+		 test yes != "$hardcode_minus_L" &&
+		 test yes = "$hardcode_shlibpath_var"; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
 		*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6895,33 +8341,33 @@
 	 fi
 	 fi
 
-	 if test "$linkmode" = prog || test "$opt_mode" = relink; then
+	 if test prog = "$linkmode" || test relink = "$opt_mode"; then
 	 add_shlibpath=
 	 add_dir=
 	 add=
 	 # Finalize command for both is simple: just hardcode it.
-	 if test "$hardcode_direct" = yes &&
-	 test "$hardcode_direct_absolute" = no; then
-	 add="$libdir/$linklib"
-	 elif test "$hardcode_minus_L" = yes; then
-	 add_dir="-L$libdir"
-	 add="-l$name"
-	 elif test "$hardcode_shlibpath_var" = yes; then
+	 if test yes = "$hardcode_direct" &&
+	 test no = "$hardcode_direct_absolute"; then
+	 add=$libdir/$linklib
+	 elif test yes = "$hardcode_minus_L"; then
+	 add_dir=-L$libdir
+	 add=-l$name
+	 elif test yes = "$hardcode_shlibpath_var"; then
 	 case :$finalize_shlibpath: in
 	 *":$libdir:"*) ;;
 	 *) func_append finalize_shlibpath "$libdir:" ;;
 	 esac
-	 add="-l$name"
-	 elif test "$hardcode_automatic" = yes; then
+	 add=-l$name
+	 elif test yes = "$hardcode_automatic"; then
 	 if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
+		 test -f "$inst_prefix_dir$libdir/$linklib"; then
+		add=$inst_prefix_dir$libdir/$linklib
 	 else
-		add="$libdir/$linklib"
+		add=$libdir/$linklib
 	 fi
 	 else
 	 # We cannot seem to hardcode it, guess we'll fake it.
-	 add_dir="-L$libdir"
+	 add_dir=-L$libdir
 	 # Try looking first in the location we're being installed to.
 	 if test -n "$inst_prefix_dir"; then
 		case $libdir in
@@ -6930,10 +8376,10 @@
 		 ;;
 		esac
 	 fi
-	 add="-l$name"
+	 add=-l$name
 	 fi
 
-	 if test "$linkmode" = prog; then
+	 if test prog = "$linkmode"; then
 	 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 	 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 	 else
@@ -6941,43 +8387,43 @@
 	 test -n "$add" && deplibs="$add $deplibs"
 	 fi
 	 fi
-	elif test "$linkmode" = prog; then
+	elif test prog = "$linkmode"; then
 	 # Here we assume that one of hardcode_direct or hardcode_minus_L
 	 # is not unsupported. This is valid on all known static and
 	 # shared platforms.
-	 if test "$hardcode_direct" != unsupported; then
-	 test -n "$old_library" && linklib="$old_library"
+	 if test unsupported != "$hardcode_direct"; then
+	 test -n "$old_library" && linklib=$old_library
 	 compile_deplibs="$dir/$linklib $compile_deplibs"
 	 finalize_deplibs="$dir/$linklib $finalize_deplibs"
 	 else
 	 compile_deplibs="-l$name -L$dir $compile_deplibs"
 	 finalize_deplibs="-l$name -L$dir $finalize_deplibs"
 	 fi
-	elif test "$build_libtool_libs" = yes; then
+	elif test yes = "$build_libtool_libs"; then
 	 # Not a shared library
-	 if test "$deplibs_check_method" != pass_all; then
+	 if test pass_all != "$deplibs_check_method"; then
 	 # We're trying link a shared library against a static one
 	 # but the system doesn't support it.
 
 	 # Just print a warning and add the library to dependency_libs so
 	 # that the program can be linked against the static library.
 	 echo
-	 $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	 $ECHO "*** Warning: This system cannot link to static lib archive $lib."
 	 echo "*** I have the capability to make that library automatically link in when"
 	 echo "*** you link to this library. But I can only do this if you have a"
 	 echo "*** shared version of the library, which you do not appear to have."
-	 if test "$module" = yes; then
+	 if test yes = "$module"; then
 	 echo "*** But as you try to build a module library, libtool will still create "
 	 echo "*** a static module, that should work as long as the dlopening application"
 	 echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	 if test -z "$global_symbol_pipe"; then
 		echo
 		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
 		echo "*** not find such a program. So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+		echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	 fi
-	 if test "$build_old_libs" = no; then
+	 if test no = "$build_old_libs"; then
 		build_libtool_libs=module
 		build_old_libs=yes
 	 else
@@ -6990,11 +8436,11 @@
 	 fi
 	fi # link shared/static library?
 
-	if test "$linkmode" = lib; then
+	if test lib = "$linkmode"; then
 	 if test -n "$dependency_libs" &&
-	 { test "$hardcode_into_libs" != yes ||
-	 test "$build_old_libs" = yes ||
-	 test "$link_static" = yes; }; then
+	 { test yes != "$hardcode_into_libs" ||
+	 test yes = "$build_old_libs" ||
+	 test yes = "$link_static"; }; then
 	 # Extract -R from dependency_libs
 	 temp_deplibs=
 	 for libdir in $dependency_libs; do
@@ -7008,12 +8454,12 @@
 	 *) func_append temp_deplibs " $libdir";;
 	 esac
 	 done
-	 dependency_libs="$temp_deplibs"
+	 dependency_libs=$temp_deplibs
 	 fi
 
 	 func_append newlib_search_path " $absdir"
 	 # Link against this library
-	 test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	 test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	 # ... and its dependency_libs
 	 tmp_libs=
 	 for deplib in $dependency_libs; do
@@ -7023,7 +8469,7 @@
 func_resolve_sysroot "$func_stripname_result";;
 *) func_resolve_sysroot "$deplib" ;;
 esac
-	 if $opt_preserve_dup_deps ; then
+	 if $opt_preserve_dup_deps; then
 	 case "$tmp_libs " in
 	 *" $func_resolve_sysroot_result "*)
 func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7032,12 +8478,12 @@
 	 func_append tmp_libs " $func_resolve_sysroot_result"
 	 done
 
-	 if test "$link_all_deplibs" != no; then
+	 if test no != "$link_all_deplibs"; then
 	 # Add the search paths of all dependency libraries
 	 for deplib in $dependency_libs; do
 	 path=
 	 case $deplib in
-	 -L*) path="$deplib" ;;
+	 -L*) path=$deplib ;;
 	 *.la)
 	 func_resolve_sysroot "$deplib"
 	 deplib=$func_resolve_sysroot_result
@@ -7045,12 +8491,12 @@
 		dir=$func_dirname_result
 		# We need an absolute path.
 		case $dir in
-		\\/* | A-Za-z:\\/*) absdir="$dir" ;;
+		\\/* | A-Za-z:\\/*) absdir=$dir ;;
 		*)
 		 absdir=`cd "$dir" && pwd`
 		 if test -z "$absdir"; then
-		 func_warning "cannot determine absolute directory name of \`$dir'"
-		 absdir="$dir"
+		 func_warning "cannot determine absolute directory name of '$dir'"
+		 absdir=$dir
 		 fi
 		 ;;
 		esac
@@ -7058,35 +8504,35 @@
 		case $host in
 		*-*-darwin*)
 		 depdepl=
-		 eval deplibrary_names=`${SED} -n -e 's/^library_names=$.*$$/\1/p' $deplib`
-		 if test -n "$deplibrary_names" ; then
-		 for tmp in $deplibrary_names ; do
+		 eval deplibrary_names=`$SED -n -e 's/^library_names=$.*$$/\1/p' $deplib`
+		 if test -n "$deplibrary_names"; then
+		 for tmp in $deplibrary_names; do
 		 depdepl=$tmp
 		 done
-		 if test -f "$absdir/$objdir/$depdepl" ; then
-		 depdepl="$absdir/$objdir/$depdepl"
-		 darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+		 if test -f "$absdir/$objdir/$depdepl"; then
+		 depdepl=$absdir/$objdir/$depdepl
+		 darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
 if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
 fi
-		 func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		 func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		 func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+		 func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
 		 path=
 		 fi
 		 fi
 		 ;;
 		*)
-		 path="-L$absdir/$objdir"
+		 path=-L$absdir/$objdir
 		 ;;
 		esac
 		else
-		 eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
+		 eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $deplib`
 		 test -z "$libdir" && \
-		 func_fatal_error "\`$deplib' is not a valid libtool archive"
+		 func_fatal_error "'$deplib' is not a valid libtool archive"
 		 test "$absdir" != "$libdir" && \
-		 func_warning "\`$deplib' seems to be moved"
+		 func_warning "'$deplib' seems to be moved"
 
-		 path="-L$absdir"
+		 path=-L$absdir
 		fi
 		;;
 	 esac
@@ -7098,23 +8544,23 @@
 	 fi # link_all_deplibs != no
 	fi # linkmode = lib
 done # for deplib in $libs
- if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
+ if test link = "$pass"; then
+	if test prog = "$linkmode"; then
 	 compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	 finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
 	 compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% $^ $*$.ltframework% -framework \1%g'`
 	fi
 fi
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
+ dependency_libs=$newdependency_libs
+ if test dlpreopen = "$pass"; then
 	# Link the dlpreopened libraries before other libraries
 	for deplib in $save_deplibs; do
 	 deplibs="$deplib $deplibs"
 	done
 fi
- if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
+ if test dlopen != "$pass"; then
+	test conv = "$pass" || {
 	 # Make sure lib_search_path contains only unique directories.
 	 lib_search_path=
 	 for dir in $newlib_search_path; do
@@ -7124,12 +8570,12 @@
 	 esac
 	 done
 	 newlib_search_path=
-	fi
+	}
 
-	if test "$linkmode,$pass" != "prog,link"; then
-	 vars="deplibs"
-	else
+	if test prog,link = "$linkmode,$pass"; then
 	 vars="compile_deplibs finalize_deplibs"
+	else
+	 vars=deplibs
 	fi
 	for var in $vars dependency_libs; do
 	 # Add libraries to $var in reverse order
@@ -7187,62 +8633,93 @@
 	 eval $var=\"$tmp_libs\"
 	done # for var
 fi
+
+ # Add Sun CC postdeps if required:
+ test CXX = "$tagname" && {
+ case $host_os in
+ linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C++ 5.9
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ func_cc_basename "$CC"
+ case $func_cc_basename_result in
+ CC* | sunCC*)
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ }
+
 # Last step: remove runtime libs from dependency_libs
 # (they stay in deplibs)
 tmp_libs=
- for i in $dependency_libs ; do
+ for i in $dependency_libs; do
 	case " $predeps $postdeps $compiler_lib_search_path " in
 	*" $i "*)
-	 i=""
+	 i=
 	 ;;
 	esac
-	if test -n "$i" ; then
+	if test -n "$i"; then
 	 func_append tmp_libs " $i"
 	fi
 done
 dependency_libs=$tmp_libs
 done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
+ if test prog = "$linkmode"; then
+ dlfiles=$newdlfiles
 fi
- if test "$linkmode" = prog || test "$linkmode" = lib; then
- dlprefiles="$newdlprefiles"
+ if test prog = "$linkmode" || test lib = "$linkmode"; then
+ dlprefiles=$newdlprefiles
 fi
 
 case $linkmode in
 oldlib)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for archives"
 fi
 
 case " $deplibs" in
 *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+	func_warning "'-l' and '-L' are ignored for archives" ;;
 esac
 
 test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
+	func_warning "'-rpath' is ignored for archives"
 
 test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
+	func_warning "'-R' is ignored for archives"
 
 test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
+	func_warning "'-version-info/-version-number' is ignored for archives"
 
 test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
+	func_warning "'-release' is ignored for archives"
 
 test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
+	func_warning "'-export-symbols' is ignored for archives"
 
 # Now set the variables for building old libraries.
 build_libtool_libs=no
- oldlibs="$output"
+ oldlibs=$output
 func_append objs "$old_deplibs"
 ;;
 
 lib)
- # Make sure we only generate libraries of the form `libNAME.la'.
+ # Make sure we only generate libraries of the form 'libNAME.la'.
 case $outputname in
 lib*)
 	func_stripname 'lib' '.la' "$outputname"
@@ -7251,10 +8728,10 @@
 	eval libname=\"$libname_spec\"
 	;;
 *)
-	test "$module" = no && \
-	 func_fatal_help "libtool library \`$output' must begin with \`lib'"
+	test no = "$module" \
+	 && func_fatal_help "libtool library '$output' must begin with 'lib'"
 
-	if test "$need_lib_prefix" != no; then
+	if test no != "$need_lib_prefix"; then
 	 # Add the "lib" prefix for modules if required
 	 func_stripname '' '.la' "$outputname"
 	 name=$func_stripname_result
@@ -7268,8 +8745,8 @@
 esac
 
 if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	 func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	if test pass_all != "$deplibs_check_method"; then
+	 func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
 	else
 	 echo
 	 $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7278,21 +8755,21 @@
 	fi
 fi
 
- test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
+ test no = "$dlself" \
+	|| func_warning "'-dlopen self' is ignored for libtool libraries"
 
 set dummy $rpath
 shift
- test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
+ test 1 -lt "$#" \
+	&& func_warning "ignoring multiple '-rpath's for a libtool library"
 
- install_libdir="$1"
+ install_libdir=$1
 
 oldlibs=
 if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
+	if test yes = "$build_libtool_libs"; then
 	 # Building a libtool convenience library.
-	 # Some compilers have problems with a `.al' extension so
+	 # Some compilers have problems with a '.al' extension so
 	 # convenience libraries should have the same extension an
 	 # archive normally would.
 	 oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7301,20 +8778,20 @@
 	fi
 
 	test -n "$vinfo" && \
-	 func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+	 func_warning "'-version-info/-version-number' is ignored for convenience libraries"
 
 	test -n "$release" && \
-	 func_warning "\`-release' is ignored for convenience libraries"
+	 func_warning "'-release' is ignored for convenience libraries"
 else
 
 	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
+	save_ifs=$IFS; IFS=:
 	set dummy $vinfo 0 0 0
 	shift
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	test -n "$7" && \
-	 func_fatal_help "too many parameters to \`-version-info'"
+	 func_fatal_help "too many parameters to '-version-info'"
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
@@ -7322,45 +8799,45 @@
 
 	case $vinfo_number in
 	yes)
-	 number_major="$1"
-	 number_minor="$2"
-	 number_revision="$3"
+	 number_major=$1
+	 number_minor=$2
+	 number_revision=$3
 	 #
 	 # There are really only two kinds -- those that
 	 # use the current revision as the major version
 	 # and those that subtract age and use age as
 	 # a minor version. But, then there is irix
-	 # which has an extra 1 added just for fun
+	 # that 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)
+	 darwin|freebsd-elf|linux|osf|windows|none)
 	 func_arith $number_major + $number_minor
 	 current=$func_arith_result
-	 age="$number_minor"
-	 revision="$number_revision"
+	 age=$number_minor
+	 revision=$number_revision
 	 ;;
-	 freebsd-aout|freebsd-elf|qnx|sunos)
-	 current="$number_major"
-	 revision="$number_minor"
-	 age="0"
+	 freebsd-aout|qnx|sunos)
+	 current=$number_major
+	 revision=$number_minor
+	 age=0
 	 ;;
 	 irix|nonstopux)
 	 func_arith $number_major + $number_minor
 	 current=$func_arith_result
-	 age="$number_minor"
-	 revision="$number_minor"
+	 age=$number_minor
+	 revision=$number_minor
 	 lt_irix_increment=no
 	 ;;
 	 *)
-	 func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+	 func_fatal_configuration "$modename: unknown library version type '$version_type'"
 	 ;;
 	 esac
 	 ;;
 	no)
-	 current="$1"
-	 revision="$2"
-	 age="$3"
+	 current=$1
+	 revision=$2
+	 age=$3
 	 ;;
 	esac
 
@@ -7368,30 +8845,30 @@
 	case $current in
 	0|1-9|1-90-9|1-90-90-9|1-90-90-90-9|1-90-90-90-90-9) ;;
 	*)
-	 func_error "CURRENT \`$current' must be a nonnegative integer"
-	 func_fatal_error "\`$vinfo' is not valid version information"
+	 func_error "CURRENT '$current' must be a nonnegative integer"
+	 func_fatal_error "'$vinfo' is not valid version information"
 	 ;;
 	esac
 
 	case $revision in
 	0|1-9|1-90-9|1-90-90-9|1-90-90-90-9|1-90-90-90-90-9) ;;
 	*)
-	 func_error "REVISION \`$revision' must be a nonnegative integer"
-	 func_fatal_error "\`$vinfo' is not valid version information"
+	 func_error "REVISION '$revision' must be a nonnegative integer"
+	 func_fatal_error "'$vinfo' is not valid version information"
 	 ;;
 	esac
 
 	case $age in
 	0|1-9|1-90-9|1-90-90-9|1-90-90-90-9|1-90-90-90-90-9) ;;
 	*)
-	 func_error "AGE \`$age' must be a nonnegative integer"
-	 func_fatal_error "\`$vinfo' is not valid version information"
+	 func_error "AGE '$age' must be a nonnegative integer"
+	 func_fatal_error "'$vinfo' is not valid version information"
 	 ;;
 	esac
 
 	if test "$age" -gt "$current"; then
-	 func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	 func_fatal_error "\`$vinfo' is not valid version information"
+	 func_error "AGE '$age' is greater than the current interface number '$current'"
+	 func_fatal_error "'$vinfo' is not valid version information"
 	fi
 
 	# Calculate the version variables.
@@ -7406,26 +8883,36 @@
 	 # verstring for coding it into the library header
 	 func_arith $current - $age
 	 major=.$func_arith_result
-	 versuffix="$major.$age.$revision"
+	 versuffix=$major.$age.$revision
 	 # Darwin ld doesn't like 0 for these options...
 	 func_arith $current + 1
 	 minor_current=$func_arith_result
-	 xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	 xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
 	 verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ # On Darwin other compilers
+ case $CC in
+ nagfor*)
+ verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+ ;;
+ *)
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+ esac
 	 ;;
 
 	freebsd-aout)
-	 major=".$current"
-	 versuffix=".$current.$revision";
+	 major=.$current
+	 versuffix=.$current.$revision
 	 ;;
 
 	freebsd-elf)
-	 major=".$current"
-	 versuffix=".$current"
+	 func_arith $current - $age
+	 major=.$func_arith_result
+	 versuffix=$major.$age.$revision
 	 ;;
 
 	irix | nonstopux)
-	 if test "X$lt_irix_increment" = "Xno"; then
+	 if test no = "$lt_irix_increment"; then
 	 func_arith $current - $age
 	 else
 	 func_arith $current - $age + 1
@@ -7436,69 +8923,74 @@
 	 nonstopux) verstring_prefix=nonstopux ;;
 	 *) verstring_prefix=sgi ;;
 	 esac
-	 verstring="$verstring_prefix$major.$revision"
+	 verstring=$verstring_prefix$major.$revision
 
 	 # Add in all the interfaces that we are compatible with.
 	 loop=$revision
-	 while test "$loop" -ne 0; do
+	 while test 0 -ne "$loop"; do
 	 func_arith $revision - $loop
 	 iface=$func_arith_result
 	 func_arith $loop - 1
 	 loop=$func_arith_result
-	 verstring="$verstring_prefix$major.$iface:$verstring"
+	 verstring=$verstring_prefix$major.$iface:$verstring
 	 done
 
-	 # Before this point, $major must not contain `.'.
+	 # Before this point, $major must not contain '.'.
 	 major=.$major
-	 versuffix="$major.$revision"
+	 versuffix=$major.$revision
 	 ;;
 
 	linux) # correct to gnu/linux during the next big refactor
 	 func_arith $current - $age
 	 major=.$func_arith_result
-	 versuffix="$major.$age.$revision"
+	 versuffix=$major.$age.$revision
 	 ;;
 
 	osf)
 	 func_arith $current - $age
 	 major=.$func_arith_result
-	 versuffix=".$current.$age.$revision"
-	 verstring="$current.$age.$revision"
+	 versuffix=.$current.$age.$revision
+	 verstring=$current.$age.$revision
 
 	 # Add in all the interfaces that we are compatible with.
 	 loop=$age
-	 while test "$loop" -ne 0; do
+	 while test 0 -ne "$loop"; do
 	 func_arith $current - $loop
 	 iface=$func_arith_result
 	 func_arith $loop - 1
 	 loop=$func_arith_result
-	 verstring="$verstring:${iface}.0"
+	 verstring=$verstring:$iface.0
 	 done
 
 	 # Make executables depend on our current version.
-	 func_append verstring ":${current}.0"
+	 func_append verstring ":$current.0"
 	 ;;
 
 	qnx)
-	 major=".$current"
-	 versuffix=".$current"
+	 major=.$current
+	 versuffix=.$current
+	 ;;
+
+	sco)
+	 major=.$current
+	 versuffix=.$current
 	 ;;
 
 	sunos)
-	 major=".$current"
-	 versuffix=".$current.$revision"
+	 major=.$current
+	 versuffix=.$current.$revision
 	 ;;
 
 	windows)
 	 # Use '-' rather than '.', since we only want one
-	 # extension on DOS 8.3 filesystems.
+	 # extension on DOS 8.3 file systems.
 	 func_arith $current - $age
 	 major=$func_arith_result
-	 versuffix="-$major"
+	 versuffix=-$major
 	 ;;
 
 	*)
-	 func_fatal_configuration "unknown library version type \`$version_type'"
+	 func_fatal_configuration "unknown library version type '$version_type'"
 	 ;;
 	esac
 
@@ -7512,42 +9004,45 @@
 	 verstring=
 	 ;;
 	 *)
-	 verstring="0.0"
+	 verstring=0.0
 	 ;;
 	 esac
-	 if test "$need_version" = no; then
+	 if test no = "$need_version"; then
 	 versuffix=
 	 else
-	 versuffix=".0.0"
+	 versuffix=.0.0
 	 fi
 	fi
 
 	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
+	if test yes,no = "$avoid_version,$need_version"; then
 	 major=
 	 versuffix=
-	 verstring=""
+	 verstring=
 	fi
 
 	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	 if test "$allow_undefined_flag" = unsupported; then
-	 func_warning "undefined symbols not allowed in $host shared libraries"
-	 build_libtool_libs=no
-	 build_old_libs=yes
+	if test yes = "$allow_undefined"; then
+	 if test unsupported = "$allow_undefined_flag"; then
+	 if test yes = "$build_old_libs"; then
+	 func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+	 build_libtool_libs=no
+	 else
+	 func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+	 fi
 	 fi
 	else
 	 # Don't allow undefined symbols.
-	 allow_undefined_flag="$no_undefined_flag"
+	 allow_undefined_flag=$no_undefined_flag
 	fi
 
 fi
 
- func_generate_dlsyms "$libname" "$libname" "yes"
+ func_generate_dlsyms "$libname" "$libname" :
 func_append libobjs " $symfileobj"
- test "X$libobjs" = "X " && libobjs=
+ test " " = "$libobjs" && libobjs=
 
- if test "$opt_mode" != relink; then
+ if test relink != "$opt_mode"; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -7556,8 +9051,8 @@
 	 case $p in
 	 *.$objext | *.gcno)
 	 ;;
-	 $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	 if test "X$precious_files_regex" != "X"; then
+	 $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+	 if test -n "$precious_files_regex"; then
 		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
 		 then
 		 continue
@@ -7573,11 +9068,11 @@
 fi
 
 # Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
 	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
 fi
 
 # Eliminate all temporary directories.
@@ -7598,13 +9093,13 @@
 	 *) func_append finalize_rpath " $libdir" ;;
 	 esac
 	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
 	 dependency_libs="$temp_xrpath $dependency_libs"
 	fi
 fi
 
 # Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
+ old_dlfiles=$dlfiles
 dlfiles=
 for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
@@ -7614,7 +9109,7 @@
 done
 
 # Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
+ old_dlprefiles=$dlprefiles
 dlprefiles=
 for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
@@ -7623,7 +9118,7 @@
 	esac
 done
 
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
 	if test -n "$rpath"; then
 	 case $host in
 	 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7647,7 +9142,7 @@
 	 ;;
 	 *)
 	 # Add libc to deplibs on all other systems if necessary.
-	 if test "$build_libtool_need_lc" = "yes"; then
+	 if test yes = "$build_libtool_need_lc"; then
 	 func_append deplibs " -lc"
 	 fi
 	 ;;
@@ -7663,9 +9158,9 @@
 	# I'm not sure if I'm treating the release correctly. I think
 	# release should show up in the -l (ie -lgmp5) so we don't want to
 	# add it in twice. Is that correct?
-	release=""
-	versuffix=""
-	major=""
+	release=
+	versuffix=
+	major=
 	newdeplibs=
 	droppeddeps=no
 	case $deplibs_check_method in
@@ -7694,20 +9189,20 @@
 	 -l*)
 		func_stripname -l '' "$i"
 		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		 case " $predeps $postdeps " in
 		 *" $i "*)
 		 func_append newdeplibs " $i"
-		 i=""
+		 i=
 		 ;;
 		 esac
 		fi
-		if test -n "$i" ; then
+		if test -n "$i"; then
 		 libname=`eval "\\$ECHO \"$libname_spec\""`
 		 deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		 set dummy $deplib_matches; shift
 		 deplib_match=$1
-		 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
 		 func_append newdeplibs " $i"
 		 else
 		 droppeddeps=yes
@@ -7737,20 +9232,20 @@
 		$opt_dry_run || $RM conftest
 		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		 ldd_output=`ldd conftest`
-		 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		 if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		 case " $predeps $postdeps " in
 		 *" $i "*)
 		 func_append newdeplibs " $i"
-		 i=""
+		 i=
 		 ;;
 		 esac
 		 fi
-		 if test -n "$i" ; then
+		 if test -n "$i"; then
 		 libname=`eval "\\$ECHO \"$libname_spec\""`
 		 deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 		 set dummy $deplib_matches; shift
 		 deplib_match=$1
-		 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
 		 func_append newdeplibs " $i"
 		 else
 		 droppeddeps=yes
@@ -7787,24 +9282,24 @@
 	 -l*)
 	 func_stripname -l '' "$a_deplib"
 	 name=$func_stripname_result
-	 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	 if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
 		 func_append newdeplibs " $a_deplib"
-		 a_deplib=""
+		 a_deplib=
 		 ;;
 		esac
 	 fi
-	 if test -n "$a_deplib" ; then
+	 if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
 		if test -n "$file_magic_glob"; then
 		 libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
 		else
 		 libnameglob=$libname
 		fi
-		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		 if test "$want_nocaseglob" = yes; then
+		 if test yes = "$want_nocaseglob"; then
 		 shopt -s nocaseglob
 		 potential_libs=`ls $i/$libnameglob.-* 2>/dev/null`
 		 $nocaseglob
@@ -7822,25 +9317,25 @@
 		 # We might still enter an endless loop, since a link
 		 # loop can be closed while we follow links,
 		 # but so what?
-		 potlib="$potent_lib"
+		 potlib=$potent_lib
 		 while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
 			case $potliblink in
-			\\/* | A-Za-z:\\/*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,^/*$,,'`"$potliblink";;
+			\\/* | A-Za-z:\\/*) potlib=$potliblink;;
+			*) potlib=`$ECHO "$potlib" | $SED 's|^/*$||'`"$potliblink";;
 			esac
 		 done
 		 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
 			func_append newdeplibs " $a_deplib"
-			a_deplib=""
+			a_deplib=
 			break 2
 		 fi
 		 done
 		done
 	 fi
-	 if test -n "$a_deplib" ; then
+	 if test -n "$a_deplib"; then
 		droppeddeps=yes
 		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7848,7 +9343,7 @@
 		echo "*** you link to this library. But I can only do this if you have a"
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		if test -z "$potlib"; then
 		 $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
 		 $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7871,30 +9366,30 @@
 	 -l*)
 	 func_stripname -l '' "$a_deplib"
 	 name=$func_stripname_result
-	 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	 if test yes = "$allow_libtool_libs_with_static_runtimes"; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
 		 func_append newdeplibs " $a_deplib"
-		 a_deplib=""
+		 a_deplib=
 		 ;;
 		esac
 	 fi
-	 if test -n "$a_deplib" ; then
+	 if test -n "$a_deplib"; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 		 potential_libs=`ls $i/$libname.-* 2>/dev/null`
 		 for potent_lib in $potential_libs; do
-		 potlib="$potent_lib" # see symlink-check above in file_magic test
+		 potlib=$potent_lib # see symlink-check above in file_magic test
 		 if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		 $EGREP "$match_pattern_regex" > /dev/null; then
 		 func_append newdeplibs " $a_deplib"
-		 a_deplib=""
+		 a_deplib=
 		 break 2
 		 fi
 		 done
 		done
 	 fi
-	 if test -n "$a_deplib" ; then
+	 if test -n "$a_deplib"; then
 		droppeddeps=yes
 		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7902,7 +9397,7 @@
 		echo "*** you link to this library. But I can only do this if you have a"
 		echo "*** shared version of the library, which you do not appear to have"
 		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
+		if test -z "$potlib"; then
 		 $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
 		 $ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7918,18 +9413,18 @@
 	 done # Gone through all deplibs.
 	 ;;
 	none | unknown | *)
-	 newdeplibs=""
+	 newdeplibs=
 	 tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -LR^ *//g'`
-	 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	 for i in $predeps $postdeps ; do
+	 if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+	 for i in $predeps $postdeps; do
 	 # can't use Xsed below, because $i might contain '/'
-	 tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	 tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
 	 done
 	 fi
 	 case $tmp_deplibs in
 	 *!\	\ *)
 	 echo
-	 if test "X$deplibs_check_method" = "Xnone"; then
+	 if test none = "$deplibs_check_method"; then
 	 echo "*** Warning: inter-library dependencies are not supported in this platform."
 	 else
 	 echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7953,8 +9448,8 @@
 	 ;;
 	esac
 
-	if test "$droppeddeps" = yes; then
-	 if test "$module" = yes; then
+	if test yes = "$droppeddeps"; then
+	 if test yes = "$module"; then
 	 echo
 	 echo "*** Warning: libtool could not satisfy all declared inter-library"
 	 $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
@@ -7963,12 +9458,12 @@
 	 if test -z "$global_symbol_pipe"; then
 	 echo
 	 echo "*** However, this would only work if libtool was able to extract symbol"
-	 echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	 echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
 	 echo "*** not find such a program. So, this module is probably useless."
-	 echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	 echo "*** 'nm' from GNU binutils and a full rebuild may help."
 	 fi
-	 if test "$build_old_libs" = no; then
-	 oldlibs="$output_objdir/$libname.$libext"
+	 if test no = "$build_old_libs"; then
+	 oldlibs=$output_objdir/$libname.$libext
 	 build_libtool_libs=module
 	 build_old_libs=yes
 	 else
@@ -7979,14 +9474,14 @@
 	 echo "*** automatically added whenever a program is linked with this library"
 	 echo "*** or is declared to -dlopen it."
 
-	 if test "$allow_undefined" = no; then
+	 if test no = "$allow_undefined"; then
 	 echo
 	 echo "*** Since this library must not contain undefined symbols,"
 	 echo "*** because either the platform does not support them or"
 	 echo "*** it was explicitly requested with -no-undefined,"
 	 echo "*** libtool will only create a static version of it."
-	 if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
+	 if test no = "$build_old_libs"; then
+		oldlibs=$output_objdir/$libname.$libext
 		build_libtool_libs=module
 		build_old_libs=yes
 	 else
@@ -8032,7 +9527,7 @@
 	*) func_append new_libs " $deplib" ;;
 	esac
 done
- deplibs="$new_libs"
+ deplibs=$new_libs
 
 # All the library-specific variables (install_libdir is set above).
 library_names=
@@ -8040,25 +9535,25 @@
 dlname=
 
 # 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.
+ if test yes = "$build_libtool_libs"; 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
+	if test yes = "$hardcode_into_libs"; then
 	 # Hardcode the library paths
 	 hardcode_libdirs=
 	 dep_rpath=
-	 rpath="$finalize_rpath"
-	 test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+	 rpath=$finalize_rpath
+	 test relink = "$opt_mode" || rpath=$compile_rpath$rpath
 	 for libdir in $rpath; do
 	 if test -n "$hardcode_libdir_flag_spec"; then
 	 if test -n "$hardcode_libdir_separator"; then
 		func_replace_sysroot "$libdir"
 		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
-		 hardcode_libdirs="$libdir"
+		 hardcode_libdirs=$libdir
 		else
 		 # Just accumulate the unique libdirs.
 		 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8083,7 +9578,7 @@
 	 # Substitute the hardcoded libdirs into the rpath.
 	 if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	 libdir="$hardcode_libdirs"
+	 libdir=$hardcode_libdirs
 	 eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	 fi
 	 if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8097,8 +9592,8 @@
 	 test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 	fi
 
-	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	shlibpath=$finalize_shlibpath
+	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
 	if test -n "$shlibpath"; then
 	 eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -8108,19 +9603,19 @@
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
 	shift
-	realname="$1"
+	realname=$1
 	shift
 
 	if test -n "$soname_spec"; then
 	 eval soname=\"$soname_spec\"
 	else
-	 soname="$realname"
+	 soname=$realname
 	fi
 	if test -z "$dlname"; then
 	 dlname=$soname
 	fi
 
-	lib="$output_objdir/$realname"
+	lib=$output_objdir/$realname
 	linknames=
 	for link
 	do
@@ -8134,7 +9629,7 @@
 	delfiles=
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	 $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	 export_symbols="$output_objdir/$libname.uexp"
+	 export_symbols=$output_objdir/$libname.uexp
 	 func_append delfiles " $export_symbols"
 	fi
 
@@ -8143,31 +9638,31 @@
 	cygwin* | mingw* | cegcc*)
 	 if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 	 # exporting using user supplied symfile
-	 if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	 func_dll_def_p "$export_symbols" || {
 	 # and it's NOT already a .def file. Must figure out
 	 # which of the given symbols are data symbols and tag
 	 # them as such. So, trigger use of export_symbols_cmds.
 	 # export_symbols gets reassigned inside the "prepare
 	 # the list of exported symbols" if statement, so the
 	 # include_expsyms logic still works.
-	 orig_export_symbols="$export_symbols"
+	 orig_export_symbols=$export_symbols
 	 export_symbols=
 	 always_export_symbols=yes
-	 fi
+	 }
 	 fi
 	 ;;
 	esac
 
 	# Prepare the list of exported symbols
 	if test -z "$export_symbols"; then
-	 if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	 func_verbose "generating symbol list for \`$libname.la'"
-	 export_symbols="$output_objdir/$libname.exp"
+	 if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+	 func_verbose "generating symbol list for '$libname.la'"
+	 export_symbols=$output_objdir/$libname.exp
 	 $opt_dry_run || $RM $export_symbols
 	 cmds=$export_symbols_cmds
-	 save_ifs="$IFS"; IFS='~'
+	 save_ifs=$IFS; IFS='~'
 	 for cmd1 in $cmds; do
-	 IFS="$save_ifs"
+	 IFS=$save_ifs
 	 # Take the normal branch if the nm_file_list_spec branch
 	 # doesn't work or if tool conversion is not needed.
 	 case $nm_file_list_spec~$to_tool_file_cmd in
@@ -8181,7 +9676,7 @@
 		 try_normal_branch=no
 		 ;;
 	 esac
-	 if test "$try_normal_branch" = yes \
+	 if test yes = "$try_normal_branch" \
 		 && { test "$len" -lt "$max_cmd_len" \
 		 || test "$max_cmd_len" -le -1; }
 	 then
@@ -8192,7 +9687,7 @@
 		output_la=$func_basename_result
 		save_libobjs=$libobjs
 		save_output=$output
-		output=${output_objdir}/${output_la}.nm
+		output=$output_objdir/$output_la.nm
 		func_to_tool_file "$output"
 		libobjs=$nm_file_list_spec$func_to_tool_file_result
 		func_append delfiles " $output"
@@ -8215,8 +9710,8 @@
 		break
 	 fi
 	 done
-	 IFS="$save_ifs"
-	 if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	 IFS=$save_ifs
+	 if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
 	 func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 	 func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 	 fi
@@ -8224,16 +9719,16 @@
 	fi
 
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	 tmp_export_symbols="$export_symbols"
-	 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	 tmp_export_symbols=$export_symbols
+	 test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
 	 $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
 	 # The given exports_symbols file has to be filtered, so filter it.
-	 func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	 func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	 # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	 # 's' commands which not all seds can handle. GNU sed should be fine
+	 # 's' commands, which not all seds can handle. GNU sed should be fine
 	 # though. Also, the filter scales superlinearly with the number of
 	 # global variables. join(1) would be nice here, but unfortunately
 	 # isn't a blessed tool.
@@ -8252,11 +9747,11 @@
 	 ;;
 	 esac
 	done
-	deplibs="$tmp_deplibs"
+	deplibs=$tmp_deplibs
 
 	if test -n "$convenience"; then
 	 if test -n "$whole_archive_flag_spec" &&
-	 test "$compiler_needs_object" = yes &&
+	 test yes = "$compiler_needs_object" &&
 	 test -z "$libobjs"; then
 	 # extract the archives, so we have objects to list.
 	 # TODO: could optimize this to just extract one archive.
@@ -8267,7 +9762,7 @@
 	 eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 	 test "X$libobjs" = "X " && libobjs=
 	 else
-	 gentop="$output_objdir/${outputname}x"
+	 gentop=$output_objdir/${outputname}x
 	 func_append generated " $gentop"
 
 	 func_extract_archives $gentop $convenience
@@ -8276,18 +9771,18 @@
 	 fi
 	fi
 
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
 	 eval flag=\"$thread_safe_flag_spec\"
 	 func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$opt_mode" = relink; then
+	if test relink = "$opt_mode"; then
 	 $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
 	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
+	if test yes = "$module" && test -n "$module_cmds"; then
 	 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	 eval test_cmds=\"$module_expsym_cmds\"
 	 cmds=$module_expsym_cmds
@@ -8305,7 +9800,7 @@
 	 fi
 	fi
 
-	if test "X$skipped_export" != "X:" &&
+	if test : != "$skipped_export" &&
 	 func_len " $test_cmds" &&
 	 len=$func_len_result &&
 	 test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8338,8 +9833,8 @@
 	 last_robj=
 	 k=1
 
-	 if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	 output=${output_objdir}/${output_la}.lnkscript
+	 if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+	 output=$output_objdir/$output_la.lnkscript
 	 func_verbose "creating GNU ld script: $output"
 	 echo 'INPUT (' > $output
 	 for obj in $save_libobjs
@@ -8351,14 +9846,14 @@
 	 func_append delfiles " $output"
 	 func_to_tool_file "$output"
 	 output=$func_to_tool_file_result
-	 elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	 output=${output_objdir}/${output_la}.lnk
+	 elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+	 output=$output_objdir/$output_la.lnk
 	 func_verbose "creating linker input file list: $output"
 	 : > $output
 	 set x $save_libobjs
 	 shift
 	 firstobj=
-	 if test "$compiler_needs_object" = yes; then
+	 if test yes = "$compiler_needs_object"; then
 	 firstobj="$1 "
 	 shift
 	 fi
@@ -8373,7 +9868,7 @@
 	 else
 	 if test -n "$save_libobjs"; then
 	 func_verbose "creating reloadable object files..."
-	 output=$output_objdir/$output_la-${k}.$objext
+	 output=$output_objdir/$output_la-$k.$objext
 	 eval test_cmds=\"$reload_cmds\"
 	 func_len " $test_cmds"
 	 len0=$func_len_result
@@ -8385,13 +9880,13 @@
 		func_len " $obj"
 		func_arith $len + $func_len_result
 		len=$func_arith_result
-		if test "X$objlist" = X ||
+		if test -z "$objlist" ||
 		 test "$len" -lt "$max_cmd_len"; then
 		 func_append objlist " $obj"
 		else
 		 # The command $test_cmds is almost too long, add a
 		 # command to the queue.
-		 if test "$k" -eq 1 ; then
+		 if test 1 -eq "$k"; then
 		 # The first file doesn't have a previous command to add.
 		 reload_objs=$objlist
 		 eval concat_cmds=\"$reload_cmds\"
@@ -8401,10 +9896,10 @@
 		 reload_objs="$objlist $last_robj"
 		 eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 		 fi
-		 last_robj=$output_objdir/$output_la-${k}.$objext
+		 last_robj=$output_objdir/$output_la-$k.$objext
 		 func_arith $k + 1
 		 k=$func_arith_result
-		 output=$output_objdir/$output_la-${k}.$objext
+		 output=$output_objdir/$output_la-$k.$objext
 		 objlist=" $obj"
 		 func_len " $last_robj"
 		 func_arith $len0 + $func_len_result
@@ -8416,9 +9911,9 @@
 	 # files will link in the last one created.
 	 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 	 reload_objs="$objlist $last_robj"
-	 eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	 eval concat_cmds=\"\$concat_cmds$reload_cmds\"
 	 if test -n "$last_robj"; then
-	 eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	 eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	 fi
 	 func_append delfiles " $output"
 
@@ -8426,9 +9921,9 @@
 	 output=
 	 fi
 
-	 if ${skipped_export-false}; then
-	 func_verbose "generating symbol list for \`$libname.la'"
-	 export_symbols="$output_objdir/$libname.exp"
+	 ${skipped_export-false} && {
+	 func_verbose "generating symbol list for '$libname.la'"
+	 export_symbols=$output_objdir/$libname.exp
 	 $opt_dry_run || $RM $export_symbols
 	 libobjs=$output
 	 # Append the command to create the export file.
@@ -8437,16 +9932,16 @@
 	 if test -n "$last_robj"; then
 		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	 fi
-	 fi
+	 }
 
 	 test -n "$save_libobjs" &&
 	 func_verbose "creating a temporary reloadable object file: $output"
 
 	 # Loop through the commands generated above and execute them.
-	 save_ifs="$IFS"; IFS='~'
+	 save_ifs=$IFS; IFS='~'
 	 for cmd in $concat_cmds; do
-	 IFS="$save_ifs"
-	 $opt_silent || {
+	 IFS=$save_ifs
+	 $opt_quiet || {
 		 func_quote_for_expand "$cmd"
 		 eval "func_echo $func_quote_for_expand_result"
 	 }
@@ -8454,7 +9949,7 @@
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
+		if test relink = "$opt_mode"; then
 		 ( cd "$output_objdir" && \
 		 $RM "${realname}T" && \
 		 $MV "${realname}U" "$realname" )
@@ -8463,7 +9958,7 @@
 		exit $lt_exit
 	 }
 	 done
-	 IFS="$save_ifs"
+	 IFS=$save_ifs
 
 	 if test -n "$export_symbols_regex" && ${skipped_export-false}; then
 	 func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8471,18 +9966,18 @@
 	 fi
 	 fi
 
- if ${skipped_export-false}; then
+ ${skipped_export-false} && {
 	 if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	 tmp_export_symbols="$export_symbols"
-	 test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	 tmp_export_symbols=$export_symbols
+	 test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
 	 $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	 fi
 
 	 if test -n "$orig_export_symbols"; then
 	 # The given exports_symbols file has to be filtered, so filter it.
-	 func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	 func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
 	 # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	 # 's' commands which not all seds can handle. GNU sed should be fine
+	 # 's' commands, which not all seds can handle. GNU sed should be fine
 	 # though. Also, the filter scales superlinearly with the number of
 	 # global variables. join(1) would be nice here, but unfortunately
 	 # isn't a blessed tool.
@@ -8491,7 +9986,7 @@
 	 export_symbols=$output_objdir/$libname.def
 	 $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	 fi
-	 fi
+	 }
 
 	 libobjs=$output
 	 # Restore the value of output.
@@ -8505,7 +10000,7 @@
 	 # value of $libobjs for piecewise linking.
 
 	 # Do each of the archive commands.
-	 if test "$module" = yes && test -n "$module_cmds" ; then
+	 if test yes = "$module" && test -n "$module_cmds"; then
 	 if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 	 cmds=$module_expsym_cmds
 	 else
@@ -8527,7 +10022,7 @@
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	 gentop="$output_objdir/${outputname}x"
+	 gentop=$output_objdir/${outputname}x
 	 func_append generated " $gentop"
 
 	 func_extract_archives $gentop $dlprefiles
@@ -8535,11 +10030,12 @@
 	 test "X$libobjs" = "X " && libobjs=
 	fi
 
-	save_ifs="$IFS"; IFS='~'
+	save_ifs=$IFS; IFS='~'
 	for cmd in $cmds; do
-	 IFS="$save_ifs"
+	 IFS=$sp$nl
 	 eval cmd=\"$cmd\"
-	 $opt_silent || {
+	 IFS=$save_ifs
+	 $opt_quiet || {
 	 func_quote_for_expand "$cmd"
 	 eval "func_echo $func_quote_for_expand_result"
 	 }
@@ -8547,7 +10043,7 @@
 	 lt_exit=$?
 
 	 # Restore the uninstalled library and exit
-	 if test "$opt_mode" = relink; then
+	 if test relink = "$opt_mode"; then
 	 ( cd "$output_objdir" && \
 	 $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -8556,10 +10052,10 @@
 	 exit $lt_exit
 	 }
 	done
-	IFS="$save_ifs"
+	IFS=$save_ifs
 
 	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; then
+	if test relink = "$opt_mode"; then
 	 $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	 if test -n "$convenience"; then
@@ -8579,39 +10075,39 @@
 	done
 
 	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
+	if test yes = "$module" || test yes = "$export_dynamic"; then
 	 # On all known operating systems, these are identical.
-	 dlname="$soname"
+	 dlname=$soname
 	fi
 fi
 ;;
 
 obj)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+	func_warning "'-dlopen' is ignored for objects"
 fi
 
 case " $deplibs" in
 *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+	func_warning "'-l' and '-L' are ignored for objects" ;;
 esac
 
 test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
+	func_warning "'-rpath' is ignored for objects"
 
 test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
+	func_warning "'-R' is ignored for objects"
 
 test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
+	func_warning "'-version-info' is ignored for objects"
 
 test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
+	func_warning "'-release' is ignored for objects"
 
 case $output in
 *.lo)
 	test -n "$objs$old_deplibs" && \
-	 func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+	 func_fatal_error "cannot build library object '$output' from non-libtool objects"
 
 	libobj=$output
 	func_lo2o "$libobj"
@@ -8619,7 +10115,7 @@
 	;;
 *)
 	libobj=
-	obj="$output"
+	obj=$output
 	;;
 esac
 
@@ -8632,17 +10128,19 @@
 # the extraction.
 reload_conv_objs=
 gentop=
- # reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
- wl=
-
+ # if reload_cmds runs $LD directly, get rid of -Wl from
+ # whole_archive_flag_spec and hope we can get by with turning comma
+ # into space.
+ case $reload_cmds in
+ *\$LD\ \$*) wl= ;;
+ esac
 if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	 eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	 reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	 test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	 reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
 	else
-	 gentop="$output_objdir/${obj}x"
+	 gentop=$output_objdir/${obj}x
 	 func_append generated " $gentop"
 
 	 func_extract_archives $gentop $convenience
@@ -8651,12 +10149,12 @@
 fi
 
 # If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+ test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
 
 # Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
 
- output="$obj"
+ output=$obj
 func_execute_cmds "$reload_cmds" 'exit $?'
 
 # Exit if we aren't doing a library object file.
@@ -8668,7 +10166,7 @@
 	exit $EXIT_SUCCESS
 fi
 
- if test "$build_libtool_libs" != yes; then
+ test yes = "$build_libtool_libs" || {
 	if test -n "$gentop"; then
 	 func_show_eval '${RM}r "$gentop"'
 	fi
@@ -8678,12 +10176,12 @@
 	# $show "echo timestamp > $libobj"
 	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 	exit $EXIT_SUCCESS
- fi
+ }
 
- if test -n "$pic_flag" || test "$pic_mode" != default; then
+ if test -n "$pic_flag" || test default != "$pic_mode"; then
 	# Only do commands if we really have different PIC objects.
 	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
+	output=$libobj
 	func_execute_cmds "$reload_cmds" 'exit $?'
 fi
 
@@ -8700,16 +10198,14 @@
 	 output=$func_stripname_result.exe;;
 esac
 test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
+	func_warning "'-version-info' is ignored for programs"
 
 test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
+	func_warning "'-release' is ignored for programs"
 
- test "$preload" = yes \
- && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	 func_warning "\`LT_INIT(dlopen)' not used. Assuming no dlopen support."
+ $preload \
+	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+	&& func_warning "'LT_INIT(dlopen)' not used. Assuming no dlopen support."
 
 case $host in
 *-*-rhapsody* | *-*-darwin1.012)
@@ -8723,11 +10219,11 @@
 *-*-darwin*)
 	# Don't allow lazy linking, it breaks C++ global constructors
 	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
+	if test CXX = "$tagname"; then
 	 case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	 10.0123)
-	 func_append compile_command " ${wl}-bind_at_load"
-	 func_append finalize_command " ${wl}-bind_at_load"
+	 func_append compile_command " $wl-bind_at_load"
+	 func_append finalize_command " $wl-bind_at_load"
 	 ;;
 	 esac
 	fi
@@ -8763,7 +10259,7 @@
 	*) func_append new_libs " $deplib" ;;
 	esac
 done
- compile_deplibs="$new_libs"
+ compile_deplibs=$new_libs
 
 
 func_append compile_command " $compile_deplibs"
@@ -8787,7 +10283,7 @@
 	if test -n "$hardcode_libdir_flag_spec"; then
 	 if test -n "$hardcode_libdir_separator"; then
 	 if test -z "$hardcode_libdirs"; then
-	 hardcode_libdirs="$libdir"
+	 hardcode_libdirs=$libdir
 	 else
 	 # Just accumulate the unique libdirs.
 	 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8810,7 +10306,7 @@
 	fi
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	 testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	 testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
 	 case :$dllsearchpath: in
 	 *":$libdir:"*) ;;
 	 ::) dllsearchpath=$libdir;;
@@ -8827,10 +10323,10 @@
 # Substitute the hardcoded libdirs into the rpath.
 if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
 fi
- compile_rpath="$rpath"
+ compile_rpath=$rpath
 
 rpath=
 hardcode_libdirs=
@@ -8838,7 +10334,7 @@
 	if test -n "$hardcode_libdir_flag_spec"; then
 	 if test -n "$hardcode_libdir_separator"; then
 	 if test -z "$hardcode_libdirs"; then
-	 hardcode_libdirs="$libdir"
+	 hardcode_libdirs=$libdir
 	 else
 	 # Just accumulate the unique libdirs.
 	 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8863,45 +10359,43 @@
 # Substitute the hardcoded libdirs into the rpath.
 if test -n "$hardcode_libdir_separator" &&
 	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
+	libdir=$hardcode_libdirs
 	eval rpath=\" $hardcode_libdir_flag_spec\"
 fi
- finalize_rpath="$rpath"
+ finalize_rpath=$rpath
 
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ if test -n "$libobjs" && test yes = "$build_old_libs"; then
 	# Transform all the library objects into standard objects.
 	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
 fi
 
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ func_generate_dlsyms "$outputname" "@PROGRAM@" false
 
 # template prelinking step
 if test -n "$prelink_cmds"; then
 	func_execute_cmds "$prelink_cmds" 'exit $?'
 fi
 
- wrappers_required=yes
+ wrappers_required=:
 case $host in
 *cegcc* | *mingw32ce*)
 # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=no
+ wrappers_required=false
 ;;
 *cygwin* | *mingw* )
- if test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
+ test yes = "$build_libtool_libs" || wrappers_required=false
 ;;
 *)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
+ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+ wrappers_required=false
 fi
 ;;
 esac
- if test "$wrappers_required" = no; then
+ $wrappers_required || {
 	# Replace the output file specification.
 	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
+	link_command=$compile_command$compile_rpath
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	exit_status=0
@@ -8914,12 +10408,12 @@
 	fi
 
 	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	 func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	if test -f "$output_objdir/${outputname}S.$objext"; then
+	 func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
 	fi
 
 	exit $exit_status
- fi
+ }
 
 if test -n "$compile_shlibpath$finalize_shlibpath"; then
 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8949,9 +10443,9 @@
 	fi
 fi
 
- if test "$no_install" = yes; then
+ if test yes = "$no_install"; then
 	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
+	link_command=$compile_var$compile_command$compile_rpath
 	# Replace the output file specification.
 	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
@@ -8968,27 +10462,28 @@
 	exit $EXIT_SUCCESS
 fi
 
- if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
- else
-	if test "$fast_install" != no; then
-	 link_command="$finalize_var$compile_command$finalize_rpath"
-	 if test "$fast_install" = yes; then
-	 relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-	 else
-	 # fast_install is set to needless
-	 relink_command=
-	 fi
-	else
-	 link_command="$compile_var$compile_command$compile_rpath"
-	 relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
- fi
+ case $hardcode_action,$fast_install in
+ relink,*)
+	 # Fast installation is not supported
+	 link_command=$compile_var$compile_command$compile_rpath
+	 relink_command=$finalize_var$finalize_command$finalize_rpath
+
+	 func_warning "this platform does not like uninstalled shared libraries"
+	 func_warning "'$output' will be relinked during installation"
+	 ;;
+ *,yes)
+	 link_command=$finalize_var$compile_command$finalize_rpath
+	 relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ ;;
+	*,no)
+	 link_command=$compile_var$compile_command$compile_rpath
+	 relink_command=$finalize_var$finalize_command$finalize_rpath
+ ;;
+	*,needless)
+	 link_command=$finalize_var$compile_command$finalize_rpath
+	 relink_command=
+ ;;
+ esac
 
 # Replace the output file specification.
 link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9045,8 +10540,8 @@
 	 func_dirname_and_basename "$output" "" "."
 	 output_name=$func_basename_result
 	 output_path=$func_dirname_result
-	 cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	 cwrapper="$output_path/$output_name.exe"
+	 cwrappersource=$output_path/$objdir/lt-$output_name.c
+	 cwrapper=$output_path/$output_name.exe
 	 $RM $cwrappersource $cwrapper
 	 trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
@@ -9067,7 +10562,7 @@
 	 trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
 	 $opt_dry_run || {
 	 # note: this script will not be executed, so do not chmod.
-	 if test "x$build" = "x$host" ; then
+	 if test "x$build" = "x$host"; then
 		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
 	 else
 		func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9090,25 +10585,27 @@
 # See if we need to build an old-fashioned archive.
 for oldlib in $oldlibs; do
 
- if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
- else
-	if test "$build_libtool_libs" = module; then
-	 oldobjs="$libobjs_save"
+ case $build_libtool_libs in
+ convenience)
+	 oldobjs="$libobjs_save $symfileobj"
+	 addlibs=$convenience
 	 build_libtool_libs=no
-	else
+	 ;;
+	module)
+	 oldobjs=$libobjs_save
+	 addlibs=$old_convenience
+	 build_libtool_libs=no
+ ;;
+	*)
 	 oldobjs="$old_deplibs $non_pic_objects"
-	 if test "$preload" = yes && test -f "$symfileobj"; then
-	 func_append oldobjs " $symfileobj"
-	 fi
-	fi
-	addlibs="$old_convenience"
- fi
+	 $preload && test -f "$symfileobj" \
+	 && func_append oldobjs " $symfileobj"
+	 addlibs=$old_convenience
+	 ;;
+ esac
 
 if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
+	gentop=$output_objdir/${outputname}x
 	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
@@ -9116,13 +10613,13 @@
 fi
 
 # Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
 	cmds=$old_archive_from_new_cmds
 else
 
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
-	 gentop="$output_objdir/${outputname}x"
+	 gentop=$output_objdir/${outputname}x
 	 func_append generated " $gentop"
 
 	 func_extract_archives $gentop $dlprefiles
@@ -9143,7 +10640,7 @@
 	 :
 	else
 	 echo "copying selected object files to avoid basename conflicts..."
-	 gentop="$output_objdir/${outputname}x"
+	 gentop=$output_objdir/${outputname}x
 	 func_append generated " $gentop"
 	 func_mkdir_p "$gentop"
 	 save_oldobjs=$oldobjs
@@ -9152,7 +10649,7 @@
 	 for obj in $save_oldobjs
 	 do
 	 func_basename "$obj"
-	 objbase="$func_basename_result"
+	 objbase=$func_basename_result
 	 case " $oldobjs " in
 	 " ") oldobjs=$obj ;;
 	 *\ /"$objbase "*)
@@ -9221,18 +10718,18 @@
 	 else
 	 # the above command should be used before it gets too long
 	 oldobjs=$objlist
-	 if test "$obj" = "$last_oldobj" ; then
+	 if test "$obj" = "$last_oldobj"; then
 		RANLIB=$save_RANLIB
 	 fi
 	 test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	 eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	 eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
 	 objlist=
 	 len=$len0
 	 fi
 	 done
 	 RANLIB=$save_RANLIB
 	 oldobjs=$objlist
-	 if test "X$oldobjs" = "X" ; then
+	 if test -z "$oldobjs"; then
 	 eval cmds=\"\$concat_cmds\"
 	 else
 	 eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9249,7 +10746,7 @@
 case $output in
 *.la)
 old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
+ test yes = "$build_old_libs" && old_library=$libname.$libext
 func_verbose "creating $output"
 
 # Preserve any variables that may affect compiler behavior
@@ -9264,31 +10761,31 @@
 	fi
 done
 # Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
 relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
+ if test yes = "$hardcode_automatic"; then
 	relink_command=
 fi
 
 # Only create the output if not a dry run.
 $opt_dry_run || {
 	for installed in no yes; do
-	 if test "$installed" = yes; then
+	 if test yes = "$installed"; then
 	 if test -z "$install_libdir"; then
 	 break
 	 fi
-	 output="$output_objdir/$outputname"i
+	 output=$output_objdir/${outputname}i
 	 # Replace all uninstalled libtool libraries with the installed ones
 	 newdependency_libs=
 	 for deplib in $dependency_libs; do
 	 case $deplib in
 	 *.la)
 		func_basename "$deplib"
-		name="$func_basename_result"
+		name=$func_basename_result
 		func_resolve_sysroot "$deplib"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $func_resolve_sysroot_result`
+		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_fatal_error "'$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	 -L*)
@@ -9304,23 +10801,23 @@
 	 *) func_append newdependency_libs " $deplib" ;;
 	 esac
 	 done
-	 dependency_libs="$newdependency_libs"
+	 dependency_libs=$newdependency_libs
 	 newdlfiles=
 
 	 for lib in $dlfiles; do
 	 case $lib in
 	 *.la)
 	 func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $lib`
 		test -z "$libdir" && \
-		 func_fatal_error "\`$lib' is not a valid libtool archive"
+		 func_fatal_error "'$lib' is not a valid libtool archive"
 		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	 *) func_append newdlfiles " $lib" ;;
 	 esac
 	 done
-	 dlfiles="$newdlfiles"
+	 dlfiles=$newdlfiles
 	 newdlprefiles=
 	 for lib in $dlprefiles; do
 	 case $lib in
@@ -9330,34 +10827,34 @@
 		# didn't already link the preopened objects directly into
 		# the library:
 		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`
+		name=$func_basename_result
+		eval libdir=`$SED -n -e 's/^libdir=$.*$$/\1/p' $lib`
 		test -z "$libdir" && \
-		 func_fatal_error "\`$lib' is not a valid libtool archive"
+		 func_fatal_error "'$lib' is not a valid libtool archive"
 		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	 esac
 	 done
-	 dlprefiles="$newdlprefiles"
+	 dlprefiles=$newdlprefiles
 	 else
 	 newdlfiles=
 	 for lib in $dlfiles; do
 	 case $lib in
-		\\/* | A-Za-z:\\/*) abs="$lib" ;;
+		\\/* | A-Za-z:\\/*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	 esac
 	 func_append newdlfiles " $abs"
 	 done
-	 dlfiles="$newdlfiles"
+	 dlfiles=$newdlfiles
 	 newdlprefiles=
 	 for lib in $dlprefiles; do
 	 case $lib in
-		\\/* | A-Za-z:\\/*) abs="$lib" ;;
+		\\/* | A-Za-z:\\/*) abs=$lib ;;
 		*) abs=`pwd`"/$lib" ;;
 	 esac
 	 func_append newdlprefiles " $abs"
 	 done
-	 dlprefiles="$newdlprefiles"
+	 dlprefiles=$newdlprefiles
 	 fi
 	 $RM $output
 	 # place dlname in correct position for cygwin
@@ -9373,10 +10870,9 @@
 	 case $host,$output,$installed,$module,$dlname in
 	 *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
 	 # If a -bindir argument was supplied, place the dll there.
-	 if test "x$bindir" != x ;
-	 then
+	 if test -n "$bindir"; then
 		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
+		tdlname=$func_relative_path_result/$dlname
 	 else
 		# Otherwise fall back on heuristic.
 		tdlname=../bin/$dlname
@@ -9385,7 +10881,7 @@
 	 esac
 	 $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -9399,7 +10895,7 @@
 # The name of the static archive.
 old_library='$old_library'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags='$new_inherited_linker_flags'
 
 # Libraries that this one depends upon.
@@ -9425,7 +10921,7 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	 if test "$installed" = no && test "$need_relink" = yes; then
+	 if test no,yes = "$installed,$need_relink"; then
 	 $ECHO >> $output "\
 relink_command=\"$relink_command\""
 	 fi
@@ -9440,27 +10936,29 @@
 exit $EXIT_SUCCESS
 }
 
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
- func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+ func_mode_link ${1+"$@"}
+fi
 
 
 # func_mode_uninstall arg...
 func_mode_uninstall ()
 {
- $opt_debug
- RM="$nonopt"
+ $debug_cmd
+
+ RM=$nonopt
 files=
- rmforce=
+ rmforce=false
 exit_status=0
 
 # This variable tells wrapper scripts just to set variables rather
 # than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
 
 for arg
 do
 case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
+ -f) func_append RM " $arg"; rmforce=: ;;
 -*) func_append RM " $arg" ;;
 *) func_append files " $arg" ;;
 esac
@@ -9473,18 +10971,18 @@
 
 for file in $files; do
 func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
-	odir="$objdir"
+ dir=$func_dirname_result
+ if test . = "$dir"; then
+	odir=$objdir
 else
-	odir="$dir/$objdir"
+	odir=$dir/$objdir
 fi
 func_basename "$file"
- name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ name=$func_basename_result
+ test uninstall = "$opt_mode" && odir=$dir
 
 # Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ if test clean = "$opt_mode"; then
 	case " $rmdirs " in
 	 *" $odir "*) ;;
 	 *) func_append rmdirs " $odir" ;;
@@ -9499,11 +10997,11 @@
 elif test -d "$file"; then
 	exit_status=1
 	continue
- elif test "$rmforce" = yes; then
+ elif $rmforce; then
 	continue
 fi
 
- rmfiles="$file"
+ rmfiles=$file
 
 case $name in
 *.la)
@@ -9517,7 +11015,7 @@
 	 done
 	 test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	 case "$opt_mode" in
+	 case $opt_mode in
 	 clean)
 	 case " $library_names " in
 	 *" $dlname "*) ;;
@@ -9528,12 +11026,12 @@
 	 uninstall)
 	 if test -n "$library_names"; then
 	 # Do each command in the postuninstall commands.
-	 func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	 func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
 	 fi
 
 	 if test -n "$old_library"; then
 	 # Do each command in the old_postuninstall commands.
-	 func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	 func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
 	 fi
 	 # FIXME: should reinstall the best remaining shared library.
 	 ;;
@@ -9549,21 +11047,19 @@
 	 func_source $dir/$name
 
 	 # Add PIC object to the list of files to remove.
-	 if test -n "$pic_object" &&
-	 test "$pic_object" != none; then
+	 if test -n "$pic_object" && test none != "$pic_object"; then
 	 func_append rmfiles " $dir/$pic_object"
 	 fi
 
 	 # Add non-PIC object to the list of files to remove.
-	 if test -n "$non_pic_object" &&
-	 test "$non_pic_object" != none; then
+	 if test -n "$non_pic_object" && test none != "$non_pic_object"; then
 	 func_append rmfiles " $dir/$non_pic_object"
 	 fi
 	fi
 	;;
 
 *)
-	if test "$opt_mode" = clean ; then
+	if test clean = "$opt_mode"; then
 	 noexename=$name
 	 case $file in
 	 *.exe)
@@ -9590,12 +11086,12 @@
 
 	 # note $name still contains .exe if it was in $file originally
 	 # as does the version of $file that was added into $rmfiles
-	 func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-	 if test "$fast_install" = yes && test -n "$relink_command"; then
+	 func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+	 if test yes = "$fast_install" && test -n "$relink_command"; then
 	 func_append rmfiles " $odir/lt-$name"
 	 fi
-	 if test "X$noexename" != "X$name" ; then
-	 func_append rmfiles " $odir/lt-${noexename}.c"
+	 if test "X$noexename" != "X$name"; then
+	 func_append rmfiles " $odir/lt-$noexename.c"
 	 fi
 	 fi
 	fi
@@ -9604,7 +11100,7 @@
 func_show_eval "$RM $rmfiles" 'exit_status=1'
 done
 
- # Try to remove the ${objdir}s in the directories where we deleted files
+ # Try to remove the $objdir's in the directories where we deleted files
 for dir in $rmdirs; do
 if test -d "$dir"; then
 	func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9614,16 +11110,17 @@
 exit $exit_status
 }
 
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+ func_mode_uninstall ${1+"$@"}
+fi
 
 test -z "$opt_mode" && {
- help="$generic_help"
+ help=$generic_help
 func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
 
 if test -n "$exec_cmd"; then
 eval exec "$exec_cmd"
@@ -9634,7 +11131,7 @@
 
 
 # The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
+# where we disable both kinds of libraries. Given conflicting
 # choices, we go for a static library, that is the most portable,
 # since we can't tell whether shared libraries were disabled because
 # the user asked for that or because the platform doesn't support
@@ -9657,5 +11154,3 @@
 # mode:shell-script
 # sh-indentation:2
 # End:
-# vi:sw=2
-

deadbeef-0.6.2.tar.bz2/missing -> deadbeef-1.9.6.tar.bz2/missing Changed

@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # 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
@@ -26,69 +25,40 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
 exit 1
 fi
 
-run=:
-sed_output='s/.* --output =$^ *$.*/\1/p'
-sed_minuso='s/.* -o $^ *$.*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
 
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
 
 -h|--h|--he|--hel|--help)
 echo "\
 $0 OPTION... PROGRAM ARGUMENT...
 
-Handle \`PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM ARGUMENT...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
 -h, --help display this help and exit
 -v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.ch', if possible, from existing .ch
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.ch', if possible, from existing .ch
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
 exit $?
@@ -100,272 +70,141 @@
 ;;
 
 -*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
 exit 1
 ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^ *ACM_CONFIG_HEADER($^)*$).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
-				 sed -e 's/^^:*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
-	 sed 's/\.am$/.in/' |
-	 while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
-	touch $file
- else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "# $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	 if test -f "$SRCFILE"; then
-	 cp "$SRCFILE" y.tab.c
-	 fi
-	 SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	 if test -f "$SRCFILE"; then
-	 cp "$SRCFILE" y.tab.h
-	 fi
-	 ;;
-	esac
- fi
- if test ! -f y.tab.h; then
-	echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	 if test -f "$SRCFILE"; then
-	 cp "$SRCFILE" lex.yy.c
-	 fi
-	 ;;
-	esac
- fi
- if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
-	 you modified a dependency of a manual page. You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
-	touch $file
- else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* $^ *$ *$/\1/'`
- file=`sed -n '
-	/^@setfilename/{
-	 s/.* $^ *$ *$/\1/
-	 p
-	 q
-	}' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.^.*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
-	case $firstarg in
-	*o*)
-	 firstarg=`echo "$firstarg" | sed s/o//`
-	 tar "$firstarg" "$@" && exit 0
-	 ;;
-	esac
-	case $firstarg in
-	*h*)
-	 firstarg=`echo "$firstarg" | sed s/h//`
-	 tar "$firstarg" "$@" && exit 0
-	 ;;
-	esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
 
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'autom4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)

deadbeef-0.6.2.tar.bz2/pixmaps/Makefile.in -> deadbeef-1.9.6.tar.bz2/pixmaps/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/aac/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/aac/COPYING Changed

@@ -1,13 +1,26 @@
 AAC DeaDBeeF Player Plugin
-Copyright (c) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+Copyright (c) 2009-2020 Oleksiy Yakovenko <waker@users.sourceforge.net>
 
-libmp4ff (modified)
-Code from MP4FF is copyright (c) Nero AG, www.nero.com
-deadbeef-related modifications (c) 2009-2014 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
+arising from the use of this software.
 
-Relies on libfaad2
-Code from FAAD2 is copyright (c) Nero AG, www.nero.com
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+libfaad2 Copyright (c) Nero AG, www.nero.com
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

deadbeef-0.6.2.tar.bz2/plugins/aac/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/aac/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/aac/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/aac/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/aac/aac.c -> deadbeef-1.9.6.tar.bz2/plugins/aac/aac.c Changed

@@ -1,52 +1,55 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2016 Oleksiy Yakovenko and other contributors
 
- 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.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
 
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <neaacdec.h>
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
 #include <stdlib.h>
 #include <math.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 #include "aac_parser.h"
+#include "aac_decoder_faad2.h"
 
-#include "mp4ff.h"
+#include "../../shared/mp4tagutil.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,...)
+#define trace(...) { deadbeef->log_detailed (&plugin.decoder.plugin, 0, __VA_ARGS__); }
 
-static DB_decoder_t plugin;
-static DB_functions_t *deadbeef;
+static ddb_decoder2_t plugin;
+DB_functions_t *deadbeef;
 
-//#define AAC_BUFFER_SIZE 50000
-#define AAC_BUFFER_SIZE (FAAD_MIN_STREAMSIZE * 16)
-#define OUT_BUFFER_SIZE 100000
+#define AAC_MAX_PACKET_SIZE 768*8 // setting max input packet size, to have some headroom
 
 #define MP4FILE mp4ff_t *
 #define MP4FILE_CB mp4ff_callback_t
 
+#define RAW_AAC_PROBE_SIZE 100
 
 // aac channel mapping
 // 0: Defined in AOT Specifc Config
@@ -59,25 +62,45 @@
 // 7: 8 channels: front-center, front-left, front-right, side-left, side-right, back-left, back-right, LFE-channel
 // 8-15: Reserved
 
+// aac channels
+#define FRONT_CHANNEL_CENTER (1)
+#define FRONT_CHANNEL_LEFT (2)
+#define FRONT_CHANNEL_RIGHT (3)
+#define SIDE_CHANNEL_LEFT (4)
+#define SIDE_CHANNEL_RIGHT (5)
+#define BACK_CHANNEL_LEFT (6)
+#define BACK_CHANNEL_RIGHT (7)
+#define BACK_CHANNEL_CENTER (8)
+#define LFE_CHANNEL (9)
+#define UNKNOWN_CHANNEL (0)
+
 
 typedef struct {
 DB_fileinfo_t info;
- NeAACDecHandle dec;
+ aacDecoderHandle_t *dec;
+ aacDecoderFrameInfo_t frame_info;
 DB_FILE *file;
- MP4FILE mp4;
- MP4FILE_CB mp4reader;
- NeAACDecFrameInfo frame_info; // last frame info
- int mp4track;
- int mp4samples;
+
+ mp4p_file_callbacks_t mp4reader;
+ mp4p_atom_t *mp4file;
+ mp4p_atom_t *trak;
+ uint64_t mp4samples;
+ uint32_t aac_samplerate;
+
 int mp4sample;
 int mp4framesize;
- int skipsamples;
- int startsample;
- int endsample;
- int currentsample;
- char bufferAAC_BUFFER_SIZE;
+ int64_t skipsamples;
+ int64_t startsample;
+ int64_t endsample;
+ int64_t currentsample;
+
+ // buffer with input packet data
+ uint8_t bufferAAC_MAX_PACKET_SIZE;
 int remaining;
- char out_bufferOUT_BUFFER_SIZE;
+
+ // buffer with decoded samples
+ uint8_t *out_buffer;
+ size_t out_buffer_size;
 int out_remaining;
 int num_errors;
 char *samplebuffer;
@@ -87,47 +110,26 @@
 int junk;
 } aac_info_t;
 
+static int
+aac_seek_sample (DB_fileinfo_t *_info, int sample);
+
 // allocate codec control structure
 static DB_fileinfo_t *
 aac_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (aac_info_t));
- aac_info_t *info = (aac_info_t *)_info;
- memset (info, 0, sizeof (aac_info_t));
- return _info;
+ aac_info_t *info = calloc (1, sizeof (aac_info_t));
+ return (DB_fileinfo_t *)info;
 }
 
-static uint32_t
-aac_fs_read (void *user_data, void *buffer, uint32_t length) {
-// trace ("aac_fs_read %d\n", length);
- aac_info_t *info = user_data;
- return deadbeef->fread (buffer, 1, length, info->file);
-}
-static uint32_t
-aac_fs_seek (void *user_data, uint64_t position) {
- aac_info_t *info = user_data;
-// trace ("aac_fs_seek %lld (%lld)\n", position, position + info->junk);
- return deadbeef->fseek (info->file, position+info->junk, SEEK_SET);
-}
-
-
-static int
-parse_aac_stream(DB_FILE *fp, int *psamplerate, int *pchannels, float *pduration, int *ptotalsamples)
+static int64_t
+parse_aac_stream(DB_FILE *fp, int *psamplerate, int *pchannels, float *pduration, int64_t *ptotalsamples)
 {
 size_t framepos = deadbeef->ftell (fp);
- size_t initfpos = framepos;
- int firstframepos = -1;
- int fsize = -1;
+ int64_t firstframepos = -1;
+ int64_t fsize = -1;
 int offs = 0;
+
 if (!fp->vfs->is_streaming ()) {
- int skip = deadbeef->junk_get_leading_size (fp);
- if (skip >= 0) {
- deadbeef->fseek (fp, skip, SEEK_SET);
- }
- int offs = deadbeef->ftell (fp);
- fsize = deadbeef->fgetlength (fp);
- if (skip > 0) {
- fsize -= skip;
- }
+ fsize = deadbeef->fgetlength (fp) - deadbeef->ftell(fp);
 }
 
 uint8_t bufADTS_HEADER_SIZE*8;
@@ -136,9 +138,7 @@
 int stream_sr = 0;
 int stream_ch = 0;
 
- int eof = 0;
 int bufsize = 0;
- int remaining = 0;
 
 int frame = 0;
 int scanframes = 1000;
@@ -149,7 +149,6 @@
 do {
 int size = sizeof (buf) - bufsize;
 if (deadbeef->fread (buf + bufsize, 1, size, fp) != size) {
- trace ("parse_aac_stream: eof\n");
 break;
 }
 bufsize = sizeof (buf);
@@ -159,15 +158,10 @@
 if (size == 0) {
 memmove (buf, buf+1, sizeof (buf)-1);
 bufsize--;
- trace ("aac_sync fail, framepos: %d\n", framepos);
-// if (deadbeef->ftell (fp) - initfpos > 4000) { // how many is enough to make sure?
-// break;
-// }
 framepos++;
 continue;
 }
 else {
- trace ("aac: frame #%d sync: %dch %d %d %d %d\n", frame, channels, samplerate, bitrate, samples, size);
 frame++;
 nsamples += samples;
 if (!stream_sr) {
@@ -185,7 +179,6 @@
 // }
 framepos += size;
 if (deadbeef->fseek (fp, size-(int)sizeof(buf), SEEK_CUR) == -1) {
- trace ("parse_aac_stream: invalid seek %d\n", size-sizeof(buf));
 break;
 }
 bufsize = 0;
@@ -203,13 +196,11 @@
 if (ptotalsamples) {
 *ptotalsamples = nsamples;
 *pduration = nsamples / (float)stream_sr;
- trace ("aac: duration=%f (%d samples @ %d Hz), fsize=%d, nframes=%d\n", *pduration, *ptotalsamples, stream_sr, fsize, frame);
 }
 else {
- int pos = deadbeef->ftell (fp);
+ int64_t pos = deadbeef->ftell (fp);
 int totalsamples = (double)fsize / (pos-offs) * nsamples;
 *pduration = totalsamples / (float)stream_sr;
- trace ("aac: duration=%f (%d samples @ %d Hz), fsize=%d\n", *pduration, totalsamples, stream_sr, fsize);
 }
 
 if (*psamplerate <= 24000) {
@@ -221,100 +212,38 @@
 return firstframepos;
 }
 
+// returns -1 for error, 0 for aac
 static int
-mp4_track_get_info(mp4ff_t *mp4, int track, float *duration, int *samplerate, int *channels, int *totalsamples, int *mp4framesize) {
- int sr = -1;
- unsigned char* buff = 0;
- unsigned int buff_size = 0;
- mp4AudioSpecificConfig mp4ASC;
- mp4ff_get_decoder_config(mp4, track, &buff, &buff_size);
- if (buff) {
- int rc = AudioSpecificConfig(buff, buff_size, &mp4ASC);
- sr = mp4ASC.samplingFrequency;
- if(rc < 0) {
- free (buff);
- trace ("aac: AudioSpecificConfig returned result=%d\n", rc);
- return -1;
+aac_probe (DB_FILE *fp, float *duration, int *samplerate, int *channels, int64_t *totalsamples) {
+ deadbeef->rewind (fp);
+ if (!fp->vfs->is_streaming ()) {
+ int skip = deadbeef->junk_get_leading_size (fp);
+ if (skip >= 0) {
+ deadbeef->fseek (fp, skip, SEEK_CUR);
 }
 }
 
- unsigned long srate;
- unsigned char ch;
- int samples;
-
- // init mp4 decoding
- NeAACDecHandle dec = NeAACDecOpen ();
- if (NeAACDecInit2(dec, buff, buff_size, &srate, &ch) < 0) {
- trace ("NeAACDecInit2 returned error\n");
- goto error;
- }
- *samplerate = srate;
- *channels = ch;
- samples = (int64_t)mp4ff_num_samples(mp4, track);
- 
- NeAACDecClose (dec);
- dec = NULL;
-
- if (samples <= 0) {
- goto error;
- }
-
- int i_sample_count = samples;
- int i_sample;
-
- int64_t total_dur = 0;
- for( i_sample = 0; i_sample < i_sample_count; i_sample++ )
- {
- total_dur += mp4ff_get_sample_duration (mp4, track, i_sample);
- }
- if (totalsamples) {
- *totalsamples = total_dur * (*samplerate) / mp4ff_time_scale (mp4, track);
- *mp4framesize = (*totalsamples) / i_sample_count;
- }
- *duration = total_dur / (float)mp4ff_time_scale (mp4, track);
-
- return 0;
-error:
- if (dec) {
- NeAACDecClose (dec);
- }
- free (buff);
- return -1;
-}
-
-// returns -1 for error, 0 for aac
-int
-aac_probe (DB_FILE *fp, float *duration, int *samplerate, int *channels, int *totalsamples) {
-
- deadbeef->rewind (fp);
 if (parse_aac_stream (fp, samplerate, channels, duration, totalsamples) == -1) {
- trace ("aac stream not found\n");
 return -1;
 }
- trace ("found aac stream\n");
 return 0;
 }
 
-
 static int
 aac_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
 aac_info_t *info = (aac_info_t *)_info;
 
 deadbeef->pl_lock ();
- info->file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ info->file = deadbeef->fopen (uri);
 if (!info->file) {
 return -1;
 }
 
 // probe
- float duration = -1;
- int samplerate = -1;
- int channels = -1;
- int totalsamples = -1;
-
- info->junk = deadbeef->junk_get_leading_size (info->file);
 if (!info->file->vfs->is_streaming ()) {
+ info->junk = deadbeef->junk_get_leading_size (info->file);
 if (info->junk >= 0) {
 deadbeef->fseek (info->file, info->junk, SEEK_SET);
 }
@@ -326,167 +255,145 @@
 deadbeef->fset_track (info->file, it);
 }
 
- info->mp4track = -1;
- info->mp4reader.read = aac_fs_read;
- info->mp4reader.write = NULL;
- info->mp4reader.seek = aac_fs_seek;
- info->mp4reader.truncate = NULL;
- info->mp4reader.user_data = info;
+ info->mp4reader.ptrhandle = info->file;
+ mp4_init_ddb_file_callbacks (&info->mp4reader);
+ info->mp4file = mp4p_open(&info->mp4reader);
 
- if (!info->file->vfs->is_streaming ()) {
- trace ("aac_init: mp4ff_open_read %s\n", deadbeef->pl_find_meta (it, ":URI"));
- info->mp4 = mp4ff_open_read (&info->mp4reader);
- if (info->mp4) {
- int ntracks = mp4ff_total_tracks (info->mp4);
- for (int i = 0; i < ntracks; i++) {
- if (mp4ff_get_track_type (info->mp4, i) != TRACK_AUDIO) {
- continue;
- }
- int res = mp4_track_get_info (info->mp4, i, &duration, &samplerate, &channels, &totalsamples, &info->mp4framesize);
- if (res >= 0 && duration > 0) {
- info->mp4track = i;
- break;
- }
+ int64_t totalsamples = -1;
+ float duration = -1;
+ mp4p_mp4a_t *aac = NULL;
+
+ if (info->mp4file) {
+ info->trak = mp4p_atom_find (info->mp4file, "moov/trak");
+ while (info->trak) {
+ mp4p_atom_t *aac_atom = mp4p_atom_find (info->trak, "trak/mdia/minf/stbl/stsd/mp4a");
+ if (aac_atom) {
+ aac = aac_atom->data;
+ info->aac_samplerate = aac->sample_rate;
+ break;
 }
- trace ("track: %d\n", info->mp4track);
- if (info->mp4track >= 0) {
- // prepare decoder
- int res = mp4_track_get_info (info->mp4, info->mp4track, &duration, &samplerate, &channels, &totalsamples, &info->mp4framesize);
- if (res != 0) {
- trace ("aac: mp4_track_get_info(%d) returned error\n", info->mp4track);
- return -1;
- }
-
- // init mp4 decoding
- info->mp4samples = mp4ff_num_samples(info->mp4, info->mp4track);
- info->dec = NeAACDecOpen ();
- unsigned long srate;
- unsigned char ch;
- unsigned char* buff = 0;
- unsigned int buff_size = 0;
- mp4AudioSpecificConfig mp4ASC;
- mp4ff_get_decoder_config (info->mp4, info->mp4track, &buff, &buff_size);
- if (NeAACDecInit2(info->dec, buff, buff_size, &srate, &ch) < 0) {
- trace ("NeAACDecInit2 returned error\n");
- free (buff);
- return -1;
- }
+ info->trak = info->trak->next;
+ }
 
- if (buff) {
- free (buff);
- }
- trace ("aac: successfully initialized track %d\n", info->mp4track);
- _info->fmt.samplerate = samplerate;
- _info->fmt.channels = channels;
- }
- else {
- trace ("aac: track not found in mp4 container\n");
- mp4ff_close (info->mp4);
- info->mp4 = NULL;
+ if (!aac) {
+ if (info->mp4file) {
+ mp4p_atom_free_list (info->mp4file);
+ info->mp4file = NULL;
 }
 }
+ }
+
+ if (aac) {
+ mp4p_atom_t *stts_atom = mp4p_atom_find(info->trak, "trak/mdia/minf/stbl/stts");
+
+ uint64_t total_sample_duration = mp4p_stts_total_sample_duration (stts_atom);
+ mp4p_atom_t *stsz_atom = mp4p_atom_find(info->trak, "trak/mdia/minf/stbl/stsz");
+ mp4p_stsz_t *stsz = stsz_atom->data;
+
+ // init mp4 decoding
+ info->mp4samples = stsz->number_of_entries;
+ info->dec = aacDecoderOpenFAAD2();
+ unsigned samplerate;
+ unsigned channels;
+
+ mp4p_atom_t *esds_atom = mp4p_atom_find (info->trak, "trak/mdia/minf/stbl/stsd/mp4a/esds");
+ if (!esds_atom) {
+ return -1;
+ }
+ mp4p_esds_t *esds = esds_atom->data;
 
- if (!info->mp4) {
- trace ("aac: looking for raw stream...\n");
+ uint8_t *asc = (uint8_t *)esds->asc;
+ if (aacDecoderInit(info->dec, asc, esds->asc_size, &samplerate, &channels) < 0) {
+ return -1;
+ }
+ totalsamples = total_sample_duration * samplerate / info->aac_samplerate;
+ duration = total_sample_duration / (float)info->aac_samplerate;
 
+ _info->fmt.samplerate = samplerate;
+ _info->fmt.channels = channels;
+ }
+ else if (info->mp4file) {
+ return -1; // mp4 but not aac
+ }
+ else {
+ int samplerate = -1;
+ int channels = -1;
+ int64_t offs;
+ if (!info->file->vfs->is_streaming ()) {
 if (info->junk >= 0) {
 deadbeef->fseek (info->file, info->junk, SEEK_SET);
 }
 else {
 deadbeef->rewind (info->file);
 }
- int offs = parse_aac_stream (info->file, &samplerate, &channels, &duration, &totalsamples);
- if (offs == -1) {
- trace ("aac stream not found\n");
- return -1;
- }
- if (offs > info->junk) {
- info->junk = offs;
- }
+ offs = parse_aac_stream (info->file, &samplerate, &channels, &duration, &totalsamples);
+ }
+ else {
+ offs = parse_aac_stream (info->file, &samplerate, &channels, &duration, NULL);
+ }
+ if (offs == -1) {
+ return -1;
+ }
+ if (offs > info->junk) {
+ info->junk = (int)offs;
+ }
+ if (!info->file->vfs->is_streaming ()) {
 if (info->junk >= 0) {
 deadbeef->fseek (info->file, info->junk, SEEK_SET);
 }
 else {
 deadbeef->rewind (info->file);
 }
- trace ("found aac stream (junk: %d, offs: %d)\n", info->junk, offs);
-
- _info->fmt.channels = channels;
- _info->fmt.samplerate = samplerate;
- }
- }
- else {
- // sync before attempting to init
- int samplerate, channels;
- float duration;
- int offs = parse_aac_stream (info->file, &samplerate, &channels, &duration, NULL);
- if (offs < 0) {
- trace ("aac: parse_aac_stream failed\n");
- return -1;
 }
- if (offs > info->junk) {
- info->junk = offs;
+ if (info->file->vfs->is_streaming ()) {
+ deadbeef->pl_replace_meta (it, "!FILETYPE", "AAC");
 }
- trace("parse_aac_stream returned %x\n", offs);
- deadbeef->pl_replace_meta (it, "!FILETYPE", "AAC");
- }
 
-// duration = (float)totalsamples / samplerate;
-// deadbeef->pl_set_item_duration (it, duration);
-
- _info->fmt.bps = 16;
- _info->plugin = &plugin;
-
- if (!info->mp4) {
- trace ("NeAACDecOpen for raw stream\n");
- info->dec = NeAACDecOpen ();
-
- trace ("prepare for NeAACDecInit: fread %d from offs %lld\n", AAC_BUFFER_SIZE, deadbeef->ftell (info->file));
- info->remaining = deadbeef->fread (info->buffer, 1, AAC_BUFFER_SIZE, info->file);
-
- NeAACDecConfigurationPtr conf = NeAACDecGetCurrentConfiguration (info->dec);
-// conf->dontUpSampleImplicitSBR = 1;
- NeAACDecSetConfiguration (info->dec, conf);
- unsigned long srate;
- unsigned char ch;
- trace ("NeAACDecInit (%d bytes)\n", info->remaining);
- int consumed = NeAACDecInit (info->dec, info->buffer, info->remaining, &srate, &ch);
- trace ("NeAACDecInit returned samplerate=%d, channels=%d, consumed: %d\n", (int)srate, (int)ch, consumed);
- if (consumed < 0) {
- trace ("NeAACDecInit returned %d\n", consumed);
+ off_t fileOffs = deadbeef->ftell (info->file);
+ uint8_t ascRAW_AAC_PROBE_SIZE;
+ size_t nb = deadbeef->fread (asc, 1, sizeof (asc), info->file);
+ if (nb != sizeof (asc)) {
 return -1;
 }
- if (consumed > info->remaining) {
- trace ("NeAACDecInit consumed more than available! wtf?\n");
+ deadbeef->fseek (info->file, fileOffs, SEEK_SET);
+ unsigned usamplerate;
+ unsigned uchannels;
+
+ info->dec = aacDecoderOpenFAAD2();
+ if (aacDecoderInitRaw(info->dec, asc, sizeof (asc), &usamplerate, &uchannels) < 0) {
 return -1;
 }
- if (consumed == info->remaining) {
- info->remaining = 0;
- }
- else if (consumed > 0) {
- memmove (info->buffer, info->buffer + consumed, info->remaining - consumed);
- info->remaining -= consumed;
- }
- _info->fmt.channels = ch;
- _info->fmt.samplerate = srate;
+ _info->fmt.samplerate = usamplerate;
+ _info->fmt.channels = uchannels;
 }
 
+ _info->fmt.bps = 16;
+ _info->plugin = &plugin.decoder;
+
 if (!info->file->vfs->is_streaming ()) {
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
- plugin.seek_sample (_info, 0);
+ int64_t endsample = deadbeef->pl_item_get_endsample(it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample(it);
+ info->endsample = endsample;
+ aac_seek_sample (_info, 0);
 }
 else {
 info->startsample = 0;
- info->endsample = totalsamples-1;
+ info->endsample = (int)totalsamples-1;
 }
 }
 if (_info->fmt.channels == 7) {
 _info->fmt.channels = 8;
 }
 
- trace ("totalsamples: %d, endsample: %d, samples-from-duration: %d, samplerate %d, channels %d\n", totalsamples-1, info->endsample, (int)deadbeef->pl_get_item_duration (it)*44100, _info->fmt.samplerate, _info->fmt.channels);
+ char s100;
+ deadbeef->pl_replace_meta (it, ":BPS", "16");
+ snprintf (s, sizeof (s), "%d", _info->fmt.channels);
+ deadbeef->pl_replace_meta (it, ":CHANNELS", s);
+ snprintf (s, sizeof (s), "%d", _info->fmt.samplerate);
+ deadbeef->pl_replace_meta (it, ":SAMPLERATE", s);
+
+ trace ("totalsamples: %d, endsample: %d, samples-from-duration: %d, samplerate %d, channels %d\n", (int)totalsamples, (int)info->endsample, (int)deadbeef->pl_get_item_duration (it)*44100, _info->fmt.samplerate, _info->fmt.channels);
 
 for (int i = 0; i < _info->fmt.channels; i++) {
 _info->fmt.channelmask |= 1 << i;
@@ -496,8 +403,6 @@
 info->remapi = -1;
 }
 
- trace ("init success\n");
-
 return 0;
 }
 
@@ -508,12 +413,13 @@
 if (info->file) {
 deadbeef->fclose (info->file);
 }
- if (info->mp4) {
- mp4ff_close (info->mp4);
+ if (info->mp4file) {
+ mp4p_atom_free_list (info->mp4file);
 }
 if (info->dec) {
- NeAACDecClose (info->dec);
+ aacDecoderClose (info->dec);
 }
+ free (info->out_buffer);
 free (info);
 }
 }
@@ -522,15 +428,14 @@
 aac_read (DB_fileinfo_t *_info, char *bytes, int size) {
 aac_info_t *info = (aac_info_t *)_info;
 if (info->eof) {
- trace ("aac_read: received call after eof\n");
 return 0;
 }
+
 int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
 if (!info->file->vfs->is_streaming ()) {
 if (info->currentsample + size / samplesize > info->endsample) {
- size = (info->endsample - info->currentsample + 1) * samplesize;
+ size = (int)(info->endsample - info->currentsample + 1) * samplesize;
 if (size <= 0) {
- trace ("aac_read: eof (current=%d, total=%d)\n", info->currentsample, info->endsample);
 return 0;
 }
 }
@@ -538,21 +443,26 @@
 
 int initsize = size;
 
+ size_t bitrate_bytes = 0;
+ size_t bitrate_samples = 0;
+
 while (size > 0) {
+ // skip decoded samples
 if (info->skipsamples > 0 && info->out_remaining > 0) {
- int skip = min (info->out_remaining, info->skipsamples);
-// trace ("skipping %d\n", skip);
+ int64_t skip = min (info->out_remaining, info->skipsamples);
 if (skip < info->out_remaining) {
 memmove (info->out_buffer, info->out_buffer + skip * samplesize, (info->out_remaining - skip) * samplesize);
 }
 info->out_remaining -= skip;
 info->skipsamples -= skip;
 }
+
+ // consume decoded samples
 if (info->out_remaining > 0) {
 int n = size / samplesize;
 n = min (info->out_remaining, n);
 
- char *src = info->out_buffer;
+ uint8_t *src = info->out_buffer;
 if (info->noremap) {
 memcpy (bytes, src, n * samplesize);
 bytes += n * samplesize;
@@ -644,50 +554,57 @@
 continue;
 }
 
- char *samples = NULL;
+ uint8_t *samples = NULL;
 
- if (info->mp4) {
+ if (info->mp4file) {
 if (info->mp4sample >= info->mp4samples) {
- trace ("aac: finished with the last mp4sample\n");
 break;
 }
- 
- unsigned char *buffer = NULL;
- int buffer_size = 0;
- int rc = mp4ff_read_sample (info->mp4, info->mp4track, info->mp4sample, &buffer, &buffer_size);
- if (rc == 0) {
- trace ("mp4ff_read_sample failed\n");
+
+ mp4p_atom_t *stbl_atom = mp4p_atom_find(info->trak, "trak/mdia/minf/stbl");
+ uint64_t offs = mp4p_sample_offset (stbl_atom, info->mp4sample);
+ unsigned int size = mp4p_sample_size (stbl_atom, info->mp4sample);
+// printf ("%08X %d\n", (int)offs, size);
+
+ uint8_t *mp4packet = malloc (size);
+ deadbeef->fseek (info->file, offs+info->junk, SEEK_SET);
+ if (size != deadbeef->fread (mp4packet, 1, size, info->file)) {
+ trace ("aac: failed to read sample\n");
 info->eof = 1;
 break;
 }
 info->mp4sample++;
- samples = NeAACDecDecode(info->dec, &info->frame_info, buffer, buffer_size);
 
- if (buffer) {
- free (buffer);
- }
+ samples = aacDecoderDecodeFrame (info->dec, &info->frame_info, mp4packet, size);
+
+ free (mp4packet);
+ mp4packet = NULL;
+
 if (!samples) {
- trace ("aac: NeAACDecDecode returned NULL\n");
+ trace ("aac: ascDecoderDecodeFrame returned NULL\n");
 break;
 }
+
+ bitrate_bytes += info->frame_info.bytesconsumed;
+ bitrate_samples += info->frame_info.samples / info->frame_info.channels;
 }
 else {
- if (info->remaining < AAC_BUFFER_SIZE) {
+ if (info->remaining < AAC_MAX_PACKET_SIZE) {
 trace ("fread from offs %lld\n", deadbeef->ftell (info->file));
- size_t res = deadbeef->fread (info->buffer + info->remaining, 1, AAC_BUFFER_SIZE-info->remaining, info->file);
+ size_t res = deadbeef->fread (info->buffer + info->remaining, 1, AAC_MAX_PACKET_SIZE-info->remaining, info->file);
 info->remaining += res;
 trace ("remain: %d\n", info->remaining);
 if (!info->remaining) {
 break;
 }
 }
-
 trace ("NeAACDecDecode %d bytes\n", info->remaining)
- samples = NeAACDecDecode (info->dec, &info->frame_info, info->buffer, info->remaining);
+ samples = aacDecoderDecodeFrame (info->dec, &info->frame_info, info->buffer, info->remaining);
+ bitrate_bytes += info->frame_info.bytesconsumed;
+ bitrate_samples += info->frame_info.channels > 0 ? info->frame_info.samples / info->frame_info.channels : 0;
 trace ("samples =%p\n", samples);
 if (!samples) {
- trace ("NeAACDecDecode failed with error %s (%d), consumed=%d\n", NeAACDecGetErrorMessage(info->frame_info.error), (int)info->frame_info.error, (int)info->frame_info.bytesconsumed);
-
+// trace ("NeAACDecDecode failed with error %s (%d), consumed=%d\n", NeAACDecGetErrorMessage(info->frame_info.error), (int)info->frame_info.error, (int)info->frame_info.bytesconsumed);
 if (info->num_errors > 10) {
 trace ("NeAACDecDecode failed %d times, interrupting\n", info->num_errors);
 break;
@@ -697,7 +614,7 @@
 continue;
 }
 info->num_errors=0;
- int consumed = info->frame_info.bytesconsumed;
+ unsigned long consumed = info->frame_info.bytesconsumed;
 if (consumed > info->remaining) {
 trace ("NeAACDecDecode consumed more than available! wtf?\n");
 break;
@@ -712,28 +629,31 @@
 }
 
 if (info->frame_info.samples > 0) {
+ if (info->out_buffer_size < info->frame_info.samples * 2) {
+ info->out_buffer_size = info->frame_info.samples * 2;
+ info->out_buffer = realloc (info->out_buffer, info->out_buffer_size);
+ }
 memcpy (info->out_buffer, samples, info->frame_info.samples * 2);
- info->out_remaining = info->frame_info.samples / info->frame_info.channels;
+ info->out_remaining = (int)(info->frame_info.samples / info->frame_info.channels);
 }
 }
 
 info->currentsample += (initsize-size) / samplesize;
+ long bitrate = 0;
+ if (bitrate_samples > 0) {
+ bitrate = bitrate_bytes * 8 * _info->fmt.samplerate / bitrate_samples / 1000;
+ }
+ deadbeef->streamer_set_bitrate ((int)bitrate);
 
 return initsize-size;
 }
 
-// returns -1 on error, 0 on success
-int
-seek_raw_aac (aac_info_t *info, int sample) {
+// returns -1 on error, skipsamples on success
+int64_t
+seek_raw_aac (aac_info_t *info, int64_t sample) {
 uint8_t bufADTS_HEADER_SIZE*8;
 
- int nsamples = 0;
- int stream_sr = 0;
- int stream_ch = 0;
-
- int eof = 0;
 int bufsize = 0;
- int remaining = 0;
 
 int frame = 0;
 
@@ -744,7 +664,6 @@
 curr_sample += frame_samples;
 int size = sizeof (buf) - bufsize;
 if (deadbeef->fread (buf + bufsize, 1, size, info->file) != size) {
- trace ("seek_raw_aac: eof\n");
 break;
 }
 bufsize = sizeof (buf);
@@ -757,10 +676,8 @@
 continue;
 }
 else {
- //trace ("aac: frame #%d(%d/%d) sync: %d %d %d %d %d\n", frame, curr_sample, sample, channels, samplerate, bitrate, frame_samples, size);
 frame++;
 if (deadbeef->fseek (info->file, size-(int)sizeof(buf), SEEK_CUR) == -1) {
- trace ("seek_raw_aac: invalid seek %d\n", size-sizeof(buf));
 break;
 }
 bufsize = 0;
@@ -778,35 +695,21 @@
 }
 
 static int
-aac_seek_sample (DB_fileinfo_t *_info, int sample) {
+aac_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
 aac_info_t *info = (aac_info_t *)_info;
 
- trace ("seek: start %d + %d\n", info->startsample, sample);
-
 sample += info->startsample;
- if (info->mp4) {
- int totalsamples = 0;
- int i;
- int num_sample_byte_sizes = mp4ff_get_num_sample_byte_sizes (info->mp4, info->mp4track);
- int scale = _info->fmt.samplerate / mp4ff_time_scale (info->mp4, info->mp4track);
- for (i = 0; i < num_sample_byte_sizes; i++)
- {
- unsigned int thissample_duration = 0;
- unsigned int thissample_bytesize = 0;
 
- mp4ff_get_sample_info(info->mp4, info->mp4track, i, &thissample_duration,
- &thissample_bytesize);
+ if (info->mp4file) {
+ mp4p_atom_t *stts_atom = mp4p_atom_find(info->trak, "trak/mdia/minf/stbl/stts");
 
- if (totalsamples + thissample_duration > sample / scale) {
- info->skipsamples = sample - totalsamples * scale;
- break;
- }
- totalsamples += thissample_duration;
- }
-// i = sample / info->mp4framesize;
-// info->skipsamples = sample - info->mp4sample * info->mp4framesize;
- info->mp4sample = i;
- trace ("seek res: frame %d (old: %d*%d), skip %d\n", info->mp4sample, sample / info->mp4framesize, info->mp4framesize, info->skipsamples);
+ uint64_t seeksample = (int)(sample * info->aac_samplerate / _info->fmt.samplerate);
+
+ uint64_t startsample = 0;
+ info->mp4sample = mp4p_stts_mp4sample_containing_sample(stts_atom, seeksample, &startsample);
+
+ startsample = startsample * _info->fmt.samplerate / info->aac_samplerate;
+ info->skipsamples = sample - startsample;
 }
 else {
 int skip = deadbeef->junk_get_leading_size (info->file);
@@ -817,7 +720,7 @@
 deadbeef->fseek (info->file, 0, SEEK_SET);
 }
 
- int res = seek_raw_aac (info, sample);
+ int64_t res = seek_raw_aac (info, sample);
 if (res < 0) {
 return -1;
 }
@@ -827,230 +730,106 @@
 info->out_remaining = 0;
 info->currentsample = sample;
 _info->readpos = (float)(info->currentsample - info->startsample) / _info->fmt.samplerate;
+
 return 0;
 }
 
 static int
-aac_seek (DB_fileinfo_t *_info, float t) {
- return aac_seek_sample (_info, t * _info->fmt.samplerate);
+aac_seek_sample (DB_fileinfo_t *_info, int sample) {
+ return aac_seek_sample64(_info, sample);
 }
 
-static const char *metainfo = {
- "artist", "artist",
- "title", "title",
- "album", "album",
- "track", "track",
- "date", "year",
- "genre", "genre",
- "comment", "comment",
- "performer", "performer",
- "album_artist", "band",
- "writer", "composer",
- "vendor", "vendor",
- "disc", "disc",
- "compilation", "compilation",
- "totaldiscs", "numdiscs",
- "copyright", "copyright",
- "totaltracks", "numtracks",
- "tool", "tool",
- "MusicBrainz Track Id", "musicbrainz_trackid",
- NULL
-};
-
+static int
+aac_seek (DB_fileinfo_t *_info, float t) {
+ return aac_seek_sample64 (_info, (float)((double)t * (int64_t)_info->fmt.samplerate));
+}
 
-/* find a metadata item by name */
-/* returns 0 if item found, 1 if no such item */
-int32_t mp4ff_meta_find_by_name(const mp4ff_t *f, const char *item, char **value);
+typedef struct {
+ char *title;
+ int64_t startsample;
+ int64_t endsample;
+} aac_chapter_t;
 
+static aac_chapter_t *
+aac_load_itunes_chapters (aac_info_t *info, mp4p_chap_t *chap, /* out */ int *num_chapters, int samplerate) {
+ *num_chapters = 0;
 
-void
-aac_load_tags (DB_playItem_t *it, mp4ff_t *mp4) {
- char *s = NULL;
- int got_itunes_tags = 0;
+ mp4p_atom_t *mp4 = info->mp4file;
 
- int n = mp4ff_meta_get_num_items (mp4);
- for (int t = 0; t < n; t++) {
- char *key = NULL;
- char *value = NULL;
- int res = mp4ff_meta_get_by_index(mp4, t, &key, &value);
- if (key && value) {
- got_itunes_tags = 1;
- if (strcasecmp (key, "cover")) {
- if (!strcasecmp (key, "replaygain_track_gain")) {
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, atof (value));
- }
- else if (!strcasecmp (key, "replaygain_album_gain")) {
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, atof (value));
- }
- else if (!strcasecmp (key, "replaygain_track_peak")) {
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, atof (value));
- }
- else if (!strcasecmp (key, "replaygain_album_peak")) {
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, atof (value));
- }
- else {
- int i;
- for (i = 0; metainfoi; i += 2) {
- if (!strcasecmp (metainfoi, key)) {
- deadbeef->pl_add_meta (it, metainfoi+1, value);
- break;
- }
- }
- if (!metainfoi) {
- deadbeef->pl_add_meta (it, key, value);
+ for (int i = 0; i < chap->number_of_entries; i++)
+ {
+ mp4p_atom_t *text_atom = NULL;
+ mp4p_atom_t *trak_atom = mp4p_atom_find(mp4, "moov/trak");
+ while (trak_atom) {
+ text_atom = NULL;
+ if (!mp4p_atom_type_compare(trak_atom, "trak") && mp4p_trak_has_chapters(trak_atom)) {
+ text_atom = mp4p_atom_find(trak_atom, "trak/mdia/minf/stbl/stsd/text");
+ mp4p_atom_t *tkhd_atom = mp4p_atom_find(trak_atom, "trak/tkhd");
+ if (text_atom && tkhd_atom) {
+ mp4p_tkhd_t *tkhd = tkhd_atom->data;
+ if (tkhd->track_id == chap->entriesi) {
+ break;
 }
 }
 }
+ trak_atom = trak_atom->next;
 }
- if (key) {
- free (key);
- }
- if (value) {
- free (value);
- }
- }
-
- if (got_itunes_tags) {
- uint32_t f = deadbeef->pl_get_item_flags (it);
- f |= DDB_TAG_ITUNES;
- deadbeef->pl_set_item_flags (it, f);
- }
-}
-
-
-int
-aac_read_metadata (DB_playItem_t *it) {
- deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
- if (!fp) {
- return -1;
- }
 
- if (fp->vfs->is_streaming ()) {
- deadbeef->fclose (fp);
- return -1;
- }
-
- aac_info_t inf;
- memset (&inf, 0, sizeof (inf));
- inf.file = fp;
- inf.junk = deadbeef->junk_get_leading_size (fp);
- if (inf.junk >= 0) {
- deadbeef->fseek (inf.file, inf.junk, SEEK_SET);
- }
- else {
- inf.junk = 0;
- }
+ if (!text_atom) {
+ continue;
+ }
 
- MP4FILE_CB cb = {
- .read = aac_fs_read,
- .write = NULL,
- .seek = aac_fs_seek,
- .truncate = NULL,
- .user_data = &inf
- };
+ mp4p_atom_t *stts_atom = mp4p_atom_find(trak_atom, "trak/mdia/minf/stbl/stts");
+ mp4p_atom_t *mdhd_atom = mp4p_atom_find(trak_atom, "trak/mdia/mdhd");
+ mp4p_atom_t *stbl_atom = mp4p_atom_find(trak_atom, "trak/mdia/minf/stbl");
+ mp4p_atom_t *stsz_atom = mp4p_atom_find(stbl_atom, "stbl/stsz");
+ if (stts_atom == NULL || mdhd_atom == NULL || stbl_atom == NULL || stsz_atom == NULL) {
+ return NULL;
+ }
 
- deadbeef->pl_delete_all_meta (it);
+ mp4p_mdhd_t *mdhd = mdhd_atom->data;
+ mp4p_stsz_t *stsz = stsz_atom->data;
 
- mp4ff_t *mp4 = mp4ff_open_read (&cb);
- if (mp4) {
- aac_load_tags (it, mp4);
- mp4ff_close (mp4);
- }
- /*int apeerr = */deadbeef->junk_apev2_read (it, fp);
- /*int v2err = */deadbeef->junk_id3v2_read (it, fp);
- /*int v1err = */deadbeef->junk_id3v1_read (it, fp);
- deadbeef->fclose (fp);
- return 0;
-}
+ if (mdhd->time_scale == 0) {
+ return NULL;
+ }
 
-typedef struct {
- char *title;
- int32_t startsample;
- int32_t endsample;
-} aac_chapter_t;
+ aac_chapter_t *chapters = calloc (stsz->number_of_entries, sizeof (aac_chapter_t));
+ *num_chapters = 0;
 
-static aac_chapter_t *
-aac_load_itunes_chapters (mp4ff_t *mp4, /* out */ int *num_chapters, int samplerate) {
- *num_chapters = 0;
- int i_entry_count = mp4ff_chap_get_num_tracks (mp4);
- int i_tracks = mp4ff_total_tracks (mp4);
- int i, j;
- for( i = 0; i < i_entry_count; i++ )
- {
- for( j = 0; j < i_tracks; j++ )
- {
- int32_t tt = mp4ff_get_track_type (mp4, j);
- trace ("aac: i_tracks=%d found track id=%d type=%d (expected %d %d)\n", i_tracks, mp4ff_get_track_id (mp4, j), mp4ff_get_track_type (mp4, j), mp4ff_chap_get_track_id (mp4, i), TRACK_TEXT);
- if(mp4ff_chap_get_track_id (mp4, i) == mp4ff_get_track_id (mp4, j) &&
- mp4ff_get_track_type (mp4, j) == TRACK_TEXT) {
- trace ("aac: found subt track\n");
- break;
- }
- }
- if( j < i_tracks )
+ int64_t curr_sample = 0;
+ for (int sample = 0; sample < stsz->number_of_entries; sample++)
 {
- int i_sample_count = mp4ff_num_samples (mp4, j);
- int i_sample;
-
- aac_chapter_t *chapters = malloc (sizeof (aac_chapter_t) * i_sample_count);
- memset (chapters, 0, sizeof (aac_chapter_t) * i_sample_count);
- *num_chapters = 0;
-
- int64_t total_dur = 0;
- int64_t curr_sample = 0;
- for( i_sample = 0; i_sample < i_sample_count; i_sample++ )
- {
-#if 0
- const int64_t i_dts = mp4ff_get_track_dts (mp4, j, i_sample);
- const int64_t i_pts_delta = mp4ff_get_track_pts_delta(mp4, j, i_sample);
- trace ("i_dts = %lld, i_pts_delta = %lld\n", i_dts, i_pts_delta);
- const unsigned int i_size = mp4ff_get_track_sample_size(mp4, j, i_sample);
- if (i_size <= 0) {
- continue;
- }
-
- int64_t i_time_offset = i_dts + max (i_pts_delta, 0);
-#endif
- int32_t dur = (int64_t)1000 * mp4ff_get_sample_duration (mp4, j, i_sample) / mp4ff_time_scale (mp4, j); // milliseconds
- total_dur += dur;
-#if 0
- trace ("dur: %d %f min // offs: %lld %f (from currsample: %f)\n", dur, dur / 1000.f / 60.f, i_time_offset, i_time_offset / 1000000.f / 60.f, curr_sample * 1000.f/ samplerate);
-#else
- trace ("dur: %d %f min\n", dur, dur / 1000.f / 60.f);
-#endif
- unsigned char *buffer = NULL;
- int buffer_size = 0;
+ unsigned char *buffer = NULL;
 
- int rc = mp4ff_read_sample (mp4, j, i_sample, &buffer, &buffer_size);
+ uint64_t offs = mp4p_sample_offset (stbl_atom, sample);
+ uint32_t size = mp4p_sample_size (stbl_atom, sample);
 
- if (rc == 0 || !buffer) {
- continue;
- }
- int len = (buffer0 << 8) | buffer1;
- len = min (len, buffer_size - 2);
- if (len > 0) {
- chapters*num_chapters.title = strndup (&buffer2, len);
- }
- chapters*num_chapters.startsample = curr_sample;
- curr_sample += (int64_t)dur * samplerate / 1000.f;
- chapters*num_chapters.endsample = curr_sample - 1;
- trace ("aac: chapter %d: %s, s=%d e=%d\n", *num_chapters, chapters*num_chapters.title, chapters*num_chapters.startsample, chapters*num_chapters.endsample);
- if (buffer) {
- free (buffer);
- }
- (*num_chapters)++;
+ buffer = malloc (size);
+ deadbeef->fseek (info->file, offs+info->junk, SEEK_SET);
+ if (size != deadbeef->fread (buffer, 1, size, info->file)) {
+ free (buffer);
+ continue;
+ }
+ int len = (buffer0 << 8) | buffer1;
+ len = min (len, size - 2);
+ if (len > 0) {
+ chapters*num_chapters.title = strndup ((const char *)&buffer2, len);
 }
- trace ("aac: total dur: %lld (%f min)\n", total_dur, total_dur / 1000.f / 60.f);
- return chapters;
+ chapters*num_chapters.startsample = (int)curr_sample;
+ uint64_t samplecount = mp4p_stts_sample_duration(stts_atom, sample) / mdhd->time_scale * samplerate;
+ curr_sample += samplecount;
+ chapters*num_chapters.endsample = (int)curr_sample - 1;
+ free (buffer);
+ (*num_chapters)++;
 }
+ return chapters;
 }
 return NULL;
 }
 
 static DB_playItem_t *
-aac_insert_with_chapters (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, aac_chapter_t *chapters, int num_chapters, int totalsamples, int samplerate) {
+aac_insert_with_chapters (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, aac_chapter_t *chapters, int num_chapters, int64_t totalsamples, int samplerate) {
 deadbeef->pl_lock ();
 DB_playItem_t *ins = after;
 for (int i = 0; i < num_chapters; i++) {
@@ -1070,10 +849,11 @@
 else {
 deadbeef->pl_add_meta (it, "title", chaptersi.title);
 }
- it->startsample = chaptersi.startsample;
- it->endsample = chaptersi.endsample;
+ deadbeef->pl_item_set_startsample (it, chaptersi.startsample);
+ deadbeef->pl_item_set_endsample (it, chaptersi.endsample);
 deadbeef->pl_replace_meta (it, ":FILETYPE", ftype);
- deadbeef->plt_set_item_duration (plt, it, (float)(it->endsample - it->startsample + 1) / samplerate);
+ float duration = (float)(chaptersi.endsample - chaptersi.startsample + 1) / samplerate;
+ deadbeef->plt_set_item_duration (plt, it, duration);
 after = deadbeef->plt_insert_item (plt, after, it);
 deadbeef->pl_item_unref (it);
 }
@@ -1089,7 +869,6 @@
 deadbeef->pl_unlock ();
 return NULL;
 }
- trace ("aac: split by chapters success\n");
 // copy metadata from embedded tags
 uint32_t f = deadbeef->pl_get_item_flags (origin);
 f |= DDB_IS_SUBTRACK;
@@ -1101,170 +880,209 @@
 return after;
 }
 
-static DB_playItem_t *
-aac_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
- trace ("adding %s\n", fname);
- DB_FILE *fp = deadbeef->fopen (fname);
- if (!fp) {
- trace ("not found\n");
- return NULL;
- }
+
+static int
+_mp4_insert(DB_playItem_t **after, const char *fname, DB_FILE *fp, ddb_playlist_t *plt) {
+ mp4p_atom_t *mp4 = NULL;
 aac_info_t info = {0};
 info.junk = deadbeef->junk_get_leading_size (fp);
 if (info.junk >= 0) {
- trace ("junk: %d\n", info.junk);
 deadbeef->fseek (fp, info.junk, SEEK_SET);
 }
 else {
 info.junk = 0;
 }
 
+ info.file = fp;
+ info.mp4reader.ptrhandle = fp;
+ mp4_init_ddb_file_callbacks (&info.mp4reader);
+ mp4 = info.mp4file = mp4p_open(&info.mp4reader);
+
+ if (!mp4) {
+ return -1; // not mp4
+ }
 const char *ftype = NULL;
 float duration = -1;
- int totalsamples = 0;
- int samplerate = 0;
- int channels = 0;
 
- int mp4track = -1;
- MP4FILE mp4 = NULL;
+ info.trak = mp4p_atom_find (info.mp4file, "moov/trak");
+ mp4p_mp4a_t *aac = NULL;
+ while (info.trak) {
+ if (mp4p_trak_playable(info.trak)) {
+ mp4p_atom_t *aac_atom = mp4p_atom_find (info.trak, "trak/mdia/minf/stbl/stsd/mp4a");
+ if (aac_atom) {
+ aac = aac_atom->data;
+ if (aac->sample_rate != 0) {
+ info.aac_samplerate = aac->sample_rate;
+ break;
+ }
+ else {
+ aac = NULL;
+ }
+ }
+ }
+ info.trak = info.trak->next;
+ }
+ if (!aac) {
+ mp4p_atom_free_list(info.mp4file);
+ return 1; // mp4 without aac
+ }
 
- if (fp->vfs->is_streaming ()) {
- trace ("streaming aac (%s)\n", fname);
- ftype = "RAW AAC";
+ // get audio format: samplerate, bps, channels
+ mp4p_atom_t *esds_atom = mp4p_atom_find (info.trak, "trak/mdia/minf/stbl/stsd/mp4a/esds");
+ if (!esds_atom) {
+ mp4p_atom_free_list(info.mp4file);
+ return 1;
 }
- else {
+ mp4p_esds_t *esds = esds_atom->data;
+
+ info.dec = aacDecoderOpenFAAD2();
+ unsigned samplerate;
+ unsigned channels;
+ uint8_t *asc = (uint8_t *)esds->asc;
+ if (aacDecoderInit(info.dec, asc, esds->asc_size, &samplerate, &channels) < 0) {
+ mp4p_atom_free_list(info.mp4file);
+ aacDecoderClose(info.dec);
+ return 1;
+ }
+ info.info.fmt.samplerate = samplerate;
+ info.info.fmt.channels = channels;
 
- // slowwww!
- info.file = fp;
- MP4FILE_CB cb = {
- .read = aac_fs_read,
- .write = NULL,
- .seek = aac_fs_seek,
- .truncate = NULL,
- .user_data = &info
- };
- mp4ff_t *mp4 = mp4ff_open_read (&cb);
- if (mp4) {
- int ntracks = mp4ff_total_tracks (mp4);
- trace ("aac: numtracks=%d\n", ntracks);
- int i;
- for (i = 0; i < ntracks; i++) {
- if (mp4ff_get_track_type (mp4, i) != TRACK_AUDIO) {
- trace ("aac: track %d is not audio\n", i);
- continue;
- }
- int mp4framesize;
- int res = mp4_track_get_info (mp4, i, &duration, &samplerate, &channels, &totalsamples, &mp4framesize);
- if (res >= 0 && duration > 0) {
- trace ("aac: found audio track %d (duration=%f, totalsamples=%d)\n", i, duration, totalsamples);
-
- int num_chapters;
- aac_chapter_t *chapters = NULL;
- if (mp4ff_chap_get_num_tracks(mp4) > 0) {
- chapters = aac_load_itunes_chapters (mp4, &num_chapters, samplerate);
- }
+ int64_t totalsamples = 0;
 
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
- ftype = "MP4 AAC";
- deadbeef->pl_add_meta (it, ":FILETYPE", ftype);
- deadbeef->pl_set_meta_int (it, ":TRACKNUM", i);
- deadbeef->plt_set_item_duration (plt, it, duration);
- aac_load_tags (it, mp4);
- int apeerr = deadbeef->junk_apev2_read (it, fp);
- int v2err = deadbeef->junk_id3v2_read (it, fp);
- int v1err = deadbeef->junk_id3v1_read (it, fp);
-
- int64_t fsize = deadbeef->fgetlength (fp);
-
- char s100;
- snprintf (s, sizeof (s), "%lld", fsize);
- deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
- deadbeef->pl_add_meta (it, ":BPS", "16");
- snprintf (s, sizeof (s), "%d", channels);
- deadbeef->pl_add_meta (it, ":CHANNELS", s);
- snprintf (s, sizeof (s), "%d", samplerate);
- deadbeef->pl_add_meta (it, ":SAMPLERATE", s);
- int br = (int)roundf(fsize / duration * 8 / 1000);
- snprintf (s, sizeof (s), "%d", br);
- deadbeef->pl_add_meta (it, ":BITRATE", s);
-
- // embedded chapters
- deadbeef->pl_lock (); // FIXME: is it needed?
- if (chapters && num_chapters > 0) {
- DB_playItem_t *cue = aac_insert_with_chapters (plt, after, it, chapters, num_chapters, totalsamples, samplerate);
- for (int n = 0; n < num_chapters; n++) {
- if (chaptersn.title) {
- free (chaptersn.title);
- }
- }
- free (chapters);
- if (cue) {
- deadbeef->fclose (fp);
- mp4ff_close (mp4);
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
- deadbeef->pl_unlock ();
- return cue;
- }
- }
+ mp4p_atom_t *stts_atom = mp4p_atom_find(info.trak, "trak/mdia/minf/stbl/stts");
 
- // embedded cue
- const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
- DB_playItem_t *cue = NULL;
-
- if (cuesheet) {
- cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), totalsamples, samplerate);
- if (cue) {
- deadbeef->fclose (fp);
- mp4ff_close (mp4);
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
- deadbeef->pl_unlock ();
- return cue;
- }
- }
- deadbeef->pl_unlock ();
+ uint64_t total_sample_duration = mp4p_stts_total_sample_duration (stts_atom);
+ totalsamples = total_sample_duration * samplerate / info.aac_samplerate;
+ duration = total_sample_duration / (float)info.aac_samplerate;
 
- cue = deadbeef->plt_insert_cue (plt, after, it, totalsamples, samplerate);
- if (cue) {
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
- return cue;
- }
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
+ ftype = "MP4 AAC";
+ deadbeef->pl_add_meta (it, ":FILETYPE", ftype);
+ deadbeef->plt_set_item_duration (plt, it, duration);
 
- after = deadbeef->plt_insert_item (plt, after, it);
- deadbeef->pl_item_unref (it);
- break;
- }
- }
- mp4ff_close (mp4);
- if (i < ntracks) {
- deadbeef->fclose (fp);
- return after;
- }
- if (ntracks > 0) {
- // mp4 container found, but no valid aac tracks in it
- deadbeef->fclose (fp);
- return NULL;
+ deadbeef->rewind (fp);
+ (void)deadbeef->junk_apev2_read (it, fp);
+ (void)deadbeef->junk_id3v2_read (it, fp);
+ (void)deadbeef->junk_id3v1_read (it, fp);
+
+ int64_t fsize = deadbeef->fgetlength (fp);
+
+ char s100;
+ snprintf (s, sizeof (s), "%lld", (long long)fsize);
+ deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
+ deadbeef->pl_add_meta (it, ":BPS", "16");
+ snprintf (s, sizeof (s), "%d", channels);
+ deadbeef->pl_add_meta (it, ":CHANNELS", s);
+ snprintf (s, sizeof (s), "%d", info.info.fmt.samplerate);
+ deadbeef->pl_add_meta (it, ":SAMPLERATE", s);
+ int br = (int)roundf(fsize / duration * 8 / 1000);
+ snprintf (s, sizeof (s), "%d", br);
+ deadbeef->pl_add_meta (it, ":BITRATE", s);
+
+ int num_chapters = 0;
+ aac_chapter_t *chapters = NULL;
+
+ mp4p_atom_t *chap_atom = mp4p_atom_find(info.trak, "trak/tref/chap");
+ if (chap_atom) {
+ mp4p_chap_t *chap = chap_atom->data;
+ if (chap->number_of_entries > 0) {
+ chapters = aac_load_itunes_chapters (&info, chap, &num_chapters, info.info.fmt.samplerate);
+ }
+ }
+
+ // embedded chapters
+ deadbeef->pl_lock (); // FIXME: the lock can be eliminated, if subtracks are first appended "locally", and only appended to the real playlist at the end
+ if (chapters && num_chapters > 0) {
+ DB_playItem_t *cue = aac_insert_with_chapters (plt, *after, it, chapters, num_chapters, totalsamples, info.info.fmt.samplerate);
+ for (int n = 0; n < num_chapters; n++) {
+ if (chaptersn.title) {
+ free (chaptersn.title);
 }
 }
+ free (chapters);
+ chapters = NULL;
+ if (cue) {
+ mp4p_atom_free_list(info.mp4file);
+ deadbeef->pl_item_unref (it);
+ deadbeef->pl_item_unref (cue);
+ deadbeef->pl_unlock ();
+ *after = cue;
+ return 0;
+ }
+ }
+ free (chapters);
+ chapters = NULL;
+ deadbeef->pl_unlock ();
+
+ // embedded cue
+ const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
+ DB_playItem_t *cue = NULL;
+
+ if (cuesheet) {
+ cue = deadbeef->plt_insert_cue_from_buffer (plt, *after, it, (const uint8_t *)cuesheet, (int)strlen (cuesheet), (int)totalsamples, info.info.fmt.samplerate);
+ if (cue) {
+ mp4p_atom_free_list(info.mp4file);
+ deadbeef->pl_item_unref (it);
+ deadbeef->pl_item_unref (cue);
+ *after = cue;
+ return 0;
+ }
+ }
+
+ cue = deadbeef->plt_insert_cue (plt, *after, it, (int)totalsamples, info.info.fmt.samplerate);
+ if (cue) {
+ deadbeef->pl_item_unref (it);
+ deadbeef->pl_item_unref (cue);
+ *after = cue;
+ return 0;
+ }
+
+ mp4_load_tags (info.mp4file, it);
+
+ *after = deadbeef->plt_insert_item (plt, *after, it);
+ deadbeef->pl_item_unref (it);
+
+ mp4p_atom_free_list(info.mp4file);
+ return 0;
+}
+
+static DB_playItem_t *
+aac_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
+ return NULL;
+ }
+ if (!fp->vfs->is_streaming ()) {
+ int res = _mp4_insert(&after, fname, fp, plt);
+ if (res == 0) {
+ deadbeef->fclose (fp);
+ return after;
+ }
+ else if (res > 0) { // mp4 but not aac
+ deadbeef->fclose (fp);
+ return NULL;
+ }
 }
- trace ("aac: mp4 container failed, trying raw aac\n");
+
+ // If mp4 is not detected, try raw aac
+ const char *ftype = "RAW AAC";
+ int samplerate = 0;
+ int channels = 0;
+ float duration = -1;
+ int64_t totalsamples = 0;
 int res = aac_probe (fp, &duration, &samplerate, &channels, &totalsamples);
 if (res == -1) {
 deadbeef->fclose (fp);
 return NULL;
 }
- ftype = "RAW AAC";
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
 deadbeef->pl_add_meta (it, ":FILETYPE", ftype);
 deadbeef->plt_set_item_duration (plt, it, duration);
- trace ("duration: %f sec\n", duration);
 
 // read tags
- int apeerr = deadbeef->junk_apev2_read (it, fp);
- int v2err = deadbeef->junk_id3v2_read (it, fp);
- int v1err = deadbeef->junk_id3v1_read (it, fp);
+ (void)deadbeef->junk_apev2_read (it, fp);
+ (void)deadbeef->junk_id3v2_read (it, fp);
+ (void)deadbeef->junk_id3v1_read (it, fp);
 
 int64_t fsize = deadbeef->fgetlength (fp);
 
@@ -1272,7 +1090,7 @@
 
 if (duration > 0) {
 char s100;
- snprintf (s, sizeof (s), "%lld", fsize);
+ snprintf (s, sizeof (s), "%lld", (long long)fsize);
 deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
 deadbeef->pl_add_meta (it, ":BPS", "16");
 snprintf (s, sizeof (s), "%d", channels);
@@ -1288,7 +1106,7 @@
 DB_playItem_t *cue = NULL;
 
 if (cuesheet) {
- cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), totalsamples, samplerate);
+ cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, (uint8_t *)cuesheet, (int)strlen (cuesheet), (int)totalsamples, samplerate);
 if (cue) {
 deadbeef->pl_item_unref (it);
 deadbeef->pl_item_unref (cue);
@@ -1298,7 +1116,7 @@
 }
 deadbeef->pl_unlock ();
 
- cue = deadbeef->plt_insert_cue (plt, after, it, totalsamples, samplerate);
+ cue = deadbeef->plt_insert_cue (plt, after, it, (int)totalsamples, samplerate);
 if (cue) {
 deadbeef->pl_item_unref (it);
 deadbeef->pl_item_unref (cue);
@@ -1315,19 +1133,41 @@
 static const char * exts = { "aac", "mp4", "m4a", "m4b", NULL };
 
 // 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 = "aac",
- .plugin.name = "AAC player",
- .plugin.descr = "plays aac files, supports raw aac files, as well as mp4 container",
- .plugin.copyright = 
- "Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+static ddb_decoder2_t plugin = {
+ .decoder.plugin.api_vmajor = 1,
+ .decoder.plugin.api_vminor = 0,
+ .decoder.plugin.version_major = 2,
+ .decoder.plugin.version_minor = 0,
+// .decoder.plugin.flags = DDB_PLUGIN_FLAG_LOGGING|DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.id = "aac",
+ .decoder.plugin.name = "AAC player",
+ .decoder.plugin.descr = "plays aac files, supports raw aac files, as well as mp4 container",
+ .decoder.plugin.copyright =
+ "AAC DeaDBeeF Player Plugin\n"
+ "Copyright (c) 2009-2020 Oleksiy Yakovenko <waker@users.sourceforge.net>\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\n"
+ "\n"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\n"
+ "\n"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\n"
+ "\n"
+ "3. This notice may not be removed or altered from any source distribution.\n"
+ "\n"
 "\n"
- "Uses modified libmp4ff (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com\n"
+ "libfaad2 Copyright (c) Nero AG, www.nero.com\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"
@@ -1343,16 +1183,18 @@
 "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",
- .open = aac_open,
- .init = aac_init,
- .free = aac_free,
- .read = aac_read,
- .seek = aac_seek,
- .seek_sample = aac_seek_sample,
- .insert = aac_insert,
- .read_metadata = aac_read_metadata,
- .exts = exts,
+ .decoder.plugin.website = "http://deadbeef.sf.net",
+ .decoder.open = aac_open,
+ .decoder.init = aac_init,
+ .decoder.free = aac_free,
+ .decoder.read = aac_read,
+ .decoder.seek = aac_seek,
+ .decoder.seek_sample = aac_seek_sample,
+ .decoder.insert = aac_insert,
+ .decoder.read_metadata = mp4_read_metadata,
+ .decoder.write_metadata = mp4_write_metadata,
+ .decoder.exts = exts,
+ .seek_sample64 = aac_seek_sample64,
 };
 
 DB_plugin_t *

deadbeef-1.9.6.tar.bz2/plugins/aac/aac_decoder_faad2.c Added

@@ -0,0 +1,99 @@
+//
+// aac_decoder_faad2.c
+// DeaDBeeF
+//
+// Created by Oleksiy Yakovenko on 4/4/20.
+// Copyright © 2020 Oleksiy Yakovenko. All rights reserved.
+//
+
+#include <stdlib.h>
+#include <string.h>
+#include <neaacdec.h>
+
+#include "aac_decoder_faad2.h"
+
+typedef struct aacDecoder_s {
+ aacDecoderHandle_t base;
+ NeAACDecHandle dec;
+} faad2Decoder_t;
+
+static void
+aacDecoderClose_FAAD2 (aacDecoderHandle_t *_dec) {
+ faad2Decoder_t *dec = (faad2Decoder_t *)_dec;
+ NeAACDecClose (dec->dec);
+ free (_dec);
+}
+
+static int
+aacDecoderInit_FAAD2 (aacDecoderHandle_t *_dec, uint8_t *buff, size_t buffSize, unsigned *samplerate, unsigned *channels) {
+ faad2Decoder_t *dec = (faad2Decoder_t *)_dec;
+ unsigned long sr;
+ unsigned char ch;
+ long res = NeAACDecInit2(dec->dec, buff, (unsigned long)buffSize, &sr, &ch);
+ if (res < 0) {
+ return -1;
+ }
+ *samplerate = (unsigned)sr;
+ *channels = (unsigned)ch;
+ return 0;
+}
+
+static int
+aacDecoderInitRaw_FAAD2 (aacDecoderHandle_t *_dec, uint8_t *buff, size_t buffSize, unsigned *samplerate, unsigned *channels) {
+ faad2Decoder_t *dec = (faad2Decoder_t *)_dec;
+ unsigned long sr;
+ unsigned char ch;
+ long res = NeAACDecInit(dec->dec, buff, (unsigned long)buffSize, &sr, &ch);
+ if (res < 0) {
+ return -1;
+ }
+ *samplerate = (unsigned)sr;
+ *channels = (unsigned)ch;
+ return 0;
+}
+
+//static const uint8_t *
+//aacDecoderGetASC_FAAD2 (aacDecoderHandle_t *_dec) {
+// faad2Decoder_t *dec = (faad2Decoder_t *)_dec;
+// NeAACDecConfigurationPtr conf = NeAACDecGetCurrentConfiguration (dec->dec);
+// return (uint8_t *)conf;
+//}
+//
+//static int
+//aacDecoderSetASC_FAAD2 (aacDecoderHandle_t *_dec, const uint8_t *asc) {
+// faad2Decoder_t *dec = (faad2Decoder_t *)_dec;
+// long res = NeAACDecSetConfiguration (dec->dec, (NeAACDecConfigurationPtr)asc);
+// if (res < 0) {
+// return -1;
+// }
+// return 0;
+//}
+
+static uint8_t *
+ascDecoderDecodeFrame_FAAD2 (aacDecoderHandle_t *_dec, aacDecoderFrameInfo_t *frameInfo, const uint8_t *buffer, size_t bufferSize) {
+ faad2Decoder_t *dec = (faad2Decoder_t *)_dec;
+ NeAACDecFrameInfo fi = {0};
+ void *samples = NeAACDecDecode(dec->dec, &fi, (unsigned char *)buffer, (unsigned long)bufferSize);
+
+ frameInfo->bytesconsumed = fi.bytesconsumed;
+ frameInfo->samples = fi.samples;
+ frameInfo->channels = fi.channels;
+ memcpy (frameInfo->channel_position, fi.channel_position, sizeof (fi.channel_position));
+
+ return (uint8_t *)samples;
+}
+
+static aacDecoderCallbacks_t aacDecoderCallbacks_FAAD2 = {
+ .close = aacDecoderClose_FAAD2,
+ .init = aacDecoderInit_FAAD2,
+ .initRaw = aacDecoderInitRaw_FAAD2,
+ .decodeFrame = ascDecoderDecodeFrame_FAAD2,
+};
+
+aacDecoderHandle_t *
+aacDecoderOpenFAAD2 (void) {
+ faad2Decoder_t *dec = calloc (1, sizeof (faad2Decoder_t));
+ dec->base.callbacks = &aacDecoderCallbacks_FAAD2;
+ dec->dec = NeAACDecOpen();
+ return &dec->base;
+}

deadbeef-1.9.6.tar.bz2/plugins/aac/aac_decoder_faad2.h Added

deadbeef-1.9.6.tar.bz2/plugins/aac/aac_decoder_protocol.h Added

@@ -0,0 +1,51 @@
+//
+// aac_decoder_protocol.h
+// deadbeef
+//
+// Created by Oleksiy Yakovenko on 4/4/20.
+// Copyright © 2020 Oleksiy Yakovenko. All rights reserved.
+//
+
+#ifndef aac_decoder_protocol_h
+#define aac_decoder_protocol_h
+
+#include <stdint.h>
+#include <stddef.h>
+
+typedef struct {
+ unsigned long bytesconsumed;
+ unsigned long samples;
+ unsigned char channels;
+ unsigned char channel_position64;
+} aacDecoderFrameInfo_t;
+
+struct aacDecoderHandle_s;
+
+typedef struct {
+ void (*close) (struct aacDecoderHandle_s *dec);
+
+ int (*init) (struct aacDecoderHandle_s * dec, uint8_t *buff, size_t buffSize, unsigned *samplerate, unsigned *channels);
+
+ int (*initRaw) (struct aacDecoderHandle_s * dec, uint8_t *buff, size_t buffSize, unsigned *samplerate, unsigned *channels);
+
+ uint8_t * (*decodeFrame) (struct aacDecoderHandle_s *dec, aacDecoderFrameInfo_t *frameInfo, const uint8_t *buffer, size_t bufferSize);
+} aacDecoderCallbacks_t;
+
+typedef struct aacDecoderHandle_s {
+ aacDecoderCallbacks_t *callbacks;
+} aacDecoderHandle_t;
+
+void
+aacDecoderClose (aacDecoderHandle_t *dec);
+
+int
+aacDecoderInit (aacDecoderHandle_t *dec, uint8_t *buff, size_t buffSize, unsigned *samplerate, unsigned *channels);
+
+int
+aacDecoderInitRaw (aacDecoderHandle_t *dec, uint8_t *buff, size_t buffSize, unsigned *samplerate, unsigned *channels);
+
+uint8_t *
+aacDecoderDecodeFrame (aacDecoderHandle_t *dec, aacDecoderFrameInfo_t *frameInfo, const uint8_t *buffer, size_t bufferSize);
+
+
+#endif /* aac_decoder_protocol_h */

deadbeef-1.9.6.tar.bz2/plugins/aac/aac_decoder_wrap.c Added

deadbeef-0.6.2.tar.bz2/plugins/aac/aac_parser.c -> deadbeef-1.9.6.tar.bz2/plugins/aac/aac_parser.c Changed

@@ -1,20 +1,24 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2016 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
 #include <stdio.h>
 #include "aac_parser.h"
@@ -45,24 +49,24 @@
 return 0;
 }
 
- int id = (buf1 & 0x08) >> 7;
+// int id = (buf1 & 0x08) >> 7;
 
- int version = id == 0 ? 4 : 2;
+// int version = id == 0 ? 4 : 2;
 
- int layer = (buf1 & 0x06) >> 5;
- int protection_abs = (buf1 & 0x01);
+// int layer = (buf1 & 0x06) >> 5;
+// int protection_abs = (buf1 & 0x01);
 
- int header_size = protection_abs > 0 ? 7 : 9;
+// int header_size = protection_abs > 0 ? 7 : 9;
 
- int profile_objecttype = (buf2 & 0xC0) >> 6;
+// int profile_objecttype = (buf2 & 0xC0) >> 6;
 
- const char *profiles4 = {
- "0 Main profile AAC MAIN",
- "1 Low Complexity profile (LC)AAC LC",
- "2 Scalable Sample Rate profile (SSR)AAC SSR",
- "3 (reserved)AAC LTP"
- };
- trace ("profile: %s\n", profilesprofile_objecttype);
+// const char *profiles4 = {
+// "0 Main profile AAC MAIN",
+// "1 Low Complexity profile (LC)AAC LC",
+// "2 Scalable Sample Rate profile (SSR)AAC SSR",
+// "3 (reserved)AAC LTP"
+// };
+// trace ("profile: %s\n", profilesprofile_objecttype);
 
 int sample_freq_index = (buf2 & 0x3C) >> 2;
 if (!aac_sample_ratessample_freq_index) {
@@ -70,7 +74,7 @@
 return 0;
 }
 trace ("samplerate %d (#%d)\n", aac_sample_ratessample_freq_index, sample_freq_index);
- int private_bit = (buf2 & 0x02) >> 1;
+// int private_bit = (buf2 & 0x02) >> 1;
 
 int channel_conf = ((buf2 & 0x01) << 2) | ((buf3 & 0xC0) >> 6);
 if (!aac_channelschannel_conf) {
@@ -78,20 +82,17 @@
 return 0;
 }
 trace ("channels %d (#%d)\n", aac_channelschannel_conf, channel_conf);
- int orig_copy = (buf3 & 0x20) >> 5;
- int home = (buf3 & 0x10) >> 4;
- int copyright_ident_bit = (buf3 & 0x08) >> 3;
- int copyright_ident_start = (buf3 & 0x04) >> 2;
+// int orig_copy = (buf3 & 0x20) >> 5;
+// int home = (buf3 & 0x10) >> 4;
+// int copyright_ident_bit = (buf3 & 0x08) >> 3;
+// int copyright_ident_start = (buf3 & 0x04) >> 2;
 size = ((buf3 & 0x03) << 11) | (buf4 << 3) | ((buf5 & 0xE0) >> 5);
 if(size < ADTS_HEADER_SIZE) {
 //trace ("invalid size\n");
 return 0;
 }
- int adts_buffer_fullness = ((buf5 & 0x1F) << 3) | ((buf6 & 0xFC) >> 2);
- rdb = buf6 & 0x03;
- if (!rdb) {
- rdb = buf7 & 0x03;
- }
+// int adts_buffer_fullness = ((buf5 & 0x1F) << 3) | ((buf6 & 0xFC) >> 2);
+ rdb = (buf6 & 0x03) + 1;
 trace ("rdb: %d\n", rdb);
 
 *channels = aac_channelschannel_conf;

deadbeef-0.6.2.tar.bz2/plugins/aac/aac_parser.h -> deadbeef-1.9.6.tar.bz2/plugins/aac/aac_parser.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/adplug/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/adplug/Makefile.am Changed

@@ -1,13 +1,11 @@
 if HAVE_ADPLUG
 adplugpath=@top_srcdir@/plugins/adplug
 
-adlibdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = adplug.la
 
-AM_CFLAGS = $(CFLAGS) -std=c99 -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fPIC
+adplug_la_CFLAGS = $(CFLAGS) -std=c99 -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -I@top_srcdir@/include -fPIC
 adplug_la_LDFLAGS = -module -avoid-version $(NOCPPLIB) -lm
-
-AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fno-exceptions -fno-rtti -fno-unwind-tables
+adplug_la_CXXFLAGS = $(CXXFLAGS) -std=c++11 -Dstricmp=strcasecmp -DVERSION=\"2.3.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -I@top_srcdir@/include
 
 adplug_la_SOURCES = plugin.c\
                    adplug-db.cpp\
@@ -19,120 +17,145 @@
 				   libbinio/binio.cpp\
 				   libbinio/binstr.cpp\
 				   libbinio/binwrap.cpp\
-				   adplug/a2m.cpp\
-				   adplug/a2m.h\
-				   adplug/adl.cpp\
-				   adplug/adl.h\
-				   adplug/adlibemu.c\
-				   adplug/adlibemu.h\
-				   adplug/adplug.cpp\
-				   adplug/adplug.h\
-				   adplug/adtrack.cpp\
-				   adplug/adtrack.h\
-				   adplug/amd.cpp\
-				   adplug/amd.h\
-				   adplug/analopl.cpp\
-				   adplug/analopl.h\
-				   adplug/bam.cpp\
-				   adplug/bam.h\
-				   adplug/bmf.cpp\
-				   adplug/bmf.h\
-				   adplug/cff.cpp\
-				   adplug/cff.h\
-				   adplug/d00.cpp\
-				   adplug/d00.h\
-				   adplug/debug.c\
-				   adplug/debug.h\
-				   adplug/dfm.cpp\
-				   adplug/dfm.h\
-				   adplug/diskopl.cpp\
-				   adplug/diskopl.h\
-				   adplug/dmo.cpp\
-				   adplug/dmo.h\
-				   adplug/dro2.cpp\
-				   adplug/dro2.h\
-				   adplug/dro.cpp\
-				   adplug/dro.h\
-				   adplug/dtm.cpp\
-				   adplug/dtm.h\
-				   adplug/emuopl.cpp\
-				   adplug/emuopl.h\
-				   adplug/flash.cpp\
-				   adplug/flash.h\
-				   adplug/fmc.cpp\
-				   adplug/fmc.h\
-				   adplug/fmopl.c\
-				   adplug/fmopl.h\
-				   adplug/fprovide.cpp\
-				   adplug/fprovide.h\
-				   adplug/hsc.cpp\
-				   adplug/hsc.h\
-				   adplug/hsp.cpp\
-				   adplug/hsp.h\
-				   adplug/hybrid.cpp\
-				   adplug/hybrid.h\
-				   adplug/hyp.cpp\
-				   adplug/hyp.h\
-				   adplug/imf.cpp\
-				   adplug/imf.h\
-				   adplug/jbm.cpp\
-				   adplug/jbm.h\
-				   adplug/kemuopl.h\
-				   adplug/ksm.cpp\
-				   adplug/ksm.h\
-				   adplug/lds.cpp\
-				   adplug/lds.h\
-				   adplug/mad.cpp\
-				   adplug/mad.h\
-				   adplug/mid.cpp\
-				   adplug/mid.h\
-				   adplug/mididata.h\
-				   adplug/mkj.cpp\
-				   adplug/mkj.h\
-				   adplug/msc.cpp\
-				   adplug/msc.h\
-				   adplug/mtk.cpp\
-				   adplug/mtk.h\
-				   adplug/opl.h\
-				   adplug/player.cpp\
-				   adplug/player.h\
-				   adplug/players.cpp\
-				   adplug/players.h\
-				   adplug/protrack.cpp\
-				   adplug/protrack.h\
-				   adplug/psi.cpp\
-				   adplug/psi.h\
-				   adplug/rad.cpp\
-				   adplug/rad.h\
-				   adplug/rat.cpp\
-				   adplug/rat.h\
-				   adplug/raw.cpp\
-				   adplug/raw.h\
-				   adplug/realopl.cpp\
-				   adplug/realopl.h\
-				   adplug/rix.cpp\
-				   adplug/rix.h\
-				   adplug/rol.cpp\
-				   adplug/rol.h\
-				   adplug/s3m.cpp\
-				   adplug/s3m.h\
-				   adplug/sa2.cpp\
-				   adplug/sa2.h\
-				   adplug/silentopl.h\
-				   adplug/sng.cpp\
-				   adplug/sng.h\
-				   adplug/surroundopl.cpp\
-				   adplug/surroundopl.h\
-				   adplug/temuopl.cpp\
-				   adplug/temuopl.h\
-				   adplug/u6m.cpp\
-				   adplug/u6m.h\
-				   adplug/xad.cpp\
-				   adplug/xad.h\
-				   adplug/xsm.cpp\
-				   adplug/xsm.h
-
-#				   adplug/database.cpp
-#				   adplug/database.h
+                   adplug/a2m.cpp\
+                   adplug/a2m.h\
+                   adplug/adl.cpp\
+                   adplug/adl.h\
+                   adplug/adlib.cpp\
+                   adplug/adlib.h\
+                   adplug/adlibemu.h\
+                   adplug/adplug.cpp\
+                   adplug/adplug.h\
+                   adplug/adtrack.cpp\
+                   adplug/adtrack.h\
+                   adplug/amd.cpp\
+                   adplug/amd.h\
+                   adplug/analopl.cpp\
+                   adplug/analopl.h\
+                   adplug/bam.cpp\
+                   adplug/bam.h\
+                   adplug/bmf.cpp\
+                   adplug/bmf.h\
+                   adplug/cff.cpp\
+                   adplug/cff.h\
+                   adplug/cmf.cpp\
+                   adplug/cmf.h\
+                   adplug/cmfmcsop.cpp\
+                   adplug/cmfmcsop.h\
+                   adplug/d00.cpp\
+                   adplug/d00.h\
+                   adplug/database.cpp\
+                   adplug/database.h\
+                   adplug/debug.h\
+                   adplug/dfm.cpp\
+                   adplug/dfm.h\
+                   adplug/diskopl.cpp\
+                   adplug/diskopl.h\
+                   adplug/dmo.cpp\
+                   adplug/dmo.h\
+                   adplug/dro.cpp\
+                   adplug/dro.h\
+                   adplug/dro2.cpp\
+                   adplug/dro2.h\
+                   adplug/dtm.cpp\
+                   adplug/dtm.h\
+                   adplug/emuopl.cpp\
+                   adplug/emuopl.h\
+                   adplug/flash.cpp\
+                   adplug/flash.h\
+                   adplug/fmc.cpp\
+                   adplug/fmc.h\
+                   adplug/fmopl.h\
+                   adplug/fprovide.cpp\
+                   adplug/fprovide.h\
+                   adplug/got.cpp\
+                   adplug/got.h\
+                   adplug/herad.cpp\
+                   adplug/herad.h\
+                   adplug/hsc.cpp\
+                   adplug/hsc.h\
+                   adplug/hsp.cpp\
+                   adplug/hsp.h\
+                   adplug/hybrid.cpp\
+                   adplug/hybrid.h\
+                   adplug/hyp.cpp\
+                   adplug/hyp.h\
+                   adplug/imf.cpp\
+                   adplug/imf.h\
+                   adplug/jbm.cpp\
+                   adplug/jbm.h\
+                   adplug/kemuopl.h\
+                   adplug/ksm.cpp\
+                   adplug/ksm.h\
+                   adplug/lds.cpp\
+                   adplug/lds.h\
+                   adplug/mad.cpp\
+                   adplug/mad.h\
+                   adplug/mdi.cpp\
+                   adplug/mdi.h\
+                   adplug/mid.cpp\
+                   adplug/mid.h\
+                   adplug/mididata.h\
+                   adplug/mkj.cpp\
+                   adplug/mkj.h\
+                   adplug/msc.cpp\
+                   adplug/msc.h\
+                   adplug/mtk.cpp\
+                   adplug/mtk.h\
+                   adplug/mus.cpp\
+                   adplug/mus.h\
+                   adplug/nemuopl.cpp\
+                   adplug/nemuopl.h\
+                   adplug/nukedopl.h\
+                   adplug/opl.h\
+                   adplug/player.cpp\
+                   adplug/player.h\
+                   adplug/players.cpp\
+                   adplug/players.h\
+                   adplug/protrack.cpp\
+                   adplug/protrack.h\
+                   adplug/psi.cpp\
+                   adplug/psi.h\
+                   adplug/rad.cpp\
+                   adplug/rad.h\
+                   adplug/rat.cpp\
+                   adplug/rat.h\
+                   adplug/raw.cpp\
+                   adplug/raw.h\
+                   adplug/realopl.cpp\
+                   adplug/realopl.h\
+                   adplug/rix.cpp\
+                   adplug/rix.h\
+                   adplug/rol.cpp\
+                   adplug/rol.h\
+                   adplug/s3m.cpp\
+                   adplug/s3m.h\
+                   adplug/sa2.cpp\
+                   adplug/sa2.h\
+                   adplug/silentopl.h\
+                   adplug/sng.cpp\
+                   adplug/sng.h\
+                   adplug/sop.cpp\
+                   adplug/sop.h\
+                   adplug/surroundopl.cpp\
+                   adplug/surroundopl.h\
+                   adplug/temuopl.cpp\
+                   adplug/temuopl.h\
+                   adplug/u6m.cpp\
+                   adplug/u6m.h\
+                   adplug/version.h\
+                   adplug/vgm.cpp\
+                   adplug/vgm.h\
+                   adplug/wemuopl.h\
+                   adplug/woodyopl.cpp\
+                   adplug/woodyopl.h\
+                   adplug/xad.cpp\
+                   adplug/xad.h\
+                   adplug/xsm.cpp\
+                   adplug/xsm.h\
+                   adplug/adlibemu.c\
+                   adplug/debug.c\
+                   adplug/fmopl.c\
+                   adplug/nukedopl.c
 
 endif

deadbeef-0.6.2.tar.bz2/plugins/adplug/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/adplug/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug-db.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug-db.cpp Changed

@@ -1,6 +1,6 @@
 /*
 DeaDBeeF ADPLUG plugin
- Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2014 Oleksiy Yakovenko <waker@users.sourceforge.net>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -24,7 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 #include "adplug.h"
 #include "emuopl.h"
 #include "kemuopl.h"
@@ -87,18 +88,19 @@
 }
 }
 else {
- if (deadbeef->conf_get_int ("adplug.use_satoh", 0)) {
- info->opl = new CEmuopl (samplerate, bps == 16, channels == 2);
+ if (deadbeef->conf_get_int ("adplug.use_ken", 0)) {
+ info->opl = new CKemuopl (samplerate, bps == 16, channels == 2);
 }
 else {
- info->opl = new CKemuopl (samplerate, bps == 16, channels == 2);
+ info->opl = new CEmuopl (samplerate, bps == 16, channels == 2);
 }
 }
 deadbeef->pl_lock ();
- info->decoder = CAdPlug::factory (deadbeef->pl_find_meta (it, ":URI"), info->opl, CAdPlug::players);
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ info->decoder = CAdPlug::factory (uri, info->opl, CAdPlug::players);
 if (!info->decoder) {
- trace ("adplug: failed to open %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ trace ("adplug: failed to open %s\n", uri);
 return -1;
 }

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/a2m.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/a2m.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/a2m.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/a2m.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/adl.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/adl.cpp Changed

@@ -44,14 +44,15 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * $URL: https://svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/engines/kyra/sound_adlib.cpp $
- * $Id: adl.cpp,v 1.11 2008/02/11 20:18:27 dynamite Exp $
+ * $Id$
 *
 */
 
+#include <cstring>
 #include <inttypes.h>
 #include <stdarg.h>
 #include <assert.h>
-#include <string.h>
+#include <stdio.h>
 
 #include "adl.h"
 #include "debug.h"
@@ -274,19 +275,27 @@
 // The sound data has at least two lookup tables:
 //
 // * One for programs, starting at offset 0.
- // * One for instruments, starting at offset 500.
+ // * One for instruments, starting at offset depending on version.
 
 uint8 *getProgram(int progId) {
- int offset = READ_LE_UINT16(_soundData + 2 * progId);
- return _soundData + offset;
+ return _soundData + READ_LE_UINT16(_soundData + 2 * progId);
 }
 
 uint8 *getInstrument(int instrumentId) {
- int offset = READ_LE_UINT16(_soundData + 500 + 2 * instrumentId);
- if (offset == 0xffff) {
- return NULL;
- }
- return _soundData + offset;
+ uint16 instOffset = 0;
+ switch (ADLVer)
+ {
+ case 1:
+ instOffset = 150 * 2;
+ break;
+ case 2:
+ instOffset = 250 * 2;
+ break;
+ case 3:
+ instOffset = 500 * 2;
+ break;
+ }
+ return _soundData + READ_LE_UINT16(_soundData + instOffset + 2 * instrumentId);
 }
 
 void setupPrograms();
@@ -388,6 +397,8 @@
 // _unkTable2_2 - One of the tables in _unkTable2
 // _unkTable2_3 - One of the tables in _unkTable2
 
+ uint8 ADLVer;
+
 int32 _samplesPerCallback;
 int32 _samplesPerCallbackRemainder;
 int32 _samplesTillCallback;
@@ -425,9 +436,10 @@
 int _flags;
 
 uint8 *_soundData;
+ size_t soundDataSize;
 
 uint8 _soundIdTable0x10;
- Channel _channels0xff; // FIXME: this array must be of size 10, but some files attempt to index >200, so this is a temporary fix to avoid invalid writes
+ Channel _channels10;
 
 uint8 _vibratoAndAMDepthBits;
 uint8 _rhythmSectionBits;
@@ -457,6 +469,7 @@
 
 // 	_mixer = mixer;
 
+ ADLVer = 0;
 _flags = 0;
 // 	_adlib = makeAdlibOPL(getRate());
 // 	assert(_adlib);
@@ -553,6 +566,9 @@
 _flagTrigger = 1;
 
 uint8 *ptr = getProgram(songId);
+ if (ptr >= _soundData + soundDataSize) {
+ return 0;
+ }
 uint8 chan = *ptr;
 
 if ((songId << 1) != 0) {
@@ -604,6 +620,9 @@
 int a = va_arg(list, int);
 int b = va_arg(list, int);
 uint8 *ptr = getProgram(a) + b;
+ if (ptr >= _soundData + soundDataSize) {
+ return 0;
+ }
 return *ptr;
 }
 
@@ -612,6 +631,9 @@
 int b = va_arg(list, int);
 int c = va_arg(list, int);
 uint8 *ptr = getProgram(a) + b;
+ if (ptr >= _soundData + soundDataSize) {
+ return 0;
+ }
 uint8 oldValue = *ptr;
 *ptr = (uint8)c;
 return oldValue;
@@ -676,8 +698,20 @@
 void AdlibDriver::setupPrograms() {
 while (_lastProcessed != _soundsPlaying) {
 uint8 *ptr = getProgram(_soundIdTable_lastProcessed);
+ if (ptr >= _soundData + soundDataSize) {
+ return;
+ }
 uint8 chan = *ptr++;
+ if (ptr >= _soundData + soundDataSize) {
+ return;
+ }
+ if (chan >= 10) {
+ return;
+ }
 uint8 priority = *ptr++;
+ if (ptr >= _soundData + soundDataSize) {
+ return;
+ }
 
 // Only start this sound if its priority is higher than the one
 // already playing.
@@ -746,7 +780,9 @@
 }
 	
 Channel &channel = _channels_curChannel;
- _curRegOffset = _regOffset_curChannel;
+ if (_curChannel != 9) {
+ _curRegOffset = _regOffset_curChannel;
+ }
 
 if (channel.tempoReset) {
 channel.tempo = _tempo;
@@ -778,19 +814,8 @@
 	 opcode &= 0x7F;
 	 if (opcode >= _parserOpcodeTableSize)
 	 opcode = _parserOpcodeTableSize - 1;
- debugC(9, kDebugLevelSound, "Calling opcode '%s' (%d) (channel: %d)\n", _parserOpcodeTableopcode.name, opcode, _curChannel);
-	 if (opcode == 2) {
- int offset = READ_LE_UINT16(_soundData + 2 * param);
- if (offset == 0xffff) {
- break; // corrupted file / bad parser
- }
- else {
- result = (this->*(_parserOpcodeTableopcode.function))(dataptr, channel, param);
- }
- }
- else {
- result = (this->*(_parserOpcodeTableopcode.function))(dataptr, channel, param);
- }
+	 debugC(9, kDebugLevelSound, "Calling opcode '%s' (%d) (channel: %d)", _parserOpcodeTableopcode.name, opcode, _curChannel);
+	 result = (this->*(_parserOpcodeTableopcode.function))(dataptr, channel, param);
 	 channel.dataptr = dataptr;
 	 if (result)
 	 break;
@@ -1012,9 +1037,6 @@
 }
 
 void AdlibDriver::setupInstrument(uint8 regOffset, uint8 *dataptr, Channel &channel) {
- if (!dataptr) {
- return;
- }
 debugC(9, kDebugLevelSound, "setupInstrument(%d, %p, %lu)", regOffset, (const void *)dataptr, (long)(&channel - _channels));
 // Amplitude Modulation / Vibrato / Envelope Generator Type /
 // Keyboard Scaling Rate / Modulator Frequency Multiple
@@ -1297,6 +1319,9 @@
 return 0;
 
 uint8 *ptr = getProgram(value);
+ if (ptr >= _soundData + soundDataSize) {
+ return 0;
+ }
 uint8 chan = *ptr++;
 uint8 priority = *ptr++;
 
@@ -1410,7 +1435,11 @@
 }
 
 int AdlibDriver::update_setupInstrument(uint8 *&dataptr, Channel &channel, uint8 value) {
- setupInstrument(_curRegOffset, getInstrument(value), channel);
+ uint8 *instrument = getInstrument(value);
+ if (instrument >= _soundData + soundDataSize) {
+ return 0;
+ }
+ setupInstrument(_curRegOffset, instrument, channel);
 return 0;
 }
 
@@ -2225,9 +2254,11 @@
 const int CadlPlayer::_kyra1NumSoundTriggers = ARRAYSIZE(CadlPlayer::_kyra1SoundTriggers);
 
 CadlPlayer::CadlPlayer(Copl *newopl)
- : CPlayer(newopl), numsubsongs(0), _trackEntries(), _soundDataPtr(0)
+ : CPlayer(newopl), numsubsongs(0), _trackEntries(), _trackEntries16(), _soundDataPtr(0)
 {
+ _version = 0;
 memset(_trackEntries, 0, sizeof(_trackEntries));
+ memset(_trackEntries16, 0, sizeof(_trackEntries16));
 _driver = new AdlibDriver(newopl);
 assert(_driver);
 
@@ -2277,7 +2308,7 @@
 // 	loadSoundFile(file);
 // }
 
-void CadlPlayer::playTrack(uint8 track) {
+void CadlPlayer::playTrack(uint16_t track) {
 play(track);
 }
 
@@ -2287,19 +2318,27 @@
 // 	//_engine->_system->delayMillis(3 * 60);
 // }
 
-void CadlPlayer::playSoundEffect(uint8_t track) {
+void CadlPlayer::playSoundEffect(uint16_t track) {
 play(track);
 }
 
-void CadlPlayer::play(uint8_t track) {
- uint8 soundId = _trackEntriestrack;
- if (soundId == 0xff || !_soundDataPtr)
- return;
- soundId &= 0xFF;
- int offset = READ_LE_UINT16(_driver->_soundData + 2 * soundId);
- if (offset == 0xffff) {
+void CadlPlayer::play(uint16_t track) {
+ uint16 soundId = 0;
+ if (_version < 3)
+ {
+ soundId = _trackEntriestrack;
+ if ((int8)soundId == -1 || !_soundDataPtr)
 return;
+ soundId &= 0xFF;
 }
+ else
+ {
+ soundId = _trackEntries16track;
+ if ((int16)soundId == -1 || !_soundDataPtr)
+ return;
+ soundId &= 0xFFFF;
+ }
+ _driver->ADLVer = _version;
 _driver->callback(16, 0);
 // 	while ((_driver->callback(16, 0) & 8)) {
 // We call the system delay and not the game delay to avoid concurrency issues.
@@ -2344,7 +2383,7 @@
 // 	playSoundEffect(1);
 // }
 
-bool CadlPlayer::load(const char *filename, const CFileProvider &fp)
+bool CadlPlayer::load(const std::string &filename, const CFileProvider &fp)
 {
 binistream	*f = fp.open(filename);
 
@@ -2353,6 +2392,11 @@
 fp.close(f);
 return false;
 }
+ if (fp.filesize(f) < 720)
+ { // minimum file size of v1
+ fp.close(f);
+ return false;
+ }
 
 // 	if (_soundFileLoaded == file)
 // 		return;
@@ -2375,6 +2419,47 @@
 unk2();
 unk1();
 
+ // detect format version
+ _version = 3; // assuming we have v3
+ for (int i = 0; i < 120; i += 2)
+ {
+ uint16_t w = f->readInt(2);
+ // all entries should be in range 0..500-1 or 0xFFFF
+ if (w >= 500 && w < 0xffff)
+ {
+ _version = 1; // actually 1 or 2
+ break;
+ }
+ }
+ if (_version == 1)
+ { // detect whether v1 or v2
+ f->seek(120);
+ _version = 2; // assuming we have v2
+ for (int i = 0; i < 150; i += 2)
+ {
+ uint16_t w = f->readInt(2);
+ if (w > 0 && w < 600)
+ { // minimum track offset for v1 is 600
+ fp.close(f);
+ return false;
+ }
+ // minimum track offset for v2 is 1000
+ if (w > 0 && w < 1000)
+ _version = 1;
+ }
+ }
+ if (_version == 2 && fp.filesize(f) < 1120)
+ { // minimum file size of v2
+ fp.close(f);
+ return false;
+ }
+ if (_version == 3 && fp.filesize(f) < 2500)
+ { // minimum file size of v3
+ fp.close(f);
+ return false;
+ }
+
+ f->seek(0);
 file_size = fp.filesize(f);
 file_data = new uint8 file_size;
 f->readString((char *)file_data, file_size);
@@ -2383,10 +2468,20 @@
 _soundDataPtr = 0;
 
 uint8 *p = file_data;
- memcpy(_trackEntries, p, 120*sizeof(uint8));
- p += 120;
+ uint16 _EntriesSize;
+ if (_version < 3)
+ {
+ _EntriesSize = 120 * sizeof(uint8);
+ memcpy(_trackEntries, p, _EntriesSize);
+ }
+ else
+ {
+ _EntriesSize = 250 * sizeof(uint16);
+ memcpy(_trackEntries16, p, _EntriesSize);
+ }
+ p += _EntriesSize;
 
- int soundDataSize = file_size - 120;
+ int soundDataSize = file_size - _EntriesSize;
 
 _soundDataPtr = new uint8soundDataSize;
 assert(_soundDataPtr);
@@ -2397,21 +2492,44 @@
 file_data = p = 0;
 file_size = 0;
 
+ _driver->soundDataSize = soundDataSize;
 _driver->callback(4, _soundDataPtr);
 
 // 	_soundFileLoaded = file;
 
 // find last subsong
- for(int i = 119; i >= 0; i--) {
- if(_trackEntriesi != 0xff) {
- numsubsongs = i + 1;
- break;
+ uint16_t maxEntry = 0xffff;
+ switch (_version)
+ {
+ case 1:
+ maxEntry = 150 - 1;
+ break;
+ case 2:
+ maxEntry = 250 - 1;
+ break;
+ case 3:
+ maxEntry = 500 - 1;
+ break;
+ }
+ if (_version < 3)
+ {
+ for (int i = 120-1; i >= 0; i--)
+ if (_trackEntriesi <= maxEntry) {
+ numsubsongs = i + 1;
+ break;
+ }
+ }
+ else
+ {
+ for (int i = 250-1; i >= 0; i--)
+ if (_trackEntries16i <= maxEntry) {
+ numsubsongs = i + 1;
+ break;
 }
 }
 
 fp.close(f);
- cursubsong = 2;
- rewind();
+ cursubsong = -1;
 return true;
 }
 
@@ -2432,15 +2550,9 @@
 
 bool CadlPlayer::update()
 {
- uint8 soundId = _trackEntriescursubsong;
- if (soundId == 0xff || !_soundDataPtr) {
- return false;
- }
- soundId &= 0xFF;
- int offset = READ_LE_UINT16(_driver->_soundData + 2 * soundId);
- if (offset == 0xffff) {
- return false;
- }
+ if (cursubsong == -1)
+ rewind(2);
+
 bool songend = true;
 
 // if(_trackEntriescursubsong == 0xff)
@@ -2464,6 +2576,14 @@
 playSoundEffect(0);
 }
 
+std::string CadlPlayer::gettype()
+{
+ char tmpstr25;
+
+ sprintf(tmpstr, "Westwood ADL (version %d)", _version);
+ return std::string(tmpstr);
+}
+
 CPlayer *CadlPlayer::factory(Copl *newopl)
 {
 return new CadlPlayer(newopl);

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/adl.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/adl.h Changed

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/adlib.cpp Added

@@ -0,0 +1,708 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2008 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * adlib.cpp - AdLib Sound Driver by Stas'M <binarymaster@mail.ru> and Jepael
+ *
+ * Based on ADLIB.C by Marc Savary and Dale Glowinski, Ad Lib Inc.
+ */
+
+#include "adlib.h"
+
+const uint8_t CadlibDriver::percMasks5 =
+	{0x10, 0x08, 0x04, 0x02, 0x01};
+
+/* definition of the ELECTRIC-PIANO voice (opr0 & opr1) */
+uint8_t CadlibDriver::pianoParamsOp0nbLocParam =
+	{ 1, 1, 3, 15, 5, 0, 1, 3, 15, 0, 0, 0, 1, 0 };
+uint8_t CadlibDriver::pianoParamsOp1nbLocParam =
+	{ 0, 1, 1, 15, 7, 0, 2, 4, 0, 0, 0, 1, 0, 0 };
+
+/* definition of default percussive voices: */
+uint8_t CadlibDriver::bdOpr0nbLocParam =
+	{ 0, 0, 0, 10, 4, 0, 8, 12, 11, 0, 0, 0, 1, 0 };
+uint8_t CadlibDriver::bdOpr1nbLocParam =
+	{ 0, 0, 0, 13, 4, 0, 6, 15, 0, 0, 0, 0, 1, 0 };
+uint8_t CadlibDriver::sdOprnbLocParam =
+	{ 0, 12, 0, 15, 11, 0, 8, 5, 0, 0, 0, 0, 0, 0 };
+uint8_t CadlibDriver::tomOprnbLocParam =
+	{ 0, 4, 0, 15, 11, 0, 7, 5, 0, 0, 0, 0, 0, 0 };
+uint8_t CadlibDriver::cymbOprnbLocParam =
+	{ 0, 1, 0, 15, 11, 0, 5, 5, 0, 0, 0, 0, 0, 0 };
+uint8_t CadlibDriver::hhOprnbLocParam =
+	{ 0, 1, 0, 15, 11, 0, 7, 5, 0, 0, 0, 0, 0, 0 };
+
+/* Slot numbers as a function of the voice and the operator.
+	( melodic only)
+*/
+uint8_t CadlibDriver::slotVoice92 = {
+	{ 0, 3 },	/* voix 0 */
+	{ 1, 4 },	/* 1 */
+	{ 2, 5 },	/* 2 */
+	{ 6, 9 },	/* 3 */
+	{ 7, 10 },	/* 4 */
+	{ 8, 11 },	/* 5 */
+	{ 12, 15 },	/* 6 */
+	{ 13, 16 },	/* 7 */
+	{ 14, 17 }	/* 8 */
+};
+
+/* Slot numbers for the percussive voices.
+	0 indicates that there is only one slot.
+*/
+uint8_t CadlibDriver::slotPerc52 = {
+	{ 12, 15 },		/* Bass Drum: slot 12 et 15 */
+	{ 16, 0 },		/* SD: slot 16 */
+	{ 14, 0 },		/* TOM: slot 14 */
+	{ 17, 0 },		/* TOP-CYM: slot 17 */
+	{ 13, 0 }		/* HH: slot 13 */
+};
+
+/*
+	This table gives the offset of each slot within the chip.
+	offset = fn( slot)
+*/
+uint8_t CadlibDriver::offsetSlot18 = {
+	0, 1, 2, 3, 4, 5,
+	8, 9, 10, 11, 12, 13,
+	16, 17, 18, 19, 20, 21
+};
+
+/* This table indicates if the slot is a modulator (0) or a carrier (1).
+	opr = fn( slot)
+*/
+uint8_t CadlibDriver::operSlot18 = {
+	0, 0, 0,		/* 1 2 3 */
+	1, 1, 1,		/* 4 5 6 */
+	0, 0, 0, 		/* 7 8 9 */
+	1, 1, 1, 		/* 10 11 12 */
+	0, 0, 0, 		/* 13 14 15 */
+	1, 1, 1,		/* 16 17 18 */
+};
+
+/* This table gives the voice number associated with each slot.
+	(melodic mode only)
+	voice = fn( slot)
+*/
+uint8_t CadlibDriver::voiceSlot18 = {
+	0, 1, 2,
+	0, 1, 2,
+	3, 4, 5,
+	3, 4, 5,
+	6, 7, 8,
+	6, 7, 8,
+};
+
+/*** public methods *************************************/
+
+void CadlibDriver::SoundWarmInit()
+{
+	/* init variables */
+	for (int i = 0; i < MAX_VOICES; i++)
+	{
+		fNumFreqPtri = 0;
+		voiceKeyOni = 0;
+		notePitchi = 0;
+	}
+	amDepth = 0;
+	vibDepth = 0;
+	noteSel = 0;
+	InitSlotVolume();
+	InitFNums();
+	SetMode(0);				/* melodic mode */
+	SetGParam(0, 0, 0);		/* init global parameters */
+	for (int i = 0; i < 9; i++)
+		SoundChut(i);
+	SetPitchRange(1);		/* default pitch range is 1 half-tone */
+	SetWaveSel(1);
+}
+
+/*
+---------------------------------------------
+	Put the chip in melodic mode (mode == 0),
+	or in percussive mode ( mode != 0).
+
+	If the melodic mode is chosen, all voices are
+	set to electric-piano, else the first 5 are set
+	to electric-piano, and the percussion voices
+	to their default timbres.
+---------------------------------------------
+*/
+void CadlibDriver::SetMode(int mode)
+{
+	if (mode)
+	{
+		SoundChut(BD);
+		SoundChut(SD);
+		SoundChut(TOM);
+
+		/* set the frequency for the last 4 percussion voices: */
+		SetFreq(TOM, TOM_PITCH, 0);
+		SetFreq(SD, SD_PITCH, 0);
+	}
+	percussion = mode;
+	percBits = 0;
+
+	InitSlotParams();
+	SndSAmVibRhythm();
+}
+
+/*
+	Enable (state != 0) / disable (state == 0)
+	the wave-select parameters.
+
+	If you do not want to use the wave-select parameters, call
+	this function with a value of 0 AFTER calling SoundColdInit()
+	or SoundWarmInit().
+*/
+void CadlibDriver::SetWaveSel(int state)
+{
+	modeWaveSel = state ? 0x20 : 0;
+	for (int i = 0; i < 18; i++)
+		opl->write(0xE0 + offsetSloti, 0);
+	opl->write(1, modeWaveSel);
+}
+
+/*
+	Routine to change the pitch bend range. The value can be from
+	1 to 12 (in half-tones).
+
+	For example, the value 12 means that the pitch bend will
+	range from -12 (pitchBend == 0, see function 'SetVoicePitch()')
+	to +12 (pitchBend == 0x3fff) half-tones.
+
+	The change will be effective as of the next call to
+	'SetVoicePitch()'.
+*/
+void CadlibDriver::SetPitchRange(uint8_t pR)
+{
+	if (pR > 12)
+		pR = 12;
+	if (pR < 1)
+		pR = 1;
+	pitchRange = pR;
+	pitchRangeStep = pitchRange * NR_STEP_PITCH;
+}
+
+/*
+----------------------------------------------
+	Set the 3 global parameters AmDepth,
+	VibDepth & NoteSel
+
+	The change takes place immediately.
+----------------------------------------------
+*/
+void CadlibDriver::SetGParam(int amD, int vibD, int nSel)
+{
+	amDepth = amD;
+	vibDepth = vibD;
+	noteSel = nSel;
+
+	SndSAmVibRhythm();
+	SndSNoteSel();
+}
+
+/*
+-------------------------------------------------
+	Set the parameters of the voice 'voice'.
+
+	In melodic mode, 'voice' varies from 0 to 8.
+	In percussive mode, voices 0 to 5 are melodic
+	and 6 to 10 are percussive.
+
+	A timbre (melodic or percussive) is defined as follows:
+	the 13 first parameters of operator 0 ( ksl, multi, feedBack,
+	attack, sustain, eg-typem decay, release, level, am, vib, ksr, fm)
+	followed by the 13 parameters of operator 1 (if a percussive voice, all
+	the parameters are zero), followed by the wave-select parameter for
+	the operators 0 and 1.
+
+	'paramArray' is structured as follows:
+		struct {
+			int opr0Prm 13;		first 13 parameters
+			int opr1Prm 13;		must be 0 if percussive timbre
+			int	opr0WaveSel;		last parameter
+			int opr1WaveSel;		must be 0 if percussive timbre
+		} TimbreDef;
+
+	The old timbre files (*.INS) do not contain the parameters
+	'opr0WaveSel' and 'opr1WaveSel'. 
+	Set these two parameters to zero if you are using the old file
+	format.
+-------------------------------------------------
+*/
+void CadlibDriver::SetVoiceTimbre(uint8_t voice, int16_t * paramArray)
+{
+	int16_t wave0, wave1;
+	int16_t * prm1, * wavePtr;
+
+	wavePtr = paramArray + 2 * (nbLocParam - 1);
+	wave0 = *wavePtr++;
+	wave1 = *wavePtr;
+	prm1 = paramArray + nbLocParam - 1;
+
+	if (!percussion || voice < BD) {	/* melodic only */
+		SetSlotParam(slotVoicevoice0, paramArray, wave0);
+		SetSlotParam(slotVoicevoice1, prm1, wave1);
+	}
+	else if (voice == BD) {	/* Bass Drum */
+		SetSlotParam(slotPerc00, paramArray, wave0);
+		SetSlotParam(slotPerc01, prm1, wave1);
+	}
+	else	/* percussion, 1 slot */
+		SetSlotParam(slotPercvoice - BD0, paramArray, wave0);
+}
+
+/*
+--------------------------------------------------
+	Set the volume of the voice 'voice' to 'volume'.
+
+	The resulting output level is (timbreVolume * volume / 127).
+	The change takes place immediately.
+
+	0 <= volume <= 127
+--------------------------------------------------
+*/
+void CadlibDriver::SetVoiceVolume(uint8_t voice, uint8_t volume)
+{
+	uint8_t slot;
+
+#if 1
+	if (!percussion || voice < BD)
+		slot = slotVoicevoice1;
+	else
+		slot = slotPercvoice - BDvoice == BD ? 1 : 0;
+
+	if (volume > MAX_VOLUME)
+		volume = MAX_VOLUME;
+	slotRelVolumeslot = volume;
+	SndSKslLevel(slot);
+#else	/* code that modify the two oper. volume of an additive sound: */
+	if (volume > MAX_VOLUME)
+		volume = MAX_VOLUME;
+
+	if (!percussion || voice <= BD) {
+		slots = slotVoicevoice;
+		slotRelVolumeslots1 = volume;
+		SndSKslLevel(slots1);
+		if (!GetLocPrm(slots0, prmFm)) {
+			/* additive syntesis: set volume of first slot too */
+			slotRelVolumeslots0 = volume;
+			SndSKslLevel(slots0);
+		}
+	}
+	else {
+		slot = slotPercvoice - BD0;
+		slotRelVolumeslot = volume;
+		SndSKslLevel(slot);
+	}
+#endif
+}
+
+/*
+-------------------------------------------------
+	Change the pitch value of a voice.
+
+	The variation in pitch is a function of the previous call
+	to 'SetPitchRange()' and the value of 'pitchBend'.
+	A value of 0 means -half-tone * pitchRange,
+	0x2000 means no variation (exact pitch) and
+	0x3fff means +half-tone * pitchRange.
+
+	Does not affect the percussive voices, except for the bass drum.
+
+	The change takes place immediately.
+
+	0 <= pitchBend <= 0x3fff, 0x2000 == exact tuning
+-------------------------------------------------
+*/
+void CadlibDriver::SetVoicePitch(uint8_t voice, uint16_t pitchBend)
+{
+	if (!percussion || voice <= BD) {
+		/* melodic + bass-drum */
+		if (pitchBend > MAX_PITCH)
+			pitchBend = MAX_PITCH;
+		ChangePitch(voice, pitchBend);
+		SetFreq(voice, notePitchvoice, voiceKeyOnvoice);
+	}
+}
+
+/*
+-----------------------------------------------------------
+	Routine to start a note playing.
+
+	0 <= voice <= 8	in melodic mode,
+	0 <= voice <= 10 in percussive mode;
+	0 <= pitch <= 127, 60 == MID_C ( the card can play between 12 and 107 )
+-----------------------------------------------------------
+*/
+void CadlibDriver::NoteOn(uint8_t voice, int pitch)
+{
+	pitch -= (MID_C - CHIP_MID_C);
+	if (pitch < 0)
+		pitch = 0;
+	if (pitch > 127)
+		pitch = 127;
+
+	if (voice < BD || !percussion)
+		/* this is a melodic voice */
+		SetFreq(voice, pitch, 1);
+	else {
+		/* this is a percussive voice */
+		if (voice == BD)
+			SetFreq(BD, pitch, 0);
+		else if (voice == TOM) {
+			/* for the last 4 percussions, only the TOM may change in frequency,
+			modifying the three others: */
+			SetFreq(TOM, pitch, 0);
+			SetFreq(SD, pitch + TOM_TO_SD, 0);	/* f7 = 3 * f8 */
+		}
+
+		percBits |= percMasksvoice - BD;
+		SndSAmVibRhythm();
+	}
+}
+
+/*
+	Routine to stop playing the note which was started in 'NoteOn()'.
+
+	0 <= voice <= 8	in melodic mode,
+	0 <= voice <= 10 in percussive mode;
+*/
+void CadlibDriver::NoteOff(uint8_t voice)
+{
+	if (!percussion || voice < BD)
+		SetFreq(voice, notePitchvoice, 0); /* shut off */
+	else {
+		percBits &= ~percMasksvoice - BD;
+		SndSAmVibRhythm();
+	}
+}
+
+/*
+	Set the volume of all slots.
+*/
+void CadlibDriver::InitSlotVolume()
+{
+	for (int i = 0; i < 18; i++)
+		slotRelVolumei = MAX_VOLUME;
+}
+
+/*
+	Initialize all lines of the frequency table. Each line represents
+	12 half-tones shifted by (n/NR_STEP_PITCH), where 'n' is the line number
+	and ranges from 1 to NR_STEP_PITCH.
+*/
+void CadlibDriver::InitFNums()
+{
+	uint8_t i, j, k, num, numStep, pas;
+
+	numStep = 100 / NR_STEP_PITCH;
+	for (num = pas = 0; pas < NR_STEP_PITCH; pas++, num += numStep)
+		SetFNum(fNumNotespas, num, 100);
+	for (i = 0; i < MAX_VOICES; i++) {
+		fNumFreqPtri = (uint16_t *)fNumNotes0;
+		halfToneOffseti = 0;
+	}
+
+	k = 0;
+	for (i = 0; i < 8; i++)
+		for (j = 0; j < 12; j++, k++) {
+			noteDIV12k = i;
+			noteMOD12k = j;
+		}
+}
+
+/*
+	Set the frequency of voice 'voice' to 0 hertz.
+*/
+void CadlibDriver::SoundChut(int voice)
+{
+	opl->write(0xA0 + voice, 0);
+	opl->write(0xB0 + voice, 0);
+}
+
+/*
+	Change pitch of voices 0 to 8, for melodic or percussive mode.
+*/
+void CadlibDriver::SetFreq(uint8_t voice, int pitch, uint8_t keyOn)
+{
+	uint16_t fNbr, t1;
+
+	voiceKeyOnvoice = keyOn;
+	notePitchvoice = pitch;
+	pitch += halfToneOffsetvoice;
+	if (pitch > 95)
+		pitch = 95;
+	if (pitch < 0)
+		pitch = 0;
+	fNbr = *(fNumFreqPtrvoice + noteMOD12pitch);
+	opl->write(0xA0 + voice, fNbr & 0xFF);
+	t1 = keyOn ? 32 : 0;
+	t1 += (noteDIV12pitch << 2) + (0x3 & (fNbr >> 8));
+	opl->write(0xB0 + voice, t1);
+}
+
+/*
+	Set the values: AM Depth, VIB depth & Rhythm
+*/
+void CadlibDriver::SndSAmVibRhythm()
+{
+	uint8_t t1;
+
+	t1 = amDepth ? 0x80 : 0;
+	t1 |= vibDepth ? 0x40 : 0;
+	t1 |= percussion ? 0x20 : 0;
+	t1 |= percBits;
+	opl->write(0xBD, t1);
+}
+
+/* --------------------------------------------
+	Note sel
+*/
+void CadlibDriver::SndSNoteSel()
+{
+	opl->write(0x08, noteSel ? 64 : 0);
+}
+
+/*
+	KSL, LEVEL
+*/
+void CadlibDriver::SndSKslLevel(uint8_t slot)
+{
+	unsigned t1;
+
+	t1 = 63 - (GetLocPrm(slot, prmLevel) & 0x3f);	/* amplitude */
+	t1 = slotRelVolumeslot * t1;
+	t1 += t1 + MAX_VOLUME;	/* round off to 0.5 */
+	t1 = 63 - t1 / (2 * MAX_VOLUME);
+
+	t1 |= GetLocPrm(slot, prmKsl) << 6;
+	opl->write(0x40 + offsetSlotslot, t1 & 0xFF);
+}
+
+/* --------------------------------------------
+	FEED-BACK and FM (connection).
+	Applicable only to operator 0 in melodic mode.
+*/
+void CadlibDriver::SndSFeedFm(uint8_t slot)
+{
+	uint8_t t1;
+
+	if (operSlotslot)
+		return;
+	t1 = GetLocPrm(slot, prmFeedBack) << 1;
+	t1 |= GetLocPrm(slot, prmFm) ? 0 : 1;
+	opl->write(0xC0 + (int)voiceSlotslot, t1);
+}
+
+/*
+	ATTACK, DECAY
+*/
+void CadlibDriver::SndSAttDecay(uint8_t slot)
+{
+	uint8_t t1;
+
+	t1 = GetLocPrm(slot, prmAttack) << 4;
+	t1 |= GetLocPrm(slot, prmDecay) & 0xf;
+	opl->write(0x60 + (int)offsetSlotslot, t1);
+}
+
+/*
+	SUSTAIN, RELEASE
+*/
+void CadlibDriver::SndSSusRelease(uint8_t slot)
+{
+	uint8_t t1;
+
+	t1 = GetLocPrm(slot, prmSustain) << 4;
+	t1 |= GetLocPrm(slot, prmRelease) & 0xf;
+	opl->write(0x80 + (int)offsetSlotslot, t1);
+}
+
+/*
+	AM, VIB, EG-TYP (Sustaining), KSR, MULTI
+*/
+void CadlibDriver::SndSAVEK(uint8_t slot)
+{
+	uint8_t t1;
+
+	t1 = GetLocPrm(slot, prmAm) ? 0x80 : 0;
+	t1 += GetLocPrm(slot, prmVib) ? 0x40 : 0;
+	t1 += GetLocPrm(slot, prmStaining) ? 0x20 : 0;
+	t1 += GetLocPrm(slot, prmKsr) ? 0x10 : 0;
+	t1 += GetLocPrm(slot, prmMulti) & 0xf;
+	opl->write(0x20 + (int)offsetSlotslot, t1);
+}
+
+/*
+	Set the wave-select parameter.
+*/
+void CadlibDriver::SndWaveSelect(uint8_t slot)
+{
+	uint8_t wave;
+
+	if (modeWaveSel)
+		wave = GetLocPrm(slot, prmWaveSel) & 0x03;
+	else
+		wave = 0;
+	opl->write(0xE0 + offsetSlotslot, wave);
+}
+
+/*-------------------------------------------------
+	Transfer all the parameters from slot 'slot' to
+	the chip.
+*/
+void CadlibDriver::SndSetAllPrm(uint8_t slot)
+{
+	SndSAmVibRhythm();
+	SndSNoteSel();
+	SndSKslLevel(slot);
+	SndSFeedFm(slot);
+	SndSAttDecay(slot);
+	SndSSusRelease(slot);
+	SndSAVEK(slot);
+	SndWaveSelect(slot);
+}
+
+/*
+------------------------------------------------------
+	Set the 14 parameters ( 13 in 'param', 1 in 'waveSel')
+	of slot 'slot'. Update the parameter array and the chip.
+------------------------------------------------------
+*/
+void CadlibDriver::SetSlotParam(uint8_t slot, int16_t * param, uint8_t waveSel)
+{
+	for (int i = 0; i < nbLocParam - 1; i++)
+		paramSlotsloti = *param++;
+	paramSlotslotnbLocParam - 1 = waveSel &= 0x3;
+	SndSetAllPrm(slot);
+}
+
+void CadlibDriver::SetCharSlotParam(uint8_t slot, uint8_t * cParam, uint8_t waveSel)
+{
+	int16_t paramnbLocParam;
+
+	for (int i = 0; i < nbLocParam - 1; i++)
+		parami = *cParam++;
+	SetSlotParam(slot, param, waveSel);
+}
+
+/*
+	In melodic mode, initialize all voices to electric-pianos.
+
+	In percussive mode, initialize the first 6 voices to electric-pianos
+	and the percussive voices to their default timbres.
+*/
+void CadlibDriver::InitSlotParams()
+{
+	for (int i = 0; i < 18; i++)
+		if (operSloti)
+			SetCharSlotParam(i, pianoParamsOp1, 0);
+		else
+			SetCharSlotParam(i, pianoParamsOp0, 0);
+
+	if (percussion)
+	{
+		SetCharSlotParam(12, bdOpr0, 0);
+		SetCharSlotParam(15, bdOpr1, 0);
+		SetCharSlotParam(16, sdOpr, 0);
+		SetCharSlotParam(14, tomOpr, 0);
+		SetCharSlotParam(17, cymbOpr, 0);
+		SetCharSlotParam(13, hhOpr, 0);
+	}
+}
+
+/*
+	Initialize a line in the frequency table with shifted frequency values.
+	The values are shifted a fraction (num/den) of a half-tone.
+	See following routine.
+*/
+void CadlibDriver::SetFNum(uint16_t * fNumVec, int num, int den)
+{
+	int i;
+	long val;
+
+	*fNumVec++ = (uint16_t)(4 + (val = CalcPremFNum(num, den))) >> 3;
+	for (i = 1; i < 12; i++) {
+		val *= 106;
+		*fNumVec++ = (uint16_t)(4 + (val /= 100)) >> 3;
+	}
+}
+
+/*
+	Routine to set 'halfToneOffset' & 'fNumFreqPtr'.
+	These two global variables are used to determine the frequency
+	variation to use when a note is played.
+
+	0 <= pitchBend <= 3fffH
+*/
+void CadlibDriver::ChangePitch(int voice, int pitchBend)
+{
+	int l, t1, t2, delta;
+	static int oldL = -1;
+	static int oldHt;
+	static uint16_t * oldPtr;
+
+	l = (int)(pitchBend - MID_PITCH) * pitchRangeStep;
+	if (oldL == l) {	/* optimisation ... */
+		fNumFreqPtrvoice = oldPtr;
+		halfToneOffsetvoice = oldHt;
+	}
+	else {
+		t1 = l / MID_PITCH;
+		if (t1 < 0) {
+			t2 = NR_STEP_PITCH - 1 - t1;
+			oldHt = halfToneOffsetvoice = -(t2 / NR_STEP_PITCH);
+			delta = (t2 - NR_STEP_PITCH + 1) % NR_STEP_PITCH;
+			if (delta)
+				delta = NR_STEP_PITCH - delta;
+		}
+		else {
+			oldHt = halfToneOffsetvoice = t1 / NR_STEP_PITCH;
+			delta = t1 % NR_STEP_PITCH;
+		}
+		oldPtr = fNumFreqPtrvoice = (uint16_t *)fNumNotesdelta;
+		oldL = l;
+	}
+}
+
+/*
+	Return binary value of the frequency 260.44 (C)
+	shifted by +/- numdeltaDemiTon/denDeltaDemiTon multiplied by 8.
+
+	If the numerator (numDeltaDemiTon) is positive, the frequency is
+	increased; if negative, it is decreased.
+
+	Fo = Fb( 1 + 0.06 num /den)
+	Fnum8 = Fo * 65536 * 72 / 3.58e6
+	
+	-100 <= numDeltaDemiTon <= +100
+	1 <= denDeltaDemiTon <= 100
+*/
+long CadlibDriver::CalcPremFNum(int numDeltaDemiTon, int denDeltaDemiTon)
+{
+	long	f8, fNum8, d100;
+
+	d100 = denDeltaDemiTon * 100;
+	f8 = (d100 + 6 * numDeltaDemiTon) * (26044L * 2L);	/* 260.44 * 100 * 2 */
+	f8 /= d100 * 25;
+	fNum8 = f8 * 16384;		/*( 16384L * 9L);	*/
+	fNum8 *= 9L;
+	fNum8 /= 179L * 625L;
+	return fNum8;
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/adlib.h Added

@@ -0,0 +1,175 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2005 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * adlib.h - AdLib Sound Driver by Stas'M <binarymaster@mail.ru> and Jepael
+ *
+ * Based on ADLIB.H by Marc Savary and Dale Glowinski, Ad Lib Inc.
+ */
+
+#ifndef H_ADPLUG_ADLIBDRV
+#define H_ADPLUG_ADLIBDRV
+
+#include "stdint.h"
+#include "player.h"
+
+/* Parameters of each voice: */
+#define nbLocParam		14
+
+#define prmKsl			0
+#define prmMulti		1
+#define prmFeedBack		2		/* use for opr. 0 only */
+#define prmAttack		3
+#define prmSustain		4
+#define prmStaining		5		/* Sustaining ... */
+#define prmDecay		6
+#define prmRelease		7
+#define prmLevel		8
+#define prmAm			9
+#define prmVib			10
+#define prmKsr			11
+#define prmFm			12			/* use for opr. 0 only */
+#define prmWaveSel		13			/* wave select */
+
+ /* globals parameters: */
+#define prmAmDepth		14
+#define prmVibDepth		15
+#define prmNoteSel		16
+#define prmPercussion	17
+
+ /* melodic voice numbers: */
+#define vMelo0			0
+#define vMelo1			1
+#define vMelo2			2
+#define vMelo3			3
+#define vMelo4			4
+#define vMelo5			5
+#define vMelo6			6
+#define vMelo7			7
+#define vMelo8			8
+
+ /* percussive voice numbers: */
+#define BD				6
+#define SD				7
+#define TOM				8
+#define CYMB			9
+#define HIHAT			10
+
+#define MAX_VOICES		11
+#define MAX_VOLUME		0x7f
+#define MAX_PITCH		0x3fff
+#define MID_PITCH		0x2000
+
+#define MID_C			60			/* MIDI standard mid C */
+#define CHIP_MID_C		48			/* sound chip mid C */
+#define NR_NOTES		96			/* # of notes we can play on chip */
+
+#define TOM_PITCH	24				/* best frequency, in range of 0 to 95 */
+#define TOM_TO_SD	7				/* 7 half-tones between voice 7 & 8 */
+#define SD_PITCH	(TOM_PITCH + TOM_TO_SD)
+
+#define NR_STEP_PITCH	25			/* 25 steps within a half-tone for pitch bend */
+#define ADLIB_OPER_LEN	13			/* operator length */
+#define ADLIB_INST_LEN	(ADLIB_OPER_LEN * 2 + 2)	/* modulator, carrier, mod/car wave select */
+
+#define GetLocPrm(slot, prm) ( (uint8_t)paramSlotslotprm )
+
+class CadlibDriver
+{
+public:
+	CadlibDriver(Copl *newopl)
+		: opl(newopl)
+	{};
+	~CadlibDriver()
+	{};
+
+	void SoundWarmInit();
+	void SetMode(int mode);
+	void SetWaveSel(int state);
+	void SetPitchRange(uint8_t pR);
+	void SetGParam(int amD, int vibD, int nSel);
+	void SetVoiceTimbre(uint8_t voice, int16_t * paramArray);
+	void SetVoiceVolume(uint8_t voice, uint8_t volume);
+	void SetVoicePitch(uint8_t voice, uint16_t pitchBend);
+	void NoteOn(uint8_t voice, int pitch);
+	void NoteOff(uint8_t voice);
+
+private:
+	Copl *opl;
+
+	void InitSlotVolume();
+	void InitFNums();
+	void SoundChut(int voice);
+	void SetFreq(uint8_t voice, int pitch, uint8_t keyOn);
+	void SndSAmVibRhythm();
+	void SndSNoteSel();
+	void SndSKslLevel(uint8_t slot);
+	void SndSFeedFm(uint8_t slot);
+	void SndSAttDecay(uint8_t slot);
+	void SndSSusRelease(uint8_t slot);
+	void SndSAVEK(uint8_t slot);
+	void SndWaveSelect(uint8_t slot);
+	void SndSetAllPrm(uint8_t slot);
+	void SetSlotParam(uint8_t slot, int16_t * param, uint8_t waveSel);
+	void SetCharSlotParam(uint8_t slot, uint8_t * cParam, uint8_t waveSel);
+	void InitSlotParams();
+	void SetFNum(uint16_t * fNumVec, int num, int den);
+	void ChangePitch(int voice, int pitchBend);
+	long CalcPremFNum(int numDeltaDemiTon, int denDeltaDemiTon);
+
+	uint16_t fNumNotesNR_STEP_PITCH12;
+	int		halfToneOffsetMAX_VOICES;
+	uint16_t * fNumFreqPtrMAX_VOICES;
+	int	 	pitchRange;			/* pitch variation, half-tone +1,+12 */
+	int 	pitchRangeStep;		/* == pitchRange * NR_STEP_PITCH */
+	int		modeWaveSel;		/* != 0 if used with the 'wave-select' parameters */
+
+	uint8_t percBits;				/* control bits of percussive voices */
+	uint8_t notePitchMAX_VOICES;	/* pitch of last note-on of each voice */
+	uint8_t voiceKeyOnMAX_VOICES;	/* state of keyOn bit of each voice */
+
+	uint8_t noteDIV1296;			/* table of (0..95) DIV 12 */
+	uint8_t noteMOD1296;			/* table of (0..95) MOD 12 */
+
+	uint8_t slotRelVolume18;		/* relative volume of slots */
+
+	typedef uint8_t SLOT_PARAM;
+	SLOT_PARAM paramSlot18nbLocParam;	/* all the parameters of slots... */
+
+	uint8_t amDepth;			/* chip global parameters .. */
+	uint8_t vibDepth;			/* ... */
+	uint8_t noteSel;			/* ... */
+	uint8_t percussion;		/* percussion mode parameter */
+
+protected:
+	static const uint8_t percMasks5;
+	static uint8_t pianoParamsOp0nbLocParam;
+	static uint8_t pianoParamsOp1nbLocParam;
+	static uint8_t bdOpr0nbLocParam;
+	static uint8_t bdOpr1nbLocParam;
+	static uint8_t sdOprnbLocParam;
+	static uint8_t tomOprnbLocParam;
+	static uint8_t cymbOprnbLocParam;
+	static uint8_t hhOprnbLocParam;
+	static uint8_t slotVoice92;
+	static uint8_t slotPerc52;
+	static uint8_t offsetSlot18;
+	static uint8_t operSlot18;
+	static uint8_t voiceSlot18;
+};
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/adlibemu.c -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/adlibemu.c Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/adlibemu.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/adlibemu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/adplug.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/adplug.cpp Changed

@@ -14,16 +14,24 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * adplug.cpp - CAdPlug utility class, by Simon Peter <dn.tlp@gmx.net>
 */
 
-#include <string.h>
+/*
+ * Copyright (c) 2017 Wraithverge <liam82067@yahoo.com>
+ * - Added extension ".rac" for CrawPlayer.
+ * - Corrected 'type' string for CrawPlayer.
+ */
+
+#include <cstring>
+#include <string>
 #include <binfile.h>
 
 #include "adplug.h"
 #include "debug.h"
+#include "version.h"
 
 /***** Replayer includes *****/
 
@@ -34,7 +42,7 @@
 #include "sng.h"
 #include "adtrack.h"
 #include "bam.h"
-//#include "cmf.h"
+#include "cmf.h"
 #include "d00.h"
 #include "dfm.h"
 #include "hsp.h"
@@ -67,11 +75,18 @@
 #include "rix.h"
 #include "adl.h"
 #include "jbm.h"
+#include "got.h"
+#include "mus.h"
+#include "mdi.h"
+#include "cmfmcsop.h"
+#include "vgm.h"
+#include "sop.h"
+#include "herad.h"
 
 /***** CAdPlug *****/
 
 // List of all players that come with the standard AdPlug distribution
-CPlayerDesc CAdPlug::allplayers = {
+const CPlayerDesc CAdPlug::allplayers = {
 CPlayerDesc(ChscPlayer::factory, "HSC-Tracker", ".hsc\0"),
 CPlayerDesc(CsngPlayer::factory, "SNGPlay", ".sng\0"),
 CPlayerDesc(CimfPlayer::factory, "Apogee IMF", ".imf\0.wlf\0.adlib\0"),
@@ -79,13 +94,15 @@
 CPlayerDesc(CadtrackLoader::factory, "Adlib Tracker", ".sng\0"),
 CPlayerDesc(CamdLoader::factory, "AMUSIC", ".amd\0"),
 CPlayerDesc(CbamPlayer::factory, "Bob's Adlib Music", ".bam\0"),
-// CPlayerDesc(CcmfPlayer::factory, "Creative Music File", ".cmf\0"),
+ CPlayerDesc(CcmfPlayer::factory, "Creative Music File", ".cmf\0"),
 CPlayerDesc(Cd00Player::factory, "Packed EdLib", ".d00\0"),
 CPlayerDesc(CdfmLoader::factory, "Digital-FM", ".dfm\0"),
 CPlayerDesc(ChspLoader::factory, "HSC Packed", ".hsp\0"),
 CPlayerDesc(CksmPlayer::factory, "Ken Silverman Music", ".ksm\0"),
 CPlayerDesc(CmadLoader::factory, "Mlat Adlib Tracker", ".mad\0"),
- CPlayerDesc(CmidPlayer::factory, "MIDI", ".mid\0.sci\0.laa\0.cmf\0"),
+ CPlayerDesc(CmusPlayer::factory, "AdLib MIDI/IMS Format", ".mus\0.ims\0"),
+ CPlayerDesc(CmdiPlayer::factory, "AdLib MIDIPlay File", ".mdi\0"),
+ CPlayerDesc(CmidPlayer::factory, "MIDI", ".mid\0.sci\0.laa\0"),
 CPlayerDesc(CmkjPlayer::factory, "MKJamz", ".mkj\0"),
 CPlayerDesc(CcffLoader::factory, "Boomtracker", ".cff\0"),
 CPlayerDesc(CdmoLoader::factory, "TwinTeam", ".dmo\0"),
@@ -94,9 +111,9 @@
 CPlayerDesc(CfmcLoader::factory, "Faust Music Creator", ".sng\0"),
 CPlayerDesc(CmtkLoader::factory, "MPU-401 Trakker", ".mtk\0"),
 CPlayerDesc(CradLoader::factory, "Reality Adlib Tracker", ".rad\0"),
- CPlayerDesc(CrawPlayer::factory, "RdosPlay RAW", ".raw\0"),
+ CPlayerDesc(CrawPlayer::factory, "Raw AdLib Capture", ".rac\0.raw\0"),
 CPlayerDesc(Csa2Loader::factory, "Surprise! Adlib Tracker", ".sat\0.sa2\0"),
- CPlayerDesc(CxadbmfPlayer::factory, "BMF Adlib Tracker", ".xad\0"),
+ CPlayerDesc(CxadbmfPlayer::factory, "BMF Adlib Tracker", ".xad\0.bmf\0"),
 CPlayerDesc(CxadflashPlayer::factory, "Flash", ".xad\0"),
 CPlayerDesc(CxadhybridPlayer::factory, "Hybrid", ".xad\0"),
 CPlayerDesc(CxadhypPlayer::factory, "Hypnosis", ".xad\0"),
@@ -112,10 +129,15 @@
 CPlayerDesc(CrixPlayer::factory, "Softstar RIX OPL Music", ".rix\0"),
 CPlayerDesc(CadlPlayer::factory, "Westwood ADL", ".adl\0"),
 CPlayerDesc(CjbmPlayer::factory, "JBM Adlib Music", ".jbm\0"),
+ CPlayerDesc(CgotPlayer::factory, "God of Thunder Music", ".got\0"),
+ CPlayerDesc(CcmfmacsoperaPlayer::factory, "SoundFX Macs Opera CMF", ".cmf\0"),
+ CPlayerDesc(CvgmPlayer::factory, "Video Game Music", ".vgm\0.vgz\0"),
+ CPlayerDesc(CsopPlayer::factory, "Note Sequencer by sopepos", ".sop\0"),
+ CPlayerDesc(CheradPlayer::factory, "Herbulot AdLib System", ".hsq\0.sqx\0.sdb\0.agd\0.ha2\0"),
 CPlayerDesc()
 };
 
-const CPlayers &CAdPlug::init_players(CPlayerDesc pd)
+const CPlayers &CAdPlug::init_players(const CPlayerDesc pd)
 {
 static CPlayers	initplayers;
 unsigned int		i;
@@ -127,23 +149,23 @@
 }
 
 const CPlayers CAdPlug::players = CAdPlug::init_players(CAdPlug::allplayers);
-//CAdPlugDatabase *CAdPlug::database = 0;
+CAdPlugDatabase *CAdPlug::database = 0;
 
-CPlayer *CAdPlug::factory(const char *fn, Copl *opl, const CPlayers &pl,
+CPlayer *CAdPlug::factory(const std::string &fn, Copl *opl, const CPlayers &pl,
 			 const CFileProvider &fp)
 {
 CPlayer			*p;
- CPlayerDesc *i;
+ CPlayers::const_iterator	i;
 unsigned int			j;
 
- AdPlug_LogWrite("*** CAdPlug::factory(\"%s\",opl,fp) ***\n", fn);
+ AdPlug_LogWrite("*** CAdPlug::factory(\"%s\",opl,fp) ***\n", fn.c_str());
 
 // Try a direct hit by file extension
- for(i = pl.head; i; i = i->next)
- for(j = 0; i->get_extension(j); j++)
- if(fp.extension(fn, i->get_extension(j))) {
-	AdPlug_LogWrite("Trying direct hit: %s\n", i->filetype);
-	if((p = i->factory(opl))) {
+ for(i = pl.begin(); i != pl.end(); i++)
+ for(j = 0; (*i)->get_extension(j); j++)
+ if(fp.extension(fn, (*i)->get_extension(j))) {
+	AdPlug_LogWrite("Trying direct hit: %s\n", (*i)->filetype.c_str());
+	if((p = (*i)->factory(opl))) {
 	 if(p->load(fn, fp)) {
 	 AdPlug_LogWrite("got it!\n");
 	 AdPlug_LogWrite("--- CAdPlug::factory ---\n");
@@ -154,9 +176,9 @@
 }
 
 // Try all players, one by one
- for(i = pl.head; i; i = i->next) {
- AdPlug_LogWrite("Trying: %s\n", i->filetype);
- if((p = i->factory(opl))) {
+ for(i = pl.begin(); i != pl.end(); i++) {
+ AdPlug_LogWrite("Trying: %s\n", (*i)->filetype.c_str());
+ if((p = (*i)->factory(opl))) {
 if(p->load(fn, fp)) {
 AdPlug_LogWrite("got it!\n");
 AdPlug_LogWrite("--- CAdPlug::factory ---\n");
@@ -172,20 +194,18 @@
 return 0;
 }
 
-#if 0
 void CAdPlug::set_database(CAdPlugDatabase *db)
 {
 database = db;
 }
-#endif
 
-const char * CAdPlug::get_version()
+std::string CAdPlug::get_version()
 {
- return VERSION;
+ return std::string(ADPLUG_VERSION);
 }
 
-void CAdPlug::debug_output(const char *filename)
+void CAdPlug::debug_output(const std::string &filename)
 {
- AdPlug_LogFile(filename);
- AdPlug_LogWrite("CAdPlug::debug_output(\"%s\"): Redirected.\n",filename);
+ AdPlug_LogFile(filename.c_str());
+ AdPlug_LogWrite("CAdPlug::debug_output(\"%s\"): Redirected.\n",filename.c_str());
 }

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/adplug.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/adplug.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/adtrack.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/adtrack.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/adtrack.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/adtrack.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/amd.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/amd.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/amd.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/amd.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/analopl.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/analopl.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/analopl.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/analopl.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/bam.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/bam.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/bam.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/bam.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/bmf.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/bmf.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/bmf.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/bmf.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/cff.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/cff.cpp Changed

@@ -14,7 +14,7 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 cff.cpp - BoomTracker loader by Riven the Mage <riven@ok.ru>
 */
@@ -24,6 +24,7 @@
 slides use previous effect data instead of current.
 */
 
+#include <cstring>
 #include <stdlib.h>
 #include <string.h>
 
@@ -36,7 +37,7 @@
 return new CcffLoader(newopl);
 }
 
-bool CcffLoader::load(const char *filename, const CFileProvider &fp)
+bool CcffLoader::load(const std::string &filename, const CFileProvider &fp)
 {
 binistream *f = fp.open(filename); if(!f) return false;
 const unsigned char conv_inst11 = { 2,1,10,9,4,3,6,5,0,8,7 };
@@ -68,17 +69,17 @@
 if (!unpacker->unpack(packed_module,module))
 	{
 	 delete unpacker;
-	 delete packed_module;
-	 delete module;
+	 delete packed_module;
+	 delete module;
 	 return false;
 	}
 
 delete unpacker;
- delete packed_module;
+ delete packed_module;
 
 if (memcmp(&module0x5E1,"CUD-FM-File - SEND A POSTCARD -",31))
 	{
-	 delete module;
+	 delete module;
 	 return false;
 	}
 }
@@ -274,27 +275,27 @@
 }
 }
 
-const char * CcffLoader::gettype()
+std::string CcffLoader::gettype()
 {
 if (header.packed)
- return "BoomTracker 4, packed";
+ return std::string("BoomTracker 4, packed");
 else
- return "BoomTracker 4";
+ return std::string("BoomTracker 4");
 }
 
-const char * CcffLoader::gettitle()
+std::string CcffLoader::gettitle()
 {
- return song_title;
+ return std::string(song_title,20);
 }
 
-const char * CcffLoader::getauthor()
+std::string CcffLoader::getauthor()
 {
- return song_author;
+ return std::string(song_author,20);
 }
 
-const char * CcffLoader::getinstrument(unsigned int n)
+std::string CcffLoader::getinstrument(unsigned int n)
 {
- return instrumentsn.name;
+ return std::string(instrumentsn.name);
 }
 
 unsigned int CcffLoader::getinstruments()
@@ -378,7 +379,10 @@
 	 }
 
 	 for (unsigned int i=0;i<repeat_counter*repeat_length;i++)
-	 outputoutput_length++ = outputoutput_length - repeat_length;
+	 {
+	 outputoutput_length = outputoutput_length - repeat_length;
+	 output_length++;
+	 }
 
 	 code_length = old_code_length;

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/cff.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/cff.h Changed

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/cmf.cpp Added

@@ -0,0 +1,860 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2009 Simon Peter, <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * cmf.cpp - CMF player by Adam Nielsen <malvineous@shikadi.net>
+ * Subset of CMF reader in MOPL code (Malvineous' OPL player), no seeking etc.
+ */
+
+#include <stdint.h> // for uintxx_t
+#include <cassert>
+#include <math.h> // for pow() etc.
+#include <string.h> // for memset
+#include "debug.h"
+#include "cmf.h"
+
+// ------------------------------
+// OPTIONS
+// ------------------------------
+
+// The official Creative Labs CMF player seems to ignore the note velocity
+// (playing every note at the same volume), but you can uncomment this to
+// allow the note velocity to affect the volume (as presumably the composer
+// originally intended.)
+//
+//#define USE_VELOCITY
+//
+// The Xargon demo song is a good example of a song that uses note velocity.
+
+// OPL register offsets
+#define BASE_CHAR_MULT 0x20
+#define BASE_SCAL_LEVL 0x40
+#define BASE_ATCK_DCAY 0x60
+#define BASE_SUST_RLSE 0x80
+#define BASE_FNUM_L 0xA0
+#define BASE_KEYON_FREQ 0xB0
+#define BASE_RHYTHM 0xBD
+#define BASE_WAVE 0xE0
+#define BASE_FEED_CONN 0xC0
+
+#define OPLBIT_KEYON 0x20 // Bit in BASE_KEYON_FREQ register for turning a note on
+
+// Supplied with a channel, return the offset from a base OPL register for the
+// Modulator cell (e.g. channel 4's modulator is at offset 0x09. Since 0x60 is
+// the attack/decay function, register 0x69 will thus set the attack/decay for
+// channel 4's modulator.) (channels go from 0 to 8 inclusive)
+#define OPLOFFSET(channel) (((channel) / 3) * 8 + ((channel) % 3))
+
+// These 16 instruments are repeated to fill up the 128 available slots. A CMF
+// file can override none/some/all of the 128 slots with custom instruments,
+// so any that aren't overridden are still available for use with these default
+// patches. The Word Rescue CMFs are good examples of songs that rely on these
+// default patches.
+uint8_t cDefaultPatches =
+"\x01\x11\x4F\x00\xF1\xD2\x53\x74\x00\x00\x06"
+"\x07\x12\x4F\x00\xF2\xF2\x60\x72\x00\x00\x08"
+"\x31\xA1\x1C\x80\x51\x54\x03\x67\x00\x00\x0E"
+"\x31\xA1\x1C\x80\x41\x92\x0B\x3B\x00\x00\x0E"
+"\x31\x16\x87\x80\xA1\x7D\x11\x43\x00\x00\x08"
+"\x30\xB1\xC8\x80\xD5\x61\x19\x1B\x00\x00\x0C"
+"\xF1\x21\x01\x00\x97\xF1\x17\x18\x00\x00\x08"
+"\x32\x16\x87\x80\xA1\x7D\x10\x33\x00\x00\x08"
+"\x01\x12\x4F\x00\x71\x52\x53\x7C\x00\x00\x0A"
+"\x02\x03\x8D\x00\xD7\xF5\x37\x18\x00\x00\x04"
+"\x21\x21\xD1\x00\xA3\xA4\x46\x25\x00\x00\x0A"
+"\x22\x22\x0F\x00\xF6\xF6\x95\x36\x00\x00\x0A"
+"\xE1\xE1\x00\x00\x44\x54\x24\x34\x02\x02\x07"
+"\xA5\xB1\xD2\x80\x81\xF1\x03\x05\x00\x00\x02"
+"\x71\x22\xC5\x00\x6E\x8B\x17\x0E\x00\x00\x02"
+"\x32\x21\x16\x80\x73\x75\x24\x57\x00\x00\x0E";
+
+
+CPlayer *CcmfPlayer::factory(Copl *newopl)
+{
+ return new CcmfPlayer(newopl);
+}
+
+CcmfPlayer::CcmfPlayer(Copl *newopl) :
+	CPlayer(newopl),
+	data(NULL),
+	pInstruments(NULL),
+	bPercussive(false),
+	iPrevCommand(0)
+{
+	assert(OPLOFFSET(1-1) == 0x00);
+	assert(OPLOFFSET(5-1) == 0x09);
+	assert(OPLOFFSET(9-1) == 0x12);
+}
+
+CcmfPlayer::~CcmfPlayer()
+{
+	if (this->data) delete data;
+	if (this->pInstruments) delete pInstruments;
+}
+
+bool CcmfPlayer::load(const std::string &filename, const CFileProvider &fp)
+{
+ binistream *f = fp.open(filename); if(!f) return false;
+
+	char cSig4;
+	f->readString(cSig, 4);
+	if (
+		(cSig0 != 'C') ||
+		(cSig1 != 'T') ||
+		(cSig2 != 'M') ||
+		(cSig3 != 'F')
+	) {
+		// Not a CMF file
+		fp.close(f);
+		return false;
+	}
+	uint16_t iVer = f->readInt(2);
+	if ((iVer != 0x0101) && (iVer != 0x0100)) {
+		AdPlug_LogWrite("CMF file is not v1.0 or v1.1 (reports %d.%d)\n", iVer >> 8 , iVer & 0xFF);
+		fp.close(f);
+		return false;
+	}
+
+	this->cmfHeader.iInstrumentBlockOffset = f->readInt(2);
+	this->cmfHeader.iMusicOffset = f->readInt(2);
+	this->cmfHeader.iTicksPerQuarterNote = f->readInt(2);
+	this->cmfHeader.iTicksPerSecond = f->readInt(2);
+	this->cmfHeader.iTagOffsetTitle = f->readInt(2);
+	this->cmfHeader.iTagOffsetComposer = f->readInt(2);
+	this->cmfHeader.iTagOffsetRemarks = f->readInt(2);
+
+	// This checks will fix crash for a lot of broken files
+	// Title, Composer and Remarks blocks usually located before Instrument block
+	// But if not this will indicate invalid offset value (sometimes even bigger than filesize)
+	if (this->cmfHeader.iTagOffsetTitle >= this->cmfHeader.iInstrumentBlockOffset)
+		this->cmfHeader.iTagOffsetTitle = 0;
+	if (this->cmfHeader.iTagOffsetComposer >= this->cmfHeader.iInstrumentBlockOffset)
+		this->cmfHeader.iTagOffsetComposer = 0;
+	if (this->cmfHeader.iTagOffsetRemarks >= this->cmfHeader.iInstrumentBlockOffset)
+		this->cmfHeader.iTagOffsetRemarks = 0;
+
+	f->readString((char *)this->cmfHeader.iChannelsInUse, 16);
+	if (iVer == 0x0100) {
+		this->cmfHeader.iNumInstruments = f->readInt(1);
+		this->cmfHeader.iTempo = 0;
+	} else { // 0x0101
+		this->cmfHeader.iNumInstruments = f->readInt(2);
+		this->cmfHeader.iTempo = f->readInt(2);
+	}
+
+	// Load the instruments
+
+	f->seek(this->cmfHeader.iInstrumentBlockOffset);
+	this->pInstruments = new SBI
+		(this->cmfHeader.iNumInstruments < 128) ? 128 : this->cmfHeader.iNumInstruments
+	; // Always at least 128 available for use
+
+	for (int i = 0; i < this->cmfHeader.iNumInstruments; i++) {
+		this->pInstrumentsi.op0.iCharMult = f->readInt(1);
+		this->pInstrumentsi.op1.iCharMult = f->readInt(1);
+		this->pInstrumentsi.op0.iScalingOutput = f->readInt(1);
+		this->pInstrumentsi.op1.iScalingOutput = f->readInt(1);
+		this->pInstrumentsi.op0.iAttackDecay = f->readInt(1);
+		this->pInstrumentsi.op1.iAttackDecay = f->readInt(1);
+		this->pInstrumentsi.op0.iSustainRelease = f->readInt(1);
+		this->pInstrumentsi.op1.iSustainRelease = f->readInt(1);
+		this->pInstrumentsi.op0.iWaveSel = f->readInt(1);
+		this->pInstrumentsi.op1.iWaveSel = f->readInt(1);
+		this->pInstrumentsi.iConnection = f->readInt(1);
+		f->seek(5, binio::Add); // skip over the padding bytes
+	}
+
+	// Set the rest of the instruments to the CMF defaults
+	for (int i = this->cmfHeader.iNumInstruments; i < 128; i++) {
+		this->pInstrumentsi.op0.iCharMult = cDefaultPatches(i % 16) * 11 + 0;
+		this->pInstrumentsi.op1.iCharMult = cDefaultPatches(i % 16) * 11 + 1;
+		this->pInstrumentsi.op0.iScalingOutput = cDefaultPatches(i % 16) * 11 + 2;
+		this->pInstrumentsi.op1.iScalingOutput = cDefaultPatches(i % 16) * 11 + 3;
+		this->pInstrumentsi.op0.iAttackDecay = cDefaultPatches(i % 16) * 11 + 4;
+		this->pInstrumentsi.op1.iAttackDecay = cDefaultPatches(i % 16) * 11 + 5;
+		this->pInstrumentsi.op0.iSustainRelease = cDefaultPatches(i % 16) * 11 + 6;
+		this->pInstrumentsi.op1.iSustainRelease = cDefaultPatches(i % 16) * 11 + 7;
+		this->pInstrumentsi.op0.iWaveSel = cDefaultPatches(i % 16) * 11 + 8;
+		this->pInstrumentsi.op1.iWaveSel = cDefaultPatches(i % 16) * 11 + 9;
+		this->pInstrumentsi.iConnection = cDefaultPatches(i % 16) * 11 + 10;
+	}
+
+	if (this->cmfHeader.iTagOffsetTitle) {
+		f->seek(this->cmfHeader.iTagOffsetTitle);
+		this->strTitle = f->readString('\0');
+	}
+	if (this->cmfHeader.iTagOffsetComposer) {
+		f->seek(this->cmfHeader.iTagOffsetComposer);
+		this->strComposer = f->readString('\0');
+	}
+	if (this->cmfHeader.iTagOffsetRemarks) {
+		f->seek(this->cmfHeader.iTagOffsetRemarks);
+		this->strRemarks = f->readString('\0');
+	}
+
+	// Load the MIDI data into memory
+ f->seek(this->cmfHeader.iMusicOffset);
+ this->iSongLen = fp.filesize(f) - this->cmfHeader.iMusicOffset;
+ this->data = new unsigned charthis->iSongLen;
+ f->readString((char *)data, this->iSongLen);
+
+ fp.close(f);
+	rewind(0);
+
+ return true;
+}
+
+bool CcmfPlayer::update()
+{
+	// This has to be here and not in getrefresh() for some reason.
+	this->iDelayRemaining = 0;
+
+	// Read in the next event
+	while (!this->iDelayRemaining) {
+		uint8_t iCommand = this->datathis->iPlayPointer++;
+		if ((iCommand & 0x80) == 0) {
+			// Running status, use previous command
+			this->iPlayPointer--;
+			iCommand = this->iPrevCommand;
+		} else {
+			this->iPrevCommand = iCommand;
+		}
+		uint8_t iChannel = iCommand & 0x0F;
+		switch (iCommand & 0xF0) {
+			case 0x80: { // Note off (two data bytes)
+				uint8_t iNote = this->datathis->iPlayPointer++;
+				uint8_t iVelocity = this->datathis->iPlayPointer++; // release velocity
+				this->cmfNoteOff(iChannel, iNote, iVelocity);
+				break;
+			}
+			case 0x90: { // Note on (two data bytes)
+				uint8_t iNote = this->datathis->iPlayPointer++;
+				uint8_t iVelocity = this->datathis->iPlayPointer++; // attack velocity
+				if (iVelocity) {
+					if (iNotePlayingiChannel == iNote)
+					{	// Note duplicated, turn it off
+						iVelocity = 0;
+						// Fix this on next Note Off event
+						bNoteFixiChannel = true;
+					}
+				}
+				else {
+					if (bNoteFixiChannel)
+					{	// Turn on this note again
+						iVelocity = 127;
+						// Fix not needed anymore
+						bNoteFixiChannel = false;
+					}
+				}
+				// Store last played note
+				iNotePlayingiChannel = (iVelocity ? iNote : 255);
+				if (iVelocity) {
+					this->cmfNoteOn(iChannel, iNote, iVelocity);
+				} else {
+					// This is a note-off instead (velocity == 0)
+					this->cmfNoteOff(iChannel, iNote, iVelocity); // 64 is the MIDI default note-off velocity
+					break;
+				}
+				break;
+			}
+			case 0xA0: { // Polyphonic key pressure (two data bytes)
+				uint8_t iNote = this->datathis->iPlayPointer++;
+				uint8_t iPressure = this->datathis->iPlayPointer++;
+				AdPlug_LogWrite("CMF: Key pressure not yet implemented! (wanted ch%d/note %d set to %d)\n", iChannel, iNote, iPressure);
+				break;
+			}
+			case 0xB0: { // Controller (two data bytes)
+				uint8_t iController = this->datathis->iPlayPointer++;
+				uint8_t iValue = this->datathis->iPlayPointer++;
+				this->MIDIcontroller(iChannel, iController, iValue);
+				break;
+			}
+			case 0xC0: { // Instrument change (one data byte)
+				uint8_t iNewInstrument = this->datathis->iPlayPointer++;
+				this->chMIDIiChannel.iPatch = iNewInstrument;
+				AdPlug_LogWrite("CMF: Remembering MIDI channel %d now uses patch %d\n", iChannel, iNewInstrument);
+				break;
+			}
+			case 0xD0: { // Channel pressure (one data byte)
+				uint8_t iPressure = this->datathis->iPlayPointer++;
+				AdPlug_LogWrite("CMF: Channel pressure not yet implemented! (wanted ch%d set to %d)\n", iChannel, iPressure);
+				break;
+			}
+			case 0xE0: { // Pitch bend (two data bytes)
+				uint8_t iLSB = this->datathis->iPlayPointer++;
+				uint8_t iMSB = this->datathis->iPlayPointer++;
+				uint16_t iValue = (iMSB << 7) | iLSB;
+				// 8192 is middle/off, 0 is -2 semitones, 16384 is +2 semitones
+				this->chMIDIiChannel.iPitchbend = iValue;
+				this->cmfNoteUpdate(iChannel);
+				AdPlug_LogWrite("CMF: Channel %d pitchbent to %d (%+.2f)\n", iChannel + 1, iValue, (float)(iValue - 8192) / 8192);
+				break;
+			}
+			case 0xF0: // System message (arbitrary data bytes)
+				switch (iCommand) {
+					case 0xF0: { // Sysex
+						uint8_t iNextByte;
+						AdPlug_LogWrite("Sysex message: ");
+						do {
+							iNextByte = this->datathis->iPlayPointer++;
+							AdPlug_LogWrite("%02X", iNextByte);
+						} while ((iNextByte & 0x80) == 0);
+						AdPlug_LogWrite("\n");
+						// This will have read in the terminating EOX (0xF7) message too
+						break;
+					}
+					case 0xF1: // MIDI Time Code Quarter Frame
+						this->datathis->iPlayPointer++; // message data (ignored)
+						break;
+					case 0xF2: // Song position pointer
+						this->datathis->iPlayPointer++; // message data (ignored)
+						this->datathis->iPlayPointer++;
+						break;
+					case 0xF3: // Song select
+						this->datathis->iPlayPointer++; // message data (ignored)
+						AdPlug_LogWrite("CMF: MIDI Song Select is not implemented.\n");
+						break;
+					case 0xF6: // Tune request
+						break;
+					case 0xF7: // End of System Exclusive (EOX) - should never be read, should be absorbed by Sysex handling code
+						break;
+
+					// These messages are "real time", meaning they can be sent between
+					// the bytes of other messages - but we're lazy and don't handle these
+					// here (hopefully they're not necessary in a MIDI file, and even less
+					// likely to occur in a CMF.)
+					case 0xF8: // Timing clock (sent 24 times per quarter note, only when playing)
+					case 0xFA: // Start
+					case 0xFB: // Continue
+					case 0xFE: // Active sensing (sent every 300ms or MIDI connection assumed lost)
+						break;
+					case 0xFC: // Stop
+						AdPlug_LogWrite("CMF: Received Real Time Stop message (0xFC)\n");
+						this->bSongEnd = true;
+						this->iPlayPointer = 0; // for repeat in endless-play mode
+						break;
+					case 0xFF: { // System reset, used as meta-events in a MIDI file
+						uint8_t iEvent = this->datathis->iPlayPointer++;
+						switch (iEvent) {
+							case 0x2F: // end of track
+								AdPlug_LogWrite("CMF: End-of-track, stopping playback\n");
+								this->bSongEnd = true;
+								this->iPlayPointer = 0; // for repeat in endless-play mode
+								break;
+							default:
+								AdPlug_LogWrite("CMF: Unknown MIDI meta-event 0xFF 0x%02X\n", iEvent);
+								break;
+						}
+						break;
+					}
+					default:
+						AdPlug_LogWrite("CMF: Unknown MIDI system command 0x%02X\n", iCommand);
+						break;
+				}
+				break;
+			default:
+				AdPlug_LogWrite("CMF: Unknown MIDI command 0x%02X\n", iCommand);
+				break;
+		}
+
+		if (this->iPlayPointer >= this->iSongLen) {
+			this->bSongEnd = true;
+			this->iPlayPointer = 0; // for repeat in endless-play mode
+		}
+
+		// Read in the number of ticks until the next event
+		this->iDelayRemaining = this->readMIDINumber();
+	}
+
+	return !this->bSongEnd;
+}
+
+void CcmfPlayer::rewind(int subsong)
+{
+ this->opl->init();
+
+	// Initialise
+
+ // Enable use of WaveSel register on OPL3 (even though we're only an OPL2!)
+ // Apparently this enables nine-channel mode?
+	this->writeOPL(0x01, 0x20);
+
+	// Disable OPL3 mode (can be left enabled by a previous non-CMF song)
+	this->writeOPL(0x05, 0x00);
+
+	// Really make sure CSM+SEL are off (again, Creative's player...)
+	this->writeOPL(0x08, 0x00);
+
+	// This freq setting is required for the hihat to sound correct at the start
+	// of funky.cmf, even though it's for an unrelated channel.
+	// If it's here however, it makes the hihat in Word Rescue's theme.cmf
+	// sound really bad.
+	// TODO: How do we figure out whether we need it or not???
+	this->writeOPL(BASE_FNUM_L + 8, 514 & 0xFF);
+	this->writeOPL(BASE_KEYON_FREQ + 8, (1 << 2) | (514 >> 8));
+
+	// default freqs?
+	this->writeOPL(BASE_FNUM_L + 7, 509 & 0xFF);
+	this->writeOPL(BASE_KEYON_FREQ + 7, (2 << 2) | (509 >> 8));
+	this->writeOPL(BASE_FNUM_L + 6, 432 & 0xFF);
+	this->writeOPL(BASE_KEYON_FREQ + 6, (2 << 2) | (432 >> 8));
+
+	// Amplify AM + VIB depth. Creative's CMF player does this, and there
+	// doesn't seem to be any way to stop it from doing so - except for the
+	// non-standard controller 0x63 I added :-)
+	this->writeOPL(0xBD, 0xC0);
+
+	this->bSongEnd = false;
+	this->iPlayPointer = 0;
+	this->iPrevCommand = 0; // just in case
+	this->iNoteCount = 0;
+
+	// Read in the number of ticks until the first event
+	this->iDelayRemaining = this->readMIDINumber();
+
+ // Reset song state. This used to be in the constructor, but the XMMS2
+ // plugin sets the song length before starting playback. AdPlug plays the
+ // song in its entirety (with no synth) to determine the song length, which
+ // results in the state variables below matching the end of the song. When
+ // the real OPL synth is activated for playback, it no longer matches the
+ // state variables and the instruments are not set correctly!
+	for (int i = 0; i < 9; i++) {
+		this->chOPLi.iNoteStart = 0; // no note playing atm
+		this->chOPLi.iMIDINote = -1;
+		this->chOPLi.iMIDIChannel = -1;
+		this->chOPLi.iMIDIPatch = -1;
+
+		this->chMIDIi.iPatch = -2;
+		this->chMIDIi.iPitchbend = 8192;
+		this->chMIDIi.iTranspose = 0;
+	}
+	for (int i = 9; i < 16; i++) {
+		this->chMIDIi.iPatch = -2;
+		this->chMIDIi.iPitchbend = 8192;
+		this->chMIDIi.iTranspose = 0;
+	}
+
+	memset(this->iCurrentRegs, 0, 256);
+	memset(this->iNotePlaying, 255, sizeof(iNotePlaying));
+	memset(this->bNoteFix, false, sizeof(bNoteFix));
+
+	return;
+}
+
+// Return value: 1 == 1 second, 2 == 0.5 seconds
+float CcmfPlayer::getrefresh()
+{
+	if (this->iDelayRemaining) {
+		return (float)this->cmfHeader.iTicksPerSecond / (float)this->iDelayRemaining;
+	} else {
+		// Delay-remaining is zero (e.g. start of song) so use a tiny delay
+		return this->cmfHeader.iTicksPerSecond; // wait for one tick
+	}
+}
+
+std::string CcmfPlayer::gettitle()
+{
+	return this->strTitle;
+}
+std::string CcmfPlayer::getauthor()
+{
+	return this->strComposer;
+}
+std::string CcmfPlayer::getdesc()
+{
+	return this->strRemarks;
+}
+
+
+//
+// PROTECTED
+//
+
+// Read a variable-length integer from MIDI data
+uint32_t CcmfPlayer::readMIDINumber()
+{
+	uint32_t iValue = 0;
+	for (int i = 0; i < 4; i++) {
+		uint8_t iNext = this->datathis->iPlayPointer++;
+		iValue <<= 7;
+		iValue |= (iNext & 0x7F); // ignore the MSB
+		if ((iNext & 0x80) == 0) break; // last byte has the MSB unset
+	}
+	return iValue;
+}
+
+// iChannel: OPL channel (0-8)
+// iOperator: 0 == Modulator, 1 == Carrier
+// Source - source operator to read from instrument definition
+// Dest - destination operator on OPL chip
+// iInstrument: Index into this->pInstruments array of CMF instruments
+void CcmfPlayer::writeInstrumentSettings(uint8_t iChannel, uint8_t iOperatorSource, uint8_t iOperatorDest, uint8_t iInstrument)
+{
+	assert(iChannel <= 8);
+
+	uint8_t iOPLOffset = OPLOFFSET(iChannel);
+	if (iOperatorDest) iOPLOffset += 3; // Carrier if iOperator == 1 (else Modulator)
+
+	this->writeOPL(BASE_CHAR_MULT + iOPLOffset, this->pInstrumentsiInstrument.opiOperatorSource.iCharMult);
+	this->writeOPL(BASE_SCAL_LEVL + iOPLOffset, this->pInstrumentsiInstrument.opiOperatorSource.iScalingOutput);
+	this->writeOPL(BASE_ATCK_DCAY + iOPLOffset, this->pInstrumentsiInstrument.opiOperatorSource.iAttackDecay);
+	this->writeOPL(BASE_SUST_RLSE + iOPLOffset, this->pInstrumentsiInstrument.opiOperatorSource.iSustainRelease);
+	this->writeOPL(BASE_WAVE + iOPLOffset, this->pInstrumentsiInstrument.opiOperatorSource.iWaveSel);
+
+	// TODO: Check to see whether we should only be loading this for one or both operators
+	this->writeOPL(BASE_FEED_CONN + iChannel, this->pInstrumentsiInstrument.iConnection);
+	return;
+}
+
+// Write a byte to the OPL "chip" and update the current record of register states
+void CcmfPlayer::writeOPL(uint8_t iRegister, uint8_t iValue)
+{
+	this->opl->write(iRegister, iValue);
+	this->iCurrentRegsiRegister = iValue;
+	return;
+}
+
+void CcmfPlayer::getFreq(uint8_t iChannel, uint8_t iNote, uint8_t * iBlock, uint16_t * iOPLFNum)
+{
+	*iBlock = iNote / 12;
+	if (*iBlock > 1) (*iBlock)--; // keep in the same range as the Creative player
+	//if (*iBlock > 7) *iBlock = 7; // don't want to go out of range
+
+	double d = pow(2, (
+		(double)iNote + (
+			(this->chMIDIiChannel.iPitchbend - 8192) / 8192.0
+		) + (
+			this->chMIDIiChannel.iTranspose / 256.0
+		) - 9) / 12.0 - (*iBlock - 20))
+		* 440.0 / 32.0 / 50000.0;
+	*iOPLFNum = (uint16_t)(d+0.5);
+}
+
+void CcmfPlayer::cmfNoteOn(uint8_t iChannel, uint8_t iNote, uint8_t iVelocity)
+{
+	uint8_t iBlock = 0;
+	uint16_t iOPLFNum = 0;
+	getFreq(iChannel, iNote, &iBlock, &iOPLFNum);
+	if (iOPLFNum > 1023) AdPlug_LogWrite("CMF: This note is out of range! (send this song to malvineous@shikadi.net!)\n");
+
+	// See if we're playing a rhythm mode percussive instrument
+	if ((iChannel > 10) && (this->bPercussive)) {
+		uint8_t iPercChannel = this->getPercChannel(iChannel);
+
+		// Will have to set every time (easier) than figuring out whether the mod
+		// or car needs to be changed.
+		//if (this->chOPLiPercChannel.iMIDIPatch != this->chMIDIiChannel.iPatch) {
+			this->MIDIchangeInstrument(iPercChannel, iChannel, this->chMIDIiChannel.iPatch);
+		//}
+
+		/* Velocity calculations - TODO: Work out the proper formula
+
+		iVelocity -> iLevel (values generated by Creative's player)
+		7f -> 00
+		7c -> 00
+
+		7b -> 09
+		73 -> 0a
+		6b -> 0b
+		63 -> 0c
+		5b -> 0d
+		53 -> 0e
+		4b -> 0f
+		43 -> 10
+		3b -> 11
+		33 -> 13
+		2b -> 15
+		23 -> 19
+		1b -> 1b
+		13 -> 1d
+		0b -> 1f
+		03 -> 21
+
+		02 -> 21
+		00 -> N/A (note off)
+		*/
+		// Approximate formula, need to figure out more accurate one (my maths isn't so good...)
+		int iLevel = 0x25 - sqrt(iVelocity * 16/*6*/);//(127 - iVelocity) * 0x20 / 127;
+		if (iVelocity > 0x7b) iLevel = 0; // full volume
+		if (iLevel < 0) iLevel = 0;
+		if (iLevel > 0x3F) iLevel = 0x3F;
+		//if (iVelocity < 0x40) iLevel = 0x10;
+
+		int iOPLOffset = BASE_SCAL_LEVL + OPLOFFSET(iPercChannel);
+		//if ((iChannel == 11) || (iChannel == 12) || (iChannel == 14)) {
+		if (iChannel == 11) iOPLOffset += 3; // only do bassdrum carrier for volume control
+		//iOPLOffset += 3; // carrier
+		this->writeOPL(iOPLOffset, (this->iCurrentRegsiOPLOffset & ~0x3F) | iLevel);//(iVelocity * 0x3F / 127));
+		//}
+		// Bass drum (ch11) uses both operators
+		//if (iChannel == 11) this->writeOPL(iOPLOffset + 3, (this->iCurrentRegsiOPLOffset + 3 & ~0x3F) | iLevel);
+
+/*		#ifdef USE_VELOCITY // Official CMF player seems to ignore velocity levels
+			uint16_t iLevel = 0x2F - (iVelocity * 0x2F / 127); // 0x2F should be 0x3F but it's too quiet then
+			AdPlug_LogWrite("%02X + vel %d (lev %02X) == %02X\n", this->iCurrentRegsiOPLOffset, iVelocity, iLevel, (this->iCurrentRegsiOPLOffset & ~0x3F) | iLevel);
+			//this->writeOPL(iOPLOffset, (this->iCurrentRegsiOPLOffset & ~0x3F) | (0x3F - (iVelocity >> 1)));//(iVelocity * 0x3F / 127));
+			this->writeOPL(iOPLOffset, (this->iCurrentRegsiOPLOffset & ~0x3F) | iLevel);//(iVelocity * 0x3F / 127));
+		#endif*/
+
+		// Apparently you can't set the frequency for the cymbal or hihat?
+		// Vinyl requires you don't set it, Kiloblaster requires you do!
+		this->writeOPL(BASE_FNUM_L + iPercChannel, iOPLFNum & 0xFF);
+		this->writeOPL(BASE_KEYON_FREQ + iPercChannel, (iBlock << 2) | ((iOPLFNum >> 8) & 0x03));
+
+		uint8_t iBit = 1 << (15 - iChannel);
+
+		// Turn the perc instrument off if it's already playing (OPL can't do
+		// polyphonic notes w/ percussion)
+		if (this->iCurrentRegsBASE_RHYTHM & iBit) this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM & ~iBit);
+
+		// I wonder whether we need to delay or anything here?
+
+		// Turn the note on
+		//if (iChannel == 15) {
+		this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM | iBit);
+		//AdPlug_LogWrite("CMF: Note %d on MIDI channel %d (mapped to OPL channel %d-1) - vel %02X, fnum %d/%d\n", iNote, iChannel, iPercChannel+1, iVelocity, iOPLFNum, iBlock);
+		//}
+
+		this->chOPLiPercChannel.iNoteStart = ++this->iNoteCount;
+		this->chOPLiPercChannel.iMIDIChannel = iChannel;
+		this->chOPLiPercChannel.iMIDINote = iNote;
+
+	} else { // Non rhythm-mode or a normal instrument channel
+
+		// Figure out which OPL channel to play this note on
+		int iOPLChannel = -1;
+		int iNumChannels = this->bPercussive ? 6 : 9;
+		for (int i = iNumChannels - 1; i >= 0; i--) {
+			// If there's no note playing on this OPL channel, use that
+			if (this->chOPLi.iNoteStart == 0) {
+				iOPLChannel = i;
+				// See if this channel is already set to the instrument we want.
+				if (this->chOPLi.iMIDIPatch == this->chMIDIiChannel.iPatch) {
+					// It is, so stop searching
+					break;
+				} // else keep searching just in case there's a better match
+			}
+		}
+		if (iOPLChannel == -1) {
+			// All channels were in use, find the one with the longest note
+			iOPLChannel = 0;
+			int iEarliest = this->chOPL0.iNoteStart;
+			for (int i = 1; i < iNumChannels; i++) {
+				if (this->chOPLi.iNoteStart < iEarliest) {
+					// Found a channel with a note being played for longer
+					iOPLChannel = i;
+					iEarliest = this->chOPLi.iNoteStart;
+				}
+			}
+			AdPlug_LogWrite("CMF: Too many polyphonic notes, cutting note on channel %d\n", iOPLChannel);
+		}
+
+		// Run through all the channels with negative notestart values - these
+		// channels have had notes recently stop - and increment the counter
+		// to slowly move the channel closer to being reused for a future note.
+		//for (int i = 0; i < iNumChannels; i++) {
+		//	if (this->chOPLi.iNoteStart < 0) this->chOPLi.iNoteStart++;
+		//}
+
+		// Now the new note should be played on iOPLChannel, but see if the instrument
+		// is right first.
+		if (this->chOPLiOPLChannel.iMIDIPatch != this->chMIDIiChannel.iPatch) {
+			this->MIDIchangeInstrument(iOPLChannel, iChannel, this->chMIDIiChannel.iPatch);
+		}
+
+		this->chOPLiOPLChannel.iNoteStart = ++this->iNoteCount;
+		this->chOPLiOPLChannel.iMIDIChannel = iChannel;
+		this->chOPLiOPLChannel.iMIDINote = iNote;
+
+		#ifdef USE_VELOCITY // Official CMF player seems to ignore velocity levels
+			// Adjust the channel volume to match the note velocity
+			uint8_t iOPLOffset = BASE_SCAL_LEVL + OPLOFFSET(iChannel) + 3; // +3 == Carrier
+			uint16_t iLevel = 0x2F - (iVelocity * 0x2F / 127); // 0x2F should be 0x3F but it's too quiet then
+			this->writeOPL(iOPLOffset, (this->iCurrentRegsiOPLOffset & ~0x3F) | iLevel);
+		#endif
+
+		// Set the frequency and play the note
+		this->writeOPL(BASE_FNUM_L + iOPLChannel, iOPLFNum & 0xFF);
+		this->writeOPL(BASE_KEYON_FREQ + iOPLChannel, OPLBIT_KEYON | (iBlock << 2) | ((iOPLFNum & 0x300) >> 8));
+	}
+	return;
+}
+
+void CcmfPlayer::cmfNoteOff(uint8_t iChannel, uint8_t iNote, uint8_t iVelocity)
+{
+	if ((iChannel > 10) && (this->bPercussive)) {
+		int iOPLChannel = this->getPercChannel(iChannel);
+		if (this->chOPLiOPLChannel.iMIDINote != iNote) return; // there's a different note playing now
+		this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM & ~(1 << (15 - iChannel)));
+		this->chOPLiOPLChannel.iNoteStart = 0; // channel free
+	} else { // Non rhythm-mode or a normal instrument channel
+		int iOPLChannel = -1;
+		int iNumChannels = this->bPercussive ? 6 : 9;
+		for (int i = 0; i < iNumChannels; i++) {
+			if (
+				(this->chOPLi.iMIDIChannel == iChannel) &&
+				(this->chOPLi.iMIDINote == iNote) &&
+				(this->chOPLi.iNoteStart != 0)
+			) {
+				// Found the note, switch it off
+				this->chOPLi.iNoteStart = 0;
+				iOPLChannel = i;
+				break;
+			}
+		}
+		if (iOPLChannel == -1) return;
+
+		this->writeOPL(BASE_KEYON_FREQ + iOPLChannel, this->iCurrentRegsBASE_KEYON_FREQ + iOPLChannel & ~OPLBIT_KEYON);
+	}
+	return;
+}
+
+void CcmfPlayer::cmfNoteUpdate(uint8_t iChannel)
+{
+	uint8_t iBlock = 0;
+	uint16_t iOPLFNum = 0;
+
+	// See if we're playing a rhythm mode percussive instrument
+	if ((iChannel > 10) && (this->bPercussive)) {
+		uint8_t iPercChannel = this->getPercChannel(iChannel);
+		getFreq(iChannel, this->chOPLiPercChannel.iMIDINote, &iBlock, &iOPLFNum);
+
+		// Update note frequency
+		this->writeOPL(BASE_FNUM_L + iPercChannel, iOPLFNum & 0xFF);
+		this->writeOPL(BASE_KEYON_FREQ + iPercChannel, (iBlock << 2) | ((iOPLFNum >> 8) & 0x03));
+
+	} else { // Non rhythm-mode or a normal instrument channel
+
+		// Figure out which OPL channels should be updated
+		int iNumChannels = this->bPercussive ? 6 : 9;
+		for (int i = 0; i < iNumChannels; i++) {
+			// Needed channel and note is playing
+			if (this->chOPLi.iMIDIChannel == iChannel && this->chOPLi.iNoteStart > 0) {
+				// Update note frequency
+				getFreq(iChannel, this->chOPLi.iMIDINote, &iBlock, &iOPLFNum);
+				this->writeOPL(BASE_FNUM_L + i, iOPLFNum & 0xFF);
+				this->writeOPL(BASE_KEYON_FREQ + i, OPLBIT_KEYON | (iBlock << 2) | ((iOPLFNum & 0x300) >> 8));
+			}
+		}
+	}
+	return;
+}
+
+uint8_t CcmfPlayer::getPercChannel(uint8_t iChannel)
+{
+	switch (iChannel) {
+		case 11: return 7-1; // Bass drum
+		case 12: return 8-1; // Snare drum
+		case 13: return 9-1; // Tom tom
+		case 14: return 9-1; // Top cymbal
+		case 15: return 8-1; // Hihat
+	}
+	AdPlug_LogWrite("CMF ERR: Tried to get the percussion channel from MIDI channel %d - this shouldn't happen!\n", iChannel);
+	return 0;
+}
+
+
+void CcmfPlayer::MIDIchangeInstrument(uint8_t iOPLChannel, uint8_t iMIDIChannel, uint8_t iNewInstrument)
+{
+	if ((iMIDIChannel > 10) && (this->bPercussive)) {
+		switch (iMIDIChannel) {
+			case 11: // Bass drum (operator 13+16 == channel 7 modulator+carrier)
+				this->writeInstrumentSettings(7-1, 0, 0, iNewInstrument);
+				this->writeInstrumentSettings(7-1, 1, 1, iNewInstrument);
+				break;
+			case 12: // Snare drum (operator 17 == channel 8 carrier)
+			//case 15:
+				this->writeInstrumentSettings(8-1, 0, 1, iNewInstrument);
+
+				//
+				//this->writeInstrumentSettings(8-1, 0, 0, iNewInstrument);
+				break;
+			case 13: // Tom tom (operator 15 == channel 9 modulator)
+			//case 14:
+				this->writeInstrumentSettings(9-1, 0, 0, iNewInstrument);
+
+				//
+				//this->writeInstrumentSettings(9-1, 0, 1, iNewInstrument);
+				break;
+			case 14: // Top cymbal (operator 18 == channel 9 carrier)
+				this->writeInstrumentSettings(9-1, 0, 1, iNewInstrument);
+				break;
+			case 15: // Hi-hat (operator 14 == channel 8 modulator)
+				this->writeInstrumentSettings(8-1, 0, 0, iNewInstrument);
+				break;
+			default:
+				AdPlug_LogWrite("CMF: Invalid MIDI channel %d (not melodic and not percussive!)\n", iMIDIChannel + 1);
+				break;
+		}
+		this->chOPLiOPLChannel.iMIDIPatch = iNewInstrument;
+	} else {
+		// Standard nine OPL channels
+		this->writeInstrumentSettings(iOPLChannel, 0, 0, iNewInstrument);
+		this->writeInstrumentSettings(iOPLChannel, 1, 1, iNewInstrument);
+		this->chOPLiOPLChannel.iMIDIPatch = iNewInstrument;
+	}
+	return;
+}
+
+void CcmfPlayer::MIDIcontroller(uint8_t iChannel, uint8_t iController, uint8_t iValue)
+{
+	switch (iController) {
+		case 0x63:
+			// Custom extension to allow CMF files to switch the AM+VIB depth on and
+			// off (officially both are on, and there's no way to switch them off.)
+			// Controller values:
+			// 0 == AM+VIB off
+			// 1 == VIB on
+			// 2 == AM on
+			// 3 == AM+VIB on
+			if (iValue) {
+				this->writeOPL(BASE_RHYTHM, (this->iCurrentRegsBASE_RHYTHM & ~0xC0) | (iValue << 6)); // switch AM+VIB extension on
+			} else {
+				this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM & ~0xC0); // switch AM+VIB extension off
+			}
+			AdPlug_LogWrite("CMF: AM+VIB depth change - AM %s, VIB %s\n",
+				(this->iCurrentRegsBASE_RHYTHM & 0x80) ? "on" : "off",
+				(this->iCurrentRegsBASE_RHYTHM & 0x40) ? "on" : "off");
+			break;
+		case 0x66:
+			AdPlug_LogWrite("CMF: Song set marker to 0x%02X\n", iValue);
+			break;
+		case 0x67:
+			this->bPercussive = (iValue != 0);
+			if (this->bPercussive) {
+				this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM | 0x20); // switch rhythm-mode on
+			} else {
+				this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM & ~0x20); // switch rhythm-mode off
+			}
+			AdPlug_LogWrite("CMF: Percussive/rhythm mode %s\n", this->bPercussive ? "enabled" : "disabled");
+			break;
+		case 0x68:
+			this->chMIDIiChannel.iTranspose = iValue;
+			this->cmfNoteUpdate(iChannel);
+			AdPlug_LogWrite("CMF: Transposing all notes up by %d * 1/128ths of a semitone on channel %d.\n", iValue, iChannel + 1);
+			break;
+		case 0x69:
+			this->chMIDIiChannel.iTranspose = -iValue;
+			this->cmfNoteUpdate(iChannel);
+			AdPlug_LogWrite("CMF: Transposing all notes down by %d * 1/128ths of a semitone on channel %d.\n", iValue, iChannel + 1);
+			break;
+		default:
+			AdPlug_LogWrite("CMF: Unsupported MIDI controller 0x%02X, ignoring.\n", iController);
+			break;
+	}
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/cmf.h Added

@@ -0,0 +1,116 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2009 Simon Peter, <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * cmf.h - CMF player by Adam Nielsen <malvineous@shikadi.net>
+ */
+
+#include <stdint.h> // for uintxx_t
+#include "player.h"
+
+typedef struct {
+	uint16_t iInstrumentBlockOffset;
+	uint16_t iMusicOffset;
+	uint16_t iTicksPerQuarterNote;
+	uint16_t iTicksPerSecond;
+	uint16_t iTagOffsetTitle;
+	uint16_t iTagOffsetComposer;
+	uint16_t iTagOffsetRemarks;
+	uint8_t iChannelsInUse16;
+	uint16_t iNumInstruments;
+	uint16_t iTempo;
+} CMFHEADER;
+
+typedef struct {
+	uint8_t iCharMult;
+	uint8_t iScalingOutput;
+	uint8_t iAttackDecay;
+	uint8_t iSustainRelease;
+	uint8_t iWaveSel;
+} OPERATOR;
+
+typedef struct {
+	OPERATOR op2; // 0 == modulator, 1 == carrier
+	uint8_t iConnection;
+} SBI;
+
+typedef struct {
+	int iPatch; // MIDI patch for this channel
+	int iPitchbend; // Current pitchbend amount for this channel
+	int iTranspose; // Transpose amount for this channel (between -128 and +128)
+} MIDICHANNEL;
+
+typedef struct {
+	int iNoteStart; // When the note started playing (longest notes get cut first, 0 == channel free)
+	int iMIDINote; // MIDI note number currently being played on this OPL channel
+	int iMIDIChannel; // Source MIDI channel where this note came from
+	int iMIDIPatch; // Current MIDI patch set on this OPL channel
+} OPLCHANNEL;
+
+class CcmfPlayer: public CPlayer
+{
+	private:
+		uint8_t *data; // song data (CMF music block)
+		int iPlayPointer;		// Current location of playback pointer
+		int iSongLen; // Max value for iPlayPointer
+		CMFHEADER cmfHeader;
+		SBI *pInstruments;
+		bool bPercussive; // are rhythm-mode instruments enabled?
+		uint8_t iCurrentRegs256; // Current values in the OPL chip
+		uint8_t iPrevCommand; // Previous command (used for repeated MIDI commands, as the seek and playback code need to share this)
+		uint8_t iNotePlaying16; // Last note turned on, used for duplicate note check
+		bool bNoteFix16; // Fix duplicated Note On / Note Off
+
+		int iNoteCount; // Used to count how long notes have been playing for
+		MIDICHANNEL chMIDI16;
+		OPLCHANNEL chOPL9;
+
+		// Additions for AdPlug's design
+		int iDelayRemaining;
+		bool bSongEnd;
+		std::string strTitle, strComposer, strRemarks;
+
+	public:
+		static CPlayer *factory(Copl *newopl);
+
+		CcmfPlayer(Copl *newopl);
+		~CcmfPlayer();
+
+		bool load(const std::string &filename, const CFileProvider &fp);
+		bool update();
+		void rewind(int subsong);
+		float getrefresh();
+
+		std::string gettype()
+			{ return std::string("Creative Music File (CMF)"); };
+		std::string gettitle();
+		std::string getauthor();
+		std::string getdesc();
+
+	protected:
+		uint32_t readMIDINumber();
+		void writeInstrumentSettings(uint8_t iChannel, uint8_t iOperatorSource, uint8_t iOperatorDest, uint8_t iInstrument);
+		void writeOPL(uint8_t iRegister, uint8_t iValue);
+		void getFreq(uint8_t iChannel, uint8_t iNote, uint8_t * iBlock, uint16_t * iOPLFNum);
+		void cmfNoteOn(uint8_t iChannel, uint8_t iNote, uint8_t iVelocity);
+		void cmfNoteOff(uint8_t iChannel, uint8_t iNote, uint8_t iVelocity);
+		void cmfNoteUpdate(uint8_t iChannel);
+		uint8_t getPercChannel(uint8_t iChannel);
+		void MIDIchangeInstrument(uint8_t iOPLChannel, uint8_t iMIDIChannel, uint8_t iNewInstrument);
+		void MIDIcontroller(uint8_t iChannel, uint8_t iController, uint8_t iValue);
+
+};

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/cmfmcsop.cpp Added

@@ -0,0 +1,525 @@
+/*
+ * SoundFX Macs Opera CMF Player -- Copyright (c) 2017 Sebastian Kienzl <seb@knzl.de>
+ *
+ * Part of Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+ * Most songs in this format use rhythm mode.
+ * The emus don't support rhythm mode too well, "nuked" seems good.
+ * I didn't verify with real hardware, so I don't know how it's supposed to sound.
+ */
+
+#include <string.h>
+#include <stddef.h>
+#include "cmfmcsop.h"
+#include "debug.h"
+
+CPlayer* CcmfmacsoperaPlayer::factory(Copl* newopl)
+{
+	return new CcmfmacsoperaPlayer(newopl);
+}
+
+static const int16_t fNumbers = { 0x157, 0x16b, 0x181, 0x198, 0x1b0, 0x1ca, 0x1e5, 0x202, 0x221, 0x242, 0x264, 0x288 };
+
+// Register offset for slot, e.g. 0x20 + slotRegisterOffsetsslotNr
+static const int8_t slotRegisterOffsets = {
+	0, 1, 2, 3, 4, 5,
+	8, 9, 10, 11, 12, 13,
+	16, 17, 18, 19, 20, 21
+};
+
+/*
+Channel Slot
+ Op1 Op2
+===================
+ 0 0 3
+ 1 1 4
+ 2 2 5
+ 3 6 9
+ 4 7 10
+ 5 8 11
+ 6 12 15
+ 7 13 16
+ 8 14 17
+
+ Rhythm Mode
+-------------------
+ BD 12 15 <- like Channel 6 in "melody mode"
+ SD 16
+ TOM 14
+ TC 17
+ HH 13
+*/
+
+// Slots for Op1/Op2 for channel
+static const struct {
+	int8_t slotOp1;
+	int8_t slotOp2;
+}
+channelSlots = { {0, 3}, {1, 4}, {2, 5}, {6, 9}, {7, 10}, {8, 11}, {12, 15}, {13, 16}, {14, 17}};
+
+/*
+Note that
+ op_tablechan == slotRegisterOffetschannelSlotschan.slotOp1
+ op_tablechan + 3 == slotRegisterOffetschannelSlotschan.slotOp2
+However, the slot-numbers are needed for rhythm mode, thus the extra tables.
+*/
+
+// Rhythm mode mapping: Which slots for which channel (note that the BD uses 12/15 like in melody mode)
+static const int8_t channelSlotsRhythm = { -1, -1, -1, -1, -1, -1, 12, 16, 14, 17, 13};
+
+enum {
+	CHANNEL_RHY_BD = 6,
+	CHANNEL_RHY_SN = 7,
+	CHANNEL_RHY_TOM = 8,
+	CHANNEL_RHY_TC = 9,
+	CHANNEL_RHY_HH = 10
+};
+
+CcmfmacsoperaPlayer::CcmfmacsoperaPlayer(Copl* newopl): CPlayer(newopl)
+{
+}
+
+std::string CcmfmacsoperaPlayer::gettype() { return std::string("SoundFX Macs Opera CMF"); }
+
+// helper class to close a binistream when leaving context
+class binistream_closer {
+public:
+	binistream_closer(const CFileProvider& fp, binistream* strm): fp(fp), strm(strm) {}
+	~binistream_closer() { if(strm) fp.close(strm); }
+	const CFileProvider& fp;
+	binistream* strm;
+};
+
+bool CcmfmacsoperaPlayer::load(const std::string& filename, const CFileProvider& fp)
+{
+	if (!fp.extension(filename, ".cmf"))
+		return false;
+	
+	binistream* f = fp.open(filename);
+	if (!f)
+		return false;
+
+	binistream_closer _closer(fp, f);
+	
+	std::string signature = f->readString();
+	if (signature != "A.H.")
+		return false;
+
+	// the pattern order is 99 shorts
+	nrOfOrders = -1;
+	for (int i = 0; i < 99; ++i) {
+		patternOrderi = f->readInt(2);
+		// count number of orders, only assign once
+		if (patternOrderi == 99 && nrOfOrders < 0)
+			nrOfOrders = i;
+	}
+
+	if (nrOfOrders == -1) // no end of song marker found, assume 99
+		nrOfOrders = 99;
+
+	nrOfPatterns = f->readInt(2);
+	
+	int speed = f->readInt(2);
+	if (speed < 1 || speed > 3)
+		return false;
+	
+	// 1 => 18 rows/s, 2 => 9 rows/s, 3 => 4.5 rows/s
+	// (With 18.2 the speed matches the speed with DOSBox, otherwise it's ~2 BPM too slow)
+	speedRowsPerSec = 18.2f / (1 << (speed - 1));
+
+	rhythmMode = f->readInt(2) == 1;
+	int nrOfInstruments = f->readInt(2);
+	
+	if (!loadInstruments(f, nrOfInstruments))
+		return false;
+	
+	if (!loadPatterns(f))
+		return false;
+	
+	rewind(0);
+	
+	return true;
+}
+
+bool CcmfmacsoperaPlayer::loadInstruments(binistream* f, int nrOfInstruments)
+{
+	if (nrOfInstruments > 0xff)
+		return false;
+
+	instruments.resize(nrOfInstruments);
+
+	static const intptr_t loadOffsets = {
+		offsetof(Instrument, op0.ksl),
+		offsetof(Instrument, op0.multiple),
+		offsetof(Instrument, feedback),
+		offsetof(Instrument, op0.attackRate),
+		offsetof(Instrument, op0.sustainLevel),
+		offsetof(Instrument, op0.egType),
+		offsetof(Instrument, op0.decayRate),
+		offsetof(Instrument, op0.releaseRate),
+		offsetof(Instrument, op0.totalLevel),
+		offsetof(Instrument, op0.ampMod),
+		offsetof(Instrument, op0.vib),
+		offsetof(Instrument, op0.ksr),
+		offsetof(Instrument, connection),
+
+		offsetof(Instrument, op1.ksl),
+		offsetof(Instrument, op1.multiple),
+		-1,
+		offsetof(Instrument, op1.attackRate),
+		offsetof(Instrument, op1.sustainLevel),
+		offsetof(Instrument, op1.egType),
+		offsetof(Instrument, op1.decayRate),
+		offsetof(Instrument, op1.releaseRate),
+		offsetof(Instrument, op1.totalLevel),
+		offsetof(Instrument, op1.ampMod),
+		offsetof(Instrument, op1.vib),
+		offsetof(Instrument, op1.ksr),
+		-1,
+		offsetof(Instrument, op0.waveSelect),
+		offsetof(Instrument, op1.waveSelect)
+	};
+
+	for (int i = 0; i < nrOfInstruments; ++i) {
+		for (int j = 0; j < sizeof(loadOffsets)/sizeof(loadOffsets0); ++j) {
+			int v = f->readInt(2);
+			if (loadOffsetsj >= 0 ) {
+				*(int16_t*)((char*)&instrumentsi + loadOffsetsj) = v;
+			}
+		}
+
+		f->readString(instrumentsi.name, 13);
+		instrumentsi.name13 = 0;
+	}
+
+	return !f->ateof();
+}
+
+bool CcmfmacsoperaPlayer::loadPatterns(binistream* f)
+{
+	if (nrOfPatterns > 0xff)
+		return false;
+
+	patterns.resize(nrOfPatterns);
+
+	for (int i = 0; i < nrOfPatterns; ++i) {
+		while (!f->eof()) {
+			// 6 bytes per event, if the 1st byte is 0xff, end of pattern
+			NoteEvent n;
+			
+			n.row = f->readInt(1);
+			if (n.row == 0xff)
+				break;
+			
+			uint8_t* d = &n.col;
+			for (int j = 0; j < 5; ++j)
+				*d++ = f->readInt(1);
+
+			n.instrument--;
+			patternsi.push_back(n);
+		}
+	}
+	
+	return true;
+}
+
+bool CcmfmacsoperaPlayer::isValidChannel(int channelNr) const
+{
+	return channelNr >= 0 && ((rhythmMode && channelNr < 11) || (!rhythmMode && channelNr < 9));
+}
+
+bool CcmfmacsoperaPlayer::isRhythmChannel(int channelNr) const
+{
+	return rhythmMode && channelNr >= 6;
+}
+
+static inline int getSlotRegister(int base, int slotNr)
+{
+	return base + slotRegisterOffsetsslotNr;
+}
+
+void CcmfmacsoperaPlayer::setSlot(int slotNr, const SlotSettings& settings)
+{
+	opl->write(getSlotRegister(0x20, slotNr), (settings.multiple & 0xf) | ((settings.ksr & 1) << 4) | ((settings.egType & 1) << 5) | ((settings.vib & 1) << 6) | ((settings.ampMod & 1) << 7));
+	opl->write(getSlotRegister(0x60, slotNr), ((settings.attackRate & 0xf) << 4) | (settings.decayRate & 0xf));
+	opl->write(getSlotRegister(0x80, slotNr), ((settings.sustainLevel & 0xf) << 4) | (settings.releaseRate & 0xf));
+	opl->write(getSlotRegister(0xe0, slotNr), settings.waveSelect & 3);
+}
+
+bool CcmfmacsoperaPlayer::setInstrument(int channelNr, const Instrument& inst)
+{
+	if (!isValidChannel(channelNr))
+		return false;
+
+	if (channelCurrentInstrumentchannelNr != &inst) {
+		if (!isRhythmChannel(channelNr) || channelNr == CHANNEL_RHY_BD) {
+			// normal 2-op channel (or BD in rhythm mode, which also has two slots)
+			opl->write(0xc0 + channelNr, ((inst.feedback & 7) << 1) | (1 - (inst.connection & 1)));
+			setSlot(channelSlotschannelNr.slotOp1, inst.op0);
+			setSlot(channelSlotschannelNr.slotOp2, inst.op1);
+		}
+		else {
+			// rhythm channel
+			setSlot(channelSlotsRhythmchannelNr, inst.op0);
+		}
+
+		channelCurrentInstrumentchannelNr = &inst;
+	}
+
+	return true;
+}
+
+static int calculateAttenuation(int attenuation, int volumeColumn)
+{
+	if (attenuation < 0 ) attenuation = 0;
+	if (attenuation > 63 ) attenuation = 63;
+	if (volumeColumn < 0 ) volumeColumn = 0;
+	if (volumeColumn > 127) volumeColumn = 127;
+	
+	// Instruments have a configured attenuation.
+	// The "rest" of the attenuation (max. 63, 6 bits in "total level") is scaled by volumeColumn.
+	// (This seems right for most values I've tested. But with att=8/vol=115, we get 13 here while SOUNDFX gets 14.
+	return attenuation + ((63 - attenuation) * (127 - volumeColumn)) / 127;
+}
+
+void CcmfmacsoperaPlayer::keyOn(int channelNr)
+{
+	if (!isValidChannel(channelNr))
+		return;
+
+	if (!isRhythmChannel(channelNr)) {
+		current0xBxchannelNr |= (1 << 5);
+		opl->write(0xb0 + channelNr, current0xBxchannelNr);
+	}
+	else {
+		// Channel 6 (BD) -> D4 .. Channel 10 (HH) -> D0
+		current0xBD |= 1 << (10 - channelNr);
+		opl->write(0xbd, current0xBD);
+	}
+}
+
+void CcmfmacsoperaPlayer::keyOff(int channelNr)
+{
+	if (!isValidChannel(channelNr))
+		return;
+
+	if (!isRhythmChannel(channelNr)) {
+		current0xBxchannelNr &= ~(1 << 5);
+		opl->write(0xb0 + channelNr, current0xBxchannelNr);
+	}
+	else {
+		// Channel 6 (BD) -> D4 .. Channel 10 (HH) -> D0
+		current0xBD &= ~(1 << (10 - channelNr));
+		opl->write(0xbd, current0xBD);
+	}
+}
+
+void CcmfmacsoperaPlayer::setAxBx(int channelNr, int Ax, int Bx)
+{
+	if (channelNr < 0 || channelNr >= 8)
+		return;
+
+	opl->write(0xa0 + channelNr, Ax);
+	current0xBxchannelNr = Bx;
+	opl->write(0xb0 + channelNr, current0xBxchannelNr);
+}
+
+bool CcmfmacsoperaPlayer::setNote(int channelNr, int note)
+{
+	if (!isValidChannel(channelNr))
+		return false;
+
+	if (note < 23 || note >= 120)
+		return false;
+
+	int fNumber = fNumbersnote % 12;
+
+	int Ax = fNumber & 0xff;
+	int Bx = ((fNumber >> 8) & 3) | ((note / 12 - 2) << 2);
+
+	if (!isRhythmChannel(channelNr)) {
+		setAxBx(channelNr, Ax, Bx);
+	}
+	else {
+		// not entirely right, but this is what the original player seems to do
+		if (channelNr == CHANNEL_RHY_BD)
+			setAxBx(6, Ax, Bx);
+		setAxBx(7, Ax, Bx);
+		if (channelNr == CHANNEL_RHY_SN || channelNr == CHANNEL_RHY_TOM)
+			setAxBx(8, Ax, Bx);
+	}
+
+	return true;
+}
+
+void CcmfmacsoperaPlayer::setVolume(int channelNr, int vol)
+{
+	if (!isValidChannel(channelNr) || !channelCurrentInstrumentchannelNr)
+		return;
+
+	const Instrument& inst = *channelCurrentInstrumentchannelNr;
+
+	if (!isRhythmChannel(channelNr) || channelNr == CHANNEL_RHY_BD) {
+		// normal 2-op channel (or BD in rhythm mode, which also has two slots)
+
+		// Set volume on OP1: If OP1 modulates OP2 (inst.connection != 0), don't scale its volume by n.volume
+		opl->write(
+			getSlotRegister(0x40, channelSlotschannelNr.slotOp1),
+			((inst.op0.ksl & 3) << 6) |
+			 (inst.connection == 0 ? calculateAttenuation(inst.op0.totalLevel, vol) : (inst.op0.totalLevel & 0x3f))
+		);
+
+		// Set volume on OP2
+		opl->write(
+			getSlotRegister(0x40, channelSlotschannelNr.slotOp2),
+			((inst.op1.ksl & 3) << 6) | calculateAttenuation(inst.op1.totalLevel, vol)
+		);
+	}
+	else {
+		// rhythm channel
+		opl->write(
+			getSlotRegister(0x40, channelSlotsRhythmchannelNr),
+			((inst.op1.ksl & 3) << 6) | calculateAttenuation(inst.op0.totalLevel, vol)
+		);
+	}
+}
+
+bool CcmfmacsoperaPlayer::advanceRow()
+{
+	for (;;) {
+		if (currentRow < 0 || ++currentRow >= 64) {
+			// next pattern
+			currentRow = 0;
+			currentPatternIndex = 0;
+
+			do {
+				currentOrderIndex++;
+
+				// check bounds
+				if (currentOrderIndex < 0 || currentOrderIndex >= sizeof(patternOrder) / sizeof(patternOrder0))
+					return false;
+
+				// end of song?
+				if (patternOrdercurrentOrderIndex == 99)
+					return false;
+
+			} while (patternOrdercurrentOrderIndex >= patterns.size()); // loop to skip invalid pattern references
+
+			AdPlug_LogWrite("order %d, pattern %d\n", currentOrderIndex, patternOrdercurrentOrderIndex);
+		}
+
+		// check for pattern break
+		const Pattern &p = patternspatternOrdercurrentOrderIndex;
+		if (currentPatternIndex < p.size() && pcurrentPatternIndex.row == currentRow && pcurrentPatternIndex.note == 1) {
+			currentRow = -1;
+		}
+		else // no pattern break, done!
+			break;
+	}
+
+	return true;
+}
+
+void CcmfmacsoperaPlayer::processNoteEvent(const CcmfmacsoperaPlayer::NoteEvent &n)
+{
+	int channelNr = n.col;
+
+	if (!isValidChannel(channelNr))
+		return;
+
+	keyOff(channelNr);
+
+	if (n.note == 4) // key off: done here
+		return;
+
+	if (n.instrument >= 0 && n.instrument < instruments.size())
+		setInstrument(channelNr, instrumentsn.instrument);
+
+	setVolume(channelNr, n.volume);
+
+	if (setNote(channelNr, n.note))
+		keyOn(channelNr);
+}
+
+bool CcmfmacsoperaPlayer::update()
+{
+	AdPlug_LogWrite( "%2d: ", currentRow);
+
+	const Pattern& p = patternspatternOrdercurrentOrderIndex;
+
+	int currentCol = 0;
+	for (; currentPatternIndex < p.size() && pcurrentPatternIndex.row == currentRow; ++currentPatternIndex) {
+		const NoteEvent& n = pcurrentPatternIndex;
+
+		for (; currentCol < n.col; ++currentCol)
+			AdPlug_LogWrite(" ");
+		AdPlug_LogWrite( "%2d %2d %2x %2d ", n.note, n.instrument, n.volume, n.pitch);
+
+		currentCol++;
+		processNoteEvent(n);
+	}
+	AdPlug_LogWrite("\n");
+
+	bool stillPlaying = advanceRow();
+
+	if (!stillPlaying) {
+		resetPlayer();
+		// Once the song is done, keep on returning false.
+		// TODO: returning "false" once should suffice, but it doesn't (at least with adplay-unix&SDL)
+		// "songDone" is only reset in rewind().
+		songDone = true;
+	}
+
+	return !songDone;
+}
+
+void CcmfmacsoperaPlayer::resetPlayer()
+{
+	currentRow = -1;
+	currentOrderIndex = -1;
+	advanceRow();
+}
+
+void CcmfmacsoperaPlayer::rewind(int subsong)
+{
+	opl->init();
+	opl->write(1, 1 << 5); // enable wave select
+
+	// 0xbd:5 (RHY) enables "rhythm mode"
+	current0xBD = rhythmMode ? (1 << 5) : 0;
+	opl->write(0xbd, current0xBD);
+
+	memset(current0xBx, 0, sizeof(current0xBx));
+	memset(channelCurrentInstrument, 0, sizeof(channelCurrentInstrument));
+
+	// This isn't right for all channels.
+	// No songs I've seen rely on the undocumented "default instrument", so ...
+	static const Instrument defaultInstrument = {
+		{{0, 1, 15, 5, 0, 1, 0, 0, 0, 0, 0, 0},
+		 {0, 1, 15, 7, 0, 2, 0, 0, 0, 0, 1, 0}},
+		3, 0, {'D', 'e', 'f', 'a', 'u', 'l', 't', 0, 0, 0, 0, 0, 0, 0 }
+	};
+	for (int i = 0; i < 11; ++i)
+		setInstrument(i, defaultInstrument);
+
+	// see comment in update() why this is needed
+	songDone = false;
+
+	resetPlayer();
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/cmfmcsop.h Added

@@ -0,0 +1,125 @@
+/*
+ * SoundFX Macs Opera CMF Player -- Copyright (c) 2017 Sebastian Kienzl <seb@knzl.de>
+ *
+ * Part of Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef H_ADPLUG_CMFMACSOPERAPLAYER
+#define H_ADPLUG_CMFMACSOPERAPLAYER
+
+#include <vector>
+#include <stdint.h>
+#include "player.h"
+
+class CcmfmacsoperaPlayer: public CPlayer
+{
+public:
+	static CPlayer* factory(Copl* newopl);
+
+	CcmfmacsoperaPlayer(Copl* newopl);
+
+	bool load(const std::string& filename, const CFileProvider& fp);
+	bool update();
+	void rewind(int subsong);
+	float getrefresh() { return speedRowsPerSec; };
+
+	virtual std::string gettype();
+	virtual unsigned int getpatterns() { return nrOfPatterns; }
+	virtual unsigned int getpattern() { return patternOrdercurrentOrderIndex; }
+	virtual unsigned int getorders() { return nrOfOrders; }
+	virtual unsigned int getorder() { return currentOrderIndex; }
+	virtual unsigned int getrow() { return currentRow; }
+	virtual unsigned int getspeed() { return 1; }
+	virtual unsigned int getinstruments() { return instruments.size(); }
+	virtual std::string getinstrument(unsigned int n) { return instrumentsn.name; }
+
+ protected:
+	struct SlotSettings {
+		int16_t ksl;
+		int16_t multiple;
+		int16_t attackRate;
+		int16_t sustainLevel;
+		int16_t egType;
+		int16_t decayRate;
+		int16_t releaseRate;
+		int16_t totalLevel;
+		int16_t ampMod;
+		int16_t vib;
+		int16_t ksr;
+		int16_t waveSelect;
+	};
+
+	struct Instrument {
+		SlotSettings op2;
+		int16_t feedback;
+		int16_t connection;
+		char name14;
+	};
+
+	struct NoteEvent {
+		uint8_t row;
+		uint8_t col;
+		uint8_t note; // 4: release, 1: end of pattern, 24: C-0, 119: H-7/B#7
+		uint8_t instrument;
+		uint8_t volume;
+		uint8_t pitch;
+	};
+	
+	typedef std::vector<NoteEvent> Pattern;
+
+	float speedRowsPerSec;
+	bool rhythmMode;
+	bool songDone;
+
+	int nrOfPatterns;
+	int16_t patternOrder99;
+	int nrOfOrders;
+
+	std::vector<Instrument> instruments;
+	std::vector<Pattern> patterns;
+	
+	int currentOrderIndex;
+	int currentRow;
+	int currentPatternIndex;
+	
+ const Instrument* channelCurrentInstrument11;
+	int current0xBx9;
+	int current0xBD;
+
+
+	bool loadInstruments(binistream* f, int nrOfInstruments);
+	bool loadPatterns(binistream* f);
+
+	bool isValidChannel(int channelNr) const;
+	bool isRhythmChannel(int channelNr) const;
+
+	void setSlot(int slotNr, const SlotSettings& settings);
+	bool setInstrument(int channelNr, const Instrument& inst);
+	void setAxBx(int channelNr, int Ax, int Bx);
+	bool setNote(int channelNr, int note);
+	void setVolume(int channelNr, int vol);
+
+	void keyOn(int channelNr);
+	void keyOff(int channelNr);
+
+	bool advanceRow();
+	void processNoteEvent(const NoteEvent &n);
+
+	void resetPlayer();
+};
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/d00.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/d00.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/d00.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/d00.h Changed

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/database.cpp Added

@@ -0,0 +1,427 @@
+/*
+ * AdPlug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (c) 1999 - 2006 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * database.cpp - AdPlug database class
+ * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
+ * Copyright (c) 2002, 2003, 2006 Simon Peter <dn.tlp@gmx.net>
+ */
+
+#include <binio.h>
+#include <binfile.h>
+#include <string.h>
+
+#include "database.h"
+
+#define DB_FILEID_V10	"AdPlug Module Information Database 1.0\x10"
+
+/***** CAdPlugDatabase *****/
+
+const unsigned short CAdPlugDatabase::hash_radix = 0xfff1;	// should be prime
+
+CAdPlugDatabase::CAdPlugDatabase()
+ : linear_index(0), linear_logic_length(0), linear_length(0)
+{
+ db_linear = new DB_Bucket * hash_radix;
+ db_hashed = new DB_Bucket * hash_radix;
+ memset(db_linear, 0, sizeof(DB_Bucket *) * hash_radix);
+ memset(db_hashed, 0, sizeof(DB_Bucket *) * hash_radix);
+}
+
+CAdPlugDatabase::~CAdPlugDatabase()
+{
+ unsigned long i;
+
+ for(i = 0; i < linear_length; i++)
+ delete db_lineari;
+
+ delete db_linear;
+ delete db_hashed;
+}
+
+bool CAdPlugDatabase::load(std::string db_name)
+{
+ binifstream f(db_name);
+ if(f.error()) return false;
+ return load(f);
+}
+
+bool CAdPlugDatabase::load(binistream &f)
+{
+ unsigned int idlen = strlen(DB_FILEID_V10);
+ char *id = new char idlen;
+ unsigned long length;
+
+ // Open database as little endian with IEEE floats
+ f.setFlag(binio::BigEndian, false); f.setFlag(binio::FloatIEEE);
+
+ f.readString(id,idlen);
+ if(memcmp(id,DB_FILEID_V10,idlen)) {
+ delete id;
+ return false;
+ }
+ delete id;
+ length = f.readInt(4);
+
+ // read records
+ for(unsigned long i = 0; i < length; i++)
+ insert(CRecord::factory(f));
+
+ return true;
+}
+
+bool CAdPlugDatabase::save(std::string db_name)
+{
+ binofstream f(db_name);
+ if(f.error()) return false;
+ return save(f);
+}
+
+bool CAdPlugDatabase::save(binostream &f)
+{
+ unsigned long i;
+
+ // Save database as little endian with IEEE floats
+ f.setFlag(binio::BigEndian, false); f.setFlag(binio::FloatIEEE);
+
+ f.writeString(DB_FILEID_V10);
+ f.writeInt(linear_logic_length, 4);
+
+ // write records
+ for(i = 0; i < linear_length; i++)
+ if(!db_lineari->deleted)
+ db_lineari->record->write(f);
+
+ return true;
+}
+
+CAdPlugDatabase::CRecord *CAdPlugDatabase::search(CKey const &key)
+{
+ if(lookup(key)) return get_record(); else return 0;
+}
+
+bool CAdPlugDatabase::lookup(CKey const &key)
+{
+ unsigned long index = make_hash(key);
+ if(!db_hashedindex) return false;
+
+ // immediate hit ?
+ DB_Bucket *bucket = db_hashedindex;
+
+ if(!bucket->deleted && bucket->record->key == key) {
+ linear_index = bucket->index;
+ return true;
+ }
+
+ // in-chain hit ?
+ bucket = db_hashedindex->chain;
+
+ while(bucket) {
+ if(!bucket->deleted && bucket->record->key == key) {
+ linear_index = bucket->index;
+ return true;
+ }
+
+ bucket = bucket->chain;
+ }
+
+ return false;
+}
+
+bool CAdPlugDatabase::insert(CRecord *record)
+{
+ long index;
+
+ // sanity checks
+ if(!record) return false;			// null-pointer given
+ if(linear_length == hash_radix) return false;	// max. db size exceeded
+ if(lookup(record->key)) return false;		// record already in db
+
+ // make bucket
+ DB_Bucket *bucket = new DB_Bucket(linear_length, record);
+ if(!bucket) return false;
+
+ // add to linear list
+ db_linearlinear_length = bucket;
+ linear_logic_length++; linear_length++;
+
+ // add to hashed list
+ index = make_hash(record->key);
+
+ if(!db_hashedindex)	// First entry in hashtable
+ db_hashedindex = bucket;
+ else {		// Add entry in chained list
+ DB_Bucket *chain = db_hashedindex;
+
+ while(chain->chain) chain = chain->chain;
+ chain->chain = bucket;
+ }
+
+ return true;
+}
+
+void CAdPlugDatabase::wipe(CRecord *record)
+{
+ if(!lookup(record->key)) return;
+ wipe();
+}
+
+void CAdPlugDatabase::wipe()
+{
+ if(!linear_length) return;
+
+ DB_Bucket *bucket = db_linearlinear_index;
+
+ if(!bucket->deleted) {
+ delete bucket->record;
+ linear_logic_length--;
+ bucket->deleted = true;
+ }
+}
+
+CAdPlugDatabase::CRecord *CAdPlugDatabase::get_record()
+{
+ if(!linear_length) return 0;
+ return db_linearlinear_index->record;
+}
+
+bool CAdPlugDatabase::go_forward()
+{
+ if(linear_index + 1 < linear_length) {
+ linear_index++;
+ return true;
+ } else
+ return false;
+}
+
+bool CAdPlugDatabase::go_backward()
+{
+ if(!linear_index) return false;
+ linear_index--;
+ return true;
+}
+
+void CAdPlugDatabase::goto_begin()
+{	
+ if(linear_length) linear_index = 0;
+}
+
+void CAdPlugDatabase::goto_end()
+{
+ if(linear_length) linear_index = linear_length - 1;
+}
+
+inline unsigned long CAdPlugDatabase::make_hash(CKey const &key)
+{
+ return (key.crc32 + key.crc16) % hash_radix;
+}
+
+/***** CAdPlugDatabase::DB_Bucket *****/
+
+CAdPlugDatabase::DB_Bucket::DB_Bucket(unsigned long nindex, CRecord *newrecord, DB_Bucket *newchain)
+ : index(nindex), deleted(false), chain(newchain), record(newrecord)
+{
+}
+
+CAdPlugDatabase::DB_Bucket::~DB_Bucket()
+{
+ if(!deleted) delete record;
+}
+
+/***** CAdPlugDatabase::CRecord *****/
+
+CAdPlugDatabase::CRecord *CAdPlugDatabase::CRecord::factory(RecordType type)
+{
+ switch(type) {
+ case Plain: return new CPlainRecord;
+ case SongInfo: return new CInfoRecord;
+ case ClockSpeed: return new CClockRecord;
+ default: return 0;
+ }
+}
+
+CAdPlugDatabase::CRecord *CAdPlugDatabase::CRecord::factory(binistream &in)
+{
+ RecordType	type;
+ unsigned long	size;
+ CRecord	*rec;
+
+ type = (RecordType)in.readInt(1); size = in.readInt(4);
+ rec = factory(type);
+
+ if(rec) {
+ rec->key.crc16 = in.readInt(2); rec->key.crc32 = in.readInt(4);
+ rec->filetype = in.readString('\0'); rec->comment = in.readString('\0');
+ rec->read_own(in);
+ return rec;
+ } else {
+ // skip this record, cause we don't know about it
+ in.seek(size, binio::Add);
+ return 0;
+ }
+}
+
+void CAdPlugDatabase::CRecord::write(binostream &out)
+{
+ out.writeInt(type, 1);
+ out.writeInt(get_size() + filetype.length() + comment.length() + 8, 4);
+ out.writeInt(key.crc16, 2); out.writeInt(key.crc32, 4);
+ out.writeString(filetype); out.writeInt('\0', 1);
+ out.writeString(comment); out.writeInt('\0', 1);
+
+ write_own(out);
+}
+
+bool CAdPlugDatabase::CRecord::user_read(std::istream &in, std::ostream &out)
+{
+ return user_read_own(in, out);
+}
+
+bool CAdPlugDatabase::CRecord::user_write(std::ostream &out)
+{
+ out << "Record type: ";
+ switch(type) {
+ case Plain: out << "Plain"; break;
+ case SongInfo: out << "SongInfo"; break;
+ case ClockSpeed: out << "ClockSpeed"; break;
+ default: out << "*** Unknown ***"; break;
+ }
+ out << std::endl;
+ out << "Key: " << std::hex << key.crc16 << ":" << key.crc32 << std::dec << std::endl;
+ out << "File type: " << filetype << std::endl;
+ out << "Comment: " << comment << std::endl;
+
+ return user_write_own(out);
+}
+
+/***** CAdPlugDatabase::CRecord::CKey *****/
+
+CAdPlugDatabase::CKey::CKey(binistream &buf)
+{
+ make(buf);
+}
+
+bool CAdPlugDatabase::CKey::operator==(const CKey &key)
+{
+ return ((crc16 == key.crc16) && (crc32 == key.crc32));
+}
+
+void CAdPlugDatabase::CKey::make(binistream &buf)
+// Key is CRC16:CRC32 pair. CRC16 and CRC32 calculation routines (c) Zhengxi
+{
+ static const unsigned short magic16 = 0xa001;
+ static const unsigned long magic32 = 0xedb88320;
+
+ crc16 = 0; crc32 = 0xffffffffL;
+
+ while(!buf.eof())
+ {
+ unsigned char byte = buf.readInt(1);
+
+ for (int j=0;j<8;j++)
+	{
+	 if ((crc16 ^ byte) & 1)
+	 crc16 = (crc16 >> 1) ^ magic16;
+	 else
+	 crc16 >>= 1;
+
+	 if ((crc32 ^ byte) & 1)
+	 crc32 = (crc32 >> 1) ^ magic32;
+	 else
+	 crc32 >>= 1;
+
+	 byte >>= 1;
+	}
+ }
+
+ crc16 &= 0xffff;
+ crc32 = ~crc32;
+ crc32 &= 0xffffffffL;
+}
+
+/***** CInfoRecord *****/
+
+CInfoRecord::CInfoRecord()
+{
+ type = SongInfo;
+}
+
+void CInfoRecord::read_own(binistream &in)
+{
+ title = in.readString('\0');
+ author = in.readString('\0');
+}
+
+void CInfoRecord::write_own(binostream &out)
+{
+ out.writeString(title); out.writeInt('\0', 1);
+ out.writeString(author); out.writeInt('\0', 1);
+}
+
+unsigned long CInfoRecord::get_size()
+{
+ return title.length() + author.length() + 2;
+}
+
+bool CInfoRecord::user_read_own(std::istream &in, std::ostream &out)
+{
+ out << "Title: "; in >> title;
+ out << "Author: "; in >> author;
+ return true;
+}
+
+bool CInfoRecord::user_write_own(std::ostream &out)
+{
+ out << "Title: " << title << std::endl;
+ out << "Author: " << author << std::endl;
+ return true;
+}
+
+/***** CClockRecord *****/
+
+CClockRecord::CClockRecord()
+ : clock(0.0f)
+{
+ type = ClockSpeed;
+}
+
+void CClockRecord::read_own(binistream &in)
+{
+ clock = in.readFloat(binio::Single);
+}
+
+void CClockRecord::write_own(binostream &out)
+{
+ out.writeFloat(clock, binio::Single);
+}
+
+unsigned long CClockRecord::get_size()
+{
+ return 4;
+}
+
+bool CClockRecord::user_read_own(std::istream &in, std::ostream &out)
+{
+ out << "Clockspeed: "; in >> clock;
+ return true;
+}
+
+bool CClockRecord::user_write_own(std::ostream &out)
+{
+ out << "Clock speed: " << clock << " Hz" << std::endl;
+ return true;
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/database.h Added

@@ -0,0 +1,169 @@
+/*
+ * AdPlug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (c) 1999 - 2003 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * database.h - AdPlug database class
+ * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
+ * Copyright (c) 2002, 2003 Simon Peter <dn.tlp@gmx.net>
+ */
+
+#ifndef H_ADPLUG_DATABASE
+#define H_ADPLUG_DATABASE
+
+#include <iostream>
+#include <string>
+#include <binio.h>
+
+class CAdPlugDatabase
+{
+public:
+ class CKey
+ {
+ public:
+ unsigned short	crc16;
+ unsigned long	crc32;
+
+ CKey() {};
+ CKey(binistream &in);
+
+ bool operator==(const CKey &key);
+
+ private:
+ void make(binistream &in);
+ };
+
+ class CRecord
+ {
+ public:
+ typedef enum { Plain, SongInfo, ClockSpeed } RecordType;
+
+ RecordType	type;
+ CKey	key;
+ std::string	filetype, comment;
+
+ static CRecord *factory(RecordType type);
+ static CRecord *factory(binistream &in);
+
+ CRecord() {}
+ virtual ~CRecord() {}
+
+ void write(binostream &out);
+
+ bool user_read(std::istream &in, std::ostream &out);
+ bool user_write(std::ostream &out);
+
+ protected:
+ virtual void read_own(binistream &in) = 0;
+ virtual void write_own(binostream &out) = 0;
+ virtual unsigned long get_size() = 0;
+ virtual bool user_read_own(std::istream &in, std::ostream &out) = 0;
+ virtual bool user_write_own(std::ostream &out) = 0;
+ };
+
+ CAdPlugDatabase();
+ ~CAdPlugDatabase();
+
+ bool	load(std::string db_name);
+ bool	load(binistream &f);
+ bool	save(std::string db_name);
+ bool	save(binostream &f);
+
+ bool	insert(CRecord *record);
+
+ void	wipe(CRecord *record);
+ void	wipe();
+
+ CRecord *search(CKey const &key);
+ bool lookup(CKey const &key);
+
+ CRecord *get_record();
+
+ bool	go_forward();
+ bool	go_backward();
+
+ void	goto_begin();
+ void	goto_end();
+
+private:
+ static const unsigned short hash_radix;
+
+ class DB_Bucket
+ {
+ public:
+ unsigned long	index;
+ bool		deleted;
+ DB_Bucket		*chain;
+
+ CRecord		*record;
+
+ DB_Bucket(unsigned long nindex, CRecord *newrecord, DB_Bucket *newchain = 0);
+ ~DB_Bucket();
+ };
+
+ DB_Bucket	**db_linear;
+ DB_Bucket	**db_hashed;
+
+ unsigned long	linear_index, linear_logic_length, linear_length;
+
+ unsigned long make_hash(CKey const &key);
+};
+
+class CPlainRecord: public CAdPlugDatabase::CRecord
+{
+public:
+ CPlainRecord() { type = Plain; }
+
+protected:
+ virtual void read_own(binistream &in) {}
+ virtual void write_own(binostream &out) {}
+ virtual unsigned long get_size() { return 0; }
+ virtual bool user_read_own(std::istream &in, std::ostream &out) { return true; }
+ virtual bool user_write_own(std::ostream &out) { return true; }
+};
+
+class CInfoRecord: public CAdPlugDatabase::CRecord
+{
+public:
+ std::string	title;
+ std::string	author;
+
+ CInfoRecord();
+
+protected:
+ virtual void read_own(binistream &in);
+ virtual void write_own(binostream &out);
+ virtual unsigned long get_size();
+ virtual bool user_read_own(std::istream &in, std::ostream &out);
+ virtual bool user_write_own(std::ostream &out);
+};
+
+class CClockRecord: public CAdPlugDatabase::CRecord
+{
+public:
+ float	clock;
+
+ CClockRecord();
+
+protected:
+ virtual void read_own(binistream &in);
+ virtual void write_own(binostream &out);
+ virtual unsigned long get_size();
+ virtual bool user_read_own(std::istream &in, std::ostream &out);
+ virtual bool user_write_own(std::ostream &out);
+};
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/debug.c -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/debug.c Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/debug.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/debug.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/dfm.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/dfm.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/dfm.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/dfm.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/diskopl.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/diskopl.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/diskopl.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/diskopl.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/dmo.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/dmo.cpp Changed

@@ -14,7 +14,7 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 dmo.cpp - TwinTeam loader by Riven the Mage <riven@ok.ru>
 */
@@ -49,7 +49,7 @@
 return new CdmoLoader(newopl);
 }
 
-bool CdmoLoader::load(const char *filename, const CFileProvider &fp)
+bool CdmoLoader::load(const std::string &filename, const CFileProvider &fp)
 {
 int i,j;
 binistream *f;
@@ -58,11 +58,18 @@
 dmo_unpacker *unpacker = new dmo_unpacker;
 unsigned char chkhdr16;
 
- if(!fp.extension(filename, ".dmo")) {
+ if(!fp.extension(filename, ".dmo"))
+ {
 delete unpacker;
 return false;
- }
- f = fp.open(filename); if(!f) return false;
+ }
+
+ f = fp.open(filename);
+ if(!f)
+ {
+ delete unpacker;
+ return false;
+ }
 
 f->readString((char *)chkhdr, 16);
 
@@ -104,7 +111,7 @@
 // "TwinTeam" - signed ?
 if (memcmp(module,"TwinTeam Module File""\x0D\x0A",22))
 {
- delete module;
+ delete module;
 return false;
 }
 
@@ -212,19 +219,19 @@
 return true;
 }
 
-const char * CdmoLoader::gettype()
+std::string CdmoLoader::gettype()
 {
- return "TwinTeam (packed S3M)";
+ return std::string("TwinTeam (packed S3M)");
 }
 
-const char * CdmoLoader::getauthor()
+std::string CdmoLoader::getauthor()
 {
 /*
 All available .DMO modules written by one composer. And because all .DMO
 stuff was lost due to hd crash (TwinTeam guys said this), there are
 never(?) be another.
 */
- return "Benjamin GERARDIN";
+ return std::string("Benjamin GERARDIN");
 }
 
 /* -------- Private Methods ------------------------------- */
@@ -320,7 +327,10 @@
 	 return -1;
 
 	 for(int i=0;i<cx;i++)
-	 *opos++ = *(opos - ax);
+	 {
+	 *opos = *(opos - ax);
+	 opos++;
+	 }
 
 	 continue;
 	}
@@ -340,7 +350,10 @@
 	 return -1;
 
 	 for(i=0;i<cx;i++)
-	 *opos++ = *(opos - ax);
+	 {
+	 *opos = *(opos - ax);
+	 opos++;
+	 }
 
 	 for (i=0;i<bx;i++)
 	 *opos++ = *ipos++;
@@ -364,7 +377,10 @@
 	 return -1;
 
 	 for(i=0;i<cx;i++)
-	 *opos++ = *(opos - bx);
+	 {
+	 *opos = *(opos - bx);
+	 opos++;
+	 }
 
 	 for (i=0;i<ax;i++)
 	 *opos++ = *ipos++;

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/dmo.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/dmo.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/dro.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/dro.cpp Changed

@@ -14,128 +14,197 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * dro.c - DOSBox Raw OPL Player by Sjoerd van der Berg <harekiet@zophar.net>
 *
 * upgraded by matthew gambrell <zeromus@zeromus.org>
+ * Refactored to better match dro2.cpp 
+ * by Laurence Dougal Myers <jestarjokin@jestarjokin.net>
 * 
 * NOTES: 3-oct-04: the DRO format is not yet finalized. beware.
+ * 10-jun-12: the DRO 1 format is finalized, but capturing is buggy.
 */
 
-#include <string.h>
+/*
+ * Copyright (c) 2012 - 2017 Wraithverge <liam82067@yahoo.com>
+ * - Added Member pointers.
+ * - Fixed incorrect operator.
+ * - Finalized support for displaying arbitrary Tag data.
+ */
+
+#include <cstring>
 #include <stdio.h>
 
 #include "dro.h"
 
-/*** public methods *************************************/
-
 CPlayer *CdroPlayer::factory(Copl *newopl)
 {
 return new CdroPlayer(newopl);
 }
 
-CdroPlayer::CdroPlayer(Copl *newopl)
- : CPlayer(newopl), data(0)
+CdroPlayer::CdroPlayer(Copl *newopl) :
+	CPlayer(newopl),
+	data(0)
 {
- if(opl->gettype() == Copl::TYPE_OPL2)
- opl3_mode = 0;
- else
- opl3_mode = 1;
 }
 
-bool CdroPlayer::load(const char *filename, const CFileProvider &fp)
+CdroPlayer::~CdroPlayer()
 {
- binistream *f = fp.open(filename); if(!f) return false;
- char id8;
- unsigned long i;
-
- // file validation section
- f->readString(id, 8);
- if(strncmp(id,"DBRAWOPL",8)) { fp.close (f); return false; }
- int version = f->readInt(4);	// not very useful just yet
- if(version != 0x10000) { fp.close(f); return false; }
-
- // load section
- mstotal = f->readInt(4);	// Total milliseconds in file
- length = f->readInt(4);	// Total data bytes in file
- data = new unsigned char length;
-
- f->ignore(1);			// Type of opl data this can contain - ignored
- for (i=0;i<3;i++)
- 	datai=f->readInt(1);
-
- if ((data0 == 0) || (data1 == 0) || (data2 == 0)) {
- 	// Some early .DRO files only used one byte for the hardware type, then
- 	// later changed to four bytes with no version number change. If we're
- 	// here then this is a later (more popular) file with the full four bytes
- 	// for the hardware-type.
- 	i = 0; // so ignore the three bytes we just read and start again
- }
- for (;i<length;i++)
- datai=f->readInt(1);
- fp.close(f);
- rewind(0);
- return true;
+	if (this->data) delete this->data;
+}
+
+bool CdroPlayer::load(const std::string &filename, const CFileProvider &fp)
+{
+	binistream *f = fp.open(filename);
+	if (!f) return false;
+
+	char id8;
+	f->readString(id, 8);
+	if (strncmp(id, "DBRAWOPL", 8)) {
+		fp.close(f);
+		return false;
+	}
+	int version = f->readInt(4);
+	if (version != 0x10000) {
+		fp.close(f);
+		return false;
+	}
+
+	f->ignore(4);	// Length in milliseconds
+	this->iLength = f->readInt(4); // stored in file as number of bytes
+
+	this->data = new uint8_tthis->iLength;
+
+	unsigned long i;
+	// Some early .DRO files only used one byte for the hardware type, then
+ 	// later changed to four bytes with no version number change.
+	// OPL type (0 == OPL2, 1 == OPL3, 2 == Dual OPL2)
+	f->ignore(1);	// Type of opl data this can contain - ignored
+	for (i = 0; i < 3; i++) {
+ 		this->datai=f->readInt(1);
+	}
+
+	if (this->data0 == 0 || this->data1 == 0 || this->data2 == 0) {
+		// If we're here then this is a later (more popular) file with
+		// the full four bytes for the hardware-type.
+ 		i = 0; // so ignore the three bytes we just read and start again
+	}
+
+	// Read the OPL data.
+	for (; (int)i < this->iLength; i++) {
+		this->datai=f->readInt(1);
+	}
+
+	title0 = 0;
+	author0 = 0;
+	desc0 = 0;
+	int tagsize = fp.filesize(f) - f->pos();
+
+	if (tagsize >= 3)
+	{
+		// The arbitrary Tag Data section begins here.
+		if ((uint8_t)f->readInt(1) != 0xFF ||
+			(uint8_t)f->readInt(1) != 0xFF ||
+			(uint8_t)f->readInt(1) != 0x1A)
+		{
+			// Tag data does not present or truncated.
+			goto end_section;
+		}
+
+		// "title" is maximum 40 characters long.
+		f->readString(title, 40, 0);
+
+		// Skip "author" if Tag marker byte is missing.
+		if (f->readInt(1) != 0x1B) {
+			f->seek(-1, binio::Add);
+			goto desc_section;
+		}
+
+		// "author" is maximum 40 characters long.
+		f->readString(author, 40, 0);
+
+desc_section:
+		// Skip "desc" if Tag marker byte is missing.
+		if (f->readInt(1) != 0x1C) {
+			goto end_section;
+		}
+
+		// "desc" is now maximum 1023 characters long (it was 140).
+		f->readString(desc, 1023, 0);
+	}
+
+end_section:
+	fp.close(f);
+	rewind(0);
+
+	return true;
 }
 
 bool CdroPlayer::update()
 {
- if (delay>500) {
- delay-=500;
- return true;
- } else
- delay=0;
-
- while (pos < length) {
- unsigned char cmd = datapos++;
- switch(cmd) {
- case 0: 
- delay = 1 + datapos++;
- return true;
- case 1: 
- delay = 1 + datapos + (datapos+1<<8);
- pos+=2;
- return true;
- case 2:
- index = 0;
- opl->setchip(0);
- break;
- case 3:
- index = 1;
- opl->setchip(1);
- break;
- default:
- if(cmd==4) cmd = datapos++; //data override
- if(index == 0 || opl3_mode)
-	opl->write(cmd,datapos++);
- break;
- }
- }
-
- return pos<length;
+	int iIndex;
+	int iValue;
+	while (this->iPos < this->iLength) {
+		iIndex = this->datathis->iPos++;
+
+		// Short delay
+		if (iIndex == this->iCmdDelayS) {
+			iValue = this->datathis->iPos++;
+			this->iDelay = iValue + 1;
+			return true;
+
+		// Long delay
+		} else if (iIndex == this->iCmdDelayL) {
+			iValue = this->datathis->iPos | (this->datathis->iPos + 1 << 8);
+			this->iPos += 2;
+			this->iDelay = (iValue + 1);
+			return true;
+
+		// Bank switching
+		} else if (iIndex == 0x02 || iIndex == 0x03) {
+			this->opl->setchip(iIndex - 0x02);
+
+		// Normal write
+		} else {
+			if (iIndex == 0x04) {
+				iIndex = this->datathis->iPos++;
+			}
+			iValue = this->datathis->iPos++;
+			this->opl->write(iIndex, iValue);
+		}
+	}
+
+	// This won't result in endless-play using Adplay, but IMHO that code belongs
+	// in Adplay itself, not here.
+	return this->iPos < this->iLength;
 }
 
 void CdroPlayer::rewind(int subsong)
 {
- delay=1; 
- pos = index = 0; 
- opl->init(); 
-
- //dro assumes all registers are initialized to 0
- //registers not initialized to 0 will be corrected
- //in the data stream
- for(int i=0;i<256;i++)
- opl->write(i,0);
+	this->iDelay = 0;
+	this->iPos = 0;
+	opl->init();
+
+	// DRO v1 assumes all registers are initialized to 0.
+	// Registers not initialized to 0 will be corrected
+	// in the data stream.
+	int i;
+	opl->setchip(0);
+	for(i = 0; i < 256; i++) {
+		opl->write(i, 0);
+	}
 	
- opl->setchip(1);
- for(int i=0;i<256;i++)
- opl->write(i,0);
- opl->setchip(0);
+	opl->setchip(1);
+	for(i = 0; i < 256; i++) {
+		opl->write(i, 0);
+	}
+
+	opl->setchip(0);
 }
 
 float CdroPlayer::getrefresh()
 {
- if (delay > 500) return 1000 / 500;
- else return 1000 / (double)delay;
+	if (this->iDelay > 0) return 1000.0 / this->iDelay;
+	else return 1000.0;
 }

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/dro.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/dro.h Changed

@@ -14,39 +14,56 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * dro.h - DOSBox Raw OPL Player by Sjoerd van der Berg <harekiet@zophar.net>
+ * Refactored to better match dro2.h 
+ * by Laurence Dougal Myers <jestarjokin@jestarjokin.net>
 */
 
+/*
+ * Copyright (c) 2012 - 2017 Wraithverge <liam82067@yahoo.com>
+ * - Realigned and re-ordered sections.
+ * - Removed unused garbage.
+ * - Finalized support for displaying arbitrary Tag data.
+ */
+
+#include <stdint.h> // for uintxx_t
 #include "player.h"
 
 class CdroPlayer: public CPlayer
 {
- public:
- static CPlayer *factory(Copl *newopl);
-
- CdroPlayer(Copl *newopl);
- ~CdroPlayer()
- {
- if(data)
-	delete data;
- }
-
- bool load(const char *filename, const CFileProvider &fp);
- bool update();
- void rewind(int subsong);
- float getrefresh();
-
- const char * gettype()
- {
- return "DOSBox Raw OPL v0.1";
- }
-
- protected:
- unsigned char *data;
- unsigned long pos,length;
- unsigned long msdone,mstotal;
- unsigned short delay;
- unsigned char index, opl3_mode;
+	protected:
+		static const uint8_t iCmdDelayS = 0x00; // Wraithverge: fixed this with "static".
+		static const uint8_t iCmdDelayL = 0x01; // Wraithverge: fixed this with "static".
+
+		uint8_t *data;
+		int iLength;
+		int iPos;
+		int iDelay;
+
+	private:
+		char title40;
+		char author40;
+		char desc1023;
+
+	public:
+		static CPlayer *factory(Copl *newopl);
+
+		CdroPlayer(Copl *newopl);
+		~CdroPlayer();
+
+		bool load(const std::string &filename, const CFileProvider &fp);
+		bool update();
+		void rewind(int subsong);
+		float getrefresh();
+
+		std::string gettype()
+		{
+			return std::string("DOSBox Raw OPL v0.1");
+		}
+
+		std::string gettitle() { return std::string(title, 0, 40); };
+		std::string getauthor() { return std::string(author, 0, 40); };
+		std::string getdesc() { return std::string(desc, 0, 1023); };
 };

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/dro2.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/dro2.cpp Changed

@@ -14,12 +14,17 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * dro2.cpp - DOSBox Raw OPL v2.0 player by Adam Nielsen <malvineous@shikadi.net>
 */
 
-#include <string.h>
+/*
+ * Copyright (c) 2017 Wraithverge <liam82067@yahoo.com>
+ * - Finalized support for displaying arbitrary Tag data.
+ */
+
+#include <cstring>
 #include <stdio.h>
 
 #include "dro2.h"
@@ -42,7 +47,7 @@
 	if (this->piConvTable) delete this->piConvTable;
 }
 
-bool Cdro2Player::load(const char * filename, const CFileProvider &fp)
+bool Cdro2Player::load(const std::string &filename, const CFileProvider &fp)
 {
 	binistream *f = fp.open(filename);
 	if (!f) return false;
@@ -79,9 +84,48 @@
 	this->piConvTable = new uint8_tthis->iConvTableLen;
 	f->readString((char *)this->piConvTable, this->iConvTableLen);
 
+	// Read the OPL data.
 	this->data = new uint8_tthis->iLength;
 	f->readString((char *)this->data, this->iLength);
 
+	title0 = 0;
+	author0 = 0;
+	desc0 = 0;
+	int tagsize = fp.filesize(f) - f->pos();
+	if (tagsize >= 3)
+	{
+		// The arbitrary Tag Data section begins here.
+		if ((uint8_t)f->readInt(1) != 0xFF ||
+			(uint8_t)f->readInt(1) != 0xFF ||
+			(uint8_t)f->readInt(1) != 0x1A)
+		{
+			// Tag data does not present or truncated.
+			goto end_section;
+		}
+
+		// "title" is maximum 40 characters long.
+		f->readString(title, 40, 0);
+
+		// Skip "author" if Tag marker byte is missing.
+		if (f->readInt(1) != 0x1B) {
+			f->seek(-1, binio::Add);
+			goto desc_section;
+		}
+
+		// "author" is maximum 40 characters long.
+		f->readString(author, 40, 0);
+
+	desc_section:
+		// Skip "desc" if Tag marker byte is missing.
+		if (f->readInt(1) != 0x1C) {
+			goto end_section;
+		}
+
+		// "desc" is now maximum 1023 characters long (it was 140).
+		f->readString(desc, 1023, 0);
+	}
+
+end_section:
 	fp.close(f);
 	rewind(0);
 
@@ -125,14 +169,14 @@
 
 	// This won't result in endless-play using Adplay, but IMHO that code belongs
 	// in Adplay itself, not here.
- return this->iPos < this->iLength;
+	return this->iPos < this->iLength;
 }
 
 void Cdro2Player::rewind(int subsong)
 {
 	this->iDelay = 0;
 	this->iPos = 0;
- opl->init(); 
+	opl->init(); 
 }
 
 float Cdro2Player::getrefresh()

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/dro2.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/dro2.h Changed

@@ -14,11 +14,18 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * dro2.h - DOSBox Raw OPL v2.0 player by Adam Nielsen <malvineous@shikadi.net>
 */
 
+/*
+ * Copyright (c) 2017 Wraithverge <liam82067@yahoo.com>
+ * - Realigned and re-ordered sections.
+ * - Removed unused garbage.
+ * - Finalized support for displaying arbitrary Tag data.
+ */
+
 #include <stdint.h> // for uintxx_t
 #include "player.h"
 
@@ -34,6 +41,10 @@
 		int iPos;
 		int iDelay;
 
+	private:
+		char title40;
+		char author40;
+		char desc1023;
 
 	public:
 		static CPlayer *factory(Copl *newopl);
@@ -41,20 +52,17 @@
 		Cdro2Player(Copl *newopl);
 		~Cdro2Player();
 
-		bool load(const char * filename, const CFileProvider &fp);
+		bool load(const std::string &filename, const CFileProvider &fp);
 		bool update();
 		void rewind(int subsong);
 		float getrefresh();
 
-		const char * gettype()
+		std::string gettype()
 		{
-			return "DOSBox Raw OPL v2.0";
+			return std::string("DOSBox Raw OPL v2.0");
 		}
 
-	protected:
-		//unsigned char *data;
-		//unsigned long pos,length;
-		//unsigned long msdone,mstotal;
-		//unsigned short delay;
-		//unsigned char index, opl3_mode;
+		std::string gettitle() { return std::string(title, 0, 40); };
+		std::string getauthor() { return std::string(author, 0, 40); };
+		std::string getdesc() { return std::string(desc, 0, 1023); };
 };

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/dtm.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/dtm.cpp Changed

@@ -14,7 +14,7 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 dtm.cpp - DTM loader by Riven the Mage <riven@ok.ru>
 */
@@ -22,7 +22,7 @@
 NOTE: Panning (Ex) effect is ignored.
 */
 
-#include <string.h>
+#include <cstring>
 #include "dtm.h"
 
 /* -------- Public Methods -------------------------------- */
@@ -32,7 +32,7 @@
 return new CdtmLoader(newopl);
 }
 
-bool CdtmLoader::load(const char *filename, const CFileProvider &fp)
+bool CdtmLoader::load(const std::string &filename, const CFileProvider &fp)
 {
 binistream *f = fp.open(filename); if(!f) return false;
 const unsigned char conv_inst11 = { 2,1,10,9,4,3,6,5,0,8,7 };
@@ -132,7 +132,7 @@
 
 if (!unpacked_length)
 	{
-	 delete pattern;
+	 delete pattern;
 	 fp.close(f);
 	 return false;
 	}
@@ -251,29 +251,29 @@
 return 18.2f;
 }
 
-const char * CdtmLoader::gettype()
+std::string CdtmLoader::gettype()
 {
- return "DeFy Adlib Tracker";
+ return std::string("DeFy Adlib Tracker");
 }
 
-const char * CdtmLoader::gettitle()
+std::string CdtmLoader::gettitle()
 {
- return header.title;
+ return std::string(header.title);
 }
 
-const char * CdtmLoader::getauthor()
+std::string CdtmLoader::getauthor()
 {
- return header.author;
+ return std::string(header.author);
 }
 
-const char * CdtmLoader::getdesc()
+std::string CdtmLoader::getdesc()
 {
- return desc;
+ return std::string(desc);
 }
 
-const char * CdtmLoader::getinstrument(unsigned int n)
+std::string CdtmLoader::getinstrument(unsigned int n)
 {
- return instrumentsn.name;
+ return std::string(instrumentsn.name);
 }
 
 unsigned int CdtmLoader::getinstruments()

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/dtm.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/dtm.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/emuopl.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/emuopl.cpp Changed

@@ -14,23 +14,18 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * emuopl.cpp - Emulated OPL, by Simon Peter <dn.tlp@gmx.net>
 */
 
 #include "emuopl.h"
 
-#define likely(x) __builtin_expect((x),1)
-#define unlikely(x) __builtin_expect((x),0)
-
 CEmuopl::CEmuopl(int rate, bool bit16, bool usestereo)
 : use16bit(bit16), stereo(usestereo), mixbufSamples(0)
 {
 opl0 = OPLCreate(OPL_TYPE_YM3812, 3579545, rate);
 opl1 = OPLCreate(OPL_TYPE_YM3812, 3579545, rate);
- mixbuf0 = 0;
- mixbuf1 = 0;
 
 currType = TYPE_DUAL_OPL2;
 
@@ -41,8 +36,10 @@
 {
 OPLDestroy(opl0); OPLDestroy(opl1);
 
- delete mixbuf0;
- delete mixbuf1;
+ if(mixbufSamples) {
+ delete mixbuf0;
+ delete mixbuf1;
+ }
 }
 
 void CEmuopl::update(short *buf, int samples)
@@ -50,22 +47,15 @@
 int i;
 
 //ensure that our mix buffers are adequately sized
- if(unlikely (mixbufSamples < samples)) {
+ if(mixbufSamples < samples) {
+ if(mixbufSamples) { delete mixbuf0; delete mixbuf1; }
+ mixbufSamples = samples;
 
- if (mixbuf0) {
- delete mixbuf0;
- mixbuf0 = 0;
- }
- if (mixbuf1) {
- delete mixbuf1;
- mixbuf1 = 0;
- }
 //*2 = make room for stereo, if we need it
 mixbuf0 = new shortsamples*2; 
 mixbuf1 = new shortsamples*2;
 }
 
- mixbufSamples = samples;
 //data should be rendered to outbuf
 //tempbuf should be used as a temporary buffer
 //if we are supposed to generate 16bit output,
@@ -75,12 +65,10 @@
 //and so it must point to a mixbuf instead--
 //it will be reduced to 8bit and put in "buf" later
 short *outbuf;
- if (likely (use16bit)) {
- outbuf = buf;
- }
- else {
- outbuf = mixbuf1;
- }
+ short *tempbuf=mixbuf0;
+ short *tempbuf2=mixbuf1;
+ if(use16bit) outbuf = buf;
+ else outbuf = mixbuf1;
 //...there is a potentially confusing situation where mixbuf1 can be aliased.
 //beware. it is a little loony.
 
@@ -94,12 +82,11 @@
 
 //if we are supposed to output stereo,
 //then we need to dup the mono channel
- if(unlikely (stereo)) {
- for(i=samples-1;i>=0;i--) {
- outbufi*2 = outbufi;
- outbufi*2+1 = outbufi;
- }
- }
+ if(stereo)
+ for(i=samples-1;i>=0;i--) {
+	outbufi*2 = outbufi;
+	outbufi*2+1 = outbufi;
+ }
 break;
 
 case TYPE_OPL3:	// unsupported
@@ -108,53 +95,40 @@
 case TYPE_DUAL_OPL2:
 //for dual opl2 mode:
 //render each chip to a different tempbuffer
- YM3812UpdateOne(opl0,mixbuf1,samples);
- YM3812UpdateOne(opl1,mixbuf0,samples);
+ YM3812UpdateOne(opl0,tempbuf2,samples);
+ YM3812UpdateOne(opl1,tempbuf,samples);
 
 //output stereo:
 //then we need to interleave the two buffers
- if(unlikely (stereo)){
- //first, spread tempbuf's samples across left channel
- for(i=0;i<samples;i++)
- outbufi*2 = mixbuf1i;
- //next, insert the samples from tempbuf2 into right channel
- for(i=0;i<samples;i++)
- outbufi*2+1 = mixbuf0i;
- } else {
- //output mono:
- //then we need to mix the two buffers into buf
- for(i=0;i<samples;i++) {
- int sample = (int)mixbuf0i + (int)mixbuf1i;
- if (unlikely (sample > 32767)) {
- sample = 32767;
- }
- else if (unlikely (sample < -32768)) {
- sample = -32768;
- }
- outbufi = (short)sample;
- }
- }
+ if(stereo){
+ //first, spread tempbuf's samples across left channel
+ //left channel
+ for(i=0;i<samples;i++)
+	outbufi*2 = tempbuf2i;
+ //next, insert the samples from tempbuf2 into right channel
+ for(i=0;i<samples;i++)
+	outbufi*2+1 = tempbufi;
+ } else
+ //output mono:
+ //then we need to mix the two buffers into buf
+ for(i=0;i<samples;i++)
+	outbufi = (tempbufi>>1) + (tempbuf2i>>1);
 break;
 }
 
 //now reduce to 8bit if we need to
- if(unlikely (!use16bit)) {
- int smp = stereo ? samples*2 : samples;
- for(i=0;i<smp;i++) {
- ((char *)buf)i = (outbufi >> 8) ^ 0x80;
- }
- }
+ if(!use16bit)
+ for(i=0;i<(stereo ? samples*2 : samples);i++)
+ ((char *)buf)i = (outbufi >> 8) ^ 0x80;
 }
 
 void CEmuopl::write(int reg, int val)
 {
 switch(currType){
- case TYPE_DUAL_OPL2:
- OPLWrite(opl1, 0, reg);
- OPLWrite(opl1, 1, val);
 case TYPE_OPL2:
- OPLWrite(opl0, 0, reg);
- OPLWrite(opl0, 1, val);
+ case TYPE_DUAL_OPL2:
+ OPLWrite(oplcurrChip, 0, reg);
+ OPLWrite(oplcurrChip, 1, val);
 break;
 case TYPE_OPL3:	// unsupported
 break;

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/emuopl.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/emuopl.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/flash.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/flash.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/flash.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/flash.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/fmc.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/fmc.cpp Changed

@@ -14,12 +14,12 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 fmc.cpp - FMC Loader by Riven the Mage <riven@ok.ru>
 */
 
-#include <string.h>
+#include <cstring>
 #include "fmc.h"
 
 /* -------- Public Methods -------------------------------- */
@@ -29,7 +29,7 @@
 return new CfmcLoader(newopl);
 }
 
-bool CfmcLoader::load(const char *filename, const CFileProvider &fp)
+bool CfmcLoader::load(const std::string &filename, const CFileProvider &fp)
 {
 binistream *f = fp.open(filename); if(!f) return false;
 const unsigned char conv_fx16 = {0,1,2,3,4,8,255,255,255,255,26,11,12,13,14,15};
@@ -168,19 +168,19 @@
 return 50.0f;
 }
 
-const char * CfmcLoader::gettype()
+std::string CfmcLoader::gettype()
 {
- return "Faust Music Creator";
+ return std::string("Faust Music Creator");
 }
 
-const char * CfmcLoader::gettitle()
+std::string CfmcLoader::gettitle()
 {
- return header.title;
+ return std::string(header.title);
 }
 
-const char * CfmcLoader::getinstrument(unsigned int n)
+std::string CfmcLoader::getinstrument(unsigned int n)
 {
- return instrumentsn.name;
+ return std::string(instrumentsn.name);
 }
 
 unsigned int CfmcLoader::getinstruments()

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/fmc.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/fmc.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/fmopl.c -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/fmopl.c Changed

@@ -28,10 +28,14 @@
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
 #define INLINE		__inline
+#else
+#define INLINE		static inline
+#endif
 #define HAS_YM3812	1
 
 #include <stdio.h>
@@ -70,7 +74,7 @@
 /* final output shift , limit minimum and maximum */
 #define OPL_OUTSB (TL_BITS+3-16)		/* OPL output final shift 16bit */
 #define OPL_MAXOUT (0x7fff<<OPL_OUTSB)
-#define OPL_MINOUT (-0x8000<<OPL_OUTSB)
+#define OPL_MINOUT (-(0x8000<<OPL_OUTSB))
 
 /* -------------------- quality selection --------------------- */
 
@@ -125,54 +129,56 @@
 /* key scale level */
 /* table is 3dB/OCT , DV converts this in TL step at 6dB/OCT */
 #define DV (EG_STEP/2)
+#define U(x) ((UINT32)(x))
 static const UINT32 KSL_TABLE8*16=
 {
 	/* OCT 0 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
+	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
+	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
+	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
 	/* OCT 1 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV,
-	 1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV,
+	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
+	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
+	U( 0.000/DV),U( 0.750/DV),U( 1.125/DV),U( 1.500/DV),
+	U( 1.875/DV),U( 2.250/DV),U( 2.625/DV),U( 3.000/DV),
 	/* OCT 2 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV,
-	 3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV,
-	 4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV,
+	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
+	U( 0.000/DV),U( 1.125/DV),U( 1.875/DV),U( 2.625/DV),
+	U( 3.000/DV),U( 3.750/DV),U( 4.125/DV),U( 4.500/DV),
+	U( 4.875/DV),U( 5.250/DV),U( 5.625/DV),U( 6.000/DV),
 	/* OCT 3 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV,
-	 3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV,
-	 6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV,
-	 7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV,
+	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 1.875/DV),
+	U( 3.000/DV),U( 4.125/DV),U( 4.875/DV),U( 5.625/DV),
+	U( 6.000/DV),U( 6.750/DV),U( 7.125/DV),U( 7.500/DV),
+	U( 7.875/DV),U( 8.250/DV),U( 8.625/DV),U( 9.000/DV),
 	/* OCT 4 */
-	 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
-	 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
-	 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
-	10.875/DV,11.250/DV,11.625/DV,12.000/DV,
+	U( 0.000/DV),U( 0.000/DV),U( 3.000/DV),U( 4.875/DV),
+	U( 6.000/DV),U( 7.125/DV),U( 7.875/DV),U( 8.625/DV),
+	U( 9.000/DV),U( 9.750/DV),U(10.125/DV),U(10.500/DV),
+	U(10.875/DV),U(11.250/DV),U(11.625/DV),U(12.000/DV),
 	/* OCT 5 */
-	 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
-	 9.000/DV,10.125/DV,10.875/DV,11.625/DV,
-	12.000/DV,12.750/DV,13.125/DV,13.500/DV,
-	13.875/DV,14.250/DV,14.625/DV,15.000/DV,
+	U( 0.000/DV),U( 3.000/DV),U( 6.000/DV),U( 7.875/DV),
+	U( 9.000/DV),U(10.125/DV),U(10.875/DV),U(11.625/DV),
+	U(12.000/DV),U(12.750/DV),U(13.125/DV),U(13.500/DV),
+	U(13.875/DV),U(14.250/DV),U(14.625/DV),U(15.000/DV),
 	/* OCT 6 */
-	 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
-	12.000/DV,13.125/DV,13.875/DV,14.625/DV,
-	15.000/DV,15.750/DV,16.125/DV,16.500/DV,
-	16.875/DV,17.250/DV,17.625/DV,18.000/DV,
+	U( 0.000/DV),U( 6.000/DV),U( 9.000/DV),U(10.875/DV),
+	U(12.000/DV),U(13.125/DV),U(13.875/DV),U(14.625/DV),
+	U(15.000/DV),U(15.750/DV),U(16.125/DV),U(16.500/DV),
+	U(16.875/DV),U(17.250/DV),U(17.625/DV),U(18.000/DV),
 	/* OCT 7 */
-	 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
-	15.000/DV,16.125/DV,16.875/DV,17.625/DV,
-	18.000/DV,18.750/DV,19.125/DV,19.500/DV,
-	19.875/DV,20.250/DV,20.625/DV,21.000/DV
+	U( 0.000/DV),U( 9.000/DV),U(12.000/DV),U(13.875/DV),
+	U(15.000/DV),U(16.125/DV),U(16.875/DV),U(17.625/DV),
+	U(18.000/DV),U(18.750/DV),U(19.125/DV),U(19.500/DV),
+	U(19.875/DV),U(20.250/DV),U(20.625/DV),U(21.000/DV)
 };
+#undef U
 #undef DV
 
 /* sustain lebel table (3db per step) */
 /* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
-#define SC(db) (db*((3/EG_STEP)*(1<<ENV_BITS)))+EG_DST
+#define SC(db) (INT32)((db*((3/EG_STEP)*(1<<ENV_BITS)))+EG_DST)
 static const INT32 SL_TABLE16={
 SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
 SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)
@@ -200,8 +206,8 @@
 #define ML 2
 static const UINT32 MUL_TABLE16= {
 /* 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15 */
- 0.50*ML, 1.00*ML, 2.00*ML, 3.00*ML, 4.00*ML, 5.00*ML, 6.00*ML, 7.00*ML,
- 8.00*ML, 9.00*ML,10.00*ML,10.00*ML,12.00*ML,12.00*ML,15.00*ML,15.00*ML
+ ML/2, 1*ML, 2*ML, 3*ML, 4*ML, 5*ML, 6*ML, 7*ML,
+ 8*ML, 9*ML,10*ML,10*ML,12*ML,12*ML,15*ML,15*ML
 };
 #undef ML
 
@@ -244,7 +250,7 @@
 
 /* --------------------- subroutines --------------------- */
 
-static INLINE int Limit( int val, int max, int min ) {
+INLINE int Limit( int val, int max, int min ) {
 	if ( val > max )
 		val = max;
 	else if ( val < min )
@@ -254,7 +260,7 @@
 }
 
 /* status set and IRQ handling */
-static INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag)
+INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag)
 {
 	/* set status flag */
 	OPL->status |= flag;
@@ -270,7 +276,7 @@
 }
 
 /* status reset and IRQ handling */
-static INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
+INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
 {
 	/* reset status flag */
 	OPL->status &=~flag;
@@ -286,7 +292,7 @@
 }
 
 /* IRQ mask set */
-static INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
+INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
 {
 	OPL->statusmask = flag;
 	/* IRQ handling check */
@@ -295,7 +301,7 @@
 }
 
 /* ----- key on ----- */
-static INLINE void OPL_KEYON(OPL_SLOT *SLOT)
+INLINE void OPL_KEYON(OPL_SLOT *SLOT)
 {
 	/* sin wave restart */
 	SLOT->Cnt = 0;
@@ -306,7 +312,7 @@
 	SLOT->eve = EG_AED;
 }
 /* ----- key off ----- */
-static INLINE void OPL_KEYOFF(OPL_SLOT *SLOT)
+INLINE void OPL_KEYOFF(OPL_SLOT *SLOT)
 {
 	if( SLOT->evm > ENV_MOD_RR)
 	{
@@ -322,7 +328,7 @@
 
 /* ---------- calcrate Envelope Generator & Phase Generator ---------- */
 /* return : envelope output */
-static INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT )
+INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT )
 {
 	/* calcrate envelope generator */
 	if( (SLOT->evc+=SLOT->evs) >= SLOT->eve )
@@ -368,7 +374,7 @@
 }
 
 /* ---------- frequency counter for operater update ---------- */
-static INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
+INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
 {
 	int ksr;
 
@@ -388,7 +394,7 @@
 }
 
 /* set multi,am,vib,EG-TYP,KSR,mul */
-static INLINE void set_mul(FM_OPL *OPL,int slot,int v)
+INLINE void set_mul(FM_OPL *OPL,int slot,int v)
 {
 	OPL_CH *CH = &OPL->P_CHslot/2;
 	OPL_SLOT *SLOT = &CH->SLOTslot&1;
@@ -402,7 +408,7 @@
 }
 
 /* set ksl & tl */
-static INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v)
+INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v)
 {
 	OPL_CH *CH = &OPL->P_CHslot/2;
 	OPL_SLOT *SLOT = &CH->SLOTslot&1;
@@ -418,7 +424,7 @@
 }
 
 /* set attack rate & decay rate */
-static INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v)
+INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v)
 {
 	OPL_CH *CH = &OPL->P_CHslot/2;
 	OPL_SLOT *SLOT = &CH->SLOTslot&1;
@@ -435,7 +441,7 @@
 }
 
 /* set sustain level & release rate */
-static INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v)
+INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v)
 {
 	OPL_CH *CH = &OPL->P_CHslot/2;
 	OPL_SLOT *SLOT = &CH->SLOTslot&1;
@@ -452,7 +458,7 @@
 /* operator output calcrator */
 #define OP_OUT(slot,env,con) slot->wavetable((slot->Cnt+con)/(0x1000000/SIN_ENT))&(SIN_ENT-1)env
 /* ---------- calcrate one of channel ---------- */
-static INLINE void OPL_CALC_CH( OPL_CH *CH )
+INLINE void OPL_CALC_CH( OPL_CH *CH )
 {
 	UINT32 env_out;
 	OPL_SLOT *SLOT;
@@ -497,7 +503,7 @@
 
 /* ---------- calcrate rythm block ---------- */
 #define WHITE_NOISE_db 6.0
-static INLINE void OPL_CALC_RH( OPL_CH *CH )
+INLINE void OPL_CALC_RH( OPL_CH *CH )
 {
 	UINT32 env_tam,env_sd,env_top,env_hh;
 	int whitenoise = (rand()&1)*(WHITE_NOISE_db/EG_STEP);
@@ -596,7 +602,7 @@
 		OPL->AR_TABLEi = rate / ARRATE;
 		OPL->DR_TABLEi = rate / DRRATE;
 	}
-	for (i = 60;i < 76;i++)
+	for (i = 60;i < 75;i++)
 	{
 		OPL->AR_TABLEi = EG_AED-1;
 		OPL->DR_TABLEi = OPL->DR_TABLE60;
@@ -713,7 +719,7 @@
 }
 
 /* CSM Key Controll */
-static INLINE void CSMKeyControll(OPL_CH *CH)
+INLINE void CSMKeyControll(OPL_CH *CH)
 {
 	OPL_SLOT *slot1 = &CH->SLOTSLOT1;
 	OPL_SLOT *slot2 = &CH->SLOTSLOT2;
@@ -970,7 +976,7 @@
 			}
 		}
 		/* update */
-		if(CH->block_fnum != block_fnum)
+		if((int)CH->block_fnum != block_fnum)
 		{
 			int blockRv = 7-(block_fnum>>10);
 			int fnum = block_fnum&0x3ff;
@@ -1344,7 +1350,9 @@
 			if(OPL->keyboardhandler_r)
 				return OPL->keyboardhandler_r(OPL->keyboard_param);
 			else
+			{
 				LOG(LOG_WAR,("OPL:read unmapped KEYBOARD port\n"));
+			}
 		}
 		return 0;
 #if 0
@@ -1357,7 +1365,9 @@
 			if(OPL->porthandler_r)
 				return OPL->porthandler_r(OPL->port_param);
 			else
+			{
 				LOG(LOG_WAR,("OPL:read unmapped I/O port\n"));
+			}
 		}
 		return 0;
 	case 0x1a: /* PCM-DATA */

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/fprovide.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/fprovide.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/fprovide.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/fprovide.h Changed

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/got.cpp Added

@@ -0,0 +1,115 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2008 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * got.cpp - GOT Player by Stas'M <binarymaster@mail.ru>
+ *
+ * Based on IMF Player by Simon Peter <dn.tlp@gmx.net>
+ *
+ * REFERENCES:
+ * http://www.shikadi.net/moddingwiki/God_of_Thunder_Music_Format
+ */
+
+#include <string.h>
+
+#include "got.h"
+#include "database.h"
+
+/*** public methods *************************************/
+
+CPlayer *CgotPlayer::factory(Copl *newopl)
+{
+	return new CgotPlayer(newopl);
+}
+
+bool CgotPlayer::load(const std::string &filename, const CFileProvider &fp)
+{
+	binistream *f = fp.open(filename); if(!f) return false;
+
+	// file validation section
+	{
+		if (!fp.extension(filename, ".got"))
+		{
+			fp.close(f);
+			return false;
+		}
+		if (fp.filesize(f) % 3 != 0 || fp.filesize(f) < 9)
+		{
+			fp.close(f);
+			return false;
+		}
+		if (f->readInt(2) != 1)
+		{
+			fp.close(f);
+			return false;
+		}
+		f->seek(fp.filesize(f) - 4);
+		if (f->readInt(4) != 0)
+		{
+			fp.close(f);
+			return false;
+		}
+	}
+	f->seek(0);
+	CAdPlugDatabase::CKey key(*f);
+	f->seek(2);
+
+	// load section
+	size = fp.filesize(f) / 3 - 1;
+
+	data = new Sdatasize;
+	for(unsigned int i = 0; i < size; i++) {
+		datai.time = f->readInt(1);
+		datai.reg = f->readInt(1); datai.val = f->readInt(1);
+	}
+
+	CAdPlugDatabase::CKey menu_music;
+	menu_music.crc16 = 0xB627;
+	menu_music.crc32 = 0x72036C41;
+
+	if (key == menu_music)
+		rate = 140.0f;
+	else
+		rate = 120.0f;
+
+	fp.close(f);
+	rewind(0);
+	return true;
+}
+
+bool CgotPlayer::update()
+{
+	do {
+		del = datapos.time;
+		opl->write(datapos.reg, datapos.val);
+		pos++;
+	} while (!del && pos < size);
+
+	if (pos >= size) {
+		pos = 0;
+		songend = true;
+	} else
+		timer = rate / (float)del;
+
+	return !songend;
+}
+
+void CgotPlayer::rewind(int subsong)
+{
+	pos = 0; del = 0; timer = rate; songend = false;
+	opl->init(); opl->write(1,32); // go to OPL2 mode
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/got.h Added

@@ -0,0 +1,71 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2005 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * got.h - GOT Player by Stas'M <binarymaster@mail.ru>
+ *
+ * Based on IMF Player by Simon Peter <dn.tlp@gmx.net>
+ *
+ * REFERENCES:
+ * http://www.shikadi.net/moddingwiki/God_of_Thunder_Music_Format
+ */
+
+#ifndef H_ADPLUG_GOTPLAYER
+#define H_ADPLUG_GOTPLAYER
+
+#include "player.h"
+
+class CgotPlayer: public CPlayer
+{
+public:
+	static CPlayer *factory(Copl *newopl);
+
+	CgotPlayer(Copl *newopl)
+		: CPlayer(newopl), data(0)
+		{ }
+	~CgotPlayer()
+	{
+		if(data) delete data;
+	};
+
+	bool load(const std::string &filename, const CFileProvider &fp);
+	bool update();
+	void rewind(int subsong);
+
+	float getrefresh()
+	{
+		return timer;
+	};
+
+	std::string gettype()
+	{
+		return std::string("God of Thunder Music");
+	}
+
+protected:
+	unsigned long	pos, size;
+	unsigned short	del;
+	bool		songend;
+	float		rate, timer;
+
+	struct Sdata {
+		unsigned char	time;
+		unsigned char	reg, val;
+	} *data;
+};
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/herad.cpp Added

@@ -0,0 +1,1281 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2008 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * herad.cpp - Herbulot AdLib Player by Stas'M <binarymaster@mail.ru>
+ *
+ * Thanks goes to co-workers: 
+ * -=CHE@TER=- (SQX decompression)
+ * SynaMax (general documentation, reverse-engineering, testing)
+ * Jepael (timer code sample, DOS driver shell)
+ * Daniël van de Burgt "thatdutchguy" (pitch slides code sample)
+ *
+ * REFERENCES:
+ * http://www.vgmpf.com/Wiki/index.php/HERAD
+ *
+ * TODO:
+ * - Fix strange AGD sound
+ * - Fix splash sound in Gorbi (at 0:23)
+ * - Fix hiss sound in NewSan (at beginning)
+ */
+
+#include <cstring>
+#include <stdio.h>
+
+#include "herad.h"
+
+#ifdef DEBUG
+#include "debug.h"
+#endif
+
+const uint8_t CheradPlayer::slot_offsetHERAD_NUM_VOICES = {
+	0, 1, 2, 8, 9, 10, 16, 17, 18
+};
+const uint16_t CheradPlayer::FNumHERAD_NUM_NOTES = {
+	343, 364, 385, 408, 433, 459, 486, 515, 546, 579, 614, 650
+};
+const uint8_t CheradPlayer::fine_bendHERAD_NUM_NOTES + 1 = {
+	19, 21, 21, 23, 25, 26, 27, 29, 31, 33, 35, 36, 37
+};
+const uint8_t CheradPlayer::coarse_bend10 = {
+	0, 5, 10, 15, 20,
+	0, 6, 12, 18, 24
+};
+
+CPlayer *CheradPlayer::factory(Copl *newopl)
+{
+	return new CheradPlayer(newopl);
+}
+
+std::string CheradPlayer::gettype()
+{
+	char scomp12 + 1 = "";
+	if (comp > HERAD_COMP_NONE)
+		sprintf(scomp, ", %s packed", (comp == HERAD_COMP_HSQ ? "HSQ" : "SQX"));
+	char type40 + 1;
+	sprintf(type, "HERAD System %s (version %d%s)", (AGD ? "AGD" : "SDB"), (v2 ? 2 : 1), scomp);
+	return std::string(type);
+}
+
+bool isHSQ(uint8_t * data, int size)
+{
+	// data0 - word DecompSize
+	// data1
+	// data2 - byte Null = 0
+	// data3 - word CompSize
+	// data4
+	// data5 - byte Checksum
+	if ( data2 != 0 )
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: Is not HSQ, wrong check byte.\n");
+		#endif
+		return false;
+	}
+	if ( *(uint16_t *)(data + 3) != size )
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: Is not HSQ, wrong compressed size.\n");
+		#endif
+		return false;
+	}
+	uint8_t checksum = 0;
+	for (int i = 0; i < HERAD_MIN_SIZE; i++)
+	{
+		checksum += datai;
+	}
+	if ( checksum != 0xAB )
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: Is not HSQ, wrong checksum.\n");
+		#endif
+		return false;
+	}
+	return true;
+}
+
+bool isSQX(uint8_t * data)
+{
+	// data0 - word OutbufInit
+	// data1
+	// data2 - byte SQX flag #1
+	// data3 - byte SQX flag #2
+	// data4 - byte SQX flag #3
+	// data5 - byte CntOffPart
+	if ( data2 > 2 || data3 > 2 || data4 > 2 )
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: Is not SQX, wrong flags.\n");
+		#endif
+		return false;
+	}
+	if ( data5 == 0 || data5 > 15 )
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: Is not SQX, wrong bit count.\n");
+		#endif
+		return false;
+	}
+	return true;
+}
+
+uint16_t HSQ_decompress(uint8_t * data, int size, uint8_t * out)
+{
+	uint32_t queue = 1;
+	int8_t bit;
+	int16_t offset;
+	uint16_t count, out_size = *(uint16_t *)data;
+	uint8_t * src = data;
+	uint8_t * dst = out;
+
+	src += 6;
+	while (true)
+	{
+		// get next bit of the queue
+		if (queue == 1)
+		{
+			queue = *(uint16_t *)src | 0x10000;
+			src += 2;
+		}
+		bit = queue & 1;
+		queue >>= 1;
+		// if bit is non-zero
+		if (bit)
+		{
+			// copy next byte of the input to the output
+			*dst++ = *src++;
+		}
+		else
+		{
+			// get next bit of the queue
+			if (queue == 1)
+			{
+				queue = *(uint16_t *)src | 0x10000;
+				src += 2;
+			}
+			bit = queue & 1;
+			queue >>= 1;
+			// if bit is non-zero
+			if (bit)
+			{
+				// count = next 3 bits of the input
+				// offset = next 13 bits of the input minus 8192
+				count = *(uint16_t *)src;
+				offset = (count >> 3) - 8192;
+				count &= 7;
+				src += 2;
+				// if count is zero
+				if (!count)
+				{
+					// count = next 8 bits of the input
+					count = *(uint8_t *)src;
+					src++;
+				}
+				// if count is zero
+				if (!count)
+					break; // finish the unpacking
+			}
+			else
+			{
+				// count = next bit of the queue * 2 + next bit of the queue
+				if (queue == 1)
+				{
+					queue = *(uint16_t *)src | 0x10000;
+					src += 2;
+				}
+				bit = queue & 1;
+				queue >>= 1;
+				count = bit << 1;
+				if (queue == 1)
+				{
+					queue = *(uint16_t *)src | 0x10000;
+					src += 2;
+				}
+				bit = queue & 1;
+				queue >>= 1;
+				count += bit;
+				// offset = next 8 bits of the input minus 256
+				offset = *(uint8_t *)src;
+				offset -= 256;
+				src++;
+			}
+			count += 2;
+			// copy count bytes at (output + offset) to the output
+			while (count--)
+			{
+				*dst = *(dst + offset);
+				dst++;
+			}
+		}
+	}
+	return out_size;
+}
+
+uint16_t SQX_decompress(uint8_t * data, int size, uint8_t * out)
+{
+	int16_t offset;
+	uint16_t count;
+	uint8_t * src = data;
+	uint8_t * dst = out;
+	bool done = false;
+
+	*(uint16_t *)dst = *(uint16_t *)src;
+	src += 6;
+	uint16_t queue = 1;
+	uint8_t bit, bit_p;
+	while (true)
+	{
+		bit = queue & 1;
+		queue >>= 1;
+		if (queue == 0)
+		{
+			queue = *(uint16_t *)src;
+			src += 2;
+			bit_p = bit;
+			bit = queue & 1;
+			queue >>= 1;
+			if (bit_p)
+				queue |= 0x8000;
+		}
+		if (bit == 0)
+		{
+			switch (data2)
+			{
+			case 0:
+				*dst++ = *src++;
+				break;
+			case 1:
+				count = 0;
+				bit = queue & 1;
+				queue >>= 1;
+				if (queue == 0)
+				{
+					queue = *(uint16_t *)src;
+					src += 2;
+					bit_p = bit;
+					bit = queue & 1;
+					queue >>= 1;
+					if (bit_p)
+						queue |= 0x8000;
+					count = bit;
+					bit = queue & 1;
+					queue >>= 1;
+				}
+				else
+				{
+					count = bit;
+					bit = queue & 1;
+					queue >>= 1;
+					if (queue == 0)
+					{
+						queue = *(uint16_t *)src;
+						src += 2;
+						bit_p = bit;
+						bit = queue & 1;
+						queue >>= 1;
+						if (bit_p)
+							queue |= 0x8000;
+					}
+				}
+				count = (count << 1) | bit;
+				offset = *(uint8_t *)src;
+				offset -= 256;
+				src++;
+				count += 2;
+				while (count--)
+				{
+					*dst = *(dst + offset);
+					dst++;
+				}
+				break;
+			case 2:
+				count = *(uint16_t *)src;
+				offset = (count >> data5) - (1 << (16 - data5));
+				count &= (1 << data5) - 1;
+				src += 2;
+				if (!count)
+				{
+					count = *(uint8_t *)src;
+					src++;
+				}
+				if (!count)
+				{
+					done = true;
+					break;
+				}
+				count += 2;
+				while (count--)
+				{
+					*dst = *(dst + offset);
+					dst++;
+				}
+				break;
+			}
+			if (done)
+				break;
+			continue;
+		}
+		else
+		{
+			bit = queue & 1;
+			queue >>= 1;
+			if (queue == 0)
+			{
+				queue = *(uint16_t *)src;
+				src += 2;
+				bit_p = bit;
+				bit = queue & 1;
+				queue >>= 1;
+				if (bit_p)
+					queue |= 0x8000;
+			}
+			if (bit == 0)
+			{
+				switch (data3)
+				{
+				case 0:
+					*dst++ = *src++;
+					break;
+				case 1:
+					count = 0;
+					bit = queue & 1;
+					queue >>= 1;
+					if (queue == 0)
+					{
+						queue = *(uint16_t *)src;
+						src += 2;
+						bit_p = bit;
+						bit = queue & 1;
+						queue >>= 1;
+						if (bit_p)
+							queue |= 0x8000;
+						count = bit;
+						bit = queue & 1;
+						queue >>= 1;
+					}
+					else
+					{
+						count = bit;
+						bit = queue & 1;
+						queue >>= 1;
+						if (queue == 0)
+						{
+							queue = *(uint16_t *)src;
+							src += 2;
+							bit_p = bit;
+							bit = queue & 1;
+							queue >>= 1;
+							if (bit_p)
+								queue |= 0x8000;
+						}
+					}
+					count = (count << 1) | bit;
+					offset = *(uint8_t *)src;
+					offset -= 256;
+					src++;
+					count += 2;
+					while (count--)
+					{
+						*dst = *(dst + offset);
+						dst++;
+					}
+					break;
+				case 2:
+					count = *(uint16_t *)src;
+					offset = (count >> data5) - (1 << (16 - data5));
+					count &= (1 << data5) - 1;
+					src += 2;
+					if (!count)
+					{
+						count = *(uint8_t *)src;
+						src++;
+					}
+					if (!count)
+					{
+						done = true;
+						break;
+					}
+					count += 2;
+					while (count--)
+					{
+						*dst = *(dst + offset);
+						dst++;
+					}
+					break;
+				}
+				if (done)
+					break;
+				continue;
+			}
+			else
+			{
+				switch (data4)
+				{
+				case 0:
+					*dst++ = *src++;
+					break;
+				case 1:
+					count = 0;
+					bit = queue & 1;
+					queue >>= 1;
+					if (queue == 0)
+					{
+						queue = *(uint16_t *)src;
+						src += 2;
+						bit_p = bit;
+						bit = queue & 1;
+						queue >>= 1;
+						if (bit_p)
+							queue |= 0x8000;
+						count = bit;
+						bit = queue & 1;
+						queue >>= 1;
+					}
+					else
+					{
+						count = bit;
+						bit = queue & 1;
+						queue >>= 1;
+						if (queue == 0)
+						{
+							queue = *(uint16_t *)src;
+							src += 2;
+							bit_p = bit;
+							bit = queue & 1;
+							queue >>= 1;
+							if (bit_p)
+								queue |= 0x8000;
+						}
+					}
+					count = (count << 1) | bit;
+					offset = *(uint8_t *)src;
+					offset -= 256;
+					src++;
+					count += 2;
+					while (count--)
+					{
+						*dst = *(dst + offset);
+						dst++;
+					}
+					break;
+				case 2:
+					count = *(uint16_t *)src;
+					offset = (count >> data5) - (1 << (16 - data5));
+					count &= (1 << data5) - 1;
+					src += 2;
+					if (!count)
+					{
+						count = *(uint8_t *)src;
+						src++;
+					}
+					if (!count)
+					{
+						done = true;
+						break;
+					}
+					count += 2;
+					while (count--)
+					{
+						*dst = *(dst + offset);
+						dst++;
+					}
+					break;
+				}
+				if (done)
+					break;
+				continue;
+			}
+		}
+	}
+	return dst - out;
+}
+
+bool CheradPlayer::load(const std::string &filename, const CFileProvider &fp)
+{
+	binistream *f = fp.open(filename); if(!f) return false;
+
+	// file validation
+	if (!fp.extension(filename, ".hsq") &&
+		!fp.extension(filename, ".sqx") &&
+		!fp.extension(filename, ".sdb") &&
+		!fp.extension(filename, ".agd") &&
+		!fp.extension(filename, ".ha2"))
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: Unsupported file extension.\n");
+		#endif
+		fp.close(f);
+		return false;
+	}
+	int size = fp.filesize(f);
+	if (size < HERAD_MIN_SIZE)
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: File size is too small.\n");
+		#endif
+		fp.close(f);
+		return false;
+	}
+	if (size > HERAD_MAX_SIZE)
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: File size is too big.\n");
+		#endif
+		fp.close(f);
+		return false;
+	}
+	// Read entire file into memory
+	uint8_t * data = new uint8_tsize;
+	f->readString((char *)data, size);
+	fp.close(f);
+	// Detect compression
+	if (isHSQ(data, size))
+	{
+		comp = HERAD_COMP_HSQ;
+		uint8_t * out = new uint8_tHERAD_MAX_SIZE;
+		memset(out, 0, HERAD_MAX_SIZE);
+		size = HSQ_decompress(data, size, out);
+		delete data;
+		data = new uint8_tsize;
+		memcpy(data, out, size);
+		delete out;
+	}
+	else if (isSQX(data))
+	{
+		comp = HERAD_COMP_SQX;
+		uint8_t * out = new uint8_tHERAD_MAX_SIZE;
+		memset(out, 0, HERAD_MAX_SIZE);
+		size = SQX_decompress(data, size, out);
+		delete data;
+		data = new uint8_tsize;
+		memcpy(data, out, size);
+		delete out;
+	}
+	else
+	{
+		comp = HERAD_COMP_NONE;
+	}
+	// Process file header
+	uint16_t offset;
+	if (size < HERAD_HEAD_SIZE)
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: File size is too small.\n");
+		#endif
+		goto failure;
+	}
+	if ( size < *(uint16_t *)data )
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: Incorrect offset / file size.\n");
+		#endif
+		goto failure;
+	}
+	nInsts = (size - *(uint16_t *)data) / HERAD_INST_SIZE;
+	if ( nInsts == 0 )
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: M32 files are not supported.\n");
+		#endif
+		goto failure;
+	}
+	offset = *(uint16_t *)(data + 2);
+	if ( offset != 0x32 && offset != 0x52 )
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: Wrong first track offset.\n");
+		#endif
+		goto failure;
+	}
+	AGD = offset == 0x52;
+	wLoopStart = *(uint16_t *)(data + 0x2C);
+	wLoopEnd = *(uint16_t *)(data + 0x2E);
+	wLoopCount = *(uint16_t *)(data + 0x30);
+	wSpeed = *(uint16_t *)(data + 0x32);
+	if (wSpeed == 0)
+	{
+		#ifdef DEBUG
+		AdPlug_LogWrite("HERAD: Speed is not defined.\n");
+		#endif
+		goto failure;
+	}
+	nTracks = 0;
+	for (int i = 0; i < HERAD_MAX_TRACKS; i++)
+	{
+		if ( *(uint16_t *)(data + 2 + i * 2) == 0 )
+			break;
+		nTracks++;
+	}
+	track = new herad_trknTracks;
+	chn = new herad_chnnTracks;
+	for (int i = 0; i < nTracks; i++)
+	{
+		offset = *(uint16_t *)(data + 2 + i * 2) + 2;
+		uint16_t next = (i < HERAD_MAX_TRACKS - 1 ? *(uint16_t *)(data + 2 + (i + 1) * 2) + 2 : *(uint16_t *)data);
+		if (next <= 2) next = *(uint16_t *)data;
+
+		tracki.size = next - offset;
+		tracki.data = new uint8_ttracki.size;
+		memcpy(tracki.data, data + offset, tracki.size);
+	}
+	inst = new herad_instnInsts;
+	offset = *(uint16_t *)data;
+	v2 = true;
+	for (int i = 0; i < nInsts; i++)
+	{
+		memcpy(insti.data, data + offset + i * HERAD_INST_SIZE, HERAD_INST_SIZE);
+		if (v2 && insti.param.mode == HERAD_INSTMODE_SDB1)
+			v2 = false;
+	}
+	delete data;
+	goto good;
+
+failure:
+	delete data;
+	return false;
+
+good:
+	rewind(0);
+	return true;
+}
+
+void CheradPlayer::rewind(int subsong)
+{
+	uint32_t j;
+	wTime = 0;
+	songend = false;
+
+	ticks_pos = -1; // there's always 1 excess tick at start
+	total_ticks = 0;
+	loop_pos = -1;
+	loop_times = 1;
+
+	for (int i = 0; i < nTracks; i++)
+	{
+		tracki.pos = 0;
+		j = 0;
+		while (tracki.pos < tracki.size)
+		{
+			j += GetTicks(i);
+			switch (tracki.datatracki.pos++ & 0xF0)
+			{
+			case 0x80:	// Note Off
+				tracki.pos += (v2 ? 1 : 2);
+				break;
+			case 0x90:	// Note On
+			case 0xA0:	// Unused
+			case 0xB0:	// Unused
+				tracki.pos += 2;
+				break;
+			case 0xC0:	// Program Change
+			case 0xD0:	// Aftertouch
+			case 0xE0:	// Pitch Bend
+				tracki.pos++;
+				break;
+			default:
+				tracki.pos = tracki.size;
+				break;
+			}
+		}
+		if (j > total_ticks)
+			total_ticks = j;
+		tracki.pos = 0;
+		tracki.counter = 0;
+		tracki.ticks = 0;
+		chni.program = 0;
+		chni.playprog = 0;
+		chni.note = 0;
+		chni.keyon = false;
+		chni.bend = HERAD_BEND_CENTER;
+		chni.slide_dur = 0;
+	}
+	if (v2)
+	{
+		if (!wLoopStart || wLoopCount) wLoopStart = 1; // if loop not specified, start from beginning
+		if (!wLoopEnd || wLoopCount) wLoopEnd = getpatterns() + 1; // till the end
+		if (wLoopCount) wLoopCount = 0; // repeats forever
+	}
+
+	opl->init();
+	opl->write(1, 32); // Enable Waveform Select
+	opl->write(0xBD, 0); // Disable Percussion Mode
+	opl->write(8, 64); // Enable Note-Sel
+	if (AGD)
+	{
+		opl->setchip(1);
+		opl->write(5, 1); // Enable OPL3
+		opl->write(4, 0); // Disable 4OP Mode
+		opl->setchip(0);
+	}
+}
+
+/*
+ * Get delta ticks (t - track index)
+ */
+uint32_t CheradPlayer::GetTicks(uint8_t t)
+{
+	uint32_t result = 0;
+	do
+	{
+		result <<= 7;
+		result |= trackt.datatrackt.pos & 0x7F;
+	} while (trackt.datatrackt.pos++ & 0x80 && trackt.pos < trackt.size);
+	return result;
+}
+
+/*
+ * Execute event (t - track index)
+ */
+void CheradPlayer::executeCommand(uint8_t t)
+{
+	uint8_t status, note, par;
+
+	if (t >= nTracks)
+		return;
+
+	if (t >= (AGD ? HERAD_NUM_VOICES * 2 : HERAD_NUM_VOICES))
+	{
+		trackt.pos = trackt.size;
+		return;
+	}
+
+	// execute MIDI command
+	status = trackt.datatrackt.pos++;
+	if (status == 0xFF)
+	{
+		trackt.pos = trackt.size;
+	}
+	else
+	{
+		switch (status & 0xF0)
+		{
+		case 0x80:	// Note Off
+			note = trackt.datatrackt.pos++;
+			par = (v2 ? 0 : trackt.datatrackt.pos++);
+			ev_noteOff(t, note, par);
+			break;
+		case 0x90:	// Note On
+			note = trackt.datatrackt.pos++;
+			par = trackt.datatrackt.pos++;
+			ev_noteOn(t, note, par);
+			break;
+		case 0xA0:	// Unused
+		case 0xB0:	// Unused
+			trackt.pos += 2;
+			break;
+		case 0xC0:	// Program Change
+			par = trackt.datatrackt.pos++;
+			ev_programChange(t, par);
+			break;
+		case 0xD0:	// Aftertouch
+			par = trackt.datatrackt.pos++;
+			ev_aftertouch(t, par);
+			break;
+		case 0xE0:	// Pitch Bend
+			par = trackt.datatrackt.pos++;
+			ev_pitchBend(t, par);
+			break;
+		default:
+			trackt.pos = trackt.size;
+			break;
+		}
+	}
+}
+
+void CheradPlayer::ev_noteOn(uint8_t ch, uint8_t note, uint8_t vel)
+{
+	int8_t macro;
+
+	if (chnch.keyon)
+	{
+		// turn off last active note
+		chnch.keyon = false;
+		playNote(ch, chnch.note, HERAD_NOTE_OFF);
+	}
+	if (v2 && instchnch.program.param.mode == HERAD_INSTMODE_KMAP)
+	{
+		// keymap is used
+		int8_t mp = note - (instchnch.program.keymap.offset + 24);
+		if (mp < 0 || mp >= HERAD_INST_SIZE - 4)
+			return; // if not in range, skip note
+		chnch.playprog = instchnch.program.keymap.indexmp;
+		changeProgram(ch, chnch.playprog);
+	}
+	chnch.note = note;
+	chnch.keyon = true;
+	chnch.bend = HERAD_BEND_CENTER;
+	if (v2 && instchnch.playprog.param.mode == HERAD_INSTMODE_KMAP)
+		return; // single keymapped instrument can't be keymap (avoid recursion)
+	playNote(ch, note, HERAD_NOTE_ON);
+	macro = instchnch.playprog.param.mc_mod_out_vel;
+	if (macro != 0)
+		macroModOutput(ch, chnch.playprog, macro, vel);
+	macro = instchnch.playprog.param.mc_car_out_vel;
+	if (macro != 0)
+		macroCarOutput(ch, chnch.playprog, macro, vel);
+	macro = instchnch.playprog.param.mc_fb_vel;
+	if (macro != 0)
+		macroFeedback(ch, chnch.playprog, macro, vel);
+}
+
+void CheradPlayer::ev_noteOff(uint8_t ch, uint8_t note, uint8_t vel)
+{
+	if (note != chnch.note || !chnch.keyon)
+		return;
+	chnch.keyon = false;
+	playNote(ch, note, HERAD_NOTE_OFF);
+}
+
+void CheradPlayer::ev_programChange(uint8_t ch, uint8_t prog)
+{
+	if (prog >= nInsts) // out of index
+		return;
+	chnch.program = prog;
+	chnch.playprog = prog;
+	changeProgram(ch, prog);
+}
+
+void CheradPlayer::ev_aftertouch(uint8_t ch, uint8_t vel)
+{
+	int8_t macro;
+
+	if (v2) // version 2 ignores this event
+		return;
+	macro = instchnch.playprog.param.mc_mod_out_at;
+	if (macro != 0)
+		macroModOutput(ch, chnch.playprog, macro, vel);
+	macro = instchnch.playprog.param.mc_car_out_at;
+	if (macro != 0 && instchnch.playprog.param.mc_car_out_vel != 0)
+		macroCarOutput(ch, chnch.playprog, macro, vel);
+	macro = instchnch.playprog.param.mc_fb_at;
+	if (macro != 0)
+		macroFeedback(ch, chnch.playprog, macro, vel);
+}
+
+void CheradPlayer::ev_pitchBend(uint8_t ch, uint8_t bend)
+{
+	chnch.bend = bend;
+	if (chnch.keyon) // update pitch
+		playNote(ch, chnch.note, HERAD_NOTE_UPDATE);
+}
+
+/*
+ * Play Note (c - channel, note number, note state - see HERAD_NOTE_*)
+ */
+void CheradPlayer::playNote(uint8_t c, uint8_t note, uint8_t state)
+{
+	if (instchnc.playprog.param.mc_transpose != 0)
+		macroTranspose(&note, chnc.playprog);
+	note = (note - 24) & 0xFF;
+	if (state != HERAD_NOTE_UPDATE && note >= 0x60)
+		note = 0; // clip too low/high notes
+	int8_t oct = note / HERAD_NUM_NOTES;
+	int8_t key = note % HERAD_NUM_NOTES;
+	if (state != HERAD_NOTE_UPDATE && instchnc.playprog.param.mc_slide_dur)
+	{
+		chnc.slide_dur = (state == HERAD_NOTE_ON ? instchnc.playprog.param.mc_slide_dur : 0);
+	}
+	uint8_t bend = chnc.bend;
+	int16_t amount, detune = 0;
+	uint8_t amount_lo, amount_hi;
+	if (!(instchnc.playprog.param.mc_slide_coarse & 1))
+	{ // fine tune
+		if (bend - HERAD_BEND_CENTER < 0)
+		{ // slide down
+			amount = HERAD_BEND_CENTER - bend;
+			amount_lo = (amount >> 5);
+			amount_hi = (amount << 3) & 0xFF;
+			key -= amount_lo;
+
+			if (key < 0)
+			{
+				key += HERAD_NUM_NOTES;
+				oct--;
+			}
+			if (oct < 0)
+			{
+				key = 0;
+				oct = 0;
+			}
+			detune = -1 * ((fine_bendkey * amount_hi) >> 8);
+		}
+		else
+		{ // slide up
+			amount = bend - HERAD_BEND_CENTER;
+			amount_lo = (amount >> 5);
+			amount_hi = (amount << 3) & 0xFF;
+			key += amount_lo;
+
+			if (key >= HERAD_NUM_NOTES)
+			{
+				key -= HERAD_NUM_NOTES;
+				oct++;
+			}
+			detune = (fine_bendkey + 1 * amount_hi) >> 8;
+		}
+	}
+	else
+	{ // coarse tune
+		uint8_t offset;
+		if (bend - HERAD_BEND_CENTER < 0)
+		{ // slide down
+			amount = HERAD_BEND_CENTER - bend;
+			key -= amount / 5;
+
+			if (key < 0)
+			{
+				key += HERAD_NUM_NOTES;
+				oct--;
+			}
+			if (oct < 0)
+			{
+				key = 0;
+				oct = 0;
+			}
+			offset = (amount % 5) + (key >= 6 ? 5 : 0);
+			detune = -1 * coarse_bendoffset;
+		}
+		else
+		{ // slide up
+			amount = bend - HERAD_BEND_CENTER;
+			key += amount / 5;
+
+			if (key >= HERAD_NUM_NOTES)
+			{
+				key -= HERAD_NUM_NOTES;
+				oct++;
+			}
+			offset = (amount % 5) + (key >= 6 ? 5 : 0);
+			detune = coarse_bendoffset;
+		}
+	}
+	setFreq(c, oct, FNumkey + detune, state != HERAD_NOTE_OFF);
+}
+
+/*
+ * Set Frequency and Key (c - channel, octave, frequency, note on)
+ */
+void CheradPlayer::setFreq(uint8_t c, uint8_t oct, uint16_t freq, bool on)
+{
+	uint8_t reg, val;
+
+	if (c >= HERAD_NUM_VOICES) opl->setchip(1);
+
+	reg = 0xA0 + (c % HERAD_NUM_VOICES);
+	val = freq & 0xFF;
+	opl->write(reg, val);
+	reg = 0xB0 + (c % HERAD_NUM_VOICES);
+	val = ((freq >> 8) & 3) |
+		((oct & 7) << 2) |
+		((on ? 1 : 0) << 5);
+	opl->write(reg, val);
+
+	if (c >= HERAD_NUM_VOICES) opl->setchip(0);
+}
+
+/*
+ * Change Program (c - channel, i - instrument index)
+ */
+void CheradPlayer::changeProgram(uint8_t c, uint8_t i)
+{
+	uint8_t reg, val;
+
+	if (v2 && insti.param.mode == HERAD_INSTMODE_KMAP)
+		return;
+
+	if (c >= HERAD_NUM_VOICES) opl->setchip(1);
+
+	// Amp Mod / Vibrato / EG type / Key Scaling / Multiple
+	reg = 0x20 + slot_offsetc % HERAD_NUM_VOICES;
+	val = (insti.param.mod_mul & 15) |
+		((insti.param.mod_ksr & 1) << 4) |
+		((insti.param.mod_eg > 0 ? 1 : 0) << 5) |
+		((insti.param.mod_vib & 1) << 6) |
+		((insti.param.mod_am & 1) << 7);
+	opl->write(reg, val);
+	reg += 3;
+	val = (insti.param.car_mul & 15) |
+		((insti.param.car_ksr & 1) << 4) |
+		((insti.param.car_eg > 0 ? 1 : 0) << 5) |
+		((insti.param.car_vib & 1) << 6) |
+		((insti.param.car_am & 1) << 7);
+	opl->write(reg, val);
+
+	// Key scaling level / Output level
+	reg = 0x40 + slot_offsetc % HERAD_NUM_VOICES;
+	val = (insti.param.mod_out & 63) |
+		((insti.param.mod_ksl & 3) << 6);
+	opl->write(reg, val);
+	reg += 3;
+	val = (insti.param.car_out & 63) |
+		((insti.param.car_ksl & 3) << 6);
+	opl->write(reg, val);
+
+	// Attack Rate / Decay Rate
+	reg = 0x60 + slot_offsetc % HERAD_NUM_VOICES;
+	val = (insti.param.mod_D & 15) |
+		((insti.param.mod_A & 15) << 4);
+	opl->write(reg, val);
+	reg += 3;
+	val = (insti.param.car_D & 15) |
+		((insti.param.car_A & 15) << 4);
+	opl->write(reg, val);
+
+	// Sustain Level / Release Rate
+	reg = 0x80 + slot_offsetc % HERAD_NUM_VOICES;
+	val = (insti.param.mod_R & 15) |
+		((insti.param.mod_S & 15) << 4);
+	opl->write(reg, val);
+	reg += 3;
+	val = (insti.param.car_R & 15) |
+		((insti.param.car_S & 15) << 4);
+	opl->write(reg, val);
+
+	// Panning / Feedback strength / Connection type
+	reg = 0xC0 + (c % HERAD_NUM_VOICES);
+	val = (insti.param.con > 0 ? 0 : 1) |
+		((insti.param.feedback & 7) << 1) |
+		((AGD ? (insti.param.pan == 0 || insti.param.pan > 3 ? 3 : insti.param.pan) : 0) << 4);
+	opl->write(reg, val);
+
+	// Wave Select
+	reg = 0xE0 + slot_offsetc % HERAD_NUM_VOICES;
+	val = insti.param.mod_wave & (AGD ? 7 : 3);
+	opl->write(reg, val);
+	reg += 3;
+	val = insti.param.car_wave & (AGD ? 7 : 3);
+	opl->write(reg, val);
+
+	if (c >= HERAD_NUM_VOICES) opl->setchip(0);
+}
+
+/*
+ * Macro: Change Modulator Output (c - channel, i - instrument index, sensitivity, level)
+ */
+void CheradPlayer::macroModOutput(uint8_t c, uint8_t i, int8_t sens, uint8_t level)
+{
+	uint8_t reg, val;
+	uint16_t output;
+
+	if (sens < -4 || sens > 4)
+		return;
+
+	if (sens < 0)
+	{
+		output = (level >> (sens + 4) > 63 ? 63 : level >> (sens + 4));
+	}
+	else
+	{
+		output = ((0x80 - level) >> (4 - sens) > 63 ? 63 : (0x80 - level) >> (4 - sens));
+	}
+	output += insti.param.mod_out;
+	if (output > 63) output = 63;
+
+	if (c >= HERAD_NUM_VOICES) opl->setchip(1);
+
+	// Key scaling level / Output level
+	reg = 0x40 + slot_offsetc % HERAD_NUM_VOICES;
+	val = (output & 63) |
+		((insti.param.mod_ksl & 3) << 6);
+	opl->write(reg, val);
+
+	if (c >= HERAD_NUM_VOICES) opl->setchip(0);
+}
+
+/*
+ * Macro: Change Carrier Output (c - channel, i - instrument index, sensitivity, level)
+ */
+void CheradPlayer::macroCarOutput(uint8_t c, uint8_t i, int8_t sens, uint8_t level)
+{
+	uint8_t reg, val;
+	uint16_t output;
+
+	if (sens < -4 || sens > 4)
+		return;
+
+	if (sens < 0)
+	{
+		output = (level >> (sens + 4) > 63 ? 63 : level >> (sens + 4));
+	}
+	else
+	{
+		output = ((0x80 - level) >> (4 - sens) > 63 ? 63 : (0x80 - level) >> (4 - sens));
+	}
+	output += insti.param.car_out;
+	if (output > 63) output = 63;
+
+	if (c >= HERAD_NUM_VOICES) opl->setchip(1);
+
+	// Key scaling level / Output level
+	reg = 0x43 + slot_offsetc % HERAD_NUM_VOICES;
+	val = (output & 63) |
+		((insti.param.car_ksl & 3) << 6);
+	opl->write(reg, val);
+
+	if (c >= HERAD_NUM_VOICES) opl->setchip(0);
+}
+
+/*
+ * Macro: Change Feedback (c - channel, i - instrument index, sensitivity, level)
+ */
+void CheradPlayer::macroFeedback(uint8_t c, uint8_t i, int8_t sens, uint8_t level)
+{
+	uint8_t reg, val;
+	uint8_t feedback;
+
+	if (sens < -6 || sens > 6)
+		return;
+
+	if (sens < 0)
+	{
+		feedback = (level >> (sens + 7) > 7 ? 7 : level >> (sens + 7));
+	}
+	else
+	{
+		feedback = ((0x80 - level) >> (7 - sens) > 7 ? 7 : (0x80 - level) >> (7 - sens));
+	}
+	feedback += insti.param.feedback;
+	if (feedback > 7) feedback = 7;
+
+	if (c >= HERAD_NUM_VOICES) opl->setchip(1);
+
+	// Panning / Feedback strength / Connection type
+	reg = 0xC0 + (c % HERAD_NUM_VOICES);
+	val = (insti.param.con > 0 ? 0 : 1) |
+		((feedback & 7) << 1) |
+		((AGD ? (insti.param.pan == 0 || insti.param.pan > 3 ? 3 : insti.param.pan) : 0) << 4);
+	opl->write(reg, val);
+
+	if (c >= HERAD_NUM_VOICES) opl->setchip(0);
+}
+
+/*
+ * Macro: Root Note Transpose (note, i - instrument index)
+ */
+void CheradPlayer::macroTranspose(uint8_t * note, uint8_t i)
+{
+	uint8_t tran = insti.param.mc_transpose;
+	uint8_t diff = (tran - 0x31) & 0xFF;
+	if (v2 && diff < 0x60)
+		*note = (diff + 0x18) & 0xFF;
+	else
+		*note = (*note + tran) & 0xFF;
+}
+
+/*
+ * Macro: Pitch Bend Slide (c - channel)
+ */
+void CheradPlayer::macroSlide(uint8_t c)
+{
+	if (!chnc.slide_dur)
+		return;
+
+	chnc.slide_dur--;
+	chnc.bend += instchnc.playprog.param.mc_slide_range;
+
+	if (!(chnc.note & 0x7F))
+		return;
+	playNote(c, chnc.note, HERAD_NOTE_UPDATE);
+}
+
+void CheradPlayer::processEvents()
+{
+	uint8_t i;
+	songend = true;
+
+	if (wLoopStart && wLoopEnd && (ticks_pos + 1) % HERAD_MEASURE_TICKS == 0 && (ticks_pos + 1) / HERAD_MEASURE_TICKS + 1 == wLoopStart)
+	{
+		loop_pos = ticks_pos;
+		for (i = 0; i < nTracks; i++)
+		{
+			loop_datai.counter = tracki.counter;
+			loop_datai.ticks = tracki.ticks;
+			loop_datai.pos = tracki.pos;
+		}
+	}
+	for (i = 0; i < nTracks; i++)
+	{
+		if (chni.slide_dur > 0 && chni.keyon)
+			macroSlide(i);
+		if (tracki.pos >= tracki.size)
+			continue;
+		songend = false; // track is not finished
+		if (!tracki.counter)
+		{
+			bool first = tracki.pos == 0;
+			tracki.ticks = GetTicks(i);
+			if (first && tracki.ticks)
+				tracki.ticks++; // workaround to synchronize tracks (there's always 1 excess tick at start)
+		}
+		if (++tracki.counter >= tracki.ticks)
+		{
+			tracki.counter = 0;
+			while (tracki.pos < tracki.size)
+			{
+				executeCommand(i);
+				if (tracki.pos >= tracki.size) {
+					break;
+				}
+				else if (!tracki.datatracki.pos) // if next delay is zero
+				{
+					tracki.pos++;
+				}
+				else break;
+			}
+		}
+		else if (tracki.ticks >= 0x8000)
+		{
+			tracki.pos = tracki.size;
+			tracki.counter = tracki.ticks;
+		}
+	}
+	if (!songend)
+		ticks_pos++;
+	if (wLoopStart && wLoopEnd && (ticks_pos == total_ticks || (ticks_pos % HERAD_MEASURE_TICKS == 0 && ticks_pos / HERAD_MEASURE_TICKS + 1 == wLoopEnd)))
+	{
+#ifdef HERAD_USE_LOOPING
+		if (!wLoopCount)
+			songend = true;
+		else if (songend && loop_times < wLoopCount)
+			songend = false;
+
+		if (!wLoopCount || loop_times < wLoopCount)
+		{
+			ticks_pos = loop_pos;
+			for (i = 0; i < nTracks; i++)
+			{
+				tracki.counter = loop_datai.counter;
+				tracki.ticks = loop_datai.ticks;
+				tracki.pos = loop_datai.pos;
+			}
+			if (wLoopCount)
+				loop_times++;
+		}
+#endif
+	}
+}
+
+bool CheradPlayer::update()
+{
+	wTime = wTime - 256;
+	if (wTime < 0)
+	{
+		wTime = wTime + wSpeed;
+		processEvents();
+	}
+	return !songend;
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/herad.h Added

@@ -0,0 +1,244 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2005 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * herad.h - Herbulot AdLib Player by Stas'M <binarymaster@mail.ru>
+ *
+ * Thanks goes to co-workers: 
+ * -=CHE@TER=- (SQX decompression)
+ * SynaMax (general documentation, reverse-engineering, testing)
+ * Jepael (timer code sample, DOS driver shell)
+ * Daniël van de Burgt "thatdutchguy" (pitch slides code sample)
+ *
+ * REFERENCES:
+ * http://www.vgmpf.com/Wiki/index.php/HERAD
+ */
+
+#ifndef H_ADPLUG_HERADPLAYER
+#define H_ADPLUG_HERADPLAYER
+
+#include <stdint.h>
+#include "player.h"
+
+#define HERAD_MIN_SIZE		6		/* Minimum file size for compression detection */
+#define HERAD_MAX_SIZE		75775		/* Maximum possible file size: 0xFFFF + 256 * HERAD_INST_SIZE */
+#define HERAD_HEAD_SIZE		52		/* File header size */
+#define HERAD_COMP_NONE		0
+#define HERAD_COMP_HSQ		1
+#define HERAD_COMP_SQX		2
+#define HERAD_MAX_TRACKS	21
+#define HERAD_INST_SIZE		40
+#define HERAD_INSTMODE_SDB1	0		/* HERAD SDB version 1 instrument */
+#define HERAD_INSTMODE_SDB2	1		/* HERAD SDB version 2 instrument */
+#define HERAD_INSTMODE_AGD	4		/* HERAD AGD instrument */
+#define HERAD_INSTMODE_KMAP	-1		/* HERAD version 2 keymap */
+#define HERAD_FNUM_MIN		325		/* Minimum note frequency number */
+#define HERAD_FNUM_MAX		685		/* Maximum note frequency number */
+#define HERAD_BEND_CENTER	0x40	/* Pitch bend middle value */
+#define HERAD_NOTE_OFF		0
+#define HERAD_NOTE_ON		1
+#define HERAD_NOTE_UPDATE	2
+#define HERAD_NUM_VOICES	9
+#define HERAD_NUM_NOTES		12
+#define HERAD_MEASURE_TICKS	96
+//#define HERAD_USE_LOOPING			/* Uncomment this to enable looping */
+
+class CheradPlayer: public CPlayer
+{
+public:
+	static CPlayer *factory(Copl *newopl);
+
+	CheradPlayer(Copl *newopl)
+		: CPlayer(newopl), track(0), chn(0), inst(0)
+		{ }
+	~CheradPlayer()
+	{
+		if (track)
+		{
+			for (int i = 0; i < nTracks; i++)
+			{
+				if (tracki.data) delete tracki.data;
+			}
+			delete track;
+		}
+		if (chn) delete chn;
+		if (inst) delete inst;
+	};
+
+	bool load(const std::string &filename, const CFileProvider &fp);
+	bool update();
+	void rewind(int subsong);
+
+	float getrefresh()
+	{
+		return (float)200.299;
+	};
+
+	unsigned int getspeed()
+	{
+		return wSpeed;
+	};
+
+	unsigned int getpatterns()
+	{
+		return total_ticks / HERAD_MEASURE_TICKS + (total_ticks % HERAD_MEASURE_TICKS ? 1 : 0);
+	};
+
+	unsigned int getpattern()
+	{
+		return (ticks_pos <= 0 ? 0: (ticks_pos - 1) / HERAD_MEASURE_TICKS + 1);
+	};
+
+	unsigned int getrow()
+	{
+		return (ticks_pos <= 0 ? 0 : (ticks_pos - 1) % HERAD_MEASURE_TICKS);
+	};
+
+	std::string gettype();
+
+	unsigned int getinstruments()
+	{
+		return inst ? nInsts : 0;
+	};
+
+	std::string getinstrument(unsigned int n)
+	{
+		return std::string();
+	};
+
+private:
+	uint32_t GetTicks(uint8_t t);
+	void executeCommand(uint8_t t);
+	void processEvents();
+	void ev_noteOn(uint8_t ch, uint8_t note, uint8_t vel);
+	void ev_noteOff(uint8_t ch, uint8_t note, uint8_t vel);
+	void ev_programChange(uint8_t ch, uint8_t prog);
+	void ev_aftertouch(uint8_t ch, uint8_t vel);
+	void ev_pitchBend(uint8_t ch, uint8_t bend);
+	void playNote(uint8_t c, uint8_t note, uint8_t state);
+	void setFreq(uint8_t c, uint8_t oct, uint16_t freq, bool on);
+	void changeProgram(uint8_t c, uint8_t i);
+	void macroModOutput(uint8_t c, uint8_t i, int8_t sens, uint8_t level);
+	void macroCarOutput(uint8_t c, uint8_t i, int8_t sens, uint8_t level);
+	void macroFeedback(uint8_t c, uint8_t i, int8_t sens, uint8_t level);
+	void macroTranspose(uint8_t * note, uint8_t i);
+	void macroSlide(uint8_t c);
+
+	static const uint8_t slot_offsetHERAD_NUM_VOICES;
+	static const uint16_t FNumHERAD_NUM_NOTES;
+	static const uint8_t fine_bendHERAD_NUM_NOTES + 1;
+	static const uint8_t coarse_bend10;
+
+protected:
+	bool songend;
+	int16_t wTime;
+	int32_t ticks_pos;	/* current tick counter */
+	uint32_t total_ticks;	/* total ticks in song */
+
+	uint8_t comp;		/* File compression type (see HERAD_COMP_*) */
+	bool AGD;			/* Whether this is HERAD AGD (OPL3) */
+	bool v2;			/* Whether this is HERAD version 2 */
+	uint8_t nTracks;		/* Number of tracks */
+	uint8_t nInsts;		/* Number of instruments */
+
+	uint16_t wLoopStart;	/* Loop starts at this measure (0 = don't loop) */
+	uint16_t wLoopEnd;	/* Loop ends at this measure (0 = don't loop) */
+	uint16_t wLoopCount;	/* Number of times the selected measures will play (0 = loop forever; >0 - play N times) */
+	uint16_t wSpeed;		/* Fixed point value that controls music speed. Value range is 0x0100 - 0x8100 */
+
+	struct herad_trk {
+		// stored variables
+		uint16_t size;			/* data size */
+		uint8_t * data;			/* event data */
+
+		// variables for playback
+		uint16_t pos;			/* data position */
+		uint32_t counter;			/* tick counter */
+		uint16_t ticks;			/* ticks to wait for next event */
+	};
+	struct herad_chn {
+		uint8_t program;			/* current instrument */
+		uint8_t playprog;			/* current playing instrument (used for keymap) */
+		uint8_t note;			/* current note */
+		bool keyon;				/* note is active */
+		uint8_t bend;			/* current pitch bend */
+		uint8_t slide_dur;		/* pitch slide duration */
+	};
+	struct herad_inst_data {
+		int8_t mode;			/* instrument mode (see HERAD_INSTMODE_*) */
+		uint8_t voice;			/* voice number, unused */
+		uint8_t mod_ksl;			/* modulator: KSL */
+		uint8_t mod_mul;			/* modulator: frequency multiplier */
+		uint8_t feedback;			/* feedback */
+		uint8_t mod_A;			/* modulator: attack */
+		uint8_t mod_S;			/* modulator: sustain */
+		uint8_t mod_eg;			/* modulator: envelope gain */
+		uint8_t mod_D;			/* modulator: decay */
+		uint8_t mod_R;			/* modulator: release */
+		uint8_t mod_out;			/* modulator: output level */
+		uint8_t mod_am;			/* modulator: amplitude modulation (tremolo) */
+		uint8_t mod_vib;			/* modulator: frequency vibrato */
+		uint8_t mod_ksr;			/* modulator: key scaling/envelope rate */
+		uint8_t con;			/* connector */
+		uint8_t car_ksl;			/* carrier: KSL */
+		uint8_t car_mul;			/* carrier: frequency multiplier */
+		uint8_t pan;			/* panning */
+		uint8_t car_A;			/* carrier: attack */
+		uint8_t car_S;			/* carrier: sustain */
+		uint8_t car_eg;			/* carrier: envelope gain */
+		uint8_t car_D;			/* carrier: decay */
+		uint8_t car_R;			/* carrier: release */
+		uint8_t car_out;			/* carrier: output level */
+		uint8_t car_am;			/* carrier: amplitude modulation (tremolo) */
+		uint8_t car_vib;			/* carrier: frequency vibrato */
+		uint8_t car_ksr;			/* carrier: key scaling/envelope rate */
+		int8_t mc_fb_at;			/* macro: modify feedback with aftertouch */
+		uint8_t mod_wave;			/* modulator: waveform select */
+		uint8_t car_wave;			/* carrier: waveform select */
+		int8_t mc_mod_out_vel;		/* macro: modify modulator output level with note velocity */
+		int8_t mc_car_out_vel;		/* macro: modify carrier output level with note velocity */
+		int8_t mc_fb_vel;			/* macro: modify feedback with note velocity */
+		uint8_t mc_slide_coarse;	/* macro: pitch slide coarse tune */
+		uint8_t mc_transpose;		/* macro: root note transpose */
+		uint8_t mc_slide_dur;		/* macro: pitch slide duration (in ticks) */
+		int8_t mc_slide_range;		/* macro: pitch slide range */
+		uint8_t dummy;			/* unknown value */
+		int8_t mc_mod_out_at;		/* macro: modify modulator output level with aftertouch */
+		int8_t mc_car_out_at;		/* macro: modify carrier output level with aftertouch */
+	};
+	struct herad_keymap {
+		int8_t mode;			/* same as herad_inst_data */
+		uint8_t voice;			/* same as herad_inst_data */
+		uint8_t offset;			/* keymap start note: 0 => C2 (24), 24 => C4 (48) */
+		uint8_t dummy;			/* unknown value */
+		uint8_t indexHERAD_INST_SIZE-4;	/* array of instruments */
+	};
+	union herad_inst {
+		uint8_t dataHERAD_INST_SIZE;	/* array of 8-bit parameters */
+		herad_inst_data param;			/* structure of parameters */
+		herad_keymap keymap;			/* keymap structure */
+	};
+	herad_trk * track;				/* event tracks nTracks */
+	herad_chn * chn;					/* active channels nTracks */
+	herad_inst * inst;				/* instruments nInsts */
+
+	int32_t loop_pos;
+	uint16_t loop_times;
+	herad_trk loop_dataHERAD_MAX_TRACKS;
+};
+
+#endif
\ No newline at end of file

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/hsc.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/hsc.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/hsc.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/hsc.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/hsp.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/hsp.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/hsp.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/hsp.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/hybrid.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/hybrid.cpp Changed

@@ -14,235 +14,267 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * xad HYBRID player, by Riven the Mage <riven@ok.ru>
 */
 
 /*
+ * Copyright (c) 2015 - 2017 Wraithverge <liam82067@yahoo.com>
+ * - Realigned to Tabs.
+ * - Added support for Speed indicator in 'File Info' dialogues.
+ * - Refactored timing per all MiG-29 songs (*.ETD).
+ * - Corrected 'type' string.
+ *
+ * Note: all *.ETD files require a header to be prefixed, plus their
+ * extension be changed to ".XAD", before this player can handle them.
+ */
+
+/*
 - discovery -
 
 file(s) : HYBRID.EXE
 type : Hybrid cracktro for Apache Longbow CD-RIP
- tune : from 'Mig-29 Super Fulcrum' game by Domark
- player : from 'Mig-29 Super Fulcrum' game by Domark
+ tune : from 'MiG-29M Super Fulcrum' game by Domark
+ player : from 'MiG-29M Super Fulcrum' game by Domark
 */
 
 #include "hybrid.h"
+// Wraithverge: added DEBUG PPD.
+#ifdef DEBUG
 #include "debug.h"
+#endif
 
 const unsigned char CxadhybridPlayer::hyb_adlib_registers99 = 
 {
- 0xE0, 0x60, 0x80, 0x20, 0x40, 0xE3, 0x63, 0x83, 0x23, 0x43, 0xC0,
- 0xE1, 0x61, 0x81, 0x21, 0x41, 0xE4, 0x64, 0x84, 0x24, 0x44, 0xC1,
- 0xE2, 0x62, 0x82, 0x22, 0x42, 0xE5, 0x65, 0x85, 0x25, 0x45, 0xC2,
- 0xE8, 0x68, 0x88, 0x28, 0x48, 0xEB, 0x6B, 0x8B, 0x2B, 0x4B, 0xC3,
- 0xE9, 0x69, 0x89, 0x29, 0x49, 0xEC, 0x6C, 0x8C, 0x2C, 0x4C, 0xC4,
- 0xEA, 0x6A, 0x8A, 0x2A, 0x4A, 0xED, 0x6D, 0x8D, 0x2D, 0x4D, 0xC5,
- 0xF0, 0x70, 0x90, 0x30, 0x50, 0xF3, 0x73, 0x93, 0x33, 0x53, 0xC6,
- 0xF1, 0x71, 0x91, 0x31, 0x51, 0xF4, 0x74, 0x94, 0x34, 0x54, 0xC7,
- 0xF2, 0x72, 0x92, 0x32, 0x52, 0xF5, 0x75, 0x95, 0x35, 0x55, 0xC8
+	0xE0, 0x60, 0x80, 0x20, 0x40, 0xE3, 0x63, 0x83, 0x23, 0x43, 0xC0,
+	0xE1, 0x61, 0x81, 0x21, 0x41, 0xE4, 0x64, 0x84, 0x24, 0x44, 0xC1,
+	0xE2, 0x62, 0x82, 0x22, 0x42, 0xE5, 0x65, 0x85, 0x25, 0x45, 0xC2,
+	0xE8, 0x68, 0x88, 0x28, 0x48, 0xEB, 0x6B, 0x8B, 0x2B, 0x4B, 0xC3,
+	0xE9, 0x69, 0x89, 0x29, 0x49, 0xEC, 0x6C, 0x8C, 0x2C, 0x4C, 0xC4,
+	0xEA, 0x6A, 0x8A, 0x2A, 0x4A, 0xED, 0x6D, 0x8D, 0x2D, 0x4D, 0xC5,
+	0xF0, 0x70, 0x90, 0x30, 0x50, 0xF3, 0x73, 0x93, 0x33, 0x53, 0xC6,
+	0xF1, 0x71, 0x91, 0x31, 0x51, 0xF4, 0x74, 0x94, 0x34, 0x54, 0xC7,
+	0xF2, 0x72, 0x92, 0x32, 0x52, 0xF5, 0x75, 0x95, 0x35, 0x55, 0xC8
 };
 
 const unsigned short CxadhybridPlayer::hyb_notes98 =
 {
- 0x0000, 0x0000,
- 0x016B, 0x0181, 0x0198, 0x01B0, 0x01CA, 0x01E5, 0x0202, 0x0220, 0x0241, 0x0263, 0x0287, 0x02AE,
- 0x056B, 0x0581, 0x0598, 0x05B0, 0x05CA, 0x05E5, 0x0602, 0x0620, 0x0641, 0x0663, 0x0687, 0x06AE,
- 0x096B, 0x0981, 0x0998, 0x09B0, 0x09CA, 0x09E5, 0x0A02, 0x0A20, 0x0A41, 0x0A63, 0x0A87, 0x0AAE,
- 0x0D6B, 0x0D81, 0x0D98, 0x0DB0, 0x0DCA, 0x0DE5, 0x0E02, 0x0E20, 0x0E41, 0x0E63, 0x0E87, 0x0EAE,
- 0x116B, 0x1181, 0x1198, 0x11B0, 0x11CA, 0x11E5, 0x1202, 0x1220, 0x1241, 0x1263, 0x1287, 0x12AE,
- 0x156B, 0x1581, 0x1598, 0x15B0, 0x15CA, 0x15E5, 0x1602, 0x1620, 0x1641, 0x1663, 0x1687, 0x16AE,
- 0x196B, 0x1981, 0x1998, 0x19B0, 0x19CA, 0x19E5, 0x1A02, 0x1A20, 0x1A41, 0x1A63, 0x1A87, 0x1AAE,
- 0x1D6B, 0x1D81, 0x1D98, 0x1DB0, 0x1DCA, 0x1DE5, 0x1E02, 0x1E20, 0x1E41, 0x1E63, 0x1E87, 0x1EAE
+	0x0000, 0x0000,
+	0x016B, 0x0181, 0x0198, 0x01B0, 0x01CA, 0x01E5, 0x0202, 0x0220, 0x0241, 0x0263, 0x0287, 0x02AE,
+	0x056B, 0x0581, 0x0598, 0x05B0, 0x05CA, 0x05E5, 0x0602, 0x0620, 0x0641, 0x0663, 0x0687, 0x06AE,
+	0x096B, 0x0981, 0x0998, 0x09B0, 0x09CA, 0x09E5, 0x0A02, 0x0A20, 0x0A41, 0x0A63, 0x0A87, 0x0AAE,
+	0x0D6B, 0x0D81, 0x0D98, 0x0DB0, 0x0DCA, 0x0DE5, 0x0E02, 0x0E20, 0x0E41, 0x0E63, 0x0E87, 0x0EAE,
+	0x116B, 0x1181, 0x1198, 0x11B0, 0x11CA, 0x11E5, 0x1202, 0x1220, 0x1241, 0x1263, 0x1287, 0x12AE,
+	0x156B, 0x1581, 0x1598, 0x15B0, 0x15CA, 0x15E5, 0x1602, 0x1620, 0x1641, 0x1663, 0x1687, 0x16AE,
+	0x196B, 0x1981, 0x1998, 0x19B0, 0x19CA, 0x19E5, 0x1A02, 0x1A20, 0x1A41, 0x1A63, 0x1A87, 0x1AAE,
+	0x1D6B, 0x1D81, 0x1D98, 0x1DB0, 0x1DCA, 0x1DE5, 0x1E02, 0x1E20, 0x1E41, 0x1E63, 0x1E87, 0x1EAE
 };
 
 const unsigned char CxadhybridPlayer::hyb_default_instrument11 = 
 {
- 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00
+	0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00
 };
 
 CPlayer *CxadhybridPlayer::factory(Copl *newopl)
 {
- return new CxadhybridPlayer(newopl);
+	return new CxadhybridPlayer(newopl);
 }
 
 bool CxadhybridPlayer::xadplayer_load()
 {
- if(xad.fmt != HYBRID)
- return false;
+	if(xad.fmt != HYBRID) return false;
 
- // load instruments
- hyb.inst = (hyb_instrument *)&tune0;
+	// load instruments
+	hyb.inst = (hyb_instrument *)&tune0;
 
- // load order
- hyb.order = &tune0x1D4;
+	// load order
+	hyb.order = &tune0x1D4;
 
- return true;
+	return true;
 }
 
 void CxadhybridPlayer::xadplayer_rewind(int subsong)
 {
- int i;
+	int i = 0;
 
- hyb.order_pos = 0;
- hyb.pattern_pos = 0;
+	hyb.order_pos = 0;
+	hyb.pattern_pos = 0;
 
- hyb.speed = 6;
- hyb.speed_counter = 1;
+	hyb.speed = 6;
+	hyb.speed_counter = 1;
 
- plr.speed = 1;
+	plr.speed = 1;
 
- // init channel data
- for(i=0;i<9;i++)
- {
- hyb.channeli.freq = 0x2000;
- hyb.channeli.freq_slide = 0x0000;
- }
+	// init channel data
+	for (i=0;i<9;i++)
+	{
+		hyb.channeli.freq = 0x2000;
+		hyb.channeli.freq_slide = 0x0000;
+	}
 
- // basic OPL init
- opl_write(0x01, 0x20);
- opl_write(0xBD, 0x40);
- opl_write(0x08, 0x00);
+	// basic OPL init
+	opl_write(0x01, 0x20);
+	opl_write(0xBD, 0x40);
+	opl_write(0x08, 0x00);
 
- // init OPL channels
- for(i=0;i<9;i++)
- {
- for(int j=0;j<11;j++)
- opl_write(hyb_adlib_registersi*11+j, 0x00 /* hyb_default_instrumentj */ );
+	// init OPL channels
+	for (i=0;i<9;i++)
+	{
+		for (int j=0;j<11;j++)
+			opl_write(hyb_adlib_registersi*11+j, 0x00 /* hyb_default_instrumentj */ );
 
-	opl_write(0xA0+i, 0x00);
-	opl_write(0xB0+i, 0x20);
- }
+		opl_write(0xA0+i, 0x00);
+		opl_write(0xB0+i, 0x20);
+	}
 }
 
 void CxadhybridPlayer::xadplayer_update()
 {
- int i,j;
- unsigned char patpos,ordpos;
-
- if (--hyb.speed_counter)
- goto update_slides;
-
- hyb.speed_counter = hyb.speed;
-
- patpos = hyb.pattern_pos;
- ordpos = hyb.order_pos;
-
- // process channels
- for(i=0;i<9;i++)
- {
- unsigned char *pos = &tune0xADE + (hyb.orderhyb.order_pos*9 + i * 64 * 2) + (patpos * 2);
- // read event
- unsigned short event = (pos1 << 8) + pos0;
-
-#ifdef DEBUG
- AdPlug_LogWrite("track %02X, channel %02X, event %04X:\n", hyb.orderhyb.order_pos*9 + i, i, event );
-#endif
-
- // calculate variables
-	unsigned char note = event >> 9;
-	unsigned char ins = ((event & 0x01F0) >> 4);
- unsigned char slide = event & 0x000F;
-
- // play event
- switch(note)
- {
- case 0x7D: // 0x7D: Set Speed
- hyb.speed = event & 0xFF;
- break;
- case 0x7E: // 0x7E: Jump Position
- hyb.order_pos = event & 0xFF;
- hyb.pattern_pos = 0x3F;
-
- // jumpback ?
- if (hyb.order_pos <= ordpos)
- plr.looping = 1;
-
- break;
- case 0x7F: // 0x7F: Pattern Break
- hyb.pattern_pos = 0x3F;
- break;
- default:
-
- // is instrument ?
- if (ins)
- for(j=0;j<11;j++)
- opl_write(hyb_adlib_registersi*11+j, *((unsigned char *)&hyb.instins-1 + 7 + j)); // +7 = skip name...
-
- // is note ?
- if (note)
- {
- hyb.channeli.freq = hyb_notesnote;
- hyb.channeli.freq_slide = 0;
- }
-
- // is slide ?
- if (slide)
- {
- hyb.channeli.freq_slide = (((slide >> 3) * -1) * (slide & 7)) << 1;
+	int i = 0, j = 0;
+	unsigned char patpos,ordpos;
+
+	if (--hyb.speed_counter) goto update_slides;
+
+	hyb.speed_counter = hyb.speed;
+
+	patpos = hyb.pattern_pos;
+	ordpos = hyb.order_pos;
+
+	// process channels
+	for (i=0;i<9;i++)
+	{
+		unsigned char *pos = &tune0xADE + (hyb.orderhyb.order_pos*9 + i * 64 * 2) + (patpos * 2);
+		// read event
+		unsigned short event = (pos1 << 8) + pos0;
+
+		#ifdef DEBUG
+		AdPlug_LogWrite("track %02X, channel %02X, event %04X:\n", hyb.orderhyb.order_pos*9 + i, i, event );
+		#endif
+
+		// calculate variables
+		unsigned char note = event >> 9;
+		unsigned char ins = ((event & 0x01F0) >> 4);
+		unsigned char slide = event & 0x000F;
+
+		// play event
+		switch(note)
+		{
+			case 0x7D: // 0x7D: Set Speed
+			hyb.speed = event & 0xFF;
+			break;
+
+			case 0x7E: // 0x7E: Jump Position
+			hyb.order_pos = event & 0xFF;
+			hyb.pattern_pos = 0x3F;
+
+			// jumpback ?
+			if (hyb.order_pos <= ordpos) plr.looping = 1;
+
+			break;
+
+			case 0x7F: // 0x7F: Pattern Break
+			hyb.pattern_pos = 0x3F;
+			break;
+
+			default:
+			// is instrument ?
+			if (ins)
+				for (j=0;j<11;j++)
+					opl_write(hyb_adlib_registersi*11+j, *((unsigned char *)&hyb.instins-1 + 7 + j)); // +7 = skip name...
+
+			// is note ?
+			if (note)
+			{
+				hyb.channeli.freq = hyb_notesnote;
+				hyb.channeli.freq_slide = 0;
+			}
+
+			// is slide ?
+			if (slide)
+			{
+				hyb.channeli.freq_slide = (((slide >> 3) * -1) * (slide & 7)) << 1;
 
- if (slide & 0x80)
- slide = -(slide & 7);
- }
-
- // set frequency
- if (!(hyb.channeli.freq & 0x2000))
- {
- opl_write(0xA0+i, hyb.channeli.freq & 0xFF);
- opl_write(0xB0+i, hyb.channeli.freq >> 8);
-
- hyb.channeli.freq |= 0x2000;
+				if (slide & 0x80) slide = -(slide & 7);
+			}
 
- opl_write(0xA0+i, hyb.channeli.freq & 0xFF);
- opl_write(0xB0+i, hyb.channeli.freq >> 8);
- }
+			// set frequency
+			if (!(hyb.channeli.freq & 0x2000))
+			{
+				opl_write(0xA0+i, hyb.channeli.freq & 0xFF);
+				opl_write(0xB0+i, hyb.channeli.freq >> 8);
 
- break;
- }
- }
+				hyb.channeli.freq |= 0x2000;
 
- hyb.pattern_pos++;
+				opl_write(0xA0+i, hyb.channeli.freq & 0xFF);
+				opl_write(0xB0+i, hyb.channeli.freq >> 8);
+			}
+			break;
+		}
+	}
 
- // end of pattern ?
- if (hyb.pattern_pos >= 0x40)
- {
- hyb.pattern_pos = 0;
+	hyb.pattern_pos++;
 
- hyb.order_pos++;
- }
+	// end of pattern ?
+	if (hyb.pattern_pos >= 0x40)
+	{
+		hyb.pattern_pos = 0;
+		hyb.order_pos++;
+	}
 
 update_slides:
-#ifdef DEBUG
- AdPlug_LogWrite("slides:\n");
-#endif
- // update fine frequency slides
- for(i=0;i<9;i++)
- if (hyb.channeli.freq_slide)
- {
- hyb.channeli.freq = (((hyb.channeli.freq & 0x1FFF) + hyb.channeli.freq_slide) & 0x1FFF) | 0x2000;
-
- opl_write(0xA0+i, hyb.channeli.freq & 0xFF);
- opl_write(0xB0+i, hyb.channeli.freq >> 8);
- }
+	#ifdef DEBUG
+	AdPlug_LogWrite("slides:\n");
+	#endif
+
+	// update fine frequency slides
+	for (i=0;i<9;i++)
+		if (hyb.channeli.freq_slide)
+		{
+			hyb.channeli.freq = (((hyb.channeli.freq & 0x1FFF) + hyb.channeli.freq_slide) & 0x1FFF) | 0x2000;
+
+			opl_write(0xA0+i, hyb.channeli.freq & 0xFF);
+			opl_write(0xB0+i, hyb.channeli.freq >> 8);
+		}
 }
 
 float CxadhybridPlayer::xadplayer_getrefresh()
 {
- return 50.0f;
+	// Wraithverge: disabled this.
+	// return 50.0f;
+
+	// Wraithverge: most are now very close to their original tempo.
+	if (hyb.speed == 2) // Intro of MIG29_2.
+		return 34.0f; // First 4 notes (2 Flams) play slower, but why?
+	else if (hyb.speed == 5) // All of MIGWELL and MUSIC.
+		return 42.0f;
+	else if (hyb.speed == 6) // All of MIGFAIL.
+		return 43.0f;
+	else if (hyb.speed == 7) // Main loop of MIG29_2.
+		return 44.0f;
+	else
+		return 50.0f; // What Riven had set.
 }
 
-const char * CxadhybridPlayer::xadplayer_gettype()
+std::string CxadhybridPlayer::xadplayer_gettype()
 {
- return "xad: hybrid player";
+	// Wraithverge: no disrespect to Riven, but I've changed this from
+	// "xad: hybrid player", because Domark developed the original
+	// sound-engine for the songs from these two games.
+	return (std::string("xad: Domark Player"));
 }
 
-const char * CxadhybridPlayer::xadplayer_getinstrument(unsigned int i)
+std::string CxadhybridPlayer::xadplayer_getinstrument(unsigned int i)
 {
- return hyb.insti.name;
+	return (std::string(hyb.insti.name,7));
 }
 
 unsigned int CxadhybridPlayer::xadplayer_getinstruments()
 {
- return 26;
+	return 26;
+}
+
+unsigned int CxadhybridPlayer::xadplayer_getspeed()
+{
+	return hyb.speed;
 }

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/hybrid.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/hybrid.h Changed

@@ -14,67 +14,76 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * xad HYBRID player, by Riven the Mage <riven@ok.ru>
 */
 
+/*
+ * Copyright (c) 2015 - 2017 Wraithverge <liam82067@yahoo.com>
+ * - Realigned to Tabs.
+ * - Added support for Speed indicator in 'File Info' dialogues.
+ */
+
 #include "xad.h"
 
 class CxadhybridPlayer: public CxadPlayer
 {
 public:
- static CPlayer *factory(Copl *newopl);
+	static CPlayer *factory(Copl *newopl);
 
- CxadhybridPlayer(Copl *newopl): CxadPlayer(newopl)
- { }
+	CxadhybridPlayer(Copl *newopl): CxadPlayer(newopl)
+	{ }
 
 protected:
- struct hyb_instrument
- {
- char name7;
- unsigned char mod_wave;
- unsigned char mod_AD;
- unsigned char mod_SR;
- unsigned char mod_crtl;
- unsigned char mod_volume;
- unsigned char car_wave;
- unsigned char car_AD;
- unsigned char car_SR;
- unsigned char car_crtl;
- unsigned char car_volume;
- unsigned char connect;
- };
+	struct hyb_instrument
+	{
+		char name7;
+		unsigned char mod_wave;
+		unsigned char mod_AD;
+		unsigned char mod_SR;
+		unsigned char mod_crtl;
+		unsigned char mod_volume;
+		unsigned char car_wave;
+		unsigned char car_AD;
+		unsigned char car_SR;
+		unsigned char car_crtl;
+		unsigned char car_volume;
+		unsigned char connect;
+	};
+
+	struct
+	{
+		unsigned char order_pos;
+		unsigned char pattern_pos;
 
- struct
- {
- unsigned char order_pos;
- unsigned char pattern_pos;
+		unsigned char *order;
 
- unsigned char *order;
+		hyb_instrument *inst;
 
- hyb_instrument *inst;
+	struct
+	{
+		unsigned short freq;
+		unsigned short freq_slide;
+	} channel9;
 
- struct
- {
- unsigned short freq;
- unsigned short freq_slide;
- } channel9;
+		unsigned char speed;
+		unsigned char speed_counter;
+	} hyb;
+	//
+	bool xadplayer_load();
+	void xadplayer_rewind(int subsong);
+	void xadplayer_update();
+	float xadplayer_getrefresh();
+	std::string xadplayer_gettype();
+	std::string xadplayer_getinstrument(unsigned int i);
+	unsigned int xadplayer_getinstruments();
 
- unsigned char speed;
- unsigned char speed_counter;
- } hyb;
- //
- bool xadplayer_load();
- void xadplayer_rewind(int subsong);
- void xadplayer_update();
- float xadplayer_getrefresh();
- const char * xadplayer_gettype();
- const char * xadplayer_getinstrument(unsigned int i);
- unsigned int xadplayer_getinstruments();
+	// Wraithverge: added this.
+	unsigned int xadplayer_getspeed();
 
 private:
- static const unsigned char hyb_adlib_registers99;
- static const unsigned short hyb_notes98;
- static const unsigned char hyb_default_instrument11;
+	static const unsigned char hyb_adlib_registers99;
+	static const unsigned short hyb_notes98;
+	static const unsigned char hyb_default_instrument11;
 };

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/hyp.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/hyp.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/hyp.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/hyp.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/imf.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/imf.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/imf.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/imf.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/jbm.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/jbm.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/jbm.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/jbm.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/kemuopl.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/kemuopl.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/ksm.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/ksm.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/ksm.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/ksm.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/lds.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/lds.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/lds.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/lds.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/mad.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mad.cpp Changed

@@ -14,12 +14,12 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 mad.cpp - MAD loader by Riven the Mage <riven@ok.ru>
 */
 
-#include <string.h>
+#include <cstring>
 #include "mad.h"
 
 /* -------- Public Methods -------------------------------- */
@@ -29,7 +29,7 @@
 return new CmadLoader(newopl);
 }
 
-bool CmadLoader::load(const char *filename, const CFileProvider &fp)
+bool CmadLoader::load(const std::string &filename, const CFileProvider &fp)
 {
 binistream *f = fp.open(filename); if(!f) return false;
 const unsigned char conv_inst10 = { 2,1,10,9,4,3,6,5,8,7 };
@@ -111,14 +111,14 @@
 	return (float)timer;
 }
 
-const char * CmadLoader::gettype()
+std::string CmadLoader::gettype()
 {
-	return "Mlat Adlib Tracker";
+	return std::string("Mlat Adlib Tracker");
 }
 
-const char * CmadLoader::getinstrument(unsigned int n)
+std::string CmadLoader::getinstrument(unsigned int n)
 {
-	return instrumentsn.name;
+	return std::string(instrumentsn.name,8);
 }
 
 unsigned int CmadLoader::getinstruments()

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/mad.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mad.h Changed

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mdi.cpp Added

@@ -0,0 +1,323 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2008 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * mdi.cpp - AdLib SMF (MDI) Player by Stas'M <binarymaster@mail.ru>
+ *
+ * Based on MIDIPLAY.C by Dale Glowinski, Ad Lib Inc.
+ *
+ * REFERENCES:
+ * http://www.shikadi.net/moddingwiki/MDI_Format
+ * http://www.vgmpf.com/Wiki/index.php?title=MDI
+ */
+
+#include <string.h>
+
+#include "mdi.h"
+
+/*** public methods *************************************/
+
+CPlayer *CmdiPlayer::factory(Copl *newopl)
+{
+	return new CmdiPlayer(newopl);
+}
+
+bool CmdiPlayer::load(const std::string &filename, const CFileProvider &fp)
+{
+	binistream *f = fp.open(filename); if(!f) return false;
+
+	// file validation
+	if (!fp.extension(filename, ".mdi"))
+	{
+		fp.close(f);
+		return false;
+	}
+	if (fp.filesize(f) < MIDI_MIN_SIZE)
+	{
+		fp.close(f);
+		return false;
+	}
+
+	char chunkMIDI_CHUNK_SIZE + 1;
+	chunkMIDI_CHUNK_SIZE = 0;
+
+	// header validation
+	f->readString(chunk, MIDI_CHUNK_SIZE);
+	if (strcmp(chunk, "MThd"))
+	{
+		fp.close(f);
+		return false;
+	}
+	f->setFlag(binio::BigEndian, true);
+	if (f->readInt(4) != MIDI_HEAD_SIZE || // chunk size
+		f->readInt(2) != 0 || // MIDI Type must be 0
+		f->readInt(2) != 1) // track count must be 1
+	{
+		fp.close(f);
+		return false;
+	}
+	// division (UINT16_BE)
+	division = f->readInt(2);
+	// track validation
+	f->readString(chunk, MIDI_CHUNK_SIZE);
+	if (strcmp(chunk, "MTrk"))
+	{
+		fp.close(f);
+		return false;
+	}
+	// chunk size (UINT32_BE)
+	size = f->readInt(4);
+	// data size validation
+	if (fp.filesize(f) < MIDI_MIN_SIZE + size)
+	{
+		fp.close(f);
+		return false;
+	}
+	// load section
+	data = new uint8_tsize;
+	f->readString((char *)data, size);
+
+	fp.close(f);
+	drv = new CadlibDriver(opl);
+	rewind(0);
+	return true;
+}
+
+void CmdiPlayer::rewind(int subsong)
+{
+	// set default MIDI tempo
+	SetTempo(MIDI_DEF_TEMPO);
+	pos = 0; songend = false;
+
+	for (int i = 0; i < MAX_VOICES; i++)
+		volumei = 0;
+	counter = 0;
+	ticks = 0;
+
+	opl->init();
+	if (drv) drv->SoundWarmInit();
+}
+
+/*
+	Change the tempo.
+*/
+void CmdiPlayer::SetTempo(uint32_t tempo)
+{
+	if (!tempo) tempo = MIDI_DEF_TEMPO;
+	timer = division * 1000000 / (float)tempo;
+}
+
+uint32_t CmdiPlayer::GetVarVal()
+{
+	uint32_t result = 0;
+	do
+	{
+		result <<= 7;
+		result |= datapos & 0x7F;
+	} while (datapos++ & 0x80 && pos < size);
+	return result;
+}
+
+void CmdiPlayer::executeCommand()
+{
+	uint32_t len, tempo;
+	uint8_t new_status = 0, meta, voice, note, vol;
+	uint16_t code, pitch;
+
+	// execute MIDI command
+	if (datapos < 0x80)
+	{
+		// running status
+		new_status = status;
+	}
+	else
+		new_status = datapos++;
+	if (new_status == STOP_FC)
+	{
+		pos = size;
+	}
+	else if (new_status == SYSEX_F0 || new_status == SYSEX_F7)
+	{
+		/* skip over system exclusive event */
+		len = GetVarVal();
+		pos += len;
+	}
+	else if (new_status == META)
+	{
+		/* Process meta-event */
+		meta = datapos++;
+		len = GetVarVal();
+		switch (meta)
+		{
+		case END_OF_TRACK:
+			pos = size - len; // pos incremented later
+			break;
+		case TEMPO:
+			if (len >= 3)
+			{
+				tempo = datapos << 16 | datapos + 1 << 8 | datapos + 2;
+				SetTempo(tempo);
+			}
+			break;
+		case SEQ_SPECIFIC:
+			if (len >= META_MIN_SIZE)
+			{
+				/* Ad Lib midi ID is 00 00 3f. */
+				if (datapos == 0 &&
+					datapos + 1 == 0 &&
+					datapos + 2 == 0x3f)
+				{
+					/*
+					The first two bytes after the ID contain the Ad Lib event code.
+					The following bytes contain the data pertaining to the event.
+					*/
+					code = datapos + 3 << 8 | datapos + 4;
+					if (code == ADLIB_TIMBRE && len >= META_MIN_SIZE + ADLIB_INST_LEN)
+					{
+						/*
+						Instrument change code. First byte of data contains voice number.
+						Following bytes contain instrument parameters.
+						*/
+						voice = datapos + 5;
+						int16_t paramsADLIB_INST_LEN;
+						for (int n = 0; n < ADLIB_INST_LEN; n++)
+							paramsn = (int8_t)datapos + META_MIN_SIZE + n;
+						if (drv) drv->SetVoiceTimbre(voice, &params0);
+					}
+					else if (code == ADLIB_RHYTHM) {
+						/* Melo/perc mode code. 0 is melodic, !0 is percussive. */
+						if (drv) drv->SetMode((int)datapos + 5);
+					}
+					else if (code == ADLIB_PITCH) {
+						/* Sets the interval over which pitch bend changes will be applied. */
+						if (drv) drv->SetPitchRange((int)datapos + 5);
+					}
+				}
+			}
+			break;
+		}
+		pos += len;
+	}
+	else
+	{
+		status = new_status;
+		voice = status & 0xF;
+		switch (status & 0xF0)
+		{
+		case NOTE_OFF:
+			pos += 2;
+			if (voice > MAX_VOICES - 1)
+				break;
+			if (drv) drv->NoteOff(voice);
+			break;
+		case NOTE_ON:
+			note = datapos++;
+			vol = datapos++;
+			if (voice > MAX_VOICES - 1)
+				break;
+			if (!vol)
+			{
+				/* A note-on with a volume of 0 is equivalent to a note-off. */
+				if (drv) drv->NoteOff(voice);
+				volumevoice = vol;
+			}
+			else
+			{
+				/* Regular note-on */
+				if (vol != volumevoice)
+				{
+					if (drv) drv->SetVoiceVolume(voice, vol);
+					volumevoice = vol;
+				}
+				if (drv) drv->NoteOn(voice, note);
+			}
+			break;
+		case AFTER_TOUCH:
+			pos++; // skip note
+			vol = datapos++;
+			if (voice > MAX_VOICES - 1)
+				break;
+			if (vol != volumevoice)
+			{
+				if (drv) drv->SetVoiceVolume(voice, vol);
+				volumevoice = vol;
+			}
+			break;
+		case CONTROL_CHANGE:
+			/* unused */
+			pos += 2;
+			break;
+		case PROG_CHANGE:
+			/* unused */
+			pos += 1;
+			break;
+		case CHANNEL_PRESSURE:
+			vol = datapos++;
+			if (voice > MAX_VOICES - 1)
+				break;
+			if (vol != volumevoice)
+			{
+				if (drv) drv->SetVoiceVolume(voice, vol);
+				volumevoice = vol;
+			}
+			break;
+		case PITCH_BEND:
+			pitch = datapos++;
+			pitch |= datapos++ << 7;
+			if (voice > MAX_VOICES - 1)
+				break;
+			if (drv) drv->SetVoicePitch(voice, pitch);
+			break;
+		default:
+			/*
+			A bad status byte ( or unimplemented MIDI command) has been encontered.
+			Skip bytes until next timing byte followed by status byte.
+			*/
+			while (datapos++ < NOTE_OFF && pos < size);
+			if (pos >= size)
+				break;
+			break;
+		}
+	}
+}
+
+bool CmdiPlayer::update()
+{
+	if (!counter)
+	{
+		ticks = GetVarVal();
+	}
+	if (++counter >= ticks)
+	{
+		counter = 0;
+		while (pos < size)
+		{
+			executeCommand();
+			if (pos >= size) {
+				pos = 0;
+				songend = true;
+				break;
+			}
+			else if (!datapos) // if next delay is zero
+			{
+				pos++;
+			}
+			else break;
+		}
+	}
+	return !songend;
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mdi.h Added

@@ -0,0 +1,112 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2005 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * mdi.h - AdLib SMF (MDI) Player by Stas'M <binarymaster@mail.ru>
+ *
+ * Based on MIDIPLAY.C by Dale Glowinski, Ad Lib Inc.
+ *
+ * REFERENCES:
+ * http://www.shikadi.net/moddingwiki/MDI_Format
+ * http://www.vgmpf.com/Wiki/index.php?title=MDI
+ */
+
+#ifndef H_ADPLUG_MDIPLAYER
+#define H_ADPLUG_MDIPLAYER
+
+#include "player.h"
+#include "adlib.h"
+
+#define MIDI_CHUNK_SIZE	4	/* FOURCC size */
+#define MIDI_HEAD_SIZE	6	/* MThd data size */
+#define MIDI_MIN_SIZE	MIDI_CHUNK_SIZE + sizeof(uint32_t) + MIDI_HEAD_SIZE + MIDI_CHUNK_SIZE + sizeof(uint32_t)
+#define MIDI_DEF_TEMPO	500000
+
+#define NR_CHANS		16
+
+#define NOTE_OFF		0x80
+#define NOTE_ON			0x90
+#define AFTER_TOUCH		0xA0
+#define CONTROL_CHANGE	0xB0
+#define PROG_CHANGE		0xC0
+#define CHANNEL_PRESSURE	0xD0
+#define PITCH_BEND		0xE0
+#define SYSEX_F0		0xf0
+#define SYSEX_F7		0xf7
+#define STOP_FC			0xfc
+#define META			0xff
+
+#define END_OF_TRACK	0x2f
+#define TEMPO			0x51
+#define SEQ_SPECIFIC	0x7f
+
+#define META_SIGN_LEN	3
+#define META_CODE_LEN	2
+#define META_MIN_SIZE	META_SIGN_LEN + META_CODE_LEN + 1
+
+#define ADLIB_TIMBRE	1
+#define ADLIB_RHYTHM	2
+#define ADLIB_PITCH		3
+
+class CmdiPlayer: public CPlayer
+{
+public:
+	static CPlayer *factory(Copl *newopl);
+
+	CmdiPlayer(Copl *newopl)
+		: CPlayer(newopl), drv(0), data(0)
+		{ }
+	~CmdiPlayer()
+	{
+		if(data) delete data;
+		if (drv) drv->~CadlibDriver();
+	};
+
+	bool load(const std::string &filename, const CFileProvider &fp);
+	bool update();
+	void rewind(int subsong);
+
+	float getrefresh()
+	{
+		return timer;
+	};
+
+	std::string gettype()
+	{
+		return std::string("AdLib MIDIPlay File");
+	}
+
+private:
+	void SetTempo(uint32_t tempo);
+	uint32_t GetVarVal();
+	void executeCommand();
+	CadlibDriver *drv;
+
+protected:
+	unsigned long	pos, size;
+	bool		songend;
+	float		timer;
+	uint16_t	division;				/* division in PPQN */
+	uint8_t *	data;					/* MIDI data */
+
+	uint32_t	counter;					/* tick counter */
+	uint32_t	ticks;					/* ticks to wait for next event */
+	uint8_t		status; /* running status byte */
+	uint8_t		volumeMAX_VOICES;		/* actual volume of all voices */
+};
+
+#endif
\ No newline at end of file

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/mid.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mid.cpp Changed

@@ -14,7 +14,7 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 *
 * MIDI & MIDI-like file player - Last Update: 10/15/2005
@@ -91,6 +91,15 @@
 }
 #endif
 
+#if !defined(UINT8_MAX)
+typedef signed char int8_t;
+typedef short int16_t;
+typedef int int32_t;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+#endif
+
 #define LUCAS_STYLE 1
 #define CMF_STYLE 2
 #define MIDI_STYLE 4
@@ -178,15 +187,15 @@
 	return(v);
 }
 
-bool CmidPlayer::load_sierra_ins(const char *fname, const CFileProvider &fp)
+bool CmidPlayer::load_sierra_ins(const std::string &fname, const CFileProvider &fp)
 {
 long i,j,k,l;
 unsigned char ins28;
 char *pfilename;
 binistream *f;
 
- pfilename = (char *)malloc(strlen (fname)+9);
- strcpy(pfilename,fname);
+ pfilename = (char *)malloc(fname.length()+9);
+ strcpy(pfilename,fname.c_str());
 j=0;
 for(i=strlen(pfilename)-1; i >= 0; i--)
 if(pfilenamei == '/' || pfilenamei == '\\') {
@@ -206,7 +215,7 @@
 for (k=0; k<48; k++)
 {
 l=i*48+k;
- midiprintf ("\n%2d: ",l);
+ midiprintf ("\n%2ld: ",l);
 for (j=0; j<28; j++)
 insj = f->readInt(1);
 
@@ -260,6 +269,8 @@
 {
 getnext(1);
 curtrack=j; j++;
+ if (curtrack >= 16)
+ break;
 trackcurtrack.on=1;
 	 trackcurtrack.spos = getnext(1);
 	 trackcurtrack.spos += (getnext(1) << 8) + 4;	//4 best usually +3? not 0,1,2 or 5
@@ -267,7 +278,7 @@
 trackcurtrack.tend=flen; //0xFC will kill it
 trackcurtrack.iwait=0;
 trackcurtrack.pv=0;
- midiprintf ("track %d starts at %lx\n",curtrack,trackcurtrack.spos);
+ midiprintf ("track %u starts at %lx\n",curtrack,trackcurtrack.spos);
 
 getnext(2);
 i=getnext(1);
@@ -281,13 +292,15 @@
 doing=1;
 }
 
-bool CmidPlayer::load(const char *filename, const CFileProvider &fp)
+bool CmidPlayer::load(const std::string &filename, const CFileProvider &fp)
 {
 binistream *f = fp.open(filename); if(!f) return false;
 int good;
 unsigned char s6;
+ uint32_t size;
 
 f->readString((char *)s, 6);
+ size = *(uint32_t *)s; // size of FILE_OLDLUCAS
 good=0;
 subsongs=0;
 switch(s0)
@@ -310,7 +323,7 @@
 	 }
 	 break;
 default:
- if (s4=='A' && s5=='D') good=FILE_OLDLUCAS;
+ if (size == fp.filesize(f) && s4=='A' && s5=='D') good=FILE_OLDLUCAS;
 break;
 }
 
@@ -420,6 +433,9 @@
 
 void CmidPlayer::midi_fm_playnote(int voice, int note, int volume)
 {
+ if (note < 0) {
+ note = 0;
+ }
 int freq=fnumsnote%12;
 int oct=note/12;
 	int c;
@@ -493,7 +509,7 @@
 trackcurtrack.pv=(unsigned char)v;
 
 		c=v&0x0f;
- midiprintf ("%2X",v);
+ midiprintf ("%2lX",v);
 switch(v&0xf0)
 {
 			case 0x80: /*note off*/
@@ -594,7 +610,7 @@
 chpon2=0;
 }
 }
- midiprintf(" %d:%d:%d:%d\n",c,chc.inum,note,vel);
+ midiprintf(" %d:%d:%ld:%ld\n",c,chc.inum,note,vel);
 }
 else
 midiprintf ("off");
@@ -614,7 +630,7 @@
 switch(ctrl)
 {
 case 0x07:
- midiprintf ("(pb:%d: %d %d)",c,ctrl,vel);
+ midiprintf ("(pb:%d: %ld %ld)",c,ctrl,vel);
 chc.vol=vel;
 midiprintf("vol");
 break;
@@ -636,7 +652,7 @@
 }
 break;
 case 0x67:
- midiprintf("Rhythm mode: %d\n", vel);
+ midiprintf("Rhythm mode: %ld\n", vel);
 if ((adlib_style&CMF_STYLE)!=0) {
 			 adlib_mode=vel;
 			 if(adlib_mode == ADLIB_RYTHM)
@@ -668,7 +684,7 @@
 		 l=getval();
 		 if (datalook(pos+l)==0xf7)
 			i=1;
-		 midiprintf("{%d}",l);
+		 midiprintf("{%ld}",l);
 		 midiprintf("\n");
 
 if (datalook(pos)==0x7d &&
@@ -714,7 +730,7 @@
 {
 midiprintf("\n");
 for (j=0; j<l; j++)
- midiprintf ("%2X ",getnext(1));
+ midiprintf ("%2lX ",getnext(1));
 }
 
 midiprintf("\n");
@@ -743,7 +759,7 @@
 type == FILE_ADVSIERRA)
 {
 trackcurtrack.tend=pos;
- midiprintf ("endmark: %ld -- %lx\n",pos,pos);
+ midiprintf ("endmark: %lu -- %lx\n",pos,pos);
 }
 break;
 case 0xfe:
@@ -754,7 +770,7 @@
 v=getnext(1);
 l=getval();
 midiprintf ("\n");
- midiprintf("{%X_%X}",v,l);
+ midiprintf("{%lX_%lX}",v,l);
 if (v==0x51)
 {
 lnum=getnext(l);
@@ -764,12 +780,12 @@
 else
 {
 for (i=0; i<l; i++)
- midiprintf ("%2X ",getnext(1));
+ midiprintf ("%2lX ",getnext(1));
 }
 break;
 					}
 break;
- default: midiprintf("!",v); /* if we get down here, a error occurred */
+ default: midiprintf("%lX!",v); /* if we get down here, a error occurred */
 			break;
 }
 
@@ -832,7 +848,7 @@
 for (i=0; i<16; i++)
 if (tracki.on) {
 	if (tracki.pos < tracki.tend)
-	 midiprintf ("<%d>",tracki.iwait);
+	 midiprintf ("<%lu>",tracki.iwait);
 	else
 	 midiprintf("stop");
 }
@@ -869,7 +885,7 @@
 adlib_style=MIDI_STYLE|CMF_STYLE;
 adlib_mode=ADLIB_MELODIC;
 for (i=0; i<128; i++)
- for (j=0; j<16; j++)
+ for (j=0; j<14; j++)
 myinsbankij=midi_fm_instrumentsij;
 	for (i=0; i<16; i++)
 {
@@ -928,7 +944,7 @@
 trackcurtrack.on=1;
 trackcurtrack.tend=getnext(4);
 trackcurtrack.spos=pos;
- midiprintf ("tracklen:%ld\n",trackcurtrack.tend);
+ midiprintf ("tracklen:%lu\n",trackcurtrack.tend);
 break;
 case FILE_CMF:
 getnext(3); // ctmf
@@ -951,13 +967,13 @@
 if (i>128) i=128; // to ward of bad numbers...
 getnexti(2); //basic tempo
 
- midiprintf("\nioff:%d\nmoff%d\ndeltas:%ld\nmsqtr:%ld\nnumi:%d\n",
+ midiprintf("\nioff:%ld\nmoff%ld\ndeltas:%ld\nmsqtr:%ld\nnumi:%ld\n",
 n,m,deltas,msqtr,i);
 pos=n; // jump to instruments
 tins=i;
 for (j=0; j<i; j++)
 {
- midiprintf ("\n%d: ",j);
+ midiprintf ("\n%ld: ",j);
 for (l=0; l<16; l++)
 {
 myinsbankjl=(unsigned char)getnext(1);
@@ -985,7 +1001,7 @@
 tins=i;
 for (j=0; j<i; j++)
 {
- midiprintf ("\n%d: ",j);
+ midiprintf ("\n%ld: ",j);
 for (l=0; l<16; l++)
 insl=(unsigned char)getnext(1);
 
@@ -1030,7 +1046,7 @@
 
 o_sierra_pos=sierra_pos=pos;
 sierra_next_section();
- while (datalook(sierra_pos-2)!=0xff)
+ while (datalook(sierra_pos-2) != 0xff && pos < flen)
 {
 sierra_next_section();
 subsongs++;
@@ -1089,22 +1105,22 @@
 midi_fm_reset();
 }
 
-const char * CmidPlayer::gettype()
+std::string CmidPlayer::gettype()
 {
 	switch(type) {
 	case FILE_LUCAS:
-		return "LucasArts AdLib MIDI";
+		return std::string("LucasArts AdLib MIDI");
 	case FILE_MIDI:
-		return "General MIDI";
+		return std::string("General MIDI");
 	case FILE_CMF:
-		return "Creative Music Format (CMF MIDI)";
+		return std::string("Creative Music Format (CMF MIDI)");
 	case FILE_OLDLUCAS:
-		return "Lucasfilm Adlib MIDI";
+		return std::string("Lucasfilm Adlib MIDI");
 	case FILE_ADVSIERRA:
-		return "Sierra On-Line VGA MIDI";
+		return std::string("Sierra On-Line VGA MIDI");
 	case FILE_SIERRA:
-		return "Sierra On-Line EGA MIDI";
+		return std::string("Sierra On-Line EGA MIDI");
 	default:
-		return "MIDI unknown";
+		return std::string("MIDI unknown");
 	}
 }

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/mid.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mid.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/mididata.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mididata.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/mkj.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mkj.cpp Changed

@@ -14,12 +14,12 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * mkj.cpp - MKJamz Player, by Simon Peter <dn.tlp@gmx.net>
 */
 
-#include <string.h>
+#include <cstring>
 #include <assert.h>
 
 #include "mkj.h"
@@ -30,7 +30,7 @@
 return new CmkjPlayer(newopl);
 }
 
-bool CmkjPlayer::load(const char *filename, const CFileProvider &fp)
+bool CmkjPlayer::load(const std::string &filename, const CFileProvider &fp)
 {
 binistream *f = fp.open(filename); if(!f) return false;
 char	id6;
@@ -65,7 +65,7 @@
 songbufi = f->readInt(2);
 
 AdPlug_LogWrite("CmkjPlayer::load(\"%s\"): loaded file ver %.2f, %d channels,"
-		 " %d notes/channel.\n", filename, ver, maxchannel,
+		 " %d notes/channel.\n", filename.c_str(), ver, maxchannel,
 		 maxnotes);
 fp.close(f);
 rewind(0);

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/mkj.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mkj.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/msc.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/msc.cpp Changed

@@ -14,12 +14,12 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * msc.c - MSC Player by Lubomir Bulej (pallas@kadan.cz)
 */
 
-#include <string.h>
+#include <cstring>
 #include <stdio.h>
 
 #include "msc.h"
@@ -63,7 +63,7 @@
 delete desc;
 }
 
-bool CmscPlayer::load(const char * filename, const CFileProvider & fp)
+bool CmscPlayer::load(const std::string & filename, const CFileProvider & fp)
 {
 binistream * 	bf;
 msc_header	hdr;
@@ -172,10 +172,12 @@
 return 1193180 / (float) (timer_div ? timer_div : 0xffff);
 }
 
-const char * CmscPlayer::gettype()
+std::string CmscPlayer::gettype()
 {
+ char vstr 40;
+
 sprintf(vstr, "AdLib MSCplay (version %d)", version);
- return vstr;
+ return std::string (vstr);
 }
 
 /*** private methods *************************************/
@@ -207,10 +209,10 @@
 return false;
 		
 blk = msc_data block_num;
+ u8	len_corr = 0;	// length correction
 while (1) {
 u8 	octet;		// decoded octet
- u8	len_corr = 0;	// length correction
-		
+
 // advance to next block if necessary
 if (block_pos >= blk.mb_length && dec_len == 0) {
 block_num++;

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/msc.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/msc.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/mtk.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mtk.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/mtk.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mtk.h Changed

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mus.cpp Added

@@ -0,0 +1,602 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2008 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * mus.cpp - AdLib MIDI Music File Player by Stas'M <binarymaster@mail.ru> and Wraithverge <liam82067@yahoo.com>
+ *
+ * Based on PLAY.C by Marc Savary, Ad Lib Inc.
+ *
+ * REFERENCES:
+ * http://www.shikadi.net/moddingwiki/AdLib_MIDI_Format
+ * http://www.shikadi.net/moddingwiki/IMS_Format
+ * http://www.shikadi.net/moddingwiki/AdLib_Timbre_Bank_Format
+ * http://www.shikadi.net/moddingwiki/AdLib_Instrument_Bank_Format
+ * http://www.vgmpf.com/Wiki/index.php?title=MUS_(AdLib)
+ * http://www.vgmpf.com/Wiki/index.php?title=SND_(AdLib)
+ */
+
+#include <cstring>
+#include <stdio.h>
+
+#include "mus.h"
+
+#ifdef DEBUG
+#include "debug.h"
+#endif
+
+/*** public methods *************************************/
+
+CPlayer *CmusPlayer::factory(Copl *newopl)
+{
+	return new CmusPlayer(newopl);
+}
+
+std::string CmusPlayer::gettype()
+{
+	char tmpstr30;
+
+	if (isIMS)
+		sprintf(tmpstr, "IMPlay Song Format v%d.%d", majorVersion, minorVersion);
+	else
+		sprintf(tmpstr, "AdLib MIDI Format v%d.%d", majorVersion, minorVersion);
+	return std::string(tmpstr);
+}
+
+bool CmusPlayer::load(const std::string &filename, const CFileProvider &fp)
+{
+	binistream *f = fp.open(filename); if(!f) return false;
+
+	// file validation
+	if (!fp.extension(filename, ".mus") &&
+		!fp.extension(filename, ".ims"))
+	{
+		fp.close(f);
+		return false;
+	}
+	if (fp.filesize(f) < HEADER_LEN)
+	{
+		fp.close(f);
+		return false;
+	}
+
+	// read file header
+	isIMS = false;
+	majorVersion = static_cast<uint8_t>(f->readInt(1));
+	minorVersion = static_cast<uint8_t>(f->readInt(1));
+	uint32_t tuneId = static_cast<uint32_t>(f->readInt(4));
+	f->readString(tuneName, TUNE_NAME_SIZE);
+	tickBeat = static_cast<uint8_t>(f->readInt(1));
+	uint8_t beatMeasure = static_cast<uint8_t>(f->readInt(1));
+	uint32_t totalTick = static_cast<uint32_t>(f->readInt(4));
+	dataSize = static_cast<uint32_t>(f->readInt(4));
+	uint32_t nrCommand = static_cast<uint32_t>(f->readInt(4));
+	f->seek(FILLER_SIZE, binio::Add);
+	soundMode = static_cast<uint8_t>(f->readInt(1));
+	pitchBRange = static_cast<uint8_t>(f->readInt(1));
+	basicTempo = static_cast<uint16_t>(f->readInt(2));
+	f->seek(FILLER_SIZE, binio::Add);
+
+	// validate header and data size
+	if (majorVersion != 1 ||
+		minorVersion != 0 ||
+		tuneId != 0 ||
+		tickBeat == 0 ||
+		beatMeasure == 0 ||
+		totalTick == 0 ||
+		dataSize == 0 ||
+		nrCommand == 0 ||
+		fp.filesize(f) < (unsigned)(HEADER_LEN + dataSize))
+	{
+		fp.close(f);
+		return false;
+	}
+
+	// read MIDI data
+	data = new uint8_tdataSize;
+	f->readString((char *)data, dataSize);
+
+	// read IMS timbre list (if exists)
+	if (fp.filesize(f) >= (unsigned)(HEADER_LEN + dataSize) + 4 &&
+		f->readInt(2) == IMS_SIGNATURE)
+	{
+		isIMS = true;
+		nrTimbre = f->readInt(2);
+		// validate post-data size
+		if (fp.filesize(f) >= (unsigned)(HEADER_LEN + dataSize) + 4 + nrTimbre * TIMBRE_NAME_SIZE)
+		{
+			insts = new mus_instnrTimbre;
+			// read timbre names
+			for (int i = 0; i < nrTimbre; i++)
+			{
+				f->readString(instsi.name, TIMBRE_NAME_SIZE);
+				instsi.nameTIMBRE_NAME_SIZE - 1 = 0;
+				instsi.loaded = false;
+			}
+		}
+		else
+			nrTimbre = 0;
+	}
+
+	fp.close(f);
+	bool bankload;
+	if (!insts)
+	{
+		// load SND timbre bank
+		bankload = LoadTimbreBank(filename.substr(0, filename.length() - 3).append("snd"), fp);
+		#ifndef DOS
+		#ifndef WIN32
+		if (!bankload) // for case-sensitive file systems
+			bankload = LoadTimbreBank(filename.substr(0, filename.length() - 3).append("SND"), fp);
+		#endif
+		#endif
+		if (!bankload)
+			bankload = LoadTimbreBank(filename.substr(0, filename.length() - 3).append("tim"), fp);
+		#ifndef DOS
+		#ifndef WIN32
+		if (!bankload) // for case-sensitive file systems
+			bankload = LoadTimbreBank(filename.substr(0, filename.length() - 3).append("TIM"), fp);
+		#endif
+		#endif
+		if (!bankload)
+		{
+			// fetch default bank
+			size_t np = filename.find_last_of("/");
+			if (np == std::string::npos)
+				np = filename.find_last_of("\\");
+			if (np != std::string::npos)
+				bankload = LoadTimbreBank(filename.substr(0, np + 1).append("timbres.snd"), fp);
+			#ifndef DOS
+			#ifndef WIN32
+			if (!bankload) // for case-sensitive file systems
+				bankload = LoadTimbreBank(filename.substr(0, np + 1).append("TIMBRES.SND"), fp);
+			#endif
+			#endif
+			if (!bankload)
+				bankload = LoadTimbreBank(filename.substr(0, np + 1).append("timbres.tim"), fp);
+			#ifndef DOS
+			#ifndef WIN32
+			if (!bankload) // for case-sensitive file systems
+				bankload = LoadTimbreBank(filename.substr(0, np + 1).append("TIMBRES.TIM"), fp);
+			#endif
+			#endif
+		}
+	}
+	else if (isIMS)	// fetch timbre data from BNK banks
+	{
+		// fetch bank of the song
+		bankload = FetchTimbreData(filename.substr(0, filename.length() - 3).append("bnk"), fp);
+		#ifndef DOS
+		#ifndef WIN32
+		if (!bankload) // for case-sensitive file systems
+			bankload = FetchTimbreData(filename.substr(0, filename.length() - 3).append("BNK"), fp);
+		#endif
+		#endif
+		if (!bankload)
+		{
+			// fetch other default banks
+			size_t np = filename.find_last_of("/");
+			if (np == std::string::npos)
+				np = filename.find_last_of("\\");
+			if (np != std::string::npos)
+			{
+				if (!InstsLoaded())
+				{
+					// fetch IMPlay bank
+					bankload = FetchTimbreData(filename.substr(0, np + 1).append("implay.bnk"), fp);
+					#ifndef DOS
+					#ifndef WIN32
+					if (!bankload) // for case-sensitive file systems
+						bankload = FetchTimbreData(filename.substr(0, np + 1).append("IMPLAY.BNK"), fp);
+					#endif
+					#endif
+				}
+				if (!InstsLoaded())
+				{
+					// fetch standard bank
+					bankload = FetchTimbreData(filename.substr(0, np + 1).append("standard.bnk"), fp);
+					#ifndef DOS
+					#ifndef WIN32
+					if (!bankload) // for case-sensitive file systems
+						bankload = FetchTimbreData(filename.substr(0, np + 1).append("STANDARD.BNK"), fp);
+					#endif
+					#endif
+				}
+			}
+		}
+	}
+	drv = new CadlibDriver(opl);
+	rewind(0);
+	return true;
+}
+
+bool CmusPlayer::InstsLoaded()
+{
+	if (!insts) return false;
+	for (int i = 0; i < nrTimbre; i++)
+		if (!instsi.loaded)
+			return false;
+	return true;
+}
+
+bool CmusPlayer::LoadTimbreBank(const std::string fname, const CFileProvider &fp)
+{
+	binistream *f = fp.open(fname);
+	if (!f) {
+		#ifdef DEBUG
+		AdPlug_LogWrite("Timbre bank not found: %s\n", fname.c_str());
+		#endif
+		return false;
+	}
+
+	// file validation
+	if (fp.filesize(f) < SND_HEADER_LEN)
+	{
+		fp.close(f);
+		#ifdef DEBUG
+		AdPlug_LogWrite("Timbre bank size is wrong.\n");
+		#endif
+		return false;
+	}
+ 	uint8_t vMaj = static_cast<uint8_t>(f->readInt(1));
+	uint8_t vMin = static_cast<uint8_t>(f->readInt(1));
+	nrTimbre = static_cast<uint16_t>(f->readInt(2));
+	uint16_t offsetDef = static_cast<uint16_t>(f->readInt(2));
+	// validate header and data size
+	if (vMaj != 1 || vMin != 0 ||
+		offsetDef != SND_HEADER_LEN + nrTimbre * TIMBRE_NAME_SIZE ||
+		fp.filesize(f) < SND_HEADER_LEN + nrTimbre * TIMBRE_NAME_SIZE + nrTimbre * TIMBRE_DEF_SIZE)
+	{
+		nrTimbre = 0;
+		fp.close(f);
+		#ifdef DEBUG
+		AdPlug_LogWrite("Timbre bank format is incorrect.\n");
+		#endif
+		return false;
+	}
+	insts = new mus_instnrTimbre;
+	// read timbre names
+	for (int i = 0; i < nrTimbre; i++)
+	{
+		f->readString(instsi.name, TIMBRE_NAME_SIZE);
+		instsi.nameTIMBRE_NAME_SIZE - 1 = 0;
+	}
+	// read timbre data
+	for (int i = 0; i < nrTimbre; i++)
+	{
+		f->readString((char *)instsi.data, TIMBRE_DEF_LEN * 2);
+		instsi.loaded = true;
+	}
+	fp.close(f);
+	return true;
+}
+
+bool CmusPlayer::FetchTimbreData(const std::string fname, const CFileProvider &fp)
+{
+	binistream *f = fp.open(fname);
+	if (!f) {
+		#ifdef DEBUG
+		AdPlug_LogWrite("Instrument bank not found: %s\n", fname.c_str());
+		#endif
+		return false;
+	}
+	// file validation
+	if (fp.filesize(f) < BNK_HEADER_SIZE)
+	{
+		fp.close(f);
+		#ifdef DEBUG
+		AdPlug_LogWrite("Instrument bank size is wrong.");
+		#endif
+		return false;
+	}
+	// check bank version
+	if (f->readInt(1) != 1 ||
+		f->readInt(1) != 0)
+	{
+		fp.close(f);
+		#ifdef DEBUG
+		AdPlug_LogWrite("Instrument bank version is wrong.");
+		#endif
+		return false;
+	}
+	// check bank signature
+	char signatureBNK_SIGNATURE_LEN + 1;
+	signatureBNK_SIGNATURE_LEN = 0;
+	f->readString(signature, BNK_SIGNATURE_LEN);
+	if (strcmp(signature, "ADLIB-"))
+	{
+		fp.close(f);
+		#ifdef DEBUG
+		AdPlug_LogWrite("Instrument bank signature is wrong.");
+		#endif
+		return false;
+	}
+	uint16_t numUsed = static_cast<uint16_t>(f->readInt(2));
+	uint16_t numInst = static_cast<uint16_t>(f->readInt(2));
+	uint32_t offsetName = static_cast<uint32_t>(f->readInt(4));
+	uint32_t offsetData = static_cast<uint32_t>(f->readInt(4));
+	// validate header and data size
+	if (numUsed == 0 ||
+		numInst == 0 ||
+		numUsed > numInst ||
+		offsetName == 0 ||
+		offsetData == 0 ||
+		offsetName > offsetData ||
+		offsetName > BNK_HEADER_SIZE || /* often 0x1C, also can be 0x14 */
+		fp.filesize(f) < offsetData + numInst * BNK_INST_SIZE)
+	{
+		fp.close(f);
+		#ifdef DEBUG
+		AdPlug_LogWrite("Instrument bank format is incorrect.");
+		#endif
+		return false;
+	}
+	f->seek(offsetName);
+	uint8_t * names = new uint8_tnumInst * BNK_NAME_SIZE;
+	f->readString((char *)names, numInst * BNK_NAME_SIZE);
+
+	f->seek(offsetData);
+	uint8_t * instData = new uint8_tnumInst * BNK_INST_SIZE;
+	f->readString((char *)instData, numInst * BNK_INST_SIZE);
+
+	fp.close(f);
+
+	uint16_t index;
+	bool match;
+	for (int i = 0; i < numUsed; i++)
+	{
+		index = *(uint16_t *)(names + i * BNK_NAME_SIZE);
+		for (int j = 0; j < nrTimbre; j++)
+		{
+			match = true;
+			for (int k = 0; k < TIMBRE_NAME_SIZE; k++)
+			{
+				if (k > 0 && instsj.namek - 1 == 0)
+					break;
+				if (tolower(instsj.namek) != tolower(namesi * BNK_NAME_SIZE + 3 + k))
+				{
+					match = false;
+					break;
+				}
+			}
+			if (match && !instsj.loaded && index < numInst)
+			{
+				for (int k = 0; k < TIMBRE_DEF_LEN; k++)
+				{
+					instsj.datak = instDataindex * BNK_INST_SIZE + 2 + k;
+				}
+				instsj.loaded = true;
+			}
+		}
+		if (InstsLoaded())
+			break;
+	}
+	delete names;
+	delete instData;
+	return true;
+}
+
+void CmusPlayer::rewind(int subsong)
+{
+	SetTempo(basicTempo, tickBeat);
+	pos = 0; songend = false;
+	opl->init();
+	if (drv) drv->SoundWarmInit();
+
+	for (int i = 0; i < MAX_VOICES; i++)
+		volumei = 0;
+	counter = 0;
+	ticks = 0;
+
+	if (drv) drv->SetMode(soundMode);
+	if (drv) drv->SetPitchRange(pitchBRange);
+}
+
+/*
+	Change the tempo.
+*/
+void CmusPlayer::SetTempo(uint16_t tempo, uint8_t tickBeat)
+{
+	if (!tempo) tempo = basicTempo;
+	timer = tempo * tickBeat / 60.0f;
+}
+
+uint32_t CmusPlayer::GetTicks()
+{
+	uint32_t ticks = 0;
+	while (datapos == OVERFLOW_BYTE && pos < dataSize)
+	{
+		ticks += OVERFLOW_TICKS;
+		pos++;
+	}
+	if (pos < dataSize)
+		ticks += datapos++;
+	// Wraithverge: this check reduces delay and makes loops smoother
+	// in DarkSpyre (*.MUS) songs. Their loop-point is much closer
+	// to the mark with this condition.
+	if (ticks / timer > MAX_SEC_DELAY) // for very long delays
+		// Wraithverge: added uint32_t cast, but removed float cast,
+		// because MAX_SEC_DELAY is now float.
+		ticks = static_cast<uint32_t>(timer * MAX_SEC_DELAY);
+	return ticks;
+}
+
+void CmusPlayer::executeCommand()
+{
+	uint8_t new_status = 0, voice, haut, vol, timbre;
+	uint16_t pitch;
+
+	// execute MIDI command
+	if (datapos < NOTE_OFF_BYTE)
+	{
+		// running status
+		new_status = status;
+	}
+	else
+		new_status = datapos++;
+	if (new_status == STOP_BYTE)
+	{
+		pos = dataSize;
+	}
+	else if (new_status == SYSTEM_XOR_BYTE)
+	{
+		/*
+		non-standard... this is a tempo multiplier:
+		data format: <F0> <7F> <00> <integer> <frac> <F7>
+		tempo = basicTempo * integerPart + basicTempo * fractionPart/128
+		*/
+		if (datapos++ != ADLIB_CTRL_BYTE ||
+			datapos++ != TEMPO_CTRL_BYTE)
+		{
+			/* unknown format ... skip all the XOR message */
+			pos -= 2;
+			while (datapos++ != EOX_BYTE);
+		}
+		else
+		{
+			uint8_t integer = datapos++;
+			uint8_t frac = datapos++;
+			uint16_t tempo = basicTempo;
+			tempo = tempo * integer + ((tempo * frac) >> 7);
+			SetTempo(tempo, tickBeat);
+			pos++; /* skip EOX_BYTE */
+		}
+	}
+	else
+	{
+		status = new_status;
+		voice = status & 0xF;
+		switch (status & 0xF0)
+		{
+		case NOTE_ON_BYTE:
+			haut = datapos++;
+			vol = datapos++;
+			if (voice > MAX_VOICES - 1)
+				break;
+			if (!vol)
+			{
+				if (drv) drv->NoteOff(voice);
+			}
+			else
+			{
+				if (vol != volumevoice)
+				{
+					if (drv) drv->SetVoiceVolume(voice, vol);
+					volumevoice = vol;
+				}
+				if (drv) drv->NoteOn(voice, haut);
+			}
+			break;
+		case NOTE_OFF_BYTE:
+			haut = datapos++;
+			vol = datapos++;
+			if (voice > MAX_VOICES - 1)
+				break;
+			if (drv) drv->NoteOff(voice);
+			if (isIMS && vol)
+			{
+				if (vol != volumevoice)
+				{
+					if (drv) drv->SetVoiceVolume(voice, vol);
+					volumevoice = vol;
+				}
+				if (drv) drv->NoteOn(voice, haut);
+			}
+			break;
+		case AFTER_TOUCH_BYTE:
+			vol = datapos++;
+			if (voice > MAX_VOICES - 1)
+				break;
+			if (vol != volumevoice)
+			{
+				if (drv) drv->SetVoiceVolume(voice, vol);
+				volumevoice = vol;
+			}
+			break;
+		case PROG_CHANGE_BYTE:
+			timbre = datapos++;
+			if (voice > MAX_VOICES - 1)
+				break;
+			if (insts &&
+				timbre < nrTimbre &&
+				inststimbre.loaded)
+			{
+				if (drv) drv->SetVoiceTimbre(voice, &inststimbre.data0);
+			}
+			#ifdef DEBUG
+			else
+				AdPlug_LogWrite("Timbre not found: %d\n", timbre);
+			#endif
+			break;
+		case PITCH_BEND_BYTE:
+			pitch = datapos++;
+			pitch |= datapos++ << 7;
+			if (voice > MAX_VOICES - 1)
+				break;
+			if (drv) drv->SetVoicePitch(voice, pitch);
+			break;
+		case CONTROL_CHANGE_BYTE:
+			/* unused */
+			pos += 2;
+			break;
+		case CHANNEL_PRESSURE_BYTE:
+			/* unused */
+			pos++;
+			break;
+		default:
+			/*
+			A bad status byte ( or unimplemented MIDI command) has been encontered.
+			Skip bytes until next timing byte followed by status byte.
+			*/
+			#ifdef DEBUG
+			AdPlug_LogWrite("Bad MIDI status byte: %d\n", status);
+			#endif
+			while (datapos++ < NOTE_OFF_BYTE && pos < dataSize);
+			if (pos >= dataSize)
+				break;
+			if (datapos != OVERFLOW_BYTE)
+				pos--;
+			break;
+		}
+	}
+}
+
+bool CmusPlayer::update()
+{
+	if (!counter)
+	{
+		ticks = GetTicks();
+	}
+	if (++counter >= ticks)
+	{
+		counter = 0;
+		while (pos < dataSize)
+		{
+			executeCommand();
+			if (pos >= dataSize) {
+				pos = 0;
+				songend = true;
+				break;
+			}
+			else if (!datapos) // if next delay is zero
+			{
+				pos++;
+			}
+			else break;
+		}
+	}
+	return !songend;
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/mus.h Added

@@ -0,0 +1,155 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2005 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * mus.h - AdLib MIDI Music File Player by Stas'M <binarymaster@mail.ru>
+ *
+ * Based on PLAY.C by Marc Savary, Ad Lib Inc.
+ *
+ * REFERENCES:
+ * http://www.shikadi.net/moddingwiki/AdLib_MIDI_Format
+ * http://www.shikadi.net/moddingwiki/IMS_Format
+ * http://www.shikadi.net/moddingwiki/AdLib_Timbre_Bank_Format
+ * http://www.shikadi.net/moddingwiki/AdLib_Instrument_Bank_Format
+ * http://www.vgmpf.com/Wiki/index.php?title=MUS_(AdLib)
+ * http://www.vgmpf.com/Wiki/index.php?title=SND_(AdLib)
+ */
+
+#ifndef H_ADPLUG_MUSPLAYER
+#define H_ADPLUG_MUSPLAYER
+
+#include "player.h"
+#include "adlib.h"
+
+#define SYSTEM_XOR_BYTE		0xF0
+#define EOX_BYTE			0xF7
+#define OVERFLOW_BYTE		0xF8
+#define STOP_BYTE			0xFC
+
+#define NOTE_OFF_BYTE		0x80
+#define NOTE_ON_BYTE		0x90
+#define AFTER_TOUCH_BYTE	0xA0
+#define CONTROL_CHANGE_BYTE	0xB0
+#define PROG_CHANGE_BYTE	0xC0
+#define CHANNEL_PRESSURE_BYTE	0xD0
+#define PITCH_BEND_BYTE		0xE0
+
+#define ADLIB_CTRL_BYTE	0x7F	/* for System exclusive */
+#define TEMPO_CTRL_BYTE	0
+
+#define TUNE_NAME_SIZE		30
+#define FILLER_SIZE			8
+#define TIMBRE_NAME_SIZE	9
+#define TIMBRE_DEF_LEN		ADLIB_INST_LEN
+#define TIMBRE_DEF_SIZE 	(TIMBRE_DEF_LEN * sizeof(int16_t))
+#define OVERFLOW_TICKS		240
+#define MAX_SEC_DELAY		10.0f	/* Wraithverge: changed this to float, to avoid casting */
+#define HEADER_LEN			70
+#define SND_HEADER_LEN		6
+#define IMS_SIGNATURE		0x7777
+
+#define BNK_HEADER_SIZE		28
+#define BNK_SIGNATURE_LEN	6
+#define BNK_NAME_SIZE		12
+#define BNK_INST_SIZE		30
+
+class CmusPlayer: public CPlayer
+{
+public:
+	static CPlayer *factory(Copl *newopl);
+
+	CmusPlayer(Copl *newopl)
+		: CPlayer(newopl), drv(0), data(0), insts(0)
+		{ }
+	~CmusPlayer()
+	{
+		if (data) delete data;
+		if (insts) delete insts;
+		if (drv) drv->~CadlibDriver();
+	};
+
+	bool load(const std::string &filename, const CFileProvider &fp);
+	bool update();
+	void rewind(int subsong);
+
+	float getrefresh()
+	{
+		return timer;
+	};
+
+	std::string gettitle()
+	{
+		return std::string(tuneName);
+	};
+
+	std::string gettype();
+
+	unsigned int getinstruments()
+	{
+		return insts ? nrTimbre : 0;
+	};
+
+	std::string getinstrument(unsigned int n)
+	{
+		return insts && n < nrTimbre ? (instsn.loaded ? std::string(instsn.name) : std::string("N/A ").append(instsn.name)) : std::string();
+	};
+
+private:
+	bool InstsLoaded();
+	bool LoadTimbreBank(const std::string fname, const CFileProvider &fp);
+	bool FetchTimbreData(const std::string fname, const CFileProvider &fp);
+	void SetTempo(uint16_t tempo, uint8_t tickBeat);
+	uint32_t GetTicks();
+	void executeCommand();
+	CadlibDriver *drv;
+
+protected:
+	/* variables for playback */
+	unsigned long	pos;
+	bool		songend;
+	float		timer;
+
+	uint32_t	counter;					/* tick counter */
+	uint32_t	ticks;					/* ticks to wait for next event */
+	uint8_t		status; /* running status byte */
+	uint8_t		volumeMAX_VOICES;		/* actual volume of all voices */
+
+	/* header variables of .MUS file */
+	uint8_t		majorVersion;
+	uint8_t		minorVersion;
+	char		tuneNameTUNE_NAME_SIZE;
+	uint8_t		tickBeat;
+	uint32_t	dataSize;
+	uint8_t		soundMode;			/* 0: melodic, 1: percussive */
+	uint8_t		pitchBRange;		/* 1 - 12 */
+	uint16_t	basicTempo;
+
+	uint8_t *	data;				/* MIDI data */
+	bool		isIMS;					/* play as IMS format */
+
+	/* variables for timbre bank */
+	struct mus_inst {
+		char	nameTIMBRE_NAME_SIZE;
+		bool	loaded;
+		int16_t	dataTIMBRE_DEF_LEN;
+	};
+
+	uint16_t	nrTimbre;			/* # of definitions in bank. */
+	mus_inst *	insts;					/* instrument definitions */
+};
+
+#endif
\ No newline at end of file

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/nemuopl.cpp Added

@@ -0,0 +1,50 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2006 Simon Peter, <dn.tlp@gmx.net>, et al.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * nemuopl.cpp - Emulated OPL using the Nuked OPL3 emulator
+ */
+
+#include "nemuopl.h"
+
+extern "C" {
+#include "nukedopl.h"
+}
+
+CNemuopl::CNemuopl(int rate)
+{
+ opl = new opl3_chip();
+ OPL3_Reset(opl, rate);
+ currType = TYPE_OPL2;
+}
+
+CNemuopl::~CNemuopl()
+{
+ delete opl;
+}
+
+void CNemuopl::update(short *buf, int samples)
+{
+ OPL3_GenerateStream(opl, buf, samples);
+}
+
+void CNemuopl::write(int reg, int val)
+{
+ OPL3_WriteRegBuffered(opl, (currChip << 8) | reg, val);
+}
+
+void CNemuopl::init() {}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/nemuopl.h Added

@@ -0,0 +1,45 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2008 Simon Peter, <dn.tlp@gmx.net>, et al.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * nemuopl.h - Emulated OPL using the Nuked OPL3 emulator
+ */
+
+#ifndef H_ADPLUG_NEMUOPL
+#define H_ADPLUG_NEMUOPL
+
+#include "opl.h"
+
+typedef struct _opl3_chip opl3_chip;
+
+class CNemuopl: public Copl
+{
+public:
+ CNemuopl(int rate);
+ ~CNemuopl();
+
+ void update(short *buf, int samples);
+
+ void write(int reg, int val);
+
+ void init();
+
+private:
+ opl3_chip*	opl;
+};
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/nukedopl.c Added

@@ -0,0 +1,1418 @@
+//
+// Copyright (C) 2013-2016 Alexey Khokholov (Nuke.YKT)
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// Lesser 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.
+//
+// Nuked OPL3 emulator.
+// Thanks:
+// MAME Development Team(Jarek Burczynski, Tatsuyuki Satoh):
+// Feedback and Rhythm part calculation information.
+// forums.submarine.org.uk(carbon14, opl3):
+// Tremolo and phase generator calculation information.
+// OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
+// OPL2 ROMs.
+//
+// version: 1.7.4
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "nukedopl.h"
+
+#define RSM_FRAC 10
+
+// Channel types
+
+enum {
+ ch_2op = 0,
+ ch_4op = 1,
+ ch_4op2 = 2,
+ ch_drum = 3
+};
+
+// Envelope key types
+
+enum {
+ egk_norm = 0x01,
+ egk_drum = 0x02
+};
+
+
+//
+// logsin table
+//
+
+static const Bit16u logsinrom256 = {
+ 0x859, 0x6c3, 0x607, 0x58b, 0x52e, 0x4e4, 0x4a6, 0x471,
+ 0x443, 0x41a, 0x3f5, 0x3d3, 0x3b5, 0x398, 0x37e, 0x365,
+ 0x34e, 0x339, 0x324, 0x311, 0x2ff, 0x2ed, 0x2dc, 0x2cd,
+ 0x2bd, 0x2af, 0x2a0, 0x293, 0x286, 0x279, 0x26d, 0x261,
+ 0x256, 0x24b, 0x240, 0x236, 0x22c, 0x222, 0x218, 0x20f,
+ 0x206, 0x1fd, 0x1f5, 0x1ec, 0x1e4, 0x1dc, 0x1d4, 0x1cd,
+ 0x1c5, 0x1be, 0x1b7, 0x1b0, 0x1a9, 0x1a2, 0x19b, 0x195,
+ 0x18f, 0x188, 0x182, 0x17c, 0x177, 0x171, 0x16b, 0x166,
+ 0x160, 0x15b, 0x155, 0x150, 0x14b, 0x146, 0x141, 0x13c,
+ 0x137, 0x133, 0x12e, 0x129, 0x125, 0x121, 0x11c, 0x118,
+ 0x114, 0x10f, 0x10b, 0x107, 0x103, 0x0ff, 0x0fb, 0x0f8,
+ 0x0f4, 0x0f0, 0x0ec, 0x0e9, 0x0e5, 0x0e2, 0x0de, 0x0db,
+ 0x0d7, 0x0d4, 0x0d1, 0x0cd, 0x0ca, 0x0c7, 0x0c4, 0x0c1,
+ 0x0be, 0x0bb, 0x0b8, 0x0b5, 0x0b2, 0x0af, 0x0ac, 0x0a9,
+ 0x0a7, 0x0a4, 0x0a1, 0x09f, 0x09c, 0x099, 0x097, 0x094,
+ 0x092, 0x08f, 0x08d, 0x08a, 0x088, 0x086, 0x083, 0x081,
+ 0x07f, 0x07d, 0x07a, 0x078, 0x076, 0x074, 0x072, 0x070,
+ 0x06e, 0x06c, 0x06a, 0x068, 0x066, 0x064, 0x062, 0x060,
+ 0x05e, 0x05c, 0x05b, 0x059, 0x057, 0x055, 0x053, 0x052,
+ 0x050, 0x04e, 0x04d, 0x04b, 0x04a, 0x048, 0x046, 0x045,
+ 0x043, 0x042, 0x040, 0x03f, 0x03e, 0x03c, 0x03b, 0x039,
+ 0x038, 0x037, 0x035, 0x034, 0x033, 0x031, 0x030, 0x02f,
+ 0x02e, 0x02d, 0x02b, 0x02a, 0x029, 0x028, 0x027, 0x026,
+ 0x025, 0x024, 0x023, 0x022, 0x021, 0x020, 0x01f, 0x01e,
+ 0x01d, 0x01c, 0x01b, 0x01a, 0x019, 0x018, 0x017, 0x017,
+ 0x016, 0x015, 0x014, 0x014, 0x013, 0x012, 0x011, 0x011,
+ 0x010, 0x00f, 0x00f, 0x00e, 0x00d, 0x00d, 0x00c, 0x00c,
+ 0x00b, 0x00a, 0x00a, 0x009, 0x009, 0x008, 0x008, 0x007,
+ 0x007, 0x007, 0x006, 0x006, 0x005, 0x005, 0x005, 0x004,
+ 0x004, 0x004, 0x003, 0x003, 0x003, 0x002, 0x002, 0x002,
+ 0x002, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001, 0x001,
+ 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000
+};
+
+//
+// exp table
+//
+
+static const Bit16u exprom256 = {
+ 0x000, 0x003, 0x006, 0x008, 0x00b, 0x00e, 0x011, 0x014,
+ 0x016, 0x019, 0x01c, 0x01f, 0x022, 0x025, 0x028, 0x02a,
+ 0x02d, 0x030, 0x033, 0x036, 0x039, 0x03c, 0x03f, 0x042,
+ 0x045, 0x048, 0x04b, 0x04e, 0x051, 0x054, 0x057, 0x05a,
+ 0x05d, 0x060, 0x063, 0x066, 0x069, 0x06c, 0x06f, 0x072,
+ 0x075, 0x078, 0x07b, 0x07e, 0x082, 0x085, 0x088, 0x08b,
+ 0x08e, 0x091, 0x094, 0x098, 0x09b, 0x09e, 0x0a1, 0x0a4,
+ 0x0a8, 0x0ab, 0x0ae, 0x0b1, 0x0b5, 0x0b8, 0x0bb, 0x0be,
+ 0x0c2, 0x0c5, 0x0c8, 0x0cc, 0x0cf, 0x0d2, 0x0d6, 0x0d9,
+ 0x0dc, 0x0e0, 0x0e3, 0x0e7, 0x0ea, 0x0ed, 0x0f1, 0x0f4,
+ 0x0f8, 0x0fb, 0x0ff, 0x102, 0x106, 0x109, 0x10c, 0x110,
+ 0x114, 0x117, 0x11b, 0x11e, 0x122, 0x125, 0x129, 0x12c,
+ 0x130, 0x134, 0x137, 0x13b, 0x13e, 0x142, 0x146, 0x149,
+ 0x14d, 0x151, 0x154, 0x158, 0x15c, 0x160, 0x163, 0x167,
+ 0x16b, 0x16f, 0x172, 0x176, 0x17a, 0x17e, 0x181, 0x185,
+ 0x189, 0x18d, 0x191, 0x195, 0x199, 0x19c, 0x1a0, 0x1a4,
+ 0x1a8, 0x1ac, 0x1b0, 0x1b4, 0x1b8, 0x1bc, 0x1c0, 0x1c4,
+ 0x1c8, 0x1cc, 0x1d0, 0x1d4, 0x1d8, 0x1dc, 0x1e0, 0x1e4,
+ 0x1e8, 0x1ec, 0x1f0, 0x1f5, 0x1f9, 0x1fd, 0x201, 0x205,
+ 0x209, 0x20e, 0x212, 0x216, 0x21a, 0x21e, 0x223, 0x227,
+ 0x22b, 0x230, 0x234, 0x238, 0x23c, 0x241, 0x245, 0x249,
+ 0x24e, 0x252, 0x257, 0x25b, 0x25f, 0x264, 0x268, 0x26d,
+ 0x271, 0x276, 0x27a, 0x27f, 0x283, 0x288, 0x28c, 0x291,
+ 0x295, 0x29a, 0x29e, 0x2a3, 0x2a8, 0x2ac, 0x2b1, 0x2b5,
+ 0x2ba, 0x2bf, 0x2c4, 0x2c8, 0x2cd, 0x2d2, 0x2d6, 0x2db,
+ 0x2e0, 0x2e5, 0x2e9, 0x2ee, 0x2f3, 0x2f8, 0x2fd, 0x302,
+ 0x306, 0x30b, 0x310, 0x315, 0x31a, 0x31f, 0x324, 0x329,
+ 0x32e, 0x333, 0x338, 0x33d, 0x342, 0x347, 0x34c, 0x351,
+ 0x356, 0x35b, 0x360, 0x365, 0x36a, 0x370, 0x375, 0x37a,
+ 0x37f, 0x384, 0x38a, 0x38f, 0x394, 0x399, 0x39f, 0x3a4,
+ 0x3a9, 0x3ae, 0x3b4, 0x3b9, 0x3bf, 0x3c4, 0x3c9, 0x3cf,
+ 0x3d4, 0x3da, 0x3df, 0x3e4, 0x3ea, 0x3ef, 0x3f5, 0x3fa
+};
+
+//
+// freq mult table multiplied by 2
+//
+// 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 12, 12, 15, 15
+//
+
+static const Bit8u mt16 = {
+ 1, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 20, 24, 24, 30, 30
+};
+
+//
+// ksl table
+//
+
+static const Bit8u kslrom16 = {
+ 0, 32, 40, 45, 48, 51, 53, 55, 56, 58, 59, 60, 61, 62, 63, 64
+};
+
+static const Bit8u kslshift4 = {
+ 8, 1, 2, 0
+};
+
+//
+// envelope generator constants
+//
+
+static const Bit8u eg_incstep348 = {
+ {
+ { 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0 },
+ { 0, 0, 0, 0, 0, 0, 0, 0 }
+ },
+ {
+ { 0, 1, 0, 1, 0, 1, 0, 1 },
+ { 0, 1, 0, 1, 1, 1, 0, 1 },
+ { 0, 1, 1, 1, 0, 1, 1, 1 },
+ { 0, 1, 1, 1, 1, 1, 1, 1 }
+ },
+ {
+ { 1, 1, 1, 1, 1, 1, 1, 1 },
+ { 2, 2, 1, 1, 1, 1, 1, 1 },
+ { 2, 2, 1, 1, 2, 2, 1, 1 },
+ { 2, 2, 2, 2, 2, 2, 1, 1 }
+ }
+};
+
+static const Bit8u eg_incdesc16 = {
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2
+};
+
+static const Bit8s eg_incsh16 = {
+ 0, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, -1, -2
+};
+
+//
+// address decoding
+//
+
+static const Bit8s ad_slot0x20 = {
+ 0, 1, 2, 3, 4, 5, -1, -1, 6, 7, 8, 9, 10, 11, -1, -1,
+ 12, 13, 14, 15, 16, 17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+};
+
+static const Bit8u ch_slot18 = {
+ 0, 1, 2, 6, 7, 8, 12, 13, 14, 18, 19, 20, 24, 25, 26, 30, 31, 32
+};
+
+//
+// Envelope generator
+//
+
+typedef Bit16s(*envelope_sinfunc)(Bit16u phase, Bit16u envelope);
+typedef void(*envelope_genfunc)(opl3_slot *slott);
+
+static Bit16s OPL3_EnvelopeCalcExp(Bit32u level)
+{
+ if (level > 0x1fff)
+ {
+ level = 0x1fff;
+ }
+ return ((exprom(level & 0xff) ^ 0xff | 0x400) << 1) >> (level >> 8);
+}
+
+static Bit16s OPL3_EnvelopeCalcSin0(Bit16u phase, Bit16u envelope)
+{
+ Bit16u out = 0;
+ Bit16u neg = 0;
+ phase &= 0x3ff;
+ if (phase & 0x200)
+ {
+ neg = ~0;
+ }
+ if (phase & 0x100)
+ {
+ out = logsinrom(phase & 0xff) ^ 0xff;
+ }
+ else
+ {
+ out = logsinromphase & 0xff;
+ }
+ return OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg;
+}
+
+static Bit16s OPL3_EnvelopeCalcSin1(Bit16u phase, Bit16u envelope)
+{
+ Bit16u out = 0;
+ phase &= 0x3ff;
+ if (phase & 0x200)
+ {
+ out = 0x1000;
+ }
+ else if (phase & 0x100)
+ {
+ out = logsinrom(phase & 0xff) ^ 0xff;
+ }
+ else
+ {
+ out = logsinromphase & 0xff;
+ }
+ return OPL3_EnvelopeCalcExp(out + (envelope << 3));
+}
+
+static Bit16s OPL3_EnvelopeCalcSin2(Bit16u phase, Bit16u envelope)
+{
+ Bit16u out = 0;
+ phase &= 0x3ff;
+ if (phase & 0x100)
+ {
+ out = logsinrom(phase & 0xff) ^ 0xff;
+ }
+ else
+ {
+ out = logsinromphase & 0xff;
+ }
+ return OPL3_EnvelopeCalcExp(out + (envelope << 3));
+}
+
+static Bit16s OPL3_EnvelopeCalcSin3(Bit16u phase, Bit16u envelope)
+{
+ Bit16u out = 0;
+ phase &= 0x3ff;
+ if (phase & 0x100)
+ {
+ out = 0x1000;
+ }
+ else
+ {
+ out = logsinromphase & 0xff;
+ }
+ return OPL3_EnvelopeCalcExp(out + (envelope << 3));
+}
+
+static Bit16s OPL3_EnvelopeCalcSin4(Bit16u phase, Bit16u envelope)
+{
+ Bit16u out = 0;
+ Bit16u neg = 0;
+ phase &= 0x3ff;
+ if ((phase & 0x300) == 0x100)
+ {
+ neg = ~0;
+ }
+ if (phase & 0x200)
+ {
+ out = 0x1000;
+ }
+ else if (phase & 0x80)
+ {
+ out = logsinrom((phase ^ 0xff) << 1) & 0xff;
+ }
+ else
+ {
+ out = logsinrom(phase << 1) & 0xff;
+ }
+ return OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg;
+}
+
+static Bit16s OPL3_EnvelopeCalcSin5(Bit16u phase, Bit16u envelope)
+{
+ Bit16u out = 0;
+ phase &= 0x3ff;
+ if (phase & 0x200)
+ {
+ out = 0x1000;
+ }
+ else if (phase & 0x80)
+ {
+ out = logsinrom((phase ^ 0xff) << 1) & 0xff;
+ }
+ else
+ {
+ out = logsinrom(phase << 1) & 0xff;
+ }
+ return OPL3_EnvelopeCalcExp(out + (envelope << 3));
+}
+
+static Bit16s OPL3_EnvelopeCalcSin6(Bit16u phase, Bit16u envelope)
+{
+ Bit16u neg = 0;
+ phase &= 0x3ff;
+ if (phase & 0x200)
+ {
+ neg = ~0;
+ }
+ return OPL3_EnvelopeCalcExp(envelope << 3) ^ neg;
+}
+
+static Bit16s OPL3_EnvelopeCalcSin7(Bit16u phase, Bit16u envelope)
+{
+ Bit16u out = 0;
+ Bit16u neg = 0;
+ phase &= 0x3ff;
+ if (phase & 0x200)
+ {
+ neg = ~0;
+ phase = (phase & 0x1ff) ^ 0x1ff;
+ }
+ out = phase << 3;
+ return OPL3_EnvelopeCalcExp(out + (envelope << 3)) ^ neg;
+}
+
+static const envelope_sinfunc envelope_sin8 = {
+ OPL3_EnvelopeCalcSin0,
+ OPL3_EnvelopeCalcSin1,
+ OPL3_EnvelopeCalcSin2,
+ OPL3_EnvelopeCalcSin3,
+ OPL3_EnvelopeCalcSin4,
+ OPL3_EnvelopeCalcSin5,
+ OPL3_EnvelopeCalcSin6,
+ OPL3_EnvelopeCalcSin7
+};
+
+static void OPL3_EnvelopeGenOff(opl3_slot *slot);
+static void OPL3_EnvelopeGenAttack(opl3_slot *slot);
+static void OPL3_EnvelopeGenDecay(opl3_slot *slot);
+static void OPL3_EnvelopeGenSustain(opl3_slot *slot);
+static void OPL3_EnvelopeGenRelease(opl3_slot *slot);
+
+envelope_genfunc envelope_gen5 = {
+ OPL3_EnvelopeGenOff,
+ OPL3_EnvelopeGenAttack,
+ OPL3_EnvelopeGenDecay,
+ OPL3_EnvelopeGenSustain,
+ OPL3_EnvelopeGenRelease
+};
+
+enum envelope_gen_num
+{
+ envelope_gen_num_off = 0,
+ envelope_gen_num_attack = 1,
+ envelope_gen_num_decay = 2,
+ envelope_gen_num_sustain = 3,
+ envelope_gen_num_release = 4
+};
+
+static Bit8u OPL3_EnvelopeCalcRate(opl3_slot *slot, Bit8u reg_rate)
+{
+ Bit8u rate;
+ if (reg_rate == 0x00)
+ {
+ return 0x00;
+ }
+ rate = (reg_rate << 2)
+ + (slot->reg_ksr ? slot->channel->ksv : (slot->channel->ksv >> 2));
+ if (rate > 0x3c)
+ {
+ rate = 0x3c;
+ }
+ return rate;
+}
+
+static void OPL3_EnvelopeUpdateKSL(opl3_slot *slot)
+{
+ Bit16s ksl = (kslromslot->channel->f_num >> 6 << 2)
+ - ((0x08 - slot->channel->block) << 5);
+ if (ksl < 0)
+ {
+ ksl = 0;
+ }
+ slot->eg_ksl = (Bit8u)ksl;
+}
+
+static void OPL3_EnvelopeUpdateRate(opl3_slot *slot)
+{
+ switch (slot->eg_gen)
+ {
+ case envelope_gen_num_off:
+ case envelope_gen_num_attack:
+ slot->eg_rate = OPL3_EnvelopeCalcRate(slot, slot->reg_ar);
+ break;
+ case envelope_gen_num_decay:
+ slot->eg_rate = OPL3_EnvelopeCalcRate(slot, slot->reg_dr);
+ break;
+ case envelope_gen_num_sustain:
+ case envelope_gen_num_release:
+ slot->eg_rate = OPL3_EnvelopeCalcRate(slot, slot->reg_rr);
+ break;
+ }
+}
+
+static void OPL3_EnvelopeGenOff(opl3_slot *slot)
+{
+ slot->eg_rout = 0x1ff;
+}
+
+static void OPL3_EnvelopeGenAttack(opl3_slot *slot)
+{
+ if (slot->eg_rout == 0x00)
+ {
+ slot->eg_gen = envelope_gen_num_decay;
+ OPL3_EnvelopeUpdateRate(slot);
+ return;
+ }
+ slot->eg_rout += ((~slot->eg_rout) * slot->eg_inc) >> 3;
+ if (slot->eg_rout < 0x00)
+ {
+ slot->eg_rout = 0x00;
+ }
+}
+
+static void OPL3_EnvelopeGenDecay(opl3_slot *slot)
+{
+ if (slot->eg_rout >= slot->reg_sl << 4)
+ {
+ slot->eg_gen = envelope_gen_num_sustain;
+ OPL3_EnvelopeUpdateRate(slot);
+ return;
+ }
+ slot->eg_rout += slot->eg_inc;
+}
+
+static void OPL3_EnvelopeGenSustain(opl3_slot *slot)
+{
+ if (!slot->reg_type)
+ {
+ OPL3_EnvelopeGenRelease(slot);
+ }
+}
+
+static void OPL3_EnvelopeGenRelease(opl3_slot *slot)
+{
+ if (slot->eg_rout >= 0x1ff)
+ {
+ slot->eg_gen = envelope_gen_num_off;
+ slot->eg_rout = 0x1ff;
+ OPL3_EnvelopeUpdateRate(slot);
+ return;
+ }
+ slot->eg_rout += slot->eg_inc;
+}
+
+static void OPL3_EnvelopeCalc(opl3_slot *slot)
+{
+ Bit8u rate_h, rate_l;
+ Bit8u inc = 0;
+ rate_h = slot->eg_rate >> 2;
+ rate_l = slot->eg_rate & 3;
+ if (eg_incshrate_h > 0)
+ {
+ if ((slot->chip->timer & ((1 << eg_incshrate_h) - 1)) == 0)
+ {
+ inc = eg_incstepeg_incdescrate_hrate_l
+ ((slot->chip->timer)>> eg_incshrate_h) & 0x07;
+ }
+ }
+ else
+ {
+ inc = eg_incstepeg_incdescrate_hrate_l
+ slot->chip->timer & 0x07 << (-eg_incshrate_h);
+ }
+ slot->eg_inc = inc;
+ slot->eg_out = slot->eg_rout + (slot->reg_tl << 2)
+ + (slot->eg_ksl >> kslshiftslot->reg_ksl) + *slot->trem;
+ envelope_genslot->eg_gen(slot);
+}
+
+static void OPL3_EnvelopeKeyOn(opl3_slot *slot, Bit8u type)
+{
+ if (!slot->key)
+ {
+ slot->eg_gen = envelope_gen_num_attack;
+ OPL3_EnvelopeUpdateRate(slot);
+ if ((slot->eg_rate >> 2) == 0x0f)
+ {
+ slot->eg_gen = envelope_gen_num_decay;
+ OPL3_EnvelopeUpdateRate(slot);
+ slot->eg_rout = 0x00;
+ }
+ slot->pg_phase = 0x00;
+ }
+ slot->key |= type;
+}
+
+static void OPL3_EnvelopeKeyOff(opl3_slot *slot, Bit8u type)
+{
+ if (slot->key)
+ {
+ slot->key &= (~type);
+ if (!slot->key)
+ {
+ slot->eg_gen = envelope_gen_num_release;
+ OPL3_EnvelopeUpdateRate(slot);
+ }
+ }
+}
+
+//
+// Phase Generator
+//
+
+static void OPL3_PhaseGenerate(opl3_slot *slot)
+{
+ Bit16u f_num;
+ Bit32u basefreq;
+
+ f_num = slot->channel->f_num;
+ if (slot->reg_vib)
+ {
+ Bit8s range;
+ Bit8u vibpos;
+
+ range = (f_num >> 7) & 7;
+ vibpos = slot->chip->vibpos;
+
+ if (!(vibpos & 3))
+ {
+ range = 0;
+ }
+ else if (vibpos & 1)
+ {
+ range >>= 1;
+ }
+ range >>= slot->chip->vibshift;
+
+ if (vibpos & 4)
+ {
+ range = -range;
+ }
+ f_num += range;
+ }
+ basefreq = (f_num << slot->channel->block) >> 1;
+ slot->pg_phase += (basefreq * mtslot->reg_mult) >> 1;
+}
+
+//
+// Noise Generator
+//
+
+static void OPL3_NoiseGenerate(opl3_chip *chip)
+{
+ if (chip->noise & 0x01)
+ {
+ chip->noise ^= 0x800302;
+ }
+ chip->noise >>= 1;
+}
+
+//
+// Slot
+//
+
+static void OPL3_SlotWrite20(opl3_slot *slot, Bit8u data)
+{
+ if ((data >> 7) & 0x01)
+ {
+ slot->trem = &slot->chip->tremolo;
+ }
+ else
+ {
+ slot->trem = (Bit8u*)&slot->chip->zeromod;
+ }
+ slot->reg_vib = (data >> 6) & 0x01;
+ slot->reg_type = (data >> 5) & 0x01;
+ slot->reg_ksr = (data >> 4) & 0x01;
+ slot->reg_mult = data & 0x0f;
+ OPL3_EnvelopeUpdateRate(slot);
+}
+
+static void OPL3_SlotWrite40(opl3_slot *slot, Bit8u data)
+{
+ slot->reg_ksl = (data >> 6) & 0x03;
+ slot->reg_tl = data & 0x3f;
+ OPL3_EnvelopeUpdateKSL(slot);
+}
+
+static void OPL3_SlotWrite60(opl3_slot *slot, Bit8u data)
+{
+ slot->reg_ar = (data >> 4) & 0x0f;
+ slot->reg_dr = data & 0x0f;
+ OPL3_EnvelopeUpdateRate(slot);
+}
+
+static void OPL3_SlotWrite80(opl3_slot *slot, Bit8u data)
+{
+ slot->reg_sl = (data >> 4) & 0x0f;
+ if (slot->reg_sl == 0x0f)
+ {
+ slot->reg_sl = 0x1f;
+ }
+ slot->reg_rr = data & 0x0f;
+ OPL3_EnvelopeUpdateRate(slot);
+}
+
+static void OPL3_SlotWriteE0(opl3_slot *slot, Bit8u data)
+{
+ slot->reg_wf = data & 0x07;
+ if (slot->chip->newm == 0x00)
+ {
+ slot->reg_wf &= 0x03;
+ }
+}
+
+static void OPL3_SlotGeneratePhase(opl3_slot *slot, Bit16u phase)
+{
+ slot->out = envelope_sinslot->reg_wf(phase, slot->eg_out);
+}
+
+static void OPL3_SlotGenerate(opl3_slot *slot)
+{
+ OPL3_SlotGeneratePhase(slot, (Bit16u)(slot->pg_phase >> 9) + *slot->mod);
+}
+
+static void OPL3_SlotGenerateZM(opl3_slot *slot)
+{
+ OPL3_SlotGeneratePhase(slot, (Bit16u)(slot->pg_phase >> 9));
+}
+
+static void OPL3_SlotCalcFB(opl3_slot *slot)
+{
+ if (slot->channel->fb != 0x00)
+ {
+ slot->fbmod = (slot->prout + slot->out) >> (0x09 - slot->channel->fb);
+ }
+ else
+ {
+ slot->fbmod = 0;
+ }
+ slot->prout = slot->out;
+}
+
+//
+// Channel
+//
+
+static void OPL3_ChannelSetupAlg(opl3_channel *channel);
+
+static void OPL3_ChannelUpdateRhythm(opl3_chip *chip, Bit8u data)
+{
+ opl3_channel *channel6;
+ opl3_channel *channel7;
+ opl3_channel *channel8;
+ Bit8u chnum;
+
+ chip->rhy = data & 0x3f;
+ if (chip->rhy & 0x20)
+ {
+ channel6 = &chip->channel6;
+ channel7 = &chip->channel7;
+ channel8 = &chip->channel8;
+ channel6->out0 = &channel6->slots1->out;
+ channel6->out1 = &channel6->slots1->out;
+ channel6->out2 = &chip->zeromod;
+ channel6->out3 = &chip->zeromod;
+ channel7->out0 = &channel7->slots0->out;
+ channel7->out1 = &channel7->slots0->out;
+ channel7->out2 = &channel7->slots1->out;
+ channel7->out3 = &channel7->slots1->out;
+ channel8->out0 = &channel8->slots0->out;
+ channel8->out1 = &channel8->slots0->out;
+ channel8->out2 = &channel8->slots1->out;
+ channel8->out3 = &channel8->slots1->out;
+ for (chnum = 6; chnum < 9; chnum++)
+ {
+ chip->channelchnum.chtype = ch_drum;
+ }
+ OPL3_ChannelSetupAlg(channel6);
+ //hh
+ if (chip->rhy & 0x01)
+ {
+ OPL3_EnvelopeKeyOn(channel7->slots0, egk_drum);
+ }
+ else
+ {
+ OPL3_EnvelopeKeyOff(channel7->slots0, egk_drum);
+ }
+ //tc
+ if (chip->rhy & 0x02)
+ {
+ OPL3_EnvelopeKeyOn(channel8->slots1, egk_drum);
+ }
+ else
+ {
+ OPL3_EnvelopeKeyOff(channel8->slots1, egk_drum);
+ }
+ //tom
+ if (chip->rhy & 0x04)
+ {
+ OPL3_EnvelopeKeyOn(channel8->slots0, egk_drum);
+ }
+ else
+ {
+ OPL3_EnvelopeKeyOff(channel8->slots0, egk_drum);
+ }
+ //sd
+ if (chip->rhy & 0x08)
+ {
+ OPL3_EnvelopeKeyOn(channel7->slots1, egk_drum);
+ }
+ else
+ {
+ OPL3_EnvelopeKeyOff(channel7->slots1, egk_drum);
+ }
+ //bd
+ if (chip->rhy & 0x10)
+ {
+ OPL3_EnvelopeKeyOn(channel6->slots0, egk_drum);
+ OPL3_EnvelopeKeyOn(channel6->slots1, egk_drum);
+ }
+ else
+ {
+ OPL3_EnvelopeKeyOff(channel6->slots0, egk_drum);
+ OPL3_EnvelopeKeyOff(channel6->slots1, egk_drum);
+ }
+ }
+ else
+ {
+ for (chnum = 6; chnum < 9; chnum++)
+ {
+ chip->channelchnum.chtype = ch_2op;
+ OPL3_ChannelSetupAlg(&chip->channelchnum);
+ OPL3_EnvelopeKeyOff(chip->channelchnum.slots0, egk_drum);
+ OPL3_EnvelopeKeyOff(chip->channelchnum.slots1, egk_drum);
+ }
+ }
+}
+
+static void OPL3_ChannelWriteA0(opl3_channel *channel, Bit8u data)
+{
+ if (channel->chip->newm && channel->chtype == ch_4op2)
+ {
+ return;
+ }
+ channel->f_num = (channel->f_num & 0x300) | data;
+ channel->ksv = (channel->block << 1)
+ | ((channel->f_num >> (0x09 - channel->chip->nts)) & 0x01);
+ OPL3_EnvelopeUpdateKSL(channel->slots0);
+ OPL3_EnvelopeUpdateKSL(channel->slots1);
+ OPL3_EnvelopeUpdateRate(channel->slots0);
+ OPL3_EnvelopeUpdateRate(channel->slots1);
+ if (channel->chip->newm && channel->chtype == ch_4op)
+ {
+ channel->pair->f_num = channel->f_num;
+ channel->pair->ksv = channel->ksv;
+ OPL3_EnvelopeUpdateKSL(channel->pair->slots0);
+ OPL3_EnvelopeUpdateKSL(channel->pair->slots1);
+ OPL3_EnvelopeUpdateRate(channel->pair->slots0);
+ OPL3_EnvelopeUpdateRate(channel->pair->slots1);
+ }
+}
+
+static void OPL3_ChannelWriteB0(opl3_channel *channel, Bit8u data)
+{
+ if (channel->chip->newm && channel->chtype == ch_4op2)
+ {
+ return;
+ }
+ channel->f_num = (channel->f_num & 0xff) | ((data & 0x03) << 8);
+ channel->block = (data >> 2) & 0x07;
+ channel->ksv = (channel->block << 1)
+ | ((channel->f_num >> (0x09 - channel->chip->nts)) & 0x01);
+ OPL3_EnvelopeUpdateKSL(channel->slots0);
+ OPL3_EnvelopeUpdateKSL(channel->slots1);
+ OPL3_EnvelopeUpdateRate(channel->slots0);
+ OPL3_EnvelopeUpdateRate(channel->slots1);
+ if (channel->chip->newm && channel->chtype == ch_4op)
+ {
+ channel->pair->f_num = channel->f_num;
+ channel->pair->block = channel->block;
+ channel->pair->ksv = channel->ksv;
+ OPL3_EnvelopeUpdateKSL(channel->pair->slots0);
+ OPL3_EnvelopeUpdateKSL(channel->pair->slots1);
+ OPL3_EnvelopeUpdateRate(channel->pair->slots0);
+ OPL3_EnvelopeUpdateRate(channel->pair->slots1);
+ }
+}
+
+static void OPL3_ChannelSetupAlg(opl3_channel *channel)
+{
+ if (channel->chtype == ch_drum)
+ {
+ switch (channel->alg & 0x01)
+ {
+ case 0x00:
+ channel->slots0->mod = &channel->slots0->fbmod;
+ channel->slots1->mod = &channel->slots0->out;
+ break;
+ case 0x01:
+ channel->slots0->mod = &channel->slots0->fbmod;
+ channel->slots1->mod = &channel->chip->zeromod;
+ break;
+ }
+ return;
+ }
+ if (channel->alg & 0x08)
+ {
+ return;
+ }
+ if (channel->alg & 0x04)
+ {
+ channel->pair->out0 = &channel->chip->zeromod;
+ channel->pair->out1 = &channel->chip->zeromod;
+ channel->pair->out2 = &channel->chip->zeromod;
+ channel->pair->out3 = &channel->chip->zeromod;
+ switch (channel->alg & 0x03)
+ {
+ case 0x00:
+ channel->pair->slots0->mod = &channel->pair->slots0->fbmod;
+ channel->pair->slots1->mod = &channel->pair->slots0->out;
+ channel->slots0->mod = &channel->pair->slots1->out;
+ channel->slots1->mod = &channel->slots0->out;
+ channel->out0 = &channel->slots1->out;
+ channel->out1 = &channel->chip->zeromod;
+ channel->out2 = &channel->chip->zeromod;
+ channel->out3 = &channel->chip->zeromod;
+ break;
+ case 0x01:
+ channel->pair->slots0->mod = &channel->pair->slots0->fbmod;
+ channel->pair->slots1->mod = &channel->pair->slots0->out;
+ channel->slots0->mod = &channel->chip->zeromod;
+ channel->slots1->mod = &channel->slots0->out;
+ channel->out0 = &channel->pair->slots1->out;
+ channel->out1 = &channel->slots1->out;
+ channel->out2 = &channel->chip->zeromod;
+ channel->out3 = &channel->chip->zeromod;
+ break;
+ case 0x02:
+ channel->pair->slots0->mod = &channel->pair->slots0->fbmod;
+ channel->pair->slots1->mod = &channel->chip->zeromod;
+ channel->slots0->mod = &channel->pair->slots1->out;
+ channel->slots1->mod = &channel->slots0->out;
+ channel->out0 = &channel->pair->slots0->out;
+ channel->out1 = &channel->slots1->out;
+ channel->out2 = &channel->chip->zeromod;
+ channel->out3 = &channel->chip->zeromod;
+ break;
+ case 0x03:
+ channel->pair->slots0->mod = &channel->pair->slots0->fbmod;
+ channel->pair->slots1->mod = &channel->chip->zeromod;
+ channel->slots0->mod = &channel->pair->slots1->out;
+ channel->slots1->mod = &channel->chip->zeromod;
+ channel->out0 = &channel->pair->slots0->out;
+ channel->out1 = &channel->slots0->out;
+ channel->out2 = &channel->slots1->out;
+ channel->out3 = &channel->chip->zeromod;
+ break;
+ }
+ }
+ else
+ {
+ switch (channel->alg & 0x01)
+ {
+ case 0x00:
+ channel->slots0->mod = &channel->slots0->fbmod;
+ channel->slots1->mod = &channel->slots0->out;
+ channel->out0 = &channel->slots1->out;
+ channel->out1 = &channel->chip->zeromod;
+ channel->out2 = &channel->chip->zeromod;
+ channel->out3 = &channel->chip->zeromod;
+ break;
+ case 0x01:
+ channel->slots0->mod = &channel->slots0->fbmod;
+ channel->slots1->mod = &channel->chip->zeromod;
+ channel->out0 = &channel->slots0->out;
+ channel->out1 = &channel->slots1->out;
+ channel->out2 = &channel->chip->zeromod;
+ channel->out3 = &channel->chip->zeromod;
+ break;
+ }
+ }
+}
+
+static void OPL3_ChannelWriteC0(opl3_channel *channel, Bit8u data)
+{
+ channel->fb = (data & 0x0e) >> 1;
+ channel->con = data & 0x01;
+ channel->alg = channel->con;
+ if (channel->chip->newm)
+ {
+ if (channel->chtype == ch_4op)
+ {
+ channel->pair->alg = 0x04 | (channel->con << 1) | (channel->pair->con);
+ channel->alg = 0x08;
+ OPL3_ChannelSetupAlg(channel->pair);
+ }
+ else if (channel->chtype == ch_4op2)
+ {
+ channel->alg = 0x04 | (channel->pair->con << 1) | (channel->con);
+ channel->pair->alg = 0x08;
+ OPL3_ChannelSetupAlg(channel);
+ }
+ else
+ {
+ OPL3_ChannelSetupAlg(channel);
+ }
+ }
+ else
+ {
+ OPL3_ChannelSetupAlg(channel);
+ }
+ if (channel->chip->newm)
+ {
+ channel->cha = ((data >> 4) & 0x01) ? ~0 : 0;
+ channel->chb = ((data >> 5) & 0x01) ? ~0 : 0;
+ }
+ else
+ {
+ channel->cha = channel->chb = ~0;
+ }
+}
+
+static void OPL3_ChannelKeyOn(opl3_channel *channel)
+{
+ if (channel->chip->newm)
+ {
+ if (channel->chtype == ch_4op)
+ {
+ OPL3_EnvelopeKeyOn(channel->slots0, egk_norm);
+ OPL3_EnvelopeKeyOn(channel->slots1, egk_norm);
+ OPL3_EnvelopeKeyOn(channel->pair->slots0, egk_norm);
+ OPL3_EnvelopeKeyOn(channel->pair->slots1, egk_norm);
+ }
+ else if (channel->chtype == ch_2op || channel->chtype == ch_drum)
+ {
+ OPL3_EnvelopeKeyOn(channel->slots0, egk_norm);
+ OPL3_EnvelopeKeyOn(channel->slots1, egk_norm);
+ }
+ }
+ else
+ {
+ OPL3_EnvelopeKeyOn(channel->slots0, egk_norm);
+ OPL3_EnvelopeKeyOn(channel->slots1, egk_norm);
+ }
+}
+
+static void OPL3_ChannelKeyOff(opl3_channel *channel)
+{
+ if (channel->chip->newm)
+ {
+ if (channel->chtype == ch_4op)
+ {
+ OPL3_EnvelopeKeyOff(channel->slots0, egk_norm);
+ OPL3_EnvelopeKeyOff(channel->slots1, egk_norm);
+ OPL3_EnvelopeKeyOff(channel->pair->slots0, egk_norm);
+ OPL3_EnvelopeKeyOff(channel->pair->slots1, egk_norm);
+ }
+ else if (channel->chtype == ch_2op || channel->chtype == ch_drum)
+ {
+ OPL3_EnvelopeKeyOff(channel->slots0, egk_norm);
+ OPL3_EnvelopeKeyOff(channel->slots1, egk_norm);
+ }
+ }
+ else
+ {
+ OPL3_EnvelopeKeyOff(channel->slots0, egk_norm);
+ OPL3_EnvelopeKeyOff(channel->slots1, egk_norm);
+ }
+}
+
+static void OPL3_ChannelSet4Op(opl3_chip *chip, Bit8u data)
+{
+ Bit8u bit;
+ Bit8u chnum;
+ for (bit = 0; bit < 6; bit++)
+ {
+ chnum = bit;
+ if (bit >= 3)
+ {
+ chnum += 9 - 3;
+ }
+ if ((data >> bit) & 0x01)
+ {
+ chip->channelchnum.chtype = ch_4op;
+ chip->channelchnum + 3.chtype = ch_4op2;
+ }
+ else
+ {
+ chip->channelchnum.chtype = ch_2op;
+ chip->channelchnum + 3.chtype = ch_2op;
+ }
+ }
+}
+
+static Bit16s OPL3_ClipSample(Bit32s sample)
+{
+ if (sample > 32767)
+ {
+ sample = 32767;
+ }
+ else if (sample < -32768)
+ {
+ sample = -32768;
+ }
+ return (Bit16s)sample;
+}
+
+static void OPL3_GenerateRhythm1(opl3_chip *chip)
+{
+ opl3_channel *channel6;
+ opl3_channel *channel7;
+ opl3_channel *channel8;
+ Bit16u phase14;
+ Bit16u phase17;
+ Bit16u phase;
+ Bit16u phasebit;
+
+ channel6 = &chip->channel6;
+ channel7 = &chip->channel7;
+ channel8 = &chip->channel8;
+ OPL3_SlotGenerate(channel6->slots0);
+ phase14 = (channel7->slots0->pg_phase >> 9) & 0x3ff;
+ phase17 = (channel8->slots1->pg_phase >> 9) & 0x3ff;
+ phase = 0x00;
+ //hh tc phase bit
+ phasebit = ((phase14 & 0x08) | (((phase14 >> 5) ^ phase14) & 0x04)
+ | (((phase17 >> 2) ^ phase17) & 0x08)) ? 0x01 : 0x00;
+ //hh
+ phase = (phasebit << 9)
+ | (0x34 << ((phasebit ^ (chip->noise & 0x01)) << 1));
+ OPL3_SlotGeneratePhase(channel7->slots0, phase);
+ //tt
+ OPL3_SlotGenerateZM(channel8->slots0);
+}
+
+static void OPL3_GenerateRhythm2(opl3_chip *chip)
+{
+ opl3_channel *channel6;
+ opl3_channel *channel7;
+ opl3_channel *channel8;
+ Bit16u phase14;
+ Bit16u phase17;
+ Bit16u phase;
+ Bit16u phasebit;
+
+ channel6 = &chip->channel6;
+ channel7 = &chip->channel7;
+ channel8 = &chip->channel8;
+ OPL3_SlotGenerate(channel6->slots1);
+ phase14 = (channel7->slots0->pg_phase >> 9) & 0x3ff;
+ phase17 = (channel8->slots1->pg_phase >> 9) & 0x3ff;
+ phase = 0x00;
+ //hh tc phase bit
+ phasebit = ((phase14 & 0x08) | (((phase14 >> 5) ^ phase14) & 0x04)
+ | (((phase17 >> 2) ^ phase17) & 0x08)) ? 0x01 : 0x00;
+ //sd
+ phase = (0x100 << ((phase14 >> 8) & 0x01)) ^ ((chip->noise & 0x01) << 8);
+ OPL3_SlotGeneratePhase(channel7->slots1, phase);
+ //tc
+ phase = 0x100 | (phasebit << 9);
+ OPL3_SlotGeneratePhase(channel8->slots1, phase);
+}
+
+void OPL3_Generate(opl3_chip *chip, Bit16s *buf)
+{
+ Bit8u ii;
+ Bit8u jj;
+ Bit16s accm;
+
+ buf1 = OPL3_ClipSample(chip->mixbuff1);
+
+ for (ii = 0; ii < 12; ii++)
+ {
+ OPL3_SlotCalcFB(&chip->slotii);
+ OPL3_PhaseGenerate(&chip->slotii);
+ OPL3_EnvelopeCalc(&chip->slotii);
+ OPL3_SlotGenerate(&chip->slotii);
+ }
+
+ for (ii = 12; ii < 15; ii++)
+ {
+ OPL3_SlotCalcFB(&chip->slotii);
+ OPL3_PhaseGenerate(&chip->slotii);
+ OPL3_EnvelopeCalc(&chip->slotii);
+ }
+
+ if (chip->rhy & 0x20)
+ {
+ OPL3_GenerateRhythm1(chip);
+ }
+ else
+ {
+ OPL3_SlotGenerate(&chip->slot12);
+ OPL3_SlotGenerate(&chip->slot13);
+ OPL3_SlotGenerate(&chip->slot14);
+ }
+
+ chip->mixbuff0 = 0;
+ for (ii = 0; ii < 18; ii++)
+ {
+ accm = 0;
+ for (jj = 0; jj < 4; jj++)
+ {
+ accm += *chip->channelii.outjj;
+ }
+ chip->mixbuff0 += (Bit16s)(accm & chip->channelii.cha);
+ }
+
+ for (ii = 15; ii < 18; ii++)
+ {
+ OPL3_SlotCalcFB(&chip->slotii);
+ OPL3_PhaseGenerate(&chip->slotii);
+ OPL3_EnvelopeCalc(&chip->slotii);
+ }
+
+ if (chip->rhy & 0x20)
+ {
+ OPL3_GenerateRhythm2(chip);
+ }
+ else
+ {
+ OPL3_SlotGenerate(&chip->slot15);
+ OPL3_SlotGenerate(&chip->slot16);
+ OPL3_SlotGenerate(&chip->slot17);
+ }
+
+ buf0 = OPL3_ClipSample(chip->mixbuff0);
+
+ for (ii = 18; ii < 33; ii++)
+ {
+ OPL3_SlotCalcFB(&chip->slotii);
+ OPL3_PhaseGenerate(&chip->slotii);
+ OPL3_EnvelopeCalc(&chip->slotii);
+ OPL3_SlotGenerate(&chip->slotii);
+ }
+
+ chip->mixbuff1 = 0;
+ for (ii = 0; ii < 18; ii++)
+ {
+ accm = 0;
+ for (jj = 0; jj < 4; jj++)
+ {
+ accm += *chip->channelii.outjj;
+ }
+ chip->mixbuff1 += (Bit16s)(accm & chip->channelii.chb);
+ }
+
+ for (ii = 33; ii < 36; ii++)
+ {
+ OPL3_SlotCalcFB(&chip->slotii);
+ OPL3_PhaseGenerate(&chip->slotii);
+ OPL3_EnvelopeCalc(&chip->slotii);
+ OPL3_SlotGenerate(&chip->slotii);
+ }
+
+ OPL3_NoiseGenerate(chip);
+
+ if ((chip->timer & 0x3f) == 0x3f)
+ {
+ chip->tremolopos = (chip->tremolopos + 1) % 210;
+ }
+ if (chip->tremolopos < 105)
+ {
+ chip->tremolo = chip->tremolopos >> chip->tremoloshift;
+ }
+ else
+ {
+ chip->tremolo = (210 - chip->tremolopos) >> chip->tremoloshift;
+ }
+
+ if ((chip->timer & 0x3ff) == 0x3ff)
+ {
+ chip->vibpos = (chip->vibpos + 1) & 7;
+ }
+
+ chip->timer++;
+
+ while (chip->writebufchip->writebuf_cur.time <= chip->writebuf_samplecnt)
+ {
+ if (!(chip->writebufchip->writebuf_cur.reg & 0x200))
+ {
+ break;
+ }
+ chip->writebufchip->writebuf_cur.reg &= 0x1ff;
+ OPL3_WriteReg(chip, chip->writebufchip->writebuf_cur.reg,
+ chip->writebufchip->writebuf_cur.data);
+ chip->writebuf_cur = (chip->writebuf_cur + 1) % OPL_WRITEBUF_SIZE;
+ }
+ chip->writebuf_samplecnt++;
+}
+
+void OPL3_GenerateResampled(opl3_chip *chip, Bit16s *buf)
+{
+ while (chip->samplecnt >= chip->rateratio)
+ {
+ chip->oldsamples0 = chip->samples0;
+ chip->oldsamples1 = chip->samples1;
+ OPL3_Generate(chip, chip->samples);
+ chip->samplecnt -= chip->rateratio;
+ }
+ buf0 = (Bit16s)((chip->oldsamples0 * (chip->rateratio - chip->samplecnt)
+ + chip->samples0 * chip->samplecnt) / chip->rateratio);
+ buf1 = (Bit16s)((chip->oldsamples1 * (chip->rateratio - chip->samplecnt)
+ + chip->samples1 * chip->samplecnt) / chip->rateratio);
+ chip->samplecnt += 1 << RSM_FRAC;
+}
+
+void OPL3_Reset(opl3_chip *chip, Bit32u samplerate)
+{
+ Bit8u slotnum;
+ Bit8u channum;
+
+ memset(chip, 0, sizeof(opl3_chip));
+ for (slotnum = 0; slotnum < 36; slotnum++)
+ {
+ chip->slotslotnum.chip = chip;
+ chip->slotslotnum.mod = &chip->zeromod;
+ chip->slotslotnum.eg_rout = 0x1ff;
+ chip->slotslotnum.eg_out = 0x1ff;
+ chip->slotslotnum.eg_gen = envelope_gen_num_off;
+ chip->slotslotnum.trem = (Bit8u*)&chip->zeromod;
+ }
+ for (channum = 0; channum < 18; channum++)
+ {
+ chip->channelchannum.slots0 = &chip->slotch_slotchannum;
+ chip->channelchannum.slots1 = &chip->slotch_slotchannum + 3;
+ chip->slotch_slotchannum.channel = &chip->channelchannum;
+ chip->slotch_slotchannum + 3.channel = &chip->channelchannum;
+ if ((channum % 9) < 3)
+ {
+ chip->channelchannum.pair = &chip->channelchannum + 3;
+ }
+ else if ((channum % 9) < 6)
+ {
+ chip->channelchannum.pair = &chip->channelchannum - 3;
+ }
+ chip->channelchannum.chip = chip;
+ chip->channelchannum.out0 = &chip->zeromod;
+ chip->channelchannum.out1 = &chip->zeromod;
+ chip->channelchannum.out2 = &chip->zeromod;
+ chip->channelchannum.out3 = &chip->zeromod;
+ chip->channelchannum.chtype = ch_2op;
+ chip->channelchannum.cha = ~0;
+ chip->channelchannum.chb = ~0;
+ OPL3_ChannelSetupAlg(&chip->channelchannum);
+ }
+ chip->noise = 0x306600;
+ chip->rateratio = (samplerate << RSM_FRAC) / 49716;
+ chip->tremoloshift = 4;
+ chip->vibshift = 1;
+}
+
+void OPL3_WriteReg(opl3_chip *chip, Bit16u reg, Bit8u v)
+{
+ Bit8u high = (reg >> 8) & 0x01;
+ Bit8u regm = reg & 0xff;
+ switch (regm & 0xf0)
+ {
+ case 0x00:
+ if (high)
+ {
+ switch (regm & 0x0f)
+ {
+ case 0x04:
+ OPL3_ChannelSet4Op(chip, v);
+ break;
+ case 0x05:
+ chip->newm = v & 0x01;
+ break;
+ }
+ }
+ else
+ {
+ switch (regm & 0x0f)
+ {
+ case 0x08:
+ chip->nts = (v >> 6) & 0x01;
+ break;
+ }
+ }
+ break;
+ case 0x20:
+ case 0x30:
+ if (ad_slotregm & 0x1f >= 0)
+ {
+ OPL3_SlotWrite20(&chip->slot18 * high + ad_slotregm & 0x1f, v);
+ }
+ break;
+ case 0x40:
+ case 0x50:
+ if (ad_slotregm & 0x1f >= 0)
+ {
+ OPL3_SlotWrite40(&chip->slot18 * high + ad_slotregm & 0x1f, v);
+ }
+ break;
+ case 0x60:
+ case 0x70:
+ if (ad_slotregm & 0x1f >= 0)
+ {
+ OPL3_SlotWrite60(&chip->slot18 * high + ad_slotregm & 0x1f, v);
+ }
+ break;
+ case 0x80:
+ case 0x90:
+ if (ad_slotregm & 0x1f >= 0)
+ {
+ OPL3_SlotWrite80(&chip->slot18 * high + ad_slotregm & 0x1f, v);
+ }
+ break;
+ case 0xe0:
+ case 0xf0:
+ if (ad_slotregm & 0x1f >= 0)
+ {
+ OPL3_SlotWriteE0(&chip->slot18 * high + ad_slotregm & 0x1f, v);
+ }
+ break;
+ case 0xa0:
+ if ((regm & 0x0f) < 9)
+ {
+ OPL3_ChannelWriteA0(&chip->channel9 * high + (regm & 0x0f), v);
+ }
+ break;
+ case 0xb0:
+ if (regm == 0xbd && !high)
+ {
+ chip->tremoloshift = (((v >> 7) ^ 1) << 1) + 2;
+ chip->vibshift = ((v >> 6) & 0x01) ^ 1;
+ OPL3_ChannelUpdateRhythm(chip, v);
+ }
+ else if ((regm & 0x0f) < 9)
+ {
+ OPL3_ChannelWriteB0(&chip->channel9 * high + (regm & 0x0f), v);
+ if (v & 0x20)
+ {
+ OPL3_ChannelKeyOn(&chip->channel9 * high + (regm & 0x0f));
+ }
+ else
+ {
+ OPL3_ChannelKeyOff(&chip->channel9 * high + (regm & 0x0f));
+ }
+ }
+ break;
+ case 0xc0:
+ if ((regm & 0x0f) < 9)
+ {
+ OPL3_ChannelWriteC0(&chip->channel9 * high + (regm & 0x0f), v);
+ }
+ break;
+ }
+}
+
+void OPL3_WriteRegBuffered(opl3_chip *chip, Bit16u reg, Bit8u v)
+{
+ Bit64u time1, time2;
+
+ if (chip->writebufchip->writebuf_last.reg & 0x200)
+ {
+ OPL3_WriteReg(chip, chip->writebufchip->writebuf_last.reg & 0x1ff,
+ chip->writebufchip->writebuf_last.data);
+
+ chip->writebuf_cur = (chip->writebuf_last + 1) % OPL_WRITEBUF_SIZE;
+ chip->writebuf_samplecnt = chip->writebufchip->writebuf_last.time;
+ }
+
+ chip->writebufchip->writebuf_last.reg = reg | 0x200;
+ chip->writebufchip->writebuf_last.data = v;
+ time1 = chip->writebuf_lasttime + OPL_WRITEBUF_DELAY;
+ time2 = chip->writebuf_samplecnt;
+
+ if (time1 < time2)
+ {
+ time1 = time2;
+ }
+
+ chip->writebufchip->writebuf_last.time = time1;
+ chip->writebuf_lasttime = time1;
+ chip->writebuf_last = (chip->writebuf_last + 1) % OPL_WRITEBUF_SIZE;
+}
+
+void OPL3_GenerateStream(opl3_chip *chip, Bit16s *sndptr, Bit32u numsamples)
+{
+ Bit32u i;
+
+ for(i = 0; i < numsamples; i++)
+ {
+ OPL3_GenerateResampled(chip, sndptr);
+ sndptr += 2;
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/nukedopl.h Added

@@ -0,0 +1,138 @@
+//
+// Copyright (C) 2013-2016 Alexey Khokholov (Nuke.YKT)
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// Lesser 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.
+//
+// Nuked OPL3 emulator.
+// Thanks:
+// MAME Development Team(Jarek Burczynski, Tatsuyuki Satoh):
+// Feedback and Rhythm part calculation information.
+// forums.submarine.org.uk(carbon14, opl3):
+// Tremolo and phase generator calculation information.
+// OPLx decapsulated(Matthew Gambrell, Olli Niemitalo):
+// OPL2 ROMs.
+//
+// version: 1.7.4
+//
+
+#ifndef NUKEDOPL_H
+#define NUKEDOPL_H
+
+#include <inttypes.h>
+
+#define OPL_WRITEBUF_SIZE 1024
+#define OPL_WRITEBUF_DELAY 2
+
+typedef uintptr_t Bitu;
+typedef intptr_t Bits;
+typedef uint64_t Bit64u;
+typedef int64_t Bit64s;
+typedef uint32_t Bit32u;
+typedef int32_t Bit32s;
+typedef uint16_t Bit16u;
+typedef int16_t Bit16s;
+typedef uint8_t Bit8u;
+typedef int8_t Bit8s;
+
+typedef struct _opl3_slot opl3_slot;
+typedef struct _opl3_channel opl3_channel;
+typedef struct _opl3_chip opl3_chip;
+
+struct _opl3_slot {
+ opl3_channel *channel;
+ opl3_chip *chip;
+ Bit16s out;
+ Bit16s fbmod;
+ Bit16s *mod;
+ Bit16s prout;
+ Bit16s eg_rout;
+ Bit16s eg_out;
+ Bit8u eg_inc;
+ Bit8u eg_gen;
+ Bit8u eg_rate;
+ Bit8u eg_ksl;
+ Bit8u *trem;
+ Bit8u reg_vib;
+ Bit8u reg_type;
+ Bit8u reg_ksr;
+ Bit8u reg_mult;
+ Bit8u reg_ksl;
+ Bit8u reg_tl;
+ Bit8u reg_ar;
+ Bit8u reg_dr;
+ Bit8u reg_sl;
+ Bit8u reg_rr;
+ Bit8u reg_wf;
+ Bit8u key;
+ Bit32u pg_phase;
+ Bit32u timer;
+};
+
+struct _opl3_channel {
+ opl3_slot *slots2;
+ opl3_channel *pair;
+ opl3_chip *chip;
+ Bit16s *out4;
+ Bit8u chtype;
+ Bit16u f_num;
+ Bit8u block;
+ Bit8u fb;
+ Bit8u con;
+ Bit8u alg;
+ Bit8u ksv;
+ Bit16u cha, chb;
+};
+
+typedef struct _opl3_writebuf {
+ Bit64u time;
+ Bit16u reg;
+ Bit8u data;
+} opl3_writebuf;
+
+struct _opl3_chip {
+ opl3_channel channel18;
+ opl3_slot slot36;
+ Bit16u timer;
+ Bit8u newm;
+ Bit8u nts;
+ Bit8u rhy;
+ Bit8u vibpos;
+ Bit8u vibshift;
+ Bit8u tremolo;
+ Bit8u tremolopos;
+ Bit8u tremoloshift;
+ Bit32u noise;
+ Bit16s zeromod;
+ Bit32s mixbuff2;
+ //OPL3L
+ Bit32s rateratio;
+ Bit32s samplecnt;
+ Bit16s oldsamples2;
+ Bit16s samples2;
+
+ Bit64u writebuf_samplecnt;
+ Bit32u writebuf_cur;
+ Bit32u writebuf_last;
+ Bit64u writebuf_lasttime;
+ opl3_writebuf writebufOPL_WRITEBUF_SIZE;
+};
+
+void OPL3_Generate(opl3_chip *chip, Bit16s *buf);
+void OPL3_GenerateResampled(opl3_chip *chip, Bit16s *buf);
+void OPL3_Reset(opl3_chip *chip, Bit32u samplerate);
+void OPL3_WriteReg(opl3_chip *chip, Bit16u reg, Bit8u v);
+void OPL3_WriteRegBuffered(opl3_chip *chip, Bit16u reg, Bit8u v);
+void OPL3_GenerateStream(opl3_chip *chip, Bit16s *sndptr, Bit32u numsamples);
+#endif

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/opl.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/opl.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/player.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/player.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/player.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/player.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/players.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/players.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/players.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/players.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/protrack.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/protrack.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/protrack.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/protrack.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/psi.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/psi.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/psi.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/psi.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/rad.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/rad.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/rad.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/rad.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/rat.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/rat.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/rat.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/rat.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/raw.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/raw.cpp Changed

@@ -14,12 +14,20 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * raw.c - RAW Player by Simon Peter <dn.tlp@gmx.net>
 */
 
-#include <string.h>
+/*
+ * Copyright (c) 2015 - 2017 Wraithverge <liam82067@yahoo.com>
+ * - Preliminary support for displaying arbitrary Tag data. (2015)
+ * - Realigned to Tabs. (2017)
+ * - Added Member pointers. (2017)
+ * - Finalized Tag support. (2017)
+ */
+
+#include <cstring>
 #include "raw.h"
 
 /*** public methods *************************************/
@@ -29,25 +37,84 @@
 return new CrawPlayer(newopl);
 }
 
-bool CrawPlayer::load(const char *filename, const CFileProvider &fp)
+bool CrawPlayer::load(const std::string &filename, const CFileProvider &fp)
 {
- binistream *f = fp.open(filename); if(!f) return false;
+ binistream *f = fp.open(filename);
+ if (!f) return false;
+
 char id8;
- unsigned long i;
+ unsigned long i = 0;
 
 // file validation section
 f->readString(id, 8);
- if(strncmp(id,"RAWADATA",8)) { fp.close (f); return false; }
+ if (strncmp(id,"RAWADATA",8)) { fp.close (f); return false; }
 
 // load section
- clock = f->readInt(2);	// clock speed
- length = (fp.filesize(f) - 10) / 2;
- data = new Tdata length;
- for(i = 0; i < length; i++) {
- datai.param = f->readInt(1);
- datai.command = f->readInt(1);
+ this->clock = f->readInt(2); // clock speed
+ this->length = (fp.filesize(f) - 10) / 2; // Wraithverge: total data-size.
+ this->data = new Tdata this->length;
+ bool tagdata = false;
+ title0 = 0;
+ author0 = 0;
+ desc0 = 0;
+
+ for (i = 0; i < this->length; i++) {
+ // Do not store tag data in track data.
+ this->datai.param = (tagdata ? 0xFF : f->readInt(1));
+ this->datai.command = (tagdata ? 0xFF : f->readInt(1));
+
+ // Continue trying to stop at the RAW EOF data marker.
+ if (!tagdata && this->datai.param == 0xFF && this->datai.command == 0xFF) {
+ unsigned char tagCode = f->readInt(1);
+ if (tagCode == 0x1A) {
+ // Tag marker found.
+ tagdata = true;
+ } else if (tagCode == 0) {
+ // Old comment (music archive 2004)
+ f->readString(desc, 1023, 0);
+ } else {
+ // This is not tag marker, revert.
+ f->seek(-1, binio::Add);
+ }
+ }
+ }
+
+ if (tagdata)
+ {
+ // The arbitrary Tag Data section begins here.
+
+ // "title" is maximum 40 characters long.
+ f->readString(title, 40, 0);
+
+ // Skip "author" if Tag marker byte is missing.
+ if (f->readInt(1) != 0x1B) {
+ f->seek(-1, binio::Add);
+ // Check for older version tag (e.g. stunts.raw)
+ if (f->readInt(1) >= 0x20) {
+ f->seek(-1, binio::Add);
+ f->readString(author, 60, 0);
+ f->readString(desc, 1023, 0);
+ goto end_section;
+ }
+ else
+ f->seek(-1, binio::Add);
+ goto desc_section;
+ }
+
+ // "author" is maximum 40 characters long.
+ f->readString(author, 40, 0);
+
+desc_section:
+ // Skip "desc" if Tag marker byte is missing.
+ if (f->readInt(1) != 0x1C) {
+ goto end_section;
+ }
+
+ // "desc" is now maximum 1023 characters long (it was 140).
+ f->readString(desc, 1023, 0);
 }
 
+end_section:
 fp.close(f);
 rewind(0);
 return true;
@@ -55,39 +122,47 @@
 
 bool CrawPlayer::update()
 {
- bool	setspeed;
+ bool setspeed = 0;
 
- if(pos >= length) return false;
+ if (this->pos >= this->length) return false;
 
- if(del) {
+ if (this->del) {
 del--;
 return !songend;
 }
 
 do {
 setspeed = false;
- switch(datapos.command) {
- case 0: del = datapos.param - 1; break;
+
+ if (this->pos >= this->length) return false;
+
+ switch(this->datathis->pos.command) {
+ case 0:
+ this->del = this->datathis->pos.param - 1;
+ break;
+
 case 2:
- if(!datapos.param) {
-	pos++;
-	speed = datapos.param + (datapos.command << 8);
-	setspeed = true;
+ if (!this->datathis->pos.param) {
+ pos++;
+ this->speed = this->datathis->pos.param + (this->datathis->pos.command << 8);
+ setspeed = true;
 } else
-	opl->setchip(datapos.param - 1);
+ opl->setchip(this->datathis->pos.param - 1);
 break;
+
 case 0xff:
- if(datapos.param == 0xff) {
-	rewind(0);		// auto-rewind song
-	songend = true;
-	return !songend;
+ if (this->datathis->pos.param == 0xff) {
+ rewind(0); // auto-rewind song
+ songend = true;
+ return !songend;
 }
 break;
+
 default:
- opl->write(datapos.command,datapos.param);
+ opl->write(this->datathis->pos.command, this->datathis->pos.param);
 break;
 }
- } while(datapos++.command || setspeed);
+ } while (this->datathis->pos++.command || setspeed);
 
 return !songend;
 }
@@ -100,5 +175,6 @@
 
 float CrawPlayer::getrefresh()
 {
- return 1193180.0 / (speed ? speed : 0xffff);	// timer oscillator speed / wait register = clock frequency
+ // timer oscillator speed / wait register = clock frequency
+ return 1193180.0 / (speed ? speed : 0xffff);
 }

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/raw.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/raw.h Changed

@@ -14,31 +14,44 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * raw.h - RAW Player by Simon Peter <dn.tlp@gmx.net>
 */
 
+/*
+ * Copyright (c) 2015 - 2017 Wraithverge <liam82067@yahoo.com>
+ * - Preliminary support for displaying arbitrary Tag data. (2015)
+ * - Minor realignments. (2017)
+ * - Corrected 'type' string. (2017)
+ * - Finalized Tag support. (2017)
+ */
+
 #include "player.h"
 
 class CrawPlayer: public CPlayer
 {
 public:
- static CPlayer *factory(Copl *newopl);
+	static CPlayer *factory(Copl *newopl);
 
 	CrawPlayer(Copl *newopl)
 		: CPlayer(newopl), data(0)
 	{ };
+
 	~CrawPlayer()
-	{ if(data) delete data; };
+	{ if (data) delete data; };
 
-	bool load(const char *filename, const CFileProvider &fp);
+	bool load(const std::string &filename, const CFileProvider &fp);
 	bool update();
 	void rewind(int subsong);
 	float getrefresh();
 
-	const char * gettype()
-	{ return "RdosPlay RAW"; };
+	// Wraithverge: RAC originally captured these files, not RdosPlay.
+	std::string gettype() { return std::string("Raw AdLib Capture"); };
+
+	std::string gettitle() { return std::string(title, 0, 40); };
+	std::string getauthor() { return std::string(author, 0, 60); };
+	std::string getdesc() { return std::string(desc, 0, 1023); };
 
 protected:
 	struct Tdata {
@@ -49,4 +62,9 @@
 	unsigned short clock, speed;
 	unsigned char del;
 	bool songend;
+
+private:
+	char title40;
+	char author60;
+	char desc1023;
 };

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/realopl.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/realopl.cpp Changed

@@ -1,77 +1,79 @@
 /*
 * Adplug - Replayer for many OPL2/OPL3 audio file formats.
 * Copyright (C) 1999 - 2007 Simon Peter, <dn.tlp@gmx.net>, et al.
- * 
+ *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * realopl.cpp - Real hardware OPL, by Simon Peter <dn.tlp@gmx.net>
+ * - Linux support by Tomas Pollak <tomas@forkhq.com>
 */
 
-#ifdef _MSC_VER			// Microsoft Visual C++
-#	include <conio.h>
-#	define INP	_inp
-#	define OUTP	_outp
-#elif defined(__WATCOMC__)	// Watcom C/C++ and OpenWatcom
-#	include <conio.h>
-#	define INP	inp
-#	define OUTP	outp
-#elif defined(WIN32) && defined(__MSVCRT__) && defined(__MINGW32__)	// MinGW32
-/*
-int __cdecl _inp(unsigned short);
-int __cdecl _outp(unsigned short, int);
-#	define INP	_inp
-#	define OUTP	_outp
-*/
-#	define INP		inb
-#	define OUTP(reg, val)	outb(val, reg)
-#elif defined(DJGPP)		// DJGPP
-#	include <pc.h>
-#	define INP	inportb
-#	define OUTP	outportb
-#else				// no support on other platforms
-#	define INP(reg)		0
-#	define OUTP(reg, val)
+#ifdef _MSC_VER // Microsoft Visual C++
+ #if (_MSC_VER >= 1900) // VS2015+
+ // _inp and _outp are no longer part of the C runtime from VS2015/Win8.1
+ int INP(int dummy) { return 0; }
+ void OUTP(int dummy, int dummy2) { return; }
+ #else // _MSC_VER < 1900
+ # include <conio.h>
+ # define INP _inp
+ # define OUTP _outp
+ #endif // _MSC_VER < 1900
+#elif defined(__WATCOMC__) // Watcom C/C++ and OpenWatcom
+ # include <conio.h>
+ # define INP inp
+ # define OUTP outp
+#elif defined(WIN32) && defined(__MSVCRT__) && defined(__MINGW32__) // MinGW32
+ # define INP inb
+ # define OUTP(reg, val) outb(val, reg)
+#elif defined(DJGPP) // DJGPP
+ # include <pc.h>
+ # define INP inportb
+ # define OUTP outportb
+#elif defined(linux) && defined(HAVE_SYS_IO_H)
+ # include <sys/io.h>
+ # define INP inb
+ # define OUTP(reg,val) outb(val,reg)
+#else // no support on other platforms
+ # define INP(reg) 0
+ # define OUTP(reg, val)
 #endif
 
 #include "realopl.h"
 
-#define SHORTDELAY		6	// short delay in I/O port-reads after OPL hardware output
-#define LONGDELAY		35	// long delay in I/O port-reads after OPL hardware output
+#define SHORTDELAY 6 // short delay in I/O port-reads after OPL hardware output
+#define LONGDELAY 35 // long delay in I/O port-reads after OPL hardware output
 
 const unsigned char CRealopl::op_table9 =
- {0x00, 0x01, 0x02, 0x08, 0x09, 0x0a, 0x10, 0x11, 0x12};
+{0x00, 0x01, 0x02, 0x08, 0x09, 0x0a, 0x10, 0x11, 0x12};
 
 #if defined(WIN32) && defined(__MINGW32__)
-static __inline unsigned char inb(unsigned short int port)
-{
+static __inline unsigned char inb(unsigned short int port) {
 unsigned char _v;
 
 __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port));
 return _v;
 }
 
-static __inline void outb(unsigned char value, unsigned short int port)
-{
+static __inline void outb(unsigned char value, unsigned short int port) {
 __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port));
 }
 #endif
 
 CRealopl::CRealopl(unsigned short initport)
- : adlport(initport), hardvol(0), bequiet(false), nowrite(false)
-{
- for(int i=0;i<22;i++) {
+ : adlport(initport), hardvol(0), bequiet(false), nowrite(false) {
+ for (int i = 0; i < 22; i++) {
 hardvols0i0 = 0;
 hardvols0i1 = 0;
 hardvols1i0 = 0;
@@ -81,127 +83,155 @@
 currType = TYPE_OPL3;
 }
 
-bool CRealopl::harddetect()
-{
- unsigned char		stat1, stat2, i;
- unsigned short	adp = (currChip == 0 ? adlport : adlport + 2);
+bool CRealopl::harddetect() {
+ unsigned char stat1, stat2, i;
+ unsigned short adp = (currChip == 0 ? adlport : adlport + 2);
 
- hardwrite(4,0x60); hardwrite(4,0x80);
+ hardwrite(4, 0x60); hardwrite(4, 0x80);
 stat1 = INP(adp);
- hardwrite(2,0xff); hardwrite(4,0x21);
- for(i=0;i<80;i++)			// wait for adlib
+ hardwrite(2, 0xff); hardwrite(4, 0x21);
+
+ for (i = 0; i < 80; i++) // wait for adlib
 INP(adp);
+
 stat2 = INP(adp);
- hardwrite(4,0x60); hardwrite(4,0x80);
+ hardwrite(4, 0x60); hardwrite(4, 0x80);
 
- if(((stat1 & 0xe0) == 0) && ((stat2 & 0xe0) == 0xc0))
+ if (((stat1 & 0xe0) == 0) && ((stat2 & 0xe0) == 0xc0))
 return true;
 else
 return false;
 }
 
-bool CRealopl::detect()
-{
- unsigned char	stat;
+bool CRealopl::detect() {
+ unsigned char stat;
 
 setchip(0);
- if(harddetect()) {
+
+ if (harddetect()) {
 // is at least OPL2, check for OPL3
 currType = TYPE_OPL2;
 
 stat = INP(adlport);
- if(stat & 6) {
+
+ if (stat & 6) {
 // not OPL3, try dual-OPL2
 setchip(1);
- if(harddetect())
-	currType = TYPE_DUAL_OPL2;
- } else
+
+ if (harddetect())
+ currType = TYPE_DUAL_OPL2;
+
+ } else {
 currType = TYPE_OPL3;
+ }
 
 setchip(0);
 return true;
- } else
+
+ } else {
 return false;
+ }
 }
 
-void CRealopl::setvolume(int volume)
-{
+void CRealopl::setvolume(int volume) {
 int i, j;
 
 hardvol = volume;
- for(j = 0; j < 2; j++)
- for(i = 0; i < 9; i++) {
- hardwrite(0x43+op_tablei,((hardvolsjop_tablei+30 & 63) + volume) > 63 ? 63 : hardvolsjop_tablei+30 + volume);
- if(hardvolsji1 & 1)	// modulator too?
-	hardwrite(0x40+op_tablei,((hardvolsjop_tablei0 & 63) + volume) > 63 ? 63 : hardvolsjop_tablei0 + volume);
+
+ for (j = 0; j < 2; j++)
+ for (i = 0; i < 9; i++) {
+ hardwrite(0x43 + op_tablei, ((hardvolsjop_tablei + 30 & 63) + volume) > 63 ? 63 : hardvolsjop_tablei + 30 + volume);
+
+ if (hardvolsji1 & 1) // modulator too?
+ hardwrite(0x40 + op_tablei, ((hardvolsjop_tablei0 & 63) + volume) > 63 ? 63 : hardvolsjop_tablei0 + volume);
 }
 }
 
-void CRealopl::setquiet(bool quiet)
-{
+void CRealopl::setquiet(bool quiet) {
 bequiet = quiet;
 
- if(quiet) {
+ if (quiet) {
 oldvol = hardvol;
 setvolume(63);
+
 } else
 setvolume(oldvol);
 }
 
-void CRealopl::hardwrite(int reg, int val)
-{
- int 			i;
- unsigned short	adp = (currChip == 0 ? adlport : adlport + 2);
+void CRealopl::hardwrite(int reg, int val) {
+ int i;
+ unsigned short adp = (currChip == 0 ? adlport : adlport + 2);
+
+ if (nowrite)
+ return;
+
+#if defined(linux) && defined(HAVE_SYS_IO_H) // see whether we can access the port
+ if (!gotperms) {
+ if ((ioperm(adlport, 2, 1) != 0) || (ioperm(adlport + 2, 2, 1) != 0)) {
+ return;
+ }
+ gotperms = true;
+ }
+#endif
+
+ OUTP(adp, reg); // set register
 
- OUTP(adp,reg);		// set register
- for(i=0;i<SHORTDELAY;i++)	// wait for adlib
+ for (i = 0; i < SHORTDELAY; i++) // wait for adlib
 INP(adp);
- OUTP(adp+1,val);		// set value
- for(i=0;i<LONGDELAY;i++)	// wait for adlib
+
+ OUTP(adp + 1, val); // set value
+
+ for (i = 0; i < LONGDELAY; i++) // wait for adlib
 INP(adp);
 }
 
-void CRealopl::write(int reg, int val)
-{
+void CRealopl::write(int reg, int val) {
 int i;
 
- if(nowrite)
+ if (nowrite)
 return;
 
- if(currType == TYPE_OPL2 && currChip > 0)
+ if (currType == TYPE_OPL2 && currChip > 0)
 return;
 
- if(bequiet && (reg >= 0xb0 && reg <= 0xb8))	// filter all key-on commands
+ if (bequiet && (reg >= 0xb0 && reg <= 0xb8)) // filter all key-on commands
 val &= ~32;
- if(reg >= 0x40 && reg <= 0x55)		// cache volumes
- hardvolscurrChipreg-0x400 = val;
- if(reg >= 0xc0 && reg <= 0xc8)
- hardvolscurrChipreg-0xc01 = val;
- if(hardvol)					// reduce volume
- for(i=0;i<9;i++) {
- if(reg == 0x43 + op_tablei)
-	val = ((val & 63) + hardvol) > 63 ? 63 : val + hardvol;
- else
-	if((reg == 0x40 + op_tablei) && (hardvolscurrChipi1 & 1))
-	 val = ((val & 63) + hardvol) > 63 ? 63 : val + hardvol;
+
+ if (reg >= 0x40 && reg <= 0x55) // cache volumes
+ hardvolscurrChipreg - 0x400 = val;
+
+ if (reg >= 0xc0 && reg <= 0xc8)
+ hardvolscurrChipreg - 0xc01 = val;
+
+ if (hardvol) // reduce volume
+ for (i = 0; i < 9; i++) {
+ if (reg == 0x43 + op_tablei)
+ val = ((val & 63) + hardvol) > 63 ? 63 : val + hardvol;
+ else if ((reg == 0x40 + op_tablei) && (hardvolscurrChipi1 & 1))
+ val = ((val & 63) + hardvol) > 63 ? 63 : val + hardvol;
 }
 
- hardwrite(reg,val);
+ hardwrite(reg, val);
 }
 
-void CRealopl::init()
-{
+void CRealopl::init() {
 int i, j;
 
- for(j = 0; j < 2; j++) {
+ for (j = 0; j < 2; j++) {
 setchip(j);
 
- for(i=0;i<9;i++) {				// stop instruments
- hardwrite(0xb0 + i,0);			// key off
- hardwrite(0x80 + op_tablei,0xff);	// fastest release
+ // set all registers to zero
+ for (i = 0; i < 256; i++) {
+ write(i, 0);
+ }
+
+ // stop instruments
+ for (i = 0; i < 9; i++) {
+ hardwrite(0xb0 + i, 0); // key off
+ hardwrite(0x80 + op_tablei, 0xff); // fastest release
 }
 
- hardwrite(0xbd,0);	// clear misc. register
+ hardwrite(0xbd, 0); // clear misc. register
 }
 
 setchip(0);

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/realopl.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/realopl.h Changed

@@ -1,22 +1,23 @@
 /*
 * AdPlug - Replayer for many OPL2/OPL3 audio file formats.
 * Copyright (C) 1999 - 2005 Simon Peter <dn.tlp@gmx.net>, et al.
- * 
+ *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * realopl.h - Real hardware OPL, by Simon Peter <dn.tlp@gmx.net>
+ * - Linux support by Tomas Pollak <tomas@forkhq.com>
 */
 
 #ifndef H_ADPLUG_REALOPL
@@ -24,49 +25,50 @@
 
 #include "opl.h"
 
-#define DFL_ADLIBPORT	0x388		// default adlib baseport
+#define DFL_ADLIBPORT 0x388 // default adlib baseport
 
-class CRealopl: public Copl
-{
- public:	
- CRealopl(unsigned short initport = DFL_ADLIBPORT);	// initport = OPL2 hardware baseport
+class CRealopl: public Copl {
+ public:
+ CRealopl(unsigned short initport = DFL_ADLIBPORT); // initport = OPL2 hardware baseport
 
- bool detect();			// returns true if adlib compatible board is found, else false
- void setvolume(int volume);		// set adlib master volume (0 - 63) 0 = loudest, 63 = softest
- void setquiet(bool quiet = true);	// sets the OPL2 quiet, while still writing to the registers
- void setport(unsigned short port)	// set new OPL2 hardware baseport
- {
- adlport = port;
- }
- void setnowrite(bool nw = true)	// set hardware write status
- {
- nowrite = nw;
- }
+ bool detect(); // returns true if adlib compatible board is found, else false
+ void setvolume(int volume); // set adlib master volume (0 - 63) 0 = loudest, 63 = softest
+ void setquiet(bool quiet = true); // sets the OPL2 quiet, while still writing to the registers
 
- int getvolume()			// get adlib master volume
- {
- return hardvol;
- }
+ void setport(unsigned short port) { // set new OPL2 hardware baseport
+ adlport = port;
+ }
+
+ void setnowrite(bool nw = true) { // set hardware write status
+ nowrite = nw;
+ }
+
+ int getvolume() { // get adlib master volume
+ return hardvol;
+ }
 
 // template methods
 void write(int reg, int val);
 void init();
- void settype(ChipType type)
- {
- currType = type;
- }
+ void settype(ChipType type) {
+ currType = type;
+ }
 
 protected:
- void hardwrite(int reg, int val);		// write to OPL2 hardware registers
- bool harddetect();				// do real hardware detection
+ void hardwrite(int reg, int val); // write to OPL2 hardware registers
+ bool harddetect(); // do real hardware detection
 
- static const unsigned char op_table9;	// the 9 operators as expected by the OPL2
+ // the 9 operators as expected by the OPL2
+ static const unsigned char op_table9;
 
- unsigned short	adlport;		// adlib hardware baseport
- int			hardvol, oldvol;	// hardware master volume
- bool			bequiet;		// quiet status cache
- char			hardvols2222;	// volume cache
- bool			nowrite;		// don't write to hardware, if true
+ unsigned short adlport; // adlib hardware baseport
+ int hardvol, oldvol; // hardware master volume
+ bool bequiet; // quiet status cache
+ char hardvols2222; // volume cache
+ bool nowrite; // don't write to hardware, if true
+#ifdef linux
+ bool gotperms; // if we've requested ioperms yet
+#endif
 };
 
 #endif

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/rix.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/rix.cpp Changed

@@ -14,22 +14,35 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * rix.cpp - Softstar RIX OPL Format Player by palxex <palxex.ys168.com>
 * BSPAL <BSPAL.ys168.com>
 */
 
-#include <string.h>
+#include <cstring>
+#include <stdint.h>
 #include "rix.h"
 #include "debug.h"
 
-const unsigned char CrixPlayer::adflag = {0,0,0,1,1,1,0,0,0,1,1,1,0,0,0,1,1,1};
-const unsigned char CrixPlayer::reg_data = {0,1,2,3,4,5,8,9,10,11,12,13,16,17,18,19,20,21};
-const unsigned char CrixPlayer::ad_C0_offs = {0,1,2,0,1,2,3,4,5,3,4,5,6,7,8,6,7,8};
-const unsigned char CrixPlayer::modify = {0,3,1,4,2,5,6,9,7,10,8,11,12,15,13,16,14,17,12,\
+#if defined(__hppa__) || \
+ defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
+ (defined(__MIPS__) && defined(__MISPEB__)) || \
+ defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
+ defined(__sparc__)
+ // big endian
+ #define RIX_SWAP32(a) (((a) << 24) | (((a) << 8) & 0x00FF0000) | (((a) >> 8) & 0x0000FF00) | ((a) >> 24))
+#else
+ // little endian
+ #define RIX_SWAP32(a) (a)
+#endif
+
+const uint8_t CrixPlayer::adflag = {0,0,0,1,1,1,0,0,0,1,1,1,0,0,0,1,1,1};
+const uint8_t CrixPlayer::reg_data = {0,1,2,3,4,5,8,9,10,11,12,13,16,17,18,19,20,21};
+const uint8_t CrixPlayer::ad_C0_offs = {0,1,2,0,1,2,3,4,5,3,4,5,6,7,8,6,7,8};
+const uint8_t CrixPlayer::modify = {0,3,1,4,2,5,6,9,7,10,8,11,12,15,13,16,14,17,12,\
 					 15,16,0,14,0,17,0,13,0};
-const unsigned char CrixPlayer::bd_reg_data = {
+const uint8_t CrixPlayer::bd_reg_data = {
 0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x08,0x04,0x02,0x01,
 0x00,0x01,0x01,0x03,0x0F,0x05,0x00,0x01,0x03,0x0F,0x00,
 0x00,0x00,0x01,0x00,0x00,0x01,0x01,0x0F,0x07,0x00,0x02,
@@ -42,9 +55,9 @@
 0x0F,0x0B,0x00,0x05,0x05,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x01,0x00,0x0F,0x0B,0x00,0x07,0x05,0x00,0x00,0x00,
 0x00,0x00,0x00};
-unsigned char CrixPlayer::for40reg = {0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,
+uint8_t CrixPlayer::for40reg = {0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,
 					0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F,0x7F};
-unsigned short CrixPlayer::mus_time = 0x4268;
+const uint16_t CrixPlayer::mus_time = 0x4268;
 
 /*** public methods *************************************/
 
@@ -54,7 +67,7 @@
 }
 
 CrixPlayer::CrixPlayer(Copl *newopl)
- : CPlayer(newopl), flag_mkf(0), file_buffer(0), buf_addr(0)
+ : CPlayer(newopl), flag_mkf(0), file_buffer(0), rix_buf(0)
 {
 }
 
@@ -64,30 +77,27 @@
 delete file_buffer;
 }
 
-bool CrixPlayer::load(const char *filename, const CFileProvider &fp)
+bool CrixPlayer::load(const std::string &filename, const CFileProvider &fp)
 {
 binistream *f = fp.open(filename); if(!f) return false;
- unsigned long i=0;
+ uint32_t i=0;
 
- const char *pext = filename + strlen (filename);
- while (pext > filename && *pext != '.') {
- pext--;
- }
- if (*pext == '.' && !stricmp (pext+1, ".mkf")) {
+ if(stricmp(filename.substr(filename.length()-4,4).c_str(),".mkf")==0)
+ {
 	 flag_mkf=1;
 	 f->seek(0);
 	 int offset=f->readInt(4);
 	 f->seek(offset);
 }
 if(f->readInt(2)!=0x55aa){ fp.close(f);return false; }
- file_buffer = new unsigned char fp.filesize(f) + 1;
+ file_buffer = new uint8_t fp.filesize(f) + 1;
 f->seek(0);
 while(!f->eof())
 	file_bufferi++=f->readInt(1);
 length=i;
 fp.close(f);
 if(!flag_mkf)
-	 buf_addr=file_buffer;
+	 rix_buf=file_buffer;
 rewind(0);
 return true;
 }
@@ -114,23 +124,24 @@
 play_end = 0;
 pos = index = 0; 
 
- memset(f_buffer, 0, sizeof(unsigned short) * 300);
- memset(a0b0_data2, 0, sizeof(unsigned short) * 11);
- memset(a0b0_data3, 0, 18);
- memset(a0b0_data4, 0, 18);
- memset(a0b0_data5, 0, 96);
- memset(addrs_head, 0, 96);
- memset(insbuf, 0, 28 * sizeof(unsigned short));
- memset(displace, 0, 11 * sizeof(unsigned short));
- memset(reg_bufs, 0, 18 * sizeof(ADDT));
+ memset(f_buffer, 0, sizeof(f_buffer));
+ memset(a0b0_data2, 0, sizeof(a0b0_data2));
+ memset(a0b0_data3, 0, sizeof(a0b0_data3));
+ memset(a0b0_data4, 0, sizeof(a0b0_data4));
+ memset(a0b0_data5, 0, sizeof(a0b0_data5));
+ memset(addrs_head, 0, sizeof(addrs_head));
+ memset(insbuf, 0, sizeof(insbuf));
+ memset(displace, 0, sizeof(displace));
+ memset(reg_bufs, 0, sizeof(reg_bufs));
+ memset(for40reg, 0x7F, sizeof(for40reg));
 
 if(flag_mkf)
 {
-	 unsigned int *buf_index=(unsigned int *)file_buffer;
-	 int offset1=buf_indexsubsong,offset2;
-	 while((offset2=buf_index++subsong)==offset1);
+	 uint32_t *buf_index=(uint32_t *)file_buffer;
+	 int offset1=RIX_SWAP32(buf_indexsubsong),offset2;
+	 while((offset2=RIX_SWAP32(buf_index++subsong))==offset1);
 	 length=offset2-offset1+1;
-	 buf_addr=file_buffer+offset1;
+	 rix_buf=file_buffer+offset1;
 }
 opl->init();
 opl->write(1,32);	// go to OPL2 mode
@@ -138,12 +149,12 @@
 data_initial();
 }
 
-unsigned int CrixPlayer::getsubsongs()
+uint32_t CrixPlayer::getsubsongs()
 {
 	if(flag_mkf)
 	{
-		unsigned int *buf_index=(unsigned int *)file_buffer;
-		int songs=buf_index0/4,i=0;
+		uint32_t *buf_index=(uint32_t *)file_buffer;
+		int songs=RIX_SWAP32(buf_index0)/4,i=0;
 		for(i=0;i<songs;i++)
 			if(buf_indexi+1==buf_indexi)
 				songs--;
@@ -167,23 +178,23 @@
 /*----------------------------------------------------------*/
 inline void CrixPlayer::Pause()
 {
- register unsigned short i;
+ register uint16_t i;
 pause_flag = 1;
 for(i=0;i<11;i++)
 switch_ad_bd(i);
 }
 /*----------------------------------------------------------*/
-inline void CrixPlayer::ad_a0b0l_reg_(unsigned short index,unsigned short p2,unsigned short p3)
+inline void CrixPlayer::ad_a0b0l_reg_(uint16_t index,uint16_t p2,uint16_t p3)
 {
-// unsigned short i = p2+a0b0_data2index;
+// uint16_t i = p2+a0b0_data2index;
 a0b0_data4index = p3;
 a0b0_data3index = p2;
 }
 inline void CrixPlayer::data_initial()
 {
- rhythm = buf_addr2;
- mus_block = (buf_addr0x0D<<8)+buf_addr0x0C;
- ins_block = (buf_addr0x09<<8)+buf_addr0x08;
+ rhythm = rix_buf2;
+ mus_block = (rix_buf0x0D<<8)+rix_buf0x0C;
+ ins_block = (rix_buf0x09<<8)+rix_buf0x08;
 I = mus_block+1;
 if(rhythm != 0)
 {
@@ -198,14 +209,18 @@
 band = 0; music_on = 1;
 }
 /*----------------------------------------------------------*/
-inline unsigned short CrixPlayer::ad_initial()
+inline uint16_t CrixPlayer::ad_initial()
 {
- register unsigned short i,j,k = 0;
+ uint16_t i,j,k = 0;
 for(i=0;i<25;i++) 
 {
- 	f_bufferi*12=(unsigned int)((i*24+10000)*0.27461678223+4)>>3;
- 	for(int t=1;t<12;t++)
- 		f_bufferi*12+t=f_bufferi*12+t-1*1.06;
+		uint32_t res = ((uint32_t)i*24+10000)*52088/250000*0x24000/0x1B503;
+		f_bufferi*12=((uint16_t)res+4)>>3;
+		for(int t=1;t<12;t++)
+		{
+			res*=1.06;
+			f_bufferi*12+t=((uint16_t)res+4)>>3;
+		}
 }
 for(i=0;i<8;i++)
 for(j=0;j<12;j++)
@@ -223,7 +238,7 @@
 return 1;//ad_test();
 }
 /*----------------------------------------------------------*/
-inline void CrixPlayer::ad_bop(unsigned short reg,unsigned short value)
+inline void CrixPlayer::ad_bop(uint16_t reg,uint16_t value)
 {
 if(reg == 2 || reg == 3)
 AdPlug_LogWrite("switch OPL2/3 mode!\n");
@@ -232,7 +247,7 @@
 /*--------------------------------------------------------------*/
 inline void CrixPlayer::int_08h_entry() 
 { 
- unsigned short band_sus = 1; 
+ uint16_t band_sus = 1; 
 while(band_sus) 
 { 
 if(sustain <= 0) 
@@ -253,19 +268,19 @@
 } 
 } 
 /*--------------------------------------------------------------*/ 
-inline unsigned short CrixPlayer::rix_proc()
+inline uint16_t CrixPlayer::rix_proc()
 {
- unsigned char ctrl = 0;
+ uint8_t ctrl = 0;
 if(music_on == 0||pause_flag == 1) return 0;
 band = 0;
- while(buf_addrI != 0x80 && I<length-1)
+ while(rix_bufI != 0x80 && I<length-1)
 {
- band_low = buf_addrI-1;
- ctrl = buf_addrI; I+=2;
+ band_low = rix_bufI-1;
+ ctrl = rix_bufI; I+=2;
 switch(ctrl&0xF0)
 	{
 	case 0x90: rix_get_ins(); rix_90_pro(ctrl&0x0F); break;
-	case 0xA0: rix_A0_pro(ctrl&0x0F,((unsigned short)band_low)<<6); break;
+	case 0xA0: rix_A0_pro(ctrl&0x0F,((uint16_t)band_low)<<6); break;
 	case 0xB0: rix_B0_pro(ctrl&0x0F,band_low); break;
 	case 0xC0: switch_ad_bd(ctrl&0x0F);
 	 if(band_low != 0) rix_C0_pro(ctrl&0x0F,band_low);
@@ -283,13 +298,13 @@
 inline void CrixPlayer::rix_get_ins()
 {
 int		i;
- unsigned char	*baddr = (&buf_addrins_block)+(band_low<<6);
+ uint8_t	*baddr = (&rix_bufins_block)+(band_low<<6);
 
 for(i = 0; i < 28; i++)
 insbufi = (baddri * 2 + 1 << 8) + baddri * 2;
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::rix_90_pro(unsigned short ctrl_l)
+inline void CrixPlayer::rix_90_pro(uint16_t ctrl_l)
 {
 if(rhythm == 0 || ctrl_l < 6)
 {
@@ -310,7 +325,7 @@
 		}
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::rix_A0_pro(unsigned short ctrl_l,unsigned short index)
+inline void CrixPlayer::rix_A0_pro(uint16_t ctrl_l,uint16_t index)
 {
 if(rhythm == 0 || ctrl_l <= 6)
 {
@@ -320,9 +335,9 @@
 else return;
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::prepare_a0b0(unsigned short index,unsigned short v) /* important !*/
+inline void CrixPlayer::prepare_a0b0(uint16_t index,uint16_t v) /* important !*/
 {
- short high = 0,low = 0; unsigned int res;
+ short high = 0,low = 0; uint32_t res;
 int res1 = (v-0x2000)*0x19;
 if(res1 == (int)0xff) return;
 low = res1/0x2000;
@@ -350,9 +365,9 @@
 displaceindex = low;
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::ad_a0b0l_reg(unsigned short index,unsigned short p2,unsigned short p3)
+inline void CrixPlayer::ad_a0b0l_reg(uint16_t index,uint16_t p2,uint16_t p3)
 {
- unsigned short data; unsigned short i = p2+a0b0_data2index;
+ uint16_t data; uint16_t i = p2+a0b0_data2index;
 a0b0_data4index = p3;
 a0b0_data3index = p2;
 i = ((signed short)i<=0x5F?i:0x5F);
@@ -363,7 +378,7 @@
 ad_bop(0xB0+index,data);
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::rix_B0_pro(unsigned short ctrl_l,unsigned short index)
+inline void CrixPlayer::rix_B0_pro(uint16_t ctrl_l,uint16_t index)
 {
 register int temp = 0;
 if(rhythm == 0 || ctrl_l < 6) temp = modifyctrl_l*2+1;
@@ -376,9 +391,9 @@
 ad_40_reg(temp);
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::rix_C0_pro(unsigned short ctrl_l,unsigned short index)
+inline void CrixPlayer::rix_C0_pro(uint16_t ctrl_l,uint16_t index)
 {
- register unsigned short i = index>=12?index-12:0;
+ register uint16_t i = index>=12?index-12:0;
 if(ctrl_l < 6 || rhythm == 0)
 {
 ad_a0b0l_reg(ctrl_l,i,1);
@@ -401,7 +416,7 @@
 }
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::switch_ad_bd(unsigned short index)
+inline void CrixPlayer::switch_ad_bd(uint16_t index)
 {
 
 if(rhythm == 0 || index < 6) ad_a0b0l_reg(index,a0b0_data3index,0);
@@ -412,9 +427,9 @@
 }
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::ins_to_reg(unsigned short index,unsigned short* insb,unsigned short value)
+inline void CrixPlayer::ins_to_reg(uint16_t index,uint16_t* insb,uint16_t value)
 {
- register unsigned short i;
+ register uint16_t i;
 for(i=0;i<13;i++) reg_bufsindex.vi = insbi;
 reg_bufsindex.v13 = value&3;
 ad_bd_reg(),ad_08_reg(),
@@ -422,15 +437,15 @@
 ad_80_reg(index),ad_20_reg(index),ad_E0_reg(index);
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::ad_E0_reg(unsigned short index)
+inline void CrixPlayer::ad_E0_reg(uint16_t index)
 {
- unsigned short data = e0_reg_flag == 0?0:(reg_bufsindex.v13&3);
+ uint16_t data = e0_reg_flag == 0?0:(reg_bufsindex.v13&3);
 ad_bop(0xE0+reg_dataindex,data);
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::ad_20_reg(unsigned short index)
+inline void CrixPlayer::ad_20_reg(uint16_t index)
 {
- unsigned short data = (reg_bufsindex.v9 < 1?0:0x80);
+ uint16_t data = (reg_bufsindex.v9 < 1?0:0x80);
 data += (reg_bufsindex.v10 < 1?0:0x40);
 data += (reg_bufsindex.v5 < 1?0:0x20);
 data += (reg_bufsindex.v11 < 1?0:0x10);
@@ -438,33 +453,33 @@
 ad_bop(0x20+reg_dataindex,data);
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::ad_80_reg(unsigned short index)
+inline void CrixPlayer::ad_80_reg(uint16_t index)
 {
- unsigned short data = (reg_bufsindex.v7&0x0F),temp = reg_bufsindex.v4;
+ uint16_t data = (reg_bufsindex.v7&0x0F),temp = reg_bufsindex.v4;
 data |= (temp << 4);
 ad_bop(0x80+reg_dataindex,data);
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::ad_60_reg(unsigned short index)
+inline void CrixPlayer::ad_60_reg(uint16_t index)
 {
- unsigned short data = reg_bufsindex.v6&0x0F,temp = reg_bufsindex.v3;
+ uint16_t data = reg_bufsindex.v6&0x0F,temp = reg_bufsindex.v3;
 data |= (temp << 4);
 ad_bop(0x60+reg_dataindex,data);
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::ad_C0_reg(unsigned short index)
+inline void CrixPlayer::ad_C0_reg(uint16_t index)
 {
- unsigned short data = reg_bufsindex.v2;
+ uint16_t data = reg_bufsindex.v2;
 if(adflagindex == 1) return;
 data *= 2,
 data |= (reg_bufsindex.v12 < 1?1:0);
 ad_bop(0xC0+ad_C0_offsindex,data);
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::ad_40_reg(unsigned short index)
+inline void CrixPlayer::ad_40_reg(uint16_t index)
 {
- unsigned int res = 0;
- unsigned short data = 0,temp = reg_bufsindex.v0;
+ uint32_t res = 0;
+ uint16_t data = 0,temp = reg_bufsindex.v0;
 data = 0x3F - (0x3F & reg_bufsindex.v8),
 data *= for40regindex,
 data *= 2,
@@ -479,12 +494,12 @@
 /*--------------------------------------------------------------*/
 inline void CrixPlayer::ad_bd_reg()
 {
- unsigned short data = rhythm < 1? 0:0x20;
+ uint16_t data = rhythm < 1? 0:0x20;
 data |= bd_modify;
 ad_bop(0xBD,data);
 }
 /*--------------------------------------------------------------*/
-inline void CrixPlayer::ad_a0b0_reg(unsigned short index)
+inline void CrixPlayer::ad_a0b0_reg(uint16_t index)
 {
 ad_bop(0xA0+index,0);
 ad_bop(0xB0+index,0);

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/rix.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/rix.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/rol.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/rol.cpp Changed

@@ -14,239 +14,326 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
- * rol.h - ROL Player by OPLx <oplx@yahoo.com>
+ * rol.cpp - ROL Player by OPLx <oplx@yahoo.com>
 *
- * Visit: http://tenacity.hispeed.com/aomit/oplx/
+ * Source references ADLIB.C from Adlib MSC SDK.
 */
-#include <string.h>
+#include <cstring>
+#include <algorithm>
+
 #include "rol.h"
 #include "debug.h"
 
-
-int const CrolPlayer::kSizeofDataRecord = 30;
-int const CrolPlayer::kMaxTickBeat = 60;
+#if !defined(UINT8_MAX)
+ typedef signed char int8_t;
+ typedef short int16_t;
+ typedef int int32_t;
+ typedef unsigned char uint8_t;
+ typedef unsigned short uint16_t;
+ typedef unsigned int uint32_t;
+#endif
+
+ //---------------------------------------------------------
+static uint32_t const skMidPitch = 0x2000U;
+static int16_t const skNrStepPitch = 25; // 25 steps within a half-tone for pitch bend
+static int16_t const skVersionMajor = 4;
+static int16_t const skVersionMinor = 0;
+static uint8_t const skMaxVolume = 0x7FU;
+static uint8_t const skMaxNotes = 96U;
+static uint8_t const skCarrierOpOffset = 3U;
+static uint8_t const skNumSemitonesInOctave = 12U;
+//---------------------------------------------------------
+static uint8_t const skOPL2_WaveCtrlBaseAddress = 0x01U; // Test LSI / Enable waveform control
+static uint8_t const skOPL2_AaMultiBaseAddress = 0x20U; // Amp Mod / Vibrato / EG type / Key Scaling / Multiple
+static uint8_t const skOPL2_KSLTLBaseAddress = 0x40U; // Key scaling level / Operator output level
+static uint8_t const skOPL2_ArDrBaseAddress = 0x60U; // Attack Rate / Decay Rate
+static uint8_t const skOPL2_SlrrBaseAddress = 0x80U; // Sustain Level / Release Rate
+static uint8_t const skOPL2_FreqLoBaseAddress = 0xA0U; // Frequency (low 8 bits)
+static uint8_t const skOPL2_KeyOnFreqHiBaseAddress = 0xB0U; // Key On / Octave / Frequency (high 2 bits)
+static uint8_t const skOPL2_AmVibRhythmBaseAddress = 0xBDU; // AM depth / Vibrato depth / Rhythm control
+static uint8_t const skOPL2_FeedConBaseAddress = 0xC0U; // Feedback strength / Connection type
+static uint8_t const skOPL2_WaveformBaseAddress = 0xE0U; // Waveform select
+//---------------------------------------------------------
+static uint8_t const skOPL2_EnableWaveformSelectMask = 0x20U;
+static uint8_t const skOPL2_KeyOnMask = 0x20U;
+static uint8_t const skOPL2_RhythmMask = 0x20U;
+static uint8_t const skOPL2_KSLMask = 0xC0U;
+static uint8_t const skOPL2_TLMask = 0x3FU;
+static uint8_t const skOPL2_TLMinLevel = 0x3FU;
+static uint8_t const skOPL2_FNumLSBMask = 0xFFU;
+static uint8_t const skOPL2_FNumMSBMask = 0x03U;
+static uint8_t const skOPL2_FNumMSBShift = 0x08U;
+static uint8_t const skOPL2_BlockNumberShift = 0x02U;
+//---------------------------------------------------------
+static uint8_t const skNoteOctaveskMaxNotes =
+{
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
+};
+//---------------------------------------------------------
+static uint8_t const skNoteIndexskMaxNotes =
+{
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
+};
+//---------------------------------------------------------
+// Table below generated by initialize_fnum_table function (from Adlib Music SDK).
+static uint16_t const skFNumNotesskNrStepPitchskNumSemitonesInOctave =
+{
+ 343, 364, 385, 408, 433, 459, 486, 515, 546, 579, 614, 650,
+ 344, 365, 387, 410, 434, 460, 488, 517, 548, 581, 615, 652,
+ 345, 365, 387, 410, 435, 461, 489, 518, 549, 582, 617, 653,
+ 346, 366, 388, 411, 436, 462, 490, 519, 550, 583, 618, 655,
+ 346, 367, 389, 412, 437, 463, 491, 520, 551, 584, 619, 657,
+ 347, 368, 390, 413, 438, 464, 492, 522, 553, 586, 621, 658,
+ 348, 369, 391, 415, 439, 466, 493, 523, 554, 587, 622, 660,
+ 349, 370, 392, 415, 440, 467, 495, 524, 556, 589, 624, 661,
+ 350, 371, 393, 416, 441, 468, 496, 525, 557, 590, 625, 663,
+ 351, 372, 394, 417, 442, 469, 497, 527, 558, 592, 627, 665,
+ 351, 372, 395, 418, 443, 470, 498, 528, 559, 593, 628, 666,
+ 352, 373, 396, 419, 444, 471, 499, 529, 561, 594, 630, 668,
+ 353, 374, 397, 420, 445, 472, 500, 530, 562, 596, 631, 669,
+ 354, 375, 398, 421, 447, 473, 502, 532, 564, 597, 633, 671,
+ 355, 376, 398, 422, 448, 474, 503, 533, 565, 599, 634, 672,
+ 356, 377, 399, 423, 449, 475, 504, 534, 566, 600, 636, 674,
+ 356, 378, 400, 424, 450, 477, 505, 535, 567, 601, 637, 675,
+ 357, 379, 401, 425, 451, 478, 506, 537, 569, 603, 639, 677,
+ 358, 379, 402, 426, 452, 479, 507, 538, 570, 604, 640, 679,
+ 359, 380, 403, 427, 453, 480, 509, 539, 571, 606, 642, 680,
+ 360, 381, 404, 428, 454, 481, 510, 540, 572, 607, 643, 682,
+ 360, 382, 405, 429, 455, 482, 511, 541, 574, 608, 645, 683,
+ 361, 383, 406, 430, 456, 483, 512, 543, 575, 610, 646, 685,
+ 362, 384, 407, 431, 457, 484, 513, 544, 577, 611, 648, 687,
+ 363, 385, 408, 432, 458, 485, 514, 545, 578, 612, 649, 688
+};
+//---------------------------------------------------------
+static uint8_t const drum_op_table4 = { 0x14, 0x12, 0x15, 0x11 };
+//---------------------------------------------------------
+static inline float fmin(int const a, int const b)
+{
+ return static_cast<float>(a < b ? a : b);
+}
+//---------------------------------------------------------
+int const CrolPlayer::kSizeofDataRecord = 30;
+int const CrolPlayer::kMaxTickBeat = 60;
 int const CrolPlayer::kSilenceNote = -12;
-int const CrolPlayer::kNumMelodicVoices = 9;
+int const CrolPlayer::kNumMelodicVoices = 9;
 int const CrolPlayer::kNumPercussiveVoices = 11;
-int const CrolPlayer::kBassDrumChannel = 6;
-int const CrolPlayer::kSnareDrumChannel = 7;
-int const CrolPlayer::kTomtomChannel = 8;
-int const CrolPlayer::kTomtomFreq = 2;//4;
-int const CrolPlayer::kSnareDrumFreq = 2;//kTomtomFreq + 7;
+int const CrolPlayer::kBassDrumChannel = 6;
+int const CrolPlayer::kSnareDrumChannel = 7;
+int const CrolPlayer::kTomtomChannel = 8;
+int const CrolPlayer::kTomTomNote = 24;
+int const CrolPlayer::kTomTomToSnare = 7; // 7 half-tones between voice 7 & 8
+int const CrolPlayer::kSnareNote = CrolPlayer::kTomTomNote + CrolPlayer::kTomTomToSnare;
 float const CrolPlayer::kDefaultUpdateTme = 18.2f;
-float const CrolPlayer::kPitchFactor = 400.0f;
-
-static const unsigned char drum_table4 = {0x14, 0x12, 0x15, 0x11};
-
-CrolPlayer::uint16 const CrolPlayer::kNoteTable12 = 
-{ 
- 340, // C
- 363, // C#
- 385, // D
- 408, // D#
- 432, // E
- 458, // F
- 485, // F#
- 514, // G
- 544, // G#
- 577, // A
- 611, // A#
- 647 // B
-};
 
 /*** public methods **************************************/
 
-CPlayer *CrolPlayer::factory(Copl *newopl)
+CPlayer * CrolPlayer::factory(Copl * pNewOpl)
 {
- return new CrolPlayer(newopl);
+ return new CrolPlayer(pNewOpl);
 }
 //---------------------------------------------------------
-CrolPlayer::CrolPlayer(Copl *newopl)
-: CPlayer ( newopl )
- ,rol_header ( NULL )
- ,mNextTempoEvent ( 0 )
- ,mCurrTick ( 0 )
- ,mTimeOfLastNote ( 0 )
- ,mRefresh ( kDefaultUpdateTme )
- ,bdRegister ( 0 )
- ,n_voice_data(0)
- ,n_tempo_events(0)
- ,n_used_ins(0)
-{
- int n;
-
- mTempoEvents = 0;
- voice_data = 0;
- ins_list = 0;
-
- memset(bxRegister, 0, sizeof(bxRegister) );
- memset(volumeCache, 0, sizeof(volumeCache) );
- memset(freqCache, 0, sizeof(freqCache) );
-
- for(n=0; n<11; n++)
- pitchCachen=1.0f; 
+CrolPlayer::CrolPlayer(Copl * const pNewOpl)
+ : CPlayer (pNewOpl)
+ , mpROLHeader (NULL)
+ , mpOldFNumFreqPtr (NULL)
+ , mTempoEvents ()
+ , mVoiceData ()
+ , mInstrumentList ()
+ , mFNumFreqPtrList (kNumPercussiveVoices, skFNumNotes0)
+ , mHalfToneOffset (kNumPercussiveVoices, 0)
+ , mVolumeCache (kNumPercussiveVoices, skMaxVolume)
+ , mKSLTLCache (kNumPercussiveVoices, 0)
+ , mNoteCache (kNumPercussiveVoices, 0)
+ , mKOnOctFNumCache (kNumMelodicVoices, 0)
+ , mKeyOnCache (kNumPercussiveVoices, false)
+ , mRefresh (kDefaultUpdateTme)
+ , mOldPitchBendLength(~0)
+ , mPitchRangeStep (skNrStepPitch)
+ , mNextTempoEvent (0)
+ , mCurrTick (0)
+ , mTimeOfLastNote (0)
+ , mOldHalfToneOffset (0)
+ , mAMVibRhythmCache (0)
+{
 }
 //---------------------------------------------------------
 CrolPlayer::~CrolPlayer()
 {
- if( rol_header != NULL )
+ if (mpROLHeader != NULL)
 {
- delete rol_header;
- rol_header=NULL;
+ delete mpROLHeader;
+ mpROLHeader = NULL;
 }
-
- delete mTempoEvents;
- delete voice_data;
- delete ins_list;
 }
 //---------------------------------------------------------
-bool CrolPlayer::load(const char *filename, const CFileProvider &fp)
+bool CrolPlayer::load(const std::string & filename, const CFileProvider & fp)
 {
- binistream *f = fp.open(filename); if(!f) return false;
+ binistream *f = fp.open(filename);
+
+ if (!f)
+ {
+ return false;
+ }
 
- char fnstrlen(filename)+12;
+ char *fn = new charfilename.length()+13;
 int i;
- const char * bnk_filename;
+ std::string bnk_filename;
 
- AdPlug_LogWrite("*** CrolPlayer::load(f, \"%s\") ***\n", filename);
- strcpy(fn,filename);
- int len = strlen(fn)-1;
- for (i=len; i>=0; i--) {
- if (fni == '/' || fni == '\\') {
+ AdPlug_LogWrite("*** CrolPlayer::load(f, \"%s\") ***\n", filename.c_str());
+ strcpy(fn,filename.data());
+ for (i = strlen(fn) - 1; i >= 0; i--)
+ {
+ if (fni == '/' || fni == '\\')
+ {
 break;
 }
 }
 strcpy(fn+i+1,"standard.bnk");
 bnk_filename = fn;
- AdPlug_LogWrite("bnk_filename = \"%s\"\n",bnk_filename);
+ delete fn;
+ AdPlug_LogWrite("bnk_filename = \"%s\"\n",bnk_filename.c_str());
 
- rol_header = new SRolHeader;
- memset( rol_header, 0, sizeof(SRolHeader) );
+ mpROLHeader = new SRolHeader;
+ memset(mpROLHeader, 0, sizeof(SRolHeader));
 
- rol_header->version_major = f->readInt( 2 );
- rol_header->version_minor = f->readInt( 2 );
+ mpROLHeader->version_major = static_cast<uint16_t>(f->readInt(2));
+ mpROLHeader->version_minor = static_cast<uint16_t>(f->readInt(2));
 
 // Version check
- if(rol_header->version_major != 0 || rol_header->version_minor != 4) {
- AdPlug_LogWrite("Unsupported file version %d.%d or not a ROL file!\n",
-	 rol_header->version_major, rol_header->version_minor);
- AdPlug_LogWrite("--- CrolPlayer::load ---\n");
- fp.close(f);
- return false;
+ if ((mpROLHeader->version_major != skVersionMinor) || (mpROLHeader->version_minor != skVersionMajor))
+ {
+ AdPlug_LogWrite("Unsupported file version %d.%d or not a ROL file!\n",
+ mpROLHeader->version_major, mpROLHeader->version_minor);
+ AdPlug_LogWrite("--- CrolPlayer::load ---\n");
+ fp.close(f);
+ return false;
 }
 
- f->seek( 40, binio::Add );
+ f->readString(mpROLHeader->comment, ROL_COMMENT_SIZE);
+ mpROLHeader->commentROL_COMMENT_SIZE - 1 = 0;
+ mpROLHeader->ticks_per_beat = static_cast<uint16_t>(f->readInt(2));
+ mpROLHeader->beats_per_measure = static_cast<uint16_t>(f->readInt(2));
+ mpROLHeader->edit_scale_y = static_cast<uint16_t>(f->readInt(2));
+ mpROLHeader->edit_scale_x = static_cast<uint16_t>(f->readInt(2));
 
- rol_header->ticks_per_beat = f->readInt( 2 );
- rol_header->beats_per_measure = f->readInt( 2 );
- rol_header->edit_scale_y = f->readInt( 2 );
- rol_header->edit_scale_x = f->readInt( 2 );
+ f->seek(ROL_UNUSED1_SIZE, binio::Add); // Seek past 'SRolHeader.(unused1)' field of the header.
 
- f->seek( 1, binio::Add );
+ mpROLHeader->mode = static_cast<uint8_t>(f->readInt(1));
 
- rol_header->mode = f->readInt(1);
+ f->seek(ROL_UNUSED2_SIZE + ROL_FILLER0_SIZE + ROL_FILLER1_SIZE, binio::Add); // Seek past 'SRolHeader.(unused2, filler0, filler1)' field of header
 
- f->seek( 90+38+15, binio::Add );
+ mpROLHeader->basic_tempo = static_cast<float>(f->readFloat(binio::Single));
 
- rol_header->basic_tempo = f->readFloat( binio::Single );
-
- load_tempo_events( f );
+ load_tempo_events(f);
 
 mTimeOfLastNote = 0;
 
- if( load_voice_data( f, bnk_filename, fp ) != true )
+ if (load_voice_data(f, bnk_filename, fp) != true)
 {
 AdPlug_LogWrite("CrolPlayer::load_voice_data(f) failed!\n");
 AdPlug_LogWrite("--- CrolPlayer::load ---\n");
 
- fp.close( f );
+ fp.close(f);
 return false;
 }
 
- fp.close( f );
+ fp.close(f);
 
- rewind( 0 );
+ rewind(0);
 AdPlug_LogWrite("--- CrolPlayer::load ---\n");
-
 return true;
 }
 //---------------------------------------------------------
 bool CrolPlayer::update()
 {
- if( mNextTempoEvent < n_tempo_events &&
- mTempoEventsmNextTempoEvent.time == mCurrTick )
+ if ((mNextTempoEvent < mTempoEvents.size()) &&
+ (mTempoEventsmNextTempoEvent.time == mCurrTick))
 {
- SetRefresh( mTempoEventsmNextTempoEvent.multiplier );
+ SetRefresh(mTempoEventsmNextTempoEvent.multiplier);
 ++mNextTempoEvent;
 }
 
+ TVoiceData::iterator curr = mVoiceData.begin();
+ TVoiceData::iterator end = mVoiceData.end();
+ int voice = 0;
 
- int curr = 0;
- int end = n_voice_data;
-
- while( curr < end )
+ while(curr != end)
 {
- UpdateVoice( curr, voice_datacurr );
+ UpdateVoice(voice, *curr);
 ++curr;
+ ++voice;
 }
 
 ++mCurrTick;
 
- if( mCurrTick > mTimeOfLastNote )
+ if (mCurrTick > mTimeOfLastNote)
 {
 return false;
 }
 
 return true;
- //return ( mCurrTick > mTimeOfLastNote ) ? false : true;
 }
 //---------------------------------------------------------
-void CrolPlayer::rewind( int subsong )
+void CrolPlayer::rewind(int subsong)
 {
- int curr = 0;
- while( curr < n_voice_data )
+ TVoiceData::iterator curr = mVoiceData.begin();
+ TVoiceData::iterator end = mVoiceData.end();
+
+ while(curr != end)
 {
- CVoiceData &voice = voice_datacurr;
+ CVoiceData & voice = *curr;
 
 voice.Reset();
 ++curr;
 }
 
- memset(bxRegister, 0, sizeof(bxRegister) );
- memset(volumeCache, 0, sizeof(volumeCache) );
+ mHalfToneOffset = TInt16Vector(kNumPercussiveVoices, 0);
+ mVolumeCache = TUInt8Vector(kNumPercussiveVoices, skMaxVolume);
+ mKSLTLCache = TUInt8Vector(kNumPercussiveVoices, 0);
+ mNoteCache = TUInt8Vector(kNumPercussiveVoices, 0);
+ mKOnOctFNumCache = TUInt8Vector(kNumMelodicVoices, 0);
+ mKeyOnCache = TBoolVector(kNumPercussiveVoices, false);
 
- bdRegister = 0;
+ mNextTempoEvent = 0;
+ mCurrTick = 0;
+ mAMVibRhythmCache = 0;
 
- opl->init(); // initialize to melodic by default
- opl->write(1,0x20); // Enable waveform select (bit 5)
+ opl->init(); // initialize to melodic by default
+ opl->write(skOPL2_WaveCtrlBaseAddress, skOPL2_EnableWaveformSelectMask); // Enable waveform select
 
- if( rol_header->mode == 0 )
+ if (mpROLHeader->mode == 0)
 {
- opl->write( 0xbd, 0x20 ); // select rhythm mode (bit 5)
- bdRegister = 0x20;
+ mAMVibRhythmCache = skOPL2_RhythmMask;
+ opl->write(skOPL2_AmVibRhythmBaseAddress, mAMVibRhythmCache); // Enable rhythm mode
 
- SetFreq( kTomtomChannel, 24 );
- SetFreq( kSnareDrumChannel, 31 );
+ SetFreq(kTomtomChannel, kTomTomNote);
+ SetFreq(kSnareDrumChannel, kSnareNote);
 }
 
- mNextTempoEvent = 0;
- mCurrTick = 0;
-
 SetRefresh(1.0f);
 }
 //---------------------------------------------------------
-inline float fmin( int const a, int const b )
-{
- return static_cast<float>( a ticks_per_beat);
+ float const tickBeat = static_cast<float>(fmin(kMaxTickBeat, mpROLHeader->ticks_per_beat));
 
- mRefresh = (tickBeat*rol_header->basic_tempo*multiplier) / 60.0f;
+ mRefresh = (tickBeat*mpROLHeader->basic_tempo*multiplier) / 60.0f;
 }
 //---------------------------------------------------------
 float CrolPlayer::getrefresh()
@@ -254,20 +341,28 @@
 return mRefresh;
 }
 //---------------------------------------------------------
-void CrolPlayer::UpdateVoice( int const voice, CVoiceData &voiceData )
+void CrolPlayer::UpdateVoice(int const voice, CVoiceData & voiceData)
 {
- if( !voiceData.n_note_events || (voiceData.mEventStatus & CVoiceData::kES_NoteEnd) )
+ TNoteEvents const & nEvents = voiceData.note_events;
+
+ if (nEvents.empty() || (voiceData.mEventStatus & CVoiceData::kES_NoteEnd))
 {
 return; // no note data to process, don't bother doing anything.
 }
 
- if( !(voiceData.mEventStatus & CVoiceData::kES_InstrEnd ) &&
- voiceData.instrument_eventsvoiceData.next_instrument_event.time == mCurrTick )
+ TInstrumentEvents const & iEvents = voiceData.instrument_events;
+ TVolumeEvents const & vEvents = voiceData.volume_events;
+ TPitchEvents const & pEvents = voiceData.pitch_events;
+
+ if ((voiceData.mEventStatus & CVoiceData::kES_InstrEnd) == 0)
 {
- if( voiceData.next_instrument_event < voiceData.n_instrument_events )
+ if (voiceData.next_instrument_event < iEvents.size())
 {
- send_ins_data_to_chip( voice, voiceData.instrument_eventsvoiceData.next_instrument_event.ins_index );
- ++voiceData.next_instrument_event;
+ if (iEventsvoiceData.next_instrument_event.time == mCurrTick)
+ {
+ send_ins_data_to_chip(voice, iEventsvoiceData.next_instrument_event.ins_index);
+ ++voiceData.next_instrument_event;
+ }
 }
 else
 {
@@ -275,18 +370,20 @@
 }
 }
 
- if( !(voiceData.mEventStatus & CVoiceData::kES_VolumeEnd ) &&
- voiceData.volume_eventsvoiceData.next_volume_event.time == mCurrTick )
+ if ((voiceData.mEventStatus & CVoiceData::kES_VolumeEnd) == 0)
 {
- SVolumeEvent const &volumeEvent = voiceData.volume_eventsvoiceData.next_volume_event;
-
- if( voiceData.next_volume_event < voiceData.n_volume_events )
+ if (voiceData.next_volume_event < vEvents.size())
 {
- int const volume = (int)(63.0f*(1.0f - volumeEvent.multiplier));
+ if (vEventsvoiceData.next_volume_event.time == mCurrTick)
+ {
+ SVolumeEvent const & volumeEvent = vEventsvoiceData.next_volume_event;
+
+ uint8_t const volume = (uint8_t)(skMaxVolume * volumeEvent.multiplier);
 
- SetVolume( voice, volume );
+ SetVolume(voice, volume);
 
- ++voiceData.next_volume_event; // move to next volume event
+ ++voiceData.next_volume_event; // move to next volume event
+ }
 }
 else
 {
@@ -294,37 +391,39 @@
 } 
 }
 
- if( voiceData.mForceNote || voiceData.current_note_duration > voiceData.mNoteDuration-1 )
+ if (voiceData.mForceNote || (voiceData.current_note_duration > voiceData.mNoteDuration-1))
 {
- if( mCurrTick != 0 )
+ if (mCurrTick != 0)
 {
 ++voiceData.current_note;
 }
 
- if( voiceData.current_note < voiceData.n_note_events )
+ if (voiceData.current_note < nEvents.size())
 {
- SNoteEvent const &noteEvent = voiceData.note_eventsvoiceData.current_note;
+ SNoteEvent const & noteEvent = nEventsvoiceData.current_note;
 
- SetNote( voice, noteEvent.number );
+ SetNote(voice, noteEvent.number);
 voiceData.current_note_duration = 0;
 voiceData.mNoteDuration = noteEvent.duration;
 voiceData.mForceNote = false;
 }
 else
 {
- SetNote( voice, kSilenceNote );
+ SetNote(voice, kSilenceNote);
 voiceData.mEventStatus |= CVoiceData::kES_NoteEnd;
 return;
 }
 }
 
- if( !(voiceData.mEventStatus & CVoiceData::kES_PitchEnd ) &&
- voiceData.pitch_eventsvoiceData.next_pitch_event.time == mCurrTick )
+ if ((voiceData.mEventStatus & CVoiceData::kES_PitchEnd) == 0)
 {
- if( voiceData.next_pitch_event < voiceData.n_pitch_events )
+ if ( voiceData.next_pitch_event < pEvents.size() )
 {
- SetPitch(voice,voiceData.pitch_eventsvoiceData.next_pitch_event.variation);
- ++voiceData.next_pitch_event;
+ if (pEventsvoiceData.next_pitch_event.time == mCurrTick)
+ {
+ SetPitch(voice, pEventsvoiceData.next_pitch_event.variation);
+ ++voiceData.next_pitch_event;
+ }
 }
 else
 {
@@ -335,168 +434,226 @@
 ++voiceData.current_note_duration;
 }
 //---------------------------------------------------------
-void CrolPlayer::SetNote( int const voice, int const note )
+void CrolPlayer::SetNote(int const voice, int const note)
 {
- if( voice < kBassDrumChannel || rol_header->mode )
+ if ((voice < kBassDrumChannel) || mpROLHeader->mode)
 {
- SetNoteMelodic( voice, note );
+ SetNoteMelodic(voice, note);
 }
 else
 {
- SetNotePercussive( voice, note );
+ SetNotePercussive(voice, note);
 }
 }
 //---------------------------------------------------------
-void CrolPlayer::SetNotePercussive( int const voice, int const note )
+void CrolPlayer::SetNotePercussive(int const voice, int const note)
 {
- int const bit_pos = 4-voice+kBassDrumChannel;
+ int const channel_bit_mask = 1 << (4-voice+kBassDrumChannel);
 
- bdRegister &= ~( 1<<bit_pos );
- opl->write( 0xbd, bdRegister );
+ mAMVibRhythmCache &= ~channel_bit_mask;
+ opl->write(skOPL2_AmVibRhythmBaseAddress, mAMVibRhythmCache);
+ mKeyOnCachevoice = false;
 
- if( note != kSilenceNote )
+ if (note != kSilenceNote)
 {
- switch( voice )
+ switch(voice)
 {
 case kTomtomChannel:
- SetFreq( kSnareDrumChannel, note+7 );
+ SetFreq(kTomtomChannel, note);
+ SetFreq(kSnareDrumChannel, note + kTomTomToSnare);
+ break;
+
 case kBassDrumChannel:
- SetFreq( voice, note );
+ SetFreq(voice, note);
+ break;
+ default:
+ // Does nothing
 break;
 }
 
- bdRegister |= 1<<bit_pos;
- opl->write( 0xbd, bdRegister );
+ mKeyOnCachevoice = true;
+ mAMVibRhythmCache |= channel_bit_mask;
+ opl->write(skOPL2_AmVibRhythmBaseAddress, mAMVibRhythmCache);
 }
 }
 //---------------------------------------------------------
-void CrolPlayer::SetNoteMelodic( int const voice, int const note )
+void CrolPlayer::SetNoteMelodic(int const voice, int const note)
 {
- opl->write( 0xb0+voice, bxRegistervoice & ~0x20 );
+ opl->write(skOPL2_KeyOnFreqHiBaseAddress + voice, mKOnOctFNumCachevoice & ~skOPL2_KeyOnMask);
+ mKeyOnCachevoice = false;
 
- if( note != kSilenceNote )
+ if (note != kSilenceNote)
 {
- SetFreq( voice, note, true );
+ SetFreq(voice, note, true);
 }
 }
 //---------------------------------------------------------
-void CrolPlayer::SetPitch(int const voice, real32 const variation)
+// From Adlib Music SDK's ADLIB.C ...
+void CrolPlayer::ChangePitch(int voice, uint16_t const pitchBend)
 {
- pitchCachevoice = variation;
- freqCachevoice += (uint16)((((float)freqCachevoice)*(variation-1.0f)) / kPitchFactor);
+ int32_t const pitchBendLength = (int32_t)(pitchBend - skMidPitch) * mPitchRangeStep;
 
- opl->write(0xa0+voice,freqCachevoice & 0xff);
+ if (mOldPitchBendLength == pitchBendLength)
+ {
+ // optimisation ...
+ mFNumFreqPtrListvoice = mpOldFNumFreqPtr;
+ mHalfToneOffsetvoice = mOldHalfToneOffset;
+ }
+ else
+ {
+ int16_t const pitchStepDir = pitchBendLength / skMidPitch;
+ int16_t delta;
+ if (pitchStepDir < 0)
+ {
+ int16_t const pitchStepDown = skNrStepPitch - 1 - pitchStepDir;
+ mOldHalfToneOffset = mHalfToneOffsetvoice = -(pitchStepDown / skNrStepPitch);
+ delta = (pitchStepDown - skNrStepPitch + 1) % skNrStepPitch;
+ if (delta)
+ {
+ delta = skNrStepPitch - delta;
+ }
+ }
+ else
+ {
+ mOldHalfToneOffset = mHalfToneOffsetvoice = pitchStepDir / skNrStepPitch;
+ delta = pitchStepDir % skNrStepPitch;
+ }
+ mpOldFNumFreqPtr = mFNumFreqPtrListvoice = skFNumNotesdelta;
+ mOldPitchBendLength = pitchBendLength;
+ }
 }
 //---------------------------------------------------------
-void CrolPlayer::SetFreq( int const voice, int const note, bool const keyOn )
+void CrolPlayer::SetPitch(int const voice, float const variation)
 {
- uint16 freq = kNoteTablenote%12 + ((note/12) << 10);
- freq += (uint16)((((float)freq)*(pitchCachevoice-1.0f))/kPitchFactor);
+ if ((voice < kBassDrumChannel) || mpROLHeader->mode)
+ {
+ uint16_t const pitchBend = (variation == 1.0f) ? skMidPitch : static_cast<uint16_t>((0x3fff >> 1) * variation);
 
- freqCachevoice = freq;
- bxRegistervoice = ((freq >> 8) & 0x1f);
+ ChangePitch(voice, pitchBend);
+ SetFreq(voice, mNoteCachevoice, mKeyOnCachevoice);
+ }
+}
+//---------------------------------------------------------
+void CrolPlayer::SetFreq(int const voice, int const note, bool const keyOn)
+{
+ int const biased_note = std::max(0, std::min((skMaxNotes-1), note + mHalfToneOffsetvoice));
+
+ uint16_t const frequency = *(mFNumFreqPtrListvoice + skNoteIndexbiased_note);
+
+ mNoteCachevoice = note;
+ mKeyOnCachevoice = keyOn;
+
+ mKOnOctFNumCachevoice = (skNoteOctavebiased_note << skOPL2_BlockNumberShift) | ((frequency >> skOPL2_FNumMSBShift) & skOPL2_FNumMSBMask);
+
+ opl->write(skOPL2_FreqLoBaseAddress + voice, frequency & skOPL2_FNumLSBMask);
+ opl->write(skOPL2_KeyOnFreqHiBaseAddress + voice, mKOnOctFNumCachevoice | (keyOn ? skOPL2_KeyOnMask : 0x0));
+}
+//---------------------------------------------------------
+uint8_t CrolPlayer::GetKSLTL(int const voice) const
+{
+ uint16_t kslTL = skOPL2_TLMinLevel - (mKSLTLCachevoice & skOPL2_TLMask); // amplitude
 
- opl->write( 0xa0+voice, freq & 0xff );
- opl->write( 0xb0+voice, bxRegistervoice | (keyOn ? 0x20 : 0x0) );
+ kslTL = mVolumeCachevoice * kslTL;
+ kslTL += kslTL + skMaxVolume;	// round off to 0.5
+ kslTL = skOPL2_TLMinLevel - (kslTL / (2 * skMaxVolume));
+
+ kslTL |= mKSLTLCachevoice & skOPL2_KSLMask;
+
+ return static_cast<uint8_t>(kslTL);
 }
 //---------------------------------------------------------
-void CrolPlayer::SetVolume( int const voice, int const volume )
+void CrolPlayer::SetVolume(int const voice, uint8_t const volume)
 {
- volumeCachevoice = (volumeCachevoice &0xc0) | volume;
+ uint8_t const op_offset = (voice < kSnareDrumChannel || mpROLHeader->mode) ? op_tablevoice + skCarrierOpOffset : drum_op_tablevoice - kSnareDrumChannel;
 
- int const op_offset = ( voice < kSnareDrumChannel || rol_header->mode ) ? 
- op_tablevoice+3 : drum_tablevoice-kSnareDrumChannel;
+ mVolumeCachevoice = volume;
 
- opl->write( 0x40+op_offset, volumeCachevoice );
+ opl->write(skOPL2_KSLTLBaseAddress + op_offset, GetKSLTL(voice));
 }
 //---------------------------------------------------------
-void CrolPlayer::send_ins_data_to_chip( int const voice, int const ins_index )
+void CrolPlayer::send_ins_data_to_chip(int const voice, int const ins_index)
 {
- SRolInstrument &instrument = ins_listins_index.instrument;
+ SRolInstrument const & instrument = mInstrumentListins_index.instrument;
 
- send_operator( voice, instrument.modulator, instrument.carrier );
+ send_operator(voice, instrument.modulator, instrument.carrier);
 }
 //---------------------------------------------------------
-void CrolPlayer::send_operator( int const voice, SOPL2Op const &modulator, SOPL2Op const &carrier )
+void CrolPlayer::send_operator(int const voice, SOPL2Op const & modulator, SOPL2Op const & carrier)
 {
- if( voice < kSnareDrumChannel || rol_header->mode )
+ if ((voice < kSnareDrumChannel) || mpROLHeader->mode)
 {
- int const op_offset = op_tablevoice;
+ uint8_t const op_offset = op_tablevoice;
 
- opl->write( 0x20+op_offset, modulator.ammulti );
- opl->write( 0x40+op_offset, modulator.ksltl );
- opl->write( 0x60+op_offset, modulator.ardr );
- opl->write( 0x80+op_offset, modulator.slrr );
- opl->write( 0xc0+voice , modulator.fbc );
- opl->write( 0xe0+op_offset, modulator.waveform );
+ opl->write(skOPL2_AaMultiBaseAddress + op_offset, modulator.ammulti);
+ opl->write(skOPL2_KSLTLBaseAddress + op_offset, modulator.ksltl);
+ opl->write(skOPL2_ArDrBaseAddress + op_offset, modulator.ardr);
+ opl->write(skOPL2_SlrrBaseAddress + op_offset, modulator.slrr);
+ opl->write(skOPL2_FeedConBaseAddress + voice , modulator.fbc);
+ opl->write(skOPL2_WaveformBaseAddress + op_offset, modulator.waveform);
 
- volumeCachevoice = (carrier.ksltl & 0xc0) | volumeCachevoice & 0x3f;
+ mKSLTLCachevoice = carrier.ksltl;
 
- opl->write( 0x23+op_offset, carrier.ammulti );
- opl->write( 0x43+op_offset, volumeCachevoice );
- opl->write( 0x63+op_offset, carrier.ardr );
- opl->write( 0x83+op_offset, carrier.slrr );
-// opl->write( 0xc3+voice , carrier.fbc ); <- don't bother writing this.
- opl->write( 0xe3+op_offset, carrier.waveform );
+ opl->write(skOPL2_AaMultiBaseAddress + op_offset + skCarrierOpOffset, carrier.ammulti);
+ opl->write(skOPL2_KSLTLBaseAddress + op_offset + skCarrierOpOffset, GetKSLTL(voice));
+ opl->write(skOPL2_ArDrBaseAddress + op_offset + skCarrierOpOffset, carrier.ardr);
+ opl->write(skOPL2_SlrrBaseAddress + op_offset + skCarrierOpOffset, carrier.slrr);
+ opl->write(skOPL2_WaveformBaseAddress + op_offset + skCarrierOpOffset, carrier.waveform);
 }
 else
 {
- int const op_offset = drum_tablevoice-kSnareDrumChannel;
+ uint8_t const op_offset = drum_op_tablevoice-kSnareDrumChannel;
 
- volumeCachevoice = (modulator.ksltl & 0xc0) | volumeCachevoice & 0x3f;
+ mKSLTLCachevoice = modulator.ksltl;
 
- opl->write( 0x20+op_offset, modulator.ammulti );
- opl->write( 0x40+op_offset, volumeCachevoice );
- opl->write( 0x60+op_offset, modulator.ardr );
- opl->write( 0x80+op_offset, modulator.slrr );
- opl->write( 0xc0+voice , modulator.fbc );
- opl->write( 0xe0+op_offset, modulator.waveform );
+ opl->write(skOPL2_AaMultiBaseAddress + op_offset, modulator.ammulti);
+ opl->write(skOPL2_KSLTLBaseAddress + op_offset, GetKSLTL(voice));
+ opl->write(skOPL2_ArDrBaseAddress + op_offset, modulator.ardr);
+ opl->write(skOPL2_SlrrBaseAddress + op_offset, modulator.slrr);
+ opl->write(skOPL2_WaveformBaseAddress + op_offset, modulator.waveform);
 }
 }
 //---------------------------------------------------------
-void CrolPlayer::load_tempo_events( binistream *f )
+void CrolPlayer::load_tempo_events(binistream *f)
 {
- int16 const num_tempo_events = f->readInt( 2 );
+ int16_t const num_tempo_events = static_cast<uint16_t>(f->readInt(2));
 
- mTempoEvents = new STempoEventnum_tempo_events;
- memset (mTempoEvents, 0, sizeof (STempoEvent) * num_tempo_events);
+ mTempoEvents.reserve(num_tempo_events);
 
- for(int i=0; i<num_tempo_events; ++i)
+ for (int i=0; i<num_tempo_events; ++i)
 {
 STempoEvent event;
 
- event.time = f->readInt( 2 );
- event.multiplier = f->readFloat( binio::Single );
- mTempoEventsn_tempo_events++ = event;
+ event.time = static_cast<int16_t>(f->readInt(2));
+ event.multiplier = static_cast<float>(f->readFloat(binio::Single));
+ mTempoEvents.push_back(event);
 }
 }
 //---------------------------------------------------------
-bool CrolPlayer::load_voice_data( binistream *f, const char *bnk_filename, const CFileProvider &fp )
+bool CrolPlayer::load_voice_data(binistream *f, std::string const &bnk_filename, const CFileProvider &fp)
 {
 SBnkHeader bnk_header;
- memset (&bnk_header, 0, sizeof (bnk_header));
- binistream *bnk_file = fp.open( bnk_filename);
+ binistream *bnk_file = fp.open(bnk_filename.c_str());
 
- if( bnk_file )
+ if (bnk_file)
 {
- load_bnk_info( bnk_file, bnk_header );
+ load_bnk_info(bnk_file, bnk_header);
 
- int const numVoices = rol_header->mode ? kNumMelodicVoices : kNumPercussiveVoices;
- voice_data = new CVoiceDatanumVoices;
+ int const numVoices = mpROLHeader->mode ? kNumMelodicVoices : kNumPercussiveVoices;
 
- for(int i=0; i<numVoices; ++i)
+ mVoiceData.reserve(numVoices);
+ for (int i=0; i<numVoices; ++i)
 {
- CVoiceData &voice = voice_datan_voice_data++;
+ CVoiceData voice;
 
- load_note_events( f, voice );
- load_instrument_events( f, voice, bnk_file, bnk_header );
- load_volume_events( f, voice );
- load_pitch_events( f, voice );
+ load_note_events(f, voice);
+ load_instrument_events(f, voice, bnk_file, bnk_header);
+ load_volume_events(f, voice);
+ load_pitch_events(f, voice);
 
+ mVoiceData.push_back(voice);
 }
 
 fp.close(bnk_file);
- delete bnk_header.ins_name_list;
 
 return true;
 }
@@ -504,207 +661,223 @@
 return false;
 }
 //---------------------------------------------------------
-void CrolPlayer::load_note_events( binistream *f, CVoiceData &voice )
+void CrolPlayer::load_note_events(binistream *f, CVoiceData & voice)
 {
- f->seek( 15, binio::Add );
+ f->seek(ROL_FILLER_SIZE, binio::Add);
 
- int16 const time_of_last_note = f->readInt( 2 );
+ int16_t const time_of_last_note = static_cast<int16_t>(f->readInt(2));
 
- if( time_of_last_note != 0 )
+ if (time_of_last_note != 0)
 {
- int16 total_duration = 0;
+ TNoteEvents & note_events = voice.note_events;
+ int16_t total_duration = 0;
 
 do
 {
- SNoteEvent &event = voice.note_eventsvoice.n_note_events++;
+ SNoteEvent event;
 
- event.number = f->readInt( 2 );
- event.duration = f->readInt( 2 );
+ event.number = static_cast<int16_t>(f->readInt(2));
+ event.duration = static_cast<int16_t>(f->readInt(2));
 
 event.number += kSilenceNote; // adding -12
 
+ note_events.push_back(event);
+
 total_duration += event.duration;
- } while( total_duration < time_of_last_note );
+ } while (total_duration < time_of_last_note);
 
- if( time_of_last_note > mTimeOfLastNote )
+ if (time_of_last_note > mTimeOfLastNote)
 {
 mTimeOfLastNote = time_of_last_note;
 }
 }
 
- f->seek( 15, binio::Add );
+ f->seek(ROL_FILLER_SIZE, binio::Add);
 }
 //---------------------------------------------------------
-void CrolPlayer::load_instrument_events( binistream *f, CVoiceData &voice,
- binistream *bnk_file, SBnkHeader const &bnk_header )
+void CrolPlayer::load_instrument_events(binistream *f, CVoiceData & voice,
+ binistream *bnk_file, SBnkHeader const & bnk_header)
 {
- int16 const number_of_instrument_events = f->readInt( 2 );
- voice.instrument_events = new SInstrumentEventnumber_of_instrument_events;
- memset (voice.instrument_events, 0, sizeof (SInstrumentEvent) * number_of_instrument_events);
+ int16_t const number_of_instrument_events = static_cast<int16_t>(f->readInt(2));
 
- for(int i=0; i<number_of_instrument_events; ++i)
+ TInstrumentEvents & instrument_events = voice.instrument_events;
+
+ instrument_events.reserve(number_of_instrument_events);
+
+ for (int16_t i = 0; i < number_of_instrument_events; ++i)
 {
- SInstrumentEvent &event = voice.instrument_eventsvoice.n_instrument_events++;
- event.time = f->readInt( 2 );
- f->readString( event.name, 9 );
+ SInstrumentEvent event;
+ event.time = static_cast<int16_t>(f->readInt(2));
+ f->readString(event.name, ROL_MAX_NAME_SIZE);
 
-	 const char * event_name = event.name;
- event.ins_index = load_rol_instrument( bnk_file, bnk_header, event_name );
+ std::string event_name = event.name;
+ if (std::find(usedInstruments.begin(), usedInstruments.end(), event_name) == usedInstruments.end())
+ usedInstruments.push_back(event_name);
+ event.ins_index = load_rol_instrument(bnk_file, bnk_header, event_name);
 
- f->seek( 1+2, binio::Add );
+ instrument_events.push_back(event);
+
+ f->seek(ROL_INSTRUMENT_EVENT_FILLER_SIZE, binio::Add);
 }
 
- f->seek( 15, binio::Add );
+ f->seek(ROL_FILLER_SIZE, binio::Add);
 }
 //---------------------------------------------------------
-void CrolPlayer::load_volume_events( binistream *f, CVoiceData &voice )
+void CrolPlayer::load_volume_events(binistream *f, CVoiceData & voice)
 {
- int16 const number_of_volume_events = f->readInt( 2 );
- voice.volume_events = new SVolumeEventnumber_of_volume_events;
- memset (voice.volume_events, 0, sizeof (SVolumeEvent) * number_of_volume_events);
+ int16_t const number_of_volume_events = static_cast<int16_t>(f->readInt(2));
+
+ TVolumeEvents & volume_events = voice.volume_events;
 
- for(int i=0; i<number_of_volume_events; ++i)
+ volume_events.reserve(number_of_volume_events);
+
+ for (int i=0; i<number_of_volume_events; ++i)
 {
- SVolumeEvent &event = voice.volume_eventsvoice.n_volume_events++;
- event.time = f->readInt( 2 );
- event.multiplier = f->readFloat( binio::Single );
+ SVolumeEvent event;
+ event.time = static_cast<int16_t>(f->readInt(2));
+ event.multiplier = static_cast<float>(f->readFloat(binio::Single));
+
+ volume_events.push_back(event);
 }
 
- f->seek( 15, binio::Add );
+ f->seek(ROL_FILLER_SIZE, binio::Add);
 }
 //---------------------------------------------------------
-void CrolPlayer::load_pitch_events( binistream *f, CVoiceData &voice )
+void CrolPlayer::load_pitch_events(binistream *f, CVoiceData & voice)
 {
- int16 const number_of_pitch_events = f->readInt( 2 );
- voice.pitch_events = new SPitchEventnumber_of_pitch_events;
- memset (voice.pitch_events, 0, sizeof (SPitchEvent) * number_of_pitch_events);
+ int16_t const number_of_pitch_events = static_cast<int16_t>(f->readInt(2));
+
+ TPitchEvents & pitch_events = voice.pitch_events;
 
- for(int i=0; i<number_of_pitch_events; ++i)
+ pitch_events.reserve(number_of_pitch_events);
+
+ for (int i=0; i<number_of_pitch_events; ++i)
 {
- SPitchEvent &event = voice.pitch_eventsvoice.n_pitch_events++;
- event.time = f->readInt( 2 );
- event.variation = f->readFloat( binio::Single );
+ SPitchEvent event;
+ event.time = static_cast<int16_t>(f->readInt(2));
+ event.variation = static_cast<float>(f->readFloat(binio::Single));
+
+ pitch_events.push_back(event);
 }
 }
 //---------------------------------------------------------
-bool CrolPlayer::load_bnk_info( binistream *f, SBnkHeader &header )
+bool CrolPlayer::load_bnk_info(binistream *f, SBnkHeader & header)
 {
- header.version_major = f->readInt(1);
- header.version_minor = f->readInt(1);
- f->readString( header.signature, 6 );
+ header.version_major = static_cast<uint8_t>(f->readInt(1));
+ header.version_minor = static_cast<uint8_t>(f->readInt(1));
+ f->readString(header.signature, ROL_BNK_SIGNATURE_SIZE);
 
- header.number_of_list_entries_used = f->readInt( 2 );
- header.total_number_of_list_entries = f->readInt( 2 );
+ header.number_of_list_entries_used = static_cast<uint16_t>(f->readInt(2));
+ header.total_number_of_list_entries = static_cast<uint16_t>(f->readInt(2));
 
- header.abs_offset_of_name_list = f->readInt( 4 );
- header.abs_offset_of_data = f->readInt( 4 );
+ header.abs_offset_of_name_list = static_cast<int32>(f->readInt(4));
+ header.abs_offset_of_data = static_cast<int32>(f->readInt(4));
 
- f->seek( header.abs_offset_of_name_list, binio::Set );
+ f->seek(header.abs_offset_of_name_list, binio::Set);
 
- header.ins_name_list = new SInstrumentNameheader.number_of_list_entries_used;
- memset (header.ins_name_list, 0, sizeof (SInstrumentName) * header.number_of_list_entries_used);
+ TInstrumentNames & ins_name_list = header.ins_name_list;
+ ins_name_list.reserve(header.number_of_list_entries_used);
 
- for(int i=0; i<header.number_of_list_entries_used; ++i)
+ for (uint16_t i=0; i<header.number_of_list_entries_used; ++i)
 {
- SInstrumentName &instrument = header.ins_name_listheader.n_ins_names++;
+ SInstrumentName instrument;
 
- instrument.index = f->readInt( 2 );
- instrument.record_used = f->readInt(1);
- f->readString( instrument.name, 9 );
- }
+ instrument.index = static_cast<uint16_t>(f->readInt(2));
+ instrument.record_used = static_cast<uint8_t>(f->readInt(1));
+ f->readString(instrument.name, ROL_MAX_NAME_SIZE);
 
- // preallocate space for instruments
- ins_list = new SUsedListheader.number_of_list_entries_used * 2;
- memset (ins_list, 0, sizeof (SUsedList) * header.number_of_list_entries_used * 2);
+ ins_name_list.push_back( instrument );
+ }
 
- return true;
+ return true;
 }
 //---------------------------------------------------------
-int CrolPlayer::load_rol_instrument( binistream *f, SBnkHeader const &header, const char * name )
+int CrolPlayer::load_rol_instrument(binistream *f, SBnkHeader const & header, std::string const & name)
 {
- int const ins_index = get_ins_index( name );
+ TInstrumentNames const & ins_name_list = header.ins_name_list;
+
+ int const ins_index = get_ins_index(name);
 
- if( ins_index != -1 )
+ if (ins_index != -1)
 {
 return ins_index;
 }
 
- if (n_used_ins >= header.n_ins_names * 2) {
- AdPlug_LogWrite("*** CrolPlayer::load_rol_instrument out of memory***\n");
- return -1;
- }
+ SInstrument usedInstrument;
+ usedInstrument.name = name;
 
- // find instrument struct by name to get file pos
- int ipos;
- for (ipos = 0; ipos < header.n_ins_names; ipos++) {
- if (!stricmp (name, header.ins_name_listipos.name)) {
- break;
- }
- }
- if (ipos < header.n_ins_names && ipos >= 0) {
- int const seekOffs = header.abs_offset_of_data + (header.ins_name_listipos.index*kSizeofDataRecord);
- f->seek( seekOffs, binio::Set );
- }
+ typedef TInstrumentNames::const_iterator TInsIter;
+ typedef std::pair<TInsIter, TInsIter> TInsIterPair;
+
+ TInsIterPair const range = std::equal_range(ins_name_list.begin(), 
+ ins_name_list.end(), 
+ name, 
+ StringCompare());
 
- SUsedList &usedIns = ins_listn_used_ins++;
- usedIns.name = name; // no strdup, pointing to SInstrumentEvent name
+ if (range.first != range.second)
+ {
+ int const seekOffs = header.abs_offset_of_data + (range.first->index * kSizeofDataRecord);
+ f->seek(seekOffs, binio::Set);
 
- if (ipos < header.n_ins_names && ipos >= 0) {
- read_rol_instrument( f, usedIns.instrument );
+ read_rol_instrument(f, usedInstrument.instrument);
 }
- else {
+ else
+ {
 // set up default instrument data here
- memset( &usedIns.instrument, 0, sizeof(SRolInstrument) );
+ memset(&usedInstrument.instrument, 0, sizeof(SRolInstrument));
 }
- return n_used_ins-1;
+
+ mInstrumentList.push_back( usedInstrument );
+
+ return mInstrumentList.size()-1;
 }
 //---------------------------------------------------------
-int CrolPlayer::get_ins_index( const char * const &name ) const
+int CrolPlayer::get_ins_index(std::string const & name) const
 {
- for(unsigned int i=0; i<n_used_ins; ++i)
+ for (size_t index = 0; index<mInstrumentList.size(); ++index)
 {
- if( stricmp(ins_listi.name, name) == 0 )
+ if (stricmp(mInstrumentListindex.name.c_str(), name.c_str()) == 0)
 {
- return i;
+ return index;
 }
 }
 
 return -1;
 }
 //---------------------------------------------------------
-void CrolPlayer::read_rol_instrument( binistream *f, SRolInstrument &ins )
+void CrolPlayer::read_rol_instrument(binistream * f, SRolInstrument & instrument)
 {
- ins.mode = f->readInt(1);
- ins.voice_number = f->readInt(1);
+ instrument.mode = static_cast<uint8_t>(f->readInt(1));
+ instrument.voice_number = static_cast<uint8_t>(f->readInt(1));
 
- read_fm_operator( f, ins.modulator );
- read_fm_operator( f, ins.carrier );
+ read_fm_operator(f, instrument.modulator);
+ read_fm_operator(f, instrument.carrier);
 
- ins.modulator.waveform = f->readInt(1);
- ins.carrier.waveform = f->readInt(1);
+ instrument.modulator.waveform = static_cast<uint8_t>(f->readInt(1));
+ instrument.carrier.waveform = static_cast<uint8_t>(f->readInt(1));
 }
 //---------------------------------------------------------
-void CrolPlayer::read_fm_operator( binistream *f, SOPL2Op &opl2_op )
-{
- SFMOperator fm_op;
-
- fm_op.key_scale_level = f->readInt(1);
- fm_op.freq_multiplier = f->readInt(1);
- fm_op.feed_back = f->readInt(1);
- fm_op.attack_rate = f->readInt(1);
- fm_op.sustain_level = f->readInt(1);
- fm_op.sustaining_sound = f->readInt(1);
- fm_op.decay_rate = f->readInt(1);
- fm_op.release_rate = f->readInt(1);
- fm_op.output_level = f->readInt(1);
- fm_op.amplitude_vibrato = f->readInt(1);
- fm_op.frequency_vibrato = f->readInt(1);
- fm_op.envelope_scaling = f->readInt(1);
- fm_op.fm_type = f->readInt(1);
-
- opl2_op.ammulti = fm_op.amplitude_vibrato << 7 | fm_op.frequency_vibrato << 6 | fm_op.sustaining_sound << 5 | fm_op.envelope_scaling << 4 | fm_op.freq_multiplier;
- opl2_op.ksltl = fm_op.key_scale_level << 6 | fm_op.output_level;
- opl2_op.ardr = fm_op.attack_rate << 4 | fm_op.decay_rate;
- opl2_op.slrr = fm_op.sustain_level << 4 | fm_op.release_rate;
- opl2_op.fbc = fm_op.feed_back << 1 | (fm_op.fm_type ^ 1);
+void CrolPlayer::read_fm_operator(binistream *f, SOPL2Op &opl2_op)
+{
+ SFMOperator fm_op;
+
+ fm_op.key_scale_level = static_cast<uint8_t>(f->readInt(1));
+ fm_op.freq_multiplier = static_cast<uint8_t>(f->readInt(1));
+ fm_op.feed_back = static_cast<uint8_t>(f->readInt(1));
+ fm_op.attack_rate = static_cast<uint8_t>(f->readInt(1));
+ fm_op.sustain_level = static_cast<uint8_t>(f->readInt(1));
+ fm_op.sustaining_sound = static_cast<uint8_t>(f->readInt(1));
+ fm_op.decay_rate = static_cast<uint8_t>(f->readInt(1));
+ fm_op.release_rate = static_cast<uint8_t>(f->readInt(1));
+ fm_op.output_level = static_cast<uint8_t>(f->readInt(1));
+ fm_op.amplitude_vibrato = static_cast<uint8_t>(f->readInt(1));
+ fm_op.frequency_vibrato = static_cast<uint8_t>(f->readInt(1));
+ fm_op.envelope_scaling = static_cast<uint8_t>(f->readInt(1));
+ fm_op.fm_type = static_cast<uint8_t>(f->readInt(1));
+
+ opl2_op.ammulti = fm_op.amplitude_vibrato << 7 | fm_op.frequency_vibrato << 6 | fm_op.sustaining_sound << 5 | fm_op.envelope_scaling << 4 | fm_op.freq_multiplier;
+ opl2_op.ksltl = fm_op.key_scale_level << 6 | fm_op.output_level;
+ opl2_op.ardr = fm_op.attack_rate << 4 | fm_op.decay_rate;
+ opl2_op.slrr = fm_op.sustain_level << 4 | fm_op.release_rate;
+ opl2_op.fbc = fm_op.feed_back << 1 | (fm_op.fm_type ^ 1);
 }

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/rol.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/rol.h Changed

@@ -14,285 +14,340 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * rol.h - ROL Player by OPLx <oplx@yahoo.com>
 *
- * Visit: http://tenacity.hispeed.com/aomit/oplx/
+ * Source references ADLIB.C from Adlib MSC SDK.
 */
 #ifndef H_ROLPLAYER
 #define H_ROLPLAYER
 
+#include <vector>
+#include <string>
+
 #include "player.h"
 
+// These are here since Visual C 6 doesn't support statics declared and defined in class.
+#define ROL_COMMENT_SIZE 40U
+#define ROL_UNUSED1_SIZE 1U
+#define ROL_UNUSED2_SIZE 90U
+#define ROL_FILLER0_SIZE 38U
+#define ROL_FILLER1_SIZE 15U
+#define ROL_FILLER_SIZE 15U
+#define ROL_MAX_NAME_SIZE 9U
+#define ROL_INSTRUMENT_EVENT_FILLER_SIZE 3U // 1 for filler, 2 for unused
+#define ROL_BNK_SIGNATURE_SIZE 6U
+
 class CrolPlayer: public CPlayer
 {
 public:
- static CPlayer *factory(Copl *newopl);
+ static CPlayer *factory(Copl * pNewOpl);
 
- CrolPlayer(Copl *newopl);
+ explicit CrolPlayer(Copl * const pNewOpl);
 
- ~CrolPlayer();
+ virtual ~CrolPlayer();
 
- bool load (const char *filename, const CFileProvider &fp);
- bool update ();
- void rewind (int subsong);	// rewinds to specified subsong
- float getrefresh();			// returns needed timer refresh rate
+ virtual bool load (const std::string &filename, const CFileProvider &fp);
+ virtual bool update ();
+ virtual void rewind (int subsong);	// rewinds to specified subsong
+ virtual float getrefresh();			// returns needed timer refresh rate
 
- const char * gettype() { return "Adlib Visual Composer"; }
+ virtual std::string gettype() { return std::string("AdLib Visual Composer"); }
+ virtual unsigned int getinstruments()
+ {
+ return usedInstruments.size();
+ };
+ virtual std::string getinstrument(unsigned int n)
+ {
+ return usedInstrumentsn;
+ };
+ virtual std::string getdesc()
+ {
+ return std::string(mpROLHeader->comment);
+ };
 
 private:
- typedef unsigned short uint16;
- typedef signed short int16;
+
+#if !defined(UINT8_MAX)
+ typedef signed char int8_t;
+ typedef short int16_t;
+ typedef int int32_t;
+ typedef unsigned char uint8_t;
+ typedef unsigned short uint16_t;
+ typedef unsigned int uint32_t;
+#endif
+
 #ifdef __x86_64__
 typedef signed int int32;
 #else
 typedef signed long int int32;
 #endif
- typedef float real32;
 
 typedef struct
 {
- uint16 version_major;
- uint16 version_minor;
- char unused040;
- uint16 ticks_per_beat;
- uint16 beats_per_measure;
- uint16 edit_scale_y;
- uint16 edit_scale_x;
- char unused1;
- char mode;
- char unused290;
- char filler038;
- char filler115;
- real32 basic_tempo;
+ uint16_t version_major;
+ uint16_t version_minor;
+ char commentROL_COMMENT_SIZE;
+ uint16_t ticks_per_beat;
+ uint16_t beats_per_measure;
+ uint16_t edit_scale_y;
+ uint16_t edit_scale_x;
+ char unused1;
+ char mode;
+ char unused2ROL_UNUSED2_SIZE;
+ char filler0ROL_FILLER0_SIZE;
+ char filler1ROL_FILLER1_SIZE;
+ float basic_tempo;
 } SRolHeader;
 
 typedef struct
 {
- int16 time;
- real32 multiplier;
+ int16_t time;
+ float multiplier;
 } STempoEvent;
 
 typedef struct
 {
- int16 number;
- int16 duration;
+ int16_t number;
+ int16_t duration;
 } SNoteEvent;
 
 typedef struct
 {
- int16 time;
- char name9;
- int16 ins_index;
+ int16_t time;
+ char nameROL_MAX_NAME_SIZE;
+ int16_t ins_index;
 } SInstrumentEvent;
 
 typedef struct
 {
- int16 time;
- real32 multiplier;
+ int16_t time;
+ float multiplier;
 } SVolumeEvent;
 
 typedef struct
 {
- int16 time;
- real32 variation;
+ int16_t time;
+ float variation;
 } SPitchEvent;
 
- enum {
- MAX_NOTE_EVENTS = 2000,
- };
+ typedef std::vector<SNoteEvent> TNoteEvents;
+ typedef std::vector<SInstrumentEvent> TInstrumentEvents;
+ typedef std::vector<SVolumeEvent> TVolumeEvents;
+ typedef std::vector<SPitchEvent> TPitchEvents;
 
-#define bit_pos( pos ) (1<<pos)
+#define BIT_POS(pos) (1<<pos)
 
 class CVoiceData
 {
 public:
 enum EEventStatus
 {
- kES_NoteEnd = bit_pos( 0 ),
- kES_PitchEnd = bit_pos( 1 ),
- kES_InstrEnd = bit_pos( 2 ),
- kES_VolumeEnd = bit_pos( 3 ),
+ kES_NoteEnd = BIT_POS(0),
+ kES_PitchEnd = BIT_POS(1),
+ kES_InstrEnd = BIT_POS(2),
+ kES_VolumeEnd = BIT_POS(3),
 
- kES_None = 0
+ kES_None = 0
 };
 
 explicit CVoiceData()
- : mForceNote ( true )
- ,mEventStatus ( kES_None )
- ,current_note ( 0 )
- ,current_note_duration( 0 )
- ,mNoteDuration ( 0 )
- ,next_instrument_event( 0 )
- ,next_volume_event ( 0 )
- ,next_pitch_event ( 0 )
- ,n_note_events (0)
- ,n_instrument_events(0)
- ,n_volume_events(0)
- ,n_pitch_events(0)
+ :mEventStatus (kES_None)
+ ,mNoteDuration (0)
+ ,current_note_duration(0)
+ ,current_note (0)
+ ,next_instrument_event(0)
+ ,next_volume_event (0)
+ ,next_pitch_event (0)
+ ,mForceNote (true)
 {
- memset (note_events, 0, sizeof (note_events));
- instrument_events = 0;
- volume_events = 0;
- pitch_events = 0;
- }
-
- ~CVoiceData () {
- delete instrument_events;
- delete volume_events;
- delete pitch_events;
 }
 
 void Reset()
 {
- mForceNote = true;
 mEventStatus = kES_None;
- current_note = 0;
- current_note_duration = 0;
 mNoteDuration = 0;
+ current_note_duration = 0;
+ current_note = 0;
 next_instrument_event = 0;
 next_volume_event = 0;
 next_pitch_event = 0;
+ mForceNote = true;
 }
 
- SNoteEvent note_eventsMAX_NOTE_EVENTS;
- int n_note_events;
- SInstrumentEvent *instrument_events;
- int n_instrument_events;
- SVolumeEvent *volume_events;
- int n_volume_events;
- SPitchEvent *pitch_events;
- int n_pitch_events;
-
- bool mForceNote : 1;
+ TNoteEvents note_events;
+ TInstrumentEvents instrument_events;
+ TVolumeEvents volume_events;
+ TPitchEvents pitch_events;
 int mEventStatus;
- unsigned int current_note;
- int current_note_duration;
- int mNoteDuration;
- unsigned int next_instrument_event;
- unsigned int next_volume_event;
- unsigned int next_pitch_event;
+ int16_t mNoteDuration;
+ int16_t current_note_duration;
+ uint16_t current_note;
+ uint16_t next_instrument_event;
+ uint16_t next_volume_event;
+ uint16_t next_pitch_event;
+ bool mForceNote;
 };
 
 typedef struct
 {
- uint16 index;
- char record_used;
- char name9;
+ uint16_t index;
+ uint8_t record_used;
+ char nameROL_MAX_NAME_SIZE;
 } SInstrumentName;
 
+ typedef std::vector<SInstrumentName> TInstrumentNames;
+
 typedef struct
 {
- char version_major;
- char version_minor;
- char signature6;
- uint16 number_of_list_entries_used;
- uint16 total_number_of_list_entries;
- int32 abs_offset_of_name_list;
- int32 abs_offset_of_data;
-
- SInstrumentName *ins_name_list;
- int n_ins_names;
+ uint8_t version_major;
+ uint8_t version_minor;
+ char signatureROL_BNK_SIGNATURE_SIZE;
+ uint16_t number_of_list_entries_used;
+ uint16_t total_number_of_list_entries;
+ int32 abs_offset_of_name_list;
+ int32 abs_offset_of_data;
+
+ TInstrumentNames ins_name_list;
 } SBnkHeader;
 
 typedef struct
 {
- unsigned char key_scale_level;
- unsigned char freq_multiplier;
- unsigned char feed_back;
- unsigned char attack_rate;
- unsigned char sustain_level;
- unsigned char sustaining_sound;
- unsigned char decay_rate;
- unsigned char release_rate;
- unsigned char output_level;
- unsigned char amplitude_vibrato;
- unsigned char frequency_vibrato;
- unsigned char envelope_scaling;
- unsigned char fm_type;
+ uint8_t key_scale_level;
+ uint8_t freq_multiplier;
+ uint8_t feed_back;
+ uint8_t attack_rate;
+ uint8_t sustain_level;
+ uint8_t sustaining_sound;
+ uint8_t decay_rate;
+ uint8_t release_rate;
+ uint8_t output_level;
+ uint8_t amplitude_vibrato;
+ uint8_t frequency_vibrato;
+ uint8_t envelope_scaling;
+ uint8_t fm_type;
 } SFMOperator;
 
 typedef struct
 {
- unsigned char ammulti;
- unsigned char ksltl;
- unsigned char ardr; 
- unsigned char slrr;
- unsigned char fbc;
- unsigned char waveform;
+ uint8_t ammulti;
+ uint8_t ksltl;
+ uint8_t ardr; 
+ uint8_t slrr;
+ uint8_t fbc;
+ uint8_t waveform;
 } SOPL2Op;
 
 typedef struct
 {
- char mode;
- char voice_number;
- SOPL2Op modulator;
- SOPL2Op carrier;
+ uint8_t mode;
+ uint8_t voice_number;
+ SOPL2Op modulator;
+ SOPL2Op carrier;
 } SRolInstrument;
 
 typedef struct
 {
- const char * name;
+ std::string name;
 SRolInstrument instrument;
- } SUsedList;
-
- void load_tempo_events ( binistream *f );
- bool load_voice_data ( binistream *f, const char *bnk_filename, const CFileProvider &fp );
- void load_note_events ( binistream *f, CVoiceData &voice );
- void load_instrument_events( binistream *f, CVoiceData &voice,
- binistream *bnk_file, SBnkHeader const &bnk_header );
- void load_volume_events ( binistream *f, CVoiceData &voice );
- void load_pitch_events ( binistream *f, CVoiceData &voice );
-
- bool load_bnk_info ( binistream *f, SBnkHeader &header );
- int load_rol_instrument ( binistream *f, SBnkHeader const &header, const char *name );
- void read_rol_instrument ( binistream *f, SRolInstrument &ins );
- void read_fm_operator ( binistream *f, SOPL2Op &opl2_op );
- int get_ins_index( const char * const &name ) const;
-
- void UpdateVoice( int const voice, CVoiceData &voiceData );
- void SetNote( int const voice, int const note );
- void SetNoteMelodic( int const voice, int const note );
- void SetNotePercussive( int const voice, int const note );
- void SetFreq ( int const voice, int const note, bool const keyOn=false );
- void SetPitch ( int const voice, real32 const variation );
- void SetVolume ( int const voice, int const volume );
- void SetRefresh( float const multiplier );
- void send_ins_data_to_chip( int const voice, int const ins_index );
- void send_operator( int const voice, SOPL2Op const &modulator, SOPL2Op const &carrier );
-
- SRolHeader *rol_header;
- STempoEvent *mTempoEvents;
- int n_tempo_events;
- CVoiceData *voice_data;
- int n_voice_data;
- SUsedList *ins_list;
- int n_used_ins;
-
- unsigned int mNextTempoEvent;
- int mCurrTick;
- int mTimeOfLastNote;
- float mRefresh;
- unsigned char bdRegister;
- unsigned char bxRegister9;
- unsigned char volumeCache11;
- uint16			freqCache11;
- real32 pitchCache11;
-
- static int const kSizeofDataRecord;
- static int const kMaxTickBeat;
- static int const kSilenceNote;
- static int const kNumMelodicVoices;
- static int const kNumPercussiveVoices;
- static int const kBassDrumChannel;
- static int const kSnareDrumChannel;
- static int const kTomtomChannel;
- static int const kTomtomFreq;
- static int const kSnareDrumFreq;
- static float const kDefaultUpdateTme;
- static float const kPitchFactor;
- static uint16 const kNoteTable12;
+ } SInstrument;
+
+ void load_tempo_events (binistream *f);
+ bool load_voice_data (binistream *f, std::string const & bnk_filename, CFileProvider const & fp);
+ void load_note_events (binistream *f, CVoiceData & voice);
+ void load_instrument_events(binistream *f, CVoiceData & voice,
+ binistream *bnk_file, SBnkHeader const & bnk_header);
+ void load_volume_events (binistream *f, CVoiceData & voice);
+ void load_pitch_events (binistream *f, CVoiceData & voice);
+
+ bool load_bnk_info (binistream *f, SBnkHeader & header);
+ int load_rol_instrument (binistream *f, SBnkHeader const & header, std::string const & name);
+ void read_rol_instrument (binistream *f, SRolInstrument & ins);
+ void read_fm_operator (binistream *f, SOPL2Op & opl2_op);
+ int get_ins_index (std::string const & name) const;
+
+ void UpdateVoice(int const voice, CVoiceData & voiceData);
+ void SetNote(int const voice, int const note);
+ void SetNoteMelodic(int const voice, int const note);
+ void SetNotePercussive(int const voice, int const note);
+ void SetFreq (int const voice, int const note, bool const keyOn=false);
+ void ChangePitch(int voice, uint16_t const pitchBend);
+ void SetPitch (int const voice, float const variation);
+ void SetVolume (int const voice, uint8_t const volume);
+ void SetRefresh(float const multiplier);
+ uint8_t GetKSLTL(int const voice) const;
+ void send_ins_data_to_chip(int const voice, int const ins_index);
+ void send_operator(int const voice, SOPL2Op const & modulator, SOPL2Op const & carrier);
+
+ class StringCompare
+ {
+ public:
+ bool operator()(SInstrumentName const & lhs, SInstrumentName const & rhs) const
+ {
+ return keyLess(lhs.name, rhs.name);
+ }
+
+ bool operator()(SInstrumentName const & lhs, std::string const &rhs) const
+ {
+ return keyLess(lhs.name, rhs.c_str());
+ }
+
+ bool operator()(std::string const & lhs, SInstrumentName const & rhs) const
+ {
+ return keyLess(lhs.c_str(), rhs.name);
+ }
+ private:
+ bool keyLess(char const * const lhs, char const * const rhs) const
+ {
+ return stricmp(lhs, rhs) < 0;
+ }
+ };
+
+ typedef uint16_t const * TUint16ConstPtr;
+ typedef std::vector<STempoEvent> TTempoEvents;
+ typedef std::vector<CVoiceData> TVoiceData;
+ typedef std::vector<SInstrument> TInstrumentList;
+ typedef std::vector<TUint16ConstPtr> TUint16PtrVector;
+ typedef std::vector<int16_t> TInt16Vector;
+ typedef std::vector<uint8_t> TUInt8Vector;
+ typedef std::vector<bool> TBoolVector;
+ typedef std::vector<std::string> TStringVector;
+
+ SRolHeader * mpROLHeader;
+ TUint16ConstPtr mpOldFNumFreqPtr;
+ TTempoEvents mTempoEvents;
+ TVoiceData mVoiceData;
+ TInstrumentList mInstrumentList;
+ TUint16PtrVector mFNumFreqPtrList;
+ TInt16Vector mHalfToneOffset;
+ TUInt8Vector mVolumeCache;
+ TUInt8Vector mKSLTLCache;
+ TUInt8Vector mNoteCache;
+ TUInt8Vector mKOnOctFNumCache;
+ TBoolVector mKeyOnCache;
+ float mRefresh;
+ int32_t mOldPitchBendLength;
+ uint16_t mPitchRangeStep;
+ uint16_t mNextTempoEvent;
+ int16_t mCurrTick;
+ int16_t mTimeOfLastNote;
+ int16_t mOldHalfToneOffset;
+ uint8_t mAMVibRhythmCache;
+ TStringVector usedInstruments;
+
+ static int const kSizeofDataRecord;
+ static int const kMaxTickBeat;
+ static int const kSilenceNote;
+ static int const kNumMelodicVoices;
+ static int const kNumPercussiveVoices;
+ static int const kBassDrumChannel;
+ static int const kSnareDrumChannel;
+ static int const kTomtomChannel;
+ static int const kTomTomNote;
+ static int const kTomTomToSnare;
+ static int const kSnareNote;
+ static float const kDefaultUpdateTme;
 };
 
 #endif

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/s3m.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/s3m.cpp Changed

@@ -14,7 +14,7 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * s3m.c - S3M Player by Simon Peter <dn.tlp@gmx.net>
 *
@@ -22,11 +22,10 @@
 * Extra Fine Slides (EEx, FEx) & Fine Vibrato (Uxy) are inaccurate
 */
 
-#include <stdio.h>
-#include <string.h>
+#include <cstring>
 #include "s3m.h"
 
-const char Cs3mPlayer::chnresolv =	// S3M -> adlib channel conversion
+const signed char Cs3mPlayer::chnresolv =	// S3M -> adlib channel conversion
 {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1};
 
 const unsigned short Cs3mPlayer::notetable12 =		// S3M adlib note table
@@ -57,109 +56,97 @@
 }
 }
 
-bool Cs3mPlayer::load(const char *filename, const CFileProvider &fp)
+bool Cs3mPlayer::load(const std::string &filename, const CFileProvider &fp)
 {
- binistream		*f = fp.open(filename);
- if(!f) {
- return false;
- }
- unsigned short	insptr99,pattptr99;
- int			i,row;
- unsigned char		bufval,bufval2;
- unsigned short	ppatlen;
- s3mheader		*checkhead;
- bool			adlibins=false;
-
- // file validation section
- checkhead = new s3mheader;
- load_header(f, checkhead);
- if(checkhead->kennung != 0x1a || checkhead->typ != 16
- || checkhead->insnum > 99) {
- delete checkhead;
- fp.close(f);
- return false;
- } else
- if(strncmp(checkhead->scrm,"SCRM",4)) {
- delete checkhead;
- fp.close(f);
- return false;
- } else {	// is an adlib module?
- f->seek(checkhead->ordnum, binio::Add);
- for(i = 0; i < checkhead->insnum; i++) {
- insptri = f->readInt(2);
- }
- for(i=0;i<checkhead->insnum;i++) {
- f->seek(insptri*16);
- int n = f->readInt(1);
- if(n >= 2) {
- adlibins = true;
- break;
- }
- }
- delete checkhead;
- if(!adlibins) {
- fp.close(f);
- return false;
- }
- }
-
- // load section
- f->seek(0);			// rewind for load
- load_header(f, &header);	// read header
-
- // security check
- if(header.ordnum > 256 || header.insnum > 99 || header.patnum > 99) {
- fp.close(f);
- return false;
- }
-
- for(i = 0; i < header.ordnum; i++) ordersi = f->readInt(1);	// read orders
- for(i = 0; i < header.insnum; i++) insptri = f->readInt(2);	// instrument parapointers
- for(i = 0; i < header.patnum; i++) pattptri = f->readInt(2); // pattern parapointers
-
- for(i=0;i<header.insnum;i++) {	// load instruments
- f->seek(insptri*16);
- insti.type = f->readInt(1);
- f->readString(insti.filename, 15);
- insti.d00 = f->readInt(1); insti.d01 = f->readInt(1);
- insti.d02 = f->readInt(1); insti.d03 = f->readInt(1);
- insti.d04 = f->readInt(1); insti.d05 = f->readInt(1);
- insti.d06 = f->readInt(1); insti.d07 = f->readInt(1);
- insti.d08 = f->readInt(1); insti.d09 = f->readInt(1);
- insti.d0a = f->readInt(1); insti.d0b = f->readInt(1);
- insti.volume = f->readInt(1); insti.dsk = f->readInt(1);
- f->ignore(2);
- insti.c2spd = f->readInt(4);
- f->ignore(12);
- f->readString(insti.name, 28);
- f->readString(insti.scri, 4);
+ binistream		*f = fp.open(filename); if(!f) return false;
+ unsigned short	insptr99,pattptr99;
+ int			i,row;
+ unsigned char		bufval,bufval2;
+ unsigned short	ppatlen;
+ s3mheader		*checkhead;
+ bool			adlibins=false;
+
+ // file validation section
+ checkhead = new s3mheader;
+ load_header(f, checkhead);
+ if(checkhead->kennung != 0x1a || checkhead->typ != 16
+ || checkhead->insnum > 99) {
+ delete checkhead; fp.close(f); return false;
+ } else
+ if(strncmp(checkhead->scrm,"SCRM",4)) {
+ delete checkhead; fp.close(f); return false;
+ } else {	// is an adlib module?
+ f->seek(checkhead->ordnum, binio::Add);
+ for(i = 0; i < checkhead->insnum; i++)
+	insptri = f->readInt(2);
+ for(i=0;i<checkhead->insnum;i++) {
+	f->seek(insptri*16);
+	if(f->readInt(1) >= 2) {
+	 adlibins = true;
+	 break;
+	}
+ }
+ delete checkhead;
+ if(!adlibins) { fp.close(f); return false; }
 }
 
- for(i=0;i<header.patnum;i++) {	// depack patterns
- f->seek(pattptri*16);
- ppatlen = f->readInt(2);
- unsigned long pattpos = f->pos();
- for(row=0;(row<64) && (pattpos-pattptri*16<=ppatlen);row++)
- do {
- bufval = f->readInt(1);
- if(bufval & 32) {
- bufval2 = f->readInt(1);
- patternirowbufval & 31.note = bufval2 & 15;
- patternirowbufval & 31.oct = (bufval2 & 240) >> 4;
- patternirowbufval & 31.instrument = f->readInt(1);
- }
- if(bufval & 64)
- patternirowbufval & 31.volume = f->readInt(1);
- if(bufval & 128) {
- patternirowbufval & 31.command = f->readInt(1);
- patternirowbufval & 31.info = f->readInt(1);
- }
- } while(bufval);
- }
+ // load section
+ f->seek(0);			// rewind for load
+ load_header(f, &header);	// read header
 
+ // security check
+ if(header.ordnum > 256 || header.insnum > 99 || header.patnum > 99) {
 fp.close(f);
- rewind(0);
- return true;		// done
+ return false;
+ }
+
+ for(i = 0; i < header.ordnum; i++) ordersi = f->readInt(1);	// read orders
+ for(i = 0; i < header.insnum; i++) insptri = f->readInt(2);	// instrument parapointers
+ for(i = 0; i < header.patnum; i++) pattptri = f->readInt(2); // pattern parapointers
+
+ for(i=0;i<header.insnum;i++) {	// load instruments
+ f->seek(insptri*16);
+ insti.type = f->readInt(1);
+ f->readString(insti.filename, 15);
+ insti.d00 = f->readInt(1); insti.d01 = f->readInt(1);
+ insti.d02 = f->readInt(1); insti.d03 = f->readInt(1);
+ insti.d04 = f->readInt(1); insti.d05 = f->readInt(1);
+ insti.d06 = f->readInt(1); insti.d07 = f->readInt(1);
+ insti.d08 = f->readInt(1); insti.d09 = f->readInt(1);
+ insti.d0a = f->readInt(1); insti.d0b = f->readInt(1);
+ insti.volume = f->readInt(1); insti.dsk = f->readInt(1);
+ f->ignore(2);
+ insti.c2spd = f->readInt(4);
+ f->ignore(12);
+ f->readString(insti.name, 28);
+ f->readString(insti.scri, 4);
+ }
+
+ for(i=0;i<header.patnum;i++) {	// depack patterns
+ f->seek(pattptri*16);
+ ppatlen = f->readInt(2);
+ unsigned long pattpos = f->pos();
+ for(row=0;(row<64) && (pattpos-pattptri*16<=ppatlen);row++)
+ do {
+	bufval = f->readInt(1);
+	if(bufval & 32) {
+	 bufval2 = f->readInt(1);
+	 patternirowbufval & 31.note = bufval2 & 15;
+	 patternirowbufval & 31.oct = (bufval2 & 240) >> 4;
+	 patternirowbufval & 31.instrument = f->readInt(1);
+	}
+	if(bufval & 64)
+	 patternirowbufval & 31.volume = f->readInt(1);
+	if(bufval & 128) {
+	 patternirowbufval & 31.command = f->readInt(1);
+	 patternirowbufval & 31.info = f->readInt(1);
+	}
+ } while(bufval);
+ }
+
+ fp.close(f);
+ rewind(0);
+ return true;		// done
 }
 
 bool Cs3mPlayer::update()
@@ -417,7 +404,7 @@
 opl->write(1,32);			// Go to ym3812 mode
 }
 
-const char * Cs3mPlayer::gettype()
+std::string Cs3mPlayer::gettype()
 {
 char filever5;
 
@@ -429,8 +416,7 @@
 default: strcpy(filever,"3.??");
 }
 
- snprintf (filetype, sizeof (filetype), "Scream Tracker %s", filever);
- return filetype;
+ return (std::string("Scream Tracker ") + filever);
 }
 
 float Cs3mPlayer::getrefresh()

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/s3m.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/s3m.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/sa2.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/sa2.cpp Changed

@@ -14,12 +14,13 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * sa2.cpp - SAdT2 Loader by Simon Peter <dn.tlp@gmx.net>
 * SAdT Loader by Mamiya <mamiya@users.sourceforge.net>
 */
 
+#include <cstring>
 #include <stdio.h>
 #include <string.h>
 
@@ -31,7 +32,7 @@
 return new Csa2Loader(newopl);
 }
 
-bool Csa2Loader::load(const char *filename, const CFileProvider &fp)
+bool Csa2Loader::load(const std::string &filename, const CFileProvider &fp)
 {
 binistream *f = fp.open(filename); if(!f) return false;
 struct {
@@ -160,7 +161,7 @@
 
 AdPlug_LogWrite("Csa2Loader::load(\"%s\"): sat_type = %x, nop = %d, "
 		 "length = %d, restartpos = %d, activechan = %x, bpm = %d\n",
-		 filename, sat_type, nop, length, restartpos, activechan, bpm);
+		 filename.c_str(), sat_type, nop, length, restartpos, activechan, bpm);
 
 // track data
 if(sat_type & HAS_OLDPATTERNS) {
@@ -226,13 +227,15 @@
 return true;
 }
 
-const char * Csa2Loader::gettype()
+std::string Csa2Loader::gettype()
 {
- snprintf(filetype,sizeof(filetype),"Surprise! Adlib Tracker 2 (version %d)",header.version);
- return filetype;
+ char tmpstr40;
+
+ sprintf(tmpstr,"Surprise! Adlib Tracker 2 (version %d)",header.version);
+ return std::string(tmpstr);
 }
 
-const char * Csa2Loader::gettitle()
+std::string Csa2Loader::gettitle()
 {
 char bufinst29*17,buf18;
 int i,ptr;
@@ -253,12 +256,8 @@
 strcat(bufinst,buf);
 }
 
- if(strchr(bufinst,'"')) {
- const char *pos = strchr(bufinst,'"')+1;
- int len = strrchr(bufinst,'"')-pos;
- memcpy (title,pos,len);
- titlelen = 0;
- return title;
- }
- return "";
+ if(strchr(bufinst,'"'))
+ return std::string(bufinst,strchr(bufinst,'"')-bufinst+1,strrchr(bufinst,'"')-strchr(bufinst,'"')-1);
+ else
+ return std::string();
 }

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/sa2.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/sa2.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/silentopl.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/silentopl.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/sng.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/sng.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/sng.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/sng.h Changed

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/sop.cpp Added

@@ -0,0 +1,861 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2008 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * sop.cpp - sopepos' Note Player by Stas'M <binarymaster@mail.ru>
+ *
+ * REFERENCES:
+ * http://www.shikadi.net/moddingwiki/SOP_Format
+ */
+
+#include <string.h>
+
+#include "sop.h"
+
+CPlayer *CsopPlayer::factory(Copl *newopl)
+{
+	return new CsopPlayer(newopl);
+}
+
+bool CsopPlayer::load(const std::string &filename, const CFileProvider &fp)
+{
+	binistream *f = fp.open(filename); if(!f) return false;
+
+	// file validation
+	if (!fp.extension(filename, ".sop"))
+	{
+		fp.close(f);
+		return false;
+	}
+	if (fp.filesize(f) < SOP_HEAD_SIZE)
+	{
+		fp.close(f);
+		return false;
+	}
+
+	/****** static header validation ******/
+
+	char signSOP_SIGN_SIZE + 1;
+	signSOP_SIGN_SIZE = 0;
+	f->readString(sign, SOP_SIGN_SIZE);
+	if (strcmp(sign, "sopepos"))
+	{
+		fp.close(f);
+		return false;
+	}
+	uint32_t check = f->readInt(3);
+	if (check != 0x100 && check != 0x200)
+	{
+		fp.close(f);
+		return false;
+	}
+	version = check;
+	f->readString(fname, SOP_FILENAME);
+	fnameSOP_FILENAME - 1 = 0;
+	f->readString(title, SOP_TITLE);
+	titleSOP_TITLE - 1 = 0;
+	percussive = f->readInt(1);
+	check = f->readInt(1);
+	if (percussive > 1 || check != 0)
+	{
+		fp.close(f);
+		return false;
+	}
+	tickBeat = f->readInt(1);
+	check = f->readInt(1);
+	if (tickBeat == 0 || check != 0)
+	{
+		fp.close(f);
+		return false;
+	}
+	check = f->readInt(1); // beatMeasure
+	basicTempo = f->readInt(1);
+	if (!basicTempo) basicTempo = SOP_DEF_TEMPO;
+	if (check == 0)
+	{
+		fp.close(f);
+		return false;
+	}
+	f->readString(comment, SOP_COMMENT);
+	commentSOP_COMMENT - 1 = 0;
+	nTracks = f->readInt(1);
+	nInsts = f->readInt(1);
+	check = f->readInt(1);
+	if (nTracks == 0 || nInsts == 0 || nTracks > SOP_MAX_TRACK || nInsts > SOP_MAX_INST ||
+		check != 0 || fp.filesize(f) < SOP_HEAD_SIZE + nTracks)
+	{
+		fp.close(f);
+		return false;
+	}
+
+	/****** dynamic data load ******/
+
+	// channel modes
+	chanMode = new uint8_tnTracks;
+	f->readString((char *)chanMode, nTracks);
+	// instruments
+	inst = new sop_instnInsts;
+	unsigned int i;
+	for (i = 0; i < nInsts; i++)
+	{
+		insti.type = f->readInt(1);
+		if (insti.type > SOP_INST_NONE)
+		{
+			fp.close(f);
+			return false;
+		}
+		f->readString(insti.filename, SOP_INSTNAME);
+		insti.filenameSOP_INSTNAME = 0;
+		f->readString(insti.longname, SOP_LONGNAME);
+		insti.longnameSOP_LONGNAME = 0;
+		if (insti.type == SOP_INST_NONE)
+		{
+			continue;
+		}
+		else if (insti.type == SOP_INST_WAV)
+		{
+			if (fp.filesize(f) - f->pos() < sizeof(sop_sample))
+			{
+				fp.close(f);
+				return false;
+			}
+			sop_sample sample;
+			f->readString((char *)&sample, sizeof(sample));
+			if (fp.filesize(f) - f->pos() < sample.length)
+			{
+				fp.close(f);
+				return false;
+			}
+			f->seek(sample.length, binio::Add);
+			memset(insti.data, 0, sizeof(insti.data));
+		}
+		else if (insti.type == SOP_INST_4OP)
+		{
+			if (fp.filesize(f) - f->pos() < SOP_INST4OP)
+			{
+				fp.close(f);
+				return false;
+			}
+			f->readString((char *)insti.data, SOP_INST4OP);
+		}
+		else
+		{
+			if (fp.filesize(f) - f->pos() < SOP_INST2OP)
+			{
+				fp.close(f);
+				return false;
+			}
+			f->readString((char *)insti.data, SOP_INST2OP);
+		}
+	}
+	// event tracks
+	track = new sop_trknTracks + 1;
+	for (i = 0; i < nTracks + 1; i++)
+	{
+		tracki.nEvents = f->readInt(2);
+		tracki.size = f->readInt(4);
+		if (fp.filesize(f) - f->pos() < tracki.size)
+		{
+			fp.close(f);
+			return false;
+		}
+		tracki.data = new uint8_ttracki.size;
+		f->readString((char *)tracki.data, tracki.size);
+	}
+	// done
+	fp.close(f);
+	drv = new Cad262Driver(opl);
+	rewind(0);
+	return true;
+}
+
+void CsopPlayer::rewind(int subsong)
+{
+	// set default tempo
+	SetTempo(basicTempo);
+	opl->init();
+	if (drv) drv->SoundWarmInit();
+	if (drv) drv->SetYM_262_SOP(1);
+
+	int i;
+	for (i = 0; i < nTracks + 1; i++)
+	{
+		tracki.pos = 0;
+		tracki.counter = 0;
+		tracki.ticks = 0;
+		tracki.dur = 0;
+	}
+	songend = false;
+
+	for (i = 0; i < SOP_MAX_TRACK; i++)
+	{
+		volumei = 0;
+		lastvoli = 0;
+	}
+	master_vol = SOP_MAX_VOL;
+
+	for (i = 0; i < nTracks; i++)
+	{
+		if (!drv) break;
+		if (chanModei & SOP_CHAN_4OP)
+			drv->Set_4OP_Mode(i, 1);
+	}
+	if (drv) drv->SetMode_SOP(percussive);
+}
+
+/*
+ * Set Tempo (tempo - BPM)
+ */
+void CsopPlayer::SetTempo(uint8_t tempo)
+{
+	if (!tempo) tempo = basicTempo;
+	timer = tempo * tickBeat / 60.0f;
+	cur_tempo = tempo;
+}
+
+/*
+ * Execute SOP event (t - track index)
+ */
+void CsopPlayer::executeCommand(uint8_t t)
+{
+	uint8_t event = trackt.datatrackt.pos++;
+	uint8_t value;
+
+	switch (event)
+	{
+	case SOP_EVNT_NOTE:
+		if (trackt.pos + 2 >= trackt.size) break;
+		value = trackt.datatrackt.pos++;
+		trackt.dur = trackt.datatrackt.pos++;
+		trackt.dur |= trackt.datatrackt.pos++ << 8;
+		// skip this event on control track, ignore notes with zero duration
+		if (t == nTracks || !trackt.dur) break;
+		if (drv) drv->NoteOn_SOP(t, value);
+		break;
+	case SOP_EVNT_TEMPO:
+		if (trackt.pos >= trackt.size) break;
+		value = trackt.datatrackt.pos++;
+		// process this event only on control track
+		if (t < nTracks) break;
+		SetTempo(value);
+		break;
+	case SOP_EVNT_VOL:
+		if (trackt.pos >= trackt.size) break;
+		value = trackt.datatrackt.pos++;
+		// skip this event on control track
+		if (t == nTracks) break;
+		lastvolt = value;
+		value = value * master_vol / SOP_MAX_VOL;
+		if (value != volumet)
+		{
+			if (drv) drv->SetVoiceVolume_SOP(t, value);
+			volumet = value;
+		}
+		break;
+	case SOP_EVNT_PITCH:
+		if (trackt.pos >= trackt.size) break;
+		value = trackt.datatrackt.pos++;
+		// skip this event on control track
+		if (t == nTracks) break;
+		if (drv) drv->SetVoicePitch_SOP(t, value);
+		break;
+	case SOP_EVNT_INST:
+		if (trackt.pos >= trackt.size) break;
+		value = trackt.datatrackt.pos++;
+		// skip this event on control track, ignore values out of range
+		if (t == nTracks || value >= nInsts) break;
+		if (drv) drv->SetVoiceTimbre_SOP(t, instvalue.data);
+		break;
+	case SOP_EVNT_PAN:
+		if (trackt.pos >= trackt.size) break;
+		value = trackt.datatrackt.pos++;
+		// skip this event on control track
+		if (t == nTracks) break;
+		if (version == 0x200)
+		{
+			switch (value) // SOP v2 panning
+			{
+			case 0x00: value = 2; break; // left
+			case 0x40: value = 1; break; // middle
+			case 0x80: value = 0; break; // right
+			}
+		}
+		if (drv) drv->SetStereoPan_SOP(t, value);
+		break;
+	case SOP_EVNT_MVOL:
+		if (trackt.pos >= trackt.size) break;
+		value = trackt.datatrackt.pos++;
+		// process this event only on control track
+		if (t < nTracks) break;
+		master_vol = value;
+		for (int i = 0; i < nTracks; i++)
+		{
+			value = lastvoli * master_vol / SOP_MAX_VOL;
+			if (value != volumei)
+			{
+				if (drv) drv->SetVoiceVolume_SOP(i, value);
+				volumei = value;
+			}
+		}
+		break;
+	default:
+		trackt.pos++;
+		break;
+	}
+}
+
+bool CsopPlayer::update()
+{
+	songend = true;
+	for (uint8_t i = 0; i < nTracks + 1; i++)
+	{
+		if (tracki.dur)
+		{
+			songend = false; // there are active notes
+			if (drv && !--tracki.dur) drv->NoteOff_SOP(i);
+		}
+		if (tracki.pos >= tracki.size)
+			continue;
+		songend = false; // track is not finished
+		if (!tracki.counter)
+		{
+			tracki.ticks = tracki.datatracki.pos++;
+			tracki.ticks |= tracki.datatracki.pos++ << 8;
+			if (tracki.pos == 2 && tracki.ticks)
+				tracki.ticks++; // workaround to synchronize tracks (there's always 1 excess tick at start)
+		}
+		if (++tracki.counter >= tracki.ticks)
+		{
+			tracki.counter = 0;
+			while (tracki.pos < tracki.size)
+			{
+				executeCommand(i);
+				if (tracki.pos >= tracki.size) {
+					break;
+				}
+				else if (!tracki.datatracki.pos && !tracki.datatracki.pos + 1) // if next delay is zero
+				{
+					tracki.pos += 2;
+				}
+				else break;
+			}
+		}
+	}
+	return !songend;
+}
+
+/*
+ * Source code parts from free Ad262Sop Library (c) 1996-2005, Park Jeenhong
+ */
+
+const int Cad262Driver::fNumTblTABLE_SIZE={
+	0x0159, 0x015A, 0x015A, 0x015B, 0x015C, 0x015C, 0x015D, 0x015D, 0x015E, 0x015F, 0x015F, 0x0160,
+	0x0161, 0x0161, 0x0162, 0x0162, 0x0163, 0x0164, 0x0164, 0x0165, 0x0166, 0x0166, 0x0167, 0x0168,
+	0x0168, 0x0169, 0x016A, 0x016A, 0x016B, 0x016C, 0x016C, 0x016D, 0x016E, 0x016E, 0x016F, 0x016F,
+	0x0170, 0x0171, 0x0171, 0x0172, 0x0173, 0x0174, 0x0174, 0x0175, 0x0176, 0x0176, 0x0177, 0x0178,
+	0x0178, 0x0179, 0x017A, 0x017A, 0x017B, 0x017C, 0x017C, 0x017D, 0x017E, 0x017E, 0x017F, 0x0180,
+	0x0180, 0x0181, 0x0182, 0x0183, 0x0183, 0x0184, 0x0185, 0x0185, 0x0186, 0x0187, 0x0187, 0x0188,
+	0x0189, 0x018A, 0x018A, 0x018B, 0x018C, 0x018C, 0x018D, 0x018E, 0x018F, 0x018F, 0x0190, 0x0191,
+	0x0191, 0x0192, 0x0193, 0x0194, 0x0194, 0x0195, 0x0196, 0x0197, 0x0197, 0x0198, 0x0199, 0x019A,
+	0x019A, 0x019B, 0x019C, 0x019D, 0x019D, 0x019E, 0x019F, 0x019F, 0x01A0, 0x01A1, 0x01A2, 0x01A3,
+	0x01A3, 0x01A4, 0x01A5, 0x01A6, 0x01A6, 0x01A7, 0x01A8, 0x01A9, 0x01A9, 0x01AA, 0x01AB, 0x01AC,
+	0x01AC, 0x01AD, 0x01AE, 0x01AF, 0x01B0, 0x01B0, 0x01B1, 0x01B2, 0x01B3, 0x01B3, 0x01B4, 0x01B5,
+	0x01B6, 0x01B7, 0x01B7, 0x01B8, 0x01B9, 0x01BA, 0x01BB, 0x01BB, 0x01BC, 0x01BD, 0x01BE, 0x01BF,
+	0x01BF, 0x01C0, 0x01C1, 0x01C2, 0x01C3, 0x01C3, 0x01C4, 0x01C5, 0x01C6, 0x01C7, 0x01C8, 0x01C8,
+	0x01C9, 0x01CA, 0x01CB, 0x01CC, 0x01CD, 0x01CD, 0x01CE, 0x01CF, 0x01D0, 0x01D1, 0x01D2, 0x01D2,
+	0x01D3, 0x01D4, 0x01D5, 0x01D6, 0x01D7, 0x01D7, 0x01D8, 0x01D9, 0x01DA, 0x01DB, 0x01DC, 0x01DD,
+	0x01DD, 0x01DE, 0x01DF, 0x01E0, 0x01E1, 0x01E2, 0x01E3, 0x01E4, 0x01E4, 0x01E5, 0x01E6, 0x01E7,
+	0x01E8, 0x01E9, 0x01EA, 0x01EB, 0x01EB, 0x01EC, 0x01ED, 0x01EE, 0x01EF, 0x01F0, 0x01F1, 0x01F2,
+	0x01F3, 0x01F3, 0x01F4, 0x01F5, 0x01F6, 0x01F7, 0x01F8, 0x01F9, 0x01FA, 0x01FB, 0x01FC, 0x01FD,
+	0x01FE, 0x01FE, 0x01FF, 0x0200, 0x0201, 0x0202, 0x0203, 0x0204, 0x0205, 0x0206, 0x0207, 0x0208,
+	0x0209, 0x020A, 0x020B, 0x020B, 0x020C, 0x020D, 0x020E, 0x020F, 0x0210, 0x0211, 0x0212, 0x0213,
+	0x0214, 0x0215, 0x0216, 0x0217, 0x0218, 0x0219, 0x021A, 0x021B, 0x021C, 0x021D, 0x021E, 0x021F,
+	0x0220, 0x0221, 0x0222, 0x0223, 0x0224, 0x0225, 0x0226, 0x0227, 0x0228, 0x0229, 0x022A, 0x022B,
+	0x022C, 0x022D, 0x022E, 0x022F, 0x0230, 0x0231, 0x0232, 0x0233, 0x0234, 0x0235, 0x0236, 0x0237,
+	0x0238, 0x0239, 0x023A, 0x023B, 0x023C, 0x023D, 0x023E, 0x023F, 0x0240, 0x0241, 0x0242, 0x0243,
+	0x0244, 0x0245, 0x0246, 0x0247, 0x0248, 0x0249, 0x024B, 0x024C, 0x024D, 0x024E, 0x024F, 0x0250,
+	0x0251, 0x0252, 0x0253, 0x0254, 0x0255, 0x0256, 0x0257, 0x0258, 0x025A, 0x025B, 0x025C, 0x025D,
+	0x025E, 0x025F, 0x0260, 0x0261, 0x0262, 0x0263, 0x0265, 0x0266, 0x0267, 0x0268, 0x0269, 0x026A,
+	0x026B, 0x026C, 0x026D, 0x026F, 0x0270, 0x0271, 0x0272, 0x0273, 0x0274, 0x0275, 0x0276, 0x0278,
+	0x0279, 0x027A, 0x027B, 0x027C, 0x027D, 0x027E, 0x0280, 0x0281, 0x0282, 0x0283, 0x0284, 0x0285,
+	0x0287, 0x0288, 0x0289, 0x028A, 0x028B, 0x028C, 0x028E, 0x028F, 0x0290, 0x0291, 0x0292, 0x0294,
+	0x0295, 0x0296, 0x0297, 0x0298, 0x029A, 0x029B, 0x029C, 0x029D, 0x029E, 0x02A0, 0x02A1, 0x02A2,
+	0x02A3, 0x02A4, 0x02A6, 0x02A7, 0x02A8, 0x02A9, 0x02AB, 0x02AC, 0x02AD, 0x02AE, 0x02B0, 0x02B1
+};
+
+const unsigned char Cad262Driver::SlotXmaxVoices * 2={
+	0, 1, 2, 8, 9, 10, 16, 17, 18, 0, 0, 0, 1, 2, 8, 9, 10, 16, 17, 18,
+	0, 1, 2, 8, 9, 10, 16, 20, 18, 21, 17, 0, 1, 2, 8, 9, 10, 16, 17, 18
+};
+
+const unsigned char Cad262Driver::VolReg11 * 2={
+	0x43, 0x44, 0x45, 0x4B, 0x4C, 0x4D, 0x53, 0x54, 0x55, 0, 0,
+	0x43, 0x44, 0x45, 0x4B, 0x4C, 0x4D, 0x53, 0x54, 0x52, 0x55, 0x51
+};
+
+const unsigned Cad262Driver::MOD12OCTAVE * 11={
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
+};
+
+const unsigned Cad262Driver::DIV12OCTAVE * 8={
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+	2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+	3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+	4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
+};
+
+void Cad262Driver::SetMode_SOP(int mode)
+{
+	if (mode) {
+		/* set the frequency for the last 4 percussion voices: */
+		voiceNoteTOM = SOP_TOM_PITCH;
+		vPitchBendTOM = 100;
+		UpdateFNums(TOM);
+
+		voiceNoteSD = SOP_SD_PITCH;
+		vPitchBendSD = 100;
+		UpdateFNums(SD);
+	}
+
+	percussion = mode;
+
+	SndOutput1(0xBD, (percussion ? 0x20 : 0));
+} /* SetMode() */
+
+void Cad262Driver::SoundWarmInit()
+{
+	int i, j;
+
+	for (i = 0; i < 64; i++) {
+		for (j = 0; j < 128; j++)
+			VolumeTablei * 128 + j = (i * j + (MAX_VOLUME + 1) / 2) >> LOG2_VOLUME;
+	}
+
+	for (i = 1; i <= 0xF5; i++) {
+		SndOutput1(i, 0); /* clear all registers */
+		SndOutput3(i, 0);
+	}
+
+	for (i = 0; i < YMB_SIZE; i++) {
+		ymbufi = 0;
+		ymbufi + YMB_SIZE = 0;
+	}
+
+	for (i = 0; i < 20; i++) {
+		vPitchBendi = 100;
+		voiceKeyOni = 0;
+		voiceNotei = MID_C;
+		VoiceVolumei = 0;
+		Ksli = 0;
+		Ksl2i = 0;
+		Ksl2Vi = 0;
+		OP4i = 0;
+		Stereoi = 0x30;
+	}
+
+	OP_MASK = 0;
+
+	SndOutput1(4, 6); /* mask T1 & T2 */
+
+	SndOutput3(5, 1); /* YMF-262M Mode */
+	SndOutput3(4, 0);
+
+	SetMode_SOP(0); /* melodic mode */
+
+	SndOutput1(0x08, 0);
+	SndOutput1(1, 0x20);
+} /* SoundWarmInit() */
+
+void Cad262Driver::UpdateFNums(int chan)
+{
+	if (chan >= maxVoices)
+		return;
+
+	SetFreq_SOP(chan, voiceNotechan, vPitchBendchan, 0);
+}
+
+void Cad262Driver::SndOutput1(int addr, int value)
+{
+	if (addr >= 0xB0)
+		ymbufaddr - 0xB0 = value;
+
+	if (opl->getchip() != 0)
+		opl->setchip(0);
+	opl->write(addr, value);
+}
+
+void Cad262Driver::SndOutput3(int addr, int value)
+{
+	if (addr >= 0xB0)
+		ymbufYMB_SIZE - 0xB0 + addr = value;
+
+	if (opl->getchip() != 1)
+		opl->setchip(1);
+	opl->write(addr, value);
+}
+
+void Cad262Driver::SEND_INS(int base_addr, unsigned char* value, int mode)
+{
+	int i;
+	if (opl->getchip() != mode)
+		opl->setchip(mode);
+
+	for (i = 0; i < 4; i++) {
+		opl->write(base_addr, *value++);
+		base_addr += 0x20;
+	}
+
+	base_addr += 0x40;
+	opl->write(base_addr, (*value) & 0x07);
+}
+
+void Cad262Driver::SetYM_262_SOP(int VX)
+{
+	SndOutput3(5, VX);
+	SndOutput3(4, 0);
+}
+
+void Cad262Driver::SetStereoPan_SOP(int chan, int value)
+{
+	int PAN = { 0xa0, 0x30, 0x50 };
+	int port, abs_port;
+
+	if (chan >= maxVoices)
+		return;
+
+	Stereochan = (unsigned char)(value = PANvalue);
+
+	port = 0;
+
+	if (chan < 9)
+		abs_port = chan;
+	else {
+		if (chan < 11)
+			abs_port = 17 - chan;
+		else {
+			abs_port = chan - 11;
+			port = 1;
+		}
+	}
+
+	value |= ((chan >= 11) ? ymbufYMB_SIZE + 0x10 + abs_port & 0x0F : ymbufabs_port + 0x10 & 0x0F);
+	if (opl->getchip() != port)
+		opl->setchip(port);
+
+	if (OP4chan) {
+		opl->write(abs_port + 0xC3, (value & 0xF0) | (int)(((chan >= 11) ? ymbufYMB_SIZE + 0x13 + abs_port : ymbufabs_port + 0x13) & 0x0F));
+	}
+
+	opl->write(abs_port + 0xC0, value);
+}
+
+void Cad262Driver::SetVoiceVolume_SOP(unsigned chan, unsigned vol)
+{
+	int volume;
+	unsigned char KSL_value;
+
+	if (chan >= maxVoices)
+		return;
+
+	if (chan > 2 && OP4chan - 3)
+		return;
+
+	if (vol > MAX_VOLUME)
+		vol = MAX_VOLUME;
+
+	VoiceVolumechan = vol;
+
+	if (Ksl2Vchan) {
+		volume = 63 - VolumeTable((63 - ((KSL_value = Ksl2chan) & 0x3F)) << 7) + vol;
+
+		if (chan >= 11)
+			SndOutput3(VolRegchan - 11 - 3, KSL_value & 0xC0 | volume);
+		else
+			SndOutput1((percussion ? VolRegchan + 11 : VolRegchan) - 3, KSL_value & 0xC0 | volume);
+
+		if (OP4chan) {
+			chan += 3;
+			volume = 63 - VolumeTable((63 - ((KSL_value = Kslchan) & 0x3F)) << 7) + vol;
+
+			if (chan >= 11)
+				SndOutput3(VolRegchan - 11, KSL_value & 0xC0 | volume);
+			else
+				SndOutput1(VolRegchan, KSL_value & 0xC0 | volume);
+
+			if (Ksl2Vchan) {
+				volume = 63 - VolumeTable((63 - ((KSL_value = Ksl2chan) & 0x3F)) << 7) + vol;
+
+				if (chan >= 11)
+					SndOutput3(VolRegchan - 11 - 3, KSL_value & 0xC0 | volume);
+				else
+					SndOutput1(VolRegchan - 3, KSL_value & 0xC0 | volume);
+			}
+		}
+		else {
+			volume = 63 - VolumeTable((63 - ((KSL_value = Kslchan) & 0x3F)) << 7) + vol;
+
+			if (chan >= 11)
+				SndOutput3(VolRegchan - 11, KSL_value & 0xC0 | volume);
+			else
+				SndOutput1((percussion ? VolRegchan + 11 : VolRegchan), KSL_value & 0xC0 | volume);
+		}
+	}
+	else {
+		if (OP4chan) {
+			volume = 63 - VolumeTable((63 - ((KSL_value = Kslchan + 3) & 0x3F)) << 7) + vol;
+
+			if (chan >= 11)
+				SndOutput3(VolRegchan + 3 - 11, KSL_value & 0xC0 | volume);
+			else
+				SndOutput1(VolRegchan + 3, KSL_value & 0xC0 | volume);
+
+			if (Ksl2Vchan + 3) {
+				volume = 63 - VolumeTable((63 - ((KSL_value = Kslchan) & 0x3F)) << 7) + vol;
+
+				if (chan >= 11)
+					SndOutput3(VolRegchan - 11, KSL_value & 0xC0 | volume);
+				else
+					SndOutput1(VolRegchan, KSL_value & 0xC0 | volume);
+			}
+		}
+		else {
+			volume = 63 - VolumeTable((63 - ((KSL_value = Kslchan) & 0x3F)) << 7) + vol;
+
+			if (chan >= 11)
+				SndOutput3(VolRegchan - 11, KSL_value & 0xC0 | volume);
+			else
+				SndOutput1((percussion ? VolRegchan + 11 : VolRegchan), KSL_value & 0xC0 | volume);
+		}
+	}
+}
+
+void Cad262Driver::SetVoiceTimbre_SOP(unsigned chan, unsigned char* array)
+{
+	int i;
+	int Slot_Number, KSL_value;
+
+	if (chan >= maxVoices || (chan > 2 && OP4chan - 3))
+		return;
+
+	if (!percussion)
+		Slot_Number = SlotXchan;
+	else
+		Slot_Number = SlotXchan + 20;
+
+	Ksl2Vchan = ((KSL_value = (array5 & 0x0F)) & 0x01);
+
+	if (chan > 10) {
+		i = chan + 0xC0 - 11;
+
+		SndOutput3(i, 0);
+
+		SEND_INS(0x20 + Slot_Number, array, 1);
+		SEND_INS(0x23 + Slot_Number, &array6, 1);
+
+		if (OP4chan) {
+			SndOutput3(i + 3, 0);
+
+			SEND_INS(0x28 + Slot_Number, &((unsigned char*)array)11, 1);
+			SEND_INS(0x2B + Slot_Number, &((unsigned char*)array)17, 1);
+
+			Kslchan + 3 = *(array + 18);
+			Ksl2chan + 3 = *(array + 12);
+			Ksl2Vchan + 3 = *(array + 16) & 1;
+
+			SndOutput3(i + 3, (*(array + 16) & 0x0F) | Stereochan);
+		}
+
+		Kslchan = *(array + 7);
+		Ksl2chan = *(array + 1);
+		Ksl2Vchan = *(array + 5) & 1;
+
+		SetVoiceVolume_SOP(chan, VoiceVolumechan);
+		SndOutput3(i, KSL_value | Stereochan);
+	}
+	else {
+		if (chan > 8)
+			i = 0xC0 + 17 - chan;
+		else
+			i = chan + 0xC0;
+
+		SndOutput1(i, 0);
+
+		SEND_INS(0x20 + Slot_Number, array, 0);
+
+		if (percussion && chan > BD) {
+			Kslchan = *(array + 1);
+			Ksl2Vchan = 0;
+		}
+		else {
+			SEND_INS(0x23 + Slot_Number, &array6, 0);
+
+			Kslchan = *(array + 7);
+			Ksl2chan = *(array + 1);
+			Ksl2Vchan = *(array + 5) & 1;
+		}
+
+		if (OP4chan) {
+			SndOutput1(i + 3, 0);
+
+			SEND_INS(0x28 + Slot_Number, &((unsigned char*)array)11, 0);
+			SEND_INS(0x2B + Slot_Number, &((unsigned char*)array)17, 0);
+
+			Kslchan + 3 = *(array + 18);
+			Ksl2chan + 3 = *(array + 12);
+			Ksl2Vchan + 3 = *(array + 16) & 1;
+
+			SndOutput1(i + 3, *(array + 16) & 0x0F | Stereochan);
+		}
+
+		SetVoiceVolume_SOP(chan, VoiceVolumechan);
+		SndOutput1(i, KSL_value | Stereochan);
+	}
+}
+
+void Cad262Driver::SetFreq_SOP(int voice, unsigned note, int pitch, int keyOn)
+{
+	int temp, fN, divFactor, fNIndex;
+
+	temp = (int)((pitch - 100) / 3.125) + ((note - 12) << LOG_NB_STEP_PITCH);
+
+	if (temp < 0)
+		temp = 0;
+	else {
+		if (temp >= ((NB_NOTES << LOG_NB_STEP_PITCH) - 1))
+			temp = (NB_NOTES << LOG_NB_STEP_PITCH) - 1;
+	}
+
+	fNIndex = (MOD12(temp >> 5) << 5) + (temp & (NB_STEP_PITCH - 1));
+
+	fN = fNumTblfNIndex;
+
+	divFactor = DIV12(temp >> 5);
+
+	if (voice <= 10)
+		SndOutput1(0xA0 + voice, (fN & 0xFF));
+	else
+		SndOutput3(0xA0 + voice - 11, (fN & 0xFF));
+
+	fN = (((fN >> 8) & 0x03) | (divFactor << 2) | keyOn) & 0xFF;
+
+	if (voice <= 10)
+		SndOutput1(0xB0 + voice, fN);
+	else
+		SndOutput3(0xB0 + voice - 11, fN);
+}
+
+void Cad262Driver::SetVoicePitch_SOP(unsigned chan, int pitch)
+{
+	if (chan >= maxVoices || pitch < 0 || pitch > 200)
+		return;
+
+	vPitchBendchan = pitch;
+
+	if (!percussion)
+		SetFreq_SOP(chan, voiceNotechan, pitch, voiceKeyOnchan);
+	else {
+		if (chan <= BD || chan > HIHAT)
+			SetFreq_SOP(chan, voiceNotechan, pitch, voiceKeyOnchan);
+	}
+}
+
+void Cad262Driver::NoteOn_SOP(unsigned chan, unsigned pitch)
+{
+	if (chan >= maxVoices)
+		return;
+
+	if (percussion && chan >= BD && chan <= HIHAT) {
+		if (chan == BD) {
+			voiceNoteBD = pitch;
+			SetFreq_SOP(BD, voiceNoteBD, vPitchBendBD, 0);
+		}
+		else {
+			if (chan == TOM && (unsigned)voiceNoteTOM != pitch) {
+				voiceNoteSD = (voiceNoteTOM = pitch) + TOM_TO_SD;
+				SetFreq_SOP(TOM, voiceNoteTOM, 100, 0);
+				SetFreq_SOP(SD, voiceNoteSD, 100, 0);
+			}
+		}
+		SndOutput1(0xBD, ymbuf0x0D | (0x10 >> (chan - BD)));
+	}
+	else {
+		voiceNotechan = pitch;
+		voiceKeyOnchan = 0x20;
+
+		SetFreq_SOP(chan, pitch, vPitchBendchan, 0x20);
+	}
+}
+
+void Cad262Driver::NoteOff_SOP(unsigned chan)
+{
+	if (chan >= maxVoices)
+		return;
+
+	voiceKeyOnchan = 0;
+
+	if (percussion && chan >= BD && chan <= HIHAT)
+		SndOutput1(0xBD, ymbuf0x0D & (0xFF - (0x10 >> (chan - BD))));
+	else {
+		if (chan < HIHAT)
+			SndOutput1(0xB0 + chan, ymbufchan & 0xDF);
+		else
+			SndOutput3(0xB0 - 11 + chan, ymbufchan - 11 + YMB_SIZE & 0xDF);
+	}
+}
+
+int Cad262Driver::Set_4OP_Mode(unsigned chan, unsigned value)
+{
+	if (chan >= maxVoices)
+		return 1;
+
+	if (SlotXchan + 20 <= 2) {
+		OP4chan = value;
+
+		if (value) {
+			if (chan > 10)
+				OP_MASK |= (0x01 << (chan - 11 + 3));
+			else
+				OP_MASK |= (0x01 << chan);
+		}
+		else {
+			if (chan > 10)
+				OP_MASK &= (0xFF - (0x01 << (chan - 11 + 3)));
+			else
+				OP_MASK &= (0xFF - (0x01 << chan));
+		}
+
+		SndOutput3(0x04, OP_MASK);
+
+		return 1;
+	}
+
+	return 0;
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/sop.h Added

@@ -0,0 +1,272 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2005 Simon Peter <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * sop.h - sopepos' Note Player by Stas'M <binarymaster@mail.ru>
+ *
+ * REFERENCES:
+ * http://www.shikadi.net/moddingwiki/SOP_Format
+ */
+
+#ifndef H_ADPLUG_SOPPLAYER
+#define H_ADPLUG_SOPPLAYER
+
+#include <stdint.h>
+#include <stdio.h>
+#include "player.h"
+
+/*
+ * Source code parts from free Ad262Sop Library (c) 1996-2005, Park Jeenhong
+ */
+
+/* percussive voice numbers: */
+#define	BD 6
+#define	SD 7
+#define	TOM 8
+#define	CYMB 9
+#define	HIHAT 10
+
+#define	MAX_VOLUME		0x7f
+#define	LOG2_VOLUME		7		/* log2( MAX_VOLUME) */
+
+#define	MID_C			60		/* MIDI standard mid C */
+
+#define	SOP_TOM_PITCH		36		/* best frequency, in range of 0 to 95 */
+#define	TOM_TO_SD		7		/* 7 half-tones between voice 7 & 8 */
+#define	SOP_SD_PITCH		(SOP_TOM_PITCH + TOM_TO_SD)
+
+#define NB_NOTES			96 /* 8 octave of 12 notes */
+#define OCTAVE			12 /* half-tone by octave */
+#define NB_STEP_PITCH		32 /* 32 steps between two half-tones */
+#define LOG_NB_STEP_PITCH	5 /* LOG2( NB_STEP_PITCH ) */
+#define NB_TABLE_DEMI_TON	OCTAVE
+#define TABLE_SIZE			(NB_STEP_PITCH * NB_TABLE_DEMI_TON)
+
+#define	maxVoices		20
+#define	YMB_SIZE		80
+
+class Cad262Driver
+{
+public:
+	Cad262Driver(Copl *newopl)
+		: opl(newopl)
+	{};
+	~Cad262Driver()
+	{};
+
+	void SoundWarmInit();
+	void SetYM_262_SOP(int VX);
+	void SetMode_SOP(int mode);
+	void SetStereoPan_SOP(int chan, int value);
+	void SetVoiceVolume_SOP(unsigned chan, unsigned vol);
+	void SetVoiceTimbre_SOP(unsigned chan, unsigned char *array);
+	void SetVoicePitch_SOP(unsigned chan, int pitch);
+	void NoteOn_SOP(unsigned chan, unsigned pitch);
+	void NoteOff_SOP(unsigned chan);
+	int Set_4OP_Mode(unsigned chan, unsigned value);
+
+private:
+	Copl *opl;
+
+	void UpdateFNums(int chan);
+	void SndOutput1(int addr, int value);
+	void SndOutput3(int addr, int value);
+	void SEND_INS(int base_addr, unsigned char *value, int mode);
+	void SetFreq_SOP(int voice, unsigned note, int pitch, int keyOn);
+
+	char percussion;		/* percussion mode parameter */
+	unsigned char VolumeTable 64 * 128 ; /* Pre-calculated Volume Table */
+	char voiceNote20;	/* pitch of last note-on of each voice */
+	char voiceKeyOn20;	/* state of keyOn bit of each voice */
+	unsigned char vPitchBend20;	/* current pitch bend of each voice */
+	unsigned char Ksl20; /* KSL value for Slot 1 */
+	unsigned char Ksl220; /* KSL value for Slot 2 */
+	unsigned char Ksl2V20; /* Parallel connection? */
+	unsigned char VoiceVolume20, OP_MASK;
+	unsigned char ymbuf 2 * YMB_SIZE ;
+	unsigned char OP420;
+	unsigned char Stereo22;
+
+protected:
+	static const int fNumTblTABLE_SIZE;
+	static const unsigned char SlotXmaxVoices * 2;
+	static const unsigned char VolReg11 * 2;
+	static const unsigned MOD12OCTAVE * 11;
+	static const unsigned DIV12OCTAVE * 8;
+};
+
+/******************************************************************/
+
+#define SOP_HEAD_SIZE	76
+#define SOP_SIGN_SIZE	7	/* "sopepos" signature */
+#define SOP_FILENAME	13	/* size of file name tag */
+#define SOP_TITLE		31	/* size of title tag */
+#define SOP_DEF_TEMPO	120	/* default tempo BPM */
+#define SOP_COMMENT	13	/* size of comment tag */
+#define SOP_INSTNAME	8	/* size of instrument file name tag */
+#define SOP_LONGNAME	19	/* size of instrument long name tag */
+#define SOP_INST2OP	11	/* size of 2OP instrument data */
+#define SOP_INST4OP	22	/* size of 4OP instrument data */
+#define SOP_MAX_INST	128	/* maximum number of instruments */
+#define SOP_MAX_TRACK	24	/* maximum number of tracks */
+#define SOP_MAX_VOL	127	/* maximum volume */
+
+#define SOP_CHAN_NONE	0	/* unused channel */
+#define SOP_CHAN_4OP	1	/* channel in 4OP mode */
+#define SOP_CHAN_2OP	2	/* channel in 2OP mode */
+
+#define SOP_INST_4OP	0	/* 4OP instrument */
+#define SOP_INST_2OP	1	/* 2OP instrument */
+#define SOP_INST_BD	6	/* Bass Drum */
+#define SOP_INST_SD	7	/* Snare Drum */
+#define SOP_INST_TT	8	/* Tom Tom */
+#define SOP_INST_CY	9	/* Cymbal */
+#define SOP_INST_HH	10	/* Hi-Hat */
+#define SOP_INST_WAV	11	/* Wave sample (SOP v2) */
+#define SOP_INST_NONE	12	/* Unused instrument */
+
+#define SOP_EVNT_SPEC	1	/* Special event */
+#define SOP_EVNT_NOTE	2	/* Note event */
+#define SOP_EVNT_TEMPO	3	/* Tempo event */
+#define SOP_EVNT_VOL	4	/* Volume event */
+#define SOP_EVNT_PITCH	5	/* Pitch event */
+#define SOP_EVNT_INST	6	/* Instrument event */
+#define SOP_EVNT_PAN	7	/* Panning event */
+#define SOP_EVNT_MVOL	8	/* Master volume event */
+
+class CsopPlayer: public CPlayer
+{
+public:
+	static CPlayer *factory(Copl *newopl);
+
+	CsopPlayer(Copl *newopl)
+		: CPlayer(newopl), drv(0), chanMode(0), inst(0), track(0)
+		{ }
+	~CsopPlayer()
+	{
+		if (chanMode) delete chanMode;
+		if (inst) delete inst;
+		if (track)
+		{
+			for (int i = 0; i < nTracks + 1; i++)
+			{
+				if (tracki.data) delete tracki.data;
+			}
+			delete track;
+		}
+		if (drv) drv->~Cad262Driver();
+	};
+
+	bool load(const std::string &filename, const CFileProvider &fp);
+	bool update();
+	void rewind(int subsong);
+
+	float getrefresh()
+	{
+		return timer;
+	};
+
+	unsigned int getspeed()
+	{
+		return cur_tempo;
+	};
+
+	std::string gettitle()
+	{
+		return title0 ? std::string(title) : std::string(fname);
+	}
+
+	std::string gettype()
+	{
+		char type36;
+		sprintf(type, "Note Sequencer v%u.%u by sopepos", (version >> 8) & 0xFF, version & 0xFF);
+		return std::string(type);
+	}
+
+	std::string getdesc()
+	{
+		return std::string(comment);
+	}
+
+	unsigned int getinstruments()
+	{
+		return inst ? nInsts : 0;
+	};
+
+	std::string getinstrument(unsigned int n)
+	{
+		return inst && n < nInsts ? std::string(instn.longname) : std::string();
+	};
+
+private:
+	void SetTempo(uint8_t tempo);
+	void executeCommand(uint8_t t);
+	Cad262Driver * drv;
+
+protected:
+	bool songend;
+	float timer;
+	uint16_t version;
+	uint8_t cur_tempo;			/* current tempo in BPM */
+	uint8_t volumeSOP_MAX_TRACK;	/* actual volume of all voices */
+	uint8_t lastvolSOP_MAX_TRACK;	/* last set volume of all voices */
+	uint8_t master_vol;			/* master volume */
+
+	char fnameSOP_FILENAME;
+	char titleSOP_TITLE;
+	uint8_t percussive, tickBeat, basicTempo;
+	char commentSOP_COMMENT;
+	uint8_t nTracks, nInsts;
+
+	struct sop_inst {
+		uint8_t type;
+		char filenameSOP_INSTNAME + 1;
+		char longnameSOP_LONGNAME + 1;
+		uint8_t dataSOP_INST4OP;
+	};
+#pragma pack(push, 1)
+	struct sop_sample {
+		uint16_t val1;
+		uint16_t val2;
+		uint16_t length;
+		uint16_t val4;
+		uint16_t base_freq;
+		uint16_t val6;
+		uint16_t val7;
+		uint8_t val8;
+		uint16_t val9;
+		uint16_t val10;
+	};
+#pragma pack(pop)
+	struct sop_trk {
+		// stored variables
+		uint16_t nEvents;			/* event count */
+		uint32_t size;			/* data size */
+		uint8_t * data;			/* event data */
+
+		// variables for playback
+		uint32_t pos;			/* data position */
+		uint32_t counter;			/* tick counter */
+		uint16_t ticks;			/* ticks to wait for next event */
+		uint16_t dur;			/* note play duration */
+	};
+	uint8_t * chanMode;			/* channel modes nTracks */
+	sop_inst * inst;				/* instruments nInsts */
+	sop_trk * track;				/* event tracks nTracks + control track */
+};
+
+#endif
\ No newline at end of file

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/surroundopl.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/surroundopl.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/surroundopl.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/surroundopl.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/temuopl.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/temuopl.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/temuopl.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/temuopl.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/u6m.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/u6m.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/u6m.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/u6m.h Changed

@@ -14,13 +14,14 @@
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 *
 * u6m.h - Ultima 6 Music Player by Marc Winterrowd.
 * This code extends the Adlib Winamp plug-in by Simon Peter <dn.tlp@gmx.net>
 */
 
-#include <string.h>
+#include <stack>
+
 #include "player.h"
 
 #define default_dict_size 4096 // because maximum codeword size == 12 bits
@@ -31,7 +32,7 @@
 public:
 static CPlayer *factory(Copl *newopl);
 
- Cu6mPlayer(Copl *newopl) : CPlayer(newopl), song_data(0), subsong_stack_sz(0)
+ Cu6mPlayer(Copl *newopl) : CPlayer(newopl), song_data(0)
 {
 };
 
@@ -41,14 +42,14 @@
 if(song_data) delete song_data;
 };
 
- bool load(const char *filename, const CFileProvider &fp);
+ bool load(const std::string &filename, const CFileProvider &fp);
 bool update();
 void rewind(int subsong);
 float getrefresh();
 
- const char * gettype()
+ std::string gettype()
 {
- return "Ultima 6 Music";
+ return std::string("Ultima 6 Music");
 };
 
 protected:
@@ -108,9 +109,7 @@
 int song_pos; // current offset within the song
 int loop_position; // position of the loop point
 int read_delay; // delay (in timer ticks) before further song data is read
- enum {MAX_SUBSONG_STACK = 100};
- subsong_info subsong_stackMAX_SUBSONG_STACK;
- int subsong_stack_sz;
+ std::stack<subsong_info> subsong_stack;
 
 int instrument_offsets9; // offsets of the adlib instrument data
 // vibrato ("vb")
@@ -164,7 +163,6 @@
 bool lzw_decompress(data_block source, data_block dest);
 int get_next_codeword (long& bits_read, unsigned char *source, int codeword_size);
 void output_root(unsigned char root, unsigned char *destination, long& position);
- //void get_string(int codeword, MyDict& dictionary, std::stack<unsigned char>& root_stack);
- void get_string(int codeword, MyDict& dictionary, unsigned char *root_stack, int &root_stack_size);
+ void get_string(int codeword, MyDict& dictionary, std::stack<unsigned char>& root_stack);
 };

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/version.h Added

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/vgm.cpp Added

@@ -0,0 +1,388 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2005 Simon Peter, <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * vgm.c - VGM Player by Stas'M <binarymaster@mail.ru>
+ *
+ * REFERENCES:
+ * https://vgmrips.net/wiki/VGM_Specification
+ * http://www.smspower.org/uploads/Music/vgmspec160.txt
+ * http://www.smspower.org/uploads/Music/gd3spec100.txt
+ *
+ * TODO:
+ * - Add support for *.VGZ (GZip compressed files)
+ */
+
+#include <cstring>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "vgm.h"
+
+/*** public methods *************************************/
+
+CPlayer *CvgmPlayer::factory(Copl *newopl)
+{
+	return new CvgmPlayer(newopl);
+}
+
+void fillGD3Tag(binistream *f, wchar_t *data)
+{
+	uint16_t chr, cnt = 0;
+	do
+	{
+		chr = f->readInt(2);
+		datacnt < 256 ? cnt : 255 = cnt < 256 ? chr : 0;
+		cnt++;
+	} while (chr && !f->eof());
+}
+
+bool CvgmPlayer::load(const std::string &filename, const CFileProvider &fp)
+{
+	binistream *f = fp.open(filename);
+	if (!f) return false;
+
+	if (!fp.extension(filename, ".vgm") &&
+		!fp.extension(filename, ".vgz"))
+	{
+		fp.close(f);
+		return false;
+	}
+
+	if (fp.filesize(f) < VGM_GZIP_MIN)
+	{
+		// File size is too small
+		fp.close(f);
+		return false;
+	}
+	char id4;
+	f->readString(id, 4);
+
+	if ((uint8_t)id0 == 0x1F &&
+		(uint8_t)id1 == 0x8B)
+	{
+		// TODO: GZip decompression
+		fp.close(f);
+		return false;
+	}
+	if (fp.filesize(f) < VGM_HEADER_MIN)
+	{
+		// File size is too small
+		fp.close(f);
+		return false;
+	}
+	if (strncmp(id, VGM_HEADER_ID, 4))
+	{
+		// Header ID mismatch
+		fp.close(f);
+		return false;
+	}
+	uint32_t eof = f->readInt(4);
+	if (fp.filesize(f) != eof + OFFSET_EOF)
+	{
+		// EOF offset is incorrect
+		fp.close(f);
+		return false;
+	}
+	version = f->readInt(4);
+	if (version < 0x151)
+	{
+		// Minimum supported VGM version is 1.51
+		fp.close(f);
+		return false;
+	}
+	f->seek(12, binio::Add);
+	samples = f->readInt(4);
+	loop_ofs = f->readInt(4);
+	loop_smp = f->readInt(4);
+	rate = f->readInt(4);
+
+	f->seek(12, binio::Add);
+	int data_ofs = f->readInt(4);
+	if (data_ofs < OFFSET_YM3812 - OFFSET_DATA + 4)
+	{
+		// VGM data overlays important header fields
+		fp.close(f);
+		return false;
+	}
+	clock = 0;
+	if (data_ofs >= OFFSET_YMF262 - OFFSET_DATA + 4)
+	{
+		f->seek(OFFSET_YMF262);
+		clock = f->readInt(4);
+	}
+	vgmOPL3 = clock != 0;
+	vgmDual = false;
+	if (!vgmOPL3)
+	{
+		f->seek(OFFSET_YM3812);
+		clock = f->readInt(4);
+		vgmDual = (clock & VGM_DUAL_BIT) > 0;
+	}
+	clock &= (VGM_DUAL_BIT - 1);
+	if (!clock)
+	{
+		// VGM clock is not set
+		fp.close(f);
+		return false;
+	}
+	loop_base = 0;
+	if (data_ofs >= OFFSET_LOOPBASE - OFFSET_DATA + 1)
+	{
+		f->seek(OFFSET_LOOPBASE);
+		loop_base = f->readInt(1);
+	}
+	loop_mod = 0;
+	if (data_ofs >= OFFSET_LOOPMOD - OFFSET_DATA + 1)
+	{
+		f->seek(OFFSET_LOOPMOD);
+		loop_mod = f->readInt(1);
+	}
+	data_sz = 0;
+	f->seek(OFFSET_GD3);
+	int gd3_ofs = f->readInt(4);
+	if (gd3_ofs)
+	{
+		// process GD3
+		f->seek(OFFSET_GD3 + gd3_ofs);
+		f->readString(id, 4);
+		if (!strncmp(id, GD3_HEADER_ID, 4))
+		{
+			int gd3_ver = f->readInt(4);
+			int gd3_size = f->readInt(4);
+			fillGD3Tag(f, GD3.title_en);
+			fillGD3Tag(f, GD3.title_jp);
+			fillGD3Tag(f, GD3.game_en);
+			fillGD3Tag(f, GD3.game_jp);
+			fillGD3Tag(f, GD3.system_en);
+			fillGD3Tag(f, GD3.system_jp);
+			fillGD3Tag(f, GD3.author_en);
+			fillGD3Tag(f, GD3.author_jp);
+			fillGD3Tag(f, GD3.date);
+			fillGD3Tag(f, GD3.ripper);
+			fillGD3Tag(f, GD3.notes);
+		}
+	}
+	else
+	{
+		f->seek(OFFSET_EOF);
+		gd3_ofs = f->readInt(4);
+	}
+	f->seek(OFFSET_DATA + data_ofs);
+	data_sz = gd3_ofs - data_ofs;
+	vgmData = new uint8_tdata_sz;
+	for (int i = 0; i < data_sz; i++)
+	{
+		vgmDatai = f->readInt(1);
+	}
+	fp.close(f);
+	loop_ofs -= data_ofs + (OFFSET_DATA - OFFSET_LOOP);
+	rewind(0);
+	return true;
+}
+
+bool CvgmPlayer::update()
+{
+	uint8_t reg, val;
+	wait = 0;
+
+	do
+	{
+		if (pos >= data_sz)
+		{
+			songend = true;
+			break;
+		}
+		uint8_t cmd = vgmDatapos++;
+		switch (cmd)
+		{
+		case CMD_OPL2:
+		case CMD_OPL3_PORT0:
+			reg = vgmDatapos++;
+			val = vgmDatapos++;
+			if ((!vgmOPL3 && cmd == CMD_OPL2) || (vgmOPL3 && cmd == CMD_OPL3_PORT0))
+			{
+				if (opl->getchip() != 0)
+					opl->setchip(0);
+				opl->write(reg, val);
+			}
+			break;
+		case CMD_OPL2_2ND:
+		case CMD_OPL3_PORT1:
+			reg = vgmDatapos++;
+			val = vgmDatapos++;
+			if ((vgmDual && cmd == CMD_OPL2_2ND) || (vgmOPL3 && cmd == CMD_OPL3_PORT1))
+			{
+				if (opl->getchip() != 1)
+					opl->setchip(1);
+				opl->write(reg, val);
+			}
+			break;
+		case CMD_WAIT:
+			wait = vgmDatapos++;
+			wait |= vgmDatapos++ << 8;
+			break;
+		case CMD_WAIT_735:
+			wait = 735;
+			break;
+		case CMD_WAIT_882:
+			wait = 882;
+			break;
+		case CMD_DATA_END:
+			pos = data_sz;
+			break;
+		default:
+			if (cmd >= CMD_WAIT_N && cmd <= CMD_WAIT_N + 0xF)
+			{
+				wait = (cmd & 0xF) + 1;
+			}
+		}
+		if (wait && wait < 40)
+			wait = 0; // skip too short pauses
+		if (!songend)
+			songend = pos >= data_sz;
+		if (pos >= data_sz && loop_ofs >= 0)
+			pos = loop_ofs;
+	} while (!wait);
+	return !songend;
+}
+
+void CvgmPlayer::rewind(int subsong)
+{
+	pos = 0; songend = false; wait = 0;
+	opl->init();
+}
+
+float CvgmPlayer::getrefresh()
+{
+	return VGM_FREQUENCY / (wait > 0 ? wait : VGM_FREQUENCY / 1000);
+}
+
+std::string CvgmPlayer::gettype()
+{
+	char chip10;
+	memset(chip, 0, 10);
+	if (vgmOPL3)
+		strcpy(chip, "OPL3");
+	else if (vgmDual)
+		strcpy(chip, "Dual OPL2");
+	else
+		strcpy(chip, "OPL2");
+	char tmpstr40;
+	uint8_t major = (version >> 8) & 0xFF;
+	uint8_t minor = version & 0xFF;
+	sprintf(tmpstr, "Video Game Music %x.%x (%s)", major, minor, chip);
+	return std::string(tmpstr);
+}
+
+std::string CvgmPlayer::gettitle()
+{
+	char str256;
+	str0 = 0;
+	if (GD3.title_en0)
+	{
+		wcstombs(str, GD3.title_en, 256);
+	}
+	else if (GD3.title_jp0)
+	{
+		wcstombs(str, GD3.title_jp, 256);
+	}
+	return std::string(str);
+}
+
+std::string CvgmPlayer::getauthor()
+{
+	char str256;
+	str0 = 0;
+	if (GD3.author_en0)
+	{
+		wcstombs(str, GD3.author_en, 256);
+	}
+	else if (GD3.author_jp0)
+	{
+		wcstombs(str, GD3.author_jp, 256);
+	}
+	return std::string(str);
+}
+
+std::string CvgmPlayer::getdesc()
+{
+	char game256; game0 = 0;
+	char system256; system0 = 0;
+	char date256; date0 = 0;
+	char notes256; notes0 = 0;
+	
+	if (GD3.game_en0)
+	{
+		wcstombs(game, GD3.game_en, 256);
+	}
+	else if (GD3.game_jp0)
+	{
+		wcstombs(game, GD3.game_jp, 256);
+	}
+	if (GD3.system_en0)
+	{
+		wcstombs(system, GD3.system_en, 256);
+	}
+	else if (GD3.system_jp0)
+	{
+		wcstombs(system, GD3.system_jp, 256);
+	}
+	if (GD3.date0)
+		wcstombs(date, GD3.date, 256);
+	if (GD3.notes0)
+		wcstombs(notes, GD3.notes, 256);
+	char str_sys256; str_sys0 = 0;
+	if (system0 && date0)
+	{
+		sprintf(str_sys, "%s / %s", system, date);
+	}
+	else if (system0)
+	{
+		strcpy(str_sys, system);
+	}
+	else if (date0)
+	{
+		strcpy(str_sys, date);
+	}
+	char str_game256; str_game0 = 0;
+	char str_desc256; str_desc0 = 0;
+	if (game0)
+	{
+		if (str_sys0)
+		{
+			sprintf(str_game, "%s (%s)", game, str_sys);
+		}
+		else
+		{
+			strcpy(str_game, game);
+		}
+	}
+	else if (str_sys0)
+	{
+		strcpy(str_game, str_sys);
+	}
+	if (notes0)
+	{
+		sprintf(str_desc, "%s\r\n\r\n%s", str_game, notes);
+	}
+	else
+	{
+		strcpy(str_desc, str_game);
+	}
+	return std::string(str_desc);
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/vgm.h Added

@@ -0,0 +1,111 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2005 Simon Peter, <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * vgm.h - VGM Player by Stas'M <binarymaster@mail.ru>
+ *
+ * REFERENCES:
+ * https://vgmrips.net/wiki/VGM_Specification
+ * http://www.smspower.org/uploads/Music/vgmspec160.txt
+ * http://www.smspower.org/uploads/Music/gd3spec100.txt
+ */
+
+#ifndef H_ADPLUG_VGMPLAYER
+#define H_ADPLUG_VGMPLAYER
+
+#include "player.h"
+
+#if !defined(UINT8_MAX)
+typedef signed char int8_t;
+typedef short int16_t;
+typedef int int32_t;
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+#endif
+
+#define VGM_GZIP_MIN	8		// minimum size for GZip header
+#define VGM_HEADER_MIN	84		// minimum size for header (till YM3812 clock field)
+#define VGM_HEADER_ID	"Vgm "	// header ident
+#define OFFSET_EOF		0x04	// End Of File offset
+#define OFFSET_GD3		0x14	// GD3 tag offset
+#define OFFSET_LOOP		0x1C	// Loop offset
+#define OFFSET_DATA		0x34	// VGM data offset
+#define OFFSET_YM3812	0x50	// YM3812 clock offset
+#define OFFSET_YMF262	0x5C	// YMF262 clock offset
+#define OFFSET_LOOPBASE	0x7E	// Loop base offset
+#define OFFSET_LOOPMOD	0x7F	// Loop modifier offset
+#define VGM_DUAL_BIT	0x40000000	// VGM flag for dual-chip feature
+#define GD3_HEADER_ID	"Gd3 "	// GD3 tag header ident
+
+#define CMD_OPL2		0x5A	// YM3812, write value <dd> to register <aa>
+#define CMD_OPL3_PORT0	0x5E	// YMF262 port 0, write value <dd> to register <aa>
+#define CMD_OPL3_PORT1	0x5F	// YMF262 port 1, write value <dd> to register <aa>
+#define CMD_WAIT		0x61	// Wait <n> samples, <n> can range from 0 to 65535 (approx 1.49 seconds)
+#define CMD_WAIT_735	0x62	// wait 735 samples (60th of a second)
+#define CMD_WAIT_882	0x63	// wait 882 samples (50th of a second)
+#define CMD_DATA_END	0x66	// end of sound data
+#define CMD_WAIT_N		0x70	// wait <n+1> samples, <n> can range from 0 to 15
+#define CMD_OPL2_2ND	0xAA	// YM3812 chip 2, write value <dd> to register <aa>
+
+#define VGM_FREQUENCY	44100.0	// VGM base sample frequency
+
+class CvgmPlayer: public CPlayer
+{
+public:
+	static CPlayer *factory(Copl *newopl);
+
+	CvgmPlayer(Copl *newopl)
+		: CPlayer(newopl), vgmData(0)
+	{ };
+	~CvgmPlayer()
+	{
+		if (vgmData) delete vgmData;
+	};
+
+	bool load(const std::string &filename, const CFileProvider &fp);
+	bool update();
+	void rewind(int subsong);
+	float getrefresh();
+
+	std::string gettype();
+	std::string gettitle();
+	std::string getauthor();
+	std::string getdesc();
+
+protected:
+	int version, samples, loop_ofs, loop_smp, rate, clock;
+	uint8_t loop_base, loop_mod;
+	bool vgmOPL3, vgmDual;
+	int data_sz;
+	uint8_t * vgmData;
+
+	struct GD3tag {
+		wchar_t title_en256, title_jp256;
+		wchar_t game_en256, game_jp256;
+		wchar_t system_en256, system_jp256;
+		wchar_t author_en256, author_jp256;
+		wchar_t date256, ripper256, notes256;
+	};
+	GD3tag GD3;
+
+	int pos;
+	bool songend;
+	uint16_t wait;
+};
+
+#endif
\ No newline at end of file

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/wemuopl.h Added

@@ -0,0 +1,56 @@
+/*
+ * Adplug - Replayer for many OPL2/OPL3 audio file formats.
+ * Copyright (C) 1999 - 2008 Simon Peter, <dn.tlp@gmx.net>, et al.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * wemuopl.h - Emulated OPL using the DOSBox OPL3 emulator
+ */
+
+#ifndef H_ADPLUG_WEMUOPL
+#define H_ADPLUG_WEMUOPL
+
+#include "opl.h"
+extern "C" {
+#include "woodyopl.h"
+}
+
+class CWemuopl: public Copl
+{
+public:
+ CWemuopl(int rate, bool bit16, bool usestereo)
+ {
+ opl.adlib_init(rate, usestereo ? 2 : 1, bit16 ? 2 : 1);
+ currType = TYPE_OPL2;
+ };
+
+ void update(short *buf, int samples)
+ {
+ opl.adlib_getsample(buf, samples);
+ }
+
+ // template methods
+ void write(int reg, int val)
+ {
+ opl.adlib_write((currChip << 8) | reg, val);
+ };
+
+ void init() {};
+
+private:
+ OPLChipClass	opl;
+};
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/woodyopl.cpp Added

@@ -0,0 +1,1512 @@
+/*
+ * Copyright (C) 2002-2015 The DOSBox Team
+ * OPL2/OPL3 emulation library
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+/*
+ * Originally based on ADLIBEMU.C, an AdLib/OPL2 emulation library by Ken Silverman
+ * Copyright (C) 1998-2001 Ken Silverman
+ * Ken Silverman's official web site: "http://www.advsys.net/ken"
+ */
+
+/*
+ * Modified for AdPlug
+ */
+
+#include <math.h>
+#include <stdlib.h> // rand()
+#include <string.h> // memset
+#include "woodyopl.h"
+
+
+static fltype recipsamp;	// inverse of sampling rate
+static Bit16s wavtableWAVEPREC*3;	// wave form table
+
+// vibrato/tremolo tables
+static Bit32s vib_tableVIBTAB_SIZE;
+static Bit32s trem_tableTREMTAB_SIZE*2;
+
+static Bit32s vibval_constBLOCKBUF_SIZE;
+static Bit32s tremval_constBLOCKBUF_SIZE;
+
+// vibrato value tables (used per-operator)
+static Bit32s vibval_var1BLOCKBUF_SIZE;
+static Bit32s vibval_var2BLOCKBUF_SIZE;
+//static Bit32s vibval_var3BLOCKBUF_SIZE;
+//static Bit32s vibval_var4BLOCKBUF_SIZE;
+
+// vibrato/trmolo value table pointers
+static Bit32s *vibval1, *vibval2, *vibval3, *vibval4;
+static Bit32s *tremval1, *tremval2, *tremval3, *tremval4;
+
+
+// key scale level lookup table
+static const fltype kslmul4 = {
+	0.0, 0.5, 0.25, 1.0		// -> 0, 3, 1.5, 6 dB/oct
+};
+
+// frequency multiplicator lookup table
+static const fltype frqmul_tab16 = {
+	0.5,1,2,3,4,5,6,7,8,9,10,10,12,12,15,15
+};
+// calculated frequency multiplication values (depend on sampling rate)
+static fltype frqmul16;
+
+// key scale levels
+static Bit8u kslev816;
+
+// map a channel number to the register offset of the modulator (=register base)
+static const Bit8u modulatorbase9	= {
+	0,1,2,
+	8,9,10,
+	16,17,18
+};
+
+// map a register base to a modulator operator number or operator number
+#if defined(OPLTYPE_IS_OPL3)
+static const Bit8u regbase2modop44 = {
+	0,1,2,0,1,2,0,0,3,4,5,3,4,5,0,0,6,7,8,6,7,8,					// first set
+	18,19,20,18,19,20,0,0,21,22,23,21,22,23,0,0,24,25,26,24,25,26	// second set
+};
+static const Bit8u regbase2op44 = {
+	0,1,2,9,10,11,0,0,3,4,5,12,13,14,0,0,6,7,8,15,16,17,			// first set
+	18,19,20,27,28,29,0,0,21,22,23,30,31,32,0,0,24,25,26,33,34,35	// second set
+};
+#else
+static const Bit8u regbase2modop22 = {
+	0,1,2,0,1,2,0,0,3,4,5,3,4,5,0,0,6,7,8,6,7,8
+};
+static const Bit8u regbase2op22 = {
+	0,1,2,9,10,11,0,0,3,4,5,12,13,14,0,0,6,7,8,15,16,17
+};
+#endif
+
+
+// start of the waveform
+static Bit32u waveform8 = {
+	WAVEPREC,
+	WAVEPREC>>1,
+	WAVEPREC,
+	(WAVEPREC*3)>>2,
+	0,
+	0,
+	(WAVEPREC*5)>>2,
+	WAVEPREC<<1
+};
+
+// length of the waveform as mask
+static Bit32u wavemask8 = {
+	WAVEPREC-1,
+	WAVEPREC-1,
+	(WAVEPREC>>1)-1,
+	(WAVEPREC>>1)-1,
+	WAVEPREC-1,
+	((WAVEPREC*3)>>2)-1,
+	WAVEPREC>>1,
+	WAVEPREC-1
+};
+
+// where the first entry resides
+static Bit32u wavestart8 = {
+	0,
+	WAVEPREC>>1,
+	0,
+	WAVEPREC>>2,
+	0,
+	0,
+	0,
+	WAVEPREC>>3
+};
+
+// envelope generator function constants
+static fltype attackconst4 = {
+	(fltype)(1/2.82624),
+	(fltype)(1/2.25280),
+	(fltype)(1/1.88416),
+	(fltype)(1/1.59744)
+};
+static fltype decrelconst4 = {
+	(fltype)(1/39.28064),
+	(fltype)(1/31.41608),
+	(fltype)(1/26.17344),
+	(fltype)(1/22.44608)
+};
+
+
+void operator_advance(op_type* op_pt, Bit32s vib) {
+	op_pt->wfpos = op_pt->tcount;						// waveform position
+
+	// advance waveform time
+	op_pt->tcount += op_pt->tinc;
+	op_pt->tcount += (Bit32s)(op_pt->tinc)*vib/FIXEDPT;
+
+	op_pt->generator_pos += generator_add;
+}
+
+void operator_advance_drums(op_type* op_pt1, Bit32s vib1, op_type* op_pt2, Bit32s vib2, op_type* op_pt3, Bit32s vib3) {
+	Bit32u c1 = op_pt1->tcount/FIXEDPT;
+	Bit32u c3 = op_pt3->tcount/FIXEDPT;
+	Bit32u phasebit = (((c1 & 0x88) ^ ((c1<<5) & 0x80)) | ((c3 ^ (c3<<2)) & 0x20)) ? 0x02 : 0x00;
+
+	Bit32u noisebit = rand()&1;
+
+	Bit32u snare_phase_bit = (((Bitu)((op_pt1->tcount/FIXEDPT) / 0x100))&1);
+
+	//Hihat
+	Bit32u inttm = (phasebit<<8) | (0x34<<(phasebit ^ (noisebit<<1)));
+	op_pt1->wfpos = inttm*FIXEDPT;				// waveform position
+	// advance waveform time
+	op_pt1->tcount += op_pt1->tinc;
+	op_pt1->tcount += (Bit32s)(op_pt1->tinc)*vib1/FIXEDPT;
+	op_pt1->generator_pos += generator_add;
+
+	//Snare
+	inttm = ((1+snare_phase_bit) ^ noisebit)<<8;
+	op_pt2->wfpos = inttm*FIXEDPT;				// waveform position
+	// advance waveform time
+	op_pt2->tcount += op_pt2->tinc;
+	op_pt2->tcount += (Bit32s)(op_pt2->tinc)*vib2/FIXEDPT;
+	op_pt2->generator_pos += generator_add;
+
+	//Cymbal
+	inttm = (1+phasebit)<<8;
+	op_pt3->wfpos = inttm*FIXEDPT;				// waveform position
+	// advance waveform time
+	op_pt3->tcount += op_pt3->tinc;
+	op_pt3->tcount += (Bit32s)(op_pt3->tinc)*vib3/FIXEDPT;
+	op_pt3->generator_pos += generator_add;
+}
+
+
+// output level is sustained, mode changes only when operator is turned off (->release)
+// or when the keep-sustained bit is turned off (->sustain_nokeep)
+void operator_output(op_type* op_pt, Bit32s modulator, Bit32s trem) {
+	if (op_pt->op_state != OF_TYPE_OFF) {
+		op_pt->lastcval = op_pt->cval;
+		Bit32u i = (Bit32u)((op_pt->wfpos+modulator)/FIXEDPT);
+
+		// wform: -16384 to 16383 (0x4000)
+		// trem : 32768 to 65535 (0x10000)
+		// step_amp: 0.0 to 1.0
+		// vol : 1/2^14 to 1/2^29 (/0x4000; /1../0x8000)
+
+		op_pt->cval = (Bit32s)(op_pt->step_amp*op_pt->vol*op_pt->cur_wformi&op_pt->cur_wmask*trem/16.0);
+	}
+}
+
+
+// no action, operator is off
+void operator_off(op_type* /*op_pt*/) {
+}
+
+// output level is sustained, mode changes only when operator is turned off (->release)
+// or when the keep-sustained bit is turned off (->sustain_nokeep)
+void operator_sustain(op_type* op_pt) {
+	Bit32u num_steps_add = op_pt->generator_pos/FIXEDPT;	// number of (standardized) samples
+	for (Bit32u ct=0; ct<num_steps_add; ct++) {
+		op_pt->cur_env_step++;
+	}
+	op_pt->generator_pos -= num_steps_add*FIXEDPT;
+}
+
+// operator in release mode, if output level reaches zero the operator is turned off
+void operator_release(op_type* op_pt) {
+	// ??? boundary?
+	if (op_pt->amp > 0.00000001) {
+		// release phase
+		op_pt->amp *= op_pt->releasemul;
+	}
+
+	Bit32u num_steps_add = op_pt->generator_pos/FIXEDPT;	// number of (standardized) samples
+	for (Bit32u ct=0; ct<num_steps_add; ct++) {
+		op_pt->cur_env_step++;						// sample counter
+		if ((op_pt->cur_env_step & op_pt->env_step_r)==0) {
+			if (op_pt->amp <= 0.00000001) {
+				// release phase finished, turn off this operator
+				op_pt->amp = 0.0;
+				if (op_pt->op_state == OF_TYPE_REL) {
+					op_pt->op_state = OF_TYPE_OFF;
+				}
+			}
+			op_pt->step_amp = op_pt->amp;
+		}
+	}
+	op_pt->generator_pos -= num_steps_add*FIXEDPT;
+}
+
+// operator in decay mode, if sustain level is reached the output level is either
+// kept (sustain level keep enabled) or the operator is switched into release mode
+void operator_decay(op_type* op_pt) {
+	if (op_pt->amp > op_pt->sustain_level) {
+		// decay phase
+		op_pt->amp *= op_pt->decaymul;
+	}
+
+	Bit32u num_steps_add = op_pt->generator_pos/FIXEDPT;	// number of (standardized) samples
+	for (Bit32u ct=0; ct<num_steps_add; ct++) {
+		op_pt->cur_env_step++;
+		if ((op_pt->cur_env_step & op_pt->env_step_d)==0) {
+			if (op_pt->amp <= op_pt->sustain_level) {
+				// decay phase finished, sustain level reached
+				if (op_pt->sus_keep) {
+					// keep sustain level (until turned off)
+					op_pt->op_state = OF_TYPE_SUS;
+					op_pt->amp = op_pt->sustain_level;
+				} else {
+					// next: release phase
+					op_pt->op_state = OF_TYPE_SUS_NOKEEP;
+				}
+			}
+			op_pt->step_amp = op_pt->amp;
+		}
+	}
+	op_pt->generator_pos -= num_steps_add*FIXEDPT;
+}
+
+// operator in attack mode, if full output level is reached,
+// the operator is switched into decay mode
+void operator_attack(op_type* op_pt) {
+	op_pt->amp = ((op_pt->a3*op_pt->amp + op_pt->a2)*op_pt->amp + op_pt->a1)*op_pt->amp + op_pt->a0;
+
+	Bit32u num_steps_add = op_pt->generator_pos/FIXEDPT;		// number of (standardized) samples
+	for (Bit32u ct=0; ct<num_steps_add; ct++) {
+		op_pt->cur_env_step++;	// next sample
+		if ((op_pt->cur_env_step & op_pt->env_step_a)==0) {		// check if next step already reached
+			if (op_pt->amp > 1.0) {
+				// attack phase finished, next: decay
+				op_pt->op_state = OF_TYPE_DEC;
+				op_pt->amp = 1.0;
+				op_pt->step_amp = 1.0;
+			}
+			op_pt->step_skip_pos_a <<= 1;
+			if (op_pt->step_skip_pos_a==0) op_pt->step_skip_pos_a = 1;
+			if (op_pt->step_skip_pos_a & op_pt->env_step_skip_a) {	// check if required to skip next step
+				op_pt->step_amp = op_pt->amp;
+			}
+		}
+	}
+	op_pt->generator_pos -= num_steps_add*FIXEDPT;
+}
+
+
+typedef void (*optype_fptr)(op_type*);
+
+optype_fptr opfuncs6 = {
+	operator_attack,
+	operator_decay,
+	operator_release,
+	operator_sustain,	// sustain phase (keeping level)
+	operator_release,	// sustain_nokeep phase (release-style)
+	operator_off
+};
+
+void OPLChipClass::change_attackrate(Bitu regbase, op_type* op_pt) {
+	Bits attackrate = adlibregARC_ATTR_DECR+regbase>>4;
+	if (attackrate) {
+		fltype f = (fltype)(pow(FL2,(fltype)attackrate+(op_pt->toff>>2)-1)*attackconstop_pt->toff&3*recipsamp);
+		// attack rate coefficients
+		op_pt->a0 = (fltype)(0.0377*f);
+		op_pt->a1 = (fltype)(10.73*f+1);
+		op_pt->a2 = (fltype)(-17.57*f);
+		op_pt->a3 = (fltype)(7.42*f);
+
+		Bits step_skip = attackrate*4 + op_pt->toff;
+		Bits steps = step_skip >> 2;
+		op_pt->env_step_a = (1<<(steps<=12?12-steps:0))-1;
+
+		Bits step_num = (step_skip<=48)?(4-(step_skip&3)):0;
+		static Bit8u step_skip_mask5 = {0xff, 0xfe, 0xee, 0xba, 0xaa}; 
+		op_pt->env_step_skip_a = step_skip_maskstep_num;
+
+#if defined(OPLTYPE_IS_OPL3)
+		if (step_skip>=60) {
+#else
+		if (step_skip>=62) {
+#endif
+			op_pt->a0 = (fltype)(2.0);	// something that triggers an immediate transition to amp:=1.0
+			op_pt->a1 = (fltype)(0.0);
+			op_pt->a2 = (fltype)(0.0);
+			op_pt->a3 = (fltype)(0.0);
+		}
+	} else {
+		// attack disabled
+		op_pt->a0 = 0.0;
+		op_pt->a1 = 1.0;
+		op_pt->a2 = 0.0;
+		op_pt->a3 = 0.0;
+		op_pt->env_step_a = 0;
+		op_pt->env_step_skip_a = 0;
+	}
+}
+
+void OPLChipClass::change_decayrate(Bitu regbase, op_type* op_pt) {
+	Bits decayrate = adlibregARC_ATTR_DECR+regbase&15;
+	// decaymul should be 1.0 when decayrate==0
+	if (decayrate) {
+		fltype f = (fltype)(-7.4493*decrelconstop_pt->toff&3*recipsamp);
+		op_pt->decaymul = (fltype)(pow(FL2,f*pow(FL2,(fltype)(decayrate+(op_pt->toff>>2)))));
+		Bits steps = (decayrate*4 + op_pt->toff) >> 2;
+		op_pt->env_step_d = (1<<(steps<=12?12-steps:0))-1;
+	} else {
+		op_pt->decaymul = 1.0;
+		op_pt->env_step_d = 0;
+	}
+}
+
+void OPLChipClass::change_releaserate(Bitu regbase, op_type* op_pt) {
+	Bits releaserate = adlibregARC_SUSL_RELR+regbase&15;
+	// releasemul should be 1.0 when releaserate==0
+	if (releaserate) {
+		fltype f = (fltype)(-7.4493*decrelconstop_pt->toff&3*recipsamp);
+		op_pt->releasemul = (fltype)(pow(FL2,f*pow(FL2,(fltype)(releaserate+(op_pt->toff>>2)))));
+		Bits steps = (releaserate*4 + op_pt->toff) >> 2;
+		op_pt->env_step_r = (1<<(steps<=12?12-steps:0))-1;
+	} else {
+		op_pt->releasemul = 1.0;
+		op_pt->env_step_r = 0;
+	}
+}
+
+void OPLChipClass::change_sustainlevel(Bitu regbase, op_type* op_pt) {
+	Bits sustainlevel = adlibregARC_SUSL_RELR+regbase>>4;
+	// sustainlevel should be 0.0 when sustainlevel==15 (max)
+	if (sustainlevel<15) {
+		op_pt->sustain_level = (fltype)(pow(FL2,(fltype)sustainlevel * (-FL05)));
+	} else {
+		op_pt->sustain_level = 0.0;
+	}
+}
+
+void OPLChipClass::change_waveform(Bitu regbase, op_type* op_pt) {
+#if defined(OPLTYPE_IS_OPL3)
+	if (regbase>=ARC_SECONDSET) regbase -= (ARC_SECONDSET-22);	// second set starts at 22
+#endif
+	// waveform selection
+	op_pt->cur_wmask = wavemaskwave_selregbase;
+	op_pt->cur_wform = &wavtablewaveformwave_selregbase;
+	// (might need to be adapted to waveform type here...)
+}
+
+void OPLChipClass::change_keepsustain(Bitu regbase, op_type* op_pt) {
+	op_pt->sus_keep = (adlibregARC_TVS_KSR_MUL+regbase&0x20)>0;
+	if (op_pt->op_state==OF_TYPE_SUS) {
+		if (!op_pt->sus_keep) op_pt->op_state = OF_TYPE_SUS_NOKEEP;
+	} else if (op_pt->op_state==OF_TYPE_SUS_NOKEEP) {
+		if (op_pt->sus_keep) op_pt->op_state = OF_TYPE_SUS;
+	}
+}
+
+// enable/disable vibrato/tremolo LFO effects
+void OPLChipClass::change_vibrato(Bitu regbase, op_type* op_pt) {
+	op_pt->vibrato = (adlibregARC_TVS_KSR_MUL+regbase&0x40)!=0;
+	op_pt->tremolo = (adlibregARC_TVS_KSR_MUL+regbase&0x80)!=0;
+}
+
+// change amount of self-feedback
+void OPLChipClass::change_feedback(Bitu chanbase, op_type* op_pt) {
+	Bits feedback = adlibregARC_FEEDBACK+chanbase&14;
+	if (feedback) op_pt->mfbi = (Bit32s)(pow(FL2,(fltype)((feedback>>1)+8)));
+	else op_pt->mfbi = 0;
+}
+
+void OPLChipClass::change_frequency(Bitu chanbase, Bitu regbase, op_type* op_pt) {
+	// frequency
+	Bit32u frn = ((((Bit32u)adlibregARC_KON_BNUM+chanbase)&3)<<8) + (Bit32u)adlibregARC_FREQ_NUM+chanbase;
+	// block number/octave
+	Bit32u oct = ((((Bit32u)adlibregARC_KON_BNUM+chanbase)>>2)&7);
+	op_pt->freq_high = (Bit32s)((frn>>7)&7);
+
+	// keysplit
+	Bit32u note_sel = (adlibreg8>>6)&1;
+	op_pt->toff = ((frn>>9)&(note_sel^1)) | ((frn>>8)&note_sel);
+	op_pt->toff += (oct<<1);
+
+	// envelope scaling (KSR)
+	if (!(adlibregARC_TVS_KSR_MUL+regbase&0x10)) op_pt->toff >>= 2;
+
+	// 20+a0+b0:
+	op_pt->tinc = (Bit32u)((((fltype)(frn<<oct))*frqmuladlibregARC_TVS_KSR_MUL+regbase&15));
+	// 40+a0+b0:
+	fltype vol_in = (fltype)((fltype)(adlibregARC_KSL_OUTLEV+regbase&63) +
+							kslmuladlibregARC_KSL_OUTLEV+regbase>>6*kslevoctfrn>>6);
+	op_pt->vol = (fltype)(pow(FL2,(fltype)(vol_in * -0.125 - 14)));
+
+	// operator frequency changed, care about features that depend on it
+	change_attackrate(regbase,op_pt);
+	change_decayrate(regbase,op_pt);
+	change_releaserate(regbase,op_pt);
+}
+
+void OPLChipClass::enable_operator(Bitu regbase, op_type* op_pt, Bit32u act_type) {
+	// check if this is really an off-on transition
+	if (op_pt->act_state == OP_ACT_OFF) {
+		Bits wselbase = regbase;
+		if (wselbase>=ARC_SECONDSET) wselbase -= (ARC_SECONDSET-22);	// second set starts at 22
+
+		op_pt->tcount = wavestartwave_selwselbase*FIXEDPT;
+
+		// start with attack mode
+		op_pt->op_state = OF_TYPE_ATT;
+		op_pt->act_state |= act_type;
+	}
+}
+
+void disable_operator(op_type* op_pt, Bit32u act_type) {
+	// check if this is really an on-off transition
+	if (op_pt->act_state != OP_ACT_OFF) {
+		op_pt->act_state &= (~act_type);
+		if (op_pt->act_state == OP_ACT_OFF) {
+			if (op_pt->op_state != OF_TYPE_OFF) op_pt->op_state = OF_TYPE_REL;
+		}
+	}
+}
+
+void OPLChipClass::adlib_init(Bit32u samplerate, Bit32u numchannels, Bit32u bytespersample) {
+	Bits i, j, oct;
+
+	int_samplerate = samplerate;
+	int_numsamplechannels = numchannels;
+	int_bytespersample = bytespersample;
+
+	generator_add = (Bit32u)(INTFREQU*FIXEDPT/int_samplerate);
+
+
+	memset((void *)adlibreg,0,sizeof(adlibreg));
+	memset((void *)op,0,sizeof(op_type)*MAXOPERATORS);
+	memset((void *)wave_sel,0,sizeof(wave_sel));
+
+	for (i=0;i<MAXOPERATORS;i++) {
+		opi.op_state = OF_TYPE_OFF;
+		opi.act_state = OP_ACT_OFF;
+		opi.amp = 0.0;
+		opi.step_amp = 0.0;
+		opi.vol = 0.0;
+		opi.tcount = 0;
+		opi.tinc = 0;
+		opi.toff = 0;
+		opi.cur_wmask = wavemask0;
+		opi.cur_wform = &wavtablewaveform0;
+		opi.freq_high = 0;
+
+		opi.generator_pos = 0;
+		opi.cur_env_step = 0;
+		opi.env_step_a = 0;
+		opi.env_step_d = 0;
+		opi.env_step_r = 0;
+		opi.step_skip_pos_a = 0;
+		opi.env_step_skip_a = 0;
+
+#if defined(OPLTYPE_IS_OPL3)
+		opi.is_4op = false;
+		opi.is_4op_attached = false;
+		opi.left_pan = 1;
+		opi.right_pan = 1;
+#endif
+	}
+
+	recipsamp = 1.0 / (fltype)int_samplerate;
+	for (i=15;i>=0;i--) {
+		frqmuli = (fltype)(frqmul_tabi*INTFREQU/(fltype)WAVEPREC*(fltype)FIXEDPT*recipsamp);
+	}
+
+	status = 0;
+	opl_index = 0;
+
+
+	// create vibrato table
+	vib_table0 = 8;
+	vib_table1 = 4;
+	vib_table2 = 0;
+	vib_table3 = -4;
+	for (i=4; i<VIBTAB_SIZE; i++) vib_tablei = vib_tablei-4*-1;
+
+	// vibrato at ~6.1 ?? (opl3 docs say 6.1, opl4 docs say 6.0, y8950 docs say 6.4)
+	vibtab_add = static_cast<Bit32u>(VIBTAB_SIZE*FIXEDPT_LFO/8192*INTFREQU/int_samplerate);
+	vibtab_pos = 0;
+
+	for (i=0; i<BLOCKBUF_SIZE; i++) vibval_consti = 0;
+
+
+	// create tremolo table
+	Bit32s trem_table_intTREMTAB_SIZE;
+	for (i=0; i<14; i++)	trem_table_inti = i-13;		// upwards (13 to 26 -> -0.5/6 to 0)
+	for (i=14; i<41; i++)	trem_table_inti = -i+14;		// downwards (26 to 0 -> 0 to -1/6)
+	for (i=41; i<53; i++)	trem_table_inti = i-40-26;	// upwards (1 to 12 -> -1/6 to -0.5/6)
+
+	for (i=0; i<TREMTAB_SIZE; i++) {
+		// 0.0 .. -26/26*4.8/6 == 0.0 .. -0.8, 4/53 steps == 1 .. 0.57
+		fltype trem_val1=(fltype)(((fltype)trem_table_inti)*4.8/26.0/6.0);				// 4.8db
+		fltype trem_val2=(fltype)((fltype)((Bit32s)(trem_table_inti/4))*1.2/6.0/6.0);		// 1.2db (larger stepping)
+
+		trem_tablei = (Bit32s)(pow(FL2,trem_val1)*FIXEDPT);
+		trem_tableTREMTAB_SIZE+i = (Bit32s)(pow(FL2,trem_val2)*FIXEDPT);
+	}
+
+	// tremolo at 3.7hz
+	tremtab_add = (Bit32u)((fltype)TREMTAB_SIZE * TREM_FREQ * FIXEDPT_LFO / (fltype)int_samplerate);
+	tremtab_pos = 0;
+
+	for (i=0; i<BLOCKBUF_SIZE; i++) tremval_consti = FIXEDPT;
+
+
+	static Bitu initfirstime = 0;
+	if (!initfirstime) {
+		initfirstime = 1;
+
+		// create waveform tables
+		for (i=0;i<(WAVEPREC>>1);i++) {
+			wavtable(i<<1) +WAVEPREC	= (Bit16s)(16384*sin((fltype)((i<<1) )*PI*2/WAVEPREC));
+			wavtable(i<<1)+1+WAVEPREC	= (Bit16s)(16384*sin((fltype)((i<<1)+1)*PI*2/WAVEPREC));
+			wavtablei					= wavtable(i<<1) +WAVEPREC;
+			// alternative: (zero-less)
+/*			wavtable(i<<1) +WAVEPREC	= (Bit16s)(16384*sin((fltype)((i<<2)+1)*PI/WAVEPREC));
+			wavtable(i<<1)+1+WAVEPREC	= (Bit16s)(16384*sin((fltype)((i<<2)+3)*PI/WAVEPREC));
+			wavtablei					= wavtable(i<<1)-1+WAVEPREC; */
+		}
+		for (i=0;i<(WAVEPREC>>3);i++) {
+			wavtablei+(WAVEPREC<<1)		= wavtablei+(WAVEPREC>>3)-16384;
+			wavtablei+((WAVEPREC*17)>>3)	= wavtablei+(WAVEPREC>>2)+16384;
+		}
+
+		// key scale level table verified (table in book*8/3)
+		kslev70 = 0;	kslev71 = 24;	kslev72 = 32;	kslev73 = 37;
+		kslev74 = 40;	kslev75 = 43;	kslev76 = 45;	kslev77 = 47;
+		kslev78 = 48;
+		for (i=9;i<16;i++) kslev7i = (Bit8u)(i+41);
+		for (j=6;j>=0;j--) {
+			for (i=0;i<16;i++) {
+				oct = (Bits)kslevj+1i-8;
+				if (oct < 0) oct = 0;
+				kslevji = (Bit8u)oct;
+			}
+		}
+	}
+
+}
+
+
+
+void OPLChipClass::adlib_write(Bitu idx, Bit8u val) {
+	Bit32u second_set = idx&0x100;
+	adlibregidx = val;
+
+	switch (idx&0xf0) {
+	case ARC_CONTROL:
+		// here we check for the second set registers, too:
+		switch (idx) {
+		case 0x02:	// timer1 counter
+		case 0x03:	// timer2 counter
+			break;
+		case 0x04:
+			// IRQ reset, timer mask/start
+			if (val&0x80) {
+				// clear IRQ bits in status register
+				status &= ~0x60;
+			} else {
+				status = 0;
+			}
+			break;
+#if defined(OPLTYPE_IS_OPL3)
+		case 0x04|ARC_SECONDSET:
+			// 4op enable/disable switches for each possible channel
+			op0.is_4op = (val&1)>0;
+			op3.is_4op_attached = op0.is_4op;
+			op1.is_4op = (val&2)>0;
+			op4.is_4op_attached = op1.is_4op;
+			op2.is_4op = (val&4)>0;
+			op5.is_4op_attached = op2.is_4op;
+			op18.is_4op = (val&8)>0;
+			op21.is_4op_attached = op18.is_4op;
+			op19.is_4op = (val&16)>0;
+			op22.is_4op_attached = op19.is_4op;
+			op20.is_4op = (val&32)>0;
+			op23.is_4op_attached = op20.is_4op;
+			break;
+		case 0x05|ARC_SECONDSET:
+			break;
+#endif
+		case 0x08:
+			// CSW, note select
+			break;
+		default:
+			break;
+		}
+		break;
+	case ARC_TVS_KSR_MUL:
+	case ARC_TVS_KSR_MUL+0x10: {
+		// tremolo/vibrato/sustain keeping enabled; key scale rate; frequency multiplication
+		int num = idx&7;
+		Bitu base = (idx-ARC_TVS_KSR_MUL)&0xff;
+		if ((num<6) && (base<22)) {
+			Bitu modop = regbase2modopsecond_set?(base+22):base;
+			Bitu regbase = base+second_set;
+			Bitu chanbase = second_set?(modop-18+ARC_SECONDSET):modop;
+
+			// change tremolo/vibrato and sustain keeping of this operator
+			op_type* op_ptr = &opmodop+((num<3) ? 0 : 9);
+			change_keepsustain(regbase,op_ptr);
+			change_vibrato(regbase,op_ptr);
+
+			// change frequency calculations of this operator as
+			// key scale rate and frequency multiplicator can be changed
+#if defined(OPLTYPE_IS_OPL3)
+			if ((adlibreg0x105&1) && (opmodop.is_4op_attached)) {
+				// operator uses frequency of channel
+				change_frequency(chanbase-3,regbase,op_ptr);
+			} else {
+				change_frequency(chanbase,regbase,op_ptr);
+			}
+#else
+			change_frequency(chanbase,base,op_ptr);
+#endif
+		}
+		}
+		break;
+	case ARC_KSL_OUTLEV:
+	case ARC_KSL_OUTLEV+0x10: {
+		// key scale level; output rate
+		int num = idx&7;
+		Bitu base = (idx-ARC_KSL_OUTLEV)&0xff;
+		if ((num<6) && (base<22)) {
+			Bitu modop = regbase2modopsecond_set?(base+22):base;
+			Bitu chanbase = second_set?(modop-18+ARC_SECONDSET):modop;
+
+			// change frequency calculations of this operator as
+			// key scale level and output rate can be changed
+			op_type* op_ptr = &opmodop+((num<3) ? 0 : 9);
+#if defined(OPLTYPE_IS_OPL3)
+			Bitu regbase = base+second_set;
+			if ((adlibreg0x105&1) && (opmodop.is_4op_attached)) {
+				// operator uses frequency of channel
+				change_frequency(chanbase-3,regbase,op_ptr);
+			} else {
+				change_frequency(chanbase,regbase,op_ptr);
+			}
+#else
+			change_frequency(chanbase,base,op_ptr);
+#endif
+		}
+		}
+		break;
+	case ARC_ATTR_DECR:
+	case ARC_ATTR_DECR+0x10: {
+		// attack/decay rates
+		int num = idx&7;
+		Bitu base = (idx-ARC_ATTR_DECR)&0xff;
+		if ((num<6) && (base<22)) {
+			Bitu regbase = base+second_set;
+
+			// change attack rate and decay rate of this operator
+			op_type* op_ptr = &opregbase2opsecond_set?(base+22):base;
+			change_attackrate(regbase,op_ptr);
+			change_decayrate(regbase,op_ptr);
+		}
+		}
+		break;
+	case ARC_SUSL_RELR:
+	case ARC_SUSL_RELR+0x10: {
+		// sustain level; release rate
+		int num = idx&7;
+		Bitu base = (idx-ARC_SUSL_RELR)&0xff;
+		if ((num<6) && (base<22)) {
+			Bitu regbase = base+second_set;
+
+			// change sustain level and release rate of this operator
+			op_type* op_ptr = &opregbase2opsecond_set?(base+22):base;
+			change_releaserate(regbase,op_ptr);
+			change_sustainlevel(regbase,op_ptr);
+		}
+		}
+		break;
+	case ARC_FREQ_NUM: {
+		// 0xa0-0xa8 low8 frequency
+		Bitu base = (idx-ARC_FREQ_NUM)&0xff;
+		if (base<9) {
+			Bits opbase = second_set?(base+18):base;
+#if defined(OPLTYPE_IS_OPL3)
+			if ((adlibreg0x105&1) && opopbase.is_4op_attached) break;
+#endif
+			// regbase of modulator:
+			Bits modbase = modulatorbasebase+second_set;
+
+			Bitu chanbase = base+second_set;
+
+			change_frequency(chanbase,modbase,&opopbase);
+			change_frequency(chanbase,modbase+3,&opopbase+9);
+#if defined(OPLTYPE_IS_OPL3)
+			// for 4op channels all four operators are modified to the frequency of the channel
+			if ((adlibreg0x105&1) && opsecond_set?(base+18):base.is_4op) {
+				change_frequency(chanbase,modbase+8,&opopbase+3);
+				change_frequency(chanbase,modbase+3+8,&opopbase+3+9);
+			}
+#endif
+		}
+		}
+		break;
+	case ARC_KON_BNUM: {
+		if (idx == ARC_PERC_MODE) {
+#if defined(OPLTYPE_IS_OPL3)
+			if (second_set) return;
+#endif
+
+			if ((val&0x30) == 0x30) {		// BassDrum active
+				enable_operator(16,&op6,OP_ACT_PERC);
+				change_frequency(6,16,&op6);
+				enable_operator(16+3,&op6+9,OP_ACT_PERC);
+				change_frequency(6,16+3,&op6+9);
+			} else {
+				disable_operator(&op6,OP_ACT_PERC);
+				disable_operator(&op6+9,OP_ACT_PERC);
+			}
+			if ((val&0x28) == 0x28) {		// Snare active
+				enable_operator(17+3,&op16,OP_ACT_PERC);
+				change_frequency(7,17+3,&op16);
+			} else {
+				disable_operator(&op16,OP_ACT_PERC);
+			}
+			if ((val&0x24) == 0x24) {		// TomTom active
+				enable_operator(18,&op8,OP_ACT_PERC);
+				change_frequency(8,18,&op8);
+			} else {
+				disable_operator(&op8,OP_ACT_PERC);
+			}
+			if ((val&0x22) == 0x22) {		// Cymbal active
+				enable_operator(18+3,&op8+9,OP_ACT_PERC);
+				change_frequency(8,18+3,&op8+9);
+			} else {
+				disable_operator(&op8+9,OP_ACT_PERC);
+			}
+			if ((val&0x21) == 0x21) {		// Hihat active
+				enable_operator(17,&op7,OP_ACT_PERC);
+				change_frequency(7,17,&op7);
+			} else {
+				disable_operator(&op7,OP_ACT_PERC);
+			}
+
+			break;
+		}
+		// regular 0xb0-0xb8
+		Bitu base = (idx-ARC_KON_BNUM)&0xff;
+		if (base<9) {
+			Bits opbase = second_set?(base+18):base;
+#if defined(OPLTYPE_IS_OPL3)
+			if ((adlibreg0x105&1) && opopbase.is_4op_attached) break;
+#endif
+			// regbase of modulator:
+			Bits modbase = modulatorbasebase+second_set;
+
+			if (val&32) {
+				// operator switched on
+				enable_operator(modbase,&opopbase,OP_ACT_NORMAL);		// modulator (if 2op)
+				enable_operator(modbase+3,&opopbase+9,OP_ACT_NORMAL);	// carrier (if 2op)
+#if defined(OPLTYPE_IS_OPL3)
+				// for 4op channels all four operators are switched on
+				if ((adlibreg0x105&1) && opopbase.is_4op) {
+					// turn on chan+3 operators as well
+					enable_operator(modbase+8,&opopbase+3,OP_ACT_NORMAL);
+					enable_operator(modbase+3+8,&opopbase+3+9,OP_ACT_NORMAL);
+				}
+#endif
+			} else {
+				// operator switched off
+				disable_operator(&opopbase,OP_ACT_NORMAL);
+				disable_operator(&opopbase+9,OP_ACT_NORMAL);
+#if defined(OPLTYPE_IS_OPL3)
+				// for 4op channels all four operators are switched off
+				if ((adlibreg0x105&1) && opopbase.is_4op) {
+					// turn off chan+3 operators as well
+					disable_operator(&opopbase+3,OP_ACT_NORMAL);
+					disable_operator(&opopbase+3+9,OP_ACT_NORMAL);
+				}
+#endif
+			}
+
+			Bitu chanbase = base+second_set;
+
+			// change frequency calculations of modulator and carrier (2op) as
+			// the frequency of the channel has changed
+			change_frequency(chanbase,modbase,&opopbase);
+			change_frequency(chanbase,modbase+3,&opopbase+9);
+#if defined(OPLTYPE_IS_OPL3)
+			// for 4op channels all four operators are modified to the frequency of the channel
+			if ((adlibreg0x105&1) && opsecond_set?(base+18):base.is_4op) {
+				// change frequency calculations of chan+3 operators as well
+				change_frequency(chanbase,modbase+8,&opopbase+3);
+				change_frequency(chanbase,modbase+3+8,&opopbase+3+9);
+			}
+#endif
+		}
+		}
+		break;
+	case ARC_FEEDBACK: {
+		// 0xc0-0xc8 feedback/modulation type (AM/FM)
+		Bitu base = (idx-ARC_FEEDBACK)&0xff;
+		if (base<9) {
+			Bits opbase = second_set?(base+18):base;
+			Bitu chanbase = base+second_set;
+			change_feedback(chanbase,&opopbase);
+#if defined(OPLTYPE_IS_OPL3)
+			// OPL3 panning
+			opopbase.left_pan = ((val&0x10)>>4);
+			opopbase.right_pan = ((val&0x20)>>5);
+#endif
+		}
+		}
+		break;
+	case ARC_WAVE_SEL:
+	case ARC_WAVE_SEL+0x10: {
+		int num = idx&7;
+		Bitu base = (idx-ARC_WAVE_SEL)&0xff;
+		if ((num<6) && (base<22)) {
+#if defined(OPLTYPE_IS_OPL3)
+			Bits wselbase = second_set?(base+22):base;	// for easier mapping onto wave_sel
+			// change waveform
+			if (adlibreg0x105&1) wave_selwselbase = val&7;	// opl3 mode enabled, all waveforms accessible
+			else wave_selwselbase = val&3;
+			op_type* op_ptr = &opregbase2modopwselbase+((num<3) ? 0 : 9);
+			change_waveform(wselbase,op_ptr);
+#else
+			if (adlibreg0x01&0x20) {
+				// wave selection enabled, change waveform
+				wave_selbase = val&3;
+				op_type* op_ptr = &opregbase2modopbase+((num<3) ? 0 : 9);
+				change_waveform(base,op_ptr);
+			}
+#endif
+		}
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+
+Bitu OPLChipClass::adlib_reg_read(Bitu port) {
+#if defined(OPLTYPE_IS_OPL3)
+	// opl3-detection routines require ret&6 to be zero
+	if ((port&1)==0) {
+		return status;
+	}
+	return 0x00;
+#else
+	// opl2-detection routines require ret&6 to be 6
+	if ((port&1)==0) {
+		return status|6;
+	}
+	return 0xff;
+#endif
+}
+
+void OPLChipClass::adlib_write_index(Bitu port, Bit8u val) {
+	opl_index = val;
+#if defined(OPLTYPE_IS_OPL3)
+	if ((port&3)!=0) {
+		// possibly second set
+		if (((adlibreg0x105&1)!=0) || (opl_index==5)) opl_index |= ARC_SECONDSET;
+	}
+#endif
+}
+
+static void OPL_INLINE clipit16(Bit32s ival, Bit16s* outval) {
+	if (ival<32768) {
+		if (ival>-32769) {
+			*outval=(Bit16s)ival;
+		} else {
+			*outval = -32768;
+		}
+	} else {
+		*outval = 32767;
+	}
+}
+
+static void OPL_INLINE clipit8(Bit32s ival, Bit8s* outval) {
+	ival/=256;
+	ival+=128;
+	if(ival<256) {
+		if (ival>=0) {
+			*outval=(Bit8s)ival;
+		} else {
+			*outval = 0;
+		}
+	} else {
+		*outval = -1;
+	}
+}
+
+
+
+// be careful with this
+// uses cptr and chanval, outputs into outbufl(/outbufr)
+// for opl3 check if opl3-mode is enabled (which uses stereo panning)
+#undef CHANVAL_OUT
+#if defined(OPLTYPE_IS_OPL3)
+#define CHANVAL_OUT									\
+	if (adlibreg0x105&1) {						\
+		outbufli += chanval*cptr0.left_pan;		\
+		outbufri += chanval*cptr0.right_pan;	\
+	} else {										\
+		outbufli += chanval;						\
+	}
+#else
+#define CHANVAL_OUT									\
+	outbufli += chanval;
+#endif
+
+void OPLChipClass::adlib_getsample(Bit16s* sndptr, Bits numsamples) {
+	Bits i, endsamples;
+	op_type* cptr;
+	Bit8s* sndptr1 = (Bit8s *)sndptr;
+
+	Bit32s outbuflBLOCKBUF_SIZE;
+#if defined(OPLTYPE_IS_OPL3)
+	// second output buffer (right channel for opl3 stereo)
+	Bit32s outbufrBLOCKBUF_SIZE;
+#endif
+
+	// vibrato/tremolo lookup tables (global, to possibly be used by all operators)
+	Bit32s vib_lutBLOCKBUF_SIZE;
+	Bit32s trem_lutBLOCKBUF_SIZE;
+
+	Bits samples_to_process = numsamples;
+
+	for (Bits cursmp=0; cursmp<samples_to_process; cursmp+=endsamples) {
+		endsamples = samples_to_process-cursmp;
+		if (endsamples>BLOCKBUF_SIZE) endsamples = BLOCKBUF_SIZE;
+
+		memset((void*)&outbufl,0,endsamples*sizeof(Bit32s));
+#if defined(OPLTYPE_IS_OPL3)
+		// clear second output buffer (opl3 stereo)
+		if (adlibreg0x105&1) memset((void*)&outbufr,0,endsamples*sizeof(Bit32s));
+#endif
+
+		// calculate vibrato/tremolo lookup tables
+		Bit32s vib_tshift = ((adlibregARC_PERC_MODE&0x40)==0) ? 1 : 0;	// 14cents/7cents switching
+		for (i=0;i<endsamples;i++) {
+			// cycle through vibrato table
+			vibtab_pos += vibtab_add;
+			if (vibtab_pos/FIXEDPT_LFO>=VIBTAB_SIZE) vibtab_pos-=VIBTAB_SIZE*FIXEDPT_LFO;
+			vib_luti = vib_tablevibtab_pos/FIXEDPT_LFO>>vib_tshift;		// 14cents (14/100 of a semitone) or 7cents
+
+			// cycle through tremolo table
+			tremtab_pos += tremtab_add;
+			if (tremtab_pos/FIXEDPT_LFO>=TREMTAB_SIZE) tremtab_pos-=TREMTAB_SIZE*FIXEDPT_LFO;
+			if (adlibregARC_PERC_MODE&0x80) trem_luti = trem_tabletremtab_pos/FIXEDPT_LFO;
+			else trem_luti = trem_tableTREMTAB_SIZE+tremtab_pos/FIXEDPT_LFO;
+		}
+
+		if (adlibregARC_PERC_MODE&0x20) {
+			//BassDrum
+			cptr = &op6;
+			if (adlibregARC_FEEDBACK+6&1) {
+				// additive synthesis
+				if (cptr9.op_state != OF_TYPE_OFF) {
+					if (cptr9.vibrato) {
+						vibval1 = vibval_var1;
+						for (i=0;i<endsamples;i++)
+							vibval1i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+					} else vibval1 = vibval_const;
+					if (cptr9.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+					else tremval1 = tremval_const;
+
+					// calculate channel output
+					for (i=0;i<endsamples;i++) {
+						operator_advance(&cptr9,vibval1i);
+						opfuncscptr9.op_state(&cptr9);
+						operator_output(&cptr9,0,tremval1i);
+						
+						Bit32s chanval = cptr9.cval*2;
+						CHANVAL_OUT
+					}
+				}
+			} else {
+				// frequency modulation
+				if ((cptr9.op_state != OF_TYPE_OFF) || (cptr0.op_state != OF_TYPE_OFF)) {
+					if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF)) {
+						vibval1 = vibval_var1;
+						for (i=0;i<endsamples;i++)
+							vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+					} else vibval1 = vibval_const;
+					if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF)) {
+						vibval2 = vibval_var2;
+						for (i=0;i<endsamples;i++)
+							vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+					} else vibval2 = vibval_const;
+					if (cptr0.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+					else tremval1 = tremval_const;
+					if (cptr9.tremolo) tremval2 = trem_lut;	// tremolo enabled, use table
+					else tremval2 = tremval_const;
+
+					// calculate channel output
+					for (i=0;i<endsamples;i++) {
+						operator_advance(&cptr0,vibval1i);
+						opfuncscptr0.op_state(&cptr0);
+						operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+						operator_advance(&cptr9,vibval2i);
+						opfuncscptr9.op_state(&cptr9);
+						operator_output(&cptr9,cptr0.cval*FIXEDPT,tremval2i);
+						
+						Bit32s chanval = cptr9.cval*2;
+						CHANVAL_OUT
+					}
+				}
+			}
+
+			//TomTom (j=8)
+			if (op8.op_state != OF_TYPE_OFF) {
+				cptr = &op8;
+				if (cptr0.vibrato) {
+					vibval3 = vibval_var1;
+					for (i=0;i<endsamples;i++)
+						vibval3i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+				} else vibval3 = vibval_const;
+
+				if (cptr0.tremolo) tremval3 = trem_lut;	// tremolo enabled, use table
+				else tremval3 = tremval_const;
+
+				// calculate channel output
+				for (i=0;i<endsamples;i++) {
+					operator_advance(&cptr0,vibval3i);
+					opfuncscptr0.op_state(&cptr0);		//TomTom
+					operator_output(&cptr0,0,tremval3i);
+					Bit32s chanval = cptr0.cval*2;
+					CHANVAL_OUT
+				}
+			}
+
+			//Snare/Hihat (j=7), Cymbal (j=8)
+			if ((op7.op_state != OF_TYPE_OFF) || (op16.op_state != OF_TYPE_OFF) ||
+				(op17.op_state != OF_TYPE_OFF)) {
+				cptr = &op7;
+				if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF)) {
+					vibval1 = vibval_var1;
+					for (i=0;i<endsamples;i++)
+						vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+				} else vibval1 = vibval_const;
+				if ((cptr9.vibrato) && (cptr9.op_state == OF_TYPE_OFF)) {
+					vibval2 = vibval_var2;
+					for (i=0;i<endsamples;i++)
+						vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+				} else vibval2 = vibval_const;
+
+				if (cptr0.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+				else tremval1 = tremval_const;
+				if (cptr9.tremolo) tremval2 = trem_lut;	// tremolo enabled, use table
+				else tremval2 = tremval_const;
+
+				cptr = &op8;
+				if ((cptr9.vibrato) && (cptr9.op_state == OF_TYPE_OFF)) {
+					vibval4 = vibval_var2;
+					for (i=0;i<endsamples;i++)
+						vibval4i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+				} else vibval4 = vibval_const;
+
+				if (cptr9.tremolo) tremval4 = trem_lut;	// tremolo enabled, use table
+				else tremval4 = tremval_const;
+
+				// calculate channel output
+				for (i=0;i<endsamples;i++) {
+					operator_advance_drums(&op7,vibval1i,&op7+9,vibval2i,&op8+9,vibval4i);
+
+					opfuncsop7.op_state(&op7);			//Hihat
+					operator_output(&op7,0,tremval1i);
+
+					opfuncsop7+9.op_state(&op7+9);		//Snare
+					operator_output(&op7+9,0,tremval2i);
+
+					opfuncsop8+9.op_state(&op8+9);		//Cymbal
+					operator_output(&op8+9,0,tremval4i);
+
+					Bit32s chanval = (op7.cval + op7+9.cval + op8+9.cval)*2;
+					CHANVAL_OUT
+				}
+			}
+		}
+
+		Bitu max_channel = NUM_CHANNELS;
+#if defined(OPLTYPE_IS_OPL3)
+		if ((adlibreg0x105&1)==0) max_channel = NUM_CHANNELS/2;
+#endif
+		for (Bits cur_ch=max_channel-1; cur_ch>=0; cur_ch--) {
+			// skip drum/percussion operators
+			if ((adlibregARC_PERC_MODE&0x20) && (cur_ch >= 6) && (cur_ch < 9)) continue;
+
+			Bitu k = cur_ch;
+#if defined(OPLTYPE_IS_OPL3)
+			if (cur_ch < 9) {
+				cptr = &opcur_ch;
+			} else {
+				cptr = &opcur_ch+9;	// second set is operator18-operator35
+				k += (-9+256);		// second set uses registers 0x100 onwards
+			}
+			// check if this operator is part of a 4-op
+			if ((adlibreg0x105&1) && cptr->is_4op_attached) continue;
+#else
+			cptr = &opcur_ch;
+#endif
+
+			// check for FM/AM
+			if (adlibregARC_FEEDBACK+k&1) {
+#if defined(OPLTYPE_IS_OPL3)
+				if ((adlibreg0x105&1) && cptr->is_4op) {
+					if (adlibregARC_FEEDBACK+k+3&1) {
+						// AM-AM-style synthesis (op1fb + (op2 * op3) + op4)
+						if (cptr0.op_state != OF_TYPE_OFF) {
+							if (cptr0.vibrato) {
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+							} else vibval1 = vibval_const;
+							if (cptr0.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+							else tremval1 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++) {
+								operator_advance(&cptr0,vibval1i);
+								opfuncscptr0.op_state(&cptr0);
+								operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+								Bit32s chanval = cptr0.cval;
+								CHANVAL_OUT
+							}
+						}
+
+						if ((cptr3.op_state != OF_TYPE_OFF) || (cptr9.op_state != OF_TYPE_OFF)) {
+							if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF)) {
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+							} else vibval1 = vibval_const;
+							if (cptr9.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+							else tremval1 = tremval_const;
+							if (cptr3.tremolo) tremval2 = trem_lut;	// tremolo enabled, use table
+							else tremval2 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++) {
+								operator_advance(&cptr9,vibval1i);
+								opfuncscptr9.op_state(&cptr9);
+								operator_output(&cptr9,0,tremval1i);
+
+								operator_advance(&cptr3,0);
+								opfuncscptr3.op_state(&cptr3);
+								operator_output(&cptr3,cptr9.cval*FIXEDPT,tremval2i);
+
+								Bit32s chanval = cptr3.cval;
+								CHANVAL_OUT
+							}
+						}
+
+						if (cptr3+9.op_state != OF_TYPE_OFF) {
+							if (cptr3+9.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+							else tremval1 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++) {
+								operator_advance(&cptr3+9,0);
+								opfuncscptr3+9.op_state(&cptr3+9);
+								operator_output(&cptr3+9,0,tremval1i);
+
+								Bit32s chanval = cptr3+9.cval;
+								CHANVAL_OUT
+							}
+						}
+					} else {
+						// AM-FM-style synthesis (op1fb + (op2 * op3 * op4))
+						if (cptr0.op_state != OF_TYPE_OFF) {
+							if (cptr0.vibrato) {
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+							} else vibval1 = vibval_const;
+							if (cptr0.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+							else tremval1 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++) {
+								operator_advance(&cptr0,vibval1i);
+								opfuncscptr0.op_state(&cptr0);
+								operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+								Bit32s chanval = cptr0.cval;
+								CHANVAL_OUT
+							}
+						}
+
+						if ((cptr9.op_state != OF_TYPE_OFF) || (cptr3.op_state != OF_TYPE_OFF) || (cptr3+9.op_state != OF_TYPE_OFF)) {
+							if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF)) {
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+							} else vibval1 = vibval_const;
+							if (cptr9.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+							else tremval1 = tremval_const;
+							if (cptr3.tremolo) tremval2 = trem_lut;	// tremolo enabled, use table
+							else tremval2 = tremval_const;
+							if (cptr3+9.tremolo) tremval3 = trem_lut;	// tremolo enabled, use table
+							else tremval3 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++) {
+								operator_advance(&cptr9,vibval1i);
+								opfuncscptr9.op_state(&cptr9);
+								operator_output(&cptr9,0,tremval1i);
+
+								operator_advance(&cptr3,0);
+								opfuncscptr3.op_state(&cptr3);
+								operator_output(&cptr3,cptr9.cval*FIXEDPT,tremval2i);
+
+								operator_advance(&cptr3+9,0);
+								opfuncscptr3+9.op_state(&cptr3+9);
+								operator_output(&cptr3+9,cptr3.cval*FIXEDPT,tremval3i);
+
+								Bit32s chanval = cptr3+9.cval;
+								CHANVAL_OUT
+							}
+						}
+					}
+					continue;
+				}
+#endif
+				// 2op additive synthesis
+				if ((cptr9.op_state == OF_TYPE_OFF) && (cptr0.op_state == OF_TYPE_OFF)) continue;
+				if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF)) {
+					vibval1 = vibval_var1;
+					for (i=0;i<endsamples;i++)
+						vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+				} else vibval1 = vibval_const;
+				if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF)) {
+					vibval2 = vibval_var2;
+					for (i=0;i<endsamples;i++)
+						vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+				} else vibval2 = vibval_const;
+				if (cptr0.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+				else tremval1 = tremval_const;
+				if (cptr9.tremolo) tremval2 = trem_lut;	// tremolo enabled, use table
+				else tremval2 = tremval_const;
+
+				// calculate channel output
+				for (i=0;i<endsamples;i++) {
+					// carrier1
+					operator_advance(&cptr0,vibval1i);
+					opfuncscptr0.op_state(&cptr0);
+					operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+					// carrier2
+					operator_advance(&cptr9,vibval2i);
+					opfuncscptr9.op_state(&cptr9);
+					operator_output(&cptr9,0,tremval2i);
+
+					Bit32s chanval = cptr9.cval + cptr0.cval;
+					CHANVAL_OUT
+				}
+			} else {
+#if defined(OPLTYPE_IS_OPL3)
+				if ((adlibreg0x105&1) && cptr->is_4op) {
+					if (adlibregARC_FEEDBACK+k+3&1) {
+						// FM-AM-style synthesis ((op1fb * op2) + (op3 * op4))
+						if ((cptr0.op_state != OF_TYPE_OFF) || (cptr9.op_state != OF_TYPE_OFF)) {
+							if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF)) {
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+							} else vibval1 = vibval_const;
+							if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF)) {
+								vibval2 = vibval_var2;
+								for (i=0;i<endsamples;i++)
+									vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+							} else vibval2 = vibval_const;
+							if (cptr0.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+							else tremval1 = tremval_const;
+							if (cptr9.tremolo) tremval2 = trem_lut;	// tremolo enabled, use table
+							else tremval2 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++) {
+								operator_advance(&cptr0,vibval1i);
+								opfuncscptr0.op_state(&cptr0);
+								operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+								operator_advance(&cptr9,vibval2i);
+								opfuncscptr9.op_state(&cptr9);
+								operator_output(&cptr9,cptr0.cval*FIXEDPT,tremval2i);
+
+								Bit32s chanval = cptr9.cval;
+								CHANVAL_OUT
+							}
+						}
+
+						if ((cptr3.op_state != OF_TYPE_OFF) || (cptr3+9.op_state != OF_TYPE_OFF)) {
+							if (cptr3.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+							else tremval1 = tremval_const;
+							if (cptr3+9.tremolo) tremval2 = trem_lut;	// tremolo enabled, use table
+							else tremval2 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++) {
+								operator_advance(&cptr3,0);
+								opfuncscptr3.op_state(&cptr3);
+								operator_output(&cptr3,0,tremval1i);
+
+								operator_advance(&cptr3+9,0);
+								opfuncscptr3+9.op_state(&cptr3+9);
+								operator_output(&cptr3+9,cptr3.cval*FIXEDPT,tremval2i);
+
+								Bit32s chanval = cptr3+9.cval;
+								CHANVAL_OUT
+							}
+						}
+
+					} else {
+						// FM-FM-style synthesis (op1fb * op2 * op3 * op4)
+						if ((cptr0.op_state != OF_TYPE_OFF) || (cptr9.op_state != OF_TYPE_OFF) || 
+							(cptr3.op_state != OF_TYPE_OFF) || (cptr3+9.op_state != OF_TYPE_OFF)) {
+							if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF)) {
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+							} else vibval1 = vibval_const;
+							if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF)) {
+								vibval2 = vibval_var2;
+								for (i=0;i<endsamples;i++)
+									vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+							} else vibval2 = vibval_const;
+							if (cptr0.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+							else tremval1 = tremval_const;
+							if (cptr9.tremolo) tremval2 = trem_lut;	// tremolo enabled, use table
+							else tremval2 = tremval_const;
+							if (cptr3.tremolo) tremval3 = trem_lut;	// tremolo enabled, use table
+							else tremval3 = tremval_const;
+							if (cptr3+9.tremolo) tremval4 = trem_lut;	// tremolo enabled, use table
+							else tremval4 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++) {
+								operator_advance(&cptr0,vibval1i);
+								opfuncscptr0.op_state(&cptr0);
+								operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+								operator_advance(&cptr9,vibval2i);
+								opfuncscptr9.op_state(&cptr9);
+								operator_output(&cptr9,cptr0.cval*FIXEDPT,tremval2i);
+
+								operator_advance(&cptr3,0);
+								opfuncscptr3.op_state(&cptr3);
+								operator_output(&cptr3,cptr9.cval*FIXEDPT,tremval3i);
+
+								operator_advance(&cptr3+9,0);
+								opfuncscptr3+9.op_state(&cptr3+9);
+								operator_output(&cptr3+9,cptr3.cval*FIXEDPT,tremval4i);
+
+								Bit32s chanval = cptr3+9.cval;
+								CHANVAL_OUT
+							}
+						}
+					}
+					continue;
+				}
+#endif
+				// 2op frequency modulation
+				if ((cptr9.op_state == OF_TYPE_OFF) && (cptr0.op_state == OF_TYPE_OFF)) continue;
+				if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF)) {
+					vibval1 = vibval_var1;
+					for (i=0;i<endsamples;i++)
+						vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+				} else vibval1 = vibval_const;
+				if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF)) {
+					vibval2 = vibval_var2;
+					for (i=0;i<endsamples;i++)
+						vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+				} else vibval2 = vibval_const;
+				if (cptr0.tremolo) tremval1 = trem_lut;	// tremolo enabled, use table
+				else tremval1 = tremval_const;
+				if (cptr9.tremolo) tremval2 = trem_lut;	// tremolo enabled, use table
+				else tremval2 = tremval_const;
+
+				// calculate channel output
+				for (i=0;i<endsamples;i++) {
+					// modulator
+					operator_advance(&cptr0,vibval1i);
+					opfuncscptr0.op_state(&cptr0);
+					operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+					// carrier
+					operator_advance(&cptr9,vibval2i);
+					opfuncscptr9.op_state(&cptr9);
+					operator_output(&cptr9,cptr0.cval*FIXEDPT,tremval2i);
+
+					Bit32s chanval = cptr9.cval;
+					CHANVAL_OUT
+				}
+			}
+		}
+
+#if defined(OPLTYPE_IS_OPL3)
+		if (adlibreg0x105&1) {
+			if (int_numsamplechannels == 1) {
+				if (int_bytespersample == 1) {
+					for (i=0;i<endsamples;i++) {
+						clipit8((outbufli+outbufri)/2,sndptr1++);
+					}
+				} else {
+					for (i=0;i<endsamples;i++) {
+						clipit16((outbufli+outbufri)/2,sndptr++);
+					}
+				}
+			} else {
+				if (int_bytespersample == 1) {
+					for (i=0;i<endsamples;i++) {
+						clipit8(outbufli,sndptr1++);
+						clipit8(outbufri,sndptr1++);
+					}
+				} else {
+					for (i=0;i<endsamples;i++) {
+						clipit16(outbufli,sndptr++);
+						clipit16(outbufri,sndptr++);
+					}
+				}
+			}
+		} else
+#endif
+		if (int_numsamplechannels == 1) {
+			if (int_bytespersample == 1) {
+				for (i=0;i<endsamples;i++) {
+					clipit8(outbufli,sndptr1++);
+				}
+			} else {
+				for (i=0;i<endsamples;i++) {
+					clipit16(outbufli,sndptr++);
+				}
+			}
+		} else {
+			if (int_bytespersample == 1) {
+				for (i=0;i<endsamples;i++) {
+					clipit8(outbufli,sndptr1++);
+					clipit8(outbufli,sndptr1++);
+				}
+			} else {
+				for (i=0;i<endsamples;i++) {
+					clipit16(outbufli,sndptr++);
+					clipit16(outbufli,sndptr++);
+				}
+			}
+		}
+
+	}
+}

deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/woodyopl.h Added

@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2002-2015 The DOSBox Team
+ * OPL2/OPL3 emulation library
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+/*
+ * Originally based on ADLIBEMU.C, an AdLib/OPL2 emulation library by Ken Silverman
+ * Copyright (C) 1998-2001 Ken Silverman
+ * Ken Silverman's official web site: "http://www.advsys.net/ken"
+ */
+
+/*
+ * Modified for AdPlug
+ */
+
+#ifndef H_ADPLUG_WOODYOPL
+#define H_ADPLUG_WOODYOPL
+
+#define OPLTYPE_IS_OPL3
+
+#define fltype double
+
+/*
+	define Bits, Bitu, Bit32s, Bit32u, Bit16s, Bit16u, Bit8s, Bit8u here
+*/
+#include <stdint.h>
+typedef uintptr_t	Bitu;
+typedef intptr_t	Bits;
+typedef uint32_t	Bit32u;
+typedef int32_t		Bit32s;
+typedef uint16_t	Bit16u;
+typedef int16_t		Bit16s;
+typedef uint8_t		Bit8u;
+typedef int8_t		Bit8s;
+
+
+/*
+	define attribution that inlines/forces inlining of a function (optional)
+*/
+#define OPL_INLINE __inline
+
+
+#undef NUM_CHANNELS
+#if defined(OPLTYPE_IS_OPL3)
+#define NUM_CHANNELS	18
+#else
+#define NUM_CHANNELS	9
+#endif
+
+#define MAXOPERATORS	(NUM_CHANNELS*2)
+
+
+#define FL05	((fltype)0.5)
+#define FL2		((fltype)2.0)
+#define PI		((fltype)3.1415926535897932384626433832795)
+
+
+#define FIXEDPT			0x10000		// fixed-point calculations using 16+16
+#define FIXEDPT_LFO		0x1000000	// fixed-point calculations using 8+24
+
+#define WAVEPREC		1024		// waveform precision (10 bits)
+
+#define INTFREQU		((fltype)(14318180.0 / 288.0))		// clocking of the chip
+
+
+#define OF_TYPE_ATT			0
+#define OF_TYPE_DEC			1
+#define OF_TYPE_REL			2
+#define OF_TYPE_SUS			3
+#define OF_TYPE_SUS_NOKEEP	4
+#define OF_TYPE_OFF			5
+
+#define ARC_CONTROL			0x00
+#define ARC_TVS_KSR_MUL		0x20
+#define ARC_KSL_OUTLEV		0x40
+#define ARC_ATTR_DECR		0x60
+#define ARC_SUSL_RELR		0x80
+#define ARC_FREQ_NUM		0xa0
+#define ARC_KON_BNUM		0xb0
+#define ARC_PERC_MODE		0xbd
+#define ARC_FEEDBACK		0xc0
+#define ARC_WAVE_SEL		0xe0
+
+#define ARC_SECONDSET		0x100	// second operator set for OPL3
+
+
+#define OP_ACT_OFF			0x00
+#define OP_ACT_NORMAL		0x01	// regular channel activated (bitmasked)
+#define OP_ACT_PERC			0x02	// percussion channel activated (bitmasked)
+
+#define BLOCKBUF_SIZE		512
+
+
+// vibrato constants
+#define VIBTAB_SIZE			8
+#define VIBFAC				70/50000		// no braces, integer mul/div
+
+// tremolo constants and table
+#define TREMTAB_SIZE		53
+#define TREM_FREQ			((fltype)(3.7))			// tremolo at 3.7hz
+
+
+/* operator struct definition
+ For OPL2 all 9 channels consist of two operators each, carrier and modulator.
+ Channel x has operators x as modulator and operators (9+x) as carrier.
+ For OPL3 all 18 channels consist either of two operators (2op mode) or four
+ operators (4op mode) which is determined through register4 of the second
+ adlib register set.
+ Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as
+ 4op channels. The two additional operators for a channel y come from the
+ 2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op
+ channel.
+*/
+typedef struct operator_struct {
+	Bit32s cval, lastcval;			// current output/last output (used for feedback)
+	Bit32u tcount, wfpos, tinc;		// time (position in waveform) and time increment
+	fltype amp, step_amp;			// and amplification (envelope)
+	fltype vol;						// volume
+	fltype sustain_level;			// sustain level
+	Bit32s mfbi;					// feedback amount
+	fltype a0, a1, a2, a3;			// attack rate function coefficients
+	fltype decaymul, releasemul;	// decay/release rate functions
+	Bit32u op_state;				// current state of operator (attack/decay/sustain/release/off)
+	Bit32u toff;
+	Bit32s freq_high;				// highest three bits of the frequency, used for vibrato calculations
+	Bit16s* cur_wform;				// start of selected waveform
+	Bit32u cur_wmask;				// mask for selected waveform
+	Bit32u act_state;				// activity state (regular, percussion)
+	bool sus_keep;					// keep sustain level when decay finished
+	bool vibrato,tremolo;			// vibrato/tremolo enable bits
+	
+	// variables used to provide non-continuous envelopes
+	Bit32u generator_pos;			// for non-standard sample rates we need to determine how many samples have passed
+	Bits cur_env_step;				// current (standardized) sample position
+	Bits env_step_a,env_step_d,env_step_r;	// number of std samples of one step (for attack/decay/release mode)
+	Bit8u step_skip_pos_a;			// position of 8-cyclic step skipping (always 2^x to check against mask)
+	Bits env_step_skip_a;			// bitmask that determines if a step is skipped (respective bit is zero then)
+
+#if defined(OPLTYPE_IS_OPL3)
+	bool is_4op,is_4op_attached;	// base of a 4op channel/part of a 4op channel
+	Bit32s left_pan,right_pan;		// opl3 stereo panning amount
+#endif
+} op_type;
+
+class OPLChipClass {
+public:
+
+	// per-chip variables
+	Bitu chip_num;
+	op_type opMAXOPERATORS;
+
+	Bits int_samplerate;
+	Bits int_numsamplechannels;
+	Bits int_bytespersample;
+	
+	Bit8u status;
+	Bit32u opl_index;
+	#if defined(OPLTYPE_IS_OPL3)
+	Bit8u adlibreg512;	// adlib register set (including second set)
+	Bit8u wave_sel44;		// waveform selection
+	#else
+	Bit8u adlibreg256;	// adlib register set
+	Bit8u wave_sel22;		// waveform selection
+	#endif
+
+
+	// vibrato/tremolo increment/counter
+	Bit32u vibtab_pos;
+	Bit32u vibtab_add;
+	Bit32u tremtab_pos;
+	Bit32u tremtab_add;
+
+
+	// enable an operator
+	void enable_operator(Bitu regbase, op_type* op_pt, Bit32u act_type);
+
+	// functions to change parameters of an operator
+	void change_frequency(Bitu chanbase, Bitu regbase, op_type* op_pt);
+
+	void change_attackrate(Bitu regbase, op_type* op_pt);
+	void change_decayrate(Bitu regbase, op_type* op_pt);
+	void change_releaserate(Bitu regbase, op_type* op_pt);
+	void change_sustainlevel(Bitu regbase, op_type* op_pt);
+	void change_waveform(Bitu regbase, op_type* op_pt);
+	void change_keepsustain(Bitu regbase, op_type* op_pt);
+	void change_vibrato(Bitu regbase, op_type* op_pt);
+	void change_feedback(Bitu chanbase, op_type* op_pt);
+
+	// general functions
+	void adlib_init(Bit32u samplerate, Bit32u numchannels, Bit32u bytespersample);
+	void adlib_write(Bitu idx, Bit8u val);
+	void adlib_getsample(Bit16s* sndptr, Bits numsamples);
+
+	Bitu adlib_reg_read(Bitu port);
+	void adlib_write_index(Bitu port, Bit8u val);
+};
+
+static Bit32u generator_add;	// should be a chip parameter
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/xad.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/xad.cpp Changed

@@ -14,127 +14,162 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 xad.cpp - XAD shell player by Riven the Mage <riven@ok.ru>
 */
 
+/*
+ * Copyright (c) 2015 - 2017 Wraithverge <liam82067@yahoo.com>
+ * - Realigned to Tabs.
+ * - Added support for Speed indicator in 'File Info' dialogues.
+ */
+
 #include "xad.h"
+// Wraithverge: added DEBUG PPD.
+#ifdef DEBUG
 #include "debug.h"
+#endif
 
 /* -------- Public Methods -------------------------------- */
 
 CxadPlayer::CxadPlayer(Copl * newopl) : CPlayer(newopl)
 {
- tune = 0;
+	tune = 0;
 }
 
 CxadPlayer::~CxadPlayer()
 {
- if (tune)
- delete tune;
+	if (tune) delete tune;
 }
 
-bool CxadPlayer::load(const char *filename, const CFileProvider &fp)
+bool CxadPlayer::load(const std::string &filename, const CFileProvider &fp)
 {
- binistream *f = fp.open(filename); if(!f) return false;
- bool ret = false;
-
- // load header
- xad.id = f->readInt(4);
- f->readString(xad.title, 36);
- f->readString(xad.author, 36);
- xad.fmt = f->readInt(2);
- xad.speed = f->readInt(1);
- xad.reserved_a = f->readInt(1);
-
- // 'XAD!' - signed ?
- if(xad.id != 0x21444158) { fp.close(f); return false; }
-
- // get file size
- tune_size = fp.filesize(f) - 80;
-
- // load()
- tune = new unsigned char tune_size;
- f->readString((char *)tune, tune_size);
- fp.close(f);
-
- ret = xadplayer_load();
-
- if (ret)
- rewind(0);
-
- return ret;
+	binistream *f = fp.open(filename); if(!f) return false;
+	bool ret = false;
+	bool xad_header = true;
+
+	// load header
+	xad.id = f->readInt(4);
+	f->readString(xad.title, 36);
+	f->readString(xad.author, 36);
+	xad.fmt = f->readInt(2);
+	xad.speed = f->readInt(1);
+	xad.reserved_a = f->readInt(1);
+
+	// 'XAD!' - signed ?
+	if (xad.id != 0x21444158) {
+		if ((xad.id & 0xFFFFFF) == 4607298) // 'BMF'
+		{
+			xad_header = false;
+			xad.fmt = BMF;
+		}
+		if (xad_header)
+		{
+			fp.close(f);
+			return false;
+		}
+	}
+	if (!xad_header)
+	{
+		xad.title0 = 0;
+		xad.author0 = 0;
+		xad.speed = 0;
+		xad.reserved_a = 0;
+		f->seek(0);
+		tune_size = fp.filesize(f);
+	}
+	else
+	{
+		// get file size
+		tune_size = fp.filesize(f) - 80;
+	}
+
+	// load()
+	tune = new unsigned char tune_size;
+	f->readString((char *)tune, tune_size);
+	fp.close(f);
+
+	ret = xadplayer_load();
+
+	if (ret) rewind(0);
+
+	return ret;
 }
 
 void CxadPlayer::rewind(int subsong)
 {
- opl->init();
+	opl->init();
 
- plr.speed = xad.speed;
- plr.speed_counter = 1;
- plr.playing = 1;
- plr.looping = 0;
+	plr.speed = xad.speed;
+	plr.speed_counter = 1;
+	plr.playing = 1;
+	plr.looping = 0;
 
- // rewind()
- xadplayer_rewind(subsong);
+	// rewind()
+	xadplayer_rewind(subsong);
 
-#ifdef DEBUG
- AdPlug_LogWrite("-----------\n");
-#endif
+	#ifdef DEBUG
+	AdPlug_LogWrite("-----------\n");
+	#endif
 }
 
 bool CxadPlayer::update()
 {
- if (--plr.speed_counter)
- goto update_end;
+	if (--plr.speed_counter) goto update_end;
 
- plr.speed_counter = plr.speed;
+	plr.speed_counter = plr.speed;
 
- // update()
- xadplayer_update();
+	// update()
+	xadplayer_update();
 
 update_end:
- return (plr.playing && (!plr.looping));
+	return (plr.playing && (!plr.looping));
 }
 
 float CxadPlayer::getrefresh()
 {
- return xadplayer_getrefresh();
+	return xadplayer_getrefresh();
 }
 
-const char * CxadPlayer::gettype()
+std::string CxadPlayer::gettype()
 {
- return xadplayer_gettype();
+	return xadplayer_gettype();
 }
 
-const char * CxadPlayer::gettitle()
+std::string CxadPlayer::gettitle()
 {
- return xadplayer_gettitle();
+	return xadplayer_gettitle();
 }
 
-const char * CxadPlayer::getauthor()
+std::string CxadPlayer::getauthor()
 {
- return xadplayer_getauthor();
+	return xadplayer_getauthor();
 }
 
-const char * CxadPlayer::getinstrument(unsigned int i)
+std::string CxadPlayer::getinstrument(unsigned int i)
 {
- return xadplayer_getinstrument(i);
+	return xadplayer_getinstrument(i);
 }
 
 unsigned int CxadPlayer::getinstruments()
 {
- return xadplayer_getinstruments();
+	return xadplayer_getinstruments();
+}
+
+// Wraithverge: added this.
+unsigned int CxadPlayer::getspeed()
+{
+	return xadplayer_getspeed();
 }
 
 /* -------- Protected Methods ------------------------------- */
 
 void CxadPlayer::opl_write(int reg, int val)
 {
- adlibreg = val;
-#ifdef DEBUG
- AdPlug_LogWrite(" %02X = %02X\n",reg,val);
-#endif
- opl->write(reg,val);
+	adlibreg = val;
+	#ifdef DEBUG
+	AdPlug_LogWrite(" %02X = %02X\n",reg,val);
+	#endif
+	opl->write(reg,val);
 }

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/xad.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/xad.h Changed

@@ -14,11 +14,17 @@
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 xad.h - XAD shell player by Riven the Mage <riven@ok.ru>
 */
 
+/*
+ * Copyright (c) 2015 - 2017 Wraithverge <liam82067@yahoo.com>
+ * - Realigned to Tabs.
+ * - Added support for Speed indicator in 'File Info' dialogues.
+ */
+
 #ifndef H_ADPLUG_XAD
 #define H_ADPLUG_XAD
 
@@ -27,71 +33,79 @@
 class CxadPlayer: public CPlayer
 {
 public:
- static CPlayer *factory(Copl *newopl);
+	static CPlayer *factory(Copl *newopl);
+
+	CxadPlayer(Copl * newopl);
+	~CxadPlayer();
 
- CxadPlayer(Copl * newopl);
- ~CxadPlayer();
+	bool	load(const std::string &filename, const CFileProvider &fp);
+	bool	update();
+	void	rewind(int subsong);
+	float	getrefresh();
 
- bool	load(const char *filename, const CFileProvider &fp);
- bool	update();
- void	rewind(int subsong);
- float	getrefresh();
+	std::string gettype();
+	std::string gettitle();
+	std::string getauthor();
+	std::string getinstrument(unsigned int i);
+	unsigned int getinstruments();
 
- const char * gettype();
- const char * gettitle();
- const char * getauthor();
- const char * getinstrument(unsigned int i);
- unsigned int getinstruments();
+	// Wraithverge: added this.
+	unsigned int getspeed();
 
 protected:
 	virtual void xadplayer_rewind(int subsong) = 0;
 	virtual bool xadplayer_load() = 0;
 	virtual void xadplayer_update() = 0;
 	virtual float xadplayer_getrefresh() = 0;
-	virtual const char * xadplayer_gettype() = 0;
-	virtual const char * xadplayer_gettitle()
-	 {
-	 return xad.title;
-	 }
-	virtual const char *xadplayer_getauthor()
-	 {
-	 return xad.author;
-	 }
-	virtual const char *xadplayer_getinstrument(unsigned int i)
-	 {
-	 return "";
-	 }
+	virtual std::string xadplayer_gettype() = 0;
+	virtual std::string xadplayer_gettitle()
+	{
+		return std::string(xad.title);
+	}
+	virtual std::string xadplayer_getauthor()
+	{
+		return std::string(xad.author);
+	}
+	virtual std::string xadplayer_getinstrument(unsigned int i)
+	{
+		return std::string("");
+	}
 	virtual unsigned int xadplayer_getinstruments()
-	 {
-	 return 0;
-	 }
+	{
+		return 0;
+	}
+
+	// Wraithverge: added this.
+	virtual unsigned int xadplayer_getspeed()
+	{
+		return 0;
+	}
 
 	enum { HYP=1, PSI, FLASH, BMF, RAT, HYBRID };
 
- struct xad_header
- {
-	 unsigned long id;
- char title36;
- char author36;
- unsigned short fmt;
- unsigned char speed;
- unsigned char reserved_a;
- } xad;
-
- unsigned char * tune;
- unsigned long tune_size;
-
- struct
- {
- int playing;
- int looping;
- unsigned char speed;
- unsigned char speed_counter;
- } plr;
-
- unsigned char adlib256;
-
- void opl_write(int reg, int val);
+	struct xad_header
+	{
+		unsigned long id;
+		char title36;
+		char author36;
+		unsigned short fmt;
+		unsigned char speed;
+		unsigned char reserved_a;
+	} xad;
+
+	unsigned char * tune;
+	unsigned long tune_size;
+
+	struct
+	{
+		int playing;
+		int looping;
+		unsigned char speed;
+		unsigned char speed_counter;
+	} plr;
+
+	unsigned char adlib256;
+
+	void opl_write(int reg, int val);
 };
-
 #endif

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/xsm.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/xsm.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/adplug/xsm.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/adplug/xsm.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/libbinio/binfile.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/libbinio/binfile.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/libbinio/binfile.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/libbinio/binfile.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/libbinio/binio.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/libbinio/binio.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/libbinio/binio.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/libbinio/binio.h Changed

@@ -14,7 +14,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 * binio.h - Binary stream I/O classes
- * Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>
+ * Copyright (C) 2002, 2003, 2005 Simon Peter <dn.tlp@gmx.net>
 */
 
 #ifndef H_BINIO_BINIO
@@ -26,13 +26,13 @@
 //
 // Set to 1 to build std::string supporting methods. You need the STL to
 // do this.
-#define BINIO_ENABLE_STRING	0
+#define BINIO_ENABLE_STRING	1
 
 // BINIO_ENABLE_IOSTREAM - Build iostream wrapper classes
 //
 // Set to 1 to build the iostream wrapper classes. You need the standard
 // C++ library to do this.
-#define BINIO_ENABLE_IOSTREAM	0
+#define BINIO_ENABLE_IOSTREAM	1
 
 // BINIO_ISO_STDLIB - Build with ISO C++ standard library compliance
 //
@@ -124,8 +124,9 @@
 
 Int readInt(unsigned int size);
 Float readFloat(FType ft);
- unsigned long readString(char *str, unsigned long amount);
+ unsigned long readString(char *str, unsigned long maxlen);
 unsigned long readString(char *str, unsigned long maxlen, const char delim);
+ void readBuf(char *buf, int size);
 #if BINIO_ENABLE_STRING
 std::string readString(const char delim = '\0');
 #endif
@@ -138,6 +139,7 @@
 
 protected:
 virtual Byte getByte() = 0;
+ virtual void getBuf(char *buf, int size) = 0;
 
 private:
 Float ieee_single2float(Byte *data);

deadbeef-0.6.2.tar.bz2/plugins/adplug/libbinio/binstr.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/libbinio/binstr.cpp Changed

@@ -14,9 +14,10 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 * binstr.cpp - Binary I/O on standard C strings in memory
- * Copyright (C) 2003 Simon Peter <dn.tlp@gmx.net>
+ * Copyright (C) 2003, 2010 Simon Peter <dn.tlp@gmx.net>
 */
 
+#include <string.h>
 #include "binstr.h"
 
 /***** binsbase *****/
@@ -35,20 +36,19 @@
 switch(offs) {
 case Set: spos = data + p; break;
 case Add: spos += p; break;
- case End: spos = data + length - 1 + p; break;
+ case End: spos = data + length + p; break;
 }
 
 // Seek before start of data
 if(spos < data) {
- err |= Eof;
 spos = data;
 return;
 }
 
 // Seek after end of data
- if(spos - data >= length) {
+ if(spos - data > length) {
 err |= Eof;
- spos = data + length - 1;
+ spos = data + length;
 }
 }
 
@@ -82,6 +82,17 @@
 return in;
 }
 
+void binisstream::getBuf(char *buf, int size)
+{
+ if(spos - data >= length) {
+ err |= Eof;
+ return;
+ }
+ memcpy (buf, spos, size);
+ spos += size;
+}
+
+
 /***** binosstream *****/
 
 binosstream::binosstream(void *str, unsigned long len)
@@ -95,11 +106,12 @@
 
 void binosstream::putByte(Byte b)
 {
- *spos = b;
- spos++;
-
- if(spos - data >= length)
- spos = data + length - 1;
+ if(spos - data >= length) {
+ err |= Eof;
+ } else {
+ *spos = b;
+ spos++;
+ }
 }
 
 /***** binsstream *****/

deadbeef-0.6.2.tar.bz2/plugins/adplug/libbinio/binstr.h -> deadbeef-1.9.6.tar.bz2/plugins/adplug/libbinio/binstr.h Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/libbinio/binwrap.cpp -> deadbeef-1.9.6.tar.bz2/plugins/adplug/libbinio/binwrap.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/adplug/plugin.c -> deadbeef-1.9.6.tar.bz2/plugins/adplug/plugin.c Changed

@@ -1,6 +1,6 @@
 /*
 DeaDBeeF ADPLUG plugin
- Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2014 Oleksiy Yakovenko <waker@users.sourceforge.net>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -24,7 +24,7 @@
 // this is a decoder plugin skeleton
 // use to create new decoder plugins
 
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 extern const char *adplug_exts;
 
@@ -54,8 +54,7 @@
 
 // define plugin interface
 DB_decoder_t adplug_plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_DECODER,
@@ -64,7 +63,7 @@
 .plugin.descr = "Adplug player (ADLIB OPL2/OPL3 emulator)",
 .plugin.copyright = 
 "ADPLUG DeaDBeeF Player Plugin\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko <waker@users.sourceforge.net>\n"
 "\n"
 "This software is provided 'as-is', without any express or implied\n"
 "warranty. In no event will the authors be held liable for any damages\n"
@@ -88,7 +87,7 @@
 "\n"
 "adplug (modified)\n"
 "Copyright (C) 1999 - 2006 Simon Peter, <dn.tlp@gmx.net>, et al.\n"
- "deadbeef-related modifications (c) 2009-2014 Alexey Yakovenko\n"
+ "deadbeef-related modifications (c) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "This library is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU Lesser General Public\n"

deadbeef-0.6.2.tar.bz2/plugins/alac/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/alac/COPYING Changed

@@ -1,5 +1,5 @@
 ALAC plugin for deadbeef
-Copyright (C) 2012-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+Copyright (C) 2012-2013 Oleksiy Yakovenko <waker@users.sourceforge.net>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -49,20 +49,3 @@
 
 
 
-libmp4ff (modified)
-Code from MP4FF is copyright (c) Nero AG, www.nero.com
-deadbeef-related modifications (c) 2009-2014 Alexey Yakovenko
-
-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.

deadbeef-0.6.2.tar.bz2/plugins/alac/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/alac/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/alac/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/alac/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/alac/alac.c -> deadbeef-1.9.6.tar.bz2/plugins/alac/alac.c Changed

@@ -59,6 +59,8 @@
 struct alac_file
 {
 unsigned char *input_buffer;
+ int input_buffer_size;
+
 int input_buffer_bitaccumulator; /* used so we can do arbitary
 bit reads */
 
@@ -152,6 +154,9 @@
 _Swap32(alac->setinfo_8a_rate);
 
 ptr += 4;
+ 
+ alac->samplesize = alac->setinfo_sample_size;
+ alac->bytespersample = (alac->setinfo_sample_size / 8) * alac->numchannels;
 
 allocate_buffers(alac);
 
@@ -162,6 +167,11 @@
 return alac->setinfo_8a_rate;
 }
 
+int
+alac_get_bitspersample(alac_file *alac) {
+ return alac->setinfo_sample_size;
+}
+
 /* stream reading */
 
 /* supports reading 1 to 16 bits, in big endian format */
@@ -170,6 +180,10 @@
 uint32_t result;
 int new_accumulator;
 
+ if (alac->input_buffer_size < 3) {
+ return 0;
+ }
+
 result = (alac->input_buffer0 << 16) |
 (alac->input_buffer1 << 8) |
 (alac->input_buffer2);
@@ -189,6 +203,7 @@
 
 /* increase the buffer pointer if we've read over n bytes. */
 alac->input_buffer += (new_accumulator >> 3);
+ alac->input_buffer_size -= (new_accumulator >> 3);
 
 /* and the remainder goes back into the bit accumulator */
 alac->input_buffer_bitaccumulator = (new_accumulator & 7);
@@ -218,6 +233,9 @@
 int result;
 int new_accumulator;
 
+ if (alac->input_buffer_size < 1) {
+ return 0;
+ }
 result = alac->input_buffer0;
 
 result = result << alac->input_buffer_bitaccumulator;
@@ -227,6 +245,7 @@
 new_accumulator = (alac->input_buffer_bitaccumulator + 1);
 
 alac->input_buffer += (new_accumulator / 8);
+ alac->input_buffer_size -= (new_accumulator / 8);
 
 alac->input_buffer_bitaccumulator = (new_accumulator % 8);
 
@@ -238,6 +257,7 @@
 int new_accumulator = (alac->input_buffer_bitaccumulator - bits);
 
 alac->input_buffer += (new_accumulator >> 3);
+ alac->input_buffer_size -= (new_accumulator >> 3);
 
 alac->input_buffer_bitaccumulator = (new_accumulator & 7);
 if (alac->input_buffer_bitaccumulator < 0)
@@ -449,6 +469,9 @@
 			// got blockSize 0s
 			if (blockSize > 0)
 			{
+				if (outputCount + 1 + blockSize > outputSize) {
+					blockSize = outputSize - outputCount - 1;
+				}
 				memset(&outputBufferoutputCount + 1, 0, blockSize * sizeof(*outputBuffer));
 				outputCount += blockSize;
 			}
@@ -746,7 +769,7 @@
 }
 
 void decode_frame(alac_file *alac,
- unsigned char *inbuffer,
+ unsigned char *inbuffer, int insize,
 void *outbuffer, int *outputsize)
 {
 int channels;
@@ -754,12 +777,13 @@
 
 /* setup the stream */
 alac->input_buffer = inbuffer;
+ alac->input_buffer_size = insize;
 alac->input_buffer_bitaccumulator = 0;
 
 channels = readbits(alac, 3);
 
 *outputsize = outputsamples * alac->bytespersample;
-
+ 
 switch(channels)
 {
 case 0: /* 1 channel */
@@ -784,11 +808,17 @@
 
 isnotcompressed = readbits(alac, 1); /* whether the frame is compressed */
 
+ uint32_t read_output_samples = 0;
+
 if (hassize)
 {
 /* now read the number of samples,
 * as a 32bit integer */
- outputsamples = readbits(alac, 32);
+ read_output_samples = readbits(alac, 32);
+ outputsamples = read_output_samples;
+ if (outputsamples > alac->setinfo_max_samples_per_frame) {
+ outputsamples = alac->setinfo_max_samples_per_frame;
+ }
 *outputsize = outputsamples * alac->bytespersample;
 }
 
@@ -849,7 +879,9 @@
 }
 else
 {
- fprintf(stderr, "FIXME: unhandled predicition type: %i\n", prediction_type);
+ fprintf(stderr, "ALAC: unhandled predicition type: %i, the data seems to be corrupt\n", prediction_type);
+ *outputsize = 0;
+ return;
 /* i think the only other prediction type (or perhaps this is just a
 * boolean?) runs adaptive fir twice.. like:
 * predictor_decompress_fir_adapt(predictor_error, tempout, ...)
@@ -961,11 +993,17 @@
 
 isnotcompressed = readbits(alac, 1); /* whether the frame is compressed */
 
+ uint32_t read_output_samples = 0;
+
 if (hassize)
 {
 /* now read the number of samples,
 * as a 32bit integer */
- outputsamples = readbits(alac, 32);
+ read_output_samples = readbits(alac, 32);
+ outputsamples = read_output_samples;
+ if (outputsamples > alac->setinfo_max_samples_per_frame) {
+ outputsamples = alac->setinfo_max_samples_per_frame;
+ }
 *outputsize = outputsamples * alac->bytespersample;
 }
 
@@ -1049,7 +1087,9 @@
 }
 else
 { /* see mono case */
- fprintf(stderr, "FIXME: unhandled predicition type: %i\n", prediction_type_a);
+ fprintf(stderr, "ALAC: unhandled predicition type: %i, the data seems to be corrupt\n", prediction_type_a);
+ *outputsize = 0;
+ return;
 }
 
 /* channel 2 */
@@ -1074,7 +1114,9 @@
 }
 else
 {
- fprintf(stderr, "FIXME: unhandled predicition type: %i\n", prediction_type_b);
+ fprintf(stderr, "ALAC: unhandled predicition type: %i, the data seems to be corrupt\n", prediction_type_b);
+ *outputsize = 0;
+ return;
 }
 }
 else

deadbeef-0.6.2.tar.bz2/plugins/alac/alac_plugin.c -> deadbeef-1.9.6.tar.bz2/plugins/alac/alac_plugin.c Changed

@@ -1,6 +1,6 @@
 /*
 ALAC plugin for deadbeef
- Copyright (C) 2012-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2012-2013 Oleksiy Yakovenko <waker@users.sourceforge.net>
 Uses the reverse engineered ALAC decoder (C) 2005 David Hammerton
 All rights reserved.
 
@@ -24,25 +24,38 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "mp4ff.h"
-#include "demux.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <deadbeef/strdupa.h>
+
 #include "decomp.h"
-#include "stream.h"
+
+#include "../../shared/mp4tagutil.h"
+
+#include <mp4p/mp4p.h>
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
 
+#ifndef __linux__
+#define off64_t off_t
+#define lseek64 lseek
+#define O_LARGEFILE 0
+#endif
+
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
-static DB_decoder_t plugin;
+static ddb_decoder2_t alac_plugin;
+static ddb_decoder2_t alac_plugin;
 DB_functions_t *deadbeef;
 
 #ifdef WORDS_BIGENDIAN
@@ -57,135 +70,119 @@
 typedef struct {
 DB_fileinfo_t info;
 DB_FILE *file;
- demux_res_t demux_res;
- stream_t *stream;
- alac_file *alac;
+ mp4p_file_callbacks_t mp4reader;
+ mp4p_atom_t *mp4file;
+ mp4p_atom_t *trak;
+ uint32_t alac_samplerate;
+ uint64_t mp4samples;
+ alac_file *_alac;
+ int mp4sample;
 int junk;
- char out_bufferBUFFER_SIZE;
+ uint8_t out_bufferBUFFER_SIZE;
 int out_remaining;
- int skipsamples;
- int currentsample;
- int startsample;
- int endsample;
- int current_frame;
- int64_t dataoffs;
+ int64_t skipsamples;
+ int64_t currentsample;
+ int64_t startsample;
+ int64_t endsample;
 } alacplug_info_t;
 
+static int
+alacplug_seek (DB_fileinfo_t *_info, float t);
+
 // allocate codec control structure
-static DB_fileinfo_t *
+DB_fileinfo_t *
 alacplug_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (alacplug_info_t));
- alacplug_info_t *info = (alacplug_info_t *)_info;
- memset (info, 0, sizeof (alacplug_info_t));
- return _info;
+ alacplug_info_t *info = calloc (1, sizeof (alacplug_info_t));
+ return &info->info;
 }
 
-static uint32_t
-alacplug_fs_read (void *user_data, void *buffer, uint32_t length) {
- alacplug_info_t *info = user_data;
- return deadbeef->fread (buffer, 1, length, info->file);
-}
-
-static uint32_t
-alacplug_fs_seek (void *user_data, uint64_t position) {
- alacplug_info_t *info = user_data;
- return deadbeef->fseek (info->file, position+info->junk, SEEK_SET);
-}
+int
+alacplug_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ alacplug_info_t *info = (alacplug_info_t *)_info;
 
-static int
-get_sample_info(demux_res_t *demux_res, uint32_t samplenum,
- uint32_t *sample_duration,
- uint32_t *sample_byte_size)
-{
- unsigned int duration_index_accum = 0;
- unsigned int duration_cur_index = 0;
-
- if (samplenum >= demux_res->num_sample_byte_sizes)
- {
- fprintf(stderr, "sample %i does not exist\n", samplenum);
- return 0;
+ deadbeef->pl_lock ();
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ info->file = deadbeef->fopen (uri);
+ if (!info->file) {
+ return -1;
 }
 
- if (!demux_res->num_time_to_samples)
- {
- fprintf(stderr, "no time to samples\n");
- return 0;
- }
- while ((demux_res->time_to_sampleduration_cur_index.sample_count + duration_index_accum)
- <= samplenum)
- {
- duration_index_accum += demux_res->time_to_sampleduration_cur_index.sample_count;
- duration_cur_index++;
- if (duration_cur_index >= demux_res->num_time_to_samples)
- {
- fprintf(stderr, "sample %i does not have a duration\n", samplenum);
- return 0;
+ uint64_t totalsamples = 0;
+
+ int samplerate = 0;
+ int channels = 0;
+ int bps = 0;
+ float duration = 0;
+
+ info->mp4reader.ptrhandle = info->file;
+ mp4_init_ddb_file_callbacks (&info->mp4reader);
+ info->mp4file = mp4p_open(&info->mp4reader);
+
+ // iterate over tracks, find the ALAC one
+ info->trak = mp4p_atom_find (info->mp4file, "moov/trak");
+ mp4p_alac_t *alac = NULL;
+ while (info->trak) {
+ mp4p_atom_t *alac_atom = mp4p_atom_find (info->trak, "trak/mdia/minf/stbl/stsd/alac");
+ if (alac_atom && mp4p_trak_playable(info->trak)) {
+ alac = alac_atom->data;
+ info->alac_samplerate = alac->sample_rate;
+ break;
 }
+ info->trak = info->trak->next;
+ }
+ if (!alac) {
+// printf ("not found\n");
+ return -1;
 }
 
- *sample_duration = demux_res->time_to_sampleduration_cur_index.sample_duration;
- *sample_byte_size = demux_res->sample_byte_sizesamplenum;
+ // get audio format: samplerate, bps, channels
+ samplerate = alac->sample_rate;
+ bps = alac->bps;
+ channels = alac->channel_count;
+ //printf ("%d %d %d\n", _samplerate, _bps, _channels);
 
- return 1;
-}
+ // get file info: totalsamples
 
-static int
-alacplug_get_totalsamples (demux_res_t *demux_res) {
- int totalsamples = 0;
- for (int i = 0; i < demux_res->num_sample_byte_sizes; i++)
- {
- unsigned int thissample_duration = 0;
- unsigned int thissample_bytesize = 0;
+ // 1. sum of all stts entries
+ mp4p_atom_t *stts_atom = mp4p_atom_find(info->trak, "trak/mdia/minf/stbl/stts");
 
- get_sample_info(demux_res, i, &thissample_duration,
- &thissample_bytesize);
+// printf ("num_samples: %lld\n", num_mp4samples);
 
- totalsamples += thissample_duration;
- }
- return totalsamples;
-}
+ // total PCM samples and duration
 
-static int
-alacplug_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
- alacplug_info_t *info = (alacplug_info_t *)_info;
+ // duration is calculated from stts table (time-to-sample), which is not pcm-sample-precise.
+ // there should be a way to count pcm samples
+ uint64_t total_sample_duration = mp4p_stts_total_sample_duration (stts_atom);
+ totalsamples = total_sample_duration * samplerate / alac->sample_rate;
+ duration = total_sample_duration / (float)alac->sample_rate;
 
- deadbeef->pl_lock ();
- info->file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
- if (!info->file) {
- return -1;
- }
+ mp4p_atom_t *stsz_atom = mp4p_atom_find(info->trak, "trak/mdia/minf/stbl/stsz");
+ mp4p_stsz_t *stsz = stsz_atom->data;
 
- info->stream = stream_create_file (info->file, 1, info->junk);
+ info->mp4samples = stsz->number_of_entries;
 
- if (!qtmovie_read(info->stream, &info->demux_res)) {
- if (!info->demux_res.format_read || info->demux_res.format != MAKEFOURCC('a','l','a','c')) {
- return -1;
- }
- }
- info->dataoffs = deadbeef->ftell (info->file);
+ _info->fmt.samplerate = samplerate;
+ _info->fmt.channels = channels;
+ _info->fmt.bps = bps;
 
- info->alac = create_alac(info->demux_res.sample_size, info->demux_res.num_channels);
- alac_set_info(info->alac, info->demux_res.codecdata);
- info->demux_res.sample_rate = alac_get_samplerate (info->alac);
+ info->_alac = create_alac (bps, channels);
+ alac_set_info (info->_alac, (char *)alac->asc);
 
- int totalsamples = alacplug_get_totalsamples (&info->demux_res);
 if (!info->file->vfs->is_streaming ()) {
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
- plugin.seek_sample (_info, 0);
+ int64_t endsample = deadbeef->pl_item_get_endsample(it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample(it);
+ info->endsample = endsample;
+ alacplug_seek (_info, 0);
 }
 else {
 info->startsample = 0;
- info->endsample = totalsamples-1;
+ info->endsample = (int)(totalsamples-1);
 }
 }
 
- _info->plugin = &plugin;
- _info->fmt.bps = info->demux_res.sample_size;
- _info->fmt.channels = info->demux_res.num_channels;
- _info->fmt.samplerate = info->demux_res.sample_rate;
+ _info->plugin = &alac_plugin.decoder;
 for (int i = 0; i < _info->fmt.channels; i++) {
 _info->fmt.channelmask |= 1 << i;
 }
@@ -193,31 +190,32 @@
 return 0;
 }
 
-static void
+void
 alacplug_free (DB_fileinfo_t *_info) {
 alacplug_info_t *info = (alacplug_info_t *)_info;
 if (info) {
 if (info->file) {
 deadbeef->fclose (info->file);
 }
- if (info->stream) {
- stream_destroy (info->stream);
+ if (info->mp4file) {
+ mp4p_atom_free_list (info->mp4file);
 }
- qtmovie_free_demux (&info->demux_res);
- if (info->alac) {
- alac_file_free (info->alac);
+
+ if (info->_alac) {
+ alac_file_free (info->_alac);
 }
+
 free (info);
 }
 }
 
-static int
+int
 alacplug_read (DB_fileinfo_t *_info, char *bytes, int size) {
 alacplug_info_t *info = (alacplug_info_t *)_info;
 int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
 if (!info->file->vfs->is_streaming ()) {
 if (info->currentsample + size / samplesize > info->endsample) {
- size = (info->endsample - info->currentsample + 1) * samplesize;
+ size = (int)(info->endsample - info->currentsample + 1) * samplesize;
 if (size <= 0) {
 trace ("alacplug_read: eof (current=%d, total=%d)\n", info->currentsample, info->endsample);
 return 0;
@@ -228,7 +226,7 @@
 while (size > 0) {
 // handle seeking
 if (info->skipsamples > 0 && info->out_remaining > 0) {
- int skip = min (info->out_remaining, info->skipsamples);
+ int64_t skip = min (info->out_remaining, info->skipsamples);
 if (skip < info->out_remaining) {
 memmove (info->out_buffer, info->out_buffer + skip * samplesize, (info->out_remaining - skip) * samplesize);
 }
@@ -239,7 +237,7 @@
 int n = size / samplesize;
 n = min (info->out_remaining, n);
 
- char *src = info->out_buffer;
+ uint8_t *src = info->out_buffer;
 memcpy (bytes, src, n * samplesize);
 bytes += n * samplesize;
 src += n * samplesize;
@@ -255,40 +253,36 @@
 continue;
 }
 
- // decode next frame
- if (info->current_frame == info->demux_res.num_sample_byte_sizes) {
- break; // end of file
- }
- 
- uint32_t sample_duration;
- uint32_t sample_byte_size;
-
- int outputBytes;
+ unsigned char *buffer = NULL;
+// uint32_t buffer_size = 0;
+ uint32_t outNumSamples = 0;
 
- /* just get one sample for now */
- if (!get_sample_info(&info->demux_res, info->current_frame,
- &sample_duration, &sample_byte_size))
- {
- fprintf(stderr, "alac: sample failed\n");
+ if (info->mp4sample >= info->mp4samples) {
+ trace ("alac: finished with the last mp4sample\n");
 break;
 }
 
- if (IN_BUFFER_SIZE < sample_byte_size)
- {
- fprintf(stderr, "alac: buffer too small! (is %i want %i)\n",
- IN_BUFFER_SIZE,
- sample_byte_size);
+ mp4p_atom_t *stbl_atom = mp4p_atom_find(info->trak, "trak/mdia/minf/stbl");
+ uint64_t offs = mp4p_sample_offset (stbl_atom, info->mp4sample);
+ uint64_t size = mp4p_sample_size (stbl_atom, info->mp4sample);
+
+ buffer = malloc (size);
+ deadbeef->fseek (info->file, offs+info->junk, SEEK_SET);
+ if (size != deadbeef->fread (buffer, 1, size, info->file)) {
+ trace ("alac: failed to read sample\n");
 break;
 }
 
- char bufferIN_BUFFER_SIZE;
- stream_read(info->stream, sample_byte_size, buffer);
+ int outputBytes = 0;
+ decode_frame(info->_alac, buffer, (int)size, info->out_buffer, &outputBytes);
+ outNumSamples = outputBytes / samplesize;
 
- outputBytes = BUFFER_SIZE;
- decode_frame(info->alac, buffer, info->out_buffer, &outputBytes);
- info->current_frame++;
+ info->out_remaining += outNumSamples;
+ info->mp4sample++;
 
- info->out_remaining += outputBytes / samplesize;
+ if (buffer) {
+ free (buffer);
+ }
 }
 
 info->currentsample += (initsize-size) / samplesize;
@@ -296,192 +290,58 @@
 }
 
 static int
-alacplug_seek_sample (DB_fileinfo_t *_info, int sample) {
+alacplug_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
 alacplug_info_t *info = (alacplug_info_t *)_info;
 
 sample += info->startsample;
 
- int totalsamples = 0;
- int64_t seekpos = 0;
- int i;
- for (i = 0; i < info->demux_res.num_sample_byte_sizes; i++)
- {
- unsigned int thissample_duration = 0;
- unsigned int thissample_bytesize = 0;
-
- get_sample_info(&info->demux_res, i, &thissample_duration,
- &thissample_bytesize);
-
- if (totalsamples + thissample_duration > sample) {
- info->skipsamples = sample - totalsamples;
- break;
- }
- totalsamples += thissample_duration;
- seekpos += info->demux_res.sample_byte_sizei;
- }
+ mp4p_atom_t *stts_atom = mp4p_atom_find(info->trak, "trak/mdia/minf/stbl/stts");
 
- if (i == info->demux_res.num_sample_byte_sizes) {
- return -1;
- }
+ uint64_t seeksample = (int)(sample * info->alac_samplerate / _info->fmt.samplerate);
 
+ uint64_t startsample = 0;
+ info->mp4sample = mp4p_stts_mp4sample_containing_sample(stts_atom, seeksample, &startsample);
 
- deadbeef->fseek(info->file, info->dataoffs + seekpos, SEEK_SET);
+ startsample = startsample * _info->fmt.samplerate / info->alac_samplerate;
+ info->skipsamples = sample - startsample;
 
- info->current_frame = i;
 info->out_remaining = 0;
 info->currentsample = sample;
 _info->readpos = (float)(info->currentsample - info->startsample) / _info->fmt.samplerate;
+
 return 0;
 }
 
 static int
-alacplug_seek (DB_fileinfo_t *_info, float t) {
- return alacplug_seek_sample (_info, t * _info->fmt.samplerate);
+alacplug_seek_sample(DB_fileinfo_t *_info, int sample) {
+ return alacplug_seek_sample64(_info, sample);
 }
 
-static const char *metainfo = {
- "artist", "artist",
- "title", "title",
- "album", "album",
- "track", "track",
- "date", "year",
- "genre", "genre",
- "comment", "comment",
- "performer", "performer",
- "album_artist", "band",
- "writer", "composer",
- "vendor", "vendor",
- "disc", "disc",
- "compilation", "compilation",
- "totaldiscs", "numdiscs",
- "copyright", "copyright",
- "totaltracks", "numtracks",
- "tool", "tool",
- "MusicBrainz Track Id", "musicbrainz_trackid",
- NULL
-};
-
-
-/* find a metadata item by name */
-/* returns 0 if item found, 1 if no such item */
-int32_t mp4ff_meta_find_by_name(const mp4ff_t *f, const char *item, char **value);
-
-
-void
-alacplug_load_tags (DB_playItem_t *it, mp4ff_t *mp4) {
- char *s = NULL;
- int got_itunes_tags = 0;
-
- int n = mp4ff_meta_get_num_items (mp4);
- for (int t = 0; t < n; t++) {
- char *key = NULL;
- char *value = NULL;
- int res = mp4ff_meta_get_by_index(mp4, t, &key, &value);
- if (key && value) {
- got_itunes_tags = 1;
- if (strcasecmp (key, "cover")) {
- if (!strcasecmp (key, "replaygain_track_gain")) {
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, atof (value));
- }
- else if (!strcasecmp (key, "replaygain_album_gain")) {
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, atof (value));
- }
- else if (!strcasecmp (key, "replaygain_track_peak")) {
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, atof (value));
- }
- else if (!strcasecmp (key, "replaygain_album_peak")) {
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, atof (value));
- }
- else {
- int i;
- for (i = 0; metainfoi; i += 2) {
- if (!strcasecmp (metainfoi, key)) {
- deadbeef->pl_add_meta (it, metainfoi+1, value);
- break;
- }
- }
- if (!metainfoi) {
- deadbeef->pl_add_meta (it, key, value);
- }
- }
- }
- }
- if (key) {
- free (key);
- }
- if (value) {
- free (value);
- }
- }
-
- if (got_itunes_tags) {
- uint32_t f = deadbeef->pl_get_item_flags (it);
- f |= DDB_TAG_ITUNES;
- deadbeef->pl_set_item_flags (it, f);
- }
+static int
+alacplug_seek (DB_fileinfo_t *_info, float t) {
+ return alacplug_seek_sample64 (_info, (int64_t)((double)t * (int64_t)_info->fmt.samplerate));
 }
 
-int
-alacplug_read_metadata (DB_playItem_t *it) {
- deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
- if (!fp) {
- return -1;
- }
-
- if (fp->vfs->is_streaming ()) {
- deadbeef->fclose (fp);
- return -1;
- }
+DB_playItem_t *
+alacplug_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+ trace ("adding %s\n", fname);
 
- alacplug_info_t inf;
- memset (&inf, 0, sizeof (inf));
- inf.file = fp;
- inf.junk = deadbeef->junk_get_leading_size (fp);
- if (inf.junk >= 0) {
- deadbeef->fseek (inf.file, inf.junk, SEEK_SET);
- }
- else {
- inf.junk = 0;
- }
+ int samplerate = 0;
+ int bps = 0;
+ int channels = 0;
+ int64_t totalsamples = 0;
 
- mp4ff_callback_t cb = {
- .read = alacplug_fs_read,
- .write = NULL,
- .seek = alacplug_fs_seek,
- .truncate = NULL,
- .user_data = &inf
- };
+ alacplug_info_t info;
+ mp4p_atom_t *mp4 = NULL;
 
- deadbeef->pl_delete_all_meta (it);
+ memset (&info, 0, sizeof (info));
 
- mp4ff_t *mp4 = mp4ff_open_read (&cb);
- if (mp4) {
- alacplug_load_tags (it, mp4);
- mp4ff_close (mp4);
- }
- /*int apeerr = */deadbeef->junk_apev2_read (it, fp);
- /*int v2err = */deadbeef->junk_id3v2_read (it, fp);
- /*int v1err = */deadbeef->junk_id3v1_read (it, fp);
- deadbeef->fclose (fp);
- return 0;
-}
-
-static DB_playItem_t *
-alacplug_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
- trace ("adding %s\n", fname);
- mp4ff_t *mp4 = NULL;
- DB_playItem_t *it = NULL;
- demux_res_t demux_res;
- memset (&demux_res, 0, sizeof (demux_res));
- stream_t *stream;
 DB_FILE *fp = deadbeef->fopen (fname);
 if (!fp) {
 trace ("not found\n");
 return NULL;
 }
- alacplug_info_t info = {0};
+
 info.file = fp;
 info.junk = deadbeef->junk_get_leading_size (fp);
 if (info.junk >= 0) {
@@ -492,136 +352,122 @@
 info.junk = 0;
 }
 
+ const char *ftype = NULL;
 float duration = -1;
 
- stream = stream_create_file (fp, 1, info.junk);
- if (!stream) {
- trace ("alac: stream_create_file failed\n");
- goto error;
- }
+ info.mp4reader.ptrhandle = fp;
+ mp4_init_ddb_file_callbacks (&info.mp4reader);
+ mp4 = info.mp4file = mp4p_open(&info.mp4reader);
 
- if (!qtmovie_read(stream, &demux_res)) {
- if (!demux_res.format_read || demux_res.format != MAKEFOURCC('a','l','a','c')) {
- trace ("alac track not found in the file %s, expected atom %X got %X\n", fname, MAKEFOURCC('a','l','a','c'), demux_res.format);
- goto error;
+ if (!info.mp4file) {
+ deadbeef->fclose (fp);
+ return NULL;
+ }
+ // iterate over tracks, and the ALAC one
+ info.trak = mp4p_atom_find (info.mp4file, "moov/trak");
+ mp4p_alac_t *alac = NULL;
+ while (info.trak) {
+ mp4p_atom_t *alac_atom = mp4p_atom_find (info.trak, "trak/mdia/minf/stbl/stsd/alac");
+ if (alac_atom && mp4p_trak_playable(info.trak)) {
+ alac = alac_atom->data;
+ if (alac->sample_rate != 0) {
+ info.alac_samplerate = alac->sample_rate;
+ break;
+ }
+ else {
+ alac = NULL;
+ }
 }
+ info.trak = info.trak->next;
+ }
+ if (!alac) {
+ deadbeef->fclose (fp);
+ mp4p_atom_free_list(info.mp4file);
+ return NULL;
 }
 
- alac_file *alac = create_alac(demux_res.sample_size, demux_res.num_channels);
- alac_set_info(alac, demux_res.codecdata);
- demux_res.sample_rate = alac_get_samplerate (alac);
- alac_file_free (alac);
+ // get audio format: samplerate, bps, channels
+ samplerate = alac->sample_rate;
+ bps = alac->bps;
+ channels = alac->channel_count;
 
- it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
- deadbeef->pl_add_meta (it, ":FILETYPE", "ALAC");
+ mp4p_atom_t *stts_atom = mp4p_atom_find(info.trak, "trak/mdia/minf/stbl/stts");
 
- int totalsamples = alacplug_get_totalsamples (&demux_res);
- duration = totalsamples / (float)demux_res.sample_rate;
+ uint64_t total_sample_duration = mp4p_stts_total_sample_duration (stts_atom);
+ totalsamples = total_sample_duration * samplerate / alac->sample_rate;
+ duration = total_sample_duration / (float)alac->sample_rate;
 
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, alac_plugin.decoder.plugin.id);
+ ftype = "ALAC";
+ deadbeef->pl_add_meta (it, ":FILETYPE", ftype);
 deadbeef->plt_set_item_duration (plt, it, duration);
 
- // read tags
- mp4ff_callback_t cb = {
- .read = alacplug_fs_read,
- .write = NULL,
- .seek = alacplug_fs_seek,
- .truncate = NULL,
- .user_data = &info
- };
- deadbeef->fseek (fp, info.junk, SEEK_SET);
- mp4 = mp4ff_open_read (&cb);
- if (mp4) {
- alacplug_load_tags (it, mp4);
- }
+ deadbeef->rewind (fp);
 
- int apeerr = deadbeef->junk_apev2_read (it, fp);
- int v2err = deadbeef->junk_id3v2_read (it, fp);
- int v1err = deadbeef->junk_id3v1_read (it, fp);
+ (void)deadbeef->junk_apev2_read (it, fp);
+ (void)deadbeef->junk_id3v2_read (it, fp);
+ (void)deadbeef->junk_id3v1_read (it, fp);
 
 int64_t fsize = deadbeef->fgetlength (fp);
-
 deadbeef->fclose (fp);
- fp = NULL;
- stream_destroy (stream);
- stream = NULL;
- if (mp4) {
- mp4ff_close (mp4);
- mp4 = NULL;
- }
- int samplerate = demux_res.sample_rate;
- int bps = demux_res.sample_size;
- int channels = demux_res.num_channels;
-
- qtmovie_free_demux (&demux_res);
-
- trace ("duration %f\n", duration);
- if (duration > 0) {
- char s100;
- snprintf (s, sizeof (s), "%lld", fsize);
- deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
- snprintf (s, sizeof (s), "%d", bps);
- deadbeef->pl_add_meta (it, ":BPS", s);
- snprintf (s, sizeof (s), "%d", channels);
- deadbeef->pl_add_meta (it, ":CHANNELS", s);
- snprintf (s, sizeof (s), "%d", samplerate);
- deadbeef->pl_add_meta (it, ":SAMPLERATE", s);
- int br = (int)roundf(fsize / duration * 8 / 1000);
- snprintf (s, sizeof (s), "%d", br);
- deadbeef->pl_add_meta (it, ":BITRATE", s);
- // embedded cue
- deadbeef->pl_lock ();
- const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
- DB_playItem_t *cue = NULL;
-
- if (cuesheet) {
- cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), totalsamples, samplerate);
- if (cue) {
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
- deadbeef->pl_unlock ();
- return cue;
- }
- }
- deadbeef->pl_unlock ();
 
- cue = deadbeef->plt_insert_cue (plt, after, it, totalsamples, samplerate);
+ char s100;
+ snprintf (s, sizeof (s), "%lld", (long long)fsize);
+ deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
+ deadbeef->pl_add_meta (it, ":BPS", "16");
+ snprintf (s, sizeof (s), "%d", channels);
+ deadbeef->pl_add_meta (it, ":CHANNELS", s);
+ snprintf (s, sizeof (s), "%d", samplerate);
+ deadbeef->pl_add_meta (it, ":SAMPLERATE", s);
+ int br = (int)roundf(fsize / duration * 8 / 1000);
+ snprintf (s, sizeof (s), "%d", br);
+ deadbeef->pl_add_meta (it, ":BITRATE", s);
+
+ // embedded cue
+ const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
+ DB_playItem_t *cue = NULL;
+
+ if (cuesheet) {
+ cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, (const uint8_t *)cuesheet, (int)strlen (cuesheet), (int)totalsamples, samplerate);
 if (cue) {
+ mp4p_atom_free_list(info.mp4file);
 deadbeef->pl_item_unref (it);
 deadbeef->pl_item_unref (cue);
 return cue;
 }
 }
 
- trace ("success\n");
-success:
+ cue = deadbeef->plt_insert_cue (plt, after, it, (int)totalsamples, samplerate);
+ if (cue) {
+ deadbeef->pl_item_unref (it);
+ deadbeef->pl_item_unref (cue);
+ return cue;
+ }
+
+ mp4_load_tags (info.mp4file, it);
 after = deadbeef->plt_insert_item (plt, after, it);
 deadbeef->pl_item_unref (it);
-error:
- if (fp) {
- deadbeef->fclose (fp);
- }
- if (mp4) {
- mp4ff_close (mp4);
- }
- qtmovie_free_demux (&demux_res);
- return it;
+
+ mp4p_atom_free_list(info.mp4file);
+ return after;
 }
 
 static const char * exts = { "mp4", "m4a", NULL };
 
 // 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 = "alac",
- .plugin.name = "ALAC player",
- .plugin.descr = "plays alac files from MP4 and M4A files",
- .plugin.copyright = 
+static ddb_decoder2_t alac_plugin = {
+ .decoder.plugin.api_vmajor = 1,
+ .decoder.plugin.api_vminor = 0,
+ .decoder.plugin.version_major = 1,
+ .decoder.plugin.version_minor = 0,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.id = "alac",
+ .decoder.plugin.name = "ALAC player",
+ .decoder.plugin.descr = "plays alac files from MP4 and M4A files",
+ .decoder.plugin.copyright =
 "ALAC plugin for deadbeef\n"
- "Copyright (C) 2012-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2012-2013 Oleksiy Yakovenko <waker@users.sourceforge.net>\n"
 "Uses the reverse engineered ALAC decoder (C) 2005 David Hammerton\n"
 "All rights reserved.\n"
 "\n"
@@ -645,20 +491,22 @@
 "FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n"
 "OTHER DEALINGS IN THE SOFTWARE.\n"
 ,
- .plugin.website = "http://deadbeef.sf.net",
- .open = alacplug_open,
- .init = alacplug_init,
- .free = alacplug_free,
- .read = alacplug_read,
- .seek = alacplug_seek,
- .seek_sample = alacplug_seek_sample,
- .insert = alacplug_insert,
- .read_metadata = alacplug_read_metadata,
- .exts = exts,
+ .decoder.plugin.website = "http://deadbeef.sf.net",
+ .decoder.open = alacplug_open,
+ .decoder.init = alacplug_init,
+ .decoder.free = alacplug_free,
+ .decoder.read = alacplug_read,
+ .decoder.seek = alacplug_seek,
+ .decoder.seek_sample = alacplug_seek_sample,
+ .decoder.insert = alacplug_insert,
+ .decoder.read_metadata = mp4_read_metadata,
+ .decoder.write_metadata = mp4_write_metadata,
+ .decoder.exts = exts,
+ .seek_sample64 = alacplug_seek_sample64,
 };
 
 DB_plugin_t *
 alac_load (DB_functions_t *api) {
 deadbeef = api;
- return DB_PLUGIN (&plugin);
+ return DB_PLUGIN (&alac_plugin);
 }

deadbeef-0.6.2.tar.bz2/plugins/alac/decomp.h -> deadbeef-1.9.6.tar.bz2/plugins/alac/decomp.h Changed

deadbeef-0.6.2.tar.bz2/plugins/alsa/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/alsa/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/alsa/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/alsa/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/alsa/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/alsa/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/alsa/alsa.c -> deadbeef-1.9.6.tar.bz2/plugins/alsa/alsa.c Changed

deadbeef-0.6.2.tar.bz2/plugins/artwork/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/artwork/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/artwork/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/artwork/Makefile.am Changed

@@ -1,34 +1,31 @@
 if HAVE_ARTWORK
-artworkdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = artwork.la
 
 if HAVE_OGG
+if HAVE_VORBIS
 ogg_def = -DUSE_OGG=1
-ogg_libs = $(OGG_LIBS)
+ogg_libs = $(OGG_LIBS) $(VORBIS_LIBS)
+ogg_sources = base64.c base64.h artwork_ogg.c artwork_ogg.h
+endif
 endif
 
 if ARTWORK_USE_VFS_CURL
 artwork_net_cflags = -DUSE_VFS_CURL
-artwork_net_sources =  albumartorg.c albumartorg.h lastfm.c lastfm.h wos.c wos.h escape.c escape.h
+artwork_net_sources = musicbrainz.c musicbrainz.h albumartorg.c albumartorg.h lastfm.c lastfm.h wos.c wos.h escape.c escape.h
 endif
 
-artwork_la_SOURCES = artwork.c artwork.h $(artwork_net_sources)
+sdkdir = $(pkgincludedir)
+sdk_HEADERS = artwork.h
 
-artwork_la_LDFLAGS = -module -avoid-version
+artwork_la_SOURCES = artwork.c artwork.h cache.c cache.h artwork_internal.c artwork_internal.h artwork_flac.c artwork_flac.h coverinfo.c coverinfo.h $(artwork_net_sources) $(ogg_sources)
 
-if HAVE_IMLIB2
-ARTWORK_DEPS=$(IMLIB2_DEPS_LIBS)
-ARTWORK_CFLAGS=-DUSE_IMLIB2
-else
-ARTWORK_DEPS=$(JPEG_DEPS_LIBS) $(PNG_DEPS_LIBS)
-ARTWORK_CFLAGS=$(JPEG_DEPS_CFLAGS) $(PNG_DEPS_CFLAGS)
-endif
+artwork_la_LDFLAGS = -module -avoid-version
 
 if HAVE_FLAC
 FLAC_DEPS=$(FLAC_LIBS)
 flac_cflags=-DUSE_METAFLAC $(FLAC_CFLAGS)
 endif
 
-AM_CFLAGS = $(CFLAGS) $(ARTWORK_CFLAGS) $(flac_cflags) $(artwork_net_cflags) $(ogg_def) -std=c99
-artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) $(FLAC_DEPS) $(ogg_libs)
+artwork_la_CFLAGS = -std=c99  -I@top_srcdir@/external/mp4p/include -I@top_srcdir@/include -I@top_srcdir@/shared $(CFLAGS) $(ARTWORK_CFLAGS) $(flac_cflags) $(artwork_net_cflags) $(ogg_def) $(DISPATCH_CFLAGS)
+artwork_la_LIBADD = $(LDADD) $(ARTWORK_DEPS) $(FLAC_DEPS) $(DISPATCH_LIBS) $(ogg_libs) ../../shared/libmp4tagutil.la ../../external/libmp4p.la
 endif

deadbeef-0.6.2.tar.bz2/plugins/artwork/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/artwork/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/artwork/albumartorg.c -> deadbeef-1.9.6.tar.bz2/plugins/artwork/albumartorg.c Changed

deadbeef-0.6.2.tar.bz2/plugins/artwork/albumartorg.h -> deadbeef-1.9.6.tar.bz2/plugins/artwork/albumartorg.h Changed

deadbeef-0.6.2.tar.bz2/plugins/artwork/artwork.c -> deadbeef-1.9.6.tar.bz2/plugins/artwork/artwork.c Changed

@@ -1,7 +1,6 @@
 /*
- Album Art plugin for DeaDBeeF
- Copyright (C) 2009-2011 Viktor Semykin <thesame.ml@gmail.com>
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2022 Oleksiy Yakovenko and other contributors
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -23,1525 +22,1733 @@
 */
 
 #ifdef HAVE_CONFIG_H
-# include "../../config.h"
+ #include "../../config.h"
 #endif
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <dispatch/dispatch.h>
+#include <errno.h>
+#include <fnmatch.h>
+#include <libgen.h>
+#include <limits.h>
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
+#if HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
 #ifdef __linux__
 #include <sys/prctl.h>
 #endif
-#include <errno.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <fnmatch.h>
-#include <inttypes.h>
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#ifdef _WIN32
+#include <sys/utime.h>
 #endif
-#if HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
+#include <unistd.h>
+
+#include <deadbeef/deadbeef.h>
+#include "artwork_flac.h"
+#ifdef USE_OGG
+#include "artwork_ogg.h"
 #endif
-#include <assert.h>
-#include "../../deadbeef.h"
+#include "albumartorg.h"
 #include "artwork.h"
-#ifdef USE_VFS_CURL
+#include "artwork_internal.h"
+#include "cache.h"
+#include "coverinfo.h"
 #include "lastfm.h"
-#include "albumartorg.h"
+#include "musicbrainz.h"
+#include "mp4tagutil.h"
+#include <deadbeef/strdupa.h>
 #include "wos.h"
-#endif
 
-#ifdef USE_IMLIB2
-#include <Imlib2.h>
-static uintptr_t imlib_mutex;
-#else
-#include <jpeglib.h>
-#include <jerror.h>
-//#include <setjmp.h>
-#include <png.h>
-#endif
+//#define DEBUG_COUNTER 1
+//#define MEASURE_COVER_GET 1
 
-#ifdef USE_METAFLAC
-#include <FLAC/metadata.h>
+#ifndef DISPATCH_QUEUE_CONCURRENT
+#define DISPATCH_QUEUE_CONCURRENT NULL
 #endif
 
-#include "../../strdupa.h"
-
-#define min(x,y) ((x)<(y)?(x):(y))
+#define ENABLE_MUSICBRAINZ 0
+#define ENABLE_ALBUMART_ORG 0
 
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(...)
+#define trace(...) { deadbeef->log_detailed (&plugin.plugin.plugin, 0, __VA_ARGS__); }
 
-static char default_coverPATH_MAX;
-#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;
+ddb_artwork_plugin_t plugin;
+
+#define MAX_LISTENERS 100
+static ddb_artwork_listener_t listenersMAX_LISTENERS;
+static void *listeners_userdataMAX_LISTENERS;
+
+dispatch_queue_t sync_queue; // used in artwork_internal, therefore not static
+static dispatch_queue_t process_queue;
+static dispatch_queue_t fetch_queue;
+static dispatch_semaphore_t fetch_semaphore;
+
+// Grouping queries by source id
+static int64_t next_source_id;
+typedef struct query_group_s {
+ ddb_cover_query_t *query;
+ struct query_group_s *next;
+} query_group_item_t;
+
+static query_group_item_t **query_groups; // unique groups
+static int query_groups_count;
+static int query_groups_reserved;
+
+// Squashing queries
+// To handle concurrency correctly, we need to be able to squash the queries
+#define MAX_SQUASHED_QUERIES 50
+typedef struct artwork_query_s {
+ ddb_cover_query_t *queriesMAX_SQUASHED_QUERIES;
+ ddb_cover_callback_t callbacksMAX_SQUASHED_QUERIES;
+ int query_count;
+ struct artwork_query_s *next;
+} artwork_query_t;
+
+static artwork_query_t *query_head;
+static artwork_query_t *query_tail;
+
+// -
+
+static int64_t last_job_idx;
+static int64_t cancellation_idx;
+
+#define MAX_COVERS_IN_CACHE 20
+static ddb_cover_info_t *cover_cacheMAX_COVERS_IN_CACHE;
+
+#define DEFAULT_SAVE_TO_MUSIC_FOLDERS_FILENAME "cover.jpg"
+
+#ifdef ANDROID
+#define DEFAULT_SAVE_TO_MUSIC_FOLDERS 1
+static int artwork_save_to_music_folders = DEFAULT_SAVE_TO_MUSIC_FOLDERS;
+#else
+#define DEFAULT_SAVE_TO_MUSIC_FOLDERS 0
+int artwork_save_to_music_folders = DEFAULT_SAVE_TO_MUSIC_FOLDERS;
+#endif
 
-DB_FILE *current_file;
-
-#define MAX_CALLBACKS 200
-
-typedef struct cover_callback_s {
- artwork_callback cb;
- void *ud;
-} cover_callback_t;
-
-typedef struct cover_query_s {
- char *fname;
- char *artist;
- char *album;
- int size;
- cover_callback_t callbacksMAX_CALLBACKS;
- int numcb;
- 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;
-static uintptr_t cond;
-static volatile int terminate;
-static volatile int clear_queue;
-static intptr_t tid;
+static char *save_to_music_folders_filename;
 
 static int artwork_enable_embedded;
 static int artwork_enable_local;
 #ifdef USE_VFS_CURL
-static int artwork_enable_lfm;
-static int artwork_enable_aao;
-static int artwork_enable_wos;
+ static int artwork_enable_lfm;
+#if ENABLE_MUSICBRAINZ
+ static int artwork_enable_mb;
+#endif
+#if ENABLE_ALBUMART_ORG
+ static int artwork_enable_aao;
+#endif
+ static int artwork_enable_wos;
+#endif
+static int missing_artwork;
+static char *nocover_path;
+static int artwork_image_size;
+static int simplified_cache;
+
+static time_t cache_reset_time;
+static time_t default_reset_time;
+
+#define DEFAULT_FILEMASK "front.png;front.jpg;front.jpeg;folder.png;folder.jpg;folder.jpeg;cover.png;cover.jpg;cover.jpeg;f.png;f.jpg;f.jpeg;*front*.png;*front*.jpg;*front*.jpeg;*cover*.png;*cover*.jpg;*cover.jpeg;*folder*.png;*folder*.jpg;*folder*.jpeg;*.png;*.jpg;*.jpeg"
+#define DEFAULT_FOLDERS "art;scans;covers;artwork;artworks"
+
+static char *artwork_filemask;
+static char *artwork_folders;
+
+static char *album_tf;
+static char *artist_tf;
+static char *title_tf;
+static char *albumartist_tf;
+static char *query_compare_tf;
+static char *track_cache_filename_tf;
+static char *album_cache_filename_tf;
+static char *simplified_album_cache_filename_tf;
+
+// Replace illegal file path characters with "-"
+static char
+_fix_illegal_char (char c) {
+#ifdef _WIN32
+ static const char chars = "<>:\"/\\|?*";
+#else
+ static const char chars = ":/";
 #endif
-static time_t artwork_reset_time;
-static char artwork_filemask200;
 
-static const char *get_default_cover (void) {
- return default_cover;
+ if (strchr(chars, c)) {
+ return '-';
+ }
+ return c;
 }
 
 static int
-esc_char (char c) {
- if (c < 1
- || (c >= 'a' && c <= 'z')
- || (c >= 'A' && c <= 'Z')
- || (c >= '0' && c <= '9')
- || c == ' '
- || c == '_'
- || c == '-') {
- return c;
- }
- return '_';
+make_track_cache_filename (ddb_playItem_t *it, char *outpath, size_t outsize) {
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .it = it,
+ .flags = DDB_TF_CONTEXT_NO_DYNAMIC,
+ };
+
+ return deadbeef->tf_eval (&ctx, track_cache_filename_tf, outpath, (int)outsize);
 }
 
 static int
-make_cache_dir_path (char *path, int size, const char *artist, int img_size) {
- char esc_artistPATH_MAX;
- int i;
+make_album_cache_filename (ddb_playItem_t *it, char *outpath, size_t outsize) {
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .it = it,
+ .flags = DDB_TF_CONTEXT_NO_DYNAMIC,
+ };
+
+ return deadbeef->tf_eval (&ctx, simplified_cache ? simplified_album_cache_filename_tf : album_cache_filename_tf, outpath, (int)outsize);
+}
 
- if (artist) {
- for (i = 0; artisti; i++) {
- esc_artisti = esc_char (artisti);
- }
- esc_artisti = 0;
+static int
+make_track_cache_path (ddb_playItem_t *it, char *outpath, size_t outsize) {
+ outpath0 = '\0';
+
+ char root_pathPATH_MAX;
+ if (make_cache_root_path (root_path, sizeof(root_path)) < 0) {
+ return -1;
 }
- else {
- strcpy (esc_artist, "Unknown artist");
+
+ char cache_fnamePATH_MAX;
+ if (make_track_cache_filename(it, cache_fname, sizeof (cache_fname)) < 0) {
+ return -1;
 }
 
- const char *cache = getenv ("XDG_CACHE_HOME");
- int sz;
+ snprintf (outpath, outsize, "%s/%s.jpg", root_path, cache_fname);
 
- if (img_size == -1) {
- sz = snprintf (path, size, cache ? "%s/deadbeef/covers/" : "%s/.cache/deadbeef/covers/", cache ? cache : getenv ("HOME"));
- }
- else {
- sz = snprintf (path, size, cache ? "%s/deadbeef/covers-%d/" : "%s/.cache/deadbeef/covers-%d/", cache ? cache : getenv ("HOME"), img_size);
+ // sanitize
+ char *p = outpath + strlen(root_path) + 1;
+ while (*p) {
+ *p = _fix_illegal_char (*p);
+ p++;
 }
- path += sz;
 
- sz += snprintf (path, size-sz, "%s", esc_artist);
- for (char *p = path; *p; p++) {
- if (*p == '/') {
- *p = '_';
- }
- }
- return sz;
+ return 0;
 }
 
 static int
-make_cache_path2 (char *path, int size, const char *fname, const char *album, const char *artist, int img_size) {
- *path = 0;
+make_album_cache_path (ddb_playItem_t *it, char *outpath, int outsize) {
+ outpath0 = '\0';
 
- int unk = 0;
- int unk_artist = 0;
+ char root_pathPATH_MAX;
+ if (make_cache_root_path (root_path, sizeof(root_path)) < 0) {
+ return -1;
+ }
 
- if (!album || !(*album)) {
- album = "Unknown album";
- unk = 1;
+ char cache_fnamePATH_MAX;
+ if (make_album_cache_filename(it, cache_fname, sizeof (cache_fname)) < 0) {
+ return -1;
 }
- if (!artist || !(*artist)) {
- artist = "Unknown artist";
- unk_artist = 1;
+
+ snprintf (outpath, outsize, "%s/%s.jpg", root_path, cache_fname);
+
+ // sanitize
+ char *p = outpath + strlen(root_path) + 1;
+ while (*p) {
+ *p = _fix_illegal_char (*p);
+ p++;
 }
 
- if (unk)
- {
- if (fname) {
- album = fname;
- }
- else if (!unk_artist) {
- album = artist;
- }
- else {
- trace ("not possible to get any unique album name\n");
- return -1;
- }
+ return 0;
+}
+
+static int
+strings_equal (const char *s1, const char *s2) {
+ return (s1 == s2) || (s1 && s2 && !strcasecmp (s1, s2));
+}
+
+#ifndef FNM_CASEFOLD
+#define FNM_CASEFOLD FNM_IGNORECASE
+#endif
+
+static int
+vfs_scan_results (struct dirent *entry, const char *container_uri, ddb_cover_info_t *cover, const char *mask) {
+ /* VFS container, double check the match in case scandir didn't implement filtering */
+ if (!fnmatch (mask, entry->d_name, FNM_CASEFOLD)) {
+ trace ("found cover %s in %s\n", entry->d_name, container_uri);
+ size_t len = strlen (container_uri) + strlen(entry->d_name) + 2;
+ cover->image_filename = malloc (len);
+ snprintf (cover->image_filename, len, "%s:%s", container_uri, entry->d_name);
+ return 0;
 }
 
- char *p = path;
- char esc_albumPATH_MAX;
- const char *palbum = album;
- size_t l = strlen (album);
- if (l > 200) {
- palbum = album + l - 200;
+ return -1;
+}
+
+static int
+dir_scan_results (struct dirent *entry, const char *container, ddb_cover_info_t *cover) {
+ /* Local file in a directory */
+ trace ("found cover %s in local folder\n", entry->d_name);
+ size_t len = strlen (container) + strlen(entry->d_name) + 2;
+ cover->image_filename = malloc (len);
+ snprintf (cover->image_filename, len, "%s/%s", container, entry->d_name);
+ struct stat stat_struct;
+ if (!stat (cover->image_filename, &stat_struct) && S_ISREG (stat_struct.st_mode) && stat_struct.st_size > 0) {
+ return 0;
 }
- int i;
- for (i = 0; palbumi; i++) {
- esc_albumi = esc_char (palbumi);
+ else {
+ free (cover->image_filename);
+ cover->image_filename = NULL;
 }
- esc_albumi = 0;
 
- int sz = make_cache_dir_path (path, size, artist, img_size);
- size -= sz;
- path += sz;
- sz = snprintf (path, size, "/%s.jpg", esc_album);
- for (char *p = path+1; *p; p++) {
- if (*p == '/') {
- *p = '_';
+ return -1;
+}
+
+static int
+scan_local_path (const char *local_path, const char *uri, DB_vfs_t *vfsplug, ddb_cover_info_t *cover) {
+ struct dirent **files = NULL;
+ int (* custom_scandir)(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **));
+ custom_scandir = vfsplug ? vfsplug->scandir : scandir;
+ int files_count = custom_scandir (local_path, &files, NULL, NULL);
+
+ __block char *filemask = NULL;
+
+ dispatch_sync(sync_queue, ^{
+ filemask = strdup (artwork_filemask);
+ });
+
+ int err = -1;
+
+ if (files != NULL) {
+ const char *filemask_end = filemask + strlen (filemask);
+ char *p;
+ while ((p = strrchr (filemask, ';'))) {
+ *p = '\0';
 }
+
+ for (char *mask = filemask; mask < filemask_end; mask += strlen (mask)+1) {
+ for (int i = 0; i < files_count; i++) {
+ if (!fnmatch (mask, filesi->d_name, FNM_CASEFOLD)) {
+ if (uri) {
+ err = vfs_scan_results (filesi, uri, cover, mask);
+ }
+ else {
+ err = dir_scan_results (filesi, local_path, cover);
+ }
+ }
+ if (!err) {
+ break;
+ }
+ }
+ if (!err) {
+ break;
+ }
+ }
+ for (size_t i = 0; i < files_count; i++) {
+ free (filesi);
+ }
+ free (files);
 }
-}
 
-static void
-make_cache_path (char *path, int size, const char *album, const char *artist, int img_size) {
- make_cache_path2 (path, size, NULL, album, artist, img_size);
+ free (filemask);
+ return err;
 }
 
-static void
-queue_add (const char *fname, const char *artist, const char *album, int img_size, artwork_callback callback, void *user_data) {
- if (!artist) {
- artist = "";
- }
- if (!album) {
- album = "";
- }
- deadbeef->mutex_lock (mutex);
-
- for (cover_query_t *q = queue; q; q = q->next) {
- if (!strcasecmp (artist, q->artist) && !strcasecmp (album, q->album) && img_size == q->size) {
- // already in queue, add callback
- if (q->numcb < MAX_CALLBACKS && callback) {
- q->callbacksq->numcb.cb = callback;
- q->callbacksq->numcb.ud = user_data;
- q->numcb++;
+// FIXME: this returns only one path that matches subfolder. Usually that's enough, but can be improved.
+static char *
+get_case_insensitive_path (const char *local_path, const char *subfolder, DB_vfs_t *vfsplug) {
+ struct dirent **files = NULL;
+ int (* custom_scandir)(const char *, struct dirent ***, int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **));
+ custom_scandir = vfsplug ? vfsplug->scandir : scandir;
+ int files_count = custom_scandir (local_path, &files, NULL, NULL);
+ char *ret = NULL;
+ if (files != NULL) {
+ for (int i = 0; i < files_count; i++) {
+ if (!strcasecmp (subfolder, filesi->d_name)) {
+ size_t l = strlen (local_path) + strlen (filesi->d_name) + 2;
+ ret = malloc (l);
+ snprintf (ret, l, "%s/%s", local_path, filesi->d_name);
+ break;
 }
- deadbeef->mutex_unlock (mutex);
- return;
 }
+ for (size_t i = 0; i < files_count; i++) {
+ free (filesi);
+ }
+ free (files);
 }
+ return ret;
+}
 
- trace ("artwork:queue_add %s %s %s %d\n", fname, artist, album, img_size);
- cover_query_t *q = malloc (sizeof (cover_query_t));
- memset (q, 0, sizeof (cover_query_t));
- q->fname = strdup (fname);
- q->artist = strdup (artist);
- q->album = strdup (album);
- q->size = img_size;
- q->callbacksq->numcb.cb = callback;
- q->callbacksq->numcb.ud = user_data;
- q->numcb++;
- if (queue_tail) {
- queue_tail->next = q;
- queue_tail = q;
+static int
+local_image_file (const char *local_path, const char *uri, DB_vfs_t *vfsplug, ddb_cover_info_t *cover) {
+ if (!artwork_filemask) {
+ return -1;
 }
- else {
- queue = queue_tail = q;
+
+ char *p;
+
+ char *folders = strdup (artwork_folders);
+ const char *folders_end = folders + strlen (folders);
+ while ((p = strrchr (folders, ';'))) {
+ *p = '\0';
 }
- deadbeef->mutex_unlock (mutex);
- deadbeef->cond_signal (cond);
-}
 
-static void
-queue_pop (void) {
- deadbeef->mutex_lock (mutex);
- cover_query_t *next = queue ? queue->next : NULL;
- if (queue) {
- if (queue->fname) {
- free (queue->fname);
- }
- if (queue->artist) {
- free (queue->artist);
- }
- if (queue->album) {
- free (queue->album);
- }
- for (int i = 0; i < queue->numcb; i++) {
- if (queue->callbacksi.cb) {
- queue->callbacksi.cb (NULL, NULL, NULL, queue->callbacksi.ud);
- }
+ int root = 1;
+ char *folder = folders;
+ while (folder < folders_end) {
+ char *path;
+ if (root) {
+ root = 0;
+ path = strdup (local_path);
 }
- free (queue);
- }
- queue = next;
- if (!queue) {
- queue_tail = NULL;
+ else {
+ path = get_case_insensitive_path (local_path, folder, vfsplug);
+ folder += strlen (folder)+1;
+ }
+ trace ("scanning %s for artwork\n", path);
+ if (path && !scan_local_path (path, uri, vfsplug, cover)) {
+ free (folders);
+ free (path);
+ return 0;
+ }
+ free (path);
 }
- deadbeef->mutex_unlock (mutex);
+
+ trace ("No cover art files in local folder\n");
+ free (folders);
+ return -1;
 }
 
-static int
-check_dir (const char *dir, mode_t mode)
-{
- char *tmp = strdup (dir);
- char *slash = tmp;
- struct stat stat_buf;
- do
- {
- slash = strstr (slash+1, "/");
- if (slash)
- *slash = 0;
- if (-1 == stat (tmp, &stat_buf))
- {
- trace ("creating dir %s\n", tmp);
- if (0 != mkdir (tmp, mode))
- {
- trace ("Failed to create %s (%d)\n", tmp, errno);
- free (tmp);
- return 0;
- }
+static const uint8_t *
+id3v2_skip_str (int enc, const uint8_t *ptr, const uint8_t *end) {
+ if (enc == 0 || enc == 3) {
+ while (ptr < end && *ptr) {
+ ptr++;
 }
- if (slash)
- *slash = '/';
- } while (slash);
- free (tmp);
- return 1;
+ ptr++;
+ return ptr < end ? ptr : NULL;
+ }
+ else {
+ while (ptr < end-1 && (ptr0 || ptr1)) {
+ ptr += 2;
+ }
+ ptr += 2;
+ return ptr < end ? ptr : NULL;
+ }
 }
 
-#ifndef USE_IMLIB2
-struct my_error_mgr {
- struct jpeg_error_mgr pub;	/* "public" fields */
+static const uint8_t *
+id3v2_artwork (const DB_id3v2_frame_t *f, int minor_version, int type) {
+ if ((minor_version > 2 && strcmp (f->id, "APIC")) || (minor_version == 2 && strcmp (f->id, "PIC"))) {
+ return NULL;
+ }
 
- jmp_buf setjmp_buffer;	/* for return to caller */
-};
+ if (f->size < 20) {
+ trace ("artwork: id3v2 APIC frame is too small\n");
+ return NULL;
+ }
 
-typedef struct my_error_mgr * my_error_ptr;
+ const uint8_t *data = f->data;
 
-METHODDEF(void)
-my_error_exit (j_common_ptr cinfo)
-{
- /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */
- my_error_ptr myerr = (my_error_ptr) cinfo->err;
+ if (minor_version == 4 && (f->flags1 & 1)) {
+ data += 4;
+ }
+ const uint8_t *end = f->data + f->size;
+ int enc = *data;
+ data++;
 
-// (*cinfo->err->output_message) (cinfo);
+ if (minor_version > 2) {
+ // mime type is ascii always, the enc above is for the picture type
+ const uint8_t *mime_end = id3v2_skip_str (0, data, end);
+ if (!mime_end) {
+ trace ("artwork: corrupted id3v2 APIC frame\n");
+ return NULL;
+ }
+ if (type == -1 || *mime_end == type) {
+ trace ("artwork: picture type=%d\n", *mime_end);
+ return NULL;
+ }
+ trace ("artwork: mime-type=%s, picture type: %d\n", data, *mime_end);
+ data = mime_end;
+ }
+ else {
+ data += 3; // image format
+ }
+ data++; // picture type
+ data = id3v2_skip_str (enc, data, end); // description
+ if (!data) {
+ trace ("artwork: corrupted id3v2 APIC frame\n");
+ return NULL;
+ }
 
- /* Return control to the setjmp point */
- longjmp(myerr->setjmp_buffer, 1);
+ return data;
 }
 
+static const uint8_t *
+apev2_artwork (const DB_apev2_frame_t *f) {
+ if (strcasecmp (f->key, "cover art (front)")) {
+ return NULL;
+ }
 
-static int
-jpeg_resize (const char *fname, const char *outname, int scaled_size) {
- trace ("resizing %s into %s\n", fname, outname);
- struct jpeg_decompress_struct cinfo;
- struct jpeg_compress_struct cinfo_out;
+ const uint8_t *data = f->data;
+ const uint8_t *end = f->data + f->size;
+ while (data < end && *data)
+ data++;
+ if (data == end) {
+ trace ("artwork: apev2 cover art frame has no name\n");
+ return NULL;
+ }
 
- memset (&cinfo, 0, sizeof (cinfo));
- memset (&cinfo_out, 0, sizeof (cinfo_out));
+ size_t sz = end - ++data;
+ if (sz < 20) {
+ trace ("artwork: apev2 cover art frame is too small\n");
+ return NULL;
+ }
+
+ return data;
+}
 
- struct my_error_mgr jerr;
 
- uint8_t *c;
- FILE *fp = NULL, *out = NULL;
 
+static int
+id3_extract_art (ddb_cover_info_t *cover) {
+ int err = -1;
 
- cinfo.err = jpeg_std_error (&jerr.pub);
+ DB_id3v2_tag_t id3v2_tag;
+ memset (&id3v2_tag, 0, sizeof (id3v2_tag));
+ DB_FILE *id3v2_fp = deadbeef->fopen (cover->priv->filepath);
+ if (id3v2_fp && !deadbeef->junk_id3v2_read_full (NULL, &id3v2_tag, id3v2_fp)) {
+ int minor_version = id3v2_tag.version0;
+ DB_id3v2_frame_t *fprev = NULL;
+ for (DB_id3v2_frame_t *f = id3v2_tag.frames; f; f = f->next) {
+ const uint8_t *image_data = id3v2_artwork (f, minor_version, 3);
+ if (!image_data) {
+ // try any cover if front is not available
+ image_data = id3v2_artwork (f, minor_version, 0);
+ }
+ if (image_data) {
+ const size_t sz = f->size - (image_data - f->data);
+ if (sz <= 0) {
+ continue;
+ }
+ // steal the frame memory from DB_id3v2_tag_t
+ if (fprev) {
+ fprev->next = f->next;
+ }
+ else {
+ id3v2_tag.frames = f->next;
+ }
 
- jerr.pub.error_exit = my_error_exit;
- /* Establish the setjmp return context for my_error_exit to use. */
- if (setjmp(jerr.setjmp_buffer)) {
- /* If we get here, the JPEG code has signaled an error.
- * We need to clean up the JPEG object, close the input file, and return.
- */
- jpeg_destroy_decompress(&cinfo);
- jpeg_destroy_compress(&cinfo_out);
- if (fp) {
- fclose(fp);
+ cover->priv->blob = (char *)f;
+ cover->priv->blob_size = f->size;
+ cover->priv->blob_image_offset = (uint64_t)((char *)image_data - (char *)cover->priv->blob);
+ cover->priv->blob_image_size = sz;
+ err = 0;
+ break;
+ }
+ fprev = f;
 }
- if (out) {
- fclose (out);
+ }
+ deadbeef->junk_id3v2_free (&id3v2_tag);
+ if (id3v2_fp) {
+ deadbeef->fclose (id3v2_fp);
+ }
+ return err;
+}
+
+static int
+apev2_extract_art (ddb_cover_info_t *cover) {
+ int err = -1;
+ DB_apev2_tag_t apev2_tag;
+ memset (&apev2_tag, 0, sizeof (apev2_tag));
+ DB_FILE *apev2_fp = deadbeef->fopen (cover->priv->filepath);
+ if (apev2_fp && !deadbeef->junk_apev2_read_full (NULL, &apev2_tag, apev2_fp)) {
+ DB_apev2_frame_t *fprev = NULL;
+ for (DB_apev2_frame_t *f = apev2_tag.frames; f; f = f->next) {
+ const uint8_t *image_data = apev2_artwork (f);
+ if (image_data) {
+ const size_t sz = f->size - (image_data - f->data);
+ if (sz <= 0) {
+ continue;
+ }
+ // steal the frame memory from DB_id3v2_tag_t
+ if (fprev) {
+ fprev->next = f->next;
+ }
+ else {
+ apev2_tag.frames = f->next;
+ }
+
+ cover->priv->blob = (char *)f;
+ cover->priv->blob_size = f->size;
+ cover->priv->blob_image_offset = (uint64_t)((char *)image_data - (char *)cover->priv->blob);
+ cover->priv->blob_image_size = sz;
+ err = 0;
+ break;
+ }
+ fprev = f;
 }
- return -1;
+
 }
+ deadbeef->junk_apev2_free (&apev2_tag);
+ if (apev2_fp) {
+ deadbeef->fclose (apev2_fp);
+ }
+ return err;
+}
 
- jpeg_create_decompress (&cinfo);
+static int
+mp4_extract_art (ddb_cover_info_t *cover) {
+ int ret = -1;
+ mp4p_atom_t *mp4file = NULL;
+ DB_FILE* fp = NULL;
+ uint8_t* image_blob = NULL;
 
- fp = fopen (fname, "rb");
- if (!fp) {
+ if (!strcasestr (cover->priv->filepath, ".mp4") && !strcasestr (cover->priv->filepath, ".m4a") && !strcasestr (cover->priv->filepath, ".m4b")) {
 return -1;
 }
- out = fopen (outname, "w+b");
- if (!out) {
- fclose (fp);
- return -1;
+
+ fp = deadbeef->fopen (cover->priv->filepath);
+ if (!fp) {
+ goto error;
 }
 
- jpeg_stdio_src (&cinfo, fp);
+ mp4p_file_callbacks_t callbacks = {0};
+ callbacks.ptrhandle = fp;
+ mp4_init_ddb_file_callbacks (&callbacks);
+ mp4file = mp4p_open(&callbacks);
+ if (!mp4file) {
+ goto error;
+ }
 
- jpeg_read_header (&cinfo, TRUE);
- jpeg_start_decompress (&cinfo);
+ mp4p_atom_t *covr = mp4_get_cover_atom(mp4file);
+ if (!covr) {
+ goto error;
+ }
 
- int i;
+ mp4p_ilst_meta_t *data = covr->data;
 
- cinfo_out.err = cinfo.err;
+ uint32_t sz = data->data_size;
+ image_blob = malloc (sz);
+ if (data->blob) {
+ image_blob = memcpy (image_blob, data->blob, sz);
+ }
+ else if (data->values) {
+ uint16_t *v = data->values;
+ for (size_t i = 0; i < sz/2; i++, v++) {
+ image_blobi*2+0 = (*v) >> 8;
+ image_blobi*2+1 = (*v) & 0xff;
+ }
+ }
+ else {
+ goto error;
+ }
 
- jpeg_create_compress(&cinfo_out);
+ cover->priv->blob = (char *)image_blob;
+ image_blob = NULL;
+ cover->priv->blob_size = data->data_size;
+ cover->priv->blob_image_size = data->data_size;
+ ret = 0;
 
- jpeg_stdio_dest(&cinfo_out, out);
+error:
+ if (image_blob) {
+ free(image_blob);
+ image_blob = NULL;
+ }
+ if (mp4file) {
+ mp4p_atom_free_list (mp4file);
+ mp4file = NULL;
+ }
+ if (fp) {
+ deadbeef->fclose (fp);
+ fp = NULL;
+ }
+ return ret;
+}
 
- int sw, sh;
- if (deadbeef->conf_get_int ("artwork.scale_towards_longer", 1)) {
- if (cinfo.image_width > cinfo.image_height) {
- sh = scaled_size;
- sw = scaled_size * cinfo.image_width / cinfo.image_height;
+static int
+web_lookups (const char *cache_path, ddb_cover_info_t *cover) {
+ if (!cache_path) {
+ return -1;
+ }
+#ifdef USE_VFS_CURL
+ if (artwork_enable_lfm) {
+ if (!fetch_from_lastfm (cover->priv->artist, cover->priv->album, cache_path)) {
+ cover->image_filename = strdup (cache_path);
+ return 1;
 }
- else {
- sw = scaled_size;
- sh = scaled_size * cinfo.image_height / cinfo.image_width;
+ if (errno == ECONNABORTED) {
+ return -1;
 }
 }
- else {
- if (cinfo.image_width < cinfo.image_height) {
- sh = scaled_size;
- sw = scaled_size * cinfo.image_width / cinfo.image_height;
+#if ENABLE_MUSICBRAINZ
+ // Albumart.org and Musicbrainz have either changed their APIs, or are broken in general -- therefore disabled.
+ if (artwork_enable_mb) {
+ if (!fetch_from_musicbrainz (cover->artist, cover->album, cache_path)) {
+ cover->image_filename = strdup (cache_path);
+ return 1;
 }
- else {
- sw = scaled_size;
- sh = scaled_size * cinfo.image_height / cinfo.image_width;
+ if (errno == ECONNABORTED) {
+ return -1;
 }
 }
+#endif
 
+#if ENABLE_ALBUMART_ORG
+ if (artwork_enable_aao) {
+ if (!fetch_from_albumart_org (cover->artist, cover->album, cache_path)) {
+ cover->image_filename = strdup (cache_path);
+ return 1;
+ }
+ if (errno == ECONNABORTED) {
+ return -1;
+ }
+ }
+#endif
+#endif
 
- cinfo_out.image_width = sw;
- cinfo_out.image_height = sh;
- cinfo_out.input_components = cinfo.output_components;
- cinfo_out.in_color_space = cinfo.out_color_space;
+ return -1;
+}
 
- jpeg_set_defaults(&cinfo_out);
+static char *
+vfs_path (const char *fname) {
+ if (fname0 == '/' || strstr (fname, "file://") == fname) {
+ return NULL;
+ }
 
- jpeg_set_quality(&cinfo_out, 100, TRUE);
- jpeg_start_compress(&cinfo_out, TRUE);
+ char *p = strstr (fname, "://");
+ if (p) {
+ p += 3;
+ char *q = strrchr (p, ':');
+ if (q) {
+ *q = '\0';
+ }
+ }
+ return p;
+}
 
- float sy = 0;
- float dy = (float)cinfo.output_height / (float)sh;
+static DB_vfs_t *
+scandir_plug (const char *vfs_fname) {
+ DB_vfs_t **vfsplugs = deadbeef->plug_get_vfs_list ();
+ for (size_t i = 0; vfsplugsi; i++) {
+ if (vfsplugsi->is_container && vfsplugsi->is_container (vfs_fname) && vfsplugsi->scandir) {
+ return vfsplugsi;
+ }
+ }
 
- while (cinfo.output_scanline < cinfo.output_height)
- {
- uint8_t bufcinfo.output_width * cinfo.output_components;
- uint8_t *ptr = buf;
- jpeg_read_scanlines (&cinfo, &ptr, 1);
+ return NULL;
+}
 
- // scale row
- uint8_t out_bufsw * cinfo.output_components;
- float sx = 0;
- float dx = (float)cinfo.output_width/(float)sw;
- for (int i = 0; i < sw; i++) {
- memcpy (&out_bufi * cinfo.output_components, &buf(int)sx * cinfo.output_components, cinfo.output_components);
- sx += dx;
- }
+static int
+_is_path_newer_than_time (const char *fname, const time_t time) {
+ struct stat stat_buf;
+ return !stat (fname, &stat_buf) && stat_buf.st_mtime > time;
+}
 
- while ((int)sy == cinfo.output_scanline-1) {
- uint8_t *ptr = out_buf;
- jpeg_write_scanlines(&cinfo_out, &ptr, 1);
- sy += dy;
+// returns 1 if enough time passed since the last attemp to find the requested cover
+static int
+recheck_missing_artwork (const char *input_fname, const time_t cache_mtime) {
+ int res = 0;
+ char *fname = strdup (input_fname);
+ /* Check if local files could have new associated artwork */
+ if (deadbeef->is_local_file (fname)) {
+ char *vfs_fname = vfs_path (fname);
+ const char *real_fname = vfs_fname ? vfs_fname : fname;
+
+ /* Recheck artwork if file (track or VFS container) was modified since the last check */
+ if (_is_path_newer_than_time (real_fname, cache_mtime)) {
+ return 1;
 }
+
+ /* Recheck local artwork if the directory contents have changed */
+ char *dname = strdup (dirname (fname));
+ res = artwork_enable_local && _is_path_newer_than_time (dname, cache_mtime);
+ free (dname);
 }
 
- jpeg_finish_compress(&cinfo_out); //Always finish
- jpeg_destroy_compress(&cinfo_out); //Free resources
+ free (fname);
+ return res;
+}
 
- jpeg_finish_decompress (&cinfo);
- jpeg_destroy_decompress (&cinfo);
+static void
+_touch(const char *path) {
+ struct stat stat_struct;
+ if (0 != stat (path, &stat_struct)) {
+ FILE *fp = fopen(path,"w+b");
+ if (fp != NULL) {
+ (void)fclose(fp);
+ }
+ }
+ else {
+#ifdef _WIN32
+ (void)_utime(path, NULL);
+#else
+ (void)utimes(path, NULL);
+#endif
+ }
+}
 
- fclose(fp);
- fclose(out);
+static void
+_free_blob (ddb_cover_info_t *cover) {
+ free (cover->priv->blob);
+ cover->priv->blob = NULL;
+ cover->priv->blob_size = 0;
+ cover->priv->blob_image_offset = 0;
+ cover->priv->blob_image_size = 0;
+}
 
- return 0;
+static void
+_consume_blob (ddb_cover_info_t *cover, const char *cache_path) {
+ if (cover->image_filename != NULL) {
+ _free_blob (cover);
+ return;
+ }
+ if (cover->priv->blob != NULL) {
+ write_file(cache_path, cover->priv->blob + cover->priv->blob_image_offset, cover->priv->blob_image_size);
+ cover->image_filename = strdup (cache_path);
+ _free_blob(cover);
+ }
 }
 
-static int
-png_resize (const char *fname, const char *outname, int scaled_size) {
- png_structp png_ptr = NULL;
- png_infop info_ptr = NULL;
- unsigned int sig_read = 0;
- png_uint_32 width, height;
- int bit_depth, color_type, interlace_type;
- int number_passes;
- png_uint_32 row;
- int bpp;
- int err = -1;
- FILE *fp = NULL;
- FILE *out = NULL;
- struct my_error_mgr jerr;
- struct jpeg_compress_struct cinfo_out;
+// Behavior:
+// Found in cache: сache path is returned
+// Local cover: save to cache & return path
+// Embedded cover: save to cache & return blob
+// Web cover: save_to_local ? save_to_local&return_path : save_to_cache&return_path
+static void
+process_query (ddb_cover_info_t *cover) {
+ int islocal = deadbeef->is_local_file (cover->priv->filepath);
 
- fp = fopen(fname, "rb");
- if (!fp) {
- goto error;
- }
+ struct stat cache_stat;
 
- png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if (!png_ptr) {
- goto error;
+ int res;
+ if (!simplified_cache && cover->priv->track_cache_path0) {
+ res = stat (cover->priv->track_cache_path, &cache_stat);
+ if (!res && cache_stat.st_size != 0) {
+ cover->image_filename = strdup(cover->priv->track_cache_path);
+ cover->cover_found = 1;
+ return;
+ }
 }
 
- if (setjmp(png_jmpbuf((png_ptr))))
- {
- fprintf (stderr, "failed to read png: %s\n", fname);
- goto error;
+ if (cover->priv->album_cache_path0) {
+ res = stat (cover->priv->album_cache_path, &cache_stat);
+ if (!res && cache_stat.st_size != 0) {
+ cover->image_filename = strdup(cover->priv->album_cache_path);
+ cover->cover_found = 1;
+ return;
+ }
+ }
+ else {
+ trace ("artwork: undefined album cache path\n");
+ return;
 }
- png_init_io(png_ptr, fp);
 
- info_ptr = png_create_info_struct (png_ptr);
- if (!info_ptr) {
- goto error;
+ // Flood control, don't retry missing artwork for an hour unless something changes
+ if (!res && cache_stat.st_mtime + 60*60 > time (NULL)) {
+ int recheck = cache_stat.st_size == 0 || recheck_missing_artwork (cover->priv->filepath, cache_stat.st_mtime);
+ if (!recheck) {
+ return;
+ }
 }
- // if (setjmp (png_ptr->jmpbuf)) {
- // goto err;
- // }
-
- png_set_sig_bytes (png_ptr, sig_read);
-
- png_read_info(png_ptr, info_ptr);
-
- png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- &interlace_type, NULL, NULL);
-
- /* Tell libpng to strip 16 bit/color files down to 8 bits/color */
- png_set_strip_16(png_ptr);
-
- /* Strip alpha bytes from the input data without combining with the
- * background (not recommended).
- */
- png_set_strip_alpha(png_ptr);
-
- /* Extract multiple pixels with bit depths of 1, 2, and 4 from a single
- * byte into separate bytes (useful for paletted and grayscale images).
- */
- png_set_packing(png_ptr);
-
- /* Expand paletted colors into true RGB triplets */
- if (color_type == PNG_COLOR_TYPE_PALETTE)
- png_set_palette_to_rgb(png_ptr);
-
- /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
- if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
- png_set_expand_gray_1_2_4_to_8(png_ptr);
-
- // /* Expand paletted or RGB images with transparency to full alpha channels
- // * so the data will be available as RGBA quartets.
- // */
- // if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
- // png_set_tRNS_to_alpha(png_ptr);
-
- // /* Set the background color to draw transparent and alpha images over.
- // * It is possible to set the red, green, and blue components directly
- // * for paletted images instead of supplying a palette index. Note that
- // * even if the PNG file supplies a background, you are not required to
- // * use it - you should use the (solid) application background if it has one.
- // */
- //
- // png_color_16 my_background, *image_background;
- //
- // if (png_get_bKGD(png_ptr, info_ptr, &image_background))
- // png_set_background(png_ptr, image_background,
- // PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
- // else
- // png_set_background(png_ptr, &my_background,
- // PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
-
- // screen_gamma = 2.2; /* A good guess for a PC monitor in a dimly
- // lit room */
-
- /* Tell libpng to handle the gamma conversion for you. The final call
- * is a good guess for PC generated images, but it should be configurable
- * by the user at run time by the user. It is strongly suggested that
- * your application support gamma correction.
- */
-
- // int intent;
- //
- // if (png_get_sRGB(png_ptr, info_ptr, &intent))
- // png_set_gamma(png_ptr, screen_gamma, 0.45455);
- // else
- // {
- // double image_gamma;
- // if (png_get_gAMA(png_ptr, info_ptr, &image_gamma))
- // png_set_gamma(png_ptr, screen_gamma, image_gamma);
- // else
- // png_set_gamma(png_ptr, screen_gamma, 0.45455);
- // }
-
- // /* Flip the RGB pixels to BGR (or RGBA to BGRA) */
- // if (color_type & PNG_COLOR_MASK_COLOR)
- // png_set_bgr(png_ptr);
- //
- // /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
- // png_set_swap_alpha(png_ptr);
- //
- // /* Swap bytes of 16 bit files to least significant byte first */
- // png_set_swap(png_ptr);
- //
- // /* Add filler (or alpha) byte (before/after each RGB triplet) */
- // png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
-
- /* Turn on interlace handling. REQUIRED if you are not using
- * png_read_image(). To see how to handle interlacing passes,
- * see the png_read_row() method below:
- */
- number_passes = png_set_interlace_handling(png_ptr);
-
- // /* Optional call to gamma correct and add the background to the palette
- // * and update info structure. REQUIRED if you are expecting libpng to
- // * update the palette for you (ie you selected such a transform above).
- // */
- // png_read_update_info(png_ptr, info_ptr);
-
- /* Allocate the memory to hold the image using the fields of info_ptr. */
-
- /* The easiest way to read the image: */
-
- png_bytep *row_pointers = png_malloc(png_ptr, height*sizeof (png_bytep));
-
- /* Clear the pointer array */
- for (row = 0; row < height; row++)
- row_pointersrow = NULL;
-
- png_read_update_info(png_ptr, info_ptr);
-
- for (row = 0; row < height; row++)
- row_pointersrow = png_malloc(png_ptr, png_get_rowbytes(png_ptr,
- info_ptr));
-
- /* Now it's time to read the image. One of these methods is REQUIRED */
- /* The other way to read images - deal with interlacing: */
-
- png_read_image(png_ptr, row_pointers);
-
-
- out = fopen (outname, "w+b");
- if (!out) {
- fclose (fp);
- return -1;
+
+ if (artwork_enable_local && islocal) {
+ char *fname_copy = strdup (cover->priv->filepath);
+ if (fname_copy) {
+ char *vfs_fname = vfs_path (fname_copy);
+ if (vfs_fname) {
+ /* Search inside scannable VFS containers */
+ DB_vfs_t *plugin = scandir_plug (vfs_fname);
+ if (plugin && !local_image_file (vfs_fname, fname_copy, plugin, cover)) {
+ free (fname_copy);
+ copy_file(cover->image_filename, cover->priv->album_cache_path);
+ cover->cover_found = 1;
+ return;
+ }
+ }
+
+ /* Search in file directory */
+ if (!local_image_file (dirname (vfs_fname ? vfs_fname : fname_copy), NULL, NULL, cover)) {
+ free (fname_copy);
+ copy_file(cover->image_filename, cover->priv->album_cache_path);
+ cover->cover_found = 1;
+ return;
+ }
+
+ free (fname_copy);
+ }
 }
 
+ if (artwork_enable_embedded && islocal) {
+#ifdef USE_METAFLAC
+ // try to load embedded from flac metadata
+ trace ("trying to load artwork from Flac tag for %s\n", cover->priv->filepath);
+ if (!flac_extract_art (cover)) {
+ _consume_blob (cover, simplified_cache ? cover->priv->album_cache_path : cover->priv->track_cache_path);
+ cover->cover_found = 1;
+ return;
+ }
+#endif
 
- int i;
+ // try to load embedded from id3v2
+ trace ("trying to load artwork from id3v2 tag for %s\n", cover->priv->filepath);
+ if (!id3_extract_art (cover)) {
+ _consume_blob (cover, simplified_cache ? cover->priv->album_cache_path : cover->priv->track_cache_path);
+ cover->cover_found = 1;
+ return;
+ }
 
- cinfo_out.err = jpeg_std_error (&jerr.pub);
- jerr.pub.error_exit = my_error_exit;
- /* Establish the setjmp return context for my_error_exit to use. */
- if (setjmp(jerr.setjmp_buffer)) {
- /* If we get here, the JPEG code has signaled an error.
- * We need to clean up the JPEG object, close the input file, and return.
- */
- goto error;
+ // try to load embedded from apev2
+ trace ("trying to load artwork from apev2 tag for %s\n", cover->priv->filepath);
+ if (!apev2_extract_art (cover)) {
+ _consume_blob (cover, simplified_cache ? cover->priv->album_cache_path : cover->priv->track_cache_path);
+ cover->cover_found = 1;
+ return;
+ }
+
+ // try to load embedded from mp4
+ trace ("trying to load artwork from mp4 tag for %s\n", cover->priv->filepath);
+ if (!mp4_extract_art (cover)) {
+ _consume_blob (cover, simplified_cache ? cover->priv->album_cache_path : cover->priv->track_cache_path);
+ cover->cover_found = 1;
+ return;
+ }
+
+#ifdef USE_OGG
+ trace ("trying to load artwork from ogg tag for %s\n", cover->priv->filepath);
+ if (!ogg_extract_art (cover)) {
+ _consume_blob (cover, simplified_cache ? cover->priv->album_cache_path : cover->priv->track_cache_path);
+ cover->cover_found = 1;
+ return;
+ }
+#endif
 }
 
- jpeg_create_compress(&cinfo_out);
+#ifdef USE_VFS_CURL
+ // Don't do anything if all web lookups are off
+ if (!artwork_enable_wos
+ && !artwork_enable_lfm
+#if ENABLE_MUSICBRAINZ
+ && !artwork_enable_mb
+#endif
+#if ENABLE_ALBUMART_ORG
+ && !artwork_enable_aao
+#endif
+ ) {
+ _touch(cover->priv->album_cache_path);
+ return;
+ }
 
- jpeg_stdio_dest(&cinfo_out, out);
+ /* Web lookups */
+ res = -1;
 
- int sw, sh;
- if (deadbeef->conf_get_int ("artwork.scale_towards_longer", 1)) {
- if (width > height) {
- sh = scaled_size;
- sw = scaled_size * width / height;
+ // don't attempt to load AY covers from regular music services
+ if (artwork_enable_wos && strlen (cover->priv->filepath) > 3 && !strcasecmp (cover->priv->filepath + strlen (cover->priv->filepath) - 3, ".ay")) {
+ if (!fetch_from_wos (cover->priv->title, simplified_cache ? cover->priv->album_cache_path : cover->priv->track_cache_path)) {
+ cover->image_filename = strdup(simplified_cache ? cover->priv->album_cache_path : cover->priv->track_cache_path);
+ res = 1;
 }
- else {
- sw = scaled_size;
- sh = scaled_size * height / width;
+ if (errno == ECONNABORTED) {
+ res = -1;
 }
 }
 else {
- if (width < height) {
- sh = scaled_size;
- sw = scaled_size * width / height;
- }
- else {
- sw = scaled_size;
- sh = scaled_size * height / width;
+ res = web_lookups (cover->priv->album_cache_path, cover);
+ }
+ if (res < 0) {
+ /* Try stripping parenthesised text off the end of the album name */
+ char *p = strpbrk (cover->priv->album, "(");
+ if (p) {
+ *p = '\0';
+ res = web_lookups (cover->priv->album_cache_path, cover);
+ *p = '(';
 }
 }
+ if (res >= 0) {
+ cover->cover_found = res;
 
- cinfo_out.image_width = sw;
- cinfo_out.image_height = sh;
- cinfo_out.input_components = 3;
- cinfo_out.in_color_space = JCS_RGB;
+ if (res && artwork_save_to_music_folders && cover->image_filename && !cover->priv->is_compilation) {
+ // save to the music folder (only if not present)
+ char *slash = strrchr (cover->priv->filepath, '/');
 
- jpeg_set_defaults(&cinfo_out);
+ if (!slash) {
+ return;
+ }
+ size_t len = slash - cover->priv->filepath + 1;
 
- jpeg_set_quality(&cinfo_out, 100, TRUE);
- jpeg_start_compress(&cinfo_out, TRUE);
+ __block char *covername = NULL;
+ dispatch_sync(sync_queue, ^{
+ if (save_to_music_folders_filename != NULL) {
+ covername = strdup(save_to_music_folders_filename);
+ }
+ });
+ if (covername != NULL) {
+ size_t covername_len = strlen (covername) + 1;
+ size_t coverpath_len = len + covername_len;
+ char *coverpath = malloc(coverpath_len);
+ memcpy (coverpath, cover->priv->filepath, len);
+ memcpy (coverpath + len, covername, covername_len);
+ free (covername);
+ covername = NULL;
+
+ struct stat stat_struct;
+ if (stat (coverpath, &stat_struct)) {
+ copy_file(cover->image_filename, coverpath);
+ }
+ free (coverpath);
+ coverpath = NULL;
+ }
+ }
 
- float sy = 0;
- float dy = (float)height / (float)sh;
+ return;
+ }
+ else {
+ _touch(cover->priv->album_cache_path);
+ }
+#endif
+}
 
- int input_y = 1;
- while (input_y <= height)
- {
- uint8_t *buf = row_pointersinput_y-1;
+#pragma mark - In memory cache
 
- // scale row
- uint8_t out_bufsw * cinfo_out.input_components;
- float sx = 0;
- float dx = (float)width/(float)sw;
- for (int i = 0; i < sw; i++) {
- memcpy (&out_bufi * cinfo_out.input_components, &buf(int)sx * cinfo_out.input_components, cinfo_out.input_components);
- sx += dx;
+static void
+cover_update_cache (ddb_cover_info_t *cover) {
+ // any empty items?
+ time_t minTimestamp = INT64_MAX;
+ int minTimestampIdx = -1;
+ int emptyIdx = -1;
+ for (int i = 0; i < MAX_COVERS_IN_CACHE; i++) {
+ if (!cover_cachei) {
+ emptyIdx = i;
+ break;
 }
 
- while ((int)sy == input_y-1) {
- uint8_t *ptr = out_buf;
- jpeg_write_scanlines(&cinfo_out, &ptr, 1);
- sy += dy;
+ if (cover_cachei->priv->timestamp < minTimestamp || emptyIdx == -1) {
+ minTimestamp = cover_cachei->priv->timestamp;
+ minTimestampIdx = i;
 }
- input_y++;
 }
 
- jpeg_finish_compress(&cinfo_out); //Always finish
- jpeg_destroy_compress(&cinfo_out); //Free resources
-
- /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */
- png_read_end(png_ptr, info_ptr);
-
- err = 0;
-error:
- if (out) {
- fclose (out);
+ if (emptyIdx < 0) {
+ cover_info_release(cover_cacheminTimestampIdx);
+ cover_cacheminTimestampIdx = NULL;
+ emptyIdx = minTimestampIdx;
 }
- if (fp) {
- fclose (fp);
+ cover_cacheemptyIdx = cover;
+ cover->priv->timestamp = time(NULL);
+ cover_info_ref (cover);
+}
+
+static void
+cover_cache_free (void) {
+ for (int i = 0; i < MAX_COVERS_IN_CACHE; i++) {
+ if (!cover_cachei) {
+ continue;
+ }
+ cover_info_release(cover_cachei);
+ cover_cachei = NULL;
 }
- if (png_ptr) {
- png_destroy_read_struct (&png_ptr, info_ptr ? &info_ptr : NULL, (png_infopp)NULL);
+}
+
+static ddb_cover_info_t *
+cover_cache_find (ddb_cover_info_t *cover) {
+ for (int i = 0; i < MAX_COVERS_IN_CACHE; i++) {
+ if (!cover_cachei) {
+ continue;
+ }
+
+ ddb_cover_info_t *cached_cover = cover_cachei;
+
+ if (!strcmp (cover->priv->filepath, cached_cover->priv->filepath)) {
+ return cached_cover;
+ }
 }
 
- return err;
+ return NULL;
 }
 
-#endif
+static void
+cover_cache_remove (ddb_cover_info_t *cover) {
+ for (int i = 0; i < MAX_COVERS_IN_CACHE; i++) {
+ if (!cover_cachei) {
+ continue;
+ }
 
-#define BUFFER_SIZE 4096
+ ddb_cover_info_t *cached_cover = cover_cachei;
 
-static int
-copy_file (const char *in, const char *out, int img_size) {
- trace ("copying %s to %s\n", in, out);
-
- if (img_size != -1) {
-#ifdef USE_IMLIB2
- deadbeef->mutex_lock (imlib_mutex);
- // need to scale, use imlib2
- Imlib_Image img = imlib_load_image_immediately (in);
- if (!img) {
- trace ("file %s not found, or imlib2 can't load it\n", in);
- deadbeef->mutex_unlock (imlib_mutex);
- return -1;
+ if (!strcmp (cover->priv->filepath, cached_cover->priv->filepath)) {
+ cover_info_release(cached_cover);
+ cover_cachei = NULL;
+ break;
 }
- imlib_context_set_image(img);
- int w = imlib_image_get_width ();
- int h = imlib_image_get_height ();
- int sw, sh;
- if (deadbeef->conf_get_int ("artwork.scale_towards_longer", 1)) {
- if (w > h) {
- sh = img_size;
- sw = img_size * w / h;
- }
- else {
- sw = img_size;
- sh = img_size * h / w;
- }
+ }
+}
+
+#pragma mark - Utility
+
+static void
+_setup_tf_once(void) {
+ dispatch_sync(sync_queue, ^{
+ if (!album_tf) {
+ album_tf = deadbeef->tf_compile ("%album%");
 }
- else {
- if (w < h) {
- sh = img_size;
- sw = img_size * w / h;
- }
- else {
- sw = img_size;
- sh = img_size * h / w;
- }
+ if (!artist_tf) {
+ artist_tf = deadbeef->tf_compile ("$itematindex(0,%artist%)");
 }
- Imlib_Image scaled = imlib_create_image (sw, sh);
- imlib_context_set_image (scaled);
- imlib_blend_image_onto_image (img, 1, 0, 0, w, h, 0, 0, sw, sh);
- Imlib_Load_Error err = 0;
- imlib_image_set_format ("jpg");
- imlib_save_image_with_error_return (out, &err);
- if (err != 0) {
- trace ("imlib save %s returned %d\n", out, err);
- imlib_free_image ();
- imlib_context_set_image(img);
- imlib_free_image ();
- deadbeef->mutex_unlock (imlib_mutex);
- return -1;
+ if (!title_tf) {
+ title_tf = deadbeef->tf_compile ("%title%");
 }
- imlib_free_image ();
- imlib_context_set_image(img);
- imlib_free_image ();
- deadbeef->mutex_unlock (imlib_mutex);
-#else
- int res = jpeg_resize (in, out, img_size);
- if (res != 0) {
- unlink (out);
- res = png_resize (in, out, img_size);
- if (res != 0) {
- unlink (out);
- return -1;
+ if (!albumartist_tf) {
+ albumartist_tf = deadbeef->tf_compile ("%album artist%");
+ }
+ if (!query_compare_tf) {
+ query_compare_tf = deadbeef->tf_compile ("$if($and(%title%,%artist%,%album%),%track number% - %title% - %artist% - %album%)");
+ }
+ if (!track_cache_filename_tf) {
+ track_cache_filename_tf = deadbeef->tf_compile ("$if($and(%album%,%artist%,%title%),%album% - %artist% - %title%,$directory(%path%,2)-$directory(%path%)-%filename%)");
+ }
+ if (!album_cache_filename_tf) {
+ album_cache_filename_tf = deadbeef->tf_compile("$if($and(%album%,%artist%),$directory(%path%,2)-$directory(%path%)-%album% - %artist%,$directory(%path%,2)-$directory(%path%)-%filename%)");
+ }
+ if (!simplified_album_cache_filename_tf) {
+ // This is to stay compatible with simple (but ambiguous) cache filename scheme
+ simplified_album_cache_filename_tf = deadbeef->tf_compile("$if($and(%album%,%artist%),%album% - %artist%,$directory(%path%,2)-$directory(%path%)-%filename%)");
+ }
+ });
+}
+
+static void
+_notify_listeners(ddb_artwork_listener_event_t event, DB_playItem_t *it) {
+ __block ddb_artwork_listener_t *callbacks = calloc(MAX_LISTENERS, sizeof (ddb_artwork_listener_t));
+ __block void **userdatas = calloc(MAX_LISTENERS, sizeof (void *));
+ __block int count = 0;
+ dispatch_sync(sync_queue, ^{
+ for (int i = 0; i < MAX_LISTENERS; i++) {
+ if (listenersi != NULL) {
+ callbackscount = listenersi;
+ userdatascount = listeners_userdatai;
+ count += 1;
 }
 }
-#endif
- return 0;
- }
+ });
 
- FILE *fin = fopen (in, "rb");
- if (!fin) {
- trace ("artwork: failed to open file %s for reading\n", in);
- return -1;
+ for (int i = 0; i < count; i++) {
+ callbacksi(event, userdatasi, (intptr_t)it, 0);
 }
- FILE *fout = fopen (out, "w+b");
- if (!fout) {
- fclose (fin);
- trace ("artwork: failed to open file %s for writing\n", out);
- return -1;
+ free (callbacks);
+ free (userdatas);
+}
+
+static ddb_cover_info_t *
+sync_cover_info_alloc (void) {
+ __block ddb_cover_info_t *cover = NULL;
+ dispatch_sync(sync_queue, ^{
+ cover = cover_info_alloc();
+ });
+ return cover;
+}
+
+static void
+sync_cover_info_ref (ddb_cover_info_t *cover) {
+ dispatch_sync(sync_queue, ^{
+ cover_info_ref(cover);
+ });
+}
+
+static void
+sync_cover_info_release (ddb_cover_info_t *cover) {
+ dispatch_sync(sync_queue, ^{
+ cover_info_release(cover);
+ });
+}
+
+static void
+queue_clear (void) {
+ dispatch_sync(sync_queue, ^{
+ artwork_abort_all_http_requests();
+ cancellation_idx = last_job_idx++;
+ });
+}
+
+#pragma mark - Grouping queries by source id
+
+static void
+_groups_register_query (ddb_cover_query_t *query) {
+ // find existing group
+ int group_index = -1;
+ for (int i = 0; i < query_groups_count; i++) {
+ if (query_groupsi == NULL) {
+ group_index = i;
+ }
+ else if (query_groupsi->query->source_id == query->source_id) {
+ group_index = i;
+ break;
+ }
 }
- char *buf = malloc (BUFFER_SIZE);
- if (!buf) {
- trace ("artwork: failed to alloc %d bytes\n", BUFFER_SIZE);
- fclose (fin);
- fclose (fout);
- return -1;
+
+ if (group_index < 0) {
+ group_index = query_groups_count;
+ query_groups_count += 1;
+ if (query_groups_count > query_groups_reserved) {
+ int prev_size = query_groups_reserved;
+ if (query_groups_reserved == 0) {
+ query_groups_reserved = 10;
+ }
+ else {
+ query_groups_reserved *= 2;
+ }
+ query_groups = realloc(query_groups, query_groups_reserved * sizeof (query_group_item_t *));
+ memset (query_groups + prev_size, 0, (query_groups_reserved - prev_size) * sizeof (query_group_item_t *));
+ }
 }
 
- fseek (fin, 0, SEEK_END);
- size_t sz = ftell (fin);
- rewind (fin);
+ query_group_item_t *item = calloc(1, sizeof (query_group_item_t));
+ item->query = query;
+ item->next = query_groupsgroup_index;
+ query_groupsgroup_index = item;
+}
 
- while (sz > 0) {
- int rs = min (sz, BUFFER_SIZE);
- if (fread (buf, rs, 1, fin) != 1) {
- trace ("artwork: failed to read file %s\n", in);
+static void
+_groups_unregister_query(ddb_cover_query_t *query) {
+ int group_index = -1;
+ for (int i = 0; i < query_groups_count; i++) {
+ if (query_groupsi != NULL && query_groupsi->query->source_id == query->source_id) {
+ group_index = i;
 break;
 }
- if (fwrite (buf, rs, 1, fout) != 1) {
- trace ("artwork: failed to write file %s\n", out);
+ }
+
+ if (group_index == -1) {
+ trace("_groups_unregister_query: query not registered\n");
+ return;
+ }
+
+ int done = 0;
+ query_group_item_t *prev = NULL;
+ query_group_item_t *group = query_groupsgroup_index;
+ for (; group; prev = group, group = group->next) {
+ if (group->query == query) {
+ if (prev != NULL) {
+ prev->next = group->next;
+ }
+ else {
+ query_groupsgroup_index = group->next;
+ }
+ free (group);
+ done = 1;
 break;
 }
- sz -= rs;
 }
- free (buf);
- fclose (fin);
- fclose (fout);
- if (sz > 0) {
- unlink (out);
+
+ assert(done);
+}
+
+#pragma mark - Ending queries / cleanup / executing callbacks
+
+#if DEBUG_COUNTER
+static int _queued_jobs_counter = 0;
+#endif
+
+static void
+_end_query (ddb_cover_query_t *query, ddb_cover_callback_t callback, int error, ddb_cover_info_t *cover) {
+ assert(query);
+ dispatch_sync(sync_queue, ^{
+ _groups_unregister_query(query);
+ });
+ callback (error, query, cover);
+#if DEBUG_COUNTER
+ _queued_jobs_counter -= 1;
+ printf ("*** count %d\n", _queued_jobs_counter);
+#endif
+}
+
+static void
+_execute_callback (ddb_cover_callback_t callback, ddb_cover_info_t *cover, ddb_cover_query_t *query) {
+ int cover_found = cover->cover_found;
+
+ // Make all the callbacks (and free the chain), with data if a file was written
+ if (cover_found) {
+ trace ("artwork fetcher: cover art file found: %s\n", cover->image_filename);
+ sync_cover_info_ref(cover);
+ _end_query(query, callback, 0, cover);
+ }
+ else {
+ trace ("artwork fetcher: no cover art found\n");
+ _end_query(query, callback, -1, NULL);
 }
- return 0;
 }
 
-static const char *filter_custom_mask = NULL;
+#pragma mark - Squashing multiple similar queries into one
 
 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)) {
+queries_squashable (ddb_cover_query_t *query1, ddb_cover_query_t *query2) {
+ if (query1->flags != query2->flags) {
+ return 0;
+ }
+
+ if (query1->track == query2->track) {
 return 1;
 }
- return 0;
-}
 
-static int
-filter_jpg (const struct dirent *f)
-{
- const char *ext = strrchr (f->d_name, '.');
- if (!ext)
- return 0;
- if (!strcasecmp (ext, ".jpg") || !strcasecmp (ext, ".jpeg")) {
+ const char *uri1 = deadbeef->pl_find_meta (query1->track, ":URI");
+ const char *uri2 = deadbeef->pl_find_meta (query2->track, ":URI");
+
+ if (uri1 == uri2) {
+ return 1;
+ }
+
+ // if all metadata is defined -- compare tracknr, title, album, artist
+ ddb_tf_context_t ctx = {0};
+ ctx._size = sizeof (ddb_tf_context_t);
+
+ char query1title1000;
+ char query2title1000;
+ ctx.it = query1->track;
+ deadbeef->tf_eval (&ctx, query_compare_tf, query1title, sizeof (query1title));
+ ctx.it = query2->track;
+ deadbeef->tf_eval (&ctx, query_compare_tf, query2title, sizeof (query2title));
+
+ if (query1title0 && query2title0 && !strcmp (query1title, query2title)) {
 return 1;
 }
 
 return 0;
 }
 
-static uint8_t *
-id3v2_skip_str (int enc, uint8_t *ptr, uint8_t *end) {
- if (enc == 0 || enc == 3) {
- while (ptr < end && *ptr) {
- ptr++;
+static int
+squash_query(ddb_cover_callback_t callback, ddb_cover_query_t *query) {
+ __block int squashed = 0;
+ dispatch_sync(sync_queue, ^{
+ artwork_query_t *q = query_head;
+ for (; q; q = q->next) {
+ if (queries_squashable (query, q->queries0) && q->query_count < MAX_SQUASHED_QUERIES-1) {
+ squashed = 1;
+ break;
+ }
 }
- ptr++;
- if (ptr >= end) {
- return NULL;
+ 
+ if (!q) {
+ // create new
+ q = calloc(1, sizeof (artwork_query_t));
+ if (query_tail) {
+ query_tail->next = q;
+ query_tail = q;
+ }
+ else {
+ query_head = query_tail = q;
+ }
+ squashed = 0;
 }
- return ptr;
- }
- else {
- while (ptr < end-1 && (ptr0 || ptr1)) {
- ptr += 2;
+ q->queriesq->query_count = query;
+ q->callbacksq->query_count = callback;
+ q->query_count += 1;
+ });
+
+ return squashed;
+}
+
+static void callback_and_free_squashed (ddb_cover_info_t *cover, ddb_cover_query_t *query) {
+ __block artwork_query_t *squashed_queries = NULL;
+ dispatch_sync (sync_queue, ^{
+ cover_update_cache (cover);
+ // find & remove from the queries list
+ artwork_query_t *q = query_head;
+ artwork_query_t *prev = NULL;
+ for (; q; q = q->next) {
+ if (q->queries0 == query) {
+ break;
+ }
+ prev = q;
 }
- ptr += 2;
- if (ptr >= end) {
- return NULL;
+
+ if (q) {
+ if (prev) {
+ prev->next = q->next;
+ }
+ else {
+ query_head = q->next;
+ }
+ if (q == query_tail) {
+ query_tail = prev;
+ }
+ squashed_queries = q;
 }
- return ptr;
+ });
+
+ // send the result
+ if (squashed_queries != NULL) {
+ for (int i = 0; i < squashed_queries->query_count; i++) {
+ _execute_callback (squashed_queries->callbacksi, cover, squashed_queries->queriesi);
+ }
+ free (squashed_queries);
 }
- return NULL;
+ sync_cover_info_release (cover);
 }
 
-#ifdef USE_METAFLAC
-static size_t
-flac_io_read (void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) {
- return deadbeef->fread (ptr, size, nmemb, (DB_FILE *)handle);
-}
+static void
+_init_cover_metadata(ddb_cover_info_t *cover, ddb_playItem_t *track) {
+ _setup_tf_once();
 
-static int
-flac_io_seek (FLAC__IOHandle handle, FLAC__int64 offset, int whence) {
- return deadbeef->fseek ((DB_FILE *)handle, offset, whence);
-}
+ deadbeef->pl_lock ();
+ strncat (cover->priv->filepath, deadbeef->pl_find_meta (track, ":URI"), sizeof(cover->priv->filepath) - strlen(cover->priv->filepath) - 1);
+ deadbeef->pl_unlock ();
 
-static FLAC__int64
-flac_io_tell (FLAC__IOHandle handle) {
- return deadbeef->ftell ((DB_FILE *)handle);
-}
+ ddb_tf_context_t ctx = {0};
+ ctx._size = sizeof (ddb_tf_context_t);
+ ctx.it = track;
 
-static int
-flac_io_eof (FLAC__IOHandle handle) {
- int64_t pos = deadbeef->ftell ((DB_FILE *)handle);
- return pos == deadbeef->fgetlength ((DB_FILE *)handle);
-}
+#ifdef USE_VFS_CURL
+ if (artwork_enable_wos && strlen (cover->priv->filepath) > 3 && !strcasecmp (cover->priv->filepath + strlen (cover->priv->filepath) - 3, ".ay")) {
+ strcpy (cover->priv->artist, "AY Music");
+ deadbeef->tf_eval (&ctx, title_tf, cover->priv->album, sizeof (cover->priv->album));
+ for (char *p = cover->priv->album; *p; p++) {
+ if (p0 == ' ' && p1 == '-') {
+ *p = 0;
+ break;
+ }
+ }
+ strcpy (cover->priv->title, cover->priv->album);
+ }
+ else
+#endif
+ {
+ deadbeef->tf_eval (&ctx, album_tf, cover->priv->album, sizeof (cover->priv->album));
+ deadbeef->tf_eval (&ctx, artist_tf, cover->priv->artist, sizeof (cover->priv->artist));
+ deadbeef->tf_eval (&ctx, title_tf, cover->priv->title, sizeof (cover->priv->title));
+
+ char albumartist100;
+ deadbeef->tf_eval (&ctx, albumartist_tf, albumartist, sizeof (albumartist));
+ if (!strcasecmp (albumartist, "Various Artists")) {
+ cover->priv->is_compilation = 1;
+ }
+ }
 
-static int
-flac_io_close (FLAC__IOHandle handle) {
- deadbeef->fclose ((DB_FILE *)handle);
- return 0;
+ if (!simplified_cache) {
+ make_album_cache_path(track, cover->priv->album_cache_path, sizeof(cover->priv->album_cache_path));
+ make_track_cache_path(track, cover->priv->track_cache_path, sizeof (cover->priv->track_cache_path));
+ }
+ else {
+ make_album_cache_path(track, cover->priv->album_cache_path, sizeof(cover->priv->album_cache_path));
+ }
 }
 
-static FLAC__IOCallbacks iocb = {
- .read = flac_io_read,
- .write = NULL,
- .seek = flac_io_seek,
- .tell = flac_io_tell,
- .eof = flac_io_eof,
- .close = flac_io_close,
-};
-#endif
+#pragma mark - API entry points
 
 static void
-fetcher_thread (void *none)
-{
-#ifdef __linux__
- prctl (PR_SET_NAME, "deadbeef-artwork", 0, 0, 0, 0);
+cover_get (ddb_cover_query_t *query, ddb_cover_callback_t callback) {
+#if DEBUG_COUNTER
+ _queued_jobs_counter += 1;
+ printf ("*** count %d\n", _queued_jobs_counter);
 #endif
- for (;;) {
- trace ("artwork: waiting for signal\n");
- deadbeef->cond_wait (cond, mutex);
- trace ("artwork: cond signalled\n");
- deadbeef->mutex_unlock (mutex);
- while (!terminate && queue && !clear_queue) {
- cover_query_t *param = queue;
- char path PATH_MAX;
- struct dirent **files;
- int files_count;
-
- make_cache_dir_path (path, sizeof (path), param->artist, -1);
- trace ("cache folder: %s\n", path);
- if (!check_dir (path, 0755)) {
- queue_pop ();
- trace ("failed to create folder for %s %s\n", param->album, param->artist);
- continue;
- }
- if (param->size != -1) {
- make_cache_dir_path (path, sizeof (path), param->artist, param->size);
- trace ("cache folder: %s\n", path);
- if (!check_dir (path, 0755)) {
- queue_pop ();
- trace ("failed to create folder for %s %s\n", param->album, param->artist);
- continue;
- }
- }
-
- trace ("fetching cover for %s %s\n", param->album, param->artist);
- char cache_path1024;
- make_cache_path2 (cache_path, sizeof (cache_path), param->fname, param->album, param->artist, -1);
- int got_pic = 0;
-
- if (deadbeef->is_local_file (param->fname)) {
- if (artwork_enable_embedded) {
- // 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.version0 == 4 && (f->flags1 & 1)) {
- data += 4;
- }
-#if 0
- printf ("version: %d, flags: %d %d\n", (int)tag.version0, (int)f->flags0, (int)f->flags1);
- for (int i = 0; i < 20; i++) {
- printf ("%c", datai < 0x20 ? '?' : datai);
- }
- printf ("\n");
- for (int i = 0; i < 20; i++) {
- printf ("%02x ", datai);
- }
- printf ("\n");
+ __block int64_t job_idx = 0;
+ dispatch_sync(sync_queue, ^{
+ job_idx = last_job_idx++;
+ _groups_register_query(query);
+ });
+
+#if MEASURE_COVER_GET
+ struct timeval tm1;
+ gettimeofday (&tm1, NULL);
 #endif
- 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") && strcasecmp (data, "image/gif")) {
- trace ("artwork: unsupported mime type: %s\n", data);
- continue;
- }
- if (*mime_end != 3) {
- trace ("artwork: picture type=%d\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_path1024;
- 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;
- }
- }
- }
-
- deadbeef->junk_id3v2_free (&tag);
- current_file = NULL;
- deadbeef->fclose (fp);
- }
- }
 
- // try to load embedded from apev2
- {
- trace ("trying to load artwork from apev2 tag for %s\n", param->fname);
- DB_apev2_tag_t tag;
- memset (&tag, 0, sizeof (tag));
- DB_FILE *fp = deadbeef->fopen (param->fname);
- current_file = fp;
- if (fp) {
- int res = deadbeef->junk_apev2_read_full (NULL, &tag, fp);
- if (!res) {
- for (DB_apev2_frame_t *f = tag.frames; f; f = f->next) {
- if (!strcasecmp (f->key, "cover art (front)")) {
- uint8_t *name = f->data, *ext = f->data, *data = f->data;
- uint8_t *end = f->data + f->size;
- while (data < end && *data)
- data++;
- if (data == end) {
- trace ("artwork: apev2 cover art frame has no name\n");
- continue;
- }
- int sz = end - ++data;
- if (sz < 20) {
- trace ("artwork: apev2 cover art frame is too small\n");
- continue;
- }
- ext = strrchr (name, '.');
- if (!ext || !*++ext) {
- trace ("artwork: apev2 cover art name has no extension\n");
- continue;
- }
- if (strcasecmp (ext, "jpeg") && strcasecmp (ext, "jpg") && strcasecmp (ext, "png")) {
- trace ("artwork: unsupported file type: %s\n", ext);
- continue;
- }
- trace ("found apev2 cover art of %d bytes (%s)\n", sz, ext);
- char tmp_path1024;
- char cache_path1024;
- make_cache_path2 (cache_path, sizeof (cache_path), param->fname, param->album, param->artist, -1);
- trace ("will write apev2 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 (data, 1, sz, out) != sz) {
- trace ("artwork: failed to write apev2 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;
- }
- }
- }
-
- deadbeef->junk_apev2_free (&tag);
- current_file = NULL;
- deadbeef->fclose (fp);
- }
- }
+ dispatch_async(process_queue, ^{
+ if (!query->track) {
+ _end_query(query, callback, -1, NULL);
+ return;
+ }
 
-#ifdef USE_METAFLAC
- // try to load embedded from flac metadata
- for (;;)
- {
- const char *filename = param->fname;
- FLAC__Metadata_Chain *chain = FLAC__metadata_chain_new();
- int is_ogg = 0;
- if(strlen(filename) >= 4 && (0 == strcmp(filename+strlen(filename)-4, ".oga") || 0 == strcasecmp(filename+strlen(filename)-4, ".ogg"))) {
- is_ogg = 1;
- }
-
- DB_FILE *file = deadbeef->fopen (filename);
- if (!file) {
- break;
- }
-
- int res = 0;
- if (is_ogg) {
-#if USE_OGG
- res = FLAC__metadata_chain_read_ogg_with_callbacks(chain, (FLAC__IOHandle)file, iocb);
-#endif
- }
- else
- {
- res = FLAC__metadata_chain_read_with_callbacks(chain, (FLAC__IOHandle)file, iocb);
- }
-
- if(!res) {
- trace ("artwork: failed to read metadata from flac: %s\n", filename);
- deadbeef->fclose (file);
- FLAC__metadata_chain_delete(chain);
- break;
- }
- deadbeef->fclose (file);
- FLAC__StreamMetadata *picture = 0;
- FLAC__Metadata_Iterator *iterator = FLAC__metadata_iterator_new();
- FLAC__metadata_iterator_init(iterator, chain);
-
- do {
- FLAC__StreamMetadata *block = FLAC__metadata_iterator_get_block(iterator);
- if(block->type == FLAC__METADATA_TYPE_PICTURE) {
- picture = block;
- }
- } while(FLAC__metadata_iterator_next(iterator) && 0 == picture);
-
- if (!picture) {
- trace ("%s doesn't have an embedded cover\n", param->fname);
- break;
- }
- FLAC__StreamMetadata_Picture *pic = &picture->data.picture;
- trace ("found flac cover art of %d bytes (%s)\n", pic->data_length, pic->description);
- char tmp_path1024;
- char cache_path1024;
- make_cache_path2 (cache_path, sizeof (cache_path), param->fname, 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;
-
- if (chain) {
- FLAC__metadata_chain_delete(chain);
- }
- if (iterator) {
- FLAC__metadata_iterator_delete(iterator);
- }
- break;
- }
-#endif
- }
+ /* Process this query, hopefully writing a file into cache */
+ __block ddb_cover_info_t *cover = sync_cover_info_alloc();
 
- if (!got_pic && artwork_enable_local) {
- /* Searching in track directory */
- strncpy (path, param->fname, sizeof (path));
- char *slash = strrchr (path, '/');
- if (slash) {
- *slash = 0; // assuming at least one slash exist
- }
- trace ("scanning directory: %s\n", path);
- char mask200 = "";
- char *p = artwork_filemask;
- while (p) {
- *mask = 0;
- char *e = strchr (p, ';');
- if (e) {
- strncpy (mask, p, e-p);
- maske-p = 0;
- e++;
- }
- else {
- strcpy (mask, p);
- }
- if (*mask) {
- filter_custom_mask = mask;
- files_count = scandir (path, &files, filter_custom, NULL);
- if (files_count != 0) {
- break;
- }
- }
- p = e;
- }
- if (files_count == 0) {
- files_count = scandir (path, &files, filter_jpg, alphasort);
- }
+ _init_cover_metadata(cover, query->track);
 
- if (files_count > 0) {
- trace ("found cover for %s - %s in local folder\n", param->artist, param->album);
- strcat (path, "/");
- strcat (path, files0->d_name);
- char cache_pathPATH_MAX;
- char tmp_pathPATH_MAX;
- char cache_path_dirPATH_MAX;
- make_cache_path2 (cache_path, sizeof (cache_path), param->fname, param->album, param->artist, -1);
- strcpy (cache_path_dir, cache_path);
- char *slash = strrchr (cache_path_dir, '/');
- if (slash) {
- *slash = 0;
- }
- trace ("check_dir: %s\n", cache_path_dir);
- if (check_dir (cache_path_dir, 0755)) {
- snprintf (tmp_path, sizeof (tmp_path), "%s.part", cache_path);
- copy_file (path, tmp_path, -1);
- int err = rename (tmp_path, cache_path);
- if (err != 0) {
- trace ("artwork: rename error %d: failed to move %s to %s: %s\n", err, tmp_path, cache_path, strerror (err));
- unlink (tmp_path);
- }
- int i;
- for (i = 0; i < files_count; i++) {
- free (files i);
- }
- got_pic = 1;
- }
- }
- }
+ __block int cancel_job = 0;
+ dispatch_sync(sync_queue, ^{
+ if (job_idx < cancellation_idx || (query->flags & DDB_ARTWORK_FLAG_CANCELLED)) {
+ cancel_job = 1;
 }
+ });
 
-#ifdef USE_VFS_CURL
- if (!got_pic) {
- if (artwork_enable_wos) {
+ if (cancel_job) {
+ _end_query(query, callback, -1, NULL);
+ return;
+ }
 
- char *dot = strrchr (param->fname, '.');
- if (dot && !strcasecmp (dot, ".ay") && !fetch_from_wos (param->album, cache_path)) {
- got_pic = 1;
- }
- }
- if (!got_pic && artwork_enable_lfm) {
- if (!fetch_from_lastfm (param->artist, param->album, cache_path)) {
- got_pic = 1;
- }
- else {
- // try to fix parentheses
- char *fixed_alb = strdupa (param->album);
- char *openp = strchr (fixed_alb, '(');
- if (openp && openp != fixed_alb) {
- *openp = 0;
- if (!fetch_from_lastfm (param->artist, fixed_alb, cache_path)) {
- got_pic = 1;
- }
- }
- }
- }
- if (!got_pic && artwork_enable_aao && !fetch_from_albumart_org (param->artist, param->album, cache_path)) {
- got_pic = 1;
- }
+ // check the cache
+ __block int found_in_cache = 0;
+ dispatch_sync(sync_queue, ^{
+ ddb_cover_info_t *cached_cover = cover_cache_find (cover);
+ if (cached_cover) {
+ found_in_cache = 1;
+ cached_cover->priv->timestamp = time(NULL);
+ cover_info_release(cover);
+ cover = cached_cover;
 }
-#endif
+ });
 
- if (got_pic) {
- trace ("downloaded art for %s %s\n", param->album, param->artist);
- if (param->size != -1) {
- make_cache_dir_path (path, sizeof (path), param->artist, param->size);
- trace ("cache folder: %s\n", path);
- if (!check_dir (path, 0755)) {
- trace ("failed to create folder %s\n", path);
- queue_pop ();
- continue;
- }
- char scaled_path1024;
- make_cache_path2 (scaled_path, sizeof (scaled_path), param->fname, param->album, param->artist, param->size);
- copy_file (cache_path, scaled_path, param->size);
- }
- for (int i = 0; i < param->numcb; i++) {
- if (param->callbacksi.cb) {
- param->callbacksi.cb (param->fname, param->artist, param->album, param->callbacksi.ud);
- param->callbacksi.cb = NULL;
- }
- }
- }
- queue_pop ();
+
+ if (found_in_cache) {
+ _execute_callback (callback, cover, query);
 }
- if (clear_queue) {
- trace ("artwork: received queue clear request\n");
- while (queue) {
- queue_pop ();
+ else {
+ // Check if another query for the same thing is already present in the queue, and squash.
+ if (squash_query(callback, query)) {
+ return;
 }
- clear_queue = 0;
- trace ("artwork: queue clear done\n");
- continue;
- }
- if (terminate) {
- break;
- }
- }
-}
 
-static char *
-find_image (const char *path) {
- struct stat stat_buf;
- if (0 == stat (path, &stat_buf)) {
- int cache_period = deadbeef->conf_get_int ("artwork.cache.period", 48);
- time_t tm = time (NULL);
- // invalidate cache every 2 days
- if ((cache_period > 0 && (tm - stat_buf.st_mtime > cache_period * 60 * 60))
- || artwork_reset_time > stat_buf.st_mtime) {
- trace ("deleting cached file %s\n", path);
- unlink (path);
- return NULL;
- }
+ // fetch on concurrent fetch queue
+ dispatch_semaphore_wait(fetch_semaphore, DISPATCH_TIME_FOREVER);
+ __block int cancel_job = 0;
+ dispatch_sync(sync_queue, ^{
+ if (job_idx < cancellation_idx) {
+ cancel_job = 1;
+ }
+ });
 
- return strdup (path);
- }
- return NULL;
-}
+ if (cancel_job) {
+ callback_and_free_squashed (cover, query);
+ dispatch_semaphore_signal (fetch_semaphore);
+ return;
+ }
 
-static char*
-get_album_art (const char *fname, const char *artist, const char *album, int size, artwork_callback callback, void *user_data)
-{
- char path 1024;
+ dispatch_async (fetch_queue, ^{
+ process_query (cover);
 
- make_cache_path2 (path, sizeof (path), fname, album, artist, size);
- char *p = find_image (path);
- if (p) {
- if (callback) {
- callback (NULL, NULL, NULL, user_data);
+#if MEASURE_COVER_GET
+ struct timeval tm2;
+ gettimeofday (&tm2, NULL);
+ long ms = (tm2.tv_sec*1000+tm2.tv_usec/1000) - (tm1.tv_sec*1000+tm1.tv_usec/1000);
+ const char *uri = deadbeef->pl_find_meta(query->track, ":URI");
+ printf ("cover_get %s took %d ms\n", uri, (int)ms);
+#endif
+
+ // update queue, and notity the caller
+ callback_and_free_squashed (cover, query);
+ dispatch_semaphore_signal (fetch_semaphore);
+ });
 }
- return p;
- }
+ });
+}
 
- if (size != -1) {
- // check if we have unscaled image
- char unscaled_path1024;
- make_cache_path2 (unscaled_path, sizeof (unscaled_path), fname, album, artist, -1);
- p = find_image (unscaled_path);
- if (p) {
- free (p);
- char dir1024;
- make_cache_dir_path (dir, sizeof (dir), artist, size);
- if (!check_dir (dir, 0755)) {
- trace ("failed to create folder for %s\n", dir);
- }
- else {
- int res = copy_file (unscaled_path, path, size);
- if (!res) {
- if (callback) {
- callback (NULL, NULL, NULL, user_data);
- }
- return strdup (path);
- }
+static void
+artwork_reset (void) {
+ trace ("artwork: reset queue\n");
+ queue_clear ();
+}
+
+static void
+artwork_add_listener (ddb_artwork_listener_t listener, void *user_data) {
+ dispatch_sync(sync_queue, ^{
+ for (int i = 0; i < MAX_LISTENERS; i++) {
+ if (listenersi == NULL) {
+ listenersi = listener;
+ listeners_userdatai = user_data;
+ break;
 }
 }
- }
+ });
+}
 
- queue_add (fname, artist, album, size, callback, user_data);
- return NULL;
+void
+artwork_remove_listener (ddb_artwork_listener_t listener, void *user_data) {
+ dispatch_sync(sync_queue, ^{
+ for (int i = 0; i < MAX_LISTENERS; i++) {
+ if (listenersi == listener) {
+ listenersi = NULL;
+ listeners_userdatai = NULL;
+ break;
+ }
+ }
+ });
 }
 
 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);
+artwork_default_image_path (char *path, size_t size) {
+ *path = 0;
+ dispatch_sync(sync_queue, ^{
+ if (nocover_path != NULL) {
+ strncat (path, nocover_path, size-1);
+ }
+ });
 }
 
-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;
+static int64_t
+artwork_allocate_source_id (void) {
+ __block int64_t retval;
+ dispatch_sync(sync_queue, ^{
+ retval = next_source_id;
+ next_source_id += 1;
+ if (next_source_id < 0) {
+ next_source_id = 1;
+ }
+ });
+ return retval;
 }
 
+/// Cancel all queries with the specified source_id
 static void
-artwork_reset (int fast) {
- if (fast) {
-// if (current_file) {
-// deadbeef->fabort (current_file);
-// }
- deadbeef->mutex_lock (mutex);
- while (queue && queue->next) {
- cover_query_t *next = queue->next->next;
- free (queue->next->fname);
- free (queue->next->artist);
- free (queue->next->album);
- for (int i = 0; i < queue->next->numcb; i++) {
- if (queue->next->callbacksi.cb == sync_callback) {
- sync_callback (NULL, NULL, NULL, queue->next->callbacksi.ud);
+artwork_cancel_queries_with_source_id (int64_t source_id) {
+ dispatch_sync(sync_queue, ^{
+ for (int i = 0; i < query_groups_count; i++) {
+ query_group_item_t *group = query_groupsi;
+ if (group != NULL && group->query->source_id == source_id) {
+ for (query_group_item_t *item = query_groupsi; item; item = item->next) {
+ item->query->flags |= DDB_ARTWORK_FLAG_CANCELLED;
 }
+ break;
 }
- queue->next = next;
- if (next == NULL) {
- queue_tail = queue;
- }
 }
- deadbeef->mutex_unlock (mutex);
+ });
+}
+
+static void
+_get_fetcher_preferences (void) {
+ deadbeef->conf_lock ();
+ artwork_save_to_music_folders = deadbeef->conf_get_int ("artwork.save_to_music_folders", DEFAULT_SAVE_TO_MUSIC_FOLDERS);
+
+ const char *save_filename = deadbeef->conf_get_str_fast ("artwork.save_to_music_folders_relative_path", DEFAULT_SAVE_TO_MUSIC_FOLDERS_FILENAME);
+
+ free (save_to_music_folders_filename);
+ save_to_music_folders_filename = strdup(save_filename);
+
+ artwork_enable_embedded = deadbeef->conf_get_int ("artwork.enable_embedded", 1);
+ artwork_enable_local = deadbeef->conf_get_int ("artwork.enable_localfolder", 1);
+ const char *new_artwork_filemask = deadbeef->conf_get_str_fast ("artwork.filemask", NULL);
+ if (!new_artwork_filemask || !new_artwork_filemask0) {
+ new_artwork_filemask = DEFAULT_FILEMASK;
+ }
+ if (!strings_equal (artwork_filemask, new_artwork_filemask)) {
+ char *old_artwork_filemask = artwork_filemask;
+ artwork_filemask = strdup (new_artwork_filemask);
+ if (old_artwork_filemask) {
+ free (old_artwork_filemask);
+ }
 }
- else {
- trace ("artwork: reset\n");
- clear_queue = 1;
- deadbeef->cond_signal (cond);
- trace ("artwork: waiting for clear to complete\n");
- while (clear_queue) {
- usleep (100000);
+
+ const char *new_artwork_folders = deadbeef->conf_get_str_fast ("artwork.folders", NULL);
+ if (!new_artwork_folders || !new_artwork_folders0) {
+ new_artwork_folders = DEFAULT_FOLDERS;
+ }
+ if (!strings_equal (artwork_folders, new_artwork_folders)) {
+ char *old_artwork_folders = artwork_folders;
+ artwork_folders = strdup (new_artwork_folders);
+ if (old_artwork_folders) {
+ free (old_artwork_folders);
+ }
+ }
+ deadbeef->conf_unlock ();
+#ifdef USE_VFS_CURL
+ artwork_enable_lfm = deadbeef->conf_get_int ("artwork.enable_lastfm", 0);
+#if ENABLE_MUSICBRAINZ
+ artwork_enable_mb = deadbeef->conf_get_int ("artwork.enable_musicbrainz", 0);
+#endif
+#if ENABLE_ALBUMART_ORG
+ artwork_enable_aao = deadbeef->conf_get_int ("artwork.enable_albumartorg", 0);
+#endif
+ artwork_enable_wos = deadbeef->conf_get_int ("artwork.enable_wos", 0);
+#endif
+ missing_artwork = deadbeef->conf_get_int ("artwork.missing_artwork", 1);
+ artwork_image_size = deadbeef->conf_get_int("artwork.image_size", 256);
+ if (artwork_image_size < 64) {
+ artwork_image_size = 64;
+ }
+ if (artwork_image_size > 2048) {
+ artwork_image_size = 2048;
+ }
+
+ simplified_cache = deadbeef->conf_get_int ("artwork.cache.simplified", 0);
+
+ deadbeef->conf_lock ();
+ if (missing_artwork == 0) {
+ free(nocover_path);
+ nocover_path = NULL;
+ }
+ else if (missing_artwork == 1) {
+ const char *res_dir = deadbeef->get_system_dir(DDB_SYS_DIR_PIXMAP);
+ char pathPATH_MAX;
+ snprintf (path, sizeof (path), "%s/noartwork.png", res_dir);
+ if (nocover_path == NULL || strcmp(path, nocover_path)) {
+ free(nocover_path);
+ nocover_path = strdup (path);
+ }
+ }
+ else if (missing_artwork == 2) {
+ const char *new_nocover_path = deadbeef->conf_get_str_fast ("artwork.nocover_path", NULL);
+ if (nocover_path == NULL || !strings_equal (new_nocover_path, nocover_path)) {
+ char *old_nocover_path = nocover_path;
+ nocover_path = new_nocover_path ? strdup (new_nocover_path) : NULL;
+ if (old_nocover_path) {
+ free (old_nocover_path);
+ }
 }
 }
+ deadbeef->conf_unlock ();
 }
 
-static int
+static void
 artwork_configchanged (void) {
- int new_artwork_enable_embedded = deadbeef->conf_get_int ("artwork.enable_embedded", 1);
- int new_artwork_enable_local = deadbeef->conf_get_int ("artwork.enable_localfolder", 1);
+ __block int need_clear_queue = 0;
+ cache_configchanged ();
+ dispatch_sync (sync_queue, ^{
+ int old_artwork_enable_embedded = artwork_enable_embedded;
+ int old_artwork_enable_local = artwork_enable_local;
+ char *old_artwork_filemask = strdup(artwork_filemask ? artwork_filemask : "");
+ char *old_artwork_folders = strdup(artwork_folders ? artwork_folders : "");
 #ifdef USE_VFS_CURL
- int new_artwork_enable_lfm = deadbeef->conf_get_int ("artwork.enable_lastfm", 0);
- int new_artwork_enable_aao = deadbeef->conf_get_int ("artwork.enable_albumartorg", 0);
- int new_artwork_enable_wos = deadbeef->conf_get_int ("artwork.enable_wos", 0);
+ int old_artwork_enable_lfm = artwork_enable_lfm;
+#if ENABLE_MUSICBRAINZ
+ int old_artwork_enable_mb = artwork_enable_mb;
 #endif
+#if ENABLE_ALBUMART_ORG
+ int old_artwork_enable_aao = artwork_enable_aao;
+#endif
+ int old_artwork_enable_wos = artwork_enable_wos;
+#endif
+ int old_missing_artwork = missing_artwork;
+ const char *old_nocover_path = nocover_path;
+
+ int old_image_size = artwork_image_size;
+ int old_simplified_cache = simplified_cache;
+
+ _get_fetcher_preferences ();
 
- char new_artwork_filemask200;
- deadbeef->conf_get_str ("artwork.filemask", DEFAULT_FILEMASK, new_artwork_filemask, sizeof (new_artwork_filemask));
+ int cache_did_reset = 0;
+ if (old_missing_artwork != missing_artwork || old_nocover_path != nocover_path) {
+ trace ("artwork config changed, invalidating default artwork...\n");
+ default_reset_time = time (NULL);
+ cache_did_reset = 1;
+ }
 
- if (new_artwork_enable_embedded != artwork_enable_embedded
- || new_artwork_enable_local != artwork_enable_local
+ if (old_artwork_enable_embedded != artwork_enable_embedded
+ || old_artwork_enable_local != artwork_enable_local
 #ifdef USE_VFS_CURL
- || new_artwork_enable_lfm != artwork_enable_lfm
- || new_artwork_enable_aao != artwork_enable_aao
- || new_artwork_enable_wos != artwork_enable_wos
+ || old_artwork_enable_lfm != artwork_enable_lfm
+#if ENABLE_MUSICBRAINZ
+ || old_artwork_enable_mb != artwork_enable_mb
 #endif
- || strcmp (new_artwork_filemask, artwork_filemask)) {
- trace ("artwork config changed, invalidating cache...\n");
- artwork_enable_embedded = new_artwork_enable_embedded;
- artwork_enable_local = new_artwork_enable_local;
-#ifdef USE_VFS_CURL
- artwork_enable_lfm = new_artwork_enable_lfm;
- artwork_enable_aao = new_artwork_enable_aao;
- artwork_enable_wos = new_artwork_enable_wos;
+#if ENABLE_ALBUMART_ORG
+ || old_artwork_enable_aao != artwork_enable_aao
 #endif
- artwork_reset_time = time (NULL);
- strcpy (artwork_filemask, new_artwork_filemask);
- deadbeef->conf_set_int64 ("artwork.cache_reset_time", artwork_reset_time);
- artwork_reset (0);
- deadbeef->sendmessage (DB_EV_PLAYLIST_REFRESH, 0, 0, 0);
- }
+ || old_artwork_enable_wos != artwork_enable_wos
+#endif
+ || strcmp(old_artwork_filemask, artwork_filemask)
+ || strcmp(old_artwork_folders, artwork_folders)
+ || cache_did_reset
+ || old_image_size != artwork_image_size
+ || old_simplified_cache != simplified_cache
+ ) {
+
+ /* All artwork is now (including this second) obsolete */
+ deadbeef->conf_set_int64 ("artwork.cache_reset_time", cache_reset_time);
+
+ /* Wait for a new second to start before proceeding */
+ while (time (NULL) == cache_reset_time) {
+ usleep (100000);
+ }
 
- return 0;
+ cover_cache_free ();
+ need_clear_queue = 1;
+ }
+ free (old_artwork_filemask);
+ free (old_artwork_folders);
+ });
+ if (need_clear_queue) {
+ queue_clear();
+ _notify_listeners(DDB_ARTWORK_SETTINGS_DID_CHANGE, NULL);
+ }
 }
 
 static int
@@ -1555,104 +1762,217 @@
 }
 
 static int
-artwork_plugin_start (void)
-{
- deadbeef->conf_lock ();
+invalidate_playitem_cache (DB_plugin_action_t *action, ddb_action_context_t ctx) {
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ if (!plt)
+ return -1;
 
- const char *def_art = deadbeef->conf_get_str_fast ("gtkui.nocover_pixmap", NULL);
- if (!def_art) {
- snprintf (default_cover, sizeof (default_cover), "%s/noartwork.png", deadbeef->get_pixmap_dir ());
- }
- else {
- strcpy (default_cover, def_art);
+ dispatch_async(process_queue, ^{
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ if (deadbeef->pl_is_selected (it)) {
+ ddb_cover_info_t *cover = sync_cover_info_alloc();
+ _init_cover_metadata(cover, it);
+ ddb_cover_info_t *cached_cover = cover_cache_find (cover);
+ if (cached_cover) {
+ cover_cache_remove (cover);
+ }
+
+ if (cover->priv->album_cache_path0) {
+ remove_cache_item (cover->priv->album_cache_path);
+ (void)unlink(cover->priv->album_cache_path);
+ }
+ if (cover->priv->track_cache_path0) {
+ remove_cache_item (cover->priv->track_cache_path);
+ (void)unlink(cover->priv->track_cache_path);
+ }
+
+ cover_info_release(cover);
+
+ _notify_listeners(DDB_ARTWORK_SETTINGS_DID_CHANGE, it);
+ }
+ deadbeef->pl_item_unref (it);
+ it = deadbeef->pl_get_next (it, PL_MAIN);
+ }
+ deadbeef->plt_unref (plt);
+ });
+
+ return 0;
+}
+
+static DB_plugin_action_t *
+artwork_get_actions (DB_playItem_t *it) {
+ if (!it) {
+ return NULL; // Only currently show for the playitem context menu
 }
- terminate = 0;
 
- artwork_enable_embedded = deadbeef->conf_get_int ("artwork.enable_embedded", 1);
- artwork_enable_local = deadbeef->conf_get_int ("artwork.enable_localfolder", 1);
-#ifdef USE_VFS_CURL
- artwork_enable_lfm = deadbeef->conf_get_int ("artwork.enable_lastfm", 0);
- artwork_enable_aao = deadbeef->conf_get_int ("artwork.enable_albumartorg", 0);
- artwork_enable_wos = deadbeef->conf_get_int ("artwork.enable_wos", 0);
-#endif
- artwork_reset_time = deadbeef->conf_get_int64 ("artwork.cache_reset_time", 0);
+ static DB_plugin_action_t context_action = {
+ .title = "Refresh Cover Art",
+ .name = "invalidate_playitem_cache",
+ .callback2 = invalidate_playitem_cache,
+ .flags = DB_ACTION_SINGLE_TRACK | DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_ADD_MENU,
+ .next = NULL
+ };
+
+ return &context_action;
+}
 
- deadbeef->conf_get_str ("artwork.filemask", DEFAULT_FILEMASK, artwork_filemask, sizeof (artwork_filemask));
+static int
+artwork_plugin_stop (void (^completion_block)(void)) {
+ queue_clear ();
+ stop_cache_cleaner ();
+
+ // lock semaphore
+ for (int i = 0; i < FETCH_CONCURRENT_LIMIT; i++) {
+ dispatch_semaphore_wait(fetch_semaphore, DISPATCH_TIME_FOREVER);
+ }
+ dispatch_async (process_queue, ^{
+ dispatch_release(fetch_queue);
+ fetch_queue = NULL;
+ dispatch_release(process_queue);
+ process_queue = NULL;
+
+ // unlock semaphore
+ for (int i = 0; i < FETCH_CONCURRENT_LIMIT; i++) {
+ dispatch_semaphore_signal (fetch_semaphore);
+ }
+ dispatch_release(fetch_semaphore);
+ fetch_semaphore = NULL;
 
- deadbeef->conf_unlock ();
+ cover_cache_free ();
 
- artwork_filemasksizeof(artwork_filemask)-1 = 0;
+ cover_info_cleanup();
 
- mutex = deadbeef->mutex_create_nonrecursive ();
-#ifdef USE_IMLIB2
- imlib_mutex = deadbeef->mutex_create_nonrecursive ();
-#endif
- cond = deadbeef->cond_create ();
- tid = deadbeef->thread_start_low_priority (fetcher_thread, NULL);
+ free (save_to_music_folders_filename);
+ save_to_music_folders_filename = NULL;
+ free (artwork_filemask);
+ artwork_filemask = NULL;
+ free (artwork_folders);
+ artwork_folders = NULL;
+
+ if (album_tf) {
+ deadbeef->tf_free (album_tf);
+ album_tf = NULL;
+ }
+
+ if (artist_tf) {
+ deadbeef->tf_free (artist_tf);
+ artist_tf = NULL;
+ }
+
+ if (title_tf) {
+ deadbeef->tf_free (title_tf);
+ title_tf = NULL;
+ }
+
+ if (albumartist_tf) {
+ deadbeef->tf_free (albumartist_tf);
+ albumartist_tf = NULL;
+ }
+
+ if (query_compare_tf) {
+ deadbeef->tf_free (query_compare_tf);
+ query_compare_tf = NULL;
+ }
+
+ if (track_cache_filename_tf) {
+ deadbeef->tf_free (track_cache_filename_tf);
+ track_cache_filename_tf = NULL;
+ }
+
+ if (album_cache_filename_tf) {
+ deadbeef->tf_free (album_cache_filename_tf);
+ album_cache_filename_tf = NULL;
+ }
+
+ if (simplified_album_cache_filename_tf) {
+ deadbeef->tf_free (simplified_album_cache_filename_tf);
+ simplified_album_cache_filename_tf = NULL;
+ }
+
+ dispatch_release(sync_queue);
+ sync_queue = NULL;
+ completion_block();
+ });
 
 return 0;
 }
 
 static int
-artwork_plugin_stop (void)
-{
- if (current_file) {
- deadbeef->fabort (current_file);
- }
- if (tid) {
- terminate = 1;
- deadbeef->cond_signal (cond);
- deadbeef->thread_join (tid);
- tid = 0;
- }
- while (queue) {
- queue_pop ();
- }
- if (mutex) {
- deadbeef->mutex_free (mutex);
- mutex = 0;
- }
-#ifdef USE_IMLIB2
- if (imlib_mutex) {
- deadbeef->mutex_free (imlib_mutex);
- imlib_mutex = 0;
- }
-#endif
- if (cond) {
- deadbeef->cond_free (cond);
- cond = 0;
- }
+_command(int cmd, ...) {
+ if (cmd == DDB_COMMAND_PLUGIN_ASYNC_STOP) {
+ va_list ap;
+ void (^block)(void);
+ va_start(ap, cmd);
+ block = va_arg(ap, void (^)(void));
+ va_end(ap);
+ return artwork_plugin_stop(block);
+ }
+ return -1;
+}
+
+static int
+artwork_plugin_start (void) {
+ _get_fetcher_preferences ();
+ cache_reset_time = deadbeef->conf_get_int64 ("artwork.cache_reset_time", 0);
+
+ next_source_id = 1;
+
+ sync_queue = dispatch_queue_create("ArtworkSyncQueue", NULL);
+ process_queue = dispatch_queue_create("ArtworkProcessQueue", NULL);
+ fetch_queue = dispatch_queue_create("ArtworkFetchQueue", DISPATCH_QUEUE_CONCURRENT);
+ fetch_semaphore = dispatch_semaphore_create(FETCH_CONCURRENT_LIMIT);
+
+ start_cache_cleaner ();
 
 return 0;
 }
 
 static const char settings_dlg =
- "property \"Cache update period (hr)\" entry artwork.cache.period 48;\n"
 "property \"Fetch from embedded tags\" checkbox artwork.enable_embedded 1;\n"
 "property \"Fetch from local folder\" checkbox artwork.enable_localfolder 1;\n"
- "property \"Local cover file mask\" entry artwork.filemask \"" DEFAULT_FILEMASK "\";\n"
 #ifdef USE_VFS_CURL
- "property \"Fetch from last.fm\" checkbox artwork.enable_lastfm 0;\n"
- "property \"Fetch from albumart.org\" checkbox artwork.enable_albumartorg 0;\n"
- "property \"Fetch from worldofspectrum.org (AY only)\" checkbox artwork.enable_wos 0;\n"
+ "property \"Fetch from Last.fm\" checkbox artwork.enable_lastfm 0;\n"
+#if ENABLE_MUSICBRAINZ
+ "property \"Fetch from MusicBrainz\" checkbox artwork.enable_musicbrainz 0;\n"
+#endif
+#if ENABLE_ALBUMART_ORG
+ "property \"Fetch from Albumart.org\" checkbox artwork.enable_albumartorg 0;\n"
 #endif
- "property \"Scale artwork towards longer side\" checkbox artwork.scale_towards_longer 1;\n"
+ "property \"Fetch from World of Spectrum (AY files)\" checkbox artwork.enable_wos 0;\n"
+ "property \"Save downloaded files to music folders\" checkbox artwork.save_to_music_folders 0;\n"
+#endif
+// android doesn't display any image when cover is not found, and positioning algorithm is really different,
+// therefore the below options are useless
+#ifndef ANDROID
+ "property \"When no artwork is found\" select3 artwork.missing_artwork 1 \"leave blank\" \"use DeaDBeeF default cover\" \"display custom image\";"
+ "property \"Custom image path\" file artwork.nocover_path \"\";\n"
+ "property \"Save to file name\" entry artwork.save_to_music_folders_relative_path \"cover.jpg\";\n"
+#endif
+ "property \"Search masks (; separated)\" entry artwork.filemask \"" DEFAULT_FILEMASK "\";\n"
+ "property \"Search folders (; separated)\" entry artwork.folders \"" DEFAULT_FOLDERS "\";\n"
+// on android, cache is always off and music is saved to music folders by default
+#ifndef ANDROID
+ "property \"Cache refresh (hrs)\" spinbtn0,1000,1 artwork.cache.expiration_time 0;\n"
+#endif
+ "property \"Simplified cache file names\" checkbox artwork.cache.simplified 0;\n"
+ "property \"Image size\" spinbtn64,2048,1 artwork.image_size 256;\n"
 ;
 
 // define plugin interface
-static DB_artwork_plugin_t plugin = {
- .plugin.plugin.api_vmajor = 1,
- .plugin.plugin.api_vminor = 0,
- .plugin.plugin.version_major = 1,
- .plugin.plugin.version_minor = 2,
+ddb_artwork_plugin_t plugin = {
+ .plugin.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .plugin.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .plugin.plugin.version_major = DDB_ARTWORK_MAJOR_VERSION,
+ .plugin.plugin.version_minor = DDB_ARTWORK_MINOR_VERSION,
+ .plugin.plugin.flags = DDB_PLUGIN_FLAG_ASYNC_STOP,
 .plugin.plugin.type = DB_PLUGIN_MISC,
- .plugin.plugin.id = "artwork",
+ .plugin.plugin.id = "artwork2",
 .plugin.plugin.name = "Album Artwork",
- .plugin.plugin.descr = "Loads album artwork either from local directories or from internet",
+ .plugin.plugin.descr = "Loads album artwork from embedded tags, local directories, or internet services",
 .plugin.plugin.copyright =
- "Album Art plugin for DeaDBeeF\n"
- "Copyright (C) 2009-2011 Viktor Semykin <thesame.ml@gmail.com>\n"
- "Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "DeaDBeeF -- the music player\n"
+ "Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors\n"
 "\n"
 "This software is provided 'as-is', without any express or implied\n"
 "warranty. In no event will the authors be held liable for any damages\n"
@@ -1673,16 +1993,20 @@
 "3. This notice may not be removed or altered from any source distribution.\n"
 ,
 .plugin.plugin.website = "http://deadbeef.sf.net",
+ .plugin.plugin.command = _command,
 .plugin.plugin.start = artwork_plugin_start,
- .plugin.plugin.stop = artwork_plugin_stop,
+ // NOTE: stop is handled asynchronously by the command method with DDB_COMMAND_PLUGIN_ASYNC_STOP type
 .plugin.plugin.configdialog = settings_dlg,
 .plugin.plugin.message = artwork_message,
- .get_album_art = get_album_art,
+ .plugin.plugin.get_actions = artwork_get_actions,
+ .cover_get = cover_get,
 .reset = artwork_reset,
- .get_default_cover = get_default_cover,
- .get_album_art_sync = get_album_art_sync,
- .make_cache_path = make_cache_path,
- .make_cache_path2 = make_cache_path2,
+ .cover_info_release = sync_cover_info_release,
+ .add_listener = artwork_add_listener,
+ .remove_listener = artwork_remove_listener,
+ .default_image_path = artwork_default_image_path,
+ .allocate_source_id = artwork_allocate_source_id,
+ .cancel_queries_with_source_id = artwork_cancel_queries_with_source_id,
 };
 
 DB_plugin_t *
@@ -1690,4 +2014,3 @@
 deadbeef = api;
 return DB_PLUGIN (&plugin);
 }
-

deadbeef-0.6.2.tar.bz2/plugins/artwork/artwork.h -> deadbeef-1.9.6.tar.bz2/plugins/artwork/artwork.h Changed

deadbeef-1.9.6.tar.bz2/plugins/artwork/artwork_flac.c Added

@@ -0,0 +1,132 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+#include <limits.h>
+#include <deadbeef/deadbeef.h>
+#include "artwork_flac.h"
+#include "artwork_internal.h"
+#ifdef USE_METAFLAC
+#include <FLAC/metadata.h>
+#endif
+
+#define trace(...) { deadbeef->log_detailed (&plugin.plugin.plugin, 0, __VA_ARGS__); }
+
+extern DB_functions_t *deadbeef;
+extern ddb_artwork_plugin_t plugin;
+extern int artwork_disable_cache;
+
+#ifdef USE_METAFLAC
+static size_t
+flac_io_read (void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) {
+ return deadbeef->fread (ptr, size, nmemb, (DB_FILE *)handle);
+}
+
+static int
+flac_io_seek (FLAC__IOHandle handle, FLAC__int64 offset, int whence) {
+ return deadbeef->fseek ((DB_FILE *)handle, offset, whence);
+}
+
+static FLAC__int64
+flac_io_tell (FLAC__IOHandle handle) {
+ return deadbeef->ftell ((DB_FILE *)handle);
+}
+
+static FLAC__IOCallbacks flac_iocb = {
+ .read = flac_io_read,
+ .write = NULL,
+ .seek = flac_io_seek,
+ .tell = flac_io_tell,
+ .eof = NULL,
+ .close = NULL
+};
+
+int
+flac_extract_art (ddb_cover_info_t *cover) {
+ if (!strcasestr (cover->priv->filepath, ".flac") && !strcasestr (cover->priv->filepath, ".oga")) {
+ return -1;
+ }
+ int err = -1;
+ DB_FILE *file = NULL;
+ FLAC__Metadata_Iterator *iterator = NULL;
+
+ FLAC__Metadata_Chain *chain = FLAC__metadata_chain_new ();
+ if (!chain) {
+ return -1;
+ }
+
+ file = deadbeef->fopen (cover->priv->filepath);
+ if (!file) {
+ trace ("artwork: failed to open %s\n", cover->priv->filepath);
+ goto error;
+ }
+
+ int res = FLAC__metadata_chain_read_with_callbacks (chain, (FLAC__IOHandle)file, flac_iocb);
+#if USE_OGG
+ if (!res && FLAC__metadata_chain_status (chain) == FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE) {
+ res = FLAC__metadata_chain_read_ogg_with_callbacks (chain, (FLAC__IOHandle)file, flac_iocb);
+ }
+#endif
+ deadbeef->fclose (file);
+ if (!res) {
+ trace ("artwork: failed to read metadata from flac: %s\n", cover->priv->filepath);
+ goto error;
+ }
+
+ FLAC__StreamMetadata *picture = 0;
+ iterator = FLAC__metadata_iterator_new ();
+ if (!iterator) {
+ goto error;
+ }
+ FLAC__metadata_iterator_init (iterator, chain);
+ do {
+ FLAC__StreamMetadata *block = FLAC__metadata_iterator_get_block (iterator);
+ if (block->type == FLAC__METADATA_TYPE_PICTURE) {
+ picture = block;
+ }
+ } while (FLAC__metadata_iterator_next (iterator) && 0 == picture);
+
+ if (!picture) {
+ trace ("%s doesn't have an embedded cover\n", cover->priv->filepath);
+ goto error;
+ }
+
+ FLAC__StreamMetadata_Picture *pic = &picture->data.picture;
+ if (pic && pic->data_length > 0) {
+ trace ("found flac cover art of %d bytes (%s)\n", pic->data_length, pic->description);
+ cover->priv->blob = malloc (pic->data_length);
+ memcpy (cover->priv->blob, pic->data, pic->data_length);
+ cover->priv->blob_size = pic->data_length;
+ cover->priv->blob_image_size = pic->data_length;
+ err = 0;
+ }
+error:
+ if (chain) {
+ FLAC__metadata_chain_delete (chain);
+ }
+ if (iterator) {
+ FLAC__metadata_iterator_delete (iterator);
+ }
+ return err;
+}
+#endif

deadbeef-1.9.6.tar.bz2/plugins/artwork/artwork_flac.h Added

@@ -0,0 +1,32 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef artwork_flac_h
+#define artwork_flac_h
+
+#include "artwork.h"
+
+int
+flac_extract_art (ddb_cover_info_t *cover);
+
+#endif /* artwork_flac_h */

deadbeef-1.9.6.tar.bz2/plugins/artwork/artwork_internal.c Added

@@ -0,0 +1,236 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+ #include "../../config.h"
+#endif
+#include <dispatch/dispatch.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libgen.h>
+#include <errno.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <limits.h>
+#include <deadbeef/deadbeef.h>
+#include "artwork_internal.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(...)
+
+extern DB_functions_t *deadbeef;
+extern dispatch_queue_t sync_queue;
+
+#define MAX_REQUESTS FETCH_CONCURRENT_LIMIT
+static DB_FILE *_requestsMAX_REQUESTS; // all current open requests
+
+static DB_FILE *
+new_http_request (const char *url) {
+ errno = 0;
+
+ DB_FILE *http_request = deadbeef->fopen (url);
+
+ __block int registered = 0;
+
+ dispatch_sync(sync_queue, ^{
+ for (int i = 0; i < MAX_REQUESTS; i++) {
+ if (_requestsi == NULL) {
+ _requestsi = http_request;
+ registered = 1;
+ break;
+ }
+ }
+ });
+
+ if (!registered) {
+ deadbeef->fclose (http_request);
+ trace ("Too many concurrent HTTP requests");
+ return NULL;
+ }
+
+ return http_request;
+}
+
+// Make sure to call on sync queue
+void
+artwork_abort_all_http_requests (void) {
+ for (int i = 0; i < MAX_REQUESTS; i++) {
+ if (_requestsi != NULL) {
+ deadbeef->fabort (_requestsi);
+ }
+ }
+}
+
+static void
+close_http_request (DB_FILE *request) {
+ dispatch_sync(sync_queue, ^{
+ for (int i = 0; i < MAX_REQUESTS; i++) {
+ if (_requestsi == request) {
+ _requestsi = NULL;
+ break;
+ }
+ }
+ });
+ deadbeef->fclose (request);
+}
+
+size_t
+artwork_http_request (const char *url, char *buffer, const size_t buffer_size) {
+ DB_FILE *request = new_http_request (url);
+ if (!request) {
+ return 0;
+ }
+
+ const size_t size = deadbeef->fread (buffer, 1, buffer_size-1, request);
+ buffersize = '\0';
+
+ close_http_request (request);
+
+ return size;
+}
+
+static int
+check_dir (const char *path) {
+ struct stat stat_struct;
+ if (!stat (path, &stat_struct)) {
+ return S_ISDIR (stat_struct.st_mode);
+ }
+ if (errno != ENOENT) {
+ return 0;
+ }
+
+ char *dir = strdup (path);
+ char *dname = strdup (dirname (dir));
+ int good_dir = check_dir (dname);
+ free (dir);
+ free (dname);
+ return good_dir && !mkdir (path, 0755);
+}
+
+// check if directory of a supplied file exists,
+// attempt to create one if it doesn't,
+// return 1 on success.
+int
+ensure_dir (const char *path) {
+ char *dir = strdup (path);
+ char *dname = strdup (dirname (dir));
+ trace ("artwork: ensure folder %s exists\n", dname);
+ int res = check_dir (dname);
+ free (dir);
+ free (dname);
+ return res;
+}
+
+#define BUFFER_SIZE 4096
+int
+copy_file (const char *in, const char *out) {
+ trace ("copying %s to %s\n", in, out);
+
+ if (!ensure_dir (out)) {
+ return -1;
+ }
+
+ char tmp_outPATH_MAX;
+ snprintf (tmp_out, PATH_MAX, "%s.part", out);
+
+ struct stat stat_struct;
+ if (!stat (tmp_out, &stat_struct) && S_ISREG (stat_struct.st_mode) && stat_struct.st_size > 0) {
+ return 0;
+ }
+
+ FILE *fout = fopen (tmp_out, "w+b");
+ if (!fout) {
+ trace ("artwork: failed to open file %s for writing\n", tmp_out);
+ return -1;
+ }
+
+ DB_FILE *request = new_http_request (in);
+ if (!request) {
+ fclose (fout);
+ trace ("artwork: failed to open file %s for reading\n", in);
+ return -1;
+ }
+
+ int err = 0;
+ int64_t bytes_read;
+ size_t file_bytes = 0;
+ do {
+ char bufferBUFFER_SIZE;
+ bytes_read = deadbeef->fread (buffer, 1, BUFFER_SIZE, request);
+ if (bytes_read > 0 && fwrite (buffer, bytes_read, 1, fout) != 1) {
+ trace ("artwork: failed to write file %s: %s\n", tmp_out, strerror (errno));
+ err = -1;
+ }
+ file_bytes += bytes_read;
+ } while (!err && bytes_read == BUFFER_SIZE);
+
+ close_http_request (request);
+ fclose (fout);
+
+ if (file_bytes > 0 && !err) {
+ err = rename (tmp_out, out);
+ if (err) {
+ trace ("artwork: failed to move %s to %s: %s\n", tmp_out, out, strerror (errno));
+ }
+ }
+
+ unlink (tmp_out);
+ if (!err && file_bytes == 0) {
+ return -1;
+ }
+ return err;
+}
+
+int
+write_file (const char *out, const char *data, const size_t data_length) {
+ if (!ensure_dir (out)) {
+ return -1;
+ }
+
+ char tmp_pathPATH_MAX;
+ snprintf (tmp_path, sizeof (tmp_path), "%s.part", out);
+ FILE *fp = fopen (tmp_path, "w+b");
+ if (!fp) {
+ trace ("artwork: failed to open %s for writing\n", tmp_path);
+ return -1;
+ }
+
+ int err = 0;
+ if (fwrite (data, 1, data_length, fp) != data_length) {
+ trace ("artwork: failed to write picture into %s\n", tmp_path);
+ err = -1;
+ }
+
+ fclose (fp);
+
+ if (!err) {
+ err = rename (tmp_path, out);
+ if (err) {
+ trace ("Failed to move %s to %s: %s\n", tmp_path, out, strerror (errno));
+ }
+ }
+
+ unlink (tmp_path);
+ return err;
+}

deadbeef-1.9.6.tar.bz2/plugins/artwork/artwork_internal.h Added

@@ -0,0 +1,67 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __ARTWORK_INTERNAL_H
+#define __ARTWORK_INTERNAL_H
+
+#include <limits.h>
+#include <deadbeef/deadbeef.h>
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define max(x,y) ((x)>(y)?(x):(y))
+
+#define FETCH_CONCURRENT_LIMIT 5
+
+struct ddb_cover_info_priv_s {
+ // query info
+ time_t timestamp; // Last time when the info was used last time
+ char filepathPATH_MAX;
+ char album1000;
+ char artist1000;
+ char title1000;
+ int is_compilation;
+
+ char track_cache_pathPATH_MAX;
+ char album_cache_pathPATH_MAX;
+
+ char *blob; // A blob with the image data, or NULL
+ uint64_t blob_size; // Size of the blob
+ uint64_t blob_image_offset; // offset where the image data starts in the blob
+ uint64_t blob_image_size; // size of the image at offset
+
+ int refc; // Reference count, to allow sending the same cover to multiple callbacks
+
+ // prev/next in the list of all alive cover_info_t objects
+ struct ddb_cover_info_s *prev;
+ struct ddb_cover_info_s *next;
+};
+
+size_t artwork_http_request(const char *url, char *buffer, const size_t max_bytes);
+
+void artwork_abort_all_http_requests (void);
+
+int ensure_dir(const char *path);
+int copy_file (const char *in, const char *out);
+int write_file(const char *out, const char *data, const size_t data_length);
+
+#endif /*__ARTWORK_INTERNAL_H*/

deadbeef-1.9.6.tar.bz2/plugins/artwork/artwork_ogg.c Added

@@ -0,0 +1,190 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2022 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <vorbis/vorbisfile.h>
+#include <deadbeef/deadbeef.h>
+#include "artwork_ogg.h"
+#include "artwork_internal.h"
+#include "base64.h"
+
+#define trace(...) { deadbeef->log_detailed (&plugin.plugin.plugin, 0, __VA_ARGS__); }
+
+extern DB_functions_t *deadbeef;
+extern ddb_artwork_plugin_t plugin;
+extern int artwork_disable_cache;
+
+// ---
+
+static size_t
+cvorbis_fread (void *ptr, size_t size, size_t nmemb, void *datasource) {
+ size_t ret = deadbeef->fread (ptr, size, nmemb, datasource);
+ // trace ("cvorbis_fread %d %d %d\n", size, nmemb, ret);
+ return ret;
+}
+
+static int
+cvorbis_fseek (void *datasource, ogg_int64_t offset, int whence) {
+ DB_FILE *f = (DB_FILE *)datasource;
+ return deadbeef->fseek (f, offset, whence);
+}
+
+static int
+cvorbis_fclose (void *datasource) {
+ deadbeef->fclose (datasource);
+ return 0;
+}
+
+static long
+cvorbis_ftell (void *datasource) {
+ return deadbeef->ftell (datasource);
+}
+
+// ---
+
+#define READ_UINT32() ({if (buffer_size < 4) goto error_decode_flac_block; uint32_t _temp32 = (uint32_t)buffer3 | ((uint32_t)buffer2<<8) | ((uint32_t)buffer1<<16) | ((uint32_t)buffer0<<24); buffer+=4; buffer_size-=4; _temp32;})
+
+#define READ_BUF(buf,size) {if (buffer_size < size) goto error_decode_flac_block; memcpy (buf, buffer, size); buffer += size; buffer_size -= size; }
+
+// ---
+
+int
+ogg_extract_art (ddb_cover_info_t *cover) {
+ int err = -1;
+ if (!strcasestr (cover->priv->filepath, ".ogg")
+ && !strcasestr (cover->priv->filepath, ".oga")
+ && !strcasestr (cover->priv->filepath, ".opus")) {
+ return -1;
+ }
+
+ DB_FILE *fp = NULL;
+ OggVorbis_File vorbis_file;
+
+ fp = deadbeef->fopen (cover->priv->filepath);
+ if (!fp) {
+ trace ("ogg_extract_art: failed to fopen %s\n", cover->priv->filepath);
+ return -1;
+ }
+ if (fp->vfs->is_streaming ()) {
+ trace ("ogg_extract_art: failed to fopen %s\n", cover->priv->filepath);
+ deadbeef->fclose(fp);
+ return -1;
+ }
+ ov_callbacks ovcb = {
+ .read_func = cvorbis_fread,
+ .seek_func = cvorbis_fseek,
+ .close_func = cvorbis_fclose,
+ .tell_func = cvorbis_ftell
+ };
+ int res = ov_open_callbacks (fp, &vorbis_file, NULL, 0, ovcb);
+ if (res != 0) {
+ trace ("ogg_extract_art: ov_open_callbacks returned %d\n", res);
+ deadbeef->fclose(fp);
+ return -1;
+ }
+
+ const vorbis_comment *vc = ov_comment(&vorbis_file, 0);
+ if (!vc) {
+ trace("ogg_extract_art: ov_comment failed\n");
+ goto error;
+ }
+
+ // TODO: currently it will just return the first picture,
+ // but would be great to be able to enumerate / return all pictures,
+ // as well as prioritize by picture type.
+
+ const char key = "METADATA_BLOCK_PICTURE=";
+ for (int i = 0; i < vc->comments; i++) {
+ uint8_t *decoded_blob = NULL;
+ char *mime_type = NULL;
+ char *descr = NULL;
+ int size = vc->comment_lengthsi;
+ if (vc->comment_lengthsi <= sizeof(key)-1
+ || memcmp (vc->user_commentsi, key, sizeof (key)-1)) {
+ continue;
+ }
+ trace ("ogg_extract_art: found cover art of %d bytes\n", size);
+
+ // decode base64
+ char *blob = vc->user_commentsi + sizeof (key) - 1;
+ const int predicted_decoded_size = Base64decode_len(blob);
+
+ if (predicted_decoded_size <= 0) {
+ continue;
+ }
+
+ decoded_blob = malloc (predicted_decoded_size);
+ if (decoded_blob == NULL) {
+ goto error_decode_flac_block;
+ }
+ const int decoded_size = Base64decode((char *)decoded_blob, blob);
+
+ // decode flac picture block
+ uint8_t *buffer = decoded_blob;
+ int buffer_size = decoded_size;
+
+ /*int32_t picture_type = */READ_UINT32();
+ int32_t mime_size = READ_UINT32();
+ mime_type = calloc(1, mime_size + 1);
+ READ_BUF(mime_type, mime_size);
+ mime_typemime_size = 0;
+
+ // skip non-image data
+ if (strcasecmp(mime_type, "image/")
+ && strcasecmp(mime_type, "image/png")
+ && strcasecmp(mime_type, "image/jpeg")) {
+ goto error_decode_flac_block; // unsupported mime type
+ }
+
+ free (mime_type);
+ mime_type = NULL;
+ int32_t descr_size = READ_UINT32();
+ descr = calloc(1, descr_size + 1);
+ READ_BUF(descr, descr_size);
+ descrdescr_size = 0;
+ free (descr);
+ descr = NULL;
+ /*uint32_t width = */READ_UINT32();
+ /*uint32_t height = */READ_UINT32();
+ /*uint32_t depth = */READ_UINT32();
+ /*uint32_t palette_size = */READ_UINT32();
+ uint32_t picture_data_len = READ_UINT32();
+
+ cover->priv->blob_size = picture_data_len;
+ cover->priv->blob_image_size = picture_data_len;
+ cover->priv->blob = (char *)decoded_blob;
+ cover->priv->blob_image_offset = buffer - decoded_blob;
+ err = 0;
+ break;
+ error_decode_flac_block:
+ free (decoded_blob);
+ free (mime_type);
+ free (descr);
+ continue;
+ }
+
+error:
+ ov_clear (&vorbis_file);
+ return err;
+}

deadbeef-1.9.6.tar.bz2/plugins/artwork/artwork_ogg.h Added

@@ -0,0 +1,32 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2022 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef artwork_ogg_h
+#define artwork_ogg_h
+
+#include "artwork.h"
+
+int
+ogg_extract_art (ddb_cover_info_t *cover);
+
+#endif /* artwork_ogg_h */

deadbeef-1.9.6.tar.bz2/plugins/artwork/base64.c Added

@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/* ====================================================================
+ * Copyright (c) 1995-1999 The Apache Group. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * EXPRESSED 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 APACHE GROUP OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ */
+
+/* Base64 encoder/decoder. Originally Apache file ap_base64.c
+ */
+
+#include <string.h>
+
+#include "base64.h"
+
+/* aaaack but it's fast and const should make it shared text page. */
+static const unsigned char pr2six256 =
+{
+ /* ASCII table */
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 64, 64, 63,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64,
+ 64, 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, 64, 64, 64, 64, 64,
+ 64, 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, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
+};
+
+int Base64decode_len(const char *bufcoded)
+{
+ int nbytesdecoded;
+ register const unsigned char *bufin;
+ register int nprbytes;
+
+ bufin = (const unsigned char *) bufcoded;
+ while (pr2six*(bufin++) <= 63);
+
+ nprbytes = (int)((bufin - (const unsigned char *) bufcoded) - 1);
+ nbytesdecoded = ((nprbytes + 3) / 4) * 3;
+
+ return nbytesdecoded + 1;
+}
+
+int Base64decode(char *bufplain, const char *bufcoded)
+{
+ int nbytesdecoded;
+ register const unsigned char *bufin;
+ register unsigned char *bufout;
+ register int nprbytes;
+
+ bufin = (const unsigned char *) bufcoded;
+ while (pr2six*(bufin++) <= 63);
+ nprbytes = (int)((bufin - (const unsigned char *) bufcoded) - 1);
+ nbytesdecoded = ((nprbytes + 3) / 4) * 3;
+
+ bufout = (unsigned char *) bufplain;
+ bufin = (const unsigned char *) bufcoded;
+
+ while (nprbytes > 4) {
+ *(bufout++) =
+ (unsigned char) (pr2six*bufin << 2 | pr2sixbufin1 >> 4);
+ *(bufout++) =
+ (unsigned char) (pr2sixbufin1 << 4 | pr2sixbufin2 >> 2);
+ *(bufout++) =
+ (unsigned char) (pr2sixbufin2 << 6 | pr2sixbufin3);
+ bufin += 4;
+ nprbytes -= 4;
+ }
+
+ /* Note: (nprbytes == 1) would be an error, so just ingore that case */
+ if (nprbytes > 1) {
+ *(bufout++) =
+ (unsigned char) (pr2six*bufin << 2 | pr2sixbufin1 >> 4);
+ }
+ if (nprbytes > 2) {
+ *(bufout++) =
+ (unsigned char) (pr2sixbufin1 << 4 | pr2sixbufin2 >> 2);
+ }
+ if (nprbytes > 3) {
+ *(bufout++) =
+ (unsigned char) (pr2sixbufin2 << 6 | pr2sixbufin3);
+ }
+
+ *(bufout++) = '\0';
+ nbytesdecoded -= (4 - nprbytes) & 3;
+ return nbytesdecoded;
+}
+
+static const char basis_64 =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+int Base64encode_len(int len)
+{
+ return ((len + 2) / 3 * 4) + 1;
+}
+
+int Base64encode(char *encoded, const char *string, int len)
+{
+ int i;
+ char *p;
+
+ p = encoded;
+ for (i = 0; i < len - 2; i += 3) {
+ *p++ = basis_64(stringi >> 2) & 0x3F;
+ *p++ = basis_64((stringi & 0x3) << 4) |
+ ((int) (stringi + 1 & 0xF0) >> 4);
+ *p++ = basis_64((stringi + 1 & 0xF) << 2) |
+ ((int) (stringi + 2 & 0xC0) >> 6);
+ *p++ = basis_64stringi + 2 & 0x3F;
+ }
+ if (i < len) {
+ *p++ = basis_64(stringi >> 2) & 0x3F;
+ if (i == (len - 1)) {
+ *p++ = basis_64((stringi & 0x3) << 4);
+ *p++ = '=';
+ }
+ else {
+ *p++ = basis_64((stringi & 0x3) << 4) |
+ ((int) (stringi + 1 & 0xF0) >> 4);
+ *p++ = basis_64((stringi + 1 & 0xF) << 2);
+ }
+ *p++ = '=';
+ }
+
+ *p++ = '\0';
+ return (int)(p - encoded);
+}

deadbeef-1.9.6.tar.bz2/plugins/artwork/base64.h Added

@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/* ====================================================================
+ * Copyright (c) 1995-1999 The Apache Group. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * EXPRESSED 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 APACHE GROUP OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ */
+
+
+
+#ifndef _BASE64_H_
+#define _BASE64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int Base64encode_len(int len);
+int Base64encode(char * coded_dst, const char *plain_src,int len_plain_src);
+
+int Base64decode_len(const char * coded_src);
+int Base64decode(char * plain_dst, const char *coded_src);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //_BASE64_H_

deadbeef-1.9.6.tar.bz2/plugins/artwork/cache.c Added

@@ -0,0 +1,164 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <dirent.h>
+#include <dispatch/dispatch.h>
+#include <libgen.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+#include <deadbeef/deadbeef.h>
+#include "artwork.h"
+#include "artwork_internal.h"
+
+extern DB_functions_t *deadbeef;
+extern ddb_artwork_plugin_t plugin;
+
+#define trace(...) { deadbeef->log_detailed (&plugin.plugin.plugin, 0, __VA_ARGS__); }
+#define trace_err(...) { deadbeef->log_detailed (&plugin.plugin.plugin, DDB_LOG_LAYER_DEFAULT, __VA_ARGS__); }
+
+extern DB_functions_t *deadbeef;
+
+static dispatch_queue_t sync_queue;
+static dispatch_queue_t worker_queue;
+static int _terminate;
+static int32_t _file_expiration_time; // Seconds since the file creation, until the file expires.
+
+int
+make_cache_root_path (char *path, const size_t size) {
+ const char *cache_root_path = deadbeef->get_system_dir(DDB_SYS_DIR_CACHE);
+ size_t res;
+ res = snprintf(path, size, "%s/covers2", cache_root_path);
+ if (res >= size) {
+ trace ("artwork: cache root path truncated at %d bytes\n", (int)size);
+ return -1;
+ }
+ return 0;
+}
+
+void
+remove_cache_item (const char *cache_path) {
+ // Unlink the expired file, and the artist directory if it is empty
+ (void)unlink (cache_path);
+}
+
+static int
+path_ok (const char *entry) {
+ return strcmp (entry, ".") && strcmp (entry, "..");
+}
+
+static int
+should_terminate(void) {
+ __block int terminate = 0;
+ dispatch_sync(sync_queue, ^{
+ terminate = (_terminate || _file_expiration_time == 0);
+ });
+ return terminate;
+}
+
+static void
+cache_cleaner_worker (void) {
+ char covers_pathPATH_MAX;
+ if (make_cache_root_path (covers_path, sizeof (covers_path))) {
+ return;
+ }
+
+ const int32_t cache_secs = _file_expiration_time;
+ const time_t cache_expiry = time (NULL) - cache_secs;
+
+ DIR *covers_dir = opendir (covers_path);
+ if (covers_dir == NULL) {
+ return;
+ }
+ struct dirent *entry;
+ char entry_pathPATH_MAX;
+
+ while (!should_terminate() && (entry = readdir (covers_dir))) {
+ if (path_ok (entry->d_name)) {
+ if (sizeof (entry_path) < snprintf (entry_path, sizeof(entry_path), "%s/%s", covers_path, entry->d_name)) {
+ trace("artwork: cache cleaner entry_path buffer too small for path:\n%s/%s\n", covers_path, entry->d_name);
+ continue; // buffer too small
+ }
+
+ // Test against the cache expiry time
+ struct stat stat_buf;
+ if (!stat (entry_path, &stat_buf)) {
+ if (stat_buf.st_mtime <= cache_expiry) {
+ trace ("%s expired from cache\n", entry_path);
+ remove_cache_item (entry_path);
+ }
+ }
+ }
+ }
+ if (covers_dir) {
+ closedir (covers_dir);
+ covers_dir = NULL;
+ }
+}
+
+void
+cache_configchanged (void) {
+ dispatch_sync(sync_queue, ^{
+ int32_t old_expiration_time = _file_expiration_time;
+ _file_expiration_time = deadbeef->conf_get_int ("artwork.cache.expiration_time", 0) * 60 * 60;
+ if (old_expiration_time == 0 && _file_expiration_time != 0) {
+ dispatch_async(worker_queue, ^{
+ cache_cleaner_worker();
+ });
+ trace ("Cache cleaner started\n");
+ }
+ });
+}
+
+int
+start_cache_cleaner (void) {
+ _terminate = 0;
+
+ sync_queue = dispatch_queue_create("ArtworkCacheSyncQueue", NULL);
+ worker_queue = dispatch_queue_create("ArtworkCacheCleanerQueue", NULL);
+
+ cache_configchanged();
+
+ return 0;
+}
+
+void
+stop_cache_cleaner (void) {
+ dispatch_sync(sync_queue, ^{
+ _terminate = 1;
+ });
+
+ dispatch_release(worker_queue);
+ worker_queue = NULL;
+ dispatch_release(sync_queue);
+ sync_queue = NULL;
+
+ trace ("Cache cleaner stopped\n");
+}
+

deadbeef-1.9.6.tar.bz2/plugins/artwork/cache.h Added

@@ -0,0 +1,33 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __ARTWORK_CACHE_H
+#define __ARTWORK_CACHE_H
+
+int make_cache_root_path(char *path, const size_t size);
+void remove_cache_item(const char *entry_path);
+void cache_configchanged(void);
+void start_cache_cleaner(void);
+void stop_cache_cleaner(void);
+
+#endif /*__ARTWORK_CACHE_H*/

deadbeef-1.9.6.tar.bz2/plugins/artwork/coverinfo.c Added

@@ -0,0 +1,90 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <deadbeef/deadbeef.h>
+#include "artwork.h"
+#include "artwork_internal.h"
+#include "coverinfo.h"
+#include <assert.h>
+#include <stdlib.h>
+
+static ddb_cover_info_t *cover_info_list;
+
+ddb_cover_info_t *
+cover_info_alloc (void) {
+ ddb_cover_info_t *info = calloc(1, sizeof (ddb_cover_info_t));
+
+ info->priv = calloc(1, sizeof (ddb_cover_info_priv_t));
+
+ info->_size = sizeof (ddb_cover_info_t);
+ info->priv->refc = 1;
+ info->priv->timestamp = time(NULL);
+
+ info->priv->prev = NULL;
+
+ if (cover_info_list != NULL) {
+ cover_info_list->priv->prev = info;
+ }
+
+ info->priv->next = cover_info_list;
+ cover_info_list = info;
+
+ return info;
+}
+
+void
+cover_info_ref (ddb_cover_info_t *cover) {
+ cover->priv->refc++;
+}
+
+void
+cover_info_release (ddb_cover_info_t *cover) {
+ assert (cover->priv->refc > 0);
+ cover->priv->refc -= 1;
+ if (cover->priv->refc != 0) {
+ return;
+ }
+ free (cover->image_filename);
+ free (cover->priv->blob);
+
+ // remove from list
+ if (cover->priv->prev) {
+ cover->priv->prev->priv->next = cover->priv->next;
+ }
+ else {
+ cover_info_list = cover->priv->next;
+ }
+ if (cover->priv->next) {
+ cover->priv->next->priv->prev = cover->priv->prev;
+ }
+ free (cover->priv);
+
+ free (cover);
+}
+
+void
+cover_info_cleanup (void) {
+ while (cover_info_list) {
+ cover_info_release(cover_info_list);
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/artwork/coverinfo.h Added

@@ -0,0 +1,39 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef coverinfo_h
+#define coverinfo_h
+
+ddb_cover_info_t *
+cover_info_alloc (void);
+
+void
+cover_info_ref (ddb_cover_info_t *cover);
+
+void
+cover_info_release (ddb_cover_info_t *info);
+
+void
+cover_info_cleanup (void);
+
+#endif /* coverinfo_h */

deadbeef-0.6.2.tar.bz2/plugins/artwork/escape.c -> deadbeef-1.9.6.tar.bz2/plugins/artwork/escape.c Changed

deadbeef-0.6.2.tar.bz2/plugins/artwork/escape.h -> deadbeef-1.9.6.tar.bz2/plugins/artwork/escape.h Changed

deadbeef-0.6.2.tar.bz2/plugins/artwork/lastfm.c -> deadbeef-1.9.6.tar.bz2/plugins/artwork/lastfm.c Changed

deadbeef-0.6.2.tar.bz2/plugins/artwork/lastfm.h -> deadbeef-1.9.6.tar.bz2/plugins/artwork/lastfm.h Changed

deadbeef-1.9.6.tar.bz2/plugins/artwork/musicbrainz.c Added

@@ -0,0 +1,106 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include "artwork_internal.h"
+#include "escape.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(...)
+
+#define MB_ID_LENGTH 36
+#define MB_BUFFER_LENGTH 4096
+
+#define MB_ID_URL "http://musicbrainz.org/ws/2/release-group/?query=artist:%%22%s%%22%%20AND%%20release:%%22%s%%22"
+#define MB_ID_STRING "<release-group id=\""
+
+#define MB_ART_URL "http://coverartarchive.org/release-group/%s/"
+#define MB_ART_STRING "\"large\":\""
+
+
+int fetch_from_musicbrainz (const char *artist, const char *album, const char *dest) {
+ if (!artist || !album) {
+ return -1;
+ }
+
+ char *artist_url = uri_escape(artist, 0);
+ char *album_url = uri_escape(album, 0);
+ if (!artist_url || !album_url) {
+ return -1;
+ }
+
+ char *id_url = malloc(sizeof(MB_ID_URL) + strlen(artist_url) + strlen(album_url));
+ if (id_url) {
+ sprintf(id_url, MB_ID_URL, artist_url, album_url);
+ }
+ free(artist_url);
+ free(album_url);
+ if (!id_url) {
+ return -1;
+ }
+
+ trace("fetch_from_musicbrainz: search for release group MBID %s\n", id_url);
+ char bufferMB_BUFFER_LENGTH+1;
+ const size_t id_size = artwork_http_request(id_url, buffer, sizeof(buffer));
+ if (!id_size) {
+ trace("fetch_from_musicbrainz: failed to read (%d)\n", id_size);
+ return -1;
+ }
+
+ char *mbid = strstr(buffer, MB_ID_STRING);
+ if (!mbid || mbid+sizeof(MB_ID_STRING)+MB_ID_LENGTH > buffer+id_size) {
+ trace("fetch_from_musicbrainz: release-group ID not found in response (%d bytes)\n", id_size);
+ return -1;
+ }
+
+ mbid += sizeof(MB_ID_STRING)-1;
+ *(mbid + MB_ID_LENGTH) = '\0';
+ char art_urlsizeof(MB_ART_URL) + MB_ID_LENGTH;
+ sprintf(art_url, MB_ART_URL, mbid);
+
+ trace("fetch_from_musicbrainz: get art list for the MBID %s\n", art_url);
+ const size_t art_size = artwork_http_request(art_url, buffer, sizeof(buffer));
+ if (!art_size) {
+ trace("fetch_from_musicbrainz: failed to read (%d)\n", art_size);
+ return -1;
+ }
+
+ char *image_url = strstr(buffer, MB_ART_STRING);
+ if (!image_url) {
+ trace("fetch_from_musicbrainz: large thumb not found in response (%d bytes)\n", art_size);
+ return -1;
+ }
+
+ image_url += sizeof(MB_ART_STRING)-1;
+ char *image_url_end = strchr(image_url, '"');
+ if (image_url_end) {
+ *image_url_end = '\0';
+ }
+
+ trace("fetch_from_musicbrainz: download image %s\n", image_url);
+ return copy_file(image_url, dest);
+}

deadbeef-1.9.6.tar.bz2/plugins/artwork/musicbrainz.h Added

@@ -0,0 +1,30 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __MUSICBRAINZ_H
+#define __MUSICBRAINZ_H
+
+int
+fetch_from_musicbrainz (const char *artist, const char *album, const char *dest);
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/artwork/wos.c -> deadbeef-1.9.6.tar.bz2/plugins/artwork/wos.c Changed

@@ -1,6 +1,6 @@
 /*
- world of spectrum game cover downloader for the Deadbeef Artwork plugin
- Copyright (C) 2009-2013 Alexey Yakovenko and other contributors
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -24,26 +24,19 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <limits.h>
 #include <ctype.h>
-
-#include "artwork.h"
+#include "artwork_internal.h"
 #include "escape.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(...)
 
-extern DB_functions_t *deadbeef;
-
-#define BASE_URL "http://www.worldofspectrum.org/showscreen.cgi?screen=screens/load"
-#define min(x,y) ((x)<(y)?(x):(y))
+static const char WOS_URL = "http://worldofspectrum.org//scr2gif?file=pub/sinclair/screens/load/%c/scr/%s.scr";
 
 void
-strcopy_escape (char *dst, int d_len, const char *src, int n) {
+strcopy_escape (char *dst, int d_len, const char *src, size_t n) {
 char *e = dst + d_len - 1;
 const char *se = src + n;
 while (dst < e && *src && src < se) {
@@ -55,9 +48,7 @@
 *dst = 0;
 }
 
-int
-fetch_from_wos (const char *title, const char *dest)
-{
+int fetch_from_wos (const char *title, const char *dest) {
 // extract game title from title
 char t100;
 char *dash = strstr (title, " -");
@@ -67,60 +58,21 @@
 else {
 strcopy_escape(t, sizeof (t), title, dash-title);
 }
- char *sp;
- while (sp = strchr(t, ' ')) {
- *sp = '_';
- }
- char *title_url = uri_escape (t, 0);
- char url 1024;
- snprintf (url, sizeof (url), BASE_URL "/%c/gif/%s.gif", tolower (title_url0), title_url);
- free (title_url);
- trace ("WOS request: %s\n", url);
-
- DB_FILE *fp = NULL;
-
- fp = deadbeef->fopen (url);
- if (!fp) {
- trace ("fetch_from_wos: failed to open %s\n", url);
- return -1;
- }
- current_file = fp;
-
- char tempPATH_MAX;
- snprintf (temp, sizeof (temp), "%s.part", dest);
- FILE *out = fopen (temp, "w+b");
- if (!out) {
- trace ("fetch_from_lastfm: failed to open %s for writing\n", temp);
- deadbeef->fclose (fp);
- current_file = NULL;
- return -1;
- }
 
- char *writebuffer4096;
- int len;
- int error = 0;
- while ((len = deadbeef->fread (writebuffer, 1, sizeof (writebuffer), fp)) > 0) {
- if (fwrite (writebuffer, 1, len, out) != len) {
- trace ("fetch_from_lastfm: failed to write to %s\n", dest);
- error = 1;
- break;
- }
- }
+ char *title_url = uri_escape(t, 0);
+ size_t url_size = strlen(WOS_URL) + strlen(title_url) + 1;
 
- fclose (out);
- current_file = NULL;
- deadbeef->fclose (fp);
+ char *url = malloc (url_size);
+ snprintf(url, url_size, WOS_URL, tolower(title_url0), title_url);
 
- if (error) {
- unlink (temp);
- return -1;
- }
+ free(title_url);
+ title_url = NULL;
 
- if (rename (temp, dest) != 0) {
- unlink (temp);
- unlink (dest);
- return -1;
- }
+ trace("WOS request: %s\n", url);
+ int res = copy_file(url, dest);
+
+ free (url);
+ url = NULL;
 
- return 0;
+ return res;
 }

deadbeef-0.6.2.tar.bz2/plugins/artwork/wos.h -> deadbeef-1.9.6.tar.bz2/plugins/artwork/wos.h Changed

deadbeef-0.6.2.tar.bz2/plugins/cdda/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/cdda/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/cdda/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/cdda/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/cdda/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/cdda/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/cdda/cdda.c -> deadbeef-1.9.6.tar.bz2/plugins/cdda/cdda.c Changed

@@ -16,212 +16,285 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* screwed/maintained by Alexey Yakovenko <waker@users.sourceforge.net> */
+/* screwed/maintained by Oleksiy Yakovenko <waker@users.sourceforge.net> */
 
-#ifdef HAVE_CONFIG_H
-# include "../../config.h"
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 #include <sys/types.h>
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
+
+#if USE_PARANOIA_10_2
+ #include <cdio/paranoia/cdda.h>
+ #include <cdio/paranoia/paranoia.h>
+#elif USE_PARANOIA
+#if USE_CDDA_SUBDIR
+ #include <cdda/cdda_interface.h>
+ #include <cdda/cdda_paranoia.h>
+#else
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
 #endif
-#if HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
 #endif
-
 #include <cdio/cdio.h>
+#include <cdio/cd_types.h>
 #include <cdio/cdtext.h>
 #include <cddb/cddb.h>
 
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 //#define trace(...) { fprintf (stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
-#define DEFAULT_SERVER "freedb.org"
-#define DEFAULT_PORT 888
+#define CDDA_ALL_TRACKS "all.cda"
+
+#define DEFAULT_SERVER "gnudb.gnudb.org"
+#define DEFAULT_PORT 8880
 #define DEFAULT_USE_CDDB 1
 #define DEFAULT_PROTOCOL 1
 #define DEFAULT_PREFER_CDTEXT 1
 
 #define SECTORSIZE CDIO_CD_FRAMESIZE_RAW //2352
 #define SAMPLESIZE 4 //bytes
-#define BUFSIZE (CDIO_CD_FRAMESIZE_RAW * 2)
+
+#define CDDB_CATEGORY_SIZE 12
+#define CDDB_DISCID_SIZE 10
+#define MAX_CDDB_DISCS 10
+#define MAX_CDDB_MENU 80
+
+#define CDDB_DISCID_TAG ":CDDB_DISCID"
+#define CDDB_IDS_TAG ":CDDB IDs"
 
 static DB_decoder_t plugin;
 static DB_functions_t *deadbeef;
 
-typedef struct {
+typedef struct
+{
 DB_fileinfo_t info;
- CdIo_t* cdio;
+ uint32_t hints;
+ CdIo_t *cdio;
+#if USE_PARANOIA
+ cdrom_paranoia *paranoia;
+ cdrom_drive *cdrom;
+#endif
 lsn_t first_sector;
- unsigned int sector_count;
- uint8_t tail SECTORSIZE;
- unsigned int tail_len;
- int current_sector;
- unsigned int current_sample;
+ lsn_t current_sector;
+ lsn_t last_sector;
+ uint8_t bufferSECTORSIZE;
+ uint8_t *tail;
+ size_t tail_length;
 } cdda_info_t;
 
 struct cddb_thread_params
 {
- DB_playItem_t *items100;
- CdIo_t *cdio;
+ DB_playItem_t **items;
+ cddb_disc_t *disc;
+ int got_cdtext;
+ int prefer_cdtext;
 };
 
-static inline int
-min (int a, int b) {
- return a < b ? a : b;
+static cddb_disc_t *
+create_disc(CdIo_t *cdio)
+{
+ cddb_disc_t *disc = cddb_disc_new();
+ if (disc) {
+ const lba_t leadout_lba = cdio_get_track_lba(cdio, CDIO_CDROM_LEADOUT_TRACK);
+ cddb_disc_set_length(disc, leadout_lba / CDIO_CD_FRAMES_PER_SEC);
+ const track_t first_track = cdio_get_first_track_num(cdio);
+ const track_t num_tracks = cdio_get_num_tracks(cdio);
+ if (leadout_lba == CDIO_INVALID_LBA || first_track == CDIO_INVALID_TRACK || num_tracks == CDIO_INVALID_TRACK) {
+ trace("cda: create_disc failed, invalid CD disc format\n");
+ cddb_disc_destroy(disc);
+ return NULL;
+ }
+
+ const track_t last_track = first_track + num_tracks;
+ for (track_t i = first_track; i < last_track; i++) {
+ cddb_track_t *track = cddb_track_new();
+ if (!track) {
+ cddb_disc_destroy(disc);
+ return NULL;
+ }
+ const lba_t offset = cdio_get_track_lba(cdio, i);
+ cddb_track_set_frame_offset(track, offset);
+ cddb_disc_add_track(disc, track);
+ }
+ cddb_disc_calc_discid(disc);
+ }
+
+ return disc;
 }
 
 static DB_fileinfo_t *
-cda_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (cdda_info_t));
- memset (_info, 0, sizeof (cdda_info_t));
- return _info;
+cda_open (uint32_t hints)
+{
+ cdda_info_t *info = calloc(1, sizeof (cdda_info_t));
+ if (info) {
+ info->hints = hints;
+ info->info.plugin = &plugin;
+ info->info.fmt.bps = 16;
+ info->info.fmt.channels = 2;
+ info->info.fmt.samplerate = 44100;
+ info->info.fmt.channelmask = DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT;
+ }
+ return (DB_fileinfo_t *)info;
 }
 
 static int
-cda_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
- cdda_info_t *info = (cdda_info_t *)_info;
-
- trace ("cdda: init %s\n", deadbeef->pl_find_meta (it, ":URI"));
-
- char locationPATH_MAX;
- deadbeef->pl_get_meta (it, ":URI", location, sizeof (location));
-
- char *nr = strchr (location, '#');
- if (nr) {
- *nr = 0; nr++;
- }
- else {
- trace ("cdda: bad name: %s\n", deadbeef->pl_find_meta (it, ":URI"));
+cda_init (DB_fileinfo_t *_info, DB_playItem_t *it)
+{
+ deadbeef->pl_lock();
+ const char *uri = deadbeef->pl_find_meta(it, ":URI");
+ const char *nr = uri ? strchr(uri, '#') : NULL;
+ if (!nr || nr == uri) {
+ deadbeef->pl_unlock();
+ trace ("cdda: bad name: %s\n", uri);
 return -1;
 }
- int track_nr = atoi (nr);
- char *fname = (*location) ? location : NULL; //NULL if empty string; means pysical CD drive
 
- info->cdio = cdio_open (fname, DRIVER_UNKNOWN);
- if (!info->cdio)
- {
- trace ("cdda: Could not open CD\n");
- return -1;
- }
+ trace ("cdda: init %s\n", uri);
+ const int track_nr = atoi(nr+1);
+ const size_t device_length = nr - uri;
+ char devicedevice_length+1;
+ strncpy(device, uri, device_length);
+ devicedevice_length = '\0';
+ deadbeef->pl_unlock();
 
- track_t first_track = cdio_get_first_track_num (info->cdio);
- if (first_track == 0xff) {
- trace ("cdda: no medium found\n");
+ cdda_info_t *info = (cdda_info_t *)_info;
+ info->cdio = cdio_open(device, DRIVER_UNKNOWN);
+ if (!info->cdio) {
+ trace ("cdda: Could not open CD device\n");
 return -1;
 }
- track_t tracks = cdio_get_num_tracks (info->cdio);
- track_t i;
- cddb_track_t *track;
-
- cddb_disc_t *disc = cddb_disc_new();
 
- cddb_disc_set_length (disc, cdio_get_track_lba (info->cdio, CDIO_CDROM_LEADOUT_TRACK) / CDIO_CD_FRAMES_PER_SEC);
+ const int need_bitrate = info->hints & DDB_DECODER_HINT_NEED_BITRATE;
+ const int drive_speed = deadbeef->conf_get_int("cdda.drive_speed", 2);
+ cdio_set_speed(info->cdio, need_bitrate && drive_speed < 5 ? 1<<drive_speed : -1);
 
- for (i = 0; i < tracks; i++)
- {
- lsn_t offset = cdio_get_track_lba (info->cdio, i+first_track);
- track = cddb_track_new();
- cddb_track_set_frame_offset (track, offset);
- cddb_disc_add_track (disc, track);
+ cddb_disc_t *disc = create_disc(info->cdio);
+ if (!disc) {
+ return -1;
 }
- cddb_disc_calc_discid (disc);
- int discid = cddb_disc_get_discid (disc);
 
- int trk_discid = deadbeef->pl_find_meta_int (it, ":CDIO_DISCID", 0);
+ const unsigned long discid = cddb_disc_get_discid(disc);
+ cddb_disc_destroy(disc);
+
+ deadbeef->pl_lock();
+ const char *discid_hex = deadbeef->pl_find_meta(it, CDDB_DISCID_TAG);
+ const unsigned long trk_discid = discid_hex ? strtoul(discid_hex, NULL, 16) : 0;
+ deadbeef->pl_unlock();
 if (trk_discid != discid) {
- cddb_disc_destroy (disc);
- trace ("cdda: the track belongs to another disc, skipped\n");
+ trace ("cdda: the track belongs to another disc (%x vs %x), skipped\n", trk_discid, discid);
 return -1;
 }
- cddb_disc_destroy (disc);
 
-
- if (TRACK_FORMAT_AUDIO != cdio_get_track_format (info->cdio, track_nr))
- {
+ if (cdio_get_track_format(info->cdio, track_nr) != TRACK_FORMAT_AUDIO) {
 trace ("cdda: Not an audio track (%d)\n", track_nr);
 return -1;
 }
 
- int channels = cdio_get_track_channels (info->cdio, track_nr);
- trace ("cdio nchannels: %d\n", channels);
-
- _info->plugin = &plugin;
- _info->fmt.bps = 16;
- _info->fmt.channels = 2;
- _info->fmt.samplerate = 44100;
- _info->fmt.channelmask = DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT;
- _info->readpos = 0;
-
- info->first_sector = cdio_get_track_lsn (info->cdio, track_nr);
- info->sector_count = cdio_get_track_sec_count (info->cdio, track_nr);
+ info->first_sector = cdio_get_track_lsn(info->cdio, track_nr);
 info->current_sector = info->first_sector;
- info->tail_len = 0;
- info->current_sample = 0;
+ info->last_sector = info->first_sector + cdio_get_track_sec_count(info->cdio, track_nr) - 1;
+ trace("cdio nchannels (should always be 2 for an audio track): %d\n", cdio_get_track_channels (info->cdio, track_nr));
+ if (info->first_sector == CDIO_INVALID_LSN || info->last_sector <= info->first_sector) {
+ trace ("cdda: invalid track\n");
+ return -1;
+ }
+
+#if USE_PARANOIA
+ if (cdio_get_driver_id(info->cdio) != DRIVER_NRG) {
+ info->cdrom = cdda_identify(device, CDDA_MESSAGE_FORGETIT, NULL);
+ if (info->cdrom) {
+ cdda_open(info->cdrom);
+ info->paranoia = paranoia_init(info->cdrom);
+ }
+ if (!info->paranoia) {
+ trace ("cdda: cannot re-open %s for paranoia\n", device);
+ return -1;
+ }
+ const int no_paranoia = need_bitrate || !deadbeef->conf_get_int("cdda.paranoia", 0);
+ if (no_paranoia) {
+ paranoia_cachemodel_size(info->paranoia, 100);
+ }
+ paranoia_modeset(info->paranoia, no_paranoia ? PARANOIA_MODE_DISABLE : PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP);
+ paranoia_seek(info->paranoia, info->first_sector, SEEK_SET);
+ }
+#endif
 return 0;
 }
 
-int
-cda_read (DB_fileinfo_t *_info, char *bytes, int size) {
+#if USE_PARANOIA
+static void
+paranoia_callback(long bytes, int mode)
+{
+ if (mode > 1 && mode != 9)
+ fprintf(stderr, "%ld %d\n", bytes, mode);
+}
+#endif
+
+static const char *
+read_sector(cdda_info_t *info)
+{
+#if USE_PARANOIA
+ if (info->paranoia) {
+ const int16_t *p_readbuf = paranoia_read(info->paranoia, NULL);
+ if (p_readbuf) {
+ info->current_sector++;
+ return (char *)p_readbuf;
+ }
+ }
+ else
+#endif
+ if (!cdio_read_audio_sector(info->cdio, info->buffer, info->current_sector)) {
+ info->current_sector++;
+ return info->buffer;
+ }
+
+ return NULL;
+}
+
+static int
+cda_read (DB_fileinfo_t *_info, char *bytes, int size)
+{
 cdda_info_t *info = (cdda_info_t *)_info;
- int extrasize = 0;
- 
- if (info->tail_len > 0)
- {
- if (info->tail_len >= size)
- {
-// trace ("Easy case\n");
- memcpy (bytes, info->tail, size);
- info->tail_len -= size;
- memmove (info->tail, info->tail+size, info->tail_len);
- return size;
- }
-// trace ("Prepending with tail of %d bytes\n", tail_len);
- extrasize = info->tail_len;
- memcpy (bytes, info->tail, info->tail_len);
- bytes += info->tail_len;
- size -= info->tail_len;
- info->tail_len = 0;
- }
-
- int sectors_to_read = size / SECTORSIZE + 1;
- int end = 0;
- 
- if (info->current_sector + sectors_to_read > info->first_sector + info->sector_count) // reached end of track
- {
- end = 1;
- sectors_to_read = info->first_sector + info->sector_count - info->current_sector;
-// trace ("cdda: reached end of track\n");
- }
-
- int bufsize = sectors_to_read * SECTORSIZE;
-
- info->tail_len = end ? 0 : bufsize - size;
-
- char *buf = alloca (bufsize);
-
- driver_return_code_t ret = cdio_read_audio_sectors (info->cdio, buf, info->current_sector, sectors_to_read);
- if (ret != DRIVER_OP_SUCCESS)
- return 0;
- info->current_sector += sectors_to_read;
+ char *fill = bytes;
+ const char *high_water = bytes + size;
+
+ if (info->tail_length >= size) {
+ memcpy(fill, info->tail, size);
+ info->tail += size;
+ fill += size;
+ info->tail_length -= size;
+ }
+ else if (info->tail_length > 0) {
+ memcpy(fill, info->tail, info->tail_length);
+ fill += info->tail_length;
+ info->tail_length = 0;
+ }
 
- int retsize = end ? bufsize : size;
+ while (fill < high_water && info->current_sector <= info->last_sector) {
+ const char *p_readbuf = read_sector(info);
+ if (!p_readbuf) {
+ trace("cda_read: read_sector failed\n");
+ return -1;
+ }
 
- memcpy (bytes, buf, retsize);
- if (!end)
- memcpy (info->tail, buf+retsize, info->tail_len);
+ if (fill+SECTORSIZE <= high_water) {
+ memcpy(fill, p_readbuf, SECTORSIZE);
+ fill += SECTORSIZE;
+ }
+ else {
+ const size_t bytes_left = high_water - fill;
+ memcpy(fill, p_readbuf, bytes_left);
+ fill += bytes_left;
+ info->tail_length = SECTORSIZE - bytes_left;
+ info->tail = (char *)p_readbuf + bytes_left;
+ }
+ }
 
- retsize += extrasize;
-// trace ("requested: %d; tail_len: %d; size: %d; sectors_to_read: %d; return: %d\n", initsize, tail_len, size, sectors_to_read, retsize);
- info->current_sample += retsize / SAMPLESIZE;
- _info->readpos = (float)info->current_sample / _info->fmt.samplerate;
- return retsize;
+// trace ("requested: %d, return: %d\n", size, fill-bytes);
+ _info->readpos = (float)(info->current_sector-info->first_sector) * SECTORSIZE / SAMPLESIZE / _info->fmt.samplerate;
+ return fill - bytes;
 }
 
 static void
@@ -232,25 +305,41 @@
 if (info->cdio) {
 cdio_destroy (info->cdio);
 }
- free (_info);
+#if USE_PARANOIA
+ if (info->paranoia) {
+ paranoia_free(info->paranoia);
+ }
+ if (info->cdrom) {
+ cdda_close(info->cdrom);
+ }
+#endif
+ free (info);
 }
 }
 
 static int
 cda_seek_sample (DB_fileinfo_t *_info, int sample)
 {
+ trace("cda_seek_sample %d\n", sample);
 cdda_info_t *info = (cdda_info_t *)_info;
- int sector = sample / (SECTORSIZE / SAMPLESIZE) + info->first_sector;
- int offset = (sample % (SECTORSIZE / SAMPLESIZE)) * SAMPLESIZE; //in bytes
- char buf SECTORSIZE;
+ const int sector = sample * SAMPLESIZE / SECTORSIZE + info->first_sector;
+ const int offset = sample * SAMPLESIZE % SECTORSIZE;
 
- driver_return_code_t ret = cdio_read_audio_sector (info->cdio, buf, sector);
- if (ret != DRIVER_OP_SUCCESS)
- return -1;
- memcpy (info->tail, buf + offset, SECTORSIZE - offset);
+#if USE_PARANOIA
+ if (info->paranoia) {
+ paranoia_seek(info->paranoia, sector, SEEK_SET);
+ }
+#endif
 info->current_sector = sector;
- info->current_sample = sample;
- _info->readpos = (float)info->current_sample / _info->fmt.samplerate;
+ const char *p_readbuf = read_sector(info);
+ if (!p_readbuf) {
+ return -1;
+ }
+
+ info->tail = (char *)p_readbuf + offset;
+ info->tail_length = SECTORSIZE - offset;
+ _info->readpos = (float)sample / _info->fmt.samplerate;
+
 return 0;
 }
 
@@ -260,155 +349,154 @@
 return cda_seek_sample (_info, sec * _info->fmt.samplerate);
 }
 
-cddb_disc_t*
-resolve_disc (CdIo_t *cdio)
+static cddb_conn_t *
+new_cddb_connection(void)
 {
- track_t first_track = cdio_get_first_track_num (cdio);
- track_t tracks = cdio_get_num_tracks (cdio);
- track_t i;
- cddb_track_t *track;
+ cddb_conn_t *conn = cddb_new();
+ if (conn) {
+ deadbeef->conf_lock ();
+ cddb_set_server_name (conn, deadbeef->conf_get_str_fast ("cdda.freedb.host", DEFAULT_SERVER));
+ cddb_set_server_port (conn, deadbeef->conf_get_int ("cdda.freedb.port", DEFAULT_PORT));
+ if (!deadbeef->conf_get_int ("cdda.protocol", DEFAULT_PROTOCOL)) {
+ cddb_http_enable (conn);
+ if (deadbeef->conf_get_int ("network.proxy", 0)) {
+ cddb_set_server_port(conn, deadbeef->conf_get_int ("network.proxy.port", 8080));
+ cddb_set_server_name(conn, deadbeef->conf_get_str_fast ("network.proxy.address", ""));
+ }
+ }
+ deadbeef->conf_unlock ();
+ }
 
- cddb_disc_t *disc = cddb_disc_new();
+ return conn;
+}
+
+static int
+resolve_disc (cddb_disc_t* disc, char *disc_list)
+{
+ trace("cda: resolve_disc\n");
 
- cddb_disc_set_length (disc, cdio_get_track_lba (cdio, CDIO_CDROM_LEADOUT_TRACK) / CDIO_CD_FRAMES_PER_SEC);
+ cddb_conn_t *conn = new_cddb_connection();
+ if (!conn) {
+ return 0;
+ }
 
- for (i = 0; i < tracks; i++)
- {
- lsn_t offset = cdio_get_track_lba (cdio, i+first_track);
- track = cddb_track_new();
- cddb_track_set_frame_offset (track, offset);
- cddb_disc_add_track (disc, track);
+ cddb_disc_t *temp_disc = cddb_disc_clone(disc);
+ cddb_disc_t *query_disc = disc;
+
+ cddb_cache_disable(conn);
+ const int matches = cddb_query(conn, query_disc);
+
+ cddb_cache_enable(conn);
+ size_t discs_read = 0;
+ disc_list0 = '\0';
+ for (int i = 0; i < matches; i++) {
+ if (cddb_read(conn, query_disc) && discs_read < MAX_CDDB_DISCS) {
+ discs_read++;
+ char temp_stringCDDB_CATEGORY_SIZE + CDDB_DISCID_SIZE + 1;
+ sprintf(temp_string, ",%s/%08x", cddb_disc_get_category_str(query_disc), cddb_disc_get_discid(query_disc));
+ strcat(disc_list, temp_string);
+ query_disc = temp_disc;
+ }
+ cddb_query_next(conn, query_disc);
 }
- cddb_conn_t *conn = NULL;
 
- conn = cddb_new();
+ cddb_disc_destroy(temp_disc);
+ cddb_destroy(conn);
 
- deadbeef->conf_lock ();
- cddb_set_server_name (conn, deadbeef->conf_get_str_fast ("cdda.freedb.host", DEFAULT_SERVER));
- cddb_set_server_port (conn, deadbeef->conf_get_int ("cdda.freedb.port", DEFAULT_PORT));
+ return discs_read;
+}
 
- if (!deadbeef->conf_get_int ("cdda.protocol", DEFAULT_PROTOCOL))
- {
- cddb_http_enable (conn);
- if (deadbeef->conf_get_int ("network.proxy", 0))
- {
- cddb_set_server_port(conn, deadbeef->conf_get_int ("network.proxy.port", 8080));
- cddb_set_server_name(conn, deadbeef->conf_get_str_fast ("network.proxy.address", ""));
+static void
+cleanup_thread_params (struct cddb_thread_params *params)
+{
+ trace("cleanup_thread_params\n");
+ if (params->items) {
+ for (size_t i = 0; params->itemsi; i++) {
+ deadbeef->pl_item_unref(params->itemsi);
 }
+ free(params->items);
 }
- deadbeef->conf_unlock ();
-
- int matches = cddb_query (conn, disc);
- if (matches == -1)
- {
- cddb_disc_destroy (disc);
- cddb_destroy (conn);
- return NULL;
+ if (params->disc) {
+ cddb_disc_destroy(params->disc);
 }
- cddb_read (conn, disc);
- cddb_destroy (conn);
- return disc;
+ free(params);
 }
 
-static DB_playItem_t *
-insert_single_track (CdIo_t* cdio, ddb_playlist_t *plt, DB_playItem_t *after, const char* file, int track_nr, int discid)
+static void
+replace_meta(struct cddb_thread_params *params, DB_playItem_t *it, const char *key, const char *value)
 {
- char tmpfile ? strlen (file) + 20 : 20;
- if (file)
- snprintf (tmp, sizeof (tmp), "%s#%d.cda", file, track_nr);
- else
- snprintf (tmp, sizeof (tmp), "#%d.cda", track_nr);
-
- if (TRACK_FORMAT_AUDIO != cdio_get_track_format (cdio, track_nr))
- {
- trace ("Not an audio track (%d)\n", track_nr);
- return NULL;
+ if (params && params->got_cdtext && deadbeef->pl_find_meta (it, key) && params->prefer_cdtext) {
+ // already got the preferred value from cdtext
+ return;
 }
 
- int sector_count = cdio_get_track_sec_count (cdio, track_nr);
-
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (tmp, plugin.plugin.id);
- deadbeef->pl_add_meta (it, ":FILETYPE", "cdda");
- deadbeef->plt_set_item_duration (plt, it, (float)sector_count / 75.0);
-
- snprintf (tmp, sizeof (tmp), "CD Track %02d", track_nr);
- deadbeef->pl_add_meta (it, "title", tmp);
- snprintf (tmp, sizeof (tmp), "%02d", track_nr);
- deadbeef->pl_add_meta (it, "track", tmp);
-
- deadbeef->pl_set_meta_int (it, ":CDIO_DISCID", discid);
-
- after = deadbeef->plt_insert_item (plt, after, it);
-
- return after;
+ if (value) {
+ deadbeef->pl_replace_meta(it, key, value);
+ }
+ else {
+ deadbeef->pl_delete_meta(it, key);
+ }
 }
 
 static void
-cleanup_thread_params (struct cddb_thread_params *params)
+write_metadata(struct cddb_thread_params *params, DB_playItem_t *it, const cddb_disc_t *disc, const char *num_tracks)
 {
- int i;
- for (i = 0; params->itemsi; i++)
- deadbeef->pl_item_unref (params->itemsi);
- cdio_destroy (params->cdio);
- free (params);
-}
+ const int track_nr = deadbeef->pl_find_meta_int(it, "track", 0);
+ cddb_track_t *track = cddb_disc_get_track(disc, track_nr-1);
+
+ replace_meta(params, it, "artist", cddb_disc_get_artist(disc));
+ replace_meta(params, it, "title", cddb_track_get_title(track));
+ replace_meta(params, it, "album", cddb_disc_get_title(disc));
+ replace_meta(params, it, "genre", cddb_disc_get_genre(disc));
+ const unsigned int year = cddb_disc_get_year(disc);
+ year ? deadbeef->pl_set_meta_int(it, "year", year) : deadbeef->pl_delete_meta(it, "year");
+ replace_meta(params, it, "numtracks", num_tracks);
+
+ // if the title is still empty, fill with autogenerated title
+ if (!deadbeef->pl_find_meta (it, "title")) {
+ char title50;
+ snprintf(title, sizeof (title), "CD Track %02d", track_nr);
+ deadbeef->pl_add_meta(it, "title", title);
+ }
 
+ ddb_event_track_t *ev = (ddb_event_track_t *)deadbeef->event_alloc(DB_EV_TRACKINFOCHANGED);
+ ev->track = it;
+ if (ev->track) {
+ deadbeef->pl_item_ref(ev->track);
+ }
+ deadbeef->event_send((ddb_event_t *)ev, 0, 0);
+}
 
 static void
-cddb_thread (void *items_i)
+cddb_thread (void *params_void)
 {
- struct cddb_thread_params *params = (struct cddb_thread_params*)items_i;
- DB_playItem_t **items = params->items;
-
- trace ("calling resolve_disc\n");
- cddb_disc_t* disc = resolve_disc (params->cdio);
- if (!disc)
- {
- trace ("disc not resolved\n");
- if (params->cdio) {
- cdio_destroy (params->cdio);
- }
- free (params);
+ struct cddb_thread_params *params = (struct cddb_thread_params *)params_void;
+
+ char disc_list(CDDB_CATEGORY_SIZE + CDDB_DISCID_SIZE + 1) * MAX_CDDB_DISCS;
+ const int num_discs = resolve_disc(params->disc, disc_list);
+ if (num_discs <= 0) {
+ trace("disc not resolved\n");
+ cleanup_thread_params(params);
 return;
 }
- trace ("disc resolved\n");
-
- const char *disc_title = cddb_disc_get_title (disc);
- const char *artist = cddb_disc_get_artist (disc);
- trace ("disc_title=%s, disk_artist=%s\n", disc_title, artist);
- cddb_track_t *track;
- int i;
- 
- // FIXME: playlist must be locked before doing that
- int trk = 1;
- for (i = 0, track = cddb_disc_get_track_first (disc); itemsi; trk++, ++i, track = cddb_disc_get_track_next (disc))
- {
- // FIXME: problem will happen here if item(s) were deleted from playlist, and new items were added in their places
- // possible solutions: catch EV_TRACKDELETED and mark item(s) in every thread as NULL
- trace ("track %d, artist=%s, album=%s, title=%s\n", i, artist, disc_title, cddb_track_get_title (track));
-
- deadbeef->pl_delete_all_meta (itemsi);
- deadbeef->pl_add_meta (itemsi, "artist", artist);
- deadbeef->pl_add_meta (itemsi, "album", disc_title);
- deadbeef->pl_add_meta (itemsi, "title", cddb_track_get_title (track));
- char tmp5;
- snprintf (tmp, sizeof (tmp), "%02d", trk);
- deadbeef->pl_add_meta (itemsi, "track", tmp);
- ddb_event_track_t *ev = (ddb_event_track_t *)deadbeef->event_alloc (DB_EV_TRACKINFOCHANGED);
- ev->track = itemsi;
- if (ev->track) {
- deadbeef->pl_item_ref (ev->track);
- }
- deadbeef->event_send ((ddb_event_t *)ev, 0, 0);
- }
- cddb_disc_destroy (disc);
- cleanup_thread_params (params);
+ trace("disc resolved\n");
+
+ char num_tracks4;
+ int track_count = cddb_disc_get_track_count(params->disc);
+ snprintf(num_tracks, sizeof(num_tracks), "%02d", track_count);
+ for (size_t i = 0; params->itemsi; i++) {
+ deadbeef->pl_add_meta(params->itemsi, CDDB_IDS_TAG, disc_list);
+ write_metadata(params, params->itemsi, params->disc, num_tracks);
+ }
+
+ cleanup_thread_params(params);
+
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
 if (plt) {
 deadbeef->plt_modified (plt);
 deadbeef->plt_unref (plt);
 }
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 }
 
 static void
@@ -419,26 +507,21 @@
 #else
 cdtext_t *cdtext = cdio_get_cdtext (cdio, 0);
 #endif
- if (!cdtext)
- {
+ if (!cdtext) {
 trace ("No cdtext\n");
 return;
 }
 const char *artist = NULL;
 const char *album = NULL;
 int field_type;
- for (field_type = 0; field_type < MAX_CDTEXT_FIELDS; field_type++)
- {
+ for (field_type = 0; field_type < MAX_CDTEXT_FIELDS; field_type++) {
 #if CDIO_API_VERSION >= 6
 const char *text = cdtext_get_const (cdtext, field_type, track_nr);
 #else
 const char *text = cdtext_get_const (field_type, cdtext);
 #endif
- const char *field = NULL;
- if (text)
- {
- switch (field_type)
- {
+ if (text) {
+ switch (field_type) {
 #if CDIO_API_VERSION >= 6
 case CDTEXT_FIELD_TITLE: album = text; break;
 case CDTEXT_FIELD_PERFORMER: artist = text; break;
@@ -450,12 +533,42 @@
 }
 }
 
- trace ("artist: %s; album: %s\n", artist, album);
- if (artist) {
- deadbeef->pl_replace_meta (item, "artist", artist);
- }
+ // some versions of cdio does not convert strings to UTF-8 as documented
 if (album) {
- deadbeef->pl_replace_meta (item, "album", album);
+ const char *album_charset = deadbeef->junk_detect_charset (album);
+ char *album_converted = NULL;
+ if (album_charset) {
+ trace ( "cdda: album field using %s charset, converting\n",album_charset);
+ char *album_converted = malloc (strlen(album) * 4);
+ if (album_converted) {
+ deadbeef->junk_iconv (album, strlen(album), album_converted, strlen(album)*4, album_charset, "UTF-8");
+ album = album_converted;
+ }
+ }
+ replace_meta(NULL, item, "album", album);
+ if (album_converted) {
+ free (album_converted);
+ album = album_converted = NULL;
+ }
+ }
+
+ if (artist) {
+ const char *artist_charset = deadbeef->junk_detect_charset (artist);
+ char *artist_converted = NULL;
+ if (artist_charset != NULL) {
+ trace ( "cdda: artist field using %s charset, converting\n",artist_charset);
+ char *artist_converted = malloc (strlen(artist) * 4);
+ if (artist_converted) {
+ deadbeef->junk_iconv (artist, strlen(artist), artist_converted, strlen(artist)*4, artist_charset, "UTF-8");
+ artist = artist_converted;
+ }
+ }
+ replace_meta(NULL, item, "artist", artist);
+
+ if (artist_charset) {
+ free (artist_converted);
+ artist = artist_converted = NULL;
+ }
 }
 
 #if CDIO_API_VERSION >= 6
@@ -463,21 +576,22 @@
 #else
 cdtext = cdio_get_cdtext (cdio, track_nr);
 #endif
- if (!cdtext)
+ if (!cdtext) {
 return;
+ }
 
- for (field_type = 0; field_type < MAX_CDTEXT_FIELDS; field_type++)
- {
+ for (field_type = 0; field_type < MAX_CDTEXT_FIELDS; field_type++) {
 #if CDIO_API_VERSION >= 6
 const char *text = cdtext_get_const (cdtext, field_type, track_nr);
 #else
 const char *text = cdtext_get_const (field_type, cdtext);
 #endif
- const char *field = NULL;
- if (!text)
+ if (!text) {
 continue;
- switch (field_type)
- {
+ }
+
+ const char *field = NULL;
+ switch (field_type) {
 #if CDIO_API_VERSION >= 6
 case CDTEXT_FIELD_TITLE: field = "title"; break;
 case CDTEXT_FIELD_PERFORMER: field = "artist"; break;
@@ -495,154 +609,401 @@
 #endif
 default: field = NULL;
 }
- if (field && text)
- {
- trace ("%s: %s\n", field, text);
- deadbeef->pl_replace_meta (item, field, text);
+ if (field) {
+ // convert to UTF-8 if not UTF-8 already
+ const char *text_charset = deadbeef->junk_detect_charset (text);
+ char *text_converted = NULL;
+ if (text_charset != NULL) {
+ trace ("cdda: text field using %s charset, converting\n",text_charset);
+ text_converted = malloc (strlen(text) * 4);
+ if (text_converted) {
+ deadbeef->junk_iconv (field, strlen(text), text_converted, strlen(text)*4, text_charset, "UTF-8");
+ text = text_converted;
+ }
+ }
+ trace("%s: %s\n", field, text);
+ replace_meta(NULL, item, field, text);
+ if (text_converted && text_charset != NULL) {
+ free (text_converted);
+ text = text_converted = NULL;
+ }
 }
 }
 }
 
 static int
-read_disc_cdtext (struct cddb_thread_params *params)
+read_disc_cdtext (CdIo_t *cdio, DB_playItem_t **items, const track_t tracks)
 {
- DB_playItem_t **items = params->items;
 #if CDIO_API_VERSION >= 6
- cdtext_t *cdtext = cdio_get_cdtext (params->cdio);
+ cdtext_t *cdtext = cdio_get_cdtext(cdio);
 #else
- cdtext_t *cdtext = cdio_get_cdtext (params->cdio, 0);
+ cdtext_t *cdtext = cdio_get_cdtext(cdio, 0);
 #endif
- if (!cdtext)
+ if (!cdtext) {
 return 0;
+ }
 
- track_t first_track = cdio_get_first_track_num (params->cdio);
- track_t tracks = cdio_get_num_tracks (params->cdio);
- track_t i;
- for (i = 0; i < tracks; i++)
- read_track_cdtext (params->cdio, i + first_track, params->itemsi);
+ for (track_t i = 0; i < tracks; i++) {
+ read_track_cdtext(cdio, deadbeef->pl_find_meta_int(itemsi, "track", 0), itemsi);
+ }
 
 return 1;
 }
 
 static DB_playItem_t *
-cda_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
- trace ("CDA insert: %s\n", fname);
- CdIo_t* cdio = NULL;
- int track_nr;
- DB_playItem_t *res;
+insert_track (ddb_playlist_t *plt, DB_playItem_t *after, const char* path, const track_t track_nr, CdIo_t *cdio, const int discid)
+{
+ char fnamestrlen(path) + 10;
+ sprintf(fname, "%s#%d.cda", path, track_nr);
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init(fname, plugin.plugin.id);
+ if (it) {
+ deadbeef->pl_add_meta(it, ":FILETYPE", "cdda");
+
+ const float sector_count = cdio_get_track_sec_count(cdio, track_nr);
+ deadbeef->plt_set_item_duration(plt, it, sector_count / 75);
 
- const char* shortname = strrchr (fname, '/');
- if (shortname) {
- shortname++;
+ char track4;
+ snprintf(track, sizeof (track), "%02d", track_nr);
+ deadbeef->pl_add_meta(it, "track", track);
+
+ char discid_string10;
+ snprintf(discid_string, sizeof (discid_string), "%08x", discid);
+ deadbeef->pl_add_meta(it, CDDB_DISCID_TAG, discid_string);
+
+ it = deadbeef->plt_insert_item(plt, after, it);
 }
- else {
- shortname = fname;
+
+ return it;
+}
+
+static DB_playItem_t *
+insert_disc (ddb_playlist_t *plt, DB_playItem_t *after, const char *path, const track_t single_track, CdIo_t* cdio)
+{
+ struct cddb_thread_params *p = calloc(1, sizeof(struct cddb_thread_params));
+ if (!p) {
+ return NULL;
 }
- const char *ext = strrchr (shortname, '.') + 1;
- int is_image = ext && (0 == strcmp (ext, "nrg"));
- if (is_image && !deadbeef->conf_get_int ("cdda.enable_nrg", 0)) {
+
+ p->disc = create_disc(cdio);
+ if (!p->disc) {
+ cleanup_thread_params(p);
 return NULL;
 }
 
- if (0 == strcmp (ext, "cda")) {
- cdio = cdio_open (NULL, DRIVER_UNKNOWN);
+ const track_t tracks = single_track ? 1 : cddb_disc_get_track_count(p->disc);
+ p->items = calloc(tracks+1, sizeof(*p->items));
+ if (!p->items) {
+ cleanup_thread_params(p);
+ return NULL;
 }
- else if (is_image) {
- cdio = cdio_open (fname, DRIVER_NRG);
+
+ const unsigned long discid = cddb_disc_get_discid(p->disc);
+ DB_playItem_t *inserted = NULL;
+ const track_t first_track = single_track ? single_track : cdio_get_first_track_num(cdio);
+ track_t item_count = 0;
+ for (track_t i = 0; i < tracks; i++) {
+ if (cdio_get_track_format(cdio, first_track+i) == TRACK_FORMAT_AUDIO) {
+ trace("inserting track %d from %s\n", first_track+i, path);
+ inserted = insert_track(plt, after, path, first_track+i, cdio, discid);
+ p->itemsitem_count++ = inserted;
+ after = inserted;
+ }
 }
 
- if (!cdio) {
- trace ("not an audio disc/image, or file not found (%s)\n", fname);
- return NULL;
+ intptr_t tid = 0;
+ if (item_count) {
+ const int got_cdtext = read_disc_cdtext(cdio, p->items, tracks);
+ const int prefer_cdtext = deadbeef->conf_get_int("cdda.prefer_cdtext", DEFAULT_PREFER_CDTEXT);
+ const int enable_cddb = deadbeef->conf_get_int("cdda.freedb.enable", DEFAULT_USE_CDDB);
+ p->got_cdtext = got_cdtext;
+ p->prefer_cdtext = prefer_cdtext;
+ if (enable_cddb) {
+ tid = deadbeef->thread_start(cddb_thread, p);
+ if (tid) {
+ deadbeef->thread_detach(tid);
+ }
+ }
+ else {
+ // if cddb is off, fill empty titles with autogenerated ones
+ for (int i = 0; i < item_count; i++) {
+ DB_playItem_t *it = p->itemsi;
+ if (!deadbeef->pl_find_meta (it, "title")) {
+ const int track_nr = deadbeef->pl_find_meta_int(it, "track", 0);
+ char title50;
+ snprintf(title, sizeof (title), "CD Track %02d", track_nr);
+ deadbeef->pl_add_meta(it, "title", title);
+ }
+ }
+ }
 }
 
+ if (!tid) {
+ cleanup_thread_params(p);
+ }
 
- // calculate discid
- track_t first_track = cdio_get_first_track_num (cdio);
- if (first_track == 0xff) {
- trace ("cdda: no medium found\n");
- cdio_destroy (cdio);
- return NULL;
+ return inserted;
+}
+
+static DB_playItem_t *
+cda_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *path)
+{
+ trace("CDA insert: %s\n", path);
+ cdio_close_tray(NULL, NULL);
+
+ /* Deal with any NRG files and get them out of the way */
+ const char *ext = strrchr(path, '.');
+ if (ext && !strcasecmp(ext, ".nrg")) {
+ if (!deadbeef->conf_get_int("cdda.enable_nrg", 0)) {
+ trace("cda: NRG found but disabled in preferences\n");
+ return NULL;
+ }
+ CdIo_t* cdio = cdio_open(path, DRIVER_NRG);
+ if (!cdio) {
+ trace("not an NRG image, or file not found (%s)\n", path);
+ return NULL;
+ }
+ DB_playItem_t *inserted = insert_disc(plt, after, path, 0, cdio);
+ cdio_destroy(cdio);
+ return inserted;
 }
- track_t tracks = cdio_get_num_tracks (cdio);
- track_t i;
- cddb_track_t *track;
 
- cddb_disc_t *disc = cddb_disc_new();
+ /* Get a list of all devices containing CD audio */
+ driver_id_t driver_id;
+ char **device_list = cdio_get_devices_with_cap_ret(NULL, CDIO_FS_AUDIO, false, &driver_id);
+ if (!device_list) {
+ trace("cda: no audio drives found\n");
+ return NULL;
+ }
 
- cddb_disc_set_length (disc, cdio_get_track_lba (cdio, CDIO_CDROM_LEADOUT_TRACK) / CDIO_CD_FRAMES_PER_SEC);
-
- for (i = 0; i < tracks; i++)
- {
- lsn_t offset = cdio_get_track_lba (cdio, i+first_track);
- track = cddb_track_new();
- cddb_track_set_frame_offset (track, offset);
- cddb_disc_add_track (disc, track);
- }
- cddb_disc_calc_discid (disc);
- int discid = cddb_disc_get_discid (disc);
-
- if (0 == strcasecmp (shortname, "all.cda") || is_image)
- {
- track_t i;
- res = after;
- struct cddb_thread_params *p = malloc (sizeof (struct cddb_thread_params));
- memset (p, 0, sizeof (struct cddb_thread_params));
- p->cdio = cdio;
-
- int enable_cddb = deadbeef->conf_get_int ("cdda.freedb.enable", DEFAULT_USE_CDDB);
-
- for (i = 0; i < tracks; i++)
- {
- trace ("inserting track %d\n", i);
- res = insert_single_track (cdio, plt, res, is_image ? fname : NULL, i+first_track, discid);
- if (res) {
- p->itemsi = res;
+ /* Match the device name for the requested insert (invalid devices may crash cdio) */
+ const char *sep = strrchr(path, '/');
+ char *drive_device = NULL;
+ if (sep) {
+ char *real_path = realpath(path, NULL);
+ if (!real_path) {
+ const size_t device_length = sep - path;
+ char device_pathdevice_length+1;
+ strncpy(device_path, path, device_length);
+ device_pathdevice_length = '\0';
+ real_path = realpath(device_path, NULL);
+ }
+ if (real_path) {
+ for (size_t i = 0; device_listi && !drive_device; i++) {
+ char *real_device = realpath(device_listi, NULL);
+ if (real_device) {
+ if (!strcmp(real_device, real_path)) {
+ drive_device = device_listi;
+ }
+ free(real_device);
+ }
 }
+ free(real_path);
+ }
+ }
+ else {
+ drive_device = device_list0;
+ }
+
+ /* Open the device and insert the requested track(s) */
+ DB_playItem_t *inserted = NULL;
+ if (drive_device) {
+ trace("cda: try to open device %s\n", drive_device);
+ CdIo_t* cdio = cdio_open(drive_device, driver_id);
+ if (cdio) {
+ char *track_end;
+ const unsigned long track_nr = strtoul(sep ? sep + 1 : path, &track_end, 10);
+ const track_t single_track = strcmp(track_end, ".cda") || track_nr > CDIO_CD_MAX_TRACKS ? 0 : track_nr;
+ inserted = insert_disc(plt, after, drive_device, single_track, cdio);
+ cdio_destroy(cdio);
 }
+ }
+ cdio_free_device_list(device_list);
+ return inserted;
+}
+
+static int dialog_combo_index;
+
+static void
+set_param (const char *key, const char *value)
+{
+ dialog_combo_index = atoi(value);
+ if (dialog_combo_index < 0) {
+ dialog_combo_index = 0;
+ }
+ return;
+}
+
+static void
+get_param (const char *key, char *value, int len, const char *def)
+{
+ strcpy(value, "0");
+ return;
+}
+
+#define DRIVE_COMBO_SCRIPT \
+"property box vbox1 hmg expand fill border=10 height=250;"\
+"property box hbox1 hmg height=-1;"\
+"property \"CD drive to load\" select%u cdda.drive_device 0"
+
+static int
+cda_action_add_cd (DB_plugin_action_t *act, ddb_action_context_t ctx)
+{
+ /* Get all devices containg CD audio media */
+ cdio_close_tray(NULL, NULL);
+ char **device_list = cdio_get_devices_with_cap(NULL, CDIO_FS_AUDIO, false);
+ if (!device_list) {
+ return 0;
+ }
 
- int got_cdtext = read_disc_cdtext (p);
- int prefer_cdtext = deadbeef->conf_get_int ("cdda.prefer_cdtext", DEFAULT_PREFER_CDTEXT);
+ char *drive_device = NULL;
+ if (device_list0 && device_list1) {
+ /* Multiple devices, ask the user to pick one */
+ size_t device_count;
+ size_t device_combo_length = sizeof(DRIVE_COMBO_SCRIPT);
+ for (device_count = 0; device_listdevice_count; device_count++) {
+ device_combo_length += strlen(device_listdevice_count) + 1;
+ }
 
- if ((!got_cdtext || !prefer_cdtext) && enable_cddb)
- {
- trace ("cdda: querying freedb...\n");
- intptr_t tid = deadbeef->thread_start (cddb_thread, p); //will destroy cdio
- deadbeef->thread_detach (tid);
+ char *layout = malloc(device_combo_length);
+ if (layout) {
+ snprintf(layout, device_combo_length, DRIVE_COMBO_SCRIPT, (unsigned)device_count);
+ for (char **device = device_list; *device; device++) {
+ strcat(layout, " ");
+ strcat(layout, *device);
+ }
+ strcat(layout, ";");
+
+ ddb_dialog_t conf = {
+ .title = "Audio CD Drive",
+ .layout = layout,
+ .set_param = set_param,
+ .get_param = get_param,
+ .parent = NULL
+ };
+
+ struct DB_plugin_s **plugin_list;
+ for (plugin_list = deadbeef->plug_get_list(); *plugin_list && (*plugin_list)->type != DB_PLUGIN_GUI; plugin_list++);
+ if (*plugin_list) {
+ DB_gui_t *gui_plugin = (DB_gui_t *)*plugin_list;
+ if (gui_plugin->run_dialog(&conf, 1<<ddb_button_ok|1<<ddb_button_cancel, NULL, NULL) == ddb_button_ok) {
+ drive_device = device_listdialog_combo_index;
+ }
+ }
+ free(layout);
 }
- else
- cleanup_thread_params (p);
 }
- else
- {
- track_nr = atoi (shortname);
- res = insert_single_track (cdio, plt, after, NULL, track_nr, discid);
- if (res) {
- read_track_cdtext (cdio, track_nr, res);
- deadbeef->pl_item_unref (res);
+ else if (device_list0) {
+ drive_device = device_list0;
+ }
+
+ /* If the user picked a device or there is only one, then add all the tracks */
+ if (drive_device) {
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ char pathstrlen(drive_device) + sizeof(CDDA_ALL_TRACKS) + 1;
+ sprintf(path, "%s/%s", drive_device, CDDA_ALL_TRACKS);
+ deadbeef->plt_add_files_begin(plt, 0);
+ deadbeef->plt_add_file2(0, plt, path, NULL, NULL);
+ deadbeef->plt_add_files_end(plt, 0);
+ deadbeef->plt_modified(plt);
+ deadbeef->plt_unref(plt);
 }
- cdio_destroy (cdio);
+ deadbeef->sendmessage(DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 }
- cddb_disc_destroy (disc);
- return res;
+
+ cdio_free_device_list(device_list);
+
+ return 0;
+}
+
+static void
+set_disc_id(const char *disc_id, cddb_disc_t *disc)
+{
+ char categoryCDDB_CATEGORY_SIZE;
+ unsigned long discid;
+ sscanf(disc_id, ",%^//%8lx", category, &discid);
+ cddb_disc_set_category_str(disc, category);
+ cddb_disc_set_discid(disc, discid);
 }
 
 static int
-cda_action_add_cd (DB_plugin_action_t *act, int ctx)
+load_cddb_data (ddb_playlist_t *plt, cddb_disc_t *disc, const size_t disc_num)
 {
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- deadbeef->plt_add_files_begin (plt, 0);
- deadbeef->plt_add_file2 (0, plt, "all.cda", NULL, NULL);
- deadbeef->plt_add_files_end (plt, 0);
- deadbeef->plt_modified (plt);
- deadbeef->plt_unref (plt);
+ /* Find the first selected playitem */
+ DB_playItem_t *it = deadbeef->plt_get_first(plt, PL_MAIN);
+ while (it && !deadbeef->pl_is_selected(it)) {
+ deadbeef->pl_item_unref(it);
+ it = deadbeef->pl_get_next(it, PL_MAIN);
+ }
+
+ /* Find the category/discid for the chosen disc */
+ deadbeef->pl_lock();
+ const char *disc_list = deadbeef->pl_find_meta(it, CDDB_IDS_TAG);
+ char *p = (char *)disc_list;
+ size_t i = 0;
+ while (p && i++ < disc_num) {
+ p = strchr(++p, ',');
+ }
+ if (p) {
+ set_disc_id(p, disc);
+ }
+ deadbeef->pl_unlock();
+ trace("cda: load metadata from discid %s/%u\n", cddb_disc_get_category_str(disc), cddb_disc_get_discid(disc));
+
+ /* Read the cddb data for this disc */
+ cddb_conn_t *conn = new_cddb_connection();
+ if (!conn) {
+ return -1;
+ }
+ const int read = cddb_read(conn, disc);
+ cddb_destroy(conn);
+ if (!read) {
+ trace("cda: discid read failed\n");
+ return -1;
 }
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+
+ /* Apply the data to each selected playitem */
+ int track_count = cddb_disc_get_track_count(disc);
+ char num_tracks4;
+ snprintf(num_tracks, sizeof(num_tracks), "%02d", track_count);
+ do {
+ if (deadbeef->pl_is_selected(it)) {
+ // FIXME: Reloading from cddb can't combine cdtext with cddb data
+ write_metadata(NULL, it, disc, num_tracks);
+ }
+ deadbeef->pl_item_unref(it);
+ it = deadbeef->pl_get_next(it, PL_MAIN);
+ } while (it);
+
+ deadbeef->plt_modified(plt);
+ deadbeef->sendmessage(DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+
 return 0;
 }
 
-static DB_plugin_action_t add_cd_action = {
+static int
+action_disc_n (DB_plugin_action_t *act, ddb_action_context_t ctx)
+{
+ const int disc_num = atoi(act->name+11);
+ int res = -1;
+ ddb_playlist_t *plt = deadbeef->plt_get_curr();
+ if (plt) {
+ cddb_disc_t *disc = cddb_disc_new();
+ if (disc) {
+ res = load_cddb_data(plt, disc, disc_num);
+ cddb_disc_destroy(disc);
+ }
+ deadbeef->plt_unref(plt);
+ }
+
+ return res;
+}
+
+static DB_plugin_action_t disc_actionsMAX_CDDB_DISCS;
+static char disc_action_titlesMAX_CDDB_DISCSMAX_CDDB_MENU;
+
+static DB_plugin_action_t add_cd_action =
+{
 .name = "cd_add",
 .title = "File/Add Audio CD",
 .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
@@ -651,33 +1012,130 @@
 };
 
 static DB_plugin_action_t *
-cda_get_actions (DB_playItem_t *unused)
+cda_get_actions (DB_playItem_t *it)
 {
- return &add_cd_action;
+ /* Main menu, File->Add Audio CD */
+ if (!it) {
+ return &add_cd_action;
+ }
+
+ /* Quick sanity check that the current playitem is a CD track with a CDDB IDs tag */
+ char disc_list(CDDB_CATEGORY_SIZE + CDDB_DISCID_SIZE) * MAX_CDDB_DISCS + 1 = "";
+ deadbeef->pl_get_meta(it, CDDB_IDS_TAG, disc_list, sizeof(disc_list));
+ if (!*disc_list) {
+ return NULL;
+ }
+
+ /* Make sure all selected playitems are from the same CD disc */
+ ddb_playlist_t *plt = deadbeef->plt_get_curr();
+ if (!plt) {
+ return NULL;
+ }
+ DB_playItem_t *test_it = deadbeef->plt_get_first(plt, PL_MAIN);
+ while (test_it) {
+ if (deadbeef->pl_is_selected(test_it)) {
+ deadbeef->pl_lock();
+ const char *it_disc_list = deadbeef->pl_find_meta(test_it, CDDB_IDS_TAG);
+ if (!it_disc_list || strcmp(disc_list, it_disc_list)) {
+ deadbeef->pl_item_unref(test_it);
+ deadbeef->plt_unref(plt);
+ deadbeef->pl_unlock();
+ return NULL;
+ }
+ deadbeef->pl_unlock();
+ }
+
+ deadbeef->pl_item_unref(test_it);
+ test_it = deadbeef->pl_get_next(test_it, PL_MAIN);
+ }
+ deadbeef->plt_unref(plt);
+
+ /* Make sure all the static menu items are initialised */
+ if (!disc_actions0.name) {
+ disc_actions0.name = "disc_action0";
+ disc_actions1.name = "disc_action1";
+ disc_actions2.name = "disc_action2";
+ disc_actions3.name = "disc_action3";
+ disc_actions4.name = "disc_action4";
+ disc_actions5.name = "disc_action5";
+ disc_actions6.name = "disc_action6";
+ disc_actions7.name = "disc_action7";
+ disc_actions8.name = "disc_action8";
+ disc_actions9.name = "disc_action9";
+ for (size_t i = 0; i < MAX_CDDB_DISCS; i++) {
+ disc_actionsi.title = disc_action_titlesi;
+ disc_actionsi.callback2 = action_disc_n;
+ }
+ }
+
+ /* Only query against the cache, everything has been read before and we need to be fast */
+ cddb_conn_t *conn = new_cddb_connection();
+ if (!conn) {
+ return NULL;
+ }
+ cddb_cache_only(conn);
+ cddb_disc_t *disc = cddb_disc_new();
+ if (!disc) {
+ cddb_destroy(conn);
+ return NULL;
+ }
+
+ /* Build a menu item for each possible cddb disc for this CD */
+ size_t i = 0;
+ char *p = disc_list;
+ do {
+ set_disc_id(p, disc);
+ if (cddb_read(conn, disc)) {
+ const char *title = cddb_disc_get_title(disc);
+ const unsigned int year_int = cddb_disc_get_year(disc);
+ char year8 = "";
+ if (year_int && year_int <= 9999) {
+ sprintf(year, "%u ", year_int);
+ }
+ snprintf(disc_action_titlesi, MAX_CDDB_MENU, "Load CDDB metadata/%s%s", year, title);
+ disc_actionsi.flags = DB_ACTION_SINGLE_TRACK | DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_ADD_MENU;
+ disc_actionsi.next = &disc_actionsi+1;
+ i++;
+ }
+ p = strchr(p+1, ',');
+ } while (p);
+ disc_actionsi-1.next = NULL;
+
+ cddb_disc_destroy(disc);
+ cddb_destroy(conn);
+
+ return disc_actions;
 }
 
-static const char *exts = { "cda", "nrg", NULL };
 static const char settings_dlg =
- "property \"Use CDDB/FreeDB\" checkbox cdda.freedb.enable 1;\n"
+ "property \"Use CDDB/GnuDb\" checkbox cdda.freedb.enable 1;\n"
+ "property box hbox2 height=-1;"
+ "property box hbox0 border=5 height=-1;"
+ "property box vbox4 expand fill height=-1;"
 "property \"Prefer CD-Text over CDDB\" checkbox cdda.prefer_cdtext 1;\n"
- "property \"CDDB url (e.g. 'freedb.org')\" entry cdda.freedb.host freedb.org;\n"
- "property \"CDDB port number (e.g. '888')\" entry cdda.freedb.port 888;\n"
- "property \"Prefer CDDB protocol over HTTP\" checkbox cdda.protocol 1;\n"
+ "property \"CDDB url (e.g. 'gnudb.gnudb.org')\" entry cdda.freedb.host gnudb.gnudb.org;\n"
+ "property box hbox1 height=-1;"
+ "property \"CDDB port number (e.g. '8880')\" entry cdda.freedb.port 8880;\n"
+ "property \"Use CDDB protocol\" checkbox cdda.protocol 1;\n"
 "property \"Enable NRG image support\" checkbox cdda.enable_nrg 0;"
+ "property box hbox1 height=-1;"
+ "property \"Drive speed for normal playback\" select6 cdda.drive_speed 2 1x 2x 4x 8x 16x Max;"
+#if USE_PARANOIA
+ "property \"Use cdparanoia error correction when ripping\" checkbox cdda.paranoia 0;"
+#endif
 ;
 
 // define plugin interface
 static DB_decoder_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_DECODER,
 .plugin.id = "cda",
 .plugin.name = "Audio CD player",
 .plugin.descr = "Audio CD plugin using libcdio and libcddb",
- .plugin.copyright = 
- "Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ .plugin.copyright =
+ "Copyright (C) 2009-2013 Oleksiy 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"
@@ -704,7 +1162,7 @@
 .seek = cda_seek,
 .seek_sample = cda_seek_sample,
 .insert = cda_insert,
- .exts = exts,
+ .exts = (char const *){"cda", "nrg", NULL}
 };
 
 DB_plugin_t *

deadbeef-0.6.2.tar.bz2/plugins/converter/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/converter/COPYING Changed

@@ -1,17 +1,21 @@
 Converter plugin for DeaDBeeF Player
 
-Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
 
-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 software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-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.
+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:
 
-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.
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.

deadbeef-0.6.2.tar.bz2/plugins/converter/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/converter/Makefile.am Changed

@@ -1,3 +1,25 @@
+convdata = \
+	convpresets/AAC_VBR_192Kbps_(Nero_FAAC).txt\
+	convpresets/AAC_VBR_256Kbps_(Nero_FAAC).txt\
+	convpresets/AAC_VBR_320Kbps_(Nero_FAAC).txt\
+	convpresets/FLAC_(compression_level_5).txt\
+	convpresets/MP3_CBR_320_Kbps_(Lame).txt\
+	convpresets/MP3_VBR_192Kbps_(Lame).txt\
+	convpresets/MS_RIFF_WAV.txt\
+	convpresets/MusePack.txt\
+	convpresets/Ogg_FLAC.txt\
+	convpresets/Ogg_VBR_192Kbps.txt\
+	convpresets/Ogg_VBR_256Kbps.txt\
+	convpresets/Ogg_VBR_320Kbps.txt\
+	convpresets/Opus.txt\
+	convpresets/TTA.txt\
+	convpresets/WavPack.txt\
+	convpresets/ALAC.txt\
+	convpresets/File_Copy.txt\
+	convpresets/File_Move.txt
+
+EXTRA_DIST = $(convdata) converter.glade
+
 if HAVE_CONVERTER
 
 if HAVE_GTK2
@@ -13,47 +35,29 @@
 endif
 
 convdatadir = $(libdir)/deadbeef/convpresets
-convdata_DATA = \
-	presets/AAC_(Nero_FAAC).txt\
-	presets/FLAC_(compression_level_5).txt\
-	presets/MP3_CBR_320_Kbps_(Lame).txt\
-	presets/MP3_VBR_192Kbps_(Lame).txt\
-	presets/MS_RIFF_WAV.txt\
-	presets/MusePack.txt\
-	presets/Ogg_FLAC.txt\
-	presets/Ogg_Vorbis_(-q_5).txt\
-	presets/Opus.txt\
-	presets/TTA.txt\
-	presets/WavPack.txt\
-	presets/ALAC.txt
-
-EXTRA_DIST = $(convdata_DATA) converter.glade
-
-AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
+convdata_DATA = $(convdata)
 
+converter_la_CFLAGS =  $(CFLAGS) -I@top_srcdir@/external/mp4p/include -I@top_srcdir@/include -std=c99 -fPIC -DUSE_TAGGING=1
 converter_la_SOURCES = converter.c converter.h
 converter_la_LDFLAGS = -module -avoid-version
+converter_la_LIBADD = $(LDADD) ../../shared/libmp4tagutil.la ../../external/libmp4p.la
 
 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 -avoid-version
-if STATICLINK
-GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
-
-converter_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
-
-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_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
-converter_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
-endif
+converter_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) -I@top_srcdir@/include
 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 -avoid-version
 converter_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
-converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
+converter_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) -I@top_srcdir@/include
 endif
 
+sdkdir = $(pkgincludedir)
+sdk_HEADERS = converter.h
+
+
 endif

deadbeef-0.6.2.tar.bz2/plugins/converter/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/converter/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/converter/callbacks.h -> deadbeef-1.9.6.tar.bz2/plugins/converter/callbacks.h Changed

deadbeef-0.6.2.tar.bz2/plugins/converter/converter.c -> deadbeef-1.9.6.tar.bz2/plugins/converter/converter.c Changed

@@ -1,31 +1,37 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ Converter for DeaDBeeF Player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifdef HAVE_CONFIG_H
 # include "../../config.h"
 #endif
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-#if HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
 #endif
 #include <stdlib.h>
+#include <limits.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -33,9 +39,13 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <inttypes.h>
+#include <errno.h>
+#include <deadbeef/deadbeef.h>
 #include "converter.h"
-#include "../../deadbeef.h"
-#include "../../strdupa.h"
+#include <deadbeef/strdupa.h>
+#include "../../shared/mp4tagutil.h"
+
+static ddb_converter_t plugin;
 
 #ifndef __linux__
 #define O_LARGEFILE 0
@@ -43,11 +53,15 @@
 
 #define min(x,y) ((x)<(y)?(x):(y))
 
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
+#define trace(...) { deadbeef->log_detailed (&plugin.misc.plugin, 0, __VA_ARGS__); }
+#define trace_err(...) { deadbeef->log_detailed (&plugin.misc.plugin, DDB_LOG_LAYER_DEFAULT, __VA_ARGS__); }
+
+#ifndef _O_BINARY
+#define _O_BINARY 0
+#endif
 
 static ddb_converter_t plugin;
-static DB_functions_t *deadbeef;
+DB_functions_t *deadbeef;
 
 static ddb_encoder_preset_t *encoder_presets;
 static ddb_dsp_preset_t *dsp_presets;
@@ -136,6 +150,9 @@
 else if (!strcmp (str, "tag_oggvorbis")) {
 p->tag_oggvorbis = atoi (item);
 }
+ else if (!strcmp (str, "tag_mp4")) {
+ p->tag_mp4 = atoi (item);
+ }
 }
 
 if (!p->title) {
@@ -164,10 +181,10 @@
 int
 encoder_preset_save (ddb_encoder_preset_t *p, int overwrite) {
 if (!p->title || !p->title0) {
- fprintf (stderr, "encoder_preset_save: empty title\n");
+ trace ("encoder_preset_save: empty title\n");
 return -1;
 }
- const char *confdir = deadbeef->get_config_dir ();
+ const char *confdir = deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG);
 char pathPATH_MAX;
 if (snprintf (path, sizeof (path), "%s/presets", confdir) < 0) {
 return -1;
@@ -185,7 +202,7 @@
 FILE *fp = fopen (path, "rb");
 if (fp) {
 fclose (fp);
- return -2; 
+ return -2;
 }
 }
 
@@ -204,6 +221,7 @@
 fprintf (fp, "tag_apev2 %d\n", p->tag_apev2);
 fprintf (fp, "tag_flac %d\n", p->tag_flac);
 fprintf (fp, "tag_oggvorbis %d\n", p->tag_oggvorbis);
+ fprintf (fp, "tag_mp4 %d\n", p->tag_mp4);
 
 fclose (fp);
 return 0;
@@ -220,6 +238,7 @@
 to->tag_apev2 = from->tag_apev2;
 to->tag_flac = from->tag_flac;
 to->tag_oggvorbis = from->tag_oggvorbis;
+ to->tag_mp4 = from->tag_mp4;
 to->tag_mp3xing = from->tag_mp3xing;
 to->id3v2_version = from->id3v2_version;
 }
@@ -368,10 +387,10 @@
 int
 dsp_preset_save (ddb_dsp_preset_t *p, int overwrite) {
 if (!p->title || !p->title0) {
- fprintf (stderr, "dsp_preset_save: empty title\n");
+ trace ("dsp_preset_save: empty title\n");
 return -1;
 }
- const char *confdir = deadbeef->get_config_dir ();
+ const char *confdir = deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG);
 char pathPATH_MAX;
 if (snprintf (path, sizeof (path), "%s/presets", confdir) < 0) {
 return -1;
@@ -389,7 +408,7 @@
 FILE *fp = fopen (path, "rb");
 if (fp) {
 fclose (fp);
- return -2; 
+ return -2;
 }
 }
 
@@ -409,68 +428,21 @@
 return 0;
 }
 
-static int
-copy_file (const char *in, const char *out) {
- int BUFFER_SIZE = 1000;
- FILE *fin = fopen (in, "rb");
- if (!fin) {
- fprintf (stderr, "converter: failed to open file %s for reading\n", in);
- return -1;
- }
- FILE *fout = fopen (out, "w+b");
- if (!fout) {
- fclose (fin);
- fprintf (stderr, "converter: failed to open file %s for writing\n", out);
- return -1;
- }
- char *buf = malloc (BUFFER_SIZE);
- if (!buf) {
- fprintf (stderr, "converter: failed to alloc %d bytes\n", BUFFER_SIZE);
- fclose (fin);
- fclose (fout);
- return -1;
- }
-
- fseek (fin, 0, SEEK_END);
- size_t sz = ftell (fin);
- rewind (fin);
-
- while (sz > 0) {
- int rs = min (sz, BUFFER_SIZE);
- if (fread (buf, rs, 1, fin) != 1) {
- fprintf (stderr, "converter: failed to read file %s\n", in);
- break;
- }
- if (fwrite (buf, rs, 1, fout) != 1) {
- fprintf (stderr, "converter: failed to write file %s\n", out);
- break;
- }
- sz -= rs;
- }
- free (buf);
- fclose (fin);
- fclose (fout);
- if (sz > 0) {
- unlink (out);
- }
- return 0;
-}
-
 int
 load_encoder_presets (void) {
 // check if we need to install presets
 char ppathPATH_MAX;
 char epathPATH_MAX;
- snprintf (ppath, sizeof (ppath), "%s/presets", deadbeef->get_config_dir ());
+ snprintf (ppath, sizeof (ppath), "%s/presets", deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG));
 snprintf (epath, sizeof (epath), "%s/encoders", ppath);
 
 char pathPATH_MAX;
- if (snprintf (path, sizeof (path), "%s/presets/encoders", deadbeef->get_config_dir ()) < 0) {
+ if (snprintf (path, sizeof (path), "%s/presets/encoders", deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG)) < 0) {
 return -1;
 }
 
 char syspathPATH_MAX;
- if (snprintf (syspath, sizeof (syspath), "%s/convpresets", deadbeef->get_plugin_dir ()) < 0) {
+ if (snprintf (syspath, sizeof (syspath), "%s/convpresets", deadbeef->get_system_dir (DDB_SYS_DIR_PLUGIN_RESOURCES)) < 0) {
 return -1;
 }
 
@@ -506,6 +478,8 @@
 if (!p) {
 // NOTE: we don't delete duplicate presets in $HOME
 // for compat with <=0.6.1
+ encoder_preset_free (p);
+ p = NULL;
 continue;
 }
 }
@@ -518,9 +492,12 @@
 }
 }
 }
+ }
+ for (i = 0; i < n; i++) {
 free (namelisti);
 }
 free (namelist);
+ namelist = NULL;
 }
 return 0;
 }
@@ -549,7 +526,7 @@
 load_dsp_presets (void) {
 ddb_dsp_preset_t *tail = NULL;
 char pathPATH_MAX;
- if (snprintf (path, sizeof (path), "%s/presets/dsp", deadbeef->get_config_dir ()) < 0) {
+ if (snprintf (path, sizeof (path), "%s/presets/dsp", deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG)) < 0) {
 return -1;
 }
 struct dirent **namelist = NULL;
@@ -645,20 +622,12 @@
 to->next = from->next;
 }
 
-
 static void
-get_output_field (DB_playItem_t *it, const char *field, char *out, int sz)
-{
- int idx = deadbeef->pl_get_idx_of (it);
- char tempPATH_MAX;
- char fmtstrlen(field)+3;
- snprintf (fmt, sizeof (fmt), "%%/%s", field);
- deadbeef->pl_format_title (it, idx, temp, sizeof (temp), -1, fmt);
-
+escape_filepath (const char *path, char *out, int sz) {
 // escape special chars
 char invalid = "$\"`\\";
 char *p = out;
- char *t = temp;
+ const char *t = path;
 int n = sz;
 while (*t && n > 1) {
 if (strchr (invalid, *t)) {
@@ -674,19 +643,70 @@
 t++;
 }
 *p = 0;
- trace ("field '%s' expanded to '%s'\n", field, out);
 }
 
-void
-get_output_path (DB_playItem_t *it, const char *outfolder_user, const char *outfile, ddb_encoder_preset_t *encoder_preset, int preserve_folder_structure, const char *root_folder, int write_to_source_folder, char *out, int sz) {
- trace ("get_output_path: %s %s %s\n", outfolder_user, outfile, root_folder);
+static void
+get_output_field (DB_playItem_t *it, const char *field, char *out, int sz)
+{
+ int idx = deadbeef->pl_get_idx_of (it);
+ char tempPATH_MAX;
+ char fmtstrlen(field)+3;
+ snprintf (fmt, sizeof (fmt), "%%/%s", field);
+ deadbeef->pl_format_title (it, idx, temp, sizeof (temp), -1, fmt);
+
+ strncpy (out, temp, sz);
+ outsz-1 = 0;
+ //trace ("field '%s' expanded to '%s'\n", field, out);
+}
+
+static void
+_metadata_transform(ddb_tf_context_t *ctx, char *data, size_t size) {
+ const char *filter = "/\\:*?\"<>|";
+ for (int i = 0; i < size; i++) {
+ if (strchr (filter, datai)) {
+ datai = '-';
+ }
+ }
+}
+
+static void
+get_output_path_tf (DB_playItem_t *it, ddb_playlist_t *plt, const char *field, char *out, int sz)
+{
+ int idx = deadbeef->pl_get_idx_of (it);
+
+ char *tf = deadbeef->tf_compile (field);
+ if (!tf) {
+ *out = 0;
+ return;
+ }
+
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .flags = DDB_TF_CONTEXT_HAS_INDEX,
+ .it = it,
+ .idx = idx,
+ .iter = PL_MAIN,
+ .plt = plt,
+ .metadata_transformer = _metadata_transform
+ };
+
+ deadbeef->tf_eval (&ctx, tf, out, sz);
+ deadbeef->tf_free (tf);
+}
+
+
+static void
+get_output_path_int (DB_playItem_t *it, ddb_playlist_t *plt, const char *outfolder_user, const char *outfile, ddb_encoder_preset_t *encoder_preset, int preserve_folder_structure, const char *root_folder, int write_to_source_folder, char *out, int sz, int use_new_tf) {
+// trace ("get_output_path: %s %s %s\n", outfolder_user, outfile, root_folder);
+
 deadbeef->pl_lock ();
 const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
- char outfolder_preserve2000;
+
+ char outfolder_preservePATH_MAX;
 if (preserve_folder_structure) {
 // generate new outfolder
- int rootlen = strlen (root_folder);
+ size_t rootlen = strlen (root_folder);
 const char *e = strrchr (uri, '/');
 if (e) {
 const char *s = uri + rootlen;
@@ -711,56 +731,64 @@
 outfolder = preserve_folder_structure ? outfolder_preserve : outfolder_user;
 }
 
- int l;
 char fnamePATH_MAX;
- int pathl = strlen(outfolder)*2+1;
- char pathpathl;
- char *pattern = strdupa (outfile);
 
- // escape special chars
- char invalid = "$\"`\\";
- char *p = path;
- const char *t = outfolder;
- while (*t && pathl > 1) {
- if (strchr (invalid, *t)) {
- *p++ = '\\';
- pathl--;
- }
- *p++ = *t;
- pathl--;
- t++;
- }
- *p = 0;
- snprintf (out, sz, "%s/", path);
+ snprintf (out, sz, "%s/", outfolder);
 
- // split path and create directories
- char *field = pattern;
- char *s = pattern;
- while (*s) {
- if ((*s == '/') || (*s == '\\')) {
- *s = '\0';
- get_output_field (it, field, fname, sizeof(fname));
+ if (use_new_tf) {
+ get_output_path_tf(it, plt, outfile, fname, sizeof (fname));
+ }
+ else {
+ // split path, and expand each path component using get_output_field
+ size_t l;
+ char *pattern = strdupa (outfile);
+ char *field = pattern;
+ char *s = pattern;
+ while (*s) {
+ if ((*s == '/') || (*s == '\\')) {
+ *s = '\0';
+ get_output_field (it, field, fname, sizeof (fname));
+
+ l = strlen (out);
+ snprintf (out+l, sz-l, "%s/", fname);
+
+ field = s+1;
+ }
+ s++;
+ }
 
- l = strlen (out);
- snprintf (out+l, sz-l, "%s/", fname);
- mkdir (out, 0755);
+ // last part of outfile is the filename
+ get_output_field (it, field, fname, sizeof(fname));
+ }
 
- field = s+1;
+ size_t l = strlen (out);
+ if (encoder_preset->ext && encoder_preset->ext0) {
+ snprintf (out+l, sz-l, "%s.%s", fname, encoder_preset->ext);
+ }
+ else {
+ // get original file ext
+ const char *ext = strrchr (uri, '.');
+ if (!ext) {
+ ext = "";
 }
- s++;
+ snprintf (out+l, sz-l, "%s%s", fname, ext);
 }
+ //trace ("converter output file is '%s'\n", out);
+}
 
- // last part of outfile is the filename
- get_output_field (it, field, fname, sizeof(fname));
+void
+get_output_path (DB_playItem_t *it, const char *outfolder_user, const char *outfile, ddb_encoder_preset_t *encoder_preset, int preserve_folder_structure, const char *root_folder, int write_to_source_folder, char *out, int sz) {
+ get_output_path_int (it, NULL, outfolder_user, outfile, encoder_preset, preserve_folder_structure, root_folder, write_to_source_folder, out, sz, 0);
+}
 
- l = strlen (out);
- snprintf (out+l, sz-l, "%s.%s", fname, encoder_preset->ext);
- trace ("converter output file is '%s'\n", out);
+void
+get_output_path2 (DB_playItem_t *it, ddb_playlist_t *plt, const char *outfolder_user, const char *outfile, ddb_encoder_preset_t *encoder_preset, int preserve_folder_structure, const char *root_folder, int write_to_source_folder, char *out, int sz) {
+ get_output_path_int (it, plt, outfolder_user, outfile, encoder_preset, preserve_folder_structure, root_folder, write_to_source_folder, out, sz, 1);
 }
 
 static void
 get_output_path_1_0 (DB_playItem_t *it, const char *outfolder, const char *outfile, ddb_encoder_preset_t *encoder_preset, char *out, int sz) {
- fprintf (stderr, "converter: warning: old version of \"get_output_path\" has been called, please update your plugins which depend on converter 1.1\n");
+ trace ("warning: old version of \"get_output_path\" has been called, please update your plugins which depend on converter 1.1\n");
 *out = 0;
 sz = 0;
 }
@@ -776,10 +804,9 @@
 slash = strstr (slash+1, "/");
 if (slash)
 *slash = 0;
- if (-1 == stat (tmp, &stat_buf))
+ if (0 != mkdir (tmp, mode))
 {
- trace ("creating dir %s\n", tmp);
- if (0 != mkdir (tmp, mode))
+ if ( (errno == EEXIST && (-1 == stat (tmp, &stat_buf))) || errno != EEXIST)
 {
 trace ("Failed to create %s\n", tmp);
 free (tmp);
@@ -793,299 +820,247 @@
 return 1;
 }
 
-int
-convert (DB_playItem_t *it, const char *out, int output_bps, int output_is_float, ddb_encoder_preset_t *encoder_preset, ddb_dsp_preset_t *dsp_preset, int *abort) {
+static inline void
+write_int32_le (char *p, uint32_t value) {
+ p0 = value & 0xff;
+ p1 = (value >> 8) & 0xff;
+ p2 = (value >> 16) & 0xff;
+ p3 = (value >> 24) & 0xff;
+}
+
+static inline void
+write_int16_le (char *p, uint16_t value) {
+ p0 = value & 0xff;
+ p1 = (value >> 8) & 0xff;
+}
+
+static const unsigned char format_id_float32 = {
+ 0x03, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0xaa,
+ 0x00, 0x00, 0x10, 0x00, 0x00, 0x38, 0x9b, 0x71
+};
+
+static const unsigned char format_id_pcm = {
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
+ 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71
+};
+
+static int64_t
+_write_wav (DB_playItem_t *it, DB_decoder_t *dec, DB_fileinfo_t *fileinfo, ddb_dsp_preset_t *dsp_preset, ddb_encoder_preset_t *encoder_preset, int *abort, int fd, int output_bps, int output_is_float) {
+ int64_t res = -1;
 char *buffer = NULL;
 char *dspbuffer = NULL;
- if (deadbeef->pl_get_item_duration (it) <= 0) {
- deadbeef->pl_lock ();
- fprintf (stderr, "converter: stream %s doesn't have finite length, skipped\n", deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
- return -1;
- }
-
- int err = -1;
- FILE *enc_pipe = NULL;
- int temp_file = -1;
- DB_decoder_t *dec = NULL;
- DB_fileinfo_t *fileinfo = NULL;
- char input_file_namePATH_MAX = "";
- deadbeef->pl_lock ();
- dec = (DB_decoder_t *)deadbeef->plug_get_for_id (deadbeef->pl_find_meta (it, ":DECODER"));
- deadbeef->pl_unlock ();
 
- if (dec) {
- fileinfo = dec->open (0);
- if (fileinfo && dec->init (fileinfo, DB_PLAYITEM (it)) != 0) {
- deadbeef->pl_lock ();
- fprintf (stderr, "converter: failed to decode file %s\n", deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
- goto error;
+ // write wave header
+ int exheader = output_bps > 16 && !output_is_float;
+
+ int32_t wavehdr_size = 0;
+ char wavehdr0x50;
+ int header_written = 0;
+ int64_t outsize = 0;
+ uint32_t outsr = fileinfo->fmt.samplerate;
+ uint16_t outch = fileinfo->fmt.channels;
+
+ int samplesize = fileinfo->fmt.channels * fileinfo->fmt.bps / 8;
+
+ // block size
+ int bs = 2000 * samplesize;
+ // expected buffer size after worst-case dsp
+ int dspsize = bs/samplesize*sizeof(float)*8*48;
+ buffer = malloc (dspsize);
+ // account for up to float32 7.1 resampled to 48x ratio
+ dspbuffer = malloc (dspsize);
+ int eof = 0;
+ for (;;) {
+ if (eof) {
+ break;
 }
- if (fileinfo) {
- if (output_bps == -1) {
- output_bps = fileinfo->fmt.bps;
- output_is_float = fileinfo->fmt.is_float;
- }
-
- char *final_path = strdupa (out);
- char *sep = strrchr (final_path, '/');
- if (sep) {
- *sep = 0;
- if (!check_dir (final_path, 0755)) {
- fprintf (stderr, "converter: failed to create output folder: %s\n", final_path);
- goto error;
- }
- }
+ if (abort && *abort) {
+ break;
+ }
+ int sz = dec->read (fileinfo, buffer, bs);
 
- if (encoder_preset->method == DDB_ENCODER_METHOD_FILE) {
- const char *tmp = getenv ("TMPDIR");
- if (!tmp) {
- tmp = "/tmp";
+ if (sz != bs) {
+ eof = 1;
+ }
+ if (dsp_preset) {
+ ddb_waveformat_t fmt;
+ ddb_waveformat_t outfmt;
+ memcpy (&fmt, &fileinfo->fmt, sizeof (fmt));
+ memcpy (&outfmt, &fileinfo->fmt, sizeof (fmt));
+ fmt.bps = 32;
+ fmt.is_float = 1;
+ deadbeef->pcm_convert (&fileinfo->fmt, buffer, &fmt, dspbuffer, sz);
+
+ ddb_dsp_context_t *dsp = dsp_preset->chain;
+ int frames = sz / samplesize;
+ while (dsp) {
+ frames = dsp->plugin->process (dsp, (float *)dspbuffer, frames, dspsize / (fmt.channels * 4), &fmt, NULL);
+ if (frames <= 0) {
+ break;
 }
- snprintf (input_file_name, sizeof (input_file_name), "%s/ddbconvXXXXXX", tmp);
- char *res = mktemp (input_file_name);
- strcat (input_file_name, ".wav");
+ dsp = dsp->next;
 }
- else {
- strcpy (input_file_name, "-");
+ if (frames <= 0) {
+ trace ("DSP error, please check you dsp preset\n");
+ goto error;
 }
 
- char enc2000;
- memset (enc, 0, sizeof (enc));
+ outsr = fmt.samplerate;
+ outch = fmt.channels;
 
- // formatting: %o = outfile, %i = infile
- char *e = encoder_preset->encoder;
- char *o = enc;
- *o = 0;
- int len = sizeof (enc);
- while (e && *e) {
- if (len <= 0) {
- fprintf (stderr, "converter: failed to assemble encoder command line - buffer is not big enough, try to shorten your parameters. max allowed length is %u characters\n", (unsigned)sizeof (enc));
- goto error;
- }
- if (e0 == '%' && e1) {
- if (e1 == 'o') {
- int l = snprintf (o, len, "\"%s\"", out);
- o += l;
- len -= l;
- }
- else if (e1 == 'i') {
- int l = snprintf (o, len, "\"%s\"", input_file_name);
- o += l;
- len -= l;
- }
- else {
- strncpy (o, e, 2);
- o += 2;
- len -= 2;
- }
- e += 2;
- }
- else {
- *o++ = *e++;
- *o = 0;
- len--;
- }
- }
+ outfmt.bps = output_bps;
+ outfmt.is_float = output_is_float;
+ outfmt.channels = outch;
+ outfmt.samplerate = outsr;
 
- fprintf (stderr, "converter: will encode using: %s\n", enc0 ? enc : "internal RIFF WAVE writer");
+ int n = deadbeef->pcm_convert (&fmt, dspbuffer, &outfmt, buffer, frames * sizeof (float) * fmt.channels);
+ sz = n;
+ }
+ else if (fileinfo->fmt.bps != output_bps || fileinfo->fmt.is_float != output_is_float) {
+ ddb_waveformat_t outfmt;
+ memcpy (&outfmt, &fileinfo->fmt, sizeof (outfmt));
+ outfmt.bps = output_bps;
+ outfmt.is_float = output_is_float;
+ outfmt.channels = outch;
+ outfmt.samplerate = outsr;
+
+ int frames = sz / samplesize;
+ int n = deadbeef->pcm_convert (&fileinfo->fmt, buffer, &outfmt, dspbuffer, frames * samplesize);
+ memcpy (buffer, dspbuffer, n);
+ sz = n;
+ }
+ outsize += sz;
 
- mode_t wrmode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
+ if (!header_written) {
+ int64_t startsample = deadbeef->pl_item_get_startsample (it);
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ uint64_t size = (int64_t)(endsample-startsample) * outch * output_bps / 8;
+ if (!size) {
+ size = (double)deadbeef->pl_get_item_duration (it) * fileinfo->fmt.samplerate * outch * output_bps / 8;
 
- if (!encoder_preset->encoder0) {
- // write to wave file
- temp_file = open (out, O_LARGEFILE | O_WRONLY | O_CREAT | O_TRUNC, wrmode);
- if (temp_file == -1) {
- fprintf (stderr, "converter: failed to open output wave file %s\n", out);
- goto error;
- }
- }
- else if (encoder_preset->method == DDB_ENCODER_METHOD_FILE) {
- temp_file = open (input_file_name, O_LARGEFILE | O_WRONLY | O_CREAT | O_TRUNC, wrmode);
- if (temp_file == -1) {
- fprintf (stderr, "converter: failed to open temp file %s\n", input_file_name);
- goto error;
- }
- }
- else {
- enc_pipe = popen (enc, "w");
- if (!enc_pipe) {
- fprintf (stderr, "converter: failed to open encoder\n");
- goto error;
- }
 }
 
- if (temp_file == -1 && enc_pipe) {
- temp_file = fileno (enc_pipe);
+ if (outsr != fileinfo->fmt.samplerate) {
+ uint64_t temp = size;
+ temp *= outsr;
+ temp /= fileinfo->fmt.samplerate;
+ size = temp;
 }
 
- // write wave header
- char wavehdr_int = {
- 0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x44, 0xac, 0x00, 0x00, 0x10, 0xb1, 0x02, 0x00, 0x04, 0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61
- };
- char wavehdr_float = {
- 0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x28, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x02, 0x00, 0x40, 0x1f, 0x00, 0x00, 0x00, 0xfa, 0x00, 0x00, 0x08, 0x00, 0x20, 0x00, 0x16, 0x00, 0x20, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71, 0x66, 0x61, 0x63, 0x74, 0x04, 0x00, 0x00, 0x00, 0xc5, 0x5b, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61
- };
- char *wavehdr = output_is_float ? wavehdr_float : wavehdr_int;
- int wavehdr_size = output_is_float ? sizeof (wavehdr_float) : sizeof (wavehdr_int);
- int header_written = 0;
- uint32_t outsize = 0;
- uint32_t outsr = fileinfo->fmt.samplerate;
- uint16_t outch = fileinfo->fmt.channels;
-
- int samplesize = fileinfo->fmt.channels * fileinfo->fmt.bps / 8;
-
- // block size
- int bs = 2000 * samplesize;
- // expected buffer size after worst-case dsp
- int dspsize = bs/samplesize*sizeof(float)*8*48;
- char *buffer = malloc (dspsize);
- // account for up to float32 7.1 resampled to 48x ratio
- char *dspbuffer = malloc (dspsize);
- int eof = 0;
- for (;;) {
- if (eof) {
- break;
- }
- if (abort && *abort) {
- break;
- }
- int sz = dec->read (fileinfo, buffer, bs);
+ uint64_t chunksize;
+ chunksize = size + 40;
 
- if (sz != bs) {
- eof = 1;
- }
- if (dsp_preset) {
- ddb_waveformat_t fmt;
- ddb_waveformat_t outfmt;
- memcpy (&fmt, &fileinfo->fmt, sizeof (fmt));
- memcpy (&outfmt, &fileinfo->fmt, sizeof (fmt));
- fmt.bps = 32;
- fmt.is_float = 1;
- deadbeef->pcm_convert (&fileinfo->fmt, buffer, &fmt, dspbuffer, sz);
-
- ddb_dsp_context_t *dsp = dsp_preset->chain;
- int frames = sz / samplesize;
- while (dsp) {
- frames = dsp->plugin->process (dsp, (float *)dspbuffer, frames, dspsize / (fmt.channels * 4), &fmt, NULL);
- if (frames <= 0) {
- break;
- }
- dsp = dsp->next;
- }
- if (frames <= 0) {
- fprintf (stderr, "converter: dsp error, please check you dsp preset\n");
- goto error;
- }
-
- outsr = fmt.samplerate;
- outch = fmt.channels;
-
- outfmt.bps = output_bps;
- outfmt.is_float = output_is_float;
- outfmt.channels = outch;
- outfmt.samplerate = outsr;
-
- int n = deadbeef->pcm_convert (&fmt, dspbuffer, &outfmt, buffer, frames * sizeof (float) * fmt.channels);
- sz = n;
- }
- else if (fileinfo->fmt.bps != output_bps || fileinfo->fmt.is_float != output_is_float) {
- ddb_waveformat_t outfmt;
- memcpy (&outfmt, &fileinfo->fmt, sizeof (outfmt));
- outfmt.bps = output_bps;
- outfmt.is_float = output_is_float;
- outfmt.channels = outch;
- outfmt.samplerate = outsr;
-
- int frames = sz / samplesize;
- int n = deadbeef->pcm_convert (&fileinfo->fmt, buffer, &outfmt, dspbuffer, frames * samplesize);
- memcpy (buffer, dspbuffer, n);
- sz = n;
- }
- outsize += sz;
-
- if (!header_written) {
- uint64_t size = (int64_t)(it->endsample-it->startsample) * outch * output_bps / 8;
- if (!size) {
- size = (double)deadbeef->pl_get_item_duration (it) * fileinfo->fmt.samplerate * outch * output_bps / 8;
-
- }
-
- if (outsr != fileinfo->fmt.samplerate) {
- uint64_t temp = size;
- temp *= outsr;
- temp /= fileinfo->fmt.samplerate;
- size = temp;
- }
-
- uint64_t chunksize;
- chunksize = size + 40;
+ // for exheader, add 36 more
+ if (exheader) {
+ chunksize += 36;
+ }
 
- // for float, add 36 more
- if (output_is_float) {
- chunksize += 36;
- }
+ uint32_t size32 = 0xffffffff;
+ if (chunksize <= 0xffffffff) {
+ size32 = (uint32_t)chunksize;
+ }
 
- uint32_t size32 = 0xffffffff;
- if (chunksize <= 0xffffffff) {
- size32 = chunksize;
- }
- memcpy (&wavehdr4, &size32, 4);
- memcpy (&wavehdr22, &outch, 2);
- memcpy (&wavehdr24, &outsr, 4);
- uint16_t blockalign = outch * output_bps / 8;
- memcpy (&wavehdr32, &blockalign, 2);
- memcpy (&wavehdr34, &output_bps, 2);
-
- size32 = 0xffffffff;
- if (size <= 0xffffffff) {
- size32 = size;
- }
+ memcpy (wavehdr, "RIFF", 4); // RIFFxxxxWAVEfmt_
+ write_int32_le (wavehdr+4, size32);
+ memcpy (wavehdr+8, "WAVE", 4);
+ memcpy (wavehdr+12, "fmt ", 4);
+ int32_t wavefmtsize = exheader ? 0x28 : 0x10;
+ write_int32_le (wavehdr+16, wavefmtsize); // chunk size; fe ff; num chan ; samples_per_sec; avg_bytes_per_sec
+ int16_t fmt = exheader ? 0xfffe : (output_is_float ? 3 : 1);
+ write_int16_le (wavehdr+20, fmt);
+ write_int16_le (wavehdr+22, outch);
+ write_int32_le (wavehdr+24, outsr);
+ int32_t bytes_per_sec = outsr * output_bps / 8 * outch;
+ write_int32_le (wavehdr+28, bytes_per_sec);
+ uint16_t blockalign = outch * output_bps / 8; // block_align; bits_per_sample; cbSize; validBPS
+ write_int16_le (wavehdr+32, blockalign);
+ write_int16_le (wavehdr+34, output_bps);
+ if (exheader) {
+ int16_t cbSize = 0x16;
+ write_int16_le (wavehdr+36, cbSize); // cbSize (validBPS + channelmask + codec ID = 22 bytes)
+ write_int16_le (wavehdr+38, output_bps); // validBPS
+ int32_t chMask = 3;
+ write_int32_le (wavehdr+40, chMask); // channelMask
+
+ memcpy (wavehdr + 44, output_is_float ? format_id_float32 : format_id_pcm, 16); // 16 bytes format ID
+ memcpy (wavehdr + 60, "data", 4);
+ wavehdr_size = 64;
+ }
+ else {
+ memcpy (wavehdr + 36, "data", 4);
+ wavehdr_size = 40;
+ }
 
- if (wavehdr_size != write (temp_file, wavehdr, wavehdr_size)) {
- fprintf (stderr, "converter: wave header write error\n");
- goto error;
- }
- if (encoder_preset->method == DDB_ENCODER_METHOD_PIPE) {
- size32 = 0;
- }
- if (write (temp_file, &size32, sizeof (size32)) != sizeof (size32)) {
- fprintf (stderr, "converter: wave header size write error\n");
- goto error;
- }
- header_written = 1;
- }
+ size32 = 0xffffffff;
+ if (size <= 0xffffffff) {
+ size32 = (uint32_t)size;
+ }
 
- int64_t res = write (temp_file, buffer, sz);
- if (sz != res) {
- fprintf (stderr, "converter: write error (%"PRId64" bytes written out of %d)\n", res, sz);
- goto error;
- }
+ if (wavehdr_size != write (fd, wavehdr, wavehdr_size)) {
+ trace ("Wave header write error\n");
+ goto error;
+ }
+ if (encoder_preset->method == DDB_ENCODER_METHOD_PIPE) {
+ size32 = 0;
 }
- if (abort && *abort) {
+ if (write (fd, &size32, sizeof (size32)) != sizeof (size32)) {
+ trace ("Wave header size write error\n");
 goto error;
 }
- if (temp_file != -1 && (!enc_pipe || temp_file != fileno (enc_pipe))) {
- lseek (temp_file, wavehdr_size, SEEK_SET);
- if (4 != write (temp_file, &outsize, 4)) {
- fprintf (stderr, "converter: data size write error\n");
- goto error;
- }
+ header_written = 1;
+ }
 
- if (temp_file != -1 && (!enc_pipe || temp_file != fileno (enc_pipe))) {
- close (temp_file);
- temp_file = -1;
- }
+ if (output_bps == 8) {
+ // convert to unsigned
+ for (char *p = buffer; p < buffer + sz; p++) {
+ uint8_t sample = (uint8_t)(((int)*p) + 128);
+ *((uint8_t *)p) = sample;
 }
+ }
 
- if (encoder_preset->encoder0 && encoder_preset->method == DDB_ENCODER_METHOD_FILE) {
- enc_pipe = popen (enc, "w");
- }
+ int64_t res = write (fd, buffer, sz);
+ if (sz != res) {
+ trace ("Write error (%"PRId64" bytes written out of %d)\n", res, sz);
+ goto error;
 }
 }
- err = 0;
+
+ res = outsize;
+
+ // rewrite wave data size
+ if (encoder_preset->method == DDB_ENCODER_METHOD_FILE) {
+ uint32_t writesize;
+
+ // RIFF chunk size
+ lseek (fd, 4, SEEK_SET);
+ int64_t riffsize = wavehdr_size + outsize - 4;
+ if (riffsize <= 0xffffffff) {
+ writesize = (uint32_t)riffsize;
+ }
+ else {
+ writesize = 0xffffffff;
+ }
+ if (4 != write (fd, &writesize, 4)) {
+ trace_err ("converter: riff size write error\n");
+ goto error;
+ }
+
+ // data size
+ lseek (fd, wavehdr_size, SEEK_SET);
+ if (outsize <= 0xffffffff) {
+ writesize = (uint32_t)outsize;
+ }
+ else {
+ writesize = 0xffffffff;
+ }
+ if (4 != write (fd, &writesize, 4)) {
+ trace_err ("converter: data size write error\n");
+ goto error;
+ }
+ }
+
 error:
+
 if (buffer) {
 free (buffer);
 buffer = NULL;
@@ -1094,57 +1069,178 @@
 free (dspbuffer);
 dspbuffer = NULL;
 }
- if (temp_file != -1 && (!enc_pipe || temp_file != fileno (enc_pipe))) {
- close (temp_file);
- temp_file = -1;
+
+ return res;
+}
+
+static int
+_get_encoder_cmdline (ddb_encoder_preset_t *encoder_preset, char *enc, int len, const char *escaped_out, const char *input_file_name) {
+ // formatting: %o = outfile, %i = infile
+ char *e = encoder_preset->encoder;
+ char *o = enc;
+ *o = 0;
+
+ while (e && *e) {
+ if (len <= 0) {
+ trace ("Failed to assemble encoder command line - buffer is not big enough, try to shorten your parameters. max allowed length is %u characters\n", (unsigned)sizeof (enc));
+ return -1;
+ }
+ if (e0 == '%' && e1) {
+ if (e1 == 'o') {
+ int l = snprintf (o, len, "\"%s\"", escaped_out);
+ o += l;
+ len -= l;
+ }
+ else if (e1 == 'i') {
+ int l = snprintf (o, len, "\"%s\"", input_file_name);
+ o += l;
+ len -= l;
+ }
+ else {
+ strncpy (o, e, 2);
+ o += 2;
+ len -= 2;
+ }
+ e += 2;
+ }
+ else {
+ *o++ = *e++;
+ *o = 0;
+ len--;
+ }
 }
- if (enc_pipe) {
- pclose (enc_pipe);
- enc_pipe = NULL;
+
+ return 0;
+}
+
+#define BUFFER_SIZE 4096
+static int
+_copy_file (const char *in, const char *out) {
+ char *final_path = strdupa (out);
+ char *sep = strrchr (final_path, '/');
+ if (sep) {
+ *sep = 0;
+ if (!check_dir (final_path, 0755)) {
+ trace ("Failed to create output folder: %s\n", final_path);
+ return -1;
+ }
 }
- if (dec && fileinfo) {
- dec->free (fileinfo);
- fileinfo = NULL;
+
+ DB_FILE *infile = deadbeef->fopen (in);
+ if (!infile) {
+ trace ("Failed to open file %s for reading\n", in);
+ return -1;
 }
- if (abort && *abort && out0) {
- unlink (out);
+
+ char tmp_outPATH_MAX;
+ snprintf (tmp_out, PATH_MAX, "%s.part", out);
+ FILE *fout = fopen (tmp_out, "w+b");
+ if (!fout) {
+ trace ("Failed to open file %s for writing\n", tmp_out);
+ deadbeef->fclose (infile);
+ return -1;
 }
- if (input_file_name0 && strcmp (input_file_name, "-")) {
- unlink (input_file_name);
+
+ int err = 0;
+ int64_t bytes_read;
+ size_t file_bytes = 0;
+ do {
+ char bufferBUFFER_SIZE;
+ bytes_read = deadbeef->fread (buffer, 1, BUFFER_SIZE, infile);
+ if (bytes_read > 0 && fwrite (buffer, bytes_read, 1, fout) != 1) {
+ trace ("Failed to write file %s: %s\n", tmp_out, strerror (errno));
+ err = -1;
+ }
+ file_bytes += bytes_read;
+ } while (!err && bytes_read == BUFFER_SIZE);
+
+ deadbeef->fclose (infile);
+
+ if (fclose (fout)) {
+ trace ("Failed to write file %s: %s\n", tmp_out, strerror (errno));
+ unlink (tmp_out);
+ return -1;
 }
- if (err != 0) {
- return err;
+
+ if (file_bytes > 0 && !err) {
+ err = rename (tmp_out, out);
+ if (err) {
+ trace ("Failed to move %s to %s: %s\n", tmp_out, out, strerror (errno));
+ }
 }
 
- // write junklib tags
+ unlink (tmp_out);
+ return err;
+}
+
+// replaygain key names in deadbeef internal metadata
+static const char *ddb_internal_rg_keys = {
+ ":REPLAYGAIN_ALBUMGAIN",
+ ":REPLAYGAIN_ALBUMPEAK",
+ ":REPLAYGAIN_TRACKGAIN",
+ ":REPLAYGAIN_TRACKPEAK",
+ NULL
+};
+
+static int
+_converter_write_tags (ddb_encoder_preset_t *encoder_preset, DB_playItem_t *it, const char *out) {
+ int err = 0;
 
 DB_playItem_t *out_it = NULL;
 
- if (encoder_preset->tag_id3v2 || encoder_preset->tag_id3v1 || encoder_preset->tag_apev2 || encoder_preset->tag_flac || encoder_preset->tag_oggvorbis) {
+ if (!(encoder_preset->tag_id3v2
+ || encoder_preset->tag_id3v1
+ || encoder_preset->tag_apev2
+ || encoder_preset->tag_flac
+ || encoder_preset->tag_oggvorbis
+ || encoder_preset->tag_mp4)) {
+ // encoder doesn't specify tagging format
+ return 0;
+ }
+
+ out_it = deadbeef->pl_item_init (out);
+
+ if (!out_it) {
+ // can't initialize the converted file, just copy metadata from source
 out_it = deadbeef->pl_item_alloc ();
 deadbeef->pl_item_copy (out_it, it);
- char unesc_path2000;
- char invalid = "$\"`\\";
- const char *p = out;
- char *o = unesc_path;
- while (*p) {
- if (*p == '\\') {
- p++;
+ deadbeef->pl_set_item_flags (out_it, 0);
+ }
+ else {
+ // merge metadata
+ deadbeef->pl_lock ();
+
+ DB_metaInfo_t *meta = deadbeef->pl_get_metadata_head (it);
+ while (meta) {
+ if (strchr (":!_", meta->key0)) {
+ break;
+ }
+ if (!deadbeef->pl_meta_exists (out_it, meta->key)) {
+ deadbeef->pl_append_meta (out_it, meta->key, meta->value);
 }
- *o++ = *p++;
+ meta = meta->next;
 }
- *o = 0;
- deadbeef->pl_set_item_flags (out_it, 0);
- DB_metaInfo_t *m = deadbeef->pl_get_metadata_head (out_it);
- while (m) {
- DB_metaInfo_t *next = m->next;
- if (m->key0 == ':' || m->key0 == '!' || !strcasecmp (m->key, "cuesheet")) {
+
+ deadbeef->pl_unlock ();
+ }
+
+ DB_metaInfo_t *m = deadbeef->pl_get_metadata_head (out_it);
+ while (m) {
+ DB_metaInfo_t *next = m->next;
+ if (m->key0 == ':' || m->key0 == '!' || !strcasecmp (m->key, "cuesheet")) {
+ int i;
+ for (i = 0; ddb_internal_rg_keysi; i++) {
+ if (!strcasecmp (m->key, ddb_internal_rg_keysi)) {
+ break;
+ }
+ }
+ if (!ddb_internal_rg_keysi) {
 deadbeef->pl_delete_metadata (out_it, m);
 }
- m = next;
 }
- deadbeef->pl_replace_meta (out_it, ":URI", unesc_path);
+ m = next;
 }
+ deadbeef->pl_replace_meta (out_it, ":URI", out);
 
 uint32_t tagflags = 0;
 if (encoder_preset->tag_id3v2) {
@@ -1166,31 +1262,30 @@
 if (encoder_preset->tag_flac) {
 // find flac decoder plugin
 DB_decoder_t **plugs = deadbeef->plug_get_decoder_list ();
- DB_decoder_t *flac = NULL;
+ int res = -1;
 for (int i = 0; plugsi; i++) {
 if (!strcmp (plugsi->plugin.id, "stdflac")) {
- flac = plugsi;
+ res = plugsi->write_metadata (out_it);
+ if (!res) {
+ break;
+ }
 break;
 }
 }
- if (!flac) {
- fprintf (stderr, "converter: flac plugin not found, cannot write flac metadata\n");
- }
- else {
- if (0 != flac->write_metadata (out_it)) {
- fprintf (stderr, "converter: failed to write flac metadata, not a flac file?\n");
- }
+ if (res) {
+ trace ("converter: Failed to write FLAC metadata to %s\n", out);
 }
 }
 
 // write vorbis tags
 if (encoder_preset->tag_oggvorbis) {
- // find flac decoder plugin
+ // find plugin to write vorbis comment tags
 DB_decoder_t **plugs = deadbeef->plug_get_decoder_list ();
 int res = -1;
 for (int i = 0; plugsi; i++) {
 if (!strcmp (plugsi->plugin.id, "stdogg")
- || !strcmp (plugsi->plugin.id, "stdopus")) {
+ || !strcmp (plugsi->plugin.id, "opus")
+ || !strcmp (plugsi->plugin.id, "stdopus")) {
 res = plugsi->write_metadata (out_it);
 if (!res) {
 break;
@@ -1198,9 +1293,17 @@
 }
 }
 if (res) {
- fprintf (stderr, "converter: failed to write ogg metadata, not an ogg file?\n");
+ trace ("converter: Failed to write ogg metadata to %s\n", out);
 }
 }
+
+ if (encoder_preset->tag_mp4) {
+ int res = mp4_write_metadata(out_it);
+ if (res) {
+ trace ("converter: Failed to write mp4 metadata to %s\n", out);
+ }
+ }
+
 if (out_it) {
 deadbeef->pl_item_unref (out_it);
 }
@@ -1208,9 +1311,246 @@
 return err;
 }
 
-int
+static int
+ddb_mktemp(char *template, size_t template_size, char *suffix) {
+#if PORTABLE || defined(_WIN32) || !HAVE_MKSTEMPS
+ // This codepath should only be used when building with older LIBC
+ // which doesn't support mkstemps,
+ // such as glibc < 2.19 or MSVCRT.
+ (void)mktemp (template);
+ strncat(template, suffix, template_size);
+ return open(template,
+ O_LARGEFILE | O_WRONLY | O_CREAT | O_TRUNC | _O_BINARY,
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+#else
+ // Here, we would like to use mkstemp for better compatibility,
+ // but we want to have the file extension,
+ // to avoid confusing external command line encoders.
+ strncat(template, suffix, template_size);
+ return mkstemps(template, (int)strlen (suffix));
+#endif
+}
+
+static int
+convert2 (ddb_converter_settings_t *settings, DB_playItem_t *it, const char *out, int *pabort) {
+ int output_bps = settings->output_bps;
+ int output_is_float = settings->output_is_float;
+ ddb_encoder_preset_t *encoder_preset = settings->encoder_preset;
+ ddb_dsp_preset_t *dsp_preset = settings->dsp_preset;
+ int bypass_conversion_on_same_format = settings->bypass_conversion_on_same_format;
+ int rewrite_tags_after_copy = settings->rewrite_tags_after_copy;
+
+ char enc2000;
+ memset (enc, 0, sizeof (enc));
+
+ const char *fname;
+ deadbeef->pl_lock ();
+ fname = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+
+ if (deadbeef->pl_get_item_duration (it) <= 0) {
+ trace ("stream %s doesn't have finite length, skipped\n", fname);
+ return -1;
+ }
+
+ const char *ext = strrchr (fname, '.');
+ if (ext) {
+ ext++;
+ }
+ else {
+ ext = "";
+ }
+
+ if (bypass_conversion_on_same_format && !strcasecmp (ext, encoder_preset->ext)) {
+ int res = _copy_file (fname, out);
+ if (res) {
+ return res;
+ }
+ if (rewrite_tags_after_copy) {
+ (void)_converter_write_tags (encoder_preset, it, out);
+ }
+ return res;
+ }
+
+ int err = -1;
+ FILE *enc_pipe = NULL;
+ int temp_file = -1;
+ DB_decoder_t *dec = NULL;
+ DB_fileinfo_t *fileinfo = NULL;
+ char input_file_namePATH_MAX = "";
+
+ char *final_path = strdupa (out);
+ char *sep = strrchr (final_path, '/');
+ if (sep) {
+ *sep = 0;
+ if (!check_dir (final_path, 0755)) {
+ trace ("Failed to create output folder: %s\n", final_path);
+ goto error;
+ }
+ }
+ char escaped_outPATH_MAX;
+ escape_filepath (out, escaped_out, sizeof (escaped_out));
+
+ // only need to decode / process the file if not passing the source filename
+ if (encoder_preset->method == DDB_ENCODER_METHOD_FILE || encoder_preset->method == DDB_ENCODER_METHOD_PIPE) {
+ deadbeef->pl_lock ();
+ dec = (DB_decoder_t *)deadbeef->plug_get_for_id (deadbeef->pl_find_meta (it, ":DECODER"));
+ deadbeef->pl_unlock ();
+
+ if (dec) {
+ fileinfo = dec->open (DDB_DECODER_HINT_RAW_SIGNAL);
+ if (fileinfo && dec->init (fileinfo, DB_PLAYITEM (it)) != 0) {
+ trace ("Failed to decode file %s\n", fname);
+ goto error;
+ }
+ if (fileinfo) {
+ if (output_bps == -1) {
+ output_bps = fileinfo->fmt.bps;
+ output_is_float = fileinfo->fmt.is_float;
+ }
+
+ switch (encoder_preset->method) {
+ case DDB_ENCODER_METHOD_FILE:
+ {
+ const char *tmp = getenv ("TMPDIR");
+ if (!tmp) {
+ tmp = "/tmp";
+ }
+ snprintf (input_file_name, sizeof (input_file_name), "%s/ddbconvXXXXXX", tmp);
+ temp_file = ddb_mktemp(input_file_name, sizeof(input_file_name), ".wav");
+ if (temp_file == -1) {
+ trace ("Failed to open temp file %s\n", input_file_name);
+ goto error;
+ }
+ }
+ break;
+ case DDB_ENCODER_METHOD_PIPE:
+ strcpy (input_file_name, "-");
+ break;
+ default:
+ trace ("Invalid encoder method: %d, check your encoder preset\n", encoder_preset->method);
+ goto error;
+ }
+
+ if (_get_encoder_cmdline (encoder_preset, enc, sizeof (enc), escaped_out, input_file_name) < 0) {
+ goto error;
+ }
+
+ mode_t wrmode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
+
+ if (!encoder_preset->encoder0) {
+ // write to wave file
+ temp_file = open (out, O_LARGEFILE | O_WRONLY | O_CREAT | O_TRUNC | _O_BINARY, wrmode);
+ if (temp_file == -1) {
+ trace ("Failed to open output wave file %s\n", out);
+ goto error;
+ }
+ }
+ else if (encoder_preset->method == DDB_ENCODER_METHOD_FILE) {
+ // File should have been opened already
+ if (temp_file == -1) {
+ temp_file = open (input_file_name, O_LARGEFILE | O_WRONLY | O_CREAT | O_TRUNC | _O_BINARY, wrmode);
+ }
+ if (temp_file == -1) {
+ trace ("Failed to open temp file %s\n", input_file_name);
+ goto error;
+ }
+ }
+ else {
+ enc_pipe = popen (enc, "w");
+ if (!enc_pipe) {
+ trace ("Failed to execute the encoder, command used:\n%s\n", enc0 ? enc : "internal RIFF WAVE writer");
+ goto error;
+ }
+ }
+
+ if (encoder_preset->method == DDB_ENCODER_METHOD_FILE || encoder_preset->method == DDB_ENCODER_METHOD_PIPE) {
+ if (temp_file == -1 && enc_pipe) {
+ temp_file = fileno (enc_pipe);
+ }
+ }
+
+ if (temp_file > 0) {
+ int64_t outsize = _write_wav (it, dec, fileinfo, dsp_preset, encoder_preset, pabort, temp_file, output_bps, output_is_float);
+
+ if (outsize < 0) {
+ goto error;
+ }
+
+ if (pabort && *pabort) {
+ goto error;
+ }
+
+ if (encoder_preset->method == DDB_ENCODER_METHOD_FILE) {
+ if (temp_file != -1 && (!enc_pipe || temp_file != fileno (enc_pipe))) {
+ close (temp_file);
+ temp_file = -1;
+ }
+ }
+ }
+ }
+ }
+ }
+ else if (encoder_preset->method == DDB_ENCODER_METHOD_FILENAME) {
+ if (_get_encoder_cmdline (encoder_preset, enc, sizeof (enc), escaped_out, fname) < 0) {
+ goto error;
+ }
+ }
+
+ if (enc0 && (encoder_preset->method == DDB_ENCODER_METHOD_FILE || encoder_preset->method == DDB_ENCODER_METHOD_FILENAME)) {
+ enc_pipe = popen (enc, "w");
+ }
+
+ err = 0;
+error:
+ if (temp_file != -1 && (!enc_pipe || temp_file != fileno (enc_pipe))) {
+ close (temp_file);
+ temp_file = -1;
+ }
+ if (enc_pipe) {
+ err = pclose (enc_pipe);
+ err = WEXITSTATUS(err);
+ if (err) {
+ trace ("Failed to execute the encoder, command used:\n%s\n", enc0 ? enc : "internal RIFF WAVE writer");
+ err = -1;
+ }
+ enc_pipe = NULL;
+ }
+ if (dec && fileinfo) {
+ dec->free (fileinfo);
+ fileinfo = NULL;
+ }
+ if (pabort && *pabort && out0) {
+ unlink (out);
+ }
+ if (input_file_name0 && strcmp (input_file_name, "-")) {
+ unlink (input_file_name);
+ }
+ if (err != 0) {
+ return err;
+ }
+
+ (void)_converter_write_tags (encoder_preset, it, out);
+
+ return err;
+}
+
+static int
+convert (DB_playItem_t *it, const char *out, int output_bps, int output_is_float, ddb_encoder_preset_t *encoder_preset, ddb_dsp_preset_t *dsp_preset, int *abort) {
+ ddb_converter_settings_t settings = {
+ .output_bps = output_bps,
+ .output_is_float = output_is_float,
+ .encoder_preset = encoder_preset,
+ .dsp_preset = dsp_preset,
+ };
+
+ return convert2(&settings, it, out, abort);
+}
+
+
+static int
 convert_1_0 (DB_playItem_t *it, const char *outfolder, const char *outfile, int output_bps, int output_is_float, int preserve_folder_structure, const char *root_folder, ddb_encoder_preset_t *encoder_preset, ddb_dsp_preset_t *dsp_preset, int *abort) {
- fprintf (stderr, "converter: warning: old version of \"convert\" has been called, please update your plugins which depend on converter 1.1\n");
+ trace ("An old version of \"convert\" has been called, please update your plugins which depend on converter 1.1\n");
 return -1;
 }
 
@@ -1236,31 +1576,37 @@
 
 // define plugin interface
 static ddb_converter_t plugin = {
- .misc.plugin.api_vmajor = 1,
- .misc.plugin.api_vminor = 0,
+ .misc.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .misc.plugin.api_vminor = DB_API_VERSION_MINOR,
 .misc.plugin.version_major = 1,
- .misc.plugin.version_minor = 3,
+ .misc.plugin.version_minor = 5,
+ .misc.plugin.flags = DDB_PLUGIN_FLAG_LOGGING,
 .misc.plugin.type = DB_PLUGIN_MISC,
 .misc.plugin.name = "Converter",
 .misc.plugin.id = "converter",
 .misc.plugin.descr = "Converts any supported formats to other formats.\n"
 "Requires separate GUI plugin, e.g. Converter GTK UI\n",
- .misc.plugin.copyright = 
- "Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ .misc.plugin.copyright =
+ "Converter for DeaDBeeF Player\n"
+ "Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\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"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\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"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\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"
+ "3. This notice may not be removed or altered from any source distribution.\n"
 ,
 .misc.plugin.website = "http://deadbeef.sf.net",
 .misc.plugin.start = converter_start,
@@ -1296,6 +1642,10 @@
 // 1.2 entry points
 .convert = convert,
 .get_output_path = get_output_path,
+ // 1.4 entry points
+ .get_output_path2 = get_output_path2,
+ // 1.5 entry points
+ .convert2 = convert2,
 };
 
 DB_plugin_t *

deadbeef-0.6.2.tar.bz2/plugins/converter/converter.glade -> deadbeef-1.9.6.tar.bz2/plugins/converter/converter.glade Changed

@@ -4,6 +4,7 @@
 <glade-interface>
 
 <widget class="GtkDialog" id="converterdlg">
+ <property name="width_request">720</property>
 <property name="visible">True</property>
 <property name="title">Converter</property>
 <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -66,162 +67,177 @@
 </child>
 
 <child>
-	<widget class="GtkVBox" id="vbox26">
-	 <property name="border_width">12</property>
+	<widget class="GtkHBox" id="hbox105">
 	 <property name="visible">True</property>
 	 <property name="homogeneous">False</property>
-	 <property name="spacing">8</property>
+	 <property name="spacing">0</property>
 
 	 <child>
-	 <widget class="GtkHBox" id="hbox67">
+	 <widget class="GtkVBox" id="vbox26">
+	 <property name="border_width">12</property>
 	 <property name="visible">True</property>
 	 <property name="homogeneous">False</property>
 	 <property name="spacing">8</property>
 
 	 <child>
-		<widget class="GtkLabel" id="label103">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Output folder:</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="GtkHBox" id="hbox68">
+		<widget class="GtkHBox" id="hbox67">
 		 <property name="visible">True</property>
 		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
+		 <property name="spacing">8</property>
 
 		 <child>
-		 <widget class="GtkEntry" id="output_folder">
+		 <widget class="GtkLabel" id="label103">
 		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">True</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">●</property>
-		 <property name="activates_default">False</property>
-		 <signal name="changed" handler="on_output_folder_changed" last_modification_time="Sun, 13 Mar 2011 11:25:59 GMT"/>
+		 <property name="label" translatable="yes">Output folder:</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">True</property>
-		 <property name="fill">True</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
 		 </packing>
 		 </child>
 
 		 <child>
-		 <widget class="GtkButton" id="converter_output_browse">
+		 <widget class="GtkHBox" id="hbox68">
 		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label">...</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="clicked" handler="on_converter_output_browse_clicked" last_modification_time="Thu, 02 Dec 2010 19:59:50 GMT"/>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">0</property>
+
+		 <child>
+			<widget class="GtkEntry" id="output_folder">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="editable">True</property>
+			 <property name="visibility">True</property>
+			 <property name="max_length">0</property>
+			 <property name="text" translatable="yes"></property>
+			 <property name="has_frame">True</property>
+			 <property name="invisible_char">●</property>
+			 <property name="activates_default">False</property>
+			 <signal name="changed" handler="on_output_folder_changed" last_modification_time="Sun, 13 Mar 2011 11:25:59 GMT"/>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkButton" id="converter_output_browse">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label">...</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <signal name="clicked" handler="on_converter_output_browse_clicked" last_modification_time="Thu, 02 Dec 2010 19:59:50 GMT"/>
+			</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="expand">True</property>
+		 <property name="fill">True</property>
 		 </packing>
 		 </child>
 		</widget>
 		<packing>
 		 <property name="padding">0</property>
-		 <property name="expand">True</property>
+		 <property name="expand">False</property>
 		 <property name="fill">True</property>
 		</packing>
 	 </child>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">True</property>
-	 </packing>
-	 </child>
 
-	 <child>
-	 <widget class="GtkCheckButton" id="write_to_source_folder">
-	 <property name="visible">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="label" translatable="yes">Write to source track folder</property>
-	 <property name="use_underline">True</property>
-	 <property name="relief">GTK_RELIEF_NORMAL</property>
-	 <property name="focus_on_click">True</property>
-	 <property name="active">False</property>
-	 <property name="inconsistent">False</property>
-	 <property name="draw_indicator">True</property>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">False</property>
-	 </packing>
-	 </child>
+	 <child>
+		<widget class="GtkCheckButton" id="write_to_source_folder">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Write to source track folder</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		</packing>
+	 </child>
 
-	 <child>
-	 <widget class="GtkCheckButton" id="preserve_folders">
-	 <property name="visible">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="label" translatable="yes">Preserve folder structure</property>
-	 <property name="use_underline">True</property>
-	 <property name="relief">GTK_RELIEF_NORMAL</property>
-	 <property name="focus_on_click">True</property>
-	 <property name="active">False</property>
-	 <property name="inconsistent">False</property>
-	 <property name="draw_indicator">True</property>
-	 <signal name="toggled" handler="on_preserve_folders_toggled" last_modification_time="Sun, 13 Mar 2011 12:34:49 GMT"/>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">False</property>
-	 </packing>
-	 </child>
+	 <child>
+		<widget class="GtkCheckButton" id="preserve_folders">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Preserve folder structure</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		 <signal name="toggled" handler="on_preserve_folders_toggled" last_modification_time="Sun, 13 Mar 2011 12:34:49 GMT"/>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		</packing>
+	 </child>
 
-	 <child>
-	 <widget class="GtkHBox" id="hbox100">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">8</property>
+	 <child>
+		<widget class="GtkCheckButton" id="bypass_same_format">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Copy if the format is not changing</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		 <signal name="toggled" handler="on_bypass_same_format_toggled" last_modification_time="Wed, 07 Sep 2016 13:51:47 GMT"/>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		</packing>
+	 </child>
 
 	 <child>
-		<widget class="GtkLabel" id="label122">
+		<widget class="GtkCheckButton" id="retag_after_copy">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Output file name:</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>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Re-tag after copy</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		 <signal name="toggled" handler="on_retag_after_copy_toggled" last_modification_time="Thu, 19 Oct 2017 14:19:09 GMT"/>
 		</widget>
 		<packing>
 		 <property name="padding">0</property>
@@ -231,25 +247,77 @@
 	 </child>
 
 	 <child>
-		<widget class="GtkHBox" id="hbox101">
+		<widget class="GtkHBox" id="hbox100">
 		 <property name="visible">True</property>
 		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
+		 <property name="spacing">8</property>
 
 		 <child>
-		 <widget class="GtkEntry" id="output_file">
+		 <widget class="GtkLabel" id="label122">
 		 <property name="visible">True</property>
-		 <property name="tooltip" translatable="yes">Extension (e.g. .mp3) will be appended automatically.
-Leave the field empty for default (%a - %t).</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">True</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">•</property>
-		 <property name="activates_default">False</property>
-		 <signal name="changed" handler="on_output_file_changed" last_modification_time="Sun, 13 Mar 2011 20:02:34 GMT"/>
+		 <property name="label" translatable="yes">Output file name:</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="GtkHBox" id="hbox101">
+		 <property name="visible">True</property>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">0</property>
+
+		 <child>
+			<widget class="GtkEntry" id="output_file">
+			 <property name="visible">True</property>
+			 <property name="tooltip" translatable="yes">Extension (e.g. .mp3) will be appended automatically.
+Leave the field empty for default (%tracknumber%. %artist% - %title%).</property>
+			 <property name="can_focus">True</property>
+			 <property name="editable">True</property>
+			 <property name="visibility">True</property>
+			 <property name="max_length">0</property>
+			 <property name="text" translatable="yes"></property>
+			 <property name="has_frame">True</property>
+			 <property name="invisible_char">•</property>
+			 <property name="activates_default">False</property>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="Custom" id="custom6">
+			 <property name="visible">True</property>
+			 <property name="creation_function">title_formatting_help_link_create</property>
+			 <property name="int1">0</property>
+			 <property name="int2">0</property>
+			 <property name="last_modification_time">Fri, 03 Dec 2010 20:39:24 GMT</property>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			</packing>
+		 </child>
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
@@ -257,14 +325,91 @@
 		 <property name="fill">True</property>
 		 </packing>
 		 </child>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">True</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkHBox" id="hbox69">
+		 <property name="visible">True</property>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">8</property>
 
 		 <child>
-		 <widget class="Custom" id="custom6">
+		 <widget class="GtkLabel" id="label104">
 		 <property name="visible">True</property>
-		 <property name="creation_function">title_formatting_help_link_create</property>
-		 <property name="int1">0</property>
-		 <property name="int2">0</property>
-		 <property name="last_modification_time">Fri, 03 Dec 2010 20:39:24 GMT</property>
+		 <property name="label" translatable="yes">Encoder:</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="GtkHBox" id="hbox90">
+		 <property name="visible">True</property>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">0</property>
+
+		 <child>
+			<widget class="GtkComboBox" id="encoder">
+			 <property name="visible">True</property>
+			 <property name="add_tearoffs">False</property>
+			 <property name="focus_on_click">True</property>
+			 <signal name="changed" handler="on_converter_encoder_changed" last_modification_time="Mon, 06 Dec 2010 20:55:31 GMT"/>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkButton" id="edit_encoder_presets">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <signal name="clicked" handler="on_edit_encoder_presets_clicked" last_modification_time="Sat, 04 Dec 2010 15:20:49 GMT"/>
+
+			 <child>
+			 <widget class="GtkImage" id="image469">
+			 <property name="visible">True</property>
+			 <property name="stock">gtk-edit</property>
+			 <property name="icon_size">4</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 </widget>
+			 </child>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			</packing>
+		 </child>
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
@@ -275,307 +420,270 @@
 		</widget>
 		<packing>
 		 <property name="padding">0</property>
-		 <property name="expand">True</property>
+		 <property name="expand">False</property>
 		 <property name="fill">True</property>
 		</packing>
 	 </child>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkHBox" id="hbox69">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">8</property>
 
 	 <child>
-		<widget class="GtkLabel" id="label104">
+		<widget class="GtkHBox" id="hbox86">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Encoder:</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>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">8</property>
+
+		 <child>
+		 <widget class="GtkLabel" id="label114">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">DSP preset:</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="GtkHBox" id="hbox91">
+		 <property name="visible">True</property>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">0</property>
+
+		 <child>
+			<widget class="GtkComboBox" id="dsp_preset">
+			 <property name="visible">True</property>
+			 <property name="items" translatable="yes"></property>
+			 <property name="add_tearoffs">False</property>
+			 <property name="focus_on_click">True</property>
+			 <signal name="changed" handler="on_converter_dsp_preset_changed" last_modification_time="Wed, 08 Dec 2010 21:22:19 GMT"/>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkButton" id="edit_dsp_presets">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <signal name="clicked" handler="on_edit_dsp_presets_clicked" last_modification_time="Sat, 04 Dec 2010 15:20:53 GMT"/>
+
+			 <child>
+			 <widget class="GtkImage" id="image470">
+			 <property name="visible">True</property>
+			 <property name="stock">gtk-edit</property>
+			 <property name="icon_size">4</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 </widget>
+			 </child>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			</packing>
+		 </child>
+		 </widget>
+		 <packing>
+		 <property name="padding">0</property>
+		 <property name="expand">True</property>
+		 <property name="fill">True</property>
+		 </packing>
+		 </child>
 		</widget>
 		<packing>
 		 <property name="padding">0</property>
 		 <property name="expand">False</property>
-		 <property name="fill">False</property>
+		 <property name="fill">True</property>
 		</packing>
 	 </child>
 
 	 <child>
-		<widget class="GtkHBox" id="hbox90">
-		 <property name="visible">True</property>
+		<widget class="GtkHBox" id="hbox88">
 		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
+		 <property name="spacing">8</property>
 
 		 <child>
-		 <widget class="GtkComboBox" id="encoder">
+		 <widget class="GtkLabel" id="label116">
 		 <property name="visible">True</property>
-		 <property name="add_tearoffs">False</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="changed" handler="on_converter_encoder_changed" last_modification_time="Mon, 06 Dec 2010 20:55:31 GMT"/>
+		 <property name="label" translatable="yes">Number of threads:</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">True</property>
-		 <property name="fill">True</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
 		 </packing>
 		 </child>
 
 		 <child>
-		 <widget class="GtkButton" id="edit_encoder_presets">
+		 <widget class="GtkSpinButton" id="numthreads">
 		 <property name="visible">True</property>
 		 <property name="can_focus">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="clicked" handler="on_edit_encoder_presets_clicked" last_modification_time="Sat, 04 Dec 2010 15:20:49 GMT"/>
-
-		 <child>
-			<widget class="GtkImage" id="image469">
-			 <property name="visible">True</property>
-			 <property name="stock">gtk-edit</property>
-			 <property name="icon_size">4</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			</widget>
-		 </child>
+		 <property name="climb_rate">1</property>
+		 <property name="digits">0</property>
+		 <property name="numeric">False</property>
+		 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+		 <property name="snap_to_ticks">False</property>
+		 <property name="wrap">False</property>
+		 <property name="adjustment">1 0 100 1 10 0</property>
+		 <signal name="changed" handler="on_numthreads_changed" last_modification_time="Sun, 13 Mar 2011 11:26:21 GMT"/>
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
+		 <property name="expand">True</property>
+		 <property name="fill">True</property>
 		 </packing>
 		 </child>
 		</widget>
 		<packing>
 		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">False</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkHBox" id="hbox86">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">8</property>
-
-	 <child>
-		<widget class="GtkLabel" id="label114">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">DSP preset:</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>
+		 <property name="fill">True</property>
 		</packing>
 	 </child>
 
 	 <child>
-		<widget class="GtkHBox" id="hbox91">
+		<widget class="GtkHBox" id="hbox89">
 		 <property name="visible">True</property>
 		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
+		 <property name="spacing">8</property>
 
 		 <child>
-		 <widget class="GtkComboBox" id="dsp_preset">
+		 <widget class="GtkLabel" id="label117">
 		 <property name="visible">True</property>
-		 <property name="items" translatable="yes"></property>
-		 <property name="add_tearoffs">False</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="changed" handler="on_converter_dsp_preset_changed" last_modification_time="Wed, 08 Dec 2010 21:22:19 GMT"/>
+		 <property name="label" translatable="yes">Output sample format:</property>
+		 <property name="use_underline">False</property>
+		 <property name="use_markup">False</property>
+		 <property name="justify">GTK_JUSTIFY_LEFT</property>
+		 <property name="wrap">False</property>
+		 <property name="selectable">False</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xpad">0</property>
+		 <property name="ypad">0</property>
+		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		 <property name="width_chars">-1</property>
+		 <property name="single_line_mode">False</property>
+		 <property name="angle">0</property>
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
 		 </packing>
 		 </child>
 
 		 <child>
-		 <widget class="GtkButton" id="edit_dsp_presets">
+		 <widget class="GtkComboBox" id="output_format">
 		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="items" translatable="yes">Keep source format
+8 bit signed int
+16 bit signed int
+24 bit signed int
+32 bit signed int
+32 bit float</property>
+		 <property name="add_tearoffs">False</property>
 		 <property name="focus_on_click">True</property>
-		 <signal name="clicked" handler="on_edit_dsp_presets_clicked" last_modification_time="Sat, 04 Dec 2010 15:20:53 GMT"/>
-
-		 <child>
-			<widget class="GtkImage" id="image470">
-			 <property name="visible">True</property>
-			 <property name="stock">gtk-edit</property>
-			 <property name="icon_size">4</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			</widget>
-		 </child>
+		 <signal name="changed" handler="on_converter_output_format_changed" last_modification_time="Sun, 12 Dec 2010 16:55:42 GMT"/>
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
+		 <property name="expand">True</property>
+		 <property name="fill">True</property>
 		 </packing>
 		 </child>
 		</widget>
 		<packing>
 		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkHBox" id="hbox88">
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">8</property>
-
-	 <child>
-		<widget class="GtkLabel" id="label116">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Number of threads:</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>
+		 <property name="fill">True</property>
 		</packing>
 	 </child>
 
 	 <child>
-		<widget class="GtkSpinButton" id="numthreads">
+		<widget class="GtkHBox" id="hbox99">
 		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="climb_rate">1</property>
-		 <property name="digits">0</property>
-		 <property name="numeric">False</property>
-		 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		 <property name="snap_to_ticks">False</property>
-		 <property name="wrap">False</property>
-		 <property name="adjustment">1 0 100 1 10 0</property>
-		 <signal name="changed" handler="on_numthreads_changed" last_modification_time="Sun, 13 Mar 2011 11:26:21 GMT"/>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">True</property>
-	 </packing>
-	 </child>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">8</property>
 
-	 <child>
-	 <widget class="GtkHBox" id="hbox89">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">8</property>
+		 <child>
+		 <widget class="GtkLabel" id="label121">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">When file exists:</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="GtkLabel" id="label117">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Output sample format:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0.5</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
+		 <child>
+		 <widget class="GtkComboBox" id="overwrite_action">
+		 <property name="visible">True</property>
+		 <property name="items" translatable="yes">Skip
+Prompt
+Overwrite</property>
+		 <property name="add_tearoffs">False</property>
+		 <property name="focus_on_click">True</property>
+		 <signal name="changed" handler="on_overwrite_action_changed" last_modification_time="Sun, 13 Mar 2011 11:26:30 GMT"/>
+		 </widget>
+		 <packing>
+		 <property name="padding">0</property>
+		 <property name="expand">True</property>
+		 <property name="fill">True</property>
+		 </packing>
+		 </child>
 		</widget>
 		<packing>
 		 <property name="padding">0</property>
 		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkComboBox" id="output_format">
-		 <property name="visible">True</property>
-		 <property name="items" translatable="yes">Keep source format
-8 bit signed int
-16 bit signed int
-24 bit signed int
-32 bit signed int
-32 bit float</property>
-		 <property name="add_tearoffs">False</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="changed" handler="on_converter_output_format_changed" last_modification_time="Sun, 12 Dec 2010 16:55:42 GMT"/>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
 		 <property name="fill">True</property>
 		</packing>
 	 </child>
@@ -588,50 +696,27 @@
 	 </child>
 
 	 <child>
-	 <widget class="GtkHBox" id="hbox99">
+	 <widget class="GtkScrolledWindow" id="scrolledwindow9">
+	 <property name="border_width">12</property>
 	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">8</property>
-
-	 <child>
-		<widget class="GtkLabel" id="label121">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">When file exists:</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>
+	 <property name="can_focus">True</property>
+	 <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	 <property name="shadow_type">GTK_SHADOW_IN</property>
+	 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	 <child>
-		<widget class="GtkComboBox" id="overwrite_action">
+		<widget class="GtkTreeView" id="preview_tree">
 		 <property name="visible">True</property>
-		 <property name="items" translatable="yes">Prompt
-Overwrite</property>
-		 <property name="add_tearoffs">False</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="changed" handler="on_overwrite_action_changed" last_modification_time="Sun, 13 Mar 2011 11:26:30 GMT"/>
+		 <property name="can_focus">True</property>
+		 <property name="headers_visible">True</property>
+		 <property name="rules_hint">True</property>
+		 <property name="reorderable">False</property>
+		 <property name="enable_search">True</property>
+		 <property name="fixed_height_mode">False</property>
+		 <property name="hover_selection">False</property>
+		 <property name="hover_expand">False</property>
 		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		</packing>
 	 </child>
 	 </widget>
 	 <packing>
@@ -984,7 +1069,8 @@
 		<widget class="GtkComboBox" id="method">
 		 <property name="visible">True</property>
 		 <property name="items" translatable="yes">Pipe
-Temporary file</property>
+Temp File
+Source File</property>
 		 <property name="add_tearoffs">False</property>
 		 <property name="focus_on_click">True</property>
 		</widget>
@@ -1167,6 +1253,28 @@
 			 <property name="y_options">fill</property>
 			</packing>
 		 </child>
+
+		 <child>
+			<widget class="GtkCheckButton" id="mp4">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label" translatable="yes">MP4</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			 <property name="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>
 		 </widget>
 		 </child>
 		</widget>

deadbeef-0.6.2.tar.bz2/plugins/converter/converter.h -> deadbeef-1.9.6.tar.bz2/plugins/converter/converter.h Changed

@@ -1,30 +1,46 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ Converter for DeaDBeeF Player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
 #ifndef __CONVERTER_H
 #define __CONVERTER_H
 
 #include <stdint.h>
-#include "../../deadbeef.h"
+
+// changes in 1.5:
+// added mp4 tagging support
+// added converter option to copy files without conversion, if file format isn't changing
+// added encoder preset option to pass source file name for %i without any processing
+// added `converter2` function
+// changes in 1.4:
+// changed escaping rules:
+// now get_output_path returns unescaped path, and doesn't create folders
+// added get_output_path2
+// changes in 1.3:
+// readonly preset support
 
 enum {
 DDB_ENCODER_METHOD_PIPE = 0,
 DDB_ENCODER_METHOD_FILE = 1,
+ DDB_ENCODER_METHOD_FILENAME = 2, // added in converter-1.5
 };
 
 enum {
@@ -45,13 +61,14 @@
 struct ddb_encoder_preset_s *next;
 char *ext;
 char *encoder;
- int method; // pipe or file
+ int method; // DDB_ENCODER_METHOD_*
 int tag_id3v2;
 int tag_id3v1;
 int tag_apev2;
 int tag_flac;
 int tag_oggvorbis;
 int tag_mp3xing;
+ int tag_mp4;
 int id3v2_version;
 
 // added in converter-1.3
@@ -64,6 +81,26 @@
 ddb_dsp_context_t *chain;
 } ddb_dsp_preset_t;
 
+typedef struct ddb_converter_settings_s {
+ // stream should be pre-converted to this resolution
+ int output_bps;
+
+ // stream should be converted to float
+ int output_is_float;
+
+ // encoder preset to use
+ ddb_encoder_preset_t *encoder_preset;
+
+ // dsp preset to use
+ ddb_dsp_preset_t *dsp_preset;
+
+ // bypass conversion, and copy the file as-is, if the output file extension is the same
+ int bypass_conversion_on_same_format;
+
+ // rewrite tags after copy, if the bypass_conversion_on_same_format is true
+ int rewrite_tags_after_copy;
+} ddb_converter_settings_t;
+
 typedef struct {
 DB_misc_t misc;
 
@@ -148,7 +185,7 @@
 
 // this function is deprecated, please don't use directly
 int
- (*convert_1_0) (DB_playItem_t *it, const char *outfolder, const char *outfile, int output_bps, int output_is_float, int preserve_folder_structure, const char *root_folder, ddb_encoder_preset_t *encoder_preset, ddb_dsp_preset_t *dsp_preset, int *abort);
+ (*convert_1_0) (DB_playItem_t *it, const char *outfolder, const char *outfile, int output_bps, int output_is_float, int preserve_folder_structure, const char *root_folder, ddb_encoder_preset_t *encoder_preset, ddb_dsp_preset_t *dsp_preset, int *pabort);
 
 /////////////////////////////
 // new APIs for converter-1.1
@@ -166,18 +203,68 @@
 /////////////////////////////
 // new APIs for converter-1.2
 /////////////////////////////
+
+ // `convert` is deprecated in converter-1.5, use `convert2` instead
 int
 (*convert) (
- DB_playItem_t *it, // track to be converted
- const char *outpath, // final path to write the file (should normally be obtained using get_output_path)
- int output_bps, // stream should be pre-converted to this resolution
- int output_is_float, // stream should be converted to float
- ddb_encoder_preset_t *encoder_preset, // encoder preset to use
- ddb_dsp_preset_t *dsp_preset, // dsp preset to use
- int *abort // *abort will be checked regularly, conversion will be interrupted if it's non-zero
+ // track to be converted
+ DB_playItem_t *it,
+ // final path to write the file (should normally be obtained using get_output_path)
+ const char *outpath,
+ // stream should be pre-converted to this resolution
+ int output_bps,
+ // stream should be converted to float
+ int output_is_float,
+ // encoder preset to use
+ ddb_encoder_preset_t *encoder_preset,
+ // dsp preset to use
+ ddb_dsp_preset_t *dsp_preset,
+ // *pabort will be checked regularly, conversion will be interrupted if it's non-zero
+ int *pabort
 );
+
+ // The 'get_output_path' function should be used to get the fully
+ // qualified output file path, to be passed to 'convert' function.
+ // It is commonly used by converter GUI.
+ // Parameters:
+ // it: the track
+ // outfolder: the folder to write the file to (usually specified in GUI)
+ // outfile: the filename pattern, which may include additional folder
+ // structure, and title formatting; without extension.
+ // examples: "%artist% - %title%", "subfolder/%title%"
+ // encoder_preset: an existing encoder preset.
+ // preserve_folder_structure: set to 1 to recreate the existing folder
+ // structure, when converting multiple files
+ // root_folder: common root path of all the tracks being converted in 1 go.
+ // write_to_source_folder: set to 1 to write output to the same folders
+ // where input files are located.
+ // out: the buffer for the output file path,
+ // which will come out not escaped, will include the file extension.
+ // sz: size of the out buffer.
 void
 (*get_output_path) (DB_playItem_t *it, const char *outfolder, const char *outfile, ddb_encoder_preset_t *encoder_preset, int preserve_folder_structure, const char *root_folder, int write_to_source_folder, char *out, int sz);
+
+ // since 1.4
+ // same as get_output_path, but takes playlist as argument, and used the new title formatting
+ // plt: the playlist which contains the track 'it'
+ void
+ (*get_output_path2) (DB_playItem_t *it, ddb_playlist_t *plt, const char *outfolder, const char *outfile, ddb_encoder_preset_t *encoder_preset, int preserve_folder_structure, const char *root_folder, int write_to_source_folder, char *out, int sz);
+
+ // since 1.5
+ int
+ (*convert2) (
+ // converter settings
+ ddb_converter_settings_t *settings,
+
+ // track to convert
+ DB_playItem_t *it,
+
+ // fully qualified output path with filename and extension
+ const char *outpath,
+
+ // *pabort will be checked regularly, conversion will be interrupted if it's non-zero
+ int *pabort
+ );
 } ddb_converter_t;
 
 #endif

deadbeef-0.6.2.tar.bz2/plugins/converter/convgui.c -> deadbeef-1.9.6.tar.bz2/plugins/converter/convgui.c Changed

@@ -1,37 +1,40 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ Converter UI for DeaDBeeF Player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifdef HAVE_CONFIG_H
 # include "../../config.h"
 #endif
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-#if HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
+#include <limits.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>
-#include "converter.h"
+#include <deadbeef/deadbeef.h>
+#include "../converter/converter.h"
 #include "support.h"
 #include "interface.h"
 #include "../gtkui/gtkui_api.h"
@@ -49,11 +52,15 @@
 ddb_dsp_preset_t *current_dsp_preset;
 
 DB_playItem_t **convert_items;
+ ddb_playlist_t *convert_playlist;
+
 int convert_items_count;
 char *outfolder;
 char *outfile;
 int preserve_folder_structure;
 int write_to_source_folder;
+ int bypass_same_format;
+ int retag_after_copy;
 int output_bps;
 int output_is_float;
 int overwrite_action;
@@ -62,7 +69,6 @@
 GtkWidget *progress;
 GtkWidget *progress_entry;
 int cancelled;
- char *progress_text;
 } converter_ctx_t;
 
 converter_ctx_t *current_ctx;
@@ -72,15 +78,17 @@
 PRESET_TYPE_DSP
 };
 
+static const char *default_format = "%tracknumber%. %artist% - %title%";
+
 static void
 fill_presets (GtkListStore *mdl, ddb_preset_t *head, int type) {
 ddb_preset_t *p = head;
 while (p) {
 GtkTreeIter iter;
 gtk_list_store_append (mdl, &iter);
+ char stock1000;
 const char *s = p->title;
 if (type == PRESET_TYPE_ENCODER && ((ddb_encoder_preset_t *)p)->readonly) {
- char stock1000;
 snprintf (stock, sizeof (stock), _("Built-in %s"), p->title);
 s = stock;
 }
@@ -95,6 +103,14 @@
 ctx->cancelled = 1;
 }
 
+void
+on_output_file_changed (GtkEntry *entry,
+ gpointer user_data);
+
+void
+on_converter_realize (GtkWidget *widget,
+ gpointer user_data);
+
 typedef struct {
 GtkWidget *entry;
 char *text;
@@ -117,7 +133,7 @@
 }
 
 struct overwrite_prompt_ctx {
- char *fname;
+ const char *fname;
 uintptr_t mutex;
 uintptr_t cond;
 int result;
@@ -139,6 +155,20 @@
 return FALSE;
 }
 
+static int
+overwrite_prompt (const char *outpath) {
+ struct overwrite_prompt_ctx ctl;
+ ctl.mutex = deadbeef->mutex_create ();
+ ctl.cond = deadbeef->cond_create ();
+ ctl.fname = outpath;
+ ctl.result = 0;
+ gdk_threads_add_idle (overwrite_prompt_cb, &ctl);
+ deadbeef->cond_wait (ctl.cond, ctl.mutex);
+ deadbeef->cond_free (ctl.cond);
+ deadbeef->mutex_free (ctl.mutex);
+ return ctl.result;
+}
+
 static void
 converter_worker (void *ctx) {
 deadbeef->background_job_increment ();
@@ -178,9 +208,17 @@
 }
 deadbeef->pl_unlock ();
 }
- fprintf (stderr, "common root path: %s\n", root);
 }
 
+ ddb_converter_settings_t settings = {
+ .output_bps = conv->output_bps,
+ .output_is_float = conv->output_is_float,
+ .encoder_preset = conv->encoder_preset,
+ .dsp_preset = conv->dsp_preset,
+ .bypass_conversion_on_same_format = conv->bypass_same_format,
+ .rewrite_tags_after_copy = conv->retag_after_copy,
+ };
+
 for (int n = 0; n < conv->convert_items_count; n++) {
 update_progress_info_t *info = malloc (sizeof (update_progress_info_t));
 info->entry = conv->progress_entry;
@@ -191,55 +229,29 @@
 g_idle_add (update_progress_cb, info);
 
 char outpath2000;
-
- converter_plugin->get_output_path (conv->convert_itemsn, conv->outfolder, conv->outfile, conv->encoder_preset, conv->preserve_folder_structure, root, conv->write_to_source_folder, outpath, sizeof (outpath));
+ converter_plugin->get_output_path2 (conv->convert_itemsn, conv->convert_playlist, conv->outfolder, conv->outfile, conv->encoder_preset, conv->preserve_folder_structure, root, conv->write_to_source_folder, outpath, sizeof (outpath));
 
 int skip = 0;
-
- // need to unescape path before passing to stat
- char unesc_path2000;
- char invalid = "$\"`\\";
- const char *p = outpath;
- char *o = unesc_path;
- while (*p) {
- if (*p == '\\') {
- p++;
- }
- *o++ = *p++;
- }
- *o = 0;
-
- struct stat st;
- int res = stat(unesc_path, &st);
- if (res == 0) {
- if (conv->overwrite_action > 1 || conv->overwrite_action < 0) {
- conv->overwrite_action = 0;
- }
- if (conv->overwrite_action == 0) {
- // prompt if file exists
- struct overwrite_prompt_ctx ctl;
- ctl.mutex = deadbeef->mutex_create ();
- ctl.cond = deadbeef->cond_create ();
- ctl.fname = unesc_path;
- ctl.result = 0;
- gdk_threads_add_idle (overwrite_prompt_cb, &ctl);
- deadbeef->cond_wait (ctl.cond, ctl.mutex);
- deadbeef->cond_free (ctl.cond);
- deadbeef->mutex_free (ctl.mutex);
- if (ctl.result) {
- unlink (outpath);
- }
- else {
- skip = 1;
- }
+ char *real_out = realpath(outpath, NULL);
+ if (real_out) {
+ skip = 1;
+ deadbeef->pl_lock();
+ char *real_in = realpath(deadbeef->pl_find_meta(conv->convert_itemsn, ":URI"), NULL);
+ deadbeef->pl_unlock();
+ const int paths_match = real_in && !strcmp(real_in, real_out);
+ free(real_in);
+ free(real_out);
+ if (paths_match) {
+ fprintf (stderr, "converter: destination file is the same as source file, skipping\n");
 }
- else if (conv->overwrite_action == 1) {
+ else if (conv->overwrite_action == 2 || (conv->overwrite_action == 1 && overwrite_prompt(outpath))) {
 unlink (outpath);
+ skip = 0;
 }
 }
 
 if (!skip) {
- converter_plugin->convert (conv->convert_itemsn, outpath, conv->output_bps, conv->output_is_float, conv->encoder_preset, conv->dsp_preset, &conv->cancelled);
+ converter_plugin->convert2 (&settings, conv->convert_itemsn, outpath, &conv->cancelled);
 }
 if (conv->cancelled) {
 for (; n < conv->convert_items_count; n++) {
@@ -253,7 +265,15 @@
 if (conv->convert_items) {
 free (conv->convert_items);
 }
- free (conv->outfolder);
+ if (conv->convert_playlist) {
+ deadbeef->plt_unref (conv->convert_playlist);
+ }
+ if (conv->outfolder) {
+ free (conv->outfolder);
+ }
+ if (conv->outfile) {
+ free (conv->outfile);
+ }
 converter_plugin->encoder_preset_free (conv->encoder_preset);
 converter_plugin->dsp_preset_free (conv->dsp_preset);
 free (conv);
@@ -266,11 +286,13 @@
 conv->outfolder = strdup (gtk_entry_get_text (GTK_ENTRY (lookup_widget (conv->converter, "output_folder"))));
 const char *outfile = gtk_entry_get_text (GTK_ENTRY (lookup_widget (conv->converter, "output_file")));
 if (outfile0 == 0) {
- outfile = "%a - %t";
+ outfile = default_format;
 }
 conv->outfile = strdup (outfile);
 conv->preserve_folder_structure = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (conv->converter, "preserve_folders")));
 conv->write_to_source_folder = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (conv->converter, "write_to_source_folder")));
+ conv->bypass_same_format = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (conv->converter, "bypass_same_format")));
+ conv->retag_after_copy = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (conv->converter, "retag_after_copy")));
 conv->overwrite_action = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (conv->converter, "overwrite_action")));
 
 GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (conv->converter, "output_format"));
@@ -342,6 +364,109 @@
 return 0;
 }
 
+static int preview_delay_timer = 0;
+
+static gboolean
+preview_update (gpointer user_data)
+{
+ // reset delay
+ if (preview_delay_timer) {
+ g_source_remove (preview_delay_timer);
+ preview_delay_timer = 0;
+ }
+
+ converter_ctx_t *conv = current_ctx;
+ if (!conv) {
+ return FALSE;
+ }
+
+ GtkTreeView *tree_view = GTK_TREE_VIEW (lookup_widget (conv->converter, "preview_tree"));
+ GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (tree_view));
+
+ if (!tree_view || !store) {
+ return FALSE;
+ }
+ gtk_list_store_clear (store);
+
+ // get encoder preset to access filename extension
+ GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (conv->converter, "encoder"));
+ int enc_preset = gtk_combo_box_get_active (combo);
+ ddb_encoder_preset_t *p = NULL;
+ if (enc_preset >= 0) {
+ p = converter_plugin->encoder_preset_get_for_idx (enc_preset);
+ }
+ else {
+ return FALSE;
+ }
+
+ // get filename format
+ GtkEntry *output_file = GTK_ENTRY (lookup_widget (conv->converter, "output_file"));
+ const char *format = gtk_entry_get_text (output_file);
+ if (!format || format0 == 0) {
+ // use default format when entry is empty
+ format = default_format;
+ }
+
+ char *tf = deadbeef->tf_compile (format);
+ if (!tf) {
+ return FALSE;
+ }
+
+ // detach model from treeview while adding lots of items to increase performance
+ g_object_ref (store);
+ gtk_tree_view_set_model (tree_view, NULL);
+
+ // NOTE: while displaying is not a problem, adding lots of rows to a GtkListStore
+ // can be quite slow (about 20s for ~60.000 rows)
+ // so we better prevent those huge numbers from locking the UI
+ int num_items = MIN (1000, conv->convert_items_count);
+ for (int n = 0; n < num_items; n++) {
+ DB_playItem_t *it = conv->convert_itemsn;
+ if (it) {
+ char outpathPATH_MAX;
+ const char *output_folder = gtk_entry_get_text (GTK_ENTRY(lookup_widget (conv->converter, "output_folder")));
+
+ int preserve_folders = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (conv->converter, "preserve_folders")));
+ int write_to_source = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (conv->converter, "write_to_source_folder")));
+ converter_plugin->get_output_path2 (it, conv->convert_playlist, output_folder, format, p, preserve_folders, "", write_to_source, outpath, sizeof (outpath));
+
+ GtkTreeIter iter;
+ gtk_list_store_insert_with_values (store, &iter, -1, 0, outpath, -1);
+ }
+ }
+ // reattach model to treeview
+ gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (store));
+ g_object_unref (store);
+ deadbeef->tf_free (tf);
+ return FALSE;
+}
+
+static void
+preview_timeout_add (void)
+{
+ if (preview_delay_timer) {
+ g_source_remove (preview_delay_timer);
+ preview_delay_timer = 0;
+ }
+ preview_delay_timer = g_timeout_add (100, preview_update, NULL);
+}
+
+static void
+create_preview_treeview (converter_ctx_t *conv)
+{
+ GtkWidget *treeview = lookup_widget (conv->converter, "preview_tree");
+ GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (store));
+
+ GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+ GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ("Preview",
+ renderer,
+ "text", 0,
+ NULL);
+ gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (treeview), column, 0);
+}
+
 void
 on_write_to_source_folder_toggled (GtkToggleButton *togglebutton,
 gpointer user_data);
@@ -353,6 +478,11 @@
 current_ctx = conv;
 memset (conv, 0, sizeof (converter_ctx_t));
 
+ ddb_playItem_t *playing_track = NULL;
+ if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ playing_track = deadbeef->streamer_get_playing_track_safe ();
+ }
+
 deadbeef->pl_lock ();
 switch (ctx) {
 case DDB_ACTION_CTX_MAIN:
@@ -361,6 +491,7 @@
 // copy list
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
 if (plt) {
+ conv->convert_playlist = plt;
 conv->convert_items_count = deadbeef->plt_getselcount (plt);
 if (0 < conv->convert_items_count) {
 conv->convert_items = malloc (sizeof (DB_playItem_t *) * conv->convert_items_count);
@@ -385,8 +516,9 @@
 case DDB_ACTION_CTX_PLAYLIST:
 {
 // copy list
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
 if (plt) {
+ conv->convert_playlist = plt;
 conv->convert_items_count = deadbeef->plt_get_item_count (plt, PL_MAIN);
 if (0 < conv->convert_items_count) {
 conv->convert_items = malloc (sizeof (DB_playItem_t *) * conv->convert_items_count);
@@ -399,18 +531,18 @@
 }
 }
 }
- deadbeef->plt_unref (plt);
 }
 break;
 }
 case DDB_ACTION_CTX_NOWPLAYING:
 {
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
- if (it) {
+ if (playing_track) {
+ conv->convert_playlist = deadbeef->pl_get_playlist (playing_track);
 conv->convert_items_count = 1;
 conv->convert_items = malloc (sizeof (DB_playItem_t *) * conv->convert_items_count);
 if (conv->convert_items) {
- conv->convert_items1 = it;
+ conv->convert_items0 = playing_track;
+ deadbeef->pl_item_ref(playing_track);
 }
 }
 }
@@ -418,18 +550,50 @@
 }
 deadbeef->pl_unlock ();
 
+ if (playing_track != NULL) {
+ deadbeef->pl_item_unref (playing_track);
+ playing_track = NULL;
+ }
+
 conv->converter = create_converterdlg ();
+ GtkWidget *mainwin = gtkui_plugin->get_mainwin ();
+ gtk_window_set_transient_for (GTK_WINDOW (conv->converter), GTK_WINDOW (mainwin));
+
+ create_preview_treeview (conv);
+
 deadbeef->conf_lock ();
 const char *out_folder = deadbeef->conf_get_str_fast ("converter.output_folder", "");
 if (!out_folder0) {
 out_folder = getenv("HOME");
 }
 gtk_entry_set_text (GTK_ENTRY (lookup_widget (conv->converter, "output_folder")), out_folder);
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (conv->converter, "output_file")), deadbeef->conf_get_str_fast ("converter.output_file", ""));
+
+ GtkWidget *output_file = lookup_widget (conv->converter, "output_file");
+ const char *output_file_text = deadbeef->conf_get_str_fast ("converter.output_file_tf", "");
+ gtk_entry_set_text (GTK_ENTRY (output_file), output_file_text);
+
+ g_signal_connect ((gpointer) output_file, "changed",
+ G_CALLBACK (on_output_file_changed),
+ conv);
+
+ // fill preview on window launch
+ g_signal_connect ((gpointer) conv->converter, "realize",
+ G_CALLBACK (on_converter_realize),
+ (void *)output_file_text);
+
+
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (conv->converter, "preserve_folders")), deadbeef->conf_get_int ("converter.preserve_folder_structure", 0));
+
 int write_to_source_folder = deadbeef->conf_get_int ("converter.write_to_source_folder", 0);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (conv->converter, "write_to_source_folder")), write_to_source_folder);
 
+ int bypass_same_format = deadbeef->conf_get_int ("converter.bypass_same_format", 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (conv->converter, "bypass_same_format")), bypass_same_format);
+
+ int retag_after_copy = deadbeef->conf_get_int ("converter.retag_after_copy", 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (conv->converter, "retag_after_copy")), retag_after_copy);
+ gtk_widget_set_sensitive (lookup_widget (conv->converter, "retag_after_copy"), bypass_same_format);
+
 g_signal_connect ((gpointer) lookup_widget (conv->converter, "write_to_source_folder"), "toggled",
 G_CALLBACK (on_write_to_source_folder_toggled),
 conv);
@@ -464,6 +628,7 @@
 combo = GTK_COMBO_BOX (lookup_widget (conv->converter, "overwrite_action"));
 gtk_combo_box_set_active (combo, deadbeef->conf_get_int ("converter.overwrite_action", 0));
 
+
 for (;;) {
 int response = gtk_dialog_run (GTK_DIALOG (conv->converter));
 if (response == GTK_RESPONSE_OK) {
@@ -492,7 +657,7 @@
 }
 
 static int
-converter_show (DB_plugin_action_t *act, int ctx) {
+converter_show (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 if (converter_active) {
 return -1;
 }
@@ -515,6 +680,8 @@
 {
 GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (current_ctx->converter, "encoder"));
 int act = gtk_combo_box_get_active (combo);
+ // update preview to show new filename extensions
+ preview_update (NULL);
 deadbeef->conf_set_int ("converter.encoder_preset", act);
 deadbeef->conf_save ();
 }
@@ -577,6 +744,7 @@
 on_output_folder_changed (GtkEntry *entry,
 gpointer user_data)
 {
+ preview_timeout_add ();
 deadbeef->conf_set_str ("converter.output_folder", gtk_entry_get_text (entry));
 deadbeef->conf_save ();
 }
@@ -642,10 +810,18 @@
 }
 
 void
+on_converter_realize (GtkWidget *widget,
+ gpointer user_data)
+{
+ preview_timeout_add ();
+}
+
+void
 on_output_file_changed (GtkEntry *entry,
 gpointer user_data)
 {
- deadbeef->conf_set_str ("converter.output_file", gtk_entry_get_text (entry));
+ preview_timeout_add ();
+ deadbeef->conf_set_str ("converter.output_file_tf", gtk_entry_get_text (entry));
 deadbeef->conf_save ();
 }
 
@@ -653,6 +829,7 @@
 on_preserve_folders_toggled (GtkToggleButton *togglebutton,
 gpointer user_data)
 {
+ preview_update (NULL);
 deadbeef->conf_set_int ("converter.preserve_folder_structure", gtk_toggle_button_get_active (togglebutton));
 deadbeef->conf_save ();
 }
@@ -661,13 +838,34 @@
 on_write_to_source_folder_toggled (GtkToggleButton *togglebutton,
 gpointer user_data)
 {
+ preview_update (NULL);
 int active = gtk_toggle_button_get_active (togglebutton);
 converter_ctx_t *conv = user_data;
 deadbeef->conf_set_int ("converter.write_to_source_folder", active);
 gtk_widget_set_sensitive (lookup_widget (conv->converter, "output_folder"), !active);
 gtk_widget_set_sensitive (lookup_widget (conv->converter, "preserve_folders"), !active);
+ deadbeef->conf_save ();
 }
 
+void
+on_bypass_same_format_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (togglebutton);
+ deadbeef->conf_set_int ("converter.bypass_same_format", active);
+ deadbeef->conf_save ();
+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (togglebutton));
+ gtk_widget_set_sensitive (lookup_widget (toplevel, "retag_after_copy"), active);
+}
+
+void
+on_retag_after_copy_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (togglebutton);
+ deadbeef->conf_set_int ("converter.retag_after_copy", active);
+ deadbeef->conf_save ();
+}
 
 DB_decoder_t *
 plug_get_decoder_for_id (const char *id) {
@@ -701,6 +899,7 @@
 p->tag_apev2 = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "apev2")));
 p->tag_flac = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "flac")));
 p->tag_oggvorbis = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "oggvorbis")));
+ p->tag_mp4 = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "mp4")));
 }
 
 int
@@ -729,6 +928,7 @@
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "apev2")), p->tag_apev2);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "flac")), p->tag_flac);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "oggvorbis")), p->tag_oggvorbis);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "mp4")), p->tag_mp4);
 
 ddb_encoder_preset_t *old = p;
 int r = GTK_RESPONSE_CANCEL;
@@ -754,7 +954,7 @@
 if (!err) {
 if (old->title && strcmp (p->title, old->title)) {
 char path1024;
- if (snprintf (path, sizeof (path), "%s/presets/encoders/%s.txt", deadbeef->get_config_dir (), old->title) > 0) {
+ if (snprintf (path, sizeof (path), "%s/presets/encoders/%s.txt", deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG), old->title) > 0) {
 unlink (path);
 }
 }
@@ -779,7 +979,7 @@
 }
 break;
 }
- 
+
 gtk_widget_destroy (dlg);
 return r;
 }
@@ -894,7 +1094,7 @@
 gtk_widget_destroy (dlg);
 if (response == GTK_RESPONSE_YES) {
 char path1024;
- if (snprintf (path, sizeof (path), "%s/presets/encoders/%s.txt", deadbeef->get_config_dir (), p->title) > 0) {
+ if (snprintf (path, sizeof (path), "%s/presets/encoders/%s.txt", deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG), p->title) > 0) {
 unlink (path);
 }
 
@@ -906,12 +1106,16 @@
 }
 }
 
+static GtkWidget *encpreset_dialog;
+
 static void
 on_encoder_preset_cursor_changed (GtkTreeView *treeview,
 gpointer user_data) {
- GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (treeview));
- GtkWidget *edit = lookup_widget (toplevel, "edit");
- GtkWidget *remove = lookup_widget (toplevel, "remove");
+ if (!encpreset_dialog) {
+ return;
+ }
+ GtkWidget *edit = lookup_widget (encpreset_dialog, "edit");
+ GtkWidget *remove = lookup_widget (encpreset_dialog, "remove");
 
 GtkTreePath *path;
 GtkTreeViewColumn *col;
@@ -956,6 +1160,12 @@
 return;
 }
 converter_plugin->encoder_preset_copy (current_ctx->current_encoder_preset, p);
+ // FIXME: this is a hack to prevent deleting the original preset after
+ // copying. Needs a proper fix.
+ if (current_ctx->current_encoder_preset->title) {
+ free (current_ctx->current_encoder_preset->title);
+ current_ctx->current_encoder_preset->title = NULL;
+ }
 
 if (GTK_RESPONSE_OK == edit_encoder_preset (_("Add new encoder"), toplevel)) {
 converter_plugin->encoder_preset_append (current_ctx->current_encoder_preset);
@@ -971,6 +1181,7 @@
 gpointer user_data)
 {
 GtkWidget *dlg = create_preset_list ();
+ encpreset_dialog = dlg;
 gtk_window_set_title (GTK_WINDOW (dlg), _("Encoders"));
 gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (current_ctx->converter));
 g_signal_connect ((gpointer)lookup_widget (dlg, "add"), "clicked", G_CALLBACK (on_encoder_preset_add), NULL);
@@ -997,6 +1208,7 @@
 on_encoder_preset_cursor_changed (GTK_TREE_VIEW (list), NULL);
 gtk_dialog_run (GTK_DIALOG (dlg));
 gtk_widget_destroy (dlg);
+ encpreset_dialog = NULL;
 }
 
 ///// dsp preset gui
@@ -1312,6 +1524,12 @@
 }
 
 if (!err) {
+ if (current_ctx->current_dsp_preset->title && strcmp (title, current_ctx->current_dsp_preset->title)) {
+ char path1024;
+ if (snprintf (path, sizeof (path), "%s/presets/dsp/%s.txt", deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG), current_ctx->current_dsp_preset->title) > 0) {
+ unlink (path);
+ }
+ }
 if (current_ctx->current_dsp_preset->title) {
 free (current_ctx->current_dsp_preset->title);
 }
@@ -1381,7 +1599,7 @@
 {
 
 current_ctx->current_dsp_preset = converter_plugin->dsp_preset_alloc ();
- 
+
 GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
 
 if (GTK_RESPONSE_OK == edit_dsp_preset (_("New DSP Preset"), toplevel, NULL)) {
@@ -1422,6 +1640,13 @@
 }
 converter_plugin->dsp_preset_copy (current_ctx->current_dsp_preset, p);
 
+ // FIXME: this is a hack to prevent deleting the original preset after
+ // copying. Needs a proper fix.
+ if (current_ctx->current_dsp_preset->title) {
+ free (current_ctx->current_dsp_preset->title);
+ current_ctx->current_dsp_preset->title = NULL;
+ }
+
 if (GTK_RESPONSE_OK == edit_dsp_preset (_("New DSP Preset"), toplevel, NULL)) {
 converter_plugin->dsp_preset_append (current_ctx->current_dsp_preset);
 GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (current_ctx->converter, "dsp_preset"));
@@ -1465,7 +1690,7 @@
 gtk_widget_destroy (dlg);
 if (response == GTK_RESPONSE_YES) {
 char path1024;
- if (snprintf (path, sizeof (path), "%s/presets/dsp/%s.txt", deadbeef->get_config_dir (), p->title) > 0) {
+ if (snprintf (path, sizeof (path), "%s/presets/dsp/%s.txt", deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG), p->title) > 0) {
 unlink (path);
 }
 
@@ -1564,7 +1789,7 @@
 title_formatting_help_link_create (gchar *widget_name, gchar *string1, gchar *string2,
 gint int1, gint int2)
 {
- GtkWidget *link = gtk_link_button_new_with_label ("http://github.com/Alexey-Yakovenko/deadbeef/wiki/Title-formatting", _("Help"));
+ GtkWidget *link = gtk_link_button_new_with_label ("http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0", _("Help"));
 return link;
 }
 
@@ -1572,7 +1797,7 @@
 encoder_cmdline_help_link_create (gchar *widget_name, gchar *string1, gchar *string2,
 gint int1, gint int2)
 {
- GtkWidget *link = gtk_link_button_new_with_label ("http://github.com/Alexey-Yakovenko/deadbeef/wiki/Encoder-Command-Line", _("Help"));
+ GtkWidget *link = gtk_link_button_new_with_label ("http://github.com/DeaDBeeF-Player/deadbeef/wiki/Encoder-Command-Line", _("Help"));
 return link;
 }
 
@@ -1590,7 +1815,7 @@
 return &convert_action;
 }
 
-int
+static int
 convgui_connect (void) {
 gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id (DDB_GTKUI_PLUGIN_ID);
 converter_plugin = (ddb_converter_t *)deadbeef->plug_get_for_id ("converter");
@@ -1602,49 +1827,75 @@
 fprintf (stderr, "convgui: converter plugin not found\n");
 return -1;
 }
- if (!PLUG_TEST_COMPAT(&converter_plugin->misc.plugin, 1, 3)) {
- fprintf (stderr, "convgui: need converter>=1.3, but found %d.%d\n", converter_plugin->misc.plugin.version_major, converter_plugin->misc.plugin.version_minor);
+#define REQ_CONV_VERSION 4
+ if (!PLUG_TEST_COMPAT(&converter_plugin->misc.plugin, 1, REQ_CONV_VERSION)) {
+ fprintf (stderr, "convgui: need converter>=1.%d, but found %d.%d\n", REQ_CONV_VERSION, converter_plugin->misc.plugin.version_major, converter_plugin->misc.plugin.version_minor);
 return -1;
 }
 return 0;
 }
 
+static void
+import_legacy_tf (const char *key_from, const char *key_to) {
+ deadbeef->conf_lock ();
+ if (!deadbeef->conf_get_str_fast (key_to, NULL)
+ && deadbeef->conf_get_str_fast (key_from, NULL)) {
+ char old200, new200;
+ deadbeef->conf_get_str (key_from, "", old, sizeof (old));
+ deadbeef->tf_import_legacy (old, new, sizeof (new));
+ deadbeef->conf_set_str (key_to, new);
+ }
+ deadbeef->conf_unlock ();
+}
+
+static int
+convgui_start (void) {
+ import_legacy_tf ("converter.output_file", "converter.output_file_tf");
+ return 0;
+}
+
 DB_misc_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 5,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 2,
 .plugin.type = DB_PLUGIN_MISC,
 #if GTK_CHECK_VERSION(3,0,0)
- .plugin.name = "Converter GTK3 UI",
+ .plugin.id = "converter-gtk3",
 #else
- .plugin.name = "Converter GTK2 UI",
+ .plugin.id = "converter-gtk2",
 #endif
+ .plugin.name = "Converter UI",
 .plugin.descr = "GTK User interface for the Converter plugin\n"
 "Usage:\n"
 "· select some tracks in playlist\n"
 "· right click\n"
 "· select «Convert»\n",
- .plugin.copyright = 
- "Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ .plugin.copyright =
+ "Converter UI for DeaDBeeF Player\n"
+ "Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\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"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\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"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\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"
+ "3. This notice may not be removed or altered from any source distribution.\n"
 ,
 .plugin.website = "http://deadbeef.sf.net",
 .plugin.get_actions = convgui_get_actions,
 .plugin.connect = convgui_connect,
+ .plugin.start = convgui_start,
 };
 
 DB_plugin_t *

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/AAC_VBR_192Kbps_(Nero_FAAC).txt Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/AAC_VBR_256Kbps_(Nero_FAAC).txt Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/AAC_VBR_320Kbps_(Nero_FAAC).txt Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/ALAC.txt Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/FLAC_(compression_level_5).txt Changed

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/File_Copy.txt Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/File_Move.txt Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/MP3_CBR_320_Kbps_(Lame).txt Changed

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/MP3_VBR_192Kbps_(Lame).txt Changed

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/MS_RIFF_WAV.txt Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/MusePack.txt Changed

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/Ogg_FLAC.txt Changed

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/Ogg_VBR_192Kbps.txt Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/Ogg_VBR_256Kbps.txt Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/Ogg_VBR_320Kbps.txt Added

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/Opus.txt Changed

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/TTA.txt Changed

deadbeef-1.9.6.tar.bz2/plugins/converter/convpresets/WavPack.txt Changed

deadbeef-0.6.2.tar.bz2/plugins/converter/interface.c -> deadbeef-1.9.6.tar.bz2/plugins/converter/interface.c Changed

@@ -31,6 +31,7 @@
 {
 GtkWidget *converterdlg;
 GtkWidget *dialog_vbox6;
+ GtkWidget *hbox105;
 GtkWidget *vbox26;
 GtkWidget *hbox67;
 GtkWidget *label103;
@@ -39,6 +40,8 @@
 GtkWidget *converter_output_browse;
 GtkWidget *write_to_source_folder;
 GtkWidget *preserve_folders;
+ GtkWidget *bypass_same_format;
+ GtkWidget *retag_after_copy;
 GtkWidget *hbox100;
 GtkWidget *label122;
 GtkWidget *hbox101;
@@ -66,11 +69,14 @@
 GtkWidget *hbox99;
 GtkWidget *label121;
 GtkWidget *overwrite_action;
+ GtkWidget *scrolledwindow9;
+ GtkWidget *preview_tree;
 GtkWidget *dialog_action_area5;
 GtkWidget *converter_cancel;
 GtkWidget *converter_ok;
 
 converterdlg = gtk_dialog_new ();
+ gtk_widget_set_size_request (converterdlg, 720, -1);
 gtk_window_set_title (GTK_WINDOW (converterdlg), "Converter");
 gtk_window_set_position (GTK_WINDOW (converterdlg), GTK_WIN_POS_MOUSE);
 gtk_window_set_modal (GTK_WINDOW (converterdlg), TRUE);
@@ -81,9 +87,13 @@
 dialog_vbox6 = gtk_dialog_get_content_area (GTK_DIALOG (converterdlg));
 gtk_widget_show (dialog_vbox6);
 
+ hbox105 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox105);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox6), hbox105, TRUE, TRUE, 0);
+
 vbox26 = gtk_vbox_new (FALSE, 8);
 gtk_widget_show (vbox26);
- gtk_box_pack_start (GTK_BOX (dialog_vbox6), vbox26, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox105), vbox26, FALSE, TRUE, 0);
 gtk_container_set_border_width (GTK_CONTAINER (vbox26), 12);
 
 hbox67 = gtk_hbox_new (FALSE, 8);
@@ -115,9 +125,17 @@
 gtk_widget_show (preserve_folders);
 gtk_box_pack_start (GTK_BOX (vbox26), preserve_folders, FALSE, FALSE, 0);
 
+ bypass_same_format = gtk_check_button_new_with_mnemonic (_("Copy if the format is not changing"));
+ gtk_widget_show (bypass_same_format);
+ gtk_box_pack_start (GTK_BOX (vbox26), bypass_same_format, FALSE, FALSE, 0);
+
+ retag_after_copy = gtk_check_button_new_with_mnemonic (_("Re-tag after copy"));
+ gtk_widget_show (retag_after_copy);
+ gtk_box_pack_start (GTK_BOX (vbox26), retag_after_copy, FALSE, FALSE, 0);
+
 hbox100 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox100);
- gtk_box_pack_start (GTK_BOX (vbox26), hbox100, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox26), hbox100, FALSE, TRUE, 0);
 
 label122 = gtk_label_new (_("Output file name:"));
 gtk_widget_show (label122);
@@ -130,7 +148,7 @@
 output_file = gtk_entry_new ();
 gtk_widget_show (output_file);
 gtk_box_pack_start (GTK_BOX (hbox101), output_file, TRUE, TRUE, 0);
- gtk_widget_set_tooltip_text (output_file, _("Extension (e.g. .mp3) will be appended automatically.\nLeave the field empty for default (%a - %t)."));
+ gtk_widget_set_tooltip_text (output_file, _("Extension (e.g. .mp3) will be appended automatically.\nLeave the field empty for default (%tracknumber%. %artist% - %title%)."));
 gtk_entry_set_invisible_char (GTK_ENTRY (output_file), 8226);
 
 custom6 = title_formatting_help_link_create ("custom6", "", "", 0, 0);
@@ -141,7 +159,7 @@
 
 hbox69 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox69);
- gtk_box_pack_start (GTK_BOX (vbox26), hbox69, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox26), hbox69, FALSE, TRUE, 0);
 
 label104 = gtk_label_new (_("Encoder:"));
 gtk_widget_show (label104);
@@ -219,7 +237,7 @@
 
 hbox99 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox99);
- gtk_box_pack_start (GTK_BOX (vbox26), hbox99, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox26), hbox99, FALSE, TRUE, 0);
 
 label121 = gtk_label_new (_("When file exists:"));
 gtk_widget_show (label121);
@@ -228,9 +246,21 @@
 overwrite_action = gtk_combo_box_text_new ();
 gtk_widget_show (overwrite_action);
 gtk_box_pack_start (GTK_BOX (hbox99), overwrite_action, TRUE, TRUE, 0);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (overwrite_action), _("Skip"));
 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (overwrite_action), _("Prompt"));
 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (overwrite_action), _("Overwrite"));
 
+ scrolledwindow9 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwindow9);
+ gtk_box_pack_start (GTK_BOX (hbox105), scrolledwindow9, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow9), 12);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow9), GTK_SHADOW_IN);
+
+ preview_tree = gtk_tree_view_new ();
+ gtk_widget_show (preview_tree);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow9), preview_tree);
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (preview_tree), TRUE);
+
 dialog_action_area5 = gtk_dialog_get_action_area (GTK_DIALOG (converterdlg));
 gtk_widget_show (dialog_action_area5);
 gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area5), GTK_BUTTONBOX_END);
@@ -254,8 +284,11 @@
 g_signal_connect ((gpointer) preserve_folders, "toggled",
 G_CALLBACK (on_preserve_folders_toggled),
 NULL);
- g_signal_connect ((gpointer) output_file, "changed",
- G_CALLBACK (on_output_file_changed),
+ g_signal_connect ((gpointer) bypass_same_format, "toggled",
+ G_CALLBACK (on_bypass_same_format_toggled),
+ NULL);
+ g_signal_connect ((gpointer) retag_after_copy, "toggled",
+ G_CALLBACK (on_retag_after_copy_toggled),
 NULL);
 g_signal_connect ((gpointer) encoder, "changed",
 G_CALLBACK (on_converter_encoder_changed),
@@ -282,6 +315,7 @@
 /* Store pointers to all widgets, for use by lookup_widget(). */
 GLADE_HOOKUP_OBJECT_NO_REF (converterdlg, converterdlg, "converterdlg");
 GLADE_HOOKUP_OBJECT_NO_REF (converterdlg, dialog_vbox6, "dialog_vbox6");
+ GLADE_HOOKUP_OBJECT (converterdlg, hbox105, "hbox105");
 GLADE_HOOKUP_OBJECT (converterdlg, vbox26, "vbox26");
 GLADE_HOOKUP_OBJECT (converterdlg, hbox67, "hbox67");
 GLADE_HOOKUP_OBJECT (converterdlg, label103, "label103");
@@ -290,6 +324,8 @@
 GLADE_HOOKUP_OBJECT (converterdlg, converter_output_browse, "converter_output_browse");
 GLADE_HOOKUP_OBJECT (converterdlg, write_to_source_folder, "write_to_source_folder");
 GLADE_HOOKUP_OBJECT (converterdlg, preserve_folders, "preserve_folders");
+ GLADE_HOOKUP_OBJECT (converterdlg, bypass_same_format, "bypass_same_format");
+ GLADE_HOOKUP_OBJECT (converterdlg, retag_after_copy, "retag_after_copy");
 GLADE_HOOKUP_OBJECT (converterdlg, hbox100, "hbox100");
 GLADE_HOOKUP_OBJECT (converterdlg, label122, "label122");
 GLADE_HOOKUP_OBJECT (converterdlg, hbox101, "hbox101");
@@ -316,6 +352,8 @@
 GLADE_HOOKUP_OBJECT (converterdlg, hbox99, "hbox99");
 GLADE_HOOKUP_OBJECT (converterdlg, label121, "label121");
 GLADE_HOOKUP_OBJECT (converterdlg, overwrite_action, "overwrite_action");
+ GLADE_HOOKUP_OBJECT (converterdlg, scrolledwindow9, "scrolledwindow9");
+ GLADE_HOOKUP_OBJECT (converterdlg, preview_tree, "preview_tree");
 GLADE_HOOKUP_OBJECT_NO_REF (converterdlg, dialog_action_area5, "dialog_action_area5");
 GLADE_HOOKUP_OBJECT (converterdlg, converter_cancel, "converter_cancel");
 GLADE_HOOKUP_OBJECT (converterdlg, converter_ok, "converter_ok");
@@ -354,6 +392,7 @@
 GtkWidget *hbox104;
 GtkWidget *id3v2;
 GtkWidget *id3v2_version;
+ GtkWidget *mp4;
 GtkWidget *label125;
 GtkWidget *dialog_action_area6;
 GtkWidget *convpreset_cancel;
@@ -444,7 +483,8 @@
 gtk_widget_show (method);
 gtk_box_pack_start (GTK_BOX (hbox73), method, TRUE, TRUE, 0);
 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (method), _("Pipe"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (method), _("Temporary file"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (method), _("Temp File"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (method), _("Source File"));
 
 frame9 = gtk_frame_new (NULL);
 gtk_widget_show (frame9);
@@ -501,6 +541,12 @@
 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id3v2_version), "2.3");
 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (id3v2_version), "2.4");
 
+ mp4 = gtk_check_button_new_with_mnemonic (_("MP4"));
+ gtk_widget_show (mp4);
+ gtk_table_attach (GTK_TABLE (table2), mp4, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
 label125 = gtk_label_new (_("Tag writer"));
 gtk_widget_show (label125);
 gtk_frame_set_label_widget (GTK_FRAME (frame9), label125);
@@ -553,6 +599,7 @@
 GLADE_HOOKUP_OBJECT (convpreset_editor, hbox104, "hbox104");
 GLADE_HOOKUP_OBJECT (convpreset_editor, id3v2, "id3v2");
 GLADE_HOOKUP_OBJECT (convpreset_editor, id3v2_version, "id3v2_version");
+ GLADE_HOOKUP_OBJECT (convpreset_editor, mp4, "mp4");
 GLADE_HOOKUP_OBJECT (convpreset_editor, label125, "label125");
 GLADE_HOOKUP_OBJECT_NO_REF (convpreset_editor, dialog_action_area6, "dialog_action_area6");
 GLADE_HOOKUP_OBJECT (convpreset_editor, convpreset_cancel, "convpreset_cancel");

deadbeef-0.6.2.tar.bz2/plugins/coreaudio/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/coreaudio/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/coreaudio/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/coreaudio/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/coreaudio/coreaudio.c -> deadbeef-1.9.6.tar.bz2/plugins/coreaudio/coreaudio.c Changed

@@ -1,318 +1,745 @@
 /*
-	CoreAudio Output Deadbeef Plugin
-	Copyright (c) 2011-2013 Carlos Nunes <carloslnunes@gmail.com>
- 
-	This plugin 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 of the License, or (at your option) any later version.
- 
-	This plugin is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-	Lesser General Public License for more details.
- 
-	You should have received a copy of the GNU Lesser General Public
-	License along with this library; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- 
- */
-
-#include "../../deadbeef.h"
-
-#include <AudioUnit/AudioUnit.h> // AudioUnit
-#include <CoreAudio/CoreAudio.h>		// AudioDeviceID
-#include <AudioToolbox/AudioFormat.h> // AudioFormatGetProperty
-#include <CoreServices/CoreServices.h>
-
-
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
+ DeaDBeeF CoreAudio output plugin
+ Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
 
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <deadbeef/deadbeef.h>
+#include "coreaudio.h"
+#include <AudioUnit/AudioUnit.h>
+#include <AudioToolbox/AudioToolbox.h>
+#include <IOKit/pwr_mgt/IOPMLib.h>
+
+static DB_functions_t *deadbeef;
 static DB_output_t plugin;
-DB_functions_t *deadbeef;
 
-static int state; // playing/stopped/paused
-static AudioUnit output_unit; // output unit for the audio
-static int au_state;
+#define trace(...) { deadbeef->log_detailed (&plugin.plugin, DDB_LOG_LAYER_INFO, __VA_ARGS__); }
 
-static int
-coreaudio_plugin_start (void) {
-	
-	// This is a largely undocumented but absolutely necessary
-	// requirement starting with OS-X 10.6. If not called, queries and
-	// updates to various audio device properties are not handled
-	// correctly.
-	// Many thanks to the rtaudio project for documenting this.
-	CFRunLoopRef theRunLoop = NULL;
-	AudioObjectPropertyAddress property = { kAudioHardwarePropertyRunLoop, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
-	OSStatus err = AudioObjectSetPropertyData( kAudioObjectSystemObject, &property, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
-	if (err) { trace ("AudioObjectSetPropertyData-plugin_start= %s\n", GetMacOSStatusErrorString(err) ); return -1; }
-
-	au_state = 0;
-	
-	return 0;
+static ddb_playback_state_t state = DDB_PLAYBACK_STATE_STOPPED;
+static uint64_t mutex;
+
+static AudioDeviceID device_id;
+static AudioDeviceIOProcID process_id;
+static AudioStreamBasicDescription default_format;
+static AudioStreamBasicDescription req_format;
+
+static int *avail_samplerates;
+static int num_avail_samplerates;
+
+static OSStatus
+ca_fmtchanged (AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress* inAddresses, void* inClientData);
+
+static OSStatus
+ca_buffer_callback(AudioDeviceID inDevice, const AudioTimeStamp * inNow, const AudioBufferList * inInputData, const AudioTimeStamp * inInputTime, AudioBufferList * outOutputData, const AudioTimeStamp * inOutputTime, void * inClientData);
+
+static ddb_playback_state_t
+ca_state (void);
+
+static void
+ca_set_state(ddb_playback_state_t st);
+
+static int ca_free (void);
+static int ca_init (void);
+static int ca_play (void);
+static int ca_pause (void);
+
+static UInt32
+GetNumberAvailableNominalSampleRateRanges(void)
+{
+ UInt32 theAnswer = 0;
+ AudioObjectPropertyAddress theAddress = {
+ kAudioDevicePropertyAvailableNominalSampleRates,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMaster
+ };
+ UInt32 theSize = 0;
+
+ OSStatus err = AudioObjectGetPropertyDataSize(device_id, &theAddress, 0, NULL, &theSize);
+ if (err != noErr) {
+ trace ("AudioObjectGetPropertyDataSize kAudioDevicePropertyAvailableNominalSampleRates %x", err);
+ return 0;
+ }
+ theAnswer = theSize / sizeof(AudioValueRange);
+ return theAnswer;
 }
 
-static int
-coreaudio_plugin_stop (void) {
-	return 0;
+static void
+get_avail_samplerates(void)
+{
+ AudioObjectPropertyAddress theAddress = {
+ kAudioDevicePropertyAvailableNominalSampleRates,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMaster
+ };
+
+ UInt32 num = GetNumberAvailableNominalSampleRateRanges ();
+ if (num > 0) {
+ AudioValueRange *nsrs = calloc (num, sizeof(AudioValueRange));
+ UInt32 dataSize = num * sizeof(AudioValueRange);
+ AudioObjectGetPropertyData(device_id, &theAddress, 0, NULL, &dataSize, nsrs);
+
+ avail_samplerates = malloc (sizeof (int) * num);
+ for (int i = 0; i < (int)num; i++) {
+ avail_sampleratesi = (int)nsrsi.mMinimum;
+ }
+ num_avail_samplerates = num;
+ free (nsrs);
+ }
 }
 
 int
-coreaudio_set_data_format(ddb_waveformat_t *fmt) {
-
-	AudioStreamBasicDescription streamFormat;
-	
-	 // lets assume that if it has more than one channel it is interleaved
-	bool inIsNonInterleaved = false;
-	if (fmt->channels == 1)
-		inIsNonInterleaved = true;
-	
-	UInt32 flags = (fmt->is_float ? kAudioFormatFlagIsFloat : kAudioFormatFlagIsSignedInteger) |
-					(fmt->is_bigendian ? ((UInt32)kAudioFormatFlagIsBigEndian) : 0) |
-					((!(fmt->is_float) ) ?
- 			kAudioFormatFlagIsPacked : kAudioFormatFlagIsAlignedHigh) |
-					(inIsNonInterleaved ? ((UInt32)kAudioFormatFlagIsNonInterleaved) : 0);
-	
-	streamFormat.mSampleRate = fmt->samplerate;
- streamFormat.mFormatID = kAudioFormatLinearPCM;
- streamFormat.mFormatFlags = flags;
- streamFormat.mBytesPerPacket = (inIsNonInterleaved ? 1 : fmt->channels) * (fmt->bps/8);
- streamFormat.mFramesPerPacket = 1;
- streamFormat.mBytesPerFrame = (inIsNonInterleaved ? 1 : fmt->channels) * (fmt->bps/8);
- streamFormat.mChannelsPerFrame = fmt->channels;
- streamFormat.mBitsPerChannel = fmt->bps;
-		
-	OSStatus err = noErr;
-	err = AudioUnitSetProperty (output_unit,
-								kAudioUnitProperty_StreamFormat,
-								kAudioUnitScope_Input,
-								0,
-								&streamFormat,
-								sizeof(streamFormat));
-	if (err) { trace ("AudioUnitSetProperty-SF= %s\n", GetMacOSStatusErrorString(err) ); return -1; }
-	
- return 0;
-}
+get_best_samplerate (int samplerate, int *all_samplerates, int count) {
+ int64_t nearest = 0;
+ int index = -1;
 
-/* data callback for the audio unit */
-OSStatus
-coreaudio_callback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData)
-{
-	
-	if(ioData == NULL && ioData->mNumberBuffers < 1)
-	{ trace ("no buffers\n"); return -1; /* not an OSStatus but it is not that important... */ }
-
-	int sample_size = plugin.fmt.channels * (plugin.fmt.bps / 8);
-	int block_size = ioData->mBuffers0.mDataByteSize;
-	int mod = block_size % sample_size;
-	if ( mod > 0)
-		block_size -= mod; // should not happen but just in case...
-		
-	char * buffer = NULL;
-	buffer = (char*) malloc( block_size );
-	memset(buffer, 0, block_size);
-	
-	deadbeef->streamer_read( buffer, block_size); // fetching the data from stream
-		
-	for (int i = 0; i < ioData->mNumberBuffers; ++i) {
-		
-		AudioBuffer audio_buffer = ioData->mBuffersi;
-		void * frame_buffer = audio_buffer.mData;
-		void * stream_buffer = buffer;
-		
-		memcpy(frame_buffer, stream_buffer, audio_buffer.mDataByteSize);
-	}
-
-	free(buffer);
-	
-	return noErr;
+ for (int i = 0; i < count; i++) {
+ // score is based on distance and modulo, with slightly more weight put on distance
+ int64_t dist = llabs(all_sampleratesi - samplerate);
+ int64_t mod = samplerate > all_sampleratesi ? (samplerate % all_sampleratesi) : (all_sampleratesi % samplerate);
+ int64_t score = dist*2+mod;
+
+ // upscaling is generally better than downscaling
+ if (all_sampleratesi < samplerate) {
+ score *= 100;
+ }
+
+ if (index == -1 || score < nearest) {
+ nearest = score;
+ index = i;
+ }
+ }
+
+ return all_sampleratesindex;
 }
 
 static int
-coreaudio_init (void) {
- trace ("coreaudio_init\n");
-	
-	//selecting the default output unit
-	ComponentDescription desc;
-	desc.componentType = kAudioUnitType_Output;
-	desc.componentSubType = kAudioUnitSubType_DefaultOutput;
-	desc.componentManufacturer = kAudioUnitManufacturer_Apple;
-	desc.componentFlags = 0;
-	desc.componentFlagsMask = 0;
-	
-	OSStatus err = noErr;
-	Component comp = FindNextComponent(NULL, &desc);
-	if (comp == NULL) { trace ("FindNextComponent= failed to find the default output component.\n"); return -1; }
-	
-	err = OpenAComponent(comp, &output_unit);
-	if (comp == NULL) { trace ("OpenAComponent= %s\n", GetMacOSStatusErrorString(err)); return -1; }
-	
-	// filling out the description for linear PCM data (can only be called after opening audio component)
- if (coreaudio_set_data_format(&plugin.fmt) < 0)
-		return -1;
-	
-	// callback
-	AURenderCallbackStruct input_cb;
-	input_cb.inputProc = coreaudio_callback;
-	input_cb.inputProcRefCon = NULL;
-	
-	err = AudioUnitSetProperty(output_unit,
-							 kAudioUnitProperty_SetRenderCallback,
-							 kAudioUnitScope_Input,
-							 0,
-							 &input_cb,
-							 sizeof(input_cb));
-	if (err)
-		{ trace ("AudioUnitSetProperty-CB= %s\n", GetMacOSStatusErrorString(err)); return -1; }
-	
-	// Initialize unit
-	err = AudioUnitInitialize(output_unit);
-	if (err) { trace ("AudioUnitInitialize= %s\n", GetMacOSStatusErrorString(err)); return -1; }
-	
-	
-	au_state = 1; // audio unit initialised
- state = OUTPUT_STATE_STOPPED;
-	
-	return 0;
+ca_apply_format (void) {
+ int res = -1;
+ OSStatus err;
+ UInt32 sz;
+ deadbeef->mutex_lock (mutex);
+ if (req_format.mSampleRate > 0) {
+ req_format.mSampleRate = get_best_samplerate ((int)req_format.mSampleRate, avail_samplerates, num_avail_samplerates);
+
+ AudioObjectPropertyAddress theAddress = {
+ kAudioDevicePropertyStreamFormat,
+ kAudioDevicePropertyScopeOutput,
+ kAudioObjectPropertyElementMaster
+ };
+ sz = sizeof (AudioStreamBasicDescription);
+
+ // NOTE: for unsupported formats, this call may cause bogus messages to appear in console / debug output.
+ err = AudioObjectSetPropertyData(device_id, &theAddress, 0, NULL, sz, &req_format);
+ if (err != noErr && req_format.mChannelsPerFrame == 1) {
+ req_format.mChannelsPerFrame = 2;
+ req_format.mBytesPerFrame *= 2;
+ req_format.mBytesPerPacket *= 2;
+ err = AudioObjectSetPropertyData(device_id, &theAddress, 0, NULL, sz, &req_format);
+ }
+ if (err != noErr) {
+ err = AudioObjectSetPropertyData(device_id, &theAddress, 0, NULL, sz, &default_format);
+ // ignore the result of this operation -- it may fail even when attempting to change to the same format that's current right now
+ }
+
+ ca_fmtchanged(device_id, 1, &theAddress, NULL);
+ }
+
+ res = 0;
+error:
+ deadbeef->mutex_unlock (mutex);
+ return res;
+}
+
+OSStatus propertiesChanged(AudioObjectID inObjectID,
+ UInt32 inNumberAddresses,
+ const AudioObjectPropertyAddress inAddresses,
+ void *inClientData) {
+ ddb_playback_state_t st = state;
+ ca_free ();
+ ca_init ();
+ if (st == DDB_PLAYBACK_STATE_PLAYING) {
+ ca_play();
+ }
+ else if (st == DDB_PLAYBACK_STATE_PAUSED) {
+ ca_pause();
+ }
+ return noErr;
+}
+
+static void
+ca_get_deviceid (void) {
+ device_id = 0;
+
+ char newdev100;
+ deadbeef->conf_get_str ("coreaudio_soundcard", "", newdev, sizeof (newdev));
+
+ AudioObjectPropertyAddress propertyAddress = {
+ kAudioHardwarePropertyDevices,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMaster
+ };
+
+ UInt32 dataSize = 0;
+ OSStatus status = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize);
+ if(kAudioHardwareNoError != status) {
+ trace ("AudioObjectGetPropertyDataSize (kAudioHardwarePropertyDevices) failed: %i\n", status);
+ return;
+ }
+
+ UInt32 deviceCount = dataSize / sizeof(AudioDeviceID);
+
+ AudioDeviceID *audioDevices = malloc(dataSize);
+
+ status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, audioDevices);
+ if(kAudioHardwareNoError != status) {
+ trace ("AudioObjectGetPropertyData (kAudioHardwarePropertyDevices) failed: %i\n", status);
+ free(audioDevices);
+ return;
+ }
+
+ // find device with specified name
+ propertyAddress.mScope = kAudioDevicePropertyScopeOutput;
+ for(UInt32 i = 0; i < deviceCount; ++i) {
+ // Query device name
+ CFStringRef deviceName = NULL;
+ dataSize = sizeof(deviceName);
+ propertyAddress.mSelector = kAudioDevicePropertyDeviceNameCFString;
+ status = AudioObjectGetPropertyData(audioDevicesi, &propertyAddress, 0, NULL, &dataSize, &deviceName);
+ if(kAudioHardwareNoError != status) {
+ trace ("AudioObjectGetPropertyData (kAudioDevicePropertyDeviceNameCFString) failed: %i\n", status);
+ continue;
+ }
+
+ char buf100;
+ CFStringGetCString(deviceName, buf, sizeof(buf), kCFStringEncodingUTF8);
+ CFRelease(deviceName);
+ if (!strcmp (buf, newdev)) {
+ device_id = audioDevicesi;
+ break;
+ }
+ }
+
+ free(audioDevices);
+
 }
 
 static int
-coreaudio_free(void) {
-	
-	trace("coreaudio_free\n");
-	
-	state = OUTPUT_STATE_STOPPED;
-	
-	if(!au_state) // audio unit already unintialized
-		return 0;
-	
-	OSStatus err = AudioUnitUninitialize (output_unit);
-	if (err) { trace ("AudioUnitUninitialize= %s\n", GetMacOSStatusErrorString(err)); return -1; }
-	au_state = 0;
-	
-	CloseComponent(output_unit);
-
-	return 0;
+ca_init (void) {
+ OSStatus err;
+ UInt32 sz;
+ char device_name128;
+ AudioObjectPropertyAddress theAddress = {
+ kAudioHardwarePropertyDefaultOutputDevice,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMaster
+ };
+
+ ca_free ();
+
+ ca_get_deviceid ();
+ if (device_id == 0) {
+ sz = sizeof(device_id);
+ err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &theAddress, 0, NULL, &sz, &device_id);
+ if (err != noErr) {
+ trace ("AudioObjectGetPropertyData kAudioHardwarePropertyDefaultOutputDevice: %x\n", err);
+ return -1;
+ }
+ }
+
+ get_avail_samplerates ();
+
+ sz = sizeof (device_name);
+ theAddress.mSelector = kAudioDevicePropertyDeviceName;
+ theAddress.mScope = kAudioDevicePropertyScopeOutput;
+ theAddress.mElement = kAudioObjectPropertyElementMaster;
+ 
+ err = AudioObjectGetPropertyData(device_id, &theAddress, 0, NULL, &sz, device_name);
+ if (err != noErr) {
+ trace ("AudioObjectGetPropertyData kAudioDevicePropertyDeviceName: %x\n", err);
+ return -1;
+ }
+
+ sz = sizeof (default_format);
+ theAddress.mSelector = kAudioDevicePropertyStreamFormat;
+ theAddress.mElement = kAudioObjectPropertyElementMaster;
+ err = AudioObjectGetPropertyData(device_id, &theAddress, 0, NULL, &sz, &default_format);
+ if (err != noErr) {
+ trace ("AudioObjectGetPropertyData kAudioDevicePropertyStreamFormat: %x\n", err);
+ return -1;
+ }
+
+ UInt32 bufsize = 1024;
+ sz = sizeof (bufsize);
+ theAddress.mSelector = kAudioDevicePropertyBufferFrameSize;
+ err = AudioObjectSetPropertyData(device_id, &theAddress, 0, NULL, sz, &bufsize);
+ if (err != noErr) {
+ // non-critical
+ trace ("AudioObjectSetPropertyData kAudioDevicePropertyBufferFrameSize: %x\n", err);
+ }
+
+ if (ca_apply_format ()) {
+ return -1;
+ }
+
+ err = AudioDeviceCreateIOProcID(device_id, ca_buffer_callback, NULL, &process_id);
+ if (err != noErr) {
+ trace ("AudioDeviceCreateIOProcID: %x\n", err);
+ return -1;
+ }
+
+ theAddress.mSelector = kAudioDevicePropertyStreamFormat;
+ 
+ err = AudioObjectAddPropertyListener(device_id, &theAddress, ca_fmtchanged, NULL);
+ if (err != noErr) {
+ trace ("AudioObjectAddPropertyListener kAudioDevicePropertyStreamFormat: %x\n", err);
+ return -1;
+ }
+
+ ca_fmtchanged(device_id, 1, &theAddress, NULL);
+
+ AudioObjectPropertyAddress outputDeviceAddress = {
+ kAudioHardwarePropertyDefaultOutputDevice,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMaster
+ };
+ AudioObjectAddPropertyListener(kAudioObjectSystemObject,
+ &outputDeviceAddress,
+ &propertiesChanged, nil);
+
+ UInt32 transportType = 0;
+ sz = sizeof (transportType);
+ theAddress.mScope = kAudioDevicePropertyScopeOutput;
+ theAddress.mElement = kAudioObjectPropertyElementMaster;
+ theAddress.mSelector = kAudioDevicePropertyTransportType;
+ err = AudioObjectGetPropertyData(device_id, &theAddress, 0, NULL, &sz, &transportType);
+ if (err != noErr) {
+ trace ("AudioObjectGetPropertyData kAudioDevicePropertyTransportType: %x\n", err);
+ return -1;
+ }
+
+
+ if (transportType == kAudioDeviceTransportTypeAirPlay) {
+ plugin.plugin.flags |= DDB_COREAUDIO_FLAG_AIRPLAY;
+ }
+ else {
+ plugin.plugin.flags &= ~DDB_COREAUDIO_FLAG_AIRPLAY;
+ }
+
+ state = DDB_PLAYBACK_STATE_STOPPED;
+
+ return 0;
 }
 
 static int
-coreaudio_play (void) {
-	
-	if (coreaudio_init() < 0)
-		return -1;
-	
-	OSStatus err = AudioOutputUnitStart (output_unit);
-	if (err) { trace ("AudioOutputUnitStart= %s\n", GetMacOSStatusErrorString(err)); return -1; }
-	
-	state = OUTPUT_STATE_PLAYING;	
-	return 0;
+ca_free (void) {
+ OSStatus err;
+ 
+ if (device_id != 0) {
+ deadbeef->mutex_lock (mutex);
+ AudioObjectPropertyAddress theAddress = { kAudioDevicePropertyStreamFormat,
+ kAudioDevicePropertyScopeOutput,
+ 0 };
+ 
+ err = AudioDeviceStop(device_id, ca_buffer_callback);
+ if (err != noErr) {
+ trace ("AudioDeviceStop: %x\n", err);
+ }
+ 
+ err = AudioObjectRemovePropertyListener(device_id, &theAddress, ca_fmtchanged, NULL);
+ if (err != noErr) {
+ trace ("AudioObjectRemovePropertyListener kAudioDevicePropertyStreamFormat: %x\n", err);
+ }
+
+ err = AudioDeviceDestroyIOProcID(device_id, process_id);
+ if (err != noErr) {
+ trace ("AudioDeviceDestroyIOProcID: %x\n", err);
+ }
+
+ if (avail_samplerates) {
+ free (avail_samplerates);
+ avail_samplerates = NULL;
+ }
+ num_avail_samplerates = 0;
+
+ process_id = 0;
+ device_id = 0;
+ deadbeef->mutex_unlock (mutex);
+ }
+ return 0;
 }
 
 static int
-coreaudio_stop(void) {
-	
-	trace("coreaudio_stop\n");
-
-	state = OUTPUT_STATE_STOPPED;
- deadbeef->streamer_reset(1);
-	
-	if(!au_state) // no audio unit to stop
-		return 0;
-	
-	OSStatus err = AudioOutputUnitStop (output_unit);
-	if (err) { trace ("AudioOutputUnitStop= %s\n", GetMacOSStatusErrorString(err)); return -1; }
-	
- return coreaudio_free();
+ca_setformat (ddb_waveformat_t *fmt) {
+ memset (&req_format, 0, sizeof (req_format));
+
+ int samplerate = fmt->samplerate;
+ int is_float = fmt->is_float;
+ int bps = fmt->bps;
+
+ memset (&req_format, 0, sizeof (req_format));
+ req_format.mSampleRate = (Float64)samplerate;
+
+ // audioqueue happily accepts ultra-high samplerates, but doesn't really play them
+ if (req_format.mSampleRate > 192000) {
+ req_format.mSampleRate = 192000;
+ }
+ req_format.mFormatID = kAudioFormatLinearPCM;
+
+ if (is_float) {
+ req_format.mFormatFlags = kAudioFormatFlagsNativeFloatPacked;
+ }
+ else {
+ req_format.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger | kLinearPCMFormatFlagIsPacked | kAudioFormatFlagsNativeEndian;
+ }
+
+ req_format.mBytesPerPacket = bps / 8 * fmt->channels;
+ req_format.mFramesPerPacket = 1;
+ req_format.mBytesPerFrame = bps / 8 * fmt->channels;
+ req_format.mChannelsPerFrame = fmt->channels;
+ req_format.mBitsPerChannel = bps;
+
+ if (device_id != 0) {
+ return ca_apply_format ();
+ }
+
+ return -1;
+}
+
+static IOPMAssertionID assertion_id = 0;
+static int sleep_prevented = 0;
+
+static void
+ca_prevent_sleep (void) {
+ if (sleep_prevented) {
+ return; // already preventing
+ }
+ IOPMAssertionID assertionID = 0;
+ CFStringRef reasonForActivity= CFSTR("Deadbeef playback");
+
+ IOReturn success = IOPMAssertionCreateWithName(kIOPMAssertionTypeNoIdleSleep,
+ kIOPMAssertionLevelOn, reasonForActivity, &assertionID);
+ if (success == kIOReturnSuccess) {
+ sleep_prevented = 1;
+ assertion_id = assertionID;
+ }
+}
+
+static void
+ca_allow_sleep (void) {
+ if (sleep_prevented) {
+ IOPMAssertionRelease(assertion_id);
+ assertion_id = 0;
+ sleep_prevented = 0;
+ }
 }
 
 static int
-coreaudio_pause(void) {
+ca_play (void) {
+ OSStatus err;
 
- state = OUTPUT_STATE_PAUSED;
-	AudioOutputUnitStop(output_unit);
+ if (device_id == 0) {
+ if (ca_init()) {
+ return -1;
+ }
+ }
+
+ ddb_playback_state_t current_state = ca_state();
+
+ if (current_state != DDB_PLAYBACK_STATE_PLAYING) {
+ err = AudioDeviceStart (device_id, ca_buffer_callback);
+ if (err != noErr) {
+ trace ("AudioDeviceStart: %x\n", err);
+ ca_set_state(DDB_PLAYBACK_STATE_STOPPED);
+ return -1;
+ }
+ ca_set_state(DDB_PLAYBACK_STATE_PLAYING);
+ }
+
+ ca_prevent_sleep ();
 
 return 0;
 }
 
 static int
-coreaudio_unpause(void) {
-	
-	trace("coreaudio_unpause\n");
-	
-	OSStatus err = AudioOutputUnitStart (output_unit);
-	if (err) { trace ("AudioOutputUnitStart= %s\n", GetMacOSStatusErrorString(err)); return -1; }
+ca_stop (void) {
+ ca_allow_sleep ();
+
+ OSStatus err;
+ if (device_id == 0) {
+ return 0;
+ }
+
+ ddb_playback_state_t curr_state = ca_state();
 
-	state = OUTPUT_STATE_PLAYING;
+ if (curr_state != DDB_PLAYBACK_STATE_STOPPED) {
+ err = AudioDeviceStop (device_id, ca_buffer_callback);
+ ca_set_state(DDB_PLAYBACK_STATE_STOPPED);
+ if (err != noErr) {
+ trace ("AudioDeviceStop: %x\n", err);
+ return -1;
+ }
+ }
 
-	return 0;
+ return 0;
 }
 
 static int
-coreaudio_setformat (ddb_waveformat_t *fmt) {
- trace ("coreaudio_setformat\n");
-	
- memcpy (&plugin.fmt, fmt, sizeof (ddb_waveformat_t));
-	
-	switch (state) {
-		case OUTPUT_STATE_STOPPED:
-			return coreaudio_stop ();
-		case OUTPUT_STATE_PLAYING:
-			return coreaudio_play ();
-		case OUTPUT_STATE_PAUSED:
-			if (0 != coreaudio_play ()) {
-				return -1;
-			}
-			if (0 != coreaudio_pause ()) {
-				return -1;
-			}
-			break;
- }
-	
+ca_pause (void) {
+ OSStatus err;
+ if (device_id == 0) {
+ if (ca_init()) {
+ return -1;
+ }
+ }
+
+ ddb_playback_state_t curr_state = ca_state();
+
+ if (curr_state != DDB_PLAYBACK_STATE_PAUSED) {
+ ca_set_state(DDB_PLAYBACK_STATE_PAUSED);
+ err = AudioDeviceStop (device_id, ca_buffer_callback);
+ if (err != noErr) {
+ trace ("AudioDeviceStop: %x\n", err);
+ ca_set_state(DDB_PLAYBACK_STATE_STOPPED);
+ return -1;
+ }
+ }
+ return 0;
+}
+
+static OSStatus
+ca_fmtchanged (AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress* inAddresses, void* inClientData) {
+ OSStatus err;
+ 
+ AudioStreamBasicDescription device_format;
+ UInt32 sz = sizeof (device_format);
+ AudioObjectPropertyAddress theAddress = {
+ kAudioDevicePropertyStreamFormat,
+ kAudioDevicePropertyScopeOutput,
+ kAudioObjectPropertyElementMaster
+ };
+
+ deadbeef->mutex_lock (mutex);
+ err = AudioObjectGetPropertyData(device_id, &theAddress, 0, NULL, &sz, &device_format);
+ if (err != noErr) {
+ trace ("AudioObjectGetPropertyData kAudioDevicePropertyStreamFormat: %x\n", err);
+ }
+ else {
+
+// trace ("requested %d, obtained %d\n", (int)req_format.mSampleRate, (int)device_format.mSampleRate);
+ plugin.fmt.bps = device_format.mBitsPerChannel;
+ plugin.fmt.channels = device_format.mChannelsPerFrame;
+ plugin.fmt.is_float = 1;
+ plugin.fmt.samplerate = (int)device_format.mSampleRate;
+ plugin.fmt.channelmask = 0;
+ for (int i = 0; i < plugin.fmt.channels; i++) {
+ plugin.fmt.channelmask |= (1<<i);
+ }
+ }
+ deadbeef->mutex_unlock (mutex);
+
+ return 0;
+}
+
+static OSStatus
+ca_buffer_callback(AudioDeviceID inDevice, const AudioTimeStamp * inNow, const AudioBufferList * inInputData, const AudioTimeStamp * inInputTime, AudioBufferList * outOutputData, const AudioTimeStamp * inOutputTime, void * inClientData) {
+
+ UInt32 sz;
+ char *buffer = outOutputData->mBuffers0.mData;
+ sz = outOutputData->mBuffers0.mDataByteSize;
+
+ deadbeef->mutex_lock (mutex);
+ int st = state;
+ deadbeef->mutex_unlock (mutex);
+
+ if (st == DDB_PLAYBACK_STATE_PLAYING && deadbeef->streamer_ok_to_read (-1)) {
+ int br = deadbeef->streamer_read (buffer, sz);
+ if (br < 0) {
+ br = 0;
+ }
+ if (br < (int)sz) {
+ memset (buffer+br, 0, sz-br);
+ }
+ }
+ else {
+ memset (buffer, 0, sz);
+ }
+
 return 0;
-	
 }
 
 static int
-coreaudio_get_state(void) {
-	return state;
+ca_unpause (void) {
+ return ca_play ();
 }
- 
-DB_plugin_t *
-coreaudio_load (DB_functions_t *api) {
- deadbeef = api;
- return DB_PLUGIN (&plugin);
+
+static ddb_playback_state_t
+ca_state (void) {
+ deadbeef->mutex_lock (mutex);
+ int ret = state;
+ deadbeef->mutex_unlock (mutex);
+ return ret;
+}
+
+static void
+ca_set_state(ddb_playback_state_t st) {
+ deadbeef->mutex_lock (mutex);
+ state = st;
+ deadbeef->mutex_unlock (mutex);
+}
+
+static void ca_enum_soundcards (void (*callback)(const char *name, const char *desc, void*), void *userdata) {
+ AudioObjectPropertyAddress propertyAddress = {
+ kAudioHardwarePropertyDevices,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMaster
+ };
+
+ UInt32 dataSize = 0;
+ OSStatus status = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize);
+ if(kAudioHardwareNoError != status) {
+ trace ("AudioObjectGetPropertyDataSize (kAudioHardwarePropertyDevices) failed: %i\n", status);
+ return;
+ }
+
+ UInt32 deviceCount = dataSize / sizeof(AudioDeviceID);
+
+ AudioDeviceID *audioDevices = malloc(dataSize);
+
+ status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, audioDevices);
+ if(kAudioHardwareNoError != status) {
+ trace ("AudioObjectGetPropertyData (kAudioHardwarePropertyDevices) failed: %i\n", status);
+ free(audioDevices);
+ return;
+ }
+
+ // Iterate through all the devices and determine which are output-capable
+ propertyAddress.mScope = kAudioDevicePropertyScopeOutput;
+ for(UInt32 i = 0; i < deviceCount; ++i) {
+ // Query device UID
+ CFStringRef deviceUID = NULL;
+ dataSize = sizeof(deviceUID);
+ propertyAddress.mSelector = kAudioDevicePropertyDeviceUID;
+ status = AudioObjectGetPropertyData(audioDevicesi, &propertyAddress, 0, NULL, &dataSize, &deviceUID);
+ if(kAudioHardwareNoError != status) {
+ trace ("AudioObjectGetPropertyData (kAudioDevicePropertyDeviceUID) failed: %i\n", status);
+ continue;
+ }
+
+ // Query device name
+ CFStringRef deviceName = NULL;
+ dataSize = sizeof(deviceName);
+ propertyAddress.mSelector = kAudioDevicePropertyDeviceNameCFString;
+ status = AudioObjectGetPropertyData(audioDevicesi, &propertyAddress, 0, NULL, &dataSize, &deviceName);
+ if(kAudioHardwareNoError != status) {
+ trace ("AudioObjectGetPropertyData (kAudioDevicePropertyDeviceNameCFString) failed: %i\n", status);
+ continue;
+ }
+
+ // test for number of channels
+ dataSize = 0;
+ propertyAddress.mSelector = kAudioDevicePropertyStreamConfiguration;
+ status = AudioObjectGetPropertyDataSize(audioDevicesi, &propertyAddress, 0, NULL, &dataSize);
+ if(kAudioHardwareNoError != status) {
+ trace ("AudioObjectGetPropertyDataSize (kAudioDevicePropertyStreamConfiguration) failed: %i\n", status);
+ continue;
+ }
+
+ AudioBufferList *bufferList = malloc(dataSize);
+ status = AudioObjectGetPropertyData(audioDevicesi, &propertyAddress, 0, NULL, &dataSize, bufferList);
+ if(kAudioHardwareNoError != status || 0 == bufferList->mNumberBuffers) {
+ free(bufferList);
+ continue;
+ }
+
+ if (callback) {
+ char buf100;
+ CFStringGetCString(deviceName, buf, sizeof(buf), kCFStringEncodingUTF8);
+ callback (buf, "", userdata);
+ }
+
+ free(bufferList);
+ }
+
+ free(audioDevices);
+}
+
+static int
+ca_plugin_start (void) {
+ mutex = deadbeef->mutex_create ();
+ return 0;
+}
+
+static int
+ca_plugin_stop (void) {
+ deadbeef->mutex_free (mutex);
+ return 0;
 }
 
-// define plugin interface
 static DB_output_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
- .plugin.version_major = 0,
- .plugin.version_minor = 1,
+ DDB_PLUGIN_SET_API_VERSION
+ .plugin.version_major = 2,
+ .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_OUTPUT,
+ .plugin.flags = DDB_PLUGIN_FLAG_LOGGING,
 .plugin.id = "coreaudio",
- .plugin.name = "core audio output plugin",
- .plugin.descr = "Uses the core audio framework to output sound.",
- .plugin.copyright = 
-	"CoreAudio Output Deadbeef Plugin\n" 
-	"Copyright (c) 2011-2013 Carlos Nunes <carloslnunes@gmail.com>\n"
-	"\n"
-	"CoreAudio Output Deadbeef Plugin is licensed under the GNU \n"
-	"Lesser General Public License version 2.\n"
+ .plugin.name = "CoreAudio",
+ .plugin.descr = "CoreAudio output plugin",
+ .plugin.copyright =
+ "DeaDBeeF CoreAudio output plugin\n"
+ "Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors\n"
+ "Copyright (C) 2016 Christopher Snowhill\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\n"
+ "\n"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\n"
+ "\n"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\n"
+ "\n"
+ "3. This notice may not be removed or altered from any source distribution.\n"
 ,
- .plugin.website = "http://spontaneouscoders.com/projects/coreaudio-output-deadbeef-plugin",
- .plugin.start = coreaudio_plugin_start,
- .plugin.stop = coreaudio_plugin_stop,
- .init = coreaudio_init,
- .free = coreaudio_free,
- .setformat = coreaudio_setformat,
- .play = coreaudio_play,
- .stop = coreaudio_stop,
- .pause = coreaudio_pause,
- .unpause = coreaudio_unpause,
- .state = coreaudio_get_state,
- .fmt = {-1},
+ .plugin.website = "http://deadbeef.sf.net",
+ .init = ca_init,
+ .free = ca_free,
+ .setformat = ca_setformat,
+ .play = ca_play,
+ .stop = ca_stop,
+ .pause = ca_pause,
+ .unpause = ca_unpause,
+ .state = ca_state,
+ .enum_soundcards = ca_enum_soundcards,
+ .plugin.start = ca_plugin_start,
+ .plugin.stop = ca_plugin_stop,
 };
 
+DB_plugin_t *
+coreaudio_load (DB_functions_t *api) {
+ deadbeef = api;
+ return DB_PLUGIN (&plugin);
+}

deadbeef-0.6.2.tar.bz2/plugins/dca/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/dca/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/dca/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/dca/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/dca/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/dca/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/dca/bitstream.c -> deadbeef-1.9.6.tar.bz2/plugins/dca/bitstream.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dca/dcaplug.c -> deadbeef-1.9.6.tar.bz2/plugins/dca/dcaplug.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dca/downmix.c -> deadbeef-1.9.6.tar.bz2/plugins/dca/downmix.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dca/extract_dca.c -> deadbeef-1.9.6.tar.bz2/plugins/dca/extract_dca.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dca/gettimeofday.c -> deadbeef-1.9.6.tar.bz2/plugins/dca/gettimeofday.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dca/parse.c -> deadbeef-1.9.6.tar.bz2/plugins/dca/parse.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dsp_libsrc/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/dsp_libsrc/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/dsp_libsrc/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/dsp_libsrc/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/dsp_libsrc/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/dsp_libsrc/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/dsp_libsrc/src.c -> deadbeef-1.9.6.tar.bz2/plugins/dsp_libsrc/src.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dsp_libsrc/src.h -> deadbeef-1.9.6.tar.bz2/plugins/dsp_libsrc/src.h Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/dumb/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/dumb/Makefile.am Changed

@@ -1,107 +1,127 @@
-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
 
+if HAVE_DUMB
 pkglib_LTLIBRARIES = ddb_dumb.la
 
-AM_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=c99
-ddb_dumb_la_LDFLAGS = -module -avoid-version -lm
+ddb_dumb_la_CFLAGS = $(CFLAGS) $(ALLOCA_H_CFLAGS) -I$(dumbpath)/include -I@top_srcdir@/include -std=gnu99
+ddb_dumb_la_CXXFLAGS = $(CFLAGS) $(ALLOCA_H_CFLAGS) -I$(dumbpath)/include -I@top_srcdir@/include -fno-exceptions -fno-rtti -fno-unwind-tables
+ddb_dumb_la_LDFLAGS = -module -avoid-version -lm $(NOCPPLIB)
+if HAVE_SSE2
+noinst_LTLIBRARIES = libdumbsse2.la
+libdumbsse2_la_SOURCES = dumb-kode54/src/helpers/resampler_sse2.c
+libdumbsse2_la_CFLAGS = $(CFLAGS) -I$(dumbpath)/include -std=gnu99 -msse2 -fPIC
+ddb_dumb_la_LIBADD = libdumbsse2.la
+endif
+
 
 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/loadmod2.c\
+dumb-kode54/src/it/itorder.c\
+dumb-kode54/src/it/readokt2.c\
+dumb-kode54/src/it/readptm.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/loadany2.c\
+dumb-kode54/src/it/loadokt2.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/readasy.c\
+dumb-kode54/src/it/loadpsm2.c\
+dumb-kode54/src/it/readstm.c\
+dumb-kode54/src/it/readxm2.c\
+dumb-kode54/src/it/readmod.c\
+dumb-kode54/src/it/readam.c\
+dumb-kode54/src/it/loadoldpsm2.c\
+dumb-kode54/src/it/loadxm2.c\
+dumb-kode54/src/it/loadmod.c\
+dumb-kode54/src/it/loadany.c\
+dumb-kode54/src/it/loadmtm.c\
+dumb-kode54/src/it/itrender.c\
+dumb-kode54/src/it/loadasy2.c\
+dumb-kode54/src/it/readpsm.c\
+dumb-kode54/src/it/itload.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/loadriff.c\
+dumb-kode54/src/it/readmtm.c\
+dumb-kode54/src/it/reads3m.c\
 dumb-kode54/src/it/itload2.c\
-dumb-kode54/src/it/loadmtm.c\
-dumb-kode54/src/it/loadoldpsm.c\
+dumb-kode54/src/it/readxm.c\
+dumb-kode54/src/it/loadpsm.c\
+dumb-kode54/src/it/readany2.c\
+dumb-kode54/src/it/loadamf.c\
+dumb-kode54/src/it/loadptm2.c\
+dumb-kode54/src/it/readokt.c\
+dumb-kode54/src/it/itread2.c\
+dumb-kode54/src/it/itmisc.c\
+dumb-kode54/src/it/loadokt.c\
+dumb-kode54/src/it/loads3m.c\
+dumb-kode54/src/it/loadptm.c\
+dumb-kode54/src/it/readdsmf.c\
+dumb-kode54/src/it/readamf2.c\
+dumb-kode54/src/it/itunload.c\
+dumb-kode54/src/it/readmod2.c\
+dumb-kode54/src/it/readamf.c\
+dumb-kode54/src/it/readoldpsm.c\
+dumb-kode54/src/it/loadamf2.c\
+dumb-kode54/src/it/read6692.c\
+dumb-kode54/src/it/read669.c\
+dumb-kode54/src/it/readriff.c\
+dumb-kode54/src/it/readany.c\
+dumb-kode54/src/it/load669.c\
 dumb-kode54/src/it/loadstm2.c\
+dumb-kode54/src/it/loadstm.c\
+dumb-kode54/src/it/load6692.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/it/loadoldpsm.c\
+dumb-kode54/src/it/xmeffect.c\
+dumb-kode54/src/helpers/riff.c\
+dumb-kode54/src/helpers/memfile.c\
+dumb-kode54/src/helpers/silence.c\
+dumb-kode54/src/helpers/stdfile.c\
+dumb-kode54/src/helpers/clickrem.c\
+dumb-kode54/src/helpers/tarray.c\
+dumb-kode54/src/helpers/resample.c\
+dumb-kode54/src/helpers/barray.c\
+dumb-kode54/src/helpers/lpc.c\
+dumb-kode54/src/helpers/resampler.c\
+dumb-kode54/src/helpers/sampbuf.c\
 dumb-kode54/src/core/unload.c\
-dumb-kode54/src/core/duhtag.c\
+dumb-kode54/src/core/loadduh.c\
+dumb-kode54/src/core/duhlen.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/rendduh.c\
 dumb-kode54/src/core/makeduh.c\
+dumb-kode54/src/core/duhtag.c\
+dumb-kode54/src/core/readduh.c\
+dumb-kode54/src/core/dumbfile.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/core/rendsig.c\
 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/tarray.h\
+dumb-kode54/include/internal/resampler.h\
 dumb-kode54/include/internal/riff.h\
-dumb-kode54/include/internal/aldumb.h\
+dumb-kode54/include/internal/lpc.h\
+dumb-kode54/include/internal/dumbfile.h\
+dumb-kode54/include/internal/stack_alloc.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
+modloader.cpp\
+modloader.h\
+umr.h\
+unmo3.h\
+unrealfmt.cpp\
+unrealfmtdata.cpp\
+urf.h\
+cdumb.c\
+cdumb.h
 endif

deadbeef-0.6.2.tar.bz2/plugins/dumb/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/dumb/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/cdumb.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/cdumb.c Changed

@@ -1,6 +1,6 @@
 /*
 DUMB Plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2016 Oleksiy Yakovenko <waker@users.sourceforge.net>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -26,20 +26,26 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "cdumb.h"
 #include "dumb.h"
 #include "internal/it.h"
-#include "../../deadbeef.h"
+#include "modloader.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
 static DB_decoder_t plugin;
-static DB_functions_t *deadbeef;
+DB_functions_t *deadbeef;
 
 typedef struct {
 DB_fileinfo_t info;
 DUH *duh;
 DUH_SIGRENDERER *renderer;
+ int chip_voices;
+ int can_loop;
+ int rawsignal;
 } dumb_info_t;
 
 //#define DUMB_RQ_ALIASING
@@ -49,17 +55,23 @@
 extern int dumb_resampling_quality;
 extern int dumb_it_max_to_mix;
 
+static int conf_bps = 16;
+static int conf_samplerate = 44100;
+static int conf_resampling_quality = 4;
+static int conf_ramping_style = 2;
+static int conf_global_volume = 64;
+static int conf_play_forever = 0;
+
 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;
+ dumb_info_t *info = calloc (1, sizeof (dumb_info_t));
+ info->can_loop = hints & DDB_DECODER_HINT_CAN_LOOP;
+ info->rawsignal = hints & DDB_DECODER_HINT_RAW_SIGNAL;
+ info->chip_voices = 0xff;
+ return &info->info;
 }
 
 static int
@@ -67,27 +79,24 @@
 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;
-	deadbeef->pl_lock ();
- {
- const char *uri = deadbeef->pl_find_meta (it, ":URI");
- const char *ext = uri + strlen (uri) - 1;
- while (*ext != '.' && ext > uri) {
- ext--;
- }
- ext++;
- const char *ftype;
- info->duh = open_module (uri, ext, &start_order, &is_it, &is_dos, &ftype);
- }
+ int is_dos, is_it, is_ptcompat;
+ deadbeef->pl_lock ();
+ const char *uri = strdupa(deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ const char *ext = uri + strlen (uri) - 1;
+ while (*ext != '.' && ext > uri) {
+ ext--;
+ }
+ ext++;
+ const char *ftype;
+ info->duh = g_open_module (uri, &is_it, &is_dos, &is_ptcompat, 0, &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.bps = conf_bps;
 _info->fmt.channels = 2;
- _info->fmt.samplerate = deadbeef->conf_get_int ("synth.samplerate", 44100);
+ _info->fmt.samplerate = conf_samplerate;
 _info->readpos = 0;
 _info->fmt.channelmask = _info->fmt.channels == 1 ? DDB_SPEAKER_FRONT_LEFT : (DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT);
 
@@ -115,7 +124,7 @@
 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);
+ int q = conf_resampling_quality;
 if (q < 0) {
 q = 0;
 }
@@ -126,8 +135,17 @@
 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);
+ 
+ int rq = conf_ramping_style;
+ if (rq < 0) {
+ rq = 0;
+ }
+ else if (rq > 2) {
+ rq = 2;
+ }
+ dumb_it_set_ramp_style(itsr, rq);
 
- dumb_it_sr_set_global_volume (itsr, deadbeef->conf_get_int ("dumb.globalvolume", 64));
+ dumb_it_sr_set_global_volume (itsr, conf_global_volume);
 return 0;
 }
 
@@ -149,560 +167,98 @@
 }
 
 static int
+cdumb_it_callback_loop_forever(void *unused)
+{
+ (void)unused;
+ return 0;
+}
+
+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;
+
+ DUMB_IT_SIGRENDERER *itsr = duh_get_it_sigrenderer (info->renderer);
+
+ if (!info->rawsignal) {
+ int chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
+ if (chip_voices != info->chip_voices) {
+ info->chip_voices = chip_voices;
+
+ for (int i = 0; i < 8; i++) {
+ dumb_it_sr_set_channel_muted(itsr, i, (chip_voices&(1<<i)) == 0);
+ }
+ }
+ }
+
+ if (conf_play_forever && info->can_loop)
+ dumb_it_set_loop_callback (itsr, &cdumb_it_callback_loop_forever, NULL);
+ else
+ dumb_it_set_loop_callback (itsr, &dumb_it_callback_terminate, NULL);
+
 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;
+ return (int)(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) {
+ float skiptime = time;
+ if (skiptime < _info->readpos) {
 if (cdumb_startrenderer (_info) < 0) {
 return -1;
 } 
 }
 else {
- time -= _info->readpos;
+ skiptime -= _info->readpos;
 }
- int pos = time * _info->fmt.samplerate;
+ int pos = skiptime * _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;
+ _info->readpos = time;
 return 0;
 }
 
+enum { MOD_EXT_COUNT = 6 };
+
 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
+ "mod","mdz","stk","m15","fst","oct","nt",
+ "s3m","s3z",
+ "stm","stz",
+ "it","itz",
+ "xm","xmz",
+ "ptm","ptz",
+ "mtm","mtz",
+ "669",
+ "psm",
+ "umx",
+ "am","j2b",
+ "dsm",
+ "amf",
+ "okt","okta",
+ "mo3",
+ 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 ptr2000;
- 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 &&
-		ptr0 == 0xC1 && ptr1 == 0x83 &&
-		ptr2 == 0x2A && ptr3 == 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 && ptr0 == 'I' && ptr1 == 'M' && ptr2 == 'P' && ptr3 == 'M')
-						{
-							is_it = true;
-							duh = dumb_read_it_quick(f);
-						}
-						else if (size >= 42 && ptr38 == 'F' && ptr39 == 'a' && ptr40 == 's' && ptr41 == 't')
-						{
-							duh = dumb_read_xm_quick(f);
-						}
-						else if (size >= 48 && ptr44 == 'S' && ptr45 == 'C' && ptr46 == 'R' && ptr47 == 'M')
-						{
-							duh = dumb_read_s3m_quick(f);
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-	else
-#endif
-// end of umr code
-// }}}
-	if (size >= 4 &&
-		ptr0 == 'I' && ptr1 == 'M' &&
-		ptr2 == 'P' && ptr3 == '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 &&
-		ptr0x2C == 'S' && ptr0x2D == 'C' &&
-		ptr0x2E == 'R' && ptr0x2F == 'M')
-	{
-		duh = dumb_read_s3m_quick(f);
-		*filetype = "S3M";
-	}
-	else if (size >= 1168 &&
-		/*ptr28 == 0x1A &&*/ ptr29 == 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 &&
-		((ptr0 == 0x69 && ptr1 == 0x66) ||
-		(ptr0 == 0x4A && ptr1 == 0x4E)))
-	{
-		duh = dumb_read_669_quick(f);
-		*filetype = "669";
-	}
-	else if (size >= 0x30 &&
-		ptr0x2C == 'P' && ptr0x2D == 'T' &&
-		ptr0x2E == 'M' && ptr0x2F == 'F')
-	{
-		duh = dumb_read_ptm_quick(f);
-		*filetype = "PTM";
-	}
-	else if (size >= 4 &&
-		ptr0 == 'P' && ptr1 == 'S' &&
-		ptr2 == 'M' && ptr3 == ' ')
-	{
-		duh = dumb_read_psm_quick(f, *start_order);
-		*start_order = 0;
-		*filetype = "PSM";
-	}
-	else if (size >= 4 &&
-		ptr0 == 'P' && ptr1 == 'S' &&
-		ptr2 == 'M' && ptr3 == 254)
-	{
-		duh = dumb_read_old_psm_quick(f);
-		*filetype = "PSM";
-	}
-	else if (size >= 3 &&
-		ptr0 == 'M' && ptr1 == 'T' &&
-		ptr2 == 'M')
-	{
-		duh = dumb_read_mtm_quick(f);
-		*filetype = "MTM";
-	}
-	else if ( size >= 4 &&
-		ptr0 == 'R' && ptr1 == 'I' &&
-		ptr2 == 'F' && ptr3 == '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, exts0) || !strcasecmp (ext, exts1)) ? 0 : 1);
-		*filetype = "MOD";
-	}
-
- if (f) {
- dumbfile_close(f);
+int
+cdumb_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ switch (id) {
+ case DB_EV_CONFIGCHANGED:
+ conf_bps = deadbeef->conf_get_int ("dumb.8bitoutput", 0) ? 8 : 16;
+ conf_samplerate = deadbeef->conf_get_int ("synth.samplerate", 44100);
+ conf_resampling_quality = deadbeef->conf_get_int ("dumb.resampling_quality", 4);
+ conf_ramping_style = deadbeef->conf_get_int ("dumb.volume_ramping", 2);
+ conf_global_volume = deadbeef->conf_get_int ("dumb.globalvolume", 64);
+ conf_play_forever = deadbeef->streamer_get_repeat () == DDB_REPEAT_SINGLE;
+ break;
 }
-
-// {{{ 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->samplei;
-					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->samplei;
-				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;
+ return 0;
 }
 
 static const char *
@@ -779,24 +335,16 @@
 static int
 cdumb_read_metadata (DB_playItem_t *it) {
 DUH* duh = NULL;
- int start_order = 0;
 int is_it;
 int is_dos;
- const char *ftype;
+ int is_ptcompat;
 
 deadbeef->pl_lock ();
- {
- const char *fname = deadbeef->pl_find_meta (it, ":URI");
- const char *ext = strrchr (fname, '.');
- if (ext) {
- ext++;
- }
- else {
- ext = "";
- }
- duh = open_module(fname, ext, &start_order, &is_it, &is_dos, &ftype);
- }
+ const char *fname = strdupa(deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ const char *ftype;
+ duh = g_open_module(fname, &is_it, &is_dos, &is_ptcompat, 0, &ftype);
+
 if (!duh) {
 unload_duh (duh);
 return -1;
@@ -818,11 +366,11 @@
 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);
+ int is_ptcompat;
+ const char *ftype = NULL;
+ DUH* duh = g_open_module(fname, &is_it, &is_dos, &is_ptcompat, 0, &ftype);
 if (!duh) {
 return NULL;
 }
@@ -844,60 +392,88 @@
 
 static DUMBFILE_SYSTEM dumb_vfs;
 
+static void *
+dumb_vfs_open (const char *fname) {
+ ddb_dumb_file_t *f = calloc (1, sizeof (ddb_dumb_file_t));
+ f->file = deadbeef->fopen (fname);
+ return f;
+}
+
 static int
 dumb_vfs_skip (void *f, long n) {
- return deadbeef->fseek (f, n, SEEK_CUR);
+ ddb_dumb_file_t *d = f;
+ return deadbeef->fseek (d->file, n, SEEK_CUR);
 }
 
 static int
 dumb_vfs_getc (void *f) {
+ ddb_dumb_file_t *d = f;
 uint8_t c;
- deadbeef->fread (&c, 1, 1, f);
+ if (1 != deadbeef->fread (&c, 1, 1, d->file)) {
+ return -1;
+ }
 return (int)c;
 }
 
 static long
 dumb_vfs_getnc (char *ptr, long n, void *f) {
- return deadbeef->fread (ptr, 1, n, f);
+ ddb_dumb_file_t *d = f;
+ return deadbeef->fread (ptr, 1, n, d->file);
+}
+
+static int
+dumb_vfs_seek (void *f, long n) {
+ ddb_dumb_file_t *d = f;
+ return deadbeef->fseek(d->file, d->startoffs + n, SEEK_SET);
+}
+
+static long
+dumb_vfs_get_size (void *f) {
+ ddb_dumb_file_t *d = f;
+ return deadbeef->fgetlength(d->file) - d->startoffs;
 }
 
 static void
 dumb_vfs_close (void *f) {
- deadbeef->fclose (f);
+ ddb_dumb_file_t *d = f;
+ deadbeef->fclose (d->file);
+ free (d);
 }
 
 static void
 dumb_register_db_vfs (void) {
- dumb_vfs.open = (void *(*)(const char *))deadbeef->fopen;
+ dumb_vfs.open = dumb_vfs_open;
 dumb_vfs.skip = dumb_vfs_skip;
 dumb_vfs.getc = dumb_vfs_getc;
 dumb_vfs.getnc = dumb_vfs_getnc;
+ dumb_vfs.seek = dumb_vfs_seek;
+ dumb_vfs.get_size = dumb_vfs_get_size;
 dumb_vfs.close = dumb_vfs_close;
 register_dumbfile_system (&dumb_vfs);
 }
 
 int
-cgme_start (void) {
+cdumb_start (void) {
 dumb_register_db_vfs ();
 return 0;
 }
 
 int
-cgme_stop (void) {
+cdumb_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"
- "property \"Internal DUMB volume (0..128)\" spinbtn0,128,16 dumb.globalvolume 64;\n"
+ "property \"Resampling quality\" spinbtn0,5,1 dumb.resampling_quality 4;\n"
+ "property \"Internal DUMB volume\" spinbtn0,128,16 dumb.globalvolume 64;\n"
+ "property \"Volume ramping\" select3 dumb.volume_ramping 0 None \"On/Off Only\" \"Full\";\n"
+ "property \"8-bit output\" checkbox dumb.8bitoutput 0;\n"
 ;
 
 // define plugin interface
 static DB_decoder_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_DECODER,
@@ -906,7 +482,7 @@
 .plugin.descr = "module player based on DUMB library",
 .plugin.copyright = 
 "DUMB Plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2009-2016 Oleksiy 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"
@@ -931,8 +507,8 @@
 "3. This notice may not be removed or altered from any source distribution.\n"
 ,
 .plugin.website = "http://deadbeef.sf.net",
- .plugin.start = cgme_start,
- .plugin.stop = cgme_stop,
+ .plugin.start = cdumb_start,
+ .plugin.stop = cdumb_stop,
 .plugin.configdialog = settings_dlg,
 .open = cdumb_open,
 .init = cdumb_init,
@@ -942,6 +518,7 @@
 .insert = cdumb_insert,
 .read_metadata = cdumb_read_metadata,
 .exts = exts,
+ .plugin.message = cdumb_message,
 };
 
 DB_plugin_t *

deadbeef-1.9.6.tar.bz2/plugins/dumb/cdumb.h Added

@@ -0,0 +1,34 @@
+/*
+ DUMB Plugin for DeaDBeeF Player
+ Copyright (C) 2009-2016 Oleksiy Yakovenko <waker@users.sourceforge.net>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef cdumb_h
+#define cdumb_h
+
+#include <deadbeef/deadbeef.h>
+
+typedef struct {
+ DB_FILE *file;
+ // start offset, used for UMX
+ size_t startoffs;
+} ddb_dumb_file_t;
+
+#endif /* cdumb_h */

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/include/dumb.h -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/include/dumb.h Changed

@@ -25,9 +25,11 @@
 #include <stdio.h>
 
 #ifdef _DEBUG
+#ifdef _MSC_VER
 #define _CRTDBG_MAP_ALLOC
 #include <crtdbg.h>
 #endif
+#endif
 
 #ifdef __cplusplus
 	extern "C" {
@@ -42,7 +44,7 @@
 
 #define DUMB_VERSION_STR "0.9.3"
 
-#define DUMB_NAME "DUMB v"DUMB_VERSION_STR
+#define DUMB_NAME "DUMB v" DUMB_VERSION_STR
 
 #define DUMB_YEAR 2005
 #define DUMB_MONTH 8
@@ -53,19 +55,14 @@
 #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
+#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
+#define DUMB_DAY_STR2 "0" DUMB_DAY_STR1
 #else
 #define DUMB_DAY_STR2 DUMB_DAY_STR1
 #endif
@@ -77,7 +74,7 @@
 */
 #define DUMB_DATE (DUMB_YEAR*10000 + DUMB_MONTH*100 + DUMB_DAY)
 
-#define DUMB_DATE_STR DUMB_DAY_STR1"."DUMB_MONTH_STR1"."DUMB_YEAR_STR4
+#define DUMB_DATE_STR DUMB_DAY_STR1 "." DUMB_MONTH_STR1 "." DUMB_YEAR_STR4
 
 
 #undef MIN
@@ -165,19 +162,29 @@
 	int (*getc)(void *f);
 	long (*getnc)(char *ptr, long n, void *f);
 	void (*close)(void *f);
+ int (*seek)(void *f, long n);
+ long (*get_size)(void *f);
 }
 DUMBFILE_SYSTEM;
 
 typedef struct DUMBFILE DUMBFILE;
 
-void register_dumbfile_system(DUMBFILE_SYSTEM *dfs);
+void register_dumbfile_system(const DUMBFILE_SYSTEM *dfs);
 
 DUMBFILE *dumbfile_open(const char *filename);
-DUMBFILE *dumbfile_open_ex(void *file, DUMBFILE_SYSTEM *dfs);
+DUMBFILE *dumbfile_open_ex(void *file, const DUMBFILE_SYSTEM *dfs);
 
 long dumbfile_pos(DUMBFILE *f);
 int dumbfile_skip(DUMBFILE *f, long n);
 
+#define DFS_SEEK_SET 0
+#define DFS_SEEK_CUR 1
+#define DFS_SEEK_END 2
+
+int dumbfile_seek(DUMBFILE *f, long n, int origin);
+
+long dumbfile_get_size(DUMBFILE *f);
+
 int dumbfile_getc(DUMBFILE *f);
 
 int dumbfile_igetw(DUMBFILE *f);
@@ -222,9 +229,6 @@
 
 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;
@@ -375,10 +379,15 @@
 
 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);
-
+enum
+{
+ DUMB_IT_RAMP_NONE = 0,
+ DUMB_IT_RAMP_ONOFF_ONLY = 1,
+ DUMB_IT_RAMP_FULL = 2
+};
+ 
 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);
@@ -387,11 +396,13 @@
 int dumb_it_callback_terminate(void *data);
 int dumb_it_callback_midi_block(void *data, int channel, unsigned char midi_byte);
 
+/* dumb_*_mod*: restrict_ |= 1-Don't read 15 sample files / 2-Use old pattern counting method */
+
 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_mod(const char *filename, int restrict_);
 DUH *dumb_load_ptm(const char *filename);
 DUH *dumb_load_669(const char *filename);
 DUH *dumb_load_psm(const char *filename, int subsong);
@@ -399,12 +410,14 @@
 DUH *dumb_load_mtm(const char *filename);
 DUH *dumb_load_riff(const char *filename);
 DUH *dumb_load_asy(const char *filename);
+DUH *dumb_load_amf(const char *filename);
+DUH *dumb_load_okt(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_mod(DUMBFILE *f, int restrict_);
 DUH *dumb_read_ptm(DUMBFILE *f);
 DUH *dumb_read_669(DUMBFILE *f);
 DUH *dumb_read_psm(DUMBFILE *f, int subsong);
@@ -412,12 +425,14 @@
 DUH *dumb_read_mtm(DUMBFILE *f);
 DUH *dumb_read_riff(DUMBFILE *f);
 DUH *dumb_read_asy(DUMBFILE *f);
+DUH *dumb_read_amf(DUMBFILE *f);
+DUH *dumb_read_okt(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_mod_quick(const char *filename, int restrict_);
 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);
@@ -425,12 +440,14 @@
 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_load_amf_quick(const char *filename);
+DUH *dumb_load_okt_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_mod_quick(DUMBFILE *f, int restrict_);
 DUH *dumb_read_ptm_quick(DUMBFILE *f);
 DUH *dumb_read_669_quick(DUMBFILE *f);
 DUH *dumb_read_psm_quick(DUMBFILE *f, int subsong);
@@ -438,6 +455,14 @@
 DUH *dumb_read_mtm_quick(DUMBFILE *f);
 DUH *dumb_read_riff_quick(DUMBFILE *f);
 DUH *dumb_read_asy_quick(DUMBFILE *f);
+DUH *dumb_read_amf_quick(DUMBFILE *f);
+DUH *dumb_read_okt_quick(DUMBFILE *f);
+
+DUH *dumb_read_any_quick(DUMBFILE *f, int restrict_, int subsong);
+DUH *dumb_read_any(DUMBFILE *f, int restrict_, int subsong);
+
+DUH *dumb_load_any_quick(const char *filename, int restrict_, int subsong);
+DUH *dumb_load_any(const char *filename, int restrict_, int subsong);
 
 long dumb_it_build_checkpoints(DUMB_IT_SIGDATA *sigdata, int startorder);
 void dumb_it_do_initial_runthrough(DUH *duh);
@@ -493,9 +518,6 @@
 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
@@ -570,6 +592,10 @@
 	sample_t *samples
 );
 
+typedef long (*DUH_SIGRENDERER_GET_POSITION)(
+	sigrenderer_t *sigrenderer
+);
+
 typedef void (*DUH_END_SIGRENDERER)(sigrenderer_t *sigrenderer);
 
 typedef void (*DUH_UNLOAD_SIGDATA)(sigdata_t *sigdata);
@@ -585,6 +611,7 @@
 	DUH_SIGRENDERER_SET_SIGPARAM sigrenderer_set_sigparam;
 	DUH_SIGRENDERER_GENERATE_SAMPLES sigrenderer_generate_samples;
 	DUH_SIGRENDERER_GET_CURRENT_SAMPLE sigrenderer_get_current_sample;
+	DUH_SIGRENDERER_GET_POSITION sigrenderer_get_position;
 	DUH_END_SIGRENDERER end_sigrenderer;
 	DUH_UNLOAD_SIGDATA unload_sigdata;
 }
@@ -592,6 +619,8 @@
 
 void dumb_register_sigtype(DUH_SIGTYPE_DESC *desc);
 
+int duh_add_signal(DUH *duh, DUH_SIGTYPE_DESC *desc, sigdata_t *sigdata);
+
 
 // Decide where to put these functions; new heading?
 
@@ -619,19 +648,6 @@
 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);
@@ -658,10 +674,15 @@
 /* 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;
+#define DUMB_RQ_BLEP 1
+#define DUMB_RQ_LINEAR 2
+#define DUMB_RQ_BLAM 3
+#define DUMB_RQ_CUBIC 4
+#define DUMB_RQ_FIR 5
+#define DUMB_RQ_N_LEVELS 6
+
+extern int dumb_resampling_quality; /* This specifies the default */
+void dumb_it_set_resampling_quality(DUMB_IT_SIGRENDERER * sigrenderer, int quality); /* This overrides it */
 
 typedef struct DUMB_RESAMPLER DUMB_RESAMPLER;
 
@@ -686,6 +707,8 @@
 		signed char x83*2;
 	} x;
 	int overshot;
+ double fir_resampler_ratio;
+ void* fir_resampler2;
 };
 
 struct DUMB_VOLUME_RAMP_INFO
@@ -694,6 +717,7 @@
 	float delta;
 	float target;
 	float mix;
+ unsigned char declick_stage;
 };
 
 void dumb_reset_resampler(DUMB_RESAMPLER *resampler, sample_t *src, int src_channels, long pos, long start, long end, int quality);
@@ -732,7 +756,6 @@
 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);
@@ -745,6 +768,11 @@
 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);
 
+/* This sets the default panning separation for hard panned formats,
+ or for formats with default panning information. This must be set
+ before using any readers or loaders, and is not really thread safe. */
+
+extern int dumb_it_default_panning_separation; /* in percent, default 25 */
 
 /* DUH Construction */
 
@@ -759,8 +787,6 @@
 
 void duh_set_length(DUH *duh, long length);
 
-void duh_set_length(DUH *duh, long length);
-
 
 #ifdef __cplusplus
 	}

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/include/internal/barray.h -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/include/internal/barray.h Changed

@@ -3,6 +3,25 @@
 
 #include <stdlib.h>
 
+#ifdef BARRAY_DECORATE
+#undef PASTE
+#undef EVALUATE
+#define PASTE(a,b) a ## b
+#define EVALUATE(a,b) PASTE(a,b)
+#define bit_array_create EVALUATE(BARRAY_DECORATE,_bit_array_create)
+#define bit_array_destroy EVALUATE(BARRAY_DECORATE,_bit_array_destroy)
+#define bit_array_dup EVALUATE(BARRAY_DECORATE,_bit_array_dup)
+#define bit_array_reset EVALUATE(BARRAY_DECORATE,_bit_array_reset)
+#define bit_array_set EVALUATE(BARRAY_DECORATE,_bit_array_set)
+#define bit_array_set_range EVALUATE(BARRAY_DECORATE,_bit_array_set_range)
+#define bit_array_test EVALUATE(BARRAY_DECORATE,_bit_array_test)
+#define bit_array_test_range EVALUATE(BARRAY_DECORATE,_bit_array_test_range)
+#define bit_array_clear EVALUATE(BARRAY_DECORATE,_bit_array_clear)
+#define bit_array_clear_range EVALUATE(BARRAY_DECORATE,_bit_array_clear_range)
+#define bit_array_merge EVALUATE(BARRAY_DECORATE,_bit_array_merge)
+#define bit_array_mask EVALUATE(BARRAY_DECORATE,_bit_array_mask)
+#endif
+
 void * bit_array_create(size_t size);
 void bit_array_destroy(void * array);
 void * bit_array_dup(void * array);
@@ -10,9 +29,13 @@
 void bit_array_reset(void * array);
 
 void bit_array_set(void * array, size_t bit);
+void bit_array_set_range(void * array, size_t bit, size_t count);
+
 int bit_array_test(void * array, size_t bit);
 int bit_array_test_range(void * array, size_t bit, size_t count);
+
 void bit_array_clear(void * array, size_t bit);
+void bit_array_clear_range(void * array, size_t bit, size_t count);
 
 void bit_array_merge(void * array, void * source, size_t offset);
 void bit_array_mask(void * array, void * source, size_t offset);

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

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/include/internal/it.h -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/include/internal/it.h Changed

@@ -33,6 +33,7 @@
 #include <stddef.h>
 
 #include "barray.h"
+#include "tarray.h"
 
 
 /** TO DO: THINK ABOUT THE FOLLOWING:
@@ -54,9 +55,8 @@
 * 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 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
 
@@ -73,10 +73,9 @@
 #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.
+/* This is divided by the tempo times 256 to get the interval between ticks.
 */
-#define TICK_TIME_DIVIDEND ((65536 * 60) / (4 * 6))
+#define TICK_TIME_DIVIDEND (65536 * 5 * 128)
 
 
 
@@ -209,7 +208,7 @@
 struct IT_SAMPLE
 {
 	unsigned char name35;
-	unsigned char filename14;
+	unsigned char filename15;
 	unsigned char flags;
 	unsigned char global_volume;
 	unsigned char default_volume;
@@ -299,18 +298,19 @@
 #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
+/* More effects needed for OKT compatibility */
+#define IT_OKT_NOTE_SLIDE_DOWN 38
+#define IT_OKT_NOTE_SLIDE_DOWN_ROW 39
+#define IT_OKT_NOTE_SLIDE_UP 40
+#define IT_OKT_NOTE_SLIDE_UP_ROW 41
+#define IT_OKT_ARPEGGIO_3 42
+#define IT_OKT_ARPEGGIO_4 43
+#define IT_OKT_ARPEGGIO_5 44
+#define IT_OKT_VOLUME_SLIDE_DOWN 45
+#define IT_OKT_VOLUME_SLIDE_UP 46
 
-#define IT_N_EFFECTS 38
+#define IT_N_EFFECTS 47
 
 /* These represent the top nibble of the command value. */
 #define IT_S_SET_FILTER 0 /* Greyed out in IT... */
@@ -409,6 +409,12 @@
 
 #define IT_WAS_A_669 1024
 
+#define IT_WAS_AN_OKT 2048
+
+#define IT_WAS_AN_STM 4096
+
+#define IT_WAS_PROCESSED 8192 /* Will be set the first time a sigdata passes through a sigrenderer */
+
 #define IT_ORDER_END 255
 #define IT_ORDER_SKIP 254
 
@@ -445,6 +451,8 @@
 	IT_MIDI *midi;
 
 	IT_CHECKPOINT *checkpoint;
+
+	int initial_runthrough;
 };
 
 
@@ -462,6 +470,7 @@
 #define IT_PLAYING_SUSTAINOFF 2
 #define IT_PLAYING_FADING 4
 #define IT_PLAYING_DEAD 8
+#define IT_PLAYING_REVERSE 16
 
 struct IT_PLAYING
 {
@@ -478,7 +487,6 @@
 	unsigned char instnum;
 
 	unsigned char declick_stage;
-	float declick_volume;
 
 	float float_volume2;
 	float ramp_volume2;
@@ -594,7 +602,10 @@
 
 	unsigned char new_note_action;
 
-	int arpeggio;
+	unsigned char const* arpeggio_table;
+	signed char arpeggio_offsets3;
+
+	int arpeggio_shift;
 	unsigned char retrig;
 	unsigned char xm_retrig;
 	int retrig_tick;
@@ -609,7 +620,7 @@
 	int portamento;
 	int toneporta;
 	int toneslide;
-	unsigned char toneslide_tick, last_toneslide_tick, ptm_toneslide, ptm_last_toneslide;
+	unsigned char toneslide_tick, last_toneslide_tick, ptm_toneslide, ptm_last_toneslide, okt_toneslide;
 	unsigned char destnote;
 	unsigned char toneslide_retrig;
 
@@ -651,6 +662,10 @@
 	unsigned char xm_lastX1;
 	unsigned char xm_lastX2;
 
+	unsigned char inv_loop_delay;
+	unsigned char inv_loop_speed;
+	int inv_loop_offset;
+
 	IT_PLAYING *playing;
 
 #ifdef BIT_ARRAY_BULLSHIT
@@ -709,14 +724,31 @@
 #ifdef BIT_ARRAY_BULLSHIT
 	/* bit array, which rows are played, only checked by pattern break or loop commands */
 	void * played;
+
+	/*
+	 Loop indicator for internal processes, may also be useful for external processes 
+	 0 - Not looped
+	 1 - Looped
+	 -1 - Continued past loop
+	 */
+	int looped;
+
+	/*
+	 Kept until looped
+	*/
+	LONG_LONG time_played;
+
+	void * row_timekeeper;
 #endif
 
 	long gvz_time;
 	int gvz_sub_time;
 
-	int ramp_style;
-
+ int ramp_style;
+ 
 	//int max_output;
+
+	int initial_runthrough;
 };
 
 
@@ -808,6 +840,7 @@
 #define XM_E_NOTE_CUT 0xC
 #define XM_E_NOTE_DELAY 0xD
 #define XM_E_PATTERN_DELAY 0xE
+#define XM_E_SET_MIDI_MACRO 0xF
 
 #define XM_X_EXTRAFINE_PORTA_UP 1
 #define XM_X_EXTRAFINE_PORTA_DOWN 2
@@ -886,7 +919,12 @@
 
 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))
+void _dumb_it_interleave_stereo_sample(IT_SAMPLE *sample);
+
+/* Calling either of these is optional */
+void _dumb_init_cubic();
+#ifdef _USE_SSE
+void _dumb_init_sse();
+#endif
 
 #endif /* INTERNAL_IT_H */

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

@@ -0,0 +1,30 @@
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+ *                                                                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ *                                                                  *
+ ********************************************************************
+
+  function: LPC low level routines
+  last mod: $Id: lpc.h 16037 2009-05-26 21:10:58Z xiphmont $
+
+ ********************************************************************/
+
+#ifndef _V_LPC_H_
+#define _V_LPC_H_
+
+/* simple linear scale LPC code */
+extern float vorbis_lpc_from_data(float *data,float *lpc,int n,int m);
+
+extern void vorbis_lpc_predict(float *coeff,float *prime,int m,
+                               float *data,long n);
+
+struct DUMB_IT_SIGDATA;
+extern void dumb_it_add_lpc(struct DUMB_IT_SIGDATA *sigdata);
+
+#endif

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

@@ -0,0 +1,101 @@
+#ifndef _RESAMPLER_H_
+#define _RESAMPLER_H_
+
+// Ugglay
+#ifdef RESAMPLER_DECORATE
+#undef PASTE
+#undef EVALUATE
+#define PASTE(a,b) a ## b
+#define EVALUATE(a,b) PASTE(a,b)
+#define resampler_init EVALUATE(RESAMPLER_DECORATE,_resampler_init)
+#define resampler_create EVALUATE(RESAMPLER_DECORATE,_resampler_create)
+#define resampler_delete EVALUATE(RESAMPLER_DECORATE,_resampler_delete)
+#define resampler_dup EVALUATE(RESAMPLER_DECORATE,_resampler_dup)
+#define resampler_dup_inplace EVALUATE(RESAMPLER_DECORATE,_resampler_dup_inplace)
+#define resampler_set_quality EVALUATE(RESAMPLER_DECORATE,_resampler_set_quality)
+#define resampler_get_free_count EVALUATE(RESAMPLER_DECORATE,_resampler_get_free_count)
+#define resampler_write_sample EVALUATE(RESAMPLER_DECORATE,_resampler_write_sample)
+#define resampler_write_sample_fixed EVALUATE(RESAMPLER_DECORATE,_resampler_write_sample_fixed)
+#define resampler_set_rate EVALUATE(RESAMPLER_DECORATE,_resampler_set_rate)
+#define resampler_ready EVALUATE(RESAMPLER_DECORATE,_resampler_ready)
+#define resampler_clear EVALUATE(RESAMPLER_DECORATE,_resampler_clear)
+#define resampler_get_sample_count EVALUATE(RESAMPLER_DECORATE,_resampler_get_sample_count)
+#define resampler_get_sample EVALUATE(RESAMPLER_DECORATE,_resampler_get_sample)
+#define resampler_get_sample_float EVALUATE(RESAMPLER_DECORATE,_resampler_get_sample_float)
+#define resampler_remove_sample EVALUATE(RESAMPLER_DECORATE,_resampler_remove_sample)
+#endif
+
+void resampler_init(void);
+
+void * resampler_create(void);
+void resampler_delete(void *);
+void * resampler_dup(const void *);
+void resampler_dup_inplace(void *, const void *);
+
+enum
+{
+ RESAMPLER_QUALITY_MIN = 0,
+ RESAMPLER_QUALITY_ZOH = 0,
+ RESAMPLER_QUALITY_BLEP = 1,
+ RESAMPLER_QUALITY_LINEAR = 2,
+ RESAMPLER_QUALITY_BLAM = 3,
+ RESAMPLER_QUALITY_CUBIC = 4,
+ RESAMPLER_QUALITY_SINC = 5,
+ RESAMPLER_QUALITY_MAX = 5
+};
+
+void resampler_set_quality(void *, int quality);
+
+int resampler_get_free_count(void *);
+void resampler_write_sample(void *, short sample);
+void resampler_write_sample_fixed(void *, int sample, unsigned char depth);
+void resampler_set_rate( void *, double new_factor );
+int resampler_ready(void *);
+void resampler_clear(void *);
+int resampler_get_sample_count(void *);
+int resampler_get_sample(void *);
+float resampler_get_sample_float(void *);
+void resampler_remove_sample(void *, int decay);
+
+enum { SINC_WIDTH = 16 };
+enum { resampler_buffer_size = SINC_WIDTH * 4 };
+
+enum { RESAMPLER_SHIFT = 10 };
+enum { RESAMPLER_SHIFT_EXTRA = 8 };
+enum { RESAMPLER_RESOLUTION = 1 << RESAMPLER_SHIFT };
+enum { RESAMPLER_RESOLUTION_EXTRA = 1 << (RESAMPLER_SHIFT + RESAMPLER_SHIFT_EXTRA) };
+enum { SINC_SAMPLES = RESAMPLER_RESOLUTION * SINC_WIDTH };
+enum { CUBIC_SAMPLES = RESAMPLER_RESOLUTION * 4 };
+
+static const float RESAMPLER_BLEP_CUTOFF = 0.90f;
+static const float RESAMPLER_BLAM_CUTOFF = 0.93f;
+static const float RESAMPLER_SINC_CUTOFF = 0.999f;
+
+#ifdef _MSC_VER
+#define ALIGNED _declspec(align(16))
+#else
+#define ALIGNED __attribute__((aligned(16)))
+#endif
+
+extern ALIGNED float cubic_lutCUBIC_SAMPLES;
+extern float sinc_lutSINC_SAMPLES + 1;
+extern float window_lutSINC_SAMPLES + 1;
+
+typedef struct resampler
+{
+ int write_pos, write_filled;
+ int read_pos, read_filled;
+ float phase;
+ float phase_inc;
+ float inv_phase;
+ float inv_phase_inc;
+ unsigned char quality;
+ signed char delay_added;
+ signed char delay_removed;
+ float last_amp;
+ float accumulator;
+ float buffer_inresampler_buffer_size * 2;
+ float buffer_outresampler_buffer_size + SINC_WIDTH * 2 - 1;
+} resampler;
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/include/internal/riff.h -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/include/internal/riff.h Changed

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

@@ -0,0 +1,113 @@
+/* Copyright (C) 2002 Jean-Marc Valin */
+/**
+ @file stack_alloc.h
+ @brief Temporary memory allocation on stack
+*/
+/*
+ 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 name of the Xiph.org Foundation 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 FOUNDATION 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.
+*/
+
+#ifndef STACK_ALLOC_H
+#define STACK_ALLOC_H
+
+#ifdef WIN32
+# include <malloc.h>
+#else
+# ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+# else
+# include <stdlib.h>
+# endif
+#endif
+
+/**
+ * @def ALIGN(stack, size)
+ *
+ * Aligns the stack to a 'size' boundary
+ *
+ * @param stack Stack
+ * @param size New size boundary
+ */
+
+/**
+ * @def PUSH(stack, size, type)
+ *
+ * Allocates 'size' elements of type 'type' on the stack
+ *
+ * @param stack Stack
+ * @param size Number of elements
+ * @param type Type of element
+ */
+
+/**
+ * @def VARDECL(var)
+ *
+ * Declare variable on stack
+ *
+ * @param var Variable to declare
+ */
+
+/**
+ * @def ALLOC(var, size, type)
+ *
+ * Allocate 'size' elements of 'type' on stack
+ *
+ * @param var Name of variable to allocate
+ * @param size Number of elements
+ * @param type Type of element
+ */
+
+#ifdef ENABLE_VALGRIND
+
+#include <valgrind/memcheck.h>
+
+#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
+
+#define PUSH(stack, size, type) (VALGRIND_MAKE_NOACCESS(stack, 1000),ALIGN((stack),sizeof(type)),VALGRIND_MAKE_WRITABLE(stack, ((size)*sizeof(type))),(stack)+=((size)*sizeof(type)),(type*)((stack)-((size)*sizeof(type))))
+
+#else
+
+#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
+
+#define PUSH(stack, size, type) (ALIGN((stack),sizeof(type)),(stack)+=((size)*sizeof(type)),(type*)((stack)-((size)*sizeof(type))))
+
+#endif
+
+#if defined(VAR_ARRAYS)
+#define VARDECL(var)
+#define ALLOC(var, size, type) type varsize
+#elif defined(USE_ALLOCA)
+#define VARDECL(var) var
+#define ALLOC(var, size, type) var = alloca(sizeof(type)*(size))
+#else
+#define VARDECL(var) var
+#define ALLOC(var, size, type) var = PUSH(stack, size, type)
+#endif
+
+
+#endif

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

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/readme.txt -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/readme.txt Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/duhlen.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/core/duhlen.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/dumbfile.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/core/dumbfile.c Changed

@@ -23,27 +23,24 @@
 
 
 
-static DUMBFILE_SYSTEM *the_dfs = NULL;
+static const DUMBFILE_SYSTEM *the_dfs = NULL;
 
 
 
-void register_dumbfile_system(DUMBFILE_SYSTEM *dfs)
+void register_dumbfile_system(const DUMBFILE_SYSTEM *dfs)
 {
 	ASSERT(dfs);
 	ASSERT(dfs->open);
 	ASSERT(dfs->getc);
 	ASSERT(dfs->close);
+    ASSERT(dfs->seek);
+    ASSERT(dfs->get_size);
 	the_dfs = dfs;
 }
 
 
 
-struct DUMBFILE
-{
-	DUMBFILE_SYSTEM *dfs;
-	void *file;
-	long pos;
-};
+#include "internal/dumbfile.h"
 
 
 
@@ -53,7 +50,7 @@
 
 	ASSERT(the_dfs);
 
-	f = malloc(sizeof(*f));
+	f = (DUMBFILE *) malloc(sizeof(*f));
 
 	if (!f)
 		return NULL;
@@ -74,7 +71,7 @@
 
 
 
-DUMBFILE *dumbfile_open_ex(void *file, DUMBFILE_SYSTEM *dfs)
+DUMBFILE *dumbfile_open_ex(void *file, const DUMBFILE_SYSTEM *dfs)
 {
 	DUMBFILE *f;
 
@@ -82,7 +79,7 @@
 	ASSERT(dfs->getc);
 	ASSERT(file);
 
-	f = malloc(sizeof(*f));
+	f = (DUMBFILE *) malloc(sizeof(*f));
 
 	if (!f) {
 		if (dfs->close)
@@ -375,6 +372,26 @@
 
 
 
+int dumbfile_seek(DUMBFILE *f, long n, int origin)
+{
+    switch ( origin )
+    {
+    case DFS_SEEK_CUR: n += f->pos; break;
+    case DFS_SEEK_END: n += (*f->dfs->get_size)(f->file); break;
+    }
+    f->pos = n;
+    return (*f->dfs->seek)(f->file, n);
+}
+
+
+
+long dumbfile_get_size(DUMBFILE *f)
+{
+    return (*f->dfs->get_size)(f->file);
+}
+
+
+
 int dumbfile_error(DUMBFILE *f)
 {
 	ASSERT(f);

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/makeduh.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/core/makeduh.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/rawsig.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/core/rawsig.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/core/rendsig.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/core/rendsig.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/barray.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/barray.c Changed

@@ -53,6 +53,21 @@
 	}
 }
 
+void bit_array_set_range(void * array, size_t bit, size_t count)
+{
+ if (array && count)
+ {
+ size_t * size = (size_t *) array;
+ if (bit < *size)
+ {
+ unsigned char * ptr = (unsigned char *)(size + 1);
+ size_t i;
+ for (i = bit; i < *size && i < bit + count; ++i)
+ ptri >> 3 |= (1U << (i & 7));
+ }
+ }
+}
+
 int bit_array_test(void * array, size_t bit)
 {
 	if (array)
@@ -120,6 +135,21 @@
 	}
 }
 
+void bit_array_clear_range(void * array, size_t bit, size_t count)
+{
+ if (array && count)
+ {
+ size_t * size = (size_t *) array;
+ if (bit < *size)
+ {
+ unsigned char * ptr = (unsigned char *)(size + 1);
+ size_t i;
+ for (i = bit; i < *size && i < bit + count; ++i)
+ ptri >> 3 &= ~(1U << (i & 7));
+ }
+ }
+}
+
 void bit_array_merge(void * dest, void * source, size_t offset)
 {
 	if (dest && source)

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/lpc.c Added

@@ -0,0 +1,323 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 *
+ * by the Xiph.Org Foundation http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: LPC low level routines
+ last mod: $Id: lpc.c 16227 2009-07-08 06:58:46Z xiphmont $
+
+ ********************************************************************/
+
+/* Some of these routines (autocorrelator, LPC coefficient estimator)
+ are derived from code written by Jutta Degener and Carsten Bormann;
+ thus we include their copyright below. The entirety of this file
+ is freely redistributable on the condition that both of these
+ copyright notices are preserved without modification. */
+
+/* Preserved Copyright: *********************************************/
+
+/* Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
+Technische Universita"t Berlin
+
+Any use of this software is permitted provided that this notice is not
+removed and that neither the authors nor the Technische Universita"t
+Berlin are deemed to have made any representations as to the
+suitability of this software for any purpose nor are held responsible
+for any defects of this software. THERE IS ABSOLUTELY NO WARRANTY FOR
+THIS SOFTWARE.
+
+As a matter of courtesy, the authors request to be informed about uses
+this software has found, about bugs in this software, and about any
+improvements that may be of general interest.
+
+Berlin, 28.11.1994
+Jutta Degener
+Carsten Bormann
+
+*********************************************************************/
+
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "internal/stack_alloc.h"
+#include "internal/lpc.h"
+
+/* Autocorrelation LPC coeff generation algorithm invented by
+ N. Levinson in 1947, modified by J. Durbin in 1959. */
+
+/* Input : n elements of time doamin data
+ Output: m lpc coefficients, excitation energy */
+
+float vorbis_lpc_from_data(float *data,float *lpci,int n,int m){
+ double *aut=alloca(sizeof(*aut)*(m+1));
+ double *lpc=alloca(sizeof(*lpc)*(m));
+ double error;
+ double epsilon;
+ int i,j;
+
+ /* autocorrelation, p+1 lag coefficients */
+ j=m+1;
+ while(j--){
+ double d=0; /* double needed for accumulator depth */
+ for(i=j;i<n;i++)d+=(double)datai*data(i-j);
+ autj=d;
+ }
+
+ /* Generate lpc coefficients from autocorr values */
+
+ /* set our noise floor to about -100dB */
+ error=aut0 * (1. + 1e-10);
+ epsilon=1e-9*aut0+1e-10;
+
+ for(i=0;i<m;i++){
+ double r= -auti+1;
+
+ if(error<epsilon){
+ memset(lpc+i,0,(m-i)*sizeof(*lpc));
+ goto done;
+ }
+
+ /* Sum up this iteration's reflection coefficient; note that in
+ Vorbis we don't save it. If anyone wants to recycle this code
+ and needs reflection coefficients, save the results of 'r' from
+ each iteration. */
+
+ for(j=0;j<i;j++)r-=lpcj*auti-j;
+ r/=error;
+
+ /* Update LPC coefficients and total error */
+
+ lpci=r;
+ for(j=0;j<i/2;j++){
+ double tmp=lpcj;
+
+ lpcj+=r*lpci-1-j;
+ lpci-1-j+=r*tmp;
+ }
+ if(i&1)lpcj+=lpcj*r;
+
+ error*=1.-r*r;
+
+ }
+
+ done:
+
+ /* slightly damp the filter */
+ {
+ double g = .99;
+ double damp = g;
+ for(j=0;j<m;j++){
+ lpcj*=damp;
+ damp*=g;
+ }
+ }
+
+ for(j=0;j<m;j++)lpcij=(float)lpcj;
+
+ /* we need the error value to know how big an impulse to hit the
+ filter with later */
+
+ return error;
+}
+
+void vorbis_lpc_predict(float *coeff,float *prime,int m,
+ float *data,long n){
+
+ /* in: coeff0...m-1 LPC coefficients
+ prime0...m-1 initial values (allocated size of n+m-1)
+ out: data0...n-1 data samples */
+
+ long i,j,o,p;
+ float y;
+ float *work=alloca(sizeof(*work)*(m+n));
+
+ if(!prime)
+ for(i=0;i<m;i++)
+ worki=0.f;
+ else
+ for(i=0;i<m;i++)
+ worki=primei;
+
+ for(i=0;i<n;i++){
+ y=0;
+ o=i;
+ p=m;
+ for(j=0;j<m;j++)
+ y-=worko++*coeff--p;
+
+ datai=worko=y;
+ }
+}
+
+#include "dumb.h"
+#include "internal/dumb.h"
+#include "internal/it.h"
+
+enum { lpc_max = 256 }; /* Maximum number of input samples to train the function */
+enum { lpc_order = 32 }; /* Order of the filter */
+enum { lpc_extra = 64 }; /* How many samples of padding to predict or silence */
+
+
+/* This extra sample padding is really only needed by the FIR resampler, but it helps the other resamplers as well. */
+
+void dumb_it_add_lpc(struct DUMB_IT_SIGDATA *sigdata){
+ float lpclpc_order * 2;
+ float lpc_inputlpc_max * 2;
+ float lpc_outputlpc_extra * 2;
+
+ signed char * s8;
+ signed short * s16;
+
+ int n, o, offset, lpc_samples;
+
+ for ( n = 0; n < sigdata->n_samples; n++ ) {
+ IT_SAMPLE * sample = sigdata->sample + n;
+ if ( ( sample->flags & ( IT_SAMPLE_EXISTS | IT_SAMPLE_LOOP) ) == IT_SAMPLE_EXISTS ) {
+ /* If we have enough sample data to train the filter, use the filter to generate the padding */
+ if ( sample->length >= lpc_order ) {
+ lpc_samples = sample->length;
+ if (lpc_samples > lpc_max) lpc_samples = lpc_max;
+ offset = sample->length - lpc_samples;
+
+ if ( sample->flags & IT_SAMPLE_STEREO )
+ {
+ if ( sample->flags & IT_SAMPLE_16BIT )
+ {
+ s16 = ( signed short * ) sample->data;
+ s16 += offset * 2;
+ for ( o = 0; o < lpc_samples; o++ )
+ {
+ lpc_input o = s16 o * 2 + 0 ;
+ lpc_input o + lpc_max = s16 o * 2 + 1 ;
+ }
+ }
+ else
+ {
+ s8 = ( signed char * ) sample->data;
+ s8 += offset * 2;
+ for ( o = 0; o < lpc_samples; o++ )
+ {
+ lpc_input o = s8 o * 2 + 0 ;
+ lpc_input o + lpc_max = s8 o * 2 + 1 ;
+ }
+ }
+
+ vorbis_lpc_from_data( lpc_input, lpc, lpc_samples, lpc_order );
+ vorbis_lpc_from_data( lpc_input + lpc_max, lpc + lpc_order, lpc_samples, lpc_order );
+
+ vorbis_lpc_predict( lpc, lpc_input + lpc_samples - lpc_order, lpc_order, lpc_output, lpc_extra );
+ vorbis_lpc_predict( lpc + lpc_order, lpc_input + lpc_max + lpc_samples - lpc_order, lpc_order, lpc_output + lpc_extra, lpc_extra );
+
+ if ( sample->flags & IT_SAMPLE_16BIT )
+ {
+ s16 = ( signed short * ) realloc( sample->data, ( sample->length + lpc_extra ) * 2 * sizeof(short) );
+ sample->data = s16;
+
+ s16 += sample->length * 2;
+ sample->length += lpc_extra;
+
+ for ( o = 0; o < lpc_extra; o++ )
+ {
+ s16 o * 2 + 0 = lpc_output o ;
+ s16 o * 2 + 1 = lpc_output o + lpc_extra ;
+ }
+ }
+ else
+ {
+ s8 = ( signed char * ) realloc( sample->data, ( sample->length + lpc_extra ) * 2 );
+ sample->data = s8;
+
+ s8 += sample->length * 2;
+ sample->length += lpc_extra;
+
+ for ( o = 0; o < lpc_extra; o++ )
+ {
+ s8 o * 2 + 0 = lpc_output o ;
+ s8 o * 2 + 1 = lpc_output o + lpc_extra ;
+ }
+ }
+ }
+ else
+ {
+ if ( sample->flags & IT_SAMPLE_16BIT )
+ {
+ s16 = ( signed short * ) sample->data;
+ s16 += offset;
+ for ( o = 0; o < lpc_samples; o++ )
+ {
+ lpc_input o = s16 o ;
+ }
+ }
+ else
+ {
+ s8 = ( signed char * ) sample->data;
+ s8 += offset;
+ for ( o = 0; o < lpc_samples; o++ )
+ {
+ lpc_input o = s8 o ;
+ }
+ }
+
+ vorbis_lpc_from_data( lpc_input, lpc, lpc_samples, lpc_order );
+
+ vorbis_lpc_predict( lpc, lpc_input + lpc_samples - lpc_order, lpc_order, lpc_output, lpc_extra );
+
+ if ( sample->flags & IT_SAMPLE_16BIT )
+ {
+ s16 = ( signed short * ) realloc( sample->data, ( sample->length + lpc_extra ) * sizeof(short) );
+ sample->data = s16;
+
+ s16 += sample->length;
+ sample->length += lpc_extra;
+
+ for ( o = 0; o < lpc_extra; o++ )
+ {
+ s16 o = lpc_output o ;
+ }
+ }
+ else
+ {
+ s8 = ( signed char * ) realloc( sample->data, sample->length + lpc_extra );
+ sample->data = s8;
+
+ s8 += sample->length;
+ sample->length += lpc_extra;
+
+ for ( o = 0; o < lpc_extra; o++ )
+ {
+ s8 o = lpc_output o ;
+ }
+ }
+ }
+ }
+ else
+ /* Otherwise, pad with silence. */
+ {
+ offset = sample->length;
+ lpc_samples = lpc_extra;
+
+ sample->length += lpc_samples;
+
+ n = 1;
+ if ( sample->flags & IT_SAMPLE_STEREO ) n *= 2;
+ if ( sample->flags & IT_SAMPLE_16BIT ) n *= 2;
+
+ offset *= n;
+ lpc_samples *= n;
+
+ sample->data = realloc( sample->data, offset + lpc_samples );
+ memset( (char*)sample->data + offset, 0, lpc_samples );
+ }
+ }
+ }
+}

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/memfile.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/memfile.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resamp2.inc -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resamp2.inc Changed

@@ -1,160 +1,162 @@
-/* _______ ____ __ ___ ___
- * \ _ \ \ / \ / \ \ / / ' ' '
- * | | \ \ | | || | \/ | . .
- * | | | | | | || ||\ /| |
- * | | | | | | || || \/ | | ' ' '
- * | | | | | | || || | | . .
- * | |_/ / \ \__// || | |
- * /_______/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
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/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 PEEK_FIR MONO_DEST_PEEK_FIR
+#define MIX_FIR MONO_DEST_MIX_FIR
+#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, lvolr = 0, lvold, lvolt, lvolm, rvol, rvolr = 0, rvold, rvolt, rvolm
+#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; \
+		lvold = 0; \
+		lvolt = 0; \
+		lvolm = 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; \
+		rvold = 0; \
+		rvolt = 0; \
+		rvolm = 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 PEEK_FIR STEREO_DEST_PEEK_FIR
+#define MIX_FIR STEREO_DEST_MIX_FIR
+#define MIX_ZEROS(op) { *dst++ op 0; *dst++ op 0; }
+#include "resamp3.inc"
+
+
+
+#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 MONO_DEST_PEEK_FIR
+#undef STEREO_DEST_PEEK_FIR
+#undef MONO_DEST_MIX_FIR
+#undef STEREO_DEST_MIX_FIR
+#undef ADVANCE_FIR
+#undef POKE_FIR
+#undef COPYSRC2
+#undef COPYSRC
+#undef DIVIDE_BY_SRC_CHANNELS
+#undef SRC_CHANNELS
+#undef SUFFIX2

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resamp3.inc -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resamp3.inc Changed

@@ -1,376 +1,259 @@
-/* _______ ____ __ ___ ___
- * \ _ \ \ / \ / \ \ / / ' ' '
- * | | \ \ | | || | \/ | . .
- * | | | | | | || ||\ /| |
- * | | | | | | || || \/ | | ' ' '
- * | | | | | | || || | | . .
- * | |_/ / \ \__// || | |
- * /_______/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 xbuf2*SRC_CHANNELS;
-					SRCTYPE *x = &xbuf0;
-					SRCTYPE *xstart;
-					COPYSRC(xbuf, 0, resampler->X, 1);
-					COPYSRC(xbuf, 1, resampler->X, 2);
-					while (todo && x < &xbuf2*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 = &srcpos*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 xbuf3*SRC_CHANNELS;
-					SRCTYPE *x = &xbuf1*SRC_CHANNELS;
-					COPYSRC(xbuf, 0, resampler->X, 1);
-					COPYSRC(xbuf, 1, resampler->X, 2);
-					COPYSRC(xbuf, 2, src, pos);
-					while (todo && x < &xbuf3*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 = &srcpos*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 xbuf6*SRC_CHANNELS;
-					SRCTYPE *x = &xbuf3*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 < &xbuf6*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 = &srcpos*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 xbuf2*SRC_CHANNELS;
-					SRCTYPE *x = &xbuf0;
-					SRCTYPE *xstart;
-					COPYSRC(xbuf, 0, resampler->X, 1);
-					COPYSRC(xbuf, 1, resampler->X, 2);
-					while (todo && x < &xbuf2*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 = &srcpos*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 xbuf3*SRC_CHANNELS;
-					SRCTYPE *x = &xbuf1*SRC_CHANNELS;
-					COPYSRC(xbuf, 0, resampler->X, 1);
-					COPYSRC(xbuf, 1, resampler->X, 2);
-					COPYSRC(xbuf, 2, src, pos);
-					while (todo && x < &xbuf3*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 = &srcpos*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 xbuf6*SRC_CHANNELS;
-					SRCTYPE *x = &xbuf3*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 < &xbuf6*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 = &srcpos*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
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/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, inv_dt;
+	int VOLUME_VARIABLES;
+	long done;
+	long todo;
+	LONG_LONG todo64;
+	int quality;
+	int check;
+
+	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 || dt == (int)-0x80000000) return 0;
+ inv_dt = (int)(1.0 / delta * 65536.0 + 0.5);
+	SET_VOLUME_VARIABLES;
+
+	if (VOLUMES_ARE_ZERO) dst = NULL;
+
+	_dumb_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 {
+ /* FIR resampling, backwards */
+ SRCTYPE *x;
+ if ( resampler->fir_resampler_ratio != delta ) {
+ resampler_set_rate( resampler->fir_resampler0, delta );
+ resampler_set_rate( resampler->fir_resampler1, delta );
+ resampler->fir_resampler_ratio = delta;
+ }
+ x = &srcpos*SRC_CHANNELS;
+ while ( todo ) {
+ while ( ( resampler_get_free_count( resampler->fir_resampler0 ) ||
+ (!resampler_get_sample_count( resampler->fir_resampler0 )
+#if SRC_CHANNELS == 2
+ && !resampler_get_sample_count( resampler->fir_resampler1 )
+#endif
+ ) ) && pos >= resampler->start )
+ {
+ POKE_FIR(0);
+ pos--;
+ x -= SRC_CHANNELS;
+ }
+ if ( !resampler_get_sample_count( resampler->fir_resampler0 ) ) break;
+ MIX_FIR;
+ ADVANCE_FIR;
+ --todo;
+ }
+ done -= todo;
+ }
+				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 {
+ /* FIR resampling, forwards */
+ SRCTYPE *x;
+ if ( resampler->fir_resampler_ratio != delta ) {
+ resampler_set_rate( resampler->fir_resampler0, delta );
+ resampler_set_rate( resampler->fir_resampler1, delta );
+ resampler->fir_resampler_ratio = delta;
+ }
+ x = &srcpos*SRC_CHANNELS;
+ while ( todo ) {
+ while ( ( resampler_get_free_count( resampler->fir_resampler0 ) ||
+ (!resampler_get_sample_count( resampler->fir_resampler0 )
+#if SRC_CHANNELS == 2
+ && !resampler_get_sample_count( resampler->fir_resampler1 )
+#endif
+ ) ) && pos < resampler->end )
+ {
+ POKE_FIR(0);
+ pos++;
+ x += SRC_CHANNELS;
+ }
+ if ( !resampler_get_sample_count( resampler->fir_resampler0 ) ) break;
+ MIX_FIR;
+ ADVANCE_FIR;
+ --todo;
+ }
+ done -= todo;
+ }
+				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; }
+
+	_dumb_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);
+ /* FIR resampling, backwards */
+ PEEK_FIR;
+	} else {
+		HEAVYASSERT(pos < resampler->end);
+ /* FIR resampling, forwards */
+ PEEK_FIR;
+	}
+}
+
+
+
+#undef MIX_ZEROS
+#undef MIX_FIR
+#undef PEEK_FIR
+#undef VOLUMES_ARE_ZERO
+#undef SET_VOLUME_VARIABLES
+#undef RETURN_VOLUME_VARIABLES
+#undef VOLUME_VARIABLES
+#undef VOLUME_PARAMETERS
+#undef SUFFIX3

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resample.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resample.c Changed

@@ -45,6 +45,8 @@
 #include <math.h>
 #include "dumb.h"
 
+#include "internal/resampler.h"
+
 
 
 /* Compile with -DHEAVYDEBUG if you want to make sure the pick-up function is
@@ -70,10 +72,13 @@
 * specification doesn't override it. The following values are valid:
 *
 * 0 - DUMB_RQ_ALIASING - fastest
- * 1 - DUMB_RQ_LINEAR
- * 2 - DUMB_RQ_CUBIC - nicest
+ * 1 - DUMB_RQ_BLEP - nicer than aliasing, but slower
+ * 2 - DUMB_RQ_LINEAR
+ * 3 - DUMB_RQ_BLAM - band-limited linear interpolation, nice but slower
+ * 4 - DUMB_RQ_CUBIC
+ * 5 - DUMB_RQ_FIR - nicest
 *
- * Values outside the range 0-2 will behave the same as the nearest
+ * Values outside the range 0-4 will behave the same as the nearest
 * value within the range.
 */
 int dumb_resampling_quality = DUMB_RQ_CUBIC;
@@ -92,6 +97,7 @@
 * Clobbers the 'iterator' variable.
 * The loop is unrolled by four.
 */
+#if 0
 #define LOOP4(iterator, CONTENT) \
 { \
 	if ((iterator) & 2) { \
@@ -110,8 +116,15 @@
 		(iterator)--; \
 	} \
 }
-
-
+#else
+#define LOOP4(iterator, CONTENT) \
+{ \
+	while ( (iterator)-- ) \
+	{ \
+		CONTENT; \
+	} \
+}
+#endif
 
 #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. */
@@ -120,45 +133,14 @@
 
 
 
-/* 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 cubicA01025, cubicA11025;
-
-/*static*/ void init_cubic(void)
+void _dumb_init_cubic(void)
 {
-	unsigned int t; /* 3*1024*1024*1024 is within range if it's unsigned */
 	static int done = 0;
 	if (done) return;
+
+	resampler_init();
+
 	done = 1;
-	for (t = 0; t < 1025; t++) {
-		/* int casts to pacify warnings about negating unsigned values */
-		cubicA0t = -(int)( t*t*t >> 17) + (int)( t*t >> 6) - (int)(t << 3);
-		cubicA1t = (int)(3*t*t*t >> 17) - (int)(5*t*t >> 7) + (int)(1 << 14);
-	}
 }
 
 
@@ -176,22 +158,7 @@
 
 #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, cubicA0subpos >> 6 << 2) + \
-	MULSC(x1, cubicA1subpos >> 6 << 2) + \
-	MULSC(x2, cubicA11 + (subpos >> 6 ^ 1023) << 2) + \
-	MULSC(x3, cubicA01 + (subpos >> 6 ^ 1023) << 2))
-#define CUBICVOL(x, vol) MULSC(x, vol)
+#define FIR(x) (x >> 8)
 #include "resample.inc"
 
 /* Undefine the simplified macros. */
@@ -212,44 +179,14 @@
 #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 * cubicA0subpos >> 6 + \
-	x1 * cubicA1subpos >> 6 + \
-	x2 * cubicA11 + (subpos >> 6 ^ 1023) + \
-	x3 * cubicA01 + (subpos >> 6 ^ 1023))
-#define CUBICVOL(x, vol) (int)((LONG_LONG)(x) * (vol << 10) >> 32)
+#define FIR(x) (x)
 #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 * cubicA0subpos >> 6 + \
-	x1 * cubicA1subpos >> 6 + \
-	x2 * cubicA11 + (subpos >> 6 ^ 1023) + \
-	x3 * cubicA01 + (subpos >> 6 ^ 1023)) << 6)
-#define CUBICVOL(x, vol) (int)((LONG_LONG)(x) * (vol << 12) >> 32)
+#define FIR(x) (x << 8)
 #include "resample.inc"

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resample.inc -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resample.inc Changed

@@ -1,264 +1,256 @@
-/* _______ ____ __ ___ ___
- * \ _ \ \ / \ / \ \ / / ' ' '
- * | | \ \ | | || | \/ | . .
- * | | | | | | || ||\ /| |
- * | | | | | | || || \/ | | ' ' '
- * | | | | | | || || | | . .
- * | |_/ / \ \__// || | |
- * /_______/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->Xi = 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(xoffset, vol); \
-	if ( upd ) UPDATE_VOLUME( volume, vol ); \
-}
-#define STEREO_DEST_MIX_ALIAS(op, upd, offset) { \
-	int xm = xoffset; \
-	*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(xo0, xo1), vol); \
-	if ( upd ) UPDATE_VOLUME( volume, vol ); \
-}
-#define STEREO_DEST_MIX_LINEAR(op, upd, o0, o1) { \
-	int xm = LINEAR(xo0, xo1); \
-	*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(x0o0, xo1, xo2, x3o3), vol); \
-	if ( upd ) UPDATE_VOLUME( volume, vol ); \
-}
-#define STEREO_DEST_MIX_CUBIC(op, upd, x0, x3, o0, o1, o2, o3) { \
-	int xm = CUBIC(x0o0, xo1, xo2, x3o3); \
-	*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
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/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->Xi = 0;
+	resampler->overshot = -1;
+ resampler->fir_resampler_ratio = 0;
+ resampler_clear(resampler->fir_resampler0);
+ resampler_clear(resampler->fir_resampler1);
+ resampler_set_quality(resampler->fir_resampler0, resampler->quality);
+ resampler_set_quality(resampler->fir_resampler1, resampler->quality);
+}
+
+
+
+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; \
+ if ( pvol->declick_stage == 0 || \
+ pvol->declick_stage >= 3) \
+ pvol->declick_stage++; \
+			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, volr = 0, vold, volt, volm
+#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; \
+		vold = 0; \
+		volt = 0; \
+		volm = 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 POKE_FIR(offset) { \
+ resampler_write_sample( resampler->fir_resampler0, FIR(xoffset) ); \
+}
+#define MONO_DEST_PEEK_FIR *dst = MULSC( resampler_get_sample( resampler->fir_resampler0 ), vol )
+#define MONO_DEST_MIX_FIR { \
+ *dst++ += MULSC( resampler_get_sample( resampler->fir_resampler0 ), vol ); \
+ UPDATE_VOLUME( volume, vol ); \
+}
+#define ADVANCE_FIR resampler_remove_sample( resampler->fir_resampler0, 1 )
+#define STEREO_DEST_PEEK_FIR { \
+ int sample = resampler_get_sample( resampler->fir_resampler0 ); \
+ *dst++ = MULSC( sample, lvol ); \
+ *dst++ = MULSC( sample, rvol ); \
+}
+#define STEREO_DEST_MIX_FIR { \
+ int sample = resampler_get_sample( resampler->fir_resampler0 ); \
+ *dst++ += MULSC( sample, lvol ); \
+ *dst++ += MULSC( sample, rvol ); \
+ UPDATE_VOLUME( volume_left, lvol ); \
+ 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, lvolt, lvolm, rvol = 0, rvolr = 0, rvold, rvolt, rvolm
+#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; \
+		lvold = 0; \
+		lvolt = 0; \
+		lvolm = 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; \
+		rvold = 0; \
+		rvolt = 0; \
+		rvolm = 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 POKE_FIR(offset) { \
+ resampler_write_sample( resampler->fir_resampler0, FIR(x(offset)*2+0) ); \
+ resampler_write_sample( resampler->fir_resampler1, FIR(x(offset)*2+1) ); \
+}
+#define MONO_DEST_PEEK_FIR { \
+ *dst = MULSC( resampler_get_sample( resampler->fir_resampler0 ), lvol ) + \
+ MULSC( resampler_get_sample( resampler->fir_resampler1 ), rvol ); \
+}
+#define MONO_DEST_MIX_FIR { \
+ *dst++ += MULSC( resampler_get_sample( resampler->fir_resampler0 ), lvol ) + \
+ MULSC( resampler_get_sample( resampler->fir_resampler1 ), rvol ); \
+ UPDATE_VOLUME( volume_left, lvol ); \
+ UPDATE_VOLUME( volume_right, rvol ); \
+}
+#define ADVANCE_FIR { \
+ resampler_remove_sample( resampler->fir_resampler0, 1 ); \
+ resampler_remove_sample( resampler->fir_resampler1, 1 ); \
+}
+#define STEREO_DEST_PEEK_FIR { \
+ *dst++ = MULSC( resampler_get_sample( resampler->fir_resampler0 ), lvol ); \
+ *dst++ = MULSC( resampler_get_sample( resampler->fir_resampler1 ), rvol ); \
+}
+#define STEREO_DEST_MIX_FIR { \
+ *dst++ += MULSC( resampler_get_sample( resampler->fir_resampler0 ), lvol ); \
+ *dst++ += MULSC( resampler_get_sample( resampler->fir_resampler1 ), rvol ); \
+ UPDATE_VOLUME( volume_left, lvol ); \
+ UPDATE_VOLUME( volume_right, rvol ); \
+}
+#include "resamp2.inc"
+
+
+
+void dumb_end_resampler(DUMB_RESAMPLER *resampler)
+{
+	if (resampler)
+		free(resampler);
+}
+
+
+
+#undef FIR
+#undef SRCBITS
+#undef SRCTYPE
+#undef SUFFIX

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resampler.c Added

@@ -0,0 +1,1149 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <stdlib.h>
+#include <string.h>
+#define _USE_MATH_DEFINES
+#include <math.h>
+#ifdef __APPLE__
+#include <TargetConditionals.h>
+#if TARGET_CPU_ARM || TARGET_CPU_ARM64
+#define RESAMPLER_NEON
+#endif
+#endif
+#ifdef RESAMPLER_NEON
+#include <arm_neon.h>
+#endif
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#include "internal/resampler.h"
+#if HAVE_SSE2
+#define RESAMPLER_SSE
+extern int resampler_run_blep_sse(resampler * r, float ** out_, float * out_end);
+extern int resampler_run_blam_sse(resampler * r, float ** out_, float * out_end);
+extern int resampler_run_cubic_sse(resampler * r, float ** out_, float * out_end);
+extern int resampler_run_sinc_sse(resampler * r, float ** out_, float * out_end);
+#endif
+
+ALIGNED float cubic_lutCUBIC_SAMPLES;
+float sinc_lutSINC_SAMPLES + 1;
+float window_lutSINC_SAMPLES + 1;
+
+static int fEqual(const float b, const float a)
+{
+ return fabs(a - b) < 1.0e-6;
+}
+
+static float sinc(float x)
+{
+ return fEqual(x, 0.0) ? 1.0 : sin(x * M_PI) / (x * M_PI);
+}
+
+#ifdef RESAMPLER_SSE
+#ifdef _MSC_VER
+#include <intrin.h>
+#elif defined(__clang__) || defined(__GNUC__)
+static inline void
+__cpuid(int *data, int selector)
+{
+#if defined(__PIC__) && defined(__i386__)
+ asm("xchgl %%ebx, %%esi; cpuid; xchgl %%ebx, %%esi"
+ : "=a" (data0),
+ "=S" (data1),
+ "=c" (data2),
+ "=d" (data3)
+ : "0" (selector));
+#elif defined(__PIC__) && defined(__amd64__)
+ asm("xchg{q} {%%}rbx, %q1; cpuid; xchg{q} {%%}rbx, %q1"
+ : "=a" (data0),
+ "=&r" (data1),
+ "=c" (data2),
+ "=d" (data3)
+ : "0" (selector));
+#else
+ asm("cpuid"
+ : "=a" (data0),
+ "=b" (data1),
+ "=c" (data2),
+ "=d" (data3)
+ : "0" (selector));
+#endif
+}
+#else
+#define __cpuid(a,b) memset((a), 0, sizeof(int) * 4)
+#endif
+
+static int query_cpu_feature_sse() {
+ int buffer4;
+ __cpuid(buffer,1);
+ if ((buffer3&(1<<25)) == 0) return 0;
+ return 1;
+}
+
+static int resampler_has_sse = 0;
+#endif
+
+void resampler_init(void)
+{
+ unsigned i;
+ double dx = (float)(SINC_WIDTH) / SINC_SAMPLES, x = 0.0;
+ for (i = 0; i < SINC_SAMPLES + 1; ++i, x += dx)
+ {
+ float y = x / SINC_WIDTH;
+#if 0
+ // Blackman
+ float window = 0.42659 - 0.49656 * cos(M_PI + M_PI * y) + 0.076849 * cos(2.0 * M_PI * y);
+#elif 1
+ // Nuttal 3 term
+ float window = 0.40897 + 0.5 * cos(M_PI * y) + 0.09103 * cos(2.0 * M_PI * y);
+#elif 0
+ // C.R.Helmrich's 2 term window
+ float window = 0.79445 * cos(0.5 * M_PI * y) + 0.20555 * cos(1.5 * M_PI * y);
+#elif 0
+ // Lanczos
+ float window = sinc(y);
+#endif
+ sinc_luti = fabs(x) < SINC_WIDTH ? sinc(x) : 0.0;
+ window_luti = window;
+ }
+ dx = 1.0 / (float)(RESAMPLER_RESOLUTION);
+ x = 0.0;
+ for (i = 0; i < RESAMPLER_RESOLUTION; ++i, x += dx)
+ {
+ cubic_luti*4 = (float)(-0.5 * x * x * x + x * x - 0.5 * x);
+ cubic_luti*4+1 = (float)( 1.5 * x * x * x - 2.5 * x * x + 1.0);
+ cubic_luti*4+2 = (float)(-1.5 * x * x * x + 2.0 * x * x + 0.5 * x);
+ cubic_luti*4+3 = (float)( 0.5 * x * x * x - 0.5 * x * x);
+ }
+#ifdef RESAMPLER_SSE
+ resampler_has_sse = query_cpu_feature_sse();
+#endif
+}
+
+void * resampler_create(void)
+{
+ resampler * r = ( resampler * ) malloc( sizeof(resampler) );
+ if ( !r ) return 0;
+
+ r->write_pos = SINC_WIDTH - 1;
+ r->write_filled = 0;
+ r->read_pos = 0;
+ r->read_filled = 0;
+ r->phase = 0;
+ r->phase_inc = 0;
+ r->inv_phase = 0;
+ r->inv_phase_inc = 0;
+ r->quality = RESAMPLER_QUALITY_MAX;
+ r->delay_added = -1;
+ r->delay_removed = -1;
+ r->last_amp = 0;
+ r->accumulator = 0;
+ memset( r->buffer_in, 0, sizeof(r->buffer_in) );
+ memset( r->buffer_out, 0, sizeof(r->buffer_out) );
+
+ return r;
+}
+
+void resampler_delete(void * _r)
+{
+ free( _r );
+}
+
+void * resampler_dup(const void * _r)
+{
+ void * r_out = malloc( sizeof(resampler) );
+ if ( !r_out ) return 0;
+
+ resampler_dup_inplace(r_out, _r);
+
+ return r_out;
+}
+
+void resampler_dup_inplace(void *_d, const void *_s)
+{
+ const resampler * r_in = ( const resampler * ) _s;
+ resampler * r_out = ( resampler * ) _d;
+
+ r_out->write_pos = r_in->write_pos;
+ r_out->write_filled = r_in->write_filled;
+ r_out->read_pos = r_in->read_pos;
+ r_out->read_filled = r_in->read_filled;
+ r_out->phase = r_in->phase;
+ r_out->phase_inc = r_in->phase_inc;
+ r_out->inv_phase = r_in->inv_phase;
+ r_out->inv_phase_inc = r_in->inv_phase_inc;
+ r_out->quality = r_in->quality;
+ r_out->delay_added = r_in->delay_added;
+ r_out->delay_removed = r_in->delay_removed;
+ r_out->last_amp = r_in->last_amp;
+ r_out->accumulator = r_in->accumulator;
+ memcpy( r_out->buffer_in, r_in->buffer_in, sizeof(r_in->buffer_in) );
+ memcpy( r_out->buffer_out, r_in->buffer_out, sizeof(r_in->buffer_out) );
+}
+
+void resampler_set_quality(void *_r, int quality)
+{
+ resampler * r = ( resampler * ) _r;
+ if (quality < RESAMPLER_QUALITY_MIN)
+ quality = RESAMPLER_QUALITY_MIN;
+ else if (quality > RESAMPLER_QUALITY_MAX)
+ quality = RESAMPLER_QUALITY_MAX;
+ if ( r->quality != quality )
+ {
+ if ( quality == RESAMPLER_QUALITY_BLEP || r->quality == RESAMPLER_QUALITY_BLEP ||
+ quality == RESAMPLER_QUALITY_BLAM || r->quality == RESAMPLER_QUALITY_BLAM )
+ {
+ r->read_pos = 0;
+ r->read_filled = 0;
+ r->last_amp = 0;
+ r->accumulator = 0;
+ memset( r->buffer_out, 0, sizeof(r->buffer_out) );
+ }
+ r->delay_added = -1;
+ r->delay_removed = -1;
+ }
+ r->quality = (unsigned char)quality;
+}
+
+int resampler_get_free_count(void *_r)
+{
+ resampler * r = ( resampler * ) _r;
+ return resampler_buffer_size - r->write_filled;
+}
+
+static int resampler_min_filled(resampler *r)
+{
+ switch (r->quality)
+ {
+ default:
+ case RESAMPLER_QUALITY_ZOH:
+ case RESAMPLER_QUALITY_BLEP:
+ return 1;
+ 
+ case RESAMPLER_QUALITY_LINEAR:
+ case RESAMPLER_QUALITY_BLAM:
+ return 2;
+ 
+ case RESAMPLER_QUALITY_CUBIC:
+ return 4;
+ 
+ case RESAMPLER_QUALITY_SINC:
+ return SINC_WIDTH * 2;
+ }
+}
+
+static int resampler_input_delay(resampler *r)
+{
+ switch (r->quality)
+ {
+ default:
+ case RESAMPLER_QUALITY_ZOH:
+ case RESAMPLER_QUALITY_BLEP:
+ case RESAMPLER_QUALITY_LINEAR:
+ case RESAMPLER_QUALITY_BLAM:
+ return 0;
+ 
+ case RESAMPLER_QUALITY_CUBIC:
+ return 1;
+ 
+ case RESAMPLER_QUALITY_SINC:
+ return SINC_WIDTH - 1;
+ }
+}
+
+static int resampler_output_delay(resampler *r)
+{
+ switch (r->quality)
+ {
+ default:
+ case RESAMPLER_QUALITY_ZOH:
+ case RESAMPLER_QUALITY_LINEAR:
+ case RESAMPLER_QUALITY_CUBIC:
+ case RESAMPLER_QUALITY_SINC:
+ return 0;
+ 
+ case RESAMPLER_QUALITY_BLEP:
+ case RESAMPLER_QUALITY_BLAM:
+ return SINC_WIDTH - 1;
+ }
+}
+
+int resampler_ready(void *_r)
+{
+ resampler * r = ( resampler * ) _r;
+ return r->write_filled > resampler_min_filled(r);
+}
+
+void resampler_clear(void *_r)
+{
+ resampler * r = ( resampler * ) _r;
+ r->write_pos = SINC_WIDTH - 1;
+ r->write_filled = 0;
+ r->read_pos = 0;
+ r->read_filled = 0;
+ r->phase = 0;
+ r->delay_added = -1;
+ r->delay_removed = -1;
+ memset(r->buffer_in, 0, (SINC_WIDTH - 1) * sizeof(r->buffer_in0));
+ memset(r->buffer_in + resampler_buffer_size, 0, (SINC_WIDTH - 1) * sizeof(r->buffer_in0));
+ if (r->quality == RESAMPLER_QUALITY_BLEP || r->quality == RESAMPLER_QUALITY_BLAM)
+ {
+ r->inv_phase = 0;
+ r->last_amp = 0;
+ r->accumulator = 0;
+ memset(r->buffer_out, 0, sizeof(r->buffer_out));
+ }
+}
+
+void resampler_set_rate(void *_r, double new_factor)
+{
+ resampler * r = ( resampler * ) _r;
+ r->phase_inc = new_factor;
+ new_factor = 1.0 / new_factor;
+ r->inv_phase_inc = new_factor;
+}
+
+void resampler_write_sample(void *_r, short s)
+{
+ resampler * r = ( resampler * ) _r;
+
+ if ( r->delay_added < 0 )
+ {
+ r->delay_added = 0;
+ r->write_filled = resampler_input_delay( r );
+ }
+ 
+ if ( r->write_filled < resampler_buffer_size )
+ {
+ float s32 = s;
+ s32 *= 256.0;
+
+ r->buffer_in r->write_pos = s32;
+ r->buffer_in r->write_pos + resampler_buffer_size = s32;
+
+ ++r->write_filled;
+
+ r->write_pos = ( r->write_pos + 1 ) % resampler_buffer_size;
+ }
+}
+
+void resampler_write_sample_fixed(void *_r, int s, unsigned char depth)
+{
+ resampler * r = ( resampler * ) _r;
+ 
+ if ( r->delay_added < 0 )
+ {
+ r->delay_added = 0;
+ r->write_filled = resampler_input_delay( r );
+ }
+ 
+ if ( r->write_filled < resampler_buffer_size )
+ {
+ float s32 = s;
+ s32 /= (double)(1 << (depth - 1));
+ 
+ r->buffer_in r->write_pos = s32;
+ r->buffer_in r->write_pos + resampler_buffer_size = s32;
+ 
+ ++r->write_filled;
+ 
+ r->write_pos = ( r->write_pos + 1 ) % resampler_buffer_size;
+ }
+}
+
+static int resampler_run_zoh(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 1;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+ 
+ do
+ {
+ float sample;
+ 
+ if ( out >= out_end )
+ break;
+
+ sample = *in;
+ *out++ = sample;
+ 
+ phase += phase_inc;
+ 
+ in += (int)phase;
+ 
+ phase = fmod(phase, 1.0f);
+ }
+ while ( in < in_end );
+ 
+ r->phase = phase;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+
+#ifndef RESAMPLER_NEON
+static int resampler_run_blep(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 1;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float last_amp = r->last_amp;
+ float inv_phase = r->inv_phase;
+ float inv_phase_inc = r->inv_phase_inc;
+ 
+ const int step = RESAMPLER_BLEP_CUTOFF * RESAMPLER_RESOLUTION;
+ const int window_step = RESAMPLER_RESOLUTION;
+ 
+ do
+ {
+ float sample;
+ 
+ if ( out + SINC_WIDTH * 2 > out_end )
+ break;
+ 
+ sample = *in++ - last_amp;
+ 
+ if (sample)
+ {
+ float kernelSINC_WIDTH * 2, kernel_sum = 0.0f;
+ int phase_reduced = (int)(inv_phase * RESAMPLER_RESOLUTION);
+ int phase_adj = phase_reduced * step / RESAMPLER_RESOLUTION;
+ int i = SINC_WIDTH;
+
+ for (; i >= -SINC_WIDTH + 1; --i)
+ {
+ int pos = i * step;
+ int window_pos = i * window_step;
+ kernel_sum += kerneli + SINC_WIDTH - 1 = sinc_lutabs(phase_adj - pos) * window_lutabs(phase_reduced - window_pos);
+ }
+ last_amp += sample;
+ sample /= kernel_sum;
+ for (i = 0; i < SINC_WIDTH * 2; ++i)
+ outi += sample * kerneli;
+ }
+ 
+ inv_phase += inv_phase_inc;
+ 
+ out += (int)inv_phase;
+ 
+ inv_phase = fmod(inv_phase, 1.0f);
+ }
+ while ( in < in_end );
+ 
+ r->inv_phase = inv_phase;
+ r->last_amp = last_amp;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+#endif
+
+#ifdef RESAMPLER_NEON
+static int resampler_run_blep(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 1;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float last_amp = r->last_amp;
+ float inv_phase = r->inv_phase;
+ float inv_phase_inc = r->inv_phase_inc;
+ 
+ const int step = RESAMPLER_BLEP_CUTOFF * RESAMPLER_RESOLUTION;
+ const int window_step = RESAMPLER_RESOLUTION;
+ 
+ do
+ {
+ float sample;
+ 
+ if ( out + SINC_WIDTH * 2 > out_end )
+ break;
+ 
+ sample = *in++ - last_amp;
+ 
+ if (sample)
+ {
+ float kernel_sum = 0.0f;
+ float32x4_t kernelSINC_WIDTH / 2;
+ float32x4_t temp1, temp2;
+ float32x4_t samplex;
+ float *kernelf = (float*)(&kernel);
+ int phase_reduced = (int)(inv_phase * RESAMPLER_RESOLUTION);
+ int phase_adj = phase_reduced * step / RESAMPLER_RESOLUTION;
+ int i = SINC_WIDTH;
+
+ for (; i >= -SINC_WIDTH + 1; --i)
+ {
+ int pos = i * step;
+ int window_pos = i * window_step;
+ kernel_sum += kernelfi + SINC_WIDTH - 1 = sinc_lutabs(phase_adj - pos) * window_lutabs(phase_reduced - window_pos);
+ }
+ last_amp += sample;
+ sample /= kernel_sum;
+ samplex = vdupq_n_f32(sample);
+ for (i = 0; i < SINC_WIDTH / 2; ++i)
+ {
+ temp1 = vld1q_f32( (const float32_t *)( kernel + i ) );
+ temp2 = vld1q_f32( (const float32_t *) out + i * 4 );
+ temp2 = vmlaq_f32( temp2, temp1, samplex );
+ vst1q_f32( (float32_t *) out + i * 4, temp2 );
+ }
+ }
+ 
+ inv_phase += inv_phase_inc;
+ 
+ out += (int)inv_phase;
+ 
+ inv_phase = fmod(inv_phase, 1.0f);
+ }
+ while ( in < in_end );
+ 
+ r->inv_phase = inv_phase;
+ r->last_amp = last_amp;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+#endif
+
+static int resampler_run_linear(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 2;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+ 
+ do
+ {
+ float sample;
+ 
+ if ( out >= out_end )
+ break;
+ 
+ sample = in0 + (in1 - in0) * phase;
+ *out++ = sample;
+ 
+ phase += phase_inc;
+ 
+ in += (int)phase;
+ 
+ phase = fmod(phase, 1.0f);
+ }
+ while ( in < in_end );
+ 
+ r->phase = phase;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+
+#ifndef RESAMPLER_NEON
+static int resampler_run_blam(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 2;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float last_amp = r->last_amp;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+ float inv_phase = r->inv_phase;
+ float inv_phase_inc = r->inv_phase_inc;
+ 
+ const int step = RESAMPLER_BLAM_CUTOFF * RESAMPLER_RESOLUTION;
+ const int window_step = RESAMPLER_RESOLUTION;
+
+ do
+ {
+ float sample;
+ 
+ if ( out + SINC_WIDTH * 2 > out_end )
+ break;
+ 
+ sample = in0;
+ if (phase_inc < 1.0f)
+ sample += (in1 - in0) * phase;
+ sample -= last_amp;
+ 
+ if (sample)
+ {
+ float kernelSINC_WIDTH * 2, kernel_sum = 0.0f;
+ int phase_reduced = (int)(inv_phase * RESAMPLER_RESOLUTION);
+ int phase_adj = phase_reduced * step / RESAMPLER_RESOLUTION;
+ int i = SINC_WIDTH;
+
+ for (; i >= -SINC_WIDTH + 1; --i)
+ {
+ int pos = i * step;
+ int window_pos = i * window_step;
+ kernel_sum += kerneli + SINC_WIDTH - 1 = sinc_lutabs(phase_adj - pos) * window_lutabs(phase_reduced - window_pos);
+ }
+ last_amp += sample;
+ sample /= kernel_sum;
+ for (i = 0; i < SINC_WIDTH * 2; ++i)
+ outi += sample * kerneli;
+ }
+ 
+ if (inv_phase_inc < 1.0f)
+ {
+ ++in;
+ inv_phase += inv_phase_inc;
+ out += (int)inv_phase;
+ inv_phase = fmod(inv_phase, 1.0f);
+ }
+ else
+ {
+ phase += phase_inc;
+ ++out;
+ in += (int)phase;
+ phase = fmod(phase, 1.0f);
+ }
+ }
+ while ( in < in_end );
+ 
+ r->phase = phase;
+ r->inv_phase = inv_phase;
+ r->last_amp = last_amp;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+#endif
+
+#ifdef RESAMPLER_NEON
+static int resampler_run_blam(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 2;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float last_amp = r->last_amp;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+ float inv_phase = r->inv_phase;
+ float inv_phase_inc = r->inv_phase_inc;
+ 
+ const int step = RESAMPLER_BLAM_CUTOFF * RESAMPLER_RESOLUTION;
+ const int window_step = RESAMPLER_RESOLUTION;
+
+ do
+ {
+ float sample;
+ 
+ if ( out + SINC_WIDTH * 2 > out_end )
+ break;
+ 
+ sample = in0;
+ if (phase_inc < 1.0f)
+ sample += (in1 - in0) * phase;
+ sample -= last_amp;
+ 
+ if (sample)
+ {
+ float kernel_sum = 0.0;
+ float32x4_t kernelSINC_WIDTH / 2;
+ float32x4_t temp1, temp2;
+ float32x4_t samplex;
+ float *kernelf = (float*)(&kernel);
+ int phase_reduced = (int)(inv_phase * RESAMPLER_RESOLUTION);
+ int phase_adj = phase_reduced * step / RESAMPLER_RESOLUTION;
+ int i = SINC_WIDTH;
+
+ for (; i >= -SINC_WIDTH + 1; --i)
+ {
+ int pos = i * step;
+ int window_pos = i * window_step;
+ kernel_sum += kernelfi + SINC_WIDTH - 1 = sinc_lutabs(phase_adj - pos) * window_lutabs(phase_reduced - window_pos);
+ }
+ last_amp += sample;
+ sample /= kernel_sum;
+ samplex = vdupq_n_f32(sample);
+ for (i = 0; i < SINC_WIDTH / 2; ++i)
+ {
+ temp1 = vld1q_f32( (const float32_t *)( kernel + i ) );
+ temp2 = vld1q_f32( (const float32_t *) out + i * 4 );
+ temp2 = vmlaq_f32( temp2, temp1, samplex );
+ vst1q_f32( (float32_t *) out + i * 4, temp2 );
+ }
+ }
+
+ if (inv_phase_inc < 1.0f)
+ {
+ ++in;
+ inv_phase += inv_phase_inc;
+ out += (int)inv_phase;
+ inv_phase = fmod(inv_phase, 1.0f);
+ }
+ else
+ {
+ phase += phase_inc;
+ ++out;
+ 
+ if (phase >= 1.0f)
+ {
+ ++in;
+ phase = fmod(phase, 1.0f);
+ }
+ }
+ }
+ while ( in < in_end );
+ 
+ r->phase = phase;
+ r->inv_phase = inv_phase;
+ r->last_amp = last_amp;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+#endif
+
+#ifndef RESAMPLER_NEON
+static int resampler_run_cubic(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 4;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+ 
+ do
+ {
+ float * kernel;
+ int i;
+ float sample;
+ 
+ if ( out >= out_end )
+ break;
+ 
+ kernel = cubic_lut + (int)(phase * RESAMPLER_RESOLUTION) * 4;
+ 
+ for (sample = 0, i = 0; i < 4; ++i)
+ sample += ini * kerneli;
+ *out++ = sample;
+ 
+ phase += phase_inc;
+ 
+ in += (int)phase;
+ 
+ phase = fmod(phase, 1.0f);
+ }
+ while ( in < in_end );
+ 
+ r->phase = phase;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+#endif
+
+#ifdef RESAMPLER_NEON
+static int resampler_run_cubic(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 4;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+ 
+ do
+ {
+ float32x4_t temp1, temp2;
+ float32x2_t half;
+ 
+ if ( out >= out_end )
+ break;
+ 
+ temp1 = vld1q_f32( (const float32_t *)( in ) );
+ temp2 = vld1q_f32( (const float32_t *)( cubic_lut + (int)(phase * RESAMPLER_RESOLUTION) * 4 ) );
+ temp1 = vmulq_f32( temp1, temp2 );
+ half = vadd_f32(vget_high_f32(temp1), vget_low_f32(temp1));
+ *out++ = vget_lane_f32(vpadd_f32(half, half), 0);
+ 
+ phase += phase_inc;
+ 
+ in += (int)phase;
+ 
+ phase = fmod(phase, 1.0f);
+ }
+ while ( in < in_end );
+ 
+ r->phase = phase;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+#endif
+
+#ifndef RESAMPLER_NEON
+static int resampler_run_sinc(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= SINC_WIDTH * 2;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+
+ int step = phase_inc > 1.0f ? (int)(RESAMPLER_RESOLUTION / phase_inc * RESAMPLER_SINC_CUTOFF) : (int)(RESAMPLER_RESOLUTION * RESAMPLER_SINC_CUTOFF);
+ int window_step = RESAMPLER_RESOLUTION;
+
+ do
+ {
+ float kernelSINC_WIDTH * 2, kernel_sum = 0.0;
+ int i = SINC_WIDTH;
+ int phase_reduced = (int)(phase * RESAMPLER_RESOLUTION);
+ int phase_adj = phase_reduced * step / RESAMPLER_RESOLUTION;
+ float sample;
+
+ if ( out >= out_end )
+ break;
+
+ for (; i >= -SINC_WIDTH + 1; --i)
+ {
+ int pos = i * step;
+ int window_pos = i * window_step;
+ kernel_sum += kerneli + SINC_WIDTH - 1 = sinc_lutabs(phase_adj - pos) * window_lutabs(phase_reduced - window_pos);
+ }
+ for (sample = 0, i = 0; i < SINC_WIDTH * 2; ++i)
+ sample += ini * kerneli;
+ *out++ = (float)(sample / kernel_sum);
+
+ phase += phase_inc;
+
+ in += (int)phase;
+
+ phase = fmod(phase, 1.0f);
+ }
+ while ( in < in_end );
+
+ r->phase = phase;
+ *out_ = out;
+
+ used = (int)(in - in_);
+
+ r->write_filled -= used;
+ }
+
+ return used;
+}
+#endif
+
+#ifdef RESAMPLER_NEON
+static int resampler_run_sinc(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= SINC_WIDTH * 2;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+ 
+ int step = phase_inc > 1.0f ? (int)(RESAMPLER_RESOLUTION / phase_inc * RESAMPLER_SINC_CUTOFF) : (int)(RESAMPLER_RESOLUTION * RESAMPLER_SINC_CUTOFF);
+ int window_step = RESAMPLER_RESOLUTION;
+ 
+ do
+ {
+ // accumulate in extended precision
+ float kernel_sum = 0.0;
+ float32x4_t kernelSINC_WIDTH / 2;
+ float32x4_t temp1, temp2;
+ float32x4_t samplex = {0};
+ float32x2_t half;
+ float *kernelf = (float*)(&kernel);
+ int i = SINC_WIDTH;
+ int phase_reduced = (int)(phase * RESAMPLER_RESOLUTION);
+ int phase_adj = phase_reduced * step / RESAMPLER_RESOLUTION;
+ 
+ if ( out >= out_end )
+ break;
+ 
+ for (; i >= -SINC_WIDTH + 1; --i)
+ {
+ int pos = i * step;
+ int window_pos = i * window_step;
+ kernel_sum += kernelfi + SINC_WIDTH - 1 = sinc_lutabs(phase_adj - pos) * window_lutabs(phase_reduced - window_pos);
+ }
+ for (i = 0; i < SINC_WIDTH / 2; ++i)
+ {
+ temp1 = vld1q_f32( (const float32_t *)( in + i * 4 ) );
+ temp2 = vld1q_f32( (const float32_t *)( kernel + i ) );
+ samplex = vmlaq_f32( samplex, temp1, temp2 );
+ }
+ kernel_sum = 1.0 / kernel_sum;
+ samplex = vmulq_f32(samplex, vmovq_n_f32(kernel_sum));
+ half = vadd_f32(vget_high_f32(samplex), vget_low_f32(samplex));
+ *out++ = vget_lane_f32(vpadd_f32(half, half), 0);
+ 
+ phase += phase_inc;
+ 
+ in += (int)phase;
+ 
+ phase = fmod(phase, 1.0f);
+ }
+ while ( in < in_end );
+ 
+ r->phase = phase;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+#endif
+
+static void resampler_fill(resampler * r)
+{
+ int min_filled = resampler_min_filled(r);
+ int quality = r->quality;
+ while ( r->write_filled > min_filled &&
+ r->read_filled < resampler_buffer_size )
+ {
+ int write_pos = ( r->read_pos + r->read_filled ) % resampler_buffer_size;
+ int write_size = resampler_buffer_size - write_pos;
+ float * out = r->buffer_out + write_pos;
+ if ( write_size > ( resampler_buffer_size - r->read_filled ) )
+ write_size = resampler_buffer_size - r->read_filled;
+ switch (quality)
+ {
+ case RESAMPLER_QUALITY_ZOH:
+ resampler_run_zoh( r, &out, out + write_size );
+ break;
+ 
+ case RESAMPLER_QUALITY_BLEP:
+ {
+ int used;
+ int write_extra = 0;
+ if ( write_pos >= r->read_pos )
+ write_extra = r->read_pos;
+ if ( write_extra > SINC_WIDTH * 2 - 1 )
+ write_extra = SINC_WIDTH * 2 - 1;
+ memcpy( r->buffer_out + resampler_buffer_size, r->buffer_out, write_extra * sizeof(r->buffer_out0) );
+#ifdef RESAMPLER_SSE
+ if ( resampler_has_sse )
+ used = resampler_run_blep_sse( r, &out, out + write_size + write_extra );
+ else
+#endif
+ used = resampler_run_blep( r, &out, out + write_size + write_extra );
+ memcpy( r->buffer_out, r->buffer_out + resampler_buffer_size, write_extra * sizeof(r->buffer_out0) );
+ if (!used)
+ return;
+ break;
+ }
+ 
+ case RESAMPLER_QUALITY_LINEAR:
+ resampler_run_linear( r, &out, out + write_size );
+ break;
+ 
+ case RESAMPLER_QUALITY_BLAM:
+ {
+ float * out_ = out;
+ int write_extra = 0;
+ if ( write_pos >= r->read_pos )
+ write_extra = r->read_pos;
+ if ( write_extra > SINC_WIDTH * 2 - 1 )
+ write_extra = SINC_WIDTH * 2 - 1;
+ memcpy( r->buffer_out + resampler_buffer_size, r->buffer_out, write_extra * sizeof(r->buffer_out0) );
+#ifdef RESAMPLER_SSE
+ if ( resampler_has_sse )
+ resampler_run_blam_sse( r, &out, out + write_size + write_extra );
+ else
+#endif
+ resampler_run_blam( r, &out, out + write_size + write_extra );
+ memcpy( r->buffer_out, r->buffer_out + resampler_buffer_size, write_extra * sizeof(r->buffer_out0) );
+ if ( out == out_ )
+ return;
+ break;
+ }
+
+ case RESAMPLER_QUALITY_CUBIC:
+#ifdef RESAMPLER_SSE
+ if ( resampler_has_sse )
+ resampler_run_cubic_sse( r, &out, out + write_size );
+ else
+#endif
+ resampler_run_cubic( r, &out, out + write_size );
+ break;
+ 
+ case RESAMPLER_QUALITY_SINC:
+#ifdef RESAMPLER_SSE
+ if ( resampler_has_sse )
+ resampler_run_sinc_sse( r, &out, out + write_size );
+ else
+#endif
+ resampler_run_sinc( r, &out, out + write_size );
+ break;
+ }
+ r->read_filled += out - r->buffer_out - write_pos;
+ }
+}
+
+static void resampler_fill_and_remove_delay(resampler * r)
+{
+ resampler_fill( r );
+ if ( r->delay_removed < 0 )
+ {
+ int delay = resampler_output_delay( r );
+ r->delay_removed = 0;
+ while ( delay-- )
+ resampler_remove_sample( r, 1 );
+ }
+}
+
+int resampler_get_sample_count(void *_r)
+{
+ resampler * r = ( resampler * ) _r;
+ if ( r->read_filled < 1 && ((r->quality != RESAMPLER_QUALITY_BLEP && r->quality != RESAMPLER_QUALITY_BLAM) || r->inv_phase_inc))
+ resampler_fill_and_remove_delay( r );
+ return r->read_filled;
+}
+
+int resampler_get_sample(void *_r)
+{
+ resampler * r = ( resampler * ) _r;
+ if ( r->read_filled < 1 && r->phase_inc)
+ resampler_fill_and_remove_delay( r );
+ if ( r->read_filled < 1 )
+ return 0;
+ if ( r->quality == RESAMPLER_QUALITY_BLEP || r->quality == RESAMPLER_QUALITY_BLAM )
+ return (int)(r->buffer_out r->read_pos + r->accumulator);
+ else
+ return (int)r->buffer_out r->read_pos ;
+}
+
+float resampler_get_sample_float(void *_r)
+{
+ resampler * r = ( resampler * ) _r;
+ if ( r->read_filled < 1 && r->phase_inc)
+ resampler_fill_and_remove_delay( r );
+ if ( r->read_filled < 1 )
+ return 0;
+ if ( r->quality == RESAMPLER_QUALITY_BLEP || r->quality == RESAMPLER_QUALITY_BLAM )
+ return r->buffer_out r->read_pos + r->accumulator;
+ else
+ return r->buffer_out r->read_pos ;
+}
+
+void resampler_remove_sample(void *_r, int decay)
+{
+ resampler * r = ( resampler * ) _r;
+ if ( r->read_filled > 0 )
+ {
+ if ( r->quality == RESAMPLER_QUALITY_BLEP || r->quality == RESAMPLER_QUALITY_BLAM )
+ {
+ r->accumulator += r->buffer_out r->read_pos ;
+ r->buffer_out r->read_pos = 0;
+ if (decay)
+ {
+ r->accumulator -= r->accumulator * (1.0f / 8192.0f);
+ if (fabs(r->accumulator) < 1e-20f)
+ r->accumulator = 0;
+ }
+ }
+ --r->read_filled;
+ r->read_pos = ( r->read_pos + 1 ) % resampler_buffer_size;
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/resampler_sse2.c Added

@@ -0,0 +1,313 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if HAVE_SSE2 || defined(__SSE2__)
+#include <math.h>
+#include <xmmintrin.h>
+#include "internal/resampler.h"
+
+int resampler_run_blep_sse(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 1;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float last_amp = r->last_amp;
+ float inv_phase = r->inv_phase;
+ float inv_phase_inc = r->inv_phase_inc;
+ 
+ const int step = RESAMPLER_BLEP_CUTOFF * RESAMPLER_RESOLUTION;
+ const int window_step = RESAMPLER_RESOLUTION;
+ 
+ do
+ {
+ float sample;
+ 
+ if ( out + SINC_WIDTH * 2 > out_end )
+ break;
+ 
+ sample = *in++ - last_amp;
+ 
+ if (sample)
+ {
+ float kernel_sum = 0.0f;
+ __m128 kernelSINC_WIDTH / 2;
+ __m128 temp1, temp2;
+ __m128 samplex;
+ float *kernelf = (float*)(&kernel);
+ int phase_reduced = (int)(inv_phase * RESAMPLER_RESOLUTION);
+ int phase_adj = phase_reduced * step / RESAMPLER_RESOLUTION;
+ int i = SINC_WIDTH;
+
+ for (; i >= -SINC_WIDTH + 1; --i)
+ {
+ int pos = i * step;
+ int window_pos = i * window_step;
+ kernel_sum += kernelfi + SINC_WIDTH - 1 = sinc_lutabs(phase_adj - pos) * window_lutabs(phase_reduced - window_pos);
+ }
+ last_amp += sample;
+ sample /= kernel_sum;
+ samplex = _mm_set1_ps( sample );
+ for (i = 0; i < SINC_WIDTH / 2; ++i)
+ {
+ temp1 = _mm_load_ps( (const float *)( kernel + i ) );
+ temp1 = _mm_mul_ps( temp1, samplex );
+ temp2 = _mm_loadu_ps( (const float *) out + i * 4 );
+ temp1 = _mm_add_ps( temp1, temp2 );
+ _mm_storeu_ps( (float *) out + i * 4, temp1 );
+ }
+ }
+ 
+ inv_phase += inv_phase_inc;
+ 
+ out += (int)inv_phase;
+ 
+ inv_phase = fmod(inv_phase, 1.0f);
+ }
+ while ( in < in_end );
+ 
+ r->inv_phase = inv_phase;
+ r->last_amp = last_amp;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+
+int resampler_run_blam_sse(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 2;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float last_amp = r->last_amp;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+ float inv_phase = r->inv_phase;
+ float inv_phase_inc = r->inv_phase_inc;
+ 
+ const int step = RESAMPLER_BLAM_CUTOFF * RESAMPLER_RESOLUTION;
+ const int window_step = RESAMPLER_RESOLUTION;
+
+ do
+ {
+ float sample;
+ 
+ if ( out + SINC_WIDTH * 2 > out_end )
+ break;
+
+ sample = in0;
+ if (phase_inc < 1.0f)
+ {
+ sample += (in1 - in0) * phase;
+ }
+ sample -= last_amp;
+ 
+ if (sample)
+ {
+ float kernel_sum = 0.0f;
+ __m128 kernelSINC_WIDTH / 2;
+ __m128 temp1, temp2;
+ __m128 samplex;
+ float *kernelf = (float*)(&kernel);
+ int phase_reduced = (int)(inv_phase * RESAMPLER_RESOLUTION);
+ int phase_adj = phase_reduced * step / RESAMPLER_RESOLUTION;
+ int i = SINC_WIDTH;
+
+ for (; i >= -SINC_WIDTH + 1; --i)
+ {
+ int pos = i * step;
+ int window_pos = i * window_step;
+ kernel_sum += kernelfi + SINC_WIDTH - 1 = sinc_lutabs(phase_adj - pos) * window_lutabs(phase_reduced - window_pos);
+ }
+ last_amp += sample;
+ sample /= kernel_sum;
+ samplex = _mm_set1_ps( sample );
+ for (i = 0; i < SINC_WIDTH / 2; ++i)
+ {
+ temp1 = _mm_load_ps( (const float *)( kernel + i ) );
+ temp1 = _mm_mul_ps( temp1, samplex );
+ temp2 = _mm_loadu_ps( (const float *) out + i * 4 );
+ temp1 = _mm_add_ps( temp1, temp2 );
+ _mm_storeu_ps( (float *) out + i * 4, temp1 );
+ }
+ }
+ 
+ if (inv_phase_inc < 1.0f)
+ {
+ ++in;
+ inv_phase += inv_phase_inc;
+ out += (int)inv_phase;
+ inv_phase = fmod(inv_phase, 1.0f);
+ }
+ else
+ {
+ phase += phase_inc;
+ ++out;
+ 
+ if (phase >= 1.0f)
+ {
+ ++in;
+ phase = fmod(phase, 1.0f);
+ }
+ }
+ }
+ while ( in < in_end );
+
+ r->phase = phase;
+ r->inv_phase = inv_phase;
+ r->last_amp = last_amp;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+
+int resampler_run_cubic_sse(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= 4;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+ 
+ do
+ {
+ __m128 temp1, temp2;
+ __m128 samplex = _mm_setzero_ps();
+ 
+ if ( out >= out_end )
+ break;
+ 
+ temp1 = _mm_loadu_ps( (const float *)( in ) );
+ temp2 = _mm_load_ps( (const float *)( cubic_lut + (int)(phase * RESAMPLER_RESOLUTION) * 4 ) );
+ temp1 = _mm_mul_ps( temp1, temp2 );
+ samplex = _mm_add_ps( samplex, temp1 );
+ temp1 = _mm_movehl_ps( temp1, samplex );
+ samplex = _mm_add_ps( samplex, temp1 );
+ temp1 = samplex;
+ temp1 = _mm_shuffle_ps( temp1, samplex, _MM_SHUFFLE(0, 0, 0, 1) );
+ samplex = _mm_add_ps( samplex, temp1 );
+ _mm_store_ss( out, samplex );
+ ++out;
+ 
+ phase += phase_inc;
+ 
+ in += (int)phase;
+ 
+ phase = fmod(phase, 1.0f);
+ }
+ while ( in < in_end );
+ 
+ r->phase = phase;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+
+int resampler_run_sinc_sse(resampler * r, float ** out_, float * out_end)
+{
+ int in_size = r->write_filled;
+ float const* in_ = r->buffer_in + resampler_buffer_size + r->write_pos - r->write_filled;
+ int used = 0;
+ in_size -= SINC_WIDTH * 2;
+ if ( in_size > 0 )
+ {
+ float* out = *out_;
+ float const* in = in_;
+ float const* const in_end = in + in_size;
+ float phase = r->phase;
+ float phase_inc = r->phase_inc;
+ 
+ int step = phase_inc > 1.0f ? (int)(RESAMPLER_RESOLUTION / phase_inc * RESAMPLER_SINC_CUTOFF) : (int)(RESAMPLER_RESOLUTION * RESAMPLER_SINC_CUTOFF);
+ int window_step = RESAMPLER_RESOLUTION;
+ 
+ do
+ {
+ // accumulate in extended precision
+ float kernel_sum = 0.0;
+ __m128 kernelSINC_WIDTH / 2;
+ __m128 temp1 = _mm_setzero_ps(), temp2;
+ __m128 samplex = _mm_setzero_ps();
+ float *kernelf = (float*)(&kernel);
+ int i = SINC_WIDTH;
+ int phase_reduced = (int)(phase * RESAMPLER_RESOLUTION);
+ int phase_adj = phase_reduced * step / RESAMPLER_RESOLUTION;
+ 
+ if ( out >= out_end )
+ break;
+ 
+ for (; i >= -SINC_WIDTH + 1; --i)
+ {
+ int pos = i * step;
+ int window_pos = i * window_step;
+ kernel_sum += kernelfi + SINC_WIDTH - 1 = sinc_lutabs(phase_adj - pos) * window_lutabs(phase_reduced - window_pos);
+ }
+ for (i = 0; i < SINC_WIDTH / 2; ++i)
+ {
+ temp1 = _mm_loadu_ps( (const float *)( in + i * 4 ) );
+ temp2 = _mm_load_ps( (const float *)( kernel + i ) );
+ temp1 = _mm_mul_ps( temp1, temp2 );
+ samplex = _mm_add_ps( samplex, temp1 );
+ }
+ kernel_sum = 1.0 / kernel_sum;
+ temp1 = _mm_movehl_ps( temp1, samplex );
+ samplex = _mm_add_ps( samplex, temp1 );
+ temp1 = samplex;
+ temp1 = _mm_shuffle_ps( temp1, samplex, _MM_SHUFFLE(0, 0, 0, 1) );
+ samplex = _mm_add_ps( samplex, temp1 );
+ temp1 = _mm_set_ss( kernel_sum );
+ samplex = _mm_mul_ps( samplex, temp1 );
+ _mm_store_ss( out, samplex );
+ ++out;
+ 
+ phase += phase_inc;
+ 
+ in += (int)phase;
+ 
+ phase = fmod(phase, 1.0f);
+ }
+ while ( in < in_end );
+ 
+ r->phase = phase;
+ *out_ = out;
+ 
+ used = (int)(in - in_);
+ 
+ r->write_filled -= used;
+ }
+ 
+ return used;
+}
+#endif
+

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/riff.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/riff.c Changed

@@ -1,59 +1,57 @@
+#include "dumb.h"
 #include "internal/riff.h"
 
 #include <stdlib.h>
-#include <string.h>
 
-struct riff * riff_parse( unsigned char * ptr, unsigned size, unsigned proper )
+struct riff * riff_parse( DUMBFILE * f, long offset, long size, unsigned proper )
 {
 	unsigned stream_size;
 	struct riff * stream;
 
-	if ( size < 8 ) return 0;
+ if ( size < 8 ) return 0;
 
-	if ( ptr0 != 'R' || ptr1 != 'I' || ptr2 != 'F' || ptr3 != 'F' ) return 0;
+ if ( dumbfile_seek(f, offset, DFS_SEEK_SET) ) return 0;
+ if ( dumbfile_mgetl(f) != DUMB_ID('R','I','F','F') ) return 0;
 
-	stream_size = ptr4 | ( ptr5 << 8 ) | ( ptr6 << 16 ) | ( ptr7 << 24 );
-	if ( stream_size + 8 > size ) return 0;
+ stream_size = dumbfile_igetl(f);
+ if ( stream_size + 8 > size ) return 0;
 	if ( stream_size < 4 ) return 0;
 
-	stream = malloc( sizeof( struct riff ) );
+ stream = (struct riff *) malloc( sizeof( struct riff ) );
 	if ( ! stream ) return 0;
 
-	stream->type = ( ptr8 << 24 ) | ( ptr9 << 16 ) | ( ptr10 << 8 ) | ptr11;
+ stream->type = dumbfile_mgetl(f);
 	stream->chunk_count = 0;
 	stream->chunks = 0;
 
-	ptr += 12;
 	stream_size -= 4;
 
-	while ( stream_size )
+ while ( stream_size && !dumbfile_error(f) )
 	{
 		struct riff_chunk * chunk;
 		if ( stream_size < 8 ) break;
-		stream->chunks = realloc( stream->chunks, ( stream->chunk_count + 1 ) * sizeof( struct riff_chunk ) );
+ stream->chunks = ( struct riff_chunk * ) realloc( stream->chunks, ( stream->chunk_count + 1 ) * sizeof( struct riff_chunk ) );
 		if ( ! stream->chunks ) break;
 		chunk = stream->chunks + stream->chunk_count;
-		chunk->type = ( ptr0 << 24 ) | ( ptr1 << 16 ) | ( ptr2 << 8 ) | ptr3;
-		chunk->size = ptr4 | ( ptr5 << 8 ) | ( ptr6 << 16 ) | ( ptr7 << 24 );
-		ptr += 8;
+ chunk->type = dumbfile_mgetl(f);
+ chunk->size = dumbfile_igetl(f);
+ chunk->offset = dumbfile_pos(f);
 		stream_size -= 8;
 		if ( stream_size < chunk->size ) break;
-		if ( chunk->type == 'RIFF' )
+ if ( chunk->type == DUMB_ID('R','I','F','F') )
 		{
-			chunk->data = riff_parse( ptr - 8, chunk->size + 8, proper );
-			if ( ! chunk->data ) break;
+ chunk->nested = riff_parse( f, chunk->offset - 8, chunk->size + 8, proper );
+ if ( ! chunk->nested ) break;
 		}
 		else
 		{
-			chunk->data = malloc( chunk->size );
-			if ( ! chunk->data ) break;
-			memcpy( chunk->data, ptr, chunk->size );
+ chunk->nested = 0;
 		}
-		ptr += chunk->size;
+ dumbfile_seek(f, chunk->offset + chunk->size, DFS_SEEK_SET);
 		stream_size -= chunk->size;
 		if ( proper && ( chunk->size & 1 ) )
 		{
-			++ ptr;
+ dumbfile_skip(f, 1);
 			-- stream_size;
 		}
 		++stream->chunk_count;
@@ -78,8 +76,7 @@
 			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 );
+ if ( chunk->nested ) riff_free( chunk->nested );
 			}
 			free( stream->chunks );
 		}

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/stdfile.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/stdfile.c Changed

@@ -23,47 +23,91 @@
 
 
 
+typedef struct dumb_stdfile
+{
+    FILE * file;
+    long size;
+} dumb_stdfile;
+
+
+
 static void *dumb_stdfile_open(const char *filename)
 {
-	return fopen(filename, "rb");
+    dumb_stdfile * file = ( dumb_stdfile * ) malloc( sizeof(dumb_stdfile) );
+    if ( !file ) return 0;
+    file->file = fopen(filename, "rb");
+    fseek(file->file, 0, SEEK_END);
+    file->size = ftell(file->file);
+    fseek(file->file, 0, SEEK_SET);
+    return file;
 }
 
 
 
 static int dumb_stdfile_skip(void *f, long n)
 {
-	return fseek(f, n, SEEK_CUR);
+    dumb_stdfile * file = ( dumb_stdfile * ) f;
+    return fseek(file->file, n, SEEK_CUR);
 }
 
 
 
 static int dumb_stdfile_getc(void *f)
 {
-	return fgetc(f);
+    dumb_stdfile * file = ( dumb_stdfile * ) f;
+    return fgetc(file->file);
 }
 
 
 
 static long dumb_stdfile_getnc(char *ptr, long n, void *f)
 {
-	return fread(ptr, 1, n, f);
+    dumb_stdfile * file = ( dumb_stdfile * ) f;
+    return fread(ptr, 1, n, file->file);
 }
 
 
 
 static void dumb_stdfile_close(void *f)
 {
-	fclose(f);
+    dumb_stdfile * file = ( dumb_stdfile * ) f;
+    fclose(file->file);
+    free(f);
+}
+
+
+
+static void dumb_stdfile_noclose(void *f)
+{
+    free(f);
+}
+
+
+
+static int dumb_stdfile_seek(void *f, long n)
+{
+    dumb_stdfile * file = ( dumb_stdfile * ) f;
+    return fseek(file->file, n, SEEK_SET);
+}
+
+
+
+static long dumb_stdfile_get_size(void *f)
+{
+    dumb_stdfile * file = ( dumb_stdfile * ) f;
+    return file->size;
 }
 
 
 
-static DUMBFILE_SYSTEM stdfile_dfs = {
+static const DUMBFILE_SYSTEM stdfile_dfs = {
 	&dumb_stdfile_open,
 	&dumb_stdfile_skip,
 	&dumb_stdfile_getc,
 	&dumb_stdfile_getnc,
-	&dumb_stdfile_close
+    &dumb_stdfile_close,
+    &dumb_stdfile_seek,
+    &dumb_stdfile_get_size
 };
 
 
@@ -75,19 +119,28 @@
 
 
 
-static DUMBFILE_SYSTEM stdfile_dfs_leave_open = {
+static const DUMBFILE_SYSTEM stdfile_dfs_leave_open = {
 	NULL,
 	&dumb_stdfile_skip,
 	&dumb_stdfile_getc,
 	&dumb_stdfile_getnc,
-	NULL
+    &dumb_stdfile_noclose,
+    &dumb_stdfile_seek,
+    &dumb_stdfile_get_size
 };
 
 
 
 DUMBFILE *dumbfile_open_stdfile(FILE *p)
 {
-	DUMBFILE *d = dumbfile_open_ex(p, &stdfile_dfs_leave_open);
+    dumb_stdfile * file = ( dumb_stdfile * ) malloc( sizeof(dumb_stdfile) );
+	DUMBFILE *d;
+    if ( !file ) return 0;
+    file->file = p;
+    fseek(p, 0, SEEK_END);
+    file->size = ftell(p);
+    fseek(p, 0, SEEK_SET);
+    d = dumbfile_open_ex(file, &stdfile_dfs_leave_open);
 
 	return d;
 }

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/helpers/tarray.c Added

@@ -0,0 +1,175 @@
+#include "internal/tarray.h"
+
+#include <string.h>
+
+	/*
+	 Structures which contain the play times of each pattern and row combination in the song,
+	 not guaranteed to be valid for the whole song until the loop status is no longer zero.
+	 The initial count and restart count will both be zero on song start, then both will be
+	 incremented until the song loops. Restart count will be reset to zero on loop for all
+	 rows which have a time equal to or greater than the loop start point, so time keeping
+	 functions will know which timestamp the song is currently located at.
+
+	 Timestamp lists are guaranteed to be allocated in blocks of 16 timestamps at a time.
+	*/
+
+	/*
+	 We don't need full timekeeping because the player loop only wants the first play time
+	 of the loop start order/row. We also don't really want full timekeeping because it
+	 involves a lot of memory allocations, which is also slow.
+	*/
+
+#undef FULL_TIMEKEEPING
+
+typedef struct DUMB_IT_ROW_TIME
+{
+	unsigned int count, restart_count;
+#ifndef FULL_TIMEKEEPING
+	LONG_LONG first_time;
+#else
+	LONG_LONG * times;
+#endif
+} DUMB_IT_ROW_TIME;
+
+void * timekeeping_array_create(size_t size)
+{
+	size_t * _size = (size_t *) calloc( 1, sizeof(size_t) + sizeof(DUMB_IT_ROW_TIME) * size );
+	if ( _size ) {
+		*_size = size;
+	}
+	return _size;
+}
+
+void timekeeping_array_destroy(void * array)
+{
+#ifdef FULL_TIMEKEEPING
+	size_t i;
+	size_t * size = (size_t *) array;
+	DUMB_IT_ROW_TIME * s = (DUMB_IT_ROW_TIME *)(size + 1);
+
+	for (i = 0; i < *size; i++) {
+		if (si.times) free(si.times);
+	}
+#endif
+
+ free(array);
+}
+
+void * timekeeping_array_dup(void * array)
+{
+	size_t i;
+	size_t * size = (size_t *) array;
+	DUMB_IT_ROW_TIME * s = (DUMB_IT_ROW_TIME *)(size + 1);
+	size_t * new_size = (size_t *) calloc( 1, sizeof(size_t) + sizeof(DUMB_IT_ROW_TIME) * *size );
+	if ( new_size ) {
+		DUMB_IT_ROW_TIME * new_s = (DUMB_IT_ROW_TIME *)(new_size + 1);
+
+		*new_size = *size;
+
+		for (i = 0; i < *size; i++) {
+			new_si.count = si.count;
+			new_si.restart_count = si.restart_count;
+
+#ifndef FULL_TIMEKEEPING
+			new_si.first_time = si.first_time;
+#else
+			if ( si.times ) {
+				size_t time_count = ( si.count + 15 ) & ~15;
+				new_si.times = (LONG_LONG *) malloc( sizeof(LONG_LONG) * time_count );
+				if ( new_si.times == (void *)0 ) {
+					timekeeping_array_destroy( new_size );
+					return (void *) 0;
+				}
+				memcpy( new_si.times, si.times, sizeof(LONG_LONG) * si.count );
+			}
+#endif
+		}
+	}
+
+	return new_size;
+}
+
+void timekeeping_array_reset(void * array, size_t loop_start)
+{
+	size_t i;
+	size_t * size = (size_t *) array;
+	DUMB_IT_ROW_TIME * s = (DUMB_IT_ROW_TIME *)(size + 1);
+
+	DUMB_IT_ROW_TIME * s_loop_start = s + loop_start;
+	LONG_LONG loop_start_time;
+
+	if ( loop_start >= *size || s_loop_start->count < 1 ) return;
+
+#ifndef FULL_TIMEKEEPING
+	loop_start_time = s_loop_start->first_time;
+#else
+	loop_start_time = s_loop_start->times0;
+#endif
+
+	for ( i = 0; i < *size; i++ ) {
+#ifndef FULL_TIMEKEEPING
+		if ( si.count && si.first_time >= loop_start_time ) {
+#else
+		if ( si.count && si.times0 >= loop_start_time ) {
+#endif
+			si.restart_count = 0;
+		}
+	}
+}
+
+void timekeeping_array_push(void * array, size_t index, LONG_LONG time)
+{
+#ifdef FULL_TIMEKEEPING
+	size_t i;
+ size_t time_count;
+#endif
+ size_t * size = (size_t *) array;
+	DUMB_IT_ROW_TIME * s = (DUMB_IT_ROW_TIME *)(size + 1);
+
+	if (index >= *size) return;
+
+#ifndef FULL_TIMEKEEPING
+	if ( !sindex.count++ )
+		sindex.first_time = time;
+#else
+	time_count = ( sindex.count + 16 ) & ~15;
+
+	sindex.times = (LONG_LONG *) realloc( sindex.times, sizeof(LONG_LONG) * time_count );
+
+	sindex.timessindex.count++ = time;
+#endif
+}
+
+void timekeeping_array_bump(void * array, size_t index)
+{
+	size_t * size = (size_t *) array;
+	DUMB_IT_ROW_TIME * s = (DUMB_IT_ROW_TIME *)(size + 1);
+
+	if (index >= *size) return;
+
+	sindex.restart_count++;
+}
+
+unsigned int timekeeping_array_get_count(void * array, size_t index)
+{
+	size_t * size = (size_t *) array;
+	DUMB_IT_ROW_TIME * s = (DUMB_IT_ROW_TIME *)(size + 1);
+
+	if (index >= *size) return 0;
+
+	return sindex.count;
+}
+
+LONG_LONG timekeeping_array_get_item(void * array, size_t index)
+{
+	size_t * size = (size_t *) array;
+	DUMB_IT_ROW_TIME * s = (DUMB_IT_ROW_TIME *)(size + 1);
+
+	if (index >= *size || sindex.restart_count >= sindex.count) return 0;
+
+#ifndef FULL_TIMEKEEPING
+	return sindex.first_time;
+#else
+	return sindex.timessindex.restart_count;
+#endif
+}

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itload.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/itload.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itmisc.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/itmisc.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itread.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/itread.c Changed

@@ -24,23 +24,14 @@
 #include "dumb.h"
 #include "internal/it.h"
 
-#define INVESTIGATE_OLD_INSTRUMENTS
-
+#ifndef min
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+#endif
 
 
-static int it_seek(DUMBFILE *f, long offset)
-{
-	long pos = dumbfile_pos(f);
+#define INVESTIGATE_OLD_INSTRUMENTS
 
-	if (pos > offset)
-		return -1;
 
-	if (pos < offset)
-		if (dumbfile_skip(f, offset - pos))
-			return -1;
-
-	return 0;
-}
 
 typedef unsigned char byte;
 typedef uint16_t word;
@@ -63,13 +54,13 @@
 
 	size = dumbfile_igetw(f);
 	if (size < 0)
-		return size;
+		return (int)size;
 
 	crap->sourcebuf = malloc(size);
 	if (!crap->sourcebuf)
 		return -1;
 
-	c = dumbfile_getnc((char *)crap->sourcebuf, size, f);
+	c = (int)dumbfile_getnc((char *)crap->sourcebuf, size, f);
 	if (c < size) {
 		free(crap->sourcebuf);
 		crap->sourcebuf = NULL;
@@ -119,7 +110,7 @@
 /** 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)
+static int decompress8(DUMBFILE *f, signed char *data, int len, int it215, int stereo)
 {
 	int blocklen, blockpos;
 	byte bitwidth;
@@ -129,7 +120,8 @@
 
 	memset(&crap, 0, sizeof(crap));
 
-	memset(data, 0, len * sizeof(*data));
+	for (blocklen = 0, blockpos = 0; blocklen < len; blocklen++, blockpos += 1 + stereo)
+		data blockpos = 0;
 
 	while (len > 0) {
 		//Read a block of compressed data:
@@ -194,7 +186,8 @@
 			/* Version 2.15 was an unofficial version with hacked compression
 			 * code. Yay, better compression :D
 			 */
-			*data++ = cmwt == 0x215 ? d2 : d1;
+			*data++ = it215 ? d2 : d1;
+			data += stereo;
 			len--;
 			blockpos++;
 		}
@@ -205,17 +198,18 @@
 
 
 
-static int decompress16(DUMBFILE *f, short *data, int len, int cmwt)
+static int decompress16(DUMBFILE *f, short *data, int len, int it215, int stereo)
 {
 	int blocklen, blockpos;
 	byte bitwidth;
 	long val;
-	short d1, d2;
+	signed short d1, d2;
 	readblock_crap crap;
 
 	memset(&crap, 0, sizeof(crap));
 
-	memset(data, 0, len * sizeof(*data));
+	for ( blocklen = 0, blockpos = 0; blocklen < len; blocklen++, blockpos += 1 + stereo )
+		data blockpos = 0;
 
 	while (len > 0) {
 		//Read a block of compressed data:
@@ -279,7 +273,8 @@
 			/* Version 2.15 was an unofficial version with hacked compression
 			 * code. Yay, better compression :D
 			 */
-			*data++ = cmwt == 0x215 ? d2 : d1;
+			*data++ = it215 ? d2 : d1;
+			data += stereo;
 			len--;
 			blockpos++;
 		}
@@ -300,6 +295,8 @@
 	envelope->loop_end = dumbfile_getc(f);
 	envelope->sus_loop_start = dumbfile_getc(f);
 	envelope->sus_loop_end = dumbfile_getc(f);
+	if (envelope->n_nodes > 25)
+		envelope->n_nodes = 25;
 	for (n = 0; n < envelope->n_nodes; n++) {
 		envelope->node_yn = dumbfile_getc(f);
 		envelope->node_tn = dumbfile_igetw(f);
@@ -313,13 +310,6 @@
 		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);
 }
 
@@ -334,7 +324,7 @@
 	// XXX
 	dumbfile_skip(f, 4);
 
-	dumbfile_getnc(instrument->filename, 13, f);
+ dumbfile_getnc((char *)instrument->filename, 13, f);
 	instrument->filename13 = 0;
 
 	instrument->volume_envelope.flags = dumbfile_getc(f);
@@ -363,7 +353,7 @@
 	 */
 	dumbfile_skip(f, 4);
 
-	dumbfile_getnc(instrument->name, 26, f);
+ dumbfile_getnc((char *)instrument->name, 26, f);
 	instrument->name26 = 0;
 
 	/* Skip unused bytes following the Instrument Name. */
@@ -426,16 +416,6 @@
 		}
 	}
 
-	{
-		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;
 
@@ -449,17 +429,19 @@
 
 static int it_read_instrument(IT_INSTRUMENT *instrument, DUMBFILE *f, int maxlen)
 {
-	int n, len;
+ int n;
+ long len;
 
 	/*if (dumbfile_mgetl(f) != IT_INSTRUMENT_SIGNATURE)
 		return -1;*/
 	// XXX
 
 	if (maxlen) len = dumbfile_pos(f);
+ else len = 0;
 
 	dumbfile_skip(f, 4);
 
-	dumbfile_getnc(instrument->filename, 13, f);
+ dumbfile_getnc((char *)instrument->filename, 13, f);
 	instrument->filename13 = 0;
 
 	instrument->new_note_action = dumbfile_getc(f);
@@ -478,7 +460,7 @@
 	 */
 	dumbfile_skip(f, 4);
 
-	dumbfile_getnc(instrument->name, 26, f);
+ dumbfile_getnc((char *)instrument->name, 26, f);
 	instrument->name26 = 0;
 
 	instrument->filter_cutoff = dumbfile_getc(f);
@@ -562,14 +544,14 @@
 		}
 	}
 
-	dumbfile_getnc(sample->filename, 13, f);
+ dumbfile_getnc((char *)sample->filename, 13, f);
 	sample->filename13 = 0;
 
 	sample->global_volume = dumbfile_getc(f);
 	sample->flags = dumbfile_getc(f);
 	sample->default_volume = dumbfile_getc(f);
 
-	dumbfile_getnc(sample->name, 26, f);
+ dumbfile_getnc((char *)sample->name, 26, f);
 	sample->name26 = 0;
 
 	*convert = dumbfile_getc(f);
@@ -639,8 +621,8 @@
 	long n, len, delta;
 	signed char * ptr, * end;
 	signed char compression_table16;
-	if (dumbfile_getnc(compression_table, 16, f) != 16)
-		return -1;
+ if (dumbfile_getnc((char *)compression_table, 16, f) != 16)
+ return -1;
 	ptr = (signed char *) sample->data;
 	delta = 0;
 
@@ -660,7 +642,7 @@
 }
 
 
-static long it_read_sample_data(int cmwt, IT_SAMPLE *sample, unsigned char convert, DUMBFILE *f)
+static long it_read_sample_data(IT_SAMPLE *sample, unsigned char convert, DUMBFILE *f)
 {
 	long n;
 
@@ -677,31 +659,53 @@
 	} 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;
+		/* Behavior as defined by greasemonkey's munch.py and observed by XMPlay and OpenMPT */
 
-/*
-//#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)));
- }
+		if (sample->flags & IT_SAMPLE_STEREO) {
+			if (sample->flags & IT_SAMPLE_16BIT) {
+				decompress16(f, (short *) sample->data, (int)(datasize >> 1), convert & 4, 1);
+				decompress16(f, (short *) sample->data + 1, (int)(datasize >> 1), convert & 4, 1);
+			} else {
+				decompress8(f, (signed char *) sample->data, (int)(datasize >> 1), convert & 4, 1);
+				decompress8(f, (signed char *) sample->data + 1, (int)(datasize >> 1), convert & 4, 1);
+			}
+		} else {
+			if (sample->flags & IT_SAMPLE_16BIT)
+				decompress16(f, (short *) sample->data, (int)datasize, convert & 4, 0);
+			else
+				decompress8(f, (signed char *) sample->data, (int)datasize, convert & 4, 0);
+		}
 	} else if (sample->flags & IT_SAMPLE_16BIT) {
- 		if (convert & 2)
-			for (n = 0; n < datasize; n++)
-				((short *)sample->data)n = dumbfile_mgetw(f);
- 		else
+		if (sample->flags & IT_SAMPLE_STEREO) {
+			if (convert & 2) {
+				for (n = 0; n < datasize; n += 2)
+					((short *)sample->data)n = dumbfile_mgetw(f);
+				for (n = 1; n < datasize; n += 2)
+					((short *)sample->data)n = dumbfile_mgetw(f);
+			} else {
+				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 {
+ 			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 {
+		if (sample->flags & IT_SAMPLE_STEREO) {
+			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
 			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);
+				((signed char *)sample->data)n = dumbfile_getc(f);
+	}
 
 	if (dumbfile_error(f))
 		return -1;
@@ -776,7 +780,7 @@
 		return -1;
 
 	/* Read in the pattern data. */
-	dumbfile_getnc(buffer, buflen, f);
+ dumbfile_getnc((char *)buffer, buflen, f);
 
 	if (dumbfile_error(f))
 		return -1;
@@ -922,8 +926,8 @@
 
 static int it_component_compare(const void *e1, const void *e2)
 {
-	return ((const IT_COMPONENT *)e1)->offset -
-	 ((const IT_COMPONENT *)e2)->offset;
+	return (int)(((const IT_COMPONENT *)e1)->offset -
+	 ((const IT_COMPONENT *)e2)->offset);
 }
 
 
@@ -946,12 +950,16 @@
 	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;
@@ -961,7 +969,7 @@
 	sigdata->midi = NULL;
 	sigdata->checkpoint = NULL;
 
-	dumbfile_getnc(sigdata->name, 26, f);
+ dumbfile_getnc((char *)sigdata->name, 26, f);
 	sigdata->name26 = 0;
 
 	/* Skip pattern row highlight info. */
@@ -989,13 +997,13 @@
 	dumbfile_skip(f, 1);
 
 	message_length = dumbfile_igetw(f);
-	message_offset = dumbfile_igetl(f);
+	message_offset = (int)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);
+ dumbfile_getnc((char *)sigdata->channel_pan, DUMB_IT_N_CHANNELS, f);
+ dumbfile_getnc((char *)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) {
@@ -1037,7 +1045,7 @@
 			sigdata->patternn.entry = NULL;
 	}
 
-	dumbfile_getnc(sigdata->order, sigdata->n_orders, f);
+ dumbfile_getnc((char *)sigdata->order, sigdata->n_orders, f);
 	sigdata->restart_position = 0;
 
 	component = malloc(769 * sizeof(*component));
@@ -1127,7 +1135,7 @@
 		for (i = 0; i < 16; i++) {
 			unsigned char len = 0;
 			int j, leftdigit = -1;
-			if (dumbfile_getnc(mididata, 32, f) < 32) {
+ if (dumbfile_getnc((char *)mididata, 32, f) < 32) {
 				free(component);
 				_dumb_it_unload_sigdata(sigdata);
 				return NULL;
@@ -1159,7 +1167,7 @@
 		for (i = 0; i < 128; i++) {
 			unsigned char len = 0;
 			int j, leftdigit = -1;
-			dumbfile_getnc(mididata, 32, f);
+ dumbfile_getnc((char *)mididata, 32, f);
 			for (j = 0; j < 32; j++) {
 				if (leftdigit >= 0) {
 					if (mididataj == 0) {
@@ -1185,7 +1193,7 @@
 
 	sigdata->flags &= IT_REAL_FLAGS;
 
-	qsort(component, n_components, sizeof(IT_COMPONENT), &it_component_compare);
+ qsort(component, n_components, sizeof(IT_COMPONENT), &it_component_compare);
 
 	buffer = malloc(65536);
 	if (!buffer) {
@@ -1219,7 +1227,7 @@
 			continue;
 		}
 
-		if (it_seek(f, componentn.offset)) {
+ if (dumbfile_seek(f, componentn.offset, DFS_SEEK_SET)) {
 			free(buffer);
 			free(component);
 			_dumb_it_unload_sigdata(sigdata);
@@ -1229,9 +1237,12 @@
 		switch (componentn.type) {
 
 			case IT_COMPONENT_SONG_MESSAGE:
+				if ( n < n_components ) {
+					message_length = min( message_length, (int)(componentn+1.offset - componentn.offset) );
+				}
 				sigdata->song_message = malloc(message_length + 1);
 				if (sigdata->song_message) {
-					if (dumbfile_getnc(sigdata->song_message, message_length, f) < message_length) {
+ if (dumbfile_getnc((char *)sigdata->song_message, message_length, f) < message_length) {
 						free(buffer);
 						free(component);
 						_dumb_it_unload_sigdata(sigdata);
@@ -1245,7 +1256,7 @@
 				if (cmwt < 0x200)
 					m = it_read_old_instrument(&sigdata->instrumentcomponentn.n, f);
 				else
-					m = it_read_instrument(&sigdata->instrumentcomponentn.n, f, (n + 1 < n_components) ? (componentn+1.offset - componentn.offset) : 0);
+					m = it_read_instrument(&sigdata->instrumentcomponentn.n, f, (n + 1 < n_components) ? (int)(componentn+1.offset - componentn.offset) : 0);
 
 				if (m) {
 					free(buffer);
@@ -1295,14 +1306,14 @@
 		m = componentn.sampfirst;
 
 		while (m >= 0) {
-			if (it_seek(f, componentm.offset)) {
+ if (dumbfile_seek(f, componentm.offset, DFS_SEEK_SET)) {
 				free(buffer);
 				free(component);
 				_dumb_it_unload_sigdata(sigdata);
 				return NULL;
 			}
 
-			if (it_read_sample_data(cmwt, &sigdata->samplecomponentm.n, sample_convertcomponentm.n, f)) {
+			if (it_read_sample_data(&sigdata->samplecomponentm.n, sample_convertcomponentm.n, f)) {
 				free(buffer);
 				free(component);
 				_dumb_it_unload_sigdata(sigdata);
@@ -1311,9 +1322,67 @@
 
 			m = componentm.sampnext;
 		}
-	}
+ }
+
+ for ( n = 0; n < 10; n++ )
+ {
+ if ( dumbfile_getc( f ) == 'X' )
+ {
+ if ( dumbfile_getc( f ) == 'T' )
+ {
+ if ( dumbfile_getc( f ) == 'P' )
+ {
+ if ( dumbfile_getc( f ) == 'M' )
+ {
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if ( !dumbfile_error( f ) && n < 10 )
+ {
+ unsigned int mptx_id = (unsigned int)dumbfile_igetl( f );
+ while ( !dumbfile_error( f ) && mptx_id != DUMB_ID('M','P','T','S') )
+ {
+ unsigned int size = dumbfile_igetw( f );
+ switch (mptx_id)
+ {
+ /* TODO: Add instrument extension readers */
+
+ default:
+ dumbfile_skip(f, size * sigdata->n_instruments);
+ break;
+ }
+
+ mptx_id = (unsigned int)dumbfile_igetl( f );
+ }
+
+ mptx_id = (unsigned int)dumbfile_igetl( f );
+ while ( !dumbfile_error(f) && dumbfile_pos(f) < dumbfile_get_size(f) )
+ {
+ unsigned int size = dumbfile_igetw( f );
+ switch (mptx_id)
+ {
+ /* TODO: Add more song extension readers */
+
+ case DUMB_ID('D','T','.','.'):
+ if ( size == 2 )
+ sigdata->tempo = dumbfile_igetw( f );
+ else if ( size == 4 )
+ sigdata->tempo = (int)dumbfile_igetl( f );
+ break;
+
+ default:
+ dumbfile_skip(f, size);
+ break;
+ }
+ mptx_id = (unsigned int)dumbfile_igetl( f );
+ }
+ }
 
-	free(buffer);
+ free(buffer);
 	free(component);
 
 	_dumb_it_fix_invalid_orders(sigdata);
@@ -1321,6 +1390,8 @@
 	return sigdata;
 }
 
+
+
 DUH *dumb_read_it_quick(DUMBFILE *f)
 {
 	sigdata_t *sigdata;
@@ -1333,9 +1404,11 @@
 		return NULL;
 
 	{
-		const char *tag12;
+		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
-		return make_duh(-1, 1, (const char *const (*)2)tag, 1, &descptr, &sigdata);
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
+		tag10 = "FORMAT";
+		tag11 = "IT";
+		return make_duh(-1, 2, (const char *const (*)2)tag, 1, &descptr, &sigdata);
 	}
 }

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/itrender.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/itrender.c Changed

@@ -1,5565 +1,6125 @@
-/* _______ ____ __ ___ ___
- * \ _ \ \ / \ / \ \ / / ' ' '
- * | | \ \ | | || | \/ | . .
- * | | | | | | || ||\ /| |
- * | | | | | | || || \/ | | ' ' '
- * | | | | | | || || | | . .
- * | |_/ / \ \__// || | |
- * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
- * / \
- * / . \
- * itrender.c - Code to render an Impulse Tracker / / \ \
- * module. | < / \_
- * | \/ /\ /
- * Written - painstakingly - by entheh. \_ / > /
- * | \ / /
- * | ' /
- * \__/
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.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 = &dstchannelsrc->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_volume0 = src->float_volume0;
-	dst->float_volume1 = src->float_volume1;
-
-	dst->ramp_volume0 = src->ramp_volume0;
-	dst->ramp_volume1 = src->ramp_volume1;
-
-	dst->ramp_delta0 = src->ramp_delta0;
-	dst->ramp_delta1 = src->ramp_delta1;
-
-	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_state0 = src->filter_state0;
-	dst->filter_state1 = src->filter_state1;
-
-	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;
-	}
-	memset (dst, 0, sizeof (*dst));
-
-	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->channeli, &src->channeli);
-
-	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++)
-		dst->playingi = dup_playing(src->playingi, 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 SFmacro1616; */
-	{
-		{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 SFmacrolen16; */
-	{4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	/* unsigned short SFmacroz16; */
-	/* 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 Zmacro12816; */
-	{
-		{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 Zmacrolen128; */
-	{
-		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 src0, and writes its
- * output starting at dstpos. 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(src0, ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
-			dumb_record_click(cr, pos, startstep);
-		}
-
-		for (i = 0; i < datasize; i += step) {
-			{
-				sample_t newsample = MULSCA(srci, ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
-				prevsample = currsample;
-				currsample = newsample;
-			}
-			dsti += currsample;
-		}
-
-		if (cr) {
-			sample_t endstep = MULSCA(srcdatasize, 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 = src0*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 = srcdatasize*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_sine256 = {
-	 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_sawtooth256 = {
-	 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_squarewave256 = {
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 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_ramp256 = {
-	 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_squarewave256 = {
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
-	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
-	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
-	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
-	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
-	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
-	-64,-64,-64,-64,-64,-64,-64,-64,-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->channeli;
-		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->channeli);
-	}
-}
-
-
-
-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->channeli;
-		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->channeli;
-		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->instrumentchannel->instrument-1.map_samplechannel->note;
-				channel->truenote = sigdata->instrumentchannel->instrument-1.map_notechannel->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->samplechannel->sample-1.flags & IT_SAMPLE_EXISTS) && sigdata->samplechannel->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->instrumentchannel->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->instrumentchannel->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->instrumentchannel->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->instrumentchannel->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->playingi) {
-				sigrenderer->playingi = 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->playingi;
-				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->playingi = 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->playingi->flags & IT_PLAYING_BACKGROUND) {
-					write_seqtime();
-					sequence_c(SEQUENCE_STOP_SIGNAL);
-					sequence_c(i);
-					channel->VChannel = &module->VChanneli;
-					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->playingi;
-			if (playing && (playing->enabled_envelopes) && playing->instnum == channel->instrument) {
-				IT_INSTRUMENT * inst = &sigdata->instrumentchannel->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->samplechannel->sample-1;
-	if (sigdata->flags & IT_USE_INSTRUMENTS)
-		channel->playing->instrument = &sigdata->instrumentchannel->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_volume0 = 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_state0);
-	it_reset_filter_state(&channel->playing->filter_state1);
-	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->samplechannel->sample-1.default_volume;
-
-	if (sigdata->flags & IT_WAS_AN_XM) {
-		if (!(sigdata->flags & IT_WAS_A_MOD))
-			channel->truepan = 32 + sigdata->samplechannel->sample-1.default_pan*64;
-		return;
-	}
-
-	if (sigdata->flags & IT_WAS_AN_XM) {
-		if (!(sigdata->flags & IT_WAS_A_MOD))
-			channel->truepan = 32 + sigdata->samplechannel->sample-1.default_pan*64;
-		return;
-	}
-
-	{
-		int pan = sigdata->samplechannel->sample-1.default_pan;
-		if (pan >= 128 && pan <= 192) {
-			channel->pan = pan - 128;
-			return;
-		}
-	}
-
-	if (sigdata->flags & IT_USE_INSTRUMENTS) {
-		IT_INSTRUMENT *instrument = &sigdata->instrumentchannel->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->instrumentchannel->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->channeli.filter_cutoff = 127;
-							sigrenderer->channeli.filter_resonance = 0;
-							//// should we be resetting channeli.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_y0 << IT_ENVELOPE_SHIFT;
-	else if (pe->next_node >= envelope->n_nodes)
-		pe->value = envelope->node_yenvelope->n_nodes-1 << IT_ENVELOPE_SHIFT;
-	else {
-		int ys = envelope->node_ype->next_node-1 << IT_ENVELOPE_SHIFT;
-		int ts = envelope->node_tpe->next_node-1;
-		int te = envelope->node_tpe->next_node;
-
-		if (ts == te)
-			pe->value = ys;
-		else {
-			int ye = envelope->node_ype->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_vibratowaveform;
-								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_vibratowaveform;
-								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->playingi;
-											if (playing && channel == playing->channel)
-											{
-#ifdef RAMP_DOWN
-												playing->declick_stage = 2;
-#else
-												free(playing);
-												sigrenderer->playingi = 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->playingi;
-											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->playingi;
-											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->Zmacrolenentry->effectvalue-0x80;
-						int i;
-						for (i = 0; i < n; i++)
-							it_send_midi(sigrenderer, channel, midi->Zmacroentry->effectvalue-0x80i);
-					} else {
-						int n = midi->SFmacrolenchannel->SFmacro;
-						int i, j;
-						for (i = 0, j = 1; i < n; i++, j <<= 1)
-							it_send_midi(sigrenderer, channel,
-								(unsigned char)(midi->SFmacrozchannel->SFmacro & j ?
-									entry->effectvalue : midi->SFmacrochannel->SFmacroi));
-					}
-				}
-				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_tenvelope->n_nodes-1)
-							pe->tick = envelope->node_tenvelope->n_nodes-1;
-						pe->next_node = 0;
-						while (pe->tick > envelope->node_tpe->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 = slidetableentry->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->playingi) {
-							channel->playing->declick_stage = 2;
-							sigrenderer->playingi = 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->samplechannel->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->playingi) {
-						channel->playing->declick_stage = 2;
-						sigrenderer->playingi = 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->playingi) {
-						ptemp->declick_stage = 2;
-						ptemp->flags |= IT_PLAYING_SUSTAINOFF | IT_PLAYING_FADING;
-						sigrenderer->playingi = 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->samplechannel->sample-1;
-			if (sigdata->flags & IT_USE_INSTRUMENTS)
-				channel->playing->instrument = &sigdata->instrumentchannel->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_volume0 = 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_state0); // Are these
-			it_reset_filter_state(&channel->playing->filter_state1); // 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->channeli;
-
-		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->playingi) {
-							channel->playing->declick_stage = 2;
-							sigrenderer->playingi = 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_y0 << IT_ENVELOPE_SHIFT;
-
-	if (pe->next_node >= envelope->n_nodes)
-		return envelope->node_yenvelope->n_nodes-1 << IT_ENVELOPE_SHIFT;
-
-	ys = envelope->node_ype->next_node-1 << IT_ENVELOPE_SHIFT;
-	ts = envelope->node_tpe->next_node-1;
-	te = envelope->node_tpe->next_node;
-
-	if (ts == te)
-		return ys;
-
-	ye = envelope->node_ype->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_tpe->next_node) return 0;
-
-	if ((envelope->flags & IT_ENVELOPE_LOOP_ON) &&
-	 envelope->loop_end >= pe->next_node &&
-	 envelope->node_tenvelope->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_tenvelope->sus_loop_end <= pe->tick) return 0;
-
-	if (envelope->node_tenvelope->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_y0 << IT_ENVELOPE_SHIFT;
-	else if (pe->next_node >= envelope->n_nodes) {
-		pe->value = envelope->node_yenvelope->n_nodes-1 << IT_ENVELOPE_SHIFT;
-		return 1;
-	} else {
-		int ys = envelope->node_ype->next_node-1 << IT_ENVELOPE_SHIFT;
-		int ts = envelope->node_tpe->next_node-1;
-		int te = envelope->node_tpe->next_node;
-
-		if (ts == te)
-			pe->value = ys;
-		else {
-			int ye = envelope->node_ype->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_tpe->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_tenvelope->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_tenvelope->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_tenvelope->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_tenvelope->n_nodes-1)
-		return;
-
-	pe->tick++;
-
-	/* pe->next_node must be kept up to date for envelope_get_y(). */
-	while (pe->tick > envelope->node_tpe->next_node)
-		pe->next_node++;
-
-	if ((envelope->flags & IT_ENVELOPE_LOOP_ON) && envelope->loop_end < envelope->n_nodes) {
-		if (pe->tick == envelope->node_tenvelope->loop_end) {
-			pe->next_node = MID(0, envelope->loop_start, envelope->n_nodes - 1);
-			pe->tick = envelope->node_tpe->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_volume0 = vol;
-		vol = -vol;
-		if (!IT_IS_SURROUND_SHIFTED(pan)) vol += 2.0f * volume;
-		playing->float_volume1 = 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_volume0 = vol;
-			if (!IT_IS_SURROUND_SHIFTED(pan)) vol = 2.0f - vol;
-			playing->float_volume1 = vol;
-		} else {
-			playing->float_volume0 = 1.0f;
-			playing->float_volume1 = 1.0f;
-		}
-	}
-
-	vol = calculate_volume(sigrenderer, playing, 1.0f);
-	playing->float_volume0 *= vol;
-	playing->float_volume1 *= vol;
-
-	if (!sigrenderer->ramp_style || playing->ramp_volume0 == 31337.0) {
-		playing->ramp_volume0 = playing->float_volume0;
-		playing->ramp_volume1 = playing->float_volume1;
-		playing->ramp_delta0 = 0;
-		playing->ramp_delta1 = 0;
-	} else {
-		playing->ramp_delta0 = invt2g * (playing->float_volume0 - playing->ramp_volume0);
-		playing->ramp_delta1 = invt2g * (playing->float_volume1 - playing->ramp_volume1);
-	}
-}
-
-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;
-}
-
-static inline float dumb_log2(float x) {return (float)log(x)/M_LN2;}
-
-static int delta_to_note(float delta, int base)
-{
-	float note;
-	note = dumb_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 ProTrackerPeriodTable6*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 ProTrackerTunedPeriods16*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->channeli;
-		IT_PLAYING *playing = channel->playing;
-
-		if (playing) {
-			int vibrato_shift;
-			switch (playing->vibrato_waveform)
-			{
-			default:
-				vibrato_shift = it_sineplaying->vibrato_time;
-				break;
-			case 1:
-				vibrato_shift = it_sawtoothplaying->vibrato_time;
-				break;
-			case 2:
-				vibrato_shift = it_squarewaveplaying->vibrato_time;
-				break;
-			case 3:
-				vibrato_shift = (rand() % 129) - 64;
-				break;
-			case 4:
-				vibrato_shift = it_xm_squarewaveplaying->vibrato_time;
-				break;
-			case 5:
-				vibrato_shift = it_xm_rampplaying->vibrato_time;
-				break;
-			case 6:
-				vibrato_shift = it_xm_ramp255-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->channeli.playing) {
-			process_playing(sigrenderer, sigrenderer->channeli.playing, invt2g);
-			if (!(sigdata->flags & IT_WAS_AN_XM)) {
-				//if ((sigrenderer->channeli.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->channeli.playing->flags & IT_PLAYING_DEAD) {
-					free(sigrenderer->channeli.playing);
-					sigrenderer->channeli.playing = NULL;
-				}
-			}
-		}
-	}
-
-	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
-		if (sigrenderer->playingi) {
-			process_playing(sigrenderer, sigrenderer->playingi, invt2g);
-			if (sigrenderer->playingi->flags & IT_PLAYING_DEAD) {
-				free(sigrenderer->playingi);
-				sigrenderer->playingi = 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->channeln;
-						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->channeln.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->ordersigrenderer->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->patternn;
-
-				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_sineplaying->tremolo_time;
-			break;
-		case 1:
-			vol = it_sawtoothplaying->tremolo_time;
-			break;
-		case 2:
-			vol = it_squarewaveplaying->tremolo_time;
-			break;
-		case 3:
-			vol = (rand() % 129) - 64;
-			break;
-		case 4:
-			vol = it_xm_squarewaveplaying->vibrato_time;
-			break;
-		case 5:
-			vol = it_xm_rampplaying->vibrato_time;
-			break;
-		case 6:
-			vol = it_xm_ramp255-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_sineplaying->panbrello_time;
-				break;
-			case 1:
-				pan = it_sawtoothplaying->panbrello_time;
-				break;
-			case 2:
-				pan = it_squarewaveplaying->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 click2;
-					dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, &lvol, &rvol, click);
-					dumb_record_click(sigrenderer->click_remover0, pos, click0);
-					dumb_record_click(sigrenderer->click_remover1, pos, click1);
-				}
-				size_rendered = dumb_resample_n_2_2(bits, &playing->resampler, samples0 + pos*2, size, &lvol, &rvol, delta);
-				if (store_end_sample) {
-					sample_t click2;
-					dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, &lvol, &rvol, click);
-					samples0(pos + size_rendered) * 2 = click0;
-					samples0(pos + size_rendered) * 2 + 1 = click1;
-				}
-				if ((cr_record_which & 2) && sigrenderer->click_remover) {
-					sample_t click2;
-					dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, &lvol, &rvol, click);
-					dumb_record_click(sigrenderer->click_remover0, pos + size_rendered, -click0);
-					dumb_record_click(sigrenderer->click_remover1, pos + size_rendered, -click1);
-				}
-			} else {
-				if ((cr_record_which & 1) && sigrenderer->click_remover) {
-					sample_t click2;
-					dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, &lvol, &rvol, click);
-					dumb_record_click(sigrenderer->click_remover0, pos, click0);
-					dumb_record_click(sigrenderer->click_remover1, pos, click1);
-				}
-				size_rendered = dumb_resample_n_1_2(bits, &playing->resampler, samples0 + pos*2, size, &lvol, &rvol, delta);
-				if (store_end_sample) {
-					sample_t click2;
-					dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, &lvol, &rvol, click);
-					samples0(pos + size_rendered) * 2 = click0;
-					samples0(pos + size_rendered) * 2 + 1 = click1;
-				}
-				if ((cr_record_which & 2) && sigrenderer->click_remover) {
-					sample_t click2;
-					dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, &lvol, &rvol, click);
-					dumb_record_click(sigrenderer->click_remover0, pos + size_rendered, -click0);
-					dumb_record_click(sigrenderer->click_remover1, pos + size_rendered, -click1);
-				}
-			}
-		} 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_remover0, pos, click);
-				}
-				size_rendered = dumb_resample_n_2_1(bits, &playing->resampler, samples0 + pos, size, &lvol, &rvol, delta);
-				if (store_end_sample)
-					dumb_resample_get_current_sample_n_2_1(bits, &playing->resampler, &lvol, &rvol, &samples0pos + 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_remover0, 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_remover0, pos, click);
-				}
-				size_rendered = dumb_resample_n_1_1(bits, &playing->resampler, samples0 + pos, size, &lvol, delta);
-				if (store_end_sample)
-					dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, &lvol, &samples0pos + 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_remover0, 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 click2;
-				dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, lvol, rvol, click);
-				dumb_record_click(sigrenderer->click_remover0, pos, click0);
-				dumb_record_click(sigrenderer->click_remover1, pos, click1);
-			}
-			size_rendered = dumb_resample_n_2_2(bits, &playing->resampler, samples0 + pos*2, size, lvol, rvol, delta);
-			if (store_end_sample) {
-				sample_t click2;
-				dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, lvol, rvol, click);
-				samples0(pos + size_rendered) * 2 = click0;
-				samples0(pos + size_rendered) * 2 + 1 = click1;
-			}
-			if ((cr_record_which & 2) && sigrenderer->click_remover) {
-				sample_t click2;
-				dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, lvol, rvol, click);
-				dumb_record_click(sigrenderer->click_remover0, pos + size_rendered, -click0);
-				dumb_record_click(sigrenderer->click_remover1, pos + size_rendered, -click1);
-			}
-		} else {
-			if ((cr_record_which & 1) && sigrenderer->click_remover) {
-				sample_t click2;
-				dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, lvol, rvol, click);
-				dumb_record_click(sigrenderer->click_remover0, pos, click0);
-				dumb_record_click(sigrenderer->click_remover1, pos, click1);
-			}
-			size_rendered = dumb_resample_n_1_2(bits, &playing->resampler, samples0 + pos*2, size, lvol, rvol, delta);
-			if (store_end_sample) {
-				sample_t click2;
-				dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, lvol, rvol, click);
-				samples0(pos + size_rendered) * 2 = click0;
-				samples0(pos + size_rendered) * 2 + 1 = click1;
-			}
-			if ((cr_record_which & 2) && sigrenderer->click_remover) {
-				sample_t click2;
-				dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, lvol, rvol, click);
-				dumb_record_click(sigrenderer->click_remover0, pos + size_rendered, -click0);
-				dumb_record_click(sigrenderer->click_remover1, pos + size_rendered, -click1);
-			}
-		}
-	} 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_remover0, pos, click);
-			}
-			size_rendered = dumb_resample_n_2_1(bits, &playing->resampler, samples0 + pos, size, lvol, rvol, delta);
-			if (store_end_sample)
-				dumb_resample_get_current_sample_n_2_1(bits, &playing->resampler, lvol, rvol, &samples0pos + 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_remover0, 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_remover0, pos, click);
-			}
-			size_rendered = dumb_resample_n_1_1(bits, &playing->resampler, samples0 + pos, size, lvol, delta);
-			if (store_end_sample)
-				dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, lvol, &samples0pos + 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_remover0, 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_sineplaying->sample_vibrato_time;
-			break;
-		case 1:
-			sample_vibrato_shift = it_sawtoothplaying->sample_vibrato_time;
-			break;
-		case 2:
-			sample_vibrato_shift = it_squarewaveplaying->sample_vibrato_time;
-			break;
-		case 3:
-			sample_vibrato_shift = (rand() % 129) - 64;
-			break;
-		case 4:
-			sample_vibrato_shift = it_xm_squarewaveplaying->sample_vibrato_time;
-			break;
-		case 5:
-			sample_vibrato_shift = it_xm_rampplaying->sample_vibrato_time;
-			break;
-		case 6:
-			sample_vibrato_shift = it_xm_ramp255-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_mixDUMB_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->channeli.playing && !(sigrenderer->channeli.playing->flags & IT_PLAYING_DEAD)) {
-			to_mixn_to_mix.playing = sigrenderer->channeli.playing;
-			to_mixn_to_mix.volume = volume == 0 ? 0 : calculate_volume(sigrenderer, sigrenderer->channeli.playing, volume);
-			n_to_mix++;
-		}
-	}
-
-	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
-		if (sigrenderer->playingi) { /* Won't be dead; it would have been freed. */
-			to_mixn_to_mix.playing = sigrenderer->playingi;
-			to_mixn_to_mix.volume = volume == 0 ? 0 : calculate_volume(sigrenderer, sigrenderer->playingi, 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_mixi.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_filter0, 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 ? cr0 : NULL, &playing->filter_state0, samples0 /*output*/, pos, samples_to_filter0, size_rendered,
-						2, (int)(65536.0f/delta), playing->true_filter_cutoff, playing->true_filter_resonance);
-					it_filter(cr ? cr1 : NULL, &playing->filter_state1, samples0 /*output*/+1, pos, samples_to_filter0+1, size_rendered,
-						2, (int)(65536.0f/delta), playing->true_filter_cutoff, playing->true_filter_resonance);
-				} else {
-					it_filter(cr ? cr0 : NULL, &playing->filter_state0, samples0 /*output*/, pos, samples_to_filter0, 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_state0);
-			it_reset_filter_state(&playing->filter_state1);
-			render_playing_ramp(sigrenderer, playing, volume, delta, note_delta, pos, size, samples /*&samplesoutput*/, 0, &left_to_mix, ramp_style);
-		}
-	}
-
-	destroy_sample_buffer(samples_to_filter);
-
-	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
-		if (sigrenderer->channeli.playing) {
-			//if ((sigrenderer->channeli.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->channeli.playing->declick_stage == 3) || 
-#endif
-			(sigrenderer->channeli.playing->flags & IT_PLAYING_DEAD)) {
-				free(sigrenderer->channeli.playing);
-				sigrenderer->channeli.playing = NULL;
-			}
-		}
-	}
-
-	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
-		if (sigrenderer->playingi) {
-			if (
-#ifdef RAMP_DOWN
-				(sigrenderer->playingi->declick_stage == 3) ||
-#endif
-				(sigrenderer->playingi->flags & IT_PLAYING_DEAD)) {
-				free(sigrenderer->playingi);
-				sigrenderer->playingi = 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;
-	}
-	memset (sigrenderer, 0, sizeof (*sigrenderer));
-
-	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->channeli;
-#if IT_CHANNEL_MUTED != 1
-#error this is wrong
-#endif
-		channel->flags = sigdata->channel_pani >> 7;
-		channel->volume = (sigdata->flags & IT_WAS_AN_XM) ? 0 : 64;
-		channel->pan = sigdata->channel_pani & 0x7F;
-		channel->truepan = channel->pan << IT_ENVELOPE_SHIFT;
-		channel->channelvolume = sigdata->channel_volumei;
-		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->playingi = 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->ordern > 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->orderorder;
-			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->channeli.playing)
-			{
-				IT_PLAYING * playing = sigrenderer->channeli.playing;
-				playing->resampling_quality = quality;
-				playing->resampler.quality = quality;
-			}
-		}
-		for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
-			if (sigrenderer->playingi) {
-				IT_PLAYING * playing = sigrenderer->playingi;
-				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->channeli.playing)
-				free(sigrenderer->channeli.playing);
-#ifdef BIT_ARRAY_BULLSHIT
-			bit_array_destroy(sigrenderer->channeli.played_patjump);
-#endif
-		}
-
-		for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++)
-			if (sigrenderer->playingi)
-				free(sigrenderer->playingi);
-
-		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->playingchannel - DUMB_IT_N_CHANNELS;
-		if (!playing) { state->sample = 0; return; }
-	} else {
-		playing = sr->channelchannel.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->ordern;
-		if (p < sigdata->n_patterns) {
-			IT_PATTERN * pattern = &sigdata->patternp;
-			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->ordern;
-		if (p < sigdata->n_patterns) {
-			IT_PATTERN * pattern = &sigdata->patternp;
-			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->ordern >= sigdata->n_patterns) ||
-			(is_pattern_silent(&sigdata->patternsigdata->ordern, 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;
-}
-
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * itrender.c - Code to render an Impulse Tracker / / \ \
+ * module. | < / \_
+ * | \/ /\ /
+ * Written - painstakingly - by entheh. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+#include "internal/dumb.h"
+#include "internal/it.h"
+#include "internal/lpc.h"
+
+#include "internal/resampler.h"
+
+// Keep this disabled, as it's actually slower than the original C/integer version
+//
+//#ifdef __APPLE__
+//#include <TargetConditionals.h>
+//#if TARGET_CPU_ARM || TARGET_CPU_ARM64
+//#include <arm_neon.h>
+//#define FILTER_NEON
+//#endif
+//#endif
+
+// #define BIT_ARRAY_BULLSHIT
+
+static IT_PLAYING *new_playing()
+{
+	IT_PLAYING * r = (IT_PLAYING*) malloc(sizeof(*r));
+	if (r)
+	{
+		r->resampler.fir_resampler_ratio = 0.0;
+		r->resampler.fir_resampler0 = resampler_create();
+		if ( !r->resampler.fir_resampler0 ) {
+			free( r );
+			return NULL;
+		}
+		r->resampler.fir_resampler1 = resampler_create();
+		if ( !r->resampler.fir_resampler1 ) {
+			resampler_delete( r->resampler.fir_resampler0 );
+			free( r );
+			return NULL;
+		}
+	}
+	return r;
+}
+
+static void free_playing(IT_PLAYING * r)
+{
+	resampler_delete( r->resampler.fir_resampler1 );
+	resampler_delete( r->resampler.fir_resampler0 );
+	free( r );
+}
+
+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 = &dstchannelsrc->channel - srcchannel;
+	dst->sample = src->sample;
+	dst->instrument = src->instrument;
+	dst->env_instrument = src->env_instrument;
+
+	dst->sampnum = src->sampnum;
+	dst->instnum = src->instnum;
+
+	dst->declick_stage = src->declick_stage;
+
+	dst->float_volume0 = src->float_volume0;
+	dst->float_volume1 = src->float_volume1;
+
+	dst->ramp_volume0 = src->ramp_volume0;
+	dst->ramp_volume1 = src->ramp_volume1;
+
+	dst->ramp_delta0 = src->ramp_delta0;
+	dst->ramp_delta1 = src->ramp_delta1;
+
+	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_state0 = src->filter_state0;
+	dst->filter_state1 = src->filter_state1;
+
+	dst->resampler = src->resampler;
+	dst->resampler.pickup_data = dst;
+	dst->resampler.fir_resampler_ratio = src->resampler.fir_resampler_ratio;
+	dst->resampler.fir_resampler0 = resampler_dup( src->resampler.fir_resampler0 );
+	if ( !dst->resampler.fir_resampler0 ) {
+		free( dst );
+		return NULL;
+	}
+	dst->resampler.fir_resampler1 = resampler_dup( src->resampler.fir_resampler1 );
+	if ( !dst->resampler.fir_resampler1 ) {
+		resampler_delete( dst->resampler.fir_resampler0 );
+		free( dst );
+		return NULL;
+	}
+	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_table = src->arpeggio_table;
+	memcpy(dst->arpeggio_offsets, src->arpeggio_offsets, sizeof(dst->arpeggio_offsets));
+	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->okt_toneslide = src->okt_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->inv_loop_delay = src->inv_loop_delay;
+	dst->inv_loop_speed = src->inv_loop_speed;
+	dst->inv_loop_offset = src->inv_loop_offset;
+
+	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;
+	}
+
+	memset (dst, 0, sizeof (*dst));
+
+	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->channeli, &src->channeli);
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++)
+		dst->playingi = dup_playing(src->playingi, 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->ramp_style = src->ramp_style;
+
+	dst->click_remover = NULL;
+
+	dst->callbacks = callbacks;
+
+#ifdef BIT_ARRAY_BULLSHIT
+	dst->played = bit_array_dup(src->played);
+
+	dst->looped = src->looped;
+	dst->time_played = src->time_played;
+	dst->row_timekeeper = timekeeping_array_dup(src->row_timekeeper);
+#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 SFmacro1616; */
+	{
+		{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 SFmacrolen16; */
+	{4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	/* unsigned short SFmacroz16; */
+	/* 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 Zmacro12816; */
+	{
+		{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 Zmacrolen128; */
+	{
+		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;
+}
+
+
+
+#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 src0, and writes its
+ * output starting at dstpos. The pos parameter is required for getting
+ * click removal right.
+ */
+
+static void it_filter_int(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(src0, ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
+			dumb_record_click(cr, pos, startstep);
+		}
+
+		for (i = 0; i < datasize; i += step) {
+			{
+				sample_t newsample = MULSCA(srci, ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
+				prevsample = currsample;
+				currsample = newsample;
+			}
+			dsti += currsample;
+		}
+
+		if (cr) {
+			sample_t endstep = MULSCA(srcdatasize, 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 = src0*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 = srcdatasize*a + currsample*b + prevsample*c;
+		dumb_record_click(cr, pos + size, -(sample_t)endstep);
+	}
+#endif
+
+	state->currsample = currsample;
+	state->prevsample = prevsample;
+}
+
+#if defined(_USE_SSE) && (defined(_M_IX86) || defined(__i386__) || defined(_M_X64) || defined(__amd64__))
+#include <xmmintrin.h>
+
+static void it_filter_sse(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)
+{
+	__m128 data, impulse;
+	__m128 temp1, temp2;
+
+	sample_t currsample = state->currsample;
+	sample_t prevsample = state->prevsample;
+
+	float imp4;
+
+	//profiler( filter_sse ); On ClawHammer Athlon64 3200+, ~12000 cycles, ~500 for that x87 setup code (as opposed to ~25500 for the original integer code)
+
+	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;
+		imp0 = 1.0f / (1.0f + d + e);
+		imp2 = -e * imp0;
+		imp1 = 1.0f - imp0 - imp2;
+#else
+		imp0 = 1.0f / (inv_angle*inv_angle + inv_angle*loss + loss);
+		imp2 = -(inv_angle*inv_angle) * imp0;
+		imp1 = 1.0f - imp0 - imp2;
+#endif
+		imp3 = 0.0f;
+	}
+
+	dst += pos * step;
+	datasize = size * step;
+
+	{
+		int ai, bi, ci, i;
+
+		if (cr) {
+			sample_t startstep;
+			ai = (int)(imp0 * (1 << (16+SCALEB)));
+			bi = (int)(imp1 * (1 << (16+SCALEB)));
+			ci = (int)(imp2 * (1 << (16+SCALEB)));
+			startstep = MULSCA(src0, ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
+			dumb_record_click(cr, pos, startstep);
+		}
+
+		temp1 = _mm_setzero_ps();
+		data = _mm_cvtsi32_ss( temp1, currsample );
+		temp2 = _mm_cvtsi32_ss( temp1, prevsample );
+		impulse = _mm_loadu_ps( (const float *) &imp );
+		data = _mm_shuffle_ps( data, temp2, _MM_SHUFFLE(1, 0, 0, 1) );
+
+		for (i = 0; i < datasize; i += step) {
+			temp1 = _mm_cvtsi32_ss( data, src i );
+			temp1 = _mm_mul_ps( temp1, impulse );
+			temp2 = _mm_movehl_ps( temp2, temp1 );
+			temp1 = _mm_add_ps( temp1, temp2 );
+			temp2 = temp1;
+			temp2 = _mm_shuffle_ps( temp2, temp1, _MM_SHUFFLE(0, 0, 0, 1) );
+			temp1 = _mm_add_ps( temp1, temp2 );
+			temp1 = _mm_shuffle_ps( temp1, data, _MM_SHUFFLE(2, 1, 0, 0) );
+			data = temp1;
+			dst i += _mm_cvtss_si32( temp1 );
+		}
+
+		currsample = _mm_cvtss_si32( temp1 );
+		temp1 = _mm_shuffle_ps( temp1, data, _MM_SHUFFLE(0, 0, 0, 2) );
+		prevsample = _mm_cvtss_si32( temp1 );
+
+		if (cr) {
+			sample_t endstep = MULSCA(srcdatasize, ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
+			dumb_record_click(cr, pos + size, -endstep);
+		}
+	}
+
+	state->currsample = currsample;
+	state->prevsample = prevsample;
+}
+#endif
+
+#ifdef FILTER_NEON
+static void it_filter_neon(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)
+{
+ float32x4_t data, impulse;
+ float32x4_t temp1;
+ float32x2_t temp2;
+ float32_t temp3;
+ 
+ sample_t currsample = state->currsample;
+ sample_t prevsample = state->prevsample;
+ 
+ float imp4;
+ 
+ //profiler( filter_sse ); On ClawHammer Athlon64 3200+, ~12000 cycles, ~500 for that x87 setup code (as opposed to ~25500 for the original integer code)
+ 
+ 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;
+ imp0 = 1.0f / (1.0f + d + e);
+ imp2 = -e * imp0;
+ imp1 = 1.0f - imp0 - imp2;
+#else
+ imp0 = 1.0f / (inv_angle*inv_angle + inv_angle*loss + loss);
+ imp2 = -(inv_angle*inv_angle) * imp0;
+ imp1 = 1.0f - imp0 - imp2;
+#endif
+ imp3 = 0.0f;
+ }
+ 
+ dst += pos * step;
+ datasize = size * step;
+ 
+ {
+ int ai, bi, ci, i;
+ 
+ if (cr) {
+ sample_t startstep;
+ ai = (int)(imp0 * (1 << (16+SCALEB)));
+ bi = (int)(imp1 * (1 << (16+SCALEB)));
+ ci = (int)(imp2 * (1 << (16+SCALEB)));
+ startstep = MULSCA(src0, ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
+ dumb_record_click(cr, pos, startstep);
+ }
+ 
+ data = vdupq_n_f32(0.0f);
+ data = vsetq_lane_f32( currsample, data, 1 );
+ data = vsetq_lane_f32( prevsample, data, 2 );
+ impulse = vld1q_f32( (const float32_t *) &imp );
+ 
+ for (i = 0; i < datasize; i += step) {
+ data = vsetq_lane_f32( src i, data, 0 );
+ temp1 = vmulq_f32(data, impulse);
+ temp2 = vadd_f32(vget_high_f32(temp1), vget_low_f32(temp1));
+ temp3 = vget_lane_f32(vpadd_f32(temp2, temp2), 0);
+ data = vextq_f32(data, data, 3);
+ data = vsetq_lane_f32(temp3, data, 1);
+ dst i += temp3;
+ }
+ 
+ currsample = temp3;
+ prevsample = vgetq_lane_f32(data, 2);
+ 
+ if (cr) {
+ sample_t endstep = MULSCA(srcdatasize, ai) + MULSCA(currsample, bi) + MULSCA(prevsample, ci);
+ dumb_record_click(cr, pos + size, -endstep);
+ }
+ }
+ 
+ state->currsample = currsample;
+ state->prevsample = prevsample;
+}
+#endif
+
+#undef LOG10
+
+#ifdef _USE_SSE
+#if defined(_M_IX86) || defined(__i386__)
+
+#ifdef _MSC_VER
+#include <intrin.h>
+#elif defined(__clang__) || defined(__GNUC__)
+static inline void
+__cpuid(int *data, int selector)
+{
+#if defined(__PIC__) && defined(__i386__)
+ asm("xchgl %%ebx, %%esi; cpuid; xchgl %%ebx, %%esi"
+ : "=a" (data0),
+ "=S" (data1),
+ "=c" (data2),
+ "=d" (data3)
+ : "0" (selector));
+#elif defined(__PIC__) && defined(__amd64__)
+ asm("xchg{q} {%%}rbx, %q1; cpuid; xchg{q} {%%}rbx, %q1"
+ : "=a" (data0),
+ "=&r" (data1),
+ "=c" (data2),
+ "=d" (data3)
+ : "0" (selector));
+#else
+ asm("cpuid"
+ : "=a" (data0),
+ "=b" (data1),
+ "=c" (data2),
+ "=d" (data3)
+ : "a"(selector));
+#endif
+}
+#else
+#define __cpuid(a,b) memset((a), 0, sizeof(int) * 4)
+#endif
+
+static int query_cpu_feature_sse() {
+	int buffer4;
+	__cpuid(buffer,1);
+	if ((buffer3&(1<<25)) == 0) return 0;
+	return 1;
+}
+
+static int _dumb_it_use_sse = 0;
+
+void _dumb_init_sse()
+{
+ static int initialized = 0;
+ if (!initialized)
+ {
+ _dumb_it_use_sse = query_cpu_feature_sse();
+ initialized = 1;
+ }
+}
+
+#elif defined(_M_X64) || defined(__amd64__)
+
+static const int _dumb_it_use_sse = 1;
+
+void _dumb_init_sse() { }
+
+#else
+
+static const int _dumb_it_use_sse = 0;
+
+void _dumb_init_sse() { }
+
+#endif
+#endif
+
+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)
+{
+#if defined(_USE_SSE) && (defined(_M_IX86) || defined(__i386__) || defined(_M_X64) || defined(__amd64__))
+ _dumb_init_sse();
+	if ( _dumb_it_use_sse ) it_filter_sse( cr, state, dst, pos, src, size, step, sampfreq, cutoff, resonance );
+	else
+#endif
+#ifdef FILTER_NEON
+ it_filter_neon( cr, state, dst, pos, src, size, step, sampfreq, cutoff, resonance );
+#else
+	it_filter_int( cr, state, dst, pos, src, size, step, sampfreq, cutoff, resonance );
+#endif
+}
+
+
+
+static const signed char it_sine256 = {
+	 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_sawtooth256 = {
+	 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_squarewave256 = {
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 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_ramp256 = {
+	 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_squarewave256 = {
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,-64,
+	-64,-64,-64,-64,-64,-64,-64,-64,-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->channeli;
+		channel->key_off_count = 0;
+		channel->note_cut_count = 0;
+		channel->note_delay_count = 0;
+	}
+}
+
+
+
+static const unsigned char arpeggio_mod32 = {0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1};
+static const unsigned char arpeggio_xm32 = {0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2};
+static const unsigned char arpeggio_okt_332 = {1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0};
+static const unsigned char arpeggio_okt_432 = {0, 2, 0, 1, 0, 2, 0, 1, 0, 2, 0, 1, 0, 2, 0, 1, 0, 2, 0, 1, 0, 2, 0, 1, 0, 2, 0, 1, 0, 2, 0, 1};
+static const unsigned char arpeggio_okt_532 = {2, 2, 0, 2, 2, 0, 2, 2, 0, 2, 2, 0, 2, 2, 0, 2, 2, 0, 2, 2, 0, 2, 2, 0, 2, 2, 0, 2, 2, 0, 2, 2};
+
+
+
+static void reset_channel_effects(IT_CHANNEL *channel)
+{
+	channel->volslide = 0;
+	channel->xm_volslide = 0;
+	channel->panslide = 0;
+	channel->channelvolslide = 0;
+	channel->arpeggio_table = (const unsigned char *) &arpeggio_mod;
+	memset(channel->arpeggio_offsets, 0, sizeof(channel->arpeggio_offsets));
+	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;
+	channel->okt_toneslide = 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->channeli);
+	}
+}
+
+
+
+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_pickup_stop_after_reverse(DUMB_RESAMPLER *resampler, void *data)
+{
+	(void)data;
+
+	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->flags & IT_PLAYING_REVERSE) {
+		playing->resampler.start = 0;
+		playing->resampler.end = playing->sample->length;
+		playing->resampler.dir = -1;
+		playing->resampler.pickup = &it_pickup_stop_after_reverse;
+	} 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);
+				channel->playing->declick_stage = 0;
+			} 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);
+				channel->playing->declick_stage = 0;
+			} 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_playing(IT_PLAYING *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_smooth_effects(DUMB_IT_SIGRENDERER *sigrenderer)
+{
+	if (sigrenderer->initial_runthrough) {
+		return;
+	}
+	int i;
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		IT_CHANNEL *channel = &sigrenderer->channeli;
+		IT_PLAYING *playing = channel->playing;
+
+		if (playing) {
+			update_smooth_effects_playing(playing);
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+		IT_PLAYING *playing = sigrenderer->playingi;
+
+		if (playing) {
+			update_smooth_effects_playing(playing);
+		}
+	}
+}
+
+
+static const unsigned char pt_tab_invloop16 =
+{
+	0x00, 0x05, 0x06, 0x07, 0x08, 0x0A, 0x0B, 0x0D,
+	0x0F, 0x13, 0x16, 0x1A, 0x20, 0x2B, 0x40, 0x80
+};
+
+static void update_invert_loop(IT_CHANNEL *channel, IT_SAMPLE *sample)
+{
+	channel->inv_loop_delay += pt_tab_invloopchannel->inv_loop_speed;
+	if (channel->inv_loop_delay >= 0x80)
+	{
+		channel->inv_loop_delay = 0;
+
+		if (sample && ((sample->flags & (IT_SAMPLE_EXISTS | IT_SAMPLE_LOOP)) == (IT_SAMPLE_EXISTS | IT_SAMPLE_LOOP)) && !(sample->flags & (IT_SAMPLE_STEREO | IT_SAMPLE_16BIT)))
+		{
+			if (sample->loop_end - sample->loop_start >= 4)
+			{
+				channel->inv_loop_offset++;
+				if (channel->inv_loop_offset >= (sample->loop_end - sample->loop_start)) channel->inv_loop_offset = 0;
+
+				((char *)sample->data)sample->loop_start + channel->inv_loop_offset ^= 0xFF;
+			}
+		}
+	}
+}
+
+
+static void update_playing_effects(IT_PLAYING *playing)
+{
+	IT_CHANNEL *channel = playing->channel;
+
+	if (channel->channelvolslide) {
+		playing->channel_volume = channel->channelvolume;
+	}
+
+	if (channel->okt_toneslide) {
+		if (channel->okt_toneslide--) {
+			playing->note += channel->toneslide;
+			if (playing->note >= 120) {
+				if (channel->toneslide < 0) playing->note = 0;
+				else playing->note = 119;
+			}
+		}
+	} else if (channel->ptm_toneslide) {
+		if (--channel->toneslide_tick == 0) {
+			channel->toneslide_tick = channel->ptm_toneslide;
+			if (playing) {
+				playing->note += channel->toneslide;
+				if (playing->note >= 120) {
+					if (channel->toneslide < 0) playing->note = 0;
+					else playing->note = 119;
+				}
+				if (channel->playing == playing) {
+					channel->note = channel->truenote = playing->note;
+				}
+				if (channel->toneslide_retrig) {
+					it_playing_reset_resamplers(playing, 0);
+					playing->declick_stage = 0;
+				}
+			}
+		}
+	}
+}
+
+
+static void update_effects(DUMB_IT_SIGRENDERER *sigrenderer)
+{
+	if (sigrenderer->initial_runthrough) {
+		return;
+	}
+
+ 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->channeli;
+		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) {
+			int clip = (sigrenderer->sigdata->flags & IT_WAS_AN_S3M) ? 63 : 64;
+			channel->volume += channel->volslide;
+			if (channel->volume > clip) {
+				if (channel->volslide >= 0)
+					channel->volume = clip;
+				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->channelvolslide) {
+			channel->channelvolume += channel->channelvolslide;
+			if (channel->channelvolume > 64) {
+				if (channel->channelvolslide >= 0)
+					channel->channelvolume = 64;
+				else
+					channel->channelvolume = 0;
+			}
+		}
+
+		update_tremor(channel);
+
+		update_retrig(sigrenderer, channel);
+
+		if (channel->inv_loop_speed) update_invert_loop(channel, playing ? playing->sample : NULL);
+
+		if (playing) {
+			playing->slide += channel->portamento;
+
+			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_playing_effects(playing);
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+		IT_PLAYING *playing = sigrenderer->playingi;
+		if (playing) update_playing_effects(playing);
+	}
+
+	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 (sigrenderer->sigdata->flags & IT_WAS_AN_S3M) {
+						if (effectvalue == 0)
+							effectvalue = channel->lastDKL;
+						channel->lastDKL = effectvalue;
+					} else {
+						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 != 0xFFFE && channel->played_patjump_order != sigrenderer->order )
+											bit_array_merge(sigrenderer->played, channel->played_patjump, channel->played_patjump_order * 256);
+										//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 = channel->pat_loop_row; n <= sigrenderer->row; 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 | 0xC00) < 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->instrumentchannel->instrument-1.map_samplechannel->note;
+				channel->truenote = sigdata->instrumentchannel->instrument-1.map_notechannel->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->samplechannel->sample-1.flags & IT_SAMPLE_EXISTS) && sigdata->samplechannel->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->flags & IT_PLAYING_SUSTAINOFF)) {
+				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->instrumentchannel->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 || channel->instrument > sigdata->n_instruments ||
+			!(sigdata->instrumentchannel->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 recalculate_it_envelope_node(IT_PLAYING_ENVELOPE *pe, IT_ENVELOPE *e)
+{
+	int envpos = pe->tick;
+	unsigned int pt = e->n_nodes - 1;
+	unsigned int i;
+	for (i = 0; i < (unsigned int)(e->n_nodes - 1); ++i)
+	{
+		if (envpos <= e->node_ti)
+		{
+			pt = i;
+			break;
+		}
+	}
+	pe->next_node = pt;
+}
+
+
+static void recalculate_it_envelope_nodes(IT_PLAYING *playing)
+{
+	recalculate_it_envelope_node(&playing->volume_envelope, &playing->env_instrument->volume_envelope);
+	recalculate_it_envelope_node(&playing->pan_envelope, &playing->env_instrument->pitch_envelope);
+	recalculate_it_envelope_node(&playing->pitch_envelope, &playing->env_instrument->pitch_envelope);
+}
+
+
+static void it_retrigger_note(DUMB_IT_SIGRENDERER *sigrenderer, IT_CHANNEL *channel)
+{
+	int vol_env_tick = 0;
+	int pan_env_tick = 0;
+	int pitch_env_tick = 0;
+
+	DUMB_IT_SIGDATA *sigdata = sigrenderer->sigdata;
+	unsigned char nna = ~0;
+	int i, envelopes_copied = 0;
+
+	if (channel->playing) {
+		if (channel->note == IT_NOTE_CUT)
+			nna = NNA_NOTE_CUT;
+		else if (channel->note == IT_NOTE_OFF)
+			nna = NNA_NOTE_OFF;
+		else if (channel->note > 120)
+			nna = NNA_NOTE_FADE;
+		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;
+
+		if (!(channel->playing->flags & IT_PLAYING_SUSTAINOFF))
+		{
+			if (nna != NNA_NOTE_CUT)
+				vol_env_tick = channel->playing->volume_envelope.tick;
+			pan_env_tick = channel->playing->pan_envelope.tick;
+			pitch_env_tick = channel->playing->pitch_envelope.tick;
+			envelopes_copied = 1;
+		}
+
+		switch (nna) {
+			case NNA_NOTE_CUT:
+				channel->playing->declick_stage = 3;
+				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->playingi) {
+				sigrenderer->playingi = 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->playingi;
+				if (playing && playing->channel == channel && playing->instrument->dup_check_type) {
+					int match = 1;
+					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:
+							playing->declick_stage = 3;
+							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->playingi->flags & IT_PLAYING_BACKGROUND) {
+					write_seqtime();
+					sequence_c(SEQUENCE_STOP_SIGNAL);
+					sequence_c(i);
+					channel->VChannel = &module->VChanneli;
+					break;
+				}
+			}
+		}
+#endif
+	}
+
+	if (channel->playing)
+		free_playing(channel->playing);
+
+	channel->playing = new_playing();
+
+	if (!channel->playing)
+		return;
+
+	if (!envelopes_copied && sigdata->flags & IT_USE_INSTRUMENTS) {
+		for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+			IT_PLAYING * playing = sigrenderer->playingi;
+			if (!playing || playing->channel != channel) continue;
+			if (playing->flags & IT_PLAYING_SUSTAINOFF) continue;
+			if (nna != NNA_NOTE_CUT)
+				vol_env_tick = playing->volume_envelope.tick;
+			pan_env_tick = playing->pan_envelope.tick;
+			pitch_env_tick = playing->pitch_envelope.tick;
+			envelopes_copied = 1;
+			break;
+		}
+	}				
+
+	channel->playing->flags = 0;
+	channel->playing->resampling_quality = sigrenderer->resampling_quality;
+	channel->playing->channel = channel;
+	channel->playing->sample = &sigdata->samplechannel->sample-1;
+	if (sigdata->flags & IT_USE_INSTRUMENTS)
+		channel->playing->instrument = &sigdata->instrumentchannel->instrument-1;
+	else
+		channel->playing->instrument = NULL;
+	channel->playing->env_instrument = channel->playing->instrument;
+	channel->playing->sampnum = channel->sample;
+	channel->playing->instnum = channel->instrument;
+	channel->playing->declick_stage = 0;
+	channel->playing->channel_volume = channel->channelvolume;
+	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 (sigdata->flags & IT_USE_INSTRUMENTS)
+	{
+		if (envelopes_copied && channel->playing->env_instrument->volume_envelope.flags & IT_ENVELOPE_CARRY) {
+			channel->playing->volume_envelope.tick = vol_env_tick;
+		} else {
+			channel->playing->volume_envelope.tick = 0;
+		}
+		if (envelopes_copied && channel->playing->env_instrument->pan_envelope.flags & IT_ENVELOPE_CARRY) {
+			channel->playing->pan_envelope.tick = pan_env_tick;
+		} else {
+			channel->playing->pan_envelope.tick = 0;
+		}
+		if (envelopes_copied && channel->playing->env_instrument->pitch_envelope.flags & IT_ENVELOPE_CARRY) {
+			channel->playing->pitch_envelope.tick = pitch_env_tick;
+		} else {
+			channel->playing->pitch_envelope.tick = 0;
+		}
+		recalculate_it_envelope_nodes(channel->playing);
+	}
+	channel->playing->fadeoutcount = 1024;
+	it_reset_filter_state(&channel->playing->filter_state0);
+	it_reset_filter_state(&channel->playing->filter_state1);
+	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->samplechannel->sample-1.default_volume;
+
+	if (sigdata->flags & IT_WAS_AN_XM) {
+		if (!(sigdata->flags & IT_WAS_A_MOD))
+			channel->truepan = 32 + sigdata->samplechannel->sample-1.default_pan*64;
+		return;
+	}
+
+	{
+		int pan = sigdata->samplechannel->sample-1.default_pan;
+		if (pan >= 128 && pan <= 192) {
+			channel->pan = pan - 128;
+			return;
+		}
+	}
+
+	if (sigdata->flags & IT_USE_INSTRUMENTS) {
+		IT_INSTRUMENT *instrument = &sigdata->instrumentchannel->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->instrumentchannel->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, (int)(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->channeli.filter_cutoff = 127;
+							sigrenderer->channeli.filter_resonance = 0;
+							//// should we be resetting channeli.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_y0 << IT_ENVELOPE_SHIFT;
+	else if (pe->next_node >= envelope->n_nodes)
+		pe->value = envelope->node_yenvelope->n_nodes-1 << IT_ENVELOPE_SHIFT;
+	else {
+		int ys = envelope->node_ype->next_node-1 << IT_ENVELOPE_SHIFT;
+		int ts = envelope->node_tpe->next_node-1;
+		int te = envelope->node_tpe->next_node;
+
+		if (ts == te)
+			pe->value = ys;
+		else {
+			int ye = envelope->node_ype->next_node << IT_ENVELOPE_SHIFT;
+			int t = pe->tick;
+
+			pe->value = ys + (ye - ys) * (t - ts) / (te - ts);
+		}
+	}
+}
+
+
+
+extern const char xm_convert_vibrato;
+
+const char mod_convert_vibrato = {
+	IT_VIBRATO_SINE,
+	IT_VIBRATO_RAMP_UP, /* this will be inverted by IT_OLD_EFFECTS */
+	IT_VIBRATO_XM_SQUARE,
+	IT_VIBRATO_XM_SQUARE
+};
+
+/* 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_PLAYING *playing;
+	int i;
+
+	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;*/
+					if (sigdata->flags & IT_WAS_AN_STM) {
+						int n = entry->effectvalue;
+						if (n >= 32) {
+							sigrenderer->tick = sigrenderer->speed = n;
+						}
+					} else {
+						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;
+#ifdef BIT_ARRAY_BULLSHIT
+					sigrenderer->looped = 1;
+#endif
+					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:
+				for (i = -1; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+					if (i < 0) playing = channel->playing;
+					else {
+						playing = sigrenderer->playingi;
+						if (!playing || playing->channel != channel) continue;
+					}
+					if (playing) {
+						playing->vibrato_speed = channel->lastHspeed;
+						playing->vibrato_depth = channel->lastHdepth;
+						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 (!(sigdata->flags & IT_WAS_AN_XM)) {
+						int clip = (sigdata->flags & IT_WAS_AN_S3M) ? 63 : 64;
+						if ((v & 0x0F) == 0x0F) {
+							if (!(v & 0xF0)) {
+								channel->volslide = -15;
+								channel->volume -= 15;
+								if (channel->volume > clip) channel->volume = 0;
+							} else {
+								channel->volume += v >> 4;
+								if (channel->volume > clip) channel->volume = clip;
+							}
+						} else if ((v & 0xF0) == 0xF0) {
+							if (!(v & 0x0F)) {
+								channel->volslide = 15;
+								channel->volume += 15;
+								if (channel->volume > clip) channel->volume = clip;
+							} else {
+								channel->volume -= v & 15;
+								if (channel->volume > clip) channel->volume = 0;
+							}
+						} else if (!(v & 0x0F)) {
+							channel->volslide = v >> 4;
+						} else {
+							channel->volslide = -(v & 15);
+						}
+					} else {
+						if ((v & 0x0F) == 0) { /* Dx0 */
+							channel->volslide = v >> 4;
+						} else if ((v & 0xF0) == 0) { /* D0x */
+							channel->volslide = -v;
+						} 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 (sigdata->flags & IT_WAS_AN_S3M) {
+						if (v == 0)
+							v = channel->lastDKL;
+						channel->lastDKL = v;
+					} else {
+						if (v == 0)
+							v = channel->lastEF;
+						channel->lastEF = v;
+					}
+					for (i = -1; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+						if (i < 0) playing = channel->playing;
+						else {
+							playing = sigrenderer->playingi;
+							if (!playing || playing->channel != channel) continue;
+						}
+						if (playing) {
+							if ((v & 0xF0) == 0xF0)
+								playing->slide -= (v & 15) << 4;
+							else if ((v & 0xF0) == 0xE0)
+								playing->slide -= (v & 15) << 2;
+							else if (i < 0 && sigdata->flags & IT_WAS_A_669)
+								channel->portamento -= v << 3;
+							else if (i < 0)
+								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 (sigdata->flags & IT_WAS_AN_S3M) {
+						if (v == 0)
+							v = channel->lastDKL;
+						channel->lastDKL = v;
+					} else {
+						if (v == 0)
+							v = channel->lastEF;
+						channel->lastEF = v;
+					}
+					for (i = -1; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+						if (i < 0) playing = channel->playing;
+						else {
+							playing = sigrenderer->playingi;
+							if (!playing || playing->channel != channel) continue;
+						}
+						if (playing) {
+							if ((v & 0xF0) == 0xF0)
+								playing->slide += (v & 15) << 4;
+							else if ((v & 0xF0) == 0xE0)
+								playing->slide += (v & 15) << 2;
+							else if (i < 0 && sigdata->flags & IT_WAS_A_669)
+								channel->portamento += v << 3;
+							else if (i < 0)
+								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 && !(sigdata->flags & IT_WAS_A_MOD))
+								depth <<= 3;
+							else
+								depth <<= 2;
+							channel->lastHdepth = depth;
+						}
+						for (i = -1; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+							if (i < 0) playing = channel->playing;
+							else {
+								playing = sigrenderer->playingi;
+								if (!playing || playing->channel != channel) continue;
+							}
+							if (playing) {
+								playing->vibrato_speed = speed;
+								playing->vibrato_depth = depth;
+								playing->vibrato_n++;
+							}
+						}
+					}
+				}
+				break;
+			case IT_TREMOR:
+				{
+					unsigned char v = entry->effectvalue;
+					if (v == 0) {
+						if (sigdata->flags & IT_WAS_AN_S3M)
+							v = channel->lastDKL;
+						else
+							v = channel->lastI;
+					}
+					else if (!(sigdata->flags & IT_OLD_EFFECTS)) {
+						if (v & 0xF0) v -= 0x10;
+						if (v & 0x0F) v -= 0x01;
+					}
+					if (sigdata->flags & IT_WAS_AN_S3M)
+						channel->lastDKL = v;
+					else
+						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 (sigdata->flags & IT_WAS_AN_S3M) {
+							if (v == 0)
+								v = channel->lastDKL;
+							channel->lastDKL = v;
+						} else {
+							if (v == 0)
+								v = channel->lastJ;
+							channel->lastJ = v;
+						}
+					}
+					channel->arpeggio_offsets0 = 0;
+					channel->arpeggio_offsets1 = (v & 0xF0) >> 4;
+					channel->arpeggio_offsets2 = (v & 0x0F);
+					channel->arpeggio_table = (const unsigned char *)(((sigdata->flags & (IT_WAS_AN_XM|IT_WAS_A_MOD))==IT_WAS_AN_XM) ? &arpeggio_xm : &arpeggio_mod);
+				}
+				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 = (int)sample->sus_loop_end;
+							else if (sample->flags & IT_SAMPLE_LOOP)
+								end = (int)sample->loop_end;
+							else {
+								end = (int)sample->length;
+								if ( sigdata->flags & IT_WAS_PROCESSED && end > 64 ) // XXX bah damn LPC and edge case modules
+									end -= 64;
+							}
+							if ((sigdata->flags & IT_WAS_A_PTM) && (sample->flags & IT_SAMPLE_16BIT))
+								offset >>= 1;
+							if (offset < end) {
+								it_playing_reset_resamplers(playing, offset);
+								playing->declick_stage = 0;
+							} else if (sigdata->flags & IT_OLD_EFFECTS) {
+								it_playing_reset_resamplers(playing, end);
+								playing->declick_stage = 0;
+							}
+						}
+					}
+				}
+				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;
+						channel->lastQ = v;
+					} else if (sigdata->flags & IT_WAS_AN_S3M) {
+						if (v == 0)
+							v = channel->lastDKL;
+						channel->lastDKL = v;
+					} 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);
+						channel->playing->declick_stage = 0;
+					}
+				break;
+			case IT_TREMOLO:
+				{
+					unsigned char speed, depth;
+					if (sigdata->flags & IT_WAS_AN_S3M) {
+						unsigned char v = entry->effectvalue;
+						if (v == 0)
+							v = channel->lastDKL;
+						channel->lastDKL = v;
+						speed = v >> 4;
+						depth = v & 15;
+					} else {
+						speed = entry->effectvalue >> 4;
+						depth = entry->effectvalue & 15;
+						if (speed == 0)
+							speed = channel->lastRspeed;
+						channel->lastRspeed = speed;
+						if (depth == 0)
+							depth = channel->lastRdepth;
+						channel->lastRdepth = depth;
+					}
+					for (i = -1; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+						if (i < 0) playing = channel->playing;
+						else {
+							playing = sigrenderer->playingi;
+							if (!playing || playing->channel != channel) continue;
+						}
+						if (playing) {
+							playing->tremolo_speed = speed;
+							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_A_MOD) waveform = mod_convert_vibratowaveform;
+								else if (sigdata->flags & IT_WAS_AN_XM) waveform = xm_convert_vibratowaveform;
+								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_A_MOD) waveform = mod_convert_vibratowaveform;
+								else if (sigdata->flags & IT_WAS_AN_XM) waveform = xm_convert_vibratowaveform;
+								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->playingi;
+											if (playing && channel == playing->channel)
+											{
+												playing->declick_stage = 3;
+												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->playingi;
+											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->playingi;
+											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) == 15) {
+								if (channel->playing && channel->playing->sample &&
+									!(channel->playing->sample->flags & (IT_SAMPLE_LOOP | IT_SAMPLE_SUS_LOOP))) {
+									channel->playing->flags |= IT_PLAYING_REVERSE;
+									it_playing_reset_resamplers( channel->playing, channel->playing->sample->length - 1 );
+								}
+							} else 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:
+							if ((sigdata->flags & (IT_WAS_AN_XM | IT_WAS_A_MOD)) == (IT_WAS_AN_XM | IT_WAS_A_MOD)) {
+								channel->inv_loop_speed = effectvalue & 15;
+								update_invert_loop(channel, channel->playing ? channel->playing->sample : NULL);
+							} else 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;
+					}
+					for (i = -1; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+						if (i < 0) playing = channel->playing;
+						else {
+							playing = sigrenderer->playingi;
+							if (!playing || playing->channel != channel) continue;
+						}
+						if (playing) {
+							playing->vibrato_speed = speed;
+							playing->vibrato_depth = depth;
+							playing->vibrato_n++;
+						}
+					}
+				}
+				break;
+			case IT_SET_GLOBAL_VOLUME:
+				if ((sigdata->flags & IT_WAS_AN_S3M) && (entry->effectvalue > 64))
+					break;
+				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) {
+					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->Zmacrolenentry->effectvalue-0x80;
+						int i;
+						for (i = 0; i < n; i++)
+							it_send_midi(sigrenderer, channel, midi->Zmacroentry->effectvalue-0x80i);
+					} else {
+						int n = midi->SFmacrolenchannel->SFmacro;
+						int i, j;
+						for (i = 0, j = 1; i < n; i++, j <<= 1)
+							it_send_midi(sigrenderer, channel,
+								(unsigned char)(midi->SFmacrozchannel->SFmacro & j ?
+									entry->effectvalue : midi->SFmacrochannel->SFmacroi));
+					}
+				}
+				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_tenvelope->n_nodes-1)
+							pe->tick = envelope->node_tenvelope->n_nodes-1;
+						pe->next_node = 0;
+						while (pe->tick > envelope->node_tpe->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);
+								channel->playing->declick_stage = 0;
+							}
+						}
+					}
+
+					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);
+								channel->playing->declick_stage = 0;
+							}
+						}
+					}
+
+					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_OKT_NOTE_SLIDE_DOWN:
+			case IT_OKT_NOTE_SLIDE_DOWN_ROW:
+				channel->toneslide = -entry->effectvalue;
+				channel->okt_toneslide = (entry->effect == IT_OKT_NOTE_SLIDE_DOWN) ? 255 : 1;
+				break;
+
+			case IT_OKT_NOTE_SLIDE_UP:
+			case IT_OKT_NOTE_SLIDE_UP_ROW:
+				channel->toneslide = entry->effectvalue;
+				channel->okt_toneslide = (entry->effect == IT_OKT_NOTE_SLIDE_UP) ? 255 : 1;
+				break;
+
+			case IT_OKT_ARPEGGIO_3:
+			case IT_OKT_ARPEGGIO_4:
+			case IT_OKT_ARPEGGIO_5:
+				{
+					channel->arpeggio_offsets0 = 0;
+					channel->arpeggio_offsets1 = -(entry->effectvalue >> 4);
+					channel->arpeggio_offsets2 = entry->effectvalue & 0x0F;
+
+					switch (entry->effect)
+					{
+					case IT_OKT_ARPEGGIO_3:
+						channel->arpeggio_table = (const unsigned char *)&arpeggio_okt_3;
+						break;
+
+					case IT_OKT_ARPEGGIO_4:
+						channel->arpeggio_table = (const unsigned char *)&arpeggio_okt_4;
+						break;
+
+					case IT_OKT_ARPEGGIO_5:
+						channel->arpeggio_table = (const unsigned char *)&arpeggio_okt_5;
+						break;
+					}
+				}
+				break;
+
+			case IT_OKT_VOLUME_SLIDE_DOWN:
+				if ( entry->effectvalue <= 16 ) channel->volslide = -entry->effectvalue;
+				else
+				{
+					channel->volume -= entry->effectvalue - 16;
+					if (channel->volume > 64) channel->volume = 0;
+				}
+				break;
+
+			case IT_OKT_VOLUME_SLIDE_UP:
+				if ( entry->effectvalue <= 16 ) channel->volslide = entry->effectvalue;
+				else
+				{
+					channel->volume += entry->effectvalue - 16;
+					if (channel->volume > 64) channel->volume = 64;
+				}
+				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?
+				}
+			}
+		}
+
+		channel->toneporta = 0;
+
+		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 = slidetableentry->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;
+			}
+			channel->toneporta += v << 4;
+		}
+
+		if ((entry->mask & IT_ENTRY_EFFECT) && (entry->effect == IT_TONE_PORTAMENTO || entry->effect == IT_VOLSLIDE_TONEPORTA)) {
+			/* 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;
+			}
+			channel->toneporta += v << 4;
+		}
+
+		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;
+			}
+		}
+
+		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 = NULL;
+
+	if (entry->mask & IT_ENTRY_INSTRUMENT) {
+		int oldsample = channel->sample;
+		channel->inv_loop_offset = 0;
+		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 = dup_playing(channel->playing, channel, channel);
+			if (!playing) return;
+			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) {
+					int i;
+					for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+						if (!sigrenderer->playingi) {
+							channel->playing->declick_stage = 3;
+							sigrenderer->playingi = channel->playing;
+							channel->playing = NULL;
+							break;
+						}
+					}
+
+					if (!channel->sample) {
+						if (channel->playing)
+						{
+							free_playing(channel->playing);
+							channel->playing = NULL;
+						}
+					} else {
+						if (channel->playing) {
+							free_playing(channel->playing);
+						}
+						channel->playing = playing;
+						playing = NULL;
+						channel->playing->declick_stage = 0;
+						channel->playing->sampnum = channel->sample;
+						channel->playing->sample = &sigdata->samplechannel->sample-1;
+						it_playing_reset_resamplers(channel->playing, 0);
+					}
+				}
+				get_default_volpan(sigdata, channel);
+			}
+		}
+	}
+
+	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) {
+				int i;
+				if (playing) {
+					free_playing(channel->playing);
+					channel->playing = playing;
+					playing = NULL;
+				}
+				for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+					if (!sigrenderer->playingi) {
+						channel->playing->declick_stage = 3;
+						sigrenderer->playingi = channel->playing;
+						channel->playing = NULL;
+						break;
+					}
+				}
+				if (channel->playing) {
+					free_playing(channel->playing);
+					channel->playing = NULL;
+				}
+			}
+			if (playing) free_playing(playing);
+			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 = new_playing();
+				if (!channel->playing) {
+					if (playing) free_playing(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);
+			}
+			else if (playing) {
+				/* volume rampy stuff! move note to NNA */
+				int i;
+				IT_PLAYING * ptemp;
+				if (playing->sample) ptemp = playing;
+				else ptemp = channel->playing;
+				if (!ptemp) {
+					if (playing) free_playing(playing);
+					return;
+				}
+				playing = NULL;
+				for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+					if (!sigrenderer->playingi) {
+						ptemp->declick_stage = 3;
+						ptemp->flags |= IT_PLAYING_SUSTAINOFF | IT_PLAYING_FADING;
+						sigrenderer->playingi = ptemp;
+						ptemp = NULL;
+						break;
+					}
+				}
+				if (ptemp) free_playing(ptemp);
+			}
+
+			channel->playing->flags = 0;
+			channel->playing->resampling_quality = sigrenderer->resampling_quality;
+			channel->playing->channel = channel;
+			channel->playing->sample = &sigdata->samplechannel->sample-1;
+			if (sigdata->flags & IT_USE_INSTRUMENTS)
+				channel->playing->instrument = &sigdata->instrumentchannel->instrument-1;
+			else
+				channel->playing->instrument = NULL;
+			channel->playing->env_instrument = channel->playing->instrument;
+			channel->playing->sampnum = channel->sample;
+			channel->playing->instnum = channel->instrument;
+			channel->playing->declick_stage = 0;
+			channel->playing->channel_volume = channel->channelvolume;
+			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_state0); // Are these
+			it_reset_filter_state(&channel->playing->filter_state1); // 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;
+		}
+	}
+
+	if (playing) free_playing(playing);
+}
+
+
+
+/* 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->channeli;
+
+		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) {
+					int i;
+					for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+						if (!sigrenderer->playingi) {
+							channel->playing->declick_stage = 3;
+							sigrenderer->playingi = channel->playing;
+							channel->playing = NULL;
+							break;
+						}
+					}
+					if (channel->playing) {
+						free_playing(channel->playing);
+						channel->playing = NULL;
+					}
+				}
+			}
+		} 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_y0 << IT_ENVELOPE_SHIFT;
+
+	if (pe->next_node >= envelope->n_nodes)
+		return envelope->node_yenvelope->n_nodes-1 << IT_ENVELOPE_SHIFT;
+
+	ys = envelope->node_ype->next_node-1 << IT_ENVELOPE_SHIFT;
+	ts = envelope->node_tpe->next_node-1;
+	te = envelope->node_tpe->next_node;
+
+	if (ts == te)
+		return ys;
+
+	ye = envelope->node_ype->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_tpe->next_node) return 0;
+
+	if ((envelope->flags & IT_ENVELOPE_LOOP_ON) &&
+	 envelope->loop_end >= pe->next_node &&
+	 envelope->node_tenvelope->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_tenvelope->sus_loop_end <= pe->tick) return 0;
+
+	if (envelope->node_tenvelope->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) || !envelope->n_nodes)
+		return 0;
+
+	ASSERT(envelope->n_nodes > 0);
+
+	if (pe->tick <= 0)
+		pe->value = envelope->node_y0 << IT_ENVELOPE_SHIFT;
+	else if (pe->tick >= envelope->node_tenvelope->n_nodes-1) {
+		pe->value = envelope->node_yenvelope->n_nodes-1 << IT_ENVELOPE_SHIFT;
+	} else {
+		int ys = envelope->node_ype->next_node-1 << IT_ENVELOPE_SHIFT;
+		int ts = envelope->node_tpe->next_node-1;
+		int te = envelope->node_tpe->next_node;
+
+		if (ts == te)
+			pe->value = ys;
+		else {
+			int ye = envelope->node_ype->next_node << IT_ENVELOPE_SHIFT;
+			int t = pe->tick;
+
+			pe->value = ys + (ye - ys) * (t - ts) / (te - ts);
+		}
+	}
+
+	pe->tick++;
+
+	recalculate_it_envelope_node(pe, envelope);
+
+	if ((envelope->flags & IT_ENVELOPE_SUSTAIN_LOOP) && !(playing->flags & IT_PLAYING_SUSTAINOFF)) {
+		if (pe->tick > envelope->node_tenvelope->sus_loop_end) {
+			pe->next_node = envelope->sus_loop_start + 1;
+			ASSERT(pe->next_node <= envelope->n_nodes);
+			pe->tick = envelope->node_tenvelope->sus_loop_start;
+			return 0;
+		}
+	} else if (envelope->flags & IT_ENVELOPE_LOOP_ON) {
+		if (pe->tick > envelope->node_tenvelope->loop_end) {
+			pe->next_node = envelope->loop_start + 1;
+			ASSERT(pe->next_node <= envelope->n_nodes);
+			pe->tick = envelope->node_tenvelope->loop_start;
+			return 0;
+		}
+	}
+	else if (pe->tick > envelope->node_tenvelope->n_nodes - 1)
+		return 1;
+
+	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_tenvelope->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_tenvelope->n_nodes-1)
+		return;
+
+	pe->tick++;
+
+	/* pe->next_node must be kept up to date for envelope_get_y(). */
+	while (pe->tick > envelope->node_tpe->next_node)
+		pe->next_node++;
+
+	if ((envelope->flags & IT_ENVELOPE_LOOP_ON) && envelope->loop_end < envelope->n_nodes) {
+		if (pe->tick == envelope->node_tenvelope->loop_end) {
+			pe->next_node = MID(0, envelope->loop_start, envelope->n_nodes - 1);
+			pe->tick = envelope->node_tpe->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 vol, span;
+ float rampScale;
+ int ramp_style = sigrenderer->ramp_style;
+ 
+	pan = apply_pan_envelope(playing);
+
+	if ((sigrenderer->n_channels >= 2) && (sigdata->flags & IT_STEREO) && (sigrenderer->n_channels != 3 || !IT_IS_SURROUND_SHIFTED(pan))) {
+		if (!IT_IS_SURROUND_SHIFTED(pan)) {
+			span = (pan - (32<<8)) * sigdata->pan_separation * (1.0f / ((32<<8) * 128));
+			vol = 0.5f * (1.0f - span);
+			playing->float_volume0 = vol;
+			playing->float_volume1 = 1.0f - vol;
+		} else {
+			playing->float_volume0 = -0.5f;
+			playing->float_volume1 = 0.5f;
+		}
+ 	} else {
+		playing->float_volume0 = 1.0f;
+		playing->float_volume1 = 1.0f;
+	}
+
+	vol = calculate_volume(sigrenderer, playing, 1.0f);
+	playing->float_volume0 *= vol;
+	playing->float_volume1 *= vol;
+ 
+ rampScale = 4;
+
+ if (ramp_style > 0 && playing->declick_stage == 2) {
+ if ((playing->ramp_volume0 == 0 && playing->ramp_volume1 == 0) || vol == 0)
+ rampScale = 48;
+ }
+
+ if (ramp_style == 0 || (ramp_style < 2 && playing->declick_stage == 2)) {
+		if (playing->declick_stage <= 2) {
+			playing->ramp_volume0 = playing->float_volume0;
+			playing->ramp_volume1 = playing->float_volume1;
+			playing->declick_stage = 2;
+		} else {
+			playing->float_volume0 = 0;
+			playing->float_volume1 = 0;
+			playing->ramp_volume0 = 0;
+			playing->ramp_volume1 = 0;
+			playing->declick_stage = 5;
+		}
+		playing->ramp_delta0 = 0;
+ playing->ramp_delta1 = 0;
+ } else {
+ if (playing->declick_stage == 0) {
+ playing->ramp_volume0 = 0;
+ playing->ramp_volume1 = 0;
+ rampScale = 48;
+ playing->declick_stage++;
+ } else if (playing->declick_stage == 1) {
+ rampScale = 48;
+ } else if (playing->declick_stage >= 3) {
+ playing->float_volume0 = 0;
+ playing->float_volume1 = 0;
+ if (playing->declick_stage == 3)
+ playing->declick_stage++;
+ rampScale = 48;
+ }
+ playing->ramp_delta0 = rampScale * invt2g * (playing->float_volume0 - playing->ramp_volume0);
+ playing->ramp_delta1 = rampScale * invt2g * (playing->float_volume1 - playing->ramp_volume1);
+ }
+}
+
+static void process_playing(DUMB_IT_SIGRENDERER *sigrenderer, IT_PLAYING *playing, float invt2g)
+{
+	if (sigrenderer->initial_runthrough) {
+		return;
+	}
+
+	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;
+}
+
+#if (defined(_MSC_VER) && _MSC_VER < 1800) || defined(ANDROID)
+static 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:
+#if 0
+static const unsigned short ProTrackerPeriodTable6*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 ProTrackerTunedPeriods16*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 
+};
+#endif
+
+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 / 256.0f);
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		IT_CHANNEL *channel = &sigrenderer->channeli;
+		IT_PLAYING *playing = channel->playing;
+
+		if (playing) {
+			int vibrato_shift;
+			switch (playing->vibrato_waveform)
+			{
+			default:
+				vibrato_shift = it_sineplaying->vibrato_time;
+				break;
+			case 1:
+				vibrato_shift = it_sawtoothplaying->vibrato_time;
+				break;
+			case 2:
+				vibrato_shift = it_squarewaveplaying->vibrato_time;
+				break;
+			case 3:
+				vibrato_shift = (rand() % 129) - 64;
+				break;
+			case 4:
+				vibrato_shift = it_xm_squarewaveplaying->vibrato_time;
+				break;
+			case 5:
+				vibrato_shift = it_xm_rampplaying->vibrato_time;
+				break;
+			case 6:
+				vibrato_shift = it_xm_ramp255-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, (int)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*/
+				{
+					int tick = sigrenderer->tick - 1;
+					if ((sigrenderer->sigdata->flags & (IT_WAS_AN_XM|IT_WAS_A_MOD))!=IT_WAS_AN_XM)
+						tick = sigrenderer->speed - tick - 1;
+					else if (tick == sigrenderer->speed - 1)
+						tick = 0;
+					else
+						++tick;
+					playing->delta *= (float)pow(DUMB_SEMITONE_BASE, channel->arpeggio_offsetschannel->arpeggio_tabletick&31);
+				}
+			/*
+			}*/
+
+			playing->filter_cutoff = channel->filter_cutoff;
+			playing->filter_resonance = channel->filter_resonance;
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		if (sigrenderer->channeli.playing) {
+			process_playing(sigrenderer, sigrenderer->channeli.playing, invt2g);
+			if (!(sigdata->flags & IT_WAS_AN_XM)) {
+				//if ((sigrenderer->channeli.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->channeli.playing->flags & IT_PLAYING_DEAD) {
+					free_playing(sigrenderer->channeli.playing);
+					sigrenderer->channeli.playing = NULL;
+				}
+			}
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+		if (sigrenderer->playingi) {
+			process_playing(sigrenderer, sigrenderer->playingi, invt2g);
+			if (sigrenderer->playingi->flags & IT_PLAYING_DEAD) {
+				free_playing(sigrenderer->playingi);
+				sigrenderer->playingi = 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->channeln;
+						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->channeln.pat_loop_end_row = 0;
+				} else {
+					sigrenderer->processrow = sigrenderer->breakrow;
+					sigrenderer->breakrow = 0; // XXX lolwut
+				}
+
+				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;
+						}
+						if (sigdata->flags & IT_WAS_AN_OKT) {
+							/* Reset some things */
+							sigrenderer->speed = sigdata->speed;
+							sigrenderer->tempo = sigdata->tempo;
+							for (n = 0; n < DUMB_IT_N_CHANNELS; n++) {
+								xm_note_off(sigdata, &sigrenderer->channeln);
+							}
+						}
+					}
+
+					n = sigdata->ordersigrenderer->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;
+					}
+
+#ifdef BIT_ARRAY_BULLSHIT
+					/* Fix play tracking and timekeeping for orders containing skip commands */
+					for (n = 0; n < 256; n++) {
+						bit_array_set(sigrenderer->played, sigrenderer->processorder * 256 + n);
+						timekeeping_array_push(sigrenderer->row_timekeeper, sigrenderer->processorder * 256 + n, sigrenderer->time_played);
+						timekeeping_array_bump(sigrenderer->row_timekeeper, sigrenderer->processorder * 256 + n);
+					}
+#endif
+				}
+
+				pattern = &sigdata->patternn;
+
+				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
+					) {
+#ifdef BIT_ARRAY_BULLSHIT
+					sigrenderer->looped = 1;
+#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;
+				}
+			}
+
+#ifdef BIT_ARRAY_BULLSHIT
+			if (sigrenderer->looped == 0) {
+				timekeeping_array_push(sigrenderer->row_timekeeper, sigrenderer->order * 256 + sigrenderer->row, sigrenderer->time_played);
+			}
+			timekeeping_array_bump(sigrenderer->row_timekeeper, sigrenderer->order * 256 + sigrenderer->row);
+#endif
+
+			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_WAS_AN_OKT)
+				update_effects(sigrenderer);
+			else 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 {
+		if ( !(sigdata->flags & IT_WAS_AN_STM) || !(sigrenderer->tick & 15)) {
+			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 + ((TICK_TIME_DIVIDEND / (sigrenderer->tempo << 8)) << 16);
+			sigrenderer->gvz_time += (int)(t >> 16);
+			sigrenderer->gvz_sub_time = (int)t & 65535;
+			if (sigrenderer->gvz_time >= 65536 * 12) {
+#ifdef BIT_ARRAY_BULLSHIT
+				sigrenderer->looped = 1;
+#endif
+				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 = (TICK_TIME_DIVIDEND / (sigrenderer->tempo << 8)) << 16;
+		if ( sigrenderer->sigdata->flags & IT_WAS_AN_STM ) {
+			t /= 16;
+		}
+		t += sigrenderer->sub_time_left;
+		sigrenderer->time_left += (int)(t >> 16);
+		sigrenderer->sub_time_left = (int)t & 65535;
+	}
+
+	return 0;
+}
+
+
+
+int dumb_it_max_to_mix = 64;
+
+#if 0
+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
+};
+#endif
+
+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 (sigrenderer->initial_runthrough) {
+		return 0;
+	}
+
+	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_sineplaying->tremolo_time;
+			break;
+		case 1:
+			vol = it_sawtoothplaying->tremolo_time;
+			break;
+		case 2:
+			vol = it_squarewaveplaying->tremolo_time;
+			break;
+		case 3:
+			vol = (rand() % 129) - 64;
+			break;
+		case 4:
+			vol = it_xm_squarewaveplaying->tremolo_time;
+			break;
+		case 5:
+			vol = it_xm_rampplaying->tremolo_time;
+			break;
+		case 6:
+			vol = it_xm_ramp255-((sigrenderer->sigdata->flags & IT_WAS_A_MOD)?playing->vibrato_time:playing->tremolo_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 && playing->env_instrument->volume_envelope.n_nodes) {
+				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_sineplaying->panbrello_time;
+				break;
+			case 1:
+				pan = it_sawtoothplaying->panbrello_time;
+				break;
+			case 2:
+				pan = it_squarewaveplaying->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 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;
+
+	{
+		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;
+ resampler_set_quality(playing->resampler.fir_resampler0, quality);
+ resampler_set_quality(playing->resampler.fir_resampler1, quality);
+	}
+
+	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;
+ lvol.declick_stage = rvol.declick_stage = playing->declick_stage;
+		if (sigrenderer->n_channels >= 2) {
+			if (playing->sample->flags & IT_SAMPLE_STEREO) {
+				if (sigrenderer->click_remover) {
+					sample_t click2;
+					dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, &lvol, &rvol, click);
+					dumb_record_click(sigrenderer->click_remover0, pos, click0);
+					dumb_record_click(sigrenderer->click_remover1, pos, click1);
+				}
+				size_rendered = dumb_resample_n_2_2(bits, &playing->resampler, samples0 + pos*2, size, &lvol, &rvol, delta);
+				if (store_end_sample) {
+					sample_t click2;
+					dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, &lvol, &rvol, click);
+					samples0(pos + size_rendered) * 2 = click0;
+					samples0(pos + size_rendered) * 2 + 1 = click1;
+				}
+				if (sigrenderer->click_remover) {
+					sample_t click2;
+					dumb_resample_get_current_sample_n_2_2(bits, &playing->resampler, &lvol, &rvol, click);
+					dumb_record_click(sigrenderer->click_remover0, pos + size_rendered, -click0);
+					dumb_record_click(sigrenderer->click_remover1, pos + size_rendered, -click1);
+				}
+			} else {
+				if (sigrenderer->click_remover) {
+					sample_t click2;
+					dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, &lvol, &rvol, click);
+					dumb_record_click(sigrenderer->click_remover0, pos, click0);
+					dumb_record_click(sigrenderer->click_remover1, pos, click1);
+				}
+				size_rendered = dumb_resample_n_1_2(bits, &playing->resampler, samples0 + pos*2, size, &lvol, &rvol, delta);
+				if (store_end_sample) {
+					sample_t click2;
+					dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, &lvol, &rvol, click);
+					samples0(pos + size_rendered) * 2 = click0;
+					samples0(pos + size_rendered) * 2 + 1 = click1;
+				}
+				if (sigrenderer->click_remover) {
+					sample_t click2;
+					dumb_resample_get_current_sample_n_1_2(bits, &playing->resampler, &lvol, &rvol, click);
+					dumb_record_click(sigrenderer->click_remover0, pos + size_rendered, -click0);
+					dumb_record_click(sigrenderer->click_remover1, pos + size_rendered, -click1);
+				}
+			}
+		} else {
+			if (playing->sample->flags & IT_SAMPLE_STEREO) {
+				if (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_remover0, pos, click);
+				}
+				size_rendered = dumb_resample_n_2_1(bits, &playing->resampler, samples0 + pos, size, &lvol, &rvol, delta);
+				if (store_end_sample)
+					dumb_resample_get_current_sample_n_2_1(bits, &playing->resampler, &lvol, &rvol, &samples0pos + size_rendered);
+				if (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_remover0, pos + size_rendered, -click);
+				}
+			} else {
+				if (sigrenderer->click_remover) {
+					sample_t click;
+					dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, &lvol, &click);
+					dumb_record_click(sigrenderer->click_remover0, pos, click);
+				}
+				size_rendered = dumb_resample_n_1_1(bits, &playing->resampler, samples0 + pos, size, &lvol, delta);
+				if (store_end_sample)
+					dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, &lvol, &samples0pos + size_rendered);
+				if (sigrenderer->click_remover) {
+					sample_t click;
+					dumb_resample_get_current_sample_n_1_1(bits, &playing->resampler, &lvol, &click);
+					dumb_record_click(sigrenderer->click_remover0, pos + size_rendered, -click);
+				}
+			}
+		}
+		playing->ramp_volume 0 = lvol.volume;
+		playing->ramp_volume 1 = rvol.volume;
+ playing->declick_stage = (lvol.declick_stage > rvol.declick_stage) ? lvol.declick_stage : rvol.declick_stage;
+ if (playing->declick_stage >= 4)
+ playing->flags |= IT_PLAYING_DEAD;
+		(*left_to_mix)--;
+	}
+
+	if (playing->resampler.dir == 0)
+		playing->flags |= IT_PLAYING_DEAD;
+
+	return size_rendered;
+}
+
+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_sineplaying->sample_vibrato_time;
+			break;
+		case 1:
+			sample_vibrato_shift = it_sawtoothplaying->sample_vibrato_time;
+			break;
+		case 2:
+			sample_vibrato_shift = it_squarewaveplaying->sample_vibrato_time;
+			break;
+		case 3:
+			sample_vibrato_shift = (rand() % 129) - 64;
+			break;
+		case 4:
+			sample_vibrato_shift = it_xm_squarewaveplaying->sample_vibrato_time;
+			break;
+		case 5:
+			sample_vibrato_shift = it_xm_rampplaying->sample_vibrato_time;
+			break;
+		case 6:
+			sample_vibrato_shift = it_xm_ramp255-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_normal(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_mixDUMB_IT_TOTAL_CHANNELS;
+	int left_to_mix = dumb_it_max_to_mix;
+
+	sample_t **samples_to_filter = NULL;
+
+	//int max_output = sigrenderer->max_output;
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		if (sigrenderer->channeli.playing && !(sigrenderer->channeli.playing->flags & IT_PLAYING_DEAD)) {
+			to_mixn_to_mix.playing = sigrenderer->channeli.playing;
+			to_mixn_to_mix.volume = volume == 0 ? 0 : calculate_volume(sigrenderer, sigrenderer->channeli.playing, volume);
+			n_to_mix++;
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+		if (sigrenderer->playingi) { /* Won't be dead; it would have been freed. */
+			to_mixn_to_mix.playing = sigrenderer->playingi;
+			to_mixn_to_mix.volume = volume == 0 ? 0 : calculate_volume(sigrenderer, sigrenderer->playingi, 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_mixi.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(sigrenderer, playing, 0, delta, note_delta, pos, size, NULL, 0, &left_to_mix);
+					continue;
+				}
+			}
+			{
+				long size_rendered;
+				DUMB_CLICK_REMOVER **cr = sigrenderer->click_remover;
+				dumb_silence(samples_to_filter0, sigrenderer->n_channels * (size + 1));
+				sigrenderer->click_remover = NULL;
+				size_rendered = render_playing(sigrenderer, playing, volume, delta, note_delta, 0, size, samples_to_filter, 1, &left_to_mix);
+				sigrenderer->click_remover = cr;
+				if (sigrenderer->n_channels == 2) {
+					it_filter(cr ? cr0 : NULL, &playing->filter_state0, samples0 /*output*/, pos, samples_to_filter0, size_rendered,
+						2, (int)(65536.0f/delta), playing->true_filter_cutoff, playing->true_filter_resonance);
+					it_filter(cr ? cr1 : NULL, &playing->filter_state1, samples0 /*output*/+1, pos, samples_to_filter0+1, size_rendered,
+						2, (int)(65536.0f/delta), playing->true_filter_cutoff, playing->true_filter_resonance);
+				} else {
+					it_filter(cr ? cr0 : NULL, &playing->filter_state0, samples0 /*output*/, pos, samples_to_filter0, 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_state0);
+			it_reset_filter_state(&playing->filter_state1);
+			render_playing(sigrenderer, playing, volume, delta, note_delta, pos, size, samples /*&samplesoutput*/, 0, &left_to_mix);
+		}
+	}
+
+	destroy_sample_buffer(samples_to_filter);
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		if (sigrenderer->channeli.playing) {
+			//if ((sigrenderer->channeli.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->channeli.playing->flags & IT_PLAYING_DEAD) {
+				free_playing(sigrenderer->channeli.playing);
+				sigrenderer->channeli.playing = NULL;
+			}
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+		if (sigrenderer->playingi) {
+			if (sigrenderer->playingi->flags & IT_PLAYING_DEAD) {
+				free_playing(sigrenderer->playingi);
+				sigrenderer->playingi = NULL;
+			}
+		}
+	}
+}
+
+
+
+static void render_surround(DUMB_IT_SIGRENDERER *sigrenderer, float volume, float delta, long pos, long size, sample_t **samples)
+{
+	int i;
+
+	int n_to_mix = 0, n_to_mix_surround = 0;
+	IT_TO_MIX to_mixDUMB_IT_TOTAL_CHANNELS;
+	IT_TO_MIX to_mix_surroundDUMB_IT_TOTAL_CHANNELS;
+	int left_to_mix = dumb_it_max_to_mix;
+
+	int saved_channels = sigrenderer->n_channels;
+
+	sample_t **samples_to_filter = NULL;
+
+	DUMB_CLICK_REMOVER **saved_cr = sigrenderer->click_remover;
+
+	//int max_output = sigrenderer->max_output;
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		if (sigrenderer->channeli.playing && !(sigrenderer->channeli.playing->flags & IT_PLAYING_DEAD)) {
+			IT_PLAYING *playing = sigrenderer->channeli.playing;
+			IT_TO_MIX *_to_mix = IT_IS_SURROUND_SHIFTED(playing->pan) ? to_mix_surround + n_to_mix_surround++ : to_mix + n_to_mix++;
+			_to_mix->playing = playing;
+			_to_mix->volume = volume == 0 ? 0 : calculate_volume(sigrenderer, playing, volume);
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+		if (sigrenderer->playingi) { /* Won't be dead; it would have been freed. */
+			IT_PLAYING *playing = sigrenderer->playingi;
+			IT_TO_MIX *_to_mix = IT_IS_SURROUND_SHIFTED(playing->pan) ? to_mix_surround + n_to_mix_surround++ : to_mix + n_to_mix++;
+			_to_mix->playing = playing;
+			_to_mix->volume = volume == 0 ? 0 : calculate_volume(sigrenderer, playing, volume);
+		}
+	}
+
+	if (volume != 0) {
+		qsort(to_mix, n_to_mix, sizeof(IT_TO_MIX), &it_to_mix_compare);
+		qsort(to_mix_surround, n_to_mix_surround, sizeof(IT_TO_MIX), &it_to_mix_compare);
+	}
+
+	sigrenderer->n_channels = 2;
+
+	for (i = 0; i < n_to_mix; i++) {
+		IT_PLAYING *playing = to_mixi.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(sigrenderer, playing, 0, delta, note_delta, pos, size, NULL, 0, &left_to_mix);
+					continue;
+				}
+			}
+			{
+				long size_rendered;
+				DUMB_CLICK_REMOVER **cr = sigrenderer->click_remover;
+				dumb_silence(samples_to_filter0, sigrenderer->n_channels * (size + 1));
+				sigrenderer->click_remover = NULL;
+				size_rendered = render_playing(sigrenderer, playing, volume, delta, note_delta, 0, size, samples_to_filter, 1, &left_to_mix);
+				sigrenderer->click_remover = cr;
+				it_filter(cr ? cr0 : NULL, &playing->filter_state0, samples0 /*output*/, pos, samples_to_filter0, size_rendered,
+					2, (int)(65536.0f/delta), playing->true_filter_cutoff, playing->true_filter_resonance);
+				it_filter(cr ? cr1 : NULL, &playing->filter_state1, samples0 /*output*/+1, pos, samples_to_filter0+1, size_rendered,
+					2, (int)(65536.0f/delta), playing->true_filter_cutoff, playing->true_filter_resonance);
+			}
+		} else {
+			it_reset_filter_state(&playing->filter_state0);
+			it_reset_filter_state(&playing->filter_state1);
+			render_playing(sigrenderer, playing, volume, delta, note_delta, pos, size, samples /*&samplesoutput*/, 0, &left_to_mix);
+		}
+	}
+
+	sigrenderer->n_channels = 1;
+	sigrenderer->click_remover = saved_cr ? saved_cr + 2 : 0;
+
+	for (i = 0; i < n_to_mix_surround; i++) {
+		IT_PLAYING *playing = to_mix_surroundi.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(sigrenderer, playing, 0, delta, note_delta, pos, size, NULL, 0, &left_to_mix);
+					continue;
+				}
+			}
+			{
+				long size_rendered;
+				DUMB_CLICK_REMOVER **cr = sigrenderer->click_remover;
+				dumb_silence(samples_to_filter0, size + 1);
+				sigrenderer->click_remover = NULL;
+				size_rendered = render_playing(sigrenderer, playing, volume, delta, note_delta, 0, size, samples_to_filter, 1, &left_to_mix);
+				sigrenderer->click_remover = cr;
+				it_filter(cr ? cr0 : NULL, &playing->filter_state0, samples1 /*output*/, pos, samples_to_filter0, 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_state0);
+			it_reset_filter_state(&playing->filter_state1);
+			render_playing(sigrenderer, playing, volume, delta, note_delta, pos, size, &samples1, 0, &left_to_mix);
+		}
+	}
+
+	sigrenderer->n_channels = saved_channels;
+	sigrenderer->click_remover = saved_cr;
+
+	destroy_sample_buffer(samples_to_filter);
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		if (sigrenderer->channeli.playing) {
+			//if ((sigrenderer->channeli.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->channeli.playing->flags & IT_PLAYING_DEAD) {
+				free_playing(sigrenderer->channeli.playing);
+				sigrenderer->channeli.playing = NULL;
+			}
+		}
+	}
+
+	for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+		if (sigrenderer->playingi) {
+			if (sigrenderer->playingi->flags & IT_PLAYING_DEAD) {
+				free_playing(sigrenderer->playingi);
+				sigrenderer->playingi = NULL;
+			}
+		}
+	}
+}
+
+
+
+static void render(DUMB_IT_SIGRENDERER *sigrenderer, float volume, float delta, long pos, long size, sample_t **samples)
+{
+	if (size == 0) return;
+	if (sigrenderer->n_channels == 1 || sigrenderer->n_channels == 2)
+		render_normal(sigrenderer, volume, delta, pos, size, samples);
+	else if (sigrenderer->n_channels == 3)
+		render_surround(sigrenderer, volume, delta, pos, size, samples);
+}
+
+
+
+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;
+	}
+	memset (sigrenderer, 0, sizeof (*sigrenderer));
+
+	sigrenderer->callbacks = callbacks;
+	sigrenderer->click_remover = cr;
+
+	sigrenderer->sigdata = sigdata;
+	sigrenderer->n_channels = n_channels;
+	sigrenderer->resampling_quality = dumb_resampling_quality;
+ sigrenderer->ramp_style = DUMB_IT_RAMP_FULL;
+	sigrenderer->globalvolume = sigdata->global_volume;
+	sigrenderer->tempo = sigdata->tempo;
+
+	for (i = 0; i < DUMB_IT_N_CHANNELS; i++) {
+		IT_CHANNEL *channel = &sigrenderer->channeli;
+#if IT_CHANNEL_MUTED != 1
+#error this is wrong
+#endif
+		channel->flags = sigdata->channel_pani >> 7;
+		channel->volume = (sigdata->flags & IT_WAS_AN_XM) ? 0 : 64;
+		channel->pan = sigdata->channel_pani & 0x7F;
+		channel->truepan = channel->pan << IT_ENVELOPE_SHIFT;
+		channel->channelvolume = sigdata->channel_volumei;
+		channel->instrument = 0;
+		channel->sample = 0;
+		channel->note = IT_NOTE_OFF;
+		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->okt_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->inv_loop_delay = 0;
+		channel->inv_loop_speed = 0;
+		channel->inv_loop_offset = 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->playingi = 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->ordern > 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;
+
+#ifdef BIT_ARRAY_BULLSHIT
+	sigrenderer->played = bit_array_create(sigdata->n_orders * 256);
+
+	sigrenderer->looped = 0;
+	sigrenderer->time_played = 0;
+	sigrenderer->row_timekeeper = timekeeping_array_create(sigdata->n_orders * 256);
+#endif
+
+	{
+		int order;
+		for (order = 0; order < sigdata->n_orders; order++) {
+			int n = sigdata->orderorder;
+			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;
+
+#ifdef BIT_ARRAY_BULLSHIT
+			/* Fix for played order detection for songs which have skips at the start of the orders list */
+			for (n = 0; n < 256; n++) {
+				bit_array_set(sigrenderer->played, order * 256 + n);
+				timekeeping_array_push(sigrenderer->row_timekeeper, order * 256 + n, 0);
+				timekeeping_array_bump(sigrenderer->row_timekeeper, order * 256 + n);
+			}
+#endif
+		}
+		/* 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;
+
+	sigrenderer->gvz_time = 0;
+	sigrenderer->gvz_sub_time = 0;
+
+	//sigrenderer->max_output = 0;
+
+	if ( !(sigdata->flags & IT_WAS_PROCESSED) ) {
+		dumb_it_add_lpc( sigdata );
+
+		sigdata->flags |= IT_WAS_PROCESSED;
+	}
+
+	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->channeli.playing)
+			{
+				IT_PLAYING * playing = sigrenderer->channeli.playing;
+				playing->resampling_quality = quality;
+				playing->resampler.quality = quality;
+ resampler_set_quality(playing->resampler.fir_resampler0, quality);
+ resampler_set_quality(playing->resampler.fir_resampler1, quality);
+			}
+		}
+		for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
+			if (sigrenderer->playingi) {
+				IT_PLAYING * playing = sigrenderer->playingi;
+				playing->resampling_quality = quality;
+				playing->resampler.quality = quality;
+ resampler_set_quality(playing->resampler.fir_resampler0, quality);
+ resampler_set_quality(playing->resampler.fir_resampler1, quality);
+			}
+		}
+	}
+}
+
+
+void dumb_it_set_ramp_style(DUMB_IT_SIGRENDERER * sigrenderer, int ramp_style) {
+	if (sigrenderer && ramp_style >= 0 && ramp_style <= 2) {
+		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 > 0 && pos >= sigrenderer->time_left) {
+		render(sigrenderer, 0, 1.0f, 0, sigrenderer->time_left, NULL);
+
+#ifdef BIT_ARRAY_BULLSHIT
+		sigrenderer->time_played += (LONG_LONG)sigrenderer->time_left << 16;
+#endif
+
+		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;
+
+#ifdef BIT_ARRAY_BULLSHIT
+	sigrenderer->time_played += (LONG_LONG)pos << 16;
+#endif
+
+	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;
+	int ret;
+	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);
+
+#ifdef BIT_ARRAY_BULLSHIT
+		sigrenderer->time_played += (LONG_LONG)todo * dt;
+#endif
+
+		ret = process_tick(sigrenderer);
+
+		if (ret) {
+			sigrenderer->order = -1;
+			sigrenderer->row = -1;
+		}
+
+#ifdef BIT_ARRAY_BULLSHIT
+		if (sigrenderer->looped == 1) {
+			sigrenderer->looped = -1;
+			size = 0;
+			timekeeping_array_reset(sigrenderer->row_timekeeper, sigrenderer->order * 256 + sigrenderer->row);
+			sigrenderer->time_played = timekeeping_array_get_item(sigrenderer->row_timekeeper, sigrenderer->order * 256 + sigrenderer->row);
+			break;
+		}
+#endif
+
+		if (ret) {
+			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);
+
+#ifdef BIT_ARRAY_BULLSHIT
+	sigrenderer->time_played += (LONG_LONG)size * dt;
+#endif
+
+	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->channeli.playing)
+				free_playing(sigrenderer->channeli.playing);
+#ifdef BIT_ARRAY_BULLSHIT
+			bit_array_destroy(sigrenderer->channeli.played_patjump);
+#endif
+		}
+
+		for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++)
+			if (sigrenderer->playingi)
+				free_playing(sigrenderer->playingi);
+
+		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);
+
+		timekeeping_array_destroy(sigrenderer->row_timekeeper);
+#endif
+
+		free(vsigrenderer);
+	}
+}
+
+
+
+#ifdef BIT_ARRAY_BULLSHIT
+static long it_sigrenderer_get_position(sigrenderer_t *vsigrenderer)
+{
+	DUMB_IT_SIGRENDERER *sigrenderer = (DUMB_IT_SIGRENDERER *) vsigrenderer;
+
+	return (long)(sigrenderer->time_played >> 16);
+}
+#endif
+
+
+
+DUH_SIGTYPE_DESC _dumb_sigtype_it = {
+	SIGTYPE_IT,
+	NULL,
+	&it_start_sigrenderer,
+	NULL,
+	&it_sigrenderer_get_samples,
+	&it_sigrenderer_get_current_sample,
+#ifdef BIT_ARRAY_BULLSHIT
+	&it_sigrenderer_get_position,
+#else
+	NULL,
+#endif
+	&_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->playingchannel - DUMB_IT_N_CHANNELS;
+		if (!playing) { state->sample = 0; return; }
+	} else {
+		playing = sr->channelchannel.playing;
+		if (!playing) { state->sample = 0; return; }
+	}
+
+	if (playing->flags & IT_PLAYING_DEAD) { state->sample = 0; return; }
+
+	state->channel = (int)(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;
+		}
+
+		sigrenderer->initial_runthrough = sigdata->initial_runthrough;
+		l = it_sigrenderer_get_samples(sigrenderer, 0, 1.0f, IT_CHECKPOINT_INTERVAL, NULL);
+		sigrenderer->initial_runthrough = 0;
+		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) {
+			sigdata->initial_runthrough = 1;
+			duh_set_length(duh, dumb_it_build_checkpoints(sigdata, 0));
+			sigdata->initial_runthrough = 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->ordern;
+		if (p < sigdata->n_patterns) {
+			IT_PATTERN * pattern = &sigdata->patternp;
+			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->ordern;
+		if (p < sigdata->n_patterns) {
+			IT_PATTERN * pattern = &sigdata->patternp;
+			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;
+
+	/* Skip the first order, it should always be played */
+	for (n = 1; n < sigdata->n_orders; n++) {
+		if ((sigdata->ordern >= sigdata->n_patterns) ||
+			(is_pattern_silent(&sigdata->patternsigdata->ordern, 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-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadamf.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadamf.c - Code to read a DSMI AMF module file, / / \ \
+ * opening and closing it for you. | < / \_
+ * | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_amf_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_amf_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_amf_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadamf2.c Added

@@ -0,0 +1,34 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadamf2.c - Code to read a DSMI AMF 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_amf(): 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_amf(const char *filename)
+{
+	DUH *duh = dumb_load_amf_quick(filename);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadany.c Added

@@ -0,0 +1,38 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadany.c - Code to detect and read any of the / / \ \
+ * module formats supported by DUMB, | < / \_
+ * opening and closing the file for you. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+DUH *dumb_load_any_quick(const char *filename, int restrict_, int subsong)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+ duh = dumb_read_any_quick(f, restrict_, subsong);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadany2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadany2.c - Code to detect and read any of the / / \ \
+ * module formats supported by DUMB, | < / \_
+ * opening and closing the file for | \/ /\ /
+ * you, and do an initial run-through. \_ / > /
+ * | \ / /
+ * by Chris Moeller. | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_load_any(const char *filename, int restrict_, int subsong)
+{
+ DUH *duh = dumb_load_any_quick(filename, restrict_, subsong);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadmod.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadmod.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadmod2.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadmod2.c Changed

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadokt.c Added

@@ -0,0 +1,42 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * loadokt.c - Code to read an Oktalyzer module / / \ \
+ * file, opening and closing it for | < / \_
+ * you. | \/ /\ /
+ * \_ / > /
+ * By Chris Moeller. | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+#include "internal/it.h"
+
+
+
+/* dumb_load_okt_quick(): loads an OKT 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_okt_quick(const char *filename)
+{
+	DUH *duh;
+	DUMBFILE *f = dumbfile_open(filename);
+
+	if (!f)
+		return NULL;
+
+	duh = dumb_read_okt_quick(f);
+
+	dumbfile_close(f);
+
+	return duh;
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/loadokt2.c Added

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

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/read669.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/read669.c Changed

@@ -35,7 +35,7 @@
 
 	pattern->n_rows = 64;
 
-	if (dumbfile_getnc(buffer, 64 * 3 * 8, f) < 64 * 3 * 8)
+ if (dumbfile_getnc((char *)buffer, 64 * 3 * 8, f) < 64 * 3 * 8)
 		return -1;
 
 	/* compute number of entries */
@@ -156,7 +156,7 @@
 
 static int it_669_read_sample_header(IT_SAMPLE *sample, DUMBFILE *f)
 {
-	dumbfile_getnc(sample->name, 13, f);
+ dumbfile_getnc((char *)sample->name, 13, f);
 	sample->name13 = 0;
 
 	sample->filename0 = 0;
@@ -268,7 +268,7 @@
 		return NULL;
 	}
 
-	if (dumbfile_getnc(sigdata->name, 36, f) < 36) {
+ if (dumbfile_getnc((char *)sigdata->name, 36, f) < 36) {
 		free(sigdata);
 		return NULL;
 	}
@@ -288,13 +288,13 @@
 		free(sigdata);
 		return NULL;
 	}
-	if (dumbfile_getnc(sigdata->song_message, 36, f) < 36) {
+ if (dumbfile_getnc((char *)sigdata->song_message, 36, f) < 36) {
 		_dumb_it_unload_sigdata(sigdata);
 		return NULL;
 	}
 	sigdata->song_message36 = 13;
 	sigdata->song_message36 + 1 = 10;
-	if (dumbfile_getnc(sigdata->song_message + 38, 36, f) < 36) {
+ if (dumbfile_getnc((char *)sigdata->song_message + 38, 36, f) < 36) {
 		_dumb_it_unload_sigdata(sigdata);
 		return NULL;
 	}
@@ -314,7 +314,7 @@
 		_dumb_it_unload_sigdata(sigdata);
 		return NULL;
 	}
-	if (dumbfile_getnc(sigdata->order, 128, f) < 128) {
+ if (dumbfile_getnc((char *)sigdata->order, 128, f) < 128) {
 		_dumb_it_unload_sigdata(sigdata);
 		return NULL;
 	}
@@ -332,12 +332,12 @@
 	}
 	sigdata->n_orders = i;
 
-	if (dumbfile_getnc(tempolist, 128, f) < 128) {
+ if (dumbfile_getnc((char *)tempolist, 128, f) < 128) {
 		_dumb_it_unload_sigdata(sigdata);
 		return NULL;
 	}
 
-	if (dumbfile_getnc(breaklist, 128, f) < 128) {
+ if (dumbfile_getnc((char *)breaklist, 128, f) < 128) {
 		_dumb_it_unload_sigdata(sigdata);
 		return NULL;
 	}
@@ -413,8 +413,9 @@
 	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
 
 	for (i = 0; i < DUMB_IT_N_CHANNELS; i += 2) {
-		sigdata->channel_pani+0 = 48;
-		sigdata->channel_pani+1 = 16;
+		int sep = 32 * dumb_it_default_panning_separation / 100;
+		sigdata->channel_pani+0 = 32 + sep;
+		sigdata->channel_pani+1 = 32 - sep;
 	}
 
 	_dumb_it_fix_invalid_orders(sigdata);
@@ -439,7 +440,7 @@
 	{
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		tag11 = ext ? "669 Extended" : "669";
 		return make_duh(-1, 2, (const char *const (*)2)tag, 1, &descptr, &sigdata);

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/read6692.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/read6692.c Changed

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

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readam.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readam.c Changed

@@ -24,7 +24,7 @@
 #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 )
+static int it_riff_am_process_sample( IT_SAMPLE * sample, DUMBFILE * f, int len, int ver )
 {
 	int header_length;
 	int default_pan;
@@ -34,49 +34,51 @@
 	int length_bytes;
 	int loop_start;
 	int loop_end;
-	int sample_rate;
+ int sample_rate;
+
+ long start = dumbfile_pos( f );
 
 	if ( ver == 0 )
-	{
+ {
 		if ( len < 0x38 )
 			return -1;
 
 		header_length = 0x38;
 
-		memcpy( sample->name, data, 28 );
+ dumbfile_getnc( (char *) sample->name, 28, f );
 		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 );
+ default_pan = dumbfile_getc( f );
+ default_volume = dumbfile_getc( f );
+ flags = dumbfile_igetw( f );
+ length = dumbfile_igetl( f );
+ loop_start = dumbfile_igetl( f );
+ loop_end = dumbfile_igetl( f );
+ sample_rate = dumbfile_igetl( f );
 	}
 	else
 	{
 		if (len < 4) return -1;
 
-		header_length = data 0 | ( data 1 << 8 ) | ( data 2 << 16 ) | ( data 3 << 24 );
+ header_length = dumbfile_igetl( f );
 		if ( header_length < 0x40 )
 			return -1;
 		if ( header_length + 4 > len )
 			return -1;
 
-		data += 4;
+ start += 4;
 		len -= 4;
 
-		memcpy( sample->name, data, 32 );
-		sample->name 32 = 0;
+ dumbfile_getnc( (char *) sample->name, 32, f );
 
-		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 );
+ default_pan = dumbfile_igetw( f );
+ default_volume = dumbfile_igetw( f );
+ flags = dumbfile_igetw( f );
+ dumbfile_skip( f, 2 );
+ length = dumbfile_igetl( f );
+ loop_start = dumbfile_igetl( f );
+ loop_end = dumbfile_igetl( f );
+ sample_rate = dumbfile_igetl( f );
 
 		if ( default_pan > 0x7FFF || default_volume > 0x7FFF )
 			return -1;
@@ -85,9 +87,6 @@
 		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;
@@ -138,43 +137,49 @@
 	if ( ! sample->data )
 		return -1;
 
-	memcpy( sample->data, data + header_length, length_bytes );
+ if ( dumbfile_seek( f, start + header_length, DFS_SEEK_SET ) )
+ return -1;
+
+ dumbfile_getnc( sample->data, length_bytes, f );
 
 	return 0;
 }
 
-static int it_riff_am_process_pattern( IT_PATTERN * pattern, const unsigned char * data, int len, int ver )
+static int it_riff_am_process_pattern( IT_PATTERN * pattern, DUMBFILE * f, int len, int ver )
 {
-	int nrows, row, pos;
+ int nrows, row;
+ long start, end;
 	unsigned flags;
+ int p, q, r;
 	IT_ENTRY * entry;
 
-	nrows = data0 + 1;
+ nrows = dumbfile_getc( f ) + 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 ) {
+ start = dumbfile_pos( f );
+ end = start + len;
+
+ while ( (row < nrows) && !dumbfile_error( f ) && (dumbfile_pos( f ) < end) ) {
+ p = dumbfile_getc( f );
+ if ( ! p ) {
 			++ row;
-			++ pos;
 			continue;
 		}
 
-		flags = data pos++ & 0xE0;
+ flags = p & 0xE0;
 
-		if (flags) {
+ if (flags) {
 			++ pattern->n_entries;
-			if (flags & 0x80) pos += 2;
-			if (flags & 0x40) pos += 2;
-			if (flags & 0x20) pos ++;
+ if (flags & 0x80) dumbfile_skip( f, 2 );
+ if (flags & 0x40) dumbfile_skip( f, 2 );
+ if (flags & 0x20) dumbfile_skip( f, 1 );
 		}
 	}
 
@@ -188,20 +193,22 @@
 	entry = pattern->entry;
 
 	row = 0;
-	pos = 0;
 
-	while ( ( row < nrows ) && ( pos < len ) )
+ dumbfile_seek( f, start, DFS_SEEK_SET );
+
+ while ( ( row < nrows ) && !dumbfile_error( f ) && ( dumbfile_pos( f ) < end ) )
 	{
-		if ( ! data pos )
+ p = dumbfile_getc( f );
+
+ if ( ! p )
 		{
 			IT_SET_END_ROW( entry );
 			++ entry;
 			++ row;
-			++ pos;
 			continue;
 		}
 
-		flags = data pos++ ;
+ flags = p;
 		entry->channel = flags & 0x1F;
 		entry->mask = 0;
 
@@ -209,31 +216,33 @@
 		{
 			if ( flags & 0x80 )
 			{
-				_dumb_it_xm_convert_effect( data pos + 1 , data pos , entry, 0 );
-				pos += 2;
+ q = dumbfile_getc( f );
+ r = dumbfile_getc( f );
+ _dumb_it_xm_convert_effect( r, q, entry, 0 );
 			}
 
 			if ( flags & 0x40 )
 			{
-				if ( data pos )
+ q = dumbfile_getc( f );
+ r = dumbfile_getc( f );
+ if ( q )
 				{
 					entry->mask |= IT_ENTRY_INSTRUMENT;
-					entry->instrument = data pos ;
+ entry->instrument = q;
 				}
-				if ( data pos + 1 )
+ if ( r )
 				{
 					entry->mask |= IT_ENTRY_NOTE;
-					entry->note = data pos + 1 - 1;
+ entry->note = r - 1;
 				}
-				pos += 2;
 			}
 
 			if ( flags & 0x20 )
 			{
+ q = dumbfile_getc( f );
 				entry->mask |= IT_ENTRY_VOLPAN;
-				if ( ver == 0 ) entry->volpan = data pos ;
-				else entry->volpan = data pos * 64 / 127;
-				++ pos;
+ if ( ver == 0 ) entry->volpan = q;
+ else entry->volpan = q * 64 / 127;
 			}
 
 			if (entry->mask) entry++;
@@ -253,13 +262,11 @@
 	return 0;
 }
 
-static DUMB_IT_SIGDATA *it_riff_amff_load_sigdata( struct riff * stream )
+static DUMB_IT_SIGDATA *it_riff_amff_load_sigdata( DUMBFILE * f, struct riff * stream )
 {
 	DUMB_IT_SIGDATA *sigdata;
 
-	int n, o, found;
-
-	unsigned char * ptr;
+ int n, o, p, found;
 
 	if ( ! stream ) goto error;
 
@@ -274,7 +281,7 @@
 
 	found = 0;
 
-	for ( n = 0; n < stream->chunk_count; ++n )
+ for ( n = 0; (unsigned)n < stream->chunk_count; ++n )
 	{
 		struct riff_chunk * c = stream->chunks + n;
 		switch( c->type )
@@ -290,23 +297,28 @@
 			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;
+ case DUMB_ID( 'P', 'A', 'T', 'T' ):
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_sd;
+ o = dumbfile_getc( f );
+ if ( o >= sigdata->n_patterns ) sigdata->n_patterns = o + 1;
+ o = dumbfile_igetl( f );
+ if ( (unsigned)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;
+				if ( c->size < 0xE1 ) goto error_sd;
+ if ( dumbfile_seek( f, c->offset + 1, DFS_SEEK_SET ) ) goto error_sd;
+ o = dumbfile_getc( f );
+ if ( o >= sigdata->n_samples ) sigdata->n_samples = o + 1;
+ if ( c->size >= 0x121 )
+ {
+ if ( dumbfile_seek( f, c->offset + 0xE1, DFS_SEEK_SET ) ) goto error_sd;
+ if ( dumbfile_mgetl( f ) == DUMB_ID('S','A','M','P') )
+ {
+ unsigned size = dumbfile_igetl( f );
+ if ( size + 0xE1 + 8 > c->size ) goto error_sd;
+ }
 				}
 			}
 			break;
@@ -330,40 +342,46 @@
 
 	sigdata->n_instruments = 0;
 	sigdata->n_orders = 0;
+	sigdata->restart_position = 0;
 
 	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
 
 	for (n = 0; n < DUMB_IT_N_CHANNELS; n += 4) {
-		sigdata->channel_pann = 16;
-		sigdata->channel_pann+1 = 48;
-		sigdata->channel_pann+2 = 48;
-		sigdata->channel_pann+3 = 16;
+		int sep = 32 * dumb_it_default_panning_separation / 100;
+		sigdata->channel_pann = 32 - sep;
+		sigdata->channel_pann+1 = 32 + sep;
+		sigdata->channel_pann+2 = 32 + sep;
+		sigdata->channel_pann+3 = 32 - sep;
 	}
 
-	for ( n = 0; n < stream->chunk_count; ++n )
+ for ( n = 0; (unsigned)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 );
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_usd;
+ dumbfile_getnc( (char *) sigdata->name, 64, f );
 			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 ;
+ o = dumbfile_getc( f );
+ if ( ! ( o & 1 ) ) sigdata->flags |= IT_LINEAR_SLIDES;
+ if ( ( o & ~3 ) || ! ( o & 2 ) ) goto error_usd; // unknown flags
+ sigdata->n_pchannels = dumbfile_getc( f );
+ sigdata->speed = dumbfile_getc( f );
+ sigdata->tempo = dumbfile_getc( f );
 
-			sigdata->global_volume = ptr 0x48 ;
+ dumbfile_skip( f, 4 );
 
-			if ( c->size < 0x48 + sigdata->n_pchannels ) goto error_usd;
+ sigdata->global_volume = dumbfile_getc( f );
+
+ if ( c->size < 0x48 + (unsigned)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 )
+ p = dumbfile_getc( f );
+ sigdata->channel_pan o = p;
+ if ( p >= 128 )
 				{
 					sigdata->channel_volume o = 0;
 				}
@@ -387,43 +405,46 @@
 		sample->name 0 = 0;
 	}
 
-	for ( n = 0; n < stream->chunk_count; ++n )
+ for ( n = 0; (unsigned)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;
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_usd;
+ sigdata->n_orders = dumbfile_getc( f ) + 1;
+ if ( (unsigned)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 );
+ dumbfile_getnc( (char *) sigdata->order, sigdata->n_orders, f );
 			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;
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_usd;
+ o = dumbfile_getc( f );
+ p = dumbfile_igetl( f );
+ if ( it_riff_am_process_pattern( sigdata->pattern + o, f, p, 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;
+ if ( dumbfile_seek( f, c->offset + 1, DFS_SEEK_SET ) ) goto error_usd;
+ sample = sigdata->sample + dumbfile_getc( f );
+ if ( c->size >= 0x121 )
+ {
+ if ( dumbfile_seek( f, c->offset + 0xE1, DFS_SEEK_SET ) ) goto error_usd;
+ if ( dumbfile_mgetl( f ) == DUMB_ID('S','A','M','P') )
+ {
+ unsigned size = dumbfile_igetl( f );
+ if ( it_riff_am_process_sample( sample, f, size, 0 ) ) goto error_usd;
+ break;
+ }
 				}
-			}
+ dumbfile_seek( f, c->offset + 2, DFS_SEEK_SET );
+ dumbfile_getnc( (char *) sample->name, 28, f );
+ sample->name 28 = 0;
+ }
 			break;
 		}
 	}
@@ -441,15 +462,13 @@
 	return NULL;
 }
 
-static DUMB_IT_SIGDATA *it_riff_am_load_sigdata( struct riff * stream )
+static DUMB_IT_SIGDATA *it_riff_am_load_sigdata( DUMBFILE * f, struct riff * stream )
 {
 	DUMB_IT_SIGDATA *sigdata;
 
 	int n, o, p, found;
 
-	unsigned char * ptr;
-
-	if ( ! stream ) goto error;
+ if ( ! f || ! stream ) goto error;
 
 	if ( stream->type != DUMB_ID( 'A', 'M', ' ', ' ' ) ) goto error;
 
@@ -462,7 +481,7 @@
 
 	found = 0;
 
-	for ( n = 0; n < stream->chunk_count; ++n )
+ for ( n = 0; (unsigned)n < stream->chunk_count; ++n )
 	{
 		struct riff_chunk * c = stream->chunks + n;
 		switch( c->type )
@@ -479,19 +498,20 @@
 			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;
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_sd;
+ o = dumbfile_getc( f );
+ if ( o >= sigdata->n_patterns ) sigdata->n_patterns = o + 1;
+ o = dumbfile_igetl( f );
+ if ( (unsigned)o + 5 > c->size ) goto error_sd;
 			break;
 
 		case DUMB_ID( 'R', 'I', 'F', 'F' ):
 			{
-				struct riff * str = ( struct riff * ) c->data;
+ struct riff * str = c->nested;
 				switch ( str->type )
 				{
 				case DUMB_ID( 'A', 'I', ' ', ' ' ):
-					for ( o = 0; o < str->chunk_count; ++o )
+ for ( o = 0; (unsigned)o < str->chunk_count; ++o )
 					{
 						struct riff_chunk * chk = str->chunks + o;
 						switch( chk->type )
@@ -501,24 +521,26 @@
 								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;
+ if ( dumbfile_seek( f, chk->offset, DFS_SEEK_SET ) ) goto error_sd;
+ size = dumbfile_igetl( f );
+								if ( size < 0x142 ) goto error_sd;
 								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 );
+ dumbfile_skip( f, 1 );
+ p = dumbfile_getc( f );
+ if ( p >= sigdata->n_samples ) sigdata->n_samples = p + 1;
+ temp = riff_parse( f, chk->offset + 4 + size, chk->size - size - 4, 1 );
 								if ( temp )
 								{
 									if ( temp->type == DUMB_ID( 'A', 'S', ' ', ' ' ) )
 									{
-										for ( p = 0; p < temp->chunk_count; ++p )
+ for ( p = 0; (unsigned)p < temp->chunk_count; ++p )
 										{
 											if ( temp->chunks p .type == DUMB_ID( 'S', 'A', 'M', 'P' ) )
 											{
 												if ( sample_found )
 												{
 													riff_free( temp );
-													goto error;
+ goto error_sd;
 												}
 												sample_found = 1;
 											}
@@ -552,41 +574,47 @@
 
 	sigdata->n_instruments = 0;
 	sigdata->n_orders = 0;
+	sigdata->restart_position = 0;
 
 	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
 
 	for (n = 0; n < DUMB_IT_N_CHANNELS; n += 4) {
-		sigdata->channel_pann = 16;
-		sigdata->channel_pann+1 = 48;
-		sigdata->channel_pann+2 = 48;
-		sigdata->channel_pann+3 = 16;
+		int sep = 32 * dumb_it_default_panning_separation / 100;
+		sigdata->channel_pann = 32 - sep;
+		sigdata->channel_pann+1 = 32 + sep;
+		sigdata->channel_pann+2 = 32 + sep;
+		sigdata->channel_pann+3 = 32 - sep;
 	}
 
-	for ( n = 0; n < stream->chunk_count; ++n )
+ for ( n = 0; (unsigned)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 );
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_usd;
+ dumbfile_getnc( (char *) sigdata->name, 64, f );
 			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 ;
+ o = dumbfile_getc( f );
+ if ( ! ( o & 1 ) ) sigdata->flags |= IT_LINEAR_SLIDES;
+ if ( ( o & ~3 ) || ! ( o & 2 ) ) goto error_usd; // unknown flags
+ sigdata->n_pchannels = dumbfile_getc( f );
+ sigdata->speed = dumbfile_getc( f );
+ sigdata->tempo = dumbfile_getc( f );
+
+ dumbfile_skip( f, 4 );
 
-			sigdata->global_volume = ptr 0x48 ;
+ sigdata->global_volume = dumbfile_getc( f );
 
-			if ( c->size < 0x48 + sigdata->n_pchannels ) goto error_usd;
+ if ( c->size < 0x48 + (unsigned)sigdata->n_pchannels ) goto error_usd;
 
 			for ( o = 0; o < sigdata->n_pchannels; ++o )
 			{
-				if ( ptr 0x49 + o <= 128 )
+ p = dumbfile_getc( f );
+ if ( p <= 128 )
 				{
-					sigdata->channel_pan o = ptr 0x49 + o / 2;
+ sigdata->channel_pan o = p / 2;
 				}
 				else
 				{
@@ -612,33 +640,34 @@
 		sample->name 0 = 0;
 	}
 
-	for ( n = 0; n < stream->chunk_count; ++n )
+ for ( n = 0; (unsigned)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;
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_usd;
+ sigdata->n_orders = dumbfile_getc( f ) + 1;
+ if ( (unsigned)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 );
+ dumbfile_getnc( (char *) sigdata->order, sigdata->n_orders, f );
 			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;
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_usd;
+ o = dumbfile_getc( f );
+ p = dumbfile_igetl( f );
+ if ( it_riff_am_process_pattern( sigdata->pattern + o, f, p, 1 ) ) goto error_usd;
 			break;
 
 		case DUMB_ID( 'R', 'I', 'F', 'F' ):
 			{
-				struct riff * str = ( struct riff * ) c->data;
+ struct riff * str = c->nested;
 				switch ( str->type )
 				{
 				case DUMB_ID('A', 'I', ' ', ' '):
-					for ( o = 0; o < str->chunk_count; ++o )
+ for ( o = 0; (unsigned)o < str->chunk_count; ++o )
 					{
 						struct riff_chunk * chk = str->chunks + o;
 						switch( chk->type )
@@ -649,16 +678,18 @@
 								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 );
+ if ( dumbfile_seek( f, chk->offset, DFS_SEEK_SET ) ) goto error_usd;
+ size = dumbfile_igetl( f );
+ dumbfile_skip( f, 1 );
+ p = dumbfile_getc( f );
+ temp = riff_parse( f, chk->offset + 4 + size, chk->size - size - 4, 1 );
 								sample_found = 0;
-								sample = sigdata->sample + ptr 5 ;
+ sample = sigdata->sample + p;
 								if ( temp )
 								{
 									if ( temp->type == DUMB_ID( 'A', 'S', ' ', ' ' ) )
 									{
-										for ( p = 0; p < temp->chunk_count; ++p )
+ for ( p = 0; (unsigned)p < temp->chunk_count; ++p )
 										{
 											struct riff_chunk * c = temp->chunks + p;
 											if ( c->type == DUMB_ID( 'S', 'A', 'M', 'P' ) )
@@ -668,7 +699,12 @@
 													riff_free( temp );
 													goto error_usd;
 												}
-												if ( it_riff_am_process_sample( sigdata->sample + ptr 5 , ( unsigned char * ) c->data, c->size, 1 ) )
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) )
+ {
+ riff_free( temp );
+ goto error_usd;
+ }
+ if ( it_riff_am_process_sample( sample, f, c->size, 1 ) )
 												{
 													riff_free( temp );
 													goto error_usd;
@@ -681,7 +717,8 @@
 								}
 								if ( ! sample_found )
 								{
-									memcpy( sample->name, ptr + 6, 32 );
+ dumbfile_seek( f, chk->offset + 6, DFS_SEEK_SET );
+ dumbfile_getnc( (char *) sample->name, 32, f );
 									sample->name 32 = 0;
 								}
 							}
@@ -706,14 +743,14 @@
 	return NULL;
 }
 
-DUH *dumb_read_riff_amff( struct riff * stream )
+DUH *dumb_read_riff_amff( DUMBFILE * f, struct riff * stream )
 {
 	sigdata_t *sigdata;
 	long length;
 
 	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
 
-	sigdata = it_riff_amff_load_sigdata( stream );
+ sigdata = it_riff_amff_load_sigdata( f, stream );
 
 	if (!sigdata)
 		return NULL;
@@ -723,20 +760,20 @@
 	{
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		tag11 = "RIFF AMFF";
 		return make_duh( length, 2, ( const char * const (*) 2 ) tag, 1, & descptr, & sigdata );
 	}
 }
 
-DUH *dumb_read_riff_am( struct riff * stream )
+DUH *dumb_read_riff_am( DUMBFILE * f, struct riff * stream )
 {
 	sigdata_t *sigdata;
 
 	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
 
-	sigdata = it_riff_am_load_sigdata( stream );
+ sigdata = it_riff_am_load_sigdata( f, stream );
 
 	if (!sigdata)
 		return NULL;
@@ -744,7 +781,7 @@
 	{
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		tag11 = "RIFF AM";
 		return make_duh( -1, 2, ( const char * const (*) 2 ) tag, 1, & descptr, & sigdata );

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readamf.c Added

@@ -0,0 +1,559 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readamf.c - Code to read a DSMI AMF 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 void it_amf_process_track( IT_ENTRY *entry_table, unsigned char *track, int rows, int channels )
+{
+	int last_instrument = 0;
+	int tracksize = track 0 + ( track 1 << 8 ) + ( track 2 << 16 );
+	track += 3;
+	while ( tracksize-- ) {
+		unsigned int row = track 0 ;
+		unsigned int command = track 1 ;
+		unsigned int argument = track 2 ;
+		IT_ENTRY * entry = entry_table + row * channels;
+		if ( row >= ( unsigned int ) rows ) break;
+		if ( command < 0x7F ) {
+			entry->mask |= IT_ENTRY_NOTE | IT_ENTRY_INSTRUMENT | IT_ENTRY_VOLPAN;
+			entry->note = command;
+			if ( ! entry->instrument ) entry->instrument = last_instrument;
+			entry->volpan = argument;
+		}
+		else if ( command == 0x7F ) {
+			signed char row_delta = ( signed char ) argument;
+			int row_source = ( int ) row + ( int ) row_delta;
+			if ( row_source >= 0 && row_source < ( int ) rows ) {
+				*entry = entry_table row_source * channels ;
+			}
+		}
+		else if ( command == 0x80 ) {
+			entry->mask |= IT_ENTRY_INSTRUMENT;
+			last_instrument = argument + 1;
+			entry->instrument = last_instrument;
+		}
+		else if ( command == 0x83 ) {
+			entry->mask |= IT_ENTRY_VOLPAN;
+			entry->volpan = argument;
+		}
+		else {
+			unsigned int effect = command & 0x7F;
+			unsigned int effectvalue = argument;
+			switch (effect) {
+				case 0x01: effect = IT_SET_SPEED; break;
+
+				case 0x02: effect = IT_VOLUME_SLIDE;
+				case 0x0A: if ( effect == 0x0A ) effect = IT_VOLSLIDE_TONEPORTA;
+				case 0x0B: if ( effect == 0x0B ) effect = IT_VOLSLIDE_VIBRATO;
+					if ( effectvalue & 0x80 ) effectvalue = ( -( signed char ) effectvalue ) & 0x0F;
+					else effectvalue = ( effectvalue & 0x0F ) << 4;
+					break;
+
+				case 0x04:
+					if ( effectvalue & 0x80 ) {
+						effect = IT_PORTAMENTO_UP;
+						effectvalue = ( -( signed char ) effectvalue ) & 0x7F;
+					}
+					else {
+						effect = IT_PORTAMENTO_DOWN;
+					}
+					break;
+
+				case 0x06: effect = IT_TONE_PORTAMENTO; break;
+
+				case 0x07: effect = IT_TREMOR; break;
+
+				case 0x08: effect = IT_ARPEGGIO; break;
+
+				case 0x09: effect = IT_VIBRATO; break;
+
+				case 0x0C: effect = IT_BREAK_TO_ROW; break;
+
+				case 0x0D: effect = IT_JUMP_TO_ORDER; break;
+
+				case 0x0F: effect = IT_RETRIGGER_NOTE; break;
+
+				case 0x10: effect = IT_SET_SAMPLE_OFFSET; break;
+
+				case 0x11:
+					if ( effectvalue ) {
+						effect = IT_VOLUME_SLIDE;
+						if ( effectvalue & 0x80 )
+							effectvalue = 0xF0 | ( ( -( signed char ) effectvalue ) & 0x0F );
+						else
+							effectvalue = 0x0F | ( ( effectvalue & 0x0F ) << 4 );
+					}
+					else
+						effect = 0;
+					break;
+
+				case 0x12:
+				case 0x16:
+					if ( effectvalue ) {
+						int mask = ( effect == 0x16 ) ? 0xE0 : 0xF0;
+						effect = ( effectvalue & 0x80 ) ? IT_PORTAMENTO_UP : IT_PORTAMENTO_DOWN;
+						if ( effectvalue & 0x80 )
+							effectvalue = mask | ( ( -( signed char ) effectvalue ) & 0x0F );
+						else
+							effectvalue = mask | ( effectvalue & 0x0F );
+ }
+					else
+						effect = 0;
+					break;
+
+				case 0x13:
+					effect = IT_S;
+					effectvalue = EFFECT_VALUE( IT_S_NOTE_DELAY, effectvalue & 0x0F );
+					break;
+
+				case 0x14:
+					effect = IT_S;
+					effectvalue = EFFECT_VALUE( IT_S_DELAYED_NOTE_CUT, effectvalue & 0x0F );
+					break;
+
+				case 0x15: effect = IT_SET_SONG_TEMPO; break;
+
+				case 0x17:
+					effectvalue = ( effectvalue + 64 ) & 0x7F;
+					if ( entry->mask & IT_ENTRY_EFFECT ) {
+						if ( !( entry->mask & IT_ENTRY_VOLPAN ) ) {
+							entry->mask |= IT_ENTRY_VOLPAN;
+							entry->volpan = ( effectvalue / 2 ) + 128;
+						}
+						effect = 0;
+					}
+					else {
+						effect = IT_SET_PANNING;
+					}
+					break;
+
+				default: effect = effectvalue = 0;
+			}
+			if ( effect ) {
+				entry->mask |= IT_ENTRY_EFFECT;
+				entry->effect = effect;
+				entry->effectvalue = effectvalue;
+			}
+		}
+		track += 3;
+	}
+}
+
+static int it_amf_process_pattern( IT_PATTERN *pattern, IT_ENTRY *entry_table, int rows, int channels )
+{
+	int i, j;
+	int n_entries = rows;
+	IT_ENTRY * entry;
+
+	pattern->n_rows = rows;
+
+	for ( i = 0, j = channels * rows; i < j; i++ ) {
+		if ( entry_table i .mask ) {
+			n_entries++;
+		}
+	}
+
+	pattern->n_entries = n_entries;
+
+	pattern->entry = entry = malloc( n_entries * sizeof( IT_ENTRY ) );
+	if ( !entry ) {
+		return -1;
+	}
+
+	for ( i = 0; i < rows; i++ ) {
+		for ( j = 0; j < channels; j++ ) {
+			if ( entry_table i * channels + j .mask ) {
+				*entry = entry_table i * channels + j ;
+				entry->channel = j;
+				entry++;
+			}
+		}
+		IT_SET_END_ROW( entry );
+		entry++;
+	}
+
+	return 0;
+}
+
+static int it_amf_read_sample_header( IT_SAMPLE *sample, DUMBFILE *f, int * offset, int ver )
+{
+	int exists;
+
+	exists = dumbfile_getc( f );
+
+ dumbfile_getnc( (char *) sample->name, 32, f );
+	sample->name32 = 0;
+
+ dumbfile_getnc( (char *) sample->filename, 13, f );
+	sample->filename13 = 0;
+
+	*offset = (int)dumbfile_igetl( f );
+	sample->length = dumbfile_igetl( f );
+	sample->C5_speed = dumbfile_igetw( f );
+	sample->default_volume = dumbfile_getc( f );
+	sample->global_volume = 64;
+	if ( sample->default_volume > 64 ) sample->default_volume = 64;
+
+	if ( ver >= 11 ) {
+		sample->loop_start = dumbfile_igetl( f );
+		sample->loop_end = dumbfile_igetl( f );
+	} else {
+		sample->loop_start = dumbfile_igetw( f );
+		sample->loop_end = sample->length;
+	}
+
+	if ( sample->length <= 0 ) {
+		sample->flags = 0;
+		return 0;
+	}
+
+	sample->flags = exists == 1 ? IT_SAMPLE_EXISTS : 0;
+
+	sample->default_pan = 0;
+	sample->finetune = 0;
+
+	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_amf_read_sample_data( IT_SAMPLE *sample, DUMBFILE *f )
+{
+	int i, read_length = 0;
+
+	sample->data = malloc( sample->length );
+
+	if ( !sample->data )
+		return -1;
+
+	if ( sample->length )
+		read_length = (int)dumbfile_getnc( sample->data, sample->length, f );
+
+	for ( i = 0; i < read_length; i++ ) {
+		( ( signed char * ) sample->data ) i ^= 0x80;
+	}
+
+	for ( i = read_length; i < sample->length; i++ ) {
+		( ( signed char * ) sample->data ) i = 0;
+	}
+
+	return 0; /* Sometimes the last sample is truncated :( */
+}
+
+static DUMB_IT_SIGDATA *it_amf_load_sigdata(DUMBFILE *f, int * version)
+{
+	DUMB_IT_SIGDATA *sigdata;
+	int i, j, ver, ntracks, realntracks, nchannels;
+
+	int maxsampleseekpos = 0;
+	int sampleseekpos256;
+
+	unsigned short *orderstotracks;
+	unsigned short *trackmap;
+	unsigned int tracksize256;
+
+	unsigned char **track;
+
+	static const char sig = "AMF";
+
+	char signature 3;
+
+	if ( dumbfile_getnc( signature, 3, f ) != 3 ||
+		memcmp( signature, sig, 3 ) ) {
+		return NULL;
+	}
+
+	*version = ver = dumbfile_getc( f );
+	if ( ver < 10 || ver > 14) {
+		return NULL;
+	}
+
+	sigdata = malloc(sizeof(*sigdata));
+	if (!sigdata) {
+		return NULL;
+	}
+
+ dumbfile_getnc( (char *) sigdata->name, 32, f );
+	sigdata->name 32 = 0;
+	sigdata->n_samples = dumbfile_getc( f );
+	sigdata->n_orders = dumbfile_getc( f );
+	ntracks = dumbfile_igetw( f );
+	nchannels = dumbfile_getc( f );
+
+	if ( dumbfile_error( f ) ||
+		sigdata->n_samples < 1 || sigdata->n_samples > 255 ||
+		sigdata->n_orders < 1 || sigdata->n_orders > 255 ||
+		! ntracks ||
+		nchannels < 1 || nchannels > 32 ) {
+		free( sigdata );
+		return NULL;
+	}
+ 
+ sigdata->n_pchannels = nchannels;
+
+	memset( sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS );
+
+	if ( ver >= 11 ) {
+		int nchannels = ( ver >= 13 ) ? 32 : 16;
+		for ( i = 0; i < nchannels; i++ ) {
+			signed char panpos = dumbfile_getc( f );
+			int pan = ( panpos + 64 ) / 2;
+			if ( pan < 0 ) pan = 0;
+			else if ( pan > 64 ) pan = IT_SURROUND;
+			sigdata->channel_pan i = pan;
+		}
+	}
+	else {
+		int sep = 32 * dumb_it_default_panning_separation / 100;
+		for ( i = 0; i < 16; i++ ) {
+			sigdata->channel_pan i = ( dumbfile_getc( f ) & 1 ) ? 32 - sep : 32 + sep;
+		}
+	}
+
+	sigdata->tempo = 125;
+	sigdata->speed = 6;
+	if ( ver >= 13 ) {
+		i = dumbfile_getc( f );
+		if ( i >= 32 ) sigdata->tempo = i;
+		i = dumbfile_getc( f );
+		if ( i <= 32 ) sigdata->speed = i;
+	}
+
+	sigdata->order = malloc( sigdata->n_orders );
+	if ( !sigdata->order ) {
+		free( sigdata );
+		return NULL;
+	}
+
+	orderstotracks = malloc( sigdata->n_orders * nchannels * sizeof( unsigned short ) );
+	if ( !orderstotracks ) {
+		free( sigdata->order );
+		free( sigdata );
+		return NULL;
+	}
+
+	for ( i = 0; i < sigdata->n_orders; i++ ) {
+		sigdata->order i = i;
+		tracksize i = 64;
+		if ( ver >= 14 ) {
+			tracksize i = dumbfile_igetw( f );
+		}
+		for ( j = 0; j < nchannels; j++ ) {
+			orderstotracks i * nchannels + j = dumbfile_igetw( f );
+		}
+	}
+
+	if ( dumbfile_error( f ) ) {
+		free( orderstotracks );
+		free( sigdata->order );
+		free( sigdata );
+		return NULL;
+	}
+
+	sigdata->sample = malloc( sigdata->n_samples * sizeof( *sigdata->sample ) );
+	if ( !sigdata->sample ) {
+		free( orderstotracks );
+		free( sigdata->order );
+		free( sigdata );
+		return NULL;
+	}
+
+	sigdata->restart_position = 0;
+
+	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->samplei.data = NULL;
+
+	for ( i = 0; i < sigdata->n_samples; ++i ) {
+		int offset;
+		if ( it_amf_read_sample_header( &sigdata->samplei, f, &offset, ver ) ) {
+			goto error_ott;
+		}
+		sampleseekpos i = offset;
+		if ( offset > maxsampleseekpos ) maxsampleseekpos = offset;
+	}
+
+	sigdata->n_patterns = sigdata->n_orders;
+
+	sigdata->pattern = malloc( sigdata->n_patterns * sizeof( *sigdata->pattern ) );
+	if ( !sigdata->pattern ) {
+		goto error_ott;
+	}
+	for (i = 0; i < sigdata->n_patterns; ++i)
+		sigdata->patterni.entry = NULL;
+
+	trackmap = malloc( ntracks * sizeof( unsigned short ) );
+	if ( !trackmap ) {
+		goto error_ott;
+	}
+
+	if ( dumbfile_getnc( ( char * ) trackmap, ntracks * sizeof( unsigned short ), f ) != (long)(ntracks * sizeof( unsigned short )) ) {
+		goto error_tm;
+	}
+
+	realntracks = 0;
+
+	for ( i = 0; i < ntracks; i++ ) {
+		if ( trackmap i > realntracks ) realntracks = trackmap i ;
+	}
+
+	track = calloc( realntracks, sizeof( unsigned char * ) );
+	if ( !track ) {
+		goto error_tm;
+	}
+
+	for ( i = 0; i < realntracks; i++ ) {
+		int tracksize = dumbfile_igetw( f );
+		tracksize += dumbfile_getc( f ) << 16;
+		track i = malloc( tracksize * 3 + 3 );
+		if ( !track i ) {
+			goto error_all;
+		}
+		track i 0 = tracksize & 255;
+		track i 1 = ( tracksize >> 8 ) & 255;
+		track i 2 = ( tracksize >> 16 ) & 255;
+ if ( dumbfile_getnc( (char *) track i + 3, tracksize * 3, f ) != tracksize * 3 ) {
+			goto error_all;
+		}
+	}
+
+	for ( i = 1; i <= maxsampleseekpos; i++ ) {
+		for ( j = 0; j < sigdata->n_samples; j++ ) {
+			if ( sampleseekpos j == i ) {
+				if ( it_amf_read_sample_data( &sigdata->sample j , f ) ) {
+					goto error_all;
+				}
+				break;
+			}
+		}
+	}
+
+	/* Process tracks into patterns */
+	for ( i = 0; i < sigdata->n_patterns; i++ ) {
+		IT_ENTRY * entry_table = calloc( tracksize i * nchannels, sizeof( IT_ENTRY ) );
+		if ( !entry_table ) {
+			goto error_all;
+		}
+		for ( j = 0; j < nchannels; j++ ) {
+			int ntrack = orderstotracks i * nchannels + j ;
+			if ( ntrack && ntrack <= ntracks ) {
+				int realtrack = trackmap ntrack - 1 ;
+				if ( realtrack ) {
+					realtrack--;
+					if ( realtrack < realntracks && track realtrack ) {
+						it_amf_process_track( entry_table + j, track realtrack , tracksize i , nchannels );
+					}
+				}
+			}
+		}
+		if ( it_amf_process_pattern( &sigdata->pattern i , entry_table, tracksize i , nchannels ) ) {
+			free( entry_table );
+			goto error_all;
+		}
+		free( entry_table );
+	}
+
+	/* Now let's initialise the remaining variables, and we're done! */
+	sigdata->flags = IT_OLD_EFFECTS | IT_COMPATIBLE_GXX | IT_STEREO | IT_WAS_AN_S3M;
+
+	sigdata->global_volume = 128;
+	sigdata->mixing_volume = 48;
+	sigdata->pan_separation = 128;
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	for ( i = 0; i < realntracks; i++ ) {
+		if ( track i ) {
+			free( track i );
+		}
+	}
+	free( track );
+	free( trackmap );
+	free( orderstotracks );
+
+	return sigdata;
+
+error_all:
+	for ( i = 0; i < realntracks; i++ ) {
+		if ( track i ) {
+			free( track i );
+		}
+	}
+	free( track );
+error_tm:
+	free( trackmap );
+error_ott:
+	free( orderstotracks );
+	_dumb_it_unload_sigdata( sigdata );
+	return NULL;
+}
+
+
+
+DUH *dumb_read_amf_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+	int version;
+
+	sigdata = it_amf_load_sigdata(f, &version);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		const char *tag22;
+		char ver_string14;
+		tag00 = "TITLE";
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
+		tag10 = "FORMAT";
+		memcpy( ver_string, "DSMI AMF v", 10 );
+		ver_string10 = '0' + version / 10;
+		ver_string11 = '.';
+		ver_string12 = '0' + version % 10;
+		ver_string13 = 0;
+		tag11 = ver_string;
+		return make_duh(-1, 2, (const char *const (*)2)tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readamf2.c Added

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

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readany.c Added

@@ -0,0 +1,132 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readany.c - Code to detect and read any of the / / \ \
+ * module formats supported by DUMB. | < / \_
+ * | \/ /\ /
+ * By Chris Moeller. \_ / > /
+ * | \ / /
+ * | ' /
+ * \__/
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "dumb.h"
+
+#ifdef _MSC_VER
+	#define strnicmp _strnicmp
+#else
+	#if defined(unix) || defined(__unix__) || defined(__unix)
+		#include <strings.h>
+	#endif
+	#define strnicmp strncasecmp
+#endif
+
+enum { maximum_signature_size = 0x30 };
+
+DUH *dumb_read_any_quick(DUMBFILE *f, int restrict_, int subsong)
+{
+ unsigned char signature maximum_signature_size ;
+ unsigned long signature_size;
+ DUH * duh = NULL;
+
+ signature_size = dumbfile_get_size(f);
+
+ signature_size = dumbfile_getnc( (char *)signature, maximum_signature_size, f );
+ dumbfile_seek( f, 0, DFS_SEEK_SET );
+
+ if (signature_size >= 4 &&
+ signature0 == 'I' && signature1 == 'M' &&
+ signature2 == 'P' && signature3 == 'M')
+ {
+ duh = dumb_read_it_quick( f );
+ }
+ else if (signature_size >= 17 && !memcmp(signature, "Extended Module: ", 17))
+ {
+ duh = dumb_read_xm_quick( f );
+ }
+ else if (signature_size >= 0x30 &&
+ signature0x2C == 'S' && signature0x2D == 'C' &&
+ signature0x2E == 'R' && signature0x2F == 'M')
+ {
+ duh = dumb_read_s3m_quick( f );
+ }
+ else if (signature_size >= 30 &&
+ /*signature28 == 0x1A &&*/ signature29 == 2 &&
+ ( ! strnicmp( ( const char * ) signature + 20, "!Scream!", 8 ) ||
+ ! strnicmp( ( const char * ) signature + 20, "BMOD2STM", 8 ) ||
+ ! strnicmp( ( const char * ) signature + 20, "WUZAMOD!", 8 ) ) )
+ {
+ duh = dumb_read_stm_quick( f );
+ }
+ else if (signature_size >= 2 &&
+ ((signature0 == 0x69 && signature1 == 0x66) ||
+ (signature0 == 0x4A && signature1 == 0x4E)))
+ {
+ duh = dumb_read_669_quick( f );
+ }
+ else if (signature_size >= 0x30 &&
+ signature0x2C == 'P' && signature0x2D == 'T' &&
+ signature0x2E == 'M' && signature0x2F == 'F')
+ {
+ duh = dumb_read_ptm_quick( f );
+ }
+ else if (signature_size >= 4 &&
+ signature0 == 'P' && signature1 == 'S' &&
+ signature2 == 'M' && signature3 == ' ')
+ {
+ duh = dumb_read_psm_quick( f, subsong );
+ }
+ else if (signature_size >= 4 &&
+ signature0 == 'P' && signature1 == 'S' &&
+ signature2 == 'M' && signature3 == 254)
+ {
+ duh = dumb_read_old_psm_quick( f );
+ }
+ else if (signature_size >= 3 &&
+ signature0 == 'M' && signature1 == 'T' &&
+ signature2 == 'M')
+ {
+ duh = dumb_read_mtm_quick( f );
+ }
+ else if ( signature_size >= 4 &&
+ signature0 == 'R' && signature1 == 'I' &&
+ signature2 == 'F' && signature3 == 'F')
+ {
+ duh = dumb_read_riff_quick( f );
+ }
+ else if ( signature_size >= 24 &&
+ !memcmp( signature, "ASYLUM Music Format", 19 ) &&
+ !memcmp( signature + 19, " V1.0", 5 ) )
+ {
+ duh = dumb_read_asy_quick( f );
+ }
+ else if ( signature_size >= 3 &&
+ signature0 == 'A' && signature1 == 'M' &&
+ signature2 == 'F')
+ {
+ duh = dumb_read_amf_quick( f );
+ }
+ else if ( signature_size >= 8 &&
+ !memcmp( signature, "OKTASONG", 8 ) )
+ {
+ duh = dumb_read_okt_quick( f );
+ }
+
+ if ( !duh )
+ {
+ dumbfile_seek( f, 0, DFS_SEEK_SET );
+ duh = dumb_read_mod_quick( f, restrict_ );
+ }
+
+ return duh;
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readany2.c Added

@@ -0,0 +1,29 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readany2.c - Code to detect and read any of the / / \ \
+ * module formats supported by DUMB | < / \_
+ * from an open file and do an initial | \/ /\ /
+ * run-through. \_ / > /
+ * | \ / /
+ * by Chris Moeller. | ' /
+ * \__/
+ */
+
+#include "dumb.h"
+
+
+
+DUH *dumb_read_any(DUMBFILE *f, int restrict_, int subsong)
+{
+ DUH *duh = dumb_read_any_quick(f, restrict_, subsong);
+	dumb_it_do_initial_runthrough(duh);
+	return duh;
+}

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readasy.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readasy.c Changed

@@ -35,7 +35,7 @@
 
 	pattern->n_rows = 64;
 
-	if ( dumbfile_getnc( buffer, 64 * 8 * 4, f ) != 64 * 8 * 4 )
+ if ( dumbfile_getnc( (char *) buffer, 64 * 8 * 4, f ) != 64 * 8 * 4 )
 		return -1;
 
 	/* compute number of entries */
@@ -71,7 +71,14 @@
 					entry->mask |= IT_ENTRY_INSTRUMENT;
 				}
 
-				_dumb_it_xm_convert_effect( buffer pos + 2 & 0x0F, buffer pos + 3 , entry, 1 );
+				_dumb_it_xm_convert_effect( buffer pos + 2 , buffer pos + 3 , entry, 1 );
+ 
+ // fixup
+ switch ( entry->effect ) {
+ case IT_SET_PANNING:
+ entry->effectvalue <<= 1;
+ break;
+ }
 
 				if ( entry->mask ) ++entry;
 			}
@@ -90,7 +97,7 @@
 
 static int it_asy_read_sample_header( IT_SAMPLE *sample, DUMBFILE *f )
 {
-	int finetune;
+	int finetune, key_offset;
 
 /**
 21 22 Chars Sample 1 name. If the name is not a full
@@ -101,7 +108,7 @@
 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 );
+ dumbfile_getnc( (char *) sample->name, 22, f );
 	sample->name22 = 0;
 
 	sample->filename0 = 0;
@@ -111,7 +118,7 @@
 	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 */
+	key_offset = ( signed char ) dumbfile_getc( f ); /* base key offset */
 	sample->length = dumbfile_igetl( f );
 	sample->loop_start = dumbfile_igetl( f );
 	sample->loop_end = sample->loop_start + dumbfile_igetl( f );
@@ -124,7 +131,7 @@
 	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->C5_speed = (int)( AMIGA_CLOCK / 214.0 * pow( DUMB_SEMITONE_BASE, key_offset ) );//( long )( 16726.0 * pow( DUMB_PITCH_BASE, finetune * 32 ) );
 	sample->finetune = finetune * 32;
 	// the above line might be wrong
 
@@ -212,7 +219,7 @@
 		return NULL;
 	}
 
-	if ( dumbfile_getnc( sigdata->order, sigdata->n_orders, f ) != sigdata->n_orders ||
+ if ( dumbfile_getnc( (char *) sigdata->order, sigdata->n_orders, f ) != sigdata->n_orders ||
 		dumbfile_skip( f, 256 - sigdata->n_orders ) ) {
 		free( sigdata->order );
 		free( sigdata );
@@ -296,10 +303,11 @@
 	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
 
 	for (i = 0; i < DUMB_IT_N_CHANNELS; i += 4) {
-		sigdata->channel_pani+0 = 16;
-		sigdata->channel_pani+1 = 48;
-		sigdata->channel_pani+2 = 48;
-		sigdata->channel_pani+3 = 16;
+		int sep = 32 * dumb_it_default_panning_separation / 100;
+		sigdata->channel_pani+0 = 32 - sep;
+		sigdata->channel_pani+1 = 32 + sep;
+		sigdata->channel_pani+2 = 32 + sep;
+		sigdata->channel_pani+3 = 32 - sep;
 	}
 
 	_dumb_it_fix_invalid_orders(sigdata);
@@ -323,7 +331,7 @@
 	{
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		tag11 = "ASYLUM Music Format";
 		return make_duh(-1, 2, (const char *const (*)2)tag, 1, &descptr, &sigdata);

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readdsmf.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readdsmf.c Changed

@@ -24,20 +24,22 @@
 #include "internal/it.h"
 #include "internal/riff.h"
 
-static int it_riff_dsmf_process_sample( IT_SAMPLE * sample, const unsigned char * data, int len )
+static int it_riff_dsmf_process_sample( IT_SAMPLE * sample, DUMBFILE * f, int len )
 {
 	int flags;
 
-	memcpy( sample->filename, data, 13 );
+ dumbfile_getnc( (char *) sample->filename, 13, f );
 	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 );
+ flags = dumbfile_igetw( f );
+ sample->default_volume = dumbfile_getc( f );
+ sample->length = dumbfile_igetl( f );
+ sample->loop_start = dumbfile_igetl( f );
+ sample->loop_end = dumbfile_igetl( f );
+ dumbfile_skip( f, 32 - 28 );
+ sample->C5_speed = dumbfile_igetw( f ) * 2;
+ dumbfile_skip( f, 36 - 34 );
+ dumbfile_getnc( (char *) sample->name, 28, f );
 	sample->name 28 = 0;
 
 	/*if ( data 0x38 || data 0x39 || data 0x3A || data 0x3B )
@@ -80,7 +82,7 @@
 	if ( ! sample->data )
 		return -1;
 
-	memcpy( sample->data, data + 64, sample->length );
+ dumbfile_getnc( sample->data, sample->length, f );
 
 	if ( ! ( flags & 2 ) )
 	{
@@ -91,39 +93,42 @@
 	return 0;
 }
 
-static int it_riff_dsmf_process_pattern( IT_PATTERN * pattern, const unsigned char * data, int len )
+static int it_riff_dsmf_process_pattern( IT_PATTERN * pattern, DUMBFILE * f, int len )
 {
-	int length, row, pos;
+ int length, row;
 	unsigned flags;
+ long start, end;
+ int p, q, r;
 	IT_ENTRY * entry;
 
-	length = data 0 | ( data 1 << 8 );
+ length = dumbfile_igetw( f );
 	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 ) {
+ start = dumbfile_pos( f );
+ end = start + len;
+
+ while ( (row < 64) && !dumbfile_error( f ) && (dumbfile_pos( f ) < end) ) {
+ p = dumbfile_getc( f );
+ if ( ! p ) {
 			++ row;
-			++ pos;
 			continue;
 		}
 
-		flags = data pos++ & 0xF0;
+ flags = p & 0xF0;
 
 		if (flags) {
 			++ pattern->n_entries;
-			if (flags & 0x80) pos ++;
-			if (flags & 0x40) pos ++;
-			if (flags & 0x20) pos ++;
-			if (flags & 0x10) pos += 2;
+ if (flags & 0x80) dumbfile_skip( f, 1 );
+ if (flags & 0x40) dumbfile_skip( f, 1 );
+ if (flags & 0x20) dumbfile_skip( f, 1 );
+ if (flags & 0x10) dumbfile_skip( f, 2 );
 		}
 	}
 
@@ -135,20 +140,21 @@
 	entry = pattern->entry;
 
 	row = 0;
-	pos = 0;
 
-	while ( ( row < 64 ) && ( pos < len ) )
+ if ( dumbfile_seek( f, start, DFS_SEEK_SET ) ) return -1;
+
+ while ( ( row < 64 ) && !dumbfile_error( f ) && ( dumbfile_pos( f ) < end ) )
 	{
-		if ( ! data pos )
+ p = dumbfile_getc( f );
+ if ( ! p )
 		{
 			IT_SET_END_ROW( entry );
 			++ entry;
 			++ row;
-			++ pos;
 			continue;
 		}
 
-		flags = data pos++ ;
+ flags = p;
 		entry->channel = flags & 0x0F;
 		entry->mask = 0;
 
@@ -156,35 +162,35 @@
 		{
 			if ( flags & 0x80 )
 			{
-				if ( data pos )
+ q = dumbfile_getc( f );
+ if ( q )
 				{
 					entry->mask |= IT_ENTRY_NOTE;
-					entry->note = data pos - 1;
+ entry->note = q - 1;
 				}
-				++ pos;
 			}
 
 			if ( flags & 0x40 )
 			{
-				if ( data pos )
+ q = dumbfile_getc( f );
+ if ( q )
 				{
 					entry->mask |= IT_ENTRY_INSTRUMENT;
-					entry->instrument = data pos ;
+ entry->instrument = q;
 				}
-				++ pos;
 			}
 
 			if ( flags & 0x20 )
 			{
 				entry->mask |= IT_ENTRY_VOLPAN;
-				entry->volpan = data pos ;
-				++ pos;
+ entry->volpan = dumbfile_getc( f );
 			}
 
 			if ( flags & 0x10 )
 			{
-				_dumb_it_xm_convert_effect( data pos , data pos + 1 , entry, 0 );
-				pos += 2;
+ q = dumbfile_getc( f );
+ r = dumbfile_getc( f );
+ _dumb_it_xm_convert_effect( q, r, entry, 0 );
 			}
 
 			if (entry->mask) entry++;
@@ -204,14 +210,12 @@
 	return 0;
 }
 
-static DUMB_IT_SIGDATA *it_riff_dsmf_load_sigdata( struct riff * stream )
+static DUMB_IT_SIGDATA *it_riff_dsmf_load_sigdata( DUMBFILE * f, 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;
@@ -225,7 +229,7 @@
 
 	found = 0;
 
-	for ( n = 0; n < stream->chunk_count; ++n )
+ for ( n = 0; (unsigned)n < stream->chunk_count; ++n )
 	{
 		struct riff_chunk * c = stream->chunks + n;
 		switch( c->type )
@@ -263,43 +267,47 @@
 
 	sigdata->n_instruments = 0;
 	sigdata->n_orders = 0;
+	sigdata->restart_position = 0;
 
 	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
 
 	for (n = 0; n < DUMB_IT_N_CHANNELS; n += 4) {
-		sigdata->channel_pann = 16;
-		sigdata->channel_pann+1 = 48;
-		sigdata->channel_pann+2 = 48;
-		sigdata->channel_pann+3 = 16;
+		int sep = 32 * dumb_it_default_panning_separation / 100;
+		sigdata->channel_pann = 32 - sep;
+		sigdata->channel_pann+1 = 32 + sep;
+		sigdata->channel_pann+2 = 32 + sep;
+		sigdata->channel_pann+3 = 32 - sep;
 	}
 
-	for ( n = 0; n < stream->chunk_count; ++n )
+ for ( n = 0; (unsigned)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 );
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_usd;
+ dumbfile_getnc( (char *) sigdata->name, 28, f );
 			sigdata->name 28 = 0;
 			sigdata->flags = IT_STEREO | IT_OLD_EFFECTS | IT_COMPATIBLE_GXX;
-			sigdata->n_orders = ptr 36 | ( ptr 37 << 8 );
+ dumbfile_skip( f, 36 - 28 );
+ sigdata->n_orders = dumbfile_igetw( f );
 			//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 ;
+ dumbfile_skip( f, 42 - 38 );
+ sigdata->n_pchannels = dumbfile_igetw( f );
+ sigdata->global_volume = dumbfile_getc( f );
+ sigdata->mixing_volume = dumbfile_getc( f );
+ sigdata->speed = dumbfile_getc( f );
+ sigdata->tempo = dumbfile_getc( f );
 
 			for ( o = 0; o < 16; ++o )
 			{
-				sigdata->channel_pan o = ptr 48 + o / 2;
+ sigdata->channel_pan o = dumbfile_getc( f ) / 2;
 			}
 
 			sigdata->order = malloc( 128 );
 			if ( ! sigdata->order ) goto error_usd;
-			memcpy( sigdata->order, ptr + 64, 128 );
+ dumbfile_getnc( (char *) sigdata->order, 128, f );
 
 			break;
 		}
@@ -321,18 +329,20 @@
 	sigdata->n_samples = 0;
 	sigdata->n_patterns = 0;
 
-	for ( n = 0; n < stream->chunk_count; ++n )
+ for ( n = 0; (unsigned)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;
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_usd;
+ if ( it_riff_dsmf_process_pattern( sigdata->pattern + sigdata->n_patterns, f, 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;
+ if ( dumbfile_seek( f, c->offset, DFS_SEEK_SET ) ) goto error_usd;
+ if ( it_riff_dsmf_process_sample( sigdata->sample + sigdata->n_samples, f, c->size ) ) goto error_usd;
 			++ sigdata->n_samples;
 			break;
 		}
@@ -351,13 +361,13 @@
 	return NULL;
 }
 
-DUH *dumb_read_riff_dsmf( struct riff * stream )
+DUH *dumb_read_riff_dsmf( DUMBFILE * f, struct riff * stream )
 {
 	sigdata_t *sigdata;
 
 	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
 
-	sigdata = it_riff_dsmf_load_sigdata( stream );
+ sigdata = it_riff_dsmf_load_sigdata( f, stream );
 
 	if (!sigdata)
 		return NULL;
@@ -365,7 +375,7 @@
 	{
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		tag11 = "RIFF DSMF";
 		return make_duh( -1, 2, ( const char * const (*) 2 ) tag, 1, & descptr, & sigdata );

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readmod.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readmod.c Changed

@@ -38,14 +38,14 @@
 	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);
+ dumbfile_getnc((char *)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);
+ dumbfile_getnc((char *)buffer + pos, 4*4, f);
 
 		n_channels = 8;
 	} else
-		dumbfile_getnc(buffer, 64 * n_channels * 4, f);
+ dumbfile_getnc((char *)buffer, 64 * n_channels * 4, f);
 
 	if (dumbfile_error(f))
 		return -1;
@@ -118,7 +118,7 @@
 
 
 
-static int it_mod_read_sample_header(IT_SAMPLE *sample, DUMBFILE *f)
+static int it_mod_read_sample_header(IT_SAMPLE *sample, DUMBFILE *f, int stk)
 {
 	int finetune, loop_start, loop_length;
 
@@ -131,7 +131,7 @@
 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);
+ dumbfile_getnc((char *)sample->name, 22, f);
 	sample->name22 = 0;
 
 	sample->filename0 = 0;
@@ -141,7 +141,8 @@
 /** 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_start = dumbfile_mgetw(f);
+	if ( !stk ) loop_start <<= 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;
@@ -197,8 +198,10 @@
 	} else {
 		truncated_size = 0;
 	}
+
 	if (sample->length) {
 		sample->data = malloc(sample->length);
+
 		if (!sample->data)
 			return -1;
 
@@ -268,198 +271,27 @@
 
 
 
-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->bufferedbm->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->bufferedMOD_FFT_OFFSET << 24
-			 | (unsigned long)bm->bufferedMOD_FFT_OFFSET+1 << 16
-			 | (unsigned long)bm->bufferedMOD_FFT_OFFSET+2 << 8
-			 | (unsigned long)bm->bufferedMOD_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)
+static DUMB_IT_SIGDATA *it_mod_load_sigdata(DUMBFILE *f, int restrict_)
 {
 	DUMB_IT_SIGDATA *sigdata;
 	int n_channels;
 	int i;
-	unsigned long fft = 0;
-	DUMBFILE *rem;
+	unsigned long fft;
 
-	f = dumbfile_buffer_mod(f, &fft);
-	if (!f)
-		return NULL;
+ if ( dumbfile_seek(f, MOD_FFT_OFFSET, DFS_SEEK_SET) )
+ return NULL;
 
-	sigdata = malloc(sizeof(*sigdata));
-	if (!sigdata) {
-		dumbfile_close(f);
-		return NULL;
-	}
+ fft = dumbfile_mgetl(f);
+ if (dumbfile_error(f))
+ return NULL;
+
+ if ( dumbfile_seek(f, 0, DFS_SEEK_SET) )
+ return NULL;
 
 	sigdata = malloc(sizeof(*sigdata));
 	if (!sigdata) {
-		dumbfile_close(f);
 		return NULL;
 	}
 
@@ -468,10 +300,9 @@
 full 20 chars in length, it will be null-
 terminated.
 	*/
-	if (dumbfile_getnc(sigdata->name, 20, f) < 20) {
+ if (dumbfile_getnc((char *)sigdata->name, 20, f) < 20) {
 		free(sigdata);
-		dumbfile_close(f);
-		return NULL;
+ return NULL;
 	}
 	sigdata->name20 = 0;
 
@@ -554,11 +385,10 @@
 	}
 
 	// moo
-	if ( restr && sigdata->n_samples == 15 )
+	if ( ( restrict_ & 1 ) && sigdata->n_samples == 15 )
 	{
 		free(sigdata);
-		dumbfile_close(f);
-		return NULL;
+ return NULL;
 	}
 
 	sigdata->n_pchannels = n_channels ? n_channels : 8; /* special case for 0, see above */
@@ -566,8 +396,7 @@
 	sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
 	if (!sigdata->sample) {
 		free(sigdata);
-		dumbfile_close(f);
-		return NULL;
+ return NULL;
 	}
 
 	sigdata->song_message = NULL;
@@ -583,10 +412,9 @@
 		sigdata->samplei.data = NULL;
 
 	for (i = 0; i < sigdata->n_samples; i++) {
-		if (it_mod_read_sample_header(&sigdata->samplei, f)) {
+		if (it_mod_read_sample_header(&sigdata->samplei, f, sigdata->n_samples == 15)) {
 			_dumb_it_unload_sigdata(sigdata);
-			dumbfile_close(f);
-			return NULL;
+ return NULL;
 		}
 	}
 
@@ -596,8 +424,7 @@
 
 /*	if (sigdata->n_orders <= 0 || sigdata->n_orders > 128) { // is this right?
 		_dumb_it_unload_sigdata(sigdata);
-		dumbfile_close(f);
-		return NULL;
+ return NULL;
 	}*/
 
 	//if (sigdata->restart_position >= sigdata->n_orders)
@@ -606,13 +433,11 @@
 	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;
+ return NULL;
 	}
-	if (dumbfile_getnc(sigdata->order, 128, f) < 128) {
+ if (dumbfile_getnc((char *)sigdata->order, 128, f) < 128) {
 		_dumb_it_unload_sigdata(sigdata);
-		dumbfile_close(f);
-		return NULL;
+ return NULL;
 	}
 
 	if (sigdata->n_orders <= 0 || sigdata->n_orders > 128) { // is this right?
@@ -633,12 +458,71 @@
 	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->orderi)
-			sigdata->n_patterns = sigdata->orderi;
-	sigdata->n_patterns++;
+
+ if ( ( restrict_ & 2 ) )
+	{
+ unsigned char buffer5;
+ long sample_number;
+ long total_sample_size;
+ long offset = dumbfile_pos(f);
+ long remain = dumbfile_get_size(f) - offset;
+ if ( dumbfile_error( f ) ||
+ dumbfile_seek( f, 0, SEEK_END ) ) {
+ _dumb_it_unload_sigdata(sigdata);
+ return NULL;
+ }
+ sample_number = sigdata->n_samples - 1;
+ total_sample_size = 0;
+ while (dumbfile_pos(f) > offset && sample_number >= 0) {
+ if (sigdata->samplesample_number.flags & IT_SAMPLE_EXISTS) {
+ if ( dumbfile_seek(f, -((sigdata->samplesample_number.length + 1) / 2 + 5 + 16), DFS_SEEK_CUR) ||
+ dumbfile_getnc((char *)buffer, 5, f) < 5 ) {
+ _dumb_it_unload_sigdata(sigdata);
+ return NULL;
+ }
+ if ( !memcmp( buffer, "ADPCM", 5 ) ) { /* BAH */
+ total_sample_size += (sigdata->samplesample_number.length + 1) / 2 + 5 + 16;
+ if ( dumbfile_seek(f, -5, DFS_SEEK_CUR) ) {
+ _dumb_it_unload_sigdata(sigdata);
+ return NULL;
+ }
+ } else {
+ total_sample_size += sigdata->samplesample_number.length;
+ if ( dumbfile_seek(f, -(sigdata->samplesample_number.length - ((sigdata->samplesample_number.length + 1) / 2 + 5 + 16) + 5), DFS_SEEK_CUR) ) {
+ _dumb_it_unload_sigdata(sigdata);
+ return NULL;
+ }
+ }
+ }
+ --sample_number;
+ }
+
+		if (remain > total_sample_size) {
+			sigdata->n_patterns = ( remain - total_sample_size + 4 ) / ( 256 * sigdata->n_pchannels );
+			if (fft == DUMB_ID('M',0,0,0) || fft == DUMB_ID('8',0,0,0)) {
+				remain -= sigdata->n_patterns * 256 * sigdata->n_pchannels;
+				if (dumbfile_skip(f, remain - total_sample_size)) {
+					_dumb_it_unload_sigdata(sigdata);
+					return NULL;
+				}
+			}
+		}
+	}
+	else
+ {
+ for (i = 0; i < 128; i++)
+ {
+ if (sigdata->orderi > sigdata->n_patterns)
+ sigdata->n_patterns = sigdata->orderi;
+ }
+		sigdata->n_patterns++;
+	}
+
+	if ( sigdata->n_patterns <= 0 ) {
+		_dumb_it_unload_sigdata(sigdata);
+		return NULL;
+	}
 
 	/* May as well try to save a tiny bit of memory. */
 	if (sigdata->n_orders < 128) {
@@ -649,7 +533,6 @@
 	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++)
@@ -657,57 +540,25 @@
 
 	/* Read in the patterns */
 	{
-		unsigned char *buffer = malloc(256 * n_channels); /* 64 rows * 4 bytes */
+		unsigned char *buffer = malloc(256 * sigdata->n_pchannels); /* 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->patterni, 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->samplei.flags & IT_SAMPLE_EXISTS) {
-				skip += sigdata->samplei.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->samplei, f, fft)) {
 			_dumb_it_unload_sigdata(sigdata);
-			dumbfile_close(f);
-			if (rem) dumbfile_close(rem);
 			return NULL;
 		}
 	}
@@ -730,10 +581,6 @@
 		}
 	}*/
 
-	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;
 
@@ -749,10 +596,11 @@
 	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
 
 	for (i = 0; i < DUMB_IT_N_CHANNELS; i += 4) {
-		sigdata->channel_pani+0 = 16;
-		sigdata->channel_pani+1 = 48;
-		sigdata->channel_pani+2 = 48;
-		sigdata->channel_pani+3 = 16;
+		int sep = 32 * dumb_it_default_panning_separation / 100;
+		sigdata->channel_pani+0 = 32 - sep;
+		sigdata->channel_pani+1 = 32 + sep;
+		sigdata->channel_pani+2 = 32 + sep;
+		sigdata->channel_pani+3 = 32 - sep;
 	}
 
 	_dumb_it_fix_invalid_orders(sigdata);
@@ -760,13 +608,15 @@
 	return sigdata;
 }
 
-DUH *dumb_read_mod_quick(DUMBFILE *f, int restr)
+
+
+DUH *dumb_read_mod_quick(DUMBFILE *f, int restrict_)
 {
 	sigdata_t *sigdata;
 
 	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
 
-	sigdata = it_mod_load_sigdata(f, restr);
+	sigdata = it_mod_load_sigdata(f, restrict_);
 
 	if (!sigdata)
 		return NULL;
@@ -774,7 +624,7 @@
 	{
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		tag11 = "MOD";
 		return make_duh(-1, 2, (const char *const (*)2)tag, 1, &descptr, &sigdata);

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readmod2.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readmod2.c Changed

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readmtm.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readmtm.c Changed

@@ -96,7 +96,7 @@
 {
 	int finetune, flags;
 
-	dumbfile_getnc(sample->name, 22, f);
+ dumbfile_getnc((char *)sample->name, 22, f);
 	sample->name22 = 0;
 
 	sample->filename0 = 0;
@@ -195,7 +195,7 @@
 	sigdata = malloc(sizeof(*sigdata));
 	if (!sigdata) goto error;
 
-	dumbfile_getnc(sigdata->name, 20, f);
+ dumbfile_getnc((char *)sigdata->name, 20, f);
 	sigdata->name20 = 0;
 
 	n_tracks = dumbfile_igetw(f);
@@ -216,7 +216,7 @@
 
 	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
 
-	if (dumbfile_getnc(sigdata->channel_pan, 32, f) < 32) goto error_sd;
+ if (dumbfile_getnc((char *)sigdata->channel_pan, 32, f) < 32) goto error_sd;
 
 	for (n = 0; n < 32; n++) {
 		if (sigdata->channel_pann <= 15) {
@@ -229,10 +229,11 @@
 	}
 
 	for (n = 32; n < DUMB_IT_N_CHANNELS; n += 4) {
-		sigdata->channel_pann = 16;
-		sigdata->channel_pann+1 = 48;
-		sigdata->channel_pann+2 = 48;
-		sigdata->channel_pann+3 = 16;
+		int sep = 32 * dumb_it_default_panning_separation / 100;
+		sigdata->channel_pann = 32 - sep;
+		sigdata->channel_pann+1 = 32 + sep;
+		sigdata->channel_pann+2 = 32 + sep;
+		sigdata->channel_pann+3 = 32 - sep;
 	}
 
 	sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
@@ -268,14 +269,14 @@
 	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 (dumbfile_getnc((char *)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;
+ if (dumbfile_getnc((char *)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;
@@ -395,7 +396,7 @@
 		char version16;
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		version0 = 'M';
 		version1 = 'T';

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readokt.c Added

@@ -0,0 +1,558 @@
+/* _______ ____ __ ___ ___
+ * \ _ \ \ / \ / \ \ / / ' ' '
+ * | | \ \ | | || | \/ | . .
+ * | | | | | | || ||\ /| |
+ * | | | | | | || || \/ | | ' ' '
+ * | | | | | | || || | | . .
+ * | |_/ / \ \__// || | |
+ * /_______/ynamic \____/niversal /__\ /____\usic /| . . ibliotheque
+ * / \
+ * / . \
+ * readokt.c - Code to read an Oktalyzer 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_okt_read_pattern(IT_PATTERN *pattern, const unsigned char *data, int length, int n_channels)
+{
+	int pos;
+	int channel;
+	int row;
+	int n_rows;
+	IT_ENTRY *entry;
+
+	if (length < 2) return -1;
+
+	n_rows = (data0 << 8) | data1;
+	if (!n_rows) n_rows = 64;
+
+	if (length < 2 + (n_rows * n_channels * 4)) return -1;
+
+	pattern->n_rows = n_rows;
+
+	/* compute number of entries */
+	pattern->n_entries = n_rows; /* Account for the row end markers */
+	pos = 2;
+	for (row = 0; row < pattern->n_rows; row++) {
+		for (channel = 0; channel < n_channels; channel++) {
+			if (datapos+0 | datapos+2)
+				pattern->n_entries++;
+			pos += 4;
+		}
+	}
+
+	pattern->entry = (IT_ENTRY *) malloc(pattern->n_entries * sizeof(*pattern->entry));
+	if (!pattern->entry)
+		return -1;
+
+	entry = pattern->entry;
+	pos = 2;
+	for (row = 0; row < n_rows; row++) {
+		for (channel = 0; channel < n_channels; channel++) {
+			if (datapos+0 | datapos+2) {
+				entry->channel = channel;
+				entry->mask = 0;
+
+				if (datapos+0 > 0 && datapos+0 <= 36) {
+					entry->mask |= IT_ENTRY_NOTE | IT_ENTRY_INSTRUMENT;
+
+					entry->note = datapos+0 + 35;
+					entry->instrument = datapos+1 + 1;
+				}
+
+				entry->effect = 0;
+				entry->effectvalue = datapos+3;
+
+				switch (datapos+2) {
+				case 2: if (datapos+3) entry->effect = IT_PORTAMENTO_DOWN; break; // XXX code calls this rs_portu, but it's adding to the period, which decreases the pitch
+				case 13: if (datapos+3) entry->effect = IT_OKT_NOTE_SLIDE_DOWN; break;
+				case 21: if (datapos+3) entry->effect = IT_OKT_NOTE_SLIDE_DOWN_ROW; break;
+
+				case 1: if (datapos+3) entry->effect = IT_PORTAMENTO_UP; break; // XXX same deal here, increasing the pitch
+				case 17: if (datapos+3) entry->effect = IT_OKT_NOTE_SLIDE_UP; break;
+				case 30: if (datapos+3) entry->effect = IT_OKT_NOTE_SLIDE_UP_ROW; break;
+
+				case 10: if (datapos+3) entry->effect = IT_OKT_ARPEGGIO_3; break;
+				case 11: if (datapos+3) entry->effect = IT_OKT_ARPEGGIO_4; break;
+				case 12: if (datapos+3) entry->effect = IT_OKT_ARPEGGIO_5; break;
+
+				case 15: entry->effect = IT_S; entry->effectvalue = EFFECT_VALUE(IT_S_SET_FILTER, datapos+3 & 0x0F); break;
+
+				case 25: entry->effect = IT_JUMP_TO_ORDER; break;
+
+				case 27: entry->note = IT_NOTE_OFF; entry->mask |= IT_ENTRY_NOTE; break;
+
+				case 28: entry->effect = IT_SET_SPEED; break;
+
+				case 31:
+					if ( datapos+3 <= 0x40 ) entry->effect = IT_SET_CHANNEL_VOLUME;
+					else if ( datapos+3 <= 0x50 ) { entry->effect = IT_OKT_VOLUME_SLIDE_DOWN; entry->effectvalue = datapos+3 - 0x40; }
+					else if ( datapos+3 <= 0x60 ) { entry->effect = IT_OKT_VOLUME_SLIDE_UP; entry->effectvalue = datapos+3 - 0x50; }
+					else if ( datapos+3 <= 0x70 ) { entry->effect = IT_OKT_VOLUME_SLIDE_DOWN; entry->effectvalue = datapos+3 - 0x50; }
+					else if ( datapos+3 <= 0x80 ) { entry->effect = IT_OKT_VOLUME_SLIDE_UP; entry->effectvalue = datapos+3 - 0x60; }
+					break;
+				}
+
+				if ( entry->effect ) entry->mask |= IT_ENTRY_EFFECT;
+
+				entry++;
+			}
+			pos += 4;
+		}
+		IT_SET_END_ROW(entry);
+		entry++;
+	}
+
+	return 0;
+}
+
+
+
+static void it_okt_read_sample_header(IT_SAMPLE *sample, const unsigned char * data)
+{
+	int loop_start, loop_length;
+
+	memcpy(sample->name, data, 20);
+	sample->name20 = 0;
+
+	sample->filename0 = 0;
+
+	sample->length = (data20 << 24) | (data21 << 16) | (data22 << 8) | data23;
+	sample->global_volume = 64;
+	sample->default_volume = data29;
+	loop_start = ((data24 << 8) | data25) << 1;
+	loop_length = ((data26 << 8) | data27) << 1;
+	sample->sus_loop_start = loop_start;
+	sample->sus_loop_end = loop_start + loop_length;
+
+	if (sample->length <= 0) {
+		sample->flags = 0;
+		return;
+	}
+
+	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 = 0;
+
+	if (sample->sus_loop_end > sample->length)
+		sample->sus_loop_end = sample->length;
+
+	if (loop_length > 2)
+		sample->flags |= IT_SAMPLE_SUS_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;
+}
+
+
+
+static int it_okt_read_sample_data(IT_SAMPLE *sample, const char * data, int length)
+{
+	if (length && sample->length) {
+		if (length < sample->length) {
+			sample->length = length;
+			if (length < sample->sus_loop_end) sample->sus_loop_end = length;
+		}
+
+		sample->data = malloc(length);
+
+		if (!sample->data)
+			return -1;
+
+		memcpy(sample->data, data, length);
+	}
+
+	return 0;
+}
+
+
+
+typedef struct IFF_CHUNK IFF_CHUNK;
+typedef struct IFF_CHUNKED IFF_CHUNKED;
+
+struct IFF_CHUNK
+{
+	unsigned type;
+	unsigned char * data;
+	unsigned size;
+};
+
+struct IFF_CHUNKED
+{
+	unsigned chunk_count;
+	IFF_CHUNK * chunks;
+};
+
+
+
+static IFF_CHUNKED *dumbfile_read_okt(DUMBFILE *f)
+{
+	IFF_CHUNKED *mod = (IFF_CHUNKED *) malloc(sizeof(*mod));
+	if (!mod) return NULL;
+
+	mod->chunk_count = 0;
+	mod->chunks = 0;
+
+	for (;;)
+	{
+		long bytes_read;
+		IFF_CHUNK * chunk = ( IFF_CHUNK * ) realloc( mod->chunks, ( mod->chunk_count + 1 ) * sizeof( IFF_CHUNK ) );
+		if ( !chunk )
+		{
+			if ( mod->chunks ) free( mod->chunks );
+			free( mod );
+			return NULL;
+		}
+		mod->chunks = chunk;
+		chunk += mod->chunk_count;
+
+		bytes_read = dumbfile_mgetl( f );
+		if ( bytes_read < 0 ) break;
+
+		chunk->type = bytes_read;
+		chunk->size = dumbfile_mgetl( f );
+
+		if ( dumbfile_error( f ) ) break;
+
+		chunk->data = (unsigned char *) malloc( chunk->size );
+		if ( !chunk->data )
+		{
+			free( mod->chunks );
+			free( mod );
+			return NULL;
+		}
+
+		bytes_read = dumbfile_getnc( ( char * ) chunk->data, chunk->size, f );
+		if ( bytes_read < chunk->size )
+		{
+			if ( bytes_read <= 0 ) {
+				free( chunk->data );
+				break;
+			} else {
+				chunk->size = bytes_read;
+				mod->chunk_count++;
+				break;
+			}
+		}
+
+		mod->chunk_count++;
+	}
+
+	if ( !mod->chunk_count ) {
+		if ( mod->chunks ) free(mod->chunks);
+		free(mod);
+		mod = NULL;
+	}
+
+	return mod;
+}
+
+void free_okt(IFF_CHUNKED * mod)
+{
+	unsigned i;
+	if (mod)
+	{
+		if (mod->chunks)
+		{
+			for (i = 0; i < mod->chunk_count; i++)
+			{
+				if (mod->chunksi.data) free(mod->chunksi.data);
+			}
+			free(mod->chunks);
+		}
+		free(mod);
+	}
+}
+
+const IFF_CHUNK * get_chunk_by_type(IFF_CHUNKED * mod, unsigned type, unsigned offset)
+{
+	unsigned i;
+	if (mod)
+	{
+		if (mod->chunks)
+		{
+			for (i = 0; i < mod->chunk_count; i++)
+			{
+				if (mod->chunksi.type == type)
+				{
+					if (!offset) return &mod->chunksi;
+					else offset--;
+				}
+			}
+		}
+	}
+	return NULL;
+}
+
+unsigned get_chunk_count(IFF_CHUNKED *mod, unsigned type)
+{
+	unsigned i, count = 0;
+	if (mod)
+	{
+		if (mod->chunks)
+		{
+			for (i = 0; i < mod->chunk_count; i++)
+			{
+				if (mod->chunksi.type == type) count++;
+			}
+		}
+	}
+	return count;
+}
+
+
+static DUMB_IT_SIGDATA *it_okt_load_sigdata(DUMBFILE *f)
+{
+	DUMB_IT_SIGDATA *sigdata;
+ int n_channels;
+ int i, j, k, l;
+	IFF_CHUNKED *mod;
+	const IFF_CHUNK *chunk;
+
+	char signature8;
+
+	if (dumbfile_getnc(signature, 8, f) < 8 ||
+		memcmp(signature, "OKTASONG", 8)) {
+		return NULL;
+	}
+
+	mod = dumbfile_read_okt(f);
+	if (!mod)
+		return NULL;
+
+	sigdata = (DUMB_IT_SIGDATA *) malloc(sizeof(*sigdata));
+	if (!sigdata) {
+		free_okt(mod);
+		return NULL;
+	}
+
+	sigdata->name0 = 0;
+
+	chunk = get_chunk_by_type(mod, DUMB_ID('S','P','E','E'), 0);
+	if (!chunk || chunk->size < 2) {
+		free(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+
+	sigdata->speed = (chunk->data0 << 8) | chunk->data1;
+
+	chunk = get_chunk_by_type(mod, DUMB_ID('S','A','M','P'), 0);
+	if (!chunk || chunk->size < 32) {
+		free(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+
+	sigdata->n_samples = chunk->size / 32;
+
+	chunk = get_chunk_by_type(mod, DUMB_ID('C','M','O','D'), 0);
+	if (!chunk || chunk->size < 8) {
+		free(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+
+	n_channels = 0;
+
+	for (i = 0; i < 4; i++) {
+		j = (chunk->datai * 2 << 8) | chunk->datai * 2 + 1;
+		if (!j) n_channels++;
+		else if (j == 1) n_channels += 2;
+	}
+
+	if (!n_channels) {
+		free(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+
+	sigdata->n_pchannels = n_channels;
+
+	sigdata->sample = (IT_SAMPLE *) malloc(sigdata->n_samples * sizeof(*sigdata->sample));
+	if (!sigdata->sample) {
+		free(sigdata);
+		free_okt(mod);
+		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->samplei.data = NULL;
+
+	chunk = get_chunk_by_type(mod, DUMB_ID('S','A','M','P'), 0);
+
+	for (i = 0; i < sigdata->n_samples; i++) {
+		it_okt_read_sample_header(&sigdata->samplei, chunk->data + 32 * i);
+	}
+
+	sigdata->restart_position = 0;
+
+	chunk = get_chunk_by_type(mod, DUMB_ID('P','L','E','N'), 0);
+	if (!chunk || chunk->size < 2) {
+		_dumb_it_unload_sigdata(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+
+	sigdata->n_orders = (chunk->data0 << 8) | chunk->data1;
+	// what if this is > 128?
+
+	if (sigdata->n_orders <= 0 || sigdata->n_orders > 128) {
+		_dumb_it_unload_sigdata(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+
+	chunk = get_chunk_by_type(mod, DUMB_ID('P','A','T','T'), 0);
+ if (!chunk || chunk->size < (unsigned)sigdata->n_orders) {
+		_dumb_it_unload_sigdata(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+
+	sigdata->order = (unsigned char *) malloc(sigdata->n_orders);
+	if (!sigdata->order) {
+		_dumb_it_unload_sigdata(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+
+	memcpy(sigdata->order, chunk->data, sigdata->n_orders);
+
+	/* Work out how many patterns there are. */
+	chunk = get_chunk_by_type(mod, DUMB_ID('S','L','E','N'), 0);
+	if (!chunk || chunk->size < 2) {
+		_dumb_it_unload_sigdata(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+
+	sigdata->n_patterns = (chunk->data0 << 8) | chunk->data1;
+
+	j = get_chunk_count(mod, DUMB_ID('P','B','O','D'));
+	if (sigdata->n_patterns > j) sigdata->n_patterns = j;
+
+	if (!sigdata->n_patterns) {
+		_dumb_it_unload_sigdata(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+
+	sigdata->pattern = (IT_PATTERN *) malloc(sigdata->n_patterns * sizeof(*sigdata->pattern));
+	if (!sigdata->pattern) {
+		_dumb_it_unload_sigdata(sigdata);
+		free_okt(mod);
+		return NULL;
+	}
+	for (i = 0; i < sigdata->n_patterns; i++)
+		sigdata->patterni.entry = NULL;
+
+	/* Read in the patterns */
+	for (i = 0; i < sigdata->n_patterns; i++) {
+		chunk = get_chunk_by_type(mod, DUMB_ID('P','B','O','D'), i);
+		if (it_okt_read_pattern(&sigdata->patterni, chunk->data, chunk->size, n_channels) != 0) {
+			_dumb_it_unload_sigdata(sigdata);
+			free_okt(mod);
+			return NULL;
+		}
+	}
+
+	/* And finally, the sample data */
+	k = get_chunk_count(mod, DUMB_ID('S','B','O','D'));
+	for (i = 0, j = 0; i < sigdata->n_samples && j < k; i++) {
+		if (sigdata->samplei.flags & IT_SAMPLE_EXISTS) {
+			chunk = get_chunk_by_type(mod, DUMB_ID('S','B','O','D'), j);
+			if (it_okt_read_sample_data(&sigdata->samplei, (const char *)chunk->data, chunk->size)) {
+				_dumb_it_unload_sigdata(sigdata);
+				free_okt(mod);
+				return NULL;
+			}
+			j++;
+		}
+	}
+	for (; i < sigdata->n_samples; i++) {
+		sigdata->samplei.flags = 0;
+	}
+
+	chunk = get_chunk_by_type(mod, DUMB_ID('C','M','O','D'), 0);
+
+	for (i = 0, j = 0; i < n_channels && j < 4; j++) {
+		k = (chunk->dataj * 2 << 8) | chunk->dataj * 2 + 1;
+		l = (j == 1 || j == 2) ? 48 : 16;
+		if (k == 0) {
+			sigdata->channel_pani++ = l;
+		}
+		else if (k == 1) {
+			sigdata->channel_pani++ = l;
+			sigdata->channel_pani++ = l;
+		}
+	}
+
+	free_okt(mod);
+
+	/* Now let's initialise the remaining variables, and we're done! */
+	sigdata->flags = IT_WAS_AN_OKT | 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->tempo = 125;
+	sigdata->pan_separation = 128;
+
+	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
+	memset(sigdata->channel_pan + n_channels, 32, DUMB_IT_N_CHANNELS - n_channels);
+
+	_dumb_it_fix_invalid_orders(sigdata);
+
+	return sigdata;
+}
+
+
+
+DUH *dumb_read_okt_quick(DUMBFILE *f)
+{
+	sigdata_t *sigdata;
+
+	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
+
+ sigdata = it_okt_load_sigdata(f);
+
+	if (!sigdata)
+		return NULL;
+
+	{
+		const char *tag12;
+		tag00 = "FORMAT";
+		tag01 = "Oktalyzer";
+		return make_duh(-1, 1, (const char *const (*)2)tag, 1, &descptr, &sigdata);
+	}
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readokt2.c Added

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

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readoldpsm.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readoldpsm.c Changed

@@ -33,19 +33,18 @@
 	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)
+static int it_old_psm_read_samples(IT_SAMPLE ** sample, DUMBFILE * f, int * num)
 {
-	int n, o, pos, count = *num, true_num, snum, offset, flags, finetune, delta;
+ int n, o, count = *num, true_num, snum, offset, flags, finetune, delta;
 
-	unsigned char * buffer, * sbuffer = 0;
+ unsigned char * buffer;
 	const unsigned char * sdata;
+ long sample_bytes;
 
 	buffer = malloc(count * 64);
 	if (!buffer) goto error;
 
-	if (dumbfile_getnc(buffer, count * 64, f) < count * 64) goto error_fb;
-
-	pos = dumbfile_pos(f);
+ if (dumbfile_getnc((char *)buffer, count * 64, f) < count * 64) goto error_fb;
 
 	true_num = 0;
 
@@ -94,7 +93,8 @@
 		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 & 15) {
+			finetune &= 15;
 			if (finetune >= 8) finetune -= 16;
 			//s->C5_speed = (long)((double)s->C5_speed * pow(DUMB_PITCH_BASE, finetune*32));
 			s->finetune = finetune * 32;
@@ -127,22 +127,12 @@
 		s->vibrato_waveform = IT_VIBRATO_SINE;
 		s->max_resampling_quality = -1;
 
-		s->data = malloc(s->length * ((flags & 4) ? 2 : 1));
+ sample_bytes = s->length * ((flags & 4) ? 2 : 1);
+ s->data = malloc(sample_bytes);
 		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 (dumbfile_seek(f, offset, DFS_SEEK_SET) || dumbfile_getnc(s->data, sample_bytes, f) < sample_bytes) goto error_fb;
+ sdata = ( const unsigned char * ) s->data;
 
 		if (flags & 0x10) {
 			if (flags & 8) {
@@ -179,8 +169,8 @@
 			} else {
 				if (flags & 4) {
 					for (o = 0; o < s->length; o++) {
-						delta += (short)(sdatao * 2 | (sdata(o * 2) + 1 << 8));
-						((short *)s->data)o = delta;
+						delta += (signed short)(sdatao * 2 | (sdata(o * 2) + 1 << 8));
+						((signed short *)s->data)o = delta;
 					}
 				} else {
 					for (o = 0; o < s->length; o++) {
@@ -190,26 +180,19 @@
 				}
 			}
 		}
-
-		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)
+static int it_old_psm_read_patterns(IT_PATTERN * pattern, DUMBFILE * f, int num, int size, int pchans)
 {
 	int n, offset, psize, rows, chans, row, flags, channel;
 
@@ -220,7 +203,7 @@
 	buffer = malloc(size);
 	if (!buffer) goto error;
 
-	if (dumbfile_getnc(buffer, size, f) < size) goto error_fb;
+ if (dumbfile_getnc((char *)buffer, size, f) < size) goto error_fb;
 
 	offset = 0;
 
@@ -289,12 +272,12 @@
 				if (channel >= chans)
 				{
 					//channel = 0;
-					goto error_fb;
+					//goto error_fb;
 				}
 				if (flags & 0x80) {
 					if ((*ptr < 60) && (channel < pchans)) {
 						entry->mask |= IT_ENTRY_NOTE;
-						entry->note = *ptr + 36;
+						entry->note = *ptr + 35;
 					}
 					ptr++;
 					if (*ptr) {
@@ -481,7 +464,7 @@
 			}
 		}
 
-		p->n_entries = entry - p->entry;
+		p->n_entries = (int)(entry - p->entry);
 		offset += psize;
 	}
 
@@ -510,16 +493,14 @@
 
 static int psm_component_compare(const void *e1, const void *e2)
 {
-	return ((const PSM_COMPONENT *)e1)->offset -
-	 ((const PSM_COMPONENT *)e2)->offset;
+	return (int)(((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;
 
@@ -530,7 +511,7 @@
 	sigdata = malloc(sizeof(*sigdata));
 	if (!sigdata) goto error;
 
-	if (dumbfile_getnc(sigdata->name, 60, f) < 60 ||
+ if (dumbfile_getnc((char *)sigdata->name, 60, f) < 60 ||
 		sigdata->name59 != 0x1A) goto error_sd;
 	sigdata->name59 = 0;
 
@@ -609,7 +590,7 @@
 
 	if (!n_components) goto error_fc;
 
-	total_pattern_size = dumbfile_igetl(f);
+	total_pattern_size = (int)dumbfile_igetl(f);
 	if (!total_pattern_size) goto error_fc;
 
 	qsort(component, n_components, sizeof(PSM_COMPONENT), &psm_component_compare);
@@ -617,43 +598,31 @@
 	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
 
 	for (n = 0; n < DUMB_IT_N_CHANNELS; n += 4) {
-		sigdata->channel_pann = 16;
-		sigdata->channel_pann+1 = 48;
-		sigdata->channel_pann+2 = 48;
-		sigdata->channel_pann+3 = 16;
+		int sep = 32 * dumb_it_default_panning_separation / 100;
+		sigdata->channel_pann = 32 - sep;
+		sigdata->channel_pann+1 = 32 + sep;
+		sigdata->channel_pann+2 = 32 + sep;
+		sigdata->channel_pann+3 = 32 - sep;
 	}
 
 	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 > componentn.offset) goto error_fc;
-
-		data_size = componentn.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;
-		}
+ if ( dumbfile_seek(f, componentn.offset, DFS_SEEK_SET) ) goto error_fc;
 
 		switch (componentn.type) {
 
 			case PSM_COMPONENT_ORDERS:
-				if (dumbfile_getnc(sigdata->order, sigdata->n_orders, f) < sigdata->n_orders) goto error_fp;
+ if (dumbfile_getnc((char *)sigdata->order, sigdata->n_orders, f) < sigdata->n_orders) goto error_fc;
 				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;
+ goto error_fc;
+ if (dumbfile_igetw(f)) goto error_fc;
 				break;
 
 			case PSM_COMPONENT_PANPOS:
-				if (dumbfile_getnc(sigdata->channel_pan, sigdata->n_pchannels, f) < sigdata->n_pchannels) goto error_fp;
+ if (dumbfile_getnc((char *)sigdata->channel_pan, sigdata->n_pchannels, f) < sigdata->n_pchannels) goto error_fc;
 				for (o = 0; o < sigdata->n_pchannels; o++) {
 					sigdata->channel_pano -= (sigdata->channel_pano & 8) >> 3;
 					sigdata->channel_pano = ((int)sigdata->channel_pano << 5) / 7;
@@ -661,11 +630,11 @@
 				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;
+ if (it_old_psm_read_patterns(sigdata->pattern, f, sigdata->n_patterns, total_pattern_size, sigdata->n_pchannels)) goto error_fc;
 				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;
+ if (it_old_psm_read_samples(&sigdata->sample, f, &sigdata->n_samples)) goto error_fc;
 				break;
 
 			case PSM_COMPONENT_COMMENTS:
@@ -673,17 +642,12 @@
 					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;
+ if (dumbfile_getnc((char *)sigdata->song_message, o, f) < o) goto error_fc;
 						sigdata->song_messageo = 0;
 					}
 				}
 				break;
 		}
-
-		if (ptr) {
-			free(ptr);
-			ptr = 0;
-		}
 	}
 
 	_dumb_it_fix_invalid_orders(sigdata);
@@ -692,8 +656,6 @@
 
 	return sigdata;
 
-error_fp:
-	if (ptr) free(ptr);
 error_fc:
 	free(component);
 error_usd:
@@ -719,7 +681,7 @@
 	{
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		tag11 = "PSM (old)";
 		return make_duh(-1, 2, (const char *const (*)2)tag, 1, &descptr, &sigdata);

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readpsm.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readpsm.c Changed

@@ -23,6 +23,14 @@
 #include "dumb.h"
 #include "internal/it.h"
 
+#ifndef min
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
+#ifdef _MSC_VER
+#define snprintf sprintf_s
+#endif
+
 #define PSMV_OLD 940730
 #define PSMV_NEW 940902
 
@@ -73,7 +81,7 @@
 		panpos = data0x43;
 		defvol = data0x44;
 		samplerate = data0x49 | (data0x4A << 8) | (data0x4B << 16) | (data0x4C << 24);
-	} else if (version == PSMV_NEW) {
+	} else /*if (version == PSMV_NEW)*/ {
 		memcpy(sample->name, data + 0x11, 34);
 		sample->name34 = 0;
 
@@ -146,7 +154,7 @@
 		if (len < 10) return -1;
 		data += 8;
 		len -= 8;
-	} else if (version == PSMV_NEW) {
+	} else /*if (version == PSMV_NEW)*/ {
 		if (len < 14) return -1;
 		data += 12;
 		len -= 12;
@@ -283,7 +291,7 @@
 				if (version == PSMV_OLD) {
 					if ((datapos < 0x80)) entry->note = (datapos>>4)*12+(datapos&0x0f)+12;
 					else entry->mask &= ~IT_ENTRY_NOTE;
-				} else if (version == PSMV_NEW) {
+				} else /*if (version == PSMV_NEW)*/ {
 					if ((datapos) && (datapos < 84)) entry->note = datapos + 35;
 					else entry->mask &= ~IT_ENTRY_NOTE;
 				}
@@ -307,25 +315,25 @@
 					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;
+						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;
+						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;
+						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;
+						else /*if (version == PSMV_NEW)*/ entry->effectvalue = length & 0xF;
 						break;
 
 					case 12:
@@ -333,7 +341,7 @@
 						if (version == PSMV_OLD) {
 							if (length < 4) entry->effectvalue = length | 0xF0;
 							else entry->effectvalue = length >> 2;
-						} else if (version == PSMV_NEW) {
+						} else /*if (version == PSMV_NEW)*/ {
 							entry->effectvalue = length;
 						}
 						break;
@@ -343,7 +351,7 @@
 						if (version == PSMV_OLD) {
 							if (length < 4) entry->effectvalue = length | 0xF0;
 							else entry->effectvalue = length >> 2;
-						} else if (version == PSMV_NEW) {
+						} else /*if (version == PSMV_NEW)*/ {
 							entry->effectvalue = length;
 						}
 						break;
@@ -351,7 +359,7 @@
 					case 15:
 						entry->effect = IT_TONE_PORTAMENTO;
 						if (version == PSMV_OLD) entry->effectvalue = length >> 2;
-						else if (version == PSMV_NEW) entry->effectvalue = length;
+						else /*if (version == PSMV_NEW)*/ entry->effectvalue = length;
 						break;
 
 					case 0x15:
@@ -456,7 +464,7 @@
 	PSMCHUNK *songchunk;
 	int n_song_chunks = 0;
 
-	PSMEVENT *event = NULL;
+	PSMEVENT *event = 0;
 	int n_events = 0;
 
 	unsigned char * ptr;
@@ -492,7 +500,7 @@
 		if (n) {
 			ptr = malloc(n);
 			if (!ptr) goto error_fc;
-			if (dumbfile_getnc(ptr, n, f) < n)
+ if (dumbfile_getnc((char *)ptr, n, f) < n)
 			{
 				free(ptr);
 				goto error_fc;
@@ -533,7 +541,7 @@
 			break;
 
 		case DUMB_ID('T','I','T','L'):
-			length = min(sizeof(sigdata->name) - 1, c->len);
+ length = min(sizeof(sigdata->name) - 1, (unsigned)c->len);
 			memcpy(sigdata->name, c->data, length);
 			sigdata->namelength = 0;
 		}
@@ -634,7 +642,7 @@
 		found != 940903 &&
 		found != 940914 &&
 		found != 941213 &&
-		found != 800211) /* WTF?
+ found != 800211) WTF?
 		goto error_sc;
 	*/
 
@@ -651,10 +659,11 @@
 	memset(sigdata->channel_volume, 64, DUMB_IT_N_CHANNELS);
 
 	for (n = 0; n < DUMB_IT_N_CHANNELS; n += 4) {
-		sigdata->channel_pann = 16;
-		sigdata->channel_pann+1 = 48;
-		sigdata->channel_pann+2 = 48;
-		sigdata->channel_pann+3 = 16;
+		int sep = 32 * dumb_it_default_panning_separation / 100;
+		sigdata->channel_pann = 32 - sep;
+		sigdata->channel_pann+1 = 32 + sep;
+		sigdata->channel_pann+2 = 32 + sep;
+		sigdata->channel_pann+3 = 32 - sep;
 	}
 
 	for (n = 0; n < n_song_chunks; n++) {
@@ -684,7 +693,7 @@
 							memcpy(eventn_events.data, ptr + 1, 4);
 							ptr += 5;
 							length -= 5;
-						} else if (found == PSMV_NEW) {
+						} else /*if (found == PSMV_NEW)*/ {
 							if (length < 9) goto error_ev;
 							memcpy(eventn_events.data, ptr + 1, 8);
 							ptr += 9;
@@ -804,7 +813,7 @@
 							n_patterns++;
 							break;
 						}
-					} else if (found == PSMV_NEW) {
+					} else /*if (found == PSMV_NEW)*/ {
 						if (length < 12) goto error_ev;
 						if (!pattcmp(ptr + 4, e->data, 8)) {
 							if (it_psm_process_pattern(&sigdata->patternn_patterns, ptr, length, speed, bpm, pan, vol, found)) goto error_ev;
@@ -922,8 +931,10 @@
 
 	sigdata->sample = malloc(sigdata->n_samples * sizeof(*sigdata->sample));
 	if (!sigdata->sample) goto error_ev;
-	for (n = 0; n < sigdata->n_samples; n++)
+	for (n = 0; n < sigdata->n_samples; n++) {
 		sigdata->samplen.data = NULL;
+		sigdata->samplen.flags = 0;
+	}
 
 	o = 0;
 	for (n = 0; n < n_chunks; n++) {
@@ -978,6 +989,7 @@
 	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;
@@ -987,6 +999,7 @@
 
 	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;
@@ -1072,7 +1085,7 @@
 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;
+ /*int last_invalid = (sigdata->flags & IT_WAS_AN_XM) ? 255 : 253;*/
 
 	unsigned char * order_list;
 	int n_patterns;
@@ -1200,9 +1213,11 @@
 /* Eww */
 int pattcmp( const unsigned char * a, const unsigned char * b, size_t l )
 {
-	int i, j, na, nb;
+ size_t i, j, na, nb;
 	char * p;
 
+	na = nb = 0;
+
 	i = memcmp( a, b, l );
 	if ( !i ) return i;
 
@@ -1215,7 +1230,7 @@
 
 	if ( i < l )
 	{
-		na = strtoul( a + i, &p, 10 );
+		na = strtoul( (const char *)a + i, &p, 10 );
 		if ( (const unsigned char *)p == a + i ) return 1;
 	}
 
@@ -1226,7 +1241,7 @@
 
 	if ( j < l )
 	{
-		nb = strtoul( b + j, &p, 10 );
+		nb = strtoul( (const char *)b + j, &p, 10 );
 		if ( (const unsigned char *)p == b + j ) return -1;
 	}
 
@@ -1258,13 +1273,14 @@
 		char version16;
 		const char *tag32;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		tag11 = "PSM";
 		if ( ver )
 		{
 			tag20 = "FORMATVERSION";
-			snprintf (version, 10, "%d", ver);
+ snprintf( version, 15, "%u", ver );
+ version15 = 0;
 			tag21 = (const char *) &version;
 			++n_tags;
 		}

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readptm.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readptm.c Changed

@@ -26,30 +26,13 @@
 
 
 
-/** 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);
+ dumbfile_getnc((char *)sample->filename, 12, f);
 	sample->filename12 = 0;
 
 	sample->default_volume = dumbfile_getc(f);
@@ -67,7 +50,7 @@
 	/* GUSBegin, GUSLStart, GUSLEnd, GUSLoop, reserverd */
 	dumbfile_skip(f, 4+4+4+1+1);
 
-	dumbfile_getnc(sample->name, 28, f);
+ dumbfile_getnc((char *)sample->name, 28, f);
 	sample->name28 = 0;
 
 	/*
@@ -195,7 +178,7 @@
 		pattern->n_entries++;
 		if (b) {
 			if (buflen + usedb >= 65536) return -1;
-			dumbfile_getnc(buffer + buflen, usedb, f);
+ dumbfile_getnc((char *)buffer + buflen, usedb, f);
 			buflen += usedb;
 		} else {
 			/* End of row */
@@ -351,7 +334,7 @@
 	if (!sigdata) return NULL;
 
 	/* Skip song name. */
-	dumbfile_getnc(sigdata->name, 28, f);
+ dumbfile_getnc((char *)sigdata->name, 28, f);
 	sigdata->name28 = 0;
 
 	if (dumbfile_getc(f) != 0x1A || dumbfile_igetw(f) != 0x203) {
@@ -446,7 +429,7 @@
 	}
 
 	/* Orders, byte each, length = sigdata->n_orders (should be even) */
-	dumbfile_getnc(sigdata->order, sigdata->n_orders, f);
+ dumbfile_getnc((char *)sigdata->order, sigdata->n_orders, f);
 	sigdata->restart_position = 0;
 
 	component = malloc(768*sizeof(*component));
@@ -455,7 +438,7 @@
 		return NULL;
 	}
 
-	if (it_seek(f, 352)) {
+ if (dumbfile_seek(f, 352, DFS_SEEK_SET)) {
 		_dumb_it_unload_sigdata(sigdata);
 		free (component);
 		return NULL;
@@ -468,16 +451,16 @@
 		n_components++;
 	}
 
-	if (it_seek(f, 608)) {
-		free (component);
+ if (dumbfile_seek(f, 608, DFS_SEEK_SET)) {
 		_dumb_it_unload_sigdata(sigdata);
+		free (component);
 		return NULL;
 	}
 
 	for (n = 0; n < sigdata->n_samples; n++) {
 		if (it_ptm_read_sample_header(&sigdata->samplen, &componentn_components.offset, f)) {
- free (component);
 			_dumb_it_unload_sigdata(sigdata);
+			free (component);
 			return NULL;
 		}
 		if (!(sigdata->samplen.flags & IT_SAMPLE_EXISTS)) continue;
@@ -513,7 +496,7 @@
 	}
 
 	for (n = 0; n < n_components; n++) {
-		if (it_seek(f, componentn.offset)) {
+ if (dumbfile_seek(f, componentn.offset, DFS_SEEK_SET)) {
 			free(buffer);
 			free(component);
 			_dumb_it_unload_sigdata(sigdata);
@@ -549,12 +532,6 @@
 	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;
@@ -569,7 +546,7 @@
 	{
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		tag11 = "PTM";
 		return make_duh(-1, 2, (const char *const (*)2)tag, 1, &descptr, &sigdata);

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readriff.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readriff.c Changed

@@ -22,9 +22,9 @@
 #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 );
+DUH *dumb_read_riff_amff( DUMBFILE * f, struct riff * stream );
+DUH *dumb_read_riff_am( DUMBFILE * f, struct riff * stream );
+DUH *dumb_read_riff_dsmf( DUMBFILE * f, 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
@@ -34,37 +34,21 @@
 {
 	DUH * duh;
 	struct riff * stream;
+ long size;
 
-	{
-		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 );
-	}
+ size = dumbfile_get_size(f);
+
+ stream = riff_parse( f, 0, size, 1 );
+ if ( ! stream ) stream = riff_parse( f, 0, size, 0 );
 
 	if ( ! stream ) return 0;
 
 	if ( stream->type == DUMB_ID( 'A', 'M', ' ', ' ' ) )
-		duh = dumb_read_riff_am( stream );
+ duh = dumb_read_riff_am( f, stream );
 	else if ( stream->type == DUMB_ID( 'A', 'M', 'F', 'F' ) )
-		duh = dumb_read_riff_amff( stream );
+ duh = dumb_read_riff_amff( f, stream );
 	else if ( stream->type == DUMB_ID( 'D', 'S', 'M', 'F' ) )
-		duh = dumb_read_riff_dsmf( stream );
+ duh = dumb_read_riff_dsmf( f, stream );
 	else duh = 0;
 
 	riff_free( stream );

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/reads3m.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/reads3m.c Changed

@@ -24,26 +24,6 @@
 #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;
@@ -51,17 +31,17 @@
 
 	type = dumbfile_getc(f);
 
-	dumbfile_getnc(sample->filename, 12, f);
+ dumbfile_getnc((char *)sample->filename, 12, f);
 	sample->filename12 = 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);
+ dumbfile_getnc((char *)sample->name, 28, f);
 		sample->name28 = 0;
 		dumbfile_skip(f, 4);
 		sample->flags &= ~IT_SAMPLE_EXISTS;
-		return -1; // return error so that another plugin could pick that file up
+		return dumbfile_error(f);
 	}
 
 	*offset = dumbfile_getc(f) << 20;
@@ -92,7 +72,7 @@
 	/* Skip four unused bytes and three internal variables. */
 	dumbfile_skip(f, 4+2+2+4);
 
-	dumbfile_getnc(sample->name, 28, f);
+ dumbfile_getnc((char *)sample->name, 28, f);
 	sample->name28 = 0;
 
 	if (type == 0 || sample->length <= 0) {
@@ -169,7 +149,7 @@
 	long datasize = sample->length;
 	if (sample->flags & IT_SAMPLE_STEREO) datasize <<= 1;
 
-	sample->data = malloc(datasize * (sample->flags & IT_SAMPLE_16BIT ? 2 : 1));
+	sample->data = calloc(datasize * (sample->flags & IT_SAMPLE_16BIT ? 2 : 1), 1);
 	if (!sample->data)
 		return -1;
 
@@ -197,7 +177,7 @@
 			((signed char *)sample->data)n = dumbfile_getc(f);
 
 	if (dumbfile_error(f))
-		return -1;
+		return 0;
 
 	if (ffi != 1) {
 		/* Convert to signed. */
@@ -214,7 +194,7 @@
 
 
 
-static int it_s3m_read_pattern(IT_PATTERN *pattern, DUMBFILE *f, unsigned char *buffer, int maxlen)
+static int it_s3m_read_pattern(IT_PATTERN *pattern, DUMBFILE *f, unsigned char *buffer)
 {
 	int length;
 	int buflen = 0;
@@ -246,19 +226,14 @@
 	 * 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.
+ *
+ * "for a good reason" ? What's this nonsense? -kode54
+ *
 	 */
 
-	/* 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)
+	if (dumbfile_error(f))
 		return -1;
 
 	pattern->n_rows = 0;
@@ -278,7 +253,7 @@
 		if (b) {
 			if (buflen + usedb >= 65536) return -1;
 			if (buflen + usedb <= length)
-				dumbfile_getnc(buffer + buflen, usedb, f);
+ dumbfile_getnc((char *)buffer + buflen, usedb, f);
 			else
 				memset(buffer + buflen, 0, usedb);
 			buflen += usedb;
@@ -478,7 +453,7 @@
 	sigdata = malloc(sizeof(*sigdata));
 	if (!sigdata) return NULL;
 
-	dumbfile_getnc(sigdata->name, 28, f);
+ dumbfile_getnc((char *)sigdata->name, 28, f);
 	sigdata->name28 = 0;
 
 	n = dumbfile_getc(f);
@@ -557,14 +532,13 @@
 		return NULL;
 	}
 
-	sigdata->global_volume = dumbfile_getc(f) << 1;
-	if ( !sigdata->global_volume || sigdata->global_volume > 128 ) sigdata->global_volume = 128;
+	sigdata->global_volume = dumbfile_getc(f);
+	if ( !sigdata->global_volume || sigdata->global_volume > 64 ) sigdata->global_volume = 64;
 	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;
+	sigdata->mixing_volume = master_volume & 127;
 
 	if (master_volume & 128) sigdata->flags |= IT_STEREO;
 
@@ -583,12 +557,13 @@
 	/* Channel settings for 32 channels, 255=unused, +128=disabled */
 	{
 		int i;
+		int sep = (7 * dumb_it_default_panning_separation + 50) / 100;
 		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_volumei = 64;
-				sigdata->channel_pani = c & 8 ? 12 : 3;
+				sigdata->channel_pani = c & 8 ? 7 + sep : 7 - sep;
 				/** WARNING: ah, but it should be 7 for mono... */
 			} else {
 				/** WARNING: this could be improved if we support channel muting... */
@@ -599,7 +574,7 @@
 	}
 
 	/* Orders, byte each, length = sigdata->n_orders (should be even) */
-	dumbfile_getnc(sigdata->order, sigdata->n_orders, f);
+ dumbfile_getnc((char *)sigdata->order, sigdata->n_orders, f);
 	sigdata->restart_position = 0;
 
 	component = malloc(768*sizeof(*component));
@@ -673,45 +648,12 @@
 		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 (componentn.type == S3M_COMPONENT_PATTERN) {
-			int m;
-			for (m = n + 1; m < n_components; m++) {
-				if (componentm.type == S3M_COMPONENT_PATTERN) {
-					if (componentn.offset == componentm.offset) {
-						int o, pattern;
-						pattern = componentm.n;
-						n_components--;
-						for (o = m; o < n_components; o++) {
-							componento = componento + 1;
-						}
-						for (o = 0; o < sigdata->n_orders; o++) {
-							if (sigdata->ordero == pattern) {
-								sigdata->ordero = componentn.n;
-							}
-						}
-						sigdata->patternpattern.n_rows = 64;
-						sigdata->patternpattern.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, componentn.offset)) {
+		offset = 0;
+ if (dumbfile_seek(f, componentn.offset, DFS_SEEK_SET)) {
 			free(buffer);
 			free(component);
 			_dumb_it_unload_sigdata(sigdata);
@@ -721,7 +663,7 @@
 		switch (componentn.type) {
 
 			case S3M_COMPONENT_PATTERN:
-				if (it_s3m_read_pattern(&sigdata->patterncomponentn.n, f, buffer, (n + 1 < n_components) ? (componentn+1.offset - componentn.offset) : 0)) {
+ if (it_s3m_read_pattern(&sigdata->patterncomponentn.n, f, buffer)) {
 					free(buffer);
 					free(component);
 					_dumb_it_unload_sigdata(sigdata);
@@ -730,15 +672,12 @@
 				break;
 
 			case S3M_COMPONENT_SAMPLE:
- {
- int err = it_s3m_read_sample_header(&sigdata->samplecomponentn.n, &offset, &sample_packcomponentn.n, *cwtv, f);
-				if (err) {
+				if (it_s3m_read_sample_header(&sigdata->samplecomponentn.n, &offset, &sample_packcomponentn.n, *cwtv, f)) {
 					free(buffer);
 					free(component);
 					_dumb_it_unload_sigdata(sigdata);
 					return NULL;
 				}
- }
 
 				if (sigdata->samplecomponentn.n.flags & IT_SAMPLE_EXISTS) {
 					short *sample;
@@ -762,41 +701,9 @@
 
 		m = componentn.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 ) > componentm.offset ) {
-					IT_SAMPLE * s1 = &sigdata->samplecomponentlast.n;
-					IT_SAMPLE * s2 = &sigdata->samplecomponentm.n;
-					if ( ( s1->flags | s2->flags ) & ( IT_SAMPLE_16BIT | IT_SAMPLE_STEREO ) ) {
-						free(buffer);
-						free(component);
-						_dumb_it_unload_sigdata(sigdata);
-						return NULL;
-					}
-					if ( componentm.offset >= componentlast.offset &&
-						componentm.offset + s2->length <= componentlast.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 + componentm.offset - componentlast.offset, s2->length );
-						last = -1;
-					}
-				}
-			} else last = 0;
-
-			if ( last >= 0 ) {
-#endif
-				if (it_seek(f, componentm.offset)) {
+ if (dumbfile_seek(f, componentm.offset, DFS_SEEK_SET)) {
 					free(buffer);
 					free(component);
 					_dumb_it_unload_sigdata(sigdata);
@@ -810,11 +717,6 @@
 					return NULL;
 				}
 
-#ifdef S3M_BROKEN_OVERLAPPED_SAMPLES
-				last = m;
-			}
-#endif
-
 			m = componentm.sampnext;
 		}
 	}
@@ -849,7 +751,7 @@
 		char version8;
 		const char *tag32;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		tag11 = "S3M";
 		tag20 = "TRACKERVERSION";

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readstm.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readstm.c Changed

@@ -20,34 +20,30 @@
 // IT_STEREO... :o
 #include <stdlib.h>
 #include <string.h>
+#include <limits.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;
-}
+#ifdef _MSC_VER
+	#define strnicmp _strnicmp
+#else
+	#if defined(unix) || defined(__unix__) || defined(__unix)
+		#include <strings.h>
+	#endif
+	#define strnicmp strncasecmp
+#endif
 
-static int it_stm_read_sample_header( IT_SAMPLE *sample, DUMBFILE *f )
+static int it_stm_read_sample_header( IT_SAMPLE *sample, DUMBFILE *f, unsigned short *offset )
 {
-	dumbfile_getnc( sample->filename, 12, f );
+ dumbfile_getnc( (char *) sample->filename, 12, f );
 	sample->filename12 = 0;
 
 	memcpy( sample->name, sample->filename, 13 );
 
-	dumbfile_skip( f, 2 + 2 );
+	dumbfile_skip( f, 2 );
+
+	*offset = dumbfile_igetw( f );
 
 	sample->length = dumbfile_igetw( f );
 	sample->loop_start = dumbfile_igetw( f );
@@ -65,6 +61,7 @@
 		/* Looks like no-existy. */
 		sample->flags &= ~IT_SAMPLE_EXISTS;
 		sample->length = 0;
+		*offset = 0;
 		return dumbfile_error( f );
 	}
 
@@ -90,26 +87,17 @@
 	return dumbfile_error(f);
 }
 
-static int it_stm_read_sample_data( IT_SAMPLE *sample, DUMBFILE *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;
+ dumbfile_getnc( sample->data, sample->length, f );
 
-	return 0;
+ return dumbfile_error( f );
 }
 
 static int it_stm_read_pattern( IT_PATTERN *pattern, DUMBFILE *f, unsigned char *buffer )
@@ -121,7 +109,7 @@
 
 	pattern->n_rows = 64;
 
-	if ( dumbfile_getnc( buffer, 64 * 4 * 4, f ) != 64 * 4 * 4 )
+ if ( dumbfile_getnc( (char *) buffer, 64 * 4 * 4, f ) != 64 * 4 * 4 )
 		return -1;
 
 	pattern->n_entries = 64;
@@ -153,10 +141,6 @@
 				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 );
@@ -165,9 +149,9 @@
 					entry->mask |= IT_ENTRY_VOLPAN;
 				entry->mask |= IT_ENTRY_EFFECT;
 				switch ( entry->effect ) {
-					case IT_SET_SPEED:
-						entry->effectvalue >>= 4;
-						break;
+ case IT_SET_SPEED:
+ /* taken care of in the renderer */
+ break;
 
 					case IT_BREAK_TO_ROW:
 						entry->effectvalue -= (entry->effectvalue >> 4) * 6;
@@ -204,19 +188,21 @@
 
 
 
-static DUMB_IT_SIGDATA *it_stm_load_sigdata(DUMBFILE *f /*, int * version*/)
+static DUMB_IT_SIGDATA *it_stm_load_sigdata(DUMBFILE *f, int * version)
 {
 	DUMB_IT_SIGDATA *sigdata;
 
 	char tracker_name 8 ;
 
-	int n;
+	unsigned short sample_offset 31 ;
+
+ int n;
 
 	sigdata = malloc(sizeof(*sigdata));
 	if (!sigdata) return NULL;
 
 	/* Skip song name. */
-	dumbfile_getnc(sigdata->name, 20, f);
+ dumbfile_getnc((char *)sigdata->name, 20, f);
 	sigdata->name20 = 0;
 
 	dumbfile_getnc(tracker_name, 8, f);
@@ -231,16 +217,15 @@
 		free( sigdata );
 		return NULL;
 	}
-	if ( strncasecmp( tracker_name, "!Scream!", 8 ) &&
-		strncasecmp( tracker_name, "BMOD2STM", 8 ) &&
-		strncasecmp( tracker_name, "WUZAMOD!", 8 ) )
+	if ( strnicmp( tracker_name, "!Scream!", 8 ) &&
+		strnicmp( tracker_name, "BMOD2STM", 8 ) &&
+		strnicmp( tracker_name, "WUZAMOD!", 8 ) )
 	{
 		free( sigdata );
 		return NULL;
 	}
 
-	/* *version = dumbfile_mgetw(f); */
-	dumbfile_skip( f, 2 );
+	*version = dumbfile_mgetw(f);
 
 	sigdata->song_message = NULL;
 	sigdata->order = NULL;
@@ -254,16 +239,17 @@
 	sigdata->n_samples = 31;
 	sigdata->n_pchannels = 4;
 
-	sigdata->tempo = 125;
-	sigdata->mixing_volume = 48;
+ 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->flags = IT_OLD_EFFECTS | IT_COMPATIBLE_GXX | IT_WAS_AN_S3M | IT_WAS_AN_STM | IT_STEREO;
 
-	sigdata->speed = dumbfile_getc(f) >> 4;
-	if ( sigdata->speed < 1 ) sigdata->speed = 1;
-	sigdata->n_patterns = dumbfile_getc(f);
+ n = dumbfile_getc(f);
+ if ( n < 32 ) n = 32;
+ sigdata->speed = n;
+ sigdata->n_patterns = dumbfile_getc(f);
 	sigdata->global_volume = dumbfile_getc(f) << 1;
 	if ( sigdata->global_volume > 128 ) sigdata->global_volume = 128;
 	
@@ -293,13 +279,14 @@
 	}
 
 	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;
+	n = 32 * dumb_it_default_panning_separation / 100;
+	sigdata->channel_pan 0 = 32 + n;
+	sigdata->channel_pan 1 = 32 - n;
+	sigdata->channel_pan 2 = 32 + n;
+	sigdata->channel_pan 3 = 32 - n;
 
 	for ( n = 0; n < sigdata->n_samples; ++n ) {
-		if ( it_stm_read_sample_header( &sigdata->sample n , f ) ) {
+		if ( it_stm_read_sample_header( &sigdata->sample n , f, &sample_offset n ) ) {
 			_dumb_it_unload_sigdata( sigdata );
 			return NULL;
 		}
@@ -312,7 +299,8 @@
 	}
 
 	/* Orders, byte each, length = sigdata->n_orders (should be even) */
-	dumbfile_getnc( sigdata->order, 128, f );
+ dumbfile_getnc( (char *) sigdata->order, *version >= 0x200 ? 128 : 64, f );
+	if (*version < 0x200) memset( sigdata->order + 64, 0xFF, 64 );
 	sigdata->restart_position = 0;
 
 	for ( n = 127; n >= 0; --n ) {
@@ -344,54 +332,66 @@
 		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;
-		}
-	}
+ for ( n = 0; n < sigdata->n_samples; ++n ) {
+ if ( sample_offset n )
+ {
+ if ( dumbfile_seek( f, sample_offset n * 16, DFS_SEEK_SET ) ||
+ it_stm_read_sample_data( &sigdata->sample n , f ) ) {
+ _dumb_it_unload_sigdata( sigdata );
+ return NULL;
+ }
+ }
+ else
+ {
+ sigdata->sample n .flags = 0;
+ sigdata->sample n .length = 0;
+ }
+ }
 
 	_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;*/
+	int ver;
 
 	DUH_SIGTYPE_DESC *descptr = &_dumb_sigtype_it;
 
-	sigdata = it_stm_load_sigdata(f /*, &ver*/);
+	sigdata = it_stm_load_sigdata(f , &ver);
 
 	if (!sigdata)
 		return NULL;
 
 	{
-		/*char version16;*/
+		char version16;
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
-		tag11 = "STM";
-		/*version0 = 'S';
+		version0 = 'S';
 		version1 = 'T';
 		version2 = 'M';
 		version3 = ' ';
 		version4 = 'v';
-		version5 = hexdigit((ver >> 8) & 15);
+		version5 = '0' + ((ver >> 8) & 15);
 		version6 = '.';
-		version7 = hexdigit((ver >> 4) & 15);
-		version8 = hexdigit(ver & 15);
-		version9 = 0;
-		tag11 = (const char *) &version;*/
+		if ((ver & 255) > 99)
+		{
+			version7 = '0' + ((ver & 255) / 100 );
+			version8 = '0' + (((ver & 255) / 10) % 10);
+			version9 = '0' + ((ver & 255) % 10);
+			version10 = 0;
+		}
+		else
+		{
+			version7 = '0' + ((ver & 255) / 10);
+			version8 = '0' + ((ver & 255) % 10);
+			version9 = 0;
+		}
+		tag11 = (const char *) &version;
 		return make_duh(-1, 2, (const char *const (*)2)tag, 1, &descptr, &sigdata);
 	}
 }

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/readxm.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/readxm.c Changed

@@ -23,13 +23,13 @@
 
 #include "dumb.h"
 #include "internal/it.h"
+#include "internal/dumbfile.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
@@ -109,11 +109,20 @@
 	int vibrato_sweep; /* 0-0xFF */
 	int vibrato_depth; /* 0-0x0F */
 	int vibrato_speed; /* 0-0x3F */
+	int sample_header_size;
 }
 XM_INSTRUMENT_EXTRA;
 
 
 
+/* Trims off trailing white space, usually added by the tracker on file creation
+ */
+static void trim_whitespace(char *ptr, size_t size)
+{
+	char *p = ptr + size - 1;
+	while (p >= ptr && *p <= 0x20) *p-- = '\0';
+}
+
 /* Frees the original block if it can't resize it or if size is 0, and acts
 * as malloc if ptr is NULL.
 */
@@ -213,7 +222,7 @@
 		return -1;
 	}
 
-	if (dumbfile_getnc(buffer, size, f) < size)
+ if (dumbfile_getnc((char *)buffer, size, f) < size)
 		return -1;
 
 	/* compute number of entries */
@@ -318,7 +327,7 @@
 
 static int it_xm_make_envelope(IT_ENVELOPE *envelope, const unsigned short *data, int y_offset)
 {
-	int i, pos;
+ int i, pos, val;
 
 	if (envelope->n_nodes > 12) {
 		/* XXX
@@ -335,34 +344,178 @@
 	pos = 0;
 	for (i = 0; i < envelope->n_nodes; i++) {
 		envelope->node_ti = datapos++;
-		if (datapos > 64) {
-			TRACE("XM error: out-of-range envelope node (node_y%d=%d)\n", i, datapos);
-			envelope->n_nodes = 0;
-			return -1;
+ val = datapos++;
+ if (val > 64) {
+ TRACE("XM error: out-of-range envelope node (node_y%d=%d)\n", i, val);
+ /* FT2 seems to simply clip the value */
+ val = 64;
+		}
+ envelope->node_yi = (signed char)(val + y_offset);
+	}
+
+	return 0;
+}
+
+
+
+typedef struct LIMITED_XM LIMITED_XM;
+
+struct LIMITED_XM
+{
+	unsigned char *buffered;
+	long ptr, limit, allocated;
+	DUMBFILE *remaining;
+};
+
+static int limit_xm_resize(void *f, long n)
+{
+	DUMBFILE *df = f;
+	LIMITED_XM *lx = df->file;
+	if (lx->buffered || n) {
+		if (n > lx->allocated) {
+			unsigned char *buffered = realloc( lx->buffered, n );
+			if ( !buffered ) return -1;
+			lx->buffered = buffered;
+			memset( buffered + lx->allocated, 0, n - lx->allocated );
+			lx->allocated = n;
 		}
-		envelope->node_yi = (signed char)(datapos++ + y_offset);
+ if ( dumbfile_getnc( (char *)lx->buffered, n, lx->remaining ) < n ) return -1;
+	} else if (!n) {
+		if ( lx->buffered ) free( lx->buffered );
+		lx->buffered = NULL;
+		lx->allocated = 0;
 	}
+	lx->limit = n;
+	lx->ptr = 0;
+	return 0;
+}
+
+static int limit_xm_skip_end(void *f, long n)
+{
+	DUMBFILE *df = f;
+	LIMITED_XM *lx = df->file;
+	return dumbfile_skip( lx->remaining, n );
+}
 
+static int limit_xm_skip(void *f, long n)
+{
+	LIMITED_XM *lx = f;
+	lx->ptr += n;
 	return 0;
 }
 
 
 
+static int limit_xm_getc(void *f)
+{
+	LIMITED_XM *lx = f;
+	if (lx->ptr >= lx->allocated) {
+		return 0;
+	}
+	return lx->bufferedlx->ptr++;
+}
+
+
+
+static long limit_xm_getnc(char *ptr, long n, void *f)
+{
+	LIMITED_XM *lx = f;
+	int left;
+	left = lx->allocated - lx->ptr;
+	if (n > left) {
+		if (left > 0) {
+			memcpy( ptr, lx->buffered + lx->ptr, left );
+			memset( ptr + left, 0, n - left );
+		} else {
+			memset( ptr, 0, n );
+		}
+	} else {
+		memcpy( ptr, lx->buffered + lx->ptr, n );
+	}
+	lx->ptr += n;
+	return n;
+}
+
+
+
+static void limit_xm_close(void *f)
+{
+	LIMITED_XM *lx = f;
+	if (lx->buffered) free(lx->buffered);
+	/* Do NOT close lx->remaining */
+	free(f);
+}
+
+
+/* These two can be stubs since this implementation doesn't use seeking */
+static int limit_xm_seek(void *f, long n)
+{
+ (void)f;
+ (void)n;
+ return 1;
+}
+
+
+
+static long limit_xm_get_size(void *f)
+{
+ (void)f;
+ return 0;
+}
+
+
+
+DUMBFILE_SYSTEM limit_xm_dfs = {
+	NULL,
+	&limit_xm_skip,
+	&limit_xm_getc,
+	&limit_xm_getnc,
+ &limit_xm_close,
+ &limit_xm_seek,
+ &limit_xm_get_size
+};
+
+static DUMBFILE *dumbfile_limit_xm(DUMBFILE *f)
+{
+	LIMITED_XM * lx = malloc(sizeof(*lx));
+	lx->remaining = f;
+	lx->buffered = NULL;
+	lx->ptr = 0;
+	lx->limit = 0;
+	lx->allocated = 0;
+	return dumbfile_open_ex( lx, &limit_xm_dfs );
+}
+
 static int it_xm_read_instrument(IT_INSTRUMENT *instrument, XM_INSTRUMENT_EXTRA *extra, DUMBFILE *f)
 {
 	unsigned long size, bytes_read;
 	unsigned short vol_points24;
 	unsigned short pan_points24;
 	int i, type;
+	const unsigned long max_size = 4 + 22 + 1 + 2 + 4 + 96 + 48 + 48 + 1 * 14 + 2 + 2;
+	unsigned long skip_end = 0;
 
 	/* 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.
 	 */
+
+	if ( limit_xm_resize( f, 4 ) < 0 ) return -1;
+
 	size = dumbfile_igetl(f);
 
-	dumbfile_getnc(instrument->name, 22, f);
+	if ( size == 0 ) size = max_size;
+	else if ( size > max_size )
+	{
+		skip_end = size - max_size;
+		size = max_size;
+	}
+
+	if ( limit_xm_resize( f, size - 4 ) < 0 ) return -1;
+
+ dumbfile_getnc((char *)instrument->name, 22, f);
 	instrument->name22 = 0;
+ trim_whitespace((char *)instrument->name, 22);
 	instrument->filename0 = 0;
 	dumbfile_skip(f, 1); /* Instrument type. Should be 0, but seems random. */
 	extra->n_samples = dumbfile_igetw(f);
@@ -374,12 +527,11 @@
 
 	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;
-		}*/
+		if (!i || i > 0x28) i = 0x28;*/
+		dumbfile_skip(f, 4);
+		i = 0x28;
+		extra->sample_header_size = i;
 
 		/* sample map */
 		for (i = 0; i < 96; i++) {
@@ -465,7 +617,10 @@
 		for (i = 0; i < 96; i++)
 			instrument->map_samplei = 0;
 
-	if (dumbfile_skip(f, size - bytes_read))
+	if (size > bytes_read && dumbfile_skip(f, size - bytes_read))
+		return -1;
+
+	if (skip_end && limit_xm_skip_end(f, skip_end))
 		return -1;
 
 	instrument->new_note_action = NNA_NOTE_CUT;
@@ -518,8 +673,9 @@
 
 	reserved = dumbfile_getc(f);
 
-	dumbfile_getnc(sample->name, 22, f);
+ dumbfile_getnc((char *)sample->name, 22, f);
 	sample->name22 = 0;
+ trim_whitespace((char *)sample->name, 22);
 
 	sample->filename0 = 0;
 
@@ -679,16 +835,13 @@
 	if (!sigdata)
 		return NULL;
 
-	sigdata = malloc(sizeof(*sigdata));
-	if (!sigdata)
-		return NULL;
-
 	/* song name */
-	if (dumbfile_getnc(sigdata->name, 20, f) < 20) {
+ if (dumbfile_getnc((char *)sigdata->name, 20, f) < 20) {
 		free(sigdata);
 		return NULL;
 	}
 	sigdata->name20 = 0;
+ trim_whitespace((char *)sigdata->name, 20);
 
 	if (dumbfile_getc(f) != 0x1A) {
 		TRACE("XM error: 0x1A not found\n");
@@ -744,6 +897,16 @@
 	if (sigdata->speed == 0) sigdata->speed = 6; // Should we? What about tempo?
 	sigdata->tempo = dumbfile_igetw(f);
 
+ // FT2 always clips restart position against the song length
+ if (sigdata->restart_position > sigdata->n_orders)
+ sigdata->restart_position = sigdata->n_orders;
+ // And FT2 starts playback on order 0, regardless of length,
+ // and only checks if the next order is greater than or equal
+ // to this, not the current pattern. Work around this with
+ // DUMB's playback core by overriding a zero length with one.
+ if (sigdata->n_orders == 0)
+ sigdata->n_orders = 1;
+
 	/* sanity checks */
 	// XXX
 	i = header_size - 4 - 2 * 8; /* Maximum number of orders expected */
@@ -761,7 +924,7 @@
 		_dumb_it_unload_sigdata(sigdata);
 		return NULL;
 	}
-	dumbfile_getnc(sigdata->order, sigdata->n_orders, f);
+ dumbfile_getnc((char *)sigdata->order, sigdata->n_orders, f);
 	dumbfile_skip(f, i - sigdata->n_orders);
 
 	if (dumbfile_error(f)) {
@@ -829,16 +992,24 @@
 		for (i = 0; i < sigdata->n_instruments; i++) {
 			XM_INSTRUMENT_EXTRA extra;
 
-			if (it_xm_read_instrument(&sigdata->instrumenti, &extra, f) < 0) {
+			DUMBFILE * lf = dumbfile_limit_xm( f );
+			if ( !lf ) {
+				_dumb_it_unload_sigdata(sigdata);
+				return NULL;
+			}
+
+			if (it_xm_read_instrument(&sigdata->instrumenti, &extra, lf) < 0) {
 				// XXX
 				if ( ! i )
 				{
 					TRACE("XM error: instrument %d\n", i+1);
+					dumbfile_close( lf );
 					_dumb_it_unload_sigdata(sigdata);
 					return NULL;
 				}
 				else
 				{
+					dumbfile_close( lf );
 					sigdata->n_instruments = i;
 					break;
 				}
@@ -853,17 +1024,31 @@
 
 				sigdata->sample = safe_realloc(sigdata->sample, sizeof(*sigdata->sample)*(total_samples+extra.n_samples));
 				if (!sigdata->sample) {
+					dumbfile_close( lf );
 					_dumb_it_unload_sigdata(sigdata);
 					return NULL;
 				}
 				for (j = total_samples; j < total_samples+extra.n_samples; j++)
 					sigdata->samplej.data = NULL;
 
+				if ( limit_xm_resize( lf, 0 ) < 0 ) {
+					dumbfile_close( lf );
+					_dumb_it_unload_sigdata( sigdata );
+					return NULL;
+				}
+
 				/* read instrument's samples */
 				for (j = 0; j < extra.n_samples; j++) {
 					IT_SAMPLE *sample = &sigdata->sampletotal_samples+j;
-					int b = it_xm_read_sample_header(sample, f);
+					int b;
+					if ( limit_xm_resize( lf, extra.sample_header_size ) < 0 ) {
+						dumbfile_close( lf );
+						_dumb_it_unload_sigdata( sigdata );
+						return NULL;
+					}
+					b = it_xm_read_sample_header(sample, lf);
 					if (b < 0) {
+						dumbfile_close( lf );
 						_dumb_it_unload_sigdata(sigdata);
 						return NULL;
 					}
@@ -880,12 +1065,15 @@
 				}
 				for (j = 0; j < extra.n_samples; j++) {
 					if (it_xm_read_sample_data(&sigdata->sampletotal_samples+j, roguebytesj, f) != 0) {
+						dumbfile_close( lf );
 						_dumb_it_unload_sigdata(sigdata);
 						return NULL;
 					}
 				}
 				total_samples += extra.n_samples;
 			}
+
+			dumbfile_close( lf );
 		}
 
 		sigdata->n_samples = total_samples;
@@ -907,7 +1095,7 @@
 
 		sigdata->instrument = malloc(sigdata->n_instruments * sizeof(*sigdata->instrument));
 		if (!sigdata->instrument) {
- free (roguebytes);
+			free (roguebytes);
 			_dumb_it_unload_sigdata(sigdata);
 			return NULL;
 		}
@@ -918,14 +1106,20 @@
 		for (i = 0; i < sigdata->n_instruments; i++) {
 			XM_INSTRUMENT_EXTRA extra;
 
-			if (it_xm_read_instrument(&sigdata->instrumenti, &extra, f) < 0) {
+			DUMBFILE * lf = dumbfile_limit_xm( f );
+			if ( !lf ) {
+				free(roguebytes);
+				_dumb_it_unload_sigdata(sigdata);
+				return NULL;
+			}
+
+			if (it_xm_read_instrument(&sigdata->instrumenti, &extra, lf) < 0) {
 				TRACE("XM error: instrument %d\n", i+1);
+				dumbfile_close(lf);
 				free(roguebytes);
 				_dumb_it_unload_sigdata(sigdata);
 				return NULL;
 			}
-			for (j = total_samples; j < total_samples+extra.n_samples; j++)
-				sigdata->samplej.data = NULL;
 
 			if (extra.n_samples) {
 				/* adjust instrument sample map (make indices absolute) */
@@ -934,6 +1128,7 @@
 
 				sigdata->sample = safe_realloc(sigdata->sample, sizeof(*sigdata->sample)*(total_samples+extra.n_samples));
 				if (!sigdata->sample) {
+					dumbfile_close( lf );
 					free(roguebytes);
 					_dumb_it_unload_sigdata(sigdata);
 					return NULL;
@@ -941,10 +1136,24 @@
 				for (j = total_samples; j < total_samples+extra.n_samples; j++)
 					sigdata->samplej.data = NULL;
 
+				if ( limit_xm_resize( lf, 0 ) < 0 ) {
+					dumbfile_close( lf );
+					free( roguebytes );
+					_dumb_it_unload_sigdata( sigdata );
+					return NULL;
+				}
+
 				/* read instrument's samples */
 				for (j = 0; j < extra.n_samples; j++) {
 					IT_SAMPLE *sample = &sigdata->sampletotal_samples+j;
-					int b = it_xm_read_sample_header(sample, f);
+					int b;
+					if ( limit_xm_resize( lf, extra.sample_header_size ) < 0 ) {
+							dumbfile_close( lf );
+							free( roguebytes );
+							_dumb_it_unload_sigdata( sigdata );
+							return NULL;
+					}
+					b = it_xm_read_sample_header(sample, lf);
 					if (b < 0) {
 						free(roguebytes);
 						_dumb_it_unload_sigdata(sigdata);
@@ -963,6 +1172,8 @@
 				}
 				total_samples += extra.n_samples;
 			}
+
+			dumbfile_close( lf );
 		}
 
 		sigdata->n_samples = total_samples;
@@ -1200,7 +1411,7 @@
 		char version16;
 		const char *tag22;
 		tag00 = "TITLE";
-		tag01 = ((DUMB_IT_SIGDATA *)sigdata)->name;
+ tag01 = (const char *)(((DUMB_IT_SIGDATA *)sigdata)->name);
 		tag10 = "FORMAT";
 		version0 = 'X';
 		version1 = 'M';

deadbeef-0.6.2.tar.bz2/plugins/dumb/dumb-kode54/src/it/xmeffect.c -> deadbeef-1.9.6.tar.bz2/plugins/dumb/dumb-kode54/src/it/xmeffect.c Changed

deadbeef-1.9.6.tar.bz2/plugins/dumb/modloader.cpp Added

@@ -0,0 +1,526 @@
+/*
+ DUMB Plugin for DeaDBeeF Player
+ Copyright (C) 2009-2016 Oleksiy Yakovenko <waker@users.sourceforge.net>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+// based on fb2k dumb plugin from http://kode54.foobar2000.org
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include "dumb.h"
+#include "internal/dumbfile.h"
+#include "internal/it.h"
+#include "umr.h"
+#include "cdumb.h"
+#include "modloader.h"
+#include <deadbeef/deadbeef.h>
+
+// FIXME: config
+static int cfg_dumb_count_patterns = 1; // MOD - Count patterns from the order list
+static int cfg_autochip = 0; // ???
+static int cfg_autochip_size_force = 100;
+static int cfg_autochip_size_scan = 500;
+static int cfg_autochip_scan_threshold = 12;
+static int cfg_trim = 0;
+
+extern DB_functions_t *deadbeef;
+
+class umr_mem_reader : public umr::file_reader
+{
+ const uint8_t * ptr;
+ long offset, size;
+public:
+ umr_mem_reader(const uint8_t * buf, unsigned p_size) : ptr(buf), size(p_size), offset(0) {}
+
+ long read( void * buf, long howmany )
+ {
+ long max = size - offset;
+ if ( max > howmany ) max = howmany;
+ if ( max )
+ {
+ memcpy( buf, ptr + offset, max );
+ offset += max;
+ }
+ return max;
+ }
+
+ void seek( long where )
+ {
+ if ( where > size ) offset = size;
+ else offset = where;
+ }
+};
+
+static const char *exts = {"MOD","MDZ","STK","M15","FST","OCT","NT",NULL};
+
+static bool g_test_path(const char * path)
+{
+ const char *name = strrchr (path, '/');
+ if (name) {
+ name++;
+ }
+ else {
+ name = path;
+ }
+ const char *ext = strrchr(name, '.');
+ if (ext) {
+ ext++;
+ }
+ else {
+ ext = name;
+ }
+ for( int n = 0; extsn; ++n )
+ {
+ if (!strcasecmp(ext,extsn) || !strcasecmp(name, extsn)) return true;
+ }
+ return false;
+}
+
+void dumb_it_convert_tempos( DUMB_IT_SIGDATA * itsd, bool vsync )
+{
+ for ( unsigned i = 0, j = itsd->n_patterns; i < j; i++ )
+ {
+ IT_PATTERN * pat = &itsd->pattern i ;
+ for ( unsigned k = 0, l = pat->n_entries; k < l; k++ )
+ {
+ IT_ENTRY * entry = &pat->entry k ;
+ if ( entry->mask & IT_ENTRY_EFFECT )
+ {
+ if ( vsync && entry->effect == IT_SET_SONG_TEMPO ) entry->effect = IT_SET_SPEED;
+ else if ( !vsync && entry->effect == IT_SET_SPEED && entry->effectvalue > 0x20 ) entry->effect = IT_SET_SONG_TEMPO;
+ }
+ }
+ }
+}
+
+DUH * g_open_module(const char * path, int *is_it, int *is_dos, int *is_ptcompat, int is_vblank, const char **ftype)
+{
+ DUH * duh = 0;
+
+ DB_FILE *fp = deadbeef->fopen (path);
+ if (!fp) {
+ return NULL;
+ }
+
+ uint8_t buf2000;
+ size_t size = deadbeef->fread (buf, 1, sizeof (buf), fp);
+
+ uint8_t *ptr = buf;
+
+ deadbeef->fclose (fp);
+
+ DUMBFILE * f = dumbfile_open (path);
+ if (!f) {
+ return NULL;
+ }
+
+ *is_it = 0;
+ *is_dos = 1;
+ *is_ptcompat = 0;
+
+ if (size >= 4 &&
+ ptr0 == 0xC1 && ptr1 == 0x83 &&
+ ptr2 == 0x2A && ptr3 == 0x9E)
+ {
+ DB_FILE *fp = deadbeef->fopen (path);
+ if (!fp) {
+ dumbfile_close(f);
+ return NULL;
+ }
+ size_t filesize = deadbeef->fgetlength(fp);
+ uint8_t *buf = (uint8_t *)malloc (filesize);
+ ptr = buf;
+ size_t size = deadbeef->fread (buf, 1, filesize, fp);
+ deadbeef->fclose (fp);
+ if (size != filesize) {
+ free (buf);
+ dumbfile_close(f);
+ return NULL;
+ }
+ umr_mem_reader memreader(buf, (int)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 (!strcasecmp(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 (!strcasecmp(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 (!strcasecmp(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 (!strcasecmp(type, "it") || !strcasecmp(type, "s3m") || !strcasecmp(type, "xm"))
+ {
+ ddb_dumb_file_t *d = (ddb_dumb_file_t *)f->file;
+ d->startoffs = pkg.object_offset(i);
+ f->dfs->seek (f->file, 0);
+ ptr += pkg.object_offset(i);
+ size = pkg.object_size(i);
+
+ if (size >= 4 && ptr0 == 'I' && ptr1 == 'M' && ptr2 == 'P' && ptr3 == 'M')
+ {
+ *is_it = 1;
+ duh = dumb_read_it_quick(f);
+ *ftype = "IT";
+ }
+ else if (size >= 42 && ptr38 == 'F' && ptr39 == 'a' && ptr40 == 's' && ptr41 == 't')
+ {
+ duh = dumb_read_xm_quick(f);
+ *ftype = "XM";
+ }
+ else if (size >= 48 && ptr44 == 'S' && ptr45 == 'C' && ptr46 == 'R' && ptr47 == 'M')
+ {
+ duh = dumb_read_s3m_quick(f);
+ *ftype = "S3M";
+ }
+
+ break;
+ }
+ }
+ }
+ }
+ free (buf);
+ }
+ else if (size >= 4 &&
+ ptr0 == 'I' && ptr1 == 'M' &&
+ ptr2 == 'P' && ptr3 == 'M')
+ {
+ *is_it = 1;
+ duh = dumb_read_it_quick(f);
+ *ftype = "IT";
+ }
+ else if (size >= 17 && !memcmp(ptr, "Extended Module: ", 17))
+ {
+ duh = dumb_read_xm_quick(f);
+ *ftype = "XM";
+ }
+ else if (size >= 0x30 &&
+ ptr0x2C == 'S' && ptr0x2D == 'C' &&
+ ptr0x2E == 'R' && ptr0x2F == 'M')
+ {
+ duh = dumb_read_s3m_quick(f);
+ *ftype = "S3M";
+ }
+ else if (size >= 1168 &&
+ /*ptr28 == 0x1A &&*/ ptr29 == 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);
+ *ftype = "STM";
+ }
+ else if (size >= 2 &&
+ ((ptr0 == 0x69 && ptr1 == 0x66) ||
+ (ptr0 == 0x4A && ptr1 == 0x4E)))
+ {
+ duh = dumb_read_669_quick(f);
+ *ftype = "669";
+ }
+ else if (size >= 0x30 &&
+ ptr0x2C == 'P' && ptr0x2D == 'T' &&
+ ptr0x2E == 'M' && ptr0x2F == 'F')
+ {
+ duh = dumb_read_ptm_quick(f);
+ *ftype = "PTM";
+ }
+ else if (size >= 4 &&
+ ptr0 == 'P' && ptr1 == 'S' &&
+ ptr2 == 'M' && ptr3 == ' ')
+ {
+ duh = dumb_read_psm_quick(f, 0);
+ *ftype = "PSM";
+ }
+ else if (size >= 4 &&
+ ptr0 == 'P' && ptr1 == 'S' &&
+ ptr2 == 'M' && ptr3 == 254)
+ {
+ duh = dumb_read_old_psm_quick(f);
+ *ftype = "PSM";
+ }
+ else if (size >= 3 &&
+ ptr0 == 'M' && ptr1 == 'T' &&
+ ptr2 == 'M')
+ {
+ *is_ptcompat = 1;
+ duh = dumb_read_mtm_quick(f);
+ *ftype = "MTM";
+ }
+ else if ( size >= 4 &&
+ ptr0 == 'R' && ptr1 == 'I' &&
+ ptr2 == 'F' && ptr3 == 'F')
+ {
+ duh = dumb_read_riff_quick(f);
+ *ftype = "RIFF";
+ }
+ else if ( size >= 32 &&
+ !memcmp( ptr, "ASYLUM Music Format", 19 ) &&
+ !memcmp( ptr + 19, " V1.0", 5 ) )
+ {
+ duh = dumb_read_asy_quick(f);
+ *ftype = "ASY";
+ }
+ else if ( size >= 3 &&
+ ptr0 == 'A' && ptr1 == 'M' &&
+ ptr2 == 'F')
+ {
+ duh = dumb_read_amf_quick(f);
+ *ftype = "AMF";
+ }
+ else if ( size >= 8 &&
+ !memcmp( ptr, "OKTASONG", 8 ) )
+ {
+ duh = dumb_read_okt_quick(f);
+ *ftype = "OKT";
+ }
+
+ if ( ! duh )
+ {
+ *is_dos = 0;
+ dumbfile_seek( f, 0, DFS_SEEK_SET );
+ duh = dumb_read_mod_quick(f, ( cfg_dumb_count_patterns ? 0 : 2 ) + ( g_test_path( path ) ? 0 : 1 ) );
+ if ( duh && is_vblank )
+ {
+ DUMB_IT_SIGDATA * itsd = duh_get_it_sigdata( duh );
+ dumb_it_convert_tempos( itsd, true );
+ }
+ if ( duh ) *is_ptcompat = 1;
+
+ *ftype = "MOD";
+ }
+
+ dumbfile_close(f);
+
+ 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->samplei;
+ if (sample->flags & IT_SAMPLE_EXISTS)
+ {
+ int channels = sample->flags & IT_SAMPLE_STEREO ? 2 : 1;
+ if (sample->length < size_force) sample->max_resampling_quality = 1;
+ 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 = 1;
+ 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 = 1;
+ 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 = 1;
+ 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 = 1;
+ 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 = 1;
+ 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 = 1;
+ 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 = 1;
+ 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 = 1;
+ 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 = 1;
+ 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 = 1;
+ 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 = 1;
+ 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 = 1;
+ continue;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ 
+ if ( duh && cfg_trim )
+ {
+ if ( dumb_it_trim_silent_patterns( duh ) < 0 )
+ {
+ unload_duh( duh );
+ duh = 0;
+ }
+ }
+ 
+ return duh;
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/modloader.h Added

@@ -0,0 +1,40 @@
+/*
+ DUMB Plugin for DeaDBeeF Player
+ Copyright (C) 2009-2016 Oleksiy Yakovenko <waker@users.sourceforge.net>
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+// based on fb2k dumb plugin from http://kode54.foobar2000.org
+#ifndef modloader_h
+#define modloader_h
+
+#include "dumb.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+DUH * g_open_module(const char * path, int *is_it, int *is_dos, int *is_ptcompat, int is_vblank, const char **ftype);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* modloader_h */

deadbeef-1.9.6.tar.bz2/plugins/dumb/umr.h Added

@@ -0,0 +1,89 @@
+#ifndef _UMR_H
+#define _UMR_H
+
+#include <stdint.h>
+
+namespace umr
+{
+
+class file_reader
+{
+public:
+	virtual long read(void * ptr, long howmany) =0;
+	virtual void seek(long where) =0;
+};
+
+class file_writer
+{
+public:
+	virtual void write(void * ptr, long howmany) =0;
+};
+
+#include "urf.h"
+
+class upkg
+{
+	upkg_hdr *hdr;			// read the urf.h for these 4...
+	upkg_exports *exports;
+	upkg_imports *imports;
+	upkg_names *names;
+
+	file_reader * reader;
+
+	int data_size,			// a way to standardize some freaky parts of the format
+	 pkg_opened;		// sanity check
+
+	char header4096,		// we load the header into this buffer
+	 buf256;			// temp buf for get_string()
+
+public:
+	upkg() { pkg_opened = 0; }
+	~upkg() { close(); }
+
+	bool open(file_reader * reader);		// open a upkg format file.
+	void close(void);
+
+	signed int ocount(void);	// returns the number of exports
+	char *oname(signed int);	// returns the name of the export
+	char *oclassname(signed int);	// returns the name of the export's class
+	char *opackagename(signed int);	// returns the name of the export's package
+	char *otype(signed int);	// returns the name of the type of object
+	signed int export_size(signed int);	// return the size of the export described
+	signed int object_size(signed int);	// return the size of the object described
+	signed int export_offset(signed int);	// return the offset to said export
+	signed int object_offset(signed int);	// same
+
+	int read(void *, signed int, signed int);	// read data from the upkg file
+
+	int export_dump(file_writer *, signed int);	// dump an export
+	int object_dump(file_writer *, signed int);	// dump an object
+
+private:
+	signed long get_fci(char *in);
+ unsigned long get_u32(void *addr);
+	signed long get_s32(void *addr);
+	signed long get_s16(void *addr);
+	signed long get_s8(void *addr);
+	char *get_string(char *addr, int count);
+	
+	int set_classname(int idx, int c_idx);
+	int set_pkgname(int idx, int c_idx);
+
+	int load_upkg(void);
+
+	void get_names(void);
+
+	void get_exports_cpnames(int idx);
+	void get_exports(void);
+
+	void get_imports(void);
+
+	void get_type(char *buf, int e, int d);
+	int get_types_isgood(int idx);
+	void check_type(int e, int d);
+	void get_types(void);
+};
+
+}
+
+#endif				// _UMR_H

deadbeef-1.9.6.tar.bz2/plugins/dumb/unmo3.h Added

deadbeef-1.9.6.tar.bz2/plugins/dumb/unrealfmt.cpp Added

@@ -0,0 +1,664 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "umr.h"
+
+namespace umr {
+
+#include "urf.h"
+
+
+/*
+upkg_hdr *hdr;			// read the urf.h for these 4...
+upkg_exports *exports;
+upkg_imports *imports;
+upkg_names *names;
+
+FILE *file;			// we store the file pointer globally around here
+
+int data_size,			// a way to standardize some freaky parts of the format
+ pkg_opened = 0;		// sanity check
+int indent_level;
+
+char header4096,		// we load the header into this buffer
+ buf256;			// temp buf for get_string()
+*/
+
+// this function decodes the encoded indices in the upkg files
+signed long upkg::get_fci(char *in)
+{
+	signed long a;
+	int size;
+
+	a = 0;
+	size = 1;
+
+	a = in0 & 0x3f;
+
+	if (in0 & 0x40) {
+		size++;
+		a |= (in1 & 0x7f) << 6;
+
+		if (in1 & 0x80) {
+			size++;
+			a |= (in2 & 0x7f) << 13;
+
+			if (in2 & 0x80) {
+				size++;
+				a |= (in3 & 0x7f) << 20;
+
+				if (in3 & 0x80) {
+					size++;
+					a |= (in4 & 0x3f) << 27;
+				}
+			}
+		}
+	}
+
+	if (in0 & 0x80)
+		a = -a;
+
+	data_size = size;
+
+	return a;
+}
+ 
+unsigned long upkg::get_u32(void *addr)
+{
+ const uint8_t * addr8 = (const uint8_t *) addr;
+ uint32_t rval = addr80 | (addr81 << 8) | (addr82 << 16) | (addr83 << 24);
+	data_size = sizeof(uint32_t);
+	return rval;
+}
+
+signed long upkg::get_s32(void *addr)
+{
+ const uint8_t * addr8 = (const uint8_t *) addr;
+ int32_t rval = addr80 | (addr81 << 8) | (addr82 << 16) | (addr83 << 24);
+	data_size = sizeof(int32_t);
+	return rval;
+}
+
+signed long upkg::get_s16(void *addr)
+{
+ const uint8_t * addr8 = (const uint8_t *) addr;
+ int16_t rval = addr80 | (addr81 << 8);
+	data_size = sizeof(int16_t);
+	return rval;
+}
+
+signed long upkg::get_s8(void *addr)
+{
+	data_size = sizeof(int8_t);
+	return *(int8_t *) addr;
+}
+
+char * upkg::get_string(char *addr, int count)
+{
+	if (count > UPKG_MAX_NAME_SIZE || count == UPKG_NAME_NOCOUNT)
+		count = UPKG_MAX_NAME_SIZE;
+
+	strncpy(buf, addr, count);	// the string stops at count chars, or is ASCIIZ
+
+	data_size = strlen(buf) + 1;
+
+	return buf;
+}
+
+signed int export_index(signed int i)
+{
+	if (i > 0) {
+		return i - 1;
+	}
+
+	return -1;
+}
+
+signed int import_index(signed int i)
+{
+	if (i < 0) {
+		return -i - 1;
+	}
+
+	return -1;
+}
+
+// idx == exportsidx, c_idx == index to the next element from idx
+int upkg::set_classname(int idx, int c_idx) {
+ int i, next;
+ 
+ i = c_idx;
+ 
+ do {
+	if (i < 0) {
+	 i = import_index(i);
+	 if (!strcmp(namesimportsi.class_name.name, "Class")) {
+		exportsidx.class_name = importsi.object_name;
+		return importsi.package_index;
+	 }
+	 
+	 next = importsi.package_index;
+	}
+	
+	if (i > 0) {
+	 i = export_index(i);
+	 next = exportsi.class_index;
+	} else {
+	 break;
+	}
+	
+	i = next;
+ } while (i >= -hdr->import_count && i < hdr->export_count);
+ 
+ exportsidx.class_name = hdr->name_count;
+ return c_idx;
+}
+
+int upkg::set_pkgname(int idx, int c_idx) {
+ int i, next;
+ 
+ i = c_idx;
+ 
+ do {
+	if (i < 0) {
+	 i = import_index(i);
+	 if (!strcmp(namesimportsi.class_name.name, "Package")) {
+		exportsidx.package_name = importsi.object_name;
+		return importsi.package_index;
+	 }
+	 
+	 next = importsi.package_index;
+	}
+	
+	if (i > 0) {
+	 i = export_index(i);
+
+	 next = exportsi.class_index;
+	} else {
+	 break;
+	}
+	
+	i = next;
+ } while (i >= -hdr->import_count && i < hdr->export_count);
+ 
+ exportsidx.package_name = hdr->name_count;
+ return c_idx;
+}
+
+// load in the header, AWA allocating the needed memory for the tables
+int upkg::load_upkg(void)
+{
+	int index, i;
+
+	index = 0;
+
+	hdr = (upkg_hdr *) header;
+
+	if (get_u32(&hdr->tag) != UPKG_HDR_TAG)
+		return -1;
+
+	for (i = 0; export_desci.version; i++) {
+		if (get_u32(&hdr->file_version) == export_desci.version) {
+			break;
+		}
+	}
+
+	if (export_desci.version == 0)
+		return -1;
+
+	names =
+	 (upkg_names *) malloc(sizeof(upkg_names) * (hdr->name_count + 1));
+	if (names == NULL)
+		return -1;
+
+	exports =
+	 (upkg_exports *) malloc(sizeof(upkg_exports) *
+				 hdr->export_count);
+	if (exports == NULL) {
+		free(names);
+		return -1;
+	}
+
+	imports =
+	 (upkg_imports *) malloc(sizeof(upkg_imports) *
+				 hdr->import_count);
+	if (imports == NULL) {
+		free(exports);
+		free(names);
+		return -1;
+	}
+	
+	return 0;
+}
+
+// load the name table
+void upkg::get_names(void)
+{
+	int i, j, index;
+
+	index = get_u32(&hdr->name_offset);
+
+	for (i = 0, j = get_u32(&hdr->name_count); i < j; i++) {
+		if (get_u32(&hdr->file_version) >= 64) {
+			get_string(&headerindex + 1,
+				 get_s8(&headerindex));
+			index++;
+		} else {
+			get_string(&headerindex, UPKG_NAME_NOCOUNT);
+		}
+		index += data_size;
+
+		strncpy(namesi.name, buf, UPKG_MAX_NAME_SIZE);
+
+		namesi.flags = get_s32(&headerindex);
+		index += data_size;
+	}
+	
+// hdr->name_count + 1 names total, this one's last
+	strncpy(namesi.name, "(NULL)", UPKG_MAX_NAME_SIZE);
+	namesi.flags = 0;
+}
+
+// load the export table (which is at the end of the file... go figure)
+void upkg::get_exports_cpnames(int idx) {
+ int x;
+ 
+ if (idx < 0 || idx >= get_u32(&hdr->export_count))
+	return;
+ 
+ x = get_u32(&exportsidx.class_index);
+ 
+ x = set_classname(idx, x);
+ 
+ set_pkgname(idx, x);
+}
+
+void upkg::get_exports(void)
+{
+	int i, j, index;
+	char readbuf1024;
+
+	reader->seek(hdr->export_offset);
+	reader->read(readbuf, 1024);
+
+	index = 0;
+
+	for (i = 0, j = get_u32(&hdr->export_count); i < j; i++) {
+		exportsi.class_index = get_fci(&readbufindex);
+		index += data_size;
+
+		exportsi.package_index = get_s32(&readbufindex);
+		index += data_size;
+
+		exportsi.super_index = get_fci(&readbufindex);
+		index += data_size;
+
+		exportsi.object_name = get_fci(&readbufindex);
+		index += data_size;
+
+		exportsi.object_flags = get_s32(&readbufindex);
+		index += data_size;
+
+		exportsi.serial_size = get_fci(&readbufindex);
+		index += data_size;
+
+		if (exportsi.serial_size > 0) {
+			exportsi.serial_offset =
+			 get_fci(&readbufindex);
+			index += data_size;
+		} else {
+			exportsi.serial_offset = -1;
+		}
+
+		get_exports_cpnames(i);	// go grab the class & package names
+	}
+}
+
+// load the import table (notice a trend?). same story as get_exports()
+void upkg::get_imports(void)
+{
+	int i, j, index;
+	char readbuf1024;
+
+	reader->seek(hdr->import_offset);
+	reader->read(readbuf, 1024);
+
+	index = 0;
+
+	for (i = 0, j = get_u32(&hdr->import_count); i < j; i++) {
+		importsi.class_package = get_fci(&readbufindex);
+		index += data_size;
+
+		importsi.class_name = get_fci(&readbufindex);
+		index += data_size;
+
+		importsi.package_index = get_s32(&readbufindex);
+		index += data_size;
+
+		importsi.object_name = get_fci(&readbufindex);
+		index += data_size;
+	}
+}	
+
+// load the type_names
+void upkg::get_type(char *buf, int e, int d)
+{
+	int i, j, index;
+	signed long tmp = 0;
+	char *chtmp;
+
+	index = 0;
+
+	for (i = 0, j = strlen(export_descd.order); i < j; i++) {
+		switch (export_descd.orderi) {
+		case UPKG_DATA_FCI:
+			tmp = get_fci(&bufindex);
+			index += data_size;
+			break;
+		case UPKG_DATA_32:
+			tmp = get_s32(&bufindex);
+			index += data_size;
+			break;
+		case UPKG_DATA_16:
+			tmp = get_s16(&bufindex);
+			index += data_size;
+			break;
+		case UPKG_DATA_8:
+			tmp = get_s8(&bufindex);
+			index += data_size;
+			break;
+		case UPKG_DATA_ASCIC:
+			chtmp =
+			 get_string(&bufindex + 1,
+				 get_s8(&bufindex));
+			index += data_size + 1;
+			break;
+		case UPKG_DATA_ASCIZ:
+			chtmp = get_string(&bufindex, UPKG_NAME_NOCOUNT);
+			index += data_size;
+			break;
+		case UPKG_OBJ_JUNK:	// do nothing!!!
+			break;
+		case UPKG_OBJ_NAME:
+			exportse.type_name = tmp;
+			break;
+		case UPKG_EXP_SIZE:	// maybe we'll do something later on
+			break;
+		case UPKG_OBJ_SIZE:
+			exportse.object_size = tmp;
+			break;
+		default:
+			exportse.type_name = -1;
+			return;
+		}
+	}
+
+	exportse.object_offset = exportse.serial_offset + index;
+}
+
+int upkg::get_types_isgood(int idx)
+{
+	int i;
+
+	for (i = 0; export_desci.version; i++) {
+		if (export_desci.version == get_u32(&hdr->file_version)) {
+			if (strcmp(export_desci.class_name,
+				 namesexportsidx.class_name.name
+			 ) == 0) {
+				return i;
+			}
+		}
+	}
+
+	return -1;
+}
+
+void upkg::check_type(int e, int d)
+{
+	int i;
+	char readbuf101, s, l;
+
+	reader->seek(exportse.object_offset);
+	reader->read(readbuf, 100);
+
+	for (i = 0; object_desci.sig_offset != -1; i++) {
+		s = object_desci.sig_offset;
+		l = strlen(object_desci.object_sig);
+		readbuf100 = readbufs + l;
+
+		readbufs + l = 0;
+
+		if (!strcmp(&readbufs, object_desci.object_sig)) {
+			return;
+		}
+
+		readbufs + l = readbuf100;
+	}
+
+	exportse.type_name = -1;
+}
+
+
+void upkg::get_types(void)
+{
+	int i, j, k;
+	char readbufUPKG_MAX_ORDERS * 4;
+
+	for (i = 0, k = get_u32(&hdr->export_count); i < k; i++) {
+		if ((j = get_types_isgood(i)) != -1) {
+			reader->seek(exportsi.serial_offset);
+			reader->read(readbuf, 4 * UPKG_MAX_ORDERS);
+
+			get_type(readbuf, i, j);
+
+			check_type(i, j);
+		} else {
+			exportsi.type_name = -1;
+		}
+	}
+}
+
+
+//************** GLOBALS
+
+
+// open that puppy!!! gets the file opened and the data structs read for use
+bool upkg::open(file_reader * p_reader)
+{
+	if (pkg_opened)		// is there a pkg opened already?
+		return false;	// if so, don't try to open another one!
+
+	if (p_reader == NULL)
+		return false;
+
+	reader = p_reader;
+
+	if (reader->read(header, 4096) < 4096) {
+		return false;
+	}
+
+	if (load_upkg() != 0) {
+		return false;
+	}
+
+	pkg_opened = 1;
+
+	get_names();		// this order is important.
+	get_imports();
+	get_exports();
+	get_types();
+
+	return true;
+}
+
+// close everything out
+void upkg::close(void)
+{
+	if (pkg_opened == 0)
+		return;
+
+	free(imports);
+	free(exports);
+	free(names);
+	hdr = (upkg_hdr *) 0;
+
+	pkg_opened = 0;
+}
+
+// API stuff... should be self-explainatory (upkg_o* == unreal package object *)
+signed int upkg::ocount(void)
+{
+	if (pkg_opened == 0)
+		return -1;
+
+	return hdr->export_count;
+}
+
+
+char * upkg::oname(signed int idx)
+{
+	idx = export_index(idx);
+	if (idx == -1 || pkg_opened == 0)
+		return NULL;
+
+	return namesexportsidx.object_name.name;
+}
+
+char * upkg::oclassname(signed int idx)
+{
+	idx = export_index(idx);
+	if (idx == -1 || pkg_opened == 0)
+		return NULL;
+
+	return namesexportsidx.class_name.name;
+}
+
+char * upkg::opackagename(signed int idx)
+{
+	idx = export_index(idx);
+	if (idx == -1 || pkg_opened == 0)
+		return NULL;
+
+	return namesexportsidx.package_name.name;
+}
+
+char * upkg::otype(signed int idx)
+{
+	idx = export_index(idx);
+	if (idx == -1 || pkg_opened == 0)
+		return NULL;
+
+	if (exportsidx.type_name == -1)
+		return NULL;
+
+	return namesexportsidx.type_name.name;
+}
+
+signed int upkg::export_size(signed int idx)
+{
+	idx = export_index(idx);
+	if (idx == -1 || pkg_opened == 0)
+		return 0;
+
+	return exportsidx.serial_size;
+}
+
+signed int upkg::object_size(signed int idx)
+{
+	idx = export_index(idx);
+	if (idx == -1 || pkg_opened == 0)
+		return 0;
+
+	return exportsidx.object_size;
+}
+
+signed int upkg::export_offset(signed int idx)
+{
+	idx = export_index(idx);
+	if (idx == -1 || pkg_opened == 0)
+		return 0;
+
+	return exportsidx.serial_offset;
+}
+
+signed int upkg::object_offset(signed int idx)
+{
+	idx = export_index(idx);
+	if (idx == -1 || pkg_opened == 0)
+		return 0;
+
+	return exportsidx.object_offset;
+}
+
+
+int upkg::read(void *readbuf, signed int bytes, signed int offset)
+{
+	if (pkg_opened == 0)
+		return -1;
+
+	reader->seek(offset);
+
+	return reader->read(readbuf, bytes);
+}
+
+int upkg::export_dump(file_writer * writer, signed int idx)
+{
+	int count, diff;
+	void *buffer;
+
+	idx = export_index(idx);
+	if (idx == -1 || pkg_opened == 0)
+		return -1;
+
+	buffer = malloc(4096);
+	if (buffer == NULL)
+		return -1;
+
+	reader->seek(exportsidx.serial_offset);
+
+	count = exportsidx.serial_size;
+
+	do {
+		diff =
+			reader->read(buffer, ((count > 4096) ? 4096 : count));
+		writer->write(buffer, diff);
+		count -= diff;
+	} while (count > 0);
+
+	free(buffer);
+
+	return 0;
+}
+
+int upkg::object_dump(file_writer * writer, signed int idx)
+{
+	int count, diff;
+	void *buffer;
+
+	idx = export_index(idx);
+	if (idx == -1 || pkg_opened == 0)
+		return -1;
+
+	buffer = malloc(4096);
+	if (buffer == NULL)
+		return -1;
+
+	reader->seek(exportsidx.object_offset);
+
+	count = exportsidx.object_size;
+
+	do {
+		diff =
+			reader->read(buffer, ((count > 4096) ? 4096 : count));
+		writer->write(buffer, diff);
+		count -= diff;
+	} while (count > 0);
+
+	free(buffer);
+
+	return 0;
+}
+
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/unrealfmtdata.cpp Added

@@ -0,0 +1,56 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+namespace umr
+{
+
+#include "urf.h"
+
+
+// version, class_name, order
+const upkg_export_hdr export_desc = {
+	{61, "Music", "FjFnFd"},
+	{61, "Sound", "FjFnFd"},
+	//{61, "Palette", ""},
+
+	{62, "Music", "FjFn3sFd"},
+	{62, "Sound", "FjFn3sFd"},
+	//{62, "Palette", ""},
+
+	{63, "Music", "FjFn3sFd"},
+	{63, "Music", "FjFn3sFd"},
+
+	{64, "Music", "FjFn3sFd"},
+	{64, "Music", "FjFn3sFd"},
+	//{64, "Palette", ""},
+
+	{66, "Music", "FjFn3sFd"},
+	{66, "Sound", "FjFn3sFd"},
+	//{66, "Palette", ""},
+
+	{68, "Music", "FjFn3sFd"},
+	{68, "Sound", "FjFn3sFd"},
+	//{68, "Palette", ""},
+
+	{69, "Music", "FjFn3sFd"},
+	{69, "Sound", "FjFn3sFd"},
+	//{69, "Palette", ""},
+
+	{0, "", ""}		// last entry must have version == 0
+};
+
+const upkg_object_hdr object_desc = {
+	{"s3m", "SCRM", 44/*, "ScreamTracker 3"*/}
+	,
+	{"it", "IMPM", 0 /*, "Impluse Tracker" */}
+	,
+	{"xm", "Fast", 38 /*, "FastTracker 2.0" */}
+	,
+	//{"WAV", "WAVE", 8, "MS PCM Sound"}
+	//,
+
+	{"", "", -1 /*, ""*/}	// last entry must have sig_offset == -1
+};
+
+}

deadbeef-1.9.6.tar.bz2/plugins/dumb/urf.h Added

@@ -0,0 +1,113 @@
+#ifndef _URF_H
+#define _URF_H
+
+#define UPKG_MAX_NAME_SIZE	64
+#define UPKG_MAX_ORDERS		10
+
+// all data types in upkg files are signed
+#define UPKG_DATA_FCI	'F'
+#define UPKG_DATA_32	'3'
+#define UPKG_DATA_16	'1'
+#define UPKG_DATA_8	'8'
+#define UPKG_DATA_ASCIC	'C'
+#define UPKG_DATA_ASCIZ	'Z'
+
+#define UPKG_OBJ_JUNK	'j'
+#define UPKG_OBJ_NAME	'n'
+#define UPKG_EXP_SIZE	's'
+#define UPKG_OBJ_SIZE	'd'
+
+#define UPKG_NAME_NOCOUNT	-1
+
+#define UPKG_HDR_TAG	0x9e2a83c1
+
+enum upkg_flags {
+ RF_Transactional	= 0x00000001,
+ RF_SourceModified	= 0x00000002,
+ RF_Public		= 0x00000004,
+ RF_LoadForClient	= 0x00010000,
+ RF_LoadForServer	= 0x00020000,
+ RF_LoadForEdit	= 0x00040000,
+ RF_Standalone	= 0x00080000,
+ RF_HasStack		= 0x02000000,
+ RF_Intrinsic	= 0x04000000
+};
+
+struct unreal_pkg_hdr {
+	int32_t tag,	// hdr tag, should == UPKG_HDR_TAG
+	 file_version,		// should be 61 for unreal. > for UT
+	 pkg_flags,		// bitflags.. we don't need them
+	 name_count,		// number of names in name table (>= 0)
+	 name_offset,		// offset to name table (>= 0)
+	 export_count,		// num. exports in export table (>= 0)
+	 export_offset,		// offset to export table (>= 0)
+	 import_count,		// -- seeing a trend yet? (>= 0)
+	 import_offset,		// (>= 0)
+	 heritage_count,	// heritage table (has GUID's) (>= 1)
+	 heritage_offset;	// (>= 0)
+};
+
+
+/* indices have 2 types. type 1 is harder, so I'll describe type 2 first. =)
+
+ type 2 is an index into the name table (upkg_name_table). pure and simple.
+ 
+ type 1 is an index into either the imports table, or the exports table, or NULL.
+ if index == 0, you can ignore it
+ if index < 0, use imports-index - 1
+ if index > 0, use exportsindex - 1
+ 
+ type 1 is used for dependency/inheritancy info
+*/
+struct unreal_pkg_export_tbl {
+	int32_t class_index,	// index, type 1
+	 package_index,		// index, type 1
+	 super_index,		// index, type 1
+	 object_name,		// index, type 2
+	 object_flags,		// flags for the object (will be supported when I decide to code it ;-)
+	 serial_size,		// size of export described
+	 serial_offset,		// start of the export in the the package file (offset from beginning of file)
+	 class_name,		// index, type 2 (the name of the object class)
+	 package_name,		// index, type 2 (the name of the object package)
+	 type_name,		// index, type 2 (the name of the object type)
+	 object_size,		// bytes of data in object
+	 object_offset;		// offset into package file that object starts
+};
+
+struct unreal_pkg_import_tbl {
+	int32_t class_package,	// index, type 2
+	 class_name,		// index, type 2
+	 package_index,		// index, type 1
+	 object_name;		// index, type 2
+};
+
+struct unreal_pkg_name_tbl {
+	char nameUPKG_MAX_NAME_SIZE;	// a name
+	int32_t flags;	// flags for the name
+};
+
+struct unreal_pkg_export_hdr {
+	int32_t version;	// version of pkg header this supports
+	const char * class_name; //UPKG_MAX_NAME_SIZE;	// unreal class
+	const char * order; //UPKG_MAX_ORDERS * 10;	// order of the header
+};
+
+struct unreal_pkg_object_hdr {
+	const char type_str4;	// type string of the object type
+	const char object_sig5;	// sig of the object data (if exists)
+	int32_t sig_offset;		// offset in object that object_sig occurs
+	//char desc33;		// description of the object
+};
+
+typedef struct unreal_pkg_hdr upkg_hdr;
+typedef struct unreal_pkg_export_tbl upkg_exports;
+typedef struct unreal_pkg_import_tbl upkg_imports;
+typedef struct unreal_pkg_name_tbl upkg_names;
+typedef struct unreal_pkg_export_hdr upkg_export_hdr;
+typedef struct unreal_pkg_object_hdr upkg_object_hdr;
+
+
+extern const upkg_export_hdr export_desc;
+extern const upkg_object_hdr object_desc;
+
+#endif				// _URF_H

deadbeef-0.6.2.tar.bz2/plugins/ffap/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/ffap/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/ffap/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/ffap/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/ffap/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/ffap/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/ffap/ffap.c -> deadbeef-1.9.6.tar.bz2/plugins/ffap/ffap.c Changed

@@ -1,6 +1,6 @@
 /*
 DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2013 Oleksiy Yakovenko <waker@users.sourceforge.net>
 based on apedec from FFMpeg Copyright (c) 2007 Benjamin Zores <ben@geexbox.org>
 based upon libdemac from Dave Chapman.
 
@@ -37,7 +37,8 @@
 //#include <alloca.h>
 #include <assert.h>
 #include <math.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 
 #ifdef TARGET_ANDROID
 int posix_memalign (void **memptr, size_t alignment, size_t size) {
@@ -62,19 +63,6 @@
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
 
-static inline unsigned int bytestream_get_buffer(const uint8_t **b, uint8_t *dst, unsigned int size)
-{
- memcpy(dst, *b, size);
- (*b) += size;
- return size;
-}
-
-static inline void bytestream_put_buffer(uint8_t **b, const uint8_t *src, unsigned int size)
-{
- memcpy(*b, src, size);
- (*b) += size;
-}
-
 static inline uint8_t bytestream_get_byte (const uint8_t **ptr) {
 uint8_t v = *(*ptr);
 (*ptr)++;
@@ -94,7 +82,9 @@
 #define MAX_BYTESPERSAMPLE 3
 
 #define APE_FRAMECODE_MONO_SILENCE 1
-#define APE_FRAMECODE_STEREO_SILENCE 3
+#define APE_FRAMECODE_LEFT_SILENCE 1 /* same as mono */
+#define APE_FRAMECODE_RIGHT_SILENCE 2
+#define APE_FRAMECODE_STEREO_SILENCE 3 /* combined */
 #define APE_FRAMECODE_PSEUDO_STEREO 4
 
 #define HISTORY_SIZE 512
@@ -267,7 +257,7 @@
 int packet_remaining; // number of bytes in packet_data
 int packet_sizeleft; // number of bytes left unread for current ape frame
 int samplestoskip;
- int currentsample; // current sample from beginning of file
+ int64_t currentsample; // current sample from beginning of file
 
 uint8_t bufferBLOCKS_PER_LOOP * 2 * 2 * 2;
 int remaining;
@@ -279,8 +269,8 @@
 
 typedef struct {
 DB_fileinfo_t info;
- int startsample;
- int endsample;
+ int64_t startsample;
+ int64_t endsample;
 APEContext ape_ctx;
 DB_FILE *fp;
 } ape_info_t;
@@ -290,7 +280,7 @@
 read_uint16(DB_FILE *fp, uint16_t* x)
 {
 unsigned char tmp2;
- int n;
+ size_t n;
 
 n = deadbeef->fread(tmp, 1, 2, fp);
 
@@ -304,16 +294,10 @@
 
 
 inline static int
-read_int16(DB_FILE *fp, int16_t* x)
-{
- return read_uint16(fp, (uint16_t*)x);
-}
-
-inline static int
 read_uint32(DB_FILE *fp, uint32_t* x)
 {
 unsigned char tmp4;
- int n;
+ size_t n;
 
 n = deadbeef->fread(tmp, 1, 4, fp);
 
@@ -384,7 +368,6 @@
 ape_read_header(DB_FILE *fp, APEContext *ape)
 {
 int i;
- int total_blocks;
 
 /* TODO: Skip any leading junk such as id3v2 tags */
 ape->junklength = 0;
@@ -395,7 +378,7 @@
 if (memcmp (ape->magic, "MAC ", 4))
 return -1;
 
- if (read_uint16 (fp, &ape->fileversion) < 0) {
+ if (read_uint16 (fp, (uint16_t *)&ape->fileversion) < 0) {
 return -1;
 }
 
@@ -405,7 +388,7 @@
 }
 
 if (ape->fileversion >= 3980) {
- if (read_uint16 (fp, &ape->padding1) < 0) {
+ if (read_uint16 (fp, (uint16_t *)&ape->padding1) < 0) {
 return -1;
 }
 if (read_uint32 (fp, &ape->descriptorlength) < 0) {
@@ -537,7 +520,7 @@
 fprintf (stderr, "ape: Too many frames: %d\n", ape->totalframes);
 return -1;
 }
- ape->frames = malloc(ape->totalframes * sizeof(APEFrame));
+ ape->frames = calloc(ape->totalframes, sizeof(APEFrame));
 if(!ape->frames)
 return -1;
 ape->firstframe = ape->junklength + ape->descriptorlength + ape->headerlength + ape->seektablelength + ape->wavheaderlength;
@@ -549,7 +532,7 @@
 ape->totalsamples += ape->blocksperframe * (ape->totalframes - 1);
 
 if (ape->seektablelength > 0) {
- ape->seektable = malloc(ape->seektablelength);
+ ape->seektable = calloc (1, ape->seektablelength);
 for (i = 0; i < ape->seektablelength / sizeof(uint32_t); i++) {
 if (read_uint32 (fp, &ape->seektablei) < 0) {
 return -1;
@@ -561,9 +544,11 @@
 ape->frames0.nblocks = ape->blocksperframe;
 ape->frames0.skip = 0;
 for (i = 1; i < ape->totalframes; i++) {
- ape->framesi.pos = ape->seektablei; //ape->framesi-1.pos + ape->blocksperframe;
+ if (ape->seektablelength > 0) {
+ ape->framesi.pos = ape->seektablei;
+ }
 ape->framesi.nblocks = ape->blocksperframe;
- ape->framesi - 1.size = ape->framesi.pos - ape->framesi - 1.pos;
+ ape->framesi - 1.size = (int)(ape->framesi.pos - ape->framesi - 1.pos);
 ape->framesi.skip = (ape->framesi.pos - ape->frames0.pos) & 3;
 }
 ape->framesape->totalframes - 1.size = ape->finalframeblocks * 4;
@@ -584,8 +569,6 @@
 fprintf (stderr, "ape: Decoding file - v%d.%02d, compression level %d\n", ape->fileversion / 1000, (ape->fileversion % 1000) / 10, ape->compressiontype);
 #endif
 
- total_blocks = (ape->totalframes == 0) ? 0 : ((ape->totalframes - 1) * ape->blocksperframe) + ape->finalframeblocks;
-
 return 0;
 }
 
@@ -607,7 +590,6 @@
 
 static int ape_read_packet(DB_FILE *fp, APEContext *ape_ctx)
 {
- int ret;
 int nblocks;
 APEContext *ape = ape_ctx;
 uint32_t extra_size = 8;
@@ -642,7 +624,7 @@
 int sz = PACKET_BUFFER_SIZE-8;
 sz = min (sz, ape->framesape->currentframe.size);
 // fprintf (stderr, "readsize: %d, packetsize: %d\n", sz, ape->framesape->currentframe.size);
- ret = deadbeef->fread (ape->packet_data + extra_size, 1, sz, fp);
+ deadbeef->fread (ape->packet_data + extra_size, 1, sz, fp);
 ape->packet_sizeleft = ape->framesape->currentframe.size - sz + 8;
 ape->packet_remaining = sz+8;
 
@@ -688,9 +670,8 @@
 
 static DB_fileinfo_t *
 ffap_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (ape_info_t));
- memset (_info, 0, sizeof (ape_info_t));
- return _info;
+ ape_info_t *info = calloc (1, sizeof (ape_info_t));
+ return &info->info;
 }
 
 static int
@@ -699,8 +680,9 @@
 ape_info_t *info = (ape_info_t*)_info;
 
 deadbeef->pl_lock ();
- info->fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ info->fp = deadbeef->fopen (uri);
 if (!info->fp) {
 return -1;
 }
@@ -754,9 +736,10 @@
 return -1;
 }
 
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample (it);
+ info->endsample = endsample;
 plugin.seek_sample (_info, 0);
 //trace ("start: %d/%f, end: %d/%f\n", startsample, timestart, endsample, timeend);
 }
@@ -976,16 +959,7 @@
 */
 lo_bits = (nbits - 16);
 
- // {{{ unrolled base_hi = range_decode_culfreq(ctx, (pivot >> lo_bits) + 1)
- range_dec_normalize(ctx);
- ctx->rc.help = ctx->rc.range / ((pivot >> lo_bits) + 1);
- if (unlikely (ctx->rc.help == 0)) {
- trace ("rc.help=0\n");
- ctx->error = 1;
- return 0;
- }
- base_hi = ctx->rc.low / ctx->rc.help;
- // }}}
+ base_hi = range_decode_culfreq(ctx, (pivot >> lo_bits) + 1);
 range_decode_update(ctx, 1, base_hi);
 
 base_lo = range_decode_culshift(ctx, lo_bits);
@@ -994,15 +968,7 @@
 base = (base_hi << lo_bits) + base_lo;
 }
 else {
- // {{{ unrolled base = range_decode_culfreq(ctx, pivot)
- range_dec_normalize(ctx);
- ctx->rc.help = ctx->rc.range / pivot;
- if (unlikely (ctx->rc.help == 0)) {
- ctx->error = 1;
- return 0;
- }
- base = ctx->rc.low / ctx->rc.help;
- // }}}
+ base = range_decode_culfreq(ctx, pivot);
 range_decode_update(ctx, 1, base);
 }
 
@@ -1025,10 +991,12 @@
 
 ctx->blocksdecoded = blockstodecode;
 
- if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
+ if ((ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) == APE_FRAMECODE_STEREO_SILENCE) {
 /* We are pure silence, just memset the output buffer. */
 memset(decoded0, 0, blockstodecode * sizeof(int32_t));
- memset(decoded1, 0, blockstodecode * sizeof(int32_t));
+ if (stereo) {
+ memset(decoded1, 0, blockstodecode * sizeof(int32_t));
+ }
 } else {
 while (likely (blockstodecode--)) {
 *decoded0++ = ape_decode_value(ctx, &ctx->riceY);
@@ -1428,7 +1396,6 @@
 int32_t *decoded1 = ctx->decoded1;
 
 if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
- entropy_decode(ctx, count, 0);
 /* We are pure silence, so we're done. */
 //fprintf (stderr, "pure silence mono\n");
 return;
@@ -1455,7 +1422,7 @@
 int32_t *decoded0 = ctx->decoded0;
 int32_t *decoded1 = ctx->decoded1;
 
- if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
+ if ((ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) == APE_FRAMECODE_STEREO_SILENCE) {
 /* We are pure silence, so we're done. */
 //fprintf (stderr, "pure silence stereo\n");
 return;
@@ -1486,7 +1453,7 @@
 int nblocks;
 int i, n;
 int blockstodecode;
- int bytes_used;
+ long bytes_used;
 int samplesize = _info->fmt.bps/8 * s->channels;;
 
 /* should not happen but who knows */
@@ -1543,8 +1510,8 @@
 sz = min (sz, s->packet_sizeleft);
 sz = sz&~3;
 uint8_t *p = s->packet_data + s->packet_remaining;
- int r = deadbeef->fread (p, 1, sz, info->fp);
- bswap_buf((uint32_t*)p, (const uint32_t*)p, r >> 2);
+ size_t r = deadbeef->fread (p, 1, sz, info->fp);
+ bswap_buf((uint32_t*)p, (const uint32_t*)p, (int)r >> 2);
 s->packet_sizeleft -= r;
 s->packet_remaining += r;
 //fprintf (stderr, "read more %d bytes for current packet, sizeleft=%d, packet_remaining=%d\n", r, packet_sizeleft, packet_remaining);
@@ -1651,7 +1618,7 @@
 s->ptr -= bytes_used;
 s->last_ptr = s->ptr;
 
- return bytes_used;
+ return (int)bytes_used;
 }
 
 static DB_playItem_t *
@@ -1703,24 +1670,8 @@
 deadbeef->fclose (fp);
 fp = NULL;
 
- // embedded cue
- deadbeef->pl_lock ();
- const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
- DB_playItem_t *cue = NULL;
- if (cuesheet) {
- cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), ape_ctx.totalsamples, ape_ctx.samplerate);
- if (cue) {
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
- deadbeef->pl_unlock ();
- ape_free_ctx (&ape_ctx);
- return cue;
- }
- }
- deadbeef->pl_unlock ();
-
 char s100;
- snprintf (s, sizeof (s), "%lld", fsize);
+ snprintf (s, sizeof (s), "%lld", (long long)fsize);
 deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
 snprintf (s, sizeof (s), "%d", ape_ctx.bps);
 deadbeef->pl_add_meta (it, ":BPS", s);
@@ -1732,10 +1683,9 @@
 snprintf (s, sizeof (s), "%d", br);
 deadbeef->pl_add_meta (it, ":BITRATE", s);
 
- cue = deadbeef->plt_insert_cue (plt, after, it, ape_ctx.totalsamples, ape_ctx.samplerate);
+ DB_playItem_t *cue = deadbeef->plt_process_cue (plt, after, it, ape_ctx.totalsamples, ape_ctx.samplerate);
 if (cue) {
 deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
 ape_free_ctx (&ape_ctx);
 return cue;
 }
@@ -1766,7 +1716,7 @@
 int samplesize = _info->fmt.bps / 8 * info->ape_ctx.channels;
 
 if (info->ape_ctx.currentsample + size / samplesize > info->endsample) {
- size = (info->endsample - info->ape_ctx.currentsample + 1) * samplesize;
+ size = (int)((info->endsample - info->ape_ctx.currentsample + 1) * samplesize);
 trace ("size truncated to %d bytes (%d samples), cursample=%d, info->endsample=%d, totalsamples=%d\n", size, size / samplesize, info->ape_ctx.currentsample, info->endsample, info->ape_ctx.totalsamples);
 if (size <= 0) {
 return 0;
@@ -1868,8 +1818,9 @@
 
 static int ffap_read_metadata (DB_playItem_t *it) {
 deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
 if (!fp) {
 return -1;
 }
@@ -1918,8 +1869,7 @@
 
 // define plugin interface
 static DB_decoder_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_DECODER,
@@ -1927,7 +1877,7 @@
 .plugin.name = "Monkey's Audio (APE) decoder",
 .plugin.descr = "APE player based on code from libavc and rockbox",
 .plugin.copyright = 
- "Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2009-2013 Oleksiy 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"
@@ -1976,6 +1926,9 @@
 #define FF_MM_IWMMXT 0x0100 ///< XScale IWMMXT
 #define FF_MM_ALTIVEC 0x0001 ///< standard AltiVec
 
+#ifdef __APPLE__
+#define mm_support() FF_MM_SSE2
+#else
 /* ebx saving is necessary for PIC. gcc seems unable to see it alone */
 #define cpuid(index,eax,ebx,ecx,edx)\
 __asm__ volatile\
@@ -2063,6 +2016,7 @@
 return rval;
 }
 #endif
+#endif
 
 #if ARCH_ARM
 int32_t EXTERN_ASMff_scalarproduct_int16_neon(int16_t *v1, int16_t *v2, int len,

deadbeef-0.6.2.tar.bz2/plugins/ffmpeg/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/ffmpeg/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/ffmpeg/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/ffmpeg/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/ffmpeg/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/ffmpeg/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/ffmpeg/ffmpeg.c -> deadbeef-1.9.6.tar.bz2/plugins/ffmpeg/ffmpeg.c Changed

@@ -1,6 +1,6 @@
 /*
 DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2013 Oleksiy 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
@@ -23,41 +23,19 @@
 //#include <alloca.h>
 #include <errno.h>
 
-#include "../../deadbeef.h"
-#include "../../strdupa.h"
-
-#if !FFMPEG_OLD
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 
 #include <libavformat/avformat.h>
 #include <libavcodec/avcodec.h>
 #include <libavutil/avutil.h>
 #include <libavutil/avstring.h>
 
-#else
-
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avutil.h>
-#include <ffmpeg/avstring.h>
 
-#define AVERROR_EOF AVERROR(EPIPE)
-
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-#define av_register_protocol register_protocol
-#endif
-
-#ifndef AV_VERSION_INT
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#endif
-
-#endif
+#define avcodec_free_frame(frame) av_frame_free(frame)
 
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0)
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-#define av_find_stream_info(ctx) avformat_find_stream_info(ctx,NULL)
-#define avcodec_open(ctx,codec) avcodec_open2(ctx,codec,NULL)
-#define av_get_bits_per_sample_format(fmt) (av_get_bytes_per_sample(fmt)*8)
-#define av_close_input_file(ctx) avformat_close_input(&(ctx))
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 8, 0)
+#define av_packet_unref(packet) av_free_packet(packet)
 #endif
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
@@ -66,65 +44,136 @@
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
 
-static DB_decoder_t plugin;
+static ddb_decoder2_t plugin;
 static DB_functions_t *deadbeef;
 
-#define DEFAULT_EXTS "aa3;oma;ac3;vqf;amr;opus;tak"
+#define DEFAULT_EXTS "aa3;oma;ac3;vqf;amr;tak;dsf;dff;wma;3gp;mp4;m4a"
+#define UNPOPULATED_EXTS_BY_FFMPEG \
+ "aif,aiff,afc,aifc,amr,asf," \
+ "wmv,wma,au,caf,webm," \
+ "gxf,lbc,mmf,mpg,mpeg,ts,m2t," \
+ "m2ts,mts,mxf,rm,ra,roq,sox," \
+ "spdif,swf,rcv,voc,w64,wav,wv"
 
-#define EXT_MAX 100
+#define EXT_MAX 1024
 
-#define FFMPEG_MAX_ANALYZE_DURATION 500000
-
-static char * extsEXT_MAX = {NULL};
-
-enum {
- FT_ALAC = 0,
- FT_WMA = 1,
- FT_ATRAC3 = 2,
- FT_VQF = 3,
- FT_AC3 = 4,
- FT_AMR = 5,
- FT_UNKNOWN = 5
-};
-
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 6, 0)
-#define FF_PROTOCOL_NAME "deadbeef"
-#endif
+static char * extsEXT_MAX+1 = {NULL};
+static int enable_dop = 0;
 
 typedef struct {
 DB_fileinfo_t info;
 AVCodec *codec;
- AVCodecContext *ctx;
- AVFormatContext *fctx;
+ AVCodecContext *codec_context;
+ int need_to_free_codec_context;
+ AVFormatContext *format_context;
 AVPacket pkt;
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 40, 0)
 AVFrame *frame;
-#endif
 int stream_id;
 
 int left_in_packet;
 int have_packet;
 
- char *buffer; // must be AVCODEC_MAX_AUDIO_FRAME_SIZE
- int left_in_buffer;
+ char *buffer;
+ size_t left_in_buffer;
+ size_t buffer_size;
 
- int startsample;
- int endsample;
- int currentsample;
+ int64_t startsample;
+ int64_t endsample;
+ int64_t currentsample;
 } ffmpeg_info_t;
 
-static DB_playItem_t *current_track;
-static DB_fileinfo_t *current_info;
-
 static DB_fileinfo_t *
 ffmpeg_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (ffmpeg_info_t));
- memset (_info, 0, sizeof (ffmpeg_info_t));
- return _info;
+ ffmpeg_info_t *info = calloc (1, sizeof (ffmpeg_info_t));
+ return &info->info;
+}
+
+static const uint8_t bit_reverse_table256 =
+{
+#define R2(n) n, n + 2*64, n + 1*64, n + 3*64
+#define R4(n) R2(n), R2(n + 2*16), R2(n + 1*16), R2(n + 3*16)
+#define R6(n) R4(n), R4(n + 2*4 ), R4(n + 1*4 ), R4(n + 3*4 )
+ R6(0), R6(2), R6(1), R6(3)
+#undef R2
+#undef R4
+#undef R6
+};
+
+int is_codec_dsd(enum AVCodecID codec_id) {
+ switch(codec_id) {
+ case AV_CODEC_ID_DSD_LSBF:
+ case AV_CODEC_ID_DSD_LSBF_PLANAR:
+ case AV_CODEC_ID_DSD_MSBF:
+ case AV_CODEC_ID_DSD_MSBF_PLANAR:
+ return 1;
+ break;
+ default:
+ return 0;
+ }
+}
+
+// ensure that the buffer can contain entire frame of frame_size bytes per channel
+static int
+ensure_buffer (ffmpeg_info_t *info, size_t frame_size) {
+ if (!info->buffer || info->buffer_size < frame_size * info->codec_context->channels) {
+ if (info->buffer) {
+ free (info->buffer);
+ info->buffer = NULL;
+ }
+ info->buffer_size = frame_size*info->codec_context->channels;
+ info->left_in_buffer = 0;
+ int err = posix_memalign ((void **)&info->buffer, 16, info->buffer_size);
+ if (err) {
+ fprintf (stderr, "ffmpeg: failed to allocate %ld bytes of buffer memory\n", (long)info->buffer_size);
+ return -1;
+ }
+ }
+ return 0;
+}
+
+static int
+_get_audio_codec_from_stream(AVFormatContext *format_context, int stream_index, ffmpeg_info_t *info) {
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 0)
+ if (format_context->streamsstream_index->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+ return 0;
+ }
+ AVCodec *codec = avcodec_find_decoder(format_context->streamsstream_index->codecpar->codec_id);
+ if (codec == NULL) {
+ return 0;
+ }
+ info->codec = codec;
+ info->stream_id = stream_index;
+ info->codec_context = avcodec_alloc_context3 (info->codec);
+ info->need_to_free_codec_context = 1;
+ avcodec_parameters_to_context(info->codec_context, format_context->streamsstream_index->codecpar);
+#else
+ if (format_context->streamsstream_index->codec->codec_type != AVMEDIA_TYPE_AUDIO) {
+ return 0;
+ }
+ AVCodecContext *ctx = format_context->streamsstream_index->codec;
+ if (ctx == NULL) {
+ return 0;
+ }
+ AVCodec *codec = avcodec_find_decoder (ctx->codec_id);
+ if (codec == NULL) {
+ return 0;
+ }
+ info->codec_context = ctx;
+ info->codec = codec;
+ info->stream_id = stream_index;
+#endif
+ return 1;
 }
 
 static int
 ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ // Don't allow playing network streams.
+ // Even when ffmpeg has network support, it's causing too many problems this way.
+ const char *fname = deadbeef->pl_find_meta (it, ":URI");
+ if (!deadbeef->is_local_file (fname)) {
+ return -1;
+ }
+
 ffmpeg_info_t *info = (ffmpeg_info_t *)_info;
 trace ("ffmpeg init %s\n", deadbeef->pl_find_meta (it, ":URI"));
 // prepare to decode the track
@@ -137,60 +186,30 @@
 deadbeef->pl_lock ();
 {
 const char *fname = deadbeef->pl_find_meta (it, ":URI");
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0)
 uri = strdupa (fname);
-#else
- int l = strlen (fname);
- uri = alloca (l + sizeof (FF_PROTOCOL_NAME) + 1);
-
- // construct uri
- memcpy (uri, FF_PROTOCOL_NAME, sizeof (FF_PROTOCOL_NAME)-1);
- memcpy (uri + sizeof (FF_PROTOCOL_NAME)-1, ":", 1);
- memcpy (uri + sizeof (FF_PROTOCOL_NAME), fname, l);
- urisizeof (FF_PROTOCOL_NAME) + l = 0;
-#endif
 }
 deadbeef->pl_unlock ();
 trace ("ffmpeg: uri: %s\n", uri);
 
 // open file
 trace ("\0330;31mffmpeg av_open_input_file\03337;0m\n");
- current_track = it;
- current_info = _info;
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0)
- avformat_network_init();
- info->fctx = avformat_alloc_context ();
- if ((ret = avformat_open_input(&info->fctx, uri, NULL, NULL)) < 0) {
-#else
- if ((ret = av_open_input_file(&info->fctx, uri, NULL, 0, NULL)) < 0) {
-#endif
- current_track = NULL;
+
+ info->format_context = avformat_alloc_context ();
+
+ if ((ret = avformat_open_input(&info->format_context, uri, NULL, NULL)) < 0) {
 trace ("\0330;31minfo->fctx is %p, ret %d/%s\0330;31m\n", info->fctx, ret, strerror(-ret));
 return -1;
 }
 trace ("\0330;31mav_open_input_file done, ret=%d\0330;31m\n", ret);
- current_track = NULL;
- current_info = NULL;
 
- trace ("\0330;31mffmpeg av_find_stream_info\03337;0m\n");
+ trace ("\0330;31mffmpeg avformat_find_stream_info\03337;0m\n");
 info->stream_id = -1;
- info->fctx->max_analyze_duration = FFMPEG_MAX_ANALYZE_DURATION;
- av_find_stream_info(info->fctx);
- for (i = 0; i < info->fctx->nb_streams; i++)
- {
- info->ctx = info->fctx->streamsi->codec;
- if (info->ctx->codec_type ==
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
- AVMEDIA_TYPE_AUDIO)
-#else
- CODEC_TYPE_AUDIO)
-#endif
- {
- info->codec = avcodec_find_decoder (info->ctx->codec_id);
- if (info->codec != NULL) {
- info->stream_id = i;
- break;
- }
+ info->format_context->max_analyze_duration = AV_TIME_BASE;
+ avformat_find_stream_info(info->format_context, NULL);
+ AVFormatContext *fctx = info->format_context;
+ for (i = 0; i < info->format_context->nb_streams; i++) {
+ if (_get_audio_codec_from_stream (fctx, i, info)) {
+ break;
 }
 }
 
@@ -202,64 +221,60 @@
 trace ("ffmpeg can decode %s\n", deadbeef->pl_find_meta (it, ":URI"));
 trace ("ffmpeg: codec=%s, stream=%d\n", info->codec->name, i);
 
- if (avcodec_open (info->ctx, info->codec) < 0) {
- trace ("ffmpeg: avcodec_open failed\n");
+ if (avcodec_open2 (info->codec_context, info->codec, NULL) < 0) {
+ trace ("ffmpeg: avcodec_open2 failed\n");
 return -1;
 }
 
 deadbeef->pl_replace_meta (it, "!FILETYPE", info->codec->name);
 
- int bps = av_get_bits_per_sample_format (info->ctx->sample_fmt);
- int samplerate = info->ctx->sample_rate;
- float duration = info->fctx->duration / (float)AV_TIME_BASE;
- trace ("ffmpeg: bits per sample is %d\n", bps);
- trace ("ffmpeg: samplerate is %d\n", samplerate);
- trace ("ffmpeg: duration is %lld/%fsec\n", info->fctx->duration, duration);
+ int bps = av_get_bytes_per_sample (info->codec_context->sample_fmt)*8;
+ int samplerate = info->codec_context->sample_rate;
 
- int totalsamples = info->fctx->duration * samplerate / AV_TIME_BASE;
+ if (bps <= 0 || info->codec_context->channels <= 0 || samplerate <= 0) {
+ return -1;
+ }
+
+ int64_t totalsamples = info->format_context->duration * samplerate / AV_TIME_BASE;
 info->left_in_packet = 0;
 info->left_in_buffer = 0;
 
 memset (&info->pkt, 0, sizeof (info->pkt));
 info->have_packet = 0;
 
- int err = posix_memalign ((void **)&info->buffer, 16, AVCODEC_MAX_AUDIO_FRAME_SIZE);
- if (err) {
- fprintf (stderr, "ffmpeg: failed to allocate buffer memory\n");
- return -1;
- }
-
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 40, 0)
- info->frame = avcodec_alloc_frame();
-#endif
+ info->frame = av_frame_alloc();
 
 // fill in mandatory plugin fields
- _info->plugin = &plugin;
+ _info->plugin = &plugin.decoder;
 _info->readpos = 0;
 _info->fmt.bps = bps;
- _info->fmt.channels = info->ctx->channels;
+ _info->fmt.channels = info->codec_context->channels;
 _info->fmt.samplerate = samplerate;
- if (info->ctx->sample_fmt == AV_SAMPLE_FMT_FLT || info->ctx->sample_fmt == AV_SAMPLE_FMT_FLTP) {
+ if (info->codec_context->sample_fmt == AV_SAMPLE_FMT_FLT || info->codec_context->sample_fmt == AV_SAMPLE_FMT_FLTP) {
 _info->fmt.is_float = 1;
 }
 
-
- int64_t layout = info->ctx->channel_layout;
- if (layout != 0, 0) {
- _info->fmt.channelmask = layout;
+ if (enable_dop && is_codec_dsd(info->codec_context->codec_id)) {
+ _info->fmt.is_float = 0;
+ _info->fmt.bps = 32;
+ _info->fmt.samplerate = info->codec_context->sample_rate / 2;
+ _info->fmt.flags |= DDB_WAVEFORMAT_FLAG_IS_DOP;
 }
- else {
- for (int i = 0; i < _info->fmt.channels; i++) {
- _info->fmt.channelmask |= 1 << i;
- }
+
+ // FIXME: channel layout from ffmpeg
+ // int64_t layout = info->ctx->channel_layout;
+
+ for (int i = 0; i < _info->fmt.channels; i++) {
+ _info->fmt.channelmask |= 1 << i;
 }
 
 // subtrack info
 info->currentsample = 0;
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
- plugin.seek_sample (_info, 0);
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample (it);
+ info->endsample = endsample;
+ plugin.seek_sample64 (_info, 0);
 }
 else {
 info->startsample = 0;
@@ -269,32 +284,36 @@
 }
 
 static void
+_free_info_data(ffmpeg_info_t *info) {
+ if (info->frame) {
+ avcodec_free_frame(&info->frame);
+ }
+ if (info->buffer) {
+ free (info->buffer);
+ }
+ // free everything allocated in _init and _read
+ if (info->have_packet) {
+ av_packet_unref (&info->pkt);
+ }
+ if (info->codec_context) {
+ avcodec_close (info->codec_context);
+
+ // The ctx is owned by AVFormatContext in legacy mode
+ if (info->need_to_free_codec_context) {
+ avcodec_free_context (&info->codec_context);
+ }
+ }
+ if (info->format_context) {
+ avformat_close_input (&info->format_context);
+ }
+}
+
+static void
 ffmpeg_free (DB_fileinfo_t *_info) {
 trace ("ffmpeg: free\n");
 ffmpeg_info_t *info = (ffmpeg_info_t*)_info;
 if (info) {
-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54, 59, 100)
- if (info->frame) {
- avcodec_free_frame(&info->frame);
- }
-#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 40, 0)
- if (info->frame) {
- av_freep (&info->frame);
- }
-#endif
- if (info->buffer) {
- free (info->buffer);
- }
- // free everything allocated in _init and _read
- if (info->have_packet) {
- av_free_packet (&info->pkt);
- }
- if (info->ctx) {
- avcodec_close (info->ctx);
- }
- if (info->fctx) {
- av_close_input_file (info->fctx);
- }
+ _free_info_data(info);
 free (info);
 }
 }
@@ -304,16 +323,22 @@
 trace ("ffmpeg_read_int16 %d\n", size);
 ffmpeg_info_t *info = (ffmpeg_info_t*)_info;
 
- _info->fmt.channels = info->ctx->channels;
- _info->fmt.samplerate = info->ctx->sample_rate;
- _info->fmt.bps = av_get_bits_per_sample_format (info->ctx->sample_fmt);
- _info->fmt.is_float = (info->ctx->sample_fmt == AV_SAMPLE_FMT_FLT || info->ctx->sample_fmt == AV_SAMPLE_FMT_FLTP);
+ if (enable_dop && is_codec_dsd(info->codec_context->codec_id)) {
+ _info->fmt.samplerate = info->codec_context->sample_rate / 2;
+ _info->fmt.bps = 32;
+ _info->fmt.is_float = 0;
+ _info->fmt.flags |= DDB_WAVEFORMAT_FLAG_IS_DOP;
+ } else {
+ _info->fmt.samplerate = info->codec_context->sample_rate;
+ _info->fmt.bps = av_get_bytes_per_sample (info->codec_context->sample_fmt) * 8;
+ _info->fmt.is_float = (info->codec_context->sample_fmt == AV_SAMPLE_FMT_FLT || info->codec_context->sample_fmt == AV_SAMPLE_FMT_FLTP);
+ _info->fmt.flags &= ~DDB_WAVEFORMAT_FLAG_IS_DOP;
+ }
 
 int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
 
 if (info->endsample >= 0 && info->currentsample + size / samplesize > info->endsample) {
- size = (info->endsample - info->currentsample + 1) * samplesize;
- if (size <= 0) {
+ if ((info->endsample - info->currentsample + 1) * samplesize <= 0) {
 return 0;
 }
 }
@@ -326,11 +351,10 @@
 while (size > 0) {
 
 if (info->left_in_buffer > 0) {
-// int sz = min (size, info->left_in_buffer);
- int nsamples = size / samplesize;
- int nsamples_buf = info->left_in_buffer / samplesize;
+ size_t nsamples = size / samplesize;
+ size_t nsamples_buf = info->left_in_buffer / samplesize;
 nsamples = min (nsamples, nsamples_buf);
- int sz = nsamples * samplesize;
+ size_t sz = nsamples * samplesize;
 memcpy (bytes, info->buffer, nsamples*samplesize);
 bytes += nsamples * samplesize;
 size -= nsamples * samplesize;
@@ -341,50 +365,134 @@
 }
 
 while (info->left_in_packet > 0 && size > 0) {
- int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- int len;
+ size_t out_size = info->buffer_size;
+ int len = 0;
 //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size);
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 40, 0)
+ if (enable_dop && is_codec_dsd(info->codec_context->codec_id)) {
+ len = info->pkt.size;
+ } else {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 28, 0)
+ int ret = avcodec_send_packet (info->codec_context, &info->pkt);
+ if (ret < 0) {
+ break;
+ }
+ ret = avcodec_receive_frame (info->codec_context,info->frame);
+ if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
+ break;
+ }
+ else {
+ len = info->pkt.size;
+ }
+#else
 int got_frame = 0;
 len = avcodec_decode_audio4(info->ctx, info->frame, &got_frame, &info->pkt);
+#endif
+ }
 if (len > 0) {
- if (av_sample_fmt_is_planar(info->ctx->sample_fmt)) {
- out_size = 0;
- for (int c = 0; c < info->ctx->channels; c++) {
- for (int i = 0; i < info->frame->nb_samples; i++) {
- if (_info->fmt.bps == 8) {
- info->bufferi*info->ctx->channels+c = ((int8_t *)info->frame->extended_datac)i;
- out_size++;
+ if (enable_dop && is_codec_dsd(info->codec_context->codec_id)) {
+ out_size = info->pkt.size * 2;
+ if (ensure_buffer (info, info->pkt.duration * 2)) {
+ return -1;
+ }
+
+ int chCnt = info->codec_context->channels;
+ int chSize = info->pkt.size / chCnt;
+ uint32_t *pOut = (uint32_t *)info->buffer;
+ uint8_t marker = 0x05;
+
+ if (info->codec_context->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR ||
+ info->codec_context->codec_id == AV_CODEC_ID_DSD_MSBF_PLANAR) {
+
+ uint8_t* pInchCnt;
+ for (int i = 0; i < chCnt; i++) {
+ pIni = info->pkt.data + chSize * i;
+ }
+
+ if (info->codec_context->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR) {
+ for (int i = 0; i < chSize; i+=2) {
+ for (int ch = 0; ch < chCnt; ch++) {
+ *pOut++ = (uint32_t)marker << 24 |
+ bit_reverse_table*pInch << 16 |
+ bit_reverse_table*(pInch + 1) << 8;
+ pInch += 2;
+ }
+ marker = ~marker;
 }
- else if (_info->fmt.bps == 16) {
- int16_t outsample = ((int16_t *)info->frame->extended_datac)i;
- ((int16_t*)info->buffer)i*info->ctx->channels+c = outsample;
- out_size += 2;
+ }
+ else {
+ for (int i = 0; i < chSize / 2; i++) {
+ for (int ch = 0; ch < chCnt; ch++) {
+ *pOut++ = (uint32_t)marker << 24 |
+ *pInch << 16 |
+ *(pInch + 1) << 8;
+ pInch += 2;
+ }
+ marker = ~marker;
 }
- else if (_info->fmt.bps == 24) {
- memcpy (&info->buffer(i*info->ctx->channels+c)*3, &((int8_t*)info->frame->extended_datac)i*3, 3);
- out_size += 3;
+ }
+ }
+ else {
+ uint8_t* pIn = info->pkt.data;
+ if (info->codec_context->codec_id == AV_CODEC_ID_DSD_LSBF) {
+ for (int i = 0; i < chSize / 2; i++) {
+ for (int ch = 0; ch < chCnt; ch++) {
+ *pOut++ = (uint32_t)marker << 24 |
+ bit_reverse_table*(pIn + ch) << 16 |
+ bit_reverse_table*(pIn + ch + chCnt) << 8;
+ }
+ pIn += chCnt * 2;
+ marker = ~marker;
 }
- else if (_info->fmt.bps == 32) {
- int32_t sample = ((int32_t *)info->frame->extended_datac)i;
- ((int32_t*)info->buffer)i*info->ctx->channels+c = sample;
- out_size += 4;
+ }
+ else {
+ for (int i = 0; i < chSize / 2; i++) {
+ for (int ch = 0; ch < chCnt; ch++) {
+ *pOut++ = (uint32_t)marker << 24 |
+ *(pIn + ch) << 16 |
+ *(pIn + ch + chCnt) << 8;
+ }
+ pIn += chCnt * 2;
+ marker = ~marker;
 }
 }
 }
- }
- else {
- out_size = info->frame->nb_samples * (_info->fmt.bps >> 3) * _info->fmt.channels;
- memcpy (info->buffer, info->frame->extended_data0, out_size);
+ } else {
+ if (ensure_buffer (info, info->frame->nb_samples * (_info->fmt.bps >> 3))) {
+ return -1;
+ }
+ if (av_sample_fmt_is_planar(info->codec_context->sample_fmt)) {
+ out_size = 0;
+ for (int c = 0; c < info->codec_context->channels; c++) {
+ for (int i = 0; i < info->frame->nb_samples; i++) {
+ if (_info->fmt.bps == 8) {
+ info->bufferi*info->codec_context->channels+c = ((int8_t *)info->frame->extended_datac)i;
+ out_size++;
+ }
+ else if (_info->fmt.bps == 16) {
+ int16_t outsample = ((int16_t *)info->frame->extended_datac)i;
+ ((int16_t*)info->buffer)i*info->codec_context->channels+c = outsample;
+ out_size += 2;
+ }
+ else if (_info->fmt.bps == 24) {
+ memcpy (&info->buffer(i*info->codec_context->channels+c)*3, &((int8_t*)info->frame->extended_datac)i*3, 3);
+ out_size += 3;
+ }
+ else if (_info->fmt.bps == 32) {
+ int32_t sample = ((int32_t *)info->frame->extended_datac)i;
+ ((int32_t*)info->buffer)i*info->codec_context->channels+c = sample;
+ out_size += 4;
+ }
+ }
+ }
+ }
+ else {
+ out_size = info->frame->nb_samples * (_info->fmt.bps >> 3) * _info->fmt.channels;
+ memcpy (info->buffer, info->frame->extended_data0, out_size);
+ }
 }
 }
 
-#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0)
- len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt);
-#else
- len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
-#endif
 trace ("out: out_size=%d, len=%d\n", out_size, len);
 if (len <= 0) {
 break;
@@ -400,13 +508,13 @@
 
 // read next packet
 if (info->have_packet) {
- av_free_packet (&info->pkt);
+ av_packet_unref (&info->pkt);
 info->have_packet = 0;
 }
 int errcount = 0;
 for (;;) {
 int ret;
- if ((ret = av_read_frame (info->fctx, &info->pkt)) < 0) {
+ if ((ret = av_read_frame (info->format_context, &info->pkt)) < 0) {
 trace ("ffmpeg: error %d\n", ret);
 if (ret == AVERROR_EOF || ret == -1) {
 ret = -1;
@@ -432,7 +540,7 @@
 }
 //trace ("idx:%d, stream:%d\n", info->pkt.stream_index, info->stream_id);
 if (info->pkt.stream_index != info->stream_id) {
- av_free_packet (&info->pkt);
+ av_packet_unref (&info->pkt);
 continue;
 }
 //trace ("got packet: size=%d\n", info->pkt.size);
@@ -440,7 +548,7 @@
 info->left_in_packet = info->pkt.size;
 
 if (info->pkt.duration > 0) {
- AVRational *time_base = &info->fctx->streamsinfo->stream_id->time_base;
+ AVRational *time_base = &info->format_context->streamsinfo->stream_id->time_base;
 float sec = (float)info->pkt.duration * time_base->num / time_base->den;
 int bitrate = info->pkt.size * 8 / sec;
 if (bitrate > 0) {
@@ -462,21 +570,21 @@
 }
 
 static int
-ffmpeg_seek_sample (DB_fileinfo_t *_info, int sample) {
+ffmpeg_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
 ffmpeg_info_t *info = (ffmpeg_info_t*)_info;
 // seek to specified sample (frame)
 // return 0 on success
 // return -1 on failure
 if (info->have_packet) {
- av_free_packet (&info->pkt);
+ av_packet_unref (&info->pkt);
 info->have_packet = 0;
 }
 sample += info->startsample;
- int64_t tm = (int64_t)sample/ _info->fmt.samplerate * AV_TIME_BASE;
+ int64_t tm = sample / _info->fmt.samplerate * AV_TIME_BASE;
 trace ("ffmpeg: seek to sample: %d, t: %d\n", sample, (int)tm);
 info->left_in_packet = 0;
 info->left_in_buffer = 0;
- if (av_seek_frame (info->fctx, -1, tm, AVSEEK_FLAG_ANY) < 0) {
+ if (av_seek_frame (info->format_context, -1, tm, AVSEEK_FLAG_ANY) < 0) {
 trace ("ffmpeg: seek error\n");
 return -1;
 }
@@ -488,12 +596,13 @@
 }
 
 static int
+ffmpeg_seek_sample (DB_fileinfo_t *_info, int sample) {
+ return ffmpeg_seek_sample64(_info, sample);
+}
+
+static int
 ffmpeg_seek (DB_fileinfo_t *_info, float time) {
- ffmpeg_info_t *info = (ffmpeg_info_t*)_info;
- // seek to specified time in seconds
- // return 0 on success
- // return -1 on failure
- return ffmpeg_seek_sample (_info, time * _info->fmt.samplerate);
+ return ffmpeg_seek_sample64 (_info, (int64_t)((double)time * (int64_t)_info->fmt.samplerate));
 }
 
 static const char *map = {
@@ -501,6 +610,7 @@
 "title", "title",
 "album", "album",
 "track", "track",
+ "tracktotal", "numtracks",
 "date", "year",
 "WM/Year", "year",
 "genre", "genre",
@@ -511,48 +621,44 @@
 "encoder", "encoder",
 "encoded_by", "vendor",
 "disc", "disc",
+ "disctotal", "numdiscs",
 "copyright", "copyright",
- "tracktotal", "numtracks",
 "publisher", "publisher",
+ "originaldate","original_release_time",
+ "originalyear","original_release_year",
+ "WM/OriginalReleaseTime","original_release_time",
+ "WM/OriginalReleaseYear","original_release_year",
 NULL
 };
 
 static int
-ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) {
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0)
- if (!strlen (fctx->title)) {
- // title is empty, this call will set track title to filename without extension
- deadbeef->pl_add_meta (it, "title", NULL);
+ff_add_disc_meta (DB_playItem_t *it, const char *disc) {
+ char *slash = strchr (disc, '/');
+ if (slash) {
+ // split into disc/number
+ *slash = 0;
+ slash++;
+ deadbeef->pl_add_meta (it, "numdiscs", slash);
 }
- else {
- deadbeef->pl_add_meta (it, "title", fctx->title);
- }
- deadbeef->pl_add_meta (it, "artist", fctx->author);
- deadbeef->pl_add_meta (it, "album", fctx->album);
- deadbeef->pl_add_meta (it, "copyright", fctx->copyright);
- deadbeef->pl_add_meta (it, "comment", fctx->comment);
- deadbeef->pl_add_meta (it, "genre", fctx->genre);
-
- char tmp10;
- snprintf (tmp, sizeof (tmp), "%d", fctx->year);
- deadbeef->pl_add_meta (it, "year", tmp);
- snprintf (tmp, sizeof (tmp), "%d", fctx->track);
- deadbeef->pl_add_meta (it, "track", tmp);
-#else
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,23,0)
- AVMetadata *md = fctx->metadata;
-
- for (int m = 0; mapm; m += 2) {
- AVMetadataTag *tag = NULL;
- do {
- tag = av_metadata_get (md, mapm, tag, AV_METADATA_DONT_STRDUP_KEY | AV_METADATA_DONT_STRDUP_VAL);
- if (tag) {
- deadbeef->pl_append_meta (it, mapm+1, tag->value);
- }
- } while (tag);
+ deadbeef->pl_add_meta (it, "disc", disc);
+ return 0;
+}
+
+static int
+ff_add_track_meta (DB_playItem_t *it, const char *track) {
+ char *slash = strchr (track, '/');
+ if (slash) {
+ // split into track/number
+ *slash = 0;
+ slash++;
+ deadbeef->pl_add_meta (it, "numtracks", slash);
 }
-#else
- // ffmpeg-0.11 new metadata format
+ deadbeef->pl_add_meta (it, "track", track);
+ return 0;
+}
+
+static int
+ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) {
 AVDictionaryEntry *t = NULL;
 int m;
 for (int i = 0; i < fctx->nb_streams + 1; i++) {
@@ -560,7 +666,7 @@
 if (!md) {
 continue;
 }
- while (t = av_dict_get (md, "", t, AV_DICT_IGNORE_SUFFIX)) {
+ while ((t = av_dict_get (md, "", t, AV_DICT_IGNORE_SUFFIX))) {
 if (!strcasecmp (t->key, "replaygain_album_gain")) {
 deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, atof (t->value));
 continue;
@@ -580,7 +686,15 @@
 
 for (m = 0; mapm; m += 2) {
 if (!strcasecmp (t->key, mapm)) {
- deadbeef->pl_append_meta (it, mapm+1, t->value);
+ if (!strcmp (mapm+1, "disc")) {
+ ff_add_disc_meta (it, t->value);
+ }
+ else if (!strcmp (mapm+1, "track")) {
+ ff_add_track_meta (it, t->value);
+ }
+ else {
+ deadbeef->pl_append_meta (it, mapm+1, t->value);
+ }
 break;
 }
 }
@@ -589,11 +703,21 @@
 }
 }
 }
-#endif
-#endif
 return 0;
 }
 
+static void
+print_error(const char *filename, int err)
+{
+ char errbuf128;
+ const char *errbuf_ptr = errbuf;
+
+ if (av_strerror(err, errbuf, sizeof(errbuf)) < 0)
+ errbuf_ptr = strerror(AVUNERROR(err));
+ fprintf (stderr, "%s: %s\n", filename, errbuf_ptr);
+}
+
+
 static DB_playItem_t *
 ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
 trace ("ffmpeg_insert %s\n", fname);
@@ -603,99 +727,71 @@
 // return track pointer on success
 // return NULL on failure
 
- AVCodec *codec = NULL;
- AVCodecContext *ctx = NULL;
- AVFormatContext *fctx = NULL;
+ ffmpeg_info_t info = {0};
+
 int ret;
- int l = strlen (fname);
 char *uri = NULL;
 int i;
 
 // construct uri
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0)
 uri = strdupa (fname);
-#else
- uri = alloca (l + sizeof (FF_PROTOCOL_NAME) + 1);
- memcpy (uri, FF_PROTOCOL_NAME, sizeof (FF_PROTOCOL_NAME)-1);
- memcpy (uri + sizeof (FF_PROTOCOL_NAME)-1, ":", 1);
- memcpy (uri + sizeof (FF_PROTOCOL_NAME), fname, l);
- urisizeof (FF_PROTOCOL_NAME) + l = 0;
-#endif
 trace ("ffmpeg: uri: %s\n", uri);
 
 // open file
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0)
- avformat_network_init();
- fctx = avformat_alloc_context ();
- if ((ret = avformat_open_input(&fctx, uri, NULL, NULL)) < 0) {
-#else
- if ((ret = av_open_input_file(&fctx, uri, NULL, 0, NULL)) < 0) {
-#endif
- trace ("fctx is %p, ret %d/%s", fctx, ret, strerror(-ret));
- return NULL;
+ info.format_context = avformat_alloc_context ();
+ info.format_context->max_analyze_duration = AV_TIME_BASE;
+ if ((ret = avformat_open_input(&info.format_context, uri, NULL, NULL)) < 0) {
+ print_error (uri, ret);
+ goto error;
 }
 
- trace ("fctx is %p, ret %d/%s\n", fctx, ret, strerror(-ret));
- fctx->max_analyze_duration = FFMPEG_MAX_ANALYZE_DURATION;
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0)
- int nb_streams = fctx->nb_streams;
- ret = avformat_find_stream_info(fctx, NULL);
-#else
- ret = av_find_stream_info(fctx);
- int nb_streams = fctx->nb_streams;
-#endif
+ trace ("fctx is %p, ret %d/%s\n", info.format_context, ret, strerror(-ret));
+ ret = avformat_find_stream_info(info.format_context, NULL);
 if (ret < 0) {
- trace ("av_find_stream_info ret: %d/%s\n", ret, strerror(-ret));
+ trace ("avformat_find_stream_info ret: %d/%s\n", ret, strerror(-ret));
 }
 trace ("nb_streams=%x\n", nb_streams);
- for (i = 0; i < fctx->nb_streams; i++)
+
+ for (i = 0; i < info.format_context->nb_streams; i++)
 {
- if (!fctx->streamsi) {
+ if (!info.format_context->streamsi) {
 continue;
 }
- ctx = fctx->streamsi->codec;
- if (ctx->codec_type ==
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
- AVMEDIA_TYPE_AUDIO)
-#else
- CODEC_TYPE_AUDIO)
-#endif
- {
- codec = avcodec_find_decoder(ctx->codec_id);
- if (codec != NULL) {
- break;
- }
+ if (_get_audio_codec_from_stream(info.format_context, i, &info)) {
+ break;
 }
 }
-// AVStream *stream = fctx->streamsi;
 
- if (codec == NULL)
+ if (info.codec == NULL)
 {
 trace ("ffmpeg can't decode %s\n", fname);
- av_close_input_file(fctx);
- return NULL;
+ goto error;
 }
 trace ("ffmpeg can decode %s\n", fname);
 trace ("ffmpeg: codec=%s, stream=%d\n", codec->name, i);
 
- if (avcodec_open (ctx, codec) < 0) {
- trace ("ffmpeg: avcodec_open failed\n");
- av_close_input_file(fctx);
- return NULL;
+ int avcodec_open2_ret = avcodec_open2 (info.codec_context, info.codec, NULL);
+ if (avcodec_open2_ret < 0) {
+ trace ("ffmpeg: avcodec_open2 failed\n");
+ goto error;
 }
 
- int bps = av_get_bits_per_sample_format (ctx->sample_fmt);
- int samplerate = ctx->sample_rate;
- float duration = fctx->duration / (float)AV_TIME_BASE;
+ int bps = av_get_bytes_per_sample (info.codec_context->sample_fmt) * 8;
+ int samplerate = info.codec_context->sample_rate;
+ float duration = info.format_context->duration / (float)AV_TIME_BASE;
 // float duration = stream->duration * stream->time_base.num / (float)stream->time_base.den;
 trace ("ffmpeg: bits per sample is %d\n", bps);
 trace ("ffmpeg: samplerate is %d\n", samplerate);
 trace ("ffmpeg: duration is %f\n", duration);
 
- int totalsamples = fctx->duration * samplerate / AV_TIME_BASE;
+ if (bps <= 0 || info.codec_context->channels <= 0 || samplerate <= 0) {
+ goto error;
+ }
 
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
- deadbeef->pl_replace_meta (it, ":FILETYPE", codec->name);
+ int64_t totalsamples = info.format_context->duration * samplerate / AV_TIME_BASE;
+
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
+ deadbeef->pl_replace_meta (it, ":FILETYPE", info.codec->name);
 
 if (!deadbeef->is_local_file (fname)) {
 deadbeef->plt_set_item_duration (plt, it, -1);
@@ -705,7 +801,7 @@
 }
 
 // add metainfo
- ffmpeg_read_metadata_internal (it, fctx);
+ ffmpeg_read_metadata_internal (it, info.format_context);
 
 int64_t fsize = -1;
 
@@ -719,13 +815,18 @@
 
 if (fsize >= 0 && duration > 0) {
 char s100;
- snprintf (s, sizeof (s), "%lld", fsize);
+ snprintf (s, sizeof (s), "%lld", (long long)fsize);
 deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
- snprintf (s, sizeof (s), "%d", av_get_bits_per_sample_format (ctx->sample_fmt));
+ snprintf (s, sizeof (s), "%d", bps);
 deadbeef->pl_add_meta (it, ":BPS", s);
- snprintf (s, sizeof (s), "%d", ctx->channels);
+ snprintf (s, sizeof (s), "%d", info.codec_context->channels);
 deadbeef->pl_add_meta (it, ":CHANNELS", s);
- snprintf (s, sizeof (s), "%d", samplerate);
+ if (is_codec_dsd(info.codec_context->codec_id)) {
+ snprintf (s, sizeof (s), "%d", samplerate * 8);
+ }
+ else {
+ snprintf (s, sizeof (s), "%d", samplerate);
+ }
 deadbeef->pl_add_meta (it, ":SAMPLERATE", s);
 int br = (int)roundf(fsize / duration * 8 / 1000);
 snprintf (s, sizeof (s), "%d", br);
@@ -733,134 +834,131 @@
 }
 
 // free decoder
- avcodec_close (ctx);
- av_close_input_file(fctx);
+ _free_info_data (&info);
 
- // external cuesheet
- DB_playItem_t *cue = deadbeef->plt_insert_cue (plt, after, it, totalsamples, samplerate);
+ DB_playItem_t *cue = deadbeef->plt_process_cue (plt, after, it, totalsamples, samplerate);
 if (cue) {
 deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
 return cue;
 }
+
 // now the track is ready, insert into playlist
 after = deadbeef->plt_insert_item (plt, after, it);
 deadbeef->pl_item_unref (it);
 return after;
+error:
+ _free_info_data (&info);
+ return NULL;
 }
 
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 6, 0)
-// vfs wrapper for ffmpeg, can't only be done with ffmpeg<0.11
 static int
-ffmpeg_vfs_open(URLContext *h, const char *filename, int flags)
-{
- DB_FILE *f;
- av_strstart(filename, FF_PROTOCOL_NAME ":", &filename);
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 6, 0)
- if (flags & URL_WRONLY) {
- return -ENOENT;
- }
- else
-#endif
- {
- f = deadbeef->fopen (filename);
- }
-
- if (f == NULL)
- return -ENOENT;
-
- if (f->vfs->is_streaming ()) {
- deadbeef->fset_track (f, current_track);
- if (current_info) {
- current_info->file = f;
+assign_new_ext (int n, const char* new_ext, size_t size) {
+ char* ext = malloc (size + 1);
+ strncpy (ext, new_ext, size);
+ for (int i = 0; i < n; i++) {
+ if (strcmp (extsi, ext) == 0) {
+ free(ext);
+ return n;
 }
 }
-
- h->priv_data = f;
- return 0;
-}
-
-static int
-ffmpeg_vfs_read(URLContext *h, unsigned char *buf, int size)
-{
- trace ("ffmpeg_vfs_read %d\n", size);
- int res = deadbeef->fread (buf, 1, size, h->priv_data);
- return res;
+ extsize = '\0';
+ free (extsn);
+ extsn = ext;
+ return n + 1;
 }
 
 static int
-ffmpeg_vfs_write(URLContext *h, const unsigned char *buf, int size)
-{
- return -1;
-}
-
-static int64_t
-ffmpeg_vfs_seek(URLContext *h, int64_t pos, int whence)
-{
- trace ("ffmpeg_vfs_seek %d %d\n", pos, whence);
- DB_FILE *f = h->priv_data;
-
- if (whence == AVSEEK_SIZE) {
- return f->vfs->is_streaming () ? -1 : deadbeef->fgetlength (h->priv_data);
- }
- else if (f->vfs->is_streaming ()) {
- return -1;
- }
- else {
- int ret = deadbeef->fseek (h->priv_data, pos, whence);
- return ret;
- }
-}
-
-static int
-ffmpeg_vfs_close(URLContext *h)
-{
- trace ("ffmpeg_vfs_close\n");
- deadbeef->fclose (h->priv_data);
- return 0;
-}
-
-static URLProtocol vfswrapper = {
- .name = FF_PROTOCOL_NAME,
- .url_open = ffmpeg_vfs_open,
- .url_read = ffmpeg_vfs_read,
- .url_write = ffmpeg_vfs_write,
- .url_seek = ffmpeg_vfs_seek,
- .url_close = ffmpeg_vfs_close,
-};
-#endif
-
-static void
-ffmpeg_init_exts (void) {
- deadbeef->conf_lock ();
- const char *new_exts = deadbeef->conf_get_str_fast ("ffmpeg.extensions", DEFAULT_EXTS);
- for (int i = 0; extsi; i++) {
- free (extsi);
- }
- exts0 = NULL;
-
- int n = 0;
+add_new_exts (int n, const char* new_exts, char delim) {
 while (*new_exts) {
 if (n >= EXT_MAX) {
 fprintf (stderr, "ffmpeg: too many extensions, max is %d\n", EXT_MAX);
 break;
 }
 const char *e = new_exts;
- while (*e && *e != ';') {
+ while (*e && (*e != delim || *e == ' ')) {
 e++;
 }
 if (e != new_exts) {
- char *ext = malloc (e-new_exts+1);
- memcpy (ext, new_exts, e-new_exts);
- exte-new_exts = 0;
- extsn++ = ext;
+ n = assign_new_ext (n, new_exts, e-new_exts);
 }
 if (*e == 0) {
 break;
 }
 new_exts = e+1;
 }
+ return n;
+}
+
+static void
+ffmpeg_init_exts (void) {
+ const char *new_exts = deadbeef->conf_get_str_fast ("ffmpeg.extensions", DEFAULT_EXTS);
+ int use_all_ext = deadbeef->conf_get_int ("ffmpeg.enable_all_exts", 0);
+ for (int i = 0; extsi; i++) {
+ free (extsi);
+ extsi = NULL;
+ }
+ exts0 = NULL;
+
+ int n = 0;
+ if (!use_all_ext) {
+ n = add_new_exts (n, new_exts, ';');
+ }
+	else {
+ AVInputFormat *ifmt = NULL;
+ /*
+ * It's quite complicated to enumerate all supported extensions in
+ * ffmpeg. If a decoder defines extensions in ffmpeg, the probing
+ * mechanisim is disabled (see comments in avformat.h).
+ * Thus some decoders doesn't claim its extensions (e.g. WavPack) 
+ *
+ * To get these missing extensions, we need to search corresponding
+ * encoders for the same format, which will provide extensions for
+ * encoding purpose, because ffmpeg will guess the output format from
+ * the file name specified by users.
+ */
+#if LIBAVFORMAT_VERSION_MAJOR >= 59
+ void *iter = NULL;
+ while ((ifmt = av_demuxer_iterate(&iter))) {
+#else
+ while ((ifmt = av_iformat_next(ifmt))) {
+#endif
+#ifdef AV_IS_INPUT_DEVICE
+ if (ifmt->priv_class && AV_IS_INPUT_DEVICE(ifmt->priv_class->category))
+ continue; // Skip all input devices
+#endif
+
+ if (ifmt->flags & AVFMT_NOFILE)
+ continue; // Skip format that's not even a file
+
+#ifdef AV_CODEC_ID_FIRST_AUDIO
+ if (ifmt->raw_codec_id > 0 &&
+ (ifmt->raw_codec_id < AV_CODEC_ID_FIRST_AUDIO || ifmt->raw_codec_id > AV_CODEC_ID_FIRST_SUBTITLE)
+ )
+ continue; // Skip all non-audio raw formats
+#endif
+ if (ifmt->long_name && strstr(ifmt->long_name, "subtitle"))
+ continue; // Skip all subtitle formats
+ if (ifmt->extensions)
+ n = add_new_exts (n, ifmt->extensions, ',');
+ }
+ /*
+ * The above code doesn't guarntee all extensions are
+ * included, however. In the portable build the encoders are disabled,
+ * thus some extensions cannot be retrived.
+ *
+ * To fix this, we need to add some known extensions in addition to
+ * scanned extensions.
+ */
+ n = add_new_exts (n, UNPOPULATED_EXTS_BY_FFMPEG, ',');
+ }
 extsn = NULL;
+}
+
+static void
+_init_from_config(void) {
+ deadbeef->conf_lock ();
+ ffmpeg_init_exts ();
+ enable_dop = deadbeef->conf_get_int ("ffmpeg.enable_dop", 0);
 deadbeef->conf_unlock ();
 }
 
@@ -868,7 +966,7 @@
 ffmpeg_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
 switch (id) {
 case DB_EV_CONFIGCHANGED:
- ffmpeg_init_exts ();
+ _init_from_config();
 break;
 }
 return 0;
@@ -876,17 +974,9 @@
 
 static int
 ffmpeg_start (void) {
- ffmpeg_init_exts ();
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 6, 0)
- avcodec_register_all ();
-#endif
+ _init_from_config();
+#if LIBAVFORMAT_VERSION_MAJOR < 58
 av_register_all ();
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0)
-#warning FFMPEG-0.11 and higher does not expose register_protocol API, which means that it cant work with MMS and HTTP plugins. If you need this functionality, please downgrade FFMPEG to version 0.10 or less, and rebuild the FFMPEG plugin
-#elif LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0)
- av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
-#else
- av_register_protocol (&vfswrapper);
 #endif
 return 0;
 }
@@ -902,96 +992,71 @@
 
 int
 ffmpeg_read_metadata (DB_playItem_t *it) {
+ int err = -1;
+
 trace ("ffmpeg_read_metadata: fname %s\n", deadbeef->pl_find_meta (it, ":URI"));
- AVCodec *codec = NULL;
- AVCodecContext *ctx = NULL;
- AVFormatContext *fctx = NULL;
+ ffmpeg_info_t info = {0};
 int ret;
 char *uri = NULL;
 int i;
 
 deadbeef->pl_lock ();
- {
- const char *fname = deadbeef->pl_find_meta (it, ":URI");
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0)
- uri = strdupa (fname);
-#else
- int l = strlen (fname);
- uri = alloca (l + sizeof (FF_PROTOCOL_NAME) + 1);
-
- // construct uri
- memcpy (uri, FF_PROTOCOL_NAME, sizeof (FF_PROTOCOL_NAME)-1);
- memcpy (uri + sizeof (FF_PROTOCOL_NAME)-1, ":", 1);
- memcpy (uri + sizeof (FF_PROTOCOL_NAME), fname, l);
- urisizeof (FF_PROTOCOL_NAME) + l = 0;
-#endif
- }
+ const char *fname = deadbeef->pl_find_meta (it, ":URI");
+ uri = strdupa (fname);
 deadbeef->pl_unlock ();
 trace ("ffmpeg: uri: %s\n", uri);
 
 // open file
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0)
- avformat_network_init();
- fctx = avformat_alloc_context ();
- if ((ret = avformat_open_input(&fctx, uri, NULL, NULL)) < 0) {
-#else
- if ((ret = av_open_input_file(&fctx, uri, NULL, 0, NULL)) < 0) {
-#endif
- trace ("fctx is %p, ret %d/%s", fctx, ret, strerror(-ret));
+ if ((ret = avformat_open_input(&info.format_context, uri, NULL, NULL)) < 0) {
+ trace ("fctx is %p, ret %d/%s", info.format_context, ret, strerror(-ret));
 return -1;
 }
 
- av_find_stream_info(fctx);
- for (i = 0; i < fctx->nb_streams; i++)
- {
- ctx = fctx->streamsi->codec;
- if (ctx->codec_type ==
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
- AVMEDIA_TYPE_AUDIO)
-#else
- CODEC_TYPE_AUDIO)
-#endif
- {
- codec = avcodec_find_decoder(ctx->codec_id);
- if (codec != NULL)
- break;
+ avformat_find_stream_info(info.format_context, NULL);
+ for (i = 0; i < info.format_context->nb_streams; i++) {
+ if (_get_audio_codec_from_stream(info.format_context, i, &info)) {
+ break;
 }
 }
- if (codec == NULL)
- {
+ if (info.codec == NULL) {
 trace ("ffmpeg can't decode %s\n", deadbeef->pl_find_meta (it, ":URI"));
- av_close_input_file(fctx);
- return -1;
+ goto error;
 }
- if (avcodec_open (ctx, codec) < 0) {
- trace ("ffmpeg: avcodec_open failed\n");
- av_close_input_file(fctx);
- return -1;
+ if (avcodec_open2 (info.codec_context, info.codec, NULL) < 0) {
+ trace ("ffmpeg: avcodec_open2 failed\n");
+ goto error;
 }
 
 deadbeef->pl_delete_all_meta (it);
- ffmpeg_read_metadata_internal (it, fctx);
+ ffmpeg_read_metadata_internal (it, info.format_context);
 
- av_close_input_file(fctx);
- return 0;
+ err = 0;
+error:
+ _free_info_data(&info);
+
+ return err;
 }
 
 static const char settings_dlg =
+ "property \"Use all extensions supported by ffmpeg\" checkbox ffmpeg.enable_all_exts 0;\n"
 "property \"File Extensions (separate with ';')\" entry ffmpeg.extensions \"" DEFAULT_EXTS "\";\n"
+ "property \"Enable DoP output\" checkbox ffmpeg.enable_dop 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 = 2,
- .plugin.type = DB_PLUGIN_DECODER,
- .plugin.id = "ffmpeg",
- .plugin.name = "FFMPEG audio player",
- .plugin.descr = "decodes audio formats using FFMPEG libavcodec",
- .plugin.copyright = 
- "Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+
+static ddb_decoder2_t plugin = {
+ .decoder.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .decoder.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .decoder.plugin.version_major = 1,
+ .decoder.plugin.version_minor = 2,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.id = "ffmpeg",
+ .decoder.plugin.name = "FFMPEG audio player",
+ .decoder.plugin.descr = "decodes audio formats using FFMPEG libavcodec",
+ .decoder.plugin.copyright =
+ "Copyright (C) 2009-2013 Oleksiy 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"
@@ -1007,20 +1072,21 @@
 "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 = ffmpeg_start,
- .plugin.stop = ffmpeg_stop,
- .plugin.configdialog = settings_dlg,
- .plugin.message = ffmpeg_message,
- .open = ffmpeg_open,
- .init = ffmpeg_init,
- .free = ffmpeg_free,
- .read = ffmpeg_read,
- .seek = ffmpeg_seek,
- .seek_sample = ffmpeg_seek_sample,
- .insert = ffmpeg_insert,
- .read_metadata = ffmpeg_read_metadata,
- .exts = (const char **)exts,
+ .decoder.plugin.website = "http://deadbeef.sf.net",
+ .decoder.plugin.start = ffmpeg_start,
+ .decoder.plugin.stop = ffmpeg_stop,
+ .decoder.plugin.configdialog = settings_dlg,
+ .decoder.plugin.message = ffmpeg_message,
+ .decoder.open = ffmpeg_open,
+ .decoder.init = ffmpeg_init,
+ .decoder.free = ffmpeg_free,
+ .decoder.read = ffmpeg_read,
+ .decoder.seek = ffmpeg_seek,
+ .decoder.seek_sample = ffmpeg_seek_sample,
+ .decoder.insert = ffmpeg_insert,
+ .decoder.read_metadata = ffmpeg_read_metadata,
+ .decoder.exts = (const char **)exts,
+ .seek_sample64 = ffmpeg_seek_sample64,
 };
 
 DB_plugin_t *

deadbeef-0.6.2.tar.bz2/plugins/flac/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/flac/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/flac/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/flac/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/flac/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/flac/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/flac/flac.c -> deadbeef-1.9.6.tar.bz2/plugins/flac/flac.c Changed

@@ -1,6 +1,6 @@
 /*
 DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2013 Oleksiy Yakovenko <waker@users.sourceforge.net>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -40,30 +40,25 @@
 #include <math.h>
 #include <FLAC/stream_decoder.h>
 #include <FLAC/metadata.h>
-#if HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
-#include "../../deadbeef.h"
-#include "../artwork/artwork.h"
+#include <limits.h>
+#include <deadbeef/deadbeef.h>
 #include "../liboggedit/oggedit.h"
+#include <deadbeef/strdupa.h>
 
-static DB_decoder_t plugin;
+static ddb_decoder2_t plugin;
 static DB_functions_t *deadbeef;
 
-static DB_artwork_plugin_t *coverart_plugin = NULL;
-
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
 
-#define BUFFERSIZE 100000
-
 typedef struct {
 DB_fileinfo_t info;
 FLAC__StreamDecoder *decoder;
- char *buffer; // this buffer always has float samples
+ int buffersize;
+ char *buffer;
 int remaining; // bytes remaining in buffer from last read
 int64_t startsample;
 int64_t endsample;
@@ -71,6 +66,7 @@
 int64_t totalsamples;
 int flac_critical_error;
 int init_stop_decoding;
+ int set_bitrate;
 DB_FILE *file;
 
 // used only on insert
@@ -112,7 +108,7 @@
 return FLAC__STREAM_DECODER_TELL_STATUS_OK;
 }
 
-FLAC__StreamDecoderLengthStatus flac_lenght_cb (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) {
+FLAC__StreamDecoderLengthStatus flac_length_cb (const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) {
 flac_info_t *info = (flac_info_t *)client_data;
 size_t pos = deadbeef->ftell (info->file);
 deadbeef->fseek (info->file, 0, SEEK_END);
@@ -129,57 +125,94 @@
 cflac_write_callback (const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const inputbuffer, void *client_data) {
 flac_info_t *info = (flac_info_t *)client_data;
 DB_fileinfo_t *_info = &info->info;
+
 if (frame->header.blocksize == 0) {
+ trace ("flac: blocksize=0 is invalid, aborted.\n");
 return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 }
- int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
- int bufsize = BUFFERSIZE - info->remaining;
+
+ int channels = _info->fmt.channels;
+ int samplesize = channels * _info->fmt.bps / 8;
+ int bytesize = frame->header.blocksize * samplesize;
+ if (info->buffersize < bytesize) {
+ info->buffersize = bytesize;
+ info->buffer = realloc (info->buffer, bytesize);
+ }
+
+ int bufsize = info->buffersize - info->remaining;
 int bufsamples = bufsize / samplesize;
 int nsamples = min (bufsamples, frame->header.blocksize);
- char *bufptr = &info->bufferinfo->remaining;
+
+ char *bufptr = info->buffer + info->remaining;
 
 int readbytes = frame->header.blocksize * samplesize;
 
- if (_info->fmt.bps == 32) {
+ unsigned bps = FLAC__stream_decoder_get_bits_per_sample(decoder);
+
+ if (bps == 16) {
 for (int i = 0; i < nsamples; i++) {
- for (int c = 0; c < _info->fmt.channels; c++) {
+ for (int c = 0; c < channels; c++) {
 int32_t sample = inputbufferci;
- *((int32_t*)bufptr) = sample;
- bufptr += 4;
- info->remaining += 4;
+ *bufptr++ = sample&0xff;
+ *bufptr++ = (sample&0xff00)>>8;
 }
 }
 }
- else if (_info->fmt.bps == 24) {
+ else if (bps == 24) {
 for (int i = 0; i < nsamples; i++) {
- for (int c = 0; c < _info->fmt.channels; c++) {
+ for (int c = 0; c < channels; c++) {
 int32_t sample = inputbufferci;
 *bufptr++ = sample&0xff;
 *bufptr++ = (sample&0xff00)>>8;
 *bufptr++ = (sample&0xff0000)>>16;
- info->remaining += 3;
 }
 }
 }
- else if (_info->fmt.bps == 16) {
+ else if (bps == 32) {
 for (int i = 0; i < nsamples; i++) {
- for (int c = 0; c < _info->fmt.channels; c++) {
+ for (int c = 0; c < channels; c++) {
 int32_t sample = inputbufferci;
- *bufptr++ = sample&0xff;
- *bufptr++ = (sample&0xff00)>>8;
- info->remaining += 2;
+ *((int32_t*)bufptr) = sample;
+ bufptr += 4;
 }
 }
 }
- else if (_info->fmt.bps == 8) {
+ else if (bps == 8) {
 for (int i = 0; i < nsamples; i++) {
- for (int c = 0; c < _info->fmt.channels; c++) {
+ for (int c = 0; c < channels; c++) {
 int32_t sample = inputbufferci;
 *bufptr++ = sample&0xff;
- info->remaining += 1;
 }
 }
 }
+ else if (bps & 7) {
+ // support for non-byte-aligned bps
+ unsigned shift = _info->fmt.bps - bps;
+ bps = _info->fmt.bps;
+ int nsamples = min(bufsize / samplesize, frame->header.blocksize);
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < channels; c++) {
+ FLAC__int32 sample = inputbuffercs << shift;
+ *bufptr++ = sample & 0xff;
+ if (bps > 8) {
+ *bufptr++ = (sample>>8) & 0xff;
+ if (bps > 16) {
+ *bufptr++ = (sample>>16) & 0xff;
+ if (bps > 24) {
+ *bufptr++ = (sample>>24) & 0xff;
+ }
+ }
+ }
+ }
+ }
+ }
+ else {
+ trace ("flac: unsupported bits per sample: %d\n", bps);
+ return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+ }
+
+ info->remaining = (int)(bufptr - info->buffer);
+
 if (readbytes > bufsize) {
 trace ("flac: buffer overflow, distortion will occur\n");
 // return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
@@ -187,6 +220,12 @@
 return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
 
+inline static int
+fix_bps (int bps) {
+ int mod = bps & 7;
+ return bps - mod + (mod ? 8 : 0);
+}
+
 static void
 cflac_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) {
 DB_fileinfo_t *_info = (DB_fileinfo_t *)client_data;
@@ -194,7 +233,7 @@
 info->totalsamples = metadata->data.stream_info.total_samples;
 _info->fmt.samplerate = metadata->data.stream_info.sample_rate;
 _info->fmt.channels = metadata->data.stream_info.channels;
- _info->fmt.bps = metadata->data.stream_info.bits_per_sample;
+ _info->fmt.bps = fix_bps (metadata->data.stream_info.bits_per_sample);
 for (int i = 0; i < _info->fmt.channels; i++) {
 _info->fmt.channelmask |= 1 << i;
 }
@@ -204,11 +243,22 @@
 cflac_error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) {
 DB_fileinfo_t *_info = (DB_fileinfo_t *)client_data;
 flac_info_t *info = (flac_info_t *)_info;
- if (status != FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC
- && status != FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH) {
- trace ("cflac: got error callback: %s\n", FLAC__StreamDecoderErrorStatusStringstatus);
- info->flac_critical_error = 1;
+ if (status == FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC
+ || status == FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH) {
+ return;
+ }
+
+ if (status == FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER
+ && deadbeef->conf_get_int ("flac.ignore_bad_header_errors", 0)) {
+ return;
+ }
+
+ if (status == FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM
+ && deadbeef->conf_get_int ("flac.ignore_unparsable_stream_errors", 0)) {
+ return;
 }
+ trace ("cflac: got error callback: %s\n", FLAC__StreamDecoderErrorStatusStringstatus);
+ info->flac_critical_error = 1;
 }
 
 static void
@@ -221,11 +271,36 @@
 }
 }
 
+static flac_info_t *
+cflac_open_int (uint32_t hints) {
+ flac_info_t *info = calloc(1, sizeof(flac_info_t));
+ if (info && hints&DDB_DECODER_HINT_NEED_BITRATE) {
+ info->set_bitrate = 1;
+ }
+ return info;
+}
+
 static DB_fileinfo_t *
 cflac_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (flac_info_t));
- memset (_info, 0, sizeof (flac_info_t));
- return _info;
+ return (DB_fileinfo_t *)cflac_open_int(hints);
+}
+
+static DB_fileinfo_t *
+cflac_open2 (uint32_t hints, DB_playItem_t *it) {
+ flac_info_t *info = cflac_open_int(hints);
+ if (!info) {
+ return NULL;
+ }
+
+ deadbeef->pl_lock();
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock();
+ info->file = deadbeef->fopen(uri);
+ if (!info->file) {
+ trace("cflac_open2 failed to open file %s\n", uri);
+ }
+
+ return (DB_fileinfo_t *)info;
 }
 
 static int
@@ -233,27 +308,24 @@
 trace ("cflac_init %s\n", deadbeef->pl_find_meta (it, ":URI"));
 flac_info_t *info = (flac_info_t *)_info;
 
- deadbeef->pl_lock ();
- info->file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
 if (!info->file) {
- trace ("cflac_init failed to open file\n");
- return -1;
+ deadbeef->pl_lock ();
+	const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ info->file = deadbeef->fopen (uri);
+ if (!info->file) {
+ trace ("cflac_init failed to open file %s\n", uri);
+ return -1;
+ }
 }
 
- info->flac_critical_error = 0;
-
- const char *ext = NULL;
-
- deadbeef->pl_lock ();
- {
- const char *uri = deadbeef->pl_find_meta (it, ":URI");
- ext = strrchr (uri, '.');
- if (ext) {
- ext++;
- }
+ deadbeef->pl_lock();
+ const char *uri = deadbeef->pl_find_meta(it, ":URI");
+ const char *ext = strrchr(uri, '.');
+ if (ext) {
+ ext++;
 }
- deadbeef->pl_unlock ();
+ deadbeef->pl_unlock();
 
 int isogg = 0;
 int skip = 0;
@@ -289,10 +361,10 @@
 }
 FLAC__stream_decoder_set_md5_checking (info->decoder, 0);
 if (isogg) {
- status = FLAC__stream_decoder_init_ogg_stream (info->decoder, flac_read_cb, flac_seek_cb, flac_tell_cb, flac_lenght_cb, flac_eof_cb, cflac_write_callback, cflac_metadata_callback, cflac_error_callback, info);
+ status = FLAC__stream_decoder_init_ogg_stream (info->decoder, flac_read_cb, flac_seek_cb, flac_tell_cb, flac_length_cb, flac_eof_cb, cflac_write_callback, cflac_metadata_callback, cflac_error_callback, info);
 }
 else {
- status = FLAC__stream_decoder_init_stream (info->decoder, flac_read_cb, flac_seek_cb, flac_tell_cb, flac_lenght_cb, flac_eof_cb, cflac_write_callback, cflac_metadata_callback, cflac_error_callback, info);
+ status = FLAC__stream_decoder_init_stream (info->decoder, flac_read_cb, flac_seek_cb, flac_tell_cb, flac_length_cb, flac_eof_cb, cflac_write_callback, cflac_metadata_callback, cflac_error_callback, info);
 }
 if (status != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
 trace ("cflac_init bad decoder status\n");
@@ -305,7 +377,7 @@
 }
 
 // bps/samplerate/channels were set by callbacks
- _info->plugin = &plugin;
+ _info->plugin = &plugin.decoder;
 _info->readpos = 0;
 
 if (_info->fmt.samplerate <= 0) { // not a FLAC stream
@@ -326,12 +398,14 @@
 }
 deadbeef->pl_unlock ();
 
- info->buffer = malloc (BUFFERSIZE);
+ info->buffersize = 100000;
+ info->buffer = malloc (info->buffersize);
 info->remaining = 0;
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
- if (plugin.seek_sample (_info, 0) < 0) {
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample (it);
+ info->endsample = endsample;
+ if (plugin.seek_sample64 (_info, 0) < 0) {
 trace ("cflac_init failed to seek to sample 0\n");
 return -1;
 }
@@ -375,19 +449,21 @@
 static int
 cflac_read (DB_fileinfo_t *_info, char *bytes, int size) {
 flac_info_t *info = (flac_info_t *)_info;
- if (info->bitrate != deadbeef->streamer_get_apx_bitrate()) {
+ if (info->set_bitrate && info->bitrate != deadbeef->streamer_get_apx_bitrate()) {
 deadbeef->streamer_set_bitrate (info->bitrate);
 }
+
 int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
 if (info->endsample >= 0) {
 if (size / samplesize + info->currentsample > info->endsample) {
- size = (info->endsample - info->currentsample + 1) * samplesize;
+ size = (int)(info->endsample - info->currentsample + 1) * samplesize;
 trace ("size truncated to %d bytes, cursample=%d, endsample=%d\n", size, info->currentsample, info->endsample);
 if (size <= 0) {
 return 0;
 }
 }
 }
+
 int initsize = size;
 do {
 if (info->remaining) {
@@ -401,7 +477,7 @@
 }
 info->remaining -= sz;
 int n = sz / samplesize;
- info->currentsample += sz / samplesize;
+ info->currentsample += n;
 _info->readpos += (float)n / _info->fmt.samplerate;
 }
 if (!size) {
@@ -488,7 +564,7 @@
 #endif
 
 static int
-cflac_seek_sample (DB_fileinfo_t *_info, int sample) {
+cflac_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
 flac_info_t *info = (flac_info_t *)_info;
 sample += info->startsample;
 info->currentsample = sample;
@@ -501,8 +577,13 @@
 }
 
 static int
+cflac_seek_sample (DB_fileinfo_t *_info, int sample) {
+ return cflac_seek_sample64(_info, sample);
+}
+
+static int
 cflac_seek (DB_fileinfo_t *_info, float time) {
- return cflac_seek_sample (_info, time * _info->fmt.samplerate);
+ return cflac_seek_sample64 (_info, (int64_t)((double)time * (int64_t)_info->fmt.samplerate));
 }
 
 static FLAC__StreamDecoderWriteStatus
@@ -519,28 +600,66 @@
 "TITLE", "title",
 "ALBUM", "album",
 "TRACKNUMBER", "track",
+ "TRACKTOTAL", "numtracks",
+ "TOTALTRACKS", "numtracks",
 "DATE", "year",
 "GENRE", "genre",
 "COMMENT", "comment",
 "PERFORMER", "performer",
-// "ENSEMBLE", "band",
 "COMPOSER", "composer",
 "ENCODED-BY", "vendor",
 "DISCNUMBER", "disc",
+ "DISCTOTAL", "numdiscs",
+ "TOTALDISCS", "numdiscs",
 "COPYRIGHT", "copyright",
- "TOTALTRACKS", "numtracks",
- "TRACKTOTAL", "numtracks",
- "ALBUM ARTIST", "band",
+ "ORIGINALDATE","original_release_time",
+ "ORIGINALYEAR","original_release_year",
+ "ALBUMARTIST", "ALBUM ARTIST",
 NULL
 };
 
+static int
+add_track_meta (DB_playItem_t *it, char *track) {
+ char *slash = strchr (track, '/');
+ if (slash) {
+ // split into track/totaltracks
+ *slash = 0;
+ slash++;
+ deadbeef->pl_add_meta (it, "numtracks", slash);
+ }
+ deadbeef->pl_add_meta (it, "track", track);
+ return 0;
+}
+
+static int
+add_disc_meta (DB_playItem_t *it, char *disc) {
+ char *slash = strchr (disc, '/');
+ if (slash) {
+ // split into disc/totaldiscs
+ *slash = 0;
+ slash++;
+ deadbeef->pl_add_meta (it, "numdiscs", slash);
+ }
+ deadbeef->pl_add_meta (it, "disc", disc);
+ return 0;
+}
+
 static void
 cflac_add_metadata (DB_playItem_t *it, const char *s, int length) {
 int m;
 for (m = 0; metainfom; m += 2) {
- int l = strlen (metainfom);
+ size_t l = strlen (metainfom);
 if (length > l && !strncasecmp (metainfom, s, l) && sl == '=') {
- deadbeef->pl_append_meta (it, metainfom+1, s + l + 1);
+ const char *val = s + l + 1;
+ if (!strcmp (metainfom+1, "track")) {
+ add_track_meta (it, strdupa (val));
+ }
+ else if (!strcmp (metainfom+1, "disc")) {
+ add_disc_meta (it, strdupa (val));
+ }
+ else {
+ deadbeef->pl_append_meta (it, metainfom+1, val);
+ }
 break;
 }
 }
@@ -566,7 +685,9 @@
 char keyeq - s+1;
 strncpy (key, s, eq-s);
 keyeq-s = 0;
- deadbeef->pl_append_meta (it, key, eq+1);
+ if (eq1) {
+ deadbeef->pl_append_meta (it, key, eq+1);
+ }
 }
 }
 }
@@ -586,7 +707,7 @@
 trace ("flac: samplerate=%d, channels=%d, totalsamples=%d\n", metadata->data.stream_info.sample_rate, metadata->data.stream_info.channels, metadata->data.stream_info.total_samples);
 _info->fmt.samplerate = metadata->data.stream_info.sample_rate;
 _info->fmt.channels = metadata->data.stream_info.channels;
- _info->fmt.bps = metadata->data.stream_info.bits_per_sample;
+ _info->fmt.bps = fix_bps (metadata->data.stream_info.bits_per_sample);
 info->totalsamples = metadata->data.stream_info.total_samples;
 if (metadata->data.stream_info.total_samples > 0) {
 deadbeef->plt_set_item_duration (info->plt, it, metadata->data.stream_info.total_samples / (float)metadata->data.stream_info.sample_rate);
@@ -621,22 +742,32 @@
 }
 
 static DB_playItem_t *
-cflac_insert_with_embedded_cue (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, const FLAC__StreamMetadata_CueSheet *cuesheet, int totalsamples, int samplerate) {
+cflac_insert_with_embedded_cue (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, const FLAC__StreamMetadata_CueSheet *cuesheet, uint64_t totalsamples, int samplerate) {
+ deadbeef->pl_lock ();
+
+ static const char err_invalid_cuesheet = "The flac %s has invalid FLAC__METADATA_TYPE_CUESHEET block, which will get ignored. You should remove it using metaflac.\n";
 DB_playItem_t *ins = after;
 
 // first check if cuesheet is matching the data
 for (int i = 0; i < cuesheet->num_tracks; i++) {
- if (cuesheet->tracksi.offset >= totalsamples) {
- fprintf (stderr, "The flac %s has invalid FLAC__METADATA_TYPE_CUESHEET block, which will get ignored. You should remove it using metaflac.\n", deadbeef->pl_find_meta_raw (origin, ":URI"));
+ if (cuesheet->tracksi.offset > totalsamples) {
+ fprintf (stderr, err_invalid_cuesheet, deadbeef->pl_find_meta_raw (origin, ":URI"));
+ deadbeef->pl_unlock ();
 return NULL;
 }
 }
 
- for (int i = 0; i < cuesheet->num_tracks-1; i++) {
- const char *uri = deadbeef->pl_find_meta_raw (origin, ":URI");
- const char *dec = deadbeef->pl_find_meta_raw (origin, ":DECODER");
- const char *ftype= "FLAC";
+ // use libflac to validate the cuesheet as well
+ if(!FLAC__format_cuesheet_is_legal (cuesheet, 1, NULL)) {
+ fprintf (stderr, err_invalid_cuesheet, deadbeef->pl_find_meta_raw (origin, ":URI"));
+ deadbeef->pl_unlock ();
+ return NULL;
+ }
 
+ const char *uri = deadbeef->pl_find_meta_raw (origin, ":URI");
+ const char *dec = deadbeef->pl_find_meta_raw (origin, ":DECODER");
+ const char *ftype = "FLAC";
+ for (int i = 0; i < cuesheet->num_tracks-1; i++) {
 DB_playItem_t *it = deadbeef->pl_item_alloc_init (uri, dec);
 deadbeef->pl_set_meta_int (it, ":TRACKNUM", i+1);
 deadbeef->pl_set_meta_int (it, "TRACK", i+1);
@@ -646,10 +777,12 @@
 snprintf (id, sizeof (id), "ARTIST%d", i+1);
 deadbeef->pl_add_meta (it, "artist", deadbeef->pl_find_meta (origin, id));
 deadbeef->pl_add_meta (it, "band", deadbeef->pl_find_meta (origin, "artist"));
- it->startsample = cuesheet->tracksi.offset;
- it->endsample = cuesheet->tracksi+1.offset-1;
+ int64_t startsample = cuesheet->tracksi.offset;
+ int64_t endsample = cuesheet->tracksi+1.offset-1;
+ deadbeef->pl_item_set_startsample (it, startsample);
+ deadbeef->pl_item_set_endsample (it, endsample);
 deadbeef->pl_replace_meta (it, ":FILETYPE", ftype);
- deadbeef->plt_set_item_duration (plt, it, (float)(it->endsample - it->startsample + 1) / samplerate);
+ deadbeef->plt_set_item_duration (plt, it, (float)(endsample - startsample + 1) / samplerate);
 after = deadbeef->plt_insert_item (plt, after, it);
 deadbeef->pl_item_unref (it);
 }
@@ -662,16 +795,22 @@
 }
 
 if (!first) {
+ deadbeef->pl_unlock ();
 return NULL;
 }
- trace ("aac: split by chapters success\n");
- // copy metadata from embedded tags
+
+ // copy metadata and flags from the source track
 uint32_t f = deadbeef->pl_get_item_flags (origin);
 f |= DDB_IS_SUBTRACK;
 deadbeef->pl_set_item_flags (origin, f);
+
 deadbeef->pl_items_copy_junk (origin, first, after);
 deadbeef->pl_item_unref (first);
 
+ deadbeef->pl_item_unref (after);
+
+ deadbeef->pl_unlock ();
+
 return after;
 }
 
@@ -714,16 +853,10 @@
 goto cflac_insert_fail;
 }
 
- const char *ext = fname + strlen (fname);
- while (ext > fname && *ext != '/' && *ext != '.') {
- ext--;
- }
- if (*ext == '.') {
+ const char *ext = strrchr (fname, '.');
+ if (ext) {
 ext++;
 }
- else {
- ext = NULL;
- }
 
 int isogg = 0;
 int skip = 0;
@@ -764,20 +897,14 @@
 // read all metadata
 FLAC__stream_decoder_set_md5_checking(decoder, 0);
 FLAC__stream_decoder_set_metadata_respond_all (decoder);
- it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
- info.it = it;
- if (skip > 0) {
- deadbeef->fseek (info.file, skip, SEEK_SET);
- }
- else {
- deadbeef->rewind (info.file);
- }
- deadbeef->fseek (info.file, -4, SEEK_CUR);
+
+ it = info.it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);;
+
 if (isogg) {
- status = FLAC__stream_decoder_init_ogg_stream (decoder, flac_read_cb, flac_seek_cb, flac_tell_cb, flac_lenght_cb, flac_eof_cb, cflac_init_write_callback, cflac_init_metadata_callback, cflac_init_error_callback, &info);
+ status = FLAC__stream_decoder_init_ogg_stream (decoder, flac_read_cb, flac_seek_cb, flac_tell_cb, flac_length_cb, flac_eof_cb, cflac_init_write_callback, cflac_init_metadata_callback, cflac_init_error_callback, &info);
 }
 else {
- status = FLAC__stream_decoder_init_stream (decoder, flac_read_cb, flac_seek_cb, flac_tell_cb, flac_lenght_cb, flac_eof_cb, cflac_init_write_callback, cflac_init_metadata_callback, cflac_init_error_callback, &info);
+ status = FLAC__stream_decoder_init_stream (decoder, flac_read_cb, flac_seek_cb, flac_tell_cb, flac_length_cb, flac_eof_cb, cflac_init_write_callback, cflac_init_metadata_callback, cflac_init_error_callback, &info);
 }
 if (status != FLAC__STREAM_DECODER_INIT_STATUS_OK || info.init_stop_decoding) {
 trace ("flac: FLAC__stream_decoder_init_stream 2 failed\n");
@@ -797,7 +924,7 @@
 deadbeef->pl_add_meta (it, ":FILETYPE", isogg ? "OggFLAC" : "FLAC");
 
 char s100;
- snprintf (s, sizeof (s), "%lld", fsize);
+ snprintf (s, sizeof (s), "%lld", (long long)fsize);
 deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
 snprintf (s, sizeof (s), "%d", info.info.fmt.channels);
 deadbeef->pl_add_meta (it, ":CHANNELS", s);
@@ -830,40 +957,21 @@
 cflac_read_metadata (it);
 }
 
- // try embedded cue
- deadbeef->pl_lock ();
- if (info.flac_cue_sheet) {
- DB_playItem_t *cue = cflac_insert_with_embedded_cue (plt, after, it, &info.flac_cue_sheet->data.cue_sheet, info.totalsamples, info.info.fmt.samplerate);
- if (cue) {
- cflac_free_temp (_info);
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
- deadbeef->pl_unlock ();
- return cue;
- }
- }
- const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
- if (cuesheet) {
- DB_playItem_t *last = deadbeef->plt_insert_cue_from_buffer (plt, after, it, (const uint8_t *)cuesheet, strlen (cuesheet), info.totalsamples, info.info.fmt.samplerate);
- if (last) {
- cflac_free_temp (_info);
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (last);
- deadbeef->pl_unlock ();
- return last;
- }
+ DB_playItem_t *cue_after = NULL;
+
+ cue_after = deadbeef->plt_process_cue (plt, after, it, info.totalsamples, info.info.fmt.samplerate);
+
+ if (!deadbeef->plt_is_loading_cue (plt) && !cue_after && info.flac_cue_sheet) {
+ // try native flac embedded cuesheet
+ cue_after = cflac_insert_with_embedded_cue (plt, after, it, &info.flac_cue_sheet->data.cue_sheet, info.totalsamples, info.info.fmt.samplerate);
 }
- deadbeef->pl_unlock ();
 
- // try external cue
- DB_playItem_t *cue_after = deadbeef->plt_insert_cue (plt, after, it, info.totalsamples, info.info.fmt.samplerate);
 if (cue_after) {
 cflac_free_temp (_info);
 deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue_after);
- trace ("flac: loaded external cuesheet\n");
 return cue_after;
 }
+
 after = deadbeef->plt_insert_item (plt, after, it);
 deadbeef->pl_item_unref (it);
 cflac_free_temp (_info);
@@ -924,8 +1032,9 @@
 return -1;
 }
 deadbeef->pl_lock ();
- DB_FILE *file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ DB_FILE *file = deadbeef->fopen (uri);
 if (!file) {
 return -1;
 }
@@ -987,6 +1096,7 @@
 
 return err;
 }
+
 #if USE_OGGEDIT
 int
 cflac_write_metadata_ogg (DB_playItem_t *it, FLAC__StreamMetadata_VorbisComment *vc)
@@ -1009,6 +1119,7 @@
 return 0;
 }
 #endif
+
 int
 cflac_write_metadata (DB_playItem_t *it) {
 int err = -1;
@@ -1056,19 +1167,15 @@
 } while (FLAC__metadata_iterator_next (iter));
 
 if (data) {
+ // delete existing fields
 FLAC__StreamMetadata_VorbisComment *vc = &data->data.vorbis_comment;
 int vc_comments = vc->num_comments;
 for (int i = 0; i < vc_comments; i++) {
 const FLAC__StreamMetadata_VorbisComment_Entry *c = &vc->commentsi;
 if (c->length > 0) {
- if (strncasecmp ((const char *)c->entry, "replaygain_album_gain=", 22)
- && strncasecmp ((const char *)c->entry, "replaygain_album_peak=", 22)
- && strncasecmp ((const char *)c->entry, "replaygain_track_gain=", 22)
- && strncasecmp ((const char *)c->entry, "replaygain_track_peak=", 22)) {
- FLAC__metadata_object_vorbiscomment_delete_comment (data, i);
- vc_comments--;
- i--;
- }
+ FLAC__metadata_object_vorbiscomment_delete_comment (data, i);
+ vc_comments--;
+ i--;
 }
 }
 }
@@ -1088,43 +1195,78 @@
 deadbeef->pl_lock ();
 DB_metaInfo_t *m = deadbeef->pl_get_metadata_head (it);
 while (m) {
- if (m->key0 != ':') {
- int i;
- for (i = 0; metainfoi; i += 2) {
- if (!strcasecmp (metainfoi+1, m->key)) {
- break;
- }
+ if (strchr (":!_", m->key0)) {
+ break;
+ }
+ int i;
+ for (i = 0; metainfoi; i += 2) {
+ if (!strcasecmp (metainfoi+1, m->key)) {
+ break;
 }
- const char *val = m->value;
- if (val && *val) {
- while (val) {
- const char *next = strchr (val, '\n');
- int l;
- if (next) {
- l = next - val;
- next++;
- }
- else {
- l = strlen (val);
- }
- if (l > 0) {
- char s100+l+1;
- int n = snprintf (s, sizeof (s), "%s=", metainfoi ? metainfoi : m->key);
- strncpy (s+n, val, l);
- *(s+n+l) = 0;
- FLAC__StreamMetadata_VorbisComment_Entry ent = {
- .length = strlen (s),
- .entry = (FLAC__byte*)s
- };
- FLAC__metadata_object_vorbiscomment_append_comment (data, ent, 1);
- }
- val = next;
+ }
+ const char *val = m->value;
+ if (val && *val) {
+ const char *end = val + m->valuesize;
+ while (val < end) {
+ size_t l = strlen (val);
+ if (l > 0) {
+ char s100+l+1;
+ int n = snprintf (s, sizeof (s), "%s=", metainfoi ? metainfoi : m->key);
+ strncpy (s+n, val, l);
+ *(s+n+l) = 0;
+ FLAC__StreamMetadata_VorbisComment_Entry ent = {
+ .length = (FLAC__uint32)strlen (s),
+ .entry = (FLAC__byte*)s
+ };
+ FLAC__metadata_object_vorbiscomment_append_comment (data, ent, 1);
 }
+ val += l+1;
 }
 }
 m = m->next;
 }
 
+ static const char *tag_rg_names = {
+ "REPLAYGAIN_ALBUM_GAIN",
+ "REPLAYGAIN_ALBUM_PEAK",
+ "REPLAYGAIN_TRACK_GAIN",
+ "REPLAYGAIN_TRACK_PEAK",
+ NULL
+ };
+
+ // replaygain key names in deadbeef internal metadata
+ static const char *ddb_internal_rg_keys = {
+ ":REPLAYGAIN_ALBUMGAIN",
+ ":REPLAYGAIN_ALBUMPEAK",
+ ":REPLAYGAIN_TRACKGAIN",
+ ":REPLAYGAIN_TRACKPEAK",
+ NULL
+ };
+
+ // add replaygain values
+ for (int n = 0; ddb_internal_rg_keysn; n++) {
+ if (deadbeef->pl_find_meta (it, ddb_internal_rg_keysn)) {
+ float value = deadbeef->pl_get_item_replaygain (it, n);
+ char s100;
+ // https://wiki.hydrogenaud.io/index.php?title=ReplayGain_2.0_specification#Metadata_format
+ switch (n) {
+ case DDB_REPLAYGAIN_ALBUMGAIN:
+ case DDB_REPLAYGAIN_TRACKGAIN:
+ snprintf (s, sizeof (s), "%s=%.2f dB", tag_rg_namesn, value);
+ break;
+ case DDB_REPLAYGAIN_ALBUMPEAK:
+ case DDB_REPLAYGAIN_TRACKPEAK:
+ snprintf (s, sizeof (s), "%s=%.6f", tag_rg_namesn, value);
+ break;
+ }
+ FLAC__StreamMetadata_VorbisComment_Entry ent = {
+ .length = (FLAC__uint32)strlen (s),
+ .entry = (FLAC__byte*)s
+ };
+ FLAC__metadata_object_vorbiscomment_append_comment (data, ent, 1);
+ }
+ }
+
 deadbeef->pl_unlock ();
 
 if (!isogg) {
@@ -1152,20 +1294,27 @@
 return err;
 }
 
+static const char configdialog =
+ "property \"Ignore bad header errors\" checkbox flac.ignore_bad_header_errors 0;\n"
+ "property \"Ignore unparsable stream errors\" checkbox flac.ignore_unparsable_stream_errors 0;\n"
+;
+
+
 static const char *exts = { "flac", "oga", NULL };
 
 // 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 = "stdflac",
- .plugin.name = "FLAC decoder",
- .plugin.descr = "FLAC decoder using libFLAC",
- .plugin.copyright =
- "Copyright (C) 2009-2013 Alexey Yakovenko et al.\n"
+static ddb_decoder2_t plugin = {
+ .decoder.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .decoder.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .decoder.plugin.version_major = 1,
+ .decoder.plugin.version_minor = 0,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.id = "stdflac",
+ .decoder.plugin.name = "FLAC decoder",
+ .decoder.plugin.descr = "FLAC decoder using libFLAC",
+ .decoder.plugin.copyright =
+ "Copyright (C) 2009-2013 Oleksiy Yakovenko et al.\n"
 "Uses libFLAC (C) Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson\n"
 "Uses libogg Copyright (c) 2002, Xiph.org Foundation\n"
 "\n"
@@ -1196,17 +1345,20 @@
 "NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n"
 "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
 ,
- .plugin.website = "http://deadbeef.sf.net",
- .open = cflac_open,
- .init = cflac_init,
- .free = cflac_free,
- .read = cflac_read,
- .seek = cflac_seek,
- .seek_sample = cflac_seek_sample,
- .insert = cflac_insert,
- .read_metadata = cflac_read_metadata,
- .write_metadata = cflac_write_metadata,
- .exts = exts,
+ .decoder.plugin.website = "http://deadbeef.sf.net",
+ .decoder.plugin.configdialog = configdialog,
+ .decoder.open = cflac_open,
+ .decoder.open2 = cflac_open2,
+ .decoder.init = cflac_init,
+ .decoder.free = cflac_free,
+ .decoder.read = cflac_read,
+ .decoder.seek = cflac_seek,
+ .decoder.seek_sample = cflac_seek_sample,
+ .decoder.insert = cflac_insert,
+ .decoder.read_metadata = cflac_read_metadata,
+ .decoder.write_metadata = cflac_write_metadata,
+ .decoder.exts = exts,
+ .seek_sample64 = cflac_seek_sample64,
 };
 
 DB_plugin_t *

deadbeef-0.6.2.tar.bz2/plugins/gme/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/gme/COPYING Changed

@@ -1,5 +1,5 @@
 Game_Music_Emu plugin for DeaDBeeF
-Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+Copyright (C) 2009-2015 Oleksiy Yakovenko <waker@users.sourceforge.net>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -23,7 +23,8 @@
 
 Game_Music_Emu (modified)
 Copyright (C) 2003-2009 Shay Green.
-DeaDBeeF-related modifications (C) Alexey Yakovenko.
+Foobar2000-related modifications (C) Chris Moeller.
+DeaDBeeF-related modifications (C) Oleksiy Yakovenko.
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -38,3 +39,39 @@
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+
+VGMPlay
+Copyright Nicola Salmoria and the MAME team
+All rights reserved.
+
+Redistribution and use of this code or any derivative works are permitted
+provided that the following conditions are met:
+
+* Redistributions may not be sold, nor may they be used in a commercial
+product or activity.
+
+* Redistributions that are modified from the original source must include the
+complete source code, including the source code for all components used by a
+binary built from the modified sources. However, as a special exception, the
+source code distributed need not include anything that is normally distributed
+(in either source or binary form) with the major components (compiler, kernel,
+and so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+* Redistributions 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.
+
+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.

deadbeef-0.6.2.tar.bz2/plugins/gme/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/gme/Makefile.am Changed

@@ -1,192 +1,327 @@
-if HAVE_GME
-
 gmeversion=game-music-emu-0.6pre
-gmepath=@top_srcdir@/plugins/gme/$(gmeversion)
+gmepath=@top_srcdir@/plugins/gme/game-music-emu-0.6pre
 
-EXTRA_DIST = $(gmepath)/changes.txt $(gmepath)/design.txt $(gmepath)/gme.txt $(gmepath)/license.txt $(gmepath)/readme.txt 
-
-gmedir = $(libdir)/$(PACKAGE)
+EXTRA_DIST = $(gmepath)/changes.txt $(gmepath)/design.txt $(gmepath)/gme.txt $(gmepath)/license.txt $(gmepath)/readme.txt $(gmepath)/vgmplay/VGMPlay/chips/emu2413_NESpatches.txt $(gmepath)/vgmplay/VGMPlay/licenses/GPL.txt $(gmepath)/vgmplay/VGMPlay/licenses/List.txt $(gmepath)/vgmplay/VGMPlay/licenses/mame_license.txt $(gmepath)/vgmplay/VGMPlay/SourceReadme.txt $(gmepath)/vgmplay/VGMPlay/VGMPlay.txt $(gmepath)/vgmplay/VGMPlay/VGMPlay_Updates.txt $(gmepath)/vgmplay/VGMPlay/vgmspec171.txt $(gmepath)/gme/higan/smp/memory.cpp $(gmepath)/gme/higan/smp/timing.cpp $(gmepath)/vgmplay/VGMPlay/chips/opl.c $(gmepath)/vgmplay/VGMPlay/chips/emuconfig.h
 
+if HAVE_GME
 pkglib_LTLIBRARIES = gme.la
 
 # 0.6pre (foo_gep) files
-gme_la_SOURCES = cgme.c\
-	$(gmeversion)/gme/Ay_Apu.cpp\
-	$(gmeversion)/gme/Ay_Core.cpp\
-	$(gmeversion)/gme/Ay_Cpu.cpp\
-	$(gmeversion)/gme/Ay_Emu.cpp\
-	$(gmeversion)/gme/blargg_common.cpp\
-	$(gmeversion)/gme/blargg_errors.cpp\
-	$(gmeversion)/gme/Blip_Buffer.cpp\
-	$(gmeversion)/gme/Classic_Emu.cpp\
-	$(gmeversion)/gme/Downsampler.cpp\
-	$(gmeversion)/gme/Dual_Resampler.cpp\
-	$(gmeversion)/gme/Effects_Buffer.cpp\
-	$(gmeversion)/gme/emu2413.cpp\
-	$(gmeversion)/gme/Fir_Resampler.cpp\
-	$(gmeversion)/gme/fmopl.cpp\
-	$(gmeversion)/gme/Gb_Apu.cpp\
-	$(gmeversion)/gme/Gb_Cpu.cpp\
-	$(gmeversion)/gme/Gb_Oscs.cpp\
-	$(gmeversion)/gme/Gbs_Core.cpp\
-	$(gmeversion)/gme/Gbs_Cpu.cpp\
-	$(gmeversion)/gme/Gbs_Emu.cpp\
-	$(gmeversion)/gme/gme.cpp\
-	$(gmeversion)/gme/Gme_File.cpp\
-	$(gmeversion)/gme/Gme_Loader.cpp\
-	$(gmeversion)/gme/Gym_Emu.cpp\
-	$(gmeversion)/gme/Hes_Apu_Adpcm.cpp\
-	$(gmeversion)/gme/Hes_Apu.cpp\
-	$(gmeversion)/gme/Hes_Core.cpp\
-	$(gmeversion)/gme/Hes_Cpu.cpp\
-	$(gmeversion)/gme/Hes_Emu.cpp\
-	$(gmeversion)/gme/Kss_Core.cpp\
-	$(gmeversion)/gme/Kss_Cpu.cpp\
-	$(gmeversion)/gme/Kss_Emu.cpp\
-	$(gmeversion)/gme/Kss_Scc_Apu.cpp\
-	$(gmeversion)/gme/M3u_Playlist.cpp\
-	$(gmeversion)/gme/Multi_Buffer.cpp\
-	$(gmeversion)/gme/Music_Emu.cpp\
-	$(gmeversion)/gme/Nes_Apu.cpp\
-	$(gmeversion)/gme/Nes_Cpu.cpp\
-	$(gmeversion)/gme/Nes_Fds_Apu.cpp\
-	$(gmeversion)/gme/Nes_Fme7_Apu.cpp\
-	$(gmeversion)/gme/Nes_Namco_Apu.cpp\
-	$(gmeversion)/gme/Nes_Oscs.cpp\
-	$(gmeversion)/gme/Nes_Vrc6_Apu.cpp\
-	$(gmeversion)/gme/Nes_Vrc7_Apu.cpp\
-	$(gmeversion)/gme/Nsf_Core.cpp\
-	$(gmeversion)/gme/Nsf_Cpu.cpp\
-	$(gmeversion)/gme/Nsfe_Emu.cpp\
-	$(gmeversion)/gme/Nsf_Emu.cpp\
-	$(gmeversion)/gme/Nsf_Impl.cpp\
-	$(gmeversion)/gme/Opl_Apu.cpp\
-	$(gmeversion)/gme/Resampler.cpp\
-	$(gmeversion)/gme/Rom_Data.cpp\
-	$(gmeversion)/gme/Sap_Apu.cpp\
-	$(gmeversion)/gme/Sap_Core.cpp\
-	$(gmeversion)/gme/Sap_Cpu.cpp\
-	$(gmeversion)/gme/Sap_Emu.cpp\
-	$(gmeversion)/gme/Sgc_Core.cpp\
-	$(gmeversion)/gme/Sgc_Cpu.cpp\
-	$(gmeversion)/gme/Sgc_Emu.cpp\
-	$(gmeversion)/gme/Sgc_Impl.cpp\
-	$(gmeversion)/gme/Sms_Apu.cpp\
-	$(gmeversion)/gme/Sms_Fm_Apu.cpp\
-	$(gmeversion)/gme/Snes_Spc.cpp\
-	$(gmeversion)/gme/Spc_Cpu.cpp\
-	$(gmeversion)/gme/Spc_Dsp.cpp\
-	$(gmeversion)/gme/Spc_Emu.cpp\
-	$(gmeversion)/gme/SPC_Filter.cpp\
-	$(gmeversion)/gme/Track_Filter.cpp\
-	$(gmeversion)/gme/Upsampler.cpp\
-	$(gmeversion)/gme/Vgm_Core.cpp\
-	$(gmeversion)/gme/Vgm_Emu.cpp\
-	$(gmeversion)/gme/Ym2413_Emu.cpp\
-	$(gmeversion)/gme/Ym2612_Emu.cpp\
-	$(gmeversion)/gme/ymdeltat.cpp\
-	$(gmeversion)/gme/Z80_Cpu.cpp\
-	$(gmeversion)/gme/Data_Reader.cpp\
-	$(gmeversion)/gme/s_deltat.c\
-	$(gmeversion)/gme/s_logtbl.c\
-	$(gmeversion)/gme/s_opl.c\
-	$(gmeversion)/gme/s_opltbl.c\
-	$(gmeversion)/gme/ym2413.c\
-	$(gmeversion)/gme/Ay_Apu.h\
-	$(gmeversion)/gme/Ay_Core.h\
-	$(gmeversion)/gme/Ay_Emu.h\
-	$(gmeversion)/gme/blargg_common.h\
-	$(gmeversion)/gme/blargg_config.h\
-	$(gmeversion)/gme/blargg_endian.h\
-	$(gmeversion)/gme/blargg_errors.h\
-	$(gmeversion)/gme/blargg_source.h\
-	$(gmeversion)/gme/Blip_Buffer.h\
-	$(gmeversion)/gme/Blip_Buffer_impl2.h\
-	$(gmeversion)/gme/Blip_Buffer_impl.h\
-	$(gmeversion)/gme/Classic_Emu.h\
-	$(gmeversion)/gme/divfix.h\
-	$(gmeversion)/gme/Data_Reader.h\
-	$(gmeversion)/gme/Downsampler.h\
-	$(gmeversion)/gme/Dual_Resampler.h\
-	$(gmeversion)/gme/Effects_Buffer.h\
-	$(gmeversion)/gme/emu2413.h\
-	$(gmeversion)/gme/Fir_Resampler.h\
-	$(gmeversion)/gme/fmopl.h\
-	$(gmeversion)/gme/Gb_Apu.h\
-	$(gmeversion)/gme/Gb_Cpu.h\
-	$(gmeversion)/gme/Gb_Cpu_run.h\
-	$(gmeversion)/gme/Gb_Oscs.h\
-	$(gmeversion)/gme/Gbs_Core.h\
-	$(gmeversion)/gme/Gbs_Emu.h\
-	$(gmeversion)/gme/Gme_File.h\
-	$(gmeversion)/gme/gme.h\
-	$(gmeversion)/gme/Gme_Loader.h\
-	$(gmeversion)/gme/Gym_Emu.h\
-	$(gmeversion)/gme/Hes_Apu_Adpcm.h\
-	$(gmeversion)/gme/Hes_Apu.h\
-	$(gmeversion)/gme/Hes_Core.h\
-	$(gmeversion)/gme/Hes_Cpu.h\
-	$(gmeversion)/gme/Hes_Cpu_run.h\
-	$(gmeversion)/gme/Hes_Emu.h\
-	$(gmeversion)/gme/i_fmpac.h\
-	$(gmeversion)/gme/i_fmunit.h\
-	$(gmeversion)/gme/i_vrc7.h\
-	$(gmeversion)/gme/kmsnddev.h\
-	$(gmeversion)/gme/Kss_Core.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_run.h\
-	$(gmeversion)/gme/Nes_Fds_Apu.h\
-	$(gmeversion)/gme/Nes_Fme7_Apu.h\
-	$(gmeversion)/gme/Nes_Mmc5_Apu.h\
-	$(gmeversion)/gme/Nes_Namco_Apu.h\
-	$(gmeversion)/gme/Nes_Oscs.h\
-	$(gmeversion)/gme/nestypes.h\
-	$(gmeversion)/gme/Nes_Vrc6_Apu.h\
-	$(gmeversion)/gme/Nes_Vrc7_Apu.h\
-	$(gmeversion)/gme/Nsf_Core.h\
-	$(gmeversion)/gme/Nsfe_Emu.h\
-	$(gmeversion)/gme/Nsf_Emu.h\
-	$(gmeversion)/gme/Nsf_Impl.h\
-	$(gmeversion)/gme/Opl_Apu.h\
-	$(gmeversion)/gme/Resampler.h\
-	$(gmeversion)/gme/Rom_Data.h\
-	$(gmeversion)/gme/Sap_Apu.h\
-	$(gmeversion)/gme/Sap_Core.h\
-	$(gmeversion)/gme/Sap_Emu.h\
-	$(gmeversion)/gme/s_deltat.h\
-	$(gmeversion)/gme/Sgc_Core.h\
-	$(gmeversion)/gme/Sgc_Emu.h\
-	$(gmeversion)/gme/Sgc_Impl.h\
-	$(gmeversion)/gme/s_logtbl.h\
-	$(gmeversion)/gme/Sms_Apu.h\
-	$(gmeversion)/gme/Sms_Fm_Apu.h\
-	$(gmeversion)/gme/Snes_Spc.h\
-	$(gmeversion)/gme/s_opl.h\
-	$(gmeversion)/gme/s_opltbl.h\
-	$(gmeversion)/gme/Spc_Cpu.h\
-	$(gmeversion)/gme/Spc_Dsp.h\
-	$(gmeversion)/gme/Spc_Emu.h\
-	$(gmeversion)/gme/Spc_Filter.h\
-	$(gmeversion)/gme/Track_Filter.h\
-	$(gmeversion)/gme/Upsampler.h\
-	$(gmeversion)/gme/Vgm_Core.h\
-	$(gmeversion)/gme/Vgm_Emu.h\
-	$(gmeversion)/gme/Ym2413_Emu.h\
-	$(gmeversion)/gme/ym2413.h\
-	$(gmeversion)/gme/Ym2612_Emu.h\
-	$(gmeversion)/gme/ymdeltat.h\
-	$(gmeversion)/gme/Z80_Cpu.h\
-	$(gmeversion)/gme/Z80_Cpu_run.h
+gme_la_SOURCES = cgme.c gmewrap.cpp gmewrap.h\
+	game-music-emu-0.6pre/gme/Ay_Apu.cpp\
+	game-music-emu-0.6pre/gme/Ay_Core.cpp\
+	game-music-emu-0.6pre/gme/Ay_Cpu.cpp\
+	game-music-emu-0.6pre/gme/Ay_Emu.cpp\
+	game-music-emu-0.6pre/gme/Blip_Buffer.cpp\
+	game-music-emu-0.6pre/gme/Bml_Parser.cpp\
+	game-music-emu-0.6pre/gme/Classic_Emu.cpp\
+	game-music-emu-0.6pre/gme/Data_Reader.cpp\
+	game-music-emu-0.6pre/gme/Downsampler.cpp\
+	game-music-emu-0.6pre/gme/Dual_Resampler.cpp\
+	game-music-emu-0.6pre/gme/Effects_Buffer.cpp\
+	game-music-emu-0.6pre/gme/Fir_Resampler.cpp\
+	game-music-emu-0.6pre/gme/Gb_Apu.cpp\
+	game-music-emu-0.6pre/gme/Gb_Cpu.cpp\
+	game-music-emu-0.6pre/gme/Gb_Oscs.cpp\
+	game-music-emu-0.6pre/gme/Gbs_Core.cpp\
+	game-music-emu-0.6pre/gme/Gbs_Cpu.cpp\
+	game-music-emu-0.6pre/gme/Gbs_Emu.cpp\
+	game-music-emu-0.6pre/gme/Gme_File.cpp\
+	game-music-emu-0.6pre/gme/Gme_Loader.cpp\
+	game-music-emu-0.6pre/gme/Gym_Emu.cpp\
+	game-music-emu-0.6pre/gme/Hes_Apu.cpp\
+	game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.cpp\
+	game-music-emu-0.6pre/gme/Hes_Core.cpp\
+	game-music-emu-0.6pre/gme/Hes_Cpu.cpp\
+	game-music-emu-0.6pre/gme/Hes_Emu.cpp\
+	game-music-emu-0.6pre/gme/Kss_Core.cpp\
+	game-music-emu-0.6pre/gme/Kss_Cpu.cpp\
+	game-music-emu-0.6pre/gme/Kss_Emu.cpp\
+	game-music-emu-0.6pre/gme/Kss_Scc_Apu.cpp\
+	game-music-emu-0.6pre/gme/M3u_Playlist.cpp\
+	game-music-emu-0.6pre/gme/Multi_Buffer.cpp\
+	game-music-emu-0.6pre/gme/Music_Emu.cpp\
+	game-music-emu-0.6pre/gme/Nes_Apu.cpp\
+	game-music-emu-0.6pre/gme/Nes_Cpu.cpp\
+	game-music-emu-0.6pre/gme/Nes_Fds_Apu.cpp\
+	game-music-emu-0.6pre/gme/Nes_Fme7_Apu.cpp\
+	game-music-emu-0.6pre/gme/Nes_Namco_Apu.cpp\
+	game-music-emu-0.6pre/gme/Nes_Oscs.cpp\
+	game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.cpp\
+	game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.cpp\
+	game-music-emu-0.6pre/gme/Nsf_Core.cpp\
+	game-music-emu-0.6pre/gme/Nsf_Cpu.cpp\
+	game-music-emu-0.6pre/gme/Nsf_Emu.cpp\
+	game-music-emu-0.6pre/gme/Nsf_Impl.cpp\
+	game-music-emu-0.6pre/gme/Nsfe_Emu.cpp\
+	game-music-emu-0.6pre/gme/Opl_Apu.cpp\
+	game-music-emu-0.6pre/gme/Resampler.cpp\
+	game-music-emu-0.6pre/gme/Rom_Data.cpp\
+	game-music-emu-0.6pre/gme/SPC_Filter.cpp\
+	game-music-emu-0.6pre/gme/Sap_Apu.cpp\
+	game-music-emu-0.6pre/gme/Sap_Core.cpp\
+	game-music-emu-0.6pre/gme/Sap_Cpu.cpp\
+	game-music-emu-0.6pre/gme/Sap_Emu.cpp\
+	game-music-emu-0.6pre/gme/Sgc_Core.cpp\
+	game-music-emu-0.6pre/gme/Sgc_Cpu.cpp\
+	game-music-emu-0.6pre/gme/Sgc_Emu.cpp\
+	game-music-emu-0.6pre/gme/Sgc_Impl.cpp\
+	game-music-emu-0.6pre/gme/Sms_Apu.cpp\
+	game-music-emu-0.6pre/gme/Sms_Fm_Apu.cpp\
+	game-music-emu-0.6pre/gme/Spc_Emu.cpp\
+	game-music-emu-0.6pre/gme/Spc_Sfm.cpp\
+	game-music-emu-0.6pre/gme/Track_Filter.cpp\
+	game-music-emu-0.6pre/gme/Upsampler.cpp\
+	game-music-emu-0.6pre/gme/Vgm_Core.cpp\
+	game-music-emu-0.6pre/gme/Vgm_Emu.cpp\
+	game-music-emu-0.6pre/gme/Ym2413_Emu.cpp\
+	game-music-emu-0.6pre/gme/Ym2612_Emu.cpp\
+	game-music-emu-0.6pre/gme/Ym2612_Emu_Gens.cpp\
+	game-music-emu-0.6pre/gme/Ym2612_Emu_MAME.cpp\
+	game-music-emu-0.6pre/gme/Z80_Cpu.cpp\
+	game-music-emu-0.6pre/gme/blargg_common.cpp\
+	game-music-emu-0.6pre/gme/blargg_errors.cpp\
+	game-music-emu-0.6pre/gme/gme.cpp\
+	game-music-emu-0.6pre/gme/higan/dsp/dsp.cpp\
+	game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.cpp\
+	game-music-emu-0.6pre/gme/higan/processor/spc700/algorithms.cpp\
+	game-music-emu-0.6pre/gme/higan/processor/spc700/instructions.cpp\
+	game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.cpp\
+	game-music-emu-0.6pre/gme/higan/smp/smp.cpp\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl2.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl3.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm2612.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.c\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.c\
+	game-music-emu-0.6pre/gme/Ay_Apu.h\
+	game-music-emu-0.6pre/gme/Ay_Core.h\
+	game-music-emu-0.6pre/gme/Ay_Emu.h\
+	game-music-emu-0.6pre/gme/Blip_Buffer.h\
+	game-music-emu-0.6pre/gme/Blip_Buffer_impl.h\
+	game-music-emu-0.6pre/gme/Blip_Buffer_impl2.h\
+	game-music-emu-0.6pre/gme/Bml_Parser.h\
+	game-music-emu-0.6pre/gme/Classic_Emu.h\
+	game-music-emu-0.6pre/gme/Data_Reader.h\
+	game-music-emu-0.6pre/gme/Downsampler.h\
+	game-music-emu-0.6pre/gme/Dual_Resampler.h\
+	game-music-emu-0.6pre/gme/Effects_Buffer.h\
+	game-music-emu-0.6pre/gme/Fir_Resampler.h\
+	game-music-emu-0.6pre/gme/Gb_Apu.h\
+	game-music-emu-0.6pre/gme/Gb_Cpu.h\
+	game-music-emu-0.6pre/gme/Gb_Cpu_run.h\
+	game-music-emu-0.6pre/gme/Gb_Oscs.h\
+	game-music-emu-0.6pre/gme/Gbs_Core.h\
+	game-music-emu-0.6pre/gme/Gbs_Emu.h\
+	game-music-emu-0.6pre/gme/Gme_File.h\
+	game-music-emu-0.6pre/gme/Gme_Loader.h\
+	game-music-emu-0.6pre/gme/Gym_Emu.h\
+	game-music-emu-0.6pre/gme/Hes_Apu.h\
+	game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.h\
+	game-music-emu-0.6pre/gme/Hes_Core.h\
+	game-music-emu-0.6pre/gme/Hes_Cpu.h\
+	game-music-emu-0.6pre/gme/Hes_Cpu_run.h\
+	game-music-emu-0.6pre/gme/Hes_Emu.h\
+	game-music-emu-0.6pre/gme/Kss_Core.h\
+	game-music-emu-0.6pre/gme/Kss_Emu.h\
+	game-music-emu-0.6pre/gme/Kss_Scc_Apu.h\
+	game-music-emu-0.6pre/gme/M3u_Playlist.h\
+	game-music-emu-0.6pre/gme/Multi_Buffer.h\
+	game-music-emu-0.6pre/gme/Music_Emu.h\
+	game-music-emu-0.6pre/gme/Nes_Apu.h\
+	game-music-emu-0.6pre/gme/Nes_Cpu.h\
+	game-music-emu-0.6pre/gme/Nes_Cpu_run.h\
+	game-music-emu-0.6pre/gme/Nes_Fds_Apu.h\
+	game-music-emu-0.6pre/gme/Nes_Fme7_Apu.h\
+	game-music-emu-0.6pre/gme/Nes_Mmc5_Apu.h\
+	game-music-emu-0.6pre/gme/Nes_Namco_Apu.h\
+	game-music-emu-0.6pre/gme/Nes_Oscs.h\
+	game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.h\
+	game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.h\
+	game-music-emu-0.6pre/gme/Nsf_Core.h\
+	game-music-emu-0.6pre/gme/Nsf_Emu.h\
+	game-music-emu-0.6pre/gme/Nsf_Impl.h\
+	game-music-emu-0.6pre/gme/Nsfe_Emu.h\
+	game-music-emu-0.6pre/gme/Opl_Apu.h\
+	game-music-emu-0.6pre/gme/Resampler.h\
+	game-music-emu-0.6pre/gme/Rom_Data.h\
+	game-music-emu-0.6pre/gme/Sap_Apu.h\
+	game-music-emu-0.6pre/gme/Sap_Core.h\
+	game-music-emu-0.6pre/gme/Sap_Emu.h\
+	game-music-emu-0.6pre/gme/Sgc_Core.h\
+	game-music-emu-0.6pre/gme/Sgc_Emu.h\
+	game-music-emu-0.6pre/gme/Sgc_Impl.h\
+	game-music-emu-0.6pre/gme/Sms_Apu.h\
+	game-music-emu-0.6pre/gme/Sms_Fm_Apu.h\
+	game-music-emu-0.6pre/gme/Spc_Emu.h\
+	game-music-emu-0.6pre/gme/Spc_Filter.h\
+	game-music-emu-0.6pre/gme/Spc_Sfm.h\
+	game-music-emu-0.6pre/gme/Track_Filter.h\
+	game-music-emu-0.6pre/gme/Upsampler.h\
+	game-music-emu-0.6pre/gme/Vgm_Core.h\
+	game-music-emu-0.6pre/gme/Vgm_Emu.h\
+	game-music-emu-0.6pre/gme/Ym2413_Emu.h\
+	game-music-emu-0.6pre/gme/Ym2612_Emu.h\
+	game-music-emu-0.6pre/gme/Z80_Cpu.h\
+	game-music-emu-0.6pre/gme/Z80_Cpu_run.h\
+	game-music-emu-0.6pre/gme/adlib.h\
+	game-music-emu-0.6pre/gme/blargg_common.h\
+	game-music-emu-0.6pre/gme/blargg_config.h\
+	game-music-emu-0.6pre/gme/blargg_endian.h\
+	game-music-emu-0.6pre/gme/blargg_errors.h\
+	game-music-emu-0.6pre/gme/blargg_source.h\
+	game-music-emu-0.6pre/gme/gme.h\
+	game-music-emu-0.6pre/gme/gme_custom_dprintf.h\
+	game-music-emu-0.6pre/gme/higan/dsp/dsp.hpp\
+	game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.h\
+	game-music-emu-0.6pre/gme/higan/processor/spc700/memory.hpp\
+	game-music-emu-0.6pre/gme/higan/processor/spc700/registers.hpp\
+	game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.hpp\
+	game-music-emu-0.6pre/gme/higan/smp/smp.hpp\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413tone.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/281btone.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ChipIncl.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emutypes.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/mamedef.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_defs.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/opl.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vrc7tone.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_initialIo.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.h\
+   	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/stdbool.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMFile.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.h\
+	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay_Intf.h
 
 gme_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
 gme_la_LIBADD = $(ZLIB_LIBS)
 
-AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -I$(gmepath) -std=c99 -DGME_VERSION_055
-AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables
+gme_la_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -I$(gmepath) -std=c99 -DGME_VERSION_055 -I@top_srcdir@/include
+gme_la_CXXFLAGS = $(CXXFLAGS) $(ZLIB_CFLAGS) -I$(gmepath) -I$(gmepath)/gme -DGME_VERSION_055 -fno-exceptions -fno-rtti -fno-unwind-tables -I@top_srcdir@/include
 endif

deadbeef-0.6.2.tar.bz2/plugins/gme/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/gme/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
 am__make_running_with_option = \
 case $${target_option-} in \
 ?) ;; \
@@ -79,31 +89,27 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/gme
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/depcomp COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
 	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/intmax.m4 \
-	$(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -139,146 +145,474 @@
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @HAVE_GME_TRUE@gme_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__gme_la_SOURCES_DIST = cgme.c $(gmeversion)/gme/Ay_Apu.cpp \
-	$(gmeversion)/gme/Ay_Core.cpp $(gmeversion)/gme/Ay_Cpu.cpp \
-	$(gmeversion)/gme/Ay_Emu.cpp \
-	$(gmeversion)/gme/blargg_common.cpp \
-	$(gmeversion)/gme/blargg_errors.cpp \
-	$(gmeversion)/gme/Blip_Buffer.cpp \
-	$(gmeversion)/gme/Classic_Emu.cpp \
-	$(gmeversion)/gme/Downsampler.cpp \
-	$(gmeversion)/gme/Dual_Resampler.cpp \
-	$(gmeversion)/gme/Effects_Buffer.cpp \
-	$(gmeversion)/gme/emu2413.cpp \
-	$(gmeversion)/gme/Fir_Resampler.cpp \
-	$(gmeversion)/gme/fmopl.cpp $(gmeversion)/gme/Gb_Apu.cpp \
-	$(gmeversion)/gme/Gb_Cpu.cpp $(gmeversion)/gme/Gb_Oscs.cpp \
-	$(gmeversion)/gme/Gbs_Core.cpp $(gmeversion)/gme/Gbs_Cpu.cpp \
-	$(gmeversion)/gme/Gbs_Emu.cpp $(gmeversion)/gme/gme.cpp \
-	$(gmeversion)/gme/Gme_File.cpp \
-	$(gmeversion)/gme/Gme_Loader.cpp $(gmeversion)/gme/Gym_Emu.cpp \
-	$(gmeversion)/gme/Hes_Apu_Adpcm.cpp \
-	$(gmeversion)/gme/Hes_Apu.cpp $(gmeversion)/gme/Hes_Core.cpp \
-	$(gmeversion)/gme/Hes_Cpu.cpp $(gmeversion)/gme/Hes_Emu.cpp \
-	$(gmeversion)/gme/Kss_Core.cpp $(gmeversion)/gme/Kss_Cpu.cpp \
-	$(gmeversion)/gme/Kss_Emu.cpp \
-	$(gmeversion)/gme/Kss_Scc_Apu.cpp \
-	$(gmeversion)/gme/M3u_Playlist.cpp \
-	$(gmeversion)/gme/Multi_Buffer.cpp \
-	$(gmeversion)/gme/Music_Emu.cpp $(gmeversion)/gme/Nes_Apu.cpp \
-	$(gmeversion)/gme/Nes_Cpu.cpp \
-	$(gmeversion)/gme/Nes_Fds_Apu.cpp \
-	$(gmeversion)/gme/Nes_Fme7_Apu.cpp \
-	$(gmeversion)/gme/Nes_Namco_Apu.cpp \
-	$(gmeversion)/gme/Nes_Oscs.cpp \
-	$(gmeversion)/gme/Nes_Vrc6_Apu.cpp \
-	$(gmeversion)/gme/Nes_Vrc7_Apu.cpp \
-	$(gmeversion)/gme/Nsf_Core.cpp $(gmeversion)/gme/Nsf_Cpu.cpp \
-	$(gmeversion)/gme/Nsfe_Emu.cpp $(gmeversion)/gme/Nsf_Emu.cpp \
-	$(gmeversion)/gme/Nsf_Impl.cpp $(gmeversion)/gme/Opl_Apu.cpp \
-	$(gmeversion)/gme/Resampler.cpp $(gmeversion)/gme/Rom_Data.cpp \
-	$(gmeversion)/gme/Sap_Apu.cpp $(gmeversion)/gme/Sap_Core.cpp \
-	$(gmeversion)/gme/Sap_Cpu.cpp $(gmeversion)/gme/Sap_Emu.cpp \
-	$(gmeversion)/gme/Sgc_Core.cpp $(gmeversion)/gme/Sgc_Cpu.cpp \
-	$(gmeversion)/gme/Sgc_Emu.cpp $(gmeversion)/gme/Sgc_Impl.cpp \
-	$(gmeversion)/gme/Sms_Apu.cpp $(gmeversion)/gme/Sms_Fm_Apu.cpp \
-	$(gmeversion)/gme/Snes_Spc.cpp $(gmeversion)/gme/Spc_Cpu.cpp \
-	$(gmeversion)/gme/Spc_Dsp.cpp $(gmeversion)/gme/Spc_Emu.cpp \
-	$(gmeversion)/gme/SPC_Filter.cpp \
-	$(gmeversion)/gme/Track_Filter.cpp \
-	$(gmeversion)/gme/Upsampler.cpp $(gmeversion)/gme/Vgm_Core.cpp \
-	$(gmeversion)/gme/Vgm_Emu.cpp $(gmeversion)/gme/Ym2413_Emu.cpp \
-	$(gmeversion)/gme/Ym2612_Emu.cpp \
-	$(gmeversion)/gme/ymdeltat.cpp $(gmeversion)/gme/Z80_Cpu.cpp \
-	$(gmeversion)/gme/Data_Reader.cpp $(gmeversion)/gme/s_deltat.c \
-	$(gmeversion)/gme/s_logtbl.c $(gmeversion)/gme/s_opl.c \
-	$(gmeversion)/gme/s_opltbl.c $(gmeversion)/gme/ym2413.c \
-	$(gmeversion)/gme/Ay_Apu.h $(gmeversion)/gme/Ay_Core.h \
-	$(gmeversion)/gme/Ay_Emu.h $(gmeversion)/gme/blargg_common.h \
-	$(gmeversion)/gme/blargg_config.h \
-	$(gmeversion)/gme/blargg_endian.h \
-	$(gmeversion)/gme/blargg_errors.h \
-	$(gmeversion)/gme/blargg_source.h \
-	$(gmeversion)/gme/Blip_Buffer.h \
-	$(gmeversion)/gme/Blip_Buffer_impl2.h \
-	$(gmeversion)/gme/Blip_Buffer_impl.h \
-	$(gmeversion)/gme/Classic_Emu.h $(gmeversion)/gme/divfix.h \
-	$(gmeversion)/gme/Data_Reader.h \
-	$(gmeversion)/gme/Downsampler.h \
-	$(gmeversion)/gme/Dual_Resampler.h \
-	$(gmeversion)/gme/Effects_Buffer.h $(gmeversion)/gme/emu2413.h \
-	$(gmeversion)/gme/Fir_Resampler.h $(gmeversion)/gme/fmopl.h \
-	$(gmeversion)/gme/Gb_Apu.h $(gmeversion)/gme/Gb_Cpu.h \
-	$(gmeversion)/gme/Gb_Cpu_run.h $(gmeversion)/gme/Gb_Oscs.h \
-	$(gmeversion)/gme/Gbs_Core.h $(gmeversion)/gme/Gbs_Emu.h \
-	$(gmeversion)/gme/Gme_File.h $(gmeversion)/gme/gme.h \
-	$(gmeversion)/gme/Gme_Loader.h $(gmeversion)/gme/Gym_Emu.h \
-	$(gmeversion)/gme/Hes_Apu_Adpcm.h $(gmeversion)/gme/Hes_Apu.h \
-	$(gmeversion)/gme/Hes_Core.h $(gmeversion)/gme/Hes_Cpu.h \
-	$(gmeversion)/gme/Hes_Cpu_run.h $(gmeversion)/gme/Hes_Emu.h \
-	$(gmeversion)/gme/i_fmpac.h $(gmeversion)/gme/i_fmunit.h \
-	$(gmeversion)/gme/i_vrc7.h $(gmeversion)/gme/kmsnddev.h \
-	$(gmeversion)/gme/Kss_Core.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_run.h \
-	$(gmeversion)/gme/Nes_Fds_Apu.h \
-	$(gmeversion)/gme/Nes_Fme7_Apu.h \
-	$(gmeversion)/gme/Nes_Mmc5_Apu.h \
-	$(gmeversion)/gme/Nes_Namco_Apu.h $(gmeversion)/gme/Nes_Oscs.h \
-	$(gmeversion)/gme/nestypes.h $(gmeversion)/gme/Nes_Vrc6_Apu.h \
-	$(gmeversion)/gme/Nes_Vrc7_Apu.h $(gmeversion)/gme/Nsf_Core.h \
-	$(gmeversion)/gme/Nsfe_Emu.h $(gmeversion)/gme/Nsf_Emu.h \
-	$(gmeversion)/gme/Nsf_Impl.h $(gmeversion)/gme/Opl_Apu.h \
-	$(gmeversion)/gme/Resampler.h $(gmeversion)/gme/Rom_Data.h \
-	$(gmeversion)/gme/Sap_Apu.h $(gmeversion)/gme/Sap_Core.h \
-	$(gmeversion)/gme/Sap_Emu.h $(gmeversion)/gme/s_deltat.h \
-	$(gmeversion)/gme/Sgc_Core.h $(gmeversion)/gme/Sgc_Emu.h \
-	$(gmeversion)/gme/Sgc_Impl.h $(gmeversion)/gme/s_logtbl.h \
-	$(gmeversion)/gme/Sms_Apu.h $(gmeversion)/gme/Sms_Fm_Apu.h \
-	$(gmeversion)/gme/Snes_Spc.h $(gmeversion)/gme/s_opl.h \
-	$(gmeversion)/gme/s_opltbl.h $(gmeversion)/gme/Spc_Cpu.h \
-	$(gmeversion)/gme/Spc_Dsp.h $(gmeversion)/gme/Spc_Emu.h \
-	$(gmeversion)/gme/Spc_Filter.h \
-	$(gmeversion)/gme/Track_Filter.h $(gmeversion)/gme/Upsampler.h \
-	$(gmeversion)/gme/Vgm_Core.h $(gmeversion)/gme/Vgm_Emu.h \
-	$(gmeversion)/gme/Ym2413_Emu.h $(gmeversion)/gme/ym2413.h \
-	$(gmeversion)/gme/Ym2612_Emu.h $(gmeversion)/gme/ymdeltat.h \
-	$(gmeversion)/gme/Z80_Cpu.h $(gmeversion)/gme/Z80_Cpu_run.h
-@HAVE_GME_TRUE@am_gme_la_OBJECTS = cgme.lo Ay_Apu.lo Ay_Core.lo \
-@HAVE_GME_TRUE@	Ay_Cpu.lo Ay_Emu.lo blargg_common.lo \
-@HAVE_GME_TRUE@	blargg_errors.lo Blip_Buffer.lo Classic_Emu.lo \
-@HAVE_GME_TRUE@	Downsampler.lo Dual_Resampler.lo \
-@HAVE_GME_TRUE@	Effects_Buffer.lo emu2413.lo Fir_Resampler.lo \
-@HAVE_GME_TRUE@	fmopl.lo Gb_Apu.lo Gb_Cpu.lo Gb_Oscs.lo \
-@HAVE_GME_TRUE@	Gbs_Core.lo Gbs_Cpu.lo Gbs_Emu.lo gme.lo \
-@HAVE_GME_TRUE@	Gme_File.lo Gme_Loader.lo Gym_Emu.lo \
-@HAVE_GME_TRUE@	Hes_Apu_Adpcm.lo Hes_Apu.lo Hes_Core.lo \
-@HAVE_GME_TRUE@	Hes_Cpu.lo Hes_Emu.lo Kss_Core.lo Kss_Cpu.lo \
-@HAVE_GME_TRUE@	Kss_Emu.lo Kss_Scc_Apu.lo M3u_Playlist.lo \
-@HAVE_GME_TRUE@	Multi_Buffer.lo Music_Emu.lo Nes_Apu.lo \
-@HAVE_GME_TRUE@	Nes_Cpu.lo Nes_Fds_Apu.lo Nes_Fme7_Apu.lo \
-@HAVE_GME_TRUE@	Nes_Namco_Apu.lo Nes_Oscs.lo Nes_Vrc6_Apu.lo \
-@HAVE_GME_TRUE@	Nes_Vrc7_Apu.lo Nsf_Core.lo Nsf_Cpu.lo \
-@HAVE_GME_TRUE@	Nsfe_Emu.lo Nsf_Emu.lo Nsf_Impl.lo Opl_Apu.lo \
-@HAVE_GME_TRUE@	Resampler.lo Rom_Data.lo Sap_Apu.lo Sap_Core.lo \
-@HAVE_GME_TRUE@	Sap_Cpu.lo Sap_Emu.lo Sgc_Core.lo Sgc_Cpu.lo \
-@HAVE_GME_TRUE@	Sgc_Emu.lo Sgc_Impl.lo Sms_Apu.lo Sms_Fm_Apu.lo \
-@HAVE_GME_TRUE@	Snes_Spc.lo Spc_Cpu.lo Spc_Dsp.lo Spc_Emu.lo \
-@HAVE_GME_TRUE@	SPC_Filter.lo Track_Filter.lo Upsampler.lo \
-@HAVE_GME_TRUE@	Vgm_Core.lo Vgm_Emu.lo Ym2413_Emu.lo \
-@HAVE_GME_TRUE@	Ym2612_Emu.lo ymdeltat.lo Z80_Cpu.lo \
-@HAVE_GME_TRUE@	Data_Reader.lo s_deltat.lo s_logtbl.lo s_opl.lo \
-@HAVE_GME_TRUE@	s_opltbl.lo ym2413.lo
+am__gme_la_SOURCES_DIST = cgme.c gmewrap.cpp gmewrap.h \
+	game-music-emu-0.6pre/gme/Ay_Apu.cpp \
+	game-music-emu-0.6pre/gme/Ay_Core.cpp \
+	game-music-emu-0.6pre/gme/Ay_Cpu.cpp \
+	game-music-emu-0.6pre/gme/Ay_Emu.cpp \
+	game-music-emu-0.6pre/gme/Blip_Buffer.cpp \
+	game-music-emu-0.6pre/gme/Bml_Parser.cpp \
+	game-music-emu-0.6pre/gme/Classic_Emu.cpp \
+	game-music-emu-0.6pre/gme/Data_Reader.cpp \
+	game-music-emu-0.6pre/gme/Downsampler.cpp \
+	game-music-emu-0.6pre/gme/Dual_Resampler.cpp \
+	game-music-emu-0.6pre/gme/Effects_Buffer.cpp \
+	game-music-emu-0.6pre/gme/Fir_Resampler.cpp \
+	game-music-emu-0.6pre/gme/Gb_Apu.cpp \
+	game-music-emu-0.6pre/gme/Gb_Cpu.cpp \
+	game-music-emu-0.6pre/gme/Gb_Oscs.cpp \
+	game-music-emu-0.6pre/gme/Gbs_Core.cpp \
+	game-music-emu-0.6pre/gme/Gbs_Cpu.cpp \
+	game-music-emu-0.6pre/gme/Gbs_Emu.cpp \
+	game-music-emu-0.6pre/gme/Gme_File.cpp \
+	game-music-emu-0.6pre/gme/Gme_Loader.cpp \
+	game-music-emu-0.6pre/gme/Gym_Emu.cpp \
+	game-music-emu-0.6pre/gme/Hes_Apu.cpp \
+	game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.cpp \
+	game-music-emu-0.6pre/gme/Hes_Core.cpp \
+	game-music-emu-0.6pre/gme/Hes_Cpu.cpp \
+	game-music-emu-0.6pre/gme/Hes_Emu.cpp \
+	game-music-emu-0.6pre/gme/Kss_Core.cpp \
+	game-music-emu-0.6pre/gme/Kss_Cpu.cpp \
+	game-music-emu-0.6pre/gme/Kss_Emu.cpp \
+	game-music-emu-0.6pre/gme/Kss_Scc_Apu.cpp \
+	game-music-emu-0.6pre/gme/M3u_Playlist.cpp \
+	game-music-emu-0.6pre/gme/Multi_Buffer.cpp \
+	game-music-emu-0.6pre/gme/Music_Emu.cpp \
+	game-music-emu-0.6pre/gme/Nes_Apu.cpp \
+	game-music-emu-0.6pre/gme/Nes_Cpu.cpp \
+	game-music-emu-0.6pre/gme/Nes_Fds_Apu.cpp \
+	game-music-emu-0.6pre/gme/Nes_Fme7_Apu.cpp \
+	game-music-emu-0.6pre/gme/Nes_Namco_Apu.cpp \
+	game-music-emu-0.6pre/gme/Nes_Oscs.cpp \
+	game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.cpp \
+	game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.cpp \
+	game-music-emu-0.6pre/gme/Nsf_Core.cpp \
+	game-music-emu-0.6pre/gme/Nsf_Cpu.cpp \
+	game-music-emu-0.6pre/gme/Nsf_Emu.cpp \
+	game-music-emu-0.6pre/gme/Nsf_Impl.cpp \
+	game-music-emu-0.6pre/gme/Nsfe_Emu.cpp \
+	game-music-emu-0.6pre/gme/Opl_Apu.cpp \
+	game-music-emu-0.6pre/gme/Resampler.cpp \
+	game-music-emu-0.6pre/gme/Rom_Data.cpp \
+	game-music-emu-0.6pre/gme/SPC_Filter.cpp \
+	game-music-emu-0.6pre/gme/Sap_Apu.cpp \
+	game-music-emu-0.6pre/gme/Sap_Core.cpp \
+	game-music-emu-0.6pre/gme/Sap_Cpu.cpp \
+	game-music-emu-0.6pre/gme/Sap_Emu.cpp \
+	game-music-emu-0.6pre/gme/Sgc_Core.cpp \
+	game-music-emu-0.6pre/gme/Sgc_Cpu.cpp \
+	game-music-emu-0.6pre/gme/Sgc_Emu.cpp \
+	game-music-emu-0.6pre/gme/Sgc_Impl.cpp \
+	game-music-emu-0.6pre/gme/Sms_Apu.cpp \
+	game-music-emu-0.6pre/gme/Sms_Fm_Apu.cpp \
+	game-music-emu-0.6pre/gme/Spc_Emu.cpp \
+	game-music-emu-0.6pre/gme/Spc_Sfm.cpp \
+	game-music-emu-0.6pre/gme/Track_Filter.cpp \
+	game-music-emu-0.6pre/gme/Upsampler.cpp \
+	game-music-emu-0.6pre/gme/Vgm_Core.cpp \
+	game-music-emu-0.6pre/gme/Vgm_Emu.cpp \
+	game-music-emu-0.6pre/gme/Ym2413_Emu.cpp \
+	game-music-emu-0.6pre/gme/Ym2612_Emu.cpp \
+	game-music-emu-0.6pre/gme/Ym2612_Emu_Gens.cpp \
+	game-music-emu-0.6pre/gme/Ym2612_Emu_MAME.cpp \
+	game-music-emu-0.6pre/gme/Z80_Cpu.cpp \
+	game-music-emu-0.6pre/gme/blargg_common.cpp \
+	game-music-emu-0.6pre/gme/blargg_errors.cpp \
+	game-music-emu-0.6pre/gme/gme.cpp \
+	game-music-emu-0.6pre/gme/higan/dsp/dsp.cpp \
+	game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.cpp \
+	game-music-emu-0.6pre/gme/higan/processor/spc700/algorithms.cpp \
+	game-music-emu-0.6pre/gme/higan/processor/spc700/instructions.cpp \
+	game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.cpp \
+	game-music-emu-0.6pre/gme/higan/smp/smp.cpp \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl2.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl3.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm2612.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.c \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.c \
+	game-music-emu-0.6pre/gme/Ay_Apu.h \
+	game-music-emu-0.6pre/gme/Ay_Core.h \
+	game-music-emu-0.6pre/gme/Ay_Emu.h \
+	game-music-emu-0.6pre/gme/Blip_Buffer.h \
+	game-music-emu-0.6pre/gme/Blip_Buffer_impl.h \
+	game-music-emu-0.6pre/gme/Blip_Buffer_impl2.h \
+	game-music-emu-0.6pre/gme/Bml_Parser.h \
+	game-music-emu-0.6pre/gme/Classic_Emu.h \
+	game-music-emu-0.6pre/gme/Data_Reader.h \
+	game-music-emu-0.6pre/gme/Downsampler.h \
+	game-music-emu-0.6pre/gme/Dual_Resampler.h \
+	game-music-emu-0.6pre/gme/Effects_Buffer.h \
+	game-music-emu-0.6pre/gme/Fir_Resampler.h \
+	game-music-emu-0.6pre/gme/Gb_Apu.h \
+	game-music-emu-0.6pre/gme/Gb_Cpu.h \
+	game-music-emu-0.6pre/gme/Gb_Cpu_run.h \
+	game-music-emu-0.6pre/gme/Gb_Oscs.h \
+	game-music-emu-0.6pre/gme/Gbs_Core.h \
+	game-music-emu-0.6pre/gme/Gbs_Emu.h \
+	game-music-emu-0.6pre/gme/Gme_File.h \
+	game-music-emu-0.6pre/gme/Gme_Loader.h \
+	game-music-emu-0.6pre/gme/Gym_Emu.h \
+	game-music-emu-0.6pre/gme/Hes_Apu.h \
+	game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.h \
+	game-music-emu-0.6pre/gme/Hes_Core.h \
+	game-music-emu-0.6pre/gme/Hes_Cpu.h \
+	game-music-emu-0.6pre/gme/Hes_Cpu_run.h \
+	game-music-emu-0.6pre/gme/Hes_Emu.h \
+	game-music-emu-0.6pre/gme/Kss_Core.h \
+	game-music-emu-0.6pre/gme/Kss_Emu.h \
+	game-music-emu-0.6pre/gme/Kss_Scc_Apu.h \
+	game-music-emu-0.6pre/gme/M3u_Playlist.h \
+	game-music-emu-0.6pre/gme/Multi_Buffer.h \
+	game-music-emu-0.6pre/gme/Music_Emu.h \
+	game-music-emu-0.6pre/gme/Nes_Apu.h \
+	game-music-emu-0.6pre/gme/Nes_Cpu.h \
+	game-music-emu-0.6pre/gme/Nes_Cpu_run.h \
+	game-music-emu-0.6pre/gme/Nes_Fds_Apu.h \
+	game-music-emu-0.6pre/gme/Nes_Fme7_Apu.h \
+	game-music-emu-0.6pre/gme/Nes_Mmc5_Apu.h \
+	game-music-emu-0.6pre/gme/Nes_Namco_Apu.h \
+	game-music-emu-0.6pre/gme/Nes_Oscs.h \
+	game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.h \
+	game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.h \
+	game-music-emu-0.6pre/gme/Nsf_Core.h \
+	game-music-emu-0.6pre/gme/Nsf_Emu.h \
+	game-music-emu-0.6pre/gme/Nsf_Impl.h \
+	game-music-emu-0.6pre/gme/Nsfe_Emu.h \
+	game-music-emu-0.6pre/gme/Opl_Apu.h \
+	game-music-emu-0.6pre/gme/Resampler.h \
+	game-music-emu-0.6pre/gme/Rom_Data.h \
+	game-music-emu-0.6pre/gme/Sap_Apu.h \
+	game-music-emu-0.6pre/gme/Sap_Core.h \
+	game-music-emu-0.6pre/gme/Sap_Emu.h \
+	game-music-emu-0.6pre/gme/Sgc_Core.h \
+	game-music-emu-0.6pre/gme/Sgc_Emu.h \
+	game-music-emu-0.6pre/gme/Sgc_Impl.h \
+	game-music-emu-0.6pre/gme/Sms_Apu.h \
+	game-music-emu-0.6pre/gme/Sms_Fm_Apu.h \
+	game-music-emu-0.6pre/gme/Spc_Emu.h \
+	game-music-emu-0.6pre/gme/Spc_Filter.h \
+	game-music-emu-0.6pre/gme/Spc_Sfm.h \
+	game-music-emu-0.6pre/gme/Track_Filter.h \
+	game-music-emu-0.6pre/gme/Upsampler.h \
+	game-music-emu-0.6pre/gme/Vgm_Core.h \
+	game-music-emu-0.6pre/gme/Vgm_Emu.h \
+	game-music-emu-0.6pre/gme/Ym2413_Emu.h \
+	game-music-emu-0.6pre/gme/Ym2612_Emu.h \
+	game-music-emu-0.6pre/gme/Z80_Cpu.h \
+	game-music-emu-0.6pre/gme/Z80_Cpu_run.h \
+	game-music-emu-0.6pre/gme/adlib.h \
+	game-music-emu-0.6pre/gme/blargg_common.h \
+	game-music-emu-0.6pre/gme/blargg_config.h \
+	game-music-emu-0.6pre/gme/blargg_endian.h \
+	game-music-emu-0.6pre/gme/blargg_errors.h \
+	game-music-emu-0.6pre/gme/blargg_source.h \
+	game-music-emu-0.6pre/gme/gme.h \
+	game-music-emu-0.6pre/gme/gme_custom_dprintf.h \
+	game-music-emu-0.6pre/gme/higan/dsp/dsp.hpp \
+	game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.h \
+	game-music-emu-0.6pre/gme/higan/processor/spc700/memory.hpp \
+	game-music-emu-0.6pre/gme/higan/processor/spc700/registers.hpp \
+	game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.hpp \
+	game-music-emu-0.6pre/gme/higan/smp/smp.hpp \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413tone.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/281btone.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ChipIncl.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emutypes.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/mamedef.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_defs.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/opl.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vrc7tone.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_initialIo.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/stdbool.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMFile.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.h \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay_Intf.h
+am__dirstamp = $(am__leading_dot)dirstamp
+@HAVE_GME_TRUE@am_gme_la_OBJECTS = gme_la-cgme.lo gme_la-gmewrap.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Ay_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Ay_Core.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Ay_Cpu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Ay_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Blip_Buffer.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Bml_Parser.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Classic_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Data_Reader.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Downsampler.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Dual_Resampler.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Effects_Buffer.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Fir_Resampler.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Gb_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Gb_Cpu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Gb_Oscs.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Gbs_Core.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Gbs_Cpu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Gbs_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Gme_File.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Gme_Loader.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Gym_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Hes_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Hes_Apu_Adpcm.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Hes_Core.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Hes_Cpu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Hes_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Kss_Core.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Kss_Cpu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Kss_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Kss_Scc_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-M3u_Playlist.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Multi_Buffer.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Music_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nes_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nes_Cpu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nes_Fds_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nes_Fme7_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nes_Namco_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nes_Oscs.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nes_Vrc6_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nes_Vrc7_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nsf_Core.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nsf_Cpu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nsf_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nsf_Impl.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Nsfe_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Opl_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Resampler.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Rom_Data.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-SPC_Filter.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Sap_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Sap_Core.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Sap_Cpu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Sap_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Sgc_Core.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Sgc_Cpu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Sgc_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Sgc_Impl.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Sms_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Sms_Fm_Apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Spc_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Spc_Sfm.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Track_Filter.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Upsampler.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Vgm_Core.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Vgm_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Ym2413_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu_Gens.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu_MAME.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-Z80_Cpu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-blargg_common.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-blargg_errors.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_la-gme.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/dsp/gme_la-dsp.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/dsp/gme_la-SPC_DSP.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-algorithms.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-instructions.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-spc700.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/smp/gme_la-smp.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-ChipMapper.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2151intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2203intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2413intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2608intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2610intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2612intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-262intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-3526intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-3812intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-8950intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-adlibemu_opl2.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-adlibemu_opl3.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ay8910.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ay_intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c140.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c352.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c6280.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c6280intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-dac_control.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-emu2149.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-emu2413.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-es5503.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-es5506.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fm.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fm2612.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fmopl.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-gb.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-iremga20.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k051649.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k053260.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k054539.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-multipcm.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-nes_apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-nes_intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_apu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_dmc.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_fds.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-okim6258.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-okim6295.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-Ootake_PSG.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-panning.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-pokey.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-pwm.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-qsound.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-rf5c68.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-saa1099.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-scd_pcm.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-scsp.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-segapcm.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn76489.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn76496.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn764intf.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-upd7759.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-vsu.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ws_audio.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-x1_010.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2151.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2413.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2612.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymdeltat.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf262.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf271.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf278b.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymz280b.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-yam.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-resampler.lo \
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-VGMPlay.lo
 gme_la_OBJECTS = $(am_gme_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 gme_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(gme_la_CXXFLAGS) \
 	$(CXXFLAGS) $(gme_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_GME_TRUE@am_gme_la_rpath = -rpath $(pkglibdir)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -294,9 +628,8 @@
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -359,9 +692,11 @@
 done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
@@ -375,7 +710,6 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CDDA_CFLAGS = @CDDA_CFLAGS@
 CDDA_LIBS = @CDDA_LIBS@
 CFLAGS = @CFLAGS@
@@ -387,14 +721,14 @@
 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@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -416,6 +750,7 @@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -423,8 +758,6 @@
 GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
 GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
 GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
-GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
-GTK_MAC_LIBS = @GTK_MAC_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
@@ -435,8 +768,6 @@
 HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 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@
@@ -457,11 +788,10 @@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBS = @INTL_LIBS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JPEG_DEPS_CFLAGS = @JPEG_DEPS_CFLAGS@
-JPEG_DEPS_LIBS = @JPEG_DEPS_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIB = @LIB@
@@ -486,12 +816,15 @@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -501,12 +834,13 @@
 NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
 NOTIFY_LIBS = @NOTIFY_LIBS@
 OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGG_CFLAGS = @OGG_CFLAGS@
 OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -518,12 +852,12 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUGINS_DIRS = @PLUGINS_DIRS@
-PNG_DEPS_CFLAGS = @PNG_DEPS_CFLAGS@
-PNG_DEPS_LIBS = @PNG_DEPS_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PULSE_DEPS_CFLAGS = @PULSE_DEPS_CFLAGS@
@@ -538,8 +872,6 @@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
-VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
@@ -564,9 +896,7 @@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_ct_OBJC = @ac_ct_OBJC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -603,6 +933,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -611,191 +942,328 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@HAVE_GME_TRUE@gmeversion = game-music-emu-0.6pre
-@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)
+gmeversion = game-music-emu-0.6pre
+gmepath = @top_srcdir@/plugins/gme/game-music-emu-0.6pre
+EXTRA_DIST = $(gmepath)/changes.txt $(gmepath)/design.txt $(gmepath)/gme.txt $(gmepath)/license.txt $(gmepath)/readme.txt $(gmepath)/vgmplay/VGMPlay/chips/emu2413_NESpatches.txt $(gmepath)/vgmplay/VGMPlay/licenses/GPL.txt $(gmepath)/vgmplay/VGMPlay/licenses/List.txt $(gmepath)/vgmplay/VGMPlay/licenses/mame_license.txt $(gmepath)/vgmplay/VGMPlay/SourceReadme.txt $(gmepath)/vgmplay/VGMPlay/VGMPlay.txt $(gmepath)/vgmplay/VGMPlay/VGMPlay_Updates.txt $(gmepath)/vgmplay/VGMPlay/vgmspec171.txt $(gmepath)/gme/higan/smp/memory.cpp $(gmepath)/gme/higan/smp/timing.cpp $(gmepath)/vgmplay/VGMPlay/chips/opl.c $(gmepath)/vgmplay/VGMPlay/chips/emuconfig.h
 @HAVE_GME_TRUE@pkglib_LTLIBRARIES = gme.la
 
 # 0.6pre (foo_gep) files
-@HAVE_GME_TRUE@gme_la_SOURCES = cgme.c\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Core.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/blargg_common.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/blargg_errors.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Blip_Buffer.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Classic_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Downsampler.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Dual_Resampler.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Effects_Buffer.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/emu2413.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Fir_Resampler.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/fmopl.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Oscs.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gbs_Core.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gbs_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gbs_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/gme.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gme_File.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gme_Loader.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gym_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Apu_Adpcm.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Core.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Core.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Scc_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/M3u_Playlist.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Multi_Buffer.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Music_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Fds_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Fme7_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Namco_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Oscs.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Vrc6_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Vrc7_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsf_Core.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsf_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsfe_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsf_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsf_Impl.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Opl_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Resampler.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Rom_Data.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Core.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sgc_Core.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sgc_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sgc_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sgc_Impl.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sms_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sms_Fm_Apu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Snes_Spc.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Dsp.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Spc_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/SPC_Filter.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Track_Filter.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Upsampler.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Vgm_Core.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Vgm_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Ym2413_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Ym2612_Emu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/ymdeltat.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Z80_Cpu.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Data_Reader.cpp\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/s_deltat.c\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/s_logtbl.c\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/s_opl.c\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/s_opltbl.c\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/ym2413.c\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Ay_Core.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_errors.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/blargg_source.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Blip_Buffer.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Blip_Buffer_impl2.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Blip_Buffer_impl.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Classic_Emu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/divfix.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Data_Reader.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Downsampler.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Dual_Resampler.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Effects_Buffer.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/emu2413.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Fir_Resampler.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/fmopl.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Cpu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Cpu_run.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gb_Oscs.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gbs_Core.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/Gme_Loader.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Gym_Emu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Apu_Adpcm.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Core.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Cpu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Cpu_run.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Hes_Emu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/i_fmpac.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/i_fmunit.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/i_vrc7.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/kmsnddev.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Kss_Core.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_run.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Fds_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Fme7_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Mmc5_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Namco_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Oscs.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/nestypes.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Vrc6_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nes_Vrc7_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsf_Core.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsfe_Emu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsf_Emu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Nsf_Impl.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Opl_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Resampler.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Rom_Data.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Core.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sap_Emu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/s_deltat.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sgc_Core.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sgc_Emu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sgc_Impl.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/s_logtbl.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sms_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Sms_Fm_Apu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Snes_Spc.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/s_opl.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/s_opltbl.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/Spc_Filter.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Track_Filter.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Upsampler.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Vgm_Core.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Vgm_Emu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Ym2413_Emu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/ym2413.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Ym2612_Emu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/ymdeltat.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Z80_Cpu.h\
-@HAVE_GME_TRUE@	$(gmeversion)/gme/Z80_Cpu_run.h
+@HAVE_GME_TRUE@gme_la_SOURCES = cgme.c gmewrap.cpp gmewrap.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ay_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ay_Core.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ay_Cpu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ay_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Blip_Buffer.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Bml_Parser.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Classic_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Data_Reader.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Downsampler.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Dual_Resampler.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Effects_Buffer.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Fir_Resampler.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gb_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gb_Cpu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gb_Oscs.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gbs_Core.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gbs_Cpu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gbs_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gme_File.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gme_Loader.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gym_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Core.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Cpu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Kss_Core.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Kss_Cpu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Kss_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Kss_Scc_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/M3u_Playlist.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Multi_Buffer.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Music_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Cpu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Fds_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Fme7_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Namco_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Oscs.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nsf_Core.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nsf_Cpu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nsf_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nsf_Impl.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nsfe_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Opl_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Resampler.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Rom_Data.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/SPC_Filter.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sap_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sap_Core.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sap_Cpu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sap_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sgc_Core.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sgc_Cpu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sgc_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sgc_Impl.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sms_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sms_Fm_Apu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Spc_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Spc_Sfm.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Track_Filter.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Upsampler.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Vgm_Core.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Vgm_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ym2413_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ym2612_Emu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ym2612_Emu_Gens.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ym2612_Emu_MAME.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Z80_Cpu.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/blargg_common.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/blargg_errors.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/dsp/dsp.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/processor/spc700/algorithms.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/processor/spc700/instructions.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/smp/smp.cpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl2.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl3.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm2612.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.c\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ay_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ay_Core.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ay_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Blip_Buffer.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Blip_Buffer_impl.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Blip_Buffer_impl2.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Bml_Parser.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Classic_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Data_Reader.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Downsampler.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Dual_Resampler.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Effects_Buffer.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Fir_Resampler.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gb_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gb_Cpu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gb_Cpu_run.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gb_Oscs.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gbs_Core.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gbs_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gme_File.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gme_Loader.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Gym_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Core.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Cpu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Cpu_run.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Hes_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Kss_Core.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Kss_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Kss_Scc_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/M3u_Playlist.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Multi_Buffer.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Music_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Cpu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Cpu_run.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Fds_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Fme7_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Mmc5_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Namco_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Oscs.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nsf_Core.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nsf_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nsf_Impl.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Nsfe_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Opl_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Resampler.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Rom_Data.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sap_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sap_Core.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sap_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sgc_Core.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sgc_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sgc_Impl.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sms_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Sms_Fm_Apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Spc_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Spc_Filter.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Spc_Sfm.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Track_Filter.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Upsampler.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Vgm_Core.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Vgm_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ym2413_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Ym2612_Emu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Z80_Cpu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/Z80_Cpu_run.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/adlib.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/blargg_common.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/blargg_config.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/blargg_endian.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/blargg_errors.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/blargg_source.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/gme_custom_dprintf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/dsp/dsp.hpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/processor/spc700/memory.hpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/processor/spc700/registers.hpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.hpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/gme/higan/smp/smp.hpp\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413tone.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/281btone.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ChipIncl.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emutypes.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/mamedef.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_defs.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/opl.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vrc7tone.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_initialIo.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.h\
+@HAVE_GME_TRUE@ 	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/stdbool.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMFile.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.h\
+@HAVE_GME_TRUE@	game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay_Intf.h
 
 @HAVE_GME_TRUE@gme_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
 @HAVE_GME_TRUE@gme_la_LIBADD = $(ZLIB_LIBS)
-@HAVE_GME_TRUE@AM_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -I$(gmepath) -std=c99 -DGME_VERSION_055
-@HAVE_GME_TRUE@AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables
+@HAVE_GME_TRUE@gme_la_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -I$(gmepath) -std=c99 -DGME_VERSION_055 -I@top_srcdir@/include
+@HAVE_GME_TRUE@gme_la_CXXFLAGS = $(CXXFLAGS) $(ZLIB_CFLAGS) -I$(gmepath) -I$(gmepath)/gme -DGME_VERSION_055 -fno-exceptions -fno-rtti -fno-unwind-tables -I@top_srcdir@/include
 all: all-am
 
 .SUFFIXES:
@@ -809,10 +1277,9 @@
 	 exit 1;; \
 	 esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/gme/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps plugins/gme/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu plugins/gme/Makefile
-.PRECIOUS: Makefile
+	 $(AUTOMAKE) --gnu --ignore-deps plugins/gme/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	 *config.status*) \
@@ -865,713 +1332,818 @@
 	 echo rm -f $${locs}; \
 	 rm -f $${locs}; \
 	}
+game-music-emu-0.6pre/gme/$(am__dirstamp):
+	@$(MKDIR_P) game-music-emu-0.6pre/gme
+	@: > game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Ay_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Ay_Core.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Ay_Cpu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Ay_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Blip_Buffer.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Bml_Parser.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Classic_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Data_Reader.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Downsampler.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Dual_Resampler.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Effects_Buffer.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Fir_Resampler.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Gb_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Gb_Cpu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Gb_Oscs.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Gbs_Core.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Gbs_Cpu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Gbs_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Gme_File.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Gme_Loader.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Gym_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Hes_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Hes_Apu_Adpcm.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Hes_Core.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Hes_Cpu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Hes_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Kss_Core.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Kss_Cpu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Kss_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Kss_Scc_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-M3u_Playlist.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Multi_Buffer.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Music_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nes_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nes_Cpu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nes_Fds_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nes_Fme7_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nes_Namco_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nes_Oscs.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nes_Vrc6_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nes_Vrc7_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nsf_Core.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nsf_Cpu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nsf_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nsf_Impl.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Nsfe_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Opl_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Resampler.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Rom_Data.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-SPC_Filter.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Sap_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Sap_Core.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Sap_Cpu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Sap_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Sgc_Core.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Sgc_Cpu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Sgc_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Sgc_Impl.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Sms_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Sms_Fm_Apu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Spc_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Spc_Sfm.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Track_Filter.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Upsampler.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Vgm_Core.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Vgm_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Ym2413_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu_Gens.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu_MAME.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-Z80_Cpu.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-blargg_common.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-blargg_errors.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/gme_la-gme.lo: \
+	game-music-emu-0.6pre/gme/$(am__dirstamp)
+game-music-emu-0.6pre/gme/higan/dsp/$(am__dirstamp):
+	@$(MKDIR_P) game-music-emu-0.6pre/gme/higan/dsp
+	@: > game-music-emu-0.6pre/gme/higan/dsp/$(am__dirstamp)
+game-music-emu-0.6pre/gme/higan/dsp/gme_la-dsp.lo: \
+	game-music-emu-0.6pre/gme/higan/dsp/$(am__dirstamp)
+game-music-emu-0.6pre/gme/higan/dsp/gme_la-SPC_DSP.lo: \
+	game-music-emu-0.6pre/gme/higan/dsp/$(am__dirstamp)
+game-music-emu-0.6pre/gme/higan/processor/spc700/$(am__dirstamp):
+	@$(MKDIR_P) game-music-emu-0.6pre/gme/higan/processor/spc700
+	@: > game-music-emu-0.6pre/gme/higan/processor/spc700/$(am__dirstamp)
+game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-algorithms.lo: game-music-emu-0.6pre/gme/higan/processor/spc700/$(am__dirstamp)
+game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-instructions.lo: game-music-emu-0.6pre/gme/higan/processor/spc700/$(am__dirstamp)
+game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-spc700.lo: game-music-emu-0.6pre/gme/higan/processor/spc700/$(am__dirstamp)
+game-music-emu-0.6pre/gme/higan/smp/$(am__dirstamp):
+	@$(MKDIR_P) game-music-emu-0.6pre/gme/higan/smp
+	@: > game-music-emu-0.6pre/gme/higan/smp/$(am__dirstamp)
+game-music-emu-0.6pre/gme/higan/smp/gme_la-smp.lo: \
+	game-music-emu-0.6pre/gme/higan/smp/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/$(am__dirstamp):
+	@$(MKDIR_P) game-music-emu-0.6pre/vgmplay/VGMPlay
+	@: > game-music-emu-0.6pre/vgmplay/VGMPlay/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-ChipMapper.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp):
+	@$(MKDIR_P) game-music-emu-0.6pre/vgmplay/VGMPlay/chips
+	@: > game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2151intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2203intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2413intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2608intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2610intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2612intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-262intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-3526intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-3812intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-8950intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-adlibemu_opl2.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-adlibemu_opl3.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ay8910.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ay_intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c140.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c352.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c6280.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c6280intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-dac_control.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-emu2149.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-emu2413.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-es5503.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-es5506.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fm.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fm2612.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fmopl.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-gb.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-iremga20.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k051649.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k053260.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k054539.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-multipcm.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-nes_apu.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-nes_intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_apu.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_dmc.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_fds.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-okim6258.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-okim6295.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-Ootake_PSG.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-panning.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-pokey.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-pwm.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-qsound.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-rf5c68.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-saa1099.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-scd_pcm.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-scsp.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-segapcm.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn76489.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn76496.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn764intf.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-upd7759.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-vsu.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ws_audio.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-x1_010.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2151.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2413.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2612.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymdeltat.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf262.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf271.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf278b.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymz280b.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-yam.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-resampler.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/$(am__dirstamp)
+game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-VGMPlay.lo: \
+	game-music-emu-0.6pre/vgmplay/VGMPlay/$(am__dirstamp)
 
 gme.la: $(gme_la_OBJECTS) $(gme_la_DEPENDENCIES) $(EXTRA_gme_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(gme_la_LINK) $(am_gme_la_rpath) $(gme_la_OBJECTS) $(gme_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f game-music-emu-0.6pre/gme/*.$(OBJEXT)
+	-rm -f game-music-emu-0.6pre/gme/*.lo
+	-rm -f game-music-emu-0.6pre/gme/higan/dsp/*.$(OBJEXT)
+	-rm -f game-music-emu-0.6pre/gme/higan/dsp/*.lo
+	-rm -f game-music-emu-0.6pre/gme/higan/processor/spc700/*.$(OBJEXT)
+	-rm -f game-music-emu-0.6pre/gme/higan/processor/spc700/*.lo
+	-rm -f game-music-emu-0.6pre/gme/higan/smp/*.$(OBJEXT)
+	-rm -f game-music-emu-0.6pre/gme/higan/smp/*.lo
+	-rm -f game-music-emu-0.6pre/vgmplay/VGMPlay/*.$(OBJEXT)
+	-rm -f game-music-emu-0.6pre/vgmplay/VGMPlay/*.lo
+	-rm -f game-music-emu-0.6pre/vgmplay/VGMPlay/chips/*.$(OBJEXT)
+	-rm -f game-music-emu-0.6pre/vgmplay/VGMPlay/chips/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ay_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ay_Core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ay_Cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ay_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Blip_Buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Classic_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Data_Reader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Downsampler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Dual_Resampler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Effects_Buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Fir_Resampler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gb_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gb_Cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gb_Oscs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gbs_Core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gbs_Cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gbs_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gme_File.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gme_Loader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Gym_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Hes_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Hes_Apu_Adpcm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Hes_Core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Hes_Cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Hes_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Kss_Core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Kss_Cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Kss_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Kss_Scc_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/M3u_Playlist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Multi_Buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Music_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nes_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nes_Cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nes_Fds_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nes_Fme7_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nes_Namco_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nes_Oscs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nes_Vrc6_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nes_Vrc7_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nsf_Core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nsf_Cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nsf_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nsf_Impl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Nsfe_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Opl_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Resampler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Rom_Data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SPC_Filter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sap_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sap_Core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sap_Cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sap_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sgc_Core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sgc_Cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sgc_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sgc_Impl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sms_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sms_Fm_Apu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Snes_Spc.Plo@am__quote@
-@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)/Track_Filter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Upsampler.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Vgm_Core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Vgm_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ym2413_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Ym2612_Emu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Z80_Cpu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blargg_common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blargg_errors.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cgme.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emu2413.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmopl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gme.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_deltat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_logtbl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_opl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/s_opltbl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ym2413.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ymdeltat.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
 
 .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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-s_deltat.lo: $(gmeversion)/gme/s_deltat.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 s_deltat.lo -MD -MP -MF $(DEPDIR)/s_deltat.Tpo -c -o s_deltat.lo `test -f '$(gmeversion)/gme/s_deltat.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_deltat.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/s_deltat.Tpo $(DEPDIR)/s_deltat.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(gmeversion)/gme/s_deltat.c' object='s_deltat.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_deltat.lo `test -f '$(gmeversion)/gme/s_deltat.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_deltat.c
-
-s_logtbl.lo: $(gmeversion)/gme/s_logtbl.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 s_logtbl.lo -MD -MP -MF $(DEPDIR)/s_logtbl.Tpo -c -o s_logtbl.lo `test -f '$(gmeversion)/gme/s_logtbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_logtbl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/s_logtbl.Tpo $(DEPDIR)/s_logtbl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(gmeversion)/gme/s_logtbl.c' object='s_logtbl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_logtbl.lo `test -f '$(gmeversion)/gme/s_logtbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_logtbl.c
-
-s_opl.lo: $(gmeversion)/gme/s_opl.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 s_opl.lo -MD -MP -MF $(DEPDIR)/s_opl.Tpo -c -o s_opl.lo `test -f '$(gmeversion)/gme/s_opl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/s_opl.Tpo $(DEPDIR)/s_opl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(gmeversion)/gme/s_opl.c' object='s_opl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_opl.lo `test -f '$(gmeversion)/gme/s_opl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opl.c
-
-s_opltbl.lo: $(gmeversion)/gme/s_opltbl.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 s_opltbl.lo -MD -MP -MF $(DEPDIR)/s_opltbl.Tpo -c -o s_opltbl.lo `test -f '$(gmeversion)/gme/s_opltbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opltbl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/s_opltbl.Tpo $(DEPDIR)/s_opltbl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(gmeversion)/gme/s_opltbl.c' object='s_opltbl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o s_opltbl.lo `test -f '$(gmeversion)/gme/s_opltbl.c' || echo '$(srcdir)/'`$(gmeversion)/gme/s_opltbl.c
-
-ym2413.lo: $(gmeversion)/gme/ym2413.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 ym2413.lo -MD -MP -MF $(DEPDIR)/ym2413.Tpo -c -o ym2413.lo `test -f '$(gmeversion)/gme/ym2413.c' || echo '$(srcdir)/'`$(gmeversion)/gme/ym2413.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ym2413.Tpo $(DEPDIR)/ym2413.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(gmeversion)/gme/ym2413.c' object='ym2413.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ym2413.lo `test -f '$(gmeversion)/gme/ym2413.c' || echo '$(srcdir)/'`$(gmeversion)/gme/ym2413.c
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+gme_la-cgme.lo: cgme.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o gme_la-cgme.lo `test -f 'cgme.c' || echo '$(srcdir)/'`cgme.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-ChipMapper.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-ChipMapper.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2151intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2151intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2203intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2203intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2413intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2413intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2608intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2608intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2610intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2610intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2612intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-2612intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-262intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-262intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-3526intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-3526intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-3812intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-3812intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-8950intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-8950intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-adlibemu_opl2.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl2.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-adlibemu_opl2.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl2.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl2.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-adlibemu_opl3.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl3.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-adlibemu_opl3.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl3.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl3.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ay8910.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ay8910.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ay_intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ay_intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c140.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c140.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c352.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c352.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c6280.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c6280.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c6280intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-c6280intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-dac_control.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-dac_control.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-emu2149.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-emu2149.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-emu2413.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-emu2413.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-es5503.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-es5503.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-es5506.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-es5506.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fm.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fm.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fm2612.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm2612.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fm2612.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm2612.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm2612.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fmopl.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-fmopl.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-gb.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-gb.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-iremga20.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-iremga20.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k051649.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k051649.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k053260.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k053260.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k054539.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-k054539.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-multipcm.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-multipcm.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-nes_apu.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-nes_apu.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-nes_intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-nes_intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_apu.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_apu.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_dmc.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_dmc.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_fds.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-np_nes_fds.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-okim6258.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-okim6258.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-okim6295.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-okim6295.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-Ootake_PSG.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-Ootake_PSG.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-panning.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-panning.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-pokey.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-pokey.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-pwm.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-pwm.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-qsound.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-qsound.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-rf5c68.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-rf5c68.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-saa1099.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-saa1099.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-scd_pcm.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-scd_pcm.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-scsp.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-scsp.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-segapcm.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-segapcm.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn76489.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn76489.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn76496.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn76496.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn764intf.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-sn764intf.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-upd7759.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-upd7759.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-vsu.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-vsu.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ws_audio.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ws_audio.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-x1_010.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-x1_010.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2151.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2151.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2413.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2413.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2612.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ym2612.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymdeltat.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymdeltat.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf262.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf262.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf271.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf271.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf278b.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymf278b.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymz280b.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-ymz280b.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-yam.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gme_la-yam.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-resampler.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-resampler.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.c
+
+game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-VGMPlay.lo: game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CFLAGS) $(CFLAGS) -c -o game-music-emu-0.6pre/vgmplay/VGMPlay/gme_la-VGMPlay.lo `test -f 'game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.c' || echo '$(srcdir)/'`game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.c
 
 .cpp.o:
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cpp.lo:
-@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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-Ay_Core.lo: $(gmeversion)/gme/Ay_Core.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_Core.lo -MD -MP -MF $(DEPDIR)/Ay_Core.Tpo -c -o Ay_Core.lo `test -f '$(gmeversion)/gme/Ay_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Core.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Ay_Core.Tpo $(DEPDIR)/Ay_Core.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Ay_Core.cpp' object='Ay_Core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Core.lo `test -f '$(gmeversion)/gme/Ay_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Ay_Core.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-blargg_common.lo: $(gmeversion)/gme/blargg_common.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 blargg_common.lo -MD -MP -MF $(DEPDIR)/blargg_common.Tpo -c -o blargg_common.lo `test -f '$(gmeversion)/gme/blargg_common.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_common.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/blargg_common.Tpo $(DEPDIR)/blargg_common.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/blargg_common.cpp' object='blargg_common.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blargg_common.lo `test -f '$(gmeversion)/gme/blargg_common.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_common.cpp
-
-blargg_errors.lo: $(gmeversion)/gme/blargg_errors.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 blargg_errors.lo -MD -MP -MF $(DEPDIR)/blargg_errors.Tpo -c -o blargg_errors.lo `test -f '$(gmeversion)/gme/blargg_errors.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_errors.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/blargg_errors.Tpo $(DEPDIR)/blargg_errors.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/blargg_errors.cpp' object='blargg_errors.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o blargg_errors.lo `test -f '$(gmeversion)/gme/blargg_errors.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/blargg_errors.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-Downsampler.lo: $(gmeversion)/gme/Downsampler.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 Downsampler.lo -MD -MP -MF $(DEPDIR)/Downsampler.Tpo -c -o Downsampler.lo `test -f '$(gmeversion)/gme/Downsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Downsampler.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Downsampler.Tpo $(DEPDIR)/Downsampler.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Downsampler.cpp' object='Downsampler.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Downsampler.lo `test -f '$(gmeversion)/gme/Downsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Downsampler.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-emu2413.lo: $(gmeversion)/gme/emu2413.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 emu2413.lo -MD -MP -MF $(DEPDIR)/emu2413.Tpo -c -o emu2413.lo `test -f '$(gmeversion)/gme/emu2413.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/emu2413.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/emu2413.Tpo $(DEPDIR)/emu2413.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/emu2413.cpp' object='emu2413.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o emu2413.lo `test -f '$(gmeversion)/gme/emu2413.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/emu2413.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-fmopl.lo: $(gmeversion)/gme/fmopl.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 fmopl.lo -MD -MP -MF $(DEPDIR)/fmopl.Tpo -c -o fmopl.lo `test -f '$(gmeversion)/gme/fmopl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/fmopl.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/fmopl.Tpo $(DEPDIR)/fmopl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/fmopl.cpp' object='fmopl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fmopl.lo `test -f '$(gmeversion)/gme/fmopl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/fmopl.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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-Gbs_Core.lo: $(gmeversion)/gme/Gbs_Core.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_Core.lo -MD -MP -MF $(DEPDIR)/Gbs_Core.Tpo -c -o Gbs_Core.lo `test -f '$(gmeversion)/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Core.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gbs_Core.Tpo $(DEPDIR)/Gbs_Core.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gbs_Core.cpp' object='Gbs_Core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Core.lo `test -f '$(gmeversion)/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Core.cpp
-
-Gbs_Cpu.lo: $(gmeversion)/gme/Gbs_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 Gbs_Cpu.lo -MD -MP -MF $(DEPDIR)/Gbs_Cpu.Tpo -c -o Gbs_Cpu.lo `test -f '$(gmeversion)/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gbs_Cpu.Tpo $(DEPDIR)/Gbs_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gbs_Cpu.cpp' object='Gbs_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Cpu.lo `test -f '$(gmeversion)/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gbs_Cpu.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/gme.cpp' object='gme.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_Loader.lo: $(gmeversion)/gme/Gme_Loader.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_Loader.lo -MD -MP -MF $(DEPDIR)/Gme_Loader.Tpo -c -o Gme_Loader.lo `test -f '$(gmeversion)/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_Loader.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Gme_Loader.Tpo $(DEPDIR)/Gme_Loader.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Gme_Loader.cpp' object='Gme_Loader.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Loader.lo `test -f '$(gmeversion)/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Gme_Loader.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-Hes_Apu_Adpcm.lo: $(gmeversion)/gme/Hes_Apu_Adpcm.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_Adpcm.lo -MD -MP -MF $(DEPDIR)/Hes_Apu_Adpcm.Tpo -c -o Hes_Apu_Adpcm.lo `test -f '$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu_Adpcm.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Apu_Adpcm.Tpo $(DEPDIR)/Hes_Apu_Adpcm.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' object='Hes_Apu_Adpcm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Adpcm.lo `test -f '$(gmeversion)/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Apu_Adpcm.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_Core.lo: $(gmeversion)/gme/Hes_Core.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_Core.lo -MD -MP -MF $(DEPDIR)/Hes_Core.Tpo -c -o Hes_Core.lo `test -f '$(gmeversion)/gme/Hes_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Core.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Hes_Core.Tpo $(DEPDIR)/Hes_Core.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Hes_Core.cpp' object='Hes_Core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Core.lo `test -f '$(gmeversion)/gme/Hes_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Hes_Core.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-Kss_Core.lo: $(gmeversion)/gme/Kss_Core.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_Core.lo -MD -MP -MF $(DEPDIR)/Kss_Core.Tpo -c -o Kss_Core.lo `test -f '$(gmeversion)/gme/Kss_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Core.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Kss_Core.Tpo $(DEPDIR)/Kss_Core.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Kss_Core.cpp' object='Kss_Core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Core.lo `test -f '$(gmeversion)/gme/Kss_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Kss_Core.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_Fds_Apu.lo: $(gmeversion)/gme/Nes_Fds_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_Fds_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Fds_Apu.Tpo -c -o Nes_Fds_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fds_Apu.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Fds_Apu.Tpo $(DEPDIR)/Nes_Fds_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nes_Fds_Apu.cpp' object='Nes_Fds_Apu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Fds_Apu.lo `test -f '$(gmeversion)/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Fds_Apu.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_Vrc7_Apu.lo: $(gmeversion)/gme/Nes_Vrc7_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_Vrc7_Apu.lo -MD -MP -MF $(DEPDIR)/Nes_Vrc7_Apu.Tpo -c -o Nes_Vrc7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc7_Apu.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nes_Vrc7_Apu.Tpo $(DEPDIR)/Nes_Vrc7_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' object='Nes_Vrc7_Apu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Vrc7_Apu.lo `test -f '$(gmeversion)/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nes_Vrc7_Apu.cpp
-
-Nsf_Core.lo: $(gmeversion)/gme/Nsf_Core.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_Core.lo -MD -MP -MF $(DEPDIR)/Nsf_Core.Tpo -c -o Nsf_Core.lo `test -f '$(gmeversion)/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Core.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Core.Tpo $(DEPDIR)/Nsf_Core.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Core.cpp' object='Nsf_Core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Core.lo `test -f '$(gmeversion)/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Core.cpp
-
-Nsf_Cpu.lo: $(gmeversion)/gme/Nsf_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 Nsf_Cpu.lo -MD -MP -MF $(DEPDIR)/Nsf_Cpu.Tpo -c -o Nsf_Cpu.lo `test -f '$(gmeversion)/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Cpu.Tpo $(DEPDIR)/Nsf_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Cpu.cpp' object='Nsf_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Cpu.lo `test -f '$(gmeversion)/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Cpu.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_Impl.lo: $(gmeversion)/gme/Nsf_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 Nsf_Impl.lo -MD -MP -MF $(DEPDIR)/Nsf_Impl.Tpo -c -o Nsf_Impl.lo `test -f '$(gmeversion)/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Impl.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Nsf_Impl.Tpo $(DEPDIR)/Nsf_Impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Nsf_Impl.cpp' object='Nsf_Impl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Impl.lo `test -f '$(gmeversion)/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Nsf_Impl.cpp
-
-Opl_Apu.lo: $(gmeversion)/gme/Opl_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 Opl_Apu.lo -MD -MP -MF $(DEPDIR)/Opl_Apu.Tpo -c -o Opl_Apu.lo `test -f '$(gmeversion)/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Opl_Apu.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Opl_Apu.Tpo $(DEPDIR)/Opl_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Opl_Apu.cpp' object='Opl_Apu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Opl_Apu.lo `test -f '$(gmeversion)/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Opl_Apu.cpp
-
-Resampler.lo: $(gmeversion)/gme/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 Resampler.lo -MD -MP -MF $(DEPDIR)/Resampler.Tpo -c -o Resampler.lo `test -f '$(gmeversion)/gme/Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Resampler.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Resampler.Tpo $(DEPDIR)/Resampler.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Resampler.cpp' object='Resampler.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Resampler.lo `test -f '$(gmeversion)/gme/Resampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Resampler.cpp
-
-Rom_Data.lo: $(gmeversion)/gme/Rom_Data.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 Rom_Data.lo -MD -MP -MF $(DEPDIR)/Rom_Data.Tpo -c -o Rom_Data.lo `test -f '$(gmeversion)/gme/Rom_Data.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Rom_Data.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Rom_Data.Tpo $(DEPDIR)/Rom_Data.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Rom_Data.cpp' object='Rom_Data.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Rom_Data.lo `test -f '$(gmeversion)/gme/Rom_Data.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Rom_Data.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_Core.lo: $(gmeversion)/gme/Sap_Core.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_Core.lo -MD -MP -MF $(DEPDIR)/Sap_Core.Tpo -c -o Sap_Core.lo `test -f '$(gmeversion)/gme/Sap_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Core.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sap_Core.Tpo $(DEPDIR)/Sap_Core.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sap_Core.cpp' object='Sap_Core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Core.lo `test -f '$(gmeversion)/gme/Sap_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sap_Core.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-Sgc_Core.lo: $(gmeversion)/gme/Sgc_Core.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 Sgc_Core.lo -MD -MP -MF $(DEPDIR)/Sgc_Core.Tpo -c -o Sgc_Core.lo `test -f '$(gmeversion)/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Core.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Core.Tpo $(DEPDIR)/Sgc_Core.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Core.cpp' object='Sgc_Core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Core.lo `test -f '$(gmeversion)/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Core.cpp
-
-Sgc_Cpu.lo: $(gmeversion)/gme/Sgc_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 Sgc_Cpu.lo -MD -MP -MF $(DEPDIR)/Sgc_Cpu.Tpo -c -o Sgc_Cpu.lo `test -f '$(gmeversion)/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Cpu.Tpo $(DEPDIR)/Sgc_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Cpu.cpp' object='Sgc_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Cpu.lo `test -f '$(gmeversion)/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Cpu.cpp
-
-Sgc_Emu.lo: $(gmeversion)/gme/Sgc_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 Sgc_Emu.lo -MD -MP -MF $(DEPDIR)/Sgc_Emu.Tpo -c -o Sgc_Emu.lo `test -f '$(gmeversion)/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Emu.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Emu.Tpo $(DEPDIR)/Sgc_Emu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Emu.cpp' object='Sgc_Emu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Emu.lo `test -f '$(gmeversion)/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Emu.cpp
-
-Sgc_Impl.lo: $(gmeversion)/gme/Sgc_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 Sgc_Impl.lo -MD -MP -MF $(DEPDIR)/Sgc_Impl.Tpo -c -o Sgc_Impl.lo `test -f '$(gmeversion)/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Impl.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sgc_Impl.Tpo $(DEPDIR)/Sgc_Impl.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sgc_Impl.cpp' object='Sgc_Impl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sgc_Impl.lo `test -f '$(gmeversion)/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sgc_Impl.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_Fm_Apu.lo: $(gmeversion)/gme/Sms_Fm_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_Fm_Apu.lo -MD -MP -MF $(DEPDIR)/Sms_Fm_Apu.Tpo -c -o Sms_Fm_Apu.lo `test -f '$(gmeversion)/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Fm_Apu.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sms_Fm_Apu.Tpo $(DEPDIR)/Sms_Fm_Apu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Sms_Fm_Apu.cpp' object='Sms_Fm_Apu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Fm_Apu.lo `test -f '$(gmeversion)/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Sms_Fm_Apu.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-Track_Filter.lo: $(gmeversion)/gme/Track_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 Track_Filter.lo -MD -MP -MF $(DEPDIR)/Track_Filter.Tpo -c -o Track_Filter.lo `test -f '$(gmeversion)/gme/Track_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Track_Filter.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Track_Filter.Tpo $(DEPDIR)/Track_Filter.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Track_Filter.cpp' object='Track_Filter.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Track_Filter.lo `test -f '$(gmeversion)/gme/Track_Filter.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Track_Filter.cpp
-
-Upsampler.lo: $(gmeversion)/gme/Upsampler.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 Upsampler.lo -MD -MP -MF $(DEPDIR)/Upsampler.Tpo -c -o Upsampler.lo `test -f '$(gmeversion)/gme/Upsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Upsampler.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Upsampler.Tpo $(DEPDIR)/Upsampler.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Upsampler.cpp' object='Upsampler.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Upsampler.lo `test -f '$(gmeversion)/gme/Upsampler.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Upsampler.cpp
-
-Vgm_Core.lo: $(gmeversion)/gme/Vgm_Core.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_Core.lo -MD -MP -MF $(DEPDIR)/Vgm_Core.Tpo -c -o Vgm_Core.lo `test -f '$(gmeversion)/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Core.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Vgm_Core.Tpo $(DEPDIR)/Vgm_Core.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Vgm_Core.cpp' object='Vgm_Core.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(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_Core.lo `test -f '$(gmeversion)/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Vgm_Core.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
-
-ymdeltat.lo: $(gmeversion)/gme/ymdeltat.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 ymdeltat.lo -MD -MP -MF $(DEPDIR)/ymdeltat.Tpo -c -o ymdeltat.lo `test -f '$(gmeversion)/gme/ymdeltat.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/ymdeltat.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ymdeltat.Tpo $(DEPDIR)/ymdeltat.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/ymdeltat.cpp' object='ymdeltat.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ymdeltat.lo `test -f '$(gmeversion)/gme/ymdeltat.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/ymdeltat.cpp
-
-Z80_Cpu.lo: $(gmeversion)/gme/Z80_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 Z80_Cpu.lo -MD -MP -MF $(DEPDIR)/Z80_Cpu.Tpo -c -o Z80_Cpu.lo `test -f '$(gmeversion)/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Z80_Cpu.cpp
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Z80_Cpu.Tpo $(DEPDIR)/Z80_Cpu.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(gmeversion)/gme/Z80_Cpu.cpp' object='Z80_Cpu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Z80_Cpu.lo `test -f '$(gmeversion)/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`$(gmeversion)/gme/Z80_Cpu.cpp
-
-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
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)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@	$(AM_V_CXX@am__nodep@)$(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
+	$(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $<
+
+gme_la-gmewrap.lo: gmewrap.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o gme_la-gmewrap.lo `test -f 'gmewrap.cpp' || echo '$(srcdir)/'`gmewrap.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Ay_Apu.lo: game-music-emu-0.6pre/gme/Ay_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Ay_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Ay_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Ay_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Ay_Core.lo: game-music-emu-0.6pre/gme/Ay_Core.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Ay_Core.lo `test -f 'game-music-emu-0.6pre/gme/Ay_Core.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Ay_Core.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Ay_Cpu.lo: game-music-emu-0.6pre/gme/Ay_Cpu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Ay_Cpu.lo `test -f 'game-music-emu-0.6pre/gme/Ay_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Ay_Cpu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Ay_Emu.lo: game-music-emu-0.6pre/gme/Ay_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Ay_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Ay_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Ay_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Blip_Buffer.lo: game-music-emu-0.6pre/gme/Blip_Buffer.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Blip_Buffer.lo `test -f 'game-music-emu-0.6pre/gme/Blip_Buffer.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Blip_Buffer.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Bml_Parser.lo: game-music-emu-0.6pre/gme/Bml_Parser.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Bml_Parser.lo `test -f 'game-music-emu-0.6pre/gme/Bml_Parser.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Bml_Parser.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Classic_Emu.lo: game-music-emu-0.6pre/gme/Classic_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Classic_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Classic_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Classic_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Data_Reader.lo: game-music-emu-0.6pre/gme/Data_Reader.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Data_Reader.lo `test -f 'game-music-emu-0.6pre/gme/Data_Reader.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Data_Reader.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Downsampler.lo: game-music-emu-0.6pre/gme/Downsampler.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Downsampler.lo `test -f 'game-music-emu-0.6pre/gme/Downsampler.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Downsampler.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Dual_Resampler.lo: game-music-emu-0.6pre/gme/Dual_Resampler.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Dual_Resampler.lo `test -f 'game-music-emu-0.6pre/gme/Dual_Resampler.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Dual_Resampler.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Effects_Buffer.lo: game-music-emu-0.6pre/gme/Effects_Buffer.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Effects_Buffer.lo `test -f 'game-music-emu-0.6pre/gme/Effects_Buffer.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Effects_Buffer.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Fir_Resampler.lo: game-music-emu-0.6pre/gme/Fir_Resampler.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Fir_Resampler.lo `test -f 'game-music-emu-0.6pre/gme/Fir_Resampler.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Fir_Resampler.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Gb_Apu.lo: game-music-emu-0.6pre/gme/Gb_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Gb_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Gb_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Gb_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Gb_Cpu.lo: game-music-emu-0.6pre/gme/Gb_Cpu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Gb_Cpu.lo `test -f 'game-music-emu-0.6pre/gme/Gb_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Gb_Cpu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Gb_Oscs.lo: game-music-emu-0.6pre/gme/Gb_Oscs.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Gb_Oscs.lo `test -f 'game-music-emu-0.6pre/gme/Gb_Oscs.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Gb_Oscs.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Gbs_Core.lo: game-music-emu-0.6pre/gme/Gbs_Core.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Gbs_Core.lo `test -f 'game-music-emu-0.6pre/gme/Gbs_Core.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Gbs_Core.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Gbs_Cpu.lo: game-music-emu-0.6pre/gme/Gbs_Cpu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Gbs_Cpu.lo `test -f 'game-music-emu-0.6pre/gme/Gbs_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Gbs_Cpu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Gbs_Emu.lo: game-music-emu-0.6pre/gme/Gbs_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Gbs_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Gbs_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Gbs_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Gme_File.lo: game-music-emu-0.6pre/gme/Gme_File.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Gme_File.lo `test -f 'game-music-emu-0.6pre/gme/Gme_File.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Gme_File.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Gme_Loader.lo: game-music-emu-0.6pre/gme/Gme_Loader.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Gme_Loader.lo `test -f 'game-music-emu-0.6pre/gme/Gme_Loader.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Gme_Loader.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Gym_Emu.lo: game-music-emu-0.6pre/gme/Gym_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Gym_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Gym_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Gym_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Hes_Apu.lo: game-music-emu-0.6pre/gme/Hes_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Hes_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Hes_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Hes_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Hes_Apu_Adpcm.lo: game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Hes_Apu_Adpcm.lo `test -f 'game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Hes_Core.lo: game-music-emu-0.6pre/gme/Hes_Core.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Hes_Core.lo `test -f 'game-music-emu-0.6pre/gme/Hes_Core.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Hes_Core.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Hes_Cpu.lo: game-music-emu-0.6pre/gme/Hes_Cpu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Hes_Cpu.lo `test -f 'game-music-emu-0.6pre/gme/Hes_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Hes_Cpu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Hes_Emu.lo: game-music-emu-0.6pre/gme/Hes_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Hes_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Hes_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Hes_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Kss_Core.lo: game-music-emu-0.6pre/gme/Kss_Core.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Kss_Core.lo `test -f 'game-music-emu-0.6pre/gme/Kss_Core.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Kss_Core.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Kss_Cpu.lo: game-music-emu-0.6pre/gme/Kss_Cpu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Kss_Cpu.lo `test -f 'game-music-emu-0.6pre/gme/Kss_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Kss_Cpu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Kss_Emu.lo: game-music-emu-0.6pre/gme/Kss_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Kss_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Kss_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Kss_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Kss_Scc_Apu.lo: game-music-emu-0.6pre/gme/Kss_Scc_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Kss_Scc_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Kss_Scc_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Kss_Scc_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-M3u_Playlist.lo: game-music-emu-0.6pre/gme/M3u_Playlist.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-M3u_Playlist.lo `test -f 'game-music-emu-0.6pre/gme/M3u_Playlist.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/M3u_Playlist.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Multi_Buffer.lo: game-music-emu-0.6pre/gme/Multi_Buffer.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Multi_Buffer.lo `test -f 'game-music-emu-0.6pre/gme/Multi_Buffer.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Multi_Buffer.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Music_Emu.lo: game-music-emu-0.6pre/gme/Music_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Music_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Music_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Music_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nes_Apu.lo: game-music-emu-0.6pre/gme/Nes_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nes_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Nes_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nes_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nes_Cpu.lo: game-music-emu-0.6pre/gme/Nes_Cpu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nes_Cpu.lo `test -f 'game-music-emu-0.6pre/gme/Nes_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nes_Cpu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nes_Fds_Apu.lo: game-music-emu-0.6pre/gme/Nes_Fds_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nes_Fds_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Nes_Fds_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nes_Fds_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nes_Fme7_Apu.lo: game-music-emu-0.6pre/gme/Nes_Fme7_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nes_Fme7_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Nes_Fme7_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nes_Fme7_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nes_Namco_Apu.lo: game-music-emu-0.6pre/gme/Nes_Namco_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nes_Namco_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Nes_Namco_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nes_Namco_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nes_Oscs.lo: game-music-emu-0.6pre/gme/Nes_Oscs.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nes_Oscs.lo `test -f 'game-music-emu-0.6pre/gme/Nes_Oscs.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nes_Oscs.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nes_Vrc6_Apu.lo: game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nes_Vrc6_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nes_Vrc7_Apu.lo: game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nes_Vrc7_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nsf_Core.lo: game-music-emu-0.6pre/gme/Nsf_Core.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nsf_Core.lo `test -f 'game-music-emu-0.6pre/gme/Nsf_Core.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nsf_Core.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nsf_Cpu.lo: game-music-emu-0.6pre/gme/Nsf_Cpu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nsf_Cpu.lo `test -f 'game-music-emu-0.6pre/gme/Nsf_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nsf_Cpu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nsf_Emu.lo: game-music-emu-0.6pre/gme/Nsf_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nsf_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Nsf_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nsf_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nsf_Impl.lo: game-music-emu-0.6pre/gme/Nsf_Impl.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nsf_Impl.lo `test -f 'game-music-emu-0.6pre/gme/Nsf_Impl.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nsf_Impl.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Nsfe_Emu.lo: game-music-emu-0.6pre/gme/Nsfe_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Nsfe_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Nsfe_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Nsfe_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Opl_Apu.lo: game-music-emu-0.6pre/gme/Opl_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Opl_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Opl_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Opl_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Resampler.lo: game-music-emu-0.6pre/gme/Resampler.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Resampler.lo `test -f 'game-music-emu-0.6pre/gme/Resampler.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Resampler.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Rom_Data.lo: game-music-emu-0.6pre/gme/Rom_Data.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Rom_Data.lo `test -f 'game-music-emu-0.6pre/gme/Rom_Data.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Rom_Data.cpp
+
+game-music-emu-0.6pre/gme/gme_la-SPC_Filter.lo: game-music-emu-0.6pre/gme/SPC_Filter.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-SPC_Filter.lo `test -f 'game-music-emu-0.6pre/gme/SPC_Filter.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/SPC_Filter.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Sap_Apu.lo: game-music-emu-0.6pre/gme/Sap_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Sap_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Sap_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Sap_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Sap_Core.lo: game-music-emu-0.6pre/gme/Sap_Core.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Sap_Core.lo `test -f 'game-music-emu-0.6pre/gme/Sap_Core.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Sap_Core.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Sap_Cpu.lo: game-music-emu-0.6pre/gme/Sap_Cpu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Sap_Cpu.lo `test -f 'game-music-emu-0.6pre/gme/Sap_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Sap_Cpu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Sap_Emu.lo: game-music-emu-0.6pre/gme/Sap_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Sap_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Sap_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Sap_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Sgc_Core.lo: game-music-emu-0.6pre/gme/Sgc_Core.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Sgc_Core.lo `test -f 'game-music-emu-0.6pre/gme/Sgc_Core.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Sgc_Core.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Sgc_Cpu.lo: game-music-emu-0.6pre/gme/Sgc_Cpu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Sgc_Cpu.lo `test -f 'game-music-emu-0.6pre/gme/Sgc_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Sgc_Cpu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Sgc_Emu.lo: game-music-emu-0.6pre/gme/Sgc_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Sgc_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Sgc_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Sgc_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Sgc_Impl.lo: game-music-emu-0.6pre/gme/Sgc_Impl.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Sgc_Impl.lo `test -f 'game-music-emu-0.6pre/gme/Sgc_Impl.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Sgc_Impl.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Sms_Apu.lo: game-music-emu-0.6pre/gme/Sms_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Sms_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Sms_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Sms_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Sms_Fm_Apu.lo: game-music-emu-0.6pre/gme/Sms_Fm_Apu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Sms_Fm_Apu.lo `test -f 'game-music-emu-0.6pre/gme/Sms_Fm_Apu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Sms_Fm_Apu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Spc_Emu.lo: game-music-emu-0.6pre/gme/Spc_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Spc_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Spc_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Spc_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Spc_Sfm.lo: game-music-emu-0.6pre/gme/Spc_Sfm.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Spc_Sfm.lo `test -f 'game-music-emu-0.6pre/gme/Spc_Sfm.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Spc_Sfm.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Track_Filter.lo: game-music-emu-0.6pre/gme/Track_Filter.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Track_Filter.lo `test -f 'game-music-emu-0.6pre/gme/Track_Filter.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Track_Filter.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Upsampler.lo: game-music-emu-0.6pre/gme/Upsampler.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Upsampler.lo `test -f 'game-music-emu-0.6pre/gme/Upsampler.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Upsampler.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Vgm_Core.lo: game-music-emu-0.6pre/gme/Vgm_Core.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Vgm_Core.lo `test -f 'game-music-emu-0.6pre/gme/Vgm_Core.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Vgm_Core.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Vgm_Emu.lo: game-music-emu-0.6pre/gme/Vgm_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Vgm_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Vgm_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Vgm_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Ym2413_Emu.lo: game-music-emu-0.6pre/gme/Ym2413_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Ym2413_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Ym2413_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Ym2413_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu.lo: game-music-emu-0.6pre/gme/Ym2612_Emu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu.lo `test -f 'game-music-emu-0.6pre/gme/Ym2612_Emu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Ym2612_Emu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu_Gens.lo: game-music-emu-0.6pre/gme/Ym2612_Emu_Gens.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu_Gens.lo `test -f 'game-music-emu-0.6pre/gme/Ym2612_Emu_Gens.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Ym2612_Emu_Gens.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu_MAME.lo: game-music-emu-0.6pre/gme/Ym2612_Emu_MAME.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Ym2612_Emu_MAME.lo `test -f 'game-music-emu-0.6pre/gme/Ym2612_Emu_MAME.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Ym2612_Emu_MAME.cpp
+
+game-music-emu-0.6pre/gme/gme_la-Z80_Cpu.lo: game-music-emu-0.6pre/gme/Z80_Cpu.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-Z80_Cpu.lo `test -f 'game-music-emu-0.6pre/gme/Z80_Cpu.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/Z80_Cpu.cpp
+
+game-music-emu-0.6pre/gme/gme_la-blargg_common.lo: game-music-emu-0.6pre/gme/blargg_common.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-blargg_common.lo `test -f 'game-music-emu-0.6pre/gme/blargg_common.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/blargg_common.cpp
+
+game-music-emu-0.6pre/gme/gme_la-blargg_errors.lo: game-music-emu-0.6pre/gme/blargg_errors.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-blargg_errors.lo `test -f 'game-music-emu-0.6pre/gme/blargg_errors.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/blargg_errors.cpp
+
+game-music-emu-0.6pre/gme/gme_la-gme.lo: game-music-emu-0.6pre/gme/gme.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/gme_la-gme.lo `test -f 'game-music-emu-0.6pre/gme/gme.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/gme.cpp
+
+game-music-emu-0.6pre/gme/higan/dsp/gme_la-dsp.lo: game-music-emu-0.6pre/gme/higan/dsp/dsp.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/higan/dsp/gme_la-dsp.lo `test -f 'game-music-emu-0.6pre/gme/higan/dsp/dsp.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/higan/dsp/dsp.cpp
+
+game-music-emu-0.6pre/gme/higan/dsp/gme_la-SPC_DSP.lo: game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/higan/dsp/gme_la-SPC_DSP.lo `test -f 'game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.cpp
+
+game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-algorithms.lo: game-music-emu-0.6pre/gme/higan/processor/spc700/algorithms.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-algorithms.lo `test -f 'game-music-emu-0.6pre/gme/higan/processor/spc700/algorithms.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/higan/processor/spc700/algorithms.cpp
+
+game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-instructions.lo: game-music-emu-0.6pre/gme/higan/processor/spc700/instructions.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-instructions.lo `test -f 'game-music-emu-0.6pre/gme/higan/processor/spc700/instructions.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/higan/processor/spc700/instructions.cpp
+
+game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-spc700.lo: game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/higan/processor/spc700/gme_la-spc700.lo `test -f 'game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.cpp
+
+game-music-emu-0.6pre/gme/higan/smp/gme_la-smp.lo: game-music-emu-0.6pre/gme/higan/smp/smp.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gme_la_CXXFLAGS) $(CXXFLAGS) -c -o game-music-emu-0.6pre/gme/higan/smp/gme_la-smp.lo `test -f 'game-music-emu-0.6pre/gme/higan/smp/smp.cpp' || echo '$(srcdir)/'`game-music-emu-0.6pre/gme/higan/smp/smp.cpp
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
+	-rm -rf game-music-emu-0.6pre/gme/.libs game-music-emu-0.6pre/gme/_libs
+	-rm -rf game-music-emu-0.6pre/gme/higan/dsp/.libs game-music-emu-0.6pre/gme/higan/dsp/_libs
+	-rm -rf game-music-emu-0.6pre/gme/higan/processor/spc700/.libs game-music-emu-0.6pre/gme/higan/processor/spc700/_libs
+	-rm -rf game-music-emu-0.6pre/gme/higan/smp/.libs game-music-emu-0.6pre/gme/higan/smp/_libs
+	-rm -rf game-music-emu-0.6pre/vgmplay/VGMPlay/.libs game-music-emu-0.6pre/vgmplay/VGMPlay/_libs
+	-rm -rf game-music-emu-0.6pre/vgmplay/VGMPlay/chips/.libs game-music-emu-0.6pre/vgmplay/VGMPlay/chips/_libs
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -1688,6 +2260,12 @@
 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)
+	-rm -f game-music-emu-0.6pre/gme/$(am__dirstamp)
+	-rm -f game-music-emu-0.6pre/gme/higan/dsp/$(am__dirstamp)
+	-rm -f game-music-emu-0.6pre/gme/higan/processor/spc700/$(am__dirstamp)
+	-rm -f game-music-emu-0.6pre/gme/higan/smp/$(am__dirstamp)
+	-rm -f game-music-emu-0.6pre/vgmplay/VGMPlay/$(am__dirstamp)
+	-rm -f game-music-emu-0.6pre/vgmplay/VGMPlay/chips/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1698,7 +2276,6 @@
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1744,7 +2321,6 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1780,6 +2356,8 @@
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-pkglibLTLIBRARIES
 
+.PRECIOUS: Makefile
+
 
 # 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.6.2.tar.bz2/plugins/gme/cgme.c -> deadbeef-1.9.6.tar.bz2/plugins/gme/cgme.c Changed

@@ -1,6 +1,6 @@
 /*
 GameMusicEmu plugin for DeaDBeeF
- Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2015 Oleksiy Yakovenko <waker@users.sourceforge.net>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -31,16 +31,17 @@
 #include <math.h>
 #include "gme/gme.h"
 #include <zlib.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-#if HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
+#include <limits.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include "gmewrap.h"
 
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
+#define trace(...) { deadbeef->log_detailed (&plugin.plugin, 0, __VA_ARGS__); }
 
 // how big vgz can be?
 #define MAX_REMOTE_GZ_FILE 0x100000
@@ -49,27 +50,36 @@
 static DB_functions_t *deadbeef;
 static int conf_fadeout = 10;
 static int conf_loopcount = 2;
-static int chip_voices = 0xff;
-static int chip_voices_changed = 0;
+static int conf_play_forever = 0;
+static char *coleco_rom;
 
 typedef struct {
 DB_fileinfo_t info;
 Music_Emu *emu;
 int reallength;
 float duration; // of current song
+ int eof;
+ int chip_voices;
+ int can_loop;
+ int rawsignal;
+ int fade_set;
 } gme_fileinfo_t;
 
 static DB_fileinfo_t *
-cgme_open (uint32_t hint) {
- DB_fileinfo_t *_info = malloc (sizeof (gme_fileinfo_t));
- memset (_info, 0, sizeof (gme_fileinfo_t));
- return _info;
+cgme_open (uint32_t hints) {
+ gme_fileinfo_t *info = calloc (1, sizeof (gme_fileinfo_t));
+ info->chip_voices = 0xff;
+ info->can_loop = hints & DDB_DECODER_HINT_CAN_LOOP;
+ info->rawsignal = hints & DDB_DECODER_HINT_RAW_SIGNAL;
+ return &info->info;
 }
 
 static int
 read_gzfile (const char *fname, char **buffer, int *size) {
 int fd = -1;
+ int res = -1;
 DB_FILE *fp = deadbeef->fopen (fname);
+ char tmpnmPATH_MAX = "";
 if (!fp) {
 trace ("gme read_gzfile: failed to fopen %s\n", fname);
 return -1;
@@ -78,45 +88,60 @@
 int64_t sz = deadbeef->fgetlength (fp);
 if (fp->vfs && fp->vfs->plugin.id && strcmp (fp->vfs->plugin.id, "vfs_stdio") && sz > 0 && sz <= MAX_REMOTE_GZ_FILE) {
 trace ("gme read_gzfile: reading %s of size %lld and writing to temp file\n", fname, sz);
- char buffersz;
+ char *buffer = malloc(sz);
 if (sz == deadbeef->fread (buffer, 1, sz, fp)) {
+ static int idx = 0;
 const char *tmp = getenv ("TMPDIR");
 if (!tmp) {
 tmp = "/tmp";
 }
- char nmPATH_MAX;
-#if defined(ANDROID) || defined(STATICLINK)
- snprintf (nm, sizeof (nm), "%s/ddbgmeXXXXXX", tmp);
- fd = mkstemp (nm);
+#if defined(ANDROID)
+ // newer androids don't allow writing to /tmp, so write to ${configdir}/tmp/
+ const char *confdir = deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG);
+ snprintf (tmpnm, sizeof (tmpnm), "%s/tmp", confdir);
+ mkdir (tmpnm, 0755);
+ snprintf (tmpnm, sizeof (tmpnm), "%s/tmp/ddbgme%03d.vgz", confdir, idx);
+ fd = open (tmpnm, O_RDWR|O_CREAT|O_TRUNC);
+#elif defined(STATICLINK)
+ // mkstemps is unavailable in this case (linking to old glibc),
+ // and mkstemp is considered insecure,
+ // so just make the name manually.
+ // This is as insecure as mkstemp, but (hopefully) won't be bugged by static analyzers
+ snprintf (tmpnm, sizeof (tmpnm), "%s/ddbgme%03d.vgz", tmp, idx);
+ fd = open (tmpnm, O_RDWR|O_CREAT|O_TRUNC);
 #else
- snprintf (nm, sizeof (nm), "%s/ddbgmeXXXXXX.vgz", tmp);
- fd = mkstemps (nm, 4);
+ snprintf (tmpnm, sizeof (tmpnm), "%s/ddbgmeXXXXXX.vgz", tmp);
+ fd = mkstemps (tmpnm, 4);
 #endif
+ idx++;
 if (fd == -1 || sz != write (fd, buffer, sz)) {
- trace ("gme read_gzfile: failed to write temp file\n");
+ trace ("gme read_gzfile: failed to write temp file %s\n", tmpnm);
 if (fd != -1) {
 close (fd);
+ fd = -1;
 }
 }
 if (fd != -1) {
 lseek (fd, 0, SEEK_SET);
 }
+ trace ("%s written successfully\n", tmpnm);
+ free (buffer);
 }
 }
 
 deadbeef->fclose (fp);
 
 sz *= 2;
- int readsize = sz;
+ int readsize = (int)sz;
 *buffer = malloc (sz);
 if (!(*buffer)) {
- return -1;
+ goto error;
 }
 
 gzFile gz = fd == -1 ? gzopen (fname, "rb") : gzdopen (fd, "r");
 if (!gz) {
 trace ("failed to gzopen %s\n", fname);
- return -1;
+ goto error;
 }
 *size = 0;
 int nb;
@@ -125,9 +150,10 @@
 nb = gzread (gz, *buffer + pos, readsize);
 if (nb < 0) {
 free (*buffer);
+ *buffer = NULL;
 trace ("failed to gzread from %s\n", fname);
 gzclose (gz);
- return -1;
+ goto error;
 }
 if (nb > 0) {
 pos += nb;
@@ -137,7 +163,7 @@
 break;
 }
 else {
- readsize = sz;
+ readsize = (int)sz;
 sz *= 2;
 *buffer = realloc (*buffer, sz);
 }
@@ -145,7 +171,31 @@
 gzclose (gz);
 trace ("got %d bytes from %s\n", *size, fname);
 
- return 0;
+ res = 0;
+error:
+ if (*tmpnm) {
+ unlink (tmpnm);
+ }
+
+ return res;
+}
+
+static float
+_get_duration (const gme_info_t *inf) {
+ if (inf->length != -1 && inf->length != 0) {
+ return (inf->length + conf_fadeout)/1000.f;
+ }
+
+ if (inf->loop_length <= 0 || conf_loopcount <= 0) {
+ return deadbeef->conf_get_float ("gme.songlength", 3) * 60.f;
+ }
+
+ float songlength = inf->intro_length / 1000.f;
+ if (songlength < 0) {
+ songlength = 0;
+ }
+ songlength += (inf->loop_length * conf_loopcount) / 1000.f;
+ return songlength;
 }
 
 static int
@@ -155,72 +205,58 @@
 
 gme_err_t res = "gme uninitialized";
 deadbeef->pl_lock ();
- {
- const char *fname = deadbeef->pl_find_meta (it, ":URI");
- const char *ext = strrchr (fname, '.');
- char *buffer;
- int sz;
- if (!read_gzfile (fname, &buffer, &sz)) {
- res = gme_open_data (fname, buffer, sz, &info->emu, samplerate);
- free (buffer);
+ const char *fname = strdupa(deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ char *buffer;
+ int sz;
+ if (!read_gzfile (fname, &buffer, &sz)) {
+ res = gme_open_data (buffer, sz, &info->emu, samplerate);
+ free (buffer);
+ }
+ if (res) {
+ DB_FILE *f = deadbeef->fopen (fname);
+ if (!f) {
+ return -1;
 }
- if (res) {
- DB_FILE *f = deadbeef->fopen (fname);
- if (!f) {
- deadbeef->pl_unlock ();
- return -1;
- }
- int64_t sz = deadbeef->fgetlength (f);
- if (sz <= 0) {
- deadbeef->fclose (f);
- deadbeef->pl_unlock ();
- return -1;
- }
- char *buf = malloc (sz);
- if (!buf) {
- deadbeef->fclose (f);
- deadbeef->pl_unlock ();
- return -1;
- }
- int64_t rb = deadbeef->fread (buf, 1, sz, f);
- deadbeef->fclose(f);
- if (rb != sz) {
- free (buf);
- deadbeef->pl_unlock ();
- return -1;
- }
-
- res = gme_open_data (fname, buf, sz, &info->emu, samplerate);
+ int64_t sz = deadbeef->fgetlength (f);
+ if (sz <= 0) {
+ deadbeef->fclose (f);
+ return -1;
+ }
+ char *buf = malloc (sz);
+ if (!buf) {
+ deadbeef->fclose (f);
+ return -1;
+ }
+ int64_t rb = deadbeef->fread (buf, 1, sz, f);
+ deadbeef->fclose(f);
+ if (rb != sz) {
 free (buf);
+ return -1;
 }
+
+ res = gme_open_data (buf, sz, &info->emu, samplerate);
+ free (buf);
 }
- deadbeef->pl_unlock ();
 
 if (res) {
 trace ("failed with error %d\n", res);
 return -1;
 }
- chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
- gme_mute_voices (info->emu, chip_voices^0xff);
 gme_start_track (info->emu, deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0));
 
-#ifdef GME_VERSION_055
 gme_info_t *inf;
 gme_track_info (info->emu, &inf, deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0));
-#else
- track_info_t _inf;
- gme_track_info (info->emu, &inf, deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0));
- track_info_t *inf = &_inf;
-#endif
 
 _info->plugin = &plugin;
 _info->fmt.bps = 16;
 _info->fmt.channels = 2;
 _info->fmt.samplerate = samplerate;
 _info->fmt.channelmask = _info->fmt.channels == 1 ? DDB_SPEAKER_FRONT_LEFT : (DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT);
- info->duration = deadbeef->pl_get_item_duration (it);
- info->reallength = inf->length; 
+ info->duration = _get_duration(inf);
+ info->reallength = inf->length;
 _info->readpos = 0;
+ info->eof = 0;
 return 0;
 }
 
@@ -236,46 +272,43 @@
 static int
 cgme_read (DB_fileinfo_t *_info, char *bytes, int size) {
 gme_fileinfo_t *info = (gme_fileinfo_t*)_info;
+ int playForever = conf_play_forever && info->can_loop;
 float t = (size/4) / (float)_info->fmt.samplerate;
- if (_info->readpos + t >= info->duration) {
+ if (info->eof) {
+ return 0;
+ }
+ if (!playForever && _info->readpos + t >= info->duration) {
 t = info->duration - _info->readpos;
 if (t <= 0) {
 return 0;
 }
- // DON'T ajust size, buffer must always be po2
- //size = t * (float)info->samplerate * 4;
 }
 
- if (chip_voices_changed) {
- chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
- chip_voices_changed = 0;
- gme_mute_voices (info->emu, chip_voices^0xff);
+ if (!info->rawsignal) {
+ int chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
+ if (chip_voices != info->chip_voices) {
+ info->chip_voices = chip_voices;
+ gme_mute_voices (info->emu, chip_voices^0xff);
+ }
+ }
+
+ // FIXME: it makes more sense to call gme_set_fade on init and configchanged
+ if (playForever && info->fade_set) {
+ gme_set_fade(info->emu, -1, 0);
+ info->fade_set = 0;
+ }
+ else if (!playForever && !info->fade_set && conf_fadeout > 0 && info->duration >= conf_fadeout && _info->readpos >= info->duration - conf_fadeout) {
+ gme_set_fade(info->emu, (int)(_info->readpos * 1000), conf_fadeout * 1000);
+ info->fade_set = 1;
 }
 
 if (gme_play (info->emu, size/2, (short*)bytes)) {
 return 0;
 }
- if (conf_fadeout > 0 && info->duration >= conf_fadeout && info->reallength <= 0 && _info->readpos >= info->duration - conf_fadeout) {
- float fade_amnt = (info->duration - _info->readpos) / (float)conf_fadeout;
- int nsamples = size/2;
- float fade_incr = 1.f / (_info->fmt.samplerate * conf_fadeout) * 256;
- const float ln10=2.3025850929940002f;
- float fade = exp(ln10*(-(1.f-fade_amnt) * 3));
-
- for (int i = 0; i < nsamples; i++) {
- ((short*)bytes)i *= fade;
- if (!(i & 0xff)) {
- fade_amnt += fade_incr;
- fade = exp(ln10*(-(1.f-fade_amnt) * 3));
- }
- }
- }
 
 _info->readpos += t;
- if (info->reallength == -1) {
- if (gme_track_ended (info->emu)) {
- return 0;
- }
+ if (gme_track_ended (info->emu)) {
+ info->eof = 1;
 }
 return size;
 }
@@ -283,10 +316,11 @@
 static int
 cgme_seek (DB_fileinfo_t *_info, float time) {
 gme_fileinfo_t *info = (gme_fileinfo_t*)_info;
- if (gme_seek (info->emu, (long)(time * 1000))) {
+ if (gme_seek (info->emu, (int)(time * 1000))) {
 return -1;
 }
 _info->readpos = time;
+ info->eof = 0;
 return 0;
 }
 
@@ -295,20 +329,20 @@
 if (!value) {
 return;
 }
- char len = strlen (value);
+ size_t len = strlen (value);
 char out1024;
 // check for utf8 (hack)
- if (deadbeef->junk_iconv (value, len, out, sizeof (out), "utf-8", "utf-8") >= 0) {
+ if (deadbeef->junk_iconv (value, (int)len, out, sizeof (out), "utf-8", "utf-8") >= 0) {
 deadbeef->pl_add_meta (it, key, out);
 return;
 }
 
- if (deadbeef->junk_iconv (value, len, out, sizeof (out), "iso8859-1", "utf-8") >= 0) {
+ if (deadbeef->junk_iconv (value, (int)len, out, sizeof (out), "cp1252", "utf-8") >= 0) {
 deadbeef->pl_add_meta (it, key, out);
 return;
 }
 
- if (deadbeef->junk_iconv (value, len, out, sizeof (out), "SHIFT-JIS", "utf-8") >= 0) {
+ if (deadbeef->junk_iconv (value, (int)len, out, sizeof (out), "SHIFT-JIS", "utf-8") >= 0) {
 deadbeef->pl_add_meta (it, key, out);
 return;
 }
@@ -320,18 +354,17 @@
 
 static DB_playItem_t *
 cgme_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
- Music_Emu *emu;
+ Music_Emu *emu = NULL;
 trace ("gme_open_file %s\n", fname);
 
 gme_err_t res = "gme uninitialized";
 
- const char *ext = strrchr (fname, '.');
- char *buffer;
+ char *buffer = NULL;
 int sz;
 if (!read_gzfile (fname, &buffer, &sz)) {
- res = gme_open_data (fname, buffer, sz, &emu, gme_info_only);
- free (buffer);
+ res = gme_open_data (buffer, sz, &emu, gme_info_only);
 }
+ free (buffer);
 if (res) {
 DB_FILE *f = deadbeef->fopen (fname);
 if (!f) {
@@ -354,7 +387,7 @@
 return NULL;
 }
 
- res = gme_open_data (fname, buf, sz, &emu, gme_info_only);
+ res = gme_open_data (buf, sz, &emu, gme_info_only);
 free (buf);
 }
 
@@ -368,7 +401,7 @@
 const char *ret = gme_track_info (emu, &inf, i);
 #else
 track_info_t _inf;
- const char *ret = gme_track_info (emu, &inf, i);
+ const char *ret = gme_track_info (emu, &_inf, i);
 track_info_t *inf = &_inf;
 #endif
 if (!ret) {
@@ -408,24 +441,7 @@
 deadbeef->pl_add_meta (it, ":GME_INTRO_LENGTH", str);
 snprintf (str, sizeof(str), "%d", inf->loop_length);
 deadbeef->pl_add_meta (it, ":GME_LOOP_LENGTH", str);
- if (inf->length == -1 || inf->length == 0) {
- float songlength;
- 
- if (inf->loop_length > 0 && conf_loopcount > 0) {
- songlength = inf->intro_length / 1000.f;
- if (songlength < 0) {
- songlength = 0;
- }
- songlength += (inf->loop_length * conf_loopcount) / 1000.f;
- }
- else {
- songlength = deadbeef->conf_get_float ("gme.songlength", 3) * 60.f;
- }
- deadbeef->plt_set_item_duration (plt, it, songlength);
- }
- else {
- deadbeef->plt_set_item_duration (plt, it, (float)inf->length/1000.f);
- }
+ deadbeef->plt_set_item_duration (plt, it, _get_duration(inf));
 const char *ext = fname + strlen (fname) - 1;
 while (ext >= fname && *ext != '.') {
 ext--;
@@ -461,30 +477,69 @@
 
 static const char * exts=
 {
-	"ay","gbs","gym","hes","kss","nsf","nsfe","sap","spc","vgm","vgz",NULL
+	"ay","gbs","gym","hes","kss","nsf","nsfe","sap","sfm","spc","vgm","vgz","sgc",NULL
 };
 
 static int
 cgme_start (void) {
- conf_fadeout = deadbeef->conf_get_int ("gme.fadeout", 10);
- conf_loopcount = deadbeef->conf_get_int ("gme.loopcount", 2);
 return 0;
 }
 
 static int
 cgme_stop (void) {
+ if (coleco_rom) {
+ free (coleco_rom);
+ coleco_rom = NULL;
+ }
+ gme_set_sgc_coleco_bios (NULL);
 return 0;
 }
 
+static void
+init_coleco_bios () {
+ if (coleco_rom) {
+ free (coleco_rom);
+ coleco_rom = NULL;
+ }
+ gme_set_sgc_coleco_bios (NULL);
+ char pathPATH_MAX;
+ deadbeef->conf_get_str ("gme.coleco_rom", "", path, sizeof (path));
+ if (path0) {
+ FILE *fp = fopen (path, "rb");
+ if (!fp) {
+ return;
+ }
+ fseek (fp, 0, SEEK_END);
+ size_t size = ftell (fp);
+ rewind (fp);
+ if (size != 0x2000) {
+ fclose (fp);
+ deadbeef->log_detailed (&plugin.plugin, DDB_LOG_LAYER_DEFAULT, "ColecoVision ROM file %s has invalid size (expected 8192 bytes)", path);
+ return;
+ }
+
+ coleco_rom = malloc (size);
+ size_t rb = fread (coleco_rom, 1, size, fp);
+ fclose (fp);
+
+ if (rb != 0x2000) {
+ free (coleco_rom);
+ coleco_rom = NULL;
+ deadbeef->log_detailed (&plugin.plugin, DDB_LOG_LAYER_DEFAULT, "Failed to load ColecoVision ROM from file %s, invalid file?", path);
+ }
+
+ gme_set_sgc_coleco_bios (coleco_rom);
+ }
+}
+
 int
 cgme_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
 switch (id) {
 case DB_EV_CONFIGCHANGED:
 conf_fadeout = deadbeef->conf_get_int ("gme.fadeout", 10);
 conf_loopcount = deadbeef->conf_get_int ("gme.loopcount", 2);
- if (chip_voices != deadbeef->conf_get_int ("chip.voices", 0xff)) {
- chip_voices_changed = 1;
- }
+ conf_play_forever = deadbeef->streamer_get_repeat () == DDB_REPEAT_SINGLE;
+ init_coleco_bios ();
 break;
 }
 return 0;
@@ -494,36 +549,97 @@
 "property \"Max song length (in minutes)\" entry gme.songlength 3;\n"
 "property \"Fadeout length (seconds)\" entry gme.fadeout 10;\n"
 "property \"Play loops nr. of times (if available)\" entry gme.loopcount 2;\n"
+ "property \"ColecoVision BIOS (for SGC file format)\" file gme.coleco_rom \"\";\n"
 ;
 
 // define plugin interface
 static DB_decoder_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
+// .plugin.flags = DDB_PLUGIN_FLAG_LOGGING,
 .plugin.type = DB_PLUGIN_DECODER,
 .plugin.id = "stdgme",
 .plugin.name = "Game-Music-Emu player",
 .plugin.descr = "chiptune/game music player based on GME library",
 .plugin.copyright = 
- "Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Game_Music_Emu plugin for DeaDBeeF\n"
+ "Copyright (C) 2009-2015 Oleksiy Yakovenko <waker@users.sourceforge.net>\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\n"
+ "\n"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\n"
 "\n"
- "Uses Game-Music-Emu by Shay Green <gblargg@gmail.com>, http://code.google.com/p/game-music-emu/\n"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\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"
+ "3. This notice may not be removed or altered from any source distribution.\n"
 "\n"
- "This program is distributed in the hope that it will be useful,\n"
+ "\n"
+ "\n"
+ "Game_Music_Emu (modified)\n"
+ "Copyright (C) 2003-2009 Shay Green.\n"
+ "Foobar2000-related modifications (C) Chris Moeller\n"
+ "DeaDBeeF-related modifications (C) Oleksiy Yakovenko.\n"
+ "\n"
+ "This library is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU Lesser General Public\n"
+ "License as published by the Free Software Foundation; either\n"
+ "version 2.1 of the License, or (at your option) any later version.\n"
+ "\n"
+ "This library 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"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
+ "Lesser General Public License for more details.\n"
+ "\n"
+ "You should have received a copy of the GNU Lesser General Public\n"
+ "License along with this library; if not, write to the Free Software\n"
+ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n"
+ "\n"
+ "\n"
+ "\n"
+ "VGMPlay\n"
+ "Copyright Nicola Salmoria and the MAME team\n"
+ "All rights reserved.\n"
+ "\n"
+ "Redistribution and use of this code or any derivative works are permitted\n"
+ "provided that the following conditions are met:\n"
+ "\n"
+ "* Redistributions may not be sold, nor may they be used in a commercial\n"
+ "product or activity.\n"
+ "\n"
+ "* Redistributions that are modified from the original source must include the\n"
+ "complete source code, including the source code for all components used by a\n"
+ "binary built from the modified sources. However, as a special exception, the\n"
+ "source code distributed need not include anything that is normally distributed\n"
+ "(in either source or binary form) with the major components (compiler, kernel,\n"
+ "and so on) of the operating system on which the executable runs, unless that\n"
+ "component itself accompanies the executable.\n"
+ "\n"
+ "* Redistributions must reproduce the above copyright notice, this list of\n"
+ "conditions and the following disclaimer in the documentation and/or other\n"
+ "materials provided with the distribution.\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"
+ "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n"
+ "AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
+ "IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n"
+ "ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE\n"
+ "LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n"
+ "CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n"
+ "SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n"
+ "INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\n"
+ "CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n"
+ "ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\n"
+ "POSSIBILITY OF SUCH DAMAGE.\n"
 ,
 .plugin.website = "http://deadbeef.sf.net",
 .plugin.start = cgme_start,

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Apu.cpp Changed

@@ -1,4 +1,4 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
+// $package. http://www.slack.net/~ant/
 
 #include "Ay_Apu.h"
 
@@ -95,6 +95,7 @@
 		}
 	}
 	
+	type_ = Ay8910;
 	set_output( NULL );
 	volume( 1.0 );
 	reset();
@@ -105,13 +106,13 @@
 	addr_ = 0;
 	last_time = 0;
 	noise_delay = 0;
-	noise_lfsr = 1;
-	
+ noise_lfsr = 1;
+
 	for ( osc_t* osc = &oscs osc_count; osc != oscs; )
 	{
 		osc--;
 		osc->period = period_factor;
-		osc->delay = 0;
+ osc->delay = 0;
 		osc->last_amp = 0;
 		osc->phase = 0;
 	}
@@ -128,7 +129,8 @@
 		0xFF, 0x0F, 0xFF, 0x0F, 0xFF, 0x0F, 0x1F, 0x3F,
 		0x1F, 0x1F, 0x1F, 0xFF, 0xFF, 0x0F, 0x00, 0x00
 	};
-	return regs addr_ & masks addr_;
+	if (!(type_ & 0x10)) return regs addr_ & masks addr_;
+	else return regs addr_;
 }
 
 void Ay_Apu::write_data_( int addr, int data )
@@ -143,6 +145,10 @@
 	{
 		if ( !(data & 8) ) // convert modes 0-7 to proper equivalents
 			data = (data & 4) ? 15 : 9;
+		if (data < 9)
+			data = 9;
+		if (data > 15)
+			data = 15;
 		env_wave = env_modes data - 7;
 		env_pos = -48;
 		env_delay = 0; // will get set to envelope period in run_until()
@@ -184,18 +190,19 @@
 	unsigned const old_noise_lfsr = noise_lfsr;
 	
 	// envelope period
-	blip_time_t const env_period_factor = period_factor * 2; // verified
+ int env_step_scale = ((type_ & 0xF0) == 0x00) ? 1 : 0;
+	blip_time_t const env_period_factor = period_factor << env_step_scale; // verified
 	blip_time_t env_period = (regs 12 * 0x100 + regs 11) * env_period_factor;
 	if ( !env_period )
 		env_period = env_period_factor; // same as period 1 on my AY chip
 	if ( !env_delay )
-		env_delay = env_period;
+ env_delay = env_period;
 	
 	// run each osc separately
 	for ( int index = 0; index < osc_count; index++ )
 	{
 		osc_t* const osc = &oscs index;
-		int osc_mode = regs 7 >> index;
+ int osc_mode = regs 7 >> index;
 		
 		// output
 		Blip_Buffer* const osc_output = osc->output;
@@ -216,12 +223,14 @@
 		// envelope
 		blip_time_t start_time = last_time;
 		blip_time_t end_time = final_end_time;
-		int const vol_mode = regs 0x08 + index;
-		int volume = amp_table vol_mode & 0x0F >> half_vol;
+ int const vol_mode = regs 0x08 + index;
+		int const vol_mode_mask = type_ == Ay8914 ? 0x30 : 0x10;
+		int volume = amp_table vol_mode & 0x0F >> (half_vol + env_step_scale);
 		int osc_env_pos = env_pos;
-		if ( vol_mode & 0x10 )
+		if ( vol_mode & vol_mode_mask )
 		{
-			volume = env_wave osc_env_pos >> half_vol;
+			volume = env_wave osc_env_pos >> (half_vol + env_step_scale);
+			if ( type_ == Ay8914 ) volume >>= 3 - ( ( vol_mode & vol_mode_mask ) >> 4 );
 			// use envelope only if it's a repeating wave or a ramp that hasn't finished
 			if ( !(regs 13 & 1) || osc_env_pos < -32 )
 			{
@@ -369,10 +378,11 @@
 			// next envelope step
 			if ( ++osc_env_pos >= 0 )
 				osc_env_pos -= 32;
-			volume = env_wave osc_env_pos >> half_vol;
+			volume = env_wave osc_env_pos >> (half_vol + env_step_scale);
+			if ( type_ == Ay8914 ) volume >>= 3 - ( ( vol_mode & vol_mode_mask ) >> 4 );
 			
 			start_time = end_time;
-			end_time += env_period;
+ end_time += env_period;
 			if ( end_time > final_end_time )
 				end_time = final_end_time;
 		}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Core.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Core.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Core.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Core.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Cpu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Cpu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Emu.cpp Changed

@@ -1,309 +1,360 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Ay_Emu.h"
-
-#include "blargg_endian.h"
-
-/* Copyright (C) 2006-2009 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: probably don't need detailed errors as to why file is corrupt
-
-int const spectrum_clock = 3546900; // 128K Spectrum
-int const spectrum_period = 70908;
-
-//int const spectrum_clock = 3500000; // 48K Spectrum
-//int const spectrum_period = 69888;
-
-int const cpc_clock = 2000000;
-
-Ay_Emu::Ay_Emu()
-{
-	core.set_cpc_callback( enable_cpc_, this );
-	set_type( gme_ay_type );
-	set_silence_lookahead( 6 );
-}
-
-Ay_Emu::~Ay_Emu() { }
-
-// Track info
-
-// Given pointer to 2-byte offset of data, returns pointer to data, or NULL if
-// offset is 0 or there is less than min_size bytes of data available.
-static byte const* get_data( Ay_Emu::file_t const& file, byte const ptr , int min_size )
-{
-	int offset = (BOOST::int16_t) get_be16( ptr );
-	int pos = ptr - (byte const*) file.header;
-	int size = file.end - (byte const*) file.header;
-	assert( (unsigned) pos <= (unsigned) size - 2 );
-	int limit = size - min_size;
-	if ( limit < 0 || !offset || (unsigned) (pos + offset) > (unsigned) limit )
-		return NULL;
-	return ptr + offset;
-}
-
-static blargg_err_t parse_header( byte const in , int size, Ay_Emu::file_t* out )
-{
-	typedef Ay_Emu::header_t header_t;
-	if ( size < header_t::size )
-		return blargg_err_file_type;
-	
-	out->header = (header_t const*) in;
-	out->end = in + size;
-	header_t const& h = *(header_t const*) in;
-	if ( memcmp( h.tag, "ZXAYEMUL", 8 ) )
-		return blargg_err_file_type;
-	
-	out->tracks = get_data( *out, h.track_info, (h.max_track + 1) * 4 );
-	if ( !out->tracks )
-		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "missing track data" );
-	
-	return blargg_ok;
-}
-
-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 ) * (1000 / 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 blargg_ok;
-}
-
-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 , int size )
-	{
-		RETURN_ERR( parse_header( begin, size, &file ) );
-		set_track_count( file.header->max_track + 1 );
-		return blargg_ok;
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int track ) const
-	{
-		copy_ay_fields( file, out, track );
-		return blargg_ok;
-	}
-};
-
-static Music_Emu* new_ay_emu ()
-{
-	return BLARGG_NEW Ay_Emu;
-}
-
-static Music_Emu* new_ay_file()
-{
-	return BLARGG_NEW Ay_File;
-}
-
-gme_type_t_ const gme_ay_type 1 = {{
-	"ZX Spectrum",
-	0,
-	&new_ay_emu,
-	&new_ay_file,
-	"AY",
-	1
-}};
-
-// Setup
-
-blargg_err_t Ay_Emu::load_mem_( byte const in , int size )
-{
-	assert( offsetof (header_t,track_info 2) == header_t::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" );
-	
-	int const osc_count = Ay_Apu::osc_count + 1; // +1 for beeper
-	
-	set_voice_count( osc_count );
-	core.apu().volume( gain() );
-	
-	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+1
-	};
-	set_voice_types( types );
-	
-	return setup_buffer( spectrum_clock );
-}
-	
-void Ay_Emu::update_eq( blip_eq_t const& eq )
-{
-	core.apu().treble_eq( eq );
-}
-
-void Ay_Emu::set_voice( int i, Blip_Buffer* center, Blip_Buffer*, Blip_Buffer* )
-{
-	if ( i >= Ay_Apu::osc_count )
-		core.set_beeper_output( center );
-	else
-		core.apu().set_output( i, center );
-}
-
-void Ay_Emu::set_tempo_( double t )
-{
-	int p = spectrum_period;
-	if ( clock_rate() != spectrum_clock )
-		p = clock_rate() / 50;
-	
-	core.set_play_period( blip_time_t (p / t) );
-}
-
-blargg_err_t Ay_Emu::start_track_( int track )
-{
-	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	
-	byte* const mem = core.mem();
-	
-	memset( mem + 0x0000, 0xC9, 0x100 ); // fill RST vectors with RET
-	memset( mem + 0x0100, 0xFF, 0x4000 - 0x100 );
-	memset( mem + core.ram_addr, 0x00, core.mem_size - core.ram_addr );
-
-	// locate data blocks
-	byte const* const data = get_data( file, file.tracks + track * 4 + 2, 14 );
-	if ( !data )
-		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "file data missing" );
-	
-	byte const* const more_data = get_data( file, data + 10, 6 );
-	if ( !more_data )
-		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "file data missing" );
-	
-	byte const* blocks = get_data( file, data + 12, 8 );
-	if ( !blocks )
-		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "file data missing" );
-	
-	// initial addresses
-	unsigned addr = get_be16( blocks );
-	if ( !addr )
-		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "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 > core.mem_size )
-		{
-			set_warning( "Bad data block size" );
-			len = core.mem_size - addr;
-		}
-		check( len );
-		byte const* in = get_data( file, blocks, 0 ); blocks += 2;
-		if (!in) {
- break;
- }
-		if ( len > (unsigned) (file.end - in) )
-		{
-			set_warning( "File data missing" );
-			len = file.end - in;
-		}
-		//dprintf( "addr: $%04X, len: $%04X\n", addr, len );
-		if ( addr < core.ram_addr && addr >= 0x400 ) // several tracks use low data
-			dprintf( "Block addr in ROM\n" );
-		memcpy( mem + addr, in, len );
-		
-		if ( file.end - blocks < 8 )
-		{
-			set_warning( "File data missing" );
-			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, passive, sizeof passive );
-	int const play_addr = get_be16( more_data + 4 );
-	if ( play_addr )
-	{
-		memcpy( mem, active, sizeof active );
-		mem 9 = play_addr;
-		mem 10 = play_addr >> 8;
-	}
-	mem 2 = init;
-	mem 3 = init >> 8;
-	
-	mem 0x38 = 0xFB; // Put EI at interrupt vector (followed by RET)
-	
-	// start at spectrum speed
-	change_clock_rate( spectrum_clock );
-	set_tempo( tempo() );
-	
-	Ay_Core::registers_t r = { };
-	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;
-	
-	core.start_track( r, play_addr );
-	
-	return blargg_ok;
-}
-
-blargg_err_t Ay_Emu::run_clocks( blip_time_t& duration, int )
-{
-	core.end_frame( &duration );
-	return blargg_ok;
-}
-
-inline void Ay_Emu::enable_cpc()
-{
-	change_clock_rate( cpc_clock );
-	set_tempo( tempo() );
-}
-
-void Ay_Emu::enable_cpc_( void* data )
-{
-	STATIC_CAST(Ay_Emu*,data)->enable_cpc();
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Ay_Emu.h"
+
+#include "blargg_endian.h"
+
+/* Copyright (C) 2006-2009 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: probably don't need detailed errors as to why file is corrupt
+
+int const spectrum_clock = 3546900; // 128K Spectrum
+int const spectrum_period = 70908;
+
+//int const spectrum_clock = 3500000; // 48K Spectrum
+//int const spectrum_period = 69888;
+
+int const cpc_clock = 2000000;
+
+Ay_Emu::Ay_Emu()
+{
+	core.set_cpc_callback( enable_cpc_, this );
+	set_type( gme_ay_type );
+	set_silence_lookahead( 6 );
+}
+
+Ay_Emu::~Ay_Emu() { }
+
+// Track info
+
+// Given pointer to 2-byte offset of data, returns pointer to data, or NULL if
+// offset is 0 or there is less than min_size bytes of data available.
+static byte const* get_data( Ay_Emu::file_t const& file, byte const ptr , int min_size )
+{
+	int offset = (BOOST::int16_t) get_be16( ptr );
+	int pos = ptr - (byte const*) file.header;
+	int size = file.end - (byte const*) file.header;
+	assert( (unsigned) pos <= (unsigned) size - 2 );
+	int limit = size - min_size;
+	if ( limit < 0 || !offset || (unsigned) (pos + offset) > (unsigned) limit )
+		return NULL;
+	return ptr + offset;
+}
+
+static blargg_err_t parse_header( byte const in , int size, Ay_Emu::file_t* out )
+{
+	typedef Ay_Emu::header_t header_t;
+	if ( size < header_t::size )
+		return blargg_err_file_type;
+	
+	out->header = (header_t const*) in;
+	out->end = in + size;
+	header_t const& h = *(header_t const*) in;
+	if ( memcmp( h.tag, "ZXAYEMUL", 8 ) )
+		return blargg_err_file_type;
+	
+	out->tracks = get_data( *out, h.track_info, (h.max_track + 1) * 4 );
+	if ( !out->tracks )
+		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "missing track data" );
+	
+	return blargg_ok;
+}
+
+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 ) * (1000 / 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 ) );
+}
+
+static void hash_ay_file( Ay_Emu::file_t const& file, Gme_Info_::Hash_Function& out )
+{
+	out.hash_( &file.header->vers, sizeof(file.header->vers) );
+	out.hash_( &file.header->player, sizeof(file.header->player) );
+	out.hash_( &file.header->unused0, sizeof(file.header->unused) );
+	out.hash_( &file.header->max_track, sizeof(file.header->max_track) );
+	out.hash_( &file.header->first_track, sizeof(file.header->first_track) );
+
+	for ( unsigned i = 0; i <= file.header->max_track; i++ )
+	{
+		byte const* track_info = get_data( file, file.tracks + i * 4 + 2, 14 );
+		if ( track_info )
+		{
+			out.hash_( track_info + 8, 2 );
+			byte const* points = get_data( file, track_info + 10, 6 );
+			if ( points ) out.hash_( points, 6 );
+
+			byte const* blocks = get_data( file, track_info + 12, 8 );
+			if ( blocks )
+			{
+				int addr = get_be16( blocks );
+
+				while ( addr )
+				{
+					out.hash_( blocks, 4 );
+
+					int len = get_be16( blocks + 2 );
+
+					byte const* block = get_data( file, blocks + 4, len );
+					if ( block ) out.hash_( block, len );
+
+					blocks += 6;
+					addr = get_be16( blocks );
+				}
+			}
+		}
+	}
+}
+
+blargg_err_t Ay_Emu::track_info_( track_info_t* out, int track ) const
+{
+	copy_ay_fields( file, out, track );
+	return blargg_ok;
+}
+
+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 , int size )
+	{
+		RETURN_ERR( parse_header( begin, size, &file ) );
+		set_track_count( file.header->max_track + 1 );
+		return blargg_ok;
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int track ) const
+	{
+		copy_ay_fields( file, out, track );
+		return blargg_ok;
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		hash_ay_file( file, out );
+		return blargg_ok;
+	}
+};
+
+static Music_Emu* new_ay_emu ()
+{
+	return BLARGG_NEW Ay_Emu;
+}
+
+static Music_Emu* new_ay_file()
+{
+	return BLARGG_NEW Ay_File;
+}
+
+gme_type_t_ const gme_ay_type 1 = {{
+	"ZX Spectrum",
+	0,
+	&new_ay_emu,
+	&new_ay_file,
+	"AY",
+	1
+}};
+
+// Setup
+
+blargg_err_t Ay_Emu::load_mem_( byte const in , int size )
+{
+	assert( offsetof (header_t,track_info 2) == header_t::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" );
+	
+	int const osc_count = Ay_Apu::osc_count + 1; // +1 for beeper
+	
+	set_voice_count( osc_count );
+	core.apu().volume( gain() );
+	
+	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+1
+	};
+	set_voice_types( types );
+	
+	return setup_buffer( spectrum_clock );
+}
+	
+void Ay_Emu::update_eq( blip_eq_t const& eq )
+{
+	core.apu().treble_eq( eq );
+}
+
+void Ay_Emu::set_voice( int i, Blip_Buffer* center, Blip_Buffer*, Blip_Buffer* )
+{
+	if ( i >= Ay_Apu::osc_count )
+		core.set_beeper_output( center );
+	else
+		core.apu().set_output( i, center );
+}
+
+void Ay_Emu::set_tempo_( double t )
+{
+	int p = spectrum_period;
+	if ( clock_rate() != spectrum_clock )
+		p = clock_rate() / 50;
+	
+	core.set_play_period( blip_time_t (p / t) );
+}
+
+blargg_err_t Ay_Emu::start_track_( int track )
+{
+	RETURN_ERR( Classic_Emu::start_track_( track ) );
+	
+	byte* const mem = core.mem();
+	
+	memset( mem + 0x0000, 0xC9, 0x100 ); // fill RST vectors with RET
+	memset( mem + 0x0100, 0xFF, 0x4000 - 0x100 );
+	memset( mem + core.ram_addr, 0x00, core.mem_size - core.ram_addr );
+
+	// locate data blocks
+	byte const* const data = get_data( file, file.tracks + track * 4 + 2, 14 );
+	if ( !data )
+		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "file data missing" );
+	
+	byte const* const more_data = get_data( file, data + 10, 6 );
+	if ( !more_data )
+		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "file data missing" );
+	
+	byte const* blocks = get_data( file, data + 12, 8 );
+	if ( !blocks )
+		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "file data missing" );
+	
+	// initial addresses
+	unsigned addr = get_be16( blocks );
+	if ( !addr )
+		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "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 > core.mem_size )
+		{
+			set_warning( "Bad data block size" );
+			len = core.mem_size - addr;
+		}
+		check( len );
+		byte const* in = get_data( file, blocks, 0 ); blocks += 2;
+		if (!in) {
+			break;
+		}
+		if ( len > (unsigned) (file.end - in) )
+		{
+			set_warning( "File data missing" );
+			len = file.end - in;
+		}
+		//dprintf( "addr: $%04X, len: $%04X\n", addr, len );
+		if ( addr < core.ram_addr && addr >= 0x400 ) // several tracks use low data
+			dprintf( "Block addr in ROM\n" );
+		memcpy( mem + addr, in, len );
+		
+		if ( file.end - blocks < 8 )
+		{
+			set_warning( "File data missing" );
+			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, passive, sizeof passive );
+	int const play_addr = get_be16( more_data + 4 );
+	if ( play_addr )
+	{
+		memcpy( mem, active, sizeof active );
+		mem 9 = play_addr;
+		mem 10 = play_addr >> 8;
+	}
+	mem 2 = init;
+	mem 3 = init >> 8;
+	
+	mem 0x38 = 0xFB; // Put EI at interrupt vector (followed by RET)
+	
+	// start at spectrum speed
+	change_clock_rate( spectrum_clock );
+	set_tempo( tempo() );
+	
+	Ay_Core::registers_t r = { };
+	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;
+	
+	core.start_track( r, play_addr );
+	
+	return blargg_ok;
+}
+
+blargg_err_t Ay_Emu::run_clocks( blip_time_t& duration, int )
+{
+	core.end_frame( &duration );
+	return blargg_ok;
+}
+
+inline void Ay_Emu::enable_cpc()
+{
+	change_clock_rate( cpc_clock );
+	set_tempo( tempo() );
+}
+
+void Ay_Emu::enable_cpc_( void* data )
+{
+	STATIC_CAST(Ay_Emu*,data)->enable_cpc();
+}
+
+blargg_err_t Ay_Emu::hash_( Hash_Function& out ) const
+{
+	hash_ay_file( file, out );
+	return blargg_ok;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ay_Emu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Blip_Buffer.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Blip_Buffer.cpp Changed

@@ -1,509 +1,509 @@
-// Blip_Buffer 0.4.0. http://www.slack.net/~ant/
-
-#include "Blip_Buffer.h"
-
-#include <math.h>
-
-/* Copyright (C) 2003-2008 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"
-
-//// Blip_Buffer
-
-Blip_Buffer::Blip_Buffer()
-{
-	factor_ = UINT_MAX/2 + 1;
-	buffer_ = NULL;
-	buffer_center_ = NULL;
-	buffer_size_ = 0;
-	sample_rate_ = 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
-		int i = -0x7FFFFFFE;
-		assert( (i >> 1) == -0x3FFFFFFF );
-		
-		// casting truncates and sign-extends
-		i = 0x18000;
-		assert( (BOOST::int16_t) i == -0x8000 );
-	#endif
-	
-	clear();
-}
-
-Blip_Buffer::~Blip_Buffer()
-{
-	free( buffer_ );
-}
-
-void Blip_Buffer::clear()
-{
-	bool const entire_buffer = true;
-	
-	offset_ = 0;
-	reader_accum_ = 0;
-	modified_ = false;
-	
-	if ( buffer_ )
-	{
-		int count = (entire_buffer ? buffer_size_ : samples_avail());
-		memset( buffer_, 0, (count + blip_buffer_extra_) * sizeof (delta_t) );
-	}
-}
-
-blargg_err_t Blip_Buffer::set_sample_rate( int new_rate, int msec )
-{
-	// Limit to maximum size that resampled time can represent
-	int max_size = (((blip_resampled_time_t) -1) >> BLIP_BUFFER_ACCURACY) -
-			blip_buffer_extra_ - 64; // TODO: -64 isn't needed
-	int new_size = (new_rate * (msec + 1) + 999) / 1000;
-	if ( new_size > max_size )
-		new_size = max_size;
-	
-	// Resize buffer
-	if ( buffer_size_ != new_size )
-	{
-		//dprintf( "%d \n", (new_size + blip_buffer_extra_) * sizeof *buffer_ );
-		void* p = realloc( buffer_, (new_size + blip_buffer_extra_) * sizeof *buffer_ );
-		CHECK_ALLOC( p );
-		buffer_ = (delta_t*) p;
-		buffer_center_ = buffer_ + BLIP_MAX_QUALITY/2;
-		buffer_size_ = new_size;
-	}
-	
-	// Update sample_rate and things that depend on it
-	sample_rate_ = new_rate;
-	length_ = new_size * 1000 / new_rate - 1;
-	if ( clock_rate_ )
-		clock_rate( clock_rate_ );
-	bass_freq( bass_freq_ );
-	
-	clear();
-	
-	return blargg_ok;
-}
-
-blip_resampled_time_t Blip_Buffer::clock_rate_factor( int rate ) const
-{
-	double ratio = (double) sample_rate_ / rate;
-	int factor = (int) floor( ratio * (1 << 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 && sample_rate_ )
-	{
-		shift = 13;
-		int f = (freq << 16) / sample_rate_;
-		while ( (f >>= 1) != 0 && --shift ) { }
-	}
-	bass_shift_ = shift;
-}
-
-void Blip_Buffer::end_frame( blip_time_t t )
-{
-	offset_ += t * factor_;
-	assert( samples_avail() <= (int) buffer_size_ ); // fails if time is past end of buffer
-}
-
-int Blip_Buffer::count_samples( blip_time_t t ) const
-{
-	blip_resampled_time_t last_sample = resampled_time( t ) >> BLIP_BUFFER_ACCURACY;
-	blip_resampled_time_t first_sample = offset_ >> BLIP_BUFFER_ACCURACY;
-	return (int) (last_sample - first_sample);
-}
-
-blip_time_t Blip_Buffer::count_clocks( int count ) const
-{
-	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( int count )
-{
-	if ( count )
-	{
-		remove_silence( count );
-		
-		// copy remaining samples to beginning and clear old samples
-		int remain = samples_avail() + blip_buffer_extra_;
-		memmove( buffer_, buffer_ + count, remain * sizeof *buffer_ );
-		memset( buffer_ + remain, 0, count * sizeof *buffer_ );
-	}
-}
-
-int Blip_Buffer::read_samples( blip_sample_t out_ , int max_samples, bool stereo )
-{
-	int count = samples_avail();
-	if ( count > max_samples )
-		count = max_samples;
-	
-	if ( count )
-	{
-		int const bass = highpass_shift();
-		delta_t const* reader = read_pos() + count;
-		int reader_sum = integrator();
-		
-		blip_sample_t* BLARGG_RESTRICT out = out_ + count;
-		if ( stereo )
-			out += count;
-		int offset = -count;
-		
-		if ( !stereo )
-		{
-			do
-			{
-				int s = reader_sum >> delta_bits;
-				
-				reader_sum -= reader_sum >> bass;
-				reader_sum += reader offset;
-				
-				BLIP_CLAMP( s, s );
-				out offset = (blip_sample_t) s;
-			}
-			while ( ++offset );
-		}
-		else
-		{
-			do
-			{
-				int s = reader_sum >> delta_bits;
-				
-				reader_sum -= reader_sum >> bass;
-				reader_sum += reader offset;
-				
-				BLIP_CLAMP( s, s );
-				out offset * 2 = (blip_sample_t) s;
-			}
-			while ( ++offset );
-		}
-		
-		set_integrator( reader_sum );
-		
-		remove_samples( count );
-	}
-	return count;
-}
-
-void Blip_Buffer::mix_samples( blip_sample_t const in , int count )
-{
-	delta_t* out = buffer_center_ + (offset_ >> BLIP_BUFFER_ACCURACY);
-	
-	int const sample_shift = blip_sample_bits - 16;
-	int prev = 0;
-	while ( --count >= 0 )
-	{
-		int s = *in++ << sample_shift;
-		*out += s - prev;
-		prev = s;
-		++out;
-	}
-	*out -= prev;
-}
-
-void Blip_Buffer::save_state( blip_buffer_state_t* out )
-{
-	assert( samples_avail() == 0 );
-	out->offset_ = offset_;
-	out->reader_accum_ = reader_accum_;
-	memcpy( out->buf, &buffer_ offset_ >> BLIP_BUFFER_ACCURACY, sizeof out->buf );
-}
-
-void Blip_Buffer::load_state( blip_buffer_state_t const& in )
-{
-	clear();
-	
-	offset_ = in.offset_;
-	reader_accum_ = in.reader_accum_;
-	memcpy( buffer_, in.buf, sizeof in.buf );
-}
-
-
-//// Blip_Synth_
-
-Blip_Synth_Fast_::Blip_Synth_Fast_()
-{
-	buf = NULL;
-	last_amp = 0;
-	delta_factor = 0;
-}
-
-void Blip_Synth_Fast_::volume_unit( double new_unit )
-{
-	delta_factor = int (new_unit * (1 << blip_sample_bits) + 0.5);
-}
-
-#if BLIP_BUFFER_FAST
-
-void blip_eq_t::generate( float* out, int count ) const { }
-
-#else
-
-Blip_Synth_::Blip_Synth_( short p , int w ) :
-	phases( p ),
-	width( w )
-{
-	volume_unit_ = 0.0;
-	kernel_unit = 0;
-	buf = NULL;
-	last_amp = 0;
-	delta_factor = 0;
-}
-
-#undef PI
-#define PI 3.1415926535897932384626433832795029
-
-// Generates right half of sinc kernel (including center point) with cutoff at
-// sample rate / 2 / oversample. Frequency response at cutoff frequency is
-// treble dB (-6=0.5,-12=0.25). Mid controls frequency that rolloff begins at,
-// cut * sample rate / 2.
-static void gen_sinc( float out , int out_size, double oversample,
-		double treble, double mid )
-{
-	if ( mid > 0.9999 ) mid = 0.9999;
-	if ( treble < -300.0 ) treble = -300.0;
-	if ( treble > 5.0 ) treble = 5.0;
-	
-	double const maxh = 4096.0;
-	double rolloff = pow( 10.0, 1.0 / (maxh * 20.0) * treble / (1.0 - mid) );
-	double const pow_a_n = pow( rolloff, maxh - maxh * mid );
-	double const to_angle = PI / maxh / oversample;
-	for ( int i = 1; i < out_size; i++ )
-	{
-		double angle = i * to_angle;
-		double c = rolloff * cos( angle * maxh - angle ) -
-		 cos( angle * maxh );
-		double cos_nc_angle = cos( angle * maxh * mid );
-		double cos_nc1_angle = cos( angle * maxh * mid - 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
-	}
-	
-	// Approximate center by looking at two points to right. Much simpler
-	// and more reliable than trying to calculate it properly.
-	out 0 = out 1 + 0.5 * (out 1 - out 2);
-}
-
-// Gain is 1-2800 for beta of 0-10, instead of 1.0 as it should be, but
-// this is corrected by normalization in treble_eq().
-static void kaiser_window( float io , int count, float beta )
-{
-	int const accuracy = 10;
-	
-	float const beta2 = beta * beta;
-	float const step = (float) 0.5 / count;
-	float pos = (float) 0.5;
-	for ( float* const end = io + count; io < end; ++io )
-	{
-		float x = (pos - pos*pos) * beta2;
-		float u = x;
-		float k = 1;
-		float n = 2;
-		
-		// Keep refining until adjustment becomes small
-		do
-		{
-			u *= x / (n * n);
-			n += 1;
-			k += u;
-		}
-		while ( k <= u * (1 << accuracy) );
-		
-		pos += step;
-		*io *= k;
-	}
-}
-
-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 cutoff_adj = blip_res * 2.25 / count + 0.85;
-	if ( cutoff_adj < 1.02 )
-		cutoff_adj = 1.02;
-	double half_rate = sample_rate * 0.5;
-	if ( cutoff_freq )
-		cutoff_adj = half_rate / cutoff_freq;
-	double cutoff = rolloff_freq * cutoff_adj / half_rate;
-	
-	gen_sinc( out, count, oversample * cutoff_adj, treble, cutoff );
-	
-	kaiser_window( out, count, kaiser );
-}
-
-void Blip_Synth_::treble_eq( blip_eq_t const& eq )
-{
-	// Generate right half of kernel
-	int const half_size = blip_eq_t::calc_count( width );
-	float fimpulse blip_res / 2 * (BLIP_MAX_QUALITY - 1) + 1;
-	eq.generate( fimpulse, half_size );
-	
-	int i;
-	
-	// Find rescale factor. Summing from small to large (right to left)
-	// reduces error.
-	double total = 0.0;
-	for ( i = half_size; --i > 0; )
-		total += fimpulse i;
-	total = total * 2.0 + fimpulse 0;
-	
-	//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 / total;
-	kernel_unit = (int) base_unit;
-	
-	// Integrate, first difference, rescale, convert to int
-	double sum = 0;
-	double next = 0;
-	int const size = impulses_size();
-	for ( i = 0; i < size; i++ )
-	{
-		int j = (half_size - 1) - i;
-		
-		if ( i >= blip_res )
-			sum += fimpulse j + blip_res;
-		
-		// goes slightly past center, so it needs a little mirroring
-		next += fimpulse j < 0 ? -j : j;
-		
-		// calculate unintereleved index
-		int x = (~i & (blip_res - 1)) * (width >> 1) + (i >> BLIP_PHASE_BITS);
-		assert( (unsigned) x < (unsigned) size );
-		
-		// flooring separately virtually eliminates error
-		phases x = (short) (int)
-				(floor( sum * rescale + 0.5 ) - floor( next * rescale + 0.5 ));
-		//phases x = (short) (int)
-		// floor( sum * rescale - next * rescale + 0.5 );
-	}
-	
-	adjust_impulse();
-	
-	// volume might require rescaling
-	double vol = volume_unit_;
-	if ( vol )
-	{
-		volume_unit_ = 0.0;
-		volume_unit( vol );
-	}
-}
-
-void Blip_Synth_::adjust_impulse()
-{
-	int const size = impulses_size();
-	int const half_width = width / 2;
-	
-	// Sum each phase as would be done when synthesizing, and correct
-	// any that don't add up to exactly kernel_half.
-	for ( int phase = blip_res / 2; --phase >= 0; )
-	{
-		int const fwd = phase * half_width;
-		int const rev = size - half_width - fwd;
-		
-		int error = kernel_unit;
-		for ( int i = half_width; --i >= 0; )
-		{
-			error += phases fwd + i;
-			error += phases rev + i;
-		}
-		phases fwd + half_width - 1 -= (short) error;
-		
-		// Error shouldn't occur now with improved calculation
-		//if ( error ) printf( "error: %ld\n", error );
-	}
-	
-	#if 0
-		for ( int i = 0; i < blip_res; i++, printf( "\n" ) )
-			for ( int j = 0; j < width / 2; j++ )
-				printf( "%5d,", (int) -phases j + width/2 * i );
-	#endif
-}
-
-void Blip_Synth_::rescale_kernel( int shift )
-{
-	// Keep values positive to avoid round-towards-zero of sign-preserving
-	// right shift for negative values.
-	int const keep_positive = 0x8000 + (1 << (shift - 1));
-	
-	int const half_width = width / 2;
-	for ( int phase = blip_res; --phase >= 0; )
-	{
-		int const fwd = phase * half_width;
-		
-		// Integrate, rescale, then differentiate again.
-		// If differences are rescaled directly, more error results.
-		int sum = keep_positive;
-		for ( int i = 0; i < half_width; i++ )
-		{
-			int prev = sum;
-			sum += phases fwd + i;
-			phases fwd + i = (sum >> shift) - (prev >> shift);
-		}
-	}
-	
-	adjust_impulse();
-}
-
-void Blip_Synth_::volume_unit( double new_unit )
-{
-	if ( volume_unit_ != new_unit )
-	{
-		// use default eq if it hasn't been set yet
-		if ( !kernel_unit )
-			treble_eq( -8.0 );
-		
-		// Factor that kernel must be multiplied by
-		volume_unit_ = new_unit;
-		double factor = new_unit * (1 << blip_sample_bits) / kernel_unit;
-		
-		if ( factor > 0.0 )
-		{
-			// If factor is low, reduce amplitude of kernel itself
-			int shift = 0;
-			while ( factor < 2.0 )
-			{
-				shift++;
-				factor *= 2.0;
-			}
-			
-			if ( shift )
-			{
-				kernel_unit >>= shift;
-				assert( kernel_unit > 0 ); // fails if volume unit is too low
-				
-				rescale_kernel( shift );
-			}
-		}
-		
-		delta_factor = -(int) floor( factor + 0.5 );
-		//printf( "delta_factor: %d, kernel_unit: %d\n", delta_factor, kernel_unit );
-	}
-}
-#endif
+// Blip_Buffer $vers. http://www.slack.net/~ant/
+
+#include "Blip_Buffer.h"
+
+#include <math.h>
+
+/* Copyright (C) 2003-2008 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"
+
+//// Blip_Buffer
+
+Blip_Buffer::Blip_Buffer()
+{
+	factor_ = UINT_MAX/2 + 1;
+	buffer_ = NULL;
+	buffer_center_ = NULL;
+	buffer_size_ = 0;
+	sample_rate_ = 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
+		int i = -0x7FFFFFFE;
+		assert( (i >> 1) == -0x3FFFFFFF );
+		
+		// casting truncates and sign-extends
+		i = 0x18000;
+		assert( (BOOST::int16_t) i == -0x8000 );
+	#endif
+	
+	clear();
+}
+
+Blip_Buffer::~Blip_Buffer()
+{
+	free( buffer_ );
+}
+
+void Blip_Buffer::clear()
+{
+	bool const entire_buffer = true;
+	
+	offset_ = 0;
+	reader_accum_ = 0;
+	modified_ = false;
+	
+	if ( buffer_ )
+	{
+		int count = (entire_buffer ? buffer_size_ : samples_avail());
+		memset( buffer_, 0, (count + blip_buffer_extra_) * sizeof (delta_t) );
+	}
+}
+
+blargg_err_t Blip_Buffer::set_sample_rate( int new_rate, int msec )
+{
+	// Limit to maximum size that resampled time can represent
+	int max_size = (((blip_resampled_time_t) -1) >> BLIP_BUFFER_ACCURACY) -
+			blip_buffer_extra_ - 64; // TODO: -64 isn't needed
+	int new_size = (new_rate * (msec + 1) + 999) / 1000;
+	if ( new_size > max_size )
+		new_size = max_size;
+	
+	// Resize buffer
+	if ( buffer_size_ != new_size )
+	{
+		//dprintf( "%d \n", (new_size + blip_buffer_extra_) * sizeof *buffer_ );
+		void* p = realloc( buffer_, (new_size + blip_buffer_extra_) * sizeof *buffer_ );
+		CHECK_ALLOC( p );
+		buffer_ = (delta_t*) p;
+		buffer_center_ = buffer_ + BLIP_MAX_QUALITY/2;
+		buffer_size_ = new_size;
+	}
+	
+	// Update sample_rate and things that depend on it
+	sample_rate_ = new_rate;
+	length_ = new_size * 1000 / new_rate - 1;
+	if ( clock_rate_ )
+		clock_rate( clock_rate_ );
+	bass_freq( bass_freq_ );
+	
+	clear();
+	
+	return blargg_ok;
+}
+
+blip_resampled_time_t Blip_Buffer::clock_rate_factor( int rate ) const
+{
+	double ratio = (double) sample_rate_ / rate;
+	int factor = (int) floor( ratio * (1 << 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 && sample_rate_ )
+	{
+		shift = 13;
+		int f = (freq << 16) / sample_rate_;
+		while ( (f >>= 1) != 0 && --shift ) { }
+	}
+	bass_shift_ = shift;
+}
+
+void Blip_Buffer::end_frame( blip_time_t t )
+{
+	offset_ += t * factor_;
+	assert( samples_avail() <= (int) buffer_size_ ); // fails if time is past end of buffer
+}
+
+int Blip_Buffer::count_samples( blip_time_t t ) const
+{
+	blip_resampled_time_t last_sample = resampled_time( t ) >> BLIP_BUFFER_ACCURACY;
+	blip_resampled_time_t first_sample = offset_ >> BLIP_BUFFER_ACCURACY;
+	return (int) (last_sample - first_sample);
+}
+
+blip_time_t Blip_Buffer::count_clocks( int count ) const
+{
+	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( int count )
+{
+	if ( count )
+	{
+		remove_silence( count );
+		
+		// copy remaining samples to beginning and clear old samples
+		int remain = samples_avail() + blip_buffer_extra_;
+		memmove( buffer_, buffer_ + count, remain * sizeof *buffer_ );
+		memset( buffer_ + remain, 0, count * sizeof *buffer_ );
+	}
+}
+
+int Blip_Buffer::read_samples( blip_sample_t out_ , int max_samples, bool stereo )
+{
+	int count = samples_avail();
+	if ( count > max_samples )
+		count = max_samples;
+	
+	if ( count )
+	{
+		int const bass = highpass_shift();
+		delta_t const* reader = read_pos() + count;
+		int reader_sum = integrator();
+		
+		blip_sample_t* BLARGG_RESTRICT out = out_ + count;
+		if ( stereo )
+			out += count;
+		int offset = -count;
+		
+		if ( !stereo )
+		{
+			do
+			{
+				int s = reader_sum >> delta_bits;
+				
+				reader_sum -= reader_sum >> bass;
+				reader_sum += reader offset;
+				
+				BLIP_CLAMP( s, s );
+				out offset = (blip_sample_t) s;
+			}
+			while ( ++offset );
+		}
+		else
+		{
+			do
+			{
+				int s = reader_sum >> delta_bits;
+				
+				reader_sum -= reader_sum >> bass;
+				reader_sum += reader offset;
+				
+				BLIP_CLAMP( s, s );
+				out offset * 2 = (blip_sample_t) s;
+			}
+			while ( ++offset );
+		}
+		
+		set_integrator( reader_sum );
+		
+		remove_samples( count );
+	}
+	return count;
+}
+
+void Blip_Buffer::mix_samples( blip_sample_t const in , int count )
+{
+	delta_t* out = buffer_center_ + (offset_ >> BLIP_BUFFER_ACCURACY);
+	
+	int const sample_shift = blip_sample_bits - 16;
+	int prev = 0;
+	while ( --count >= 0 )
+	{
+		int s = *in++ << sample_shift;
+		*out += s - prev;
+		prev = s;
+		++out;
+	}
+	*out -= prev;
+}
+
+void Blip_Buffer::save_state( blip_buffer_state_t* out )
+{
+	assert( samples_avail() == 0 );
+	out->offset_ = offset_;
+	out->reader_accum_ = reader_accum_;
+	memcpy( out->buf, &buffer_ offset_ >> BLIP_BUFFER_ACCURACY, sizeof out->buf );
+}
+
+void Blip_Buffer::load_state( blip_buffer_state_t const& in )
+{
+	clear();
+	
+	offset_ = in.offset_;
+	reader_accum_ = in.reader_accum_;
+	memcpy( buffer_, in.buf, sizeof in.buf );
+}
+
+
+//// Blip_Synth_
+
+Blip_Synth_Fast_::Blip_Synth_Fast_()
+{
+	buf = NULL;
+	last_amp = 0;
+	delta_factor = 0;
+}
+
+void Blip_Synth_Fast_::volume_unit( double new_unit )
+{
+	delta_factor = int (new_unit * (1 << blip_sample_bits) + 0.5);
+}
+
+#if BLIP_BUFFER_FAST
+
+void blip_eq_t::generate( float* out, int count ) const { }
+
+#else
+
+Blip_Synth_::Blip_Synth_( short p , int w ) :
+	phases( p ),
+	width( w )
+{
+	volume_unit_ = 0.0;
+	kernel_unit = 0;
+	buf = NULL;
+	last_amp = 0;
+	delta_factor = 0;
+}
+
+#undef PI
+#define PI 3.1415926535897932384626433832795029
+
+// Generates right half of sinc kernel (including center point) with cutoff at
+// sample rate / 2 / oversample. Frequency response at cutoff frequency is
+// treble dB (-6=0.5,-12=0.25). Mid controls frequency that rolloff begins at,
+// cut * sample rate / 2.
+static void gen_sinc( float out , int out_size, double oversample,
+		double treble, double mid )
+{
+	if ( mid > 0.9999 ) mid = 0.9999;
+	if ( treble < -300.0 ) treble = -300.0;
+	if ( treble > 5.0 ) treble = 5.0;
+	
+	double const maxh = 4096.0;
+	double rolloff = pow( 10.0, 1.0 / (maxh * 20.0) * treble / (1.0 - mid) );
+	double const pow_a_n = pow( rolloff, maxh - maxh * mid );
+	double const to_angle = PI / maxh / oversample;
+	for ( int i = 1; i < out_size; i++ )
+	{
+		double angle = i * to_angle;
+		double c = rolloff * cos( angle * maxh - angle ) -
+		 cos( angle * maxh );
+		double cos_nc_angle = cos( angle * maxh * mid );
+		double cos_nc1_angle = cos( angle * maxh * mid - 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
+	}
+	
+	// Approximate center by looking at two points to right. Much simpler
+	// and more reliable than trying to calculate it properly.
+	out 0 = out 1 + 0.5 * (out 1 - out 2);
+}
+
+// Gain is 1-2800 for beta of 0-10, instead of 1.0 as it should be, but
+// this is corrected by normalization in treble_eq().
+static void kaiser_window( float io , int count, float beta )
+{
+	int const accuracy = 10;
+	
+	float const beta2 = beta * beta;
+	float const step = (float) 0.5 / count;
+	float pos = (float) 0.5;
+	for ( float* const end = io + count; io < end; ++io )
+	{
+		float x = (pos - pos*pos) * beta2;
+		float u = x;
+		float k = 1;
+		float n = 2;
+		
+		// Keep refining until adjustment becomes small
+		do
+		{
+			u *= x / (n * n);
+			n += 1;
+			k += u;
+		}
+		while ( k <= u * (1 << accuracy) );
+		
+		pos += step;
+		*io *= k;
+	}
+}
+
+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 cutoff_adj = blip_res * 2.25 / count + 0.85;
+	if ( cutoff_adj < 1.02 )
+		cutoff_adj = 1.02;
+	double half_rate = sample_rate * 0.5;
+	if ( cutoff_freq )
+		cutoff_adj = half_rate / cutoff_freq;
+	double cutoff = rolloff_freq * cutoff_adj / half_rate;
+	
+	gen_sinc( out, count, oversample * cutoff_adj, treble, cutoff );
+	
+	kaiser_window( out, count, kaiser );
+}
+
+void Blip_Synth_::treble_eq( blip_eq_t const& eq )
+{
+	// Generate right half of kernel
+	int const half_size = blip_eq_t::calc_count( width );
+	float fimpulse blip_res / 2 * (BLIP_MAX_QUALITY - 1) + 1;
+	eq.generate( fimpulse, half_size );
+	
+	int i;
+	
+	// Find rescale factor. Summing from small to large (right to left)
+	// reduces error.
+	double total = 0.0;
+	for ( i = half_size; --i > 0; )
+		total += fimpulse i;
+	total = total * 2.0 + fimpulse 0;
+	
+	//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 / total;
+	kernel_unit = (int) base_unit;
+	
+	// Integrate, first difference, rescale, convert to int
+	double sum = 0;
+	double next = 0;
+	int const size = impulses_size();
+	for ( i = 0; i < size; i++ )
+	{
+		int j = (half_size - 1) - i;
+		
+		if ( i >= blip_res )
+			sum += fimpulse j + blip_res;
+		
+		// goes slightly past center, so it needs a little mirroring
+		next += fimpulse j < 0 ? -j : j;
+		
+		// calculate unintereleved index
+		int x = (~i & (blip_res - 1)) * (width >> 1) + (i >> BLIP_PHASE_BITS);
+		assert( (unsigned) x < (unsigned) size );
+		
+		// flooring separately virtually eliminates error
+		phases x = (short) (int)
+				(floor( sum * rescale + 0.5 ) - floor( next * rescale + 0.5 ));
+		//phases x = (short) (int)
+		// floor( sum * rescale - next * rescale + 0.5 );
+	}
+	
+	adjust_impulse();
+	
+	// volume might require rescaling
+	double vol = volume_unit_;
+	if ( vol )
+	{
+		volume_unit_ = 0.0;
+		volume_unit( vol );
+	}
+}
+
+void Blip_Synth_::adjust_impulse()
+{
+	int const size = impulses_size();
+	int const half_width = width / 2;
+	
+	// Sum each phase as would be done when synthesizing, and correct
+	// any that don't add up to exactly kernel_half.
+	for ( int phase = blip_res / 2; --phase >= 0; )
+	{
+		int const fwd = phase * half_width;
+		int const rev = size - half_width - fwd;
+		
+		int error = kernel_unit;
+		for ( int i = half_width; --i >= 0; )
+		{
+			error += phases fwd + i;
+			error += phases rev + i;
+		}
+		phases fwd + half_width - 1 -= (short) error;
+		
+		// Error shouldn't occur now with improved calculation
+		//if ( error ) printf( "error: %ld\n", error );
+	}
+	
+	#if 0
+		for ( int i = 0; i < blip_res; i++, printf( "\n" ) )
+			for ( int j = 0; j < width / 2; j++ )
+				printf( "%5d,", (int) -phases j + width/2 * i );
+	#endif
+}
+
+void Blip_Synth_::rescale_kernel( int shift )
+{
+	// Keep values positive to avoid round-towards-zero of sign-preserving
+	// right shift for negative values.
+	int const keep_positive = 0x8000 + (1 << (shift - 1));
+	
+	int const half_width = width / 2;
+	for ( int phase = blip_res; --phase >= 0; )
+	{
+		int const fwd = phase * half_width;
+		
+		// Integrate, rescale, then differentiate again.
+		// If differences are rescaled directly, more error results.
+		int sum = keep_positive;
+		for ( int i = 0; i < half_width; i++ )
+		{
+			int prev = sum;
+			sum += phases fwd + i;
+			phases fwd + i = (sum >> shift) - (prev >> shift);
+		}
+	}
+	
+	adjust_impulse();
+}
+
+void Blip_Synth_::volume_unit( double new_unit )
+{
+	if ( volume_unit_ != new_unit )
+	{
+		// use default eq if it hasn't been set yet
+		if ( !kernel_unit )
+			treble_eq( -8.0 );
+		
+		// Factor that kernel must be multiplied by
+		volume_unit_ = new_unit;
+		double factor = new_unit * (1 << blip_sample_bits) / kernel_unit;
+		
+		if ( factor > 0.0 )
+		{
+			// If factor is low, reduce amplitude of kernel itself
+			int shift = 0;
+			while ( factor < 2.0 )
+			{
+				shift++;
+				factor *= 2.0;
+			}
+			
+			if ( shift )
+			{
+				kernel_unit >>= shift;
+				assert( kernel_unit > 0 ); // fails if volume unit is too low
+				
+				rescale_kernel( shift );
+			}
+		}
+		
+		delta_factor = -(int) floor( factor + 0.5 );
+		//printf( "delta_factor: %d, kernel_unit: %d\n", delta_factor, kernel_unit );
+	}
+}
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Blip_Buffer.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Blip_Buffer.h Changed

@@ -1,198 +1,198 @@
-// Band-limited sound synthesis buffer
-
-// Blip_Buffer 0.4.0
-#ifndef BLIP_BUFFER_H
-#define BLIP_BUFFER_H
-
-#include "blargg_common.h"
-#include "Blip_Buffer_impl.h"
-
-typedef int blip_time_t; // Source clocks in current time frame
-typedef BOOST::int16_t blip_sample_t; // 16-bit signed output sample
-int const blip_default_length = 1000 / 4; // Default Blip_Buffer length (1/4 second)
-
-
-//// Sample buffer for band-limited synthesis
-
-class Blip_Buffer : public Blip_Buffer_ {
-public:
-
-	// Sets output sample rate and resizes and clears sample buffer
-	blargg_err_t set_sample_rate( int samples_per_sec, int msec_length = blip_default_length );
-	
-	// Sets number of source time units per second
-	void clock_rate( int clocks_per_sec );
-	
-	// Clears buffer and removes all samples
-	void clear();
-	
-	// Use Blip_Synth to add waveform to buffer
-	
-	// Resamples to time t, then subtracts t from current time. Appends result of resampling
-	// to buffer for reading.
-	void end_frame( blip_time_t t );
-	
-	// Number of samples available for reading with read_samples()
-	int samples_avail() const;
-	
-	// Reads at most n samples to out 0 to n-1 and returns number actually read. If stereo
-	// is true, writes to out 0, out 2, out 4 etc. instead.
-	int read_samples( blip_sample_t out , int n, bool stereo = false );
-	
-// More features
-
-	// Sets flag that tells some Multi_Buffer types that sound was added to buffer,
-	// so they know that it needs to be mixed in. Only needs to be called once
-	// per time frame that sound was added. Not needed if not using Multi_Buffer.
-	void set_modified() { modified_ = true; }
-	
-	// Sets high-pass filter frequency, from 0 to 20000 Hz, where higher values reduce bass more
-	void bass_freq( int frequency );
-
-	int length() const; // Length of buffer in milliseconds
-	int sample_rate() const; // Current output sample rate
-	int clock_rate() const; // Number of source time units per second
-	int output_latency() const; // Number of samples delay from offset() to read_samples()
-	
-// Low-level features
-	
-	// Removes the first n samples
-	void remove_samples( int n );
-	
-	// Returns number of clocks needed until n samples will be available.
-	// If buffer cannot even hold n samples, returns number of clocks
-	// until buffer becomes full.
-	blip_time_t count_clocks( int n ) const;
-	
-	// Number of samples that should be mixed before calling end_frame( t )
-	int count_samples( blip_time_t t ) const;
-	
-	// Mixes n samples into buffer
-	void mix_samples( const blip_sample_t in , int n );
-
-// Resampled time (sorry, poor documentation right now)
-	
-	// Resampled time is fixed-point, in terms of output samples.
-	
-	// Converts clock count to resampled time
-	blip_resampled_time_t resampled_duration( int t ) const { return t * factor_; }
-	
-	// Converts clock time since beginning of current time frame to resampled time
-	blip_resampled_time_t resampled_time( blip_time_t t ) const { return t * factor_ + offset_; }
-	
-	// Returns factor that converts clock rate to resampled time
-	blip_resampled_time_t clock_rate_factor( int clock_rate ) const;
-	
-// State save/load
-
-	// Saves state, including high-pass filter and tails of last deltas.
-	// All samples must have been read from buffer before calling this
-	// (that is, samples_avail() must return 0).
-	void save_state( blip_buffer_state_t* out );
-	
-	// Loads state. State must have been saved from Blip_Buffer with same
-	// settings during same run of program; states can NOT be stored on disk.
-	// Clears buffer before loading state.
-	void load_state( const blip_buffer_state_t& in );
-
-private:
-	// noncopyable
-	Blip_Buffer( const Blip_Buffer& );
-	Blip_Buffer& operator = ( const Blip_Buffer& );
-
-// Implementation
-public:
-	BLARGG_DISABLE_NOTHROW
-	Blip_Buffer();
-	~Blip_Buffer();
-	void remove_silence( int n );
-};
-
-
-//// Adds amplitude changes to Blip_Buffer
-
-template<int quality,int range> class Blip_Synth;
-
-typedef Blip_Synth<8, 1> Blip_Synth_Fast; // faster, but less equalizer control
-typedef Blip_Synth<12,1> Blip_Synth_Norm; // good for most things
-typedef Blip_Synth<16,1> Blip_Synth_Good; // sharper filter cutoff
-
-template<int quality,int range>
-class Blip_Synth {
-public:
-
-	// Sets volume of amplitude delta unit
-	void volume( double v ) { impl.volume_unit( 1.0 / range * v ); }
-	
-	// Configures low-pass filter
-	void treble_eq( const blip_eq_t& eq ) { impl.treble_eq( eq ); }
-	
-	// Gets/sets default Blip_Buffer
-	Blip_Buffer* output() const { return impl.buf; }
-	void output( Blip_Buffer* b ) { impl.buf = b; impl.last_amp = 0; }
-	
-	// Extends waveform to time t at current amplitude, then changes its amplitude to a
-	// Using this requires a separate Blip_Synth for each waveform.
-	void update( blip_time_t t, int a );
-
-// Low-level interface
-	
-	// If no Blip_Buffer* is specified, uses one set by output() above
-	
-	// Adds amplitude transition at time t. Delta can be positive or negative.
-	// The actual change in amplitude is delta * volume.
-	void offset( blip_time_t t, int delta, Blip_Buffer* ) const;
-	void offset( blip_time_t t, int delta ) const { offset( t, delta, impl.buf ); }
-	
-	// Same as offset(), except code is inlined for higher performance
-	void offset_inline( blip_time_t t, int delta, Blip_Buffer* buf ) const { offset_resampled( buf->to_fixed( t ), delta, buf ); }
-	void offset_inline( blip_time_t t, int delta ) const { offset_resampled( impl.buf->to_fixed( t ), delta, impl.buf ); }
-	
-	// Works directly in terms of fractional output samples. Use resampled time functions in Blip_Buffer
-	// to convert clock counts to resampled time.
-	void offset_resampled( blip_resampled_time_t, int delta, Blip_Buffer* ) const;
-	
-// Implementation
-public:
-	BLARGG_DISABLE_NOTHROW
-
-private:
-#if BLIP_BUFFER_FAST
-	Blip_Synth_Fast_ impl;
-	typedef char coeff_t;
-#else
-	Blip_Synth_ impl;
-	typedef short coeff_t;
-	// Left halves of first difference of step response for each possible phase
-	coeff_t phases quality / 2 * blip_res;
-public:
-	Blip_Synth() : impl( phases, quality ) { }
-#endif
-};
-
-
-//// Low-pass equalization parameters
-
-class blip_eq_t {
-	double treble, kaiser;
-	int rolloff_freq, sample_rate, cutoff_freq;
-public:
-	// Logarithmic rolloff to treble dB at half sampling rate. Negative values reduce
-	// treble, small positive values (0 to 5.0) increase treble.
-	blip_eq_t( double treble_db = 0 );
-	
-	// See blip_buffer.txt
-	blip_eq_t( double treble, int rolloff_freq, int sample_rate, int cutoff_freq = 0,
-			double kaiser = 5.2 );
-	
-	// Generate center point and right half of impulse response
-	virtual void generate( float out , int count ) const;
-	virtual ~blip_eq_t() { }
-	
-	enum { oversample = blip_res };
-	static int calc_count( int quality ) { return (quality - 1) * (oversample / 2) + 1; }
-};
-
-#include "Blip_Buffer_impl2.h"
-
-#endif
+// Band-limited sound synthesis buffer
+
+// Blip_Buffer $vers
+#ifndef BLIP_BUFFER_H
+#define BLIP_BUFFER_H
+
+#include "blargg_common.h"
+#include "Blip_Buffer_impl.h"
+
+typedef int blip_time_t; // Source clocks in current time frame
+typedef BOOST::int16_t blip_sample_t; // 16-bit signed output sample
+int const blip_default_length = 1000 / 4; // Default Blip_Buffer length (1/4 second)
+
+
+//// Sample buffer for band-limited synthesis
+
+class Blip_Buffer : public Blip_Buffer_ {
+public:
+
+	// Sets output sample rate and resizes and clears sample buffer
+	blargg_err_t set_sample_rate( int samples_per_sec, int msec_length = blip_default_length );
+	
+	// Sets number of source time units per second
+	void clock_rate( int clocks_per_sec );
+	
+	// Clears buffer and removes all samples
+	void clear();
+	
+	// Use Blip_Synth to add waveform to buffer
+	
+	// Resamples to time t, then subtracts t from current time. Appends result of resampling
+	// to buffer for reading.
+	void end_frame( blip_time_t t );
+	
+	// Number of samples available for reading with read_samples()
+	int samples_avail() const;
+	
+	// Reads at most n samples to out 0 to n-1 and returns number actually read. If stereo
+	// is true, writes to out 0, out 2, out 4 etc. instead.
+	int read_samples( blip_sample_t out , int n, bool stereo = false );
+	
+// More features
+
+	// Sets flag that tells some Multi_Buffer types that sound was added to buffer,
+	// so they know that it needs to be mixed in. Only needs to be called once
+	// per time frame that sound was added. Not needed if not using Multi_Buffer.
+	void set_modified() { modified_ = true; }
+	
+	// Sets high-pass filter frequency, from 0 to 20000 Hz, where higher values reduce bass more
+	void bass_freq( int frequency );
+
+	int length() const; // Length of buffer in milliseconds
+	int sample_rate() const; // Current output sample rate
+	int clock_rate() const; // Number of source time units per second
+	int output_latency() const; // Number of samples delay from offset() to read_samples()
+	
+// Low-level features
+	
+	// Removes the first n samples
+	void remove_samples( int n );
+	
+	// Returns number of clocks needed until n samples will be available.
+	// If buffer cannot even hold n samples, returns number of clocks
+	// until buffer becomes full.
+	blip_time_t count_clocks( int n ) const;
+	
+	// Number of samples that should be mixed before calling end_frame( t )
+	int count_samples( blip_time_t t ) const;
+	
+	// Mixes n samples into buffer
+	void mix_samples( const blip_sample_t in , int n );
+
+// Resampled time (sorry, poor documentation right now)
+	
+	// Resampled time is fixed-point, in terms of output samples.
+	
+	// Converts clock count to resampled time
+	blip_resampled_time_t resampled_duration( int t ) const { return t * factor_; }
+	
+	// Converts clock time since beginning of current time frame to resampled time
+	blip_resampled_time_t resampled_time( blip_time_t t ) const { return t * factor_ + offset_; }
+	
+	// Returns factor that converts clock rate to resampled time
+	blip_resampled_time_t clock_rate_factor( int clock_rate ) const;
+	
+// State save/load
+
+	// Saves state, including high-pass filter and tails of last deltas.
+	// All samples must have been read from buffer before calling this
+	// (that is, samples_avail() must return 0).
+	void save_state( blip_buffer_state_t* out );
+	
+	// Loads state. State must have been saved from Blip_Buffer with same
+	// settings during same run of program; states can NOT be stored on disk.
+	// Clears buffer before loading state.
+	void load_state( const blip_buffer_state_t& in );
+
+private:
+	// noncopyable
+	Blip_Buffer( const Blip_Buffer& );
+	Blip_Buffer& operator = ( const Blip_Buffer& );
+
+// Implementation
+public:
+	BLARGG_DISABLE_NOTHROW
+	Blip_Buffer();
+	~Blip_Buffer();
+	void remove_silence( int n );
+};
+
+
+//// Adds amplitude changes to Blip_Buffer
+
+template<int quality,int range> class Blip_Synth;
+
+typedef Blip_Synth<8, 1> Blip_Synth_Fast; // faster, but less equalizer control
+typedef Blip_Synth<12,1> Blip_Synth_Norm; // good for most things
+typedef Blip_Synth<16,1> Blip_Synth_Good; // sharper filter cutoff
+
+template<int quality,int range>
+class Blip_Synth {
+public:
+
+	// Sets volume of amplitude delta unit
+	void volume( double v ) { impl.volume_unit( 1.0 / range * v ); }
+	
+	// Configures low-pass filter
+	void treble_eq( const blip_eq_t& eq ) { impl.treble_eq( eq ); }
+	
+	// Gets/sets default Blip_Buffer
+	Blip_Buffer* output() const { return impl.buf; }
+	void output( Blip_Buffer* b ) { impl.buf = b; impl.last_amp = 0; }
+	
+	// Extends waveform to time t at current amplitude, then changes its amplitude to a
+	// Using this requires a separate Blip_Synth for each waveform.
+	void update( blip_time_t t, int a );
+
+// Low-level interface
+	
+	// If no Blip_Buffer* is specified, uses one set by output() above
+	
+	// Adds amplitude transition at time t. Delta can be positive or negative.
+	// The actual change in amplitude is delta * volume.
+	void offset( blip_time_t t, int delta, Blip_Buffer* ) const;
+	void offset( blip_time_t t, int delta ) const { offset( t, delta, impl.buf ); }
+	
+	// Same as offset(), except code is inlined for higher performance
+	void offset_inline( blip_time_t t, int delta, Blip_Buffer* buf ) const { offset_resampled( buf->to_fixed( t ), delta, buf ); }
+	void offset_inline( blip_time_t t, int delta ) const { offset_resampled( impl.buf->to_fixed( t ), delta, impl.buf ); }
+	
+	// Works directly in terms of fractional output samples. Use resampled time functions in Blip_Buffer
+	// to convert clock counts to resampled time.
+	void offset_resampled( blip_resampled_time_t, int delta, Blip_Buffer* ) const;
+	
+// Implementation
+public:
+	BLARGG_DISABLE_NOTHROW
+
+private:
+#if BLIP_BUFFER_FAST
+	Blip_Synth_Fast_ impl;
+	typedef char coeff_t;
+#else
+	Blip_Synth_ impl;
+	typedef short coeff_t;
+	// Left halves of first difference of step response for each possible phase
+	coeff_t phases quality / 2 * blip_res;
+public:
+	Blip_Synth() : impl( phases, quality ) { }
+#endif
+};
+
+
+//// Low-pass equalization parameters
+
+class blip_eq_t {
+	double treble, kaiser;
+	int rolloff_freq, sample_rate, cutoff_freq;
+public:
+	// Logarithmic rolloff to treble dB at half sampling rate. Negative values reduce
+	// treble, small positive values (0 to 5.0) increase treble.
+	blip_eq_t( double treble_db = 0 );
+	
+	// See blip_buffer.txt
+	blip_eq_t( double treble, int rolloff_freq, int sample_rate, int cutoff_freq = 0,
+			double kaiser = 5.2 );
+	
+	// Generate center point and right half of impulse response
+	virtual void generate( float out , int count ) const;
+	virtual ~blip_eq_t() { }
+	
+	enum { oversample = blip_res };
+	static int calc_count( int quality ) { return (quality - 1) * (oversample / 2) + 1; }
+};
+
+#include "Blip_Buffer_impl2.h"
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Blip_Buffer_impl.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Blip_Buffer_impl.h Changed

@@ -1,135 +1,135 @@
-// Internal stuff here to keep public header uncluttered
-
-// Blip_Buffer 0.4.0
-#ifndef BLIP_BUFFER_IMPL_H
-#define BLIP_BUFFER_IMPL_H
-
-typedef unsigned blip_resampled_time_t;
-
-#ifndef BLIP_MAX_QUALITY
-	#define BLIP_MAX_QUALITY 32
-#endif
-
-#ifndef BLIP_BUFFER_ACCURACY
-	#define BLIP_BUFFER_ACCURACY 16
-#endif
-
-#ifndef BLIP_PHASE_BITS
-	#define BLIP_PHASE_BITS 6
-#endif
-
-class blip_eq_t;
-class Blip_Buffer;
-
-#if BLIP_BUFFER_FAST
-	// linear interpolation needs 8 bits
-	#undef BLIP_PHASE_BITS
-	#define BLIP_PHASE_BITS 8
-	
-	#undef BLIP_MAX_QUALITY
-	#define BLIP_MAX_QUALITY 2
-#endif
-
-int const blip_res = 1 << BLIP_PHASE_BITS;
-int const blip_buffer_extra_ = BLIP_MAX_QUALITY + 2;
-
-class Blip_Buffer_ {
-public:
-// Writer
-	
-	typedef int clocks_t;
-	
-	// Properties of fixed-point sample position
-	typedef unsigned fixed_t; // unsigned for more range, optimized shifts
-	enum { fixed_bits = BLIP_BUFFER_ACCURACY }; // bits in fraction
-	enum { fixed_unit = 1 << fixed_bits }; // 1.0 samples
-
-	// Converts clock count to fixed-point sample position
-	fixed_t to_fixed( clocks_t t ) const { return t * factor_ + offset_; }
-	
-	// Deltas in buffer are fixed-point with this many fraction bits.
-	// Less than 16 for extra range.
-	enum { delta_bits = 14 };
-	
-	// Pointer to first committed delta sample
-	typedef int delta_t;
-	
-	// Pointer to delta corresponding to fixed-point sample position
-	delta_t* delta_at( fixed_t );
-	
-// Reader
-	
-	delta_t* read_pos() { return buffer_; }
-	
-	void clear_modified() { modified_ = false; }
-	int highpass_shift() const { return bass_shift_; }
-	int integrator() const { return reader_accum_; }
-	void set_integrator( int n ) { reader_accum_ = n; }
-	
-public: //friend class Tracked_Blip_Buffer; private:
-	bool modified() const { return modified_; }
-	void remove_silence( int count );
-	
-private:
-	unsigned factor_;
-	fixed_t offset_;
-	delta_t* buffer_center_;
-	int buffer_size_;
-	int reader_accum_;
-	int bass_shift_;
-	delta_t* buffer_;
-	int sample_rate_;
-	int clock_rate_;
-	int bass_freq_;
-	int length_;
-	bool modified_;
-	
-	friend class Blip_Buffer;
-};
-
-class Blip_Synth_Fast_ {
-public:
-	int delta_factor;
-	int last_amp;
-	Blip_Buffer* buf;
-	
-	void volume_unit( double );
-	void treble_eq( blip_eq_t const& ) { }
-	Blip_Synth_Fast_();
-};
-
-class Blip_Synth_ {
-public:
-	int delta_factor;
-	int last_amp;
-	Blip_Buffer* buf;
-	
-	void volume_unit( double );
-	void treble_eq( blip_eq_t const& );
-	Blip_Synth_( short phases , int width );
-private:
-	double volume_unit_;
-	short* const phases;
-	int const width;
-	int kernel_unit;
-	
-	void adjust_impulse();
-	void rescale_kernel( int shift );
-	int impulses_size() const { return blip_res / 2 * width; }
-};
-
-class blip_buffer_state_t
-{
-	blip_resampled_time_t offset_;
-	int reader_accum_;
-	int buf blip_buffer_extra_;
-	friend class Blip_Buffer;
-};
-
-inline Blip_Buffer_::delta_t* Blip_Buffer_::delta_at( fixed_t f )
-{
-	assert( (f >> fixed_bits) < (unsigned) buffer_size_ );
-	return buffer_center_ + (f >> fixed_bits);
-}
-
-#endif
+// Internal stuff here to keep public header uncluttered
+
+// Blip_Buffer $vers
+#ifndef BLIP_BUFFER_IMPL_H
+#define BLIP_BUFFER_IMPL_H
+
+typedef unsigned blip_resampled_time_t;
+
+#ifndef BLIP_MAX_QUALITY
+	#define BLIP_MAX_QUALITY 32
+#endif
+
+#ifndef BLIP_BUFFER_ACCURACY
+	#define BLIP_BUFFER_ACCURACY 16
+#endif
+
+#ifndef BLIP_PHASE_BITS
+	#define BLIP_PHASE_BITS 6
+#endif
+
+class blip_eq_t;
+class Blip_Buffer;
+
+#if BLIP_BUFFER_FAST
+	// linear interpolation needs 8 bits
+	#undef BLIP_PHASE_BITS
+	#define BLIP_PHASE_BITS 8
+	
+	#undef BLIP_MAX_QUALITY
+	#define BLIP_MAX_QUALITY 2
+#endif
+
+int const blip_res = 1 << BLIP_PHASE_BITS;
+int const blip_buffer_extra_ = BLIP_MAX_QUALITY + 2;
+
+class Blip_Buffer_ {
+public:
+// Writer
+	
+	typedef int clocks_t;
+	
+	// Properties of fixed-point sample position
+	typedef unsigned fixed_t; // unsigned for more range, optimized shifts
+	enum { fixed_bits = BLIP_BUFFER_ACCURACY }; // bits in fraction
+	enum { fixed_unit = 1 << fixed_bits }; // 1.0 samples
+
+	// Converts clock count to fixed-point sample position
+	fixed_t to_fixed( clocks_t t ) const { return t * factor_ + offset_; }
+	
+	// Deltas in buffer are fixed-point with this many fraction bits.
+	// Less than 16 for extra range.
+	enum { delta_bits = 14 };
+	
+	// Pointer to first committed delta sample
+	typedef int delta_t;
+	
+	// Pointer to delta corresponding to fixed-point sample position
+	delta_t* delta_at( fixed_t );
+	
+// Reader
+	
+	delta_t* read_pos() { return buffer_; }
+	
+	void clear_modified() { modified_ = false; }
+	int highpass_shift() const { return bass_shift_; }
+	int integrator() const { return reader_accum_; }
+	void set_integrator( int n ) { reader_accum_ = n; }
+	
+public: //friend class Tracked_Blip_Buffer; private:
+	bool modified() const { return modified_; }
+	void remove_silence( int count );
+	
+private:
+	unsigned factor_;
+	fixed_t offset_;
+	delta_t* buffer_center_;
+	int buffer_size_;
+	int reader_accum_;
+	int bass_shift_;
+	delta_t* buffer_;
+	int sample_rate_;
+	int clock_rate_;
+	int bass_freq_;
+	int length_;
+	bool modified_;
+	
+	friend class Blip_Buffer;
+};
+
+class Blip_Synth_Fast_ {
+public:
+	int delta_factor;
+	int last_amp;
+	Blip_Buffer* buf;
+	
+	void volume_unit( double );
+	void treble_eq( blip_eq_t const& ) { }
+	Blip_Synth_Fast_();
+};
+
+class Blip_Synth_ {
+public:
+	int delta_factor;
+	int last_amp;
+	Blip_Buffer* buf;
+	
+	void volume_unit( double );
+	void treble_eq( blip_eq_t const& );
+	Blip_Synth_( short phases , int width );
+private:
+	double volume_unit_;
+	short* const phases;
+	int const width;
+	int kernel_unit;
+	
+	void adjust_impulse();
+	void rescale_kernel( int shift );
+	int impulses_size() const { return blip_res / 2 * width; }
+};
+
+class blip_buffer_state_t
+{
+	blip_resampled_time_t offset_;
+	int reader_accum_;
+	int buf blip_buffer_extra_;
+	friend class Blip_Buffer;
+};
+
+inline Blip_Buffer_::delta_t* Blip_Buffer_::delta_at( fixed_t f )
+{
+	assert( (f >> fixed_bits) < (unsigned) buffer_size_ );
+	return buffer_center_ + (f >> fixed_bits);
+}
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Blip_Buffer_impl2.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Blip_Buffer_impl2.h Changed

@@ -1,282 +1,282 @@
-// Internal stuff here to keep public header uncluttered
-
-// Blip_Buffer 0.4.0
-#ifndef BLIP_BUFFER_IMPL2_H
-#define BLIP_BUFFER_IMPL2_H
-
-//// Compatibility
-
-BLARGG_DEPRECATED( int const blip_low_quality = 8; )
-BLARGG_DEPRECATED( int const blip_med_quality = 8; )
-BLARGG_DEPRECATED( int const blip_good_quality = 12; )
-BLARGG_DEPRECATED( int const blip_high_quality = 16; )
-
-BLARGG_DEPRECATED( int const blip_sample_max = 32767; )
-
-// Number of bits in raw sample that covers normal output range. Less than 32 bits to give
-// extra amplitude range. That is,
-// +1 << (blip_sample_bits-1) = +1.0
-// -1 << (blip_sample_bits-1) = -1.0
-int const blip_sample_bits = 30;
-
-//// BLIP_READER_
-
-//// Optimized reading from Blip_Buffer, for use in custom sample buffer or mixer
-
-// Begins reading from buffer. Name should be unique to the current {} block.
-#define BLIP_READER_BEGIN( name, blip_buffer ) \
-	const Blip_Buffer::delta_t* BLARGG_RESTRICT name##_reader_buf = (blip_buffer).read_pos();\
-	int name##_reader_accum = (blip_buffer).integrator()
-
-// Gets value to pass to BLIP_READER_NEXT()
-#define BLIP_READER_BASS( blip_buffer ) (blip_buffer).highpass_shift()
-
-// Constant value to use instead of BLIP_READER_BASS(), for slightly more optimal
-// code at the cost of having no bass_freq() functionality
-int const blip_reader_default_bass = 9;
-
-// Current sample as 16-bit signed value
-#define BLIP_READER_READ( name ) (name##_reader_accum >> (blip_sample_bits - 16))
-
-// Current raw sample in full internal resolution
-#define BLIP_READER_READ_RAW( name ) (name##_reader_accum)
-
-// Advances to next sample
-#define BLIP_READER_NEXT( name, bass ) \
-	(void) (name##_reader_accum += *name##_reader_buf++ - (name##_reader_accum >> (bass)))
-
-// Ends reading samples from buffer. The number of samples read must now be removed
-// using Blip_Buffer::remove_samples().
-#define BLIP_READER_END( name, blip_buffer ) \
-	(void) ((blip_buffer).set_integrator( name##_reader_accum ))
-
-#define BLIP_READER_ADJ_( name, offset ) (name##_reader_buf += offset)
-
-int const blip_reader_idx_factor = sizeof (Blip_Buffer::delta_t);
-
-#define BLIP_READER_NEXT_IDX_( name, bass, idx ) {\
-	name##_reader_accum -= name##_reader_accum >> (bass);\
-	name##_reader_accum += name##_reader_buf (idx);\
-}
-
-#define BLIP_READER_NEXT_RAW_IDX_( name, bass, idx ) {\
-	name##_reader_accum -= name##_reader_accum >> (bass);\
-	name##_reader_accum +=\
-			*(Blip_Buffer::delta_t const*) ((char const*) name##_reader_buf + (idx));\
-}
-
-//// BLIP_CLAMP
-
-#if defined (_M_IX86) || defined (_M_IA64) || defined (__i486__) || \
-		defined (__x86_64__) || defined (__ia64__) || defined (__i386__)
-	#define BLIP_X86 1
-	#define BLIP_CLAMP_( in ) in < -0x8000 || 0x7FFF < in
-#else
-	#define BLIP_CLAMP_( in ) (blip_sample_t) in != in
-#endif
-
-// Clamp sample to blip_sample_t range
-#define BLIP_CLAMP( sample, out )\
-	{ if ( BLIP_CLAMP_( (sample) ) ) (out) = ((sample) >> 31) ^ 0x7FFF; }
-
-
-//// Blip_Synth
-
-// (in >> sh & mask) * mul
-#define BLIP_SH_AND_MUL( in, sh, mask, mul ) \
-((int) (in) / ((1U << (sh)) / (mul)) & (unsigned) ((mask) * (mul)))
-
-// (T*) ptr + (off >> sh)
-#define BLIP_PTR_OFF_SH( T, ptr, off, sh ) \
-	((T*) (BLIP_SH_AND_MUL( off, sh, -1, sizeof (T) ) + (char*) (ptr)))
-
-template<int quality,int range>
-inline void Blip_Synth<quality,range>::offset_resampled( blip_resampled_time_t time,
-		int delta, Blip_Buffer* blip_buf ) const
-{
-#if BLIP_BUFFER_FAST
-	int const half_width = 1;
-#else
-	int const half_width = quality / 2;
-#endif
-	
-	Blip_Buffer::delta_t* BLARGG_RESTRICT buf = blip_buf->delta_at( time );
-	
-	delta *= impl.delta_factor;
-
-	int const phase_shift = BLIP_BUFFER_ACCURACY - BLIP_PHASE_BITS;
-	int const phase = (half_width & (half_width - 1)) ?
-		(int) BLIP_SH_AND_MUL( time, phase_shift, blip_res - 1, sizeof (coeff_t) ) * half_width :
-		(int) BLIP_SH_AND_MUL( time, phase_shift, blip_res - 1, sizeof (coeff_t) * half_width );
-	
-#if BLIP_BUFFER_FAST
-	int left = buf 0 + delta;
-	
-	// Kind of crappy, but doing shift after multiply results in overflow.
-	// Alternate way of delaying multiply by delta_factor results in worse
-	// sub-sample resolution.
-	int right = (delta >> BLIP_PHASE_BITS) * phase;
-	#if BLIP_BUFFER_NOINTERP
-		// TODO: remove? (just a hack to see how it sounds)
-		right = 0;
-	#endif
-	left -= right;
-	right += buf 1;
-	
-	buf 0 = left;
-	buf 1 = right;
-#else
-	
-	int const fwd = -quality / 2;
-	int const rev = fwd + quality - 2;
-	
-	coeff_t const* BLARGG_RESTRICT imp = (coeff_t const*) ((char const*) phases + phase);
-	int const phase2 = phase + phase - (blip_res - 1) * half_width * sizeof (coeff_t);
-	
-	#define BLIP_MID_IMP imp = (coeff_t const*) ((char const*) imp - phase2);
-	
-	#if BLIP_MAX_QUALITY > 16
-		// General version for any quality
-		if ( quality != 8 && quality != 12 && quality != 16 )
-		{
-			buf += fwd;
-			
-			// left half
-			for ( int n = half_width / 2; --n >= 0; )
-			{
-				buf 0 += imp 0 * delta;
-				buf 1 += imp 1 * delta;
-				imp += 2;
-				buf += 2;
-			}
-			
-			// mirrored right half
-			BLIP_MID_IMP
-			for ( int n = half_width / 2; --n >= 0; )
-			{
-				buf 0 += imp -1 * delta;
-				buf 1 += *(imp -= 2) * delta;
-				buf += 2;
-			}
-			
-			return;
-		}
-	#endif
-	
-	// Unrolled versions for qualities 8, 12, and 16
-	
-	#if BLIP_X86
-		// This gives better code for x86
-		#define BLIP_ADD( out, in ) \
-			buf out += imp in * delta
-		
-		#define BLIP_FWD( i ) {\
-			BLIP_ADD( fwd + i, i );\
-			BLIP_ADD( fwd + 1 + i, i + 1 );\
-		}
-		
-		#define BLIP_REV( r ) {\
-			BLIP_ADD( rev - r, r + 1 );\
-			BLIP_ADD( rev + 1 - r, r );\
-		}
-		
-		BLIP_FWD( 0 )
-		BLIP_FWD( 2 )
-		if ( quality > 8 ) BLIP_FWD( 4 )
-		if ( quality > 12 ) BLIP_FWD( 6 )
-			BLIP_MID_IMP
-		if ( quality > 12 ) BLIP_REV( 6 )
-		if ( quality > 8 ) BLIP_REV( 4 )
-		BLIP_REV( 2 )
-		BLIP_REV( 0 )
-	
-	#else
-		// Help RISC processors and simplistic compilers by reading ahead of writes
-		#define BLIP_FWD( i ) {\
-			int t0 = i0 * delta + buf fwd + i;\
-			int t1 = imp i + 1 * delta + buf fwd + 1 + i;\
-			i0 = imp i + 2;\
-			buf fwd + i = t0;\
-			buf fwd + 1 + i = t1;\
-		}
-		
-		#define BLIP_REV( r ) {\
-			int t0 = i0 * delta + buf rev - r;\
-			int t1 = imp r * delta + buf rev + 1 - r;\
-			i0 = imp r - 1;\
-			buf rev - r = t0;\
-			buf rev + 1 - r = t1;\
-		}
-		
-		int i0 = *imp;
-		BLIP_FWD( 0 )
-		if ( quality > 8 ) BLIP_FWD( 2 )
-		if ( quality > 12 ) BLIP_FWD( 4 )
-		{
-			int const mid = half_width - 1;
-			int t0 = i0 * delta + buf fwd + mid - 1;
-			int t1 = imp mid * delta + buf fwd + mid ;
-			BLIP_MID_IMP
-			i0 = imp mid;
-			buf fwd + mid - 1 = t0;
-			buf fwd + mid = t1;
-		}
-		if ( quality > 12 ) BLIP_REV( 6 )
-		if ( quality > 8 ) BLIP_REV( 4 )
-		BLIP_REV( 2 )
-		
-		int t0 = i0 * delta + buf rev ;
-		int t1 = *imp * delta + buf rev + 1;
-		buf rev = t0;
-		buf rev + 1 = t1;
-	#endif
-	
-#endif
-}
-
-template<int quality,int range>
-#if BLIP_BUFFER_FAST
-	inline
-#endif
-void Blip_Synth<quality,range>::offset( blip_time_t t, int delta, Blip_Buffer* buf ) const
-{
-	offset_resampled( buf->to_fixed( t ), delta, buf );
-}
-
-template<int quality,int range>
-#if BLIP_BUFFER_FAST
-	inline
-#endif
-void Blip_Synth<quality,range>::update( blip_time_t t, int amp )
-{
-	int delta = amp - impl.last_amp;
-	impl.last_amp = amp;
-	offset_resampled( impl.buf->to_fixed( t ), delta, impl.buf );
-}
-
-
-//// blip_eq_t
-
-inline blip_eq_t::blip_eq_t( double t ) :
-		treble( t ), kaiser( 5.2 ), rolloff_freq( 0 ), sample_rate( 44100 ), cutoff_freq( 0 ) { }
-inline blip_eq_t::blip_eq_t( double t, int rf, int sr, int cf, double k ) :
-		treble( t ), kaiser( k ), rolloff_freq( rf ), sample_rate( sr ), cutoff_freq( cf ) { }
-
-
-//// Blip_Buffer
-
-inline int Blip_Buffer::length() const { return length_; }
-inline int Blip_Buffer::samples_avail() const { return (int) (offset_ >> BLIP_BUFFER_ACCURACY); }
-inline int Blip_Buffer::sample_rate() const { return sample_rate_; }
-inline int Blip_Buffer::output_latency() const { return BLIP_MAX_QUALITY / 2; }
-inline int Blip_Buffer::clock_rate() const { return clock_rate_; }
-inline void Blip_Buffer::clock_rate( int cps ) { factor_ = clock_rate_factor( clock_rate_ = cps ); }
-
-inline void Blip_Buffer::remove_silence( int count )
-{
-	// fails if you try to remove more samples than available
-	assert( count <= samples_avail() );
-	offset_ -= (blip_resampled_time_t) count << BLIP_BUFFER_ACCURACY;
-}
-
-#endif
+// Internal stuff here to keep public header uncluttered
+
+// Blip_Buffer $vers
+#ifndef BLIP_BUFFER_IMPL2_H
+#define BLIP_BUFFER_IMPL2_H
+
+//// Compatibility
+
+BLARGG_DEPRECATED( int const blip_low_quality = 8; )
+BLARGG_DEPRECATED( int const blip_med_quality = 8; )
+BLARGG_DEPRECATED( int const blip_good_quality = 12; )
+BLARGG_DEPRECATED( int const blip_high_quality = 16; )
+
+BLARGG_DEPRECATED( int const blip_sample_max = 32767; )
+
+// Number of bits in raw sample that covers normal output range. Less than 32 bits to give
+// extra amplitude range. That is,
+// +1 << (blip_sample_bits-1) = +1.0
+// -1 << (blip_sample_bits-1) = -1.0
+int const blip_sample_bits = 30;
+
+//// BLIP_READER_
+
+//// Optimized reading from Blip_Buffer, for use in custom sample buffer or mixer
+
+// Begins reading from buffer. Name should be unique to the current {} block.
+#define BLIP_READER_BEGIN( name, blip_buffer ) \
+	const Blip_Buffer::delta_t* BLARGG_RESTRICT name##_reader_buf = (blip_buffer).read_pos();\
+	int name##_reader_accum = (blip_buffer).integrator()
+
+// Gets value to pass to BLIP_READER_NEXT()
+#define BLIP_READER_BASS( blip_buffer ) (blip_buffer).highpass_shift()
+
+// Constant value to use instead of BLIP_READER_BASS(), for slightly more optimal
+// code at the cost of having no bass_freq() functionality
+int const blip_reader_default_bass = 9;
+
+// Current sample as 16-bit signed value
+#define BLIP_READER_READ( name ) (name##_reader_accum >> (blip_sample_bits - 16))
+
+// Current raw sample in full internal resolution
+#define BLIP_READER_READ_RAW( name ) (name##_reader_accum)
+
+// Advances to next sample
+#define BLIP_READER_NEXT( name, bass ) \
+	(void) (name##_reader_accum += *name##_reader_buf++ - (name##_reader_accum >> (bass)))
+
+// Ends reading samples from buffer. The number of samples read must now be removed
+// using Blip_Buffer::remove_samples().
+#define BLIP_READER_END( name, blip_buffer ) \
+	(void) ((blip_buffer).set_integrator( name##_reader_accum ))
+
+#define BLIP_READER_ADJ_( name, offset ) (name##_reader_buf += offset)
+
+int const blip_reader_idx_factor = sizeof (Blip_Buffer::delta_t);
+
+#define BLIP_READER_NEXT_IDX_( name, bass, idx ) {\
+	name##_reader_accum -= name##_reader_accum >> (bass);\
+	name##_reader_accum += name##_reader_buf (idx);\
+}
+
+#define BLIP_READER_NEXT_RAW_IDX_( name, bass, idx ) {\
+	name##_reader_accum -= name##_reader_accum >> (bass);\
+	name##_reader_accum +=\
+			*(Blip_Buffer::delta_t const*) ((char const*) name##_reader_buf + (idx));\
+}
+
+//// BLIP_CLAMP
+
+#if defined (_M_IX86) || defined (_M_IA64) || defined (__i486__) || \
+		defined (__x86_64__) || defined (__ia64__) || defined (__i386__)
+	#define BLIP_X86 1
+	#define BLIP_CLAMP_( in ) in < -0x8000 || 0x7FFF < in
+#else
+	#define BLIP_CLAMP_( in ) (blip_sample_t) in != in
+#endif
+
+// Clamp sample to blip_sample_t range
+#define BLIP_CLAMP( sample, out )\
+	{ if ( BLIP_CLAMP_( (sample) ) ) (out) = ((sample) >> 31) ^ 0x7FFF; }
+
+
+//// Blip_Synth
+
+// (in >> sh & mask) * mul
+#define BLIP_SH_AND_MUL( in, sh, mask, mul ) \
+((int) (in) / ((1U << (sh)) / (mul)) & (unsigned) ((mask) * (mul)))
+
+// (T*) ptr + (off >> sh)
+#define BLIP_PTR_OFF_SH( T, ptr, off, sh ) \
+	((T*) (BLIP_SH_AND_MUL( off, sh, -1, sizeof (T) ) + (char*) (ptr)))
+
+template<int quality,int range>
+inline void Blip_Synth<quality,range>::offset_resampled( blip_resampled_time_t time,
+		int delta, Blip_Buffer* blip_buf ) const
+{
+#if BLIP_BUFFER_FAST
+	int const half_width = 1;
+#else
+	int const half_width = quality / 2;
+#endif
+	
+	Blip_Buffer::delta_t* BLARGG_RESTRICT buf = blip_buf->delta_at( time );
+	
+	delta *= impl.delta_factor;
+
+	int const phase_shift = BLIP_BUFFER_ACCURACY - BLIP_PHASE_BITS;
+	int const phase = (half_width & (half_width - 1)) ?
+		(int) BLIP_SH_AND_MUL( time, phase_shift, blip_res - 1, sizeof (coeff_t) ) * half_width :
+		(int) BLIP_SH_AND_MUL( time, phase_shift, blip_res - 1, sizeof (coeff_t) * half_width );
+	
+#if BLIP_BUFFER_FAST
+	int left = buf 0 + delta;
+	
+	// Kind of crappy, but doing shift after multiply results in overflow.
+	// Alternate way of delaying multiply by delta_factor results in worse
+	// sub-sample resolution.
+	int right = (delta >> BLIP_PHASE_BITS) * phase;
+	#if BLIP_BUFFER_NOINTERP
+		// TODO: remove? (just a hack to see how it sounds)
+		right = 0;
+	#endif
+	left -= right;
+	right += buf 1;
+	
+	buf 0 = left;
+	buf 1 = right;
+#else
+	
+	int const fwd = -quality / 2;
+	int const rev = fwd + quality - 2;
+	
+	coeff_t const* BLARGG_RESTRICT imp = (coeff_t const*) ((char const*) phases + phase);
+	int const phase2 = phase + phase - (blip_res - 1) * half_width * sizeof (coeff_t);
+	
+	#define BLIP_MID_IMP imp = (coeff_t const*) ((char const*) imp - phase2);
+	
+	#if BLIP_MAX_QUALITY > 16
+		// General version for any quality
+		if ( quality != 8 && quality != 12 && quality != 16 )
+		{
+			buf += fwd;
+			
+			// left half
+			for ( int n = half_width / 2; --n >= 0; )
+			{
+				buf 0 += imp 0 * delta;
+				buf 1 += imp 1 * delta;
+				imp += 2;
+				buf += 2;
+			}
+			
+			// mirrored right half
+			BLIP_MID_IMP
+			for ( int n = half_width / 2; --n >= 0; )
+			{
+				buf 0 += imp -1 * delta;
+				buf 1 += *(imp -= 2) * delta;
+				buf += 2;
+			}
+			
+			return;
+		}
+	#endif
+	
+	// Unrolled versions for qualities 8, 12, and 16
+	
+	#if BLIP_X86
+		// This gives better code for x86
+		#define BLIP_ADD( out, in ) \
+			buf out += imp in * delta
+		
+		#define BLIP_FWD( i ) {\
+			BLIP_ADD( fwd + i, i );\
+			BLIP_ADD( fwd + 1 + i, i + 1 );\
+		}
+		
+		#define BLIP_REV( r ) {\
+			BLIP_ADD( rev - r, r + 1 );\
+			BLIP_ADD( rev + 1 - r, r );\
+		}
+		
+		BLIP_FWD( 0 )
+		BLIP_FWD( 2 )
+		if ( quality > 8 ) BLIP_FWD( 4 )
+		if ( quality > 12 ) BLIP_FWD( 6 )
+			BLIP_MID_IMP
+		if ( quality > 12 ) BLIP_REV( 6 )
+		if ( quality > 8 ) BLIP_REV( 4 )
+		BLIP_REV( 2 )
+		BLIP_REV( 0 )
+	
+	#else
+		// Help RISC processors and simplistic compilers by reading ahead of writes
+		#define BLIP_FWD( i ) {\
+			int t0 = i0 * delta + buf fwd + i;\
+			int t1 = imp i + 1 * delta + buf fwd + 1 + i;\
+			i0 = imp i + 2;\
+			buf fwd + i = t0;\
+			buf fwd + 1 + i = t1;\
+		}
+		
+		#define BLIP_REV( r ) {\
+			int t0 = i0 * delta + buf rev - r;\
+			int t1 = imp r * delta + buf rev + 1 - r;\
+			i0 = imp r - 1;\
+			buf rev - r = t0;\
+			buf rev + 1 - r = t1;\
+		}
+		
+		int i0 = *imp;
+		BLIP_FWD( 0 )
+		if ( quality > 8 ) BLIP_FWD( 2 )
+		if ( quality > 12 ) BLIP_FWD( 4 )
+		{
+			int const mid = half_width - 1;
+			int t0 = i0 * delta + buf fwd + mid - 1;
+			int t1 = imp mid * delta + buf fwd + mid ;
+			BLIP_MID_IMP
+			i0 = imp mid;
+			buf fwd + mid - 1 = t0;
+			buf fwd + mid = t1;
+		}
+		if ( quality > 12 ) BLIP_REV( 6 )
+		if ( quality > 8 ) BLIP_REV( 4 )
+		BLIP_REV( 2 )
+		
+		int t0 = i0 * delta + buf rev ;
+		int t1 = *imp * delta + buf rev + 1;
+		buf rev = t0;
+		buf rev + 1 = t1;
+	#endif
+	
+#endif
+}
+
+template<int quality,int range>
+#if BLIP_BUFFER_FAST
+	inline
+#endif
+void Blip_Synth<quality,range>::offset( blip_time_t t, int delta, Blip_Buffer* buf ) const
+{
+	offset_resampled( buf->to_fixed( t ), delta, buf );
+}
+
+template<int quality,int range>
+#if BLIP_BUFFER_FAST
+	inline
+#endif
+void Blip_Synth<quality,range>::update( blip_time_t t, int amp )
+{
+	int delta = amp - impl.last_amp;
+	impl.last_amp = amp;
+	offset_resampled( impl.buf->to_fixed( t ), delta, impl.buf );
+}
+
+
+//// blip_eq_t
+
+inline blip_eq_t::blip_eq_t( double t ) :
+		treble( t ), kaiser( 5.2 ), rolloff_freq( 0 ), sample_rate( 44100 ), cutoff_freq( 0 ) { }
+inline blip_eq_t::blip_eq_t( double t, int rf, int sr, int cf, double k ) :
+		treble( t ), kaiser( k ), rolloff_freq( rf ), sample_rate( sr ), cutoff_freq( cf ) { }
+
+
+//// Blip_Buffer
+
+inline int Blip_Buffer::length() const { return length_; }
+inline int Blip_Buffer::samples_avail() const { return (int) (offset_ >> BLIP_BUFFER_ACCURACY); }
+inline int Blip_Buffer::sample_rate() const { return sample_rate_; }
+inline int Blip_Buffer::output_latency() const { return BLIP_MAX_QUALITY / 2; }
+inline int Blip_Buffer::clock_rate() const { return clock_rate_; }
+inline void Blip_Buffer::clock_rate( int cps ) { factor_ = clock_rate_factor( clock_rate_ = cps ); }
+
+inline void Blip_Buffer::remove_silence( int count )
+{
+	// fails if you try to remove more samples than available
+	assert( count <= samples_avail() );
+	offset_ -= (blip_resampled_time_t) count << BLIP_BUFFER_ACCURACY;
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Bml_Parser.cpp Added

@@ -0,0 +1,202 @@
+// BML parser/serializer/accessor which doesn't use STL
+// Developed for DeaDBeeF Player by Oleksiy Yakovenko
+// Permission is granted to use this source code under the same license, as the Game Music Emu
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "Bml_Parser.h"
+
+Bml_Parser::Bml_Parser() {
+ nodes = NULL;
+ tail = NULL;
+}
+
+Bml_Parser::~Bml_Parser() {
+ clearDocument();
+}
+
+void Bml_Parser::clearDocument ()
+{
+ while (nodes) {
+ if (nodes->key) {
+ free (nodes->key);
+ }
+ if (nodes->value) {
+ free (nodes->value);
+ }
+ nodes = nodes->next;
+ }
+ tail = NULL;
+}
+
+void Bml_Parser::addNode (const char *path, const char *value)
+{
+ Bml_Node *node = new Bml_Node;
+ memset (node, 0, sizeof (Bml_Node));
+ node->key = strdup (path);
+ if (value) {
+ node->value = strdup (value);
+ }
+ if (tail) {
+ tail->next = node;
+ }
+ else {
+ nodes = node;
+ }
+ tail = node;
+}
+
+void Bml_Parser::parseDocument( const char * source, size_t max_length )
+{
+ clearDocument();
+
+ const char *p = source;
+ const char *end = p + max_length;
+
+ char path200 = "";
+
+ int indents100;
+ int num_indents = 0;
+
+ while (p < end) {
+ int indent = 0;
+ while (p < end && *p == 0x20) {
+ indent++;
+ p++;
+ }
+ while (num_indents > 0 && indentsnum_indents-1 >= indent) {
+ char *colon = strrchr (path, ':');
+ if (colon) {
+ *colon = 0;
+ }
+ num_indents--;
+ }
+ indentsnum_indents++ = indent;
+
+ const char *e = p;
+ while (e < end && *e != '\n') {
+ e++;
+ }
+ if (e == p || indent == 0) {
+ path0 = 0;
+ }
+ if (e != p) {
+ char namee-p+1;
+ memcpy (name, p, e-p);
+ namee-p = 0;
+
+ char *colon = strrchr (name, ':');
+ if (colon) {
+ *colon = 0;
+ }
+ if (indent != 0) {
+ strcat (path, ":");
+ }
+
+ strcat (path, name);
+ if (colon) {
+ addNode (path, colon+1);
+ }
+ else {
+ addNode (path, NULL);
+ }
+ }
+ p = e;
+ p++;
+ }
+}
+
+Bml_Parser::Bml_Node *Bml_Parser::walkToNode (const char *_path) const
+{
+ Bml_Node *node = nodes;
+
+ char *path = strdup(_path);
+
+ // split on : or 
+ char *p = path;
+ while (*p) {
+ if (*p == '') {
+ int n = atoi(p+1) + 1;
+ char *e = p;
+ while (*e && *e != ':') {
+ e++;
+ }
+ memmove (p, e, strlen (e)+1);
+ // find n'th node starting with p..e
+ for (; n && node; node = node->next) {
+ size_t l = p-path;
+ if (!strncmp (node->key, path, l) && !node->keyl) {
+ n--;
+ }
+ }
+ }
+ p++;
+ }
+ for (; node; node = node->next) {
+ if (!strcmp (node->key, path)) {
+ free (path);
+ return node;
+ }
+ }
+ free (path);
+ return NULL;
+}
+
+const char * Bml_Parser::enumValue(const char *path) const
+{
+ const Bml_Node *node = walkToNode (path);
+ if (node) {
+ return node->value;
+ }
+ return NULL;
+}
+
+void Bml_Parser::setValue(const char *path, const char *value)
+{
+ Bml_Node *node = walkToNode (path);
+ if (node) {
+ free (node->value);
+ node->value = strdup (value);
+ return;
+ }
+ addNode(path, value);
+}
+
+void Bml_Parser::setValue(const char *path, long value)
+{
+ char str15;
+ snprintf (str, sizeof (str), "%ld", value);
+ setValue( path, str );
+}
+
+void Bml_Parser::serialize(char *buffer, int size) const
+{
+ size_t l = 0;
+#define APPEND(x) l = strlen(x); if (l > size) return; strcat (buffer, x); buffer += l; size -= l;
+ int first = 1;
+ for (Bml_Node *node = nodes; node; node = node->next) {
+ int indent = 0;
+ const char *p = node->key;
+ const char *colon = strchr (node->key, ':');
+ while (colon) {
+ indent++;
+ p = colon + 1;
+ colon = strchr (p, ':');
+ }
+ for (int i = 0; i < indent; i++) {
+ APPEND(" ");
+ }
+ if (!indent && !first) {
+ APPEND("\n");
+ }
+ APPEND(p);
+ if (node->value) {
+ APPEND(":");
+ APPEND(node->value);
+ }
+ APPEND("\n");
+ first = 0;
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Bml_Parser.h Added

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Classic_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Classic_Emu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Classic_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Classic_Emu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Data_Reader.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Data_Reader.cpp Changed

@@ -1,13 +1,17 @@
-// File_Extractor 0.4.0. http://www.slack.net/~ant/
+// File_Extractor $vers. http://www.slack.net/~ant/
 
 #include "Data_Reader.h"
 
 #include "blargg_endian.h"
-#include <assert.h>
-#include <string.h>
+#include "blargg_common.h"
 #include <stdio.h>
+#include <errno.h>
 
-/* Copyright (C) 2005-2006 Shay Green. This module is free software; you
+#if BLARGG_UTF8_PATHS
+	#include <windows.h>
+#endif
+
+/* Copyright (C) 2005-2009 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
@@ -20,295 +24,477 @@
 
 #include "blargg_source.h"
 
-const char Data_Reader::eof_error = "Unexpected end of file";
+// Data_Reader
 
-blargg_err_t Data_Reader::read( void* p, long s )
+blargg_err_t Data_Reader::read( void* p, long n )
 {
-	long result = read_avail( p, s );
-	if ( result != s )
+	assert( n >= 0 );
+	
+	if ( n < 0 )
+		return blargg_err_caller;
+	
+	if ( n <= 0 )
+		return blargg_ok;
+	
+	if ( n > remain() )
+		return blargg_err_file_eof;
+	
+	blargg_err_t err = read_v( p, n );
+	if ( !err )
+		remain_ -= n;
+	
+	return err;
+}
+
+blargg_err_t Data_Reader::read_avail( void* p, int* n_ )
+{
+	assert( *n_ >= 0 );
+	
+ long n = (long)(BOOST::uint64_t) min( (BOOST::uint64_t)(*n_), remain() );
+	*n_ = 0;
+	
+	if ( n < 0 )
+		return blargg_err_caller;
+	
+	if ( n <= 0 )
+		return blargg_ok;
+	
+	blargg_err_t err = read_v( p, n );
+	if ( !err )
 	{
-		if ( result >= 0 && result < s )
-			return eof_error;
-		
-		return "Read error";
+		remain_ -= n;
+		*n_ = (int) n;
 	}
 	
-	return 0;
+	return err;
+}
+
+blargg_err_t Data_Reader::read_avail( void* p, long* n )
+{
+	int i = STATIC_CAST(int, *n);
+	blargg_err_t err = read_avail( p, &i );
+	*n = i;
+	return err;
 }
 
-blargg_err_t Data_Reader::skip( long count )
+blargg_err_t Data_Reader::skip_v( BOOST::uint64_t count )
 {
 	char buf 512;
 	while ( count )
 	{
-		long n = sizeof buf;
-		if ( n > count )
-			n = count;
+		BOOST::uint64_t n = min( count, (BOOST::uint64_t) sizeof buf );
 		count -= n;
-		RETURN_ERR( read( buf, n ) );
+		RETURN_ERR( read_v( buf, n ) );
 	}
-	return 0;
+	return blargg_ok;
+}
+
+blargg_err_t Data_Reader::skip( long n )
+{
+	assert( n >= 0 );
+	
+	if ( n < 0 )
+		return blargg_err_caller;
+	
+	if ( n <= 0 )
+		return blargg_ok;
+	
+	if ( n > remain() )
+		return blargg_err_file_eof;
+	
+	blargg_err_t err = skip_v( n );
+	if ( !err )
+		remain_ -= n;
+	
+	return err;
 }
 
-long File_Reader::remain() const { return size() - tell(); }
 
-blargg_err_t File_Reader::skip( long n )
+// File_Reader
+
+blargg_err_t File_Reader::seek( BOOST::uint64_t n )
 {
 	assert( n >= 0 );
-	if ( !n )
-		return 0;
-	return seek( tell() + n );
+	
+	if ( n == tell() )
+		return blargg_ok;
+	
+	if ( n > size() )
+		return blargg_err_file_eof;
+	
+	blargg_err_t err = seek_v( n );
+	if ( !err )
+		set_tell( n );
+	
+	return err;
 }
 
+blargg_err_t File_Reader::skip_v( BOOST::uint64_t n )
+{
+	return seek_v( tell() + n );
+}
+
+
 // Subset_Reader
 
-Subset_Reader::Subset_Reader( Data_Reader* dr, long size )
+Subset_Reader::Subset_Reader( Data_Reader* dr, BOOST::uint64_t size ) :
+	in( dr )
 {
-	in = dr;
-	remain_ = dr->remain();
-	if ( remain_ > size )
-		remain_ = size;
+	set_remain( min( size, dr->remain() ) );
 }
 
-long Subset_Reader::remain() const { return remain_; }
-
-long Subset_Reader::read_avail( void* p, long s )
+blargg_err_t Subset_Reader::read_v( void* p, long s )
 {
-	if ( s > remain_ )
-		s = remain_;
-	remain_ -= s;
-	return in->read_avail( p, s );
+	return in->read( p, s );
 }
 
+
 // Remaining_Reader
 
-Remaining_Reader::Remaining_Reader( void const* h, long size, Data_Reader* r )
+Remaining_Reader::Remaining_Reader( void const* h, int size, Data_Reader* r ) :
+	in( r )
 {
-	header = (char const*) h;
-	header_end = header + size;
-	in = r;
+	header = h;
+	header_remain = size;
+	
+	set_remain( size + r->remain() );
 }
 
-long Remaining_Reader::remain() const { return header_end - header + in->remain(); }
-
-long Remaining_Reader::read_first( void* out, long count )
+blargg_err_t Remaining_Reader::read_v( void* out, long count )
 {
-	long first = header_end - header;
+	int64_t first = min( (int64_t)count, (int64_t)header_remain );
 	if ( first )
 	{
-		if ( first > count )
-			first = count;
-		void const* old = header;
-		header += first;
-		memcpy( out, old, first );
+		memcpy( out, header, first );
+		header = STATIC_CAST(char const*, header) + first;
+		header_remain -= first;
 	}
-	return first;
+	
+	return in->read( STATIC_CAST(char*, out) + first, count - first );
 }
 
-long Remaining_Reader::read_avail( void* out, long count )
+
+// Mem_File_Reader
+
+Mem_File_Reader::Mem_File_Reader( const void* p, long s ) :
+	begin( STATIC_CAST(const char*, p) )
 {
-	long first = read_first( out, count );
-	long second = count - first;
-	if ( second )
-	{
-		second = in->read_avail( (char*) out + first, second );
-		if ( second <= 0 )
-			return second;
-	}
-	return first + second;
+	set_size( s );
 }
 
-blargg_err_t Remaining_Reader::read( void* out, long count )
+blargg_err_t Mem_File_Reader::read_v( void* p, long s )
 {
-	long first = read_first( out, count );
-	long second = count - first;
-	if ( !second )
-		return 0;
-	return in->read( (char*) out + first, second );
+	memcpy( p, begin + tell(), s );
+	return blargg_ok;
 }
 
-// Mem_File_Reader
+blargg_err_t Mem_File_Reader::seek_v( BOOST::uint64_t )
+{
+	return blargg_ok;
+}
 
-Mem_File_Reader::Mem_File_Reader( const void* p, long s ) :
-	begin( (const char*) p ),
-	size_( s )
+
+// Callback_Reader
+
+Callback_Reader::Callback_Reader( callback_t c, BOOST::uint64_t s, void* d ) :
+	callback( c ),
+	user_data( d )
 {
-	pos = 0;
+	set_remain( s );
 }
-	
-long Mem_File_Reader::size() const { return size_; }
 
-long Mem_File_Reader::read_avail( void* p, long s )
+blargg_err_t Callback_Reader::read_v( void* out, long count )
 {
-	long r = remain();
-	if ( s > r )
-		s = r;
-	memcpy( p, begin + pos, s );
-	pos += s;
-	return s;
+	return callback( user_data, out, count );
 }
 
-long Mem_File_Reader::tell() const { return pos; }
 
-blargg_err_t Mem_File_Reader::seek( long n )
+// Callback_File_Reader
+
+Callback_File_Reader::Callback_File_Reader( callback_t c, BOOST::uint64_t s, void* d ) :
+	callback( c ),
+	user_data( d )
 {
-	if ( n > size_ )
-		return eof_error;
-	pos = n;
-	return 0;
+	set_size( s );
 }
 
-// Callback_Reader
+blargg_err_t Callback_File_Reader::read_v( void* out, long count )
+{
+	return callback( user_data, out, count, tell() );
+}
 
-Callback_Reader::Callback_Reader( callback_t c, long size, void* d ) :
-	callback( c ),
-	data( d )
+blargg_err_t Callback_File_Reader::seek_v( BOOST::uint64_t )
 {
-	remain_ = size;
+	return blargg_ok;
 }
 
-long Callback_Reader::remain() const { return remain_; }
 
-long Callback_Reader::read_avail( void* out, long count )
+// BLARGG_UTF8_PATHS
+
+#if BLARGG_UTF8_PATHS
+
+// Thanks to byuu for the idea for BLARGG_UTF8_PATHS and the implementations
+
+static FILE* blargg_fopen( const char path , const char mode )
 {
-	if ( count > remain_ )
-		count = remain_;
-	if ( Callback_Reader::read( out, count ) )
-		count = -1;
-	return count;
+	FILE* file = NULL;
+	wchar_t* wmode = NULL;
+	wchar_t* wpath = NULL;
+	
+	wpath = blargg_to_wide( path );
+	if ( wpath )
+	{
+		wmode = blargg_to_wide( mode );
+		if ( wmode )
+			file = _wfopen( wpath, wmode );
+	}
+	
+	// Save and restore errno in case free() clears it
+	int saved_errno = errno;
+	free( wmode );
+	free( wpath );
+	errno = saved_errno;
+	
+	return file;
 }
 
-blargg_err_t Callback_Reader::read( void* out, long count )
+#else
+
+static inline FILE* blargg_fopen( const char path , const char mode )
 {
-	if ( count > remain_ )
-		return eof_error;
-	return callback( data, out, count );
+	return fopen( path, mode );
 }
 
+#endif
+
+
 // Std_File_Reader
 
-Std_File_Reader::Std_File_Reader() : file_( 0 ) { }
+Std_File_Reader::Std_File_Reader()
+{
+	file_ = NULL;
+}
 
-Std_File_Reader::~Std_File_Reader() { close(); }
+Std_File_Reader::~Std_File_Reader()
+{
+	close();
+}
 
-blargg_err_t Std_File_Reader::open( const char* path )
+static blargg_err_t blargg_fopen( FILE** out, const char path )
 {
-	file_ = fopen( path, "rb" );
-	if ( !file_ )
-		return "Couldn't open file";
-	return 0;
+	errno = 0;
+	*out = blargg_fopen( path, "rb" );
+	if ( !*out )
+	{
+		#ifdef ENOENT
+			if ( errno == ENOENT )
+				return blargg_err_file_missing;
+		#endif
+		#ifdef ENOMEM
+			if ( errno == ENOMEM )
+				return blargg_err_memory;
+		#endif
+		return blargg_err_file_read;
+	}
+	
+	return blargg_ok;
 }
 
-long Std_File_Reader::size() const
+static blargg_err_t blargg_fsize( FILE* f, long* out )
 {
-	long pos = tell();
-	fseek( (FILE*) file_, 0, SEEK_END );
-	long result = tell();
-	fseek( (FILE*) file_, pos, SEEK_SET );
-	return result;
+	if ( fseek( f, 0, SEEK_END ) )
+		return blargg_err_file_io;
+	
+	*out = ftell( f );
+	if ( *out < 0 )
+		return blargg_err_file_io;
+	
+	if ( fseek( f, 0, SEEK_SET ) )
+		return blargg_err_file_io;
+	
+	return blargg_ok;
 }
 
-long Std_File_Reader::read_avail( void* p, long s )
+blargg_err_t Std_File_Reader::open( const char path )
 {
-	return fread( p, 1, s, (FILE*) file_ );
+	close();
+	
+	FILE* f;
+	RETURN_ERR( blargg_fopen( &f, path ) );
+	
+	long s;
+	blargg_err_t err = blargg_fsize( f, &s );
+	if ( err )
+	{
+		fclose( f );
+		return err;
+	}
+	
+	file_ = f;
+	set_size( s );
+	
+	return blargg_ok;
 }
 
-blargg_err_t Std_File_Reader::read( void* p, long s )
+void Std_File_Reader::make_unbuffered()
 {
-	if ( s == (long) fread( p, 1, s, (FILE*) file_ ) )
-		return 0;
-	if ( feof( (FILE*) file_ ) )
-		return eof_error;
-	return "Couldn't read from file";
+ BOOST::uint64_t offset = ftello( STATIC_CAST(FILE*, file_) );
+ if ( setvbuf( STATIC_CAST(FILE*, file_), NULL, _IONBF, 0 ) )
+ check( false ); // shouldn't fail, but OK if it does
+ fseeko( STATIC_CAST(FILE*, file_), offset, SEEK_SET );
 }
 
-long Std_File_Reader::tell() const { return ftell( (FILE*) file_ ); }
+blargg_err_t Std_File_Reader::read_v( void* p, long s )
+{
+	if ( (size_t) s != fread( p, 1, s, STATIC_CAST(FILE*, file_) ) )
+	{
+		// Data_Reader's wrapper should prevent EOF
+		check( !feof( STATIC_CAST(FILE*, file_) ) );
+		
+		return blargg_err_file_io;
+	}
+	
+	return blargg_ok;
+}
 
-blargg_err_t Std_File_Reader::seek( long n )
+blargg_err_t Std_File_Reader::seek_v( BOOST::uint64_t n )
 {
-	if ( !fseek( (FILE*) file_, n, SEEK_SET ) )
-		return 0;
-	if ( n > size() )
-		return eof_error;
-	return "Error seeking in file";
+	if ( fseek( STATIC_CAST(FILE*, file_), n, SEEK_SET ) )
+	{
+		// Data_Reader's wrapper should prevent EOF
+		check( !feof( STATIC_CAST(FILE*, file_) ) );
+		
+		return blargg_err_file_io;
+	}
+	
+	return blargg_ok;
 }
 
 void Std_File_Reader::close()
 {
 	if ( file_ )
 	{
-		fclose( (FILE*) file_ );
-		file_ = 0;
+		fclose( STATIC_CAST(FILE*, file_) );
+		file_ = NULL;
 	}
 }
 
+
 // Gzip_File_Reader
 
 #ifdef HAVE_ZLIB_H
 
 #include "zlib.h"
 
-static const char* get_gzip_eof( const char* path, long* eof )
+static const char* get_gzip_eof( const char path , long* eof )
 {
-	FILE* file = fopen( path, "rb" );
-	if ( !file )
-		return "Couldn't open file";
+	FILE* file;
+	RETURN_ERR( blargg_fopen( &file, path ) );
+
+	int const h_size = 4;
+	unsigned char h h_size;
 	
-	unsigned char buf 4;
-	if ( fread( buf, 2, 1, file ) > 0 && buf 0 == 0x1F && buf 1 == 0x8B )
+	// read four bytes to ensure that we can seek to -4 later
+	if ( fread( h, 1, h_size, file ) != (size_t) h_size || h0 != 0x1F || h1 != 0x8B )
 	{
-		fseek( file, -4, SEEK_END );
-		fread( buf, 4, 1, file );
-		*eof = get_le32( buf );
+		// Not gzipped
+		if ( ferror( file ) )
+			return blargg_err_file_io;
+		
+		if ( fseek( file, 0, SEEK_END ) )
+			return blargg_err_file_io;
+		
+		*eof = ftell( file );
+		if ( *eof < 0 )
+			return blargg_err_file_io;
 	}
 	else
 	{
-		fseek( file, 0, SEEK_END );
-		*eof = ftell( file );
+		// Gzipped; get uncompressed size from end
+		if ( fseek( file, -h_size, SEEK_END ) )
+			return blargg_err_file_io;
+		
+		if ( fread( h, 1, h_size, file ) != (size_t) h_size )
+			return blargg_err_file_io;
+		
+		*eof = get_le32( h );
 	}
-	const char* err = (ferror( file ) || feof( file )) ? "Couldn't get file size" : 0;
-	fclose( file );
-	return err;
+	
+	if ( fclose( file ) )
+		check( false );
+	
+	return blargg_ok;
 }
 
-Gzip_File_Reader::Gzip_File_Reader() : file_( 0 ) { }
+Gzip_File_Reader::Gzip_File_Reader()
+{
+	file_ = NULL;
+}
 
-Gzip_File_Reader::~Gzip_File_Reader() { close(); }
+Gzip_File_Reader::~Gzip_File_Reader()
+{
+	close();
+}
 
-blargg_err_t Gzip_File_Reader::open( const char* path )
+blargg_err_t Gzip_File_Reader::open( const char path )
 {
 	close();
 	
-	RETURN_ERR( get_gzip_eof( path, &size_ ) );
-	
+	long s;
+	RETURN_ERR( get_gzip_eof( path, &s ) );
+
 	file_ = gzopen( path, "rb" );
 	if ( !file_ )
-		return "Couldn't open file";
+		return blargg_err_file_read;
 	
-	return 0;
+	set_size( s );
+	return blargg_ok;
 }
 
-long Gzip_File_Reader::size() const { return size_; }
-
-long Gzip_File_Reader::read_avail( void* p, long s ) { return gzread( file_, p, s ); }
+static blargg_err_t convert_gz_error( gzFile file )
+{
+	int err;
+	gzerror( file, &err );
+	
+	switch ( err )
+	{
+	case Z_STREAM_ERROR: break;
+	case Z_DATA_ERROR: return blargg_err_file_corrupt;
+	case Z_MEM_ERROR: return blargg_err_memory;
+	case Z_BUF_ERROR: break;
+	}
+	return blargg_err_internal;
+}
 
-long Gzip_File_Reader::tell() const { return gztell( file_ ); }
+blargg_err_t Gzip_File_Reader::read_v( void* p, long s )
+{
+	int result = gzread( file_, p, s );
+	if ( result != s )
+	{
+		if ( result < 0 )
+			return convert_gz_error( file_ );
+		
+		return blargg_err_file_corrupt;
+	}
+	
+	return blargg_ok;
+}
 
-blargg_err_t Gzip_File_Reader::seek( long n )
+blargg_err_t Gzip_File_Reader::seek_v( BOOST::uint64_t n )
 {
-	if ( gzseek( file_, n, SEEK_SET ) >= 0 )
-		return 0;
-	if ( n > size_ )
-		return eof_error;
-	return "Error seeking in file";
+	if ( gzseek( file_, n, SEEK_SET ) < 0 )
+		return convert_gz_error( file_ );
+
+	return blargg_ok;
 }
 
 void Gzip_File_Reader::close()
 {
 	if ( file_ )
 	{
-		gzclose( file_ );
-		file_ = 0;
+		if ( gzclose( file_ ) )
+			check( false );
+		file_ = NULL;
 	}
 }

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Data_Reader.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Data_Reader.h Changed

@@ -1,151 +1,266 @@
-// Data reader interface for uniform access
+// Lightweight interface for reading data from byte stream
 
-// File_Extractor 0.4.0
+// File_Extractor $vers
 #ifndef DATA_READER_H
 #define DATA_READER_H
 
 #include "blargg_common.h"
 
+BLARGG_NAMESPACE_BEGIN
+
+/* Some functions accept a long instead of int for convenience where caller has
+a long due to some other interface, and would otherwise have to get a warning,
+or cast it (and verify that it wasn't outside the range of an int).
+
+To really support huge (>2GB) files, long isn't a solution, since there's no
+guarantee it's more than 32 bits. We'd need to use long long (if available), or
+something compiler-specific, and change all places file sizes or offsets are
+used. */
+
 // Supports reading and finding out how many bytes are remaining
 class Data_Reader {
 public:
-	virtual ~Data_Reader() { }
-	
-	static const char eof_error ; // returned by read() when request goes beyond end
-	
-	// Read at most count bytes and return number actually read, or <= 0 if error
-	virtual long read_avail( void*, long n ) = 0;
-	
-	// Read exactly count bytes and return error if they couldn't be read
-	virtual blargg_err_t read( void*, long count );
-	
+
+	// Reads min(*n,remain()) bytes and sets *n to this number, thus trying to read more
+	// tham remain() bytes doesn't result in error, just *n being set to remain().
+	blargg_err_t read_avail( void* p, int* n );
+	blargg_err_t read_avail( void* p, long* n );
+
+	// Reads exactly n bytes, or returns error if they couldn't ALL be read.
+	// Reading past end of file results in blargg_err_file_eof.
+	blargg_err_t read( void* p, long n );
+
 	// Number of bytes remaining until end of file
-	virtual long remain() const = 0;
-	
-	// Read and discard count bytes
-	virtual blargg_err_t skip( long count );
+	BOOST::uint64_t remain() const { return remain_; }
+
+	// Reads and discards n bytes. Skipping past end of file results in blargg_err_file_eof.
+	blargg_err_t skip( long n );
 	
-public:
-	Data_Reader() { }
-	typedef blargg_err_t error_t; // deprecated
+	virtual ~Data_Reader() { }
+
 private:
 	// noncopyable
 	Data_Reader( const Data_Reader& );
 	Data_Reader& operator = ( const Data_Reader& );
+
+// Derived interface
+protected:
+	Data_Reader() : remain_( 0 ) { }
+	
+	// Sets remain
+	void set_remain( BOOST::uint64_t n ) { assert( n >= 0 ); remain_ = n; }
+	
+	// Do same as read(). Guaranteed that 0 < n <= remain(). Value of remain() is updated
+	// AFTER this call succeeds, not before. set_remain() should NOT be called from this.
+	virtual blargg_err_t read_v( void*, long n ) BLARGG_PURE( { (void)n; return blargg_ok; } )
+	
+	// Do same as skip(). Guaranteed that 0 < n <= remain(). Default just reads data
+	// and discards it. Value of remain() is updated AFTER this call succeeds, not
+	// before. set_remain() should NOT be called from this.
+	virtual blargg_err_t skip_v( BOOST::uint64_t n );
+
+// Implementation
+public:
+	BLARGG_DISABLE_NOTHROW
+	
+private:
+	BOOST::uint64_t remain_;
 };
 
+
 // Supports seeking in addition to Data_Reader operations
 class File_Reader : public Data_Reader {
 public:
+
 	// Size of file
-	virtual long size() const = 0;
-	
+	BOOST::uint64_t size() const { return size_; }
+
 	// Current position in file
-	virtual long tell() const = 0;
+	BOOST::uint64_t tell() const { return size_ - remain(); }
+
+	// Goes to new position
+	blargg_err_t seek( BOOST::uint64_t );
+
+// Derived interface
+protected:
+	// Sets size and resets position
+ void set_size( BOOST::uint64_t n ) { size_ = n; Data_Reader::set_remain( n ); }
+	void set_size( int n ) { size_ = n; Data_Reader::set_remain( n ); }
+	void set_size( long n ) { set_size( STATIC_CAST(int, n) ); }
 	
-	// Go to new position
-	virtual blargg_err_t seek( long ) = 0;
+	// Sets reported position
+	void set_tell( BOOST::uint64_t i ) { assert( 0 <= i && i <= size_ ); Data_Reader::set_remain( size_ - i ); }
 	
-	long remain() const;
-	blargg_err_t skip( long n );
+	// Do same as seek(). Guaranteed that 0 <= n <= size(). Value of tell() is updated
+	// AFTER this call succeeds, not before. set_* functions should NOT be called from this.
+	virtual blargg_err_t seek_v( BOOST::uint64_t n ) BLARGG_PURE( { (void)n; return blargg_ok; } )
+	
+// Implementation
+protected:
+	File_Reader() : size_( 0 ) { }
+	
+	virtual blargg_err_t skip_v( BOOST::uint64_t );
+
+private:
+	BOOST::uint64_t size_;
+	
+	void set_remain(); // avoid accidental use of set_remain
 };
 
-// Disk file reader
+
+// Reads from file on disk
 class Std_File_Reader : public File_Reader {
 public:
-	blargg_err_t open( const char* path );
-	void close();
+
+	// Opens file
+	blargg_err_t open( const char path );
 	
+	// Closes file if one was open
+	void close();
+
+	// Switches to unbuffered mode. Useful if buffering is already being
+	// done at a higher level.
+	void make_unbuffered();
+
+// Implementation
 public:
 	Std_File_Reader();
-	~Std_File_Reader();
-	long size() const;
-	blargg_err_t read( void*, long );
-	long read_avail( void*, long );
-	long tell() const;
-	blargg_err_t seek( long );
+	virtual ~Std_File_Reader();
+	
+protected:
+	virtual blargg_err_t read_v( void*, long );
+	virtual blargg_err_t seek_v( BOOST::uint64_t );
+
 private:
 	void* file_;
 };
 
+
 // Treats range of memory as a file
 class Mem_File_Reader : public File_Reader {
 public:
-	Mem_File_Reader( const void*, long size );
-	
-public:
-	long size() const;
-	long read_avail( void*, long );
-	long tell() const;
-	blargg_err_t seek( long );
+
+	Mem_File_Reader( const void* begin, long size );
+
+// Implementation
+protected:
+	virtual blargg_err_t read_v( void*, long );
+	virtual blargg_err_t seek_v( BOOST::uint64_t );
+
 private:
 	const char* const begin;
-	const long size_;
-	long pos;
 };
 
-// Makes it look like there are only count bytes remaining
+
+// Allows only count bytes to be read from reader passed
 class Subset_Reader : public Data_Reader {
 public:
-	Subset_Reader( Data_Reader*, long count );
 
-public:
-	long remain() const;
-	long read_avail( void*, long );
+	Subset_Reader( Data_Reader*, BOOST::uint64_t count );
+
+// Implementation
+protected:
+	virtual blargg_err_t read_v( void*, long );
+
 private:
-	Data_Reader* in;
-	long remain_;
+	Data_Reader* const in;
 };
 
-// Joins already-read header and remaining data into original file (to avoid seeking)
+
+// Joins already-read header and remaining data into original file.
+// Meant for cases where you've already read header and don't want
+// to seek and re-read data (for efficiency).
 class Remaining_Reader : public Data_Reader {
 public:
-	Remaining_Reader( void const* header, long size, Data_Reader* );
 
-public:
-	long remain() const;
-	long read_avail( void*, long );
-	blargg_err_t read( void*, long );
+	Remaining_Reader( void const* header, int header_size, Data_Reader* );
+
+// Implementation
+protected:
+	virtual blargg_err_t read_v( void*, long );
+
 private:
-	char const* header;
-	char const* header_end;
-	Data_Reader* in;
-	long read_first( void* out, long count );
+	Data_Reader* const in;
+	void const* header;
+	long header_remain;
 };
 
-// Invokes callback function to read data. Size of data must be specified in advance.
+
+// Invokes callback function to read data
+extern "C" { // necessary to be usable from C
+	typedef const char* (*callback_reader_func_t)(
+		void* user_data, // Same value passed to constructor
+		void* out, // Buffer to place data into
+		long count // Number of bytes to read
+	);
+}
 class Callback_Reader : public Data_Reader {
 public:
-	typedef const char* (*callback_t)( void* data, void* out, int count );
-	Callback_Reader( callback_t, long size, void* data = 0 );
+	typedef callback_reader_func_t callback_t;
+	Callback_Reader( callback_t, BOOST::uint64_t size, void* user_data );
+	
+// Implementation
+protected:
+	virtual blargg_err_t read_v( void*, long );
+
+private:
+	callback_t const callback;
+	void* const user_data;
+};
+
+
+// Invokes callback function to read data
+extern "C" { // necessary to be usable from C
+	typedef const char* (*callback_file_reader_func_t)(
+		void* user_data, // Same value passed to constructor
+		void* out, // Buffer to place data into
+		long count, // Number of bytes to read
+		BOOST::uint64_t pos // Position in file to read from
+	);
+}
+class Callback_File_Reader : public File_Reader {
 public:
-	long read_avail( void*, long );
-	blargg_err_t read( void*, long );
-	long remain() const;
+	typedef callback_file_reader_func_t callback_t;
+	Callback_File_Reader( callback_t, BOOST::uint64_t size, void* user_data );
+	
+// Implementation
+protected:
+	virtual blargg_err_t read_v( void*, long );
+	virtual blargg_err_t seek_v( BOOST::uint64_t );
+
 private:
 	callback_t const callback;
-	void* const data;
-	long remain_;
+	void* const user_data;
 };
 
+
 #ifdef HAVE_ZLIB_H
-// Gzip compressed file reader
+
+// Reads file compressed with gzip (or uncompressed)
 class Gzip_File_Reader : public File_Reader {
 public:
-	blargg_err_t open( const char* path );
-	void close();
+
+	// Opens possibly gzipped file
+	blargg_err_t open( const char path );
 	
+	// Closes file if one was open
+	void close();
+
+// Implementation
 public:
 	Gzip_File_Reader();
 	~Gzip_File_Reader();
-	long size() const;
-	long read_avail( void*, long );
-	long tell() const;
-	blargg_err_t seek( long );
+	
+protected:
+	virtual blargg_err_t read_v( void*, long );
+	virtual blargg_err_t seek_v( BOOST::uint64_t );
+	
 private:
+	// void* so "zlib.h" doesn't have to be included here
 	void* file_;
-	long size_;
 };
 #endif
 
+BLARGG_NAMESPACE_END
+
 #endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Downsampler.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Downsampler.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Downsampler.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Downsampler.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Dual_Resampler.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Dual_Resampler.cpp Changed

@@ -1,200 +1,315 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Dual_Resampler.h"
-
-/* Copyright (C) 2003-2008 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: fix this. hack since resampler holds back some output.
-int const resampler_extra = 34;
-
-int const stereo = 2;
-
-Dual_Resampler::Dual_Resampler() { }
-
-Dual_Resampler::~Dual_Resampler() { }
-
-blargg_err_t Dual_Resampler::reset( int pairs )
-{
-	// expand allocations a bit
-	RETURN_ERR( sample_buf.resize( (pairs + (pairs >> 2)) * 2 ) );
-	resize( pairs );
-	resampler_size = oversamples_per_frame + (oversamples_per_frame >> 2);
-	RETURN_ERR( resampler.resize_buffer( resampler_size ) );
-	resampler.clear();
-	return blargg_ok;
-}
-
-void Dual_Resampler::resize( int pairs )
-{
-	int new_sample_buf_size = pairs * 2;
-	//new_sample_buf_size = new_sample_buf_size / 4 * 4; // TODO: needed only for 3:2 downsampler
-	if ( sample_buf_size != new_sample_buf_size )
-	{
-		if ( (unsigned) new_sample_buf_size > sample_buf.size() )
-		{
-			check( false );
-			return;
-		}
-		sample_buf_size = new_sample_buf_size;
-		oversamples_per_frame = int (pairs * resampler.rate()) * 2 + 2;
-		clear();
-	}
-}
-
-void Dual_Resampler::clear()
-{
-	buf_pos = sample_buf_size;
-	resampler.clear();
-}
-
-
-void Dual_Resampler::play_frame_( Stereo_Buffer& stereo_buf, dsample_t out )
-{
-	int pair_count = sample_buf_size >> 1;
-	blip_time_t blip_time = stereo_buf.center()->count_clocks( pair_count );
-	int sample_count = oversamples_per_frame - resampler.written() + resampler_extra;
-	
-	int new_count = set_callback.f( set_callback.data, blip_time, sample_count, resampler.buffer() );
-	assert( new_count < resampler_size );
-	
-	stereo_buf.end_frame( blip_time );
-	assert( stereo_buf.samples_avail() == pair_count * 2 );
-	
-	resampler.write( new_count );
-	
-	int count = resampler.read( sample_buf.begin(), sample_buf_size );
-	assert( count == sample_buf_size );
-	
-	mix_samples( stereo_buf, out );
-	stereo_buf.left()->remove_samples( pair_count );
-	stereo_buf.right()->remove_samples( pair_count );
-	stereo_buf.center()->remove_samples( pair_count );
-}
-
-void Dual_Resampler::dual_play( int count, dsample_t out , Stereo_Buffer& stereo_buf )
-{
-	// empty extra buffer
-	int remain = sample_buf_size - buf_pos;
-	if ( remain )
-	{
-		if ( remain > count )
-			remain = count;
-		count -= remain;
-		memcpy( out, &sample_buf buf_pos, remain * sizeof *out );
-		out += remain;
-		buf_pos += remain;
-	}
-	
-	// entire frames
-	while ( count >= sample_buf_size )
-	{
-		play_frame_( stereo_buf, out );
-		out += sample_buf_size;
-		count -= sample_buf_size;
-	}
-	
-	// extra
-	if ( count )
-	{
-		play_frame_( stereo_buf, sample_buf.begin() );
-		buf_pos = count;
-		memcpy( out, sample_buf.begin(), count * sizeof *out );
-		out += count;
-	}
-}
-
-void Dual_Resampler::mix_samples( Stereo_Buffer& stereo_buf, dsample_t out_ )
-{
-	// lol hax
-	if ( ((Tracked_Blip_Buffer*)stereo_buf.left())->non_silent() | ((Tracked_Blip_Buffer*)stereo_buf.right())->non_silent() )
-		mix_stereo( stereo_buf, out_ );
-	else
-		mix_mono( stereo_buf, out_ );
-}
-
-void Dual_Resampler::mix_mono( Stereo_Buffer& stereo_buf, dsample_t out_ )
-{
-	int const bass = BLIP_READER_BASS( *stereo_buf.center() );
-	BLIP_READER_BEGIN( sn, *stereo_buf.center() );
-	
-	int count = sample_buf_size >> 1;
-	BLIP_READER_ADJ_( sn, count );
-	
-	typedef dsample_t stereo_dsample_t 2;
-	stereo_dsample_t* BLARGG_RESTRICT out = (stereo_dsample_t*) out_ + count;
-	stereo_dsample_t const* BLARGG_RESTRICT in =
-			(stereo_dsample_t const*) sample_buf.begin() + count;
-	int offset = -count;
-	int const gain = gain_;
-	do
-	{
-		int s = BLIP_READER_READ_RAW( sn ) >> (blip_sample_bits - 16);
-		BLIP_READER_NEXT_IDX_( sn, bass, offset );
-		
-		int l = (in offset 0 * gain >> gain_bits) + s;
-		int r = (in offset 1 * gain >> gain_bits) + s;
-		
-		BLIP_CLAMP( l, l );
-		out offset 0 = (blip_sample_t) l;
-		
-		BLIP_CLAMP( r, r );
-		out offset 1 = (blip_sample_t) r;
-	}
-	while ( ++offset );
-	
-	BLIP_READER_END( sn, *stereo_buf.center() );
-}
-
-void Dual_Resampler::mix_stereo( Stereo_Buffer& stereo_buf, dsample_t out_ )
-{
-	int const bass = BLIP_READER_BASS( *stereo_buf.center() );
-	BLIP_READER_BEGIN( snc, *stereo_buf.center() );
-	BLIP_READER_BEGIN( snl, *stereo_buf.left() );
-	BLIP_READER_BEGIN( snr, *stereo_buf.right() );
-	
-	int count = sample_buf_size >> 1;
-	BLIP_READER_ADJ_( snc, count );
-	BLIP_READER_ADJ_( snl, count );
-	BLIP_READER_ADJ_( snr, count );
-	
-	typedef dsample_t stereo_dsample_t 2;
-	stereo_dsample_t* BLARGG_RESTRICT out = (stereo_dsample_t*) out_ + count;
-	stereo_dsample_t const* BLARGG_RESTRICT in =
-			(stereo_dsample_t const*) sample_buf.begin() + count;
-	int offset = -count;
-	int const gain = gain_;
-	do
-	{
-		int sc = BLIP_READER_READ_RAW( snc ) >> (blip_sample_bits - 16);
-		int sl = BLIP_READER_READ_RAW( snl ) >> (blip_sample_bits - 16);
-		int sr = BLIP_READER_READ_RAW( snr ) >> (blip_sample_bits - 16);
-		BLIP_READER_NEXT_IDX_( snc, bass, offset );
-		BLIP_READER_NEXT_IDX_( snl, bass, offset );
-		BLIP_READER_NEXT_IDX_( snr, bass, offset );
-		
-		int l = (in offset 0 * gain >> gain_bits) + sl + sc;
-		int r = (in offset 1 * gain >> gain_bits) + sr + sc;
-		
-		BLIP_CLAMP( l, l );
-		out offset 0 = (blip_sample_t) l;
-		
-		BLIP_CLAMP( r, r );
-		out offset 1 = (blip_sample_t) r;
-	}
-	while ( ++offset );
-	
-	BLIP_READER_END( snc, *stereo_buf.center() );
-	BLIP_READER_END( snl, *stereo_buf.left() );
-	BLIP_READER_END( snr, *stereo_buf.right() );
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Dual_Resampler.h"
+
+/* Copyright (C) 2003-2008 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: fix this. hack since resampler holds back some output.
+int const resampler_extra = 34;
+
+int const stereo = 2;
+
+Dual_Resampler::Dual_Resampler() { }
+
+Dual_Resampler::~Dual_Resampler() { }
+
+blargg_err_t Dual_Resampler::reset( int pairs )
+{
+	// expand allocations a bit
+	RETURN_ERR( sample_buf.resize( (pairs + (pairs >> 2)) * 2 ) );
+	resize( pairs );
+	resampler_size = oversamples_per_frame + (oversamples_per_frame >> 2);
+	RETURN_ERR( resampler.resize_buffer( resampler_size ) );
+	resampler.clear();
+	return blargg_ok;
+}
+
+void Dual_Resampler::resize( int pairs )
+{
+	int new_sample_buf_size = pairs * 2;
+	//new_sample_buf_size = new_sample_buf_size / 4 * 4; // TODO: needed only for 3:2 downsampler
+	if ( sample_buf_size != new_sample_buf_size )
+	{
+		if ( (unsigned) new_sample_buf_size > sample_buf.size() )
+		{
+			check( false );
+			return;
+		}
+		sample_buf_size = new_sample_buf_size;
+		oversamples_per_frame = int (pairs * resampler.rate()) * 2 + 2;
+		clear();
+	}
+}
+
+void Dual_Resampler::clear()
+{
+	buf_pos = buffered = 0;
+	resampler.clear();
+}
+
+
+int Dual_Resampler::play_frame_( Stereo_Buffer& stereo_buf, dsample_t out , Stereo_Buffer** secondary_buf_set, int secondary_buf_set_count )
+{
+	int pair_count = sample_buf_size >> 1;
+	blip_time_t blip_time = stereo_buf.center()->count_clocks( pair_count );
+ int sample_count = oversamples_per_frame - resampler.written() + resampler_extra;
+	
+	int new_count = set_callback.f( set_callback.data, blip_time, sample_count, resampler.buffer() );
+	assert( new_count < resampler_size );
+	
+	stereo_buf.end_frame( blip_time );
+ assert( stereo_buf.samples_avail() == pair_count * 2 );
+ if ( secondary_buf_set && secondary_buf_set_count )
+ {
+ for ( int i = 0; i < secondary_buf_set_count; i++ )
+ {
+ Stereo_Buffer * second_buf = secondary_buf_seti;
+ blip_time_t blip_time_2 = second_buf->center()->count_clocks( pair_count );
+ second_buf->end_frame( blip_time_2 );
+ assert( second_buf->samples_avail() == pair_count * 2 );
+ }
+ }
+
+	resampler.write( new_count );
+	
+	int count = resampler.read( sample_buf.begin(), sample_buf_size );
+	
+ mix_samples( stereo_buf, out, count, secondary_buf_set, secondary_buf_set_count );
+
+	pair_count = count >> 1;
+	stereo_buf.left()->remove_samples( pair_count );
+	stereo_buf.right()->remove_samples( pair_count );
+	stereo_buf.center()->remove_samples( pair_count );
+
+ if ( secondary_buf_set && secondary_buf_set_count )
+ {
+ for ( int i = 0; i < secondary_buf_set_count; i++ )
+ {
+ Stereo_Buffer * second_buf = secondary_buf_seti;
+ second_buf->left()->remove_samples( pair_count );
+ second_buf->right()->remove_samples( pair_count );
+ second_buf->center()->remove_samples( pair_count );
+ }
+	}
+
+	return count;
+}
+
+void Dual_Resampler::dual_play( int count, dsample_t out , Stereo_Buffer& stereo_buf, Stereo_Buffer** secondary_buf_set, int secondary_buf_set_count )
+{
+	// empty extra buffer
+	int remain = buffered - buf_pos;
+	if ( remain )
+	{
+		if ( remain > count )
+			remain = count;
+		count -= remain;
+		memcpy( out, &sample_buf buf_pos, remain * sizeof *out );
+		out += remain;
+		buf_pos += remain;
+	}
+	
+	// entire frames
+	while ( count >= sample_buf_size )
+	{
+ buf_pos = buffered = play_frame_( stereo_buf, out, secondary_buf_set, secondary_buf_set_count );
+		out += buffered;
+		count -= buffered;
+	}
+
+	while (count > 0)
+	{
+ buffered = play_frame_( stereo_buf, sample_buf.begin(), secondary_buf_set, secondary_buf_set_count );
+		if ( buffered >= count )
+		{
+			buf_pos = count;
+			memcpy( out, sample_buf.begin(), count * sizeof *out );
+			out += count;
+			count = 0;
+		}
+		else
+		{
+			memcpy( out, sample_buf.begin(), buffered * sizeof *out );
+			out += buffered;
+			count -= buffered;
+		}
+	}
+}
+
+void Dual_Resampler::mix_samples( Stereo_Buffer& stereo_buf, dsample_t out_ , int count, Stereo_Buffer** secondary_buf_set, int secondary_buf_set_count )
+{
+	// lol hax
+	if ( ((Tracked_Blip_Buffer*)stereo_buf.left())->non_silent() | ((Tracked_Blip_Buffer*)stereo_buf.right())->non_silent() )
+		mix_stereo( stereo_buf, out_, count );
+	else
+		mix_mono( stereo_buf, out_, count );
+
+ if ( secondary_buf_set && secondary_buf_set_count )
+ {
+ for ( int i = 0; i < secondary_buf_set_count; i++ )
+ {
+ Stereo_Buffer * second_buf = secondary_buf_seti;
+ if ( ((Tracked_Blip_Buffer*)second_buf->left())->non_silent() | ((Tracked_Blip_Buffer*)second_buf->right())->non_silent() )
+ mix_extra_stereo( *second_buf, out_, count );
+ else
+ mix_extra_mono( *second_buf, out_, count );
+ }
+	}
+}
+
+void Dual_Resampler::mix_mono( Stereo_Buffer& stereo_buf, dsample_t out_ , int count )
+{
+	int const bass = BLIP_READER_BASS( *stereo_buf.center() );
+	BLIP_READER_BEGIN( sn, *stereo_buf.center() );
+	
+	count >>= 1;
+	BLIP_READER_ADJ_( sn, count );
+	
+	typedef dsample_t stereo_dsample_t 2;
+	stereo_dsample_t* BLARGG_RESTRICT out = (stereo_dsample_t*) out_ + count;
+	stereo_dsample_t const* BLARGG_RESTRICT in =
+			(stereo_dsample_t const*) sample_buf.begin() + count;
+	int offset = -count;
+	int const gain = gain_;
+	do
+	{
+		int s = BLIP_READER_READ_RAW( sn ) >> (blip_sample_bits - 16);
+		BLIP_READER_NEXT_IDX_( sn, bass, offset );
+		
+		int l = (in offset 0 * gain >> gain_bits) + s;
+		int r = (in offset 1 * gain >> gain_bits) + s;
+		
+		BLIP_CLAMP( l, l );
+		out offset 0 = (blip_sample_t) l;
+		
+		BLIP_CLAMP( r, r );
+		out offset 1 = (blip_sample_t) r;
+	}
+	while ( ++offset );
+	
+	BLIP_READER_END( sn, *stereo_buf.center() );
+}
+
+void Dual_Resampler::mix_stereo( Stereo_Buffer& stereo_buf, dsample_t out_ , int count )
+{
+	int const bass = BLIP_READER_BASS( *stereo_buf.center() );
+	BLIP_READER_BEGIN( snc, *stereo_buf.center() );
+	BLIP_READER_BEGIN( snl, *stereo_buf.left() );
+	BLIP_READER_BEGIN( snr, *stereo_buf.right() );
+	
+	count >>= 1;
+	BLIP_READER_ADJ_( snc, count );
+	BLIP_READER_ADJ_( snl, count );
+	BLIP_READER_ADJ_( snr, count );
+	
+	typedef dsample_t stereo_dsample_t 2;
+	stereo_dsample_t* BLARGG_RESTRICT out = (stereo_dsample_t*) out_ + count;
+	stereo_dsample_t const* BLARGG_RESTRICT in =
+			(stereo_dsample_t const*) sample_buf.begin() + count;
+	int offset = -count;
+	int const gain = gain_;
+	do
+	{
+		int sc = BLIP_READER_READ_RAW( snc ) >> (blip_sample_bits - 16);
+		int sl = BLIP_READER_READ_RAW( snl ) >> (blip_sample_bits - 16);
+		int sr = BLIP_READER_READ_RAW( snr ) >> (blip_sample_bits - 16);
+		BLIP_READER_NEXT_IDX_( snc, bass, offset );
+		BLIP_READER_NEXT_IDX_( snl, bass, offset );
+		BLIP_READER_NEXT_IDX_( snr, bass, offset );
+		
+		int l = (in offset 0 * gain >> gain_bits) + sl + sc;
+		int r = (in offset 1 * gain >> gain_bits) + sr + sc;
+		
+		BLIP_CLAMP( l, l );
+		out offset 0 = (blip_sample_t) l;
+		
+		BLIP_CLAMP( r, r );
+		out offset 1 = (blip_sample_t) r;
+	}
+	while ( ++offset );
+	
+	BLIP_READER_END( snc, *stereo_buf.center() );
+	BLIP_READER_END( snl, *stereo_buf.left() );
+	BLIP_READER_END( snr, *stereo_buf.right() );
+}
+
+void Dual_Resampler::mix_extra_mono( Stereo_Buffer& stereo_buf, dsample_t out_ , int count )
+{
+	int const bass = BLIP_READER_BASS( *stereo_buf.center() );
+	BLIP_READER_BEGIN( sn, *stereo_buf.center() );
+
+	count >>= 1;
+	BLIP_READER_ADJ_( sn, count );
+
+	typedef dsample_t stereo_dsample_t 2;
+	stereo_dsample_t* BLARGG_RESTRICT out = (stereo_dsample_t*) out_ + count;
+	int offset = -count;
+	do
+	{
+		int s = BLIP_READER_READ_RAW( sn ) >> (blip_sample_bits - 16);
+		BLIP_READER_NEXT_IDX_( sn, bass, offset );
+
+		int l = out offset 0 + s;
+		int r = out offset 1 + s;
+
+		BLIP_CLAMP( l, l );
+		out offset 0 = (blip_sample_t) l;
+
+		BLIP_CLAMP( r, r );
+		out offset 1 = (blip_sample_t) r;
+	}
+	while ( ++offset );
+
+	BLIP_READER_END( sn, *stereo_buf.center() );
+}
+
+void Dual_Resampler::mix_extra_stereo( Stereo_Buffer& stereo_buf, dsample_t out_ , int count )
+{
+	int const bass = BLIP_READER_BASS( *stereo_buf.center() );
+	BLIP_READER_BEGIN( snc, *stereo_buf.center() );
+	BLIP_READER_BEGIN( snl, *stereo_buf.left() );
+	BLIP_READER_BEGIN( snr, *stereo_buf.right() );
+
+	count >>= 1;
+	BLIP_READER_ADJ_( snc, count );
+	BLIP_READER_ADJ_( snl, count );
+	BLIP_READER_ADJ_( snr, count );
+
+	typedef dsample_t stereo_dsample_t 2;
+	stereo_dsample_t* BLARGG_RESTRICT out = (stereo_dsample_t*) out_ + count;
+	int offset = -count;
+	do
+	{
+		int sc = BLIP_READER_READ_RAW( snc ) >> (blip_sample_bits - 16);
+		int sl = BLIP_READER_READ_RAW( snl ) >> (blip_sample_bits - 16);
+		int sr = BLIP_READER_READ_RAW( snr ) >> (blip_sample_bits - 16);
+		BLIP_READER_NEXT_IDX_( snc, bass, offset );
+		BLIP_READER_NEXT_IDX_( snl, bass, offset );
+		BLIP_READER_NEXT_IDX_( snr, bass, offset );
+
+		int l = out offset 0 + sl + sc;
+		int r = out offset 1 + sr + sc;
+
+		BLIP_CLAMP( l, l );
+		out offset 0 = (blip_sample_t) l;
+
+		BLIP_CLAMP( r, r );
+		out offset 1 = (blip_sample_t) r;
+	}
+	while ( ++offset );
+
+	BLIP_READER_END( snc, *stereo_buf.center() );
+	BLIP_READER_END( snl, *stereo_buf.left() );
+	BLIP_READER_END( snr, *stereo_buf.right() );
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Dual_Resampler.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Dual_Resampler.h Changed

@@ -1,6 +1,6 @@
 // Combination of Fir_Resampler and Stereo_Buffer mixing. Used by Sega FM emulators.
 
-// Game_Music_Emu 0.6-pre
+// Game_Music_Emu $vers
 #ifndef DUAL_RESAMPLER_H
 #define DUAL_RESAMPLER_H
 
@@ -24,7 +24,7 @@
 	void resize( int pairs_per_frame );
 	void clear();
 	
-	void dual_play( int count, dsample_t out , Stereo_Buffer& );
+ void dual_play( int count, dsample_t out , Stereo_Buffer&, Stereo_Buffer** secondary_buf_set = NULL, int secondary_buf_set_count = 0 );
 	
 	blargg_callback<int (*)( void*, blip_time_t, int, dsample_t* )> set_callback;
 
@@ -39,14 +39,17 @@
 	int sample_buf_size;
 	int oversamples_per_frame;
 	int buf_pos;
+	int buffered;
 	int resampler_size;
 	int gain_;
 	
 	Dual_Resampler_Downsampler resampler;
-	void mix_samples( Stereo_Buffer&, dsample_t );
-	void mix_mono( Stereo_Buffer&, dsample_t );
-	void mix_stereo( Stereo_Buffer&, dsample_t );
-	void play_frame_( Stereo_Buffer&, dsample_t );
+ void mix_samples( Stereo_Buffer&, dsample_t , int, Stereo_Buffer**, int );
+	void mix_mono( Stereo_Buffer&, dsample_t , int );
+	void mix_stereo( Stereo_Buffer&, dsample_t , int );
+	void mix_extra_mono( Stereo_Buffer&, dsample_t , int );
+ void mix_extra_stereo( Stereo_Buffer&, dsample_t , int );
+ int play_frame_( Stereo_Buffer&, dsample_t , Stereo_Buffer**, int );
 };
 
 inline blargg_err_t Dual_Resampler::setup( double oversample, double rolloff, double gain )

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Effects_Buffer.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Effects_Buffer.cpp Changed

@@ -1,640 +1,640 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Effects_Buffer.h"
-
-/* Copyright (C) 2006-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
-
-int const fixed_shift = 12;
-#define TO_FIXED( f ) fixed_t ((f) * ((fixed_t) 1 << fixed_shift))
-#define FROM_FIXED( f ) (f >> fixed_shift)
-
-int const max_read = 2560; // determines minimum delay
-
-Effects_Buffer::Effects_Buffer( int max_bufs, int echo_size_ ) : Multi_Buffer( stereo )
-{
-	echo_size = max( max_read * (int) stereo, echo_size_ & ~1 );
-	clock_rate_ = 0;
-	bass_freq_ = 90;
-	bufs = NULL;
-	bufs_size = 0;
-	bufs_max = max( max_bufs, (int) extra_chans );
-	no_echo = true;
-	no_effects = true;
-	
-	// defaults
-	config_.enabled = false;
-	config_.delay 0 = 120;
-	config_.delay 1 = 122;
-	config_.feedback = 0.2f;
-	config_.treble = 0.4f;
-	
-	static float const sep = 0.8f;
-	config_.side_chans 0.pan = -sep;
-	config_.side_chans 1.pan = +sep;
-	config_.side_chans 0.vol = 1.0f;
-	config_.side_chans 1.vol = 1.0f;
-
-	memset( &s, 0, sizeof s );
-	clear();
-}
-
-Effects_Buffer::~Effects_Buffer()
-{
-	delete_bufs();
-}
-
-// avoid using new 
-blargg_err_t Effects_Buffer::new_bufs( int size )
-{
-	bufs = (buf_t*) malloc( size * sizeof *bufs );
-	CHECK_ALLOC( bufs );
-	for ( int i = 0; i < size; i++ )
-		new (bufs + i) buf_t;
-	bufs_size = size;
-	return blargg_ok;
-}
-
-void Effects_Buffer::delete_bufs()
-{
-	if ( bufs )
-	{
-		for ( int i = bufs_size; --i >= 0; )
-			bufs i.~buf_t();
-		free( bufs );
-		bufs = NULL;
-	}
-	bufs_size = 0;
-}
-
-blargg_err_t Effects_Buffer::set_sample_rate( int rate, int msec )
-{
-	// extra to allow farther past-the-end pointers
-	mixer.samples_read = 0;
-	RETURN_ERR( echo.resize( echo_size + stereo ) );
-	return Multi_Buffer::set_sample_rate( rate, msec );
-}
-
-void Effects_Buffer::clock_rate( int rate )
-{
-	clock_rate_ = rate;
-	for ( int i = bufs_size; --i >= 0; )
-		bufs i.clock_rate( clock_rate_ );
-}
-
-void Effects_Buffer::bass_freq( int freq )
-{
-	bass_freq_ = freq;
-	for ( int i = bufs_size; --i >= 0; )
-		bufs i.bass_freq( bass_freq_ );
-}
-
-blargg_err_t Effects_Buffer::set_channel_count( int count, int const types )
-{
-	RETURN_ERR( Multi_Buffer::set_channel_count( count, types ) );
-	
-	delete_bufs();
-	
-	mixer.samples_read = 0;
-	
-	RETURN_ERR( chans.resize( count + extra_chans ) );
-	
-	RETURN_ERR( new_bufs( min( bufs_max, count + extra_chans ) ) );
-	
-	for ( int i = bufs_size; --i >= 0; )
-		RETURN_ERR( bufs i.set_sample_rate( sample_rate(), length() ) );
-	
-	for ( int i = chans.size(); --i >= 0; )
-	{
-		chan_t& ch = chans i;
-		ch.cfg.vol = 1.0f;
-		ch.cfg.pan = 0.0f;
-		ch.cfg.surround = false;
-		ch.cfg.echo = false;
-	}
-	// side channels with echo
-	chans 2.cfg.echo = true;
-	chans 3.cfg.echo = true;
-	
-	clock_rate( clock_rate_ );
-	bass_freq( bass_freq_ );
-	apply_config();
-	clear();
-	
-	return blargg_ok;
-}
-
-void Effects_Buffer::clear_echo()
-{
-	if ( echo.size() )
-		memset( echo.begin(), 0, echo.size() * sizeof echo 0 );
-}
-
-void Effects_Buffer::clear()
-{
-	echo_pos = 0;
-	s.low_pass 0 = 0;
-	s.low_pass 1 = 0;
-	mixer.samples_read = 0;
-	
-	for ( int i = bufs_size; --i >= 0; )
-		bufs i.clear();
-	clear_echo();
-}
-
-Effects_Buffer::channel_t Effects_Buffer::channel( int i )
-{
-	i += extra_chans;
-	require( extra_chans <= i && i < (int) chans.size() );
-	return chans i.channel;
-}
-
-
-// Configuration
-
-// 3 wave positions with/without surround, 2 multi (one with same config as wave)
-int const simple_bufs = 3 * 2 + 2 - 1;
-
-Simple_Effects_Buffer::Simple_Effects_Buffer() :
-	Effects_Buffer( extra_chans + simple_bufs, 18 * 1024 )
-{
-	config_.echo = 0.20f;
-	config_.stereo = 0.20f;
-	config_.surround = true;
-	config_.enabled = false;
-}
-
-void Simple_Effects_Buffer::apply_config()
-{
-	Effects_Buffer::config_t& c = Effects_Buffer::config();
-	
-	c.enabled = config_.enabled;
-	if ( c.enabled )
-	{
-		c.delay 0 = 120;
-		c.delay 1 = 122;
-		c.feedback = config_.echo * 0.7f;
-		c.treble = 0.6f - 0.3f * config_.echo;
-		
-		float sep = config_.stereo + 0.80f;
-		if ( sep > 1.0f )
-			sep = 1.0f;
-		
-		c.side_chans 0.pan = -sep;
-		c.side_chans 1.pan = +sep;
-		
-		for ( int i = channel_count(); --i >= 0; )
-		{
-			chan_config_t& ch = Effects_Buffer::chan_config( i );
-			
-			ch.pan = 0.0f;
-			ch.surround = config_.surround;
-			ch.echo = false;
-			
-			int const type = (channel_types() ? channel_types() i : 0);
-			if ( !(type & noise_type) )
-			{
-				int index = (type & type_index_mask) % 6 - 3;
-				if ( index < 0 )
-				{
-					index += 3;
-					ch.surround = false;
-					ch.echo = true;
-				}
-				if ( index >= 1 )
-				{
-					ch.pan = config_.stereo;
-					if ( index == 1 )
-						ch.pan = -ch.pan;
-				}
-			}
-			else if ( type & 1 )
-			{
-				ch.surround = false;
-			}
-		}
-	}
-	
-	Effects_Buffer::apply_config();
-}
-
-int Effects_Buffer::min_delay() const
-{
-	require( sample_rate() );
-	return max_read * 1000 / sample_rate();
-}
-
-int Effects_Buffer::max_delay() const
-{
-	require( sample_rate() );
-	return (echo_size / stereo - max_read) * 1000 / sample_rate();
-}
-
-void Effects_Buffer::apply_config()
-{
-	int i;
-	
-	if ( !bufs_size )
-		return;
-	
-	s.treble = TO_FIXED( config_.treble );
-	
-	bool echo_dirty = false;
-	
-	fixed_t old_feedback = s.feedback;
-	s.feedback = TO_FIXED( config_.feedback );
-	if ( !old_feedback && s.feedback )
-		echo_dirty = true;
-	
-	// delays
-	for ( i = stereo; --i >= 0; )
-	{
-		int delay = config_.delay i * sample_rate() / 1000 * stereo;
-		delay = max( delay, (int) (max_read * stereo) );
-		delay = min( delay, (int) (echo_size - max_read * stereo) );
-		if ( s.delay i != delay )
-		{
-			s.delay i = delay;
-			echo_dirty = true;
-		}
-	}
-	
-	// side channels
-	for ( i = 2; --i >= 0; )
-	{
-		chans i+2.cfg.vol = chans i.cfg.vol = config_.side_chans i.vol * 0.5f;
-		chans i+2.cfg.pan = chans i.cfg.pan = config_.side_chans i.pan;
-	}
-	
-	// convert volumes
-	for ( i = chans.size(); --i >= 0; )
-	{
-		chan_t& ch = chans i;
-		ch.vol 0 = TO_FIXED( ch.cfg.vol - ch.cfg.vol * ch.cfg.pan );
-		ch.vol 1 = TO_FIXED( ch.cfg.vol + ch.cfg.vol * ch.cfg.pan );
-		if ( ch.cfg.surround )
-			ch.vol 0 = -ch.vol 0;
-	}
-	
-	assign_buffers();
-	
-	// set side channels
-	for ( i = chans.size(); --i >= 0; )
-	{
-		chan_t& ch = chans i;
-		ch.channel.left = chans ch.cfg.echo*2 .channel.center;
-		ch.channel.right = chans ch.cfg.echo*2+1.channel.center;
-	}
-	
-	bool old_echo = !no_echo && !no_effects;
-	
-	// determine whether effects and echo are needed at all
-	no_effects = true;
-	no_echo = true;
-	for ( i = chans.size(); --i >= extra_chans; )
-	{
-		chan_t& ch = chans i;
-		if ( ch.cfg.echo && s.feedback )
-			no_echo = false;
-		
-		if ( ch.vol 0 != TO_FIXED( 1 ) || ch.vol 1 != TO_FIXED( 1 ) )
-			no_effects = false;
-	}
-	if ( !no_echo )
-		no_effects = false;
-	
-	if ( chans 0.vol 0 != TO_FIXED( 1 ) ||
-			chans 0.vol 1 != TO_FIXED( 0 ) ||
-			chans 1.vol 0 != TO_FIXED( 0 ) ||
-			chans 1.vol 1 != TO_FIXED( 1 ) )
-		no_effects = false;
-	
-	if ( !config_.enabled )
-		no_effects = true;
-	
-	if ( no_effects )
-	{
-		for ( i = chans.size(); --i >= 0; )
-		{
-			chan_t& ch = chans i;
-			ch.channel.center = &bufs 2;
-			ch.channel.left = &bufs 0;
-			ch.channel.right = &bufs 1;
-		}
-	}
-	
-	mixer.bufs 0 = &bufs 0;
-	mixer.bufs 1 = &bufs 1;
-	mixer.bufs 2 = &bufs 2;
-	
-	if ( echo_dirty || (!old_echo && (!no_echo && !no_effects)) )
-		clear_echo();
-	
-	channels_changed();
-}
-
-void Effects_Buffer::assign_buffers()
-{
-	// assign channels to buffers
-	int buf_count = 0;
-	for ( int i = 0; i < (int) chans.size(); i++ )
-	{
-		// put second two side channels at end to give priority to main channels
-		// in case closest matching is necessary
-		int x = i;
-		if ( i > 1 )
-			x += 2;
-		if ( x >= (int) chans.size() )
-			x -= (chans.size() - 2);
-		chan_t& ch = chans x;
-		
-		int b = 0;
-		for ( ; b < buf_count; b++ )
-		{
-			if ( ch.vol 0 == bufs b.vol 0 &&
-					ch.vol 1 == bufs b.vol 1 &&
-					(ch.cfg.echo == bufs b.echo || !s.feedback) )
-				break;
-		}
-		
-		if ( b >= buf_count )
-		{
-			if ( buf_count < bufs_max )
-			{
-				bufs b.vol 0 = ch.vol 0;
-				bufs b.vol 1 = ch.vol 1;
-				bufs b.echo = ch.cfg.echo;
-				buf_count++;
-			}
-			else
-			{
-				// TODO: this is a mess, needs refinement
-				dprintf( "Effects_Buffer ran out of buffers; using closest match\n" );
-				b = 0;
-				fixed_t best_dist = TO_FIXED( 8 );
-				for ( int h = buf_count; --h >= 0; )
-				{
-					#define CALC_LEVELS( vols, sum, diff, surround ) \
-					fixed_t sum, diff;\
-					bool surround = false;\
-					{\
-						fixed_t vol_0 = vols 0;\
-						if ( vol_0 < 0 ) vol_0 = -vol_0, surround = true;\
-						fixed_t vol_1 = vols 1;\
-						if ( vol_1 < 0 ) vol_1 = -vol_1, surround = true;\
-						sum = vol_0 + vol_1;\
-						diff = vol_0 - vol_1;\
-					}
-					CALC_LEVELS( ch.vol, ch_sum, ch_diff, ch_surround );
-					CALC_LEVELS( bufs h.vol, buf_sum, buf_diff, buf_surround );
-					
-					fixed_t dist = abs( ch_sum - buf_sum ) + abs( ch_diff - buf_diff );
-					
-					if ( ch_surround != buf_surround )
-						dist += TO_FIXED( 1 ) / 2;
-					
-					if ( s.feedback && ch.cfg.echo != bufs h.echo )
-						dist += TO_FIXED( 1 ) / 2;
-					
-					if ( best_dist > dist )
-					{
-						best_dist = dist;
-						b = h;
-					}
-				}
-			}
-		}
-		
-		//dprintf( "ch %d->buf %d\n", x, b );
-		ch.channel.center = &bufs b;
-	}
-}
-
-
-// Mixing
-
-void Effects_Buffer::end_frame( blip_time_t time )
-{
-	for ( int i = bufs_size; --i >= 0; )
-		bufs i.end_frame( time );
-}
-
-int Effects_Buffer::read_samples( blip_sample_t out , int out_size )
-{
-	out_size = min( out_size, samples_avail() );
-	
-	int pair_count = int (out_size >> 1);
-	require( pair_count * stereo == out_size ); // must read an even number of samples
-	if ( pair_count )
-	{
-		if ( no_effects )
-		{
-			mixer.read_pairs( out, pair_count );
-		}
-		else
-		{
-			int pairs_remain = pair_count;
-			do
-			{
-				// mix at most max_read pairs at a time
-				int count = max_read;
-				if ( count > pairs_remain )
-					count = pairs_remain;
-				
-				if ( no_echo )
-				{
-					// optimization: clear echo here to keep mix_effects() a leaf function
-					echo_pos = 0;
-					memset( echo.begin(), 0, count * stereo * sizeof echo 0 );
-				}
-				mix_effects( out, count );
-				
-				int new_echo_pos = echo_pos + count * stereo;
-				if ( new_echo_pos >= echo_size )
-					new_echo_pos -= echo_size;
-				echo_pos = new_echo_pos;
-				assert( echo_pos < echo_size );
-				
-				out += count * stereo;
-				mixer.samples_read += count;
-				pairs_remain -= count;
-			}
-			while ( pairs_remain );
-		}
-		
-		if ( samples_avail() <= 0 || immediate_removal() )
-		{
-			for ( int i = bufs_size; --i >= 0; )
-			{
-				buf_t& b = bufs i;
-				// TODO: might miss non-silence settling since it checks END of last read
-				if ( b.non_silent() )
-					b.remove_samples( mixer.samples_read );
-				else
-					b.remove_silence( mixer.samples_read );
-			}
-			mixer.samples_read = 0;
-		}
-	}
-	return out_size;
-}
-
-void Effects_Buffer::mix_effects( blip_sample_t out_ , int pair_count )
-{
-	typedef fixed_t stereo_fixed_t stereo;
-	
-	// add channels with echo, do echo, add channels without echo, then convert to 16-bit and output
-	int echo_phase = 1;
-	do
-	{
-		// mix any modified buffers
-		{
-			buf_t* buf = bufs;
-			int bufs_remain = bufs_size;
-			do
-			{
-				if ( buf->non_silent() && buf->echo == echo_phase )
-				{
-					stereo_fixed_t* BLARGG_RESTRICT out = (stereo_fixed_t*) &echo echo_pos;
-					int const bass = BLIP_READER_BASS( *buf );
-					BLIP_READER_BEGIN( in, *buf );
-					BLIP_READER_ADJ_( in, mixer.samples_read );
-					fixed_t const vol_0 = buf->vol 0;
-					fixed_t const vol_1 = buf->vol 1;
-					
-					int count = (unsigned) (echo_size - echo_pos) / stereo;
-					int remain = pair_count;
-					if ( count > remain )
-						count = remain;
-					do
-					{
-						remain -= count;
-						BLIP_READER_ADJ_( in, count );
-						
-						out += count;
-						int offset = -count;
-						do
-						{
-							fixed_t s = BLIP_READER_READ( in );
-							BLIP_READER_NEXT_IDX_( in, bass, offset );
-							
-							out offset 0 += s * vol_0;
-							out offset 1 += s * vol_1;
-						}
-						while ( ++offset );
-						
-						out = (stereo_fixed_t*) echo.begin();
-						count = remain;
-					}
-					while ( remain );
-					
-					BLIP_READER_END( in, *buf );
-				}
-				buf++;
-			}
-			while ( --bufs_remain );
-		}
-		
-		// add echo
-		if ( echo_phase && !no_echo )
-		{
-			fixed_t const feedback = s.feedback;
-			fixed_t const treble = s.treble;
-			
-			int i = 1;
-			do
-			{
-				fixed_t low_pass = s.low_pass i;
-				
-				fixed_t* echo_end = &echo echo_size + i;
-				fixed_t const* BLARGG_RESTRICT in_pos = &echo echo_pos + i;
-				int out_offset = echo_pos + i + s.delay i;
-				if ( out_offset >= echo_size )
-					out_offset -= echo_size;
-				assert( out_offset < echo_size );
-				fixed_t* BLARGG_RESTRICT out_pos = &echo out_offset;
-				
-				// break into up to three chunks to avoid having to handle wrap-around
-				// in middle of core loop
-				int remain = pair_count;
-				do
-				{
-					fixed_t const* pos = in_pos;
-					if ( pos < out_pos )
-						pos = out_pos;
-					int count = (unsigned) ((char*) echo_end - (char const*) pos) /
-							(unsigned) (stereo * sizeof (fixed_t));
-					if ( count > remain )
-						count = remain;
-					remain -= count;
-					
-					in_pos += count * stereo;
-					out_pos += count * stereo;
-					int offset = -count;
-					do
-					{
-						low_pass += FROM_FIXED( in_pos offset * stereo - low_pass ) * treble;
-						out_pos offset * stereo = FROM_FIXED( low_pass ) * feedback;
-					}
-					while ( ++offset );
-					
-					if ( in_pos >= echo_end ) in_pos -= echo_size;
-					if ( out_pos >= echo_end ) out_pos -= echo_size;
-				}
-				while ( remain );
-				
-				s.low_pass i = low_pass;
-			}
-			while ( --i >= 0 );
-		}
-	}
-	while ( --echo_phase >= 0 );
-	
-	// clamp to 16 bits
-	{
-		stereo_fixed_t const* BLARGG_RESTRICT in = (stereo_fixed_t*) &echo echo_pos;
-		typedef blip_sample_t stereo_blip_sample_t stereo;
-		stereo_blip_sample_t* BLARGG_RESTRICT out = (stereo_blip_sample_t*) out_;
-		int count = (unsigned) (echo_size - echo_pos) / (unsigned) stereo;
-		int remain = pair_count;
-		if ( count > remain )
-			count = remain;
-		do
-		{
-			remain -= count;
-			in += count;
-			out += count;
-			int offset = -count;
-			do
-			{
-				fixed_t in_0 = FROM_FIXED( in offset 0 );
-				fixed_t in_1 = FROM_FIXED( in offset 1 );
-				
-				BLIP_CLAMP( in_0, in_0 );
-				out offset 0 = (blip_sample_t) in_0;
-				
-				BLIP_CLAMP( in_1, in_1 );
-				out offset 1 = (blip_sample_t) in_1;
-			}
-			while ( ++offset );
-			
-			in = (stereo_fixed_t*) echo.begin();
-			count = remain;
-		}
-		while ( remain );
-	}
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Effects_Buffer.h"
+
+/* Copyright (C) 2006-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
+
+int const fixed_shift = 12;
+#define TO_FIXED( f ) fixed_t ((f) * ((fixed_t) 1 << fixed_shift))
+#define FROM_FIXED( f ) ((f) >> fixed_shift)
+
+int const max_read = 2560; // determines minimum delay
+
+Effects_Buffer::Effects_Buffer( int max_bufs, int echo_size_ ) : Multi_Buffer( stereo )
+{
+	echo_size = max( max_read * (int) stereo, echo_size_ & ~1 );
+	clock_rate_ = 0;
+	bass_freq_ = 90;
+	bufs = NULL;
+	bufs_size = 0;
+	bufs_max = max( max_bufs, (int) extra_chans );
+	no_echo = true;
+	no_effects = true;
+	
+	// defaults
+	config_.enabled = false;
+	config_.delay 0 = 120;
+	config_.delay 1 = 122;
+	config_.feedback = 0.2f;
+	config_.treble = 0.4f;
+	
+	static float const sep = 0.8f;
+	config_.side_chans 0.pan = -sep;
+	config_.side_chans 1.pan = +sep;
+	config_.side_chans 0.vol = 1.0f;
+	config_.side_chans 1.vol = 1.0f;
+
+	memset( &s, 0, sizeof s );
+	clear();
+}
+
+Effects_Buffer::~Effects_Buffer()
+{
+	delete_bufs();
+}
+
+// avoid using new 
+blargg_err_t Effects_Buffer::new_bufs( int size )
+{
+	bufs = (buf_t*) malloc( size * sizeof *bufs );
+	CHECK_ALLOC( bufs );
+	for ( int i = 0; i < size; i++ )
+		new (bufs + i) buf_t;
+	bufs_size = size;
+	return blargg_ok;
+}
+
+void Effects_Buffer::delete_bufs()
+{
+	if ( bufs )
+	{
+		for ( int i = bufs_size; --i >= 0; )
+			bufs i.~buf_t();
+		free( bufs );
+		bufs = NULL;
+	}
+	bufs_size = 0;
+}
+
+blargg_err_t Effects_Buffer::set_sample_rate( int rate, int msec )
+{
+	// extra to allow farther past-the-end pointers
+	mixer.samples_read = 0;
+	RETURN_ERR( echo.resize( echo_size + stereo ) );
+	return Multi_Buffer::set_sample_rate( rate, msec );
+}
+
+void Effects_Buffer::clock_rate( int rate )
+{
+	clock_rate_ = rate;
+	for ( int i = bufs_size; --i >= 0; )
+		bufs i.clock_rate( clock_rate_ );
+}
+
+void Effects_Buffer::bass_freq( int freq )
+{
+	bass_freq_ = freq;
+	for ( int i = bufs_size; --i >= 0; )
+		bufs i.bass_freq( bass_freq_ );
+}
+
+blargg_err_t Effects_Buffer::set_channel_count( int count, int const types )
+{
+	RETURN_ERR( Multi_Buffer::set_channel_count( count, types ) );
+	
+	delete_bufs();
+	
+	mixer.samples_read = 0;
+	
+	RETURN_ERR( chans.resize( count + extra_chans ) );
+	
+	RETURN_ERR( new_bufs( min( bufs_max, count + extra_chans ) ) );
+	
+	for ( int i = bufs_size; --i >= 0; )
+		RETURN_ERR( bufs i.set_sample_rate( sample_rate(), length() ) );
+	
+	for ( int i = chans.size(); --i >= 0; )
+	{
+		chan_t& ch = chans i;
+		ch.cfg.vol = 1.0f;
+		ch.cfg.pan = 0.0f;
+		ch.cfg.surround = false;
+		ch.cfg.echo = false;
+	}
+	// side channels with echo
+	chans 2.cfg.echo = true;
+	chans 3.cfg.echo = true;
+	
+	clock_rate( clock_rate_ );
+	bass_freq( bass_freq_ );
+	apply_config();
+	clear();
+	
+	return blargg_ok;
+}
+
+void Effects_Buffer::clear_echo()
+{
+	if ( echo.size() )
+		memset( echo.begin(), 0, echo.size() * sizeof echo 0 );
+}
+
+void Effects_Buffer::clear()
+{
+	echo_pos = 0;
+	s.low_pass 0 = 0;
+	s.low_pass 1 = 0;
+	mixer.samples_read = 0;
+	
+	for ( int i = bufs_size; --i >= 0; )
+		bufs i.clear();
+	clear_echo();
+}
+
+Effects_Buffer::channel_t Effects_Buffer::channel( int i )
+{
+	i += extra_chans;
+	require( extra_chans <= i && i < (int) chans.size() );
+	return chans i.channel;
+}
+
+
+// Configuration
+
+// 3 wave positions with/without surround, 2 multi (one with same config as wave)
+int const simple_bufs = 3 * 2 + 2 - 1;
+
+Simple_Effects_Buffer::Simple_Effects_Buffer() :
+	Effects_Buffer( extra_chans + simple_bufs, 18 * 1024 )
+{
+	config_.echo = 0.20f;
+	config_.stereo = 0.20f;
+	config_.surround = true;
+	config_.enabled = false;
+}
+
+void Simple_Effects_Buffer::apply_config()
+{
+	Effects_Buffer::config_t& c = Effects_Buffer::config();
+	
+	c.enabled = config_.enabled;
+	if ( c.enabled )
+	{
+		c.delay 0 = 120;
+		c.delay 1 = 122;
+		c.feedback = config_.echo * 0.7f;
+		c.treble = 0.6f - 0.3f * config_.echo;
+		
+		float sep = config_.stereo + 0.80f;
+		if ( sep > 1.0f )
+			sep = 1.0f;
+		
+		c.side_chans 0.pan = -sep;
+		c.side_chans 1.pan = +sep;
+		
+		for ( int i = channel_count(); --i >= 0; )
+		{
+			chan_config_t& ch = Effects_Buffer::chan_config( i );
+			
+			ch.pan = 0.0f;
+			ch.surround = config_.surround;
+			ch.echo = false;
+			
+			int const type = (channel_types() ? channel_types() i : 0);
+			if ( !(type & noise_type) )
+			{
+				int index = (type & type_index_mask) % 6 - 3;
+				if ( index < 0 )
+				{
+					index += 3;
+					ch.surround = false;
+					ch.echo = true;
+				}
+				if ( index >= 1 )
+				{
+					ch.pan = config_.stereo;
+					if ( index == 1 )
+						ch.pan = -ch.pan;
+				}
+			}
+			else if ( type & 1 )
+			{
+				ch.surround = false;
+			}
+		}
+	}
+	
+	Effects_Buffer::apply_config();
+}
+
+int Effects_Buffer::min_delay() const
+{
+	require( sample_rate() );
+	return max_read * 1000 / sample_rate();
+}
+
+int Effects_Buffer::max_delay() const
+{
+	require( sample_rate() );
+	return (echo_size / stereo - max_read) * 1000 / sample_rate();
+}
+
+void Effects_Buffer::apply_config()
+{
+	int i;
+	
+	if ( !bufs_size )
+		return;
+	
+	s.treble = TO_FIXED( config_.treble );
+	
+	bool echo_dirty = false;
+	
+	fixed_t old_feedback = s.feedback;
+	s.feedback = TO_FIXED( config_.feedback );
+	if ( !old_feedback && s.feedback )
+		echo_dirty = true;
+	
+	// delays
+	for ( i = stereo; --i >= 0; )
+	{
+		int delay = config_.delay i * sample_rate() / 1000 * stereo;
+		delay = max( delay, (int) (max_read * stereo) );
+		delay = min( delay, (int) (echo_size - max_read * stereo) );
+		if ( s.delay i != delay )
+		{
+			s.delay i = delay;
+			echo_dirty = true;
+		}
+	}
+	
+	// side channels
+	for ( i = 2; --i >= 0; )
+	{
+		chans i+2.cfg.vol = chans i.cfg.vol = config_.side_chans i.vol * 0.5f;
+		chans i+2.cfg.pan = chans i.cfg.pan = config_.side_chans i.pan;
+	}
+	
+	// convert volumes
+	for ( i = chans.size(); --i >= 0; )
+	{
+		chan_t& ch = chans i;
+		ch.vol 0 = TO_FIXED( ch.cfg.vol - ch.cfg.vol * ch.cfg.pan );
+		ch.vol 1 = TO_FIXED( ch.cfg.vol + ch.cfg.vol * ch.cfg.pan );
+		if ( ch.cfg.surround )
+			ch.vol 0 = -ch.vol 0;
+	}
+	
+	assign_buffers();
+	
+	// set side channels
+	for ( i = chans.size(); --i >= 0; )
+	{
+		chan_t& ch = chans i;
+		ch.channel.left = chans ch.cfg.echo*2 .channel.center;
+		ch.channel.right = chans ch.cfg.echo*2+1.channel.center;
+	}
+	
+	bool old_echo = !no_echo && !no_effects;
+	
+	// determine whether effects and echo are needed at all
+	no_effects = true;
+	no_echo = true;
+	for ( i = chans.size(); --i >= extra_chans; )
+	{
+		chan_t& ch = chans i;
+		if ( ch.cfg.echo && s.feedback )
+			no_echo = false;
+		
+		if ( ch.vol 0 != TO_FIXED( 1 ) || ch.vol 1 != TO_FIXED( 1 ) )
+			no_effects = false;
+	}
+	if ( !no_echo )
+		no_effects = false;
+	
+	if ( chans 0.vol 0 != TO_FIXED( 1 ) ||
+			chans 0.vol 1 != TO_FIXED( 0 ) ||
+			chans 1.vol 0 != TO_FIXED( 0 ) ||
+			chans 1.vol 1 != TO_FIXED( 1 ) )
+		no_effects = false;
+	
+	if ( !config_.enabled )
+		no_effects = true;
+	
+	if ( no_effects )
+	{
+		for ( i = chans.size(); --i >= 0; )
+		{
+			chan_t& ch = chans i;
+			ch.channel.center = &bufs 2;
+			ch.channel.left = &bufs 0;
+			ch.channel.right = &bufs 1;
+		}
+	}
+	
+	mixer.bufs 0 = &bufs 0;
+	mixer.bufs 1 = &bufs 1;
+	mixer.bufs 2 = &bufs 2;
+	
+	if ( echo_dirty || (!old_echo && (!no_echo && !no_effects)) )
+		clear_echo();
+	
+	channels_changed();
+}
+
+void Effects_Buffer::assign_buffers()
+{
+	// assign channels to buffers
+	int buf_count = 0;
+	for ( int i = 0; i < (int) chans.size(); i++ )
+	{
+		// put second two side channels at end to give priority to main channels
+		// in case closest matching is necessary
+		int x = i;
+		if ( i > 1 )
+			x += 2;
+		if ( x >= (int) chans.size() )
+			x -= (chans.size() - 2);
+		chan_t& ch = chans x;
+		
+		int b = 0;
+		for ( ; b < buf_count; b++ )
+		{
+			if ( ch.vol 0 == bufs b.vol 0 &&
+					ch.vol 1 == bufs b.vol 1 &&
+					(ch.cfg.echo == bufs b.echo || !s.feedback) )
+				break;
+		}
+		
+		if ( b >= buf_count )
+		{
+			if ( buf_count < bufs_max )
+			{
+				bufs b.vol 0 = ch.vol 0;
+				bufs b.vol 1 = ch.vol 1;
+				bufs b.echo = ch.cfg.echo;
+				buf_count++;
+			}
+			else
+			{
+				// TODO: this is a mess, needs refinement
+				dprintf( "Effects_Buffer ran out of buffers; using closest match\n" );
+				b = 0;
+				fixed_t best_dist = TO_FIXED( 8 );
+				for ( int h = buf_count; --h >= 0; )
+				{
+					#define CALC_LEVELS( vols, sum, diff, surround ) \
+					fixed_t sum, diff;\
+					bool surround = false;\
+					{\
+						fixed_t vol_0 = vols 0;\
+						if ( vol_0 < 0 ) vol_0 = -vol_0, surround = true;\
+						fixed_t vol_1 = vols 1;\
+						if ( vol_1 < 0 ) vol_1 = -vol_1, surround = true;\
+						sum = vol_0 + vol_1;\
+						diff = vol_0 - vol_1;\
+					}
+					CALC_LEVELS( ch.vol, ch_sum, ch_diff, ch_surround );
+					CALC_LEVELS( bufs h.vol, buf_sum, buf_diff, buf_surround );
+					
+					fixed_t dist = abs( ch_sum - buf_sum ) + abs( ch_diff - buf_diff );
+					
+					if ( ch_surround != buf_surround )
+						dist += TO_FIXED( 1 ) / 2;
+					
+					if ( s.feedback && ch.cfg.echo != bufs h.echo )
+						dist += TO_FIXED( 1 ) / 2;
+					
+					if ( best_dist > dist )
+					{
+						best_dist = dist;
+						b = h;
+					}
+				}
+			}
+		}
+		
+		//dprintf( "ch %d->buf %d\n", x, b );
+		ch.channel.center = &bufs b;
+	}
+}
+
+
+// Mixing
+
+void Effects_Buffer::end_frame( blip_time_t time )
+{
+	for ( int i = bufs_size; --i >= 0; )
+		bufs i.end_frame( time );
+}
+
+int Effects_Buffer::read_samples( blip_sample_t out , int out_size )
+{
+	out_size = min( out_size, samples_avail() );
+	
+	int pair_count = int (out_size >> 1);
+	require( pair_count * stereo == out_size ); // must read an even number of samples
+	if ( pair_count )
+	{
+		if ( no_effects )
+		{
+			mixer.read_pairs( out, pair_count );
+		}
+		else
+		{
+			int pairs_remain = pair_count;
+			do
+			{
+				// mix at most max_read pairs at a time
+				int count = max_read;
+				if ( count > pairs_remain )
+					count = pairs_remain;
+				
+				if ( no_echo )
+				{
+					// optimization: clear echo here to keep mix_effects() a leaf function
+					echo_pos = 0;
+					memset( echo.begin(), 0, count * stereo * sizeof echo 0 );
+				}
+				mix_effects( out, count );
+				
+				int new_echo_pos = echo_pos + count * stereo;
+				if ( new_echo_pos >= echo_size )
+					new_echo_pos -= echo_size;
+				echo_pos = new_echo_pos;
+				assert( echo_pos < echo_size );
+				
+				out += count * stereo;
+				mixer.samples_read += count;
+				pairs_remain -= count;
+			}
+			while ( pairs_remain );
+		}
+		
+		if ( samples_avail() <= 0 || immediate_removal() )
+		{
+			for ( int i = bufs_size; --i >= 0; )
+			{
+				buf_t& b = bufs i;
+				// TODO: might miss non-silence settling since it checks END of last read
+				if ( b.non_silent() )
+					b.remove_samples( mixer.samples_read );
+				else
+					b.remove_silence( mixer.samples_read );
+			}
+			mixer.samples_read = 0;
+		}
+	}
+	return out_size;
+}
+
+void Effects_Buffer::mix_effects( blip_sample_t out_ , int pair_count )
+{
+	typedef fixed_t stereo_fixed_t stereo;
+	
+	// add channels with echo, do echo, add channels without echo, then convert to 16-bit and output
+	int echo_phase = 1;
+	do
+	{
+		// mix any modified buffers
+		{
+			buf_t* buf = bufs;
+			int bufs_remain = bufs_size;
+			do
+			{
+				if ( buf->non_silent() && buf->echo == echo_phase )
+				{
+					stereo_fixed_t* BLARGG_RESTRICT out = (stereo_fixed_t*) &echo echo_pos;
+					int const bass = BLIP_READER_BASS( *buf );
+					BLIP_READER_BEGIN( in, *buf );
+					BLIP_READER_ADJ_( in, mixer.samples_read );
+					fixed_t const vol_0 = buf->vol 0;
+					fixed_t const vol_1 = buf->vol 1;
+					
+					int count = (unsigned) (echo_size - echo_pos) / stereo;
+					int remain = pair_count;
+					if ( count > remain )
+						count = remain;
+					do
+					{
+						remain -= count;
+						BLIP_READER_ADJ_( in, count );
+						
+						out += count;
+						int offset = -count;
+						do
+						{
+							fixed_t s = BLIP_READER_READ( in );
+							BLIP_READER_NEXT_IDX_( in, bass, offset );
+							
+							out offset 0 += s * vol_0;
+							out offset 1 += s * vol_1;
+						}
+						while ( ++offset );
+						
+						out = (stereo_fixed_t*) echo.begin();
+						count = remain;
+					}
+					while ( remain );
+					
+					BLIP_READER_END( in, *buf );
+				}
+				buf++;
+			}
+			while ( --bufs_remain );
+		}
+		
+		// add echo
+		if ( echo_phase && !no_echo )
+		{
+			fixed_t const feedback = s.feedback;
+			fixed_t const treble = s.treble;
+			
+			int i = 1;
+			do
+			{
+				fixed_t low_pass = s.low_pass i;
+				
+				fixed_t* echo_end = &echo echo_size + i;
+				fixed_t const* BLARGG_RESTRICT in_pos = &echo echo_pos + i;
+				int out_offset = echo_pos + i + s.delay i;
+				if ( out_offset >= echo_size )
+					out_offset -= echo_size;
+				assert( out_offset < echo_size );
+				fixed_t* BLARGG_RESTRICT out_pos = &echo out_offset;
+				
+				// break into up to three chunks to avoid having to handle wrap-around
+				// in middle of core loop
+				int remain = pair_count;
+				do
+				{
+					fixed_t const* pos = in_pos;
+					if ( pos < out_pos )
+						pos = out_pos;
+					int count = (unsigned) ((char*) echo_end - (char const*) pos) /
+							(unsigned) (stereo * sizeof (fixed_t));
+					if ( count > remain )
+						count = remain;
+					remain -= count;
+					
+					in_pos += count * stereo;
+					out_pos += count * stereo;
+					int offset = -count;
+					do
+					{
+						low_pass += FROM_FIXED( in_pos offset * stereo - low_pass ) * treble;
+						out_pos offset * stereo = FROM_FIXED( low_pass ) * feedback;
+					}
+					while ( ++offset );
+					
+					if ( in_pos >= echo_end ) in_pos -= echo_size;
+					if ( out_pos >= echo_end ) out_pos -= echo_size;
+				}
+				while ( remain );
+				
+				s.low_pass i = low_pass;
+			}
+			while ( --i >= 0 );
+		}
+	}
+	while ( --echo_phase >= 0 );
+	
+	// clamp to 16 bits
+	{
+		stereo_fixed_t const* BLARGG_RESTRICT in = (stereo_fixed_t*) &echo echo_pos;
+		typedef blip_sample_t stereo_blip_sample_t stereo;
+		stereo_blip_sample_t* BLARGG_RESTRICT out = (stereo_blip_sample_t*) out_;
+		int count = (unsigned) (echo_size - echo_pos) / (unsigned) stereo;
+		int remain = pair_count;
+		if ( count > remain )
+			count = remain;
+		do
+		{
+			remain -= count;
+			in += count;
+			out += count;
+			int offset = -count;
+			do
+			{
+				fixed_t in_0 = FROM_FIXED( in offset 0 );
+				fixed_t in_1 = FROM_FIXED( in offset 1 );
+				
+				BLIP_CLAMP( in_0, in_0 );
+				out offset 0 = (blip_sample_t) in_0;
+				
+				BLIP_CLAMP( in_1, in_1 );
+				out offset 1 = (blip_sample_t) in_1;
+			}
+			while ( ++offset );
+			
+			in = (stereo_fixed_t*) echo.begin();
+			count = remain;
+		}
+		while ( remain );
+	}
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Effects_Buffer.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Effects_Buffer.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Fir_Resampler.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Fir_Resampler.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Fir_Resampler.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Fir_Resampler.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Apu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Cpu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Cpu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Cpu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Cpu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Cpu_run.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Cpu_run.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Oscs.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Oscs.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Oscs.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gb_Oscs.h Changed

@@ -1,6 +1,6 @@
 // Private oscillators used by Gb_Apu
 
-// Gb_Snd_Emu 0.1.4
+// Gb_Snd_Emu $vers
 #ifndef GB_OSCS_H
 #define GB_OSCS_H
 
@@ -112,9 +112,8 @@
 
 class Gb_Noise : public Gb_Env {
 public:
-	
 	int divider; // noise has more complex frequency divider setup
-	
+
 	void run( blip_time_t, blip_time_t );
 	void write_register( int frame_phase, int reg, int old_data, int data );
 	
@@ -124,6 +123,7 @@
 		Gb_Env::reset();
 		delay = 4 * clk_mul; // TODO: remove?
 	}
+
 private:
 	enum { period2_mask = 0x1FFFF };
 	
@@ -135,7 +135,7 @@
 class Gb_Wave : public Gb_Osc {
 public:
 	int sample_buf; // last wave RAM byte read (hardware has this as well)
-	
+
 	void write_register( int frame_phase, int reg, int old_data, int data );
 	void run( blip_time_t, blip_time_t );
 	
@@ -165,7 +165,7 @@
 	int dac_enabled() const { return regs 0 & 0x80; }
 	
 	void corrupt_wave();
-	
+
 	BOOST::uint8_t* wave_bank() const { return &wave_ram (~regs 0 & bank40_mask) >> 2 & agb_mask; }
 	
 	// Wave index that would be accessed, or -1 if no access would occur

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gbs_Core.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gbs_Core.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gbs_Core.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gbs_Core.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gbs_Cpu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gbs_Cpu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gbs_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gbs_Emu.cpp Changed

@@ -1,143 +1,167 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Gbs_Emu.h"
-
-/* Copyright (C) 2003-2009 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::cgb_eq        = {   0.0,  300 };
-Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq = {   0.0,   30 }; // DMG
-
-Gbs_Emu::Gbs_Emu()
-{
-	sound_hardware = sound_gbs;
-	enable_clicking( false );
-	set_type( gme_gbs_type );
-	set_silence_lookahead( 6 );
-	set_max_initial_silence( 21 );
-	set_gain( 1.2 );
-	
-	// kind of midway between headphones and speaker
-	static equalizer_t const eq = { -1.0, 120 };
-	set_equalizer( eq );
-}
-
-Gbs_Emu::~Gbs_Emu() { }
-
-void Gbs_Emu::unload()
-{
-	core_.unload();
-	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 blargg_ok;
-}
-
-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, h.size );
-		if ( err )
-			return (blargg_is_err_type( err, blargg_err_file_eof ) ? blargg_err_file_type : err);
-		
-		set_track_count( h.track_count );
-		if ( !h.valid_tag() )
-			return blargg_err_file_type;
-		
-		return blargg_ok;
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int ) const
-	{
-		copy_gbs_fields( h, out );
-		return blargg_ok;
-	}
-};
-
-static Music_Emu* new_gbs_emu () { return BLARGG_NEW Gbs_Emu ; }
-static Music_Emu* new_gbs_file() { return BLARGG_NEW Gbs_File; }
-
-gme_type_t_ const gme_gbs_type 1 = {{ "Game Boy", 0, &new_gbs_emu, &new_gbs_file, "GBS", 1 }};
-
-// Setup
-
-blargg_err_t Gbs_Emu::load_( Data_Reader& in )
-{
-	RETURN_ERR( core_.load( in ) );
-	set_warning( core_.warning() );
-	set_track_count( header().track_count );
-	set_voice_count( Gb_Apu::osc_count );
-	core_.apu().volume( gain() );
-	
-	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+3, mixed_type+1
-	};
-	set_voice_types( types );
-	
-	return setup_buffer( 4194304 );
-}
-
-void Gbs_Emu::update_eq( blip_eq_t const& eq )
-{
-	core_.apu().treble_eq( eq );
-}
-
-void Gbs_Emu::set_voice( int i, Blip_Buffer* c, Blip_Buffer* l, Blip_Buffer* r )
-{
-	core_.apu().set_output( i, c, l, r );
-}
-
-void Gbs_Emu::set_tempo_( double t )
-{
-	core_.set_tempo( t );
-}
-
-blargg_err_t Gbs_Emu::start_track_( int track )
-{
-	sound_t mode = sound_hardware;
-	if ( mode == sound_gbs )
-		mode = (header().timer_mode & 0x80) ? sound_cgb : sound_dmg;
-	
-	RETURN_ERR( core_.start_track( track, (Gb_Apu::mode_t) mode ) );
-	
-	// clear buffer AFTER track is started, eliminating initial click
-	return Classic_Emu::start_track_( track );
-}
-
-blargg_err_t Gbs_Emu::run_clocks( blip_time_t& duration, int )
-{
-	return core_.end_frame( duration );
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Gbs_Emu.h"
+
+/* Copyright (C) 2003-2009 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, 0,0,0,0,0,0,0,0 };
+Gbs_Emu::equalizer_t const Gbs_Emu::cgb_eq        = {   0.0,  300, 0,0,0,0,0,0,0,0 };
+Gbs_Emu::equalizer_t const Gbs_Emu::headphones_eq = {   0.0,   30, 0,0,0,0,0,0,0,0 }; // DMG
+
+Gbs_Emu::Gbs_Emu()
+{
+	sound_hardware = sound_gbs;
+	enable_clicking( false );
+	set_type( gme_gbs_type );
+	set_silence_lookahead( 6 );
+	set_max_initial_silence( 21 );
+	set_gain( 1.2 );
+
+	// kind of midway between headphones and speaker
+	static equalizer_t const eq = { -1.0, 120, 0,0,0,0,0,0,0,0 };
+	set_equalizer( eq );
+}
+
+Gbs_Emu::~Gbs_Emu() { }
+
+void Gbs_Emu::unload()
+{
+	core_.unload();
+	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 );
+}
+
+static void hash_gbs_file( Gbs_Emu::header_t const& h, byte const* data, int data_size, Music_Emu::Hash_Function& out )
+{
+	out.hash_( &h.vers, sizeof(h.vers) );
+	out.hash_( &h.track_count, sizeof(h.track_count) );
+	out.hash_( &h.first_track, sizeof(h.first_track) );
+	out.hash_( &h.load_addr0, sizeof(h.load_addr) );
+	out.hash_( &h.init_addr0, sizeof(h.init_addr) );
+	out.hash_( &h.play_addr0, sizeof(h.play_addr) );
+	out.hash_( &h.stack_ptr0, sizeof(h.stack_ptr) );
+	out.hash_( &h.timer_modulo, sizeof(h.timer_modulo) );
+	out.hash_( &h.timer_mode, sizeof(h.timer_mode) );
+	out.hash_( data, data_size );
+}
+
+blargg_err_t Gbs_Emu::track_info_( track_info_t* out, int ) const
+{
+	copy_gbs_fields( header(), out );
+	return blargg_ok;
+}
+
+struct Gbs_File : Gme_Info_
+{
+	Gbs_Emu::header_t const* h;
+	
+	Gbs_File() { set_type( gme_gbs_type ); }
+	
+	blargg_err_t load_mem_( byte const begin , int size )
+	{
+		h = ( Gbs_Emu::header_t * ) begin;
+
+		set_track_count( h->track_count );
+		if ( !h->valid_tag() )
+			return blargg_err_file_type;
+		
+		return blargg_ok;
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int ) const
+	{
+		copy_gbs_fields( Gbs_Emu::header_t( *h ), out );
+		return blargg_ok;
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		hash_gbs_file( *h, file_begin() + h->size, file_end() - file_begin() - h->size, out );
+		return blargg_ok;
+	}
+};
+
+static Music_Emu* new_gbs_emu () { return BLARGG_NEW Gbs_Emu ; }
+static Music_Emu* new_gbs_file() { return BLARGG_NEW Gbs_File; }
+
+gme_type_t_ const gme_gbs_type 1 = {{ "Game Boy", 0, &new_gbs_emu, &new_gbs_file, "GBS", 1 }};
+
+// Setup
+
+blargg_err_t Gbs_Emu::load_( Data_Reader& in )
+{
+	RETURN_ERR( core_.load( in ) );
+	set_warning( core_.warning() );
+	set_track_count( header().track_count );
+	set_voice_count( Gb_Apu::osc_count );
+	core_.apu().volume( gain() );
+	
+	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+3, mixed_type+1
+	};
+	set_voice_types( types );
+	
+	return setup_buffer( 4194304 );
+}
+
+void Gbs_Emu::update_eq( blip_eq_t const& eq )
+{
+	core_.apu().treble_eq( eq );
+}
+
+void Gbs_Emu::set_voice( int i, Blip_Buffer* c, Blip_Buffer* l, Blip_Buffer* r )
+{
+	core_.apu().set_output( i, c, l, r );
+}
+
+void Gbs_Emu::set_tempo_( double t )
+{
+	core_.set_tempo( t );
+}
+
+blargg_err_t Gbs_Emu::start_track_( int track )
+{
+	sound_t mode = sound_hardware;
+	if ( mode == sound_gbs )
+		mode = (header().timer_mode & 0x80) ? sound_cgb : sound_dmg;
+	
+	RETURN_ERR( core_.start_track( track, (Gb_Apu::mode_t) mode ) );
+	
+	// clear buffer AFTER track is started, eliminating initial click
+	return Classic_Emu::start_track_( track );
+}
+
+blargg_err_t Gbs_Emu::run_clocks( blip_time_t& duration, int )
+{
+	return core_.end_frame( duration );
+}
+
+blargg_err_t Gbs_Emu::hash_( Hash_Function& out ) const
+{
+	hash_gbs_file( header(), core_.rom_().begin(), core_.rom_().file_size(), out );
+	return blargg_ok;
+}
\ No newline at end of file

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gbs_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gbs_Emu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gme_File.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gme_File.cpp Changed

@@ -1,183 +1,183 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Gme_File.h"
-
-/* Copyright (C) 2003-2008 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 Gme_File::unload()
-{
-	clear_playlist(); // BEFORE clearing track count
-	track_count_ = 0;
-	raw_track_count_ = 0;
-	Gme_Loader::unload();
-}
-
-Gme_File::Gme_File()
-{
-	type_ = NULL;
-	user_data_ = NULL;
-	user_cleanup_ = NULL;
-	Gme_File::unload(); // clears fields
-}
-
-Gme_File::~Gme_File()
-{
-	if ( user_cleanup_ )
-		user_cleanup_( user_data_ );
-}
-
-blargg_err_t Gme_File::post_load()
-{
-	if ( !track_count() )
-		set_track_count( type()->track_count );
-	return Gme_Loader::post_load();
-}
-
-void Gme_File::clear_playlist()
-{
-	playlist.clear();
-	clear_playlist_();
-	track_count_ = raw_track_count_;
-}
-
-void Gme_File::copy_field_( char out , const char* in, int in_size )
-{
-	if ( !in || !*in )
-		return;
-	
-	// remove spaces/junk from beginning
-	while ( in_size && unsigned (*in - 1) <= ' ' - 1 )
-	{
-		in++;
-		in_size--;
-	}
-	
-	// truncate
-	if ( in_size > max_field_ )
-		in_size = max_field_;
-	
-	// find terminator
-	int len = 0;
-	while ( len < in_size && in len )
-		len++;
-	
-	// remove spaces/junk from end
-	while ( len && unsigned (in len - 1) <= ' ' )
-		len--;
-	
-	// copy
-	out len = 0;
-	memcpy( out, in, len );
-	
-	// strip out stupid fields that should have been left blank
-	if ( !strcmp( out, "?" ) || !strcmp( out, "<?>" ) || !strcmp( out, "< ? >" ) )
-		out 0 = 0;
-}
-
-void Gme_File::copy_field_( char out , const char* in )
-{
-	copy_field_( out, in, max_field_ );
-}
-
-blargg_err_t Gme_File::remap_track_( int* track_io ) const
-{
-	if ( (unsigned) *track_io >= (unsigned) track_count() )
-		return BLARGG_ERR( BLARGG_ERR_CALLER, "invalid track" );
-	
-	if ( (unsigned) *track_io < (unsigned) playlist.size() )
-	{
-		M3u_Playlist::entry_t const& e = playlist *track_io;
-		*track_io = 0;
-		if ( e.track >= 0 )
-		{
-			*track_io = e.track;
-			// TODO: really needs to be removed?
-			//if ( !(type_->flags_ & 0x02) )
-			// *track_io -= e.decimal_track;
-		}
-		if ( *track_io >= raw_track_count_ )
-			return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "invalid track in m3u playlist" );
-	}
-	else
-	{
-		check( !playlist.size() );
-	}
-	return blargg_ok;
-}
-
-blargg_err_t Gme_File::track_info( track_info_t* out, int track ) const
-{
-	out->track_count = track_count();
-	out->length = -1;
-	out->loop_length = -1;
-	out->intro_length = -1;
-	out->fade_length = -1;
-	out->play_length = -1;
-	out->repeat_count = -1;
-	out->song 0 = 0;
-	out->game 0 = 0;
-	out->author 0 = 0;
-	out->composer 0 = 0;
-	out->engineer 0 = 0;
-	out->sequencer 0 = 0;
-	out->tagger 0 = 0;
-	out->copyright 0 = 0;
-	out->date 0 = 0;
-	out->comment 0 = 0;
-	out->dumper 0 = 0;
-	out->system 0 = 0;
-	out->disc 0 = 0;
-	out->track 0 = 0;
-	out->ost 0 = 0;
-	
-	copy_field_( out->system, type()->system );
-	
-	int remapped = track;
-	RETURN_ERR( remap_track_( &remapped ) );
-	RETURN_ERR( track_info_( out, remapped ) );
-	
-	// override with m3u info
-	if ( playlist.size() )
-	{
-		M3u_Playlist::info_t const& i = playlist.info();
-		copy_field_( out->game , i.title );
-		copy_field_( out->author , i.artist );
-		copy_field_( out->engineer , i.engineer );
-		copy_field_( out->composer , i.composer );
-		copy_field_( out->sequencer, i.sequencer );
-		copy_field_( out->copyright, i.copyright );
-		copy_field_( out->dumper , i.ripping );
-		copy_field_( out->tagger , i.tagging );
-		copy_field_( out->date , i.date );
-		
-		M3u_Playlist::entry_t const& e = playlist track;
-		if ( e.length >= 0 ) out->length = e.length;
-		if ( e.intro >= 0 ) out->intro_length = e.intro;
-		if ( e.loop >= 0 ) out->loop_length = e.loop;
-		if ( e.fade >= 0 ) out->fade_length = e.fade;
-		if ( e.repeat >= 0 ) out->repeat_count = e.repeat;
-		copy_field_( out->song, e.name );
-	}
-	
-	// play_length
-	out->play_length = out->length;
-	if ( out->play_length <= 0 )
-	{
-		out->play_length = out->intro_length + 2 * out->loop_length; // intro + 2 loops
-		if ( out->play_length <= 0 )
-			out->play_length = 150 * 1000; // 2.5 minutes
-	}
-	
-	return blargg_ok;
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Gme_File.h"
+
+/* Copyright (C) 2003-2008 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 Gme_File::unload()
+{
+	clear_playlist(); // BEFORE clearing track count
+	track_count_ = 0;
+	raw_track_count_ = 0;
+	Gme_Loader::unload();
+}
+
+Gme_File::Gme_File()
+{
+	type_ = NULL;
+	user_data_ = NULL;
+	user_cleanup_ = NULL;
+	Gme_File::unload(); // clears fields
+}
+
+Gme_File::~Gme_File()
+{
+	if ( user_cleanup_ )
+		user_cleanup_( user_data_ );
+}
+
+blargg_err_t Gme_File::post_load()
+{
+	if ( !track_count() )
+		set_track_count( type()->track_count );
+	return Gme_Loader::post_load();
+}
+
+void Gme_File::clear_playlist()
+{
+	playlist.clear();
+	clear_playlist_();
+	track_count_ = raw_track_count_;
+}
+
+void Gme_File::copy_field_( char out , const char* in, int in_size )
+{
+	if ( !in || !*in )
+		return;
+	
+	// remove spaces/junk from beginning
+	while ( in_size && unsigned (*in - 1) <= ' ' - 1 )
+	{
+		in++;
+		in_size--;
+	}
+	
+	// truncate
+	if ( in_size > max_field_ )
+		in_size = max_field_;
+	
+	// find terminator
+	int len = 0;
+	while ( len < in_size && in len )
+		len++;
+	
+	// remove spaces/junk from end
+	while ( len && unsigned (in len - 1) <= ' ' )
+		len--;
+	
+	// copy
+	out len = 0;
+	memcpy( out, in, len );
+	
+	// strip out stupid fields that should have been left blank
+	if ( !strcmp( out, "?" ) || !strcmp( out, "<?>" ) || !strcmp( out, "< ? >" ) )
+		out 0 = 0;
+}
+
+void Gme_File::copy_field_( char out , const char* in )
+{
+	copy_field_( out, in, max_field_ );
+}
+
+blargg_err_t Gme_File::remap_track_( int* track_io ) const
+{
+	if ( (unsigned) *track_io >= (unsigned) track_count() )
+		return BLARGG_ERR( BLARGG_ERR_CALLER, "invalid track" );
+	
+	if ( (unsigned) *track_io < (unsigned) playlist.size() )
+	{
+		M3u_Playlist::entry_t const& e = playlist *track_io;
+		*track_io = 0;
+		if ( e.track >= 0 )
+		{
+			*track_io = e.track;
+			// TODO: really needs to be removed?
+			//if ( !(type_->flags_ & 0x02) )
+			// *track_io -= e.decimal_track;
+		}
+		if ( *track_io >= raw_track_count_ )
+			return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "invalid track in m3u playlist" );
+	}
+	else
+	{
+		check( !playlist.size() );
+	}
+	return blargg_ok;
+}
+
+blargg_err_t Gme_File::track_info( track_info_t* out, int track ) const
+{
+	out->track_count = track_count();
+	out->length = -1;
+	out->loop_length = -1;
+	out->intro_length = -1;
+	out->fade_length = -1;
+	out->play_length = -1;
+	out->repeat_count = -1;
+	out->song 0 = 0;
+	out->game 0 = 0;
+	out->author 0 = 0;
+	out->composer 0 = 0;
+	out->engineer 0 = 0;
+	out->sequencer 0 = 0;
+	out->tagger 0 = 0;
+	out->copyright 0 = 0;
+	out->date 0 = 0;
+	out->comment 0 = 0;
+	out->dumper 0 = 0;
+	out->system 0 = 0;
+	out->disc 0 = 0;
+	out->track 0 = 0;
+	out->ost 0 = 0;
+	
+	copy_field_( out->system, type()->system );
+	
+	int remapped = track;
+	RETURN_ERR( remap_track_( &remapped ) );
+	RETURN_ERR( track_info_( out, remapped ) );
+	
+	// override with m3u info
+	if ( playlist.size() )
+	{
+		M3u_Playlist::info_t const& i = playlist.info();
+		copy_field_( out->game , i.title );
+		copy_field_( out->author , i.artist );
+		copy_field_( out->engineer , i.engineer );
+		copy_field_( out->composer , i.composer );
+		copy_field_( out->sequencer, i.sequencer );
+		copy_field_( out->copyright, i.copyright );
+		copy_field_( out->dumper , i.ripping );
+		copy_field_( out->tagger , i.tagging );
+		copy_field_( out->date , i.date );
+		
+		M3u_Playlist::entry_t const& e = playlist track;
+		if ( e.length >= 0 ) out->length = e.length;
+		if ( e.intro >= 0 ) out->intro_length = e.intro;
+		if ( e.loop >= 0 ) out->loop_length = e.loop;
+		if ( e.fade >= 0 ) out->fade_length = e.fade;
+		if ( e.repeat >= 0 ) out->repeat_count = e.repeat;
+		copy_field_( out->song, e.name );
+	}
+	
+	// play_length
+	out->play_length = out->length;
+	if ( out->play_length <= 0 )
+	{
+		out->play_length = out->intro_length + 2 * out->loop_length; // intro + 2 loops
+		if ( out->play_length <= 0 )
+			out->play_length = 150 * 1000; // 2.5 minutes
+	}
+	
+	return blargg_ok;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gme_File.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gme_File.h Changed

@@ -1,152 +1,153 @@
-// Common interface for track information
-
-// Game_Music_Emu 0.6-pre
-#ifndef GME_FILE_H
-#define GME_FILE_H
-
-#include "gme.h"
-#include "Gme_Loader.h"
-#include "M3u_Playlist.h"
-
-struct track_info_t
-{
-	int track_count;
-	
-	/* 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 */
-	int fade_length;
-	int repeat_count;
-	
-	/* Length if available, otherwise intro_length+loop_length*2 if available,
-	otherwise a default of 150000 (2.5 minutes). */
-	int play_length;
-	
-	/* empty string if not available */
-	char system    256;
-	char game      256;
-	char song      256;
-	char author    256;
-	char composer  256;
-	char engineer  256;
-	char sequencer 256;
-	char tagger    256;
-	char copyright 256;
-	char date      256;
-	char comment   256;
-	char dumper    256;
-	char disc      256;
-	char track     256;
-	char ost       256;
-};
-enum { gme_max_field = 255 };
-
-class Gme_File : public Gme_Loader {
-public:
-	// Type of emulator. For example if this returns gme_nsfe_type, this object
-	// is an NSFE emulator, and you can downcast to an Nsfe_Emu* if necessary.
-	gme_type_t type() const;
-	
-	// Loads 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();
-	
-	// Number of tracks or 0 if no file has been loaded
-	int track_count() const;
-	
-	// Gets 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
-	
-	// Sets/gets 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_; }
-	
-	// Registers 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:
-	Gme_File();
-	~Gme_File();
-
-protected:
-	// Services
-	void set_type( gme_type_t t )               { type_ = t; }
-	void set_track_count( int n )               { track_count_ = raw_track_count_ = n; }
-	
-	// Must be overridden
-	virtual blargg_err_t track_info_( track_info_t* out, int track ) const BLARGG_PURE( ; )
-	
-	// Optionally overridden
-	virtual void clear_playlist_() { }
-
-protected: // Gme_Loader overrides
-	virtual void unload();
-	virtual blargg_err_t post_load();
-
-protected:
-	blargg_err_t remap_track_( int* track_io ) const; // need by Music_Emu
-private:
-	gme_type_t type_;
-	void* user_data_;
-	gme_user_cleanup_t user_cleanup_;
-	int track_count_;
-	int raw_track_count_;
-	M3u_Playlist playlist;
-	char playlist_warning 64;
-	
-	blargg_err_t load_m3u_( blargg_err_t );
-
-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 );
-};
-
-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 (C++ only) */
-	Music_Emu* (*new_info)();/* Create new info reader for this type (C++ only) */
-	
-	/* internal */
-	const char* extension_;
-	int flags_;
-};
-
-/* Emulator type constants for each supported file type */
-extern const gme_type_t_
-	gme_ay_type 1,
-	gme_gbs_type 1,
-	gme_gym_type 1,
-	gme_hes_type 1,
-	gme_kss_type 1,
-	gme_nsf_type 1,
-	gme_nsfe_type 1,
-	gme_sap_type 1,
-	gme_sgc_type 1,
-	gme_spc_type 1,
-	gme_vgm_type 1,
-	gme_vgz_type 1;
-
-#define GME_COPY_FIELD( in, out, name ) \
-	{ Gme_File::copy_field_( out->name, in.name, sizeof in.name ); }
-
-inline gme_type_t Gme_File::type() const            { return type_; }
-
-inline int Gme_File::track_count() const            { return track_count_; }
-
-inline blargg_err_t Gme_File::track_info_( track_info_t*, int ) const { return blargg_ok; }
-
-#endif
+// Common interface for track information
+
+// Game_Music_Emu $vers
+#ifndef GME_FILE_H
+#define GME_FILE_H
+
+#include "gme.h"
+#include "Gme_Loader.h"
+#include "M3u_Playlist.h"
+
+struct track_info_t
+{
+	int track_count;
+	
+	/* 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 */
+	int fade_length;
+	int repeat_count;
+	
+	/* Length if available, otherwise intro_length+loop_length*2 if available,
+	otherwise a default of 150000 (2.5 minutes). */
+	int play_length;
+	
+	/* empty string if not available */
+	char system    256;
+	char game      256;
+	char song      256;
+	char author    256;
+	char composer  256;
+	char engineer  256;
+	char sequencer 256;
+	char tagger    256;
+	char copyright 256;
+	char date      256;
+	char comment   256;
+	char dumper    256;
+	char disc      256;
+	char track     256;
+	char ost       256;
+};
+enum { gme_max_field = 255 };
+
+class Gme_File : public Gme_Loader {
+public:
+	// Type of emulator. For example if this returns gme_nsfe_type, this object
+	// is an NSFE emulator, and you can downcast to an Nsfe_Emu* if necessary.
+	gme_type_t type() const;
+	
+	// Loads 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();
+	
+	// Number of tracks or 0 if no file has been loaded
+	int track_count() const;
+	
+	// Gets 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
+	
+	// Sets/gets 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_; }
+	
+	// Registers 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:
+	Gme_File();
+	~Gme_File();
+
+protected:
+	// Services
+	void set_type( gme_type_t t )               { type_ = t; }
+	void set_track_count( int n )               { track_count_ = raw_track_count_ = n; }
+	
+	// Must be overridden
+	virtual blargg_err_t track_info_( track_info_t* out, int track ) const BLARGG_PURE( ; )
+	
+	// Optionally overridden
+	virtual void clear_playlist_() { }
+
+protected: // Gme_Loader overrides
+	virtual void unload();
+	virtual blargg_err_t post_load();
+
+protected:
+	blargg_err_t remap_track_( int* track_io ) const; // need by Music_Emu
+private:
+	gme_type_t type_;
+	void* user_data_;
+	gme_user_cleanup_t user_cleanup_;
+	int track_count_;
+	int raw_track_count_;
+	M3u_Playlist playlist;
+	char playlist_warning 64;
+	
+	blargg_err_t load_m3u_( blargg_err_t );
+
+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 );
+};
+
+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 (C++ only) */
+	Music_Emu* (*new_info)();/* Create new info reader for this type (C++ only) */
+	
+	/* internal */
+	const char* extension_;
+	int flags_;
+};
+
+/* Emulator type constants for each supported file type */
+extern const gme_type_t_
+	gme_ay_type 1,
+	gme_gbs_type 1,
+	gme_gym_type 1,
+	gme_hes_type 1,
+	gme_kss_type 1,
+	gme_nsf_type 1,
+	gme_nsfe_type 1,
+	gme_sap_type 1,
+    gme_sfm_type 1,
+	gme_sgc_type 1,
+	gme_spc_type 1,
+	gme_vgm_type 1,
+	gme_vgz_type 1;
+
+#define GME_COPY_FIELD( in, out, name ) \
+	{ Gme_File::copy_field_( out->name, in.name, sizeof in.name ); }
+
+inline gme_type_t Gme_File::type() const            { return type_; }
+
+inline int Gme_File::track_count() const            { return track_count_; }
+
+inline blargg_err_t Gme_File::track_info_( track_info_t*, int ) const { return blargg_ok; }
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gme_Loader.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gme_Loader.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gme_Loader.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gme_Loader.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gym_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gym_Emu.cpp Changed

@@ -1,405 +1,428 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Gym_Emu.h"
-
-#include "blargg_endian.h"
-
-/* Copyright (C) 2003-2008 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"
-
-double const min_tempo = 0.25;
-double const oversample = 5 / 3.0;
-double const fm_gain = 3.0;
-
-int const base_clock = 53700300;
-int const clock_rate = base_clock / 15;
-
-Gym_Emu::Gym_Emu()
-{
-	resampler.set_callback( play_frame_, this );
-	pos = NULL;
-	disable_oversampling_ = false;
-	set_type( gme_gym_type );
-	set_silence_lookahead( 1 ); // tracks should already be trimmed
-	pcm_buf = stereo_buf.center();
-}
-
-Gym_Emu::~Gym_Emu() { }
-
-// Track info
-
-static void get_gym_info( Gym_Emu::header_t const& h, int length, track_info_t* out )
-{
-	if ( 0 != memcmp( h.tag, "GYMX", 4 ) )
-		return;
-	
-	length = length * 50 / 3; // 1000 / 60
-	int loop = get_le32( h.loop_start );
-	if ( loop )
-	{
-		out->intro_length = loop * 50 / 3;
-		out->loop_length = length - out->intro_length;
-	}
-	else
-	{
-		out->length = length;
-		out->intro_length = length; // make it clear that track is no longer than length
-		out->loop_length = 0;
-	}
-	
-	// more stupidity where the field should have been left blank
-	if ( strcmp( h.song, "Unknown Song" ) )
-		GME_COPY_FIELD( h, out, song );
-	
-	if ( strcmp( h.game, "Unknown Game" ) )
-		GME_COPY_FIELD( h, out, game );
-	
-	if ( strcmp( h.copyright, "Unknown Publisher" ) )
-		GME_COPY_FIELD( h, out, copyright );
-	
-	if ( strcmp( h.dumper, "Unknown Person" ) )
-		GME_COPY_FIELD( h, out, dumper );
-	
-	if ( strcmp( h.comment, "Header added by YMAMP" ) )
-		GME_COPY_FIELD( h, out, comment );
-}
-
-static int gym_track_length( byte const p , byte const* end )
-{
-	int time = 0;
-	while ( p < end )
-	{
-		switch ( *p++ )
-		{
-		case 0:
-			time++;
-			break;
-		
-		case 1:
-		case 2:
-			p += 2;
-			break;
-		
-		case 3:
-			p += 1;
-			break;
-		}
-	}
-	return time;
-}
-
-blargg_err_t Gym_Emu::track_info_( track_info_t* out, int ) const
-{
-	get_gym_info( header_, gym_track_length( log_begin(), file_end() ), out );
-	return blargg_ok;
-}
-
-static blargg_err_t check_header( byte const in , int size, int* data_offset = NULL )
-{
-	if ( size < 4 )
-		return blargg_err_file_type;
-	
-	if ( memcmp( in, "GYMX", 4 ) == 0 )
-	{
-		if ( size < Gym_Emu::header_t::size + 1 )
-			return blargg_err_file_type;
-		
-		if ( memcmp( ((Gym_Emu::header_t const*) in)->packed, "\0\0\0\0", 4 ) != 0 )
-			return BLARGG_ERR( BLARGG_ERR_FILE_FEATURE, "packed GYM file" );
-		
-		if ( data_offset )
-			*data_offset = Gym_Emu::header_t::size;
-	}
-	else if ( *in > 3 )
-	{
-		return blargg_err_file_type;
-	}
-	
-	return blargg_ok;
-}
-
-struct Gym_File : Gme_Info_
-{
-	int data_offset;
-	
-	Gym_File() { set_type( gme_gym_type ); }
-	
-	blargg_err_t load_mem_( byte const in , int size )
-	{
-		data_offset = 0;
-		return check_header( in, size, &data_offset );
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int ) const
-	{
-		int length = gym_track_length( &file_begin() data_offset, file_end() );
-		get_gym_info( *(Gym_Emu::header_t const*) file_begin(), length, out );
-		return blargg_ok;
-	}
-};
-
-static Music_Emu* new_gym_emu () { return BLARGG_NEW Gym_Emu ; }
-static Music_Emu* new_gym_file() { return BLARGG_NEW Gym_File; }
-
-gme_type_t_ const gme_gym_type 1 = {{ "Sega Genesis", 1, &new_gym_emu, &new_gym_file, "GYM", 0 }};
-
-// Setup
-
-blargg_err_t Gym_Emu::set_sample_rate_( int sample_rate )
-{
-	blip_eq_t eq( -32, 8000, sample_rate );
-	apu.treble_eq( eq );
-	pcm_synth.treble_eq( eq );
-	
-	apu.volume( 0.135 * fm_gain * gain() );
-	
-	double factor = oversample;
-	if ( disable_oversampling_ )
-		factor = (double) base_clock / 7 / 144 / sample_rate;
-	RETURN_ERR( resampler.setup( factor, 0.990, fm_gain * gain() ) );
-	factor = resampler.rate();
-	double fm_rate = sample_rate * factor;
-	
-	RETURN_ERR( stereo_buf.set_sample_rate( sample_rate, int (1000 / 60.0 / min_tempo) ) );
-	stereo_buf.clock_rate( clock_rate );
-	
-	RETURN_ERR( fm.set_rate( fm_rate, base_clock / 7.0 ) );
-	RETURN_ERR( resampler.reset( (int) (1.0 / 60 / min_tempo * sample_rate) ) );
-	
-	return blargg_ok;
-}
-
-void Gym_Emu::set_tempo_( double t )
-{
-	if ( t < min_tempo )
-	{
-		set_tempo( min_tempo );
-		return;
-	}
-	
-	if ( stereo_buf.sample_rate() )
-	{
-		double denom = tempo() * 60;
-		clocks_per_frame = (int) (clock_rate / denom);
-		resampler.resize( (int) (sample_rate() / denom) );
-	}
-}
-
-void Gym_Emu::mute_voices_( int mask )
-{
-	Music_Emu::mute_voices_( mask );
-	fm.mute_voices( mask );
-	apu.set_output( (mask & 0x80) ? 0 : stereo_buf.center() );
-	pcm_synth.volume( (mask & 0x40) ? 0.0 : 0.125 / 256 * fm_gain * gain() );
-}
-
-blargg_err_t Gym_Emu::load_mem_( byte const in , int size )
-{
-	assert( offsetof (header_t,packed 4) == header_t::size );
-	log_offset = 0;
-	RETURN_ERR( check_header( in, size, &log_offset ) );
-	
-	loop_begin = NULL;
-	
-	static const char* const names = {
-		"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "PCM", "PSG"
-	};
-	set_voice_names( names );
-	
-	set_voice_count( 8 );
-	
-	if ( log_offset )
-		header_ = *(header_t const*) in;
-	else
-		memset( &header_, 0, sizeof header_ );
-	
-	return blargg_ok;
-}
-
-// Emulation
-
-blargg_err_t Gym_Emu::start_track_( int track )
-{
-	RETURN_ERR( Music_Emu::start_track_( track ) );
-	
-	pos = log_begin();
-	loop_remain = get_le32( header_.loop_start );
-	
-	prev_pcm_count = 0;
-	pcm_enabled = 0;
-	pcm_amp = -1;
-	
-	fm.reset();
-	apu.reset();
-	stereo_buf.clear();
-	resampler.clear();
-	pcm_buf = stereo_buf.center();
-	return blargg_ok;
-}
-
-void Gym_Emu::run_pcm( byte const pcm_in , int pcm_count )
-{
-	// Guess beginning and end of sample and adjust rate and buffer position accordingly.
-	
-	// count dac samples in next frame
-	int next_pcm_count = 0;
-	const byte* p = this->pos;
-	int cmd;
-	while ( (cmd = *p++) != 0 )
-	{
-		int data = *p++;
-		if ( cmd <= 2 )
-			++p;
-		if ( cmd == 1 && data == 0x2A )
-			next_pcm_count++;
-	}
-	
-	// detect beginning and end of sample
-	int rate_count = pcm_count;
-	int start = 0;
-	if ( !prev_pcm_count && next_pcm_count && pcm_count < next_pcm_count )
-	{
-		rate_count = next_pcm_count;
-		start = next_pcm_count - pcm_count;
-	}
-	else if ( prev_pcm_count && !next_pcm_count && pcm_count < prev_pcm_count )
-	{
-		rate_count = prev_pcm_count;
-	}
-	
-	// Evenly space samples within buffer section being used
-	blip_resampled_time_t period = pcm_buf->resampled_duration( clocks_per_frame ) / rate_count;
-	
-	blip_resampled_time_t time = pcm_buf->resampled_time( 0 ) + period * start + (unsigned) period / 2;
-	
-	int pcm_amp = this->pcm_amp;
-	if ( pcm_amp < 0 )
-		pcm_amp = pcm_in 0;
-	
-	for ( int i = 0; i < pcm_count; i++ )
-	{
-		int delta = pcm_in i - pcm_amp;
-		pcm_amp += delta;
-		pcm_synth.offset_resampled( time, delta, pcm_buf );
-		time += period;
-	}
-	this->pcm_amp = pcm_amp;
-	pcm_buf->set_modified();
-}
-
-void Gym_Emu::parse_frame()
-{
-	byte pcm 1024; // all PCM writes for frame
-	int pcm_size = 0;
-	const byte* pos = this->pos;
-	
-	if ( loop_remain && !--loop_remain )
-		loop_begin = pos; // find loop on first time through sequence
-	
-	int cmd;
-	while ( (cmd = *pos++) != 0 )
-	{
-		int data = *pos++;
-		if ( cmd == 1 )
-		{
-			int data2 = *pos++;
-			if ( data == 0x2A )
-			{
-				pcm pcm_size = data2;
-				if ( pcm_size < (int) sizeof pcm - 1 )
-					pcm_size += pcm_enabled;
-			}
-			else
-			{
-				if ( data == 0x2B )
-					pcm_enabled = data2 >> 7 & 1;
-				
-				fm.write0( data, data2 );
-			}
-		}
-		else if ( cmd == 2 )
-		{
-			int data2 = *pos++;
-			if ( data == 0xB6 )
-			{
-				Blip_Buffer * pcm_buf = NULL;
-				switch ( data2 >> 6 )
-				{
-				case 0: pcm_buf = NULL; break;
-				case 1: pcm_buf = stereo_buf.right(); break;
-				case 2: pcm_buf = stereo_buf.left(); break;
-				case 3: pcm_buf = stereo_buf.center(); break;
-				}
-				/*if ( this->pcm_buf != pcm_buf )
-				{
-					if ( this->pcm_buf ) pcm_synth.offset_inline( 0, -pcm_amp, this->pcm_buf );
-					if ( pcm_buf ) pcm_synth.offset_inline( 0, pcm_amp, pcm_buf );
-				}*/
-				this->pcm_buf = pcm_buf;
-			}
-			fm.write1( data, data2 );
-		}
-		else if ( cmd == 3 )
-		{
-			apu.write_data( 0, data );
-		}
-		else
-		{
-			// to do: many GYM streams are full of errors, and error count should
-			// reflect cases where music is really having problems
-			//log_error(); 
-			--pos; // put data back
-		}
-	}
-	
-	if ( pos >= file_end() )
-	{
-		// Reached end
-		check( pos == file_end() );
-		
-		if ( loop_begin )
-			pos = loop_begin;
-		else
-			set_track_ended();
-	}
-	this->pos = pos;
-	
-	// PCM
-	if ( pcm_buf && pcm_size )
-		run_pcm( pcm, pcm_size );
-	prev_pcm_count = pcm_size;
-}
-
-inline int Gym_Emu::play_frame( blip_time_t blip_time, int sample_count, sample_t buf )
-{
-	if ( !track_ended() )
-		parse_frame();
-	
-	apu.end_frame( blip_time );
-	
-	memset( buf, 0, sample_count * sizeof *buf );
-	fm.run( sample_count >> 1, buf );
-	
-	return sample_count;
-}
-
-int Gym_Emu::play_frame_( void* p, blip_time_t a, int b, sample_t c )
-{
-	return STATIC_CAST(Gym_Emu*,p)->play_frame( a, b, c );
-}
-
-blargg_err_t Gym_Emu::play_( int count, sample_t out )
-{
-	resampler.dual_play( count, out, stereo_buf );
-	return blargg_ok;
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Gym_Emu.h"
+
+#include "blargg_endian.h"
+
+/* Copyright (C) 2003-2008 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"
+
+double const min_tempo = 0.25;
+double const oversample = 5 / 3.0;
+double const fm_gain = 3.0;
+
+int const base_clock = 53700300;
+int const clock_rate = base_clock / 15;
+
+Gym_Emu::Gym_Emu()
+{
+	resampler.set_callback( play_frame_, this );
+	pos = NULL;
+	disable_oversampling_ = false;
+	set_type( gme_gym_type );
+	set_silence_lookahead( 1 ); // tracks should already be trimmed
+	pcm_buf = stereo_buf.center();
+}
+
+Gym_Emu::~Gym_Emu() { }
+
+// Track info
+
+static void get_gym_info( Gym_Emu::header_t const& h, int length, track_info_t* out )
+{
+	if ( 0 != memcmp( h.tag, "GYMX", 4 ) )
+		return;
+	
+	length = length * 50 / 3; // 1000 / 60
+	int loop = get_le32( h.loop_start );
+	if ( loop )
+	{
+		out->intro_length = loop * 50 / 3;
+		out->loop_length = length - out->intro_length;
+	}
+	else
+	{
+		out->length = length;
+		out->intro_length = length; // make it clear that track is no longer than length
+		out->loop_length = 0;
+	}
+	
+	// more stupidity where the field should have been left blank
+	if ( strcmp( h.song, "Unknown Song" ) )
+		GME_COPY_FIELD( h, out, song );
+	
+	if ( strcmp( h.game, "Unknown Game" ) )
+		GME_COPY_FIELD( h, out, game );
+	
+	if ( strcmp( h.copyright, "Unknown Publisher" ) )
+		GME_COPY_FIELD( h, out, copyright );
+	
+	if ( strcmp( h.dumper, "Unknown Person" ) )
+		GME_COPY_FIELD( h, out, dumper );
+	
+	if ( strcmp( h.comment, "Header added by YMAMP" ) )
+		GME_COPY_FIELD( h, out, comment );
+}
+
+static void hash_gym_file( Gym_Emu::header_t const& h, byte const* data, int data_size, Music_Emu::Hash_Function& out )
+{
+	out.hash_( &h.loop_start0, sizeof(h.loop_start) );
+	out.hash_( &h.packed0, sizeof(h.packed) );
+	out.hash_( data, data_size );
+}
+
+static int gym_track_length( byte const p , byte const* end )
+{
+	int time = 0;
+	while ( p < end )
+	{
+		switch ( *p++ )
+		{
+		case 0:
+			time++;
+			break;
+		
+		case 1:
+		case 2:
+			p += 2;
+			break;
+		
+		case 3:
+			p += 1;
+			break;
+		}
+	}
+	return time;
+}
+
+blargg_err_t Gym_Emu::track_info_( track_info_t* out, int ) const
+{
+	get_gym_info( header_, gym_track_length( log_begin(), file_end() ), out );
+	return blargg_ok;
+}
+
+static blargg_err_t check_header( byte const in , int size, int* data_offset = NULL )
+{
+	if ( size < 4 )
+		return blargg_err_file_type;
+	
+	if ( memcmp( in, "GYMX", 4 ) == 0 )
+	{
+		if ( size < Gym_Emu::header_t::size + 1 )
+			return blargg_err_file_type;
+		
+		if ( memcmp( ((Gym_Emu::header_t const*) in)->packed, "\0\0\0\0", 4 ) != 0 )
+			return BLARGG_ERR( BLARGG_ERR_FILE_FEATURE, "packed GYM file" );
+		
+		if ( data_offset )
+			*data_offset = Gym_Emu::header_t::size;
+	}
+	else if ( *in > 3 )
+	{
+		return blargg_err_file_type;
+	}
+	
+	return blargg_ok;
+}
+
+struct Gym_File : Gme_Info_
+{
+	int data_offset;
+	
+	Gym_File() { set_type( gme_gym_type ); }
+	
+	blargg_err_t load_mem_( byte const in , int size )
+	{
+		data_offset = 0;
+		return check_header( in, size, &data_offset );
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int ) const
+	{
+		int length = gym_track_length( &file_begin() data_offset, file_end() );
+		get_gym_info( *(Gym_Emu::header_t const*) file_begin(), length, out );
+		return blargg_ok;
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		Gym_Emu::header_t const* h = ( Gym_Emu::header_t const* ) file_begin();
+		byte const* data = &file_begin() data_offset;
+
+		hash_gym_file( *h, data, file_end() - data, out );
+
+		return blargg_ok;
+	}
+};
+
+static Music_Emu* new_gym_emu () { return BLARGG_NEW Gym_Emu ; }
+static Music_Emu* new_gym_file() { return BLARGG_NEW Gym_File; }
+
+gme_type_t_ const gme_gym_type 1 = {{ "Sega Genesis", 1, &new_gym_emu, &new_gym_file, "GYM", 0 }};
+
+// Setup
+
+blargg_err_t Gym_Emu::set_sample_rate_( int sample_rate )
+{
+	blip_eq_t eq( -32, 8000, sample_rate );
+	apu.treble_eq( eq );
+	pcm_synth.treble_eq( eq );
+	
+	apu.volume( 0.135 * fm_gain * gain() );
+	
+	double factor = oversample;
+	if ( disable_oversampling_ )
+		factor = (double) base_clock / 7 / 144 / sample_rate;
+	RETURN_ERR( resampler.setup( factor, 0.990, fm_gain * gain() ) );
+	factor = resampler.rate();
+	double fm_rate = sample_rate * factor;
+	
+	RETURN_ERR( stereo_buf.set_sample_rate( sample_rate, int (1000 / 60.0 / min_tempo) ) );
+	stereo_buf.clock_rate( clock_rate );
+	
+	RETURN_ERR( fm.set_rate( fm_rate, base_clock / 7.0 ) );
+	RETURN_ERR( resampler.reset( (int) (1.0 / 60 / min_tempo * sample_rate) ) );
+	
+	return blargg_ok;
+}
+
+void Gym_Emu::set_tempo_( double t )
+{
+	if ( t < min_tempo )
+	{
+		set_tempo( min_tempo );
+		return;
+	}
+	
+	if ( stereo_buf.sample_rate() )
+	{
+		double denom = tempo() * 60;
+		clocks_per_frame = (int) (clock_rate / denom);
+		resampler.resize( (int) (sample_rate() / denom) );
+	}
+}
+
+void Gym_Emu::mute_voices_( int mask )
+{
+	Music_Emu::mute_voices_( mask );
+	fm.mute_voices( mask );
+	apu.set_output( (mask & 0x80) ? 0 : stereo_buf.center() );
+	pcm_synth.volume( (mask & 0x40) ? 0.0 : 0.125 / 256 * fm_gain * gain() );
+}
+
+blargg_err_t Gym_Emu::load_mem_( byte const in , int size )
+{
+	assert( offsetof (header_t,packed 4) == header_t::size );
+	log_offset = 0;
+	RETURN_ERR( check_header( in, size, &log_offset ) );
+	
+	loop_begin = NULL;
+	
+	static const char* const names = {
+		"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "PCM", "PSG"
+	};
+	set_voice_names( names );
+	
+	set_voice_count( 8 );
+	
+	if ( log_offset )
+		header_ = *(header_t const*) in;
+	else
+		memset( &header_, 0, sizeof header_ );
+	
+	return blargg_ok;
+}
+
+// Emulation
+
+blargg_err_t Gym_Emu::start_track_( int track )
+{
+	RETURN_ERR( Music_Emu::start_track_( track ) );
+	
+	pos = log_begin();
+	loop_remain = get_le32( header_.loop_start );
+	
+	prev_pcm_count = 0;
+	pcm_enabled = 0;
+	pcm_amp = -1;
+	
+	fm.reset();
+	apu.reset();
+	stereo_buf.clear();
+	resampler.clear();
+	pcm_buf = stereo_buf.center();
+	return blargg_ok;
+}
+
+void Gym_Emu::run_pcm( byte const pcm_in , int pcm_count )
+{
+	// Guess beginning and end of sample and adjust rate and buffer position accordingly.
+	
+	// count dac samples in next frame
+	int next_pcm_count = 0;
+	const byte* p = this->pos;
+	int cmd;
+	while ( (cmd = *p++) != 0 )
+	{
+		int data = *p++;
+		if ( cmd <= 2 )
+			++p;
+		if ( cmd == 1 && data == 0x2A )
+			next_pcm_count++;
+	}
+	
+	// detect beginning and end of sample
+	int rate_count = pcm_count;
+	int start = 0;
+	if ( !prev_pcm_count && next_pcm_count && pcm_count < next_pcm_count )
+	{
+		rate_count = next_pcm_count;
+		start = next_pcm_count - pcm_count;
+	}
+	else if ( prev_pcm_count && !next_pcm_count && pcm_count < prev_pcm_count )
+	{
+		rate_count = prev_pcm_count;
+	}
+	
+	// Evenly space samples within buffer section being used
+	blip_resampled_time_t period = pcm_buf->resampled_duration( clocks_per_frame ) / rate_count;
+	
+	blip_resampled_time_t time = pcm_buf->resampled_time( 0 ) + period * start + (unsigned) period / 2;
+	
+	int pcm_amp = this->pcm_amp;
+	if ( pcm_amp < 0 )
+		pcm_amp = pcm_in 0;
+	
+	for ( int i = 0; i < pcm_count; i++ )
+	{
+		int delta = pcm_in i - pcm_amp;
+		pcm_amp += delta;
+		pcm_synth.offset_resampled( time, delta, pcm_buf );
+		time += period;
+	}
+	this->pcm_amp = pcm_amp;
+	pcm_buf->set_modified();
+}
+
+void Gym_Emu::parse_frame()
+{
+	byte pcm 1024; // all PCM writes for frame
+	int pcm_size = 0;
+	const byte* pos = this->pos;
+	
+	if ( loop_remain && !--loop_remain )
+		loop_begin = pos; // find loop on first time through sequence
+	
+	int cmd;
+	while ( (cmd = *pos++) != 0 )
+	{
+		int data = *pos++;
+		if ( cmd == 1 )
+		{
+			int data2 = *pos++;
+			if ( data == 0x2A )
+			{
+				pcm pcm_size = data2;
+				if ( pcm_size < (int) sizeof pcm - 1 )
+					pcm_size += pcm_enabled;
+			}
+			else
+			{
+				if ( data == 0x2B )
+					pcm_enabled = data2 >> 7 & 1;
+				
+				fm.write0( data, data2 );
+			}
+		}
+		else if ( cmd == 2 )
+		{
+			int data2 = *pos++;
+			if ( data == 0xB6 )
+			{
+				Blip_Buffer * pcm_buf = NULL;
+				switch ( data2 >> 6 )
+				{
+				case 0: pcm_buf = NULL; break;
+				case 1: pcm_buf = stereo_buf.right(); break;
+				case 2: pcm_buf = stereo_buf.left(); break;
+				case 3: pcm_buf = stereo_buf.center(); break;
+				}
+				/*if ( this->pcm_buf != pcm_buf )
+				{
+					if ( this->pcm_buf ) pcm_synth.offset_inline( 0, -pcm_amp, this->pcm_buf );
+					if ( pcm_buf ) pcm_synth.offset_inline( 0, pcm_amp, pcm_buf );
+				}*/
+				this->pcm_buf = pcm_buf;
+			}
+			fm.write1( data, data2 );
+		}
+		else if ( cmd == 3 )
+		{
+			apu.write_data( 0, data );
+		}
+		else
+		{
+			// to do: many GYM streams are full of errors, and error count should
+			// reflect cases where music is really having problems
+			//log_error(); 
+			--pos; // put data back
+		}
+	}
+	
+	if ( pos >= file_end() )
+	{
+		// Reached end
+		check( pos == file_end() );
+		
+		if ( loop_begin )
+			pos = loop_begin;
+		else
+			set_track_ended();
+	}
+	this->pos = pos;
+	
+	// PCM
+	if ( pcm_buf && pcm_size )
+		run_pcm( pcm, pcm_size );
+	prev_pcm_count = pcm_size;
+}
+
+inline int Gym_Emu::play_frame( blip_time_t blip_time, int sample_count, sample_t buf )
+{
+	if ( !track_ended() )
+		parse_frame();
+	
+	apu.end_frame( blip_time );
+	
+	memset( buf, 0, sample_count * sizeof *buf );
+	fm.run( sample_count >> 1, buf );
+	
+	return sample_count;
+}
+
+int Gym_Emu::play_frame_( void* p, blip_time_t a, int b, sample_t c )
+{
+	return STATIC_CAST(Gym_Emu*,p)->play_frame( a, b, c );
+}
+
+blargg_err_t Gym_Emu::play_( int count, sample_t out )
+{
+	resampler.dual_play( count, out, stereo_buf );
+	return blargg_ok;
+}
+
+blargg_err_t Gym_Emu::hash_( Hash_Function& out ) const
+{
+	hash_gym_file( header(), log_begin(), file_end() - log_begin(), out );
+	return blargg_ok;
+}
\ No newline at end of file

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gym_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Gym_Emu.h Changed

@@ -1,86 +1,88 @@
-// Sega Genesis/Mega Drive GYM music file emulator
-// Performs PCM timing recovery to improve sample quality.
-
-// Game_Music_Emu 0.6-pre
-#ifndef GYM_EMU_H
-#define GYM_EMU_H
-
-#include "Dual_Resampler.h"
-#include "Ym2612_Emu.h"
-#include "Music_Emu.h"
-#include "Sms_Apu.h"
-
-class Gym_Emu : public Music_Emu {
-public:
-	
-	// GYM file header (optional; many files have NO header at all)
-	struct header_t
-	{
-		enum { size = 428 };
-		
-	    char tag          4;
-	    char song        32;
-	    char game        32;
-	    char copyright   32;
-	    char emulator    32;
-	    char dumper      32;
-	    char comment    256;
-	    byte loop_start   4; // in 1/60 seconds, 0 if not looped
-	    byte packed       4;
-	};
-	
-	// Header for currently loaded file
-	header_t const& header() const          { return header_; }
-	
-	static gme_type_t static_type()         { return gme_gym_type; }
-	
-	// Disables running FM chips at higher than normal rate. Will result in slightly
-	// more aliasing of high notes.
-	void disable_oversampling( bool disable = true ) { disable_oversampling_ = disable; }
-	
-// Implementation
-public:
-	Gym_Emu();
-	~Gym_Emu();
-
-protected:
-	virtual blargg_err_t load_mem_( byte const , int );
-	virtual blargg_err_t track_info_( track_info_t*, int track ) const;
-	virtual blargg_err_t set_sample_rate_( int sample_rate );
-	virtual blargg_err_t start_track_( int );
-	virtual blargg_err_t play_( int count, sample_t  );
-	virtual void mute_voices_( int );
-	virtual void set_tempo_( double );
-
-private:
-	// Log
-	byte const* pos;        // current position
-	byte const* loop_begin;
-	int log_offset;         // size of header (0 or header_t::size)
-	int loop_remain;        // frames remaining until loop_begin has been located
-	int clocks_per_frame;
-
-	bool disable_oversampling_;
-	
-	// PCM
-	int pcm_amp;
-	int prev_pcm_count;     // for detecting beginning/end of group of samples
-	int pcm_enabled;
-	
-	// large objects
-	Dual_Resampler  resampler;
-	Stereo_Buffer   stereo_buf;
-	Blip_Buffer   * pcm_buf;
-	Ym2612_Emu      fm;
-	Sms_Apu         apu;
-	Blip_Synth_Fast pcm_synth;
-	header_t        header_;
-	
-	byte const* log_begin() const { return file_begin() + log_offset; }
-	void parse_frame();
-	void run_pcm( byte const in , int count );
-	int play_frame( blip_time_t blip_time, int sample_count, sample_t buf  );
-	static int play_frame_( void*, blip_time_t, int, sample_t  );
-};
-
-#endif
+// Sega Genesis/Mega Drive GYM music file emulator
+// Performs PCM timing recovery to improve sample quality.
+
+// Game_Music_Emu $vers
+#ifndef GYM_EMU_H
+#define GYM_EMU_H
+
+#include "Dual_Resampler.h"
+#include "Ym2612_Emu.h"
+#include "Music_Emu.h"
+#include "Sms_Apu.h"
+
+class Gym_Emu : public Music_Emu {
+public:
+	
+	// GYM file header (optional; many files have NO header at all)
+	struct header_t
+	{
+		enum { size = 428 };
+		
+	    char tag          4;
+	    char song        32;
+	    char game        32;
+	    char copyright   32;
+	    char emulator    32;
+	    char dumper      32;
+	    char comment    256;
+	    byte loop_start   4; // in 1/60 seconds, 0 if not looped
+	    byte packed       4;
+	};
+	
+	// Header for currently loaded file
+	header_t const& header() const          { return header_; }
+	
+	static gme_type_t static_type()         { return gme_gym_type; }
+	
+	// Disables running FM chips at higher than normal rate. Will result in slightly
+	// more aliasing of high notes.
+	void disable_oversampling( bool disable = true ) { disable_oversampling_ = disable; }
+
+	blargg_err_t hash_( Hash_Function& ) const;
+	
+// Implementation
+public:
+	Gym_Emu();
+	~Gym_Emu();
+
+protected:
+	virtual blargg_err_t load_mem_( byte const , int );
+	virtual blargg_err_t track_info_( track_info_t*, int track ) const;
+	virtual blargg_err_t set_sample_rate_( int sample_rate );
+	virtual blargg_err_t start_track_( int );
+	virtual blargg_err_t play_( int count, sample_t  );
+	virtual void mute_voices_( int );
+	virtual void set_tempo_( double );
+
+private:
+	// Log
+	byte const* pos;        // current position
+	byte const* loop_begin;
+	int log_offset;         // size of header (0 or header_t::size)
+	int loop_remain;        // frames remaining until loop_begin has been located
+	int clocks_per_frame;
+
+	bool disable_oversampling_;
+	
+	// PCM
+	int pcm_amp;
+	int prev_pcm_count;     // for detecting beginning/end of group of samples
+	int pcm_enabled;
+	
+	// large objects
+	Dual_Resampler  resampler;
+	Stereo_Buffer   stereo_buf;
+	Blip_Buffer   * pcm_buf;
+	Ym2612_Emu      fm;
+	Sms_Apu         apu;
+	Blip_Synth_Fast pcm_synth;
+	header_t        header_;
+	
+	byte const* log_begin() const { return file_begin() + log_offset; }
+	void parse_frame();
+	void run_pcm( byte const in , int count );
+	int play_frame( blip_time_t blip_time, int sample_count, sample_t buf  );
+	static int play_frame_( void*, blip_time_t, int, sample_t  );
+};
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Apu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.cpp Changed

@@ -1,309 +1,309 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Hes_Apu_Adpcm.h"
-
-/* Copyright (C) 2006-2008 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"
-
-Hes_Apu_Adpcm::Hes_Apu_Adpcm()
-{
-	output = NULL;
-
-	memset( &state, 0, sizeof( state ) );
-
-	reset();
-}
-
-void Hes_Apu_Adpcm::reset()
-{
-	last_time = 0;
-	next_timer = 0;
-	last_amp = 0;
-
-	memset( &state.pcmbuf, 0, sizeof(state.pcmbuf) );
-	memset( &state.port, 0, sizeof(state.port) );
-
-	state.ad_sample = 0;
-	state.ad_ref_index = 0;
-
-	state.addr = 0;
-	state.freq = 0;
-	state.writeptr = 0;
-	state.readptr = 0;
-	state.playflag = 0;
-	state.repeatflag = 0;
-	state.length = 0;
-	state.volume = 0xFF;
-	state.fadetimer = 0;
-	state.fadecount = 0;
-}
-
-void Hes_Apu_Adpcm::set_output( int i, Blip_Buffer* center, Blip_Buffer* left, Blip_Buffer* right )
-{
-	// Must be silent (all NULL), mono (left and right NULL), or stereo (none NULL)
-	require( !center || (center && !left && !right) || (center && left && right) );
-	require( (unsigned) i < osc_count ); // fails if you pass invalid osc index
-	
-	if ( !center || !left || !right )
-	{
-		left = center;
-		right = center;
-	}
-	
-	output = center;
-}
-
-void Hes_Apu_Adpcm::run_until( blip_time_t end_time )
-{
-	int volume = state.volume;
-	int fadetimer = state.fadetimer;
-	int fadecount = state.fadecount;
-	int last_time = this->last_time;
-	double next_timer = this->next_timer;
-	int last_amp = this->last_amp;
-	
-	Blip_Buffer* output = this->output; // cache often-used values
-
-	while ( state.playflag && last_time < end_time )
-	{
-		while ( last_time >= next_timer )
-		{
-			if ( fadetimer )
-			{
-				if ( fadecount > 0 )
-				{
-					fadecount--;
-					volume = 0xFF * fadecount / fadetimer;
-				}
-				else if ( fadecount < 0 )
-				{
-					fadecount++;
-					volume = 0xFF - ( 0xFF * fadecount / fadetimer );
-				}
-			}
-			next_timer += 7159.091;
-		}
-		int amp;
-		if ( state.ad_low_nibble )
-		{
-			amp = adpcm_decode( state.pcmbuf state.playptr & 0x0F );
-			state.ad_low_nibble = false;
-			state.playptr++;
-			state.playedsamplecount++;
-			if ( state.playedsamplecount == state.playlength )
-			{
-				state.playflag = 0;
-			}
-		}
-		else
-		{
-			amp = adpcm_decode( state.pcmbuf state.playptr >> 4 );
-			state.ad_low_nibble = true;
-		}
-		amp = amp * volume / 0xFF;
-		int delta = amp - last_amp;
-		if ( output && delta )
-		{
-			last_amp = amp;
-			synth.offset_inline( last_time, delta, output );
-		}
-		last_time += state.freq;
-	}
-
-	if ( !state.playflag )
-	{
-		while ( next_timer <= end_time ) next_timer += 7159.091;
-		last_time = end_time;
-	}
-	
-	this->last_time = last_time;
-	this->next_timer = next_timer;
-	this->last_amp = last_amp;
-	state.volume = volume;
-	state.fadetimer = fadetimer;
-	state.fadecount = fadecount;
-}
-
-void Hes_Apu_Adpcm::write_data( blip_time_t time, int addr, int data )
-{
-	if ( time > last_time ) run_until( time );
-
-	data &= 0xFF;
-	state.port addr & 15 = data;
-	switch ( addr & 15 )
-	{
-	case 8:
-		state.addr &= 0xFF00;
-		state.addr |= data;
-		break;
-	case 9:
-		state.addr &= 0xFF;
-		state.addr |= data << 8;
-		break;
-	case 10:
-		state.pcmbuf state.writeptr++ = data;
-		state.playlength ++;
-		break;
-	case 11:
-		dprintf("ADPCM DMA 0x%02X", data);
-		break;
-	case 13:
-		if ( data & 0x80 )
-		{
-			state.addr = 0;
-			state.freq = 0;
-			state.writeptr = 0;
-			state.readptr = 0;
-			state.playflag = 0;
-			state.repeatflag = 0;
-			state.length = 0;
-			state.volume = 0xFF;
-		}
-		if ( ( data & 3 ) == 3 )
-		{
-			state.writeptr = state.addr;
-		}
-		if ( data & 8 )
-		{
-			state.readptr = state.addr ? state.addr - 1 : state.addr;
-		}
-		if ( data & 0x10 )
-		{
-			state.length = state.addr;
-		}
-		state.repeatflag = data & 0x20;
-		state.playflag = data & 0x40;
-		if ( state.playflag )
-		{
-			state.playptr = state.readptr;
-			state.playlength = state.length + 1;
-			state.playedsamplecount = 0;
-			state.ad_sample = 0;
-			state.ad_low_nibble = false;
-		}
-		break;
-	case 14:
-		state.freq = 7159091 / ( 32000 / ( 16 - ( data & 15 ) ) );
-		break;
-	case 15:
-		switch ( data & 15 )
-		{
-		case 0:
-		case 8:
-		case 12:
-			state.fadetimer = -100;
-			state.fadecount = state.fadetimer;
-			break;
-		case 10:
-			state.fadetimer = 5000;
-			state.fadecount = state.fadetimer;
-			break;
-		case 14:
-			state.fadetimer = 1500;
-			state.fadecount = state.fadetimer;
-			break;
-		}
-		break;
-	}
-}
-
-int Hes_Apu_Adpcm::read_data( blip_time_t time, int addr )
-{
-	if ( time > last_time ) run_until( time );
-
-	switch ( addr & 15 )
-	{
-	case 10:
-		return state.pcmbuf state.readptr++;
-	case 11:
-		return state.port 11 & ~1;
-	case 12:
-		if (!state.playflag)
-		{
-			state.port 12 |= 1;
-			state.port 12 &= ~8;
-		}
-		else
-		{
-			state.port 12 &= ~1;
-			state.port 12 |= 8;
-		}
-		return state.port 12;
-	case 13:
-		return state.port 13;
-	}
-
-	return 0xFF;
-}
-
-void Hes_Apu_Adpcm::end_frame( blip_time_t end_time )
-{
-	run_until( end_time );
-	last_time -= end_time;
-	next_timer -= (double)end_time;
-	check( last_time >= 0 );
-	if ( output )
-		output->set_modified();
-}
-
-static short stepsize49 = {
- 16, 17, 19, 21, 23, 25, 28,
- 31, 34, 37, 41, 45, 50, 55,
- 60, 66, 73, 80, 88, 97, 107,
- 118, 130, 143, 157, 173, 190, 209,
- 230, 253, 279, 307, 337, 371, 408,
- 449, 494, 544, 598, 658, 724, 796,
- 876, 963,1060,1166,1282,1411,1552
-};
-
-int Hes_Apu_Adpcm::adpcm_decode( int code )
-{
-	int step = stepsizestate.ad_ref_index;
-	int delta;
-	int c = code & 7;
-#if 1
-	delta = 0;
-	if ( c & 4 ) delta += step;
-	step >>= 1;
-	if ( c & 2 ) delta += step;
-	step >>= 1;
-	if ( c & 1 ) delta += step;
-	step >>= 1;
-	delta += step;
-#else
-	delta = ( ( c + c + 1 ) * step ) / 8; // maybe faster, but introduces rounding
-#endif
-	if ( c != code )
-	{
-		state.ad_sample -= delta;
-		if ( state.ad_sample < -2048 )
-			state.ad_sample = -2048;
-	}
-	else
-	{
-		state.ad_sample += delta;
-		if ( state.ad_sample > 2047 )
-			state.ad_sample = 2047;
-	}
-
-	static int const steps 8 = {
-		-1, -1, -1, -1, 2, 4, 6, 8
-	};
-	state.ad_ref_index += steps c;
-	if ( state.ad_ref_index < 0 )
-		state.ad_ref_index = 0;
-	else if ( state.ad_ref_index > 48 )
-		state.ad_ref_index = 48;
-
-	return state.ad_sample;
-}
\ No newline at end of file
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Hes_Apu_Adpcm.h"
+
+/* Copyright (C) 2006-2008 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"
+
+Hes_Apu_Adpcm::Hes_Apu_Adpcm()
+{
+	output = NULL;
+
+	memset( &state, 0, sizeof( state ) );
+
+	reset();
+}
+
+void Hes_Apu_Adpcm::reset()
+{
+	last_time = 0;
+	next_timer = 0;
+	last_amp = 0;
+
+	memset( &state.pcmbuf, 0, sizeof(state.pcmbuf) );
+	memset( &state.port, 0, sizeof(state.port) );
+
+	state.ad_sample = 0;
+	state.ad_ref_index = 0;
+
+	state.addr = 0;
+	state.freq = 0;
+	state.writeptr = 0;
+	state.readptr = 0;
+	state.playflag = 0;
+	state.repeatflag = 0;
+	state.length = 0;
+	state.volume = 0xFF;
+	state.fadetimer = 0;
+	state.fadecount = 0;
+}
+
+void Hes_Apu_Adpcm::set_output( int i, Blip_Buffer* center, Blip_Buffer* left, Blip_Buffer* right )
+{
+	// Must be silent (all NULL), mono (left and right NULL), or stereo (none NULL)
+	require( !center || (center && !left && !right) || (center && left && right) );
+	require( (unsigned) i < osc_count ); // fails if you pass invalid osc index
+	
+	if ( !center || !left || !right )
+	{
+		left = center;
+		right = center;
+	}
+	
+	output = center;
+}
+
+void Hes_Apu_Adpcm::run_until( blip_time_t end_time )
+{
+	int volume = state.volume;
+	int fadetimer = state.fadetimer;
+	int fadecount = state.fadecount;
+	int last_time = this->last_time;
+	double next_timer = this->next_timer;
+	int last_amp = this->last_amp;
+	
+	Blip_Buffer* output = this->output; // cache often-used values
+
+	while ( state.playflag && last_time < end_time )
+	{
+		while ( last_time >= next_timer )
+		{
+			if ( fadetimer )
+			{
+				if ( fadecount > 0 )
+				{
+					fadecount--;
+					volume = 0xFF * fadecount / fadetimer;
+				}
+				else if ( fadecount < 0 )
+				{
+					fadecount++;
+					volume = 0xFF - ( 0xFF * fadecount / fadetimer );
+				}
+			}
+ next_timer += 7159.091;
+		}
+		int amp;
+		if ( state.ad_low_nibble )
+		{
+			amp = adpcm_decode( state.pcmbuf state.playptr & 0x0F );
+			state.ad_low_nibble = false;
+			state.playptr++;
+			state.playedsamplecount++;
+			if ( state.playedsamplecount == state.playlength )
+			{
+				state.playflag = 0;
+			}
+		}
+		else
+		{
+			amp = adpcm_decode( state.pcmbuf state.playptr >> 4 );
+			state.ad_low_nibble = true;
+		}
+		amp = amp * volume / 0xFF;
+		int delta = amp - last_amp;
+		if ( output && delta )
+		{
+			last_amp = amp;
+			synth.offset_inline( last_time, delta, output );
+		}
+		last_time += state.freq;
+	}
+
+	if ( !state.playflag )
+	{
+ while ( next_timer <= end_time ) next_timer += 7159.091;
+		last_time = end_time;
+	}
+	
+	this->last_time = last_time;
+	this->next_timer = next_timer;
+	this->last_amp = last_amp;
+	state.volume = volume;
+	state.fadetimer = fadetimer;
+	state.fadecount = fadecount;
+}
+
+void Hes_Apu_Adpcm::write_data( blip_time_t time, int addr, int data )
+{
+	if ( time > last_time ) run_until( time );
+
+	data &= 0xFF;
+	state.port addr & 15 = data;
+	switch ( addr & 15 )
+	{
+	case 8:
+		state.addr &= 0xFF00;
+		state.addr |= data;
+		break;
+	case 9:
+		state.addr &= 0xFF;
+		state.addr |= data << 8;
+		break;
+	case 10:
+		state.pcmbuf state.writeptr++ = data;
+		state.playlength ++;
+		break;
+	case 11:
+		dprintf("ADPCM DMA 0x%02X", data);
+		break;
+	case 13:
+		if ( data & 0x80 )
+		{
+			state.addr = 0;
+			state.freq = 0;
+			state.writeptr = 0;
+			state.readptr = 0;
+			state.playflag = 0;
+			state.repeatflag = 0;
+			state.length = 0;
+			state.volume = 0xFF;
+		}
+		if ( ( data & 3 ) == 3 )
+		{
+			state.writeptr = state.addr;
+		}
+		if ( data & 8 )
+		{
+			state.readptr = state.addr ? state.addr - 1 : state.addr;
+		}
+		if ( data & 0x10 )
+		{
+			state.length = state.addr;
+		}
+		state.repeatflag = data & 0x20;
+		state.playflag = data & 0x40;
+		if ( state.playflag )
+		{
+			state.playptr = state.readptr;
+			state.playlength = state.length + 1;
+			state.playedsamplecount = 0;
+			state.ad_sample = 0;
+			state.ad_low_nibble = false;
+		}
+		break;
+	case 14:
+ state.freq = 7159091 / ( 32000 / ( 16 - ( data & 15 ) ) );
+		break;
+	case 15:
+		switch ( data & 15 )
+		{
+		case 0:
+		case 8:
+		case 12:
+			state.fadetimer = -100;
+			state.fadecount = state.fadetimer;
+			break;
+		case 10:
+			state.fadetimer = 5000;
+			state.fadecount = state.fadetimer;
+			break;
+		case 14:
+			state.fadetimer = 1500;
+			state.fadecount = state.fadetimer;
+			break;
+		}
+		break;
+	}
+}
+
+int Hes_Apu_Adpcm::read_data( blip_time_t time, int addr )
+{
+	if ( time > last_time ) run_until( time );
+
+	switch ( addr & 15 )
+	{
+	case 10:
+		return state.pcmbuf state.readptr++;
+	case 11:
+		return state.port 11 & ~1;
+	case 12:
+		if (!state.playflag)
+		{
+			state.port 12 |= 1;
+			state.port 12 &= ~8;
+		}
+		else
+		{
+			state.port 12 &= ~1;
+			state.port 12 |= 8;
+		}
+		return state.port 12;
+	case 13:
+		return state.port 13;
+	}
+
+	return 0xFF;
+}
+
+void Hes_Apu_Adpcm::end_frame( blip_time_t end_time )
+{
+	run_until( end_time );
+	last_time -= end_time;
+	next_timer -= (double)end_time;
+	check( last_time >= 0 );
+	if ( output )
+		output->set_modified();
+}
+
+static short stepsize49 = {
+ 16, 17, 19, 21, 23, 25, 28,
+ 31, 34, 37, 41, 45, 50, 55,
+ 60, 66, 73, 80, 88, 97, 107,
+ 118, 130, 143, 157, 173, 190, 209,
+ 230, 253, 279, 307, 337, 371, 408,
+ 449, 494, 544, 598, 658, 724, 796,
+ 876, 963,1060,1166,1282,1411,1552
+};
+
+int Hes_Apu_Adpcm::adpcm_decode( int code )
+{
+	int step = stepsizestate.ad_ref_index;
+	int delta;
+	int c = code & 7;
+#if 1
+	delta = 0;
+	if ( c & 4 ) delta += step;
+	step >>= 1;
+	if ( c & 2 ) delta += step;
+	step >>= 1;
+	if ( c & 1 ) delta += step;
+	step >>= 1;
+	delta += step;
+#else
+	delta = ( ( c + c + 1 ) * step ) / 8; // maybe faster, but introduces rounding
+#endif
+	if ( c != code )
+	{
+		state.ad_sample -= delta;
+		if ( state.ad_sample < -2048 )
+			state.ad_sample = -2048;
+	}
+	else
+	{
+		state.ad_sample += delta;
+		if ( state.ad_sample > 2047 )
+			state.ad_sample = 2047;
+	}
+
+	static int const steps 8 = {
+		-1, -1, -1, -1, 2, 4, 6, 8
+	};
+	state.ad_ref_index += steps c;
+	if ( state.ad_ref_index < 0 )
+		state.ad_ref_index = 0;
+	else if ( state.ad_ref_index > 48 )
+		state.ad_ref_index = 48;
+
+	return state.ad_sample;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Apu_Adpcm.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Core.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Core.cpp Changed

@@ -1,4 +1,4 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
 
 #include "Hes_Core.h"
 
@@ -97,7 +97,7 @@
 void Hes_Core::set_tempo( double t )
 {
 	play_period = (time_t) (period_60hz / t);
-	timer_base = (int) (1024 / t);
+ timer_base = (int) (1024 / t);
 	recalc_timer_load();
 }
 
@@ -197,13 +197,13 @@
 		// Not a problem for other registers below because they don't write to
 		// Blip_Buffer.
 		time_t t = min( time, cpu.end_time() + 8 );
-		apu_.write_data( t, addr, data );
+ apu_.write_data( t, addr, data );
 		return;
 	}
 	if ( (unsigned) (addr - adpcm_.io_addr) < adpcm_.io_size )
 	{
 		time_t t = min( time, cpu.end_time() + 6 );
-		adpcm_.write_data( t, addr, data );
+ adpcm_.write_data( t, addr, data );
 		return;
 	}
 	
@@ -305,7 +305,7 @@
 	case 0x180B:
 	case 0x180C:
 	case 0x180D:
-		return adpcm_.read_data( time, addr );
+ return adpcm_.read_data( time, addr );
 		
 	#ifndef NDEBUG
 		case 0x1000: // I/O port
@@ -401,8 +401,8 @@
 	cpu.end_frame( duration );
 	::adjust_time( irq.timer, duration );
 	::adjust_time( irq.vdp, duration );
-	apu_.end_frame( duration );
-	adpcm_.end_frame( duration );
+ apu_.end_frame( duration );
+ adpcm_.end_frame( duration );
 	
 	return blargg_ok;
 }

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Core.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Core.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Cpu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Cpu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Cpu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Cpu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Cpu_run.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Cpu_run.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Emu.cpp Changed

@@ -1,163 +1,192 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Hes_Emu.h"
-
-#include "blargg_endian.h"
-
-/* Copyright (C) 2006-2008 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"
-
-Hes_Emu::Hes_Emu()
-{
-	set_type( gme_hes_type );
-	set_silence_lookahead( 6 );
-	set_gain( 1.11 );
-}
-
-Hes_Emu::~Hes_Emu() { }
-
-void Hes_Emu::unload()
-{
-	core.unload();
-	Music_Emu::unload();
-}
-
-static byte const* copy_field( byte const in , char* out )
-{
-	if ( in )
-	{
-		int len = 0x20;
-		if ( in 0x1F && !in 0x2F )
-			len = 0x30; // fields are sometimes 16 bytes longer (ugh)
-		
-		// since text fields are where any data could be, detect non-text
-		// and fields with data after zero byte terminator
-		
-		int i = 0;
-		for ( ; i < len && in i; i++ )
-			if ( (unsigned) (in i - ' ') >= 0xFF - ' ' ) // also treat 0xFF as non-text
-				return 0; // non-ASCII found
-		
-		for ( ; i < len; i++ )
-			if ( in i )
-				return 0; // data after terminator
-		
-		Gme_File::copy_field_( out, (char const*) in, len );
-		in += len;
-	}
-	return in;
-}
-
-static void copy_hes_fields( byte const in , track_info_t* out )
-{
-	if ( *in >= ' ' )
-	{
-		in = copy_field( in, out->game );
-		in = copy_field( in, out->author );
-		in = copy_field( in, out->copyright );
-	}
-}
-
-blargg_err_t Hes_Emu::track_info_( track_info_t* out, int ) const
-{
-	copy_hes_fields( core.data() + core.info_offset, out );
-	return blargg_ok;
-}
-
-struct Hes_File : Gme_Info_
-{
-	enum { fields_offset = Hes_Core::header_t::size + Hes_Core::info_offset };
-	
-	union header_t {
-		Hes_Core::header_t header;
-		byte data fields_offset + 0x30 * 3;
-	} h;
-	
-	Hes_File()
-	{
-		set_type( gme_hes_type );
-	}
-	
-	blargg_err_t load_( Data_Reader& in )
-	{
-		blargg_err_t err = in.read( &h, sizeof h );
-		if ( err )
-			return (blargg_is_err_type( err, blargg_err_file_eof ) ? blargg_err_file_type : err);
-		
-		if ( !h.header.valid_tag() )
-			return blargg_err_file_type;
-		
-		return blargg_ok;
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int ) const
-	{
-		copy_hes_fields( h.data + fields_offset, out );
-		return blargg_ok;
-	}
-};
-
-static Music_Emu* new_hes_emu () { return BLARGG_NEW Hes_Emu ; }
-static Music_Emu* new_hes_file() { return BLARGG_NEW Hes_File; }
-
-gme_type_t_ const gme_hes_type 1 = {{ "PC Engine", 256, &new_hes_emu, &new_hes_file, "HES", 1 }};
-
-blargg_err_t Hes_Emu::load_( Data_Reader& in )
-{
-	RETURN_ERR( core.load( in ) );
-	
-	static const char* const names Hes_Apu::osc_count + Hes_Apu_Adpcm::osc_count = {
-		"Wave 1", "Wave 2", "Wave 3", "Wave 4", "Multi 1", "Multi 2", "ADPCM"
-	};
-	set_voice_names( names );
-	
-	static int const types Hes_Apu::osc_count + Hes_Apu_Adpcm::osc_count = {
-		wave_type+0, wave_type+1, wave_type+2, wave_type+3, mixed_type+0, mixed_type+1, mixed_type+2
-	};
-	set_voice_types( types );
-	
-	set_voice_count( core.apu().osc_count + core.adpcm().osc_count );
-	core.apu().volume( gain() );
-	core.adpcm().volume( gain() );
-	
-	return setup_buffer( 7159091 );
-}
-
-void Hes_Emu::update_eq( blip_eq_t const& eq )
-{
-	core.apu().treble_eq( eq );
-}
-
-void Hes_Emu::set_voice( int i, Blip_Buffer* c, Blip_Buffer* l, Blip_Buffer* r )
-{
-	if ( i < core.apu().osc_count )
-		core.apu().set_output( i, c, l, r );
-	else if ( i == core.apu().osc_count )
-		core.adpcm().set_output( 0, c, l, r );
-}
-
-void Hes_Emu::set_tempo_( double t )
-{
-	core.set_tempo( t );
-}
-
-blargg_err_t Hes_Emu::start_track_( int track )
-{
-	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	return core.start_track( track );
-}
-
-blargg_err_t Hes_Emu::run_clocks( blip_time_t& duration_, int )
-{
-	return core.end_frame( duration_ );
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Hes_Emu.h"
+
+#include "blargg_endian.h"
+
+/* Copyright (C) 2006-2008 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"
+
+Hes_Emu::Hes_Emu()
+{
+	set_type( gme_hes_type );
+	set_silence_lookahead( 6 );
+	set_gain( 1.11 );
+}
+
+Hes_Emu::~Hes_Emu() { }
+
+void Hes_Emu::unload()
+{
+	core.unload();
+	Music_Emu::unload();
+}
+
+static byte const* copy_field( byte const in , char* out )
+{
+	if ( in )
+	{
+		int len = 0x20;
+		if ( in 0x1F && !in 0x2F )
+			len = 0x30; // fields are sometimes 16 bytes longer (ugh)
+		
+		// since text fields are where any data could be, detect non-text
+		// and fields with data after zero byte terminator
+		
+		int i = 0;
+		for ( ; i < len && in i; i++ )
+			if ( (unsigned) (in i - ' ') >= 0xFF - ' ' ) // also treat 0xFF as non-text
+				return 0; // non-ASCII found
+		
+		for ( ; i < len; i++ )
+			if ( in i )
+				return 0; // data after terminator
+		
+		Gme_File::copy_field_( out, (char const*) in, len );
+		in += len;
+	}
+	return in;
+}
+
+static byte const* copy_hes_fields( byte const in , track_info_t* out )
+{
+	byte const* in_offset = in;
+	if ( *in_offset >= ' ' )
+	{
+		in_offset = copy_field( in_offset, out->game );
+		in_offset = copy_field( in_offset, out->author );
+		in_offset = copy_field( in_offset, out->copyright );
+	}
+	return in_offset ? in_offset : in;
+}
+
+static void hash_hes_file( Hes_Emu::header_t const& h, byte const* data, int data_size, Music_Emu::Hash_Function& out )
+{
+	out.hash_( &h.vers, sizeof(h.vers) );
+	out.hash_( &h.first_track, sizeof(h.first_track) );
+	out.hash_( &h.init_addr0, sizeof(h.init_addr) );
+	out.hash_( &h.banks0, sizeof(h.banks) );
+	out.hash_( &h.data_size0, sizeof(h.data_size) );
+	out.hash_( &h.addr0, sizeof(h.addr) );
+	out.hash_( &h.unused0, sizeof(h.unused) );
+	out.hash_( data, Hes_Core::info_offset );
+
+ track_info_t temp; // GCC whines about passing a pointer to a temporary here
+ byte const* more_data = copy_hes_fields( data + Hes_Core::info_offset, &temp );
+	out.hash_( more_data, data_size - ( more_data - data ) );
+}
+
+blargg_err_t Hes_Emu::track_info_( track_info_t* out, int ) const
+{
+	copy_hes_fields( core.data() + core.info_offset, out );
+	return blargg_ok;
+}
+
+struct Hes_File : Gme_Info_
+{
+	enum { fields_offset = Hes_Core::header_t::size + Hes_Core::info_offset };
+	
+	union header_t {
+		Hes_Core::header_t header;
+		byte data fields_offset + 0x30 * 3;
+	} const* h;
+	
+	Hes_File()
+	{
+		set_type( gme_hes_type );
+	}
+	
+	blargg_err_t load_mem_( byte const begin , int size )
+	{
+		h = ( header_t const* ) begin;
+		
+		if ( !h->header.valid_tag() )
+			return blargg_err_file_type;
+		
+		return blargg_ok;
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int ) const
+	{
+		copy_hes_fields( h->data + fields_offset, out );
+		return blargg_ok;
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		hash_hes_file( h->header, file_begin() + h->header.size, file_end() - file_begin() - h->header.size, out );
+		return blargg_ok;
+	}
+};
+
+static Music_Emu* new_hes_emu () { return BLARGG_NEW Hes_Emu ; }
+static Music_Emu* new_hes_file() { return BLARGG_NEW Hes_File; }
+
+gme_type_t_ const gme_hes_type 1 = {{ "PC Engine", 256, &new_hes_emu, &new_hes_file, "HES", 1 }};
+
+blargg_err_t Hes_Emu::load_( Data_Reader& in )
+{
+	RETURN_ERR( core.load( in ) );
+	
+	static const char* const names Hes_Apu::osc_count + Hes_Apu_Adpcm::osc_count = {
+		"Wave 1", "Wave 2", "Wave 3", "Wave 4", "Multi 1", "Multi 2", "ADPCM"
+	};
+	set_voice_names( names );
+	
+	static int const types Hes_Apu::osc_count + Hes_Apu_Adpcm::osc_count = {
+		wave_type+0, wave_type+1, wave_type+2, wave_type+3, mixed_type+0, mixed_type+1, mixed_type+2
+	};
+	set_voice_types( types );
+	
+	set_voice_count( core.apu().osc_count + core.adpcm().osc_count );
+	core.apu().volume( gain() );
+	core.adpcm().volume( gain() );
+	
+ return setup_buffer( 7159091 );
+}
+
+void Hes_Emu::update_eq( blip_eq_t const& eq )
+{
+	core.apu().treble_eq( eq );
+ core.adpcm().treble_eq( eq );
+}
+
+void Hes_Emu::set_voice( int i, Blip_Buffer* c, Blip_Buffer* l, Blip_Buffer* r )
+{
+	if ( i < core.apu().osc_count )
+		core.apu().set_output( i, c, l, r );
+	else if ( i == core.apu().osc_count )
+		core.adpcm().set_output( 0, c, l, r );
+}
+
+void Hes_Emu::set_tempo_( double t )
+{
+	core.set_tempo( t );
+}
+
+blargg_err_t Hes_Emu::start_track_( int track )
+{
+	RETURN_ERR( Classic_Emu::start_track_( track ) );
+	return core.start_track( track );
+}
+
+blargg_err_t Hes_Emu::run_clocks( blip_time_t& duration_, int )
+{
+	return core.end_frame( duration_ );
+}
+
+blargg_err_t Hes_Emu::hash_( Hash_Function& out ) const
+{
+	hash_hes_file( header(), core.data(), core.data_size(), out );
+	return blargg_ok;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Hes_Emu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Core.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Core.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Core.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Core.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Cpu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Cpu.cpp Changed

@@ -1,35 +1,35 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Kss_Core.h"
-
-#include "blargg_endian.h"
-//#include "z80_cpu_log.h"
-
-/* Copyright (C) 2006-2008 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 OUT_PORT(  addr, data ) cpu_out( TIME(), addr, data )
-#define IN_PORT(   addr       ) cpu_in( TIME(), addr )
-#define WRITE_MEM( addr, data ) {FLUSH_TIME(); cpu_write( addr, data );}
-#define IDLE_ADDR               idle_addr
-#define CPU                     cpu
-
-#define CPU_BEGIN \
-bool Kss_Core::run_cpu( time_t end_time )\
-{\
-	cpu.set_end_time( end_time );
-
-	#include "Z80_Cpu_run.h"
-	
-	return warning;
-}
+// $package. http://www.slack.net/~ant/
+
+#include "Kss_Core.h"
+
+#include "blargg_endian.h"
+//#include "z80_cpu_log.h"
+
+/* Copyright (C) 2006-2008 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 OUT_PORT(  addr, data ) cpu_out( TIME(), addr, data )
+#define IN_PORT(   addr       ) cpu_in( TIME(), addr )
+#define WRITE_MEM( addr, data ) {FLUSH_TIME(); cpu_write( addr, data );}
+#define IDLE_ADDR               idle_addr
+#define CPU                     cpu
+
+#define CPU_BEGIN \
+bool Kss_Core::run_cpu( time_t end_time )\
+{\
+	cpu.set_end_time( end_time );
+
+	#include "Z80_Cpu_run.h"
+	
+	return warning;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Emu.cpp Changed

@@ -1,4 +1,4 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
 
 #include "Kss_Emu.h"
 
@@ -82,6 +82,20 @@
 	Gme_File::copy_field_( out->system, system );
 }
 
+static void hash_kss_file( Kss_Core::header_t const& h, byte const* data, int data_size, Music_Emu::Hash_Function& out )
+{
+	out.hash_( &h.load_addr0, sizeof(h.load_addr) );
+	out.hash_( &h.load_size0, sizeof(h.load_size) );
+	out.hash_( &h.init_addr0, sizeof(h.init_addr) );
+	out.hash_( &h.play_addr0, sizeof(h.play_addr) );
+	out.hash_( &h.first_bank, sizeof(h.first_bank) );
+	out.hash_( &h.bank_mode, sizeof(h.bank_mode) );
+	out.hash_( &h.extra_header, sizeof(h.extra_header) );
+	out.hash_( &h.device_flags, sizeof(h.device_flags) );
+
+	out.hash_( data, data_size );
+}
+
 blargg_err_t Kss_Emu::track_info_( track_info_t* out, int ) const
 {
 	copy_kss_fields( header(), out );
@@ -102,26 +116,29 @@
 
 struct Kss_File : Gme_Info_
 {
-	Kss_Emu::header_t header_;
+	Kss_Emu::header_t const* header_;
 
 	Kss_File() { set_type( gme_kss_type ); }
 
-	blargg_err_t load_( Data_Reader& in )
+	blargg_err_t load_mem_( byte const begin , int size )
 	{
-		memset( &header_, 0, sizeof header_ );
-		blargg_err_t err = in.read( &header_, header_.size );
-		if ( err )
-			return (err == blargg_err_file_eof ? blargg_err_file_type : err);
+		header_ = ( Kss_Emu::header_t const* ) begin;
 
-		if ( header_.tag 3 == 'X' && header_.extra_header == 0x10 )
-			set_track_count( get_le16( header_.last_track ) + 1 );
+		if ( header_->tag 3 == 'X' && header_->extra_header == 0x10 )
+			set_track_count( get_le16( header_->last_track ) + 1 );
 
-		return check_kss_header( &header_ );
+		return check_kss_header( header_ );
 	}
 
 	blargg_err_t track_info_( track_info_t* out, int ) const
 	{
-		copy_kss_fields( header_, out );
+		copy_kss_fields( *header_, out );
+		return blargg_ok;
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		hash_kss_file( *header_, file_begin() + Kss_Core::header_t::base_size, file_end() - file_begin() - Kss_Core::header_t::base_size, out );
 		return blargg_ok;
 	}
 };
@@ -468,3 +485,9 @@
 
 	return blargg_ok;
 }
+
+blargg_err_t Kss_Emu::hash_( Hash_Function& out ) const
+{
+	hash_kss_file( header(), core.rom_().begin(), core.rom_().file_size(), out );
+	return blargg_ok;
+}
\ No newline at end of file

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Emu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Scc_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Scc_Apu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Scc_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Kss_Scc_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/M3u_Playlist.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/M3u_Playlist.cpp Changed

@@ -1,476 +1,476 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "M3u_Playlist.h"
-#include "Music_Emu.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 )
-{
-	if ( !err )
-	{
-		require( raw_track_count_ ); // file must be loaded first
-		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 ( unsigned (*in - 1) <= ' ' - 1 )
-		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;
-		while ( *in == ':' )
-		{
-			n = -1;
-			in = parse_int_( in + 1, &n );
-			if ( n >= 0 )
-				*out = *out * 60 + n;
-		}
-		*out *= 1000;
-		if ( *in == '.' )
-		{
-			n = -1;
-			in = parse_int_( in + 1, &n );
-			if ( n >= 0 )
-				*out = *out + 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 = entry.length - entry.loop;
-			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, char *& last_comment_value, bool first )
-{
-	in = skip_white( in + 1 );
-	const char* field = in;
-	if ( *field != '@' )
-		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 if ( !strcmp( "Game" , field ) ) info.title = text;
-			else if ( !strcmp( "Artist" , field ) ) info.artist = text;
-			else if ( !strcmp( "Copyright", field ) ) info.copyright = text;
-			else
-				text = 0;
-			if ( text )
-				return;
-			*in = ':';
-		}
-	}
-	else if ( *field == '@' )
-	{
-		++field;
-		in = (char*)field;
-		while ( *in && *in > ' ' )
-			in++;
-		const char* text = skip_white( in );
-		if ( *text )
-		{
-			char saved = *in;
-			*in = 0;
-			 if ( !strcmp( "TITLE" , field ) ) info.title = text;
-			else if ( !strcmp( "ARTIST", field ) ) info.artist = text;
-			else if ( !strcmp( "DATE", field ) ) info.date = text;
-			else if ( !strcmp( "COMPOSER", field ) ) info.composer = text;
-			else if ( !strcmp( "SEQUENCER", field ) ) info.sequencer = text;
-			else if ( !strcmp( "ENGINEER", field ) ) info.engineer = text;
-			else if ( !strcmp( "RIPPER", field ) ) info.ripping = text;
-			else if ( !strcmp( "TAGGER", field ) ) info.tagging = text;
-			else
-				text = 0;
-			if ( text )
-			{
-				last_comment_value = (char*)text;
-				return;
-			}
-			*in = saved;
-		}
-	}
-	else if ( last_comment_value )
-	{
-		size_t len = strlen( last_comment_value );
-		last_comment_value len = ',';
-		last_comment_value len + 1 = ' ';
-		size_t field_len = strlen( field );
-		memmove( last_comment_value + len + 2, field, field_len );
-		last_comment_value len + 2 + field_len = 0;
-		return;
-	}
-	
-	if ( first )
-		info.title = field;
-}
-
-blargg_err_t M3u_Playlist::parse_()
-{
-	info_.title = "";
-	info_.artist = "";
-	info_.date = "";
-	info_.composer = "";
-	info_.sequencer = "";
-	info_.engineer = "";
-	info_.ripping = "";
-	info_.tagging = "";
-	info_.copyright = "";
-	
-	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();
-	char* last_comment_value = 0;
-	while ( in < data.end() )
-	{
-		// find end of line and terminate it
-		line++;
-		char* begin = in;
-		while ( *in != CR && *in != LF )
-		{
-			if ( !*in )
-				return blargg_err_file_type;
-			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_, last_comment_value, 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;
-		}
-		else last_comment_value = 0;
-	}
-	if ( count <= 0 )
-		return blargg_err_file_type;
-	
-	// Treat first comment as title only if another field is also specified
-	if ( !(info_.artist 0 | info_.composer 0 | info_.date 0 | info_.engineer 0 | info_.ripping 0 | info_.sequencer 0 | info_.tagging 0 | info_.copyright0) )
-		info_.title = "";
-	
-	return entries.resize( count );
-}
-
-blargg_err_t M3u_Playlist::parse()
-{
-	blargg_err_t err = parse_();
-	if ( err )
-		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();
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "M3u_Playlist.h"
+#include "Music_Emu.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 )
+{
+	if ( !err )
+	{
+		require( raw_track_count_ ); // file must be loaded first
+		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 ( unsigned (*in - 1) <= ' ' - 1 )
+		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;
+		while ( *in == ':' )
+		{
+			n = -1;
+			in = parse_int_( in + 1, &n );
+			if ( n >= 0 )
+				*out = *out * 60 + n;
+		}
+		*out *= 1000;
+		if ( *in == '.' )
+		{
+			n = -1;
+			in = parse_int_( in + 1, &n );
+			if ( n >= 0 )
+				*out = *out + 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 = entry.length - entry.loop;
+			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, char *& last_comment_value, bool first )
+{
+	in = skip_white( in + 1 );
+	const char* field = in;
+	if ( *field != '@' )
+		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 if ( !strcmp( "Game" , field ) ) info.title = text;
+			else if ( !strcmp( "Artist" , field ) ) info.artist = text;
+			else if ( !strcmp( "Copyright", field ) ) info.copyright = text;
+			else
+				text = 0;
+			if ( text )
+				return;
+			*in = ':';
+		}
+	}
+	else if ( *field == '@' )
+	{
+		++field;
+		in = (char*)field;
+		while ( *in && *in > ' ' )
+			in++;
+		const char* text = skip_white( in );
+		if ( *text )
+		{
+			char saved = *in;
+			*in = 0;
+			 if ( !strcmp( "TITLE" , field ) ) info.title = text;
+			else if ( !strcmp( "ARTIST", field ) ) info.artist = text;
+			else if ( !strcmp( "DATE", field ) ) info.date = text;
+			else if ( !strcmp( "COMPOSER", field ) ) info.composer = text;
+			else if ( !strcmp( "SEQUENCER", field ) ) info.sequencer = text;
+			else if ( !strcmp( "ENGINEER", field ) ) info.engineer = text;
+			else if ( !strcmp( "RIPPER", field ) ) info.ripping = text;
+			else if ( !strcmp( "TAGGER", field ) ) info.tagging = text;
+			else
+				text = 0;
+			if ( text )
+			{
+				last_comment_value = (char*)text;
+				return;
+			}
+			*in = saved;
+		}
+	}
+	else if ( last_comment_value )
+	{
+		size_t len = strlen( last_comment_value );
+		last_comment_value len = ',';
+		last_comment_value len + 1 = ' ';
+		size_t field_len = strlen( field );
+		memmove( last_comment_value + len + 2, field, field_len );
+		last_comment_value len + 2 + field_len = 0;
+		return;
+	}
+	
+	if ( first )
+		info.title = field;
+}
+
+blargg_err_t M3u_Playlist::parse_()
+{
+	info_.title = "";
+	info_.artist = "";
+	info_.date = "";
+	info_.composer = "";
+	info_.sequencer = "";
+	info_.engineer = "";
+	info_.ripping = "";
+	info_.tagging = "";
+	info_.copyright = "";
+	
+	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();
+	char* last_comment_value = 0;
+	while ( in < data.end() )
+	{
+		// find end of line and terminate it
+		line++;
+		char* begin = in;
+		while ( *in != CR && *in != LF )
+		{
+			if ( !*in )
+				return blargg_err_file_type;
+			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_, last_comment_value, 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;
+		}
+		else last_comment_value = 0;
+	}
+	if ( count <= 0 )
+		return blargg_err_file_type;
+	
+	// Treat first comment as title only if another field is also specified
+	if ( !(info_.artist 0 | info_.composer 0 | info_.date 0 | info_.engineer 0 | info_.ripping 0 | info_.sequencer 0 | info_.tagging 0 | info_.copyright0) )
+		info_.title = "";
+	
+	return entries.resize( count );
+}
+
+blargg_err_t M3u_Playlist::parse()
+{
+	blargg_err_t err = parse_();
+	if ( err )
+		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.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/M3u_Playlist.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/M3u_Playlist.h Changed

@@ -1,87 +1,87 @@
-// M3U playlist file parser, with support for subtrack information
-
-// Game_Music_Emu 0.6-pre
-#ifndef M3U_PLAYLIST_H
-#define M3U_PLAYLIST_H
-
-#include "blargg_common.h"
-#include "Data_Reader.h"
-
-class M3u_Playlist {
-public:
-	// Load playlist data
-	blargg_err_t load( const char* path );
-	blargg_err_t load( Data_Reader& in );
-	blargg_err_t load( void const* data, long size );
-	
-	// Line number of first parse error, 0 if no error. Any lines with parse
-	// errors are ignored.
-	int first_error() const { return first_error_; }
-	
-	// All string pointers point to valid string, or "" if not available
-	struct info_t
-	{
-		const char* title;
-		const char* artist;
-		const char* date;
-		const char* composer;
-		const char* sequencer;
-		const char* engineer;
-		const char* ripping;
-		const char* tagging;
-		const char* copyright;
-	};
-	info_t const& info() const { return info_; }
-	
-	struct entry_t
-	{
-		const char* file; // filename without stupid ::TYPE suffix
-		const char* type; // if filename has ::TYPE suffix, this is "TYPE", otherwise ""
-		const char* name;
-		bool decimal_track; // true if track was specified in decimal
-		// integers are -1 if not present
-		int track;
-		int length; // milliseconds
-		int intro;
-		int loop;
-		int fade;
-		int repeat; // count
-	};
-	entry_t const& operator ( int i ) const { return entries i; }
-	int size() const { return entries.size(); }
-	
-	void clear();
-	
-private:
-	blargg_vector<entry_t> entries;
-	blargg_vector<char> data;
-	int first_error_;
-	info_t info_;
-	
-	blargg_err_t parse();
-	blargg_err_t parse_();
-	void clear_();
-};
-
-inline void M3u_Playlist::clear_()
-{
-	info_.title = "";
-	info_.artist = "";
-	info_.date = "";
-	info_.composer = "";
-	info_.sequencer = "";
-	info_.engineer = "";
-	info_.ripping = "";
-	info_.tagging = "";
-	info_.copyright = "";
-	entries.clear();
-	data.clear();
-}
-
-inline void M3u_Playlist::clear()
-{
-	first_error_ = 0;
-	clear_();
-}
-
-#endif
+// M3U playlist file parser, with support for subtrack information
+
+// Game_Music_Emu $vers
+#ifndef M3U_PLAYLIST_H
+#define M3U_PLAYLIST_H
+
+#include "blargg_common.h"
+#include "Data_Reader.h"
+
+class M3u_Playlist {
+public:
+	// Load playlist data
+	blargg_err_t load( const char* path );
+	blargg_err_t load( Data_Reader& in );
+	blargg_err_t load( void const* data, long size );
+	
+	// Line number of first parse error, 0 if no error. Any lines with parse
+	// errors are ignored.
+	int first_error() const { return first_error_; }
+	
+	// All string pointers point to valid string, or "" if not available
+	struct info_t
+	{
+		const char* title;
+		const char* artist;
+		const char* date;
+		const char* composer;
+		const char* sequencer;
+		const char* engineer;
+		const char* ripping;
+		const char* tagging;
+		const char* copyright;
+	};
+	info_t const& info() const { return info_; }
+	
+	struct entry_t
+	{
+		const char* file; // filename without stupid ::TYPE suffix
+		const char* type; // if filename has ::TYPE suffix, this is "TYPE", otherwise ""
+		const char* name;
+		bool decimal_track; // true if track was specified in decimal
+		// integers are -1 if not present
+		int track;
+		int length; // milliseconds
+		int intro;
+		int loop;
+		int fade;
+		int repeat; // count
+	};
+	entry_t const& operator ( int i ) const { return entries i; }
+	int size() const { return entries.size(); }
+	
+	void clear();
+	
+private:
+	blargg_vector<entry_t> entries;
+	blargg_vector<char> data;
+	int first_error_;
+	info_t info_;
+	
+	blargg_err_t parse();
+	blargg_err_t parse_();
+	void clear_();
+};
+
+inline void M3u_Playlist::clear_()
+{
+	info_.title = "";
+	info_.artist = "";
+	info_.date = "";
+	info_.composer = "";
+	info_.sequencer = "";
+	info_.engineer = "";
+	info_.ripping = "";
+	info_.tagging = "";
+	info_.copyright = "";
+	entries.clear();
+	data.clear();
+}
+
+inline void M3u_Playlist::clear()
+{
+	first_error_ = 0;
+	clear_();
+}
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Multi_Buffer.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Multi_Buffer.cpp Changed

@@ -1,290 +1,290 @@
-// Blip_Buffer 0.4.0. http://www.slack.net/~ant/
-
-#include "Multi_Buffer.h"
-
-/* Copyright (C) 2003-2008 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"
-
-Multi_Buffer::Multi_Buffer( int spf ) : samples_per_frame_( spf )
-{
-	length_ = 0;
-	sample_rate_ = 0;
-	channels_changed_count_ = 1;
-	channel_types_ = NULL;
-	channel_count_ = 0;
-	immediate_removal_ = true;
-}
-
-Multi_Buffer::channel_t Multi_Buffer::channel( int /*index*/ )
-{
-	channel_t ch;
-	ch.center = ch.left = ch.right = NULL;
-	return ch;
-}
-
-// Silent_Buffer
-
-Silent_Buffer::Silent_Buffer() : Multi_Buffer( 1 ) // 0 channels would probably confuse
-{
-	// TODO: better to use empty Blip_Buffer so caller never has to check for NULL?
-	chan.left = NULL;
-	chan.center = NULL;
-	chan.right = NULL;
-}
-
-// Mono_Buffer
-
-Mono_Buffer::Mono_Buffer() : Multi_Buffer( 1 )
-{
-	chan.center = &buf;
-	chan.left = &buf;
-	chan.right = &buf;
-}
-
-Mono_Buffer::~Mono_Buffer() { }
-
-blargg_err_t Mono_Buffer::set_sample_rate( int rate, int msec )
-{
-	RETURN_ERR( buf.set_sample_rate( rate, msec ) );
-	return Multi_Buffer::set_sample_rate( buf.sample_rate(), buf.length() );
-}
-
-
-// Tracked_Blip_Buffer
-
-int const blip_buffer_extra = 32; // TODO: explain why this value
-
-Tracked_Blip_Buffer::Tracked_Blip_Buffer()
-{
-	last_non_silence = 0;
-}
-
-void Tracked_Blip_Buffer::clear()
-{
-	last_non_silence = 0;
-	Blip_Buffer::clear();
-}
-
-void Tracked_Blip_Buffer::end_frame( blip_time_t t )
-{
-	Blip_Buffer::end_frame( t );
-	if ( modified() )
-	{
-		clear_modified();
-		last_non_silence = samples_avail() + blip_buffer_extra;
-	}
-}
-
-unsigned Tracked_Blip_Buffer::non_silent() const
-{
-	return last_non_silence | unsettled();
-}
-
-inline void Tracked_Blip_Buffer::remove_( int n )
-{
-	if ( (last_non_silence -= n) < 0 )
-		last_non_silence = 0;
-}
-
-void Tracked_Blip_Buffer::remove_silence( int n )
-{
-	remove_( n );
-	Blip_Buffer::remove_silence( n );
-}
-
-void Tracked_Blip_Buffer::remove_samples( int n )
-{
-	remove_( n );
-	Blip_Buffer::remove_samples( n );
-}
-
-void Tracked_Blip_Buffer::remove_all_samples()
-{
-	int avail = samples_avail();
-	if ( !non_silent() )
-		remove_silence( avail );
-	else
-		remove_samples( avail );
-}
-
-int Tracked_Blip_Buffer::read_samples( blip_sample_t out , int count )
-{
-	count = Blip_Buffer::read_samples( out, count );
-	remove_( count );
-	return count;
-}
-
-// Stereo_Buffer
-
-int const stereo = 2;
-
-Stereo_Buffer::Stereo_Buffer() : Multi_Buffer( 2 )
-{
-	chan.center = mixer.bufs 2 = &bufs 2;
-	chan.left = mixer.bufs 0 = &bufs 0;
-	chan.right = mixer.bufs 1 = &bufs 1;
-	mixer.samples_read = 0;
-}
-
-Stereo_Buffer::~Stereo_Buffer() { }
-
-blargg_err_t Stereo_Buffer::set_sample_rate( int rate, int msec )
-{
-	mixer.samples_read = 0;
-	for ( int i = bufs_size; --i >= 0; )
-		RETURN_ERR( bufs i.set_sample_rate( rate, msec ) );
-	return Multi_Buffer::set_sample_rate( bufs 0.sample_rate(), bufs 0.length() );
-}
-
-void Stereo_Buffer::clock_rate( int rate )
-{
-	for ( int i = bufs_size; --i >= 0; )
-		bufs i.clock_rate( rate );
-}
-
-void Stereo_Buffer::bass_freq( int bass )
-{
-	for ( int i = bufs_size; --i >= 0; )
-		bufs i.bass_freq( bass );
-}
-
-void Stereo_Buffer::clear()
-{
-	mixer.samples_read = 0;
-	for ( int i = bufs_size; --i >= 0; )
-		bufs i.clear();
-}
-
-void Stereo_Buffer::end_frame( blip_time_t time )
-{
-	for ( int i = bufs_size; --i >= 0; )
-		bufs i.end_frame( time );
-}
-
-int Stereo_Buffer::read_samples( blip_sample_t out , int out_size )
-{
-	require( (out_size & 1) == 0 ); // must read an even number of samples
-	out_size = min( out_size, samples_avail() );
-
-	int pair_count = int (out_size >> 1);
-	if ( pair_count )
-	{
-		mixer.read_pairs( out, pair_count );
-		
-		if ( samples_avail() <= 0 || immediate_removal() )
-		{
-			for ( int i = bufs_size; --i >= 0; )
-			{
-				buf_t& b = bufs i;
-				// TODO: might miss non-silence settling since it checks END of last read
-				if ( !b.non_silent() )
-					b.remove_silence( mixer.samples_read );
-				else
-					b.remove_samples( mixer.samples_read );
-			}
-			mixer.samples_read = 0;
-		}
-	}
-	return out_size;
-}
-
-
-// Stereo_Mixer
-
-// mixers use a single index value to improve performance on register-challenged processors
-// offset goes from negative to zero
-
-void Stereo_Mixer::read_pairs( blip_sample_t out , int count )
-{
-	// TODO: if caller never marks buffers as modified, uses mono
-	// except that buffer isn't cleared, so caller can encounter
-	// subtle problems and not realize the cause.
-	samples_read += count;
-	if ( bufs 0->non_silent() | bufs 1->non_silent() )
-		mix_stereo( out, count );
-	else
-		mix_mono( out, count );
-}
-
-void Stereo_Mixer::mix_mono( blip_sample_t out_ , int count )
-{
-	int const bass = bufs 2->highpass_shift();
-	Blip_Buffer::delta_t const* center = bufs 2->read_pos() + samples_read;
-	int center_sum = bufs 2->integrator();
-	
-	typedef blip_sample_t stereo_blip_sample_t stereo;
-	stereo_blip_sample_t* BLARGG_RESTRICT out = (stereo_blip_sample_t*) out_ + count;
-	int offset = -count;
-	do
-	{
-		int s = center_sum >> bufs 2->delta_bits;
-		
-		center_sum -= center_sum >> bass;
-		center_sum += center offset;
-		
-		BLIP_CLAMP( s, s );
-		
-		out offset 0 = (blip_sample_t) s;
-		out offset 1 = (blip_sample_t) s;
-	}
-	while ( ++offset );
-	
-	bufs 2->set_integrator( center_sum );
-}
-
-void Stereo_Mixer::mix_stereo( blip_sample_t out_ , int count )
-{
-	blip_sample_t* BLARGG_RESTRICT out = out_ + count * stereo;
-	
-	// do left + center and right + center separately to reduce register load
-	Tracked_Blip_Buffer* const* buf = &bufs 2;
-	while ( true ) // loop runs twice
-	{
-		--buf;
-		--out;
-		
-		int const bass = bufs 2->highpass_shift();
-		Blip_Buffer::delta_t const* side = (*buf)->read_pos() + samples_read;
-		Blip_Buffer::delta_t const* center = bufs 2->read_pos() + samples_read;
-	
-		int side_sum = (*buf)->integrator();
-		int center_sum = bufs 2->integrator();
-		
-		int offset = -count;
-		do
-		{
-			int s = (center_sum + side_sum) >> Blip_Buffer::delta_bits;
-			
-			side_sum -= side_sum >> bass;
-			center_sum -= center_sum >> bass;
-			
-			side_sum += side offset;
-			center_sum += center offset;
-			
-			BLIP_CLAMP( s, s );
-			
-			++offset; // before write since out is decremented to slightly before end
-			out offset * stereo = (blip_sample_t) s;
-		}
-		while ( offset );
-		
-		(*buf)->set_integrator( side_sum );
-		
-		if ( buf != bufs )
-			continue;
-		
-		// only end center once
-		bufs 2->set_integrator( center_sum );
-		break;
-	}
-}
+// Blip_Buffer $vers. http://www.slack.net/~ant/
+
+#include "Multi_Buffer.h"
+
+/* Copyright (C) 2003-2008 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"
+
+Multi_Buffer::Multi_Buffer( int spf ) : samples_per_frame_( spf )
+{
+	length_ = 0;
+	sample_rate_ = 0;
+	channels_changed_count_ = 1;
+	channel_types_ = NULL;
+	channel_count_ = 0;
+	immediate_removal_ = true;
+}
+
+Multi_Buffer::channel_t Multi_Buffer::channel( int /*index*/ )
+{
+	channel_t ch;
+	ch.center = ch.left = ch.right = NULL;
+	return ch;
+}
+
+// Silent_Buffer
+
+Silent_Buffer::Silent_Buffer() : Multi_Buffer( 1 ) // 0 channels would probably confuse
+{
+	// TODO: better to use empty Blip_Buffer so caller never has to check for NULL?
+	chan.left = NULL;
+	chan.center = NULL;
+	chan.right = NULL;
+}
+
+// Mono_Buffer
+
+Mono_Buffer::Mono_Buffer() : Multi_Buffer( 1 )
+{
+	chan.center = &buf;
+	chan.left = &buf;
+	chan.right = &buf;
+}
+
+Mono_Buffer::~Mono_Buffer() { }
+
+blargg_err_t Mono_Buffer::set_sample_rate( int rate, int msec )
+{
+	RETURN_ERR( buf.set_sample_rate( rate, msec ) );
+	return Multi_Buffer::set_sample_rate( buf.sample_rate(), buf.length() );
+}
+
+
+// Tracked_Blip_Buffer
+
+int const blip_buffer_extra = 32; // TODO: explain why this value
+
+Tracked_Blip_Buffer::Tracked_Blip_Buffer()
+{
+	last_non_silence = 0;
+}
+
+void Tracked_Blip_Buffer::clear()
+{
+	last_non_silence = 0;
+	Blip_Buffer::clear();
+}
+
+void Tracked_Blip_Buffer::end_frame( blip_time_t t )
+{
+	Blip_Buffer::end_frame( t );
+	if ( modified() )
+	{
+		clear_modified();
+		last_non_silence = samples_avail() + blip_buffer_extra;
+	}
+}
+
+unsigned Tracked_Blip_Buffer::non_silent() const
+{
+	return last_non_silence | unsettled();
+}
+
+inline void Tracked_Blip_Buffer::remove_( int n )
+{
+	if ( (last_non_silence -= n) < 0 )
+		last_non_silence = 0;
+}
+
+void Tracked_Blip_Buffer::remove_silence( int n )
+{
+	remove_( n );
+	Blip_Buffer::remove_silence( n );
+}
+
+void Tracked_Blip_Buffer::remove_samples( int n )
+{
+	remove_( n );
+	Blip_Buffer::remove_samples( n );
+}
+
+void Tracked_Blip_Buffer::remove_all_samples()
+{
+	int avail = samples_avail();
+	if ( !non_silent() )
+		remove_silence( avail );
+	else
+		remove_samples( avail );
+}
+
+int Tracked_Blip_Buffer::read_samples( blip_sample_t out , int count )
+{
+	count = Blip_Buffer::read_samples( out, count );
+	remove_( count );
+	return count;
+}
+
+// Stereo_Buffer
+
+int const stereo = 2;
+
+Stereo_Buffer::Stereo_Buffer() : Multi_Buffer( 2 )
+{
+	chan.center = mixer.bufs 2 = &bufs 2;
+	chan.left = mixer.bufs 0 = &bufs 0;
+	chan.right = mixer.bufs 1 = &bufs 1;
+	mixer.samples_read = 0;
+}
+
+Stereo_Buffer::~Stereo_Buffer() { }
+
+blargg_err_t Stereo_Buffer::set_sample_rate( int rate, int msec )
+{
+	mixer.samples_read = 0;
+	for ( int i = bufs_size; --i >= 0; )
+		RETURN_ERR( bufs i.set_sample_rate( rate, msec ) );
+	return Multi_Buffer::set_sample_rate( bufs 0.sample_rate(), bufs 0.length() );
+}
+
+void Stereo_Buffer::clock_rate( int rate )
+{
+	for ( int i = bufs_size; --i >= 0; )
+		bufs i.clock_rate( rate );
+}
+
+void Stereo_Buffer::bass_freq( int bass )
+{
+	for ( int i = bufs_size; --i >= 0; )
+		bufs i.bass_freq( bass );
+}
+
+void Stereo_Buffer::clear()
+{
+	mixer.samples_read = 0;
+	for ( int i = bufs_size; --i >= 0; )
+		bufs i.clear();
+}
+
+void Stereo_Buffer::end_frame( blip_time_t time )
+{
+	for ( int i = bufs_size; --i >= 0; )
+		bufs i.end_frame( time );
+}
+
+int Stereo_Buffer::read_samples( blip_sample_t out , int out_size )
+{
+	require( (out_size & 1) == 0 ); // must read an even number of samples
+	out_size = min( out_size, samples_avail() );
+
+	int pair_count = int (out_size >> 1);
+	if ( pair_count )
+	{
+		mixer.read_pairs( out, pair_count );
+		
+		if ( samples_avail() <= 0 || immediate_removal() )
+		{
+			for ( int i = bufs_size; --i >= 0; )
+			{
+				buf_t& b = bufs i;
+				// TODO: might miss non-silence settling since it checks END of last read
+				if ( !b.non_silent() )
+					b.remove_silence( mixer.samples_read );
+				else
+					b.remove_samples( mixer.samples_read );
+			}
+			mixer.samples_read = 0;
+		}
+	}
+	return out_size;
+}
+
+
+// Stereo_Mixer
+
+// mixers use a single index value to improve performance on register-challenged processors
+// offset goes from negative to zero
+
+void Stereo_Mixer::read_pairs( blip_sample_t out , int count )
+{
+	// TODO: if caller never marks buffers as modified, uses mono
+	// except that buffer isn't cleared, so caller can encounter
+	// subtle problems and not realize the cause.
+	samples_read += count;
+	if ( bufs 0->non_silent() | bufs 1->non_silent() )
+		mix_stereo( out, count );
+	else
+		mix_mono( out, count );
+}
+
+void Stereo_Mixer::mix_mono( blip_sample_t out_ , int count )
+{
+	int const bass = bufs 2->highpass_shift();
+	Blip_Buffer::delta_t const* center = bufs 2->read_pos() + samples_read;
+	int center_sum = bufs 2->integrator();
+	
+	typedef blip_sample_t stereo_blip_sample_t stereo;
+	stereo_blip_sample_t* BLARGG_RESTRICT out = (stereo_blip_sample_t*) out_ + count;
+	int offset = -count;
+	do
+	{
+		int s = center_sum >> bufs 2->delta_bits;
+		
+		center_sum -= center_sum >> bass;
+		center_sum += center offset;
+		
+		BLIP_CLAMP( s, s );
+		
+		out offset 0 = (blip_sample_t) s;
+		out offset 1 = (blip_sample_t) s;
+	}
+	while ( ++offset );
+	
+	bufs 2->set_integrator( center_sum );
+}
+
+void Stereo_Mixer::mix_stereo( blip_sample_t out_ , int count )
+{
+	blip_sample_t* BLARGG_RESTRICT out = out_ + count * stereo;
+	
+	// do left + center and right + center separately to reduce register load
+	Tracked_Blip_Buffer* const* buf = &bufs 2;
+	while ( true ) // loop runs twice
+	{
+		--buf;
+		--out;
+		
+		int const bass = bufs 2->highpass_shift();
+		Blip_Buffer::delta_t const* side = (*buf)->read_pos() + samples_read;
+		Blip_Buffer::delta_t const* center = bufs 2->read_pos() + samples_read;
+	
+		int side_sum = (*buf)->integrator();
+		int center_sum = bufs 2->integrator();
+		
+		int offset = -count;
+		do
+		{
+			int s = (center_sum + side_sum) >> Blip_Buffer::delta_bits;
+			
+			side_sum -= side_sum >> bass;
+			center_sum -= center_sum >> bass;
+			
+			side_sum += side offset;
+			center_sum += center offset;
+			
+			BLIP_CLAMP( s, s );
+			
+			++offset; // before write since out is decremented to slightly before end
+			out offset * stereo = (blip_sample_t) s;
+		}
+		while ( offset );
+		
+		(*buf)->set_integrator( side_sum );
+		
+		if ( buf != bufs )
+			continue;
+		
+		// only end center once
+		bufs 2->set_integrator( center_sum );
+		break;
+	}
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Multi_Buffer.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Multi_Buffer.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Music_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Music_Emu.cpp Changed

@@ -1,235 +1,244 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Music_Emu.h"
-
-/* Copyright (C) 2003-2008 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
-
-Music_Emu::equalizer_t const Music_Emu::tv_eq = { -8.0, 180 };
-
-void Music_Emu::clear_track_vars()
-{
-	current_track_ = -1;
-	warning(); // clear warning
-	track_filter.stop();
-}
-
-void Music_Emu::unload()
-{
-	voice_count_ = 0;
-	clear_track_vars();
-	Gme_File::unload();
-}
-
-Music_Emu::gme_t()
-{
-	effects_buffer_ = NULL;
-	sample_rate_ = 0;
-	mute_mask_ = 0;
-	tempo_ = 1.0;
-	gain_ = 1.0;
-	
-	// defaults
-	tfilter = track_filter.setup();
-	set_max_initial_silence( 15 );
-	set_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(); // clears fields
-}
-
-Music_Emu::~gme_t()
-{
-	assert( !effects_buffer_ );
-}
-
-blargg_err_t Music_Emu::set_sample_rate( int rate )
-{
-	require( !sample_rate() ); // sample rate can't be changed once set
-	RETURN_ERR( set_sample_rate_( rate ) );
-	RETURN_ERR( track_filter.init( this ) );
-	sample_rate_ = rate;
-	tfilter.max_silence = 6 * stereo * sample_rate();
-	return blargg_ok;
-}
-
-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 )
-{
-	// TODO: why is GCC generating memcpy call here?
-	// Without the 'if', valgrind flags it.
-	if ( &eq != &equalizer_ )
-		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 );
-}
-
-const char* Music_Emu::voice_name( int i ) const
-{
-	if ( (unsigned) i < (unsigned) voice_count_ )
-		return voice_names_ i;
-	
-	//check( false ); // TODO: enable?
-	return "";
-}
-
-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 );
-}
-
-blargg_err_t Music_Emu::post_load()
-{
-	set_tempo( tempo_ );
-	remute_voices();
-	return Gme_File::post_load();
-}
-
-// Tell/Seek
-
-int Music_Emu::msec_to_samples( int msec ) const
-{
-	int sec = msec / 1000;
-	msec -= sec * 1000;
-	return (sec * sample_rate() + msec * sample_rate() / 1000) * stereo;
-}
-
-int Music_Emu::tell() const
-{
-	int rate = sample_rate() * stereo;
-	int sec = track_filter.sample_count() / rate;
-	return sec * 1000 + (track_filter.sample_count() - sec * rate) * 1000 / rate;
-}
-
-blargg_err_t Music_Emu::seek( int msec )
-{
-	int time = msec_to_samples( msec );
-	if ( time < track_filter.sample_count() )
-		RETURN_ERR( start_track( current_track_ ) );
-	return skip( time - track_filter.sample_count() );
-}
-
-blargg_err_t Music_Emu::skip( int count )
-{
-	require( current_track() >= 0 ); // start_track() must have been called already
-	return track_filter.skip( count );
-}
-
-blargg_err_t Music_Emu::skip_( int count )
-{
-	// for long skip, mute sound
-	const int threshold = 32768;
-	if ( count > threshold )
-	{
-		int saved_mute = mute_mask_;
-		mute_voices( ~0 );
-		
-		int n = count - threshold/2;
-		n &= ~(2048-1); // round to multiple of 2048
-		count -= n;
-		RETURN_ERR( track_filter.skip_( n ) );
-		
-		mute_voices( saved_mute );
-	}
-	
-	return track_filter.skip_( count );
-}
-
-// Playback
-
-blargg_err_t Music_Emu::start_track( int track )
-{
-	clear_track_vars();
-	
-	int remapped = track;
-	RETURN_ERR( remap_track_( &remapped ) );
-	current_track_ = track;
-	blargg_err_t err = start_track_( remapped );
-	if ( err )
-	{
-		current_track_ = -1;
-		return err;
-	}
-	
-	// convert filter times to samples
-	Track_Filter::setup_t s = tfilter;
-	s.max_initial *= sample_rate() * stereo;
-	#if GME_DISABLE_SILENCE_LOOKAHEAD
-		s.lookahead = 1;
-	#endif
-	track_filter.setup( s );
-	
-	return track_filter.start_track();
-}
-
-void Music_Emu::set_fade( int start_msec, int length_msec )
-{
-	track_filter.set_fade( msec_to_samples( start_msec ),
-			length_msec * sample_rate() / (1000 / stereo) );
-}
-
-blargg_err_t Music_Emu::play( int out_count, sample_t out )
-{
-	require( current_track() >= 0 );
-	require( out_count % stereo == 0 );
-	
-	return track_filter.play( out_count, out );
-}
-
-// Gme_Info_
-
-blargg_err_t Gme_Info_::set_sample_rate_( int ) { return blargg_ok; }
-void Gme_Info_::pre_load() { Gme_File::pre_load(); } // skip Music_Emu
-blargg_err_t Gme_Info_::post_load() { return 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 BLARGG_ERR( BLARGG_ERR_CALLER, "can't play file opened for info only" ); }
-blargg_err_t Gme_Info_::play_( int, sample_t ) { return BLARGG_ERR( BLARGG_ERR_CALLER, "can't play file opened for info only" ); }
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Music_Emu.h"
+
+/* Copyright (C) 2003-2008 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
+
+Music_Emu::equalizer_t const Music_Emu::tv_eq = { -8.0, 180, 0,0,0,0,0,0,0,0 };
+
+void Music_Emu::clear_track_vars()
+{
+	current_track_ = -1;
+	warning(); // clear warning
+	track_filter.stop();
+}
+
+void Music_Emu::unload()
+{
+	voice_count_ = 0;
+	clear_track_vars();
+	Gme_File::unload();
+}
+
+Music_Emu::gme_t()
+{
+	effects_buffer_ = NULL;
+	sample_rate_ = 0;
+	mute_mask_ = 0;
+	tempo_ = 1.0;
+	gain_ = 1.0;
+ 
+ fade_set = false;
+	
+	// defaults
+	tfilter = track_filter.setup();
+	set_max_initial_silence( 15 );
+	set_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(); // clears fields
+}
+
+Music_Emu::~gme_t()
+{
+	assert( !effects_buffer_ );
+}
+
+blargg_err_t Music_Emu::set_sample_rate( int rate )
+{
+	require( !sample_rate() ); // sample rate can't be changed once set
+	RETURN_ERR( set_sample_rate_( rate ) );
+	RETURN_ERR( track_filter.init( this ) );
+	sample_rate_ = rate;
+	tfilter.max_silence = 6 * stereo * sample_rate();
+	return blargg_ok;
+}
+
+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 )
+{
+	// TODO: why is GCC generating memcpy call here?
+	// Without the 'if', valgrind flags it.
+	if ( &eq != &equalizer_ )
+		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 );
+}
+
+const char* Music_Emu::voice_name( int i ) const
+{
+	if ( (unsigned) i < (unsigned) voice_count_ )
+		return voice_names_ i;
+	
+	//check( false ); // TODO: enable?
+	return "";
+}
+
+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 );
+}
+
+blargg_err_t Music_Emu::post_load()
+{
+	set_tempo( tempo_ );
+	remute_voices();
+	return Gme_File::post_load();
+}
+
+// Tell/Seek
+
+int Music_Emu::msec_to_samples( int msec ) const
+{
+	int sec = msec / 1000;
+	msec -= sec * 1000;
+	return (sec * sample_rate() + msec * sample_rate() / 1000) * stereo;
+}
+
+int Music_Emu::tell() const
+{
+	int rate = sample_rate() * stereo;
+	int sec = track_filter.sample_count() / rate;
+	return sec * 1000 + (track_filter.sample_count() - sec * rate) * 1000 / rate;
+}
+
+blargg_err_t Music_Emu::seek( int msec )
+{
+	int time = msec_to_samples( msec );
+	if ( time < track_filter.sample_count() )
+ {
+		RETURN_ERR( start_track( current_track_ ) );
+ if ( fade_set )
+ set_fade( length_msec, fade_msec );
+ }
+	return skip( time - track_filter.sample_count() );
+}
+
+blargg_err_t Music_Emu::skip( int count )
+{
+	require( current_track() >= 0 ); // start_track() must have been called already
+	return track_filter.skip( count );
+}
+
+blargg_err_t Music_Emu::skip_( int count )
+{
+	// for long skip, mute sound
+	const int threshold = 32768;
+	if ( count > threshold )
+	{
+		int saved_mute = mute_mask_;
+		mute_voices( ~0 );
+		
+		int n = count - threshold/2;
+		n &= ~(2048-1); // round to multiple of 2048
+		count -= n;
+		RETURN_ERR( track_filter.skip_( n ) );
+		
+		mute_voices( saved_mute );
+	}
+	
+	return track_filter.skip_( count );
+}
+
+// Playback
+
+blargg_err_t Music_Emu::start_track( int track )
+{
+	clear_track_vars();
+	
+	int remapped = track;
+	RETURN_ERR( remap_track_( &remapped ) );
+	current_track_ = track;
+	blargg_err_t err = start_track_( remapped );
+	if ( err )
+	{
+		current_track_ = -1;
+		return err;
+	}
+	
+	// convert filter times to samples
+	Track_Filter::setup_t s = tfilter;
+	s.max_initial *= sample_rate() * stereo;
+	#if GME_DISABLE_SILENCE_LOOKAHEAD
+		s.lookahead = 1;
+	#endif
+	track_filter.setup( s );
+	
+	return track_filter.start_track();
+}
+
+void Music_Emu::set_fade( int start_msec, int length_msec )
+{
+ fade_set = true;
+ this->length_msec = start_msec;
+ this->fade_msec = length_msec;
+	track_filter.set_fade( start_msec < 0 ? Track_Filter::indefinite_count : msec_to_samples( start_msec ),
+			length_msec * sample_rate() / (1000 / stereo) );
+}
+
+blargg_err_t Music_Emu::play( int out_count, sample_t out )
+{
+	require( current_track() >= 0 );
+	require( out_count % stereo == 0 );
+	
+	return track_filter.play( out_count, out );
+}
+
+// Gme_Info_
+
+blargg_err_t Gme_Info_::set_sample_rate_( int ) { return blargg_ok; }
+void Gme_Info_::pre_load() { Gme_File::pre_load(); } // skip Music_Emu
+blargg_err_t Gme_Info_::post_load() { return 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 BLARGG_ERR( BLARGG_ERR_CALLER, "can't play file opened for info only" ); }
+blargg_err_t Gme_Info_::play_( int, sample_t ) { return BLARGG_ERR( BLARGG_ERR_CALLER, "can't play file opened for info only" ); }

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Music_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Music_Emu.h Changed

@@ -1,241 +1,280 @@
-// Common interface to game music file emulators
-
-// Game_Music_Emu 0.6-pre
-#ifndef MUSIC_EMU_H
-#define MUSIC_EMU_H
-
-#include "Gme_File.h"
-#include "Track_Filter.h"
-class Multi_Buffer;
-
-struct gme_t : public Gme_File, private Track_Filter::callbacks_t {
-public:
-	// Sets output sample rate. Must be called only once before loading file.
-	blargg_err_t set_sample_rate( int sample_rate );
-
-	// Sample rate sound is generated at
-	int sample_rate() const;
-	
-// File loading
-
-	// See Gme_Loader.h
-
-// Basic playback
-
-	// Starts a track, where 0 is the first track. Also clears warning string.
-	blargg_err_t start_track( int );
-	
-	// Generates '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( int count, sample_t* buf );
-	
-// Track information
-	
-	// See Gme_File.h
-	
-	// Index of current track or -1 if one hasn't been started
-	int current_track() const;
-
-	// Info for currently playing track
-	using Gme_File::track_info;
-	blargg_err_t track_info( track_info_t* out ) const;
-	
-// Track status/control
-
-	// Number of milliseconds played since beginning of track (1000 per second)
-	int tell() const;
-	
-	// Seeks to new time in track. Seeking backwards or far forward can take a while.
-	blargg_err_t seek( int msec );
-	
-	// Skips n samples
-	blargg_err_t skip( int n );
-	
-	// True if a track has reached its end
-	bool track_ended() const;
-	
-	// Sets start time and length of track fade out. Once fade ends track_ended() returns
-	// true. Fade time must be set after track has been started, and can be changed
-	// at any time.
-	void set_fade( int start_msec, int length_msec = 8000 );
-	
-	// Disables automatic end-of-track detection and skipping of silence at beginning
-	void ignore_silence( bool disable = true );
-	
-// Voices
-
-	// Number of voices used by currently loaded file
-	int voice_count() const;
-	
-	// Name of voice i, from 0 to voice_count()-1
-	const char* voice_name( int i ) const;
-	
-	// Mutes/unmutes voice i, where voice 0 is first voice
-	void mute_voice( int index, bool mute = true );
-	
-	// Sets 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 );
-
-// Sound customization
-	
-	// Adjusts 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 );
-	
-	// Changes overall output amplitude, where 1.0 results in minimal clamping.
-	// Must be called before set_sample_rate().
-	void set_gain( double );
-	
-	// Requests 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( class 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;
-	
-	// Sets frequency equalizer parameters
-	void set_equalizer( equalizer_t const& );
-	
-	// Equalizer preset for a TV speaker
-	static equalizer_t const tv_eq;
-	
-// Derived interface
-protected:
-	// Cause any further generated samples to be silence, instead of calling play_()
-	void set_track_ended()                      { track_filter.set_track_ended(); }
-	
-	// If more than secs of silence are encountered, track is ended
-	void set_max_initial_silence( int secs )    { tfilter.max_initial = secs; }
-	
-	// Sets rate emulator is run at when scanning ahead for silence. 1=100%, 2=200% etc.
-	void set_silence_lookahead( int rate )      { tfilter.lookahead = rate; }
-	
-	// Sets number of voices
-	void set_voice_count( int n )               { voice_count_ = n; }
-	
-	// Sets names of voices
-	void set_voice_names( const char* const names  );
-	
-	// Current gain
-	double gain() const                         { return gain_; }
-	
-	// Current tempo
-	double tempo() const                        { return tempo_; }
-	
-	// Re-applies muting mask using mute_voices_()
-	void remute_voices();
-	
-// Overrides should do the indicated task
-	
-	// Set sample rate as close as possible to sample_rate, then call
-	// Music_Emu::set_sample_rate_() with the actual rate used.
-	virtual blargg_err_t set_sample_rate_( int sample_rate )    BLARGG_PURE( ; )
-	
-	// Set equalizer parameters
-	virtual void set_equalizer_( equalizer_t const& )           { }
-	
-	// Mute voices based on mask
-	virtual void mute_voices_( int mask )                       BLARGG_PURE( ; )
-	
-	// Set tempo to t, which is constrained to the range 0.02 to 4.0.
-	virtual void set_tempo_( double t )                         BLARGG_PURE( ; )
-	
-	// Start track t, where 0 is the first track
-	virtual blargg_err_t start_track_( int t )                  BLARGG_PURE( ; ) // tempo is set before this
-	
-	// Generate count samples into *out. Count will always be even.
-	virtual blargg_err_t play_( int count, sample_t out  )    BLARGG_PURE( ; )
-	
-	// Skip count samples. Count will always be even.
-	virtual blargg_err_t skip_( int count );
-
-
-// Implementation
-public:
-	gme_t();
-	~gme_t();
-	BLARGG_DEPRECATED( const char** voice_names() const { return CONST_CAST(const char**,voice_names_); } )
-
-protected:
-	virtual void unload();
-	virtual void pre_load();
-	virtual blargg_err_t post_load();
-
-private:
-	Track_Filter::setup_t tfilter;
-	Track_Filter track_filter;
-	equalizer_t equalizer_;
-	const char* const* voice_names_;
-	int voice_count_;
-	int mute_mask_;
-	double tempo_;
-	double gain_;
-	int sample_rate_;
-	int current_track_;
-	
-	void clear_track_vars();
-	int msec_to_samples( int msec ) const;
-	
-	friend Music_Emu* gme_new_emu( gme_type_t, int );
-	friend void gme_effects( Music_Emu const*, gme_effects_t* );
-	friend void gme_set_effects( Music_Emu*, gme_effects_t const* );
-	friend void gme_set_stereo_depth( Music_Emu*, double );
-	friend const char** gme_voice_names ( Music_Emu const* );
-	
-protected:
-	Multi_Buffer* effects_buffer_;
-};
-
-// base class for info-only derivations
-struct Gme_Info_ : Music_Emu
-{
-	virtual blargg_err_t set_sample_rate_( int 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_( int count, sample_t out  );
-	virtual void pre_load();
-	virtual blargg_err_t post_load();
-};
-
-inline blargg_err_t Music_Emu::track_info( track_info_t* out ) const
-{
-	return track_info( out, current_track_ );
-}
-
-inline int Music_Emu::sample_rate() const           { return sample_rate_; }
-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_filter.track_ended(); }
-inline const Music_Emu::equalizer_t& Music_Emu::equalizer() const { return equalizer_; }
-
-inline void Music_Emu::ignore_silence( bool b )     { track_filter.ignore_silence( 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::set_voice_names( const char* const p  ) { voice_names_ = p; }
-
-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;
-}
-
-inline blargg_err_t Music_Emu::start_track_( int )  { return blargg_ok; }
-
-inline blargg_err_t Music_Emu::set_sample_rate_( int ) { return blargg_ok; }
-
-inline blargg_err_t Music_Emu::play_( int, sample_t  ) { return blargg_ok; }
-
-#endif
+// Common interface to game music file emulators
+
+// Game_Music_Emu $vers
+#ifndef MUSIC_EMU_H
+#define MUSIC_EMU_H
+
+#include "Gme_File.h"
+#include "Track_Filter.h"
+#include "blargg_errors.h"
+class Multi_Buffer;
+
+struct gme_t : public Gme_File, private Track_Filter::callbacks_t {
+public:
+	// Sets output sample rate. Must be called only once before loading file.
+	blargg_err_t set_sample_rate( int sample_rate );
+
+	// Sample rate sound is generated at
+	int sample_rate() const;
+	
+// File loading
+
+	// See Gme_Loader.h
+
+// Basic playback
+
+	// Starts a track, where 0 is the first track. Also clears warning string.
+	blargg_err_t start_track( int );
+	
+	// Generates '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( int count, sample_t* buf );
+	
+// Track information
+	
+	// See Gme_File.h
+	
+	// Index of current track or -1 if one hasn't been started
+	int current_track() const;
+
+	// Info for currently playing track
+	using Gme_File::track_info;
+	blargg_err_t track_info( track_info_t* out ) const;
+    blargg_err_t set_track_info( const track_info_t* in );
+    blargg_err_t set_track_info( const track_info_t* in, int track_number );
+
+	struct Hash_Function
+	{
+		virtual void hash_( byte const* data, size_t size ) BLARGG_PURE( ; )
+	};
+	virtual blargg_err_t hash_( Hash_Function& ) const BLARGG_PURE( ; )
+    
+    blargg_err_t save( gme_writer_t writer, void* your_data) const;
+
+// Track status/control
+
+	// Number of milliseconds played since beginning of track (1000 per second)
+	int tell() const;
+	
+	// Seeks to new time in track. Seeking backwards or far forward can take a while.
+	blargg_err_t seek( int msec );
+	
+	// Skips n samples
+	blargg_err_t skip( int n );
+	
+	// True if a track has reached its end
+	bool track_ended() const;
+	
+	// Sets start time and length of track fade out. Once fade ends track_ended() returns
+	// true. Fade time must be set after track has been started, and can be changed
+	// at any time.
+	void set_fade( int start_msec, int length_msec = 8000 );
+	
+	// Disables automatic end-of-track detection and skipping of silence at beginning
+	void ignore_silence( bool disable = true );
+	
+// Voices
+
+	// Number of voices used by currently loaded file
+	int voice_count() const;
+	
+	// Name of voice i, from 0 to voice_count()-1
+	const char* voice_name( int i ) const;
+	
+	// Mutes/unmutes voice i, where voice 0 is first voice
+	void mute_voice( int index, bool mute = true );
+	
+	// Sets 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 );
+
+// Sound customization
+	
+	// Adjusts 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 );
+	
+	// Changes overall output amplitude, where 1.0 results in minimal clamping.
+	// Must be called before set_sample_rate().
+	void set_gain( double );
+	
+	// Requests 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( class 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;
+	
+	// Sets frequency equalizer parameters
+	void set_equalizer( equalizer_t const& );
+	
+	// Equalizer preset for a TV speaker
+	static equalizer_t const tv_eq;
+	
+// Derived interface
+protected:
+	// Cause any further generated samples to be silence, instead of calling play_()
+	void set_track_ended()                      { track_filter.set_track_ended(); }
+	
+	// If more than secs of silence are encountered, track is ended
+	void set_max_initial_silence( int secs )    { tfilter.max_initial = secs; }
+	
+	// Sets rate emulator is run at when scanning ahead for silence. 1=100%, 2=200% etc.
+	void set_silence_lookahead( int rate )      { tfilter.lookahead = rate; }
+	
+	// Sets number of voices
+	void set_voice_count( int n )               { voice_count_ = n; }
+	
+	// Sets names of voices
+	void set_voice_names( const char* const names  );
+	
+	// Current gain
+	double gain() const                         { return gain_; }
+	
+	// Current tempo
+	double tempo() const                        { return tempo_; }
+	
+	// Re-applies muting mask using mute_voices_()
+	void remute_voices();
+	
+// Overrides should do the indicated task
+	
+	// Set sample rate as close as possible to sample_rate, then call
+	// Music_Emu::set_sample_rate_() with the actual rate used.
+	virtual blargg_err_t set_sample_rate_( int sample_rate )    BLARGG_PURE( ; )
+	
+	// Set equalizer parameters
+	virtual void set_equalizer_( equalizer_t const& )           { }
+	
+	// Mute voices based on mask
+	virtual void mute_voices_( int mask )                       BLARGG_PURE( ; )
+	
+	// Set tempo to t, which is constrained to the range 0.02 to 4.0.
+	virtual void set_tempo_( double t )                         BLARGG_PURE( ; )
+	
+	// Start track t, where 0 is the first track
+	virtual blargg_err_t start_track_( int t )                  BLARGG_PURE( ; ) // tempo is set before this
+	
+	// Generate count samples into *out. Count will always be even.
+	virtual blargg_err_t play_( int count, sample_t out  )    BLARGG_PURE( ; )
+	
+	// Skip count samples. Count will always be even.
+	virtual blargg_err_t skip_( int count );
+
+    // Save current state of file to specified writer.
+    virtual blargg_err_t save_( gme_writer_t, void* ) const { return "Not supported by this format"; }
+
+    // Set track info
+    virtual blargg_err_t set_track_info_( const track_info_t*, int ) { return "Not supported by this format"; }
+    
+// Implementation
+public:
+	gme_t();
+	~gme_t();
+	BLARGG_DEPRECATED( const char** voice_names() const { return CONST_CAST(const char**,voice_names_); } )
+
+protected:
+	virtual void unload();
+	virtual void pre_load();
+	virtual blargg_err_t post_load();
+
+private:
+	Track_Filter::setup_t tfilter;
+	Track_Filter track_filter;
+	equalizer_t equalizer_;
+	const char* const* voice_names_;
+	int voice_count_;
+	int mute_mask_;
+	double tempo_;
+	double gain_;
+	int sample_rate_;
+	int current_track_;
+    
+    bool fade_set;
+    int length_msec;
+    int fade_msec;
+	
+	void clear_track_vars();
+	int msec_to_samples( int msec ) const;
+	
+	friend Music_Emu* gme_new_emu( gme_type_t, int );
+	friend void gme_effects( Music_Emu const*, gme_effects_t* );
+	friend void gme_set_effects( Music_Emu*, gme_effects_t const* );
+	friend void gme_set_stereo_depth( Music_Emu*, double );
+	friend const char** gme_voice_names ( Music_Emu const* );
+	
+protected:
+	Multi_Buffer* effects_buffer_;
+};
+
+// base class for info-only derivations
+struct Gme_Info_ : Music_Emu
+{
+	virtual blargg_err_t set_sample_rate_( int 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_( int count, sample_t out  );
+	virtual void pre_load();
+	virtual blargg_err_t post_load();
+};
+
+inline blargg_err_t Music_Emu::track_info( track_info_t* out ) const
+{
+	return track_info( out, current_track_ );
+}
+
+inline blargg_err_t Music_Emu::save(gme_writer_t writer, void *your_data) const
+{
+    return save_( writer, your_data );
+}
+
+inline blargg_err_t Music_Emu::set_track_info(const track_info_t *in)
+{
+    return set_track_info_( in, current_track_ );
+}
+
+inline blargg_err_t Music_Emu::set_track_info(const track_info_t *in, int track)
+{
+    return set_track_info_( in, track );
+}
+
+inline int Music_Emu::sample_rate() const           { return sample_rate_; }
+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_filter.track_ended(); }
+inline const Music_Emu::equalizer_t& Music_Emu::equalizer() const { return equalizer_; }
+
+inline void Music_Emu::ignore_silence( bool b )     { track_filter.ignore_silence( 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::set_voice_names( const char* const p  ) { voice_names_ = p; }
+
+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;
+}
+
+inline blargg_err_t Music_Emu::start_track_( int )  { return blargg_ok; }
+
+inline blargg_err_t Music_Emu::set_sample_rate_( int ) { return blargg_ok; }
+
+inline blargg_err_t Music_Emu::play_( int, sample_t  ) { return blargg_ok; }
+
+inline blargg_err_t Music_Emu::hash_( Hash_Function& ) const { return BLARGG_ERR( BLARGG_ERR_CALLER, "no hashing function defined" ); }
+
+inline void Music_Emu::Hash_Function::hash_( byte const*, size_t ) { }
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Apu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Cpu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Cpu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Cpu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Cpu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Cpu_run.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Cpu_run.h Changed

@@ -1,1121 +1,1121 @@
-// NES 6502 CPU emulator run function
-
-#if 0
-/* Define these macros in the source file before #including this file.
-- Parameters might be expressions, so they are best evaluated only once,
-though they NEVER have side-effects, so multiple evaluation is OK.
-- Output parameters might be a multiple-assignment expression like "a=x",
-so they must NOT be parenthesized.
-- Except where noted, time() and related functions will NOT work
-correctly inside a macro. TIME() is always correct, and FLUSH_TIME() and
-CACHE_TIME() allow the time changing functions to work.
-- Macros "returning" void may use a {} statement block. */
-
-	// 0 <= addr <= 0xFFFF + page_size
-	// time functions can be used
-	int READ_MEM( addr_t );
-	void WRITE_MEM( addr_t, int data );
-	// 0 <= READ_MEM() <= 0xFF
-	
-	// 0 <= addr <= 0x1FF
-	int READ_LOW( addr_t );
-	void WRITE_LOW( addr_t, int data );
-	// 0 <= READ_LOW() <= 0xFF
-
-	// Often-used instructions attempt these before using a normal memory access.
-	// Optional; defaults to READ_MEM() and WRITE_MEM()
-	bool CAN_READ_FAST( addr_t ); // if true, uses result of READ_FAST
-	void READ_FAST( addr_t, int& out ); // ALWAYS called BEFORE CAN_READ_FAST
-	bool CAN_WRITE_FAST( addr_t ); // if true, uses WRITE_FAST instead of WRITE_MEM
-	void WRITE_FAST( addr_t, int data );
-
-	// Used by instructions most often used to access the NES PPU (LDA abs and BIT abs).
-	// Optional; defaults to READ_MEM.
-	void READ_PPU( addr_t, int& out );
-	// 0 <= out <= 0xFF
-
-// The following can be used within macros:
-	
-	// Current time
-	time_t TIME();
-	
-	// Allows use of time functions
-	void FLUSH_TIME();
-	
-	// Must be used before end of macro if FLUSH_TIME() was used earlier
-	void CACHE_TIME();
-
-// Configuration (optional; commented behavior if defined)
-	
-	// Emulates dummy reads for indexed instructions
-	#define NES_CPU_DUMMY_READS 1
-	
-	// Optimizes as if map_code( 0, 0x10000 + cpu_padding, FLAT_MEM ) is always in effect
-	#define FLAT_MEM my_mem_array
-	
-	// Expanded just before beginning of code, to help debugger
-	#define CPU_BEGIN void my_run_cpu() {
-	
-#endif
-
-/* Copyright (C) 2003-2008 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 */
-
-// Allows MWCW debugger to step through code properly
-#ifdef CPU_BEGIN
-	CPU_BEGIN
-#endif
-
-// Time
-#define TIME() (s_time + s.base)
-#define FLUSH_TIME() {s.time = s_time - time_offset;}
-#define CACHE_TIME() {s_time = s.time + time_offset;}
-
-// Defaults
-#ifndef CAN_WRITE_FAST
-	#define CAN_WRITE_FAST( addr ) 0
-	#define WRITE_FAST( addr, data )
-#endif
-
-#ifndef CAN_READ_FAST
-	#define CAN_READ_FAST( addr ) 0
-	#define READ_FAST( addr, out )
-#endif
-
-#ifndef READ_PPU
-	#define READ_PPU( addr, out )\
-	{\
-		FLUSH_TIME();\
-		out = READ_MEM( addr );\
-		CACHE_TIME();\
-	}
-#endif
-
-#define READ_STACK READ_LOW
-#define WRITE_STACK WRITE_LOW
-
-// Dummy reads
-#if NES_CPU_DUMMY_READS
-	// TODO: optimize time handling
-	#define DUMMY_READ( addr, idx ) \
-		if ( (addr & 0xFF) < idx )\
-		{\
-			int const time_offset = 1;\
-			FLUSH_TIME();\
-			READ_MEM( (addr - 0x100) );\
-			CACHE_TIME();\
-		}
-#else
-	#define DUMMY_READ( addr, idx )
-#endif
-
-// Code
-#ifdef FLAT_MEM
-	#define CODE_PAGE( addr ) (FLAT_MEM)
-	#define CODE_OFFSET( addr ) (addr)
-#else
-	#define CODE_PAGE( addr ) (s.code_map NES_CPU_PAGE( addr ))
-	#define CODE_OFFSET( addr ) NES_CPU_OFFSET( addr )
-#endif
-#define READ_CODE( addr ) (CODE_PAGE( addr ) CODE_OFFSET( addr ))
-
-// Stack
-#define SET_SP( v ) (sp = ((v) + 1) | 0x100)
-#define GET_SP() ((sp - 1) & 0xFF)
-#define SP( o ) ((sp + (o - (o>0)*0x100)) | 0x100)
-
-// Truncation
-#define BYTE( n ) ((BOOST::uint8_t ) (n)) /* (unsigned) n & 0xFF */
-#define SBYTE( n ) ((BOOST::int8_t ) (n)) /* (BYTE( n ) ^ 0x80) - 0x80 */
-#define WORD( n ) ((BOOST::uint16_t) (n)) /* (unsigned) n & 0xFFFF */
-
-// Flags with hex value for clarity when used as mask.
-// Stored in indicated variable during emulation.
-int const n80 = 0x80; // nz
-int const v40 = 0x40; // flags
-int const r20 = 0x20;
-int const b10 = 0x10;
-int const d08 = 0x08; // flags
-int const i04 = 0x04; // flags
-int const z02 = 0x02; // nz
-int const c01 = 0x01; // c
-
-#define IS_NEG (nz & 0x8080)
-
-#define GET_FLAGS( out ) \
-{\
-	out = flags & (v40 | d08 | i04);\
-	out += ((nz >> 8) | nz) & n80;\
-	out += c >> 8 & c01;\
-	if ( !BYTE( nz ) )\
-		out += z02;\
-}
-
-#define SET_FLAGS( in ) \
-{\
-	flags = in & (v40 | d08 | i04);\
-	c = nz = in << 8;\
-	nz += ~in & z02;\
-}
-
-{
-	int const time_offset = 0;
-	
-	// Local state
-	Nes_Cpu::cpu_state_t s;
-	#ifdef FLAT_MEM
-		s.base = CPU.cpu_state_.base;
-	#else
-		s = CPU.cpu_state_;
-	#endif
-	CPU.cpu_state = &s;
-	int s_time = CPU.cpu_state_.time; // helps even on x86
-	
-	// Registers
-	int pc = CPU.r.pc;
-	int a = CPU.r.a;
-	int x = CPU.r.x;
-	int y = CPU.r.y;
-	int sp;
-	SET_SP( CPU.r.sp );
-	
-	// Flags
-	int flags;
-	int c; // carry set if (c & 0x100) != 0
-	int nz; // Z set if (nz & 0xFF) == 0, N set if (nz & 0x8080) != 0
-	{
-		int temp = CPU.r.flags;
-		SET_FLAGS( temp );
-	}
-	
-loop:
-	
-	// Check all values
-	check( (unsigned) sp - 0x100 < 0x100 );
-	check( (unsigned) pc < 0x10000 );
-	check( (unsigned) a < 0x100 );
-	check( (unsigned) x < 0x100 );
-	check( (unsigned) y < 0x100 );
-	
-	// Read instruction
-	byte const* instr = CODE_PAGE( pc );
-	int opcode;
-	
-	if ( CODE_OFFSET(~0) == ~0 )
-	{
-		opcode = instr pc;
-		pc++;
-		instr += pc;
-	}
-	else
-	{
-		instr += CODE_OFFSET( pc );
-		opcode = *instr++;
-		pc++;
-	}
-	
-	// local to function in case it helps optimizer
-	static byte const clock_table 256 =
-	{// 0 1 2 3 4 5 6 7 8 9 A B C D E F
-		0,6,2,8,3,3,5,5,3,2,2,2,4,4,6,6,// 0
-		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// 1
-		6,6,0,8,3,3,5,5,4,2,2,2,4,4,6,6,// 2
-		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// 3
-		6,6,2,8,3,3,5,5,3,2,2,2,3,4,6,6,// 4
-		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// 5
-		6,6,2,8,3,3,5,5,4,2,2,2,5,4,6,6,// 6
-		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// 7
-		2,6,2,6,3,3,3,3,2,2,2,2,4,4,4,4,// 8
-		2,6,2,6,4,4,4,4,2,5,2,5,5,5,5,5,// 9
-		2,6,2,6,3,3,3,3,2,2,2,2,4,4,4,4,// A
-		2,5,2,5,4,4,4,4,2,4,2,4,4,4,4,4,// B
-		2,6,2,8,3,3,5,5,2,2,2,2,4,4,6,6,// C
-		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// D
-		2,6,2,8,3,3,5,5,2,2,2,2,4,4,6,6,// E
-		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7 // F
-	}; // 0x00 was 7 and 0x22 was 2
-	
-	// Update time
-	if ( s_time >= 0 )
-		goto out_of_time;
-	
-	#ifdef CPU_INSTR_HOOK
-	{ CPU_INSTR_HOOK( (pc-1), (&instr -1), a, x, y, GET_SP(), TIME() ); }
-	#endif
-	
-	s_time += clock_table opcode;
-	
-	int data;
-	data = *instr;
-	
-	switch ( opcode )
-	{
-
-// Macros
-
-#define GET_MSB() (instr 1)
-#define ADD_PAGE( out ) (pc++, out = data + 0x100 * GET_MSB())
-#define GET_ADDR() GET_LE16( instr )
-
-#define PAGE_PENALTY( lsb ) s_time += (lsb) >> 8;
-
-#define INC_DEC( reg, n ) reg = BYTE( nz = reg + n ); goto loop;
-
-#define IND_Y( cross, out ) {\
-		int temp = READ_LOW( data ) + y;\
-		out = temp + 0x100 * READ_LOW( BYTE( data + 1 ) );\
-		cross( temp );\
-	}
-	
-#define IND_X( out ) {\
-		int temp = data + x;\
-		out = 0x100 * READ_LOW( BYTE( temp + 1 ) ) + READ_LOW( BYTE( temp ) );\
-	}
-	
-#define ARITH_ADDR_MODES( op )\
-case op - 0x04: /* (ind,x) */\
-	IND_X( data )\
-	goto ptr##op;\
-case op + 0x0C: /* (ind),y */\
-	IND_Y( PAGE_PENALTY, data )\
-	goto ptr##op;\
-case op + 0x10: /* zp,X */\
-	data = BYTE( data + x );\
-case op + 0x00: /* zp */\
-	data = READ_LOW( data );\
-	goto imm##op;\
-case op + 0x14: /* abs,Y */\
-	data += y;\
-	goto ind##op;\
-case op + 0x18: /* abs,X */\
-	data += x;\
-ind##op:\
-	PAGE_PENALTY( data );\
-case op + 0x08: /* abs */\
-	ADD_PAGE( data );\
-ptr##op:\
-	FLUSH_TIME();\
-	data = READ_MEM( data );\
-	CACHE_TIME();\
-case op + 0x04: /* imm */\
-imm##op:
-
-// TODO: more efficient way to handle negative branch that wraps PC around
-#define BRANCH( cond )\
-{\
-	++pc;\
-	if ( !(cond) ) goto loop;\
-	s_time++;\
-	int offset = SBYTE( data );\
-	s_time += (BYTE(pc) + offset) >> 8 & 1;\
-	pc = WORD( pc + offset );\
-	goto loop;\
-}
-
-// Often-Used
-
-	case 0xB5: // LDA zp,x
-		a = nz = READ_LOW( BYTE( data + x ) );
-		pc++;
-		goto loop;
-	
-	case 0xA5: // LDA zp
-		a = nz = READ_LOW( data );
-		pc++;
-		goto loop;
-	
-	case 0xD0: // BNE
-		BRANCH( BYTE( nz ) );
-	
-	case 0x20: { // JSR
-		int temp = pc + 1;
-		pc = GET_ADDR();
-		WRITE_STACK( SP( -1 ), temp >> 8 );
-		sp = SP( -2 );
-		WRITE_STACK( sp, temp );
-		goto loop;
-	}
-	
-	case 0x4C: // JMP abs
-		pc = GET_ADDR();
-		goto loop;
-	
-	case 0xE8: // INX
-		INC_DEC( x, 1 )
-	
-	case 0x10: // BPL
-		BRANCH( !IS_NEG )
-	
-	ARITH_ADDR_MODES( 0xC5 ) // CMP
-		nz = a - data;
-		pc++;
-		c = ~nz;
-		nz &= 0xFF;
-		goto loop;
-	
-	case 0x30: // BMI
-		BRANCH( IS_NEG )
-	
-	case 0xF0: // BEQ
-		BRANCH( !BYTE( nz ) );
-	
-	case 0x95: // STA zp,x
-		data = BYTE( data + x );
-	case 0x85: // STA zp
-		pc++;
-		WRITE_LOW( data, a );
-		goto loop;
-	
-	case 0xC8: // INY
-		INC_DEC( y, 1 )
-
-	case 0xA8: // TAY
-		y = a;
-		nz = a;
-		goto loop;
-	
-	case 0x98: // TYA
-		a = y;
-		nz = y;
-		goto loop;
-	
-	case 0xAD:{// LDA abs
-		int addr = GET_ADDR();
-		pc += 2;
-		READ_PPU( addr, a = nz );
-		goto loop;
-	}
-	
-	case 0x60: // RTS
-		pc = 1 + READ_STACK( sp );
-		pc += 0x100 * READ_STACK( SP( 1 ) );
-		sp = SP( 2 );
-		goto loop;
-	
-	{
-		int addr;
-		
-	case 0x8D: // STA abs
-		addr = GET_ADDR();
-		pc += 2;
-		if ( CAN_WRITE_FAST( addr ) )
-		{
-			WRITE_FAST( addr, a );
-			goto loop;
-		}
-	sta_ptr:
-		FLUSH_TIME();
-		WRITE_MEM( addr, a );
-		CACHE_TIME();
-		goto loop;
-	
-	case 0x99: // STA abs,Y
-		addr = y + GET_ADDR();
-		pc += 2;
-		if ( CAN_WRITE_FAST( addr ) )
-		{
-			WRITE_FAST( addr, a );
-			goto loop;
-		}
-		goto sta_abs_x;
-	
-	case 0x9D: // STA abs,X (slightly more common than STA abs)
-		addr = x + GET_ADDR();
-		pc += 2;
-		if ( CAN_WRITE_FAST( addr ) )
-		{
-			WRITE_FAST( addr, a );
-			goto loop;
-		}
-		DUMMY_READ( addr, x );
-	sta_abs_x:
-		FLUSH_TIME();
-		WRITE_MEM( addr, a );
-		CACHE_TIME();
-		goto loop;
-	
-	case 0x91: // STA (ind),Y
-		#define NO_PAGE_PENALTY( lsb )
-		IND_Y( NO_PAGE_PENALTY, addr )
-		pc++;
-		DUMMY_READ( addr, y );
-		goto sta_ptr;
-	
-	case 0x81: // STA (ind,X)
-		IND_X( addr )
-		pc++;
-		goto sta_ptr;
-	
-	}
-	
-	case 0xA9: // LDA #imm
-		pc++;
-		a = data;
-		nz = data;
-		goto loop;
-
-	// common read instructions
-	{
-		int addr;
-		
-	case 0xA1: // LDA (ind,X)
-		IND_X( addr )
-		pc++;
-		goto a_nz_read_addr;
-	
-	case 0xB1:// LDA (ind),Y
-		addr = READ_LOW( data ) + y;
-		PAGE_PENALTY( addr );
-		addr += 0x100 * READ_LOW( BYTE( data + 1 ) );
-		pc++;
-		READ_FAST( addr, a = nz );
-		if ( CAN_READ_FAST( addr ) )
-			goto loop;
-		DUMMY_READ( addr, y );
-		goto a_nz_read_addr;
-	
-	case 0xB9: // LDA abs,Y
-		PAGE_PENALTY( data + y );
-		addr = GET_ADDR() + y;
-		pc += 2;
-		READ_FAST( addr, a = nz );
-		if ( CAN_READ_FAST( addr ) )
-			goto loop;
-		goto a_nz_read_addr;
-	
-	case 0xBD: // LDA abs,X
-		PAGE_PENALTY( data + x );
-		addr = GET_ADDR() + x;
-		pc += 2;
-		READ_FAST( addr, a = nz );
-		if ( CAN_READ_FAST( addr ) )
-			goto loop;
-		DUMMY_READ( addr, x );
-	a_nz_read_addr:
-		FLUSH_TIME();
-		a = nz = READ_MEM( addr );
-		CACHE_TIME();
-		goto loop;
-	
-	}
-
-// Branch
-
-	case 0x50: // BVC
-		BRANCH( !(flags & v40) )
-	
-	case 0x70: // BVS
-		BRANCH( flags & v40 )
-	
-	case 0xB0: // BCS
-		BRANCH( c & 0x100 )
-	
-	case 0x90: // BCC
-		BRANCH( !(c & 0x100) )
-	
-// Load/store
-	
-	case 0x94: // STY zp,x
-		data = BYTE( data + x );
-	case 0x84: // STY zp
-		pc++;
-		WRITE_LOW( data, y );
-		goto loop;
-	
-	case 0x96: // STX zp,y
-		data = BYTE( data + y );
-	case 0x86: // STX zp
-		pc++;
-		WRITE_LOW( data, x );
-		goto loop;
-	
-	case 0xB6: // LDX zp,y
-		data = BYTE( data + y );
-	case 0xA6: // LDX zp
-		data = READ_LOW( data );
-	case 0xA2: // LDX #imm
-		pc++;
-		x = data;
-		nz = data;
-		goto loop;
-	
-	case 0xB4: // LDY zp,x
-		data = BYTE( data + x );
-	case 0xA4: // LDY zp
-		data = READ_LOW( data );
-	case 0xA0: // LDY #imm
-		pc++;
-		y = data;
-		nz = data;
-		goto loop;
-	
-	case 0xBC: // LDY abs,X
-		data += x;
-		PAGE_PENALTY( data );
-	case 0xAC:{// LDY abs
-		int addr = data + 0x100 * GET_MSB();
-		pc += 2;
-		FLUSH_TIME();
-		y = nz = READ_MEM( addr );
-		CACHE_TIME();
-		goto loop;
-	}
-	
-	case 0xBE: // LDX abs,y
-		data += y;
-		PAGE_PENALTY( data );
-	case 0xAE:{// LDX abs
-		int addr = data + 0x100 * GET_MSB();
-		pc += 2;
-		FLUSH_TIME();
-		x = nz = READ_MEM( addr );
-		CACHE_TIME();
-		goto loop;
-	}
-	
-	{
-		int temp;
-	case 0x8C: // STY abs
-		temp = y;
-		goto store_abs;
-	
-	case 0x8E: // STX abs
-		temp = x;
-	store_abs:
-		int addr = GET_ADDR();
-		pc += 2;
-		if ( CAN_WRITE_FAST( addr ) )
-		{
-			WRITE_FAST( addr, temp );
-			goto loop;
-		}
-		FLUSH_TIME();
-		WRITE_MEM( addr, temp );
-		CACHE_TIME();
-		goto loop;
-	}
-
-// Compare
-
-	case 0xEC:{// CPX abs
-		int addr = GET_ADDR();
-		pc++;
-		FLUSH_TIME();
-		data = READ_MEM( addr );
-		CACHE_TIME();
-		goto cpx_data;
-	}
-	
-	case 0xE4: // CPX zp
-		data = READ_LOW( data );
-	case 0xE0: // CPX #imm
-	cpx_data:
-		nz = x - data;
-		pc++;
-		c = ~nz;
-		nz &= 0xFF;
-		goto loop;
-	
-	case 0xCC:{// CPY abs
-		int addr = GET_ADDR();
-		pc++;
-		FLUSH_TIME();
-		data = READ_MEM( addr );
-		CACHE_TIME();
-		goto cpy_data;
-	}
-	
-	case 0xC4: // CPY zp
-		data = READ_LOW( data );
-	case 0xC0: // CPY #imm
-	cpy_data:
-		nz = y - data;
-		pc++;
-		c = ~nz;
-		nz &= 0xFF;
-		goto loop;
-	
-// Logical
-
-	ARITH_ADDR_MODES( 0x25 ) // AND
-		nz = (a &= data);
-		pc++;
-		goto loop;
-	
-	ARITH_ADDR_MODES( 0x45 ) // EOR
-		nz = (a ^= data);
-		pc++;
-		goto loop;
-	
-	ARITH_ADDR_MODES( 0x05 ) // ORA
-		nz = (a |= data);
-		pc++;
-		goto loop;
-	
-	case 0x2C:{// BIT abs
-		int addr = GET_ADDR();
-		pc += 2;
-		READ_PPU( addr, nz );
-		flags = (flags & ~v40) + (nz & v40);
-		if ( a & nz )
-			goto loop;
-		nz <<= 8; // result must be zero, even if N bit is set
-		goto loop;
-	}
-	
-	case 0x24: // BIT zp
-		nz = READ_LOW( data );
-		pc++;
-		flags = (flags & ~v40) + (nz & v40);
-		if ( a & nz )
-			goto loop; // Z should be clear, and nz must be non-zero if nz & a is
-		nz <<= 8; // set Z flag without affecting N flag
-		goto loop;
-		
-// Add/subtract
-
-	ARITH_ADDR_MODES( 0xE5 ) // SBC
-	case 0xEB: // unofficial equivalent
-		data ^= 0xFF;
-		goto adc_imm;
-	
-	ARITH_ADDR_MODES( 0x65 ) // ADC
-	adc_imm: {
-		int carry = c >> 8 & 1;
-		int ov = (a ^ 0x80) + carry + SBYTE( data );
-		flags = (flags & ~v40) + (ov >> 2 & v40);
-		c = nz = a + data + carry;
-		pc++;
-		a = BYTE( nz );
-		goto loop;
-	}
-	
-// Shift/rotate
-
-	case 0x4A: // LSR A
-		c = 0;
-	case 0x6A: // ROR A
-		nz = c >> 1 & 0x80;
-		c = a << 8;
-		nz += a >> 1;
-		a = nz;
-		goto loop;
-
-	case 0x0A: // ASL A
-		nz = a << 1;
-		c = nz;
-		a = BYTE( nz );
-		goto loop;
-
-	case 0x2A: { // ROL A
-		nz = a << 1;
-		int temp = c >> 8 & 1;
-		c = nz;
-		nz += temp;
-		a = BYTE( nz );
-		goto loop;
-	}
-	
-	case 0x5E: // LSR abs,X
-		data += x;
-	case 0x4E: // LSR abs
-		c = 0;
-	case 0x6E: // ROR abs
-	ror_abs: {
-		ADD_PAGE( data );
-		FLUSH_TIME();
-		int temp = READ_MEM( data );
-		nz = (c >> 1 & 0x80) + (temp >> 1);
-		c = temp << 8;
-		goto rotate_common;
-	}
-	
-	case 0x3E: // ROL abs,X
-		data += x;
-		goto rol_abs;
-	
-	case 0x1E: // ASL abs,X
-		data += x;
-	case 0x0E: // ASL abs
-		c = 0;
-	case 0x2E: // ROL abs
-	rol_abs:
-		ADD_PAGE( data );
-		nz = c >> 8 & 1;
-		FLUSH_TIME();
-		nz += (c = READ_MEM( data ) << 1);
-	rotate_common:
-		pc++;
-		WRITE_MEM( data, BYTE( nz ) );
-		CACHE_TIME();
-		goto loop;
-	
-	case 0x7E: // ROR abs,X
-		data += x;
-		goto ror_abs;
-	
-	case 0x76: // ROR zp,x
-		data = BYTE( data + x );
-		goto ror_zp;
-	
-	case 0x56: // LSR zp,x
-		data = BYTE( data + x );
-	case 0x46: // LSR zp
-		c = 0;
-	case 0x66: // ROR zp
-	ror_zp: {
-		int temp = READ_LOW( data );
-		nz = (c >> 1 & 0x80) + (temp >> 1);
-		c = temp << 8;
-		goto write_nz_zp;
-	}
-	
-	case 0x36: // ROL zp,x
-		data = BYTE( data + x );
-		goto rol_zp;
-	
-	case 0x16: // ASL zp,x
-		data = BYTE( data + x );
-	case 0x06: // ASL zp
-		c = 0;
-	case 0x26: // ROL zp
-	rol_zp:
-		nz = c >> 8 & 1;
-		nz += (c = READ_LOW( data ) << 1);
-		goto write_nz_zp;
-	
-// Increment/decrement
-
-	case 0xCA: // DEX
-		INC_DEC( x, -1 )
-	
-	case 0x88: // DEY
-		INC_DEC( y, -1 )
-	
-	case 0xF6: // INC zp,x
-		data = BYTE( data + x );
-	case 0xE6: // INC zp
-		nz = 1;
-		goto add_nz_zp;
-	
-	case 0xD6: // DEC zp,x
-		data = BYTE( data + x );
-	case 0xC6: // DEC zp
-		nz = -1;
-	add_nz_zp:
-		nz += READ_LOW( data );
-	write_nz_zp:
-		pc++;
-		WRITE_LOW( data, nz );
-		goto loop;
-	
-	case 0xFE: // INC abs,x
-		data = x + GET_ADDR();
-		goto inc_ptr;
-	
-	case 0xEE: // INC abs
-		data = GET_ADDR();
-	inc_ptr:
-		nz = 1;
-		goto inc_common;
-	
-	case 0xDE: // DEC abs,x
-		data = x + GET_ADDR();
-		goto dec_ptr;
-	
-	case 0xCE: // DEC abs
-		data = GET_ADDR();
-	dec_ptr:
-		nz = -1;
-	inc_common:
-		FLUSH_TIME();
-		pc += 2;
-		nz += READ_MEM( data );
-		WRITE_MEM( data, BYTE( nz ) );
-		CACHE_TIME();
-		goto loop;
-		
-// Transfer
-
-	case 0xAA: // TAX
-		x = nz = a;
-		goto loop;
-		
-	case 0x8A: // TXA
-		a = nz = x;
-		goto loop;
-
-	case 0x9A: // TXS
-		SET_SP( x ); // verified (no flag change)
-		goto loop;
-	
-	case 0xBA: // TSX
-		x = nz = GET_SP();
-		goto loop;
-	
-// Stack
-	
-	case 0x48: // PHA
-		sp = SP( -1 );
-		WRITE_STACK( sp, a );
-		goto loop;
-		
-	case 0x68: // PLA
-		a = nz = READ_STACK( sp );
-		sp = SP( 1 );
-		goto loop;
-		
-	case 0x40:{// RTI
-		pc = READ_STACK( SP( 1 ) );
-		pc += READ_STACK( SP( 2 ) ) * 0x100;
-		int temp = READ_STACK( sp );
-		sp = SP( 3 );
-		data = flags;
-		SET_FLAGS( temp );
-		CPU.r.flags = flags; // update externally-visible I flag
-		int delta = s.base - CPU.irq_time_;
-		if ( delta <= 0 ) goto loop; // end_time < irq_time
-		if ( flags & i04 ) goto loop;
-		s_time += delta;
-		s.base = CPU.irq_time_;
-		goto loop;
-	}
-	
-	case 0x28:{// PLP
-		int temp = READ_STACK( sp );
-		sp = SP( 1 );
-		int changed = flags ^ temp;
-		SET_FLAGS( temp );
-		if ( !(changed & i04) )
-			goto loop; // I flag didn't change
-		if ( flags & i04 )
-			goto handle_sei;
-		goto handle_cli;
-	}
-	
-	case 0x08:{// PHP
-		int temp;
-		GET_FLAGS( temp );
-		sp = SP( -1 );
-		WRITE_STACK( sp, temp | (b10 | r20) );
-		goto loop;
-	}
-	
-	case 0x6C:{// JMP (ind)
-		data = GET_ADDR();
-		byte const* page = CODE_PAGE( data );
-		pc = page CODE_OFFSET( data );
-		data = (data & 0xFF00) + ((data + 1) & 0xFF);
-		pc += page CODE_OFFSET( data ) * 0x100;
-		goto loop;
-	}
-	
-	case 0x00: // BRK
-		goto handle_brk;
-	
-// Flags
-
-	case 0x38: // SEC
-		c = 0x100;
-		goto loop;
-	
-	case 0x18: // CLC
-		c = 0;
-		goto loop;
-		
-	case 0xB8: // CLV
-		flags &= ~v40;
-		goto loop;
-	
-	case 0xD8: // CLD
-		flags &= ~d08;
-		goto loop;
-	
-	case 0xF8: // SED
-		flags |= d08;
-		goto loop;
-	
-	case 0x58: // CLI
-		if ( !(flags & i04) )
-			goto loop;
-		flags &= ~i04;
-	handle_cli: {
-		//dprintf( "CLI at %d\n", TIME );
-		CPU.r.flags = flags; // update externally-visible I flag
-		int delta = s.base - CPU.irq_time_;
-		if ( delta <= 0 )
-		{
-			if ( TIME() < CPU.irq_time_ )
-				goto loop;
-			goto delayed_cli;
-		}
-		s.base = CPU.irq_time_;
-		s_time += delta;
-		if ( s_time < 0 )
-			goto loop;
-		
-		if ( delta >= s_time + 1 )
-		{
-			// delayed irq until after next instruction
-			s.base += s_time + 1;
-			s_time = -1;
-			goto loop;
-		}
-		
-		// TODO: implement
-	delayed_cli:
-		dprintf( "Delayed CLI not emulated\n" );
-		goto loop;
-	}
-	
-	case 0x78: // SEI
-		if ( flags & i04 )
-			goto loop;
-		flags |= i04;
-	handle_sei: {
-		CPU.r.flags = flags; // update externally-visible I flag
-		int delta = s.base - CPU.end_time_;
-		s.base = CPU.end_time_;
-		s_time += delta;
-		if ( s_time < 0 )
-			goto loop;
-		
-		dprintf( "Delayed SEI not emulated\n" );
-		goto loop;
-	}
-	
-// Unofficial
-	
-	// SKW - skip word
-	case 0x1C: case 0x3C: case 0x5C: case 0x7C: case 0xDC: case 0xFC:
-		PAGE_PENALTY( data + x );
-	case 0x0C:
-		pc++;
-	// SKB - skip byte
-	case 0x74: case 0x04: case 0x14: case 0x34: case 0x44: case 0x54: case 0x64:
-	case 0x80: case 0x82: case 0x89: case 0xC2: case 0xD4: case 0xE2: case 0xF4:
-		pc++;
-		goto loop;
-	
-	// NOP
-	case 0xEA: case 0x1A: case 0x3A: case 0x5A: case 0x7A: case 0xDA: case 0xFA:
-		goto loop;
-	
-	case Nes_Cpu::halt_opcode: // HLT - halt processor
-		if ( pc-- > 0x10000 )
-		{
-			// handle wrap-around (assumes caller has put page of HLT at 0x10000)
-			pc = WORD( pc );
-			goto loop;
-		}
-	case 0x02: case 0x12: case 0x32: case 0x42: case 0x52:
-	case 0x62: case 0x72: case 0x92: case 0xB2: case 0xD2: case 0xF2:
-		goto stop;
-	
-// Unimplemented
-	
-	case 0xFF: // force 256-entry jump table for optimization purposes
-		c |= 1; // compiler doesn't know that this won't affect anything
-	default:
-		check( (unsigned) opcode < 0x100 );
-		
-		#ifdef UNIMPL_INSTR
-			UNIMPL_INSTR();
-		#endif
-		
-		// At least skip over proper number of bytes instruction uses
-		static unsigned char const illop_lens 8 = {
-			0x40, 0x40, 0x40, 0x80, 0x40, 0x40, 0x80, 0xA0
-		};
-		int opcode = instr -1;
-		int len = illop_lens opcode >> 2 & 7 >> (opcode << 1 & 6) & 3;
-		if ( opcode == 0x9C )
-			len = 2;
-		pc += len;
-		CPU.error_count_++;
-		
-		// Account for extra clock
-		if ( (opcode >> 4) == 0x0B )
-		{
-			if ( opcode == 0xB3 )
-				data = READ_LOW( data );
-			if ( opcode != 0xB7 )
-				PAGE_PENALTY( data + y );
-		}
-		goto loop;
-	}
-	assert( false ); // catch missing 'goto loop' or accidental 'break'
-	
-	int result_;
-handle_brk:
-	pc++;
-	result_ = b10 | 4;
-	
-#ifdef CPU_DONE
-interrupt:
-#endif
-	{
-		s_time += 7;
-		
-		// Save PC and read vector
-		WRITE_STACK( SP( -1 ), pc >> 8 );
-		WRITE_STACK( SP( -2 ), pc );
-		pc = GET_LE16( &READ_CODE( 0xFFFA ) + (result_ & 4) );
-		
-		// Save flags
-		int temp;
-		GET_FLAGS( temp );
-		temp |= r20 + (result_ & b10); // B flag set for BRK
-		sp = SP( -3 );
-		WRITE_STACK( sp, temp );
-		
-		// Update I flag in externally-visible flags
-		CPU.r.flags = (flags |= i04);
-		
-		// Update time
-		int delta = s.base - CPU.end_time_;
-		if ( delta >= 0 )
-			goto loop;
-		s_time += delta;
-		s.base = CPU.end_time_;
-		goto loop;
-	}
-	
-out_of_time:
-	pc--;
-	
-	// Optional action that triggers interrupt or changes irq/end time
-	#ifdef CPU_DONE
-	{
-		CPU_DONE( result_ );
-		if ( result_ >= 0 )
-			goto interrupt;
-		if ( s_time < 0 )
-			goto loop;
-	}
-	#endif
-stop:
-	
-	// Flush cached state
-	CPU.r.pc = pc;
-	CPU.r.sp = GET_SP();
-	CPU.r.a = a;
-	CPU.r.x = x;
-	CPU.r.y = y;
-
-	int temp;
-	GET_FLAGS( temp );
-	CPU.r.flags = temp;
-	
-	CPU.cpu_state_.base = s.base;
-	CPU.cpu_state_.time = s_time;
-	CPU.cpu_state = &CPU.cpu_state_;
-}
+// NES 6502 CPU emulator run function
+
+#if 0
+/* Define these macros in the source file before #including this file.
+- Parameters might be expressions, so they are best evaluated only once,
+though they NEVER have side-effects, so multiple evaluation is OK.
+- Output parameters might be a multiple-assignment expression like "a=x",
+so they must NOT be parenthesized.
+- Except where noted, time() and related functions will NOT work
+correctly inside a macro. TIME() is always correct, and FLUSH_TIME() and
+CACHE_TIME() allow the time changing functions to work.
+- Macros "returning" void may use a {} statement block. */
+
+	// 0 <= addr <= 0xFFFF + page_size
+	// time functions can be used
+	int READ_MEM( addr_t );
+	void WRITE_MEM( addr_t, int data );
+	// 0 <= READ_MEM() <= 0xFF
+	
+	// 0 <= addr <= 0x1FF
+	int READ_LOW( addr_t );
+	void WRITE_LOW( addr_t, int data );
+	// 0 <= READ_LOW() <= 0xFF
+
+	// Often-used instructions attempt these before using a normal memory access.
+	// Optional; defaults to READ_MEM() and WRITE_MEM()
+	bool CAN_READ_FAST( addr_t ); // if true, uses result of READ_FAST
+	void READ_FAST( addr_t, int& out ); // ALWAYS called BEFORE CAN_READ_FAST
+	bool CAN_WRITE_FAST( addr_t ); // if true, uses WRITE_FAST instead of WRITE_MEM
+	void WRITE_FAST( addr_t, int data );
+
+	// Used by instructions most often used to access the NES PPU (LDA abs and BIT abs).
+	// Optional; defaults to READ_MEM.
+	void READ_PPU( addr_t, int& out );
+	// 0 <= out <= 0xFF
+
+// The following can be used within macros:
+	
+	// Current time
+	time_t TIME();
+	
+	// Allows use of time functions
+	void FLUSH_TIME();
+	
+	// Must be used before end of macro if FLUSH_TIME() was used earlier
+	void CACHE_TIME();
+
+// Configuration (optional; commented behavior if defined)
+	
+	// Emulates dummy reads for indexed instructions
+	#define NES_CPU_DUMMY_READS 1
+	
+	// Optimizes as if map_code( 0, 0x10000 + cpu_padding, FLAT_MEM ) is always in effect
+	#define FLAT_MEM my_mem_array
+	
+	// Expanded just before beginning of code, to help debugger
+	#define CPU_BEGIN void my_run_cpu() {
+	
+#endif
+
+/* Copyright (C) 2003-2008 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 */
+
+// Allows MWCW debugger to step through code properly
+#ifdef CPU_BEGIN
+	CPU_BEGIN
+#endif
+
+// Time
+#define TIME() (s_time + s.base)
+#define FLUSH_TIME() {s.time = s_time - time_offset;}
+#define CACHE_TIME() {s_time = s.time + time_offset;}
+
+// Defaults
+#ifndef CAN_WRITE_FAST
+	#define CAN_WRITE_FAST( addr ) 0
+	#define WRITE_FAST( addr, data )
+#endif
+
+#ifndef CAN_READ_FAST
+	#define CAN_READ_FAST( addr ) 0
+	#define READ_FAST( addr, out )
+#endif
+
+#ifndef READ_PPU
+	#define READ_PPU( addr, out )\
+	{\
+		FLUSH_TIME();\
+		out = READ_MEM( addr );\
+		CACHE_TIME();\
+	}
+#endif
+
+#define READ_STACK READ_LOW
+#define WRITE_STACK WRITE_LOW
+
+// Dummy reads
+#if NES_CPU_DUMMY_READS
+	// TODO: optimize time handling
+	#define DUMMY_READ( addr, idx ) \
+		if ( (addr & 0xFF) < idx )\
+		{\
+			int const time_offset = 1;\
+			FLUSH_TIME();\
+			READ_MEM( (addr - 0x100) );\
+			CACHE_TIME();\
+		}
+#else
+	#define DUMMY_READ( addr, idx )
+#endif
+
+// Code
+#ifdef FLAT_MEM
+	#define CODE_PAGE( addr ) (FLAT_MEM)
+	#define CODE_OFFSET( addr ) (addr)
+#else
+	#define CODE_PAGE( addr ) (s.code_map NES_CPU_PAGE( addr ))
+	#define CODE_OFFSET( addr ) NES_CPU_OFFSET( addr )
+#endif
+#define READ_CODE( addr ) (CODE_PAGE( addr ) CODE_OFFSET( addr ))
+
+// Stack
+#define SET_SP( v ) (sp = ((v) + 1) | 0x100)
+#define GET_SP() ((sp - 1) & 0xFF)
+#define SP( o ) ((sp + (o - (o>0)*0x100)) | 0x100)
+
+// Truncation
+#define BYTE( n ) ((BOOST::uint8_t ) (n)) /* (unsigned) n & 0xFF */
+#define SBYTE( n ) ((BOOST::int8_t ) (n)) /* (BYTE( n ) ^ 0x80) - 0x80 */
+#define WORD( n ) ((BOOST::uint16_t) (n)) /* (unsigned) n & 0xFFFF */
+
+// Flags with hex value for clarity when used as mask.
+// Stored in indicated variable during emulation.
+int const n80 = 0x80; // nz
+int const v40 = 0x40; // flags
+int const r20 = 0x20;
+int const b10 = 0x10;
+int const d08 = 0x08; // flags
+int const i04 = 0x04; // flags
+int const z02 = 0x02; // nz
+int const c01 = 0x01; // c
+
+#define IS_NEG (nz & 0x8080)
+
+#define GET_FLAGS( out ) \
+{\
+	out = flags & (v40 | d08 | i04);\
+	out += ((nz >> 8) | nz) & n80;\
+	out += c >> 8 & c01;\
+	if ( !BYTE( nz ) )\
+		out += z02;\
+}
+
+#define SET_FLAGS( in ) \
+{\
+	flags = in & (v40 | d08 | i04);\
+	c = nz = in << 8;\
+	nz += ~in & z02;\
+}
+
+{
+	int const time_offset = 0;
+	
+	// Local state
+	Nes_Cpu::cpu_state_t s;
+	#ifdef FLAT_MEM
+		s.base = CPU.cpu_state_.base;
+	#else
+		s = CPU.cpu_state_;
+	#endif
+	CPU.cpu_state = &s;
+	int s_time = CPU.cpu_state_.time; // helps even on x86
+	
+	// Registers
+	int pc = CPU.r.pc;
+	int a = CPU.r.a;
+	int x = CPU.r.x;
+	int y = CPU.r.y;
+	int sp;
+	SET_SP( CPU.r.sp );
+	
+	// Flags
+	int flags;
+	int c; // carry set if (c & 0x100) != 0
+	int nz; // Z set if (nz & 0xFF) == 0, N set if (nz & 0x8080) != 0
+	{
+		int temp = CPU.r.flags;
+		SET_FLAGS( temp );
+	}
+	
+loop:
+	
+	// Check all values
+	check( (unsigned) sp - 0x100 < 0x100 );
+	check( (unsigned) pc < 0x10000 );
+	check( (unsigned) a < 0x100 );
+	check( (unsigned) x < 0x100 );
+	check( (unsigned) y < 0x100 );
+	
+	// Read instruction
+	byte const* instr = CODE_PAGE( pc );
+	int opcode;
+	
+	if ( CODE_OFFSET(~0) == ~0 )
+	{
+		opcode = instr pc;
+		pc++;
+		instr += pc;
+	}
+	else
+	{
+		instr += CODE_OFFSET( pc );
+		opcode = *instr++;
+		pc++;
+	}
+	
+	// local to function in case it helps optimizer
+	static byte const clock_table 256 =
+	{// 0 1 2 3 4 5 6 7 8 9 A B C D E F
+		0,6,2,8,3,3,5,5,3,2,2,2,4,4,6,6,// 0
+		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// 1
+		6,6,0,8,3,3,5,5,4,2,2,2,4,4,6,6,// 2
+		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// 3
+		6,6,2,8,3,3,5,5,3,2,2,2,3,4,6,6,// 4
+		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// 5
+		6,6,2,8,3,3,5,5,4,2,2,2,5,4,6,6,// 6
+		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// 7
+		2,6,2,6,3,3,3,3,2,2,2,2,4,4,4,4,// 8
+		2,6,2,6,4,4,4,4,2,5,2,5,5,5,5,5,// 9
+		2,6,2,6,3,3,3,3,2,2,2,2,4,4,4,4,// A
+		2,5,2,5,4,4,4,4,2,4,2,4,4,4,4,4,// B
+		2,6,2,8,3,3,5,5,2,2,2,2,4,4,6,6,// C
+		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// D
+		2,6,2,8,3,3,5,5,2,2,2,2,4,4,6,6,// E
+		2,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7 // F
+	}; // 0x00 was 7 and 0x22 was 2
+	
+	// Update time
+	if ( s_time >= 0 )
+		goto out_of_time;
+	
+	#ifdef CPU_INSTR_HOOK
+	{ CPU_INSTR_HOOK( (pc-1), (&instr -1), a, x, y, GET_SP(), TIME() ); }
+	#endif
+	
+	s_time += clock_table opcode;
+	
+	int data;
+	data = *instr;
+	
+	switch ( opcode )
+	{
+
+// Macros
+
+#define GET_MSB() (instr 1)
+#define ADD_PAGE( out ) (pc++, out = data + 0x100 * GET_MSB())
+#define GET_ADDR() GET_LE16( instr )
+
+#define PAGE_PENALTY( lsb ) s_time += (lsb) >> 8;
+
+#define INC_DEC( reg, n ) reg = BYTE( nz = reg + n ); goto loop;
+
+#define IND_Y( cross, out ) {\
+		int temp = READ_LOW( data ) + y;\
+		out = temp + 0x100 * READ_LOW( BYTE( data + 1 ) );\
+		cross( temp );\
+	}
+	
+#define IND_X( out ) {\
+		int temp = data + x;\
+		out = 0x100 * READ_LOW( BYTE( temp + 1 ) ) + READ_LOW( BYTE( temp ) );\
+	}
+	
+#define ARITH_ADDR_MODES( op )\
+case op - 0x04: /* (ind,x) */\
+	IND_X( data )\
+	goto ptr##op;\
+case op + 0x0C: /* (ind),y */\
+	IND_Y( PAGE_PENALTY, data )\
+	goto ptr##op;\
+case op + 0x10: /* zp,X */\
+	data = BYTE( data + x );\
+case op + 0x00: /* zp */\
+	data = READ_LOW( data );\
+	goto imm##op;\
+case op + 0x14: /* abs,Y */\
+	data += y;\
+	goto ind##op;\
+case op + 0x18: /* abs,X */\
+	data += x;\
+ind##op:\
+	PAGE_PENALTY( data );\
+case op + 0x08: /* abs */\
+	ADD_PAGE( data );\
+ptr##op:\
+	FLUSH_TIME();\
+	data = READ_MEM( data );\
+	CACHE_TIME();\
+case op + 0x04: /* imm */\
+imm##op:
+
+// TODO: more efficient way to handle negative branch that wraps PC around
+#define BRANCH( cond )\
+{\
+	++pc;\
+	if ( !(cond) ) goto loop;\
+	s_time++;\
+	int offset = SBYTE( data );\
+	s_time += (BYTE(pc) + offset) >> 8 & 1;\
+	pc = WORD( pc + offset );\
+	goto loop;\
+}
+
+// Often-Used
+
+	case 0xB5: // LDA zp,x
+		a = nz = READ_LOW( BYTE( data + x ) );
+		pc++;
+		goto loop;
+	
+	case 0xA5: // LDA zp
+		a = nz = READ_LOW( data );
+		pc++;
+		goto loop;
+	
+	case 0xD0: // BNE
+		BRANCH( BYTE( nz ) );
+	
+	case 0x20: { // JSR
+		int temp = pc + 1;
+		pc = GET_ADDR();
+		WRITE_STACK( SP( -1 ), temp >> 8 );
+		sp = SP( -2 );
+		WRITE_STACK( sp, temp );
+		goto loop;
+	}
+	
+	case 0x4C: // JMP abs
+		pc = GET_ADDR();
+		goto loop;
+	
+	case 0xE8: // INX
+		INC_DEC( x, 1 )
+	
+	case 0x10: // BPL
+		BRANCH( !IS_NEG )
+	
+	ARITH_ADDR_MODES( 0xC5 ) // CMP
+		nz = a - data;
+		pc++;
+		c = ~nz;
+		nz &= 0xFF;
+		goto loop;
+	
+	case 0x30: // BMI
+		BRANCH( IS_NEG )
+	
+	case 0xF0: // BEQ
+		BRANCH( !BYTE( nz ) );
+	
+	case 0x95: // STA zp,x
+		data = BYTE( data + x );
+	case 0x85: // STA zp
+		pc++;
+		WRITE_LOW( data, a );
+		goto loop;
+	
+	case 0xC8: // INY
+		INC_DEC( y, 1 )
+
+	case 0xA8: // TAY
+		y = a;
+		nz = a;
+		goto loop;
+	
+	case 0x98: // TYA
+		a = y;
+		nz = y;
+		goto loop;
+	
+	case 0xAD:{// LDA abs
+		int addr = GET_ADDR();
+		pc += 2;
+		READ_PPU( addr, a = nz );
+		goto loop;
+	}
+	
+	case 0x60: // RTS
+		pc = 1 + READ_STACK( sp );
+		pc += 0x100 * READ_STACK( SP( 1 ) );
+		sp = SP( 2 );
+		goto loop;
+	
+	{
+		int addr;
+		
+	case 0x8D: // STA abs
+		addr = GET_ADDR();
+		pc += 2;
+		if ( CAN_WRITE_FAST( addr ) )
+		{
+			WRITE_FAST( addr, a );
+			goto loop;
+		}
+	sta_ptr:
+		FLUSH_TIME();
+		WRITE_MEM( addr, a );
+		CACHE_TIME();
+		goto loop;
+	
+	case 0x99: // STA abs,Y
+		addr = y + GET_ADDR();
+		pc += 2;
+		if ( CAN_WRITE_FAST( addr ) )
+		{
+			WRITE_FAST( addr, a );
+			goto loop;
+		}
+		goto sta_abs_x;
+	
+	case 0x9D: // STA abs,X (slightly more common than STA abs)
+		addr = x + GET_ADDR();
+		pc += 2;
+		if ( CAN_WRITE_FAST( addr ) )
+		{
+			WRITE_FAST( addr, a );
+			goto loop;
+		}
+		DUMMY_READ( addr, x );
+	sta_abs_x:
+		FLUSH_TIME();
+		WRITE_MEM( addr, a );
+		CACHE_TIME();
+		goto loop;
+	
+	case 0x91: // STA (ind),Y
+		#define NO_PAGE_PENALTY( lsb )
+		IND_Y( NO_PAGE_PENALTY, addr )
+		pc++;
+		DUMMY_READ( addr, y );
+		goto sta_ptr;
+	
+	case 0x81: // STA (ind,X)
+		IND_X( addr )
+		pc++;
+		goto sta_ptr;
+	
+	}
+	
+	case 0xA9: // LDA #imm
+		pc++;
+		a = data;
+		nz = data;
+		goto loop;
+
+	// common read instructions
+	{
+		int addr;
+		
+	case 0xA1: // LDA (ind,X)
+		IND_X( addr )
+		pc++;
+		goto a_nz_read_addr;
+	
+	case 0xB1:// LDA (ind),Y
+		addr = READ_LOW( data ) + y;
+		PAGE_PENALTY( addr );
+		addr += 0x100 * READ_LOW( BYTE( data + 1 ) );
+		pc++;
+		READ_FAST( addr, a = nz );
+		if ( CAN_READ_FAST( addr ) )
+			goto loop;
+		DUMMY_READ( addr, y );
+		goto a_nz_read_addr;
+	
+	case 0xB9: // LDA abs,Y
+		PAGE_PENALTY( data + y );
+		addr = GET_ADDR() + y;
+		pc += 2;
+		READ_FAST( addr, a = nz );
+		if ( CAN_READ_FAST( addr ) )
+			goto loop;
+		goto a_nz_read_addr;
+	
+	case 0xBD: // LDA abs,X
+		PAGE_PENALTY( data + x );
+		addr = GET_ADDR() + x;
+		pc += 2;
+		READ_FAST( addr, a = nz );
+		if ( CAN_READ_FAST( addr ) )
+			goto loop;
+		DUMMY_READ( addr, x );
+	a_nz_read_addr:
+		FLUSH_TIME();
+		a = nz = READ_MEM( addr );
+		CACHE_TIME();
+		goto loop;
+	
+	}
+
+// Branch
+
+	case 0x50: // BVC
+		BRANCH( !(flags & v40) )
+	
+	case 0x70: // BVS
+		BRANCH( flags & v40 )
+	
+	case 0xB0: // BCS
+		BRANCH( c & 0x100 )
+	
+	case 0x90: // BCC
+		BRANCH( !(c & 0x100) )
+	
+// Load/store
+	
+	case 0x94: // STY zp,x
+		data = BYTE( data + x );
+	case 0x84: // STY zp
+		pc++;
+		WRITE_LOW( data, y );
+		goto loop;
+	
+	case 0x96: // STX zp,y
+		data = BYTE( data + y );
+	case 0x86: // STX zp
+		pc++;
+		WRITE_LOW( data, x );
+		goto loop;
+	
+	case 0xB6: // LDX zp,y
+		data = BYTE( data + y );
+	case 0xA6: // LDX zp
+		data = READ_LOW( data );
+	case 0xA2: // LDX #imm
+		pc++;
+		x = data;
+		nz = data;
+		goto loop;
+	
+	case 0xB4: // LDY zp,x
+		data = BYTE( data + x );
+	case 0xA4: // LDY zp
+		data = READ_LOW( data );
+	case 0xA0: // LDY #imm
+		pc++;
+		y = data;
+		nz = data;
+		goto loop;
+	
+	case 0xBC: // LDY abs,X
+		data += x;
+		PAGE_PENALTY( data );
+	case 0xAC:{// LDY abs
+		int addr = data + 0x100 * GET_MSB();
+		pc += 2;
+		FLUSH_TIME();
+		y = nz = READ_MEM( addr );
+		CACHE_TIME();
+		goto loop;
+	}
+	
+	case 0xBE: // LDX abs,y
+		data += y;
+		PAGE_PENALTY( data );
+	case 0xAE:{// LDX abs
+		int addr = data + 0x100 * GET_MSB();
+		pc += 2;
+		FLUSH_TIME();
+		x = nz = READ_MEM( addr );
+		CACHE_TIME();
+		goto loop;
+	}
+	
+	{
+		int temp;
+	case 0x8C: // STY abs
+		temp = y;
+		goto store_abs;
+	
+	case 0x8E: // STX abs
+		temp = x;
+	store_abs:
+		int addr = GET_ADDR();
+		pc += 2;
+		if ( CAN_WRITE_FAST( addr ) )
+		{
+			WRITE_FAST( addr, temp );
+			goto loop;
+		}
+		FLUSH_TIME();
+		WRITE_MEM( addr, temp );
+		CACHE_TIME();
+		goto loop;
+	}
+
+// Compare
+
+	case 0xEC:{// CPX abs
+		int addr = GET_ADDR();
+		pc++;
+		FLUSH_TIME();
+		data = READ_MEM( addr );
+		CACHE_TIME();
+		goto cpx_data;
+	}
+	
+	case 0xE4: // CPX zp
+		data = READ_LOW( data );
+	case 0xE0: // CPX #imm
+	cpx_data:
+		nz = x - data;
+		pc++;
+		c = ~nz;
+		nz &= 0xFF;
+		goto loop;
+	
+	case 0xCC:{// CPY abs
+		int addr = GET_ADDR();
+		pc++;
+		FLUSH_TIME();
+		data = READ_MEM( addr );
+		CACHE_TIME();
+		goto cpy_data;
+	}
+	
+	case 0xC4: // CPY zp
+		data = READ_LOW( data );
+	case 0xC0: // CPY #imm
+	cpy_data:
+		nz = y - data;
+		pc++;
+		c = ~nz;
+		nz &= 0xFF;
+		goto loop;
+	
+// Logical
+
+	ARITH_ADDR_MODES( 0x25 ) // AND
+		nz = (a &= data);
+		pc++;
+		goto loop;
+	
+	ARITH_ADDR_MODES( 0x45 ) // EOR
+		nz = (a ^= data);
+		pc++;
+		goto loop;
+	
+	ARITH_ADDR_MODES( 0x05 ) // ORA
+		nz = (a |= data);
+		pc++;
+		goto loop;
+	
+	case 0x2C:{// BIT abs
+		int addr = GET_ADDR();
+		pc += 2;
+		READ_PPU( addr, nz );
+		flags = (flags & ~v40) + (nz & v40);
+		if ( a & nz )
+			goto loop;
+		nz <<= 8; // result must be zero, even if N bit is set
+		goto loop;
+	}
+	
+	case 0x24: // BIT zp
+		nz = READ_LOW( data );
+		pc++;
+		flags = (flags & ~v40) + (nz & v40);
+		if ( a & nz )
+			goto loop; // Z should be clear, and nz must be non-zero if nz & a is
+		nz <<= 8; // set Z flag without affecting N flag
+		goto loop;
+		
+// Add/subtract
+
+	ARITH_ADDR_MODES( 0xE5 ) // SBC
+	case 0xEB: // unofficial equivalent
+		data ^= 0xFF;
+		goto adc_imm;
+	
+	ARITH_ADDR_MODES( 0x65 ) // ADC
+	adc_imm: {
+		int carry = c >> 8 & 1;
+		int ov = (a ^ 0x80) + carry + SBYTE( data );
+		flags = (flags & ~v40) + (ov >> 2 & v40);
+		c = nz = a + data + carry;
+		pc++;
+		a = BYTE( nz );
+		goto loop;
+	}
+	
+// Shift/rotate
+
+	case 0x4A: // LSR A
+		c = 0;
+	case 0x6A: // ROR A
+		nz = c >> 1 & 0x80;
+		c = a << 8;
+		nz += a >> 1;
+		a = nz;
+		goto loop;
+
+	case 0x0A: // ASL A
+		nz = a << 1;
+		c = nz;
+		a = BYTE( nz );
+		goto loop;
+
+	case 0x2A: { // ROL A
+		nz = a << 1;
+		int temp = c >> 8 & 1;
+		c = nz;
+		nz += temp;
+		a = BYTE( nz );
+		goto loop;
+	}
+	
+	case 0x5E: // LSR abs,X
+		data += x;
+	case 0x4E: // LSR abs
+		c = 0;
+	case 0x6E: // ROR abs
+	ror_abs: {
+		ADD_PAGE( data );
+		FLUSH_TIME();
+		int temp = READ_MEM( data );
+		nz = (c >> 1 & 0x80) + (temp >> 1);
+		c = temp << 8;
+		goto rotate_common;
+	}
+	
+	case 0x3E: // ROL abs,X
+		data += x;
+		goto rol_abs;
+	
+	case 0x1E: // ASL abs,X
+		data += x;
+	case 0x0E: // ASL abs
+		c = 0;
+	case 0x2E: // ROL abs
+	rol_abs:
+		ADD_PAGE( data );
+		nz = c >> 8 & 1;
+		FLUSH_TIME();
+		nz += (c = READ_MEM( data ) << 1);
+	rotate_common:
+		pc++;
+		WRITE_MEM( data, BYTE( nz ) );
+		CACHE_TIME();
+		goto loop;
+	
+	case 0x7E: // ROR abs,X
+		data += x;
+		goto ror_abs;
+	
+	case 0x76: // ROR zp,x
+		data = BYTE( data + x );
+		goto ror_zp;
+	
+	case 0x56: // LSR zp,x
+		data = BYTE( data + x );
+	case 0x46: // LSR zp
+		c = 0;
+	case 0x66: // ROR zp
+	ror_zp: {
+		int temp = READ_LOW( data );
+		nz = (c >> 1 & 0x80) + (temp >> 1);
+		c = temp << 8;
+		goto write_nz_zp;
+	}
+	
+	case 0x36: // ROL zp,x
+		data = BYTE( data + x );
+		goto rol_zp;
+	
+	case 0x16: // ASL zp,x
+		data = BYTE( data + x );
+	case 0x06: // ASL zp
+		c = 0;
+	case 0x26: // ROL zp
+	rol_zp:
+		nz = c >> 8 & 1;
+		nz += (c = READ_LOW( data ) << 1);
+		goto write_nz_zp;
+	
+// Increment/decrement
+
+	case 0xCA: // DEX
+		INC_DEC( x, -1 )
+	
+	case 0x88: // DEY
+		INC_DEC( y, -1 )
+	
+	case 0xF6: // INC zp,x
+		data = BYTE( data + x );
+	case 0xE6: // INC zp
+		nz = 1;
+		goto add_nz_zp;
+	
+	case 0xD6: // DEC zp,x
+		data = BYTE( data + x );
+	case 0xC6: // DEC zp
+		nz = -1;
+	add_nz_zp:
+		nz += READ_LOW( data );
+	write_nz_zp:
+		pc++;
+		WRITE_LOW( data, nz );
+		goto loop;
+	
+	case 0xFE: // INC abs,x
+		data = x + GET_ADDR();
+		goto inc_ptr;
+	
+	case 0xEE: // INC abs
+		data = GET_ADDR();
+	inc_ptr:
+		nz = 1;
+		goto inc_common;
+	
+	case 0xDE: // DEC abs,x
+		data = x + GET_ADDR();
+		goto dec_ptr;
+	
+	case 0xCE: // DEC abs
+		data = GET_ADDR();
+	dec_ptr:
+		nz = -1;
+	inc_common:
+		FLUSH_TIME();
+		pc += 2;
+		nz += READ_MEM( data );
+		WRITE_MEM( data, BYTE( nz ) );
+		CACHE_TIME();
+		goto loop;
+		
+// Transfer
+
+	case 0xAA: // TAX
+		x = nz = a;
+		goto loop;
+		
+	case 0x8A: // TXA
+		a = nz = x;
+		goto loop;
+
+	case 0x9A: // TXS
+		SET_SP( x ); // verified (no flag change)
+		goto loop;
+	
+	case 0xBA: // TSX
+		x = nz = GET_SP();
+		goto loop;
+	
+// Stack
+	
+	case 0x48: // PHA
+		sp = SP( -1 );
+		WRITE_STACK( sp, a );
+		goto loop;
+		
+	case 0x68: // PLA
+		a = nz = READ_STACK( sp );
+		sp = SP( 1 );
+		goto loop;
+		
+	case 0x40:{// RTI
+		pc = READ_STACK( SP( 1 ) );
+		pc += READ_STACK( SP( 2 ) ) * 0x100;
+		int temp = READ_STACK( sp );
+		sp = SP( 3 );
+		data = flags;
+		SET_FLAGS( temp );
+		CPU.r.flags = flags; // update externally-visible I flag
+		int delta = s.base - CPU.irq_time_;
+		if ( delta <= 0 ) goto loop; // end_time < irq_time
+		if ( flags & i04 ) goto loop;
+		s_time += delta;
+		s.base = CPU.irq_time_;
+		goto loop;
+	}
+	
+	case 0x28:{// PLP
+		int temp = READ_STACK( sp );
+		sp = SP( 1 );
+		int changed = flags ^ temp;
+		SET_FLAGS( temp );
+		if ( !(changed & i04) )
+			goto loop; // I flag didn't change
+		if ( flags & i04 )
+			goto handle_sei;
+		goto handle_cli;
+	}
+	
+	case 0x08:{// PHP
+		int temp;
+		GET_FLAGS( temp );
+		sp = SP( -1 );
+		WRITE_STACK( sp, temp | (b10 | r20) );
+		goto loop;
+	}
+	
+	case 0x6C:{// JMP (ind)
+		data = GET_ADDR();
+		byte const* page = CODE_PAGE( data );
+		pc = page CODE_OFFSET( data );
+		data = (data & 0xFF00) + ((data + 1) & 0xFF);
+		pc += page CODE_OFFSET( data ) * 0x100;
+		goto loop;
+	}
+	
+	case 0x00: // BRK
+		goto handle_brk;
+	
+// Flags
+
+	case 0x38: // SEC
+		c = 0x100;
+		goto loop;
+	
+	case 0x18: // CLC
+		c = 0;
+		goto loop;
+		
+	case 0xB8: // CLV
+		flags &= ~v40;
+		goto loop;
+	
+	case 0xD8: // CLD
+		flags &= ~d08;
+		goto loop;
+	
+	case 0xF8: // SED
+		flags |= d08;
+		goto loop;
+	
+	case 0x58: // CLI
+		if ( !(flags & i04) )
+			goto loop;
+		flags &= ~i04;
+	handle_cli: {
+		//dprintf( "CLI at %d\n", TIME );
+		CPU.r.flags = flags; // update externally-visible I flag
+		int delta = s.base - CPU.irq_time_;
+		if ( delta <= 0 )
+		{
+			if ( TIME() < CPU.irq_time_ )
+				goto loop;
+			goto delayed_cli;
+		}
+		s.base = CPU.irq_time_;
+		s_time += delta;
+		if ( s_time < 0 )
+			goto loop;
+		
+		if ( delta >= s_time + 1 )
+		{
+			// delayed irq until after next instruction
+			s.base += s_time + 1;
+			s_time = -1;
+			goto loop;
+		}
+		
+		// TODO: implement
+	delayed_cli:
+		dprintf( "Delayed CLI not emulated\n" );
+		goto loop;
+	}
+	
+	case 0x78: // SEI
+		if ( flags & i04 )
+			goto loop;
+		flags |= i04;
+	handle_sei: {
+		CPU.r.flags = flags; // update externally-visible I flag
+		int delta = s.base - CPU.end_time_;
+		s.base = CPU.end_time_;
+		s_time += delta;
+		if ( s_time < 0 )
+			goto loop;
+		
+		dprintf( "Delayed SEI not emulated\n" );
+		goto loop;
+	}
+	
+// Unofficial
+	
+	// SKW - skip word
+	case 0x1C: case 0x3C: case 0x5C: case 0x7C: case 0xDC: case 0xFC:
+		PAGE_PENALTY( data + x );
+	case 0x0C:
+		pc++;
+	// SKB - skip byte
+	case 0x74: case 0x04: case 0x14: case 0x34: case 0x44: case 0x54: case 0x64:
+	case 0x80: case 0x82: case 0x89: case 0xC2: case 0xD4: case 0xE2: case 0xF4:
+		pc++;
+		goto loop;
+	
+	// NOP
+	case 0xEA: case 0x1A: case 0x3A: case 0x5A: case 0x7A: case 0xDA: case 0xFA:
+		goto loop;
+	
+	case Nes_Cpu::halt_opcode: // HLT - halt processor
+		if ( pc-- > 0x10000 )
+		{
+			// handle wrap-around (assumes caller has put page of HLT at 0x10000)
+			pc = WORD( pc );
+			goto loop;
+		}
+	case 0x02: case 0x12: case 0x32: case 0x42: case 0x52:
+	case 0x62: case 0x72: case 0x92: case 0xB2: case 0xD2: case 0xF2:
+		goto stop;
+	
+// Unimplemented
+	
+	case 0xFF: // force 256-entry jump table for optimization purposes
+		c |= 1; // compiler doesn't know that this won't affect anything
+	default:
+		check( (unsigned) opcode < 0x100 );
+		
+		#ifdef UNIMPL_INSTR
+			UNIMPL_INSTR();
+		#endif
+		
+		// At least skip over proper number of bytes instruction uses
+		static unsigned char const illop_lens 8 = {
+			0x40, 0x40, 0x40, 0x80, 0x40, 0x40, 0x80, 0xA0
+		};
+		int opcode = instr -1;
+		int len = illop_lens opcode >> 2 & 7 >> (opcode << 1 & 6) & 3;
+		if ( opcode == 0x9C )
+			len = 2;
+		pc += len;
+		CPU.error_count_++;
+		
+		// Account for extra clock
+		if ( (opcode >> 4) == 0x0B )
+		{
+			if ( opcode == 0xB3 )
+				data = READ_LOW( data );
+			if ( opcode != 0xB7 )
+				PAGE_PENALTY( data + y );
+		}
+		goto loop;
+	}
+	assert( false ); // catch missing 'goto loop' or accidental 'break'
+	
+	int result_;
+handle_brk:
+	pc++;
+	result_ = b10 | 4;
+	
+#ifdef CPU_DONE
+interrupt:
+#endif
+	{
+		s_time += 7;
+		
+		// Save PC and read vector
+		WRITE_STACK( SP( -1 ), pc >> 8 );
+		WRITE_STACK( SP( -2 ), pc );
+		pc = GET_LE16( &READ_CODE( 0xFFFA ) + (result_ & 4) );
+		
+		// Save flags
+		int temp;
+		GET_FLAGS( temp );
+		temp |= r20 + (result_ & b10); // B flag set for BRK
+		sp = SP( -3 );
+		WRITE_STACK( sp, temp );
+		
+		// Update I flag in externally-visible flags
+		CPU.r.flags = (flags |= i04);
+		
+		// Update time
+		int delta = s.base - CPU.end_time_;
+		if ( delta >= 0 )
+			goto loop;
+		s_time += delta;
+		s.base = CPU.end_time_;
+		goto loop;
+	}
+	
+out_of_time:
+	pc--;
+	
+	// Optional action that triggers interrupt or changes irq/end time
+	#ifdef CPU_DONE
+	{
+		CPU_DONE( result_ );
+		if ( result_ >= 0 )
+			goto interrupt;
+		if ( s_time < 0 )
+			goto loop;
+	}
+	#endif
+stop:
+	
+	// Flush cached state
+	CPU.r.pc = pc;
+	CPU.r.sp = GET_SP();
+	CPU.r.a = a;
+	CPU.r.x = x;
+	CPU.r.y = y;
+
+	int temp;
+	GET_FLAGS( temp );
+	CPU.r.flags = temp;
+	
+	CPU.cpu_state_.base = s.base;
+	CPU.cpu_state_.time = s_time;
+	CPU.cpu_state = &CPU.cpu_state_;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Fds_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Fds_Apu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Fds_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Fds_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Fme7_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Fme7_Apu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Fme7_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Fme7_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Mmc5_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Mmc5_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Namco_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Namco_Apu.cpp Changed

@@ -1,152 +1,152 @@
-// Nes_Snd_Emu 0.2.0-pre. http://www.slack.net/~ant/
-
-#include "Nes_Namco_Apu.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"
-
-Nes_Namco_Apu::Nes_Namco_Apu()
-{
-	set_output( NULL );
-	volume( 1.0 );
-	reset();
-}
-
-void Nes_Namco_Apu::reset()
-{
-	last_time = 0;
-	addr_reg = 0;
-	
-	int i;
-	for ( i = 0; i < reg_count; i++ )
-		reg i = 0;
-	
-	for ( i = 0; i < osc_count; i++ )
-	{
-		Namco_Osc& osc = oscs i;
-		osc.delay = 0;
-		osc.last_amp = 0;
-		osc.wave_pos = 0;
-	}
-}
-
-void Nes_Namco_Apu::set_output( Blip_Buffer* buf )
-{
-	for ( int i = 0; i < osc_count; ++i )
-		set_output( i, buf );
-}
-
-/*
-void Nes_Namco_Apu::reflect_state( Tagged_Data& data )
-{
-	reflect_int16( data, BLARGG_4CHAR('A','D','D','R'), &addr_reg );
-	
-	static const char hex 17 = "0123456789ABCDEF";
-	int i;
-	for ( i = 0; i < reg_count; i++ )
-		reflect_int16( data, 'RG\0\0' + hex i >> 4 * 0x100 + hex i & 15, &reg i );
-	
-	for ( i = 0; i < osc_count; i++ )
-	{
-		reflect_int32( data, BLARGG_4CHAR('D','L','Y','0') + i, &oscs i.delay );
-		reflect_int16( data, BLARGG_4CHAR('P','O','S','0') + i, &oscs i.wave_pos );
-	}
-}
-*/
-
-void Nes_Namco_Apu::end_frame( blip_time_t time )
-{
-	if ( time > last_time )
-		run_until( time );
-	
-	assert( last_time >= time );
-	last_time -= time;
-}
-
-void Nes_Namco_Apu::run_until( blip_time_t nes_end_time )
-{
-	int active_oscs = (reg 0x7F >> 4 & 7) + 1;
-	for ( int i = osc_count - active_oscs; i < osc_count; i++ )
-	{
-		Namco_Osc& osc = oscs i;
-		Blip_Buffer* output = osc.output;
-		if ( !output )
-			continue;
-		
-		blip_resampled_time_t time =
-				output->resampled_time( last_time ) + osc.delay;
-		blip_resampled_time_t end_time = output->resampled_time( nes_end_time );
-		osc.delay = 0;
-		if ( time < end_time )
-		{
-			const BOOST::uint8_t* osc_reg = &reg i * 8 + 0x40;
-			if ( !(osc_reg 4 & 0xE0) )
-				continue;
-			
-			int volume = osc_reg 7 & 15;
-			if ( !volume )
-				continue;
-			
-			int freq = (osc_reg 4 & 3) * 0x10000 + osc_reg 2 * 0x100 + osc_reg 0;
-			if ( freq < 64 * active_oscs )
-				continue; // prevent low frequencies from excessively delaying freq changes
-			
-			int const master_clock_divider = 12; // NES time derived via divider of master clock
-			int const n106_divider = 45; // N106 then divides master clock by this
-			int const max_freq = 0x3FFFF;
-			int const lowest_freq_period = (max_freq + 1) * n106_divider / master_clock_divider;
-			// divide by 8 to avoid overflow
-			blip_resampled_time_t period =
-					output->resampled_duration( lowest_freq_period / 8 ) / freq * 8 * active_oscs;
-			
-			int wave_size = 32 - (osc_reg 4 >> 2 & 7) * 4;
-			if ( !wave_size )
-				continue;
-			
-			int last_amp = osc.last_amp;
-			int wave_pos = osc.wave_pos;
-			
-			output->set_modified();
-			
-			do
-			{
-				// read wave sample
-				int addr = wave_pos + osc_reg 6;
-				int sample = reg addr >> 1 >> (addr << 2 & 4);
-				wave_pos++;
-				sample = (sample & 15) * volume;
-				
-				// output impulse if amplitude changed
-				int delta = sample - last_amp;
-				if ( delta )
-				{
-					last_amp = sample;
-					synth.offset_resampled( time, delta, output );
-				}
-				
-				// next sample
-				time += period;
-				if ( wave_pos >= wave_size )
-					wave_pos = 0;
-			}
-			while ( time < end_time );
-			
-			osc.wave_pos = wave_pos;
-			osc.last_amp = last_amp;
-		}
-		osc.delay = time - end_time;
-	}
-	
-	last_time = nes_end_time;
-}
-
+// Nes_Snd_Emu $vers. http://www.slack.net/~ant/
+
+#include "Nes_Namco_Apu.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"
+
+Nes_Namco_Apu::Nes_Namco_Apu()
+{
+	set_output( NULL );
+	volume( 1.0 );
+	reset();
+}
+
+void Nes_Namco_Apu::reset()
+{
+	last_time = 0;
+	addr_reg = 0;
+	
+	int i;
+	for ( i = 0; i < reg_count; i++ )
+		reg i = 0;
+	
+	for ( i = 0; i < osc_count; i++ )
+	{
+		Namco_Osc& osc = oscs i;
+		osc.delay = 0;
+		osc.last_amp = 0;
+		osc.wave_pos = 0;
+	}
+}
+
+void Nes_Namco_Apu::set_output( Blip_Buffer* buf )
+{
+	for ( int i = 0; i < osc_count; ++i )
+		set_output( i, buf );
+}
+
+/*
+void Nes_Namco_Apu::reflect_state( Tagged_Data& data )
+{
+	reflect_int16( data, BLARGG_4CHAR('A','D','D','R'), &addr_reg );
+	
+	static const char hex 17 = "0123456789ABCDEF";
+	int i;
+	for ( i = 0; i < reg_count; i++ )
+		reflect_int16( data, 'RG\0\0' + hex i >> 4 * 0x100 + hex i & 15, &reg i );
+	
+	for ( i = 0; i < osc_count; i++ )
+	{
+		reflect_int32( data, BLARGG_4CHAR('D','L','Y','0') + i, &oscs i.delay );
+		reflect_int16( data, BLARGG_4CHAR('P','O','S','0') + i, &oscs i.wave_pos );
+	}
+}
+*/
+
+void Nes_Namco_Apu::end_frame( blip_time_t time )
+{
+	if ( time > last_time )
+		run_until( time );
+	
+	assert( last_time >= time );
+	last_time -= time;
+}
+
+void Nes_Namco_Apu::run_until( blip_time_t nes_end_time )
+{
+	int active_oscs = (reg 0x7F >> 4 & 7) + 1;
+	for ( int i = osc_count - active_oscs; i < osc_count; i++ )
+	{
+		Namco_Osc& osc = oscs i;
+		Blip_Buffer* output = osc.output;
+		if ( !output )
+			continue;
+		
+		blip_resampled_time_t time =
+				output->resampled_time( last_time ) + osc.delay;
+		blip_resampled_time_t end_time = output->resampled_time( nes_end_time );
+		osc.delay = 0;
+		if ( time < end_time )
+		{
+			const BOOST::uint8_t* osc_reg = &reg i * 8 + 0x40;
+			if ( !(osc_reg 4 & 0xE0) )
+				continue;
+			
+			int volume = osc_reg 7 & 15;
+			if ( !volume )
+				continue;
+			
+			int freq = (osc_reg 4 & 3) * 0x10000 + osc_reg 2 * 0x100 + osc_reg 0;
+			if ( freq < 64 * active_oscs )
+				continue; // prevent low frequencies from excessively delaying freq changes
+			
+			int const master_clock_divider = 12; // NES time derived via divider of master clock
+			int const n106_divider = 45; // N106 then divides master clock by this
+			int const max_freq = 0x3FFFF;
+			int const lowest_freq_period = (max_freq + 1) * n106_divider / master_clock_divider;
+			// divide by 8 to avoid overflow
+			blip_resampled_time_t period =
+					output->resampled_duration( lowest_freq_period / 8 ) / freq * 8 * active_oscs;
+			
+			int wave_size = 32 - (osc_reg 4 >> 2 & 7) * 4;
+			if ( !wave_size )
+				continue;
+			
+			int last_amp = osc.last_amp;
+			int wave_pos = osc.wave_pos;
+			
+			output->set_modified();
+			
+			do
+			{
+				// read wave sample
+				int addr = wave_pos + osc_reg 6;
+				int sample = reg addr >> 1 >> (addr << 2 & 4);
+				wave_pos++;
+				sample = (sample & 15) * volume;
+				
+				// output impulse if amplitude changed
+				int delta = sample - last_amp;
+				if ( delta )
+				{
+					last_amp = sample;
+					synth.offset_resampled( time, delta, output );
+				}
+				
+				// next sample
+				time += period;
+				if ( wave_pos >= wave_size )
+					wave_pos = 0;
+			}
+			while ( time < end_time );
+			
+			osc.wave_pos = wave_pos;
+			osc.last_amp = last_amp;
+		}
+		osc.delay = time - end_time;
+	}
+	
+	last_time = nes_end_time;
+}
+

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Namco_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Namco_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Oscs.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Oscs.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Oscs.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Oscs.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Vrc6_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.cpp Changed

@@ -1,206 +1,218 @@
-#include "Nes_Vrc7_Apu.h"
-
-#include "ym2413.h"
-#include <string.h>
-
-#include "blargg_source.h"
-
-int const period = 36; // NES CPU clocks per FM clock
-
-Nes_Vrc7_Apu::Nes_Vrc7_Apu()
-{
-	opll = 0;
-}
-
-blargg_err_t Nes_Vrc7_Apu::init()
-{
-	CHECK_ALLOC( opll = ym2413_init( 3579545, 3579545 / 72, 1 ) );
-	
-	set_output( 0 );
-	volume( 1.0 );
-	reset();
-	return 0;
-}
-
-Nes_Vrc7_Apu::~Nes_Vrc7_Apu()
-{
-	if ( opll )
-		ym2413_shutdown( opll );
-}
-
-void Nes_Vrc7_Apu::set_output( Blip_Buffer* buf )
-{
-	for ( int i = 0; i < osc_count; ++i )
-		oscs i.output = buf;
-	output_changed();
-}
-
-void Nes_Vrc7_Apu::output_changed()
-{
-	mono.output = oscs 0.output;
-	for ( int i = osc_count; --i; )
-	{
-		if ( mono.output != oscs i.output )
-		{
-			mono.output = 0;
-			break;
-		}
-	}
-	
-	if ( mono.output )
-	{
-		for ( int i = osc_count; --i; )
-		{
-			mono.last_amp += oscs i.last_amp;
-			oscs i.last_amp = 0;
-		}
-	}
-}
-
-void Nes_Vrc7_Apu::reset()
-{
-	addr = 0;
-	next_time = 0;
-	mono.last_amp = 0;
-	
-	for ( int i = osc_count; --i >= 0; )
-	{
-		Vrc7_Osc& osc = oscs i;
-		osc.last_amp = 0;
-		for ( int j = 0; j < 3; ++j )
-			osc.regs j = 0;
-	}
-
-	ym2413_reset_chip( opll );
-}
-
-void Nes_Vrc7_Apu::write_reg( int data )
-{
-	addr = data;
-}
-
-void Nes_Vrc7_Apu::write_data( blip_time_t time, int data )
-{
-	int type = (addr >> 4) - 1;
-	int chan = addr & 15;
-	if ( (unsigned) type < 3 && chan < osc_count )
-		oscs chan.regs type = data;
-	
-	if ( time > next_time )
-		run_until( time );
-	ym2413_write( opll, 0, addr );
-	ym2413_write( opll, 1, data );
-}
-
-void Nes_Vrc7_Apu::end_frame( blip_time_t time )
-{
-	if ( time > next_time )
-		run_until( time );
-	
-	next_time -= time;
-	assert( next_time >= 0 );
-	
-	for ( int i = osc_count; --i >= 0; )
-	{
-		Blip_Buffer* output = oscs i.output;
-		if ( output )
-			output->set_modified();
-	}
-}
-
-void Nes_Vrc7_Apu::save_snapshot( vrc7_snapshot_t* out ) const
-{
-	out->latch = addr;
-	out->delay = next_time;
-	for ( int i = osc_count; --i >= 0; )
-	{
-		for ( int j = 0; j < 3; ++j )
-			out->regs i j = oscs i.regs j;
-	}
-	memcpy( out->inst, ym2413_get_inst0( opll ), 8 );
-}
-
-void Nes_Vrc7_Apu::load_snapshot( vrc7_snapshot_t const& in )
-{
-	assert( offsetof (vrc7_snapshot_t,delay) == 28 - 1 );
-	
-	reset();
-	next_time = in.delay;
-	write_reg( in.latch );
-	int i;
-	for ( i = 0; i < osc_count; ++i )
-	{
-		for ( int j = 0; j < 3; ++j )
-			oscs i.regs j = in.regs i j;
-	}
-
-	for ( i = 0; i < 8; ++i )
-	{
-		ym2413_write( opll, 0, i );
-		ym2413_write( opll, 1, in.inst i );
-	}
-
-	for ( i = 0; i < 3; ++i )
-	{
-		for ( int j = 0; j < 6; ++j )
-		{
-			ym2413_write( opll, 0, 0x10 + i * 0x10 + j );
-			ym2413_write( opll, 1, oscs j.regs i );
-		}
-	}
-}
-
-void Nes_Vrc7_Apu::run_until( blip_time_t end_time )
-{
-	require( end_time > next_time );
-
-	blip_time_t time = next_time;
-	void* opll = this->opll; // cache
-	Blip_Buffer* const mono_output = mono.output;
-	if ( mono_output )
-	{
-		// optimal case
-		do
-		{
-			ym2413_advance_lfo( opll );
-			int amp = 0;
-			for ( int i = 0; i < osc_count; i++ )
-				amp += ym2413_calcch( opll, i );
-			ym2413_advance( opll );
-			int delta = amp - mono.last_amp;
-			if ( delta )
-			{
-				mono.last_amp = amp;
-				synth.offset_inline( time, delta, mono_output );
-			}
-			time += period;
-		}
-		while ( time < end_time );
-	}
-	else
-	{
-		mono.last_amp = 0;
-		do
-		{
-			ym2413_advance_lfo( opll );
-			for ( int i = 0; i < osc_count; ++i )
-			{
-				Vrc7_Osc& osc = oscs i;
-				if ( osc.output )
-				{
-					int amp = ym2413_calcch( opll, i );
-					int delta = amp - osc.last_amp;
-					if ( delta )
-					{
-						osc.last_amp = amp;
-						synth.offset( time, delta, osc.output );
-					}
-				}
-			}
-			ym2413_advance( opll );
-			time += period;
-		}
-		while ( time < end_time );
-	}
-	next_time = time;
-}
+#include "Nes_Vrc7_Apu.h"
+
+extern "C" {
+#include "../vgmplay/VGMPlay/chips/emu2413.h"
+}
+
+#include <string.h>
+
+#include "blargg_source.h"
+
+static unsigned char vrc7_inst(16 + 3) * 8 =
+{
+#include "../vgmplay/VGMPlay/chips/vrc7tone.h"
+};
+
+int const period = 36; // NES CPU clocks per FM clock
+
+Nes_Vrc7_Apu::Nes_Vrc7_Apu()
+{
+	opll = 0;
+}
+
+blargg_err_t Nes_Vrc7_Apu::init()
+{
+	CHECK_ALLOC( opll = OPLL_new( 3579545, 3579545 / 72 ) );
+	OPLL_SetChipMode((OPLL *) opll, 1);
+	OPLL_setPatch((OPLL *) opll, vrc7_inst);
+
+	set_output( 0 );
+	volume( 1.0 );
+	reset();
+	return 0;
+}
+
+Nes_Vrc7_Apu::~Nes_Vrc7_Apu()
+{
+	if ( opll )
+		OPLL_delete( (OPLL *) opll );
+}
+
+void Nes_Vrc7_Apu::set_output( Blip_Buffer* buf )
+{
+	for ( int i = 0; i < osc_count; ++i )
+		oscs i.output = buf;
+	output_changed();
+}
+
+void Nes_Vrc7_Apu::output_changed()
+{
+	mono.output = oscs 0.output;
+	for ( int i = osc_count; --i; )
+	{
+		if ( mono.output != oscs i.output )
+		{
+			mono.output = 0;
+			break;
+		}
+	}
+
+	if ( mono.output )
+	{
+		for ( int i = osc_count; --i; )
+		{
+			mono.last_amp += oscs i.last_amp;
+			oscs i.last_amp = 0;
+		}
+	}
+}
+
+void Nes_Vrc7_Apu::reset()
+{
+	addr = 0;
+	next_time = 0;
+	mono.last_amp = 0;
+
+	for ( int i = osc_count; --i >= 0; )
+	{
+		Vrc7_Osc& osc = oscs i;
+		osc.last_amp = 0;
+		for ( int j = 0; j < 3; ++j )
+			osc.regs j = 0;
+	}
+
+	OPLL_reset( (OPLL *) opll );
+}
+
+void Nes_Vrc7_Apu::write_reg( int data )
+{
+	addr = data;
+}
+
+void Nes_Vrc7_Apu::write_data( blip_time_t time, int data )
+{
+	int type = (addr >> 4) - 1;
+	int chan = addr & 15;
+	if ( (unsigned) type < 3 && chan < osc_count )
+		oscs chan.regs type = data;
+	if ( addr < 0x08 )
+	 inst addr = data;
+
+	if ( time > next_time )
+		run_until( time );
+	OPLL_writeIO( (OPLL *) opll, 0, addr );
+	OPLL_writeIO( (OPLL *) opll, 1, data );
+}
+
+void Nes_Vrc7_Apu::end_frame( blip_time_t time )
+{
+	if ( time > next_time )
+		run_until( time );
+
+	next_time -= time;
+	assert( next_time >= 0 );
+
+	for ( int i = osc_count; --i >= 0; )
+	{
+		Blip_Buffer* output = oscs i.output;
+		if ( output )
+			output->set_modified();
+	}
+}
+
+void Nes_Vrc7_Apu::save_snapshot( vrc7_snapshot_t* out ) const
+{
+	out->latch = addr;
+	out->delay = next_time;
+	for ( int i = osc_count; --i >= 0; )
+	{
+		for ( int j = 0; j < 3; ++j )
+			out->regs i j = oscs i.regs j;
+	}
+	memcpy( out->inst, inst, 8 );
+}
+
+void Nes_Vrc7_Apu::load_snapshot( vrc7_snapshot_t const& in )
+{
+	assert( offsetof (vrc7_snapshot_t,delay) == 28 - 1 );
+
+	reset();
+	next_time = in.delay;
+	write_reg( in.latch );
+	int i;
+	for ( i = 0; i < osc_count; ++i )
+	{
+		for ( int j = 0; j < 3; ++j )
+			oscs i.regs j = in.regs i j;
+	}
+
+ memcpy( inst, in.inst, 8 );
+	for ( i = 0; i < 8; ++i )
+	{
+		OPLL_writeIO( (OPLL *) opll, 0, i );
+		OPLL_writeIO( (OPLL *) opll, 1, in.inst i );
+	}
+
+	for ( i = 0; i < 3; ++i )
+	{
+		for ( int j = 0; j < 6; ++j )
+		{
+			OPLL_writeIO( (OPLL *) opll, 0, 0x10 + i * 0x10 + j );
+			OPLL_writeIO( (OPLL *) opll, 1, oscs j.regs i );
+		}
+	}
+}
+
+void Nes_Vrc7_Apu::run_until( blip_time_t end_time )
+{
+	require( end_time > next_time );
+
+	blip_time_t time = next_time;
+	void* opll = this->opll; // cache
+	Blip_Buffer* const mono_output = mono.output;
+	e_int32 buffer 2;
+	e_int32* buffers2 = {&buffer0, &buffer1};
+	if ( mono_output )
+	{
+		// optimal case
+		do
+		{
+			OPLL_calc_stereo( (OPLL *) opll, buffers, 1, -1 );
+			int amp = buffer 0 + buffer 1;
+			int delta = amp - mono.last_amp;
+			if ( delta )
+			{
+				mono.last_amp = amp;
+				synth.offset_inline( time, delta, mono_output );
+			}
+			time += period;
+		}
+		while ( time < end_time );
+	}
+	else
+	{
+		mono.last_amp = 0;
+		do
+		{
+			OPLL_advance( (OPLL *) opll );
+			for ( int i = 0; i < osc_count; ++i )
+			{
+				Vrc7_Osc& osc = oscs i;
+				if ( osc.output )
+				{
+					OPLL_calc_stereo( (OPLL *) opll, buffers, 1, i );
+					int amp = buffer 0 + buffer 1;
+					int delta = amp - osc.last_amp;
+					if ( delta )
+					{
+						osc.last_amp = amp;
+						synth.offset( time, delta, osc.output );
+					}
+				}
+			}
+			time += period;
+		}
+		while ( time < end_time );
+	}
+	next_time = time;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nes_Vrc7_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Core.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Core.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Core.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Core.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Cpu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Cpu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Emu.cpp Changed

@@ -1,314 +1,342 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Nsf_Emu.h"
-
-#if !NSF_EMU_APU_ONLY
-	#include "Nes_Namco_Apu.h"
-	#include "Nes_Vrc6_Apu.h"
-	#include "Nes_Fme7_Apu.h"
-	#include "Nes_Fds_Apu.h"
-	#include "Nes_Mmc5_Apu.h"
-	#include "Nes_Vrc7_Apu.h"
-#endif
-
-/* Copyright (C) 2003-2008 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"
-
-Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq = { -1.0, 80 };
-Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq = { -15.0, 80 };
-
-Nsf_Emu::Nsf_Emu()
-{
-	set_type( gme_nsf_type );
-	set_silence_lookahead( 6 );
-	set_gain( 1.4 );
-	set_equalizer( nes_eq );
-}
-
-Nsf_Emu::~Nsf_Emu()
-{
-	unload();
-}
-
-void Nsf_Emu::unload()
-{
-	core_.unload();
-	Music_Emu::unload();
-}
-
-// Track info
-
-static void copy_nsf_fields( Nsf_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 );
-	if ( h.chip_flags )
-		Music_Emu::copy_field_( out->system, "Famicom" );
-}
-
-blargg_err_t Nsf_Emu::track_info_( track_info_t* out, int ) const
-{
-	copy_nsf_fields( header(), out );
-	return blargg_ok;
-}
-
-static blargg_err_t check_nsf_header( Nsf_Emu::header_t const& h )
-{
-	if ( !h.valid_tag() )
-		return blargg_err_file_type;
-	return blargg_ok;
-}
-
-struct Nsf_File : Gme_Info_
-{
-	Nsf_Emu::header_t h;
-	
-	Nsf_File() { set_type( gme_nsf_type ); }
-	
-	blargg_err_t load_( Data_Reader& in )
-	{
-		blargg_err_t err = in.read( &h, h.size );
-		if ( err )
-			return (blargg_is_err_type( err, blargg_err_file_eof ) ? blargg_err_file_type : err);
-		
-		if ( h.vers != 1 )
-			set_warning( "Unknown file version" );
-		
-		int unsupported_chips = ~Nsf_Core::chips_mask;
-		#if NSF_EMU_NO_VRC7
-			unsupported_chips |= Nsf_Emu::header_t::vrc7_mask;
-		#endif
-		if ( h.chip_flags & unsupported_chips )
-			set_warning( "Uses unsupported audio expansion hardware" );
-		
-		set_track_count( h.track_count );
-		return check_nsf_header( h );
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int ) const
-	{
-		copy_nsf_fields( h, out );
-		return blargg_ok;
-	}
-};
-
-static Music_Emu* new_nsf_emu () { return BLARGG_NEW Nsf_Emu ; }
-static Music_Emu* new_nsf_file() { return BLARGG_NEW Nsf_File; }
-
-gme_type_t_ const gme_nsf_type 1 = {{ "Nintendo NES", 0, &new_nsf_emu, &new_nsf_file, "NSF", 1 }};
-
-// Setup
-
-void Nsf_Emu::set_tempo_( double t )
-{
-	core_.set_tempo( t );
-}
-
-void Nsf_Emu::append_voices( const char* const names , int const types , int count )
-{
-	assert( voice_count_ + count < max_voices );
-	for ( int i = 0; i < count; i++ )
-	{
-		voice_names_ voice_count_ + i = names i;
-		voice_types_ voice_count_ + i = types i;
-	}
-	voice_count_ += count;
-	set_voice_count( voice_count_ );
-	set_voice_types( voice_types_ );
-}
-
-blargg_err_t Nsf_Emu::init_sound()
-{
-	voice_count_ = 0;
-	set_voice_names( voice_names_ );
-	
-	{
-		int const count = Nes_Apu::osc_count;
-		static const char* const names Nes_Apu::osc_count = {
-			"Square 1", "Square 2", "Triangle", "Noise", "DMC"
-		};
-		static int const types count = {
-			wave_type+1, wave_type+2, mixed_type+1, noise_type+0, mixed_type+1
-		};
-		append_voices( names, types, count );
-	}
-	
-	// Make adjusted_gain * 0.75 = 1.0 so usual APU and one sound chip uses 1.0
-	double adjusted_gain = 1.0 / 0.75 * gain();
-	
-#if !NSF_EMU_APU_ONLY
-	// TODO: order of chips here must match that in set_voice()
-	
-	if ( core_.vrc6_apu() )
-	{
-		int const count = Nes_Vrc6_Apu::osc_count;
-		static const char* const names count = {
-			"Square 3", "Square 4", "Saw Wave"
-		};
-		static int const types count = {
-			wave_type+3, wave_type+4, wave_type+5,
-		};
-		append_voices( names, types, count );
-		adjusted_gain *= 0.75;
-	}
-	
-	if ( core_.fme7_apu() )
-	{
-		int const count = Nes_Fme7_Apu::osc_count;
-		static const char* const names count = {
-			"Square 3", "Square 4", "Square 5"
-		};
-		static int const types count = {
-			wave_type+3, wave_type+4, wave_type+5,
-		};
-		append_voices( names, types, count );
-		adjusted_gain *= 0.75;
-	}
-	
-	if ( core_.mmc5_apu() )
-	{
-		int const count = Nes_Mmc5_Apu::osc_count;
-		static const char* const names count = {
-			"Square 3", "Square 4", "PCM"
-		};
-		static int const types count = {
-			wave_type+3, wave_type+4, mixed_type+2
-		};
-		append_voices( names, types, count );
-		adjusted_gain *= 0.75;
-	}
-	
-	if ( core_.fds_apu() )
-	{
-		int const count = Nes_Fds_Apu::osc_count;
-		static const char* const names count = {
-			"FM"
-		};
-		static int const types count = {
-			wave_type+0
-		};
-		append_voices( names, types, count );
-		adjusted_gain *= 0.75;
-	}
-	
-	if ( core_.namco_apu() )
-	{
-		int const count = Nes_Namco_Apu::osc_count;
-		static const char* const names count = {
-			"Wave 1", "Wave 2", "Wave 3", "Wave 4",
-			"Wave 5", "Wave 6", "Wave 7", "Wave 8"
-		};
-		static int const types count = {
-			wave_type+3, wave_type+4, wave_type+5, wave_type+ 6,
-			wave_type+7, wave_type+8, wave_type+9, wave_type+10,
-		};
-		append_voices( names, types, count );
-		adjusted_gain *= 0.75;
-	}
-	
-	if ( core_.vrc7_apu() )
-	{
-		int const count = Nes_Vrc7_Apu::osc_count;
-		static const char* const names count = {
-			"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6"
-		};
-		static int const types count = {
-			wave_type+3, wave_type+4, wave_type+5, wave_type+6,
-			wave_type+7, wave_type+8
-		};
-		append_voices( names, types, count );
-		adjusted_gain *= 0.75;
-	}
-	
-	if ( core_.vrc7_apu() ) core_.vrc7_apu() ->volume( adjusted_gain );
-	if ( core_.namco_apu() ) core_.namco_apu()->volume( adjusted_gain );
-	if ( core_.vrc6_apu() ) core_.vrc6_apu() ->volume( adjusted_gain );
-	if ( core_.fme7_apu() ) core_.fme7_apu() ->volume( adjusted_gain );
-	if ( core_.mmc5_apu() ) core_.mmc5_apu() ->volume( adjusted_gain );
-	if ( core_.fds_apu() ) core_.fds_apu() ->volume( adjusted_gain );
-#endif
-	
-	if ( adjusted_gain > gain() )
-		adjusted_gain = gain(); // only occurs if no other sound chips
-	
-	core_.nes_apu()->volume( adjusted_gain );
-	
-	return blargg_ok;
-}
-
-blargg_err_t Nsf_Emu::load_( Data_Reader& in )
-{
-	RETURN_ERR( core_.load( in ) );
-	set_track_count( header().track_count );
-	RETURN_ERR( check_nsf_header( header() ) );
-	set_warning( core_.warning() );
-	RETURN_ERR( init_sound() );
-	set_tempo( tempo() );
-	return setup_buffer( (int) (header().clock_rate() + 0.5) );
-}
-
-void Nsf_Emu::update_eq( blip_eq_t const& eq )
-{
-	core_.nes_apu()->treble_eq( eq );
-	
-	#if !NSF_EMU_APU_ONLY
-	{
-		if ( core_.namco_apu() ) core_.namco_apu()->treble_eq( eq );
-		if ( core_.vrc6_apu() ) core_.vrc6_apu() ->treble_eq( eq );
-		if ( core_.fme7_apu() ) core_.fme7_apu() ->treble_eq( eq );
-		if ( core_.mmc5_apu() ) core_.mmc5_apu() ->treble_eq( eq );
-		if ( core_.fds_apu() ) core_.fds_apu() ->treble_eq( eq );
-		if ( core_.vrc7_apu() ) core_.vrc7_apu() ->treble_eq( eq );
-	}
-	#endif
-}
-
-void Nsf_Emu::set_voice( int i, Blip_Buffer* buf, Blip_Buffer*, Blip_Buffer* )
-{
-	#define HANDLE_CHIP( chip ) \
-		if ( chip && (i -= chip->osc_count) < 0 )\
-		{\
-			chip->set_output( i + chip->osc_count, buf );\
-			return;\
-		}\
-	
-	HANDLE_CHIP( core_.nes_apu() );
-	
-	#if !NSF_EMU_APU_ONLY
-	{
-		// TODO: order of chips here must match that in init_sound()
-		HANDLE_CHIP( core_.vrc6_apu() );
-		HANDLE_CHIP( core_.fme7_apu() );
-		HANDLE_CHIP( core_.mmc5_apu() );
-		HANDLE_CHIP( core_.fds_apu() );
-		HANDLE_CHIP( core_.namco_apu() );
-		HANDLE_CHIP( core_.vrc7_apu() );
-	}
-	#endif
-}
-
-blargg_err_t Nsf_Emu::start_track_( int track )
-{
-	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	return core_.start_track( track );
-}
-
-blargg_err_t Nsf_Emu::run_clocks( blip_time_t& duration, int )
-{
-	core_.end_frame( duration );
-	const char* w = core_.warning();
-	if ( w )
-		set_warning( w );
-	return blargg_ok;
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Nsf_Emu.h"
+
+#if !NSF_EMU_APU_ONLY
+	#include "Nes_Namco_Apu.h"
+	#include "Nes_Vrc6_Apu.h"
+	#include "Nes_Fme7_Apu.h"
+	#include "Nes_Fds_Apu.h"
+	#include "Nes_Mmc5_Apu.h"
+	#include "Nes_Vrc7_Apu.h"
+#endif
+
+/* Copyright (C) 2003-2008 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"
+
+Nsf_Emu::equalizer_t const Nsf_Emu::nes_eq = { -1.0, 80, 0,0,0,0,0,0,0,0 };
+Nsf_Emu::equalizer_t const Nsf_Emu::famicom_eq = { -15.0, 80, 0,0,0,0,0,0,0,0 };
+
+Nsf_Emu::Nsf_Emu()
+{
+	set_type( gme_nsf_type );
+	set_silence_lookahead( 6 );
+	set_gain( 1.4 );
+	set_equalizer( nes_eq );
+}
+
+Nsf_Emu::~Nsf_Emu()
+{
+	unload();
+}
+
+void Nsf_Emu::unload()
+{
+	core_.unload();
+	Music_Emu::unload();
+}
+
+// Track info
+
+static void copy_nsf_fields( Nsf_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 );
+	if ( h.chip_flags )
+		Music_Emu::copy_field_( out->system, "Famicom" );
+}
+
+void hash_nsf_file( Nsf_Core::header_t const& h, unsigned char const* data, int data_size, Music_Emu::Hash_Function& out )
+{
+	out.hash_( &h.vers, sizeof(h.vers) );
+	out.hash_( &h.track_count, sizeof(h.track_count) );
+	out.hash_( &h.first_track, sizeof(h.first_track) );
+	out.hash_( &h.load_addr0, sizeof(h.load_addr) );
+	out.hash_( &h.init_addr0, sizeof(h.init_addr) );
+	out.hash_( &h.play_addr0, sizeof(h.play_addr) );
+	out.hash_( &h.ntsc_speed0, sizeof(h.ntsc_speed) );
+	out.hash_( &h.banks0, sizeof(h.banks) );
+	out.hash_( &h.pal_speed0, sizeof(h.pal_speed) );
+	out.hash_( &h.speed_flags, sizeof(h.speed_flags) );
+	out.hash_( &h.chip_flags, sizeof(h.chip_flags) );
+	out.hash_( &h.unused0, sizeof(h.unused) );
+
+	out.hash_( data, data_size );
+}
+
+blargg_err_t Nsf_Emu::track_info_( track_info_t* out, int ) const
+{
+	copy_nsf_fields( header(), out );
+	return blargg_ok;
+}
+
+static blargg_err_t check_nsf_header( Nsf_Emu::header_t const& h )
+{
+	if ( !h.valid_tag() )
+		return blargg_err_file_type;
+	return blargg_ok;
+}
+
+struct Nsf_File : Gme_Info_
+{
+	Nsf_Emu::header_t const* h;
+	
+	Nsf_File() { set_type( gme_nsf_type ); }
+
+	blargg_err_t load_mem_( byte const begin , int size )
+	{
+		h = ( Nsf_Emu::header_t const* ) begin;
+
+		if ( h->vers != 1 )
+			set_warning( "Unknown file version" );
+		
+		int unsupported_chips = ~Nsf_Core::chips_mask;
+		#if NSF_EMU_NO_VRC7
+			unsupported_chips |= Nsf_Emu::header_t::vrc7_mask;
+		#endif
+		if ( h->chip_flags & unsupported_chips )
+			set_warning( "Uses unsupported audio expansion hardware" );
+		
+		set_track_count( h->track_count );
+		return check_nsf_header( *h );
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int ) const
+	{
+		copy_nsf_fields( *h, out );
+		return blargg_ok;
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		hash_nsf_file( *h, file_begin() + h->size, file_end() - file_begin() - h->size, out );
+		return blargg_ok;
+	}
+};
+
+static Music_Emu* new_nsf_emu () { return BLARGG_NEW Nsf_Emu ; }
+static Music_Emu* new_nsf_file() { return BLARGG_NEW Nsf_File; }
+
+gme_type_t_ const gme_nsf_type 1 = {{ "Nintendo NES", 0, &new_nsf_emu, &new_nsf_file, "NSF", 1 }};
+
+// Setup
+
+void Nsf_Emu::set_tempo_( double t )
+{
+	core_.set_tempo( t );
+}
+
+void Nsf_Emu::append_voices( const char* const names , int const types , int count )
+{
+	assert( voice_count_ + count < max_voices );
+	for ( int i = 0; i < count; i++ )
+	{
+		voice_names_ voice_count_ + i = names i;
+		voice_types_ voice_count_ + i = types i;
+	}
+	voice_count_ += count;
+	set_voice_count( voice_count_ );
+	set_voice_types( voice_types_ );
+}
+
+blargg_err_t Nsf_Emu::init_sound()
+{
+	voice_count_ = 0;
+	set_voice_names( voice_names_ );
+	
+	{
+		int const count = Nes_Apu::osc_count;
+		static const char* const names Nes_Apu::osc_count = {
+			"Square 1", "Square 2", "Triangle", "Noise", "DMC"
+		};
+		static int const types count = {
+			wave_type+1, wave_type+2, mixed_type+1, noise_type+0, mixed_type+1
+		};
+		append_voices( names, types, count );
+	}
+	
+	// Make adjusted_gain * 0.75 = 1.0 so usual APU and one sound chip uses 1.0
+	double adjusted_gain = 1.0 / 0.75 * gain();
+	
+#if !NSF_EMU_APU_ONLY
+	// TODO: order of chips here must match that in set_voice()
+	
+	if ( core_.vrc6_apu() )
+	{
+		int const count = Nes_Vrc6_Apu::osc_count;
+		static const char* const names count = {
+			"Square 3", "Square 4", "Saw Wave"
+		};
+		static int const types count = {
+			wave_type+3, wave_type+4, wave_type+5,
+		};
+		append_voices( names, types, count );
+		adjusted_gain *= 0.75;
+	}
+	
+	if ( core_.fme7_apu() )
+	{
+		int const count = Nes_Fme7_Apu::osc_count;
+		static const char* const names count = {
+			"Square 3", "Square 4", "Square 5"
+		};
+		static int const types count = {
+			wave_type+3, wave_type+4, wave_type+5,
+		};
+		append_voices( names, types, count );
+		adjusted_gain *= 0.75;
+	}
+	
+	if ( core_.mmc5_apu() )
+	{
+		int const count = Nes_Mmc5_Apu::osc_count;
+		static const char* const names count = {
+			"Square 3", "Square 4", "PCM"
+		};
+		static int const types count = {
+			wave_type+3, wave_type+4, mixed_type+2
+		};
+		append_voices( names, types, count );
+		adjusted_gain *= 0.75;
+	}
+	
+	if ( core_.fds_apu() )
+	{
+		int const count = Nes_Fds_Apu::osc_count;
+		static const char* const names count = {
+			"FM"
+		};
+		static int const types count = {
+			wave_type+0
+		};
+		append_voices( names, types, count );
+		adjusted_gain *= 0.75;
+	}
+	
+	if ( core_.namco_apu() )
+	{
+		int const count = Nes_Namco_Apu::osc_count;
+		static const char* const names count = {
+			"Wave 1", "Wave 2", "Wave 3", "Wave 4",
+			"Wave 5", "Wave 6", "Wave 7", "Wave 8"
+		};
+		static int const types count = {
+			wave_type+3, wave_type+4, wave_type+5, wave_type+ 6,
+			wave_type+7, wave_type+8, wave_type+9, wave_type+10,
+		};
+		append_voices( names, types, count );
+		adjusted_gain *= 0.75;
+	}
+	
+	if ( core_.vrc7_apu() )
+	{
+		int const count = Nes_Vrc7_Apu::osc_count;
+		static const char* const names count = {
+			"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6"
+		};
+		static int const types count = {
+			wave_type+3, wave_type+4, wave_type+5, wave_type+6,
+			wave_type+7, wave_type+8
+		};
+		append_voices( names, types, count );
+		adjusted_gain *= 0.75;
+	}
+	
+	if ( core_.vrc7_apu() ) core_.vrc7_apu() ->volume( adjusted_gain );
+	if ( core_.namco_apu() ) core_.namco_apu()->volume( adjusted_gain );
+	if ( core_.vrc6_apu() ) core_.vrc6_apu() ->volume( adjusted_gain );
+	if ( core_.fme7_apu() ) core_.fme7_apu() ->volume( adjusted_gain );
+	if ( core_.mmc5_apu() ) core_.mmc5_apu() ->volume( adjusted_gain );
+	if ( core_.fds_apu() ) core_.fds_apu() ->volume( adjusted_gain );
+#endif
+	
+	if ( adjusted_gain > gain() )
+		adjusted_gain = gain(); // only occurs if no other sound chips
+	
+	core_.nes_apu()->volume( adjusted_gain );
+	
+	return blargg_ok;
+}
+
+blargg_err_t Nsf_Emu::load_( Data_Reader& in )
+{
+	RETURN_ERR( core_.load( in ) );
+	set_track_count( header().track_count );
+	RETURN_ERR( check_nsf_header( header() ) );
+	set_warning( core_.warning() );
+	RETURN_ERR( init_sound() );
+	set_tempo( tempo() );
+	return setup_buffer( (int) (header().clock_rate() + 0.5) );
+}
+
+void Nsf_Emu::update_eq( blip_eq_t const& eq )
+{
+	core_.nes_apu()->treble_eq( eq );
+	
+	#if !NSF_EMU_APU_ONLY
+	{
+		if ( core_.namco_apu() ) core_.namco_apu()->treble_eq( eq );
+		if ( core_.vrc6_apu() ) core_.vrc6_apu() ->treble_eq( eq );
+		if ( core_.fme7_apu() ) core_.fme7_apu() ->treble_eq( eq );
+		if ( core_.mmc5_apu() ) core_.mmc5_apu() ->treble_eq( eq );
+		if ( core_.fds_apu() ) core_.fds_apu() ->treble_eq( eq );
+		if ( core_.vrc7_apu() ) core_.vrc7_apu() ->treble_eq( eq );
+	}
+	#endif
+}
+
+void Nsf_Emu::set_voice( int i, Blip_Buffer* buf, Blip_Buffer*, Blip_Buffer* )
+{
+	#define HANDLE_CHIP( chip ) \
+		if ( chip && (i -= chip->osc_count) < 0 )\
+		{\
+			chip->set_output( i + chip->osc_count, buf );\
+			return;\
+		}\
+	
+	HANDLE_CHIP( core_.nes_apu() );
+	
+	#if !NSF_EMU_APU_ONLY
+	{
+		// TODO: order of chips here must match that in init_sound()
+		HANDLE_CHIP( core_.vrc6_apu() );
+		HANDLE_CHIP( core_.fme7_apu() );
+		HANDLE_CHIP( core_.mmc5_apu() );
+		HANDLE_CHIP( core_.fds_apu() );
+		HANDLE_CHIP( core_.namco_apu() );
+		HANDLE_CHIP( core_.vrc7_apu() );
+	}
+	#endif
+}
+
+blargg_err_t Nsf_Emu::start_track_( int track )
+{
+	RETURN_ERR( Classic_Emu::start_track_( track ) );
+	return core_.start_track( track );
+}
+
+blargg_err_t Nsf_Emu::run_clocks( blip_time_t& duration, int )
+{
+	core_.end_frame( duration );
+	const char* w = core_.warning();
+	if ( w )
+		set_warning( w );
+	return blargg_ok;
+}
+
+blargg_err_t Nsf_Emu::hash_( Hash_Function& out ) const
+{
+	hash_nsf_file( header(), core_.rom_().begin(), core_.rom_().file_size(), out );
+	return blargg_ok;
+}
\ No newline at end of file

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Emu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Impl.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Impl.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Impl.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsf_Impl.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsfe_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsfe_Emu.cpp Changed

@@ -1,321 +1,329 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Nsfe_Emu.h"
-
-#include "blargg_endian.h"
-#include <ctype.h>
-
-/* Copyright (C) 2005-2009 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"
-
-Nsfe_Info::Nsfe_Info() { playlist_disabled = false; }
-
-Nsfe_Info::~Nsfe_Info() { }
-
-inline void Nsfe_Info::unload()
-{
-	track_name_data.clear();
-	track_names.clear();
-	playlist.clear();
-	track_times.clear();
-}
-
-// TODO: if no playlist, treat as if there is a playlist that is just 1,2,3,4,5... ?
-void Nsfe_Info::disable_playlist( bool b )
-{
-	playlist_disabled = b;
-	info.track_count = playlist.size();
-	if ( !info.track_count || playlist_disabled )
-		info.track_count = actual_track_count_;
-}
-
-int Nsfe_Info::remap_track( int track ) const
-{
-	if ( !playlist_disabled && (unsigned) track < playlist.size() )
-		track = playlist track;
-	return track;
-}
-
-// Read multiple strings and separate into individual strings
-static blargg_err_t read_strs( Data_Reader& in, int size, blargg_vector<char>& chars,
-		blargg_vector<const char*>& strs )
-{
-	RETURN_ERR( chars.resize( size + 1 ) );
-	chars size = 0; // in case last string doesn't have terminator
-	RETURN_ERR( in.read( &chars 0, size ) );
-	
-	RETURN_ERR( strs.resize( 128 ) );
-	int count = 0;
-	for ( int i = 0; i < size; i++ )
-	{
-		if ( (int) strs.size() <= count )
-			RETURN_ERR( strs.resize( count * 2 ) );
-		strs count++ = &chars i;
-		while ( i < size && chars i )
-			i++;
-	}
-	
-	return strs.resize( count );
-}
-
-// Copy in to out, where out has out_max characters allocated. Truncate to
-// out_max - 1 characters.
-static void copy_str( const char in , char out , int out_max )
-{
-	out out_max - 1 = 0;
-	strncpy( out, in, out_max - 1 );
-}
-
-struct nsfe_info_t
-{
-	byte load_addr 2;
-	byte init_addr 2;
-	byte play_addr 2;
-	byte speed_flags;
-	byte chip_flags;
-	byte track_count;
-	byte first_track;
-	byte unused 6;
-};
-
-blargg_err_t Nsfe_Info::load( Data_Reader& in, Nsfe_Emu* nsf_emu )
-{
-	int const nsfe_info_size = 16;
-	assert( offsetof (nsfe_info_t,unused 6) == nsfe_info_size );
-	
-	// check header
-	byte signature 4;
-	blargg_err_t err = in.read( signature, sizeof signature );
-	if ( err )
-		return (blargg_is_err_type( err, blargg_err_file_eof ) ? blargg_err_file_type : err);
-	if ( memcmp( signature, "NSFE", 4 ) )
-		return blargg_err_file_type;
-	
-	// free previous info
-	track_name_data.clear();
-	track_names.clear();
-	playlist.clear();
-	track_times.clear();
-	
-	// default nsf header
-	static const Nsf_Emu::header_t base_header =
-	{
-		{'N','E','S','M','\x1A'},// tag
-		1, // version
-		1, 1, // track count, first track
-		{0,0},{0,0},{0,0}, // addresses
-		"","","", // strings
-		{0x1A, 0x41}, // NTSC rate
-		{0,0,0,0,0,0,0,0}, // banks
-		{0x20, 0x4E}, // PAL rate
-		0, 0, // flags
-		{0,0,0,0} // unused
-	};
-	Nsf_Emu::header_t& header = info;
-	header = base_header;
-	
-	// parse tags
-	int phase = 0;
-	while ( phase != 3 )
-	{
-		// read size and tag
-		byte block_header 2 4;
-		RETURN_ERR( in.read( block_header, sizeof block_header ) );
-		int size = get_le32( block_header 0 );
-		int tag = get_le32( block_header 1 );
-		
-		//dprintf( "tag: %c%c%c%c\n", char(tag), char(tag>>8), char(tag>>16), char(tag>>24) );
-		
-		switch ( tag )
-		{
-			case BLARGG_4CHAR('O','F','N','I'): {
-				check( phase == 0 );
-				if ( size < 8 )
-					return blargg_err_file_corrupt;
-				
-				nsfe_info_t finfo;
-				finfo.track_count = 1;
-				finfo.first_track = 0;
-				
-				RETURN_ERR( in.read( &finfo, min( size, (int) nsfe_info_size ) ) );
-				if ( size > nsfe_info_size )
-					RETURN_ERR( in.skip( size - nsfe_info_size ) );
-				phase = 1;
-				info.speed_flags = finfo.speed_flags;
-				info.chip_flags = finfo.chip_flags;
-				info.track_count = finfo.track_count;
-				this->actual_track_count_ = finfo.track_count;
-				info.first_track = finfo.first_track;
-				memcpy( info.load_addr, finfo.load_addr, 2 * 3 );
-				break;
-			}
-			
-			case BLARGG_4CHAR('K','N','A','B'):
-				if ( size > (int) sizeof info.banks )
-					return blargg_err_file_corrupt;
-				RETURN_ERR( in.read( info.banks, size ) );
-				break;
-			
-			case BLARGG_4CHAR('h','t','u','a'): {
-				blargg_vector<char> chars;
-				blargg_vector<const char*> strs;
-				RETURN_ERR( read_strs( in, size, chars, strs ) );
-				int n = strs.size();
-				
-				if ( n > 3 )
-					copy_str( strs 3, info.dumper, sizeof info.dumper );
-				
-				if ( n > 2 )
-					copy_str( strs 2, info.copyright, sizeof info.copyright );
-				
-				if ( n > 1 )
-					copy_str( strs 1, info.author, sizeof info.author );
-				
-				if ( n > 0 )
-					copy_str( strs 0, info.game, sizeof info.game );
-				
-				break;
-			}
-			
-			case BLARGG_4CHAR('e','m','i','t'):
-				RETURN_ERR( track_times.resize( size / 4 ) );
-				RETURN_ERR( in.read( track_times.begin(), track_times.size() * 4 ) );
-				break;
-			
-			case BLARGG_4CHAR('l','b','l','t'):
-				RETURN_ERR( read_strs( in, size, track_name_data, track_names ) );
-				break;
-			
-			case BLARGG_4CHAR('t','s','l','p'):
-				RETURN_ERR( playlist.resize( size ) );
-				RETURN_ERR( in.read( &playlist 0, size ) );
-				break;
-			
-			case BLARGG_4CHAR('A','T','A','D'): {
-				check( phase == 1 );
-				phase = 2;
-				if ( !nsf_emu )
-				{
-					RETURN_ERR( in.skip( size ) );
-				}
-				else
-				{
-					Subset_Reader sub( &in, size ); // limit emu to nsf data
-					Remaining_Reader rem( &header, header.size, &sub );
-					RETURN_ERR( nsf_emu->Nsf_Emu::load_( rem ) );
-					check( rem.remain() == 0 );
-				}
-				break;
-			}
-			
-			case BLARGG_4CHAR('D','N','E','N'):
-				check( phase == 2 );
-				phase = 3;
-				break;
-			
-			default:
-				// tags that can be skipped start with a lowercase character
-				check( islower( (tag >> 24) & 0xFF ) );
-				RETURN_ERR( in.skip( size ) );
-				break;
-		}
-	}
-	
-	return blargg_ok;
-}
-
-blargg_err_t Nsfe_Info::track_info_( track_info_t* out, int track ) const
-{
-	int remapped = remap_track( track );
-	if ( (unsigned) remapped < track_times.size() )
-	{
-		int length = (BOOST::int32_t) get_le32( track_times remapped );
-		if ( length > 0 )
-			out->length = length;
-	}
-	if ( (unsigned) remapped < track_names.size() )
-		Gme_File::copy_field_( out->song, track_names remapped );
-	
-	GME_COPY_FIELD( info, out, game );
-	GME_COPY_FIELD( info, out, author );
-	GME_COPY_FIELD( info, out, copyright );
-	GME_COPY_FIELD( info, out, dumper );
-	return blargg_ok;
-}
-
-Nsfe_Emu::Nsfe_Emu()
-{
-	set_type( gme_nsfe_type );
-}
-
-Nsfe_Emu::~Nsfe_Emu() { }
-
-void Nsfe_Emu::unload()
-{
-	info.unload();
-	Nsf_Emu::unload();
-}
-
-blargg_err_t Nsfe_Emu::track_info_( track_info_t* out, int track ) const
-{
-	return info.track_info_( out, track );
-}
-
-struct Nsfe_File : Gme_Info_
-{
-	Nsfe_Info info;
-	
-	Nsfe_File() { set_type( gme_nsfe_type ); }
-	
-	blargg_err_t load_( Data_Reader& in )
-	{
-		RETURN_ERR( info.load( in, 0 ) );
-		info.disable_playlist( false );
-		set_track_count( info.info.track_count );
-		return blargg_ok;
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int track ) const
-	{
-		return info.track_info_( out, track );
-	}
-};
-
-static Music_Emu* new_nsfe_emu () { return BLARGG_NEW Nsfe_Emu ; }
-static Music_Emu* new_nsfe_file() { return BLARGG_NEW Nsfe_File; }
-
-gme_type_t_ const gme_nsfe_type 1 = {{ "Nintendo NES", 0, &new_nsfe_emu, &new_nsfe_file, "NSFE", 1 }};
-
-blargg_err_t Nsfe_Emu::load_( Data_Reader& in )
-{
-	RETURN_ERR( info.load( in, this ) );
-	disable_playlist_( false );
-	return blargg_ok;
-}
-
-void Nsfe_Emu::disable_playlist_( bool b )
-{
-	info.disable_playlist( b );
-	set_track_count( info.info.track_count );
-}
-
-void Nsfe_Emu::clear_playlist_()
-{
-	disable_playlist_( true );
-	Nsf_Emu::clear_playlist_();
-}
-
-blargg_err_t Nsfe_Emu::start_track_( int track )
-{
-	return Nsf_Emu::start_track_( info.remap_track( track ) );
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Nsfe_Emu.h"
+
+#include "blargg_endian.h"
+#include <ctype.h>
+
+/* Copyright (C) 2005-2009 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"
+
+Nsfe_Info::Nsfe_Info() { playlist_disabled = false; }
+
+Nsfe_Info::~Nsfe_Info() { }
+
+inline void Nsfe_Info::unload()
+{
+	data.clear();
+	track_name_data.clear();
+	track_names.clear();
+	playlist.clear();
+	track_times.clear();
+}
+
+// TODO: if no playlist, treat as if there is a playlist that is just 1,2,3,4,5... ?
+void Nsfe_Info::disable_playlist( bool b )
+{
+	playlist_disabled = b;
+	info.track_count = playlist.size();
+	if ( !info.track_count || playlist_disabled )
+		info.track_count = actual_track_count_;
+}
+
+int Nsfe_Info::remap_track( int track ) const
+{
+	if ( !playlist_disabled && (unsigned) track < playlist.size() )
+		track = playlist track;
+	return track;
+}
+
+// Read multiple strings and separate into individual strings
+static blargg_err_t read_strs( Data_Reader& in, int size, blargg_vector<char>& chars,
+		blargg_vector<const char*>& strs )
+{
+	RETURN_ERR( chars.resize( size + 1 ) );
+	chars size = 0; // in case last string doesn't have terminator
+	RETURN_ERR( in.read( &chars 0, size ) );
+	
+	RETURN_ERR( strs.resize( 128 ) );
+	int count = 0;
+	for ( int i = 0; i < size; i++ )
+	{
+		if ( (int) strs.size() <= count )
+			RETURN_ERR( strs.resize( count * 2 ) );
+		strs count++ = &chars i;
+		while ( i < size && chars i )
+			i++;
+	}
+	
+	return strs.resize( count );
+}
+
+// Copy in to out, where out has out_max characters allocated. Truncate to
+// out_max - 1 characters.
+static void copy_str( const char in , char out , int out_max )
+{
+	out out_max - 1 = 0;
+	strncpy( out, in, out_max - 1 );
+}
+
+struct nsfe_info_t
+{
+	byte load_addr 2;
+	byte init_addr 2;
+	byte play_addr 2;
+	byte speed_flags;
+	byte chip_flags;
+	byte track_count;
+	byte first_track;
+	byte unused 6;
+};
+
+blargg_err_t Nsfe_Info::load( Data_Reader& in, Nsfe_Emu* nsf_emu )
+{
+	int const nsfe_info_size = 16;
+	assert( offsetof (nsfe_info_t,unused 6) == nsfe_info_size );
+	
+	// check header
+	byte signature 4;
+	blargg_err_t err = in.read( signature, sizeof signature );
+	if ( err )
+		return (blargg_is_err_type( err, blargg_err_file_eof ) ? blargg_err_file_type : err);
+	if ( memcmp( signature, "NSFE", 4 ) )
+		return blargg_err_file_type;
+	
+	// free previous info
+	track_name_data.clear();
+	track_names.clear();
+	playlist.clear();
+	track_times.clear();
+	
+	// default nsf header
+	static const Nsf_Emu::header_t base_header =
+	{
+		{'N','E','S','M','\x1A'},// tag
+		1, // version
+		1, 1, // track count, first track
+		{0,0},{0,0},{0,0}, // addresses
+		"","","", // strings
+		{0x1A, 0x41}, // NTSC rate
+		{0,0,0,0,0,0,0,0}, // banks
+		{0x20, 0x4E}, // PAL rate
+		0, 0, // flags
+		{0,0,0,0} // unused
+	};
+	Nsf_Emu::header_t& header = info;
+	header = base_header;
+	
+	// parse tags
+	int phase = 0;
+	while ( phase != 3 )
+	{
+		// read size and tag
+		byte block_header 2 4;
+		RETURN_ERR( in.read( block_header, sizeof block_header ) );
+		int size = get_le32( block_header 0 );
+		int tag = get_le32( block_header 1 );
+		
+		//dprintf( "tag: %c%c%c%c\n", char(tag), char(tag>>8), char(tag>>16), char(tag>>24) );
+		
+		switch ( tag )
+		{
+			case BLARGG_4CHAR('O','F','N','I'): {
+				check( phase == 0 );
+				if ( size < 8 )
+					return blargg_err_file_corrupt;
+				
+				nsfe_info_t finfo;
+				finfo.track_count = 1;
+				finfo.first_track = 0;
+				
+				RETURN_ERR( in.read( &finfo, min( size, (int) nsfe_info_size ) ) );
+				if ( size > nsfe_info_size )
+					RETURN_ERR( in.skip( size - nsfe_info_size ) );
+				phase = 1;
+				info.speed_flags = finfo.speed_flags;
+				info.chip_flags = finfo.chip_flags;
+				info.track_count = finfo.track_count;
+				this->actual_track_count_ = finfo.track_count;
+				info.first_track = finfo.first_track;
+				memcpy( info.load_addr, finfo.load_addr, 2 * 3 );
+				break;
+			}
+			
+			case BLARGG_4CHAR('K','N','A','B'):
+				if ( size > (int) sizeof info.banks )
+					return blargg_err_file_corrupt;
+				RETURN_ERR( in.read( info.banks, size ) );
+				break;
+			
+			case BLARGG_4CHAR('h','t','u','a'): {
+				blargg_vector<char> chars;
+				blargg_vector<const char*> strs;
+				RETURN_ERR( read_strs( in, size, chars, strs ) );
+				int n = strs.size();
+				
+				if ( n > 3 )
+					copy_str( strs 3, info.dumper, sizeof info.dumper );
+				
+				if ( n > 2 )
+					copy_str( strs 2, info.copyright, sizeof info.copyright );
+				
+				if ( n > 1 )
+					copy_str( strs 1, info.author, sizeof info.author );
+				
+				if ( n > 0 )
+					copy_str( strs 0, info.game, sizeof info.game );
+				
+				break;
+			}
+			
+			case BLARGG_4CHAR('e','m','i','t'):
+				RETURN_ERR( track_times.resize( size / 4 ) );
+				RETURN_ERR( in.read( track_times.begin(), track_times.size() * 4 ) );
+				break;
+			
+			case BLARGG_4CHAR('l','b','l','t'):
+				RETURN_ERR( read_strs( in, size, track_name_data, track_names ) );
+				break;
+			
+			case BLARGG_4CHAR('t','s','l','p'):
+				RETURN_ERR( playlist.resize( size ) );
+				RETURN_ERR( in.read( &playlist 0, size ) );
+				break;
+			
+			case BLARGG_4CHAR('A','T','A','D'): {
+				check( phase == 1 );
+				phase = 2;
+				if ( !nsf_emu )
+				{
+					RETURN_ERR( data.resize( size ) );
+					RETURN_ERR( in.read( data.begin(), size ) );
+				}
+				else
+				{
+					Subset_Reader sub( &in, size ); // limit emu to nsf data
+					Remaining_Reader rem( &header, header.size, &sub );
+					RETURN_ERR( nsf_emu->Nsf_Emu::load_( rem ) );
+					check( rem.remain() == 0 );
+				}
+				break;
+			}
+			
+			case BLARGG_4CHAR('D','N','E','N'):
+				check( phase == 2 );
+				phase = 3;
+				break;
+			
+			default:
+				// tags that can be skipped start with a lowercase character
+				check( islower( (tag >> 24) & 0xFF ) );
+				RETURN_ERR( in.skip( size ) );
+				break;
+		}
+	}
+	
+	return blargg_ok;
+}
+
+blargg_err_t Nsfe_Info::track_info_( track_info_t* out, int track ) const
+{
+	int remapped = remap_track( track );
+	if ( (unsigned) remapped < track_times.size() )
+	{
+		int length = (BOOST::int32_t) get_le32( track_times remapped );
+		if ( length > 0 )
+			out->length = length;
+	}
+	if ( (unsigned) remapped < track_names.size() )
+		Gme_File::copy_field_( out->song, track_names remapped );
+	
+	GME_COPY_FIELD( info, out, game );
+	GME_COPY_FIELD( info, out, author );
+	GME_COPY_FIELD( info, out, copyright );
+	GME_COPY_FIELD( info, out, dumper );
+	return blargg_ok;
+}
+
+Nsfe_Emu::Nsfe_Emu()
+{
+	set_type( gme_nsfe_type );
+}
+
+Nsfe_Emu::~Nsfe_Emu() { }
+
+void Nsfe_Emu::unload()
+{
+	info.unload();
+	Nsf_Emu::unload();
+}
+
+blargg_err_t Nsfe_Emu::track_info_( track_info_t* out, int track ) const
+{
+	return info.track_info_( out, track );
+}
+
+struct Nsfe_File : Gme_Info_
+{
+	Nsfe_Info info;
+	
+	Nsfe_File() { set_type( gme_nsfe_type ); }
+	
+	blargg_err_t load_( Data_Reader& in )
+	{
+		RETURN_ERR( info.load( in, 0 ) );
+		info.disable_playlist( false );
+		set_track_count( info.info.track_count );
+		return blargg_ok;
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int track ) const
+	{
+		return info.track_info_( out, track );
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		hash_nsf_file( info.info, info.data.begin(), info.data.end() - info.data.begin(), out );
+		return blargg_ok;
+	}
+};
+
+static Music_Emu* new_nsfe_emu () { return BLARGG_NEW Nsfe_Emu ; }
+static Music_Emu* new_nsfe_file() { return BLARGG_NEW Nsfe_File; }
+
+gme_type_t_ const gme_nsfe_type 1 = {{ "Nintendo NES", 0, &new_nsfe_emu, &new_nsfe_file, "NSFE", 1 }};
+
+blargg_err_t Nsfe_Emu::load_( Data_Reader& in )
+{
+	RETURN_ERR( info.load( in, this ) );
+	disable_playlist_( false );
+	return blargg_ok;
+}
+
+void Nsfe_Emu::disable_playlist_( bool b )
+{
+	info.disable_playlist( b );
+	set_track_count( info.info.track_count );
+}
+
+void Nsfe_Emu::clear_playlist_()
+{
+	disable_playlist_( true );
+	Nsf_Emu::clear_playlist_();
+}
+
+blargg_err_t Nsfe_Emu::start_track_( int track )
+{
+	return Nsf_Emu::start_track_( info.remap_track( track ) );
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsfe_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Nsfe_Emu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Opl_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Opl_Apu.cpp Changed

@@ -1,270 +1,284 @@
-#include "Opl_Apu.h"
-
-#include "blargg_source.h"
-
-#include "ym2413.h"
-#include "fmopl.h"
-
-Opl_Apu::Opl_Apu() { opl = 0; opl_memory = 0; }
-
-blargg_err_t Opl_Apu::init( long clock, long rate, blip_time_t period, type_t type )
-{
-	type_ = type;
-	clock_ = clock;
-	rate_ = rate;
-	period_ = period;
-	set_output( 0, 0 );
-	volume( 1.0 );
-	switch (type)
-	{
-	case type_opll:
-	case type_msxmusic:
-	case type_smsfmunit:
-		opl = ym2413_init( clock, rate, 0 );
-		break;
-
-	case type_vrc7:
-		opl = ym2413_init( clock, rate, 1 );
-		break;
-
-	case type_opl:
-		opl = ym3526_init( clock, rate );
-		break;
-
-	case type_msxaudio:
-		//logfile = fopen("c:\\temp\\msxaudio.log", "wb");
-		opl = y8950_init( clock, rate );
-		opl_memory = malloc( 32768 );
-		y8950_set_delta_t_memory( opl, opl_memory, 32768 );
-		break;
-
-	case type_opl2:
-		opl = ym3812_init( clock, rate );
-		break;
-	}
-	reset();
-	return 0;
-}
-
-Opl_Apu::~Opl_Apu()
-{
-	if (opl)
-	{
-		switch (type_)
-		{
-		case type_opll:
-		case type_msxmusic:
-		case type_smsfmunit:
-		case type_vrc7:
-			ym2413_shutdown( opl );
-			break;
-
-		case type_opl:
-			ym3526_shutdown( opl );
-			break;
-
-		case type_msxaudio:
-			y8950_shutdown( opl );
-			free( opl_memory );
-			//fclose( logfile );
-			break;
-
-		case type_opl2:
-			ym3812_shutdown( opl );
-			break;
-		}
-	}
-}
-
-void Opl_Apu::reset()
-{
-	addr = 0;
-	next_time = 0;
-	last_amp = 0;
-
-	switch (type_)
-	{
-	case type_opll:
-	case type_msxmusic:
-	case type_smsfmunit:
-	case type_vrc7:
-		ym2413_reset_chip( opl );
-		break;
-
-	case type_opl:
-		ym3526_reset_chip( opl );
-		break;
-
-	case type_msxaudio:
-		y8950_reset_chip( opl );
-		break;
-
-	case type_opl2:
-		ym3812_reset_chip( opl );
-		break;
-	}
-}
-
-void Opl_Apu::write_data( blip_time_t time, int data )
-{
-	run_until( time );
-	switch (type_)
-	{
-	case type_opll:
-	case type_msxmusic:
-	case type_smsfmunit:
-	case type_vrc7:
-		ym2413_write( opl, 0, addr );
-		ym2413_write( opl, 1, data );
-		break;
-
-	case type_opl:
-		ym3526_write( opl, 0, addr );
-		ym3526_write( opl, 1, data );
-		break;
-
-	case type_msxaudio:
-		/*if ( addr >= 7 && addr <= 7 + 11 )
-		{
-			unsigned char temp 2 = { addr - 7, data };
-			fwrite( &temp, 1, 2, logfile );
-		}*/
-		y8950_write( opl, 0, addr );
-		y8950_write( opl, 1, data );
-		break;
-
-	case type_opl2:
-		ym3812_write( opl, 0, addr );
-		ym3812_write( opl, 1, data );
-		break;
-	}
-}
-
-int Opl_Apu::read( blip_time_t time, int port )
-{
-	run_until( time );
-	switch (type_)
-	{
-	case type_opll:
-	case type_msxmusic:
-	case type_smsfmunit:
-	case type_vrc7:
-		return ym2413_read( opl, port );
-
-	case type_opl:
-		return ym3526_read( opl, port );
-
-	case type_msxaudio:
-		{
-			int ret = y8950_read( opl, port );
-			/*unsigned char temp 2 = { port + 0x80, ret };
-			fwrite( &temp, 1, 2, logfile );*/
-			return ret;
-		}
-
-	case type_opl2:
-		return ym3812_read( opl, port );
-	}
-
-	return 0;
-}
-
-void Opl_Apu::end_frame( blip_time_t time )
-{
-	run_until( time );
-	next_time -= time;
-
-	if ( output_ )
-		output_->set_modified();
-}
-
-void Opl_Apu::run_until( blip_time_t end_time )
-{
-	if ( end_time > next_time )
-	{
-		blip_time_t time_delta = end_time - next_time;
-		blip_time_t time = next_time;
-		unsigned count = time_delta / period_ + 1;
-		switch (type_)
-		{
-		case type_opll:
-		case type_msxmusic:
-		case type_smsfmunit:
-		case type_vrc7:
-			{
-				SAMP bufMO 1024 ;
-				SAMP bufRO 1024 ;
-				SAMP * buffers2 = { bufMO, bufRO };
-
-				while ( count > 0 )
-				{
-					unsigned todo = count;
-					if ( todo > 1024 ) todo = 1024;
-					ym2413_update_one( opl, buffers, todo );
-
-					if ( output_ )
-					{
-						int last_amp = this->last_amp;
-						for ( unsigned i = 0; i < todo; i++ )
-						{
-							int amp = bufMO i + bufRO i;
-							int delta = amp - last_amp;
-							if ( delta )
-							{
-								last_amp = amp;
-								synth.offset_inline( time, delta, output_ );
-							}
-							time += period_;
-						}
-						this->last_amp = last_amp;
-					}
-					else time += period_ * todo;
-
-					count -= todo;
-				}
-			}
-			break;
-
-		case type_opl:
-		case type_msxaudio:
-		case type_opl2:
-			{
-				OPLSAMPLE buffer 1024 ;
-
-				while ( count > 0 )
-				{
-					unsigned todo = count;
-					if ( todo > 1024 ) todo = 1024;
-					switch (type_)
-					{
-					case type_opl: ym3526_update_one( opl, buffer, todo ); break;
-					case type_msxaudio: y8950_update_one( opl, buffer, todo ); break;
-					case type_opl2: ym3812_update_one( opl, buffer, todo ); break;
-					}
-
-					if ( output_ )
-					{
-						int last_amp = this->last_amp;
-						for ( unsigned i = 0; i < todo; i++ )
-						{
-							int amp = buffer i;
-							int delta = amp - last_amp;
-							if ( delta )
-							{
-								last_amp = amp;
-								synth.offset_inline( time, delta, output_ );
-							}
-							time += period_;
-						}
-						this->last_amp = last_amp;
-					}
-					else time += period_ * todo;
-
-					count -= todo;
-				}
-			}
-			break;
-		}
-		next_time = time;
-	}
+#include "Opl_Apu.h"
+
+#include "blargg_source.h"
+
+extern "C" {
+#include "../vgmplay/VGMPlay/chips/mamedef.h"
+#include "../vgmplay/VGMPlay/chips/emu2413.h"
+#include "../vgmplay/VGMPlay/chips/fmopl.h"
+}
+
+static unsigned char vrc7_inst(16 + 3) * 8 =
+{
+#include "../vgmplay/VGMPlay/chips/vrc7tone.h"
+};
+
+Opl_Apu::Opl_Apu() { opl = 0; opl_memory = 0; }
+
+blargg_err_t Opl_Apu::init( long clock, long rate, blip_time_t period, type_t type )
+{
+	type_ = type;
+	clock_ = clock;
+	rate_ = rate;
+	period_ = period;
+	set_output( 0, 0 );
+	volume( 1.0 );
+	switch (type)
+	{
+	case type_opll:
+	case type_msxmusic:
+	case type_smsfmunit:
+		opl = OPLL_new( (uint32_t) clock, (uint32_t) rate );
+ OPLL_SetChipMode( (OPLL *) opl, 0);
+		break;
+
+	case type_vrc7:
+		opl = OPLL_new( (uint32_t) clock, (uint32_t) rate );
+ OPLL_SetChipMode((OPLL *) opl, 1 );
+ OPLL_setPatch((OPLL *) opl, vrc7_inst);
+		break;
+
+	case type_opl:
+		opl = ym3526_init( (uint32_t) clock, (uint32_t) rate );
+		break;
+
+	case type_msxaudio:
+		//logfile = fopen("c:\\temp\\msxaudio.log", "wb");
+		opl = y8950_init( (uint32_t) clock, (uint32_t) rate );
+		opl_memory = malloc( 32768 );
+		y8950_set_delta_t_memory( opl, opl_memory, 32768 );
+		break;
+
+	case type_opl2:
+		opl = ym3812_init( (uint32_t) clock, (uint32_t) rate );
+		break;
+	}
+	reset();
+	return 0;
+}
+
+Opl_Apu::~Opl_Apu()
+{
+	if (opl)
+	{
+		switch (type_)
+		{
+		case type_opll:
+		case type_msxmusic:
+		case type_smsfmunit:
+		case type_vrc7:
+			OPLL_delete( (OPLL *) opl );
+			break;
+
+		case type_opl:
+			ym3526_shutdown( opl );
+			break;
+
+		case type_msxaudio:
+			y8950_shutdown( opl );
+			free( opl_memory );
+			//fclose( logfile );
+			break;
+
+		case type_opl2:
+			ym3812_shutdown( opl );
+			break;
+		}
+	}
+}
+
+void Opl_Apu::reset()
+{
+	addr = 0;
+	next_time = 0;
+	last_amp = 0;
+
+	switch (type_)
+	{
+	case type_opll:
+	case type_msxmusic:
+	case type_smsfmunit:
+	case type_vrc7:
+		OPLL_reset( (OPLL *) opl );
+		break;
+
+	case type_opl:
+		ym3526_reset_chip( opl );
+		break;
+
+	case type_msxaudio:
+		y8950_reset_chip( opl );
+		break;
+
+	case type_opl2:
+		ym3812_reset_chip( opl );
+		break;
+	}
+}
+
+void Opl_Apu::write_data( blip_time_t time, int data )
+{
+	run_until( time );
+	switch (type_)
+	{
+	case type_opll:
+	case type_msxmusic:
+	case type_smsfmunit:
+	case type_vrc7:
+		OPLL_writeIO( (OPLL *) opl, 0, addr );
+		OPLL_writeIO( (OPLL *) opl, 1, data );
+		break;
+
+	case type_opl:
+		ym3526_write( opl, 0, addr );
+		ym3526_write( opl, 1, data );
+		break;
+
+	case type_msxaudio:
+		/*if ( addr >= 7 && addr <= 7 + 11 )
+		{
+			unsigned char temp 2 = { addr - 7, data };
+			fwrite( &temp, 1, 2, logfile );
+		}*/
+		y8950_write( opl, 0, addr );
+		y8950_write( opl, 1, data );
+		break;
+
+	case type_opl2:
+		ym3812_write( opl, 0, addr );
+		ym3812_write( opl, 1, data );
+		break;
+	}
+}
+
+int Opl_Apu::read( blip_time_t time, int port )
+{
+	run_until( time );
+	switch (type_)
+	{
+	case type_opll:
+	case type_msxmusic:
+	case type_smsfmunit:
+	case type_vrc7:
+ return port ? 0xFF : 0;
+
+	case type_opl:
+		return ym3526_read( opl, port );
+
+	case type_msxaudio:
+		{
+			int ret = y8950_read( opl, port );
+			/*unsigned char temp 2 = { port + 0x80, ret };
+			fwrite( &temp, 1, 2, logfile );*/
+			return ret;
+		}
+
+	case type_opl2:
+		return ym3812_read( opl, port );
+	}
+
+	return 0;
+}
+
+void Opl_Apu::end_frame( blip_time_t time )
+{
+	run_until( time );
+	next_time -= time;
+
+	if ( output_ )
+		output_->set_modified();
+}
+
+void Opl_Apu::run_until( blip_time_t end_time )
+{
+	if ( end_time > next_time )
+	{
+		blip_time_t time_delta = end_time - next_time;
+		blip_time_t time = next_time;
+		unsigned count = time_delta / period_ + 1;
+		switch (type_)
+		{
+		case type_opll:
+		case type_msxmusic:
+		case type_smsfmunit:
+		case type_vrc7:
+			{
+				e_int32 bufMO 1024 ;
+				e_int32 bufRO 1024 ;
+				e_int32 * buffers2 = { bufMO, bufRO };
+
+				while ( count > 0 )
+				{
+					unsigned todo = count;
+					if ( todo > 1024 ) todo = 1024;
+					OPLL_calc_stereo( (OPLL *) opl, buffers, todo, -1 );
+
+					if ( output_ )
+					{
+						int last_amp = this->last_amp;
+						for ( unsigned i = 0; i < todo; i++ )
+						{
+							int amp = bufMO i + bufRO i;
+							int delta = amp - last_amp;
+							if ( delta )
+							{
+								last_amp = amp;
+								synth.offset_inline( time, delta, output_ );
+							}
+							time += period_;
+						}
+						this->last_amp = last_amp;
+					}
+					else time += period_ * todo;
+
+					count -= todo;
+				}
+			}
+			break;
+
+		case type_opl:
+		case type_msxaudio:
+		case type_opl2:
+			{
+				OPLSAMPLE bufL 1024 ;
+ OPLSAMPLE bufR 1024 ;
+ OPLSAMPLE* buffers2 = {bufL, bufR};
+
+				while ( count > 0 )
+				{
+					unsigned todo = count;
+					if ( todo > 1024 ) todo = 1024;
+					switch (type_)
+					{
+					case type_opl: ym3526_update_one( opl, buffers, todo ); break;
+					case type_msxaudio: y8950_update_one( opl, buffers, todo ); break;
+					case type_opl2: ym3812_update_one( opl, buffers, todo ); break;
+					default: break;
+					}
+
+					if ( output_ )
+					{
+						int last_amp = this->last_amp;
+						for ( unsigned i = 0; i < todo; i++ )
+						{
+							int amp = bufL i + bufR i;
+							int delta = amp - last_amp;
+							if ( delta )
+							{
+								last_amp = amp;
+								synth.offset_inline( time, delta, output_ );
+							}
+							time += period_;
+						}
+						this->last_amp = last_amp;
+					}
+					else time += period_ * todo;
+
+					count -= todo;
+				}
+			}
+			break;
+		}
+		next_time = time;
+	}
 }
\ No newline at end of file

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Opl_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Opl_Apu.h Changed

@@ -1,63 +1,63 @@
-#ifndef OPL_APU_H
-#define OPL_APU_H
-
-#include "blargg_common.h"
-#include "Blip_Buffer.h"
-
-#include <stdio.h>
-
-class Opl_Apu {
-public:
-	Opl_Apu();
-	~Opl_Apu();
-	
-	enum type_t { type_opll = 0x10, type_msxmusic = 0x11, type_smsfmunit = 0x12,
-			type_vrc7 = 0x13, type_opl = 0x20, type_msxaudio = 0x21, type_opl2 = 0x22 };
-	blargg_err_t init( long clock, long rate, blip_time_t period, type_t );
-	
-	void reset();
-	void volume( double v ) { synth.volume( 1.0 / (4096 * 6) * v ); }
-	void treble_eq( blip_eq_t const& eq ) { synth.treble_eq( eq ); }
-	enum { osc_count = 1 };
-	void osc_output( int index, Blip_Buffer* );
-	void set_output( int i, Blip_Buffer* buf, Blip_Buffer* = NULL, Blip_Buffer* = NULL ) { osc_output( 0, buf ); }
-	void end_frame( blip_time_t );
-	
-	void write_addr( int data ) { addr = data; }
-	void write_data( blip_time_t, int data );
-
-	int read( blip_time_t, int port );
-	
-	static bool supported() { return true; }
-
-private:
-	// noncopyable
-	Opl_Apu( const Opl_Apu& );
-	Opl_Apu& operator = ( const Opl_Apu& );
-
-	Blip_Buffer* output_;
-	type_t type_;
-	void* opl;
-	void* opl_memory;
-	//FILE* logfile;
-	unsigned char regs 0x100 ;
-	blip_time_t next_time;
-	int last_amp;
-	int addr;
-	
-	long clock_;
-	long rate_;
-	blip_time_t period_;
-	
-	Blip_Synth_Fast synth;
-	
-	void run_until( blip_time_t );
-};
-
-inline void Opl_Apu::osc_output( int i, Blip_Buffer* buf )
-{
-	assert( (unsigned) i < osc_count );
-	output_ = buf;
-}
-
-#endif
+#ifndef OPL_APU_H
+#define OPL_APU_H
+
+#include "blargg_common.h"
+#include "Blip_Buffer.h"
+
+#include <stdio.h>
+
+class Opl_Apu {
+public:
+	Opl_Apu();
+	~Opl_Apu();
+	
+	enum type_t { type_opll = 0x10, type_msxmusic = 0x11, type_smsfmunit = 0x12,
+			type_vrc7 = 0x13, type_opl = 0x20, type_msxaudio = 0x21, type_opl2 = 0x22 };
+	blargg_err_t init( long clock, long rate, blip_time_t period, type_t );
+	
+	void reset();
+	void volume( double v ) { synth.volume( 1.0 / (4096 * 6) * v ); }
+	void treble_eq( blip_eq_t const& eq ) { synth.treble_eq( eq ); }
+	enum { osc_count = 1 };
+	void osc_output( int index, Blip_Buffer* );
+	void set_output( int i, Blip_Buffer* buf, Blip_Buffer* = NULL, Blip_Buffer* = NULL ) { osc_output( 0, buf ); }
+	void end_frame( blip_time_t );
+	
+	void write_addr( int data ) { addr = data; }
+	void write_data( blip_time_t, int data );
+
+	int read( blip_time_t, int port );
+	
+	static bool supported() { return true; }
+
+private:
+	// noncopyable
+	Opl_Apu( const Opl_Apu& );
+	Opl_Apu& operator = ( const Opl_Apu& );
+
+	Blip_Buffer* output_;
+	type_t type_;
+	void* opl;
+	void* opl_memory;
+	//FILE* logfile;
+	unsigned char regs 0x100 ;
+	blip_time_t next_time;
+	int last_amp;
+	int addr;
+	
+	long clock_;
+	long rate_;
+	blip_time_t period_;
+	
+	Blip_Synth_Fast synth;
+	
+	void run_until( blip_time_t );
+};
+
+inline void Opl_Apu::osc_output( int i, Blip_Buffer* buf )
+{
+	assert( (unsigned) i < osc_count );
+	output_ = buf;
+}
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Resampler.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Resampler.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Resampler.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Resampler.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Rom_Data.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Rom_Data.cpp Changed

@@ -1,99 +1,99 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Rom_Data.h"
-
-/* Copyright (C) 2003-2009 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 Rom_Data::clear()
-{
-	file_size_ = 0;
-	rom_addr = 0;
-	mask = 0;
-	rom.clear();
-}
-
-Rom_Data::Rom_Data( int page_size ) :
-	pad_size( page_size + pad_extra )
-{
-	// page_size should be power of 2
-	check( (page_size & (page_size - 1)) == 0 );
-	
-	clear();
-}
-
-Rom_Data::~Rom_Data()
-{ }
-
-// Reads file into array, placing file_offset bytes of padding before the beginning, and pad_size after the end
-blargg_err_t Rom_Data::load_( Data_Reader& in, int header_size, int file_offset )
-{
-	clear();
-	file_size_ = in.remain();
-	if ( file_size_ <= header_size ) // <= because there must be data after header
-		return blargg_err_file_type;
-	
-	RETURN_ERR( rom.resize( file_offset + file_size_ + pad_size ) );
-	
-	return in.read( rom.begin() + file_offset, file_size_ );
-}
-
-blargg_err_t Rom_Data::load( Data_Reader& in, int header_size,
-		void* header_out, int fill )
-{
-	int file_offset = pad_size - header_size;
-	blargg_err_t err = load_( in, header_size, file_offset );
-	if ( err )
-	{
-		clear();
-		return err;
-	}
-	
-	file_size_ -= header_size;
-	memcpy( header_out, &rom file_offset, header_size );
-	
-	memset( rom.begin() , fill, pad_size );
-	memset( rom.end() - pad_size, fill, pad_size );
-	
-	return blargg_ok;
-}
-
-void Rom_Data::set_addr( int addr )
-{
-	int const page_size = pad_size - pad_extra;
-	
-	// Minimum size that contains all bytes and is a multiple of page_size
-	int const size = (addr + file_size_ + page_size - 1) / page_size * page_size;
-	
-	// Find lowest power of 2 that is >= size
-	int power2 = 1;
-	while ( power2 < size )
-		power2 *= 2;
-	
-	mask = power2 - 1;
-	
-	// Address of first byte of ROM (possibly negative)
-	rom_addr = addr - page_size - pad_extra;
-
-	if ( rom.resize( size - rom_addr + pad_extra ) ) { } // OK if shrink fails
-}
-
-byte* Rom_Data::at_addr( int addr )
-{
-	int offset = mask_addr( addr ) - rom_addr;
-	
-	if ( (unsigned) offset > (unsigned) (rom.size() - pad_size) )
-		offset = 0; // unmapped
-	
-	return &rom offset;
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Rom_Data.h"
+
+/* Copyright (C) 2003-2009 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 Rom_Data::clear()
+{
+	file_size_ = 0;
+	rom_addr = 0;
+	mask = 0;
+	rom.clear();
+}
+
+Rom_Data::Rom_Data( int page_size ) :
+	pad_size( page_size + pad_extra )
+{
+	// page_size should be power of 2
+	check( (page_size & (page_size - 1)) == 0 );
+	
+	clear();
+}
+
+Rom_Data::~Rom_Data()
+{ }
+
+// Reads file into array, placing file_offset bytes of padding before the beginning, and pad_size after the end
+blargg_err_t Rom_Data::load_( Data_Reader& in, int header_size, int file_offset )
+{
+	clear();
+	file_size_ = in.remain();
+	if ( file_size_ <= header_size ) // <= because there must be data after header
+		return blargg_err_file_type;
+	
+	RETURN_ERR( rom.resize( file_offset + file_size_ + pad_size ) );
+	
+	return in.read( rom.begin() + file_offset, file_size_ );
+}
+
+blargg_err_t Rom_Data::load( Data_Reader& in, int header_size,
+		void* header_out, int fill )
+{
+	int file_offset = pad_size - header_size;
+	blargg_err_t err = load_( in, header_size, file_offset );
+	if ( err )
+	{
+		clear();
+		return err;
+	}
+	
+	file_size_ -= header_size;
+	memcpy( header_out, &rom file_offset, header_size );
+	
+	memset( rom.begin() , fill, pad_size );
+	memset( rom.end() - pad_size, fill, pad_size );
+	
+	return blargg_ok;
+}
+
+void Rom_Data::set_addr( int addr )
+{
+	int const page_size = pad_size - pad_extra;
+	
+	// Minimum size that contains all bytes and is a multiple of page_size
+	int const size = (addr + file_size_ + page_size - 1) / page_size * page_size;
+	
+	// Find lowest power of 2 that is >= size
+	int power2 = 1;
+	while ( power2 < size )
+		power2 *= 2;
+	
+	mask = power2 - 1;
+	
+	// Address of first byte of ROM (possibly negative)
+	rom_addr = addr - page_size - pad_extra;
+
+	if ( rom.resize( size - rom_addr + pad_extra ) ) { } // OK if shrink fails
+}
+
+byte* Rom_Data::at_addr( int addr )
+{
+	int offset = mask_addr( addr ) - rom_addr;
+	
+	if ( (unsigned) offset > (unsigned) (rom.size() - pad_size) )
+		offset = 0; // unmapped
+	
+	return &rom offset;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Rom_Data.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Rom_Data.h Changed

@@ -1,94 +1,94 @@
-// Manages ROM data loaded from file in an efficient manner
-
-// Game_Music_Emu 0.6-pre
-#ifndef ROM_DATA_H
-#define ROM_DATA_H
-
-#include "blargg_common.h"
-#include "Data_Reader.h"
-
-/* Loads a ROM file into memory and allows access to it in page-sized chunks.
-
-* ROM file consists of header followed by ROM data. Instead of storing the entire
-ROM contents, the file only stores the occupied portion, with the bytes before and
-after that cleared to some value. The size and format of the header is up to the
-caller, as is the starting address of the ROM data following it. File loading is
-performed with a single read, rather than two or more that might otherwise be
-required.
-
-* Once ROM data is loaded and its address specified, a pointer to any "page" can
-be obtained. ROM data is mirrored using smallest power of 2 that contains it.
-Addresses not aligned to pages can also be used, but this might cause unexpected
-results.
-
-Example with file data of size 0x0C put at address 0x0F, with page size of 8:
-
----------------0123456789AB--------------------0123456789AB---------...
-^ ^ ^ ^ ^ ^ ^ ^ ^ 
-0 0x08 0x10 0x18 0x20 0x28 0x30 0x38 0x40
-
-at_addr(0x00) = pointer to 8 bytes of fill.
-at_addr(0x08) = pointer to 7 bytes of fill, followed by first byte of file.
-at_addr(0x10) = pointer to next 8 bytes of file.
-at_addr(0x18) = pointer to last 3 bytes of file, followed by 5 bytes of fill.
-at_addr(0x20) = pointer to 8 bytes of fill.
-at_addr(0x28) = pointer to 7 bytes of fill, followed by first byte of file.
-etc. */
-
-class Rom_Data {
-	enum { pad_extra = 8 };
-public:
-	typedef unsigned char byte;
-	
-	// Page_size should be a power of 2
-	Rom_Data( int page_size );
-	
-	// Loads file into memory, then copies header to *header_out and fills
-	// unmapped bank and file data padding with fill. Returns blargg_err_file_type
-	// if in.remain() <= header_size.
-	blargg_err_t load( Data_Reader& in, int header_size, void* header_out, int fill );
-	
-	// Below, "file data" refers to data AFTER the header
-	
-	// Size of file data
-	int file_size() const { return file_size_; }
-	
-	// Pointer to beginning of file data
-	byte * begin() { return rom.begin() + pad_size; }
-	byte const* begin() const { return rom.begin() + pad_size; }
-	
-	// Pointer to unmapped page cleared with fill value
-	byte* unmapped() { return rom.begin(); }
-	
-	// Sets address that file data will start at. Must be set before using following
-	// functions, and cannot be set more than once.
-	void set_addr( int addr );
-	
-	// Address of first empty page (file size + addr rounded up to multiple of page_size)
-	int size() const { return rom.size() - pad_extra + rom_addr; }
-	
-	// Masks address to nearest power of two greater than size()
-	int mask_addr( int addr ) const { return addr & mask; }
-	
-	// Pointer to page beginning at addr, or unmapped() if outside data.
-	// Mirrored using mask_addr().
-	byte* at_addr( int addr );
-	
-	// Frees memory
-	void clear();
-
-// Implementation
-public:
-	~Rom_Data();
-
-protected:
-	blargg_vector<byte> rom;
-	int mask;
-	int rom_addr;
-	int const pad_size;
-	int file_size_;
-	
-	blargg_err_t load_( Data_Reader& in, int header_size, int file_offset );
-};
-
-#endif
+// Manages ROM data loaded from file in an efficient manner
+
+// Game_Music_Emu $vers
+#ifndef ROM_DATA_H
+#define ROM_DATA_H
+
+#include "blargg_common.h"
+#include "Data_Reader.h"
+
+/* Loads a ROM file into memory and allows access to it in page-sized chunks.
+
+* ROM file consists of header followed by ROM data. Instead of storing the entire
+ROM contents, the file only stores the occupied portion, with the bytes before and
+after that cleared to some value. The size and format of the header is up to the
+caller, as is the starting address of the ROM data following it. File loading is
+performed with a single read, rather than two or more that might otherwise be
+required.
+
+* Once ROM data is loaded and its address specified, a pointer to any "page" can
+be obtained. ROM data is mirrored using smallest power of 2 that contains it.
+Addresses not aligned to pages can also be used, but this might cause unexpected
+results.
+
+Example with file data of size 0x0C put at address 0x0F, with page size of 8:
+
+---------------0123456789AB--------------------0123456789AB---------...
+^ ^ ^ ^ ^ ^ ^ ^ ^ 
+0 0x08 0x10 0x18 0x20 0x28 0x30 0x38 0x40
+
+at_addr(0x00) = pointer to 8 bytes of fill.
+at_addr(0x08) = pointer to 7 bytes of fill, followed by first byte of file.
+at_addr(0x10) = pointer to next 8 bytes of file.
+at_addr(0x18) = pointer to last 3 bytes of file, followed by 5 bytes of fill.
+at_addr(0x20) = pointer to 8 bytes of fill.
+at_addr(0x28) = pointer to 7 bytes of fill, followed by first byte of file.
+etc. */
+
+class Rom_Data {
+	enum { pad_extra = 8 };
+public:
+	typedef unsigned char byte;
+	
+	// Page_size should be a power of 2
+	Rom_Data( int page_size );
+	
+	// Loads file into memory, then copies header to *header_out and fills
+	// unmapped bank and file data padding with fill. Returns blargg_err_file_type
+	// if in.remain() <= header_size.
+	blargg_err_t load( Data_Reader& in, int header_size, void* header_out, int fill );
+	
+	// Below, "file data" refers to data AFTER the header
+	
+	// Size of file data
+	int file_size() const { return file_size_; }
+	
+	// Pointer to beginning of file data
+	byte * begin() { return rom.begin() + pad_size; }
+	byte const* begin() const { return rom.begin() + pad_size; }
+	
+	// Pointer to unmapped page cleared with fill value
+	byte* unmapped() { return rom.begin(); }
+	
+	// Sets address that file data will start at. Must be set before using following
+	// functions, and cannot be set more than once.
+	void set_addr( int addr );
+	
+	// Address of first empty page (file size + addr rounded up to multiple of page_size)
+	int size() const { return rom.size() - pad_extra + rom_addr; }
+	
+	// Masks address to nearest power of two greater than size()
+	int mask_addr( int addr ) const { return addr & mask; }
+	
+	// Pointer to page beginning at addr, or unmapped() if outside data.
+	// Mirrored using mask_addr().
+	byte* at_addr( int addr );
+	
+	// Frees memory
+	void clear();
+
+// Implementation
+public:
+	~Rom_Data();
+
+protected:
+	blargg_vector<byte> rom;
+	int mask;
+	int rom_addr;
+	int const pad_size;
+	int file_size_;
+	
+	blargg_err_t load_( Data_Reader& in, int header_size, int file_offset );
+};
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/SPC_Filter.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/SPC_Filter.cpp Changed

@@ -1,4 +1,4 @@
-// snes_spc 0.9.0. http://www.slack.net/~ant/
+// snes_spc $vers. http://www.slack.net/~ant/
 
 #include "Spc_Filter.h"
 
@@ -15,17 +15,49 @@
 
 #include "blargg_source.h"
 
-void SPC_Filter::clear() { memset( ch, 0, sizeof ch ); }
+static const float limiter_max = (float)0.9999;
+static const float limiter_max_05 = (float)(limiter_max - 0.5);
 
-SPC_Filter::SPC_Filter()
+#include <math.h>
+
+static short hard_limit_sample( int sample )
+{
+ double val = (double)sample * (1.0 / 32768.0);
+ if (val < -0.5)
+ val = (tanh((val + 0.5) / limiter_max_05) * limiter_max_05 - 0.5);
+ else if (val > 0.5)
+ val = (tanh((val - 0.5) / limiter_max_05) * limiter_max_05 + 0.5);
+ return val * 32768.0;
+}
+
+void Spc_Filter::build_limit_table()
+{
+ for (int i = -65536; i < 65536; ++i)
+ {
+ hard_limit_table i + 65536 = hard_limit_sample( i );
+ }
+}
+
+inline short Spc_Filter::limit_sample(int sample)
+{
+ if (!limiting && ((unsigned)sample + 32768) < 65536) return sample;
+ limiting = true;
+ if (((unsigned)sample + 65536) < 131072) return hard_limit_table sample + 65536 ;
+ return hard_limit_sample( sample );
+}
+
+void Spc_Filter::clear() { limiting = false; memset( ch, 0, sizeof ch ); }
+
+Spc_Filter::Spc_Filter()
 {
 	enabled = true;
 	gain = gain_unit;
 	bass = bass_norm;
 	clear();
+ build_limit_table();
 }
 
-void SPC_Filter::run( short io , int count )
+void Spc_Filter::run( short io , int count )
 {
 	require( (count & 1) == 0 ); // must be even
 	
@@ -52,12 +84,8 @@
 				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;
+
+				io i = limit_sample( s );
 			}
 			
 			c->p1 = p1;
@@ -73,9 +101,7 @@
 		while ( io < end )
 		{
 			int s = (*io * gain) >> gain_bits;
-			if ( (short) s != s )
-				s = (s >> 31) ^ 0x7FFF;
-			*io++ = (short) s;
+			*io++ = limit_sample( s );
 		}
 	}
 }

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Apu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Core.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Core.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Core.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Core.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Cpu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Cpu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Emu.cpp Changed

@@ -1,385 +1,429 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Sap_Emu.h"
-
-#include "blargg_endian.h"
-
-/* Copyright (C) 2006-2008 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"
-
-Sap_Emu::Sap_Emu()
-{
-	set_type( gme_sap_type );
-	set_silence_lookahead( 6 );
-}
-
-Sap_Emu::~Sap_Emu() { }
-
-// Track info
-
-// Returns 16 or greater if not hex. Handles uppercase and lowercase.
-// Thoroughly tested and rejects ALL non-hex characters.
-inline int from_hex_char( int h )
-{
-	h -= 0x30;
-	if ( (unsigned) h > 9 )
-		h = ((h - 0x11) & 0xDF) + 10;
-	return h;
-}
-
-static int from_hex( byte const in )
-{
-	int result = 0;
-	for ( int n = 4; n--; )
-	{
-		int h = from_hex_char( *in++ );
-		if ( h > 15 )
-			return -1;
-		result = result * 0x10 + h;
-	}
-	return result;
-}
-
-static int parse_int( byte const* io , byte const* end )
-{
-	byte const* in = *io;
-	int n = 0;
-	while ( in < end )
-	{
-		int dig = *in - '0';
-		if ( (unsigned) dig > 9 )
-			break;
-		++in;
-		n = n * 10 + dig;
-	}
-	if ( in == *io )
-		n = -1; // no numeric characters
-	*io = in;
-	return n;
-}
-
-static int from_dec( byte const in , byte const* end )
-{
-	int n = parse_int( &in, end );
-	if ( in < end )
-		n = -1;
-	return n;
-}
-
-static void parse_string( byte const in , byte const* end, int len, char out )
-{
-	byte const* start = in;
-	if ( *in++ == '\"' )
-	{
-		start++;
-		while ( in < end && *in != '\"' )
-			in++;
-	}
-	else
-	{
-		in = end;
-	}
-	len = min( len - 1, int (in - start) );
-	out len = 0;
-	memcpy( out, start, len );
-}
-
-static int parse_time( byte const in , byte const* end )
-{
-	int minutes = parse_int( &in, end );
-	if ( minutes < 0 || *in != ':' )
-		return 0;
-	
-	++in;
-	int seconds = parse_int( &in, end );
-	if ( seconds < 0 )
-		return 0;
-	
-	int time = minutes * 60000 + seconds * 1000;
-	if ( *in == '.' )
-	{
-		byte const* start = ++in;
-		int msec = parse_int( &in, end );
-		if ( msec >= 0 )
-		{
-			// allow 1-3 digits
-			for ( int n = in - start; n < 3; n++ )
-				msec *= 10;
-			time += msec;
-		}
-	}
-	
-	while ( in < end && *in <= ' ' )
-		++in;
-	
-	if ( end - in >= 4 && !memcmp( in, "LOOP", 4 ) )
-		time = -time;
-	
-	return time;
-}
-
-static blargg_err_t parse_info( byte const in , int size, Sap_Emu::info_t* out )
-{
-	out->track_count = 1;
-	out->author 0 = 0;
-	out->name 0 = 0;
-	out->copyright 0 = 0;
-	
-	for ( int i = 0; i < Sap_Emu::max_tracks; i++ )
-		out->track_times i = 0;
-	
-	if ( size < 16 || memcmp( in, "SAP\x0D\x0A", 5 ) )
-		return blargg_err_file_type;
-	
-	int time_count = 0;
-	byte const* file_end = in + size - 5;
-	in += 5;
-	while ( in < file_end && (in 0 != 0xFF || in 1 != 0xFF) )
-	{
-		byte const* line_end = in;
-		while ( line_end < file_end && *line_end != 0x0D )
-			line_end++;
-		
-		char const* tag = (char const*) in;
-		while ( in < line_end && *in > ' ' )
-			in++;
-		int tag_len = (char const*) in - tag;
-		
-		while ( in < line_end && *in <= ' ' ) in++;
-		
-		if ( tag_len <= 0 )
-		{
-			// skip line
-		}
-		else if ( !strncmp( "TIME", tag, tag_len ) && time_count < Sap_Emu::max_tracks )
-		{
-			out->track_times time_count++ = parse_time( in, line_end );
-		}
-		else if ( !strncmp( "INIT", tag, tag_len ) )
-		{
-			out->init_addr = from_hex( in );
-			if ( (unsigned) out->init_addr >= 0x10000 )
-				return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "init address" );
-		}
-		else if ( !strncmp( "PLAYER", tag, tag_len ) )
-		{
-			out->play_addr = from_hex( in );
-			if ( (unsigned) out->play_addr >= 0x10000 )
-				return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "play address" );
-		}
-		else if ( !strncmp( "MUSIC", tag, tag_len ) )
-		{
-			out->music_addr = from_hex( in );
-			if ( (unsigned) out->music_addr >= 0x10000 )
-				return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "music address" );
-		}
-		else if ( !strncmp( "SONGS", tag, tag_len ) )
-		{
-			out->track_count = from_dec( in, line_end );
-			if ( out->track_count <= 0 )
-				return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "track count" );
-		}
-		else if ( !strncmp( "TYPE", tag, tag_len ) )
-		{
-			switch ( out->type = *in )
-			{
-			case 'S':
-				out->type = 'C';
-			case 'B':
-			case 'C':
-			case 'D':
-				break;
-			
-			default:
-				return BLARGG_ERR( BLARGG_ERR_FILE_FEATURE, "player type" );
-			}
-		}
-		else if ( !strncmp( "STEREO", tag, tag_len ) )
-		{
-			out->stereo = true;
-		}
-		else if ( !strncmp( "FASTPLAY", tag, tag_len ) )
-		{
-			out->fastplay = from_dec( in, line_end );
-			if ( out->fastplay <= 0 )
-				return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "fastplay value" );
-		}
-		else if ( !strncmp( "AUTHOR", tag, tag_len ) )
-		{
-			parse_string( in, line_end, sizeof out->author, out->author );
-		}
-		else if ( !strncmp( "NAME", tag, tag_len ) )
-		{
-			parse_string( in, line_end, sizeof out->name, out->name );
-		}
-		else if ( !strncmp( "DATE", tag, tag_len ) )
-		{
-			parse_string( in, line_end, sizeof out->copyright, out->copyright );
-		}
-		
-		in = line_end + 2;
-	}
-	
-	if ( in 0 != 0xFF || in 1 != 0xFF )
-		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "ROM data missing" );
-	out->rom_data = in + 2;
-	
-	return blargg_ok;
-}
-
-static void copy_sap_fields( Sap_Emu::info_t const& in, track_info_t* out )
-{
-	Gme_File::copy_field_( out->game, in.name );
-	Gme_File::copy_field_( out->author, in.author );
-	Gme_File::copy_field_( out->copyright, in.copyright );
-}
-
-blargg_err_t Sap_Emu::track_info_( track_info_t* out, int track ) const
-{
-	copy_sap_fields( info_, out );
-	
-	if ( track < max_tracks )
-	{
-		int time = info_.track_times track;
-		if ( time )
-		{
-			if ( time > 0 )
-			{
-				out->loop_length = 0;
-			}
-			else
-			{
-				time = -time;
-				out->loop_length = time;
-			}
-			out->length = time;
-		}
-	}
-	return blargg_ok;
-}
-
-struct Sap_File : Gme_Info_
-{
-	Sap_Emu::info_t info;
-	
-	Sap_File() { set_type( gme_sap_type ); }
-	
-	blargg_err_t load_mem_( byte const begin , int size )
-	{
-		RETURN_ERR( parse_info( begin, size, &info ) );
-		set_track_count( info.track_count );
-		return blargg_ok;
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int ) const
-	{
-		copy_sap_fields( info, out );
-		return blargg_ok;
-	}
-};
-
-static Music_Emu* new_sap_emu () { return BLARGG_NEW Sap_Emu ; }
-static Music_Emu* new_sap_file() { return BLARGG_NEW Sap_File; }
-
-gme_type_t_ const gme_sap_type 1 = {{ "Atari XL", 0, &new_sap_emu, &new_sap_file, "SAP", 1 }};
-
-// Setup
-
-blargg_err_t Sap_Emu::load_mem_( byte const in , int size )
-{
-	file_end = in + size;
-	
-	info_.warning = NULL;
-	info_.type = 'B';
-	info_.stereo = false;
-	info_.init_addr = -1;
-	info_.play_addr = -1;
-	info_.music_addr = -1;
-	info_.fastplay = 312;
-	RETURN_ERR( parse_info( in, size, &info_ ) );
-	
-	set_warning( info_.warning );
-	set_track_count( info_.track_count );
-	set_voice_count( Sap_Apu::osc_count << info_.stereo );
-	core.apu_impl().volume( gain() );
-	
-	static const char* const names Sap_Apu::osc_count * 2 = {
-		"Wave 1", "Wave 2", "Wave 3", "Wave 4",
-		"Wave 5", "Wave 6", "Wave 7", "Wave 8",
-	};
-	set_voice_names( names );
-	
-	static int const types Sap_Apu::osc_count * 2 = {
-		wave_type+1, wave_type+2, wave_type+3, wave_type+0,
-		wave_type+5, wave_type+6, wave_type+7, wave_type+4,
-	};
-	set_voice_types( types );
-	
-	return setup_buffer( 1773447 );
-}
-
-void Sap_Emu::update_eq( blip_eq_t const& eq )
-{
-	core.apu_impl().synth.treble_eq( eq );
-}
-
-void Sap_Emu::set_voice( int i, Blip_Buffer* center, Blip_Buffer* left, Blip_Buffer* right )
-{
-	int i2 = i - Sap_Apu::osc_count;
-	if ( i2 >= 0 )
-		core.apu2().set_output( i2, right );
-	else
-		core.apu().set_output( i, (info_.stereo ? left : center) );
-}
-
-// Emulation
-
-void Sap_Emu::set_tempo_( double t )
-{
-	core.set_tempo( t );
-}
-
-blargg_err_t Sap_Emu::start_track_( int track )
-{
-	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	
-	core.setup_ram();
-	
-	// Copy file data to RAM
-	byte const* in = info_.rom_data;
-	while ( file_end - in >= 5 )
-	{
-		int start = get_le16( in );
-		int end = get_le16( in + 2 );
-		//dprintf( "Block $%04X-$%04X\n", start, end );
-		in += 4;
-		int len = end - start + 1;
-		if ( (unsigned) len > (unsigned) (file_end - in) )
-		{
-			set_warning( "Invalid file data block" );
-			break;
-		}
-		
-		memcpy( core.ram() + start, in, len );
-		in += len;
-		if ( file_end - in >= 2 && in 0 == 0xFF && in 1 == 0xFF )
-			in += 2;
-	}
-	
-	return core.start_track( track, info_ );
-}
-
-blargg_err_t Sap_Emu::run_clocks( blip_time_t& duration, int )
-{
-	return core.end_frame( duration );
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Sap_Emu.h"
+
+#include "blargg_endian.h"
+
+/* Copyright (C) 2006-2008 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"
+
+Sap_Emu::Sap_Emu()
+{
+	set_type( gme_sap_type );
+	set_silence_lookahead( 6 );
+}
+
+Sap_Emu::~Sap_Emu() { }
+
+// Track info
+
+// Returns 16 or greater if not hex. Handles uppercase and lowercase.
+// Thoroughly tested and rejects ALL non-hex characters.
+inline int from_hex_char( int h )
+{
+	h -= 0x30;
+	if ( (unsigned) h > 9 )
+		h = ((h - 0x11) & 0xDF) + 10;
+	return h;
+}
+
+static int from_hex( byte const in )
+{
+	int result = 0;
+	for ( int n = 4; n--; )
+	{
+		int h = from_hex_char( *in++ );
+		if ( h > 15 )
+			return -1;
+		result = result * 0x10 + h;
+	}
+	return result;
+}
+
+static int parse_int( byte const* io , byte const* end )
+{
+	byte const* in = *io;
+	int n = 0;
+	while ( in < end )
+	{
+		int dig = *in - '0';
+		if ( (unsigned) dig > 9 )
+			break;
+		++in;
+		n = n * 10 + dig;
+	}
+	if ( in == *io )
+		n = -1; // no numeric characters
+	*io = in;
+	return n;
+}
+
+static int from_dec( byte const in , byte const* end )
+{
+	int n = parse_int( &in, end );
+	if ( in < end )
+		n = -1;
+	return n;
+}
+
+static void parse_string( byte const in , byte const* end, int len, char out )
+{
+	byte const* start = in;
+	if ( *in++ == '\"' )
+	{
+		start++;
+		while ( in < end && *in != '\"' )
+			in++;
+	}
+	else
+	{
+		in = end;
+	}
+	len = min( len - 1, int (in - start) );
+	out len = 0;
+	memcpy( out, start, len );
+}
+
+static int parse_time( byte const in , byte const* end )
+{
+	int minutes = parse_int( &in, end );
+	if ( minutes < 0 || *in != ':' )
+		return 0;
+	
+	++in;
+	int seconds = parse_int( &in, end );
+	if ( seconds < 0 )
+		return 0;
+	
+	int time = minutes * 60000 + seconds * 1000;
+	if ( *in == '.' )
+	{
+		byte const* start = ++in;
+		int msec = parse_int( &in, end );
+		if ( msec >= 0 )
+		{
+			// allow 1-3 digits
+			for ( int n = in - start; n < 3; n++ )
+				msec *= 10;
+			time += msec;
+		}
+	}
+	
+	while ( in < end && *in <= ' ' )
+		++in;
+	
+	if ( end - in >= 4 && !memcmp( in, "LOOP", 4 ) )
+		time = -time;
+	
+	return time;
+}
+
+static blargg_err_t parse_info( byte const in , int size, Sap_Emu::info_t* out )
+{
+	out->track_count = 1;
+	out->author 0 = 0;
+	out->name 0 = 0;
+	out->copyright 0 = 0;
+	
+	for ( int i = 0; i < Sap_Emu::max_tracks; i++ )
+		out->track_times i = 0;
+	
+	if ( size < 16 || memcmp( in, "SAP\x0D\x0A", 5 ) )
+		return blargg_err_file_type;
+	
+	int time_count = 0;
+	byte const* file_end = in + size - 5;
+	in += 5;
+	while ( in < file_end && (in 0 != 0xFF || in 1 != 0xFF) )
+	{
+		byte const* line_end = in;
+		while ( line_end < file_end && *line_end != 0x0D )
+			line_end++;
+		
+		char const* tag = (char const*) in;
+		while ( in < line_end && *in > ' ' )
+			in++;
+		int tag_len = (char const*) in - tag;
+		
+		while ( in < line_end && *in <= ' ' ) in++;
+		
+		if ( tag_len <= 0 )
+		{
+			// skip line
+		}
+		else if ( !strncmp( "TIME", tag, tag_len ) && time_count < Sap_Emu::max_tracks )
+		{
+			out->track_times time_count++ = parse_time( in, line_end );
+		}
+		else if ( !strncmp( "INIT", tag, tag_len ) )
+		{
+			out->init_addr = from_hex( in );
+			if ( (unsigned) out->init_addr >= 0x10000 )
+				return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "init address" );
+		}
+		else if ( !strncmp( "PLAYER", tag, tag_len ) )
+		{
+			out->play_addr = from_hex( in );
+			if ( (unsigned) out->play_addr >= 0x10000 )
+				return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "play address" );
+		}
+		else if ( !strncmp( "MUSIC", tag, tag_len ) )
+		{
+			out->music_addr = from_hex( in );
+			if ( (unsigned) out->music_addr >= 0x10000 )
+				return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "music address" );
+		}
+		else if ( !strncmp( "SONGS", tag, tag_len ) )
+		{
+			out->track_count = from_dec( in, line_end );
+			if ( out->track_count <= 0 )
+				return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "track count" );
+		}
+		else if ( !strncmp( "TYPE", tag, tag_len ) )
+		{
+			switch ( out->type = *in )
+			{
+			case 'S':
+				out->type = 'C';
+			case 'B':
+			case 'C':
+			case 'D':
+				break;
+			
+			default:
+				return BLARGG_ERR( BLARGG_ERR_FILE_FEATURE, "player type" );
+			}
+		}
+		else if ( !strncmp( "STEREO", tag, tag_len ) )
+		{
+			out->stereo = true;
+		}
+		else if ( !strncmp( "FASTPLAY", tag, tag_len ) )
+		{
+			out->fastplay = from_dec( in, line_end );
+			if ( out->fastplay <= 0 )
+				return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "fastplay value" );
+		}
+		else if ( !strncmp( "AUTHOR", tag, tag_len ) )
+		{
+			parse_string( in, line_end, sizeof out->author, out->author );
+		}
+		else if ( !strncmp( "NAME", tag, tag_len ) )
+		{
+			parse_string( in, line_end, sizeof out->name, out->name );
+		}
+		else if ( !strncmp( "DATE", tag, tag_len ) )
+		{
+			parse_string( in, line_end, sizeof out->copyright, out->copyright );
+		}
+		
+		in = line_end + 2;
+	}
+	
+	if ( in 0 != 0xFF || in 1 != 0xFF )
+		return BLARGG_ERR( BLARGG_ERR_FILE_CORRUPT, "ROM data missing" );
+	out->rom_data = in + 2;
+	
+	return blargg_ok;
+}
+
+static void copy_sap_fields( Sap_Emu::info_t const& in, track_info_t* out, int index )
+{
+	Gme_File::copy_field_( out->game, in.name );
+	Gme_File::copy_field_( out->author, in.author );
+	Gme_File::copy_field_( out->copyright, in.copyright );
+}
+
+static void hash_sap_file( Sap_Emu::info_t const& i, byte const* data, int data_size, Music_Emu::Hash_Function& out )
+{
+	unsigned char temp4;
+	set_le32( &temp0, i.init_addr ); out.hash_( &temp0, sizeof(temp) );
+	set_le32( &temp0, i.play_addr ); out.hash_( &temp0, sizeof(temp) );
+	set_le32( &temp0, i.music_addr ); out.hash_( &temp0, sizeof(temp) );
+	set_le32( &temp0, i.type ); out.hash_( &temp0, sizeof(temp) );
+	set_le32( &temp0, i.fastplay ); out.hash_( &temp0, sizeof(temp) );
+	set_le32( &temp0, i.stereo ); out.hash_( &temp0, sizeof(temp) );
+	set_le32( &temp0, i.track_count ); out.hash_( &temp0, sizeof(temp) );
+	out.hash_( data, data_size );
+}
+
+blargg_err_t Sap_Emu::track_info_( track_info_t* out, int track ) const
+{
+	copy_sap_fields( info_, out, track );
+	
+	if ( track < max_tracks )
+	{
+		int time = info_.track_times track;
+		if ( time )
+		{
+			if ( time > 0 )
+			{
+				out->loop_length = 0;
+				out->length = 0;
+			}
+			else
+			{
+				out->loop_length = -time;
+				out->length = 0;
+			}
+		}
+	}
+	return blargg_ok;
+}
+
+struct Sap_File : Gme_Info_
+{
+	Sap_Emu::info_t info;
+	
+	Sap_File() { set_type( gme_sap_type ); }
+	
+	blargg_err_t load_mem_( byte const begin , int size )
+	{
+		RETURN_ERR( parse_info( begin, size, &info ) );
+		set_track_count( info.track_count );
+		return blargg_ok;
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int track ) const
+	{
+		copy_sap_fields( info, out, track );
+		if ( track < info.track_count )
+		{
+			int time = info.track_times track;
+			if ( time )
+			{
+				if ( time > 0 )
+				{
+					out->loop_length = 0;
+					out->length = time;
+				}
+				else
+				{
+					time = -time;
+					out->loop_length = time;
+					out->length = 0;
+				}
+			}
+		}
+
+		return blargg_ok;
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		hash_sap_file( info, info.rom_data, file_end() - info.rom_data, out );
+		return blargg_ok;
+	}
+};
+
+static Music_Emu* new_sap_emu () { return BLARGG_NEW Sap_Emu ; }
+static Music_Emu* new_sap_file() { return BLARGG_NEW Sap_File; }
+
+gme_type_t_ const gme_sap_type 1 = {{ "Atari XL", 0, &new_sap_emu, &new_sap_file, "SAP", 1 }};
+
+// Setup
+
+blargg_err_t Sap_Emu::load_mem_( byte const in , int size )
+{
+	file_end = in + size;
+	
+	info_.warning = NULL;
+	info_.type = 'B';
+	info_.stereo = false;
+	info_.init_addr = -1;
+	info_.play_addr = -1;
+	info_.music_addr = -1;
+	info_.fastplay = 312;
+	RETURN_ERR( parse_info( in, size, &info_ ) );
+	
+	set_warning( info_.warning );
+	set_track_count( info_.track_count );
+	set_voice_count( Sap_Apu::osc_count << info_.stereo );
+	core.apu_impl().volume( gain() );
+	
+	static const char* const names Sap_Apu::osc_count * 2 = {
+		"Wave 1", "Wave 2", "Wave 3", "Wave 4",
+		"Wave 5", "Wave 6", "Wave 7", "Wave 8",
+	};
+	set_voice_names( names );
+	
+	static int const types Sap_Apu::osc_count * 2 = {
+		wave_type+1, wave_type+2, wave_type+3, wave_type+0,
+		wave_type+5, wave_type+6, wave_type+7, wave_type+4,
+	};
+	set_voice_types( types );
+	
+	return setup_buffer( 1773447 );
+}
+
+void Sap_Emu::update_eq( blip_eq_t const& eq )
+{
+	core.apu_impl().synth.treble_eq( eq );
+}
+
+void Sap_Emu::set_voice( int i, Blip_Buffer* center, Blip_Buffer* left, Blip_Buffer* right )
+{
+	int i2 = i - Sap_Apu::osc_count;
+	if ( i2 >= 0 )
+		core.apu2().set_output( i2, right );
+	else
+		core.apu().set_output( i, (info_.stereo ? left : center) );
+}
+
+// Emulation
+
+void Sap_Emu::set_tempo_( double t )
+{
+	core.set_tempo( t );
+}
+
+blargg_err_t Sap_Emu::start_track_( int track )
+{
+	RETURN_ERR( Classic_Emu::start_track_( track ) );
+	
+	core.setup_ram();
+	
+	// Copy file data to RAM
+	byte const* in = info_.rom_data;
+	while ( file_end - in >= 5 )
+	{
+		int start = get_le16( in );
+		int end = get_le16( in + 2 );
+		//dprintf( "Block $%04X-$%04X\n", start, end );
+		in += 4;
+		int len = end - start + 1;
+		if ( (unsigned) len > (unsigned) (file_end - in) )
+		{
+			set_warning( "Invalid file data block" );
+			break;
+		}
+		
+		memcpy( core.ram() + start, in, len );
+		in += len;
+		if ( file_end - in >= 2 && in 0 == 0xFF && in 1 == 0xFF )
+			in += 2;
+	}
+	
+	return core.start_track( track, info_ );
+}
+
+blargg_err_t Sap_Emu::run_clocks( blip_time_t& duration, int )
+{
+	return core.end_frame( duration );
+}
+
+blargg_err_t Sap_Emu::hash_( Hash_Function& out ) const
+{
+	hash_sap_file( info(), info().rom_data, file_end - info().rom_data, out );
+	return blargg_ok;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sap_Emu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Core.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Core.cpp Changed

@@ -1,108 +1,108 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Sgc_Core.h"
-
-/* Copyright (C) 2009 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 Sgc_Core::set_tempo( double t )
-{
-	set_play_period( clock_rate() / (header().rate ? 50 : 60) / t );
-}
-
-blargg_err_t Sgc_Core::load_( Data_Reader& dr )
-{
-	RETURN_ERR( Sgc_Impl::load_( dr ) );
-	
-	if ( sega_mapping() && fm_apu_.supported() )
-		RETURN_ERR( fm_apu_.init( clock_rate(), clock_rate() / 72 ) );
-	
-	set_tempo( 1.0 );
-	return blargg_ok;
-}
-
-blargg_err_t Sgc_Core::start_track( int t )
-{
-	if ( sega_mapping() )
-	{
-		apu_.reset();
-		fm_apu_.reset();
-		fm_accessed = false;
-	}
-	else
-	{
-		apu_.reset( 0x0003, 15 );
-	}
-	
-	return Sgc_Impl::start_track( t );
-}
-
-blargg_err_t Sgc_Core::end_frame( time_t t )
-{
-	RETURN_ERR( Sgc_Impl::end_frame( t ) );
-	apu_.end_frame( t );
-	if ( sega_mapping() && fm_accessed )
-	{
-		if ( fm_apu_.supported() )
-			fm_apu_.end_frame( t );
-		else
-			set_warning( "FM sound not supported" );
-	}
-
-	return blargg_ok;
-}
-	
-Sgc_Core::Sgc_Core()
-{ }
-
-Sgc_Core::~Sgc_Core()
-{ }
-
-void Sgc_Core::cpu_out( time_t time, addr_t addr, int data )
-{
-	int port = addr & 0xFF;
-	
-	if ( sega_mapping() )
-	{
-		switch ( port )
-		{
-		case 0x06:
-			apu_.write_ggstereo( time, data );
-			return;
-		
-		case 0x7E:
-		case 0x7F:
-			apu_.write_data( time, data ); dprintf( "$7E<-%02X\n", data );
-			return;
-		
-		case 0xF0:
-			fm_accessed = true;
-			if ( fm_apu_.supported() )
-				fm_apu_.write_addr( data );//, dprintf( "$F0<-%02X\n", data );
-			return;
-		
-		case 0xF1:
-			fm_accessed = true;
-			if ( fm_apu_.supported() )
-				fm_apu_.write_data( time, data );//, dprintf( "$F1<-%02X\n", data );
-			return;
-		}
-	}
-	else if ( port >= 0xE0 )
-	{
-		apu_.write_data( time, data );
-		return;
-	}
-	
-	Sgc_Impl::cpu_out( time, addr, data );
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Sgc_Core.h"
+
+/* Copyright (C) 2009 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 Sgc_Core::set_tempo( double t )
+{
+	set_play_period( clock_rate() / (header().rate ? 50 : 60) / t );
+}
+
+blargg_err_t Sgc_Core::load_( Data_Reader& dr )
+{
+	RETURN_ERR( Sgc_Impl::load_( dr ) );
+	
+	if ( sega_mapping() && fm_apu_.supported() )
+		RETURN_ERR( fm_apu_.init( clock_rate(), clock_rate() / 72 ) );
+	
+	set_tempo( 1.0 );
+	return blargg_ok;
+}
+
+blargg_err_t Sgc_Core::start_track( int t )
+{
+	if ( sega_mapping() )
+	{
+		apu_.reset();
+		fm_apu_.reset();
+		fm_accessed = false;
+	}
+	else
+	{
+		apu_.reset( 0x0003, 15 );
+	}
+	
+	return Sgc_Impl::start_track( t );
+}
+
+blargg_err_t Sgc_Core::end_frame( time_t t )
+{
+	RETURN_ERR( Sgc_Impl::end_frame( t ) );
+	apu_.end_frame( t );
+	if ( sega_mapping() && fm_accessed )
+	{
+		if ( fm_apu_.supported() )
+			fm_apu_.end_frame( t );
+		else
+			set_warning( "FM sound not supported" );
+	}
+
+	return blargg_ok;
+}
+	
+Sgc_Core::Sgc_Core()
+{ }
+
+Sgc_Core::~Sgc_Core()
+{ }
+
+void Sgc_Core::cpu_out( time_t time, addr_t addr, int data )
+{
+	int port = addr & 0xFF;
+	
+	if ( sega_mapping() )
+	{
+		switch ( port )
+		{
+		case 0x06:
+			apu_.write_ggstereo( time, data );
+			return;
+		
+		case 0x7E:
+		case 0x7F:
+			apu_.write_data( time, data ); dprintf( "$7E<-%02X\n", data );
+			return;
+		
+		case 0xF0:
+			fm_accessed = true;
+			if ( fm_apu_.supported() )
+				fm_apu_.write_addr( data );//, dprintf( "$F0<-%02X\n", data );
+			return;
+		
+		case 0xF1:
+			fm_accessed = true;
+			if ( fm_apu_.supported() )
+				fm_apu_.write_data( time, data );//, dprintf( "$F1<-%02X\n", data );
+			return;
+		}
+	}
+	else if ( port >= 0xE0 )
+	{
+		apu_.write_data( time, data );
+		return;
+	}
+	
+	Sgc_Impl::cpu_out( time, addr, data );
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Core.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Core.h Changed

@@ -1,44 +1,44 @@
-// Sega/Game Gear/Coleco SGC music file emulator core
-
-// Game_Music_Emu 0.6-pre
-#ifndef SGC_CORE_H
-#define SGC_CORE_H
-
-#include "Sgc_Impl.h"
-#include "Sms_Fm_Apu.h"
-#include "Sms_Apu.h"
-
-class Sgc_Core : public Sgc_Impl {
-public:
-	
-	// Adjusts music tempo, where 1.0 is normal. Can be changed while playing.
-	// Resets to 1.0 when loading file.
-	void set_tempo( double );
-	
-	// Starts track, where 0 is the first.
-	blargg_err_t start_track( int );
-	
-	// Ends time frame at time t
-	blargg_err_t end_frame( time_t t );
-	
-	// SN76489 sound chip
-	Sms_Apu& apu()                  { return apu_; }
-	Sms_Fm_Apu& fm_apu()            { return fm_apu_; }
-	
-protected:
-	// Overrides
-	virtual void cpu_out( time_t, addr_t, int data );
-	virtual blargg_err_t load_( Data_Reader& );
-
-// Implementation
-public:
-	Sgc_Core();
-	~Sgc_Core();
-
-private:
-	bool fm_accessed;
-	Sms_Apu apu_;
-	Sms_Fm_Apu fm_apu_;
-};
-
-#endif
+// Sega/Game Gear/Coleco SGC music file emulator core
+
+// Game_Music_Emu $vers
+#ifndef SGC_CORE_H
+#define SGC_CORE_H
+
+#include "Sgc_Impl.h"
+#include "Sms_Fm_Apu.h"
+#include "Sms_Apu.h"
+
+class Sgc_Core : public Sgc_Impl {
+public:
+	
+	// Adjusts music tempo, where 1.0 is normal. Can be changed while playing.
+	// Resets to 1.0 when loading file.
+	void set_tempo( double );
+	
+	// Starts track, where 0 is the first.
+	blargg_err_t start_track( int );
+	
+	// Ends time frame at time t
+	blargg_err_t end_frame( time_t t );
+	
+	// SN76489 sound chip
+	Sms_Apu& apu()                  { return apu_; }
+	Sms_Fm_Apu& fm_apu()            { return fm_apu_; }
+	
+protected:
+	// Overrides
+	virtual void cpu_out( time_t, addr_t, int data );
+	virtual blargg_err_t load_( Data_Reader& );
+
+// Implementation
+public:
+	Sgc_Core();
+	~Sgc_Core();
+
+private:
+	bool fm_accessed;
+	Sms_Apu apu_;
+	Sms_Fm_Apu fm_apu_;
+};
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Cpu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Cpu.cpp Changed

@@ -1,36 +1,36 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Sgc_Impl.h"
-
-#include "blargg_endian.h"
-//#include "z80_cpu_log.h"
-
-/* Copyright (C) 2009 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 OUT_PORT(  addr, data ) cpu_out( TIME(), addr, data )
-#define IN_PORT(   addr       ) cpu_in( addr )
-#define WRITE_MEM( addr, data ) cpu_write( addr, data )
-#define IDLE_ADDR               idle_addr
-#define CPU                     cpu
-#define RST_BASE                vectors_addr
-
-#define CPU_BEGIN \
-bool Sgc_Impl::run_cpu( time_t end_time )\
-{\
-	cpu.set_end_time( end_time );
-
-	#include "Z80_Cpu_run.h"
-	
-	return warning;
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Sgc_Impl.h"
+
+#include "blargg_endian.h"
+//#include "z80_cpu_log.h"
+
+/* Copyright (C) 2009 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 OUT_PORT(  addr, data ) cpu_out( TIME(), addr, data )
+#define IN_PORT(   addr       ) cpu_in( addr )
+#define WRITE_MEM( addr, data ) cpu_write( addr, data )
+#define IDLE_ADDR               idle_addr
+#define CPU                     cpu
+#define RST_BASE                vectors_addr
+
+#define CPU_BEGIN \
+bool Sgc_Impl::run_cpu( time_t end_time )\
+{\
+	cpu.set_end_time( end_time );
+
+	#include "Z80_Cpu_run.h"
+	
+	return warning;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Emu.cpp Changed

@@ -1,136 +1,167 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Sgc_Emu.h"
-
-/* Copyright (C) 2009 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 osc_count = Sms_Apu::osc_count + Sms_Fm_Apu::osc_count;
-
-Sgc_Emu::Sgc_Emu()
-{
-	set_type( gme_sgc_type );
-	set_silence_lookahead( 6 );
-	set_gain( 1.2 );
-}
-
-Sgc_Emu::~Sgc_Emu() { }
-
-void Sgc_Emu::unload()
-{
-	core_.unload();
-	Music_Emu::unload();
-}
-
-// Track info
-
-static void copy_sgc_fields( Sgc_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 Sgc_Emu::track_info_( track_info_t* out, int ) const
-{
-	copy_sgc_fields( header(), out );
-	return blargg_ok;
-}
-
-struct Sgc_File : Gme_Info_
-{
-	Sgc_Emu::header_t h;
-	
-	Sgc_File() { set_type( gme_sgc_type ); }
-	
-	blargg_err_t load_( Data_Reader& in )
-	{
-		blargg_err_t err = in.read( &h, h.size );
-		if ( err )
-			return (blargg_is_err_type( err, blargg_err_file_eof ) ? blargg_err_file_type : err);
-		
-		set_track_count( h.song_count );
-		if ( !h.valid_tag() )
-			return blargg_err_file_type;
-		
-		return blargg_ok;
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int ) const
-	{
-		copy_sgc_fields( h, out );
-		return blargg_ok;
-	}
-};
-
-static Music_Emu* new_sgc_emu () { return BLARGG_NEW Sgc_Emu ; }
-static Music_Emu* new_sgc_file() { return BLARGG_NEW Sgc_File; }
-
-gme_type_t_ const gme_sgc_type 1 = {{ "Z80 PSG", 0, &new_sgc_emu, &new_sgc_file, "SGC", 1 }};
-
-// Setup
-
-blargg_err_t Sgc_Emu::load_( Data_Reader& in )
-{
-	RETURN_ERR( core_.load( in ) );
-	set_warning( core_.warning() );
-	set_track_count( header().song_count );
-	set_voice_count( core_.sega_mapping() ? osc_count : core_.apu().osc_count );
-	
-	core_.apu ().volume( gain() );
-	core_.fm_apu().volume( gain() );
-	
-	static const char* const names osc_count + 1 = {
-		"Square 1", "Square 2", "Square 3", "Noise", "FM"
-	};
-	set_voice_names( names );
-	
-	static int const types osc_count + 1 = {
-		wave_type+1, wave_type+2, wave_type+3, mixed_type+1, mixed_type+2
-	};
-	set_voice_types( types );
-	
-	return setup_buffer( core_.clock_rate() );
-}
-
-void Sgc_Emu::update_eq( blip_eq_t const& eq )
-{
-	core_.apu ().treble_eq( eq );
-	core_.fm_apu().treble_eq( eq );
-}
-
-void Sgc_Emu::set_voice( int i, Blip_Buffer* c, Blip_Buffer* l, Blip_Buffer* r )
-{
-	if ( i < core_.apu().osc_count )
-		core_.apu().set_output( i, c, l, r );
-	else
-		core_.fm_apu().set_output( c, l, r );
-}
-
-void Sgc_Emu::set_tempo_( double t )
-{
-	core_.set_tempo( t );
-}
-
-blargg_err_t Sgc_Emu::start_track_( int track )
-{
-	RETURN_ERR( core_.start_track( track ) );
-	return Classic_Emu::start_track_( track );
-}
-
-blargg_err_t Sgc_Emu::run_clocks( blip_time_t& duration, int )
-{
-	RETURN_ERR( core_.end_frame( duration ) );
-	set_warning( core_.warning() );
-	return blargg_ok;
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Sgc_Emu.h"
+
+/* Copyright (C) 2009 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 osc_count = Sms_Apu::osc_count + Sms_Fm_Apu::osc_count;
+
+Sgc_Emu::Sgc_Emu()
+{
+	set_type( gme_sgc_type );
+	set_silence_lookahead( 6 );
+	set_gain( 1.2 );
+}
+
+Sgc_Emu::~Sgc_Emu() { }
+
+void Sgc_Emu::unload()
+{
+	core_.unload();
+	Music_Emu::unload();
+}
+
+// Track info
+
+static void copy_sgc_fields( Sgc_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 );
+}
+
+static void hash_sgc_file( Sgc_Emu::header_t const& h, byte const* data, int data_size, Music_Emu::Hash_Function& out )
+{
+	out.hash_( &h.vers, sizeof(h.vers) );
+	out.hash_( &h.rate, sizeof(h.rate) );
+	out.hash_( &h.reserved10, sizeof(h.reserved1) );
+	out.hash_( &h.load_addr0, sizeof(h.load_addr) );
+	out.hash_( &h.init_addr0, sizeof(h.init_addr) );
+	out.hash_( &h.play_addr0, sizeof(h.play_addr) );
+	out.hash_( &h.stack_ptr0, sizeof(h.stack_ptr) );
+	out.hash_( &h.reserved20, sizeof(h.reserved2) );
+	out.hash_( &h.rst_addrs0, sizeof(h.rst_addrs) );
+	out.hash_( &h.mapping0, sizeof(h.mapping) );
+	out.hash_( &h.first_song, sizeof(h.first_song) );
+	out.hash_( &h.song_count, sizeof(h.song_count) );
+	out.hash_( &h.first_effect, sizeof(h.first_effect) );
+	out.hash_( &h.last_effect, sizeof(h.last_effect) );
+	out.hash_( &h.system, sizeof(h.system) );
+	out.hash_( &h.reserved30, sizeof(h.reserved3) );
+	out.hash_( data, data_size );
+}
+
+blargg_err_t Sgc_Emu::track_info_( track_info_t* out, int ) const
+{
+	copy_sgc_fields( header(), out );
+	return blargg_ok;
+}
+
+struct Sgc_File : Gme_Info_
+{
+	Sgc_Emu::header_t const* h;
+	
+	Sgc_File() { set_type( gme_sgc_type ); }
+	
+	blargg_err_t load_mem_( byte const begin , int size )
+	{
+		h = ( Sgc_Emu::header_t const* ) begin;
+		
+		set_track_count( h->song_count );
+		if ( !h->valid_tag() )
+			return blargg_err_file_type;
+		
+		return blargg_ok;
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int ) const
+	{
+		copy_sgc_fields( *h, out );
+		return blargg_ok;
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		hash_sgc_file( *h, file_begin() + h->size, file_end() - file_begin() - h->size, out );
+		return blargg_ok;
+	}
+};
+
+static Music_Emu* new_sgc_emu () { return BLARGG_NEW Sgc_Emu ; }
+static Music_Emu* new_sgc_file() { return BLARGG_NEW Sgc_File; }
+
+gme_type_t_ const gme_sgc_type 1 = {{ "Z80 PSG", 0, &new_sgc_emu, &new_sgc_file, "SGC", 1 }};
+
+// Setup
+
+blargg_err_t Sgc_Emu::load_( Data_Reader& in )
+{
+	RETURN_ERR( core_.load( in ) );
+	set_warning( core_.warning() );
+	set_track_count( header().song_count );
+	set_voice_count( core_.sega_mapping() ? osc_count : core_.apu().osc_count );
+	
+	core_.apu ().volume( gain() );
+	core_.fm_apu().volume( gain() );
+	
+	static const char* const names osc_count + 1 = {
+		"Square 1", "Square 2", "Square 3", "Noise", "FM"
+	};
+	set_voice_names( names );
+	
+	static int const types osc_count + 1 = {
+		wave_type+1, wave_type+2, wave_type+3, mixed_type+1, mixed_type+2
+	};
+	set_voice_types( types );
+	
+	return setup_buffer( core_.clock_rate() );
+}
+
+void Sgc_Emu::update_eq( blip_eq_t const& eq )
+{
+	core_.apu ().treble_eq( eq );
+	core_.fm_apu().treble_eq( eq );
+}
+
+void Sgc_Emu::set_voice( int i, Blip_Buffer* c, Blip_Buffer* l, Blip_Buffer* r )
+{
+	if ( i < core_.apu().osc_count )
+		core_.apu().set_output( i, c, l, r );
+	else
+		core_.fm_apu().set_output( c, l, r );
+}
+
+void Sgc_Emu::set_tempo_( double t )
+{
+	core_.set_tempo( t );
+}
+
+blargg_err_t Sgc_Emu::start_track_( int track )
+{
+	RETURN_ERR( core_.start_track( track ) );
+	return Classic_Emu::start_track_( track );
+}
+
+blargg_err_t Sgc_Emu::run_clocks( blip_time_t& duration, int )
+{
+	RETURN_ERR( core_.end_frame( duration ) );
+	set_warning( core_.warning() );
+	return blargg_ok;
+}
+
+blargg_err_t Sgc_Emu::hash_( Hash_Function& out ) const
+{
+	hash_sgc_file( header(), core_.rom_().begin(), core_.rom_().file_size(), out );
+	return blargg_ok;
+}
\ No newline at end of file

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Emu.h Changed

@@ -1,43 +1,45 @@
-// Sega/Game Gear/Coleco SGC music file emulator
-
-// Game_Music_Emu 0.6-pre
-#ifndef SGC_EMU_H
-#define SGC_EMU_H
-
-#include "Classic_Emu.h"
-#include "Sgc_Core.h"
-
-class Sgc_Emu : public Classic_Emu {
-public:
-	// SGC file header (see Sgc_Impl.h)
-	typedef Sgc_Core::header_t header_t;
-	
-	// Header for currently loaded file
-	header_t const& header() const              { return core_.header(); }
-	
-	// Sets 0x2000-byte Coleco BIOS. Necessary to play Coleco tracks.
-	static void set_coleco_bios( void const* p ){ Sgc_Core::set_coleco_bios( p ); }
-	
-	static gme_type_t static_type()             { return gme_sgc_type; }
-	
-// Internal
-public:
-	Sgc_Emu();
-	~Sgc_Emu();
-
-protected:
-	// Classic_Emu overrides
-	virtual blargg_err_t track_info_( track_info_t*, int track ) const;
-	virtual blargg_err_t load_( Data_Reader& );
-	virtual blargg_err_t start_track_( int );
-	virtual blargg_err_t run_clocks( blip_time_t&, int );
-	virtual void set_tempo_( double );
-	virtual void set_voice( int, Blip_Buffer*, Blip_Buffer*, Blip_Buffer* );
-	virtual void update_eq( blip_eq_t const& );
-	virtual void unload();
-	
-private:
-	Sgc_Core core_;
-};
-
-#endif
+// Sega/Game Gear/Coleco SGC music file emulator
+
+// Game_Music_Emu $vers
+#ifndef SGC_EMU_H
+#define SGC_EMU_H
+
+#include "Classic_Emu.h"
+#include "Sgc_Core.h"
+
+class Sgc_Emu : public Classic_Emu {
+public:
+	// SGC file header (see Sgc_Impl.h)
+	typedef Sgc_Core::header_t header_t;
+	
+	// Header for currently loaded file
+	header_t const& header() const              { return core_.header(); }
+
+	blargg_err_t hash_( Hash_Function& ) const;
+	
+	// Sets 0x2000-byte Coleco BIOS. Necessary to play Coleco tracks.
+	static void set_coleco_bios( void const* p ){ Sgc_Core::set_coleco_bios( p ); }
+	
+	static gme_type_t static_type()             { return gme_sgc_type; }
+	
+// Internal
+public:
+	Sgc_Emu();
+	~Sgc_Emu();
+
+protected:
+	// Classic_Emu overrides
+	virtual blargg_err_t track_info_( track_info_t*, int track ) const;
+	virtual blargg_err_t load_( Data_Reader& );
+	virtual blargg_err_t start_track_( int );
+	virtual blargg_err_t run_clocks( blip_time_t&, int );
+	virtual void set_tempo_( double );
+	virtual void set_voice( int, Blip_Buffer*, Blip_Buffer*, Blip_Buffer* );
+	virtual void update_eq( blip_eq_t const& );
+	virtual void unload();
+	
+private:
+	Sgc_Core core_;
+};
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Impl.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Impl.cpp Changed

@@ -1,225 +1,225 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Sgc_Impl.h"
-
-/* Copyright (C) 2006-2009 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 const* Sgc_Impl::coleco_bios;
-
-Sgc_Impl::Sgc_Impl() :
-	rom( bank_size )
-{
-	assert( offsetof (header_t,copyright 32) == header_t::size );
-}
-
-Sgc_Impl::~Sgc_Impl()
-{ }
-
-bool Sgc_Impl::header_t::valid_tag() const
-{
-	return 0 == memcmp( tag, "SGC\x1A", 4 );
-}
-
-blargg_err_t Sgc_Impl::load_( Data_Reader& in )
-{
-	RETURN_ERR( rom.load( in, header_.size, &header_, 0 ) );
-	
-	if ( !header_.valid_tag() )
-		return blargg_err_file_type;
-	
-	if ( header_.vers != 1 )
-		set_warning( "Unknown file version" );
-	
-	if ( header_.system > 2 )
-		set_warning( "Unknown system" );
-	
-	addr_t load_addr = get_le16( header_.load_addr );
-	if ( load_addr < 0x400 )
-		set_warning( "Invalid load address" );
-	
-	rom.set_addr( load_addr );
-	play_period = clock_rate() / 60;
-	
-	if ( sega_mapping() )
-	{
-		RETURN_ERR( ram.resize( 0x2000 + Sgc_Cpu::page_padding ) );
-		RETURN_ERR( ram2.resize( bank_size + Sgc_Cpu::page_padding ) );
-	}
-	else
-	{
-		RETURN_ERR( ram.resize( 0x400 + Sgc_Cpu::page_padding ) );
-	}
-	
-	RETURN_ERR( vectors.resize( Sgc_Cpu::page_size + Sgc_Cpu::page_padding ) );
-	
-	// TODO: doesn't need to be larger than page size, if we do mapping calls right
-	RETURN_ERR( unmapped_write.resize( bank_size ) );
-	
-	return blargg_ok;
-}
-
-void Sgc_Impl::unload()
-{
-	rom.clear();
-	vectors.clear();
-	ram.clear();
-	ram2.clear();
-	unmapped_write.clear();
-	Gme_Loader::unload();
-}
-
-blargg_err_t Sgc_Impl::start_track( int track )
-{
-	memset( ram .begin(), 0, ram .size() );
-	memset( ram2.begin(), 0, ram2.size() );
-	memset( vectors.begin(), 0xFF, vectors.size() );
-	cpu.reset( unmapped_write.begin(), rom.unmapped() );
-	
-	if ( sega_mapping() )
-	{
-		vectors_addr = 0x10000 - Sgc_Cpu::page_size;
-		idle_addr = vectors_addr;
-		for ( int i = 1; i < 8; ++i )
-		{
-			vectors i*8 + 0 = 0xC3; // JP addr
-			vectors i*8 + 1 = header_.rst_addrs i*2 + 0;
-			vectors i*8 + 2 = header_.rst_addrs i*2 + 1;
-		}
-		
-		cpu.map_mem( 0xC000, 0x2000, ram.begin() );
-		cpu.map_mem( vectors_addr, cpu.page_size, unmapped_write.begin(), vectors.begin() );
-		
-		bank2 = NULL;
-		for ( int i = 0; i < 4; ++i )
-			cpu_write( 0xFFFC + i, header_.mapping i );
-	}
-	else
-	{
-		if ( !coleco_bios )
-			return BLARGG_ERR( BLARGG_ERR_CALLER, "Coleco BIOS not set" );
-		
-		vectors_addr = 0;
-		cpu.map_mem( 0, 0x2000, unmapped_write.begin(), coleco_bios );
-		for ( int i = 0; i < 8; ++i )
-			cpu.map_mem( 0x6000 + i*0x400, 0x400, ram.begin() );
-		
-		idle_addr = 0x2000;
-		cpu.map_mem( 0x2000, cpu.page_size, unmapped_write.begin(), vectors.begin() );
-		
-		for ( int i = 0; i < 0x8000 / bank_size; ++i )
-		{
-			int addr = 0x8000 + i*bank_size;
-			cpu.map_mem( addr, bank_size, unmapped_write.begin(), rom.at_addr( addr ) );
-		}
-	}
-	
-	cpu.r.sp = get_le16( header_.stack_ptr );
-	cpu.r.b.a = track;
-	next_play = play_period;
-	
-	jsr( header_.init_addr );
-	
-	return blargg_ok;
-}
-
-// Emulation
-
-void Sgc_Impl::jsr( byte const (&addr) 2 )
-{
-	*cpu.write( --cpu.r.sp ) = idle_addr >> 8;
-	*cpu.write( --cpu.r.sp ) = idle_addr & 0xFF;
-	cpu.r.pc = get_le16( addr );
-}
-
-void Sgc_Impl::set_bank( int bank, void const* data )
-{
-	//dprintf( "map bank %d to %p\n", bank, (byte*) data - rom.at_addr( 0 ) );
-	cpu.map_mem( bank * bank_size, bank_size, unmapped_write.begin(), data );
-}
-
-void Sgc_Impl::cpu_write( addr_t addr, int data )
-{
-	if ( (addr ^ 0xFFFC) > 3 || !sega_mapping() )
-	{
-		*cpu.write( addr ) = data;
-		return;
-	}
-	
-	switch ( addr )
-	{
-	case 0xFFFC:
-		cpu.map_mem( 2 * bank_size, bank_size, ram2.begin() );
-		if ( data & 0x08 )
-			break;
-		
-		bank2 = ram2.begin();
-		// FALL THROUGH
-	
-	case 0xFFFF: {
-		bool rom_mapped = (cpu.read( 2 * bank_size ) == bank2);
-		bank2 = rom.at_addr( data * bank_size );
-		if ( rom_mapped )
-			set_bank( 2, bank2 );
-		break;
-	}
-		
-	case 0xFFFD:
-		set_bank( 0, rom.at_addr( data * bank_size ) );
-		break;
-	
-	case 0xFFFE:
-		set_bank( 1, rom.at_addr( data * bank_size ) );
-		break;
-	}
-}
-
-int Sgc_Impl::cpu_in( addr_t addr )
-{
-	dprintf( "in %02X\n", addr );
-	return 0;
-}
-	
-void Sgc_Impl::cpu_out( time_t, addr_t addr, int )
-{
-	dprintf( "out %02X\n", addr & 0xFF );
-}
-
-blargg_err_t Sgc_Impl::end_frame( time_t end )
-{
-	while ( cpu.time() < end )
-	{
-		time_t next = min( end, next_play );
-		if ( run_cpu( next ) )
-		{
-			set_warning( "Unsupported CPU instruction" );
-			cpu.set_time( next );
-		}
-		
-		if ( cpu.r.pc == idle_addr )
-			cpu.set_time( next );
-		
-		if ( cpu.time() >= next_play )
-		{
-			next_play += play_period;
-			if ( cpu.r.pc == idle_addr )
-				jsr( header_.play_addr );
-		}
-	}
-	
-	next_play -= end;
-	check( next_play >= 0 );
-	cpu.adjust_time( -end );
-	
-	return blargg_ok;
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Sgc_Impl.h"
+
+/* Copyright (C) 2006-2009 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 const* Sgc_Impl::coleco_bios;
+
+Sgc_Impl::Sgc_Impl() :
+	rom( bank_size )
+{
+	assert( offsetof (header_t,copyright 32) == header_t::size );
+}
+
+Sgc_Impl::~Sgc_Impl()
+{ }
+
+bool Sgc_Impl::header_t::valid_tag() const
+{
+	return 0 == memcmp( tag, "SGC\x1A", 4 );
+}
+
+blargg_err_t Sgc_Impl::load_( Data_Reader& in )
+{
+	RETURN_ERR( rom.load( in, header_.size, &header_, 0 ) );
+	
+	if ( !header_.valid_tag() )
+		return blargg_err_file_type;
+	
+	if ( header_.vers != 1 )
+		set_warning( "Unknown file version" );
+	
+	if ( header_.system > 2 )
+		set_warning( "Unknown system" );
+	
+	addr_t load_addr = get_le16( header_.load_addr );
+	if ( load_addr < 0x400 )
+		set_warning( "Invalid load address" );
+	
+	rom.set_addr( load_addr );
+	play_period = clock_rate() / 60;
+	
+	if ( sega_mapping() )
+	{
+		RETURN_ERR( ram.resize( 0x2000 + Sgc_Cpu::page_padding ) );
+		RETURN_ERR( ram2.resize( bank_size + Sgc_Cpu::page_padding ) );
+	}
+	else
+	{
+		RETURN_ERR( ram.resize( 0x400 + Sgc_Cpu::page_padding ) );
+	}
+	
+	RETURN_ERR( vectors.resize( Sgc_Cpu::page_size + Sgc_Cpu::page_padding ) );
+	
+	// TODO: doesn't need to be larger than page size, if we do mapping calls right
+	RETURN_ERR( unmapped_write.resize( bank_size ) );
+	
+	return blargg_ok;
+}
+
+void Sgc_Impl::unload()
+{
+	rom.clear();
+	vectors.clear();
+	ram.clear();
+	ram2.clear();
+	unmapped_write.clear();
+	Gme_Loader::unload();
+}
+
+blargg_err_t Sgc_Impl::start_track( int track )
+{
+	memset( ram .begin(), 0, ram .size() );
+	memset( ram2.begin(), 0, ram2.size() );
+	memset( vectors.begin(), 0xFF, vectors.size() );
+	cpu.reset( unmapped_write.begin(), rom.unmapped() );
+	
+	if ( sega_mapping() )
+	{
+		vectors_addr = 0x10000 - Sgc_Cpu::page_size;
+		idle_addr = vectors_addr;
+		for ( int i = 1; i < 7; ++i )
+		{
+			vectors i*8 + 0 = 0xC3; // JP addr
+			vectors i*8 + 1 = header_.rst_addrs i*2 + 0;
+			vectors i*8 + 2 = header_.rst_addrs i*2 + 1;
+		}
+		
+		cpu.map_mem( 0xC000, 0x2000, ram.begin() );
+		cpu.map_mem( vectors_addr, cpu.page_size, unmapped_write.begin(), vectors.begin() );
+		
+		bank2 = NULL;
+		for ( int i = 0; i < 4; ++i )
+			cpu_write( 0xFFFC + i, header_.mapping i );
+	}
+	else
+	{
+		if ( !coleco_bios )
+			return BLARGG_ERR( BLARGG_ERR_CALLER, "Coleco BIOS not set" );
+		
+		vectors_addr = 0;
+		cpu.map_mem( 0, 0x2000, unmapped_write.begin(), coleco_bios );
+		for ( int i = 0; i < 8; ++i )
+			cpu.map_mem( 0x6000 + i*0x400, 0x400, ram.begin() );
+		
+		idle_addr = 0x2000;
+		cpu.map_mem( 0x2000, cpu.page_size, unmapped_write.begin(), vectors.begin() );
+		
+		for ( int i = 0; i < 0x8000 / bank_size; ++i )
+		{
+			int addr = 0x8000 + i*bank_size;
+			cpu.map_mem( addr, bank_size, unmapped_write.begin(), rom.at_addr( addr ) );
+		}
+	}
+	
+	cpu.r.sp = get_le16( header_.stack_ptr );
+	cpu.r.b.a = track;
+	next_play = play_period;
+	
+	jsr( header_.init_addr );
+	
+	return blargg_ok;
+}
+
+// Emulation
+
+void Sgc_Impl::jsr( byte const (&addr) 2 )
+{
+	*cpu.write( --cpu.r.sp ) = idle_addr >> 8;
+	*cpu.write( --cpu.r.sp ) = idle_addr & 0xFF;
+	cpu.r.pc = get_le16( addr );
+}
+
+void Sgc_Impl::set_bank( int bank, void const* data )
+{
+	//dprintf( "map bank %d to %p\n", bank, (byte*) data - rom.at_addr( 0 ) );
+	cpu.map_mem( bank * bank_size, bank_size, unmapped_write.begin(), data );
+}
+
+void Sgc_Impl::cpu_write( addr_t addr, int data )
+{
+	if ( (addr ^ 0xFFFC) > 3 || !sega_mapping() )
+	{
+		*cpu.write( addr ) = data;
+		return;
+	}
+	
+	switch ( addr )
+	{
+	case 0xFFFC:
+		cpu.map_mem( 2 * bank_size, bank_size, ram2.begin() );
+		if ( data & 0x08 )
+			break;
+		
+		bank2 = ram2.begin();
+		// FALL THROUGH
+	
+	case 0xFFFF: {
+		bool rom_mapped = (cpu.read( 2 * bank_size ) == bank2);
+		bank2 = rom.at_addr( data * bank_size );
+		if ( rom_mapped )
+			set_bank( 2, bank2 );
+		break;
+	}
+		
+	case 0xFFFD:
+		set_bank( 0, rom.at_addr( data * bank_size ) );
+		break;
+	
+	case 0xFFFE:
+		set_bank( 1, rom.at_addr( data * bank_size ) );
+		break;
+	}
+}
+
+int Sgc_Impl::cpu_in( addr_t addr )
+{
+	dprintf( "in %02X\n", addr );
+	return 0;
+}
+	
+void Sgc_Impl::cpu_out( time_t, addr_t addr, int )
+{
+	dprintf( "out %02X\n", addr & 0xFF );
+}
+
+blargg_err_t Sgc_Impl::end_frame( time_t end )
+{
+	while ( cpu.time() < end )
+	{
+		time_t next = min( end, next_play );
+		if ( run_cpu( next ) )
+		{
+			set_warning( "Unsupported CPU instruction" );
+			cpu.set_time( next );
+		}
+		
+		if ( cpu.r.pc == idle_addr )
+			cpu.set_time( next );
+		
+		if ( cpu.time() >= next_play )
+		{
+			next_play += play_period;
+			if ( cpu.r.pc == idle_addr )
+				jsr( header_.play_addr );
+		}
+	}
+	
+	next_play -= end;
+	check( next_play >= 0 );
+	cpu.adjust_time( -end );
+	
+	return blargg_ok;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Impl.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sgc_Impl.h Changed

@@ -1,114 +1,116 @@
-// Sega/Game Gear/Coleco SGC music file emulator implementation internals
-
-// Game_Music_Emu 0.6-pre
-#ifndef SGC_IMPL_H
-#define SGC_IMPL_H
-
-#include "Gme_Loader.h"
-#include "Rom_Data.h"
-#include "Z80_Cpu.h"
-
-class Sgc_Impl : public Gme_Loader {
-public:
-	
-	// SGC file header
-	struct header_t
-	{
-		enum { size = 0xA0 };
-		
-		char tag 4; // "SGC\x1A"
-		byte vers; // 0x01
-		byte rate; // 0=NTSC 1=PAL
-		byte reserved1 2;
-		byte load_addr 2;
-		byte init_addr 2;
-		byte play_addr 2;
-		byte stack_ptr 2;
-		byte reserved2 2;
-		byte rst_addrs 7*2;
-		byte mapping 4; // Used by Sega only
-		byte first_song; // Song to start playing first
-		byte song_count;
-		byte first_effect;
-		byte last_effect;
-		byte system; // 0=Master System 1=Game Gear 2=Colecovision
-		byte reserved3 23;
-		char game 32; // strings can be 32 chars, NOT terminated
-		char author 32;
-		char copyright 32;
-		
-		// True if header has valid file signature
-		bool valid_tag() const;
-		
-		int effect_count() const { return last_effect ? last_effect - first_effect + 1 : 0; }
-	};
-	
-	// Header for currently loaded file
-	header_t const& header() const { return header_; }
-	
-	int clock_rate() const { return header_.rate ? 3546893 : 3579545; }
-	
-	// 0x2000 bytes
-	static void set_coleco_bios( void const* p ) { coleco_bios = p; }
-	
-	// Clocks between calls to play routine
-	typedef int time_t;
-	void set_play_period( time_t p ) { play_period = p; }
-	
-	// 0 = first track
-	blargg_err_t start_track( int );
-	
-	// Runs for t clocks
-	blargg_err_t end_frame( time_t t );
-	
-	// True if Master System or Game Gear
-	bool sega_mapping() const;
-	
-protected:
-	typedef Z80_Cpu Sgc_Cpu;
-	Sgc_Cpu cpu;
-	
-	typedef int addr_t;
-	virtual void cpu_out( time_t, addr_t, int data ) BLARGG_PURE( ; )
-
-// Implementation
-public:
-	Sgc_Impl();
-	~Sgc_Impl();
-	virtual void unload();
-
-protected:
-	virtual blargg_err_t load_( Data_Reader& );
-
-private:
-	enum { bank_size = 0x4000 };
-	
-	Rom_Data rom;
-	time_t play_period;
-	time_t next_play;
-	void const* bank2; // ROM selected for bank 2, in case RAM is currently hiding it
-	addr_t vectors_addr; // RST vectors start here
-	addr_t idle_addr; // return address for init/play routines
-	static void const* coleco_bios;
-	
-	// large items
-	header_t header_;
-	blargg_vector<byte> vectors;
-	blargg_vector<byte> ram;
-	blargg_vector<byte> ram2;
-	blargg_vector<byte> unmapped_write;
-	
-	bool run_cpu( time_t end );
-	void jsr( byte const (&addr) 2 );
-	void cpu_write( addr_t, int data );
-	int cpu_in( addr_t );
-	
-	void set_bank( int bank, void const* data );
-};
-
-inline bool Sgc_Impl::sega_mapping() const
-{
-	return header_.system <= 1;
-}
-
-#endif
+// Sega/Game Gear/Coleco SGC music file emulator implementation internals
+
+// Game_Music_Emu $vers
+#ifndef SGC_IMPL_H
+#define SGC_IMPL_H
+
+#include "Gme_Loader.h"
+#include "Rom_Data.h"
+#include "Z80_Cpu.h"
+
+class Sgc_Impl : public Gme_Loader {
+public:
+	
+	// SGC file header
+	struct header_t
+	{
+		enum { size = 0xA0 };
+		
+		char tag 4; // "SGC\x1A"
+		byte vers; // 0x01
+		byte rate; // 0=NTSC 1=PAL
+		byte reserved1 2;
+		byte load_addr 2;
+		byte init_addr 2;
+		byte play_addr 2;
+		byte stack_ptr 2;
+		byte reserved2 2;
+		byte rst_addrs 7*2;
+		byte mapping 4; // Used by Sega only
+		byte first_song; // Song to start playing first
+		byte song_count;
+		byte first_effect;
+		byte last_effect;
+		byte system; // 0=Master System 1=Game Gear 2=Colecovision
+		byte reserved3 23;
+		char game 32; // strings can be 32 chars, NOT terminated
+		char author 32;
+		char copyright 32;
+		
+		// True if header has valid file signature
+		bool valid_tag() const;
+		
+		int effect_count() const { return last_effect ? last_effect - first_effect + 1 : 0; }
+	};
+	
+	// Header for currently loaded file
+	header_t const& header() const { return header_; }
+
+	Rom_Data const& rom_() const { return rom; }
+	
+	int clock_rate() const { return header_.rate ? 3546893 : 3579545; }
+	
+	// 0x2000 bytes
+	static void set_coleco_bios( void const* p ) { coleco_bios = p; }
+	
+	// Clocks between calls to play routine
+	typedef int time_t;
+	void set_play_period( time_t p ) { play_period = p; }
+	
+	// 0 = first track
+	blargg_err_t start_track( int );
+	
+	// Runs for t clocks
+	blargg_err_t end_frame( time_t t );
+	
+	// True if Master System or Game Gear
+	bool sega_mapping() const;
+	
+protected:
+	typedef Z80_Cpu Sgc_Cpu;
+	Sgc_Cpu cpu;
+	
+	typedef int addr_t;
+	virtual void cpu_out( time_t, addr_t, int data ) BLARGG_PURE( ; )
+
+// Implementation
+public:
+	Sgc_Impl();
+	~Sgc_Impl();
+	virtual void unload();
+
+protected:
+	virtual blargg_err_t load_( Data_Reader& );
+
+private:
+	enum { bank_size = 0x4000 };
+	
+	Rom_Data rom;
+	time_t play_period;
+	time_t next_play;
+	void const* bank2; // ROM selected for bank 2, in case RAM is currently hiding it
+	addr_t vectors_addr; // RST vectors start here
+	addr_t idle_addr; // return address for init/play routines
+	static void const* coleco_bios;
+	
+	// large items
+	header_t header_;
+	blargg_vector<byte> vectors;
+	blargg_vector<byte> ram;
+	blargg_vector<byte> ram2;
+	blargg_vector<byte> unmapped_write;
+	
+	bool run_cpu( time_t end );
+	void jsr( byte const (&addr) 2 );
+	void cpu_write( addr_t, int data );
+	int cpu_in( addr_t );
+	
+	void set_bank( int bank, void const* data );
+};
+
+inline bool Sgc_Impl::sega_mapping() const
+{
+	return header_.system <= 1;
+}
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sms_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sms_Apu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sms_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sms_Apu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sms_Fm_Apu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sms_Fm_Apu.cpp Changed

@@ -1,80 +1,80 @@
-#include "Sms_Fm_Apu.h"
-
-#include "blargg_source.h"
-
-Sms_Fm_Apu::Sms_Fm_Apu()
-{ }
-
-Sms_Fm_Apu::~Sms_Fm_Apu()
-{ }
-
-blargg_err_t Sms_Fm_Apu::init( double clock_rate, double sample_rate )
-{
-	period_ = clock_rate / sample_rate + 0.5;
-	CHECK_ALLOC( !apu.set_rate( sample_rate, clock_rate ) );
-	
-	set_output( 0 );
-	volume( 1.0 );
-	reset();
-	return blargg_ok;
-}
-
-void Sms_Fm_Apu::reset()
-{
-	addr = 0;
-	next_time = 0;
-	last_amp = 0;
-	
-	apu.reset();
-}
-
-void Sms_Fm_Apu::write_data( blip_time_t time, int data )
-{
-	if ( time > next_time )
-		run_until( time );
-	
-	apu.write( addr, data );
-}
-
-void Sms_Fm_Apu::run_until( blip_time_t end_time )
-{
-	assert( end_time > next_time );
-	
-	Blip_Buffer* const output = this->output_;
-	if ( !output )
-	{
-		next_time = end_time;
-		return;
-	}
-	
-	blip_time_t time = next_time;
-	do
-	{
-		Ym2413_Emu::sample_t samples 2;
-		apu.run( 1, samples );
-		int amp = (samples 0 + samples 1) >> 1;
-		
-		int delta = amp - last_amp;
-		if ( delta )
-		{
-			last_amp = amp;
-			synth.offset_inline( time, delta, output );
-		}
-		time += period_;
-	}
-	while ( time < end_time );
-	
-	next_time = time;
-}
-
-void Sms_Fm_Apu::end_frame( blip_time_t time )
-{
-	if ( time > next_time )
-		run_until( time );
-	
-	next_time -= time;
-	assert( next_time >= 0 );
-	
-	if ( output_ )
-		output_->set_modified();
-}
+#include "Sms_Fm_Apu.h"
+
+#include "blargg_source.h"
+
+Sms_Fm_Apu::Sms_Fm_Apu()
+{ }
+
+Sms_Fm_Apu::~Sms_Fm_Apu()
+{ }
+
+blargg_err_t Sms_Fm_Apu::init( double clock_rate, double sample_rate )
+{
+	period_ = clock_rate / sample_rate + 0.5;
+	CHECK_ALLOC( !apu.set_rate( sample_rate, clock_rate ) );
+	
+	set_output( 0 );
+	volume( 1.0 );
+	reset();
+	return blargg_ok;
+}
+
+void Sms_Fm_Apu::reset()
+{
+	addr = 0;
+	next_time = 0;
+	last_amp = 0;
+	
+	apu.reset();
+}
+
+void Sms_Fm_Apu::write_data( blip_time_t time, int data )
+{
+	if ( time > next_time )
+		run_until( time );
+	
+	apu.write( addr, data );
+}
+
+void Sms_Fm_Apu::run_until( blip_time_t end_time )
+{
+	assert( end_time > next_time );
+	
+	Blip_Buffer* const output = this->output_;
+	if ( !output )
+	{
+		next_time = end_time;
+		return;
+	}
+	
+	blip_time_t time = next_time;
+	do
+	{
+		Ym2413_Emu::sample_t samples 2 = {0};
+		apu.run( 1, samples );
+		int amp = (samples 0 + samples 1) >> 1;
+		
+		int delta = amp - last_amp;
+		if ( delta )
+		{
+			last_amp = amp;
+			synth.offset_inline( time, delta, output );
+		}
+		time += period_;
+	}
+	while ( time < end_time );
+	
+	next_time = time;
+}
+
+void Sms_Fm_Apu::end_frame( blip_time_t time )
+{
+	if ( time > next_time )
+		run_until( time );
+	
+	next_time -= time;
+	assert( next_time >= 0 );
+	
+	if ( output_ )
+		output_->set_modified();
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sms_Fm_Apu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Sms_Fm_Apu.h Changed

@@ -1,47 +1,47 @@
-#ifndef SMS_FM_APU_H
-#define SMS_FM_APU_H
-
-#include "Blip_Buffer.h"
-#include "Ym2413_Emu.h"
-
-class Sms_Fm_Apu {
-public:
-	static bool supported()                     { return Ym2413_Emu::supported(); }
-	blargg_err_t init( double clock_rate, double sample_rate );
-	
-	void set_output( Blip_Buffer* b, Blip_Buffer* = NULL, Blip_Buffer* = NULL ) { output_ = b; }
-	void volume( double v )                     { synth.volume( 0.4 / 4096 * v ); }
-	void treble_eq( blip_eq_t const& eq )       { synth.treble_eq( eq ); }
-	
-	void reset();
-	
-	void write_addr( int data )                 { addr = data; }
-	void write_data( blip_time_t, int data );
-	
-	void end_frame( blip_time_t t );
-
-// Implementation
-public:
-	Sms_Fm_Apu();
-	~Sms_Fm_Apu();
-	BLARGG_DISABLE_NOTHROW
-	enum { osc_count = 1 };
-	void set_output( int i, Blip_Buffer* b, Blip_Buffer* = NULL, Blip_Buffer* = NULL ) { output_ = b; }
-
-private:
-	Blip_Buffer* output_;
-	blip_time_t next_time;
-	int last_amp;
-	int addr;
-	
-	int clock_;
-	int rate_;
-	blip_time_t period_;
-	
-	Blip_Synth_Norm synth;
-	Ym2413_Emu apu;
-	
-	void run_until( blip_time_t );
-};
-
-#endif
+#ifndef SMS_FM_APU_H
+#define SMS_FM_APU_H
+
+#include "Blip_Buffer.h"
+#include "Ym2413_Emu.h"
+
+class Sms_Fm_Apu {
+public:
+	static bool supported()                     { return Ym2413_Emu::supported(); }
+	blargg_err_t init( double clock_rate, double sample_rate );
+	
+	void set_output( Blip_Buffer* b, Blip_Buffer* = NULL, Blip_Buffer* = NULL ) { output_ = b; }
+	void volume( double v )                     { synth.volume( 0.4 / 4096 * v ); }
+	void treble_eq( blip_eq_t const& eq )       { synth.treble_eq( eq ); }
+	
+	void reset();
+	
+	void write_addr( int data )                 { addr = data; }
+	void write_data( blip_time_t, int data );
+	
+	void end_frame( blip_time_t t );
+
+// Implementation
+public:
+	Sms_Fm_Apu();
+	~Sms_Fm_Apu();
+	BLARGG_DISABLE_NOTHROW
+	enum { osc_count = 1 };
+	void set_output( int i, Blip_Buffer* b, Blip_Buffer* = NULL, Blip_Buffer* = NULL ) { output_ = b; }
+
+private:
+	Blip_Buffer* output_;
+	blip_time_t next_time;
+	int last_amp;
+	int addr;
+	
+	int clock_;
+	int rate_;
+	blip_time_t period_;
+	
+	Blip_Synth_Norm synth;
+	Ym2413_Emu apu;
+	
+	void run_until( blip_time_t );
+};
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Emu.cpp Changed

@@ -1,393 +1,477 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Spc_Emu.h"
-
-#include "blargg_endian.h"
-
-/* Copyright (C) 2004-2009 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 );
-	set_gain( 1.4 );
-}
-
-Spc_Emu::~Spc_Emu() { }
-
-// Track info
-
-int const trailer_offset = 0x10200;
-
-inline byte const* Spc_Emu::trailer_() const { return &file_begin() min( file_size(), trailer_offset ); }
-
-inline int Spc_Emu::trailer_size_() const { return max( 0, file_size() - trailer_offset ); }
-
-static void get_spc_xid6( byte const begin , int size, track_info_t* out )
-{
-	// header
-	byte const* end = begin + size;
-	if ( size < 8 || memcmp( begin, "xid6", 4 ) )
-	{
-		check( false );
-		return;
-	}
-	int info_size = get_le32( begin + 4 );
-	byte const* in = begin + 8; 
-	if ( end - in > info_size )
-	{
-		dprintf( "SPC: Extra data after xid6\n" );
-		end = in + info_size;
-	}
-	
-	int year = 0;
-	char copyright 256 + 5;
-	int copyright_len = 0;
-	int const year_len = 5;
-	int disc = 0, track = 0;
-	
-	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 )
-		{
-			dprintf( "SPC: xid6 goes past end" );
-			break; // block goes past end of data
-		}
-		
-		// handle specific block types
-		char* field = NULL;
-		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 0x10: field = out->ost; break;
-			case 0x11: disc = data; break;
-			case 0x12: track = data; 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 )
-					{
-						int loop = out->length - out->intro_length;
-						if ( loop >= 2000 )
-							out->loop_length = loop;
-					}
-				}
-				break;
-			*/
-			
-			case 0x33:
-				check( len == 4 );
-				if ( len >= 4 )
-				{
-					out->fade_length = get_le32( in ) / 64;
-				}
-				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 )
-					dprintf( "SPC: Unknown 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;
-				//dprintf( "SPC: xid6 info tag wasn't properly padded to align\n" );
-				break;
-			}
-		}
-	}
-	
-	char* p = &copyright year_len;
-	if ( year )
-	{
-		*--p = ' ';
-		// avoid using bloated printf
-		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 );
-	
-	if ( disc > 0 && disc <= 9 )
-	{
-		out->disc 0 = disc + '0';
-		out->disc 1 = 0;
-	}
-
-	if ( track > 255 && track < ( ( 100 << 8 ) - 1 ) )
-	{
-		char* p = &copyright 3;
-		*p = 0;
-		if ( track & 255 ) *--p = char (track & 255);
-		track >>= 8;
-		for ( int n = 2; n-- && track; )
-		{
-			*--p = char (track % 10 + '0');
-			track /= 10;
-		}
-		memcpy( out->track, p, &copyright 4 - p );
-	}
-
-	check( in == end );
-}
-
-static void get_spc_info( Spc_Emu::header_t const& h, byte const xid6 , int xid6_size,
-		track_info_t* out )
-{
-	// decode length (can be in text or binary format, sometimes ambiguous ugh)
-	int len_secs = 0;
-	int i;
-	for ( 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;
-	
-	long fade_msec = 0;
-	for ( i = 0; i < 4; i++ )
-	{
-		unsigned n = h.fade_msec i - '0';
-		if ( n > 9 )
-		{
-			if ( i == 1 && (h.author 0 || !h.author 1) )
-				fade_msec = -1;
-			break;
-		}
-		fade_msec *= 10;
-		fade_msec += n;
-	}
-	if ( i == 4 && unsigned( h.author 0 - '0' ) <= 9 )
-		fade_msec = fade_msec * 10 + h.author 0 - '0';
-	if ( fade_msec < 0 || fade_msec > 0x7FFF )
-		fade_msec = get_le32( h.fade_msec );
-	if ( fade_msec < 0x7FFF )
-		out->fade_length = fade_msec;
-
-	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 blargg_ok;
-}
-
-static blargg_err_t check_spc_header( void const* header )
-{
-	if ( memcmp( header, "SNES-SPC700 Sound File Data", 27 ) )
-		return blargg_err_file_type;
-	return blargg_ok;
-}
-
-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 )
-	{
-		int file_size = in.remain();
-		if ( file_size < Snes_Spc::spc_min_file_size )
-			return blargg_err_file_type;
-		RETURN_ERR( in.read( &header, header.size ) );
-		RETURN_ERR( check_spc_header( header.tag ) );
-		int const xid6_offset = 0x10200;
-		int xid6_size = file_size - xid6_offset;
-		if ( xid6_size > 0 )
-		{
-			RETURN_ERR( xid6.resize( xid6_size ) );
-			RETURN_ERR( in.skip( xid6_offset - header.size ) );
-			RETURN_ERR( in.read( xid6.begin(), xid6.size() ) );
-		}
-		return blargg_ok;
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int ) const
-	{
-		get_spc_info( header, xid6.begin(), xid6.size(), out );
-		return blargg_ok;
-	}
-};
-
-static Music_Emu* new_spc_emu () { return BLARGG_NEW Spc_Emu ; }
-static Music_Emu* new_spc_file() { return BLARGG_NEW Spc_File; }
-
-gme_type_t_ const gme_spc_type 1 = {{ "Super Nintendo", 1, &new_spc_emu, &new_spc_file, "SPC", 0 }};
-
-// Setup
-
-blargg_err_t Spc_Emu::set_sample_rate_( int sample_rate )
-{
-	RETURN_ERR( apu.init() );
-	if ( sample_rate != native_sample_rate )
-	{
-		RETURN_ERR( resampler.resize_buffer( native_sample_rate / 20 * 2 ) );
-		RETURN_ERR( resampler.set_rate( (double) native_sample_rate / sample_rate ) ); // 0.9965 rolloff
-	}
-	return blargg_ok;
-}
-
-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 , int size )
-{
-	assert( offsetof (header_t,unused2 46) == header_t::size );
-	set_voice_count( Spc_Dsp::voice_count );
-	if ( size < Snes_Spc::spc_min_file_size )
-		return blargg_err_file_type;
-	
-	static const char* const names Spc_Dsp::voice_count = {
-		"DSP 1", "DSP 2", "DSP 3", "DSP 4", "DSP 5", "DSP 6", "DSP 7", "DSP 8"
-	};
-	set_voice_names( names );
-	
-	return check_spc_header( in );
-}
-
-// Emulation
-
-void Spc_Emu::set_tempo_( double t )
-{
-	apu.set_tempo( (int) (t * Snes_Spc::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_begin(), file_size() ) );
-	filter.set_gain( (int) (gain() * SPC_Filter::gain_unit) );
-	apu.clear_echo();
-	return blargg_ok;
-}
-
-blargg_err_t Spc_Emu::play_and_filter( int count, sample_t out )
-{
-	RETURN_ERR( apu.play( count, out ) );
-	filter.run( out, count );
-	return blargg_ok;
-}
-
-blargg_err_t Spc_Emu::skip_( int count )
-{
-	if ( sample_rate() != native_sample_rate )
-	{
-		count = (int) (count * resampler.rate()) & ~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_( int count, sample_t out )
-{
-	if ( sample_rate() == native_sample_rate )
-		return play_and_filter( count, out );
-	
-	int remain = count;
-	while ( remain > 0 )
-	{
-		remain -= resampler.read( &out count - remain, remain );
-		if ( remain > 0 )
-		{
-			int n = resampler.buffer_free();
-			RETURN_ERR( play_and_filter( n, resampler.buffer() ) );
-			resampler.write( n );
-		}
-	}
-	check( remain == 0 );
-	return blargg_ok;
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Spc_Emu.h"
+
+#include "blargg_endian.h"
+
+/* Copyright (C) 2004-2009 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 );
+	set_gain( 1.4 );
+}
+
+Spc_Emu::~Spc_Emu() { }
+
+// Track info
+
+int const trailer_offset = 0x10200;
+
+inline byte const* Spc_Emu::trailer_() const { return &file_begin() min( file_size(), trailer_offset ); }
+
+inline int Spc_Emu::trailer_size_() const { return max( 0, file_size() - trailer_offset ); }
+
+static void get_spc_xid6( byte const begin , int size, track_info_t* out )
+{
+	// header
+	byte const* end = begin + size;
+	if ( size < 8 || memcmp( begin, "xid6", 4 ) )
+	{
+		check( false );
+		return;
+	}
+	int info_size = get_le32( begin + 4 );
+	byte const* in = begin + 8; 
+	if ( end - in > info_size )
+	{
+		dprintf( "SPC: Extra data after xid6\n" );
+		end = in + info_size;
+	}
+	
+	int year = 0;
+	char copyright 256 + 5;
+	int copyright_len = 0;
+	int const year_len = 5;
+	int disc = 0, track = 0;
+	
+	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 )
+		{
+			dprintf( "SPC: xid6 goes past end" );
+			break; // block goes past end of data
+		}
+		
+		// handle specific block types
+		char* field = NULL;
+		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 0x10: field = out->ost; break;
+			case 0x11: disc = data; break;
+			case 0x12: track = data; break;
+			case 0x14: year = data; break;
+			
+			case 0x30:
+				check( len == 4 );
+				if ( len >= 4 )
+				{
+					out->intro_length = get_le32( in );
+					if ( out->intro_length > 383999999 ) out->intro_length = 383999999;
+					out->intro_length /= 64;
+				}
+				break;
+			case 0x31:
+				check( len == 4 );
+				if ( len >= 4 )
+				{
+					out->loop_length = get_le32( in );
+					if ( out->loop_length > 383999999 ) out->loop_length = 383999999;
+					out->loop_length /= 64;
+				}
+				break;
+			case 0x32:
+				check( len == 4 );
+				if ( len >= 4 )
+				{
+					out->play_length = get_le32( in );
+					if ( out->play_length > 383999999 ) out->play_length = 383999999;
+					out->play_length /= 64;
+				}
+				break;
+
+			case 0x33:
+				check( len == 4 );
+				if ( len >= 4 )
+				{
+					out->fade_length = get_le32( in );
+					if (out->fade_length > 3839999) out->fade_length = 3839999;
+					out->fade_length /= 64;
+				}
+				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 )
+					dprintf( "SPC: Unknown 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;
+				//dprintf( "SPC: xid6 info tag wasn't properly padded to align\n" );
+				break;
+			}
+		}
+	}
+	
+	char* p = &copyright year_len;
+	if ( year )
+	{
+		*--p = ' ';
+		// avoid using bloated printf
+		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 );
+	
+	if ( disc > 0 && disc <= 9 )
+	{
+		out->disc 0 = disc + '0';
+		out->disc 1 = 0;
+	}
+
+	if ( track > 255 && track < ( ( 100 << 8 ) - 1 ) )
+	{
+		char* p = &copyright 3;
+		*p = 0;
+		if ( track & 255 ) *--p = char (track & 255);
+		track >>= 8;
+		for ( int n = 2; n-- && track; )
+		{
+			*--p = char (track % 10 + '0');
+			track /= 10;
+		}
+		memcpy( out->track, p, &copyright 4 - p );
+	}
+
+	check( in == end );
+}
+
+static void get_spc_info( Spc_Emu::header_t const& h, byte const xid6 , int xid6_size,
+		track_info_t* out )
+{
+	// decode length (can be in text or binary format, sometimes ambiguous ugh)
+	int len_secs = 0;
+	int i;
+	for ( 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;
+	
+	long fade_msec = 0;
+	for ( i = 0; i < 4; i++ )
+	{
+		unsigned n = h.fade_msec i - '0';
+		if ( n > 9 )
+		{
+			if ( i == 1 && (h.author 0 || !h.author 1) )
+				fade_msec = -1;
+			break;
+		}
+		fade_msec *= 10;
+		fade_msec += n;
+	}
+	if ( i == 4 && unsigned( h.author 0 - '0' ) <= 9 )
+		fade_msec = fade_msec * 10 + h.author 0 - '0';
+	if ( fade_msec < 0 || fade_msec > 0x7FFF )
+		fade_msec = get_le32( h.fade_msec );
+	if ( fade_msec < 0x7FFF )
+		out->fade_length = fade_msec;
+
+	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 );
+}
+
+static void hash_spc_file( Spc_Emu::header_t const& h, byte const* data, int data_size, Music_Emu::Hash_Function& out )
+{
+	out.hash_( &h.format, sizeof(h.format) );
+	out.hash_( &h.version, sizeof(h.version) );
+	out.hash_( &h.pc0, sizeof(h.pc) );
+	out.hash_( &h.a, sizeof(h.a) );
+	out.hash_( &h.x, sizeof(h.x) );
+	out.hash_( &h.y, sizeof(h.y) );
+	out.hash_( &h.psw, sizeof(h.psw) );
+	out.hash_( &h.sp, sizeof(h.sp) );
+	out.hash_( &h.unused0, sizeof(h.unused) );
+	out.hash_( &h.emulator, sizeof(h.emulator) );
+	out.hash_( &h.unused20, sizeof(h.unused2) );
+	out.hash_( data, data_size );
+}
+
+blargg_err_t Spc_Emu::track_info_( track_info_t* out, int ) const
+{
+	get_spc_info( header(), trailer_(), trailer_size_(), out );
+	return blargg_ok;
+}
+
+static blargg_err_t check_spc_header( void const* header )
+{
+	if ( memcmp( header, "SNES-SPC700 Sound File Data", 27 ) )
+		return blargg_err_file_type;
+	return blargg_ok;
+}
+
+struct Spc_File : Gme_Info_
+{
+	Spc_Emu::header_t header;
+	blargg_vector<byte> data;
+	blargg_vector<byte> xid6;
+	
+	Spc_File() { set_type( gme_spc_type ); }
+	
+	blargg_err_t load_( Data_Reader& in )
+	{
+		int file_size = in.remain();
+		if ( file_size < 0x10180 )
+			return blargg_err_file_type;
+		RETURN_ERR( in.read( &header, header.size ) );
+		RETURN_ERR( check_spc_header( header.tag ) );
+		int const xid6_offset = 0x10200;
+		RETURN_ERR( data.resize( blargg_min( xid6_offset - header.size, file_size - header.size ) ) );
+		RETURN_ERR( in.read( data.begin(), data.end() - data.begin() ) );
+		int xid6_size = file_size - xid6_offset;
+		if ( xid6_size > 0 )
+		{
+			RETURN_ERR( xid6.resize( xid6_size ) );
+			RETURN_ERR( in.read( xid6.begin(), xid6.size() ) );
+		}
+		return blargg_ok;
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int ) const
+	{
+		get_spc_info( header, xid6.begin(), xid6.size(), out );
+		return blargg_ok;
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		hash_spc_file( header, data.begin(), data.end() - data.begin(), out );
+		return blargg_ok;
+	}
+};
+
+static Music_Emu* new_spc_emu () { return BLARGG_NEW Spc_Emu ; }
+static Music_Emu* new_spc_file() { return BLARGG_NEW Spc_File; }
+
+gme_type_t_ const gme_spc_type 1 = {{ "Super Nintendo", 1, &new_spc_emu, &new_spc_file, "SPC", 0 }};
+
+// Setup
+
+blargg_err_t Spc_Emu::set_sample_rate_( int sample_rate )
+{
+	smp.power();
+	if ( sample_rate != native_sample_rate )
+	{
+		RETURN_ERR( resampler.resize_buffer( native_sample_rate / 20 * 2 ) );
+		RETURN_ERR( resampler.set_rate( (double) native_sample_rate / sample_rate ) ); // 0.9965 rolloff
+	}
+	return blargg_ok;
+}
+
+void Spc_Emu::mute_voices_( int m )
+{
+	Music_Emu::mute_voices_( m );
+	for ( int i = 0, j = 1; i < SuperFamicom::SPC_DSP::voice_count; ++i, j <<= 1 )
+ smp.dsp.channel_enable( i, !( m & j ) );
+}
+
+blargg_err_t Spc_Emu::load_mem_( byte const in , int size )
+{
+	assert( offsetof (header_t,unused2 46) == header_t::size );
+	set_voice_count( SuperFamicom::SPC_DSP::voice_count );
+	if ( size < 0x10180 )
+		return blargg_err_file_type;
+	
+	static const char* const names SuperFamicom::SPC_DSP::voice_count = {
+		"DSP 1", "DSP 2", "DSP 3", "DSP 4", "DSP 5", "DSP 6", "DSP 7", "DSP 8"
+	};
+	set_voice_names( names );
+	
+	return check_spc_header( in );
+}
+
+// Emulation
+
+void Spc_Emu::set_tempo_( double t )
+{
+	smp.set_tempo( t );
+}
+
+blargg_err_t Spc_Emu::start_track_( int track )
+{
+	RETURN_ERR( Music_Emu::start_track_( track ) );
+	resampler.clear();
+	filter.clear();
+ smp.reset();
+ const byte * ptr = file_begin();
+ 
+ Spc_Emu::header_t & header = *(Spc_Emu::header_t*)ptr;
+ ptr += sizeof(header);
+
+ smp.regs.pc = header.pc0 + header.pc1 * 0x100;
+ smp.regs.a = header.a;
+ smp.regs.x = header.x;
+ smp.regs.y = header.y;
+ smp.regs.p = header.psw;
+ smp.regs.s = header.sp;
+ 
+ memcpy( smp.apuram, ptr, 0x10000 );
+ memset( smp.apuram + 0xF4, 0, 4 );
+ memcpy( smp.sfm_last, ptr + 0xF4, 4 );
+ 
+ static const uint8_t regs_to_copy2 = { {0xFC,0xFF}, {0xFB,0xFF}, {0xFA,0xFF}, {0xF9,0xFF}, {0xF8,0xFF}, {0xF2,0xFF}, {0xF1,0x87} };
+ for (int idx = 0; idx < sizeof (regs_to_copy) / sizeof (regs_to_copy0); idx++) {
+ const uint8_t *n = regs_to_copyidx;
+ smp.op_buswrite( n0, ptr n0 & n1 );
+ }
+ smp.timer0.stage3_ticks = ptr 0xFD & 0x0F;
+ smp.timer1.stage3_ticks = ptr 0xFE & 0x0F;
+ smp.timer2.stage3_ticks = ptr 0xFF & 0x0F;
+ ptr += 0x10000;
+ 
+ smp.dsp.spc_dsp.load( ptr );
+ 
+ if ( !(smp.dsp.read( SuperFamicom::SPC_DSP::r_flg ) & 0x20) )
+ {
+ int addr = 0x100 * smp.dsp.read( SuperFamicom::SPC_DSP::r_esa );
+ int end = addr + 0x800 * (smp.dsp.read( SuperFamicom::SPC_DSP::r_edl ) & 0x0F);
+ if ( end > 0x10000 )
+ end = 0x10000;
+ memset( &smp.apuram addr, 0xFF, end - addr );
+ }
+
+	filter.set_gain( (int) (gain() * Spc_Filter::gain_unit) );
+	return blargg_ok;
+}
+
+blargg_err_t Spc_Emu::play_and_filter( int count, sample_t out )
+{
+	smp.render( out, count );
+	filter.run( out, count );
+	return blargg_ok;
+}
+
+blargg_err_t Spc_Emu::skip_( int count )
+{
+	if ( sample_rate() != native_sample_rate )
+	{
+		count = (int) (count * resampler.rate()) & ~1;
+		count -= resampler.skip_input( count );
+	}
+	
+	// TODO: shouldn't skip be adjusted for the 64 samples read afterwards?
+	
+	if ( count > 0 )
+	{
+		smp.skip( count );
+		filter.clear();
+	}
+	
+	// eliminate pop due to resampler
+	if ( sample_rate() != native_sample_rate )
+	{
+		const int resampler_latency = 64;
+		sample_t buf resampler_latency;
+		return play_( resampler_latency, buf );
+	}
+
+	return blargg_ok;
+}
+
+blargg_err_t Spc_Emu::play_( int count, sample_t out )
+{
+	if ( sample_rate() == native_sample_rate )
+		return play_and_filter( count, out );
+	
+	int remain = count;
+	while ( remain > 0 )
+	{
+		remain -= resampler.read( &out count - remain, remain );
+		if ( remain > 0 )
+		{
+			int n = resampler.buffer_free();
+			RETURN_ERR( play_and_filter( n, resampler.buffer() ) );
+			resampler.write( n );
+		}
+	}
+	check( remain == 0 );
+	return blargg_ok;
+}
+
+blargg_err_t Spc_Emu::hash_( Hash_Function& out ) const
+{
+ hash_spc_file( header(), file_begin() + header_t::size, blargg_min( (uint64_t) ( 0x10200 - header_t::size ), (uint64_t) ( file_end() - file_begin() - header_t::size ) ), out );
+	return blargg_ok;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Emu.h Changed

@@ -1,11 +1,11 @@
 // Super Nintendo SPC music file emulator
 
-// Game_Music_Emu 0.6-pre
+// Game_Music_Emu $vers
 #ifndef SPC_EMU_H
 #define SPC_EMU_H
 
 #include "Music_Emu.h"
-#include "Snes_Spc.h"
+#include "higan/smp/smp.hpp"
 #include "Spc_Filter.h"
 
 #if GME_SPC_FAST_RESAMPLER
@@ -23,11 +23,14 @@
 	enum { native_sample_rate = 32000 };
 	
 	// Disables annoying pseudo-surround effect some music uses
-	void disable_surround( bool disable = true )    { apu.disable_surround( disable ); }
+	void disable_surround( bool disable = true )    { smp.dsp.disable_surround( disable ); }
 
 	// Enables gaussian, cubic or sinc interpolation
-	void interpolation_level( int level = 0 )   { apu.interpolation_level( level ); }
+	void interpolation_level( int level = 0 )   { smp.dsp.spc_dsp.interpolation_level( level ); }
 
+    SuperFamicom::SMP const* get_smp() const;
+    SuperFamicom::SMP * get_smp();
+	
 	// SPC file header
 	struct header_t
 	{
@@ -54,6 +57,8 @@
 	
 	// Header for currently loaded file
 	header_t const& header() const                  { return *(header_t const*) file_begin(); }
+
+	blargg_err_t hash_( Hash_Function& ) const;
 	
 	static gme_type_t static_type()                 { return gme_spc_type; }
 	
@@ -74,12 +79,15 @@
 
 private:
 	Spc_Emu_Resampler resampler;
-	SPC_Filter filter;
-	Snes_Spc apu;
+	Spc_Filter filter;
+    SuperFamicom::SMP smp;
 	
 	byte const* trailer_() const;
 	int trailer_size_() const;
 	blargg_err_t play_and_filter( int count, sample_t out  );
 };
 
+inline SuperFamicom::SMP const* Spc_Emu::get_smp() const { return &smp; }
+inline SuperFamicom::SMP * Spc_Emu::get_smp() { return &smp; }
+
 #endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Filter.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Filter.h Changed

@@ -1,17 +1,17 @@
 // Simple low-pass and high-pass filter to better match sound output of a SNES
 
-// Game_Music_Emu 0.5.5
+// snes_spc $vers
 #ifndef SPC_FILTER_H
 #define SPC_FILTER_H
 
 #include "blargg_common.h"
 
-struct SPC_Filter {
+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 );
+	void run( sample_t io , int count );
 	
 // Optional features
 
@@ -33,21 +33,25 @@
 	void set_bass( int bass );
 	
 public:
-	SPC_Filter();
+	Spc_Filter();
 	BLARGG_DISABLE_NOTHROW
 private:
 	enum { gain_bits = 8 };
 	int gain;
 	int bass;
 	bool enabled;
+    bool limiting;
 	struct chan_t { int p1, pp1, sum; };
 	chan_t ch 2;
+    short hard_limit_table131072;
+    void build_limit_table();
+    inline short limit_sample(int sample);
 };
 
-inline void SPC_Filter::enable( bool b )  { enabled = b; }
+inline void Spc_Filter::enable( bool b )  { enabled = b; }
 
-inline void SPC_Filter::set_gain( int g ) { gain = g; }
+inline void Spc_Filter::set_gain( int g ) { gain = g; }
 
-inline void SPC_Filter::set_bass( int b ) { bass = b; }
+inline void Spc_Filter::set_bass( int b ) { bass = b; }
 
 #endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Sfm.cpp Added

@@ -0,0 +1,686 @@
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Spc_Sfm.h"
+
+#include "blargg_endian.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/* Copyright (C) 2004-2013 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
+
+Sfm_Emu::Sfm_Emu()
+{
+ set_type( gme_sfm_type );
+ set_gain( 1.4 );
+ set_max_initial_silence( 30 );
+	set_silence_lookahead( 30 ); // Some SFMs may have a lot of initialization code
+}
+
+Sfm_Emu::~Sfm_Emu() { }
+
+// Track info
+
+static void hash_sfm_file( byte const* data, int data_size, Music_Emu::Hash_Function& out )
+{
+ out.hash_( data, data_size );
+}
+
+static void copy_field( char* out, size_t size, const Bml_Parser& in, char const* in_path )
+{
+ const char * value = in.enumValue( in_path );
+ if ( value ) strncpy( out, value, size - 1 ), out size - 1 = 0;
+ else out 0 = 0;
+}
+
+static void copy_info( track_info_t* out, const Bml_Parser& in )
+{
+ copy_field( out->song, sizeof(out->song), in, "information:title" );
+ copy_field( out->game, sizeof(out->game), in, "information:game" );
+ copy_field( out->author, sizeof(out->author), in, "information:author" );
+ copy_field( out->composer, sizeof(out->composer), in, "information:composer" );
+ copy_field( out->copyright, sizeof(out->copyright), in, "information:copyright" );
+ copy_field( out->date, sizeof(out->date), in, "information:date" );
+ copy_field( out->track, sizeof(out->track), in, "information:track" );
+ copy_field( out->disc, sizeof(out->disc), in, "information:disc" );
+ copy_field( out->dumper, sizeof(out->dumper), in, "information:dumper" );
+ 
+ char * end;
+ const char * value = in.enumValue( "timing:length" );
+ if ( value )
+ out->length = strtoul( value, &end, 10 );
+ else
+ out->length = 0;
+ 
+ value = in.enumValue( "timing:fade" );
+ if ( value )
+ out->fade_length = strtoul( value, &end, 10 );
+ else
+ out->fade_length = 0;
+}
+
+blargg_err_t Sfm_Emu::track_info_( track_info_t* out, int ) const
+{
+ copy_info( out, metadata );
+ return blargg_ok;
+}
+
+static void set_track_info( const track_info_t* in, Bml_Parser& out )
+{
+ out.setValue( "information:title", in->song );
+ out.setValue( "information:game", in->game );
+ out.setValue( "information:author", in->author );
+ out.setValue( "information:composer", in->composer );
+ out.setValue( "information:copyright", in->copyright );
+ out.setValue( "information:date", in->date );
+ out.setValue( "information:track", in->track );
+ out.setValue( "information:disc", in->disc );
+ out.setValue( "information:dumper", in->dumper );
+ 
+ out.setValue( "timing:length", in->length );
+ out.setValue( "timing:fade", in->fade_length );
+}
+
+blargg_err_t Sfm_Emu::set_track_info_( const track_info_t* in, int )
+{
+ ::set_track_info(in, metadata);
+ 
+ return blargg_ok;
+}
+
+static blargg_err_t check_sfm_header( void const* header )
+{
+ if ( memcmp( header, "SFM1", 4 ) )
+ return blargg_err_file_type;
+ return blargg_ok;
+}
+
+struct Sfm_File : Gme_Info_
+{
+ blargg_vector<byte> data;
+ Bml_Parser metadata;
+	unsigned long original_metadata_size;
+
+ Sfm_File() { set_type( gme_sfm_type ); }
+
+ blargg_err_t load_( Data_Reader& in )
+ {
+ int file_size = in.remain();
+ if ( file_size < Sfm_Emu::sfm_min_file_size )
+ return blargg_err_file_type;
+ RETURN_ERR( data.resize( file_size ) );
+ RETURN_ERR( in.read( data.begin(), data.end() - data.begin() ) );
+ RETURN_ERR( check_sfm_header( data.begin() ) );
+ if ( file_size < 8 )
+ return "SFM file too small";
+ int metadata_size = get_le32( data.begin() + 4 );
+ metadata.parseDocument( (const char *)data.begin() + 8, metadata_size );
+		original_metadata_size = metadata_size;
+ return blargg_ok;
+ }
+
+ blargg_err_t track_info_( track_info_t* out, int ) const
+ {
+ copy_info( out, metadata );
+ return blargg_ok;
+ }
+ 
+ blargg_err_t set_track_info_( const track_info_t* in, int )
+ {
+ ::set_track_info( in, metadata );
+ return blargg_ok;
+ }
+
+ blargg_err_t hash_( Hash_Function& out ) const
+ {
+ hash_sfm_file( data.begin(), data.end() - data.begin(), out );
+ return blargg_ok;
+ }
+ 
+ blargg_err_t save_( gme_writer_t writer, void* your_data ) const
+ {
+		char *metadata_serialized = (char *)malloc (10000);
+		metadata.serialize( metadata_serialized, 10000 );
+		size_t length = strlen(metadata_serialized);
+		uint8_t meta_length4;
+		set_le32( meta_length, (unsigned int) length );
+		writer( your_data, "SFM1", 4 );
+		writer( your_data, meta_length, 4 );
+		writer( your_data, metadata_serialized, length );
+		writer( your_data, data.begin() + 4 + 4 + original_metadata_size, data.size() - (4 + 4 + original_metadata_size) );
+		free (metadata_serialized);
+		return blargg_ok;
+ }
+};
+
+static Music_Emu* new_sfm_emu () { return BLARGG_NEW Sfm_Emu ; }
+static Music_Emu* new_sfm_file() { return BLARGG_NEW Sfm_File; }
+
+gme_type_t_ const gme_sfm_type 1 = {{ "Super Nintendo with log", 1, &new_sfm_emu, &new_sfm_file, "SFM", 0 }};
+
+// Setup
+
+blargg_err_t Sfm_Emu::set_sample_rate_( int sample_rate )
+{
+ smp.power();
+ if ( sample_rate != native_sample_rate )
+ {
+ RETURN_ERR( resampler.resize_buffer( native_sample_rate / 20 * 2 ) );
+ RETURN_ERR( resampler.set_rate( (double) native_sample_rate / sample_rate ) ); // 0.9965 rolloff
+ }
+ return blargg_ok;
+}
+
+void Sfm_Emu::mute_voices_( int m )
+{
+ Music_Emu::mute_voices_( m );
+ for ( int i = 0, j = 1; i < 8; ++i, j <<= 1 )
+ smp.dsp.channel_enable( i, !( m & j ) );
+}
+
+blargg_err_t Sfm_Emu::load_mem_( byte const in , int size )
+{
+ set_voice_count( 8 );
+ if ( size < Sfm_Emu::sfm_min_file_size )
+ return blargg_err_file_type;
+
+ static const char* const names 8 = {
+ "DSP 1", "DSP 2", "DSP 3", "DSP 4", "DSP 5", "DSP 6", "DSP 7", "DSP 8"
+ };
+ set_voice_names( names );
+
+ RETURN_ERR( check_sfm_header( in ) );
+
+ const byte * ptr = file_begin();
+ int metadata_size = get_le32(ptr + 4);
+ if ( file_size() < metadata_size + Sfm_Emu::sfm_min_file_size )
+ return "SFM file too small";
+ metadata.parseDocument((const char *) ptr + 8, metadata_size);
+ 
+ return blargg_ok;
+}
+
+// Emulation
+
+void Sfm_Emu::set_tempo_( double t )
+{
+ smp.set_tempo( t );
+}
+
+// (n ? n : 256)
+#define IF_0_THEN_256( n ) ((uint8_t) ((n) - 1) + 1)
+
+#define META_ENUM_INT(n,d) (value = metadata.enumValue(n), value ? strtol(value, &end, 10) : (d))
+
+static const byte ipl_rom0x40 =
+{
+ 0xCD, 0xEF, 0xBD, 0xE8, 0x00, 0xC6, 0x1D, 0xD0,
+ 0xFC, 0x8F, 0xAA, 0xF4, 0x8F, 0xBB, 0xF5, 0x78,
+ 0xCC, 0xF4, 0xD0, 0xFB, 0x2F, 0x19, 0xEB, 0xF4,
+ 0xD0, 0xFC, 0x7E, 0xF4, 0xD0, 0x0B, 0xE4, 0xF5,
+ 0xCB, 0xF4, 0xD7, 0x00, 0xFC, 0xD0, 0xF3, 0xAB,
+ 0x01, 0x10, 0xEF, 0x7E, 0xF4, 0x10, 0xEB, 0xBA,
+ 0xF6, 0xDA, 0x00, 0xBA, 0xF4, 0xC4, 0xF4, 0xDD,
+ 0x5D, 0xD0, 0xDB, 0x1F, 0x00, 0x00, 0xC0, 0xFF
+};
+
+blargg_err_t Sfm_Emu::start_track_( int track )
+{
+ RETURN_ERR( Music_Emu::start_track_( track ) );
+ resampler.clear();
+ filter.clear();
+ const byte * ptr = file_begin();
+ int metadata_size = get_le32(ptr + 4);
+
+ memcpy( smp.iplrom, ipl_rom, 64 );
+
+ smp.reset();
+
+ memcpy( smp.apuram, ptr + 8 + metadata_size, 65536 );
+
+ memcpy( smp.dsp.spc_dsp.m.regs, ptr + 8 + metadata_size + 65536, 128 );
+ 
+ const uint8_t* log_begin = ptr + 8 + metadata_size + 65536 + 128;
+ const uint8_t* log_end = ptr + file_size();
+ size_t loop_begin = log_end - log_begin;
+ 
+ char * end;
+ const char * value;
+ 
+ loop_begin = META_ENUM_INT("timing:loopstart", loop_begin);
+
+ smp.set_sfm_queue( log_begin, log_end, log_begin + loop_begin );
+
+ uint32_t test = META_ENUM_INT("smp:test", 0);
+ smp.status.clock_speed = (test >> 6) & 3;
+ smp.status.timer_speed = (test >> 4) & 3;
+ smp.status.timers_enable = test & 0x08;
+ smp.status.ram_disable = test & 0x04;
+ smp.status.ram_writable = test & 0x02;
+ smp.status.timers_disable = test & 0x01;
+
+ smp.status.iplrom_enable = META_ENUM_INT("smp:iplrom",1);
+ smp.status.dsp_addr = META_ENUM_INT("smp:dspaddr",0);
+
+ value = metadata.enumValue("smp:ram");
+ if (value)
+ {
+ smp.status.ram00f8 = strtol(value, &end, 10);
+ if (*end)
+ {
+ value = end + 1;
+ smp.status.ram00f9 = strtol(value, &end, 10);
+ }
+ }
+
+#define NAME "smp:regs:"
+ smp.regs.pc = META_ENUM_INT(NAME "pc", 0xffc0);
+ smp.regs.a = META_ENUM_INT(NAME "a", 0x00);
+ smp.regs.x = META_ENUM_INT(NAME "x", 0x00);
+ smp.regs.y = META_ENUM_INT(NAME "y", 0x00);
+ smp.regs.s = META_ENUM_INT(NAME "s", 0xef);
+ smp.regs.p = META_ENUM_INT(NAME "psw", 0x02);
+
+ value = metadata.enumValue("smp:ports");
+ if (value)
+ {
+ for (int n = 0; n < sizeof (smp.sfm_last) / sizeof (smp.sfm_last0); n++)
+ {
+ smp.sfm_lastn = strtol(value, &end, 10);
+ if (*end == ',')
+ value = end + 1;
+ else
+ break;
+ }
+ }
+ 
+ for (int i = 0; i < 3; ++i)
+ {
+ SuperFamicom::SMP::Timer<192> &t = (i == 0 ? smp.timer0 : (i == 1 ? smp.timer1 : *(SuperFamicom::SMP::Timer<192>*)&smp.timer2));
+
+ char name50;
+ snprintf (name, sizeof (name), "smp:timer%d:", i);
+
+ char val50;
+ snprintf (val, sizeof (val), "%senable", name);
+ value = metadata.enumValue(val);
+ if (value)
+ {
+ t.enable = !!strtol(value, &end, 10);
+ }
+ snprintf (val, sizeof (val), "%starget", name);
+ value = metadata.enumValue(val);
+ if (value)
+ {
+ t.target = strtol(value, &end, 10);
+ }
+ snprintf (val, sizeof (val), "%sstage", name);
+ value = metadata.enumValue(val);
+ if (value)
+ {
+ t.stage0_ticks = strtol(value, &end, 10);
+ if (*end != ',') break;
+ value = end + 1;
+ t.stage1_ticks = strtol(value, &end, 10);
+ if (*end != ',') break;
+ value = end + 1;
+ t.stage2_ticks = strtol(value, &end, 10);
+ if (*end != ',') break;
+ value = end + 1;
+ t.stage3_ticks = strtol(value, &end, 10);
+ }
+ snprintf (val, sizeof (val), "%sline", name);
+ value = metadata.enumValue(val);
+ if (value)
+ {
+ t.current_line = !!strtol(value, &end, 10);
+ }
+ }
+
+ smp.dsp.clock = META_ENUM_INT("dsp:clock", 0) * 4096;
+ 
+ smp.dsp.spc_dsp.m.echo_hist_pos = &smp.dsp.spc_dsp.m.echo_histMETA_ENUM_INT("dsp:echohistaddr", 0);
+
+ value = metadata.enumValue("dsp:echohistdata");
+ if (value)
+ {
+ for (int i = 0; i < 8; ++i)
+ {
+ smp.dsp.spc_dsp.m.echo_histi0 = strtol(value, &end, 10);
+ value = strchr(value, ',');
+ if (!value) break;
+ ++value;
+ smp.dsp.spc_dsp.m.echo_histi1 = strtol(value, &end, 10);
+ value = strchr(value, ',');
+ if (!value) break;
+ ++value;
+ }
+ }
+
+ smp.dsp.spc_dsp.m.phase = META_ENUM_INT("dsp:sample", 0);
+ smp.dsp.spc_dsp.m.kon = META_ENUM_INT("dsp:kon", 0);
+ smp.dsp.spc_dsp.m.noise = META_ENUM_INT("dsp:noise", 0);
+ smp.dsp.spc_dsp.m.counter = META_ENUM_INT("dsp:counter", 0);
+ smp.dsp.spc_dsp.m.echo_offset = META_ENUM_INT("dsp:echooffset", 0);
+ smp.dsp.spc_dsp.m.echo_length = META_ENUM_INT("dsp:echolength", 0);
+ smp.dsp.spc_dsp.m.new_kon = META_ENUM_INT("dsp:koncache", 0);
+ smp.dsp.spc_dsp.m.endx_buf = META_ENUM_INT("dsp:endx", 0);
+ smp.dsp.spc_dsp.m.envx_buf = META_ENUM_INT("dsp:envx", 0);
+ smp.dsp.spc_dsp.m.outx_buf = META_ENUM_INT("dsp:outx", 0);
+ smp.dsp.spc_dsp.m.t_pmon = META_ENUM_INT("dsp:pmon", 0);
+ smp.dsp.spc_dsp.m.t_non = META_ENUM_INT("dsp:non", 0);
+ smp.dsp.spc_dsp.m.t_eon = META_ENUM_INT("dsp:eon", 0);
+ smp.dsp.spc_dsp.m.t_dir = META_ENUM_INT("dsp:dir", 0);
+ smp.dsp.spc_dsp.m.t_koff = META_ENUM_INT("dsp:koff", 0);
+ smp.dsp.spc_dsp.m.t_brr_next_addr = META_ENUM_INT("dsp:brrnext", 0);
+ smp.dsp.spc_dsp.m.t_adsr0 = META_ENUM_INT("dsp:adsr0", 0);
+ smp.dsp.spc_dsp.m.t_brr_header = META_ENUM_INT("dsp:brrheader", 0);
+ smp.dsp.spc_dsp.m.t_brr_byte = META_ENUM_INT("dsp:brrdata", 0);
+ smp.dsp.spc_dsp.m.t_srcn = META_ENUM_INT("dsp:srcn", 0);
+ smp.dsp.spc_dsp.m.t_esa = META_ENUM_INT("dsp:esa", 0);
+ smp.dsp.spc_dsp.m.t_echo_enabled = !META_ENUM_INT("dsp:echodisable", 0);
+ smp.dsp.spc_dsp.m.t_dir_addr = META_ENUM_INT("dsp:diraddr", 0);
+ smp.dsp.spc_dsp.m.t_pitch = META_ENUM_INT("dsp:pitch", 0);
+ smp.dsp.spc_dsp.m.t_output = META_ENUM_INT("dsp:output", 0);
+ smp.dsp.spc_dsp.m.t_looped = META_ENUM_INT("dsp:looped", 0);
+ smp.dsp.spc_dsp.m.t_echo_ptr = META_ENUM_INT("dsp:echoaddr", 0);
+
+
+#define META_ENUM_LEVELS(n, o) \
+ value = metadata.enumValue(n); \
+ if (value) \
+ { \
+ (o)0 = strtol(value, &end, 10); \
+ if (*end) \
+ { \
+ value = end + 1; \
+ (o)1 = strtol(value, &end, 10); \
+ } \
+ }
+
+ META_ENUM_LEVELS("dsp:mainout", smp.dsp.spc_dsp.m.t_main_out);
+ META_ENUM_LEVELS("dsp:echoout", smp.dsp.spc_dsp.m.t_echo_out);
+ META_ENUM_LEVELS("dsp:echoin", smp.dsp.spc_dsp.m.t_echo_in);
+
+#undef META_ENUM_LEVELS
+
+ for (int i = 0; i < 8; ++i)
+ {
+ char name50;
+ snprintf (name, sizeof (name), "dsp:voice%d:", i);
+ SuperFamicom::SPC_DSP::voice_t & voice = smp.dsp.spc_dsp.m.voicesi;
+
+ char val50;
+ snprintf (val, sizeof (val), "%sbrrhistaddr", name);
+ value = metadata.enumValue(val);
+ if (value)
+ {
+ voice.buf_pos = strtol(value, &end, 10);
+ }
+ snprintf (val, sizeof (val), "%sbrrhistdata", name);
+ value = metadata.enumValue(val);
+ if (value)
+ {
+ for (int j = 0; j < SuperFamicom::SPC_DSP::brr_buf_size; ++j)
+ {
+ voice.bufj = voice.bufj + SuperFamicom::SPC_DSP::brr_buf_size = strtol(value, &end, 10);
+ if (!*end) break;
+ value = end + 1;
+ }
+ }
+ snprintf (val, sizeof (val), "%sinterpaddr", name);
+ voice.interp_pos = META_ENUM_INT(val,0);
+ snprintf (val, sizeof (val), "%sbrraddr", name);
+ voice.brr_addr = META_ENUM_INT(val,0);
+ snprintf (val, sizeof (val), "%sbrroffset", name);
+ voice.brr_offset = META_ENUM_INT(val,0);
+ snprintf (val, sizeof (val), "%svbit", name);
+ voice.vbit = META_ENUM_INT(val,0);
+ snprintf (val, sizeof (val), "%svidx", name);
+ voice.regs = &smp.dsp.spc_dsp.m.regsMETA_ENUM_INT(val,0);
+ snprintf (val, sizeof (val), "%skondelay", name);
+ voice.kon_delay = META_ENUM_INT(val, 0);
+ snprintf (val, sizeof (val), "%senvmode", name);
+ voice.env_mode = (SuperFamicom::SPC_DSP::env_mode_t) META_ENUM_INT(val, 0);
+ snprintf (val, sizeof (val), "%senv", name);
+ voice.env = META_ENUM_INT(val, 0);
+ snprintf (val, sizeof (val), "%senvxout", name);
+ voice.t_envx_out = META_ENUM_INT(val, 0);
+ snprintf (val, sizeof (val), "%senvcache", name);
+ voice.hidden_env = META_ENUM_INT(val, 0);
+ }
+
+ filter.set_gain( (int) (gain() * Spc_Filter::gain_unit) );
+ return blargg_ok;
+}
+
+#undef META_ENUM_INT
+
+void Sfm_Emu::create_updated_metadata( Bml_Parser &out ) const
+{
+ bool first;
+ char name1000;
+ char stemp1000;
+
+ metadata.serialize(name, sizeof (name));
+ 
+ out.parseDocument(name);
+ 
+ out.setValue( "smp:test", (smp.status.clock_speed << 6) | (smp.status.timer_speed << 4) | (smp.status.timers_enable << 3) | (smp.status.ram_disable << 2) | (smp.status.ram_writable << 1) | (smp.status.timers_disable << 0) );
+ out.setValue( "smp:iplrom", smp.status.iplrom_enable );
+ out.setValue( "smp:dspaddr", smp.status.dsp_addr );
+
+ snprintf (stemp, sizeof (stemp), "%lu,%lu", (unsigned long)smp.status.ram00f8, (unsigned long)smp.status.ram00f9);
+ out.setValue( "smp:ram", stemp );
+ 
+#define PREF "smp:regs:"
+ out.setValue( PREF "pc", smp.regs.pc );
+ out.setValue( PREF "a", smp.regs.a );
+ out.setValue( PREF "x", smp.regs.x );
+ out.setValue( PREF "y", smp.regs.y );
+ out.setValue( PREF "s", smp.regs.s );
+ out.setValue( PREF "psw", smp.regs.p );
+
+ stemp0 = 0;
+ char *p = stemp;
+ first = true;
+ for (int n = 0; n < sizeof (smp.sfm_last) / sizeof (smp.sfm_last0); n++)
+ {
+ if (!first) strcat (p++, ",");
+ p += snprintf (p, sizeof (stemp) - (p-stemp), "%lu", (unsigned long)smp.sfm_lastn);
+ first = false;
+ }
+ out.setValue("smp:ports", stemp);
+
+#define SET_VALUE_PKEY(key,value) snprintf (name, sizeof (name), "%s%s", stemp, key); out.setValue(name, value);
+
+ for (int i = 0; i < 3; ++i)
+ {
+ SuperFamicom::SMP::Timer<192> const& t = (i == 0 ? smp.timer0 : (i == 1 ? smp.timer1 : *(SuperFamicom::SMP::Timer<192>*)&smp.timer2));
+ snprintf (stemp, sizeof (stemp), "smp:timer%d:", i);
+ SET_VALUE_PKEY( "enable", t.enable );
+ SET_VALUE_PKEY( "target", t.enable );
+ char val200;
+ snprintf (val, sizeof (val), "%lu,%lu,%lu,%lu", (unsigned long)t.stage0_ticks, (unsigned long)t.stage1_ticks, (unsigned long)t.stage2_ticks, (unsigned long)t.stage3_ticks);
+ SET_VALUE_PKEY( "stage", val );
+ SET_VALUE_PKEY( "line", t.current_line );
+ }
+ 
+ out.setValue( "dsp:clock", smp.dsp.clock / 4096 );
+ 
+ out.setValue( "dsp:echohistaddr", smp.dsp.spc_dsp.m.echo_hist_pos - smp.dsp.spc_dsp.m.echo_hist );
+
+ stemp0 = 0;
+ p = stemp;
+ for (int i = 0; i < 8; ++i)
+ {
+ p += snprintf (p, sizeof(stemp) - (p-stemp), "%d,%d%s", smp.dsp.spc_dsp.m.echo_histi0, smp.dsp.spc_dsp.m.echo_histi1, ( i != 7 ) ? "," : "");
+ }
+ out.setValue( "dsp:echohistdata", stemp );
+ 
+ out.setValue( "dsp:sample", smp.dsp.spc_dsp.m.phase );
+ out.setValue( "dsp:kon", smp.dsp.spc_dsp.m.kon );
+ out.setValue( "dsp:noise", smp.dsp.spc_dsp.m.noise );
+ out.setValue( "dsp:counter", smp.dsp.spc_dsp.m.counter );
+ out.setValue( "dsp:echooffset", smp.dsp.spc_dsp.m.echo_offset );
+ out.setValue( "dsp:echolength", smp.dsp.spc_dsp.m.echo_length );
+ out.setValue( "dsp:koncache", smp.dsp.spc_dsp.m.new_kon );
+ out.setValue( "dsp:endx", smp.dsp.spc_dsp.m.endx_buf );
+ out.setValue( "dsp:envx", smp.dsp.spc_dsp.m.envx_buf );
+ out.setValue( "dsp:outx", smp.dsp.spc_dsp.m.outx_buf );
+ out.setValue( "dsp:pmon", smp.dsp.spc_dsp.m.t_pmon );
+ out.setValue( "dsp:non", smp.dsp.spc_dsp.m.t_non );
+ out.setValue( "dsp:eon", smp.dsp.spc_dsp.m.t_eon );
+ out.setValue( "dsp:dir", smp.dsp.spc_dsp.m.t_dir );
+ out.setValue( "dsp:koff", smp.dsp.spc_dsp.m.t_koff );
+ out.setValue( "dsp:brrnext", smp.dsp.spc_dsp.m.t_brr_next_addr );
+ out.setValue( "dsp:adsr0", smp.dsp.spc_dsp.m.t_adsr0 );
+ out.setValue( "dsp:brrheader", smp.dsp.spc_dsp.m.t_brr_header );
+ out.setValue( "dsp:brrdata", smp.dsp.spc_dsp.m.t_brr_byte );
+ out.setValue( "dsp:srcn", smp.dsp.spc_dsp.m.t_srcn );
+ out.setValue( "dsp:esa", smp.dsp.spc_dsp.m.t_esa );
+ out.setValue( "dsp:echodisable", !smp.dsp.spc_dsp.m.t_echo_enabled );
+ out.setValue( "dsp:diraddr", smp.dsp.spc_dsp.m.t_dir_addr );
+ out.setValue( "dsp:pitch", smp.dsp.spc_dsp.m.t_pitch );
+ out.setValue( "dsp:output", smp.dsp.spc_dsp.m.t_output );
+ out.setValue( "dsp:looped", smp.dsp.spc_dsp.m.t_looped );
+ out.setValue( "dsp:echoaddr", smp.dsp.spc_dsp.m.t_echo_ptr );
+ 
+#define META_WRITE_LEVELS(n, o) \
+ snprintf (stemp, sizeof (stemp), "%d,%d", o0, o1);\
+ out.setValue((n), stemp);
+ 
+ META_WRITE_LEVELS("dsp:mainout", smp.dsp.spc_dsp.m.t_main_out);
+ META_WRITE_LEVELS("dsp:echoout", smp.dsp.spc_dsp.m.t_echo_out);
+ META_WRITE_LEVELS("dsp:echoin", smp.dsp.spc_dsp.m.t_echo_in);
+ 
+#undef META_WRITE_LEVELS
+ 
+ for (int i = 0; i < 8; ++i)
+ {
+ snprintf (stemp, sizeof (stemp), "dsp:voice%d:", i);
+ snprintf (name, sizeof (name), "%sbrrhistaddr", stemp);
+ SuperFamicom::SPC_DSP::voice_t const& voice = smp.dsp.spc_dsp.m.voicesi;
+ out.setValue( name, voice.buf_pos );
+
+ char val1000;
+ char *p = val;
+ for (int j = 0; j < SuperFamicom::SPC_DSP::brr_buf_size; ++j)
+ {
+ p += snprintf (p, sizeof (val) - (p-val), "%d%s", voice.bufj, (j != SuperFamicom::SPC_DSP::brr_buf_size - 1) ? "," : "");
+ }
+ SET_VALUE_PKEY( "brrhistdata", val );
+ SET_VALUE_PKEY( "interpaddr", voice.interp_pos );
+ SET_VALUE_PKEY( "brraddr", voice.brr_addr );
+ SET_VALUE_PKEY( "brroffset", voice.brr_offset );
+ SET_VALUE_PKEY( "vbit", voice.vbit );
+ SET_VALUE_PKEY( "vidx", voice.regs - smp.dsp.spc_dsp.m.regs);
+ SET_VALUE_PKEY( "kondelay", voice.kon_delay );
+ SET_VALUE_PKEY( "envmode", voice.env_mode );
+ SET_VALUE_PKEY( "env", voice.env );
+ SET_VALUE_PKEY( "envxout", voice.t_envx_out );
+ SET_VALUE_PKEY( "envcache", voice.hidden_env );
+ }
+}
+
+blargg_err_t Sfm_Emu::save_( gme_writer_t writer, void* your_data ) const
+{
+ char *meta_serialized = (char *)malloc (10000);
+ 
+ Bml_Parser metadata;
+ create_updated_metadata( metadata );
+ metadata.serialize( meta_serialized, 10000 );
+
+ RETURN_ERR( writer( your_data, "SFM1", 4 ) );
+
+ uint8_t temp4;
+ uint32_t meta_length = (uint32_t) strlen (meta_serialized);
+ set_le32( temp, meta_length );
+ RETURN_ERR( writer( your_data, temp, 4 ) );
+ 
+ RETURN_ERR( writer( your_data, meta_serialized, meta_length ) );
+
+ RETURN_ERR( writer( your_data, smp.apuram, 65536 ) );
+
+ RETURN_ERR( writer( your_data, smp.dsp.spc_dsp.m.regs, 128 ) );
+ 
+ if ( smp.get_sfm_queue_remain() )
+ RETURN_ERR( writer( your_data, smp.get_sfm_queue(), smp.get_sfm_queue_remain() ) );
+
+ free (meta_serialized);
+ return blargg_ok;
+}
+
+blargg_err_t Sfm_Emu::play_and_filter( int count, sample_t out )
+{
+ smp.render( out, count );
+ filter.run( out, count );
+ return blargg_ok;
+}
+
+blargg_err_t Sfm_Emu::skip_( int count )
+{
+ if ( sample_rate() != native_sample_rate )
+ {
+ count = (int) (count * resampler.rate()) & ~1;
+ count -= resampler.skip_input( count );
+ }
+
+ // TODO: shouldn't skip be adjusted for the 64 samples read afterwards?
+
+ if ( count > 0 )
+ {
+ smp.skip( count );
+ filter.clear();
+ }
+
+	if ( sample_rate() != native_sample_rate )
+	{
+		// eliminate pop due to resampler
+		const int resampler_latency = 64;
+		sample_t buf resampler_latency;
+		return play_( resampler_latency, buf );
+	}
+
+	return blargg_ok;
+}
+
+blargg_err_t Sfm_Emu::play_( int count, sample_t out )
+{
+ if ( sample_rate() == native_sample_rate )
+ return play_and_filter( count, out );
+
+ int remain = count;
+ while ( remain > 0 )
+ {
+ remain -= resampler.read( &out count - remain, remain );
+ if ( remain > 0 )
+ {
+ int n = resampler.buffer_free();
+ RETURN_ERR( play_and_filter( n, resampler.buffer() ) );
+ resampler.write( n );
+ }
+ }
+ check( remain == 0 );
+ return blargg_ok;
+}
+
+blargg_err_t Sfm_Emu::hash_( Hash_Function& out ) const
+{
+ hash_sfm_file( file_begin(), file_size(), out );
+ return blargg_ok;
+}
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Spc_Sfm.h Added

@@ -0,0 +1,77 @@
+// Super Nintendo SFM music file emulator
+
+// Game_Music_Emu $vers
+#ifndef SPC_SFM_H
+#define SPC_SFM_H
+
+#include "Music_Emu.h"
+#include "higan/smp/smp.hpp"
+#include "Spc_Filter.h"
+
+#include "Bml_Parser.h"
+
+#if GME_SPC_FAST_RESAMPLER
+ #include "Upsampler.h"
+ typedef Upsampler Spc_Emu_Resampler;
+#else
+ #include "Fir_Resampler.h"
+ typedef Fir_Resampler<24> Spc_Emu_Resampler;
+#endif
+
+class Sfm_Emu : public Music_Emu {
+public:
+ // Minimum allowed file size
+ enum { sfm_min_file_size = 8 + 65536 + 128 };
+
+ // 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 };
+ 
+ // This will serialize the current state of the emulator into a new SFM file
+ blargg_err_t serialize( char buffer, int size );
+
+ // Disables annoying pseudo-surround effect some music uses
+ void disable_surround( bool disable = true ) { smp.dsp.disable_surround( disable ); }
+
+ // Enables gaussian, cubic or sinc interpolation
+ void interpolation_level( int level = 0 ) { smp.dsp.spc_dsp.interpolation_level( level ); }
+
+ SuperFamicom::SMP const* get_smp() const;
+ SuperFamicom::SMP * get_smp();
+
+ blargg_err_t hash_( Hash_Function& ) const;
+
+ static gme_type_t static_type() { return gme_sfm_type; }
+ 
+// Implementation
+public:
+ Sfm_Emu();
+ ~Sfm_Emu();
+
+protected:
+ virtual blargg_err_t load_mem_( byte const , int );
+ virtual blargg_err_t track_info_( track_info_t*, int track ) const;
+ virtual blargg_err_t set_track_info_( const track_info_t*, int track );
+ virtual blargg_err_t set_sample_rate_( int );
+ virtual blargg_err_t start_track_( int );
+ virtual blargg_err_t play_( int, sample_t );
+ virtual blargg_err_t skip_( int );
+ virtual void mute_voices_( int );
+ virtual void set_tempo_( double );
+ virtual blargg_err_t save_( gme_writer_t, void* ) const;
+
+private:
+ Spc_Emu_Resampler resampler;
+ Spc_Filter filter;
+ SuperFamicom::SMP smp;
+
+ Bml_Parser metadata;
+ void create_updated_metadata(Bml_Parser &out) const;
+
+ blargg_err_t play_and_filter( int count, sample_t out );
+};
+
+inline SuperFamicom::SMP const* Sfm_Emu::get_smp() const { return &smp; }
+inline SuperFamicom::SMP * Sfm_Emu::get_smp() { return &smp; }
+
+#endif // SPC_SFM_H

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Track_Filter.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Track_Filter.cpp Changed

@@ -1,293 +1,293 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Track_Filter.h"
-
-/* Copyright (C) 2003-2008 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 fade_block_size = 512;
-int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift)
-int const silence_threshold = 8;
-
-blargg_err_t Track_Filter::init( callbacks_t* c )
-{
-	callbacks = c;
-	return buf.resize( buf_size );
-}
-
-void Track_Filter::clear_time_vars()
-{
-	emu_time = buf_remain;
-	out_time = 0;
-	silence_time = 0;
-	silence_count = 0;
-}
-
-void Track_Filter::stop()
-{
-	emu_track_ended_ = true;
-	track_ended_ = true;
-	fade_start = indefinite_count;
-	fade_step = 1;
-	buf_remain = 0;
-	emu_error = NULL;
-	clear_time_vars();
-}
-
-Track_Filter::Track_Filter() : setup_()
-{
-	callbacks = NULL;
-	setup_.max_silence = indefinite_count;
-	silence_ignored_ = false;
-	stop();
-}
-
-Track_Filter::~Track_Filter() { }
-
-blargg_err_t Track_Filter::start_track()
-{
-	emu_error = NULL;
-	stop();
-	
-	emu_track_ended_ = false;
-	track_ended_ = false;
-	
-	if ( !silence_ignored_ )
-	{
-		// play until non-silence or end of track
-		while ( emu_time < setup_.max_initial )
-		{
-			fill_buf();
-			if ( buf_remain | emu_track_ended_ )
-				break;
-		}
-	}
-	
-	clear_time_vars();
-	return emu_error;
-}
-
-void Track_Filter::end_track_if_error( blargg_err_t err )
-{
-	if ( err )
-	{
-		emu_error = err;
-		emu_track_ended_ = true;
-	}
-}
-
-blargg_err_t Track_Filter::skip( int count )
-{
-	emu_error = NULL;
-	out_time += count;
-	
-	// remove from silence and buf first
-	{
-		int 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;
-		silence_time = emu_time; // would otherwise be invalid
-		end_track_if_error( callbacks->skip_( count ) );
-	}
-	
-	if ( !(silence_count | buf_remain) ) // caught up to emulator, so update track ended
-		track_ended_ |= emu_track_ended_;
-	
-	return emu_error;
-}
-
-blargg_err_t Track_Filter::skip_( int count )
-{
-	while ( count && !emu_track_ended_ )
-	{
-		int n = buf_size;
-		if ( n > count )
-			n = count;
-		count -= n;
-		RETURN_ERR( callbacks->play_( n, buf.begin() ) );
-	}
-	return blargg_ok;
-}
-
-// Fading
-
-void Track_Filter::set_fade( int start, int length )
-{
-	fade_start = start;
-	fade_step = length / (fade_block_size * fade_shift);
-	if ( fade_step < 1 )
-		fade_step = 1;
-}
-
-bool Track_Filter::is_fading() const
-{
-	return out_time >= fade_start && fade_start != indefinite_count;
-}
-
-// unit / pow( 2.0, (double) x / step )
-static int int_log( int x, int step, int unit )
-{
-	int shift = x / step;
-	int fraction = (x - shift * step) * unit / step;
-	return ((unit - fraction) + (fraction >> 1)) >> shift;
-}
-
-void Track_Filter::handle_fade( sample_t out , int out_count )
-{
-	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 Track_Filter::emu_play( sample_t out , int count )
-{
-	emu_time += count;
-	if ( !emu_track_ended_ )
-		end_track_if_error( callbacks->play_( count, out ) );
-	else
-		memset( out, 0, count * sizeof *out );
-}
-
-// number of consecutive silent samples at end
-static int count_silence( Track_Filter::sample_t begin , int size )
-{
-	Track_Filter::sample_t first = *begin;
-	*begin = silence_threshold * 2; // sentinel
-	Track_Filter::sample_t* p = begin + size;
-	while ( (unsigned) (*--p + silence_threshold) <= (unsigned) silence_threshold * 2 ) { }
-	*begin = first;
-	return size - (p - begin);
-}
-
-// fill internal buffer and check it for silence
-void Track_Filter::fill_buf()
-{
-	assert( !buf_remain );
-	if ( !emu_track_ended_ )
-	{
-		emu_play( buf.begin(), buf_size );
-		int 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 Track_Filter::play( int out_count, sample_t out )
-{
-	emu_error = NULL;
-	if ( track_ended_ )
-	{
-		memset( out, 0, out_count * sizeof *out );
-	}
-	else
-	{
-		assert( emu_time >= out_time );
-		
-		// prints nifty graph of how far ahead we are when searching for silence
-		//dprintf( "%*s \n", int ((emu_time - out_time) * 7 / 44100), "*" );
-		
-		// use any remaining silence samples
-		int pos = 0;
-		if ( silence_count )
-		{
-			if ( !silence_ignored_ )
-			{
-				// during a run of silence, run emulator at >=2x speed so it gets ahead
-				int ahead_time = setup_.lookahead * (out_time + out_count - silence_time) +
-						silence_time;
-				while ( emu_time < ahead_time && !(buf_remain | emu_track_ended_) )
-					fill_buf();
-				
-				// end track if sufficient silence has been found
-				if ( emu_time - silence_time > setup_.max_silence )
-				{
-					track_ended_ = emu_track_ended_ = true;
-					silence_count = out_count;
-					buf_remain = 0;
-				}
-			}
-			
-			// fill from remaining silence
-			pos = min( silence_count, out_count );
-			memset( out, 0, pos * sizeof *out );
-			silence_count -= pos;
-		}
-		
-		// use any remaining samples from buffer
-		if ( buf_remain )
-		{
-			int n = min( buf_remain, (int) (out_count - pos) );
-			memcpy( out + pos, buf.begin() + (buf_size - buf_remain), n * sizeof *out );
-			buf_remain -= n;
-			pos += n;
-		}
-		
-		// generate remaining samples normally
-		int remain = out_count - pos;
-		if ( remain )
-		{
-			emu_play( out + pos, remain );
-			track_ended_ |= emu_track_ended_;
-			
-			if ( silence_ignored_ && !is_fading() )
-			{
-				// if left unupdated, ahead_time could become too large
-				silence_time = emu_time;
-			}
-			else
-			{
-				// check end for a new run of silence
-				int 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 ( is_fading() )
-			handle_fade( out, out_count );
-	}
-	out_time += out_count;
-	return emu_error;
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Track_Filter.h"
+
+/* Copyright (C) 2003-2008 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 fade_block_size = 512;
+int const fade_shift = 8; // fade ends with gain at 1.0 / (1 << fade_shift)
+int const silence_threshold = 8;
+
+blargg_err_t Track_Filter::init( callbacks_t* c )
+{
+	callbacks = c;
+	return buf.resize( buf_size );
+}
+
+void Track_Filter::clear_time_vars()
+{
+	emu_time = buf_remain;
+	out_time = 0;
+	silence_time = 0;
+	silence_count = 0;
+}
+
+void Track_Filter::stop()
+{
+	emu_track_ended_ = true;
+	track_ended_ = true;
+	fade_start = indefinite_count;
+	fade_step = 1;
+	buf_remain = 0;
+	emu_error = NULL;
+	clear_time_vars();
+}
+
+Track_Filter::Track_Filter() : setup_()
+{
+	callbacks = NULL;
+	setup_.max_silence = indefinite_count;
+	silence_ignored_ = false;
+	stop();
+}
+
+Track_Filter::~Track_Filter() { }
+
+blargg_err_t Track_Filter::start_track()
+{
+	emu_error = NULL;
+	stop();
+	
+	emu_track_ended_ = false;
+	track_ended_ = false;
+	
+	if ( !silence_ignored_ )
+	{
+		// play until non-silence or end of track
+		while ( emu_time < setup_.max_initial )
+		{
+			fill_buf();
+			if ( buf_remain | emu_track_ended_ )
+				break;
+		}
+	}
+	
+	clear_time_vars();
+	return emu_error;
+}
+
+void Track_Filter::end_track_if_error( blargg_err_t err )
+{
+	if ( err )
+	{
+		emu_error = err;
+		emu_track_ended_ = true;
+	}
+}
+
+blargg_err_t Track_Filter::skip( int count )
+{
+	emu_error = NULL;
+	out_time += count;
+	
+	// remove from silence and buf first
+	{
+		int 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;
+		silence_time = emu_time; // would otherwise be invalid
+		end_track_if_error( callbacks->skip_( count ) );
+	}
+	
+	if ( !(silence_count | buf_remain) ) // caught up to emulator, so update track ended
+		track_ended_ |= emu_track_ended_;
+	
+	return emu_error;
+}
+
+blargg_err_t Track_Filter::skip_( int count )
+{
+	while ( count && !emu_track_ended_ )
+	{
+		int n = buf_size;
+		if ( n > count )
+			n = count;
+		count -= n;
+		RETURN_ERR( callbacks->play_( n, buf.begin() ) );
+	}
+	return blargg_ok;
+}
+
+// Fading
+
+void Track_Filter::set_fade( int start, int length )
+{
+	fade_start = start;
+	fade_step = length / (fade_block_size * fade_shift);
+	if ( fade_step < 1 )
+		fade_step = 1;
+}
+
+bool Track_Filter::is_fading() const
+{
+	return out_time >= fade_start && fade_start != indefinite_count;
+}
+
+// unit / pow( 2.0, (double) x / step )
+static int int_log( int x, int step, int unit )
+{
+	int shift = x / step;
+	int fraction = (x - shift * step) * unit / step;
+	return ((unit - fraction) + (fraction >> 1)) >> shift;
+}
+
+void Track_Filter::handle_fade( sample_t out , int out_count )
+{
+	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 Track_Filter::emu_play( sample_t out , int count )
+{
+	emu_time += count;
+	if ( !emu_track_ended_ )
+		end_track_if_error( callbacks->play_( count, out ) );
+	else
+		memset( out, 0, count * sizeof *out );
+}
+
+// number of consecutive silent samples at end
+static int count_silence( Track_Filter::sample_t begin , int size )
+{
+	Track_Filter::sample_t first = *begin;
+	*begin = silence_threshold * 2; // sentinel
+	Track_Filter::sample_t* p = begin + size;
+	while ( (unsigned) (*--p + silence_threshold) <= (unsigned) silence_threshold * 2 ) { }
+	*begin = first;
+	return size - (p - begin);
+}
+
+// fill internal buffer and check it for silence
+void Track_Filter::fill_buf()
+{
+	assert( !buf_remain );
+	if ( !emu_track_ended_ )
+	{
+		emu_play( buf.begin(), buf_size );
+		int 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 Track_Filter::play( int out_count, sample_t out )
+{
+	emu_error = NULL;
+	if ( track_ended_ )
+	{
+		memset( out, 0, out_count * sizeof *out );
+	}
+	else
+	{
+		assert( emu_time >= out_time );
+		
+		// prints nifty graph of how far ahead we are when searching for silence
+		//dprintf( "%*s \n", int ((emu_time - out_time) * 7 / 44100), "*" );
+		
+		// use any remaining silence samples
+		int pos = 0;
+		if ( silence_count )
+		{
+			if ( !silence_ignored_ )
+			{
+				// during a run of silence, run emulator at >=2x speed so it gets ahead
+				int ahead_time = setup_.lookahead * (out_time + out_count - silence_time) +
+						silence_time;
+				while ( emu_time < ahead_time && !(buf_remain | emu_track_ended_) )
+					fill_buf();
+				
+				// end track if sufficient silence has been found
+				if ( emu_time - silence_time > setup_.max_silence )
+				{
+					track_ended_ = emu_track_ended_ = true;
+					silence_count = out_count;
+					buf_remain = 0;
+				}
+			}
+			
+			// fill from remaining silence
+			pos = min( silence_count, out_count );
+			memset( out, 0, pos * sizeof *out );
+			silence_count -= pos;
+		}
+		
+		// use any remaining samples from buffer
+		if ( buf_remain )
+		{
+			int n = min( buf_remain, (int) (out_count - pos) );
+			memcpy( out + pos, buf.begin() + (buf_size - buf_remain), n * sizeof *out );
+			buf_remain -= n;
+			pos += n;
+		}
+		
+		// generate remaining samples normally
+		int remain = out_count - pos;
+		if ( remain )
+		{
+			emu_play( out + pos, remain );
+			track_ended_ |= emu_track_ended_;
+			
+			if ( silence_ignored_ && !is_fading() )
+			{
+				// if left unupdated, ahead_time could become too large
+				silence_time = emu_time;
+			}
+			else
+			{
+				// check end for a new run of silence
+				int 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 ( is_fading() )
+			handle_fade( out, out_count );
+	}
+	out_time += out_count;
+	return emu_error;
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Track_Filter.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Track_Filter.h Changed

@@ -1,105 +1,105 @@
-// Removes silence from beginning of track, fades end of track. Also looks ahead
-// for excessive silence, and if found, ends track.
-
-// Game_Music_Emu 0.6-pre
-#ifndef TRACK_FILTER_H
-#define TRACK_FILTER_H
-
-#include "blargg_common.h"
-
-class Track_Filter {
-public:
-	typedef int sample_count_t;
-	typedef short sample_t;
-	
-	enum { indefinite_count = INT_MAX/2 + 1 };
-	
-	struct callbacks_t {
-		// Samples may be stereo or mono
-		virtual blargg_err_t play_( int count, sample_t* out ) BLARGG_PURE( { return blargg_ok; } )
-		virtual blargg_err_t skip_( int count ) BLARGG_PURE( { return blargg_ok; } )
-		virtual ~callbacks_t() { } // avoids silly "non-virtual dtor" warning
-	};
-	
-	// Initializes filter. Must be done once before using object.
-	blargg_err_t init( callbacks_t* );
-	
-	struct setup_t {
-		sample_count_t max_initial; // maximum silence to strip from beginning of track
-		sample_count_t max_silence; // maximum silence in middle of track without it ending
-		int lookahead; // internal speed when looking ahead for silence (2=200% etc.)
-	};
-	
-	// Gets/sets setup
-	setup_t const& setup() const { return setup_; }
-	void setup( setup_t const& s ) { setup_ = s; }
-	
-	// Disables automatic end-of-track detection and skipping of silence at beginning
-	void ignore_silence( bool disable = true ) { silence_ignored_ = disable; }
-	
-	// Clears state and skips initial silence in track
-	blargg_err_t start_track();
-	
-	// Sets time that fade starts, and how long until track ends.
-	void set_fade( sample_count_t start, sample_count_t length );
-	
-	// Generates n samples into buf
-	blargg_err_t play( int n, sample_t buf );
-	
-	// Skips n samples
-	blargg_err_t skip( int n );
-	
-	// Number of samples played/skipped since start_track()
-	int sample_count() const { return out_time; }
-	
-	// True if track ended. Causes are end of source samples, end of fade,
-	// or excessive silence.
-	bool track_ended() const { return track_ended_; }
-	
-	// Clears state
-	void stop();
-	
-// For use by callbacks
-
-	// Sets internal "track ended" flag and stops generation of further source samples
-	void set_track_ended() { emu_track_ended_ = true; }
-	
-	// For use by skip_() callback
-	blargg_err_t skip_( int count );
-	
-// Implementation
-public:
-	Track_Filter();
-	~Track_Filter();
-	
-private:
-	callbacks_t* callbacks;
-	setup_t setup_;
-	const char* emu_error;
-	bool silence_ignored_;
-	
-	// Timing
-	int out_time; // number of samples played since start of track
-	int emu_time; // number of samples emulator has generated since start of track
-	int emu_track_ended_; // emulator has reached end of track
-	volatile int track_ended_;
-	void clear_time_vars();
-	void end_track_if_error( blargg_err_t );
-	
-	// Fading
-	int fade_start;
-	int fade_step;
-	bool is_fading() const;
-	void handle_fade( sample_t out , int count );
-	
-	// Silence detection
-	int silence_time; // absolute number of samples where most recent silence began
-	int silence_count; // number of samples of silence to play before using buf
-	int buf_remain; // number of samples left in silence buffer
-	enum { buf_size = 2048 };
-	blargg_vector<sample_t> buf;
-	void fill_buf();
-	void emu_play( sample_t out , int count );
-};
-
-#endif
+// Removes silence from beginning of track, fades end of track. Also looks ahead
+// for excessive silence, and if found, ends track.
+
+// Game_Music_Emu $vers
+#ifndef TRACK_FILTER_H
+#define TRACK_FILTER_H
+
+#include "blargg_common.h"
+
+class Track_Filter {
+public:
+	typedef int sample_count_t;
+	typedef short sample_t;
+	
+	enum { indefinite_count = INT_MAX/2 + 1 };
+	
+	struct callbacks_t {
+		// Samples may be stereo or mono
+		virtual blargg_err_t play_( int count, sample_t* out ) BLARGG_PURE( { return blargg_ok; } )
+		virtual blargg_err_t skip_( int count ) BLARGG_PURE( { return blargg_ok; } )
+		virtual ~callbacks_t() { } // avoids silly "non-virtual dtor" warning
+	};
+	
+	// Initializes filter. Must be done once before using object.
+	blargg_err_t init( callbacks_t* );
+	
+	struct setup_t {
+		sample_count_t max_initial; // maximum silence to strip from beginning of track
+		sample_count_t max_silence; // maximum silence in middle of track without it ending
+		int lookahead; // internal speed when looking ahead for silence (2=200% etc.)
+	};
+	
+	// Gets/sets setup
+	setup_t const& setup() const { return setup_; }
+	void setup( setup_t const& s ) { setup_ = s; }
+	
+	// Disables automatic end-of-track detection and skipping of silence at beginning
+	void ignore_silence( bool disable = true ) { silence_ignored_ = disable; }
+	
+	// Clears state and skips initial silence in track
+	blargg_err_t start_track();
+	
+	// Sets time that fade starts, and how long until track ends.
+	void set_fade( sample_count_t start, sample_count_t length );
+	
+	// Generates n samples into buf
+	blargg_err_t play( int n, sample_t buf );
+	
+	// Skips n samples
+	blargg_err_t skip( int n );
+	
+	// Number of samples played/skipped since start_track()
+	int sample_count() const { return out_time; }
+	
+	// True if track ended. Causes are end of source samples, end of fade,
+	// or excessive silence.
+	bool track_ended() const { return track_ended_; }
+	
+	// Clears state
+	void stop();
+	
+// For use by callbacks
+
+	// Sets internal "track ended" flag and stops generation of further source samples
+	void set_track_ended() { emu_track_ended_ = true; }
+	
+	// For use by skip_() callback
+	blargg_err_t skip_( int count );
+	
+// Implementation
+public:
+	Track_Filter();
+	~Track_Filter();
+	
+private:
+	callbacks_t* callbacks;
+	setup_t setup_;
+	const char* emu_error;
+	bool silence_ignored_;
+	
+	// Timing
+	int out_time; // number of samples played since start of track
+	int emu_time; // number of samples emulator has generated since start of track
+	int emu_track_ended_; // emulator has reached end of track
+	volatile int track_ended_;
+	void clear_time_vars();
+	void end_track_if_error( blargg_err_t );
+	
+	// Fading
+	int fade_start;
+	int fade_step;
+	bool is_fading() const;
+	void handle_fade( sample_t out , int count );
+	
+	// Silence detection
+	int silence_time; // absolute number of samples where most recent silence began
+	int silence_count; // number of samples of silence to play before using buf
+	int buf_remain; // number of samples left in silence buffer
+	enum { buf_size = 2048 };
+	blargg_vector<sample_t> buf;
+	void fill_buf();
+	void emu_play( sample_t out , int count );
+};
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Upsampler.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Upsampler.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Upsampler.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Upsampler.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Vgm_Core.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Vgm_Core.cpp Changed

@@ -1,9 +1,10 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
 
 #include "Vgm_Core.h"
 
 #include "blargg_endian.h"
 #include <math.h>
+#include <stdio.h>
 
 /* Copyright (C) 2003-2008 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser
@@ -18,424 +19,219 @@
 
 #include "blargg_source.h"
 
-int const stereo = 2;
-int const fm_time_bits = 12;
-int const blip_time_bits = 12;
-
-enum {
-	cmd_gg_stereo = 0x4F,
-	cmd_psg = 0x50,
-	cmd_ym2413 = 0x51,
-	cmd_ym2612_port0 = 0x52,
-	cmd_ym2612_port1 = 0x53,
-	cmd_ym2151 = 0x54,
-	cmd_delay = 0x61,
-	cmd_delay_735 = 0x62,
-	cmd_delay_882 = 0x63,
-	cmd_byte_delay = 0x64,
-	cmd_end = 0x66,
-	cmd_data_block = 0x67,
-	cmd_short_delay = 0x70,
-	cmd_pcm_delay = 0x80,
-	cmd_pcm_seek = 0xE0,
-	
-	pcm_block_type = 0x00,
-	ym2612_dac_port = 0x2A,
-	ym2612_dac_pan_port = 0xB6
-};
-
-inline int command_len( int command )
+Vgm_Core::Vgm_Core()
 {
-	static byte const lens 0x10 = {
-	// 0 1 2 3 4 5 6 7 8 9 A B C D E F
-	 1,1,1,2,2,3,1,1,1,1,3,3,4,4,5,5
-	};
-	int len = lens command >> 4;
-	check( len != 1 );
-	return len;
+	vgmp = (VGM_PLAYER *) VGMPlay_Init();
+ vgmp->VGMMaxLoop = 0;
+	VGMPlay_Init2(vgmp);
 }
 
-int Vgm_Core::run_ym2413( int time )
+Vgm_Core::~Vgm_Core()
 {
-	return ym2413.run_until( time );
+	StopVGM(vgmp);
+	CloseVGMFile(vgmp);
+	VGMPlay_Deinit(vgmp);
 }
 
-int Vgm_Core::run_ym2612( int time )
+static UINT32 gcd(UINT32 x, UINT32 y)
 {
-	return ym2612.run_until( time );
-}
+	UINT32 shift;
+	UINT32 diff;
+
+	// Thanks to Wikipedia for this algorithm
+	// http://en.wikipedia.org/wiki/Binary_GCD_algorithm
+	if (! x || ! y)
+		return x | y;
+
+	for (shift = 0; ((x | y) & 1) == 0; shift ++)
+	{
+		x >>= 1;
+		y >>= 1;
+	}
+
+	while((x & 1) == 0)
+		x >>= 1;
+
+	do
+	{
+		while((y & 1) == 0)
+			y >>= 1;
 
-Vgm_Core::Vgm_Core() { blip_buf = stereo_buf.center(); }
+		if (x < y)
+		{
+			y -= x;
+		}
+		else
+		{
+			diff = x - y;
+			x = y;
+			y = diff;
+		}
+		y >>= 1;
+	} while(y);
+
+	return x << shift;
+}
 
 void Vgm_Core::set_tempo( double t )
 {
 	if ( file_begin() )
 	{
-		vgm_rate = (int) (44100 * t + 0.5);
-		blip_time_factor = (int) ((double)
-				(1 << blip_time_bits) / vgm_rate * stereo_buf.center()->clock_rate() + 0.5);
-		//dprintf( "blip_time_factor: %ld\n", blip_time_factor );
-		//dprintf( "vgm_rate: %ld\n", vgm_rate );
-		// TODO: remove? calculates vgm_rate more accurately (above differs at most by one Hz only)
-		//blip_time_factor = (int) floor( double (1 << blip_time_bits) * psg_rate_ / 44100 / t + 0.5 );
-		//vgm_rate = (int) floor( double (1 << blip_time_bits) * psg_rate_ / blip_time_factor + 0.5 );
-		
-		fm_time_factor = 2 + (int) (fm_rate * (1 << fm_time_bits) / vgm_rate + 0.5);
+ int vgm_rate_unit = header().lngRate;
+ if (!vgm_rate_unit)
+ vgm_rate_unit = 44100;
+		int vgm_rate = (int) (vgm_rate_unit * t + 0.5);
+		int old_rate = vgmp->VGMPbRate;
+		vgmp->VGMPbRate = vgm_rate;
+ vgmp->SampleRate = sample_rate;
+
+		if (vgmp->PlayingMode != 0xFF)
+		{
+			if (!old_rate)
+				old_rate = vgm_rate_unit;
+
+			INT32 TempSLng = gcd(vgm_rate_unit, vgmp->VGMPbRate);
+			vgmp->VGMPbRateMul = vgm_rate_unit / TempSLng;
+			vgmp->VGMPbRateDiv = vgmp->VGMPbRate / TempSLng;
+
+			vgmp->VGMSmplRateMul = vgmp->SampleRate * vgmp->VGMPbRateMul;
+			vgmp->VGMSmplRateDiv = vgmp->VGMSampleRate * vgmp->VGMPbRateDiv;
+			// same as above - to speed up the VGM <-> Playback calculation
+			TempSLng = gcd(vgmp->VGMSmplRateMul, vgmp->VGMSmplRateDiv);
+			vgmp->VGMSmplRateMul /= TempSLng;
+			vgmp->VGMSmplRateDiv /= TempSLng;
+
+			vgmp->VGMSmplPlayed = (INT32)((INT64)vgmp->VGMSmplPlayed * old_rate / vgm_rate);
+		}
 	}
 }
 
-bool Vgm_Core::header_t::valid_tag() const
+struct VGM_FILE_mem
 {
-	return !memcmp( tag, "Vgm ", 4 );
+	VGM_FILE vf;
+	const BOOST::uint8_t* buffer;
+	UINT32 ptr;
+	UINT32 size;
+};
+
+static int VGMF_mem_Read(VGM_FILE* f, void* out, UINT32 count)
+{
+	VGM_FILE_mem* mf = (VGM_FILE_mem *) f;
+	if (count + mf->ptr > mf->size)
+		count = mf->size - mf->ptr;
+	memcpy(out, mf->buffer + mf->ptr, count);
+	mf->ptr += count;
+	return count;
 }
 
-blargg_err_t Vgm_Core::load_mem_( byte const data , int size )
+static int VGMF_mem_Seek(VGM_FILE* f, UINT32 offset)
 {
-	assert( offsetof (header_t,unused2 8) == header_t::size );
-	
-	if ( size <= header_t::size )
-		return blargg_err_file_type;
-	
-	header_t const& h = *(header_t const*) data;
-	
-	if ( !h.valid_tag() )
-		return blargg_err_file_type;
-	
-	check( get_le32( h.version ) <= 0x150 );
-	
-	// Get loop
-	loop_begin = file_end();
-	if ( get_le32( h.loop_offset ) )
-		loop_begin = &data get_le32( h.loop_offset ) + offsetof (header_t,loop_offset);
-	
-	// PSG rate
-	int psg_rate = get_le32( h.psg_rate );
-	if ( !psg_rate )
-		psg_rate = 3579545;
-	stereo_buf.clock_rate( psg_rate );
-	
-	// Disable FM
-	fm_rate = 0;
-	ym2612.enable( false );
-	ym2413.enable( false );
-	
-	set_tempo( 1 );
-	
-	return blargg_ok;
+	VGM_FILE_mem* mf = (VGM_FILE_mem *) f;
+	if (offset > mf->size)
+		offset = mf->size;
+	mf->ptr = offset;
+	return 0;
 }
 
-// Update pre-1.10 header FM rates by scanning commands
-void Vgm_Core::update_fm_rates( int* ym2413_rate, int* ym2612_rate ) const
+static UINT32 VGMF_mem_GetSize(VGM_FILE* f)
 {
-	byte const* p = file_begin() + 0x40;
-	while ( p < file_end() )
-	{
-		switch ( *p )
-		{
-		case cmd_end:
-			return;
-		
-		case cmd_psg:
-		case cmd_byte_delay:
-			p += 2;
-			break;
-		
-		case cmd_delay:
-			p += 3;
-			break;
-		
-		case cmd_data_block:
-			p += 7 + get_le32( p + 3 );
-			break;
-		
-		case cmd_ym2413:
-			*ym2612_rate = 0;
-			return;
-		
-		case cmd_ym2612_port0:
-		case cmd_ym2612_port1:
-			*ym2612_rate = *ym2413_rate;
-			*ym2413_rate = 0;
-			return;
-		
-		case cmd_ym2151:
-			*ym2413_rate = 0;
-			*ym2612_rate = 0;
-			return;
-		
-		default:
-			p += command_len( *p );
-		}
-	}
+	VGM_FILE_mem* mf = (VGM_FILE_mem *) f;
+	return mf->size;
 }
 
-blargg_err_t Vgm_Core::init_fm( double* rate )
+static UINT32 VGMF_mem_Tell(VGM_FILE* f)
 {
-	int ym2612_rate = get_le32( header().ym2612_rate );
-	int ym2413_rate = get_le32( header().ym2413_rate );
-	if ( ym2413_rate && get_le32( header().version ) < 0x110 )
-		update_fm_rates( &ym2413_rate, &ym2612_rate );
-	
-	if ( ym2612_rate )
-	{
-		if ( !*rate )
-			*rate = ym2612_rate / 144.0;
-		RETURN_ERR( ym2612.set_rate( *rate, ym2612_rate ) );
-		ym2612.enable();
-	}
-	else if ( ym2413_rate )
-	{
-		if ( !*rate )
-			*rate = ym2413_rate / 72.0;
-		int result = ym2413.set_rate( *rate, ym2413_rate );
-		if ( result == 2 )
-			return "YM2413 FM sound not supported";
-		CHECK_ALLOC( !result );
-		ym2413.enable();
-	}
-	
-	fm_rate = *rate;
-	
-	return blargg_ok;
+	VGM_FILE_mem* mf = (VGM_FILE_mem *) f;
+	return mf->ptr;
 }
 
-void Vgm_Core::start_track()
+blargg_err_t Vgm_Core::load_mem_( byte const data , int size )
 {
-	psg.reset( get_le16( header().noise_feedback ), header().noise_width );
-	
-	blip_buf = stereo_buf.center();
-
-	dac_disabled = -1;
-	pos = file_begin() + header_t::size;
-	pcm_data = pos;
-	pcm_pos = pos;
-	dac_amp = -1;
-	vgm_time = 0;
-	if ( get_le32( header().version ) >= 0x150 )
-	{
-		int data_offset = get_le32( header().data_offset );
-		check( data_offset );
-		if ( data_offset )
-			pos += data_offset + offsetof (header_t,data_offset) - 0x40;
-	}
-	
-	if ( uses_fm() )
-	{
-		if ( ym2413.enabled() )
-			ym2413.reset();
-		
-		if ( ym2612.enabled() )
-			ym2612.reset();
-		
-		stereo_buf.clear();
-	}
-	
-	fm_time_offset = 0;
+	VGM_FILE_mem memFile;
+
+	memFile.vf.Read = &VGMF_mem_Read;
+	memFile.vf.Seek = &VGMF_mem_Seek;
+	memFile.vf.GetSize = &VGMF_mem_GetSize;
+	memFile.vf.Tell = &VGMF_mem_Tell;
+	memFile.buffer = data;
+	memFile.ptr = 0;
+	memFile.size = size;
+
+	if ( !GetVGMFileInfo_Handle( (VGM_FILE *) &memFile, &_header, 0 ) )
+		return blargg_err_file_type;
+
+	memFile.ptr = 0;
+
+	if ( !OpenVGMFile_Handle( vgmp, (VGM_FILE *) &memFile ) )
+		return blargg_err_file_type;
+ 
+ if ( !header().lngLoopOffset )
+ vgmp->VGMMaxLoop = 1;
+
+	set_tempo( 1 );
+ 
+	return blargg_ok;
 }
 
-inline Vgm_Core::fm_time_t Vgm_Core::to_fm_time( vgm_time_t t ) const
+int Vgm_Core::get_channel_count()
 {
-	return (t * fm_time_factor + fm_time_offset) >> fm_time_bits;
+ // XXX may support more than this, but 32 bit masks and all...
+ unsigned i;
+ UINT32 j;
+ for (i = 0; i < 32; i++)
+ {
+ if (!GetAccurateChipNameByChannel(vgmp, i, &j))
+ break;
+ }
+ return i;
 }
 
-inline blip_time_t Vgm_Core::to_psg_time( vgm_time_t t ) const
+char* Vgm_Core::get_voice_name(int channel)
 {
-	return (t * blip_time_factor) >> blip_time_bits;
+ UINT32 realChannel;
+ const char * name = GetAccurateChipNameByChannel(vgmp, channel, &realChannel);
+ size_t length = strlen(name) + 16;
+ char * finalName = (char *) malloc(length);
+ if (finalName)
+#ifdef _MSC_VER
+ sprintf_s(finalName, length, "%s #%u", name, realChannel);
+#else
+ sprintf(finalName, "%s #%u", name, realChannel);
+#endif
+ return finalName;
 }
 
-void Vgm_Core::write_pcm( vgm_time_t vgm_time, int amp )
+void Vgm_Core::free_voice_name(char *name)
 {
-	if ( blip_buf )
-	{
-		check( amp >= 0 );
-		blip_time_t blip_time = to_psg_time( vgm_time );
-		int old = dac_amp;
-		int delta = amp - old;
-		dac_amp = amp;
-		blip_buf->set_modified();
-		if ( old >= 0 ) // first write is ignored, to avoid click
-			pcm.offset_inline( blip_time, delta, blip_buf );
-		else
-			dac_amp |= dac_disabled;
-	}
+ free(name);
 }
 
-blip_time_t Vgm_Core::run( vgm_time_t end_time )
+void Vgm_Core::set_mute(int mask)
 {
-	vgm_time_t vgm_time = this->vgm_time; 
-	vgm_time_t vgm_loop_time = ~0;
-	byte const* pos = this->pos;
-	if ( pos > file_end() )
-		set_warning( "Stream lacked end event" );
-	
-	while ( vgm_time < end_time && pos < file_end() )
-	{
-		// TODO: be sure there are enough bytes left in stream for particular command
-		// so we don't read past end
-		switch ( *pos++ )
-		{
-		case cmd_end:
-			if ( vgm_loop_time == ~0 ) vgm_loop_time = vgm_time;
-			else if ( vgm_loop_time == vgm_time ) loop_begin = file_end(); // XXX some files may loop forever on a region without any delay commands
-			pos = loop_begin; // if not looped, loop_begin == file_end()
-			break;
-		
-		case cmd_delay_735:
-			vgm_time += 735;
-			break;
-		
-		case cmd_delay_882:
-			vgm_time += 882;
-			break;
-		
-		case cmd_gg_stereo:
-			psg.write_ggstereo( to_psg_time( vgm_time ), *pos++ );
-			break;
-		
-		case cmd_psg:
-			psg.write_data( to_psg_time( vgm_time ), *pos++ );
-			break;
-		
-		case cmd_delay:
-			vgm_time += pos 1 * 0x100 + pos 0;
-			pos += 2;
-			break;
-		
-		case cmd_byte_delay:
-			vgm_time += *pos++;
-			break;
-		
-		case cmd_ym2413:
-			if ( run_ym2413( to_fm_time( vgm_time ) ) )
-				ym2413.write( pos 0, pos 1 );
-			pos += 2;
-			break;
-		
-		case cmd_ym2612_port0:
-			if ( pos 0 == ym2612_dac_port )
-			{
-				write_pcm( vgm_time, pos 1 );
-			}
-			else if ( run_ym2612( to_fm_time( vgm_time ) ) )
-			{
-				if ( pos 0 == 0x2B )
-				{
-					dac_disabled = (pos 1 >> 7 & 1) - 1;
-					dac_amp |= dac_disabled;
-				}
-				ym2612.write0( pos 0, pos 1 );
-			}
-			pos += 2;
-			break;
-		
-		case cmd_ym2612_port1:
-			if ( run_ym2612( to_fm_time( vgm_time ) ) )
-			{
-				if ( pos 0 == ym2612_dac_pan_port )
-				{
-					Blip_Buffer * blip_buf = NULL;
-					switch ( pos 1 >> 6 )
-					{
-					case 0: blip_buf = NULL; break;
-					case 1: blip_buf = stereo_buf.right(); break;
-					case 2: blip_buf = stereo_buf.left(); break;
-					case 3: blip_buf = stereo_buf.center(); break;
-					}
-					/*if ( this->blip_buf != blip_buf )
-					{
-						blip_time_t blip_time = to_psg_time( vgm_time );
-						if ( this->blip_buf ) pcm.offset_inline( blip_time, -dac_amp, this->blip_buf );
-						if ( blip_buf ) pcm.offset_inline( blip_time, dac_amp, blip_buf );
-					}*/
-					this->blip_buf = blip_buf;
-				}
-				ym2612.write1( pos 0, pos 1 );
-			}
-			pos += 2;
-			break;
-			
-		case cmd_data_block: {
-			check( *pos == cmd_end );
-			int type = pos 1;
-			int size = get_le32( pos + 2 );
-			pos += 6;
-			if ( type == pcm_block_type )
-				pcm_data = pos;
-			pos += size;
-			break;
-		}
-		
-		case cmd_pcm_seek:
-			pcm_pos = pcm_data + pos 3 * 0x1000000 + pos 2 * 0x10000 +
-					pos 1 * 0x100 + pos 0;
-			pos += 4;
-			break;
-		
-		default:
-			int cmd = pos -1;
-			switch ( cmd & 0xF0 )
-			{
-				case cmd_pcm_delay:
-					write_pcm( vgm_time, *pcm_pos++ );
-					vgm_time += cmd & 0x0F;
-					break;
-				
-				case cmd_short_delay:
-					vgm_time += (cmd & 0x0F) + 1;
-					break;
-				
-				case 0x50:
-					pos += 2;
-					break;
-				
-				default:
-					pos += command_len( cmd ) - 1;
-					set_warning( "Unknown stream event" );
-			}
-		}
-	}
-	vgm_time -= end_time;
-	this->pos = pos;
-	this->vgm_time = vgm_time;
-	
-	return to_psg_time( end_time );
+ for (int i = 0; i < 32; i++)
+ {
+ SetChannelMute(vgmp, i, (mask >> i) & 1);
+ }
 }
 
-blip_time_t Vgm_Core::run_psg( int msec )
+void Vgm_Core::start_track()
 {
-	blip_time_t t = run( msec * vgm_rate / 1000 );
-	psg.end_frame( t );
-	return t;
+	PlayVGM(vgmp);
+	RestartVGM(vgmp);
 }
 
-int Vgm_Core::play_frame( blip_time_t blip_time, int sample_count, blip_sample_t out )
+int Vgm_Core::play_( int sample_count, short out )
 {
 	// to do: timing is working mostly by luck
-	int min_pairs = (unsigned) sample_count / 2;
-	int vgm_time = (min_pairs << fm_time_bits) / fm_time_factor - 1;
-	assert( to_fm_time( vgm_time ) <= min_pairs );
-	int pairs;
-	while ( (pairs = to_fm_time( vgm_time )) < min_pairs )
-		vgm_time++;
-	//dprintf( "pairs: %d, min_pairs: %d\n", pairs, min_pairs );
-	
-	if ( ym2612.enabled() )
-	{
-		ym2612.begin_frame( out );
-		memset( out, 0, pairs * stereo * sizeof *out );
-	}
-	else if ( ym2413.enabled() )
-	{
-		ym2413.begin_frame( out );
-	}
-	
-	run( vgm_time );
-	run_ym2612( pairs );
-	run_ym2413( pairs );
-	
-	fm_time_offset = (vgm_time * fm_time_factor + fm_time_offset) - (pairs << fm_time_bits);
-	
-	psg.end_frame( blip_time );
-	
-	return pairs * stereo;
+	int pairs = (unsigned) sample_count / 2;
+
+ memset(out, 0, sizeof(short) * pairs * 2);
+ FillBuffer(vgmp, (WAVE_16BS*) out, pairs);
+
+	return pairs * 2;
+}
+
+void Vgm_Core::skip_( int count )
+{
+	SeekVGM( vgmp, true, count / 2 );
 }

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Vgm_Core.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Vgm_Core.h Changed

@@ -1,160 +1,65 @@
 // Sega VGM music file emulator core
 
-// Game_Music_Emu 0.6-pre
+// Game_Music_Emu $vers
 #ifndef VGM_CORE_H
 #define VGM_CORE_H
 
 #include "Gme_Loader.h"
-#include "Ym2612_Emu.h"
-#include "Ym2413_Emu.h"
-#include "Sms_Apu.h"
-#include "Multi_Buffer.h"
-
-	template<class Emu>
-	class Ym_Emu : public Emu {
-		int last_time;
-		short* out;
-		enum { disabled_time = -1 };
-	public:
-		Ym_Emu() { last_time = disabled_time; out = NULL; }
-		void enable( bool b = true ) { last_time = b ? 0 : disabled_time; }
-		bool enabled() const { return last_time != disabled_time; }
-		void begin_frame( short* buf ) { out = buf; last_time = 0; }
-		
-		int run_until( int time )
-		{
-			int count = time - last_time;
-			if ( count > 0 )
-			{
-				if ( last_time < 0 )
-					return false;
-				last_time = time;
-				short* p = out;
-				out += count * Emu::out_chan_count;
-				Emu::run( count, p );
-			}
-			return true;
-		}
-	};
+
+#include "../vgmplay/VGMPlay/VGMPlay.h"
 
 class Vgm_Core : public Gme_Loader {
 public:
+	typedef VGM_HEADER header_t;
 
 	// VGM file header
-	struct header_t
-	{
-		enum { size = 0x40 };
-		
-		char tag 4;
-		byte data_size 4;
-		byte version 4;
-		byte psg_rate 4;
-		byte ym2413_rate 4;
-		byte gd3_offset 4;
-		byte track_duration 4;
-		byte loop_offset 4;
-		byte loop_duration 4;
-		byte frame_rate 4;
-		byte noise_feedback 2;
-		byte noise_width;
-		byte unused1;
-		byte ym2612_rate 4;
-		byte ym2151_rate 4;
-		byte data_offset 4;
-		byte unused2 8;
-		
-		// True if header has valid file signature
-		bool valid_tag() const;
-	};
-	
 	// Header for currently loaded file
-	header_t const& header() const { return *(header_t const*) file_begin(); }
-	
+	header_t const& header() const { return _header; }
+
 	// Raw file data, for parsing GD3 tags
 	byte const* file_begin() const { return Gme_Loader::file_begin(); }
 	byte const* file_end () const { return Gme_Loader::file_end(); }
-	
-	// If file uses FM, initializes FM sound emulator using *sample_rate. If
-	// *sample_rate is zero, sets *sample_rate to the proper accurate rate and
-	// uses that. The output of the FM sound emulator is resampled to the
-	// final sampling rate.
-	blargg_err_t init_fm( double* sample_rate );
-	
-	// True if any FM chips are used by file. Always false until init_fm()
-	// is called.
-	bool uses_fm() const { return ym2612.enabled() || ym2413.enabled(); }
-	
+
 	// Adjusts music tempo, where 1.0 is normal. Can be changed while playing.
 	// Loading a file resets tempo to 1.0.
 	void set_tempo( double );
-	
+
+	void set_sample_rate( int r ) { sample_rate = r; }
+
 	// Starts track
 	void start_track();
-	
-	// Runs PSG-only VGM for msec and returns number of clocks it ran for
-	blip_time_t run_psg( int msec );
-	
+
 	// Plays FM for at most count samples into *out, and returns number of
-	// samples actually generated (always even). Also runs PSG for blip_time.
-	int play_frame( blip_time_t blip_time, int count, blip_sample_t out );
-	
+	// samples actually generated (always even).
+	int play_( int count, short out );
+
 	// True if all of file data has been played
-	bool track_ended() const { return pos >= file_end(); }
-	
-	// PCM sound is always generated here
-	Stereo_Buffer stereo_buf;
-	Blip_Buffer * blip_buf;
-	
-	// PSG sound chip, for assigning to Blip_Buffer, and setting volume and EQ
-	Sms_Apu psg;
-	
-	// PCM synth, for setting volume and EQ
-	Blip_Synth_Fast pcm;
-	
-	// FM sound chips
-	Ym_Emu<Ym2612_Emu> ym2612;
-	Ym_Emu<Ym2413_Emu> ym2413;
+	bool track_ended() const { return !!vgmp->VGMEnd; }
+
+	// Skips the specified number of samples
+	void skip_( int count );
+ 
+ int get_channel_count();
+ 
+ char* get_voice_name(int channel);
+ void free_voice_name(char *);
+ 
+ void set_mute(int mask);
 
 // Implementation
 public:
 	Vgm_Core();
+	~Vgm_Core();
 
 protected:
 	virtual blargg_err_t load_mem_( byte const , int );
-	
+
 private:
-	// blip_time_t // PSG clocks
-	typedef int vgm_time_t; // 44100 per second, REGARDLESS of sample rate
-	typedef int fm_time_t; // FM sample count
-	
-	int vgm_rate; // rate of log, 44100 normally, adjusted by tempo
-	double fm_rate; // FM samples per second
-	
-	// VGM to FM time
-	int fm_time_factor; 
-	int fm_time_offset;
-	fm_time_t to_fm_time( vgm_time_t ) const;
-	
-	// VGM to PSG time
-	int blip_time_factor;
-	blip_time_t to_psg_time( vgm_time_t ) const;
-	
-	// Current time and position in log
-	vgm_time_t vgm_time;
-	byte const* pos;
-	byte const* loop_begin;
-	
-	// PCM
-	byte const* pcm_data; // location of PCM data in log
-	byte const* pcm_pos; // current position in PCM data
-	int dac_amp;
-	int dac_disabled; // -1 if disabled
-	void write_pcm( vgm_time_t, int amp );
-	
-	blip_time_t run( vgm_time_t );
-	int run_ym2413( int time );
-	int run_ym2612( int time );
-	void update_fm_rates( int* ym2413_rate, int* ym2612_rate ) const;
+	int sample_rate;
+
+	header_t _header;
+
+	VGM_PLAYER* vgmp;
 };
 
 #endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Vgm_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Vgm_Emu.cpp Changed

@@ -1,360 +1,588 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Vgm_Emu.h"
-
-#include "blargg_endian.h"
-
-/* Copyright (C) 2003-2008 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"
-
-// FM emulators are internally quieter to avoid 16-bit overflow
-double const fm_gain = 3.0;
-double const rolloff = 0.990;
-double const oversample_factor = 1.5;
-
-Vgm_Emu::Vgm_Emu()
-{
-	resampler.set_callback( play_frame_, this );
-	disable_oversampling_ = false;
-	set_type( gme_vgm_type );
-	set_max_initial_silence( 1 );
-	set_silence_lookahead( 1 ); // tracks should already be trimmed
-	
-	static equalizer_t const eq = { -14.0, 80 };
-	set_equalizer( eq );
-}
-
-Vgm_Emu::~Vgm_Emu() { }
-
-void Vgm_Emu::unload()
-{
-	core.unload();
-	Classic_Emu::unload();
-}
-
-// Track info
-
-static byte const* skip_gd3_str( byte const in , byte const* end )
-{
-	while ( end - in >= 2 )
-	{
-		in += 2;
-		if ( !(in -2 | in -1) )
-			break;
-	}
-	return in;
-}
-
-static byte const* get_gd3_str( byte const* in, byte const* end, char field )
-{
-	byte const* mid = skip_gd3_str( in, end );
-	int len = (mid - in) / 2 - 1;
-	if ( len > 0 )
-	{
-		len = min( len, (int) Gme_File::max_field_ );
-		field len = 0;
-		for ( int i = 0; i < len; i++ )
-			field i = (in i * 2 + 1 ? '?' : in i * 2); // TODO: convert to utf-8
-	}
-	return mid;
-}
-
-static byte const* get_gd3_pair( byte const* in, byte const* end, char field )
-{
-	return skip_gd3_str( get_gd3_str( in, end, field ), end );
-}
-
-static void parse_gd3( byte const in , byte const* end, track_info_t* out )
-{
-	in = get_gd3_pair( in, end, out->song );
-	in = get_gd3_pair( in, end, out->game );
-	in = get_gd3_pair( in, end, out->system );
-	in = get_gd3_pair( in, end, out->author );
-	in = get_gd3_str ( in, end, out->copyright );
-	in = get_gd3_pair( in, end, out->dumper );
-	in = get_gd3_str ( in, end, out->comment );
-}
-
-int const gd3_header_size = 12;
-
-static int check_gd3_header( byte const h , int remain )
-{
-	if ( remain < gd3_header_size ) return 0;
-	if ( memcmp( h, "Gd3 ", 4 ) ) return 0;
-	if ( get_le32( h + 4 ) >= 0x200 ) return 0;
-	
-	int gd3_size = get_le32( h + 8 );
-	if ( gd3_size > remain - gd3_header_size ) return 0;
-	
-	return gd3_size;
-}
-
-static void get_vgm_length( Vgm_Emu::header_t const& h, track_info_t* out )
-{
-	int length = get_le32( h.track_duration ) * 10 / 441; // 1000 / 44100
-	if ( length > 0 )
-	{
-		int loop = get_le32( h.loop_duration );
-		if ( loop > 0 && get_le32( h.loop_offset ) )
-		{
-			out->loop_length = loop * 10 / 441;
-			out->intro_length = length - out->loop_length;
-			check( out->loop_length <= length );
-			// TODO: Also set out->length? We now have play_length for suggested play time.
-		}
-		else
-		{
-			out->length = length;
-			out->intro_length = length;
-			out->loop_length = 0;
-		}
-	}
-}
-
-blargg_err_t Vgm_Emu::track_info_( track_info_t* out, int ) const
-{
-	get_vgm_length( header(), out );
-	
-	int gd3_offset = get_le32( header().gd3_offset ) - 0x2C;
-	if ( gd3_offset < 0 )
-		return blargg_ok;
-	
-	byte const* gd3 = core.file_begin() + header_t::size + gd3_offset;
-	int gd3_size = check_gd3_header( gd3, core.file_end() - gd3 );
-	if ( gd3_size )
-	{
-		byte const* gd3_data = gd3 + gd3_header_size;
-		parse_gd3( gd3_data, gd3_data + gd3_size, out );
-	}
-	
-	return blargg_ok;
-}
-
-blargg_err_t Vgm_Emu::gd3_data( const unsigned char ** data, int * size )
-{
-	*data = 0;
-	*size = 0;
-
-	int gd3_offset = get_le32( header().gd3_offset ) - 0x2C;
-	if ( gd3_offset < 0 )
-		return blargg_ok;
-
-	byte const* gd3 = core.file_begin() + header_t::size + gd3_offset;
-	int gd3_size = check_gd3_header( gd3, core.file_end() - gd3 );
-	if ( gd3_size )
-	{
-		*data = gd3;
-		*size = gd3_size + gd3_header_size;
-	}
-
-	return blargg_ok;
-}
-
-struct Vgm_File : Gme_Info_
-{
-	Vgm_Emu::header_t h;
-	blargg_vector<byte> gd3;
-	
-	Vgm_File() { set_type( gme_vgm_type ); }
-	
-	blargg_err_t load_( Data_Reader& in )
-	{
-		int file_size = in.remain();
-		if ( file_size <= h.size )
-			return blargg_err_file_type;
-		
-		RETURN_ERR( in.read( &h, h.size ) );
-		if ( !h.valid_tag() )
-			return blargg_err_file_type;
-		
-		int gd3_offset = get_le32( h.gd3_offset ) - 0x2C;
-		int remain = file_size - h.size - gd3_offset;
-		byte gd3_h gd3_header_size;
-		if ( gd3_offset > 0 && remain >= gd3_header_size )
-		{
-			RETURN_ERR( in.skip( gd3_offset ) );
-			RETURN_ERR( in.read( gd3_h, sizeof gd3_h ) );
-			int gd3_size = check_gd3_header( gd3_h, remain );
-			if ( gd3_size )
-			{
-				RETURN_ERR( gd3.resize( gd3_size ) );
-				RETURN_ERR( in.read( gd3.begin(), gd3.size() ) );
-			}
-		}
-		return blargg_ok;
-	}
-	
-	blargg_err_t track_info_( track_info_t* out, int ) const
-	{
-		get_vgm_length( h, out );
-		if ( gd3.size() )
-			parse_gd3( gd3.begin(), gd3.end(), out );
-		return blargg_ok;
-	}
-};
-
-static Music_Emu* new_vgm_emu () { return BLARGG_NEW Vgm_Emu ; }
-static Music_Emu* new_vgm_file() { return BLARGG_NEW Vgm_File; }
-
-gme_type_t_ const gme_vgm_type 1 = {{ "Sega SMS/Genesis", 1, &new_vgm_emu, &new_vgm_file, "VGM", 1 }};
-
-gme_type_t_ const gme_vgz_type 1 = {{ "Sega SMS/Genesis", 1, &new_vgm_emu, &new_vgm_file, "VGZ", 1 }};
-
-// Setup
-
-void Vgm_Emu::set_tempo_( double t )
-{
-	core.set_tempo( t );
-}
-
-blargg_err_t Vgm_Emu::set_sample_rate_( int sample_rate )
-{
-	RETURN_ERR( core.stereo_buf.set_sample_rate( sample_rate, 1000 / 30 ) );
-	return Classic_Emu::set_sample_rate_( sample_rate );
-}
-
-void Vgm_Emu::update_eq( blip_eq_t const& eq )
-{
-	core.psg.treble_eq( eq );
-	core.pcm.treble_eq( eq );
-}
-
-void Vgm_Emu::set_voice( int i, Blip_Buffer* c, Blip_Buffer* l, Blip_Buffer* r )
-{
-	if ( i < core.psg.osc_count )
-		core.psg.set_output( i, c, l, r );
-}
-
-void Vgm_Emu::mute_voices_( int mask )
-{
-	Classic_Emu::mute_voices_( mask );
-	
-	// TODO: what was this for?
-	//core.pcm.output( &core.blip_buf );
-	
-	// TODO: silence PCM if FM isn't used?
-	if ( core.uses_fm() )
-	{
-		core.psg.set_output( ( mask & 0x80 ) ? 0 : core.stereo_buf.center() );
-		if ( core.ym2612.enabled() )
-		{
-			core.pcm.volume( (mask & 0x40) ? 0.0 : 0.1115 / 256 * fm_gain * gain() );
-			core.ym2612.mute_voices( mask );
-		}
-		
-		if ( core.ym2413.enabled() )
-		{
-			int m = mask & 0x3F;
-			if ( mask & 0x20 )
-				m |= 0x01E0; // channels 5-8
-			if ( mask & 0x40 )
-				m |= 0x3E00;
-			core.ym2413.mute_voices( m );
-		}
-	}
-}
-
-blargg_err_t Vgm_Emu::load_mem_( byte const data , int size )
-{
-	RETURN_ERR( core.load_mem( data, size ) );
-
-	set_voice_count( core.psg.osc_count );
-	
-	double fm_rate = 0.0;
-	if ( !disable_oversampling_ )
-		fm_rate = sample_rate() * oversample_factor;
-	RETURN_ERR( core.init_fm( &fm_rate ) );
-	
-	if ( core.uses_fm() )
-	{
-		set_voice_count( 8 );
-		RETURN_ERR( resampler.setup( fm_rate / sample_rate(), rolloff, fm_gain * gain() ) );
-		RETURN_ERR( resampler.reset( core.stereo_buf.length() * sample_rate() / 1000 ) );
-		core.psg.volume( 0.135 * fm_gain * gain() );
-	}
-	else
-	{
-		core.psg.volume( gain() );
-	}
-	
-	static const char* const fm_names = {
-		"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "PCM", "PSG"
-	};
-	static const char* const psg_names = { "Square 1", "Square 2", "Square 3", "Noise" };
-	set_voice_names( core.uses_fm() ? fm_names : psg_names );
-	
-	static int const types 8 = {
-		wave_type+1, wave_type+2, wave_type+3, noise_type+1,
-		0, 0, 0, 0
-	};
-	set_voice_types( types );
-	
-	return Classic_Emu::setup_buffer( core.stereo_buf.center()->clock_rate() );
-}
-
-// Emulation
-
-blargg_err_t Vgm_Emu::start_track_( int track )
-{
-	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	
-	core.start_track();
-	
-	if ( core.uses_fm() )
-		resampler.clear();
-	
-	return blargg_ok;
-}
-
-inline void Vgm_Emu::check_end()
-{
-	if ( core.track_ended() )
-		set_track_ended();
-}
-
-inline void Vgm_Emu::check_warning()
-{
-	const char* w = core.warning();
-	if ( w )
-		set_warning( w );
-}
-
-blargg_err_t Vgm_Emu::run_clocks( blip_time_t& time_io, int msec )
-{
-	check_end();
-	time_io = core.run_psg( msec );
-	check_warning();
-	return blargg_ok;
-}
-
-inline int Vgm_Emu::play_frame( blip_time_t blip_time, int sample_count, sample_t buf )
-{
-	check_end();
-	int result = core.play_frame( blip_time, sample_count, buf );
-	check_warning();
-	return result;
-}
-
-int Vgm_Emu::play_frame_( void* p, blip_time_t a, int b, sample_t c )
-{
-	return STATIC_CAST(Vgm_Emu*,p)->play_frame( a, b, c );
-}
-
-blargg_err_t Vgm_Emu::play_( int count, sample_t out )
-{
-	if ( !core.uses_fm() )
-		return Classic_Emu::play_( count, out );
-		
-	resampler.dual_play( count, out, core.stereo_buf );
-	return blargg_ok;
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Vgm_Emu.h"
+
+#include "blargg_endian.h"
+#include "blargg_common.h"
+
+/* Copyright (C) 2003-2008 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"
+
+// FM emulators are internally quieter to avoid 16-bit overflow
+double const fm_gain = 3.0;
+double const rolloff = 0.990;
+double const oversample_factor = 1.5;
+
+Vgm_Emu::Vgm_Emu()
+{
+	muted_voices = 0;
+	set_type( gme_vgm_type );
+	set_max_initial_silence( 1 );
+	set_silence_lookahead( 1 ); // tracks should already be trimmed
+	voice_names_assigned_ = false;
+}
+
+Vgm_Emu::~Vgm_Emu()
+{
+ // XXX ugly use of deprecated functions to free allocated voice names
+ const char ** voice_names_ = voice_names();
+ if (voice_names_assigned_ && voice_names_)
+ {
+ for (int i = 0; i < 32; ++i)
+ {
+ if (voice_names_i)
+ core.free_voice_name((char*)voice_names_i);
+ else break;
+ }
+ free((void *)voice_names_);
+ }
+}
+
+void Vgm_Emu::unload()
+{
+	core.unload();
+}
+
+// Track info
+
+static byte const* skip_gd3_str( byte const in , byte const* end )
+{
+	while ( end - in >= 2 )
+	{
+		in += 2;
+		if ( !(in -2 | in -1) )
+			break;
+	}
+	return in;
+}
+
+static byte const* get_gd3_str( byte const* in, byte const* end, char field )
+{
+	byte const* mid = skip_gd3_str( in, end );
+	int len = (int)((mid - in) / 2) - 1;
+	if ( len > 0 )
+	{
+ char * in_utf8 = blargg_to_utf8( (blargg_wchar_t *) in );
+		len = min( len, (int) Gme_File::max_field_ );
+		field len = 0;
+		for ( int i = 0; i < len; i++ )
+ field i = in_utf8 i;
+ free(in_utf8);
+	}
+	return mid;
+}
+
+static byte const* get_gd3_pair( byte const* in, byte const* end, char field , char field_j )
+{
+	return get_gd3_str( get_gd3_str( in, end, field ), end, field_j );
+}
+
+static void parse_gd3( byte const in , byte const* end, track_info_t* out, track_info_t* out_j )
+{
+	in = get_gd3_pair( in, end, out->song , out_j->song );
+	in = get_gd3_pair( in, end, out->game , out_j->game );
+	in = get_gd3_pair( in, end, out->system , out_j->system );
+	in = get_gd3_pair( in, end, out->author , out_j->author );
+	in = get_gd3_str ( in, end, out->copyright );
+	in = get_gd3_pair( in, end, out->dumper , out_j->dumper );
+	in = get_gd3_str ( in, end, out->comment );
+}
+
+static blargg_err_t write_gd3_str( gme_writer_t writer, void* your_data, const char field )
+{
+ blargg_wchar_t * wstring = blargg_to_wide( field );
+ if (!wstring)
+ return "Out of memory";
+ blargg_err_t err = writer( your_data, wstring, blargg_wcslen( wstring ) * 2 + 2 );
+ free( wstring );
+ return err;
+}
+
+static blargg_err_t write_gd3_pair( gme_writer_t writer, void* your_data, const char field , const char field_j )
+{
+ RETURN_ERR(write_gd3_str( writer, your_data, field ));
+ RETURN_ERR(write_gd3_str( writer, your_data, field ));
+ return blargg_ok;
+}
+
+static blargg_err_t write_gd3_strings( gme_writer_t writer, void* your_data, const track_info_t* in, const track_info_t* in_j )
+{
+ RETURN_ERR(write_gd3_pair( writer, your_data, in->song , in_j->song ));
+ RETURN_ERR(write_gd3_pair( writer, your_data, in->game , in_j->game ));
+ RETURN_ERR(write_gd3_pair( writer, your_data, in->system , in_j->system ));
+ RETURN_ERR(write_gd3_pair( writer, your_data, in->author , in_j->author ));
+ RETURN_ERR(write_gd3_str ( writer, your_data, in->copyright ));
+ RETURN_ERR(write_gd3_pair( writer, your_data, in->dumper , in_j->dumper ));
+ RETURN_ERR(write_gd3_str ( writer, your_data, in->comment ));
+ return blargg_ok;
+}
+
+static gme_err_t writer_calc_size(void* param, const void* ptr, long count)
+{
+ *(long *)param += count;
+ return blargg_ok;
+}
+
+static blargg_err_t write_gd3( gme_writer_t writer, void* your_data, const track_info_t* in, const track_info_t* in_j )
+{
+ long string_size = 0;
+ byte version4;
+ RETURN_ERR(writer( your_data, "Gd3 ", 4 ));
+ set_le32(version, 0x100);
+ RETURN_ERR(writer( your_data, version, 4 ));
+ write_gd3_strings( &writer_calc_size, &string_size, in, in_j );
+ if ( string_size > 1000000000 )
+ return "GD3 tag too large";
+ set_le32(version, (int)string_size);
+ RETURN_ERR(writer( your_data, version, 4));
+ return write_gd3_strings( writer, your_data, in, in_j );
+}
+
+int const gd3_header_size = 12;
+
+static int check_gd3_header( byte const h , int remain )
+{
+	if ( remain < gd3_header_size ) return 0;
+	if ( memcmp( h, "Gd3 ", 4 ) ) return 0;
+	if ( get_le32( h + 4 ) >= 0x200 ) return 0;
+	
+	int gd3_size = get_le32( h + 8 );
+	if ( gd3_size > remain - gd3_header_size ) return 0;
+	
+	return gd3_size;
+}
+
+static void get_vgm_length( Vgm_Emu::header_t const& h, track_info_t* out )
+{
+	int length = h.lngTotalSamples * 10 / 441; // 1000 / 44100
+	if ( length > 0 )
+	{
+		int loop = h.lngLoopSamples;
+		if ( loop > 0 && h.lngLoopOffset )
+		{
+			out->length = 0;
+			out->loop_length = loop * 10 / 441;
+			out->intro_length = length - out->loop_length;
+			check( out->loop_length <= length );
+			// TODO: Also set out->length? We now have play_length for suggested play time.
+		}
+		else
+		{
+			out->length = length;
+			out->intro_length = length;
+			out->loop_length = 0;
+		}
+	}
+}
+
+blargg_err_t Vgm_Emu::track_info_( track_info_t* out, int ) const
+{
+	*out = metadata;
+	
+	return blargg_ok;
+}
+
+blargg_err_t Vgm_Emu::gd3_data( const unsigned char ** data, int * size )
+{
+	*data = 0;
+	*size = 0;
+
+	int gd3_offset = header().lngGD3Offset;
+	if ( gd3_offset <= 0 )
+		return blargg_ok;
+
+	byte const* gd3 = core.file_begin() + gd3_offset;
+	int gd3_size = check_gd3_header( gd3, (int)(core.file_end() - gd3) );
+	if ( gd3_size )
+	{
+		*data = gd3;
+		*size = gd3_size + gd3_header_size;
+	}
+
+	return blargg_ok;
+}
+
+static void hash_vgm_file( Vgm_Emu::header_t const& h, byte const* data, int data_size, Music_Emu::Hash_Function& out )
+{
+	out.hash_( (const byte *) &h.lngEOFOffset, sizeof(h.lngEOFOffset) );
+	out.hash_( (const byte *) &h.lngVersion, sizeof(h.lngVersion) );
+	out.hash_( (const byte *) &h.lngHzPSG, sizeof(h.lngHzPSG) );
+	out.hash_( (const byte *) &h.lngHzYM2413, sizeof(h.lngHzYM2413) );
+	out.hash_( (const byte *) &h.lngTotalSamples, sizeof(h.lngTotalSamples) );
+	out.hash_( (const byte *) &h.lngLoopOffset, sizeof(h.lngLoopOffset) );
+	out.hash_( (const byte *) &h.lngLoopSamples, sizeof(h.lngLoopSamples) );
+	out.hash_( (const byte *) &h.lngRate, sizeof(h.lngRate) );
+	out.hash_( (const byte *) &h.shtPSG_Feedback, sizeof(h.shtPSG_Feedback) );
+	out.hash_( (const byte *) &h.bytPSG_SRWidth, sizeof(h.bytPSG_SRWidth) );
+	out.hash_( (const byte *) &h.bytPSG_Flags, sizeof(h.bytPSG_Flags) );
+	out.hash_( (const byte *) &h.lngHzYM2612, sizeof(h.lngHzYM2612) );
+	out.hash_( (const byte *) &h.lngHzYM2151, sizeof(h.lngHzYM2151) );
+	out.hash_( (const byte *) &h.lngDataOffset, sizeof(h.lngDataOffset) );
+	out.hash_( (const byte *) &h.lngHzSPCM, sizeof(h.lngHzSPCM) );
+	out.hash_( (const byte *) &h.lngSPCMIntf, sizeof(h.lngSPCMIntf) );
+	out.hash_( (const byte *) &h.lngHzRF5C68, sizeof(h.lngHzRF5C68) );
+	out.hash_( (const byte *) &h.lngHzYM2203, sizeof(h.lngHzYM2203) );
+	out.hash_( (const byte *) &h.lngHzYM2608, sizeof(h.lngHzYM2608) );
+	out.hash_( (const byte *) &h.lngHzYM2610, sizeof(h.lngHzYM2610) );
+	out.hash_( (const byte *) &h.lngHzYM3812, sizeof(h.lngHzYM3812) );
+	out.hash_( (const byte *) &h.lngHzYM3526, sizeof(h.lngHzYM3526) );
+	out.hash_( (const byte *) &h.lngHzY8950, sizeof(h.lngHzY8950) );
+	out.hash_( (const byte *) &h.lngHzYMF262, sizeof(h.lngHzYMF262) );
+	out.hash_( (const byte *) &h.lngHzYMF278B, sizeof(h.lngHzYMF278B) );
+	out.hash_( (const byte *) &h.lngHzYMF271, sizeof(h.lngHzYMF271) );
+	out.hash_( (const byte *) &h.lngHzYMZ280B, sizeof(h.lngHzYMZ280B) );
+	out.hash_( (const byte *) &h.lngHzRF5C164, sizeof(h.lngHzRF5C164) );
+	out.hash_( (const byte *) &h.lngHzPWM, sizeof(h.lngHzPWM) );
+	out.hash_( (const byte *) &h.lngHzAY8910, sizeof(h.lngHzAY8910) );
+	out.hash_( (const byte *) &h.bytAYType, sizeof(h.bytAYType) );
+	out.hash_( (const byte *) &h.bytAYFlag, sizeof(h.bytAYFlag) );
+	out.hash_( (const byte *) &h.bytAYFlagYM2203, sizeof(h.bytAYFlagYM2203) );
+	out.hash_( (const byte *) &h.bytAYFlagYM2608, sizeof(h.bytAYFlagYM2608) );
+	out.hash_( (const byte *) &h.bytReserved2, sizeof(h.bytReserved2) );
+	out.hash_( (const byte *) &h.lngHzGBDMG, sizeof(h.lngHzGBDMG) );
+	out.hash_( (const byte *) &h.lngHzNESAPU, sizeof(h.lngHzNESAPU) );
+	out.hash_( (const byte *) &h.lngHzMultiPCM, sizeof(h.lngHzMultiPCM) );
+	out.hash_( (const byte *) &h.lngHzUPD7759, sizeof(h.lngHzUPD7759) );
+	out.hash_( (const byte *) &h.lngHzOKIM6258, sizeof(h.lngHzOKIM6258) );
+	out.hash_( (const byte *) &h.bytOKI6258Flags, sizeof(h.bytOKI6258Flags) );
+	out.hash_( (const byte *) &h.bytK054539Flags, sizeof(h.bytK054539Flags) );
+	out.hash_( (const byte *) &h.bytC140Type, sizeof(h.bytC140Type) );
+	out.hash_( (const byte *) &h.bytReservedFlags, sizeof(h.bytReservedFlags) );
+	out.hash_( (const byte *) &h.lngHzOKIM6295, sizeof(h.lngHzOKIM6295) );
+	out.hash_( (const byte *) &h.lngHzK051649, sizeof(h.lngHzK051649) );
+	out.hash_( (const byte *) &h.lngHzK054539, sizeof(h.lngHzK054539) );
+	out.hash_( (const byte *) &h.lngHzHuC6280, sizeof(h.lngHzHuC6280) );
+	out.hash_( (const byte *) &h.lngHzC140, sizeof(h.lngHzC140) );
+	out.hash_( (const byte *) &h.lngHzK053260, sizeof(h.lngHzK053260) );
+	out.hash_( (const byte *) &h.lngHzPokey, sizeof(h.lngHzPokey) );
+	out.hash_( (const byte *) &h.lngHzQSound, sizeof(h.lngHzQSound) );
+ out.hash_( (const byte *) &h.lngHzSCSP, sizeof(h.lngHzSCSP) );
+ // out.hash_( (const byte *) &h.lngExtraOffset, sizeof(h.lngExtraOffset) );
+ out.hash_( (const byte *) &h.lngHzWSwan, sizeof(h.lngHzWSwan) );
+ out.hash_( (const byte *) &h.lngHzVSU, sizeof(h.lngHzVSU) );
+ out.hash_( (const byte *) &h.lngHzSAA1099, sizeof(h.lngHzSAA1099) );
+ out.hash_( (const byte *) &h.lngHzES5503, sizeof(h.lngHzES5503) );
+ out.hash_( (const byte *) &h.lngHzES5506, sizeof(h.lngHzES5506) );
+ out.hash_( (const byte *) &h.bytES5503Chns, sizeof(h.bytES5503Chns) );
+ out.hash_( (const byte *) &h.bytES5506Chns, sizeof(h.bytES5506Chns) );
+ out.hash_( (const byte *) &h.bytC352ClkDiv, sizeof(h.bytC352ClkDiv) );
+ out.hash_( (const byte *) &h.bytESReserved, sizeof(h.bytESReserved) );
+ out.hash_( (const byte *) &h.lngHzX1_010, sizeof(h.lngHzX1_010) );
+ out.hash_( (const byte *) &h.lngHzC352, sizeof(h.lngHzC352) );
+ out.hash_( (const byte *) &h.lngHzGA20, sizeof(h.lngHzGA20) );
+	out.hash_( data, data_size );
+}
+
+struct VGM_FILE_mem
+{
+ VGM_FILE vf;
+ const BOOST::uint8_t* buffer;
+ UINT32 ptr;
+ UINT32 size;
+};
+
+static int VGMF_mem_Read(VGM_FILE* f, void* out, UINT32 count)
+{
+ VGM_FILE_mem* mf = (VGM_FILE_mem *) f;
+ if (count + mf->ptr > mf->size)
+ count = mf->size - mf->ptr;
+ memcpy(out, mf->buffer + mf->ptr, count);
+ mf->ptr += count;
+ return count;
+}
+
+static int VGMF_mem_Seek(VGM_FILE* f, UINT32 offset)
+{
+ VGM_FILE_mem* mf = (VGM_FILE_mem *) f;
+ if (offset > mf->size)
+ offset = mf->size;
+ mf->ptr = offset;
+ return 0;
+}
+
+static UINT32 VGMF_mem_GetSize(VGM_FILE* f)
+{
+ VGM_FILE_mem* mf = (VGM_FILE_mem *) f;
+ return mf->size;
+}
+
+static UINT32 VGMF_mem_Tell(VGM_FILE* f)
+{
+ VGM_FILE_mem* mf = (VGM_FILE_mem *) f;
+ return mf->ptr;
+}
+
+struct Vgm_File : Gme_Info_
+{
+	Vgm_Emu::header_t h;
+ blargg_vector<byte> original_header;
+	blargg_vector<byte> data;
+	blargg_vector<byte> gd3;
+ 
+ track_info_t metadata;
+ track_info_t metadata_j;
+	
+	Vgm_File() { set_type( gme_vgm_type ); }
+	
+	blargg_err_t load_mem_( const byte* in, int file_size )
+	{
+ VGM_FILE_mem memFile;
+ 
+ memFile.vf.Read = &VGMF_mem_Read;
+ memFile.vf.Seek = &VGMF_mem_Seek;
+ memFile.vf.GetSize = &VGMF_mem_GetSize;
+ memFile.vf.Tell = &VGMF_mem_Tell;
+ memFile.buffer = in;
+ memFile.ptr = 0;
+ memFile.size = file_size;
+ 
+ if (!GetVGMFileInfo_Handle((VGM_FILE *) &memFile, &h, 0))
+			return blargg_err_file_type;
+		
+		int data_offset = get_le32( &h.lngDataOffset );
+		int data_size = file_size - data_offset;
+		int gd3_offset = get_le32( &h.lngGD3Offset );
+
+		if ( gd3_offset > 0 && gd3_offset > data_offset )
+		{
+			data_size = gd3_offset - data_offset;
+
+			RETURN_ERR( data.resize( data_size ) );
+ memcpy( data.begin(), in + data_offset, data_size );
+		}
+
+		int remain = file_size - gd3_offset;
+		byte gd3_h gd3_header_size;
+		if ( gd3_offset > 0 && remain >= gd3_header_size )
+		{
+ memcpy( gd3_h, in + gd3_offset, sizeof gd3_h );
+			int gd3_size = check_gd3_header( gd3_h, remain );
+			if ( gd3_size )
+			{
+				RETURN_ERR( gd3.resize( gd3_size ) );
+ memcpy( gd3.begin(), in + sizeof gd3_h + gd3_offset, gd3.size() );
+			}
+
+			if ( data_offset > gd3_offset )
+			{
+				RETURN_ERR( data.resize( data_size ) );
+ memcpy( data.begin(), in + data_offset, data_size );
+			}
+		}
+ 
+ int header_size = data_offset;
+ if ( gd3_offset && data_offset > gd3_offset )
+ header_size = gd3_offset;
+ RETURN_ERR( original_header.resize( header_size ) );
+ memcpy( original_header.begin(), in, header_size );
+
+ memset( &metadata, 0, sizeof(metadata) );
+ memset( &metadata_j, 0, sizeof(metadata_j) );
+ get_vgm_length( h, &metadata );
+ if ( gd3.size() )
+ parse_gd3( gd3.begin(), gd3.end(), &metadata, &metadata_j );
+
+ return blargg_ok;
+	}
+	
+	blargg_err_t track_info_( track_info_t* out, int ) const
+	{
+ *out = metadata;
+		return blargg_ok;
+	}
+
+	blargg_err_t hash_( Hash_Function& out ) const
+	{
+		hash_vgm_file( h, data.begin(), (int)(data.end() - data.begin()), out );
+		return blargg_ok;
+	}
+ 
+ blargg_err_t set_track_info_( const track_info_t* in, int )
+ {
+ metadata = *in;
+ 
+ return blargg_ok;
+ }
+ 
+ blargg_err_t save_( gme_writer_t writer, void* your_data ) const
+ {
+ byte buffer4;
+ int data_size = (int)(data.end() - data.begin());
+ int gd3_offset = (int)(original_header.end() - original_header.begin()) + data_size;
+ 
+ RETURN_ERR( writer( your_data, original_header.begin(), 0x14 ) );
+ set_le32(buffer, gd3_offset - 0x14);
+ RETURN_ERR( writer( your_data, buffer, 4 ) );
+ RETURN_ERR( writer( your_data, original_header.begin() + 0x18, original_header.end() - original_header.begin() - 0x18 ) );
+ RETURN_ERR( writer( your_data, data.begin(), data_size ) );
+ 
+ return write_gd3( writer, your_data, &metadata, &metadata_j );
+ }
+};
+
+static Music_Emu* new_vgm_emu () { return BLARGG_NEW Vgm_Emu ; }
+static Music_Emu* new_vgm_file() { return BLARGG_NEW Vgm_File; }
+
+gme_type_t_ const gme_vgm_type 1 = {{ "Sega SMS/Genesis", 1, &new_vgm_emu, &new_vgm_file, "VGM", 0 }};
+
+gme_type_t_ const gme_vgz_type 1 = {{ "Sega SMS/Genesis", 1, &new_vgm_emu, &new_vgm_file, "VGZ", 0 }};
+
+// Setup
+
+void Vgm_Emu::set_tempo_( double t )
+{
+	core.set_tempo( t );
+}
+
+blargg_err_t Vgm_Emu::set_sample_rate_( int sample_rate )
+{
+	core.set_sample_rate(sample_rate);
+ return blargg_ok;
+}
+
+void Vgm_Emu::mute_voices_( int mask )
+{
+	muted_voices = mask;
+ core.set_mute(mask);
+}
+
+// Emulation
+
+blargg_err_t Vgm_Emu::start_track_( int track )
+{
+	core.start_track();
+
+	mute_voices_(muted_voices);
+	
+	return blargg_ok;
+}
+
+inline void Vgm_Emu::check_end()
+{
+	if ( core.track_ended() )
+		set_track_ended();
+}
+
+blargg_err_t Vgm_Emu::play_( int count, sample_t out )
+{
+ core.play_(count, out);
+ check_end();
+ return blargg_ok;
+}
+
+blargg_err_t Vgm_Emu::hash_( Hash_Function& out ) const
+{
+	byte const* p = file_begin();
+	byte const* e = file_end();
+	int data_offset = header().lngDataOffset;
+	if ( data_offset )
+		p += data_offset;
+	int gd3_offset = header().lngGD3Offset;
+	if ( gd3_offset > 0 && gd3_offset > data_offset )
+ e = file_begin() + gd3_offset;
+	hash_vgm_file( header(), p, (int)(e - p), out );
+	return blargg_ok;
+}
+
+blargg_err_t Vgm_Emu::load_mem_( const byte* in, int file_size )
+{
+ RETURN_ERR( core.load_mem(in, file_size) );
+ 
+ int voice_count = core.get_channel_count();
+ 
+ set_voice_count( voice_count );
+ 
+ char ** voice_names = (char **) calloc( sizeof(char *), voice_count + 1 );
+ if (voice_names)
+ {
+ int i;
+ for (i = 0; i < voice_count; i++)
+ {
+ voice_namesi = core.get_voice_name(i);
+ if (!voice_namesi)
+ break;
+ }
+ if (i == voice_count)
+ {
+ set_voice_names(voice_names);
+ voice_names_assigned_ = true;
+ }
+ else
+ {
+ for (i = 0; i < voice_count; i++)
+ {
+ if (voice_namesi)
+ free(voice_namesi);
+ }
+ free(voice_names);
+ }
+ }
+
+ get_vgm_length( header(), &metadata );
+ 
+ int data_offset = header().lngDataOffset;
+ int gd3_offset = header().lngGD3Offset;
+ int data_size = file_size - data_offset;
+
+ if (gd3_offset > 0)
+ {
+ if (gd3_offset > data_offset)
+ data_size = gd3_offset - data_offset;
+ byte const* gd3 = core.file_begin() + gd3_offset;
+ int gd3_size = check_gd3_header( gd3, (int)(core.file_end() - gd3) );
+ if ( gd3_size )
+ {
+ byte const* gd3_data = gd3 + gd3_header_size;
+ parse_gd3( gd3_data, gd3_data + gd3_size, &metadata, &metadata_j );
+ }
+ }
+ 
+ int header_size = data_offset;
+ if ( gd3_offset && data_offset > gd3_offset )
+ header_size = gd3_offset;
+ RETURN_ERR( original_header.resize( header_size ) );
+ memcpy( original_header.begin(), in, header_size );
+ 
+ RETURN_ERR( data.resize(data_size) );
+ memcpy( data.begin(), in + data_offset, data_size );
+ 
+ return blargg_ok;
+}
+
+blargg_err_t Vgm_Emu::skip_( int count )
+{
+	core.skip_(count);
+	return blargg_ok;
+}
+
+blargg_err_t Vgm_Emu::set_track_info_( const track_info_t* in, int )
+{
+ metadata = *in;
+ 
+ return blargg_ok;
+}
+
+blargg_err_t Vgm_Emu::save_(gme_writer_t writer, void* your_data)
+{
+ byte buffer4;
+ int data_size = (int)(data.end() - data.begin());
+ int gd3_offset = (int)(original_header.end() - original_header.begin()) + data_size;
+ 
+ RETURN_ERR( writer( your_data, original_header.begin(), 0x14 ) );
+ set_le32(buffer, gd3_offset - 0x14);
+ RETURN_ERR( writer( your_data, buffer, 4 ) );
+ RETURN_ERR( writer( your_data, original_header.begin() + 0x18, original_header.end() - original_header.begin() - 0x18 ) );
+ RETURN_ERR( writer( your_data, data.begin(), data_size ) );
+ 
+ return write_gd3( writer, your_data, &metadata, &metadata_j );
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Vgm_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Vgm_Emu.h Changed

@@ -1,6 +1,6 @@
 // Sega VGM music file emulator
 
-// Game_Music_Emu 0.6-pre
+// Game_Music_Emu $vers
 #ifndef VGM_EMU_H
 #define VGM_EMU_H
 
@@ -12,23 +12,17 @@
 Supports custom sound buffer and frequency equalization when VGM uses just the PSG. FM
 sound chips can be run at their proper rates, or slightly higher to reduce aliasing on
 high notes. A YM2413 is supported but not provided separately from the library. */
-class Vgm_Emu : public Classic_Emu {
+class Vgm_Emu : public Music_Emu {
 public:
 
-	// True if custom buffer and custom equalization are supported
-	// TODO: move into Music_Emu and rename to something like supports_custom_buffer()
-	bool is_classic_emu() const { return !core.uses_fm(); }
-	
-	// Disables running FM chips at higher than normal rate. Will result in slightly
-	// more aliasing of high notes.
-	void disable_oversampling( bool disable = true ) { disable_oversampling_ = disable; }
-	
 	// VGM file header (see Vgm_Core.h)
 	typedef Vgm_Core::header_t header_t;
 	
 	// Header for currently loaded file
 	header_t const& header() const { return core.header(); }
 
+	blargg_err_t hash_( Hash_Function& ) const;
+
 	// Gd3 tag for currently loaded file
 	blargg_err_t gd3_data( const unsigned char ** data, int * size );
 	
@@ -41,26 +35,29 @@
 	
 protected:
 	blargg_err_t track_info_( track_info_t*, int track ) const;
+ blargg_err_t set_track_info_( const track_info_t*, int track );
 	blargg_err_t load_mem_( byte const , int );
 	blargg_err_t set_sample_rate_( int sample_rate );
 	blargg_err_t start_track_( int );
 	blargg_err_t play_( int count, sample_t );
-	blargg_err_t run_clocks( blip_time_t&, int );
+	blargg_err_t skip_( int count );
+ blargg_err_t save_( gme_writer_t, void* );
 	virtual void set_tempo_( double );
 	virtual void mute_voices_( int mask );
-	virtual void set_voice( int, Blip_Buffer*, Blip_Buffer*, Blip_Buffer* );
-	virtual void update_eq( blip_eq_t const& );
 	virtual void unload();
 	
 private:
-	bool disable_oversampling_;
-	Dual_Resampler resampler;
+	unsigned muted_voices;
 	Vgm_Core core;
+ 
+ blargg_vector<byte> original_header;
+ blargg_vector<byte> data;
+ track_info_t metadata;
+ track_info_t metadata_j;
+ 
+ bool voice_names_assigned_;
 	
 	void check_end();
-	void check_warning();
-	int play_frame( blip_time_t blip_time, int sample_count, sample_t buf );
-	static int play_frame_( void*, blip_time_t, int, sample_t );
 };
 
 #endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ym2413_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ym2413_Emu.cpp Changed

@@ -1,70 +1,80 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-#include "Ym2413_Emu.h"
-#include "ym2413.h"
-
-Ym2413_Emu::Ym2413_Emu() { opll = 0; }
-
-Ym2413_Emu::~Ym2413_Emu()
-{
-	if ( opll ) ym2413_shutdown( opll );
-}
-
-int Ym2413_Emu::set_rate( double sample_rate, double clock_rate )
-{
-	if ( opll )
-	{
-		ym2413_shutdown( opll );
-		opll = 0;
-	}
-	
-	opll = ym2413_init( clock_rate, sample_rate, 0 );
-	if ( !opll )
-		return 1;
-	
-	reset();
-	return 0;
-}
-
-void Ym2413_Emu::reset()
-{
-	ym2413_reset_chip( opll );
-	ym2413_set_mask( opll, 0 );
-}
-
-void Ym2413_Emu::write( int addr, int data )
-{
-	ym2413_write( opll, 0, addr );
-	ym2413_write( opll, 1, data );
-}
-
-void Ym2413_Emu::mute_voices( int mask )
-{
-	ym2413_set_mask( opll, mask );
-}
-
-void Ym2413_Emu::run( int pair_count, sample_t* out )
-{
-	SAMP bufMO 1024 ;
-	SAMP bufRO 1024 ;
-	SAMP * buffers2 = { bufMO, bufRO };
-
-	while (pair_count > 0)
-	{
-		int todo = pair_count;
-		if (todo > 1024) todo = 1024;
-		ym2413_update_one( opll, buffers, todo );
-
-		for (int i = 0; i < todo; i++)
-		{
-			int output = bufMO i;
-			output += bufRO i;
-			if ( (short)output != output ) output = 0x7FFF ^ ( output >> 31 );
-			out 0 = output;
-			out 1 = output;
-			out += 2;
-		}
-
-		pair_count -= todo;
-	}
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Ym2413_Emu.h"
+
+extern "C" {
+#include "../vgmplay/VGMPlay/chips/emu2413.h"
+}
+
+Ym2413_Emu::Ym2413_Emu() { opll = 0; }
+
+Ym2413_Emu::~Ym2413_Emu()
+{
+	if ( opll ) OPLL_delete( (OPLL *) opll );
+}
+
+int Ym2413_Emu::set_rate( int sample_rate, int clock_rate )
+{
+	if ( opll )
+	{
+ OPLL_delete( (OPLL *) opll );
+		opll = 0;
+	}
+	
+	opll = OPLL_new( clock_rate, sample_rate );
+	if ( !opll )
+		return 1;
+ 
+ OPLL_SetChipMode( (OPLL *) opll, 0 );
+	
+	reset();
+	return 0;
+}
+
+void Ym2413_Emu::reset()
+{
+	OPLL_reset( (OPLL *) opll );
+	OPLL_SetMuteMask( (OPLL *) opll, 0 );
+}
+
+void Ym2413_Emu::write( int addr, int data )
+{
+	OPLL_writeIO( (OPLL *) opll, 0, addr );
+	OPLL_writeIO( (OPLL *) opll, 1, data );
+}
+
+void Ym2413_Emu::mute_voices( int mask )
+{
+	OPLL_SetMuteMask( (OPLL *) opll, mask );
+}
+
+void Ym2413_Emu::run( int pair_count, sample_t* out )
+{
+	e_int32 bufMO 1024 ;
+	e_int32 bufRO 1024 ;
+	e_int32 * buffers2 = { bufMO, bufRO };
+
+	while (pair_count > 0)
+	{
+		int todo = pair_count;
+		if (todo > 1024) todo = 1024;
+		OPLL_calc_stereo( (OPLL *) opll, buffers, todo, -1 );
+
+		for (int i = 0; i < todo; i++)
+		{
+			int output_l, output_r;
+			int output = bufMO i;
+			output += bufRO i;
+			output *= 3;
+			output_l = output + out 0;
+			output_r = output + out 1;
+			if ( (short)output_l != output_l ) output_l = 0x7FFF ^ ( output_l >> 31 );
+			if ( (short)output_r != output_r ) output_r = 0x7FFF ^ ( output_r >> 31 );
+			out 0 = output_l;
+			out 1 = output_r;
+			out += 2;
+		}
+
+		pair_count -= todo;
+	}
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ym2413_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ym2413_Emu.h Changed

@@ -1,37 +1,35 @@
-// YM2413 FM sound chip emulator interface
-
-// Game_Music_Emu 0.6-pre
-#ifndef YM2413_EMU_H
-#define YM2413_EMU_H
-
-struct OPLL;
-
-class Ym2413_Emu {
-	void* opll;
-public:
-	Ym2413_Emu();
-	~Ym2413_Emu();
-	
-	static bool supported() { return true; }
-	
-	// Sets output sample rate and chip clock rates, in Hz. Returns non-zero
-	// if error.
-	int set_rate( double sample_rate, double clock_rate );
-	
-	// Resets to power-up state
-	void reset();
-	
-	// Mutes voice n if bit n (1 << n) of mask is set
-	enum { channel_count = 14 };
-	void mute_voices( int mask );
-	
-	// Writes data to addr
-	void write( int addr, int data );
-	
-	// Runs and writes pair_count*2 samples to output
-	typedef short sample_t;
-	enum { out_chan_count = 2 }; // stereo
-	void run( int pair_count, sample_t* out );
-};
-
-#endif
+// YM2413 FM sound chip emulator interface
+
+// Game_Music_Emu $vers
+#ifndef YM2413_EMU_H
+#define YM2413_EMU_H
+
+class Ym2413_Emu {
+	void* opll;
+public:
+	Ym2413_Emu();
+	~Ym2413_Emu();
+	
+	static bool supported() { return true; }
+	
+	// Sets output sample rate and chip clock rates, in Hz. Returns non-zero
+	// if error.
+	int set_rate( int sample_rate, int clock_rate );
+	
+	// Resets to power-up state
+	void reset();
+	
+	// Mutes voice n if bit n (1 << n) of mask is set
+	enum { channel_count = 14 };
+	void mute_voices( int mask );
+	
+	// Writes data to addr
+	void write( int addr, int data );
+	
+	// Runs and writes pair_count*2 samples to output
+	typedef short sample_t;
+	enum { out_chan_count = 2 }; // stereo
+	void run( int pair_count, sample_t* out );
+};
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ym2612_Emu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ym2612_Emu.cpp Changed

@@ -1,2510 +1,8 @@
-// Game_Music_Emu 0.5.5. http://www.slack.net/~ant/
-
-// File: fm.c -- software implementation of Yamaha FM sound generator
-// Copyright (C) 2001, 2002, 2003 Jarek Burczynski (bujar at mame dot net)
-// Copyright (C) 1998 Tatsuyuki Satoh , MultiArcadeMachineEmulator development
-// Version 1.4 (final beta)
-
-#include "Ym2612_Emu.h"
-typedef Ym2612_Impl YM2612;
-
-#include "blargg_errors.h"
-
-// fm.h
-YM2612* YM2612Init( void* user_data, int index, long baseclock, long rate );
-void YM2612Shutdown( YM2612* );
-void YM2612ResetChip( YM2612* );
-void YM2612UpdateOne( YM2612*, short* out, int pair_count );
-int YM2612Write( YM2612*, unsigned int a, unsigned int v );
-unsigned char YM2612Read( YM2612*, int a );
-int YM2612TimerOver( YM2612*, int c );
-void YM2612Postload( YM2612* );
-void YM2612Mute( YM2612*, int mask );
-
-#include <stdlib.h>
-#include <limits.h>
-#include <math.h>
-
-/* Copyright (C) 1997-2005, Nicola Salmoria and the MAME team. All rights
-reserved. Redistribution and use of this code or any derivative works are
-permitted provided that the following conditions are met:
-- Redistributions may not be sold, nor may they be used in a commercial
-product or activity.
-- Redistributions that are modified from the original source must include the
-complete source code, including the source code for all components used by a
-binary built from the modified sources. However, as a special exception, the
-source code distributed need not include anything that is normally distributed
-(in either source or binary form) with the major components (compiler, kernel,
-and so on) of the operating system on which the executable runs, unless that
-component itself accompanies the executable.
-- Redistributions 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.
-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. */
-
-#define BUILD_YM2612 1
-#define FM_BUSY_FLAG_SUPPORT 0
-#define YM2612UpdateReq( chip ) ((void) 0)
-
-typedef unsigned char UINT8;
-typedef unsigned short UINT16;
-
-#if ULONG_MAX == 0xFFFFFFFF
-	typedef long INT32;
-	typedef unsigned long UINT32;
-#elif UINT_MAX == 0xFFFFFFFF
-	typedef int INT32;
-	typedef unsigned int UINT32;
-#else
-	#error "No suitable 32-bit type available"
-#endif
-
-#define INLINE inline
-
-#define logerror
-#define state_save_register_UINT8(mod, ins, name, val, size)
-#define state_save_register_UINT16(mod, ins, name, val, size)
-#define state_save_register_UINT32(mod, ins, name, val, size)
-#define state_save_register_INT8(mod, ins, name, val, size)
-#define state_save_register_INT16(mod, ins, name, val, size)
-#define state_save_register_INT32(mod, ins, name, val, size)
-#define state_save_register_int(mod, ins, name, val)
-#define state_save_register_func_postload(a) a();
-
-#ifndef PI
-#define PI 3.14159265358979323846
-#endif
-
-/* shared function building option */
-#define BUILD_OPN (BUILD_YM2203||BUILD_YM2608||BUILD_YM2610||BUILD_YM2610B||BUILD_YM2612)
-#define BUILD_OPN_PRESCALER (BUILD_YM2203||BUILD_YM2608)
-
-/* globals */
-#define TYPE_SSG 0x01 /* SSG support */
-#define TYPE_LFOPAN 0x02 /* OPN type LFO and PAN */
-#define TYPE_6CH 0x04 /* FM 6CH / 3CH */
-#define TYPE_DAC 0x08 /* YM2612's DAC device */
-#define TYPE_ADPCM 0x10 /* two ADPCM units */
-#define TYPE_2610 0x20 /* bogus flag to differentiate 2608 from 2610 */
-
-#define TYPE_YM2203 (TYPE_SSG)
-#define TYPE_YM2608 (TYPE_SSG |TYPE_LFOPAN |TYPE_6CH |TYPE_ADPCM)
-#define TYPE_YM2610 (TYPE_SSG |TYPE_LFOPAN |TYPE_6CH |TYPE_ADPCM |TYPE_2610)
-#define TYPE_YM2612 (TYPE_DAC |TYPE_LFOPAN |TYPE_6CH)
-
-#define FREQ_SH 16 /* 16.16 fixed point (frequency calculations) */
-#define EG_SH 16 /* 16.16 fixed point (envelope generator timing) */
-#define LFO_SH 24 /* 8.24 fixed point (LFO calculations) */
-#define TIMER_SH 16 /* 16.16 fixed point (timers calculations) */
-
-#define FREQ_MASK ((1<<FREQ_SH)-1)
-
-#define ENV_BITS 10
-#define ENV_LEN (1<<ENV_BITS)
-#define ENV_STEP (128.0/ENV_LEN)
-
-#define MAX_ATT_INDEX (ENV_LEN-1) /* 1023 */
-#define MIN_ATT_INDEX (0) /* 0 */
-
-#define EG_ATT 4
-#define EG_DEC 3
-#define EG_SUS 2
-#define EG_REL 1
-#define EG_OFF 0
-
-#define SIN_BITS 10
-#define SIN_LEN (1<<SIN_BITS)
-#define SIN_MASK (SIN_LEN-1)
-
-#define TL_RES_LEN (256) /* 8 bits addressing (real chip) */
-
-/* TL_TAB_LEN is calculated as:
-* 13 - sinus amplitude bits (Y axis)
-* 2 - sinus sign bit (Y axis)
-* TL_RES_LEN - sinus resolution (X axis)
-*/
-#define TL_TAB_LEN (13*2*TL_RES_LEN)
-static signed int tl_tabTL_TAB_LEN;
-
-#define ENV_QUIET (TL_TAB_LEN>>3)
-
-/* sin waveform table in 'decibel' scale */
-static unsigned int sin_tabSIN_LEN;
-
-/* sustain level table (3dB per step) */
-/* bit0, bit1, bit2, bit3, bit4, bit5, bit6 */
-/* 1, 2, 4, 8, 16, 32, 64 (value)*/
-/* 0.75, 1.5, 3, 6, 12, 24, 48 (dB)*/
-
-/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
-#define SC(db) (UINT32) ( db * (4.0/ENV_STEP) )
-static const UINT32 sl_table16={
- SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
- SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)
-};
-#undef SC
-
-
-#define RATE_STEPS (8)
-static const UINT8 eg_inc19*RATE_STEPS={
-
-/*cycle:0 1 2 3 4 5 6 7*/
-
-/* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..11 0 (increment by 0 or 1) */
-/* 1 */ 0,1, 0,1, 1,1, 0,1, /* rates 00..11 1 */
-/* 2 */ 0,1, 1,1, 0,1, 1,1, /* rates 00..11 2 */
-/* 3 */ 0,1, 1,1, 1,1, 1,1, /* rates 00..11 3 */
-
-/* 4 */ 1,1, 1,1, 1,1, 1,1, /* rate 12 0 (increment by 1) */
-/* 5 */ 1,1, 1,2, 1,1, 1,2, /* rate 12 1 */
-/* 6 */ 1,2, 1,2, 1,2, 1,2, /* rate 12 2 */
-/* 7 */ 1,2, 2,2, 1,2, 2,2, /* rate 12 3 */
-
-/* 8 */ 2,2, 2,2, 2,2, 2,2, /* rate 13 0 (increment by 2) */
-/* 9 */ 2,2, 2,4, 2,2, 2,4, /* rate 13 1 */
-/*10 */ 2,4, 2,4, 2,4, 2,4, /* rate 13 2 */
-/*11 */ 2,4, 4,4, 2,4, 4,4, /* rate 13 3 */
-
-/*12 */ 4,4, 4,4, 4,4, 4,4, /* rate 14 0 (increment by 4) */
-/*13 */ 4,4, 4,8, 4,4, 4,8, /* rate 14 1 */
-/*14 */ 4,8, 4,8, 4,8, 4,8, /* rate 14 2 */
-/*15 */ 4,8, 8,8, 4,8, 8,8, /* rate 14 3 */
-
-/*16 */ 8,8, 8,8, 8,8, 8,8, /* rates 15 0, 15 1, 15 2, 15 3 (increment by 8) */
-/*17 */ 16,16,16,16,16,16,16,16, /* rates 15 2, 15 3 for attack */
-/*18 */ 0,0, 0,0, 0,0, 0,0, /* infinity rates for attack and decay(s) */
-};
-
-
-#define O(a) (a*RATE_STEPS)
-
-static const UINT8 eg_rate_select32+64+32={ /* Envelope Generator rates (32 + 64 rates + 32 RKS) from tests on YM2612 */
-/* 32 infinite time rates */
-O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
-O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
-O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
-O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
-
-/* rates 00-11 */
-O( 18),O( 18),O( 0),O( 0),
-O( 0),O( 0),O( 2),O( 2), // Nemesis's tests
-
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-O( 0),O( 1),O( 2),O( 3),
-
-/* rate 12 */
-O( 4),O( 5),O( 6),O( 7),
-
-/* rate 13 */
-O( 8),O( 9),O(10),O(11),
-
-/* rate 14 */
-O(12),O(13),O(14),O(15),
-
-/* rate 15 */
-O(16),O(16),O(16),O(16),
-
-/* 32 dummy rates (same as 15 3) */
-O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
-O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
-O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
-O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16)
-
-};
-#undef O
-
-/*rate 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15*/
-/*shift 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0 */
-/*mask 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1, 0, 0, 0, 0, 0 */
-
-#define O(a) (a*1)
-static const UINT8 eg_rate_shift32+64+32={ /* Envelope Generator counter shifts (32 + 64 rates + 32 RKS) */
-/* 32 infinite time rates */
-/* O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
-O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0), */
-
-/* fixed (should be the same as rate 0, even if it makes no difference since increment value is 0 for these rates) */
-O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),
-O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),
-O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),
-O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),
-
-/* rates 00-11 */
-O(11),O(11),O(11),O(11),
-O(10),O(10),O(10),O(10),
-O( 9),O( 9),O( 9),O( 9),
-O( 8),O( 8),O( 8),O( 8),
-O( 7),O( 7),O( 7),O( 7),
-O( 6),O( 6),O( 6),O( 6),
-O( 5),O( 5),O( 5),O( 5),
-O( 4),O( 4),O( 4),O( 4),
-O( 3),O( 3),O( 3),O( 3),
-O( 2),O( 2),O( 2),O( 2),
-O( 1),O( 1),O( 1),O( 1),
-O( 0),O( 0),O( 0),O( 0),
-
-/* rate 12 */
-O( 0),O( 0),O( 0),O( 0),
-
-/* rate 13 */
-O( 0),O( 0),O( 0),O( 0),
-
-/* rate 14 */
-O( 0),O( 0),O( 0),O( 0),
-
-/* rate 15 */
-O( 0),O( 0),O( 0),O( 0),
-
-/* 32 dummy rates (same as 15 3) */
-O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
-O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
-O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
-O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0)
-
-};
-#undef O
-
-static const UINT8 dt_tab4 * 32={
-/* this is YM2151 and YM2612 phase increment data (in 10.10 fixed point format)*/
-/* FD=0 */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-/* FD=1 */
-	0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2,
-	2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8,
-/* FD=2 */
-	1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5,
-	5, 6, 6, 7, 8, 8, 9,10,11,12,13,14,16,16,16,16,
-/* FD=3 */
-	2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7,
-	8 , 8, 9,10,11,12,13,14,16,17,19,20,22,22,22,22
-};
-
-
-/* OPN key frequency number -> key code follow table */
-/* fnum higher 4bit -> keycode lower 2bit */
-static const UINT8 opn_fktable16 = {0,0,0,0,0,0,0,1,2,3,3,3,3,3,3,3};
-
-
-/* 8 LFO speed parameters */
-/* each value represents number of samples that one LFO level will last for */
-static const UINT32 lfo_samples_per_step8 = {108, 77, 71, 67, 62, 44, 8, 5};
-
-
-
-/*There are 4 different LFO AM depths available, they are:
- 0 dB, 1.4 dB, 5.9 dB, 11.8 dB
- Here is how it is generated (in EG steps):
-
- 11.8 dB = 0, 2, 4, 6, 8, 10,12,14,16...126,126,124,122,120,118,....4,2,0
- 5.9 dB = 0, 1, 2, 3, 4, 5, 6, 7, 8....63, 63, 62, 61, 60, 59,.....2,1,0
- 1.4 dB = 0, 0, 0, 0, 1, 1, 1, 1, 2,...15, 15, 15, 15, 14, 14,.....0,0,0
-
- (1.4 dB is loosing precision as you can see)
-
- It's implemented as generator from 0..126 with step 2 then a shift
- right N times, where N is:
-	8 for 0 dB
-	3 for 1.4 dB
-	1 for 5.9 dB
-	0 for 11.8 dB
-*/
-static const UINT8 lfo_ams_depth_shift4 = {8, 3, 1, 0};
-
-
-
-/*There are 8 different LFO PM depths available, they are:
- 0, 3.4, 6.7, 10, 14, 20, 40, 80 (cents)
-
- Modulation level at each depth depends on F-NUMBER bits: 4,5,6,7,8,9,10
- (bits 8,9,10 = FNUM MSB from OCT/FNUM register)
-
- Here we store only first quarter (positive one) of full waveform.
- Full table (lfo_pm_table) containing all 128 waveforms is build
- at run (init) time.
-
- One value in table below represents 4 (four) basic LFO steps
- (1 PM step = 4 AM steps).
-
- For example:
- at LFO SPEED=0 (which is 108 samples per basic LFO step)
- one value from "lfo_pm_output" table lasts for 432 consecutive
- samples (4*108=432) and one full LFO waveform cycle lasts for 13824
- samples (32*432=13824; 32 because we store only a quarter of whole
- waveform in the table below)
-*/
-static const UINT8 lfo_pm_output7*88={ /* 7 bits meaningful (of F-NUMBER), 8 LFO output levels per one depth (out of 32), 8 LFO depths */
-/* FNUM BIT 4: 000 0001xxxx */
-/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 3 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 4 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 5 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 6 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 7 */ {0, 0, 0, 0, 1, 1, 1, 1},
-
-/* FNUM BIT 5: 000 0010xxxx */
-/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 3 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 4 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 5 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 6 */ {0, 0, 0, 0, 1, 1, 1, 1},
-/* DEPTH 7 */ {0, 0, 1, 1, 2, 2, 2, 3},
-
-/* FNUM BIT 6: 000 0100xxxx */
-/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 3 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 4 */ {0, 0, 0, 0, 0, 0, 0, 1},
-/* DEPTH 5 */ {0, 0, 0, 0, 1, 1, 1, 1},
-/* DEPTH 6 */ {0, 0, 1, 1, 2, 2, 2, 3},
-/* DEPTH 7 */ {0, 0, 2, 3, 4, 4, 5, 6},
-
-/* FNUM BIT 7: 000 1000xxxx */
-/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 1, 1},
-/* DEPTH 3 */ {0, 0, 0, 0, 1, 1, 1, 1},
-/* DEPTH 4 */ {0, 0, 0, 1, 1, 1, 1, 2},
-/* DEPTH 5 */ {0, 0, 1, 1, 2, 2, 2, 3},
-/* DEPTH 6 */ {0, 0, 2, 3, 4, 4, 5, 6},
-/* DEPTH 7 */ {0, 0, 4, 6, 8, 8, 0xa, 0xc},
-
-/* FNUM BIT 8: 001 0000xxxx */
-/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 1 */ {0, 0, 0, 0, 1, 1, 1, 1},
-/* DEPTH 2 */ {0, 0, 0, 1, 1, 1, 2, 2},
-/* DEPTH 3 */ {0, 0, 1, 1, 2, 2, 3, 3},
-/* DEPTH 4 */ {0, 0, 1, 2, 2, 2, 3, 4},
-/* DEPTH 5 */ {0, 0, 2, 3, 4, 4, 5, 6},
-/* DEPTH 6 */ {0, 0, 4, 6, 8, 8, 0xa, 0xc},
-/* DEPTH 7 */ {0, 0, 8, 0xc,0x10,0x10,0x14,0x18},
-
-/* FNUM BIT 9: 010 0000xxxx */
-/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 1 */ {0, 0, 0, 0, 2, 2, 2, 2},
-/* DEPTH 2 */ {0, 0, 0, 2, 2, 2, 4, 4},
-/* DEPTH 3 */ {0, 0, 2, 2, 4, 4, 6, 6},
-/* DEPTH 4 */ {0, 0, 2, 4, 4, 4, 6, 8},
-/* DEPTH 5 */ {0, 0, 4, 6, 8, 8, 0xa, 0xc},
-/* DEPTH 6 */ {0, 0, 8, 0xc,0x10,0x10,0x14,0x18},
-/* DEPTH 7 */ {0, 0,0x10,0x18,0x20,0x20,0x28,0x30},
-
-/* FNUM BIT10: 100 0000xxxx */
-/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
-/* DEPTH 1 */ {0, 0, 0, 0, 4, 4, 4, 4},
-/* DEPTH 2 */ {0, 0, 0, 4, 4, 4, 8, 8},
-/* DEPTH 3 */ {0, 0, 4, 4, 8, 8, 0xc, 0xc},
-/* DEPTH 4 */ {0, 0, 4, 8, 8, 8, 0xc,0x10},
-/* DEPTH 5 */ {0, 0, 8, 0xc,0x10,0x10,0x14,0x18},
-/* DEPTH 6 */ {0, 0,0x10,0x18,0x20,0x20,0x28,0x30},
-/* DEPTH 7 */ {0, 0,0x20,0x30,0x40,0x40,0x50,0x60},
-
-};
-
-/* all 128 LFO PM waveforms */
-static INT32 lfo_pm_table128*8*32; /* 128 combinations of 7 bits meaningful (of F-NUMBER), 8 LFO depths, 32 LFO output levels per one depth */
-
-
-
-
-
-/* register number to channel number , slot offset */
-#define OPN_CHAN(N) (N&3)
-#define OPN_SLOT(N) ((N>>2)&3)
-
-/* slot number */
-#define SLOT1 0
-#define SLOT2 2
-#define SLOT3 1
-#define SLOT4 3
-
-/* bit0 = Right enable , bit1 = Left enable */
-#define OUTD_RIGHT 1
-#define OUTD_LEFT 2
-#define OUTD_CENTER 3
-
-
-/* save output as raw 16-bit sample */
-/* #define SAVE_SAMPLE */
-
-#ifdef SAVE_SAMPLE
-static FILE *sample1;
-	#if 1 /*save to MONO file */
-		#define SAVE_ALL_CHANNELS \
-		{ signed int pom = lt; \
-			fputc((unsigned short)pom&0xff,sample0); \
-			fputc(((unsigned short)pom>>8)&0xff,sample0); \
-		}
-	#else /*save to STEREO file */
-		#define SAVE_ALL_CHANNELS \
-		{ signed int pom = lt; \
-			fputc((unsigned short)pom&0xff,sample0); \
-			fputc(((unsigned short)pom>>8)&0xff,sample0); \
-			pom = rt; \
-			fputc((unsigned short)pom&0xff,sample0); \
-			fputc(((unsigned short)pom>>8)&0xff,sample0); \
-		}
-	#endif
-#endif
-
-
-/* struct describing a single operator (SLOT) */
-typedef struct
-{
-	INT32 *DT; /* detune :dt_tabDT */
-	UINT8 KSR; /* key scale rate :3-KSR */
-	UINT32 ar; /* attack rate */
-	UINT32 d1r; /* decay rate */
-	UINT32 d2r; /* sustain rate */
-	UINT32 rr; /* release rate */
-	UINT8 ksr; /* key scale rate :kcode>>(3-KSR) */
-	UINT32 mul; /* multiple :ML_TABLEML */
-
-	/* Phase Generator */
-	UINT32 phase; /* phase counter */
-	INT32	Incr;		/* phase step */
-
-	/* Envelope Generator */
-	UINT8 state; /* phase type */
-	UINT32 tl; /* total level: TL << 3 */
-	INT32 volume; /* envelope counter */
-	UINT32 sl; /* sustain level:sl_tableSL */
-	UINT32 vol_out; /* current output from EG circuit (without AM from LFO) */
-
-	UINT8 eg_sh_ar; /* (attack state) */
-	UINT8 eg_sel_ar; /* (attack state) */
-	UINT8 eg_sh_d1r; /* (decay state) */
-	UINT8 eg_sel_d1r; /* (decay state) */
-	UINT8 eg_sh_d2r; /* (sustain state) */
-	UINT8 eg_sel_d2r; /* (sustain state) */
-	UINT8 eg_sh_rr; /* (release state) */
-	UINT8 eg_sel_rr; /* (release state) */
-
-	UINT8 ssg; /* SSG-EG waveform */
-	UINT8 ssgn; /* SSG-EG negated output */
-
-	UINT8 key; /* 0=last key was KEY OFF, 1=KEY ON */
-
-	/* LFO */
-	UINT32 AMmask; /* AM enable flag */
-
-} FM_SLOT;
-
-typedef struct
-{
-	FM_SLOT SLOT4; /* four SLOTs (operators) */
-
-	UINT8 ALGO; /* algorithm */
-	UINT8 FB; /* feedback shift */
-	INT32 op1_out2; /* op1 output for feedback */
-
-	INT32 *connect1; /* SLOT1 output pointer */
-	INT32 *connect3; /* SLOT3 output pointer */
-	INT32 *connect2; /* SLOT2 output pointer */
-	INT32 *connect4; /* SLOT4 output pointer */
-
-	INT32 *mem_connect;/* where to put the delayed sample (MEM) */
-	INT32 mem_value; /* delayed sample (MEM) value */
-
-	INT32 pms; /* channel PMS */
-	UINT8 ams; /* channel AMS */
-
-	UINT32 fc; /* fnum,blk:adjusted to sample rate */
-	UINT8 kcode; /* key code: */
-	UINT32 block_fnum; /* current blk/fnum value for this slot (can be different betweeen slots of one channel in 3slot mode) */
-} FM_CH;
-
-
-typedef struct
-{
-	void * param; /* this chip parameter */
-	float clock; /* master clock (Hz) */
-	int rate; /* sampling rate (Hz) */
-	double freqbase; /* frequency base */
-#if FM_BUSY_FLAG_SUPPORT
-	double BusyExpire; /* ExpireTime of Busy clear */
-#endif
-	UINT16 address; /* address register */
-	UINT8 irq; /* interrupt level */
-	UINT8 irqmask; /* irq mask */
-	UINT8 status; /* status flag */
-	UINT32 mode; /* mode CSM / 3SLOT */
-	UINT8 prescaler_sel;/* prescaler selector */
-	UINT8 fn_h; /* freq latch */
-	INT32 TimerBase; /* Timer base time */
-	INT32 TA; /* timer a value */
-	INT32 TAL; /* timer a base */
-	INT32 TAC; /* timer a counter */
-	INT32 TB; /* timer b value */
-	INT32 TBL; /* timer b base */
-	INT32 TBC; /* timer b counter */
-	/* Extention Timer and IRQ handler */
-	//const struct ssg_callbacks *SSG;
-	/* local time tables */
-	INT32 dt_tab832;/* DeTune table */
-} FM_ST;
-
-
-
-/***********************************************************/
-/* OPN unit */
-/***********************************************************/
-
-/* OPN 3slot struct */
-typedef struct
-{
-	UINT32 fc3; /* fnum3,blk3: calculated */
-	UINT8 fn_h; /* freq3 latch */
-	UINT8 kcode3; /* key code */
-	UINT32 block_fnum3; /* current fnum value for this slot (can be different betweeen slots of one channel in 3slot mode) */
-	UINT8 key_csm;
-} FM_3SLOT;
-
-/* OPN/A/B common state */
-typedef struct
-{
-	FM_ST ST; /* general state */
-	FM_3SLOT SL3; /* 3 slot mode state */
-	FM_CH *P_CH; /* pointer of CH */
-	unsigned char pan_regs 6; /* last pan register write (high two bits) */
-	unsigned char pan_mutes 6; /* external channel *disable* mask to apply to pan registers */
-	unsigned int pan6*2; /* fm channels output masks (0xffffffff = enable) */
-
-	UINT32 eg_cnt; /* global envelope generator counter */
-	UINT32 eg_timer; /* global envelope generator counter works at frequency = chipclock/144/3 */
-	UINT32 eg_timer_add; /* step of eg_timer */
-	UINT32 eg_timer_overflow;/* envelope generator timer overlfows every 3 samples (on real chip) */
-
-	/* LFO */
-	UINT32 lfo_cnt;
-	UINT32 lfo_timer;
-	UINT32 lfo_timer_add;
-	UINT32 lfo_timer_overflow;
-	UINT32 LFO_AM; /* runtime LFO calculations helper */
-	INT32 LFO_PM; /* runtime LFO calculations helper */
-	
-	/* there are 2048 FNUMs that can be generated using FNUM/BLK registers
-		but LFO works with one more bit of a precision so we really need 4096 elements */
-
-	UINT32 fn_table4096; /* fnumber->increment counter */
-
-	UINT32 fn_max;
-
-	INT32 m2,c1,c2; /* Phase Modulation input for operators 2,3,4 */
-	INT32 mem; /* one sample delay memory */
-
-	INT32 out_fm8; /* outputs of working channels */
-} FM_OPN;
-
-
-/* limitter */
-#define Limit(val) { \
-	if ( (short)(val) != (val) ) val = 0x7FFF ^ ( ( val ) >> 31 ); \
-}
-
-
-/* status set and IRQ handling */
-INLINE void FM_STATUS_SET(FM_ST *ST,int flag)
-{
-	/* set status flag */
-	ST->status |= flag;
-	if ( !(ST->irq) && (ST->status & ST->irqmask) )
-	{
-		ST->irq = 1;
-	}
-}
-
-/* status reset and IRQ handling */
-INLINE void FM_STATUS_RESET(FM_ST *ST,int flag)
-{
-	/* reset status flag */
-	ST->status &=~flag;
-	if ( (ST->irq) && !(ST->status & ST->irqmask) )
-	{
-		ST->irq = 0;
-	}
-}
-
-/* IRQ mask set */
-INLINE void FM_IRQMASK_SET(FM_ST *ST,int flag)
-{
-	ST->irqmask = flag;
-	/* IRQ handling check */
-	FM_STATUS_SET(ST,0);
-	FM_STATUS_RESET(ST,0);
-}
-
-/* Timer A Overflow */
-INLINE void TimerAOver(FM_ST *ST)
-{
-	/* set status (if enabled) */
-	if(ST->mode & 0x04) FM_STATUS_SET(ST,0x01);
-	/* clear or reload the counter */
-	ST->TAC = (1024-ST->TA);
-}
-/* Timer B Overflow */
-INLINE void TimerBOver(FM_ST *ST)
-{
-	/* set status (if enabled) */
-	if(ST->mode & 0x08) FM_STATUS_SET(ST,0x02);
-	/* clear or reload the counter */
-	ST->TBC = ( 256-ST->TB)<<4;
-}
-
-
-#if FM_BUSY_FLAG_SUPPORT
-INLINE UINT8 FM_STATUS_FLAG(FM_ST *ST)
-{
-	if( ST->BusyExpire )
-	{
-		if( (ST->BusyExpire - FM_GET_TIME_NOW()) > 0)
-			return ST->status | 0x80;	/* with busy */
-		/* expire */
-		ST->BusyExpire = 0;
-	}
-	return ST->status;
-}
-INLINE void FM_BUSY_SET(FM_ST *ST,int busyclock )
-{
-	ST->BusyExpire = FM_GET_TIME_NOW() + (ST->TimerBase * busyclock);
-}
-#define FM_BUSY_CLEAR(ST) ((ST)->BusyExpire = 0)
-#else
-#define FM_STATUS_FLAG(ST) ((ST)->status)
-#define FM_BUSY_SET(ST,bclock) {}
-#define FM_BUSY_CLEAR(ST) {}
-#endif
-
-
-
-
-INLINE void FM_KEYON(FM_OPN *OPN, FM_CH *CH , int s )
-{
-	FM_SLOT *SLOT = &CH->SLOTs;
-	if( !SLOT->key && !OPN->SL3.key_csm)
-	{
-		/* restart Phase Generator */
-		SLOT->phase = 0;
-
-		/* reset SSG-EG inversion flag */
-		SLOT->ssgn = 0;
-
-		if( (SLOT->ar + SLOT->ksr) < 94 /*32+62*/)
-		{
-			SLOT->state = (SLOT->volume <= MIN_ATT_INDEX) ? ((SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC) : EG_ATT;
-		}
-		else
-		{
-			/* force attenuation level to 0 */
-			SLOT->volume = MIN_ATT_INDEX;
-
-			/* directly switch to Decay (or Sustain) */
-			SLOT->state = (SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC;
-		}
-
-		/* recalculate EG output */
-		if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04)))
-			SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
-		else
-			SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-	}
-
-	SLOT->key = 1;
-}
-
-INLINE void FM_KEYOFF(FM_OPN *OPN, FM_CH *CH , int s )
-{
-	FM_SLOT *SLOT = &CH->SLOTs;
-	if( SLOT->key && !OPN->SL3.key_csm)
-	{
-		if (SLOT->state>EG_REL)
-		{
-			SLOT->state = EG_REL; /* phase -> Release */
-
-			if ( SLOT->ssg & 0x8 )
-			{
-				/* convert EG attenuation level */
-				if (SLOT->ssgn ^ (SLOT->ssg&0x04))
-			 	SLOT->volume = (0x200 - SLOT->volume);
-
-				/* force EG attenuation level */
-				if (SLOT->volume >= 0x200)
-				{
-					SLOT->volume = MAX_ATT_INDEX;
-					SLOT->state = EG_OFF;
-				}
-
-				/* recalculate EG output */
-				SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-			}
-		}
-	}
-
-	SLOT->key = 0;
-}
-
-INLINE void FM_KEYON_CSM(FM_OPN *OPN, FM_CH *CH , int s )
-{
-	FM_SLOT *SLOT = &CH->SLOTs;
-
-	if( !SLOT->key && !OPN->SL3.key_csm)
-	{
-		/* restart Phase Generator */
-		SLOT->phase = 0;
-
-		/* reset SSG-EG inversion flag */
-		SLOT->ssgn = 0;
-
-		if ((SLOT->ar + SLOT->ksr) < 94 /*32+62*/)
-		{
-			SLOT->state = (SLOT->volume <= MIN_ATT_INDEX) ? ((SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC) : EG_ATT;
-		}
-		else
-		{
-			/* force attenuation level to 0 */
-			SLOT->volume = MIN_ATT_INDEX;
-
-			/* directly switch to Decay (or Sustain) */
-			SLOT->state = (SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC;
-		}
-
-		/* recalculate EG output */
-		if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04)))
-			SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
-		else
-			SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-	}
-}
-
-INLINE void FM_KEYOFF_CSM(FM_CH *CH , int s )
-{
-	FM_SLOT *SLOT = &CH->SLOTs;
-	if (!SLOT->key)
-	{
-		if (SLOT->state>EG_REL)
-		{
-			SLOT->state = EG_REL; /* phase -> Release */
-
-			/* SSG-EG specific update */
-			if (SLOT->ssg&0x08)
-			{
-				/* convert EG attenuation level */
-				if (SLOT->ssgn ^ (SLOT->ssg&0x04))
-					SLOT->volume = (0x200 - SLOT->volume);
-
-				/* force EG attenuation level */
-				if (SLOT->volume >= 0x200)
-				{
-					SLOT->volume = MAX_ATT_INDEX;
-					SLOT->state = EG_OFF;
-				}
-
-				/* recalculate EG output */
-				SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-			}
-		}
-	}
-}
-
-/* CSM Key Controll */
-INLINE void CSMKeyControll(FM_OPN *OPN, FM_CH *CH)
-{
-	/* all key ON (verified by Nemesis on real hardware) */
-	FM_KEYON_CSM(OPN,CH,SLOT1);
-	FM_KEYON_CSM(OPN,CH,SLOT2);
-	FM_KEYON_CSM(OPN,CH,SLOT3);
-	FM_KEYON_CSM(OPN,CH,SLOT4);
-	OPN->SL3.key_csm = 1;
-}
-
-INLINE void INTERNAL_TIMER_A(FM_OPN * OPN)
-{
- if (OPN->ST.mode & 0x01)
- {
- if ((OPN->ST.TAC -= OPN->ST.TimerBase) <= 0)
- {
- /* set status (if enabled) */
- if (OPN->ST.mode & 0x04) OPN->ST.status |= 0x01;
-
- /* reload the counter */
- if (OPN->ST.TAL) OPN->ST.TAC += OPN->ST.TAL;
- else OPN->ST.TAC = OPN->ST.TAL;
-
- /* CSM mode auto key on */
- if ((OPN->ST.mode & 0xC0) == 0x80) CSMKeyControll(OPN, &OPN->P_CH2);
- }
- }
-}
-
-INLINE void INTERNAL_TIMER_B(FM_ST * ST, int step)
-{
- if (ST->mode & 0x02)
- {
- if ((ST->TBC -= (ST->TimerBase * step)) <= 0)
- {
- /* set status (if enabled) */
- if (ST->mode & 0x08) ST->status |= 0x02;
-
- /* reload the counter */
- if (ST->TBL) ST->TBC += ST->TBL;
- else ST->TBC = ST->TBL;
- }
- }
-}
-
-/* OPN Mode Register Write */
-INLINE void set_timers( FM_OPN *OPN, int v )
-{
-	/* b7 = CSM MODE */
-	/* b6 = 3 slot mode */
-	/* b5 = reset b */
-	/* b4 = reset a */
-	/* b3 = timer enable b */
-	/* b2 = timer enable a */
-	/* b1 = load b */
-	/* b0 = load a */
-
-	if ((OPN->ST.mode ^ v) & 0xC0)
-	{
-		/* phase increment need to be recalculated */
-		OPN->P_CH2.SLOTSLOT1.Incr=-1;
-
-		/* CSM mode disabled and CSM key ON active*/
-		if (((v & 0xC0) != 0x80) && OPN->SL3.key_csm)
-		{
-			/* CSM Mode Key OFF (verified by Nemesis on real hardware) */
-			FM_KEYOFF_CSM(&OPN->P_CH2,SLOT1);
-			FM_KEYOFF_CSM(&OPN->P_CH2,SLOT2);
-			FM_KEYOFF_CSM(&OPN->P_CH2,SLOT3);
-			FM_KEYOFF_CSM(&OPN->P_CH2,SLOT4);
-			OPN->SL3.key_csm = 0;
-		}
-	}
-
-	/* reload Timers */
-	if ((v&1) & !(OPN->ST.mode&1)) OPN->ST.TAC = OPN->ST.TAL;
-	if ((v&2) & !(OPN->ST.mode&2)) OPN->ST.TBC = OPN->ST.TBL;
-
-	/* reset Timers flags */
-	OPN->ST.status &= (~v >> 4); 
-
-	OPN->ST.mode = v;
-}
-
-
-/* set algorithm connection */
-static void setup_connection( FM_OPN *OPN, FM_CH *CH, int ch )
-{
-	INT32 *carrier = &OPN->out_fmch;
-
-	INT32 **om1 = &CH->connect1;
-	INT32 **om2 = &CH->connect3;
-	INT32 **oc1 = &CH->connect2;
-
-	INT32 **memc = &CH->mem_connect;
-
-	switch( CH->ALGO ){
-	case 0:
-		/* M1---C1---MEM---M2---C2---OUT */
-		*om1 = &OPN->c1;
-		*oc1 = &OPN->mem;
-		*om2 = &OPN->c2;
-		*memc= &OPN->m2;
-		break;
-	case 1:
-		/* M1------+-MEM---M2---C2---OUT */
-		/* C1-+ */
-		*om1 = &OPN->mem;
-		*oc1 = &OPN->mem;
-		*om2 = &OPN->c2;
-		*memc= &OPN->m2;
-		break;
-	case 2:
-		/* M1-----------------+-C2---OUT */
-		/* C1---MEM---M2-+ */
-		*om1 = &OPN->c2;
-		*oc1 = &OPN->mem;
-		*om2 = &OPN->c2;
-		*memc= &OPN->m2;
-		break;
-	case 3:
-		/* M1---C1---MEM------+-C2---OUT */
-		/* M2-+ */
-		*om1 = &OPN->c1;
-		*oc1 = &OPN->mem;
-		*om2 = &OPN->c2;
-		*memc= &OPN->c2;
-		break;
-	case 4:
-		/* M1---C1-+-OUT */
-		/* M2---C2-+ */
-		/* MEM: not used */
-		*om1 = &OPN->c1;
-		*oc1 = carrier;
-		*om2 = &OPN->c2;
-		*memc= &OPN->mem;	/* store it anywhere where it will not be used */
-		break;
-	case 5:
-		/* +----C1----+ */
-		/* M1-+-MEM---M2-+-OUT */
-		/* +----C2----+ */
-		*om1 = 0;	/* special mark */
-		*oc1 = carrier;
-		*om2 = carrier;
-		*memc= &OPN->m2;
-		break;
-	case 6:
-		/* M1---C1-+ */
-		/* M2-+-OUT */
-		/* C2-+ */
-		/* MEM: not used */
-		*om1 = &OPN->c1;
-		*oc1 = carrier;
-		*om2 = carrier;
-		*memc= &OPN->mem;	/* store it anywhere where it will not be used */
-		break;
-	case 7:
-		/* M1-+ */
-		/* C1-+-OUT */
-		/* M2-+ */
-		/* C2-+ */
-		/* MEM: not used*/
-		*om1 = carrier;
-		*oc1 = carrier;
-		*om2 = carrier;
-		*memc= &OPN->mem;	/* store it anywhere where it will not be used */
-		break;
-	}
-
-	CH->connect4 = carrier;
-}
-
-/* set detune & multiple */
-INLINE void set_det_mul(FM_ST *ST,FM_CH *CH,FM_SLOT *SLOT,int v)
-{
-	SLOT->mul = (v&0x0f)? (v&0x0f)*2 : 1;
-	SLOT->DT = ST->dt_tab(v>>4)&7;
-	CH->SLOTSLOT1.Incr=-1;
-}
-
-/* set total level */
-INLINE void set_tl(FM_CH *CH,FM_SLOT *SLOT , int v)
-{
-	SLOT->tl = (v&0x7f)<<(ENV_BITS-7); /* 7bit TL */
-
-	/* recalculate EG output */
-	if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04)) && (SLOT->state > EG_REL))
-		SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
-	else
-		SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-}
-
-/* set attack rate & key scale */
-INLINE void set_ar_ksr(FM_CH *CH,FM_SLOT *SLOT,int v)
-{
-	UINT8 old_KSR = SLOT->KSR;
-
-	SLOT->ar = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
-
-	SLOT->KSR = 3-(v>>6);
-	if (SLOT->KSR != old_KSR)
-	{
-		CH->SLOTSLOT1.Incr=-1;
-	}
-
-	/* Even if it seems unnecessary, in some odd case, KSR and KC are both modified */
-	/* and could result in SLOT->kc remaining unchanged. */
-	/* In such case, AR values would not be recalculated despite SLOT->ar has changed */
-	/* This fixes the introduction music of Batman & Robin (Eke-Eke) */
-	if ((SLOT->ar + SLOT->ksr) < 94 /*32+62*/)
-	{
-		SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
-		SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
-	}
-	else
-	{
-		SLOT->eg_sh_ar = 0;
-		SLOT->eg_sel_ar = 18*RATE_STEPS;	/* verified by Nemesis on real hardware */
-	}
-}
-
-/* set decay rate */
-INLINE void set_dr(FM_SLOT *SLOT,int v)
-{
-	SLOT->d1r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
-
-	SLOT->eg_sh_d1r = eg_rate_shift SLOT->d1r + SLOT->ksr;
-	SLOT->eg_sel_d1r= eg_rate_selectSLOT->d1r + SLOT->ksr;
-}
-
-/* set sustain rate */
-INLINE void set_sr(FM_SLOT *SLOT,int v)
-{
-	SLOT->d2r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
-
-	SLOT->eg_sh_d2r = eg_rate_shift SLOT->d2r + SLOT->ksr;
-	SLOT->eg_sel_d2r= eg_rate_selectSLOT->d2r + SLOT->ksr;
-}
-
-/* set release rate */
-INLINE void set_sl_rr(FM_SLOT *SLOT,int v)
-{
-	SLOT->sl = sl_table v>>4 ;
-
-	/* check EG state changes */
-	if ((SLOT->state == EG_DEC) && (SLOT->volume >= (INT32)(SLOT->sl)))
-		SLOT->state = EG_SUS;
-
-	SLOT->rr = 34 + ((v&0x0f)<<2);
-
-	SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr;
-	SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr;
-}
-
-
-
-/* advance LFO to next sample */
-INLINE void advance_lfo(FM_OPN *OPN)
-{
-	if (OPN->lfo_timer_overflow) /* LFO enabled ? */
-	{
-		/* increment LFO timer */
-		OPN->lfo_timer += OPN->lfo_timer_add;
-
-		/* when LFO is enabled, one level will last for 108, 77, 71, 67, 62, 44, 8 or 5 samples */
-		while (OPN->lfo_timer >= OPN->lfo_timer_overflow)
-		{
-			OPN->lfo_timer -= OPN->lfo_timer_overflow;
-
-			/* There are 128 LFO steps */
-			OPN->lfo_cnt = ( OPN->lfo_cnt + 1 ) & 127;
-
-			/* triangle */
-			/* AM: 0 to 126 step +2, 126 to 0 step -2 */
-			if (OPN->lfo_cnt<64)
-				OPN->LFO_AM = OPN->lfo_cnt * 2;
-			else
-				OPN->LFO_AM = 126 - ((OPN->lfo_cnt&63) * 2);
-
-			/* PM works with 4 times slower clock */
-			OPN->LFO_PM = OPN->lfo_cnt >> 2;
-		}
-	}
-}
-
-/* changed from INLINE to static here to work around gcc 4.2.1 codegen bug */
-static void advance_eg_channel(FM_OPN *OPN, FM_SLOT *SLOT)
-{
-	unsigned int i = 4; /* four operators per channel */
-
-	do
-	{
-		switch(SLOT->state)
-		{
-		case EG_ATT: /* attack phase */
-			if (!(OPN->eg_cnt & ((1<<SLOT->eg_sh_ar)-1)))
-			{
-				/* update attenuation level */
-				SLOT->volume += (~SLOT->volume * (eg_incSLOT->eg_sel_ar + ((OPN->eg_cnt>>SLOT->eg_sh_ar)&7)))>>4;
-
-				/* check phase transition*/
-				if (SLOT->volume <= MIN_ATT_INDEX)
-				{
-					SLOT->volume = MIN_ATT_INDEX;
-					SLOT->state = (SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC; /* special case where SL=0 */
-				}
-
-				/* recalculate EG output */
-				if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04))) /* SSG-EG Output Inversion */
-					SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
-				else
-					SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-			}
-			break;
-
-		case EG_DEC: /* decay phase */
-			if (!(OPN->eg_cnt & ((1<<SLOT->eg_sh_d1r)-1)))
-			{
-				/* SSG EG type */
-				if (SLOT->ssg&0x08)
-				{
-					/* update attenuation level */
-					if (SLOT->volume < 0x200)
-					{
-						SLOT->volume += 4 * eg_incSLOT->eg_sel_d1r + ((OPN->eg_cnt>>SLOT->eg_sh_d1r)&7);
-
-						/* recalculate EG output */
-						if (SLOT->ssgn ^ (SLOT->ssg&0x04)) /* SSG-EG Output Inversion */
-							SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
-						else
-							SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-					}
-				}
-				else
-				{
-					/* update attenuation level */
-					SLOT->volume += eg_incSLOT->eg_sel_d1r + ((OPN->eg_cnt>>SLOT->eg_sh_d1r)&7);
-
-					/* recalculate EG output */
-					SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-				}
-
-				/* check phase transition*/
-				if (SLOT->volume >= (INT32)(SLOT->sl))
-					SLOT->state = EG_SUS;
-			}
-			break;
-
-		case EG_SUS: /* sustain phase */
-			if (!(OPN->eg_cnt & ((1<<SLOT->eg_sh_d2r)-1)))
-			{
-				/* SSG EG type */
-				if (SLOT->ssg&0x08)
-				{
-					/* update attenuation level */
-					if (SLOT->volume < 0x200)
-					{
-						SLOT->volume += 4 * eg_incSLOT->eg_sel_d2r + ((OPN->eg_cnt>>SLOT->eg_sh_d2r)&7);
-
-						/* recalculate EG output */
-						if (SLOT->ssgn ^ (SLOT->ssg&0x04)) /* SSG-EG Output Inversion */
-							SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
-						else
-							SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-					}
-				}
-				else
-				{
-					/* update attenuation level */
-					SLOT->volume += eg_incSLOT->eg_sel_d2r + ((OPN->eg_cnt>>SLOT->eg_sh_d2r)&7);
-
-					/* check phase transition*/
-					if ( SLOT->volume >= MAX_ATT_INDEX )
-						SLOT->volume = MAX_ATT_INDEX;
-					/* do not change SLOT->state (verified on real chip) */
-
-					/* recalculate EG output */
-					SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-				}
-			}
-			break;
-
-		case EG_REL: /* release phase */
-			if (!(OPN->eg_cnt & ((1<<SLOT->eg_sh_rr)-1)))
-			{
-				/* SSG EG type */
-				if (SLOT->ssg&0x08)
-				{
-					/* update attenuation level */
-					if (SLOT->volume < 0x200)
-						SLOT->volume += 4 * eg_incSLOT->eg_sel_rr + ((OPN->eg_cnt>>SLOT->eg_sh_rr)&7);
-					/* check phase transition */
-					if (SLOT->volume >= 0x200)
-					{
-						SLOT->volume = MAX_ATT_INDEX;
-						SLOT->state = EG_OFF;
-					}
-				}
-				else
-				{
-					/* update attenuation level */
-					SLOT->volume += eg_incSLOT->eg_sel_rr + ((OPN->eg_cnt>>SLOT->eg_sh_rr)&7);
-
-					/* check phase transition*/
-					if (SLOT->volume >= MAX_ATT_INDEX)
-					{
-						SLOT->volume = MAX_ATT_INDEX;
-						SLOT->state = EG_OFF;
-					}
-				}
-
-				/* recalculate EG output */
-				SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-
-			}
-			break;
-		}
-
-		SLOT++;
-		i--;
-	} while (i);
-}
-
-/* SSG-EG update process */
-/* The behavior is based upon Nemesis tests on real hardware */
-/* This is actually executed before each samples */
-static void update_ssg_eg_channel(FM_SLOT *SLOT)
-{
-	unsigned int i = 4; /* four operators per channel */
-
-	do
-	{
-		/* detect SSG-EG transition */
-		/* this is not required during release phase as the attenuation has been forced to MAX and output invert flag is not used */
-		/* if an Attack Phase is programmed, inversion can occur on each sample */
-		if ((SLOT->ssg & 0x08) && (SLOT->volume >= 0x200) && (SLOT->state > EG_REL))
-		{
-			if (SLOT->ssg & 0x01) /* bit 0 = hold SSG-EG */
-			{
-				/* set inversion flag */
-			 if (SLOT->ssg & 0x02)
-				 SLOT->ssgn = 4;
-
-				/* force attenuation level during decay phases */
-				if ((SLOT->state != EG_ATT) && !(SLOT->ssgn ^ (SLOT->ssg & 0x04)))
-					SLOT->volume = MAX_ATT_INDEX;
-			}
-			else /* loop SSG-EG */
-			{
-				/* toggle output inversion flag or reset Phase Generator */
-			 if (SLOT->ssg & 0x02)
-			 	SLOT->ssgn ^= 4;
-			 else
-			 	SLOT->phase = 0;
-
-				/* same as Key ON */
-				if (SLOT->state != EG_ATT)
-				{
-					if ((SLOT->ar + SLOT->ksr) < 94 /*32+62*/)
-					{
-						SLOT->state = (SLOT->volume <= MIN_ATT_INDEX) ? ((SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC) : EG_ATT;
-					}
-					else
-					{
-						/* Attack Rate is maximal: directly switch to Decay or Substain */
-						SLOT->volume = MIN_ATT_INDEX;
-						SLOT->state = (SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC;
-					}
-				}
-			}
-
-			/* recalculate EG output */
-			if (SLOT->ssgn ^ (SLOT->ssg&0x04))
-				SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
-			else
-				SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-		}
-
-		/* next slot */
-		SLOT++;
-		i--;
-	} while (i);
-}
-
-
-INLINE void update_phase_lfo_slot(FM_OPN *OPN, FM_SLOT *SLOT, INT32 pms, UINT32 block_fnum)
-{
-	UINT32 fnum_lfo = ((block_fnum & 0x7f0) >> 4) * 32 * 8;
-	INT32 lfo_fn_table_index_offset = lfo_pm_table fnum_lfo + pms + OPN->LFO_PM ;
-
-	if (lfo_fn_table_index_offset) /* LFO phase modulation active */
-	{
-		block_fnum = block_fnum*2 + lfo_fn_table_index_offset;
-
-		UINT8 blk = (block_fnum&0x7000) >> 12;
-		UINT32 fn = block_fnum & 0xfff;
-
-		/* recalculate keyscale code */
-		int kc = (blk<<2) | opn_fktablefn >> 8;
-
-		/* recalculate (frequency) phase increment counter */
-		int fc = (OPN->fn_tablefn>>(7-blk)) + SLOT->DTkc;
-
-		/* (frequency) phase overflow (credits to Nemesis) */
-		if (fc < 0) fc += OPN->fn_max;
-
-		/* update phase */
-		SLOT->phase += (fc * SLOT->mul) >> 1;
-	}
-	else /* LFO phase modulation = zero */
-	{
-		SLOT->phase += SLOT->Incr;
-	}
-}
-
-INLINE void update_phase_lfo_channel(FM_OPN *OPN, FM_CH *CH)
-{
-	UINT32 block_fnum = CH->block_fnum;
-
-	UINT32 fnum_lfo = ((block_fnum & 0x7f0) >> 4) * 32 * 8;
-	INT32 lfo_fn_table_index_offset = lfo_pm_table fnum_lfo + CH->pms + OPN->LFO_PM ;
-
-	if (lfo_fn_table_index_offset) /* LFO phase modulation active */
-	{
-		block_fnum = block_fnum*2 + lfo_fn_table_index_offset;
-
-		UINT8 blk = (block_fnum&0x7000) >> 12;
-		UINT32 fn = block_fnum & 0xfff;
-
-		/* recalculate keyscale code */
-		int kc = (blk<<2) | opn_fktablefn >> 8;
-
-		/* recalculate (frequency) phase increment counter */
-		int fc = (OPN->fn_tablefn>>(7-blk));
-
-		/* (frequency) phase overflow (credits to Nemesis) */
-		int finc = fc + CH->SLOTSLOT1.DTkc;
-		if (finc < 0) finc += OPN->fn_max;
-		CH->SLOTSLOT1.phase += (finc*CH->SLOTSLOT1.mul) >> 1;
-
-		finc = fc + CH->SLOTSLOT2.DTkc;
-		if (finc < 0) finc += OPN->fn_max;
-		CH->SLOTSLOT2.phase += (finc*CH->SLOTSLOT2.mul) >> 1;
-
-		finc = fc + CH->SLOTSLOT3.DTkc;
-		if (finc < 0) finc += OPN->fn_max;
-		CH->SLOTSLOT3.phase += (finc*CH->SLOTSLOT3.mul) >> 1;
-
-		finc = fc + CH->SLOTSLOT4.DTkc;
-		if (finc < 0) finc += OPN->fn_max;
-		CH->SLOTSLOT4.phase += (finc*CH->SLOTSLOT4.mul) >> 1;
-	}
-	else /* LFO phase modulation = zero */
-	{
-	 CH->SLOTSLOT1.phase += CH->SLOTSLOT1.Incr;
-	 CH->SLOTSLOT2.phase += CH->SLOTSLOT2.Incr;
-	 CH->SLOTSLOT3.phase += CH->SLOTSLOT3.Incr;
-	 CH->SLOTSLOT4.phase += CH->SLOTSLOT4.Incr;
-	}
-}
-
-/* update phase increment and envelope generator */
-INLINE void refresh_fc_eg_slot(FM_OPN *OPN, FM_SLOT *SLOT , int fc , int kc )
-{
-	int ksr = kc >> SLOT->KSR;
-
-	fc += SLOT->DTkc;
-
-	/* detects frequency overflow (credits to Nemesis) */
-	if (fc < 0) fc += OPN->fn_max;
-
-	/* (frequency) phase increment counter */
-	SLOT->Incr = (fc * SLOT->mul) >> 1;
-
-	if( SLOT->ksr != ksr )
-	{
-		SLOT->ksr = ksr;
-
-		/* calculate envelope generator rates */
-		if ((SLOT->ar + SLOT->ksr) < 32+62)
-		{
-			SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
-			SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
-		}
-		else
-		{
-			/* verified by Nemesis on real hardware (Attack phase is blocked) */
-			SLOT->eg_sh_ar = 0;
-			SLOT->eg_sel_ar = 18*RATE_STEPS;
-		}
-
-		SLOT->eg_sh_d1r = eg_rate_shift SLOT->d1r + SLOT->ksr;
-		SLOT->eg_sel_d1r= eg_rate_selectSLOT->d1r + SLOT->ksr;
-
-		SLOT->eg_sh_d2r = eg_rate_shift SLOT->d2r + SLOT->ksr;
-		SLOT->eg_sel_d2r= eg_rate_selectSLOT->d2r + SLOT->ksr;
-
-		SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr;
-		SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr;
-	}
-}
-
-/* update phase increment counters */
-INLINE void refresh_fc_eg_chan(FM_OPN *OPN, FM_CH *CH )
-{
-	if( CH->SLOTSLOT1.Incr==-1){
-		int fc = CH->fc;
-		int kc = CH->kcode;
-		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT1 , fc , kc );
-		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT2 , fc , kc );
-		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT3 , fc , kc );
-		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT4 , fc , kc );
-	}
-}
-
-#define volume_calc(OP) ((OP)->vol_out + (AM & (OP)->AMmask))
-
-INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
-{
-	UINT32 p;
-
-	p = (env<<3) + sin_tab ( ((signed int)((phase & ~FREQ_MASK) + (pm<<15))) >> FREQ_SH ) & SIN_MASK ;
-
-	if (p >= TL_TAB_LEN)
-		return 0;
-	return tl_tabp;
-}
-
-INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
-{
-	UINT32 p;
-
-	p = (env<<3) + sin_tab ( ((signed int)((phase & ~FREQ_MASK) + pm )) >> FREQ_SH ) & SIN_MASK ;
-
-	if (p >= TL_TAB_LEN)
-		return 0;
-	return tl_tabp;
-}
-
-INLINE void chan_calc(FM_OPN *OPN, FM_CH *CH)
-{
-	UINT32 AM = OPN->LFO_AM >> CH->ams;
-
-	OPN->m2 = OPN->c1 = OPN->c2 = OPN->mem = 0;
-
-	*CH->mem_connect = CH->mem_value; /* restore delayed sample (MEM) value to m2 or c2 */
-
-	unsigned int eg_out = volume_calc(&CH->SLOTSLOT1);
-	{
-		INT32 out = CH->op1_out0 + CH->op1_out1;
-		CH->op1_out0 = CH->op1_out1;
-
-		if( !CH->connect1 ){
-			/* algorithm 5 */
-			OPN->mem = OPN->c1 = OPN->c2 = CH->op1_out0;
-		}else{
-			/* other algorithms */
-			*CH->connect1 += CH->op1_out0;
-		}
-
-		CH->op1_out1 = 0;
-		if( eg_out < ENV_QUIET ) /* SLOT 1 */
-		{
-			if (!CH->FB)
-				out=0;
-
-			CH->op1_out1 = op_calc1(CH->SLOTSLOT1.phase, eg_out, (out<<CH->FB) );
-		}
-	}
-
-	eg_out = volume_calc(&CH->SLOTSLOT3);
-	if( eg_out < ENV_QUIET ) /* SLOT 3 */
-		*CH->connect3 += op_calc(CH->SLOTSLOT3.phase, eg_out, OPN->m2);
-
-	eg_out = volume_calc(&CH->SLOTSLOT2);
-	if( eg_out < ENV_QUIET ) /* SLOT 2 */
-		*CH->connect2 += op_calc(CH->SLOTSLOT2.phase, eg_out, OPN->c1);
-
-	eg_out = volume_calc(&CH->SLOTSLOT4);
-	if( eg_out < ENV_QUIET ) /* SLOT 4 */
-		*CH->connect4 += op_calc(CH->SLOTSLOT4.phase, eg_out, OPN->c2);
-
-
-	/* store current MEM */
-	CH->mem_value = OPN->mem;
-
-	/* update phase counters AFTER output calculations */
-	if(CH->pms)
-	{
-		/* add support for 3 slot mode */
-		if ((OPN->ST.mode & 0xC0) && (CH == &OPN->P_CH2))
-		{
-			update_phase_lfo_slot(OPN, &CH->SLOTSLOT1, CH->pms, OPN->SL3.block_fnum1);
-			update_phase_lfo_slot(OPN, &CH->SLOTSLOT2, CH->pms, OPN->SL3.block_fnum2);
-			update_phase_lfo_slot(OPN, &CH->SLOTSLOT3, CH->pms, OPN->SL3.block_fnum0);
-			update_phase_lfo_slot(OPN, &CH->SLOTSLOT4, CH->pms, CH->block_fnum);
-		}
-		else update_phase_lfo_channel(OPN, CH);
-	}
-	else /* no LFO phase modulation */
-	{
-		CH->SLOTSLOT1.phase += CH->SLOTSLOT1.Incr;
-		CH->SLOTSLOT2.phase += CH->SLOTSLOT2.Incr;
-		CH->SLOTSLOT3.phase += CH->SLOTSLOT3.Incr;
-		CH->SLOTSLOT4.phase += CH->SLOTSLOT4.Incr;
-	}
-}
-
-/* initialize time tables */
-static void init_timetables( FM_OPN *OPN )
-{
-	int i,d;
-	double rate;
-
-	/* DeTune table */
-	for (d = 0;d <= 3;d++)
-	{
-		for (i = 0;i <= 31;i++)
-		{
-			rate = ((double)dt_tabd*32 + i) * OPN->ST.freqbase * (1<<(FREQ_SH-10)); /* -10 because chip works with 10.10 fixed point, while we use 16.16 */
-			OPN->ST.dt_tabdi = (INT32) rate;
-			OPN->ST.dt_tabd+4i = -OPN->ST.dt_tabdi;
-		}
-	}
-
-	/* there are 2048 FNUMs that can be generated using FNUM/BLK registers
-	but LFO works with one more bit of a precision so we really need 4096 elements */
-	/* calculate fnumber -> increment counter table */
-	for(i = 0; i < 4096; i++)
-	{
-		/* freq table for octave 7 */
-		/* OPN phase increment counter = 20bit */
-		/* the correct formula is : F-Number = (144 * fnote * 2^20 / M) / 2^(B-1) */
-		/* where sample clock is M/144 */
-		/* this means the increment value for one clock sample is FNUM * 2^(B-1) = FNUM * 64 for octave 7 */
-		/* we also need to handle the ratio between the chip frequency and the emulated frequency (can be 1.0) */
-		OPN->fn_tablei = (UINT32)( (double)i * 32 * OPN->ST.freqbase * (1<<(FREQ_SH-10)) ); /* -10 because chip works with 10.10 fixed point, while we use 16.16 */
-	}
-
-	/* maximal frequency is required for Phase overflow calculation, register size is 17 bits (Nemesis) */
-	OPN->fn_max = (UINT32)( (double)0x20000 * OPN->ST.freqbase * (1<<(FREQ_SH-10)) );
-}
-
-
-static void reset_channels( FM_CH *CH , int num )
-{
-	int c,s;
-
-	for( c = 0 ; c < num ; c++ )
-	{
-		CHc.mem_value = 0;
-		CHc.op1_out0 = 0;
-		CHc.op1_out1 = 0;
-		for(s = 0 ; s < 4 ; s++ )
-		{
-			CHc.SLOTs.Incr = -1;
-			CHc.SLOTs.key = 0;
-			CHc.SLOTs.phase = 0;
-			CHc.SLOTs.ssgn = 0;
-			CHc.SLOTs.state = EG_OFF;
-			CHc.SLOTs.volume = MAX_ATT_INDEX;
-			CHc.SLOTs.vol_out = MAX_ATT_INDEX;
-		}
-	}
-}
-
-/* initialize generic tables */
-static int init_tables(void)
-{
-	signed int i,x;
-	signed int n;
-	double o,m;
-
-	for (x=0; x<TL_RES_LEN; x++)
-	{
-		m = (1<<16) / pow(2, (x+1) * (ENV_STEP/4.0) / 8.0);
-		m = floor(m);
-
-		/* we never reach (1<<16) here due to the (x+1) */
-		/* result fits within 16 bits at maximum */
-
-		n = (int)m;		/* 16 bits here */
-		n >>= 4;		/* 12 bits here */
-		if (n&1)		/* round to nearest */
-			n = (n>>1)+1;
-		else
-			n = n>>1;
-						/* 11 bits here (rounded) */
-		n <<= 2;		/* 13 bits here (as in real chip) */
-		tl_tab x*2 + 0 = n;
-		tl_tab x*2 + 1 = -tl_tab x*2 + 0 ;
-
-		for (i=1; i<13; i++)
-		{
-			tl_tab x*2+0 + i*2*TL_RES_LEN = tl_tab x*2+0 >>i;
-			tl_tab x*2+1 + i*2*TL_RES_LEN = -tl_tab x*2+0 + i*2*TL_RES_LEN ;
-		}
-	#if 0
-			logerror("tl %04i", x);
-			for (i=0; i<13; i++)
-				logerror(", %02i %4x", i*2, tl_tab x*2 /*+1*/ + i*2*TL_RES_LEN );
-			logerror("\n");
-		}
-	#endif
-	}
-	/*logerror("FM.C: TL_TAB_LEN = %i elements (%i bytes)\n",TL_TAB_LEN, (int)sizeof(tl_tab));*/
-
-
-	for (i=0; i<SIN_LEN; i++)
-	{
-		/* non-standard sinus */
-		m = sin( ((i*2)+1) * PI / SIN_LEN ); /* checked against the real chip */
-
-		/* we never reach zero here due to ((i*2)+1) */
-
-		if (m>0.0)
-			o = 8*log(1.0/m)/log(2.);	/* convert to 'decibels' */
-		else
-			o = 8*log(-1.0/m)/log(2.);	/* convert to 'decibels' */
-
-		o = o / (ENV_STEP/4);
-
-		n = (int)(2.0*o);
-		if (n&1)						/* round to nearest */
-			n = (n>>1)+1;
-		else
-			n = n>>1;
-
-		sin_tab i = n*2 + (m>=0.0? 0: 1 );
-		/*logerror("FM.C: sin %4i= %4i (tl_tab value=%5i)\n", i, sin_tabi,tl_tabsin_tabi);*/
-	}
-
-	/*logerror("FM.C: ENV_QUIET= %08x\n",ENV_QUIET );*/
-
-
-	/* build LFO PM modulation table */
-	for(i = 0; i < 8; i++) /* 8 PM depths */
-	{
-		UINT8 fnum;
-		for (fnum=0; fnum<128; fnum++) /* 7 bits meaningful of F-NUMBER */
-		{
-			UINT8 value;
-			UINT8 step;
-			UINT32 offset_depth = i;
-			UINT32 offset_fnum_bit;
-			UINT32 bit_tmp;
-
-			for (step=0; step<8; step++)
-			{
-				value = 0;
-				for (bit_tmp=0; bit_tmp<7; bit_tmp++) /* 7 bits */
-				{
-					if (fnum & (1<<bit_tmp)) /* only if bit "bit_tmp" is set */
-					{
-						offset_fnum_bit = bit_tmp * 8;
-						value += lfo_pm_outputoffset_fnum_bit + offset_depthstep;
-					}
-				}
-				lfo_pm_table(fnum*32*8) + (i*32) + step + 0 = value;
-				lfo_pm_table(fnum*32*8) + (i*32) +(step^7)+ 8 = value;
-				lfo_pm_table(fnum*32*8) + (i*32) + step +16 = -value;
-				lfo_pm_table(fnum*32*8) + (i*32) +(step^7)+24 = -value;
-			}
-#if 0
-			logerror("LFO depth=%1x FNUM=%04x (<<4=%4x): ", i, fnum, fnum<<4);
-			for (step=0; step<16; step++) /* dump only positive part of waveforms */
-				logerror("%02x ", lfo_pm_table(fnum*32*8) + (i*32) + step );
-			logerror("\n");
-#endif
-
-		}
-	}
-
-
-
-#ifdef SAVE_SAMPLE
-	sample0=fopen("sampsum.pcm","wb");
-#endif
-
-	return 1;
-
-}
-
-
-
-static void FMCloseTable( void )
-{
-#ifdef SAVE_SAMPLE
-	fclose(sample0);
-#endif
-	return;
-}
-
-
-#ifdef _STATE_H
-/* FM channel save , internal state only */
-static void FMsave_state_channel(const char *name,int num,FM_CH *CH,int num_ch)
-{
-	int slot , ch;
-	char state_name20;
-	const char slot_array4 = { 1 , 3 , 2 , 4 };
-
-	for(ch=0;ch<num_ch;ch++,CH++)
-	{
-		/* channel */
-		sprintf(state_name,"%s.CH%d",name,ch);
-		state_save_register_INT32(state_name, num, "feedback" , CH->op1_out , 2);
-		state_save_register_UINT32(state_name, num, "phasestep" , &CH->fc , 1);
-		/* slots */
-		for(slot=0;slot<4;slot++)
-		{
-			FM_SLOT *SLOT = &CH->SLOTslot;
-
-			sprintf(state_name,"%s.CH%d.SLOT%d",name,ch,slot_arrayslot);
-			state_save_register_UINT32(state_name, num, "phasecount" , &SLOT->phase, 1);
-			state_save_register_UINT8 (state_name, num, "state" , &SLOT->state, 1);
-			state_save_register_INT32 (state_name, num, "volume" , &SLOT->volume, 1);
-		}
-	}
-}
-
-static void FMsave_state_st(const char *state_name,int num,FM_ST *ST)
-{
-#if FM_BUSY_FLAG_SUPPORT
-	state_save_register_double(state_name, num, "BusyExpire", &ST->BusyExpire , 1);
-#endif
-	state_save_register_UINT8 (state_name, num, "address" , &ST->address , 1);
-	state_save_register_UINT8 (state_name, num, "IRQ" , &ST->irq , 1);
-	state_save_register_UINT8 (state_name, num, "IRQ MASK" , &ST->irqmask , 1);
-	state_save_register_UINT8 (state_name, num, "status" , &ST->status , 1);
-	state_save_register_UINT32(state_name, num, "mode" , &ST->mode , 1);
-	state_save_register_UINT8 (state_name, num, "prescaler" , &ST->prescaler_sel , 1);
-	state_save_register_UINT8 (state_name, num, "freq latch", &ST->fn_h , 1);
-	state_save_register_int (state_name, num, "TIMER A" , &ST->TA );
-	state_save_register_int (state_name, num, "TIMER Acnt", &ST->TAC );
-	state_save_register_UINT8 (state_name, num, "TIMER B" , &ST->TB , 1);
-	state_save_register_int (state_name, num, "TIMER Bcnt", &ST->TBC );
-}
-#endif /* _STATE_H */
-
-#if BUILD_OPN
-
-
-
-/* prescaler set (and make time tables) */
-static void OPNSetPres(FM_OPN *OPN , int pres , int TimerPres, int SSGpres)
-{
-	/* frequency base */
-	OPN->ST.freqbase = (OPN->ST.rate) ? ((double)OPN->ST.clock / OPN->ST.rate) / pres : 0;
-	if ( fabs( OPN->ST.freqbase - 1.0 ) < 0.0001 )
-		OPN->ST.freqbase = 1.0;
-
-	OPN->eg_timer_add = (UINT32)((1<<EG_SH) * OPN->ST.freqbase);
-	OPN->eg_timer_overflow = ( 3 ) * (1<<EG_SH);
-
-	/* LFO timer increment (every samples) */
-	OPN->lfo_timer_add = (UINT32)((1<<LFO_SH) * OPN->ST.freqbase);
-
-	/* Timer base time (every samples) */
-	OPN->ST.TimerBase = (int) ((1 << TIMER_SH) * OPN->ST.freqbase);
-
-	/* make time tables */
-	init_timetables( OPN );
-}
-
-
-
-/* write a OPN mode register 0x20-0x2f */
-static void OPNWriteMode(FM_OPN *OPN, int r, int v)
-{
-	UINT8 c;
-	FM_CH *CH;
-
-	switch(r){
-	case 0x21:	/* Test */
-		break;
-	case 0x22:	/* LFO FREQ (YM2608/YM2610/YM2610B/YM2612) */
-		if (v&8) /* LFO enabled ? */
-		{
-			if (!OPN->lfo_timer_overflow)
-			{
-				/* restart LFO */
-				OPN->lfo_cnt = 0;
-				OPN->lfo_timer = 0;
-				OPN->LFO_AM = 0;
-				OPN->LFO_PM = 0;
-			}
-
-			OPN->lfo_timer_overflow = lfo_samples_per_stepv&7 << LFO_SH;
-		}
-		else
-		{
-			OPN->lfo_timer_overflow = 0;
-		}
-		break;
-	case 0x24:	/* timer A High 8*/
-		OPN->ST.TA = (OPN->ST.TA & 0x03)|(((int)v)<<2);
-		OPN->ST.TAL = (1024 - OPN->ST.TA) << TIMER_SH;
-		break;
-	case 0x25:	/* timer A Low 2*/
-		OPN->ST.TA = (OPN->ST.TA & 0x3fc)|(v&3);
-		OPN->ST.TAL = (1024 - OPN->ST.TA) << TIMER_SH;
-		break;
-	case 0x26:	/* timer B */
-		OPN->ST.TB = v;
-		OPN->ST.TBL = (256 - OPN->ST.TB) << (TIMER_SH + 4);
-		break;
-	case 0x27:	/* mode, timer control */
-		set_timers( OPN, v );
-		break;
-	case 0x28:	/* key on / off */
-		c = v & 0x03;
-		if( c == 3 ) break;
-		if( (v&0x04) ) c+=3;
-		CH = OPN->P_CH;
-		CH = &CHc;
-		if(v&0x10) FM_KEYON(OPN,CH,SLOT1); else FM_KEYOFF(OPN,CH,SLOT1);
-		if(v&0x20) FM_KEYON(OPN,CH,SLOT2); else FM_KEYOFF(OPN,CH,SLOT2);
-		if(v&0x40) FM_KEYON(OPN,CH,SLOT3); else FM_KEYOFF(OPN,CH,SLOT3);
-		if(v&0x80) FM_KEYON(OPN,CH,SLOT4); else FM_KEYOFF(OPN,CH,SLOT4);
-		break;
-	}
-}
-
-INLINE void OPNUpdatePan( FM_OPN *OPN, int c )
-{
-	int v = OPN->pan_regs c & ~OPN->pan_mutes c;
-	OPN->pan c*2 = (v & 0x80) ? ~0 : 0;
-	OPN->pan c*2+1 = (v & 0x40) ? ~0 : 0;
-}
-
-/* write a OPN register (0x30-0xff) */
-static void OPNWriteReg(FM_OPN *OPN, int r, int v)
-{
-	FM_CH *CH;
-	FM_SLOT *SLOT;
-
-	UINT8 c = OPN_CHAN(r);
-
-	if (c == 3) return; /* 0xX3,0xX7,0xXB,0xXF */
-
-	if (r >= 0x100) c+=3;
-
-	CH = OPN->P_CH;
-	CH = &CHc;
-
-	SLOT = &(CH->SLOTOPN_SLOT(r));
-
-	switch( r & 0xf0 ) {
-	case 0x30:	/* DET , MUL */
-		set_det_mul(&OPN->ST,CH,SLOT,v);
-		break;
-
-	case 0x40:	/* TL */
-		set_tl(CH,SLOT,v);
-		break;
-
-	case 0x50:	/* KS, AR */
-		set_ar_ksr(CH,SLOT,v);
-		break;
-
-	case 0x60:	/* bit7 = AM ENABLE, DR */
-		set_dr(SLOT,v);
-
-		SLOT->AMmask = (v&0x80) ? ~0 : 0;
-		break;
-
-	case 0x70:	/* SR */
-		set_sr(SLOT,v);
-		break;
-
-	case 0x80:	/* SL, RR */
-		set_sl_rr(SLOT,v);
-		break;
-
-	case 0x90:	/* SSG-EG */
-		SLOT->ssg = v&0x0f;
-
-	 /* recalculate EG output */
-		if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04)) && (SLOT->state > EG_REL))
-			SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
-		else
-			SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
-
-		/* SSG-EG envelope shapes :
-
- E AtAlH
- 1 0 0 0 \\\\
-
- 1 0 0 1 \___
-
- 1 0 1 0 \/\/
- ___
- 1 0 1 1 \
-
- 1 1 0 0 ////
- ___
- 1 1 0 1 /
-
- 1 1 1 0 /\/\
-
- 1 1 1 1 /___
-
-
- E = SSG-EG enable
-
-
- The shapes are generated using Attack, Decay and Sustain phases.
-
- Each single character in the diagrams above represents this whole
- sequence:
-
- - when KEY-ON = 1, normal Attack phase is generated (*without* any
- difference when compared to normal mode),
-
- - later, when envelope level reaches minimum level (max volume),
- the EG switches to Decay phase (which works with bigger steps
- when compared to normal mode - see below),
-
- - later when envelope level passes the SL level,
- the EG swithes to Sustain phase (which works with bigger steps
- when compared to normal mode - see below),
-
- - finally when envelope level reaches maximum level (min volume),
- the EG switches to Attack phase again (depends on actual waveform).
-
- Important is that when switch to Attack phase occurs, the phase counter
- of that operator will be zeroed-out (as in normal KEY-ON) but not always.
- (I havent found the rule for that - perhaps only when the output level is low)
-
- The difference (when compared to normal Envelope Generator mode) is
- that the resolution in Decay and Sustain phases is 4 times lower;
- this results in only 256 steps instead of normal 1024.
- In other words:
- when SSG-EG is disabled, the step inside of the EG is one,
- when SSG-EG is enabled, the step is four (in Decay and Sustain phases).
-
- Times between the level changes are the same in both modes.
-
-
- Important:
- Decay 1 Level (so called SL) is compared to actual SSG-EG output, so
- it is the same in both SSG and no-SSG modes, with this exception:
-
- when the SSG-EG is enabled and is generating raising levels
- (when the EG output is inverted) the SL will be found at wrong level !!!
- For example, when SL=02:
- 0 -6 = -6dB in non-inverted EG output
- 96-6 = -90dB in inverted EG output
- Which means that EG compares its level to SL as usual, and that the
- output is simply inverted afterall.
-
-
- The Yamaha's manuals say that AR should be set to 0x1f (max speed).
- That is not necessary, but then EG will be generating Attack phase.
-
- */
-
-
-		break;
-
-	case 0xa0:
-		switch( OPN_SLOT(r) ){
-		case 0:		/* 0xa0-0xa2 : FNUM1 */
-			{
-				UINT32 fn = (((UINT32)( (OPN->ST.fn_h)&7))<<8) + v;
-				UINT8 blk = OPN->ST.fn_h>>3;
-				/* keyscale code */
-				CH->kcode = (blk<<2) | opn_fktablefn >> 7;
-				/* phase increment counter */
-				CH->fc = OPN->fn_tablefn*2>>(7-blk);
-
-				/* store fnum in clear form for LFO PM calculations */
-				CH->block_fnum = (blk<<11) | fn;
-
-				CH->SLOTSLOT1.Incr=-1;
-			}
-			break;
-		case 1:		/* 0xa4-0xa6 : FNUM2,BLK */
-			OPN->ST.fn_h = v&0x3f;
-			break;
-		case 2:		/* 0xa8-0xaa : 3CH FNUM1 */
-			if(r < 0x100)
-			{
-				UINT32 fn = (((UINT32)(OPN->SL3.fn_h&7))<<8) + v;
-				UINT8 blk = OPN->SL3.fn_h>>3;
-				/* keyscale code */
-				OPN->SL3.kcodec= (blk<<2) | opn_fktablefn >> 7;
-				/* phase increment counter */
-				OPN->SL3.fcc = OPN->fn_tablefn*2>>(7-blk);
-				OPN->SL3.block_fnumc = (blk<<11) | fn;
-				(OPN->P_CH)2.SLOTSLOT1.Incr=-1;
-			}
-			break;
-		case 3:		/* 0xac-0xae : 3CH FNUM2,BLK */
-			if(r < 0x100)
-				OPN->SL3.fn_h = v&0x3f;
-			break;
-		}
-		break;
-
-	case 0xb0:
-		switch( OPN_SLOT(r) ){
-		case 0:		/* 0xb0-0xb2 : FB,ALGO */
-			{
-				int feedback = (v>>3)&7;
-				CH->ALGO = v&7;
-				CH->FB = feedback ? feedback+6 : 0;
-				setup_connection( OPN, CH, c );
-			}
-			break;
-		case 1:		/* 0xb4-0xb6 : L , R , AMS , PMS (YM2612/YM2610B/YM2610/YM2608) */
-			{
-				/* b0-2 PMS */
-				CH->pms = (v & 7) * 32; /* CH->pms = PM depth * 32 (index in lfo_pm_table) */
-
-				/* b4-5 AMS */
-				CH->ams = lfo_ams_depth_shift(v>>4) & 0x03;
-
-				/* PAN : b7 = L, b6 = R */
-				OPN->pan_regs c = v & 0xc0;
-				OPNUpdatePan( OPN, c );
-
-			}
-			break;
-		}
-		break;
-	}
-}
-
-#endif /* BUILD_OPN */
-
-#if BUILD_YM2612
-/*******************************************************************************/
-/*		YM2612 local section */
-/*******************************************************************************/
-/* here's the virtual YM2612 */
-struct Ym2612_Impl
-{
-#ifdef _STATE_H
-	UINT8		REGS512;			/* registers			*/
-#endif
-	FM_OPN		OPN;				/* OPN state			*/
-	FM_CH		CH6;				/* channel state		*/
-
-	/* dac output (YM2612) */
-	int			dacen;
-	INT32		dacout;
-};
-
-//static int dacen;
-
-/* Generate samples for one of the YM2612s */
-void YM2612UpdateOne(YM2612 *F2612, short *buffer, int length)
-{
-	FM_OPN *OPN = &F2612->OPN;
-	int i;
-	INT32 dacout = F2612->dacout;
-	FM_CH	*cch6;
-	int dacen;
-
-	cch0 = &F2612->CH0;
-	cch1 = &F2612->CH1;
-	cch2 = &F2612->CH2;
-	cch3 = &F2612->CH3;
-	cch4 = &F2612->CH4;
-	cch5 = &F2612->CH5;
-	/* DAC mode */
-	dacen = F2612->dacen;
-
-	/* refresh PG and EG */
-	refresh_fc_eg_chan( OPN, cch0 );
-	refresh_fc_eg_chan( OPN, cch1 );
-	if( (OPN->ST.mode & 0xc0) )
-	{
-		/* 3SLOT MODE */
-		if( cch2->SLOTSLOT1.Incr==-1)
-		{
-			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT1 , OPN->SL3.fc1 , OPN->SL3.kcode1 );
-			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT2 , OPN->SL3.fc2 , OPN->SL3.kcode2 );
-			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT3 , OPN->SL3.fc0 , OPN->SL3.kcode0 );
-			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT4 , cch2->fc , cch2->kcode );
-		}
-	}else refresh_fc_eg_chan( OPN, cch2 );
-	refresh_fc_eg_chan( OPN, cch3 );
-	refresh_fc_eg_chan( OPN, cch4 );
-	refresh_fc_eg_chan( OPN, cch5 );
-
-	/* buffering */
-	for(i=0; i < length ; i++)
-	{
-		/* clear outputs */
-		OPN->out_fm0 = 0;
-		OPN->out_fm1 = 0;
-		OPN->out_fm2 = 0;
-		OPN->out_fm3 = 0;
-		OPN->out_fm4 = 0;
-		OPN->out_fm5 = 0;
-
-		/* update SSG-EG output */
-		update_ssg_eg_channel(&cch0->SLOTSLOT1);
-		update_ssg_eg_channel(&cch1->SLOTSLOT1);
-		update_ssg_eg_channel(&cch2->SLOTSLOT1);
-		update_ssg_eg_channel(&cch3->SLOTSLOT1);
-		update_ssg_eg_channel(&cch4->SLOTSLOT1);
-		update_ssg_eg_channel(&cch5->SLOTSLOT1);
-
-		/* calculate FM */
-		chan_calc(OPN, cch0 );
-		chan_calc(OPN, cch1 );
-		chan_calc(OPN, cch2 );
-		chan_calc(OPN, cch3 );
-		chan_calc(OPN, cch4 );
-		if( dacen )
-			/* *cch5->connect4 += dacout */;
-		else
-			chan_calc(OPN, cch5 );
-
-		/* advance LFO */
-		advance_lfo(OPN);
-
-		/* advance envelope generator */
-		OPN->eg_timer += OPN->eg_timer_add;
-		while (OPN->eg_timer >= OPN->eg_timer_overflow)
-		{
-			OPN->eg_timer -= OPN->eg_timer_overflow;
-			OPN->eg_cnt++;
-
-			advance_eg_channel(OPN, &cch0->SLOTSLOT1);
-			advance_eg_channel(OPN, &cch1->SLOTSLOT1);
-			advance_eg_channel(OPN, &cch2->SLOTSLOT1);
-			advance_eg_channel(OPN, &cch3->SLOTSLOT1);
-			advance_eg_channel(OPN, &cch4->SLOTSLOT1);
-			advance_eg_channel(OPN, &cch5->SLOTSLOT1);
-		}
-
-		{
-			int lt,rt;
-
-			if (OPN->out_fm0 > 8191) OPN->out_fm0 = 8191;
-			else if (OPN->out_fm0 < -8192) OPN->out_fm0 = -8192;
-			if (OPN->out_fm1 > 8191) OPN->out_fm1 = 8191;
-			else if (OPN->out_fm1 < -8192) OPN->out_fm1 = -8192;
-			if (OPN->out_fm2 > 8191) OPN->out_fm2 = 8191;
-			else if (OPN->out_fm2 < -8192) OPN->out_fm2 = -8192;
-			if (OPN->out_fm3 > 8191) OPN->out_fm3 = 8191;
-			else if (OPN->out_fm3 < -8192) OPN->out_fm3 = -8192;
-			if (OPN->out_fm4 > 8191) OPN->out_fm4 = 8191;
-			else if (OPN->out_fm4 < -8192) OPN->out_fm4 = -8192;
-			if (OPN->out_fm5 > 8191) OPN->out_fm5 = 8191;
-			else if (OPN->out_fm5 < -8192) OPN->out_fm5 = -8192;
-
-			lt = ((OPN->out_fm0>>0) & OPN->pan0);
-			rt = ((OPN->out_fm0>>0) & OPN->pan1);
-			lt += ((OPN->out_fm1>>0) & OPN->pan2);
-			rt += ((OPN->out_fm1>>0) & OPN->pan3);
-			lt += ((OPN->out_fm2>>0) & OPN->pan4);
-			rt += ((OPN->out_fm2>>0) & OPN->pan5);
-			lt += ((OPN->out_fm3>>0) & OPN->pan6);
-			rt += ((OPN->out_fm3>>0) & OPN->pan7);
-			lt += ((OPN->out_fm4>>0) & OPN->pan8);
-			rt += ((OPN->out_fm4>>0) & OPN->pan9);
-			lt += ((OPN->out_fm5>>0) & OPN->pan10);
-			rt += ((OPN->out_fm5>>0) & OPN->pan11);
-
-			lt >>= 1;
-			rt >>= 1;
-
-			Limit( lt );
-			Limit( rt );
-
-			#ifdef SAVE_SAMPLE
-				SAVE_ALL_CHANNELS
-			#endif
-
-			/* buffering */
-			bufferi*2 = lt;
-			bufferi*2+1 = rt;
-		}
-
-		/* CSM mode: if CSM Key ON has occured, CSM Key OFF need to be sent */
-		/* only if Timer A does not overflow again (i.e CSM Key ON not set again) */
-		OPN->SL3.key_csm <<= 1;
-
-		/* timer A control */
-		INTERNAL_TIMER_A( OPN );
-
-		/* CSM Mode Key ON still disabled */
-		/* CSM Mode Key OFF (verified by Nemesis on real hardware) */
-		FM_KEYOFF_CSM(cch2,SLOT1);
-		FM_KEYOFF_CSM(cch2,SLOT2);
-		FM_KEYOFF_CSM(cch2,SLOT3);
-		FM_KEYOFF_CSM(cch2,SLOT4);
-		OPN->SL3.key_csm = 0;
-	}
-	INTERNAL_TIMER_B(&OPN->ST,length);
-
-}
-
-#ifdef _STATE_H
-void YM2612Postload(void *chip)
-{
-	if (chip)
-	{
-		YM2612 *F2612 = (YM2612 *)chip;
-		int r;
-
-		/* DAC data & port */
-			F2612->dacout = ((int)F2612->REGS0x2a - 0x80) << 0;	/* level unknown */
-			F2612->dacen = F2612->REGS0x2d & 0x80;
-		/* OPN registers */
-		/* DT / MULTI , TL , KS / AR , AMON / DR , SR , SL / RR , SSG-EG */
-		for(r=0x30;r<0x9e;r++)
-			if((r&3) != 3)
-			{
-					OPNWriteReg(&F2612->OPN,r,F2612->REGSr);
-					OPNWriteReg(&F2612->OPN,r|0x100,F2612->REGSr|0x100);
-			}
-		/* FB / CONNECT , L / R / AMS / PMS */
-		for(r=0xb0;r<0xb6;r++)
-			if((r&3) != 3)
-			{
-					OPNWriteReg(&F2612->OPN,r,F2612->REGSr);
-					OPNWriteReg(&F2612->OPN,r|0x100,F2612->REGSr|0x100);
-			}
-		/* channels */
-			/*FM_channel_postload(F2612->CH,6);*/
-			OPN->cur_chip = NULL;
-		}
-}
-
-static void YM2612_save_state(YM2612 *F2612, int index)
-{
-	const char statename = "YM2612";
-
-	state_save_register_UINT8 (statename, index, "regs" , F2612->REGS , 512);
-	FMsave_state_st(statename,index,&F2612->OPN.ST);
-	FMsave_state_channel(statename,index,F2612->CH,6);
-		/* 3slots */
-	state_save_register_UINT32 (statename, index, "slot3fc" , F2612->OPN.SL3.fc , 3);
-	state_save_register_UINT8 (statename, index, "slot3fh" , &F2612->OPN.SL3.fn_h, 1);
-	state_save_register_UINT8 (statename, index, "slot3kc" , F2612->OPN.SL3.kcode, 3);
-		/* address register1 */
-	state_save_register_UINT8 (statename, index, "addr_A1" , &F2612->addr_A1, 1);
-}
-#endif /* _STATE_H */
-
-/* initialize YM2612 emulator(s) */
-YM2612 * YM2612Init(void *param, int index, long clock, long rate)
-{
-	YM2612 *F2612;
-
-	/* allocate extend state space */
-	if( (F2612 = (YM2612 *)calloc(1, sizeof(YM2612)))==NULL)
-		return NULL;
-	/* allocate total level table (128kb space) */
-	if( !init_tables() )
-	{
-		free( F2612 );
-		return NULL;
-	}
-
-	F2612->OPN.ST.param = param;
-	F2612->OPN.P_CH = F2612->CH;
-	F2612->OPN.ST.clock = clock;
-	F2612->OPN.ST.rate = rate;
-	/* F2612->OPN.ST.irq = 0; */
-	/* F2612->OPN.ST.status = 0; */
-		/* Extend handler */
-	OPNSetPres(&F2612->OPN, 6*24, 6*24, 0);
-	YM2612ResetChip( F2612 );
-
-#ifdef _STATE_H
-	YM2612_save_state(F2612, index);
-#endif
-	return F2612;
-}
-
-void YM2612Mute(YM2612* F2612, int mask)
-{
-	int c;
-	for ( c = 0; c < 6; c++ )
-	{
-		F2612->OPN.pan_mutes c = -(mask >> c & 1);
-		OPNUpdatePan( &F2612->OPN, c );
-	}
-}
-
-/* shut down emulator */
-void YM2612Shutdown(YM2612 *F2612)
-{
-	FMCloseTable();
-	free(F2612);
-}
-
-/* reset one of chip */
-void YM2612ResetChip(YM2612 *F2612)
-{
-	int i;
-	FM_OPN *OPN = &F2612->OPN;
-
-	OPN->eg_timer = 0;
-	OPN->eg_cnt = 0;
-
-	OPN->lfo_timer = 0;
-	OPN->lfo_cnt = 0;
-	OPN->LFO_AM = 0;
-	OPN->LFO_PM = 0;
-
-	OPN->ST.TAC = 0;
-	OPN->ST.TBC = 0;
-
-	OPN->SL3.key_csm = 0;
-
-	OPNWriteMode(OPN,0x27,0x30);
-	OPNWriteMode(OPN,0x26,0x00);
-	OPNWriteMode(OPN,0x25,0x00);
-	OPNWriteMode(OPN,0x24,0x00);
-	OPNWriteMode(OPN,0x22,0x00);
-
-	reset_channels( &F2612->CH0 , 6 );
-
-	for(i = 0xb6 ; i >= 0xb4 ; i-- )
-	{
-		OPNWriteReg(OPN,i ,0xc0);
-		OPNWriteReg(OPN,i|0x100,0xc0);
-	}
-	for(i = 0xb2 ; i >= 0x30 ; i-- )
-	{
-		OPNWriteReg(OPN,i ,0);
-		OPNWriteReg(OPN,i|0x100,0);
-	}
-}
-
-/* YM2612 write */
-/* n = number */
-/* a = address */
-/* v = value */
-int YM2612Write(YM2612 *F2612, unsigned int a, unsigned int v)
-{
-	v &= 0xff;	/* adjust to 8 bit bus */
-
-	switch( a )
-	{
-	case 0:	/* address port 0 */
-		F2612->OPN.ST.address = v;
-		break;
-
-	case 2:	/* address port 1 */
-		F2612->OPN.ST.address = v | 0x100;
-		break;
-
-	default:
-		{
-			int addr = F2612->OPN.ST.address; /* verified by Nemesis on real YM2612 */
-#ifdef _STATE_H
-			F2612->REGSaddr = v;
-#endif
-			switch( addr & 0x1f0 )
-			{
-			case 0x20:	/* 0x20-0x2f Mode */
-				switch( addr )
-				{
-				case 0x2a:	/* DAC data (YM2612) */
-					YM2612UpdateReq(F2612->OPN.ST.param);
-					F2612->dacout = ((int)v - 0x80) << 8;	/* level unknown */
-					break;
-				case 0x2b:	/* DAC Sel (YM2612) */
-					/* b7 = dac enable */
-					F2612->dacen = v & 0x80;
-					break;
-				default:	/* OPN section */
-					YM2612UpdateReq(F2612->OPN.ST.param);
-					/* write register */
-					OPNWriteMode(&(F2612->OPN),addr,v);
-				}
-				break;
-			default:	/* 0x30-0xff OPN section */
-				YM2612UpdateReq(F2612->OPN.ST.param);
-				/* write register */
-				OPNWriteReg(&(F2612->OPN),addr,v);
-			}
-			break;
-		}
-	}
-	return F2612->OPN.ST.irq;
-}
-
-UINT8 YM2612Read(YM2612 *F2612,int a)
-{
-	switch( a&3){
-	case 0:	/* status 0 */
-		return FM_STATUS_FLAG(&F2612->OPN.ST);
-	case 1:
-	case 2:
-	case 3:
-		logerror("YM2612 #%p:A=%d read unmapped area\n",F2612->OPN.ST.param,a);
-		return FM_STATUS_FLAG(&F2612->OPN.ST);
-	}
-	return 0;
-}
-
-int YM2612TimerOver(YM2612 *F2612,int c)
-{
-	if( c )
-	{	/* Timer B */
-		TimerBOver( &(F2612->OPN.ST) );
-	}
-	else
-	{	/* Timer A */
-		YM2612UpdateReq(F2612->OPN.ST.param);
-		/* timer update */
-		TimerAOver( &(F2612->OPN.ST) );
-		/* CSM mode key,TL controll */
-		if ((F2612->OPN.ST.mode & 0xc0) == 0x80)
-		{	/* CSM mode total level latch and auto key on */
-			CSMKeyControll( &F2612->OPN, &(F2612->CH2) );
-		}
-	}
-	return F2612->OPN.ST.irq;
-}
-
-#endif /* BUILD_YM2612 */
-
-// Ym2612_Emu
-
-Ym2612_Emu::~Ym2612_Emu()
-{
-	if ( impl )
-		YM2612Shutdown( impl );
-}
-
-const char* Ym2612_Emu::set_rate( double sample_rate, double clock_rate )
-{
-	if ( impl )
-	{
-		YM2612Shutdown( impl );
-		impl = 0;
-	}
-
-	if ( !clock_rate )
-		clock_rate = sample_rate * 144.;
-
-	impl = YM2612Init( 0, 0, (long) (clock_rate + 0.5), (long) (sample_rate + 0.5) );
-	if ( !impl )
-		return blargg_err_memory;
-	
-	return 0;
-}
-
-void Ym2612_Emu::reset()
-{
-	YM2612ResetChip( impl );
-}
-
-void Ym2612_Emu::write0( int addr, int data )
-{
-	YM2612Write( impl, 0, addr );
-	YM2612Write( impl, 1, data );
-}
-
-void Ym2612_Emu::write1( int addr, int data )
-{
-	YM2612Write( impl, 2, addr );
-	YM2612Write( impl, 3, data );
-}
-
-void Ym2612_Emu::mute_voices( int mask )
-{
-	YM2612Mute( impl, mask );
-}
-
-void Ym2612_Emu::run( int pair_count, sample_t* out )
-{
-	YM2612UpdateOne( impl, out, pair_count );
-}
-
+#include "Ym2612_Emu.h"
+
+#define YM2612_EMU_CPP
+#ifdef USE_GENS
+#include "Ym2612_Emu_Gens.cpp"
+#else
+#include "Ym2612_Emu_MAME.cpp"
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ym2612_Emu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ym2612_Emu.h Changed

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ym2612_Emu_Gens.cpp Added

@@ -0,0 +1,1303 @@
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+// Based on Gens 2.10 ym2612.c
+
+#ifdef YM2612_EMU_CPP
+
+#include "Ym2612_Emu.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <stdio.h>
+#include <math.h>
+
+/* Copyright (C) 2002 Stéphane Dallongeville (gens AT consolemul.com) */
+/* 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 */
+
+// This is mostly the original source in its C style and all.
+//
+// Somewhat optimized and simplified. Uses a template to generate the many
+// variants of Update_Chan. Rewrote header file. In need of full rewrite by
+// someone more familiar with FM sound and the YM2612. Has some inaccuracies
+// compared to the Sega Genesis sound, particularly being mixed at such a
+// high sample accuracy (the Genesis sounds like it has onn(ly 8 bit samples).
+// - Shay
+
+#ifdef BLARGG_ENABLE_OPTIMIZER
+	#include BLARGG_ENABLE_OPTIMIZER
+#endif
+
+const int output_bits = 14;
+
+struct slot_t
+{
+	const int *DT; // parametre detune
+	int MUL; // parametre "multiple de frequence"
+	int TL; // Total Level = volume lorsque l'enveloppe est au plus haut
+	int TLL; // Total Level ajusted
+	int SLL; // Sustin Level (ajusted) = volume où l'enveloppe termine sa premiere phase de regression
+	int KSR_S; // Key Scale Rate Shift = facteur de prise en compte du KSL dans la variations de l'enveloppe
+	int KSR; // Key Scale Rate = cette valeur est calculee par rapport à la frequence actuelle, elle va influer
+				// sur les differents parametres de l'enveloppe comme l'attaque, le decay ... comme dans la realite !
+	int SEG; // Type enveloppe SSG
+	const int *AR; // Attack Rate (table pointeur) = Taux d'attaque (AR KSR)
+	const int *DR; // Decay Rate (table pointeur) = Taux pour la regression (DR KSR)
+	const int *SR; // Sustin Rate (table pointeur) = Taux pour le maintien (SR KSR)
+	const int *RR; // Release Rate (table pointeur) = Taux pour le rel'chement (RR KSR)
+	int Fcnt; // Frequency Count = compteur-frequence pour determiner l'amplitude actuelle (SIN Finc >> 16)
+	int Finc; // frequency step = pas d'incrementation du compteur-frequence
+				// plus le pas est grand, plus la frequence est aïgu (ou haute)
+	int Ecurp; // Envelope current phase = cette variable permet de savoir dans quelle phase
+				// de l'enveloppe on se trouve, par exemple phase d'attaque ou phase de maintenue ...
+				// en fonction de la valeur de cette variable, on va appeler une fonction permettant
+				// de mettre à jour l'enveloppe courante.
+	int Ecnt; // Envelope counter = le compteur-enveloppe permet de savoir où l'on se trouve dans l'enveloppe
+	int Einc; // Envelope step courant
+	int Ecmp; // Envelope counter limite pour la prochaine phase
+	int EincA; // Envelope step for Attack = pas d'incrementation du compteur durant la phase d'attaque
+				// cette valeur est egal à AR KSR
+	int EincD; // Envelope step for Decay = pas d'incrementation du compteur durant la phase de regression
+				// cette valeur est egal à DR KSR
+	int EincS; // Envelope step for Sustain = pas d'incrementation du compteur durant la phase de maintenue
+				// cette valeur est egal à SR KSR
+	int EincR; // Envelope step for Release = pas d'incrementation du compteur durant la phase de rel'chement
+				// cette valeur est egal à RR KSR
+	int *OUTp; // pointeur of SLOT output = pointeur permettant de connecter la sortie de ce slot à l'entree
+				// d'un autre ou carrement à la sortie de la voie
+	int INd; // input data of the slot = donnees en entree du slot
+	int ChgEnM; // Change envelop mask.
+	int AMS; // AMS depth level of this SLOT = degre de modulation de l'amplitude par le LFO
+	int AMSon; // AMS enable flag = drapeau d'activation de l'AMS
+};
+
+struct channel_t
+{
+	int S0_OUT 4; // anciennes sorties slot 0 (pour le feed back)
+	int LEFT; // LEFT enable flag
+	int RIGHT; // RIGHT enable flag
+	int ALGO; // Algorythm = determine les connections entre les operateurs
+	int FB; // shift count of self feed back = degre de "Feed-Back" du SLOT 1 (il est son unique entree)
+	int FMS; // Frequency Modulation Sensitivity of channel = degre de modulation de la frequence sur la voie par le LFO
+	int AMS; // Amplitude Modulation Sensitivity of channel = degre de modulation de l'amplitude sur la voie par le LFO
+	int FNUM 4; // hauteur frequence de la voie (+ 3 pour le mode special)
+	int FOCT 4; // octave de la voie (+ 3 pour le mode special)
+	int KC 4; // Key Code = valeur fonction de la frequence (voir KSR pour les slots, KSR = KC >> KSR_S)
+	slot_t SLOT 4; // four slot.operators = les 4 slots de la voie
+	int FFlag; // Frequency step recalculation flag
+};
+
+struct state_t
+{
+	int TimerBase; // TimerBase calculation
+	int Status; // YM2612 Status (timer overflow)
+	int TimerA; // timerA limit = valeur jusqu'à laquelle le timer A doit compter
+	int TimerAL;
+	int TimerAcnt; // timerA counter = valeur courante du Timer A
+	int TimerB; // timerB limit = valeur jusqu'à laquelle le timer B doit compter
+	int TimerBL;
+	int TimerBcnt; // timerB counter = valeur courante du Timer B
+	int Mode; // Mode actuel des voie 3 et 6 (normal / special)
+	int DAC; // DAC enabled flag
+	channel_t CHANNEL Ym2612_Emu::channel_count; // Les 6 voies du YM2612
+	int REG 2 0x100; // Sauvegardes des valeurs de tout les registres, c'est facultatif
+						// cela nous rend le debuggage plus facile
+};
+
+#undef PI
+#define PI 3.14159265358979323846
+
+#define ATTACK 0
+#define DECAY 1
+#define SUBSTAIN 2
+#define RELEASE 3
+
+// SIN_LBITS <= 16
+// LFO_HBITS <= 16
+// (SIN_LBITS + SIN_HBITS) <= 26
+// (ENV_LBITS + ENV_HBITS) <= 28
+// (LFO_LBITS + LFO_HBITS) <= 28
+
+#define SIN_HBITS 12 // Sinus phase counter int part
+#define SIN_LBITS (26 - SIN_HBITS) // Sinus phase counter float part (best setting)
+
+#if (SIN_LBITS > 16)
+#define SIN_LBITS 16 // Can't be greater than 16 bits
+#endif
+
+#define ENV_HBITS 12 // Env phase counter int part
+#define ENV_LBITS (28 - ENV_HBITS) // Env phase counter float part (best setting)
+
+#define LFO_HBITS 10 // LFO phase counter int part
+#define LFO_LBITS (28 - LFO_HBITS) // LFO phase counter float part (best setting)
+
+#define SIN_LENGHT (1 << SIN_HBITS)
+#define ENV_LENGHT (1 << ENV_HBITS)
+#define LFO_LENGHT (1 << LFO_HBITS)
+
+#define TL_LENGHT (ENV_LENGHT * 3) // Env + TL scaling + LFO
+
+#define SIN_MASK (SIN_LENGHT - 1)
+#define ENV_MASK (ENV_LENGHT - 1)
+#define LFO_MASK (LFO_LENGHT - 1)
+
+#define ENV_STEP (96.0 / ENV_LENGHT) // ENV_MAX = 96 dB
+
+#define ENV_ATTACK ((ENV_LENGHT * 0) << ENV_LBITS)
+#define ENV_DECAY ((ENV_LENGHT * 1) << ENV_LBITS)
+#define ENV_END ((ENV_LENGHT * 2) << ENV_LBITS)
+
+#define MAX_OUT_BITS (SIN_HBITS + SIN_LBITS + 2) // Modulation = -4 <--> +4
+#define MAX_OUT ((1 << MAX_OUT_BITS) - 1)
+
+#define PG_CUT_OFF ((int) (78.0 / ENV_STEP))
+//#define ENV_CUT_OFF ((int) (68.0 / ENV_STEP))
+
+#define AR_RATE 399128
+#define DR_RATE 5514396
+
+//#define AR_RATE 426136
+//#define DR_RATE (AR_RATE * 12)
+
+#define LFO_FMS_LBITS 9 // FIXED (LFO_FMS_BASE gives somethink as 1)
+#define LFO_FMS_BASE ((int) (0.05946309436 * 0.0338 * (double) (1 << LFO_FMS_LBITS)))
+
+#define S0 0 // Stupid typo of the YM2612
+#define S1 2
+#define S2 1
+#define S3 3
+
+struct tables_t
+{
+	short SIN_TAB SIN_LENGHT; // SINUS TABLE (offset into TL TABLE)
+	int LFOcnt; // LFO counter = compteur-frequence pour le LFO
+	int LFOinc; // LFO step counter = pas d'incrementation du compteur-frequence du LFO
+						// plus le pas est grand, plus la frequence est grande
+	unsigned int AR_TAB 128; // Attack rate table
+	unsigned int DR_TAB 96; // Decay rate table
+	unsigned int DT_TAB 8 32; // Detune table
+	unsigned int SL_TAB 16; // Substain level table
+	unsigned int NULL_RATE 32; // Table for NULL rate
+	int LFO_INC_TAB 8; // LFO step table
+	
+	short ENV_TAB 2 * ENV_LENGHT + 8; // ENV CURVE TABLE (attack & decay)
+	
+	short LFO_ENV_TAB LFO_LENGHT; // LFO AMS TABLE (adjusted for 11.8 dB)
+	short LFO_FREQ_TAB LFO_LENGHT; // LFO FMS TABLE
+	int TL_TAB TL_LENGHT * 2; // TOTAL LEVEL TABLE (positif and minus)
+	unsigned int DECAY_TO_ATTACK ENV_LENGHT; // Conversion from decay to attack phase
+	unsigned int FINC_TAB 2048; // Frequency step table
+};
+
+static const unsigned char DT_DEF_TAB 4 * 32 =
+{
+// FD = 0
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+// FD = 1
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2,
+ 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8,
+
+// FD = 2
+ 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5,
+ 5, 6, 6, 7, 8, 8, 9, 10, 11, 12, 13, 14, 16, 16, 16, 16,
+
+// FD = 3
+ 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7,
+ 8 , 8, 9, 10, 11, 12, 13, 14, 16, 17, 19, 20, 22, 22, 22, 22
+};
+
+static const unsigned char FKEY_TAB 16 =
+{ 
+	0, 0, 0, 0,
+	0, 0, 0, 1,
+	2, 3, 3, 3,
+	3, 3, 3, 3
+};
+
+static const unsigned char LFO_AMS_TAB 4 =
+{
+	31, 4, 1, 0
+};
+
+static const unsigned char LFO_FMS_TAB 8 =
+{
+	LFO_FMS_BASE * 0, LFO_FMS_BASE * 1,
+	LFO_FMS_BASE * 2, LFO_FMS_BASE * 3,
+	LFO_FMS_BASE * 4, LFO_FMS_BASE * 6,
+	LFO_FMS_BASE * 12, LFO_FMS_BASE * 24
+};
+
+inline void YM2612_Special_Update() { }
+
+struct Ym2612_Impl
+{
+	enum { channel_count = Ym2612_Emu::channel_count };
+	
+	state_t YM2612;
+	int mute_mask;
+	tables_t g;
+	
+	void KEY_ON( channel_t&, int );
+	void KEY_OFF( channel_t&, int );
+	int SLOT_SET( int, int );
+	int CHANNEL_SET( int, int );
+	int YM_SET( int, int );
+	
+	void set_rate( double sample_rate, double clock_factor );
+	void reset();
+	void write0( int addr, int data );
+	void write1( int addr, int data );
+	void run_timer( int );
+	void run( int pair_count, Ym2612_Emu::sample_t );
+};
+
+void Ym2612_Impl::KEY_ON( channel_t& ch, int nsl)
+{
+	slot_t *SL = &(ch.SLOT nsl); // on recupere le bon pointeur de slot
+	
+	if (SL->Ecurp == RELEASE) // la touche est-elle rel'chee ?
+	{
+		SL->Fcnt = 0;
+
+		// Fix Ecco 2 splash sound
+		
+		SL->Ecnt = (g.DECAY_TO_ATTACK g.ENV_TAB SL->Ecnt >> ENV_LBITS + ENV_ATTACK) & SL->ChgEnM;
+		SL->ChgEnM = ~0;
+
+// SL->Ecnt = g.DECAY_TO_ATTACK g.ENV_TAB SL->Ecnt >> ENV_LBITS + ENV_ATTACK;
+// SL->Ecnt = 0;
+
+		SL->Einc = SL->EincA;
+		SL->Ecmp = ENV_DECAY;
+		SL->Ecurp = ATTACK;
+	}
+}
+
+
+void Ym2612_Impl::KEY_OFF(channel_t& ch, int nsl)
+{
+	slot_t *SL = &(ch.SLOT nsl); // on recupere le bon pointeur de slot
+	
+	if (SL->Ecurp != RELEASE) // la touche est-elle appuyee ?
+	{
+		if (SL->Ecnt < ENV_DECAY) // attack phase ?
+		{
+			SL->Ecnt = (g.ENV_TAB SL->Ecnt >> ENV_LBITS << ENV_LBITS) + ENV_DECAY;
+		}
+
+		SL->Einc = SL->EincR;
+		SL->Ecmp = ENV_END;
+		SL->Ecurp = RELEASE;
+	}
+}
+
+
+int Ym2612_Impl::SLOT_SET( int Adr, int data )
+{
+	int nch = Adr & 3;
+	if ( nch == 3 )
+		return 1;
+	
+	channel_t& ch = YM2612.CHANNEL nch + (Adr & 0x100 ? 3 : 0);
+	slot_t& sl = ch.SLOT (Adr >> 2) & 3;
+
+	switch ( Adr & 0xF0 )
+	{
+		case 0x30:
+			if ( (sl.MUL = (data & 0x0F)) != 0 ) sl.MUL <<= 1;
+			else sl.MUL = 1;
+
+			sl.DT = (int*) g.DT_TAB (data >> 4) & 7;
+
+			ch.SLOT 0.Finc = -1;
+
+			break;
+
+		case 0x40:
+			sl.TL = data & 0x7F;
+
+			// SOR2 do a lot of TL adjustement and this fix R.Shinobi jump sound...
+			YM2612_Special_Update();
+
+#if ((ENV_HBITS - 7) < 0)
+			sl.TLL = sl.TL >> (7 - ENV_HBITS);
+#else
+			sl.TLL = sl.TL << (ENV_HBITS - 7);
+#endif
+
+			break;
+
+		case 0x50:
+			sl.KSR_S = 3 - (data >> 6);
+
+			ch.SLOT 0.Finc = -1;
+
+			if (data &= 0x1F) sl.AR = (int*) &g.AR_TAB data << 1;
+			else sl.AR = (int*) &g.NULL_RATE 0;
+
+			sl.EincA = sl.AR sl.KSR;
+			if (sl.Ecurp == ATTACK) sl.Einc = sl.EincA;
+			break;
+
+		case 0x60:
+			if ( (sl.AMSon = (data & 0x80)) != 0 ) sl.AMS = ch.AMS;
+			else sl.AMS = 31;
+
+			if (data &= 0x1F) sl.DR = (int*) &g.DR_TAB data << 1;
+			else sl.DR = (int*) &g.NULL_RATE 0;
+
+			sl.EincD = sl.DR sl.KSR;
+			if (sl.Ecurp == DECAY) sl.Einc = sl.EincD;
+			break;
+
+		case 0x70:
+			if (data &= 0x1F) sl.SR = (int*) &g.DR_TAB data << 1;
+			else sl.SR = (int*) &g.NULL_RATE 0;
+
+			sl.EincS = sl.SR sl.KSR;
+			if ((sl.Ecurp == SUBSTAIN) && (sl.Ecnt < ENV_END)) sl.Einc = sl.EincS;
+			break;
+
+		case 0x80:
+			sl.SLL = g.SL_TAB data >> 4;
+
+			sl.RR = (int*) &g.DR_TAB ((data & 0xF) << 2) + 2;
+
+			sl.EincR = sl.RR sl.KSR;
+			if ((sl.Ecurp == RELEASE) && (sl.Ecnt < ENV_END)) sl.Einc = sl.EincR;
+			break;
+
+		case 0x90:
+			// SSG-EG envelope shapes :
+			/*
+			 E At Al H
+			 
+			 1 0 0 0 \\\\
+			 1 0 0 1 \___
+			 1 0 1 0 \/\/
+			 1 0 1 1 \
+			 1 1 0 0 ////
+			 1 1 0 1 /
+			 1 1 1 0 /\/\
+			 1 1 1 1 /___
+			 
+			 E = SSG-EG enable
+			 At = Start negate
+			 Al = Altern
+			 H = Hold */
+
+	 if(data & 0x08) sl.SEG = data & 0x0F;
+	 else sl.SEG = 0;
+			break;
+	}
+
+	return 0;
+}
+
+
+int Ym2612_Impl::CHANNEL_SET( int Adr, int data )
+{
+	int num = Adr & 3;
+	if ( num == 3 )
+		return 1;
+	
+	channel_t& ch = YM2612.CHANNEL num + (Adr & 0x100 ? 3 : 0);
+	
+	switch ( Adr & 0xFC )
+	{
+		case 0xA0:
+			YM2612_Special_Update();
+
+			ch.FNUM 0 = (ch.FNUM 0 & 0x700) + data;
+			ch.KC 0 = (ch.FOCT 0 << 2) | FKEY_TAB ch.FNUM 0 >> 7;
+
+			ch.SLOT 0.Finc = -1;
+			break;
+
+		case 0xA4:
+			YM2612_Special_Update();
+
+			ch.FNUM 0 = (ch.FNUM 0 & 0x0FF) + ((data & 0x07) << 8);
+			ch.FOCT 0 = (data & 0x38) >> 3;
+			ch.KC 0 = (ch.FOCT 0 << 2) | FKEY_TAB ch.FNUM 0 >> 7;
+
+			ch.SLOT 0.Finc = -1;
+			break;
+
+		case 0xA8:
+			if ( Adr < 0x100 )
+			{
+				num++;
+
+				YM2612_Special_Update();
+
+				YM2612.CHANNEL 2.FNUM num = (YM2612.CHANNEL 2.FNUM num & 0x700) + data;
+				YM2612.CHANNEL 2.KC num = (YM2612.CHANNEL 2.FOCT num << 2) |
+						FKEY_TAB YM2612.CHANNEL 2.FNUM num >> 7;
+
+				YM2612.CHANNEL 2.SLOT 0.Finc = -1;
+			}
+			break;
+
+		case 0xAC:
+			if ( Adr < 0x100 )
+			{
+				num++;
+
+				YM2612_Special_Update();
+
+				YM2612.CHANNEL 2.FNUM num = (YM2612.CHANNEL 2.FNUM num & 0x0FF) + ((data & 0x07) << 8);
+				YM2612.CHANNEL 2.FOCT num = (data & 0x38) >> 3;
+				YM2612.CHANNEL 2.KC num = (YM2612.CHANNEL 2.FOCT num << 2) |
+						FKEY_TAB YM2612.CHANNEL 2.FNUM num >> 7;
+
+				YM2612.CHANNEL 2.SLOT 0.Finc = -1;
+			}
+			break;
+
+		case 0xB0:
+			if ( ch.ALGO != (data & 7) )
+			{
+				// Fix VectorMan 2 heli sound (level 1)
+				YM2612_Special_Update();
+
+				ch.ALGO = data & 7;
+				
+				ch.SLOT 0.ChgEnM = 0;
+				ch.SLOT 1.ChgEnM = 0;
+				ch.SLOT 2.ChgEnM = 0;
+				ch.SLOT 3.ChgEnM = 0;
+			}
+
+			ch.FB = 9 - ((data >> 3) & 7); // Real thing ?
+
+// if (ch.FB = ((data >> 3) & 7)) ch.FB = 9 - ch.FB; // Thunder force 4 (music stage 8), Gynoug, Aladdin bug sound...
+// else ch.FB = 31;
+			break;
+
+		case 0xB4: {
+			YM2612_Special_Update();
+			
+			ch.LEFT = 0 - ((data >> 7) & 1);
+			ch.RIGHT = 0 - ((data >> 6) & 1);
+			
+			ch.AMS = LFO_AMS_TAB (data >> 4) & 3;
+			ch.FMS = LFO_FMS_TAB data & 7;
+			
+			for ( int i = 0; i < 4; i++ )
+			{
+				slot_t& sl = ch.SLOT i;
+				sl.AMS = (sl.AMSon ? ch.AMS : 31);
+			}
+			break;
+		}
+	}
+	
+	return 0;
+}
+
+
+int Ym2612_Impl::YM_SET(int Adr, int data)
+{
+	switch ( Adr )
+	{
+		case 0x22:
+			if (data & 8) // LFO enable
+			{
+				// Cool Spot music 1, LFO modified severals time which
+				// distord the sound, have to check that on a real genesis...
+
+				g.LFOinc = g.LFO_INC_TAB data & 7;
+			}
+			else
+			{
+				g.LFOinc = g.LFOcnt = 0;
+			}
+			break;
+
+		case 0x24:
+			YM2612.TimerA = (YM2612.TimerA & 0x003) | (((int) data) << 2);
+
+			if (YM2612.TimerAL != (1024 - YM2612.TimerA) << 12)
+			{
+				YM2612.TimerAcnt = YM2612.TimerAL = (1024 - YM2612.TimerA) << 12;
+			}
+			break;
+
+		case 0x25:
+			YM2612.TimerA = (YM2612.TimerA & 0x3FC) | (data & 3);
+
+			if (YM2612.TimerAL != (1024 - YM2612.TimerA) << 12)
+			{
+				YM2612.TimerAcnt = YM2612.TimerAL = (1024 - YM2612.TimerA) << 12;
+			}
+			break;
+
+		case 0x26:
+			YM2612.TimerB = data;
+
+			if (YM2612.TimerBL != (256 - YM2612.TimerB) << (4 + 12))
+			{
+				YM2612.TimerBcnt = YM2612.TimerBL = (256 - YM2612.TimerB) << (4 + 12);
+			}
+			break;
+
+		case 0x27:
+			// Parametre divers
+			// b7 = CSM MODE
+			// b6 = 3 slot mode
+			// b5 = reset b
+			// b4 = reset a
+			// b3 = timer enable b
+			// b2 = timer enable a
+			// b1 = load b
+			// b0 = load a
+
+			if ((data ^ YM2612.Mode) & 0x40)
+			{
+				// We changed the channel 2 mode, so recalculate phase step
+				// This fix the punch sound in Street of Rage 2
+
+				YM2612_Special_Update();
+
+				YM2612.CHANNEL 2.SLOT 0.Finc = -1; // recalculate phase step
+			}
+
+// if ((data & 2) && (YM2612.Status & 2)) YM2612.TimerBcnt = YM2612.TimerBL;
+// if ((data & 1) && (YM2612.Status & 1)) YM2612.TimerAcnt = YM2612.TimerAL;
+
+// YM2612.Status &= (~data >> 4); // Reset du Status au cas ou c'est demande
+			YM2612.Status &= (~data >> 4) & (data >> 2); // Reset Status
+
+			YM2612.Mode = data;
+			break;
+
+		case 0x28: {
+			int nch = data & 3;
+			if ( nch == 3 )
+				return 1;
+			if ( data & 4 )
+				nch += 3;
+			channel_t& ch = YM2612.CHANNEL nch;
+
+			YM2612_Special_Update();
+
+			if (data & 0x10) KEY_ON(ch, S0); // On appuie sur la touche pour le slot 1
+			else KEY_OFF(ch, S0); // On rel'che la touche pour le slot 1
+			if (data & 0x20) KEY_ON(ch, S1); // On appuie sur la touche pour le slot 3
+			else KEY_OFF(ch, S1); // On rel'che la touche pour le slot 3
+			if (data & 0x40) KEY_ON(ch, S2); // On appuie sur la touche pour le slot 2
+			else KEY_OFF(ch, S2); // On rel'che la touche pour le slot 2
+			if (data & 0x80) KEY_ON(ch, S3); // On appuie sur la touche pour le slot 4
+			else KEY_OFF(ch, S3); // On rel'che la touche pour le slot 4
+			break;
+		}
+		
+		case 0x2B:
+			if (YM2612.DAC ^ (data & 0x80)) YM2612_Special_Update();
+
+			YM2612.DAC = data & 0x80; // activation/desactivation du DAC
+			break;
+	}
+	
+	return 0;
+}
+
+void Ym2612_Impl::set_rate( double sample_rate, double clock_rate )
+{
+	assert( sample_rate );
+	assert( !clock_rate || clock_rate > sample_rate );
+	
+	int i;
+
+	// 144 = 12 * (prescale * 2) = 12 * 6 * 2
+	// prescale set to 6 by default
+	
+	double Frequence = (clock_rate ? clock_rate / sample_rate / 144.0 : 1.0);
+	if ( fabs( Frequence - 1.0 ) < 0.0000001 )
+		Frequence = 1.0;
+	YM2612.TimerBase = int (Frequence * 4096.0);
+
+	// Tableau TL :
+	// 0 - 4095 = +output 4095 - ... = +output overflow (fill with 0)
+	// 12288 - 16383 = -output 16384 - ... = -output overflow (fill with 0)
+
+	for ( i = 0; i < TL_LENGHT; i++ )
+	{
+		if (i >= PG_CUT_OFF) // YM2612 cut off sound after 78 dB (14 bits output ?)
+		{
+			g.TL_TAB TL_LENGHT + i = g.TL_TAB i = 0;
+		}
+		else
+		{
+			// Decibel -> Voltage
+			g.TL_TAB i = int (MAX_OUT / pow( 10.0, ENV_STEP / 20.0f * i ));
+			g.TL_TAB TL_LENGHT + i = -g.TL_TAB i;
+		}
+	}
+	
+	// Tableau SIN :
+	// g.SIN_TAB x y = sin(x) * y; 
+	// x = phase and y = volume
+
+	g.SIN_TAB 0 = g.SIN_TAB SIN_LENGHT / 2 = PG_CUT_OFF;
+
+	for ( i = 1; i <= SIN_LENGHT / 4; i++ )
+	{
+		// Sinus in dB
+		double x = 20 * log10( 1 / sin( 2.0 * PI * i / SIN_LENGHT ) ); // convert to dB
+
+		int j = (int) (x / ENV_STEP); // Get TL range
+
+		if (j > PG_CUT_OFF) j = (int) PG_CUT_OFF;
+
+		g.SIN_TAB i = g.SIN_TAB (SIN_LENGHT / 2) - i = j;
+		g.SIN_TAB (SIN_LENGHT / 2) + i = g.SIN_TAB SIN_LENGHT - i = TL_LENGHT + j;
+	}
+
+	// Tableau LFO (LFO wav) :
+
+	for ( i = 0; i < LFO_LENGHT; i++ )
+	{
+		double x = 1 + sin( 2.0 * PI * i * (1.0 / LFO_LENGHT) ); // Sinus
+		x *= 11.8 / ENV_STEP / 2; // ajusted to MAX enveloppe modulation
+
+		g.LFO_ENV_TAB i = (int) x;
+
+		x = sin( 2.0 * PI * i * (1.0 / LFO_LENGHT) ); // Sinus
+		x *= (1 << (LFO_HBITS - 1)) - 1;
+
+		g.LFO_FREQ_TAB i = (int) x;
+	}
+
+	// Tableau Enveloppe :
+	// g.ENV_TAB 0 -> g.ENV_TAB ENV_LENGHT - 1 = attack curve
+	// g.ENV_TAB ENV_LENGHT -> g.ENV_TAB 2 * ENV_LENGHT - 1 = decay curve
+
+	for ( i = 0; i < ENV_LENGHT; i++ )
+	{
+		// Attack curve (x^8 - music level 2 Vectorman 2)
+		double x = pow( ((ENV_LENGHT - 1) - i) / (double) ENV_LENGHT, 8.0 );
+		x *= ENV_LENGHT;
+
+		g.ENV_TAB i = (int) x;
+
+		// Decay curve (just linear)
+		g.ENV_TAB ENV_LENGHT + i = i;
+	}
+	for ( i = 0; i < 8; i++ )
+		g.ENV_TAB i + ENV_LENGHT * 2 = 0;
+	
+	g.ENV_TAB ENV_END >> ENV_LBITS = ENV_LENGHT - 1; // for the stopped state
+	
+	// Tableau pour la conversion Attack -> Decay and Decay -> Attack
+	
+	int j = ENV_LENGHT - 1;
+	for ( i = 0; i < ENV_LENGHT; i++ )
+	{
+		while ( j && g.ENV_TAB j < i )
+			j--;
+
+		g.DECAY_TO_ATTACK i = j << ENV_LBITS;
+	}
+
+	// Tableau pour le Substain Level
+	
+	for ( i = 0; i < 15; i++ )
+	{
+		double x = i * 3 / ENV_STEP; // 3 and not 6 (Mickey Mania first music for test)
+
+		g.SL_TAB i = ((int) x << ENV_LBITS) + ENV_DECAY;
+	}
+
+	g.SL_TAB 15 = ((ENV_LENGHT - 1) << ENV_LBITS) + ENV_DECAY; // special case : volume off
+
+	// Tableau Frequency Step
+	{
+		// 0.5 because MUL = value * 2
+	#if SIN_LBITS + SIN_HBITS - (21 - 7) < 0
+		double const factor = 0.5 / (1 << ((21 - 7) - SIN_LBITS - SIN_HBITS)) * Frequence;
+	#else
+		double const factor = 0.5 * (1 << (SIN_LBITS + SIN_HBITS - (21 - 7))) * Frequence;
+	#endif
+		for ( i = 0; i < 2048; i++ )
+			g.FINC_TAB i = unsigned (i * factor);
+	}
+	
+	// Tableaux Attack & Decay Rate
+
+	for ( i = 0; i < 4; i++ )
+	{
+		g.AR_TAB i = 0;
+		g.DR_TAB i = 0;
+	}
+	
+	for ( i = 0; i < 60; i++ )
+	{
+		double x =
+				(1.0 + ((i & 3) * 0.25)) * // bits 0-1 : x1.00, x1.25, x1.50, x1.75
+				(ENV_LENGHT << ENV_LBITS) * // on ajuste pour le tableau g.ENV_TAB
+				Frequence *
+				(1 << (i >> 2)); // bits 2-5 : shift bits (x2^0 - x2^15) 
+		
+		g.AR_TAB i + 4 = (unsigned int) (x / AR_RATE);
+		g.DR_TAB i + 4 = (unsigned int) (x / DR_RATE);
+	}
+	
+	for ( i = 64; i < 96; i++ )
+	{
+		g.AR_TAB i = g.AR_TAB 63;
+		g.DR_TAB i = g.DR_TAB 63;
+
+		g.NULL_RATE i - 64 = 0;
+	}
+	
+	for ( i = 96; i < 128; i++ )
+		g.AR_TAB i = 0;
+	
+	// Tableau Detune
+	{
+	#if SIN_LBITS + SIN_HBITS - 21 < 0
+		double const factor = 1.0 / (1 << (21 - SIN_LBITS - SIN_HBITS)) * Frequence;
+	#else
+		double const factor = (1 << (SIN_LBITS + SIN_HBITS - 21)) * Frequence;
+	#endif
+		for ( i = 0; i < 4; i++ )
+		{
+			for ( int j = 0; j < 32; j++ )
+			{
+				double y = DT_DEF_TAB (i << 5) + j * factor;
+				
+				g.DT_TAB i + 0 j = (int) y;
+				g.DT_TAB i + 4 j = (int) -y;
+			}
+		}
+	}
+	
+	// Tableau LFO
+	g.LFO_INC_TAB 0 = unsigned (3.98 * (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
+	g.LFO_INC_TAB 1 = unsigned (5.56 * (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
+	g.LFO_INC_TAB 2 = unsigned (6.02 * (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
+	g.LFO_INC_TAB 3 = unsigned (6.37 * (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
+	g.LFO_INC_TAB 4 = unsigned (6.88 * (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
+	g.LFO_INC_TAB 5 = unsigned (9.63 * (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
+	g.LFO_INC_TAB 6 = unsigned (48.1 * (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
+	g.LFO_INC_TAB 7 = unsigned (72.2 * (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
+	
+	reset();
+}
+
+const char* Ym2612_Emu::set_rate( double sample_rate, double clock_rate )
+{
+	if ( !impl )
+	{
+		impl = (Ym2612_Impl*) malloc( sizeof *impl );
+		if ( !impl )
+			return "Out of memory";
+		impl->mute_mask = 0;
+	}
+	memset( &impl->YM2612, 0, sizeof impl->YM2612 );
+	
+	impl->set_rate( sample_rate, clock_rate );
+	
+	return 0;
+}
+
+Ym2612_Emu::~Ym2612_Emu()
+{
+	free( impl );
+}
+
+inline void Ym2612_Impl::write0( int opn_addr, int data )
+{
+	assert( (unsigned) data <= 0xFF );
+	
+	if ( opn_addr < 0x30 )
+	{
+		YM2612.REG 0 opn_addr = data;
+		YM_SET( opn_addr, data );
+	}
+	else if ( YM2612.REG 0 opn_addr != data )
+	{
+		YM2612.REG 0 opn_addr = data;
+		
+		if ( opn_addr < 0xA0 )
+			SLOT_SET( opn_addr, data );
+		else
+			CHANNEL_SET( opn_addr, data );
+	}
+}
+
+inline void Ym2612_Impl::write1( int opn_addr, int data )
+{
+	assert( (unsigned) data <= 0xFF );
+	
+	if ( opn_addr >= 0x30 && YM2612.REG 1 opn_addr != data )
+	{
+		YM2612.REG 1 opn_addr = data;
+
+		if ( opn_addr < 0xA0 )
+			SLOT_SET( opn_addr + 0x100, data );
+		else
+			CHANNEL_SET( opn_addr + 0x100, data );
+	}
+}
+
+void Ym2612_Emu::reset()
+{
+	impl->reset();
+}
+
+void Ym2612_Impl::reset()
+{
+	g.LFOcnt = 0;
+	YM2612.TimerA = 0;
+	YM2612.TimerAL = 0;
+	YM2612.TimerAcnt = 0;
+	YM2612.TimerB = 0;
+	YM2612.TimerBL = 0;
+	YM2612.TimerBcnt = 0;
+	YM2612.DAC = 0;
+
+	YM2612.Status = 0;
+
+	int i;
+	for ( i = 0; i < channel_count; i++ )
+	{
+		channel_t& ch = YM2612.CHANNEL i;
+		
+		ch.LEFT = ~0;
+		ch.RIGHT = ~0;
+		ch.ALGO = 0;
+		ch.FB = 31;
+		ch.FMS = 0;
+		ch.AMS = 0;
+
+		for ( int j = 0 ;j < 4 ; j++ )
+		{
+			ch.S0_OUT j = 0;
+			ch.FNUM j = 0;
+			ch.FOCT j = 0;
+			ch.KC j = 0;
+
+			ch.SLOT j.Fcnt = 0;
+			ch.SLOT j.Finc = 0;
+			ch.SLOT j.Ecnt = ENV_END; // Put it at the end of Decay phase...
+			ch.SLOT j.Einc = 0;
+			ch.SLOT j.Ecmp = 0;
+			ch.SLOT j.Ecurp = RELEASE;
+
+			ch.SLOT j.ChgEnM = 0;
+		}
+	}
+
+	for ( i = 0; i < 0x100; i++ )
+	{
+		YM2612.REG 0 i = -1;
+		YM2612.REG 1 i = -1;
+	}
+
+	for ( i = 0xB6; i >= 0xB4; i-- )
+	{
+		write0( i, 0xC0 );
+		write1( i, 0xC0 );
+	}
+
+	for ( i = 0xB2; i >= 0x22; i-- )
+	{
+		write0( i, 0 );
+		write1( i, 0 );
+	}
+	
+	write0( 0x2A, 0x80 );
+}
+
+void Ym2612_Emu::write0( int addr, int data )
+{
+	impl->write0( addr, data );
+}
+
+void Ym2612_Emu::write1( int addr, int data )
+{
+	impl->write1( addr, data );
+}
+
+void Ym2612_Emu::mute_voices( int mask ) { impl->mute_mask = mask; }
+
+static void update_envelope_( slot_t* sl )
+{
+	switch ( sl->Ecurp )
+	{
+	case 0:
+		// Env_Attack_Next
+		
+		// Verified with Gynoug even in HQ (explode SFX)
+		sl->Ecnt = ENV_DECAY;
+
+		sl->Einc = sl->EincD;
+		sl->Ecmp = sl->SLL;
+		sl->Ecurp = DECAY;
+		break;
+	
+	case 1:
+		// Env_Decay_Next
+		
+		// Verified with Gynoug even in HQ (explode SFX)
+		sl->Ecnt = sl->SLL;
+
+		sl->Einc = sl->EincS;
+		sl->Ecmp = ENV_END;
+		sl->Ecurp = SUBSTAIN;
+		break;
+	
+	case 2:
+		// Env_Substain_Next(slot_t *SL)
+		if(sl->SEG & 8) // SSG envelope type
+		{
+			if(sl->SEG & 1)
+			{
+				sl->Ecnt = ENV_END;
+				sl->Einc = 0;
+				sl->Ecmp = ENV_END + 1;
+			}
+			else
+			{
+				// re KEY ON
+
+				// SL->Fcnt = 0;
+				// SL->ChgEnM = 0xFFFFFFFF;
+
+				sl->Ecnt = 0;
+				sl->Einc = sl->EincA;
+				sl->Ecmp = ENV_DECAY;
+				sl->Ecurp = ATTACK;
+			}
+
+			sl->SEG ^= (sl->SEG & 2) << 1;
+
+			break;
+		}
+		// fall through
+	
+	case 3:
+		// Env_Release_Next
+		sl->Ecnt = ENV_END;
+		sl->Einc = 0;
+		sl->Ecmp = ENV_END + 1;
+		break;
+	
+	// default: no op
+	}
+}
+
+inline void update_envelope( slot_t& sl )
+{
+	int ecmp = sl.Ecmp;
+	if ( (sl.Ecnt += sl.Einc) >= ecmp )
+		update_envelope_( &sl );
+}
+
+template<int algo>
+struct ym2612_update_chan {
+	static void func( tables_t&, channel_t&, Ym2612_Emu::sample_t , int );
+};
+
+typedef void (*ym2612_update_chan_t)( tables_t&, channel_t&, Ym2612_Emu::sample_t*, int );
+
+template<int algo>
+void ym2612_update_chan<algo>::func( tables_t& g, channel_t& ch,
+		Ym2612_Emu::sample_t* buf, int length )
+{
+	int not_end = ch.SLOT S3.Ecnt - ENV_END;
+	
+	// algo is a compile-time constant, so all conditions based on it are resolved
+	// during compilation
+	
+	// special cases
+	if ( algo == 7 )
+		not_end |= ch.SLOT S0.Ecnt - ENV_END;
+	
+	if ( algo >= 5 )
+		not_end |= ch.SLOT S2.Ecnt - ENV_END;
+	
+	if ( algo >= 4 )
+		not_end |= ch.SLOT S1.Ecnt - ENV_END;
+	
+	int CH_S0_OUT_1 = ch.S0_OUT 1;
+	
+	int in0 = ch.SLOT S0.Fcnt;
+	int in1 = ch.SLOT S1.Fcnt;
+	int in2 = ch.SLOT S2.Fcnt;
+	int in3 = ch.SLOT S3.Fcnt;
+	
+	int YM2612_LFOinc = g.LFOinc;
+	int YM2612_LFOcnt = g.LFOcnt + YM2612_LFOinc;
+	
+	if ( !not_end )
+		return;
+	
+	do
+	{
+		// envelope
+		int const env_LFO = g.LFO_ENV_TAB YM2612_LFOcnt >> LFO_LBITS & LFO_MASK;
+		
+		short const* const ENV_TAB = g.ENV_TAB;
+		
+	#define CALC_EN( x ) \
+		int temp##x = ENV_TAB ch.SLOT S##x.Ecnt >> ENV_LBITS; \
+		int en##x; \
+		if (ch.SLOT S##x.SEG & 4) { \
+			if (temp##x > ENV_MASK) en##x = 0; \
+			else en##x = (temp##x ^ ENV_MASK) + ch.SLOT S##x.TLL + (env_LFO >> ch.SLOT S##x.AMS); \
+		} else en##x = temp##x + ch.SLOT S##x.TLL + (env_LFO >> ch.SLOT S##x.AMS);
+		
+		CALC_EN( 0 )
+		CALC_EN( 1 )
+		CALC_EN( 2 )
+		CALC_EN( 3 )
+		
+		int const* const TL_TAB = g.TL_TAB;
+		
+	#define SINT( i, o ) (TL_TAB g.SIN_TAB (i) + (o))
+		
+		// feedback
+		int CH_S0_OUT_0 = ch.S0_OUT 0;
+		{
+			int temp = in0 + ((CH_S0_OUT_0 + CH_S0_OUT_1) >> ch.FB);
+			CH_S0_OUT_1 = CH_S0_OUT_0;
+			CH_S0_OUT_0 = SINT( (temp >> SIN_LBITS) & SIN_MASK, en0 );
+		}
+		
+		int CH_OUTd;
+		if ( algo == 0 )
+		{
+			int temp = in1 + CH_S0_OUT_1;
+			temp = in2 + SINT( (temp >> SIN_LBITS) & SIN_MASK, en1 );
+			temp = in3 + SINT( (temp >> SIN_LBITS) & SIN_MASK, en2 );
+			CH_OUTd = SINT( (temp >> SIN_LBITS) & SIN_MASK, en3 );
+		}
+		else if ( algo == 1 )
+		{
+			int temp = in2 + CH_S0_OUT_1 + SINT( (in1 >> SIN_LBITS) & SIN_MASK, en1 );
+			temp = in3 + SINT( (temp >> SIN_LBITS) & SIN_MASK, en2 );
+			CH_OUTd = SINT( (temp >> SIN_LBITS) & SIN_MASK, en3 );
+		}
+		else if ( algo == 2 )
+		{
+			int temp = in2 + SINT( (in1 >> SIN_LBITS) & SIN_MASK, en1 );
+			temp = in3 + CH_S0_OUT_1 + SINT( (temp >> SIN_LBITS) & SIN_MASK, en2 );
+			CH_OUTd = SINT( (temp >> SIN_LBITS) & SIN_MASK, en3 );
+		}
+		else if ( algo == 3 )
+		{
+			int temp = in1 + CH_S0_OUT_1;
+			temp = in3 + SINT( (temp >> SIN_LBITS) & SIN_MASK, en1 ) +
+					SINT( (in2 >> SIN_LBITS) & SIN_MASK, en2 );
+			CH_OUTd = SINT( (temp >> SIN_LBITS) & SIN_MASK, en3 );
+		}
+		else if ( algo == 4 )
+		{
+			int temp = in3 + SINT( (in2 >> SIN_LBITS) & SIN_MASK, en2 );
+			CH_OUTd = SINT( (temp >> SIN_LBITS) & SIN_MASK, en3 ) +
+					SINT( ((in1 + CH_S0_OUT_1) >> SIN_LBITS) & SIN_MASK, en1 );
+			//DO_LIMIT
+		}
+		else if ( algo == 5 )
+		{
+			int temp = CH_S0_OUT_1;
+			CH_OUTd = SINT( ((in3 + temp) >> SIN_LBITS) & SIN_MASK, en3 ) +
+					SINT( ((in1 + temp) >> SIN_LBITS) & SIN_MASK, en1 ) +
+					SINT( ((in2 + temp) >> SIN_LBITS) & SIN_MASK, en2 );
+			//DO_LIMIT
+		}
+		else if ( algo == 6 )
+		{
+			CH_OUTd = SINT( (in3 >> SIN_LBITS) & SIN_MASK, en3 ) +
+					SINT( ((in1 + CH_S0_OUT_1) >> SIN_LBITS) & SIN_MASK, en1 ) +
+					SINT( (in2 >> SIN_LBITS) & SIN_MASK, en2 );
+			//DO_LIMIT
+		}
+		else if ( algo == 7 )
+		{
+			CH_OUTd = SINT( (in3 >> SIN_LBITS) & SIN_MASK, en3 ) +
+					SINT( (in1 >> SIN_LBITS) & SIN_MASK, en1 ) +
+					SINT( (in2 >> SIN_LBITS) & SIN_MASK, en2 ) + CH_S0_OUT_1;
+			//DO_LIMIT
+		}
+
+		CH_OUTd *= 3;		
+		CH_OUTd >>= MAX_OUT_BITS - output_bits + 2;
+		
+		// update phase
+		unsigned freq_LFO = ((g.LFO_FREQ_TAB YM2612_LFOcnt >> LFO_LBITS & LFO_MASK *
+				ch.FMS) >> (LFO_HBITS - 1 + 1)) + (1 << (LFO_FMS_LBITS - 1));
+		YM2612_LFOcnt += YM2612_LFOinc;
+		in0 += (ch.SLOT S0.Finc * freq_LFO) >> (LFO_FMS_LBITS - 1);
+		in1 += (ch.SLOT S1.Finc * freq_LFO) >> (LFO_FMS_LBITS - 1);
+		in2 += (ch.SLOT S2.Finc * freq_LFO) >> (LFO_FMS_LBITS - 1);
+		in3 += (ch.SLOT S3.Finc * freq_LFO) >> (LFO_FMS_LBITS - 1);
+		
+		int t0 = buf 0 + (CH_OUTd & ch.LEFT);
+		int t1 = buf 1 + (CH_OUTd & ch.RIGHT);
+		
+		update_envelope( ch.SLOT 0 );
+		update_envelope( ch.SLOT 1 );
+		update_envelope( ch.SLOT 2 );
+		update_envelope( ch.SLOT 3 );
+		
+		ch.S0_OUT 0 = CH_S0_OUT_0;
+		buf 0 = t0;
+		buf 1 = t1;
+		buf += 2;
+	}
+	while ( --length );
+	
+	ch.S0_OUT 1 = CH_S0_OUT_1;
+	
+	ch.SLOT S0.Fcnt = in0;
+	ch.SLOT S1.Fcnt = in1;
+	ch.SLOT S2.Fcnt = in2;
+	ch.SLOT S3.Fcnt = in3;
+}
+
+static const ym2612_update_chan_t UPDATE_CHAN 8 = {
+	&ym2612_update_chan<0>::func,
+	&ym2612_update_chan<1>::func,
+	&ym2612_update_chan<2>::func,
+	&ym2612_update_chan<3>::func,
+	&ym2612_update_chan<4>::func,
+	&ym2612_update_chan<5>::func,
+	&ym2612_update_chan<6>::func,
+	&ym2612_update_chan<7>::func
+};
+
+void Ym2612_Impl::run_timer( int length )
+{
+	int const step = 6;
+	int remain = length;
+	do
+	{
+		int n = step;
+		if ( n > remain )
+			n = remain;
+		remain -= n;
+		
+		int i = n * YM2612.TimerBase;
+		if (YM2612.Mode & 1) // Timer A ON ?
+		{
+	// if ((YM2612.TimerAcnt -= 14073) <= 0) // 13879=NTSC (old: 14475=NTSC 14586=PAL)
+			if ((YM2612.TimerAcnt -= i) <= 0)
+			{
+				// timer a overflow
+				
+				YM2612.Status |= (YM2612.Mode & 0x04) >> 2;
+				YM2612.TimerAcnt += YM2612.TimerAL;
+
+				if (YM2612.Mode & 0x80)
+				{
+					KEY_ON( YM2612.CHANNEL 2, 0 );
+					KEY_ON( YM2612.CHANNEL 2, 1 );
+					KEY_ON( YM2612.CHANNEL 2, 2 );
+					KEY_ON( YM2612.CHANNEL 2, 3 );
+				}
+			}
+		}
+
+		if (YM2612.Mode & 2) // Timer B ON ?
+		{
+	// if ((YM2612.TimerBcnt -= 14073) <= 0) // 13879=NTSC (old: 14475=NTSC 14586=PAL)
+			if ((YM2612.TimerBcnt -= i) <= 0)
+			{
+				// timer b overflow
+				YM2612.Status |= (YM2612.Mode & 0x08) >> 2;
+				YM2612.TimerBcnt += YM2612.TimerBL;
+			}
+		}
+	}
+	while ( remain > 0 );
+}
+
+void Ym2612_Impl::run( int pair_count, Ym2612_Emu::sample_t out )
+{
+	if ( pair_count <= 0 )
+		return;
+	
+	if ( YM2612.Mode & 3 )
+		run_timer( pair_count );
+	
+	// Mise à jour des pas des compteurs-frequences s'ils ont ete modifies
+	
+	for ( int chi = 0; chi < channel_count; chi++ )
+	{
+		channel_t& ch = YM2612.CHANNEL chi;
+		if ( ch.SLOT 0.Finc != -1 )
+			continue;
+		
+		int i2 = 0;
+		if ( chi == 2 && (YM2612.Mode & 0x40) )
+			i2 = 2;
+		
+		for ( int i = 0; i < 4; i++ )
+		{
+			// static int seq 4 = { 2, 1, 3, 0 };
+			// if ( i2 ) i2 = seq i;
+			
+			slot_t& sl = ch.SLOT i;
+			int finc = g.FINC_TAB ch.FNUM i2 >> (7 - ch.FOCT i2);
+			int ksr = ch.KC i2 >> sl.KSR_S; // keycode attenuation
+			sl.Finc = (finc + sl.DT ch.KC i2) * sl.MUL;
+			if (sl.KSR != ksr) // si le KSR a change alors
+			{ // les differents taux pour l'enveloppe sont mis à jour
+				sl.KSR = ksr;
+
+				sl.EincA = sl.AR ksr;
+				sl.EincD = sl.DR ksr;
+				sl.EincS = sl.SR ksr;
+				sl.EincR = sl.RR ksr;
+
+				if (sl.Ecurp == ATTACK)
+				{
+					sl.Einc = sl.EincA;
+				}
+				else if (sl.Ecurp == DECAY)
+				{
+					sl.Einc = sl.EincD;
+				}
+				else if (sl.Ecnt < ENV_END)
+				{
+					if (sl.Ecurp == SUBSTAIN)
+						sl.Einc = sl.EincS;
+					else if (sl.Ecurp == RELEASE)
+						sl.Einc = sl.EincR;
+				}
+			}
+			
+			if ( i2 )
+				i2 = (i2 ^ 2) ^ (i2 >> 1);
+		}
+	}
+	
+	for ( int i = 0; i < channel_count; i++ )
+	{
+		if ( !(mute_mask & (1 << i)) && (i != 5 || !YM2612.DAC) )
+			UPDATE_CHAN YM2612.CHANNEL i.ALGO( g, YM2612.CHANNEL i, out, pair_count );
+	}
+	
+	g.LFOcnt += g.LFOinc * pair_count;
+}
+
+void Ym2612_Emu::run( int pair_count, sample_t out ) { impl->run( pair_count, out ); }
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Ym2612_Emu_MAME.cpp Added

@@ -0,0 +1,97 @@
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#ifdef YM2612_EMU_CPP
+
+#include "Ym2612_Emu.h"
+
+extern "C" {
+#include "../vgmplay/VGMPlay/chips/mamedef.h"
+#include "../vgmplay/VGMPlay/chips/fm.h"
+}
+
+#include "blargg_errors.h"
+
+// Ym2612_Emu
+
+Ym2612_Emu::~Ym2612_Emu()
+{
+	if ( impl )
+		ym2612_shutdown( impl );
+}
+
+static uint8_t dummy = 0;
+
+const char* Ym2612_Emu::set_rate( double sample_rate, double clock_rate )
+{
+	if ( impl )
+	{
+		ym2612_shutdown( impl );
+		impl = 0;
+	}
+
+	if ( !clock_rate )
+		clock_rate = sample_rate * 144.;
+
+ impl = ym2612_init( 0, (int) (clock_rate + 0.5), (int) (sample_rate + 0.5), 0, 0, &dummy, 0 );
+	if ( !impl )
+		return blargg_err_memory;
+
+	return 0;
+}
+
+void Ym2612_Emu::reset()
+{
+	ym2612_reset_chip( impl );
+}
+
+static stream_sample_t* DUMMYBUF0x02 = {(stream_sample_t*)NULL, (stream_sample_t*)NULL};
+
+void Ym2612_Emu::write0( int addr, int data )
+{
+	ym2612_update_one( impl, DUMMYBUF, 0 );
+	ym2612_write( impl, 0, addr );
+	ym2612_write( impl, 1, data );
+}
+
+void Ym2612_Emu::write1( int addr, int data )
+{
+	ym2612_update_one( impl, DUMMYBUF, 0 );
+	ym2612_write( impl, 2, addr );
+	ym2612_write( impl, 3, data );
+}
+
+void Ym2612_Emu::mute_voices( int mask )
+{
+	ym2612_set_mutemask( impl, mask );
+}
+
+void Ym2612_Emu::run( int pair_count, sample_t* out )
+{
+	stream_sample_t bufL 1024 ;
+	stream_sample_t bufR 1024 ;
+	stream_sample_t * buffers2 = { bufL, bufR };
+
+	while (pair_count > 0)
+	{
+		int todo = pair_count;
+		if (todo > 1024) todo = 1024;
+		ym2612_update_one( impl, buffers, todo );
+
+		for (int i = 0; i < todo; i++)
+		{
+			int output_l = bufL i;
+			int output_r = bufR i;
+			output_l += out 0;
+			output_r += out 1;
+			if ( (short)output_l != output_l ) output_l = 0x7FFF ^ ( output_l >> 31 );
+			if ( (short)output_r != output_r ) output_r = 0x7FFF ^ ( output_r >> 31 );
+			out 0 = output_l;
+			out 1 = output_r;
+			out += 2;
+		}
+
+		pair_count -= todo;
+	}
+}
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Z80_Cpu.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Z80_Cpu.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Z80_Cpu.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Z80_Cpu.h Changed

@@ -1,122 +1,122 @@
-// Z80 CPU emulator
-
-// Game_Music_Emu 0.6-pre
-#ifndef Z80_CPU_H
-#define Z80_CPU_H
-
-#include "blargg_endian.h"
-
-class Z80_Cpu {
-public:
-	typedef int time_t;
-	typedef int addr_t;
-	typedef BOOST::uint8_t byte;
-	
-	// Clears registers and maps all pages to unmapped
-	void reset( void* unmapped_write, void const* unmapped_read );
-	
-	// TODO: split mapping out of CPU
-	
-	// Maps memory. Start and size must be multiple of page_size.
-	enum { page_bits = 10 };
-	enum { page_size = 1 << page_bits };
-	void map_mem( addr_t addr, int size, void* write, void const* read );
-	void map_mem( addr_t addr, int size, void* read_write );
-	
-	// Maps address to pointer to that byte
-	byte * write( addr_t addr );
-	byte const* read( addr_t addr );
-	
-	// Time of beginning of next instruction
-	time_t time() const { return cpu_state->time + cpu_state->base; }
-	
-	// Alter current time
-	void set_time( time_t t ) { cpu_state->time = t - cpu_state->base; }
-	void adjust_time( int delta ) { cpu_state->time += delta; }
-	
-	#if BLARGG_BIG_ENDIAN
-		struct regs_t { byte b,c, d,e, h,l, flags,a; };
-	#else
-		struct regs_t { byte c,b, e,d, l,h, a,flags; };
-	#endif
-	BLARGG_STATIC_ASSERT( sizeof (regs_t) == 8 );
-	
-	struct pairs_t { BOOST::uint16_t bc, de, hl, fa; };
-	
-	// Registers are not updated until run() returns
-	struct registers_t {
-		BOOST::uint16_t pc;
-		BOOST::uint16_t sp;
-		BOOST::uint16_t ix;
-		BOOST::uint16_t iy;
-		union {
-			regs_t b; // b.b, b.c, b.d, b.e, b.h, b.l, b.flags, b.a
-			pairs_t w; // w.bc, w.de, w.hl. w.fa
-		};
-		union {
-			regs_t b;
-			pairs_t w;
-		} alt;
-		byte iff1;
-		byte iff2;
-		byte r;
-		byte i;
-		byte im;
-	};
-	//registers_t r; (below for efficiency)
-	
-	// can read this far past end of memory
-	enum { cpu_padding = 0x100 };
-	
-	// Can read this many bytes past end of a page
-	enum { page_padding = 4 };
-	
-	void set_end_time( time_t t );
-public:
-	Z80_Cpu();
-	
-	enum { page_count = 0x10000 / page_size };
-	byte szpc 0x200;
-	time_t end_time_;
-	struct cpu_state_t {
-		byte const* read page_count + 1;
-		byte * write page_count + 1;
-		time_t base;
-		time_t time;
-	};
-	cpu_state_t* cpu_state; // points to cpu_state_ or a local copy within run()
-	cpu_state_t cpu_state_;
-	void set_page( int i, void* write, void const* read );
-public:
-	registers_t r;
-};
-
-#if BLARGG_NONPORTABLE
-	#define Z80_CPU_OFFSET( addr ) (addr)
-#else
-	#define Z80_CPU_OFFSET( addr ) ((addr) & (Z80_Cpu::page_size - 1))
-#endif
-
-inline Z80_Cpu::byte* Z80_Cpu::write( addr_t addr )
-{
-	return cpu_state->write (unsigned) addr >> page_bits + Z80_CPU_OFFSET( addr );
-}
-
-inline Z80_Cpu::byte const* Z80_Cpu::read( addr_t addr )
-{
-	return cpu_state->read (unsigned) addr >> page_bits + Z80_CPU_OFFSET( addr );
-}
-
-inline void Z80_Cpu::map_mem( addr_t addr, int size, void* p )
-{
-	map_mem( addr, size, p, p );
-}
-
-inline void Z80_Cpu::set_end_time( time_t t )
-{
-	time_t delta = cpu_state->base - t;
-	cpu_state->base = t;
-	cpu_state->time += delta;
-}
-
-#endif
+// Z80 CPU emulator
+
+// $package
+#ifndef Z80_CPU_H
+#define Z80_CPU_H
+
+#include "blargg_endian.h"
+
+class Z80_Cpu {
+public:
+	typedef int time_t;
+	typedef int addr_t;
+	typedef BOOST::uint8_t byte;
+	
+	// Clears registers and maps all pages to unmapped
+	void reset( void* unmapped_write, void const* unmapped_read );
+	
+	// TODO: split mapping out of CPU
+	
+	// Maps memory. Start and size must be multiple of page_size.
+	enum { page_bits = 10 };
+	enum { page_size = 1 << page_bits };
+	void map_mem( addr_t addr, int size, void* write, void const* read );
+	void map_mem( addr_t addr, int size, void* read_write );
+	
+	// Maps address to pointer to that byte
+	byte * write( addr_t addr );
+	byte const* read( addr_t addr );
+	
+	// Time of beginning of next instruction
+	time_t time() const { return cpu_state->time + cpu_state->base; }
+	
+	// Alter current time
+	void set_time( time_t t ) { cpu_state->time = t - cpu_state->base; }
+	void adjust_time( int delta ) { cpu_state->time += delta; }
+	
+	#if BLARGG_BIG_ENDIAN
+		struct regs_t { byte b,c, d,e, h,l, flags,a; };
+	#else
+		struct regs_t { byte c,b, e,d, l,h, a,flags; };
+	#endif
+	BLARGG_STATIC_ASSERT( sizeof (regs_t) == 8 );
+	
+	struct pairs_t { BOOST::uint16_t bc, de, hl, fa; };
+	
+	// Registers are not updated until run() returns
+	struct registers_t {
+		BOOST::uint16_t pc;
+		BOOST::uint16_t sp;
+		BOOST::uint16_t ix;
+		BOOST::uint16_t iy;
+		union {
+			regs_t b; // b.b, b.c, b.d, b.e, b.h, b.l, b.flags, b.a
+			pairs_t w; // w.bc, w.de, w.hl. w.fa
+		};
+		union {
+			regs_t b;
+			pairs_t w;
+		} alt;
+		byte iff1;
+		byte iff2;
+		byte r;
+		byte i;
+		byte im;
+	};
+	//registers_t r; (below for efficiency)
+	
+	// can read this far past end of memory
+	enum { cpu_padding = 0x100 };
+	
+	// Can read this many bytes past end of a page
+	enum { page_padding = 4 };
+	
+	void set_end_time( time_t t );
+public:
+	Z80_Cpu();
+	
+	enum { page_count = 0x10000 / page_size };
+	byte szpc 0x200;
+	time_t end_time_;
+	struct cpu_state_t {
+		byte const* read page_count + 1;
+		byte * write page_count + 1;
+		time_t base;
+		time_t time;
+	};
+	cpu_state_t* cpu_state; // points to cpu_state_ or a local copy within run()
+	cpu_state_t cpu_state_;
+	void set_page( int i, void* write, void const* read );
+public:
+	registers_t r;
+};
+
+#if BLARGG_NONPORTABLE
+	#define Z80_CPU_OFFSET( addr ) (addr)
+#else
+	#define Z80_CPU_OFFSET( addr ) ((addr) & (Z80_Cpu::page_size - 1))
+#endif
+
+inline Z80_Cpu::byte* Z80_Cpu::write( addr_t addr )
+{
+	return cpu_state->write (unsigned) addr >> page_bits + Z80_CPU_OFFSET( addr );
+}
+
+inline Z80_Cpu::byte const* Z80_Cpu::read( addr_t addr )
+{
+	return cpu_state->read (unsigned) addr >> page_bits + Z80_CPU_OFFSET( addr );
+}
+
+inline void Z80_Cpu::map_mem( addr_t addr, int size, void* p )
+{
+	map_mem( addr, size, p, p );
+}
+
+inline void Z80_Cpu::set_end_time( time_t t )
+{
+	time_t delta = cpu_state->base - t;
+	cpu_state->base = t;
+	cpu_state->time += delta;
+}
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Z80_Cpu_run.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/Z80_Cpu_run.h Changed

@@ -1,1695 +1,1701 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-// Last validated with zexall 2009.12.05.
-// Doesn't implement the R register or immediate interrupt after EI.
-// Address wrap-around isn't completely correct, but is prevented from crashing emulator.
-// 16-bit memory accesses are made directly to mapped memory, instead of using macro.
-
-#if 0
-/* Define these macros in the source file before #including this file.
-- Parameters might be expressions, so they are best evaluated only once,
-though they NEVER have side-effects, so multiple evaluation is OK.
-- Output parameters might be a multiple-assignment expression like "a=x",
-so they must NOT be parenthesized.
-- Except where noted, time() and related functions will NOT work
-correctly inside a macro. TIME() is always correct, and between FLUSH_TIME() and
-CACHE_TIME() the normal time changing functions can be used.
-- Macros "returning" void may use a {} statement block. */
-
-	// 0 <= addr <= 0xFFFF + 0x100
-	// Optional; default uses whatever was set with map_mem()
-	int READ_MEM( addr_t );
-	void WRITE_MEM( addr_t, int data );
-	
-	// 0 <= port <= 0xFFFF (apparently upper 8 bits are output by hardware)
-	void OUT_PORT( int port, int data );
-	int IN_PORT int port );
-	
-	// Reference to Z80_Cpu object used for emulation
-	#define CPU cpu
-	
-// The following can be used within macros:
-	
-	// Current time
-	time_t TIME();
-	
-	// Allows use of time functions
-	void FLUSH_TIME();
-	
-	// Must be used before end of macro if FLUSH_TIME() was used earlier
-	void CACHE_TIME();
-
-// Configuration (optional; commented behavior if defined)
-	
-	// Optimizes as if map_mem( 0, 0x10000, FLAT_MEM, FLAT_MEM ) is always in effect
-	#define FLAT_MEM my_mem_array
-	
-	// If RST 7 ($FF) is encountered and PC = IDLE_ADDR, stops execution
-	#define IDLE_ADDR 0x1234
-	
-	// Expanded just before beginning of code, to help debugger
-	#define CPU_BEGIN void my_run_cpu() {
-	
-#endif
-
-/* Copyright (C) 2006-2008 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 CPU_BEGIN
-	CPU_BEGIN
-#endif
-
-#define R CPU.r
-
-// flags, named with hex value for clarity
-int const S80 = 0x80;
-int const Z40 = 0x40;
-int const F20 = 0x20;
-int const H10 = 0x10;
-int const F08 = 0x08;
-int const V04 = 0x04;
-int const P04 = 0x04;
-int const N02 = 0x02;
-int const C01 = 0x01;
-
-#define SZ28P( n ) CPU.szpc n
-#define SZ28PC( n ) CPU.szpc n
-#define SZ28C( n ) (CPU.szpc n & ~P04)
-#define SZ28( n ) SZ28C( n )
-
-#define SET_R( n ) (void) (R.r = n)
-#define GET_R() (R.r)
-
-// Time
-#define TIME() (s_time + s.base)
-#define FLUSH_TIME() {s.time = s_time;}
-#define CACHE_TIME() {s_time = s.time;}
-
-// Memory
-#define RW_MEM( addr, rw ) RW_PAGE( addr, rw ) RW_OFFSET( addr )
-#define READ_CODE( addr ) RW_MEM( addr, read )
-
-#ifdef FLAT_MEM
-	#define RW_PAGE( addr, rw ) FLAT_MEM
-	#define RW_OFFSET( addr ) (addr)
-	#define INSTR( off, addr ) READ_CODE( addr )
-#else
-	#define RW_PAGE( addr, rw ) s.rw (unsigned) (addr) >> Z80_Cpu::page_bits
-	#define RW_OFFSET( addr ) Z80_CPU_OFFSET( addr )
-	#define INSTR( off, addr ) instr off
-#endif
-
-#ifndef READ_MEM
-	#define READ_MEM( addr ) RW_MEM( addr, read )
-#endif
-	
-#ifndef WRITE_MEM
-	#define WRITE_MEM( addr, data ) (RW_MEM( addr, write ) = data)
-#endif
-
-#define READ_WORD( addr ) GET_LE16( &RW_MEM( addr, read ) )
-#define WRITE_WORD( addr, data ) SET_LE16( &RW_MEM( addr, write ), data )
-
-// Truncation
-#define BYTE( n ) ((BOOST::uint8_t ) (n)) /* (unsigned) n & 0xFF */
-#define SBYTE( n ) ((BOOST::int8_t ) (n)) /* (BYTE( n ) ^ 0x80) - 0x80 */
-#define WORD( n ) ((BOOST::uint16_t) (n)) /* (unsigned) n & 0xFFFF */
-
-// Misc
-#define CASE5( a, b, c, d, e ) case 0x##a:case 0x##b:case 0x##c:case 0x##d:case 0x##e
-#define CASE6( a, b, c, d, e, f ) CASE5( a, b, c, d, e ): case 0x##f
-#define CASE7( a, b, c, d, e, f, g ) CASE6( a, b, c, d, e, f ): case 0x##g
-#define CASE8( a, b, c, d, e, f, g, h ) CASE7( a, b, c, d, e, f, g ): case 0x##h
-
-#if BLARGG_BIG_ENDIAN
-	#define R8( n, offset ) ((r.r8_ - offset) n) 
-#elif BLARGG_LITTLE_ENDIAN
-	#define R8( n, offset ) ((r.r8_ - offset) (n) ^ 1) 
-#else
-	#error "Byte order of CPU must be known"
-#endif
-
-#define R16( n, shift, offset ) (r.r16_ ((unsigned) (n) >> shift) - (offset >> shift))
-
-#define EX( x, y ) \
-	{\
-		int temp = x;\
-		x = y;\
-		y = temp;\
-	}
-		
-#define EXX( name ) \
-	EX( R.alt.name, r.name )
-		
-bool warning = false;
-{
-	Z80_Cpu::cpu_state_t s;
-	#ifdef FLAT_MEM
-		s.base = CPU.cpu_state_.base;
-	#else
-		s = CPU.cpu_state_;
-	#endif
-	CPU.cpu_state = &s;
-	
-	
-	union r_t {
-		Z80_Cpu::regs_t b;
-		Z80_Cpu::pairs_t w;
-		byte r8_ 8; // indexed
-		BOOST::uint16_t r16_ 4;
-	} r;
-	r.b = R.b;
-	
-	Z80_Cpu::time_t s_time = CPU.cpu_state_.time;
-	int pc = R.pc;
-	int sp = R.sp;
-	int ix = R.ix; // TODO: keep in memory for direct access?
-	int iy = R.iy;
-	int flags = R.b.flags;
-	
-	//goto loop; // confuses optimizer
-	s_time += 7;
-	pc -= 2;
-	
-call_not_taken:
-	s_time -= 7; 
-jp_not_taken:
-	pc += 2;
-loop:
-	
-	check( (unsigned) pc < 0x10000 + 1 ); // +1 so emulator can catch wrap-around
-	check( (unsigned) sp < 0x10000 );
-	check( (unsigned) flags < 0x100 );
-	check( (unsigned) ix < 0x10000 );
-	check( (unsigned) iy < 0x10000 );
-	
-	byte const* instr = RW_PAGE( pc, read );
-	
-	int opcode;
-	
-	if ( RW_OFFSET( ~0 ) == ~0 )
-	{
-		opcode = instr RW_OFFSET( pc );
-		pc++;
-		instr += RW_OFFSET( pc );
-	}
-	else
-	{
-		instr += RW_OFFSET( pc );
-		opcode = *instr++;
-		pc++;
-	}
-	
-	static byte const clock_table 256 * 2 = {
-	// 0 1 2 3 4 5 6 7 8 9 A B C D E F
-		 4,10, 7, 6, 4, 4, 7, 4, 4,11, 7, 6, 4, 4, 7, 4, // 0
-		 8,10, 7, 6, 4, 4, 7, 4,12,11, 7, 6, 4, 4, 7, 4, // 1
-		 7,10,16, 6, 4, 4, 7, 4, 7,11,16, 6, 4, 4, 7, 4, // 2
-		 7,10,13, 6,11,11,10, 4, 7,11,13, 6, 4, 4, 7, 4, // 3
-		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // 4
-		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // 5
-		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // 6
-		 7, 7, 7, 7, 7, 7, 4, 7, 4, 4, 4, 4, 4, 4, 7, 4, // 7
-		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // 8
-		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // 9
-		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // A
-		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // B
-		11,10,10,10,17,11, 7,11,11,10,10, 8,17,17, 7,11, // C
-		11,10,10,11,17,11, 7,11,11, 4,10,11,17, 8, 7,11, // D
-		11,10,10,19,17,11, 7,11,11, 4,10, 4,17, 8, 7,11, // E
-		11,10,10, 4,17,11, 7,11,11, 6,10, 4,17, 8, 7,11, // F
-		
-		// high four bits are $ED time - 8, low four bits are $DD/$FD time - 8
-		//0 1 2 3 4 5 6 7 8 9 A B C D E F
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x06,0x0C,0x02,0x00,0x00,0x03,0x00,0x00,0x07,0x0C,0x02,0x00,0x00,0x03,0x00,
-		0x00,0x00,0x00,0x00,0x0F,0x0F,0x0B,0x00,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0x10,0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0x10,
-		0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0x10,0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0x10,
-		0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0xA0,0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0xA0,
-		0x4B,0x4B,0x7B,0xCB,0x0B,0x6B,0x00,0x0B,0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x0B,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0B,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x0B,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0B,0x00,
-		0x80,0x80,0x80,0x80,0x00,0x00,0x0B,0x00,0x80,0x80,0x80,0x80,0x00,0x00,0x0B,0x00,
-		0xD0,0xD0,0xD0,0xD0,0x00,0x00,0x0B,0x00,0xD0,0xD0,0xD0,0xD0,0x00,0x00,0x0B,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x06,0x00,0x0F,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,
-	};
-	
-	if ( s_time >= 0 )
-		goto out_of_time;
-	s_time += clock_table opcode;
-	
-	#ifdef Z80_CPU_LOG_H
-		//log_opcode( opcode, READ_CODE( pc ) );
-		z80_cpu_log( "log.txt", pc - 1, opcode, READ_CODE( pc ),
-				READ_CODE( pc + 1 ), READ_CODE( pc + 2 ) );
-		z80_log_regs( r.b.a, r.w.bc, r.w.de, r.w.hl, sp, ix, iy );
-	#endif
-	
-#define GET_ADDR() GET_LE16( &INSTR( 0, pc ) )
-
-	int data;
-	data = INSTR( 0, pc );
-	
-	switch ( opcode )
-	{
-// Common
-
-	case 0x00: // NOP
-	CASE7( 40, 49, 52, 5B, 64, 6D, 7F ): // LD B,B etc.
-		goto loop;
-	
-	case 0x08:{// EX AF,AF'
-		EXX( b.a );
-		EX( R.alt.b.flags, flags );
-		goto loop;
-	}
-	
-	case 0xD3: // OUT (imm),A
-		pc++;
-		OUT_PORT( (data + r.b.a * 0x100), r.b.a );
-		goto loop;
-		
-	case 0x2E: // LD L,imm
-		pc++;
-		r.b.l = data;
-		goto loop;
-	
-	case 0x3E: // LD A,imm
-		pc++;
-		r.b.a = data;
-		goto loop;
-	
-	case 0x3A:{// LD A,(addr)
-		int addr = GET_ADDR();
-		pc += 2;
-		r.b.a = READ_MEM( addr );
-		goto loop;
-	}
-	
-// Conditional
-
-#define ZERO (flags & Z40)
-#define CARRY (flags & C01)
-#define EVEN (flags & P04)
-#define MINUS (flags & S80)
-
-// JR
-// TODO: more efficient way to handle negative branch that wraps PC around
-#define JR_( cond, clocks ) {\
-	pc++;\
-	if ( !(cond) )\
-		goto loop;\
-	int offset = SBYTE( data );\
-	pc = WORD( pc + offset );\
-	s_time += clocks;\
-	goto loop;\
-}
-
-#define JR( cond ) JR_( cond, 5 )
-	
-	case 0x20: JR( !ZERO ) // JR NZ,disp
-	case 0x28: JR( ZERO ) // JR Z,disp
-	case 0x30: JR( !CARRY ) // JR NC,disp
-	case 0x38: JR( CARRY ) // JR C,disp
-	case 0x18: JR_( true,0) // JR disp
-
-	case 0x10:{// DJNZ disp
-		int temp = r.b.b - 1;
-		r.b.b = temp;
-		JR( temp )
-	}
-	
-// JP
-#define JP( cond ) \
-	if ( !(cond) )\
-		goto jp_not_taken;\
-	pc = GET_ADDR();\
-	goto loop;
-	
-	case 0xC2: JP( !ZERO ) // JP NZ,addr
-	case 0xCA: JP( ZERO ) // JP Z,addr
-	case 0xD2: JP( !CARRY ) // JP NC,addr
-	case 0xDA: JP( CARRY ) // JP C,addr
-	case 0xE2: JP( !EVEN ) // JP PO,addr
-	case 0xEA: JP( EVEN ) // JP PE,addr
-	case 0xF2: JP( !MINUS ) // JP P,addr
-	case 0xFA: JP( MINUS ) // JP M,addr
-	
-	case 0xC3: // JP addr
-		pc = GET_ADDR();
-		goto loop;
-	
-	case 0xE9: // JP HL
-		pc = r.w.hl;
-		goto loop;
-
-// RET
-#define RET( cond ) \
-	if ( cond )\
-		goto ret_taken;\
-	s_time -= 6;\
-	goto loop;
-	
-	case 0xC0: RET( !ZERO ) // RET NZ
-	case 0xC8: RET( ZERO ) // RET Z
-	case 0xD0: RET( !CARRY ) // RET NC
-	case 0xD8: RET( CARRY ) // RET C
-	case 0xE0: RET( !EVEN ) // RET PO
-	case 0xE8: RET( EVEN ) // RET PE
-	case 0xF0: RET( !MINUS ) // RET P
-	case 0xF8: RET( MINUS ) // RET M
-	
-	case 0xC9: // RET
-	ret_taken:
-		pc = READ_WORD( sp );
-		sp = WORD( sp + 2 );
-		goto loop;
-	
-// CALL
-#define CALL( cond ) \
-	if ( cond )\
-		goto call_taken;\
-	goto call_not_taken;
-
-	case 0xC4: CALL( !ZERO ) // CALL NZ,addr
-	case 0xCC: CALL( ZERO ) // CALL Z,addr
-	case 0xD4: CALL( !CARRY ) // CALL NC,addr
-	case 0xDC: CALL( CARRY ) // CALL C,addr
-	case 0xE4: CALL( !EVEN ) // CALL PO,addr
-	case 0xEC: CALL( EVEN ) // CALL PE,addr
-	case 0xF4: CALL( !MINUS ) // CALL P,addr
-	case 0xFC: CALL( MINUS ) // CALL M,addr
-	
-	case 0xCD:{// CALL addr
-	call_taken:
-		int addr = pc + 2;
-		pc = GET_ADDR();
-		sp = WORD( sp - 2 );
-		WRITE_WORD( sp, addr );
-		goto loop;
-	}
-	
-	case 0xFF: // RST
-		#ifdef IDLE_ADDR
-			if ( pc == IDLE_ADDR + 1 )
-				goto hit_idle_addr;
-		#else
-			if ( pc > 0x10000 )
-			{
-				pc = WORD( pc - 1 );
-				s_time -= 11;
-				goto loop;
-			}
-		#endif
-	CASE7( C7, CF, D7, DF, E7, EF, F7 ):
-		data = pc;
-		pc = opcode & 0x38;
-		#ifdef RST_BASE
-			pc += RST_BASE;
-		#endif
-		goto push_data;
-
-// PUSH/POP
-	case 0xF5: // PUSH AF
-		data = r.b.a * 0x100u + flags;
-		goto push_data;
-	
-	case 0xC5: // PUSH BC
-	case 0xD5: // PUSH DE
-	case 0xE5: // PUSH HL
-		data = R16( opcode, 4, 0xC5 );
-	push_data:
-		sp = WORD( sp - 2 );
-		WRITE_WORD( sp, data );
-		goto loop;
-	
-	case 0xF1: // POP AF
-		flags = READ_MEM( sp );
-		r.b.a = READ_MEM( (sp + 1) );
-		sp = WORD( sp + 2 );
-		goto loop;
-	
-	case 0xC1: // POP BC
-	case 0xD1: // POP DE
-	case 0xE1: // POP HL
-		R16( opcode, 4, 0xC1 ) = READ_WORD( sp );
-		sp = WORD( sp + 2 );
-		goto loop;
-	
-// ADC/ADD/SBC/SUB
-	case 0x96: // SUB (HL)
-	case 0x86: // ADD (HL)
-		flags &= ~C01;
-	case 0x9E: // SBC (HL)
-	case 0x8E: // ADC (HL)
-		data = READ_MEM( r.w.hl );
-		goto adc_data;
-	
-	case 0xD6: // SUB A,imm
-	case 0xC6: // ADD imm
-		flags &= ~C01;
-	case 0xDE: // SBC A,imm
-	case 0xCE: // ADC imm
-		pc++;
-		goto adc_data;
-	
-	CASE7( 90, 91, 92, 93, 94, 95, 97 ): // SUB r
-	CASE7( 80, 81, 82, 83, 84, 85, 87 ): // ADD r
-		flags &= ~C01;
-	CASE7( 98, 99, 9A, 9B, 9C, 9D, 9F ): // SBC r
-	CASE7( 88, 89, 8A, 8B, 8C, 8D, 8F ): // ADC r
-		data = R8( opcode & 7, 0 );
-	adc_data: {
-		int result = data + (flags & C01);
-		data ^= r.b.a;
-		flags = opcode >> 3 & N02; // bit 4 is set in subtract opcodes
-		if ( flags )
-			result = -result;
-		result += r.b.a;
-		data ^= result;
-		flags +=(data & H10) +
-				((data + 0x80) >> 6 & V04) +
-				SZ28C( result & 0x1FF );
-		r.b.a = result;
-		goto loop;
-	}
-
-// CP
-	case 0xBE: // CP (HL)
-		data = READ_MEM( r.w.hl );
-		goto cp_data;
-	
-	case 0xFE: // CP imm
-		pc++;
-		goto cp_data;
-	
-	CASE7( B8, B9, BA, BB, BC, BD, BF ): // CP r
-		data = R8( opcode, 0xB8 );
-	cp_data: {
-		int result = r.b.a - data;
-		flags = N02 + (data & (F20 | F08)) + (result >> 8 & C01);
-		data ^= r.b.a;
-		flags +=(((result ^ r.b.a) & data) >> 5 & V04) +
-				(((data & H10) ^ result) & (S80 | H10));
-		if ( BYTE( result ) )
-			goto loop;
-		flags += Z40;
-		goto loop;
-	}
-	
-// ADD HL,r.w
-	
-	case 0x39: // ADD HL,SP
-		data = sp;
-		goto add_hl_data;
-	
-	case 0x09: // ADD HL,BC
-	case 0x19: // ADD HL,DE
-	case 0x29: // ADD HL,HL
-		data = R16( opcode, 4, 0x09 );
-	add_hl_data: {
-		int sum = r.w.hl + data;
-		data ^= r.w.hl;
-		r.w.hl = sum;
-		flags = (flags & (S80 | Z40 | V04)) +
-				(sum >> 16) +
-				(sum >> 8 & (F20 | F08)) +
-				((data ^ sum) >> 8 & H10);
-		goto loop;
-	}
-	
-	case 0x27:{// DAA
-		int a = r.b.a;
-		if ( a > 0x99 )
-			flags |= C01;
-		
-		int adjust = 0x60 * (flags & C01);
-		
-		if ( flags & H10 || (a & 0x0F) > 9 )
-			adjust += 0x06;
-		
-		if ( flags & N02 )
-			adjust = -adjust;
-		a += adjust;
-		
-		flags = (flags & (C01 | N02)) +
-				((r.b.a ^ a) & H10) +
-				SZ28P( BYTE( a ) );
-		r.b.a = a;
-		goto loop;
-	}
-	
-// INC/DEC
-	case 0x34: // INC (HL)
-		data = READ_MEM( r.w.hl ) + 1;
-		WRITE_MEM( r.w.hl, data );
-		goto inc_set_flags;
-	
-	CASE7( 04, 0C, 14, 1C, 24, 2C, 3C ): // INC r
-		data = ++R8( opcode >> 3, 0 );
-	inc_set_flags:
-		flags = (flags & C01) +
-				(((data & 0x0F) - 1) & H10) +
-				SZ28( BYTE( data ) );
-		if ( data != 0x80 )
-			goto loop;
-		flags += V04;
-		goto loop;
-	
-	case 0x35: // DEC (HL)
-		data = READ_MEM( r.w.hl ) - 1;
-		WRITE_MEM( r.w.hl, data );
-		goto dec_set_flags;
-	
-	CASE7( 05, 0D, 15, 1D, 25, 2D, 3D ): // DEC r
-		data = --R8( opcode >> 3, 0 );
-	dec_set_flags:
-		flags = (flags & C01) + N02 +
-				(((data & 0x0F) + 1) & H10) +
-				SZ28( BYTE( data ) );
-		if ( data != 0x7F )
-			goto loop;
-		flags += V04;
-		goto loop;
-
-	case 0x03: // INC BC
-	case 0x13: // INC DE
-	case 0x23: // INC HL
-		R16( opcode, 4, 0x03 )++;
-		goto loop;
-	
-	case 0x33: // INC SP
-		sp = WORD( sp + 1 );
-		goto loop;
-	
-	case 0x0B: // DEC BC
-	case 0x1B: // DEC DE
-	case 0x2B: // DEC HL
-		R16( opcode, 4, 0x0B )--;
-		goto loop;
-	
-	case 0x3B: // DEC SP
-		sp = WORD( sp - 1 );
-		goto loop;
-	
-// AND
-	case 0xA6: // AND (HL)
-		data = READ_MEM( r.w.hl );
-		goto and_data;
-	
-	case 0xE6: // AND imm
-		pc++;
-		goto and_data;
-	
-	CASE7( A0, A1, A2, A3, A4, A5, A7 ): // AND r
-		data = R8( opcode, 0xA0 );
-	and_data:
-		r.b.a &= data;
-		flags = SZ28P( r.b.a ) + H10;
-		goto loop;
-	
-// OR
-	case 0xB6: // OR (HL)
-		data = READ_MEM( r.w.hl );
-		goto or_data;
-	
-	case 0xF6: // OR imm
-		pc++;
-		goto or_data;
-	
-	CASE7( B0, B1, B2, B3, B4, B5, B7 ): // OR r
-		data = R8( opcode, 0xB0 );
-	or_data:
-		r.b.a |= data;
-		flags = SZ28P( r.b.a );
-		goto loop;
-
-// XOR
-	case 0xAE: // XOR (HL)
-		data = READ_MEM( r.w.hl );
-		goto xor_data;
-	
-	case 0xEE: // XOR imm
-		pc++;
-		goto xor_data;
-	
-	CASE7( A8, A9, AA, AB, AC, AD, AF ): // XOR r
-		data = R8( opcode, 0xA8 );
-	xor_data:
-		r.b.a ^= data;
-		flags = SZ28P( r.b.a );
-		goto loop;
-
-// LD
-	CASE7( 70, 71, 72, 73, 74, 75, 77 ): // LD (HL),r
-		WRITE_MEM( r.w.hl, R8( opcode, 0x70 ) );
-		goto loop;
-	
-	CASE6( 41, 42, 43, 44, 45, 47 ): // LD B,r
-	CASE6( 48, 4A, 4B, 4C, 4D, 4F ): // LD C,r
-	CASE6( 50, 51, 53, 54, 55, 57 ): // LD D,r
-	CASE6( 58, 59, 5A, 5C, 5D, 5F ): // LD E,r
-	CASE6( 60, 61, 62, 63, 65, 67 ): // LD H,r
-	CASE6( 68, 69, 6A, 6B, 6C, 6F ): // LD L,r
-	CASE6( 78, 79, 7A, 7B, 7C, 7D ): // LD A,r
-		R8( opcode >> 3 & 7, 0 ) = R8( opcode & 7, 0 );
-		goto loop;
-	
-	CASE5( 06, 0E, 16, 1E, 26 ): // LD r,imm
-		R8( opcode >> 3, 0 ) = data;
-		pc++;
-		goto loop;
-	
-	case 0x36: // LD (HL),imm
-		pc++;
-		WRITE_MEM( r.w.hl, data );
-		goto loop;
-	
-	CASE7( 46, 4E, 56, 5E, 66, 6E, 7E ): // LD r,(HL)
-		R8( opcode >> 3, 8 ) = READ_MEM( r.w.hl );
-		goto loop;
-	
-	case 0x01: // LD r.w,imm
-	case 0x11:
-	case 0x21:
-		R16( opcode, 4, 0x01 ) = GET_ADDR();
-		pc += 2;
-		goto loop;
-	
-	case 0x31: // LD sp,imm
-		sp = GET_ADDR();
-		pc += 2;
-		goto loop;
-	
-	case 0x2A:{// LD HL,(addr)
-		int addr = GET_ADDR();
-		pc += 2;
-		r.w.hl = READ_WORD( addr );
-		goto loop;
-	}
-	
-	case 0x32:{// LD (addr),A
-		int addr = GET_ADDR();
-		pc += 2;
-		WRITE_MEM( addr, r.b.a );
-		goto loop;
-	}
-	
-	case 0x22:{// LD (addr),HL
-		int addr = GET_ADDR();
-		pc += 2;
-		WRITE_WORD( addr, r.w.hl );
-		goto loop;
-	}
-	
-	case 0x02: // LD (BC),A
-	case 0x12: // LD (DE),A
-		WRITE_MEM( R16( opcode, 4, 0x02 ), r.b.a );
-		goto loop;
-	
-	case 0x0A: // LD A,(BC)
-	case 0x1A: // LD A,(DE)
-		r.b.a = READ_MEM( R16( opcode, 4, 0x0A ) );
-		goto loop;
-	
-	case 0xF9: // LD SP,HL
-		sp = r.w.hl;
-		goto loop;
-	
-// Rotate
-	
-	case 0x07:{// RLCA
-		int temp = r.b.a;
-		temp = (temp << 1) + (temp >> 7);
-		flags = (flags & (S80 | Z40 | P04)) +
-				(temp & (F20 | F08 | C01));
-		r.b.a = temp;
-		goto loop;
-	}
-	
-	case 0x0F:{// RRCA
-		int temp = r.b.a;
-		flags = (flags & (S80 | Z40 | P04)) +
-				(temp & C01);
-		temp = (temp << 7) + (temp >> 1);
-		flags += temp & (F20 | F08);
-		r.b.a = temp;
-		goto loop;
-	}
-	
-	case 0x17:{// RLA
-		int temp = (r.b.a << 1) + (flags & C01);
-		flags = (flags & (S80 | Z40 | P04)) +
-				(temp & (F20 | F08)) +
-				(temp >> 8);
-		r.b.a = temp;
-		goto loop;
-	}
-	
-	case 0x1F:{// RRA
-		int temp = (flags << 7) + (r.b.a >> 1);
-		flags = (flags & (S80 | Z40 | P04)) +
-				(temp & (F20 | F08)) +
-				(r.b.a & C01);
-		r.b.a = temp;
-		goto loop;
-	}
-	
-// Misc
-	case 0x2F:{// CPL
-		int temp = ~r.b.a;
-		flags = (flags & (S80 | Z40 | P04 | C01)) +
-				(temp & (F20 | F08)) +
-				(H10 | N02);
-		r.b.a = temp;
-		goto loop;
-	}
-	
-	case 0x3F:{// CCF
-		flags = ((flags & (S80 | Z40 | P04 | C01)) ^ C01) +
-				(flags << 4 & H10) +
-				(r.b.a & (F20 | F08));
-		goto loop;
-	}
-	
-	case 0x37: // SCF
-		flags = (flags & (S80 | Z40 | P04)) | C01 +
-				(r.b.a & (F20 | F08));
-		goto loop;
-	
-	case 0xDB: // IN A,(imm)
-		pc++;
-		r.b.a = IN_PORT( (data + r.b.a * 0x100) );
-		goto loop;
-
-	case 0xE3:{// EX (SP),HL
-		int temp = READ_WORD( sp );
-		WRITE_WORD( sp, r.w.hl );
-		r.w.hl = temp;
-		goto loop;
-	}
-	
-	case 0xEB: // EX DE,HL
-		EX( r.w.hl, r.w.de );
-		goto loop;
-	
-	case 0xD9: // EXX DE,HL
-		EXX( w.bc );
-		EXX( w.de );
-		EXX( w.hl );
-		goto loop;
-	
-	case 0xF3: // DI
-		R.iff1 = 0;
-		R.iff2 = 0;
-		goto loop;
-	
-	case 0xFB: // EI
-		R.iff1 = 1;
-		R.iff2 = 1;
-		// TODO: delayed effect
-		goto loop;
-	
-	case 0x76: // HALT
-		goto halt;
-	
-//////////////////////////////////////// CB prefix
-	{
-	case 0xCB:
-		pc++;
-		switch ( data )
-		{
-	
-	// Rotate left
-		
-	#define RLC( read, write ) {\
-		int result = read;\
-		result = BYTE( result << 1 ) + (result >> 7);\
-		flags = SZ28P( result ) + (result & C01);\
-		write;\
-		goto loop;\
-	}
-		
-		case 0x06: // RLC (HL)
-			s_time += 7;
-			data = r.w.hl;
-		rlc_data_addr:
-			RLC( READ_MEM( data ), WRITE_MEM( data, result ) )
-		
-		CASE7( 00, 01, 02, 03, 04, 05, 07 ):{// RLC r
-			byte& reg = R8( data, 0 );
-			RLC( reg, reg = result )
-		}
-		
-	#define RL( read, write ) {\
-		int result = (read << 1) + (flags & C01);\
-		flags = SZ28PC( result );\
-		write;\
-		goto loop;\
-	}
-		
-		case 0x16: // RL (HL)
-			s_time += 7;
-			data = r.w.hl;
-		rl_data_addr:
-			RL( READ_MEM( data ), WRITE_MEM( data, result ) )
-		
-		CASE7( 10, 11, 12, 13, 14, 15, 17 ):{// RL r
-			byte& reg = R8( data, 0x10 );
-			RL( reg, reg = result )
-		}
-		
-	#define SLA( read, low_bit, write ) {\
-		int result = (read << 1) + low_bit;\
-		flags = SZ28PC( result );\
-		write;\
-		goto loop;\
-	}
-		
-		case 0x26: // SLA (HL)
-			s_time += 7;
-			data = r.w.hl;
-		sla_data_addr:
-			SLA( READ_MEM( data ), 0, WRITE_MEM( data, result ) )
-		
-		CASE7( 20, 21, 22, 23, 24, 25, 27 ):{// SLA r
-			byte& reg = R8( data, 0x20 );
-			SLA( reg, 0, reg = result )
-		}
-		
-		case 0x36: // SLL (HL)
-			s_time += 7;
-			data = r.w.hl;
-		sll_data_addr:
-			SLA( READ_MEM( data ), 1, WRITE_MEM( data, result ) )
-		
-		CASE7( 30, 31, 32, 33, 34, 35, 37 ):{// SLL r
-			byte& reg = R8( data, 0x30 );
-			SLA( reg, 1, reg = result )
-		}
-		
-	// Rotate right
-		
-	#define RRC( read, write ) {\
-		int result = read;\
-		flags = result & C01;\
-		result = BYTE( result << 7 ) + (result >> 1);\
-		flags += SZ28P( result );\
-		write;\
-		goto loop;\
-	}
-		
-		case 0x0E: // RRC (HL)
-			s_time += 7;
-			data = r.w.hl;
-		rrc_data_addr:
-			RRC( READ_MEM( data ), WRITE_MEM( data, result ) )
-		
-		CASE7( 08, 09, 0A, 0B, 0C, 0D, 0F ):{// RRC r
-			byte& reg = R8( data, 0x08 );
-			RRC( reg, reg = result )
-		}
-		
-	#define RR( read, write ) {\
-		int result = read;\
-		int temp = result & C01;\
-		result = BYTE( flags << 7 ) + (result >> 1);\
-		flags = SZ28P( result ) + temp;\
-		write;\
-		goto loop;\
-	}
-		
-		case 0x1E: // RR (HL)
-			s_time += 7;
-			data = r.w.hl;
-		rr_data_addr:
-			RR( READ_MEM( data ), WRITE_MEM( data, result ) )
-		
-		CASE7( 18, 19, 1A, 1B, 1C, 1D, 1F ):{// RR r
-			byte& reg = R8( data, 0x18 );
-			RR( reg, reg = result )
-		}
-		
-	#define SRA( read, write ) {\
-		int result = read;\
-		flags = result & C01;\
-		result = (result & 0x80) + (result >> 1);\
-		flags += SZ28P( result );\
-		write;\
-		goto loop;\
-	}
-		
-		case 0x2E: // SRA (HL)
-			data = r.w.hl;
-			s_time += 7;
-		sra_data_addr:
-			SRA( READ_MEM( data ), WRITE_MEM( data, result ) )
-		
-		CASE7( 28, 29, 2A, 2B, 2C, 2D, 2F ):{// SRA r
-			byte& reg = R8( data, 0x28 );
-			SRA( reg, reg = result )
-		}
-		
-	#define SRL( read, write ) {\
-		int result = read;\
-		flags = result & C01;\
-		result >>= 1;\
-		flags += SZ28P( result );\
-		write;\
-		goto loop;\
-	}
-		
-		case 0x3E: // SRL (HL)
-			s_time += 7;
-			data = r.w.hl;
-		srl_data_addr:
-			SRL( READ_MEM( data ), WRITE_MEM( data, result ) )
-		
-		CASE7( 38, 39, 3A, 3B, 3C, 3D, 3F ):{// SRL r
-			byte& reg = R8( data, 0x38 );
-			SRL( reg, reg = result )
-		}
-		
-	// BIT
-		{
-			int temp;
-		CASE8( 46, 4E, 56, 5E, 66, 6E, 76, 7E ): // BIT b,(HL)
-			s_time += 4;
-			temp = READ_MEM( r.w.hl );
-			flags &= C01;
-			goto bit_temp;
-		CASE7( 40, 41, 42, 43, 44, 45, 47 ): // BIT 0,r
-		CASE7( 48, 49, 4A, 4B, 4C, 4D, 4F ): // BIT 1,r
-		CASE7( 50, 51, 52, 53, 54, 55, 57 ): // BIT 2,r
-		CASE7( 58, 59, 5A, 5B, 5C, 5D, 5F ): // BIT 3,r
-		CASE7( 60, 61, 62, 63, 64, 65, 67 ): // BIT 4,r
-		CASE7( 68, 69, 6A, 6B, 6C, 6D, 6F ): // BIT 5,r
-		CASE7( 70, 71, 72, 73, 74, 75, 77 ): // BIT 6,r
-		CASE7( 78, 79, 7A, 7B, 7C, 7D, 7F ): // BIT 7,r
-			temp = R8( data & 7, 0 );
-			flags = (flags & C01) + (temp & (F20 | F08));
-		bit_temp:
-			temp = temp & (1 << (data >> 3 & 7));
-			flags += (temp & S80) + H10;
-			flags += (unsigned) --temp >> 8 & (Z40 | P04);
-			goto loop;
-		}
-		
-	// SET/RES
-		CASE8( 86, 8E, 96, 9E, A6, AE, B6, BE ): // RES b,(HL)
-		CASE8( C6, CE, D6, DE, E6, EE, F6, FE ):{// SET b,(HL)
-			s_time += 7;
-			int temp = READ_MEM( r.w.hl );
-			int bit = 1 << (data >> 3 & 7);
-			temp |= bit; // SET
-			if ( !(data & 0x40) )
-				temp ^= bit; // RES
-			WRITE_MEM( r.w.hl, temp );
-			goto loop;
-		}
-		
-		CASE7( C0, C1, C2, C3, C4, C5, C7 ): // SET 0,r
-		CASE7( C8, C9, CA, CB, CC, CD, CF ): // SET 1,r
-		CASE7( D0, D1, D2, D3, D4, D5, D7 ): // SET 2,r
-		CASE7( D8, D9, DA, DB, DC, DD, DF ): // SET 3,r
-		CASE7( E0, E1, E2, E3, E4, E5, E7 ): // SET 4,r
-		CASE7( E8, E9, EA, EB, EC, ED, EF ): // SET 5,r
-		CASE7( F0, F1, F2, F3, F4, F5, F7 ): // SET 6,r
-		CASE7( F8, F9, FA, FB, FC, FD, FF ): // SET 7,r
-			R8( data & 7, 0 ) |= 1 << (data >> 3 & 7);
-			goto loop;
-		
-		CASE7( 80, 81, 82, 83, 84, 85, 87 ): // RES 0,r
-		CASE7( 88, 89, 8A, 8B, 8C, 8D, 8F ): // RES 1,r
-		CASE7( 90, 91, 92, 93, 94, 95, 97 ): // RES 2,r
-		CASE7( 98, 99, 9A, 9B, 9C, 9D, 9F ): // RES 3,r
-		CASE7( A0, A1, A2, A3, A4, A5, A7 ): // RES 4,r
-		CASE7( A8, A9, AA, AB, AC, AD, AF ): // RES 5,r
-		CASE7( B0, B1, B2, B3, B4, B5, B7 ): // RES 6,r
-		CASE7( B8, B9, BA, BB, BC, BD, BF ): // RES 7,r
-			R8( data & 7, 0 ) &= ~(1 << (data >> 3 & 7));
-			goto loop;
-		}
-		assert( false );
-	}
-
-#undef GET_ADDR
-#define GET_ADDR() GET_LE16( &INSTR( 1, pc ) )
-
-//////////////////////////////////////// ED prefix
-	{
-	case 0xED:
-		pc++;
-		s_time += (clock_table + 256) data >> 4;
-		switch ( data )
-		{
-		{
-			int temp;
-		case 0x72: // SBC HL,SP
-		case 0x7A: // ADC HL,SP
-			temp = sp;
-			if ( 0 )
-		case 0x42: // SBC HL,BC
-		case 0x52: // SBC HL,DE
-		case 0x62: // SBC HL,HL
-		case 0x4A: // ADC HL,BC
-		case 0x5A: // ADC HL,DE
-		case 0x6A: // ADC HL,HL
-				temp = R16( data >> 3 & 6, 1, 0 );
-			int sum = temp + (flags & C01);
-			flags = ~data >> 2 & N02;
-			if ( flags )
-				sum = -sum;
-			sum += r.w.hl;
-			temp ^= r.w.hl;
-			temp ^= sum;
-			flags +=(sum >> 16 & C01) +
-					(temp >> 8 & H10) +
-					(sum >> 8 & (S80 | F20 | F08)) +
-					((temp + 0x8000) >> 14 & V04);
-			r.w.hl = sum;
-			if ( WORD( sum ) )
-				goto loop;
-			flags += Z40;
-			goto loop;
-		}
-		
-		CASE8( 40, 48, 50, 58, 60, 68, 70, 78 ):{// IN r,(C)
-			int temp = IN_PORT( r.w.bc );
-			R8( data >> 3, 8 ) = temp;
-			flags = (flags & C01) + SZ28P( temp );
-			goto loop;
-		}
-		
-		case 0x71: // OUT (C),0
-			r.b.flags = 0;
-		CASE7( 41, 49, 51, 59, 61, 69, 79 ): // OUT (C),r
-			OUT_PORT( r.w.bc, R8( data >> 3, 8 ) );
-			goto loop;
-		
-		{
-			int temp;
-		case 0x73: // LD (ADDR),SP
-			temp = sp;
-			if ( 0 )
-		case 0x43: // LD (ADDR),BC
-		case 0x53: // LD (ADDR),DE
-				temp = R16( data, 4, 0x43 );
-			int addr = GET_ADDR();
-			pc += 2;
-			WRITE_WORD( addr, temp );
-			goto loop;
-		}
-		
-		case 0x4B: // LD BC,(ADDR)
-		case 0x5B:{// LD DE,(ADDR)
-			int addr = GET_ADDR();
-			pc += 2;
-			R16( data, 4, 0x4B ) = READ_WORD( addr );
-			goto loop;
-		}
-		
-		case 0x7B:{// LD SP,(ADDR)
-			int addr = GET_ADDR();
-			pc += 2;
-			sp = READ_WORD( addr );
-			goto loop;
-		}
-		
-		case 0x67:{// RRD
-			int temp = READ_MEM( r.w.hl );
-			WRITE_MEM( r.w.hl, ((r.b.a << 4) + (temp >> 4)) );
-			temp = (r.b.a & 0xF0) + (temp & 0x0F);
-			flags = (flags & C01) + SZ28P( temp );
-			r.b.a = temp;
-			goto loop;
-		}
-		
-		case 0x6F:{// RLD
-			int temp = READ_MEM( r.w.hl );
-			WRITE_MEM( r.w.hl, ((temp << 4) + (r.b.a & 0x0F)) );
-			temp = (r.b.a & 0xF0) + (temp >> 4);
-			flags = (flags & C01) + SZ28P( temp );
-			r.b.a = temp;
-			goto loop;
-		}
-		
-		CASE8( 44, 4C, 54, 5C, 64, 6C, 74, 7C ): // NEG
-			opcode = 0x10; // flag to do SBC instead of ADC
-			flags &= ~C01;
-			data = r.b.a;
-			r.b.a = 0;
-			goto adc_data;
-		
-		{
-			int inc;
-		case 0xA9: // CPD
-		case 0xB9: // CPDR
-			inc = -1;
-			if ( 0 )
-		case 0xA1: // CPI
-		case 0xB1: // CPIR
-				inc = +1;
-			int addr = r.w.hl;
-			r.w.hl = addr + inc;
-			int temp = READ_MEM( addr );
-			
-			int result = r.b.a - temp;
-			flags = (flags & C01) + N02 +
-					((((temp ^ r.b.a) & H10) ^ result) & (S80 | H10));
-			
-			if ( !BYTE( result ) )
-				flags += Z40;
-			result -= (flags & H10) >> 4;
-			flags += result & F08;
-			flags += result << 4 & F20;
-			if ( !--r.w.bc )
-				goto loop;
-			
-			flags += V04;
-			if ( flags & Z40 || data < 0xB0 )
-				goto loop;
-			
-			pc -= 2;
-			s_time += 5;
-			goto loop;
-		}
-		
-		{
-			int inc;
-		case 0xA8: // LDD
-		case 0xB8: // LDDR
-			inc = -1;
-			if ( 0 )
-		case 0xA0: // LDI
-		case 0xB0: // LDIR
-				inc = +1;
-			int addr = r.w.hl;
-			r.w.hl = addr + inc;
-			int temp = READ_MEM( addr );
-			
-			addr = r.w.de;
-			r.w.de = addr + inc;
-			WRITE_MEM( addr, temp );
-			
-			temp += r.b.a;
-			flags = (flags & (S80 | Z40 | C01)) +
-					(temp & F08) + (temp << 4 & F20);
-			if ( !--r.w.bc )
-				goto loop;
-			
-			flags += V04;
-			if ( data < 0xB0 )
-				goto loop;
-			
-			pc -= 2;
-			s_time += 5;
-			goto loop;
-		}
-		
-		{
-			int inc;
-		case 0xAB: // OUTD
-		case 0xBB: // OTDR
-			inc = -1;
-			if ( 0 )
-		case 0xA3: // OUTI
-		case 0xB3: // OTIR
-				inc = +1;
-			int addr = r.w.hl;
-			r.w.hl = addr + inc;
-			int temp = READ_MEM( addr );
-			
-			int b = --r.b.b;
-			flags = (temp >> 6 & N02) + SZ28( b );
-			if ( b && data >= 0xB0 )
-			{
-				pc -= 2;
-				s_time += 5;
-			}
-			
-			OUT_PORT( r.w.bc, temp );
-			goto loop;
-		}
-		
-		{
-			int inc;
-		case 0xAA: // IND
-		case 0xBA: // INDR
-			inc = -1;
-			if ( 0 )
-		case 0xA2: // INI
-		case 0xB2: // INIR
-				inc = +1;
-			
-			int addr = r.w.hl;
-			r.w.hl = addr + inc;
-			
-			int temp = IN_PORT( r.w.bc );
-			
-			int b = --r.b.b;
-			flags = (temp >> 6 & N02) + SZ28( b );
-			if ( b && data >= 0xB0 )
-			{
-				pc -= 2;
-				s_time += 5;
-			}
-			
-			WRITE_MEM( addr, temp );
-			goto loop;
-		}
-		
-		case 0x47: // LD I,A
-			R.i = r.b.a;
-			goto loop;
-		
-		case 0x4F: // LD R,A
-			SET_R( r.b.a );
-			dprintf( "LD R,A not supported\n" );
-			warning = true;
-			goto loop;
-		
-		case 0x57: // LD A,I
-			r.b.a = R.i;
-			goto ld_ai_common;
-		
-		case 0x5F: // LD A,R
-			r.b.a = GET_R();
-			dprintf( "LD A,R not supported\n" );
-			warning = true;
-		ld_ai_common:
-			flags = (flags & C01) + SZ28( r.b.a ) + (R.iff2 << 2 & V04);
-			goto loop;
-		
-		CASE8( 45, 4D, 55, 5D, 65, 6D, 75, 7D ): // RETI/RETN
-			R.iff1 = R.iff2;
-			goto ret_taken;
-		
-		case 0x46: case 0x4E: case 0x66: case 0x6E: // IM 0
-			R.im = 0;
-			goto loop;
-		
-		case 0x56: case 0x76: // IM 1
-			R.im = 1;
-			goto loop;
-		
-		case 0x5E: case 0x7E: // IM 2
-			R.im = 2;
-			goto loop;
-		
-		default:
-			dprintf( "Opcode $ED $%02X not supported\n", data );
-			warning = true;
-			goto loop;
-		}
-		assert( false );
-	}
-
-//////////////////////////////////////// DD/FD prefix
-	{
-	int ixy;
-	case 0xDD:
-		ixy = ix;
-		goto ix_prefix;
-	case 0xFD:
-		ixy = iy;
-	ix_prefix:
-		pc++;
-		int data2 = READ_CODE( pc );
-		s_time += (clock_table + 256) data & 0x0F;
-		switch ( data )
-		{
-	// TODO: more efficient way of avoid negative address
-	// TODO: avoid using this as argument to READ_MEM() since it is evaluated twice
-	#define IXY_DISP( ixy, disp ) WORD( (ixy ) + (disp))
-	
-	#define SET_IXY( in ) if ( opcode == 0xDD ) ix = in; else iy = in;
-	
-	// ADD/ADC/SUB/SBC
-	
-		case 0x96: // SUB (IXY+disp)
-		case 0x86: // ADD (IXY+disp)
-			flags &= ~C01;
-		case 0x9E: // SBC (IXY+disp)
-		case 0x8E: // ADC (IXY+disp)
-			pc++;
-			opcode = data;
-			data = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
-			goto adc_data;
-		
-		case 0x94: // SUB HXY
-		case 0x84: // ADD HXY
-			flags &= ~C01;
-		case 0x9C: // SBC HXY
-		case 0x8C: // ADC HXY
-			opcode = data;
-			data = ixy >> 8;
-			goto adc_data;
-		
-		case 0x95: // SUB LXY
-		case 0x85: // ADD LXY
-			flags &= ~C01;
-		case 0x9D: // SBC LXY
-		case 0x8D: // ADC LXY
-			opcode = data;
-			data = BYTE( ixy );
-			goto adc_data;
-		
-		{
-			int temp;
-		case 0x39: // ADD IXY,SP
-			temp = sp;
-			goto add_ixy_data;
-		
-		case 0x29: // ADD IXY,HL
-			temp = ixy;
-			goto add_ixy_data;
-		
-		case 0x09: // ADD IXY,BC
-		case 0x19: // ADD IXY,DE
-			temp = R16( data, 4, 0x09 );
-		add_ixy_data: {
-			int sum = ixy + temp;
-			temp ^= ixy;
-			ixy = WORD( sum );
-			flags = (flags & (S80 | Z40 | V04)) +
-					(sum >> 16) +
-					(sum >> 8 & (F20 | F08)) +
-					((temp ^ sum) >> 8 & H10);
-			goto set_ixy;
-		}
-		}
-	
-	// AND
-		case 0xA6: // AND (IXY+disp)
-			pc++;
-			data = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
-			goto and_data;
-		
-		case 0xA4: // AND HXY
-			data = ixy >> 8;
-			goto and_data;
-		
-		case 0xA5: // AND LXY
-			data = BYTE( ixy );
-			goto and_data;
-	
-	// OR
-		case 0xB6: // OR (IXY+disp)
-			pc++;
-			data = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
-			goto or_data;
-		
-		case 0xB4: // OR HXY
-			data = ixy >> 8;
-			goto or_data;
-		
-		case 0xB5: // OR LXY
-			data = BYTE( ixy );
-			goto or_data;
-	
-	// XOR
-		case 0xAE: // XOR (IXY+disp)
-			pc++;
-			data = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
-			goto xor_data;
-		
-		case 0xAC: // XOR HXY
-			data = ixy >> 8;
-			goto xor_data;
-		
-		case 0xAD: // XOR LXY
-			data = BYTE( ixy );
-			goto xor_data;
-	
-	// CP
-		case 0xBE: // CP (IXY+disp)
-			pc++;
-			data = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
-			goto cp_data;
-		
-		case 0xBC: // CP HXY
-			data = ixy >> 8;
-			goto cp_data;
-		
-		case 0xBD: // CP LXY
-			data = BYTE( ixy );
-			goto cp_data;
-		
-	// LD
-		CASE7( 70, 71, 72, 73, 74, 75, 77 ): // LD (IXY+disp),r
-			data = R8( data, 0x70 );
-			if ( 0 )
-		case 0x36: // LD (IXY+disp),imm
-				pc++, data = READ_CODE( pc );
-			pc++;
-			WRITE_MEM( IXY_DISP( ixy, SBYTE( data2 ) ), data );
-			goto loop;
-
-		CASE5( 44, 4C, 54, 5C, 7C ): // LD r,HXY
-			R8( data >> 3, 8 ) = ixy >> 8;
-			goto loop;
-		
-		case 0x64: // LD HXY,HXY
-		case 0x6D: // LD LXY,LXY
-			goto loop;
-		
-		CASE5( 45, 4D, 55, 5D, 7D ): // LD r,LXY
-			R8( data >> 3, 8 ) = ixy;
-			goto loop;
-		
-		CASE7( 46, 4E, 56, 5E, 66, 6E, 7E ): // LD r,(IXY+disp)
-			pc++;
-			R8( data >> 3, 8 ) = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
-			goto loop;
-		
-		case 0x26: // LD HXY,imm
-			pc++;
-			goto ld_hxy_data;
-			
-		case 0x65: // LD HXY,LXY
-			data2 = BYTE( ixy );
-			goto ld_hxy_data;
-		
-		CASE5( 60, 61, 62, 63, 67 ): // LD HXY,r
-			data2 = R8( data, 0x60 );
-		ld_hxy_data:
-			ixy = BYTE( ixy ) + (data2 << 8);
-			goto set_ixy;
-		
-		case 0x2E: // LD LXY,imm
-			pc++;
-			goto ld_lxy_data;
-			
-		case 0x6C: // LD LXY,HXY
-			data2 = ixy >> 8;
-			goto ld_lxy_data;
-		
-		CASE5( 68, 69, 6A, 6B, 6F ): // LD LXY,r
-			data2 = R8( data, 0x68 );
-		ld_lxy_data:
-			ixy = (ixy & 0xFF00) + data2;
-		set_ixy:
-			if ( opcode == 0xDD )
-			{
-				ix = ixy;
-				goto loop;
-			}
-			iy = ixy;
-			goto loop;
-
-		case 0xF9: // LD SP,IXY
-			sp = ixy;
-			goto loop;
-	
-		case 0x22:{// LD (ADDR),IXY
-			int addr = GET_ADDR();
-			pc += 2;
-			WRITE_WORD( addr, ixy );
-			goto loop;
-		}
-		
-		case 0x21: // LD IXY,imm
-			ixy = GET_ADDR();
-			pc += 2;
-			goto set_ixy;
-		
-		case 0x2A:{// LD IXY,(addr)
-			int addr = GET_ADDR();
-			ixy = READ_WORD( addr );
-			pc += 2;
-			goto set_ixy;
-		}
-		
-	// DD/FD CB prefix
-		case 0xCB: {
-			data = IXY_DISP( ixy, SBYTE( data2 ) );
-			pc++;
-			data2 = READ_CODE( pc );
-			pc++;
-			switch ( data2 )
-			{
-			case 0x06: goto rlc_data_addr; // RLC (IXY)
-			case 0x16: goto rl_data_addr; // RL (IXY)
-			case 0x26: goto sla_data_addr; // SLA (IXY)
-			case 0x36: goto sll_data_addr; // SLL (IXY)
-			case 0x0E: goto rrc_data_addr; // RRC (IXY)
-			case 0x1E: goto rr_data_addr; // RR (IXY)
-			case 0x2E: goto sra_data_addr; // SRA (IXY)
-			case 0x3E: goto srl_data_addr; // SRL (IXY)
-			
-			CASE8( 46, 4E, 56, 5E, 66, 6E, 76, 7E ):{// BIT b,(IXY+disp)
-				int temp = READ_MEM( data );
-				temp = temp & (1 << (data2 >> 3 & 7));
-				flags = (flags & C01) + H10 + (temp & S80);
-				flags += (unsigned) --temp >> 8 & (Z40 | P04);
-				goto loop;
-			}
-			
-			CASE8( 86, 8E, 96, 9E, A6, AE, B6, BE ): // RES b,(IXY+disp)
-			CASE8( C6, CE, D6, DE, E6, EE, F6, FE ):{// SET b,(IXY+disp)
-				int temp = READ_MEM( data );
-				int bit = 1 << (data2 >> 3 & 7);
-				temp |= bit; // SET
-				if ( !(data2 & 0x40) )
-					temp ^= bit; // RES
-				WRITE_MEM( data, temp );
-				goto loop;
-			}
-			
-			default:
-				dprintf( "Opcode $%02X $CB $%02X not supported\n", opcode, data2 );
-				warning = true;
-				goto loop;
-			}
-			assert( false );
-		}
-		
-	// INC/DEC
-		case 0x23: // INC IXY
-			ixy = WORD( ixy + 1 );
-			goto set_ixy;
-		
-		case 0x2B: // DEC IXY
-			ixy = WORD( ixy - 1 );
-			goto set_ixy;
-		
-		case 0x34: // INC (IXY+disp)
-			ixy = IXY_DISP( ixy, SBYTE( data2 ) );
-			pc++;
-			data = READ_MEM( ixy ) + 1;
-			WRITE_MEM( ixy, data );
-			goto inc_set_flags;
-		
-		case 0x35: // DEC (IXY+disp)
-			ixy = IXY_DISP( ixy, SBYTE( data2 ) );
-			pc++;
-			data = READ_MEM( ixy ) - 1;
-			WRITE_MEM( ixy, data );
-			goto dec_set_flags;
-		
-		case 0x24: // INC HXY
-			ixy = WORD( ixy + 0x100 );
-			data = ixy >> 8;
-			goto inc_xy_common;
-		
-		case 0x2C: // INC LXY
-			data = BYTE( ixy + 1 );
-			ixy = (ixy & 0xFF00) + data;
-		inc_xy_common:
-			if ( opcode == 0xDD )
-			{
-				ix = ixy;
-				goto inc_set_flags;
-			}
-			iy = ixy;
-			goto inc_set_flags;
-		
-		case 0x25: // DEC HXY
-			ixy = WORD( ixy - 0x100 );
-			data = ixy >> 8;
-			goto dec_xy_common;
-		
-		case 0x2D: // DEC LXY
-			data = BYTE( ixy - 1 );
-			ixy = (ixy & 0xFF00) + data;
-		dec_xy_common:
-			if ( opcode == 0xDD )
-			{
-				ix = ixy;
-				goto dec_set_flags;
-			}
-			iy = ixy;
-			goto dec_set_flags;
-		
-	// PUSH/POP
-		case 0xE5: // PUSH IXY
-			data = ixy;
-			goto push_data;
-		
-		case 0xE1:{// POP IXY
-			ixy = READ_WORD( sp );
-			sp = WORD( sp + 2 );
-			goto set_ixy;
-		}
-	
-	// Misc
-		
-		case 0xE9: // JP (IXY)
-			pc = ixy;
-			goto loop;
-		
-		case 0xE3:{// EX (SP),IXY
-			int temp = READ_WORD( sp );
-			WRITE_WORD( sp, ixy );
-			ixy = temp;
-			goto set_ixy;
-		}
-		
-		default:
-			dprintf( "Unnecessary DD/FD prefix encountered\n" );
-			warning = true;
-			pc--;
-			goto loop;
-		}
-		assert( false );
-	}
-	
-	}
-	dprintf( "Unhandled main opcode: $%02X\n", opcode );
-	assert( false );
-	
-#ifdef IDLE_ADDR
-hit_idle_addr:
-	s_time -= 11;
-	goto out_of_time;
-#endif
-halt:
-	s_time &= 3; // increment by multiple of 4
-out_of_time:
-	pc--;
-	
-	r.b.flags = flags;
-	R.ix = ix;
-	R.iy = iy;
-	R.sp = sp;
-	R.pc = pc;
-	R.b = r.b;
-	
-	CPU.cpu_state_.base = s.base;
-	CPU.cpu_state_.time = s_time;
-	CPU.cpu_state = &CPU.cpu_state_;
-}
+// $package. http://www.slack.net/~ant/
+
+// Last validated with zexall 2009.12.05.
+// Doesn't implement the R register or immediate interrupt after EI.
+// Address wrap-around isn't completely correct, but is prevented from crashing emulator.
+// 16-bit memory accesses are made directly to mapped memory, instead of using macro.
+
+#if 0
+/* Define these macros in the source file before #including this file.
+- Parameters might be expressions, so they are best evaluated only once,
+though they NEVER have side-effects, so multiple evaluation is OK.
+- Output parameters might be a multiple-assignment expression like "a=x",
+so they must NOT be parenthesized.
+- Except where noted, time() and related functions will NOT work
+correctly inside a macro. TIME() is always correct, and between FLUSH_TIME() and
+CACHE_TIME() the normal time changing functions can be used.
+- Macros "returning" void may use a {} statement block. */
+
+ // 0 <= addr <= 0xFFFF + 0x100
+ // Optional; default uses whatever was set with map_mem()
+ int READ_CODE( addr_t );
+
+ // 0 <= addr <= 0xFFFF + 0x100
+	// Optional; default uses whatever was set with map_mem()
+	int READ_MEM( addr_t );
+	void WRITE_MEM( addr_t, int data );
+	
+	// 0 <= port <= 0xFFFF (apparently upper 8 bits are output by hardware)
+	void OUT_PORT( int port, int data );
+	int IN_PORT int port );
+
+	// Reference to Z80_Cpu object used for emulation
+	#define CPU cpu
+	
+// The following can be used within macros:
+	
+	// Current time
+	time_t TIME();
+	
+	// Allows use of time functions
+	void FLUSH_TIME();
+	
+	// Must be used before end of macro if FLUSH_TIME() was used earlier
+	void CACHE_TIME();
+
+// Configuration (optional; commented behavior if defined)
+	
+	// Optimizes as if map_mem( 0, 0x10000, FLAT_MEM, FLAT_MEM ) is always in effect
+ #define FLAT_MEM my_mem_array
+	
+	// If RST 7 ($FF) is encountered and PC = IDLE_ADDR, stops execution
+	#define IDLE_ADDR 0x1234
+	
+	// Expanded just before beginning of code, to help debugger
+	#define CPU_BEGIN void my_run_cpu() {
+	
+#endif
+
+/* Copyright (C) 2006-2008 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 CPU_BEGIN
+	CPU_BEGIN
+#endif
+
+#define R CPU.r
+
+// flags, named with hex value for clarity
+int const S80 = 0x80;
+int const Z40 = 0x40;
+int const F20 = 0x20;
+int const H10 = 0x10;
+int const F08 = 0x08;
+int const V04 = 0x04;
+int const P04 = 0x04;
+int const N02 = 0x02;
+int const C01 = 0x01;
+
+#define SZ28P( n ) CPU.szpc n
+#define SZ28PC( n ) CPU.szpc n
+#define SZ28C( n ) (CPU.szpc n & ~P04)
+#define SZ28( n ) SZ28C( n )
+
+#define SET_R( n ) (void) (R.r = n)
+#define GET_R() (R.r)
+
+// Time
+#define TIME() (s_time + s.base)
+#define FLUSH_TIME() {s.time = s_time;}
+#define CACHE_TIME() {s_time = s.time;}
+
+// Memory
+#define RW_MEM( addr, rw ) RW_PAGE( addr, rw ) RW_OFFSET( addr )
+#ifndef READ_CODE
+ #define READ_CODE( addr ) RW_MEM( addr, read )
+#endif
+
+#ifdef FLAT_MEM
+	#define RW_PAGE( addr, rw ) FLAT_MEM
+	#define RW_OFFSET( addr ) (addr)
+	#define INSTR( off, addr ) READ_CODE( addr )
+#else
+	#define RW_PAGE( addr, rw ) s.rw (unsigned) (addr) >> Z80_Cpu::page_bits
+	#define RW_OFFSET( addr ) Z80_CPU_OFFSET( addr )
+	#define INSTR( off, addr ) instr off
+#endif
+
+#ifndef READ_MEM
+	#define READ_MEM( addr ) RW_MEM( addr, read )
+#endif
+	
+#ifndef WRITE_MEM
+	#define WRITE_MEM( addr, data ) (RW_MEM( addr, write ) = data)
+#endif
+
+#define READ_WORD( addr ) GET_LE16( &RW_MEM( addr, read ) )
+#define WRITE_WORD( addr, data ) SET_LE16( &RW_MEM( addr, write ), data )
+
+// Truncation
+#define BYTE( n ) ((BOOST::uint8_t ) (n)) /* (unsigned) n & 0xFF */
+#define SBYTE( n ) ((BOOST::int8_t ) (n)) /* (BYTE( n ) ^ 0x80) - 0x80 */
+#define WORD( n ) ((BOOST::uint16_t) (n)) /* (unsigned) n & 0xFFFF */
+
+// Misc
+#define CASE5( a, b, c, d, e ) case 0x##a:case 0x##b:case 0x##c:case 0x##d:case 0x##e
+#define CASE6( a, b, c, d, e, f ) CASE5( a, b, c, d, e ): case 0x##f
+#define CASE7( a, b, c, d, e, f, g ) CASE6( a, b, c, d, e, f ): case 0x##g
+#define CASE8( a, b, c, d, e, f, g, h ) CASE7( a, b, c, d, e, f, g ): case 0x##h
+
+#if BLARGG_BIG_ENDIAN
+	#define R8( n, offset ) ((r.r8_ - offset) n) 
+#elif BLARGG_LITTLE_ENDIAN
+	#define R8( n, offset ) ((r.r8_ - offset) (n) ^ 1) 
+#else
+	#error "Byte order of CPU must be known"
+#endif
+
+#define R16( n, shift, offset ) (r.r16_ ((unsigned) (n) >> shift) - (offset >> shift))
+
+#define EX( x, y ) \
+	{\
+		int temp = x;\
+		x = y;\
+		y = temp;\
+	}
+		
+#define EXX( name ) \
+	EX( R.alt.name, r.name )
+		
+bool warning = false;
+{
+	Z80_Cpu::cpu_state_t s;
+	#ifdef FLAT_MEM
+		s.base = CPU.cpu_state_.base;
+	#else
+		s = CPU.cpu_state_;
+	#endif
+	CPU.cpu_state = &s;
+	
+	
+	union r_t {
+		Z80_Cpu::regs_t b;
+		Z80_Cpu::pairs_t w;
+		byte r8_ 8; // indexed
+		BOOST::uint16_t r16_ 4;
+	} r;
+	r.b = R.b;
+	
+	Z80_Cpu::time_t s_time = CPU.cpu_state_.time;
+	int pc = R.pc;
+	int sp = R.sp;
+	int ix = R.ix; // TODO: keep in memory for direct access?
+	int iy = R.iy;
+	int flags = R.b.flags;
+	
+	//goto loop; // confuses optimizer
+	s_time += 7;
+	pc -= 2;
+	
+call_not_taken:
+	s_time -= 7; 
+jp_not_taken:
+	pc += 2;
+loop:
+	
+	check( (unsigned) pc < 0x10000 + 1 ); // +1 so emulator can catch wrap-around
+	check( (unsigned) sp < 0x10000 );
+	check( (unsigned) flags < 0x100 );
+	check( (unsigned) ix < 0x10000 );
+	check( (unsigned) iy < 0x10000 );
+	
+ byte const* instr = RW_PAGE( pc, read );
+
+ int opcode;
+	
+ if ( RW_OFFSET( ~0 ) == ~0 )
+ {
+ opcode = instr RW_OFFSET( pc );
+ pc++;
+ instr += RW_OFFSET( pc );
+ }
+ else
+ {
+ instr += RW_OFFSET( pc );
+ opcode = *instr++;
+ pc++;
+ }
+
+ static byte const clock_table 256 * 2 = {
+	// 0 1 2 3 4 5 6 7 8 9 A B C D E F
+		 4,10, 7, 6, 4, 4, 7, 4, 4,11, 7, 6, 4, 4, 7, 4, // 0
+		 8,10, 7, 6, 4, 4, 7, 4,12,11, 7, 6, 4, 4, 7, 4, // 1
+		 7,10,16, 6, 4, 4, 7, 4, 7,11,16, 6, 4, 4, 7, 4, // 2
+		 7,10,13, 6,11,11,10, 4, 7,11,13, 6, 4, 4, 7, 4, // 3
+		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // 4
+		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // 5
+		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // 6
+		 7, 7, 7, 7, 7, 7, 4, 7, 4, 4, 4, 4, 4, 4, 7, 4, // 7
+		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // 8
+		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // 9
+		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // A
+		 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 7, 4, // B
+		11,10,10,10,17,11, 7,11,11,10,10, 8,17,17, 7,11, // C
+		11,10,10,11,17,11, 7,11,11, 4,10,11,17, 8, 7,11, // D
+		11,10,10,19,17,11, 7,11,11, 4,10, 4,17, 8, 7,11, // E
+		11,10,10, 4,17,11, 7,11,11, 6,10, 4,17, 8, 7,11, // F
+		
+		// high four bits are $ED time - 8, low four bits are $DD/$FD time - 8
+		//0 1 2 3 4 5 6 7 8 9 A B C D E F
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x06,0x0C,0x02,0x00,0x00,0x03,0x00,0x00,0x07,0x0C,0x02,0x00,0x00,0x03,0x00,
+		0x00,0x00,0x00,0x00,0x0F,0x0F,0x0B,0x00,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0x10,0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0x10,
+		0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0x10,0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0x10,
+		0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0xA0,0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0xA0,
+		0x4B,0x4B,0x7B,0xCB,0x0B,0x6B,0x00,0x0B,0x40,0x40,0x70,0xC0,0x00,0x60,0x0B,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x0B,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0B,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x0B,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0B,0x00,
+		0x80,0x80,0x80,0x80,0x00,0x00,0x0B,0x00,0x80,0x80,0x80,0x80,0x00,0x00,0x0B,0x00,
+		0xD0,0xD0,0xD0,0xD0,0x00,0x00,0x0B,0x00,0xD0,0xD0,0xD0,0xD0,0x00,0x00,0x0B,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x06,0x00,0x0F,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,
+	};
+	
+	if ( s_time >= 0 )
+		goto out_of_time;
+	s_time += clock_table opcode;
+	
+	#ifdef Z80_CPU_LOG_H
+		//log_opcode( opcode, READ_CODE( pc ) );
+		z80_cpu_log( "log.txt", pc - 1, opcode, READ_CODE( pc ),
+				READ_CODE( pc + 1 ), READ_CODE( pc + 2 ) );
+		z80_log_regs( r.b.a, r.w.bc, r.w.de, r.w.hl, sp, ix, iy );
+	#endif
+	
+#define GET_ADDR() GET_LE16( &INSTR( 0, pc ) )
+
+	int data;
+ data = INSTR( 0, pc );
+	
+	switch ( opcode )
+	{
+// Common
+
+	case 0x00: // NOP
+	CASE7( 40, 49, 52, 5B, 64, 6D, 7F ): // LD B,B etc.
+		goto loop;
+	
+	case 0x08:{// EX AF,AF'
+		EXX( b.a );
+		EX( R.alt.b.flags, flags );
+		goto loop;
+	}
+	
+	case 0xD3: // OUT (imm),A
+		pc++;
+		OUT_PORT( (data + r.b.a * 0x100), r.b.a );
+		goto loop;
+		
+	case 0x2E: // LD L,imm
+		pc++;
+		r.b.l = data;
+		goto loop;
+	
+	case 0x3E: // LD A,imm
+		pc++;
+		r.b.a = data;
+		goto loop;
+	
+	case 0x3A:{// LD A,(addr)
+		int addr = GET_ADDR();
+		pc += 2;
+		r.b.a = READ_MEM( addr );
+		goto loop;
+	}
+	
+// Conditional
+
+#define ZERO (flags & Z40)
+#define CARRY (flags & C01)
+#define EVEN (flags & P04)
+#define MINUS (flags & S80)
+
+// JR
+// TODO: more efficient way to handle negative branch that wraps PC around
+#define JR_( cond, clocks ) {\
+	pc++;\
+	if ( !(cond) )\
+		goto loop;\
+	int offset = SBYTE( data );\
+	pc = WORD( pc + offset );\
+	s_time += clocks;\
+	goto loop;\
+}
+
+#define JR( cond ) JR_( cond, 5 )
+	
+	case 0x20: JR( !ZERO ) // JR NZ,disp
+	case 0x28: JR( ZERO ) // JR Z,disp
+	case 0x30: JR( !CARRY ) // JR NC,disp
+	case 0x38: JR( CARRY ) // JR C,disp
+	case 0x18: JR_( true,0) // JR disp
+
+	case 0x10:{// DJNZ disp
+		int temp = r.b.b - 1;
+		r.b.b = temp;
+		JR( temp )
+	}
+	
+// JP
+#define JP( cond ) \
+	if ( !(cond) )\
+		goto jp_not_taken;\
+	pc = GET_ADDR();\
+	goto loop;
+	
+	case 0xC2: JP( !ZERO ) // JP NZ,addr
+	case 0xCA: JP( ZERO ) // JP Z,addr
+	case 0xD2: JP( !CARRY ) // JP NC,addr
+	case 0xDA: JP( CARRY ) // JP C,addr
+	case 0xE2: JP( !EVEN ) // JP PO,addr
+	case 0xEA: JP( EVEN ) // JP PE,addr
+	case 0xF2: JP( !MINUS ) // JP P,addr
+	case 0xFA: JP( MINUS ) // JP M,addr
+	
+	case 0xC3: // JP addr
+		pc = GET_ADDR();
+		goto loop;
+	
+	case 0xE9: // JP HL
+		pc = r.w.hl;
+		goto loop;
+
+// RET
+#define RET( cond ) \
+	if ( cond )\
+		goto ret_taken;\
+	s_time -= 6;\
+	goto loop;
+	
+	case 0xC0: RET( !ZERO ) // RET NZ
+	case 0xC8: RET( ZERO ) // RET Z
+	case 0xD0: RET( !CARRY ) // RET NC
+	case 0xD8: RET( CARRY ) // RET C
+	case 0xE0: RET( !EVEN ) // RET PO
+	case 0xE8: RET( EVEN ) // RET PE
+	case 0xF0: RET( !MINUS ) // RET P
+	case 0xF8: RET( MINUS ) // RET M
+	
+	case 0xC9: // RET
+	ret_taken:
+		pc = READ_WORD( sp );
+		sp = WORD( sp + 2 );
+		goto loop;
+	
+// CALL
+#define CALL( cond ) \
+	if ( cond )\
+		goto call_taken;\
+	goto call_not_taken;
+
+	case 0xC4: CALL( !ZERO ) // CALL NZ,addr
+	case 0xCC: CALL( ZERO ) // CALL Z,addr
+	case 0xD4: CALL( !CARRY ) // CALL NC,addr
+	case 0xDC: CALL( CARRY ) // CALL C,addr
+	case 0xE4: CALL( !EVEN ) // CALL PO,addr
+	case 0xEC: CALL( EVEN ) // CALL PE,addr
+	case 0xF4: CALL( !MINUS ) // CALL P,addr
+	case 0xFC: CALL( MINUS ) // CALL M,addr
+	
+	case 0xCD:{// CALL addr
+	call_taken:
+		int addr = pc + 2;
+		pc = GET_ADDR();
+		sp = WORD( sp - 2 );
+		WRITE_WORD( sp, addr );
+		goto loop;
+	}
+	
+	case 0xFF: // RST
+		#ifdef IDLE_ADDR
+			if ( pc == IDLE_ADDR + 1 )
+				goto hit_idle_addr;
+		#else
+			if ( pc > 0x10000 )
+			{
+				pc = WORD( pc - 1 );
+				s_time -= 11;
+				goto loop;
+			}
+		#endif
+	CASE7( C7, CF, D7, DF, E7, EF, F7 ):
+		data = pc;
+		pc = opcode & 0x38;
+		#ifdef RST_BASE
+			pc += RST_BASE;
+		#endif
+		goto push_data;
+
+// PUSH/POP
+	case 0xF5: // PUSH AF
+		data = r.b.a * 0x100u + flags;
+		goto push_data;
+	
+	case 0xC5: // PUSH BC
+	case 0xD5: // PUSH DE
+	case 0xE5: // PUSH HL
+		data = R16( opcode, 4, 0xC5 );
+	push_data:
+		sp = WORD( sp - 2 );
+		WRITE_WORD( sp, data );
+		goto loop;
+	
+	case 0xF1: // POP AF
+		flags = READ_MEM( sp );
+		r.b.a = READ_MEM( (sp + 1) );
+		sp = WORD( sp + 2 );
+		goto loop;
+	
+	case 0xC1: // POP BC
+	case 0xD1: // POP DE
+	case 0xE1: // POP HL
+		R16( opcode, 4, 0xC1 ) = READ_WORD( sp );
+		sp = WORD( sp + 2 );
+		goto loop;
+	
+// ADC/ADD/SBC/SUB
+	case 0x96: // SUB (HL)
+	case 0x86: // ADD (HL)
+		flags &= ~C01;
+	case 0x9E: // SBC (HL)
+	case 0x8E: // ADC (HL)
+		data = READ_MEM( r.w.hl );
+		goto adc_data;
+	
+	case 0xD6: // SUB A,imm
+	case 0xC6: // ADD imm
+		flags &= ~C01;
+	case 0xDE: // SBC A,imm
+	case 0xCE: // ADC imm
+		pc++;
+		goto adc_data;
+	
+	CASE7( 90, 91, 92, 93, 94, 95, 97 ): // SUB r
+	CASE7( 80, 81, 82, 83, 84, 85, 87 ): // ADD r
+		flags &= ~C01;
+	CASE7( 98, 99, 9A, 9B, 9C, 9D, 9F ): // SBC r
+	CASE7( 88, 89, 8A, 8B, 8C, 8D, 8F ): // ADC r
+		data = R8( opcode & 7, 0 );
+	adc_data: {
+		int result = data + (flags & C01);
+		data ^= r.b.a;
+		flags = opcode >> 3 & N02; // bit 4 is set in subtract opcodes
+		if ( flags )
+			result = -result;
+		result += r.b.a;
+		data ^= result;
+		flags +=(data & H10) +
+				((data + 0x80) >> 6 & V04) +
+				SZ28C( result & 0x1FF );
+		r.b.a = result;
+		goto loop;
+	}
+
+// CP
+	case 0xBE: // CP (HL)
+		data = READ_MEM( r.w.hl );
+		goto cp_data;
+	
+	case 0xFE: // CP imm
+		pc++;
+		goto cp_data;
+	
+	CASE7( B8, B9, BA, BB, BC, BD, BF ): // CP r
+		data = R8( opcode, 0xB8 );
+	cp_data: {
+		int result = r.b.a - data;
+		flags = N02 + (data & (F20 | F08)) + (result >> 8 & C01);
+		data ^= r.b.a;
+		flags +=(((result ^ r.b.a) & data) >> 5 & V04) +
+				(((data & H10) ^ result) & (S80 | H10));
+		if ( BYTE( result ) )
+			goto loop;
+		flags += Z40;
+		goto loop;
+	}
+	
+// ADD HL,r.w
+	
+	case 0x39: // ADD HL,SP
+		data = sp;
+		goto add_hl_data;
+	
+	case 0x09: // ADD HL,BC
+	case 0x19: // ADD HL,DE
+	case 0x29: // ADD HL,HL
+		data = R16( opcode, 4, 0x09 );
+	add_hl_data: {
+		int sum = r.w.hl + data;
+		data ^= r.w.hl;
+		r.w.hl = sum;
+		flags = (flags & (S80 | Z40 | V04)) +
+				(sum >> 16) +
+				(sum >> 8 & (F20 | F08)) +
+				((data ^ sum) >> 8 & H10);
+		goto loop;
+	}
+	
+	case 0x27:{// DAA
+		int a = r.b.a;
+		if ( a > 0x99 )
+			flags |= C01;
+		
+		int adjust = 0x60 * (flags & C01);
+		
+		if ( flags & H10 || (a & 0x0F) > 9 )
+			adjust += 0x06;
+		
+		if ( flags & N02 )
+			adjust = -adjust;
+		a += adjust;
+		
+		flags = (flags & (C01 | N02)) +
+				((r.b.a ^ a) & H10) +
+				SZ28P( BYTE( a ) );
+		r.b.a = a;
+		goto loop;
+	}
+	
+// INC/DEC
+	case 0x34: // INC (HL)
+		data = READ_MEM( r.w.hl ) + 1;
+		WRITE_MEM( r.w.hl, data );
+		goto inc_set_flags;
+	
+	CASE7( 04, 0C, 14, 1C, 24, 2C, 3C ): // INC r
+		data = ++R8( opcode >> 3, 0 );
+	inc_set_flags:
+		flags = (flags & C01) +
+				(((data & 0x0F) - 1) & H10) +
+				SZ28( BYTE( data ) );
+		if ( data != 0x80 )
+			goto loop;
+		flags += V04;
+		goto loop;
+	
+	case 0x35: // DEC (HL)
+		data = READ_MEM( r.w.hl ) - 1;
+		WRITE_MEM( r.w.hl, data );
+		goto dec_set_flags;
+	
+	CASE7( 05, 0D, 15, 1D, 25, 2D, 3D ): // DEC r
+		data = --R8( opcode >> 3, 0 );
+	dec_set_flags:
+		flags = (flags & C01) + N02 +
+				(((data & 0x0F) + 1) & H10) +
+				SZ28( BYTE( data ) );
+		if ( data != 0x7F )
+			goto loop;
+		flags += V04;
+		goto loop;
+
+	case 0x03: // INC BC
+	case 0x13: // INC DE
+	case 0x23: // INC HL
+		R16( opcode, 4, 0x03 )++;
+		goto loop;
+	
+	case 0x33: // INC SP
+		sp = WORD( sp + 1 );
+		goto loop;
+	
+	case 0x0B: // DEC BC
+	case 0x1B: // DEC DE
+	case 0x2B: // DEC HL
+		R16( opcode, 4, 0x0B )--;
+		goto loop;
+	
+	case 0x3B: // DEC SP
+		sp = WORD( sp - 1 );
+		goto loop;
+	
+// AND
+	case 0xA6: // AND (HL)
+		data = READ_MEM( r.w.hl );
+		goto and_data;
+	
+	case 0xE6: // AND imm
+		pc++;
+		goto and_data;
+	
+	CASE7( A0, A1, A2, A3, A4, A5, A7 ): // AND r
+		data = R8( opcode, 0xA0 );
+	and_data:
+		r.b.a &= data;
+		flags = SZ28P( r.b.a ) + H10;
+		goto loop;
+	
+// OR
+	case 0xB6: // OR (HL)
+		data = READ_MEM( r.w.hl );
+		goto or_data;
+	
+	case 0xF6: // OR imm
+		pc++;
+		goto or_data;
+	
+	CASE7( B0, B1, B2, B3, B4, B5, B7 ): // OR r
+		data = R8( opcode, 0xB0 );
+	or_data:
+		r.b.a |= data;
+		flags = SZ28P( r.b.a );
+		goto loop;
+
+// XOR
+	case 0xAE: // XOR (HL)
+		data = READ_MEM( r.w.hl );
+		goto xor_data;
+	
+	case 0xEE: // XOR imm
+		pc++;
+		goto xor_data;
+	
+	CASE7( A8, A9, AA, AB, AC, AD, AF ): // XOR r
+		data = R8( opcode, 0xA8 );
+	xor_data:
+		r.b.a ^= data;
+		flags = SZ28P( r.b.a );
+		goto loop;
+
+// LD
+	CASE7( 70, 71, 72, 73, 74, 75, 77 ): // LD (HL),r
+		WRITE_MEM( r.w.hl, R8( opcode, 0x70 ) );
+		goto loop;
+	
+	CASE6( 41, 42, 43, 44, 45, 47 ): // LD B,r
+	CASE6( 48, 4A, 4B, 4C, 4D, 4F ): // LD C,r
+	CASE6( 50, 51, 53, 54, 55, 57 ): // LD D,r
+	CASE6( 58, 59, 5A, 5C, 5D, 5F ): // LD E,r
+	CASE6( 60, 61, 62, 63, 65, 67 ): // LD H,r
+	CASE6( 68, 69, 6A, 6B, 6C, 6F ): // LD L,r
+	CASE6( 78, 79, 7A, 7B, 7C, 7D ): // LD A,r
+		R8( opcode >> 3 & 7, 0 ) = R8( opcode & 7, 0 );
+		goto loop;
+	
+	CASE5( 06, 0E, 16, 1E, 26 ): // LD r,imm
+		R8( opcode >> 3, 0 ) = data;
+		pc++;
+		goto loop;
+	
+	case 0x36: // LD (HL),imm
+		pc++;
+		WRITE_MEM( r.w.hl, data );
+		goto loop;
+	
+	CASE7( 46, 4E, 56, 5E, 66, 6E, 7E ): // LD r,(HL)
+		R8( opcode >> 3, 8 ) = READ_MEM( r.w.hl );
+		goto loop;
+	
+	case 0x01: // LD r.w,imm
+	case 0x11:
+	case 0x21:
+		R16( opcode, 4, 0x01 ) = GET_ADDR();
+		pc += 2;
+		goto loop;
+	
+	case 0x31: // LD sp,imm
+		sp = GET_ADDR();
+		pc += 2;
+		goto loop;
+	
+	case 0x2A:{// LD HL,(addr)
+		int addr = GET_ADDR();
+		pc += 2;
+		r.w.hl = READ_WORD( addr );
+		goto loop;
+	}
+	
+	case 0x32:{// LD (addr),A
+		int addr = GET_ADDR();
+		pc += 2;
+		WRITE_MEM( addr, r.b.a );
+		goto loop;
+	}
+	
+	case 0x22:{// LD (addr),HL
+		int addr = GET_ADDR();
+		pc += 2;
+		WRITE_WORD( addr, r.w.hl );
+		goto loop;
+	}
+	
+	case 0x02: // LD (BC),A
+	case 0x12: // LD (DE),A
+		WRITE_MEM( R16( opcode, 4, 0x02 ), r.b.a );
+		goto loop;
+	
+	case 0x0A: // LD A,(BC)
+	case 0x1A: // LD A,(DE)
+		r.b.a = READ_MEM( R16( opcode, 4, 0x0A ) );
+		goto loop;
+	
+	case 0xF9: // LD SP,HL
+		sp = r.w.hl;
+		goto loop;
+	
+// Rotate
+	
+	case 0x07:{// RLCA
+		int temp = r.b.a;
+		temp = (temp << 1) + (temp >> 7);
+		flags = (flags & (S80 | Z40 | P04)) +
+				(temp & (F20 | F08 | C01));
+		r.b.a = temp;
+		goto loop;
+	}
+	
+	case 0x0F:{// RRCA
+		int temp = r.b.a;
+		flags = (flags & (S80 | Z40 | P04)) +
+				(temp & C01);
+		temp = (temp << 7) + (temp >> 1);
+		flags += temp & (F20 | F08);
+		r.b.a = temp;
+		goto loop;
+	}
+	
+	case 0x17:{// RLA
+		int temp = (r.b.a << 1) + (flags & C01);
+		flags = (flags & (S80 | Z40 | P04)) +
+				(temp & (F20 | F08)) +
+				(temp >> 8);
+		r.b.a = temp;
+		goto loop;
+	}
+	
+	case 0x1F:{// RRA
+		int temp = (flags << 7) + (r.b.a >> 1);
+		flags = (flags & (S80 | Z40 | P04)) +
+				(temp & (F20 | F08)) +
+				(r.b.a & C01);
+		r.b.a = temp;
+		goto loop;
+	}
+	
+// Misc
+	case 0x2F:{// CPL
+		int temp = ~r.b.a;
+		flags = (flags & (S80 | Z40 | P04 | C01)) +
+				(temp & (F20 | F08)) +
+				(H10 | N02);
+		r.b.a = temp;
+		goto loop;
+	}
+	
+	case 0x3F:{// CCF
+		flags = ((flags & (S80 | Z40 | P04 | C01)) ^ C01) +
+				(flags << 4 & H10) +
+				(r.b.a & (F20 | F08));
+		goto loop;
+	}
+	
+	case 0x37: // SCF
+		flags = (flags & (S80 | Z40 | P04)) | C01 +
+				(r.b.a & (F20 | F08));
+		goto loop;
+	
+	case 0xDB: // IN A,(imm)
+		pc++;
+		r.b.a = IN_PORT( (data + r.b.a * 0x100) );
+		goto loop;
+
+	case 0xE3:{// EX (SP),HL
+		int temp = READ_WORD( sp );
+		WRITE_WORD( sp, r.w.hl );
+		r.w.hl = temp;
+		goto loop;
+	}
+	
+	case 0xEB: // EX DE,HL
+		EX( r.w.hl, r.w.de );
+		goto loop;
+	
+	case 0xD9: // EXX DE,HL
+		EXX( w.bc );
+		EXX( w.de );
+		EXX( w.hl );
+		goto loop;
+	
+	case 0xF3: // DI
+		R.iff1 = 0;
+		R.iff2 = 0;
+		goto loop;
+	
+	case 0xFB: // EI
+		R.iff1 = 1;
+		R.iff2 = 1;
+		// TODO: delayed effect
+		goto loop;
+	
+	case 0x76: // HALT
+		goto halt;
+	
+//////////////////////////////////////// CB prefix
+	{
+	case 0xCB:
+		pc++;
+		switch ( data )
+		{
+	
+	// Rotate left
+		
+	#define RLC( read, write ) {\
+		int result = read;\
+		result = BYTE( result << 1 ) + (result >> 7);\
+		flags = SZ28P( result ) + (result & C01);\
+		write;\
+		goto loop;\
+	}
+		
+		case 0x06: // RLC (HL)
+			s_time += 7;
+			data = r.w.hl;
+		rlc_data_addr:
+			RLC( READ_MEM( data ), WRITE_MEM( data, result ) )
+		
+		CASE7( 00, 01, 02, 03, 04, 05, 07 ):{// RLC r
+			byte& reg = R8( data, 0 );
+			RLC( reg, reg = result )
+		}
+		
+	#define RL( read, write ) {\
+		int result = (read << 1) + (flags & C01);\
+		flags = SZ28PC( result );\
+		write;\
+		goto loop;\
+	}
+		
+		case 0x16: // RL (HL)
+			s_time += 7;
+			data = r.w.hl;
+		rl_data_addr:
+			RL( READ_MEM( data ), WRITE_MEM( data, result ) )
+		
+		CASE7( 10, 11, 12, 13, 14, 15, 17 ):{// RL r
+			byte& reg = R8( data, 0x10 );
+			RL( reg, reg = result )
+		}
+		
+	#define SLA( read, low_bit, write ) {\
+		int result = (read << 1) + low_bit;\
+		flags = SZ28PC( result );\
+		write;\
+		goto loop;\
+	}
+		
+		case 0x26: // SLA (HL)
+			s_time += 7;
+			data = r.w.hl;
+		sla_data_addr:
+			SLA( READ_MEM( data ), 0, WRITE_MEM( data, result ) )
+		
+		CASE7( 20, 21, 22, 23, 24, 25, 27 ):{// SLA r
+			byte& reg = R8( data, 0x20 );
+			SLA( reg, 0, reg = result )
+		}
+		
+		case 0x36: // SLL (HL)
+			s_time += 7;
+			data = r.w.hl;
+		sll_data_addr:
+			SLA( READ_MEM( data ), 1, WRITE_MEM( data, result ) )
+		
+		CASE7( 30, 31, 32, 33, 34, 35, 37 ):{// SLL r
+			byte& reg = R8( data, 0x30 );
+			SLA( reg, 1, reg = result )
+		}
+		
+	// Rotate right
+		
+	#define RRC( read, write ) {\
+		int result = read;\
+		flags = result & C01;\
+		result = BYTE( result << 7 ) + (result >> 1);\
+		flags += SZ28P( result );\
+		write;\
+		goto loop;\
+	}
+		
+		case 0x0E: // RRC (HL)
+			s_time += 7;
+			data = r.w.hl;
+		rrc_data_addr:
+			RRC( READ_MEM( data ), WRITE_MEM( data, result ) )
+		
+		CASE7( 08, 09, 0A, 0B, 0C, 0D, 0F ):{// RRC r
+			byte& reg = R8( data, 0x08 );
+			RRC( reg, reg = result )
+		}
+		
+	#define RR( read, write ) {\
+		int result = read;\
+		int temp = result & C01;\
+		result = BYTE( flags << 7 ) + (result >> 1);\
+		flags = SZ28P( result ) + temp;\
+		write;\
+		goto loop;\
+	}
+		
+		case 0x1E: // RR (HL)
+			s_time += 7;
+			data = r.w.hl;
+		rr_data_addr:
+			RR( READ_MEM( data ), WRITE_MEM( data, result ) )
+		
+		CASE7( 18, 19, 1A, 1B, 1C, 1D, 1F ):{// RR r
+			byte& reg = R8( data, 0x18 );
+			RR( reg, reg = result )
+		}
+		
+	#define SRA( read, write ) {\
+		int result = read;\
+		flags = result & C01;\
+		result = (result & 0x80) + (result >> 1);\
+		flags += SZ28P( result );\
+		write;\
+		goto loop;\
+	}
+		
+		case 0x2E: // SRA (HL)
+			data = r.w.hl;
+			s_time += 7;
+		sra_data_addr:
+			SRA( READ_MEM( data ), WRITE_MEM( data, result ) )
+		
+		CASE7( 28, 29, 2A, 2B, 2C, 2D, 2F ):{// SRA r
+			byte& reg = R8( data, 0x28 );
+			SRA( reg, reg = result )
+		}
+		
+	#define SRL( read, write ) {\
+		int result = read;\
+		flags = result & C01;\
+		result >>= 1;\
+		flags += SZ28P( result );\
+		write;\
+		goto loop;\
+	}
+		
+		case 0x3E: // SRL (HL)
+			s_time += 7;
+			data = r.w.hl;
+		srl_data_addr:
+			SRL( READ_MEM( data ), WRITE_MEM( data, result ) )
+		
+		CASE7( 38, 39, 3A, 3B, 3C, 3D, 3F ):{// SRL r
+			byte& reg = R8( data, 0x38 );
+			SRL( reg, reg = result )
+		}
+		
+	// BIT
+		{
+			int temp;
+		CASE8( 46, 4E, 56, 5E, 66, 6E, 76, 7E ): // BIT b,(HL)
+			s_time += 4;
+			temp = READ_MEM( r.w.hl );
+			flags &= C01;
+			goto bit_temp;
+		CASE7( 40, 41, 42, 43, 44, 45, 47 ): // BIT 0,r
+		CASE7( 48, 49, 4A, 4B, 4C, 4D, 4F ): // BIT 1,r
+		CASE7( 50, 51, 52, 53, 54, 55, 57 ): // BIT 2,r
+		CASE7( 58, 59, 5A, 5B, 5C, 5D, 5F ): // BIT 3,r
+		CASE7( 60, 61, 62, 63, 64, 65, 67 ): // BIT 4,r
+		CASE7( 68, 69, 6A, 6B, 6C, 6D, 6F ): // BIT 5,r
+		CASE7( 70, 71, 72, 73, 74, 75, 77 ): // BIT 6,r
+		CASE7( 78, 79, 7A, 7B, 7C, 7D, 7F ): // BIT 7,r
+			temp = R8( data & 7, 0 );
+			flags = (flags & C01) + (temp & (F20 | F08));
+		bit_temp:
+			temp = temp & (1 << (data >> 3 & 7));
+			flags += (temp & S80) + H10;
+			flags += (unsigned) --temp >> 8 & (Z40 | P04);
+			goto loop;
+		}
+		
+	// SET/RES
+		CASE8( 86, 8E, 96, 9E, A6, AE, B6, BE ): // RES b,(HL)
+		CASE8( C6, CE, D6, DE, E6, EE, F6, FE ):{// SET b,(HL)
+			s_time += 7;
+			int temp = READ_MEM( r.w.hl );
+			int bit = 1 << (data >> 3 & 7);
+			temp |= bit; // SET
+			if ( !(data & 0x40) )
+				temp ^= bit; // RES
+			WRITE_MEM( r.w.hl, temp );
+			goto loop;
+		}
+		
+		CASE7( C0, C1, C2, C3, C4, C5, C7 ): // SET 0,r
+		CASE7( C8, C9, CA, CB, CC, CD, CF ): // SET 1,r
+		CASE7( D0, D1, D2, D3, D4, D5, D7 ): // SET 2,r
+		CASE7( D8, D9, DA, DB, DC, DD, DF ): // SET 3,r
+		CASE7( E0, E1, E2, E3, E4, E5, E7 ): // SET 4,r
+		CASE7( E8, E9, EA, EB, EC, ED, EF ): // SET 5,r
+		CASE7( F0, F1, F2, F3, F4, F5, F7 ): // SET 6,r
+		CASE7( F8, F9, FA, FB, FC, FD, FF ): // SET 7,r
+			R8( data & 7, 0 ) |= 1 << (data >> 3 & 7);
+			goto loop;
+		
+		CASE7( 80, 81, 82, 83, 84, 85, 87 ): // RES 0,r
+		CASE7( 88, 89, 8A, 8B, 8C, 8D, 8F ): // RES 1,r
+		CASE7( 90, 91, 92, 93, 94, 95, 97 ): // RES 2,r
+		CASE7( 98, 99, 9A, 9B, 9C, 9D, 9F ): // RES 3,r
+		CASE7( A0, A1, A2, A3, A4, A5, A7 ): // RES 4,r
+		CASE7( A8, A9, AA, AB, AC, AD, AF ): // RES 5,r
+		CASE7( B0, B1, B2, B3, B4, B5, B7 ): // RES 6,r
+		CASE7( B8, B9, BA, BB, BC, BD, BF ): // RES 7,r
+			R8( data & 7, 0 ) &= ~(1 << (data >> 3 & 7));
+			goto loop;
+		}
+		assert( false );
+	}
+
+#undef GET_ADDR
+#define GET_ADDR() GET_LE16( &INSTR( 1, pc ) )
+
+//////////////////////////////////////// ED prefix
+	{
+	case 0xED:
+		pc++;
+		s_time += (clock_table + 256) data >> 4;
+		switch ( data )
+		{
+		{
+			int temp;
+		case 0x72: // SBC HL,SP
+		case 0x7A: // ADC HL,SP
+			temp = sp;
+			if ( 0 )
+		case 0x42: // SBC HL,BC
+		case 0x52: // SBC HL,DE
+		case 0x62: // SBC HL,HL
+		case 0x4A: // ADC HL,BC
+		case 0x5A: // ADC HL,DE
+		case 0x6A: // ADC HL,HL
+				temp = R16( data >> 3 & 6, 1, 0 );
+			int sum = temp + (flags & C01);
+			flags = ~data >> 2 & N02;
+			if ( flags )
+				sum = -sum;
+			sum += r.w.hl;
+			temp ^= r.w.hl;
+			temp ^= sum;
+			flags +=(sum >> 16 & C01) +
+					(temp >> 8 & H10) +
+					(sum >> 8 & (S80 | F20 | F08)) +
+					((temp + 0x8000) >> 14 & V04);
+			r.w.hl = sum;
+			if ( WORD( sum ) )
+				goto loop;
+			flags += Z40;
+			goto loop;
+		}
+		
+		CASE8( 40, 48, 50, 58, 60, 68, 70, 78 ):{// IN r,(C)
+			int temp = IN_PORT( r.w.bc );
+			R8( data >> 3, 8 ) = temp;
+			flags = (flags & C01) + SZ28P( temp );
+			goto loop;
+		}
+		
+		case 0x71: // OUT (C),0
+			r.b.flags = 0;
+		CASE7( 41, 49, 51, 59, 61, 69, 79 ): // OUT (C),r
+			OUT_PORT( r.w.bc, R8( data >> 3, 8 ) );
+			goto loop;
+		
+		{
+			int temp;
+		case 0x73: // LD (ADDR),SP
+			temp = sp;
+			if ( 0 )
+		case 0x43: // LD (ADDR),BC
+		case 0x53: // LD (ADDR),DE
+				temp = R16( data, 4, 0x43 );
+			int addr = GET_ADDR();
+			pc += 2;
+			WRITE_WORD( addr, temp );
+			goto loop;
+		}
+		
+		case 0x4B: // LD BC,(ADDR)
+		case 0x5B:{// LD DE,(ADDR)
+			int addr = GET_ADDR();
+			pc += 2;
+			R16( data, 4, 0x4B ) = READ_WORD( addr );
+			goto loop;
+		}
+		
+		case 0x7B:{// LD SP,(ADDR)
+			int addr = GET_ADDR();
+			pc += 2;
+			sp = READ_WORD( addr );
+			goto loop;
+		}
+		
+		case 0x67:{// RRD
+			int temp = READ_MEM( r.w.hl );
+			WRITE_MEM( r.w.hl, ((r.b.a << 4) + (temp >> 4)) );
+			temp = (r.b.a & 0xF0) + (temp & 0x0F);
+			flags = (flags & C01) + SZ28P( temp );
+			r.b.a = temp;
+			goto loop;
+		}
+		
+		case 0x6F:{// RLD
+			int temp = READ_MEM( r.w.hl );
+			WRITE_MEM( r.w.hl, ((temp << 4) + (r.b.a & 0x0F)) );
+			temp = (r.b.a & 0xF0) + (temp >> 4);
+			flags = (flags & C01) + SZ28P( temp );
+			r.b.a = temp;
+			goto loop;
+		}
+		
+		CASE8( 44, 4C, 54, 5C, 64, 6C, 74, 7C ): // NEG
+			opcode = 0x10; // flag to do SBC instead of ADC
+			flags &= ~C01;
+			data = r.b.a;
+			r.b.a = 0;
+			goto adc_data;
+		
+		{
+			int inc;
+		case 0xA9: // CPD
+		case 0xB9: // CPDR
+			inc = -1;
+			if ( 0 )
+		case 0xA1: // CPI
+		case 0xB1: // CPIR
+				inc = +1;
+			int addr = r.w.hl;
+			r.w.hl = addr + inc;
+			int temp = READ_MEM( addr );
+			
+			int result = r.b.a - temp;
+			flags = (flags & C01) + N02 +
+					((((temp ^ r.b.a) & H10) ^ result) & (S80 | H10));
+			
+			if ( !BYTE( result ) )
+				flags += Z40;
+			result -= (flags & H10) >> 4;
+			flags += result & F08;
+			flags += result << 4 & F20;
+			if ( !--r.w.bc )
+				goto loop;
+			
+			flags += V04;
+			if ( flags & Z40 || data < 0xB0 )
+				goto loop;
+			
+			pc -= 2;
+			s_time += 5;
+			goto loop;
+		}
+		
+		{
+			int inc;
+		case 0xA8: // LDD
+		case 0xB8: // LDDR
+			inc = -1;
+			if ( 0 )
+		case 0xA0: // LDI
+		case 0xB0: // LDIR
+				inc = +1;
+			int addr = r.w.hl;
+			r.w.hl = addr + inc;
+			int temp = READ_MEM( addr );
+			
+			addr = r.w.de;
+			r.w.de = addr + inc;
+			WRITE_MEM( addr, temp );
+			
+			temp += r.b.a;
+			flags = (flags & (S80 | Z40 | C01)) +
+					(temp & F08) + (temp << 4 & F20);
+			if ( !--r.w.bc )
+				goto loop;
+			
+			flags += V04;
+			if ( data < 0xB0 )
+				goto loop;
+			
+			pc -= 2;
+			s_time += 5;
+			goto loop;
+		}
+		
+		{
+			int inc;
+		case 0xAB: // OUTD
+		case 0xBB: // OTDR
+			inc = -1;
+			if ( 0 )
+		case 0xA3: // OUTI
+		case 0xB3: // OTIR
+				inc = +1;
+			int addr = r.w.hl;
+			r.w.hl = addr + inc;
+			int temp = READ_MEM( addr );
+			
+			int b = --r.b.b;
+			flags = (temp >> 6 & N02) + SZ28( b );
+			if ( b && data >= 0xB0 )
+			{
+				pc -= 2;
+				s_time += 5;
+			}
+			
+			OUT_PORT( r.w.bc, temp );
+			goto loop;
+		}
+		
+		{
+			int inc;
+		case 0xAA: // IND
+		case 0xBA: // INDR
+			inc = -1;
+			if ( 0 )
+		case 0xA2: // INI
+		case 0xB2: // INIR
+				inc = +1;
+			
+			int addr = r.w.hl;
+			r.w.hl = addr + inc;
+			
+			int temp = IN_PORT( r.w.bc );
+			
+			int b = --r.b.b;
+			flags = (temp >> 6 & N02) + SZ28( b );
+			if ( b && data >= 0xB0 )
+			{
+				pc -= 2;
+				s_time += 5;
+			}
+			
+			WRITE_MEM( addr, temp );
+			goto loop;
+		}
+		
+		case 0x47: // LD I,A
+			R.i = r.b.a;
+			goto loop;
+		
+		case 0x4F: // LD R,A
+			SET_R( r.b.a );
+			dprintf( "LD R,A not supported\n" );
+			warning = true;
+			goto loop;
+		
+		case 0x57: // LD A,I
+			r.b.a = R.i;
+			goto ld_ai_common;
+		
+		case 0x5F: // LD A,R
+			r.b.a = GET_R();
+			dprintf( "LD A,R not supported\n" );
+			warning = true;
+		ld_ai_common:
+			flags = (flags & C01) + SZ28( r.b.a ) + (R.iff2 << 2 & V04);
+			goto loop;
+		
+		CASE8( 45, 4D, 55, 5D, 65, 6D, 75, 7D ): // RETI/RETN
+			R.iff1 = R.iff2;
+			goto ret_taken;
+		
+		case 0x46: case 0x4E: case 0x66: case 0x6E: // IM 0
+			R.im = 0;
+			goto loop;
+		
+		case 0x56: case 0x76: // IM 1
+			R.im = 1;
+			goto loop;
+		
+		case 0x5E: case 0x7E: // IM 2
+			R.im = 2;
+			goto loop;
+		
+		default:
+			dprintf( "Opcode $ED $%02X not supported\n", data );
+			warning = true;
+			goto loop;
+		}
+		assert( false );
+	}
+
+//////////////////////////////////////// DD/FD prefix
+	{
+	int ixy;
+	case 0xDD:
+		ixy = ix;
+		goto ix_prefix;
+	case 0xFD:
+		ixy = iy;
+	ix_prefix:
+		pc++;
+		int data2 = READ_CODE( pc );
+		s_time += (clock_table + 256) data & 0x0F;
+		switch ( data )
+		{
+	// TODO: more efficient way of avoid negative address
+	// TODO: avoid using this as argument to READ_MEM() since it is evaluated twice
+	#define IXY_DISP( ixy, disp ) WORD( (ixy ) + (disp))
+	
+	#define SET_IXY( in ) if ( opcode == 0xDD ) ix = in; else iy = in;
+	
+	// ADD/ADC/SUB/SBC
+	
+		case 0x96: // SUB (IXY+disp)
+		case 0x86: // ADD (IXY+disp)
+			flags &= ~C01;
+		case 0x9E: // SBC (IXY+disp)
+		case 0x8E: // ADC (IXY+disp)
+			pc++;
+			opcode = data;
+			data = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
+			goto adc_data;
+		
+		case 0x94: // SUB HXY
+		case 0x84: // ADD HXY
+			flags &= ~C01;
+		case 0x9C: // SBC HXY
+		case 0x8C: // ADC HXY
+			opcode = data;
+			data = ixy >> 8;
+			goto adc_data;
+		
+		case 0x95: // SUB LXY
+		case 0x85: // ADD LXY
+			flags &= ~C01;
+		case 0x9D: // SBC LXY
+		case 0x8D: // ADC LXY
+			opcode = data;
+			data = BYTE( ixy );
+			goto adc_data;
+		
+		{
+			int temp;
+		case 0x39: // ADD IXY,SP
+			temp = sp;
+			goto add_ixy_data;
+		
+		case 0x29: // ADD IXY,HL
+			temp = ixy;
+			goto add_ixy_data;
+		
+		case 0x09: // ADD IXY,BC
+		case 0x19: // ADD IXY,DE
+			temp = R16( data, 4, 0x09 );
+		add_ixy_data: {
+			int sum = ixy + temp;
+			temp ^= ixy;
+			ixy = WORD( sum );
+			flags = (flags & (S80 | Z40 | V04)) +
+					(sum >> 16) +
+					(sum >> 8 & (F20 | F08)) +
+					((temp ^ sum) >> 8 & H10);
+			goto set_ixy;
+		}
+		}
+	
+	// AND
+		case 0xA6: // AND (IXY+disp)
+			pc++;
+			data = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
+			goto and_data;
+		
+		case 0xA4: // AND HXY
+			data = ixy >> 8;
+			goto and_data;
+		
+		case 0xA5: // AND LXY
+			data = BYTE( ixy );
+			goto and_data;
+	
+	// OR
+		case 0xB6: // OR (IXY+disp)
+			pc++;
+			data = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
+			goto or_data;
+		
+		case 0xB4: // OR HXY
+			data = ixy >> 8;
+			goto or_data;
+		
+		case 0xB5: // OR LXY
+			data = BYTE( ixy );
+			goto or_data;
+	
+	// XOR
+		case 0xAE: // XOR (IXY+disp)
+			pc++;
+			data = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
+			goto xor_data;
+		
+		case 0xAC: // XOR HXY
+			data = ixy >> 8;
+			goto xor_data;
+		
+		case 0xAD: // XOR LXY
+			data = BYTE( ixy );
+			goto xor_data;
+	
+	// CP
+		case 0xBE: // CP (IXY+disp)
+			pc++;
+			data = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
+			goto cp_data;
+		
+		case 0xBC: // CP HXY
+			data = ixy >> 8;
+			goto cp_data;
+		
+		case 0xBD: // CP LXY
+			data = BYTE( ixy );
+			goto cp_data;
+		
+	// LD
+		CASE7( 70, 71, 72, 73, 74, 75, 77 ): // LD (IXY+disp),r
+			data = R8( data, 0x70 );
+			if ( 0 )
+		case 0x36: // LD (IXY+disp),imm
+				pc++, data = READ_CODE( pc );
+			pc++;
+			WRITE_MEM( IXY_DISP( ixy, SBYTE( data2 ) ), data );
+			goto loop;
+
+		CASE5( 44, 4C, 54, 5C, 7C ): // LD r,HXY
+			R8( data >> 3, 8 ) = ixy >> 8;
+			goto loop;
+		
+		case 0x64: // LD HXY,HXY
+		case 0x6D: // LD LXY,LXY
+			goto loop;
+		
+		CASE5( 45, 4D, 55, 5D, 7D ): // LD r,LXY
+			R8( data >> 3, 8 ) = ixy;
+			goto loop;
+		
+		CASE7( 46, 4E, 56, 5E, 66, 6E, 7E ): // LD r,(IXY+disp)
+			pc++;
+			R8( data >> 3, 8 ) = READ_MEM( IXY_DISP( ixy, SBYTE( data2 ) ) );
+			goto loop;
+		
+		case 0x26: // LD HXY,imm
+			pc++;
+			goto ld_hxy_data;
+			
+		case 0x65: // LD HXY,LXY
+			data2 = BYTE( ixy );
+			goto ld_hxy_data;
+		
+		CASE5( 60, 61, 62, 63, 67 ): // LD HXY,r
+			data2 = R8( data, 0x60 );
+		ld_hxy_data:
+			ixy = BYTE( ixy ) + (data2 << 8);
+			goto set_ixy;
+		
+		case 0x2E: // LD LXY,imm
+			pc++;
+			goto ld_lxy_data;
+			
+		case 0x6C: // LD LXY,HXY
+			data2 = ixy >> 8;
+			goto ld_lxy_data;
+		
+		CASE5( 68, 69, 6A, 6B, 6F ): // LD LXY,r
+			data2 = R8( data, 0x68 );
+		ld_lxy_data:
+			ixy = (ixy & 0xFF00) + data2;
+		set_ixy:
+			if ( opcode == 0xDD )
+			{
+				ix = ixy;
+				goto loop;
+			}
+			iy = ixy;
+			goto loop;
+
+		case 0xF9: // LD SP,IXY
+			sp = ixy;
+			goto loop;
+	
+		case 0x22:{// LD (ADDR),IXY
+			int addr = GET_ADDR();
+			pc += 2;
+			WRITE_WORD( addr, ixy );
+			goto loop;
+		}
+		
+		case 0x21: // LD IXY,imm
+			ixy = GET_ADDR();
+			pc += 2;
+			goto set_ixy;
+		
+		case 0x2A:{// LD IXY,(addr)
+			int addr = GET_ADDR();
+			ixy = READ_WORD( addr );
+			pc += 2;
+			goto set_ixy;
+		}
+		
+	// DD/FD CB prefix
+		case 0xCB: {
+			data = IXY_DISP( ixy, SBYTE( data2 ) );
+			pc++;
+			data2 = READ_CODE( pc );
+			pc++;
+			switch ( data2 )
+			{
+			case 0x06: goto rlc_data_addr; // RLC (IXY)
+			case 0x16: goto rl_data_addr; // RL (IXY)
+			case 0x26: goto sla_data_addr; // SLA (IXY)
+			case 0x36: goto sll_data_addr; // SLL (IXY)
+			case 0x0E: goto rrc_data_addr; // RRC (IXY)
+			case 0x1E: goto rr_data_addr; // RR (IXY)
+			case 0x2E: goto sra_data_addr; // SRA (IXY)
+			case 0x3E: goto srl_data_addr; // SRL (IXY)
+			
+			CASE8( 46, 4E, 56, 5E, 66, 6E, 76, 7E ):{// BIT b,(IXY+disp)
+				int temp = READ_MEM( data );
+				temp = temp & (1 << (data2 >> 3 & 7));
+				flags = (flags & C01) + H10 + (temp & S80);
+				flags += (unsigned) --temp >> 8 & (Z40 | P04);
+				goto loop;
+			}
+			
+			CASE8( 86, 8E, 96, 9E, A6, AE, B6, BE ): // RES b,(IXY+disp)
+			CASE8( C6, CE, D6, DE, E6, EE, F6, FE ):{// SET b,(IXY+disp)
+				int temp = READ_MEM( data );
+				int bit = 1 << (data2 >> 3 & 7);
+				temp |= bit; // SET
+				if ( !(data2 & 0x40) )
+					temp ^= bit; // RES
+				WRITE_MEM( data, temp );
+				goto loop;
+			}
+			
+			default:
+				dprintf( "Opcode $%02X $CB $%02X not supported\n", opcode, data2 );
+				warning = true;
+				goto loop;
+			}
+			assert( false );
+		}
+		
+	// INC/DEC
+		case 0x23: // INC IXY
+			ixy = WORD( ixy + 1 );
+			goto set_ixy;
+		
+		case 0x2B: // DEC IXY
+			ixy = WORD( ixy - 1 );
+			goto set_ixy;
+		
+		case 0x34: // INC (IXY+disp)
+			ixy = IXY_DISP( ixy, SBYTE( data2 ) );
+			pc++;
+			data = READ_MEM( ixy ) + 1;
+			WRITE_MEM( ixy, data );
+			goto inc_set_flags;
+		
+		case 0x35: // DEC (IXY+disp)
+			ixy = IXY_DISP( ixy, SBYTE( data2 ) );
+			pc++;
+			data = READ_MEM( ixy ) - 1;
+			WRITE_MEM( ixy, data );
+			goto dec_set_flags;
+		
+		case 0x24: // INC HXY
+			ixy = WORD( ixy + 0x100 );
+			data = ixy >> 8;
+			goto inc_xy_common;
+		
+		case 0x2C: // INC LXY
+			data = BYTE( ixy + 1 );
+			ixy = (ixy & 0xFF00) + data;
+		inc_xy_common:
+			if ( opcode == 0xDD )
+			{
+				ix = ixy;
+				goto inc_set_flags;
+			}
+			iy = ixy;
+			goto inc_set_flags;
+		
+		case 0x25: // DEC HXY
+			ixy = WORD( ixy - 0x100 );
+			data = ixy >> 8;
+			goto dec_xy_common;
+		
+		case 0x2D: // DEC LXY
+			data = BYTE( ixy - 1 );
+			ixy = (ixy & 0xFF00) + data;
+		dec_xy_common:
+			if ( opcode == 0xDD )
+			{
+				ix = ixy;
+				goto dec_set_flags;
+			}
+			iy = ixy;
+			goto dec_set_flags;
+		
+	// PUSH/POP
+		case 0xE5: // PUSH IXY
+			data = ixy;
+			goto push_data;
+		
+		case 0xE1:{// POP IXY
+			ixy = READ_WORD( sp );
+			sp = WORD( sp + 2 );
+			goto set_ixy;
+		}
+	
+	// Misc
+		
+		case 0xE9: // JP (IXY)
+			pc = ixy;
+			goto loop;
+		
+		case 0xE3:{// EX (SP),IXY
+			int temp = READ_WORD( sp );
+			WRITE_WORD( sp, ixy );
+			ixy = temp;
+			goto set_ixy;
+		}
+		
+		default:
+			dprintf( "Unnecessary DD/FD prefix encountered\n" );
+			warning = true;
+			pc--;
+			goto loop;
+		}
+		assert( false );
+	}
+	
+	}
+	dprintf( "Unhandled main opcode: $%02X\n", opcode );
+	assert( false );
+	
+#ifdef IDLE_ADDR
+hit_idle_addr:
+	s_time -= 11;
+	goto out_of_time;
+#endif
+halt:
+	s_time &= 3; // increment by multiple of 4
+out_of_time:
+	pc--;
+	
+	r.b.flags = flags;
+	R.ix = ix;
+	R.iy = iy;
+	R.sp = sp;
+	R.pc = pc;
+	R.b = r.b;
+	
+	CPU.cpu_state_.base = s.base;
+	CPU.cpu_state_.time = s_time;
+	CPU.cpu_state = &CPU.cpu_state_;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/adlib.h Added

@@ -0,0 +1,154 @@
+/*
+ *  Copyright (C) 2002-2009  The DOSBox Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  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: adlib.h,v 1.4 2009/04/26 10:33:53 harekiet Exp $ */
+
+#ifndef DOSBOX_ADLIB_H
+#define DOSBOX_ADLIB_H
+
+/*#include "dosbox.h"
+#include "mixer.h"
+#include "inout.h"
+#include "mixer.h"
+#include "setup.h"
+#include "pic.h"
+#include "hardware.h"*/
+
+
+namespace Adlib {
+
+struct Timer {
+	double start;
+	double delay;
+	bool enabled, overflow, masked;
+	Bit8u counter;
+	Timer() {
+		masked = false;
+		overflow = false;
+		enabled = false;
+		counter = 0;
+		delay = 0;
+	}
+	//Call update before making any further changes
+	void Update( double time ) {
+		if ( !enabled || !delay ) 
+			return;
+		double deltaStart = time - start;
+		//Only set the overflow flag when not masked
+		if ( deltaStart >= 0 && !masked ) {
+			overflow = 1;
+		}
+	}
+	//On a reset make sure the start is in sync with the next cycle
+	void Reset(const double& time ) {
+		overflow = false;
+		if ( !delay || !enabled )
+			return;
+		double delta = (time - start);
+		double rem = fmod( delta, delay );
+		double next = delay - rem;
+		start = time + next;		
+	}
+	void Stop( ) {
+		enabled = false;
+	}
+	void Start( const double& time, Bits scale ) {
+		//Don't enable again
+		if ( enabled ) {
+			return;
+		}
+		enabled = true;
+		delay = 0.001 * (256 - counter ) * scale;
+		start = time + delay;
+	}
+
+};
+
+struct Chip {
+	//Last selected register
+	Timer timer2;
+	//Check for it being a write to the timer
+	bool Write( Bit32u addr, Bit8u val );
+	//Read the current timer state, will use current double
+	Bit8u Read( );
+};
+
+//The type of handler this is
+typedef enum {
+	MODE_OPL2,
+	MODE_DUALOPL2,
+	MODE_OPL3
+} Mode;
+
+/*class Handler {
+public:
+	//Write an address to a chip, returns the address the chip sets
+	virtual Bit32u WriteAddr( Bit32u port, Bit8u val ) = 0;
+	//Write to a specific register in the chip
+	virtual void WriteReg( Bit32u addr, Bit8u val ) = 0;
+	//Generate a certain amount of samples
+	virtual void Generate( MixerChannel* chan, Bitu samples ) = 0;
+	//Initialize at a specific sample rate and mode
+	virtual void Init( Bitu rate ) = 0;
+	virtual ~Handler() {
+	}
+};*/
+
+//The cache for 2 chips or an opl3
+typedef Bit8u RegisterCache512;
+
+//Internal class used for dro capturing
+class Capture;
+
+/*class Module: public Module_base {
+	IO_ReadHandleObject ReadHandler3;
+	IO_WriteHandleObject WriteHandler3;
+	MixerObject mixerObject;
+
+	//Mode we're running in
+	Mode mode;
+	//Last selected address in the chip for the different modes
+	union {
+		Bit32u normal;
+		Bit8u dual2;
+	} reg;
+	void CacheWrite( Bit32u reg, Bit8u val );
+	void DualWrite( Bit8u index, Bit8u reg, Bit8u val );
+public:
+	static OPL_Mode oplmode;
+	MixerChannel* mixerChan;
+	Bit32u lastUsed;				//Ticks when adlib was last used to turn of mixing after a few second
+
+	Handler* handler;				//Handler that will generate the sound
+	RegisterCache cache;
+	Capture* capture;
+	Chip	chip2;
+
+	//Handle port writes
+	void PortWrite( Bitu port, Bitu val, Bitu iolen );
+	Bitu PortRead( Bitu port, Bitu iolen );
+	void Init( Mode m );
+
+	Module( Section* configuration); 
+	~Module();
+};*/
+
+
+}		//Adlib namespace
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_common.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_common.cpp Changed

@@ -1,58 +1,324 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "blargg_common.h"
-
-/* Copyright (C) 2008-2009 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_NAMESPACE_BEGIN
-
-// defined here to avoid need for blargg_errors.cpp in simple programs
-blargg_err_def_t blargg_err_memory = BLARGG_ERR_MEMORY;
-
-void blargg_vector_::init()
-{
-	begin_ = NULL;
-	size_ = 0;
-}
-
-void blargg_vector_::clear()
-{
-	void* p = begin_;
-	begin_ = NULL;
-	size_ = 0;
-	free( p );
-}
-
-blargg_err_t blargg_vector_::resize_( size_t n, size_t elem_size )
-{
-	if ( n != size_ )
-	{
-		if ( n == 0 )
-		{
-			// Simpler to handle explicitly. Realloc will handle a size of 0,
-			// but then we have to avoid raising an error for a NULL return.
-			clear();
-		}
-		else
-		{
-			void* p = realloc( begin_, n * elem_size );
-			CHECK_ALLOC( p );
-			begin_ = p;
-			size_ = n;
-		}
-	}
-	return blargg_ok;
-}
-
-BLARGG_NAMESPACE_END
+// $package. http://www.slack.net/~ant/
+
+#include "blargg_common.h"
+
+/* Copyright (C) 2008-2009 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_NAMESPACE_BEGIN
+
+// defined here to avoid need for blargg_errors.cpp in simple programs
+blargg_err_def_t blargg_err_memory = BLARGG_ERR_MEMORY;
+
+void blargg_vector_::init()
+{
+	begin_ = NULL;
+	size_ = 0;
+}
+
+void blargg_vector_::clear()
+{
+	void* p = begin_;
+	begin_ = NULL;
+	size_ = 0;
+	free( p );
+}
+
+blargg_err_t blargg_vector_::resize_( size_t n, size_t elem_size )
+{
+	if ( n != size_ )
+	{
+		if ( n == 0 )
+		{
+			// Simpler to handle explicitly. Realloc will handle a size of 0,
+			// but then we have to avoid raising an error for a NULL return.
+			clear();
+		}
+		else
+		{
+			void* p = realloc( begin_, n * elem_size );
+			CHECK_ALLOC( p );
+			begin_ = p;
+			size_ = n;
+		}
+	}
+	return blargg_ok;
+}
+
+static const BOOST::uint8_t mask_tab6={0x80,0xE0,0xF0,0xF8,0xFC,0xFE};
+
+static const BOOST::uint8_t val_tab6={0,0xC0,0xE0,0xF0,0xF8,0xFC};
+
+size_t utf8_char_len_from_header( char p_c )
+{
+	size_t cnt = 0;
+	for(;;)
+	{
+		if ( ( p_c & mask_tabcnt ) == val_tabcnt ) break;
+		if ( ++cnt >= 6 ) return 0;
+	}
+
+	return cnt + 1;
+}
+
+size_t utf8_decode_char( const char *p_utf8, unsigned & wide, size_t mmax )
+{
+	const BOOST::uint8_t * utf8 = ( const BOOST::uint8_t* )p_utf8;
+
+	if ( mmax == 0 )
+	{
+		wide = 0;
+		return 0;
+	}
+
+	if ( utf80 < 0x80 )
+	{
+		wide = utf80;
+		return utf80>0 ? 1 : 0;
+	}
+	if ( mmax > 6 ) mmax = 6;
+	wide = 0;
+
+	unsigned res=0;
+	unsigned n;
+	unsigned cnt=0;
+	for(;;)
+	{
+		if ( ( *utf8 & mask_tabcnt ) == val_tabcnt ) break;
+		if ( ++cnt >= mmax ) return 0;
+	}
+	cnt++;
+
+	if ( cnt==2 && !( *utf8 & 0x1E ) ) return 0;
+
+	if ( cnt == 1 )
+		res = *utf8;
+	else
+		res = ( 0xFF >> ( cnt + 1 ) ) & *utf8;
+
+	for ( n = 1; n < cnt; n++ )
+	{
+		if ( ( utf8n & 0xC0 ) != 0x80 )
+			return 0;
+		if ( !res && n == 2 && !( ( utf8n & 0x7F ) >> ( 7 - cnt ) ) )
+			return 0;
+
+		res = ( res << 6 ) | ( utf8n & 0x3F );
+	}
+
+	wide = res;
+
+	return cnt;
+}
+
+size_t utf8_encode_char( unsigned wide, char * target )
+{
+	size_t count;
+
+	if ( wide < 0x80 )
+		count = 1;
+	else if ( wide < 0x800 )
+		count = 2;
+	else if ( wide < 0x10000 )
+		count = 3;
+	else if ( wide < 0x200000 )
+		count = 4;
+	else if ( wide < 0x4000000 )
+		count = 5;
+	else if ( wide <= 0x7FFFFFFF )
+		count = 6;
+	else
+		return 0;
+
+	if ( target == 0 )
+		return count;
+
+	switch ( count )
+	{
+ case 6:
+		target5 = 0x80 | ( wide & 0x3F );
+		wide = wide >> 6;
+		wide |= 0x4000000;
+ case 5:
+		target4 = 0x80 | ( wide & 0x3F );
+		wide = wide >> 6;
+		wide |= 0x200000;
+ case 4:
+		target3 = 0x80 | ( wide & 0x3F );
+		wide = wide >> 6;
+		wide |= 0x10000;
+ case 3:
+		target2 = 0x80 | ( wide & 0x3F );
+		wide = wide >> 6;
+		wide |= 0x800;
+ case 2:
+		target1 = 0x80 | ( wide & 0x3F );
+		wide = wide >> 6;
+		wide |= 0xC0;
+	case 1:
+		target0 = wide;
+	}
+
+	return count;
+}
+
+size_t utf16_encode_char( unsigned cur_wchar, blargg_wchar_t * out )
+{
+	if ( cur_wchar < 0x10000 )
+	{
+ if ( out ) *out = (blargg_wchar_t) cur_wchar; return 1;
+	}
+	else if ( cur_wchar < ( 1 << 20 ) )
+	{
+		unsigned c = cur_wchar - 0x10000;
+		//MSDN:
+ //The first (high) surrogate is a 16-bit code value in the range U+D800 to U+DBFF. The second (low) surrogate is a 16-bit code value in the range U+DC00 to U+DFFF. Using surrogates, Unicode can support over one million characters. For more details about surrogates, refer to The Unicode Standard, version 2.0.
+		if ( out )
+		{
+ out0 = ( blargg_wchar_t )( 0xD800 | ( 0x3FF & ( c >> 10 ) ) );
+ out1 = ( blargg_wchar_t )( 0xDC00 | ( 0x3FF & c ) ) ;
+		}
+		return 2;
+	}
+	else
+	{
+		if ( out ) *out = '?'; return 1;
+	}
+}
+
+size_t utf16_decode_char( const blargg_wchar_t * p_source, unsigned * p_out, size_t p_source_length )
+{
+	if ( p_source_length == 0 ) return 0;
+	else if ( p_source_length == 1 )
+	{
+		*p_out = p_source0;
+		return 1;
+	}
+	else
+	{
+		size_t retval = 0;
+		unsigned decoded = p_source0;
+		if ( decoded != 0 )
+		{
+			retval = 1;
+			if ( ( decoded & 0xFC00 ) == 0xD800 )
+			{
+				unsigned low = p_source1;
+				if ( ( low & 0xFC00 ) == 0xDC00 )
+				{
+					decoded = 0x10000 + ( ( ( decoded & 0x3FF ) << 10 ) | ( low & 0x3FF ) );
+					retval = 2;
+				}
+			}
+		}
+		*p_out = decoded;
+		return retval;
+	}
+}
+
+// Converts wide-character path to UTF-8. Free result with free(). Only supported on Windows.
+char* blargg_to_utf8( const blargg_wchar_t* wpath )
+{
+	if ( wpath == NULL )
+		return NULL;
+
+	size_t needed = 0;
+ size_t mmax = blargg_wcslen( wpath );
+	if ( mmax <= 0 )
+		return NULL;
+
+	size_t ptr = 0;
+	while ( ptr < mmax )
+	{
+		unsigned wide = 0;
+		size_t char_len = utf16_decode_char( wpath + ptr, &wide, mmax - ptr );
+		if ( !char_len ) break;
+		ptr += char_len;
+		needed += utf8_encode_char( wide, 0 );
+	}
+	if ( needed <= 0 )
+		return NULL;
+
+	char* path = (char*) calloc( needed + 1, 1 );
+	if ( path == NULL )
+		return NULL;
+
+	ptr = 0;
+	size_t actual = 0;
+	while ( ptr < mmax && actual < needed )
+	{
+		unsigned wide = 0;
+		size_t char_len = utf16_decode_char( wpath + ptr, &wide, mmax - ptr );
+		if ( !char_len ) break;
+		ptr += char_len;
+		actual += utf8_encode_char( wide, path + actual );
+	}
+
+	if ( actual == 0 )
+	{
+		free( path );
+		return NULL;
+	}
+
+	assert( actual == needed );
+	return path;
+}
+
+// Converts UTF-8 path to wide-character. Free result with free() Only supported on Windows.
+blargg_wchar_t* blargg_to_wide( const char* path )
+{
+	if ( path == NULL )
+		return NULL;
+
+	size_t mmax = strlen( path );
+	if ( mmax <= 0 )
+		return NULL;
+
+	size_t needed = 0;
+	size_t ptr = 0;
+	while ( ptr < mmax )
+	{
+		unsigned wide = 0;
+		size_t char_len = utf8_decode_char( path + ptr, wide, mmax - ptr );
+		if ( !char_len ) break;
+		ptr += char_len;
+		needed += utf16_encode_char( wide, 0 );
+	}
+	if ( needed <= 0 )
+		return NULL;
+
+ blargg_wchar_t* wpath = (blargg_wchar_t*) calloc( needed + 1, sizeof *wpath );
+	if ( wpath == NULL )
+		return NULL;
+
+	ptr = 0;
+	size_t actual = 0;
+	while ( ptr < mmax && actual < needed )
+	{
+		unsigned wide = 0;
+		size_t char_len = utf8_decode_char( path + ptr, wide, mmax - ptr );
+		if ( !char_len ) break;
+		ptr += char_len;
+		actual += utf16_encode_char( wide, wpath + actual );
+	}
+	if ( actual == 0 )
+	{
+		free( wpath );
+		return NULL;
+	}
+
+	assert( actual == needed );
+	return wpath;
+}
+
+BLARGG_NAMESPACE_END

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_common.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_common.h Changed

@@ -1,224 +1,243 @@
-// Sets up common environment for Shay Green's libraries.
-// To change configuration options, modify blargg_config.h, not this file.
-
-// Game_Music_Emu 0.6-pre
-#ifndef BLARGG_COMMON_H
-#define BLARGG_COMMON_H
-
-#include <stdlib.h>
-#include <assert.h>
-#include <limits.h>
-
-typedef const char* blargg_err_t; // 0 on success, otherwise error string
-
-// Success; no error
-int const blargg_ok = 0;
-
-// BLARGG_RESTRICT: equivalent to C99's restrict, where supported
-#if __GNUC__ >= 3 || _MSC_VER >= 1100
-	#define BLARGG_RESTRICT __restrict
-#else
-	#define BLARGG_RESTRICT
-#endif
-
-#if __cplusplus >= 199711
-	#define BLARGG_MUTABLE mutable
-#else
-	#define BLARGG_MUTABLE
-#endif
-
-/* BLARGG_4CHAR('a','b','c','d') = 'abcd' (four character integer constant).
-I don't just use 'abcd' because that's implementation-dependent. */
-#define BLARGG_4CHAR( a, b, c, d ) \
-	((a&0xFF)*0x1000000 + (b&0xFF)*0x10000 + (c&0xFF)*0x100 + (d&0xFF))
-
-/* BLARGG_STATIC_ASSERT( expr ): Generates compile error if expr is 0.
-Can be used at file, function, or class scope. */
-#ifdef _MSC_VER
-	// MSVC6 (_MSC_VER < 1300) __LINE__ fails when /Zl is specified
-	#define BLARGG_STATIC_ASSERT( expr ) \
-		void blargg_failed_( int (*arg) 2 / (int) !!(expr) - 1 )
-#else
-	// Others fail when declaring same function multiple times in class,
-	// so differentiate them by line
-	#define BLARGG_STATIC_ASSERT( expr ) \
-		void blargg_failed_( int (*arg) 2 / !!(expr) - 1 __LINE__ )
-#endif
-
-/* Pure virtual functions cause a vtable entry to a "called pure virtual"
-error handler, requiring linkage to the C++ runtime library. This macro is
-used in place of the "= 0", and simply expands to its argument. During
-development, it expands to "= 0", allowing detection of missing overrides. */
-#define BLARGG_PURE( def ) def
-
-/* My code depends on ASCII anywhere a character or string constant is
-compared with data read from a file, and anywhere file data is read and
-treated as a string. */
-#if '\n'!=0x0A || ' '!=0x20 || '0'!=0x30 || 'A'!=0x41 || 'a'!=0x61
-	#error "ASCII character set required"
-#endif
-
-/* My code depends on int being at least 32 bits. Almost everything these days
-uses at least 32-bit ints, so it's hard to even find a system with 16-bit ints
-to test with. The issue can't be gotten around by using a suitable blargg_int
-everywhere either, because int is often converted to implicitly when doing
-arithmetic on smaller types. */
-#if UINT_MAX < 0xFFFFFFFF
-	#error "int must be at least 32 bits"
-#endif
-
-// In case compiler doesn't support these properly. Used rarely.
-#define STATIC_CAST(T,expr) static_cast<T> (expr)
-#define CONST_CAST( T,expr) const_cast<T> (expr)
-
-// User configuration can override the above macros if necessary
-#include "blargg_config.h"
-
-#ifdef BLARGG_NAMESPACE
-	#define BLARGG_NAMESPACE_BEGIN namespace BLARGG_NAMESPACE {
-	#define BLARGG_NAMESPACE_END }
-	
-	BLARGG_NAMESPACE_BEGIN
-	BLARGG_NAMESPACE_END
-	using namespace BLARGG_NAMESPACE;
-#else
-	#define BLARGG_NAMESPACE_BEGIN
-	#define BLARGG_NAMESPACE_END
-#endif
-
-BLARGG_NAMESPACE_BEGIN
-
-/* BLARGG_DEPRECATED _TEXT for any declarations/text to be removed in a
-future version. In GCC, we can let the compiler warn. In other compilers,
-we strip it out unless BLARGG_LEGACY is true. */
-#if BLARGG_LEGACY
-	// Allow old client code to work without warnings
-	#define BLARGG_DEPRECATED_TEXT( text ) text
-	#define BLARGG_DEPRECATED( text ) text
-#elif __GNUC__ >= 4
-	// In GCC, we can mark declarations and let the compiler warn
-	#define BLARGG_DEPRECATED_TEXT( text ) text
-	#define BLARGG_DEPRECATED( text ) __attribute__ ((deprecated)) text
-#else
-	// By default, deprecated items are removed, to avoid use in new code
-	#define BLARGG_DEPRECATED_TEXT( text )
-	#define BLARGG_DEPRECATED( text )
-#endif
-
-/* BOOST::int8_t, BOOST::int32_t, etc.
-I used BOOST since I originally was going to allow use of the boost library
-for prividing the definitions. If I'm defining them, they must be scoped or
-else they could conflict with the standard ones at global scope. Even if
-HAVE_STDINT_H isn't defined, I can't assume the typedefs won't exist at
-global scope already. */
-#if defined (HAVE_STDINT_H) || \
-		UCHAR_MAX != 0xFF || USHRT_MAX != 0xFFFF || UINT_MAX != 0xFFFFFFFF
-	#include <stdint.h>
-	#define BOOST
-#else
-	struct BOOST
-	{
-		typedef signed char int8_t;
-		typedef unsigned char uint8_t;
-		typedef short int16_t;
-		typedef unsigned short uint16_t;
-		typedef int int32_t;
-		typedef unsigned int uint32_t;
-		typedef __int64 int64_t;
-		typedef unsigned __int64 uint64_t;
-	};
-#endif
-
-/* My code is not written with exceptions in mind, so either uses new (nothrow)
-OR overrides operator new in my classes. The former is best since clients
-creating objects will get standard exceptions on failure, but that causes it
-to require the standard C++ library. So, when the client is using the C
-interface, I override operator new to use malloc. */
-
-// BLARGG_DISABLE_NOTHROW is put inside classes
-#ifndef BLARGG_DISABLE_NOTHROW
-	// throw spec mandatory in ISO C++ if NULL can be returned
-	#if __cplusplus >= 199711 || __GNUC__ >= 3 || _MSC_VER >= 1300
-		#define BLARGG_THROWS_NOTHING throw ()
-	#else
-		#define BLARGG_THROWS_NOTHING
-	#endif
-
-	#define BLARGG_DISABLE_NOTHROW \
-		void* operator new ( size_t s ) BLARGG_THROWS_NOTHING { return malloc( s ); }\
-		void operator delete( void* p ) BLARGG_THROWS_NOTHING { free( p ); }
-
-	#define BLARGG_NEW new
-#else
-	// BLARGG_NEW is used in place of new in library code
-	#include <new>
-	#define BLARGG_NEW new (std::nothrow)
-#endif
-
-	class blargg_vector_ {
-	protected:
-		void* begin_;
-		size_t size_;
-		void init();
-		blargg_err_t resize_( size_t n, size_t elem_size );
-	public:
-		size_t size() const { return size_; }
-		void clear();
-	};
-
-// Very lightweight vector for POD types (no constructor/destructor)
-template<class T>
-class blargg_vector : public blargg_vector_ {
-	union T_must_be_pod { T t; }; // fails if T is not POD
-public:
-	blargg_vector() { init(); }
-	~blargg_vector() { clear(); }
-	
-	blargg_err_t resize( size_t n ) { return resize_( n, sizeof (T) ); }
-	
-	 T* begin() { return static_cast<T*> (begin_); }
-	const T* begin() const { return static_cast<T*> (begin_); }
-	
-	 T* end() { return static_cast<T*> (begin_) + size_; }
-	const T* end() const { return static_cast<T*> (begin_) + size_; }
-	
-	T& operator ( size_t n )
-	{
-		assert( n < size_ );
-		return static_cast<T*> (begin_) n;
-	}
-	
-	const T& operator ( size_t n ) const
-	{
-		assert( n < size_ );
-		return static_cast<T*> (begin_) n;
-	}
-};
-
-// Callback function with user data.
-// blargg_callback<T> set_callback; // for user, this acts like...
-// void set_callback( T func, void* user_data = NULL ); // ...this
-// To call function, do set_callback.f( .. set_callback.data ... );
-template<class T>
-struct blargg_callback
-{
-	T f;
-	void* data;
-	blargg_callback() { f = NULL; }
-	void operator () ( T callback, void* user_data = NULL ) { f = callback; data = user_data; }
-};
-
-#ifndef _WIN32
-	// Not supported on any other platforms
-	#undef BLARGG_UTF8_PATHS
-#endif
-
-BLARGG_DEPRECATED( typedef signed int blargg_long; )
-BLARGG_DEPRECATED( typedef unsigned int blargg_ulong; )
-#if BLARGG_LEGACY
-	#define BOOST_STATIC_ASSERT BLARGG_STATIC_ASSERT
-#endif
-
-BLARGG_NAMESPACE_END
-
-#endif
+// Sets up common environment for Shay Green's libraries.
+// To change configuration options, modify blargg_config.h, not this file.
+
+// $package
+#ifndef BLARGG_COMMON_H
+#define BLARGG_COMMON_H
+
+#include <stdlib.h>
+#include <assert.h>
+#include <limits.h>
+
+typedef const char* blargg_err_t; // 0 on success, otherwise error string
+
+// Success; no error
+blargg_err_t const blargg_ok = 0;
+
+// BLARGG_RESTRICT: equivalent to C99's restrict, where supported
+#if __GNUC__ >= 3 || _MSC_VER >= 1100
+	#define BLARGG_RESTRICT __restrict
+#else
+	#define BLARGG_RESTRICT
+#endif
+
+#if __cplusplus >= 199711
+	#define BLARGG_MUTABLE mutable
+#else
+	#define BLARGG_MUTABLE
+#endif
+
+/* BLARGG_4CHAR('a','b','c','d') = 'abcd' (four character integer constant).
+I don't just use 'abcd' because that's implementation-dependent. */
+#define BLARGG_4CHAR( a, b, c, d ) \
+	((a&0xFF)*0x1000000 + (b&0xFF)*0x10000 + (c&0xFF)*0x100 + (d&0xFF))
+
+/* BLARGG_STATIC_ASSERT( expr ): Generates compile error if expr is 0.
+Can be used at file, function, or class scope. */
+#ifdef _MSC_VER
+	// MSVC6 (_MSC_VER < 1300) __LINE__ fails when /Zl is specified
+	#define BLARGG_STATIC_ASSERT( expr ) \
+		void blargg_failed_( int (*arg) 2 / (int) !!(expr) - 1 )
+#else
+	// Others fail when declaring same function multiple times in class,
+	// so differentiate them by line
+	#define BLARGG_STATIC_ASSERT( expr ) \
+		void blargg_failed_( int (*arg) 2 / !!(expr) - 1 __LINE__ )
+#endif
+
+/* Pure virtual functions cause a vtable entry to a "called pure virtual"
+error handler, requiring linkage to the C++ runtime library. This macro is
+used in place of the "= 0", and simply expands to its argument. During
+development, it expands to "= 0", allowing detection of missing overrides. */
+#define BLARGG_PURE( def ) def
+
+/* My code depends on ASCII anywhere a character or string constant is
+compared with data read from a file, and anywhere file data is read and
+treated as a string. */
+#if '\n'!=0x0A || ' '!=0x20 || '0'!=0x30 || 'A'!=0x41 || 'a'!=0x61
+	#error "ASCII character set required"
+#endif
+
+/* My code depends on int being at least 32 bits. Almost everything these days
+uses at least 32-bit ints, so it's hard to even find a system with 16-bit ints
+to test with. The issue can't be gotten around by using a suitable blargg_int
+everywhere either, because int is often converted to implicitly when doing
+arithmetic on smaller types. */
+#if UINT_MAX < 0xFFFFFFFF
+	#error "int must be at least 32 bits"
+#endif
+
+// In case compiler doesn't support these properly. Used rarely.
+#define STATIC_CAST(T,expr) static_cast<T> (expr)
+#define CONST_CAST( T,expr) const_cast<T> (expr)
+
+// User configuration can override the above macros if necessary
+#include "blargg_config.h"
+
+#ifdef BLARGG_NAMESPACE
+	#define BLARGG_NAMESPACE_BEGIN namespace BLARGG_NAMESPACE {
+	#define BLARGG_NAMESPACE_END }
+
+	BLARGG_NAMESPACE_BEGIN
+	BLARGG_NAMESPACE_END
+	using namespace BLARGG_NAMESPACE;
+#else
+	#define BLARGG_NAMESPACE_BEGIN
+	#define BLARGG_NAMESPACE_END
+#endif
+
+BLARGG_NAMESPACE_BEGIN
+
+/* BLARGG_DEPRECATED _TEXT for any declarations/text to be removed in a
+future version. In GCC, we can let the compiler warn. In other compilers,
+we strip it out unless BLARGG_LEGACY is true. */
+#if BLARGG_LEGACY
+	// Allow old client code to work without warnings
+	#define BLARGG_DEPRECATED_TEXT( text ) text
+	#define BLARGG_DEPRECATED( text ) text
+#elif __GNUC__ >= 4
+	// In GCC, we can mark declarations and let the compiler warn
+	#define BLARGG_DEPRECATED_TEXT( text ) text
+	#define BLARGG_DEPRECATED( text ) __attribute__ ((deprecated)) text
+#else
+	// By default, deprecated items are removed, to avoid use in new code
+	#define BLARGG_DEPRECATED_TEXT( text )
+	#define BLARGG_DEPRECATED( text )
+#endif
+
+/* BOOST::int8_t, BOOST::int32_t, etc.
+I used BOOST since I originally was going to allow use of the boost library
+for prividing the definitions. If I'm defining them, they must be scoped or
+else they could conflict with the standard ones at global scope. Even if
+HAVE_STDINT_H isn't defined, I can't assume the typedefs won't exist at
+global scope already. */
+#if defined (HAVE_STDINT_H) || \
+		UCHAR_MAX != 0xFF || USHRT_MAX != 0xFFFF || UINT_MAX != 0xFFFFFFFF
+	#include <stdint.h>
+	#define BOOST
+#else
+	struct BOOST
+	{
+		typedef signed char int8_t;
+		typedef unsigned char uint8_t;
+		typedef short int16_t;
+		typedef unsigned short uint16_t;
+		typedef int int32_t;
+		typedef unsigned int uint32_t;
+		typedef __int64 int64_t;
+		typedef unsigned __int64 uint64_t;
+	};
+#endif
+
+/* My code is not written with exceptions in mind, so either uses new (nothrow)
+OR overrides operator new in my classes. The former is best since clients
+creating objects will get standard exceptions on failure, but that causes it
+to require the standard C++ library. So, when the client is using the C
+interface, I override operator new to use malloc. */
+
+// BLARGG_DISABLE_NOTHROW is put inside classes
+#ifndef BLARGG_DISABLE_NOTHROW
+	// throw spec mandatory in ISO C++ if NULL can be returned
+	#if __cplusplus >= 199711 || __GNUC__ >= 3 || _MSC_VER >= 1300
+		#define BLARGG_THROWS_NOTHING throw ()
+	#else
+		#define BLARGG_THROWS_NOTHING
+	#endif
+
+	#define BLARGG_DISABLE_NOTHROW \
+		void* operator new ( size_t s ) BLARGG_THROWS_NOTHING { return malloc( s ); }\
+		void operator delete( void* p ) BLARGG_THROWS_NOTHING { free( p ); }
+
+	#define BLARGG_NEW new
+#else
+	// BLARGG_NEW is used in place of new in library code
+	#include <new>
+	#define BLARGG_NEW new (std::nothrow)
+#endif
+
+	class blargg_vector_ {
+	protected:
+		void* begin_;
+		size_t size_;
+		void init();
+		blargg_err_t resize_( size_t n, size_t elem_size );
+	public:
+		size_t size() const { return size_; }
+		void clear();
+	};
+
+// Very lightweight vector for POD types (no constructor/destructor)
+template<class T>
+class blargg_vector : public blargg_vector_ {
+	union T_must_be_pod { T t; }; // fails if T is not POD
+public:
+	blargg_vector() { init(); }
+	~blargg_vector() { clear(); }
+
+	blargg_err_t resize( size_t n ) { return resize_( n, sizeof (T) ); }
+
+	 T* begin() { return static_cast<T*> (begin_); }
+	const T* begin() const { return static_cast<T*> (begin_); }
+
+	 T* end() { return static_cast<T*> (begin_) + size_; }
+	const T* end() const { return static_cast<T*> (begin_) + size_; }
+
+	T& operator ( size_t n )
+	{
+		assert( n < size_ );
+		return static_cast<T*> (begin_) n;
+	}
+
+	const T& operator ( size_t n ) const
+	{
+		assert( n < size_ );
+		return static_cast<T*> (begin_) n;
+	}
+};
+
+// Callback function with user data.
+// blargg_callback<T> set_callback; // for user, this acts like...
+// void set_callback( T func, void* user_data = NULL ); // ...this
+// To call function, do set_callback.f( .. set_callback.data ... );
+template<class T>
+struct blargg_callback
+{
+	T f;
+	void* data;
+	blargg_callback() { f = NULL; }
+	void operator () ( T callback, void* user_data = NULL ) { f = callback; data = user_data; }
+};
+
+#ifndef _WIN32
+	// Not supported on any other platforms
+	#undef BLARGG_UTF8_PATHS
+#endif
+
+BLARGG_DEPRECATED( typedef signed int blargg_long; )
+BLARGG_DEPRECATED( typedef unsigned int blargg_ulong; )
+#if BLARGG_LEGACY
+	#define BOOST_STATIC_ASSERT BLARGG_STATIC_ASSERT
+#endif
+
+#ifdef _WIN32
+typedef wchar_t blargg_wchar_t;
+#elif defined(HAVE_STDINT_H)
+#include <stdint.h>
+typedef uint16_t blargg_wchar_t;
+#else
+typedef unsigned short blargg_wchar_t;
+#endif
+
+inline size_t blargg_wcslen( const blargg_wchar_t* str )
+{
+ size_t length = 0;
+ while ( *str++ ) length++;
+ return length;
+}
+
+char* blargg_to_utf8( const blargg_wchar_t* );
+blargg_wchar_t* blargg_to_wide( const char* );
+
+BLARGG_NAMESPACE_END
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_config.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_config.h Changed

@@ -1,55 +1,56 @@
-// Library configuration. Modify this file as necessary.
-
-// Game_Music_Emu 0.6-pre
-#ifndef BLARGG_CONFIG_H
-#define BLARGG_CONFIG_H
-
-// Uncomment a #define line below to have effect described.
-
-// Allow static linking with this library and one of my other libraries
-// in the same program.
-//#define BLARGG_NAMESPACE blargg_gme
-
-// Use zlib for transparent decompression of gzipped files.
-//#define HAVE_ZLIB_H
-
-// Support only listed music types. Remove a line to disable that type.
-/* #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_sgc_type,\
-	gme_spc_type,\
-	gme_vgm_type,\
-	gme_vgz_type
-*/
-
-// Enable platform-specific optimizations.
-//#define BLARGG_NONPORTABLE 1
-
-// Use faster sample rate convertor for SPC music.
-//#define GME_SPC_FAST_RESAMPLER 1
-
-// Use faster sample rate convertor for VGM and GYM music.
-//#define GME_VGM_FAST_RESAMPLER 1
-
-// Use faster, significantly lower quality sound synthesis for classic emulators.
-//#define BLIP_BUFFER_FAST 1
-
-// Reduce memory usage of gme.h by disabling gme_set_effects_config().
-//#define GME_DISABLE_EFFECTS 1
-
-// Force library to use assume big-endian processor.
-//#define BLARGG_BIG_ENDIAN 1
-
-// Use standard config.h if present
-#ifdef HAVE_CONFIG_H
-	#include "config.h"
-#endif
-
-#endif
+// Library configuration. Modify this file as necessary.
+
+// $package
+#ifndef BLARGG_CONFIG_H
+#define BLARGG_CONFIG_H
+
+// Uncomment a #define line below to have effect described.
+
+// Allow static linking with this library and one of my other libraries
+// in the same program.
+//#define BLARGG_NAMESPACE blargg_gme
+
+// Use zlib for transparent decompression of gzipped files.
+//#define HAVE_ZLIB_H
+
+// Support only listed music types. Remove a line to disable that type.
+/* #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_sfm_type,\
+	gme_sgc_type,\
+	gme_spc_type,\
+	gme_vgm_type,\
+	gme_vgz_type
+*/
+
+// Enable platform-specific optimizations.
+//#define BLARGG_NONPORTABLE 1
+
+// Use faster sample rate convertor for SPC music.
+//#define GME_SPC_FAST_RESAMPLER 1
+
+// Use faster sample rate convertor for VGM and GYM music.
+//#define GME_VGM_FAST_RESAMPLER 1
+
+// Use faster, significantly lower quality sound synthesis for classic emulators.
+//#define BLIP_BUFFER_FAST 1
+
+// Reduce memory usage of gme.h by disabling gme_set_effects_config().
+//#define GME_DISABLE_EFFECTS 1
+
+// Force library to use assume big-endian processor.
+//#define BLARGG_BIG_ENDIAN 1
+
+// Use standard config.h if present
+#ifdef HAVE_CONFIG_H
+	#include "config.h"
+#endif
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_endian.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_endian.h Changed

@@ -1,189 +1,203 @@
-// CPU Byte Order Utilities
-
-// Game_Music_Emu 0.6-pre
-#ifndef BLARGG_ENDIAN_H
-#define BLARGG_ENDIAN_H
-
-#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
-
-BLARGG_NAMESPACE_BEGIN
-
-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 unsigned get_le32( void const* p )
-{
-	return (unsigned) ((unsigned char const*) p) 3 << 24 |
-			(unsigned) ((unsigned char const*) p) 2 << 16 |
-			(unsigned) ((unsigned char const*) p) 1 << 8 |
-			(unsigned) ((unsigned char const*) p) 0;
-}
-
-inline unsigned get_be32( void const* p )
-{
-	return (unsigned) ((unsigned char const*) p) 0 << 24 |
-			(unsigned) ((unsigned char const*) p) 1 << 16 |
-			(unsigned) ((unsigned char const*) p) 2 << 8 |
-			(unsigned) ((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, unsigned 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, unsigned 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 const*) (addr))
-		#define GET_LE32( addr ) (*(BOOST::uint32_t const*) (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 const*) (addr))
-		#define GET_BE32( addr ) (*(BOOST::uint32_t const*) (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, unsigned 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, unsigned n ) { SET_BE32( p, n ); }
-inline unsigned get_le( BOOST::uint16_t const* p ) { return GET_LE16( p ); }
-inline unsigned get_le( BOOST::uint32_t const* p ) { return GET_LE32( p ); }
-inline unsigned get_be( BOOST::uint16_t const* p ) { return GET_BE16( p ); }
-inline unsigned get_be( BOOST::uint32_t const* p ) { return GET_BE32( p ); }
-
-BLARGG_NAMESPACE_END
-
-#endif
+// CPU Byte Order Utilities
+
+// $package
+#ifndef BLARGG_ENDIAN_H
+#define BLARGG_ENDIAN_H
+
+#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)
+#if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && defined(__BIG_ENDIAN)
+	// 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
+
+BLARGG_NAMESPACE_BEGIN
+
+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 unsigned get_le24( void const* p )
+{
+	return	(unsigned) ((unsigned char const*) p) 2 << 16 |
+			(unsigned) ((unsigned char const*) p) 1 << 8 |
+			(unsigned) ((unsigned char const*) p) 0;
+}
+
+inline unsigned get_be24( void const* p )
+{
+	return	(unsigned) ((unsigned char const*) p) 0 << 16 |
+			(unsigned) ((unsigned char const*) p) 1 << 8 |
+			(unsigned) ((unsigned char const*) p) 2;
+}
+
+inline unsigned get_le32( void const* p )
+{
+	return (unsigned) ((unsigned char const*) p) 3 << 24 |
+			(unsigned) ((unsigned char const*) p) 2 << 16 |
+			(unsigned) ((unsigned char const*) p) 1 << 8 |
+			(unsigned) ((unsigned char const*) p) 0;
+}
+
+inline unsigned get_be32( void const* p )
+{
+	return (unsigned) ((unsigned char const*) p) 0 << 24 |
+			(unsigned) ((unsigned char const*) p) 1 << 16 |
+			(unsigned) ((unsigned char const*) p) 2 << 8 |
+			(unsigned) ((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, unsigned 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, unsigned 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 const*) (addr))
+		#define GET_LE32( addr ) (*(BOOST::uint32_t const*) (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 const*) (addr))
+		#define GET_BE32( addr ) (*(BOOST::uint32_t const*) (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, unsigned 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, unsigned n ) { SET_BE32( p, n ); }
+inline unsigned get_le( BOOST::uint16_t const* p ) { return GET_LE16( p ); }
+inline unsigned get_le( BOOST::uint32_t const* p ) { return GET_LE32( p ); }
+inline unsigned get_be( BOOST::uint16_t const* p ) { return GET_BE16( p ); }
+inline unsigned get_be( BOOST::uint32_t const* p ) { return GET_BE32( p ); }
+
+BLARGG_NAMESPACE_END
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_errors.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_errors.cpp Changed

@@ -1,117 +1,117 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "blargg_errors.h"
-
-/* Copyright (C) 2009 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_NAMESPACE_BEGIN
-
-blargg_err_def_t blargg_err_generic      = BLARGG_ERR_GENERIC;
-// blargg_err_memory is defined in blargg_common.cpp
-blargg_err_def_t blargg_err_caller       = BLARGG_ERR_CALLER;
-blargg_err_def_t blargg_err_internal     = BLARGG_ERR_INTERNAL;
-blargg_err_def_t blargg_err_limitation   = BLARGG_ERR_LIMITATION;
-
-blargg_err_def_t blargg_err_file_missing = BLARGG_ERR_FILE_MISSING;
-blargg_err_def_t blargg_err_file_read    = BLARGG_ERR_FILE_READ;
-blargg_err_def_t blargg_err_file_write   = BLARGG_ERR_FILE_WRITE;
-blargg_err_def_t blargg_err_file_io      = BLARGG_ERR_FILE_IO;
-blargg_err_def_t blargg_err_file_full    = BLARGG_ERR_FILE_FULL;
-blargg_err_def_t blargg_err_file_eof     = BLARGG_ERR_FILE_EOF;
-
-blargg_err_def_t blargg_err_file_type    = BLARGG_ERR_FILE_TYPE;
-blargg_err_def_t blargg_err_file_feature = BLARGG_ERR_FILE_FEATURE;
-blargg_err_def_t blargg_err_file_corrupt = BLARGG_ERR_FILE_CORRUPT;
-
-const char* blargg_err_str( blargg_err_t err )
-{
-	if ( !err )
-		return "";
-	
-	if ( *err == BLARGG_ERR_TYPE("")0 )
-		return err + 1;
-	
-	return err;
-}
-
-bool blargg_is_err_type( blargg_err_t err, const char type  )
-{
-	if ( err )
-	{
-		// True if first strlen(type) characters of err match type
-		char const* p = err;
-		while ( *type && *type == *p )
-		{
-			type++;
-			p++;
-		}
-		
-		if ( !*type )
-			return true;
-	}
-	
-	return false;
-}
-
-const char* blargg_err_details( blargg_err_t err )
-{
-	const char* p = err;
-	if ( !p )
-	{
-		p = "";
-	}
-	else if ( *p == BLARGG_ERR_TYPE("")0 )
-	{
-		while ( *p && *p != ';' )
-			p++;
-		
-		// Skip ; and space after it
-		if ( *p )
-		{
-			p++;
-		
-			check( *p == ' ' );
-			if ( *p )
-				p++;
-		}
-	}
-	return p;
-}
-
-int blargg_err_to_code( blargg_err_t err, blargg_err_to_code_t const codes  )
-{
-	if ( !err )
-		return 0;
-	
-	while ( codes->str && !blargg_is_err_type( err, codes->str ) )
-		codes++;
-	
-	return codes->code;
-}
-
-blargg_err_t blargg_code_to_err( int code, blargg_err_to_code_t const codes  )
-{
-	if ( !code )
-		return blargg_ok;
-	
-	while ( codes->str && codes->code != code )
-		codes++;
-	
-	if ( !codes->str )
-		return blargg_err_generic;
-	
-	return codes->str;
-}
-
-BLARGG_NAMESPACE_END
+// $package. http://www.slack.net/~ant/
+
+#include "blargg_errors.h"
+
+/* Copyright (C) 2009 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_NAMESPACE_BEGIN
+
+blargg_err_def_t blargg_err_generic      = BLARGG_ERR_GENERIC;
+// blargg_err_memory is defined in blargg_common.cpp
+blargg_err_def_t blargg_err_caller       = BLARGG_ERR_CALLER;
+blargg_err_def_t blargg_err_internal     = BLARGG_ERR_INTERNAL;
+blargg_err_def_t blargg_err_limitation   = BLARGG_ERR_LIMITATION;
+
+blargg_err_def_t blargg_err_file_missing = BLARGG_ERR_FILE_MISSING;
+blargg_err_def_t blargg_err_file_read    = BLARGG_ERR_FILE_READ;
+blargg_err_def_t blargg_err_file_write   = BLARGG_ERR_FILE_WRITE;
+blargg_err_def_t blargg_err_file_io      = BLARGG_ERR_FILE_IO;
+blargg_err_def_t blargg_err_file_full    = BLARGG_ERR_FILE_FULL;
+blargg_err_def_t blargg_err_file_eof     = BLARGG_ERR_FILE_EOF;
+
+blargg_err_def_t blargg_err_file_type    = BLARGG_ERR_FILE_TYPE;
+blargg_err_def_t blargg_err_file_feature = BLARGG_ERR_FILE_FEATURE;
+blargg_err_def_t blargg_err_file_corrupt = BLARGG_ERR_FILE_CORRUPT;
+
+const char* blargg_err_str( blargg_err_t err )
+{
+	if ( !err )
+		return "";
+	
+	if ( *err == BLARGG_ERR_TYPE("")0 )
+		return err + 1;
+	
+	return err;
+}
+
+bool blargg_is_err_type( blargg_err_t err, const char type  )
+{
+	if ( err )
+	{
+		// True if first strlen(type) characters of err match type
+		char const* p = err;
+		while ( *type && *type == *p )
+		{
+			type++;
+			p++;
+		}
+		
+		if ( !*type )
+			return true;
+	}
+	
+	return false;
+}
+
+const char* blargg_err_details( blargg_err_t err )
+{
+	const char* p = err;
+	if ( !p )
+	{
+		p = "";
+	}
+	else if ( *p == BLARGG_ERR_TYPE("")0 )
+	{
+		while ( *p && *p != ';' )
+			p++;
+		
+		// Skip ; and space after it
+		if ( *p )
+		{
+			p++;
+		
+			check( *p == ' ' );
+			if ( *p )
+				p++;
+		}
+	}
+	return p;
+}
+
+int blargg_err_to_code( blargg_err_t err, blargg_err_to_code_t const codes  )
+{
+	if ( !err )
+		return 0;
+	
+	while ( codes->str && !blargg_is_err_type( err, codes->str ) )
+		codes++;
+	
+	return codes->code;
+}
+
+blargg_err_t blargg_code_to_err( int code, blargg_err_to_code_t const codes  )
+{
+	if ( !code )
+		return blargg_ok;
+	
+	while ( codes->str && codes->code != code )
+		codes++;
+	
+	if ( !codes->str )
+		return blargg_err_generic;
+	
+	return codes->str;
+}
+
+BLARGG_NAMESPACE_END

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_errors.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_errors.h Changed

@@ -1,84 +1,84 @@
-// Error strings and conversion functions
-
-// Game_Music_Emu 0.6-pre
-#ifndef BLARGG_ERRORS_H
-#define BLARGG_ERRORS_H
-
-#ifndef BLARGG_COMMON_H
-	#include "blargg_common.h"
-#endif
-
-BLARGG_NAMESPACE_BEGIN
-
-typedef const char blargg_err_def_t ;
-
-// Basic errors
-extern blargg_err_def_t blargg_err_generic;
-extern blargg_err_def_t blargg_err_memory;
-extern blargg_err_def_t blargg_err_caller;
-extern blargg_err_def_t blargg_err_internal;
-extern blargg_err_def_t blargg_err_limitation;
-
-// File low-level
-extern blargg_err_def_t blargg_err_file_missing; // not found
-extern blargg_err_def_t blargg_err_file_read;
-extern blargg_err_def_t blargg_err_file_write;
-extern blargg_err_def_t blargg_err_file_io;
-extern blargg_err_def_t blargg_err_file_full;
-extern blargg_err_def_t blargg_err_file_eof;
-
-// File high-level
-extern blargg_err_def_t blargg_err_file_type;   // wrong file type
-extern blargg_err_def_t blargg_err_file_feature;
-extern blargg_err_def_t blargg_err_file_corrupt;
-
-// C string describing error, or "" if err == NULL
-const char* blargg_err_str( blargg_err_t err );
-
-// True iff error is of given type, or false if err == NULL
-bool blargg_is_err_type( blargg_err_t, const char type  );
-
-// Details of error without describing main cause, or "" if err == NULL
-const char* blargg_err_details( blargg_err_t err );
-
-// Converts error string to integer code using mapping table. Calls blargg_is_err_type()
-// for each str and returns code on first match. Returns 0 if err == NULL.
-struct blargg_err_to_code_t {
-	const char* str;
-	int code;
-};
-int blargg_err_to_code( blargg_err_t err, blargg_err_to_code_t const  );
-
-// Converts error code back to string. If code == 0, returns NULL. If not in table,
-// returns blargg_err_generic.
-blargg_err_t blargg_code_to_err( int code, blargg_err_to_code_t const  );
-
-// Generates error string literal with details of cause
-#define BLARGG_ERR( type, str ) (type "; " str)
-
-// Extra space to make it clear when blargg_err_str() isn't called to get
-// printable version of error. At some point, I might prefix error strings
-// with a code, to speed conversion to a code.
-#define BLARGG_ERR_TYPE( str )  " " str
-
-// Error types to pass to BLARGG_ERR macro
-#define BLARGG_ERR_GENERIC      BLARGG_ERR_TYPE( "operation failed" )
-#define BLARGG_ERR_MEMORY       BLARGG_ERR_TYPE( "out of memory" )
-#define BLARGG_ERR_CALLER       BLARGG_ERR_TYPE( "internal usage bug" )
-#define BLARGG_ERR_INTERNAL     BLARGG_ERR_TYPE( "internal bug" )
-#define BLARGG_ERR_LIMITATION   BLARGG_ERR_TYPE( "exceeded limitation" )
-
-#define BLARGG_ERR_FILE_MISSING BLARGG_ERR_TYPE( "file not found" )
-#define BLARGG_ERR_FILE_READ    BLARGG_ERR_TYPE( "couldn't open file" )
-#define BLARGG_ERR_FILE_WRITE   BLARGG_ERR_TYPE( "couldn't modify file" )
-#define BLARGG_ERR_FILE_IO      BLARGG_ERR_TYPE( "read/write error" )
-#define BLARGG_ERR_FILE_FULL    BLARGG_ERR_TYPE( "disk full" )
-#define BLARGG_ERR_FILE_EOF     BLARGG_ERR_TYPE( "truncated file" )
-
-#define BLARGG_ERR_FILE_TYPE    BLARGG_ERR_TYPE( "wrong file type" )
-#define BLARGG_ERR_FILE_FEATURE BLARGG_ERR_TYPE( "unsupported file feature" )
-#define BLARGG_ERR_FILE_CORRUPT BLARGG_ERR_TYPE( "corrupt file" )
-
-BLARGG_NAMESPACE_END
-
-#endif
+// Error strings and conversion functions
+
+// $package
+#ifndef BLARGG_ERRORS_H
+#define BLARGG_ERRORS_H
+
+#ifndef BLARGG_COMMON_H
+	#include "blargg_common.h"
+#endif
+
+BLARGG_NAMESPACE_BEGIN
+
+typedef const char blargg_err_def_t ;
+
+// Basic errors
+extern blargg_err_def_t blargg_err_generic;
+extern blargg_err_def_t blargg_err_memory;
+extern blargg_err_def_t blargg_err_caller;
+extern blargg_err_def_t blargg_err_internal;
+extern blargg_err_def_t blargg_err_limitation;
+
+// File low-level
+extern blargg_err_def_t blargg_err_file_missing; // not found
+extern blargg_err_def_t blargg_err_file_read;
+extern blargg_err_def_t blargg_err_file_write;
+extern blargg_err_def_t blargg_err_file_io;
+extern blargg_err_def_t blargg_err_file_full;
+extern blargg_err_def_t blargg_err_file_eof;
+
+// File high-level
+extern blargg_err_def_t blargg_err_file_type;   // wrong file type
+extern blargg_err_def_t blargg_err_file_feature;
+extern blargg_err_def_t blargg_err_file_corrupt;
+
+// C string describing error, or "" if err == NULL
+const char* blargg_err_str( blargg_err_t err );
+
+// True iff error is of given type, or false if err == NULL
+bool blargg_is_err_type( blargg_err_t, const char type  );
+
+// Details of error without describing main cause, or "" if err == NULL
+const char* blargg_err_details( blargg_err_t err );
+
+// Converts error string to integer code using mapping table. Calls blargg_is_err_type()
+// for each str and returns code on first match. Returns 0 if err == NULL.
+struct blargg_err_to_code_t {
+	const char* str;
+	int code;
+};
+int blargg_err_to_code( blargg_err_t err, blargg_err_to_code_t const  );
+
+// Converts error code back to string. If code == 0, returns NULL. If not in table,
+// returns blargg_err_generic.
+blargg_err_t blargg_code_to_err( int code, blargg_err_to_code_t const  );
+
+// Generates error string literal with details of cause
+#define BLARGG_ERR( type, str ) (type "; " str)
+
+// Extra space to make it clear when blargg_err_str() isn't called to get
+// printable version of error. At some point, I might prefix error strings
+// with a code, to speed conversion to a code.
+#define BLARGG_ERR_TYPE( str )  " " str
+
+// Error types to pass to BLARGG_ERR macro
+#define BLARGG_ERR_GENERIC      BLARGG_ERR_TYPE( "operation failed" )
+#define BLARGG_ERR_MEMORY       BLARGG_ERR_TYPE( "out of memory" )
+#define BLARGG_ERR_CALLER       BLARGG_ERR_TYPE( "internal usage bug" )
+#define BLARGG_ERR_INTERNAL     BLARGG_ERR_TYPE( "internal bug" )
+#define BLARGG_ERR_LIMITATION   BLARGG_ERR_TYPE( "exceeded limitation" )
+
+#define BLARGG_ERR_FILE_MISSING BLARGG_ERR_TYPE( "file not found" )
+#define BLARGG_ERR_FILE_READ    BLARGG_ERR_TYPE( "couldn't open file" )
+#define BLARGG_ERR_FILE_WRITE   BLARGG_ERR_TYPE( "couldn't modify file" )
+#define BLARGG_ERR_FILE_IO      BLARGG_ERR_TYPE( "read/write error" )
+#define BLARGG_ERR_FILE_FULL    BLARGG_ERR_TYPE( "disk full" )
+#define BLARGG_ERR_FILE_EOF     BLARGG_ERR_TYPE( "truncated file" )
+
+#define BLARGG_ERR_FILE_TYPE    BLARGG_ERR_TYPE( "wrong file type" )
+#define BLARGG_ERR_FILE_FEATURE BLARGG_ERR_TYPE( "unsupported file feature" )
+#define BLARGG_ERR_FILE_CORRUPT BLARGG_ERR_TYPE( "corrupt file" )
+
+BLARGG_NAMESPACE_END
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_source.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/blargg_source.h Changed

@@ -1,135 +1,174 @@
-/* Included at the beginning of library source files, AFTER all other #include
-lines. Sets up helpful macros and services used in my source code. Since this
-is only "active" in my source code, I don't have to worry about polluting the
-global namespace with unprefixed names. */
-
-// Game_Music_Emu 0.6-pre
-#ifndef BLARGG_SOURCE_H
-#define BLARGG_SOURCE_H
-
-#ifndef BLARGG_COMMON_H // optimization only
-	#include "blargg_common.h"
-#endif
-#include "blargg_errors.h"
-
-#include <string.h> /* memcpy(), memset(), memmove() */
-#include <stddef.h> /* offsetof() */
-
-/* The following four macros are for debugging only. Some or all might be
-defined to do nothing, depending on the circumstances. Described is what
-happens when a particular macro is defined to do something. When defined to
-do nothing, the macros do NOT evaluate their argument(s). */
-
-/* If expr is false, prints file and line number, then aborts program. Meant
-for checking internal state and consistency. A failed assertion indicates a bug
-in MY code.
-
-void assert( bool expr ); */
-#include <assert.h>
-
-/* If expr is false, prints file and line number, then aborts program. Meant
-for checking caller-supplied parameters and operations that are outside the
-control of the module. A failed requirement probably indicates a bug in YOUR
-code.
-
-void require( bool expr ); */
-#undef require
-#define require( expr ) assert( expr )
-
-/* Like printf() except output goes to debugging console/file.
-
-void dprintf( const char format , ... ); */
-#ifdef NDEBUG
-static inline void blargg_dprintf_( const char , ... ) { }
-#undef dprintf
-#define dprintf (1) ? (void) 0 : blargg_dprintf_
-#else
-#include <stdarg.h>
-#include <stdio.h>
-static inline void blargg_dprintf_( const char * fmt, ... )
-{
-}
-#undef dprintf
-#define dprintf blargg_dprintf_
-#endif
-
-/* If expr is false, prints file and line number to debug console/log, then
-continues execution normally. Meant for flagging potential problems or things
-that should be looked into, but that aren't serious problems.
-
-void check( bool expr ); */
-#undef check
-#define check( expr ) ((void) 0)
-
-/* If expr yields non-NULL error string, returns it from current function,
-otherwise continues normally. */
-#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 NULL, returns out-of-memory error, otherwise continues normally. */
-#undef CHECK_ALLOC
-#define CHECK_ALLOC( ptr ) \
-	do {\
-		if ( !(ptr) )\
-			return blargg_err_memory;\
-	} while ( 0 )
-
-/* The usual min/max functions for built-in types.
-
-template<typename T> T min( T x, T y ) { return x < y ? x : y; }
-template<typename T> T max( T x, T y ) { return x > y ? x : y; } */
-#define BLARGG_DEF_MIN_MAX( type ) \
-	static inline type blargg_min( type x, type y ) { if ( y < x ) x = y; return x; }\
-	static inline type blargg_max( type x, type y ) { if ( x < y ) x = y; return x; }
-
-BLARGG_DEF_MIN_MAX( int )
-BLARGG_DEF_MIN_MAX( unsigned )
-BLARGG_DEF_MIN_MAX( long )
-BLARGG_DEF_MIN_MAX( unsigned long )
-BLARGG_DEF_MIN_MAX( float )
-BLARGG_DEF_MIN_MAX( double )
-
-#undef min
-#define min blargg_min
-
-#undef max
-#define max blargg_max
-
-// typedef unsigned char byte;
-typedef unsigned char blargg_byte;
-#undef byte
-#define byte blargg_byte
-
-#ifndef BLARGG_EXPORT
-	#if defined (_WIN32) && BLARGG_BUILD_DLL
-		#define BLARGG_EXPORT __declspec(dllexport)
-	#elif defined (__GNUC__)
-		// can always set visibility, even when not building DLL
-		#define BLARGG_EXPORT __attribute__ ((visibility ("default")))
-	#else
-		#define BLARGG_EXPORT
-	#endif
-#endif
-
-#if BLARGG_LEGACY
-	#define BLARGG_CHECK_ALLOC CHECK_ALLOC
-	#define BLARGG_RETURN_ERR RETURN_ERR
-#endif
-
-// Called after failed operation when overall operation may still complete OK.
-// Only used by unit testing framework.
-#undef ACK_FAILURE
-#define ACK_FAILURE() ((void)0)
-
-/* BLARGG_SOURCE_BEGIN: If defined, #included, allowing redefition of dprintf etc.
-and check */
-#ifdef BLARGG_SOURCE_BEGIN
-	#include BLARGG_SOURCE_BEGIN
-#endif
-
-#endif
+/* Included at the beginning of library source files, AFTER all other #include
+lines. Sets up helpful macros and services used in my source code. Since this
+is only "active" in my source code, I don't have to worry about polluting the
+global namespace with unprefixed names. */
+
+// $package
+#ifndef BLARGG_SOURCE_H
+#define BLARGG_SOURCE_H
+
+#ifndef BLARGG_COMMON_H // optimization only
+	#include "blargg_common.h"
+#endif
+#include "blargg_errors.h"
+#include "gme_custom_dprintf.h"
+
+#include <string.h> /* memcpy(), memset(), memmove() */
+#include <stddef.h> /* offsetof() */
+
+/* The following four macros are for debugging only. Some or all might be
+defined to do nothing, depending on the circumstances. Described is what
+happens when a particular macro is defined to do something. When defined to
+do nothing, the macros do NOT evaluate their argument(s). */
+
+/* If expr is false, prints file and line number, then aborts program. Meant
+for checking internal state and consistency. A failed assertion indicates a bug
+in MY code.
+
+void assert( bool expr ); */
+#include <assert.h>
+
+/* If expr is false, prints file and line number, then aborts program. Meant
+for checking caller-supplied parameters and operations that are outside the
+control of the module. A failed requirement probably indicates a bug in YOUR
+code.
+
+void require( bool expr ); */
+#undef require
+#define require( expr ) assert( expr )
+
+/* Like printf() except output goes to debugging console/file.
+
+void dprintf( const char format , ... ); */
+
+#ifdef CUSTOM_DPRINTF_FUNCTION
+
+static inline void dprintf( const char * fmt, ... )
+{
+	if (gme_custom_dprintf)
+	{
+		va_list vl;
+		va_start(vl, fmt);
+		gme_custom_dprintf(fmt, vl);
+		va_end(vl);
+	}
+}
+
+#else
+
+#ifdef NDEBUG
+static inline void blargg_dprintf_( const char , ... ) { }
+#undef dprintf
+#define dprintf (1) ? (void) 0 : blargg_dprintf_
+#else
+#include <stdarg.h>
+#include <stdio.h>
+#undef dprintf
+#define dprintf (1) ? (void) 0 : blargg_dprintf_
+#ifndef _WIN32
+#include <stdio.h>
+static inline void blargg_dprintf_( const char * fmt, ... )
+{
+	char error512;
+	va_list vl;
+	va_start(vl, fmt);
+	vsnprintf( error, 511, fmt, vl );
+	va_end(vl);
+	fputs( error, stderr );
+}
+#else
+#include <windows.h>
+static inline void blargg_dprintf_( const char * fmt, ... )
+{
+	char error512;
+	va_list vl;
+	va_start(vl, fmt);
+	vsnprintf_s( error, 511, 511, fmt, vl );
+	va_end(vl);
+	OutputDebugStringA( error );
+}
+#endif
+#endif
+
+#endif
+
+/* If expr is false, prints file and line number to debug console/log, then
+continues execution normally. Meant for flagging potential problems or things
+that should be looked into, but that aren't serious problems.
+
+void check( bool expr ); */
+#undef check
+#define check( expr ) ((void) 0)
+
+/* If expr yields non-NULL error string, returns it from current function,
+otherwise continues normally. */
+#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 NULL, returns out-of-memory error, otherwise continues normally. */
+#undef CHECK_ALLOC
+#define CHECK_ALLOC( ptr ) \
+	do {\
+		if ( !(ptr) )\
+			return blargg_err_memory;\
+	} while ( 0 )
+
+/* The usual min/max functions for built-in types.
+
+template<typename T> T min( T x, T y ) { return x < y ? x : y; }
+template<typename T> T max( T x, T y ) { return x > y ? x : y; } */
+#define BLARGG_DEF_MIN_MAX( type ) \
+	static inline type blargg_min( type x, type y ) { if ( y < x ) x = y; return x; }\
+	static inline type blargg_max( type x, type y ) { if ( x < y ) x = y; return x; }
+
+BLARGG_DEF_MIN_MAX( int32_t )
+BLARGG_DEF_MIN_MAX( int64_t )
+BLARGG_DEF_MIN_MAX( uint32_t )
+BLARGG_DEF_MIN_MAX( uint64_t )
+BLARGG_DEF_MIN_MAX( float )
+BLARGG_DEF_MIN_MAX( double )
+
+#undef min
+#define min blargg_min
+
+#undef max
+#define max blargg_max
+
+// typedef unsigned char byte;
+typedef unsigned char blargg_byte;
+#undef byte
+#define byte blargg_byte
+
+#ifndef BLARGG_EXPORT
+	#if defined (_WIN32) && BLARGG_BUILD_DLL
+		#define BLARGG_EXPORT __declspec(dllexport)
+	#elif defined (__GNUC__)
+		// can always set visibility, even when not building DLL
+		#define BLARGG_EXPORT __attribute__ ((visibility ("default")))
+	#else
+		#define BLARGG_EXPORT
+	#endif
+#endif
+
+#if BLARGG_LEGACY
+	#define BLARGG_CHECK_ALLOC CHECK_ALLOC
+	#define BLARGG_RETURN_ERR RETURN_ERR
+#endif
+
+// Called after failed operation when overall operation may still complete OK.
+// Only used by unit testing framework.
+#undef ACK_FAILURE
+#define ACK_FAILURE() ((void)0)
+
+/* BLARGG_SOURCE_BEGIN: If defined, #included, allowing redefition of dprintf etc.
+and check */
+#ifdef BLARGG_SOURCE_BEGIN
+	#include BLARGG_SOURCE_BEGIN
+#endif
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/gme.cpp -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/gme.cpp Changed

@@ -1,431 +1,469 @@
-// Game_Music_Emu 0.6-pre. http://www.slack.net/~ant/
-
-#include "Music_Emu.h"
-
-#if !GME_DISABLE_EFFECTS
-#include "Effects_Buffer.h"
-#endif
-#include "blargg_endian.h"
-#include <string.h>
-#include <ctype.h>
-
-/* Copyright (C) 2003-2009 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"
-
-#ifndef GME_TYPE_LIST
-
-// Default list of all supported game music types (copy this to blargg_config.h
-// if you want to modify it)
-#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_sgc_type,\
-	gme_spc_type,\
-	gme_vgm_type,\
-	gme_vgz_type
-
-#endif
-
-static gme_type_t const gme_type_list_ = { GME_TYPE_LIST, 0 };
-
-gme_type_t const* gme_type_list()
-{
-	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','G','C',0x1A): return "SGC";
-		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 );
-	
-	gme_type_t const* types = gme_type_list_;
-	for ( ; *types; types++ )
-		if ( !strcmp( extension, (*types)->extension_ ) )
-			break;
-	return *types;
-}
-
-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 blargg_ok; 
-}
-
-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 = NULL;
-	
-	gme_type_t file_type = 0;
-	if ( size >= 4 )
-		file_type = gme_identify_extension( path );
-	if ( !file_type )
-		return blargg_err_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 = NULL;
-	
-	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 blargg_err_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* gme = type->new_emu();
-		if ( gme )
-		{
-		#if !GME_DISABLE_EFFECTS
-			if ( type->flags_ & 1 )
-			{
-				gme->effects_buffer_ = BLARGG_NEW Simple_Effects_Buffer;
-				if ( gme->effects_buffer_ )
-					gme->set_buffer( gme->effects_buffer_ );
-			}
-			
-			if ( !(type->flags_ & 1) || gme->effects_buffer_ )
-		#endif
-			{
-				if ( !gme->set_sample_rate( rate ) )
-				{
-					check( gme->type() == type );
-					return gme;
-				}
-			}
-			delete gme;
-		}
-	}
-	return NULL;
-}
-
-gme_err_t gme_load_file( Music_Emu* gme, const char path ) { return gme->load_file( path ); }
-
-gme_err_t gme_load_data( Music_Emu* gme, void const* data, long size )
-{
-	Mem_File_Reader in( data, size );
-	return gme->load( in );
-}
-
-gme_err_t gme_load_custom( Music_Emu* gme, gme_reader_t func, long size, void* data )
-{
-	Callback_Reader in( func, size, data );
-	return gme->load( in );
-}
-
-void gme_delete( Music_Emu* gme ) { delete gme; }
-
-gme_type_t gme_type( Music_Emu const* gme ) { return gme->type(); }
-
-const char* gme_warning( Music_Emu* gme ) { return gme->warning(); }
-
-int gme_track_count( Music_Emu const* gme ) { return gme->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 blargg_ok;
-}
-
-void gme_free_info( gme_info_t* info )
-{
-	delete STATIC_CAST(gme_info_t_*,info);
-}
-
-void* gme_user_data ( Music_Emu const* gme ) { return gme->user_data(); }
-void gme_set_user_data ( Music_Emu* gme, void* new_user_data ) { gme->set_user_data( new_user_data ); }
-void gme_set_user_cleanup(Music_Emu* gme, gme_user_cleanup_t func ){ gme->set_user_cleanup( func ); }
-
-gme_err_t gme_start_track ( Music_Emu* gme, int index ) { return gme->start_track( index ); }
-gme_err_t gme_play ( Music_Emu* gme, int n, short p ) { return gme->play( n, p ); }
-void gme_set_fade ( Music_Emu* gme, int start_msec ) { gme->set_fade( start_msec ); }
-gme_bool gme_track_ended ( Music_Emu const* gme ) { return gme->track_ended(); }
-int gme_tell ( Music_Emu const* gme ) { return gme->tell(); }
-gme_err_t gme_seek ( Music_Emu* gme, int msec ) { return gme->seek( msec ); }
-int gme_voice_count ( Music_Emu const* gme ) { return gme->voice_count(); }
-void gme_ignore_silence ( Music_Emu* gme, gme_bool disable ) { gme->ignore_silence( disable != 0 ); }
-void gme_set_tempo ( Music_Emu* gme, double t ) { gme->set_tempo( t ); }
-void gme_mute_voice ( Music_Emu* gme, int index, gme_bool mute ){ gme->mute_voice( index, mute != 0 ); }
-void gme_mute_voices ( Music_Emu* gme, int mask ) { gme->mute_voices( mask ); }
-void gme_set_equalizer ( Music_Emu* gme, gme_equalizer_t const* eq ) { gme->set_equalizer( *eq ); }
-void gme_equalizer ( Music_Emu const* gme, gme_equalizer_t* o ) { *o = gme->equalizer(); }
-const char* gme_voice_name ( Music_Emu const* gme, int i ) { return gme->voice_name( i ); }
-
-void gme_effects( Music_Emu const* gme, gme_effects_t* out )
-{
-	static gme_effects_t const zero = { 0 };
-	*out = zero;
-	
-	#if !GME_DISABLE_EFFECTS
-	{
-		Simple_Effects_Buffer* b = STATIC_CAST(Simple_Effects_Buffer*,gme->effects_buffer_);
-		if ( b )
-		{
-			out->enabled = b->config().enabled;
-			out->echo = b->config().echo;
-			out->stereo = b->config().stereo;
-			out->surround = b->config().surround;
-		}
-	}
-	#endif
-}
-
-void gme_set_effects( Music_Emu* gme, gme_effects_t const* in )
-{
-	#if !GME_DISABLE_EFFECTS
-	{
-		Simple_Effects_Buffer* b = STATIC_CAST(Simple_Effects_Buffer*,gme->effects_buffer_);
-		if ( b )
-		{
-			b->config().enabled = false;
-			if ( in )
-			{
-				b->config().enabled = in->enabled;
-				b->config().echo = in->echo;
-				b->config().stereo = in->stereo;
-				b->config().surround = in->surround;
-			}
-			b->apply_config();
-		}
-	}
-	#endif
-}
-
-void gme_set_stereo_depth( Music_Emu* gme, double depth )
-{
-	#if !GME_DISABLE_EFFECTS
-	{
-		if ( gme->effects_buffer_ )
-		{
-			gme_effects_t cfg;
-			gme_effects( gme, &cfg );
-			cfg.enabled = (depth > 0.0);
-			cfg.echo = depth;
-			cfg.stereo = depth;
-			cfg.surround = true;
-			gme_set_effects( gme, &cfg );
-		}
-	}
-	#endif
-}
-
-#define ENTRY( name ) { blargg_err_##name, gme_err_##name }
-static blargg_err_to_code_t const gme_codes =
-{
-	ENTRY( generic ),
-	ENTRY( memory ),
-	ENTRY( caller ),
-	ENTRY( internal ),
-	ENTRY( limitation ),
-	
-	ENTRY( file_missing ),
-	ENTRY( file_read ),
-	ENTRY( file_io ),
-	ENTRY( file_eof ),
-	
-	ENTRY( file_type ),
-	ENTRY( file_feature ),
-	ENTRY( file_corrupt ),
-	
-	{ 0, -1 }
-};
-#undef ENTRY
-
-static int err_code( gme_err_t err )
-{
-	return blargg_err_to_code( err, gme_codes );
-}
-
-int gme_err_code( gme_err_t err )
-{
-	int code = err_code( err );
-	return (code >= 0 ? code : gme_err_generic);
-}
-
-gme_err_t gme_code_to_err( int code )
-{
-	return blargg_code_to_err( code, gme_codes );
-}
-
-const char* gme_err_details( gme_err_t err )
-{
-	// If we don't have error code assigned, return entire string
-	return (err_code( err ) >= 0 ? blargg_err_details( err ) : blargg_err_str( err ));
-}
-
-const char* gme_err_str( gme_err_t err )
-{
-	return blargg_err_str( err );
-}
+// Game_Music_Emu $vers. http://www.slack.net/~ant/
+
+#include "Music_Emu.h"
+
+#if !GME_DISABLE_EFFECTS
+#include "Effects_Buffer.h"
+#endif
+#include "blargg_endian.h"
+#include <string.h>
+#include <ctype.h>
+
+/* Copyright (C) 2003-2009 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"
+
+#ifndef GME_TYPE_LIST
+
+// Default list of all supported game music types (copy this to blargg_config.h
+// if you want to modify it)
+#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_sfm_type,\
+	gme_sgc_type,\
+	gme_spc_type,\
+	gme_vgm_type,\
+	gme_vgz_type
+
+#endif
+
+static gme_type_t const gme_type_list_ = { GME_TYPE_LIST, 0 };
+
+gme_type_t const* gme_type_list()
+{
+	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):
+		case BLARGG_4CHAR('G','B','S',0x02): 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','F','M','1'): return "SFM";
+		case BLARGG_4CHAR('S','G','C',0x1A): return "SGC";
+		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 );
+	
+	gme_type_t const* types = gme_type_list_;
+	for ( ; *types; types++ )
+		if ( !strcmp( extension, (*types)->extension_ ) )
+			break;
+	return *types;
+}
+
+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 blargg_ok; 
+}
+
+gme_err_t gme_open_data( void const* data, long size, Music_Emu** out, int sample_rate )
+{
+	require( (data || !size) && out );
+	*out = NULL;
+	
+	gme_type_t file_type = 0;
+	if ( size >= 4 )
+		file_type = gme_identify_extension( gme_identify_header( data ) );
+	if ( !file_type )
+		return blargg_err_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 = NULL;
+	
+	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 blargg_err_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* gme = type->new_emu();
+		if ( gme )
+		{
+		#if !GME_DISABLE_EFFECTS
+			if ( type->flags_ & 1 )
+			{
+				gme->effects_buffer_ = BLARGG_NEW Simple_Effects_Buffer;
+				if ( gme->effects_buffer_ )
+					gme->set_buffer( gme->effects_buffer_ );
+			}
+			
+			if ( !(type->flags_ & 1) || gme->effects_buffer_ )
+		#endif
+			{
+				if ( !gme->set_sample_rate( rate ) )
+				{
+					check( gme->type() == type );
+					return gme;
+				}
+			}
+			delete gme;
+		}
+	}
+	return NULL;
+}
+
+gme_err_t gme_load_file( Music_Emu* gme, const char path ) { return gme->load_file( path ); }
+
+gme_err_t gme_load_data( Music_Emu* gme, void const* data, long size )
+{
+	Mem_File_Reader in( data, size );
+	return gme->load( in );
+}
+
+gme_err_t gme_load_custom( Music_Emu* gme, gme_reader_t func, long size, void* data )
+{
+	Callback_Reader in( func, size, data );
+	return gme->load( in );
+}
+
+void gme_delete( Music_Emu* gme ) { delete gme; }
+
+gme_type_t gme_type( Music_Emu const* gme ) { return gme->type(); }
+
+const char* gme_type_system( gme_type_t_ const* type ) { return type->system; }
+
+const char* gme_warning( Music_Emu* gme ) { return gme->warning(); }
+
+int gme_track_count( Music_Emu const* gme ) { return gme->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 blargg_ok;
+}
+
+gme_err_t gme_set_track_info( Music_Emu * me, gme_info_t* in, int track )
+{
+	track_info_t* info = BLARGG_NEW track_info_t;
+	CHECK_ALLOC( info );
+	
+#define COPY(name) info->name = in->name;
+	
+	COPY( length );
+	COPY( intro_length );
+	COPY( loop_length );
+	
+#undef COPY
+#define COPY(name) if ( in->name ) strncpy( info->name, in->name, sizeof(info->name) - 1 ), info->namesizeof(info->name)-1 = '\0'; else info->name0 = '\0';
+ 
+	COPY( system );
+	COPY( game );
+	COPY( song );
+	COPY( author );
+	COPY( copyright );
+	COPY( comment );
+	COPY( dumper );
+	
+#undef COPY
+	
+	blargg_err_t err = me->set_track_info( info, track );
+ 
+ delete info;
+ 
+ return err;
+}
+
+void gme_free_info( gme_info_t* info )
+{
+	delete STATIC_CAST(gme_info_t_*,info);
+}
+
+void* gme_user_data ( Music_Emu const* gme ) { return gme->user_data(); }
+void gme_set_user_data ( Music_Emu* gme, void* new_user_data ) { gme->set_user_data( new_user_data ); }
+void gme_set_user_cleanup(Music_Emu* gme, gme_user_cleanup_t func ){ gme->set_user_cleanup( func ); }
+
+gme_err_t gme_start_track ( Music_Emu* gme, int index ) { return gme->start_track( index ); }
+gme_err_t gme_play ( Music_Emu* gme, int n, short p ) { return gme->play( n, p ); }
+void gme_set_fade ( Music_Emu* gme, int start_msec, int length_msec ) { gme->set_fade( start_msec, length_msec ); }
+gme_bool gme_track_ended ( Music_Emu const* gme ) { return gme->track_ended(); }
+int gme_tell ( Music_Emu const* gme ) { return gme->tell(); }
+gme_err_t gme_seek ( Music_Emu* gme, int msec ) { return gme->seek( msec ); }
+gme_err_t gme_skip ( Music_Emu* gme, int samples ) { return gme->skip( samples ); }
+int gme_voice_count ( Music_Emu const* gme ) { return gme->voice_count(); }
+void gme_ignore_silence ( Music_Emu* gme, gme_bool disable ) { gme->ignore_silence( disable != 0 ); }
+void gme_set_tempo ( Music_Emu* gme, double t ) { gme->set_tempo( t ); }
+void gme_mute_voice ( Music_Emu* gme, int index, gme_bool mute ){ gme->mute_voice( index, mute != 0 ); }
+void gme_mute_voices ( Music_Emu* gme, int mask ) { gme->mute_voices( mask ); }
+void gme_set_equalizer ( Music_Emu* gme, gme_equalizer_t const* eq ) { gme->set_equalizer( *eq ); }
+void gme_equalizer ( Music_Emu const* gme, gme_equalizer_t* o ) { *o = gme->equalizer(); }
+const char* gme_voice_name ( Music_Emu const* gme, int i ) { return gme->voice_name( i ); }
+gme_err_t gme_save ( Music_Emu const* gme, gme_writer_t writer, void* your_data ) { return gme->save( writer, your_data ); }
+
+void gme_effects( Music_Emu const* gme, gme_effects_t* out )
+{
+	static gme_effects_t const zero = { 0, 0, 0,0,0,0,0,0, 0, 0, 0,0,0,0,0,0 };
+	*out = zero;
+
+	#if !GME_DISABLE_EFFECTS
+	{
+		Simple_Effects_Buffer* b = STATIC_CAST(Simple_Effects_Buffer*,gme->effects_buffer_);
+		if ( b )
+		{
+			out->enabled = b->config().enabled;
+			out->echo = b->config().echo;
+			out->stereo = b->config().stereo;
+			out->surround = b->config().surround;
+		}
+	}
+	#endif
+}
+
+void gme_set_effects( Music_Emu* gme, gme_effects_t const* in )
+{
+	#if !GME_DISABLE_EFFECTS
+	{
+		Simple_Effects_Buffer* b = STATIC_CAST(Simple_Effects_Buffer*,gme->effects_buffer_);
+		if ( b )
+		{
+			b->config().enabled = false;
+			if ( in )
+			{
+				b->config().enabled = in->enabled;
+				b->config().echo = in->echo;
+				b->config().stereo = in->stereo;
+				b->config().surround = in->surround;
+			}
+			b->apply_config();
+		}
+	}
+	#endif
+}
+
+void gme_set_stereo_depth( Music_Emu* gme, double depth )
+{
+	#if !GME_DISABLE_EFFECTS
+	{
+		if ( gme->effects_buffer_ )
+		{
+			gme_effects_t cfg;
+			gme_effects( gme, &cfg );
+			cfg.enabled = (depth > 0.0);
+			cfg.echo = depth;
+			cfg.stereo = depth;
+			cfg.surround = true;
+			gme_set_effects( gme, &cfg );
+		}
+	}
+	#endif
+}
+
+#define ENTRY( name ) { blargg_err_##name, gme_err_##name }
+static blargg_err_to_code_t const gme_codes =
+{
+	ENTRY( generic ),
+	ENTRY( memory ),
+	ENTRY( caller ),
+	ENTRY( internal ),
+	ENTRY( limitation ),
+	
+	ENTRY( file_missing ),
+	ENTRY( file_read ),
+	ENTRY( file_io ),
+	ENTRY( file_eof ),
+	
+	ENTRY( file_type ),
+	ENTRY( file_feature ),
+	ENTRY( file_corrupt ),
+	
+	{ 0, -1 }
+};
+#undef ENTRY
+
+static int err_code( gme_err_t err )
+{
+	return blargg_err_to_code( err, gme_codes );
+}
+
+int gme_err_code( gme_err_t err )
+{
+	int code = err_code( err );
+	return (code >= 0 ? code : gme_err_generic);
+}
+
+gme_err_t gme_code_to_err( int code )
+{
+	return blargg_code_to_err( code, gme_codes );
+}
+
+const char* gme_err_details( gme_err_t err )
+{
+	// If we don't have error code assigned, return entire string
+	return (err_code( err ) >= 0 ? blargg_err_details( err ) : blargg_err_str( err ));
+}
+
+const char* gme_err_str( gme_err_t err )
+{
+	return blargg_err_str( err );
+}

deadbeef-0.6.2.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/gme.h -> deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/gme.h Changed

@@ -1,298 +1,307 @@
-/* Loads and plays video game music files into sample buffer */
-
-/* Game_Music_Emu 0.6-pre */
-#ifndef GME_H
-#define GME_H
-
-#ifdef __cplusplus
-	extern "C" {
-#endif
-
-/* Pointer to error, or NULL if function was successful. See Errors below. */
-#ifndef gme_err_t /* (#ifndef allows better testing of library) */
-	typedef const char* gme_err_t;
-#endif
-
-/* First parameter of most functions is gme_t*, or const gme_t* if nothing is
-changed. */
-typedef struct gme_t gme_t;
-
-/* Boolean; false = 0, true = 1 */
-typedef int gme_bool;
-
-
-/******** Basic operations ********/
-
-/* Opens game music file and points *out at it. If error, sets *out to NULL. */
-gme_err_t gme_open_file( const char path , gme_t** out, int sample_rate );
-
-/* Number of tracks */
-int gme_track_count( const gme_t* );
-
-/* Starts a track, where 0 is the first track. Requires that 0 <= index < gme_track_count(). */
-gme_err_t gme_start_track( gme_t*, int index );
-
-/* Generates 'count' 16-bit signed samples info 'out'. Output is in stereo, so count
-must be even. */
-gme_err_t gme_play( gme_t*, int count, short out );
-
-/* Closes file and frees memory. OK to pass NULL. */
-void gme_delete( gme_t* );
-
-
-/******** Track position/length ********/
-
-/* Sets 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( gme_t*, int start_msec );
-
-/* True if a track has reached its end */
-gme_bool gme_track_ended( const gme_t* );
-
-/* Number of milliseconds played since beginning of track (1000 = one second) */
-int gme_tell( const gme_t* );
-
-/* Seeks to new time in track. Seeking backwards or far forward can take a while. */
-gme_err_t gme_seek( gme_t*, int msec );
-
-
-/******** Informational ********/
-
-/* Use in place of sample rate for open/load if you only need to get track
-information from a music file */
-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( gme_t* );
-
-/* Loads m3u playlist file (must be done after loading music) */
-gme_err_t gme_load_m3u( gme_t*, const char path );
-
-/* Clears any loaded m3u playlist and any internal playlist that the music format
-supports (NSFE for example). */
-void gme_clear_playlist( gme_t* );
-
-/* Passes back pointer to 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( const gme_t*, 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 ********/
-
-/* Disables automatic end-of-track detection and skipping of silence at beginning
-if ignore is true */
-void gme_ignore_silence( gme_t*, gme_bool ignore );
-
-/* Adjusts song tempo, where 1.0 = normal, 0.5 = half speed, 2.0 = double speed, etc.
-Track length as returned by track_info() ignores tempo (assumes it's 1.0). */
-void gme_set_tempo( gme_t*, double tempo );
-
-/* Number of voices used by currently loaded file */
-int gme_voice_count( const gme_t* );
-
-/* Name of voice i, from 0 to gme_voice_count() - 1 */
-const char* gme_voice_name( const gme_t*, int i );
-
-/* Mutes/unmutes single voice i, where voice 0 is first voice */
-void gme_mute_voice( gme_t*, int index, gme_bool mute );
-
-/* Sets 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( gme_t*, 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;
-
-/* Gets current frequency equalizer parameters */
-void gme_equalizer( const gme_t*, gme_equalizer_t* out );
-
-/* Changes frequency equalizer parameters */
-void gme_set_equalizer( gme_t*, gme_equalizer_t const* eq );
-
-
-
-/******** Effects processor ********/
-
-/* Adds stereo surround and echo to music that's usually mono or has little
-stereo. Has no effect on GYM, SPC, and Sega Genesis VGM music. */
-
-/* Simplified control using a single value, where 0.0 = off and 1.0 = maximum */
-void gme_set_stereo_depth( gme_t*, double depth );
-
-struct gme_effects_t
-{
-	double echo; /* Amount of echo, where 0.0 = none, 1.0 = lots */
-	double stereo; /* Separation, where 0.0 = mono, 1.0 = hard left and right */
-	
-	double d2,d3,d4,d5,d6,d7; /* reserved */
-	
-	gme_bool enabled; /* If 0, no effects are added */
-	gme_bool surround;/* If 1, some channels are put in "back", using phase inversion */
-	
-	int i1,i3,i4,i5,i6,i7; /* reserved */
-};
-typedef struct gme_effects_t gme_effects_t;
-
-/* Sets effects configuration, or disables effects if NULL */
-void gme_set_effects( gme_t*, gme_effects_t const* );
-
-/* Passes back current effects configuration */
-void gme_effects( const gme_t*, gme_effects_t* out );
-
-
-/******** Game music types ********/
-
-/* Music file type identifier. Can also hold NULL. */
-typedef const struct gme_type_t_* gme_type_t;
-
-/* Type of this emulator */
-gme_type_t gme_type( const gme_t* );
-
-/* 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 */
-gme_bool gme_type_multitrack( gme_type_t );
-
-
-/******** Advanced file loading ********/
-
-/* 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, gme_t** emu_out, int sample_rate );
-
-/* Determines likely game music type based on first four bytes of file. Returns
-string containing proper file suffix ("NSF", "SPC", etc.) or "" if file header
-is not recognized. */
-const char* gme_identify_header( void const* header );
-
-/* Gets corresponding music type for file path or extension passed in. */
-gme_type_t gme_identify_extension( const char path_or_extension );
-
-/* Determines 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 );
-
-/* Creates new emulator and sets sample rate. Returns NULL if out of memory. If you only need
-track information, pass gme_info_only for sample_rate. */
-gme_t* gme_new_emu( gme_type_t, int sample_rate );
-
-/* Loads music file into emulator */
-gme_err_t gme_load_file( gme_t*, const char path );
-
-/* Loads music file from memory into emulator. Makes a copy of data passed. */
-gme_err_t gme_load_data( gme_t*, void const* data, long size );
-
-/* Loads 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( gme_t*, gme_reader_t, long file_size, void* your_data );
-
-/* Loads m3u playlist file from memory (must be done after loading music) */
-gme_err_t gme_load_m3u_data( gme_t*, void const* data, long size );
-
-
-/******** User data ********/
-
-/* Sets/gets pointer to data you want to associate with this emulator.
-You can use this for whatever you want. */
-void gme_set_user_data( gme_t*, void* new_user_data );
-void* gme_user_data( const gme_t* );
-
-/* Registers cleanup function to be called when deleting emulator, or NULL to
-clear it. Passes user_data when calling cleanup function. */
-typedef void (*gme_user_cleanup_t)( void* user_data );
-void gme_set_user_cleanup( gme_t*, gme_user_cleanup_t func );
-
-
-/******** Errors ********/
-
-/* Internally, a gme_err_t is a const char* that points to a normal C string.
-This means that other strings can be passed to the following functions. In the
-descriptions below, these other strings are referred to as being not gme_err_t
-strings. */
-
-/* Error string associated with err. Returns "" if err is NULL. Returns err
-unchanged if it isn't a gme_err_t string. */
-const char* gme_err_str( gme_err_t err );
-
-/* Details of error beyond main cause, or "" if none or err is NULL. Returns
-err unchanged if it isn't a gme_err_t string. */
-const char* gme_err_details( gme_err_t err );
-
-/* Numeric code corresponding to err. Returns gme_ok if err is NULL. Returns
-gme_err_generic if err isn't a gme_err_t string. */
-int gme_err_code( gme_err_t err );
-
-enum {
-	gme_ok = 0,/* Successful call. Guaranteed to be zero. */
-	gme_err_generic = 0x01,/* Error of unspecified type */
-	gme_err_memory = 0x02,/* Out of memory */
-	gme_err_caller = 0x03,/* Caller violated requirements of function */
-	gme_err_internal = 0x04,/* Internal problem, corruption, etc. */
-	gme_err_limitation = 0x05,/* Exceeded program limit */
-	
-	gme_err_file_missing = 0x20,/* File not found at specified path */
-	gme_err_file_read = 0x21,/* Couldn't open file for reading */
-	gme_err_file_io = 0x23,/* Read/write error */
-	gme_err_file_eof = 0x25,/* Tried to read past end of file */
-	
-	gme_err_file_type = 0x30,/* File is of wrong type */
-	gme_err_file_feature = 0x32,/* File requires unsupported feature */
-	gme_err_file_corrupt = 0x33 /* File is corrupt */
-};
-
-/* gme_err_t corresponding to numeric code. Note that this might not recover
-the original gme_err_t before it was converted to a numeric code; in
-particular, gme_err_details(gme_code_to_err(code)) will be "" in most cases. */
-gme_err_t gme_code_to_err( int code );
-
-
-
-/* Deprecated */
-typedef gme_t Music_Emu;
-
-#ifdef __cplusplus
-	}
-#endif
-
-#endif
+/* Loads and plays video game music files into sample buffer */
+
+/* Game_Music_Emu $vers */
+#ifndef GME_H
+#define GME_H
+
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
+/* Pointer to error, or NULL if function was successful. See Errors below. */
+#ifndef gme_err_t /* (#ifndef allows better testing of library) */
+	typedef const char* gme_err_t;
+#endif
+
+/* First parameter of most functions is gme_t*, or const gme_t* if nothing is
+changed. */
+typedef struct gme_t gme_t;
+
+/* Boolean; false = 0, true = 1 */
+typedef int gme_bool;
+
+
+/******** Basic operations ********/
+
+/* Opens game music file and points *out at it. If error, sets *out to NULL. */
+gme_err_t gme_open_file( const char path , gme_t** out, int sample_rate );
+
+/* Number of tracks */
+int gme_track_count( const gme_t* );
+
+/* Starts a track, where 0 is the first track. Requires that 0 <= index < gme_track_count(). */
+gme_err_t gme_start_track( gme_t*, int index );
+
+/* Generates 'count' 16-bit signed samples info 'out'. Output is in stereo, so count
+must be even. */
+gme_err_t gme_play( gme_t*, int count, short out );
+
+/* Closes file and frees memory. OK to pass NULL. */
+void gme_delete( gme_t* );
+
+
+/******** Track position/length ********/
+
+/* Sets 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( gme_t*, int start_msec, int length_msec );
+
+/* True if a track has reached its end */
+gme_bool gme_track_ended( const gme_t* );
+
+/* Number of milliseconds played since beginning of track (1000 = one second) */
+int gme_tell( const gme_t* );
+
+/* Seeks to new time in track. Seeking backwards or far forward can take a while. */
+gme_err_t gme_seek( gme_t*, int msec );
+
+/* Skips the specified number of samples. */
+gme_err_t gme_skip( gme_t*, int samples );
+
+
+/******** Informational ********/
+
+/* Use in place of sample rate for open/load if you only need to get track
+information from a music file */
+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( gme_t* );
+
+/* Loads m3u playlist file (must be done after loading music) */
+gme_err_t gme_load_m3u( gme_t*, const char path );
+
+/* Clears any loaded m3u playlist and any internal playlist that the music format
+supports (NSFE for example). */
+void gme_clear_playlist( gme_t* );
+
+/* Passes back pointer to 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( const gme_t*, gme_info_t** out, int track );
+
+gme_err_t gme_set_track_info( gme_t*, const gme_info_t* in, 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 ********/
+
+/* Disables automatic end-of-track detection and skipping of silence at beginning
+if ignore is true */
+void gme_ignore_silence( gme_t*, gme_bool ignore );
+
+/* Adjusts song tempo, where 1.0 = normal, 0.5 = half speed, 2.0 = double speed, etc.
+Track length as returned by track_info() ignores tempo (assumes it's 1.0). */
+void gme_set_tempo( gme_t*, double tempo );
+
+/* Number of voices used by currently loaded file */
+int gme_voice_count( const gme_t* );
+
+/* Name of voice i, from 0 to gme_voice_count() - 1 */
+const char* gme_voice_name( const gme_t*, int i );
+
+/* Mutes/unmutes single voice i, where voice 0 is first voice */
+void gme_mute_voice( gme_t*, int index, gme_bool mute );
+
+/* Sets 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( gme_t*, 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;
+
+/* Gets current frequency equalizer parameters */
+void gme_equalizer( const gme_t*, gme_equalizer_t* out );
+
+/* Changes frequency equalizer parameters */
+void gme_set_equalizer( gme_t*, gme_equalizer_t const* eq );
+
+
+
+/******** Effects processor ********/
+
+/* Adds stereo surround and echo to music that's usually mono or has little
+stereo. Has no effect on GYM, SPC, and Sega Genesis VGM music. */
+
+/* Simplified control using a single value, where 0.0 = off and 1.0 = maximum */
+void gme_set_stereo_depth( gme_t*, double depth );
+
+struct gme_effects_t
+{
+	double echo; /* Amount of echo, where 0.0 = none, 1.0 = lots */
+	double stereo; /* Separation, where 0.0 = mono, 1.0 = hard left and right */
+	
+	double d2,d3,d4,d5,d6,d7; /* reserved */
+	
+	gme_bool enabled; /* If 0, no effects are added */
+	gme_bool surround;/* If 1, some channels are put in "back", using phase inversion */
+	
+	int i1,i3,i4,i5,i6,i7; /* reserved */
+};
+typedef struct gme_effects_t gme_effects_t;
+
+/* Sets effects configuration, or disables effects if NULL */
+void gme_set_effects( gme_t*, gme_effects_t const* );
+
+/* Passes back current effects configuration */
+void gme_effects( const gme_t*, gme_effects_t* out );
+
+
+/******** Game music types ********/
+
+/* Music file type identifier. Can also hold NULL. */
+typedef const struct gme_type_t_* gme_type_t;
+
+/* Type of this emulator */
+gme_type_t gme_type( const gme_t* );
+
+/* 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 */
+gme_bool gme_type_multitrack( gme_type_t );
+
+
+/******** Advanced file loading ********/
+
+/* 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, gme_t** emu_out, int sample_rate );
+
+/* Determines likely game music type based on first four bytes of file. Returns
+string containing proper file suffix ("NSF", "SPC", etc.) or "" if file header
+is not recognized. */
+const char* gme_identify_header( void const* header );
+
+/* Gets corresponding music type for file path or extension passed in. */
+gme_type_t gme_identify_extension( const char path_or_extension );
+
+/* Determines 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 );
+
+/* Creates new emulator and sets sample rate. Returns NULL if out of memory. If you only need
+track information, pass gme_info_only for sample_rate. */
+gme_t* gme_new_emu( gme_type_t, int sample_rate );
+
+/* Loads music file into emulator */
+gme_err_t gme_load_file( gme_t*, const char path );
+
+/* Loads music file from memory into emulator. Makes a copy of data passed. */
+gme_err_t gme_load_data( gme_t*, void const* data, long size );
+
+/* Loads 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, long count );
+gme_err_t gme_load_custom( gme_t*, gme_reader_t, long file_size, void* your_data );
+
+/* Loads m3u playlist file from memory (must be done after loading music) */
+gme_err_t gme_load_m3u_data( gme_t*, void const* data, long size );
+
+ 
+/******** Saving ********/
+typedef gme_err_t (*gme_writer_t)( void* your_data, void const* in, long count );
+gme_err_t gme_save( gme_t const*, gme_writer_t, void* your_data );
+
+/******** User data ********/
+
+/* Sets/gets pointer to data you want to associate with this emulator.
+You can use this for whatever you want. */
+void gme_set_user_data( gme_t*, void* new_user_data );
+void* gme_user_data( const gme_t* );
+
+/* Registers cleanup function to be called when deleting emulator, or NULL to
+clear it. Passes user_data when calling cleanup function. */
+typedef void (*gme_user_cleanup_t)( void* user_data );
+void gme_set_user_cleanup( gme_t*, gme_user_cleanup_t func );
+
+
+/******** Errors ********/
+
+/* Internally, a gme_err_t is a const char* that points to a normal C string.
+This means that other strings can be passed to the following functions. In the
+descriptions below, these other strings are referred to as being not gme_err_t
+strings. */
+
+/* Error string associated with err. Returns "" if err is NULL. Returns err
+unchanged if it isn't a gme_err_t string. */
+const char* gme_err_str( gme_err_t err );
+
+/* Details of error beyond main cause, or "" if none or err is NULL. Returns
+err unchanged if it isn't a gme_err_t string. */
+const char* gme_err_details( gme_err_t err );
+
+/* Numeric code corresponding to err. Returns gme_ok if err is NULL. Returns
+gme_err_generic if err isn't a gme_err_t string. */
+int gme_err_code( gme_err_t err );
+
+enum {
+	gme_ok = 0,/* Successful call. Guaranteed to be zero. */
+	gme_err_generic = 0x01,/* Error of unspecified type */
+	gme_err_memory = 0x02,/* Out of memory */
+	gme_err_caller = 0x03,/* Caller violated requirements of function */
+	gme_err_internal = 0x04,/* Internal problem, corruption, etc. */
+	gme_err_limitation = 0x05,/* Exceeded program limit */
+	
+	gme_err_file_missing = 0x20,/* File not found at specified path */
+	gme_err_file_read = 0x21,/* Couldn't open file for reading */
+	gme_err_file_io = 0x23,/* Read/write error */
+	gme_err_file_eof = 0x25,/* Tried to read past end of file */
+	
+	gme_err_file_type = 0x30,/* File is of wrong type */
+	gme_err_file_feature = 0x32,/* File requires unsupported feature */
+	gme_err_file_corrupt = 0x33 /* File is corrupt */
+};
+
+/* gme_err_t corresponding to numeric code. Note that this might not recover
+the original gme_err_t before it was converted to a numeric code; in
+particular, gme_err_details(gme_code_to_err(code)) will be "" in most cases. */
+gme_err_t gme_code_to_err( int code );
+
+
+
+/* Deprecated */
+typedef gme_t Music_Emu;
+
+#ifdef __cplusplus
+	}
+#endif
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/gme_custom_dprintf.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/dsp Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.cpp Added

@@ -0,0 +1,1432 @@
+// snes_spc 0.9.0. 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"
+
+namespace SuperFamicom {
+
+#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 =
+{
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+
+//	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 ) \
+{\
+	if ( out >= m.out_end )\
+	{\
+		int count = sample_count();\
+		m.out_begin = (SPC_DSP::sample_t *) realloc( m.out_begin, (count ? count * 2 : 8192) * sizeof(SPC_DSP::sample_t) );\
+		out = m.out_begin + count;\
+		m.out_end = m.out_begin + count * 2;\
+	}\
+	out 0 = l;\
+	out 1 = r;\
+	out += 2;\
+}\
+
+void SPC_DSP::set_output( sample_t* out, int size )
+{
+	require( (size & 1) == 0 ); // must be even
+	if ( !out )
+	{
+		size = 0;
+	}
+	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.
+
+// Gaussian interpolation
+
+static short const gauss 512 =
+{
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2,
+ 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5,
+ 6, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10,
+ 11, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 15, 16, 16, 17, 17,
+ 18, 19, 19, 20, 20, 21, 21, 22, 23, 23, 24, 24, 25, 26, 27, 27,
+ 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 36, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 58, 59, 60, 61, 62, 64, 65, 66, 67, 69, 70, 71, 73, 74, 76, 77,
+ 78, 80, 81, 83, 84, 86, 87, 89, 90, 92, 94, 95, 97, 99, 100, 102,
+ 104, 106, 107, 109, 111, 113, 115, 117, 118, 120, 122, 124, 126, 128, 130, 132,
+ 134, 137, 139, 141, 143, 145, 147, 150, 152, 154, 156, 159, 161, 163, 166, 168,
+ 171, 173, 175, 178, 180, 183, 186, 188, 191, 193, 196, 199, 201, 204, 207, 210,
+ 212, 215, 218, 221, 224, 227, 230, 233, 236, 239, 242, 245, 248, 251, 254, 257,
+ 260, 263, 267, 270, 273, 276, 280, 283, 286, 290, 293, 297, 300, 304, 307, 311,
+ 314, 318, 321, 325, 328, 332, 336, 339, 343, 347, 351, 354, 358, 362, 366, 370,
+ 374, 378, 381, 385, 389, 393, 397, 401, 405, 410, 414, 418, 422, 426, 430, 434,
+ 439, 443, 447, 451, 456, 460, 464, 469, 473, 477, 482, 486, 491, 495, 499, 504,
+ 508, 513, 517, 522, 527, 531, 536, 540, 545, 550, 554, 559, 563, 568, 573, 577,
+ 582, 587, 592, 596, 601, 606, 611, 615, 620, 625, 630, 635, 640, 644, 649, 654,
+ 659, 664, 669, 674, 678, 683, 688, 693, 698, 703, 708, 713, 718, 723, 728, 732,
+ 737, 742, 747, 752, 757, 762, 767, 772, 777, 782, 787, 792, 797, 802, 806, 811,
+ 816, 821, 826, 831, 836, 841, 846, 851, 855, 860, 865, 870, 875, 880, 884, 889,
+ 894, 899, 904, 908, 913, 918, 923, 927, 932, 937, 941, 946, 951, 955, 960, 965,
+ 969, 974, 978, 983, 988, 992, 997,1001,1005,1010,1014,1019,1023,1027,1032,1036,
+1040,1045,1049,1053,1057,1061,1066,1070,1074,1078,1082,1086,1090,1094,1098,1102,
+1106,1109,1113,1117,1121,1125,1128,1132,1136,1139,1143,1146,1150,1153,1157,1160,
+1164,1167,1170,1174,1177,1180,1183,1186,1190,1193,1196,1199,1202,1205,1207,1210,
+1213,1216,1219,1221,1224,1227,1229,1232,1234,1237,1239,1241,1244,1246,1248,1251,
+1253,1255,1257,1259,1261,1263,1265,1267,1269,1270,1272,1274,1275,1277,1279,1280,
+1282,1283,1284,1286,1287,1288,1290,1291,1292,1293,1294,1295,1296,1297,1297,1298,
+1299,1300,1300,1301,1302,1302,1303,1303,1303,1304,1304,1304,1304,1304,1305,1305,
+};
+
+static short const cubic 514 =
+{
+ 0, -4, -8, -12, -16, -20, -23, -27, -30, -34, -37, -41, -44, -47, -50, -53,
+ -56, -59, -62, -65, -68, -71, -73, -76, -78, -81, -84, -87, -89, -91, -93, -95,
+ -98,-100,-102,-104,-106,-109,-110,-112,-113,-116,-117,-119,-121,-122,-123,-125,
+-126,-128,-129,-131,-132,-134,-134,-136,-136,-138,-138,-140,-141,-141,-142,-143,
+-144,-144,-145,-146,-147,-148,-147,-148,-148,-149,-149,-150,-150,-150,-150,-151,
+-151,-151,-151,-151,-152,-152,-151,-152,-151,-152,-151,-151,-151,-151,-150,-150,
+-150,-149,-149,-149,-149,-148,-147,-147,-146,-146,-145,-145,-144,-144,-143,-142,
+-141,-141,-140,-139,-139,-138,-137,-136,-135,-135,-133,-133,-132,-131,-130,-129,
+-128,-127,-126,-125,-124,-123,-121,-121,-119,-118,-117,-116,-115,-114,-112,-111,
+-110,-109,-107,-106,-105,-104,-102,-102,-100, -99, -97, -97, -95, -94, -92, -91,
+ -90, -88, -87, -86, -85, -84, -82, -81, -79, -78, -76, -76, -74, -73, -71, -70,
+ -68, -67, -66, -65, -63, -62, -60, -60, -58, -57, -55, -55, -53, -52, -50, -49,
+ -48, -46, -45, -44, -43, -42, -40, -39, -38, -37, -36, -35, -34, -32, -31, -30,
+ -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -19, -17, -16, -15, -14,
+ -14, -13, -12, -11, -11, -10, -9, -9, -8, -8, -7, -7, -6, -5, -4, -4,
+ -3, -3, -3, -2, -2, -2, -1, -1, 0, -1, 0, -1, 0, 0, 0, 0,
+ 0,
+2048,2048,2048,2048,2047,2047,2046,2045,2043,2042,2041,2039,2037,2035,2033,2031,
+2028,2026,2024,2021,2018,2015,2012,2009,2005,2002,1999,1995,1991,1987,1982,1978,
+1974,1969,1965,1960,1955,1951,1946,1940,1934,1929,1924,1918,1912,1906,1900,1895,
+1888,1882,1875,1869,1862,1856,1849,1842,1835,1828,1821,1814,1806,1799,1791,1783,
+1776,1768,1760,1753,1744,1737,1728,1720,1711,1703,1695,1686,1677,1668,1659,1651,
+1641,1633,1623,1614,1605,1596,1587,1577,1567,1559,1549,1539,1529,1520,1510,1499,
+1490,1480,1470,1460,1450,1440,1430,1420,1408,1398,1389,1378,1367,1357,1346,1336,
+1325,1315,1304,1293,1282,1272,1261,1250,1239,1229,1218,1207,1196,1185,1174,1163,
+1152,1141,1130,1119,1108,1097,1086,1075,1063,1052,1042,1030,1019,1008, 997, 986,
+ 974, 964, 952, 941, 930, 919, 908, 897, 886, 875, 864, 853, 842, 831, 820, 809,
+ 798, 787, 776, 765, 754, 744, 733, 722, 711, 700, 690, 679, 668, 658, 647, 637,
+ 626, 616, 605, 595, 584, 574, 564, 554, 543, 534, 524, 514, 503, 494, 483, 473,
+ 464, 454, 444, 435, 425, 416, 407, 397, 387, 378, 370, 360, 351, 342, 333, 325,
+ 315, 307, 298, 290, 281, 273, 265, 256, 248, 241, 233, 225, 216, 209, 201, 193,
+ 186, 178, 171, 164, 157, 150, 143, 137, 129, 123, 117, 110, 103, 97, 91, 85,
+ 79, 74, 68, 62, 56, 51, 46, 41, 35, 31, 27, 22, 17, 13, 8, 4,
+ 0
+};
+
+static short const sinc 2048 =
+{
+ 39, -315, 666, 15642, 666, -315, 39, -38,
+ 38, -302, 613, 15642, 718, -328, 41, -38,
+ 36, -288, 561, 15641, 772, -342, 42, -38,
+ 35, -275, 510, 15639, 826, -355, 44, -38,
+ 33, -263, 459, 15636, 880, -369, 46, -38,
+ 32, -250, 408, 15632, 935, -383, 47, -38,
+ 31, -237, 358, 15628, 990, -396, 49, -38,
+ 29, -224, 309, 15622, 1046, -410, 51, -38,
+ 28, -212, 259, 15616, 1103, -425, 53, -38,
+ 27, -200, 211, 15609, 1159, -439, 54, -38,
+ 25, -188, 163, 15601, 1216, -453, 56, -38,
+ 24, -175, 115, 15593, 1274, -467, 58, -38,
+ 23, -164, 68, 15583, 1332, -482, 60, -38,
+ 22, -152, 22, 15573, 1391, -496, 62, -37,
+ 21, -140, -24, 15562, 1450, -511, 64, -37,
+ 19, -128, -70, 15550, 1509, -526, 66, -37,
+ 18, -117, -115, 15538, 1569, -540, 68, -37,
+ 17, -106, -159, 15524, 1629, -555, 70, -37,
+ 16, -94, -203, 15510, 1690, -570, 72, -36,
+ 15, -83, -247, 15495, 1751, -585, 74, -36,
+ 14, -72, -289, 15479, 1813, -600, 76, -36,
+ 13, -62, -332, 15462, 1875, -616, 79, -36,
+ 12, -51, -374, 15445, 1937, -631, 81, -35,
+ 11, -40, -415, 15426, 2000, -646, 83, -35,
+ 11, -30, -456, 15407, 2063, -662, 85, -35,
+ 10, -20, -496, 15387, 2127, -677, 88, -34,
+ 9, -9, -536, 15366, 2191, -693, 90, -34,
+ 8, 1, -576, 15345, 2256, -708, 92, -34,
+ 7, 10, -614, 15323, 2321, -724, 95, -33,
+ 7, 20, -653, 15300, 2386, -740, 97, -33,
+ 6, 30, -690, 15276, 2451, -755, 99, -33,
+ 5, 39, -728, 15251, 2517, -771, 102, -32,
+ 5, 49, -764, 15226, 2584, -787, 104, -32,
+ 4, 58, -801, 15200, 2651, -803, 107, -32,
+ 3, 67, -836, 15173, 2718, -819, 109, -31,
+ 3, 76, -871, 15145, 2785, -835, 112, -31,
+ 2, 85, -906, 15117, 2853, -851, 115, -30,
+ 2, 93, -940, 15087, 2921, -867, 117, -30,
+ 1, 102, -974, 15057, 2990, -883, 120, -29,
+ 1, 110, -1007, 15027, 3059, -899, 122, -29,
+ 0, 118, -1039, 14995, 3128, -915, 125, -29,
+ 0, 127, -1071, 14963, 3198, -931, 128, -28,
+ -1, 135, -1103, 14930, 3268, -948, 131, -28,
+ -1, 142, -1134, 14896, 3338, -964, 133, -27,
+ -1, 150, -1164, 14862, 3409, -980, 136, -27,
+ -2, 158, -1194, 14827, 3480, -996, 139, -26,
+ -2, 165, -1224, 14791, 3551, -1013, 142, -26,
+ -3, 172, -1253, 14754, 3622, -1029, 144, -25,
+ -3, 179, -1281, 14717, 3694, -1045, 147, -25,
+ -3, 187, -1309, 14679, 3766, -1062, 150, -24,
+ -3, 193, -1337, 14640, 3839, -1078, 153, -24,
+ -4, 200, -1363, 14601, 3912, -1094, 156, -23,
+ -4, 207, -1390, 14561, 3985, -1110, 159, -23,
+ -4, 213, -1416, 14520, 4058, -1127, 162, -22,
+ -4, 220, -1441, 14479, 4131, -1143, 165, -22,
+ -4, 226, -1466, 14437, 4205, -1159, 168, -22,
+ -5, 232, -1490, 14394, 4279, -1175, 171, -21,
+ -5, 238, -1514, 14350, 4354, -1192, 174, -21,
+ -5, 244, -1537, 14306, 4428, -1208, 177, -20,
+ -5, 249, -1560, 14261, 4503, -1224, 180, -20,
+ -5, 255, -1583, 14216, 4578, -1240, 183, -19,
+ -5, 260, -1604, 14169, 4653, -1256, 186, -19,
+ -5, 265, -1626, 14123, 4729, -1272, 189, -18,
+ -5, 271, -1647, 14075, 4805, -1288, 192, -18,
+ -5, 276, -1667, 14027, 4881, -1304, 195, -17,
+ -6, 280, -1687, 13978, 4957, -1320, 198, -17,
+ -6, 285, -1706, 13929, 5033, -1336, 201, -16,
+ -6, 290, -1725, 13879, 5110, -1352, 204, -16,
+ -6, 294, -1744, 13829, 5186, -1368, 207, -15,
+ -6, 299, -1762, 13777, 5263, -1383, 210, -15,
+ -6, 303, -1779, 13726, 5340, -1399, 213, -14,
+ -6, 307, -1796, 13673, 5418, -1414, 216, -14,
+ -6, 311, -1813, 13620, 5495, -1430, 219, -13,
+ -5, 315, -1829, 13567, 5573, -1445, 222, -13,
+ -5, 319, -1844, 13512, 5651, -1461, 225, -13,
+ -5, 322, -1859, 13458, 5728, -1476, 229, -12,
+ -5, 326, -1874, 13402, 5806, -1491, 232, -12,
+ -5, 329, -1888, 13347, 5885, -1506, 235, -11,
+ -5, 332, -1902, 13290, 5963, -1521, 238, -11,
+ -5, 335, -1915, 13233, 6041, -1536, 241, -10,
+ -5, 338, -1928, 13176, 6120, -1551, 244, -10,
+ -5, 341, -1940, 13118, 6199, -1566, 247, -10,
+ -5, 344, -1952, 13059, 6277, -1580, 250, -9,
+ -5, 347, -1964, 13000, 6356, -1595, 253, -9,
+ -5, 349, -1975, 12940, 6435, -1609, 256, -8,
+ -4, 352, -1986, 12880, 6514, -1623, 259, -8,
+ -4, 354, -1996, 12819, 6594, -1637, 262, -8,
+ -4, 356, -2005, 12758, 6673, -1651, 265, -7,
+ -4, 358, -2015, 12696, 6752, -1665, 268, -7,
+ -4, 360, -2024, 12634, 6831, -1679, 271, -7,
+ -4, 362, -2032, 12572, 6911, -1693, 274, -6,
+ -4, 364, -2040, 12509, 6990, -1706, 277, -6,
+ -4, 366, -2048, 12445, 7070, -1719, 280, -6,
+ -3, 367, -2055, 12381, 7149, -1732, 283, -5,
+ -3, 369, -2062, 12316, 7229, -1745, 286, -5,
+ -3, 370, -2068, 12251, 7308, -1758, 289, -5,
+ -3, 371, -2074, 12186, 7388, -1771, 291, -4,
+ -3, 372, -2079, 12120, 7467, -1784, 294, -4,
+ -3, 373, -2084, 12054, 7547, -1796, 297, -4,
+ -3, 374, -2089, 11987, 7626, -1808, 300, -4,
+ -2, 375, -2094, 11920, 7706, -1820, 303, -3,
+ -2, 376, -2098, 11852, 7785, -1832, 305, -3,
+ -2, 376, -2101, 11785, 7865, -1844, 308, -3,
+ -2, 377, -2104, 11716, 7944, -1855, 311, -3,
+ -2, 377, -2107, 11647, 8024, -1866, 313, -2,
+ -2, 378, -2110, 11578, 8103, -1877, 316, -2,
+ -2, 378, -2112, 11509, 8182, -1888, 318, -2,
+ -1, 378, -2113, 11439, 8262, -1899, 321, -2,
+ -1, 378, -2115, 11369, 8341, -1909, 323, -2,
+ -1, 378, -2116, 11298, 8420, -1920, 326, -2,
+ -1, 378, -2116, 11227, 8499, -1930, 328, -1,
+ -1, 378, -2116, 11156, 8578, -1940, 331, -1,
+ -1, 378, -2116, 11084, 8656, -1949, 333, -1,
+ -1, 377, -2116, 11012, 8735, -1959, 335, -1,
+ -1, 377, -2115, 10940, 8814, -1968, 337, -1,
+ -1, 377, -2114, 10867, 8892, -1977, 340, -1,
+ -1, 376, -2112, 10795, 8971, -1985, 342, -1,
+ 0, 375, -2111, 10721, 9049, -1994, 344, -1,
+ 0, 375, -2108, 10648, 9127, -2002, 346, 0,
+ 0, 374, -2106, 10574, 9205, -2010, 348, 0,
+ 0, 373, -2103, 10500, 9283, -2018, 350, 0,
+ 0, 372, -2100, 10426, 9360, -2025, 352, 0,
+ 0, 371, -2097, 10351, 9438, -2032, 354, 0,
+ 0, 370, -2093, 10276, 9515, -2039, 355, 0,
+ 0, 369, -2089, 10201, 9592, -2046, 357, 0,
+ 0, 367, -2084, 10126, 9669, -2052, 359, 0,
+ 0, 366, -2080, 10050, 9745, -2058, 360, 0,
+ 0, 365, -2075, 9974, 9822, -2064, 362, 0,
+ 0, 363, -2070, 9898, 9898, -2070, 363, 0,
+ 0, 362, -2064, 9822, 9974, -2075, 365, 0,
+ 0, 360, -2058, 9745, 10050, -2080, 366, 0,
+ 0, 359, -2052, 9669, 10126, -2084, 367, 0,
+ 0, 357, -2046, 9592, 10201, -2089, 369, 0,
+ 0, 355, -2039, 9515, 10276, -2093, 370, 0,
+ 0, 354, -2032, 9438, 10351, -2097, 371, 0,
+ 0, 352, -2025, 9360, 10426, -2100, 372, 0,
+ 0, 350, -2018, 9283, 10500, -2103, 373, 0,
+ 0, 348, -2010, 9205, 10574, -2106, 374, 0,
+ 0, 346, -2002, 9127, 10648, -2108, 375, 0,
+ -1, 344, -1994, 9049, 10721, -2111, 375, 0,
+ -1, 342, -1985, 8971, 10795, -2112, 376, -1,
+ -1, 340, -1977, 8892, 10867, -2114, 377, -1,
+ -1, 337, -1968, 8814, 10940, -2115, 377, -1,
+ -1, 335, -1959, 8735, 11012, -2116, 377, -1,
+ -1, 333, -1949, 8656, 11084, -2116, 378, -1,
+ -1, 331, -1940, 8578, 11156, -2116, 378, -1,
+ -1, 328, -1930, 8499, 11227, -2116, 378, -1,
+ -2, 326, -1920, 8420, 11298, -2116, 378, -1,
+ -2, 323, -1909, 8341, 11369, -2115, 378, -1,
+ -2, 321, -1899, 8262, 11439, -2113, 378, -1,
+ -2, 318, -1888, 8182, 11509, -2112, 378, -2,
+ -2, 316, -1877, 8103, 11578, -2110, 378, -2,
+ -2, 313, -1866, 8024, 11647, -2107, 377, -2,
+ -3, 311, -1855, 7944, 11716, -2104, 377, -2,
+ -3, 308, -1844, 7865, 11785, -2101, 376, -2,
+ -3, 305, -1832, 7785, 11852, -2098, 376, -2,
+ -3, 303, -1820, 7706, 11920, -2094, 375, -2,
+ -4, 300, -1808, 7626, 11987, -2089, 374, -3,
+ -4, 297, -1796, 7547, 12054, -2084, 373, -3,
+ -4, 294, -1784, 7467, 12120, -2079, 372, -3,
+ -4, 291, -1771, 7388, 12186, -2074, 371, -3,
+ -5, 289, -1758, 7308, 12251, -2068, 370, -3,
+ -5, 286, -1745, 7229, 12316, -2062, 369, -3,
+ -5, 283, -1732, 7149, 12381, -2055, 367, -3,
+ -6, 280, -1719, 7070, 12445, -2048, 366, -4,
+ -6, 277, -1706, 6990, 12509, -2040, 364, -4,
+ -6, 274, -1693, 6911, 12572, -2032, 362, -4,
+ -7, 271, -1679, 6831, 12634, -2024, 360, -4,
+ -7, 268, -1665, 6752, 12696, -2015, 358, -4,
+ -7, 265, -1651, 6673, 12758, -2005, 356, -4,
+ -8, 262, -1637, 6594, 12819, -1996, 354, -4,
+ -8, 259, -1623, 6514, 12880, -1986, 352, -4,
+ -8, 256, -1609, 6435, 12940, -1975, 349, -5,
+ -9, 253, -1595, 6356, 13000, -1964, 347, -5,
+ -9, 250, -1580, 6277, 13059, -1952, 344, -5,
+ -10, 247, -1566, 6199, 13118, -1940, 341, -5,
+ -10, 244, -1551, 6120, 13176, -1928, 338, -5,
+ -10, 241, -1536, 6041, 13233, -1915, 335, -5,
+ -11, 238, -1521, 5963, 13290, -1902, 332, -5,
+ -11, 235, -1506, 5885, 13347, -1888, 329, -5,
+ -12, 232, -1491, 5806, 13402, -1874, 326, -5,
+ -12, 229, -1476, 5728, 13458, -1859, 322, -5,
+ -13, 225, -1461, 5651, 13512, -1844, 319, -5,
+ -13, 222, -1445, 5573, 13567, -1829, 315, -5,
+ -13, 219, -1430, 5495, 13620, -1813, 311, -6,
+ -14, 216, -1414, 5418, 13673, -1796, 307, -6,
+ -14, 213, -1399, 5340, 13726, -1779, 303, -6,
+ -15, 210, -1383, 5263, 13777, -1762, 299, -6,
+ -15, 207, -1368, 5186, 13829, -1744, 294, -6,
+ -16, 204, -1352, 5110, 13879, -1725, 290, -6,
+ -16, 201, -1336, 5033, 13929, -1706, 285, -6,
+ -17, 198, -1320, 4957, 13978, -1687, 280, -6,
+ -17, 195, -1304, 4881, 14027, -1667, 276, -5,
+ -18, 192, -1288, 4805, 14075, -1647, 271, -5,
+ -18, 189, -1272, 4729, 14123, -1626, 265, -5,
+ -19, 186, -1256, 4653, 14169, -1604, 260, -5,
+ -19, 183, -1240, 4578, 14216, -1583, 255, -5,
+ -20, 180, -1224, 4503, 14261, -1560, 249, -5,
+ -20, 177, -1208, 4428, 14306, -1537, 244, -5,
+ -21, 174, -1192, 4354, 14350, -1514, 238, -5,
+ -21, 171, -1175, 4279, 14394, -1490, 232, -5,
+ -22, 168, -1159, 4205, 14437, -1466, 226, -4,
+ -22, 165, -1143, 4131, 14479, -1441, 220, -4,
+ -22, 162, -1127, 4058, 14520, -1416, 213, -4,
+ -23, 159, -1110, 3985, 14561, -1390, 207, -4,
+ -23, 156, -1094, 3912, 14601, -1363, 200, -4,
+ -24, 153, -1078, 3839, 14640, -1337, 193, -3,
+ -24, 150, -1062, 3766, 14679, -1309, 187, -3,
+ -25, 147, -1045, 3694, 14717, -1281, 179, -3,
+ -25, 144, -1029, 3622, 14754, -1253, 172, -3,
+ -26, 142, -1013, 3551, 14791, -1224, 165, -2,
+ -26, 139, -996, 3480, 14827, -1194, 158, -2,
+ -27, 136, -980, 3409, 14862, -1164, 150, -1,
+ -27, 133, -964, 3338, 14896, -1134, 142, -1,
+ -28, 131, -948, 3268, 14930, -1103, 135, -1,
+ -28, 128, -931, 3198, 14963, -1071, 127, 0,
+ -29, 125, -915, 3128, 14995, -1039, 118, 0,
+ -29, 122, -899, 3059, 15027, -1007, 110, 1,
+ -29, 120, -883, 2990, 15057, -974, 102, 1,
+ -30, 117, -867, 2921, 15087, -940, 93, 2,
+ -30, 115, -851, 2853, 15117, -906, 85, 2,
+ -31, 112, -835, 2785, 15145, -871, 76, 3,
+ -31, 109, -819, 2718, 15173, -836, 67, 3,
+ -32, 107, -803, 2651, 15200, -801, 58, 4,
+ -32, 104, -787, 2584, 15226, -764, 49, 5,
+ -32, 102, -771, 2517, 15251, -728, 39, 5,
+ -33, 99, -755, 2451, 15276, -690, 30, 6,
+ -33, 97, -740, 2386, 15300, -653, 20, 7,
+ -33, 95, -724, 2321, 15323, -614, 10, 7,
+ -34, 92, -708, 2256, 15345, -576, 1, 8,
+ -34, 90, -693, 2191, 15366, -536, -9, 9,
+ -34, 88, -677, 2127, 15387, -496, -20, 10,
+ -35, 85, -662, 2063, 15407, -456, -30, 11,
+ -35, 83, -646, 2000, 15426, -415, -40, 11,
+ -35, 81, -631, 1937, 15445, -374, -51, 12,
+ -36, 79, -616, 1875, 15462, -332, -62, 13,
+ -36, 76, -600, 1813, 15479, -289, -72, 14,
+ -36, 74, -585, 1751, 15495, -247, -83, 15,
+ -36, 72, -570, 1690, 15510, -203, -94, 16,
+ -37, 70, -555, 1629, 15524, -159, -106, 17,
+ -37, 68, -540, 1569, 15538, -115, -117, 18,
+ -37, 66, -526, 1509, 15550, -70, -128, 19,
+ -37, 64, -511, 1450, 15562, -24, -140, 21,
+ -37, 62, -496, 1391, 15573, 22, -152, 22,
+ -38, 60, -482, 1332, 15583, 68, -164, 23,
+ -38, 58, -467, 1274, 15593, 115, -175, 24,
+ -38, 56, -453, 1216, 15601, 163, -188, 25,
+ -38, 54, -439, 1159, 15609, 211, -200, 27,
+ -38, 53, -425, 1103, 15616, 259, -212, 28,
+ -38, 51, -410, 1046, 15622, 309, -224, 29,
+ -38, 49, -396, 990, 15628, 358, -237, 31,
+ -38, 47, -383, 935, 15632, 408, -250, 32,
+ -38, 46, -369, 880, 15636, 459, -263, 33,
+ -38, 44, -355, 826, 15639, 510, -275, 35,
+ -38, 42, -342, 772, 15641, 561, -288, 36,
+ -38, 41, -328, 718, 15642, 613, -302, 38,
+};
+
+inline int SPC_DSP::interpolate( voice_t const* v )
+{
+	// Make pointers into gaussian based on fractional position between samples
+	int offset = v->interp_pos >> 4 & 0xFF;
+	short const* fwd = gauss + 255 - offset;
+	short const* rev = gauss + offset; // mirror left half of gaussian
+	
+	int const* in = &v->buf (v->interp_pos >> 12) + v->buf_pos;
+	int out;
+	out = (fwd 0 * in 0) >> 11;
+	out += (fwd 256 * in 1) >> 11;
+	out += (rev 256 * in 2) >> 11;
+	out = (int16_t) out;
+	out += (rev 0 * in 3) >> 11;
+	
+	CLAMP16( out );
+	out &= ~1;
+	return out;
+}
+
+inline int SPC_DSP::interpolate_cubic( voice_t const* v )
+{
+ // Make pointers into cubic based on fractional position between samples
+ int offset = v->interp_pos >> 4 & 0xFF;
+ short const* fwd = cubic + offset;
+ short const* rev = cubic + 256 - offset; // mirror left half of cubic
+ 
+ int const* in = &v->buf (v->interp_pos >> 12) + v->buf_pos;
+ int out;
+ out = fwd 0 * in 0;
+ out += fwd 257 * in 1;
+ out += rev 257 * in 2;
+ out += rev 0 * in 3;
+ out >>= 11;
+ 
+ CLAMP16( out );
+ out &= ~1;
+ return out;
+}
+
+inline int SPC_DSP::interpolate_sinc( voice_t const* v )
+{
+ // Make pointers into cubic based on fractional position between samples
+ int offset = v->interp_pos & 0xFF0;
+ short const* filt = (short const*) (((char const*)sinc) + offset);
+ 
+ int const* in = &v->buf (v->interp_pos >> 12) + v->buf_pos;
+ int out;
+ out = filt 0 * in 0;
+ out += filt 1 * in 1;
+ out += filt 2 * in 2;
+ out += filt 3 * in 3;
+ out += filt 4 * in 4;
+ out += filt 5 * in 5;
+ out += filt 6 * in 6;
+ out += filt 7 * in 7;
+ out >>= 14;
+ 
+ CLAMP16( out );
+ out &= ~1;
+ return out;
+}
+
+inline int SPC_DSP::interpolate_linear( voice_t const* v )
+{
+ int fract = v->interp_pos & 0xFFF;
+
+ int const* in = &v->buf (v->interp_pos >> 12) + v->buf_pos;
+ int out;
+ out = (0x1000 - fract) * in 0;
+ out += fract * in 1;
+ out >>= 12;
+
+ // no need to clamp
+ out &= ~1;
+ return out;
+}
+
+inline int SPC_DSP::interpolate_nearest( voice_t const* v )
+{
+ return v->buf (v->interp_pos >> 12) + v->buf_pos & ~1;
+}
+
+
+//// Counters
+
+int const simple_counter_range = 2048 * 5 * 3; // 30720
+
+static unsigned const counter_rates 32 =
+{
+ simple_counter_range + 1, // never fires
+ 2048, 1536,
+	1280, 1024, 768,
+	 640, 512, 384,
+	 320, 256, 192,
+	 160, 128, 96,
+	 80, 64, 48,
+	 40, 32, 24,
+	 20, 16, 12,
+	 10, 8, 6,
+	 5, 4, 3,
+	 2,
+	 1
+};
+
+static unsigned const counter_offsets 32 =
+{
+	 1, 0, 1040,
+	536, 0, 1040,
+	536, 0, 1040,
+	536, 0, 1040,
+	536, 0, 1040,
+	536, 0, 1040,
+	536, 0, 1040,
+	536, 0, 1040,
+	536, 0, 1040,
+	536, 0, 1040,
+	 0,
+	 0
+};
+
+inline void SPC_DSP::init_counter()
+{
+	m.counter = 0;
+}
+
+inline void SPC_DSP::run_counters()
+{
+	if ( --m.counter < 0 )
+		m.counter = simple_counter_range - 1;
+}
+
+inline unsigned SPC_DSP::read_counter( int rate )
+{
+	return ((unsigned) m.counter + counter_offsets rate) % counter_rates rate;
+}
+
+
+//// Envelope
+
+inline void SPC_DSP::run_envelope( voice_t* const v )
+{
+	int env = v->env;
+	if ( v->env_mode == env_release ) // 60%
+	{
+		if ( (env -= 0x8) < 0 )
+			env = 0;
+		v->env = env;
+	}
+	else
+	{
+		int rate;
+		int env_data = VREG(v->regs,adsr1);
+		if ( m.t_adsr0 & 0x80 ) // 99% ADSR
+		{
+			if ( v->env_mode >= env_decay ) // 99%
+			{
+				env--;
+				env -= env >> 8;
+				rate = env_data & 0x1F;
+				if ( v->env_mode == env_decay ) // 1%
+					rate = (m.t_adsr0 >> 3 & 0x0E) + 0x10;
+			}
+			else // env_attack
+			{
+				rate = (m.t_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
+	}
+}
+
+
+//// BRR Decoding
+
+inline void SPC_DSP::decode_brr( voice_t* v )
+{
+	// Arrange the four input nybbles in 0xABCD order for easy decoding
+	int nybbles = m.t_brr_byte * 0x100 + m.ram (v->brr_addr + v->brr_offset + 1) & 0xFFFF;
+	
+	int const header = m.t_brr_header;
+	
+	// Write to next four samples in circular buffer
+	int* pos = &v->buf v->buf_pos;
+	int* end;
+	if ( (v->buf_pos += 4) >= brr_buf_size )
+		v->buf_pos = 0;
+	
+	// Decode four samples
+	for ( end = pos + 4; pos < end; pos++, nybbles <<= 4 )
+	{
+		// Extract nybble and sign-extend
+		int s = (int16_t) nybbles >> 12;
+		
+		// Shift sample based on header
+		int const shift = header >> 4;
+		s = (s << shift) >> 1;
+		if ( shift >= 0xD ) // handle invalid range
+			s = (s >> 25) << 11; // same as: s = (s < 0 ? -0x800 : 0)
+		
+		// Apply IIR filter (8 is the most commonly used)
+		int const filter = 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
+	}
+}
+
+
+//// Misc
+
+#define MISC_CLOCK( n ) inline void SPC_DSP::misc_##n()
+
+MISC_CLOCK( 27 )
+{
+	m.t_pmon = REG(pmon) & 0xFE; // voice 0 doesn't support PMON
+}
+MISC_CLOCK( 28 )
+{
+	m.t_non = REG(non);
+	m.t_eon = REG(eon);
+	m.t_dir = REG(dir);
+}
+MISC_CLOCK( 29 )
+{
+	if ( (m.every_other_sample ^= 1) != 0 )
+		m.new_kon &= ~m.kon; // clears KON 63 clocks after it was last read
+}
+MISC_CLOCK( 30 )
+{
+	if ( m.every_other_sample )
+	{
+		m.kon = m.new_kon;
+		m.t_koff = REG(koff) | m.mute_mask; 
+	}
+	
+	run_counters();
+	
+	// Noise
+	if ( !read_counter( REG(flg) & 0x1F ) )
+	{
+		int feedback = (m.noise << 13) ^ (m.noise << 14);
+		m.noise = (feedback & 0x4000) ^ (m.noise >> 1);
+	}
+}
+
+
+//// Voices
+
+#define VOICE_CLOCK( n ) void SPC_DSP::voice_##n( voice_t* const v )
+
+inline VOICE_CLOCK( V1 )
+{
+	m.t_dir_addr = m.t_dir * 0x100 + m.t_srcn * 4;
+	m.t_srcn = VREG(v->regs,srcn);
+}
+inline VOICE_CLOCK( V2 )
+{
+	// Read sample pointer (ignored if not needed)
+	uint8_t const* entry = &m.ram m.t_dir_addr;
+	if ( !v->kon_delay )
+		entry += 2;
+	m.t_brr_next_addr = GET_LE16A( entry );
+	
+	m.t_adsr0 = VREG(v->regs,adsr0);
+	
+	// Read pitch, spread over two clocks
+	m.t_pitch = VREG(v->regs,pitchl);
+}
+inline VOICE_CLOCK( V3a )
+{
+	m.t_pitch += (VREG(v->regs,pitchh) & 0x3F) << 8;
+}
+inline VOICE_CLOCK( V3b )
+{
+	// Read BRR header and byte
+	m.t_brr_byte = m.ram (v->brr_addr + v->brr_offset) & 0xFFFF;
+	m.t_brr_header = m.ram v->brr_addr; // brr_addr doesn't need masking
+}
+VOICE_CLOCK( V3c )
+{
+	// Pitch modulation using previous voice's output
+	if ( m.t_pmon & v->vbit )
+		m.t_pitch += ((m.t_output >> 5) * m.t_pitch) >> 10;
+	
+	if ( v->kon_delay )
+	{
+		// Get ready to start BRR decoding on next sample
+		if ( v->kon_delay == 5 )
+		{
+			v->brr_addr = m.t_brr_next_addr;
+			v->brr_offset = 1;
+			v->buf_pos = 0;
+			m.t_brr_header = 0; // header is ignored on this sample
+			m.kon_check = true;
+		}
+		
+		// Envelope is never run during KON
+		v->env = 0;
+		v->hidden_env = 0;
+		
+		// Disable BRR decoding until last three samples
+		v->interp_pos = 0;
+		if ( --v->kon_delay & 3 )
+			v->interp_pos = 0x4000;
+		
+		// Pitch is never added during KON
+		m.t_pitch = 0;
+	}
+	
+	// Gaussian interpolation
+	{
+		int output;
+
+		switch ( m.interpolation_level )
+		{
+		case 0:
+		default:
+			output = interpolate( v );
+			break;
+
+		case 1:
+			output = interpolate_cubic( v );
+			break;
+
+		case 2:
+			output = interpolate_sinc( v );
+			break;
+
+		case -1:
+			output = interpolate_linear( v );
+			break;
+
+		case -2:
+			output = interpolate_nearest( v );
+			break;
+		}
+
+		// Noise
+		if ( m.t_non & v->vbit )
+			output = (int16_t) (m.noise * 2);
+		
+		// Apply envelope
+		m.t_output = (output * v->env) >> 11 & ~1;
+		v->t_envx_out = (uint8_t) (v->env >> 4);
+	}
+	
+	// Immediate silence due to end of sample or soft reset
+	if ( REG(flg) & 0x80 || (m.t_brr_header & 3) == 1 )
+	{
+		v->env_mode = env_release;
+		v->env = 0;
+	}
+	
+	if ( m.every_other_sample )
+	{
+		// KOFF
+		if ( m.t_koff & v->vbit )
+			v->env_mode = env_release;
+		
+		// KON
+		if ( m.kon & v->vbit )
+		{
+			v->kon_delay = 5;
+			v->env_mode = env_attack;
+		}
+	}
+	
+	// Run envelope for next sample
+	if ( !v->kon_delay )
+		run_envelope( v );
+}
+inline void SPC_DSP::voice_output( voice_t const* v, int ch )
+{
+ // Check surround removal
+ int vol = (int8_t) VREG(v->regs,voll + ch);
+ int voln = (int8_t) VREG(v->regs,voll + ch ^ 1);
+ if ( vol * voln < m.surround_threshold )
+ vol ^= vol >> 7;
+	
+ // Apply left/right volume
+	int amp = (m.t_output * vol) >> 7;
+	
+	int abs_amp = abs( amp );
+	if ( abs_amp > m.max_levelv - (const SPC_DSP::voice_t *)&m.voicesch )
+		m.max_levelv - (const SPC_DSP::voice_t *)&m.voicesch = abs_amp;
+
+	// Add to output total
+	m.t_main_out ch += amp;
+	CLAMP16( m.t_main_out ch );
+	
+	// Optionally add to echo total
+	if ( m.t_eon & v->vbit )
+	{
+		m.t_echo_out ch += amp;
+		CLAMP16( m.t_echo_out ch );
+	}
+}
+VOICE_CLOCK( V4 )
+{
+	// Decode BRR
+	m.t_looped = 0;
+	if ( v->interp_pos >= 0x4000 )
+	{
+		decode_brr( v );
+		
+		if ( (v->brr_offset += 2) >= brr_block_size )
+		{
+			// Start decoding next BRR block
+			assert( v->brr_offset == brr_block_size );
+			v->brr_addr = (v->brr_addr + brr_block_size) & 0xFFFF;
+			if ( m.t_brr_header & 1 )
+			{
+				v->brr_addr = m.t_brr_next_addr;
+				m.t_looped = v->vbit;
+			}
+			v->brr_offset = 1;
+		}
+	}
+	
+	// Apply pitch
+	v->interp_pos = (v->interp_pos & 0x3FFF) + m.t_pitch;
+	
+	// Keep from getting too far ahead (when using pitch modulation)
+	if ( v->interp_pos > 0x7FFF )
+		v->interp_pos = 0x7FFF;
+	
+	// Output left
+	voice_output( v, 0 );
+}
+inline VOICE_CLOCK( V5 )
+{
+	// Output right
+	voice_output( v, 1 );
+	
+	// ENDX, OUTX, and ENVX won't update if you wrote to them 1-2 clocks earlier
+	int endx_buf = REG(endx) | m.t_looped;
+	
+	// Clear bit in ENDX if KON just began
+	if ( v->kon_delay == 5 )
+		endx_buf &= ~v->vbit;
+	m.endx_buf = (uint8_t) endx_buf;
+}
+inline VOICE_CLOCK( V6 )
+{
+	(void) v; // avoid compiler warning about unused v
+	m.outx_buf = (uint8_t) (m.t_output >> 8);
+}
+inline VOICE_CLOCK( V7 )
+{
+	// Update ENDX
+	REG(endx) = m.endx_buf;
+	
+	m.envx_buf = v->t_envx_out;
+}
+inline VOICE_CLOCK( V8 )
+{
+	// Update OUTX
+	VREG(v->regs,outx) = m.outx_buf;
+}
+inline VOICE_CLOCK( V9 )
+{
+	// Update ENVX
+	VREG(v->regs,envx) = m.envx_buf;
+}
+
+// Most voices do all these in one clock, so make a handy composite
+inline VOICE_CLOCK( V3 )
+{
+	voice_V3a( v );
+	voice_V3b( v );
+	voice_V3c( v );
+}
+
+// Common combinations of voice steps on different voices. This greatly reduces
+// code size and allows everything to be inlined in these functions.
+VOICE_CLOCK(V7_V4_V1) { voice_V7(v); voice_V1(v+3); voice_V4(v+1); }
+VOICE_CLOCK(V8_V5_V2) { voice_V8(v); voice_V5(v+1); voice_V2(v+2); }
+VOICE_CLOCK(V9_V6_V3) { voice_V9(v); voice_V6(v+1); voice_V3(v+2); }
+
+
+//// Echo
+
+// Current echo buffer pointer for left/right channel
+#define ECHO_PTR( ch ) (&m.ram m.t_echo_ptr + ch * 2)
+
+// Sample in echo history buffer, where 0 is the oldest
+#define ECHO_FIR( i ) (m.echo_hist_pos i)
+
+// Calculate FIR point for left/right channel
+#define CALC_FIR( i, ch ) ((ECHO_FIR( i + 1 ) ch * (int8_t) REG(fir + i * 0x10)) >> 6)
+
+#define ECHO_CLOCK( n ) inline void SPC_DSP::echo_##n()
+
+inline void SPC_DSP::echo_read( int ch )
+{
+	int s = GET_LE16SA( ECHO_PTR( ch ) );
+	// second copy simplifies wrap-around handling
+	ECHO_FIR( 0 ) ch = ECHO_FIR( 8 ) ch = s >> 1;
+}
+
+ECHO_CLOCK( 22 )
+{
+	// History
+	if ( ++m.echo_hist_pos >= &m.echo_hist echo_hist_size )
+		m.echo_hist_pos = m.echo_hist;
+	
+	m.t_echo_ptr = (m.t_esa * 0x100 + m.echo_offset) & 0xFFFF;
+	echo_read( 0 );
+	
+	// FIR (using l and r temporaries below helps compiler optimize)
+	int l = CALC_FIR( 0, 0 );
+	int r = CALC_FIR( 0, 1 );
+	
+	m.t_echo_in 0 = l;
+	m.t_echo_in 1 = r;
+}
+ECHO_CLOCK( 23 )
+{
+	int l = CALC_FIR( 1, 0 ) + CALC_FIR( 2, 0 );
+	int r = CALC_FIR( 1, 1 ) + CALC_FIR( 2, 1 );
+	
+	m.t_echo_in 0 += l;
+	m.t_echo_in 1 += r;
+	
+	echo_read( 1 );
+}
+ECHO_CLOCK( 24 )
+{
+	int l = CALC_FIR( 3, 0 ) + CALC_FIR( 4, 0 ) + CALC_FIR( 5, 0 );
+	int r = CALC_FIR( 3, 1 ) + CALC_FIR( 4, 1 ) + CALC_FIR( 5, 1 );
+	
+	m.t_echo_in 0 += l;
+	m.t_echo_in 1 += r;
+}
+ECHO_CLOCK( 25 )
+{
+	int l = m.t_echo_in 0 + CALC_FIR( 6, 0 );
+	int r = m.t_echo_in 1 + CALC_FIR( 6, 1 );
+	
+	l = (int16_t) l;
+	r = (int16_t) r;
+	
+	l += (int16_t) CALC_FIR( 7, 0 );
+	r += (int16_t) CALC_FIR( 7, 1 );
+	
+	CLAMP16( l );
+	CLAMP16( r );
+	
+	m.t_echo_in 0 = l & ~1;
+	m.t_echo_in 1 = r & ~1;
+}
+inline int SPC_DSP::echo_output( int ch )
+{
+ // Check surround removal
+ int vol = (int8_t) REG(mvoll + ch * 0x10);
+ int voln = (int8_t) REG(mvoll + ch * 0x10 ^ 0x10);
+ if ( vol * voln < m.surround_threshold )
+ vol ^= vol >> 7;
+	
+ int out = (int16_t) ((m.t_main_out ch * vol) >> 7) +
+			(int16_t) ((m.t_echo_in ch * (int8_t) REG(evoll + ch * 0x10)) >> 7);
+	CLAMP16( out );
+	return out;
+}
+ECHO_CLOCK( 26 )
+{
+	// Left output volumes
+	// (save sample for next clock so we can output both together)
+	m.t_main_out 0 = echo_output( 0 );
+	
+	// Echo feedback
+	int l = m.t_echo_out 0 + (int16_t) ((m.t_echo_in 0 * (int8_t) REG(efb)) >> 7);
+	int r = m.t_echo_out 1 + (int16_t) ((m.t_echo_in 1 * (int8_t) REG(efb)) >> 7);
+	
+	CLAMP16( l );
+	CLAMP16( r );
+	
+	m.t_echo_out 0 = l & ~1;
+	m.t_echo_out 1 = r & ~1;
+}
+ECHO_CLOCK( 27 )
+{
+	// Output
+	int l = m.t_main_out 0;
+	int r = echo_output( 1 );
+	m.t_main_out 0 = 0;
+	m.t_main_out 1 = 0;
+	
+	// TODO: global muting isn't this simple (turns DAC on and off
+	// or something, causing small ~37-sample pulse when first muted)
+	if ( REG(flg) & 0x40 )
+	{
+		l = 0;
+		r = 0;
+	}
+	
+	// Output sample to DAC
+	#ifdef SPC_DSP_OUT_HOOK
+		SPC_DSP_OUT_HOOK( l, r );
+	#else
+		sample_t* out = m.out;
+		WRITE_SAMPLES( l, r, out );
+		m.out = out;
+	#endif
+}
+ECHO_CLOCK( 28 )
+{
+	m.t_echo_enabled = REG(flg);
+}
+inline void SPC_DSP::echo_write( int ch )
+{
+	if ( !(m.t_echo_enabled & 0x20) )
+		SET_LE16A( ECHO_PTR( ch ), m.t_echo_out ch );
+	m.t_echo_out ch = 0;
+}
+ECHO_CLOCK( 29 )
+{
+	m.t_esa = REG(esa);
+	
+	if ( !m.echo_offset )
+		m.echo_length = (REG(edl) & 0x0F) * 0x800;
+	
+	m.echo_offset += 4;
+	if ( m.echo_offset >= m.echo_length )
+		m.echo_offset = 0;
+	
+	// Write left echo
+	echo_write( 0 );
+	
+	m.t_echo_enabled = REG(flg);
+}
+ECHO_CLOCK( 30 )
+{
+	// Write right echo
+	echo_write( 1 );
+}
+
+
+//// Timing
+
+// Execute clock for a particular voice
+#define V( clock, voice ) voice_##clock( &m.voices voice );
+
+/* The most common sequence of clocks uses composite operations
+for efficiency. For example, the following are equivalent to the
+individual steps on the right:
+
+V(V7_V4_V1,2) -> V(V7,2) V(V4,3) V(V1,5)
+V(V8_V5_V2,2) -> V(V8,2) V(V5,3) V(V2,4)
+V(V9_V6_V3,2) -> V(V9,2) V(V6,3) V(V3,4) */
+
+// Voice 0 1 2 3 4 5 6 7
+#define GEN_DSP_TIMING \
+PHASE( 0) V(V5,0)V(V2,1)\
+PHASE( 1) V(V6,0)V(V3,1)\
+PHASE( 2) V(V7_V4_V1,0)\
+PHASE( 3) V(V8_V5_V2,0)\
+PHASE( 4) V(V9_V6_V3,0)\
+PHASE( 5) V(V7_V4_V1,1)\
+PHASE( 6) V(V8_V5_V2,1)\
+PHASE( 7) V(V9_V6_V3,1)\
+PHASE( 8) V(V7_V4_V1,2)\
+PHASE( 9) V(V8_V5_V2,2)\
+PHASE(10) V(V9_V6_V3,2)\
+PHASE(11) V(V7_V4_V1,3)\
+PHASE(12) V(V8_V5_V2,3)\
+PHASE(13) V(V9_V6_V3,3)\
+PHASE(14) V(V7_V4_V1,4)\
+PHASE(15) V(V8_V5_V2,4)\
+PHASE(16) V(V9_V6_V3,4)\
+PHASE(17) V(V1,0) V(V7,5)V(V4,6)\
+PHASE(18) V(V8_V5_V2,5)\
+PHASE(19) V(V9_V6_V3,5)\
+PHASE(20) V(V1,1) V(V7,6)V(V4,7)\
+PHASE(21) V(V8,6)V(V5,7) V(V2,0) /* t_brr_next_addr order dependency */\
+PHASE(22) V(V3a,0) V(V9,6)V(V6,7) echo_22();\
+PHASE(23) V(V7,7) echo_23();\
+PHASE(24) V(V8,7) echo_24();\
+PHASE(25) V(V3b,0) V(V9,7) echo_25();\
+PHASE(26) echo_26();\
+PHASE(27) misc_27(); echo_27();\
+PHASE(28) misc_28(); echo_28();\
+PHASE(29) misc_29(); echo_29();\
+PHASE(30) misc_30();V(V3c,0) echo_30();\
+PHASE(31) V(V4,0) V(V1,2)\
+
+#if !SPC_DSP_CUSTOM_RUN
+
+void SPC_DSP::run( int clocks_remain )
+{
+	require( clocks_remain > 0 );
+	
+	int const phase = m.phase;
+	m.phase = (phase + clocks_remain) & 31;
+	switch ( phase )
+	{
+	loop:
+	
+		#define PHASE( n ) if ( n && !--clocks_remain ) break; case n:
+		GEN_DSP_TIMING
+		#undef PHASE
+	
+		if ( --clocks_remain )
+			goto loop;
+	}
+}
+
+#endif
+
+
+//// Setup
+
+void SPC_DSP::init( void* ram_64k )
+{
+	m.ram = (uint8_t*) ram_64k;
+	mute_voices( 0 );
+	disable_surround( false );
+	interpolation_level( 0 );
+	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
+	for ( int i = voice_count; --i >= 0; )
+	{
+		voice_t* v = &m.voices i;
+		v->brr_offset = 1;
+		v->vbit = 1 << i;
+		v->regs = &m.regs i * 0x10;
+	}
+	m.new_kon = REG(kon);
+	m.t_dir = REG(dir);
+	m.t_esa = REG(esa);
+	
+	soft_reset_common();
+}
+
+void SPC_DSP::reset() { load( initial_regs ); }
+
+
+//// State save/load
+
+#if !SPC_NO_COPY_STATE_FUNCS
+
+void SPC_State_Copier::copy( void* state, size_t size )
+{
+	func( buf, state, size );
+}
+
+int SPC_State_Copier::copy_int( int state, int size )
+{
+	BOOST::uint8_t s 2;
+	SET_LE16( s, state );
+	func( buf, &s, size );
+	return GET_LE16( s );
+}
+
+void SPC_State_Copier::skip( int count )
+{
+	if ( count > 0 )
+	{
+		char temp 64;
+		memset( temp, 0, sizeof temp );
+		do
+		{
+			int n = sizeof temp;
+			if ( n > count )
+				n = count;
+			count -= n;
+			func( buf, temp, n );
+		}
+		while ( count );
+	}
+}
+
+void SPC_State_Copier::extra()
+{
+	int n = 0;
+	SPC_State_Copier& copier = *this;
+	SPC_COPY( uint8_t, n );
+	skip( n );
+}
+
+void SPC_DSP::copy_state( unsigned char** io, copy_func_t copy )
+{
+	SPC_State_Copier copier( io, copy );
+	
+	// DSP registers
+	copier.copy( m.regs, register_count );
+	
+	// Internal state
+	
+	// Voices
+	int i;
+	for ( i = 0; i < voice_count; i++ )
+	{
+		voice_t* v = &m.voices i;
+		
+		// BRR buffer
+		int i;
+		for ( i = 0; i < brr_buf_size; i++ )
+		{
+			int s = v->buf i;
+			SPC_COPY( int16_t, s );
+			v->buf i = v->buf i + brr_buf_size = s;
+		}
+		
+		SPC_COPY( uint16_t, v->interp_pos );
+		SPC_COPY( uint16_t, v->brr_addr );
+		SPC_COPY( uint16_t, v->env );
+		SPC_COPY( int16_t, v->hidden_env );
+		SPC_COPY( uint8_t, v->buf_pos );
+		SPC_COPY( uint8_t, v->brr_offset );
+		SPC_COPY( uint8_t, v->kon_delay );
+		{
+			int m = v->env_mode;
+			SPC_COPY( uint8_t, m );
+			v->env_mode = (enum env_mode_t) m;
+		}
+		SPC_COPY( uint8_t, v->t_envx_out );
+		
+		copier.extra();
+	}
+	
+	// Echo history
+	for ( i = 0; i < echo_hist_size; i++ )
+	{
+		int j;
+		for ( j = 0; j < 2; j++ )
+		{
+			int s = m.echo_hist_pos i j;
+			SPC_COPY( int16_t, s );
+			m.echo_hist i j = s; // write back at offset 0
+		}
+	}
+	m.echo_hist_pos = m.echo_hist;
+	memcpy( &m.echo_hist echo_hist_size, m.echo_hist, echo_hist_size * sizeof m.echo_hist 0 );
+	
+	// Misc
+	SPC_COPY( uint8_t, m.every_other_sample );
+	SPC_COPY( uint8_t, m.kon );
+	
+	SPC_COPY( uint16_t, m.noise );
+	SPC_COPY( uint16_t, m.counter );
+	SPC_COPY( uint16_t, m.echo_offset );
+	SPC_COPY( uint16_t, m.echo_length );
+	SPC_COPY( uint8_t, m.phase );
+	
+	SPC_COPY( uint8_t, m.new_kon );
+	SPC_COPY( uint8_t, m.endx_buf );
+	SPC_COPY( uint8_t, m.envx_buf );
+	SPC_COPY( uint8_t, m.outx_buf );
+	
+	SPC_COPY( uint8_t, m.t_pmon );
+	SPC_COPY( uint8_t, m.t_non );
+	SPC_COPY( uint8_t, m.t_eon );
+	SPC_COPY( uint8_t, m.t_dir );
+	SPC_COPY( uint8_t, m.t_koff );
+	
+	SPC_COPY( uint16_t, m.t_brr_next_addr );
+	SPC_COPY( uint8_t, m.t_adsr0 );
+	SPC_COPY( uint8_t, m.t_brr_header );
+	SPC_COPY( uint8_t, m.t_brr_byte );
+	SPC_COPY( uint8_t, m.t_srcn );
+	SPC_COPY( uint8_t, m.t_esa );
+	SPC_COPY( uint8_t, m.t_echo_enabled );
+	
+	SPC_COPY( int16_t, m.t_main_out 0 );
+	SPC_COPY( int16_t, m.t_main_out 1 );
+	SPC_COPY( int16_t, m.t_echo_out 0 );
+	SPC_COPY( int16_t, m.t_echo_out 1 );
+	SPC_COPY( int16_t, m.t_echo_in 0 );
+	SPC_COPY( int16_t, m.t_echo_in 1 );
+	
+	SPC_COPY( uint16_t, m.t_dir_addr );
+	SPC_COPY( uint16_t, m.t_pitch );
+	SPC_COPY( int16_t, m.t_output );
+	SPC_COPY( uint16_t, m.t_echo_ptr );
+	SPC_COPY( uint8_t, m.t_looped );
+	
+	copier.extra();
+}
+
+};
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/dsp/SPC_DSP.h Added

@@ -0,0 +1,328 @@
+// Highly accurate SNES SPC-700 DSP emulator
+
+// snes_spc 0.9.0
+#ifndef SPC_DSP_H
+#define SPC_DSP_H
+
+#include "blargg_common.h"
+
+extern "C" { typedef void (*dsp_copy_func_t)( unsigned char** io, void* state, size_t ); }
+
+namespace SuperFamicom {
+class 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 );
+	sample_t* get_output();
+
+	// 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 run()
+	// 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 (issues repeated KOFF events).
+	// Reduces emulation accuracy.
+	enum { voice_count = 8 };
+	void mute_voices( int mask );
+
+// State
+	
+	// Resets DSP and uses supplied values to initialize registers
+	enum { register_count = 128 };
+	void load( uint8_t const regs register_count );
+
+	// Saves/loads exact emulator state
+	enum { state_size = 640 }; // maximum space needed when saving
+	typedef dsp_copy_func_t copy_func_t;
+	void copy_state( unsigned char** io, copy_func_t );
+
+	// Returns non-zero if new key-on events occurred since last call
+	bool check_kon();
+	
+// 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:
+	sample_t const* out_pos() const { return m.out; }
+	void disable_surround( bool disable = true );
+	void interpolation_level( int level = 0 ) { m.interpolation_level = level; }
+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
+		uint8_t* regs; // pointer to voice's DSP registers
+		int vbit; // bitmask for voice: 0x01 for voice 0, 0x02 for voice 1, etc.
+		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
+		uint8_t t_envx_out;
+	};
+//private:
+	enum { brr_block_size = 9 };
+	
+	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 counter;
+		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)
+		bool kon_check; // set when a new KON occurs
+		
+		// Hidden registers also written to when main register is written to
+		int new_kon;
+		uint8_t endx_buf;
+		uint8_t envx_buf;
+		uint8_t outx_buf;
+		
+		// Temporary state between clocks
+		
+		// read once per sample
+		int t_pmon;
+		int t_non;
+		int t_eon;
+		int t_dir;
+		int t_koff;
+		
+		// read a few clocks ahead then used
+		int t_brr_next_addr;
+		int t_adsr0;
+		int t_brr_header;
+		int t_brr_byte;
+		int t_srcn;
+		int t_esa;
+		int t_echo_enabled;
+		
+		// internal state that is recalculated every sample
+		int t_dir_addr;
+		int t_pitch;
+		int t_output;
+		int t_looped;
+		int t_echo_ptr;
+		
+		// left/right sums
+		int t_main_out 2;
+		int t_echo_out 2;
+		int t_echo_in 2;
+		
+		voice_t voices voice_count;
+		
+		// non-emulation state
+		uint8_t* ram; // 64K shared RAM between DSP and SMP
+		int mute_mask;
+ int surround_threshold;
+		int interpolation_level;
+		sample_t* out;
+		sample_t* out_end;
+		sample_t* out_begin;
+
+		int max_levelvoice_count2;
+	};
+	state_t m;
+	
+	void init_counter();
+	void run_counters();
+	unsigned read_counter( int rate );
+	
+	int interpolate( voice_t const* v );
+	int interpolate_cubic( voice_t const* v );
+	int interpolate_sinc( voice_t const* v );
+	int interpolate_linear( voice_t const* v );
+	int interpolate_nearest( voice_t const* v );
+
+	void run_envelope( voice_t* const v );
+	void decode_brr( voice_t* v );
+
+	void misc_27();
+	void misc_28();
+	void misc_29();
+	void misc_30();
+
+	void voice_output( voice_t const* v, int ch );
+	void voice_V1( voice_t* const );
+	void voice_V2( voice_t* const );
+	void voice_V3( voice_t* const );
+	void voice_V3a( voice_t* const );
+	void voice_V3b( voice_t* const );
+	void voice_V3c( voice_t* const );
+	void voice_V4( voice_t* const );
+	void voice_V5( voice_t* const );
+	void voice_V6( voice_t* const );
+	void voice_V7( voice_t* const );
+	void voice_V8( voice_t* const );
+	void voice_V9( voice_t* const );
+	void voice_V7_V4_V1( voice_t* const );
+	void voice_V8_V5_V2( voice_t* const );
+	void voice_V9_V6_V3( voice_t* const );
+
+	void echo_read( int ch );
+	int echo_output( int ch );
+	void echo_write( int ch );
+	void echo_22();
+	void echo_23();
+	void echo_24();
+	void echo_25();
+	void echo_26();
+	void echo_27();
+	void echo_28();
+	void echo_29();
+	void echo_30();
+	
+	void soft_reset_common();
+
+public:
+	bool mute() { return m.regsr_flg & 0x40; }
+};
+
+#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::write( int addr, int data )
+{
+	assert( (unsigned) addr < register_count );
+	
+	m.regs addr = (uint8_t) data;
+	switch ( addr & 0x0F )
+	{
+	case v_envx:
+		m.envx_buf = (uint8_t) data;
+		break;
+		
+	case v_outx:
+		m.outx_buf = (uint8_t) data;
+		break;
+	
+	case 0x0C:
+		if ( addr == r_kon )
+			m.new_kon = (uint8_t) data;
+		
+		if ( addr == r_endx ) // always cleared, regardless of data written
+		{
+			m.endx_buf = 0;
+			m.regs r_endx = 0;
+		}
+		break;
+	}
+}
+
+inline void SPC_DSP::mute_voices( int mask ) { m.mute_mask = mask; }
+
+inline void SPC_DSP::disable_surround( bool disable )
+{
+ m.surround_threshold = disable ? 0 : -0x4000;
+}
+
+inline bool SPC_DSP::check_kon()
+{
+	bool old = m.kon_check;
+	m.kon_check = 0;
+	return old;
+}
+
+inline SPC_DSP::sample_t* SPC_DSP::get_output()
+{
+	return m.out_begin;
+}
+
+#if !SPC_NO_COPY_STATE_FUNCS
+
+class SPC_State_Copier {
+	SPC_DSP::copy_func_t func;
+	unsigned char** buf;
+public:
+	SPC_State_Copier( unsigned char** p, SPC_DSP::copy_func_t f ) { func = f; buf = p; }
+	void copy( void* state, size_t size );
+	int copy_int( int state, int size );
+	void skip( int count );
+	void extra();
+};
+
+#define SPC_COPY( type, state )\
+{\
+	state = (BOOST::type) copier.copy_int( state, sizeof (BOOST::type) );\
+	assert( (BOOST::type) state == state );\
+}
+
+#endif
+
+};
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/dsp/dsp.cpp Added

@@ -0,0 +1,78 @@
+#include "../smp/smp.hpp"
+#include "dsp.hpp"
+
+namespace SuperFamicom {
+
+void DSP::step(uint64_t clocks) {
+ clock += clocks;
+}
+
+void DSP::enter() {
+ int64_t dsp_clocks = (-clock) / (24 * 4096) + 1;
+ if (dsp_clocks < 1) return;
+
+ spc_dsp.run(dsp_clocks);
+ step(dsp_clocks * 24 * 4096);
+
+ samplebuffer = spc_dsp.get_output();
+ signed count = spc_dsp.sample_count();
+ if(count > removed_samples) {
+ for(unsigned n = removed_samples; n < count; n += 2) {
+ if (!smp.sample(samplebuffern + 0, samplebuffern + 1)) {
+ removed_samples = n;
+ return;
+ }
+ }
+ spc_dsp.set_output(samplebuffer, 8192);
+ removed_samples = 0;
+ }
+}
+
+bool DSP::mute() {
+ return spc_dsp.mute();
+}
+
+uint8_t DSP::read(uint8_t addr) {
+ return spc_dsp.read(addr);
+}
+
+void DSP::write(uint8_t addr, uint8_t data) {
+ spc_dsp.write(addr, data);
+}
+
+void DSP::power() {
+ spc_dsp.init(smp.apuram);
+ spc_dsp.reset();
+ spc_dsp.set_output(0, 0);
+ removed_samples = 0;
+}
+
+void DSP::reset() {
+ spc_dsp.soft_reset();
+ spc_dsp.set_output(0, 0);
+ removed_samples = 0;
+}
+
+void DSP::channel_enable(unsigned channel, bool enable) {
+ channel_enabledchannel & 7 = enable;
+ unsigned mask = 0;
+ for(unsigned i = 0; i < 8; i++) {
+ if(channel_enabledi == false) mask |= 1 << i;
+ }
+ spc_dsp.mute_voices(mask);
+}
+ 
+void DSP::disable_surround(bool disable) {
+ spc_dsp.disable_surround(disable);
+}
+
+DSP::DSP(struct SMP & p_smp)
+ : smp( p_smp ), clock( 0 ), removed_samples( 0 ), samplebuffer( 0 ) {
+ for(unsigned i = 0; i < 8; i++) channel_enabledi = true;
+}
+
+DSP::~DSP() {
+ if ( samplebuffer ) free( samplebuffer );
+}
+
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/dsp/dsp.hpp Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/processor Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/processor/spc700 Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/processor/spc700/algorithms.cpp Added

@@ -0,0 +1,138 @@
+#ifdef SPC700_CPP
+
+uint8_t SPC700::op_adc(uint8_t x, uint8_t y) {
+ int r = x + y + regs.p.c;
+ regs.p.n = r & 0x80;
+ regs.p.v = ~(x ^ y) & (x ^ r) & 0x80;
+ regs.p.h = (x ^ y ^ r) & 0x10;
+ regs.p.z = (uint8_t)r == 0;
+ regs.p.c = r > 0xff;
+ return r;
+}
+
+uint8_t SPC700::op_and(uint8_t x, uint8_t y) {
+ x &= y;
+ regs.p.n = x & 0x80;
+ regs.p.z = x == 0;
+ return x;
+}
+
+uint8_t SPC700::op_asl(uint8_t x) {
+ regs.p.c = x & 0x80;
+ x <<= 1;
+ regs.p.n = x & 0x80;
+ regs.p.z = x == 0;
+ return x;
+}
+
+uint8_t SPC700::op_cmp(uint8_t x, uint8_t y) {
+ int r = x - y;
+ regs.p.n = r & 0x80;
+ regs.p.z = (uint8_t)r == 0;
+ regs.p.c = r >= 0;
+ return x;
+}
+
+uint8_t SPC700::op_dec(uint8_t x) {
+ x--;
+ regs.p.n = x & 0x80;
+ regs.p.z = x == 0;
+ return x;
+}
+
+uint8_t SPC700::op_eor(uint8_t x, uint8_t y) {
+ x ^= y;
+ regs.p.n = x & 0x80;
+ regs.p.z = x == 0;
+ return x;
+}
+
+uint8_t SPC700::op_inc(uint8_t x) {
+ x++;
+ regs.p.n = x & 0x80;
+ regs.p.z = x == 0;
+ return x;
+}
+
+uint8_t SPC700::op_ld(uint8_t x, uint8_t y) {
+ regs.p.n = y & 0x80;
+ regs.p.z = y == 0;
+ return y;
+}
+
+uint8_t SPC700::op_lsr(uint8_t x) {
+ regs.p.c = x & 0x01;
+ x >>= 1;
+ regs.p.n = x & 0x80;
+ regs.p.z = x == 0;
+ return x;
+}
+
+uint8_t SPC700::op_or(uint8_t x, uint8_t y) {
+ x |= y;
+ regs.p.n = x & 0x80;
+ regs.p.z = x == 0;
+ return x;
+}
+
+uint8_t SPC700::op_rol(uint8_t x) {
+ unsigned carry = regs.p.c << 0;
+ regs.p.c = x & 0x80;
+ x = (x << 1) | carry;
+ regs.p.n = x & 0x80;
+ regs.p.z = x == 0;
+ return x;
+}
+
+uint8_t SPC700::op_ror(uint8_t x) {
+ unsigned carry = regs.p.c << 7;
+ regs.p.c = x & 0x01;
+ x = carry | (x >> 1);
+ regs.p.n = x & 0x80;
+ regs.p.z = x == 0;
+ return x;
+}
+
+uint8_t SPC700::op_sbc(uint8_t x, uint8_t y) {
+ return op_adc(x, ~y);
+}
+
+uint8_t SPC700::op_st(uint8_t x, uint8_t y) {
+ return y;
+}
+
+//
+
+uint16_t SPC700::op_adw(uint16_t x, uint16_t y) {
+ uint16_t r;
+ regs.p.c = 0;
+ r = op_adc(x, y);
+ r |= op_adc(x >> 8, y >> 8) << 8;
+ regs.p.z = r == 0;
+ return r;
+}
+
+uint16_t SPC700::op_cpw(uint16_t x, uint16_t y) {
+ int r = x - y;
+ regs.p.n = r & 0x8000;
+ regs.p.z = (uint16_t)r == 0;
+ regs.p.c = r >= 0;
+ return x;
+}
+
+uint16_t SPC700::op_ldw(uint16_t x, uint16_t y) {
+ regs.p.n = y & 0x8000;
+ regs.p.z = y == 0;
+ return y;
+}
+
+uint16_t SPC700::op_sbw(uint16_t x, uint16_t y) {
+ uint16_t r;
+ regs.p.c = 1;
+ r = op_sbc(x, y);
+ r |= op_sbc(x >> 8, y >> 8) << 8;
+ regs.p.z = r == 0;
+ return r;
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/processor/spc700/instructions.cpp Added

@@ -0,0 +1,560 @@
+#ifdef SPC700_CPP
+
+#define call (this->*op)
+
+template<uint8_t (SPC700::*op)(uint8_t)>
+void SPC700::op_adjust(uint8_t& r) {
+ op_io();
+ r = call(r);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t)>
+void SPC700::op_adjust_addr() {
+ dp.l = op_readpc();
+ dp.h = op_readpc();
+ rd = op_read(dp);
+ rd = call(rd);
+ op_write(dp, rd);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t)>
+void SPC700::op_adjust_dp() {
+ dp = op_readpc();
+ rd = op_readdp(dp);
+ rd = call(rd);
+ op_writedp(dp, rd);
+}
+
+void SPC700::op_adjust_dpw(signed n) {
+ dp = op_readpc();
+ rd.w = op_readdp(dp) + n;
+ op_writedp(dp++, rd.l);
+ rd.h += op_readdp(dp);
+ op_writedp(dp++, rd.h);
+ regs.p.n = rd & 0x8000;
+ regs.p.z = rd == 0;
+}
+
+template<uint8_t (SPC700::*op)(uint8_t)>
+void SPC700::op_adjust_dpx() {
+ dp = op_readpc();
+ op_io();
+ rd = op_readdp(dp + regs.x);
+ rd = call(rd);
+ op_writedp(dp + regs.x, rd);
+}
+
+void SPC700::op_branch(bool condition) {
+ rd = op_readpc();
+ if(condition == false) return;
+ op_io();
+ op_io();
+ regs.pc += (int8_t)rd;
+}
+
+void SPC700::op_branch_bit() {
+ dp = op_readpc();
+ sp = op_readdp(dp);
+ rd = op_readpc();
+ op_io();
+ if((bool)(sp & (1 << (opcode >> 5))) == (bool)(opcode & 0x10)) return;
+ op_io();
+ op_io();
+ regs.pc += (int8_t)rd;
+}
+
+void SPC700::op_pull(uint8_t& r) {
+ op_io();
+ op_io();
+ r = op_readsp();
+}
+
+void SPC700::op_push(uint8_t r) {
+ op_io();
+ op_io();
+ op_writesp(r);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_read_addr(uint8_t& r) {
+ dp.l = op_readpc();
+ dp.h = op_readpc();
+ rd = op_read(dp);
+ r = call(r, rd);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_read_addri(uint8_t& r) {
+ dp.l = op_readpc();
+ dp.h = op_readpc();
+ op_io();
+ rd = op_read(dp + r);
+ regs.a = call(regs.a, rd);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_read_const(uint8_t& r) {
+ rd = op_readpc();
+ r = call(r, rd);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_read_dp(uint8_t& r) {
+ dp = op_readpc();
+ rd = op_readdp(dp);
+ r = call(r, rd);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_read_dpi(uint8_t& r, uint8_t& i) {
+ dp = op_readpc();
+ op_io();
+ rd = op_readdp(dp + i);
+ r = call(r, rd);
+}
+
+template<uint16_t (SPC700::*op)(uint16_t, uint16_t)>
+void SPC700::op_read_dpw() {
+ dp = op_readpc();
+ rd.l = op_readdp(dp++);
+ if(op != &SPC700::op_cpw) op_io();
+ rd.h = op_readdp(dp++);
+ regs.ya = call(regs.ya, rd);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_read_idpx() {
+ dp = op_readpc() + regs.x;
+ op_io();
+ sp.l = op_readdp(dp++);
+ sp.h = op_readdp(dp++);
+ rd = op_read(sp);
+ regs.a = call(regs.a, rd);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_read_idpy() {
+ dp = op_readpc();
+ op_io();
+ sp.l = op_readdp(dp++);
+ sp.h = op_readdp(dp++);
+ rd = op_read(sp + regs.y);
+ regs.a = call(regs.a, rd);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_read_ix() {
+ op_io();
+ rd = op_readdp(regs.x);
+ regs.a = call(regs.a, rd);
+}
+
+void SPC700::op_set_addr_bit() {
+ dp.l = op_readpc();
+ dp.h = op_readpc();
+ bit = dp >> 13;
+ dp &= 0x1fff;
+ rd = op_read(dp);
+ switch(opcode >> 5) {
+ case 0: //orc addr:bit
+ case 1: //orc !addr:bit
+ op_io();
+ regs.p.c |= (rd & (1 << bit)) ^ (bool)(opcode & 0x20);
+ break;
+ case 2: //and addr:bit
+ case 3: //and !addr:bit
+ regs.p.c &= (rd & (1 << bit)) ^ (bool)(opcode & 0x20);
+ break;
+ case 4: //eor addr:bit
+ op_io();
+ regs.p.c ^= (bool)(rd & (1 << bit));
+ break;
+ case 5: //ldc addr:bit
+ regs.p.c = (rd & (1 << bit));
+ break;
+ case 6: //stc addr:bit
+ op_io();
+ rd = (rd & ~(1 << bit)) | (regs.p.c << bit);
+ op_write(dp, rd);
+ break;
+ case 7: //not addr:bit
+ rd ^= 1 << bit;
+ op_write(dp, rd);
+ break;
+ }
+}
+
+void SPC700::op_set_bit() {
+ dp = op_readpc();
+ rd = op_readdp(dp) & ~(1 << (opcode >> 5));
+ op_writedp(dp, rd | (!(opcode & 0x10) << (opcode >> 5)));
+}
+
+void SPC700::op_set_flag(bool& flag, bool data) {
+ op_io();
+ if(&flag == &regs.p.i) op_io();
+ flag = data;
+}
+
+void SPC700::op_test_addr(bool set) {
+ dp.l = op_readpc();
+ dp.h = op_readpc();
+ rd = op_read(dp);
+ regs.p.n = (regs.a - rd) & 0x80;
+ regs.p.z = (regs.a - rd) == 0;
+ op_read(dp);
+ op_write(dp, set ? rd | regs.a : rd & ~regs.a);
+}
+
+void SPC700::op_transfer(uint8_t& from, uint8_t& to) {
+ op_io();
+ to = from;
+ if(&to == &regs.s) return;
+ regs.p.n = (to & 0x80);
+ regs.p.z = (to == 0);
+}
+
+void SPC700::op_write_addr(uint8_t& r) {
+ dp.l = op_readpc();
+ dp.h = op_readpc();
+ op_read(dp);
+ op_write(dp, r);
+}
+
+void SPC700::op_write_addri(uint8_t& i) {
+ dp.l = op_readpc();
+ dp.h = op_readpc();
+ op_io();
+ dp += i;
+ op_read(dp);
+ op_write(dp, regs.a);
+}
+
+void SPC700::op_write_dp(uint8_t& r) {
+ dp = op_readpc();
+ op_readdp(dp);
+ op_writedp(dp, r);
+}
+
+void SPC700::op_write_dpi(uint8_t& r, uint8_t& i) {
+ dp = op_readpc() + i;
+ op_io();
+ op_readdp(dp);
+ op_writedp(dp, r);
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_write_dp_const() {
+ rd = op_readpc();
+ dp = op_readpc();
+ wr = op_readdp(dp);
+ wr = call(wr, rd);
+ op != &SPC700::op_cmp ? op_writedp(dp, wr) : op_io();
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_write_dp_dp() {
+ sp = op_readpc();
+ rd = op_readdp(sp);
+ dp = op_readpc();
+ if(op != &SPC700::op_st) wr = op_readdp(dp);
+ wr = call(wr, rd);
+ op != &SPC700::op_cmp ? op_writedp(dp, wr) : op_io();
+}
+
+template<uint8_t (SPC700::*op)(uint8_t, uint8_t)>
+void SPC700::op_write_ix_iy() {
+ op_io();
+ rd = op_readdp(regs.y);
+ wr = op_readdp(regs.x);
+ wr = call(wr, rd);
+ op != &SPC700::op_cmp ? op_writedp(regs.x, wr) : op_io();
+}
+
+//
+
+void SPC700::op_bne_dp() {
+ dp = op_readpc();
+ sp = op_readdp(dp);
+ rd = op_readpc();
+ op_io();
+ if(regs.a == sp) return;
+ op_io();
+ op_io();
+ regs.pc += (int8_t)rd;
+}
+
+void SPC700::op_bne_dpdec() {
+ dp = op_readpc();
+ wr = op_readdp(dp);
+ op_writedp(dp, --wr);
+ rd = op_readpc();
+ if(wr == 0) return;
+ op_io();
+ op_io();
+ regs.pc += (int8_t)rd;
+}
+
+void SPC700::op_bne_dpx() {
+ dp = op_readpc();
+ op_io();
+ sp = op_readdp(dp + regs.x);
+ rd = op_readpc();
+ op_io();
+ if(regs.a == sp) return;
+ op_io();
+ op_io();
+ regs.pc += (int8_t)rd;
+}
+
+void SPC700::op_bne_ydec() {
+ rd = op_readpc();
+ op_io();
+ op_io();
+ if(--regs.y == 0) return;
+ op_io();
+ op_io();
+ regs.pc += (int8_t)rd;
+}
+
+void SPC700::op_brk() {
+ rd.l = op_read(0xffde);
+ rd.h = op_read(0xffdf);
+ op_io();
+ op_io();
+ op_writesp(regs.pc.h);
+ op_writesp(regs.pc.l);
+ op_writesp(regs.p);
+ regs.pc = rd;
+ regs.p.b = 1;
+ regs.p.i = 0;
+}
+
+void SPC700::op_clv() {
+ op_io();
+ regs.p.v = 0;
+ regs.p.h = 0;
+}
+
+void SPC700::op_cmc() {
+ op_io();
+ op_io();
+ regs.p.c = !regs.p.c;
+}
+
+void SPC700::op_daa() {
+ op_io();
+ op_io();
+ if(regs.p.c || (regs.a) > 0x99) {
+ regs.a += 0x60;
+ regs.p.c = 1;
+ }
+ if(regs.p.h || (regs.a & 15) > 0x09) {
+ regs.a += 0x06;
+ }
+ regs.p.n = (regs.a & 0x80);
+ regs.p.z = (regs.a == 0);
+}
+
+void SPC700::op_das() {
+ op_io();
+ op_io();
+ if(!regs.p.c || (regs.a) > 0x99) {
+ regs.a -= 0x60;
+ regs.p.c = 0;
+ }
+ if(!regs.p.h || (regs.a & 15) > 0x09) {
+ regs.a -= 0x06;
+ }
+ regs.p.n = (regs.a & 0x80);
+ regs.p.z = (regs.a == 0);
+}
+
+void SPC700::op_div_ya_x() {
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ ya = regs.ya;
+ //overflow set if quotient >= 256
+ regs.p.v = (regs.y >= regs.x);
+ regs.p.h = ((regs.y & 15) >= (regs.x & 15));
+ if(regs.y < (regs.x << 1)) {
+ //if quotient is <= 511 (will fit into 9-bit result)
+ regs.a = ya / regs.x;
+ regs.y = ya % regs.x;
+ } else {
+ //otherwise, the quotient won't fit into regs.p.v + regs.a
+ //this emulates the odd behavior of the S-SMP in this case
+ regs.a = 255 - (ya - (regs.x << 9)) / (256 - regs.x);
+ regs.y = regs.x + (ya - (regs.x << 9)) % (256 - regs.x);
+ }
+ //result is set based on a (quotient) only
+ regs.p.n = (regs.a & 0x80);
+ regs.p.z = (regs.a == 0);
+}
+
+void SPC700::op_jmp_addr() {
+ rd.l = op_readpc();
+ rd.h = op_readpc();
+ regs.pc = rd;
+}
+
+void SPC700::op_jmp_iaddrx() {
+ dp.l = op_readpc();
+ dp.h = op_readpc();
+ op_io();
+ dp += regs.x;
+ rd.l = op_read(dp++);
+ rd.h = op_read(dp++);
+ regs.pc = rd;
+}
+
+void SPC700::op_jsp_dp() {
+ rd = op_readpc();
+ op_io();
+ op_io();
+ op_writesp(regs.pc.h);
+ op_writesp(regs.pc.l);
+ regs.pc = 0xff00 | rd;
+}
+
+void SPC700::op_jsr_addr() {
+ rd.l = op_readpc();
+ rd.h = op_readpc();
+ op_io();
+ op_io();
+ op_io();
+ op_writesp(regs.pc.h);
+ op_writesp(regs.pc.l);
+ regs.pc = rd;
+}
+
+void SPC700::op_jst() {
+ dp = 0xffde - ((opcode >> 4) << 1);
+ rd.l = op_read(dp++);
+ rd.h = op_read(dp++);
+ op_io();
+ op_io();
+ op_io();
+ op_writesp(regs.pc.h);
+ op_writesp(regs.pc.l);
+ regs.pc = rd;
+}
+
+void SPC700::op_lda_ixinc() {
+ op_io();
+ regs.a = op_readdp(regs.x++);
+ op_io();
+ regs.p.n = regs.a & 0x80;
+ regs.p.z = regs.a == 0;
+}
+
+void SPC700::op_mul_ya() {
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ ya = regs.y * regs.a;
+ regs.a = ya;
+ regs.y = ya >> 8;
+ //result is set based on y (high-byte) only
+ regs.p.n = (regs.y & 0x80);
+ regs.p.z = (regs.y == 0);
+}
+
+void SPC700::op_nop() {
+ op_io();
+}
+
+void SPC700::op_plp() {
+ op_io();
+ op_io();
+ regs.p = op_readsp();
+}
+
+void SPC700::op_rti() {
+ regs.p = op_readsp();
+ rd.l = op_readsp();
+ rd.h = op_readsp();
+ op_io();
+ op_io();
+ regs.pc = rd;
+}
+
+void SPC700::op_rts() {
+ rd.l = op_readsp();
+ rd.h = op_readsp();
+ op_io();
+ op_io();
+ regs.pc = rd;
+}
+
+void SPC700::op_sta_idpx() {
+ sp = op_readpc() + regs.x;
+ op_io();
+ dp.l = op_readdp(sp++);
+ dp.h = op_readdp(sp++);
+ op_read(dp);
+ op_write(dp, regs.a);
+}
+
+void SPC700::op_sta_idpy() {
+ sp = op_readpc();
+ dp.l = op_readdp(sp++);
+ dp.h = op_readdp(sp++);
+ op_io();
+ dp += regs.y;
+ op_read(dp);
+ op_write(dp, regs.a);
+}
+
+void SPC700::op_sta_ix() {
+ op_io();
+ op_readdp(regs.x);
+ op_writedp(regs.x, regs.a);
+}
+
+void SPC700::op_sta_ixinc() {
+ op_io();
+ op_io();
+ op_writedp(regs.x++, regs.a);
+}
+
+void SPC700::op_stw_dp() {
+ dp = op_readpc();
+ op_readdp(dp);
+ op_writedp(dp++, regs.a);
+ op_writedp(dp++, regs.y);
+}
+
+void SPC700::op_wait() {
+ op_io();
+ op_io();
+ regs.pc--;
+}
+
+void SPC700::op_xcn() {
+ op_io();
+ op_io();
+ op_io();
+ op_io();
+ regs.a = (regs.a >> 4) | (regs.a << 4);
+ regs.p.n = regs.a & 0x80;
+ regs.p.z = regs.a == 0;
+}
+
+#undef call
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/processor/spc700/memory.hpp Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/processor/spc700/registers.hpp Added

@@ -0,0 +1,59 @@
+struct flag_t {
+ bool n, v, p, b, h, i, z, c;
+
+ inline operator unsigned() const {
+ return (n << 7) | (v << 6) | (p << 5) | (b << 4)
+ | (h << 3) | (i << 2) | (z << 1) | (c << 0);
+ }
+
+ inline unsigned operator=(uint8_t data) {
+ n = data & 0x80; v = data & 0x40; p = data & 0x20; b = data & 0x10;
+ h = data & 0x08; i = data & 0x04; z = data & 0x02; c = data & 0x01;
+ return data;
+ }
+
+ inline unsigned operator|=(uint8_t data) { return operator=(operator unsigned() | data); }
+ inline unsigned operator^=(uint8_t data) { return operator=(operator unsigned() ^ data); }
+ inline unsigned operator&=(uint8_t data) { return operator=(operator unsigned() & data); }
+};
+
+struct word_t {
+ union {
+ uint16_t w;
+#ifdef BLARGG_BIG_ENDIAN
+ struct { uint8_t h, l; };
+#else
+ struct { uint8_t l, h; };
+#endif
+ };
+
+ inline operator unsigned() const { return w; }
+ inline unsigned operator=(unsigned data) { return w = data; }
+
+ inline unsigned operator++() { return ++w; }
+ inline unsigned operator--() { return --w; }
+
+ inline unsigned operator++(int) { unsigned data = w++; return data; }
+ inline unsigned operator--(int) { unsigned data = w--; return data; }
+
+ inline unsigned operator+=(unsigned data) { return w += data;; }
+ inline unsigned operator-=(unsigned data) { return w -= data;; }
+
+ inline unsigned operator|=(unsigned data) { return w |= data; }
+ inline unsigned operator^=(unsigned data) { return w ^= data; }
+ inline unsigned operator&=(unsigned data) { return w &= data; }
+};
+
+struct regs_t {
+ word_t pc;
+ union {
+ uint16_t ya;
+#ifdef BLARGG_BIG_ENDIAN
+ struct { uint8_t y, a; };
+#else
+ struct { uint8_t a, y; };
+#endif
+ };
+ uint8_t x, s;
+ flag_t p;
+};

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.cpp Added

@@ -0,0 +1,275 @@
+#include "spc700.hpp"
+
+namespace Processor {
+
+#define SPC700_CPP
+#include "algorithms.cpp"
+#include "instructions.cpp"
+//#include "disassembler.cpp"
+
+void SPC700::op_step() {
+#if 0
+ std::string disasm = disassemble_opcode(regs.pc) + "\n";
+ fputs(disasm.c_str(), f);
+#endif
+ switch(opcode = op_readpc()) {
+ case 0x00: return op_nop();
+ case 0x01: return op_jst();
+ case 0x02: return op_set_bit();
+ case 0x03: return op_branch_bit();
+ case 0x04: return op_read_dp<&SPC700::op_or>(regs.a);
+ case 0x05: return op_read_addr<&SPC700::op_or>(regs.a);
+ case 0x06: return op_read_ix<&SPC700::op_or>();
+ case 0x07: return op_read_idpx<&SPC700::op_or>();
+ case 0x08: return op_read_const<&SPC700::op_or>(regs.a);
+ case 0x09: return op_write_dp_dp<&SPC700::op_or>();
+ case 0x0a: return op_set_addr_bit();
+ case 0x0b: return op_adjust_dp<&SPC700::op_asl>();
+ case 0x0c: return op_adjust_addr<&SPC700::op_asl>();
+ case 0x0d: return op_push(regs.p);
+ case 0x0e: return op_test_addr(1);
+ case 0x0f: return op_brk();
+ case 0x10: return op_branch(regs.p.n == 0);
+ case 0x11: return op_jst();
+ case 0x12: return op_set_bit();
+ case 0x13: return op_branch_bit();
+ case 0x14: return op_read_dpi<&SPC700::op_or>(regs.a, regs.x);
+ case 0x15: return op_read_addri<&SPC700::op_or>(regs.x);
+ case 0x16: return op_read_addri<&SPC700::op_or>(regs.y);
+ case 0x17: return op_read_idpy<&SPC700::op_or>();
+ case 0x18: return op_write_dp_const<&SPC700::op_or>();
+ case 0x19: return op_write_ix_iy<&SPC700::op_or>();
+ case 0x1a: return op_adjust_dpw(-1);
+ case 0x1b: return op_adjust_dpx<&SPC700::op_asl>();
+ case 0x1c: return op_adjust<&SPC700::op_asl>(regs.a);
+ case 0x1d: return op_adjust<&SPC700::op_dec>(regs.x);
+ case 0x1e: return op_read_addr<&SPC700::op_cmp>(regs.x);
+ case 0x1f: return op_jmp_iaddrx();
+ case 0x20: return op_set_flag(regs.p.p, 0);
+ case 0x21: return op_jst();
+ case 0x22: return op_set_bit();
+ case 0x23: return op_branch_bit();
+ case 0x24: return op_read_dp<&SPC700::op_and>(regs.a);
+ case 0x25: return op_read_addr<&SPC700::op_and>(regs.a);
+ case 0x26: return op_read_ix<&SPC700::op_and>();
+ case 0x27: return op_read_idpx<&SPC700::op_and>();
+ case 0x28: return op_read_const<&SPC700::op_and>(regs.a);
+ case 0x29: return op_write_dp_dp<&SPC700::op_and>();
+ case 0x2a: return op_set_addr_bit();
+ case 0x2b: return op_adjust_dp<&SPC700::op_rol>();
+ case 0x2c: return op_adjust_addr<&SPC700::op_rol>();
+ case 0x2d: return op_push(regs.a);
+ case 0x2e: return op_bne_dp();
+ case 0x2f: return op_branch(true);
+ case 0x30: return op_branch(regs.p.n == 1);
+ case 0x31: return op_jst();
+ case 0x32: return op_set_bit();
+ case 0x33: return op_branch_bit();
+ case 0x34: return op_read_dpi<&SPC700::op_and>(regs.a, regs.x);
+ case 0x35: return op_read_addri<&SPC700::op_and>(regs.x);
+ case 0x36: return op_read_addri<&SPC700::op_and>(regs.y);
+ case 0x37: return op_read_idpy<&SPC700::op_and>();
+ case 0x38: return op_write_dp_const<&SPC700::op_and>();
+ case 0x39: return op_write_ix_iy<&SPC700::op_and>();
+ case 0x3a: return op_adjust_dpw(+1);
+ case 0x3b: return op_adjust_dpx<&SPC700::op_rol>();
+ case 0x3c: return op_adjust<&SPC700::op_rol>(regs.a);
+ case 0x3d: return op_adjust<&SPC700::op_inc>(regs.x);
+ case 0x3e: return op_read_dp<&SPC700::op_cmp>(regs.x);
+ case 0x3f: return op_jsr_addr();
+ case 0x40: return op_set_flag(regs.p.p, 1);
+ case 0x41: return op_jst();
+ case 0x42: return op_set_bit();
+ case 0x43: return op_branch_bit();
+ case 0x44: return op_read_dp<&SPC700::op_eor>(regs.a);
+ case 0x45: return op_read_addr<&SPC700::op_eor>(regs.a);
+ case 0x46: return op_read_ix<&SPC700::op_eor>();
+ case 0x47: return op_read_idpx<&SPC700::op_eor>();
+ case 0x48: return op_read_const<&SPC700::op_eor>(regs.a);
+ case 0x49: return op_write_dp_dp<&SPC700::op_eor>();
+ case 0x4a: return op_set_addr_bit();
+ case 0x4b: return op_adjust_dp<&SPC700::op_lsr>();
+ case 0x4c: return op_adjust_addr<&SPC700::op_lsr>();
+ case 0x4d: return op_push(regs.x);
+ case 0x4e: return op_test_addr(0);
+ case 0x4f: return op_jsp_dp();
+ case 0x50: return op_branch(regs.p.v == 0);
+ case 0x51: return op_jst();
+ case 0x52: return op_set_bit();
+ case 0x53: return op_branch_bit();
+ case 0x54: return op_read_dpi<&SPC700::op_eor>(regs.a, regs.x);
+ case 0x55: return op_read_addri<&SPC700::op_eor>(regs.x);
+ case 0x56: return op_read_addri<&SPC700::op_eor>(regs.y);
+ case 0x57: return op_read_idpy<&SPC700::op_eor>();
+ case 0x58: return op_write_dp_const<&SPC700::op_eor>();
+ case 0x59: return op_write_ix_iy<&SPC700::op_eor>();
+ case 0x5a: return op_read_dpw<&SPC700::op_cpw>();
+ case 0x5b: return op_adjust_dpx<&SPC700::op_lsr>();
+ case 0x5c: return op_adjust<&SPC700::op_lsr>(regs.a);
+ case 0x5d: return op_transfer(regs.a, regs.x);
+ case 0x5e: return op_read_addr<&SPC700::op_cmp>(regs.y);
+ case 0x5f: return op_jmp_addr();
+ case 0x60: return op_set_flag(regs.p.c, 0);
+ case 0x61: return op_jst();
+ case 0x62: return op_set_bit();
+ case 0x63: return op_branch_bit();
+ case 0x64: return op_read_dp<&SPC700::op_cmp>(regs.a);
+ case 0x65: return op_read_addr<&SPC700::op_cmp>(regs.a);
+ case 0x66: return op_read_ix<&SPC700::op_cmp>();
+ case 0x67: return op_read_idpx<&SPC700::op_cmp>();
+ case 0x68: return op_read_const<&SPC700::op_cmp>(regs.a);
+ case 0x69: return op_write_dp_dp<&SPC700::op_cmp>();
+ case 0x6a: return op_set_addr_bit();
+ case 0x6b: return op_adjust_dp<&SPC700::op_ror>();
+ case 0x6c: return op_adjust_addr<&SPC700::op_ror>();
+ case 0x6d: return op_push(regs.y);
+ case 0x6e: return op_bne_dpdec();
+ case 0x6f: return op_rts();
+ case 0x70: return op_branch(regs.p.v == 1);
+ case 0x71: return op_jst();
+ case 0x72: return op_set_bit();
+ case 0x73: return op_branch_bit();
+ case 0x74: return op_read_dpi<&SPC700::op_cmp>(regs.a, regs.x);
+ case 0x75: return op_read_addri<&SPC700::op_cmp>(regs.x);
+ case 0x76: return op_read_addri<&SPC700::op_cmp>(regs.y);
+ case 0x77: return op_read_idpy<&SPC700::op_cmp>();
+ case 0x78: return op_write_dp_const<&SPC700::op_cmp>();
+ case 0x79: return op_write_ix_iy<&SPC700::op_cmp>();
+ case 0x7a: return op_read_dpw<&SPC700::op_adw>();
+ case 0x7b: return op_adjust_dpx<&SPC700::op_ror>();
+ case 0x7c: return op_adjust<&SPC700::op_ror>(regs.a);
+ case 0x7d: return op_transfer(regs.x, regs.a);
+ case 0x7e: return op_read_dp<&SPC700::op_cmp>(regs.y);
+ case 0x7f: return op_rti();
+ case 0x80: return op_set_flag(regs.p.c, 1);
+ case 0x81: return op_jst();
+ case 0x82: return op_set_bit();
+ case 0x83: return op_branch_bit();
+ case 0x84: return op_read_dp<&SPC700::op_adc>(regs.a);
+ case 0x85: return op_read_addr<&SPC700::op_adc>(regs.a);
+ case 0x86: return op_read_ix<&SPC700::op_adc>();
+ case 0x87: return op_read_idpx<&SPC700::op_adc>();
+ case 0x88: return op_read_const<&SPC700::op_adc>(regs.a);
+ case 0x89: return op_write_dp_dp<&SPC700::op_adc>();
+ case 0x8a: return op_set_addr_bit();
+ case 0x8b: return op_adjust_dp<&SPC700::op_dec>();
+ case 0x8c: return op_adjust_addr<&SPC700::op_dec>();
+ case 0x8d: return op_read_const<&SPC700::op_ld>(regs.y);
+ case 0x8e: return op_plp();
+ case 0x8f: return op_write_dp_const<&SPC700::op_st>();
+ case 0x90: return op_branch(regs.p.c == 0);
+ case 0x91: return op_jst();
+ case 0x92: return op_set_bit();
+ case 0x93: return op_branch_bit();
+ case 0x94: return op_read_dpi<&SPC700::op_adc>(regs.a, regs.x);
+ case 0x95: return op_read_addri<&SPC700::op_adc>(regs.x);
+ case 0x96: return op_read_addri<&SPC700::op_adc>(regs.y);
+ case 0x97: return op_read_idpy<&SPC700::op_adc>();
+ case 0x98: return op_write_dp_const<&SPC700::op_adc>();
+ case 0x99: return op_write_ix_iy<&SPC700::op_adc>();
+ case 0x9a: return op_read_dpw<&SPC700::op_sbw>();
+ case 0x9b: return op_adjust_dpx<&SPC700::op_dec>();
+ case 0x9c: return op_adjust<&SPC700::op_dec>(regs.a);
+ case 0x9d: return op_transfer(regs.s, regs.x);
+ case 0x9e: return op_div_ya_x();
+ case 0x9f: return op_xcn();
+ case 0xa0: return op_set_flag(regs.p.i, 1);
+ case 0xa1: return op_jst();
+ case 0xa2: return op_set_bit();
+ case 0xa3: return op_branch_bit();
+ case 0xa4: return op_read_dp<&SPC700::op_sbc>(regs.a);
+ case 0xa5: return op_read_addr<&SPC700::op_sbc>(regs.a);
+ case 0xa6: return op_read_ix<&SPC700::op_sbc>();
+ case 0xa7: return op_read_idpx<&SPC700::op_sbc>();
+ case 0xa8: return op_read_const<&SPC700::op_sbc>(regs.a);
+ case 0xa9: return op_write_dp_dp<&SPC700::op_sbc>();
+ case 0xaa: return op_set_addr_bit();
+ case 0xab: return op_adjust_dp<&SPC700::op_inc>();
+ case 0xac: return op_adjust_addr<&SPC700::op_inc>();
+ case 0xad: return op_read_const<&SPC700::op_cmp>(regs.y);
+ case 0xae: return op_pull(regs.a);
+ case 0xaf: return op_sta_ixinc();
+ case 0xb0: return op_branch(regs.p.c == 1);
+ case 0xb1: return op_jst();
+ case 0xb2: return op_set_bit();
+ case 0xb3: return op_branch_bit();
+ case 0xb4: return op_read_dpi<&SPC700::op_sbc>(regs.a, regs.x);
+ case 0xb5: return op_read_addri<&SPC700::op_sbc>(regs.x);
+ case 0xb6: return op_read_addri<&SPC700::op_sbc>(regs.y);
+ case 0xb7: return op_read_idpy<&SPC700::op_sbc>();
+ case 0xb8: return op_write_dp_const<&SPC700::op_sbc>();
+ case 0xb9: return op_write_ix_iy<&SPC700::op_sbc>();
+ case 0xba: return op_read_dpw<&SPC700::op_ldw>();
+ case 0xbb: return op_adjust_dpx<&SPC700::op_inc>();
+ case 0xbc: return op_adjust<&SPC700::op_inc>(regs.a);
+ case 0xbd: return op_transfer(regs.x, regs.s);
+ case 0xbe: return op_das();
+ case 0xbf: return op_lda_ixinc();
+ case 0xc0: return op_set_flag(regs.p.i, 0);
+ case 0xc1: return op_jst();
+ case 0xc2: return op_set_bit();
+ case 0xc3: return op_branch_bit();
+ case 0xc4: return op_write_dp(regs.a);
+ case 0xc5: return op_write_addr(regs.a);
+ case 0xc6: return op_sta_ix();
+ case 0xc7: return op_sta_idpx();
+ case 0xc8: return op_read_const<&SPC700::op_cmp>(regs.x);
+ case 0xc9: return op_write_addr(regs.x);
+ case 0xca: return op_set_addr_bit();
+ case 0xcb: return op_write_dp(regs.y);
+ case 0xcc: return op_write_addr(regs.y);
+ case 0xcd: return op_read_const<&SPC700::op_ld>(regs.x);
+ case 0xce: return op_pull(regs.x);
+ case 0xcf: return op_mul_ya();
+ case 0xd0: return op_branch(regs.p.z == 0);
+ case 0xd1: return op_jst();
+ case 0xd2: return op_set_bit();
+ case 0xd3: return op_branch_bit();
+ case 0xd4: return op_write_dpi(regs.a, regs.x);
+ case 0xd5: return op_write_addri(regs.x);
+ case 0xd6: return op_write_addri(regs.y);
+ case 0xd7: return op_sta_idpy();
+ case 0xd8: return op_write_dp(regs.x);
+ case 0xd9: return op_write_dpi(regs.x, regs.y);
+ case 0xda: return op_stw_dp();
+ case 0xdb: return op_write_dpi(regs.y, regs.x);
+ case 0xdc: return op_adjust<&SPC700::op_dec>(regs.y);
+ case 0xdd: return op_transfer(regs.y, regs.a);
+ case 0xde: return op_bne_dpx();
+ case 0xdf: return op_daa();
+ case 0xe0: return op_clv();
+ case 0xe1: return op_jst();
+ case 0xe2: return op_set_bit();
+ case 0xe3: return op_branch_bit();
+ case 0xe4: return op_read_dp<&SPC700::op_ld>(regs.a);
+ case 0xe5: return op_read_addr<&SPC700::op_ld>(regs.a);
+ case 0xe6: return op_read_ix<&SPC700::op_ld>();
+ case 0xe7: return op_read_idpx<&SPC700::op_ld>();
+ case 0xe8: return op_read_const<&SPC700::op_ld>(regs.a);
+ case 0xe9: return op_read_addr<&SPC700::op_ld>(regs.x);
+ case 0xea: return op_set_addr_bit();
+ case 0xeb: return op_read_dp<&SPC700::op_ld>(regs.y);
+ case 0xec: return op_read_addr<&SPC700::op_ld>(regs.y);
+ case 0xed: return op_cmc();
+ case 0xee: return op_pull(regs.y);
+ case 0xef: return op_wait();
+ case 0xf0: return op_branch(regs.p.z == 1);
+ case 0xf1: return op_jst();
+ case 0xf2: return op_set_bit();
+ case 0xf3: return op_branch_bit();
+ case 0xf4: return op_read_dpi<&SPC700::op_ld>(regs.a, regs.x);
+ case 0xf5: return op_read_addri<&SPC700::op_ld>(regs.x);
+ case 0xf6: return op_read_addri<&SPC700::op_ld>(regs.y);
+ case 0xf7: return op_read_idpy<&SPC700::op_ld>();
+ case 0xf8: return op_read_dp<&SPC700::op_ld>(regs.x);
+ case 0xf9: return op_read_dpi<&SPC700::op_ld>(regs.x, regs.y);
+ case 0xfa: return op_write_dp_dp<&SPC700::op_st>();
+ case 0xfb: return op_read_dpi<&SPC700::op_ld>(regs.y, regs.x);
+ case 0xfc: return op_adjust<&SPC700::op_inc>(regs.y);
+ case 0xfd: return op_transfer(regs.a, regs.y);
+ case 0xfe: return op_bne_ydec();
+ case 0xff: return op_wait();
+ }
+}
+
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/processor/spc700/spc700.hpp Added

@@ -0,0 +1,124 @@
+#ifndef PROCESSOR_SPC700_HPP
+#define PROCESSOR_SPC700_HPP
+
+#include <stdint.h>
+#if HAVE_SPC_DISASSEMLER
+#include <string>
+#include <sstream>
+#include <iomanip>
+#endif
+#if 1
+#include <stdio.h>
+#endif
+
+namespace Processor {
+
+struct SPC700 {
+#if 0
+ FILE *f;
+ SPC700() { f = fopen("/tmp/spc_disasm", "w"); }
+ ~SPC700() { fclose(f); }
+#endif
+ 
+ virtual void op_io() = 0;
+ virtual uint8_t op_read(uint16_t addr) = 0;
+ virtual void op_write(uint16_t addr, uint8_t data) = 0;
+ void op_step();
+ 
+ virtual uint8_t disassembler_read(uint16_t addr) = 0;
+
+ #include "registers.hpp"
+ #include "memory.hpp"
+
+ regs_t regs;
+ word_t dp, sp, rd, wr, bit, ya;
+ uint8_t opcode;
+
+#if HAVE_SPC_DISASSEMLER
+ std::string disassemble_opcode(uint16_t addr);
+#endif
+
+protected:
+ uint8_t op_adc(uint8_t, uint8_t);
+ uint8_t op_and(uint8_t, uint8_t);
+ uint8_t op_asl(uint8_t);
+ uint8_t op_cmp(uint8_t, uint8_t);
+ uint8_t op_dec(uint8_t);
+ uint8_t op_eor(uint8_t, uint8_t);
+ uint8_t op_inc(uint8_t);
+ uint8_t op_ld (uint8_t, uint8_t);
+ uint8_t op_lsr(uint8_t);
+ uint8_t op_or (uint8_t, uint8_t);
+ uint8_t op_rol(uint8_t);
+ uint8_t op_ror(uint8_t);
+ uint8_t op_sbc(uint8_t, uint8_t);
+ uint8_t op_st (uint8_t, uint8_t);
+ uint16_t op_adw(uint16_t, uint16_t);
+ uint16_t op_cpw(uint16_t, uint16_t);
+ uint16_t op_ldw(uint16_t, uint16_t);
+ uint16_t op_sbw(uint16_t, uint16_t);
+
+ template<uint8_t (SPC700::*op)(uint8_t)> void op_adjust(uint8_t&);
+ template<uint8_t (SPC700::*op)(uint8_t)> void op_adjust_addr();
+ template<uint8_t (SPC700::*op)(uint8_t)> void op_adjust_dp();
+ void op_adjust_dpw(signed);
+ template<uint8_t (SPC700::*op)(uint8_t)> void op_adjust_dpx();
+ void op_branch(bool);
+ void op_branch_bit();
+ void op_pull(uint8_t&);
+ void op_push(uint8_t);
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_read_addr(uint8_t&);
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_read_addri(uint8_t&);
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_read_const(uint8_t&);
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_read_dp(uint8_t&);
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_read_dpi(uint8_t&, uint8_t&);
+ template<uint16_t (SPC700::*op)(uint16_t, uint16_t)> void op_read_dpw();
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_read_idpx();
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_read_idpy();
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_read_ix();
+ void op_set_addr_bit();
+ void op_set_bit();
+ void op_set_flag(bool&, bool);
+ void op_test_addr(bool);
+ void op_transfer(uint8_t&, uint8_t&);
+ void op_write_addr(uint8_t&);
+ void op_write_addri(uint8_t&);
+ void op_write_dp(uint8_t&);
+ void op_write_dpi(uint8_t&, uint8_t&);
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_write_dp_const();
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_write_dp_dp();
+ template<uint8_t (SPC700::*op)(uint8_t, uint8_t)> void op_write_ix_iy();
+
+ void op_bne_dp();
+ void op_bne_dpdec();
+ void op_bne_dpx();
+ void op_bne_ydec();
+ void op_brk();
+ void op_clv();
+ void op_cmc();
+ void op_daa();
+ void op_das();
+ void op_div_ya_x();
+ void op_jmp_addr();
+ void op_jmp_iaddrx();
+ void op_jsp_dp();
+ void op_jsr_addr();
+ void op_jst();
+ void op_lda_ixinc();
+ void op_mul_ya();
+ void op_nop();
+ void op_plp();
+ void op_rti();
+ void op_rts();
+ void op_sta_idpx();
+ void op_sta_idpy();
+ void op_sta_ix();
+ void op_sta_ixinc();
+ void op_stw_dp();
+ void op_wait();
+ void op_xcn();
+};
+
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/smp Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/smp/memory.cpp Added

@@ -0,0 +1,203 @@
+#ifdef SMP_CPP
+
+inline uint8_t SMP::ram_read(uint16_t addr) {
+ if(addr >= 0xffc0 && status.iplrom_enable) return iplromaddr & 0x3f;
+ if(status.ram_disable) return 0x5a; //0xff on mini-SNES
+ return apuramaddr;
+}
+
+inline void SMP::ram_write(uint16_t addr, uint8_t data) {
+ //writes to $ffc0-$ffff always go to apuram, even if the iplrom is enabled
+ if(status.ram_writable && !status.ram_disable) apuramaddr = data;
+}
+
+uint8_t SMP::port_read(uint8_t port) const {
+ return apuram0xf4 + (port & 3);
+}
+
+void SMP::port_write(uint8_t port, uint8_t data) {
+ apuram0xf4 + (port & 3) = data;
+}
+
+uint8_t SMP::op_busread(uint16_t addr) {
+ unsigned result;
+
+ switch(addr) {
+ case 0xf0: //TEST -- write-only register
+ return 0x00;
+
+ case 0xf1: //CONTROL -- write-only register
+ return 0x00;
+
+ case 0xf2: //DSPADDR
+ return status.dsp_addr;
+
+ case 0xf3: //DSPDATA
+ //0x80-0xff are read-only mirrors of 0x00-0x7f
+ return dsp.read(status.dsp_addr & 0x7f);
+
+ case 0xf4: //CPUIO0
+ case 0xf5: //CPUIO1
+ case 0xf6: //CPUIO2
+ case 0xf7: //CPUIO3
+ if (sfm_queue && sfm_queue < sfm_queue_end) {
+ result = *sfm_queue;
+ if (++sfm_queue == sfm_queue_end)
+ sfm_queue = sfm_queue_repeat;
+ sfm_lastaddr - 0xf4 = result;
+ return result;
+ }
+ return sfm_lastaddr - 0xf4;
+
+ case 0xf8: //RAM0
+ return status.ram00f8;
+
+ case 0xf9: //RAM1
+ return status.ram00f9;
+
+ case 0xfa: //T0TARGET
+ case 0xfb: //T1TARGET
+ case 0xfc: //T2TARGET -- write-only registers
+ return 0x00;
+
+ case 0xfd: //T0OUT -- 4-bit counter value
+ result = timer0.stage3_ticks;
+ timer0.stage3_ticks = 0;
+ return result;
+
+ case 0xfe: //T1OUT -- 4-bit counter value
+ result = timer1.stage3_ticks;
+ timer1.stage3_ticks = 0;
+ return result;
+
+ case 0xff: //T2OUT -- 4-bit counter value
+ result = timer2.stage3_ticks;
+ timer2.stage3_ticks = 0;
+ return result;
+ }
+
+ return ram_read(addr);
+}
+
+void SMP::op_buswrite(uint16_t addr, uint8_t data) {
+ switch(addr) {
+ case 0xf0: //TEST
+ if(regs.p.p) break; //writes only valid when P flag is clear
+
+ status.clock_speed = (data >> 6) & 3;
+ status.timer_speed = (data >> 4) & 3;
+ status.timers_enable = data & 0x08;
+ status.ram_disable = data & 0x04;
+ status.ram_writable = data & 0x02;
+ status.timers_disable = data & 0x01;
+
+ status.timer_step = (1 << status.clock_speed) + (2 << status.timer_speed);
+
+ timer0.synchronize_stage1();
+ timer1.synchronize_stage1();
+ timer2.synchronize_stage1();
+ break;
+
+ case 0xf1: //CONTROL
+ status.iplrom_enable = data & 0x80;
+ 
+ if (data & 0x10) {
+ sfm_last 0 = 0;
+ sfm_last 1 = 0;
+ }
+ if (data & 0x20) {
+ sfm_last 2 = 0;
+ sfm_last 3 = 0;
+ }
+
+ //0->1 transistion resets timers
+ if(timer2.enable == false && (data & 0x04)) {
+ timer2.stage2_ticks = 0;
+ timer2.stage3_ticks = 0;
+ }
+ timer2.enable = data & 0x04;
+
+ if(timer1.enable == false && (data & 0x02)) {
+ timer1.stage2_ticks = 0;
+ timer1.stage3_ticks = 0;
+ }
+ timer1.enable = data & 0x02;
+
+ if(timer0.enable == false && (data & 0x01)) {
+ timer0.stage2_ticks = 0;
+ timer0.stage3_ticks = 0;
+ }
+ timer0.enable = data & 0x01;
+ break;
+
+ case 0xf2: //DSPADDR
+ status.dsp_addr = data;
+ break;
+
+ case 0xf3: //DSPDATA
+ if(status.dsp_addr & 0x80) break; //0x80-0xff are read-only mirrors of 0x00-0x7f
+ dsp.write(status.dsp_addr & 0x7f, data);
+ break;
+
+ case 0xf4: //CPUIO0
+ case 0xf5: //CPUIO1
+ case 0xf6: //CPUIO2
+ case 0xf7: //CPUIO3
+ port_write(addr, data);
+ break;
+
+ case 0xf8: //RAM0
+ status.ram00f8 = data;
+ break;
+
+ case 0xf9: //RAM1
+ status.ram00f9 = data;
+ break;
+
+ case 0xfa: //T0TARGET
+ timer0.target = data;
+ break;
+
+ case 0xfb: //T1TARGET
+ timer1.target = data;
+ break;
+
+ case 0xfc: //T2TARGET
+ timer2.target = data;
+ break;
+
+ case 0xfd: //T0OUT
+ case 0xfe: //T1OUT
+ case 0xff: //T2OUT -- read-only registers
+ break;
+ }
+
+ ram_write(addr, data); //all writes, even to MMIO registers, appear on bus
+}
+
+void SMP::op_io() {
+ add_clocks(24);
+ cycle_edge();
+}
+
+uint8_t SMP::op_read(uint16_t addr) {
+ add_clocks(12);
+ uint8_t r = op_busread(addr);
+ add_clocks(12);
+ cycle_edge();
+ return r;
+}
+
+void SMP::op_write(uint16_t addr, uint8_t data) {
+ add_clocks(24);
+ op_buswrite(addr, data);
+ cycle_edge();
+}
+
+uint8_t SMP::disassembler_read(uint16_t addr) {
+ if((addr & 0xfff0) == 0x00f0) return 0x00;
+ if((addr & 0xffc0) == 0xffc0 && status.iplrom_enable) return iplromaddr & 0x3f;
+ return apuramaddr;
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/smp/smp.cpp Added

@@ -0,0 +1,149 @@
+#include "smp.hpp"
+
+#include <string.h>
+
+#define SMP_CPP
+namespace SuperFamicom {
+
+#include "memory.cpp"
+#include "timing.cpp"
+
+void SMP::step(unsigned clocks) {
+ clock += clocks;
+ dsp.clock -= clocks * dsp_clock_step;
+}
+
+void SMP::synchronize_dsp() {
+ while(dsp.clock < 0) dsp.enter();
+}
+
+void SMP::enter() {
+ while(sample_buffer < sample_buffer_end) {
+ clock -= (int64_t)((double)(sample_buffer_end - sample_buffer) * 24.0 * 16.0 * tempo);
+ while(status.clock_speed != 2 && clock < 0) op_step();
+ if(status.clock_speed == 2) step(-clock);
+ synchronize_dsp();
+ }
+}
+
+void SMP::render(int16_t * buffer, unsigned count) {
+ while (count > 4096) {
+ sample_buffer = buffer;
+ sample_buffer_end = buffer + 4096;
+ buffer += 4096;
+ count -= 4096;
+ enter();
+ }
+ sample_buffer = buffer;
+ sample_buffer_end = buffer + count;
+ enter();
+}
+
+void SMP::skip(unsigned count) {
+ while (count > 4096) {
+ sample_buffer = 0;
+ sample_buffer_end = ((const int16_t *)0) + 4096;
+ count -= 4096;
+ enter();
+ }
+ sample_buffer = 0;
+ sample_buffer_end = ((const int16_t *)0) + count;
+ enter();
+}
+
+bool SMP::sample(int16_t left, int16_t right) {
+ if ( sample_buffer_end - sample_buffer < 2 ) return false;
+ if ( sample_buffer > ((const int16_t *)0) + 4096 ) {
+ *sample_buffer++ = left;
+ *sample_buffer++ = right;
+ }
+ else {
+ sample_buffer += 2;
+ }
+ return true;
+}
+
+void SMP::power() {
+ //targets not initialized/changed upon reset
+ timer0.target = 0;
+ timer1.target = 0;
+ timer2.target = 0;
+ 
+ dsp.power();
+ 
+ reset();
+}
+
+void SMP::reset() {
+ regs.pc = 0xffc0;
+ regs.a = 0x00;
+ regs.x = 0x00;
+ regs.y = 0x00;
+ regs.s = 0xef;
+ regs.p = 0x02;
+
+ for (int n = 0; n < sizeof (apuram); n++) apuramn = rand();
+ apuram0x00f4 = 0x00;
+ apuram0x00f5 = 0x00;
+ apuram0x00f6 = 0x00;
+ apuram0x00f7 = 0x00;
+
+ status.clock_counter = 0;
+ status.dsp_counter = 0;
+ status.timer_step = 3;
+
+ //$00f0
+ status.clock_speed = 0;
+ status.timer_speed = 0;
+ status.timers_enable = true;
+ status.ram_disable = false;
+ status.ram_writable = true;
+ status.timers_disable = false;
+
+ //$00f1
+ status.iplrom_enable = true;
+
+ //$00f2
+ status.dsp_addr = 0x00;
+
+ //$00f8,$00f9
+ status.ram00f8 = 0x00;
+ status.ram00f9 = 0x00;
+
+ timer0.stage0_ticks = 0;
+ timer1.stage0_ticks = 0;
+ timer2.stage0_ticks = 0;
+
+ timer0.stage1_ticks = 0;
+ timer1.stage1_ticks = 0;
+ timer2.stage1_ticks = 0;
+
+ timer0.stage2_ticks = 0;
+ timer1.stage2_ticks = 0;
+ timer2.stage2_ticks = 0;
+
+ timer0.stage3_ticks = 0;
+ timer1.stage3_ticks = 0;
+ timer2.stage3_ticks = 0;
+
+ timer0.current_line = 0;
+ timer1.current_line = 0;
+ timer2.current_line = 0;
+
+ timer0.enable = false;
+ timer1.enable = false;
+ timer2.enable = false;
+ 
+ dsp.reset();
+}
+
+SMP::SMP() : dsp( *this ), timer0( *this ), timer1( *this ), timer2( *this ), clock( 0 ) {
+ memset (iplrom, 0, sizeof (iplrom));
+ set_sfm_queue(0, 0, 0);
+ set_tempo(1.0);
+}
+
+SMP::~SMP() {
+}
+
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/smp/smp.hpp Added

@@ -0,0 +1,132 @@
+#ifndef _higan_smp_h_
+#define _higan_smp_h_
+
+#include "blargg_common.h"
+
+#include "../processor/spc700/spc700.hpp"
+
+#include "../dsp/dsp.hpp"
+
+namespace SuperFamicom {
+
+struct SMP : Processor::SPC700 {
+ long clock;
+ 
+ uint8_t iplrom64;
+ uint8_t apuram64 * 1024;
+
+ double tempo;
+ int64_t dsp_clock_step;
+ SuperFamicom::DSP dsp;
+
+ inline void step(unsigned clocks);
+ inline void synchronize_dsp();
+
+ uint8_t port_read(uint8_t port) const;
+ void port_write(uint8_t port, uint8_t data);
+
+ void enter();
+ void power();
+ void reset();
+
+ void set_tempo(double);
+
+ void render(int16_t * buffer, unsigned count);
+ void skip(unsigned count);
+ 
+ uint8_t sfm_last4;
+private:
+ uint8_t const* sfm_queue;
+ uint8_t const* sfm_queue_end;
+ uint8_t const* sfm_queue_repeat;
+public:
+ void set_sfm_queue(const uint8_t* queue, const uint8_t* queue_end, const uint8_t* queue_repeat);
+
+ const uint8_t* get_sfm_queue() const;
+ size_t get_sfm_queue_remain() const;
+ 
+private:
+ int16_t * sample_buffer;
+ int16_t const* sample_buffer_end;
+public:
+ bool sample( int16_t, int16_t );
+ 
+ SMP();
+ ~SMP();
+
+ struct {
+ //timing
+ unsigned clock_counter;
+ unsigned dsp_counter;
+ unsigned timer_step;
+
+ //$00f0
+ uint8_t clock_speed;
+ uint8_t timer_speed;
+ bool timers_enable;
+ bool ram_disable;
+ bool ram_writable;
+ bool timers_disable;
+
+ //$00f1
+ bool iplrom_enable;
+
+ //$00f2
+ uint8_t dsp_addr;
+
+ //$00f8,$00f9
+ uint8_t ram00f8;
+ uint8_t ram00f9;
+ } status;
+
+ friend class SMPcore;
+
+ //memory.cpp
+ uint8_t ram_read(uint16_t addr);
+ void ram_write(uint16_t addr, uint8_t data);
+
+ uint8_t op_busread(uint16_t addr);
+ void op_buswrite(uint16_t addr, uint8_t data);
+
+ void op_io();
+ uint8_t op_read(uint16_t addr);
+ void op_write(uint16_t addr, uint8_t data);
+ 
+ uint8_t disassembler_read(uint16_t addr);
+
+ //timing.cpp
+ template<unsigned frequency>
+ struct Timer {
+ SMP &smp;
+ uint8_t stage0_ticks;
+ uint8_t stage1_ticks;
+ uint8_t stage2_ticks;
+ uint8_t stage3_ticks;
+ bool current_line;
+ bool enable;
+ uint8_t target;
+ 
+ Timer(SMP &p_smp) : smp( p_smp ) { }
+
+ void tick();
+ void synchronize_stage1();
+ };
+
+ Timer<192> timer0;
+ Timer<192> timer1;
+ Timer< 24> timer2;
+
+ inline void add_clocks(unsigned clocks);
+ inline void cycle_edge();
+};
+
+inline void SMP::set_tempo(double speed) { tempo = speed; dsp_clock_step = (int64_t)(4096.0 / speed); }
+
+inline void SMP::set_sfm_queue(const uint8_t *queue, const uint8_t *queue_end, const uint8_t *queue_repeat) { sfm_queue = queue; sfm_queue_end = queue_end; sfm_queue_repeat = queue_repeat; sfm_last0 = 0; sfm_last1 = 0; sfm_last2 = 0; sfm_last3 = 0; }
+
+inline const uint8_t* SMP::get_sfm_queue() const { return sfm_queue; }
+inline size_t SMP::get_sfm_queue_remain() const { return sfm_queue_end - sfm_queue; }
+
+};
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/gme/higan/smp/timing.cpp Added

@@ -0,0 +1,54 @@
+#ifdef SMP_CPP
+
+void SMP::add_clocks(unsigned clocks) {
+ step(clocks);
+ synchronize_dsp();
+}
+
+void SMP::cycle_edge() {
+ timer0.tick();
+ timer1.tick();
+ timer2.tick();
+
+ //TEST register S-SMP speed control
+ //24 clocks have already been added for this cycle at this point
+ switch(status.clock_speed) {
+ case 0: break; //100% speed
+ case 1: add_clocks(24); break; // 50% speed
+ case 2: break; // 0% speed -- locks S-SMP -- handled in outer loop
+ case 3: add_clocks(24 * 9); break; // 10% speed
+ }
+}
+
+template<unsigned timer_frequency>
+void SMP::Timer<timer_frequency>::tick() {
+ //stage 0 increment
+ stage0_ticks += smp.status.timer_step;
+ if(stage0_ticks < timer_frequency) return;
+ stage0_ticks -= timer_frequency;
+
+ //stage 1 increment
+ stage1_ticks ^= 1;
+ synchronize_stage1();
+}
+
+template<unsigned timer_frequency>
+void SMP::Timer<timer_frequency>::synchronize_stage1() {
+ bool new_line = stage1_ticks;
+ if(smp.status.timers_enable == false) new_line = false;
+ if(smp.status.timers_disable == true) new_line = false;
+
+ bool old_line = current_line;
+ current_line = new_line;
+ if(old_line != 1 || new_line != 0) return; //only pulse on 1->0 transition
+
+ //stage 2 increment
+ if(enable == false) return;
+ if(++stage2_ticks != target) return;
+
+ //stage 3 increment
+ stage2_ticks = 0;
+ stage3_ticks = (stage3_ticks + 1) & 15;
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.c Added

@@ -0,0 +1,182 @@
+// ChipMapper.c - Handles Chip Write (including OPL Hardware Support)
+
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include <wchar.h>
+#include "stdbool.h"
+
+#include "chips/mamedef.h"
+
+#include "chips/ChipIncl.h"
+
+#include "VGMPlay.h"
+
+#include "ChipMapper.h"
+
+// To finish filling out later
+UINT8 chip_reg_read(void *param, UINT8 ChipType, UINT8 ChipID, UINT8 Port, UINT8 Offset)
+{
+	VGM_PLAYER* p = (VGM_PLAYER *) param;
+	switch(ChipType)
+	{
+	case 0x1B:	// HuC6280
+		return c6280_r(p->huc6280ChipID, Offset);
+	}
+	return 0;
+}
+
+void chip_reg_write(void *param, UINT8 ChipType, UINT8 ChipID,
+					UINT8 Port, UINT8 Offset, UINT8 Data)
+{
+	VGM_PLAYER* p = (VGM_PLAYER *) param;
+		switch(ChipType)
+		{
+		case 0x00:	// SN76496
+			sn764xx_w(p->sn764xxChipID, Port, Data);
+			break;
+		case 0x01:	// YM2413
+			ym2413_w(p->ym2413ChipID, 0x00, Offset);
+			ym2413_w(p->ym2413ChipID, 0x01, Data);
+			break;
+		case 0x02:	// YM2612
+			ym2612_w(p->ym2612ChipID, (Port << 1) | 0x00, Offset);
+			ym2612_w(p->ym2612ChipID, (Port << 1) | 0x01, Data);
+			break;
+		case 0x03:	// YM2151
+			ym2151_w(p->ym2151ChipID, 0x00, Offset);
+			ym2151_w(p->ym2151ChipID, 0x01, Data);
+			break;
+		case 0x04:	// SegaPCM
+			break;
+		case 0x05:	// RF5C68
+			rf5c68_w(p->rf5c68, Offset, Data);
+			break;
+		case 0x06:	// YM2203
+			ym2203_w(p->ym2203ChipID, 0x00, Offset);
+			ym2203_w(p->ym2203ChipID, 0x01, Data);
+			break;
+		case 0x07:	// YM2608
+			ym2608_w(p->ym2608ChipID, (Port << 1) | 0x00, Offset);
+			ym2608_w(p->ym2608ChipID, (Port << 1) | 0x01, Data);
+			break;
+		case 0x08:	// YM2610/YM2610B
+			ym2610_w(p->ym2610ChipID, (Port << 1) | 0x00, Offset);
+			ym2610_w(p->ym2610ChipID, (Port << 1) | 0x01, Data);
+			break;
+		case 0x09:	// YM3812
+			ym3812_w(p->ym3812ChipID, 0x00, Offset);
+			ym3812_w(p->ym3812ChipID, 0x01, Data);
+			break;
+		case 0x0A:	// YM3526
+			ym3526_w(p->ym3526ChipID, 0x00, Offset);
+			ym3526_w(p->ym3526ChipID, 0x01, Data);
+			break;
+		case 0x0B:	// Y8950
+			y8950_w(p->y8950ChipID, 0x00, Offset);
+			y8950_w(p->y8950ChipID, 0x01, Data);
+			break;
+		case 0x0C:	// YMF262
+			ymf262_w(p->ymf262ChipID, (Port << 1) | 0x00, Offset);
+			ymf262_w(p->ymf262ChipID, (Port << 1) | 0x01, Data);
+			break;
+		case 0x0D:	// YMF278B
+			ymf278b_w(p->ymf278bChipID, (Port << 1) | 0x00, Offset);
+			ymf278b_w(p->ymf278bChipID, (Port << 1) | 0x01, Data);
+			break;
+		case 0x0E:	// YMF271
+			ymf271_w(p->ymf271ChipID, (Port << 1) | 0x00, Offset);
+			ymf271_w(p->ymf271ChipID, (Port << 1) | 0x01, Data);
+			break;
+		case 0x0F:	// YMZ280B
+			ymz280b_w(p->ymz280bChipID, 0x00, Offset);
+			ymz280b_w(p->ymz280bChipID, 0x01, Data);
+			break;
+		case 0x10:	// RF5C164
+			rf5c164_w(p->rf5c164, Offset, Data);
+			break;
+		case 0x11:	// PWM
+			pwm_chn_w(p->pwm, Port, (Offset << 8) | (Data << 0));
+			break;
+		case 0x12:	// AY8910
+			ayxx_w(p->ay8910ChipID, 0x00, Offset);
+			ayxx_w(p->ay8910ChipID, 0x01, Data);
+			break;
+		case 0x13:	// GameBoy
+			gb_sound_w(p->gbdmgChipID, Offset, Data);
+			break;
+		case 0x14:	// NES APU
+			nes_w(p->nesapuChipID, Offset, Data);
+			break;
+		case 0x15:	// MultiPCM
+			multipcm_w(p->multipcmChipID, Offset, Data);
+			break;
+		case 0x16:	// UPD7759
+			upd7759_write(p->upd7759ChipID, Offset, Data);
+			break;
+		case 0x17:	// OKIM6258
+			okim6258_write(p->okim6258ChipID, Offset, Data);
+			break;
+		case 0x18:	// OKIM6295
+			okim6295_w(p->okim6295ChipID, Offset, Data);
+			break;
+		case 0x19:	// K051649 / SCC1
+			k051649_w(p->k051649ChipID, (Port << 1) | 0x00, Offset);
+			k051649_w(p->k051649ChipID, (Port << 1) | 0x01, Data);
+			break;
+		case 0x1A:	// K054539
+			k054539_w(p->k054539ChipID, (Port << 8) | (Offset << 0), Data);
+			break;
+		case 0x1B:	// HuC6280
+			c6280_w(p->huc6280ChipID, Offset, Data);
+			break;
+		case 0x1C:	// C140
+			c140_w(p->c140ChipID, (Port << 8) | (Offset << 0), Data);
+			break;
+		case 0x1D:	// K053260
+			k053260_w(p->k053260ChipID, Offset, Data);
+			break;
+		case 0x1E:	// Pokey
+			pokey_w(p->pokeyChipID, Offset, Data);
+			break;
+		case 0x1F:	// QSound
+			qsound_w(p->qsoundChipID, 0x00, Port);	// Data MSB
+			qsound_w(p->qsoundChipID, 0x01, Offset);	// Data LSB
+			qsound_w(p->qsoundChipID, 0x02, Data);	// Register
+			break;
+		case 0x20:	// YMF292/SCSP
+			scsp_w(p->scspChipID, (Port << 8) | (Offset << 0), Data);
+			break;
+		case 0x21:	// WonderSwan
+			ws_audio_port_write(p->wswanChipID, 0x80 | Offset, Data);
+			break;
+		case 0x22:	// VSU
+			VSU_Write(p->vsuChipID, (Port << 8) | (Offset << 0), Data);
+			break;
+		case 0x23:	// SAA1099
+			saa1099_control_w(p->saa1099ChipID, 0, Offset);
+			saa1099_data_w(p->saa1099ChipID, 0, Data);
+			break;
+		case 0x24:	// ES5503
+			es5503_w(p->es5503ChipID, Offset, Data);
+			break;
+		case 0x25:	// ES5506
+			if (Port & 0x80)
+				es550x_w16(p->es550xChipID, Port & 0x7F, (Offset << 8) | (Data << 0));
+			else
+				es550x_w(p->es550xChipID, Port, Data);
+			break;
+		case 0x26:	// X1-010
+			seta_sound_w(p->x1_010ChipID, (Port << 8) | (Offset << 0), Data);
+			break;
+		case 0x27:	// C352
+			c352_w(p->c352ChipID, Port, (Offset << 8) | (Data << 0));
+			break;
+		case 0x28:	// GA20
+			irem_ga20_w(p->ga20ChipID, Offset, Data);
+			break;
+//		case 0x##:	// OKIM6376
+//			break;
+		}
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/ChipMapper.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/SourceReadme.txt Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/VGMFile.h Added

@@ -0,0 +1,147 @@
+// Header file for VGM file handling
+
+typedef struct _vgm_file_header
+{
+	UINT32 fccVGM;
+	UINT32 lngEOFOffset;
+	UINT32 lngVersion;
+	UINT32 lngHzPSG;
+	UINT32 lngHzYM2413;
+	UINT32 lngGD3Offset;
+	UINT32 lngTotalSamples;
+	UINT32 lngLoopOffset;
+	UINT32 lngLoopSamples;
+	UINT32 lngRate;
+	UINT16 shtPSG_Feedback;
+	UINT8 bytPSG_SRWidth;
+	UINT8 bytPSG_Flags;
+	UINT32 lngHzYM2612;
+	UINT32 lngHzYM2151;
+	UINT32 lngDataOffset;
+	UINT32 lngHzSPCM;
+	UINT32 lngSPCMIntf;
+	UINT32 lngHzRF5C68;
+	UINT32 lngHzYM2203;
+	UINT32 lngHzYM2608;
+	UINT32 lngHzYM2610;
+	UINT32 lngHzYM3812;
+	UINT32 lngHzYM3526;
+	UINT32 lngHzY8950;
+	UINT32 lngHzYMF262;
+	UINT32 lngHzYMF278B;
+	UINT32 lngHzYMF271;
+	UINT32 lngHzYMZ280B;
+	UINT32 lngHzRF5C164;
+	UINT32 lngHzPWM;
+	UINT32 lngHzAY8910;
+	UINT8 bytAYType;
+	UINT8 bytAYFlag;
+	UINT8 bytAYFlagYM2203;
+	UINT8 bytAYFlagYM2608;
+	UINT8 bytVolumeModifier;
+	UINT8 bytReserved2;
+	INT8 bytLoopBase;
+	UINT8 bytLoopModifier;
+	UINT32 lngHzGBDMG;
+	UINT32 lngHzNESAPU;
+	UINT32 lngHzMultiPCM;
+	UINT32 lngHzUPD7759;
+	UINT32 lngHzOKIM6258;
+	UINT8 bytOKI6258Flags;
+	UINT8 bytK054539Flags;
+	UINT8 bytC140Type;
+	UINT8 bytReservedFlags;
+	UINT32 lngHzOKIM6295;
+	UINT32 lngHzK051649;
+	UINT32 lngHzK054539;
+	UINT32 lngHzHuC6280;
+	UINT32 lngHzC140;
+	UINT32 lngHzK053260;
+	UINT32 lngHzPokey;
+	UINT32 lngHzQSound;
+	UINT32 lngHzSCSP;
+//	UINT32 lngHzOKIM6376;
+	//UINT8 bytReserved0x04;
+	UINT32 lngExtraOffset;
+	UINT32 lngHzWSwan;
+	UINT32 lngHzVSU;
+	UINT32 lngHzSAA1099;
+	UINT32 lngHzES5503;
+	UINT32 lngHzES5506;
+	UINT8 bytES5503Chns;
+	UINT8 bytES5506Chns;
+	UINT8 bytC352ClkDiv;
+	UINT8 bytESReserved;
+	UINT32 lngHzX1_010;
+	UINT32 lngHzC352;
+	UINT32 lngHzGA20;
+} VGM_HEADER;
+typedef struct _vgm_header_extra
+{
+	UINT32 DataSize;
+	UINT32 Chp2ClkOffset;
+	UINT32 ChpVolOffset;
+} VGM_HDR_EXTRA;
+typedef struct _vgm_extra_chip_data32
+{
+	UINT8 Type;
+	UINT32 Data;
+} VGMX_CHIP_DATA32;
+typedef struct _vgm_extra_chip_data16
+{
+	UINT8 Type;
+	UINT8 Flags;
+	UINT16 Data;
+} VGMX_CHIP_DATA16;
+typedef struct _vgm_extra_chip_extra32
+{
+	UINT8 ChipCnt;
+	VGMX_CHIP_DATA32* CCData;
+} VGMX_CHP_EXTRA32;
+typedef struct _vgm_extra_chip_extra16
+{
+	UINT8 ChipCnt;
+	VGMX_CHIP_DATA16* CCData;
+} VGMX_CHP_EXTRA16;
+typedef struct _vgm_header_extra_data
+{
+	VGMX_CHP_EXTRA32 Clocks;
+	VGMX_CHP_EXTRA16 Volumes;
+} VGM_EXTRA;
+
+#define VOLUME_MODIF_WRAP	0xC0
+typedef struct _vgm_gd3_tag
+{
+	UINT32 fccGD3;
+	UINT32 lngVersion;
+	UINT32 lngTagLength;
+	wchar_t* strTrackNameE;
+	wchar_t* strTrackNameJ;
+	wchar_t* strGameNameE;
+	wchar_t* strGameNameJ;
+	wchar_t* strSystemNameE;
+	wchar_t* strSystemNameJ;
+	wchar_t* strAuthorNameE;
+	wchar_t* strAuthorNameJ;
+	wchar_t* strReleaseDate;
+	wchar_t* strCreator;
+	wchar_t* strNotes;
+} GD3_TAG;
+typedef struct _vgm_pcm_bank_data
+{
+	UINT32 DataSize;
+	UINT8* Data;
+	UINT32 DataStart;
+} VGM_PCM_DATA;
+typedef struct _vgm_pcm_bank
+{
+	UINT32 BankCount;
+	VGM_PCM_DATA* Bank;
+	UINT32 DataSize;
+	UINT8* Data;
+	UINT32 DataPos;
+	UINT32 BnkPos;
+} VGM_PCM_BANK;
+
+#define FCC_VGM	0x206D6756	// 'Vgm '
+#define FCC_GD3	0x20336447	// 'Gd3 '

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.c Added

@@ -0,0 +1,6429 @@
+// VGMPlay.c: C Source File of the Main Executable
+//
+
+// Line Size:	96 Chars
+// Tab Size:	4 Spaces
+
+/*3456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456
+0000000001111111111222222222233333333334444444444555555555566666666667777777777888888888899999*/
+// TODO: Callback "ChangeSampleRate" to fix YM2203's AY8910
+
+// Mixer Muting ON:
+//		Mixer's FM Volume is set to 0 or Mute	-> absolutely muted
+//		(sometimes it can take some time to get the Mixer Control under Windows)
+// Mixer Muting OFF:
+//		FM Volume is set to 0 through commands	-> very very low volume level ~0.4%
+//		(faster way)
+//#define MIXER_MUTING
+
+// These defines enable additional features.
+//	ADDITIONAL_FORMATS enables CMF and DRO support.
+//	CONSOLE_MODE switches between VGMPlay and in_vgm mode.
+//	in_vgm mode can also be used for custom players.
+//
+//#define ADDITIONAL_FORMATS
+//#define CONSOLE_MODE
+//#define VGM_BIG_ENDIAN
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <wchar.h>
+#include "stdbool.h"
+#include <math.h>	// for pow()
+
+#ifndef NO_ZLIB
+#include <zlib.h>
+#endif
+
+#include "resampler.h"
+
+#include "chips/mamedef.h"
+
+// integer types for fast integer calculation
+// the bit number is unused (it's an orientation)
+#define FUINT8	unsigned int
+#define FUINT16	unsigned int
+
+#include "VGMPlay.h"
+//#include "VGMPlay_Intf.h" // Already included by VGMPlay.h now
+
+#include "chips/ChipIncl.h"
+
+unsigned char OpenPortTalk(void *);
+void ClosePortTalk(void *);
+
+#include "ChipMapper.h"
+
+
+
+// Function Prototypes (prototypes in comments are defined in VGMPlay_Intf.h)
+//void VGMPlay_Init(void);
+//void VGMPlay_Init2(void);
+//void VGMPlay_Deinit(void);
+
+INLINE UINT16 ReadLE16(const UINT8* Data);
+INLINE UINT16 ReadBE16(const UINT8* Data);
+INLINE UINT32 ReadLE24(const UINT8* Data);
+INLINE UINT32 ReadLE32(const UINT8* Data);
+INLINE int FILE_getLE16(VGM_FILE* hFile, UINT16* RetValue);
+INLINE int FILE_getLE32(VGM_FILE* hFile, UINT32* RetValue);
+static UINT32 gcd(UINT32 x, UINT32 y);
+//void PlayVGM(void);
+//void StopVGM(void);
+//void RestartVGM(void);
+//void PauseVGM(bool Pause);
+//void SeekVGM(bool Relative, INT32 PlayBkSamples);
+//void RefreshMuting(void);
+//void RefreshPanning(void);
+//void RefreshPlaybackOptions(void);
+
+//UINT32 GetGZFileLength(const char* FileName);
+//UINT32 GetGZFileLengthW(const wchar_t* FileName);
+static UINT32 GetGZFileLength_Internal(FILE* hFile);
+//bool OpenVGMFile(const char* FileName);
+static bool OpenVGMFile_Internal(VGM_PLAYER*, VGM_FILE* hFile, UINT32 FileSize);
+static void ReadVGMHeader(VGM_FILE* hFile, VGM_HEADER* RetVGMHead);
+static UINT8 ReadGD3Tag(VGM_FILE* hFile, UINT32 GD3Offset, GD3_TAG* RetGD3Tag);
+static void ReadChipExtraData32(VGM_PLAYER*, UINT32 StartOffset, VGMX_CHP_EXTRA32* ChpExtra);
+static void ReadChipExtraData16(VGM_PLAYER*, UINT32 StartOffset, VGMX_CHP_EXTRA16* ChpExtra);
+//void CloseVGMFile(void);
+//void FreeGD3Tag(GD3_TAG* TagData);
+static wchar_t* MakeEmptyWStr(void);
+static wchar_t* ReadWStrFromFile(VGM_FILE* hFile, UINT32* FilePos, UINT32 EOFPos);
+//UINT32 GetVGMFileInfo(const char* FileName, VGM_HEADER* RetVGMHead, GD3_TAG* RetGD3Tag);
+static UINT32 GetVGMFileInfo_Internal(VGM_FILE* hFile, UINT32 FileSize,
+									 VGM_HEADER* RetVGMHead, GD3_TAG* RetGD3Tag);
+INLINE UINT32 MulDivRound(UINT64 Number, UINT64 Numerator, UINT64 Denominator);
+//UINT32 CalcSampleMSec(VGM_PLAYER* p, UINT64 Value, UINT8 Mode);
+//UINT32 CalcSampleMSecExt(VGM_PLAYER* p, UINT64 Value, UINT8 Mode, VGM_HEADER* FileHead);
+//const char* GetChipName(UINT8 ChipID);
+//const char* GetAccurateChipName(UINT8 ChipID, UINT8 SubType);
+//UINT32 GetChipClock(void*, UINT8 ChipID, UINT8* RetSubType);
+static UINT16 GetChipVolume(VGM_PLAYER*, UINT8 ChipID, UINT8 ChipNum, UINT8 ChipCnt);
+
+static void RestartPlaying(VGM_PLAYER*);
+static void Chips_GeneralActions(VGM_PLAYER*, UINT8 Mode);
+
+INLINE INT32 SampleVGM2Pbk_I(VGM_PLAYER*, INT32 SampleVal);	// inline functions
+INLINE INT32 SamplePbk2VGM_I(VGM_PLAYER*, INT32 SampleVal);
+//INT32 SampleVGM2Playback(void*, INT32 SampleVal);		// non-inline functions
+//INT32 SamplePlayback2VGM(void*, INT32 SampleVal);
+//static bool SetMuteControl(VGM_PLAYER*, bool mute);
+
+static void InterpretFile(VGM_PLAYER*, UINT32 SampleCount);
+static void AddPCMData(VGM_PLAYER*, UINT8 Type, UINT32 DataSize, const UINT8* Data);
+//INLINE FUINT16 ReadBits(UINT8* Data, UINT32* Pos, FUINT8* BitPos, FUINT8 BitsToRead);
+static bool DecompressDataBlk(VGM_PLAYER* p, VGM_PCM_DATA* Bank, UINT32 DataSize, const UINT8* Data);
+static UINT8 GetDACFromPCMBank(VGM_PLAYER*);
+static UINT8* GetPointerFromPCMBank(VGM_PLAYER*, UINT8 Type, UINT32 DataPos);
+static void ReadPCMTable(VGM_PLAYER*, UINT32 DataSize, const UINT8* Data);
+static void InterpretVGM(VGM_PLAYER*, UINT32 SampleCount);
+#ifdef ADDITIONAL_FORMATS
+extern void InterpretOther(VGM_PLAYER*, UINT32 SampleCount);
+#endif
+
+static void GeneralChipLists(VGM_PLAYER*);
+static void SetupResampler(VGM_PLAYER*, CAUD_ATTR* CAA);
+static void ChangeChipSampleRate(void* DataPtr, UINT32 NewSmplRate);
+
+INLINE INT16 Limit2Short(INT32 Value);
+static void null_update(void *param, stream_sample_t **outputs, int samples);
+struct dual_opl2_info
+{
+ void * chip;
+ int ChipID;
+};
+static void dual_opl2_stereo(void *param, stream_sample_t **outputs, int samples);
+static void ResampleChipStream(VGM_PLAYER*, CA_LIST* CLst, WAVE_32BS* RetSample, UINT32 Length);
+static INT32 RecalcFadeVolume(VGM_PLAYER*);
+//UINT32 FillBuffer(void *, WAVE_16BS* Buffer, UINT32 BufferSize)
+
+// Options and such moved to VGM_PLAYER structure
+
+void * VGMPlay_Init(void)
+{
+	UINT8 CurChip;
+	UINT8 CurCSet;
+	UINT8 CurChn;
+	CHIP_OPTS* TempCOpt;
+	CAUD_ATTR* TempCAud;
+
+ VGM_PLAYER* p = (VGM_PLAYER*) calloc(1, sizeof(*p));
+ if (!p)
+ return NULL;
+
+	p->SampleRate = 44100;
+	p->FadeTime = 5000;
+
+	p->HardStopOldVGMs = 0x00;
+	p->FadeRAWLog = false;
+	p->VolumeLevel = 1.0f;
+	//p->FullBufFill = false;
+	p->SurroundSound = false;
+	p->VGMMaxLoop = 0x02;
+	p->VGMPbRate = 0;
+#ifdef ADDITIONAL_FORMATS
+	p->CMFMaxLoop = 0x01;
+#endif
+	p->ResampleMode = 0x00;
+	p->CHIP_SAMPLING_MODE = 0x00;
+	p->CHIP_SAMPLE_RATE = 0x00000000;
+	p->DoubleSSGVol = false;
+
+	for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+	{
+		TempCAud = (CAUD_ATTR*)&p->ChipAudioCurCSet;
+		for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++, TempCAud ++)
+		{
+			TempCOpt = (CHIP_OPTS*)&p->ChipOptsCurCSet + CurChip;
+
+			TempCOpt->Disabled = false;
+			TempCOpt->EmuCore = 0x00;
+			TempCOpt->SpecialFlags = 0x00;
+			TempCOpt->ChnCnt = 0x00;
+			TempCOpt->ChnMute1 = 0x00;
+			TempCOpt->ChnMute2 = 0x00;
+			TempCOpt->ChnMute3 = 0x00;
+			TempCOpt->Panning = NULL;
+
+			// Set up some important fields to prevent in_vgm from crashing
+			// when clicking on Muting checkboxes after init.
+			TempCAud->ChipType = 0xFF;
+			TempCAud->ChipID = CurCSet;
+			TempCAud->Paired = NULL;
+		}
+		p->ChipOptsCurCSet.GameBoy.SpecialFlags = 0x0003;
+		// default options, 0x8000 skips the option write and keeps NSFPlay's default values
+		p->ChipOptsCurCSet.NES.SpecialFlags = 0x8000 |
+										(0x00 << 12) | (0x3B << 4) | (0x01 << 2) | (0x03 << 0);
+
+		TempCAud = p->CA_PairedCurCSet;
+		for (CurChip = 0x00; CurChip < 0x03; CurChip ++, TempCAud ++)
+		{
+			TempCAud->ChipType = 0xFF;
+			TempCAud->ChipID = CurCSet;
+			TempCAud->Paired = NULL;
+		}
+
+		// currently the only chips with Panning support are
+		// SN76496 and YM2413, it should be not a problem that it's hardcoded.
+		TempCOpt = (CHIP_OPTS*)&p->ChipOptsCurCSet.SN76496;
+		TempCOpt->ChnCnt = 0x04;
+		TempCOpt->Panning = (INT16*)malloc(sizeof(INT16) * TempCOpt->ChnCnt);
+		for (CurChn = 0x00; CurChn < TempCOpt->ChnCnt; CurChn ++)
+			TempCOpt->PanningCurChn = 0x00;
+
+		TempCOpt = (CHIP_OPTS*)&p->ChipOptsCurCSet.YM2413;
+		TempCOpt->ChnCnt = 0x0E;	// 0x09 + 0x05
+		TempCOpt->Panning = (INT16*)malloc(sizeof(INT16) * TempCOpt->ChnCnt);
+		for (CurChn = 0x00; CurChn < TempCOpt->ChnCnt; CurChn ++)
+			TempCOpt->PanningCurChn = 0x00;
+	}
+
+	p->FileMode = 0xFF;
+
+	return p;
+}
+
+void VGMPlay_Init2(void *_p)
+{
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+	// has to be called after the configuration is loaded
+
+	p->StreamBufs0x00 = (INT32*)malloc(SMPL_BUFSIZE * sizeof(INT32));
+	p->StreamBufs0x01 = (INT32*)malloc(SMPL_BUFSIZE * sizeof(INT32));
+
+	if (p->CHIP_SAMPLE_RATE <= 0)
+		p->CHIP_SAMPLE_RATE = p->SampleRate;
+	p->PlayingMode = 0xFF;
+
+	return;
+}
+
+void VGMPlay_Deinit(void *_p)
+{
+	UINT8 CurChip;
+	UINT8 CurCSet;
+	CHIP_OPTS* TempCOpt;
+
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+
+	free(p->StreamBufs0x00);	p->StreamBufs0x00 = NULL;
+	free(p->StreamBufs0x01);	p->StreamBufs0x01 = NULL;
+
+	for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+	{
+		for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++)
+		{
+			TempCOpt = (CHIP_OPTS*)&p->ChipOptsCurCSet + CurChip;
+
+			if (TempCOpt->Panning != NULL)
+			{
+				free(TempCOpt->Panning);	TempCOpt->Panning = NULL;
+			}
+		}
+	}
+
+ free(p);
+
+	return;
+}
+
+INLINE UINT16 ReadLE16(const UINT8* Data)
+{
+	// read 16-Bit Word (Little Endian/Intel Byte Order)
+#ifndef VGM_BIG_ENDIAN
+	return *(UINT16*)Data;
+#else
+	return (Data0x01 << 8) | (Data0x00 << 0);
+#endif
+}
+
+INLINE UINT16 ReadBE16(const UINT8* Data)
+{
+	// read 16-Bit Word (Big Endian/Motorola Byte Order)
+#ifndef VGM_BIG_ENDIAN
+	return (Data0x00 << 8) | (Data0x01 << 0);
+#else
+	return *(UINT16*)Data;
+#endif
+}
+
+INLINE UINT32 ReadLE24(const UINT8* Data)
+{
+	// read 24-Bit Word (Little Endian/Intel Byte Order)
+#ifndef VGM_BIG_ENDIAN
+	return	(*(UINT32*)Data) & 0x00FFFFFF;
+#else
+	return	(Data0x02 << 16) | (Data0x01 << 8) | (Data0x00 << 0);
+#endif
+}
+
+INLINE UINT32 ReadLE32(const UINT8* Data)
+{
+	// read 32-Bit Word (Little Endian/Intel Byte Order)
+#ifndef VGM_BIG_ENDIAN
+	return	*(UINT32*)Data;
+#else
+	return	(Data0x03 << 24) | (Data0x02 << 16) |
+			(Data0x01 << 8) | (Data0x00 << 0);
+#endif
+}
+
+INLINE int FILE_getLE16(VGM_FILE* hFile, UINT16* RetValue)
+{
+#ifndef VGM_BIG_ENDIAN
+	return hFile->Read(hFile, RetValue, 0x02);
+#else
+	int RetVal;
+	UINT8 Data0x02;
+
+	RetVal = hFile->Read(hFile, Data, 0x02);
+	*RetValue =	(Data0x01 << 8) | (Data0x00 << 0);
+	return RetVal;
+#endif
+}
+
+INLINE int FILE_getLE32(VGM_FILE* hFile, UINT32* RetValue)
+{
+#ifndef VGM_BIG_ENDIAN
+	return hFile->Read(hFile, RetValue, 0x04);
+#else
+	int RetVal;
+	UINT8 Data0x04;
+
+	RetVal = hFime->Read(hFile, Data, 0x04);
+	*RetValue =	(Data0x03 << 24) | (Data0x02 << 16) |
+				(Data0x01 << 8) | (Data0x00 << 0);
+	return RetVal;
+#endif
+}
+
+static UINT32 gcd(UINT32 x, UINT32 y)
+{
+	UINT32 shift;
+	UINT32 diff;
+
+	// Thanks to Wikipedia for this algorithm
+	// http://en.wikipedia.org/wiki/Binary_GCD_algorithm
+	if (! x || ! y)
+		return x | y;
+
+	for (shift = 0; ((x | y) & 1) == 0; shift ++)
+	{
+		x >>= 1;
+		y >>= 1;
+	}
+
+	while((x & 1) == 0)
+		x >>= 1;
+
+	do
+	{
+		while((y & 1) == 0)
+			y >>= 1;
+
+		if (x < y)
+		{
+			y -= x;
+		}
+		else
+		{
+			diff = x - y;
+			x = y;
+			y = diff;
+		}
+		y >>= 1;
+	} while(y);
+
+	return x << shift;
+}
+
+void PlayVGM(void *_p)
+{
+	/*UINT8 CurChip;*/
+	/*UINT8 FMVal;*/
+	INT32 TempSLng;
+
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+
+	if (p->PlayingMode != 0xFF)
+		return;
+
+	p->FadePlay = false;
+	p->MasterVol = 1.0f;
+	p->ForceVGMExec = false;
+	p->FadeStart = 0;
+	p->ForceVGMExec = true;
+
+ p->PlayingMode = 0x00;	// Normal Mode
+
+	if (p->VGMHead.bytVolumeModifier <= VOLUME_MODIF_WRAP)
+		TempSLng = p->VGMHead.bytVolumeModifier;
+	else if (p->VGMHead.bytVolumeModifier == (VOLUME_MODIF_WRAP + 0x01))
+		TempSLng = VOLUME_MODIF_WRAP - 0x100;
+	else
+		TempSLng = p->VGMHead.bytVolumeModifier - 0x100;
+	p->VolumeLevelM = (float)(p->VolumeLevel * pow(2.0, TempSLng / (double)0x20));
+	p->FinalVol = p->VolumeLevelM;
+
+	if (! p->VGMMaxLoop)
+	{
+		p->VGMMaxLoopM = 0x00;
+	}
+	else
+	{
+		TempSLng = (p->VGMMaxLoop * p->VGMHead.bytLoopModifier + 0x08) / 0x10 - p->VGMHead.bytLoopBase;
+		p->VGMMaxLoopM = (TempSLng >= 0x01) ? TempSLng : 0x01;
+	}
+
+	if (! p->VGMPbRate || ! p->VGMHead.lngRate)
+	{
+		p->VGMPbRateMul = 1;
+		p->VGMPbRateDiv = 1;
+	}
+	else
+	{
+		// I prefer small Multiplers and Dividers, as they're used very often
+		TempSLng = gcd(p->VGMHead.lngRate, p->VGMPbRate);
+		p->VGMPbRateMul = p->VGMHead.lngRate / TempSLng;
+		p->VGMPbRateDiv = p->VGMPbRate / TempSLng;
+	}
+	p->VGMSmplRateMul = p->SampleRate * p->VGMPbRateMul;
+	p->VGMSmplRateDiv = p->VGMSampleRate * p->VGMPbRateDiv;
+	// same as above - to speed up the VGM <-> Playback calculation
+	TempSLng = gcd(p->VGMSmplRateMul, p->VGMSmplRateDiv);
+	p->VGMSmplRateMul /= TempSLng;
+	p->VGMSmplRateDiv /= TempSLng;
+
+	p->PlayingTime = 0;
+	p->EndPlay = false;
+
+	p->VGMPos = p->VGMHead.lngDataOffset;
+	p->VGMSmplPos = 0;
+	p->VGMSmplPlayed = 0;
+	p->VGMEnd = false;
+	p->VGMCurLoop = 0x00;
+	if (p->VGMPos >= p->VGMHead.lngEOFOffset)
+		p->VGMEnd = true;
+
+	Chips_GeneralActions(p, 0x00);	// Start chips
+	// also does Reset (0x01), Muting Mask (0x10) and Panning (0x20)
+
+	p->Last95Drum = 0xFFFF;
+	p->Last95Freq = 0;
+	p->Last95Max = 0xFFFF;
+	p->IsVGMInit = true;
+ p->ErrorHappened = false;
+	InterpretFile(p, 0);
+	p->IsVGMInit = false;
+
+	p->ForceVGMExec = false;
+
+	return;
+}
+
+void StopVGM(void *_p)
+{
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+	if (p->PlayingMode == 0xFF)
+		return;
+
+	Chips_GeneralActions(p, 0x02);	// Stop chips
+	p->PlayingMode = 0xFF;
+
+	return;
+}
+
+void RestartVGM(void *_p)
+{
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+
+	if (p->PlayingMode == 0xFF || ! p->VGMSmplPlayed)
+		return;
+
+	RestartPlaying(p);
+
+	return;
+}
+
+void SeekVGM(void *_p, bool Relative, INT32 PlayBkSamples)
+{
+	INT32 Samples;
+	UINT32 LoopSmpls;
+
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+
+	if (p->PlayingMode == 0xFF || (Relative && ! PlayBkSamples))
+		return;
+
+	LoopSmpls = p->VGMCurLoop * SampleVGM2Pbk_I(p, p->VGMHead.lngLoopSamples);
+	if (! Relative)
+		Samples = PlayBkSamples - (LoopSmpls + p->VGMSmplPlayed);
+	else
+		Samples = PlayBkSamples;
+
+	if (Samples < 0)
+	{
+		Samples = LoopSmpls + p->VGMSmplPlayed + Samples;
+		if (Samples < 0)
+			Samples = 0;
+		RestartPlaying(p);
+	}
+
+	p->ForceVGMExec = true;
+	InterpretFile(p, Samples);
+	p->ForceVGMExec = false;
+
+	return;
+}
+
+void RefreshMuting(void *_p)
+{
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+	Chips_GeneralActions(p, 0x10);	// set muting mask
+
+	return;
+}
+
+void RefreshPanning(void *_p)
+{
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+	Chips_GeneralActions(p, 0x20);	// set panning
+
+	return;
+}
+
+void RefreshPlaybackOptions(void *_p)
+{
+	INT32 TempVol;
+	UINT8 CurChip;
+	CHIP_OPTS* TempCOpt1;
+	CHIP_OPTS* TempCOpt2;
+
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+
+	if (p->VGMHead.bytVolumeModifier <= VOLUME_MODIF_WRAP)
+		TempVol = p->VGMHead.bytVolumeModifier;
+	else if (p->VGMHead.bytVolumeModifier == (VOLUME_MODIF_WRAP + 0x01))
+		TempVol = VOLUME_MODIF_WRAP - 0x100;
+	else
+		TempVol = p->VGMHead.bytVolumeModifier - 0x100;
+	p->VolumeLevelM = (float)(p->VolumeLevel * pow(2.0, TempVol / (double)0x20));
+	p->FinalVol = p->VolumeLevelM * p->MasterVol * p->MasterVol;
+
+	if (p->PlayingMode == 0xFF)
+	{
+		TempCOpt1 = (CHIP_OPTS*)&p->ChipOpts0x00;
+		TempCOpt2 = (CHIP_OPTS*)&p->ChipOpts0x01;
+		for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++, TempCOpt1 ++, TempCOpt2 ++)
+		{
+			TempCOpt2->EmuCore = TempCOpt1->EmuCore;
+			TempCOpt2->SpecialFlags = TempCOpt1->SpecialFlags;
+		}
+	}
+
+	return;
+}
+
+
+UINT32 GetGZFileLength(const char* FileName)
+{
+	FILE* hFile;
+	UINT32 FileSize;
+
+	hFile = fopen(FileName, "rb");
+	if (hFile == NULL)
+		return 0xFFFFFFFF;
+
+	FileSize = GetGZFileLength_Internal(hFile);
+
+	fclose(hFile);
+	return FileSize;
+}
+
+#ifndef NO_WCHAR_FILENAMES
+UINT32 GetGZFileLengthW(const wchar_t* FileName)
+{
+	FILE* hFile;
+	UINT32 FileSize;
+
+	hFile = _wfopen(FileName, L"rb");
+	if (hFile == NULL)
+		return 0xFFFFFFFF;
+
+	FileSize = GetGZFileLength_Internal(hFile);
+
+	fclose(hFile);
+	return FileSize;
+}
+#endif
+
+static UINT32 GetGZFileLength_Internal(FILE* hFile)
+{
+	UINT32 FileSize;
+	UINT16 gzHead;
+	size_t RetVal;
+
+	RetVal = fread(&gzHead, 0x02, 0x01, hFile);
+	if (RetVal >= 1)
+	{
+		gzHead = ReadBE16((UINT8*)&gzHead);
+		if (gzHead != 0x1F8B)
+		{
+			RetVal = 0;	// no .gz signature - treat as normal file
+		}
+		else
+		{
+			// .gz File
+			fseek(hFile, -4, SEEK_END);
+			// Note: In the error case it falls back to fseek/ftell.
+			RetVal = fread(&FileSize, 0x04, 0x01, hFile);
+#ifdef VGM_BIG_ENDIAN
+			FileSize = ReadLE32((UINT8*)&FileSize);
+#endif
+		}
+	}
+	if (RetVal <= 0)
+	{
+		// normal file
+		fseek(hFile, 0x00, SEEK_END);
+		FileSize = ftell(hFile);
+	}
+
+	return FileSize;
+}
+
+#ifndef NO_ZLIB
+typedef struct vgm_file_gz
+{
+	VGM_FILE vf;
+	gzFile hFile;
+	UINT32 Size;
+} VGM_FILE_gz;
+
+static int VGMF_gzread(VGM_FILE* hFile, void* ptr, UINT32 count)
+{
+	VGM_FILE_gz* File = (VGM_FILE_gz *)hFile;
+	return gzread(File->hFile, ptr, count);
+}
+
+static int VGMF_gzseek(VGM_FILE* hFile, UINT32 offset)
+{
+	VGM_FILE_gz* File = (VGM_FILE_gz *)hFile;
+	return gzseek(File->hFile, offset, SEEK_SET);
+}
+
+static UINT32 VGMF_gzgetsize(VGM_FILE* hFile)
+{
+	VGM_FILE_gz* File = (VGM_FILE_gz *)hFile;
+	return File->Size;
+}
+
+static UINT32 VGMF_gztell(VGM_FILE* hFile)
+{
+	VGM_FILE_gz* File = (VGM_FILE_gz *)hFile;
+	return gztell(File->hFile);
+}
+#endif
+
+bool OpenVGMFile(void *_p, const char* FileName)
+{
+#ifdef NO_ZLIB
+	return false;
+#else
+	gzFile hFile;
+	UINT32 FileSize;
+	bool RetVal;
+
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+
+	FileSize = GetGZFileLength(FileName);
+
+	hFile = gzopen(FileName, "rb");
+	if (hFile == NULL)
+		return false;
+
+	VGM_FILE_gz vgmFile;
+
+	vgmFile.vf.Read = VGMF_gzread;
+	vgmFile.vf.Seek = VGMF_gzseek;
+	vgmFile.vf.GetSize = VGMF_gzgetsize;
+	vgmFile.vf.Tell = VGMF_gztell;
+	vgmFile.hFile = hFile;
+	vgmFile.Size = FileSize;
+
+	RetVal = OpenVGMFile_Internal(p, (VGM_FILE *)&vgmFile, FileSize);
+
+	gzclose(hFile);
+	return RetVal;
+#endif
+}
+
+#ifndef NO_WCHAR_FILENAMES
+bool OpenVGMFileW(void *_p, const wchar_t* FileName)
+{
+#ifdef NO_ZLIB
+	return false;
+#else
+	gzFile hFile;
+	UINT32 FileSize;
+	bool RetVal;
+
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+
+#if ZLIB_VERNUM < 0x1270
+	int fDesc;
+
+	FileSize = GetGZFileLengthW(FileName);
+
+	fDesc = _wopen(FileName, _O_RDONLY | _O_BINARY);
+	hFile = gzdopen(fDesc, "rb");
+	if (hFile == NULL)
+	{
+		_close(fDesc);
+		return false;
+	}
+#else
+	FileSize = GetGZFileLengthW(FileName);
+
+	hFile = gzopen_w(FileName, "rb");
+	if (hFile == NULL)
+		return false;
+#endif
+	VGM_FILE_gz vgmFile;
+
+	vgmFile.vf.Read = VGMF_gzread;
+	vgmFile.vf.Seek = VGMF_gzseek;
+	vgmFile.vf.GetSize = VGMF_gzgetsize;
+	vgmFile.vf.Tell = VGMF_gztell;
+	vgmFile.hFile = hFile;
+	vgmFile.Size = FileSize;
+
+	RetVal = OpenVGMFile_Internal(p, (VGM_FILE *)&vgmFile, FileSize);
+
+	gzclose(hFile);
+	return RetVal;
+#endif
+}
+#endif
+
+bool OpenVGMFile_Handle(void* _p, VGM_FILE* hFile)
+{
+	UINT32 FileSize = hFile->GetSize(hFile);
+	return OpenVGMFile_Internal((VGM_PLAYER*)_p, hFile, FileSize);
+}
+
+static bool OpenVGMFile_Internal(VGM_PLAYER* p, VGM_FILE* hFile, UINT32 FileSize)
+{
+	UINT32 fccHeader;
+	UINT32 CurPos;
+	UINT32 HdrLimit;
+
+	hFile->Seek(hFile, 0x00);
+	FILE_getLE32(hFile, &fccHeader);
+	if (fccHeader != FCC_VGM)
+		return false;
+
+	if (p->FileMode != 0xFF)
+		CloseVGMFile(p);
+
+	p->FileMode = 0x00;
+	p->VGMDataLen = FileSize;
+
+	hFile->Seek(hFile, 0x00);
+	ReadVGMHeader(hFile, &p->VGMHead);
+	if (p->VGMHead.fccVGM != FCC_VGM)
+	{
+		printf("VGM signature matched on the first read, but not on the second one!\n");
+		printf("This is a known zlib bug where gzseek fails. Please install a fixed zlib.\n");
+		return false;
+	}
+
+	p->VGMSampleRate = 44100;
+	if (! p->VGMDataLen)
+		p->VGMDataLen = p->VGMHead.lngEOFOffset;
+	if (! p->VGMHead.lngEOFOffset || p->VGMHead.lngEOFOffset > p->VGMDataLen)
+	{
+		p->VGMHead.lngEOFOffset = p->VGMDataLen;
+	}
+	if (p->VGMHead.lngLoopOffset && ! p->VGMHead.lngLoopSamples)
+	{
+		// 0-Sample-Loops causes the program to hangs in the playback routine
+		p->VGMHead.lngLoopOffset = 0x00000000;
+	}
+	if (p->VGMHead.lngDataOffset < 0x00000040)
+	{
+		p->VGMHead.lngDataOffset = 0x00000040;
+	}
+
+	memset(&p->VGMHeadX, 0x00, sizeof(VGM_HDR_EXTRA));
+	memset(&p->VGMH_Extra, 0x00, sizeof(VGM_EXTRA));
+
+	// Read Data
+	p->VGMDataLen = p->VGMHead.lngEOFOffset;
+	p->VGMData = (UINT8*)malloc(p->VGMDataLen);
+	if (p->VGMData == NULL)
+		return false;
+	hFile->Seek(hFile, 0x00);
+	hFile->Read(hFile, p->VGMData, p->VGMDataLen);
+
+	// Read Extra Header Data
+	if (p->VGMHead.lngExtraOffset)
+	{
+		UINT32* TempPtr;
+
+		CurPos = p->VGMHead.lngExtraOffset;
+		TempPtr = (UINT32*)&p->VGMHeadX;
+		// Read Header Size
+		p->VGMHeadX.DataSize = ReadLE32(&p->VGMDataCurPos);
+		if (p->VGMHeadX.DataSize > sizeof(VGM_HDR_EXTRA))
+			p->VGMHeadX.DataSize = sizeof(VGM_HDR_EXTRA);
+		HdrLimit = CurPos + p->VGMHeadX.DataSize;
+		CurPos += 0x04;
+		TempPtr ++;
+
+		// Read all relative offsets of this header and make them absolute.
+		for (; CurPos < HdrLimit; CurPos += 0x04, TempPtr ++)
+		{
+			*TempPtr = ReadLE32(&p->VGMDataCurPos);
+			if (*TempPtr)
+				*TempPtr += CurPos;
+		}
+
+		ReadChipExtraData32(p, p->VGMHeadX.Chp2ClkOffset, &p->VGMH_Extra.Clocks);
+		ReadChipExtraData16(p, p->VGMHeadX.ChpVolOffset, &p->VGMH_Extra.Volumes);
+	}
+
+	// Read GD3 Tag
+	HdrLimit = ReadGD3Tag(hFile, p->VGMHead.lngGD3Offset, &p->VGMTag);
+	if (HdrLimit == 0x10)
+	{
+		p->VGMHead.lngGD3Offset = 0x00000000;
+		//return false;
+	}
+	if (! p->VGMHead.lngGD3Offset)
+	{
+		// replace all NULL pointers with empty strings
+		p->VGMTag.strTrackNameE = MakeEmptyWStr();
+		p->VGMTag.strTrackNameJ = MakeEmptyWStr();
+		p->VGMTag.strGameNameE = MakeEmptyWStr();
+		p->VGMTag.strGameNameJ = MakeEmptyWStr();
+		p->VGMTag.strSystemNameE = MakeEmptyWStr();
+		p->VGMTag.strSystemNameJ = MakeEmptyWStr();
+		p->VGMTag.strAuthorNameE = MakeEmptyWStr();
+		p->VGMTag.strAuthorNameJ = MakeEmptyWStr();
+		p->VGMTag.strReleaseDate = MakeEmptyWStr();
+		p->VGMTag.strCreator = MakeEmptyWStr();
+		p->VGMTag.strNotes = MakeEmptyWStr();
+	}
+
+	return true;
+}
+
+static void ReadVGMHeader(VGM_FILE* hFile, VGM_HEADER* RetVGMHead)
+{
+	VGM_HEADER CurHead;
+	UINT32 CurPos;
+	UINT32 HdrLimit;
+
+	hFile->Read(hFile, &CurHead, sizeof(VGM_HEADER));
+#ifdef VGM_BIG_ENDIAN
+	{
+		UINT8* TempPtr;
+
+		// Warning: Lots of pointer casting ahead!
+		for (CurPos = 0x00; CurPos < sizeof(VGM_HEADER); CurPos += 0x04)
+		{
+			TempPtr = (UINT8*)&CurHead + CurPos;
+			switch(CurPos)
+			{
+			case 0x28:
+				// 0x28	16-bit SN76496 Feedback Mask
+				// 0x2A	 8-bit SN76496 Shift Register Width
+				// 0x2B	 8-bit SN76496 Flags
+				*(UINT16*)TempPtr = ReadLE16(TempPtr);
+				break;
+			case 0x78:	// 78-7B 8-bit AY8910 Type/Flags
+			case 0x7C:	// 7C-7F 8-bit Volume/Loop Modifiers
+			case 0x94:	// 94-97 8-bit various flags
+				break;
+			default:
+				// everything else is 32-bit
+				*(UINT32*)TempPtr = ReadLE32(TempPtr);
+				break;
+			}
+		}
+	}
+#endif
+
+	// Header preperations
+	if (CurHead.lngVersion < 0x00000101)
+	{
+		CurHead.lngRate = 0;
+	}
+	if (CurHead.lngVersion < 0x00000110)
+	{
+		CurHead.shtPSG_Feedback = 0x0000;
+		CurHead.bytPSG_SRWidth = 0x00;
+		CurHead.lngHzYM2612 = CurHead.lngHzYM2413;
+		CurHead.lngHzYM2151 = CurHead.lngHzYM2413;
+	}
+	if (CurHead.lngVersion < 0x00000150)
+	{
+		CurHead.lngDataOffset = 0x00000000;
+	// If I would aim to be very strict, I would uncomment these few lines,
+	// but I sometimes use v1.51 Flags with v1.50 for better compatibility.
+	// (Some hyper-strict players refuse to play v1.51 files, even if there's
+	// no new chip used.)
+	//}
+	//if (CurHead.lngVersion < 0x00000151)
+	//{
+		CurHead.bytPSG_Flags = 0x00;
+		CurHead.lngHzSPCM = 0x0000;
+		CurHead.lngSPCMIntf = 0x00000000;
+		// all others are zeroed by memset
+	}
+
+	if (CurHead.lngHzPSG)
+	{
+		if (! CurHead.shtPSG_Feedback)
+			CurHead.shtPSG_Feedback = 0x0009;
+		if (! CurHead.bytPSG_SRWidth)
+			CurHead.bytPSG_SRWidth = 0x10;
+	}
+
+	// relative -> absolute addresses
+	if (CurHead.lngEOFOffset)
+		CurHead.lngEOFOffset += 0x00000004;
+	if (CurHead.lngGD3Offset)
+		CurHead.lngGD3Offset += 0x00000014;
+	if (CurHead.lngLoopOffset)
+		CurHead.lngLoopOffset += 0x0000001C;
+
+	if (CurHead.lngVersion < 0x00000150)
+		CurHead.lngDataOffset = 0x0000000C;
+	//if (CurHead.lngDataOffset < 0x0000000C)
+	//	CurHead.lngDataOffset = 0x0000000C;
+	if (CurHead.lngDataOffset)
+		CurHead.lngDataOffset += 0x00000034;
+
+	CurPos = CurHead.lngDataOffset;
+	// should actually check v1.51 (first real usage of DataOffset)
+	// v1.50 is checked to support things like the Volume Modifiers in v1.50 files
+	if (CurHead.lngVersion < 0x00000150 /*0x00000151*/)
+		CurPos = 0x40;
+	if (! CurPos)
+		CurPos = 0x40;
+	HdrLimit = sizeof(VGM_HEADER);
+	if (HdrLimit > CurPos)
+		memset((UINT8*)&CurHead + CurPos, 0x00, HdrLimit - CurPos);
+
+	if (! CurHead.bytLoopModifier)
+		CurHead.bytLoopModifier = 0x10;
+
+	if (CurHead.lngExtraOffset)
+	{
+		CurHead.lngExtraOffset += 0xBC;
+
+		CurPos = CurHead.lngExtraOffset;
+		if (CurPos < HdrLimit)
+			memset((UINT8*)&CurHead + CurPos, 0x00, HdrLimit - CurPos);
+	}
+
+	if (CurHead.lngGD3Offset >= CurHead.lngEOFOffset)
+		CurHead.lngGD3Offset = 0x00;
+	if (CurHead.lngLoopOffset >= CurHead.lngEOFOffset)
+		CurHead.lngLoopOffset = 0x00;
+	if (CurHead.lngDataOffset >= CurHead.lngEOFOffset)
+		CurHead.lngDataOffset = 0x40;
+	if (CurHead.lngExtraOffset >= CurHead.lngEOFOffset)
+		CurHead.lngExtraOffset = 0x00;
+
+	*RetVGMHead = CurHead;
+	return;
+}
+
+static UINT8 ReadGD3Tag(VGM_FILE* hFile, UINT32 GD3Offset, GD3_TAG* RetGD3Tag)
+{
+	UINT32 CurPos;
+	UINT32 TempLng;
+	UINT8 ResVal;
+
+	ResVal = 0x00;
+
+	// Read GD3 Tag
+	if (GD3Offset)
+	{
+		hFile->Seek(hFile, GD3Offset);
+		FILE_getLE32(hFile, &TempLng);
+		if (TempLng != FCC_GD3)
+		{
+			GD3Offset = 0x00000000;
+			ResVal = 0x10;	// invalid GD3 offset
+		}
+	}
+
+	if (RetGD3Tag == NULL)
+		return ResVal;
+
+	if (! GD3Offset)
+	{
+		RetGD3Tag->fccGD3 = 0x00000000;
+		RetGD3Tag->lngVersion = 0x00000000;
+		RetGD3Tag->lngTagLength = 0x00000000;
+		RetGD3Tag->strTrackNameE = NULL;
+		RetGD3Tag->strTrackNameJ = NULL;
+		RetGD3Tag->strGameNameE = NULL;
+		RetGD3Tag->strGameNameJ = NULL;
+		RetGD3Tag->strSystemNameE = NULL;
+		RetGD3Tag->strSystemNameJ = NULL;
+		RetGD3Tag->strAuthorNameE = NULL;
+		RetGD3Tag->strAuthorNameJ = NULL;
+		RetGD3Tag->strReleaseDate = NULL;
+		RetGD3Tag->strCreator = NULL;
+		RetGD3Tag->strNotes = NULL;
+	}
+	else
+	{
+		//CurPos = GD3Offset;
+		//hFile->Seek(hFile, CurPos, SEEK_SET);
+		//CurPos += FILE_getLE32(hFile, &RetGD3Tag->fccGD3);
+
+		CurPos = GD3Offset + 0x04;		// Save some back seeking, yay!
+		RetGD3Tag->fccGD3 = TempLng;	// (That costs lots of CPU in .gz files.)
+		CurPos += FILE_getLE32(hFile, &RetGD3Tag->lngVersion);
+		CurPos += FILE_getLE32(hFile, &RetGD3Tag->lngTagLength);
+
+		TempLng = CurPos + RetGD3Tag->lngTagLength;
+		RetGD3Tag->strTrackNameE =	ReadWStrFromFile(hFile, &CurPos, TempLng);
+		RetGD3Tag->strTrackNameJ =	ReadWStrFromFile(hFile, &CurPos, TempLng);
+		RetGD3Tag->strGameNameE =	ReadWStrFromFile(hFile, &CurPos, TempLng);
+		RetGD3Tag->strGameNameJ =	ReadWStrFromFile(hFile, &CurPos, TempLng);
+		RetGD3Tag->strSystemNameE =	ReadWStrFromFile(hFile, &CurPos, TempLng);
+		RetGD3Tag->strSystemNameJ =	ReadWStrFromFile(hFile, &CurPos, TempLng);
+		RetGD3Tag->strAuthorNameE =	ReadWStrFromFile(hFile, &CurPos, TempLng);
+		RetGD3Tag->strAuthorNameJ =	ReadWStrFromFile(hFile, &CurPos, TempLng);
+		RetGD3Tag->strReleaseDate =	ReadWStrFromFile(hFile, &CurPos, TempLng);
+		RetGD3Tag->strCreator =		ReadWStrFromFile(hFile, &CurPos, TempLng);
+		RetGD3Tag->strNotes =		ReadWStrFromFile(hFile, &CurPos, TempLng);
+	}
+
+	return ResVal;
+}
+
+static void ReadChipExtraData32(VGM_PLAYER* p, UINT32 StartOffset, VGMX_CHP_EXTRA32* ChpExtra)
+{
+	UINT32 CurPos;
+	UINT8 CurChp;
+	VGMX_CHIP_DATA32* TempCD;
+
+	if (! StartOffset || StartOffset >= p->VGMDataLen)
+	{
+		ChpExtra->ChipCnt = 0x00;
+		ChpExtra->CCData = NULL;
+		return;
+	}
+
+	CurPos = StartOffset;
+	ChpExtra->ChipCnt = p->VGMDataCurPos;
+	if (ChpExtra->ChipCnt)
+		ChpExtra->CCData = (VGMX_CHIP_DATA32*)malloc(sizeof(VGMX_CHIP_DATA32) *
+													ChpExtra->ChipCnt);
+	else
+		ChpExtra->CCData = NULL;
+	CurPos ++;
+
+	for (CurChp = 0x00; CurChp < ChpExtra->ChipCnt; CurChp ++)
+	{
+		TempCD = &ChpExtra->CCDataCurChp;
+		TempCD->Type = p->VGMDataCurPos + 0x00;
+		TempCD->Data = ReadLE32(&p->VGMDataCurPos + 0x01);
+		CurPos += 0x05;
+	}
+
+	return;
+}
+
+static void ReadChipExtraData16(VGM_PLAYER* p, UINT32 StartOffset, VGMX_CHP_EXTRA16* ChpExtra)
+{
+	UINT32 CurPos;
+	UINT8 CurChp;
+	VGMX_CHIP_DATA16* TempCD;
+
+	if (! StartOffset || StartOffset >= p->VGMDataLen)
+	{
+		ChpExtra->ChipCnt = 0x00;
+		ChpExtra->CCData = NULL;
+		return;
+	}
+
+	CurPos = StartOffset;
+	ChpExtra->ChipCnt = p->VGMDataCurPos;
+	if (ChpExtra->ChipCnt)
+		ChpExtra->CCData = (VGMX_CHIP_DATA16*)malloc(sizeof(VGMX_CHIP_DATA16) *
+													ChpExtra->ChipCnt);
+	else
+		ChpExtra->CCData = NULL;
+	CurPos ++;
+
+	for (CurChp = 0x00; CurChp < ChpExtra->ChipCnt; CurChp ++)
+	{
+		TempCD = &ChpExtra->CCDataCurChp;
+		TempCD->Type = p->VGMDataCurPos + 0x00;
+		TempCD->Flags = p->VGMDataCurPos + 0x01;
+		TempCD->Data = ReadLE16(&p->VGMDataCurPos + 0x02);
+		CurPos += 0x04;
+	}
+
+	return;
+}
+
+void CloseVGMFile(void *_p)
+{
+ VGM_PLAYER* p = (VGM_PLAYER*)_p;
+
+	if (p->FileMode == 0xFF)
+		return;
+
+	p->VGMHead.fccVGM = 0x00;
+	free(p->VGMH_Extra.Clocks.CCData);		p->VGMH_Extra.Clocks.CCData = NULL;
+	free(p->VGMH_Extra.Volumes.CCData);	p->VGMH_Extra.Volumes.CCData = NULL;
+	free(p->VGMData);	p->VGMData = NULL;
+
+	if (p->FileMode == 0x00)
+	FreeGD3Tag(&p->VGMTag);
+
+	p->FileMode = 0xFF;
+
+	return;
+}
+
+void FreeGD3Tag(GD3_TAG* TagData)
+{
+	if (TagData == NULL)
+		return;
+
+	TagData->fccGD3 = 0x00;
+	free(TagData->strTrackNameE);	TagData->strTrackNameE = NULL;
+	free(TagData->strTrackNameJ);	TagData->strTrackNameJ = NULL;
+	free(TagData->strGameNameE);	TagData->strGameNameE = NULL;
+	free(TagData->strGameNameJ);	TagData->strGameNameJ = NULL;
+	free(TagData->strSystemNameE);	TagData->strSystemNameE = NULL;
+	free(TagData->strSystemNameJ);	TagData->strSystemNameJ = NULL;
+	free(TagData->strAuthorNameE);	TagData->strAuthorNameE = NULL;
+	free(TagData->strAuthorNameJ);	TagData->strAuthorNameJ = NULL;
+	free(TagData->strReleaseDate);	TagData->strReleaseDate = NULL;
+	free(TagData->strCreator);		TagData->strCreator = NULL;
+	free(TagData->strNotes);		TagData->strNotes = NULL;
+
+	return;
+}
+
+static wchar_t* MakeEmptyWStr(void)
+{
+	wchar_t* Str;
+
+	Str = (wchar_t*)malloc(0x01 * sizeof(wchar_t));
+	Str0x00 = L'\0';
+
+	return Str;
+}
+
+static wchar_t* ReadWStrFromFile(VGM_FILE* hFile, UINT32* FilePos, UINT32 EOFPos)
+{
+	// Note: Works with Windows (16-bit wchar_t) as well as Linux (32-bit wchar_t)
+	UINT32 CurPos;
+	wchar_t* TextStr;
+	wchar_t* TempStr;
+	UINT32 StrLen;
+	UINT16 UnicodeChr;
+
+	CurPos = *FilePos;
+	if (CurPos >= EOFPos)
+		return NULL;
+	TextStr = (wchar_t*)malloc((EOFPos - CurPos) / 0x02 * sizeof(wchar_t));
+	if (TextStr == NULL)
+		return NULL;
+
+	if (hFile->Tell(hFile) != CurPos)
+		hFile->Seek(hFile, CurPos);
+	TempStr = TextStr - 1;
+	StrLen = 0x00;
+	do
+	{
+		TempStr ++;
+		FILE_getLE16(hFile, &UnicodeChr);
+		*TempStr = (wchar_t)UnicodeChr;
+		CurPos += 0x02;
+		StrLen ++;
+		if (CurPos >= EOFPos)
+		{
+			*TempStr = L'\0';
+			break;
+		}
+	} while(*TempStr != L'\0');
+
+	TextStr = (wchar_t*)realloc(TextStr, StrLen * sizeof(wchar_t));
+	*FilePos = CurPos;
+
+	return TextStr;
+}
+
+UINT32 GetVGMFileInfo(const char* FileName, VGM_HEADER* RetVGMHead, GD3_TAG* RetGD3Tag)
+{
+#ifdef NO_ZLIB
+	return 0;
+#else
+	gzFile hFile;
+	UINT32 FileSize;
+	UINT32 RetVal;
+
+	FileSize = GetGZFileLength(FileName);
+
+	hFile = gzopen(FileName, "rb");
+	if (hFile == NULL)
+		return 0x00;
+
+	VGM_FILE_gz vgmFile;
+
+	vgmFile.vf.Read = VGMF_gzread;
+	vgmFile.vf.Seek = VGMF_gzseek;
+	vgmFile.vf.GetSize = VGMF_gzgetsize;
+	vgmFile.hFile = hFile;
+	vgmFile.Size = FileSize;
+
+	RetVal = GetVGMFileInfo_Internal((VGM_FILE *)&vgmFile, FileSize, RetVGMHead, RetGD3Tag);
+
+	gzclose(hFile);
+	return RetVal;
+#endif
+}
+
+#ifndef NO_WCHAR_FILENAMES
+UINT32 GetVGMFileInfoW(const wchar_t* FileName, VGM_HEADER* RetVGMHead, GD3_TAG* RetGD3Tag)
+{
+#ifdef NO_ZLIB
+	return 0;
+#else
+	gzFile hFile;
+	UINT32 FileSize;
+	UINT32 RetVal;
+#if ZLIB_VERNUM < 0x1270
+	int fDesc;
+
+	FileSize = GetGZFileLengthW(FileName);
+
+	fDesc = _wopen(FileName, _O_RDONLY | _O_BINARY);
+	hFile = gzdopen(fDesc, "rb");
+	if (hFile == NULL)
+	{
+		_close(fDesc);
+		return 0x00;
+	}
+#else
+	FileSize = GetGZFileLengthW(FileName);
+
+	hFile = gzopen_w(FileName, "rb");
+	if (hFile == NULL)
+		return 0x00;
+#endif
+
+	VGM_FILE_gz vgmFile;
+
+	vgmFile.vf.Read = VGMF_gzread;
+	vgmFile.vf.Seek = VGMF_gzseek;
+	vgmFile.vf.GetSize = VGMF_gzgetsize;
+	vgmFile.hFile = hFile;
+	vgmFile.Size = FileSize;
+
+	RetVal = GetVGMFileInfo_Internal((VGM_FILE *)&vgmFile, FileSize, RetVGMHead, RetGD3Tag);
+
+	gzclose(hFile);
+	return RetVal;
+#endif
+}
+#endif
+
+UINT32 GetVGMFileInfo_Handle(VGM_FILE* hFile, VGM_HEADER* RetVGMHead, GD3_TAG* RetGD3Tag)
+{
+	UINT32 FileSize = hFile->GetSize(hFile);
+	return GetVGMFileInfo_Internal(hFile, FileSize, RetVGMHead, RetGD3Tag);
+}
+
+static UINT32 GetVGMFileInfo_Internal(VGM_FILE* hFile, UINT32 FileSize,
+									 VGM_HEADER* RetVGMHead, GD3_TAG* RetGD3Tag)
+{
+	// this is a copy-and-paste from OpenVGM, just a little stripped
+	UINT32 fccHeader;
+	UINT32 TempLng;
+	VGM_HEADER TempHead;
+
+	hFile->Seek(hFile, 0x00);
+	FILE_getLE32(hFile, &fccHeader);
+	if (fccHeader != FCC_VGM)
+		return 0x00;
+
+	if (RetVGMHead == NULL && RetGD3Tag == NULL)
+		return FileSize;
+
+	hFile->Seek(hFile, 0x00);
+	ReadVGMHeader(hFile, &TempHead);
+	if (TempHead.fccVGM != FCC_VGM)
+	{
+		printf("VGM signature matched on the first read, but not on the second one!\n");
+		printf("This is a known zlib bug where gzseek fails. Please install a fixed zlib.\n");
+		return 0x00;
+	}
+
+	if (! TempHead.lngEOFOffset || TempHead.lngEOFOffset > FileSize)
+		TempHead.lngEOFOffset = FileSize;
+	if (TempHead.lngDataOffset < 0x00000040)
+		TempHead.lngDataOffset = 0x00000040;
+
+	/*if (TempHead.lngGD3Offset)
+	{
+		gzseek(hFile, TempHead.lngGD3Offset, SEEK_SET);
+		gzgetLE32(hFile, &fccHeader);
+		if (fccHeader != FCC_GD3)
+			TempHead.lngGD3Offset = 0x00000000;
+			//return 0x00;
+	}*/
+
+	if (RetVGMHead != NULL)
+		*RetVGMHead = TempHead;
+
+	// Read GD3 Tag
+	if (RetGD3Tag != NULL)
+		TempLng = ReadGD3Tag(hFile, TempHead.lngGD3Offset, RetGD3Tag);
+
+	return FileSize;
+}
+
+INLINE UINT32 MulDivRound(UINT64 Number, UINT64 Numerator, UINT64 Denominator)
+{
+	return (UINT32)((Number * Numerator + Denominator / 2) / Denominator);
+}
+
+UINT32 CalcSampleMSec(void* _p, UINT64 Value, UINT8 Mode)
+{
+	// Mode:
+	//	Bit 0 (01):	Calculation Mode
+	//				0 - Sample2MSec
+	//				1 - MSec2Sample
+	//	Bit 1 (02):	Calculation Samlpe Rate
+	//				0 - current playback rate
+	//				1 - 44.1 KHz (VGM native)
+	UINT32 SmplRate;
+	UINT32 PbMul;
+	UINT32 PbDiv;
+	UINT32 RetVal;
+
+ VGM_PLAYER* p = (VGM_PLAYER *)_p;
+
+	if (! (Mode & 0x02))
+	{
+		SmplRate = p->SampleRate;
+		PbMul = 1;
+		PbDiv = 1;
+	}
+	else
+	{
+		SmplRate = p->VGMSampleRate;
+		PbMul = p->VGMPbRateMul;
+		PbDiv = p->VGMPbRateDiv;
+	}
+
+	switch(Mode & 0x01)
+	{
+	case 0x00:
+		RetVal = MulDivRound(Value, (UINT64)1000 * PbMul, (UINT64)SmplRate * PbDiv);
+		break;
+	case 0x01:
+		RetVal = MulDivRound(Value, (UINT64)SmplRate * PbDiv, (UINT64)1000 * PbMul);
+		break;
+	}
+
+	return RetVal;
+}
+
+UINT32 CalcSampleMSecExt(void *_p, UINT64 Value, UINT8 Mode, VGM_HEADER* FileHead)
+{
+	// Note: This function was NOT tested with non-VGM formats!
+
+	// Mode: see function above
+	UINT32 SmplRate;
+	UINT32 PbMul;
+	UINT32 PbDiv;
+	UINT32 RetVal;
+
+ VGM_PLAYER* p = (VGM_PLAYER *)_p;
+
+	if (! (Mode & 0x02))
+	{
+		SmplRate = p->SampleRate;
+		PbMul = 1;
+		PbDiv = 1;
+	}
+	else
+	{
+		// TODO: make it work for non-VGM formats
+		// (i.e. get VGMSampleRate information from FileHead)
+		//
+		// But currently GetVGMFileInfo doesn't support them, it doesn't matter either way
+		SmplRate = 44100;
+		if (! p->VGMPbRate || ! FileHead->lngRate)
+		{
+			PbMul = 1;
+			PbDiv = 1;
+		}
+		else
+		{
+			PbMul = FileHead->lngRate;
+			PbDiv = p->VGMPbRate;
+		}
+	}
+
+	switch(Mode & 0x01)
+	{
+	case 0x00:
+		RetVal = MulDivRound(Value, 1000 * PbMul, SmplRate * PbDiv);
+		break;
+	case 0x01:
+		RetVal = MulDivRound(Value, SmplRate * PbDiv, 1000 * PbMul);
+		break;
+	}
+
+	return RetVal;
+}
+
+/*static UINT32 EncryptChipName(void* DstBuf, const void* SrcBuf, UINT32 Length)
+{
+	// using nineko's awesome encryption algorithm
+	// http://forums.sonicretro.org/index.php?showtopic=25300
+	// based on C code by sasuke
+	const UINT8* SrcPos;
+	UINT8* DstPos;
+	UINT32 CurPos;
+	UINT8 CryptShift;	// Src Bit/Dst Byte
+	UINT8 PlainShift;	// Src Byte/Dst Bit
+
+	if (Length & 0x07)
+		return 0x00;	// Length MUST be a multiple of 8
+
+	SrcPos = (const UINT8*)SrcBuf;
+	DstPos = (UINT8*)DstBuf;
+	for (CurPos = 0; CurPos < Length; CurPos += 8, SrcPos += 8, DstPos += 8)
+	{
+		for (CryptShift = 0; CryptShift < 8; CryptShift ++)
+		{
+			DstPosCryptShift = 0x00;
+			for (PlainShift = 0; PlainShift < 8; PlainShift ++)
+			{
+				if (SrcPosPlainShift & (1 << CryptShift))
+					DstPosCryptShift |= (1 << PlainShift);
+			}
+		}
+	}
+
+	return Length;
+}*/
+
+const char* GetChipName(UINT8 ChipID)
+{
+	const char* CHIP_STRSCHIP_COUNT =
+	{	"SN76496", "YM2413", "YM2612", "YM2151", "SegaPCM", "RF5C68", "YM2203", "YM2608",
+		"YM2610", "YM3812", "YM3526", "Y8950", "YMF262", "YMF278B", "YMF271", "YMZ280B",
+		"RF5C164", "PWM", "AY8910", "GameBoy", "NES APU", "MultiPCM", "uPD7759", "OKIM6258",
+		"OKIM6295", "K051649", "K054539", "HuC6280", "C140", "K053260", "Pokey", "QSound",
+		"SCSP", "WSwan", "VSU", "SAA1099", "ES5503", "ES5506", "X1-010", "C352",
+		"GA20"};
+
+	/*if (ChipID == 0x21)
+	{
+		static char TempStr0x08;
+		UINT32 TempData2;
+
+		//EncryptChipName(TempData, "WSwan", 0x08);
+		TempData0 = 0x1015170F;
+		TempData1 = 0x001F1C07;
+		EncryptChipName(TempStr, TempData, 0x08);
+		return TempStr;	// "WSwan"
+	}*/
+
+	if (ChipID < CHIP_COUNT)
+		return CHIP_STRSChipID;
+	else
+		return NULL;
+}
+
+const char* GetAccurateChipName(UINT8 ChipID, UINT8 SubType)
+{
+	const char* RetStr;
+
+	if ((ChipID & 0x7F) >= CHIP_COUNT)
+		return NULL;
+
+	RetStr = NULL;
+	switch(ChipID & 0x7F)
+	{
+	case 0x00:
+		if (! (ChipID & 0x80))
+		{
+			switch(SubType)
+			{
+			case 0x01:
+				RetStr = "SN76489";
+				break;
+			case 0x02:
+				RetStr = "SN76489A";
+				break;
+			case 0x03:
+				RetStr = "SN76494";
+				break;
+			case 0x04:
+				RetStr = "SN76496";
+				break;
+			case 0x05:
+				RetStr = "SN94624";
+				break;
+			case 0x06:
+				RetStr = "NCR7496";
+				break;
+			case 0x07:
+				RetStr = "SEGA PSG";
+				break;
+			default:
+				RetStr = "SN76496";
+				break;
+			}
+		}
+		else
+		{
+			RetStr = "T6W28";
+		}
+		break;
+	case 0x01:
+		if (ChipID & 0x80)
+			RetStr = "VRC7";
+		break;
+	case 0x04:
+		RetStr = "Sega PCM";
+		break;
+	case 0x08:
+		if (! (ChipID & 0x80))
+			RetStr = "YM2610";
+		else
+			RetStr = "YM2610B";
+		break;
+	case 0x12:	// AY8910
+		switch(SubType)
+		{
+		case 0x00:
+			RetStr = "AY-3-8910";
+			break;
+		case 0x01:
+			RetStr = "AY-3-8912";
+			break;
+		case 0x02:
+			RetStr = "AY-3-8913";
+			break;
+		case 0x03:
+			RetStr = "AY8930";
+			break;
+		case 0x04:
+			RetStr = "AY-3-8914";
+			break;
+		case 0x10:
+			RetStr = "YM2149";
+			break;
+		case 0x11:
+			RetStr = "YM3439";
+			break;
+		case 0x12:
+			RetStr = "YMZ284";
+			break;
+		case 0x13:
+			RetStr = "YMZ294";
+			break;
+		}
+		break;
+	case 0x13:
+		RetStr = "GB DMG";
+		break;
+	case 0x14:
+		if (! (ChipID & 0x80))
+			RetStr = "NES APU";
+		else
+			RetStr = "NES APU + FDS";
+		break;
+	case 0x19:
+		if (! (ChipID & 0x80))
+			RetStr = "K051649";
+		else
+			RetStr = "K052539";
+		break;
+	case 0x1C:
+		switch(SubType)
+		{
+		case 0x00:
+		case 0x01:
+			RetStr = "C140";
+			break;
+		case 0x02:
+			RetStr = "C140 (219)";
+			break;
+		}
+		break;
+	case 0x21:
+		RetStr = "WonderSwan";
+		break;
+	case 0x22:
+		RetStr = "VSU-VUE";
+		break;
+	case 0x25:
+		if (! (ChipID & 0x80))
+			RetStr = "ES5505";
+		else
+			RetStr = "ES5506";
+		break;
+	case 0x28:
+		RetStr = "Irem GA20";
+		break;
+	}
+	// catch all default-cases
+	if (RetStr == NULL)
+		RetStr = GetChipName(ChipID & 0x7F);
+
+	return RetStr;
+}
+
+UINT32 GetChipClock(void* _p, UINT8 ChipID, UINT8* RetSubType)
+{
+	UINT32 Clock;
+	UINT8 SubType;
+	UINT8 CurChp;
+	bool AllowBit31;
+
+ VGM_PLAYER* p = (VGM_PLAYER *)_p;
+
+ VGM_HEADER* FileHead = &p->VGMHead;
+
+	SubType = 0x00;
+	AllowBit31 = 0x00;
+	switch(ChipID & 0x7F)
+	{
+	case 0x00:
+		Clock = FileHead->lngHzPSG;
+		AllowBit31 = 0x01;	// T6W28 Mode
+		if (RetSubType != NULL && ! (Clock & 0x80000000))	// The T6W28 is handles differently.
+		{
+			switch(FileHead->bytPSG_SRWidth)
+			{
+			case 0x0F:	// 0x4000
+				if (FileHead->bytPSG_Flags & 0x08)	// Clock Divider == 1?
+					SubType = 0x05;	// SN94624
+				else
+					SubType = 0x01;	// SN76489
+				break;
+			case 0x10:	// 0x8000
+				if (FileHead->shtPSG_Feedback == 0x0009)
+					SubType = 0x07;	// SEGA PSG
+				else if (FileHead->shtPSG_Feedback == 0x0022)
+					SubType = 0x06;	// NCR7496
+				break;
+			case 0x11:	// 0x10000
+				if (FileHead->bytPSG_Flags & 0x08)	// Clock Divider == 1?
+					SubType = 0x03;	// SN76494
+				else
+					SubType = 0x02;	// SN76489A/SN76496
+				break;
+			}
+			/*
+								 FbMask Noise Taps Negate Stereo Dv Freq0		Fb	SR	Flags
+				01 SN76489		 0x4000, 0x01, 0x02, TRUE, FALSE, 8, TRUE		03	0F	07 (02|04|00|01) unverified
+				02 SN76489A		0x10000, 0x04, 0x08, FALSE, FALSE, 8, TRUE		0C	11	05 (00|04|00|01)
+				03 SN76494		0x10000, 0x04, 0x08, FALSE, FALSE, 1, TRUE		0C	11	0D (00|04|08|01)
+				04 SN76496		0x10000, 0x04, 0x08, FALSE, FALSE, 8, TRUE		0C	11	05 (00|04|00|01) same as SN76489A
+				05 SN94624		 0x4000, 0x01, 0x02, TRUE, FALSE, 1, TRUE		03	0F	0F (02|04|08|01) unverified, SN76489A without /8
+				06 NCR7496		 0x8000, 0x02, 0x20, FALSE, FALSE, 8, TRUE		22	10	05 (00|04|00|01) unverified
+				07 GameGear PSG	 0x8000, 0x01, 0x08, TRUE, TRUE, 8, FALSE		09	10	02 (02|00|00|00)
+				07 SEGA VDP PSG	 0x8000, 0x01, 0x08, TRUE, FALSE, 8, FALSE		09	10	06 (02|04|00|00)
+				01 U8106		 0x4000, 0x01, 0x02, TRUE, FALSE, 8, TRUE		03	0F	07 (02|04|00|01) unverified, same as SN76489
+				02 Y2404		0x10000, 0x04, 0x08, FALSE, FALSE; 8, TRUE		0C	11	05 (00|04|00|01) unverified, same as SN76489A
+				-- T6W28		 0x4000, 0x01, 0x04, ????, FALSE, 8, ????		05	0F	?? (??|??|00|01) It IS stereo, but not in GameGear way.
+			*/
+		}
+		break;
+	case 0x01:
+		Clock = FileHead->lngHzYM2413;
+		AllowBit31 = 0x01;	// VRC7 Mode
+		break;
+	case 0x02:
+		Clock = FileHead->lngHzYM2612;
+		break;
+	case 0x03:
+		Clock = FileHead->lngHzYM2151;
+		break;
+	case 0x04:
+		Clock = FileHead->lngHzSPCM;
+		break;
+	case 0x05:
+		if (ChipID & 0x80)
+			return 0;
+		Clock = FileHead->lngHzRF5C68;
+		break;
+	case 0x06:
+		Clock = FileHead->lngHzYM2203;
+		break;
+	case 0x07:
+		Clock = FileHead->lngHzYM2608;
+		break;
+	case 0x08:
+		Clock = FileHead->lngHzYM2610;
+		AllowBit31 = 0x01;	// YM2610B Mode
+		break;
+	case 0x09:
+		Clock = FileHead->lngHzYM3812;
+		AllowBit31 = 0x01;	// Dual OPL2, panned to the L/R speakers
+		break;
+	case 0x0A:
+		Clock = FileHead->lngHzYM3526;
+		break;
+	case 0x0B:
+		Clock = FileHead->lngHzY8950;
+		break;
+	case 0x0C:
+		Clock = FileHead->lngHzYMF262;
+		break;
+	case 0x0D:
+		Clock = FileHead->lngHzYMF278B;
+		break;
+	case 0x0E:
+		Clock = FileHead->lngHzYMF271;
+		break;
+	case 0x0F:
+		Clock = FileHead->lngHzYMZ280B;
+		break;
+	case 0x10:
+		if (ChipID & 0x80)
+			return 0;
+		Clock = FileHead->lngHzRF5C164;
+		AllowBit31 = 0x01;	// hack for Cosmic Fantasy Stories
+		break;
+	case 0x11:
+		if (ChipID & 0x80)
+			return 0;
+		Clock = FileHead->lngHzPWM;
+		break;
+	case 0x12:
+		Clock = FileHead->lngHzAY8910;
+		SubType = FileHead->bytAYType;
+		break;
+	case 0x13:
+		Clock = FileHead->lngHzGBDMG;
+		break;
+	case 0x14:
+		Clock = FileHead->lngHzNESAPU;
+		AllowBit31 = 0x01;	// FDS Enable
+		break;
+	case 0x15:
+		Clock = FileHead->lngHzMultiPCM;
+		break;
+	case 0x16:
+		Clock = FileHead->lngHzUPD7759;
+		AllowBit31 = 0x01;	// Master/Slave Bit
+		break;
+	case 0x17:
+		Clock = FileHead->lngHzOKIM6258;
+		break;
+	case 0x18:
+		Clock = FileHead->lngHzOKIM6295;
+		AllowBit31 = 0x01;	// Pin 7 State
+		break;
+	case 0x19:
+		Clock = FileHead->lngHzK051649;
+		AllowBit31 = 0x01;	// SCC/SCC+ Bit
+		break;
+	case 0x1A:
+		Clock = FileHead->lngHzK054539;
+		break;
+	case 0x1B:
+		Clock = FileHead->lngHzHuC6280;
+		break;
+	case 0x1C:
+		Clock = FileHead->lngHzC140;
+		SubType = FileHead->bytC140Type;
+		break;
+	case 0x1D:
+		Clock = FileHead->lngHzK053260;
+		break;
+	case 0x1E:
+		Clock = FileHead->lngHzPokey;
+		break;
+	case 0x1F:
+		if (ChipID & 0x80)
+			return 0;
+		Clock = FileHead->lngHzQSound;
+		break;
+	case 0x20:
+		Clock = FileHead->lngHzSCSP;
+		break;
+	case 0x21:
+		Clock = FileHead->lngHzWSwan;
+		break;
+	case 0x22:
+		Clock = FileHead->lngHzVSU;
+		break;
+	case 0x23:
+		Clock = FileHead->lngHzSAA1099;
+		break;
+	case 0x24:
+		Clock = FileHead->lngHzES5503;
+		break;
+	case 0x25:
+		Clock = FileHead->lngHzES5506;
+		AllowBit31 = 0x01;	// ES5505/5506 switch
+		break;
+	case 0x26:
+		Clock = FileHead->lngHzX1_010;
+		break;
+	case 0x27:
+		Clock = FileHead->lngHzC352;
+		AllowBit31 = 0x01;	// disable rear channels
+		break;
+	case 0x28:
+		Clock = FileHead->lngHzGA20;
+		break;
+	default:
+		return 0;
+	}
+	if (ChipID & 0x80)
+	{
+		VGMX_CHP_EXTRA32* TempCX;
+
+		if (! (Clock & 0x40000000))
+			return 0;
+
+		ChipID &= 0x7F;
+		TempCX = &p->VGMH_Extra.Clocks;
+		for (CurChp = 0x00; CurChp < TempCX->ChipCnt; CurChp ++)
+		{
+			if (TempCX->CCDataCurChp.Type == ChipID)
+			{
+				if (TempCX->CCDataCurChp.Data)
+					Clock = TempCX->CCDataCurChp.Data;
+				break;
+			}
+		}
+	}
+
+	if (RetSubType != NULL)
+		*RetSubType = SubType;
+	if (AllowBit31)
+		return Clock & 0xBFFFFFFF;
+	else
+		return Clock & 0x3FFFFFFF;
+}
+
+static UINT16 GetChipVolume(VGM_PLAYER* p, UINT8 ChipID, UINT8 ChipNum, UINT8 ChipCnt)
+{
+	// ChipID: ID of Chip
+	//		Bit 7 - Is Paired Chip
+	// ChipNum: chip number (0 - first chip, 1 - second chip)
+	// ChipCnt: chip volume divider (number of used chips)
+	const UINT16 CHIP_VOLSCHIP_COUNT =
+	{	0x80, 0x200/*0x155*/, 0x100, 0x100, 0x180, 0xB0, 0x100, 0x80,	// 00-07
+		0x80, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x98,			// 08-0F
+		0x80, 0xE0/*0xCD*/, 0x100, 0xC0, 0x100, 0x40, 0x11E, 0x1C0,		// 10-17
+		0x100/*110*/, 0xA0, 0x100, 0x100, 0x100, 0xB3, 0x100, 0x100,	// 18-1F
+		0x20, 0x100, 0x100, 0x100, 0x40, 0x20, 0x100, 0x40,			// 20-27
+		0x280};
+	UINT16 Volume;
+	UINT8 CurChp;
+	VGMX_CHP_EXTRA16* TempCX;
+	VGMX_CHIP_DATA16* TempCD;
+
+ /*VGM_HEADER* FileHead = &p->VGMHead;*/
+
+	Volume = CHIP_VOLSChipID & 0x7F;
+	switch(ChipID)
+	{
+	case 0x00:	// SN76496
+		// if T6W28, set Volume Divider to 01
+		if (GetChipClock(p, (ChipID << 7) | ChipID, NULL) & 0x80000000)
+		{
+			// The T6W28 consists of 2 "half" chips.
+			ChipNum = 0x01;
+			ChipCnt = 0x01;
+		}
+		break;
+	case 0x18:	// OKIM6295
+		// CP System 1 patch
+		if (p->VGMTag.strSystemNameE != NULL && ! wcsncmp(p->VGMTag.strSystemNameE, L"CP", 0x02))
+			Volume = 110;
+		break;
+	case 0x86:	// YM2203's AY
+		Volume /= 2;
+		break;
+	case 0x87:	// YM2608's AY
+		// The YM2608 outputs twice as loud as the YM2203 here.
+		//Volume *= 1;
+		break;
+	case 0x88:	// YM2610's AY
+		//Volume *= 1;
+		break;
+	}
+	if (ChipCnt > 1)
+		Volume /= ChipCnt;
+
+	TempCX = &p->VGMH_Extra.Volumes;
+	TempCD = TempCX->CCData;
+	for (CurChp = 0x00; CurChp < TempCX->ChipCnt; CurChp ++, TempCD ++)
+	{
+		if (TempCD->Type == ChipID && (TempCD->Flags & 0x01) == ChipNum)
+		{
+			// Bit 15 - absolute/relative volume
+			//	0 - absolute
+			//	1 - relative (0x0100 = 1.0, 0x80 = 0.5, etc.)
+			if (TempCD->Data & 0x8000)
+				Volume = (Volume * (TempCD->Data & 0x7FFF) + 0x80) >> 8;
+			else
+			{
+				Volume = TempCD->Data;
+				if ((ChipID & 0x80) && p->DoubleSSGVol)
+					Volume *= 2;
+			}
+			break;
+		}
+	}
+
+	return Volume;
+}
+
+
+static void RestartPlaying(VGM_PLAYER* p)
+{
+	p->VGMPos = p->VGMHead.lngDataOffset;
+	p->VGMSmplPos = 0;
+	p->VGMSmplPlayed = 0;
+	p->VGMEnd = false;
+	p->EndPlay = false;
+	p->VGMCurLoop = 0x00;
+
+	Chips_GeneralActions(p, 0x01);	// Reset Chips
+	// also does Muting Mask (0x10) and Panning (0x20)
+
+	p->Last95Drum = 0xFFFF;
+	p->Last95Freq = 0;
+	p->ForceVGMExec = true;
+	p->IsVGMInit = true;
+	InterpretFile(p, 0);
+	p->IsVGMInit = false;
+	p->ForceVGMExec = false;
+
+	return;
+}
+
+static void Chips_GeneralActions(VGM_PLAYER* p, UINT8 Mode)
+{
+	UINT32 AbsVol;
+	//UINT16 ChipVol;
+	CAUD_ATTR* CAA;
+	CHIP_OPTS* COpt;
+	UINT8 ChipCnt;
+	UINT8 CurChip;
+	UINT8 CurCSet;	// Chip Set
+	UINT32 MaskVal;
+	UINT32 ChipClk;
+
+	switch(Mode)
+	{
+	case 0x00:	// Start Chips
+		for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+		{
+			CAA = (CAUD_ATTR*)&p->ChipAudioCurCSet;
+			for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++, CAA ++)
+			{
+				CAA->SmpRate = 0x00;
+				CAA->Volume = 0x00;
+				CAA->ChipType = 0xFF;
+				CAA->ChipID = CurCSet;
+				CAA->Resampler = 0x00;
+				CAA->StreamUpdate = &null_update;
+ CAA->StreamUpdateParam = NULL;
+				CAA->Paired = NULL;
+			}
+			CAA = p->CA_PairedCurCSet;
+			for (CurChip = 0x00; CurChip < 0x03; CurChip ++, CAA ++)
+			{
+				CAA->SmpRate = 0x00;
+				CAA->Volume = 0x00;
+				CAA->ChipType = 0xFF;
+				CAA->ChipID = CurCSet;
+				CAA->Resampler = 0x00;
+				CAA->StreamUpdate = &null_update;
+ CAA->StreamUpdateParam = NULL;
+				CAA->Paired = NULL;
+			}
+		}
+
+		// Initialize Sound Chips
+		AbsVol = 0x00;
+		if (p->VGMHead.lngHzPSG)
+		{
+			//ChipVol = UseFM ? 0x00 : 0x80;
+			p->ChipOpts0x01.SN76496.EmuCore = p->ChipOpts0x00.SN76496.EmuCore;
+
+			ChipCnt = (p->VGMHead.lngHzPSG & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.SN76496;
+				CAA->ChipType = 0x00;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				ChipClk &= ~0x80000000;
+				ChipClk |= p->VGMHead.lngHzPSG & ((CurChip & 0x01) << 31);
+ CAA->SmpRate = device_start_sn764xx(&p->sn764xxCurChip,
+ p->ChipOptsCurChip.SN76496.EmuCore, ChipClk, p->SampleRate,
+ p->VGMHead.bytPSG_SRWidth,
+ p->VGMHead.shtPSG_Feedback,
+ (p->VGMHead.bytPSG_Flags & 0x02) >> 1,
+ (p->VGMHead.bytPSG_Flags & 0x04) >> 2,
+ (p->VGMHead.bytPSG_Flags & 0x08) >> 3,
+ (p->VGMHead.bytPSG_Flags & 0x01) >> 0);
+ CAA->StreamUpdate = &sn764xx_stream_update;
+ CAA->StreamUpdateParam = p->sn764xxCurChip;
+
+ CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+ if (! CurChip || ! (ChipClk & 0x80000000))
+ AbsVol += CAA->Volume;
+			}
+			if (p->VGMHead.lngHzPSG & 0x80000000)
+				ChipCnt = 0x01;
+		}
+		if (p->VGMHead.lngHzYM2413)
+		{
+			//ChipVol = UseFM ? 0x00 : 0x200/*0x155*/;
+			p->ChipOpts0x01.YM2413.EmuCore = p->ChipOpts0x00.YM2413.EmuCore;
+
+			ChipCnt = (p->VGMHead.lngHzYM2413 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YM2413;
+				CAA->ChipType = 0x01;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+ CAA->SmpRate = device_start_ym2413(&p->ym2413CurChip, p->ChipOptsCurChip.YM2413.EmuCore, ChipClk, p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+ CAA->StreamUpdate = &ym2413_stream_update;
+ CAA->StreamUpdateParam = p->ym2413CurChip;
+
+ CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+ // WHY has this chip such a low volume???
+ //AbsVol += (CAA->Volume + 1) * 3 / 4;
+ AbsVol += CAA->Volume / 2;
+ }
+		}
+		if (p->VGMHead.lngHzYM2612)
+		{
+			//ChipVol = 0x100;
+			p->ChipOpts0x01.YM2612.EmuCore = p->ChipOpts0x00.YM2612.EmuCore;
+			p->ChipOpts0x01.YM2612.SpecialFlags = p->ChipOpts0x00.YM2612.SpecialFlags;
+
+			ChipCnt = (p->VGMHead.lngHzYM2612 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YM2612;
+				CAA->ChipType = 0x02;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_ym2612(&p->ym2612CurChip, p->ChipOptsCurChip.YM2612.EmuCore, p->ChipOptsCurChip.YM2612.SpecialFlags, ChipClk, p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE, &p->IsVGMInit);
+				CAA->StreamUpdate = &ym2612_stream_update;
+ CAA->StreamUpdateParam = p->ym2612CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzYM2151)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzYM2151 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YM2151;
+				CAA->ChipType = 0x03;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_ym2151(&p->ym2151CurChip, ChipClk, p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &ym2151_update;
+ CAA->StreamUpdateParam = p->ym2151CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzSPCM)
+		{
+			//ChipVol = 0x180;
+			ChipCnt = (p->VGMHead.lngHzSPCM & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.SegaPCM;
+				CAA->ChipType = 0x04;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_segapcm(&p->segapcmCurChip, ChipClk, p->VGMHead.lngSPCMIntf);
+				CAA->StreamUpdate = &SEGAPCM_update;
+ CAA->StreamUpdateParam = p->segapcmCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzRF5C68)
+		{
+			//ChipVol = 0xB0;	// that's right according to MAME, but it's almost too loud
+			ChipCnt = 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.RF5C68;
+				CAA->ChipType = 0x05;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_rf5c68(&p->rf5c68, ChipClk);
+				CAA->StreamUpdate = &rf5c68_update;
+ CAA->StreamUpdateParam = p->rf5c68;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzYM2203)
+		{
+			//ChipVol = 0x100;
+			p->ChipOpts0x01.YM2203.EmuCore = p->ChipOpts0x00.YM2203.EmuCore;
+			p->ChipOpts0x01.YM2203.SpecialFlags = p->ChipOpts0x00.YM2203.SpecialFlags;
+
+			ChipCnt = (p->VGMHead.lngHzYM2203 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YM2203;
+				COpt = &p->ChipOptsCurChip.YM2203;
+				CAA->ChipType = 0x06;
+				CAA->Paired = &p->CA_PairedCurChip0x00;
+				CAA->Paired->ChipType = 0x80 | CAA->ChipType;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+ CAA->SmpRate = device_start_ym2203(&p->ym2203CurChip, COpt->EmuCore,
+ ChipClk, COpt->SpecialFlags & 0x01,
+													p->VGMHead.bytAYFlagYM2203,
+													(int*) &CAA->Paired->SmpRate,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &ym2203_stream_update;
+ CAA->StreamUpdateParam = p->ym2203CurChip;
+				CAA->Paired->StreamUpdate = &ym2203_stream_update_ay;
+ CAA->Paired->StreamUpdateParam = p->ym2203CurChip;
+				ym2203_set_srchg_cb(p->ym2203CurChip, &ChangeChipSampleRate, CAA, CAA->Paired);
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				CAA->Paired->Volume = GetChipVolume(p, CAA->Paired->ChipType,
+													CurChip, ChipCnt);
+				AbsVol += CAA->Volume + CAA->Paired->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzYM2608)
+		{
+			//ChipVol = 0x80;
+			p->ChipOpts0x01.YM2608.EmuCore = p->ChipOpts0x00.YM2608.EmuCore;
+			p->ChipOpts0x01.YM2608.SpecialFlags = p->ChipOpts0x00.YM2608.SpecialFlags;
+
+			ChipCnt = (p->VGMHead.lngHzYM2608 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YM2608;
+				COpt = &p->ChipOptsCurChip.YM2608;
+				CAA->ChipType = 0x07;
+				CAA->Paired = &p->CA_PairedCurChip0x01;
+				CAA->Paired->ChipType = 0x80 | CAA->ChipType;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_ym2608(&p->ym2608CurChip, COpt->EmuCore,
+ ChipClk, COpt->SpecialFlags & 0x01,
+													p->VGMHead.bytAYFlagYM2608,
+													(int*) &CAA->Paired->SmpRate,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &ym2608_stream_update;
+ CAA->StreamUpdateParam = p->ym2608CurChip;
+				CAA->Paired->StreamUpdate = &ym2608_stream_update_ay;
+ CAA->Paired->StreamUpdateParam = p->ym2608CurChip;
+				ym2608_set_srchg_cb(p->ym2608CurChip, &ChangeChipSampleRate, CAA, CAA->Paired);
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				CAA->Paired->Volume = GetChipVolume(p, CAA->Paired->ChipType,
+													CurChip, ChipCnt);
+				AbsVol += CAA->Volume + CAA->Paired->Volume;
+				//CAA->Volume = ChipVol;
+				//CAA->Paired->Volume = ChipVol * 2;
+			}
+		}
+		if (p->VGMHead.lngHzYM2610)
+		{
+			//ChipVol = 0x80;
+			p->ChipOpts0x01.YM2610.EmuCore = p->ChipOpts0x00.YM2610.EmuCore;
+			p->ChipOpts0x01.YM2610.SpecialFlags = p->ChipOpts0x00.YM2610.SpecialFlags;
+
+			ChipCnt = (p->VGMHead.lngHzYM2610 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YM2610;
+				COpt = &p->ChipOptsCurChip.YM2610;
+				CAA->ChipType = 0x08;
+				CAA->Paired = &p->CA_PairedCurChip0x02;
+				CAA->Paired->ChipType = 0x80 | CAA->ChipType;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_ym2610(&p->ym2610CurChip, COpt->EmuCore,
+ ChipClk, COpt->SpecialFlags & 0x01,
+													(int*) &CAA->Paired->SmpRate,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = (ChipClk & 0x80000000) ? ym2610b_stream_update :
+															ym2610_stream_update;
+ CAA->StreamUpdateParam = p->ym2610CurChip;
+				CAA->Paired->StreamUpdate = &ym2610_stream_update_ay;
+ CAA->Paired->StreamUpdateParam = p->ym2610CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				CAA->Paired->Volume = GetChipVolume(p, CAA->Paired->ChipType,
+													CurChip, ChipCnt);
+				AbsVol += CAA->Volume + CAA->Paired->Volume;
+				//CAA->Volume = ChipVol;
+				//CAA->Paired->Volume = ChipVol * 2;
+			}
+		}
+		if (p->VGMHead.lngHzYM3812)
+		{
+			//ChipVol = UseFM ? 0x00 : 0x100;
+			p->ChipOpts0x01.YM3812.EmuCore = p->ChipOpts0x00.YM3812.EmuCore;
+
+			ChipCnt = (p->VGMHead.lngHzYM3812 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YM3812;
+				CAA->ChipType = 0x09;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+ CAA->SmpRate = device_start_ym3812(&p->ym3812CurChip,
+ p->ChipOptsCurChip.YM3812.EmuCore,
+ ChipClk,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+ if (ChipClk & 0x80000000)
+ {
+ struct dual_opl2_info * info = (struct dual_opl2_info *) malloc(sizeof(struct dual_opl2_info));
+
+ CAA->StreamUpdate = dual_opl2_stereo;
+ CAA->StreamUpdateParam = (void *) info;
+
+ info->chip = p->ym3812CurChip;
+ info->ChipID = CurChip;
+
+ p->ym3812_dual_dataCurChip = (void *) info;
+ }
+ else
+ {
+ CAA->StreamUpdate = ym3812_stream_update;
+ CAA->StreamUpdateParam = p->ym3812CurChip;
+										p->ym3812_dual_dataCurChip = NULL;
+ }
+
+ CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+ if (! CurChip || ! (ChipClk & 0x80000000))
+ AbsVol += CAA->Volume * 2;
+			}
+		}
+		if (p->VGMHead.lngHzYM3526)
+		{
+			//ChipVol = UseFM ? 0x00 : 0x100;
+			ChipCnt = (p->VGMHead.lngHzYM3526 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YM3526;
+				CAA->ChipType = 0x0A;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+ CAA->SmpRate = device_start_ym3526(&p->ym3526CurChip, ChipClk,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+ CAA->StreamUpdate = &ym3526_stream_update;
+ CAA->StreamUpdateParam = p->ym3526CurChip;
+
+ CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+ AbsVol += CAA->Volume * 2;
+			}
+		}
+		if (p->VGMHead.lngHzY8950)
+		{
+			//ChipVol = UseFM ? 0x00 : 0x100;
+			ChipCnt = (p->VGMHead.lngHzY8950 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.Y8950;
+				CAA->ChipType = 0x0B;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+ CAA->SmpRate = device_start_y8950(&p->y8950CurChip, ChipClk,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+ CAA->StreamUpdate = &y8950_stream_update;
+ CAA->StreamUpdateParam = p->y8950CurChip;
+
+ CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+ AbsVol += CAA->Volume * 2;
+			}
+		}
+		if (p->VGMHead.lngHzYMF262)
+		{
+			//ChipVol = UseFM ? 0x00 : 0x100;
+			p->ChipOpts0x01.YMF262.EmuCore = p->ChipOpts0x00.YMF262.EmuCore;
+
+			ChipCnt = (p->VGMHead.lngHzYMF262 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YMF262;
+				CAA->ChipType = 0x0C;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+ CAA->SmpRate = device_start_ymf262(&p->ymf262CurChip,
+ p->ChipOptsCurChip.YMF262.EmuCore,
+ ChipClk,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+ CAA->StreamUpdate = &ymf262_stream_update;
+ CAA->StreamUpdateParam = p->ymf262CurChip;
+
+ CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+ AbsVol += CAA->Volume * 2;
+			}
+		}
+		if (p->VGMHead.lngHzYMF278B)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzYMF278B & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YMF278B;
+				CAA->ChipType = 0x0D;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_ymf278b(&p->ymf278bCurChip, ChipClk);
+				CAA->StreamUpdate = &ymf278b_pcm_update;
+ CAA->StreamUpdateParam = p->ymf278bCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;	//good as long as it only uses WaveTable Synth
+			}
+		}
+		if (p->VGMHead.lngHzYMF271)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzYMF271 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YMF271;
+				CAA->ChipType = 0x0E;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_ymf271(&p->ymf271CurChip, ChipClk);
+				CAA->StreamUpdate = &ymf271_update;
+				CAA->StreamUpdateParam = p->ymf271CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzYMZ280B)
+		{
+			//ChipVol = 0x98;
+			ChipCnt = (p->VGMHead.lngHzYMZ280B & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.YMZ280B;
+				CAA->ChipType = 0x0F;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_ymz280b(&p->ymz280bCurChip, ChipClk);
+				CAA->StreamUpdate = &ymz280b_update;
+ CAA->StreamUpdateParam = p->ymz280bCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += (CAA->Volume * 0x20 / 0x13);
+			}
+		}
+		if (p->VGMHead.lngHzRF5C164)
+		{
+			//ChipVol = 0x80;
+			ChipCnt = 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.RF5C164;
+				CAA->ChipType = 0x10;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_rf5c164(&p->rf5c164, ChipClk,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &rf5c164_update;
+ CAA->StreamUpdateParam = p->rf5c164;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume * 2;
+			}
+		}
+		if (p->VGMHead.lngHzPWM)
+		{
+			//ChipVol = 0xE0;	// 0xCD
+			ChipCnt = 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.PWM;
+				CAA->ChipType = 0x11;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_pwm(&p->pwm, ChipClk, p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &pwm_update;
+ CAA->StreamUpdateParam = p->pwm;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzAY8910)
+		{
+			//ChipVol = 0x100;
+			p->ChipOpts0x01.AY8910.EmuCore = p->ChipOpts0x00.AY8910.EmuCore;
+
+			ChipCnt = (p->VGMHead.lngHzAY8910 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.AY8910;
+				CAA->ChipType = 0x12;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+ CAA->SmpRate = device_start_ayxx(&p->ay8910CurChip,
+ p->ChipOptsCurChip.AY8910.EmuCore,
+ ChipClk, p->VGMHead.bytAYType, p->VGMHead.bytAYFlag,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+ CAA->StreamUpdate = &ayxx_stream_update;
+ CAA->StreamUpdateParam = p->ay8910CurChip;
+
+ CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+ AbsVol += CAA->Volume * 2;
+			}
+		}
+		if (p->VGMHead.lngHzGBDMG)
+		{
+			//ChipVol = 0xC0;
+			p->ChipOpts0x01.GameBoy.SpecialFlags = p->ChipOpts0x00.GameBoy.SpecialFlags;
+
+			ChipCnt = (p->VGMHead.lngHzGBDMG & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.GameBoy;
+				CAA->ChipType = 0x13;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_gameboy_sound(&p->gbdmgCurChip, ChipClk,
+ p->ChipOptsCurChip.GameBoy.SpecialFlags,
+ p->SampleRate);
+				CAA->StreamUpdate = &gameboy_update;
+ CAA->StreamUpdateParam = p->gbdmgCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume * 2;
+			}
+		}
+		if (p->VGMHead.lngHzNESAPU)
+		{
+			//ChipVol = 0x100;
+			p->ChipOpts0x01.NES.EmuCore = p->ChipOpts0x00.NES.EmuCore;
+			p->ChipOpts0x01.NES.SpecialFlags = p->ChipOpts0x00.NES.SpecialFlags;
+
+			ChipCnt = (p->VGMHead.lngHzNESAPU & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.NES;
+ COpt = &p->ChipOptsCurChip.NES;
+				CAA->ChipType = 0x14;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_nes(&p->nesapuCurChip, COpt->EmuCore,
+ ChipClk, COpt->SpecialFlags,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &nes_stream_update;
+ CAA->StreamUpdateParam = p->nesapuCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume * 2;
+			}
+		}
+		if (p->VGMHead.lngHzMultiPCM)
+		{
+			//ChipVol = 0x40;
+			ChipCnt = (p->VGMHead.lngHzMultiPCM & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.MultiPCM;
+				CAA->ChipType = 0x15;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_multipcm(&p->multipcmCurChip, ChipClk);
+				CAA->StreamUpdate = &MultiPCM_update;
+ CAA->StreamUpdateParam = p->multipcmCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume * 4;
+			}
+		}
+		if (p->VGMHead.lngHzUPD7759)
+		{
+			//ChipVol = 0x11E;
+			ChipCnt = (p->VGMHead.lngHzUPD7759 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.UPD7759;
+				CAA->ChipType = 0x16;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_upd7759(&p->upd7759CurChip, ChipClk);
+				CAA->StreamUpdate = &upd7759_update;
+ CAA->StreamUpdateParam = p->upd7759CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzOKIM6258)
+		{
+			//ChipVol = 0x1C0;
+			p->ChipOpts0x01.OKIM6258.SpecialFlags = p->ChipOpts0x00.OKIM6258.SpecialFlags;
+
+			ChipCnt = (p->VGMHead.lngHzOKIM6258 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.OKIM6258;
+				CAA->ChipType = 0x17;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_okim6258(&p->okim6258CurChip, ChipClk,
+ p->ChipOptsCurChip.OKIM6258.SpecialFlags,
+													(p->VGMHead.bytOKI6258Flags & 0x03) >> 0,
+													(p->VGMHead.bytOKI6258Flags & 0x04) >> 2,
+													(p->VGMHead.bytOKI6258Flags & 0x08) >> 3);
+				CAA->StreamUpdate = &okim6258_update;
+ CAA->StreamUpdateParam = p->okim6258CurChip;
+				okim6258_set_srchg_cb(p->okim6258CurChip, &ChangeChipSampleRate, CAA);
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume * 2;
+			}
+		}
+		if (p->VGMHead.lngHzOKIM6295)
+		{
+			/*// Use the System Tag to decide between normal and CP System volume level.
+			// I know, this is very hackish, but ATM there's no better solution.
+			if (VGMTag.strSystemNameE != NULL && ! wcsncmp(VGMTag.strSystemNameE, L"CP", 0x02))
+				ChipVol = 110;
+			else
+				ChipVol = 0x100;*/
+			ChipCnt = (p->VGMHead.lngHzOKIM6295 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.OKIM6295;
+				CAA->ChipType = 0x18;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_okim6295(&p->okim6295CurChip, ChipClk);
+				CAA->StreamUpdate = &okim6295_update;
+ CAA->StreamUpdateParam = p->okim6295CurChip;
+				okim6295_set_srchg_cb(p->okim6295CurChip, &ChangeChipSampleRate, CAA);
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume * 2;
+			}
+		}
+		if (p->VGMHead.lngHzK051649)
+		{
+			//ChipVol = 0xA0;
+			ChipCnt = (p->VGMHead.lngHzK051649 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.K051649;
+				CAA->ChipType = 0x19;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_k051649(&p->k051649CurChip, ChipClk);
+				CAA->StreamUpdate = &k051649_update;
+ CAA->StreamUpdateParam = p->k051649CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzK054539)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzK054539 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.K054539;
+				CAA->ChipType = 0x1A;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_k054539(&p->k054539CurChip, ChipClk);
+				CAA->StreamUpdate = &k054539_update;
+ CAA->StreamUpdateParam = p->k054539CurChip;
+				k054539_init_flags(p->k054539CurChip, p->VGMHead.bytK054539Flags);
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzHuC6280)
+		{
+			//ChipVol = 0x100;
+			p->ChipOpts0x01.HuC6280.EmuCore = p->ChipOpts0x00.HuC6280.EmuCore;
+
+			ChipCnt = (p->VGMHead.lngHzHuC6280 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.HuC6280;
+				CAA->ChipType = 0x1B;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_c6280(&p->huc6280CurChip,
+ p->ChipOptsCurChip.HuC6280.EmuCore,
+ ChipClk, p->SampleRate,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &c6280_update;
+ CAA->StreamUpdateParam = p->huc6280CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzC140)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzC140 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.C140;
+				CAA->ChipType = 0x1C;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_c140(&p->c140CurChip, ChipClk, p->VGMHead.bytC140Type,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &c140_update;
+ CAA->StreamUpdateParam = p->c140CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzK053260)
+		{
+			//ChipVol = 0xB3;
+			ChipCnt = (p->VGMHead.lngHzK053260 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.K053260;
+				CAA->ChipType = 0x1D;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_k053260(&p->k053260CurChip, ChipClk);
+				CAA->StreamUpdate = &k053260_update;
+ CAA->StreamUpdateParam = p->k053260CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzPokey)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzPokey & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.Pokey;
+				CAA->ChipType = 0x1E;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_pokey(&p->pokeyCurChip, ChipClk);
+				CAA->StreamUpdate = &pokey_update;
+ CAA->StreamUpdateParam = p->pokeyCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzQSound)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzQSound & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.QSound;
+				CAA->ChipType = 0x1F;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_qsound(&p->qsoundCurChip, ChipClk);
+				CAA->StreamUpdate = &qsound_update;
+ CAA->StreamUpdateParam = p->qsoundCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzSCSP)
+		{
+			p->ChipOpts0x01.SCSP.SpecialFlags = p->ChipOpts0x00.SCSP.SpecialFlags;
+
+			//ChipVol = 0x20;
+			ChipCnt = (p->VGMHead.lngHzSCSP & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.SCSP;
+				CAA->ChipType = 0x20;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_scsp(&p->scspCurChip, ChipClk, p->ChipOptsCurChip.SCSP.SpecialFlags);
+				CAA->StreamUpdate = &SCSP_Update;
+ CAA->StreamUpdateParam = p->scspCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume * 8;
+			}
+		}
+		if (p->VGMHead.lngHzWSwan)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzWSwan & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.WSwan;
+				CAA->ChipType = 0x21;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = ws_audio_init(&p->wswanCurChip, ChipClk, p->SampleRate,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &ws_audio_update;
+ CAA->StreamUpdateParam = p->wswanCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzVSU)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzVSU & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.VSU;
+				CAA->ChipType = 0x22;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_vsu(&p->vsuCurChip, ChipClk, p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &vsu_stream_update;
+ CAA->StreamUpdateParam = p->vsuCurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzSAA1099)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzSAA1099 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.SAA1099;
+				CAA->ChipType = 0x23;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_saa1099(&p->saa1099CurChip, ChipClk);
+				CAA->StreamUpdate = &saa1099_update;
+ CAA->StreamUpdateParam = p->saa1099CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzES5503)
+		{
+			//ChipVol = 0x40;
+			ChipCnt = (p->VGMHead.lngHzES5503 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.ES5503;
+				CAA->ChipType = 0x24;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_es5503(&p->es5503CurChip, ChipClk, p->VGMHead.bytES5503Chns);
+				CAA->StreamUpdate = &es5503_pcm_update;
+ CAA->StreamUpdateParam = p->es5503CurChip;
+				es5503_set_srchg_cb(p->es5503CurChip, &ChangeChipSampleRate, CAA);
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume * 8;
+			}
+		}
+		if (p->VGMHead.lngHzES5506)
+		{
+			//ChipVol = 0x20;
+			ChipCnt = (p->VGMHead.lngHzES5506 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.ES5506;
+				CAA->ChipType = 0x25;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_es5506(&p->es550xCurChip, ChipClk, p->VGMHead.bytES5506Chns);
+				CAA->StreamUpdate = &es5506_update;
+ CAA->StreamUpdateParam = p->es550xCurChip;
+				es5506_set_srchg_cb(p->es550xCurChip, &ChangeChipSampleRate, CAA);
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume * 16;
+			}
+		}
+		if (p->VGMHead.lngHzX1_010)
+		{
+			//ChipVol = 0x100;
+			ChipCnt = (p->VGMHead.lngHzX1_010 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.X1_010;
+				CAA->ChipType = 0x26;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_x1_010(&p->x1_010CurChip, ChipClk,
+ p->CHIP_SAMPLING_MODE, p->CHIP_SAMPLE_RATE);
+				CAA->StreamUpdate = &seta_update;
+ CAA->StreamUpdateParam = p->x1_010CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+		if (p->VGMHead.lngHzC352)
+		{
+			//ChipVol = 0x40;
+			ChipCnt = (p->VGMHead.lngHzC352 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.C352;
+				CAA->ChipType = 0x27;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_c352(&p->c352CurChip, ChipClk, p->VGMHead.bytC352ClkDiv * 4);
+				CAA->StreamUpdate = &c352_update;
+ CAA->StreamUpdateParam = p->c352CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume * 8;
+			}
+		}
+		if (p->VGMHead.lngHzGA20)
+		{
+			//ChipVol = 0x280;
+			ChipCnt = (p->VGMHead.lngHzGA20 & 0x40000000) ? 0x02 : 0x01;
+			for (CurChip = 0x00; CurChip < ChipCnt; CurChip ++)
+			{
+				CAA = &p->ChipAudioCurChip.GA20;
+				CAA->ChipType = 0x28;
+
+				ChipClk = GetChipClock(p, (CurChip << 7) | CAA->ChipType, NULL);
+				CAA->SmpRate = device_start_iremga20(&p->ga20CurChip, ChipClk);
+				CAA->StreamUpdate = &IremGA20_update;
+ CAA->StreamUpdateParam = p->ga20CurChip;
+
+				CAA->Volume = GetChipVolume(p, CAA->ChipType, CurChip, ChipCnt);
+				AbsVol += CAA->Volume;
+			}
+		}
+
+		// Initialize DAC Control and PCM Bank
+		p->DacCtrlUsed = 0x00;
+		//memset(DacCtrlUsg, 0x00, 0x01 * 0xFF);
+		for (CurChip = 0x00; CurChip < 0xFF; CurChip ++)
+		{
+			p->DacCtrlCurChip.Enable = false;
+		}
+		//memset(p->DacCtrl, 0x00, sizeof(DACCTRL_DATA) * 0xFF);
+
+		memset(p->PCMBank, 0x00, sizeof(VGM_PCM_BANK) * PCM_BANK_COUNT);
+		memset(&p->PCMTbl, 0x00, sizeof(PCMBANK_TBL));
+
+		// Reset chips
+		Chips_GeneralActions(p, 0x01);
+
+		while(AbsVol < 0x200 && AbsVol)
+		{
+			for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+			{
+				CAA = (CAUD_ATTR*)&p->ChipAudioCurCSet;
+				for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++, CAA ++)
+					CAA->Volume *= 2;
+				CAA = p->CA_PairedCurCSet;
+				for (CurChip = 0x00; CurChip < 0x03; CurChip ++, CAA ++)
+					CAA->Volume *= 2;
+			}
+			AbsVol *= 2;
+		}
+		while(AbsVol > 0x300)
+		{
+			for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+			{
+				CAA = (CAUD_ATTR*)&p->ChipAudioCurCSet;
+				for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++, CAA ++)
+					CAA->Volume /= 2;
+				CAA = p->CA_PairedCurCSet;
+				for (CurChip = 0x00; CurChip < 0x03; CurChip ++, CAA ++)
+					CAA->Volume /= 2;
+			}
+			AbsVol /= 2;
+		}
+
+		// Initialize Resampler
+		for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+		{
+			CAA = (CAUD_ATTR*)&p->ChipAudioCurCSet;
+			for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++, CAA ++)
+				SetupResampler(p, CAA);
+
+			CAA = p->CA_PairedCurCSet;
+			for (CurChip = 0x00; CurChip < 0x03; CurChip ++, CAA ++)
+				SetupResampler(p, CAA);
+		}
+
+		GeneralChipLists(p);
+		break;
+	case 0x01:	// Reset chips
+		for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+		{
+
+		CAA = (CAUD_ATTR*)&p->ChipAudioCurCSet;
+		for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++, CAA ++)
+		{
+			if (CAA->ChipType == 0xFF)	// chip unused
+				continue;
+			else if (CAA->ChipType == 0x00)
+				device_reset_sn764xx(p->sn764xxCurCSet);
+			else if (CAA->ChipType == 0x01)
+				device_reset_ym2413(p->ym2413CurCSet);
+			else if (CAA->ChipType == 0x02)
+				device_reset_ym2612(p->ym2612CurCSet);
+			else if (CAA->ChipType == 0x03)
+				device_reset_ym2151(p->ym2151CurCSet);
+			else if (CAA->ChipType == 0x04)
+				device_reset_segapcm(p->segapcmCurCSet);
+			else if (CAA->ChipType == 0x05 && CurCSet == 0x00)
+				device_reset_rf5c68(p->rf5c68);
+			else if (CAA->ChipType == 0x06)
+				device_reset_ym2203(p->ym2203CurCSet);
+			else if (CAA->ChipType == 0x07)
+				device_reset_ym2608(p->ym2608CurCSet);
+			else if (CAA->ChipType == 0x08)
+				device_reset_ym2610(p->ym2610CurCSet);
+			else if (CAA->ChipType == 0x09)
+ device_reset_ym3812(p->ym3812CurCSet);
+			else if (CAA->ChipType == 0x0A)
+				device_reset_ym3526(p->ym3526CurCSet);
+			else if (CAA->ChipType == 0x0B)
+				device_reset_y8950(p->y8950CurCSet);
+			else if (CAA->ChipType == 0x0C)
+ device_reset_ymf262(p->ymf262CurCSet);
+			else if (CAA->ChipType == 0x0D)
+				device_reset_ymf278b(p->ymf278bCurCSet);
+			else if (CAA->ChipType == 0x0E)
+				device_reset_ymf271(p->ymf271CurCSet);
+			else if (CAA->ChipType == 0x0F)
+				device_reset_ymz280b(p->ymz280bCurCSet);
+			else if (CAA->ChipType == 0x10 && CurCSet == 0x00)
+				device_reset_rf5c164(p->rf5c164);
+			else if (CAA->ChipType == 0x11 && CurCSet == 0x00)
+				device_reset_pwm(p->pwm);
+			else if (CAA->ChipType == 0x12)
+				device_reset_ayxx(p->ay8910CurCSet);
+			else if (CAA->ChipType == 0x13)
+				device_reset_gameboy_sound(p->gbdmgCurCSet);
+			else if (CAA->ChipType == 0x14)
+				device_reset_nes(p->nesapuCurCSet);
+			else if (CAA->ChipType == 0x15)
+				device_reset_multipcm(p->multipcmCurCSet);
+			else if (CAA->ChipType == 0x16)
+				device_reset_upd7759(p->upd7759CurCSet);
+			else if (CAA->ChipType == 0x17)
+				device_reset_okim6258(p->okim6258CurCSet);
+			else if (CAA->ChipType == 0x18)
+				device_reset_okim6295(p->okim6295CurCSet);
+			else if (CAA->ChipType == 0x19)
+				device_reset_k051649(p->k051649CurCSet);
+			else if (CAA->ChipType == 0x1A)
+				device_reset_k054539(p->k054539CurCSet);
+			else if (CAA->ChipType == 0x1B)
+				device_reset_c6280(p->huc6280CurCSet);
+			else if (CAA->ChipType == 0x1C)
+				device_reset_c140(p->c140CurCSet);
+			else if (CAA->ChipType == 0x1D)
+				device_reset_k053260(p->k053260CurCSet);
+			else if (CAA->ChipType == 0x1E)
+				device_reset_pokey(p->pokeyCurCSet);
+			else if (CAA->ChipType == 0x1F)
+				device_reset_qsound(p->qsoundCurCSet);
+			else if (CAA->ChipType == 0x20)
+				device_reset_scsp(p->scspCurCSet);
+			else if (CAA->ChipType == 0x21)
+				ws_audio_reset(p->wswanCurCSet);
+			else if (CAA->ChipType == 0x22)
+				device_reset_vsu(p->vsuCurCSet);
+			else if (CAA->ChipType == 0x23)
+				device_reset_saa1099(p->saa1099CurCSet);
+			else if (CAA->ChipType == 0x24)
+				device_reset_es5503(p->es5503CurCSet);
+			else if (CAA->ChipType == 0x25)
+				device_reset_es5506(p->es550xCurCSet);
+			else if (CAA->ChipType == 0x26)
+				device_reset_x1_010(p->x1_010CurCSet);
+			else if (CAA->ChipType == 0x27)
+				device_reset_c352(p->c352CurCSet);
+			else if (CAA->ChipType == 0x28)
+				device_reset_iremga20(p->ga20CurCSet);
+		}	// end for CurChip
+
+		}	// end for CurCSet
+
+		Chips_GeneralActions(p, 0x10);	// set muting mask
+		Chips_GeneralActions(p, 0x20);	// set panning
+
+		for (CurChip = 0x00; CurChip < p->DacCtrlUsed; CurChip ++)
+		{
+			CurCSet = p->DacCtrlUsgCurChip;
+			device_reset_daccontrol(p->daccontrolCurCSet);
+			//DacCtrlCurCSet.Enable = false;
+		}
+		//DacCtrlUsed = 0x00;
+		//memset(DacCtrlUsg, 0x00, 0x01 * 0xFF);
+
+		for (CurChip = 0x00; CurChip < PCM_BANK_COUNT; CurChip ++)
+		{
+			// reset PCM Bank, but not the data
+			// (this way I don't need to decompress the data again when restarting)
+			p->PCMBankCurChip.DataPos = 0x00000000;
+			p->PCMBankCurChip.BnkPos = 0x00000000;
+		}
+		p->PCMTbl.EntryCount = 0x00;
+		break;
+	case 0x02:	// Stop chips
+		for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+		{
+
+		CAA = (CAUD_ATTR*)&p->ChipAudioCurCSet;
+		for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++, CAA ++)
+		{
+			if (CAA->ChipType == 0xFF)	// chip unused
+				continue;
+			else if (CAA->ChipType == 0x00)
+				device_stop_sn764xx(p->sn764xxCurCSet);
+			else if (CAA->ChipType == 0x01)
+				device_stop_ym2413(p->ym2413CurCSet);
+			else if (CAA->ChipType == 0x02)
+				device_stop_ym2612(p->ym2612CurCSet);
+			else if (CAA->ChipType == 0x03)
+				device_stop_ym2151(p->ym2151CurCSet);
+			else if (CAA->ChipType == 0x04)
+				device_stop_segapcm(p->segapcmCurCSet);
+			else if (CAA->ChipType == 0x05 && CurCSet == 0x00)
+				device_stop_rf5c68(p->rf5c68);
+			else if (CAA->ChipType == 0x06)
+				device_stop_ym2203(p->ym2203CurCSet);
+			else if (CAA->ChipType == 0x07)
+				device_stop_ym2608(p->ym2608CurCSet);
+			else if (CAA->ChipType == 0x08)
+				device_stop_ym2610(p->ym2610CurCSet);
+			else if (CAA->ChipType == 0x09)
+			{
+				device_stop_ym3812(p->ym3812CurCSet);
+				free(p->ym3812_dual_dataCurCSet);
+				p->ym3812_dual_dataCurCSet = NULL;
+			}
+			else if (CAA->ChipType == 0x0A)
+				device_stop_ym3526(p->ym3526CurCSet);
+			else if (CAA->ChipType == 0x0B)
+				device_stop_y8950(p->y8950CurCSet);
+			else if (CAA->ChipType == 0x0C)
+				device_stop_ymf262(p->ymf262CurCSet);
+			else if (CAA->ChipType == 0x0D)
+				device_stop_ymf278b(p->ymf278bCurCSet);
+			else if (CAA->ChipType == 0x0E)
+				device_stop_ymf271(p->ymf271CurCSet);
+			else if (CAA->ChipType == 0x0F)
+				device_stop_ymz280b(p->ymz280bCurCSet);
+			else if (CAA->ChipType == 0x10 && CurCSet == 0x00)
+				device_stop_rf5c164(p->rf5c164);
+			else if (CAA->ChipType == 0x11 && CurCSet == 0x00)
+				device_stop_pwm(p->pwm);
+			else if (CAA->ChipType == 0x12)
+				device_stop_ayxx(p->ay8910CurCSet);
+			else if (CAA->ChipType == 0x13)
+				device_stop_gameboy_sound(p->gbdmgCurCSet);
+			else if (CAA->ChipType == 0x14)
+				device_stop_nes(p->nesapuCurCSet);
+			else if (CAA->ChipType == 0x15)
+				device_stop_multipcm(p->multipcmCurCSet);
+			else if (CAA->ChipType == 0x16)
+				device_stop_upd7759(p->upd7759CurCSet);
+			else if (CAA->ChipType == 0x17)
+				device_stop_okim6258(p->okim6258CurCSet);
+			else if (CAA->ChipType == 0x18)
+				device_stop_okim6295(p->okim6295CurCSet);
+			else if (CAA->ChipType == 0x19)
+				device_stop_k051649(p->k051649CurCSet);
+			else if (CAA->ChipType == 0x1A)
+				device_stop_k054539(p->k054539CurCSet);
+			else if (CAA->ChipType == 0x1B)
+				device_stop_c6280(p->huc6280CurCSet);
+			else if (CAA->ChipType == 0x1C)
+				device_stop_c140(p->c140CurCSet);
+			else if (CAA->ChipType == 0x1D)
+				device_stop_k053260(p->k053260CurCSet);
+			else if (CAA->ChipType == 0x1E)
+				device_stop_pokey(p->pokeyCurCSet);
+			else if (CAA->ChipType == 0x1F)
+				device_stop_qsound(p->qsoundCurCSet);
+			else if (CAA->ChipType == 0x20)
+				device_stop_scsp(p->scspCurCSet);
+			else if (CAA->ChipType == 0x21)
+				ws_audio_done(p->wswanCurCSet);
+			else if (CAA->ChipType == 0x22)
+				device_stop_vsu(p->vsuCurCSet);
+			else if (CAA->ChipType == 0x23)
+				device_stop_saa1099(p->saa1099CurCSet);
+			else if (CAA->ChipType == 0x24)
+				device_stop_es5503(p->es5503CurCSet);
+			else if (CAA->ChipType == 0x25)
+				device_stop_es5506(p->es550xCurCSet);
+			else if (CAA->ChipType == 0x26)
+				device_stop_x1_010(p->x1_010CurCSet);
+			else if (CAA->ChipType == 0x27)
+				device_stop_c352(p->c352CurCSet);
+			else if (CAA->ChipType == 0x28)
+				device_stop_iremga20(p->ga20CurCSet);
+
+		 resampler_destroy(CAA->Resampler);
+			CAA->Resampler = 0x00;
+
+			CAA->ChipType = 0xFF;	// mark as "unused"
+		}	// end for CurChip
+
+		}	// end for CurCSet
+
+		for (CurChip = 0x00; CurChip < p->DacCtrlUsed; CurChip ++)
+		{
+			CurCSet = p->DacCtrlUsgCurChip;
+			device_stop_daccontrol(p->daccontrolCurCSet);
+			p->DacCtrlCurCSet.Enable = false;
+		}
+		p->DacCtrlUsed = 0x00;
+
+		for (CurChip = 0x00; CurChip < PCM_BANK_COUNT; CurChip ++)
+		{
+			free(p->PCMBankCurChip.Bank);
+			free(p->PCMBankCurChip.Data);
+		}
+		//memset(PCMBank, 0x00, sizeof(VGM_PCM_BANK) * PCM_BANK_COUNT);
+		free(p->PCMTbl.Entries);
+		//memset(&PCMTbl, 0x00, sizeof(PCMBANK_TBL));
+		break;
+	case 0x10:	// Set Muting Mask
+		for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+		{
+
+		CAA = (CAUD_ATTR*)&p->ChipAudioCurCSet;
+		for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++, CAA ++)
+		{
+			if (CAA->ChipType == 0xFF)	// chip unused
+				continue;
+			else if (CAA->ChipType == 0x00)
+				sn764xx_set_mute_mask(p->sn764xxCurCSet, p->ChipOptsCurCSet.SN76496.ChnMute1);
+			else if (CAA->ChipType == 0x01)
+				ym2413_set_mute_mask(p->ym2413CurCSet, p->ChipOptsCurCSet.YM2413.ChnMute1);
+			else if (CAA->ChipType == 0x02)
+				ym2612_set_mute_mask(p->ym2612CurCSet, p->ChipOptsCurCSet.YM2612.ChnMute1);
+			else if (CAA->ChipType == 0x03)
+				ym2151_set_mute_mask(p->ym2151CurCSet, p->ChipOptsCurCSet.YM2151.ChnMute1);
+			else if (CAA->ChipType == 0x04)
+				segapcm_set_mute_mask(p->segapcmCurCSet, p->ChipOptsCurCSet.SegaPCM.ChnMute1);
+			else if (CAA->ChipType == 0x05 && CurCSet == 0x00)
+				rf5c68_set_mute_mask(p->rf5c68, p->ChipOptsCurCSet.RF5C68.ChnMute1);
+			else if (CAA->ChipType == 0x06)
+				ym2203_set_mute_mask(p->ym2203CurCSet, p->ChipOptsCurCSet.YM2203.ChnMute1,
+									p->ChipOptsCurCSet.YM2203.ChnMute3);
+			else if (CAA->ChipType == 0x07)
+			{
+				MaskVal = (p->ChipOptsCurCSet.YM2608.ChnMute1 & 0x3F) << 0;
+				MaskVal |= (p->ChipOptsCurCSet.YM2608.ChnMute2 & 0x7F) << 6;
+				ym2608_set_mute_mask(p->ym2608CurCSet, MaskVal, p->ChipOptsCurCSet.YM2608.ChnMute3);
+			}
+			else if (CAA->ChipType == 0x08)
+			{
+				MaskVal = (p->ChipOptsCurCSet.YM2610.ChnMute1 & 0x3F) << 0;
+				MaskVal |= (p->ChipOptsCurCSet.YM2610.ChnMute2 & 0x7F) << 6;
+				ym2610_set_mute_mask(p->ym2610CurCSet, MaskVal, p->ChipOptsCurCSet.YM2610.ChnMute3);
+			}
+			else if (CAA->ChipType == 0x09)
+				ym3812_set_mute_mask(p->ym3812CurCSet, p->ChipOptsCurCSet.YM3812.ChnMute1);
+			else if (CAA->ChipType == 0x0A)
+				ym3526_set_mute_mask(p->ym3526CurCSet, p->ChipOptsCurCSet.YM3526.ChnMute1);
+			else if (CAA->ChipType == 0x0B)
+				y8950_set_mute_mask(p->y8950CurCSet, p->ChipOptsCurCSet.Y8950.ChnMute1);
+			else if (CAA->ChipType == 0x0C)
+				ymf262_set_mute_mask(p->ymf262CurCSet, p->ChipOptsCurCSet.YMF262.ChnMute1);
+			else if (CAA->ChipType == 0x0D)
+				ymf278b_set_mute_mask(p->ymf278bCurCSet, p->ChipOptsCurCSet.YMF278B.ChnMute1,
+										p->ChipOptsCurCSet.YMF278B.ChnMute2);
+			else if (CAA->ChipType == 0x0E)
+				ymf271_set_mute_mask(p->ymf271CurCSet, p->ChipOptsCurCSet.YMF271.ChnMute1);
+			else if (CAA->ChipType == 0x0F)
+				ymz280b_set_mute_mask(p->ymz280bCurCSet, p->ChipOptsCurCSet.YMZ280B.ChnMute1);
+			else if (CAA->ChipType == 0x10 && CurCSet == 0x00)
+				rf5c164_set_mute_mask(p->rf5c164, p->ChipOptsCurCSet.RF5C164.ChnMute1);
+ else if (CAA->ChipType == 0x11 && CurCSet == 0x00)
+ pwm_mute(p->pwm, p->ChipOptsCurCSet.PWM.ChnMute1);
+			else if (CAA->ChipType == 0x12)
+				ayxx_set_mute_mask(p->ay8910CurCSet, p->ChipOptsCurCSet.AY8910.ChnMute1);
+			else if (CAA->ChipType == 0x13)
+				gameboy_sound_set_mute_mask(p->gbdmgCurCSet, p->ChipOptsCurCSet.GameBoy.ChnMute1);
+			else if (CAA->ChipType == 0x14)
+				nes_set_mute_mask(p->nesapuCurCSet, p->ChipOptsCurCSet.NES.ChnMute1);
+			else if (CAA->ChipType == 0x15)
+				multipcm_set_mute_mask(p->multipcmCurCSet, p->ChipOptsCurCSet.MultiPCM.ChnMute1);
+			else if (CAA->ChipType == 0x16)
+ upd7759_mute(p->upd7759CurCSet, p->ChipOptsCurCSet.UPD7759.ChnMute1);
+			else if (CAA->ChipType == 0x17)
+ okim6258_mute(p->okim6258CurCSet, p->ChipOptsCurCSet.OKIM6258.ChnMute1);
+			else if (CAA->ChipType == 0x18)
+				okim6295_set_mute_mask(p->okim6295CurCSet, p->ChipOptsCurCSet.OKIM6295.ChnMute1);
+			else if (CAA->ChipType == 0x19)
+				k051649_set_mute_mask(p->k051649CurCSet, p->ChipOptsCurCSet.K051649.ChnMute1);
+			else if (CAA->ChipType == 0x1A)
+				k054539_set_mute_mask(p->k054539CurCSet, p->ChipOptsCurCSet.K054539.ChnMute1);
+			else if (CAA->ChipType == 0x1B)
+				c6280_set_mute_mask(p->huc6280CurCSet, p->ChipOptsCurCSet.HuC6280.ChnMute1);
+			else if (CAA->ChipType == 0x1C)
+				c140_set_mute_mask(p->c140CurCSet, p->ChipOptsCurCSet.C140.ChnMute1);
+			else if (CAA->ChipType == 0x1D)
+				k053260_set_mute_mask(p->k053260CurCSet, p->ChipOptsCurCSet.K053260.ChnMute1);
+			else if (CAA->ChipType == 0x1E)
+				pokey_set_mute_mask(p->pokeyCurCSet, p->ChipOptsCurCSet.Pokey.ChnMute1);
+			else if (CAA->ChipType == 0x1F)
+				qsound_set_mute_mask(p->qsoundCurCSet, p->ChipOptsCurCSet.QSound.ChnMute1);
+			else if (CAA->ChipType == 0x20)
+				scsp_set_mute_mask(p->scspCurCSet, p->ChipOptsCurCSet.SCSP.ChnMute1);
+			else if (CAA->ChipType == 0x21)
+				ws_set_mute_mask(p->wswanCurCSet, p->ChipOptsCurCSet.WSwan.ChnMute1);
+			else if (CAA->ChipType == 0x22)
+				vsu_set_mute_mask(p->vsuCurCSet, p->ChipOptsCurCSet.VSU.ChnMute1);
+			else if (CAA->ChipType == 0x23)
+				saa1099_set_mute_mask(p->saa1099CurCSet, p->ChipOptsCurCSet.SAA1099.ChnMute1);
+			else if (CAA->ChipType == 0x24)
+				es5503_set_mute_mask(p->es5503CurCSet, p->ChipOptsCurCSet.ES5503.ChnMute1);
+			else if (CAA->ChipType == 0x25)
+				es5506_set_mute_mask(p->es550xCurCSet, p->ChipOptsCurCSet.ES5506.ChnMute1);
+			else if (CAA->ChipType == 0x26)
+				x1_010_set_mute_mask(p->x1_010CurCSet, p->ChipOptsCurCSet.X1_010.ChnMute1);
+			else if (CAA->ChipType == 0x27)
+				c352_set_mute_mask(p->c352CurCSet, p->ChipOptsCurCSet.C352.ChnMute1);
+			else if (CAA->ChipType == 0x28)
+				iremga20_set_mute_mask(p->ga20CurCSet, p->ChipOptsCurCSet.GA20.ChnMute1);
+		}	// end for CurChip
+
+		}	// end for CurCSet
+		break;
+	case 0x20:	// Set Panning
+		for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+		{
+
+		CAA = (CAUD_ATTR*)&p->ChipAudioCurCSet;
+		for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++, CAA ++)
+		{
+			if (CAA->ChipType == 0xFF)	// chip unused
+				continue;
+			else if (CAA->ChipType == 0x00)
+				sn764xx_set_panning(p->sn764xxCurCSet, p->ChipOptsCurCSet.SN76496.Panning);
+			else if (CAA->ChipType == 0x01)
+				ym2413_set_panning(p->ym2413CurCSet, p->ChipOptsCurCSet.YM2413.Panning);
+		}	// end for CurChip
+
+		}	// end for CurCSet
+		break;
+	}
+
+	return;
+}
+
+INLINE INT32 SampleVGM2Pbk_I(VGM_PLAYER* p, INT32 SampleVal)
+{
+	return (INT32)((INT64)SampleVal * p->VGMSmplRateMul / p->VGMSmplRateDiv);
+}
+
+INLINE INT32 SamplePbk2VGM_I(VGM_PLAYER* p, INT32 SampleVal)
+{
+	return (INT32)((INT64)SampleVal * p->VGMSmplRateDiv / p->VGMSmplRateMul);
+}
+
+INT32 SampleVGM2Playback(void* _p, INT32 SampleVal)
+{
+ VGM_PLAYER* p = (VGM_PLAYER *)_p;
+	return (INT32)((INT64)SampleVal * p->VGMSmplRateMul / p->VGMSmplRateDiv);
+}
+
+INT32 SamplePlayback2VGM(void* _p, INT32 SampleVal)
+{
+ VGM_PLAYER* p = (VGM_PLAYER *)_p;
+	return (INT32)((INT64)SampleVal * p->VGMSmplRateDiv / p->VGMSmplRateMul);
+}
+
+
+static void InterpretFile(VGM_PLAYER* p, UINT32 SampleCount)
+{
+	/*UINT32 TempLng;*/
+	UINT8 CurChip;
+
+	if (p->DacCtrlUsed && SampleCount > 1)	// handle skipping
+	{
+		for (CurChip = 0x00; CurChip < p->DacCtrlUsed; CurChip ++)
+		{
+			daccontrol_update(p->daccontrolp->DacCtrlUsgCurChip, SampleCount - 1);
+		}
+	}
+
+	if (! p->FileMode)
+		InterpretVGM(p, SampleCount);
+#ifdef ADDITIONAL_FORMATS
+	else
+		InterpretOther(p, SampleCount);
+#endif
+
+	if (p->DacCtrlUsed && SampleCount)
+	{
+		// calling this here makes "Emulating while Paused" nicer
+		for (CurChip = 0x00; CurChip < p->DacCtrlUsed; CurChip ++)
+		{
+			daccontrol_update(p->daccontrolp->DacCtrlUsgCurChip, 1);
+		}
+	}
+
+	p->VGMSmplPlayed += SampleCount;
+	p->PlayingTime += SampleCount;
+
+	//if (FadePlay && ! FadeTime)
+	//	EndPlay = true;
+
+	return;
+}
+
+static void AddPCMData(VGM_PLAYER* p, UINT8 Type, UINT32 DataSize, const UINT8* Data)
+{
+	UINT32 CurBnk;
+	VGM_PCM_BANK* TempPCM;
+	VGM_PCM_DATA* TempBnk;
+	UINT32 BankSize;
+	bool RetVal;
+	UINT8 BnkType;
+	UINT8 CurDAC;
+
+	BnkType = Type & 0x3F;
+	if (BnkType >= PCM_BANK_COUNT || p->VGMCurLoop)
+		return;
+
+	if (Type == 0x7F)
+	{
+		ReadPCMTable(p, DataSize, Data);
+		return;
+	}
+
+	TempPCM = &p->PCMBankBnkType;
+	TempPCM->BnkPos ++;
+	if (TempPCM->BnkPos <= TempPCM->BankCount)
+		return;	// Speed hack for restarting playback (skip already loaded blocks)
+	CurBnk = TempPCM->BankCount;
+	TempPCM->BankCount ++;
+	if (p->Last95Max != 0xFFFF)
+		p->Last95Max = TempPCM->BankCount;
+	TempPCM->Bank = (VGM_PCM_DATA*)realloc(TempPCM->Bank,
+											sizeof(VGM_PCM_DATA) * TempPCM->BankCount);
+
+	if (! (Type & 0x40))
+		BankSize = DataSize;
+	else
+		BankSize = ReadLE32(&Data0x01);
+	TempPCM->Data = realloc(TempPCM->Data, TempPCM->DataSize + BankSize);
+	TempBnk = &TempPCM->BankCurBnk;
+	TempBnk->DataStart = TempPCM->DataSize;
+	if (! (Type & 0x40))
+	{
+		TempBnk->DataSize = DataSize;
+		TempBnk->Data = TempPCM->Data + TempBnk->DataStart;
+		memcpy(TempBnk->Data, Data, DataSize);
+	}
+	else
+	{
+		TempBnk->Data = TempPCM->Data + TempBnk->DataStart;
+		RetVal = DecompressDataBlk(p, TempBnk, DataSize, Data);
+		if (! RetVal)
+		{
+			TempBnk->Data = NULL;
+			TempBnk->DataSize = 0x00;
+			//return;
+			goto RefreshDACStrm;	// sorry for the goto, but I don't want to copy-paste the code
+		}
+	}
+	if (BankSize != TempBnk->DataSize)
+		printf("Error reading Data Block! Data Size conflict!\n");
+	TempPCM->DataSize += BankSize;
+
+	// realloc may've moved the Bank block, so refresh all DAC Streams
+RefreshDACStrm:
+	for (CurDAC = 0x00; CurDAC < p->DacCtrlUsed; CurDAC ++)
+	{
+		if (p->DacCtrlp->DacCtrlUsgCurDAC.Bank == BnkType)
+			daccontrol_refresh_data(p->daccontrolp->DacCtrlUsgCurDAC, TempPCM->Data, TempPCM->DataSize);
+	}
+
+	return;
+}
+
+/*INLINE FUINT16 ReadBits(UINT8* Data, UINT32* Pos, FUINT8* BitPos, FUINT8 BitsToRead)
+{
+	FUINT8 BitReadVal;
+	UINT32 InPos;
+	FUINT8 InVal;
+	FUINT8 BitMask;
+	FUINT8 InShift;
+	FUINT8 OutBit;
+	FUINT16 RetVal;
+
+	InPos = *Pos;
+	InShift = *BitPos;
+	OutBit = 0x00;
+	RetVal = 0x0000;
+	while(BitsToRead)
+	{
+		BitReadVal = (BitsToRead >= 8) ? 8 : BitsToRead;
+		BitsToRead -= BitReadVal;
+		BitMask = (1 << BitReadVal) - 1;
+
+		InShift += BitReadVal;
+		InVal = (DataInPos << InShift >> 8) & BitMask;
+		if (InShift >= 8)
+		{
+			InShift -= 8;
+			InPos ++;
+			if (InShift)
+				InVal |= (DataInPos << InShift >> 8) & BitMask;
+		}
+
+		RetVal |= InVal << OutBit;
+		OutBit += BitReadVal;
+	}
+
+	*Pos = InPos;
+	*BitPos = InShift;
+	return RetVal;
+}
+
+static void DecompressDataBlk(VGM_PCM_DATA* Bank, UINT32 DataSize, const UINT8* Data)
+{
+	UINT8 ComprType;
+	UINT8 BitDec;
+	FUINT8 BitCmp;
+	UINT8 CmpSubType;
+	UINT16 AddVal;
+	UINT32 InPos;
+	UINT32 OutPos;
+	FUINT16 InVal;
+	FUINT16 OutVal;
+	FUINT8 ValSize;
+	FUINT8 InShift;
+	FUINT8 OutShift;
+	UINT8* Ent1B;
+	UINT16* Ent2B;
+	//UINT32 Time;
+
+	//Time = GetTickCount();
+	ComprType = Data0x00;
+	Bank->DataSize = ReadLE32(&Data0x01);
+	BitDec = Data0x05;
+	BitCmp = Data0x06;
+	CmpSubType = Data0x07;
+	AddVal = ReadLE16(&Data0x08);
+
+	switch(ComprType)
+	{
+	case 0x00:	// n-Bit compression
+		if (CmpSubType == 0x02)
+		{
+			Ent1B = (UINT8*)PCMTbl.Entries;
+			Ent2B = (UINT16*)PCMTbl.Entries;
+			if (! PCMTbl.EntryCount)
+			{
+				printf("Error loading table-compressed data block! No table loaded!\n");
+				return;
+			}
+			else if (BitDec != PCMTbl.BitDec || BitCmp != PCMTbl.BitCmp)
+			{
+				printf("Warning! Data block and loaded value table incompatible!\n");
+				return;
+			}
+		}
+
+		ValSize = (BitDec + 7) / 8;
+		InPos = 0x0A;
+		InShift = 0;
+		OutShift = BitDec - BitCmp;
+
+		for (OutPos = 0x00; OutPos < Bank->DataSize; OutPos += ValSize)
+		{
+			if (InPos >= DataSize)
+				break;
+			InVal = ReadBits(Data, &InPos, &InShift, BitCmp);
+			switch(CmpSubType)
+			{
+			case 0x00:	// Copy
+				OutVal = InVal + AddVal;
+				break;
+			case 0x01:	// Shift Left
+				OutVal = (InVal << OutShift) + AddVal;
+				break;
+			case 0x02:	// Table
+				switch(ValSize)
+				{
+				case 0x01:
+					OutVal = Ent1BInVal;
+					break;
+				case 0x02:
+					OutVal = Ent2BInVal;
+					break;
+				}
+				break;
+			}
+			memcpy(&Bank->DataOutPos, &OutVal, ValSize);
+		}
+		break;
+	}
+
+	//Time = GetTickCount() - Time;
+	//printf("Decompression Time: %lu\n", Time);
+
+	return;
+}*/
+
+static bool DecompressDataBlk(VGM_PLAYER* p, VGM_PCM_DATA* Bank, UINT32 DataSize, const UINT8* Data)
+{
+	UINT8 ComprType;
+	UINT8 BitDec;
+	FUINT8 BitCmp;
+	UINT8 CmpSubType;
+	UINT16 AddVal;
+	const UINT8* InPos;
+	const UINT8* InDataEnd;
+	UINT8* OutPos;
+	const UINT8* OutDataEnd;
+	FUINT16 InVal;
+	FUINT16 OutVal;
+	FUINT8 ValSize;
+	FUINT8 InShift;
+	FUINT8 OutShift;
+	UINT8* Ent1B;
+	UINT16* Ent2B;
+
+	// ReadBits Variables
+	FUINT8 BitsToRead;
+	FUINT8 BitReadVal;
+	FUINT8 InValB;
+	FUINT8 BitMask;
+	FUINT8 OutBit;
+
+	// Variables for DPCM
+	UINT16 OutMask;
+
+	ComprType = Data0x00;
+	Bank->DataSize = ReadLE32(&Data0x01);
+
+	switch(ComprType)
+	{
+	case 0x00:	// n-Bit compression
+		BitDec = Data0x05;
+		BitCmp = Data0x06;
+		CmpSubType = Data0x07;
+		AddVal = ReadLE16(&Data0x08);
+
+		if (CmpSubType == 0x02)
+		{
+			Ent1B = (UINT8*)p->PCMTbl.Entries;	// Big Endian note: Those are stored in LE and converted when reading.
+			Ent2B = (UINT16*)p->PCMTbl.Entries;
+			if (! p->PCMTbl.EntryCount)
+			{
+				Bank->DataSize = 0x00;
+				printf("Error loading table-compressed data block! No table loaded!\n");
+				return false;
+			}
+			else if (BitDec != p->PCMTbl.BitDec || BitCmp != p->PCMTbl.BitCmp)
+			{
+				Bank->DataSize = 0x00;
+				printf("Warning! Data block and loaded value table incompatible!\n");
+				return false;
+			}
+		}
+
+		ValSize = (BitDec + 7) / 8;
+		InPos = Data + 0x0A;
+		InDataEnd = Data + DataSize;
+		InShift = 0;
+		OutShift = BitDec - BitCmp;
+		OutDataEnd = Bank->Data + Bank->DataSize;
+
+		for (OutPos = Bank->Data; OutPos < OutDataEnd && InPos < InDataEnd; OutPos += ValSize)
+		{
+			//InVal = ReadBits(Data, InPos, &InShift, BitCmp);
+			// inlined - is 30% faster
+			OutBit = 0x00;
+			InVal = 0x0000;
+			BitsToRead = BitCmp;
+			while(BitsToRead)
+			{
+				BitReadVal = (BitsToRead >= 8) ? 8 : BitsToRead;
+				BitsToRead -= BitReadVal;
+				BitMask = (1 << BitReadVal) - 1;
+
+				InShift += BitReadVal;
+				InValB = (*InPos << InShift >> 8) & BitMask;
+				if (InShift >= 8)
+				{
+					InShift -= 8;
+					InPos ++;
+					if (InShift)
+						InValB |= (*InPos << InShift >> 8) & BitMask;
+				}
+
+				InVal |= InValB << OutBit;
+				OutBit += BitReadVal;
+			}
+
+			switch(CmpSubType)
+			{
+			case 0x00:	// Copy
+				OutVal = InVal + AddVal;
+				break;
+			case 0x01:	// Shift Left
+				OutVal = (InVal << OutShift) + AddVal;
+				break;
+			case 0x02:	// Table
+				switch(ValSize)
+				{
+				case 0x01:
+					OutVal = Ent1BInVal;
+					break;
+				case 0x02:
+#ifndef VGM_BIG_ENDIAN
+					OutVal = Ent2BInVal;
+#else
+					OutVal = ReadLE16((UINT8*)&Ent2BInVal);
+#endif
+					break;
+				}
+				break;
+			}
+
+#ifndef VGM_BIG_ENDIAN
+			//memcpy(OutPos, &OutVal, ValSize);
+			if (ValSize == 0x01)
+				*((UINT8*)OutPos) = (UINT8)OutVal;
+			else //if (ValSize == 0x02)
+				*((UINT16*)OutPos) = (UINT16)OutVal;
+#else
+			if (ValSize == 0x01)
+			{
+				*OutPos = (UINT8)OutVal;
+			}
+			else //if (ValSize == 0x02)
+			{
+				OutPos0x00 = (UINT8)((OutVal & 0x00FF) >> 0);
+				OutPos0x01 = (UINT8)((OutVal & 0xFF00) >> 8);
+			}
+#endif
+		}
+		break;
+	case 0x01:	// Delta-PCM
+		BitDec = Data0x05;
+		BitCmp = Data0x06;
+		OutVal = ReadLE16(&Data0x08);
+
+		Ent1B = (UINT8*)p->PCMTbl.Entries;
+		Ent2B = (UINT16*)p->PCMTbl.Entries;
+		if (! p->PCMTbl.EntryCount)
+		{
+			Bank->DataSize = 0x00;
+			printf("Error loading table-compressed data block! No table loaded!\n");
+			return false;
+		}
+		else if (BitDec != p->PCMTbl.BitDec || BitCmp != p->PCMTbl.BitCmp)
+		{
+			Bank->DataSize = 0x00;
+			printf("Warning! Data block and loaded value table incompatible!\n");
+			return false;
+		}
+
+		ValSize = (BitDec + 7) / 8;
+		OutMask = (1 << BitDec) - 1;
+		InPos = Data + 0x0A;
+		InDataEnd = Data + DataSize;
+		InShift = 0;
+		OutShift = BitDec - BitCmp;
+		OutDataEnd = Bank->Data + Bank->DataSize;
+		AddVal = 0x0000;
+
+		for (OutPos = Bank->Data; OutPos < OutDataEnd && InPos < InDataEnd; OutPos += ValSize)
+		{
+			//InVal = ReadBits(Data, InPos, &InShift, BitCmp);
+			// inlined - is 30% faster
+			OutBit = 0x00;
+			InVal = 0x0000;
+			BitsToRead = BitCmp;
+			while(BitsToRead)
+			{
+				BitReadVal = (BitsToRead >= 8) ? 8 : BitsToRead;
+				BitsToRead -= BitReadVal;
+				BitMask = (1 << BitReadVal) - 1;
+
+				InShift += BitReadVal;
+				InValB = (*InPos << InShift >> 8) & BitMask;
+				if (InShift >= 8)
+				{
+					InShift -= 8;
+					InPos ++;
+					if (InShift)
+						InValB |= (*InPos << InShift >> 8) & BitMask;
+				}
+
+				InVal |= InValB << OutBit;
+				OutBit += BitReadVal;
+			}
+
+			switch(ValSize)
+			{
+			case 0x01:
+				AddVal = Ent1BInVal;
+				OutVal += AddVal;
+				OutVal &= OutMask;
+				*((UINT8*)OutPos) = (UINT8)OutVal;
+				break;
+			case 0x02:
+#ifndef VGM_BIG_ENDIAN
+				AddVal = Ent2BInVal;
+#else
+				AddVal = ReadLE16((UINT8*)&Ent2BInVal);
+#endif
+				OutVal += AddVal;
+				OutVal &= OutMask;
+#ifndef VGM_BIG_ENDIAN
+				*((UINT16*)OutPos) = (UINT16)OutVal;
+#else
+				OutPos0x00 = (UINT8)((OutVal & 0x00FF) >> 0);
+				OutPos0x01 = (UINT8)((OutVal & 0xFF00) >> 8);
+#endif
+				break;
+			}
+		}
+		break;
+	default:
+		printf("Error: Unknown data block compression!\n");
+		return false;
+	}
+
+	return true;
+}
+
+static UINT8 GetDACFromPCMBank(VGM_PLAYER* p)
+{
+	// for YM2612 DAC data only
+	/*VGM_PCM_BANK* TempPCM;
+	UINT32 CurBnk;*/
+	UINT32 DataPos;
+
+	/*TempPCM = &PCMBank0x00;
+	DataPos = TempPCM->DataPos;
+	for (CurBnk = 0x00; CurBnk < TempPCM->BankCount; CurBnk ++)
+	{
+		if (DataPos < TempPCM->BankCurBnk.DataSize)
+		{
+			if (TempPCM->DataPos < TempPCM->DataSize)
+				TempPCM->DataPos ++;
+			return TempPCM->BankCurBnk.DataDataPos;
+		}
+		DataPos -= TempPCM->BankCurBnk.DataSize;
+	}
+	return 0x80;*/
+
+	DataPos = p->PCMBank0x00.DataPos;
+	if (DataPos >= p->PCMBank0x00.DataSize)
+		return 0x80;
+
+	p->PCMBank0x00.DataPos ++;
+	return p->PCMBank0x00.DataDataPos;
+}
+
+static UINT8* GetPointerFromPCMBank(VGM_PLAYER* p, UINT8 Type, UINT32 DataPos)
+{
+	if (Type >= PCM_BANK_COUNT)
+		return NULL;
+
+	if (DataPos >= p->PCMBankType.DataSize)
+		return NULL;
+
+	return &p->PCMBankType.DataDataPos;
+}
+
+static void ReadPCMTable(VGM_PLAYER* p, UINT32 DataSize, const UINT8* Data)
+{
+	UINT8 ValSize;
+	UINT32 TblSize;
+
+	p->PCMTbl.ComprType = Data0x00;
+	p->PCMTbl.CmpSubType = Data0x01;
+	p->PCMTbl.BitDec = Data0x02;
+	p->PCMTbl.BitCmp = Data0x03;
+	p->PCMTbl.EntryCount = ReadLE16(&Data0x04);
+
+	ValSize = (p->PCMTbl.BitDec + 7) / 8;
+	TblSize = p->PCMTbl.EntryCount * ValSize;
+
+	p->PCMTbl.Entries = realloc(p->PCMTbl.Entries, TblSize);
+	memcpy(p->PCMTbl.Entries, &Data0x06, TblSize);
+
+	if (DataSize < 0x06 + TblSize)
+		printf("Warning! Bad PCM Table Length!\n");
+
+	return;
+}
+
+#define CHIP_CHECK(name)	(p->ChipAudioCurChip.name.ChipType != 0xFF)
+static void InterpretVGM(VGM_PLAYER* p, UINT32 SampleCount)
+{
+	INT32 SmplPlayed;
+	UINT8 Command;
+	UINT8 TempByt;
+	UINT16 TempSht;
+	UINT32 TempLng;
+	VGM_PCM_BANK* TempPCM;
+	VGM_PCM_DATA* TempBnk;
+	UINT32 ROMSize;
+	UINT32 DataStart;
+	UINT32 DataLen;
+	const UINT8* ROMData;
+	UINT8 CurChip;
+	const UINT8* VGMPnt;
+
+	if (p->VGMEnd)
+		return;
+
+	SmplPlayed = SamplePbk2VGM_I(p, p->VGMSmplPlayed + SampleCount);
+	while(p->VGMSmplPos <= SmplPlayed)
+	{
+		Command = p->VGMDatap->VGMPos + 0x00;
+		if (Command >= 0x70 && Command <= 0x8F)
+		{
+			switch(Command & 0xF0)
+			{
+			case 0x70:
+				p->VGMSmplPos += (Command & 0x0F) + 0x01;
+				break;
+			case 0x80:
+				TempByt = GetDACFromPCMBank(p);
+				if (p->VGMHead.lngHzYM2612)
+				{
+					chip_reg_write(p, 0x02, 0x00, 0x00, 0x2A, TempByt);
+				}
+				p->VGMSmplPos += (Command & 0x0F);
+				break;
+			}
+			p->VGMPos += 0x01;
+		}
+		else
+		{
+			VGMPnt = &p->VGMDatap->VGMPos;
+
+			// Cheat Mode (to use 2 instances of 1 chip)
+			CurChip = 0x00;
+			switch(Command)
+			{
+			case 0x30:
+				if (p->VGMHead.lngHzPSG & 0x40000000)
+				{
+					Command += 0x20;
+					CurChip = 0x01;
+				}
+				break;
+			case 0x3F:
+				if (p->VGMHead.lngHzPSG & 0x40000000)
+				{
+					Command += 0x10;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xA1:
+				if (p->VGMHead.lngHzYM2413 & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xA2:
+			case 0xA3:
+				if (p->VGMHead.lngHzYM2612 & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xA4:
+				if (p->VGMHead.lngHzYM2151 & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xA5:
+				if (p->VGMHead.lngHzYM2203 & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xA6:
+			case 0xA7:
+				if (p->VGMHead.lngHzYM2608 & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xA8:
+			case 0xA9:
+				if (p->VGMHead.lngHzYM2610 & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xAA:
+				if (p->VGMHead.lngHzYM3812 & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xAB:
+				if (p->VGMHead.lngHzYM3526 & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xAC:
+				if (p->VGMHead.lngHzY8950 & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xAE:
+			case 0xAF:
+				if (p->VGMHead.lngHzYMF262 & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			case 0xAD:
+				if (p->VGMHead.lngHzYMZ280B & 0x40000000)
+				{
+					Command -= 0x50;
+					CurChip = 0x01;
+				}
+				break;
+			}
+
+			switch(Command)
+			{
+			case 0x66:	// End Of File
+				if (p->VGMHead.lngLoopOffset)
+				{
+					p->VGMPos = p->VGMHead.lngLoopOffset;
+					p->VGMSmplPos -= p->VGMHead.lngLoopSamples;
+					p->VGMSmplPlayed -= SampleVGM2Pbk_I(p, p->VGMHead.lngLoopSamples);
+					SmplPlayed = SamplePbk2VGM_I(p, p->VGMSmplPlayed + SampleCount);
+					p->VGMCurLoop ++;
+
+					if (p->VGMMaxLoopM && p->VGMCurLoop >= p->VGMMaxLoopM)
+					{
+						if (! p->FadePlay)
+						{
+							p->FadeStart = SampleVGM2Pbk_I(p, p->VGMHead.lngTotalSamples +
+															(p->VGMCurLoop - 1) * p->VGMHead.lngLoopSamples);
+						}
+						p->FadePlay = true;
+					}
+					if (p->FadePlay && ! p->FadeTime)
+						p->VGMEnd = true;
+				}
+				else
+				{
+					if (p->VGMHead.lngTotalSamples != (UINT32)p->VGMSmplPos)
+					{
+#ifdef CONSOLE_MODE
+						printf("Warning! Header Samples: %u\t Counted Samples: %u\n",
+								p->VGMHead.lngTotalSamples, p->VGMSmplPos);
+						p->ErrorHappened = true;
+#endif
+						p->VGMHead.lngTotalSamples = p->VGMSmplPos;
+					}
+					
+					if (p->HardStopOldVGMs)
+					{
+						if (p->VGMHead.lngVersion < 0x150 ||
+							(p->VGMHead.lngVersion == 0x150 && p->HardStopOldVGMs == 0x02))
+						Chips_GeneralActions(p, 0x01); // reset all chips, for instant silence
+					}
+
+					p->VGMEnd = true;
+					break;
+				}
+				break;
+			case 0x62:	// 1/60s delay
+				p->VGMSmplPos += 735;
+				p->VGMPos += 0x01;
+				break;
+			case 0x63:	// 1/50s delay
+				p->VGMSmplPos += 882;
+				p->VGMPos += 0x01;
+				break;
+			case 0x61:	// xx Sample Delay
+				TempSht = ReadLE16(&VGMPnt0x01);
+				p->VGMSmplPos += TempSht;
+				p->VGMPos += 0x03;
+				break;
+			case 0x50:	// SN76496 write
+				if (CHIP_CHECK(SN76496))
+				{
+					chip_reg_write(p, 0x00, CurChip, 0x00, 0x00, VGMPnt0x01);
+				}
+				p->VGMPos += 0x02;
+				break;
+			case 0x51:	// YM2413 write
+				if (CHIP_CHECK(YM2413))
+				{
+					chip_reg_write(p, 0x01, CurChip, 0x00, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x52:	// YM2612 write port 0
+			case 0x53:	// YM2612 write port 1
+				if (CHIP_CHECK(YM2612))
+				{
+					chip_reg_write(p, 0x02, CurChip, Command & 0x01, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x67:	// PCM Data Stream
+				TempByt = VGMPnt0x02;
+				TempLng = ReadLE32(&VGMPnt0x03);
+				if (TempLng & 0x80000000)
+				{
+					TempLng &= 0x7FFFFFFF;
+					CurChip = 0x01;
+				}
+
+				switch(TempByt & 0xC0)
+				{
+				case 0x00:	// Database Block
+				case 0x40:
+					AddPCMData(p, TempByt, TempLng, &VGMPnt0x07);
+					/*switch(TempByt)
+					{
+					case 0x00:	// YM2612 PCM Database
+						break;
+					case 0x01:	// RF5C68 PCM Database
+						break;
+					case 0x02:	// RF5C164 PCM Database
+						break;
+					}*/
+					break;
+				case 0x80:	// ROM/RAM Dump
+					if (p->VGMCurLoop)
+						break;
+
+					ROMSize = ReadLE32(&VGMPnt0x07);
+					DataStart = ReadLE32(&VGMPnt0x0B);
+					DataLen = TempLng - 0x08;
+					ROMData = &VGMPnt0x0F;
+					switch(TempByt)
+					{
+					case 0x80:	// SegaPCM ROM
+						if (! CHIP_CHECK(SegaPCM))
+							break;
+						sega_pcm_write_rom(p->segapcmCurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x81:	// YM2608 DELTA-T ROM Image
+						if (! CHIP_CHECK(YM2608))
+							break;
+						ym2608_write_data_pcmrom(p->ym2608CurChip, 0x02, ROMSize, DataStart, DataLen,
+												ROMData);
+						break;
+					case 0x82:	// YM2610 ADPCM ROM Image
+					case 0x83:	// YM2610 DELTA-T ROM Image
+						if (! CHIP_CHECK(YM2610))
+							break;
+						TempByt = 0x01 + (TempByt - 0x82);
+						ym2610_write_data_pcmrom(p->ym2610CurChip, TempByt, ROMSize, DataStart, DataLen,
+												ROMData);
+						break;
+					case 0x84:	// YMF278B ROM Image
+						if (! CHIP_CHECK(YMF278B))
+							break;
+						ymf278b_write_rom(p->ymf278bCurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x85:	// YMF271 ROM Image
+						if (! CHIP_CHECK(YMF271))
+							break;
+						ymf271_write_rom(p->ymf271CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x86:	// YMZ280B ROM Image
+						if (! CHIP_CHECK(YMZ280B))
+							break;
+						ymz280b_write_rom(p->ymz280bCurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x87:	// YMF278B RAM Image
+						if (! CHIP_CHECK(YMF278B))
+							break;
+						//ymf278b_write_ram(CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x88:	// Y8950 DELTA-T ROM Image
+						if (! CHIP_CHECK(Y8950) || p->PlayingMode == 0x01)
+							break;
+						y8950_write_data_pcmrom(p->y8950CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x89:	// MultiPCM ROM Image
+						if (! CHIP_CHECK(MultiPCM))
+							break;
+						multipcm_write_rom(p->multipcmCurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x8A:	// UPD7759 ROM Image
+						if (! CHIP_CHECK(UPD7759))
+							break;
+						upd7759_write_rom(p->upd7759CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x8B:	// OKIM6295 ROM Image
+						if (! CHIP_CHECK(OKIM6295))
+							break;
+						okim6295_write_rom(p->okim6295CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x8C:	// K054539 ROM Image
+						if (! CHIP_CHECK(K054539))
+							break;
+						k054539_write_rom(p->k054539CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x8D:	// C140 ROM Image
+						if (! CHIP_CHECK(C140))
+							break;
+						c140_write_rom(p->c140CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x8E:	// K053260 ROM Image
+						if (! CHIP_CHECK(K053260))
+							break;
+						k053260_write_rom(p->k053260CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x8F:	// QSound ROM Image
+						if (! CHIP_CHECK(QSound))
+							break;
+						qsound_write_rom(p->qsoundCurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x90:	// ES5506 ROM Image
+						if (! CHIP_CHECK(ES5506))
+							break;
+						es5506_write_rom(p->es550xCurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x91:	// X1-010 ROM Image
+						if (! CHIP_CHECK(X1_010))
+							break;
+						x1_010_write_rom(p->x1_010CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x92:	// C352 ROM Image
+						if (! CHIP_CHECK(C352))
+							break;
+						c352_write_rom(p->c352CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+					case 0x93:	// GA20 ROM Image
+						if (! CHIP_CHECK(GA20))
+							break;
+						iremga20_write_rom(p->ga20CurChip, ROMSize, DataStart, DataLen, ROMData);
+						break;
+				//	case 0x8C:	// OKIM6376 ROM Image
+				//		if (! CHIP_CHECK(OKIM6376))
+				//			break;
+				//		break;
+					}
+					break;
+				case 0xC0:	// RAM Write
+					if (! (TempByt & 0x20))
+					{
+						DataStart = ReadLE16(&VGMPnt0x07);
+						DataLen = TempLng - 0x02;
+						ROMData = &VGMPnt0x09;
+					}
+					else
+					{
+						DataStart = ReadLE32(&VGMPnt0x07);
+						DataLen = TempLng - 0x04;
+						ROMData = &VGMPnt0x0B;
+					}
+					switch(TempByt)
+					{
+					case 0xC0:	// RF5C68 RAM Database
+						if (! CHIP_CHECK(RF5C68))
+							break;
+						rf5c68_write_ram(p->rf5c68, DataStart, DataLen, ROMData);
+						break;
+					case 0xC1:	// RF5C164 RAM Database
+						if (! CHIP_CHECK(RF5C164))
+							break;
+						rf5c164_write_ram(p->rf5c164, DataStart, DataLen, ROMData);
+						break;
+					case 0xC2:	// NES APU RAM
+						if (! CHIP_CHECK(NES))
+							break;
+						nes_write_ram(p->nesapuCurChip, DataStart, DataLen, ROMData);
+						break;
+					case 0xE0:	// SCSP RAM
+						if (! CHIP_CHECK(SCSP))
+							break;
+						scsp_write_ram(p->scspCurChip, DataStart, DataLen, ROMData);
+						break;
+					case 0xE1:	// ES5503 RAM
+						if (! CHIP_CHECK(ES5503))
+							break;
+						es5503_write_ram(p->es5503CurChip, DataStart, DataLen, ROMData);
+						break;
+					}
+					break;
+				}
+				p->VGMPos += 0x07 + TempLng;
+				break;
+			case 0xE0:	// Seek to PCM Data Bank Pos
+				p->PCMBank0x00.DataPos = ReadLE32(&VGMPnt0x01);
+				p->VGMPos += 0x05;
+				break;
+			case 0x4F:	// GG Stereo
+				if (CHIP_CHECK(SN76496))
+				{
+					chip_reg_write(p, 0x00, CurChip, 0x01, 0x00, VGMPnt0x01);
+				}
+				p->VGMPos += 0x02;
+				break;
+			case 0x54:	// YM2151 write
+				if (CHIP_CHECK(YM2151))
+				{
+					chip_reg_write(p, 0x03, CurChip, 0x01, VGMPnt0x01, VGMPnt0x02);
+				}
+				//p->VGMSmplPos += 80;
+				p->VGMPos += 0x03;
+				break;
+			case 0xC0:	// Sega PCM memory write
+				TempSht = ReadLE16(&VGMPnt0x01);
+				CurChip = (TempSht & 0x8000) >> 15;
+				if (CHIP_CHECK(SegaPCM))
+				{
+					sega_pcm_w(p->segapcmCurChip, TempSht & 0x7FFF, VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xB0:	// RF5C68 register write
+				if (CHIP_CHECK(RF5C68))
+				{
+					chip_reg_write(p, 0x05, CurChip, 0x00, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xC1:	// RF5C68 memory write
+				if (CHIP_CHECK(RF5C68))
+				{
+					TempSht = ReadLE16(&VGMPnt0x01);
+					rf5c68_mem_w(p->rf5c68, TempSht, VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0x55:	// YM2203
+				if (CHIP_CHECK(YM2203))
+				{
+					chip_reg_write(p, 0x06, CurChip, 0x00, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x56:	// YM2608 write port 0
+			case 0x57:	// YM2608 write port 1
+				if (CHIP_CHECK(YM2608))
+				{
+					chip_reg_write(p, 0x07, CurChip, Command & 0x01, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x58:	// YM2610 write port 0
+			case 0x59:	// YM2610 write port 1
+				if (CHIP_CHECK(YM2610))
+				{
+					chip_reg_write(p, 0x08, CurChip, Command & 0x01, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x5A:	// YM3812 write
+				if (CHIP_CHECK(YM3812))
+				{
+					chip_reg_write(p, 0x09, CurChip, 0x00, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x5B:	// YM3526 write
+				if (CHIP_CHECK(YM3526))
+				{
+					chip_reg_write(p, 0x0A, CurChip, 0x00, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x5C:	// Y8950 write
+				if (CHIP_CHECK(Y8950))
+				{
+					chip_reg_write(p, 0x0B, CurChip, 0x00, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x5E:	// YMF262 write port 0
+			case 0x5F:	// YMF262 write port 1
+				if (CHIP_CHECK(YMF262))
+				{
+					chip_reg_write(p, 0x0C, CurChip, Command & 0x01, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x5D:	// YMZ280B write
+				if (CHIP_CHECK(YMZ280B))
+				{
+					chip_reg_write(p, 0x0F, CurChip, 0x00, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xD0:	// YMF278B write
+				if (CHIP_CHECK(YMF278B))
+				{
+					CurChip = (VGMPnt0x01 & 0x80) >> 7;
+					chip_reg_write(p, 0x0D, CurChip, VGMPnt0x01 & 0x7F, VGMPnt0x02, VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xD1:	// YMF271 write
+				if (CHIP_CHECK(YMF271))
+				{
+					CurChip = (VGMPnt0x01 & 0x80) >> 7;
+					chip_reg_write(p, 0x0E, CurChip, VGMPnt0x01 & 0x7F, VGMPnt0x02, VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xB1:	// RF5C164 register write
+				if (CHIP_CHECK(RF5C164))
+				{
+					chip_reg_write(p, 0x10, CurChip, 0x00, VGMPnt0x01, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xC2:	// RF5C164 memory write
+				if (CHIP_CHECK(RF5C164))
+				{
+					TempSht = ReadLE16(&VGMPnt0x01);
+					rf5c164_mem_w(p->rf5c164, TempSht, VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xB2:	// PWM channel write
+				if (CHIP_CHECK(PWM))
+				{
+					chip_reg_write(p, 0x11, CurChip, (VGMPnt0x01 & 0xF0) >> 4,
+									VGMPnt0x01 & 0x0F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x68:	// PCM RAM write
+				CurChip = (VGMPnt0x02 & 0x80) >> 7;
+				TempByt = VGMPnt0x02 & 0x7F;
+
+				DataStart = ReadLE24(&VGMPnt0x03);
+				TempLng = ReadLE24(&VGMPnt0x06);
+				DataLen = ReadLE24(&VGMPnt0x09);
+				if (! DataLen)
+					DataLen += 0x01000000;
+				ROMData = GetPointerFromPCMBank(p, TempByt, DataStart);
+				if (ROMData == NULL)
+				{
+					p->VGMPos += 0x0C;
+					break;
+				}
+
+				switch(TempByt)
+				{
+				case 0x01:
+					if (! CHIP_CHECK(RF5C68))
+						break;
+					rf5c68_write_ram(p->rf5c68, TempLng, DataLen, ROMData);
+					break;
+				case 0x02:
+					if (! CHIP_CHECK(RF5C164))
+						break;
+					rf5c164_write_ram(p->rf5c164, TempLng, DataLen, ROMData);
+					break;
+				case 0x06:
+					if (! CHIP_CHECK(SCSP))
+						break;
+					scsp_write_ram(p->scspCurChip, TempLng, DataLen, ROMData);
+					break;
+				case 0x07:
+					if (! CHIP_CHECK(NES))
+						break;
+					p->Last95Drum = DataStart / DataLen - 1;
+					p->Last95Max = p->PCMBankTempByt.DataSize / DataLen;
+					nes_write_ram(p->nesapuCurChip, TempLng, DataLen, ROMData);
+					break;
+				}
+				p->VGMPos += 0x0C;
+				break;
+			case 0xA0:	// AY8910 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(AY8910))
+				{
+					chip_reg_write(p, 0x12, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xB3:	// GameBoy DMG write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(GameBoy))
+				{
+					chip_reg_write(p, 0x13, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xB4:	// NES APU write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(NES))
+				{
+					chip_reg_write(p, 0x14, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xB5:	// MultiPCM write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(MultiPCM))
+				{
+					chip_reg_write(p, 0x15, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xC3:	// MultiPCM memory write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(MultiPCM))
+				{
+					TempSht = ReadLE16(&VGMPnt0x02);
+					multipcm_bank_write(p->multipcmCurChip, VGMPnt0x01 & 0x7F, TempSht);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xB6:	// UPD7759 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(UPD7759))
+				{
+					chip_reg_write(p, 0x16, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xB7:	// OKIM6258 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(OKIM6258))
+				{
+					chip_reg_write(p, 0x17, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xB8:	// OKIM6295 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(OKIM6295))
+				{
+					chip_reg_write(p, 0x18, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xD2:	// SCC1 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(K051649))
+				{
+					chip_reg_write(p, 0x19, CurChip, VGMPnt0x01 & 0x7F, VGMPnt0x02,
+									VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xD3:	// K054539 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(K054539))
+				{
+					chip_reg_write(p, 0x1A, CurChip, VGMPnt0x01 & 0x7F, VGMPnt0x02,
+									VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xB9:	// HuC6280 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(HuC6280))
+				{
+					chip_reg_write(p, 0x1B, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xD4:	// C140 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(C140))
+				{
+					chip_reg_write(p, 0x1C, CurChip, VGMPnt0x01 & 0x7F, VGMPnt0x02,
+									VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xBA:	// K053260 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(K053260))
+				{
+					chip_reg_write(p, 0x1D, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xBB:	// Pokey write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(Pokey))
+				{
+					chip_reg_write(p, 0x1E, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xC4:	// QSound write
+				if (CHIP_CHECK(QSound))
+				{
+					chip_reg_write(p, 0x1F, CurChip, VGMPnt0x01, VGMPnt0x02, VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xC5:	// YMF292/SCSP write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(SCSP))
+				{
+					chip_reg_write(p, 0x20, CurChip, VGMPnt0x01 & 0x7F, VGMPnt0x02,
+									VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xBC:	// WonderSwan write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(WSwan))
+				{
+					chip_reg_write(p, 0x21, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xC6:	// WonderSwan memory write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(WSwan))
+				{
+					TempSht = ReadBE16(&VGMPnt0x01) & 0x7FFF;
+					ws_write_ram(p->wswanCurChip, TempSht, VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xC7:	// VSU write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(VSU))
+				{
+					chip_reg_write(p, 0x22, CurChip, VGMPnt0x01 & 0x7F, VGMPnt0x02,
+									VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xBD:	// SAA1099 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(SAA1099))
+				{
+					chip_reg_write(p, 0x23, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xD5:	// ES5503 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(ES5503))
+				{
+					chip_reg_write(p, 0x24, CurChip, VGMPnt0x01 & 0x7F, VGMPnt0x02,
+									VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xBE:	// ES5506 write (8-bit data)
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(ES5506))
+				{
+					chip_reg_write(p, 0x25, CurChip, VGMPnt0x01 & 0x7F, 0x00, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0xD6:	// ES5506 write (16-bit data)
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(ES5506))
+				{
+					chip_reg_write(p, 0x25, CurChip, 0x80 | (VGMPnt0x01 & 0x7F),
+									VGMPnt0x02, VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+			case 0xC8:	// X1-010 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(X1_010))
+				{
+					chip_reg_write(p, 0x26, CurChip, VGMPnt0x01 & 0x7F, VGMPnt0x02,
+									VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+#if 0	// for ctr's WIP rips
+			case 0xC9:	// C352 write
+				CurChip = 0x00;
+				if (CHIP_CHECK(C352))
+				{
+					if (VGMPnt0x01 == 0x03 && VGMPnt0x02 == 0xFF && VGMPnt0x03 == 0xFF)
+						c352_w(p->c352CurChip, 0x202, 0x0020);
+					else
+						chip_reg_write(p, 0x27, CurChip, VGMPnt0x01, VGMPnt0x02,
+										VGMPnt0x03);
+				}
+				p->VGMPos += 0x04;
+				break;
+#endif
+			case 0xE1:	// C352 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(C352))
+				{
+					TempSht = ((VGMPnt0x01 & 0x7F) << 8) | (VGMPnt0x02 << 0);
+					c352_w(p->c352CurChip, TempSht, (VGMPnt0x03 << 8) | VGMPnt0x04);
+				}
+				p->VGMPos += 0x05;
+				break;
+			case 0xBF:	// GA20 write
+				CurChip = (VGMPnt0x01 & 0x80) >> 7;
+				if (CHIP_CHECK(GA20))
+				{
+					chip_reg_write(p, 0x28, CurChip, 0x00, VGMPnt0x01 & 0x7F, VGMPnt0x02);
+				}
+				p->VGMPos += 0x03;
+				break;
+			case 0x90:	// DAC Ctrl: Setup Chip
+				CurChip = VGMPnt0x01;
+				if (CurChip == 0xFF)
+				{
+					p->VGMPos += 0x05;
+					break;
+				}
+				if (! p->DacCtrlCurChip.Enable)
+				{
+					device_start_daccontrol(&p->daccontrolCurChip, p, p->SampleRate);
+					device_reset_daccontrol(p->daccontrolCurChip);
+					p->DacCtrlCurChip.Enable = true;
+					p->DacCtrlUsgp->DacCtrlUsed = CurChip;
+					p->DacCtrlUsed ++;
+				}
+				TempByt = VGMPnt0x02;	// Chip Type
+				TempSht = ReadBE16(&VGMPnt0x03);
+				daccontrol_setup_chip(p->daccontrolCurChip, TempByt & 0x7F, (TempByt & 0x80) >> 7, TempSht);
+				p->VGMPos += 0x05;
+				break;
+			case 0x91:	// DAC Ctrl: Set Data
+				CurChip = VGMPnt0x01;
+				if (CurChip == 0xFF || ! p->DacCtrlCurChip.Enable)
+				{
+					p->VGMPos += 0x05;
+					break;
+				}
+				p->DacCtrlCurChip.Bank = VGMPnt0x02;
+				if (p->DacCtrlCurChip.Bank >= PCM_BANK_COUNT)
+					p->DacCtrlCurChip.Bank = 0x00;
+
+				TempPCM = &p->PCMBankp->DacCtrlCurChip.Bank;
+				p->Last95Max = TempPCM->BankCount;
+				daccontrol_set_data(p->daccontrolCurChip, TempPCM->Data, TempPCM->DataSize,
+									VGMPnt0x03, VGMPnt0x04);
+				p->VGMPos += 0x05;
+				break;
+			case 0x92:	// DAC Ctrl: Set Freq
+				CurChip = VGMPnt0x01;
+				if (CurChip == 0xFF || ! p->DacCtrlCurChip.Enable)
+				{
+					p->VGMPos += 0x06;
+					break;
+				}
+				TempLng = ReadLE32(&VGMPnt0x02);
+				p->Last95Freq = TempLng;
+				daccontrol_set_frequency(p->daccontrolCurChip, TempLng);
+				p->VGMPos += 0x06;
+				break;
+			case 0x93:	// DAC Ctrl: Play from Start Pos
+				CurChip = VGMPnt0x01;
+				if (CurChip == 0xFF || ! p->DacCtrlCurChip.Enable ||
+					! p->PCMBankp->DacCtrlCurChip.Bank.BankCount)
+				{
+					p->VGMPos += 0x0B;
+					break;
+				}
+				DataStart = ReadLE32(&VGMPnt0x02);
+				p->Last95Drum = 0xFFFF;
+				TempByt = VGMPnt0x06;
+				DataLen = ReadLE32(&VGMPnt0x07);
+				daccontrol_start(p->daccontrolCurChip, DataStart, TempByt, DataLen);
+				p->VGMPos += 0x0B;
+				break;
+			case 0x94:	// DAC Ctrl: Stop immediately
+				CurChip = VGMPnt0x01;
+				if (! p->DacCtrlCurChip.Enable)
+				{
+					p->VGMPos += 0x02;
+					break;
+				}
+				p->Last95Drum = 0xFFFF;
+				if (CurChip < 0xFF)
+				{
+					daccontrol_stop(p->daccontrolCurChip);
+				}
+				else
+				{
+					for (CurChip = 0x00; CurChip < 0xFF; CurChip ++)
+						daccontrol_stop(p->daccontrolCurChip);
+				}
+				p->VGMPos += 0x02;
+				break;
+			case 0x95:	// DAC Ctrl: Play Block (small)
+				CurChip = VGMPnt0x01;
+				if (CurChip == 0xFF || ! p->DacCtrlCurChip.Enable ||
+					! p->PCMBankp->DacCtrlCurChip.Bank.BankCount)
+				{
+					p->VGMPos += 0x05;
+					break;
+				}
+				TempPCM = &p->PCMBankp->DacCtrlCurChip.Bank;
+				TempSht = ReadLE16(&VGMPnt0x02);
+				p->Last95Drum = TempSht;
+				p->Last95Max = TempPCM->BankCount;
+				if (TempSht >= TempPCM->BankCount)
+					TempSht = 0x00;
+				TempBnk = &TempPCM->BankTempSht;
+
+				TempByt = DCTRL_LMODE_BYTES |
+							(VGMPnt0x04 & 0x10) |			// Reverse Mode
+							((VGMPnt0x04 & 0x01) << 7);	// Looping
+				daccontrol_start(p->daccontrolCurChip, TempBnk->DataStart, TempByt, TempBnk->DataSize);
+				p->VGMPos += 0x05;
+				break;
+			default:
+
+				switch(Command & 0xF0)
+				{
+				case 0x00:
+				case 0x10:
+				case 0x20:
+					p->VGMPos += 0x01;
+					break;
+				case 0x30:
+					p->VGMPos += 0x02;
+					break;
+				case 0x40:
+				case 0x50:
+				case 0xA0:
+				case 0xB0:
+					p->VGMPos += 0x03;
+					break;
+				case 0xC0:
+				case 0xD0:
+					p->VGMPos += 0x04;
+					break;
+				case 0xE0:
+				case 0xF0:
+					p->VGMPos += 0x05;
+					break;
+				default:
+					p->VGMEnd = true;
+					p->EndPlay = true;
+					break;
+				}
+				break;
+			}
+		}
+
+		if (p->VGMPos >= p->VGMHead.lngEOFOffset)
+			p->VGMEnd = true;
+
+		if (p->VGMEnd)
+			break;
+	}
+
+	return;
+}
+
+
+static void GeneralChipLists(VGM_PLAYER* p)
+{
+	// Generate Chip List for playback loop
+	UINT16 CurBufIdx;
+	CA_LIST* CLstOld;
+	CA_LIST* CLst;
+	/*CA_LIST* CurLst;*/
+	UINT8 CurChip;
+	UINT8 CurCSet;
+	CAUD_ATTR* CAA;
+
+	p->ChipListAll = NULL;
+	//ChipListPause = NULL;
+	//ChipListOpt = NULL;
+
+	// generate list of all chips that are used in the current VGM
+	CurBufIdx = 0x00;
+	CLstOld = NULL;
+	for (CurChip = 0x00; CurChip < CHIP_COUNT; CurChip ++)
+	{
+		for (CurCSet = 0x00; CurCSet < 0x02; CurCSet ++)
+		{
+			CAA = (CAUD_ATTR*)&p->ChipAudioCurCSet + CurChip;
+			if (CAA->ChipType != 0xFF)
+			{
+				CLst = &p->ChipListBufferCurBufIdx;
+				CurBufIdx ++;
+				if (CLstOld == NULL)
+					p->ChipListAll = CLst;
+				else
+					CLstOld->next = CLst;
+
+				CLst->CAud = CAA;
+				CLst->COpts = (CHIP_OPTS*)&p->ChipOptsCurCSet + CurChip;
+				CLstOld = CLst;
+			}
+		}
+	}
+	if (CLstOld != NULL)
+		CLstOld->next = NULL;
+
+	/*// Go through the chip list and copy all chips to a new list, except for a few
+	// selected ones.
+	CLstOld = NULL;
+	CurLst = ChipListAll;
+	while(CurLst != NULL)
+	{
+		// don't emulate the RF5Cxx chips when paused+emulated
+		if (CurLst->CAud->ChipType != 0x05 && CurLst->CAud->ChipType != 0x10)
+		{
+			CLst = &p->ChipListBufferCurBufIdx;
+			CurBufIdx ++;
+			if (CLstOld == NULL)
+				p->ChipListPause = CLst;
+			else
+				CLstOld->next = CLst;
+
+			*CLst = *CurLst;
+			CLstOld = CLst;
+		}
+		CurLst = CurLst->next;
+	}
+	if (CLstOld != NULL)
+		CLstOld->next = NULL;*/
+
+	return;
+}
+
+static void SetupResampler(VGM_PLAYER* p, CAUD_ATTR* CAA)
+{
+	if (! CAA->SmpRate)
+	{
+		CAA->Resampler = 0x00;
+		return;
+	}
+
+ CAA->TargetSmpRate = p->SampleRate;
+
+		CAA->Resampler = resampler_create();
+
+	return;
+}
+
+static void ChangeChipSampleRate(void* DataPtr, UINT32 NewSmplRate)
+{
+	CAUD_ATTR* CAA = (CAUD_ATTR*)DataPtr;
+
+	if (CAA->SmpRate == NewSmplRate)
+		return;
+
+	CAA->SmpRate = NewSmplRate;
+
+	return;
+}
+
+
+INLINE INT16 Limit2Short(INT32 Value)
+{
+	INT32 NewValue;
+
+	NewValue = Value;
+	if (NewValue < -0x8000)
+		NewValue = -0x8000;
+	else if (NewValue > 0x7FFF)
+		NewValue = 0x7FFF;
+
+	return (INT16)NewValue;
+}
+
+INLINE INT32 LimitScaleAdd(INT32 Target, INT32 Value, UINT16 Scale)
+{
+	INT64 NewValue;
+
+	NewValue = (INT64)Value;
+	NewValue *= (INT64)Scale;
+	NewValue += (INT64)Target;
+
+	if (NewValue < -0x80000000LL)
+		NewValue = -0x80000000LL;
+	else if (NewValue > 0x7FFFFFFFLL)
+		NewValue = 0x7FFFFFFFLL;
+
+	return (INT32)NewValue;
+}
+
+static void null_update(void *param, stream_sample_t **outputs, int samples)
+{
+	memset(outputs0x00, 0x00, sizeof(stream_sample_t) * samples);
+	memset(outputs0x01, 0x00, sizeof(stream_sample_t) * samples);
+
+	return;
+}
+
+static void dual_opl2_stereo(void *param, stream_sample_t **outputs, int samples)
+{
+ struct dual_opl2_info * info = (struct dual_opl2_info *) param;
+
+	ym3812_stream_update(info->chip, outputs, samples);
+
+	// Dual-OPL with Stereo
+	if (info->ChipID & 0x01)
+		memset(outputs0x00, 0x00, sizeof(stream_sample_t) * samples);	// Mute Left Chanel
+	else
+		memset(outputs0x01, 0x00, sizeof(stream_sample_t) * samples);	// Mute Right Chanel
+
+	return;
+}
+
+static void ResampleChipStream(VGM_PLAYER* p, CA_LIST* CLst, WAVE_32BS* RetSample, UINT32 Length)
+{
+	CAUD_ATTR* CAA;
+	INT32* CurBufL;
+	INT32* CurBufR;
+	INT32 SmpCnt;	// must be signed, else I'm getting calculation errors
+	INT32 CurSmpl;
+ UINT32 SampleRate;
+	UINT32 OutPos;
+	sample_t ls, rs;
+
+	CAA = CLst->CAud;
+	if (!CAA->Resampler)
+		return;
+ 
+	CurBufL = p->StreamBufs0x00;
+	CurBufR = p->StreamBufs0x01;
+
+ SampleRate = p->SampleRate;
+
+	OutPos = 0;
+
+	// This Do-While-Loop gets and resamples the chip output of one or more chips.
+	// It's a loop to support the AY8910 paired with the YM2203/YM2608/YM2610.
+	do
+	{
+		for (OutPos = 0; OutPos < Length; OutPos++)
+		{
+			if (CAA->LastSmpRate != CAA->SmpRate)
+			{
+				resampler_set_rate(CAA->Resampler, (double)CAA->SmpRate / (double)CAA->TargetSmpRate);
+				CAA->LastSmpRate = CAA->SmpRate;
+			}
+
+			SmpCnt = resampler_get_min_fill(CAA->Resampler) / 2;
+
+			if (SmpCnt)
+			{
+				CAA->StreamUpdate(CAA->StreamUpdateParam, p->StreamBufs, SmpCnt);
+				for (CurSmpl = 0; CurSmpl < SmpCnt; CurSmpl++)
+					resampler_write_pair(CAA->Resampler, CurBufLCurSmpl, CurBufRCurSmpl);
+			}
+
+			resampler_read_pair(CAA->Resampler, &ls, &rs);
+
+			RetSampleOutPos.Left = LimitScaleAdd(RetSampleOutPos.Left, ls, CAA->Volume);
+			RetSampleOutPos.Right = LimitScaleAdd(RetSampleOutPos.Right, rs, CAA->Volume);
+		}
+
+		CAA = CAA->Paired;
+	} while(CAA != NULL);
+
+	return;
+}
+
+static INT32 RecalcFadeVolume(VGM_PLAYER* p)
+{
+	float TempSng;
+
+	if (p->FadePlay)
+	{
+		if (! p->FadeStart)
+			p->FadeStart = p->PlayingTime;
+
+		TempSng = (p->PlayingTime - p->FadeStart) / (float)p->SampleRate;
+		p->MasterVol = 1.0f - TempSng / (p->FadeTime * 0.001f);
+		if (p->MasterVol < 0.0f)
+		{
+			p->MasterVol = 0.0f;
+			//EndPlay = true;
+			p->VGMEnd = true;
+		}
+		p->FinalVol = p->VolumeLevelM * p->MasterVol * p->MasterVol;
+	}
+
+	return (INT32)(0x100 * p->FinalVol + 0.5f);
+}
+
+UINT32 FillBuffer(void *_p, WAVE_16BS* Buffer, UINT32 BufferSize)
+{
+	UINT32 CurSmpl;
+	WAVE_32BS TempBuf;
+	INT32 CurMstVol;
+	UINT32 RecalcStep;
+	CA_LIST* CurCLst;
+
+ VGM_PLAYER* p = (VGM_PLAYER *)_p;
+
+	//memset(Buffer, 0x00, sizeof(WAVE_16BS) * BufferSize);
+
+	RecalcStep = p->FadePlay ? p->SampleRate / 44100 : 0;
+	CurMstVol = RecalcFadeVolume(p);
+
+	if (Buffer == NULL)
+	{
+		//for (CurSmpl = 0x00; CurSmpl < BufferSize; CurSmpl ++)
+		//	InterpretFile(1);
+		InterpretFile(p, BufferSize);
+
+		if (p->FadePlay && ! p->FadeStart)
+		{
+			p->FadeStart = p->PlayingTime;
+			RecalcStep = p->FadePlay ? p->SampleRate / 100 : 0;
+		}
+		//if (RecalcStep && ! (CurSmpl % RecalcStep))
+		if (RecalcStep)
+			CurMstVol = RecalcFadeVolume(p);
+
+ if (p->VGMEnd)
+ {
+ p->EndPlay = true;
+ }
+
+		return BufferSize;
+	}
+
+	for (CurSmpl = 0x00; CurSmpl < BufferSize; CurSmpl ++)
+	{
+		InterpretFile(p, 1);
+
+		// Sample Structures
+		//	00 - SN76496
+		//	01 - YM2413
+		//	02 - YM2612
+		//	03 - YM2151
+		//	04 - SegaPCM
+		//	05 - RF5C68
+		//	06 - YM2203
+		//	07 - YM2608
+		//	08 - YM2610/YM2610B
+		//	09 - YM3812
+		//	0A - YM3526
+		//	0B - Y8950
+		//	0C - YMF262
+		//	0D - YMF278B
+		//	0E - YMF271
+		//	0F - YMZ280B
+		//	10 - RF5C164
+		//	11 - PWM
+		//	12 - AY8910
+		//	13 - GameBoy
+		//	14 - NES APU
+		//	15 - MultiPCM
+		//	16 - UPD7759
+		//	17 - OKIM6258
+		//	18 - OKIM6295
+		//	19 - K051649
+		//	1A - K054539
+		//	1B - HuC6280
+		//	1C - C140
+		//	1D - K053260
+		//	1E - Pokey
+		//	1F - QSound
+		//	20 - YMF292/SCSP
+		//	21 - WonderSwan
+		//	22 - VSU
+		//	23 - SAA1099
+		//	24 - ES5503
+		//	25 - ES5506
+		//	26 - X1-010
+		//	27 - C352
+		//	28 - GA20
+		TempBuf.Left = 0x00;
+		TempBuf.Right = 0x00;
+		CurCLst = p->ChipListAll;
+		while(CurCLst != NULL)
+		{
+			if (! CurCLst->COpts->Disabled)
+			{
+				ResampleChipStream(p, CurCLst, &TempBuf, 1);
+			}
+			CurCLst = CurCLst->next;
+		}
+
+		// ChipData << 9 ChipVol >> 5 << 8 MstVol >> 11 -> 9-5+8-11 = <<1
+		TempBuf.Left = ((TempBuf.Left >> 5) * CurMstVol) >> 11;
+		TempBuf.Right = ((TempBuf.Right >> 5) * CurMstVol) >> 11;
+		if (p->SurroundSound)
+			TempBuf.Right *= -1;
+		BufferCurSmpl.Left = Limit2Short(TempBuf.Left);
+		BufferCurSmpl.Right = Limit2Short(TempBuf.Right);
+
+		if (p->FadePlay && ! p->FadeStart)
+		{
+			p->FadeStart = p->PlayingTime;
+			RecalcStep = p->FadePlay ? p->SampleRate / 100 : 0;
+		}
+		if (RecalcStep && ! (CurSmpl % RecalcStep))
+			CurMstVol = RecalcFadeVolume(p);
+
+		if (p->VGMEnd)
+		{
+ if (! p->EndPlay)
+ {
+ p->EndPlay = true;
+ break;
+ }
+ }
+	}
+
+	return CurSmpl;
+}
+
+// ChanCount is an array of 3, for the 3 mute masks per chip
+static void GetChipByChannel(void* vgmp, UINT32 channel, UINT8 *ChipID, UINT8 *ChipType, UINT8 *Channel, UINT8 *ChanCount)
+{
+ VGM_PLAYER* p = (VGM_PLAYER *)vgmp;
+ 
+ *ChipType = 0xFF;
+
+ if (p->VGMHead.lngHzPSG)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x00;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ 
+ if (p->VGMHead.lngHzPSG & 0x40000000)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x00;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzYM2413)
+ {
+ if (channel < 14)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x01;
+ *Channel = channel;
+ ChanCount0 = 14;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 14;
+ 
+ if (p->VGMHead.lngHzYM2413 & 0x40000000)
+ {
+ if (channel < 14)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x01;
+ *Channel = channel;
+ ChanCount0 = 14;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 14;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzYM2612)
+ {
+ if (channel < 7)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x02;
+ *Channel = channel;
+ ChanCount0 = 7;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 7;
+ 
+ if (p->VGMHead.lngHzYM2612 & 0x40000000)
+ {
+ if (channel < 7)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x02;
+ *Channel = channel;
+ ChanCount0 = 7;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 7;
+ }
+ }
+
+ if (p->VGMHead.lngHzYM2151)
+ {
+ if (channel < 8)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x03;
+ *Channel = channel;
+ ChanCount0 = 8;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 8;
+ 
+ if (p->VGMHead.lngHzYM2151 & 0x40000000)
+ {
+ if (channel < 8)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x03;
+ *Channel = channel;
+ ChanCount0 = 8;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 8;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzSPCM)
+ {
+ if (channel < 16)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x04;
+ *Channel = channel;
+ ChanCount0 = 16;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 16;
+ 
+ if (p->VGMHead.lngHzSPCM & 0x40000000)
+ {
+ if (channel < 16)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x04;
+ *Channel = channel;
+ ChanCount0 = 16;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 16;
+ }
+ }
+
+ if (p->VGMHead.lngHzRF5C68)
+ {
+ if (channel < 8)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x05;
+ *Channel = channel;
+ ChanCount0 = 8;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 8;
+ }
+
+ if (p->VGMHead.lngHzYM2203)
+ {
+ if (channel < 6)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x06;
+ *Channel = channel;
+ ChanCount0 = 3;
+ ChanCount1 = 0;
+ ChanCount2 = 3;
+ }
+ 
+ channel -= 6;
+ 
+ if (p->VGMHead.lngHzYM2203 & 0x40000000)
+ {
+ if (channel < 6)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x06;
+ *Channel = channel;
+ ChanCount0 = 3;
+ ChanCount1 = 0;
+ ChanCount2 = 3;
+ }
+ 
+ channel -= 6;
+ }
+ }
+
+ if (p->VGMHead.lngHzYM2608)
+ {
+ if (channel < 16)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x07;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 7;
+ ChanCount2 = 3;
+ }
+ 
+ channel -= 16;
+ 
+ if (p->VGMHead.lngHzYM2608 & 0x40000000)
+ {
+ if (channel < 16)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x07;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 7;
+ ChanCount2 = 3;
+ }
+ 
+ channel -= 16;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzYM2610)
+ {
+ if (channel < 16)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x08;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 7;
+ ChanCount2 = 3;
+ }
+ 
+ channel -= 16;
+ 
+ if (p->VGMHead.lngHzYM2610 & 0x40000000)
+ {
+ if (channel < 16)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x08;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 7;
+ ChanCount2 = 3;
+ }
+ 
+ channel -= 16;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzYM3812)
+ {
+ if (channel < 14)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x09;
+ *Channel = channel;
+ ChanCount0 = 14;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 14;
+ 
+ if (p->VGMHead.lngHzYM3812 & 0x40000000)
+ {
+ if (channel < 14)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x09;
+ *Channel = channel;
+ ChanCount0 = 14;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 14;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzYM3526)
+ {
+ if (channel < 15)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x0A;
+ *Channel = channel;
+ ChanCount0 = 15;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 15;
+ 
+ if (p->VGMHead.lngHzYM3526 & 0x40000000)
+ {
+ if (channel < 15)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x0B;
+ *Channel = channel;
+ ChanCount0 = 15;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 15;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzY8950)
+ {
+ if (channel < 15)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x0B;
+ *Channel = channel;
+ ChanCount0 = 15;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 15;
+ 
+ if (p->VGMHead.lngHzY8950 & 0x40000000)
+ {
+ if (channel < 15)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x0B;
+ *Channel = channel;
+ ChanCount0 = 15;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 15;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzYMF262)
+ {
+ if (channel < 23)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x0C;
+ *Channel = channel;
+ ChanCount0 = 23;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 23;
+ 
+ if (p->VGMHead.lngHzYMF262 & 0x40000000)
+ {
+ if (channel < 23)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x0C;
+ *Channel = channel;
+ ChanCount0 = 23;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 23;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzYMF278B)
+ {
+ if (channel < 47)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x0D;
+ *Channel = channel;
+ ChanCount0 = 23;
+ ChanCount1 = 24;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 47;
+ 
+ if (p->VGMHead.lngHzYMF278B & 0x40000000)
+ {
+ if (channel < 47)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x0D;
+ *Channel = channel;
+ ChanCount0 = 23;
+ ChanCount1 = 24;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 47;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzYMF271)
+ {
+ if (channel < 12)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x0E;
+ *Channel = channel;
+ ChanCount0 = 12;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 12;
+ 
+ if (p->VGMHead.lngHzYMF271 & 0x40000000)
+ {
+ if (channel < 12)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x0E;
+ *Channel = channel;
+ ChanCount0 = 12;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 12;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzYMZ280B)
+ {
+ if (channel < 8)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x0F;
+ *Channel = channel;
+ ChanCount0 = 8;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 8;
+ 
+ if (p->VGMHead.lngHzYMZ280B & 0x40000000)
+ {
+ if (channel < 8)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x0F;
+ *Channel = channel;
+ ChanCount0 = 8;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 8;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzRF5C164)
+ {
+ if (channel < 8)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x10;
+ *Channel = channel;
+ ChanCount0 = 8;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 8;
+ }
+ 
+ if (p->VGMHead.lngHzPWM)
+ {
+ if (channel < 1)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x11;
+ *Channel = channel;
+ ChanCount0 = 1;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel--;
+ }
+
+ if (p->VGMHead.lngHzAY8910)
+ {
+ if (channel < 3)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x12;
+ *Channel = channel;
+ ChanCount0 = 3;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 3;
+ 
+ if (p->VGMHead.lngHzAY8910 & 0x40000000)
+ {
+ if (channel < 3)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x12;
+ *Channel = channel;
+ ChanCount0 = 3;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 3;
+ }
+ }
+
+ if (p->VGMHead.lngHzGBDMG)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x13;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ 
+ if (p->VGMHead.lngHzGBDMG & 0x40000000)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x13;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzNESAPU)
+ {
+ if (channel < 6)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x14;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 6;
+ 
+ if (p->VGMHead.lngHzNESAPU & 0x40000000)
+ {
+ if (channel < 6)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x14;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 6;
+ }
+ }
+
+ if (p->VGMHead.lngHzMultiPCM)
+ {
+ if (channel < 28)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x15;
+ *Channel = channel;
+ ChanCount0 = 28;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 28;
+ 
+ if (p->VGMHead.lngHzMultiPCM & 0x40000000)
+ {
+ if (channel < 28)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x15;
+ *Channel = channel;
+ ChanCount0 = 28;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 28;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzUPD7759)
+ {
+ if (channel < 1)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x16;
+ *Channel = channel;
+ ChanCount0 = 1;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel--;
+ 
+ if (p->VGMHead.lngHzUPD7759 & 0x40000000)
+ {
+ if (channel < 1)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x16;
+ *Channel = channel;
+ ChanCount0 = 1;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel--;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzOKIM6258)
+ {
+ if (channel < 1)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x17;
+ *Channel = channel;
+ ChanCount0 = 1;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel--;
+ 
+ if (p->VGMHead.lngHzOKIM6258 & 0x40000000)
+ {
+ if (channel < 1)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x17;
+ *Channel = channel;
+ ChanCount0 = 1;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel--;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzOKIM6295)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x18;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ 
+ if (p->VGMHead.lngHzOKIM6295 & 0x40000000)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x18;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzK051649)
+ {
+ if (channel < 5)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x19;
+ *Channel = channel;
+ ChanCount0 = 5;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 5;
+ 
+ if (p->VGMHead.lngHzK051649 & 0x40000000)
+ {
+ if (channel < 5)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x19;
+ *Channel = channel;
+ ChanCount0 = 5;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 5;
+ }
+ }
+
+ if (p->VGMHead.lngHzK054539)
+ {
+ if (channel < 8)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x1A;
+ *Channel = channel;
+ ChanCount0 = 8;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 8;
+ 
+ if (p->VGMHead.lngHzK054539 & 0x40000000)
+ {
+ if (channel < 8)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x1A;
+ *Channel = channel;
+ ChanCount0 = 8;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 8;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzHuC6280)
+ {
+ if (channel < 6)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x1B;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 6;
+ 
+ if (p->VGMHead.lngHzHuC6280 & 0x40000000)
+ {
+ if (channel < 6)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x1B;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 6;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzC140)
+ {
+ if (channel < 24)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x1C;
+ *Channel = channel;
+ ChanCount0 = 24;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 24;
+ 
+ if (p->VGMHead.lngHzC140 & 0x40000000)
+ {
+ if (channel < 24)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x1C;
+ *Channel = channel;
+ ChanCount0 = 24;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 24;
+ }
+ }
+
+ if (p->VGMHead.lngHzK053260)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x1D;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ 
+ if (p->VGMHead.lngHzK053260 & 0x40000000)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x1D;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzPokey)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x1E;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ 
+ if (p->VGMHead.lngHzPokey & 0x40000000)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x1E;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzQSound)
+ {
+ if (channel < 16)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x1F;
+ *Channel = channel;
+ ChanCount0 = 16;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 16;
+ 
+ if (p->VGMHead.lngHzQSound & 0x40000000)
+ {
+ if (channel < 16)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x1F;
+ *Channel = channel;
+ ChanCount0 = 16;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 16;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzSCSP)
+ {
+ if (channel < 32)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x20;
+ *Channel = channel;
+ ChanCount0 = 32;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 32;
+ 
+ if (p->VGMHead.lngHzSCSP & 0x40000000)
+ {
+ if (channel < 32)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x20;
+ *Channel = channel;
+ ChanCount0 = 32;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 32;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzWSwan)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x21;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ 
+ if (p->VGMHead.lngHzWSwan & 0x40000000)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x21;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzVSU)
+ {
+ if (channel < 6)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x22;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 6;
+ 
+ if (p->VGMHead.lngHzVSU & 0x40000000)
+ {
+ if (channel < 6)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x22;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 6;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzSAA1099)
+ {
+ if (channel < 6)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x23;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 6;
+ 
+ if (p->VGMHead.lngHzSAA1099 & 0x40000000)
+ {
+ if (channel < 6)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x23;
+ *Channel = channel;
+ ChanCount0 = 6;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 6;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzES5503)
+ {
+ if (channel < 32)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x24;
+ *Channel = channel;
+ ChanCount0 = 32;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 32;
+ 
+ if (p->VGMHead.lngHzES5503 & 0x40000000)
+ {
+ if (channel < 32)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x24;
+ *Channel = channel;
+ ChanCount0 = 32;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 32;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzES5506)
+ {
+ if (channel < 32)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x25;
+ *Channel = channel;
+ ChanCount0 = 32;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 32;
+ 
+ if (p->VGMHead.lngHzES5506 & 0x40000000)
+ {
+ if (channel < 32)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x25;
+ *Channel = channel;
+ ChanCount0 = 32;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 32;
+ }
+ }
+
+ if (p->VGMHead.lngHzX1_010)
+ {
+ if (channel < 16)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x26;
+ *Channel = channel;
+ ChanCount0 = 16;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 16;
+ 
+ if (p->VGMHead.lngHzX1_010 & 0x40000000)
+ {
+ if (channel < 16)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x26;
+ *Channel = channel;
+ ChanCount0 = 16;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 16;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzC352)
+ {
+ if (channel < 32)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x27;
+ *Channel = channel;
+ ChanCount0 = 32;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 32;
+ 
+ if (p->VGMHead.lngHzC352 & 0x40000000)
+ {
+ if (channel < 32)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x27;
+ *Channel = channel;
+ ChanCount0 = 32;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 32;
+ }
+ }
+ 
+ if (p->VGMHead.lngHzGA20)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x00;
+ *ChipType = 0x28;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ 
+ if (p->VGMHead.lngHzGA20 & 0x40000000)
+ {
+ if (channel < 4)
+ {
+ *ChipID = 0x01;
+ *ChipType = 0x28;
+ *Channel = channel;
+ ChanCount0 = 4;
+ ChanCount1 = 0;
+ ChanCount2 = 0;
+ }
+ 
+ channel -= 4;
+ }
+ }
+}
+
+const char* GetAccurateChipNameByChannel(void* vgmp, UINT32 channel, UINT32 *realChannel)
+{
+ UINT8 ChipID, ChipType, SubType, Channel, ChanCount3;
+ GetChipByChannel(vgmp, channel, &ChipID, &ChipType, &Channel, ChanCount);
+ if (ChipType == 0xFF)
+ return NULL;
+ *realChannel = Channel;
+ GetChipClock(vgmp, ChipType, &SubType);
+ return GetAccurateChipName(ChipType, SubType);
+}
+
+void SetChannelMute(void* vgmp, UINT32 channel, UINT8 mute)
+{
+ VGM_PLAYER *p = (VGM_PLAYER *)vgmp;
+ 
+ UINT8 ChipID, ChipType, Channel, ChanCount3;
+ 
+ CHIP_OPTS *opts;
+ 
+ UINT8 FieldNumber;
+ 
+ UINT32 *ChnMutes;
+ 
+ GetChipByChannel(vgmp, channel, &ChipID, &ChipType, &Channel, ChanCount);
+ 
+ if (ChipType == 0xFF)
+ return;
+
+ opts = (CHIP_OPTS *)(&p->ChipOptsChipID) + ChipType;
+ 
+ ChnMutes = (UINT32 *)(&opts->ChnMute1);
+ 
+ for (FieldNumber = 0; FieldNumber < 3; FieldNumber++)
+ {
+ if (Channel < ChanCountFieldNumber)
+ {
+ if (mute)
+ ChnMutesFieldNumber |= 1 << Channel;
+ else
+ ChnMutesFieldNumber &= ~(1 << Channel);
+ break;
+ }
+ 
+ Channel -= ChanCountFieldNumber;
+ }
+ 
+ Chips_GeneralActions(p, 0x10);
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.h Added

@@ -0,0 +1,296 @@
+// Header File for structures and constants used within VGMPlay.c
+
+#include "chips/mamedef.h"
+
+#include "VGMFile.h"
+
+#include "VGMPlay_Intf.h"
+
+#define VGMPLAY_VER_STR	"0.40.7"
+//#define APLHA
+//#define BETA
+#define VGM_VER_STR		"1.71b"
+#define VGM_VER_NUM		0x170
+
+#define CHIP_COUNT	0x29
+typedef struct chip_options
+{
+	bool Disabled;
+	UINT8 EmuCore;
+	UINT8 ChnCnt;
+	// Special Flags:
+	//	YM2612:	Bit 0 - DAC Highpass Enable, Bit 1 - SSG-EG Enable
+	//	YM-OPN:	Bit 0 - Disable AY8910-Part
+	UINT16 SpecialFlags;
+
+	// Channel Mute Mask - 1 Channel is represented by 1 bit
+	UINT32 ChnMute1;
+	// Mask 2 - used by YMF287B for OPL4 Wavetable Synth and by YM2608/YM2610 for PCM
+	UINT32 ChnMute2;
+	// Mask 3 - used for the AY-part of some OPN-chips
+	UINT32 ChnMute3;
+
+	INT16* Panning;
+} CHIP_OPTS;
+typedef struct chips_options
+{
+	CHIP_OPTS SN76496;
+	CHIP_OPTS YM2413;
+	CHIP_OPTS YM2612;
+	CHIP_OPTS YM2151;
+	CHIP_OPTS SegaPCM;
+	CHIP_OPTS RF5C68;
+	CHIP_OPTS YM2203;
+	CHIP_OPTS YM2608;
+	CHIP_OPTS YM2610;
+	CHIP_OPTS YM3812;
+	CHIP_OPTS YM3526;
+	CHIP_OPTS Y8950;
+	CHIP_OPTS YMF262;
+	CHIP_OPTS YMF278B;
+	CHIP_OPTS YMF271;
+	CHIP_OPTS YMZ280B;
+	CHIP_OPTS RF5C164;
+	CHIP_OPTS PWM;
+	CHIP_OPTS AY8910;
+	CHIP_OPTS GameBoy;
+	CHIP_OPTS NES;
+	CHIP_OPTS MultiPCM;
+	CHIP_OPTS UPD7759;
+	CHIP_OPTS OKIM6258;
+	CHIP_OPTS OKIM6295;
+	CHIP_OPTS K051649;
+	CHIP_OPTS K054539;
+	CHIP_OPTS HuC6280;
+	CHIP_OPTS C140;
+	CHIP_OPTS K053260;
+	CHIP_OPTS Pokey;
+	CHIP_OPTS QSound;
+	CHIP_OPTS SCSP;
+	CHIP_OPTS WSwan;
+	CHIP_OPTS VSU;
+	CHIP_OPTS SAA1099;
+	CHIP_OPTS ES5503;
+	CHIP_OPTS ES5506;
+	CHIP_OPTS X1_010;
+	CHIP_OPTS C352;
+	CHIP_OPTS GA20;
+//	CHIP_OPTS OKIM6376;
+} CHIPS_OPTION;
+
+typedef void (*strm_func)(void *, stream_sample_t **outputs, int samples);
+
+typedef struct chip_audio_attributes CAUD_ATTR;
+struct chip_audio_attributes
+{
+    UINT32 TargetSmpRate;
+    UINT32 SmpRate;
+		UINT32 LastSmpRate;
+    UINT16 Volume;
+    UINT8 ChipType;
+    UINT8 ChipID;		// 0 - 1st chip, 1 - 2nd chip, etc.
+		void* Resampler;
+    strm_func StreamUpdate;
+    void* StreamUpdateParam;
+    CAUD_ATTR* Paired;
+};
+
+typedef struct chip_audio_struct
+{
+    CAUD_ATTR SN76496;
+    CAUD_ATTR YM2413;
+    CAUD_ATTR YM2612;
+    CAUD_ATTR YM2151;
+    CAUD_ATTR SegaPCM;
+    CAUD_ATTR RF5C68;
+    CAUD_ATTR YM2203;
+    CAUD_ATTR YM2608;
+    CAUD_ATTR YM2610;
+    CAUD_ATTR YM3812;
+    CAUD_ATTR YM3526;
+    CAUD_ATTR Y8950;
+    CAUD_ATTR YMF262;
+    CAUD_ATTR YMF278B;
+    CAUD_ATTR YMF271;
+    CAUD_ATTR YMZ280B;
+    CAUD_ATTR RF5C164;
+    CAUD_ATTR PWM;
+    CAUD_ATTR AY8910;
+    CAUD_ATTR GameBoy;
+    CAUD_ATTR NES;
+    CAUD_ATTR MultiPCM;
+    CAUD_ATTR UPD7759;
+    CAUD_ATTR OKIM6258;
+    CAUD_ATTR OKIM6295;
+    CAUD_ATTR K051649;
+    CAUD_ATTR K054539;
+    CAUD_ATTR HuC6280;
+    CAUD_ATTR C140;
+    CAUD_ATTR K053260;
+    CAUD_ATTR Pokey;
+    CAUD_ATTR QSound;
+    CAUD_ATTR SCSP;
+    CAUD_ATTR WSwan;
+    CAUD_ATTR VSU;
+    CAUD_ATTR SAA1099;
+    CAUD_ATTR ES5503;
+    CAUD_ATTR ES5506;
+    CAUD_ATTR X1_010;
+    CAUD_ATTR C352;
+    CAUD_ATTR GA20;
+    //	CAUD_ATTR OKIM6376;
+} CHIP_AUDIO;
+
+typedef struct chip_aud_list CA_LIST;
+struct chip_aud_list
+{
+    CAUD_ATTR* CAud;
+    CHIP_OPTS* COpts;
+    CA_LIST* next;
+};
+
+typedef struct daccontrol_data
+{
+    bool Enable;
+    UINT8 Bank;
+} DACCTRL_DATA;
+
+typedef struct pcmbank_table
+{
+    UINT8 ComprType;
+    UINT8 CmpSubType;
+    UINT8 BitDec;
+    UINT8 BitCmp;
+    UINT16 EntryCount;
+    void* Entries;
+} PCMBANK_TBL;
+
+typedef struct vgm_player
+{
+    // Options Variables
+    UINT32 SampleRate;	// Note: also used by some sound cores to determinate the chip sample rate
+
+    UINT32 VGMMaxLoop;
+    UINT32 VGMPbRate;	// in Hz, ignored if this value or VGM's lngRate Header value is 0
+#ifdef ADDITIONAL_FORMATS
+    UINT32 CMFMaxLoop;
+#endif
+    UINT32 FadeTime;
+
+    float VolumeLevel;
+    bool SurroundSound;
+    UINT8 HardStopOldVGMs;
+    bool FadeRAWLog;
+    //bool FullBufFill;	// Fill Buffer until it's full
+
+    bool DoubleSSGVol;
+
+    UINT8 ResampleMode;	// 00 - HQ both, 01 - LQ downsampling, 02 - LQ both
+    UINT8 CHIP_SAMPLING_MODE;
+    INT32 CHIP_SAMPLE_RATE;
+
+    CHIPS_OPTION ChipOpts0x02;
+
+    stream_sample_t* DUMMYBUF0x02;
+
+    char* AppPaths8;
+
+    UINT8 FileMode;
+    VGM_HEADER VGMHead;
+    VGM_HDR_EXTRA VGMHeadX;
+    VGM_EXTRA VGMH_Extra;
+    UINT32 VGMDataLen;
+    UINT8* VGMData;
+    GD3_TAG VGMTag;
+
+#define PCM_BANK_COUNT	0x40
+    VGM_PCM_BANK PCMBankPCM_BANK_COUNT;
+    PCMBANK_TBL PCMTbl;
+    UINT8 DacCtrlUsed;
+    UINT8 DacCtrlUsg0xFF;
+    DACCTRL_DATA DacCtrl0xFF;
+
+    CHIP_AUDIO ChipAudio0x02;
+    CAUD_ATTR CA_Paired0x020x03;
+    float MasterVol;
+
+    CA_LIST ChipListBuffer0x200;
+    CA_LIST* ChipListAll;	// all chips needed for playback (in general)
+    //CA_LIST* ChipListOpt;	// ChipListAll minus muted chips
+
+#define SMPL_BUFSIZE	0x100
+    INT32* StreamBufs0x02;
+
+    UINT32 VGMPos;
+    INT32 VGMSmplPos;
+    INT32 VGMSmplPlayed;
+    INT32 VGMSampleRate;
+    UINT32 VGMPbRateMul;
+    UINT32 VGMPbRateDiv;
+    UINT32 VGMSmplRateMul;
+    UINT32 VGMSmplRateDiv;
+    bool VGMEnd;
+    bool EndPlay;
+    bool FadePlay;
+    bool ForceVGMExec;
+    UINT8 PlayingMode;
+    UINT32 PlayingTime;
+    UINT32 FadeStart;
+    UINT32 VGMMaxLoopM;
+    UINT32 VGMCurLoop;
+    float VolumeLevelM;
+    float FinalVol;
+    bool ResetPBTimer;
+
+    UINT8 IsVGMInit;
+    UINT16 Last95Drum;	// for optvgm debugging
+    UINT16 Last95Max;	// for optvgm debugging
+    UINT32 Last95Freq;	// for optvgm debugging
+
+    bool ErrorHappened;
+
+    // the chips' states
+    void * sn764xx2;
+    void * ym24132;
+    void * ym26122;
+    void * ym21512;
+    void * segapcm2;
+    void * rf5c68;
+    void * ym22032;
+    void * ym26082;
+    void * ym26102;
+    void * ym38122;
+    void * ym3812_dual_data2;
+    void * ym35262;
+    void * y89502;
+    void * ymf2622;
+    void * ymf278b2;
+    void * ymf2712;
+    void * ymz280b2;
+    void * rf5c164;
+    void * pwm;
+    void * ay89102;
+    void * gbdmg2;
+    void * nesapu2;
+    void * multipcm2;
+    void * upd77592;
+    void * okim62582;
+    void * okim62952;
+    void * k0516492;
+    void * k0545392;
+    void * huc62802;
+    void * c1402;
+    void * k0532602;
+    void * pokey2;
+    void * qsound2;
+    void * scsp2;
+    void * wswan2;
+    void * vsu2;
+    void * saa10992;
+    void * es55032;
+    void * es550x2;
+    void * x1_0102;
+    void * c3522;
+    void * ga202;
+    void * daccontrol255;
+} VGM_PLAYER;

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay.txt Added

@@ -0,0 +1,159 @@
+VGM Player - Readme
+==========
+
+General
+=======
+Usage: Drop a file on the executable or open the program and type the filename.
+
+Supported files types are:
+- Video Game Music Files (*.vgm, *.vgz)
+- Creative Music Files (*.cmf)
+- DosBox RAW OPL Log Files (*.dro)
+- Playlist files (*.m3u)
+
+Supported chips
+---------------
+- SN76496** (Sega PSG) and T6W28** (NeoGeo Pocket custom)
+- YM2413* (OPLL)
+- YM2612 (OPN2)
+- YM2151 (OPM)
+- SegaPCM
+- RF5C68
+- YM2203 (OPN)
+- YM2608 (OPNA)
+- YM2610/B (OPNB)
+- YM3812* (OPL2)
+- YM3526* (OPL)
+- Y8950* (MSX AUDIO)
+- YMF262* (OP3)
+- YMF278B (OPL4) !
+- YMF271 (OPLX)
+- YMZ280B
+- RF5C164 (Sega MegaCD PCM)
+- PWM (from Sega 32x)
+- AY8910 (MSX PSG)
+- GameBoy DMG
+- NES APU (incl. FDS)
+- MultiPCM
+- UPD7759
+- OKI6258 (Sharp X68000 ADPCM)
+- OKI6295
+- K051649
+- K054539
+- HuC6280 (PC Engine)
+- Namco C140
+- K053260
+- Pokey (Atari)
+- QSound
+- SCSP (Saturn Custom Sound Processor, YMF292-F)
+- WonderSwan
+- Virtual Boy VSU
+- SAA1099
+- ESS5503
+- ESS5505/6
+- Seta X1-010
+- Namco C352
+- Irem GA20
+
+
+* This chip can be emulated via OPL Hardware (like Soundblaster sound cards).
+** OPL hardware emulation is available, but software emulation is prefered. Hardware emulation is used if another chip activates HW emulation or FMForce is True.
+! You need a sample ROM, called yrw801.rom, to make playback work. Place it in the directory where VGMPlay.exe lies.
+
+OPL hardware emulation can be enabled by setting the "FMPort"-entry in the ini-file.
+If you want to use FM Hardware under Windows NT/2000/XP/... you have to install PortTalk.
+PortTalk Website: http://www.beyondlogic.org/porttalk/porttalk.htm
+Under Linux the program must have root rights to use Hardware FM.
+
+It's possible to write Wave-Files by editing the "LogSound"-line in the ini-file.
+Batch conversions are possible by opening a playlist.
+FM Hardware can't be logged to Wave files.
+
+Keys
+----
+You can use the following keys during playback:
+Space - Pause
+Cursor Left/Right - Seek 5 seconds backward/forward
+Ctrl + Cursor Left/Right - Seek 1 minute backward/forward
+ESC/Q - Quit the program
+F - Fade out
+R - Restart current Track
+PageUp/B - Previous Track
+PageDown/N - Next Track
+
+Note: All keys also work during silent sound logging.
+
+
+System Reqiurements
+===================
+It depends on the files you want to play.
+
+Minimum Reqiurements
+--------------------
+Software Emulation:
+
+166 MHz should be enough for SN76496 + YM2612.
+For chips with 12+ FM channels you need probably need at least 700 MHz.
+16 MB RAM (plus a size of the VGM you want to play, so for a 100 MB vgm, you need ~110 MB RAM)
+
+That allows you to play VGMs with up to 2x FM, 2x PSG or FM + PSG + PCM.
+It's NOT enough for YMF271 emulation.
+The YMF262 is equal to 2x FM. The YMF278B is Wavetable + YMF262 (with the latter one disabled if unused).
+
+Hardware FM Playback:
+
+486 with 33 MHz? - I dunno
+On my PII 233 MHz FM Playback takes 3.5% CPU at a maximum.
+
+
+Bugs
+====
+PauseEmulation is disabled under Linux unless FM Hardware is used.
+
+Under Linux you have to double-tap ESC to quit the program (or just press Q). I haven't yet found a way around it.
+
+Sometimes MAME's sound cores tend to sound strange. I already fixed some, but it's not my fault.
+
+Ubuntu refuses to run (or maybe compile) VGMPlay correctly. It either crashes upon opening a vgm file or doesn't open the sound device. (and the ini-file, too. VGMs are opened for some reason.)
+Using Wine with the Windows-version of VGMPlay should work.
+
+It runs fine on openSUSE. (I compile and test it regularly with 12.3 64-bit. Older version were successfully tested with 11.1 32-bit and 11.4 64-bit)
+It also ran fine on the Debian system at university.
+
+
+Comments
+========
+If you want to set some options, open the ini-file. It's well commented.
+
+The T6W28 doesn't use MAME's T6W28 core. Instead I modified the SN76496 core to emulate the T6W28 with 2 SN76496 chips.
+
+The SN76496 OPL emulation is okay, but it's impossible to get the noise sound right.
+
+EMU2413 Emulator was added, because sometimes the one of MAME sounds strange.
+I added the Gens YM2612 core for the same reason (before I fixed MAME's YM2612 core).
+
+I haven't yet found a player that supports all three version of dro files. 
+P.S.: AdPlug now seems to support them.
+
+Some may be wondering, how someone can have the idea to implement OPL Hardware support. Here a more or less small story:
+I like CMF MIDI files, but I was unable to listen to them while doing other things on my computer in Windows 95. It was impossible to listen to them unter Windows 2000. When I found AdPlug, the CMF support was bad and I started to make my VGM Player play CMF files. Debugging wasn't nice - a Pentium2 233MHz isn't stong enough for a Software OPL Emulator in Debug Mode. The OPL2-Port option in AdPlug was interesting (I have a Soundblaster 16) and showed me the power of PortTalk.
+My MIDI-FM Player that got OPL-Hardware-Support earlier than my VGM Player, because playing usual MIDI files requires a lot more debugging than playing simple VGM files. When it was working in my MIDI player, I implemented OPL-Hardware-Support into VGMPlay. Of course the first working chips were OPL/OPL2/OPL3. I remembered that Meka had OPL-Support, too and wrote my OPLL->OPL-Mapper. It sounded quite good, but I was unable to get the PSG and the YM2413 of Space Harrier Theme in sync. So a PSG->OPL-Mapper followed. Later I ported Meka's OPL Mapper, because I liked the bass of some Phantasy Star tunes.
+
+
+Credits
+=======
+This program was written by Valley Bell.
+
+- almost all software emulators are from MAME (http://mamedev.org)
+- EMU2413 and Gens YM2612 were ported from Maxim's in_vgm
+- the YMF278B core was ported from openMSX
+- zlib compression by Jean-loup Gailly and Mark Adler is used
+- all custom OPL Mappers were written using MAME software emulators and the OPL2/3 programming guides by Jeffrey S. Lee and Vladimir Arnost
+- one YM2413 OPL Mapper was ported from MEKA.
+- the RF5C164 and PWM cores were ported from Gens/GS
+- the MAME YM2612 core was fixed with the help of Blargg's MAME YM2612 fix and Genesis Plus GX' YM2612 core
+- AdLibEmu (OPL2 and OPL3 core) was ported from DOSBox
+- The default HuC6280 core is from Ootake.
+- EMU2149, the alternative NES APU core and the NES FDS core were ported from rainwarrior's NSFPlay.
+- the WonderSwan core was ported from in_wsr
+- Virtual Boy VSU core was ported from vbjin and originates from mednafen

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay_Intf.h Added

@@ -0,0 +1,80 @@
+// VGMPlay_Intf.h: VGMPlay Interface Header File
+//
+
+//#define NO_WCHAR_FILENAMES
+#ifndef WIN32
+// Linux uses UTF-8 Unicode and has no special wide-character file routines.
+#define NO_WCHAR_FILENAMES
+#endif
+
+typedef struct waveform_16bit_stereo
+{
+	INT16 Left;
+	INT16 Right;
+} WAVE_16BS;
+
+typedef struct waveform_32bit_stereo
+{
+	INT32 Left;
+	INT32 Right;
+} WAVE_32BS;
+
+typedef struct vgm_file VGM_FILE;
+struct vgm_file
+{
+  int (*Read)(VGM_FILE*, void*, UINT32);
+	int (*Seek)(VGM_FILE*, UINT32);
+	UINT32 (*GetSize)(VGM_FILE*);
+	UINT32 (*Tell)(VGM_FILE*);
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void * VGMPlay_Init(void);
+void VGMPlay_Init2(void* vgmp);
+void VGMPlay_Deinit(void* vgmp);
+
+UINT32 GetGZFileLength(const char* FileName);
+
+bool OpenVGMFile(void* vgmp, const char* FileName);
+bool OpenVGMFile_Handle(void* vgmp, VGM_FILE*);
+void CloseVGMFile(void* vgmp);
+
+void FreeGD3Tag(GD3_TAG* TagData);
+UINT32 GetVGMFileInfo(const char* FileName, VGM_HEADER* RetVGMHead, GD3_TAG* RetGD3Tag);
+UINT32 GetVGMFileInfo_Handle(VGM_FILE*, VGM_HEADER* RetVGMHead, GD3_TAG* RetGD3Tag);
+UINT32 CalcSampleMSec(void* vgmp, UINT64 Value, UINT8 Mode);
+UINT32 CalcSampleMSecExt(void* vgmp, UINT64 Value, UINT8 Mode, VGM_HEADER* FileHead);
+const char* GetChipName(UINT8 ChipID);
+const char* GetAccurateChipName(UINT8 ChipID, UINT8 SubType);
+UINT32 GetChipClock(void* vgmp, UINT8 ChipID, UINT8* RetSubType);
+    
+const char* GetAccurateChipNameByChannel(void* vgmp, UINT32 channel, UINT32 *realChannel);
+    
+void SetChannelMute(void* vgmp, UINT32 channel, UINT8 mute);
+
+#ifndef NO_WCHAR_FILENAMES
+UINT32 GetGZFileLengthW(const wchar_t* FileName);
+bool OpenVGMFileW(void* vgmp, const wchar_t* FileName);
+UINT32 GetVGMFileInfoW(const wchar_t* FileName, VGM_HEADER* RetVGMHead, GD3_TAG* RetGD3Tag);
+#endif
+
+INT32 SampleVGM2Playback(void* vgmp, INT32 SampleVal);
+INT32 SamplePlayback2VGM(void* vgmp, INT32 SampleVal);
+
+void PlayVGM(void* vgmp);
+void StopVGM(void* vgmp);
+void RestartVGM(void* vgmp);
+void SeekVGM(void* vgmp, bool Relative, INT32 PlayBkSamples);
+void RefreshMuting(void* vgmp);
+void RefreshPanning(void* vgmp);
+void RefreshPlaybackOptions(void* vgmp);
+
+UINT32 FillBuffer(void* vgmp, WAVE_16BS* Buffer, UINT32 BufferSize);
+    
+#ifdef __cplusplus
+}
+#endif
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/VGMPlay_Updates.txt Added

@@ -0,0 +1,130 @@
+Update list since 0.4.0u3 (03.12.2012)
+- replaced some larger swich statements with function pointers (small speed up)
+- fixed Stereo flag in SN76496 OPL mapper
+- optimized playback routine (huge speed up, >20% for single-chip VGMs)
+- writing to a second chip if only the first one is defined doesn't cause crashes anymore
+- shortened the Chip Reset, Chip Mute and Chip Panning routines
+- added OKIM6295, OKIM6258 and UPD7759 to DAC Stream Control
+- slight improvements on OPL Hardware Playback
+- fixed bug where VGMPlay Linux was unable to show Unicode characters
+- added multiple paths for VGMPlay.ini and OPL4 ROM
+- VGMPlay Linux is now checking for "vgmplay.ini" as well as "VGMPlay.ini"
+- cleaned the code a bit
+- VGMPlay now frees its memory properly when quitting
+
+17.04.2013 and later:
+- improved skipping code for OPL hardware (to hopefully reduce noise after seeking)
+- made Makefile print short information instead of full gcc command lines
+- added possibility to override volume (+gain) of VGMs when using OPL hardware
+- VGMPlay made it use stderr for error messages
+- added optional debug output for DAC stream control (current data block, frequency)
+- fixed a bug with data blocks being re-read when restarting playback (wasted memory)
+- VGMPlay fixed bug when alternating between OPL hardware playback and emulation without restarting VGMPlay (e.g. via playlist with OPL and non-OPL VGMs)
+- fixed crash where the NES ROM could be written to invalid offsets
+- added alternative AY8910 core (EMU2149)
+- added NES DPCM address overflow behaviour, added alternative DPCM range (based on NSFPlay)
+- VGMPlay prevented it from writing too quickly to the OPL chip on fast computers
+
+15.06.2013 and later:
+- VGMPlay console title now changes to "Song (Game) - VGM Player" while playing
+- VGMPlay made it fall back to Japanese tags if English ones are empty
+- VGMPlay made Console title use Unicode (yes, that works - not like the in-Console text)
+- in_vgm made ANSI GetFileInfo function fall back to Japanese tags if English ones are not present
+- in_vgm fixed Unicode -> ANSI filename conversion bug (caused Unicode Tag function to fail with some non-ANSI filenames)
+- in_vgm fixed File Info Dialog falling back to tags of the other language (it isn't supposed to do that)
+- VGMPlay some Codepage fixes for Windows version, hopefully it now behaves correctly in all cases.
+  The Linux version should now be able to print non-ANSI Unicode characters in tags.
+- VGMPlay Windows now writes Unicode to the console (via WinAPI), so with the non-raster-fonts Japanese characters should work now. (although I only saw square boxes in WinXP, copying and pasting into Notepad worked at least)
+- in_vgm Fixed bug where "Chip Rate" == 0 didn't work and would get reset to 44100 when loading the plugin.
+- fixed bug where YM2612 Database Block caused DAC Stream Control to malfunction or crash (The MAME devs were right - realloc IS evil.)
+- VGMPlay Linux added support for libao
+
+09.09.2013 and later:
+- added WonderSwan support
+- added better SN-PSG name display
+- made it work on Big Endian machines (Thanks to nextvolume for sending me a patch that helped to find the critical spots)
+- cleaned code that loads VGMs a bit
+- shortened the Chip Stop routine
+- applied MAME fixes to YM2413/YMF262 (thread safe now), K051649 (added test register, changed sound generation code a bit), K054539 (replaced sound generation code, might improve reverb), YMZ280B (minor stuff), YMF271 (FM code replaced, sounds different now!)
+- added NES APU database block type
+- added NES APU to 0x68 command (RAM write from database) and fixed its dual chip support
+- ported NES APU/DMC emulator from NSFPlay 2.2
+- ported NES FDS emulator from NSFPlay 2.3
+- fixed MAME NES emulator reset
+- fixed MAME NES (and maybe others?) unmuting all channels when restarting a song or seeking back
+- added EMU2149 to YM2203, YM2608 and YM2610, fixes wrong AY-PSG tones in some VGMs (bug is still present with MAME's AY core)
+- VGMPlay modified makefile to make it easier to compile VGMPlay using MSYS/MinGW
+- in_vgm fixed crash when trying to mute channels after opening Winamp, but before any song was played
+- in_vgm added options from VGMPlay.ini to in_vgm.ini
+- in_vgm fixed track length display bug after changing the playback rate
+- VGMPlay Linux fixed warnings that are printed from ym2612.c
+- added VRC7 mode for YM2413 (reducing features and using separate instrument set)
+- in_vgm made OK button of File Dialog return another error code to Winamp to prevent a playlist bug
+
+Updates since 0.4.0u4 (02.11.2013)
+- added code for muting channels to K053260 (looks like I forgot that one) and K054539 (lost when applying MAME fixes)
+- made K054539 use a proper clock (with a fallback for older VGMs)
+- added a small hack that allows mid-song sample rate changes for the OKIM6258 chip (I'll make a proper implementation for 0.41)
+- VGMPlay fixed absolute paths in m3u files
+- VGMPlay fixed path handling, makes paths that contain / and \ work in both Windows and Unix, fixes m3u Windows paths under Unix
+- fixed pitch of YM2608 ADPCM Tom Tom and Rim Shot (reported by MaliceX)
+- fixed YM2612 Timer A (there are still tiny rounding errors though), this fixed the CSM mode
+- fixed probable YM2612 bug (CSM mode was able to prevent KeyOn/Off commands on channels other than FM3)
+- fixed noise calculation in MAME's AY8910 (applied latest MAME update)
+- fixed a few crashes related to corrupted VGM headers with invalid offsets and insane clock values (though not all)
+- VGMPlay MuteWTCh# now works in VGMPlay.ini
+- fixed clicks in YMF278B core (introduced when porting it from openMSX)
+- VGMPlay fixed length display when VGMs play slower/faster after using the PlaybackRate option
+- fixed bug where VGZs with additional 00s at the end won't play (because VGMPlay will read an unpacked size of 0 bytes)
+- changed Endianess of SCSP RAM data to Big Endian (as it should be)
+- applied MAME QSound fixes (key on register, chip initialization)
+- removed last A from AY-3-8910A and variants
+- added an option to force OKIM6258 into 12-bit mode (makes it louder sometimes, but an internal 12-bit calculation seems to be more correct)
+- VGMs using the OKIM6258 or OKIM6295 are now half as loud (affects global volume only, not chip-relative volume)
+- VGMPlay fixed crash that happened on Linux when trying to display a large Notes tag (thanks to vampi-the-frog for the report)
+- OKIM6258 lowers its output signal faster if there's no incoming data (reduces clicks)
+
+Updates since 0.4.0u5 (13.04.2014)
+- fixed panning in AdLibEmu with 4-op instruments (it used the bits from Channel+0 instead of Channel+3)
+- fixed panning in AdLibEmu for rhythm channels
+- VGMPlay fixed YM2608/YM2610 DeltaT-channel not being muteable via MuteMask_PCM
+- VGMPlay fixed muting of YM278B's FM drums
+- applied MAME YM2612 Timer fix (said to fix SFX in Streets of Rage 2, see MAME Testers 05049)
+- fixed C140 sub chip type and C140/System 21 banking (using current MAME code)
+- added code to handle "real" C140 clock
+- VGMPlay fixed "make install" (the share/vgmplay/ folder was created without "execute" rights for users)
+- improved OKIM6258 data cache (should reduce clicks a bit)
+- YMF278B: fixed OPL3 register writes and OPL3 chip clock
+- applied MAME K053260 DPCM decoding fix
+- applied MAME OPLx Key Scale Level fix
+- added 40h-byte-FIFO to UPD7759 chip when in Slave mode, based on how Sega Pico games work
+- fixed T6W28 muting (Noise channel muting was controlled by chip #2, affected in_vgm only)
+  Thanks to the developers of foo_input_vgm for noticing this bug.
+- added NMK112 banking to OKIM6295 emulation
+- added callback function for chip sample rate change
+  -> replaces OKIM6258 hack
+  -> fixes OPN SSG with MAME AY emulation
+  -> makes OKIM6295 clock changes work
+- added routines for wide-character file names (only used by in_vgm for now)
+- fixed RAM write range check for RF5C68 and RF5C164
+- made OKIM6258 FIFO queue larger, added RemoveDCOfs option
+- VGMPlay fixed tag display under Windows 95
+- fixed YM2151 internal sample clipping (works like YM2612 now, can reduce distortion)
+- fixed SegaPCM volume register bitmask thanks ctr for finding the bug
+- fix potential crash in MultiPCM chip when playing invalid instruments
+- fixed buggy frequency writes in K051649 by backporting some MAME changes
+- added VSU, SAA1099 support
+- fixed high beep in NSFPlay NES core with triangle at frequency 0 and OPT_TRI_NULL option
+- VGMPlay fixed YM2612 DAC not being muteable via MuteMask
+- added ES5503, ES5506, Seta X1-010, Namco C352, Irem GA20 support
+- VGMPlay fixed Loop Length (is now adjusted for changed playback rates)
+
+Updates since 0.4.0u6 (30.05.2015)
+- fixed SAA1099 muting (muting channel 1 or 4 prevented the envelope generator from running, thus muting 0-2 or 3-5 respectively)
+- made SAA1099 output bipolar
+- VGMPlay fix compiling under Linux (broken since Wide-Charcter file name support)
+- fixed ES5503 sample rate (divider was off by one)
+- applied fix from VOGONS that makes the SAA1099 core actually use the chip clock
+- fixed YMF278B's FM part being emulated at wrong sample rate
+- fixed Irem GA20 channel muting
+- fixed playing non-NMK banked OKIM6295 VGMs after NMK-banked ones

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.c Added

@@ -0,0 +1,197 @@
+/***************************************************************************
+
+ 2151intf.c
+
+ Support interface YM2151(OPM)
+
+***************************************************************************/
+
+#include <stdlib.h>
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "fm.h"
+#include "2151intf.h"
+#include "ym2151.h"
+
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+typedef struct _ym2151_state ym2151_state;
+struct _ym2151_state
+{
+	//sound_stream *			stream;
+	//emu_timer *				timer2;
+	void *					chip;
+	UINT8					lastreg;
+	//const ym2151_interface *intf;
+};
+
+
+/*INLINE ym2151_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YM2151);
+	return (ym2151_state *)device->token;
+}*/
+
+//static STREAM_UPDATE( ym2151_update )
+void ym2151_update(void *param, stream_sample_t **outputs, int samples)
+{
+	ym2151_state *info = (ym2151_state *)param;
+	ym2151_update_one(info->chip, outputs, samples);
+	//YM2151UpdateOne(0x00, outputs, samples);
+}
+
+
+//static STATE_POSTLOAD( ym2151intf_postload )
+/*static void ym2151intf_postload(UINT8 ChipID)
+{
+	//ym2151_state *info = (ym2151_state *)param;
+	ym2151_state *info = &YM2151DataChipID;
+	ym2151_postload(info->chip);
+}*/
+
+
+//static DEVICE_START( ym2151 )
+int device_start_ym2151(void **_info, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	//static const ym2151_interface dummy = { 0 };
+	
+	//ym2151_state *info = get_safe_token(device);
+	ym2151_state *info;
+	int rate;
+
+	info = (ym2151_state *) calloc(1, sizeof(ym2151_state));
+	*_info = (void *) info;	
+
+	rate = clock/64;
+	if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	//info->intf = device->static_config ? (const ym2151_interface *)device->static_config : &dummy;
+	//info->intf = &dummy;
+
+	/* stream setup */
+	//info->stream = stream_create(device,0,2,rate,info,ym2151_update);
+
+	info->chip = ym2151_init(clock,rate);
+	//assert_always(info->chip != NULL, "Error creating YM2151 chip");
+
+	//state_save_register_postload(device->machine, ym2151intf_postload, info);
+
+	//ym2151_set_irq_handler(info->chip,info->intf->irqhandler);
+	//ym2151_set_port_write_handler(info->chip,info->intf->portwritehandler);
+
+	return rate;
+}
+
+
+//static DEVICE_STOP( ym2151 )
+void device_stop_ym2151(void *_info)
+{
+	//ym2151_state *info = get_safe_token(device);
+	ym2151_state *info = (ym2151_state *)_info;
+	ym2151_shutdown(info->chip);
+	//YM2151Shutdown();
+	free(info);
+}
+
+//static DEVICE_RESET( ym2151 )
+void device_reset_ym2151(void *_info)
+{
+	//ym2151_state *info = get_safe_token(device);
+	ym2151_state *info = (ym2151_state *)_info;
+	ym2151_reset_chip(info->chip);
+	//YM2151ResetChip(0x00);
+}
+
+
+//READ8_DEVICE_HANDLER( ym2151_r )
+UINT8 ym2151_r(void *_info, offs_t offset)
+{
+	//ym2151_state *token = get_safe_token(device);
+	ym2151_state *token = (ym2151_state *)_info;
+
+	if (offset & 1)
+	{
+		//stream_update(token->stream);
+		return ym2151_read_status(token->chip);
+		//return YM2151ReadStatus(0x00);
+	}
+	else
+		return 0xff;	/* confirmed on a real YM2151 */
+}
+
+//WRITE8_DEVICE_HANDLER( ym2151_w )
+void ym2151_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ym2151_state *token = get_safe_token(device);
+	ym2151_state *token = (ym2151_state *)_info;
+
+	if (offset & 1)
+	{
+		//stream_update(token->stream);
+		ym2151_write_reg(token->chip, token->lastreg, data);
+		//YM2151WriteReg(0x00, token->lastreg, data);
+	}
+	else
+		token->lastreg = data;
+}
+
+
+/*READ8_DEVICE_HANDLER( ym2151_status_port_r ) { return ym2151_r(device, 1); }
+
+WRITE8_DEVICE_HANDLER( ym2151_register_port_w ) { ym2151_w(device, 0, data); }
+WRITE8_DEVICE_HANDLER( ym2151_data_port_w ) { ym2151_w(device, 1, data); }*/
+UINT8 ym2151_status_port_r(void *info, offs_t offset)
+{
+	return ym2151_r(info, 1);
+}
+
+void ym2151_register_port_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2151_w(info, 0, data);
+}
+void ym2151_data_port_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2151_w(info, 1, data);
+}
+
+
+void ym2151_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	ym2151_state *info = (ym2151_state *)_info;
+	ym2151_set_mutemask(info->chip, MuteMask);
+}
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ym2151 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ym2151_state);					break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym2151 );		break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( ym2151 );		break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ym2151 );		break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM2151");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");					break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2151intf.h Added

@@ -0,0 +1,33 @@
+#pragma once
+
+/*typedef struct _ym2151_interface ym2151_interface;
+struct _ym2151_interface
+{
+	//void (*irqhandler)(const device_config *device, int irq);
+	void (*irqhandler)(int irq);
+	write8_device_func portwritehandler;
+};*/
+
+/*READ8_DEVICE_HANDLER( ym2151_r );
+WRITE8_DEVICE_HANDLER( ym2151_w );
+
+READ8_DEVICE_HANDLER( ym2151_status_port_r );
+WRITE8_DEVICE_HANDLER( ym2151_register_port_w );
+WRITE8_DEVICE_HANDLER( ym2151_data_port_w );
+
+DEVICE_GET_INFO( ym2151 );
+#define SOUND_YM2151 DEVICE_GET_INFO_NAME( ym2151 )*/
+void ym2151_update(void *chip, stream_sample_t **outputs, int samples);
+
+int device_start_ym2151(void **chip, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_ym2151(void *chip);
+void device_reset_ym2151(void *chip);
+
+UINT8 ym2151_r(void *chip, offs_t offset);
+void ym2151_w(void *chip, offs_t offset, UINT8 data);
+
+UINT8 ym2151_status_port_r(void *chip, offs_t offset);
+void ym2151_register_port_w(void *chip, offs_t offset, UINT8 data);
+void ym2151_data_port_w(void *chip, offs_t offset, UINT8 data);
+
+void ym2151_set_mute_mask(void *chip, UINT32 MuteMask);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.c Added

@@ -0,0 +1,462 @@
+#include <math.h>
+#include <string.h>	// for memset
+#include <stdlib.h>	// for free
+#include <stddef.h>	// for NULL
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "2203intf.h"
+#include "fm.h"
+
+
+#ifdef ENABLE_ALL_CORES
+#define EC_MAME		0x01	// AY8910 core from MAME
+#endif
+#define EC_EMU2149	0x00
+
+typedef struct _ym2203_state ym2203_state;
+struct _ym2203_state
+{
+	//sound_stream *	stream;
+	//emu_timer *		timer2;
+	void *			chip;
+	void *			psg;
+	ym2203_interface intf;
+	int			AY_EMU_CORE;
+	//const device_config *device;
+};
+
+#define CHTYPE_YM2203	0x20
+
+
+/*INLINE ym2203_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YM2203);
+	return (ym2203_state *)device->token;
+}*/
+
+
+static void psg_set_clock(void *param, int clock)
+{
+	ym2203_state *info = (ym2203_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_set_clock_ym(info->psg, clock);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_set_clock((PSG*)info->psg, clock);
+			break;
+		}
+	}
+}
+
+static void psg_write(void *param, int address, int data)
+{
+	ym2203_state *info = (ym2203_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_write_ym(info->psg, address, data);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_writeIO((PSG*)info->psg, address, data);
+			break;
+		}
+	}
+}
+
+static int psg_read(void *param)
+{
+	ym2203_state *info = (ym2203_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			return ay8910_read_ym(info->psg);
+#endif
+		case EC_EMU2149:
+			return PSG_readIO((PSG*)info->psg);
+		}
+	}
+	return 0x00;
+}
+
+static void psg_reset(void *param)
+{
+	ym2203_state *info = (ym2203_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_reset_ym(info->psg);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_reset((PSG*)info->psg);
+			break;
+		}
+	}
+}
+
+static const ssg_callbacks psgintf =
+{
+	psg_set_clock,
+	psg_write,
+	psg_read,
+	psg_reset
+};
+
+/* IRQ Handler */
+/*static void IRQHandler(void *param,int irq)
+{
+	ym2203_state *info = (ym2203_state *)param;
+	if (info->intf.handler != NULL)
+		//(*info->intf->handler)(info->device, irq);
+		(*info->intf.handler)(irq);
+}*/
+
+/* Timer overflow callback from timer.c */
+/*static TIMER_CALLBACK( timer_callback_2203_0 )
+{
+	ym2203_state *info = (ym2203_state *)ptr;
+	ym2203_timer_over(info->chip,0);
+}
+
+static TIMER_CALLBACK( timer_callback_2203_1 )
+{
+	ym2203_state *info = (ym2203_state *)ptr;
+	ym2203_timer_over(info->chip,1);
+}*/
+
+static stream_sample_t* DUMMYBUF0x02 = {NULL, NULL};
+
+/* update request from fm.c */
+void ym2203_update_request(void *param)
+{
+	ym2203_state *info = (ym2203_state *)param;
+	//stream_update(info->stream);
+	
+	ym2203_update_one(info->chip, DUMMYBUF, 0);
+	// We really don't need this.
+	/*if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_update_one(info->psg, DUMMYBUF, 0);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_calc_stereo((PSG*)info->psg, DUMMYBUF, 0);
+			break;
+		}
+	}*/
+}
+
+
+/*static void timer_handler(void *param,int c,int count,int clock)
+{
+	ym2203_state *info = (ym2203_state *)param;
+	if( count == 0 )
+	{	// Reset FM Timer
+		//timer_enable(info->timerc, 0);
+	}
+	else
+	{	// Start FM Timer
+		//attotime period = attotime_mul(ATTOTIME_IN_HZ(clock), count);
+		//if (!timer_enable(info->timerc, 1))
+		//	timer_adjust_oneshot(info->timerc, period, 0);
+	}
+}*/
+
+//static STREAM_UPDATE( ym2203_stream_update )
+void ym2203_stream_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	//ym2203_state *info = (ym2203_state *)param;
+	ym2203_state *info = (ym2203_state *)_info;
+	ym2203_update_one(info->chip, outputs, samples);
+}
+
+void ym2203_stream_update_ay(void *_info, stream_sample_t **outputs, int samples)
+{
+	//ym2203_state *info = (ym2203_state *)param;
+	ym2203_state *info = (ym2203_state *)_info;
+	
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_update_one(info->psg, outputs, samples);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_calc_stereo((PSG*)info->psg, outputs, samples);
+			break;
+		}
+	}
+	else
+	{
+		memset(outputs0, 0x00, samples * sizeof(stream_sample_t));
+		memset(outputs1, 0x00, samples * sizeof(stream_sample_t));
+	}
+}
+
+
+//static STATE_POSTLOAD( ym2203_intf_postload )
+/*static void ym2203_intf_postload(UINT8 ChipID)
+{
+	//ym2203_state *info = (ym2203_state *)param;
+	ym2203_state *info = &YM2203DataChipID;
+	ym2203_postload(info->chip);
+}*/
+
+
+//static DEVICE_START( ym2203 )
+int device_start_ym2203(void **_info, int AY_EMU_CORE, int clock, UINT8 AYDisable, UINT8 AYFlags, int* AYrate, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	static const ym2203_interface generic_2203 =
+	{
+		{
+			AY8910_LEGACY_OUTPUT,
+			AY8910_DEFAULT_LOADS
+			//DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
+		},
+		NULL
+	};
+	//const ym2203_interface *intf = device->static_config ? (const ym2203_interface *)device->static_config : &generic_2203;
+	ym2203_interface* intf;
+	//ym2203_state *info = get_safe_token(device);
+	ym2203_state *info;
+	int rate;
+	int ay_clock;
+
+#ifdef ENABLE_ALL_CORES
+	if (AY_EMU_CORE >= 0x02)
+		AY_EMU_CORE = EC_EMU2149;
+#else
+ AY_EMU_CORE = EC_EMU2149;
+#endif
+
+	info = (ym2203_state *) calloc(1, sizeof(ym2203_state));
+	*_info = (void *)info;
+	
+	info->AY_EMU_CORE = AY_EMU_CORE;
+	rate = clock/72; /* ??? */
+	if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+
+	info->intf = generic_2203;
+	intf = &info->intf;
+	if (AYFlags)
+		intf->ay8910_intf.flags = AYFlags;
+	//info->device = device;
+	//info->psg = ay8910_start_ym(NULL, SOUND_YM2203, device, device->clock, &intf->ay8910_intf);
+	if (! AYDisable)
+	{
+		ay_clock = clock / 2;
+		*AYrate = ay_clock / 8;
+		if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+			CHIP_SAMPLING_MODE == 0x02)
+			*AYrate = CHIP_SAMPLE_RATE;
+		
+		switch(AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			// fits in the most common cases
+			// TODO: remove after being able to change the resampler's sampling rate
+			info->psg = ay8910_start_ym(NULL, CHTYPE_YM2203, ay_clock, &intf->ay8910_intf);
+			break;
+#endif
+		case EC_EMU2149:
+			info->psg = PSG_new(ay_clock, *AYrate);
+			if (info->psg == NULL)
+				return 0;
+			PSG_setVolumeMode((PSG*)info->psg, 1);	// YM2149 volume mode
+			break;
+		}
+	}
+	else
+	{
+		info->psg = NULL;
+		*AYrate = 0;
+	}
+	//assert_always(info->psg != NULL, "Error creating YM2203/AY8910 chip");
+
+	/* Timer Handler set */
+	//info->timer0 = timer_alloc(device->machine, timer_callback_2203_0, info);
+	//info->timer1 = timer_alloc(device->machine, timer_callback_2203_1, info);
+
+	/* stream system initialize */
+	//info->stream = stream_create(device,0,1,rate,info,ym2203_stream_update);
+
+	/* Initialize FM emurator */
+	//info->chip = ym2203_init(info,clock,rate,timer_handler,IRQHandler,&psgintf);
+	info->chip = ym2203_init(info,clock,rate,NULL,NULL,&psgintf);
+	//assert_always(info->chip != NULL, "Error creating YM2203 chip");
+
+	//state_save_register_postload(device->machine, ym2203_intf_postload, info);
+
+	return rate;
+}
+
+//static DEVICE_STOP( ym2203 )
+void device_stop_ym2203(void *_info)
+{
+	//ym2203_state *info = get_safe_token(device);
+	ym2203_state *info = (ym2203_state *)_info;
+	ym2203_shutdown(info->chip);
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_stop_ym(info->psg);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_delete((PSG*)info->psg);
+			break;
+		}
+		info->psg = NULL;
+	}
+	free(info);
+}
+
+//static DEVICE_RESET( ym2203 )
+void device_reset_ym2203(void *_info)
+{
+	//ym2203_state *info = get_safe_token(device);
+	ym2203_state *info = (ym2203_state *)_info;
+	ym2203_reset_chip(info->chip);	// also resets the AY clock
+	//psg_reset(info);	// already done as a callback in ym2203_reset_chip
+}
+
+
+
+//READ8_DEVICE_HANDLER( ym2203_r )
+UINT8 ym2203_r(void *_info, offs_t offset)
+{
+	//ym2203_state *info = get_safe_token(device);
+	ym2203_state *info = (ym2203_state *)_info;
+	return ym2203_read(info->chip, offset & 1);
+}
+
+//WRITE8_DEVICE_HANDLER( ym2203_w )
+void ym2203_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ym2203_state *info = get_safe_token(device);
+	ym2203_state *info = (ym2203_state *)_info;
+	ym2203_write(info->chip, offset & 1, data);
+}
+
+
+//READ8_DEVICE_HANDLER( ym2203_status_port_r )
+UINT8 ym2203_status_port_r(void *info, offs_t offset)
+{
+	return ym2203_r(info, 0);
+}
+//READ8_DEVICE_HANDLER( ym2203_read_port_r )
+UINT8 ym2203_read_port_r(void *info, offs_t offset)
+{
+	return ym2203_r(info, 1);
+}
+//WRITE8_DEVICE_HANDLER( ym2203_control_port_w )
+void ym2203_control_port_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2203_w(info, 0, data);
+}
+//WRITE8_DEVICE_HANDLER( ym2203_write_port_w )
+void ym2203_write_port_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2203_w(info, 1, data);
+}
+
+
+void ym2203_set_mute_mask(void *_info, UINT32 MuteMaskFM, UINT32 MuteMaskAY)
+{
+	ym2203_state *info = (ym2203_state *)_info;
+	ym2203_set_mutemask(info->chip, MuteMaskFM);
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_set_mute_mask_ym(info->psg, MuteMaskAY);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_setMask((PSG*)info->psg, MuteMaskAY);
+			break;
+		}
+	}
+}
+
+void ym2203_set_srchg_cb(void *_info, SRATE_CALLBACK CallbackFunc, void* DataPtr, void* AYDataPtr)
+{
+	ym2203_state *info = (ym2203_state *)_info;
+	
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_set_srchg_cb_ym(info->psg, CallbackFunc, AYDataPtr);
+			break;
+#endif
+		case EC_EMU2149:
+			break;
+		}
+	}
+	
+	return;
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ym2203 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ym2203_state);					break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym2203 );		break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( ym2203 );		break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ym2203 );		break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM2203");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");					break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2203intf.h Added

@@ -0,0 +1,43 @@
+#pragma once
+
+#include "ay8910.h"
+#include "emu2149.h"
+
+void ym2203_update_request(void *param);
+
+typedef struct _ym2203_interface ym2203_interface;
+struct _ym2203_interface
+{
+	ay8910_interface ay8910_intf;
+	//void (*handler)(const device_config *device, int irq);
+	void (*handler)(int irq);
+};
+
+/*READ8_DEVICE_HANDLER( ym2203_r );
+WRITE8_DEVICE_HANDLER( ym2203_w );
+
+READ8_DEVICE_HANDLER( ym2203_status_port_r );
+READ8_DEVICE_HANDLER( ym2203_read_port_r );
+WRITE8_DEVICE_HANDLER( ym2203_control_port_w );
+WRITE8_DEVICE_HANDLER( ym2203_write_port_w );
+
+DEVICE_GET_INFO( ym2203 );
+#define SOUND_YM2203 DEVICE_GET_INFO_NAME( ym2203 )*/
+
+void ym2203_stream_update(void *chip, stream_sample_t **outputs, int samples);
+void ym2203_stream_update_ay(void *chip, stream_sample_t **outputs, int samples);
+
+int device_start_ym2203(void **chip, int core, int clock, UINT8 AYDisable, UINT8 AYFlags, int* AYrate, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_ym2203(void *chip);
+void device_reset_ym2203(void *chip);
+
+UINT8 ym2203_r(void *chip, offs_t offset);
+void ym2203_w(void *chip, offs_t offset, UINT8 data);
+
+UINT8 ym2203_status_port_r(void *chip, offs_t offset);
+UINT8 ym2203_read_port_r(void *chip, offs_t offset);
+void ym2203_control_port_w(void *chip, offs_t offset, UINT8 data);
+void ym2203_write_port_w(void *chip, offs_t offset, UINT8 data);
+
+void ym2203_set_mute_mask(void *chip, UINT32 MuteMaskFM, UINT32 MuteMaskAY);
+void ym2203_set_srchg_cb(void *chip, SRATE_CALLBACK CallbackFunc, void* DataPtr, void* AYDataPtr);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.c Added

@@ -0,0 +1,318 @@
+/****************************************************************
+
+ MAME / MESS functions
+
+****************************************************************/
+
+#include <stdlib.h>
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#ifdef ENABLE_ALL_CORES
+#include "ym2413.h"
+#endif
+#include "emu2413.h"
+#include "2413intf.h"
+
+#ifdef ENABLE_ALL_CORES
+#define EC_MAME		0x01	// YM2413 core from MAME
+#endif
+#define EC_EMU2413	0x00	// EMU2413 core from in_vgm, value 0 because it's better than MAME
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+/* for stream system */
+typedef struct _ym2413_state ym2413_state;
+struct _ym2413_state
+{
+	//sound_stream *	stream;
+	void *			chip;
+	int			EMU_CORE;
+	UINT8			Mode;
+};
+
+static unsigned char vrc7_inst(16 + 3) * 8 =
+{
+#include "vrc7tone.h"
+};
+
+/*INLINE ym2413_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YM2413);
+	return (ym2413_state *)device->token;
+}*/
+
+#ifdef UNUSED_FUNCTION
+void YM2413DAC_update(int chip,stream_sample_t **inputs, stream_sample_t **_buffer,int length)
+{
+ INT16 *buffer = _buffer0;
+ static int out = 0;
+
+ if ( ym2413chip.reg0x0F & 0x01 )
+ {
+ out = ((ym2413chip.reg0x10 & 0xF0) << 7);
+ }
+ while (length--) *(buffer++) = out;
+}
+#endif
+
+//static STREAM_UPDATE( ym2413_stream_update )
+void ym2413_stream_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	ym2413_state *info = (ym2413_state*)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym2413_update_one(info->chip, outputs, samples);
+		break;
+#endif
+	case EC_EMU2413:
+		OPLL_calc_stereo(info->chip, outputs, samples, -1);
+		break;
+	}
+}
+
+#ifdef ENABLE_ALL_CORES
+static stream_sample_t* DUMMYBUF0x02 = {NULL, NULL};
+
+static void _stream_update(void *param, int interval)
+{
+	ym2413_state *info = (ym2413_state *)param;
+	/*stream_update(info->stream);*/
+
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym2413_update_one(info->chip, DUMMYBUF, 0);
+		break;
+#endif
+	case EC_EMU2413:
+		OPLL_calc_stereo(info->chip, DUMMYBUF, 0, -1);
+		break;
+	}
+}
+#endif
+
+//static DEVICE_START( ym2413 )
+int device_start_ym2413(void **_info, int EMU_CORE, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	//ym2413_state *info = get_safe_token(device);
+	ym2413_state *info;
+	int rate;
+
+#ifdef ENABLE_ALL_CORES
+	if (EMU_CORE >= 0x02)
+		EMU_CORE = EC_EMU2413;
+#else
+	EMU_CORE = EC_EMU2413;
+#endif
+
+	info = (ym2413_state *) calloc(1, sizeof(ym2413_state));
+	*_info = (void*) info;
+
+	info->EMU_CORE = EMU_CORE;
+	info->Mode = (clock & 0x80000000) >> 31;
+	clock &= 0x7FFFFFFF;
+
+	rate = clock/72;
+	if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	/* emulator create */
+	switch(EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		info->chip = ym2413_init(clock, rate);
+		if (info->chip == NULL)
+			return 0;
+		//assert_always(info->chip != NULL, "Error creating YM2413 chip");
+		ym2413_set_chip_mode(info->chip, info->Mode);
+
+		/* stream system initialize */
+		//info->stream = stream_create(device,0,2,rate,info,ym2413_stream_update);
+
+		ym2413_set_update_handler(info->chip, _stream_update, info);
+		break;
+#endif
+	case EC_EMU2413:
+		info->chip = OPLL_new(clock, rate);
+		if (info->chip == NULL)
+			return 0;
+
+		OPLL_SetChipMode(info->chip, info->Mode);
+		if (info->Mode)
+			OPLL_setPatch(info->chip, vrc7_inst);
+		break;
+	}
+	// Note: VRC7 instruments are set in device_reset if necessary.
+
+
+
+/*#if 0
+	int i, tst;
+	char name40;
+
+	num = intf->num;
+
+	tst = YM3812_sh_start (msound);
+	if (tst)
+		return 1;
+
+	for (i=0;i<num;i++)
+	{
+		ym2413_reset (i);
+
+		ym2413i.DAC_stream = stream_create(device, 0, 1, device->clock/72, i, YM2413DAC_update);
+
+		if (ym2413i.DAC_stream == -1)
+			return 1;
+	}
+	return 0;
+#endif*/
+
+	return rate;
+}
+
+//static DEVICE_STOP( ym2413 )
+void device_stop_ym2413(void *_info)
+{
+	//ym2413_state *info = get_safe_token(device);
+	ym2413_state *info = (ym2413_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym2413_shutdown(info->chip);
+		break;
+#endif
+	case EC_EMU2413:
+		OPLL_delete(info->chip);
+		break;
+	}
+
+	free(info);
+}
+
+//static DEVICE_RESET( ym2413 )
+void device_reset_ym2413(void *_info)
+{
+	//ym2413_state *info = get_safe_token(device);
+	ym2413_state *info = (ym2413_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym2413_reset_chip(info->chip);
+		if (info->Mode)
+			ym2413_override_patches(info->chip, vrc7_inst);
+		break;
+#endif
+	case EC_EMU2413:
+		OPLL_reset(info->chip);
+		// EMU2413 doesn't reset the patch data in OPLL_reset
+		//if (info->Mode)
+		//	OPLL_setPatch(info->chip, vrc7_inst);
+		break;
+	}
+}
+
+
+//WRITE8_DEVICE_HANDLER( ym2413_w )
+void ym2413_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ym2413_state *info = get_safe_token(device);
+	ym2413_state *info = (ym2413_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym2413_write(info->chip, offset & 1, data);
+		break;
+#endif
+	case EC_EMU2413:
+		OPLL_writeIO(info->chip, offset & 1, data);
+		break;
+	}
+}
+
+//WRITE8_DEVICE_HANDLER( ym2413_register_port_w )
+void ym2413_register_port_w(void *_info, offs_t offset, UINT8 data)
+{
+	ym2413_w(_info, 0, data);
+}
+//WRITE8_DEVICE_HANDLER( ym2413_data_port_w )
+void ym2413_data_port_w(void *_info, offs_t offset, UINT8 data)
+{
+	ym2413_w(_info, 1, data);
+}
+
+
+void ym2413_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	ym2413_state *info = (ym2413_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym2413_set_mutemask(info->chip, MuteMask);
+		break;
+#endif
+	case EC_EMU2413:
+		OPLL_SetMuteMask(info->chip, MuteMask);
+		break;
+	}
+
+	return;
+}
+
+void ym2413_set_panning(void *_info, INT16* PanVals)
+{
+	ym2413_state *info = (ym2413_state *)_info;
+	UINT8 CurChn;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		break;
+#endif
+	case EC_EMU2413:
+		for (CurChn = 0x00; CurChn < 0x0E; CurChn ++)
+			OPLL_set_pan(info->chip, CurChn, PanValsCurChn);
+		break;
+	}
+
+	return;
+}
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ym2413 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ym2413_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym2413 );				break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( ym2413 );				break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ym2413 );				break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM2413");							break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");						break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");								break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);							break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413intf.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2413tone.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.c Added

@@ -0,0 +1,485 @@
+/***************************************************************************
+
+ 2608intf.c
+
+ The YM2608 emulator supports up to 2 chips.
+ Each chip has the following connections:
+ - Status Read / Control Write A
+ - Port Read / Data Write A
+ - Control Write B
+ - Data Write B
+
+***************************************************************************/
+
+#include <string.h>	// for memset
+#include <stdlib.h>	// for free
+#include <stddef.h>	// for NULL
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "2608intf.h"
+//#include "fm.h"
+
+
+#ifdef ENABLE_ALL_CORES
+#define EC_MAME		0x01	// AY8910 core from MAME
+#endif
+#define EC_EMU2149	0x00
+
+typedef struct _ym2608_state ym2608_state;
+struct _ym2608_state
+{
+	//sound_stream *	stream;
+	//emu_timer *	timer2;
+	void *			chip;
+	void *			psg;
+	ym2608_interface intf;
+	int			AY_EMU_CORE;
+	//const device_config *device;
+};
+
+#define CHTYPE_YM2608	0x21
+
+
+/*INLINE ym2608_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YM2608);
+	return (ym2608_state *)device->token;
+}*/
+
+
+
+static void psg_set_clock(void *param, int clock)
+{
+	ym2608_state *info = (ym2608_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_set_clock_ym(info->psg, clock);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_set_clock((PSG*)info->psg, clock);
+			break;
+		}
+	}
+}
+
+static void psg_write(void *param, int address, int data)
+{
+	ym2608_state *info = (ym2608_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_write_ym(info->psg, address, data);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_writeIO((PSG*)info->psg, address, data);
+			break;
+		}
+	}
+}
+
+static int psg_read(void *param)
+{
+	ym2608_state *info = (ym2608_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			return ay8910_read_ym(info->psg);
+#endif
+		case EC_EMU2149:
+			return PSG_readIO((PSG*)info->psg);
+		}
+	}
+	return 0x00;
+}
+
+static void psg_reset(void *param)
+{
+	ym2608_state *info = (ym2608_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_reset_ym(info->psg);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_reset((PSG*)info->psg);
+			break;
+		}
+	}
+}
+
+static const ssg_callbacks psgintf =
+{
+	psg_set_clock,
+	psg_write,
+	psg_read,
+	psg_reset
+};
+
+
+/* IRQ Handler */
+/*static void IRQHandler(void *param,int irq)
+{
+	ym2608_state *info = (ym2608_state *)param;
+	//if(info->intf->handler) info->intf->handler(info->device, irq);
+	if(info->intf.handler) info->intf.handler(irq);
+}*/
+
+/* Timer overflow callback from timer.c */
+/*static TIMER_CALLBACK( timer_callback_2608_0 )
+{
+	ym2608_state *info = (ym2608_state *)ptr;
+	ym2608_timer_over(info->chip,0);
+}
+
+static TIMER_CALLBACK( timer_callback_2608_1 )
+{
+	ym2608_state *info = (ym2608_state *)ptr;
+	ym2608_timer_over(info->chip,1);
+}*/
+
+/*static void timer_handler(void *param,int c,int count,int clock)
+{
+	ym2608_state *info = (ym2608_state *)param;
+	if( count == 0 )
+	{	// Reset FM Timer
+		//timer_enable(info->timerc, 0);
+	}
+	else
+	{	// Start FM Timer
+		//attotime period = attotime_mul(ATTOTIME_IN_HZ(clock), count);
+		//if (!timer_enable(info->timerc, 1))
+		//	timer_adjust_oneshot(info->timerc, period, 0);
+	}
+}*/
+
+static stream_sample_t* DUMMYBUF0x02 = {NULL, NULL};
+
+/* update request from fm.c */
+void ym2608_update_request(void *param)
+{
+	ym2608_state *info = (ym2608_state *)param;
+	//stream_update(info->stream);
+	
+	ym2608_update_one(info->chip, DUMMYBUF, 0);
+	// Not necessary.
+	//if (info->psg != NULL)
+	//	ay8910_update_one(info->psg, DUMMYBUF, 0);
+}
+
+//static STREAM_UPDATE( ym2608_stream_update )
+void ym2608_stream_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	//ym2608_state *info = (ym2608_state *)param;
+	ym2608_state *info = (ym2608_state *)_info;
+	ym2608_update_one(info->chip, outputs, samples);
+}
+
+void ym2608_stream_update_ay(void *_info, stream_sample_t **outputs, int samples)
+{
+	//ym2608_state *info = (ym2608_state *)param;
+	ym2608_state *info = (ym2608_state *)_info;
+	
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_update_one(info->psg, outputs, samples);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_calc_stereo((PSG*)info->psg, outputs, samples);
+			break;
+		}
+	}
+	else
+	{
+		memset(outputs0, 0x00, samples * sizeof(stream_sample_t));
+		memset(outputs1, 0x00, samples * sizeof(stream_sample_t));
+	}
+}
+
+
+//static STATE_POSTLOAD( ym2608_intf_postload )
+/*static void ym2608_intf_postload(UINT8 ChipID)
+{
+	//ym2608_state *info = (ym2608_state *)param;
+	ym2608_state *info = &YM2608DataChipID;
+	ym2608_postload(info->chip);
+}*/
+
+
+//static DEVICE_START( ym2608 )
+int device_start_ym2608(void **_info, int AY_EMU_CORE, int clock, UINT8 AYDisable, UINT8 AYFlags, int* AYrate, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	static const ym2608_interface generic_2608 =
+	{
+		{
+			AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
+			AY8910_DEFAULT_LOADS
+			//DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
+		},
+		NULL
+	};
+	//const ym2608_interface *intf = device->static_config ? (const ym2608_interface *)device->static_config : &generic_2608;
+	ym2608_interface *intf;
+	int rate;
+	int ay_clock;
+	//void *pcmbufa;
+	//int pcmsizea;
+	//ym2608_state *info = get_safe_token(device);
+	ym2608_state *info;
+
+#ifdef ENABLE_ALL_CORES
+	if (AY_EMU_CORE >= 0x02)
+		AY_EMU_CORE = EC_EMU2149;
+#else
+	AY_EMU_CORE = EC_EMU2149;
+#endif
+
+	info = (ym2608_state *) calloc(1, sizeof(ym2608_state));
+	*_info = (void *) info;	
+
+	info->AY_EMU_CORE = AY_EMU_CORE;
+	rate = clock/72;
+	if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	info->intf = generic_2608;
+	intf = &info->intf;
+	if (AYFlags)
+		intf->ay8910_intf.flags = AYFlags;
+	//info->device = device;
+
+	/* FIXME: Force to use single output */
+	//info->psg = ay8910_start_ym(NULL, SOUND_YM2608, clock, &intf->ay8910_intf);
+	if (! AYDisable)
+	{
+		ay_clock = clock / 4;
+		*AYrate = ay_clock / 8;
+		switch(AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			info->psg = ay8910_start_ym(NULL, CHTYPE_YM2608, ay_clock, &intf->ay8910_intf);
+			break;
+#endif
+		case EC_EMU2149:
+			info->psg = PSG_new(ay_clock, *AYrate);
+			if (info->psg == NULL)
+				return 0;
+			PSG_setVolumeMode((PSG*)info->psg, 1);	// YM2149 volume mode
+			break;
+		}
+	}
+	else
+	{
+		info->psg = NULL;
+		*AYrate = 0;
+	}
+	//assert_always(info->psg != NULL, "Error creating YM2608/AY8910 chip");
+
+	/* Timer Handler set */
+	//info->timer0 = timer_alloc(device->machine, timer_callback_2608_0, info);
+	//info->timer1 = timer_alloc(device->machine, timer_callback_2608_1, info);
+
+	/* stream system initialize */
+	//info->stream = stream_create(device,0,2,rate,info,ym2608_stream_update);
+	/* setup adpcm buffers */
+	//pcmbufa = device->region;
+	//pcmsizea = device->regionbytes;
+
+	/* initialize YM2608 */
+	//info->chip = ym2608_init(info,device,device->clock,rate,
+	//	 pcmbufa,pcmsizea,
+	//	 timer_handler,IRQHandler,&psgintf);
+	info->chip = ym2608_init(info, clock, rate, NULL, NULL, &psgintf);
+	//assert_always(info->chip != NULL, "Error creating YM2608 chip");
+
+	//state_save_register_postload(device->machine, ym2608_intf_postload, info);
+
+	return rate;
+}
+
+//static DEVICE_STOP( ym2608 )
+void device_stop_ym2608(void *_info)
+{
+	//ym2608_state *info = get_safe_token(device);
+	ym2608_state *info = (ym2608_state *)_info;
+	ym2608_shutdown(info->chip);
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_stop_ym(info->psg);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_delete((PSG*)info->psg);
+			break;
+		}
+		info->psg = NULL;
+	}
+	free(info);
+}
+
+//static DEVICE_RESET( ym2608 )
+void device_reset_ym2608(void *_info)
+{
+	//ym2608_state *info = get_safe_token(device);
+	ym2608_state *info = (ym2608_state *)_info;
+	ym2608_reset_chip(info->chip);	// also resets the AY clock
+	//psg_reset(info);	// already done as a callback in ym2608_reset_chip
+}
+
+
+//READ8_DEVICE_HANDLER( ym2608_r )
+UINT8 ym2608_r(void *_info, offs_t offset)
+{
+	//ym2608_state *info = get_safe_token(device);
+	ym2608_state *info = (ym2608_state *)_info;
+	return ym2608_read(info->chip, offset & 3);
+}
+
+//WRITE8_DEVICE_HANDLER( ym2608_w )
+void ym2608_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ym2608_state *info = get_safe_token(device);
+	ym2608_state *info = (ym2608_state *)_info;
+	ym2608_write(info->chip, offset & 3, data);
+}
+
+//READ8_DEVICE_HANDLER( ym2608_read_port_r )
+UINT8 ym2608_read_port_r(void *info, offs_t offset)
+{
+	return ym2608_r(info, 1);
+}
+//READ8_DEVICE_HANDLER( ym2608_status_port_a_r )
+UINT8 ym2608_status_port_a_r(void *info, offs_t offset)
+{
+	return ym2608_r(info, 0);
+}
+//READ8_DEVICE_HANDLER( ym2608_status_port_b_r )
+UINT8 ym2608_status_port_b_r(void *info, offs_t offset)
+{
+	return ym2608_r(info, 2);
+}
+
+//WRITE8_DEVICE_HANDLER( ym2608_control_port_a_w )
+void ym2608_control_port_a_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2608_w(info, 0, data);
+}
+//WRITE8_DEVICE_HANDLER( ym2608_control_port_b_w )
+void ym2608_control_port_b_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2608_w(info, 2, data);
+}
+//WRITE8_DEVICE_HANDLER( ym2608_data_port_a_w )
+void ym2608_data_port_a_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2608_w(info, 1, data);
+}
+//WRITE8_DEVICE_HANDLER( ym2608_data_port_b_w )
+void ym2608_data_port_b_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2608_w(info, 3, data);
+}
+
+
+void ym2608_write_data_pcmrom(void *_info, UINT8 rom_id, offs_t ROMSize, offs_t DataStart,
+							 offs_t DataLength, const UINT8* ROMData)
+{
+	ym2608_state* info = (ym2608_state *)_info;
+	ym2608_write_pcmrom(info->chip, rom_id, ROMSize, DataStart, DataLength, ROMData);
+}
+
+void ym2608_set_mute_mask(void *_info, UINT32 MuteMaskFM, UINT32 MuteMaskAY)
+{
+	ym2608_state* info = (ym2608_state *)_info;
+	ym2608_set_mutemask(info->chip, MuteMaskFM);
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_set_mute_mask_ym(info->psg, MuteMaskAY);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_setMask((PSG*)info->psg, MuteMaskAY);
+			break;
+		}
+	}
+}
+
+void ym2608_set_srchg_cb(void *_info, SRATE_CALLBACK CallbackFunc, void* DataPtr, void* AYDataPtr)
+{
+	ym2608_state* info = (ym2608_state *)_info;
+	
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_set_srchg_cb_ym(info->psg, CallbackFunc, AYDataPtr);
+			break;
+#endif
+		case EC_EMU2149:
+			break;
+		}
+	}
+	
+	return;
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ym2608 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ym2608_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym2608 );				break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( ym2608 );				break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ym2608 );				break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM2608");							break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");						break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");								break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);							break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2608intf.h Added

@@ -0,0 +1,54 @@
+#pragma once
+
+#include "fm.h"
+#include "ay8910.h"
+#include "emu2149.h"
+
+void ym2608_update_request(void *param);
+
+typedef struct _ym2608_interface ym2608_interface;
+struct _ym2608_interface
+{
+	ay8910_interface ay8910_intf;
+	//void ( *handler )( const device_config *device, int irq );	/* IRQ handler for the YM2608 */
+	void ( *handler )( int irq );	/* IRQ handler for the YM2608 */
+};
+
+/*READ8_DEVICE_HANDLER( ym2608_r );
+WRITE8_DEVICE_HANDLER( ym2608_w );
+
+READ8_DEVICE_HANDLER( ym2608_read_port_r );
+READ8_DEVICE_HANDLER( ym2608_status_port_a_r );
+READ8_DEVICE_HANDLER( ym2608_status_port_b_r );
+
+WRITE8_DEVICE_HANDLER( ym2608_control_port_a_w );
+WRITE8_DEVICE_HANDLER( ym2608_control_port_b_w );
+WRITE8_DEVICE_HANDLER( ym2608_data_port_a_w );
+WRITE8_DEVICE_HANDLER( ym2608_data_port_b_w );
+
+DEVICE_GET_INFO( ym2608 );
+#define SOUND_YM2608 DEVICE_GET_INFO_NAME( ym2608 )*/
+
+void ym2608_stream_update(void *chip, stream_sample_t **outputs, int samples);
+void ym2608_stream_update_ay(void *chip, stream_sample_t **outputs, int samples);
+
+int device_start_ym2608(void **chip, int core, int clock, UINT8 AYDisable, UINT8 AYFlags, int* AYrate, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_ym2608(void *chip);
+void device_reset_ym2608(void *chip);
+
+UINT8 ym2608_r(void *chip, offs_t offset);
+void ym2608_w(void *chip, offs_t offset, UINT8 data);
+
+UINT8 ym2608_read_port_r(void *chip, offs_t offset);
+UINT8 ym2608_status_port_a_r(void *chip, offs_t offset);
+UINT8 ym2608_status_port_b_r(void *chip, offs_t offset);
+
+void ym2608_control_port_a_w(void *chip, offs_t offset, UINT8 data);
+void ym2608_control_port_b_w(void *chip, offs_t offset, UINT8 data);
+void ym2608_data_port_a_w(void *chip, offs_t offset, UINT8 data);
+void ym2608_data_port_b_w(void *chip, offs_t offset, UINT8 data);
+
+void ym2608_write_data_pcmrom(void *chip, UINT8 rom_id, offs_t ROMSize, offs_t DataStart,
+							  offs_t DataLength, const UINT8* ROMData);
+void ym2608_set_mute_mask(void *chip, UINT32 MuteMaskFM, UINT32 MuteMaskAY);
+void ym2608_set_srchg_cb(void *chip, SRATE_CALLBACK CallbackFunc, void* DataPtr, void* AYDataPtr);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.c Added

@@ -0,0 +1,494 @@
+/***************************************************************************
+
+ 2610intf.c
+
+ The YM2610 emulator supports up to 2 chips.
+ Each chip has the following connections:
+ - Status Read / Control Write A
+ - Port Read / Data Write A
+ - Control Write B
+ - Data Write B
+
+***************************************************************************/
+
+#include <string.h>	// for memset
+#include <stdlib.h>	// for free
+#include <stddef.h>	// for NULL
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "2610intf.h"
+#include "fm.h"
+
+
+#ifdef ENABLE_ALL_CORES
+#define EC_MAME		0x01	// AY8910 core from MAME
+#endif
+#define EC_EMU2149	0x00
+
+typedef struct _ym2610_state ym2610_state;
+struct _ym2610_state
+{
+	//sound_stream *	stream;
+	//emu_timer *		timer2;
+	void *			chip;
+	void *			psg;
+	int			AY_EMU_CORE;
+	//const ym2610_interface *intf;
+	//const device_config *device;
+};
+
+#define CHTYPE_YM2610	0x22
+
+
+/*INLINE ym2610_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YM2610 || sound_get_type(device) == SOUND_YM2610B);
+	return (ym2610_state *)device->token;
+}*/
+
+
+static void psg_set_clock(void *param, int clock)
+{
+	ym2610_state *info = (ym2610_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_set_clock_ym(info->psg, clock);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_set_clock((PSG*)info->psg, clock);
+			break;
+		}
+	}
+}
+
+static void psg_write(void *param, int address, int data)
+{
+	ym2610_state *info = (ym2610_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_write_ym(info->psg, address, data);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_writeIO((PSG*)info->psg, address, data);
+			break;
+		}
+	}
+}
+
+static int psg_read(void *param)
+{
+	ym2610_state *info = (ym2610_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			return ay8910_read_ym(info->psg);
+#endif
+		case EC_EMU2149:
+			return PSG_readIO((PSG*)info->psg);
+		}
+	}
+	return 0x00;
+}
+
+static void psg_reset(void *param)
+{
+	ym2610_state *info = (ym2610_state *)param;
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_reset_ym(info->psg);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_reset((PSG*)info->psg);
+			break;
+		}
+	}
+}
+
+static const ssg_callbacks psgintf =
+{
+	psg_set_clock,
+	psg_write,
+	psg_read,
+	psg_reset
+};
+
+/*------------------------- TM2610 -------------------------------*/
+/* IRQ Handler */
+/*static void IRQHandler(void *param,int irq)
+{
+	ym2610_state *info = (ym2610_state *)param;
+	//if(info->intf->handler) info->intf->handler(info->device, irq);
+	//if(info->intf->handler) info->intf->handler(irq);
+}*/
+
+/* Timer overflow callback from timer.c */
+/*static TIMER_CALLBACK( timer_callback_0 )
+{
+	ym2610_state *info = (ym2610_state *)ptr;
+	ym2610_timer_over(info->chip,0);
+}
+
+static TIMER_CALLBACK( timer_callback_1 )
+{
+	ym2610_state *info = (ym2610_state *)ptr;
+	ym2610_timer_over(info->chip,1);
+}*/
+
+/*static void timer_handler(void *param,int c,int count,int clock)
+{
+	ym2610_state *info = (ym2610_state *)param;
+	if( count == 0 )
+	{	// Reset FM Timer
+		//timer_enable(info->timerc, 0);
+	}
+	else
+	{	// Start FM Timer
+		//attotime period = attotime_mul(ATTOTIME_IN_HZ(clock), count);
+
+		//if (!timer_enable(info->timerc, 1))
+		//	timer_adjust_oneshot(info->timerc, period, 0);
+	}
+}*/
+
+static stream_sample_t* DUMMYBUF0x02 = {NULL, NULL};
+
+/* update request from fm.c */
+void ym2610_update_request(void *param)
+{
+	ym2610_state *info = (ym2610_state *)param;
+	//stream_update(info->stream);
+	
+	ym2610b_update_one(info->chip, DUMMYBUF, 0);
+	// Not necessary.
+	//if (info->psg != NULL)
+	//	ay8910_update_one(info->psg, DUMMYBUF, 0);
+}
+
+
+//static STREAM_UPDATE( ym2610_stream_update )
+void ym2610_stream_update(void *param, stream_sample_t **outputs, int samples)
+{
+	ym2610_state *info = (ym2610_state *)param;
+	ym2610_update_one(info->chip, outputs, samples);
+}
+
+//static STREAM_UPDATE( ym2610b_stream_update )
+void ym2610b_stream_update(void *param, stream_sample_t **outputs, int samples)
+{
+	ym2610_state *info = (ym2610_state *)param;
+	ym2610b_update_one(info->chip, outputs, samples);
+}
+
+void ym2610_stream_update_ay(void *param, stream_sample_t **outputs, int samples)
+{
+	ym2610_state *info = (ym2610_state *)param;
+	
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_update_one(info->psg, outputs, samples);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_calc_stereo((PSG*)info->psg, outputs, samples);
+			break;
+		}
+	}
+	else
+	{
+		memset(outputs0, 0x00, samples * sizeof(stream_sample_t));
+		memset(outputs1, 0x00, samples * sizeof(stream_sample_t));
+	}
+}
+
+
+//static STATE_POSTLOAD( ym2610_intf_postload )
+/*static void ym2610_intf_postload(UINT8 ChipID)
+{
+	//ym2610_state *info = (ym2610_state *)param;
+	ym2610_state *info = &YM2610DataChipID;
+	ym2610_postload(info->chip);
+}*/
+
+
+//static DEVICE_START( ym2610 )
+int device_start_ym2610(void **_info, int AY_EMU_CORE, int clock, UINT8 AYDisable, int* AYrate, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	// clock bit 31:	0 - YM2610
+	//					1 - YM2610B
+	
+	//static const ym2610_interface generic_2610 = { 0 };
+#ifdef ENABLE_ALL_CORES
+	static const ay8910_interface generic_ay8910 =
+	{
+		AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
+		AY8910_DEFAULT_LOADS
+		//DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
+	};
+#endif
+	//const ym2610_interface *intf = device->static_config ? (const ym2610_interface *)device->static_config : &generic_2610;
+	//const ym2610_interface *intf = &generic_2610;
+	int rate;
+	int ay_clock;
+	//void *pcmbufa,*pcmbufb;
+	//int pcmsizea,pcmsizeb;
+	//ym2610_state *info = get_safe_token(device);
+	ym2610_state *info;
+	//astring *name = astring_alloc();
+	//sound_type type = sound_get_type(device);
+	unsigned char ChipType;
+
+#ifdef ENABLE_ALL_CORES
+	if (AY_EMU_CORE >= 0x02)
+		AY_EMU_CORE = EC_EMU2149;
+#else
+	AY_EMU_CORE = EC_EMU2149;
+#endif
+
+	info = (ym2610_state *) calloc(1, sizeof(ym2610_state));
+	*_info = (void *) info;
+
+	info->AY_EMU_CORE = AY_EMU_CORE;
+	ChipType = (clock & 0x80000000) ? 0x01 : 0x00;
+	clock &= 0x7FFFFFFF;
+	rate = clock/72;
+	if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	//info->intf = intf;
+	//info->device = device;
+	//info->psg = ay8910_start_ym(NULL, sound_get_type(device), device, device->clock, &generic_ay8910);
+	if (! AYDisable)
+	{
+		ay_clock = clock / 4;
+		*AYrate = ay_clock / 8;
+		switch(AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			info->psg = ay8910_start_ym(NULL, CHTYPE_YM2610 + ChipType, ay_clock, &generic_ay8910);
+			break;
+#endif
+		case EC_EMU2149:
+			info->psg = PSG_new(ay_clock, *AYrate);
+			if (info->psg == NULL)
+				return 0;
+			PSG_setVolumeMode((PSG*)info->psg, 1);	// YM2149 volume mode
+			break;
+		}
+	}
+	else
+	{
+		info->psg = NULL;
+		*AYrate = 0;
+	}
+	//assert_always(info->psg != NULL, "Error creating YM2610/AY8910 chip");
+
+	/* Timer Handler set */
+	//info->timer0 = timer_alloc(device->machine, timer_callback_0, info);
+	//info->timer1 = timer_alloc(device->machine, timer_callback_1, info);
+
+	/* stream system initialize */
+	//info->stream = stream_create(device,0,2,rate,info,(type == SOUND_YM2610) ? ym2610_stream_update : ym2610b_stream_update);
+	/* setup adpcm buffers */
+	//pcmbufa = device->region;
+	//pcmsizea = device->regionbytes;
+	//astring_printf(name, "%s.deltat", device->tag);
+	//pcmbufb = (void *)(memory_region(device->machine, astring_c(name)));
+	//pcmsizeb = memory_region_length(device->machine, astring_c(name));
+	//astring_free(name);
+	/*if (pcmbufb == NULL || pcmsizeb == 0)
+	{
+		pcmbufb = pcmbufa;
+		pcmsizeb = pcmsizea;
+	}*/
+
+	/**** initialize YM2610 ****/
+	//info->chip = ym2610_init(info,device,device->clock,rate,
+	//	 pcmbufa,pcmsizea,pcmbufb,pcmsizeb,
+	//	 timer_handler,IRQHandler,&psgintf);
+	info->chip = ym2610_init(info, clock & 0x7FFFFFFF, rate, NULL, NULL, &psgintf);
+	//assert_always(info->chip != NULL, "Error creating YM2610 chip");
+
+	//state_save_register_postload(device->machine, ym2610_intf_postload, info);
+	
+	return rate;
+}
+
+//static DEVICE_STOP( ym2610 )
+void device_stop_ym2610(void *_info)
+{
+	//ym2610_state *info = get_safe_token(device);
+	ym2610_state* info = (ym2610_state *)_info;
+	ym2610_shutdown(info->chip);
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_stop_ym(info->psg);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_delete((PSG*)info->psg);
+			break;
+		}
+		info->psg = NULL;
+	}
+	free(info);
+}
+
+//static DEVICE_RESET( ym2610 )
+void device_reset_ym2610(void *_info)
+{
+	//ym2610_state *info = get_safe_token(device);
+	ym2610_state* info = (ym2610_state *)_info;
+	ym2610_reset_chip(info->chip);	// also resets the AY clock
+	//psg_reset(info);	// already done as a callback in ym2610_reset_chip
+}
+
+
+//READ8_DEVICE_HANDLER( ym2610_r )
+UINT8 ym2610_r(void *_info, offs_t offset)
+{
+	//ym2610_state *info = get_safe_token(device);
+	ym2610_state* info = (ym2610_state *)_info;
+	return ym2610_read(info->chip, offset & 3);
+}
+
+//WRITE8_DEVICE_HANDLER( ym2610_w )
+void ym2610_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ym2610_state *info = get_safe_token(device);
+	ym2610_state* info = (ym2610_state *)_info;
+	ym2610_write(info->chip, offset & 3, data);
+}
+
+
+//READ8_DEVICE_HANDLER( ym2610_status_port_a_r )
+UINT8 ym2610_status_port_a_r(void *info, offs_t offset)
+{
+	return ym2610_r(info, 0);
+}
+//READ8_DEVICE_HANDLER( ym2610_status_port_b_r )
+UINT8 ym2610_status_port_b_r(void *info, offs_t offset)
+{
+	return ym2610_r(info, 2);
+}
+//READ8_DEVICE_HANDLER( ym2610_read_port_r )
+UINT8 ym2610_read_port_r(void *info, offs_t offset)
+{
+	return ym2610_r(info, 1);
+}
+
+//WRITE8_DEVICE_HANDLER( ym2610_control_port_a_w )
+void ym2610_control_port_a_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2610_w(info, 0, data);
+}
+//WRITE8_DEVICE_HANDLER( ym2610_control_port_b_w )
+void ym2610_control_port_b_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2610_w(info, 2, data);
+}
+//WRITE8_DEVICE_HANDLER( ym2610_data_port_a_w )
+void ym2610_data_port_a_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2610_w(info, 1, data);
+}
+//WRITE8_DEVICE_HANDLER( ym2610_data_port_b_w )
+void ym2610_data_port_b_w(void *info, offs_t offset, UINT8 data)
+{
+	ym2610_w(info, 3, data);
+}
+
+
+void ym2610_write_data_pcmrom(void *_info, UINT8 rom_id, offs_t ROMSize, offs_t DataStart,
+							 offs_t DataLength, const UINT8* ROMData)
+{
+	ym2610_state* info = (ym2610_state *)_info;
+	ym2610_write_pcmrom(info->chip, rom_id, ROMSize, DataStart, DataLength, ROMData);
+}
+
+void ym2610_set_mute_mask(void *_info, UINT32 MuteMaskFM, UINT32 MuteMaskAY)
+{
+	ym2610_state* info = (ym2610_state *)_info;
+	ym2610_set_mutemask(info->chip, MuteMaskFM);
+	if (info->psg != NULL)
+	{
+		switch(info->AY_EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			ay8910_set_mute_mask_ym(info->psg, MuteMaskAY);
+			break;
+#endif
+		case EC_EMU2149:
+			PSG_setMask((PSG*)info->psg, MuteMaskAY);
+			break;
+		}
+	}
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ym2610 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ym2610_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym2610 );				break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( ym2610 );				break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ym2610 );				break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM2610");							break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");						break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");								break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);							break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+
+/*DEVICE_GET_INFO( ym2610b )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM2610B");					break;
+
+		default:										DEVICE_GET_INFO_CALL(ym2610);				break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2610intf.h Added

@@ -0,0 +1,59 @@
+#pragma once
+
+#include "fm.h"
+#include "ay8910.h"
+#include "emu2149.h"
+
+
+void ym2610_update_request(void *param);
+
+/*typedef struct _ym2610_interface ym2610_interface;
+struct _ym2610_interface
+{
+	//void ( *handler )( const device_config *device, int irq );	// IRQ handler for the YM2610
+	void ( *handler )( int irq );	// IRQ handler for the YM2610
+};*/
+
+/*READ8_DEVICE_HANDLER( ym2610_r );
+WRITE8_DEVICE_HANDLER( ym2610_w );
+
+READ8_DEVICE_HANDLER( ym2610_status_port_a_r );
+READ8_DEVICE_HANDLER( ym2610_status_port_b_r );
+READ8_DEVICE_HANDLER( ym2610_read_port_r );
+
+WRITE8_DEVICE_HANDLER( ym2610_control_port_a_w );
+WRITE8_DEVICE_HANDLER( ym2610_control_port_b_w );
+WRITE8_DEVICE_HANDLER( ym2610_data_port_a_w );
+WRITE8_DEVICE_HANDLER( ym2610_data_port_b_w );
+
+
+DEVICE_GET_INFO( ym2610 );
+DEVICE_GET_INFO( ym2610b );
+
+#define SOUND_YM2610 DEVICE_GET_INFO_NAME( ym2610 )
+#define SOUND_YM2610B DEVICE_GET_INFO_NAME( ym2610b )*/
+
+void ym2610_stream_update(void *chip, stream_sample_t **outputs, int samples);
+void ym2610b_stream_update(void *chip, stream_sample_t **outputs, int samples);
+void ym2610_stream_update_ay(void *chip, stream_sample_t **outputs, int samples);
+
+int device_start_ym2610(void **chip, int core, int clock, UINT8 AYDisable, int* AYrate, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_ym2610(void *chip);
+void device_reset_ym2610(void *chip);
+
+UINT8 ym2610_r(void *chip, offs_t offset);
+void ym2610_w(void *chip, offs_t offset, UINT8 data);
+
+UINT8 ym2610_status_port_a_r(void *chip, offs_t offset);
+UINT8 ym2610_status_port_b_r(void *chip, offs_t offset);
+UINT8 ym2610_read_port_r(void *chip, offs_t offset);
+
+void ym2610_control_port_a_w(void *chip, offs_t offset, UINT8 data);
+void ym2610_control_port_b_w(void *chip, offs_t offset, UINT8 data);
+void ym2610_data_port_a_w(void *chip, offs_t offset, UINT8 data);
+void ym2610_data_port_b_w(void *chip, offs_t offset, UINT8 data);
+
+void ym2610_write_data_pcmrom(void *chip, UINT8 rom_id, offs_t ROMSize, offs_t DataStart,
+							  offs_t DataLength, const UINT8* ROMData);
+void ym2610_set_mute_mask(void *chip, UINT32 MuteMaskFM, UINT32 MuteMaskAY);
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.c Added

@@ -0,0 +1,412 @@
+/***************************************************************************
+
+ 2612intf.c
+
+ The YM2612 emulator supports up to 2 chips.
+ Each chip has the following connections:
+ - Status Read / Control Write A
+ - Port Read / Data Write A
+ - Control Write B
+ - Data Write B
+
+***************************************************************************/
+
+#include <stdlib.h>
+#include <stddef.h>	// for NULL
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+//#include "sound/fm.h"
+//#include "sound/2612intf.h"
+#include "fm.h"
+#include "2612intf.h"
+#ifdef ENABLE_ALL_CORES
+#include "ym2612.h"
+#endif
+
+
+#define EC_MAME		0x00	// YM2612 core from MAME (now fixed, so it isn't worse than Gens anymore)
+#ifdef ENABLE_ALL_CORES
+#define EC_GENS		0x01	// Gens YM2612 core from in_vgm
+#endif
+
+typedef struct _ym2612_state ym2612_state;
+struct _ym2612_state
+{
+	//sound_stream *	stream;
+	//emu_timer *		timer2;
+	void *			chip;
+	int			EMU_CORE;
+	//const ym2612_interface *intf;
+	//const device_config *device;
+	int* GensBuf0x02;
+	UINT8 ChipFlags;
+};
+
+
+/*INLINE ym2612_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YM2612 || sound_get_type(device) == SOUND_YM3438);
+	return (ym2612_state *)device->token;
+}*/
+
+/*------------------------- TM2612 -------------------------------*/
+/* IRQ Handler */
+/*static void IRQHandler(void *param,int irq)
+{
+	ym2612_state *info = (ym2612_state *)param;
+	//if(info->intf->handler) info->intf->handler(info->device, irq);
+	//if(info->intf->handler) info->intf->handler(irq);
+}*/
+
+/* Timer overflow callback from timer.c */
+//static TIMER_CALLBACK( timer_callback_2612_0 )
+/*void timer_callback_2612_0(void *ptr, int param)
+{
+	ym2612_state *info = (ym2612_state *)ptr;
+	ym2612_timer_over(info->chip,0);
+}
+
+//static TIMER_CALLBACK( timer_callback_2612_1 )
+void timer_callback_2612_1(void *ptr, int param)
+{
+	ym2612_state *info = (ym2612_state *)ptr;
+	ym2612_timer_over(info->chip,1);
+}*/
+
+/*static void timer_handler(void *param,int c,int count,int clock)
+{
+	ym2612_state *info = (ym2612_state *)param;
+	if( count == 0 )
+	{	// Reset FM Timer
+		//timer_enable(info->timerc, 0);
+	}
+	else
+	{	// Start FM Timer
+		//attotime period = attotime_mul(ATTOTIME_IN_HZ(clock), count);
+		//if (!timer_enable(info->timerc, 1))
+		//	timer_adjust_oneshot(info->timerc, period, 0);
+	}
+}*/
+
+static stream_sample_t* DUMMYBUF0x02 = {NULL, NULL};
+
+/* update request from fm.c */
+void ym2612_update_request(void *param)
+{
+	ym2612_state *info = (ym2612_state *)param;
+	//stream_update(info->stream);
+
+	if (!param)
+		return;
+	
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		ym2612_update_one(info->chip, DUMMYBUF, 0);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_GENS:
+		YM2612_Update(info->chip, DUMMYBUF, 0);
+		YM2612_DacAndTimers_Update(info->chip, DUMMYBUF, 0);
+		break;
+#endif
+	}
+}
+
+/***********************************************************/
+/* YM2612 */
+/***********************************************************/
+
+//static STREAM_UPDATE( ym2612_stream_update )
+void ym2612_stream_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	//ym2612_state *info = (ym2612_state *)param;
+	ym2612_state *info = (ym2612_state *)_info;
+#ifdef ENABLE_ALL_CORES
+	int i;
+#endif
+	
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		ym2612_update_one(info->chip, outputs, samples);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_GENS:
+		YM2612_ClearBuffer(info->GensBuf, samples);
+		YM2612_Update(info->chip, info->GensBuf, samples);
+		YM2612_DacAndTimers_Update(info->chip, info->GensBuf, samples);
+		for (i = 0x00; i < samples; i ++)
+		{
+			outputs0x00i = (stream_sample_t)info->GensBuf0x00i;
+			outputs0x01i = (stream_sample_t)info->GensBuf0x01i;
+		}
+		break;
+#endif
+	}
+}
+
+
+//static STATE_POSTLOAD( ym2612_intf_postload )
+/*static void ym2612_intf_postload(UINT8 ChipID)
+{
+	//ym2612_state *info = (ym2612_state *)param;
+	ym2612_state *info = &YM2612DataChipID;
+	ym2612_postload(info->chip);
+}*/
+
+
+//static DEVICE_START( ym2612 )
+int device_start_ym2612(void **_info, int EMU_CORE, int ChipFlags, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE, UINT8 * IsVGMInit)
+{
+	//static const ym2612_interface dummy = { 0 };
+	//ym2612_state *info = get_safe_token(device);
+	ym2612_state *info;
+	int rate;
+
+#ifdef ENABLE_ALL_CORES
+	if (EMU_CORE >= 0x02)
+		EMU_CORE = EC_MAME;
+#else
+	EMU_CORE = EC_MAME;
+#endif
+
+	info = (ym2612_state *) calloc(1, sizeof(ym2612_state));
+	*_info = (void *) info;
+
+	info->EMU_CORE = EMU_CORE;
+	info->ChipFlags = ChipFlags;
+	rate = clock/72;
+	if (EMU_CORE == EC_MAME && ! (ChipFlags & 0x02))
+		rate /= 2;
+	if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	//info->intf = device->static_config ? (const ym2612_interface *)device->static_config : &dummy;
+	//info->intf = &dummy;
+	//info->device = device;
+
+	/* FM init */
+	/* Timer Handler set */
+	//info->timer0 = timer_alloc(device->machine, timer_callback_2612_0, info);
+	//info->timer1 = timer_alloc(device->machine, timer_callback_2612_1, info);
+
+	/* stream system initialize */
+	//info->stream = stream_create(device,0,2,rate,info,ym2612_stream_update);
+
+	/**** initialize YM2612 ****/
+	switch(EMU_CORE)
+	{
+	case EC_MAME:
+		//info->chip = ym2612_init(info,clock,rate,timer_handler,IRQHandler);
+		info->chip = ym2612_init(info, clock, rate, NULL, NULL, IsVGMInit, ChipFlags);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_GENS:
+		if (info->GensBuf0x00 == NULL)
+		{
+			info->GensBuf0x00 = malloc(sizeof(int) * 0x100);
+			info->GensBuf0x01 = info->GensBuf0x00 + 0x80;
+		}
+		info->chip = YM2612_Init(clock, rate, 0x00);
+		YM2612_SetMute(info->chip, 0x80);	// Disable SSG-EG
+		YM2612_SetOptions(ChipFlags);
+		break;
+#endif
+	}
+	//assert_always(info->chip != NULL, "Error creating YM2612 chip");
+	//ym2612_postload(info->chip);
+
+	//state_save_register_postload(device->machine, ym2612_intf_postload, info);
+	//ym2612_intf_postload();
+
+	return rate;
+}
+
+
+//static DEVICE_STOP( ym2612 )
+void device_stop_ym2612(void *_info)
+{
+	//ym2612_state *info = get_safe_token(device);
+	ym2612_state *info = (ym2612_state *)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		ym2612_shutdown(info->chip);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_GENS:
+		YM2612_End(info->chip);
+		if (info->GensBuf0x00 != NULL)
+		{
+			free(info->GensBuf0x00);
+			info->GensBuf0x00 = NULL;
+			info->GensBuf0x01 = NULL;
+		}
+		break;
+#endif
+	}
+
+	free(info);
+}
+
+//static DEVICE_RESET( ym2612 )
+void device_reset_ym2612(void *_info)
+{
+	//ym2612_state *info = get_safe_token(device);
+	ym2612_state *info = (ym2612_state *)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		ym2612_reset_chip(info->chip);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_GENS:
+		YM2612_Reset(info->chip);
+		break;
+#endif
+	}
+}
+
+
+//READ8_DEVICE_HANDLER( ym2612_r )
+UINT8 ym2612_r(void *_info, offs_t offset)
+{
+	//ym2612_state *info = get_safe_token(device);
+	ym2612_state *info = (ym2612_state *)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		return ym2612_read(info->chip, offset & 3);
+#ifdef ENABLE_ALL_CORES
+	case EC_GENS:
+		return YM2612_Read(info->chip);
+#endif
+	default:
+		return 0x00;
+	}
+}
+
+//WRITE8_DEVICE_HANDLER( ym2612_w )
+void ym2612_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ym2612_state *info = get_safe_token(device);
+	ym2612_state *info = (ym2612_state *)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		ym2612_write(info->chip, offset & 3, data);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_GENS:
+		YM2612_Write(info->chip, (unsigned char)(offset & 0x03), data);
+		break;
+#endif
+	}
+}
+
+
+/*READ8_DEVICE_HANDLER( ym2612_status_port_a_r ) { return ym2612_r(device, 0); }
+READ8_DEVICE_HANDLER( ym2612_status_port_b_r ) { return ym2612_r(device, 2); }
+READ8_DEVICE_HANDLER( ym2612_data_port_a_r ) { return ym2612_r(device, 1); }
+READ8_DEVICE_HANDLER( ym2612_data_port_b_r ) { return ym2612_r(device, 3); }
+
+WRITE8_DEVICE_HANDLER( ym2612_control_port_a_w ) { ym2612_w(device, 0, data); }
+WRITE8_DEVICE_HANDLER( ym2612_control_port_b_w ) { ym2612_w(device, 2, data); }
+WRITE8_DEVICE_HANDLER( ym2612_data_port_a_w ) { ym2612_w(device, 1, data); }
+WRITE8_DEVICE_HANDLER( ym2612_data_port_b_w ) { ym2612_w(device, 3, data); }*/
+UINT8 ym2612_status_port_a_r(void *_info, offs_t offset)
+{
+	return ym2612_r(_info, 0);
+}
+UINT8 ym2612_status_port_b_r(void *_info, offs_t offset)
+{
+	return ym2612_r(_info, 2);
+}
+UINT8 ym2612_data_port_a_r(void *_info, offs_t offset)
+{
+	return ym2612_r(_info, 1);
+}
+UINT8 ym2612_data_port_b_r(void *_info, offs_t offset)
+{
+	return ym2612_r(_info, 3);
+}
+
+void ym2612_control_port_a_w(void *_info, offs_t offset, UINT8 data)
+{
+	ym2612_w(_info, 0, data);
+}
+void ym2612_control_port_b_w(void *_info, offs_t offset, UINT8 data)
+{
+	ym2612_w(_info, 2, data);
+}
+void ym2612_data_port_a_w(void *_info, offs_t offset, UINT8 data)
+{
+	ym2612_w(_info, 1, data);
+}
+void ym2612_data_port_b_w(void *_info, offs_t offset, UINT8 data)
+{
+	ym2612_w(_info, 3, data);
+}
+
+
+void ym2612_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	ym2612_state *info = (ym2612_state *)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		ym2612_set_mutemask(info->chip, MuteMask);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_GENS:
+		YM2612_SetMute(info->chip, (int)MuteMask);
+		break;
+#endif
+	}
+	
+	return;
+}
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ym2612 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ym2612_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym2612 );	break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( ym2612 );	break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ym2612 );	break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM2612");					break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");				break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");						break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);					break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEVICE_GET_INFO( ym3438 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM3438");							break;
+
+		default:										DEVICE_GET_INFO_CALL(ym2612);						break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/2612intf.h Added

@@ -0,0 +1,72 @@
+#pragma once
+
+void ym2612_update_request(void *param);
+
+/*typedef struct _ym2612_interface ym2612_interface;
+struct _ym2612_interface
+{
+	//void (*handler)(const device_config *device, int irq);
+	void (*handler)(int irq);
+};*/
+
+/*READ8_DEVICE_HANDLER( ym2612_r );
+WRITE8_DEVICE_HANDLER( ym2612_w );
+
+READ8_DEVICE_HANDLER( ym2612_status_port_a_r );
+READ8_DEVICE_HANDLER( ym2612_status_port_b_r );
+READ8_DEVICE_HANDLER( ym2612_data_port_a_r );
+READ8_DEVICE_HANDLER( ym2612_data_port_b_r );
+
+WRITE8_DEVICE_HANDLER( ym2612_control_port_a_w );
+WRITE8_DEVICE_HANDLER( ym2612_control_port_b_w );
+WRITE8_DEVICE_HANDLER( ym2612_data_port_a_w );
+WRITE8_DEVICE_HANDLER( ym2612_data_port_b_w );
+
+
+DEVICE_GET_INFO( ym2612 );
+#define SOUND_YM2612 DEVICE_GET_INFO_NAME( ym2612 )*/
+void ym2612_stream_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_ym2612(void **chip, int core, int options, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE, UINT8 * IsVGMInit);
+void device_stop_ym2612(void *chip);
+void device_reset_ym2612(void *chip);
+
+UINT8 ym2612_r(void *chip, offs_t offset);
+void ym2612_w(void *chip, offs_t offset, UINT8 data);
+
+UINT8 ym2612_status_port_a_r(void *chip, offs_t offset);
+UINT8 ym2612_status_port_b_r(void *chip, offs_t offset);
+UINT8 ym2612_data_port_a_r(void *chip, offs_t offset);
+UINT8 ym2612_data_port_b_r(void *chip, offs_t offset);
+
+void ym2612_control_port_a_w(void *chip, offs_t offset, UINT8 data);
+void ym2612_control_port_b_w(void *chip, offs_t offset, UINT8 data);
+void ym2612_data_port_a_w(void *chip, offs_t offset, UINT8 data);
+void ym2612_data_port_b_w(void *chip, offs_t offset, UINT8 data);
+
+void ym2612_set_mute_mask(void *chip, UINT32 MuteMask);
+
+
+/*typedef struct _ym3438_interface ym3438_interface;
+struct _ym3438_interface
+{
+	//void (*handler)(const device_config *device, int irq);
+	void (*handler)(int irq);
+};
+
+
+#define ym3438_r				ym2612_r
+#define ym3438_w				ym2612_w
+
+#define ym3438_status_port_a_r	ym2612_status_port_a_r
+#define ym3438_status_port_b_r	ym2612_status_port_b_r
+#define ym3438_data_port_a_r	ym2612_data_port_a_r
+#define ym3438_data_port_b_r	ym2612_data_port_b_r
+
+#define ym3438_control_port_a_w	ym2612_control_port_a_w
+#define ym3438_control_port_b_w	ym2612_control_port_b_w
+#define ym3438_data_port_a_w	ym2612_data_port_a_w
+#define ym3438_data_port_b_w	ym2612_data_port_b_w*/
+
+
+//DEVICE_GET_INFO( ym3438 );
+//#define SOUND_YM3438 DEVICE_GET_INFO_NAME( ym3438 )

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.c Added

@@ -0,0 +1,325 @@
+/***************************************************************************
+
+ 262intf.c
+
+ MAME interface for YMF262 (OPL3) emulator
+
+***************************************************************************/
+#include "mamedef.h"
+#include <stdlib.h>
+//#include "attotime.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "262intf.h"
+#ifdef ENABLE_ALL_CORES
+#include "ymf262.h"
+#endif
+
+#define OPLTYPE_IS_OPL3
+#include "adlibemu.h"
+
+
+#define EC_DBOPL	0x00	// DosBox OPL (AdLibEmu)
+#ifdef ENABLE_ALL_CORES
+#define EC_MAME		0x01	// YMF262 core from MAME
+#endif
+
+typedef struct _ymf262_state ymf262_state;
+struct _ymf262_state
+{
+	//sound_stream *	stream;
+	//emu_timer *		timer2;
+	void *			chip;
+	int			EMU_CORE;
+	//const ymf262_interface *intf;
+	//const device_config *device;
+};
+
+
+/*INLINE ymf262_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YMF262);
+	return (ymf262_state *)device->token;
+}*/
+
+
+
+
+#ifdef ENABLE_ALL_CORES
+static void IRQHandler_262(void *param,int irq)
+{
+	//ymf262_state *info = (ymf262_state *)param;
+	//if (info->intf->handler) (info->intf->handler)(info->device, irq);
+}
+#endif
+
+/*static TIMER_CALLBACK( timer_callback_262_0 )
+{
+	ymf262_state *info = (ymf262_state *)ptr;
+	ymf262_timer_over(info->chip, 0);
+}
+
+static TIMER_CALLBACK( timer_callback_262_1 )
+{
+	ymf262_state *info = (ymf262_state *)ptr;
+	ymf262_timer_over(info->chip, 1);
+}*/
+
+//static void timer_handler_262(void *param,int timer, attotime period)
+#ifdef ENABLE_ALL_CORES
+static void timer_handler_262(void *param,int timer, int period)
+{
+	//ymf262_state *info = (ymf262_state *)param;
+	if( period == 0 )
+	{	/* Reset FM Timer */
+		//timer_enable(info->timertimer, 0);
+	}
+	else
+	{	/* Start FM Timer */
+		//timer_adjust_oneshot(info->timertimer, period, 0);
+	}
+}
+#endif
+
+//static STREAM_UPDATE( ymf262_stream_update )
+void ymf262_stream_update(void *param, stream_sample_t **outputs, int samples)
+{
+	ymf262_state *info = (ymf262_state *)param;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ymf262_update_one(info->chip, outputs, samples);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL3_getsample(info->chip, outputs, samples);
+		break;
+	}
+}
+
+static stream_sample_t* DUMMYBUF0x02 = {NULL, NULL};
+
+static void _stream_update(void *param/*, int interval*/)
+{
+	ymf262_state *info = (ymf262_state *)param;
+	//stream_update(info->stream);
+	
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ymf262_update_one(info->chip, DUMMYBUF, 0);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL3_getsample(info->chip, DUMMYBUF, 0);
+		break;
+	}
+}
+
+
+//static DEVICE_START( ymf262 )
+int device_start_ymf262(void **_info, int EMU_CORE, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	//static const ymf262_interface dummy = { 0 };
+	//ymf262_state *info = get_safe_token(device);
+	ymf262_state *info;
+	int rate;
+
+#ifdef ENABLE_ALL_CORES
+	if (EMU_CORE >= 0x02)
+		EMU_CORE = EC_DBOPL;
+#else
+	EMU_CORE = EC_DBOPL;
+#endif
+	
+	info = (ymf262_state *) calloc(1, sizeof(ymf262_state));
+	*_info = (void *) info;
+	
+	info->EMU_CORE = EMU_CORE;
+	rate = clock/288;
+	if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+
+	//info->intf = device->static_config ? (const ymf262_interface *)device->static_config : &dummy;
+	//info->intf = &dummy;
+	//info->device = device;
+
+	/* stream system initialize */
+	switch(EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		info->chip = ymf262_init(clock,rate);
+		//assert_always(info->chip != NULL, "Error creating YMF262 chip");
+
+		//info->stream = stream_create(device,0,4,rate,info,ymf262_stream_update);
+
+		/* YMF262 setup */
+		ymf262_set_timer_handler (info->chip, timer_handler_262, info);
+		ymf262_set_irq_handler (info->chip, IRQHandler_262, info);
+		ymf262_set_update_handler(info->chip, _stream_update, info);
+
+		//info->timer0 = timer_alloc(device->machine, timer_callback_262_0, info);
+		//info->timer1 = timer_alloc(device->machine, timer_callback_262_1, info);
+		break;
+#endif
+	case EC_DBOPL:
+		info->chip = adlib_OPL3_init(clock, rate, _stream_update, info);
+		break;
+	}
+
+	return rate;
+}
+
+//static DEVICE_STOP( ymf262 )
+void device_stop_ymf262(void *_info)
+{
+	//ymf262_state *info = get_safe_token(device);
+	ymf262_state *info = (ymf262_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ymf262_shutdown(info->chip);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL3_stop(info->chip);
+		break;
+	}
+	free(info);
+}
+
+/* reset */
+//static DEVICE_RESET( ymf262 )
+void device_reset_ymf262(void *_info)
+{
+	//ymf262_state *info = get_safe_token(device);
+	ymf262_state *info = (ymf262_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ymf262_reset_chip(info->chip);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL3_reset(info->chip);
+		break;
+	}
+}
+
+
+//READ8_DEVICE_HANDLER( ymf262_r )
+UINT8 ymf262_r(void *_info, offs_t offset)
+{
+	//ymf262_state *info = get_safe_token(device);
+	ymf262_state *info = (ymf262_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		return ymf262_read(info->chip, offset & 3);
+#endif
+	case EC_DBOPL:
+		return adlib_OPL3_reg_read(info->chip, offset & 0x03);
+	default:
+		return 0x00;
+	}
+}
+
+//WRITE8_DEVICE_HANDLER( ymf262_w )
+void ymf262_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ymf262_state *info = get_safe_token(device);
+	ymf262_state *info = (ymf262_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ymf262_write(info->chip, offset & 3, data);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL3_writeIO(info->chip, offset & 3, data);
+		break;
+	}
+}
+
+//READ8_DEVICE_HANDLER ( ymf262_status_r )
+UINT8 ymf262_status_r(void *info, offs_t offset)
+{
+	return ymf262_r(info, 0);
+}
+//WRITE8_DEVICE_HANDLER( ymf262_register_a_w )
+void ymf262_register_a_w(void *info, offs_t offset, UINT8 data)
+{
+	ymf262_w(info, 0, data);
+}
+//WRITE8_DEVICE_HANDLER( ymf262_register_b_w )
+void ymf262_register_b_w(void *info, offs_t offset, UINT8 data)
+{
+	ymf262_w(info, 2, data);
+}
+//WRITE8_DEVICE_HANDLER( ymf262_data_a_w )
+void ymf262_data_a_w(void *info, offs_t offset, UINT8 data)
+{
+	ymf262_w(info, 1, data);
+}
+//WRITE8_DEVICE_HANDLER( ymf262_data_b_w )
+void ymf262_data_b_w(void *info, offs_t offset, UINT8 data)
+{
+	ymf262_w(info, 3, data);
+}
+
+
+void ymf262_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	ymf262_state *info = (ymf262_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ymf262_set_mutemask(info->chip, MuteMask);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL3_set_mute_mask(info->chip, MuteMask);
+		break;
+	}
+	
+	return;
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ymf262 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ymf262_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ymf262 );				break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( ymf262 );				break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ymf262 );				break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YMF262");							break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");						break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");								break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);							break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/262intf.h Added

@@ -0,0 +1,41 @@
+#pragma once
+
+
+/*typedef struct _ymf262_interface ymf262_interface;
+struct _ymf262_interface
+{
+	//void (*handler)(const device_config *device, int irq);
+	void (*handler)(int irq);
+};*/
+
+
+/*READ8_DEVICE_HANDLER( ymf262_r );
+WRITE8_DEVICE_HANDLER( ymf262_w );
+
+READ8_DEVICE_HANDLER ( ymf262_status_r );
+WRITE8_DEVICE_HANDLER( ymf262_register_a_w );
+WRITE8_DEVICE_HANDLER( ymf262_register_b_w );
+WRITE8_DEVICE_HANDLER( ymf262_data_a_w );
+WRITE8_DEVICE_HANDLER( ymf262_data_b_w );
+
+
+DEVICE_GET_INFO( ymf262 );
+#define SOUND_YMF262 DEVICE_GET_INFO_NAME( ymf262 )*/
+
+void ymf262_stream_update(void *chip, stream_sample_t **outputs, int samples);
+
+int device_start_ymf262(void **chip, int core, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_ymf262(void *chip);
+void device_reset_ymf262(void *chip);
+
+UINT8 ymf262_r(void *chip, offs_t offset);
+void ymf262_w(void *chip, offs_t offset, UINT8 data);
+
+UINT8 ymf262_status_r(void *chip, offs_t offset);
+void ymf262_register_a_w(void *chip, offs_t offset, UINT8 data);
+void ymf262_register_b_w(void *chip, offs_t offset, UINT8 data);
+void ymf262_data_a_w(void *chip, offs_t offset, UINT8 data);
+void ymf262_data_b_w(void *chip, offs_t offset, UINT8 data);
+
+void ymf262_set_mute_mask(void *chip, UINT32 MuteMask);
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/281btone.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.c Added

@@ -0,0 +1,225 @@
+/******************************************************************************
+* FILE
+* Yamaha 3812 emulator interface - MAME VERSION
+*
+* CREATED BY
+* Ernesto Corvi
+*
+* UPDATE LOG
+* JB 28-04-2002 Fixed simultaneous usage of all three different chip types.
+* Used real sample rate when resample filter is active.
+* AAT 12-28-2001 Protected Y8950 from accessing unmapped port and keyboard handlers.
+* CHS 1999-01-09 Fixes new ym3812 emulation interface.
+* CHS 1998-10-23 Mame streaming sound chip update
+* EC 1998 Created Interface
+*
+* NOTES
+*
+******************************************************************************/
+#include "mamedef.h"
+#include <stdlib.h>
+//#include "attotime.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+//#include "cpuintrf.h"
+#include "3526intf.h"
+#include "fmopl.h"
+
+#include <string.h>
+
+typedef struct _ym3526_state ym3526_state;
+struct _ym3526_state
+{
+	//sound_stream *	stream;
+	//emu_timer *		timer2;
+	void *			chip;
+	//const ym3526_interface *intf;
+	//const device_config *device;
+};
+
+
+/*INLINE ym3526_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YM3526);
+	return (ym3526_state *)device->token;
+}*/
+
+
+/* IRQ Handler */
+static void IRQHandler(void *param,int irq)
+{
+	//ym3526_state *info = (ym3526_state *)param;
+	//if (info->intf->handler) (info->intf->handler)(info->device, irq ? ASSERT_LINE : CLEAR_LINE);
+	//if (info->intf->handler) (info->intf->handler)(irq ? ASSERT_LINE : CLEAR_LINE);
+}
+/* Timer overflow callback from timer.c */
+/*static TIMER_CALLBACK( timer_callback_0 )
+{
+	ym3526_state *info = (ym3526_state *)ptr;
+	ym3526_timer_over(info->chip,0);
+}
+static TIMER_CALLBACK( timer_callback_1 )
+{
+	ym3526_state *info = (ym3526_state *)ptr;
+	ym3526_timer_over(info->chip,1);
+}*/
+/* TimerHandler from fm.c */
+//static void TimerHandler(void *param,int c,attotime period)
+static void TimerHandler(void *param,int c,int period)
+{
+	//ym3526_state *info = (ym3526_state *)param;
+	//if( attotime_compare(period, attotime_zero) == 0 )
+	if( period == 0 )
+	{	/* Reset FM Timer */
+		//timer_enable(info->timerc, 0);
+	}
+	else
+	{	/* Start FM Timer */
+		//timer_adjust_oneshot(info->timerc, period, 0);
+	}
+}
+
+
+//static STREAM_UPDATE( ym3526_stream_update )
+void ym3526_stream_update(void *param, stream_sample_t **outputs, int samples)
+{
+	ym3526_state *info = (ym3526_state *)param;
+	ym3526_update_one(info->chip, outputs, samples);
+}
+
+static stream_sample_t* DUMMYBUF0x02 = {NULL, NULL};
+
+static void _stream_update(void *param/*, int interval*/)
+{
+	ym3526_state *info = (ym3526_state *)param;
+	//stream_update(info->stream);
+	
+	ym3526_update_one(info->chip, DUMMYBUF, 0);
+}
+
+
+//static DEVICE_START( ym3526 )
+int device_start_ym3526(void **_info, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	//static const ym3526_interface dummy = { 0 };
+	//ym3526_state *info = get_safe_token(device);
+	ym3526_state *info;
+	int rate;
+	
+	info = (ym3526_state *) calloc(1, sizeof(ym3526_state));
+	*_info = (void *) info;	
+
+	rate = clock/72;
+	if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	//info->intf = device->static_config ? (const ym3526_interface *)device->static_config : &dummy;
+	//info->intf = &dummy;
+	//info->device = device;
+
+	/* stream system initialize */
+	info->chip = ym3526_init(clock,rate);
+	//assert_always(info->chip != NULL, "Error creating YM3526 chip");
+
+	//info->stream = stream_create(device,0,1,rate,info,ym3526_stream_update);
+	/* YM3526 setup */
+	ym3526_set_timer_handler (info->chip, TimerHandler, info);
+	ym3526_set_irq_handler (info->chip, IRQHandler, info);
+	ym3526_set_update_handler(info->chip, _stream_update, info);
+
+	//info->timer0 = timer_alloc(device->machine, timer_callback_0, info);
+	//info->timer1 = timer_alloc(device->machine, timer_callback_1, info);
+
+	return rate;
+}
+
+//static DEVICE_STOP( ym3526 )
+void device_stop_ym3526(void *_info)
+{
+	//ym3526_state *info = get_safe_token(device);
+	ym3526_state *info = (ym3526_state *)_info;
+	ym3526_shutdown(info->chip);
+	free(info);
+}
+
+//static DEVICE_RESET( ym3526 )
+void device_reset_ym3526(void *_info)
+{
+	//ym3526_state *info = get_safe_token(device);
+	ym3526_state *info = (ym3526_state *)_info;
+	ym3526_reset_chip(info->chip);
+}
+
+
+//READ8_DEVICE_HANDLER( ym3526_r )
+UINT8 ym3526_r(void *_info, offs_t offset)
+{
+	//ym3526_state *info = get_safe_token(device);
+	ym3526_state *info = (ym3526_state *)_info;
+	return ym3526_read(info->chip, offset & 1);
+}
+
+//WRITE8_DEVICE_HANDLER( ym3526_w )
+void ym3526_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ym3526_state *info = get_safe_token(device);
+	ym3526_state *info = (ym3526_state *)_info;
+	ym3526_write(info->chip, offset & 1, data);
+}
+
+//READ8_DEVICE_HANDLER( ym3526_status_port_r )
+UINT8 ym3526_status_port_r(void *info, offs_t offset)
+{
+	return ym3526_r(info, 0);
+}
+//READ8_DEVICE_HANDLER( ym3526_read_port_r )
+UINT8 ym3526_read_port_r(void *info, offs_t offset)
+{
+	return ym3526_r(info, 1);
+}
+//WRITE8_DEVICE_HANDLER( ym3526_control_port_w )
+void ym3526_control_port_w(void *info, offs_t offset, UINT8 data)
+{
+	ym3526_w(info, 0, data);
+}
+//WRITE8_DEVICE_HANDLER( ym3526_write_port_w )
+void ym3526_write_port_w(void *info, offs_t offset, UINT8 data)
+{
+	ym3526_w(info, 1, data);
+}
+
+
+void ym3526_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	ym3526_state *info = (ym3526_state *)_info;
+	opl_set_mute_mask(info->chip, MuteMask);
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ym3526 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ym3526_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym3526 );				break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( ym3526 );				break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ym3526 );				break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM3526");							break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");						break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");								break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);							break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3526intf.h Added

@@ -0,0 +1,33 @@
+#pragma once
+
+/*typedef struct _ym3526_interface ym3526_interface;
+struct _ym3526_interface
+{
+	//void (*handler)(const device_config *device, int linestate);
+	void (*handler)(int linestate);
+};*/
+
+/*READ8_DEVICE_HANDLER( ym3526_r );
+WRITE8_DEVICE_HANDLER( ym3526_w );
+
+READ8_DEVICE_HANDLER( ym3526_status_port_r );
+READ8_DEVICE_HANDLER( ym3526_read_port_r );
+WRITE8_DEVICE_HANDLER( ym3526_control_port_w );
+WRITE8_DEVICE_HANDLER( ym3526_write_port_w );
+
+DEVICE_GET_INFO( ym3526 );
+#define SOUND_YM3526 DEVICE_GET_INFO_NAME( ym3526 )*/
+void ym3526_stream_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_ym3526(void **chip, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_ym3526(void *chip);
+void device_reset_ym3526(void *chip);
+
+UINT8 ym3526_r(void *chip, offs_t offset);
+void ym3526_w(void *chip, offs_t offset, UINT8 data);
+
+UINT8 ym3526_status_port_r(void *chip, offs_t offset);
+UINT8 ym3526_read_port_r(void *chip, offs_t offset);
+void ym3526_control_port_w(void *chip, offs_t offset, UINT8 data);
+void ym3526_write_port_w(void *chip, offs_t offset, UINT8 data);
+
+void ym3526_set_mute_mask(void *chip, UINT32 MuteMask);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.c Added

@@ -0,0 +1,336 @@
+/******************************************************************************
+* FILE
+* Yamaha 3812 emulator interface - MAME VERSION
+*
+* CREATED BY
+* Ernesto Corvi
+*
+* UPDATE LOG
+* JB 28-04-2002 Fixed simultaneous usage of all three different chip types.
+* Used real sample rate when resample filter is active.
+* AAT 12-28-2001 Protected Y8950 from accessing unmapped port and keyboard handlers.
+* CHS 1999-01-09 Fixes new ym3812 emulation interface.
+* CHS 1998-10-23 Mame streaming sound chip update
+* EC 1998 Created Interface
+*
+* NOTES
+*
+******************************************************************************/
+#include <string.h>
+
+#include <stdlib.h>
+#include "mamedef.h"
+//#include "attotime.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+//#include "cpuintrf.h"
+#include "3812intf.h"
+#ifdef ENABLE_ALL_CORES
+#include "fmopl.h"
+#endif
+
+#define OPLTYPE_IS_OPL2
+#include "adlibemu.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+
+#define EC_DBOPL	0x00	// DosBox OPL (AdLibEmu)
+#ifdef ENABLE_ALL_CORES
+#define EC_MAME		0x01	// YM3826 core from MAME
+#endif
+
+typedef struct _ym3812_state ym3812_state;
+struct _ym3812_state
+{
+	//sound_stream *	stream;
+	//emu_timer *		timer2;
+	void *			chip;
+	int			EMU_CORE;
+	//const ym3812_interface *intf;
+	//const device_config *device;
+};
+
+
+/*INLINE ym3812_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YM3812);
+	return (ym3812_state *)device->token;
+}*/
+
+
+#ifdef ENABLE_ALL_CORES
+static void IRQHandler(void *param,int irq)
+{
+	//ym3812_state *info = (ym3812_state *)param;
+	//if (info->intf->handler) (info->intf->handler)(info->device, irq ? ASSERT_LINE : CLEAR_LINE);
+	//if (info->intf->handler) (info->intf->handler)(irq ? ASSERT_LINE : CLEAR_LINE);
+}
+#endif
+
+/*static TIMER_CALLBACK( timer_callback_0 )
+{
+	ym3812_state *info = (ym3812_state *)ptr;
+	ym3812_timer_over(info->chip,0);
+}
+
+static TIMER_CALLBACK( timer_callback_1 )
+{
+	ym3812_state *info = (ym3812_state *)ptr;
+	ym3812_timer_over(info->chip,1);
+}*/
+
+//static void TimerHandler(void *param,int c,attotime period)
+#ifdef ENABLE_ALL_CORES
+static void TimerHandler(void *param,int c,int period)
+{
+	//ym3812_state *info = (ym3812_state *)param;
+	//if( attotime_compare(period, attotime_zero) == 0 )
+	if( period == 0 )
+	{	/* Reset FM Timer */
+		//timer_enable(info->timerc, 0);
+	}
+	else
+	{	/* Start FM Timer */
+		//timer_adjust_oneshot(info->timerc, period, 0);
+	}
+}
+#endif
+
+
+//static STREAM_UPDATE( ym3812_stream_update )
+void ym3812_stream_update(void *param, stream_sample_t **outputs, int samples)
+{
+	ym3812_state *info = (ym3812_state *)param;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym3812_update_one(info->chip, outputs, samples);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL2_getsample(info->chip, outputs, samples);
+		break;
+	}
+}
+
+static stream_sample_t* DUMMYBUF0x02 = {NULL, NULL};
+
+static void _stream_update(void * param/*, int interval*/)
+{
+	ym3812_state *info = (ym3812_state *)param;
+	//stream_update(info->stream);
+	
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym3812_update_one(info->chip, DUMMYBUF, 0);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL2_getsample(info->chip, DUMMYBUF, 0);
+		break;
+	}
+}
+
+
+//static DEVICE_START( ym3812 )
+int device_start_ym3812(void **_info, int EMU_CORE, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	//static const ym3812_interface dummy = { 0 };
+	//ym3812_state *info = get_safe_token(device);
+	ym3812_state *info;
+	int rate;
+
+#ifdef ENABLE_ALL_CORES
+	if (EMU_CORE >= 0x02)
+		EMU_CORE = EC_DBOPL;
+#else
+	EMU_CORE = EC_DBOPL;
+#endif
+	
+	info = (ym3812_state *) calloc(1, sizeof(ym3812_state));
+	*_info = (void *) info;
+	
+	info->EMU_CORE = EMU_CORE;
+	rate = (clock & 0x7FFFFFFF)/72;
+	if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	//info->intf = device->static_config ? (const ym3812_interface *)device->static_config : &dummy;
+	//info->intf = &dummy;
+	//info->device = device;
+
+	/* stream system initialize */
+	switch(EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		info->chip = ym3812_init(clock & 0x7FFFFFFF,rate);
+		//assert_always(info->chip != NULL, "Error creating YM3812 chip");
+
+		//info->stream = stream_create(device,0,1,rate,info,ym3812_stream_update);
+
+		/* YM3812 setup */
+		ym3812_set_timer_handler (info->chip, TimerHandler, info);
+		ym3812_set_irq_handler (info->chip, IRQHandler, info);
+		ym3812_set_update_handler(info->chip, _stream_update, info);
+
+		//info->timer0 = timer_alloc(device->machine, timer_callback_0, info);
+		//info->timer1 = timer_alloc(device->machine, timer_callback_1, info);
+		break;
+#endif
+	case EC_DBOPL:
+		info->chip = adlib_OPL2_init(clock & 0x7FFFFFFF, rate, _stream_update, info);
+		break;
+	}
+
+	return rate;
+}
+
+//static DEVICE_STOP( ym3812 )
+void device_stop_ym3812(void *_info)
+{
+	//ym3812_state *info = get_safe_token(device);
+	ym3812_state *info = (ym3812_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym3812_shutdown(info->chip);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL2_stop(info->chip);
+		break;
+	}
+	free(info);
+}
+
+//static DEVICE_RESET( ym3812 )
+void device_reset_ym3812(void *_info)
+{
+	//ym3812_state *info = get_safe_token(device);
+	ym3812_state *info = (ym3812_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym3812_reset_chip(info->chip);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL2_reset(info->chip);
+		break;
+	}
+}
+
+
+//READ8_DEVICE_HANDLER( ym3812_r )
+UINT8 ym3812_r(void *_info, offs_t offset)
+{
+	//ym3812_state *info = get_safe_token(device);
+	ym3812_state *info = (ym3812_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		return ym3812_read(info->chip, offset & 1);
+#endif
+	case EC_DBOPL:
+		return adlib_OPL2_reg_read(info->chip, offset & 0x01);
+	default:
+		return 0x00;
+	}
+}
+
+//WRITE8_DEVICE_HANDLER( ym3812_w )
+void ym3812_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ym3812_state *info = get_safe_token(device);
+	ym3812_state *info = (ym3812_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ym3812_write(info->chip, offset & 1, data);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL2_writeIO(info->chip, offset & 1, data);
+		break;
+	}
+}
+
+//READ8_DEVICE_HANDLER( ym3812_status_port_r )
+UINT8 ym3812_status_port_r(void *info, offs_t offset)
+{
+	return ym3812_r(info, 0);
+}
+//READ8_DEVICE_HANDLER( ym3812_read_port_r )
+UINT8 ym3812_read_port_r(void *info, offs_t offset)
+{
+	return ym3812_r(info, 1);
+}
+//WRITE8_DEVICE_HANDLER( ym3812_control_port_w )
+void ym3812_control_port_w(void *info, offs_t offset, UINT8 data)
+{
+	ym3812_w(info, 0, data);
+}
+//WRITE8_DEVICE_HANDLER( ym3812_write_port_w )
+void ym3812_write_port_w(void *info, offs_t offset, UINT8 data)
+{
+	ym3812_w(info, 1, data);
+}
+
+
+void ym3812_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	ym3812_state *info = (ym3812_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		opl_set_mute_mask(info->chip, MuteMask);
+		break;
+#endif
+	case EC_DBOPL:
+		adlib_OPL2_set_mute_mask(info->chip, MuteMask);
+		break;
+	}
+	
+	return;
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ym3812 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ym3812_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym3812 );				break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( ym3812 );				break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ym3812 );				break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM3812");							break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");						break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");								break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);							break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/3812intf.h Added

@@ -0,0 +1,34 @@
+#pragma once
+
+/*typedef struct _ym3812_interface ym3812_interface;
+struct _ym3812_interface
+{
+	//void (*handler)(const device_config *device, int linestate);
+	void (*handler)(int linestate);
+};*/
+
+/*READ8_DEVICE_HANDLER( ym3812_r );
+WRITE8_DEVICE_HANDLER( ym3812_w );
+
+READ8_DEVICE_HANDLER( ym3812_status_port_r );
+READ8_DEVICE_HANDLER( ym3812_read_port_r );
+WRITE8_DEVICE_HANDLER( ym3812_control_port_w );
+WRITE8_DEVICE_HANDLER( ym3812_write_port_w );
+
+DEVICE_GET_INFO( ym3812 );
+#define SOUND_YM3812 DEVICE_GET_INFO_NAME( ym3812 )*/
+
+void ym3812_stream_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_ym3812(void **chip, int core, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_ym3812(void *chip);
+void device_reset_ym3812(void *chip);
+
+UINT8 ym3812_r(void *chip, offs_t offset);
+void ym3812_w(void *chip, offs_t offset, UINT8 data);
+
+UINT8 ym3812_status_port_r(void *chip, offs_t offset);
+UINT8 ym3812_read_port_r(void *chip, offs_t offset);
+void ym3812_control_port_w(void *chip, offs_t offset, UINT8 data);
+void ym3812_write_port_w(void *chip, offs_t offset, UINT8 data);
+
+void ym3812_set_mute_mask(void *chip, UINT32 MuteMask);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.c Added

@@ -0,0 +1,277 @@
+/******************************************************************************
+* FILE
+* Yamaha 3812 emulator interface - MAME VERSION
+*
+* CREATED BY
+* Ernesto Corvi
+*
+* UPDATE LOG
+* JB 28-04-2002 Fixed simultaneous usage of all three different chip types.
+* Used real sample rate when resample filter is active.
+* AAT 12-28-2001 Protected Y8950 from accessing unmapped port and keyboard handlers.
+* CHS 1999-01-09 Fixes new ym3812 emulation interface.
+* CHS 1998-10-23 Mame streaming sound chip update
+* EC 1998 Created Interface
+*
+* NOTES
+*
+******************************************************************************/
+#include "mamedef.h"
+#include <stdlib.h>
+//#include "attotime.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+//#include "cpuintrf.h"
+#include "8950intf.h"
+//#include "fm.h"
+#include "fmopl.h"
+
+#include <string.h>
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+
+typedef struct _y8950_state y8950_state;
+struct _y8950_state
+{
+	//sound_stream *	stream;
+	//emu_timer *		timer2;
+	void *			chip;
+	//const y8950_interface *intf;
+	//const device_config *device;
+};
+
+
+/*INLINE y8950_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_Y8950);
+	return (y8950_state *)device->token;
+}*/
+
+
+static void IRQHandler(void *param,int irq)
+{
+	//y8950_state *info = (y8950_state *)param;
+	//if (info->intf->handler) (info->intf->handler)(info->device, irq ? ASSERT_LINE : CLEAR_LINE);
+	//if (info->intf->handler) (info->intf->handler)(irq ? ASSERT_LINE : CLEAR_LINE);
+}
+/*static TIMER_CALLBACK( timer_callback_0 )
+{
+	y8950_state *info = (y8950_state *)ptr;
+	y8950_timer_over(info->chip,0);
+}
+static TIMER_CALLBACK( timer_callback_1 )
+{
+	y8950_state *info = (y8950_state *)ptr;
+	y8950_timer_over(info->chip,1);
+}*/
+//static void TimerHandler(void *param,int c,attotime period)
+static void TimerHandler(void *param,int c,int period)
+{
+	//y8950_state *info = (y8950_state *)param;
+	//if( attotime_compare(period, attotime_zero) == 0 )
+	if( period == 0 )
+	{	/* Reset FM Timer */
+		//timer_enable(info->timerc, 0);
+	}
+	else
+	{	/* Start FM Timer */
+		//timer_adjust_oneshot(info->timerc, period, 0);
+	}
+}
+
+
+static unsigned char Y8950PortHandler_r(void *param)
+{
+	//y8950_state *info = (y8950_state *)param;
+	/*if (info->intf->portread)
+		return info->intf->portread(0);*/
+	return 0;
+}
+
+static void Y8950PortHandler_w(void *param,unsigned char data)
+{
+	//y8950_state *info = (y8950_state *)param;
+	/*if (info->intf->portwrite)
+		info->intf->portwrite(0,data);*/
+}
+
+static unsigned char Y8950KeyboardHandler_r(void *param)
+{
+	//y8950_state *info = (y8950_state *)param;
+	/*if (info->intf->keyboardread)
+		return info->intf->keyboardread(0);*/
+	return 0;
+}
+
+static void Y8950KeyboardHandler_w(void *param,unsigned char data)
+{
+	//y8950_state *info = (y8950_state *)param;
+	/*if (info->intf->keyboardwrite)
+		info->intf->keyboardwrite(0,data);*/
+}
+
+//static STREAM_UPDATE( y8950_stream_update )
+void y8950_stream_update(void *param, stream_sample_t **outputs, int samples)
+{
+	y8950_state *info = (y8950_state *)param;
+	y8950_update_one(info->chip, outputs, samples);
+}
+
+static stream_sample_t* DUMMYBUF0x02 = {NULL, NULL};
+
+static void _stream_update(void *param/*, int interval*/)
+{
+	y8950_state *info = (y8950_state *)param;
+	//stream_update(info->stream);
+	
+	y8950_update_one(info->chip, DUMMYBUF, 0);
+}
+
+
+//static DEVICE_START( y8950 )
+int device_start_y8950(void **_info, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	//static const y8950_interface dummy = { 0 };
+	//y8950_state *info = get_safe_token(device);
+	y8950_state *info;
+	int rate;
+	
+	info = (y8950_state *) calloc(1, sizeof(y8950_state));
+	*_info = (void *) info;	
+
+	rate = clock/72;
+	if ((CHIP_SAMPLING_MODE == 0x01 && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	//info->intf = device->static_config ? (const y8950_interface *)device->static_config : &dummy;
+	//info->intf = &dummy;
+	//info->device = device;
+
+	/* stream system initialize */
+	info->chip = y8950_init(clock,rate);
+	//assert_always(info->chip != NULL, "Error creating Y8950 chip");
+
+	/* ADPCM ROM data */
+	//y8950_set_delta_t_memory(info->chip, device->region, device->regionbytes);
+	y8950_set_delta_t_memory(info->chip, NULL, 0x00);
+
+	//info->stream = stream_create(device,0,1,rate,info,y8950_stream_update);
+
+	/* port and keyboard handler */
+	y8950_set_port_handler(info->chip, Y8950PortHandler_w, Y8950PortHandler_r, info);
+	y8950_set_keyboard_handler(info->chip, Y8950KeyboardHandler_w, Y8950KeyboardHandler_r, info);
+
+	/* Y8950 setup */
+	y8950_set_timer_handler (info->chip, TimerHandler, info);
+	y8950_set_irq_handler (info->chip, IRQHandler, info);
+	y8950_set_update_handler(info->chip, _stream_update, info);
+
+	//info->timer0 = timer_alloc(device->machine, timer_callback_0, info);
+	//info->timer1 = timer_alloc(device->machine, timer_callback_1, info);
+
+	return rate;
+}
+
+//static DEVICE_STOP( y8950 )
+void device_stop_y8950(void *_info)
+{
+	//y8950_state *info = get_safe_token(device);
+	y8950_state *info = (y8950_state *)_info;
+	y8950_shutdown(info->chip);
+	free(info);
+}
+
+//static DEVICE_RESET( y8950 )
+void device_reset_y8950(void *_info)
+{
+	//y8950_state *info = get_safe_token(device);
+	y8950_state *info = (y8950_state *)_info;
+	y8950_reset_chip(info->chip);
+}
+
+
+//READ8_DEVICE_HANDLER( y8950_r )
+UINT8 y8950_r(void *_info, offs_t offset)
+{
+	//y8950_state *info = get_safe_token(device);
+	y8950_state *info = (y8950_state *)_info;
+	return y8950_read(info->chip, offset & 1);
+}
+
+//WRITE8_DEVICE_HANDLER( y8950_w )
+void y8950_w(void *_info, offs_t offset, UINT8 data)
+{
+	//y8950_state *info = get_safe_token(device);
+	y8950_state *info = (y8950_state *)_info;
+	y8950_write(info->chip, offset & 1, data);
+}
+
+//READ8_DEVICE_HANDLER( y8950_status_port_r )
+UINT8 y8950_status_port_r(void *info, offs_t offset)
+{
+	return y8950_r(info, 0);
+}
+//READ8_DEVICE_HANDLER( y8950_read_port_r )
+UINT8 y8950_read_port_r(void *info, offs_t offset)
+{
+	return y8950_r(info, 1);
+}
+//WRITE8_DEVICE_HANDLER( y8950_control_port_w )
+void y8950_control_port_w(void *info, offs_t offset, UINT8 data)
+{
+	y8950_w(info, 0, data);
+}
+//WRITE8_DEVICE_HANDLER( y8950_write_port_w )
+void y8950_write_port_w(void *info, offs_t offset, UINT8 data)
+{
+	y8950_w(info, 1, data);
+}
+
+
+void y8950_write_data_pcmrom(void *_info, offs_t ROMSize, offs_t DataStart,
+							 offs_t DataLength, const UINT8* ROMData)
+{
+	y8950_state* info = (y8950_state *)_info;
+	
+	y8950_write_pcmrom(info->chip, ROMSize, DataStart, DataLength, ROMData);
+	
+	return;
+}
+
+void y8950_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	y8950_state *info = (y8950_state *)_info;
+	opl_set_mute_mask(info->chip, MuteMask);
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( y8950 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(y8950_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( y8950 );				break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( y8950 );				break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( y8950 );				break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "Y8950");							break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");						break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");								break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);							break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/8950intf.h Added

@@ -0,0 +1,40 @@
+#pragma once
+
+/*typedef struct _y8950_interface y8950_interface;
+struct _y8950_interface
+{
+	//void (*handler)(const device_config *device, int linestate);
+	void (*handler)(int linestate);
+
+	read8_device_func keyboardread;
+	write8_device_func keyboardwrite;
+	read8_device_func portread;
+	write8_device_func portwrite;
+};*/
+
+/*READ8_DEVICE_HANDLER( y8950_r );
+WRITE8_DEVICE_HANDLER( y8950_w );
+
+READ8_DEVICE_HANDLER( y8950_status_port_r );
+READ8_DEVICE_HANDLER( y8950_read_port_r );
+WRITE8_DEVICE_HANDLER( y8950_control_port_w );
+WRITE8_DEVICE_HANDLER( y8950_write_port_w );
+
+DEVICE_GET_INFO( y8950 );
+#define SOUND_Y8950 DEVICE_GET_INFO_NAME( y8950 )*/
+void y8950_stream_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_y8950(void **chip, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_y8950(void *chip);
+void device_reset_y8950(void *chip);
+
+UINT8 y8950_r(void *chip, offs_t offset);
+void y8950_w(void *chip, offs_t offset, UINT8 data);
+
+UINT8 y8950_status_port_r(void *chip, offs_t offset);
+UINT8 y8950_read_port_r(void *chip, offs_t offset);
+void y8950_control_port_w(void *chip, offs_t offset, UINT8 data);
+void y8950_write_port_w(void *chip, offs_t offset, UINT8 data);
+
+void y8950_write_data_pcmrom(void *chip, offs_t ROMSize, offs_t DataStart,
+							  offs_t DataLength, const UINT8* ROMData);
+void y8950_set_mute_mask(void *chip, UINT32 MuteMask);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ChipIncl.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.c Added

@@ -0,0 +1,1055 @@
+/******************************************************************************
+Ootake
+・キューの参照処理をシンプルにした。テンポの安定性および音質の向上。
+・オーバーサンプリングしないようにした。（筆者の主観もあるが、PSGの場合、響きの
+ 美しさが損なわれてしまうケースが多いため。速度的にもアップ）
+・ノイズの音質・音量を実機並みに調整した。v0.72
+・ノイズの周波数に0x1Fが書き込まれたときは、0x1Eと同じ周波数で音量を半分にして
+ 鳴らすようにした。v0.68
+・現状は再生サンプルレートは44.1KHz固定とした。(CD-DA再生時の速度アップのため)
+・DDA音の発声が終了したときにいきなり波形を0にせず、フェードアウトさせるように
+ し、ノイズを軽減した。v0.57
+・DDAモード(サンプリング発声)のときの波形データのノイズが多く含まれている部分
+ をカットしして、音質を上げた。音量も調節した。v0.59
+・ノイズ音の音質・音量を調整して、実機の雰囲気に近づけた。v0.68
+・waveIndexの初期化とDDAモード時の動作を見直して実機の動作に近づけた。v0.63
+・waveIndexの初期化時にwaveテーブルも初期化するようにした。ファイヤープロレス
+ リング、Ｆ１トリプルバトルなどの音が実機に近づいた。v0.65
+・waveの波形の正負を実機同様にした。v0.74
+・waveの最小値が-14になるようにし音質を整えた。v0.74
+・クリティカルセクションは必要ない(書き込みが同時に行われるわけではない)ような
+ ので、省略し高速化した。v1.09
+・キュー処理(ApuQueue.c)をここに統合して高速化した。v1.10
+・低音領域のボリュームを上げて実機並みの聞こえやすさに近づけた。v1.46
+・LFO処理のの実装。"はにいいんざすかい"のOPや、フラッシュハイダースの効果音が
+ 実機の音に近づいた。v1.59
+
+Copyright(C)2006-2012 Kitao Nakamura.
+	改造版・後継版を公開なさるときは必ずソースコードを添付してください。
+	その際に事後でかまいませんので、ひとことお知らせいただけると幸いです。
+	商的な利用は禁じます。
+	あとは「GNU General Public License(一般公衆利用許諾契約書)」に準じます。
+
+*******************************************************************************
+	PSG.c
+		ＰＳＧを実装します。
+
+	Implements the PSG.
+
+	Copyright (C) 2004 Ki
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+******************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "mamedef.h"
+#include "Ootake_PSG.h"
+//#include "MainBoard.h" //Kitao追加
+//#include "App.h" //Kitao追加
+//#include "PRINTF.h" //Kitao追加
+//#define PRINTF	printf
+
+
+#define N_CHANNEL			6
+
+//#define SAMPLE_RATE			44100.0 //Kitao更新。現状は速度優先でサンプルレートを44100固定とした。
+#define OVERSAMPLE_RATE		1.0 //Kitao更新。PSGはオーバーサンプリングすると響きの美しさが損なわれてしまうのでオーバーサンプリングしないようにした。速度的にもアップ。
+#define PSG_DECLINE			(21.8500*6.0) //21.8500。Kitao追加。PSG音量の減少値。*6.0は各チャンネル足したぶんを割る意味。大きいほど音は減る。CDDAが100%のときにちょうど良いぐらいの音量に合わせよう。v2.19,v2.37,v2.39,v2.62更新
+#define VOL_TABLE_DECLINE	-1.05809999010 //-1.05809999010で雀探物語２OK。Kitao追加。音量テーブルの減少値。マイナスが大きいほど小さい音が聞こえづらくなる。マイナスが小さすぎると平面的な音になる。v2.19,v2.37,v2.39,v2.40,v2.62,v2.65更新
+									 // ※PSG_DECLINEの値を変更した場合、減退率のベスト値も変更する必要がある。雀探物語２(マイナスが小さいとPSGが目立ちすぎてADPCMが聴きづらい)，大魔界村(マイナスが大きいと音篭り),ソルジャーブレイドで、PSG_DECLINE=(14.4701*6.0)で減退率-1.0498779900db前後が飛び抜けていい響き(うちの環境で主観)。
+										 //																		 モトローダー(マイナスやや大き目がいい),１９４１(マイナス小さめがいい)なども微妙な値変更で大きく変わる。
+#define NOISE_TABLE_VALUE	-18 : -1 //キレと聴きやすさで-18:-1をベストとした。最大値が大きい(+に近い)と重い音に。２つの値が離れていると重い音に。フォーメーションサッカー，大魔界村のエンディングのドラムなどで調整。v1.46,v2.40,v2.62更新
+									 // ※VOL_TABLE_DECLINEによってこの値の最適値も変化する。
+#define SAMPLE_FADE_DECLINE	 0.305998999951 //0.30599899951。Kitao追加。サンプリング音の消音時の音の減退量。ソルジャーブレイド,将棋初心者無用の音声で調整。基本的にこの値が小さいほうがノイズが減る(逆のケースもある)。v2.40
+											//							サンプリングドラムの音色が決まるので大事な値。値が大きすぎるとファイナルソルジャーやソルジャーブレイド,モトローダーなどでドラムがしょぼくなる。
+
+//#define RESMPL_RATE		PSG_FRQ / OVERSAMPLE_RATE / SAMPLE_RATE	// the lack of () is intentional
+
+
+/*-----------------------------------------------------------------------------
+	DEV NOTE
+
+	MAL			--- 0 - 15 (15 で -0dB, １減るごとに -3.0 dB)
+	AL			--- 0 - 31 (31 で -0dB, １減るごとに -1.5 dB)
+	LAL/RAL		--- 0 - 15 (15 で -0dB, １減るごとに -3.0 dB)
+
+	次のように解釈しなおす。
+
+	MAL*2		--- 0 - 30 (30 で -0dB, １減るごとに -1.5 dB)
+	AL			--- 0 - 31 (31 で -0dB, １減るごとに -1.5 dB)
+	LAL/RAL*2	--- 0 - 30 (30 で -0dB, １減るごとに -1.5 dB)
+
+
+	dB = 20 * log10(OUT/IN)
+
+	dB / 20 = log10(OUT/IN)
+
+	OUT/IN = 10^(dB/20)
+
+	IN(最大出力) を 1.0 とすると、
+
+	OUT = 10^(dB/20)
+
+					-91 <= -(MAL*2 + AL + LAL(RAL)*2) <= 0
+
+	だから、最も小さい音は、
+
+		-91 * 1.5 dB = -136.5 dB = 10^(-136.5/20) ~= 1.496236e-7 倍
+
+	となる。
+
+	 1e-7 オーダーの値は、固定小数点で表現しようとすると、小数部だけで
+	24 ビット以上必要で、なおかつ１６ビットの音声を扱うためには +16ビット
+	だから 24+16 = 40ビット以上必要になる。よって、32 ビットの処理系で
+	ＰＣＥの音声を固定小数点で表現するのはつらい。そこで、波形の計算は
+	float で行なうことにする。
+
+	 float から出力形式に変換するのはＡＰＵの仕事とする。
+
+	2004.4.28 やっぱり Sint32 で実装することにした(微小な値は無視する)。
+
+	 ＣＰＵとＰＳＧは同じＩＣにパッケージしてあるのだが、
+	実際にはＰＳＧはＣＰＵの１／２のクロックで動作すると考えて良いようだ。
+	よって、ＰＳＧの動作周波数 Fpsg は、
+
+		Fpsg = 21.47727 MHz / 3 / 2 = 3.579545 MHz
+
+	となる。
+
+	たとえば３２サンプルを１周期とする波形が再生されるとき、
+	この周波数の周期でサンプルを１つずつ拾い出すと、
+
+		M = 3579545 / 32 = 111860.78125 Hz
+
+	というマジックナンバーが得られる（ファミコンと同じ）。
+	ただし、再生周波数が固定では曲の演奏ができないので、
+	FRQ なる周波数パラメータを用いて再生周波数を変化させる。
+	FRQ はＰＳＧのレジスタに書き込まれる１２ビット長のパラメータで、
+	↑で得られたマジックナンバーの「割る数」になっている。
+
+	上の３２サンプルを１周期とする波形が再生されるとき、
+	この波形の周波数 F は、FRQ を用いて、
+	
+		F = M / FRQ Hz (FRQ != 0)
+	
+	となる。
+
+	 ＰＣの再生サンプリング周波数が Fpc Hz だとすると、
+	１周期３２サンプルの波形の再生周波数 F2 は F2 = Fpc / 32 Hz。
+	よって、ＰＣの１サンプルに対して、ＰＣＥの１サンプルを拾い出す
+	カウンタの進み幅 I は
+
+		I = F / F2 = 32 * F / Fpc = Fpsg / FRQ / Fpc 単位なし
+
+	となる。
+
+	NOISE CHANNEL
+
+	 擬似ノイズの生成にはＭ系列(maximum length sequence)が用いられる。
+	Ｍ系列のビット長は未調査につき不明。
+	ここでは仮に１５ビットとして実装を行なう。
+	出力は１ビットで、D0 がゼロのときは負の値、１のときは正の値とする。
+
+	ＰＣの１サンプルに対して、ＰＣＥの１サンプルを拾い出す
+	カウンタの進み幅 I は、
+
+		I = Fpsg / 64 / FRQ / Fpc (FRQ != 0)
+
+	となる。
+
+	再生クオリティ向上について 2004.6.22
+
+	 エミュレータでは、ＰＳＧのレジスタにデータが書き込まれるまで、
+	次に発声すべき音がわからない。レジスタにデータが書き込まれたときに、
+	サウンドバッファを更新したいのだけど、あいにく現在の実装では、
+	サウンドバッファの更新は別スレッドで行なわれていて、
+	エミュレーションスレッドから任意の時間に更新することができない。
+
+	 これまでの再生では、サウンドバッファの更新時のレジスタ設定のみが
+	有効だったが、これだと例えばサウンドバッファ更新の合間に一瞬だけ
+	出力された音などが無視されてしまう。これは特にＤＤＡモードやノイズが
+	リズムパートとして使用される上で問題になる。
+
+	 レジスタに書き込まれた値をきちんと音声出力に反映させるには、
+	過去に書き込まれたレジスタの値(いつ、どのレジスタに、何が書き込まれたか)
+	を保存しておいて、サウンドバッファ更新時にこれを参照する方法が
+	考えられる。どのくらい過去までレジスタの値を保存しておくかは、
+	サウンドバッファの長さにもよると思われるが、とりあえずは試行錯誤で
+	決めることにする。
+
+	 ＰＳＧレジスタへの書き込み動作はエミュレーションスレッドで
+	行なわれ、サウンドバッファ更新はその専用スレッドで行なわれる。
+	これだと、エミュレーションスレッドがレジスタのキューに書き込みを
+	行なっている最中に、サウンドバッファ更新スレッドがキューから
+	読み出しを行なってしまい、アクセスが衝突する。この問題を解決するには、
+
+		１．サウンドバッファの更新を別スレッドで行なわない
+		２．キューのアクセス部分を排他処理にする
+
+	の２とおりが考えられる。とりあえず２の方法をとることにする。
+---------------------------------------------------------------------------*/
+
+
+typedef struct
+{
+	Uint32		frq;
+	BOOL		bOn;
+	BOOL		bDDA;
+	Uint32		volume;
+	Uint32		volumeL;
+	Uint32		volumeR;
+	Sint32		outVolumeL;
+	Sint32		outVolumeR;
+	Sint32		wave32;
+	Uint32		waveIndex;
+	Sint32		ddaSample;
+	Uint32		phase;
+	Uint32		deltaPhase;
+	BOOL		bNoiseOn;
+	Uint32		noiseFrq;
+	Uint32		deltaNoisePhase;
+} PSG;
+
+typedef struct
+{
+	double SAMPLE_RATE;
+	double PSG_FRQ;
+	double RESMPL_RATE;
+
+	PSG			Psg8;				// 6, 7 is unused
+	Sint32		DdaFadeOutL8; //Kitao追加
+	Sint32		DdaFadeOutR8; //Kitao追加
+	Uint32		Channel;				// 0 - 5;
+	Uint32		MainVolumeL;			// 0 - 15
+	Uint32		MainVolumeR;			// 0 - 15
+	Uint32		LfoFrq;
+	BOOL		bLfoOn; //v1.59から非使用。過去verのステートロードのために残してある。
+	Uint32		LfoCtrl;
+	Uint32		LfoShift; //v1.59から非使用。過去verのステートロードのために残してある。
+	Sint32		PsgVolumeEffect;	// = 0;//Kitao追加
+	double		Volume;	// = 0;//Kitao追加
+	double		VOL;	// = 0.0;//Kitao追加。v1.08
+//	BOOL		_bPsgMute8 = {FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE};//Kitao追加。v1.29
+	BOOL		bPsgMute8;
+
+	Uint8		Port16;				// for debug purpose 
+
+	BOOL		bWaveCrash; //Kitao追加。DDA再生中にWaveデータが書き換えられたらTRUE
+	BOOL		bHoneyInTheSky; //はにいいんざすかいパッチ用。v2.60
+} huc6280_state;
+
+static Sint32		_VolumeTable92;
+static Sint32		_NoiseTable32768;
+
+//static BOOL		_bPsgInit = FALSE;
+static BOOL			_bTblInit = FALSE;
+
+//Kitao更新。v1.10。キュー処理をここに統合して高速化。
+/*
+	ＡＰＵ専用キューの仕様
+
+	レジスタに書き込みが行なわれるごとに、
+	キューにその内容を追加する。
+
+	サウンドバッファ更新時に経過時間をみて、
+	過去に書き込まれたレジスタ内容を
+	書き込まれた順にキューから取り出し、
+	ＰＳＧレジスタを更新する。
+	（なおＰＳＧレジスタは全て write only とみなす)
+	 ↑要確認
+
+	キューに追加するときには write index を用い、
+	取り出すときには read index を用いる。
+
+	// 追加
+	queuewrite index++ = written data
+
+	// 取り出し
+	data = queueread index++
+
+	キューから値を取り出したときに read index が
+	write index と一致したときは queue underflow。
+	→とりあえずなにもしない。
+
+	キューに値を追加したときに write index が
+	read index と一致したときは queue overflow。
+	→とりあえずリセットすることにする。
+*/
+
+/*#define APUQUEUE_SIZE	65536*2				// must be power of 2 v1.61更新。65536だとＡ列車３をオーバークロックしてプレイしたときに足りなかった。
+
+typedef struct		//Kitao更新。clockは非使用とした。v1.61からステートセーブのサイズを減らすために変数上からもカット。
+{
+	Uint8			reg;					// 0-15
+	Uint8			data;					// written data
+} ApuQueue;
+typedef struct		//v1.60以前のステートロードのため残してある。
+{
+	Uint32			clock;					// cpu cycles elapsed since previous write Kitao更新。clockは現在非使用。
+	Uint8			reg;					// 0-15
+	Uint8			data;					// written data
+} OldApuQueue;
+
+static ApuQueue				_QueueAPUQUEUE_SIZE;
+static Uint32				_QueueWriteIndex;
+static Uint32				_QueueReadIndex;*/
+
+
+//ボリュームテーブルの作成
+//Kitao更新。低音量の音が実機より聞こえづらいので、減退率をVOL_TABLE_DECLINEdb(試行錯誤したベスト値)とし、ノーマライズ処理をするようにした。v1.46
+//			 おそらく、実機もアンプを通って出力される際にノーマライズ処理されている。
+static void
+create_volume_table()
+{
+	int		i;
+	double	v;
+
+	_VolumeTable0 = 0; //Kitao追加
+	for (i = 1; i <= 91; i++)
+	{
+		v = 91 - i;
+		_VolumeTablei = (Sint32)(32768.0 * pow(10.0, v * VOL_TABLE_DECLINE / 20.0)); //VOL_TABLE_DECLINE。小さくしすぎると音が平面的な傾向に。ソルジャーブレイドで調整。v1.46。
+	}
+}
+
+
+//ノイズテーブルの作成
+static void
+create_noise_table()
+{
+	Sint32	i;
+	Uint32	bit0;
+	Uint32	bit1;
+	Uint32	bit14;
+	Uint32	reg = 0x100;
+
+	for (i = 0; i < 32768; i++)
+	{
+		bit0 = reg & 1;
+		bit1 = (reg & 2) >> 1;
+		bit14 = (bit0 ^ bit1);
+		reg >>= 1;
+		reg |= (bit14 << 14);
+		_NoiseTablei = (bit0) ? NOISE_TABLE_VALUE; //Kitao更新。ノイズのボリュームと音質を調整した。
+	}
+}
+
+
+/*-----------------------------------------------------------------------------
+	write_reg
+		ＰＳＧポートの書き込みに対する動作を記述します。
+-----------------------------------------------------------------------------*/
+//static inline void
+INLINE void
+write_reg(
+	huc6280_state* info,
+	Uint8		reg,
+	Uint8		data)
+{
+	Uint32	i;
+	Uint32	frq;//Kitao追加
+	PSG*	PSGChn;
+
+	info->Portreg & 15 = data;
+
+	switch (reg & 15)
+	{
+		case 0:	// register select
+			info->Channel = data & 7;
+			break;
+
+		case 1:	// main volume
+			info->MainVolumeL = (data >> 4) & 0x0F;
+			info->MainVolumeR = data & 0x0F;
+
+			/* LMAL, RMAL は全チャネルの音量に影響する */
+			for (i = 0; i < N_CHANNEL; i++)
+			{
+				PSGChn = &info->Psgi;
+				PSGChn->outVolumeL = _VolumeTablePSGChn->volume + (info->MainVolumeL + PSGChn->volumeL) * 2;
+				PSGChn->outVolumeR = _VolumeTablePSGChn->volume + (info->MainVolumeR + PSGChn->volumeR) * 2;
+			}
+			break;
+
+		case 2:	// frequency low
+			PSGChn = &info->Psginfo->Channel;
+			PSGChn->frq &= ~0xFF;
+			PSGChn->frq |= data;
+			//Kitao更新。update_frequencyは、速度アップのためサブルーチンにせず直接実行するようにした。
+			frq = (PSGChn->frq - 1) & 0xFFF;
+			if (frq)
+				PSGChn->deltaPhase = (Uint32)((double)(65536.0 * 256.0 * 8.0 * info->RESMPL_RATE) / (double)frq +0.5); //Kitao更新。速度アップのためfrq以外は定数計算にした。精度向上のため、先に値の小さいOVERSAMPLE_RATEのほうで割るようにした。+0.5は四捨五入で精度アップ。プチノイズ軽減のため。
+			else
+				PSGChn->deltaPhase = 0;
+			break;
+
+		case 3:	// frequency high
+			PSGChn = &info->Psginfo->Channel;
+			PSGChn->frq &= ~0xF00;
+			PSGChn->frq |= (data & 0x0F) << 8;
+			//Kitao更新。update_frequencyは、速度アップのためサブルーチンにせず直接実行するようにした。
+			frq = (PSGChn->frq - 1) & 0xFFF;
+			if (frq)
+				PSGChn->deltaPhase = (Uint32)((double)(65536.0 * 256.0 * 8.0 * info->RESMPL_RATE) / (double)frq +0.5); //Kitao更新。速度アップのためfrq以外は定数計算にした。精度向上のため、先に値の小さいOVERSAMPLE_RATEのほうで割るようにした。+0.5は四捨五入で精度アップ。プチノイズ軽減のため。
+			else
+				PSGChn->deltaPhase = 0;
+			break;
+
+		case 4:	// ON, DDA, AL
+			PSGChn = &info->Psginfo->Channel;
+			if (info->bHoneyInTheSky) //はにいいんざすかいのポーズ時に、微妙なボリューム調整タイミングの問題でプチノイズが載ってしまうので、現状はパッチ処理で対応。v2.60更新
+			{
+				if ((PSGChn->bOn)&&(data == 0)) //発声中にdataが0の場合、LRボリュームも0にリセット。はにいいんざすかいのポーズ時のノイズが解消。(data & 0x1F)だけが0のときにリセットすると、サイレントデバッガーズ等でNG。発声してない時にリセットするとアトミックロボでNG。ｖ2.55
+				{
+					//PRINTF("test %X %X %X %X",info->Channel,PSGChn->bOn,info->MainVolumeL,info->MainVolumeR);
+					if ((info->MainVolumeL & 1) == 0) //メインボリュームのbit0が0のときだけ処理(はにいいんざすかいでイレギュラーな0xE。他のゲームは0xF。※ヘビーユニットも0xEだった)。これがないとミズバク大冒険で音が出ない。実機の仕組みと同じかどうかは未確認。v2.53追加
+						PSGChn->volumeL = 0;
+					if ((info->MainVolumeR & 1) == 0) //右チャンネルも同様とする
+						PSGChn->volumeR = 0;
+				}
+			}
+
+			PSGChn->bOn = ((data & 0x80) != 0);
+			if ((PSGChn->bDDA)&&((data & 0x40)==0)) //DDAからWAVEへ切り替わるとき or DDAから消音するとき
+			{
+				//Kitao追加。DDAはいきなり消音すると目立つノイズが載るのでフェードアウトする。
+				info->DdaFadeOutLinfo->Channel = (Sint32)((double)(PSGChn->ddaSample * PSGChn->outVolumeL) *
+															((1 + (1 >> 3) + (1 >> 4) + (1 >> 5) + (1 >> 7) + (1 >> 12) + (1 >> 14) + (1 >> 15)) * SAMPLE_FADE_DECLINE)); //元の音量。v2.65更新
+				info->DdaFadeOutRinfo->Channel = (Sint32)((double)(PSGChn->ddaSample * PSGChn->outVolumeR) *
+															((1 + (1 >> 3) + (1 >> 4) + (1 >> 5) + (1 >> 7) + (1 >> 12) + (1 >> 14) + (1 >> 15)) * SAMPLE_FADE_DECLINE));
+
+			}
+			PSGChn->bDDA = ((data & 0x40) != 0);
+			
+			//Kitao追加。dataのbit7,6が01のときにWaveインデックスをリセットする。
+			//DDAモード時にWaveデータを書き込んでいた場合はここでWaveデータを修復（初期化）する。ファイヤープロレスリング。
+			if ((data & 0xC0) == 0x40)
+			{
+				PSGChn->waveIndex = 0;
+				if (info->bWaveCrash)
+				{
+					for (i=0; i<32; i++)
+						PSGChn->wavei = -14; //Waveデータを最小値で初期化
+					info->bWaveCrash = FALSE;
+				}
+			}
+
+			PSGChn->volume = data & 0x1F;
+			PSGChn->outVolumeL = _VolumeTablePSGChn->volume + (info->MainVolumeL + PSGChn->volumeL) * 2;
+			PSGChn->outVolumeR = _VolumeTablePSGChn->volume + (info->MainVolumeR + PSGChn->volumeR) * 2;
+			break;
+
+		case 5:	// LAL, RAL
+			PSGChn = &info->Psginfo->Channel;
+			PSGChn->volumeL = (data >> 4) & 0xF;
+			PSGChn->volumeR = data & 0xF;
+			PSGChn->outVolumeL = _VolumeTablePSGChn->volume + (info->MainVolumeL + PSGChn->volumeL) * 2;
+			PSGChn->outVolumeR = _VolumeTablePSGChn->volume + (info->MainVolumeR + PSGChn->volumeR) * 2;
+			break;
+
+		case 6:	// wave data //Kitao更新。DDAモードのときもWaveデータを更新するようにした。v0.63。ファイヤープロレスリング
+			PSGChn = &info->Psginfo->Channel;
+			data &= 0x1F;
+			info->bWaveCrash = FALSE; //Kitao追加
+			if (!PSGChn->bOn) //Kitao追加。音を鳴らしていないときだけWaveデータを更新する。v0.65。F1トリプルバトルのエンジン音。
+			{
+				PSGChn->wavePSGChn->waveIndex++ = 17 - data; //17。Kitao更新。一番心地よく響く値に。ミズバク大冒険，モトローダー，ドラゴンスピリット等で調整。
+				PSGChn->waveIndex &= 0x1F;
+			}
+			if (PSGChn->bDDA)
+			{
+				//Kitao更新。ノイズ軽減のため6より下側の値はカットするようにした。v0.59
+				if (data < 6) //サイバーナイトで6に決定
+					data = 6; //ノイズが多いので小さな値はカット
+				PSGChn->ddaSample = 11 - data; //サイバーナイトで11に決定。ドラムの音色が最適。v0.74
+			
+				if (!PSGChn->bOn) //DDAモード時にWaveデータを書き換えた場合
+					info->bWaveCrash = TRUE;
+			}
+			break;
+
+		case 7:	// noise on, noise frq
+			if (info->Channel >= 4)
+			{
+				PSGChn = &info->Psginfo->Channel;
+				PSGChn->bNoiseOn = ((data & 0x80) != 0);
+				PSGChn->noiseFrq = 0x1F - (data & 0x1F);
+				if (PSGChn->noiseFrq == 0)
+					PSGChn->deltaNoisePhase = (Uint32)((double)(2048.0 * info->RESMPL_RATE) +0.5); //Kitao更新
+				else
+					PSGChn->deltaNoisePhase = (Uint32)((double)(2048.0 * info->RESMPL_RATE) / (double)PSGChn->noiseFrq +0.5); //Kitao更新
+			}
+			break;
+
+		case 8:	// LFO frequency
+			info->LfoFrq = data;
+			//Kitaoテスト用
+			//PRINTF("LFO Frq = %X",info->LfoFrq);
+			break;
+
+		case 9:	// LFO control Kitao更新。シンプルに実装してみた。実機で同じ動作かは未確認。はにいいんざすかいの音が似るように実装。v1.59
+			if (data & 0x80) //bit7を立てて呼ぶと恐らくリセット
+			{
+				info->Psg1.phase = 0; //LfoFrqは初期化しない。はにいいんざすかい。
+				//Kitaoテスト用
+				//PRINTF("LFO control = %X",data);
+			}
+			info->LfoCtrl = data & 7; //ドロップロックほらホラで5が使われる。v1.61更新
+			if (info->LfoCtrl & 4)
+				info->LfoCtrl = 0; //ドロップロックほらホラ。実機で聴いた感じはLFOオフと同じ音のようなのでbit2が立っていた(負の数扱い？)ら0と同じこととする。
+			//Kitaoテスト用
+			//PRINTF("LFO control = %X, Frq =%X",data,info->LfoFrq);
+			break;
+
+		default:	// invalid write
+			break;
+	}
+
+	return;
+}
+
+
+//Kitao追加
+static void
+set_VOL(huc6280_state* info)
+{
+	//Sint32	v;
+
+	if (info->PsgVolumeEffect == 0)
+		//info->VOL = 0.0; //ミュート
+		info->VOL = 1.0 / 128.0;
+	else if (info->PsgVolumeEffect == 3)
+		info->VOL = info->Volume / (double)(OVERSAMPLE_RATE * 4.0/3.0); // 3/4。v1.29追加
+	else
+		info->VOL = info->Volume / (double)(OVERSAMPLE_RATE * info->PsgVolumeEffect); //Kitao追加。_PsgVolumeEffect=ボリューム調節効果。
+
+	/*if (!APP_GetCDGame()) //Huカードゲームのときだけ、ボリューム101～120を有効化。v2.62
+	{
+		v = APP_GetWindowsVolume();
+		if (v > 100)
+			_VOL *= ((double)(v-100) * 3.0 + 100.0) / 100.0; //101～120は通常の3.0倍の音量変化。3.0倍のVol120でソルジャーブレイド最適。ビックリマンワールドOK。3.1倍以上だと音が薄くなる＆音割れの心配もあり。
+	}*/
+}
+
+/*-----------------------------------------------------------------------------
+	Mix
+		ＰＳＧの出力をミックスします。
+-----------------------------------------------------------------------------*/
+void
+PSG_Mix(
+//	Sint16*		pDst,		// 出力先バッファ //Kitao更新。PSG専用バッファにしたためSint16に。
+	void*		chip,
+	Sint32**	pDst,
+	Sint32		nSample)	// 書き出すサンプル数 
+{
+	huc6280_state* info = (huc6280_state*)chip;
+	PSG*		PSGChn;
+	Sint32		i;
+	Sint32		j;
+	Sint32		sample; //Kitao追加
+	Sint32		lfo;
+	Sint32		sampleAllL; //Kitao追加。6chぶんのサンプルを足していくためのバッファ。精度を維持するために必要。6chぶん合計が終わった後に、これをSint16に変換して書き込むようにした。
+	Sint32		sampleAllR; //Kitao追加。上のＲチャンネル用
+	Sint32		smp; //Kitao追加。DDA音量,ノイズ音量計算用
+	Sint32*		bufL = pDst0;
+	Sint32*		bufR = pDst1;
+
+//	if (!_bPsgInit)
+//		return;
+
+	for (j=0; j<nSample; j++)
+	{
+		sampleAllL = 0;
+		sampleAllR = 0;
+		for (i=0; i<N_CHANNEL; i++)
+		{
+			PSGChn = &info->Psgi;
+			
+			if ((PSGChn->bOn)&&((i != 1)||(info->LfoCtrl == 0))&&(!info->bPsgMutei)) //Kitao更新
+			{
+				if (PSGChn->bDDA)
+				{
+					smp = PSGChn->ddaSample * PSGChn->outVolumeL;
+					sampleAllL += smp + (smp >> 3) + (smp >> 4) + (smp >> 5) + (smp >> 7) + (smp >> 12) + (smp >> 14) + (smp >> 15); //Kitao更新。サンプリング音の音量を実機並みに調整。v2.39,v2.40,v2.62,v2.65再調整した。
+					smp = PSGChn->ddaSample * PSGChn->outVolumeR;
+					sampleAllR += smp + (smp >> 3) + (smp >> 4) + (smp >> 5) + (smp >> 7) + (smp >> 12) + (smp >> 14) + (smp >> 15); //Kitao更新。サンプリング音の音量を実機並みに調整。v2.39,v2.40,v2.62,v2.65再調整した。
+				}
+				else if (PSGChn->bNoiseOn)
+				{
+					sample = _NoiseTablePSGChn->phase >> 17;
+					
+					if (PSGChn->noiseFrq == 0) //Kitao追加。noiseFrq=0(dataに0x1Fが書き込まれた)のときは音量が通常の半分とした。（ファイヤープロレスリング３、パックランド、桃太郎活劇、がんばれゴルフボーイズなど）
+					{
+						smp = sample * PSGChn->outVolumeL;
+						sampleAllL += (smp >> 1) + (smp >> 12) + (smp >> 14); //(1/2 + 1/4096 + (1/32768 + 1/32768))
+						smp = sample * PSGChn->outVolumeR;
+						sampleAllR += (smp >> 1) + (smp >> 12) + (smp >> 14);
+					}
+					else //通常
+					{
+						smp = sample * PSGChn->outVolumeL;
+						sampleAllL += smp + (smp >> 11) + (smp >> 14) + (smp >> 15); //Kitao更新。ノイズの音量を実機並みに調整(1 + 1/2048 + 1/16384 + 1/32768)。この"+1/32768"で絶妙(主観。大魔界村,ソルジャーブレイドなど)になる。v2.62更新
+						smp = sample * PSGChn->outVolumeR;
+						sampleAllR += smp + (smp >> 11) + (smp >> 14) + (smp >> 15); //Kitao更新。ノイズの音量を実機並みに調整
+					}
+					
+					PSGChn->phase += PSGChn->deltaNoisePhase; //Kitao更新
+				}
+				else if (PSGChn->deltaPhase)
+				{
+					//Kitao更新。オーバーサンプリングしないようにした。
+					sample = PSGChn->wavePSGChn->phase >> 27;
+					if (PSGChn->frq < 128)
+						sample -= sample >> 2; //低周波域の音量を制限。ブラッドギアのスタート時などで実機と同様の音に。ソルジャーブレイドなども実機に近くなった。v2.03
+
+					sampleAllL += sample * PSGChn->outVolumeL; //Kitao更新
+					sampleAllR += sample * PSGChn->outVolumeR; //Kitao更新
+					
+					//Kitao更新。Lfoオンが有効になるようにし、Lfoの掛かり具合を実機に近づけた。v1.59
+					if ((i==0)&&(info->LfoCtrl>0))
+					{
+						//_LfoCtrlが1のときに0回シフト(そのまま)で、はにいいんざすかいが実機の音に近い。
+						//_LfoCtrlが3のときに4回シフトで、フラッシュハイダースが実機の音に近い。
+						lfo = info->Psg1.waveinfo->Psg1.phase >> 27 << ((info->LfoCtrl-1) << 1); //v1.60更新
+						info->Psg0.phase += (Uint32)((double)(65536.0 * 256.0 * 8.0 * info->RESMPL_RATE) / (double)(info->Psg0.frq + lfo) +0.5);
+						info->Psg1.phase += (Uint32)((double)(65536.0 * 256.0 * 8.0 *info-> RESMPL_RATE) / (double)(info->Psg1.frq * info->LfoFrq) +0.5); //v1.60更新
+					}
+					else
+						PSGChn->phase += PSGChn->deltaPhase;
+				}
+			}
+			//Kitao追加。DDA消音時はノイズ軽減のためフェードアウトで消音する。
+			//			 ベラボーマン(「わしがばくだはかせじゃ」から数秒後)やパワーテニス(タイトル曲終了から数秒後。点数コール)，将棋初心者無用(音声)等で効果あり。
+			if (info->DdaFadeOutLi > 0)
+				--info->DdaFadeOutLi;
+			else if (info->DdaFadeOutLi < 0)
+				++info->DdaFadeOutLi;
+			if (info->DdaFadeOutRi > 0)
+				--info->DdaFadeOutRi;
+			else if (info->DdaFadeOutRi < 0)
+				++info->DdaFadeOutRi;
+			sampleAllL += info->DdaFadeOutLi;
+			sampleAllR += info->DdaFadeOutRi;
+		}
+		//Kitao更新。6ch合わさったところで、ボリューム調整してバッファに書き込む。
+		sampleAllL = (Sint32)((double)sampleAllL * info->VOL);
+		//if ((sampleAllL>32767)||(sampleAllL<-32768)) PRINTF("PSG Sachitta!");//test用
+//		if (sampleAllL> 32767) sampleAllL= 32767; //Volをアップしたのでサチレーションチェックが必要。v2.39
+//		if (sampleAllL<-32768) sampleAllL=-32768; // パックランドでUFO等にやられたときぐらいで、通常のゲームでは起こらない。音量の大きなビックリマンワールドもOK。パックランドも通常はOKでサチレーションしたときでもわずかなので音質的に大丈夫。
+												 // なので音質的には、PSGを２つのDirectXチャンネルに分けて鳴らすべき(処理は重くなる)だが、現状はパックランドでもサチレーション処理だけで音質的に問題なし(速度優先)とする。
+		sampleAllR = (Sint32)((double)sampleAllR * info->VOL);
+		//if ((sampleAllR>32767)||(sampleAllR<-32768)) PRINTF("PSG Satitta!");//test用
+//		if (sampleAllR> 32767) sampleAllR= 32767; //Volをアップしたのでサチレーションチェックが必要。v2.39
+//		if (sampleAllR<-32768) sampleAllR=-32768; //
+		*bufL++ = sampleAllL;
+		*bufR++ = sampleAllR;
+		
+		//キューを参照しPSGレジスタを更新する。Kitao更新。高速化のためサブルーチンにせずここで処理。キューの参照はシンプルにした(テンポの安定性向上)。
+		/*while (_QueueReadIndex != _QueueWriteIndex) //v1.10更新。キュー処理をここへ統合し高速化。
+		{
+			write_reg(_Queue_QueueReadIndex.reg, _Queue_QueueReadIndex.data);
+			_QueueReadIndex++; //Kitao更新
+			_QueueReadIndex &= APUQUEUE_SIZE-1; //Kitao更新
+		}*/
+	}
+}
+
+
+//Kitao更新
+static void
+psg_reset(huc6280_state* info)
+{
+	int		i,j;
+
+	memset(info->Psg, 0, sizeof(info->Psg));
+	memset(info->DdaFadeOutL, 0, sizeof(info->DdaFadeOutL)); //Kitao追加
+	memset(info->DdaFadeOutR, 0, sizeof(info->DdaFadeOutR)); //Kitao追加
+	info->MainVolumeL = 0;
+	info->MainVolumeR = 0;
+	info->LfoFrq = 0;
+	info->LfoCtrl = 0;
+	info->Channel = 0; //Kitao追加。v2.65
+	info->bWaveCrash = FALSE; //Kitao追加
+
+	//Kitao更新。v0.65．waveデータを初期化。
+	for (i=0; i<N_CHANNEL; i++)
+		for (j=0; j<32; j++)
+			info->Psgi.wavej = -14; //最小値で初期化。ファイプロ，フォーメーションサッカー'90，F1トリプルバトルで必要。
+	for (j=0; j<32; j++)
+		info->Psg3.wavej = 17; //ch3は最大値で初期化。F1トリプルバトル。v2.65
+
+	//Kitao更新。v1.10。キュー処理をここに統合
+//	_QueueWriteIndex = 0;
+//	_QueueReadIndex = 0;
+}
+
+
+static void PSG_SetVolume(huc6280_state* info);
+/*-----------------------------------------------------------------------------
+	Init
+		ＰＳＧを初期化します。
+-----------------------------------------------------------------------------*/
+//Sint32
+void*
+PSG_Init(
+	Sint32		clock,
+	Sint32		sampleRate)
+{
+	huc6280_state* info;
+	
+	info = (huc6280_state*)malloc(sizeof(huc6280_state));
+	if (info == NULL)
+		return NULL;
+	
+	info->PSG_FRQ = clock & 0x7FFFFFFF;
+	PSG_SetHoneyInTheSky(info, (clock >> 31) & 0x01);
+//	PSG_SetHoneyInTheSky(0x01);
+	
+	info->PsgVolumeEffect = 0;
+	info->Volume = 0;
+	info->VOL = 0.0;
+	
+	//PSG_SetVolume(APP_GetPsgVolume());//Kitao追加
+	PSG_SetVolume(info);
+
+	psg_reset(info);
+
+	if (! _bTblInit)
+	{
+		create_volume_table();
+		create_noise_table();
+		_bTblInit = TRUE;
+	}
+
+	//PSG_SetSampleRate(sampleRate);
+	info->SAMPLE_RATE = sampleRate;
+	info->RESMPL_RATE = info->PSG_FRQ / OVERSAMPLE_RATE / info->SAMPLE_RATE;
+
+//	_bPsgInit = TRUE;
+
+	return info;
+}
+
+
+/*-----------------------------------------------------------------------------
+	SetSampleRate
+-----------------------------------------------------------------------------*/
+/*void
+PSG_SetSampleRate(
+	Uint32		sampleRate)
+{
+	//_SampleRate = sampleRate;
+}*/
+
+
+/*-----------------------------------------------------------------------------
+	Deinit
+		ＰＳＧを破棄します。
+-----------------------------------------------------------------------------*/
+void
+PSG_Deinit(void* chip)
+{
+	huc6280_state* info = (huc6280_state*)chip;
+	
+	/*memset(info->Psg, 0, sizeof(_Psg));
+	memset(info->DdaFadeOutL, 0, sizeof(_DdaFadeOutL)); //Kitao追加
+	memset(info->DdaFadeOutR, 0, sizeof(_DdaFadeOutR)); //Kitao追加
+	info->MainVolumeL = 0;
+	info->MainVolumeR = 0;
+	info->LfoFrq = 0;
+	info->LfoCtrl = 0;
+	info->bWaveCrash = FALSE; //Kitao追加
+//	_bPsgInit = FALSE;*/
+	
+	free(info);
+}
+
+
+/*-----------------------------------------------------------------------------
+	Read
+		ＰＳＧポートの読み出しに対する動作を記述します。
+-----------------------------------------------------------------------------*/
+Uint8
+PSG_Read(
+	void*	chip,
+	Uint32	regNum)
+{
+	huc6280_state* info = (huc6280_state*)chip;
+	
+	if (regNum == 0)
+		return (Uint8)info->Channel;
+
+	return info->PortregNum & 15;
+}
+
+
+/*-----------------------------------------------------------------------------
+	Write
+		ＰＳＧポートの書き込みに対する動作を記述します。
+-----------------------------------------------------------------------------*/
+void
+PSG_Write(
+	void*		chip,
+	Uint32		regNum,
+	Uint8		data)
+{
+	//huc6280_state* info = (huc6280_state*)chip;
+	
+	//v1.10更新。キュー処理をここに統合して高速化。
+	//Kitao更新。clockは考慮せずにシンプルにして高速化した。
+/*	if (((_QueueWriteIndex + 1) & (APUQUEUE_SIZE-1)) == _QueueReadIndex)
+	{
+		PRINTF("PSG Queue Over!"); // キューが満タン
+		return;
+	}
+	_Queue_QueueWriteIndex.reg = (Uint8)(regNum & 15);
+	_Queue_QueueWriteIndex.data = data;
+	_QueueWriteIndex++; //Kitao更新
+	_QueueWriteIndex &= APUQUEUE_SIZE-1; //Kitao更新
+*/
+	write_reg(chip, regNum, data);
+}
+
+
+/*Sint32
+PSG_AdvanceClock(
+	Sint32		clock)
+{
+	return 0;
+}*/
+
+
+//Kitao追加。PSGのボリュームも個別に設定可能にした。
+/*static void
+PSG_SetVolume(
+	Uint32	volume)		// 0 - 65535*/
+static void PSG_SetVolume(huc6280_state* info)
+{
+	/*if (volume < 0)	volume = 0;
+	if (volume > 65535)	volume = 65535;*/
+
+	//_Volume = (double)volume / 65535.0 / PSG_DECLINE;
+	info->Volume = 1.0 / PSG_DECLINE;
+	set_VOL(info);
+}
+
+//Kitao追加。ボリュームミュート、ハーフなどをできるようにした。
+/*static void
+PSG_SetVolumeEffect(
+	Uint32	volumeEffect)
+{
+	_PsgVolumeEffect = (Sint32)volumeEffect; //※数値が大きいほどボリュームは小さくなる
+	set_VOL();
+}*/
+
+
+//Kitao追加
+void
+PSG_ResetVolumeReg(void* chip)
+{
+	huc6280_state* info = (huc6280_state*)chip;
+	int	i;
+
+	info->MainVolumeL = 0;
+	info->MainVolumeR = 0;
+	for (i = 0; i < N_CHANNEL; i++)
+	{
+		info->Psgi.volume = 0;
+		info->Psgi.outVolumeL = 0;
+		info->Psgi.outVolumeR = 0;
+		info->DdaFadeOutLi = 0;
+		info->DdaFadeOutRi = 0;
+	}
+}
+
+
+//Kitao追加
+void
+PSG_SetMutePsgChannel(
+	void*	chip,
+	Sint32	num,
+	BOOL	bMute)
+{
+	huc6280_state* info = (huc6280_state*)chip;
+	
+	info->bPsgMutenum = bMute;
+	if (bMute)
+	{
+		info->DdaFadeOutLnum = 0;
+		info->DdaFadeOutRnum = 0;
+	}
+}
+
+void PSG_SetMuteMask(void* chip, Uint32 MuteMask)
+{
+	Uint8 CurChn;
+	
+	for (CurChn = 0x00; CurChn < N_CHANNEL; CurChn ++)
+		PSG_SetMutePsgChannel(chip, CurChn, (MuteMask >> CurChn) & 0x01);
+	
+	return;
+}
+
+//Kitao追加
+BOOL
+PSG_GetMutePsgChannel(
+	void*	chip,
+	Sint32	num)
+{
+	huc6280_state* info = (huc6280_state*)chip;
+	
+	return info->bPsgMutenum;
+}
+
+//Kitao追加。v2.60
+void
+PSG_SetHoneyInTheSky(
+	void*	chip,
+	BOOL	bHoneyInTheSky)
+{
+	huc6280_state* info = (huc6280_state*)chip;
+	
+	info->bHoneyInTheSky = bHoneyInTheSky;
+}
+
+
+/*// save variable
+#define SAVE_V(V)	if (fwrite(&V, sizeof(V), 1, p) != 1)	return FALSE
+#define LOAD_V(V)	if (fread(&V, sizeof(V), 1, p) != 1)	return FALSE
+// save array
+#define SAVE_A(A)	if (fwrite(A, sizeof(A), 1, p) != 1)	return FALSE
+#define LOAD_A(A)	if (fread(A, sizeof(A), 1, p) != 1)		return FALSE*/
+/*-----------------------------------------------------------------------------
+	SaveState
+		状態をファイルに保存します。 
+-----------------------------------------------------------------------------*/
+/*BOOL
+PSG_SaveState(
+	FILE*		p)
+{
+	BOOL	bFlashHiders = FALSE; //Kitao更新。現在非使用。旧バージョンのステートセーブとの互換のため
+
+	if (p == NULL)
+		return FALSE;
+
+	SAVE_A(_Psg);
+
+	SAVE_V(_Channel);
+	SAVE_V(_MainVolumeL);
+	SAVE_V(_MainVolumeR);
+	SAVE_V(_LfoFrq);
+	SAVE_V(_bLfoOn); //v1.59から非使用に。
+	SAVE_V(_LfoCtrl);
+	SAVE_V(_LfoShift); //v1.59から非使用に。
+	SAVE_V(_bWaveCrash); //Kitao追加。v0.65
+
+	SAVE_V(bFlashHiders); //Kitao追加。v0.62
+
+	//v1.10追加。キュー処理をここへ統合。
+	SAVE_A(_Queue); //v1.61からサイズが２倍になった。
+	SAVE_V(_QueueWriteIndex);
+	SAVE_V(_QueueReadIndex);
+
+	return TRUE;
+}*/
+
+
+/*-----------------------------------------------------------------------------
+	LoadState
+		状態をファイルから読み込みます。 
+-----------------------------------------------------------------------------*/
+/*BOOL
+PSG_LoadState(
+	FILE*		p)
+{
+	Uint32			i;
+	double			clockCounter; //Kitao更新。現在非使用。旧バージョンのステートセーブとの互換のため
+	BOOL			bInit; //Kitao更新。現在非使用。旧バージョンのステートセーブとの互換のため
+	Sint32			totalClockAdvanced; //Kitao更新。現在非使用。旧バージョンのステートセーブとの互換のため
+	BOOL			bFlashHiders; //Kitao更新。現在非使用。旧バージョンのステートセーブとの互換のため
+	OldApuQueue		oldQueue65536; //v1.60以前のステートを読み込み用。
+	
+
+	if (p == NULL)
+		return FALSE;
+
+	LOAD_A(_Psg);
+
+	LOAD_V(_Channel);
+	LOAD_V(_MainVolumeL);
+	LOAD_V(_MainVolumeR);
+	LOAD_V(_LfoFrq);
+	LOAD_V(_bLfoOn); //v1.59から非使用に。
+	LOAD_V(_LfoCtrl);
+	if (MAINBOARD_GetStateVersion() >= 3) //Kitao追加。v0.57以降のセーブファイルなら
+		LOAD_V(_LfoShift); //v1.59から非使用に。
+	if (MAINBOARD_GetStateVersion() >= 9) //Kitao追加。v0.65以降のセーブファイルなら
+	{
+		LOAD_V(_bWaveCrash);
+	}
+	else
+		_bWaveCrash = FALSE;
+
+	if (MAINBOARD_GetStateVersion() >= 7) //Kitao追加。v0.62以降のセーブファイルなら
+		LOAD_V(bFlashHiders);
+
+	//v1.10追加。キュー処理をここへ統合。v1.61更新
+	if (MAINBOARD_GetStateVersion() >= 34) //v1.61beta以降のセーブファイルなら
+	{
+		LOAD_A(_Queue); //v1.61からサイズが２倍＆clock部分を削除した。
+		LOAD_V(_QueueWriteIndex);
+		LOAD_V(_QueueReadIndex);
+	}
+	else //v1.60以前のキュー(旧)バージョンのステートの場合、新バージョンの方に合うように変換。
+	{
+		LOAD_A(oldQueue);
+		LOAD_V(_QueueWriteIndex);
+		LOAD_V(_QueueReadIndex);
+		if (_QueueWriteIndex >= _QueueReadIndex)
+		{
+			for (i=_QueueReadIndex; i<=_QueueWriteIndex; i++)
+			{
+				_Queuei.reg = oldQueuei.reg;
+				_Queuei.data = oldQueuei.data;
+			}
+		}
+		else //Writeの位置がReadの位置よりも前（65536地点をまたいでデータが存在しているとき）の場合
+		{
+			for (i=_QueueReadIndex; i<=65535; i++)
+			{
+				_Queuei.reg = oldQueuei.reg;
+				_Queuei.data = oldQueuei.data;
+			}
+			for (i=0; i<=_QueueWriteIndex; i++)
+			{
+				_Queue65536+i.reg = oldQueuei.reg;
+				_Queue65536+i.data = oldQueuei.data;
+			}
+			_QueueWriteIndex += 65536;
+		}
+	}
+	if (MAINBOARD_GetStateVersion() < 26) //Kitao追加。v1.11より前のセーブファイルなら
+	{
+		LOAD_V(clockCounter); //現在非使用。v0.95
+		LOAD_V(bInit); //現在非使用。v1.10
+		LOAD_V(totalClockAdvanced); //現在非使用。v0.95
+	}
+
+	return TRUE;
+}
+
+#undef SAVE_V
+#undef SAVE_A
+#undef LOAD_V
+#undef LOAD_A*/
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/Ootake_PSG.h Added

@@ -0,0 +1,114 @@
+/*-----------------------------------------------------------------------------
+	PSG.h
+		ＰＳＧを記述するのに必要な定義および関数のプロトタイプ宣言を行ないます．
+
+	Copyright (C) 2004 Ki
+
+ 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
+**---------------------------------------------------------------------------*/
+//#include <stdio.h>
+//#include "TypeDefs.h"
+
+typedef UINT8	Uint8;
+typedef INT16	Sint16;
+typedef INT32	Sint32;
+typedef UINT32	Uint32;
+typedef UINT8	BOOL;
+#define TRUE	1
+#define	FALSE	0
+
+//#define PSG_FRQ		3579545.0
+
+
+/*-----------------------------------------------------------------------------
+** 関数のプロトタイプ宣言を行ないます．
+**---------------------------------------------------------------------------*/
+//Sint32
+void*
+PSG_Init(
+	Sint32		clock,
+	Sint32		sampleRate);
+
+void
+PSG_Deinit(void* chip);
+
+void
+PSG_Mix(
+//	Sint16*		pDst,				// 出力先バッファ 
+	void*		chip,
+	Sint32**	pDst,
+	Sint32		nSample);			// 書き出すサンプル数 
+
+/*void
+PSG_SetSampleRate(
+	Uint32		sampleRate);*/
+
+/*void
+PSGDEBUG_ShowRegs();*/
+
+Uint8
+PSG_Read(void* chip, Uint32 regNum);
+
+void
+PSG_Write(
+	void*		chip,
+	Uint32		regNum,
+	Uint8		data);
+
+/*Sint32
+PSG_AdvanceClock(Sint32 clock);
+
+BOOL
+PSG_SaveState(
+	FILE*		p);
+
+BOOL
+PSG_LoadState(
+	FILE*		p);*/
+
+//Kitao追加。PSGのボリュームも個別に設定可能にした。
+/*void
+PSG_SetVolume(
+	Uint32		volume);		// 0 - 65535
+
+//Kitao追加。ボリュームミュート、ハーフなどをできるようにした。
+void
+PSG_SetVolumeEffect(
+	Uint32 volumeEffect);*/
+
+//Kitao追加
+void
+PSG_ResetVolumeReg(void* chip);
+
+//Kitao追加
+void
+PSG_SetMutePsgChannel(
+	void*	chip,
+	Sint32	num,
+	BOOL	bMute);
+
+void PSG_SetMuteMask(void* chip, Uint32 MuteMask);
+
+//Kitao追加
+BOOL
+PSG_GetMutePsgChannel(
+	void*	chip,
+	Sint32	num);
+
+//Kitao追加。v2.60
+void
+PSG_SetHoneyInTheSky(
+	void*	chip,
+	BOOL	bHoneyInTheSky);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl2.c Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/adlibemu_opl3.c Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.c Added

@@ -0,0 +1,1360 @@
+/***************************************************************************
+
+ ay8910.c
+
+ Emulation of the AY-3-8910 / YM2149 sound chip.
+
+ Based on various code snippets by Ville Hallik, Michael Cuddy,
+ Tatsuyuki Satoh, Fabrice Frances, Nicola Salmoria.
+
+ Mostly rewritten by couriersud in 2008
+
+ Public documentation:
+
+ - http://privatfrickler.de/blick-auf-den-chip-soundchip-general-instruments-ay-3-8910/
+ Die pictures of the AY8910
+
+ - US Patent 4933980
+
+ Games using ADSR: gyruss
+
+ A list with more games using ADSR can be found here:
+ http://mametesters.org/view.php?id=3043
+
+ TODO:
+ * The AY8930 has an extended mode which is currently
+ not emulated.
+ * The YMZ284 only has one 1 output channel (mixed chan A,B,C).
+ This should be forced.
+ * YM2610 & YM2608 will need a separate flag in their config structures
+ to distinguish between legacy and discrete mode.
+
+ The rewrite also introduces a generic model for the DAC. This model is
+ not perfect, but allows channel mixing based on a parametrized approach.
+ This model also allows to factor in different loads on individual channels.
+ If a better model is developped in the future or better measurements are
+ available, the driver should be easy to change. The model is described
+ later.
+
+ In order to not break hundreds of existing drivers by default the flag
+ AY8910_LEGACY_OUTPUT is used by drivers not changed to take into account the
+ new model. All outputs are normalized to the old output range (i.e. 0 .. 7ffff).
+ In the case of channel mixing, output range is 0...3 * 7fff.
+
+ The main difference between the AY-3-8910 and the YM2149 is, that the
+ AY-3-8910 datasheet mentions, that fixed volume level 0, which is set by
+ registers 8 to 10 is "channel off". The YM2149 mentions, that the generated
+ signal has a 2V DC component. This is confirmed by measurements. The approach
+ taken here is to assume the 2V DC offset for all outputs for the YM2149.
+ For the AY-3-8910, an offset is used if envelope is active for a channel.
+ This is backed by oscilloscope pictures from the datasheet. If a fixed volume
+ is set, i.e. envelope is disabled, the output voltage is set to 0V. Recordings
+ I found on the web for gyruss indicate, that the AY-3-8910 offset should
+ be around 0.2V. This will also make sound levels more compatible with
+ user observations for scramble.
+
+ The Model:
+ 5V 5V
+ | |
+ / |
+ Volume Level x >---| Z
+ > Z Pullup Resistor RU
+ | Z
+ Z |
+ Rx Z |
+ Z |
+ | |
+ '-----+--------> >---+----> Output signal
+ | |
+ Z Z
+ Pulldown RD Z Z Load RL
+ Z Z
+ | |
+ GND GND
+
+Each Volume level x will select a different resistor Rx. Measurements from fpgaarcade.com
+where used to calibrate channel mixing for the YM2149. This was done using
+a least square approach using a fixed RL of 1K Ohm.
+
+For the AY measurements cited in e.g. openmsx as "Hacker Kay" for a single
+channel were taken. These were normalized to 0 ... 65535 and consequently
+adapted to an offset of 0.2V and a VPP of 1.3V. These measurements are in
+line e.g. with the formula used by pcmenc for the volume: vol(i) = exp(i/2-7.5).
+
+The following is documentation from the code moved here and amended to reflect
+the changes done:
+
+Careful studies of the chip output prove that the chip counts up from 0
+until the counter becomes greater or equal to the period. This is an
+important difference when the program is rapidly changing the period to
+modulate the sound. This is worthwhile noting, since the datasheets
+say, that the chip counts down.
+Also, note that period = 0 is the same as period = 1. This is mentioned
+in the YM2203 data sheets. However, this does NOT apply to the Envelope
+period. In that case, period = 0 is half as period = 1.
+
+Envelope shapes:
+ C AtAlH
+ 0 0 x x \___
+ 0 1 x x /___
+ 1 0 0 0 \\\\
+ 1 0 0 1 \___
+ 1 0 1 0 \/\/
+ 1 0 1 1 \```
+ 1 1 0 0 ////
+ 1 1 0 1 /```
+ 1 1 1 0 /\/\
+ 1 1 1 1 /___
+
+The envelope counter on the AY-3-8910 has 16 steps. On the YM2149 it
+has twice the steps, happening twice as fast.
+
+***************************************************************************/
+
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+//#include "cpuintrf.h"
+//#include "cpuexec.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include "ay8910.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+/*************************************
+ *
+ * Defines
+ *
+ *************************************/
+
+#define ENABLE_REGISTER_TEST		(0)		/* Enable preprogrammed registers */
+
+//#define MAX_OUTPUT 0x7fff
+#define MAX_OUTPUT 0x4000
+#define NUM_CHANNELS 3
+
+/* register id's */
+#define AY_AFINE	(0)
+#define AY_ACOARSE	(1)
+#define AY_BFINE	(2)
+#define AY_BCOARSE	(3)
+#define AY_CFINE	(4)
+#define AY_CCOARSE	(5)
+#define AY_NOISEPER	(6)
+#define AY_ENABLE	(7)
+#define AY_AVOL		(8)
+#define AY_BVOL		(9)
+#define AY_CVOL		(10)
+#define AY_EFINE	(11)
+#define AY_ECOARSE	(12)
+#define AY_ESHAPE	(13)
+
+#define AY_PORTA	(14)
+#define AY_PORTB	(15)
+
+#define NOISE_ENABLEQ(_psg, _chan)	(((_psg)->regsAY_ENABLE >> (3 + _chan)) & 1)
+#define TONE_ENABLEQ(_psg, _chan)	(((_psg)->regsAY_ENABLE >> (_chan)) & 1)
+#define TONE_PERIOD(_psg, _chan)	( (_psg)->regs(_chan) << 1 | (((_psg)->regs((_chan) << 1) | 1 & 0x0f) << 8) )
+#define NOISE_PERIOD(_psg)			( (_psg)->regsAY_NOISEPER & 0x1f)
+#define TONE_VOLUME(_psg, _chan)	( (_psg)->regsAY_AVOL + (_chan) & 0x0f)
+//#define TONE_ENVELOPE(_psg, _chan)	(((_psg)->regsAY_AVOL + (_chan) >> 4) & (((_psg)->device->type() == AY8914) ? 3 : 1))
+#define TONE_ENVELOPE(_psg, _chan)	(((_psg)->regsAY_AVOL + (_chan) >> 4) & (((_psg)->chip_type == CHTYPE_AY8914) ? 3 : 1))
+#define ENVELOPE_PERIOD(_psg)		(((_psg)->regsAY_EFINE | ((_psg)->regsAY_ECOARSE<<8)))
+#define NOISE_OUTPUT(_psg)			((_psg)->rng & 1)
+
+#define CHTYPE_AY8910	0x00
+#define CHTYPE_AY8912	0x01
+#define CHTYPE_AY8913	0x02
+#define CHTYPE_AY8930	0x03
+#define CHTYPE_AY8914	0x04
+#define CHTYPE_YM2149	0x10
+#define CHTYPE_YM3439	0x11
+#define CHTYPE_YMZ284	0x12
+#define CHTYPE_YMZ294	0x13
+#define CHTYPE_YM2203	0x20
+#define CHTYPE_YM2608	0x21
+#define CHTYPE_YM2610	0x22
+#define CHTYPE_YM2610B	0x23
+
+/*************************************
+ *
+ * Type definitions
+ *
+ *************************************/
+
+typedef struct _ay_ym_param ay_ym_param;
+struct _ay_ym_param
+{
+	double r_up;
+	double r_down;
+	int res_count;
+	double res32;
+};
+
+typedef struct _ay8910_context ay8910_context;
+struct _ay8910_context
+{
+	//const device_config *device;
+	int streams;
+	int ready;
+	//sound_stream *channel;
+	const ay8910_interface *intf;
+	INT32 register_latch;
+	UINT8 regs16;
+	INT32 last_enable;
+	INT32 countNUM_CHANNELS;
+	UINT8 outputNUM_CHANNELS;
+	UINT8 prescale_noise;
+	INT32 count_noise;
+	INT32 count_env;
+	INT8 env_step;
+	UINT32 env_volume;
+	UINT8 hold,alternate,attack,holding;
+	INT32 rng;
+	UINT8 env_step_mask;
+	/* init parameters ... */
+	int step;
+	int zero_is_off;
+	UINT8 vol_enabledNUM_CHANNELS;
+	const ay_ym_param *par;
+	const ay_ym_param *par_env;
+	INT32 vol_tableNUM_CHANNELS16;
+	INT32 env_tableNUM_CHANNELS32;
+	INT32 vol3d_table8*32*32*32;
+	//devcb_resolved_read8 portAread;
+	//devcb_resolved_read8 portBread;
+	//devcb_resolved_write8 portAwrite;
+	//devcb_resolved_write8 portBwrite;
+	UINT8 StereoMaskNUM_CHANNELS;
+	UINT32 MuteMskNUM_CHANNELS;
+	UINT8 chip_type;
+	UINT8 IsDisabled;
+	
+	SRATE_CALLBACK SmpRateFunc;
+	void* SmpRateData;
+};
+
+//#define MAX_CHIPS	0x02
+//static ay8910_context AY8910DataMAX_CHIPS;
+
+#define MAX_UPDATE_LEN	0x10	// in samples
+static stream_sample_t AYBufNUM_CHANNELSMAX_UPDATE_LEN;
+
+
+/*INLINE ay8910_context *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_AY8910 ||
+		 sound_get_type(device) == SOUND_AY8912 ||
+		 sound_get_type(device) == SOUND_AY8913 ||
+		 sound_get_type(device) == SOUND_AY8930 ||
+		 sound_get_type(device) == SOUND_YM2149 ||
+		 sound_get_type(device) == SOUND_YM3439 ||
+		 sound_get_type(device) == SOUND_YMZ284 ||
+		 sound_get_type(device) == SOUND_YMZ294);
+	return (ay8910_context *)device->token;
+}*/
+
+
+/*************************************
+ *
+ * Static
+ *
+ *************************************/
+
+static const ay_ym_param ym2149_param =
+{
+	630, 801,
+	16,
+	{ 73770, 37586, 27458, 21451, 15864, 12371, 8922, 6796,
+	 4763, 3521, 2403, 1737, 1123, 762, 438, 251 },
+};
+
+static const ay_ym_param ym2149_param_env =
+{
+	630, 801,
+	32,
+	{ 103350, 73770, 52657, 37586, 32125, 27458, 24269, 21451,
+	 18447, 15864, 14009, 12371, 10506, 8922, 7787, 6796,
+	 5689, 4763, 4095, 3521, 2909, 2403, 2043, 1737,
+	 1397, 1123, 925, 762, 578, 438, 332, 251 },
+};
+
+#if 0
+/* RL = 1000, Hacker Kay normalized, 2.1V to 3.2V */
+static const ay_ym_param ay8910_param =
+{
+	664, 913,
+	16,
+	{ 85785, 34227, 26986, 20398, 14886, 10588, 7810, 4856,
+	 4120, 2512, 1737, 1335, 1005, 747, 586, 451 },
+};
+
+/*
+ * RL = 3000, Hacker Kay normalized pattern, 1.5V to 2.8V
+ * These values correspond with guesses based on Gyruss schematics
+ * They work well with scramble as well.
+ */
+static const ay_ym_param ay8910_param =
+{
+	930, 454,
+	16,
+	{ 85066, 34179, 27027, 20603, 15046, 10724, 7922, 4935,
+	 4189, 2557, 1772, 1363, 1028, 766, 602, 464 },
+};
+
+/*
+ * RL = 1000, Hacker Kay normalized pattern, 0.75V to 2.05V
+ * These values correspond with guesses based on Gyruss schematics
+ * They work well with scramble as well.
+ */
+static const ay_ym_param ay8910_param =
+{
+	1371, 313,
+	16,
+	{ 93399, 33289, 25808, 19285, 13940, 9846, 7237, 4493,
+	 3814, 2337, 1629, 1263, 962, 727, 580, 458 },
+};
+
+/*
+ * RL = 1000, Hacker Kay normalized pattern, 0.2V to 1.5V
+ */
+static const ay_ym_param ay8910_param =
+{
+	5806, 300,
+	16,
+	{ 118996, 42698, 33105, 24770, 17925, 12678, 9331, 5807,
+ 4936, 3038, 2129, 1658, 1271, 969, 781, 623 }
+};
+#endif
+
+/*
+ * RL = 2000, Based on Matthew Westcott's measurements from Dec 2001.
+ * -------------------------------------------------------------------
+ *
+ * http://groups.google.com/group/comp.sys.sinclair/browse_thread/thread/fb3091da4c4caf26/d5959a800cda0b5e?lnk=gst&q=Matthew+Westcott#d5959a800cda0b5e
+ * After what Russell mentioned a couple of weeks back about the lack of
+ * publicised measurements of AY chip volumes - I've finally got round to
+ * making these readings, and I'm placing them in the public domain - so
+ * anyone's welcome to use them in emulators or anything else.
+
+ * To make the readings, I set up the chip to produce a constant voltage on
+ * channel C (setting bits 2 and 5 of register 6), and varied the amplitude
+ * (the low 4 bits of register 10). The voltages were measured between the
+ * channel C output (pin 1) and ground (pin 6).
+ *
+ * Level Voltage
+ * 0 1.147
+ * 1 1.162
+ * 2 1.169
+ * 3 1.178
+ * 4 1.192
+ * 5 1.213
+ * 6 1.238
+ * 7 1.299
+ * 8 1.336
+ * 9 1.457
+ * 10 1.573
+ * 11 1.707
+ * 12 1.882
+ * 13 2.06
+ * 14 2.32
+ * 15 2.58
+ * -------------------------------------------------------------------
+ *
+ * The ZX spectrum output circuit was modelled in SwitcherCAD and
+ * the resistor values below create the voltage levels above.
+ * RD was measured on a real chip to be 8m Ohm, RU was 0.8m Ohm.
+ */
+
+static const ay_ym_param ay8910_param =
+{
+	800000, 8000000,
+	16,
+	{ 15950, 15350, 15090, 14760, 14275, 13620, 12890, 11370,
+ 10600, 8590, 7190, 5985, 4820, 3945, 3017, 2345 }
+};
+
+/*************************************
+ *
+ * Inline
+ *
+ *************************************/
+
+#if 0
+INLINE void build_3D_table(double rl, const ay_ym_param *par, const ay_ym_param *par_env, int normalize, double factor, int zero_is_off, INT32 *tab)
+{
+	int j, j1, j2, j3, e, indx;
+	double rt, rw, n;
+	double min = 10.0, max = 0.0;
+	double *temp;
+	double spdup;
+
+	temp = (double *)malloc(8*32*32*32*sizeof(*temp));
+
+	for (e=0; e < 8; e++)
+		for (j1=0; j1 < 32; j1++)
+			for (j2=0; j2 < 32; j2++)
+				for (j3=0; j3 < 32; j3++)
+				{
+					if (zero_is_off)
+					{
+						n = (j1 != 0 || (e & 0x01)) ? 1 : 0;
+						n += (j2 != 0 || (e & 0x02)) ? 1 : 0;
+						n += (j3 != 0 || (e & 0x04)) ? 1 : 0;
+					}
+					else
+						n = 3.0;
+
+					rt = n / par->r_up + 3.0 / par->r_down + 1.0 / rl;
+					rw = n / par->r_up;
+
+					/*rw += 1.0 / ( (e & 0x01) ? par_env->resj1 : par->resj1);
+					rt += 1.0 / ( (e & 0x01) ? par_env->resj1 : par->resj1);
+					rw += 1.0 / ( (e & 0x02) ? par_env->resj2 : par->resj2);
+					rt += 1.0 / ( (e & 0x02) ? par_env->resj2 : par->resj2);
+					rw += 1.0 / ( (e & 0x04) ? par_env->resj3 : par->resj3);
+					rt += 1.0 / ( (e & 0x04) ? par_env->resj3 : par->resj3);*/
+					/* this should speed up the initialsation a bit (it calculates 262144 values) */
+					spdup = 1.0 / ( (e & 0x01) ? par_env->resj1 : par->resj1);
+					spdup += 1.0 / ( (e & 0x02) ? par_env->resj2 : par->resj2);
+					spdup += 1.0 / ( (e & 0x04) ? par_env->resj3 : par->resj3);
+					if (spdup > 1.0)
+					{
+						// Bugfix for spdup being 1.#INF
+						indx = (e << 15) | (j3<<10) | (j2<<5) | j1;
+						tempindx = 0.0;
+						continue;
+					}
+					rw += spdup;
+					rt += spdup;
+
+					indx = (e << 15) | (j3<<10) | (j2<<5) | j1;
+					tempindx = rw / rt;
+					if (tempindx < min)
+						min = tempindx;
+					if (tempindx > max)
+						max = tempindx;
+				}
+
+	if (normalize)
+	{
+		for (j=0; j < 32*32*32*8; j++)
+			//tabj = MAX_OUTPUT * (((tempj - min)/(max-min))) * factor;
+			tabj = MAX_OUTPUT * (((tempj - min)/(max-min)) * 0.5) * factor;
+	}
+	else
+	{
+		for (j=0; j < 32*32*32*8; j++)
+			tabj = MAX_OUTPUT * tempj;
+	}
+
+	/* for (e=0;e<16;e++) printf("%d %d\n",e<<10, tabe<<10); */
+
+	free(temp);
+}
+#endif
+
+INLINE void build_single_table(double rl, const ay_ym_param *par, int normalize, INT32 *tab, int zero_is_off)
+{
+	int j;
+	double rt, rw = 0;
+	double temp32, min=10.0, max=0.0;
+
+	for (j=0; j < par->res_count; j++)
+	{
+		rt = 1.0 / par->r_down + 1.0 / rl;
+
+		rw = 1.0 / par->resj;
+		rt += 1.0 / par->resj;
+
+		if (!(zero_is_off && j == 0))
+		{
+			rw += 1.0 / par->r_up;
+			rt += 1.0 / par->r_up;
+		}
+
+		tempj = rw / rt;
+		if (tempj < min)
+			min = tempj;
+		if (tempj > max)
+			max = tempj;
+	}
+	if (normalize)
+	{
+		for (j=0; j < par->res_count; j++)
+			/* The following line generates values that cause clicks when starting/pausing/stopping
+				because there're off (the center is at zero, not the base).
+				That's quite bad for a player.
+			tabj = MAX_OUTPUT * (((tempj - min)/(max-min)) - 0.25) * 0.5;
+			*/
+			tabj = MAX_OUTPUT * ((tempj - min)/(max-min)) / NUM_CHANNELS;
+	}
+	else
+	{
+		for (j=0; j < par->res_count; j++)
+			tabj = MAX_OUTPUT * tempj / NUM_CHANNELS;
+	}
+
+}
+
+#if 0
+INLINE UINT16 mix_3D(ay8910_context *psg)
+{
+	int indx = 0, chan;
+
+	for (chan = 0; chan < NUM_CHANNELS; chan++)
+		if (TONE_ENVELOPE(psg, chan) != 0)
+		{
+			//if (psg->device->type() == AY8914) // AY8914 Has a two bit tone_envelope field
+			if (psg->chip_type == CHTYPE_AY8914) // AY8914 Has a two bit tone_envelope field
+			{
+				indx |= (1 << (chan+15)) | ( psg->vol_enabledchan ? ((psg->env_volume >> (3-TONE_ENVELOPE(psg, chan))) << (chan*5)) : 0);
+			}
+			else
+			{
+				indx |= (1 << (chan+15)) | ( psg->vol_enabledchan ? psg->env_volume << (chan*5) : 0);
+			}
+		}
+		else
+		{
+			indx |= (psg->vol_enabledchan ? TONE_VOLUME(psg, chan) << (chan*5) : 0);
+		}
+	return psg->vol3d_tableindx;
+}
+#endif
+
+/*************************************
+ *
+ * Static functions
+ *
+ *************************************/
+
+static void ay8910_write_reg(ay8910_context *psg, int r, int v)
+{
+	//if (r >= 11 && r <= 13 ) printf("%d %x %02x\n", PSG->index, r, v);
+	psg->regsr = v;
+
+	switch( r )
+	{
+		case AY_AFINE:
+		case AY_ACOARSE:
+		case AY_BFINE:
+		case AY_BCOARSE:
+		case AY_CFINE:
+		case AY_CCOARSE:
+		case AY_NOISEPER:
+		case AY_AVOL:
+		case AY_BVOL:
+		case AY_CVOL:
+		case AY_EFINE:
+			/* No action required */
+			break;
+		case AY_ECOARSE:
+			#ifdef MAME_DEBUG
+			if ( (v & 0x0f) > 0)
+				popmessage("Write to ECoarse register detected - please inform www.mametesters.org");
+			#endif
+			/* No action required */
+			break;
+		case AY_ENABLE:
+			/*if ((psg->last_enable == -1) ||
+			 ((psg->last_enable & 0x40) != (psg->regsAY_ENABLE & 0x40)))
+			{
+				// write out 0xff if port set to input
+				devcb_call_write8(&psg->portAwrite, 0, (psg->regsAY_ENABLE & 0x40) ? psg->regsAY_PORTA : 0xff);
+			}
+
+			if ((psg->last_enable == -1) ||
+			 ((psg->last_enable & 0x80) != (psg->regsAY_ENABLE & 0x80)))
+			{
+				// write out 0xff if port set to input
+				devcb_call_write8(&psg->portBwrite, 0, (psg->regsAY_ENABLE & 0x80) ? psg->regsAY_PORTB : 0xff);
+			}*/
+			if (~v & 0x3F)	// one of the channels gets enabled -> Enable emulation
+				psg->IsDisabled = 0x00;
+
+			psg->last_enable = psg->regsAY_ENABLE;
+			break;
+		case AY_ESHAPE:
+			#ifdef MAME_DEBUG
+			if ( (v & 0x0f) > 0)
+				popmessage("Write to EShape register detected - please inform www.mametesters.org");
+			#endif
+			psg->attack = (psg->regsAY_ESHAPE & 0x04) ? psg->env_step_mask : 0x00;
+			if ((psg->regsAY_ESHAPE & 0x08) == 0)
+			{
+				/* if Continue = 0, map the shape to the equivalent one which has Continue = 1 */
+				psg->hold = 1;
+				psg->alternate = psg->attack;
+			}
+			else
+			{
+				psg->hold = psg->regsAY_ESHAPE & 0x01;
+				psg->alternate = psg->regsAY_ESHAPE & 0x02;
+			}
+			psg->env_step = psg->env_step_mask;
+			psg->holding = 0;
+			psg->env_volume = (psg->env_step ^ psg->attack);
+			break;
+		case AY_PORTA:
+			/*if (psg->regsAY_ENABLE & 0x40)
+			{
+				if (psg->portAwrite.write)
+					devcb_call_write8(&psg->portAwrite, 0, psg->regsAY_PORTA);
+				else
+					logerror("warning - write %02x to 8910 '%s' Port A\n",psg->regsAY_PORTA,psg->device->tag);
+			}
+			else
+			{
+				logerror("warning: write to 8910 '%s' Port A set as input - ignored\n",psg->device->tag);
+			}*/
+			break;
+		case AY_PORTB:
+			/*if (psg->regsAY_ENABLE & 0x80)
+			{
+				if (psg->portBwrite.write)
+					devcb_call_write8(&psg->portBwrite, 0, psg->regsAY_PORTB);
+				else
+					logerror("warning - write %02x to 8910 '%s' Port B\n",psg->regsAY_PORTB,psg->device->tag);
+			}
+			else
+			{
+				logerror("warning: write to 8910 '%s' Port B set as input - ignored\n",psg->device->tag);
+			}*/
+			break;
+	}
+}
+
+//static STREAM_UPDATE( ay8910_update )
+/*void ay8910_update(UINT8 ChipID, stream_sample_t **outputs, int samples)
+{
+	ay8910_context *psg = &AY8910DataChipID;
+	
+	memset(outputs0, 0x00, samples * sizeof(stream_sample_t));
+	memset(outputs1, 0x00, samples * sizeof(stream_sample_t));
+	ay8910_update_one(psg, outputs, samples);
+	
+	return;
+}*/
+
+void ay8910_update_one(void *param, stream_sample_t **outputs, int samples)
+{
+	ay8910_context *psg = (ay8910_context *)param;
+	stream_sample_t *bufNUM_CHANNELS;
+	int chan;
+	int cursmpl;
+	int buf_smpls;
+	stream_sample_t *bufL = outputs0;
+	stream_sample_t *bufR = outputs1;
+	//stream_sample_t bufSmpl;
+	
+	memset(outputs0, 0x00, samples * sizeof(stream_sample_t));
+	memset(outputs1, 0x00, samples * sizeof(stream_sample_t));
+	
+	// Speed hack for OPN chips (YM2203, YM26xx), that have an often unused AY8910
+	if (psg->IsDisabled)
+		return;
+	
+	buf_smpls = samples;
+	//buf0 = outputs0;
+	buf0 = AYBuf0;
+	buf1 = NULL;
+	buf2 = NULL;
+	//if (psg->streams == NUM_CHANNELS)
+	//{
+		//buf1 = outputs1;
+		//buf2 = outputs2;
+		buf1 = AYBuf1;
+		buf2 = AYBuf2;
+	//}
+
+	/* hack to prevent us from hanging when starting filtered outputs */
+	//if (!psg->ready)
+	//{
+		for (chan = 0; chan < NUM_CHANNELS; chan++)
+			if (bufchan != NULL)
+				memset(bufchan, 0, samples * sizeof(*bufchan));
+	//}
+
+	/* The 8910 has three outputs, each output is the mix of one of the three */
+	/* tone generators and of the (single) noise generator. The two are mixed */
+	/* BEFORE going into the DAC. The formula to mix each channel is: */
+	/* (ToneOn | ToneDisable) & (NoiseOn | NoiseDisable). */
+	/* Note that this means that if both tone and noise are disabled, the output */
+	/* is 1, not 0, and can be modulated changing the volume. */
+
+	if (buf_smpls > MAX_UPDATE_LEN)
+		buf_smpls = MAX_UPDATE_LEN;
+	/* buffering loop */
+	while (buf_smpls)
+	{
+		for (chan = 0; chan < NUM_CHANNELS; chan++)
+		{
+			psg->countchan++;
+			if (psg->countchan >= TONE_PERIOD(psg, chan))
+			{
+				psg->outputchan ^= 1;
+				psg->countchan = 0;
+			}
+		}
+
+		psg->count_noise++;
+		if (psg->count_noise >= NOISE_PERIOD(psg))
+		{
+			/* toggle the prescaler output. Noise is no different to
+			 * channels.
+			 */
+			psg->count_noise = 0;
+			psg->prescale_noise ^= 1;
+
+			if ( psg->prescale_noise)
+			{
+				/* The Random Number Generator of the 8910 is a 17-bit shift */
+				/* register. The input to the shift register is bit0 XOR bit3 */
+				/* (bit0 is the output). This was verified on AY-3-8910 and YM2149 chips. */
+
+				psg->rng ^= (((psg->rng & 1) ^ ((psg->rng >> 3) & 1)) << 17);
+				psg->rng >>= 1;
+			}
+		}
+
+		for (chan = 0; chan < NUM_CHANNELS; chan++)
+		{
+			psg->vol_enabledchan = (psg->outputchan | TONE_ENABLEQ(psg, chan)) & (NOISE_OUTPUT(psg) | NOISE_ENABLEQ(psg, chan));
+		}
+
+		/* update envelope */
+		if (psg->holding == 0)
+		{
+			psg->count_env++;
+			if (psg->count_env >= ENVELOPE_PERIOD(psg) * psg->step )
+			{
+				psg->count_env = 0;
+				psg->env_step--;
+
+				/* check envelope current position */
+				if (psg->env_step < 0)
+				{
+					if (psg->hold)
+					{
+						if (psg->alternate)
+							psg->attack ^= psg->env_step_mask;
+						psg->holding = 1;
+						psg->env_step = 0;
+					}
+					else
+					{
+						/* if CountEnv has looped an odd number of times (usually 1), */
+						/* invert the output. */
+						if (psg->alternate && (psg->env_step & (psg->env_step_mask + 1)))
+ 							psg->attack ^= psg->env_step_mask;
+
+						psg->env_step &= psg->env_step_mask;
+					}
+				}
+
+			}
+		}
+		psg->env_volume = (psg->env_step ^ psg->attack);
+
+		//if (psg->streams == NUM_CHANNELS)
+		//{
+			for (chan = 0; chan < NUM_CHANNELS; chan++)
+				if (TONE_ENVELOPE(psg, chan) != 0)
+				{
+					/* Envolope has no "off" state */
+					//if (psg->device->type() == AY8914) // AY8914 Has a two bit tone_envelope field
+					if (psg->chip_type == CHTYPE_AY8914) // AY8914 Has a two bit tone_envelope field
+					{
+						*(bufchan++) = psg->env_tablechanpsg->vol_enabledchan ? psg->env_volume >> (3-TONE_ENVELOPE(psg,chan)) : 0;
+					}
+					else
+					{
+						*(bufchan++) = psg->env_tablechanpsg->vol_enabledchan ? psg->env_volume : 0;
+					}
+				}
+				else
+				{
+					*(bufchan++) = psg->vol_tablechanpsg->vol_enabledchan ? TONE_VOLUME(psg, chan) : 0;
+				}
+		/*}
+		else
+		{
+			*(buf0++) = mix_3D(psg);
+#if 0
+			*(buf0) = ( vol_enabled0 * psg->vol_tablepsg->Vol0
+			 + vol_enabled1 * psg->vol_tablepsg->Vol1
+			 + vol_enabled2 * psg->vol_tablepsg->Vol2) / psg->step;
+#endif
+		}*/
+		buf_smpls--;
+		
+	}
+	
+	buf_smpls = samples;
+	if (buf_smpls > MAX_UPDATE_LEN)
+		buf_smpls = MAX_UPDATE_LEN;
+	for (cursmpl = 0; cursmpl < buf_smpls; cursmpl ++)
+	{
+		/*bufSmpl = AYBuf0cursmpl & psg->MuteMsk0;
+		if (psg->streams == NUM_CHANNELS)
+		{
+			bufSmpl += AYBuf1cursmpl & psg->MuteMsk1;
+			bufSmpl += AYBuf2cursmpl & psg->MuteMsk2;
+		}
+		bufLcursmpl += bufSmpl;
+		bufRcursmpl += bufSmpl;*/
+		for (chan = 0; chan < NUM_CHANNELS; chan ++)
+		{
+			if (psg->MuteMskchan)
+			{
+				if (psg->StereoMaskchan & 0x01)
+					bufLcursmpl += AYBufchancursmpl;
+				if (psg->StereoMaskchan & 0x02)
+					bufRcursmpl += AYBufchancursmpl;
+			}
+		}
+	}
+}
+
+static void build_mixer_table(ay8910_context *psg)
+{
+	int	normalize = 0;
+	int	chan;
+
+	if ((psg->intf->flags & AY8910_LEGACY_OUTPUT) != 0)
+	{
+#ifdef _DEBUG
+		//logerror("AY-3-8910/YM2149 using legacy output levels!\n");
+#endif
+		//normalize = 1;
+	}
+	normalize = 1;
+
+	/* skip unnecessary things to speed up the AY8910 init
+		1-channel AY uses the 3D table, 3-channel AY uses envelope and volume
+		but building the 3D table still takes too long */
+	//if (psg->streams == NUM_CHANNELS)
+	{
+		for (chan=0; chan < NUM_CHANNELS; chan++)
+		{
+			build_single_table(psg->intf->res_loadchan, psg->par, normalize, psg->vol_tablechan, psg->zero_is_off);
+			build_single_table(psg->intf->res_loadchan, psg->par_env, normalize, psg->env_tablechan, 0);
+		}
+	}
+	//else
+	//{
+	//	/*
+	//	 * The previous implementation added all three channels up instead of averaging them.
+	//	 * The factor of 3 will force the same levels if normalizing is used.
+	//	 */
+	//	build_3D_table(psg->intf->res_load0, psg->par, psg->par_env, normalize, 3, psg->zero_is_off, psg->vol3d_table);
+	//}
+}
+
+/*static void ay8910_statesave(ay8910_context *psg, const device_config *device)
+{
+	state_save_register_device_item(device, 0, psg->register_latch);
+	state_save_register_device_item_array(device, 0, psg->regs);
+	state_save_register_device_item(device, 0, psg->last_enable);
+
+	state_save_register_device_item_array(device, 0, psg->count);
+	state_save_register_device_item(device, 0, psg->count_noise);
+	state_save_register_device_item(device, 0, psg->count_env);
+
+	state_save_register_device_item(device, 0, psg->env_volume);
+
+	state_save_register_device_item_array(device, 0, psg->output);
+	state_save_register_device_item(device, 0, psg->output_noise);
+
+	state_save_register_device_item(device, 0, psg->env_step);
+	state_save_register_device_item(device, 0, psg->hold);
+	state_save_register_device_item(device, 0, psg->alternate);
+	state_save_register_device_item(device, 0, psg->attack);
+	state_save_register_device_item(device, 0, psg->holding);
+	state_save_register_device_item(device, 0, psg->rng);
+}*/
+
+/*************************************
+ *
+ * Public functions
+ *
+ * used by e.g. YM2203, YM2210 ...
+ *
+ *************************************/
+
+//void *ay8910_start_ym(void *infoptr, sound_type chip_type, const device_config *device, int clock, const ay8910_interface *intf)
+void *ay8910_start_ym(void *infoptr, unsigned char chip_type, int clock, const ay8910_interface *intf)
+{
+	ay8910_context *info = (ay8910_context *)infoptr;
+	int master_clock = clock;
+	UINT8 CurChn;
+
+	if (info == NULL)
+	{
+		//info = auto_alloc_clear(device->machine, ay8910_context);
+		info = (ay8910_context*)malloc(sizeof(ay8910_context));
+		memset(info, 0x00, sizeof(ay8910_context));
+	}
+
+	//info->device = device;
+	info->intf = intf;
+	info->SmpRateFunc = NULL;
+	//devcb_resolve_read8(&info->portAread, &intf->portAread, device);
+	//devcb_resolve_read8(&info->portBread, &intf->portBread, device);
+	//devcb_resolve_write8(&info->portAwrite, &intf->portAwrite, device);
+	//devcb_resolve_write8(&info->portBwrite, &intf->portBwrite, device);
+	if ((info->intf->flags & AY8910_SINGLE_OUTPUT) != 0)
+	{
+#ifdef _DEBUG
+		//logerror("AY-3-8910/YM2149 using single output!\n");
+#endif
+		//info->streams = 1;
+		info->streams = 3;	// set to 3 to greatly speed up loading times
+	}
+	else	
+		info->streams = 3;
+
+	info->chip_type = chip_type;
+	//if (chip_type == CHTYPE_AY8910 || chip_type == CHTYPE_AY8914 || chip_type == CHTYPE_AY8930)
+	if ((chip_type & 0xF0) == 0x00)	// CHTYPE_AY89xx variants
+	{
+		info->step = 2;
+		info->par = &ay8910_param;
+		info->par_env = &ay8910_param;
+		info->zero_is_off = 0;		/* FIXME: Remove after verification that off=vol(0) */
+		info->env_step_mask = 0x0F;
+	}
+	else //if ((chip_type & 0xF0) == 0x10)	// CHTYPE_YMxxxx variants (also YM2203/2608/2610)
+	{
+		info->step = 1;
+		info->par = &ym2149_param;
+		info->par_env = &ym2149_param_env;
+		info->zero_is_off = 0;
+		info->env_step_mask = 0x1F;
+
+		/* YM2149 master clock divider? */
+		if (info->intf->flags & YM2149_PIN26_LOW)
+			master_clock /= 2;
+	}
+	if (intf->flags & AY8910_ZX_STEREO)
+	{
+		// ABC Stereo
+		info->StereoMask0 = 0x01;
+		info->StereoMask1 = 0x03;
+		info->StereoMask2 = 0x02;
+	}
+	else
+	{
+		info->StereoMask0 = 0x03;
+		info->StereoMask1 = 0x03;
+		info->StereoMask2 = 0x03;
+	}
+
+	build_mixer_table(info);
+
+	/* The envelope is pacing twice as fast for the YM2149 as for the AY-3-8910, */
+	/* This handled by the step parameter. Consequently we use a divider of 8 here. */
+	//info->channel = stream_create(device, 0, info->streams, device->clock / 8, info, ay8910_update);
+
+	ay8910_set_clock_ym(info,clock);
+	//ay8910_statesave(info, device);
+
+	for (CurChn = 0; CurChn < NUM_CHANNELS; CurChn ++)
+		info->MuteMskCurChn = 0;
+	
+	return info;
+}
+
+void ay8910_stop_ym(void *chip)
+{
+	free(chip);
+}
+
+void ay8910_reset_ym(void *chip)
+{
+	ay8910_context *psg = (ay8910_context *)chip;
+	int i;
+
+	psg->register_latch = 0;
+	psg->rng = 1;
+	psg->output0 = 0;
+	psg->output1 = 0;
+	psg->output2 = 0;
+	psg->count0 = 0;
+	psg->count1 = 0;
+	psg->count2 = 0;
+	psg->count_noise = 0;
+	psg->count_env = 0;
+	psg->prescale_noise = 0;
+	psg->last_enable = -1;	/* force a write */
+	for (i = 0;i < AY_PORTA;i++)
+		ay8910_write_reg(psg,i,0);
+	psg->ready = 1;
+#if ENABLE_REGISTER_TEST
+	ay8910_write_reg(psg, AY_AFINE, 0);
+	ay8910_write_reg(psg, AY_ACOARSE, 1);
+	ay8910_write_reg(psg, AY_BFINE, 0);
+	ay8910_write_reg(psg, AY_BCOARSE, 2);
+	ay8910_write_reg(psg, AY_CFINE, 0);
+	ay8910_write_reg(psg, AY_CCOARSE, 4);
+	//#define AY_NOISEPER (6)
+	ay8910_write_reg(psg, AY_ENABLE, ~7);
+	ay8910_write_reg(psg, AY_AVOL, 10);
+	ay8910_write_reg(psg, AY_BVOL, 10);
+	ay8910_write_reg(psg, AY_CVOL, 10);
+	//#define AY_EFINE (11)
+	//#define AY_ECOARSE (12)
+	//#define AY_ESHAPE (13)
+#endif
+	if (psg->chip_type & 0x20)
+		psg->IsDisabled = 0x01;
+}
+
+/*void ay8910_set_volume(UINT8 ChipID,int channel,int volume)
+{
+	//ay8910_context *psg = get_safe_token(device);
+	int ch;
+
+	for (ch = 0; ch < psg->streams; ch++)
+		if (channel == ch || psg->streams == 1 || channel == ALL_8910_CHANNELS)
+			stream_set_output_gain(psg->channel, ch, volume / 100.0);
+}*/
+
+void ay8910_set_clock_ym(void *chip, int clock)
+{
+	ay8910_context *psg = (ay8910_context *)chip;
+	
+	if ((psg->chip_type & 0xF0) == 0x10 && (psg->intf->flags & YM2149_PIN26_LOW))
+		clock /= 2;
+	
+	//stream_set_sample_rate(psg->channel, clock / 8 );
+	if (psg->SmpRateFunc != NULL)
+		psg->SmpRateFunc(psg->SmpRateData, clock / 8);
+	
+	return;
+}
+
+void ay8910_write_ym(void *chip, int addr, int data)
+{
+	ay8910_context *psg = (ay8910_context *)chip;
+
+	if (addr & 1)
+	{	/* Data port */
+		int r = psg->register_latch;
+
+		if (r > 15) return;
+		if (r == AY_ESHAPE || psg->regsr != data)
+		{
+			/* update the output buffer before changing the register */
+			//stream_update(psg->channel);
+		}
+
+		ay8910_write_reg(psg,r,data);
+	}
+	else
+	{	/* Register port */
+		psg->register_latch = data & 0x0f;
+	}
+}
+
+int ay8910_read_ym(void *chip)
+{
+	ay8910_context *psg = (ay8910_context *)chip;
+	int r = psg->register_latch;
+
+	if (r > 15) return 0;
+
+	/* There are no state dependent register in the AY8910! */
+	/* stream_update(psg->channel); */
+
+	switch (r)
+	{
+	case AY_PORTA:
+		//if ((psg->regsAY_ENABLE & 0x40) != 0)
+		//	logerror("warning: read from 8910 '%s' Port A set as output\n",psg->device->tag);
+		/*
+ even if the port is set as output, we still need to return the external
+ data. Some games, like kidniki, need this to work.
+ */
+		/*if (psg->portAread.read)
+			psg->regsAY_PORTA = devcb_call_read8(&psg->portAread, 0);
+		else
+			logerror("%s: warning - read 8910 '%s' Port A\n",cpuexec_describe_context(psg->device->machine),psg->device->tag);*/
+		break;
+	case AY_PORTB:
+		//if ((psg->regsAY_ENABLE & 0x80) != 0)
+		//	logerror("warning: read from 8910 '%s' Port B set as output\n",psg->device->tag);
+		/*if (psg->portBread.read)
+			psg->regsAY_PORTB = devcb_call_read8(&psg->portBread, 0);
+		else
+			logerror("%s: warning - read 8910 '%s' Port B\n",cpuexec_describe_context(psg->device->machine),psg->device->tag);*/
+		break;
+	}
+
+	/* Depending on chip type, unused bits in registers may or may not be accessible.
+	Untested chips are assumed to regard them as 'ram'
+	Tested and confirmed on hardware:
+	- AY-3-8910: inaccessible bits (see masks below) read back as 0
+	- YM2149: no anomaly
+	*/
+	if (! (psg->chip_type & 0x10)) {
+		const UINT8 mask0x10={
+			0xff,0x0f,0xff,0x0f,0xff,0x0f,0x1f,0xff,0x1f,0x1f,0x1f,0xff,0xff,0x0f,0xff,0xff
+		};
+
+		return psg->regsr & maskr;
+	}
+	else return psg->regsr;
+}
+
+/*************************************
+ *
+ * Sound Interface
+ *
+ *************************************/
+
+//static DEVICE_START( ay8910 )
+/*int device_start_ay8910(UINT8 ChipID, int clock, unsigned char chip_type, unsigned char Flags)
+{
+	static const ay8910_interface generic_ay8910 =
+	{
+		AY8910_LEGACY_OUTPUT,
+		AY8910_DEFAULT_LOADS
+	};
+	//const ay8910_interface *intf = (device->static_config ? (const ay8910_interface *)device->static_config : &generic_ay8910);
+	ay8910_interface intf = generic_ay8910;
+	ay8910_context *psg;
+	
+	if (ChipID >= MAX_CHIPS)
+		return 0;
+	
+	psg = &AY8910DataChipID;
+	intf.flags = Flags;
+	ay8910_start_ym(psg, chip_type, clock, &intf);
+	
+	return clock / 8;
+}*/
+int ay8910_start(void **chip, int clock, UINT8 chip_type, UINT8 Flags)
+{
+	static const ay8910_interface generic_ay8910 =
+	{
+		AY8910_LEGACY_OUTPUT,
+		AY8910_DEFAULT_LOADS
+	};
+	ay8910_interface intf = generic_ay8910;
+	ay8910_context *psg = (ay8910_context*)chip;
+	
+	psg = (ay8910_context*)malloc(sizeof(ay8910_context));
+	if(psg == NULL)
+		return 0;
+	memset(psg, 0x00, sizeof(ay8910_context));
+	*chip = psg;
+	
+	intf.flags = Flags;
+	ay8910_start_ym(psg, chip_type, clock, &intf);
+	
+	if (Flags & YM2149_PIN26_LOW)
+		return clock / 16;
+	else
+		return clock / 8;
+}
+
+/*static DEVICE_START( ym2149 )
+{
+	static const ay8910_interface generic_ay8910 =
+	{
+		AY8910_LEGACY_OUTPUT,
+		AY8910_DEFAULT_LOADS,
+		DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
+	};
+	const ay8910_interface *intf = (device->static_config ? (const ay8910_interface *)device->static_config : &generic_ay8910);
+	ay8910_start_ym(get_safe_token(device), SOUND_YM2149, device, device->clock, intf);
+}*/
+
+//static DEVICE_STOP( ay8910 )
+/*void device_stop_ay8910(UINT8 ChipID)
+{
+	ay8910_context *psg = &AY8910DataChipID;
+	ay8910_stop_ym(psg);
+}
+
+//static DEVICE_RESET( ay8910 )
+void device_reset_ay8910(UINT8 ChipID)
+{
+	ay8910_context *psg = &AY8910DataChipID;
+	ay8910_reset_ym(psg);
+}*/
+
+/*DEVICE_GET_INFO( ay8910 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ay8910_context);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ay8910 );			break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( ay8910 );			break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ay8910 );			break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "AY-3-8910A");					break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "PSG");							break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+DEVICE_GET_INFO( ay8912 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ay8910 );			break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "AY-3-8912A");					break;
+		default: 										DEVICE_GET_INFO_CALL(ay8910);						break;
+	}
+}
+
+DEVICE_GET_INFO( ay8913 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ay8910 );			break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "AY-3-8913A");					break;
+		default: 										DEVICE_GET_INFO_CALL(ay8910);						break;
+	}
+}
+
+DEVICE_GET_INFO( ay8930 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ay8910 );			break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "AY8930");						break;
+		default: 										DEVICE_GET_INFO_CALL(ay8910);						break;
+	}
+}
+
+DEVICE_GET_INFO( ym2149 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym2149 );			break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM2149");						break;
+		default: 										DEVICE_GET_INFO_CALL(ay8910);						break;
+	}
+}
+
+DEVICE_GET_INFO( ym3439 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym2149 );			break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YM3439");						break;
+		default: 										DEVICE_GET_INFO_CALL(ay8910);						break;
+	}
+}
+
+DEVICE_GET_INFO( ymz284 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym2149 );			break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YMZ284");						break;
+		default: 										DEVICE_GET_INFO_CALL(ay8910);						break;
+	}
+}
+
+DEVICE_GET_INFO( ymz294 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ym2149 );			break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YMZ294");						break;
+		default: 										DEVICE_GET_INFO_CALL(ay8910);						break;
+	}
+}*/
+
+/*************************************
+ *
+ * Read/Write Handlers
+ *
+ *************************************/
+
+//READ8_DEVICE_HANDLER( ay8910_r )
+/*UINT8 ay8910_r(UINT8 ChipID, offs_t offset)
+{
+	ay8910_context *psg = &AY8910DataChipID;
+	return ay8910_read_ym(psg);
+}
+
+//WRITE8_DEVICE_HANDLER( ay8910_data_address_w )
+void ay8910_data_address_w(UINT8 ChipID, offs_t offset, UINT8 data)
+{
+	ay8910_context *psg = &AY8910DataChipID;
+	// note that directly connecting BC1 to A0 puts data on 0 and address on 1
+	ay8910_write_ym(psg, ~offset & 1, data);
+}
+
+//WRITE8_DEVICE_HANDLER( ay8910_address_data_w )
+void ay8910_address_data_w(UINT8 ChipID, offs_t offset, UINT8 data)
+{
+	ay8910_context *psg = &AY8910DataChipID;
+	ay8910_write_ym(psg, offset & 1, data);
+}
+
+//WRITE8_DEVICE_HANDLER( ay8910_address_w )
+void ay8910_address_w(UINT8 ChipID, offs_t offset, UINT8 data)
+{
+#if ENABLE_REGISTER_TEST
+	return;
+#endif
+	ay8910_data_address_w(ChipID, 1, data);
+}
+
+//WRITE8_DEVICE_HANDLER( ay8910_data_w )
+void ay8910_data_w(UINT8 ChipID, offs_t offset, UINT8 data)
+{
+#if ENABLE_REGISTER_TEST
+	return;
+#endif
+	ay8910_data_address_w(ChipID, 0, data);
+}*/
+
+
+void ay8910_set_mute_mask_ym(void *chip, UINT32 MuteMask)
+{
+	ay8910_context *psg = (ay8910_context *)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < NUM_CHANNELS; CurChn ++)
+		psg->MuteMskCurChn = (MuteMask & (1 << CurChn)) ? 0 : ~0;
+	
+	return;
+}
+
+/*void ay8910_set_mute_mask(UINT8 ChipID, UINT32 MuteMask)
+{
+	ay8910_context *psg = &AY8910DataChipID;
+	ay8910_set_mute_mask_ym(psg, MuteMask);
+}*/
+
+void ay8910_set_srchg_cb_ym(void *chip, SRATE_CALLBACK CallbackFunc, void* DataPtr)
+{
+	ay8910_context *info = (ay8910_context *)chip;
+	
+	// set Sample Rate Change Callback routine
+	info->SmpRateFunc = CallbackFunc;
+	info->SmpRateData = DataPtr;
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay8910.h Added

@@ -0,0 +1,143 @@
+#pragma once
+
+//#include "devcb.h"
+#define DEVCB_TYPE_NULL				(0)
+#define DEVCB_NULL							{ DEVCB_TYPE_NULL }
+
+/*
+AY-3-8910A: 2 I/O ports
+AY-3-8912A: 1 I/O port
+AY-3-8913A: 0 I/O port
+AY8930: upper compatible with 8910.
+In extended mode, it has higher resolution and duty ratio setting
+YM2149: higher resolution
+YM3439: same as 2149
+YMZ284: 0 I/O port, different clock divider
+YMZ294: 0 I/O port
+*/
+
+#define ALL_8910_CHANNELS -1
+
+/* Internal resistance at Volume level 7. */
+
+#define AY8910_INTERNAL_RESISTANCE	(356)
+#define YM2149_INTERNAL_RESISTANCE	(353)
+
+/*
+ * Default values for resistor loads.
+ * The macro should be used in AY8910interface if
+ * the real values are unknown.
+ */
+#define AY8910_DEFAULT_LOADS		{1000, 1000, 1000}
+
+/*
+ * The following is used by all drivers not reviewed yet.
+ * This will like the old behaviour, output between
+ * 0 and 7FFF
+ */
+#define AY8910_LEGACY_OUTPUT		(1)
+
+/*
+ * Specifing the next define will simulate the special
+ * cross channel mixing if outputs are tied together.
+ * The driver will only provide one stream in this case.
+ */
+#define AY8910_SINGLE_OUTPUT		(2)
+
+/*
+ * The follwoing define is the default behaviour.
+ * Output level 0 is 0V and 7ffff corresponds to 5V.
+ * Use this to specify that a discrete mixing stage
+ * follows.
+ */
+#define AY8910_DISCRETE_OUTPUT		(4)
+
+/*
+ * The follwoing define causes the driver to output
+ * raw volume levels, i.e. 0 .. 15 and 0..31.
+ * This is intended to be used in a subsequent
+ * mixing modul (i.e. mpatrol ties 6 channels from
+ * AY-3-8910 together). Do not use it now.
+ */
+/* TODO: implement mixing module */
+#define AY8910_RAW_OUTPUT			(8)
+
+#define AY8910_ZX_STEREO			0x80
+/*
+* This define specifies the initial state of YM2149
+* pin 26 (SEL pin). By default it is set to high,
+* compatible with AY8910.
+*/
+/* TODO: make it controllable while it's running (used by any hw???) */
+#define YM2149_PIN26_HIGH           (0x00) /* or N/C */
+#define YM2149_PIN26_LOW            (0x10)
+
+typedef struct _ay8910_interface ay8910_interface;
+struct _ay8910_interface
+{
+	int					flags;			/* Flags */
+	int					res_load3; 	/* Load on channel in ohms */
+	//devcb_read8			portAread;
+	//devcb_read8			portBread;
+	//devcb_write8		portAwrite;
+	//devcb_write8		portBwrite;
+};
+
+
+//void ay8910_set_volume(UINT8 ChipID,int channel,int volume);
+
+/*READ8_DEVICE_HANDLER( ay8910_r );
+WITE8_DEVICE_HANDLER( ay8910_address_w );
+WRITE8_DEVICE_HANDLER( ay8910_data_w );*/
+/*UINT8 ay8910_r(UINT8 ChipID, offs_t offset);
+void ay8910_address_w(UINT8 ChipID, offs_t offset, UINT8 data);
+void ay8910_data_w(UINT8 ChipID, offs_t offset, UINT8 data);*/
+
+/* use this when BC1 == A0; here, BC1=0 selects 'data' and BC1=1 selects 'latch address' */
+//WRITE8_DEVICE_HANDLER( ay8910_data_address_w );
+//void ay8910_data_address_w(UINT8 ChipID, offs_t offset, UINT8 data);
+
+/* use this when BC1 == !A0; here, BC1=0 selects 'latch address' and BC1=1 selects 'data' */
+//WRITE8_DEVICE_HANDLER( ay8910_address_data_w );
+//void ay8910_address_data_w(UINT8 ChipID, offs_t offset, UINT8 data);
+
+
+/*********** An interface for SSG of YM2203 ***********/
+
+//void *ay8910_start_ym(void *infoptr, sound_type chip_type, const device_config *device, int clock, const ay8910_interface *intf);
+void *ay8910_start_ym(void *infoptr, unsigned char chip_type, int clock, const ay8910_interface *intf);
+
+void ay8910_stop_ym(void *chip);
+void ay8910_reset_ym(void *chip);
+void ay8910_set_clock_ym(void *chip, int clock);
+void ay8910_write_ym(void *chip, int addr, int data);
+int ay8910_read_ym(void *chip);
+
+//void ay8910_update(UINT8 ChipID, stream_sample_t **outputs, int samples);
+void ay8910_update_one(void *param, stream_sample_t **outputs, int samples);
+int ay8910_start(void **chip, int clock, UINT8 chip_type, UINT8 Flags);
+/*int device_start_ay8910(UINT8 ChipID, int clock, unsigned char chip_type, unsigned char Flags);
+void device_stop_ay8910(UINT8 ChipID);
+void device_reset_ay8910(UINT8 ChipID);*/
+
+void ay8910_set_mute_mask_ym(void *chip, UINT32 MuteMask);
+//void ay8910_set_mute_mask(UINT8 ChipID, UINT32 MuteMask);
+void ay8910_set_srchg_cb_ym(void *chip, SRATE_CALLBACK CallbackFunc, void* DataPtr);
+
+/*DEVICE_GET_INFO( ay8910 );
+DEVICE_GET_INFO( ay8912 );
+DEVICE_GET_INFO( ay8913 );
+DEVICE_GET_INFO( ay8930 );
+DEVICE_GET_INFO( ym2149 );
+DEVICE_GET_INFO( ym3439 );
+DEVICE_GET_INFO( ymz284 );
+DEVICE_GET_INFO( ymz294 );
+
+#define SOUND_AY8910 DEVICE_GET_INFO_NAME( ay8910 )
+#define SOUND_AY8912 DEVICE_GET_INFO_NAME( ay8912 )
+#define SOUND_AY8913 DEVICE_GET_INFO_NAME( ay8913 )
+#define SOUND_AY8930 DEVICE_GET_INFO_NAME( ay8930 )
+#define SOUND_YM2149 DEVICE_GET_INFO_NAME( ym2149 )
+#define SOUND_YM3439 DEVICE_GET_INFO_NAME( ym3439 )
+#define SOUND_YMZ284 DEVICE_GET_INFO_NAME( ymz284 )
+#define SOUND_YMZ294 DEVICE_GET_INFO_NAME( ymz294 )*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.c Added

@@ -0,0 +1,160 @@
+/****************************************************************
+
+ MAME / MESS functions
+
+****************************************************************/
+
+#include <string.h>	// for memset
+#include <stdlib.h>	// for free
+#include <stddef.h>	// for NULL
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "ay8910.h"		// must be always included (for YM2149_PIN26_LOW)
+#include "emu2149.h"
+#include "ay_intf.h"
+
+
+#ifdef ENABLE_ALL_CORES
+#define EC_MAME		0x01	// AY8910 core from MAME
+#endif
+#define EC_EMU2149	0x00	// EMU2149 from NSFPlay
+
+
+/* for stream system */
+typedef struct _ayxx_state ayxx_state;
+struct _ayxx_state
+{
+	void *chip;
+	int EMU_CORE;
+};
+
+void ayxx_stream_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	ayxx_state *info = (ayxx_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ay8910_update_one(info->chip, outputs, samples);
+		break;
+#endif
+	case EC_EMU2149:
+		PSG_calc_stereo((PSG*)info->chip, outputs, samples);
+		break;
+	}
+}
+
+int device_start_ayxx(void **_info, int EMU_CORE, int clock, UINT8 chip_type, UINT8 Flags, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	ayxx_state *info;
+	int rate;
+
+#ifdef ENABLE_ALL_CORES
+	if (EMU_CORE >= 0x02)
+		EMU_CORE = EC_EMU2149;
+#else
+	EMU_CORE = EC_EMU2149;
+#endif
+	
+	info = (ayxx_state *) calloc(1, sizeof(ayxx_state));
+	*_info = (void *) info;
+ 
+	info->EMU_CORE = EMU_CORE;
+	if (Flags & YM2149_PIN26_LOW)
+		rate = clock / 16;
+	else
+		rate = clock / 8;
+	if (((CHIP_SAMPLING_MODE & 0x01) && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	
+	switch(EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		rate = ay8910_start(&info->chip, clock, chip_type, Flags);
+		break;
+#endif
+	case EC_EMU2149:
+		if (Flags & YM2149_PIN26_LOW)
+			clock /= 2;
+		info->chip = PSG_new(clock, rate);
+		if (info->chip == NULL)
+			return 0;
+		PSG_setVolumeMode((PSG*)info->chip, (chip_type & 0x10) ? 1 : 2);
+		PSG_setFlags((PSG*)info->chip, Flags & ~YM2149_PIN26_LOW);
+		break;
+	}
+
+	return rate;
+}
+
+void device_stop_ayxx(void *_info)
+{
+	ayxx_state *info = (ayxx_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ay8910_stop_ym(info->chip);
+		break;
+#endif
+	case EC_EMU2149:
+		PSG_delete((PSG*)info->chip);
+		break;
+	}
+	info->chip = NULL;
+	free(info);
+}
+
+void device_reset_ayxx(void *_info)
+{
+	ayxx_state *info = (ayxx_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ay8910_reset_ym(info->chip);
+		break;
+#endif
+	case EC_EMU2149:
+		PSG_reset((PSG*)info->chip);
+		break;
+	}
+}
+
+
+void ayxx_w(void *_info, offs_t offset, UINT8 data)
+{
+	ayxx_state *info = (ayxx_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ay8910_write_ym(info->chip, offset, data);
+		break;
+#endif
+	case EC_EMU2149:
+		PSG_writeIO((PSG*)info->chip, offset, data);
+		break;
+	}
+}
+
+void ayxx_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	ayxx_state *info = (ayxx_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		ay8910_set_mute_mask_ym(info->chip, MuteMask);
+		break;
+#endif
+	case EC_EMU2149:
+		PSG_setMask((PSG*)info->chip, MuteMask);
+		break;
+	}
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ay_intf.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.c Added

@@ -0,0 +1,639 @@
+/*
+C140.c
+
+Simulator based on AMUSE sources.
+The C140 sound chip is used by Namco System 2 and System 21
+The 219 ASIC (which incorporates a modified C140) is used by Namco NA-1 and NA-2
+This chip controls 24 channels (C140) or 16 (219) of PCM.
+16 bytes are associated with each channel.
+Channels can be 8 bit signed PCM, or 12 bit signed PCM.
+
+Timer behavior is not yet handled.
+
+Unmapped registers:
+ 0x1f8:timer interval? (Nx0.1 ms)
+ 0x1fa:irq ack? timer restart?
+ 0x1fe:timer switch?(0:off 1:on)
+
+--------------
+
+ ASIC "219" notes
+
+ On the 219 ASIC used on NA-1 and NA-2, the high registers have the following
+ meaning instead:
+ 0x1f7: bank for voices 0-3
+ 0x1f1: bank for voices 4-7
+ 0x1f3: bank for voices 8-11
+ 0x1f5: bank for voices 12-15
+
+ Some games (bkrtmaq, xday2) write to 0x1fd for voices 12-15 instead. Probably the bank registers
+ mirror at 1f8, in which case 1ff is also 0-3, 1f9 is also 4-7, 1fb is also 8-11, and 1fd is also 12-15.
+
+ Each bank is 0x20000 (128k), and the voice addresses on the 219 are all multiplied by 2.
+ Additionally, the 219's base pitch is the same as the C352's (42667). But these changes
+ are IMO not sufficient to make this a separate file - all the other registers are
+ fully compatible.
+
+ Finally, the 219 only has 16 voices.
+*/
+/*
+ 2000.06.26 CAB fixed compressed pcm playback
+ 2002.07.20 R.Belmont added support for multiple banking types
+ 2006.01.08 R.Belmont added support for NA-1/2 "219" derivative
+*/
+
+
+//#include "emu.h"
+#include <stdlib.h>
+#include <string.h>
+#include "mamedef.h"
+#include "c140.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+#define MAX_VOICE 24
+
+struct voice_registers
+{
+	UINT8 volume_right;
+	UINT8 volume_left;
+	UINT8 frequency_msb;
+	UINT8 frequency_lsb;
+	UINT8 bank;
+	UINT8 mode;
+	UINT8 start_msb;
+	UINT8 start_lsb;
+	UINT8 end_msb;
+	UINT8 end_lsb;
+	UINT8 loop_msb;
+	UINT8 loop_lsb;
+	UINT8 reserved4;
+};
+
+typedef struct
+{
+	long	ptoffset;
+	long	pos;
+	long	key;
+	//--work
+	long	lastdt;
+	long	prevdt;
+	long	dltdt;
+	//--reg
+	long	rvol;
+	long	lvol;
+	long	frequency;
+	long	bank;
+	long	mode;
+
+	long	sample_start;
+	long	sample_end;
+	long	sample_loop;
+	UINT8	Muted;
+} VOICE;
+
+typedef struct _c140_state c140_state;
+struct _c140_state
+{
+	int sample_rate;
+	//sound_stream *stream;
+	int banking_type;
+	/* internal buffers */
+	INT16 *mixer_buffer_left;
+	INT16 *mixer_buffer_right;
+
+	int baserate;
+	UINT32 pRomSize;
+	void *pRom;
+	UINT8 REG0x200;
+
+	INT16 pcmtbl8;		//2000.06.26 CAB
+
+	VOICE voiMAX_VOICE;
+};
+
+/*INLINE c140_state *get_safe_token(device_t *device)
+{
+	assert(device != NULL);
+	assert(device->type() == C140);
+	return (c140_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+static void init_voice( VOICE *v )
+{
+	v->key=0;
+	v->ptoffset=0;
+	v->rvol=0;
+	v->lvol=0;
+	v->frequency=0;
+	v->bank=0;
+	v->mode=0;
+	v->sample_start=0;
+	v->sample_end=0;
+	v->sample_loop=0;
+}
+//READ8_DEVICE_HANDLER( c140_r )
+UINT8 c140_r(void *_info, offs_t offset)
+{
+	//c140_state *info = get_safe_token(device);
+	c140_state *info = (c140_state *)_info;
+	offset&=0x1ff;
+	return info->REGoffset;
+}
+
+/*
+ find_sample: compute the actual address of a sample given it's
+ address and banking registers, as well as the board type.
+
+ I suspect in "real life" this works like the Sega MultiPCM where the banking
+ is done by a small PAL or GAL external to the sound chip, which can be switched
+ per-game or at least per-PCB revision as addressing range needs grow.
+ */
+static long find_sample(c140_state *info, long adrs, long bank, int voice)
+{
+	long newadr = 0;
+
+	static const INT16 asic219banks4 = { 0x1f7, 0x1f1, 0x1f3, 0x1f5 };
+
+	adrs=(bank<<16)+adrs;
+
+	switch (info->banking_type)
+	{
+		case C140_TYPE_SYSTEM2:
+			// System 2 banking
+			newadr = ((adrs&0x200000)>>2)|(adrs&0x7ffff);
+			break;
+
+		case C140_TYPE_SYSTEM21:
+			// System 21 banking.
+			// similar to System 2's.
+			newadr = ((adrs&0x300000)>>1)+(adrs&0x7ffff);
+			break;
+
+		/*case C140_TYPE_SYSTEM21_A:
+			// System 21 type A (simple) banking.
+			// similar to System 2's.
+			newadr = ((adrs&0x300000)>>1)+(adrs&0x7ffff);
+			break;
+
+		case C140_TYPE_SYSTEM21_B:
+			// System 21 type B (chip select) banking
+
+			// get base address of sample inside the bank
+			newadr = ((adrs&0x100000)>>2) + (adrs&0x3ffff);
+
+			// now add the starting bank offsets based on the 2
+			// chip select bits.
+			// 0x40000 picks individual 512k ROMs
+			if (adrs & 0x40000)
+			{
+				newadr += 0x80000;
+			}
+
+			// and 0x200000 which group of chips...
+			if (adrs & 0x200000)
+			{
+				newadr += 0x100000;
+			}
+			break;*/
+
+		case C140_TYPE_ASIC219:
+			// ASIC219's banking is fairly simple
+			newadr = ((info->REGasic219banksvoice/4&0x3) * 0x20000) + adrs;
+			break;
+	}
+
+	return (newadr);
+}
+//WRITE8_DEVICE_HANDLER( c140_w )
+void c140_w(void *_info, offs_t offset, UINT8 data)
+{
+	//c140_state *info = get_safe_token(device);
+	c140_state *info = (c140_state *)_info;
+	//info->stream->update();
+
+	offset&=0x1ff;
+
+	// mirror the bank registers on the 219, fixes bkrtmaq (and probably xday2 based on notes in the HLE)
+	if ((offset >= 0x1f8) && (info->banking_type == C140_TYPE_ASIC219))
+	{
+		offset -= 8;
+	}
+
+	info->REGoffset=data;
+	if( offset<0x180 )
+	{
+		VOICE *v = &info->voioffset>>4;
+
+		if( (offset&0xf)==0x5 )
+		{
+			if( data&0x80 )
+			{
+				const struct voice_registers *vreg = (struct voice_registers *) &info->REGoffset&0x1f0;
+				v->key=1;
+				v->ptoffset=0;
+				v->pos=0;
+				v->lastdt=0;
+				v->prevdt=0;
+				v->dltdt=0;
+				v->bank = vreg->bank;
+				v->mode = data;
+
+				// on the 219 asic, addresses are in words
+				if (info->banking_type == C140_TYPE_ASIC219)
+				{
+					v->sample_loop = (vreg->loop_msb*256 + vreg->loop_lsb)*2;
+					v->sample_start = (vreg->start_msb*256 + vreg->start_lsb)*2;
+					v->sample_end = (vreg->end_msb*256 + vreg->end_lsb)*2;
+
+					#if 0
+					logerror("219: play v %d mode %02x start %x loop %x end %x\n",
+						offset>>4, v->mode,
+						find_sample(info, v->sample_start, v->bank, offset>>4),
+						find_sample(info, v->sample_loop, v->bank, offset>>4),
+						find_sample(info, v->sample_end, v->bank, offset>>4));
+					#endif
+				}
+				else
+				{
+					v->sample_loop = vreg->loop_msb*256 + vreg->loop_lsb;
+					v->sample_start = vreg->start_msb*256 + vreg->start_lsb;
+					v->sample_end = vreg->end_msb*256 + vreg->end_lsb;
+				}
+			}
+			else
+			{
+				v->key=0;
+			}
+		}
+	}
+}
+
+//void c140_set_base(device_t *device, void *base)
+void c140_set_base(void *_info, void *base)
+{
+	//c140_state *info = get_safe_token(device);
+	c140_state *info = (c140_state *)_info;
+	info->pRom = base;
+}
+
+/*INLINE int limit(INT32 in)
+{
+	if(in>0x7fff)		return 0x7fff;
+	else if(in<-0x8000)	return -0x8000;
+	return in;
+}*/
+
+//static STREAM_UPDATE( update_stereo )
+void c140_update(void *param, stream_sample_t **outputs, int samples)
+{
+	c140_state *info = (c140_state *)param;
+	int		i,j;
+
+	INT32	rvol,lvol;
+	INT32	dt;
+	INT32	sdt;
+	INT32	st,ed,sz;
+
+	INT8	*pSampleData;
+	INT32	frequency,delta,offset,pos;
+	INT32	cnt, voicecnt;
+	INT32	lastdt,prevdt,dltdt;
+	float	pbase=(float)info->baserate*2.0f / (float)info->sample_rate;
+
+	INT16	*lmix, *rmix;
+
+	if(samples>info->sample_rate) samples=info->sample_rate;
+
+	/* zap the contents of the mixer buffer */
+	memset(info->mixer_buffer_left, 0, samples * sizeof(INT16));
+	memset(info->mixer_buffer_right, 0, samples * sizeof(INT16));
+	if (info->pRom == NULL)
+		return;
+
+	/* get the number of voices to update */
+	voicecnt = (info->banking_type == C140_TYPE_ASIC219) ? 16 : 24;
+
+	//--- audio update
+	for( i=0;i<voicecnt;i++ )
+	{
+		VOICE *v = &info->voii;
+		const struct voice_registers *vreg = (struct voice_registers *)&info->REGi*16;
+
+		if( v->key && ! v->Muted)
+		{
+			frequency= vreg->frequency_msb*256 + vreg->frequency_lsb;
+
+			/* Abort voice if no frequency value set */
+			if(frequency==0) continue;
+
+			/* Delta = frequency * ((8MHz/374)*2 / sample rate) */
+			delta=(long)((float)frequency * pbase);
+
+			/* Calculate left/right channel volumes */
+			lvol=(vreg->volume_left*32)/MAX_VOICE; //32ch -> 24ch
+			rvol=(vreg->volume_right*32)/MAX_VOICE;
+
+			/* Set mixer outputs base pointers */
+			lmix = info->mixer_buffer_left;
+			rmix = info->mixer_buffer_right;
+
+			/* Retrieve sample start/end and calculate size */
+			st=v->sample_start;
+			ed=v->sample_end;
+			sz=ed-st;
+
+			/* Retrieve base pointer to the sample data */
+			//pSampleData=(signed char*)((FPTR)info->pRom + find_sample(info, st, v->bank, i));
+			pSampleData = (INT8*)info->pRom + find_sample(info, st, v->bank, i);
+
+			/* Fetch back previous data pointers */
+			offset=v->ptoffset;
+			pos=v->pos;
+			lastdt=v->lastdt;
+			prevdt=v->prevdt;
+			dltdt=v->dltdt;
+
+			/* Switch on data type - compressed PCM is only for C140 */
+			if ((v->mode&8) && (info->banking_type != C140_TYPE_ASIC219))
+			{
+				//compressed PCM (maybe correct...)
+				/* Loop for enough to fill sample buffer as requested */
+				for(j=0;j<samples;j++)
+				{
+					offset += delta;
+					cnt = (offset>>16)&0x7fff;
+					offset &= 0xffff;
+					pos+=cnt;
+					//for(;cnt>0;cnt--)
+					{
+						/* Check for the end of the sample */
+						if(pos >= sz)
+						{
+							/* Check if its a looping sample, either stop or loop */
+							if(v->mode&0x10)
+							{
+								pos = (v->sample_loop - st);
+							}
+							else
+							{
+								v->key=0;
+								break;
+							}
+						}
+
+						/* Read the chosen sample byte */
+						dt=pSampleDatapos;
+
+						/* decompress to 13bit range */		//2000.06.26 CAB
+						sdt=dt>>3;				//signed
+						if(sdt<0)	sdt = (sdt<<(dt&7)) - info->pcmtbldt&7;
+						else		sdt = (sdt<<(dt&7)) + info->pcmtbldt&7;
+
+						prevdt=lastdt;
+						lastdt=sdt;
+						dltdt=(lastdt - prevdt);
+					}
+
+					/* Caclulate the sample value */
+					dt=((dltdt*offset)>>16)+prevdt;
+
+					/* Write the data to the sample buffers */
+					*lmix++ +=(dt*lvol)>>(5+5);
+					*rmix++ +=(dt*rvol)>>(5+5);
+				}
+			}
+			else
+			{
+				/* linear 8bit signed PCM */
+				for(j=0;j<samples;j++)
+				{
+					offset += delta;
+					cnt = (offset>>16)&0x7fff;
+					offset &= 0xffff;
+					pos += cnt;
+					/* Check for the end of the sample */
+					if(pos >= sz)
+					{
+						/* Check if its a looping sample, either stop or loop */
+						if( v->mode&0x10 )
+						{
+							pos = (v->sample_loop - st);
+						}
+						else
+						{
+							v->key=0;
+							break;
+						}
+					}
+
+					if( cnt )
+					{
+						prevdt=lastdt;
+
+						if (info->banking_type == C140_TYPE_ASIC219)
+						{
+							//lastdt = pSampleDataBYTE_XOR_BE(pos);
+							lastdt = pSampleDatapos ^ 0x01;
+
+							// Sign + magnitude format
+							if ((v->mode & 0x01) && (lastdt & 0x80))
+								lastdt = -(lastdt & 0x7f);
+
+							// Sign flip
+							if (v->mode & 0x40)
+								lastdt = -lastdt;
+						}
+						else
+						{
+							lastdt=pSampleDatapos;
+						}
+
+						dltdt = (lastdt - prevdt);
+					}
+
+					/* Caclulate the sample value */
+					dt=((dltdt*offset)>>16)+prevdt;
+
+					/* Write the data to the sample buffers */
+					*lmix++ +=(dt*lvol)>>5;
+					*rmix++ +=(dt*rvol)>>5;
+				}
+			}
+
+			/* Save positional data for next callback */
+			v->ptoffset=offset;
+			v->pos=pos;
+			v->lastdt=lastdt;
+			v->prevdt=prevdt;
+			v->dltdt=dltdt;
+		}
+	}
+
+	/* render to MAME's stream buffer */
+	lmix = info->mixer_buffer_left;
+	rmix = info->mixer_buffer_right;
+	{
+		stream_sample_t *dest1 = outputs0;
+		stream_sample_t *dest2 = outputs1;
+		for (i = 0; i < samples; i++)
+		{
+			//*dest1++ = limit(8*(*lmix++));
+			//*dest2++ = limit(8*(*rmix++));
+			*dest1++ = 8 * (*lmix ++);
+			*dest2++ = 8 * (*rmix ++);
+		}
+	}
+}
+
+//static DEVICE_START( c140 )
+int device_start_c140(void **_info, int clock, int banking_type, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	//const c140_interface *intf = (const c140_interface *)device->static_config();
+	//c140_state *info = get_safe_token(device);
+	c140_state *info;
+	int i;
+
+	info = (c140_state *) calloc(1, sizeof(c140_state));
+	*_info = (void *) info;
+	
+	//info->sample_rate=info->baserate=device->clock();
+	if (clock < 1000000)
+		info->baserate = clock;
+	else
+		info->baserate = clock / 384;	// based on MAME's notes on Namco System II
+	info->sample_rate = info->baserate;
+	if (((CHIP_SAMPLING_MODE & 0x01) && info->sample_rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		info->sample_rate = CHIP_SAMPLE_RATE;
+	if (info->sample_rate >= 0x1000000)	// limit to 16 MHz sample rate (32 MB buffer)
+		return 0;
+
+	//info->banking_type = intf->banking_type;
+	info->banking_type = banking_type;
+
+	//info->stream = device->machine().sound().stream_alloc(*device,0,2,info->sample_rate,info,update_stereo);
+
+	//info->pRom=*device->region();
+	info->pRomSize = 0x00;
+	info->pRom = NULL;
+
+	/* make decompress pcm table */		//2000.06.26 CAB
+	{
+		INT32 segbase=0;
+		for(i=0;i<8;i++)
+		{
+			info->pcmtbli=segbase;	//segment base value
+			segbase += 16<<i;
+		}
+	}
+
+	// done at device_reset
+	/*memset(info->REG,0,sizeof(info->REG));
+	{
+		int i;
+		for(i=0;i<MAX_VOICE;i++) init_voice( &info->voii );
+	}*/
+
+	/* allocate a pair of buffers to mix into - 1 second's worth should be more than enough */
+	//info->mixer_buffer_left = auto_alloc_array(device->machine(), INT16, 2 * info->sample_rate);
+	info->mixer_buffer_left = (INT16*)malloc(sizeof(INT16) * 2 * info->sample_rate);
+	info->mixer_buffer_right = info->mixer_buffer_left + info->sample_rate;
+	
+	for (i = 0; i < MAX_VOICE; i ++)
+		info->voii.Muted = 0x00;
+
+	return info->sample_rate;
+}
+
+void device_stop_c140(void *_info)
+{
+	c140_state *info = (c140_state *)_info;
+	
+	free(info->pRom);	info->pRom = NULL;
+	free(info->mixer_buffer_left);
+
+	free(info);
+	
+	return;
+}
+
+void device_reset_c140(void *_info)
+{
+	c140_state *info = (c140_state *)_info;
+	int i;
+	
+	memset(info->REG, 0, sizeof(info->REG));
+	
+	for(i = 0; i < MAX_VOICE; i ++)
+		init_voice( &info->voii );
+	
+	return;
+}
+
+void c140_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					const UINT8* ROMData)
+{
+	c140_state *info = (c140_state *)_info;
+	
+	if (info->pRomSize != ROMSize)
+	{
+		info->pRom = (UINT8*)realloc(info->pRom, ROMSize);
+		info->pRomSize = ROMSize;
+		memset(info->pRom, 0xFF, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy((INT8*)info->pRom + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+
+void c140_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	c140_state *info = (c140_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < MAX_VOICE; CurChn ++)
+		info->voiCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( c140 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers --- //
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(c140_state);			break;
+
+		// --- the following bits of info are returned as pointers to data or functions --- //
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( c140 );		break;
+		case DEVINFO_FCT_STOP:							// nothing //								break;
+		case DEVINFO_FCT_RESET:							// nothing //								break;
+
+		// --- the following bits of info are returned as NULL-terminated strings --- //
+		case DEVINFO_STR_NAME:							strcpy(info->s, "C140");					break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Namco PCM");				break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");						break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);					break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(C140, c140);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c140.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.c Added

@@ -0,0 +1,370 @@
+/*
+ c352.c - Namco C352 custom PCM chip emulation
+ v2.0
+ 
+ Rewritten by superctr
+ 
+ Original code by R. Belmont
+ Additional code by cync and the hoot development team
+
+ Thanks to Cap of VivaNonno for info and The_Author for preliminary reverse-engineering
+
+ Chip specs:
+ 32 voices
+ Supports 8-bit linear and 8-bit muLaw samples
+ Output: digital, 16 bit, 4 channels
+ Output sample rate is the input clock / (288 * 2).
+ */
+
+//#include "emu.h"
+//#include "streams.h"
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h> // for NULL
+#include "mamedef.h"
+#include "c352.h"
+
+#define VERBOSE (0)
+#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+
+#define C352_VOICES 32
+enum {
+ C352_FLG_BUSY = 0x8000, // channel is busy
+ C352_FLG_KEYON = 0x4000, // Keyon
+ C352_FLG_KEYOFF = 0x2000, // Keyoff
+ C352_FLG_LOOPTRG = 0x1000, // Loop Trigger
+ C352_FLG_LOOPHIST = 0x0800, // Loop History
+ C352_FLG_FM = 0x0400, // Frequency Modulation
+ C352_FLG_PHASERL = 0x0200, // Rear Left invert phase 180 degrees
+ C352_FLG_PHASEFL = 0x0100, // Front Left invert phase 180 degrees
+ C352_FLG_PHASEFR = 0x0080, // invert phase 180 degrees (e.g. flip sign of sample)
+ C352_FLG_LDIR = 0x0040, // loop direction
+ C352_FLG_LINK = 0x0020, // "long-format" sample (can't loop, not sure what else it means)
+ C352_FLG_NOISE = 0x0010, // play noise instead of sample
+ C352_FLG_MULAW = 0x0008, // sample is mulaw instead of linear 8-bit PCM
+ C352_FLG_FILTER = 0x0004, // don't apply filter
+ C352_FLG_REVLOOP = 0x0003, // loop backwards
+ C352_FLG_LOOP = 0x0002, // loop forward
+ C352_FLG_REVERSE = 0x0001 // play sample backwards
+};
+
+typedef struct {
+
+ UINT32 pos;
+ UINT32 counter;
+ 
+ INT16 sample;
+ INT16 last_sample;
+
+ UINT16 vol_f;
+ UINT16 vol_r;
+ UINT16 freq;
+ UINT16 flags;
+ 
+ UINT16 wave_bank;
+ UINT16 wave_start;
+ UINT16 wave_end;
+ UINT16 wave_loop;
+ 
+ int mute;
+
+} C352_Voice;
+
+typedef struct {
+
+ UINT32 rate;
+ UINT8 muteRear;
+
+ C352_Voice vC352_VOICES;
+
+ UINT16 control1; // unknown purpose for both
+ UINT16 control2;
+
+ UINT8* wave;
+ UINT32 wavesize;
+ UINT32 wave_mask;
+
+ UINT16 random;
+ 
+ INT16 mulaw256;
+
+} C352;
+
+void C352_generate_mulaw(C352 *c)
+{
+ int i;
+ double x_max = 32752.0;
+ double y_max = 127.0;
+ double u = 10.0;
+
+ // generate mulaw table for mulaw format samples
+ for (i = 0; i < 256; i++)
+ {
+ double y = (double) (i & 0x7f);
+ double x = (exp (y / y_max * log (1.0 + u)) - 1.0) * x_max / u;
+
+ if (i & 0x80)
+ x = -x;
+ c->mulawi = (short)x;
+ }
+}
+
+void C352_fetch_sample(C352 *c, int i)
+{
+ C352_Voice *v = &c->vi;
+ v->last_sample = v->sample;
+ 
+ if(v->flags & C352_FLG_NOISE)
+ {
+ c->random = (c->random>>1) ^ (-(c->random&1)) & 0xfff6; 
+ v->sample = (c->random&4) ? 0xc000 : 0x3fff;
+ 
+ v->last_sample = v->sample; // No interpolation for noise samples
+ }
+ else
+ {
+ INT8 s;
+ UINT16 pos;
+
+ s = (INT8)c->wavev->pos&0xffffff;
+
+ if(v->flags & C352_FLG_MULAW)
+ v->sample = c->mulaw(UINT8)s;
+ else
+ v->sample = s<<8;
+ 
+ pos = v->pos&0xffff;
+ 
+ if((v->flags & C352_FLG_LOOP) && v->flags & C352_FLG_REVERSE)
+ {
+ // backwards>forwards
+ if((v->flags & C352_FLG_LDIR) && pos == v->wave_loop)
+ v->flags &= ~C352_FLG_LDIR;
+ // forwards>backwards
+ else if(!(v->flags & C352_FLG_LDIR) && pos == v->wave_end)
+ v->flags |= C352_FLG_LDIR;
+ 
+ v->pos += (v->flags&C352_FLG_LDIR) ? -1 : 1;
+ }
+ else if(pos == v->wave_end)
+ {
+ if((v->flags & C352_FLG_LINK) && (v->flags & C352_FLG_LOOP))
+ {
+ v->pos = (v->wave_start<<16) | v->wave_loop;
+ v->flags |= C352_FLG_LOOPHIST;
+ }
+ else if(v->flags & C352_FLG_LOOP)
+ {
+ v->pos = (v->pos&0xff0000) | v->wave_loop;
+ v->flags |= C352_FLG_LOOPHIST;
+ }
+ else
+ {
+ v->flags |= C352_FLG_KEYOFF;
+ v->flags &= ~C352_FLG_BUSY;
+ v->sample=0;
+ v->last_sample=0;
+ }
+ }
+ else
+ {
+ v->pos += (v->flags&C352_FLG_REVERSE) ? -1 : 1;
+ }
+ }
+}
+
+UINT16 C352_update_voice(C352 *c, int i)
+{
+ C352_Voice *v = &c->vi;
+ INT32 temp;
+
+ if((v->flags & C352_FLG_BUSY) == 0)
+ return 0;
+
+ v->counter += v->freq;
+ 
+ if(v->counter > 0x10000)
+ {
+ v->counter &= 0xffff;
+ C352_fetch_sample(c,i);
+ }
+ 
+ temp = v->sample;
+ 
+ if((v->flags & C352_FLG_FILTER) == 0)
+ temp = v->last_sample + (v->counter*(v->sample-v->last_sample)>>16);
+
+ return temp;
+}
+
+void c352_update(void *_info, stream_sample_t **outputs, int samples)
+{
+ C352 *c = (C352 *) _info;
+ int i, j;
+ INT16 s;
+ memset(outputs0, 0x00, samples * sizeof(stream_sample_t));
+ memset(outputs1, 0x00, samples * sizeof(stream_sample_t));
+ 
+ for(i=0;i<samples;i++)
+ {
+ for(j=0;j<32;j++)
+ {
+ s = C352_update_voice(c,j);
+ if(!c->vj.mute)
+ {
+ // Left
+ outputs0i += (c->vj.flags & C352_FLG_PHASEFL) ? (-s * (c->vj.vol_f>>8) )>>8
+ : ( s * (c->vj.vol_f>>8) )>>8;
+ if (!c->muteRear)
+ outputs0i += (c->vj.flags & C352_FLG_PHASERL) ? (-s * (c->vj.vol_r>>8) )>>8
+ : ( s * (c->vj.vol_r>>8) )>>8;
+ 
+ // Right
+ outputs1i += (c->vj.flags & C352_FLG_PHASEFR) ? (-s * (c->vj.vol_f&0xff))>>8
+ : ( s * (c->vj.vol_f&0xff))>>8;
+ if (!c->muteRear)
+ outputs1i += ( s * (c->vj.vol_r&0xff))>>8;
+ }
+ }
+ 
+ }
+}
+
+int device_start_c352(void **_info, int clock, int clkdiv)
+{
+ C352 *c = calloc(1, sizeof(C352));
+ *_info = (void *) c;
+
+ c->wave = NULL;
+ c->wavesize = 0x00;
+
+ if(!clkdiv)
+ clkdiv = 288;
+
+ c->rate = (clock&0x7FFFFFFF)/clkdiv;
+ c->muteRear = (clock&0x80000000)>>31;
+
+ memset(c->v,0,sizeof(C352_Voice)*C352_VOICES);
+
+ c->control1 = 0;
+ c->control2 = 0;
+ c->random = 0x1234;
+
+ C352_generate_mulaw(c);
+ 
+ return c->rate;
+}
+
+void device_stop_c352(void *_info)
+{
+ C352 *c = (C352 *)_info;
+ 
+ free(c->wave);
+ c->wave = NULL;
+
+ free(c);
+ 
+ return;
+}
+
+void device_reset_c352(void *_info)
+{
+ C352 *c = (C352 *) _info;
+ 
+ memset(c->v,0,sizeof(C352_Voice)*C352_VOICES);
+ 
+ return;
+}
+
+static const UINT16 C352RegMap8 = {
+ offsetof(C352_Voice,vol_f) / sizeof(UINT16),
+ offsetof(C352_Voice,vol_r) / sizeof(UINT16),
+ offsetof(C352_Voice,freq) / sizeof(UINT16),
+ offsetof(C352_Voice,flags) / sizeof(UINT16),
+ offsetof(C352_Voice,wave_bank) / sizeof(UINT16),
+ offsetof(C352_Voice,wave_start) / sizeof(UINT16),
+ offsetof(C352_Voice,wave_end) / sizeof(UINT16),
+ offsetof(C352_Voice,wave_loop) / sizeof(UINT16),
+};
+
+UINT16 c352_r(void *_info, offs_t offset)
+{
+ C352 *c = (C352 *) _info;
+
+ if(offset < 0x100)
+ return *((UINT16*)&c->voffset/8+C352RegMapoffset%8);
+ else
+ return 0;
+}
+
+void c352_w(void *_info, offs_t offset, UINT16 data)
+{
+ C352 *c = (C352 *) _info;
+ 
+ int i;
+ 
+ if(offset < 0x100) // Channel registers, see map above.
+ *((UINT16*)&c->voffset/8+C352RegMapoffset%8) = data;
+ else if(offset == 0x200) // Unknown purpose.
+ c->control1 = data;
+ else if(offset == 0x201)
+ c->control2 = data;
+ else if(offset == 0x202) // execute keyons/keyoffs
+ {
+ for(i=0;i<C352_VOICES;i++)
+ { 
+ if((c->vi.flags & C352_FLG_KEYON))
+ {
+ c->vi.pos = (c->vi.wave_bank<<16) | c->vi.wave_start;
+
+ c->vi.sample = 0;
+ c->vi.last_sample = 0;
+ c->vi.counter = 0x10000; // Immediate update
+
+ c->vi.flags |= C352_FLG_BUSY;
+ c->vi.flags &= ~(C352_FLG_KEYON|C352_FLG_LOOPHIST);
+ }
+ else if(c->vi.flags & C352_FLG_KEYOFF)
+ {
+ c->vi.sample=0;
+ c->vi.last_sample=0;
+ c->vi.flags &= ~(C352_FLG_BUSY|C352_FLG_KEYOFF);
+ }
+ }
+ }
+}
+
+
+void c352_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+ const UINT8* ROMData)
+{
+ C352 *c = (C352 *) _info;
+ 
+ if (c->wavesize != ROMSize)
+ {
+ c->wave = (UINT8*)realloc(c->wave, ROMSize);
+ c->wavesize = ROMSize;
+ memset(c->wave, 0xFF, ROMSize);
+ }
+ if (DataStart > ROMSize)
+ return;
+ if (DataStart + DataLength > ROMSize)
+ DataLength = ROMSize - DataStart;
+ 
+ memcpy(c->wave + DataStart, ROMData, DataLength);
+ 
+ return;
+}
+
+void c352_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+ C352 *c = (C352 *) _info;
+ UINT8 CurChn;
+ 
+ for (CurChn = 0; CurChn < 32; CurChn ++)
+ c->vCurChn.mute = (MuteMask >> CurChn) & 0x01;
+ 
+ return;
+}
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c352.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.c Added

@@ -0,0 +1,454 @@
+/*
+ HuC6280 sound chip emulator
+ by Charles MacDonald
+ E-mail: cgfm2@hotmail.com
+ WWW: http://cgfm2.emuviews.com
+
+ Thanks to:
+
+ - Paul Clifford for his PSG documentation.
+ - Richard Bannister for the TGEmu-specific sound updating code.
+ - http://www.uspto.gov for the PSG patents.
+ - All contributors to the tghack-list.
+
+ Changes:
+
+ (03/30/2003)
+ - Removed TGEmu specific code and added support functions for MAME.
+ - Modified setup code to handle multiple chips with different clock and
+ volume settings.
+
+ Missing features / things to do:
+
+ - Add LFO support. But do any games actually use it?
+
+ - Add shared index for waveform playback and sample writes. Almost every
+ game will reset the index prior to playback so this isn't an issue.
+
+ - While the noise emulation is complete, the data for the pseudo-random
+ bitstream is calculated by machine.rand() and is not a representation of what
+ the actual hardware does.
+
+ For some background on Hudson Soft's C62 chipset:
+
+ - http://www.hudsonsoft.net/ww/about/about.html
+ - http://www.hudson.co.jp/corp/eng/coinfo/history.html
+
+ Legal information:
+
+ Copyright Charles MacDonald
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+//#include "emu.h"
+#include <stdlib.h>	// for rand()
+#include <string.h>	// for memset()
+#include <math.h>	// for pow()
+#include "mamedef.h"
+#include "c6280.h"
+
+typedef struct {
+ UINT16 frequency;
+ UINT8 control;
+ UINT8 balance;
+ UINT8 waveform32;
+ UINT8 index;
+ INT16 dda;
+ UINT8 noise_control;
+ UINT32 noise_counter;
+ UINT32 counter;
+	UINT8 Muted;
+} t_channel;
+
+typedef struct {
+	//sound_stream *stream;
+	//device_t *device;
+	//device_t *cpudevice;
+ UINT8 select;
+ UINT8 balance;
+ UINT8 lfo_frequency;
+ UINT8 lfo_control;
+ t_channel channel8;	// is 8, because: p->select = data & 0x07;
+ INT16 volume_table32;
+ UINT32 noise_freq_tab32;
+ UINT32 wave_freq_tab4096;
+} c6280_t;
+
+/*INLINE c6280_t *get_safe_token(device_t *device)
+{
+	assert(device != NULL);
+	assert(device->type() == C6280);
+	return (c6280_t *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+/* only needed for io_buffer */
+//#include "cpu/h6280/h6280.h"
+
+
+static void c6280_init(/*device_t *device,*/ c6280_t *p, double clk, double rate)
+{
+	//const c6280_interface *intf = (const c6280_interface *)device->static_config();
+ int i;
+ double step;
+
+ /* Loudest volume level for table */
+ //double level = 65535.0 / 6.0 / 32.0;
+	double level = 65536.0 / 6.0 / 32.0;
+
+ /* Clear context */
+ memset(p, 0, sizeof(c6280_t));
+
+ //p->device = device;
+ //p->cpudevice = device->machine().device(intf->cpu);
+ //if (p->cpudevice == NULL)
+ //	fatalerror("c6280_init: no CPU found with tag of '%s'\n", device->tag());
+
+ /* Make waveform frequency table */
+ for(i = 0; i < 4096; i += 1)
+ {
+ step = ((clk / rate) * 4096) / (i+1);
+ p->wave_freq_tab(1 + i) & 0xFFF = (UINT32)step;
+ }
+
+ /* Make noise frequency table */
+ for(i = 0; i < 32; i += 1)
+ {
+ step = ((clk / rate) * 32) / (i+1);
+ p->noise_freq_tabi = (UINT32)step;
+ }
+
+ /* Make volume table */
+ /* PSG has 48dB volume range spread over 32 steps */
+ step = 48.0 / 32.0;
+ for(i = 0; i < 31; i++)
+ {
+ p->volume_tablei = (UINT16)level;
+ level /= pow(10.0, step / 20.0);
+ }
+ p->volume_table31 = 0;
+}
+
+
+static void c6280_write(c6280_t *p, int offset, int data)
+{
+ t_channel *q = &p->channelp->select;
+
+ /* Update stream */
+ //p->stream->update();
+
+ switch(offset & 0x0F)
+ {
+ case 0x00: /* Channel select */
+ p->select = data & 0x07;
+ break;
+
+ case 0x01: /* Global balance */
+ p->balance = data;
+ break;
+
+ case 0x02: /* Channel frequency (LSB) */
+ q->frequency = (q->frequency & 0x0F00) | data;
+ q->frequency &= 0x0FFF;
+ break;
+
+ case 0x03: /* Channel frequency (MSB) */
+ q->frequency = (q->frequency & 0x00FF) | (data << 8);
+ q->frequency &= 0x0FFF;
+ break;
+
+ case 0x04: /* Channel control (key-on, DDA mode, volume) */
+
+ /* 1-to-0 transition of DDA bit resets waveform index */
+ if((q->control & 0x40) && ((data & 0x40) == 0))
+ {
+ q->index = 0;
+ }
+ q->control = data;
+ break;
+
+ case 0x05: /* Channel balance */
+ q->balance = data;
+ break;
+
+ case 0x06: /* Channel waveform data */
+
+ switch(q->control & 0xC0)
+ {
+ case 0x00:
+ q->waveformq->index & 0x1F = data & 0x1F;
+ q->index = (q->index + 1) & 0x1F;
+ break;
+
+ case 0x40:
+ break;
+
+ case 0x80:
+ q->waveformq->index & 0x1F = data & 0x1F;
+ q->index = (q->index + 1) & 0x1F;
+ break;
+
+ case 0xC0:
+ q->dda = data & 0x1F;
+ break;
+ }
+
+ break;
+
+ case 0x07: /* Noise control (enable, frequency) */
+ q->noise_control = data;
+ break;
+
+ case 0x08: /* LFO frequency */
+ p->lfo_frequency = data;
+ break;
+
+ case 0x09: /* LFO control (enable, mode) */
+ p->lfo_control = data;
+ break;
+
+ default:
+ break;
+ }
+}
+
+
+//static STREAM_UPDATE( c6280_update )
+void c6280m_update(void* param, stream_sample_t **outputs, int samples)
+{
+ static const int scale_tab = {
+ 0x00, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0D, 0x0F,
+ 0x10, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F
+ };
+ int ch;
+ int i;
+ c6280_t *p = (c6280_t *)param;
+
+ int lmal = (p->balance >> 4) & 0x0F;
+ int rmal = (p->balance >> 0) & 0x0F;
+ int vll, vlr;
+
+ lmal = scale_tablmal;
+ rmal = scale_tabrmal;
+
+ /* Clear buffer */
+ for(i = 0; i < samples; i++)
+ {
+ outputs0i = 0;
+ outputs1i = 0;
+ }
+
+ for(ch = 0; ch < 6; ch++)
+ {
+ /* Only look at enabled channels */
+ if((p->channelch.control & 0x80) && ! p->channelch.Muted)
+ {
+ int lal = (p->channelch.balance >> 4) & 0x0F;
+ int ral = (p->channelch.balance >> 0) & 0x0F;
+ int al = p->channelch.control & 0x1F;
+
+ lal = scale_tablal;
+ ral = scale_tabral;
+
+ /* Calculate volume just as the patent says */
+ vll = (0x1F - lal) + (0x1F - al) + (0x1F - lmal);
+ if(vll > 0x1F) vll = 0x1F;
+
+ vlr = (0x1F - ral) + (0x1F - al) + (0x1F - rmal);
+ if(vlr > 0x1F) vlr = 0x1F;
+
+ vll = p->volume_tablevll;
+ vlr = p->volume_tablevlr;
+
+ /* Check channel mode */
+ if((ch >= 4) && (p->channelch.noise_control & 0x80))
+ {
+ /* Noise mode */
+ UINT32 step = p->noise_freq_tab(p->channelch.noise_control & 0x1F) ^ 0x1F;
+ for(i = 0; i < samples; i += 1)
+ {
+ static int data = 0;
+ p->channelch.noise_counter += step;
+ if(p->channelch.noise_counter >= 0x800)
+ {
+ //data = (p->device->machine().rand() & 1) ? 0x1F : 0;
+						data = (rand() & 1) ? 0x1F : 0;
+ }
+ p->channelch.noise_counter &= 0x7FF;
+ outputs0i += (INT16)(vll * (data - 16));
+ outputs1i += (INT16)(vlr * (data - 16));
+ }
+ }
+ else
+ if(p->channelch.control & 0x40)
+ {
+ /* DDA mode */
+ for(i = 0; i < samples; i++)
+ {
+ outputs0i += (INT16)(vll * (p->channelch.dda - 16));
+ outputs1i += (INT16)(vlr * (p->channelch.dda - 16));
+ }
+ }
+ else
+ {
+ /* Waveform mode */
+ UINT32 step = p->wave_freq_tabp->channelch.frequency;
+ for(i = 0; i < samples; i += 1)
+ {
+ int offset;
+ INT16 data;
+ offset = (p->channelch.counter >> 12) & 0x1F;
+ p->channelch.counter += step;
+ p->channelch.counter &= 0x1FFFF;
+ data = p->channelch.waveformoffset;
+ outputs0i += (INT16)(vll * (data - 16));
+ outputs1i += (INT16)(vlr * (data - 16));
+ }
+ }
+ }
+ }
+}
+
+
+/*--------------------------------------------------------------------------*/
+/* MAME specific code */
+/*--------------------------------------------------------------------------*/
+
+//static DEVICE_START( c6280 )
+void* device_start_c6280m(int clock, int rate)
+{
+ //int rate = device->clock()/16;
+ //c6280_t *info = get_safe_token(device);
+	c6280_t *info;
+	UINT8 CurChn;
+
+	info = (c6280_t*)malloc(sizeof(c6280_t));
+	if (info == NULL)
+		return 0;
+	memset(info, 0x00, sizeof(c6280_t));
+	
+ /* Initialize PSG emulator */
+ //c6280_init(device, info, device->clock(), rate);
+	c6280_init(info, clock & 0x7FFFFFFF, rate);
+
+ /* Create stereo stream */
+ //info->stream = device->machine().sound().stream_alloc(*device, 0, 2, rate, info, c6280_update);
+	
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		info->channelCurChn.Muted = 0x00;
+	
+	return info;
+}
+
+void device_stop_c6280m(void* chip)
+{
+	c6280_t *info = (c6280_t *)chip;
+	
+	free(info);
+	
+	return;
+}
+
+void device_reset_c6280m(void* chip)
+{
+	c6280_t *info = (c6280_t *)chip;
+	UINT8 CurChn;
+	t_channel* TempChn;
+	
+	info->select = 0x00;
+	info->balance = 0x00;
+	info->lfo_frequency = 0x00;
+	info->lfo_control = 0x00;
+	
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+	{
+		TempChn = &info->channelCurChn;
+		
+		TempChn->frequency = 0x00;
+		TempChn->control = 0x00;
+		TempChn->balance = 0x00;
+		memset(TempChn->waveform, 0x00, 0x20);
+		TempChn->index = 0x00;
+		TempChn->dda = 0x00;
+		TempChn->noise_control = 0x00;
+		TempChn->noise_counter = 0x00;
+		TempChn->counter = 0x00;
+	}
+	
+	return;
+}
+
+//READ8_DEVICE_HANDLER( c6280_r )
+UINT8 c6280m_r(void* chip, offs_t offset)
+{
+ //c6280_t *info = get_safe_token(device);
+	c6280_t *info = (c6280_t *)chip;
+	//return h6280io_get_buffer(info->cpudevice);
+	if (offset == 0)
+		return info->select;
+	return 0;
+}
+
+//WRITE8_DEVICE_HANDLER( c6280_w )
+void c6280m_w(void* chip, offs_t offset, UINT8 data)
+{
+ //c6280_t *info = get_safe_token(device);
+	c6280_t *info = (c6280_t *)chip;
+	//h6280io_set_buffer(info->cpudevice, data);
+	c6280_write(info, offset, data);
+}
+
+
+void c6280m_set_mute_mask(void* chip, UINT32 MuteMask)
+{
+	c6280_t *info = (c6280_t *)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		info->channelCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( c6280 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(c6280_t);						break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( c6280 );			break;
+		case DEVINFO_FCT_STOP:							// nothing //									break;
+		case DEVINFO_FCT_RESET:							// nothing //									break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "HuC6280");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "????");						break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(C6280, c6280);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.c Added

@@ -0,0 +1,169 @@
+#include <stdlib.h>
+#include "mamedef.h"
+#ifdef ENABLE_ALL_CORES
+#include "c6280.h"
+#endif
+#include "Ootake_PSG.h"
+
+#ifdef ENABLE_ALL_CORES
+#define EC_MAME		0x01
+#endif
+#define EC_OOTAKE	0x00
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+typedef struct _c6280_state
+{
+	void* chip;
+	int EMU_CORE;
+} c6280_state;
+
+void c6280_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	c6280_state* info = (c6280_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		c6280m_update(info->chip, outputs, samples);
+		break;
+#endif
+	case EC_OOTAKE:
+		PSG_Mix(info->chip, outputs, samples);
+		break;
+	}
+}
+
+int device_start_c6280(void **_info, int EMU_CORE, int clock, int SampleRate, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	c6280_state* info;
+	int rate;
+
+#ifdef ENABLE_ALL_CORES
+	if (EMU_CORE >= 0x02)
+		EMU_CORE = EC_OOTAKE;
+#else
+	EMU_CORE = EC_OOTAKE;
+#endif
+	
+	info = (c6280_state *) calloc(1, sizeof(c6280_state));
+	*_info = (void *) info;
+ 
+	info->EMU_CORE = EMU_CORE;
+	switch(EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		rate = (clock & 0x7FFFFFFF)/16;
+		if (((CHIP_SAMPLING_MODE & 0x01) && rate < CHIP_SAMPLE_RATE) ||
+			CHIP_SAMPLING_MODE == 0x02)
+			rate = CHIP_SAMPLE_RATE;
+		
+		info->chip = device_start_c6280m(clock, rate);
+		if (info->chip == NULL)
+			return 0;
+		break;
+#endif
+	case EC_OOTAKE:
+		rate = SampleRate;
+		info->chip = PSG_Init(clock, rate);
+		if (info->chip == NULL)
+			return 0;
+		break;
+	}
+
+	return rate;
+}
+
+void device_stop_c6280(void *_info)
+{
+	c6280_state* info = (c6280_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		device_stop_c6280m(info->chip);
+		break;
+#endif
+	case EC_OOTAKE:
+		PSG_Deinit(info->chip);
+		break;
+	}
+	info->chip = NULL;
+
+	free(info);	
+
+	return;
+}
+
+void device_reset_c6280(void *_info)
+{
+	c6280_state* info = (c6280_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		device_reset_c6280m(info->chip);
+		break;
+#endif
+	case EC_OOTAKE:
+		PSG_ResetVolumeReg(info->chip);
+		break;
+	}
+	return;
+}
+
+UINT8 c6280_r(void *_info, offs_t offset)
+{
+	c6280_state* info = (c6280_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		return c6280m_r(info->chip, offset);
+#endif
+	case EC_OOTAKE:
+		return PSG_Read(info->chip, offset);
+	default:
+		return 0x00;
+	}
+}
+
+void c6280_w(void *_info, offs_t offset, UINT8 data)
+{
+	c6280_state* info = (c6280_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		c6280m_w(info->chip, offset, data);
+		break;
+#endif
+	case EC_OOTAKE:
+		PSG_Write(info->chip, offset, data);
+		break;
+	}
+	
+	return;
+}
+
+
+void c6280_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	c6280_state* info = (c6280_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		c6280m_set_mute_mask(info->chip, MuteMask);
+		break;
+#endif
+	case EC_OOTAKE:
+		PSG_SetMuteMask(info->chip, MuteMask);
+		break;
+	}
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/c6280intf.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.c Added

@@ -0,0 +1,496 @@
+// TODO: SCSP and (especially) WonderSwan
+ /************************
+ * DAC Stream Control *
+ ***********************/
+// (Custom Driver to handle PCM Streams of YM2612 DAC and PWM.)
+//
+// Written on 3 February 2011 by Valley Bell
+// Last Update: 04 October 2015
+//
+// Only for usage in non-commercial, VGM file related software.
+
+/* How it basically works:
+
+1. send command X with data Y at frequency F to chip C
+2. do that until you receive a STOP command, or until you sent N commands
+
+*/
+
+#include <stdlib.h>
+
+#include "mamedef.h"
+#include "dac_control.h"
+
+#include "../ChipMapper.h"
+
+#define DAC_SMPL_RATE	chip->SampleRate
+
+typedef struct _dac_control
+{
+	// Commands sent to dest-chip
+	UINT8 DstChipType;
+	UINT8 DstChipID;
+	UINT16 DstCommand;
+	UINT8 CmdSize;
+	
+	UINT32 Frequency;	// Frequency (Hz) at which the commands are sent
+	UINT32 DataLen;		// to protect from reading beyond End Of Data
+	const UINT8* Data;
+	UINT32 DataStart;	// Position where to start
+	UINT8 StepSize;		// usually 1, set to 2 for L/R interleaved data
+	UINT8 StepBase;		// usually 0, set to 0/1 for L/R interleaved data
+	UINT32 CmdsToSend;
+	
+	// Running Bits:	0 (01) - is playing
+	//					2 (04) - loop sample (simple loop from start to end)
+	//					4 (10) - already sent this command
+	//					7 (80) - disabled
+	UINT8 Running;
+	UINT8 Reverse;
+	UINT32 Step;		// Position in Player SampleRate
+	UINT32 Pos;			// Position in Data SampleRate
+	UINT32 RemainCmds;
+	UINT32 RealPos;		// true Position in Data (== Pos, if Reverse is off)
+	UINT8 DataStep;		// always StepSize * CmdSize
+
+	void* param;
+	UINT32 SampleRate;
+} dac_control;
+
+#ifndef NULL
+#define NULL	(void*)0
+#endif
+
+INLINE void daccontrol_SendCommand(dac_control *chip)
+{
+	UINT8 Port;
+	UINT8 Command;
+	UINT8 Data;
+	const UINT8* ChipData;
+	
+	if (chip->Running & 0x10)	// command already sent
+		return;
+	if (chip->DataStart + chip->RealPos >= chip->DataLen)
+		return;
+	
+	//if (! chip->Reverse)
+		ChipData = chip->Data + (chip->DataStart + chip->RealPos);
+	//else
+	//	ChipData = chip->Data + (chip->DataStart + chip->CmdsToSend - 1 - chip->Pos);
+	switch(chip->DstChipType)
+	{
+	// Support for the important chips
+	case 0x02:	// YM2612 (16-bit Register (actually 9 Bit), 8-bit Data)
+		Port = (chip->DstCommand & 0xFF00) >> 8;
+		Command = (chip->DstCommand & 0x00FF) >> 0;
+		Data = ChipData0x00;
+		chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, Port, Command, Data);
+		break;
+	case 0x11:	// PWM (4-bit Register, 12-bit Data)
+		Port = (chip->DstCommand & 0x000F) >> 0;
+		Command = ChipData0x01 & 0x0F;
+		Data = ChipData0x00;
+		chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, Port, Command, Data);
+		break;
+	// Support for other chips (mainly for completeness)
+	case 0x00:	// SN76496 (4-bit Register, 4-bit/10-bit Data)
+		Command = (chip->DstCommand & 0x00F0) >> 0;
+		Data = ChipData0x00 & 0x0F;
+		if (Command & 0x10)
+		{
+			// Volume Change (4-Bit value)
+			chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, 0x00, Command | Data);
+		}
+		else
+		{
+			// Frequency Write (10-Bit value)
+			Port = ((ChipData0x01 & 0x03) << 4) | ((ChipData0x00 & 0xF0) >> 4);
+			chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, 0x00, Command | Data);
+			chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, 0x00, Port);
+		}
+		break;
+	case 0x18:	// OKIM6295 - TODO: verify
+		Command = (chip->DstCommand & 0x00FF) >> 0;
+		Data = ChipData0x00;
+		
+		if (! Command)
+		{
+			Port = (chip->DstCommand & 0x0F00) >> 8;
+			if (Data & 0x80)
+			{
+				// Sample Start
+				// write sample ID
+				chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, Command, Data);
+				// write channel(s) that should play the sample
+				chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, Command, Port << 4);
+			}
+			else
+			{
+				// Sample Stop
+				chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, Command, Port << 3);
+			}
+		}
+		else
+		{
+			chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, Command, Data);
+		}
+		break;
+		// Generic support: 8-bit Register, 8-bit Data
+	case 0x01:	// YM2413
+	case 0x03:	// YM2151
+	case 0x06:	// YM2203
+	case 0x09:	// YM3812
+	case 0x0A:	// YM3526
+	case 0x0B:	// Y8950
+	case 0x0F:	// YMZ280B
+	case 0x12:	// AY8910
+	case 0x13:	// GameBoy DMG
+	case 0x14:	// NES APU
+//	case 0x15:	// MultiPCM
+	case 0x16:	// UPD7759
+	case 0x17:	// OKIM6258
+	case 0x1D:	// K053260 - TODO: Verify
+	case 0x1E:	// Pokey - TODO: Verify
+		Command = (chip->DstCommand & 0x00FF) >> 0;
+		Data = ChipData0x00;
+		chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, Command, Data);
+		break;
+		// Generic support: 16-bit Register, 8-bit Data
+	case 0x07:	// YM2608
+	case 0x08:	// YM2610/B
+	case 0x0C:	// YMF262
+	case 0x0D:	// YMF278B
+	case 0x0E:	// YMF271
+	case 0x19:	// K051649 - TODO: Verify
+	case 0x1A:	// K054539 - TODO: Verify
+	case 0x1C:	// C140 - TODO: Verify
+		Port = (chip->DstCommand & 0xFF00) >> 8;
+		Command = (chip->DstCommand & 0x00FF) >> 0;
+		Data = ChipData0x00;
+		chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, Port, Command, Data);
+		break;
+		// Generic support: 8-bit Register with Channel Select, 8-bit Data
+	case 0x05:	// RF5C68
+	case 0x10:	// RF5C164
+	case 0x1B:	// HuC6280
+		Port = (chip->DstCommand & 0xFF00) >> 8;
+		Command = (chip->DstCommand & 0x00FF) >> 0;
+		Data = ChipData0x00;
+		
+		if (Port == 0xFF)
+		{
+			chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, Command & 0x0F, Data);
+		}
+		else
+		{
+			UINT8 prevChn;
+			
+			prevChn = Port;	// by default don't restore channel
+			// get current channel for supported chips
+			if (chip->DstChipType == 0x05)
+				;	// TODO
+			else if (chip->DstChipType == 0x05)
+				;	// TODO
+			else if (chip->DstChipType == 0x1B)
+				prevChn = chip_reg_read(chip->param, 0x1B, chip->DstChipID, 0x00, 0x00);
+			
+			// Send Channel Select
+			chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, Command >> 4, Port);
+			// Send Data
+			chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, Command & 0x0F, Data);
+			// restore old channel
+			if (prevChn != Port)
+				chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, 0x00, Command >> 4, prevChn);
+		}
+		break;
+		// Generic support: 8-bit Register, 16-bit Data
+	case 0x1F:	// QSound
+		Command = (chip->DstCommand & 0x00FF) >> 0;
+		chip_reg_write(chip->param, chip->DstChipType, chip->DstChipID, ChipData0x00, ChipData0x01, Command);
+		break;
+	}
+	chip->Running |= 0x10;
+	
+	return;
+}
+
+INLINE UINT32 muldiv64round(UINT32 Multiplicand, UINT32 Multiplier, UINT32 Divisor)
+{
+	// Yes, I'm correctly rounding the values.
+	return (UINT32)(((UINT64)Multiplicand * Multiplier + Divisor / 2) / Divisor);
+}
+
+void daccontrol_update(void *_info, UINT32 samples)
+{
+	dac_control *chip = (dac_control *)_info;
+	UINT32 NewPos;
+	INT16 RealDataStp;
+	
+	if (chip->Running & 0x80)	// disabled
+		return;
+	if (! (chip->Running & 0x01))	// stopped
+		return;
+	
+	if (! chip->Reverse)
+		RealDataStp = chip->DataStep;
+	else
+		RealDataStp = -chip->DataStep;
+	
+	if (samples > 0x20)
+	{
+		// very effective Speed Hack for fast seeking
+		NewPos = chip->Step + (samples - 0x10);
+		NewPos = muldiv64round(NewPos * chip->DataStep, chip->Frequency, DAC_SMPL_RATE);
+		while(chip->RemainCmds && chip->Pos < NewPos)
+		{
+			chip->Pos += chip->DataStep;
+			chip->RealPos += RealDataStp;
+			chip->RemainCmds --;
+		}
+	}
+	
+	chip->Step += samples;
+	// Formula: Step * Freq / SampleRate
+	NewPos = muldiv64round(chip->Step * chip->DataStep, chip->Frequency, DAC_SMPL_RATE);
+	daccontrol_SendCommand(chip);
+	
+	while(chip->RemainCmds && chip->Pos < NewPos)
+	{
+		daccontrol_SendCommand(chip);
+		chip->Pos += chip->DataStep;
+		chip->RealPos += RealDataStp;
+		chip->Running &= ~0x10;
+		chip->RemainCmds --;
+	}
+	
+	if (! chip->RemainCmds && (chip->Running & 0x04))
+	{
+		// loop back to start
+		chip->RemainCmds = chip->CmdsToSend;
+		chip->Step = 0x00;
+		chip->Pos = 0x00;
+		if (! chip->Reverse)
+			chip->RealPos = 0x00;
+		else
+			chip->RealPos = (chip->CmdsToSend - 0x01) * chip->DataStep;
+	}
+	
+	if (! chip->RemainCmds)
+		chip->Running &= ~0x01;	// stop
+	
+	return;
+}
+
+UINT8 device_start_daccontrol(void **_info, void *param, int SampleRate)
+{
+	dac_control *chip;
+	
+	chip = (dac_control *) calloc(1, sizeof(dac_control));
+	*_info = (void *) chip;
+
+	chip->param = param;
+	chip->SampleRate = SampleRate;
+	
+	chip->DstChipType = 0xFF;
+	chip->DstChipID = 0x00;
+	chip->DstCommand = 0x0000;
+	
+	chip->Running = 0xFF;	// disable all actions (except setup_chip)
+	
+	return 1;
+}
+
+void device_stop_daccontrol(void *_info)
+{
+	dac_control *chip = (dac_control *)_info;
+	
+	chip->Running = 0xFF;
+
+	free(chip);
+	
+	return;
+}
+
+void device_reset_daccontrol(void *_info)
+{
+	dac_control *chip = (dac_control *)_info;
+	
+	chip->DstChipType = 0x00;
+	chip->DstChipID = 0x00;
+	chip->DstCommand = 0x00;
+	chip->CmdSize = 0x00;
+	
+	chip->Frequency = 0;
+	chip->DataLen = 0x00;
+	chip->Data = NULL;
+	chip->DataStart = 0x00;
+	chip->StepSize = 0x00;
+	chip->StepBase = 0x00;
+	
+	chip->Running = 0x00;
+	chip->Reverse = 0x00;
+	chip->Step = 0x00;
+	chip->Pos = 0x00;
+	chip->RealPos = 0x00;
+	chip->RemainCmds = 0x00;
+	chip->DataStep = 0x00;
+	
+	return;
+}
+
+void daccontrol_setup_chip(void *_info, UINT8 ChType, UINT8 ChNum, UINT16 Command)
+{
+	dac_control *chip = (dac_control *)_info;
+	
+	chip->DstChipType = ChType;	// TypeID (e.g. 0x02 for YM2612)
+	chip->DstChipID = ChNum;	// chip number (to send commands to 1st or 2nd chip)
+	chip->DstCommand = Command;	// Port and Command (would be 0x02A for YM2612)
+	
+	switch(chip->DstChipType)
+	{
+	case 0x00:	// SN76496
+		if (chip->DstCommand & 0x0010)
+			chip->CmdSize = 0x01;	// Volume Write
+		else
+			chip->CmdSize = 0x02;	// Frequency Write
+		break;
+	case 0x02:	// YM2612
+		chip->CmdSize = 0x01;
+		break;
+	case 0x11:	// PWM
+	case 0x1F:	// QSound
+		chip->CmdSize = 0x02;
+		break;
+	default:
+		chip->CmdSize = 0x01;
+		break;
+	}
+	chip->DataStep = chip->CmdSize * chip->StepSize;
+	
+	return;
+}
+
+void daccontrol_set_data(void *_info, UINT8* Data, UINT32 DataLen, UINT8 StepSize, UINT8 StepBase)
+{
+	dac_control *chip = (dac_control *)_info;
+	
+	if (chip->Running & 0x80)
+		return;
+	
+	if (DataLen && Data != NULL)
+	{
+		chip->DataLen = DataLen;
+		chip->Data = Data;
+	}
+	else
+	{
+		chip->DataLen = 0x00;
+		chip->Data = NULL;
+	}
+	chip->StepSize = StepSize ? StepSize : 1;
+	chip->StepBase = StepBase;
+	chip->DataStep = chip->CmdSize * chip->StepSize;
+	
+	return;
+}
+
+void daccontrol_refresh_data(void *_info, UINT8* Data, UINT32 DataLen)
+{
+	// Should be called to fix the data pointer. (e.g. after a realloc)
+	dac_control *chip = (dac_control *)_info;
+	
+	if (chip->Running & 0x80)
+		return;
+	
+	if (DataLen && Data != NULL)
+	{
+		chip->DataLen = DataLen;
+		chip->Data = Data;
+	}
+	else
+	{
+		chip->DataLen = 0x00;
+		chip->Data = NULL;
+	}
+	
+	return;
+}
+
+void daccontrol_set_frequency(void *_info, UINT32 Frequency)
+{
+	dac_control *chip = (dac_control *)_info;
+	
+	if (chip->Running & 0x80)
+		return;
+	
+	chip->Frequency = Frequency;
+	
+	return;
+}
+
+void daccontrol_start(void *_info, UINT32 DataPos, UINT8 LenMode, UINT32 Length)
+{
+	dac_control *chip = (dac_control *)_info;
+	UINT16 CmdStepBase;
+	
+	if (chip->Running & 0x80)
+		return;
+	
+	CmdStepBase = chip->CmdSize * chip->StepBase;
+	if (DataPos != 0xFFFFFFFF)	// skip setting DataStart, if Pos == -1
+	{
+		chip->DataStart = DataPos + CmdStepBase;
+		if (chip->DataStart > chip->DataLen)	// catch bad value and force silence
+			chip->DataStart = chip->DataLen;
+	}
+	
+	switch(LenMode & 0x0F)
+	{
+	case DCTRL_LMODE_IGNORE:	// Length is already set - ignore
+		break;
+	case DCTRL_LMODE_CMDS:		// Length = number of commands
+		chip->CmdsToSend = Length;
+		break;
+	case DCTRL_LMODE_MSEC:		// Length = time in msec
+		chip->CmdsToSend = 1000 * Length / chip->Frequency;
+		break;
+	case DCTRL_LMODE_TOEND:		// play unti stop-command is received (or data-end is reached)
+		chip->CmdsToSend = (chip->DataLen - (chip->DataStart - CmdStepBase)) / chip->DataStep;
+		break;
+	case DCTRL_LMODE_BYTES:		// raw byte count
+		chip->CmdsToSend = Length / chip->DataStep;
+		break;
+	default:
+		chip->CmdsToSend = 0x00;
+		break;
+	}
+	chip->Reverse = (LenMode & 0x10) >> 4;
+	
+	chip->RemainCmds = chip->CmdsToSend;
+	chip->Step = 0x00;
+	chip->Pos = 0x00;
+	if (! chip->Reverse)
+		chip->RealPos = 0x00;
+	else
+		chip->RealPos = (chip->CmdsToSend - 0x01) * chip->DataStep;
+	
+	chip->Running &= ~0x04;
+	chip->Running |= (LenMode & 0x80) ? 0x04 : 0x00;	// set loop mode
+	
+	chip->Running |= 0x01;	// start
+	chip->Running &= ~0x10;	// command isn't yet sent
+	
+	return;
+}
+
+void daccontrol_stop(void *_info)
+{
+	dac_control *chip = (dac_control *)_info;
+	
+	if (chip->Running & 0x80)
+		return;
+	
+	chip->Running &= ~0x01;	// stop
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/dac_control.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.c Added

@@ -0,0 +1,524 @@
+/****************************************************************************
+
+ emu2149.c -- YM2149/AY-3-8910 emulator by Mitsutaka Okazaki 2001
+
+ 2001 04-28 : Version 1.00beta -- 1st Beta Release.
+ 2001 08-14 : Version 1.10
+ 2001 10-03 : Version 1.11 -- Added PSG_set_quality().
+ 2002 03-02 : Version 1.12 -- Removed PSG_init & PSG_close.
+ 2002 10-13 : Version 1.14 -- Fixed the envelope unit.
+ 2003 09-19 : Version 1.15 -- Added PSG_setMask and PSG_toggleMask
+ 2004 01-11 : Version 1.16 -- Fixed an envelope problem where the envelope 
+ frequency register is written before key-on.
+ 
+ References: 
+ psg.vhd -- 2000 written by Kazuhiro Tsujikawa.
+ s_fme7.c -- 1999,2000 written by Mamiya (NEZplug).
+ ay8910.c -- 1998-2001 Author unknown (MAME).
+ MSX-Datapack -- 1991 ASCII Corp.
+ AY-3-8910 data sheet
+ 
+*****************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "emu2149.h"
+
+static e_uint32 voltbl232 = {
+ {0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x07, 0x09,
+ 0x0B, 0x0D, 0x0F, 0x12,
+ 0x16, 0x1A, 0x1F, 0x25, 0x2D, 0x35, 0x3F, 0x4C, 0x5A, 0x6A, 0x7F, 0x97,
+ 0xB4, 0xD6, 0xEB, 0xFF},
+ {0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x05, 0x05, 0x07, 0x07,
+ 0x0B, 0x0B, 0x0F, 0x0F,
+ 0x16, 0x16, 0x1F, 0x1F, 0x2D, 0x2D, 0x3F, 0x3F, 0x5A, 0x5A, 0x7F, 0x7F,
+ 0xB4, 0xB4, 0xFF, 0xFF}
+};
+
+#define GETA_BITS 24
+
+static void
+internal_refresh (PSG * psg)
+{
+ if (psg->quality)
+ {
+ psg->base_incr = 1 << GETA_BITS;
+ psg->realstep = (e_uint32) ((1 << 31) / psg->rate);
+ psg->psgstep = (e_uint32) ((1 << 31) / (psg->clk / 8));
+ psg->psgtime = 0;
+ }
+ else
+ {
+ psg->base_incr =
+ (e_uint32) ((double) psg->clk * (1 << GETA_BITS) / (8.0 * psg->rate));
+ }
+}
+
+EMU2149_API void
+PSG_set_clock(PSG * psg, e_uint32 c)
+{
+ psg->clk = c;
+ internal_refresh(psg);
+}
+
+EMU2149_API void
+PSG_set_rate (PSG * psg, e_uint32 r)
+{
+ psg->rate = r ? r : 44100;
+ internal_refresh (psg);
+}
+
+EMU2149_API void
+PSG_set_quality (PSG * psg, e_uint32 q)
+{
+ psg->quality = q;
+ internal_refresh (psg);
+}
+
+EMU2149_API PSG *
+PSG_new (e_uint32 c, e_uint32 r)
+{
+ PSG *psg;
+
+ psg = (PSG *) malloc (sizeof (PSG));
+ if (psg == NULL)
+ return NULL;
+ memset(psg, 0x00, sizeof(PSG));
+
+ PSG_setVolumeMode (psg, EMU2149_VOL_DEFAULT);
+ psg->clk = c;
+ psg->rate = r ? r : 44100;
+ PSG_set_quality (psg, 0);
+ psg->stereo_mask0 = 0x03;
+ psg->stereo_mask1 = 0x03;
+ psg->stereo_mask2 = 0x03;
+
+ return psg;
+}
+
+EMU2149_API void
+PSG_setFlags (PSG * psg, e_uint8 flags)
+{
+	if (flags & EMU2149_ZX_STEREO)
+	{
+		// ABC Stereo
+		psg->stereo_mask0 = 0x01;
+		psg->stereo_mask1 = 0x03;
+		psg->stereo_mask2 = 0x02;
+	}
+	else
+	{
+		psg->stereo_mask0 = 0x03;
+		psg->stereo_mask1 = 0x03;
+		psg->stereo_mask2 = 0x03;
+	}
+	
+	return;
+}
+
+EMU2149_API void
+PSG_setVolumeMode (PSG * psg, int type)
+{
+ switch (type)
+ {
+ case 1:
+ psg->voltbl = voltblEMU2149_VOL_YM2149;
+ break;
+ case 2:
+ psg->voltbl = voltblEMU2149_VOL_AY_3_8910;
+ break;
+ default:
+ psg->voltbl = voltblEMU2149_VOL_DEFAULT;
+ break;
+ }
+}
+
+EMU2149_API e_uint32
+PSG_setMask (PSG *psg, e_uint32 mask)
+{
+ e_uint32 ret = 0;
+ if(psg)
+ {
+ ret = psg->mask;
+ psg->mask = mask;
+ } 
+ return ret;
+}
+
+EMU2149_API e_uint32
+PSG_toggleMask (PSG *psg, e_uint32 mask)
+{
+ e_uint32 ret = 0;
+ if(psg)
+ {
+ ret = psg->mask;
+ psg->mask ^= mask;
+ }
+ return ret;
+}
+
+EMU2149_API void
+PSG_reset (PSG * psg)
+{
+ int i;
+
+ psg->base_count = 0;
+
+ for (i = 0; i < 3; i++)
+ {
+ psg->couti = 0;
+ psg->counti = 0x1000;
+ psg->freqi = 0;
+ psg->edgei = 0;
+ psg->volumei = 0;
+ }
+
+ psg->mask = 0;
+
+ for (i = 0; i < 16; i++)
+ psg->regi = 0;
+ psg->adr = 0;
+
+ psg->noise_seed = 0xffff;
+ psg->noise_count = 0x40;
+ psg->noise_freq = 0;
+
+ psg->env_volume = 0;
+ psg->env_ptr = 0;
+ psg->env_freq = 0;
+ psg->env_count = 0;
+ psg->env_pause = 1;
+
+ psg->out = 0;
+}
+
+EMU2149_API void
+PSG_delete (PSG * psg)
+{
+ free (psg);
+}
+
+EMU2149_API e_uint8
+PSG_readIO (PSG * psg)
+{
+ return (e_uint8) (psg->regpsg->adr);
+}
+
+EMU2149_API e_uint8
+PSG_readReg (PSG * psg, e_uint32 reg)
+{
+ return (e_uint8) (psg->regreg & 0x1f);
+
+}
+
+EMU2149_API void
+PSG_writeIO (PSG * psg, e_uint32 adr, e_uint32 val)
+{
+ if (adr & 1)
+ PSG_writeReg (psg, psg->adr, val);
+ else
+ psg->adr = val & 0x1f;
+}
+
+INLINE static e_int16
+calc (PSG * psg)
+{
+
+ int i, noise;
+ e_uint32 incr;
+ e_int32 mix = 0;
+
+ psg->base_count += psg->base_incr;
+ incr = (psg->base_count >> GETA_BITS);
+ psg->base_count &= (1 << GETA_BITS) - 1;
+
+ /* Envelope */
+ psg->env_count += incr;
+ while (psg->env_count>=0x10000 && psg->env_freq!=0)
+ {
+ if (!psg->env_pause)
+ {
+ if(psg->env_face)
+ psg->env_ptr = (psg->env_ptr + 1) & 0x3f ; 
+ else
+ psg->env_ptr = (psg->env_ptr + 0x3f) & 0x3f;
+ }
+
+ if (psg->env_ptr & 0x20) /* if carry or borrow */
+ {
+ if (psg->env_continue)
+ {
+ if (psg->env_alternate^psg->env_hold) psg->env_face ^= 1;
+ if (psg->env_hold) psg->env_pause = 1;
+ psg->env_ptr = psg->env_face?0:0x1f; 
+ }
+ else
+ {
+ psg->env_pause = 1;
+ psg->env_ptr = 0;
+ }
+ }
+
+ psg->env_count -= psg->env_freq;
+ }
+
+ /* Noise */
+ psg->noise_count += incr;
+ if (psg->noise_count & 0x40)
+ {
+ if (psg->noise_seed & 1)
+ psg->noise_seed ^= 0x24000;
+ psg->noise_seed >>= 1;
+ psg->noise_count -= psg->noise_freq;
+ }
+ noise = psg->noise_seed & 1;
+
+ /* Tone */
+ for (i = 0; i < 3; i++)
+ {
+ psg->counti += incr;
+ if (psg->counti & 0x1000)
+ {
+ if (psg->freqi > 1)
+ {
+ psg->edgei = !psg->edgei;
+ psg->counti -= psg->freqi;
+ }
+ else
+ {
+ psg->edgei = 1;
+ }
+ }
+
+ psg->couti = 0; // BS maintaining cout for stereo mix
+
+ if (psg->mask&PSG_MASK_CH(i))
+ continue;
+
+ if ((psg->tmaski || psg->edgei) && (psg->nmaski || noise))
+ {
+ if (!(psg->volumei & 32))
+ psg->couti = psg->voltblpsg->volumei & 31;
+ else
+ psg->couti = psg->voltblpsg->env_ptr;
+
+ mix += psg->couti;
+ }
+ }
+
+ return (e_int16) mix;
+}
+
+EMU2149_API e_int16
+PSG_calc (PSG * psg)
+{
+ if (!psg->quality)
+ return (e_int16) (calc (psg) << 4);
+
+ /* Simple rate converter */
+ while (psg->realstep > psg->psgtime)
+ {
+ psg->psgtime += psg->psgstep;
+ psg->out += calc (psg);
+ psg->out >>= 1;
+ }
+
+ psg->psgtime = psg->psgtime - psg->realstep;
+
+ return (e_int16) (psg->out << 4);
+}
+
+INLINE static void
+calc_stereo (PSG * psg, e_int32 out2)
+{
+ int i, noise;
+ e_uint32 incr;
+ e_int32 l = 0, r = 0;
+
+ psg->base_count += psg->base_incr;
+ incr = (psg->base_count >> GETA_BITS);
+ psg->base_count &= (1 << GETA_BITS) - 1;
+
+ /* Envelope */
+ psg->env_count += incr;
+ while (psg->env_count>=0x10000 && psg->env_freq!=0)
+ {
+ if (!psg->env_pause)
+ {
+ if(psg->env_face)
+ psg->env_ptr = (psg->env_ptr + 1) & 0x3f ; 
+ else
+ psg->env_ptr = (psg->env_ptr + 0x3f) & 0x3f;
+ }
+
+ if (psg->env_ptr & 0x20) /* if carry or borrow */
+ {
+ if (psg->env_continue)
+ {
+ if (psg->env_alternate^psg->env_hold) psg->env_face ^= 1;
+ if (psg->env_hold) psg->env_pause = 1;
+ psg->env_ptr = psg->env_face?0:0x1f; 
+ }
+ else
+ {
+ psg->env_pause = 1;
+ psg->env_ptr = 0;
+ }
+ }
+
+ psg->env_count -= psg->env_freq;
+ }
+
+ /* Noise */
+ psg->noise_count += incr;
+ if (psg->noise_count & 0x40)
+ {
+ if (psg->noise_seed & 1)
+ psg->noise_seed ^= 0x24000;
+ psg->noise_seed >>= 1;
+ psg->noise_count -= psg->noise_freq;
+ }
+ noise = psg->noise_seed & 1;
+
+ /* Tone */
+ for (i = 0; i < 3; i++)
+ {
+ psg->counti += incr;
+ if (psg->counti & 0x1000)
+ {
+ if (psg->freqi > 1)
+ {
+ psg->edgei = !psg->edgei;
+ psg->counti -= psg->freqi;
+ }
+ else
+ {
+ psg->edgei = 1;
+ }
+ }
+
+ psg->couti = 0; // BS maintaining cout for stereo mix
+
+ if (psg->mask&PSG_MASK_CH(i))
+ continue;
+
+ if ((psg->tmaski || psg->edgei) && (psg->nmaski || noise))
+ {
+ if (!(psg->volumei & 32))
+ psg->couti = psg->voltblpsg->volumei & 31;
+ else
+ psg->couti = psg->voltblpsg->env_ptr;
+
+ if (psg->stereo_maski & 0x01)
+ l += psg->couti;
+ if (psg->stereo_maski & 0x02)
+ r += psg->couti;
+ }
+ }
+
+ out0 = l << 5;
+ out1 = r << 5;
+
+ return;
+}
+
+EMU2149_API void
+PSG_calc_stereo (PSG * psg, e_int32 **out, e_int32 samples)
+{
+ e_int32 *bufMO = out0;
+ e_int32 *bufRO = out1;
+ e_int32 buffers2;
+
+ int i;
+
+ for (i = 0; i < samples; i ++)
+ {
+ if (!psg->quality)
+ {
+ calc_stereo (psg, buffers);
+ bufMOi = buffers0;
+ bufROi = buffers1;
+ }
+ else
+ {
+ while (psg->realstep > psg->psgtime)
+ { 
+ psg->psgtime += psg->psgstep;
+ psg->sprev0 = psg->snext0;
+ psg->sprev1 = psg->snext1;
+ calc_stereo (psg, psg->snext);
+ }
+
+ psg->psgtime -= psg->realstep;
+ bufMOi = (e_int32) (((double) psg->snext0 * (psg->psgstep - psg->psgtime)
+ + (double) psg->sprev0 * psg->psgtime) / psg->psgstep);
+ bufROi = (e_int32) (((double) psg->snext1 * (psg->psgstep - psg->psgtime)
+ + (double) psg->sprev1 * psg->psgtime) / psg->psgstep);
+ }
+ }
+}
+
+EMU2149_API void
+PSG_writeReg (PSG * psg, e_uint32 reg, e_uint32 val)
+{
+ int c;
+
+ if (reg > 15) return;
+
+ psg->regreg = (e_uint8) (val & 0xff);
+ switch (reg)
+ {
+ case 0:
+ case 2:
+ case 4:
+ case 1:
+ case 3:
+ case 5:
+ c = reg >> 1;
+ psg->freqc = ((psg->regc * 2 + 1 & 15) << 8) + psg->regc * 2;
+ break;
+
+ case 6:
+ psg->noise_freq = (val == 0) ? 1 : ((val & 31) << 1);
+ break;
+
+ case 7:
+ psg->tmask0 = (val & 1);
+ psg->tmask1 = (val & 2);
+ psg->tmask2 = (val & 4);
+ psg->nmask0 = (val & 8);
+ psg->nmask1 = (val & 16);
+ psg->nmask2 = (val & 32);
+ break;
+
+ case 8:
+ case 9:
+ case 10:
+ psg->volumereg - 8 = val << 1;
+
+ break;
+
+ case 11:
+ case 12:
+ psg->env_freq = (psg->reg12 << 8) + psg->reg11;
+ break;
+
+ case 13:
+ psg->env_continue = (val >> 3) & 1;
+ psg->env_attack = (val >> 2) & 1;
+ psg->env_alternate = (val >> 1) & 1;
+ psg->env_hold = val & 1;
+ psg->env_face = psg->env_attack;
+ psg->env_pause = 0;
+ psg->env_count = 0x10000 - psg->env_freq;
+ psg->env_ptr = psg->env_face?0:0x1f;
+ break;
+
+ case 14:
+ case 15:
+ default:
+ break;
+ }
+
+ return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2149.h Added

@@ -0,0 +1,102 @@
+/* emu2149.h */
+#ifndef _EMU2149_H_
+#define _EMU2149_H_
+#include "emutypes.h"
+
+/*#ifdef EMU2149_DLL_EXPORTS
+#define EMU2149_API __declspec(dllexport)
+#elif EMU2149_DLL_IMPORTS
+#define EMU2149_API __declspec(dllimport)
+#else*/
+#define EMU2149_API
+//#endif
+
+#define EMU2149_VOL_DEFAULT 1
+#define EMU2149_VOL_YM2149 0
+#define EMU2149_VOL_AY_3_8910 1
+
+#define EMU2149_ZX_STEREO			0x80
+
+#define PSG_MASK_CH(x) (1<<(x))
+
+/*#ifdef __cplusplus
+extern "C"
+{
+#endif*/
+
+ typedef struct __PSG
+ {
+
+ /* Volume Table */
+ e_uint32 *voltbl;
+
+ e_uint8 reg0x20;
+ e_int32 out;
+ e_int32 cout3;
+
+ e_uint32 clk, rate, base_incr, quality;
+
+ e_uint32 count3;
+ e_uint32 volume3;
+ e_uint32 freq3;
+ e_uint32 edge3;
+ e_uint32 tmask3;
+ e_uint32 nmask3;
+ e_uint32 mask;
+ e_uint32 stereo_mask3;
+
+ e_uint32 base_count;
+
+ e_uint32 env_volume;
+ e_uint32 env_ptr;
+ e_uint32 env_face;
+
+ e_uint32 env_continue;
+ e_uint32 env_attack;
+ e_uint32 env_alternate;
+ e_uint32 env_hold;
+ e_uint32 env_pause;
+ e_uint32 env_reset;
+
+ e_uint32 env_freq;
+ e_uint32 env_count;
+
+ e_uint32 noise_seed;
+ e_uint32 noise_count;
+ e_uint32 noise_freq;
+
+ /* rate converter */
+ e_uint32 realstep;
+ e_uint32 psgtime;
+ e_uint32 psgstep;
+ e_int32 prev, next;
+ e_int32 sprev2, snext2;
+
+ /* I/O Ctrl */
+ e_uint32 adr;
+
+ }
+ PSG;
+
+ EMU2149_API void PSG_set_quality (PSG * psg, e_uint32 q);
+ EMU2149_API void PSG_set_clock(PSG * psg, e_uint32 c);
+ EMU2149_API void PSG_set_rate (PSG * psg, e_uint32 r);
+ EMU2149_API PSG *PSG_new (e_uint32 clk, e_uint32 rate);
+ EMU2149_API void PSG_reset (PSG *);
+ EMU2149_API void PSG_delete (PSG *);
+ EMU2149_API void PSG_writeReg (PSG *, e_uint32 reg, e_uint32 val);
+ EMU2149_API void PSG_writeIO (PSG * psg, e_uint32 adr, e_uint32 val);
+ EMU2149_API e_uint8 PSG_readReg (PSG * psg, e_uint32 reg);
+ EMU2149_API e_uint8 PSG_readIO (PSG * psg);
+ EMU2149_API e_int16 PSG_calc (PSG *);
+ EMU2149_API void PSG_calc_stereo (PSG * psg, e_int32 **out, e_int32 samples);
+ EMU2149_API void PSG_setFlags (PSG * psg, e_uint8 flags);
+ EMU2149_API void PSG_setVolumeMode (PSG * psg, int type);
+ EMU2149_API e_uint32 PSG_setMask (PSG *, e_uint32 mask);
+ EMU2149_API e_uint32 PSG_toggleMask (PSG *, e_uint32 mask);
+ 
+/*#ifdef __cplusplus
+}
+#endif*/
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.c Added

@@ -0,0 +1,2127 @@
+/***********************************************************************************
+
+ emu2413.c -- YM2413 emulator written by Mitsutaka Okazaki 2001
+
+ 2001 01-08 : Version 0.10 -- 1st version.
+ 2001 01-15 : Version 0.20 -- semi-public version.
+ 2001 01-16 : Version 0.30 -- 1st public version.
+ 2001 01-17 : Version 0.31 -- Fixed bassdrum problem.
+ : Version 0.32 -- LPF implemented.
+ 2001 01-18 : Version 0.33 -- Fixed the drum problem, refine the mix-down method.
+ -- Fixed the LFO bug.
+ 2001 01-24 : Version 0.35 -- Fixed the drum problem,
+ support undocumented EG behavior.
+ 2001 02-02 : Version 0.38 -- Improved the performance.
+ Fixed the hi-hat and cymbal model.
+ Fixed the default percussive datas.
+ Noise reduction.
+ Fixed the feedback problem.
+ 2001 03-03 : Version 0.39 -- Fixed some drum bugs.
+ Improved the performance.
+ 2001 03-04 : Version 0.40 -- Improved the feedback.
+ Change the default table size.
+ Clock and Rate can be changed during play.
+ 2001 06-24 : Version 0.50 -- Improved the hi-hat and the cymbal tone.
+ Added VRC7 patch (OPLL_reset_patch is changed).
+ Fixed OPLL_reset() bug.
+ Added OPLL_setMask, OPLL_getMask and OPLL_toggleMask.
+ Added OPLL_writeIO.
+ 2001 09-28 : Version 0.51 -- Removed the noise table.
+ 2002 01-28 : Version 0.52 -- Added Stereo mode.
+ 2002 02-07 : Version 0.53 -- Fixed some drum bugs.
+ 2002 02-20 : Version 0.54 -- Added the best quality mode.
+ 2002 03-02 : Version 0.55 -- Removed OPLL_init & OPLL_close.
+ 2002 05-30 : Version 0.60 -- Fixed HH&CYM generator and all voice datas.
+ 2004 04-10 : Version 0.61 -- Added YMF281B tone (defined by Chabin).
+
+ References:
+ fmopl.c -- 1999,2000 written by Tatsuyuki Satoh (MAME development).
+ fmopl.c(fixed) -- (C) 2002 Jarek Burczynski.
+ s_opl.c -- 2001 written by Mamiya (NEZplug development).
+ fmgen.cpp -- 1999,2000 written by cisc.
+ fmpac.ill -- 2000 created by NARUTO.
+ MSX-Datapack
+ YMU757 data sheet
+ YM2143 data sheet
+
+**************************************************************************************/
+
+/**
+ * Additions by Maxim:
+ * - per-channel panning
+ *
+ **/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "mamedef.h"
+#undef INLINE
+#include "emu2413.h"
+#include "panning.h" // Maxim
+
+/*#ifdef EMU2413_COMPACTION
+#define OPLL_TONE_NUM 1
+static unsigned char default_instOPLL_TONE_NUM(16 + 3) * 16 = {
+ {
+#include "2413tone.h"
+ }
+};
+#else
+#define OPLL_TONE_NUM 3
+static unsigned char default_instOPLL_TONE_NUM(16 + 3) * 16 = {
+ {
+#include "2413tone.h"
+ },
+ {
+#include "vrc7tone.h"
+ },
+ {
+#include "281btone.h"
+ }
+};
+#endif*/
+
+// Note: Dump size changed to 8 per instrument, since 9-15 were unused. -VB
+#define OPLL_TONE_NUM 1
+static unsigned char default_instOPLL_TONE_NUM(16 + 3) * 8 = {
+ {
+#include "2413tone.h"
+ }
+};
+
+/* Size of Sintable ( 8 -- 18 can be used. 9 recommended.) */
+#define PG_BITS 9
+#define PG_WIDTH (1<<PG_BITS)
+
+/* Phase increment counter */
+#define DP_BITS 18
+#define DP_WIDTH (1<<DP_BITS)
+#define DP_BASE_BITS (DP_BITS - PG_BITS)
+
+/* Dynamic range (Accuracy of sin table) */
+#define DB_BITS 8
+#define DB_STEP (48.0/(1<<DB_BITS))
+#define DB_MUTE (1<<DB_BITS)
+
+/* Dynamic range of envelope */
+#define EG_STEP 0.375
+#define EG_BITS 7
+#define EG_MUTE (1<<EG_BITS)
+
+/* Dynamic range of total level */
+#define TL_STEP 0.75
+#define TL_BITS 6
+#define TL_MUTE (1<<TL_BITS)
+
+/* Dynamic range of sustine level */
+#define SL_STEP 3.0
+#define SL_BITS 4
+#define SL_MUTE (1<<SL_BITS)
+
+#define EG2DB(d) ((d)*(e_int32)(EG_STEP/DB_STEP))
+#define TL2EG(d) ((d)*(e_int32)(TL_STEP/EG_STEP))
+#define SL2EG(d) ((d)*(e_int32)(SL_STEP/EG_STEP))
+
+#define DB_POS(x) (e_uint32)((x)/DB_STEP)
+#define DB_NEG(x) (e_uint32)(DB_MUTE+DB_MUTE+(x)/DB_STEP)
+
+/* Bits for liner value */
+#define DB2LIN_AMP_BITS 8
+#define SLOT_AMP_BITS (DB2LIN_AMP_BITS)
+
+/* Bits for envelope phase incremental counter */
+#define EG_DP_BITS 22
+#define EG_DP_WIDTH (1<<EG_DP_BITS)
+
+/* Bits for Pitch and Amp modulator */
+#define PM_PG_BITS 8
+#define PM_PG_WIDTH (1<<PM_PG_BITS)
+#define PM_DP_BITS 16
+#define PM_DP_WIDTH (1<<PM_DP_BITS)
+#define AM_PG_BITS 8
+#define AM_PG_WIDTH (1<<AM_PG_BITS)
+#define AM_DP_BITS 16
+#define AM_DP_WIDTH (1<<AM_DP_BITS)
+
+/* PM table is calcurated by PM_AMP * pow(2,PM_DEPTH*sin(x)/1200) */
+#define PM_AMP_BITS 8
+#define PM_AMP (1<<PM_AMP_BITS)
+
+/* PM speed(Hz) and depth(cent) */
+#define PM_SPEED 6.4
+#define PM_DEPTH 13.75
+
+/* AM speed(Hz) and depth(dB) */
+#define AM_SPEED 3.6413
+#define AM_DEPTH 4.875
+
+/* Cut the lower b bit(s) off. */
+#define HIGHBITS(c,b) ((c)>>(b))
+
+/* Leave the lower b bit(s). */
+#define LOWBITS(c,b) ((c)&((1<<(b))-1))
+
+/* Expand x which is s bits to d bits. */
+#define EXPAND_BITS(x,s,d) ((x)<<((d)-(s)))
+
+/* Expand x which is s bits to d bits and fill expanded bits '1' */
+#define EXPAND_BITS_X(x,s,d) (((x)<<((d)-(s)))|((1<<((d)-(s)))-1))
+
+/* Adjust envelope speed which depends on sampling rate. */
+#define RATE_ADJUST(x) (rate==49716?x:(e_uint32)((double)(x)*clk/72/rate + 0.5)) /* added 0.5 to round the value*/
+
+#define MOD(o,x) (&(o)->slot(x)<<1)
+#define CAR(o,x) (&(o)->slot((x)<<1)|1)
+
+#define BIT(s,b) (((s)>>(b))&1)
+
+/* Input clock */
+static e_uint32 clk = 844451141;
+/* Sampling rate */
+static e_uint32 rate = 3354932;
+
+/* WaveTable for each envelope amp */
+static e_uint16 fullsintablePG_WIDTH;
+static e_uint16 halfsintablePG_WIDTH;
+
+static e_uint16 *waveform2 = { fullsintable, halfsintable };
+
+/* LFO Table */
+static e_int32 pmtablePM_PG_WIDTH;
+static e_int32 amtableAM_PG_WIDTH;
+
+/* Phase delta for LFO */
+static e_uint32 pm_dphase;
+static e_uint32 am_dphase;
+
+/* dB to Liner table */
+static e_int16 DB2LIN_TABLE(DB_MUTE + DB_MUTE) * 2;
+
+/* Liner to Log curve conversion table (for Attack rate). */
+static e_uint16 AR_ADJUST_TABLE1 << EG_BITS;
+
+/* Empty voice data */
+static OPLL_PATCH null_patch = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
+/* Basic voice Data */
+static OPLL_PATCH default_patchOPLL_TONE_NUM(16 + 3) * 2;
+
+/* Definition of envelope mode */
+enum OPLL_EG_STATE
+{ READY, ATTACK, DECAY, SUSHOLD, SUSTINE, RELEASE, SETTLE, FINISH };
+
+/* Phase incr table for Attack */
+static e_uint32 dphaseARTable1616;
+/* Phase incr table for Decay and Release */
+static e_uint32 dphaseDRTable1616;
+
+/* KSL + TL Table */
+static e_uint32 tllTable1681 << TL_BITS4;
+static e_int32 rksTable282;
+
+/* Phase incr table for PG */
+static e_uint32 dphaseTable512816;
+
+/***************************************************
+
+ Create tables
+
+****************************************************/
+INLINE static e_int32
+Min (e_int32 i, e_int32 j)
+{
+ if (i < j)
+ return i;
+ else
+ return j;
+}
+
+/* Table for AR to LogCurve. */
+static void
+makeAdjustTable (void)
+{
+ e_int32 i;
+
+ AR_ADJUST_TABLE0 = (1 << EG_BITS) - 1;
+ for (i = 1; i < (1<<EG_BITS); i++)
+ AR_ADJUST_TABLEi = (e_uint16) ((double) (1<<EG_BITS)-1 - ((1<<EG_BITS)-1)*log(i)/log(127));
+}
+
+
+/* Table for dB(0 -- (1<<DB_BITS)-1) to Liner(0 -- DB2LIN_AMP_WIDTH) */
+static void
+makeDB2LinTable (void)
+{
+ e_int32 i;
+
+ for (i = 0; i < DB_MUTE + DB_MUTE; i++)
+ {
+ DB2LIN_TABLEi = (e_int16) ((double) ((1 << DB2LIN_AMP_BITS) - 1) * pow (10, -(double) i * DB_STEP / 20));
+ if (i >= DB_MUTE) DB2LIN_TABLEi = 0;
+ DB2LIN_TABLEi + DB_MUTE + DB_MUTE = (e_int16) (-DB2LIN_TABLEi);
+ }
+}
+
+/* Liner(+0.0 - +1.0) to dB((1<<DB_BITS) - 1 -- 0) */
+static e_int32
+lin2db (double d)
+{
+ if (d == 0)
+ return (DB_MUTE - 1);
+ else
+ return Min (-(e_int32) (20.0 * log10 (d) / DB_STEP), DB_MUTE-1); /* 0 -- 127 */
+}
+
+
+/* Sin Table */
+static void
+makeSinTable (void)
+{
+ e_int32 i;
+
+ for (i = 0; i < PG_WIDTH / 4; i++)
+ {
+ fullsintablei = (e_uint32) lin2db (sin (2.0 * PI * i / PG_WIDTH) );
+ }
+
+ for (i = 0; i < PG_WIDTH / 4; i++)
+ {
+ fullsintablePG_WIDTH / 2 - 1 - i = fullsintablei;
+ }
+
+ for (i = 0; i < PG_WIDTH / 2; i++)
+ {
+ fullsintablePG_WIDTH / 2 + i = (e_uint32) (DB_MUTE + DB_MUTE + fullsintablei);
+ }
+
+ for (i = 0; i < PG_WIDTH / 2; i++)
+ halfsintablei = fullsintablei;
+ for (i = PG_WIDTH / 2; i < PG_WIDTH; i++)
+ halfsintablei = fullsintable0;
+}
+
+static double saw(double phase)
+{
+ if(phase <= PI/2)
+ return phase * 2 / PI ;
+ else if(phase <= PI*3/2)
+ return 2.0 - ( phase * 2 / PI );
+ else
+ return -4.0 + phase * 2 / PI;
+}
+
+/* Table for Pitch Modulator */
+static void
+makePmTable (void)
+{
+ e_int32 i;
+
+ for (i = 0; i < PM_PG_WIDTH; i++)
+ /* pmtablei = (e_int32) ((double) PM_AMP * pow (2, (double) PM_DEPTH * sin (2.0 * PI * i / PM_PG_WIDTH) / 1200)); */
+ pmtablei = (e_int32) ((double) PM_AMP * pow (2, (double) PM_DEPTH * saw (2.0 * PI * i / PM_PG_WIDTH) / 1200));
+}
+
+/* Table for Amp Modulator */
+static void
+makeAmTable (void)
+{
+ e_int32 i;
+
+ for (i = 0; i < AM_PG_WIDTH; i++)
+ /* amtablei = (e_int32) ((double) AM_DEPTH / 2 / DB_STEP * (1.0 + sin (2.0 * PI * i / PM_PG_WIDTH))); */
+ amtablei = (e_int32) ((double) AM_DEPTH / 2 / DB_STEP * (1.0 + saw (2.0 * PI * i / PM_PG_WIDTH)));
+}
+
+/* Phase increment counter table */
+static void
+makeDphaseTable (void)
+{
+ e_uint32 fnum, block, ML;
+ e_uint32 mltable16 =
+ { 1, 1 * 2, 2 * 2, 3 * 2, 4 * 2, 5 * 2, 6 * 2, 7 * 2, 8 * 2, 9 * 2, 10 * 2, 10 * 2, 12 * 2, 12 * 2, 15 * 2, 15 * 2 };
+
+ for (fnum = 0; fnum < 512; fnum++)
+ for (block = 0; block < 8; block++)
+ for (ML = 0; ML < 16; ML++)
+ dphaseTablefnumblockML = RATE_ADJUST (((fnum * mltableML) << block) >> (20 - DP_BITS));
+}
+
+static void
+makeTllTable (void)
+{
+#define dB2(x) ((x)*2)
+
+ static double kltable16 = {
+ dB2 (0.000), dB2 (9.000), dB2 (12.000), dB2 (13.875), dB2 (15.000), dB2 (16.125), dB2 (16.875), dB2 (17.625),
+ dB2 (18.000), dB2 (18.750), dB2 (19.125), dB2 (19.500), dB2 (19.875), dB2 (20.250), dB2 (20.625), dB2 (21.000)
+ };
+
+ e_int32 tmp;
+ e_int32 fnum, block, TL, KL;
+
+ for (fnum = 0; fnum < 16; fnum++)
+ for (block = 0; block < 8; block++)
+ for (TL = 0; TL < 64; TL++)
+ for (KL = 0; KL < 4; KL++)
+ {
+ if (KL == 0)
+ {
+ tllTablefnumblockTLKL = TL2EG (TL);
+ }
+ else
+ {
+ tmp = (e_int32) (kltablefnum - dB2 (3.000) * (7 - block));
+ if (tmp <= 0)
+ tllTablefnumblockTLKL = TL2EG (TL);
+ else
+ tllTablefnumblockTLKL = (e_uint32) ((tmp >> (3 - KL)) / EG_STEP) + TL2EG (TL);
+ }
+ }
+}
+
+#ifdef USE_SPEC_ENV_SPEED
+static double attacktime164 = {
+ {0, 0, 0, 0},
+ {1730.15, 1400.60, 1153.43, 988.66},
+ {865.08, 700.30, 576.72, 494.33},
+ {432.54, 350.15, 288.36, 247.16},
+ {216.27, 175.07, 144.18, 123.58},
+ {108.13, 87.54, 72.09, 61.79},
+ {54.07, 43.77, 36.04, 30.90},
+ {27.03, 21.88, 18.02, 15.45},
+ {13.52, 10.94, 9.01, 7.72},
+ {6.76, 5.47, 4.51, 3.86},
+ {3.38, 2.74, 2.25, 1.93},
+ {1.69, 1.37, 1.13, 0.97},
+ {0.84, 0.70, 0.60, 0.54},
+ {0.50, 0.42, 0.34, 0.30},
+ {0.28, 0.22, 0.18, 0.14},
+ {0.00, 0.00, 0.00, 0.00}
+};
+
+static double decaytime164 = {
+ {0, 0, 0, 0},
+ {20926.60, 16807.20, 14006.00, 12028.60},
+ {10463.30, 8403.58, 7002.98, 6014.32},
+ {5231.64, 4201.79, 3501.49, 3007.16},
+ {2615.82, 2100.89, 1750.75, 1503.58},
+ {1307.91, 1050.45, 875.37, 751.79},
+ {653.95, 525.22, 437.69, 375.90},
+ {326.98, 262.61, 218.84, 187.95},
+ {163.49, 131.31, 109.42, 93.97},
+ {81.74, 65.65, 54.71, 46.99},
+ {40.87, 32.83, 27.36, 23.49},
+ {20.44, 16.41, 13.68, 11.75},
+ {10.22, 8.21, 6.84, 5.87},
+ {5.11, 4.10, 3.42, 2.94},
+ {2.55, 2.05, 1.71, 1.47},
+ {1.27, 1.27, 1.27, 1.27}
+};
+#endif
+
+/* Rate Table for Attack */
+static void
+makeDphaseARTable (void)
+{
+ e_int32 AR, Rks, RM, RL;
+
+#ifdef USE_SPEC_ENV_SPEED
+ e_uint32 attacktable164;
+
+ for (RM = 0; RM < 16; RM++)
+ for (RL = 0; RL < 4; RL++)
+ {
+ if (RM == 0)
+ attacktableRMRL = 0;
+ else if (RM == 15)
+ attacktableRMRL = EG_DP_WIDTH;
+ else
+ attacktableRMRL = (e_uint32) ((double) (1 << EG_DP_BITS) / (attacktimeRMRL * 3579545 / 72000));
+
+ }
+#endif
+
+ for (AR = 0; AR < 16; AR++)
+ for (Rks = 0; Rks < 16; Rks++)
+ {
+ RM = AR + (Rks >> 2);
+ RL = Rks & 3;
+ if (RM > 15)
+ RM = 15;
+ switch (AR)
+ {
+ case 0:
+ dphaseARTableARRks = 0;
+ break;
+ case 15:
+ dphaseARTableARRks = 0;/*EG_DP_WIDTH;*/
+ break;
+ default:
+#ifdef USE_SPEC_ENV_SPEED
+ dphaseARTableARRks = RATE_ADJUST (attacktableRMRL);
+#else
+ dphaseARTableARRks = RATE_ADJUST ((3 * (RL + 4) << (RM + 1)));
+#endif
+ break;
+ }
+ }
+}
+
+/* Rate Table for Decay and Release */
+static void
+makeDphaseDRTable (void)
+{
+ e_int32 DR, Rks, RM, RL;
+
+#ifdef USE_SPEC_ENV_SPEED
+ e_uint32 decaytable164;
+
+ for (RM = 0; RM < 16; RM++)
+ for (RL = 0; RL < 4; RL++)
+ if (RM == 0)
+ decaytableRMRL = 0;
+ else
+ decaytableRMRL = (e_uint32) ((double) (1 << EG_DP_BITS) / (decaytimeRMRL * 3579545 / 72000));
+#endif
+
+ for (DR = 0; DR < 16; DR++)
+ for (Rks = 0; Rks < 16; Rks++)
+ {
+ RM = DR + (Rks >> 2);
+ RL = Rks & 3;
+ if (RM > 15)
+ RM = 15;
+ switch (DR)
+ {
+ case 0:
+ dphaseDRTableDRRks = 0;
+ break;
+ default:
+#ifdef USE_SPEC_ENV_SPEED
+ dphaseDRTableDRRks = RATE_ADJUST (decaytableRMRL);
+#else
+ dphaseDRTableDRRks = RATE_ADJUST ((RL + 4) << (RM - 1));
+#endif
+ break;
+ }
+ }
+}
+
+static void
+makeRksTable (void)
+{
+
+ e_int32 fnum8, block, KR;
+
+ for (fnum8 = 0; fnum8 < 2; fnum8++)
+ for (block = 0; block < 8; block++)
+ for (KR = 0; KR < 2; KR++)
+ {
+ if (KR != 0)
+ rksTablefnum8blockKR = (block << 1) + fnum8;
+ else
+ rksTablefnum8blockKR = block >> 1;
+ }
+}
+
+void
+OPLL_dump2patch (const e_uint8 * dump, OPLL_PATCH * patch)
+{
+ patch0.AM = (dump0 >> 7) & 1;
+ patch1.AM = (dump1 >> 7) & 1;
+ patch0.PM = (dump0 >> 6) & 1;
+ patch1.PM = (dump1 >> 6) & 1;
+ patch0.EG = (dump0 >> 5) & 1;
+ patch1.EG = (dump1 >> 5) & 1;
+ patch0.KR = (dump0 >> 4) & 1;
+ patch1.KR = (dump1 >> 4) & 1;
+ patch0.ML = (dump0) & 15;
+ patch1.ML = (dump1) & 15;
+ patch0.KL = (dump2 >> 6) & 3;
+ patch1.KL = (dump3 >> 6) & 3;
+ patch0.TL = (dump2) & 63;
+ patch0.FB = (dump3) & 7;
+ patch0.WF = (dump3 >> 3) & 1;
+ patch1.WF = (dump3 >> 4) & 1;
+ patch0.AR = (dump4 >> 4) & 15;
+ patch1.AR = (dump5 >> 4) & 15;
+ patch0.DR = (dump4) & 15;
+ patch1.DR = (dump5) & 15;
+ patch0.SL = (dump6 >> 4) & 15;
+ patch1.SL = (dump7 >> 4) & 15;
+ patch0.RR = (dump6) & 15;
+ patch1.RR = (dump7) & 15;
+}
+
+void
+OPLL_getDefaultPatch (e_int32 type, e_int32 num, OPLL_PATCH * patch)
+{
+ OPLL_dump2patch (default_insttype + num * 8, patch);
+}
+
+static void
+makeDefaultPatch ()
+{
+ e_int32 i, j;
+
+ for (i = 0; i < OPLL_TONE_NUM; i++)
+ for (j = 0; j < 19; j++)
+ OPLL_getDefaultPatch (i, j, &default_patchij * 2);
+
+}
+
+void
+OPLL_setPatch (OPLL * opll, const e_uint8 * dump)
+{
+ OPLL_PATCH patch2;
+ int i;
+
+ for (i = 0; i < 19; i++)
+ {
+ OPLL_dump2patch (dump + i * 8, patch);
+ memcpy (&opll->patchi*2+0, &patch0, sizeof (OPLL_PATCH));
+ memcpy (&opll->patchi*2+1, &patch1, sizeof (OPLL_PATCH));
+ }
+}
+
+void
+OPLL_patch2dump (const OPLL_PATCH * patch, e_uint8 * dump)
+{
+ dump0 = (e_uint8) ((patch0.AM << 7) + (patch0.PM << 6) + (patch0.EG << 5) + (patch0.KR << 4) + patch0.ML);
+ dump1 = (e_uint8) ((patch1.AM << 7) + (patch1.PM << 6) + (patch1.EG << 5) + (patch1.KR << 4) + patch1.ML);
+ dump2 = (e_uint8) ((patch0.KL << 6) + patch0.TL);
+ dump3 = (e_uint8) ((patch1.KL << 6) + (patch1.WF << 4) + (patch0.WF << 3) + patch0.FB);
+ dump4 = (e_uint8) ((patch0.AR << 4) + patch0.DR);
+ dump5 = (e_uint8) ((patch1.AR << 4) + patch1.DR);
+ dump6 = (e_uint8) ((patch0.SL << 4) + patch0.RR);
+ dump7 = (e_uint8) ((patch1.SL << 4) + patch1.RR);
+ dump8 = 0;
+ dump9 = 0;
+ dump10 = 0;
+ dump11 = 0;
+ dump12 = 0;
+ dump13 = 0;
+ dump14 = 0;
+ dump15 = 0;
+}
+
+/************************************************************
+
+ Calc Parameters
+
+************************************************************/
+
+INLINE static e_uint32
+calc_eg_dphase (OPLL_SLOT * slot)
+{
+
+ switch (slot->eg_mode)
+ {
+ case ATTACK:
+ return dphaseARTableslot->patch->ARslot->rks;
+
+ case DECAY:
+ return dphaseDRTableslot->patch->DRslot->rks;
+
+ case SUSHOLD:
+ return 0;
+
+ case SUSTINE:
+ return dphaseDRTableslot->patch->RRslot->rks;
+
+ case RELEASE:
+ if (slot->sustine)
+ return dphaseDRTable5slot->rks;
+ else if (slot->patch->EG)
+ return dphaseDRTableslot->patch->RRslot->rks;
+ else
+ return dphaseDRTable7slot->rks;
+
+ case SETTLE:
+ return dphaseDRTable150;
+
+ case FINISH:
+ return 0;
+
+ default:
+ return 0;
+ }
+}
+
+/*************************************************************
+
+ OPLL internal interfaces
+
+*************************************************************/
+#define SLOT_BD1 12
+#define SLOT_BD2 13
+#define SLOT_HH 14
+#define SLOT_SD 15
+#define SLOT_TOM 16
+#define SLOT_CYM 17
+
+#define UPDATE_PG(S) (S)->dphase = dphaseTable(S)->fnum(S)->block(S)->patch->ML
+#define UPDATE_TLL(S)\
+(((S)->type==0)?\
+((S)->tll = tllTable((S)->fnum)>>5(S)->block(S)->patch->TL(S)->patch->KL):\
+((S)->tll = tllTable((S)->fnum)>>5(S)->block(S)->volume(S)->patch->KL))
+#define UPDATE_RKS(S) (S)->rks = rksTable((S)->fnum)>>8(S)->block(S)->patch->KR
+#define UPDATE_WF(S) (S)->sintbl = waveform(S)->patch->WF
+#define UPDATE_EG(S) (S)->eg_dphase = calc_eg_dphase(S)
+#define UPDATE_ALL(S)\
+ UPDATE_PG(S);\
+ UPDATE_TLL(S);\
+ UPDATE_RKS(S);\
+ UPDATE_WF(S); \
+ UPDATE_EG(S) /* EG should be updated last. */
+
+
+/* Slot key on */
+INLINE static void
+slotOn (OPLL_SLOT * slot)
+{
+ slot->eg_mode = ATTACK;
+ slot->eg_phase = 0;
+ slot->phase = 0;
+ UPDATE_EG(slot);
+}
+
+/* Slot key on without reseting the phase */
+INLINE static void
+slotOn2 (OPLL_SLOT * slot)
+{
+ slot->eg_mode = ATTACK;
+ slot->eg_phase = 0;
+ UPDATE_EG(slot);
+}
+
+/* Slot key off */
+INLINE static void
+slotOff (OPLL_SLOT * slot)
+{
+ if (slot->eg_mode == ATTACK)
+ slot->eg_phase = EXPAND_BITS (AR_ADJUST_TABLEHIGHBITS (slot->eg_phase, EG_DP_BITS - EG_BITS), EG_BITS, EG_DP_BITS);
+ slot->eg_mode = RELEASE;
+ UPDATE_EG(slot);
+}
+
+/* Channel key on */
+INLINE static void
+keyOn (OPLL * opll, e_int32 i)
+{
+ if (!opll->slot_on_flagi * 2)
+ slotOn (MOD(opll,i));
+ if (!opll->slot_on_flagi * 2 + 1)
+ slotOn (CAR(opll,i));
+ opll->key_statusi = 1;
+}
+
+/* Channel key off */
+INLINE static void
+keyOff (OPLL * opll, e_int32 i)
+{
+ if (opll->slot_on_flagi * 2 + 1)
+ slotOff (CAR(opll,i));
+ opll->key_statusi = 0;
+}
+
+INLINE static void
+keyOn_BD (OPLL * opll)
+{
+ keyOn (opll, 6);
+}
+INLINE static void
+keyOn_SD (OPLL * opll)
+{
+ if (!opll->slot_on_flagSLOT_SD)
+ slotOn (CAR(opll,7));
+}
+INLINE static void
+keyOn_TOM (OPLL * opll)
+{
+ if (!opll->slot_on_flagSLOT_TOM)
+ slotOn (MOD(opll,8));
+}
+INLINE static void
+keyOn_HH (OPLL * opll)
+{
+ if (!opll->slot_on_flagSLOT_HH)
+ slotOn2 (MOD(opll,7));
+}
+INLINE static void
+keyOn_CYM (OPLL * opll)
+{
+ if (!opll->slot_on_flagSLOT_CYM)
+ slotOn2 (CAR(opll,8));
+}
+
+/* Drum key off */
+INLINE static void
+keyOff_BD (OPLL * opll)
+{
+ keyOff (opll, 6);
+}
+INLINE static void
+keyOff_SD (OPLL * opll)
+{
+ if (opll->slot_on_flagSLOT_SD)
+ slotOff (CAR(opll,7));
+}
+INLINE static void
+keyOff_TOM (OPLL * opll)
+{
+ if (opll->slot_on_flagSLOT_TOM)
+ slotOff (MOD(opll,8));
+}
+INLINE static void
+keyOff_HH (OPLL * opll)
+{
+ if (opll->slot_on_flagSLOT_HH)
+ slotOff (MOD(opll,7));
+}
+INLINE static void
+keyOff_CYM (OPLL * opll)
+{
+ if (opll->slot_on_flagSLOT_CYM)
+ slotOff (CAR(opll,8));
+}
+
+/* Change a voice */
+INLINE static void
+setPatch (OPLL * opll, e_int32 i, e_int32 num)
+{
+ opll->patch_numberi = num;
+ MOD(opll,i)->patch = &opll->patchnum * 2 + 0;
+ CAR(opll,i)->patch = &opll->patchnum * 2 + 1;
+}
+
+/* Change a rhythm voice */
+INLINE static void
+setSlotPatch (OPLL_SLOT * slot, OPLL_PATCH * patch)
+{
+ slot->patch = patch;
+}
+
+/* Set sustine parameter */
+INLINE static void
+setSustine (OPLL * opll, e_int32 c, e_int32 sustine)
+{
+ CAR(opll,c)->sustine = sustine;
+ if (MOD(opll,c)->type)
+ MOD(opll,c)->sustine = sustine;
+}
+
+/* Volume : 6bit ( Volume register << 2 ) */
+INLINE static void
+setVolume (OPLL * opll, e_int32 c, e_int32 volume)
+{
+ CAR(opll,c)->volume = volume;
+}
+
+INLINE static void
+setSlotVolume (OPLL_SLOT * slot, e_int32 volume)
+{
+ slot->volume = volume;
+}
+
+/* Set F-Number ( fnum : 9bit ) */
+INLINE static void
+setFnumber (OPLL * opll, e_int32 c, e_int32 fnum)
+{
+ CAR(opll,c)->fnum = fnum;
+ MOD(opll,c)->fnum = fnum;
+}
+
+/* Set Block data (block : 3bit ) */
+INLINE static void
+setBlock (OPLL * opll, e_int32 c, e_int32 block)
+{
+ CAR(opll,c)->block = block;
+ MOD(opll,c)->block = block;
+}
+
+/* Change Rhythm Mode */
+INLINE static void
+update_rhythm_mode (OPLL * opll)
+{
+ if (opll->patch_number6 & 0x10)
+ {
+ if (!(opll->slot_on_flagSLOT_BD2 | (opll->reg0x0e & 0x20)))
+ {
+ opll->slotSLOT_BD1.eg_mode = FINISH;
+ opll->slotSLOT_BD2.eg_mode = FINISH;
+ setPatch (opll, 6, opll->reg0x36 >> 4);
+ }
+ }
+ else if (opll->reg0x0e & 0x20)
+ {
+ opll->patch_number6 = 16;
+ opll->slotSLOT_BD1.eg_mode = FINISH;
+ opll->slotSLOT_BD2.eg_mode = FINISH;
+ setSlotPatch (&opll->slotSLOT_BD1, &opll->patch16 * 2 + 0);
+ setSlotPatch (&opll->slotSLOT_BD2, &opll->patch16 * 2 + 1);
+ }
+
+ if (opll->patch_number7 & 0x10)
+ {
+ if (!((opll->slot_on_flagSLOT_HH && opll->slot_on_flagSLOT_SD) | (opll->reg0x0e & 0x20)))
+ {
+ opll->slotSLOT_HH.type = 0;
+ opll->slotSLOT_HH.eg_mode = FINISH;
+ opll->slotSLOT_SD.eg_mode = FINISH;
+ setPatch (opll, 7, opll->reg0x37 >> 4);
+ }
+ }
+ else if (opll->reg0x0e & 0x20)
+ {
+ opll->patch_number7 = 17;
+ opll->slotSLOT_HH.type = 1;
+ opll->slotSLOT_HH.eg_mode = FINISH;
+ opll->slotSLOT_SD.eg_mode = FINISH;
+ setSlotPatch (&opll->slotSLOT_HH, &opll->patch17 * 2 + 0);
+ setSlotPatch (&opll->slotSLOT_SD, &opll->patch17 * 2 + 1);
+ }
+
+ if (opll->patch_number8 & 0x10)
+ {
+ if (!((opll->slot_on_flagSLOT_CYM && opll->slot_on_flagSLOT_TOM) | (opll->reg0x0e & 0x20)))
+ {
+ opll->slotSLOT_TOM.type = 0;
+ opll->slotSLOT_TOM.eg_mode = FINISH;
+ opll->slotSLOT_CYM.eg_mode = FINISH;
+ setPatch (opll, 8, opll->reg0x38 >> 4);
+ }
+ }
+ else if (opll->reg0x0e & 0x20)
+ {
+ opll->patch_number8 = 18;
+ opll->slotSLOT_TOM.type = 1;
+ opll->slotSLOT_TOM.eg_mode = FINISH;
+ opll->slotSLOT_CYM.eg_mode = FINISH;
+ setSlotPatch (&opll->slotSLOT_TOM, &opll->patch18 * 2 + 0);
+ setSlotPatch (&opll->slotSLOT_CYM, &opll->patch18 * 2 + 1);
+ }
+}
+
+INLINE static void
+update_key_status (OPLL * opll)
+{
+ int ch;
+
+ for (ch = 0; ch < 9; ch++)
+ opll->slot_on_flagch * 2 = opll->slot_on_flagch * 2 + 1 = (opll->reg0x20 + ch) & 0x10;
+
+ if (opll->reg0x0e & 0x20)
+ {
+ opll->slot_on_flagSLOT_BD1 |= (opll->reg0x0e & 0x10);
+ opll->slot_on_flagSLOT_BD2 |= (opll->reg0x0e & 0x10);
+ opll->slot_on_flagSLOT_SD |= (opll->reg0x0e & 0x08);
+ opll->slot_on_flagSLOT_HH |= (opll->reg0x0e & 0x01);
+ opll->slot_on_flagSLOT_TOM |= (opll->reg0x0e & 0x04);
+ opll->slot_on_flagSLOT_CYM |= (opll->reg0x0e & 0x02);
+ }
+}
+
+void
+OPLL_copyPatch (OPLL * opll, e_int32 num, OPLL_PATCH * patch)
+{
+ memcpy (&opll->patchnum, patch, sizeof (OPLL_PATCH));
+}
+
+/***********************************************************
+
+ Initializing
+
+***********************************************************/
+
+static void
+OPLL_SLOT_reset (OPLL_SLOT * slot, int type)
+{
+ slot->type = type;
+ slot->sintbl = waveform0;
+ slot->phase = 0;
+ slot->dphase = 0;
+ slot->output0 = 0;
+ slot->output1 = 0;
+ slot->feedback = 0;
+ slot->eg_mode = FINISH;
+ slot->eg_phase = EG_DP_WIDTH;
+ slot->eg_dphase = 0;
+ slot->rks = 0;
+ slot->tll = 0;
+ slot->sustine = 0;
+ slot->fnum = 0;
+ slot->block = 0;
+ slot->volume = 0;
+ slot->pgout = 0;
+ slot->egout = 0;
+ slot->patch = &null_patch;
+}
+
+static void
+internal_refresh (void)
+{
+ makeDphaseTable ();
+ makeDphaseARTable ();
+ makeDphaseDRTable ();
+ pm_dphase = (e_uint32) RATE_ADJUST (PM_SPEED * PM_DP_WIDTH / (clk / 72));
+ am_dphase = (e_uint32) RATE_ADJUST (AM_SPEED * AM_DP_WIDTH / (clk / 72));
+}
+
+static void
+maketables (e_uint32 c, e_uint32 r)
+{
+ if (c != clk)
+ {
+ clk = c;
+ makePmTable ();
+ makeAmTable ();
+ makeDB2LinTable ();
+ makeAdjustTable ();
+ makeTllTable ();
+ makeRksTable ();
+ makeSinTable ();
+ makeDefaultPatch ();
+ }
+
+ if (r != rate)
+ {
+ rate = r;
+ internal_refresh ();
+ }
+}
+
+OPLL *
+OPLL_new (e_uint32 clk, e_uint32 rate)
+{
+ OPLL *opll;
+ e_int32 i;
+
+ maketables (clk, rate);
+
+ opll = (OPLL *) calloc (sizeof (OPLL), 1);
+ if (opll == NULL)
+ return NULL;
+
+ opll->vrc7_mode = 0x00;
+
+ for (i = 0; i < 19 * 2; i++)
+ memcpy(&opll->patchi,&null_patch,sizeof(OPLL_PATCH));
+ for (i = 0; i < 14; i++)
+ centre_panning( opll->pani );
+
+ opll->mask = 0;
+
+ OPLL_reset (opll);
+ OPLL_reset_patch (opll, 0);
+
+ return opll;
+}
+
+
+void
+OPLL_delete (OPLL * opll)
+{
+ free (opll);
+}
+
+
+/* Reset patch datas by system default. */
+void
+OPLL_reset_patch (OPLL * opll, e_int32 type)
+{
+ e_int32 i;
+
+ for (i = 0; i < 19 * 2; i++)
+ OPLL_copyPatch (opll, i, &default_patchtype % OPLL_TONE_NUMi);
+}
+
+/* Reset whole of OPLL except patch datas. */
+void
+OPLL_reset (OPLL * opll)
+{
+ e_int32 i;
+
+ if (!opll)
+ return;
+
+ opll->adr = 0;
+ opll->out = 0;
+
+ opll->pm_phase = 0;
+ opll->am_phase = 0;
+
+ opll->noise_seed = 0xffff;
+ //opll->mask = 0;
+
+ for (i = 0; i <18; i++)
+ OPLL_SLOT_reset(&opll->sloti, i%2);
+
+ for (i = 0; i < 9; i++)
+ {
+ opll->key_statusi = 0;
+ setPatch (opll, i, 0);
+ }
+
+ for (i = 0; i < 0x40; i++)
+ OPLL_writeReg (opll, i, 0);
+
+#ifndef EMU2413_COMPACTION
+ opll->realstep = (e_uint32) ((1 << 31) / rate);
+ opll->opllstep = (e_uint32) ((1 << 31) / (clk / 72));
+ opll->oplltime = 0;
+ /*for (i = 0; i < 14; i++)
+ {
+		//centre_panning( opll->pani );
+		opll->pani0 = 1.0f;
+		opll->pani1 = 1.0f;
+	}*/
+ opll->sprev0 = opll->sprev1 = 0;
+ opll->snext0 = opll->snext1 = 0;
+#endif
+}
+
+/* Force Refresh (When external program changes some parameters). */
+void
+OPLL_forceRefresh (OPLL * opll)
+{
+ e_int32 i;
+
+ if (opll == NULL)
+ return;
+
+ for (i = 0; i < 9; i++)
+ setPatch(opll,i,opll->patch_numberi);
+
+ for (i = 0; i < 18; i++)
+ {
+ UPDATE_PG (&opll->sloti);
+ UPDATE_RKS (&opll->sloti);
+ UPDATE_TLL (&opll->sloti);
+ UPDATE_WF (&opll->sloti);
+ UPDATE_EG (&opll->sloti);
+ }
+}
+
+void
+OPLL_set_rate (OPLL * opll, e_uint32 r)
+{
+ if (opll->quality)
+ rate = 49716;
+ else
+ rate = r;
+ internal_refresh ();
+ rate = r;
+}
+
+void
+OPLL_set_quality (OPLL * opll, e_uint32 q)
+{
+ opll->quality = q;
+ OPLL_set_rate (opll, rate);
+}
+
+/*********************************************************
+
+ Generate wave data
+
+*********************************************************/
+/* Convert Amp(0 to EG_HEIGHT) to Phase(0 to 2PI). */
+#if ( SLOT_AMP_BITS - PG_BITS ) > 0
+#define wave2_2pi(e) ( (e) >> ( SLOT_AMP_BITS - PG_BITS ))
+#else
+#define wave2_2pi(e) ( (e) << ( PG_BITS - SLOT_AMP_BITS ))
+#endif
+
+/* Convert Amp(0 to EG_HEIGHT) to Phase(0 to 4PI). */
+#if ( SLOT_AMP_BITS - PG_BITS - 1 ) == 0
+#define wave2_4pi(e) (e)
+#elif ( SLOT_AMP_BITS - PG_BITS - 1 ) > 0
+#define wave2_4pi(e) ( (e) >> ( SLOT_AMP_BITS - PG_BITS - 1 ))
+#else
+#define wave2_4pi(e) ( (e) << ( 1 + PG_BITS - SLOT_AMP_BITS ))
+#endif
+
+/* Convert Amp(0 to EG_HEIGHT) to Phase(0 to 8PI). */
+#if ( SLOT_AMP_BITS - PG_BITS - 2 ) == 0
+#define wave2_8pi(e) (e)
+#elif ( SLOT_AMP_BITS - PG_BITS - 2 ) > 0
+#define wave2_8pi(e) ( (e) >> ( SLOT_AMP_BITS - PG_BITS - 2 ))
+#else
+#define wave2_8pi(e) ( (e) << ( 2 + PG_BITS - SLOT_AMP_BITS ))
+#endif
+
+/* Update AM, PM unit */
+static void
+update_ampm (OPLL * opll)
+{
+ opll->pm_phase = (opll->pm_phase + pm_dphase) & (PM_DP_WIDTH - 1);
+ opll->am_phase = (opll->am_phase + am_dphase) & (AM_DP_WIDTH - 1);
+ opll->lfo_am = amtableHIGHBITS (opll->am_phase, AM_DP_BITS - AM_PG_BITS);
+ opll->lfo_pm = pmtableHIGHBITS (opll->pm_phase, PM_DP_BITS - PM_PG_BITS);
+}
+
+/* PG */
+INLINE static void
+calc_phase (OPLL_SLOT * slot, e_int32 lfo)
+{
+ if (slot->patch->PM)
+ slot->phase += (slot->dphase * lfo) >> PM_AMP_BITS;
+ else
+ slot->phase += slot->dphase;
+
+ slot->phase &= (DP_WIDTH - 1);
+
+ slot->pgout = HIGHBITS (slot->phase, DP_BASE_BITS);
+}
+
+/* Update Noise unit */
+static void
+update_noise (OPLL * opll)
+{
+ if(opll->noise_seed&1) opll->noise_seed ^= 0x8003020;
+ opll->noise_seed >>= 1;
+}
+
+/* EG */
+static void
+calc_envelope (OPLL_SLOT * slot, e_int32 lfo)
+{
+#define S2E(x) (SL2EG((e_int32)(x/SL_STEP))<<(EG_DP_BITS-EG_BITS))
+
+ static e_uint32 SL16 = {
+ S2E (0.0), S2E (3.0), S2E (6.0), S2E (9.0), S2E (12.0), S2E (15.0), S2E (18.0), S2E (21.0),
+ S2E (24.0), S2E (27.0), S2E (30.0), S2E (33.0), S2E (36.0), S2E (39.0), S2E (42.0), S2E (48.0)
+ };
+
+ e_uint32 egout;
+
+ switch (slot->eg_mode)
+ {
+ case ATTACK:
+ egout = AR_ADJUST_TABLEHIGHBITS (slot->eg_phase, EG_DP_BITS - EG_BITS);
+ slot->eg_phase += slot->eg_dphase;
+ if((EG_DP_WIDTH & slot->eg_phase)||(slot->patch->AR==15))
+ {
+ egout = 0;
+ slot->eg_phase = 0;
+ slot->eg_mode = DECAY;
+ UPDATE_EG (slot);
+ }
+ break;
+
+ case DECAY:
+ egout = HIGHBITS (slot->eg_phase, EG_DP_BITS - EG_BITS);
+ slot->eg_phase += slot->eg_dphase;
+ if (slot->eg_phase >= SLslot->patch->SL)
+ {
+ if (slot->patch->EG)
+ {
+ slot->eg_phase = SLslot->patch->SL;
+ slot->eg_mode = SUSHOLD;
+ UPDATE_EG (slot);
+ }
+ else
+ {
+ slot->eg_phase = SLslot->patch->SL;
+ slot->eg_mode = SUSTINE;
+ UPDATE_EG (slot);
+ }
+ }
+ break;
+
+ case SUSHOLD:
+ egout = HIGHBITS (slot->eg_phase, EG_DP_BITS - EG_BITS);
+ if (slot->patch->EG == 0)
+ {
+ slot->eg_mode = SUSTINE;
+ UPDATE_EG (slot);
+ }
+ break;
+
+ case SUSTINE:
+ case RELEASE:
+ egout = HIGHBITS (slot->eg_phase, EG_DP_BITS - EG_BITS);
+ slot->eg_phase += slot->eg_dphase;
+ if (egout >= (1 << EG_BITS))
+ {
+ slot->eg_mode = FINISH;
+ egout = (1 << EG_BITS) - 1;
+ }
+ break;
+
+ case SETTLE:
+ egout = HIGHBITS (slot->eg_phase, EG_DP_BITS - EG_BITS);
+ slot->eg_phase += slot->eg_dphase;
+ if (egout >= (1 << EG_BITS))
+ {
+ slot->eg_mode = ATTACK;
+ egout = (1 << EG_BITS) - 1;
+ UPDATE_EG(slot);
+ }
+ break;
+
+ case FINISH:
+ egout = (1 << EG_BITS) - 1;
+ break;
+
+ default:
+ egout = (1 << EG_BITS) - 1;
+ break;
+ }
+
+ if (slot->patch->AM)
+ egout = EG2DB (egout + slot->tll) + lfo;
+ else
+ egout = EG2DB (egout + slot->tll);
+
+ if (egout >= DB_MUTE)
+ egout = DB_MUTE - 1;
+
+ slot->egout = egout | 3;
+}
+
+/* CARRIOR */
+INLINE static e_int32
+calc_slot_car (OPLL_SLOT * slot, e_int32 fm)
+{
+ if (slot->egout >= (DB_MUTE - 1))
+ {
+ slot->output0 = 0;
+ }
+ else
+ {
+ slot->output0 = DB2LIN_TABLEslot->sintbl(slot->pgout+wave2_8pi(fm))&(PG_WIDTH-1) + slot->egout;
+ }
+
+ slot->output1 = (slot->output1 + slot->output0) >> 1;
+ return slot->output1;
+}
+
+/* MODULATOR */
+INLINE static e_int32
+calc_slot_mod (OPLL_SLOT * slot)
+{
+ e_int32 fm;
+
+ slot->output1 = slot->output0;
+
+ if (slot->egout >= (DB_MUTE - 1))
+ {
+ slot->output0 = 0;
+ }
+ else if (slot->patch->FB != 0)
+ {
+ fm = wave2_4pi (slot->feedback) >> (7 - slot->patch->FB);
+ slot->output0 = DB2LIN_TABLEslot->sintbl(slot->pgout+fm)&(PG_WIDTH-1) + slot->egout;
+ }
+ else
+ {
+ slot->output0 = DB2LIN_TABLEslot->sintblslot->pgout + slot->egout;
+ }
+
+ slot->feedback = (slot->output1 + slot->output0) >> 1;
+
+ return slot->feedback;
+
+}
+
+/* TOM */
+INLINE static e_int32
+calc_slot_tom (OPLL_SLOT * slot)
+{
+ if (slot->egout >= (DB_MUTE - 1))
+ return 0;
+
+ return DB2LIN_TABLEslot->sintblslot->pgout + slot->egout;
+
+}
+
+/* SNARE */
+INLINE static e_int32
+calc_slot_snare (OPLL_SLOT * slot, e_uint32 noise)
+{
+ if(slot->egout>=(DB_MUTE-1))
+ return 0;
+
+ if(BIT(slot->pgout,7))
+ return DB2LIN_TABLE(noise?DB_POS(0.0):DB_POS(15.0))+slot->egout;
+ else
+ return DB2LIN_TABLE(noise?DB_NEG(0.0):DB_NEG(15.0))+slot->egout;
+}
+
+/*
+ TOP-CYM
+ */
+INLINE static e_int32
+calc_slot_cym (OPLL_SLOT * slot, e_uint32 pgout_hh)
+{
+ e_uint32 dbout;
+
+ if (slot->egout >= (DB_MUTE - 1))
+ return 0;
+ else if(
+ /* the same as fmopl.c */
+ ((BIT(pgout_hh,PG_BITS-8)^BIT(pgout_hh,PG_BITS-1))|BIT(pgout_hh,PG_BITS-7)) ^
+ /* different from fmopl.c */
+ (BIT(slot->pgout,PG_BITS-7)&!BIT(slot->pgout,PG_BITS-5))
+ )
+ dbout = DB_NEG(3.0);
+ else
+ dbout = DB_POS(3.0);
+
+ return DB2LIN_TABLEdbout + slot->egout;
+}
+
+/*
+ HI-HAT
+*/
+INLINE static e_int32
+calc_slot_hat (OPLL_SLOT *slot, e_int32 pgout_cym, e_uint32 noise)
+{
+ e_uint32 dbout;
+
+ if (slot->egout >= (DB_MUTE - 1))
+ return 0;
+ else if(
+ /* the same as fmopl.c */
+ ((BIT(slot->pgout,PG_BITS-8)^BIT(slot->pgout,PG_BITS-1))|BIT(slot->pgout,PG_BITS-7)) ^
+ /* different from fmopl.c */
+ (BIT(pgout_cym,PG_BITS-7)&!BIT(pgout_cym,PG_BITS-5))
+ )
+ {
+ if(noise)
+ dbout = DB_NEG(12.0);
+ else
+ dbout = DB_NEG(24.0);
+ }
+ else
+ {
+ if(noise)
+ dbout = DB_POS(12.0);
+ else
+ dbout = DB_POS(24.0);
+ }
+
+ return DB2LIN_TABLEdbout + slot->egout;
+}
+
+static e_int16
+calc (OPLL * opll)
+{
+ e_int32 inst = 0, perc = 0, out = 0;
+ e_int32 i;
+
+ update_ampm (opll);
+ update_noise (opll);
+
+ for (i = 0; i < 18; i++)
+ {
+ calc_phase(&opll->sloti,opll->lfo_pm);
+ calc_envelope(&opll->sloti,opll->lfo_am);
+ }
+
+ for (i = 0; i < 6; i++)
+ if (!(opll->mask & OPLL_MASK_CH (i)) && (CAR(opll,i)->eg_mode != FINISH))
+ inst += calc_slot_car (CAR(opll,i), calc_slot_mod(MOD(opll,i)));
+
+ if (! opll->vrc7_mode)
+ {
+ /* CH6 */
+ if (opll->patch_number6 <= 15)
+ {
+ if (!(opll->mask & OPLL_MASK_CH (6)) && (CAR(opll,6)->eg_mode != FINISH))
+ inst += calc_slot_car (CAR(opll,6), calc_slot_mod(MOD(opll,6)));
+ }
+ else
+ {
+ if (!(opll->mask & OPLL_MASK_BD) && (CAR(opll,6)->eg_mode != FINISH))
+ perc += calc_slot_car (CAR(opll,6), calc_slot_mod(MOD(opll,6)));
+ }
+
+ /* CH7 */
+ if (opll->patch_number7 <= 15)
+ {
+ if (!(opll->mask & OPLL_MASK_CH (7)) && (CAR(opll,7)->eg_mode != FINISH))
+ inst += calc_slot_car (CAR(opll,7), calc_slot_mod(MOD(opll,7)));
+ }
+ else
+ {
+ if (!(opll->mask & OPLL_MASK_HH) && (MOD(opll,7)->eg_mode != FINISH))
+ perc += calc_slot_hat (MOD(opll,7), CAR(opll,8)->pgout, opll->noise_seed&1);
+ if (!(opll->mask & OPLL_MASK_SD) && (CAR(opll,7)->eg_mode != FINISH))
+ perc -= calc_slot_snare (CAR(opll,7), opll->noise_seed&1);
+ }
+
+ /* CH8 */
+ if (opll->patch_number8 <= 15)
+ {
+ if (!(opll->mask & OPLL_MASK_CH(8)) && (CAR(opll,8)->eg_mode != FINISH))
+ inst += calc_slot_car (CAR(opll,8), calc_slot_mod (MOD(opll,8)));
+ }
+ else
+ {
+ if (!(opll->mask & OPLL_MASK_TOM) && (MOD(opll,8)->eg_mode != FINISH))
+ perc += calc_slot_tom (MOD(opll,8));
+ if (!(opll->mask & OPLL_MASK_CYM) && (CAR(opll,8)->eg_mode != FINISH))
+ perc -= calc_slot_cym (CAR(opll,8), MOD(opll,7)->pgout);
+ }
+ } // end if (! opll->vrc7_mode)
+
+ out = inst + (perc << 1);
+ return (e_int16) out;
+}
+
+#ifdef EMU2413_COMPACTION
+e_int16
+OPLL_calc (OPLL * opll)
+{
+ return calc (opll);
+}
+#else
+e_int16
+OPLL_calc (OPLL * opll)
+{
+ if (!opll->quality)
+ return calc (opll);
+
+ while (opll->realstep > opll->oplltime)
+ {
+ opll->oplltime += opll->opllstep;
+ opll->prev = opll->next;
+ opll->next = calc (opll);
+ }
+
+ opll->oplltime -= opll->realstep;
+ opll->out = (e_int16) (((double) opll->next * (opll->opllstep - opll->oplltime)
+ + (double) opll->prev * opll->oplltime) / opll->opllstep);
+
+ return (e_int16) opll->out;
+}
+#endif
+
+/*e_uint32
+OPLL_setMask (OPLL * opll, e_uint32 mask)
+{
+ e_uint32 ret;
+
+ if (opll)
+ {
+ ret = opll->mask;
+ opll->mask = mask;
+ return ret;
+ }
+ else
+ return 0;
+}*/
+
+void OPLL_SetMuteMask(OPLL* opll, e_uint32 MuteMask)
+{
+	unsigned char CurChn;
+	e_uint32 ChnMsk;
+
+	for (CurChn = 0; CurChn < 14; CurChn ++)
+	{
+		if (CurChn < 9)
+		{
+			ChnMsk = OPLL_MASK_CH(CurChn);
+		}
+		else
+		{
+			switch(CurChn)
+			{
+			case 9:
+				ChnMsk = OPLL_MASK_BD;
+				break;
+			case 10:
+				ChnMsk = OPLL_MASK_SD;
+				break;
+			case 11:
+				ChnMsk = OPLL_MASK_TOM;
+				break;
+			case 12:
+				ChnMsk = OPLL_MASK_CYM;
+				break;
+			case 13:
+				ChnMsk = OPLL_MASK_HH;
+				break;
+			default:
+				ChnMsk = 0;
+				break;
+			}
+		}
+		if ((MuteMask >> CurChn) & 0x01)
+			opll->mask |= ChnMsk;
+		else
+			opll->mask &= ~ChnMsk;
+	}
+
+	return;
+}
+
+/*e_uint32
+OPLL_toggleMask (OPLL * opll, e_uint32 mask)
+{
+ e_uint32 ret;
+
+ if (opll)
+ {
+ ret = opll->mask;
+ opll->mask ^= mask;
+ return ret;
+ }
+ else
+ return 0;
+}*/
+
+void OPLL_SetChipMode(OPLL* opll, e_uint8 Mode)
+{
+	// Enable/Disable VRC7 Mode (with only 6 instead of 9 channels and no rhythm part)
+	opll->vrc7_mode = Mode;
+
+	return;
+}
+
+/****************************************************
+
+ I/O Ctrl
+
+*****************************************************/
+
+void
+OPLL_writeReg (OPLL * opll, e_uint32 reg, e_uint32 data)
+{
+ e_int32 i, v, ch;
+
+ data = data & 0xff;
+ reg = reg & 0x3f;
+ opll->regreg = (e_uint8) data;
+
+ switch (reg)
+ {
+ case 0x00:
+ opll->patch0.AM = (data >> 7) & 1;
+ opll->patch0.PM = (data >> 6) & 1;
+ opll->patch0.EG = (data >> 5) & 1;
+ opll->patch0.KR = (data >> 4) & 1;
+ opll->patch0.ML = (data) & 15;
+ for (i = 0; i < 9; i++)
+ {
+ if (opll->patch_numberi == 0)
+ {
+ UPDATE_PG (MOD(opll,i));
+ UPDATE_RKS (MOD(opll,i));
+ UPDATE_EG (MOD(opll,i));
+ }
+ }
+ break;
+
+ case 0x01:
+ opll->patch1.AM = (data >> 7) & 1;
+ opll->patch1.PM = (data >> 6) & 1;
+ opll->patch1.EG = (data >> 5) & 1;
+ opll->patch1.KR = (data >> 4) & 1;
+ opll->patch1.ML = (data) & 15;
+ for (i = 0; i < 9; i++)
+ {
+ if (opll->patch_numberi == 0)
+ {
+ UPDATE_PG (CAR(opll,i));
+ UPDATE_RKS (CAR(opll,i));
+ UPDATE_EG (CAR(opll,i));
+ }
+ }
+ break;
+
+ case 0x02:
+ opll->patch0.KL = (data >> 6) & 3;
+ opll->patch0.TL = (data) & 63;
+ for (i = 0; i < 9; i++)
+ {
+ if (opll->patch_numberi == 0)
+ {
+ UPDATE_TLL(MOD(opll,i));
+ }
+ }
+ break;
+
+ case 0x03:
+ opll->patch1.KL = (data >> 6) & 3;
+ opll->patch1.WF = (data >> 4) & 1;
+ opll->patch0.WF = (data >> 3) & 1;
+ opll->patch0.FB = (data) & 7;
+ for (i = 0; i < 9; i++)
+ {
+ if (opll->patch_numberi == 0)
+ {
+ UPDATE_WF(MOD(opll,i));
+ UPDATE_WF(CAR(opll,i));
+ }
+ }
+ break;
+
+ case 0x04:
+ opll->patch0.AR = (data >> 4) & 15;
+ opll->patch0.DR = (data) & 15;
+ for (i = 0; i < 9; i++)
+ {
+ if (opll->patch_numberi == 0)
+ {
+ UPDATE_EG (MOD(opll,i));
+ }
+ }
+ break;
+
+ case 0x05:
+ opll->patch1.AR = (data >> 4) & 15;
+ opll->patch1.DR = (data) & 15;
+ for (i = 0; i < 9; i++)
+ {
+ if (opll->patch_numberi == 0)
+ {
+ UPDATE_EG(CAR(opll,i));
+ }
+ }
+ break;
+
+ case 0x06:
+ opll->patch0.SL = (data >> 4) & 15;
+ opll->patch0.RR = (data) & 15;
+ for (i = 0; i < 9; i++)
+ {
+ if (opll->patch_numberi == 0)
+ {
+ UPDATE_EG (MOD(opll,i));
+ }
+ }
+ break;
+
+ case 0x07:
+ opll->patch1.SL = (data >> 4) & 15;
+ opll->patch1.RR = (data) & 15;
+ for (i = 0; i < 9; i++)
+ {
+ if (opll->patch_numberi == 0)
+ {
+ UPDATE_EG (CAR(opll,i));
+ }
+ }
+ break;
+
+ case 0x0e:
+ if (opll->vrc7_mode)
+ break;
+ update_rhythm_mode (opll);
+ if (data & 0x20)
+ {
+ if (data & 0x10)
+ keyOn_BD (opll);
+ else
+ keyOff_BD (opll);
+ if (data & 0x8)
+ keyOn_SD (opll);
+ else
+ keyOff_SD (opll);
+ if (data & 0x4)
+ keyOn_TOM (opll);
+ else
+ keyOff_TOM (opll);
+ if (data & 0x2)
+ keyOn_CYM (opll);
+ else
+ keyOff_CYM (opll);
+ if (data & 0x1)
+ keyOn_HH (opll);
+ else
+ keyOff_HH (opll);
+ }
+ update_key_status (opll);
+
+ UPDATE_ALL (MOD(opll,6));
+ UPDATE_ALL (CAR(opll,6));
+ UPDATE_ALL (MOD(opll,7));
+ UPDATE_ALL (CAR(opll,7));
+ UPDATE_ALL (MOD(opll,8));
+ UPDATE_ALL (CAR(opll,8));
+
+ break;
+
+ case 0x0f:
+ break;
+
+ case 0x10:
+ case 0x11:
+ case 0x12:
+ case 0x13:
+ case 0x14:
+ case 0x15:
+ case 0x16:
+ case 0x17:
+ case 0x18:
+ ch = reg - 0x10;
+ if (opll->vrc7_mode && ch >= 6)
+ break;
+ setFnumber (opll, ch, data + ((opll->reg0x20 + ch & 1) << 8));
+ UPDATE_ALL (MOD(opll,ch));
+ UPDATE_ALL (CAR(opll,ch));
+ break;
+
+ case 0x20:
+ case 0x21:
+ case 0x22:
+ case 0x23:
+ case 0x24:
+ case 0x25:
+ case 0x26:
+ case 0x27:
+ case 0x28:
+ ch = reg - 0x20;
+ if (opll->vrc7_mode && ch >= 6)
+ break;
+ setFnumber (opll, ch, ((data & 1) << 8) + opll->reg0x10 + ch);
+ setBlock (opll, ch, (data >> 1) & 7);
+ setSustine (opll, ch, (data >> 5) & 1);
+	if (ch < 0x06 || ! (opll->reg0x0E & 0x20))
+	{
+		// Valley Bell Fix: prevent commands 0x26-0x28 from turning
+		// the drums (BD, SD, CYM) off
+		if (data & 0x10)
+		 keyOn (opll, ch);
+		else
+		 keyOff (opll, ch);
+	}
+ UPDATE_ALL (MOD(opll,ch));
+ UPDATE_ALL (CAR(opll,ch));
+ update_key_status (opll);
+ update_rhythm_mode (opll);
+ break;
+
+ case 0x30:
+ case 0x31:
+ case 0x32:
+ case 0x33:
+ case 0x34:
+ case 0x35:
+ case 0x36:
+ case 0x37:
+ case 0x38:
+ if (opll->vrc7_mode && reg >= 0x36)
+ break;
+ i = (data >> 4) & 15;
+ v = data & 15;
+ if ((opll->reg0x0e & 0x20) && (reg >= 0x36))
+ {
+ switch (reg)
+ {
+ case 0x37:
+ setSlotVolume (MOD(opll,7), i << 2);
+ break;
+ case 0x38:
+ setSlotVolume (MOD(opll,8), i << 2);
+ break;
+ default:
+ break;
+ }
+ }
+ else
+ {
+ setPatch (opll, reg - 0x30, i);
+ }
+ setVolume (opll, reg - 0x30, v << 2);
+ UPDATE_ALL (MOD(opll,reg - 0x30));
+ UPDATE_ALL (CAR(opll,reg - 0x30));
+ break;
+
+ default:
+ break;
+
+ }
+}
+
+void
+OPLL_writeIO (OPLL * opll, e_uint32 adr, e_uint32 val)
+{
+ if (adr & 1)
+ OPLL_writeReg (opll, opll->adr, val);
+ else
+ opll->adr = val;
+}
+
+#ifndef EMU2413_COMPACTION
+/* STEREO MODE (OPT) */
+void
+OPLL_set_pan (OPLL * opll, e_uint32 ch, e_int32 pan)
+{
+	e_uint32 fnl_ch;
+
+	if (ch >= 14)
+		return;
+
+	if (ch < 9)
+		fnl_ch = ch;
+	else
+		fnl_ch = 13 - (ch - 9);
+	calc_panning( opll->panfnl_ch, pan ); // Maxim
+}
+
+static void
+calc_stereo (OPLL * opll, e_int32 out2, e_int32 ch)
+{
+	/* Maxim: added stereo control (multiply each side by a float in opll->panchside) */
+ e_int32 l=0,r=0;
+/* e_int32 b4 = { 0, 0, 0, 0 };*/ /* Ignore, Right, Left, Center */
+/* e_int32 r4 = { 0, 0, 0, 0 };*/ /* Ignore, Right, Left, Center */
+ e_int32 i;
+ e_int32 channel;
+
+ if (ch < 0)
+ {
+ update_ampm (opll);
+ update_noise (opll);
+
+ for(i=0;i<18;i++)
+ {
+ calc_phase(&opll->sloti,opll->lfo_pm);
+ calc_envelope(&opll->sloti,opll->lfo_am);
+ }
+ }
+
+ for (i = 0; i < 6; i++)
+ {
+ if (ch >= 0 && i != ch) continue;
+ if (!(opll->mask & OPLL_MASK_CH (i)) && (CAR(opll,i)->eg_mode != FINISH))
+ {
+ channel = calc_slot_car (CAR(opll,i), calc_slot_mod (MOD(opll,i)));
+ if ( opll->pani0 == 1.0f )
+ {
+ l += channel;
+ r += channel;
+ }
+ else
+ {
+ l += (e_int32)( channel * opll->pani0 );
+ r += (e_int32)( channel * opll->pani1 );
+ }
+ }
+ }
+
+
+ if (! opll->vrc7_mode)
+ {
+ if (ch < 0 || ch == 6)
+ {
+ if (opll->patch_number6 <= 15)
+ {
+ if (!(opll->mask & OPLL_MASK_CH (6)) && (CAR(opll,6)->eg_mode != FINISH))
+ {
+ channel = calc_slot_car (CAR(opll,6), calc_slot_mod (MOD(opll,6)));
+ if ( opll->pan60 == 1.0f )
+ {
+ l += channel;
+ r += channel;
+ }
+ else
+ {
+ l += (e_int32)( channel * opll->pan60 );
+ r += (e_int32)( channel * opll->pan61 );
+ }
+ }
+ }
+ else
+ {
+ if (!(opll->mask & OPLL_MASK_BD) && (CAR(opll,6)->eg_mode != FINISH))
+ {
+ channel = calc_slot_car (CAR(opll,6), calc_slot_mod (MOD(opll,6))) << 1;
+ if ( opll->pan90 == 1.0f )
+ {
+ l += channel;
+ r += channel;
+ }
+ else
+ {
+ l += (e_int32)( channel * opll->pan90 );
+ r += (e_int32)( channel * opll->pan91 );
+ }
+ }
+ }
+ }
+
+ if (ch < 0 || ch == 7)
+ {
+ if (opll->patch_number7 <= 15)
+ {
+ if (!(opll->mask & OPLL_MASK_CH (7)) && (CAR (opll,7)->eg_mode != FINISH))
+ {
+ channel = calc_slot_car (CAR (opll,7), calc_slot_mod (MOD (opll,7)));
+ if ( opll->pan70 == 1.0f )
+ {
+ l += channel;
+ r += channel;
+ }
+ else
+ {
+ l += (e_int32)( channel * opll->pan70 );
+ r += (e_int32)( channel * opll->pan71 );
+ }
+ }
+ }
+ else
+ {
+ if (!(opll->mask & OPLL_MASK_HH) && (MOD (opll,7)->eg_mode != FINISH))
+ {
+ channel = calc_slot_hat (MOD (opll,7), CAR(opll,8)->pgout, opll->noise_seed&1) << 1;
+ if ( opll->pan100 == 1.0f )
+ {
+ l += channel;
+ r += channel;
+ }
+ else
+ {
+ l += (e_int32)( channel * opll->pan100 );
+ r += (e_int32)( channel * opll->pan101 );
+ }
+ }
+ if (!(opll->mask & OPLL_MASK_SD) && (CAR (opll,7)->eg_mode != FINISH))
+ {
+ channel = -(calc_slot_snare (CAR (opll,7), opll->noise_seed&1) << 1); // this one is negated
+ if ( opll->pan110 == 1.0f )
+ {
+ l += channel;
+ r += channel;
+ }
+ else
+ {
+ l += (e_int32)( channel * opll->pan110 );
+ r += (e_int32)( channel * opll->pan111 );
+ }
+ }
+ }
+ }
+
+ if (ch < 0 || ch == 8)
+ {
+ if (opll->patch_number8 <= 15)
+ {
+ if (!(opll->mask & OPLL_MASK_CH (8)) && (CAR (opll,8)->eg_mode != FINISH))
+ {
+ channel = calc_slot_car (CAR (opll,8), calc_slot_mod (MOD (opll,8)));
+ if ( opll->pan80 == 1.0f )
+ {
+ l += channel;
+ r += channel;
+ }
+ else
+ {
+ l += (e_int32)( channel * opll->pan80 );
+ r += (e_int32)( channel * opll->pan81 );
+ }
+ }
+ }
+ else
+ {
+ if (!(opll->mask & OPLL_MASK_TOM) && (MOD (opll,8)->eg_mode != FINISH))
+ {
+ channel = calc_slot_tom (MOD (opll,8)) << 1;
+ if ( opll->pan120 == 1.0f )
+ {
+ l += channel;
+ r += channel;
+ }
+ else
+ {
+ l += (e_int32)( channel * opll->pan120 );
+ r += (e_int32)( channel * opll->pan121 );
+ }
+ }
+ if (!(opll->mask & OPLL_MASK_CYM) && (CAR (opll,8)->eg_mode != FINISH))
+ {
+ channel = -(calc_slot_cym (CAR (opll,8), MOD(opll,7)->pgout) << 1); // negated
+ if ( opll->pan130 == 1.0f )
+ {
+ l += channel;
+ r += channel;
+ }
+ else
+ {
+ l += (e_int32)( channel * opll->pan130 );
+ r += (e_int32)( channel * opll->pan131 );
+ }
+ }
+ }
+ }
+ } // end if (! opll->vrc7_mode)
+/*
+ out1 = (b1 + b3 + ((r1 + r3) << 1)) <<3;
+ out0 = (b2 + b3 + ((r2 + r3) << 1)) <<3;
+ */
+ out0 = l << 3;
+ out1 = r << 3;
+}
+
+/*void
+OPLL_calc_stereo (OPLL * opll, e_int32 out2, samples)
+{
+ if (!opll->quality)
+ {
+ calc_stereo (opll, out);
+ return;
+ }
+
+ while (opll->realstep > opll->oplltime)
+ {
+ opll->oplltime += opll->opllstep;
+ opll->sprev0 = opll->snext0;
+ opll->sprev1 = opll->snext1;
+ calc_stereo (opll, opll->snext);
+ }
+
+ opll->oplltime -= opll->realstep;
+ out0 = (e_int16) (((double) opll->snext0 * (opll->opllstep - opll->oplltime)
+ + (double) opll->sprev0 * opll->oplltime) / opll->opllstep);
+ out1 = (e_int16) (((double) opll->snext1 * (opll->opllstep - opll->oplltime)
+ + (double) opll->sprev1 * opll->oplltime) / opll->opllstep);
+}*/
+void
+OPLL_advance (OPLL * opll)
+{
+ e_int32 buffers2;
+ calc_stereo (opll, buffers, -1);
+}
+
+void
+OPLL_calc_stereo (OPLL * opll, e_int32 **out, e_int32 samples, e_int32 ch)
+{
+ e_int32 *bufMO = out0;
+ e_int32 *bufRO = out1;
+ e_int32 buffers2;
+
+ int i;
+
+ for( i=0; i < samples ; i++ )
+ {
+ if (!opll->quality)
+ {
+ calc_stereo (opll, buffers, ch);
+ bufMOi = buffers0;
+ bufROi = buffers1;
+ }
+ else
+ {
+ while (opll->realstep > opll->oplltime)
+ {
+ opll->oplltime += opll->opllstep;
+ opll->sprev0 = opll->snext0;
+ opll->sprev1 = opll->snext1;
+ calc_stereo (opll, opll->snext, ch);
+ }
+
+ opll->oplltime -= opll->realstep;
+ bufMOi = (e_int32) (((double) opll->snext0 * (opll->opllstep - opll->oplltime)
+ + (double) opll->sprev0 * opll->oplltime) / opll->opllstep);
+ bufROi = (e_int32) (((double) opll->snext1 * (opll->opllstep - opll->oplltime)
+ + (double) opll->sprev1 * opll->oplltime) / opll->opllstep);
+ }
+ }
+}
+#endif /* EMU2413_COMPACTION */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413.h Added

@@ -0,0 +1,151 @@
+#ifndef _EMU2413_H_
+#define _EMU2413_H_
+
+#include "emutypes.h"
+
+#ifdef EMU2413_DLL_EXPORTS
+ #define EMU2413_API __declspec(dllexport)
+#elif defined(EMU2413_DLL_IMPORTS)
+ #define EMU2413_API __declspec(dllimport)
+#else
+ #define EMU2413_API
+#endif
+
+#define PI 3.14159265358979323846
+
+enum OPLL_TONE_ENUM {OPLL_2413_TONE=0, OPLL_VRC7_TONE=1, OPLL_281B_TONE=2} ;
+
+/* voice data */
+typedef struct __OPLL_PATCH {
+ e_uint32 TL,FB,EG,ML,AR,DR,SL,RR,KR,KL,AM,PM,WF ;
+} OPLL_PATCH ;
+
+/* slot */
+typedef struct __OPLL_SLOT {
+
+ OPLL_PATCH *patch;
+
+ e_int32 type ; /* 0 : modulator 1 : carrier */
+
+ /* OUTPUT */
+ e_int32 feedback ;
+ e_int32 output2 ; /* Output value of slot */
+
+ /* for Phase Generator (PG) */
+ e_uint16 *sintbl ; /* Wavetable */
+ e_uint32 phase ; /* Phase */
+ e_uint32 dphase ; /* Phase increment amount */
+ e_uint32 pgout ; /* output */
+
+ /* for Envelope Generator (EG) */
+ e_int32 fnum ; /* F-Number */
+ e_int32 block ; /* Block */
+ e_int32 volume ; /* Current volume */
+ e_int32 sustine ; /* Sustine 1 = ON, 0 = OFF */
+ e_uint32 tll ;	 /* Total Level + Key scale level*/
+ e_uint32 rks ; /* Key scale offset (Rks) */
+ e_int32 eg_mode ; /* Current state */
+ e_uint32 eg_phase ; /* Phase */
+ e_uint32 eg_dphase ; /* Phase increment amount */
+ e_uint32 egout ; /* output */
+
+} OPLL_SLOT ;
+
+/* Mask */
+#define OPLL_MASK_CH(x) (1<<(x))
+#define OPLL_MASK_HH (1<<(9))
+#define OPLL_MASK_CYM (1<<(10))
+#define OPLL_MASK_TOM (1<<(11))
+#define OPLL_MASK_SD (1<<(12))
+#define OPLL_MASK_BD (1<<(13))
+#define OPLL_MASK_RHYTHM ( OPLL_MASK_HH | OPLL_MASK_CYM | OPLL_MASK_TOM | OPLL_MASK_SD | OPLL_MASK_BD )
+
+/* opll */
+typedef struct __OPLL {
+
+ e_uint8 vrc7_mode;
+ e_uint8 adr ;
+ //e_uint32 adr ;
+ e_int32 out ;
+
+#ifndef EMU2413_COMPACTION
+ e_uint32 realstep ;
+ e_uint32 oplltime ;
+ e_uint32 opllstep ;
+ e_int32 prev, next ;
+ e_int32 sprev2,snext2;
+ float pan142;
+#endif
+
+ /* Register */
+ e_uint8 reg0x40 ;
+ e_int32 slot_on_flag18 ;
+
+ /* Pitch Modulator */
+ e_uint32 pm_phase ;
+ e_int32 lfo_pm ;
+
+ /* Amp Modulator */
+ e_int32 am_phase ;
+ e_int32 lfo_am ;
+
+ e_uint32 quality;
+
+ /* Noise Generator */
+ e_uint32 noise_seed ;
+
+ /* Channel Data */
+ e_int32 patch_number9;
+ e_int32 key_status9 ;
+
+ /* Slot */
+ OPLL_SLOT slot18 ;
+
+ /* Voice Data */
+ OPLL_PATCH patch19*2 ;
+ e_int32 patch_update2 ; /* flag for check patch update */
+
+ e_uint32 mask ;
+
+} OPLL ;
+
+/* Create Object */
+EMU2413_API OPLL *OPLL_new(e_uint32 clk, e_uint32 rate) ;
+EMU2413_API void OPLL_delete(OPLL *) ;
+
+/* Setup */
+EMU2413_API void OPLL_reset(OPLL *) ;
+EMU2413_API void OPLL_reset_patch(OPLL *, e_int32) ;
+EMU2413_API void OPLL_set_rate(OPLL *opll, e_uint32 r) ;
+EMU2413_API void OPLL_set_quality(OPLL *opll, e_uint32 q) ;
+EMU2413_API void OPLL_set_pan(OPLL *, e_uint32 ch, e_int32 pan);
+
+/* Port/Register access */
+EMU2413_API void OPLL_writeIO(OPLL *, e_uint32 reg, e_uint32 val) ;
+EMU2413_API void OPLL_writeReg(OPLL *, e_uint32 reg, e_uint32 val) ;
+
+/* Advance engine */
+EMU2413_API void OPLL_advance (OPLL *);
+
+/* Synthsize */
+EMU2413_API e_int16 OPLL_calc(OPLL *) ;
+EMU2413_API void OPLL_calc_stereo(OPLL *, e_int32 **out, e_int32 samples, e_int32 ch) ; /* ch = -1 for normal operation */
+
+/* Misc */
+EMU2413_API void OPLL_setPatch(OPLL *, const e_uint8 *dump) ;
+EMU2413_API void OPLL_copyPatch(OPLL *, e_int32, OPLL_PATCH *) ;
+EMU2413_API void OPLL_forceRefresh(OPLL *) ;
+/* Utility */
+EMU2413_API void OPLL_dump2patch(const e_uint8 *dump, OPLL_PATCH *patch) ;
+EMU2413_API void OPLL_patch2dump(const OPLL_PATCH *patch, e_uint8 *dump) ;
+EMU2413_API void OPLL_getDefaultPatch(e_int32 type, e_int32 num, OPLL_PATCH *) ;
+
+/* Channel Mask */
+//EMU2413_API e_uint32 OPLL_setMask(OPLL *, e_uint32 mask) ;
+//EMU2413_API e_uint32 OPLL_toggleMask(OPLL *, e_uint32 mask) ;
+void OPLL_SetMuteMask(OPLL* opll, e_uint32 MuteMask);
+void OPLL_SetChipMode(OPLL* opll, e_uint8 Mode);
+
+#define dump2patch OPLL_dump2patch
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emu2413_NESpatches.txt Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emuconfig.h Added

@@ -0,0 +1,101 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// Configuration for emulation libraries
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __EMUCONFIG_H__
+#define __EMUCONFIG_H__
+
+/////////////////////////////////////////////////////////////////////////////
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// One of these has to be defined when compiling the library.
+// Shouldn't be necessary for using it.
+//
+#if defined(EMU_COMPILE) && !defined(EMU_BIG_ENDIAN) && !defined(EMU_LITTLE_ENDIAN)
+#error "Hi I forgot to set EMU_x_ENDIAN"
+#endif
+#if defined(EMU_COMPILE) && defined(EMU_BIG_ENDIAN) && defined(EMU_LITTLE_ENDIAN)
+#error "Both byte orders should not be defined"
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// WIN32 native project definitions
+//
+/////////////////////////////////////////////////////////////////////////////
+#if defined(WIN32) && !defined(__GNUC__)
+
+#define EMU_CALL __fastcall
+#define EMU_CALL_ __cdecl
+#define EMU_INLINE __inline
+
+#define uint8 unsigned char
+#define uint16 unsigned short
+#define uint32 unsigned int
+#define uint64 unsigned __int64
+#define sint8 signed char
+#define sint16 signed short
+#define sint32 signed int
+#define sint64 signed __int64
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// LINUX / other platform definitions
+//
+/////////////////////////////////////////////////////////////////////////////
+#else
+
+//#if defined(__GNUC__) && defined(__i386__)
+//#define EMU_CALL __attribute__((__regparm__(2)))
+//#else
+#define EMU_CALL
+//#endif
+
+#define EMU_CALL_
+#define EMU_INLINE __inline
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#define uint8 uint8_t
+#define uint16 uint16_t
+#define uint32 uint32_t
+#define uint64 uint64_t
+#define sint8 int8_t
+#define sint16 int16_t
+#define sint32 int32_t
+#define sint64 int64_t
+#else
+#define uint8 unsigned char
+#define uint16 unsigned short
+#define uint32 unsigned int
+#define uint64 unsigned long long
+#define sint8 signed char
+#define sint16 signed short
+#define sint32 signed int
+#define sint64 signed long long
+#endif
+
+#endif
+
+#ifdef EMU_BIG_ENDIAN
+#define EMU_ENDIAN_XOR_L2H(x) (x)
+#define EMU_ENDIAN_XOR_B2H(x) (0)
+#else
+#define EMU_ENDIAN_XOR_L2H(x) (0)
+#define EMU_ENDIAN_XOR_B2H(x) (x)
+#endif
+
+// deprecated
+#define EMU_ENDIAN_XOR(x) EMU_ENDIAN_XOR_L2H(x)
+
+/////////////////////////////////////////////////////////////////////////////
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/emutypes.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.c Added

@@ -0,0 +1,624 @@
+/*
+
+ ES5503 - Ensoniq ES5503 "DOC" emulator v2.1.1
+ By R. Belmont.
+
+ Copyright R. Belmont.
+
+ This software is dual-licensed: it may be used in MAME and properly licensed
+ MAME derivatives under the terms of the MAME license. For use outside of
+ MAME and properly licensed derivatives, it is available under the
+ terms of the GNU Lesser General Public License (LGPL), version 2.1.
+ You may read the LGPL at http://www.gnu.org/licenses/lgpl.html
+
+ History: the ES5503 was the next design after the famous C64 "SID" by Bob Yannes.
+ It powered the legendary Mirage sampler (the first affordable pro sampler) as well
+ as the ESQ-1 synth/sequencer. The ES5505 (used in Taito's F3 System) and 5506
+ (used in the "Soundscape" series of ISA PC sound cards) followed on a fundamentally
+ similar architecture.
+
+ Bugs: On the real silicon, oscillators 30 and 31 have random volume fluctuations and are
+ unusable for playback. We don't attempt to emulate that. :-)
+
+ Additionally, in "swap" mode, there's one cycle when the switch takes place where the
+ oscillator's output is 0x80 (centerline) regardless of the sample data. This can
+ cause audible clicks and a general degradation of audio quality if the correct sample
+ data at that point isn't 0x80 or very near it.
+
+ Changes:
+ 0.2 (RB) - improved behavior for volumes > 127, fixes missing notes in Nucleus & missing voices in Thexder
+ 0.3 (RB) - fixed extraneous clicking, improved timing behavior for e.g. Music Construction Set & Music Studio
+ 0.4 (RB) - major fixes to IRQ semantics and end-of-sample handling.
+ 0.5 (RB) - more flexible wave memory hookup (incl. banking) and save state support.
+ 1.0 (RB) - properly respects the input clock
+ 2.0 (RB) - C++ conversion, more accurate oscillator IRQ timing
+ 2.1 (RB) - Corrected phase when looping; synthLAB, Arkanoid, and Arkanoid II no longer go out of tune
+ 2.1.1 (RB) - Fixed issue introduced in 2.0 where IRQs were delayed
+*/
+
+//#include "emu.h"
+//#include "streams.h"
+#include <stdlib.h>
+#include <string.h>
+#include "mamedef.h"
+#include "es5503.h"
+
+typedef struct
+{
+	UINT16 freq;
+	UINT16 wtsize;
+	UINT8 control;
+	UINT8 vol;
+	UINT8 data;
+	UINT32 wavetblpointer;
+	UINT8 wavetblsize;
+	UINT8 resolution;
+
+	UINT32 accumulator;
+	UINT8 irqpend;
+	
+	UINT8 Muted;
+} ES5503Osc;
+
+typedef struct
+{
+	ES5503Osc oscillators32;
+
+	UINT32 dramsize;
+	UINT8 *docram;
+
+	//sound_stream * stream;
+
+	//void (*irq_callback)(running_device *, int);	// IRQ callback
+
+	//read8_device_func adc_read;		// callback for the 5503's built-in analog to digital converter
+
+	INT8 oscsenabled;		// # of oscillators enabled
+	int rege0;			// contents of register 0xe0
+
+	UINT8 channel_strobe;
+
+	UINT32 clock;
+	int output_channels;
+	int outchn_mask;
+	UINT32 output_rate;
+	//running_device *device;
+	
+	SRATE_CALLBACK SmpRateFunc;
+	void* SmpRateData;
+} ES5503Chip;
+
+/*INLINE ES5503Chip *get_safe_token(running_device *device)
+{
+	assert(device != NULL);
+	assert(device->type() == ES5503);
+	return (ES5503Chip *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+static const UINT16 wavesizes8 = { 256, 512, 1024, 2048, 4096, 8192, 16384, 32768 };
+static const UINT32 wavemasks8 = { 0x1ff00, 0x1fe00, 0x1fc00, 0x1f800, 0x1f000, 0x1e000, 0x1c000, 0x18000 };
+static const UINT32 accmasks8 = { 0xff, 0x1ff, 0x3ff, 0x7ff, 0xfff, 0x1fff, 0x3fff, 0x7fff };
+static const int resshifts8 = { 9, 10, 11, 12, 13, 14, 15, 16 };
+
+enum
+{
+	MODE_FREE = 0,
+	MODE_ONESHOT = 1,
+	MODE_SYNCAM = 2,
+	MODE_SWAP = 3
+};
+
+// halt_osc: handle halting an oscillator
+// chip = chip ptr
+// onum = oscillator #
+// type = 1 for 0 found in sample data, 0 for hit end of table size
+static void es5503_halt_osc(ES5503Chip *chip, int onum, int type, UINT32 *accumulator, int resshift)
+{
+	ES5503Osc *pOsc = &chip->oscillatorsonum;
+	ES5503Osc *pPartner = &chip->oscillatorsonum^1;
+	int mode = (pOsc->control>>1) & 3;
+	//int omode = (pPartner->control>>1) & 3;
+
+	// if 0 found in sample data or mode is not free-run, halt this oscillator
+	if ((mode != MODE_FREE) || (type != 0))
+	{
+		pOsc->control |= 1;
+	}
+	else // preserve the relative phase of the oscillator when looping
+	{
+		UINT16 wtsize = pOsc->wtsize - 1;
+		UINT32 altram = (*accumulator) >> resshift;
+
+		if (altram > wtsize)
+		{
+			altram -= wtsize;
+		}
+		else
+		{
+			altram = 0;
+		}
+
+		*accumulator = altram << resshift;
+	}
+
+	// if swap mode, start the partner
+	// Note: The swap mode fix breaks Silpheed and other games.
+	if (/*(*/mode == MODE_SWAP/*)*/ /*|| (omode == MODE_SWAP)*/)
+	{
+		pPartner->control &= ~1;	// clear the halt bit
+		pPartner->accumulator = 0; // and make sure it starts from the top (does this also need phase preservation?)
+	}
+
+	// IRQ enabled for this voice?
+	if (pOsc->control & 0x08)
+	{
+		pOsc->irqpend = 1;
+
+		/*if (chip->irq_callback)
+		{
+			chip->irq_callback(chip->device, 1);
+		}*/
+	}
+}
+
+//static STREAM_UPDATE( es5503_pcm_update )
+void es5503_pcm_update(void *param, stream_sample_t **outputs, int samples)
+{
+	// Note: The advantage of NOT using this buffer is not only less RAM usage,
+	// but also a huge speedup. This is, because the array is not marked
+	// as 'static' and thus re-allocated for every single call.
+	//INT32 mix48000*2;
+	//INT32 *mixp;
+	int osc, snum;
+	UINT32 ramptr;
+	ES5503Chip *chip = (ES5503Chip *)param;
+	int chnsStereo, chan;
+
+	memset(outputs0, 0x00, samples * sizeof(stream_sample_t));
+	memset(outputs1, 0x00, samples * sizeof(stream_sample_t));
+	//memset(mix, 0, sizeof(mix));
+
+	chnsStereo = chip->output_channels & ~1;
+	for (osc = 0; osc < chip->oscsenabled; osc++)
+	{
+		ES5503Osc *pOsc = &chip->oscillatorsosc;
+
+		if (!(pOsc->control & 1) && ! pOsc->Muted)
+		{
+			UINT32 wtptr = pOsc->wavetblpointer & wavemaskspOsc->wavetblsize, altram;
+			UINT32 acc = pOsc->accumulator;
+			UINT16 wtsize = pOsc->wtsize - 1;
+			//UINT8 ctrl = pOsc->control;
+			UINT16 freq = pOsc->freq;
+			INT16 vol = pOsc->vol;
+			//INT8 data = -128;
+			UINT8 chnMask = (pOsc->control >> 4) & 0x0F;
+			int resshift = resshiftspOsc->resolution - pOsc->wavetblsize;
+			UINT32 sizemask = accmaskspOsc->wavetblsize;
+			INT32 outData;
+			//mixp = &mix0 + chan;
+
+			chnMask &= chip->outchn_mask;
+			for (snum = 0; snum < samples; snum++)
+			{
+				altram = acc >> resshift;
+				ramptr = altram & sizemask;
+
+				acc += freq;
+
+				// channel strobe is always valid when reading; this allows potentially banking per voice
+				//chip->channel_strobe = (pOsc->control>>4) & 0xf;
+				//data = (INT32)chip->docramramptr + wtptr ^ 0x80;
+				pOsc->data = chip->docramramptr + wtptr;
+
+				if (pOsc->data == 0x00)
+				{
+					es5503_halt_osc(chip, osc, 1, &acc, resshift);
+				}
+				else
+				{
+					outData = (pOsc->data - 0x80) * vol;
+					//*mixp += outData;
+					//mixp += output_channels;
+					
+					// send groups of 2 channels to L or R
+					for (chan = 0; chan < chnsStereo; chan ++)
+					{
+						if (chan == chnMask)
+							outputschan & 1snum += outData;
+					}
+					outData = (outData * 181) >> 8;	// outData *= sqrt(2)
+					// send remaining channels to L+R
+					for (; chan < chip->output_channels; chan ++)
+					{
+						if (chan == chnMask)
+						{
+							outputs0snum += outData;
+							outputs1snum += outData;
+						}
+					}
+
+					if (altram >= wtsize)
+					{
+						es5503_halt_osc(chip, osc, 0, &acc, resshift);
+					}
+				}
+
+				// if oscillator halted, we've got no more samples to generate
+				if (pOsc->control & 1)
+				{
+					//pOsc->control |= 1;
+					break;
+				}
+			}
+
+			//pOsc->control = ctrl;
+			pOsc->accumulator = acc;
+			//pOsc->data = data ^ 0x80;
+		}
+	}
+
+/*	mixp = &mix0;
+	for (i = 0; i < samples; i++)
+		for (int chan = 0; chan < output_channels; chan++)
+			outputschani = (*mixp++)>>1;*/
+}
+
+
+//static DEVICE_START( es5503 )
+int device_start_es5503(void **_info, int clock, int channels)
+{
+	//const es5503_interface *intf;
+	int osc;
+	//ES5503Chip *chip = get_safe_token(device);
+	ES5503Chip *chip;
+
+	chip = (ES5503Chip *) calloc(1, sizeof(ES5503Chip));
+	*_info = (void *) chip;
+	
+	//intf = (const es5503_interface *)device->baseconfig().static_config();
+
+	//chip->irq_callback = intf->irq_callback;
+	//chip->adc_read = intf->adc_read;
+	//chip->docram = intf->wave_memory;
+	chip->dramsize = 0x20000;	// 128 KB
+	chip->docram = (UINT8*)malloc(chip->dramsize);
+	//chip->clock = device->clock();
+	//chip->device = device;
+	chip->clock = clock;
+
+	chip->output_channels = channels;
+	chip->outchn_mask = 1;
+	while(chip->outchn_mask < chip->output_channels)
+		chip->outchn_mask <<= 1;
+	chip->outchn_mask --;
+	chip->rege0 = 0xff;
+
+	/*for (osc = 0; osc < 32; osc++)
+	{
+		state_save_register_device_item(device, osc, chip->oscillatorsosc.freq);
+		state_save_register_device_item(device, osc, chip->oscillatorsosc.wtsize);
+		state_save_register_device_item(device, osc, chip->oscillatorsosc.control);
+		state_save_register_device_item(device, osc, chip->oscillatorsosc.vol);
+		state_save_register_device_item(device, osc, chip->oscillatorsosc.data);
+		state_save_register_device_item(device, osc, chip->oscillatorsosc.wavetblpointer);
+		state_save_register_device_item(device, osc, chip->oscillatorsosc.wavetblsize);
+		state_save_register_device_item(device, osc, chip->oscillatorsosc.resolution);
+		state_save_register_device_item(device, osc, chip->oscillatorsosc.accumulator);
+		state_save_register_device_item(device, osc, chip->oscillatorsosc.irqpend);
+	}*/
+
+	//chip->output_rate = (device->clock()/8)/34;	// (input clock / 8) / # of oscs. enabled + 2
+	//chip->stream = stream_create(device, 0, 2, chip->output_rate, chip, es5503_pcm_update);
+	chip->output_rate = (chip->clock/8)/34;	// (input clock / 8) / # of oscs. enabled + 2
+	
+	for (osc = 0; osc < 32; osc ++)
+		chip->oscillatorsosc.Muted = 0x00;
+	
+	return chip->output_rate;
+}
+
+void device_stop_es5503(void *_info)
+{
+	ES5503Chip *chip = (ES5503Chip *)_info;
+	
+	free(chip->docram);	chip->docram = NULL;
+
+	free(chip);	
+
+	return;
+}
+
+void device_reset_es5503(void *_info)
+{
+	ES5503Chip *chip = (ES5503Chip *)_info;
+	int osc;
+	ES5503Osc* tempOsc;
+	
+	for (osc = 0; osc < 32; osc++)
+	{
+		tempOsc = &chip->oscillatorsosc;
+		tempOsc->freq = 0;
+		tempOsc->wtsize = 0;
+		tempOsc->control = 0;
+		tempOsc->vol = 0;
+		tempOsc->data = 0x80;
+		tempOsc->wavetblpointer = 0;
+		tempOsc->wavetblsize = 0;
+		tempOsc->resolution = 0;
+		tempOsc->accumulator = 0;
+		tempOsc->irqpend = 0;
+	}
+	
+	chip->oscsenabled = 1;
+	
+	chip->channel_strobe = 0;
+	memset(chip->docram, 0x00, chip->dramsize);
+	
+	chip->output_rate = (chip->clock/8)/(2+chip->oscsenabled);	// (input clock / 8) / # of oscs. enabled + 2
+	if (chip->SmpRateFunc != NULL)
+		chip->SmpRateFunc(chip->SmpRateData, chip->output_rate);
+	
+	return;
+}
+
+
+//READ8_DEVICE_HANDLER( es5503_r )
+UINT8 es5503_r(void *_info, offs_t offset)
+{
+	UINT8 retval;
+	int i;
+	//ES5503Chip *chip = get_safe_token(device);
+	ES5503Chip *chip = (ES5503Chip *)_info;
+
+	//stream_update(chip->stream);
+
+	if (offset < 0xe0)
+	{
+		int osc = offset & 0x1f;
+
+		switch(offset & 0xe0)
+		{
+			case 0:		// freq lo
+				return (chip->oscillatorsosc.freq & 0xff);
+
+			case 0x20: 	// freq hi
+				return (chip->oscillatorsosc.freq >> 8);
+
+			case 0x40:	// volume
+				return chip->oscillatorsosc.vol;
+
+			case 0x60:	// data
+				return chip->oscillatorsosc.data;
+
+			case 0x80:	// wavetable pointer
+				return (chip->oscillatorsosc.wavetblpointer>>8) & 0xff;
+
+			case 0xa0:	// oscillator control
+				return chip->oscillatorsosc.control;
+
+			case 0xc0:	// bank select / wavetable size / resolution
+				retval = 0;
+				if (chip->oscillatorsosc.wavetblpointer & 0x10000)
+				{
+					retval |= 0x40;
+				}
+
+				retval |= (chip->oscillatorsosc.wavetblsize<<3);
+				retval |= chip->oscillatorsosc.resolution;
+				return retval;
+		}
+	}
+	else	 // global registers
+	{
+		switch (offset)
+		{
+			case 0xe0:	// interrupt status
+				retval = chip->rege0;
+
+				//m_irq_func(0);
+
+				// scan all oscillators
+				for (i = 0; i < chip->oscsenabled; i++)
+				{
+					if (chip->oscillatorsi.irqpend)
+					{
+						// signal this oscillator has an interrupt
+						retval = i<<1;
+
+						chip->rege0 = retval | 0x80;
+
+						// and clear its flag
+						chip->oscillatorsi.irqpend = 0;
+
+						/*if (chip->irq_callback)
+						{
+							chip->irq_callback(chip->device, 0);
+						}*/
+						break;
+					}
+				}
+
+				// if any oscillators still need to be serviced, assert IRQ again immediately
+				/*for (i = 0; i < chip->oscsenabled; i++)
+				{
+					if (chip->oscillatorsi.irqpend)
+					{
+						if (chip->irq_callback)
+						{
+							chip->irq_callback(chip->device, 1);
+						}
+						break;
+					}
+				}*/
+
+				return retval;
+
+			case 0xe1:	// oscillator enable
+				return (chip->oscsenabled-1)<<1;
+
+			case 0xe2:	// A/D converter
+				/*if (chip->adc_read)
+				{
+					return chip->adc_read(chip->device, 0);
+				}*/
+				break;
+		}
+	}
+
+	return 0;
+}
+
+//WRITE8_DEVICE_HANDLER( es5503_w )
+void es5503_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ES5503Chip *chip = get_safe_token(device);
+	ES5503Chip *chip = (ES5503Chip *)_info;
+
+	//stream_update(chip->stream);
+
+	if (offset < 0xe0)
+	{
+		int osc = offset & 0x1f;
+
+		switch(offset & 0xe0)
+		{
+			case 0:		// freq lo
+				chip->oscillatorsosc.freq &= 0xff00;
+				chip->oscillatorsosc.freq |= data;
+				break;
+
+			case 0x20: 	// freq hi
+				chip->oscillatorsosc.freq &= 0x00ff;
+				chip->oscillatorsosc.freq |= (data<<8);
+				break;
+
+			case 0x40:	// volume
+				chip->oscillatorsosc.vol = data;
+				break;
+
+			case 0x60:	// data - ignore writes
+				break;
+
+			case 0x80:	// wavetable pointer
+				chip->oscillatorsosc.wavetblpointer = (data<<8);
+				break;
+
+			case 0xa0:	// oscillator control
+				// if a fresh key-on, reset the ccumulator
+				if ((chip->oscillatorsosc.control & 1) && (!(data&1)))
+				{
+					chip->oscillatorsosc.accumulator = 0;
+				}
+
+				chip->oscillatorsosc.control = data;
+				break;
+
+			case 0xc0:	// bank select / wavetable size / resolution
+				if (data & 0x40)	// bank select - not used on the Apple IIgs
+				{
+					chip->oscillatorsosc.wavetblpointer |= 0x10000;
+				}
+				else
+				{
+					chip->oscillatorsosc.wavetblpointer &= 0xffff;
+				}
+
+				chip->oscillatorsosc.wavetblsize = ((data>>3) & 7);
+				chip->oscillatorsosc.wtsize = wavesizeschip->oscillatorsosc.wavetblsize;
+				chip->oscillatorsosc.resolution = (data & 7);
+				break;
+		}
+	}
+	else	 // global registers
+	{
+		switch (offset)
+		{
+			case 0xe0:	// interrupt status
+				break;
+
+			case 0xe1:	// oscillator enable
+				chip->oscsenabled = 1 + ((data>>1) & 0x1f);
+
+				chip->output_rate = (chip->clock/8)/(2+chip->oscsenabled);
+				//stream_set_sample_rate(chip->stream, chip->output_rate);
+				if (chip->SmpRateFunc != NULL)
+					chip->SmpRateFunc(chip->SmpRateData, chip->output_rate);
+				break;
+
+			case 0xe2:	// A/D converter
+				break;
+		}
+	}
+}
+
+/*void es5503_set_base(running_device *device, UINT8 *wavemem)
+{
+	ES5503Chip *chip = get_safe_token(device);
+
+	chip->docram = wavemem;
+}*/
+
+void es5503_write_ram(void *_info, offs_t DataStart, offs_t DataLength, const UINT8* RAMData)
+{
+	ES5503Chip *chip = (ES5503Chip *)_info;
+	
+	if (DataStart >= chip->dramsize)
+		return;
+	if (DataStart + DataLength > chip->dramsize)
+		DataLength = chip->dramsize - DataStart;
+	
+	memcpy(chip->docram + DataStart, RAMData, DataLength);
+	
+	return;
+}
+
+void es5503_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	ES5503Chip *chip = (ES5503Chip *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 32; CurChn ++)
+		chip->oscillatorsCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+void es5503_set_srchg_cb(void *_info, SRATE_CALLBACK CallbackFunc, void* DataPtr)
+{
+	ES5503Chip *chip = (ES5503Chip *)_info;
+	
+	// set Sample Rate Change Callback routine
+	chip->SmpRateFunc = CallbackFunc;
+	chip->SmpRateData = DataPtr;
+	
+	return;
+}
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( es5503 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ES5503Chip);					break;
+
+		// --- the following bits of info are returned as pointers to data or functions --- //
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( es5503 );			break;
+		case DEVINFO_FCT_STOP:							// Nothing //									break;
+		case DEVINFO_FCT_RESET:							// Nothing //									break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "ES5503");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Ensoniq ES550x");				break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright R. Belmont");		break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(ES5503, es5503);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5503.h Added

@@ -0,0 +1,34 @@
+#pragma once
+
+#ifndef __ES5503_H__
+#define __ES5503_H__
+
+///#include "devlegcy.h"
+
+/*typedef struct _es5503_interface es5503_interface;
+struct _es5503_interface
+{
+	void (*irq_callback)(running_device *device, int state);
+	read8_device_func adc_read;
+	UINT8 *wave_memory;
+};*/
+
+//READ8_DEVICE_HANDLER( es5503_r );
+//WRITE8_DEVICE_HANDLER( es5503_w );
+void es5503_w(void *chip, offs_t offset, UINT8 data);
+UINT8 es5503_r(void *chip, offs_t offset);
+
+void es5503_pcm_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_es5503(void **chip, int clock, int channels);
+void device_stop_es5503(void *chip);
+void device_reset_es5503(void *chip);
+//void es5503_set_base(running_device *device, UINT8 *wavemem);
+
+void es5503_write_ram(void *chip, offs_t DataStart, offs_t DataLength, const UINT8* RAMData);
+
+void es5503_set_mute_mask(void *chip, UINT32 MuteMask);
+void es5503_set_srchg_cb(void *chip, SRATE_CALLBACK CallbackFunc, void* DataPtr);
+
+//DECLARE_LEGACY_SOUND_DEVICE(ES5503, es5503);
+
+#endif /* __ES5503_H__ */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.c Added

@@ -0,0 +1,2445 @@
+/**********************************************************************************************
+
+ Ensoniq ES5505/6 driver
+ by Aaron Giles
+
+Ensoniq OTIS - ES5505 Ensoniq OTTO - ES5506
+
+ OTIS is a VLSI device designed in a 2 micron double metal OTTO is a VLSI device designed in a 1.5 micron double metal
+ CMOS process. The device is the next generation of audio CMOS process. The device is the next generation of audio
+ technology from ENSONIQ. This new chip achieves a new technology from ENSONIQ. All calculations in the device are
+ level of audio fidelity performance. These improvements made with at least 18-bit accuracy.
+ are achieved through the use of frequency interpolation
+ and on board real time digital filters. All calculations The major features of OTTO are:
+ in the device are made with at least 16 bit accuracy. - 68 pin PLCC package
+ - On chip real time digital filters
+ The major features of OTIS are: - Frequency interpolation
+ - 48 Pin dual in line package - 32 independent voices
+ - On chip real time digital filters - Loop start and stop posistions for each voice
+ - Frequency interpolation - Bidirectional and reverse looping
+ - 32 independent voices (up from 25 in DOCII) - 68000 compatibility for asynchronous bus communication
+ - Loop start and stop positions for each voice - separate host and sound memory interface
+ - Bidirectional and reverse looping - 6 channel stereo serial communication port
+ - 68000 compatibility for asynchronous bus communication - Programmable clocks for defining serial protocol
+ - On board pulse width modulation D to A - Internal volume multiplication and stereo panning
+ - 4 channel stereo serial communication port - A to D input for pots and wheels
+ - Internal volume multiplication and stereo panning - Hardware support for envelopes
+ - A to D input for pots and wheels - Support for dual OTTO systems
+ - Up to 10MHz operation - Optional compressed data format for sample data
+ - Up to 16MHz operation
+ ______ ______
+ _|o \__/ |_
+ A17/D13 - |_|1 48|_| - VSS A A A A A A
+ _| |_ 2 1 1 1 1 1 A
+ A18/D14 - |_|2 47|_| - A16/D12 0 9 8 7 6 5 1
+ _| |_ / / / / / / 4
+ A19/D15 - |_|3 46|_| - A15/D11 H H H H H H H V V H D D D D D D /
+ _| |_ D D D D D D D S D D 1 1 1 1 1 1 D
+ BS - |_|4 45|_| - A14/D10 0 1 2 3 4 5 6 S D 7 5 4 3 2 1 0 9
+ _| |_ ------------------------------------+
+ PWZERO - |_|5 44|_| - A13/D9 / 9 8 7 6 5 4 3 2 1 6 6 6 6 6 6 6 6 |
+ _| |_ / 8 7 6 5 4 3 2 1 |
+ SER0 - |_|6 43|_| - A12/D8 | |
+ _| E |_ SER0|10 60|A13/D8
+ SER1 - |_|7 N 42|_| - A11/D7 SER1|11 59|A12/D7
+ _| S |_ SER2|12 58|A11/D6
+ SER2 - |_|8 O 41|_| - A10/D6 SER3|13 ENSONIQ 57|A10/D5
+ _| N |_ SER4|14 56|A9/D4
+ SER3 - |_|9 I 40|_| - A9/D5 SER5|15 55|A8/D3
+ _| Q |_ WCLK|16 54|A7/D2
+ SERWCLK - |_|10 39|_| - A8/D4 LRCLK|17 ES5506 53|A6/D1
+ _| |_ BCLK|18 52|A5/D0
+ SERLR - |_|11 38|_| - A7/D3 RESB|19 51|A4
+ _| |_ HA5|20 50|A3
+ SERBCLK - |_|12 E 37|_| - A6/D2 HA4|21 OTTO 49|A2
+ _| S |_ HA3|22 48|A1
+ RLO - |_|13 5 36|_| - A5/D1 HA2|23 47|A0
+ _| 5 |_ HA1|24 46|BS1
+ RHI - |_|14 0 35|_| - A4/D0 HA0|25 45|BS0
+ _| 5 |_ POT_IN|26 44|DTACKB
+ LLO - |_|15 34|_| - CLKIN | 2 2 2 3 3 3 3 3 3 3 3 3 3 4 4 4 4 |
+ _| |_ | 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 |
+ LHI - |_|16 33|_| - CAS +--------------------------------------+
+ _| |_ B E E B E B B D S B B B E K B W W
+ POT - |_|17 O 32|_| - AMUX S B L N L S S D S S X S L Q / /
+ _| T |_ E E R E H M C V V A U A C R R R
+ DTACK - |_|18 I 31|_| - RAS R R D H R M C I M
+ _| S |_ _ D A
+ R/W - |_|19 30|_| - E T
+ _| |_ O
+ MS - |_|20 29|_| - IRQ P
+ _| |_
+ CS - |_|21 28|_| - A3
+ _| |_
+ RES - |_|22 27|_| - A2
+ _| |_
+ VSS - |_|23 26|_| - A1
+ _| |_
+ VDD - |_|24 25|_| - A0
+ |________________|
+
+***********************************************************************************************/
+
+//#include "emu.h"
+#include <stdlib.h>
+#include <string.h>	// for memset
+#include "mamedef.h"
+#include "es5506.h"
+
+
+
+/**********************************************************************************************
+
+ CONSTANTS
+
+***********************************************************************************************/
+
+#define LOG_COMMANDS			0
+#define RAINE_CHECK				0
+#define MAKE_WAVS				0
+
+#if MAKE_WAVS
+#include "wavwrite.h"
+#endif
+
+#define ACCESSING_BITS_0_7	( byteOfs)
+#define ACCESSING_BITS_8_15	(! byteOfs)
+
+
+#define MAX_SAMPLE_CHUNK		10000
+#define ULAW_MAXBITS			8
+
+#define CONTROL_BS1				0x8000
+#define CONTROL_BS0				0x4000
+#define CONTROL_CMPD			0x2000
+#define CONTROL_CA2				0x1000
+#define CONTROL_CA1				0x0800
+#define CONTROL_CA0				0x0400
+#define CONTROL_LP4				0x0200
+#define CONTROL_LP3				0x0100
+#define CONTROL_IRQ				0x0080
+#define CONTROL_DIR				0x0040
+#define CONTROL_IRQE			0x0020
+#define CONTROL_BLE				0x0010
+#define CONTROL_LPE				0x0008
+#define CONTROL_LEI				0x0004
+#define CONTROL_STOP1			0x0002
+#define CONTROL_STOP0			0x0001
+
+#define CONTROL_BSMASK			(CONTROL_BS1 | CONTROL_BS0)
+#define CONTROL_CAMASK			(CONTROL_CA2 | CONTROL_CA1 | CONTROL_CA0)
+#define CONTROL_LPMASK			(CONTROL_LP4 | CONTROL_LP3)
+#define CONTROL_LOOPMASK		(CONTROL_BLE | CONTROL_LPE)
+#define CONTROL_STOPMASK		(CONTROL_STOP1 | CONTROL_STOP0)
+
+
+
+/**********************************************************************************************
+
+ INTERNAL DATA STRUCTURES
+
+***********************************************************************************************/
+
+/* struct describing a single playing voice */
+typedef struct _es5506_voice es5506_voice;
+struct _es5506_voice
+{
+	/* external state */
+	UINT32		control;				/* control register */
+	UINT32		freqcount;				/* frequency count register */
+	UINT32		start;					/* start register */
+	UINT32		lvol;					/* left volume register */
+	UINT32		end;					/* end register */
+	UINT32		lvramp;					/* left volume ramp register */
+	UINT32		accum;					/* accumulator register */
+	UINT32		rvol;					/* right volume register */
+	UINT32		rvramp;					/* right volume ramp register */
+	UINT32		ecount;					/* envelope count register */
+	UINT32		k2;						/* k2 register */
+	UINT32		k2ramp;					/* k2 ramp register */
+	UINT32		k1;						/* k1 register */
+	UINT32		k1ramp;					/* k1 ramp register */
+	INT32		o4n1;					/* filter storage O4(n-1) */
+	INT32		o3n1;					/* filter storage O3(n-1) */
+	INT32		o3n2;					/* filter storage O3(n-2) */
+	INT32		o2n1;					/* filter storage O2(n-1) */
+	INT32		o2n2;					/* filter storage O2(n-2) */
+	INT32		o1n1;					/* filter storage O1(n-1) */
+	UINT32		exbank;					/* external address bank */
+
+	/* internal state */
+	UINT8		index;					/* index of this voice */
+	UINT8		filtcount;				/* filter count */
+	UINT8 Muted;
+	UINT32		accum_mask;
+};
+
+typedef struct _es5506_state es5506_state;
+struct _es5506_state
+{
+	//sound_stream *stream;				/* which stream are we using */
+	int			sample_rate;			/* current sample rate */
+	UINT32		region_size4;
+	UINT16 *	region_base4;			/* pointer to the base of the region */
+	UINT32		write_latch;			/* currently accumulated data for write */
+	UINT32		read_latch;				/* currently accumulated data for read */
+	UINT32		master_clock;			/* master clock frequency */
+	//void		(*irq_callback)(device_t *, int);	/* IRQ callback */
+	//UINT16		(*port_read)(void);		/* input port read */
+
+	UINT8		current_page;			/* current register page */
+	UINT8		active_voices;			/* number of active voices */
+	UINT8		mode;					/* MODE register */
+	UINT8		wst;					/* W_ST register */
+	UINT8		wend;					/* W_END register */
+	UINT8		lrend;					/* LR_END register */
+	UINT8		irqv;					/* IRQV register */
+
+	es5506_voice voice32;				/* the 32 voices */
+
+	INT32 *		scratch;
+
+	INT16 *		ulaw_lookup;
+	UINT16 *	volume_lookup;
+	//device_t *device;
+
+#if MAKE_WAVS
+	void *		wavraw;					/* raw waveform */
+#endif
+	int channels;						/* number of output channels: 1 .. 6 */
+	UINT8 sndtype;				/* 0 - ES5505, 1 - ES5506 */
+	
+	SRATE_CALLBACK SmpRateFunc;
+	void* SmpRateData;
+};
+
+
+/*INLINE es5506_state *get_safe_token(device_t *device)
+{
+	assert(device != NULL);
+	assert(device->type() == ES5505 || device->type() == ES5506);
+	return (es5506_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+
+/**********************************************************************************************
+
+ GLOBAL VARIABLES
+
+***********************************************************************************************/
+
+//static FILE *eslog;
+
+
+
+/**********************************************************************************************
+
+ update_irq_state -- update the IRQ state
+
+***********************************************************************************************/
+
+static void update_irq_state(es5506_state *chip)
+{
+	/* ES5505/6 irq line has been set high - inform the host */
+	//if (chip->irq_callback)
+	//	(*chip->irq_callback)(chip->device, 1); /* IRQB set high */
+}
+
+static void update_internal_irq_state(es5506_state *chip)
+{
+	/* Host (cpu) has just read the voice interrupt vector (voice IRQ ack).
+
+ Reset the voice vector to show the IRQB line is low (top bit set).
+ If we have any stacked interrupts (other voices waiting to be
+ processed - with their IRQ bit set) then they will be moved into
+ the vector next time the voice is processed. In emulation
+ terms they get updated next time generate_samples() is called.
+ */
+
+	chip->irqv=0x80;
+
+	//if (chip->irq_callback)
+	//	(*chip->irq_callback)(chip->device, 0); /* IRQB set low */
+}
+
+/**********************************************************************************************
+
+ compute_tables -- compute static tables
+
+***********************************************************************************************/
+
+static void compute_tables(es5506_state *chip)
+{
+	int i;
+
+	/* allocate ulaw lookup table */
+	//chip->ulaw_lookup = auto_alloc_array(chip->device->machine(), INT16, 1 << ULAW_MAXBITS);
+	chip->ulaw_lookup = (INT16*)malloc((1 << ULAW_MAXBITS) * sizeof(INT16));
+
+	/* generate ulaw lookup table */
+	for (i = 0; i < (1 << ULAW_MAXBITS); i++)
+	{
+		UINT16 rawval = (i << (16 - ULAW_MAXBITS)) | (1 << (15 - ULAW_MAXBITS));
+		UINT8 exponent = rawval >> 13;
+		UINT32 mantissa = (rawval << 3) & 0xffff;
+
+		if (exponent == 0)
+			chip->ulaw_lookupi = (INT16)mantissa >> 7;
+		else
+		{
+			mantissa = (mantissa >> 1) | (~mantissa & 0x8000);
+			chip->ulaw_lookupi = (INT16)mantissa >> (7 - exponent);
+		}
+	}
+
+	/* allocate volume lookup table */
+	//chip->volume_lookup = auto_alloc_array(chip->device->machine(), UINT16, 4096);
+	chip->volume_lookup = (UINT16*)malloc(4096 * sizeof(UINT16));
+
+	/* generate volume lookup table */
+	for (i = 0; i < 4096; i++)
+	{
+		UINT8 exponent = i >> 8;
+		UINT32 mantissa = (i & 0xff) | 0x100;
+
+		chip->volume_lookupi = (mantissa << 11) >> (20 - exponent);
+	}
+}
+
+
+
+/**********************************************************************************************
+
+ interpolate -- interpolate between two samples
+
+***********************************************************************************************/
+
+#define interpolate(sample1, sample2, accum)								\
+		(sample1 * (INT32)(0x800 - (accum & 0x7ff)) +						\
+		 sample2 * (INT32)(accum & 0x7ff)) >> 11;
+
+
+
+/**********************************************************************************************
+
+ apply_filters -- apply the 4-pole digital filter to the sample
+
+***********************************************************************************************/
+
+#define apply_filters(voice, sample)															\
+do																								\
+{																								\
+	/* pole 1 is always low-pass using K1 */													\
+	sample = ((INT32)(voice->k1 >> 2) * (sample - voice->o1n1) / 16384) + voice->o1n1;			\
+	voice->o1n1 = sample;																		\
+																								\
+	/* pole 2 is always low-pass using K1 */													\
+	sample = ((INT32)(voice->k1 >> 2) * (sample - voice->o2n1) / 16384) + voice->o2n1;			\
+	voice->o2n2 = voice->o2n1;																	\
+	voice->o2n1 = sample;																		\
+																								\
+	/* remaining poles depend on the current filter setting */									\
+	switch (voice->control & CONTROL_LPMASK)													\
+	{																							\
+		case 0:																					\
+			/* pole 3 is high-pass using K2 */													\
+			sample = sample - voice->o2n2 + ((INT32)(voice->k2 >> 2) * voice->o3n1) / 32768 + voice->o3n1 / 2; \
+			voice->o3n2 = voice->o3n1;															\
+			voice->o3n1 = sample;																\
+																								\
+			/* pole 4 is high-pass using K2 */													\
+			sample = sample - voice->o3n2 + ((INT32)(voice->k2 >> 2) * voice->o4n1) / 32768 + voice->o4n1 / 2; \
+			voice->o4n1 = sample;																\
+			break;																				\
+																								\
+		case CONTROL_LP3:																		\
+			/* pole 3 is low-pass using K1 */													\
+			sample = ((INT32)(voice->k1 >> 2) * (sample - voice->o3n1) / 16384) + voice->o3n1;	\
+			voice->o3n2 = voice->o3n1;															\
+			voice->o3n1 = sample;																\
+																								\
+			/* pole 4 is high-pass using K2 */													\
+			sample = sample - voice->o3n2 + ((INT32)(voice->k2 >> 2) * voice->o4n1) / 32768 + voice->o4n1 / 2; \
+			voice->o4n1 = sample;																\
+			break;																				\
+																								\
+		case CONTROL_LP4:																		\
+			/* pole 3 is low-pass using K2 */													\
+			sample = ((INT32)(voice->k2 >> 2) * (sample - voice->o3n1) / 16384) + voice->o3n1;	\
+			voice->o3n2 = voice->o3n1;															\
+			voice->o3n1 = sample;																\
+																								\
+			/* pole 4 is low-pass using K2 */													\
+			sample = ((INT32)(voice->k2 >> 2) * (sample - voice->o4n1) / 16384) + voice->o4n1;	\
+			voice->o4n1 = sample;																\
+			break;																				\
+																								\
+		case CONTROL_LP4 | CONTROL_LP3:															\
+			/* pole 3 is low-pass using K1 */													\
+			sample = ((INT32)(voice->k1 >> 2) * (sample - voice->o3n1) / 16384) + voice->o3n1;	\
+			voice->o3n2 = voice->o3n1;															\
+			voice->o3n1 = sample;																\
+																								\
+			/* pole 4 is low-pass using K2 */													\
+			sample = ((INT32)(voice->k2 >> 2) * (sample - voice->o4n1) / 16384) + voice->o4n1;	\
+			voice->o4n1 = sample;																\
+			break;																				\
+	}																							\
+} while (0)
+
+
+
+/**********************************************************************************************
+
+ update_envelopes -- update the envelopes
+
+***********************************************************************************************/
+
+#define update_envelopes(voice, samples)											\
+do																					\
+{																					\
+	int count = (samples > 1 && samples > voice->ecount) ? voice->ecount : samples;	\
+																					\
+	/* decrement the envelope counter */											\
+	voice->ecount -= count;															\
+																					\
+	/* ramp left volume */															\
+	if (voice->lvramp)																\
+	{																				\
+		voice->lvol += (INT8)voice->lvramp * count;									\
+		if ((INT32)voice->lvol < 0) voice->lvol = 0;								\
+		else if (voice->lvol > 0xffff) voice->lvol = 0xffff;						\
+	}																				\
+																					\
+	/* ramp right volume */															\
+	if (voice->rvramp)																\
+	{																				\
+		voice->rvol += (INT8)voice->rvramp * count;									\
+		if ((INT32)voice->rvol < 0) voice->rvol = 0;								\
+		else if (voice->rvol > 0xffff) voice->rvol = 0xffff;						\
+	}																				\
+																					\
+	/* ramp k1 filter constant */													\
+	if (voice->k1ramp && ((INT32)voice->k1ramp >= 0 || !(voice->filtcount & 7)))	\
+	{																				\
+		voice->k1 += (INT8)voice->k1ramp * count;									\
+		if ((INT32)voice->k1 < 0) voice->k1 = 0;									\
+		else if (voice->k1 > 0xffff) voice->k1 = 0xffff;							\
+	}																				\
+																					\
+	/* ramp k2 filter constant */													\
+	if (voice->k2ramp && ((INT32)voice->k2ramp >= 0 || !(voice->filtcount & 7)))	\
+	{																				\
+		voice->k2 += (INT8)voice->k2ramp * count;									\
+		if ((INT32)voice->k2 < 0) voice->k2 = 0;									\
+		else if (voice->k2 > 0xffff) voice->k2 = 0xffff;							\
+	}																				\
+																					\
+	/* update the filter constant counter */										\
+	voice->filtcount += count;														\
+																					\
+} while (0)
+
+
+
+/**********************************************************************************************
+
+ check_for_end_forward
+ check_for_end_reverse -- check for loop end and loop appropriately
+
+***********************************************************************************************/
+
+#define check_for_end_forward(voice, accum)											\
+do																					\
+{																					\
+	/* are we past the end? */														\
+	if (accum > voice->end && !(voice->control & CONTROL_LEI))						\
+	{																				\
+		/* generate interrupt if required */										\
+		if (voice->control&CONTROL_IRQE)											\
+			voice->control |= CONTROL_IRQ;											\
+																					\
+		/* handle the different types of looping */									\
+		switch (voice->control & CONTROL_LOOPMASK)									\
+		{																			\
+			/* non-looping */														\
+			case 0:																	\
+				voice->control |= CONTROL_STOP0;									\
+				goto alldone;														\
+																					\
+			/* uni-directional looping */											\
+			case CONTROL_LPE:														\
+				accum = (voice->start + (accum - voice->end)) & voice->accum_mask;	\
+				break;																\
+																					\
+			/* trans-wave looping */												\
+			case CONTROL_BLE:														\
+				accum = (voice->start + (accum - voice->end)) & voice->accum_mask;	\
+				voice->control = (voice->control & ~CONTROL_LOOPMASK) | CONTROL_LEI;\
+				break;																\
+																					\
+			/* bi-directional looping */											\
+			case CONTROL_LPE | CONTROL_BLE:											\
+				accum = (voice->end - (accum - voice->end)) & voice->accum_mask;	\
+				voice->control ^= CONTROL_DIR;										\
+				goto reverse;														\
+		}																			\
+	}																				\
+} while (0)
+
+
+#define check_for_end_reverse(voice, accum)											\
+do																					\
+{																					\
+	/* are we past the end? */														\
+	if (accum < voice->start && !(voice->control & CONTROL_LEI))					\
+	{																				\
+		/* generate interrupt if required */										\
+		if (voice->control&CONTROL_IRQE)											\
+			voice->control |= CONTROL_IRQ;											\
+																					\
+		/* handle the different types of looping */									\
+		switch (voice->control & CONTROL_LOOPMASK)									\
+		{																			\
+			/* non-looping */														\
+			case 0:																	\
+				voice->control |= CONTROL_STOP0;									\
+				goto alldone;														\
+																					\
+			/* uni-directional looping */											\
+			case CONTROL_LPE:														\
+				accum = (voice->end - (voice->start - accum)) & voice->accum_mask;	\
+				break;																\
+																					\
+			/* trans-wave looping */												\
+			case CONTROL_BLE:														\
+				accum = (voice->end - (voice->start - accum)) & voice->accum_mask;	\
+				voice->control = (voice->control & ~CONTROL_LOOPMASK) | CONTROL_LEI;\
+				break;																\
+																					\
+			/* bi-directional looping */											\
+			case CONTROL_LPE | CONTROL_BLE:											\
+				accum = (voice->start + (voice->start - accum)) & voice->accum_mask;\
+				voice->control ^= CONTROL_DIR;										\
+				goto reverse;														\
+		}																			\
+	}																				\
+} while (0)
+
+
+
+/**********************************************************************************************
+
+ generate_dummy -- generate nothing, just apply envelopes
+
+***********************************************************************************************/
+
+static void generate_dummy(es5506_state *chip, es5506_voice *voice, UINT16 *base, INT32 *lbuffer, INT32 *rbuffer, int samples)
+{
+	UINT32 freqcount = voice->freqcount;
+	UINT32 accum = voice->accum & voice->accum_mask;
+
+	/* outer loop, in case we switch directions */
+	while (samples > 0 && !(voice->control & CONTROL_STOPMASK))
+	{
+reverse:
+		/* two cases: first case is forward direction */
+		if (!(voice->control & CONTROL_DIR))
+		{
+			/* loop while we still have samples to generate */
+			while (samples--)
+			{
+				/* fetch two samples */
+				accum = (accum + freqcount) & voice->accum_mask;
+
+				/* update filters/volumes */
+				if (voice->ecount != 0)
+					update_envelopes(voice, 1);
+
+				/* check for loop end */
+				check_for_end_forward(voice, accum);
+			}
+		}
+
+		/* two cases: second case is backward direction */
+		else
+		{
+			/* loop while we still have samples to generate */
+			while (samples--)
+			{
+				/* fetch two samples */
+				accum = (accum - freqcount) & voice->accum_mask;
+
+				/* update filters/volumes */
+				if (voice->ecount != 0)
+					update_envelopes(voice, 1);
+
+				/* check for loop end */
+				check_for_end_reverse(voice, accum);
+			}
+		}
+	}
+
+	/* if we stopped, process any additional envelope */
+alldone:
+	voice->accum = accum;
+	if (samples > 0)
+		update_envelopes(voice, samples);
+}
+
+
+
+/**********************************************************************************************
+
+ generate_ulaw -- general u-law decoding routine
+
+***********************************************************************************************/
+
+static void generate_ulaw(es5506_state *chip, es5506_voice *voice, UINT16 *base, INT32 *lbuffer, INT32 *rbuffer, int samples)
+{
+	UINT32 freqcount = voice->freqcount;
+	UINT32 accum = voice->accum & voice->accum_mask;
+	INT32 lvol = chip->volume_lookupvoice->lvol >> 4;
+	INT32 rvol = chip->volume_lookupvoice->rvol >> 4;
+
+	/* pre-add the bank offset */
+	base += voice->exbank;
+
+	/* outer loop, in case we switch directions */
+	while (samples > 0 && !(voice->control & CONTROL_STOPMASK))
+	{
+reverse:
+		/* two cases: first case is forward direction */
+		if (!(voice->control & CONTROL_DIR))
+		{
+			/* loop while we still have samples to generate */
+			while (samples--)
+			{
+				/* fetch two samples */
+#ifdef VGM_BIG_ENDIAN
+	#warning "ES5506 sound emulation not Endian-Safe!"
+#endif
+				INT32 val1 = baseaccum >> 11;
+				INT32 val2 = base((accum + (1 << 11)) & voice->accum_mask) >> 11;
+
+				/* decompress u-law */
+				val1 = chip->ulaw_lookupval1 >> (16 - ULAW_MAXBITS);
+				val2 = chip->ulaw_lookupval2 >> (16 - ULAW_MAXBITS);
+
+				/* interpolate */
+				val1 = interpolate(val1, val2, accum);
+				accum = (accum + freqcount) & voice->accum_mask;
+
+				/* apply filters */
+				apply_filters(voice, val1);
+
+				/* update filters/volumes */
+				if (voice->ecount != 0)
+				{
+					update_envelopes(voice, 1);
+					lvol = chip->volume_lookupvoice->lvol >> 4;
+					rvol = chip->volume_lookupvoice->rvol >> 4;
+				}
+
+				/* apply volumes and add */
+				*lbuffer++ += (val1 * lvol) >> 11;
+				*rbuffer++ += (val1 * rvol) >> 11;
+
+				/* check for loop end */
+				check_for_end_forward(voice, accum);
+			}
+		}
+
+		/* two cases: second case is backward direction */
+		else
+		{
+			/* loop while we still have samples to generate */
+			while (samples--)
+			{
+				/* fetch two samples */
+#ifdef VGM_BIG_ENDIAN
+	#warning "ES5506 sound emulation not Endian-Safe!"
+#endif
+				INT32 val1 = baseaccum >> 11;
+				INT32 val2 = base((accum + (1 << 11)) & voice->accum_mask) >> 11;
+
+				/* decompress u-law */
+				val1 = chip->ulaw_lookupval1 >> (16 - ULAW_MAXBITS);
+				val2 = chip->ulaw_lookupval2 >> (16 - ULAW_MAXBITS);
+
+				/* interpolate */
+				val1 = interpolate(val1, val2, accum);
+				accum = (accum - freqcount) & voice->accum_mask;
+
+				/* apply filters */
+				apply_filters(voice, val1);
+
+				/* update filters/volumes */
+				if (voice->ecount != 0)
+				{
+					update_envelopes(voice, 1);
+					lvol = chip->volume_lookupvoice->lvol >> 4;
+					rvol = chip->volume_lookupvoice->rvol >> 4;
+				}
+
+				/* apply volumes and add */
+				*lbuffer++ += (val1 * lvol) >> 11;
+				*rbuffer++ += (val1 * rvol) >> 11;
+
+				/* check for loop end */
+				check_for_end_reverse(voice, accum);
+			}
+		}
+	}
+
+	/* if we stopped, process any additional envelope */
+alldone:
+	voice->accum = accum;
+	if (samples > 0)
+		update_envelopes(voice, samples);
+}
+
+
+
+/**********************************************************************************************
+
+ generate_pcm -- general PCM decoding routine
+
+***********************************************************************************************/
+
+static void generate_pcm(es5506_state *chip, es5506_voice *voice, UINT16 *base, INT32 *lbuffer, INT32 *rbuffer, int samples)
+{
+	UINT32 freqcount = voice->freqcount;
+	UINT32 accum = voice->accum & voice->accum_mask;
+	INT32 lvol = chip->volume_lookupvoice->lvol >> 4;
+	INT32 rvol = chip->volume_lookupvoice->rvol >> 4;
+
+	/* pre-add the bank offset */
+	base += voice->exbank;
+
+	/* outer loop, in case we switch directions */
+	while (samples > 0 && !(voice->control & CONTROL_STOPMASK))
+	{
+reverse:
+		/* two cases: first case is forward direction */
+		if (!(voice->control & CONTROL_DIR))
+		{
+			/* loop while we still have samples to generate */
+			while (samples--)
+			{
+				/* fetch two samples */
+#ifdef VGM_BIG_ENDIAN
+	#warning "ES5506 sound emulation not Endian-Safe!"
+#endif
+				INT32 val1 = (INT16)baseaccum >> 11;
+				INT32 val2 = (INT16)base((accum + (1 << 11)) & voice->accum_mask) >> 11;
+
+				/* interpolate */
+				val1 = interpolate(val1, val2, accum);
+				accum = (accum + freqcount) & voice->accum_mask;
+
+				/* apply filters */
+				apply_filters(voice, val1);
+
+				/* update filters/volumes */
+				if (voice->ecount != 0)
+				{
+					update_envelopes(voice, 1);
+					lvol = chip->volume_lookupvoice->lvol >> 4;
+					rvol = chip->volume_lookupvoice->rvol >> 4;
+				}
+
+				/* apply volumes and add */
+				*lbuffer++ += (val1 * lvol) >> 11;
+				*rbuffer++ += (val1 * rvol) >> 11;
+
+				/* check for loop end */
+				check_for_end_forward(voice, accum);
+			}
+		}
+
+		/* two cases: second case is backward direction */
+		else
+		{
+			/* loop while we still have samples to generate */
+			while (samples--)
+			{
+				/* fetch two samples */
+#ifdef VGM_BIG_ENDIAN
+	#warning "ES5506 sound emulation not Endian-Safe!"
+#endif
+				INT32 val1 = (INT16)baseaccum >> 11;
+				INT32 val2 = (INT16)base((accum + (1 << 11)) & voice->accum_mask) >> 11;
+
+				/* interpolate */
+				val1 = interpolate(val1, val2, accum);
+				accum = (accum - freqcount) & voice->accum_mask;
+
+				/* apply filters */
+				apply_filters(voice, val1);
+
+				/* update filters/volumes */
+				if (voice->ecount != 0)
+				{
+					update_envelopes(voice, 1);
+					lvol = chip->volume_lookupvoice->lvol >> 4;
+					rvol = chip->volume_lookupvoice->rvol >> 4;
+				}
+
+				/* apply volumes and add */
+				*lbuffer++ += (val1 * lvol) >> 11;
+				*rbuffer++ += (val1 * rvol) >> 11;
+
+				/* check for loop end */
+				check_for_end_reverse(voice, accum);
+			}
+		}
+	}
+
+	/* if we stopped, process any additional envelope */
+alldone:
+	voice->accum = accum;
+	if (samples > 0)
+		update_envelopes(voice, samples);
+}
+
+
+
+/**********************************************************************************************
+
+ generate_samples -- tell each voice to generate samples
+
+***********************************************************************************************/
+
+static void generate_samples(es5506_state *chip, INT32 **outputs, int offset, int samples)
+{
+	int v;
+	int i;
+	int voice_channel;
+	int channel;
+	int l;
+	int r;
+	INT32 *left;
+	INT32 *right;
+
+	/* skip if nothing to do */
+	if (!samples)
+		return;
+
+	/* clear out the accumulator */
+	for (i = 0; i < chip->channels << 1; i++)
+	{
+		memset(outputsi + offset, 0, sizeof(INT32) * samples);
+	}
+
+	/* loop over voices */
+	for (v = 0; v <= chip->active_voices; v++)
+	{
+		es5506_voice *voice = &chip->voicev;
+		UINT16 *base = chip->region_basevoice->control >> 14;
+
+		/* special case: if end == start, stop the voice */
+		if (voice->start == voice->end)
+			voice->control |= CONTROL_STOP0;
+
+		voice_channel = (voice->control & CONTROL_CAMASK) >> 10;
+		channel = voice_channel % chip->channels;
+		l = channel << 1;
+		r = l + 1;
+		left = outputsl + offset;
+		right = outputsr + offset;
+
+		/* generate from the appropriate source */
+		if (!base)
+		{
+			//logerror("es5506: NULL region base %d\n",voice->control >> 14);
+			generate_dummy(chip, voice, base, left, right, samples);
+		}
+		else if (voice->control & 0x2000)
+			generate_ulaw(chip, voice, base, left, right, samples);
+		else
+			generate_pcm(chip, voice, base, left, right, samples);
+
+		/* does this voice have it's IRQ bit raised? */
+		if (voice->control&CONTROL_IRQ)
+		{
+#ifdef _DEBUG
+			logerror("es5506: IRQ raised on voice %d!!\n",v);
+#endif
+			/* only update voice vector if existing IRQ is acked by host */
+			if (chip->irqv&0x80)
+			{
+				/* latch voice number into vector, and set high bit low */
+				chip->irqv=v&0x7f;
+
+				/* take down IRQ bit on voice */
+				voice->control&=~CONTROL_IRQ;
+
+				/* inform host of irq */
+				update_irq_state(chip);
+			}
+		}
+	}
+}
+
+
+
+/**********************************************************************************************
+
+ es5506_update -- update the sound chip so that it is in sync with CPU execution
+
+***********************************************************************************************/
+
+//static STREAM_UPDATE( es5506_update )
+void es5506_update(void *param, stream_sample_t **outputs, int samples)
+{
+	es5506_state *chip = (es5506_state *)param;
+	int offset;
+
+#if MAKE_WAVS
+	/* start the logging once we have a sample rate */
+	if (chip->sample_rate)
+	{
+		if (!chip->wavraw)
+			chip->wavraw = wav_open("raw.wav", chip->sample_rate, 2);
+	}
+#endif
+
+	/* loop until all samples are output */
+	offset = 0;
+	while (samples)
+	{
+		int length = (samples > MAX_SAMPLE_CHUNK) ? MAX_SAMPLE_CHUNK : samples;
+
+		generate_samples(chip, outputs, offset, length);
+
+		/* account for these samples */
+		offset += length;
+		samples -= length;
+	}
+}
+
+
+/**********************************************************************************************
+
+ DEVICE_START( es5506 ) -- start emulation of the ES5506
+
+***********************************************************************************************/
+
+//static void es5506_start_common(device_t *device, const void *config, device_type sndtype)
+static void es5506_start_common(es5506_state *chip, int clock, UINT8 sndtype)
+{
+	//const es5506_interface *intf = (const es5506_interface *)config;
+	//es5506_state *chip = get_safe_token(device);
+//	int j;
+//	UINT32 accum_mask;
+	int max_chns;
+
+	chip->sndtype = sndtype;
+	/* only override the number of channels if the value is in the valid range 1 .. 6 */
+	max_chns = chip->sndtype ? 6 : 4;	// 6 for ES5506, 4 for ES5505
+	if (chip->channels < 1 || chip->channels > max_chns)
+		chip->channels = 1;	/* 1 channel by default, for backward compatibility */
+	
+	/* debugging */
+	//if (LOG_COMMANDS && !eslog)
+	//	eslog = fopen("es.log", "w");
+
+	/* create the stream */
+//	chip->stream = device->machine().sound().stream_alloc(*device, 0, 2, device->clock() / (16*32), chip, es5506_update);
+
+	/* initialize the regions */
+//	chip->region_base0 = intf->region0 ? (UINT16 *)device->machine().region(intf->region0)->base() : NULL;
+//	chip->region_base1 = intf->region1 ? (UINT16 *)device->machine().region(intf->region1)->base() : NULL;
+//	chip->region_base2 = intf->region2 ? (UINT16 *)device->machine().region(intf->region2)->base() : NULL;
+//	chip->region_base3 = intf->region3 ? (UINT16 *)device->machine().region(intf->region3)->base() : NULL;
+
+	/* initialize the rest of the structure */
+//	chip->device = device;
+//	chip->master_clock = device->clock();
+//	chip->irq_callback = intf->irq_callback;
+	chip->master_clock = clock;
+	chip->irqv = 0x80;
+
+	if (chip->sndtype)
+	{
+		/* KT-76 assumes all voices are active on an ES5506 without setting them! */
+		chip->active_voices = 31;
+		chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
+		//chip->stream->set_sample_rate(m_sample_rate);
+	}
+	else
+	{
+		// ES5505
+		chip->sample_rate = chip->master_clock / (16*32);
+	}
+
+	/* compute the tables */
+	compute_tables(chip);
+
+	/* init the voices */
+	//accum_mask = (chip->sndtype == ES5506) ? 0xffffffff : 0x7fffffff;
+	// now done in device_reset
+
+	/* allocate memory */
+	//chip->scratch = auto_alloc_array(device->machine(), INT32, 2 * MAX_SAMPLE_CHUNK);
+	chip->scratch = (INT32*)malloc(2 * MAX_SAMPLE_CHUNK * sizeof(INT32));
+
+	/* register save */
+	/*device->save_item(NAME(chip->sample_rate));
+	device->save_item(NAME(chip->write_latch));
+	device->save_item(NAME(chip->read_latch));
+
+	device->save_item(NAME(chip->current_page));
+	device->save_item(NAME(chip->active_voices));
+	device->save_item(NAME(chip->mode));
+	device->save_item(NAME(chip->wst));
+	device->save_item(NAME(chip->wend));
+	device->save_item(NAME(chip->lrend));
+	device->save_item(NAME(chip->irqv));
+
+	device->save_pointer(NAME(chip->scratch), 2 * MAX_SAMPLE_CHUNK);
+
+	for (j = 0; j < 32; j++)
+	{
+		device->save_item(NAME(chip->voicej.control), j);
+		device->save_item(NAME(chip->voicej.freqcount), j);
+		device->save_item(NAME(chip->voicej.start), j);
+		device->save_item(NAME(chip->voicej.lvol), j);
+		device->save_item(NAME(chip->voicej.end), j);
+		device->save_item(NAME(chip->voicej.lvramp), j);
+		device->save_item(NAME(chip->voicej.accum), j);
+		device->save_item(NAME(chip->voicej.rvol), j);
+		device->save_item(NAME(chip->voicej.rvramp), j);
+		device->save_item(NAME(chip->voicej.ecount), j);
+		device->save_item(NAME(chip->voicej.k2), j);
+		device->save_item(NAME(chip->voicej.k2ramp), j);
+		device->save_item(NAME(chip->voicej.k1), j);
+		device->save_item(NAME(chip->voicej.k1ramp), j);
+		device->save_item(NAME(chip->voicej.o4n1), j);
+		device->save_item(NAME(chip->voicej.o3n1), j);
+		device->save_item(NAME(chip->voicej.o3n2), j);
+		device->save_item(NAME(chip->voicej.o2n1), j);
+		device->save_item(NAME(chip->voicej.o2n2), j);
+		device->save_item(NAME(chip->voicej.o1n1), j);
+		device->save_item(NAME(chip->voicej.exbank), j);
+		device->save_item(NAME(chip->voicej.filtcount), j);
+	}*/
+
+	/* success */
+}
+
+
+//static DEVICE_START( es5506 )
+int device_start_es5506(void **_info, int clock, int channels)
+{
+	es5506_state* chip;
+
+	chip = (es5506_state *) calloc(1, sizeof(es5506_state));
+	*_info = (void *) chip;
+	
+	//es5506_start_common(device, device->static_config(), ES5506);
+	//chip->channels = channels;
+	chip->channels = 1;	// fixed to L+R for now
+	es5506_start_common(chip, clock & 0x7FFFFFFF, clock >> 31);
+	return chip->master_clock / (16*32);
+}
+
+
+
+/**********************************************************************************************
+
+ DEVICE_STOP( es5506 ) -- stop emulation of the ES5506
+
+***********************************************************************************************/
+
+//static DEVICE_STOP( es5506 )
+void device_stop_es5506(void *_info)
+{
+	es5506_state *chip = (es5506_state *)_info;
+	
+	free(chip->ulaw_lookup);	chip->ulaw_lookup = NULL;
+	free(chip->volume_lookup);	chip->volume_lookup = NULL;
+	free(chip->scratch);		chip->scratch = NULL;
+
+	/* debugging */
+	/*if (LOG_COMMANDS && eslog)
+	{
+		fclose(eslog);
+		eslog = NULL;
+	}*/
+
+#if MAKE_WAVS
+{
+	int i;
+
+	for (i = 0; i < MAX_ES5506; i++)
+	{
+		if (es5506i.wavraw)
+			wav_close(es5506i.wavraw);
+	}
+}
+#endif
+
+	free(chip);
+}
+
+
+//static DEVICE_RESET( es5506 )
+void device_reset_es5506(void *_info)
+{
+	es5506_state *chip = (es5506_state *)_info;
+	int j;
+	UINT32 accum_mask;
+	
+	accum_mask = chip->sndtype ? 0xffffffff : 0x7fffffff;
+	for (j = 0; j < 32; j++)
+	{
+		chip->voicej.index = j;
+		chip->voicej.control = CONTROL_STOPMASK;
+		chip->voicej.lvol = 0xffff;
+		chip->voicej.rvol = 0xffff;
+		chip->voicej.exbank = 0;
+		chip->voicej.accum_mask = accum_mask;
+	}
+}
+
+
+
+/**********************************************************************************************
+
+ es5506_reg_write -- handle a write to the selected ES5506 register
+
+***********************************************************************************************/
+
+INLINE void es5506_reg_write_low(es5506_state *chip, es5506_voice *voice, offs_t offset, UINT32 data)
+{
+	switch (offset)
+	{
+		case 0x00/8:	/* CR */
+			voice->control = data & 0xffff;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, control=%04x\n", chip->current_page & 0x1f, voice->control);
+			break;
+
+		case 0x08/8:	/* FC */
+			voice->freqcount = data & 0x1ffff;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, freq count=%08x\n", chip->current_page & 0x1f, voice->freqcount);
+			break;
+
+		case 0x10/8:	/* LVOL */
+			voice->lvol = data & 0xffff;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, left vol=%04x\n", chip->current_page & 0x1f, voice->lvol);
+			break;
+
+		case 0x18/8:	/* LVRAMP */
+			voice->lvramp = (data & 0xff00) >> 8;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, left vol ramp=%04x\n", chip->current_page & 0x1f, voice->lvramp);
+			break;
+
+		case 0x20/8:	/* RVOL */
+			voice->rvol = data & 0xffff;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, right vol=%04x\n", chip->current_page & 0x1f, voice->rvol);
+			break;
+
+		case 0x28/8:	/* RVRAMP */
+			voice->rvramp = (data & 0xff00) >> 8;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, right vol ramp=%04x\n", chip->current_page & 0x1f, voice->rvramp);
+			break;
+
+		case 0x30/8:	/* ECOUNT */
+			voice->ecount = data & 0x1ff;
+			voice->filtcount = 0;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, envelope count=%04x\n", chip->current_page & 0x1f, voice->ecount);
+			break;
+
+		case 0x38/8:	/* K2 */
+			voice->k2 = data & 0xffff;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, K2=%04x\n", chip->current_page & 0x1f, voice->k2);
+			break;
+
+		case 0x40/8:	/* K2RAMP */
+			voice->k2ramp = ((data & 0xff00) >> 8) | ((data & 0x0001) << 31);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, K2 ramp=%04x\n", chip->current_page & 0x1f, voice->k2ramp);
+			break;
+
+		case 0x48/8:	/* K1 */
+			voice->k1 = data & 0xffff;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, K1=%04x\n", chip->current_page & 0x1f, voice->k1);
+			break;
+
+		case 0x50/8:	/* K1RAMP */
+			voice->k1ramp = ((data & 0xff00) >> 8) | ((data & 0x0001) << 31);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, K1 ramp=%04x\n", chip->current_page & 0x1f, voice->k1ramp);
+			break;
+
+		case 0x58/8:	/* ACTV */
+		{
+			chip->active_voices = data & 0x1f;
+			chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
+			//chip->stream->set_sample_rate(chip->sample_rate);
+			if (chip->SmpRateFunc != NULL)
+				chip->SmpRateFunc(chip->SmpRateData, chip->sample_rate);
+
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "active voices=%d, sample_rate=%d\n", chip->active_voices, chip->sample_rate);
+			break;
+		}
+
+		case 0x60/8:	/* MODE */
+			chip->mode = data & 0x1f;
+			break;
+
+		case 0x68/8:	/* PAR - read only */
+		case 0x70/8:	/* IRQV - read only */
+			break;
+
+		case 0x78/8:	/* PAGE */
+			chip->current_page = data & 0x7f;
+			break;
+	}
+}
+
+
+INLINE void es5506_reg_write_high(es5506_state *chip, es5506_voice *voice, offs_t offset, UINT32 data)
+{
+	switch (offset)
+	{
+		case 0x00/8:	/* CR */
+			voice->control = data & 0xffff;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, control=%04x\n", chip->current_page & 0x1f, voice->control);
+			break;
+
+		case 0x08/8:	/* START */
+			voice->start = data & 0xfffff800;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, loop start=%08x\n", chip->current_page & 0x1f, voice->start);
+			break;
+
+		case 0x10/8:	/* END */
+			voice->end = data & 0xffffff80;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, loop end=%08x\n", chip->current_page & 0x1f, voice->end);
+			break;
+
+		case 0x18/8:	/* ACCUM */
+			voice->accum = data;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, accum=%08x\n", chip->current_page & 0x1f, voice->accum);
+			break;
+
+		case 0x20/8:	/* O4(n-1) */
+			voice->o4n1 = (INT32)(data << 14) >> 14;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, O4(n-1)=%05x\n", chip->current_page & 0x1f, voice->o4n1 & 0x3ffff);
+			break;
+
+		case 0x28/8:	/* O3(n-1) */
+			voice->o3n1 = (INT32)(data << 14) >> 14;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, O3(n-1)=%05x\n", chip->current_page & 0x1f, voice->o3n1 & 0x3ffff);
+			break;
+
+		case 0x30/8:	/* O3(n-2) */
+			voice->o3n2 = (INT32)(data << 14) >> 14;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, O3(n-2)=%05x\n", chip->current_page & 0x1f, voice->o3n2 & 0x3ffff);
+			break;
+
+		case 0x38/8:	/* O2(n-1) */
+			voice->o2n1 = (INT32)(data << 14) >> 14;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, O2(n-1)=%05x\n", chip->current_page & 0x1f, voice->o2n1 & 0x3ffff);
+			break;
+
+		case 0x40/8:	/* O2(n-2) */
+			voice->o2n2 = (INT32)(data << 14) >> 14;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, O2(n-2)=%05x\n", chip->current_page & 0x1f, voice->o2n2 & 0x3ffff);
+			break;
+
+		case 0x48/8:	/* O1(n-1) */
+			voice->o1n1 = (INT32)(data << 14) >> 14;
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "voice %d, O1(n-1)=%05x\n", chip->current_page & 0x1f, voice->o1n1 & 0x3ffff);
+			break;
+
+		case 0x50/8:	/* W_ST */
+			chip->wst = data & 0x7f;
+			break;
+
+		case 0x58/8:	/* W_END */
+			chip->wend = data & 0x7f;
+			break;
+
+		case 0x60/8:	/* LR_END */
+			chip->lrend = data & 0x7f;
+			break;
+
+		case 0x68/8:	/* PAR - read only */
+		case 0x70/8:	/* IRQV - read only */
+			break;
+
+		case 0x78/8:	/* PAGE */
+			chip->current_page = data & 0x7f;
+			break;
+	}
+}
+
+INLINE void es5506_reg_write_test(es5506_state *chip, es5506_voice *voice, offs_t offset, UINT32 data)
+{
+	switch (offset)
+	{
+		case 0x00/8:	/* CHANNEL 0 LEFT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 0 left test write %08x\n", data);
+			break;
+
+		case 0x08/8:	/* CHANNEL 0 RIGHT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 0 right test write %08x\n", data);
+			break;
+
+		case 0x10/8:	/* CHANNEL 1 LEFT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 1 left test write %08x\n", data);
+			break;
+
+		case 0x18/8:	/* CHANNEL 1 RIGHT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 1 right test write %08x\n", data);
+			break;
+
+		case 0x20/8:	/* CHANNEL 2 LEFT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 2 left test write %08x\n", data);
+			break;
+
+		case 0x28/8:	/* CHANNEL 2 RIGHT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 2 right test write %08x\n", data);
+			break;
+
+		case 0x30/8:	/* CHANNEL 3 LEFT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 3 left test write %08x\n", data);
+			break;
+
+		case 0x38/8:	/* CHANNEL 3 RIGHT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 3 right test write %08x\n", data);
+			break;
+
+		case 0x40/8:	/* CHANNEL 4 LEFT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 4 left test write %08x\n", data);
+			break;
+
+		case 0x48/8:	/* CHANNEL 4 RIGHT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 4 right test write %08x\n", data);
+			break;
+
+		case 0x50/8:	/* CHANNEL 5 LEFT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 5 left test write %08x\n", data);
+			break;
+
+		case 0x58/8:	/* CHANNEL 6 RIGHT */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Channel 5 right test write %08x\n", data);
+			break;
+
+		case 0x60/8:	/* EMPTY */
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "Test write EMPTY %08x\n", data);
+			break;
+
+		case 0x68/8:	/* PAR - read only */
+		case 0x70/8:	/* IRQV - read only */
+			break;
+
+		case 0x78/8:	/* PAGE */
+			chip->current_page = data & 0x7f;
+			break;
+	}
+}
+
+//WRITE8_DEVICE_HANDLER( es5506_w )
+static void es5506_w(es5506_state *chip, offs_t offset, UINT8 data)
+{
+	//es5506_state *chip = get_safe_token(device);
+	es5506_voice *voice = &chip->voicechip->current_page & 0x1f;
+	int shift = 8 * (offset & 3);
+
+	/* accumulate the data */
+	chip->write_latch = (chip->write_latch & ~(0xff000000 >> shift)) | (data << (24 - shift));
+
+	/* wait for a write to complete */
+	if (shift != 24)
+		return;
+
+	/* force an update */
+	//chip->stream->update();
+
+	/* switch off the page and register */
+	if (chip->current_page < 0x20)
+		es5506_reg_write_low(chip, voice, offset / 4, chip->write_latch);
+	else if (chip->current_page < 0x40)
+		es5506_reg_write_high(chip, voice, offset / 4, chip->write_latch);
+	else
+		es5506_reg_write_test(chip, voice, offset / 4, chip->write_latch);
+
+	/* clear the write latch when done */
+	chip->write_latch = 0;
+}
+
+
+
+/**********************************************************************************************
+
+ es5506_reg_read -- read from the specified ES5506 register
+
+***********************************************************************************************/
+
+INLINE UINT32 es5506_reg_read_low(es5506_state *chip, es5506_voice *voice, offs_t offset)
+{
+	UINT32 result = 0;
+
+	switch (offset)
+	{
+		case 0x00/8:	/* CR */
+			result = voice->control;
+			break;
+
+		case 0x08/8:	/* FC */
+			result = voice->freqcount;
+			break;
+
+		case 0x10/8:	/* LVOL */
+			result = voice->lvol;
+			break;
+
+		case 0x18/8:	/* LVRAMP */
+			result = voice->lvramp << 8;
+			break;
+
+		case 0x20/8:	/* RVOL */
+			result = voice->rvol;
+			break;
+
+		case 0x28/8:	/* RVRAMP */
+			result = voice->rvramp << 8;
+			break;
+
+		case 0x30/8:	/* ECOUNT */
+			result = voice->ecount;
+			break;
+
+		case 0x38/8:	/* K2 */
+			result = voice->k2;
+			break;
+
+		case 0x40/8:	/* K2RAMP */
+			result = (voice->k2ramp << 8) | (voice->k2ramp >> 31);
+			break;
+
+		case 0x48/8:	/* K1 */
+			result = voice->k1;
+			break;
+
+		case 0x50/8:	/* K1RAMP */
+			result = (voice->k1ramp << 8) | (voice->k1ramp >> 31);
+			break;
+
+		case 0x58/8:	/* ACTV */
+			result = chip->active_voices;
+			break;
+
+		case 0x60/8:	/* MODE */
+			result = chip->mode;
+			break;
+
+		case 0x68/8:	/* PAR */
+			//if (chip->port_read)
+			//	result = (*chip->port_read)();
+			break;
+
+		case 0x70/8:	/* IRQV */
+			result = chip->irqv;
+			update_internal_irq_state(chip);
+			break;
+
+		case 0x78/8:	/* PAGE */
+			result = chip->current_page;
+			break;
+	}
+	return result;
+}
+
+
+INLINE UINT32 es5506_reg_read_high(es5506_state *chip, es5506_voice *voice, offs_t offset)
+{
+	UINT32 result = 0;
+
+	switch (offset)
+	{
+		case 0x00/8:	/* CR */
+			result = voice->control;
+			break;
+
+		case 0x08/8:	/* START */
+			result = voice->start;
+			break;
+
+		case 0x10/8:	/* END */
+			result = voice->end;
+			break;
+
+		case 0x18/8:	/* ACCUM */
+			result = voice->accum;
+			break;
+
+		case 0x20/8:	/* O4(n-1) */
+			result = voice->o4n1 & 0x3ffff;
+			break;
+
+		case 0x28/8:	/* O3(n-1) */
+			result = voice->o3n1 & 0x3ffff;
+			break;
+
+		case 0x30/8:	/* O3(n-2) */
+			result = voice->o3n2 & 0x3ffff;
+			break;
+
+		case 0x38/8:	/* O2(n-1) */
+			result = voice->o2n1 & 0x3ffff;
+			break;
+
+		case 0x40/8:	/* O2(n-2) */
+			result = voice->o2n2 & 0x3ffff;
+			break;
+
+		case 0x48/8:	/* O1(n-1) */
+			result = voice->o1n1 & 0x3ffff;
+			break;
+
+		case 0x50/8:	/* W_ST */
+			result = chip->wst;
+			break;
+
+		case 0x58/8:	/* W_END */
+			result = chip->wend;
+			break;
+
+		case 0x60/8:	/* LR_END */
+			result = chip->lrend;
+			break;
+
+		case 0x68/8:	/* PAR */
+			//if (chip->port_read)
+			//	result = (*chip->port_read)();
+			break;
+
+		case 0x70/8:	/* IRQV */
+			result = chip->irqv;
+			update_internal_irq_state(chip);
+			break;
+
+		case 0x78/8:	/* PAGE */
+			result = chip->current_page;
+			break;
+	}
+	return result;
+}
+
+INLINE UINT32 es5506_reg_read_test(es5506_state *chip, es5506_voice *voice, offs_t offset)
+{
+	UINT32 result = 0;
+
+	switch (offset)
+	{
+		case 0x68/8:	/* PAR */
+			//if (chip->port_read)
+			//	result = (*chip->port_read)();
+			break;
+
+		case 0x70/8:	/* IRQV */
+			result = chip->irqv;
+			break;
+
+		case 0x78/8:	/* PAGE */
+			result = chip->current_page;
+			break;
+	}
+	return result;
+}
+
+//READ8_DEVICE_HANDLER( es5506_r )
+static UINT8 es5506_r(es5506_state *chip, offs_t offset)
+{
+	//es5506_state *chip = get_safe_token(device);
+	es5506_voice *voice = &chip->voicechip->current_page & 0x1f;
+	int shift = 8 * (offset & 3);
+
+	/* only read on offset 0 */
+	if (shift != 0)
+		return chip->read_latch >> (24 - shift);
+
+	//if (LOG_COMMANDS && eslog)
+	//	fprintf(eslog, "read from %02x/%02x -> ", chip->current_page, offset / 4 * 8);
+
+	/* force an update */
+	//chip->stream->update();
+
+	/* switch off the page and register */
+	if (chip->current_page < 0x20)
+		chip->read_latch = es5506_reg_read_low(chip, voice, offset / 4);
+	else if (chip->current_page < 0x40)
+		chip->read_latch = es5506_reg_read_high(chip, voice, offset / 4);
+	else
+		chip->read_latch = es5506_reg_read_test(chip, voice, offset / 4);
+
+	//if (LOG_COMMANDS && eslog)
+	//	fprintf(eslog, "%08x\n", chip->read_latch);
+
+	/* return the high byte */
+	return chip->read_latch >> 24;
+}
+
+
+
+//void es5506_voice_bank_w(device_t *device, int voice, int bank)
+void es5506_voice_bank_w(void *_info, int voice, int bank)
+{
+	//es5506_state *chip = get_safe_token(device);
+	es5506_state *chip = (es5506_state *)_info;
+	chip->voicevoice.exbank=bank;
+}
+
+
+/**********************************************************************************************
+
+ DEVICE_START( es5505 ) -- start emulation of the ES5505
+
+***********************************************************************************************/
+
+/*static DEVICE_START( es5505 )
+{
+	const es5505_interface *intf = (const es5505_interface *)device->static_config();
+	es5506_interface es5506intf;
+
+	memset(&es5506intf, 0, sizeof(es5506intf));
+
+	es5506intf.region0 = intf->region0;
+	es5506intf.region1 = intf->region1;
+	es5506intf.irq_callback = intf->irq_callback;
+	es5506intf.read_port = intf->read_port;
+
+	es5506_start_common(device, &es5506intf, ES5505);
+}*/
+
+
+
+/**********************************************************************************************
+
+ DEVICE_STOP( es5505 ) -- stop emulation of the ES5505
+
+***********************************************************************************************/
+
+/*static DEVICE_STOP( es5505 )
+{
+	DEVICE_STOP_CALL( es5506 );
+}
+
+
+static DEVICE_RESET( es5505 )
+{
+	DEVICE_RESET_CALL( es5506 );
+}*/
+
+
+
+/**********************************************************************************************
+
+ es5505_reg_write -- handle a write to the selected ES5505 register
+
+***********************************************************************************************/
+
+INLINE void es5505_reg_write_low(es5506_state *chip, es5506_voice *voice, offs_t offset, UINT16 data)
+{
+	//running_machine &machine = chip->device->machine();
+	UINT8 byteOfs;
+
+	byteOfs = offset & 0x01;
+	if (! byteOfs)
+		data <<= 8;
+	switch (offset >> 1)
+	{
+		case 0x00:	/* CR */
+			if (ACCESSING_BITS_0_7)
+			{
+#if RAINE_CHECK
+				voice->control &= ~(CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_DIR);
+#else
+				voice->control &= ~(CONTROL_STOPMASK | CONTROL_BS0 | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ);
+#endif
+				voice->control |= (data & (CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ)) |
+								 ((data << 12) & CONTROL_BS0);
+			}
+			if (ACCESSING_BITS_8_15)
+			{
+				voice->control &= ~(CONTROL_CA0 | CONTROL_CA1 | CONTROL_LPMASK);
+				voice->control |= ((data >> 2) & CONTROL_LPMASK) |
+								 ((data << 2) & (CONTROL_CA0 | CONTROL_CA1));
+			}
+
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, control=%04x (raw=%04x & %04x)\n", machine.describe_context(), chip->current_page & 0x1f, voice->control, data, mem_mask ^ 0xffff);
+			break;
+
+		case 0x01:	/* FC */
+			if (ACCESSING_BITS_0_7)
+				voice->freqcount = (voice->freqcount & ~0x001fe) | ((data & 0x00ff) << 1);
+			if (ACCESSING_BITS_8_15)
+				voice->freqcount = (voice->freqcount & ~0x1fe00) | ((data & 0xff00) << 1);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, freq count=%08x\n", machine.describe_context(), chip->current_page & 0x1f, voice->freqcount);
+			break;
+
+		case 0x02:	/* STRT (hi) */
+			if (ACCESSING_BITS_0_7)
+				voice->start = (voice->start & ~0x03fc0000) | ((data & 0x00ff) << 18);
+			if (ACCESSING_BITS_8_15)
+				voice->start = (voice->start & ~0x7c000000) | ((data & 0x1f00) << 18);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, loop start=%08x\n", machine.describe_context(), chip->current_page & 0x1f, voice->start);
+			break;
+
+		case 0x03:	/* STRT (lo) */
+			if (ACCESSING_BITS_0_7)
+				voice->start = (voice->start & ~0x00000380) | ((data & 0x00e0) << 2);
+			if (ACCESSING_BITS_8_15)
+				voice->start = (voice->start & ~0x0003fc00) | ((data & 0xff00) << 2);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, loop start=%08x\n", machine.describe_context(), chip->current_page & 0x1f, voice->start);
+			break;
+
+		case 0x04:	/* END (hi) */
+			if (ACCESSING_BITS_0_7)
+				voice->end = (voice->end & ~0x03fc0000) | ((data & 0x00ff) << 18);
+			if (ACCESSING_BITS_8_15)
+				voice->end = (voice->end & ~0x7c000000) | ((data & 0x1f00) << 18);
+#if RAINE_CHECK
+			voice->control |= CONTROL_STOP0;
+#endif
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, loop end=%08x\n", machine.describe_context(), chip->current_page & 0x1f, voice->end);
+			break;
+
+		case 0x05:	/* END (lo) */
+			if (ACCESSING_BITS_0_7)
+				voice->end = (voice->end & ~0x00000380) | ((data & 0x00e0) << 2);
+			if (ACCESSING_BITS_8_15)
+				voice->end = (voice->end & ~0x0003fc00) | ((data & 0xff00) << 2);
+#if RAINE_CHECK
+			voice->control |= CONTROL_STOP0;
+#endif
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, loop end=%08x\n", machine.describe_context(), chip->current_page & 0x1f, voice->end);
+			break;
+
+		case 0x06:	/* K2 */
+			if (ACCESSING_BITS_0_7)
+				voice->k2 = (voice->k2 & ~0x00f0) | (data & 0x00f0);
+			if (ACCESSING_BITS_8_15)
+				voice->k2 = (voice->k2 & ~0xff00) | (data & 0xff00);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, K2=%04x\n", machine.describe_context(), chip->current_page & 0x1f, voice->k2);
+			break;
+
+		case 0x07:	/* K1 */
+			if (ACCESSING_BITS_0_7)
+				voice->k1 = (voice->k1 & ~0x00f0) | (data & 0x00f0);
+			if (ACCESSING_BITS_8_15)
+				voice->k1 = (voice->k1 & ~0xff00) | (data & 0xff00);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, K1=%04x\n", machine.describe_context(), chip->current_page & 0x1f, voice->k1);
+			break;
+
+		case 0x08:	/* LVOL */
+			if (ACCESSING_BITS_8_15)
+				voice->lvol = (voice->lvol & ~0xff00) | (data & 0xff00);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, left vol=%04x\n", machine.describe_context(), chip->current_page & 0x1f, voice->lvol);
+			break;
+
+		case 0x09:	/* RVOL */
+			if (ACCESSING_BITS_8_15)
+				voice->rvol = (voice->rvol & ~0xff00) | (data & 0xff00);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, right vol=%04x\n", machine.describe_context(), chip->current_page & 0x1f, voice->rvol);
+			break;
+
+		case 0x0a:	/* ACC (hi) */
+			if (ACCESSING_BITS_0_7)
+				voice->accum = (voice->accum & ~0x03fc0000) | ((data & 0x00ff) << 18);
+			if (ACCESSING_BITS_8_15)
+				voice->accum = (voice->accum & ~0x7c000000) | ((data & 0x1f00) << 18);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, accum=%08x\n", machine.describe_context(), chip->current_page & 0x1f, voice->accum);
+			break;
+
+		case 0x0b:	/* ACC (lo) */
+			if (ACCESSING_BITS_0_7)
+				voice->accum = (voice->accum & ~0x000003fc) | ((data & 0x00ff) << 2);
+			if (ACCESSING_BITS_8_15)
+				voice->accum = (voice->accum & ~0x0003fc00) | ((data & 0xff00) << 2);
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, accum=%08x\n", machine.describe_context(), chip->current_page & 0x1f, voice->accum);
+			break;
+
+		case 0x0c:	/* unused */
+			break;
+
+		case 0x0d:	/* ACT */
+			if (ACCESSING_BITS_0_7)
+			{
+				chip->active_voices = data & 0x1f;
+				chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
+				//chip->stream->set_sample_rate(chip->sample_rate);
+				if (chip->SmpRateFunc != NULL)
+					chip->SmpRateFunc(chip->SmpRateData, chip->sample_rate);
+
+				//if (LOG_COMMANDS && eslog)
+				//	fprintf(eslog, "active voices=%d, sample_rate=%d\n", chip->active_voices, chip->sample_rate);
+			}
+			break;
+
+		case 0x0e:	/* IRQV - read only */
+			break;
+
+		case 0x0f:	/* PAGE */
+			if (ACCESSING_BITS_0_7)
+				chip->current_page = data & 0x7f;
+			break;
+	}
+}
+
+
+INLINE void es5505_reg_write_high(es5506_state *chip, es5506_voice *voice, offs_t offset, UINT16 data)
+{
+	//running_machine &machine = chip->device->machine();
+	UINT8 byteOfs;
+
+	byteOfs = offset & 0x01;
+	if (! byteOfs)
+		data <<= 8;
+	switch (offset >> 1)
+	{
+		case 0x00:	/* CR */
+			if (ACCESSING_BITS_0_7)
+			{
+				voice->control &= ~(CONTROL_STOPMASK | CONTROL_BS0 | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ);
+				voice->control |= (data & (CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ)) |
+								 ((data << 12) & CONTROL_BS0);
+			}
+			if (ACCESSING_BITS_8_15)
+			{
+				voice->control &= ~(CONTROL_CA0 | CONTROL_CA1 | CONTROL_LPMASK);
+				voice->control |= ((data >> 2) & CONTROL_LPMASK) |
+								 ((data << 2) & (CONTROL_CA0 | CONTROL_CA1));
+			}
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, control=%04x (raw=%04x & %04x)\n", machine.describe_context(), chip->current_page & 0x1f, voice->control, data, mem_mask);
+			break;
+
+		case 0x01:	/* O4(n-1) */
+			if (ACCESSING_BITS_0_7)
+				voice->o4n1 = (voice->o4n1 & ~0x00ff) | (data & 0x00ff);
+			if (ACCESSING_BITS_8_15)
+				voice->o4n1 = (INT16)((voice->o4n1 & ~0xff00) | (data & 0xff00));
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, O4(n-1)=%05x\n", machine.describe_context(), chip->current_page & 0x1f, voice->o4n1 & 0x3ffff);
+			break;
+
+		case 0x02:	/* O3(n-1) */
+			if (ACCESSING_BITS_0_7)
+				voice->o3n1 = (voice->o3n1 & ~0x00ff) | (data & 0x00ff);
+			if (ACCESSING_BITS_8_15)
+				voice->o3n1 = (INT16)((voice->o3n1 & ~0xff00) | (data & 0xff00));
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, O3(n-1)=%05x\n", machine.describe_context(), chip->current_page & 0x1f, voice->o3n1 & 0x3ffff);
+			break;
+
+		case 0x03:	/* O3(n-2) */
+			if (ACCESSING_BITS_0_7)
+				voice->o3n2 = (voice->o3n2 & ~0x00ff) | (data & 0x00ff);
+			if (ACCESSING_BITS_8_15)
+				voice->o3n2 = (INT16)((voice->o3n2 & ~0xff00) | (data & 0xff00));
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, O3(n-2)=%05x\n", machine.describe_context(), chip->current_page & 0x1f, voice->o3n2 & 0x3ffff);
+			break;
+
+		case 0x04:	/* O2(n-1) */
+			if (ACCESSING_BITS_0_7)
+				voice->o2n1 = (voice->o2n1 & ~0x00ff) | (data & 0x00ff);
+			if (ACCESSING_BITS_8_15)
+				voice->o2n1 = (INT16)((voice->o2n1 & ~0xff00) | (data & 0xff00));
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, O2(n-1)=%05x\n", machine.describe_context(), chip->current_page & 0x1f, voice->o2n1 & 0x3ffff);
+			break;
+
+		case 0x05:	/* O2(n-2) */
+			if (ACCESSING_BITS_0_7)
+				voice->o2n2 = (voice->o2n2 & ~0x00ff) | (data & 0x00ff);
+			if (ACCESSING_BITS_8_15)
+				voice->o2n2 = (INT16)((voice->o2n2 & ~0xff00) | (data & 0xff00));
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, O2(n-2)=%05x\n", machine.describe_context(), chip->current_page & 0x1f, voice->o2n2 & 0x3ffff);
+			break;
+
+		case 0x06:	/* O1(n-1) */
+			if (ACCESSING_BITS_0_7)
+				voice->o1n1 = (voice->o1n1 & ~0x00ff) | (data & 0x00ff);
+			if (ACCESSING_BITS_8_15)
+				voice->o1n1 = (INT16)((voice->o1n1 & ~0xff00) | (data & 0xff00));
+			//if (LOG_COMMANDS && eslog)
+			//	fprintf(eslog, "%s:voice %d, O1(n-1)=%05x (accum=%08x)\n", machine.describe_context(), chip->current_page & 0x1f, voice->o2n1 & 0x3ffff, voice->accum);
+			break;
+
+		case 0x07:
+		case 0x08:
+		case 0x09:
+		case 0x0a:
+		case 0x0b:
+		case 0x0c:	/* unused */
+			break;
+
+		case 0x0d:	/* ACT */
+			if (ACCESSING_BITS_0_7)
+			{
+				chip->active_voices = data & 0x1f;
+				chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
+				//chip->stream->set_sample_rate(chip->sample_rate);
+				if (chip->SmpRateFunc != NULL)
+					chip->SmpRateFunc(chip->SmpRateData, chip->sample_rate);
+
+				//if (LOG_COMMANDS && eslog)
+				//	fprintf(eslog, "active voices=%d, sample_rate=%d\n", chip->active_voices, chip->sample_rate);
+			}
+			break;
+
+		case 0x0e:	/* IRQV - read only */
+			break;
+
+		case 0x0f:	/* PAGE */
+			if (ACCESSING_BITS_0_7)
+				chip->current_page = data & 0x7f;
+			break;
+	}
+}
+
+
+INLINE void es5505_reg_write_test(es5506_state *chip, es5506_voice *voice, offs_t offset, UINT16 data)
+{
+	UINT8 byteOfs;
+
+	byteOfs = offset & 0x01;
+	if (! byteOfs)
+		data <<= 8;
+	switch (offset >> 1)
+	{
+		case 0x00:	/* CH0L */
+		case 0x01:	/* CH0R */
+		case 0x02:	/* CH1L */
+		case 0x03:	/* CH1R */
+		case 0x04:	/* CH2L */
+		case 0x05:	/* CH2R */
+		case 0x06:	/* CH3L */
+		case 0x07:	/* CH3R */
+			break;
+
+		case 0x08:	/* SERMODE */
+			if (ACCESSING_BITS_0_7)
+				chip->mode = data & 0x07;
+			break;
+
+		case 0x09:	/* PAR */
+			break;
+
+		case 0x0d:	/* ACT */
+			if (ACCESSING_BITS_0_7)
+			{
+				chip->active_voices = data & 0x1f;
+				chip->sample_rate = chip->master_clock / (16 * (chip->active_voices + 1));
+				//chip->stream->set_sample_rate(chip->sample_rate);
+				if (chip->SmpRateFunc != NULL)
+					chip->SmpRateFunc(chip->SmpRateData, chip->sample_rate);
+
+				//if (LOG_COMMANDS && eslog)
+				//	fprintf(eslog, "active voices=%d, sample_rate=%d\n", chip->active_voices, chip->sample_rate);
+			}
+			break;
+
+		case 0x0e:	/* IRQV - read only */
+			break;
+
+		case 0x0f:	/* PAGE */
+			if (ACCESSING_BITS_0_7)
+				chip->current_page = data & 0x7f;
+			break;
+	}
+}
+
+
+//WRITE16_DEVICE_HANDLER( es5505_w )
+static void es5505_w(es5506_state *chip, offs_t offset, UINT8 data)
+{
+	//es5506_state *chip = get_safe_token(device);
+	es5506_voice *voice = &chip->voicechip->current_page & 0x1f;
+
+// logerror("%s:ES5505 write %02x/%02x = %04x & %04x\n", machine.describe_context(), chip->current_page, offset, data, mem_mask);
+
+	/* force an update */
+	//chip->stream->update();
+
+	/* switch off the page and register */
+	if (chip->current_page < 0x20)
+		es5505_reg_write_low(chip, voice, offset, data);
+	else if (chip->current_page < 0x40)
+		es5505_reg_write_high(chip, voice, offset, data);
+	else
+		es5505_reg_write_test(chip, voice, offset, data);
+}
+
+
+
+/**********************************************************************************************
+
+ es5505_reg_read -- read from the specified ES5505 register
+
+***********************************************************************************************/
+
+INLINE UINT16 es5505_reg_read_low(es5506_state *chip, es5506_voice *voice, offs_t offset)
+{
+	UINT16 result = 0;
+
+	switch (offset)
+	{
+		case 0x00:	/* CR */
+			result = (voice->control & (CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ)) |
+					 ((voice->control & CONTROL_BS0) >> 12) |
+					 ((voice->control & CONTROL_LPMASK) << 2) |
+					 ((voice->control & (CONTROL_CA0 | CONTROL_CA1)) >> 2) |
+					 0xf000;
+			break;
+
+		case 0x01:	/* FC */
+			result = voice->freqcount >> 1;
+			break;
+
+		case 0x02:	/* STRT (hi) */
+			result = voice->start >> 18;
+			break;
+
+		case 0x03:	/* STRT (lo) */
+			result = voice->start >> 2;
+			break;
+
+		case 0x04:	/* END (hi) */
+			result = voice->end >> 18;
+			break;
+
+		case 0x05:	/* END (lo) */
+			result = voice->end >> 2;
+			break;
+
+		case 0x06:	/* K2 */
+			result = voice->k2;
+			break;
+
+		case 0x07:	/* K1 */
+			result = voice->k1;
+			break;
+
+		case 0x08:	/* LVOL */
+			result = voice->lvol;
+			break;
+
+		case 0x09:	/* RVOL */
+			result = voice->rvol;
+			break;
+
+		case 0x0a:	/* ACC (hi) */
+			result = voice->accum >> 18;
+			break;
+
+		case 0x0b:	/* ACC (lo) */
+			result = voice->accum >> 2;
+			break;
+
+		case 0x0c:	/* unused */
+			break;
+
+		case 0x0d:	/* ACT */
+			result = chip->active_voices;
+			break;
+
+		case 0x0e:	/* IRQV */
+			result = chip->irqv;
+			update_internal_irq_state(chip);
+			break;
+
+		case 0x0f:	/* PAGE */
+			result = chip->current_page;
+			break;
+	}
+	return result;
+}
+
+
+INLINE UINT16 es5505_reg_read_high(es5506_state *chip, es5506_voice *voice, offs_t offset)
+{
+	UINT16 result = 0;
+
+	switch (offset)
+	{
+		case 0x00:	/* CR */
+			result = (voice->control & (CONTROL_STOPMASK | CONTROL_LOOPMASK | CONTROL_IRQE | CONTROL_DIR | CONTROL_IRQ)) |
+					 ((voice->control & CONTROL_BS0) >> 12) |
+					 ((voice->control & CONTROL_LPMASK) << 2) |
+					 ((voice->control & (CONTROL_CA0 | CONTROL_CA1)) >> 2) |
+					 0xf000;
+			break;
+
+		case 0x01:	/* O4(n-1) */
+			result = voice->o4n1;
+			break;
+
+		case 0x02:	/* O3(n-1) */
+			result = voice->o3n1;
+			break;
+
+		case 0x03:	/* O3(n-2) */
+			result = voice->o3n2;
+			break;
+
+		case 0x04:	/* O2(n-1) */
+			result = voice->o2n1;
+			break;
+
+		case 0x05:	/* O2(n-2) */
+			result = voice->o2n2;
+			break;
+
+		case 0x06:	/* O1(n-1) */
+			/* special case for the Taito F3 games: they set the accumulator on a stopped */
+			/* voice and assume the filters continue to process the data. They then read */
+			/* the O1(n-1) in order to extract raw data from the sound ROMs. Since we don't */
+			/* want to waste time filtering stopped channels, we just look for a read from */
+			/* this register on a stopped voice, and return the raw sample data at the */
+			/* accumulator */
+			if ((voice->control & CONTROL_STOPMASK) && chip->region_basevoice->control >> 14)
+			{
+				voice->o1n1 = chip->region_basevoice->control >> 14voice->exbank + (voice->accum >> 11);
+#ifdef _DEBUG
+				logerror("%02x %08x ==> %08x\n",voice->o1n1,voice->control >> 14,voice->exbank + (voice->accum >> 11));
+#endif
+			}
+			result = voice->o1n1;
+			break;
+
+		case 0x07:
+		case 0x08:
+		case 0x09:
+		case 0x0a:
+		case 0x0b:
+		case 0x0c:	/* unused */
+			break;
+
+		case 0x0d:	/* ACT */
+			result = chip->active_voices;
+			break;
+
+		case 0x0e:	/* IRQV */
+			result = chip->irqv;
+			update_internal_irq_state(chip);
+			break;
+
+		case 0x0f:	/* PAGE */
+			result = chip->current_page;
+			break;
+	}
+	return result;
+}
+
+
+INLINE UINT16 es5505_reg_read_test(es5506_state *chip, es5506_voice *voice, offs_t offset)
+{
+	UINT16 result = 0;
+
+	switch (offset)
+	{
+		case 0x00:	/* CH0L */
+		case 0x01:	/* CH0R */
+		case 0x02:	/* CH1L */
+		case 0x03:	/* CH1R */
+		case 0x04:	/* CH2L */
+		case 0x05:	/* CH2R */
+		case 0x06:	/* CH3L */
+		case 0x07:	/* CH3R */
+			break;
+
+		case 0x08:	/* SERMODE */
+			result = chip->mode;
+			break;
+
+		case 0x09:	/* PAR */
+			//if (chip->port_read)
+			//	result = (*chip->port_read)();
+			break;
+
+		case 0x0f:	/* PAGE */
+			result = chip->current_page;
+			break;
+	}
+	return result;
+}
+
+
+//READ16_DEVICE_HANDLER( es5505_r )
+static UINT8 es5505_r(es5506_state *chip, offs_t offset)
+{
+	//es5506_state *chip = get_safe_token(device);
+	es5506_voice *voice = &chip->voicechip->current_page & 0x1f;
+	UINT16 result = 0;
+
+	//if (LOG_COMMANDS && eslog)
+	//	fprintf(eslog, "read from %02x/%02x -> ", chip->current_page, offset);
+
+	/* force an update */
+	//chip->stream->update();
+
+	/* switch off the page and register */
+	if (chip->current_page < 0x20)
+		result = es5505_reg_read_low(chip, voice, offset);
+	else if (chip->current_page < 0x40)
+		result = es5505_reg_read_high(chip, voice, offset);
+	else
+		result = es5505_reg_read_test(chip, voice, offset);
+
+	//if (LOG_COMMANDS && eslog)
+	//	fprintf(eslog, "%04x (accum=%08x)\n", result, voice->accum);
+
+	/* return the high byte */
+	if (offset & 0x01)
+		return (result & 0x00FF) >> 0;
+	else
+		return (result & 0xFF00) >> 8;
+}
+
+UINT8 es550x_r(void *_info, offs_t offset)
+{
+	es5506_state *chip = (es5506_state *)_info;
+	
+	if (! chip->sndtype)
+		return es5505_r(chip, offset);
+	else
+		return es5506_r(chip, offset);
+}
+
+void es550x_w(void *_info, offs_t offset, UINT8 data)
+{
+	es5506_state *chip = (es5506_state *)_info;
+	if (offset < 0x40)
+	{
+		if (! chip->sndtype)
+			es5505_w(chip, offset, data);
+		else
+			es5506_w(chip, offset, data);
+	}
+	else
+	{
+		es5506_voice_bank_w(chip, offset & 0x1F, data << 20);
+	}
+	return;
+}
+
+void es550x_w16(void *_info, offs_t offset, UINT16 data)
+{
+	es5506_state *chip = (es5506_state *)_info;
+	
+	if (offset < 0x40)
+	{
+		if (! chip->sndtype)
+		{
+			es5505_w(chip, offset | 0, (data & 0xFF00) >> 8);
+			es5505_w(chip, offset | 1, (data & 0x00FF) >> 0);
+		}
+		else
+		{
+			es5506_w(chip, offset | 0, (data & 0xFF00) >> 8);
+			es5506_w(chip, offset | 1, (data & 0x00FF) >> 0);
+		}
+	}
+	else
+	{
+		es5506_voice_bank_w(chip, offset & 0x1F, data << 20);
+	}
+	return;
+}
+
+
+
+/*void es5505_voice_bank_w(device_t *device, int voice, int bank)
+{
+	//es5506_state *chip = get_safe_token(device);
+	es5506_state *chip = &ES5506DataChipID;
+#if RAINE_CHECK
+	chip->voicevoice.control = CONTROL_STOPMASK;
+#endif
+	chip->voicevoice.exbank=bank;
+}*/
+
+/*void es5505_set_channel_volume(device_t *device, int channel, int volume)
+{
+	//es5506_state *chip = get_safe_token(device);
+	es5506_state *chip = &ES5506DataChipID;
+
+	chip->stream->set_output_gain(channel,volume / 100.0);
+}*/
+
+void es5506_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					 const UINT8* ROMData)
+{
+	es5506_state *info = (es5506_state *)_info;
+	UINT8 curRgn;
+	UINT8 is8bROM;
+	UINT32 curPos;
+	
+	curRgn = (DataStart >> 28) & 0x03;
+	is8bROM = (DataStart >> 31) & 0x01;
+	DataStart &= 0x0FFFFFFF;
+	
+	if (is8bROM)
+	{
+		// multiply all values with 2 for boundary checks
+		ROMSize *= 2;
+		DataStart *= 2;
+		DataLength *= 2;
+	}
+	if (info->region_sizecurRgn != ROMSize)
+	{
+		info->region_basecurRgn = (UINT16*)realloc(info->region_basecurRgn, ROMSize);
+		info->region_sizecurRgn = ROMSize;
+		memset(info->region_basecurRgn, 0x00, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	if (! is8bROM)
+	{
+		memcpy((UINT8*)info->region_basecurRgn + DataStart, ROMData, DataLength);
+	}
+	else
+	{
+		DataLength /= 2;
+		for (curPos = 0x00; curPos < DataLength; curPos ++)
+			info->region_basecurRgnDataStart + curPos = ROMDatacurPos << 8;
+	}
+	
+	return;
+}
+
+void es5506_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	es5506_state *chip = (es5506_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 32; CurChn ++)
+		chip->voiceCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+void es5506_set_srchg_cb(void *_info, SRATE_CALLBACK CallbackFunc, void* DataPtr)
+{
+	es5506_state *chip = (es5506_state *)_info;
+	
+	// set Sample Rate Change Callback routine
+	chip->SmpRateFunc = CallbackFunc;
+	chip->SmpRateData = DataPtr;
+	
+	return;
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( es5505 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(es5506_state);					break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( es5505 );		break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( es5505 );		break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( es5505 );		break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "ES5505");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Ensoniq Wavetable");			break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( es5506 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(es5506_state);					break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( es5506 );		break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( es5506 );		break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( es5506 );		break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "ES5506");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Ensoniq Wavetable");			break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(ES5505, es5505);
+DEFINE_LEGACY_SOUND_DEVICE(ES5506, es5506);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/es5506.h Added

@@ -0,0 +1,65 @@
+/**********************************************************************************************
+ *
+ *   Ensoniq ES5505/6 driver
+ *   by Aaron Giles
+ *
+ **********************************************************************************************/
+
+#pragma once
+
+#ifndef __ES5506_H__
+#define __ES5506_H__
+
+//#include "devlegcy.h"
+
+/*typedef struct _es5505_interface es5505_interface;
+struct _es5505_interface
+{
+	const char * region0;						// memory region where the sample ROM lives
+	const char * region1;						// memory region where the sample ROM lives
+	void (*irq_callback)(device_t *device, int state);	// irq callback
+	UINT16 (*read_port)(device_t *device);			// input port read
+};*
+
+READ16_DEVICE_HANDLER( es5505_r );
+WRITE16_DEVICE_HANDLER( es5505_w );
+void es5505_voice_bank_w(device_t *device, int voice, int bank);
+void es5505_set_channel_volume(device_t *device, int channel, int volume);
+
+//DECLARE_LEGACY_SOUND_DEVICE(ES5505, es5505);
+
+
+typedef struct _es5506_interface es5506_interface;
+struct _es5506_interface
+{
+	const char * region0;						// memory region where the sample ROM lives
+	const char * region1;						// memory region where the sample ROM lives
+	const char * region2;						// memory region where the sample ROM lives
+	const char * region3;						// memory region where the sample ROM lives
+	void (*irq_callback)(device_t *device, int state);	// irq callback
+	UINT16 (*read_port)(device_t *device);			// input port read
+};*/
+
+//READ8_DEVICE_HANDLER( es5506_r );
+//WRITE8_DEVICE_HANDLER( es5506_w );
+UINT8 es550x_r(void *chip, offs_t offset);
+void es550x_w(void *chip, offs_t offset, UINT8 data);
+void es550x_w16(void *chip, offs_t offset, UINT16 data);
+
+void es5506_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_es5506(void **chip, int clock, int channels);
+void device_stop_es5506(void *chip);
+void device_reset_es5506(void *chip);
+//void es5506_set_base(running_device *device, UINT8 *wavemem);
+
+void es5506_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					   const UINT8* ROMData);
+
+void es5506_set_mute_mask(void *chip, UINT32 MuteMask);
+void es5506_set_srchg_cb(void *chip, SRATE_CALLBACK CallbackFunc, void* DataPtr);
+
+//void es5506_voice_bank_w(device_t *device, int voice, int bank);
+
+//DECLARE_LEGACY_SOUND_DEVICE(ES5506, es5506);
+
+#endif /* __ES5506_H__ */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.c Added

@@ -0,0 +1,4703 @@
+#define YM2610B_WARNING
+
+/*
+**
+** File: fm.c -- software implementation of Yamaha FM sound generator
+**
+** Copyright Jarek Burczynski (bujar at mame dot net)
+** Copyright Tatsuyuki Satoh , MultiArcadeMachineEmulator development
+**
+** Version 1.4.2 (final beta)
+**
+*/
+
+/*
+** History:
+**
+** 2006-2008 Eke-Eke (Genesis Plus GX), MAME backport by R. Belmont.
+** - implemented PG overflow, aka "detune bug" (Ariel, Comix Zone, Shaq Fu, Spiderman,...), credits to Nemesis
+** - fixed SSG-EG support, credits to Nemesis and additional fixes from Alone Coder
+** - modified EG rates and frequency, tested by Nemesis on real hardware
+** - implemented LFO phase update for CH3 special mode (Warlock birds, Alladin bug sound)
+** - fixed Attack Rate update (Batman & Robin intro)
+** - fixed attenuation level at the start of Substain (Gynoug explosions)
+** - fixed EG decay->substain transition to handle special cases, like SL=0 and Decay rate is very slow (Mega Turrican tracks 03,09...)
+**
+** 06-23-2007 Zsolt Vasvari:
+** - changed the timing not to require the use of floating point calculations
+**
+** 03-08-2003 Jarek Burczynski:
+** - fixed YM2608 initial values (after the reset)
+** - fixed flag and irqmask handling (YM2608)
+** - fixed BUFRDY flag handling (YM2608)
+**
+** 14-06-2003 Jarek Burczynski:
+** - implemented all of the YM2608 status register flags
+** - implemented support for external memory read/write via YM2608
+** - implemented support for deltat memory limit register in YM2608 emulation
+**
+** 22-05-2003 Jarek Burczynski:
+** - fixed LFO PM calculations (copy&paste bugfix)
+**
+** 08-05-2003 Jarek Burczynski:
+** - fixed SSG support
+**
+** 22-04-2003 Jarek Burczynski:
+** - implemented 100% correct LFO generator (verified on real YM2610 and YM2608)
+**
+** 15-04-2003 Jarek Burczynski:
+** - added support for YM2608's register 0x110 - status mask
+**
+** 01-12-2002 Jarek Burczynski:
+** - fixed register addressing in YM2608, YM2610, YM2610B chips. (verified on real YM2608)
+** The addressing patch used for early Neo-Geo games can be removed now.
+**
+** 26-11-2002 Jarek Burczynski, Nicola Salmoria:
+** - recreated YM2608 ADPCM ROM using data from real YM2608's output which leads to:
+** - added emulation of YM2608 drums.
+** - output of YM2608 is two times lower now - same as YM2610 (verified on real YM2608)
+**
+** 16-08-2002 Jarek Burczynski:
+** - binary exact Envelope Generator (verified on real YM2203);
+** identical to YM2151
+** - corrected 'off by one' error in feedback calculations (when feedback is off)
+** - corrected connection (algorithm) calculation (verified on real YM2203 and YM2610)
+**
+** 18-12-2001 Jarek Burczynski:
+** - added SSG-EG support (verified on real YM2203)
+**
+** 12-08-2001 Jarek Burczynski:
+** - corrected sin_tab and tl_tab data (verified on real chip)
+** - corrected feedback calculations (verified on real chip)
+** - corrected phase generator calculations (verified on real chip)
+** - corrected envelope generator calculations (verified on real chip)
+** - corrected FM volume level (YM2610 and YM2610B).
+** - changed YMxxxUpdateOne() functions (YM2203, YM2608, YM2610, YM2610B, YM2612) :
+** this was needed to calculate YM2610 FM channels output correctly.
+** (Each FM channel is calculated as in other chips, but the output of the channel
+** gets shifted right by one *before* sending to accumulator. That was impossible to do
+** with previous implementation).
+**
+** 23-07-2001 Jarek Burczynski, Nicola Salmoria:
+** - corrected YM2610 ADPCM type A algorithm and tables (verified on real chip)
+**
+** 11-06-2001 Jarek Burczynski:
+** - corrected end of sample bug in ADPCMA_calc_cha().
+** Real YM2610 checks for equality between current and end addresses (only 20 LSB bits).
+**
+** 08-12-98 hiro-shi:
+** rename ADPCMA -> ADPCMB, ADPCMB -> ADPCMA
+** move ROM limit check.(CALC_CH? -> 2610Write1/2)
+** test program (ADPCMB_TEST)
+** move ADPCM A/B end check.
+** ADPCMB repeat flag(no check)
+** change ADPCM volume rate (8->16) (32->48).
+**
+** 09-12-98 hiro-shi:
+** change ADPCM volume. (8->16, 48->64)
+** replace ym2610 ch0/3 (YM-2610B)
+** change ADPCM_SHIFT (10->8) missing bank change 0x4000-0xffff.
+** add ADPCM_SHIFT_MASK
+** change ADPCMA_DECODE_MIN/MAX.
+*/
+
+
+
+
+/************************************************************************/
+/* comment of hiro-shi(Hiromitsu Shioya) */
+/* YM2610(B) = OPN-B */
+/* YM2610 : PSG:3ch FM:4ch ADPCM(18.5KHz):6ch DeltaT ADPCM:1ch */
+/* YM2610B : PSG:3ch FM:6ch ADPCM(18.5KHz):6ch DeltaT ADPCM:1ch */
+/************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <math.h>
+#include <stdlib.h>
+
+#include "mamedef.h"
+//#ifndef __RAINE__
+//#include "sndintrf.h"		/* use M.A.M.E. */
+//#else
+//#include "deftypes.h"		/* use RAINE */
+//#include "support.h"		/* use RAINE */
+//#endif
+#include "fm.h"
+
+
+/* include external DELTA-T unit (when needed) */
+#if (BUILD_YM2608||BUILD_YM2610||BUILD_YM2610B)
+	#include "ymdeltat.h"
+#endif
+
+/* shared function building option */
+#define BUILD_OPN (BUILD_YM2203||BUILD_YM2608||BUILD_YM2610||BUILD_YM2610B)
+#define BUILD_OPN_PRESCALER (BUILD_YM2203||BUILD_YM2608)
+
+
+/* globals */
+#define TYPE_SSG 0x01 /* SSG support */
+#define TYPE_LFOPAN 0x02 /* OPN type LFO and PAN */
+#define TYPE_6CH 0x04 /* FM 6CH / 3CH */
+#define TYPE_DAC 0x08 /* YM2612's DAC device */
+#define TYPE_ADPCM 0x10 /* two ADPCM units */
+#define TYPE_2610 0x20 /* bogus flag to differentiate 2608 from 2610 */
+
+
+#define TYPE_YM2203 (TYPE_SSG)
+#define TYPE_YM2608 (TYPE_SSG |TYPE_LFOPAN |TYPE_6CH |TYPE_ADPCM)
+#define TYPE_YM2610 (TYPE_SSG |TYPE_LFOPAN |TYPE_6CH |TYPE_ADPCM |TYPE_2610)
+
+
+
+#define FREQ_SH			16 /* 16.16 fixed point (frequency calculations) */
+#define EG_SH			16 /* 16.16 fixed point (envelope generator timing) */
+#define LFO_SH			24 /* 8.24 fixed point (LFO calculations) */
+#define TIMER_SH		16 /* 16.16 fixed point (timers calculations) */
+
+#define FREQ_MASK		((1<<FREQ_SH)-1)
+
+#define ENV_BITS		10
+#define ENV_LEN			(1<<ENV_BITS)
+#define ENV_STEP		(128.0/ENV_LEN)
+
+#define MAX_ATT_INDEX	(ENV_LEN-1) /* 1023 */
+#define MIN_ATT_INDEX	(0)			/* 0 */
+
+#define EG_ATT			4
+#define EG_DEC			3
+#define EG_SUS			2
+#define EG_REL			1
+#define EG_OFF			0
+
+#define SIN_BITS		10
+#define SIN_LEN			(1<<SIN_BITS)
+#define SIN_MASK		(SIN_LEN-1)
+
+#define TL_RES_LEN		(256) /* 8 bits addressing (real chip) */
+
+
+#if (FM_SAMPLE_BITS==16)
+	#define FINAL_SH	(0)
+	#define MAXOUT		(+32767)
+	#define MINOUT		(-32768)
+#else
+	#define FINAL_SH	(8)
+	#define MAXOUT		(+127)
+	#define MINOUT		(-128)
+#endif
+
+
+/* TL_TAB_LEN is calculated as:
+* 13 - sinus amplitude bits (Y axis)
+* 2 - sinus sign bit (Y axis)
+* TL_RES_LEN - sinus resolution (X axis)
+*/
+#define TL_TAB_LEN (13*2*TL_RES_LEN)
+static signed int tl_tabTL_TAB_LEN;
+
+#define ENV_QUIET		(TL_TAB_LEN>>3)
+
+/* sin waveform table in 'decibel' scale */
+static unsigned int sin_tabSIN_LEN;
+
+/* sustain level table (3dB per step) */
+/* bit0, bit1, bit2, bit3, bit4, bit5, bit6 */
+/* 1, 2, 4, 8, 16, 32, 64 (value)*/
+/* 0.75, 1.5, 3, 6, 12, 24, 48 (dB)*/
+
+/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
+#define SC(db) (UINT32) ( db * (4.0/ENV_STEP) )
+static const UINT32 sl_table16={
+ SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
+ SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)
+};
+#undef SC
+
+
+#define RATE_STEPS (8)
+static const UINT8 eg_inc19*RATE_STEPS={
+
+/*cycle:0 1 2 3 4 5 6 7*/
+
+/* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..11 0 (increment by 0 or 1) */
+/* 1 */ 0,1, 0,1, 1,1, 0,1, /* rates 00..11 1 */
+/* 2 */ 0,1, 1,1, 0,1, 1,1, /* rates 00..11 2 */
+/* 3 */ 0,1, 1,1, 1,1, 1,1, /* rates 00..11 3 */
+
+/* 4 */ 1,1, 1,1, 1,1, 1,1, /* rate 12 0 (increment by 1) */
+/* 5 */ 1,1, 1,2, 1,1, 1,2, /* rate 12 1 */
+/* 6 */ 1,2, 1,2, 1,2, 1,2, /* rate 12 2 */
+/* 7 */ 1,2, 2,2, 1,2, 2,2, /* rate 12 3 */
+
+/* 8 */ 2,2, 2,2, 2,2, 2,2, /* rate 13 0 (increment by 2) */
+/* 9 */ 2,2, 2,4, 2,2, 2,4, /* rate 13 1 */
+/*10 */ 2,4, 2,4, 2,4, 2,4, /* rate 13 2 */
+/*11 */ 2,4, 4,4, 2,4, 4,4, /* rate 13 3 */
+
+/*12 */ 4,4, 4,4, 4,4, 4,4, /* rate 14 0 (increment by 4) */
+/*13 */ 4,4, 4,8, 4,4, 4,8, /* rate 14 1 */
+/*14 */ 4,8, 4,8, 4,8, 4,8, /* rate 14 2 */
+/*15 */ 4,8, 8,8, 4,8, 8,8, /* rate 14 3 */
+
+/*16 */ 8,8, 8,8, 8,8, 8,8, /* rates 15 0, 15 1, 15 2, 15 3 (increment by 8) */
+/*17 */ 16,16,16,16,16,16,16,16, /* rates 15 2, 15 3 for attack */
+/*18 */ 0,0, 0,0, 0,0, 0,0, /* infinity rates for attack and decay(s) */
+};
+
+
+#define O(a) (a*RATE_STEPS)
+
+/*note that there is no O(17) in this table - it's directly in the code */
+static const UINT8 eg_rate_select32+64+32={	/* Envelope Generator rates (32 + 64 rates + 32 RKS) */
+/* 32 infinite time rates */
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+
+/* rates 00-11 */
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+
+/* rate 12 */
+O( 4),O( 5),O( 6),O( 7),
+
+/* rate 13 */
+O( 8),O( 9),O(10),O(11),
+
+/* rate 14 */
+O(12),O(13),O(14),O(15),
+
+/* rate 15 */
+O(16),O(16),O(16),O(16),
+
+/* 32 dummy rates (same as 15 3) */
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16)
+
+};
+
+#undef O
+
+/*rate 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15*/
+/*shift 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0 */
+/*mask 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1, 0, 0, 0, 0, 0 */
+
+#define O(a) (a*1)
+static const UINT8 eg_rate_shift32+64+32={	/* Envelope Generator counter shifts (32 + 64 rates + 32 RKS) */
+/* 32 infinite time rates */
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+
+/* rates 00-11 */
+O(11),O(11),O(11),O(11),
+O(10),O(10),O(10),O(10),
+O( 9),O( 9),O( 9),O( 9),
+O( 8),O( 8),O( 8),O( 8),
+O( 7),O( 7),O( 7),O( 7),
+O( 6),O( 6),O( 6),O( 6),
+O( 5),O( 5),O( 5),O( 5),
+O( 4),O( 4),O( 4),O( 4),
+O( 3),O( 3),O( 3),O( 3),
+O( 2),O( 2),O( 2),O( 2),
+O( 1),O( 1),O( 1),O( 1),
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 12 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 13 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 14 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 15 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* 32 dummy rates (same as 15 3) */
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0)
+
+};
+#undef O
+
+static const UINT8 dt_tab4 * 32={
+/* this is YM2151 and YM2612 phase increment data (in 10.10 fixed point format)*/
+/* FD=0 */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* FD=1 */
+	0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2,
+	2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8,
+/* FD=2 */
+	1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5,
+	5, 6, 6, 7, 8, 8, 9,10,11,12,13,14,16,16,16,16,
+/* FD=3 */
+	2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7,
+	8 , 8, 9,10,11,12,13,14,16,17,19,20,22,22,22,22
+};
+
+
+/* OPN key frequency number -> key code follow table */
+/* fnum higher 4bit -> keycode lower 2bit */
+static const UINT8 opn_fktable16 = {0,0,0,0,0,0,0,1,2,3,3,3,3,3,3,3};
+
+
+/* 8 LFO speed parameters */
+/* each value represents number of samples that one LFO level will last for */
+static const UINT32 lfo_samples_per_step8 = {108, 77, 71, 67, 62, 44, 8, 5};
+
+
+
+/*There are 4 different LFO AM depths available, they are:
+ 0 dB, 1.4 dB, 5.9 dB, 11.8 dB
+ Here is how it is generated (in EG steps):
+
+ 11.8 dB = 0, 2, 4, 6, 8, 10,12,14,16...126,126,124,122,120,118,....4,2,0
+ 5.9 dB = 0, 1, 2, 3, 4, 5, 6, 7, 8....63, 63, 62, 61, 60, 59,.....2,1,0
+ 1.4 dB = 0, 0, 0, 0, 1, 1, 1, 1, 2,...15, 15, 15, 15, 14, 14,.....0,0,0
+
+ (1.4 dB is losing precision as you can see)
+
+ It's implemented as generator from 0..126 with step 2 then a shift
+ right N times, where N is:
+ 8 for 0 dB
+ 3 for 1.4 dB
+ 1 for 5.9 dB
+ 0 for 11.8 dB
+*/
+static const UINT8 lfo_ams_depth_shift4 = {8, 3, 1, 0};
+
+
+
+/*There are 8 different LFO PM depths available, they are:
+ 0, 3.4, 6.7, 10, 14, 20, 40, 80 (cents)
+
+ Modulation level at each depth depends on F-NUMBER bits: 4,5,6,7,8,9,10
+ (bits 8,9,10 = FNUM MSB from OCT/FNUM register)
+
+ Here we store only first quarter (positive one) of full waveform.
+ Full table (lfo_pm_table) containing all 128 waveforms is build
+ at run (init) time.
+
+ One value in table below represents 4 (four) basic LFO steps
+ (1 PM step = 4 AM steps).
+
+ For example:
+ at LFO SPEED=0 (which is 108 samples per basic LFO step)
+ one value from "lfo_pm_output" table lasts for 432 consecutive
+ samples (4*108=432) and one full LFO waveform cycle lasts for 13824
+ samples (32*432=13824; 32 because we store only a quarter of whole
+ waveform in the table below)
+*/
+static const UINT8 lfo_pm_output7*88={ /* 7 bits meaningful (of F-NUMBER), 8 LFO output levels per one depth (out of 32), 8 LFO depths */
+/* FNUM BIT 4: 000 0001xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 3 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 4 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 5 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 6 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 7 */ {0, 0, 0, 0, 1, 1, 1, 1},
+
+/* FNUM BIT 5: 000 0010xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 3 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 4 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 5 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 6 */ {0, 0, 0, 0, 1, 1, 1, 1},
+/* DEPTH 7 */ {0, 0, 1, 1, 2, 2, 2, 3},
+
+/* FNUM BIT 6: 000 0100xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 3 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 4 */ {0, 0, 0, 0, 0, 0, 0, 1},
+/* DEPTH 5 */ {0, 0, 0, 0, 1, 1, 1, 1},
+/* DEPTH 6 */ {0, 0, 1, 1, 2, 2, 2, 3},
+/* DEPTH 7 */ {0, 0, 2, 3, 4, 4, 5, 6},
+
+/* FNUM BIT 7: 000 1000xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 1, 1},
+/* DEPTH 3 */ {0, 0, 0, 0, 1, 1, 1, 1},
+/* DEPTH 4 */ {0, 0, 0, 1, 1, 1, 1, 2},
+/* DEPTH 5 */ {0, 0, 1, 1, 2, 2, 2, 3},
+/* DEPTH 6 */ {0, 0, 2, 3, 4, 4, 5, 6},
+/* DEPTH 7 */ {0, 0, 4, 6, 8, 8, 0xa, 0xc},
+
+/* FNUM BIT 8: 001 0000xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 1, 1, 1, 1},
+/* DEPTH 2 */ {0, 0, 0, 1, 1, 1, 2, 2},
+/* DEPTH 3 */ {0, 0, 1, 1, 2, 2, 3, 3},
+/* DEPTH 4 */ {0, 0, 1, 2, 2, 2, 3, 4},
+/* DEPTH 5 */ {0, 0, 2, 3, 4, 4, 5, 6},
+/* DEPTH 6 */ {0, 0, 4, 6, 8, 8, 0xa, 0xc},
+/* DEPTH 7 */ {0, 0, 8, 0xc,0x10,0x10,0x14,0x18},
+
+/* FNUM BIT 9: 010 0000xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 2, 2, 2, 2},
+/* DEPTH 2 */ {0, 0, 0, 2, 2, 2, 4, 4},
+/* DEPTH 3 */ {0, 0, 2, 2, 4, 4, 6, 6},
+/* DEPTH 4 */ {0, 0, 2, 4, 4, 4, 6, 8},
+/* DEPTH 5 */ {0, 0, 4, 6, 8, 8, 0xa, 0xc},
+/* DEPTH 6 */ {0, 0, 8, 0xc,0x10,0x10,0x14,0x18},
+/* DEPTH 7 */ {0, 0,0x10,0x18,0x20,0x20,0x28,0x30},
+
+/* FNUM BIT10: 100 0000xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 4, 4, 4, 4},
+/* DEPTH 2 */ {0, 0, 0, 4, 4, 4, 8, 8},
+/* DEPTH 3 */ {0, 0, 4, 4, 8, 8, 0xc, 0xc},
+/* DEPTH 4 */ {0, 0, 4, 8, 8, 8, 0xc,0x10},
+/* DEPTH 5 */ {0, 0, 8, 0xc,0x10,0x10,0x14,0x18},
+/* DEPTH 6 */ {0, 0,0x10,0x18,0x20,0x20,0x28,0x30},
+/* DEPTH 7 */ {0, 0,0x20,0x30,0x40,0x40,0x50,0x60},
+
+};
+
+/* all 128 LFO PM waveforms */
+static INT32 lfo_pm_table128*8*32; /* 128 combinations of 7 bits meaningful (of F-NUMBER), 8 LFO depths, 32 LFO output levels per one depth */
+
+
+
+
+
+/* register number to channel number , slot offset */
+#define OPN_CHAN(N) (N&3)
+#define OPN_SLOT(N) ((N>>2)&3)
+
+/* slot number */
+#define SLOT1 0
+#define SLOT2 2
+#define SLOT3 1
+#define SLOT4 3
+
+/* bit0 = Right enable , bit1 = Left enable */
+#define OUTD_RIGHT 1
+#define OUTD_LEFT 2
+#define OUTD_CENTER 3
+
+
+/* save output as raw 16-bit sample */
+/* #define SAVE_SAMPLE */
+
+#ifdef SAVE_SAMPLE
+static FILE *sample1;
+	#if 1	/*save to MONO file */
+		#define SAVE_ALL_CHANNELS \
+		{	signed int pom = lt; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+	#else	/*save to STEREO file */
+		#define SAVE_ALL_CHANNELS \
+		{	signed int pom = lt; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+			pom = rt; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+	#endif
+#endif
+
+
+/* struct describing a single operator (SLOT) */
+typedef struct
+{
+	INT32	*DT;		/* detune :dt_tabDT */
+	UINT8	KSR;		/* key scale rate :3-KSR */
+	UINT32	ar;			/* attack rate */
+	UINT32	d1r;		/* decay rate */
+	UINT32	d2r;		/* sustain rate */
+	UINT32	rr;			/* release rate */
+	UINT8	ksr;		/* key scale rate :kcode>>(3-KSR) */
+	UINT32	mul;		/* multiple :ML_TABLEML */
+
+	/* Phase Generator */
+	UINT32	phase;		/* phase counter */
+	INT32	Incr;		/* phase step */
+
+	/* Envelope Generator */
+	UINT8	state;		/* phase type */
+	UINT32	tl;			/* total level: TL << 3 */
+	INT32	volume;		/* envelope counter */
+	UINT32	sl;			/* sustain level:sl_tableSL */
+	UINT32	vol_out;	/* current output from EG circuit (without AM from LFO) */
+
+	UINT8	eg_sh_ar;	/* (attack state) */
+	UINT8	eg_sel_ar;	/* (attack state) */
+	UINT8	eg_sh_d1r;	/* (decay state) */
+	UINT8	eg_sel_d1r;	/* (decay state) */
+	UINT8	eg_sh_d2r;	/* (sustain state) */
+	UINT8	eg_sel_d2r;	/* (sustain state) */
+	UINT8	eg_sh_rr;	/* (release state) */
+	UINT8	eg_sel_rr;	/* (release state) */
+
+	UINT8	ssg;		/* SSG-EG waveform */
+	UINT8	ssgn;		/* SSG-EG negated output */
+
+	UINT32	key;		/* 0=last key was KEY OFF, 1=KEY ON */
+
+	/* LFO */
+	UINT32	AMmask;		/* AM enable flag */
+
+} FM_SLOT;
+
+typedef struct
+{
+	FM_SLOT	SLOT4;	/* four SLOTs (operators) */
+
+	UINT8	ALGO;		/* algorithm */
+	UINT8	FB;			/* feedback shift */
+	INT32	op1_out2;	/* op1 output for feedback */
+
+	INT32	*connect1;	/* SLOT1 output pointer */
+	INT32	*connect3;	/* SLOT3 output pointer */
+	INT32	*connect2;	/* SLOT2 output pointer */
+	INT32	*connect4;	/* SLOT4 output pointer */
+
+	INT32	*mem_connect;/* where to put the delayed sample (MEM) */
+	INT32	mem_value;	/* delayed sample (MEM) value */
+
+	INT32	pms;		/* channel PMS */
+	UINT8	ams;		/* channel AMS */
+
+	UINT32	fc;			/* fnum,blk:adjusted to sample rate */
+	UINT8	kcode;		/* key code: */
+	UINT32	block_fnum;	/* current blk/fnum value for this slot (can be different betweeen slots of one channel in 3slot mode) */
+	UINT8	Muted;
+} FM_CH;
+
+
+typedef struct
+{
+	//const device_config *device;
+	void *		param;				/* this chip parameter */
+	int			clock;				/* master clock (Hz) */
+	int			rate;				/* sampling rate (Hz) */
+	double		freqbase;			/* frequency base */
+	int			timer_prescaler;	/* timer prescaler */
+#if FM_BUSY_FLAG_SUPPORT
+	TIME_TYPE	busy_expiry_time;	/* expiry time of the busy status */
+#endif
+	UINT8		address;			/* address register */
+	UINT8		irq;				/* interrupt level */
+	UINT8		irqmask;			/* irq mask */
+	UINT8		status;				/* status flag */
+	UINT32		mode;				/* mode CSM / 3SLOT */
+	UINT8		prescaler_sel;		/* prescaler selector */
+	UINT8		fn_h;				/* freq latch */
+	INT32		TA;					/* timer a */
+	INT32		TAC;				/* timer a counter */
+	UINT8		TB;					/* timer b */
+	INT32		TBC;				/* timer b counter */
+	/* local time tables */
+	INT32		dt_tab832;		/* DeTune table */
+	/* Extention Timer and IRQ handler */
+	FM_TIMERHANDLER	timer_handler;
+	FM_IRQHANDLER	IRQ_Handler;
+	const ssg_callbacks *SSG;
+} FM_ST;
+
+
+
+/***********************************************************/
+/* OPN unit */
+/***********************************************************/
+
+/* OPN 3slot struct */
+typedef struct
+{
+	UINT32 fc3;			/* fnum3,blk3: calculated */
+	UINT8	fn_h;			/* freq3 latch */
+	UINT8	kcode3;		/* key code */
+	UINT32	block_fnum3;	/* current fnum value for this slot (can be different betweeen slots of one channel in 3slot mode) */
+} FM_3SLOT;
+
+/* OPN/A/B common state */
+typedef struct
+{
+	UINT8	type;			/* chip type */
+	FM_ST	ST;				/* general state */
+	FM_3SLOT SL3;			/* 3 slot mode state */
+	FM_CH	*P_CH;			/* pointer of CH */
+	unsigned int pan6*2;	/* fm channels output masks (0xffffffff = enable) */
+
+	UINT32	eg_cnt;			/* global envelope generator counter */
+	UINT32	eg_timer;		/* global envelope generator counter works at frequency = chipclock/64/3 */
+	UINT32	eg_timer_add;	/* step of eg_timer */
+	UINT32	eg_timer_overflow;/* envelope generator timer overlfows every 3 samples (on real chip) */
+
+
+	/* there are 2048 FNUMs that can be generated using FNUM/BLK registers
+ but LFO works with one more bit of a precision so we really need 4096 elements */
+
+	UINT32	fn_table4096;	/* fnumber->increment counter */
+	UINT32 fn_max; /* maximal phase increment (used for phase overflow) */
+
+	/* LFO */
+	UINT32	LFO_AM;			/* runtime LFO calculations helper */
+	INT32	LFO_PM;			/* runtime LFO calculations helper */
+
+	UINT32	lfo_cnt;
+	UINT32	lfo_inc;
+
+	UINT32	lfo_freq8;	/* LFO FREQ table */
+
+	INT32	m2,c1,c2;		/* Phase Modulation input for operators 2,3,4 */
+	INT32	mem;			/* one sample delay memory */
+
+	INT32	out_fm8;		/* outputs of working channels */
+
+#if (BUILD_YM2608||BUILD_YM2610||BUILD_YM2610B)
+	INT32	out_adpcm4;	/* channel output NONE,LEFT,RIGHT or CENTER for YM2608/YM2610 ADPCM */
+	INT32	out_delta4;	/* channel output NONE,LEFT,RIGHT or CENTER for YM2608/YM2610 DELTAT*/
+#endif
+} FM_OPN;
+
+
+
+/* log output level */
+#define LOG_ERR 3 /* ERROR */
+#define LOG_WAR 2 /* WARNING */
+#define LOG_INF 1 /* INFORMATION */
+#define LOG_LEVEL LOG_INF
+
+#ifndef __RAINE__
+#define LOG(n,x) do { if( (n)>=LOG_LEVEL ) logerror x; } while (0)
+#endif
+
+/* limitter */
+#define Limit(val, max,min) { \
+	if ( val > max ) val = max; \
+	else if ( val < min ) val = min; \
+}
+
+
+/* status set and IRQ handling */
+INLINE void FM_STATUS_SET(FM_ST *ST,int flag)
+{
+	/* set status flag */
+	ST->status |= flag;
+	if ( !(ST->irq) && (ST->status & ST->irqmask) )
+	{
+		ST->irq = 1;
+		/* callback user interrupt handler (IRQ is OFF to ON) */
+		if(ST->IRQ_Handler) (ST->IRQ_Handler)(ST->param,1);
+	}
+}
+
+/* status reset and IRQ handling */
+INLINE void FM_STATUS_RESET(FM_ST *ST,int flag)
+{
+	/* reset status flag */
+	ST->status &=~flag;
+	if ( (ST->irq) && !(ST->status & ST->irqmask) )
+	{
+		ST->irq = 0;
+		/* callback user interrupt handler (IRQ is ON to OFF) */
+		if(ST->IRQ_Handler) (ST->IRQ_Handler)(ST->param,0);
+	}
+}
+
+/* IRQ mask set */
+INLINE void FM_IRQMASK_SET(FM_ST *ST,int flag)
+{
+	ST->irqmask = flag;
+	/* IRQ handling check */
+	FM_STATUS_SET(ST,0);
+	FM_STATUS_RESET(ST,0);
+}
+
+/* OPN Mode Register Write */
+INLINE void set_timers( FM_ST *ST, void *n, int v )
+{
+	/* b7 = CSM MODE */
+	/* b6 = 3 slot mode */
+	/* b5 = reset b */
+	/* b4 = reset a */
+	/* b3 = timer enable b */
+	/* b2 = timer enable a */
+	/* b1 = load b */
+	/* b0 = load a */
+	ST->mode = v;
+
+	/* reset Timer b flag */
+	if( v & 0x20 )
+		FM_STATUS_RESET(ST,0x02);
+	/* reset Timer a flag */
+	if( v & 0x10 )
+		FM_STATUS_RESET(ST,0x01);
+	/* load b */
+	if( v & 0x02 )
+	{
+		if( ST->TBC == 0 )
+		{
+			ST->TBC = ( 256-ST->TB)<<4;
+			/* External timer handler */
+			if (ST->timer_handler) (ST->timer_handler)(n,1,ST->TBC * ST->timer_prescaler,ST->clock);
+		}
+	}
+	else
+	{	/* stop timer b */
+		if( ST->TBC != 0 )
+		{
+			ST->TBC = 0;
+			if (ST->timer_handler) (ST->timer_handler)(n,1,0,ST->clock);
+		}
+	}
+	/* load a */
+	if( v & 0x01 )
+	{
+		if( ST->TAC == 0 )
+		{
+			ST->TAC = (1024-ST->TA);
+			/* External timer handler */
+			if (ST->timer_handler) (ST->timer_handler)(n,0,ST->TAC * ST->timer_prescaler,ST->clock);
+		}
+	}
+	else
+	{	/* stop timer a */
+		if( ST->TAC != 0 )
+		{
+			ST->TAC = 0;
+			if (ST->timer_handler) (ST->timer_handler)(n,0,0,ST->clock);
+		}
+	}
+}
+
+
+/* Timer A Overflow */
+INLINE void TimerAOver(FM_ST *ST)
+{
+	/* set status (if enabled) */
+	if(ST->mode & 0x04) FM_STATUS_SET(ST,0x01);
+	/* clear or reload the counter */
+	ST->TAC = (1024-ST->TA);
+	if (ST->timer_handler) (ST->timer_handler)(ST->param,0,ST->TAC * ST->timer_prescaler,ST->clock);
+}
+/* Timer B Overflow */
+INLINE void TimerBOver(FM_ST *ST)
+{
+	/* set status (if enabled) */
+	if(ST->mode & 0x08) FM_STATUS_SET(ST,0x02);
+	/* clear or reload the counter */
+	ST->TBC = ( 256-ST->TB)<<4;
+	if (ST->timer_handler) (ST->timer_handler)(ST->param,1,ST->TBC * ST->timer_prescaler,ST->clock);
+}
+
+
+#if FM_INTERNAL_TIMER
+/* ----- internal timer mode , update timer */
+
+/* ---------- calculate timer A ---------- */
+	#define INTERNAL_TIMER_A(ST,CSM_CH)					\
+	{													\
+		if( (ST)->TAC && ((ST)->timer_handler==0) )		\
+			if( ((ST)->TAC -= (int)((ST)->freqbase*4096)) <= 0 )	\
+			{											\
+				TimerAOver( ST );						\
+				/* CSM mode total level latch and auto key on */	\
+				if( (ST)->mode & 0x80 )					\
+					CSMKeyControll( OPN->type, CSM_CH );			\
+			}											\
+	}
+/* ---------- calculate timer B ---------- */
+	#define INTERNAL_TIMER_B(ST,step)						\
+	{														\
+		if( (ST)->TBC && ((ST)->timer_handler==0) )				\
+			if( ((ST)->TBC -= (int)((ST)->freqbase*4096*step)) <= 0 )	\
+				TimerBOver( ST );							\
+	}
+#else /* FM_INTERNAL_TIMER */
+/* external timer mode */
+#define INTERNAL_TIMER_A(ST,CSM_CH)
+#define INTERNAL_TIMER_B(ST,step)
+#endif /* FM_INTERNAL_TIMER */
+
+
+
+#if FM_BUSY_FLAG_SUPPORT
+#define FM_BUSY_CLEAR(ST) ((ST)->busy_expiry_time = UNDEFINED_TIME)
+INLINE UINT8 FM_STATUS_FLAG(FM_ST *ST)
+{
+	if( COMPARE_TIMES(ST->busy_expiry_time, UNDEFINED_TIME) != 0 )
+	{
+		if (COMPARE_TIMES(ST->busy_expiry_time, FM_GET_TIME_NOW(ST->device->machine)) > 0)
+			return ST->status | 0x80;	/* with busy */
+		/* expire */
+		FM_BUSY_CLEAR(ST);
+	}
+	return ST->status;
+}
+INLINE void FM_BUSY_SET(FM_ST *ST,int busyclock )
+{
+	TIME_TYPE expiry_period = MULTIPLY_TIME_BY_INT(ATTOTIME_IN_HZ(ST->clock), busyclock * ST->timer_prescaler);
+	ST->busy_expiry_time = ADD_TIMES(FM_GET_TIME_NOW(ST->device->machine), expiry_period);
+}
+#else
+#define FM_STATUS_FLAG(ST) ((ST)->status)
+#define FM_BUSY_SET(ST,bclock) {}
+#define FM_BUSY_CLEAR(ST) {}
+#endif
+
+
+
+
+INLINE void FM_KEYON(UINT8 type, FM_CH *CH , int s )
+{
+	FM_SLOT *SLOT = &CH->SLOTs;
+	if( !SLOT->key )
+	{
+		SLOT->key = 1;
+		SLOT->phase = 0;		/* restart Phase Generator */
+		SLOT->ssgn = (SLOT->ssg & 0x04) >> 1;
+		SLOT->state = EG_ATT;
+	}
+}
+
+INLINE void FM_KEYOFF(FM_CH *CH , int s )
+{
+	FM_SLOT *SLOT = &CH->SLOTs;
+	if( SLOT->key )
+	{
+		SLOT->key = 0;
+		if (SLOT->state>EG_REL)
+			SLOT->state = EG_REL;/* phase -> Release */
+	}
+}
+
+/* set algorithm connection */
+static void setup_connection( FM_OPN *OPN, FM_CH *CH, int ch )
+{
+	INT32 *carrier = &OPN->out_fmch;
+
+	INT32 **om1 = &CH->connect1;
+	INT32 **om2 = &CH->connect3;
+	INT32 **oc1 = &CH->connect2;
+
+	INT32 **memc = &CH->mem_connect;
+
+	switch( CH->ALGO )
+	{
+	case 0:
+		/* M1---C1---MEM---M2---C2---OUT */
+		*om1 = &OPN->c1;
+		*oc1 = &OPN->mem;
+		*om2 = &OPN->c2;
+		*memc= &OPN->m2;
+		break;
+	case 1:
+		/* M1------+-MEM---M2---C2---OUT */
+		/* C1-+ */
+		*om1 = &OPN->mem;
+		*oc1 = &OPN->mem;
+		*om2 = &OPN->c2;
+		*memc= &OPN->m2;
+		break;
+	case 2:
+		/* M1-----------------+-C2---OUT */
+		/* C1---MEM---M2-+ */
+		*om1 = &OPN->c2;
+		*oc1 = &OPN->mem;
+		*om2 = &OPN->c2;
+		*memc= &OPN->m2;
+		break;
+	case 3:
+		/* M1---C1---MEM------+-C2---OUT */
+		/* M2-+ */
+		*om1 = &OPN->c1;
+		*oc1 = &OPN->mem;
+		*om2 = &OPN->c2;
+		*memc= &OPN->c2;
+		break;
+	case 4:
+		/* M1---C1-+-OUT */
+		/* M2---C2-+ */
+		/* MEM: not used */
+		*om1 = &OPN->c1;
+		*oc1 = carrier;
+		*om2 = &OPN->c2;
+		*memc= &OPN->mem;	/* store it anywhere where it will not be used */
+		break;
+	case 5:
+		/* +----C1----+ */
+		/* M1-+-MEM---M2-+-OUT */
+		/* +----C2----+ */
+		*om1 = 0;	/* special mark */
+		*oc1 = carrier;
+		*om2 = carrier;
+		*memc= &OPN->m2;
+		break;
+	case 6:
+		/* M1---C1-+ */
+		/* M2-+-OUT */
+		/* C2-+ */
+		/* MEM: not used */
+		*om1 = &OPN->c1;
+		*oc1 = carrier;
+		*om2 = carrier;
+		*memc= &OPN->mem;	/* store it anywhere where it will not be used */
+		break;
+	case 7:
+		/* M1-+ */
+		/* C1-+-OUT */
+		/* M2-+ */
+		/* C2-+ */
+		/* MEM: not used*/
+		*om1 = carrier;
+		*oc1 = carrier;
+		*om2 = carrier;
+		*memc= &OPN->mem;	/* store it anywhere where it will not be used */
+		break;
+	}
+
+	CH->connect4 = carrier;
+}
+
+/* set detune & multiple */
+INLINE void set_det_mul(FM_ST *ST,FM_CH *CH,FM_SLOT *SLOT,int v)
+{
+	SLOT->mul = (v&0x0f)? (v&0x0f)*2 : 1;
+	SLOT->DT = ST->dt_tab(v>>4)&7;
+	CH->SLOTSLOT1.Incr=-1;
+}
+
+/* set total level */
+INLINE void set_tl(FM_CH *CH,FM_SLOT *SLOT , int v)
+{
+	SLOT->tl = (v&0x7f)<<(ENV_BITS-7); /* 7bit TL */
+}
+
+/* set attack rate & key scale */
+INLINE void set_ar_ksr(UINT8 type, FM_CH *CH,FM_SLOT *SLOT,int v)
+{
+	UINT8 old_KSR = SLOT->KSR;
+
+	SLOT->ar = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
+
+	SLOT->KSR = 3-(v>>6);
+	if (SLOT->KSR != old_KSR)
+	{
+		CH->SLOTSLOT1.Incr=-1;
+	}
+
+	/* refresh Attack rate */
+	if ((SLOT->ar + SLOT->ksr) < 32+62)
+	{
+		SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+		SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
+	}
+	else
+	{
+		SLOT->eg_sh_ar = 0;
+		SLOT->eg_sel_ar = 17*RATE_STEPS;
+	}
+}
+
+/* set decay rate */
+INLINE void set_dr(UINT8 type, FM_SLOT *SLOT,int v)
+{
+	SLOT->d1r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
+
+	SLOT->eg_sh_d1r = eg_rate_shift SLOT->d1r + SLOT->ksr;
+	SLOT->eg_sel_d1r= eg_rate_selectSLOT->d1r + SLOT->ksr;
+}
+
+/* set sustain rate */
+INLINE void set_sr(UINT8 type, FM_SLOT *SLOT,int v)
+{
+	SLOT->d2r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
+
+	SLOT->eg_sh_d2r = eg_rate_shift SLOT->d2r + SLOT->ksr;
+	SLOT->eg_sel_d2r= eg_rate_selectSLOT->d2r + SLOT->ksr;
+}
+
+/* set release rate */
+INLINE void set_sl_rr(UINT8 type, FM_SLOT *SLOT,int v)
+{
+	SLOT->sl = sl_table v>>4 ;
+
+	SLOT->rr = 34 + ((v&0x0f)<<2);
+
+	SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr;
+	SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr;
+}
+
+
+
+INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
+{
+	UINT32 p;
+
+	p = (env<<3) + sin_tab ( ((signed int)((phase & ~FREQ_MASK) + (pm<<15))) >> FREQ_SH ) & SIN_MASK ;
+
+	if (p >= TL_TAB_LEN)
+		return 0;
+	return tl_tabp;
+}
+
+INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
+{
+	UINT32 p;
+
+	p = (env<<3) + sin_tab ( ((signed int)((phase & ~FREQ_MASK) + pm )) >> FREQ_SH ) & SIN_MASK ;
+
+	if (p >= TL_TAB_LEN)
+		return 0;
+	return tl_tabp;
+}
+
+/* advance LFO to next sample */
+INLINE void advance_lfo(FM_OPN *OPN)
+{
+	UINT8 pos;
+
+	if (OPN->lfo_inc)	/* LFO enabled ? */
+	{
+		OPN->lfo_cnt += OPN->lfo_inc;
+
+		pos = (OPN->lfo_cnt >> LFO_SH) & 127;
+
+
+		/* update AM when LFO output changes */
+
+		/* actually I can't optimize is this way without rewriting chan_calc()
+ to use chip->lfo_am instead of global lfo_am */
+		{
+
+			/* triangle */
+			/* AM: 0 to 126 step +2, 126 to 0 step -2 */
+			if (pos<64)
+				OPN->LFO_AM = (pos&63) * 2;
+			else
+				OPN->LFO_AM = 126 - ((pos&63) * 2);
+		}
+
+		/* PM works with 4 times slower clock */
+		pos >>= 2;
+		/* update PM when LFO output changes */
+		/*if (prev_pos != pos)*/ /* can't use global lfo_pm for this optimization, must be chip->lfo_pm instead*/
+		{
+			OPN->LFO_PM = pos;
+		}
+
+	}
+	else
+	{
+		OPN->LFO_AM = 0;
+		OPN->LFO_PM = 0;
+	}
+}
+
+/* changed from INLINE to static here to work around gcc 4.2.1 codegen bug */
+static void advance_eg_channel(FM_OPN *OPN, FM_SLOT *SLOT)
+{
+	unsigned int out;
+	unsigned int swap_flag = 0;
+	unsigned int i;
+
+
+	i = 4; /* four operators per channel */
+	do
+	{
+		/* reset SSG-EG swap flag */
+		swap_flag = 0;
+
+		switch(SLOT->state)
+		{
+		case EG_ATT:		/* attack phase */
+			if ( !(OPN->eg_cnt & ((1<<SLOT->eg_sh_ar)-1) ) )
+			{
+				SLOT->volume += (~SLOT->volume *
+ (eg_incSLOT->eg_sel_ar + ((OPN->eg_cnt>>SLOT->eg_sh_ar)&7))
+ ) >>4;
+
+				if (SLOT->volume <= MIN_ATT_INDEX)
+				{
+					SLOT->volume = MIN_ATT_INDEX;
+					SLOT->state = EG_DEC;
+				}
+			}
+		break;
+
+		case EG_DEC:	/* decay phase */
+			{
+				if (SLOT->ssg&0x08)	/* SSG EG type envelope selected */
+				{
+					if ( !(OPN->eg_cnt & ((1<<SLOT->eg_sh_d1r)-1) ) )
+					{
+						SLOT->volume += 4 * eg_incSLOT->eg_sel_d1r + ((OPN->eg_cnt>>SLOT->eg_sh_d1r)&7);
+
+						if ( SLOT->volume >= (INT32)(SLOT->sl) )
+							SLOT->state = EG_SUS;
+					}
+				}
+				else
+				{
+					if ( !(OPN->eg_cnt & ((1<<SLOT->eg_sh_d1r)-1) ) )
+					{
+						SLOT->volume += eg_incSLOT->eg_sel_d1r + ((OPN->eg_cnt>>SLOT->eg_sh_d1r)&7);
+
+						if ( SLOT->volume >= (INT32)(SLOT->sl) )
+							SLOT->state = EG_SUS;
+					}
+				}
+			}
+		break;
+
+		case EG_SUS:	/* sustain phase */
+			if (SLOT->ssg&0x08)	/* SSG EG type envelope selected */
+			{
+				if ( !(OPN->eg_cnt & ((1<<SLOT->eg_sh_d2r)-1) ) )
+				{
+
+					SLOT->volume += 4 * eg_incSLOT->eg_sel_d2r + ((OPN->eg_cnt>>SLOT->eg_sh_d2r)&7);
+
+					if ( SLOT->volume >= ENV_QUIET )
+					{
+						SLOT->volume = MAX_ATT_INDEX;
+
+						if (SLOT->ssg&0x01)	/* bit 0 = hold */
+						{
+							if (SLOT->ssgn&1)	/* have we swapped once ??? */
+							{
+								/* yes, so do nothing, just hold current level */
+							}
+							else
+								swap_flag = (SLOT->ssg&0x02) | 1 ; /* bit 1 = alternate */
+
+						}
+						else
+						{
+							/* same as KEY-ON operation */
+
+							/* restart of the Phase Generator should be here */
+							SLOT->phase = 0;
+
+							{
+								/* phase -> Attack */
+								SLOT->volume = 511;
+								SLOT->state = EG_ATT;
+							}
+
+							swap_flag = (SLOT->ssg&0x02); /* bit 1 = alternate */
+						}
+					}
+				}
+			}
+			else
+			{
+				if ( !(OPN->eg_cnt & ((1<<SLOT->eg_sh_d2r)-1) ) )
+				{
+					SLOT->volume += eg_incSLOT->eg_sel_d2r + ((OPN->eg_cnt>>SLOT->eg_sh_d2r)&7);
+
+					if ( SLOT->volume >= MAX_ATT_INDEX )
+					{
+						SLOT->volume = MAX_ATT_INDEX;
+						/* do not change SLOT->state (verified on real chip) */
+					}
+				}
+
+			}
+		break;
+
+		case EG_REL:	/* release phase */
+				if ( !(OPN->eg_cnt & ((1<<SLOT->eg_sh_rr)-1) ) )
+				{
+					/* SSG-EG affects Release phase also (Nemesis) */
+					SLOT->volume += eg_incSLOT->eg_sel_rr + ((OPN->eg_cnt>>SLOT->eg_sh_rr)&7);
+
+					if ( SLOT->volume >= MAX_ATT_INDEX )
+					{
+						SLOT->volume = MAX_ATT_INDEX;
+						SLOT->state = EG_OFF;
+					}
+				}
+		break;
+
+		}
+
+
+		out = ((UINT32)SLOT->volume);
+
+ /* negate output (changes come from alternate bit, init comes from attack bit) */
+		if ((SLOT->ssg&0x08) && (SLOT->ssgn&2) && (SLOT->state > EG_REL))
+			out ^= MAX_ATT_INDEX;
+
+		/* we need to store the result here because we are going to change ssgn
+ in next instruction */
+		SLOT->vol_out = out + SLOT->tl;
+
+ /* reverse SLOT inversion flag */
+		SLOT->ssgn ^= swap_flag;
+
+		SLOT++;
+		i--;
+	}while (i);
+
+}
+
+
+
+#define volume_calc(OP) ((OP)->vol_out + (AM & (OP)->AMmask))
+
+INLINE void update_phase_lfo_slot(FM_OPN *OPN, FM_SLOT *SLOT, INT32 pms, UINT32 block_fnum)
+{
+	UINT32 fnum_lfo = ((block_fnum & 0x7f0) >> 4) * 32 * 8;
+	INT32 lfo_fn_table_index_offset = lfo_pm_table fnum_lfo + pms + OPN->LFO_PM ;
+
+	if (lfo_fn_table_index_offset) /* LFO phase modulation active */
+	{
+		UINT8 blk;
+		UINT32 fn;
+		int kc, fc;
+
+		block_fnum = block_fnum*2 + lfo_fn_table_index_offset;
+
+		blk = (block_fnum&0x7000) >> 12;
+		fn = block_fnum & 0xfff;
+
+		/* keyscale code */
+		kc = (blk<<2) | opn_fktablefn >> 8;
+
+		/* phase increment counter */
+		fc = (OPN->fn_tablefn>>(7-blk)) + SLOT->DTkc;
+
+		/* detects frequency overflow (credits to Nemesis) */
+		if (fc < 0) fc += OPN->fn_max;
+
+		/* update phase */
+		SLOT->phase += (fc * SLOT->mul) >> 1;
+	}
+	else /* LFO phase modulation = zero */
+	{
+		SLOT->phase += SLOT->Incr;
+	}
+}
+
+INLINE void update_phase_lfo_channel(FM_OPN *OPN, FM_CH *CH)
+{
+	UINT32 block_fnum = CH->block_fnum;
+
+	UINT32 fnum_lfo = ((block_fnum & 0x7f0) >> 4) * 32 * 8;
+	INT32 lfo_fn_table_index_offset = lfo_pm_table fnum_lfo + CH->pms + OPN->LFO_PM ;
+
+	if (lfo_fn_table_index_offset) /* LFO phase modulation active */
+	{
+	 UINT8 blk;
+	 UINT32 fn;
+		int kc, fc, finc;
+
+		block_fnum = block_fnum*2 + lfo_fn_table_index_offset;
+
+	 blk = (block_fnum&0x7000) >> 12;
+	 fn = block_fnum & 0xfff;
+
+		/* keyscale code */
+	 kc = (blk<<2) | opn_fktablefn >> 8;
+
+	 /* phase increment counter */
+		fc = (OPN->fn_tablefn>>(7-blk));
+
+		/* detects frequency overflow (credits to Nemesis) */
+		finc = fc + CH->SLOTSLOT1.DTkc;
+
+		if (finc < 0) finc += OPN->fn_max;
+		CH->SLOTSLOT1.phase += (finc*CH->SLOTSLOT1.mul) >> 1;
+
+		finc = fc + CH->SLOTSLOT2.DTkc;
+		if (finc < 0) finc += OPN->fn_max;
+		CH->SLOTSLOT2.phase += (finc*CH->SLOTSLOT2.mul) >> 1;
+
+		finc = fc + CH->SLOTSLOT3.DTkc;
+		if (finc < 0) finc += OPN->fn_max;
+		CH->SLOTSLOT3.phase += (finc*CH->SLOTSLOT3.mul) >> 1;
+
+		finc = fc + CH->SLOTSLOT4.DTkc;
+		if (finc < 0) finc += OPN->fn_max;
+		CH->SLOTSLOT4.phase += (finc*CH->SLOTSLOT4.mul) >> 1;
+	}
+	else /* LFO phase modulation = zero */
+	{
+	 CH->SLOTSLOT1.phase += CH->SLOTSLOT1.Incr;
+	 CH->SLOTSLOT2.phase += CH->SLOTSLOT2.Incr;
+	 CH->SLOTSLOT3.phase += CH->SLOTSLOT3.Incr;
+	 CH->SLOTSLOT4.phase += CH->SLOTSLOT4.Incr;
+	}
+}
+
+INLINE void chan_calc(FM_OPN *OPN, FM_CH *CH, int chnum)
+{
+	unsigned int eg_out;
+
+	UINT32 AM = OPN->LFO_AM >> CH->ams;
+
+	if (CH->Muted)
+		return;
+
+
+	OPN->m2 = OPN->c1 = OPN->c2 = OPN->mem = 0;
+
+	*CH->mem_connect = CH->mem_value;	/* restore delayed sample (MEM) value to m2 or c2 */
+
+	eg_out = volume_calc(&CH->SLOTSLOT1);
+	{
+		INT32 out = CH->op1_out0 + CH->op1_out1;
+		CH->op1_out0 = CH->op1_out1;
+
+		if( !CH->connect1 )
+		{
+			/* algorithm 5 */
+			OPN->mem = OPN->c1 = OPN->c2 = CH->op1_out0;
+		}
+		else
+		{
+			/* other algorithms */
+			*CH->connect1 += CH->op1_out0;
+		}
+
+		CH->op1_out1 = 0;
+		if( eg_out < ENV_QUIET )	/* SLOT 1 */
+		{
+			if (!CH->FB)
+				out=0;
+
+			CH->op1_out1 = op_calc1(CH->SLOTSLOT1.phase, eg_out, (out<<CH->FB) );
+		}
+	}
+
+	eg_out = volume_calc(&CH->SLOTSLOT3);
+	if( eg_out < ENV_QUIET )		/* SLOT 3 */
+		*CH->connect3 += op_calc(CH->SLOTSLOT3.phase, eg_out, OPN->m2);
+
+	eg_out = volume_calc(&CH->SLOTSLOT2);
+	if( eg_out < ENV_QUIET )		/* SLOT 2 */
+		*CH->connect2 += op_calc(CH->SLOTSLOT2.phase, eg_out, OPN->c1);
+
+	eg_out = volume_calc(&CH->SLOTSLOT4);
+	if( eg_out < ENV_QUIET )		/* SLOT 4 */
+		*CH->connect4 += op_calc(CH->SLOTSLOT4.phase, eg_out, OPN->c2);
+
+
+	/* store current MEM */
+	CH->mem_value = OPN->mem;
+
+	/* update phase counters AFTER output calculations */
+	if(CH->pms)
+	{
+		/* add support for 3 slot mode */
+		if ((OPN->ST.mode & 0xC0) && (chnum == 2))
+		{
+		 update_phase_lfo_slot(OPN, &CH->SLOTSLOT1, CH->pms, OPN->SL3.block_fnum1);
+		 update_phase_lfo_slot(OPN, &CH->SLOTSLOT2, CH->pms, OPN->SL3.block_fnum2);
+		 update_phase_lfo_slot(OPN, &CH->SLOTSLOT3, CH->pms, OPN->SL3.block_fnum0);
+		 update_phase_lfo_slot(OPN, &CH->SLOTSLOT4, CH->pms, CH->block_fnum);
+		}
+		else update_phase_lfo_channel(OPN, CH);
+	}
+	else	/* no LFO phase modulation */
+	{
+		CH->SLOTSLOT1.phase += CH->SLOTSLOT1.Incr;
+		CH->SLOTSLOT2.phase += CH->SLOTSLOT2.Incr;
+		CH->SLOTSLOT3.phase += CH->SLOTSLOT3.Incr;
+		CH->SLOTSLOT4.phase += CH->SLOTSLOT4.Incr;
+	}
+}
+
+/* update phase increment and envelope generator */
+INLINE void refresh_fc_eg_slot(FM_OPN *OPN, FM_SLOT *SLOT , int fc , int kc )
+{
+	int ksr = kc >> SLOT->KSR;
+
+	fc += SLOT->DTkc;
+
+	/* detects frequency overflow (credits to Nemesis) */
+	if (fc < 0) fc += OPN->fn_max;
+
+	/* (frequency) phase increment counter */
+	SLOT->Incr = (fc * SLOT->mul) >> 1;
+
+	if( SLOT->ksr != ksr )
+	{
+		SLOT->ksr = ksr;
+
+		/* calculate envelope generator rates */
+		if ((SLOT->ar + SLOT->ksr) < 32+62)
+		{
+			SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+			SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
+		}
+		else
+		{
+			SLOT->eg_sh_ar = 0;
+			SLOT->eg_sel_ar = 17*RATE_STEPS;
+		}
+
+		SLOT->eg_sh_d1r = eg_rate_shift SLOT->d1r + SLOT->ksr;
+		SLOT->eg_sh_d2r = eg_rate_shift SLOT->d2r + SLOT->ksr;
+		SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr;
+
+		SLOT->eg_sel_d1r= eg_rate_selectSLOT->d1r + SLOT->ksr;
+		SLOT->eg_sel_d2r= eg_rate_selectSLOT->d2r + SLOT->ksr;
+		SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr;
+	}
+}
+
+/* update phase increment counters */
+/* Changed from INLINE to static to work around gcc 4.2.1 codegen bug */
+static void refresh_fc_eg_chan(FM_OPN *OPN, FM_CH *CH )
+{
+	if( CH->SLOTSLOT1.Incr==-1)
+	{
+		int fc = CH->fc;
+		int kc = CH->kcode;
+		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT1 , fc , kc );
+		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT2 , fc , kc );
+		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT3 , fc , kc );
+		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT4 , fc , kc );
+	}
+}
+
+/* initialize time tables */
+static void init_timetables( FM_ST *ST , const UINT8 *dttable )
+{
+	int i,d;
+	double rate;
+
+#if 0
+	logerror("FM.C: samplerate=%8i chip clock=%8i freqbase=%f \n",
+			 ST->rate, ST->clock, ST->freqbase );
+#endif
+
+	/* DeTune table */
+	for (d = 0;d <= 3;d++)
+	{
+		for (i = 0;i <= 31;i++)
+		{
+			rate = ((double)dttabled*32 + i) * SIN_LEN * ST->freqbase * (1<<FREQ_SH) / ((double)(1<<20));
+			ST->dt_tabdi = (INT32) rate;
+			ST->dt_tabd+4i = -ST->dt_tabdi;
+#if 0
+			logerror("FM.C: DT %2i %2i = %8x \n", d, i, ST->dt_tabdi );
+#endif
+		}
+	}
+
+}
+
+
+static void reset_channels( FM_ST *ST , FM_CH *CH , int num )
+{
+	int c,s;
+
+	ST->mode = 0;	/* normal mode */
+	ST->TA = 0;
+	ST->TAC = 0;
+	ST->TB = 0;
+	ST->TBC = 0;
+
+	for( c = 0 ; c < num ; c++ )
+	{
+		//memset(&CHc, 0x00, sizeof(FM_CH));
+		CHc.mem_value = 0;
+		CHc.op1_out0 = 0;
+		CHc.op1_out1 = 0;
+		CHc.fc = 0;
+		for(s = 0 ; s < 4 ; s++ )
+		{
+			//memset(&CHc.SLOTs, 0x00, sizeof(FM_SLOT));
+			CHc.SLOTs.Incr = -1;
+			CHc.SLOTs.key = 0;
+			CHc.SLOTs.phase = 0;
+			CHc.SLOTs.ssg = 0;
+			CHc.SLOTs.ssgn = 0;
+			CHc.SLOTs.state= EG_OFF;
+			CHc.SLOTs.volume = MAX_ATT_INDEX;
+			CHc.SLOTs.vol_out= MAX_ATT_INDEX;
+		}
+	}
+}
+
+/* initialize generic tables */
+static int init_tables(void)
+{
+	signed int i,x;
+	signed int n;
+	double o,m;
+
+	for (x=0; x<TL_RES_LEN; x++)
+	{
+		m = (1<<16) / pow(2, (x+1) * (ENV_STEP/4.0) / 8.0);
+		m = floor(m);
+
+		/* we never reach (1<<16) here due to the (x+1) */
+		/* result fits within 16 bits at maximum */
+
+		n = (int)m;		/* 16 bits here */
+		n >>= 4;		/* 12 bits here */
+		if (n&1)		/* round to nearest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+						/* 11 bits here (rounded) */
+		n <<= 2;		/* 13 bits here (as in real chip) */
+		tl_tab x*2 + 0 = n;
+		tl_tab x*2 + 1 = -tl_tab x*2 + 0 ;
+
+		for (i=1; i<13; i++)
+		{
+			tl_tab x*2+0 + i*2*TL_RES_LEN = tl_tab x*2+0 >>i;
+			tl_tab x*2+1 + i*2*TL_RES_LEN = -tl_tab x*2+0 + i*2*TL_RES_LEN ;
+		}
+	#if 0
+			logerror("tl %04i", x);
+			for (i=0; i<13; i++)
+				logerror(", %02i %4x", i*2, tl_tab x*2 /*+1*/ + i*2*TL_RES_LEN );
+			logerror("\n");
+	#endif
+	}
+	/*logerror("FM.C: TL_TAB_LEN = %i elements (%i bytes)\n",TL_TAB_LEN, (int)sizeof(tl_tab));*/
+
+
+	for (i=0; i<SIN_LEN; i++)
+	{
+		/* non-standard sinus */
+		m = sin( ((i*2)+1) * M_PI / SIN_LEN ); /* checked against the real chip */
+
+		/* we never reach zero here due to ((i*2)+1) */
+
+		if (m>0.0)
+			o = 8*log(1.0/m)/log(2.0);	/* convert to 'decibels' */
+		else
+			o = 8*log(-1.0/m)/log(2.0);	/* convert to 'decibels' */
+
+		o = o / (ENV_STEP/4);
+
+		n = (int)(2.0*o);
+		if (n&1)						/* round to nearest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+
+		sin_tab i = n*2 + (m>=0.0? 0: 1 );
+		/*logerror("FM.C: sin %4i= %4i (tl_tab value=%5i)\n", i, sin_tabi,tl_tabsin_tabi);*/
+	}
+
+	/*logerror("FM.C: ENV_QUIET= %08x\n",ENV_QUIET );*/
+
+
+	/* build LFO PM modulation table */
+	for(i = 0; i < 8; i++) /* 8 PM depths */
+	{
+		UINT8 fnum;
+		for (fnum=0; fnum<128; fnum++) /* 7 bits meaningful of F-NUMBER */
+		{
+			UINT8 value;
+			UINT8 step;
+			UINT32 offset_depth = i;
+			UINT32 offset_fnum_bit;
+			UINT32 bit_tmp;
+
+			for (step=0; step<8; step++)
+			{
+				value = 0;
+				for (bit_tmp=0; bit_tmp<7; bit_tmp++) /* 7 bits */
+				{
+					if (fnum & (1<<bit_tmp)) /* only if bit "bit_tmp" is set */
+					{
+						offset_fnum_bit = bit_tmp * 8;
+						value += lfo_pm_outputoffset_fnum_bit + offset_depthstep;
+					}
+				}
+				lfo_pm_table(fnum*32*8) + (i*32) + step + 0 = value;
+				lfo_pm_table(fnum*32*8) + (i*32) +(step^7)+ 8 = value;
+				lfo_pm_table(fnum*32*8) + (i*32) + step +16 = -value;
+				lfo_pm_table(fnum*32*8) + (i*32) +(step^7)+24 = -value;
+			}
+#if 0
+			logerror("LFO depth=%1x FNUM=%04x (<<4=%4x): ", i, fnum, fnum<<4);
+			for (step=0; step<16; step++) /* dump only positive part of waveforms */
+				logerror("%02x ", lfo_pm_table(fnum*32*8) + (i*32) + step );
+			logerror("\n");
+#endif
+
+		}
+	}
+
+
+
+#ifdef SAVE_SAMPLE
+	sample0=fopen("sampsum.pcm","wb");
+#endif
+
+	return 1;
+
+}
+
+
+
+static void FMCloseTable( void )
+{
+#ifdef SAVE_SAMPLE
+	fclose(sample0);
+#endif
+	return;
+}
+
+
+/* CSM Key Controll */
+INLINE void CSMKeyControll(UINT8 type, FM_CH *CH)
+{
+	/* all key on then off (only for operators which were OFF!) */
+	if (!CH->SLOTSLOT1.key)
+	{
+		FM_KEYON(type, CH,SLOT1);
+		FM_KEYOFF(CH, SLOT1);
+	}
+	if (!CH->SLOTSLOT2.key)
+	{
+		FM_KEYON(type, CH,SLOT2);
+		FM_KEYOFF(CH, SLOT2);
+	}
+	if (!CH->SLOTSLOT3.key)
+	{
+		FM_KEYON(type, CH,SLOT3);
+		FM_KEYOFF(CH, SLOT3);
+	}
+	if (!CH->SLOTSLOT4.key)
+	{
+		FM_KEYON(type, CH,SLOT4);
+		FM_KEYOFF(CH, SLOT4);
+	}
+}
+
+#ifdef __STATE_H__
+/* FM channel save , internal state only */
+static void FMsave_state_channel(const device_config *device,FM_CH *CH,int num_ch)
+{
+	int slot , ch;
+
+	for(ch=0;ch<num_ch;ch++,CH++)
+	{
+		/* channel */
+		state_save_register_device_item_array(device, ch, CH->op1_out);
+		state_save_register_device_item(device, ch, CH->fc);
+		/* slots */
+		for(slot=0;slot<4;slot++)
+		{
+			FM_SLOT *SLOT = &CH->SLOTslot;
+			state_save_register_device_item(device, ch * 4 + slot, SLOT->phase);
+			state_save_register_device_item(device, ch * 4 + slot, SLOT->state);
+			state_save_register_device_item(device, ch * 4 + slot, SLOT->volume);
+		}
+	}
+}
+
+static void FMsave_state_st(const device_config *device,FM_ST *ST)
+{
+#if FM_BUSY_FLAG_SUPPORT
+	state_save_register_device_item(device, 0, ST->busy_expiry_time.seconds );
+	state_save_register_device_item(device, 0, ST->busy_expiry_time.attoseconds );
+#endif
+	state_save_register_device_item(device, 0, ST->address );
+	state_save_register_device_item(device, 0, ST->irq );
+	state_save_register_device_item(device, 0, ST->irqmask );
+	state_save_register_device_item(device, 0, ST->status );
+	state_save_register_device_item(device, 0, ST->mode );
+	state_save_register_device_item(device, 0, ST->prescaler_sel );
+	state_save_register_device_item(device, 0, ST->fn_h );
+	state_save_register_device_item(device, 0, ST->TA );
+	state_save_register_device_item(device, 0, ST->TAC );
+	state_save_register_device_item(device, 0, ST->TB );
+	state_save_register_device_item(device, 0, ST->TBC );
+}
+#endif /* _STATE_H */
+
+#if BUILD_OPN
+
+
+
+/* prescaler set (and make time tables) */
+static void OPNSetPres(FM_OPN *OPN, int pres, int timer_prescaler, int SSGpres)
+{
+	int i;
+
+	/* frequency base */
+	OPN->ST.freqbase = (OPN->ST.rate) ? ((double)OPN->ST.clock / OPN->ST.rate) / pres : 0;
+
+#if 0
+	OPN->ST.rate = (double)OPN->ST.clock / pres;
+	OPN->ST.freqbase = 1.0;
+#endif
+
+	OPN->eg_timer_add = (1<<EG_SH) * OPN->ST.freqbase;
+	OPN->eg_timer_overflow = ( 3 ) * (1<<EG_SH);
+
+
+	/* Timer base time */
+	OPN->ST.timer_prescaler = timer_prescaler;
+
+	/* SSG part prescaler set */
+	if( SSGpres ) (*OPN->ST.SSG->set_clock)( OPN->ST.param, OPN->ST.clock * 2 / SSGpres );
+
+	/* make time tables */
+	init_timetables( &OPN->ST, dt_tab );
+
+	/* there are 2048 FNUMs that can be generated using FNUM/BLK registers
+ but LFO works with one more bit of a precision so we really need 4096 elements */
+	/* calculate fnumber -> increment counter table */
+	for(i = 0; i < 4096; i++)
+	{
+		/* freq table for octave 7 */
+		/* OPN phase increment counter = 20bit */
+		OPN->fn_tablei = (UINT32)( (double)i * 32 * OPN->ST.freqbase * (1<<(FREQ_SH-10)) ); /* -10 because chip works with 10.10 fixed point, while we use 16.16 */
+#if 0
+		logerror("FM.C: fn_table%4i = %08x (dec=%8i)\n",
+				 i, OPN->fn_tablei>>6,OPN->fn_tablei>>6 );
+#endif
+	}
+
+	/* maximal frequency is required for Phase overflow calculation, register size is 17 bits (Nemesis) */
+	OPN->fn_max = (UINT32)( (double)0x20000 * OPN->ST.freqbase * (1<<(FREQ_SH-10)) );
+
+	/* LFO freq. table */
+	for(i = 0; i < 8; i++)
+	{
+		/* Amplitude modulation: 64 output levels (triangle waveform); 1 level lasts for one of "lfo_samples_per_step" samples */
+		/* Phase modulation: one entry from lfo_pm_output lasts for one of 4 * "lfo_samples_per_step" samples */
+		OPN->lfo_freqi = (1.0 / lfo_samples_per_stepi) * (1<<LFO_SH) * OPN->ST.freqbase;
+#if 0
+		logerror("FM.C: lfo_freq%i = %08x (dec=%8i)\n",
+				 i, OPN->lfo_freqi,OPN->lfo_freqi );
+#endif
+	}
+}
+
+
+
+/* write a OPN mode register 0x20-0x2f */
+static void OPNWriteMode(FM_OPN *OPN, int r, int v)
+{
+	UINT8 c;
+	FM_CH *CH;
+
+	switch(r)
+	{
+	case 0x21:	/* Test */
+		break;
+	case 0x22:	/* LFO FREQ (YM2608/YM2610/YM2610B/YM2612) */
+		if( OPN->type & TYPE_LFOPAN )
+		{
+			if (v&0x08) /* LFO enabled ? */
+			{
+				OPN->lfo_inc = OPN->lfo_freqv&7;
+			}
+			else
+			{
+				OPN->lfo_inc = 0;
+			}
+		}
+		break;
+	case 0x24:	/* timer A High 8*/
+		OPN->ST.TA = (OPN->ST.TA & 0x03)|(((int)v)<<2);
+		break;
+	case 0x25:	/* timer A Low 2*/
+		OPN->ST.TA = (OPN->ST.TA & 0x3fc)|(v&3);
+		break;
+	case 0x26:	/* timer B */
+		OPN->ST.TB = v;
+		break;
+	case 0x27:	/* mode, timer control */
+		set_timers( &(OPN->ST),OPN->ST.param,v );
+		break;
+	case 0x28:	/* key on / off */
+		c = v & 0x03;
+		if( c == 3 ) break;
+		if( (v&0x04) && (OPN->type & TYPE_6CH) ) c+=3;
+		CH = OPN->P_CH;
+		CH = &CHc;
+		if(v&0x10) FM_KEYON(OPN->type,CH,SLOT1); else FM_KEYOFF(CH,SLOT1);
+		if(v&0x20) FM_KEYON(OPN->type,CH,SLOT2); else FM_KEYOFF(CH,SLOT2);
+		if(v&0x40) FM_KEYON(OPN->type,CH,SLOT3); else FM_KEYOFF(CH,SLOT3);
+		if(v&0x80) FM_KEYON(OPN->type,CH,SLOT4); else FM_KEYOFF(CH,SLOT4);
+		break;
+	}
+}
+
+/* write a OPN register (0x30-0xff) */
+static void OPNWriteReg(FM_OPN *OPN, int r, int v)
+{
+	FM_CH *CH;
+	FM_SLOT *SLOT;
+
+	UINT8 c = OPN_CHAN(r);
+
+	if (c == 3) return; /* 0xX3,0xX7,0xXB,0xXF */
+
+	if (r >= 0x100) c+=3;
+
+	CH = OPN->P_CH;
+	CH = &CHc;
+
+	SLOT = &(CH->SLOTOPN_SLOT(r));
+
+	switch( r & 0xf0 )
+	{
+	case 0x30:	/* DET , MUL */
+		set_det_mul(&OPN->ST,CH,SLOT,v);
+		break;
+
+	case 0x40:	/* TL */
+		set_tl(CH,SLOT,v);
+		break;
+
+	case 0x50:	/* KS, AR */
+		set_ar_ksr(OPN->type,CH,SLOT,v);
+		break;
+
+	case 0x60:	/* bit7 = AM ENABLE, DR */
+		set_dr(OPN->type, SLOT,v);
+
+		if(OPN->type & TYPE_LFOPAN) /* YM2608/2610/2610B/2612 */
+		{
+			SLOT->AMmask = (v&0x80) ? ~0 : 0;
+		}
+		break;
+
+	case 0x70:	/* SR */
+		set_sr(OPN->type,SLOT,v);
+		break;
+
+	case 0x80:	/* SL, RR */
+		set_sl_rr(OPN->type,SLOT,v);
+		break;
+
+	case 0x90:	/* SSG-EG */
+		SLOT->ssg = v&0x0f;
+		SLOT->ssgn = (v&0x04)>>1; /* bit 1 in ssgn = attack */
+
+		/* SSG-EG envelope shapes :
+
+ E AtAlH
+ 1 0 0 0 \\\\
+
+ 1 0 0 1 \___
+
+ 1 0 1 0 \/\/
+ ___
+ 1 0 1 1 \
+
+ 1 1 0 0 ////
+ ___
+ 1 1 0 1 /
+
+ 1 1 1 0 /\/\
+
+ 1 1 1 1 /___
+
+
+ E = SSG-EG enable
+
+
+ The shapes are generated using Attack, Decay and Sustain phases.
+
+ Each single character in the diagrams above represents this whole
+ sequence:
+
+ - when KEY-ON = 1, normal Attack phase is generated (*without* any
+ difference when compared to normal mode),
+
+ - later, when envelope level reaches minimum level (max volume),
+ the EG switches to Decay phase (which works with bigger steps
+ when compared to normal mode - see below),
+
+ - later when envelope level passes the SL level,
+ the EG swithes to Sustain phase (which works with bigger steps
+ when compared to normal mode - see below),
+
+ - finally when envelope level reaches maximum level (min volume),
+ the EG switches to Attack phase again (depends on actual waveform).
+
+ Important is that when switch to Attack phase occurs, the phase counter
+ of that operator will be zeroed-out (as in normal KEY-ON) but not always.
+ (I havent found the rule for that - perhaps only when the output level is low)
+
+ The difference (when compared to normal Envelope Generator mode) is
+ that the resolution in Decay and Sustain phases is 4 times lower;
+ this results in only 256 steps instead of normal 1024.
+ In other words:
+ when SSG-EG is disabled, the step inside of the EG is one,
+ when SSG-EG is enabled, the step is four (in Decay and Sustain phases).
+
+ Times between the level changes are the same in both modes.
+
+
+ Important:
+ Decay 1 Level (so called SL) is compared to actual SSG-EG output, so
+ it is the same in both SSG and no-SSG modes, with this exception:
+
+ when the SSG-EG is enabled and is generating raising levels
+ (when the EG output is inverted) the SL will be found at wrong level !!!
+ For example, when SL=02:
+ 0 -6 = -6dB in non-inverted EG output
+ 96-6 = -90dB in inverted EG output
+ Which means that EG compares its level to SL as usual, and that the
+ output is simply inverted afterall.
+
+
+ The Yamaha's manuals say that AR should be set to 0x1f (max speed).
+ That is not necessary, but then EG will be generating Attack phase.
+
+ */
+
+
+		break;
+
+	case 0xa0:
+		switch( OPN_SLOT(r) )
+		{
+		case 0:		/* 0xa0-0xa2 : FNUM1 */
+			{
+				UINT32 fn = (((UINT32)( (OPN->ST.fn_h)&7))<<8) + v;
+				UINT8 blk = OPN->ST.fn_h>>3;
+				/* keyscale code */
+				CH->kcode = (blk<<2) | opn_fktablefn >> 7;
+				/* phase increment counter */
+				CH->fc = OPN->fn_tablefn*2>>(7-blk);
+
+				/* store fnum in clear form for LFO PM calculations */
+				CH->block_fnum = (blk<<11) | fn;
+
+				CH->SLOTSLOT1.Incr=-1;
+			}
+			break;
+		case 1:		/* 0xa4-0xa6 : FNUM2,BLK */
+			OPN->ST.fn_h = v&0x3f;
+			break;
+		case 2:		/* 0xa8-0xaa : 3CH FNUM1 */
+			if(r < 0x100)
+			{
+				UINT32 fn = (((UINT32)(OPN->SL3.fn_h&7))<<8) + v;
+				UINT8 blk = OPN->SL3.fn_h>>3;
+				/* keyscale code */
+				OPN->SL3.kcodec= (blk<<2) | opn_fktablefn >> 7;
+				/* phase increment counter */
+				OPN->SL3.fcc = OPN->fn_tablefn*2>>(7-blk);
+				OPN->SL3.block_fnumc = (blk<<11) | fn;
+				(OPN->P_CH)2.SLOTSLOT1.Incr=-1;
+			}
+			break;
+		case 3:		/* 0xac-0xae : 3CH FNUM2,BLK */
+			if(r < 0x100)
+				OPN->SL3.fn_h = v&0x3f;
+			break;
+		}
+		break;
+
+	case 0xb0:
+		switch( OPN_SLOT(r) )
+		{
+		case 0:		/* 0xb0-0xb2 : FB,ALGO */
+			{
+				int feedback = (v>>3)&7;
+				CH->ALGO = v&7;
+				CH->FB = feedback ? feedback+6 : 0;
+				setup_connection( OPN, CH, c );
+			}
+			break;
+		case 1:		/* 0xb4-0xb6 : L , R , AMS , PMS (YM2612/YM2610B/YM2610/YM2608) */
+			if( OPN->type & TYPE_LFOPAN)
+			{
+				/* b0-2 PMS */
+				CH->pms = (v & 7) * 32; /* CH->pms = PM depth * 32 (index in lfo_pm_table) */
+
+				/* b4-5 AMS */
+				CH->ams = lfo_ams_depth_shift(v>>4) & 0x03;
+
+				/* PAN : b7 = L, b6 = R */
+				OPN->pan c*2 = (v & 0x80) ? ~0 : 0;
+				OPN->pan c*2+1 = (v & 0x40) ? ~0 : 0;
+
+			}
+			break;
+		}
+		break;
+	}
+}
+
+#endif /* BUILD_OPN */
+
+#if BUILD_OPN_PRESCALER
+/*
+ prescaler circuit (best guess to verified chip behaviour)
+
+ +--------------+ +-sel2-+
+ | +--|in20 |
+ +---+ | +-sel1-+ | |
+M-CLK -+-|1/2|-+--|in10 | +---+ | out|--INT_CLOCK
+ | +---+ | out|-|1/3|-|in21 |
+ +----------|in11 | +---+ +------+
+ +------+
+
+reg.2d : sel2 = in21 (select sel2)
+reg.2e : sel1 = in11 (select sel1)
+reg.2f : sel1 = in10 , sel2 = in20 (clear selector)
+reset : sel1 = in11 , sel2 = in21 (clear both)
+
+*/
+static void OPNPrescaler_w(FM_OPN *OPN , int addr, int pre_divider)
+{
+	static const int opn_pres4 = { 2*12 , 2*12 , 6*12 , 3*12 };
+	static const int ssg_pres4 = { 1 , 1 , 4 , 2 };
+	int sel;
+
+	switch(addr)
+	{
+	case 0:		/* when reset */
+		OPN->ST.prescaler_sel = 2;
+		break;
+	case 1:		/* when postload */
+		break;
+	case 0x2d:	/* divider sel : select 1/1 for 1/3line */
+		OPN->ST.prescaler_sel |= 0x02;
+		break;
+	case 0x2e:	/* divider sel , select 1/3line for output */
+		OPN->ST.prescaler_sel |= 0x01;
+		break;
+	case 0x2f:	/* divider sel , clear both selector to 1/2,1/2 */
+		OPN->ST.prescaler_sel = 0;
+		break;
+	}
+	sel = OPN->ST.prescaler_sel & 3;
+	/* update prescaler */
+	OPNSetPres( OPN,	opn_pressel*pre_divider,
+						opn_pressel*pre_divider,
+						ssg_pressel*pre_divider );
+}
+#endif /* BUILD_OPN_PRESCALER */
+
+#if BUILD_YM2203
+/*****************************************************************************/
+/* YM2203 local section */
+/*****************************************************************************/
+
+/* here's the virtual YM2203(OPN) */
+typedef struct
+{
+	UINT8 REGS256;		/* registers */
+	FM_OPN OPN;				/* OPN state */
+	FM_CH CH3;			/* channel state */
+} YM2203;
+
+/* Generate samples for one of the YM2203s */
+void ym2203_update_one(void *chip, FMSAMPLE **buffer, int length)
+{
+	YM2203 *F2203 = (YM2203 *)chip;
+	FM_OPN *OPN = &F2203->OPN;
+	int i;
+	FMSAMPLE *bufL = buffer0;
+	FMSAMPLE *bufR = buffer1;
+	FM_CH	*cch3;
+
+	cch0 = &F2203->CH0;
+	cch1 = &F2203->CH1;
+	cch2 = &F2203->CH2;
+
+
+	/* refresh PG and EG */
+	refresh_fc_eg_chan( OPN, cch0 );
+	refresh_fc_eg_chan( OPN, cch1 );
+	if( (F2203->OPN.ST.mode & 0xc0) )
+	{
+		/* 3SLOT MODE */
+		if( cch2->SLOTSLOT1.Incr==-1)
+		{
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT1 , OPN->SL3.fc1 , OPN->SL3.kcode1 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT2 , OPN->SL3.fc2 , OPN->SL3.kcode2 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT3 , OPN->SL3.fc0 , OPN->SL3.kcode0 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT4 , cch2->fc , cch2->kcode );
+		}
+	}
+	else
+		refresh_fc_eg_chan( OPN, cch2 );
+
+
+	/* YM2203 doesn't have LFO so we must keep these globals at 0 level */
+	OPN->LFO_AM = 0;
+	OPN->LFO_PM = 0;
+
+	/* buffering */
+	for (i=0; i < length ; i++)
+	{
+		/* clear outputs */
+		OPN->out_fm0 = 0;
+		OPN->out_fm1 = 0;
+		OPN->out_fm2 = 0;
+
+		/* advance envelope generator */
+		OPN->eg_timer += OPN->eg_timer_add;
+		while (OPN->eg_timer >= OPN->eg_timer_overflow)
+		{
+			OPN->eg_timer -= OPN->eg_timer_overflow;
+			OPN->eg_cnt++;
+
+			advance_eg_channel(OPN, &cch0->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch1->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch2->SLOTSLOT1);
+		}
+
+		/* calculate FM */
+		chan_calc(OPN, cch0, 0 );
+		chan_calc(OPN, cch1, 1 );
+		chan_calc(OPN, cch2, 2 );
+
+		/* buffering */
+		{
+			int lt;
+
+			lt = OPN->out_fm0 + OPN->out_fm1 + OPN->out_fm2;
+
+			lt >>= FINAL_SH;
+
+			//Limit( lt , MAXOUT, MINOUT );
+
+			#ifdef SAVE_SAMPLE
+				SAVE_ALL_CHANNELS
+			#endif
+
+			/* buffering */
+			bufLi = lt;
+			bufRi = lt;
+		}
+
+		/* timer A control */
+		INTERNAL_TIMER_A( &F2203->OPN.ST , cch2 )
+	}
+	INTERNAL_TIMER_B(&F2203->OPN.ST,length)
+}
+
+/* ---------- reset one of chip ---------- */
+void ym2203_reset_chip(void *chip)
+{
+	int i;
+	YM2203 *F2203 = (YM2203 *)chip;
+	FM_OPN *OPN = &F2203->OPN;
+
+	/* Reset Prescaler */
+	OPNPrescaler_w(OPN, 0 , 1 );
+	/* reset SSG section */
+	(*OPN->ST.SSG->reset)(OPN->ST.param);
+	/* status clear */
+	FM_IRQMASK_SET(&OPN->ST,0x03);
+	FM_BUSY_CLEAR(&OPN->ST);
+	OPNWriteMode(OPN,0x27,0x30); /* mode 0 , timer reset */
+
+	OPN->eg_timer = 0;
+	OPN->eg_cnt = 0;
+
+	FM_STATUS_RESET(&OPN->ST, 0xff);
+
+	reset_channels( &OPN->ST , F2203->CH , 3 );
+	/* reset OPerator paramater */
+	for(i = 0xb2 ; i >= 0x30 ; i-- ) OPNWriteReg(OPN,i,0);
+	for(i = 0x26 ; i >= 0x20 ; i-- ) OPNWriteReg(OPN,i,0);
+}
+
+#ifdef __STATE_H__
+void ym2203_postload(void *chip)
+{
+	if (chip)
+	{
+		YM2203 *F2203 = (YM2203 *)chip;
+		int r;
+
+		/* prescaler */
+		OPNPrescaler_w(&F2203->OPN,1,1);
+
+		/* SSG registers */
+		for(r=0;r<16;r++)
+		{
+			(*F2203->OPN.ST.SSG->write)(F2203->OPN.ST.param,0,r);
+			(*F2203->OPN.ST.SSG->write)(F2203->OPN.ST.param,1,F2203->REGSr);
+		}
+
+		/* OPN registers */
+		/* DT / MULTI , TL , KS / AR , AMON / DR , SR , SL / RR , SSG-EG */
+		for(r=0x30;r<0x9e;r++)
+			if((r&3) != 3)
+				OPNWriteReg(&F2203->OPN,r,F2203->REGSr);
+		/* FB / CONNECT , L / R / AMS / PMS */
+		for(r=0xb0;r<0xb6;r++)
+			if((r&3) != 3)
+				OPNWriteReg(&F2203->OPN,r,F2203->REGSr);
+
+		/* channels */
+		/*FM_channel_postload(F2203->CH,3);*/
+	}
+}
+
+static void YM2203_save_state(YM2203 *F2203, const device_config *device)
+{
+	state_save_register_device_item_array(device, 0, F2203->REGS);
+	FMsave_state_st(device,&F2203->OPN.ST);
+	FMsave_state_channel(device,F2203->CH,3);
+	/* 3slots */
+	state_save_register_device_item_array (device, 0, F2203->OPN.SL3.fc);
+	state_save_register_device_item (device, 0, F2203->OPN.SL3.fn_h);
+	state_save_register_device_item_array (device, 0, F2203->OPN.SL3.kcode);
+}
+#endif /* _STATE_H */
+
+/* ---------- Initialize YM2203 emulator(s) ----------
+ 'num' is the number of virtual YM2203s to allocate
+ 'clock' is the chip clock in Hz
+ 'rate' is sampling rate
+*/
+//void * ym2203_init(void *param, const device_config *device, int clock, int rate,
+// FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
+void * ym2203_init(void *param, int clock, int rate,
+ FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
+{
+	YM2203 *F2203;
+
+	/* allocate ym2203 state space */
+	if( (F2203 = (YM2203 *)malloc(sizeof(YM2203)))==NULL)
+		return NULL;
+	/* clear */
+	memset(F2203,0,sizeof(YM2203));
+
+	if( !init_tables() )
+	{
+		free( F2203 );
+		return NULL;
+	}
+
+	F2203->OPN.ST.param = param;
+	F2203->OPN.type = TYPE_YM2203;
+	F2203->OPN.P_CH = F2203->CH;
+	//F2203->OPN.ST.device = device;
+	F2203->OPN.ST.clock = clock;
+	F2203->OPN.ST.rate = rate;
+
+	F2203->OPN.ST.timer_handler = timer_handler;
+	F2203->OPN.ST.IRQ_Handler = IRQHandler;
+	F2203->OPN.ST.SSG = ssg;
+
+#ifdef __STATE_H__
+	YM2203_save_state(F2203, device);
+#endif
+	return F2203;
+}
+
+/* shut down emulator */
+void ym2203_shutdown(void *chip)
+{
+	YM2203 *FM2203 = (YM2203 *)chip;
+
+	FMCloseTable();
+	free(FM2203);
+}
+
+/* YM2203 I/O interface */
+int ym2203_write(void *chip,int a,UINT8 v)
+{
+	YM2203 *F2203 = (YM2203 *)chip;
+	FM_OPN *OPN = &F2203->OPN;
+
+	if( !(a&1) )
+	{	/* address port */
+		OPN->ST.address = (v &= 0xff);
+
+		/* Write register to SSG emulator */
+		if( v < 16 ) (*OPN->ST.SSG->write)(OPN->ST.param,0,v);
+
+		/* prescaler select : 2d,2e,2f */
+		if( v >= 0x2d && v <= 0x2f )
+			OPNPrescaler_w(OPN , v , 1);
+	}
+	else
+	{	/* data port */
+		int addr = OPN->ST.address;
+		F2203->REGSaddr = v;
+		switch( addr & 0xf0 )
+		{
+		case 0x00:	/* 0x00-0x0f : SSG section */
+			/* Write data to SSG emulator */
+			(*OPN->ST.SSG->write)(OPN->ST.param,a,v);
+			break;
+		case 0x20:	/* 0x20-0x2f : Mode section */
+			ym2203_update_req(OPN->ST.param);
+			/* write register */
+			OPNWriteMode(OPN,addr,v);
+			break;
+		default:	/* 0x30-0xff : OPN section */
+			ym2203_update_req(OPN->ST.param);
+			/* write register */
+			OPNWriteReg(OPN,addr,v);
+		}
+		FM_BUSY_SET(&OPN->ST,1);
+	}
+	return OPN->ST.irq;
+}
+
+UINT8 ym2203_read(void *chip,int a)
+{
+	YM2203 *F2203 = (YM2203 *)chip;
+	int addr = F2203->OPN.ST.address;
+	UINT8 ret = 0;
+
+	if( !(a&1) )
+	{	/* status port */
+		ret = FM_STATUS_FLAG(&F2203->OPN.ST);
+	}
+	else
+	{	/* data port (only SSG) */
+		if( addr < 16 ) ret = (*F2203->OPN.ST.SSG->read)(F2203->OPN.ST.param);
+	}
+	return ret;
+}
+
+int ym2203_timer_over(void *chip,int c)
+{
+	YM2203 *F2203 = (YM2203 *)chip;
+
+	if( c )
+	{	/* Timer B */
+		TimerBOver( &(F2203->OPN.ST) );
+	}
+	else
+	{	/* Timer A */
+		ym2203_update_req(F2203->OPN.ST.param);
+		/* timer update */
+		TimerAOver( &(F2203->OPN.ST) );
+		/* CSM mode key,TL control */
+		if( F2203->OPN.ST.mode & 0x80 )
+		{	/* CSM mode auto key on */
+			CSMKeyControll( F2203->OPN.type, &(F2203->CH2) );
+		}
+	}
+	return F2203->OPN.ST.irq;
+}
+
+void ym2203_set_mutemask(void *chip, UINT32 MuteMask)
+{
+	YM2203 *F2203 = (YM2203 *)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 3; CurChn ++)
+		F2203->CHCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+#endif /* BUILD_YM2203 */
+
+
+
+#if (BUILD_YM2608||BUILD_YM2610||BUILD_YM2610B)
+
+/* ADPCM type A channel struct */
+typedef struct
+{
+	UINT8		flag;			/* port state */
+	UINT8		flagMask;		/* arrived flag mask */
+	UINT8		now_data;		/* current ROM data */
+	UINT32		now_addr;		/* current ROM address */
+	UINT32		now_step;
+	UINT32		step;
+	UINT32		start;			/* sample data start address*/
+	UINT32		end;			/* sample data end address */
+	UINT8		IL;				/* Instrument Level */
+	INT32		adpcm_acc;		/* accumulator */
+	INT32		adpcm_step;		/* step */
+	INT32		adpcm_out;		/* (speedup) hiro-shi!! */
+	INT8		vol_mul;		/* volume in "0.75dB" steps */
+	UINT8		vol_shift;		/* volume in "-6dB" steps */
+	INT32		*pan;			/* &out_adpcmOPN_xxxx */
+	UINT8		Muted;
+} ADPCM_CH;
+
+/* here's the virtual YM2610 */
+typedef struct
+{
+	UINT8		REGS512;			/* registers */
+	FM_OPN		OPN;				/* OPN state */
+	FM_CH		CH6;				/* channel state */
+	UINT8		addr_A1;			/* address line A1 */
+
+	/* ADPCM-A unit */
+	//const UINT8	*pcmbuf;			/* pcm rom buffer */
+	UINT8		*pcmbuf;			/* pcm rom buffer */
+	UINT32		pcm_size;			/* size of pcm rom */
+	UINT8		adpcmTL;			/* adpcmA total level */
+	ADPCM_CH	adpcm6;			/* adpcm channels */
+	UINT32		adpcmreg0x30;		/* registers */
+	UINT8		adpcm_arrivedEndAddress;
+	YM_DELTAT	deltaT;				/* Delta-T ADPCM unit */
+	UINT8		MuteDeltaT;
+
+ UINT8		flagmask;			/* YM2608 only */
+ UINT8		irqmask;			/* YM2608 only */
+} YM2610;
+
+/* here is the virtual YM2608 */
+typedef YM2610 YM2608;
+
+
+/**** YM2610 ADPCM defines ****/
+#define ADPCM_SHIFT (16) /* frequency step rate */
+#define ADPCMA_ADDRESS_SHIFT 8 /* adpcm A address shift */
+
+/* Algorithm and tables verified on real YM2608 and YM2610 */
+
+/* usual ADPCM table (16 * 1.1^N) */
+static const int steps49 =
+{
+	 16, 17, 19, 21, 23, 25, 28,
+	 31, 34, 37, 41, 45, 50, 55,
+	 60, 66, 73, 80, 88, 97, 107,
+	118, 130, 143, 157, 173, 190, 209,
+	230, 253, 279, 307, 337, 371, 408,
+	449, 494, 544, 598, 658, 724, 796,
+	876, 963, 1060, 1166, 1282, 1411, 1552
+};
+
+/* different from the usual ADPCM table */
+static const int step_inc8 = { -1*16, -1*16, -1*16, -1*16, 2*16, 5*16, 7*16, 9*16 };
+
+/* speedup purposes only */
+static int jedi_table 49*16 ;
+
+
+static void Init_ADPCMATable(void)
+{
+	int step, nib;
+
+	for (step = 0; step < 49; step++)
+	{
+		/* loop over all nibbles and compute the difference */
+		for (nib = 0; nib < 16; nib++)
+		{
+			int value = (2*(nib & 0x07) + 1) * stepsstep / 8;
+			jedi_tablestep*16 + nib = (nib&0x08) ? -value : value;
+		}
+	}
+}
+
+/* ADPCM A (Non control type) : calculate one channel output */
+INLINE void ADPCMA_calc_chan( YM2610 *F2610, ADPCM_CH *ch )
+{
+	UINT32 step;
+	UINT8 data;
+
+	if (ch->Muted)
+		return;
+
+
+	ch->now_step += ch->step;
+	if ( ch->now_step >= (1<<ADPCM_SHIFT) )
+	{
+		step = ch->now_step >> ADPCM_SHIFT;
+		ch->now_step &= (1<<ADPCM_SHIFT)-1;
+		do{
+			/* end check */
+			/* 11-06-2001 JB: corrected comparison. Was > instead of == */
+			/* YM2610 checks lower 20 bits only, the 4 MSB bits are sample bank */
+			/* Here we use 1<<21 to compensate for nibble calculations */
+
+			if ( (ch->now_addr & ((1<<21)-1)) == ((ch->end<<1) & ((1<<21)-1))	 )
+			{
+				ch->flag = 0;
+				F2610->adpcm_arrivedEndAddress |= ch->flagMask;
+				return;
+			}
+#if 0
+			if ( ch->now_addr > (F2610->pcmsizeA<<1) )
+			{
+#ifdef _DEBUG
+				LOG(LOG_WAR,("YM2610: Attempting to play past adpcm rom size!\n" ));
+#endif
+				return;
+			}
+#endif
+			if ( ch->now_addr&1 )
+				data = ch->now_data & 0x0f;
+			else
+			{
+				ch->now_data = *(F2610->pcmbuf+(ch->now_addr>>1));
+				data = (ch->now_data >> 4) & 0x0f;
+			}
+
+			ch->now_addr++;
+
+			ch->adpcm_acc += jedi_tablech->adpcm_step + data;
+
+			/* extend 12-bit signed int */
+			if (ch->adpcm_acc & ~0x7ff)
+				ch->adpcm_acc |= ~0xfff;
+			else
+				ch->adpcm_acc &= 0xfff;
+
+			ch->adpcm_step += step_incdata & 7;
+			Limit( ch->adpcm_step, 48*16, 0*16 );
+
+		}while(--step);
+
+		/* calc pcm * volume data */
+		ch->adpcm_out = ((ch->adpcm_acc * ch->vol_mul) >> ch->vol_shift) & ~3;	/* multiply, shift and mask out 2 LSB bits */
+	}
+
+	/* output for work of output channels (out_adpcmOPNxxxx)*/
+	*(ch->pan) += ch->adpcm_out;
+}
+
+/* ADPCM type A Write */
+static void FM_ADPCMAWrite(YM2610 *F2610,int r,int v)
+{
+	ADPCM_CH *adpcm = F2610->adpcm;
+	UINT8 c = r&0x07;
+
+	F2610->adpcmregr = v&0xff; /* stock data */
+	switch( r )
+	{
+	case 0x00: /* DM,--,C5,C4,C3,C2,C1,C0 */
+		if( !(v&0x80) )
+		{
+			/* KEY ON */
+			for( c = 0; c < 6; c++ )
+			{
+				if( (v>>c)&1 )
+				{
+					/**** start adpcm ****/
+					// The .step variable is already set and for the YM2608 it is different on channels 4 and 5.
+					//adpcmc.step = (UINT32)((float)(1<<ADPCM_SHIFT)*((float)F2610->OPN.ST.freqbase)/3.0);
+					adpcmc.now_addr = adpcmc.start<<1;
+					adpcmc.now_step = 0;
+					adpcmc.adpcm_acc = 0;
+					adpcmc.adpcm_step= 0;
+					adpcmc.adpcm_out = 0;
+					adpcmc.flag = 1;
+
+					if(F2610->pcmbuf==NULL)
+					{					/* Check ROM Mapped */
+#ifdef _DEBUG
+						logerror("YM2608-YM2610: ADPCM-A rom not mapped\n");
+#endif
+						adpcmc.flag = 0;
+					}
+					else
+					{
+						if(adpcmc.end >= F2610->pcm_size)
+						{	/* Check End in Range */
+#ifdef _DEBUG
+							logerror("YM2610: ADPCM-A end out of range: $%08x\n",adpcmc.end);
+#endif
+							/*adpcmc.end = F2610->pcm_size-1;*/ /* JB: DO NOT uncomment this, otherwise you will break the comparison in the ADPCM_CALC_CHA() */
+						}
+						if(adpcmc.start >= F2610->pcm_size)	/* Check Start in Range */
+						{
+#ifdef _DEBUG
+							logerror("YM2608-YM2610: ADPCM-A start out of range: $%08x\n",adpcmc.start);
+#endif
+							adpcmc.flag = 0;
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			/* KEY OFF */
+			for( c = 0; c < 6; c++ )
+				if( (v>>c)&1 )
+					adpcmc.flag = 0;
+		}
+		break;
+	case 0x01:	/* B0-5 = TL */
+		F2610->adpcmTL = (v & 0x3f) ^ 0x3f;
+		for( c = 0; c < 6; c++ )
+		{
+			int volume = F2610->adpcmTL + adpcmc.IL;
+
+			if ( volume >= 63 )	/* This is correct, 63 = quiet */
+			{
+				adpcmc.vol_mul = 0;
+				adpcmc.vol_shift = 0;
+			}
+			else
+			{
+				adpcmc.vol_mul = 15 - (volume & 7);		/* so called 0.75 dB */
+				adpcmc.vol_shift = 1 + (volume >> 3);	/* Yamaha engineers used the approximation: each -6 dB is close to divide by two (shift right) */
+			}
+
+			/* calc pcm * volume data */
+			adpcmc.adpcm_out = ((adpcmc.adpcm_acc * adpcmc.vol_mul) >> adpcmc.vol_shift) & ~3;	/* multiply, shift and mask out low 2 bits */
+		}
+		break;
+	default:
+		c = r&0x07;
+		if( c >= 0x06 ) return;
+		switch( r&0x38 )
+		{
+		case 0x08:	/* B7=L,B6=R, B4-0=IL */
+		{
+			int volume;
+
+			adpcmc.IL = (v & 0x1f) ^ 0x1f;
+
+			volume = F2610->adpcmTL + adpcmc.IL;
+
+			if ( volume >= 63 )	/* This is correct, 63 = quiet */
+			{
+				adpcmc.vol_mul = 0;
+				adpcmc.vol_shift = 0;
+			}
+			else
+			{
+				adpcmc.vol_mul = 15 - (volume & 7);		/* so called 0.75 dB */
+				adpcmc.vol_shift = 1 + (volume >> 3);	/* Yamaha engineers used the approximation: each -6 dB is close to divide by two (shift right) */
+			}
+
+			adpcmc.pan = &F2610->OPN.out_adpcm(v>>6)&0x03;
+
+			/* calc pcm * volume data */
+			adpcmc.adpcm_out = ((adpcmc.adpcm_acc * adpcmc.vol_mul) >> adpcmc.vol_shift) & ~3;	/* multiply, shift and mask out low 2 bits */
+		}
+			break;
+		case 0x10:
+		case 0x18:
+			adpcmc.start = ( (F2610->adpcmreg0x18 + c*0x0100 | F2610->adpcmreg0x10 + c) << ADPCMA_ADDRESS_SHIFT);
+			break;
+		case 0x20:
+		case 0x28:
+			adpcmc.end = ( (F2610->adpcmreg0x28 + c*0x0100 | F2610->adpcmreg0x20 + c) << ADPCMA_ADDRESS_SHIFT);
+			adpcmc.end += (1<<ADPCMA_ADDRESS_SHIFT) - 1;
+			break;
+		}
+	}
+}
+
+#ifdef __STATE_H__
+/* FM channel save , internal state only */
+static void FMsave_state_adpcma(const device_config *device,ADPCM_CH *adpcm)
+{
+	int ch;
+
+	for(ch=0;ch<6;ch++,adpcm++)
+	{
+		state_save_register_device_item(device, ch, adpcm->flag);
+		state_save_register_device_item(device, ch, adpcm->now_data);
+		state_save_register_device_item(device, ch, adpcm->now_addr);
+		state_save_register_device_item(device, ch, adpcm->now_step);
+		state_save_register_device_item(device, ch, adpcm->adpcm_acc);
+		state_save_register_device_item(device, ch, adpcm->adpcm_step);
+		state_save_register_device_item(device, ch, adpcm->adpcm_out);
+	}
+}
+#endif /* _STATE_H */
+
+#endif /* (BUILD_YM2608||BUILD_YM2610||BUILD_YM2610B) */
+
+
+#if BUILD_YM2608
+/*****************************************************************************/
+/* YM2608 local section */
+/*****************************************************************************/
+
+
+
+static const unsigned int YM2608_ADPCM_ROM_addr2*6 = {
+0x0000, 0x01bf, /* bass drum */
+0x01c0, 0x043f, /* snare drum */
+0x0440, 0x1b7f, /* top cymbal */
+0x1b80, 0x1cff, /* high hat */
+0x1d00, 0x1f7f, /* tom tom */
+0x1f80, 0x1fff /* rim shot */
+};
+
+
+/*
+ This data is derived from the chip's output - internal ROM can't be read.
+ It was verified, using real YM2608, that this ADPCM stream produces 100% correct output signal.
+*/
+
+static const unsigned char YM2608_ADPCM_ROM0x2000 = {
+
+/* Source: 01BD.ROM */
+/* Length: 448 / 0x000001C0 */
+
+0x88,0x08,0x08,0x08,0x00,0x88,0x16,0x76,0x99,0xB8,0x22,0x3A,0x84,0x3C,0xB1,0x54,
+0x10,0xA9,0x98,0x32,0x80,0x33,0x9A,0xA7,0x4A,0xB4,0x58,0xBC,0x15,0x29,0x8A,0x97,
+0x9B,0x44,0xAC,0x80,0x12,0xDE,0x13,0x1B,0xC0,0x58,0xC8,0x11,0x0A,0xA2,0x1A,0xA0,
+0x00,0x98,0x0B,0x93,0x9E,0x92,0x0A,0x88,0xBE,0x14,0x1B,0x98,0x08,0xA1,0x4A,0xC1,
+0x30,0xD9,0x33,0x98,0x10,0x89,0x17,0x1A,0x82,0x29,0x37,0x0C,0x83,0x50,0x9A,0x24,
+0x1A,0x83,0x10,0x23,0x19,0xB3,0x72,0x8A,0x16,0x10,0x0A,0x93,0x70,0x99,0x23,0x99,
+0x02,0x20,0x91,0x18,0x02,0x41,0xAB,0x24,0x18,0x81,0x99,0x4A,0xE8,0x28,0x9A,0x99,
+0xA1,0x2F,0xA8,0x9D,0x90,0x08,0xCC,0xA3,0x1D,0xCA,0x82,0x0B,0xD8,0x08,0xB9,0x09,
+0xBC,0xB8,0x00,0xBE,0x90,0x1B,0xCA,0x00,0x9B,0x8A,0xA8,0x91,0x0F,0xB3,0x3D,0xB8,
+0x31,0x0B,0xA5,0x0A,0x11,0xA1,0x48,0x92,0x10,0x50,0x91,0x30,0x23,0x09,0x37,0x39,
+0xA2,0x72,0x89,0x92,0x30,0x83,0x1C,0x96,0x28,0xB9,0x24,0x8C,0xA1,0x31,0xAD,0xA9,
+0x13,0x9C,0xBA,0xA8,0x0B,0xBF,0xB8,0x9B,0xCA,0x88,0xDB,0xB8,0x19,0xFC,0x92,0x0A,
+0xBA,0x89,0xAB,0xB8,0xAB,0xD8,0x08,0xAD,0xBA,0x33,0x9D,0xAA,0x83,0x3A,0xC0,0x40,
+0xB9,0x15,0x39,0xA2,0x52,0x89,0x02,0x63,0x88,0x13,0x23,0x03,0x52,0x02,0x54,0x00,
+0x11,0x23,0x23,0x35,0x20,0x01,0x44,0x41,0x80,0x24,0x40,0xA9,0x45,0x19,0x81,0x12,
+0x81,0x02,0x11,0x21,0x19,0x02,0x61,0x8A,0x13,0x3A,0x10,0x12,0x23,0x8B,0x37,0x18,
+0x91,0x24,0x10,0x81,0x34,0x20,0x05,0x32,0x82,0x53,0x20,0x14,0x33,0x31,0x34,0x52,
+0x00,0x43,0x32,0x13,0x52,0x22,0x13,0x52,0x11,0x43,0x11,0x32,0x32,0x32,0x22,0x02,
+0x13,0x12,0x89,0x22,0x19,0x81,0x81,0x08,0xA8,0x08,0x8B,0x90,0x1B,0xBA,0x8A,0x9B,
+0xB9,0x89,0xCA,0xB9,0xAB,0xCA,0x9B,0xCA,0xB9,0xAB,0xDA,0x99,0xAC,0xBB,0x9B,0xAC,
+0xAA,0xBA,0xAC,0xAB,0x9A,0xAA,0xAA,0xBA,0xB8,0xA9,0xBA,0x99,0xA9,0x9A,0xA0,0x8A,
+0xA9,0x08,0x8A,0xA9,0x00,0x99,0x89,0x88,0x98,0x08,0x99,0x00,0x89,0x80,0x08,0x98,
+0x00,0x88,0x88,0x80,0x90,0x80,0x90,0x80,0x81,0x99,0x08,0x88,0x99,0x09,0x00,0x1A,
+0xA8,0x10,0x9A,0x88,0x08,0x0A,0x8A,0x89,0x99,0xA8,0x98,0xA9,0x99,0x99,0xA9,0x99,
+0xAA,0x8A,0xAA,0x9B,0x8A,0x9A,0xA9,0x9A,0xBA,0x99,0x9A,0xAA,0x99,0x89,0xA9,0x99,
+0x98,0x9A,0x98,0x88,0x09,0x89,0x09,0x08,0x08,0x09,0x18,0x18,0x00,0x12,0x00,0x11,
+0x11,0x11,0x12,0x12,0x21,0x21,0x22,0x22,0x22,0x22,0x22,0x22,0x32,0x31,0x32,0x31,
+0x32,0x32,0x21,0x31,0x21,0x32,0x21,0x12,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,
+
+/* Source: 02SD.ROM */
+/* Length: 640 / 0x00000280 */
+
+0x0A,0xDC,0x14,0x0B,0xBA,0xBC,0x01,0x0F,0xF5,0x2F,0x87,0x19,0xC9,0x24,0x1B,0xA1,
+0x31,0x99,0x90,0x32,0x32,0xFE,0x83,0x48,0xA8,0xA9,0x23,0x19,0xBC,0x91,0x02,0x41,
+0xDE,0x81,0x28,0xA8,0x0A,0xB1,0x72,0xDA,0x23,0xBC,0x04,0x19,0xB8,0x21,0x8A,0x03,
+0x29,0xBA,0x14,0x21,0x0B,0xC0,0x43,0x08,0x91,0x50,0x93,0x0F,0x86,0x1A,0x91,0x18,
+0x21,0xCB,0x27,0x0A,0xA1,0x42,0x8C,0xA9,0x21,0x10,0x08,0xAB,0x94,0x2A,0xDA,0x02,
+0x8B,0x91,0x09,0x98,0xAE,0x80,0xA9,0x02,0x0A,0xE9,0x21,0xBB,0x15,0x20,0xBE,0x92,
+0x42,0x09,0xA9,0x11,0x34,0x08,0x12,0x0A,0x27,0x29,0xA1,0x52,0x12,0x8E,0x92,0x28,
+0x92,0x2B,0xD1,0x23,0xBF,0x81,0x10,0x99,0xA8,0x0A,0xC4,0x3B,0xB9,0xB0,0x00,0x62,
+0xCF,0x92,0x29,0x92,0x2B,0xB1,0x1C,0xB2,0x72,0xAA,0x88,0x11,0x18,0x80,0x13,0x9E,
+0x03,0x18,0xB0,0x60,0xA1,0x28,0x88,0x08,0x04,0x10,0x8F,0x96,0x19,0x90,0x01,0x09,
+0xC8,0x50,0x91,0x8A,0x01,0xAB,0x03,0x50,0xBA,0x9D,0x93,0x68,0xBA,0x80,0x22,0xCB,
+0x41,0xBC,0x92,0x60,0xB9,0x1A,0x95,0x4A,0xC8,0x20,0x88,0x33,0xAC,0x92,0x38,0x83,
+0x09,0x80,0x16,0x09,0x29,0xD0,0x54,0x8C,0xA2,0x28,0x91,0x89,0x93,0x60,0xCD,0x85,
+0x1B,0xA1,0x49,0x90,0x8A,0x80,0x34,0x0C,0xC9,0x14,0x19,0x98,0xA0,0x40,0xA9,0x21,
+0xD9,0x34,0x0A,0xA9,0x10,0x23,0xCB,0x25,0xAA,0x25,0x9B,0x13,0xCD,0x16,0x09,0xA0,
+0x80,0x01,0x19,0x90,0x88,0x21,0xAC,0x33,0x8B,0xD8,0x27,0x3B,0xB8,0x81,0x31,0x80,
+0xAF,0x97,0x0A,0x82,0x0A,0xA0,0x21,0x89,0x8A,0xA2,0x32,0x8D,0xBB,0x87,0x19,0x21,
+0xC9,0xBC,0x45,0x09,0x90,0x09,0xA1,0x24,0x1A,0xD0,0x10,0x08,0x11,0xA9,0x21,0xE8,
+0x60,0xA9,0x14,0x0C,0xD1,0x32,0xAB,0x04,0x0C,0x81,0x90,0x29,0x83,0x9B,0x01,0x8F,
+0x97,0x0B,0x82,0x18,0x88,0xBA,0x06,0x39,0xC8,0x23,0xBC,0x04,0x09,0x92,0x08,0x1A,
+0xBB,0x74,0x8C,0x81,0x18,0x81,0x9D,0x83,0x41,0xCD,0x81,0x40,0x9A,0x90,0x10,0x12,
+0x9C,0xA1,0x68,0xD8,0x33,0x9C,0x91,0x01,0x12,0xBE,0x02,0x09,0x12,0x99,0x9A,0x36,
+0x0A,0xB0,0x30,0x88,0xA3,0x2D,0x12,0xBC,0x03,0x3A,0x11,0xBD,0x08,0xC8,0x62,0x80,
+0x8B,0xD8,0x23,0x38,0xF9,0x12,0x08,0x99,0x91,0x21,0x99,0x85,0x2F,0xB2,0x30,0x90,
+0x88,0xD9,0x53,0xAC,0x82,0x19,0x91,0x20,0xCC,0x96,0x29,0xC9,0x24,0x89,0x80,0x99,
+0x12,0x08,0x18,0x88,0x99,0x23,0xAB,0x73,0xCB,0x33,0x9F,0x04,0x2B,0xB1,0x08,0x03,
+0x1B,0xC9,0x21,0x32,0xFA,0x33,0xDB,0x02,0x33,0xAE,0xB9,0x54,0x8B,0xA1,0x20,0x89,
+0x90,0x11,0x88,0x09,0x98,0x23,0xBE,0x37,0x8D,0x81,0x20,0xAA,0x34,0xBB,0x13,0x18,
+0xB9,0x40,0xB1,0x18,0x83,0x8E,0xB2,0x72,0xBC,0x82,0x30,0xA9,0x9A,0x24,0x8B,0x27,
+0x0E,0x91,0x20,0x90,0x08,0xB0,0x32,0xB9,0x21,0xB0,0xAC,0x45,0x9A,0xA1,0x50,0xA9,
+0x80,0x0A,0x26,0x9B,0x11,0xBB,0x23,0x71,0xCB,0x12,0x10,0xB8,0x40,0xA9,0xA5,0x39,
+0xC0,0x30,0xB2,0x20,0xAA,0xBA,0x76,0x1C,0xC1,0x48,0x98,0x80,0x18,0x81,0xAA,0x23,
+0x9C,0xA2,0x32,0xAC,0x9A,0x43,0x9C,0x12,0xAD,0x82,0x72,0xBC,0x00,0x82,0x39,0xD1,
+0x3A,0xB8,0x35,0x9B,0x10,0x40,0xF9,0x22,0x0A,0xC0,0x51,0xB9,0x82,0x18,0x98,0xA3,
+0x79,0xD0,0x20,0x88,0x09,0x01,0x99,0x82,0x11,0x38,0xFC,0x33,0x09,0xC8,0x40,0xA9,
+0x11,0x29,0xAA,0x94,0x3A,0xC2,0x4A,0xC0,0x89,0x52,0xBC,0x11,0x08,0x09,0xB8,0x71,
+0xA9,0x08,0xA8,0x62,0x8D,0x92,0x10,0x00,0x9E,0x94,0x38,0xBA,0x13,0x88,0x90,0x4A,
+0xE2,0x30,0xBA,0x02,0x00,0x19,0xD9,0x62,0xBB,0x04,0x0B,0xA3,0x68,0xB9,0x21,0x88,
+0x9D,0x04,0x10,0x8C,0xC8,0x62,0x99,0xAA,0x24,0x1A,0x80,0x9A,0x14,0x9B,0x26,0x8C,
+0x92,0x30,0xB9,0x09,0xA3,0x71,0xBB,0x10,0x19,0x82,0x39,0xDB,0x02,0x44,0x9F,0x10,
+
+/* Source: 04TOP.ROM */
+/* Length: 5952 / 0x00001740 */
+
+0x07,0xFF,0x7C,0x3C,0x31,0xC6,0xC4,0xBB,0x7F,0x7F,0x7B,0x82,0x8A,0x4D,0x5F,0x7C,
+0x3E,0x44,0xD2,0xB3,0xA0,0x19,0x1B,0x6C,0x81,0x28,0xC4,0xA1,0x1C,0x4B,0x18,0x00,
+0x2A,0xA2,0x0A,0x7C,0x2A,0x00,0x01,0x89,0x98,0x48,0x8A,0x3C,0x28,0x2A,0x5B,0x3E,
+0x3A,0x1A,0x3B,0x3D,0x4B,0x3B,0x4A,0x08,0x2A,0x1A,0x2C,0x4A,0x3B,0x82,0x99,0x3C,
+0x5D,0x29,0x2B,0x39,0x0B,0x23,0xAB,0x1A,0x4C,0x79,0xA3,0x01,0xC1,0x2A,0x0A,0x38,
+0xA7,0xB9,0x12,0x1F,0x29,0x08,0x82,0xA1,0x08,0xA9,0x42,0xAA,0x95,0xB3,0x90,0x81,
+0x09,0xD4,0x1A,0x80,0x1B,0x07,0xB8,0x12,0x8E,0x49,0x81,0x92,0xD3,0x90,0xA1,0x2A,
+0x02,0xE1,0xA3,0x99,0x02,0xB3,0x94,0xB3,0xB0,0xF4,0x98,0x93,0x90,0x13,0xE1,0x81,
+0x99,0x38,0x91,0xA6,0xD3,0x99,0x94,0xC1,0x83,0xB1,0x92,0x98,0x49,0xC4,0xB2,0xA4,
+0xA3,0xD0,0x1A,0x30,0xBA,0x59,0x02,0xD4,0xA0,0xA4,0xA2,0x8A,0x01,0x00,0xB7,0xA8,
+0x18,0x2A,0x2B,0x1E,0x23,0xC8,0x1A,0x00,0x39,0xA0,0x18,0x92,0x4F,0x2D,0x5A,0x10,
+0x89,0x81,0x2A,0x8B,0x6A,0x02,0x09,0xB3,0x8D,0x48,0x1B,0x80,0x19,0x34,0xF8,0x29,
+0x0A,0x7B,0x2A,0x28,0x81,0x0C,0x02,0x1E,0x29,0x09,0x12,0xC2,0x94,0xE1,0x18,0x98,
+0x02,0xC4,0x89,0x91,0x1A,0x20,0xA9,0x02,0x1B,0x48,0x8E,0x20,0x88,0x2D,0x08,0x59,
+0x1B,0x02,0xA3,0xB1,0x8A,0x1E,0x58,0x80,0xC2,0xB6,0x88,0x91,0x88,0x11,0xA1,0xA3,
+0xE2,0x01,0xB0,0x19,0x11,0x09,0xF4,0x88,0x09,0x88,0x19,0x89,0x12,0xF1,0x2A,0x28,
+0x8C,0x25,0x99,0xA4,0x98,0x39,0xA1,0x00,0xD0,0x58,0xAA,0x59,0x01,0x0C,0x00,0x2B,
+0x00,0x08,0x89,0x6B,0x69,0x90,0x01,0x90,0x98,0x12,0xB3,0xF3,0xA0,0x89,0x02,0x3B,
+0x0C,0x50,0xA9,0x4E,0x6B,0x19,0x28,0x09,0xA2,0x08,0x2F,0x20,0x88,0x92,0x8A,0x11,
+0xC4,0x93,0xF1,0x18,0x88,0x11,0xF2,0x80,0x92,0xA8,0x02,0xA8,0xB7,0xB3,0xA3,0xA0,
+0x88,0x1A,0x40,0xE2,0x91,0x19,0x88,0x18,0x91,0x83,0xC1,0xB5,0x92,0xA9,0xC6,0x90,
+0x01,0xC2,0x81,0x98,0x03,0xF0,0x00,0x2C,0x2A,0x92,0x2C,0x83,0x1F,0x3A,0x29,0x00,
+0xB8,0x70,0xAB,0x69,0x18,0x89,0x10,0x0D,0x12,0x0B,0x88,0x4A,0x3A,0x9B,0x70,0xA8,
+0x28,0x2F,0x2A,0x3A,0x1B,0x85,0x88,0x8B,0x6A,0x29,0x00,0x91,0x91,0x1B,0x7C,0x29,
+0x01,0x88,0x90,0x19,0x2B,0x2B,0x00,0x39,0xA8,0x5E,0x21,0x89,0x91,0x09,0x3A,0x6F,
+0x2A,0x18,0x18,0x8B,0x50,0x89,0x2B,0x19,0x49,0x88,0x29,0xF5,0x89,0x08,0x09,0x12,
+0xAA,0x15,0xB0,0x82,0xAC,0x38,0x00,0x3F,0x81,0x10,0xB0,0x49,0xA2,0x81,0x3A,0xC8,
+0x87,0x90,0xC4,0xA3,0x99,0x19,0x83,0xE1,0x84,0xE2,0xA2,0x90,0x80,0x93,0xB5,0xC4,
+0xB3,0xA1,0x0A,0x18,0x92,0xC4,0xA0,0x93,0x0C,0x3A,0x18,0x01,0x1E,0x20,0xB1,0x82,
+0x8C,0x03,0xB5,0x2E,0x82,0x19,0xB2,0x1B,0x1B,0x6B,0x4C,0x19,0x12,0x8B,0x5A,0x11,
+0x0C,0x3A,0x2C,0x18,0x3D,0x08,0x2A,0x5C,0x18,0x00,0x88,0x3D,0x29,0x80,0x2A,0x09,
+0x00,0x7A,0x0A,0x10,0x0B,0x69,0x98,0x10,0x81,0x3F,0x00,0x18,0x19,0x91,0xB7,0x9A,
+0x28,0x8A,0x48,0x92,0xF3,0xA2,0x88,0x98,0x87,0xA1,0x88,0x80,0x81,0x95,0xD1,0xA3,
+0x1B,0x1C,0x39,0x10,0xA1,0x2A,0x0B,0x7A,0x4B,0x80,0x13,0xC1,0xD1,0x2B,0x2A,0x85,
+0xB2,0xA2,0x93,0xB2,0xD3,0x80,0xD1,0x18,0x08,0x08,0xB7,0x98,0x81,0x3F,0x01,0x88,
+0x01,0xE2,0x00,0x9A,0x59,0x08,0x10,0xC3,0x99,0x84,0xA9,0xA5,0x91,0x91,0x91,0x80,
+0xB5,0x94,0xC0,0x01,0x98,0x09,0x84,0xB0,0x80,0x7A,0x08,0x18,0x90,0xA8,0x6A,0x1C,
+0x39,0x2A,0xB7,0x98,0x19,0x10,0x2A,0xA1,0x10,0xBD,0x39,0x18,0x2D,0x39,0x3F,0x10,
+0x3F,0x01,0x09,0x19,0x0A,0x38,0x8C,0x40,0xB3,0xB4,0x93,0xAD,0x20,0x2B,0xD4,0x81,
+0xC3,0xB0,0x39,0xA0,0x23,0xD8,0x04,0xB1,0x9B,0xA7,0x1A,0x92,0x08,0xA5,0x88,0x81,
+0xE2,0x01,0xB8,0x01,0x81,0xC1,0xC7,0x90,0x92,0x80,0xA1,0x97,0xA0,0xA2,0x82,0xB8,
+0x18,0x00,0x9C,0x78,0x98,0x83,0x0B,0x0B,0x32,0x7D,0x19,0x10,0xA1,0x19,0x09,0x0A,
+0x78,0xA8,0x10,0x1B,0x29,0x29,0x1A,0x14,0x2F,0x88,0x4A,0x1B,0x10,0x10,0xAB,0x79,
+0x0D,0x49,0x18,0xA0,0x02,0x1F,0x19,0x3A,0x2B,0x11,0x8A,0x88,0x79,0x8A,0x20,0x49,
+0x9B,0x58,0x0B,0x28,0x18,0xA9,0x3A,0x7D,0x00,0x29,0x88,0x82,0x3D,0x1A,0x38,0xBA,
+0x15,0x09,0xAA,0x51,0x8B,0x83,0x3C,0x8A,0x58,0x1B,0xB5,0x01,0xBB,0x50,0x19,0x99,
+0x24,0xCA,0x21,0x1B,0xA2,0x87,0xA8,0xB1,0x68,0xA1,0xA6,0xA2,0xA8,0x29,0x8B,0x24,
+0xB4,0xE2,0x92,0x8A,0x00,0x19,0x93,0xB5,0xB4,0xB1,0x81,0xB1,0x03,0x9A,0x82,0xA7,
+0x90,0xD6,0xA0,0x80,0x1B,0x29,0x01,0xA4,0xE1,0x18,0x0A,0x2A,0x29,0x92,0xC7,0xA8,
+0x81,0x19,0x89,0x30,0x10,0xE0,0x30,0xB8,0x10,0x0C,0x1A,0x79,0x1B,0xA7,0x80,0xA0,
+0x00,0x0B,0x28,0x18,0xB1,0x85,0x1E,0x00,0x20,0xA9,0x18,0x18,0x1C,0x13,0xBC,0x15,
+0x99,0x2E,0x12,0x00,0xE1,0x00,0x0B,0x3B,0x21,0x90,0x06,0xC9,0x2A,0x49,0x0A,0x18,
+0x20,0xD1,0x3C,0x08,0x00,0x83,0xC9,0x41,0x8E,0x18,0x08,0x02,0xA0,0x09,0xA4,0x7B,
+0x90,0x19,0x2A,0x10,0x2A,0xA8,0x71,0xBA,0x10,0x4A,0x0E,0x22,0xB2,0xB2,0x1B,0x8C,
+0x78,0x1A,0xB5,0x93,0xA9,0x1B,0x49,0x19,0x29,0xA3,0xC6,0x88,0xAA,0x32,0x0D,0x1B,
+0x22,0x08,0xC2,0x18,0xB9,0x79,0x3F,0x01,0x10,0xA9,0x84,0x1C,0x09,0x21,0xB0,0xA7,
+0x0A,0x99,0x50,0x0C,0x81,0x28,0x8B,0x48,0x2E,0x00,0x08,0x99,0x38,0x5B,0x88,0x14,
+0xA9,0x08,0x11,0xAA,0x72,0xC1,0xB3,0x09,0x8A,0x05,0x91,0xF2,0x81,0xA1,0x09,0x02,
+0xF2,0x92,0x99,0x1A,0x49,0x80,0xC5,0x90,0x90,0x18,0x09,0x12,0xA1,0xF2,0x81,0x98,
+0xC6,0x91,0xA0,0x11,0xA0,0x94,0xB4,0xF2,0x81,0x8B,0x03,0x80,0xD2,0x93,0xA8,0x88,
+0x69,0xA0,0x03,0xB8,0x88,0x32,0xBC,0x97,0x80,0xB1,0x3B,0x1A,0xA6,0x00,0xD1,0x01,
+0x0B,0x3B,0x30,0x9B,0x31,0x3E,0x92,0x19,0x8A,0xD3,0x5C,0x1B,0x41,0xA0,0x93,0xA2,
+0xAF,0x39,0x4C,0x01,0x92,0xA8,0x81,0x3C,0x0D,0x78,0x98,0x00,0x19,0x0A,0x20,0x2D,
+0x29,0x3C,0x1B,0x48,0x88,0x99,0x7A,0x2D,0x29,0x2A,0x82,0x80,0xA8,0x49,0x3E,0x19,
+0x11,0x98,0x82,0x9A,0x3B,0x28,0x2F,0x20,0x4C,0x90,0x29,0x19,0x9A,0x7A,0x29,0x28,
+0x98,0x88,0x33,0xCD,0x11,0x3A,0xC1,0xA4,0xA0,0xC4,0x82,0xC8,0x50,0x98,0xB2,0x21,
+0xC0,0xB6,0x98,0x82,0x80,0x9C,0x23,0x00,0xF8,0x30,0xA8,0x1A,0x68,0xA8,0x86,0x9A,
+0x01,0x2A,0x0A,0x97,0x91,0xC1,0x18,0x89,0x02,0x83,0xE0,0x01,0x8B,0x29,0x30,0xE2,
+0x91,0x0B,0x18,0x3B,0x1C,0x11,0x28,0xAC,0x78,0x80,0x93,0x91,0xA9,0x49,0x8B,0x87,
+0x90,0x99,0x3D,0x5A,0x81,0x08,0xA1,0x11,0x2F,0x1A,0x21,0x9B,0x15,0xA2,0xB0,0x11,
+0xC0,0x91,0x5B,0x98,0x24,0xA2,0xF2,0x92,0x8B,0x6A,0x18,0x81,0xB5,0xB1,0x88,0x4C,
+0x00,0x00,0xA4,0xC1,0x2B,0x1A,0x59,0x0A,0x02,0x80,0x1E,0x02,0x08,0xB3,0x80,0x9A,
+0x23,0xB8,0xF2,0x84,0xAB,0x01,0x48,0x90,0xA7,0x90,0x0A,0x29,0x09,0x95,0x99,0xA0,
+0x59,0x2B,0x00,0x97,0xB0,0x29,0x89,0x2A,0x03,0xD0,0xB7,0x1B,0x81,0x00,0xA6,0xB1,
+0x90,0x09,0x48,0xC0,0x11,0x00,0x8A,0x00,0x5B,0x83,0x9A,0x18,0x2F,0x3C,0x18,0x11,
+0xA9,0x04,0x1A,0x4F,0x01,0x98,0x81,0x09,0x09,0x4A,0x18,0xB4,0xA2,0x0B,0x59,0x90,
+0x3B,0x49,0xBC,0x40,0x6A,0x88,0x3A,0x08,0x3E,0x3A,0x80,0x93,0xB0,0xE1,0x5A,0x00,
+0xA4,0xB3,0xE3,0x90,0x0D,0x38,0x09,0x82,0xC4,0xA1,0xB1,0x4C,0x18,0x10,0x91,0xB2,
+0x13,0xEA,0x34,0x99,0x88,0xA6,0x89,0x92,0x91,0xC1,0x20,0xB2,0xC2,0x86,0xD2,0xB3,
+0x80,0xB2,0x08,0x09,0x87,0x91,0xC0,0x11,0x89,0x90,0x28,0xB9,0x79,0x19,0xA4,0x82,
+0xD0,0x03,0x0C,0xA3,0xA5,0xB2,0xB2,0x1B,0x29,0x13,0xF1,0xB4,0x81,0x9D,0x38,0x00,
+0xC4,0xA1,0x89,0x59,0x1A,0x81,0xA4,0xA9,0x1C,0x6A,0x19,0x02,0xB1,0x1A,0x4A,0x0B,
+0x78,0x89,0x81,0x1C,0x2A,0x29,0x4A,0xA3,0x3E,0x1C,0x49,0x1A,0x08,0x21,0xAE,0x28,
+0x4B,0x19,0x20,0x8C,0x10,0x3A,0xAB,0x26,0x8B,0x18,0x59,0x99,0x13,0xA2,0xAB,0x79,
+0x2F,0x18,0x10,0xB2,0x80,0x1B,0x4D,0x5A,0x80,0x82,0x98,0x81,0x80,0x09,0xA5,0x90,
+0x91,0x03,0xC2,0xE2,0x81,0xA8,0x82,0x09,0xC6,0xA3,0xB1,0x08,0x5B,0x08,0x05,0xD1,
+0xA2,0x89,0x2A,0x28,0x91,0xA6,0x88,0xB0,0x49,0x80,0x09,0x08,0x88,0x07,0xB8,0x05,
+0x99,0x81,0x88,0x18,0xE2,0x00,0xC3,0x18,0x0D,0x10,0x30,0xD0,0x93,0x8A,0x09,0x10,
+0x2F,0x11,0x90,0xA1,0x20,0x9B,0xB1,0x73,0xC8,0x94,0x98,0x3B,0x01,0x0C,0x30,0x19,
+0xF8,0x12,0x90,0xBA,0x78,0x0A,0x11,0x98,0xA0,0x79,0x8A,0x30,0x2B,0xC2,0x11,0x0D,
+0x09,0x7A,0x00,0x82,0xB9,0x01,0x7A,0x89,0x21,0x09,0xA1,0x0A,0x7C,0x10,0x88,0xB5,
+0x88,0x0A,0x2B,0x69,0x1A,0x10,0xA0,0x5B,0x19,0x1A,0x10,0x19,0x1A,0x6C,0x20,0x90,
+0xA5,0x98,0x1B,0x0A,0x69,0x82,0xD1,0x18,0x09,0x19,0x2A,0x93,0xD4,0x9A,0x01,0x49,
+0xA2,0xA2,0x82,0xD8,0x22,0xAA,0x97,0xA9,0x2D,0x38,0x2A,0xB6,0x80,0x90,0x0A,0x3C,
+0x82,0x94,0xB8,0x21,0x0E,0x2A,0x22,0xB8,0x00,0x4F,0x2B,0x3A,0x81,0xA1,0x29,0x2C,
+0x6A,0x13,0xD1,0xA2,0x98,0x28,0x0C,0x01,0xD5,0x08,0xA9,0x31,0xB3,0xB0,0xA7,0xB0,
+0x29,0x1B,0x87,0xA2,0xA1,0xB2,0x4A,0x89,0x11,0xC3,0xF3,0x98,0x08,0x03,0xA0,0xA3,
+0xC5,0x90,0xB3,0xB5,0xB4,0xB8,0x02,0x91,0x91,0xD3,0xA4,0xC1,0x1B,0x82,0x28,0xA4,
+0xD1,0x94,0x8A,0x28,0x08,0x03,0xE0,0x80,0xD4,0x90,0x91,0xA1,0x3B,0x3D,0x02,0xE4,
+0xA1,0x92,0x89,0x1A,0x4B,0x95,0xB3,0x90,0x99,0x6A,0x0A,0x30,0xA1,0x93,0xA6,0xA9,
+0x85,0x8B,0x82,0x10,0xB1,0xA3,0x94,0xF8,0x38,0x9A,0x30,0x1A,0x8B,0xA7,0x89,0x01,
+0x5B,0x19,0x18,0x11,0xF0,0x18,0x1C,0x39,0x19,0x0C,0x12,0x1C,0x2A,0x7B,0x3A,0x88,
+0x2B,0x18,0x2B,0x5C,0x20,0x92,0x8D,0x38,0x8A,0x3A,0x5B,0x2E,0x3A,0x2B,0x10,0x12,
+0xBB,0x6A,0x4D,0x18,0x10,0xB1,0x81,0x2A,0x8B,0x79,0x80,0x01,0x0A,0x09,0x5B,0x2D,
+0x84,0x8A,0x08,0x02,0xA2,0x91,0x82,0xE8,0x50,0x9B,0x85,0xA3,0xB0,0xA3,0x1B,0x02,
+0x18,0xF3,0xA2,0x88,0xAB,0x53,0xD1,0xB4,0xA3,0x09,0x09,0x18,0xD4,0x08,0xB0,0x09,
+0x58,0xD1,0x82,0x89,0x81,0x1A,0x18,0x05,0xB9,0xC3,0x30,0xC0,0x95,0x80,0xC3,0x89,
+0x89,0x13,0x88,0xF2,0x93,0x0E,0x18,0x01,0x92,0xA5,0xB8,0x2A,0x39,0xAA,0x33,0x9A,
+0xB1,0x11,0xF5,0xA1,0xA1,0x0A,0x50,0xB8,0x03,0xC4,0xA0,0x4E,0x29,0x10,0x88,0xC2,
+0x1A,0x39,0x1D,0x28,0x98,0x94,0x0E,0x10,0x2A,0x3C,0x02,0x2D,0x1B,0x4B,0x3B,0x49,
+0x19,0xA9,0x48,0x2F,0x29,0x10,0x89,0x02,0x0C,0x10,0x09,0xB9,0x70,0x1B,0x8A,0x50,
+0xA8,0x2B,0x49,0x89,0x69,0x88,0x95,0x89,0x90,0x92,0x4C,0x19,0x82,0xC1,0x01,0x80,
+0xA0,0x2B,0x7A,0x81,0x10,0xC2,0xB7,0x98,0x88,0x19,0x2C,0x03,0xB1,0xA4,0xA1,0x0C,
+0x3B,0x78,0x88,0x85,0xB1,0xA0,0x1B,0x3A,0x4A,0x08,0x94,0x81,0xF1,0x80,0x00,0x0C,
+0x59,0x09,0x18,0x90,0xA6,0x92,0x8C,0x1A,0x79,0x92,0xA8,0x00,0x81,0x2E,0x2A,0x13,
+0xA2,0xB0,0xA5,0x88,0x88,0x89,0x11,0x19,0xA0,0xF3,0x82,0xB0,0x83,0x5F,0x2A,0x01,
+0xA1,0x94,0xB0,0x09,0x78,0x98,0xA3,0xA6,0xA0,0x91,0x80,0x93,0x98,0xC1,0x12,0x18,
+0xC9,0x17,0xA0,0xA0,0x1A,0x21,0x80,0x99,0xD4,0x30,0x9D,0x00,0x10,0x2F,0x08,0x1C,
+0x21,0x08,0xB4,0xC3,0x2B,0xA9,0x52,0xD2,0xA3,0xD1,0x09,0x10,0x8B,0x24,0x92,0xD1,
+0x80,0x19,0xA0,0x2C,0x12,0x49,0xAA,0xB6,0x95,0xB8,0x08,0x3A,0x2B,0x01,0xF3,0xB3,
+0x0B,0x09,0x79,0x18,0xA2,0xA4,0xA0,0x18,0x0C,0x20,0x08,0xA9,0x16,0x0C,0x00,0x1B,
+0x08,0x2B,0x7B,0x01,0x01,0xB9,0x59,0x19,0x8B,0x45,0xA8,0x80,0x0C,0x1A,0x41,0x1E,
+0x00,0x28,0xA8,0x5A,0x00,0xC1,0x49,0x99,0x21,0x1D,0x08,0x85,0x99,0x95,0x89,0x90,
+0x11,0x90,0xD1,0x28,0xB2,0xA7,0x99,0x81,0x02,0xAC,0x13,0x81,0xB2,0xA6,0xA9,0x28,
+0x1C,0xB1,0x33,0xD1,0xC1,0x58,0xA8,0x14,0xB0,0xB7,0x91,0xA0,0x82,0x89,0xC2,0x28,
+0xA1,0xB2,0x49,0xD2,0x94,0xC8,0x12,0x80,0x99,0x85,0x08,0xD3,0x09,0xA2,0xB3,0x1E,
+0x08,0x21,0xB9,0x23,0xB4,0xAB,0x41,0xAC,0x87,0x09,0xA2,0xC5,0x0B,0x2A,0x5A,0x91,
+0x20,0x9A,0x89,0x78,0x9B,0x31,0x89,0x80,0x29,0x0A,0xB7,0x3C,0x98,0x48,0x1D,0x00,
+0x01,0xB0,0x20,0x2F,0x29,0x4A,0x89,0x94,0x1C,0x88,0x28,0x2B,0x10,0x88,0x9A,0x71,
+0x9A,0x08,0x4A,0x2F,0x18,0x2B,0x18,0x02,0xA8,0x4B,0x7A,0x99,0x48,0x80,0xA8,0x20,
+0x1D,0x40,0xA8,0x10,0x08,0xA8,0xC5,0x88,0xC2,0x18,0x88,0x2A,0x12,0xF3,0x82,0xD8,
+0x20,0x0A,0x09,0xA6,0x98,0x04,0xB9,0x11,0x18,0xC3,0xE1,0x29,0xA1,0x11,0xC1,0x03,
+0xE2,0x9A,0x33,0xA9,0xB5,0x98,0x92,0xA1,0x02,0xF8,0x21,0xA8,0x10,0x02,0xC1,0xB7,
+0x1B,0x90,0x5B,0x3C,0x83,0x93,0xE0,0x19,0x1A,0x11,0x11,0xF1,0x92,0x89,0x19,0x2C,
+0x2C,0x41,0x99,0x92,0x90,0x3F,0x18,0x4B,0x00,0x08,0xD2,0x01,0xB2,0xAA,0x78,0x09,
+0x01,0x91,0xA2,0x98,0x2F,0x3A,0x2C,0x01,0x00,0x93,0xE0,0x28,0x2C,0x2B,0x01,0x12,
+0xE1,0x80,0xB3,0x3D,0x3A,0x0A,0x50,0x98,0xC2,0xA0,0x11,0xAA,0x30,0x87,0x90,0xC2,
+0x29,0x88,0x38,0xC8,0xB5,0x90,0xBA,0x70,0x1A,0x02,0x94,0xD0,0x80,0x1A,0x82,0xA6,
+0xB0,0x91,0x18,0xB3,0x00,0x13,0xF1,0xA2,0xC1,0x82,0xB0,0x00,0x15,0x0B,0xD3,0x02,
+0xA8,0x91,0x2B,0x1F,0x49,0x88,0xA6,0x80,0x88,0x08,0x1B,0xA5,0x80,0xB9,0x06,0x0B,
+0x90,0x21,0x9D,0x48,0x18,0xA0,0x15,0xC9,0x82,0x2B,0x1A,0x42,0x9A,0xC4,0x39,0xBC,
+0x69,0x00,0xA0,0x29,0x8C,0x39,0x59,0x08,0x09,0x49,0xA9,0x6B,0x81,0x00,0x98,0xB0,
+0x68,0x3D,0x81,0x88,0x18,0x19,0x1D,0x12,0x80,0xB2,0x3A,0x3F,0x85,0x92,0xD0,0x00,
+0x0A,0x19,0x12,0xF1,0x02,0x9B,0x19,0x40,0xB9,0x11,0x02,0xF2,0x1A,0x08,0x94,0x0A,
+0xC2,0x83,0x0B,0xB4,0xA4,0xC0,0x32,0xD8,0x86,0x98,0x90,0x95,0x89,0xA3,0x83,0xC2,
+0x92,0xE1,0x92,0x82,0xD9,0x03,0x08,0xA9,0x85,0x92,0xA2,0x80,0xE0,0x30,0x8B,0xB3,
+0x87,0x89,0x90,0x83,0xA0,0x08,0x92,0x93,0x3E,0xAB,0x43,0x89,0xE3,0x80,0x83,0x2F,
+0x00,0xA3,0x80,0xC9,0x22,0x3F,0x08,0x81,0x0B,0x33,0x9A,0xA3,0x7B,0x0C,0x29,0x4A,
+0x1B,0x21,0xAA,0x70,0x1B,0x0D,0x48,0x1A,0x81,0x88,0xB1,0x39,0x3F,0x08,0x58,0xA0,
+0x81,0x1A,0x1A,0x2B,0x6D,0x11,0x0A,0x91,0x01,0x1A,0x98,0x5A,0x0C,0x03,0xB1,0x84,
+0xA3,0xAD,0x58,0x2A,0xA1,0x84,0xB1,0xA0,0x5C,0x2B,0x13,0xA8,0x95,0x83,0xE8,0x10,
+0x81,0xB0,0x00,0xC2,0x96,0xA0,0x91,0x00,0x2C,0x90,0x30,0xF2,0x80,0xA8,0x39,0x21,
+0xC1,0x03,0xAC,0x39,0x7C,0x29,0x91,0x1A,0x00,0x19,0x2C,0x3A,0x93,0xB0,0x29,0x8F,
+0x28,0x02,0x93,0xF3,0xA9,0x01,0x03,0xE0,0x08,0x09,0x1D,0x58,0xA1,0x83,0xA9,0x6B,
+0x2A,0x3C,0x21,0x89,0xC2,0x2C,0x4B,0x8A,0x50,0x81,0x98,0xA8,0x32,0x0C,0x8E,0x24,
+0x0B,0x1A,0x81,0x92,0xA1,0x4F,0x18,0x3A,0x0A,0xB4,0x18,0x2E,0x39,0x82,0x19,0xD3,
+0xD0,0x28,0x1B,0x11,0x98,0x07,0xAA,0x28,0x00,0x88,0xB4,0x89,0x1B,0x1F,0x22,0x00,
+0xB3,0xC9,0x33,0xAB,0x2B,0xB5,0x48,0x98,0x98,0xA7,0x10,0xD2,0xC1,0x23,0xCA,0x93,
+0xC6,0x80,0xA1,0x88,0x02,0x89,0xE2,0x09,0x38,0xBA,0x40,0x89,0x21,0xD8,0x49,0x10,
+0x8D,0x02,0x90,0xC3,0x9A,0x24,0x89,0x08,0x84,0xA5,0x9C,0x10,0x11,0x9C,0x88,0x30,
+0x3C,0xA1,0x94,0x58,0x8C,0x0B,0x69,0x29,0x9A,0x81,0x12,0x2B,0x8B,0x79,0x94,0xB0,
+0xC1,0x84,0xC2,0x99,0x25,0x99,0x11,0xA2,0x93,0xE4,0x99,0x80,0x0A,0x00,0x10,0xB7,
+0xB0,0x31,0xBA,0x3C,0x21,0xB3,0xF1,0x18,0xA0,0x2A,0x20,0xA3,0x06,0xE8,0x28,0xA1,
+0xB4,0x08,0x0B,0x11,0x4B,0xB7,0x90,0xA5,0x98,0x3D,0x19,0x02,0xA1,0xC4,0xB2,0x19,
+0x28,0xC0,0xA5,0x92,0xB1,0xA3,0x0A,0x0A,0x08,0x2B,0x70,0xC4,0xB3,0x00,0xBC,0x4B,
+0x39,0x12,0xE3,0xA0,0x00,0x3F,0x18,0x29,0x94,0xD1,0x19,0x09,0x00,0xA1,0x83,0x99,
+0x9B,0x35,0x80,0xC4,0xB1,0x6A,0x1A,0x1C,0x29,0x38,0x0E,0x19,0x5A,0x1A,0x82,0x8A,
+0x59,0x2A,0x2E,0x20,0x88,0xA8,0x3A,0x38,0x3D,0x00,0xB3,0x29,0xAD,0x49,0x10,0x0C,
+0x01,0x01,0xA3,0x8F,0x85,0x09,0x1B,0x88,0x10,0xA3,0xD2,0x90,0x3C,0x5C,0x39,0x03,
+0xD1,0xA0,0x00,0x2A,0x0B,0x04,0xA7,0x90,0xA0,0x11,0x90,0x99,0x83,0xB4,0xB1,0xF1,
+0x84,0x88,0x90,0x18,0x18,0xD3,0xD2,0xB3,0xA0,0x1A,0x21,0xA7,0xB2,0xB3,0x92,0x9A,
+0x22,0xB9,0x28,0x38,0xBD,0x87,0x2A,0xB1,0x13,0x0D,0x0A,0x38,0xC9,0x24,0xC0,0x19,
+0x23,0x0F,0x01,0x88,0xC0,0x2A,0x82,0x18,0x28,0xF0,0x18,0x2A,0x29,0x4B,0x35,0xB8,
+0xA3,0x9D,0x18,0x1B,0x40,0x00,0x9A,0x5C,0x3A,0x09,0x2F,0x38,0x8A,0x3B,0x3B,0x11,
+0x5C,0x19,0x2B,0x4A,0x08,0x0A,0x3D,0x20,0x4F,0x3A,0x19,0x2A,0x18,0x4D,0x1B,0x3A,
+0x11,0x0D,0x3A,0x3C,0x4B,0x93,0x81,0xAA,0x6B,0x4A,0x18,0x00,0xC3,0xC3,0x9A,0x59,
+0x2A,0x1B,0xA7,0xA1,0x81,0x88,0x88,0x58,0xB2,0xB1,0x2B,0x83,0xD4,0x81,0x08,0x0F,
+0x00,0x20,0xC2,0xE2,0x80,0x08,0x1C,0x29,0x04,0xB1,0xA2,0x01,0x1C,0x91,0x00,0x0C,
+0x49,0xB0,0x43,0xF2,0x99,0x39,0x3F,0x00,0x81,0x94,0xC1,0x09,0x1A,0x69,0x90,0x80,
+0x94,0xAA,0x20,0x2A,0x91,0xB1,0x39,0x7A,0x38,0xD1,0x10,0x8A,0x8C,0x5A,0x01,0xB5,
+0x98,0x80,0x2A,0x0B,0x32,0x92,0xF1,0x81,0x9A,0x23,0x8A,0xA3,0xB7,0x09,0x03,0x08,
+0xD0,0x94,0x9A,0x09,0x01,0x93,0xB7,0xC2,0x8C,0x3A,0x83,0x99,0x05,0xA0,0x0B,0x29,
+0x93,0xE5,0x80,0x89,0x38,0x90,0x8A,0xD7,0xA1,0x19,0x1B,0x48,0x98,0x92,0xC3,0xA1,
+0x09,0x3F,0x02,0x0C,0x22,0xC3,0xB2,0xA1,0x01,0x9F,0x4A,0x01,0xA3,0xD3,0xB0,0x28,
+0x3F,0x29,0x20,0xA2,0xC2,0xB1,0x08,0x5A,0x98,0x13,0xD2,0xC1,0x01,0xB2,0x80,0x3D,
+0x03,0xC1,0x89,0x96,0x90,0x90,0x3A,0x1A,0x9A,0x32,0xB6,0xA2,0x8E,0x4A,0x28,0x8A,
+0x84,0xA2,0x8A,0x2D,0x49,0x09,0x88,0x18,0x30,0x9D,0x2C,0x23,0xB1,0x0C,0x92,0x2D,
+0x39,0x82,0xC4,0x2E,0x10,0x1A,0x10,0xB9,0x48,0x19,0x39,0xBA,0x34,0xDA,0x2D,0x48,
+0x1A,0xA6,0x98,0x83,0x9A,0x1D,0x38,0x04,0xD0,0x18,0x90,0x2C,0x11,0x93,0xD3,0x9A,
+0x11,0x08,0x82,0xF1,0x01,0xA0,0x2A,0x93,0xD3,0xB4,0xB8,0x82,0x2F,0x11,0xA3,0xB3,
+0xA8,0x3B,0x09,0x23,0x96,0xC8,0x3B,0x3F,0x93,0x82,0xA1,0x90,0x3F,0x28,0x81,0xD1,
+0x93,0x08,0x2D,0x18,0x91,0xB3,0xB5,0x98,0x2A,0x2B,0x84,0xB1,0x5B,0x8A,0x31,0x18,
+0x80,0x8B,0x7E,0x39,0x2B,0x02,0xC1,0x8B,0x6C,0x49,0x09,0x10,0xA1,0x08,0x01,0x0C,
+0x20,0xA1,0x09,0x4F,0x18,0x00,0x01,0xA0,0x5C,0x1B,0x5B,0x10,0x92,0x90,0x2B,0x5A,
+0x3D,0x18,0x91,0x19,0x98,0x2D,0x39,0x89,0x2D,0x3A,0x48,0x2C,0x11,0xB5,0x9A,0x19,
+0x5B,0x28,0x90,0x95,0x98,0x89,0x2B,0x40,0x08,0x90,0xF3,0x0A,0x08,0xA6,0x80,0x91,
+0xB2,0xA0,0x02,0xF2,0xA1,0xB7,0x89,0x81,0x82,0x91,0xB1,0x21,0xAB,0x32,0xE9,0x04,
+0xA2,0x8D,0x12,0x91,0xA3,0xA3,0xD2,0x8B,0x39,0xD1,0x84,0xE2,0x90,0x00,0x2B,0x29,
+0xA3,0xD4,0xA1,0x91,0x1D,0x5A,0x08,0x19,0x11,0x99,0x08,0x18,0x49,0x0F,0x18,0x10,
+0x82,0xF1,0x00,0x89,0x2F,0x3A,0x01,0xB3,0xC2,0x81,0x3F,0x29,0x08,0x10,0xA1,0xA1,
+0x3B,0x5D,0x19,0x28,0x0B,0x38,0x82,0x91,0x19,0xBD,0x3B,0x7A,0x80,0x12,0xB3,0xE0,
+0x0B,0x6A,0x01,0x88,0xA4,0x08,0x0B,0x08,0x59,0x80,0x80,0x1D,0x49,0x89,0x00,0x84,
+0x99,0x1A,0x2B,0x32,0xE3,0xB4,0xA9,0x3A,0x99,0x31,0xE3,0xAA,0x58,0x3B,0x88,0x95,
+0xC0,0x18,0x4A,0x09,0x30,0xF2,0xA3,0x1C,0x1B,0x49,0x00,0xD3,0xB2,0xA0,0x18,0x11,
+0x92,0xD3,0xB2,0x91,0x80,0xE7,0xA1,0x91,0x98,0x19,0x22,0xC2,0xD2,0x18,0x8D,0x3B,
+0x10,0xA5,0x91,0x98,0x02,0x3E,0x80,0x01,0x90,0xAA,0x13,0xF1,0x02,0xD1,0x08,0x19,
+0x49,0xB4,0x91,0xB4,0x99,0x2A,0x0C,0x32,0xC0,0x05,0x88,0x0B,0x80,0x2C,0x81,0x10,
+0x0B,0x51,0xA9,0x19,0x05,0xBF,0x28,0x20,0xE1,0x90,0x80,0x28,0x19,0x08,0x26,0xB1,
+0xA1,0x18,0x88,0x2A,0xF0,0x12,0x8A,0xB3,0x14,0x1B,0xD4,0xD8,0x10,0x08,0x8A,0x17,
+0xA0,0x98,0x2B,0x3A,0x29,0x48,0xA4,0x99,0x0E,0x4A,0x12,0x8B,0x31,0x8B,0x4E,0x1A,
+0x11,0xB5,0x89,0x91,0x29,0x89,0xC2,0x97,0x90,0x0A,0x19,0x11,0x91,0xC1,0xD5,0x08,
+0x89,0x20,0x91,0xB1,0x1A,0x2D,0x18,0x29,0xD2,0x3B,0x3E,0x3A,0x2A,0x90,0x82,0x1C,
+0x49,0x3B,0x93,0xB6,0xC8,0x4C,0x02,0x91,0x93,0xF2,0x88,0x2D,0x28,0x81,0x82,0xC1,
+0x89,0x2D,0x6B,0x19,0x82,0x80,0x18,0x8B,0x39,0x39,0xC8,0x3A,0x6A,0x0A,0x22,0xD2,
+0x09,0x2C,0x1A,0x68,0x92,0xE2,0x89,0x2A,0x2A,0x30,0xC2,0xA3,0xB4,0x1D,0x2A,0x09,
+0x93,0x18,0xF2,0x89,0x28,0xB3,0x01,0x8F,0x18,0x11,0xA1,0x93,0x90,0xD1,0x7A,0x20,
+0xC3,0xA2,0xA8,0x88,0x1D,0x28,0xA5,0xA2,0xA2,0x0B,0x29,0x2B,0x87,0xC1,0x80,0x0A,
+0x19,0x01,0x12,0xF1,0x10,0x80,0x0A,0x18,0x08,0x2F,0x4A,0x02,0x89,0x1B,0x29,0x5D,
+0x4C,0x08,0x82,0xA1,0x0A,0x3A,0x4B,0x29,0xC6,0xC3,0x09,0x09,0x88,0x39,0x98,0x82,
+0xA5,0x1A,0x30,0x11,0xBD,0x3F,0x12,0x8B,0x28,0xC3,0x88,0x3F,0x2B,0x3B,0x48,0xA1,
+0x80,0x8A,0x4D,0x39,0x01,0x93,0xA2,0xF1,0x19,0x19,0x0A,0x02,0xB2,0x8B,0x24,0xD2,
+0x4B,0x12,0xC8,0x2E,0x10,0xB5,0x89,0x01,0x09,0x1C,0x2A,0x03,0xD4,0x91,0x98,0x99,
+0x11,0x2B,0xE4,0x00,0x00,0x01,0xE0,0xA5,0x89,0x99,0x31,0x18,0xD0,0xB7,0x98,0x18,
+0x0A,0x10,0x94,0xC2,0x90,0x18,0x00,0x99,0x87,0xA0,0x90,0x2A,0x3C,0x02,0xB8,0xC1,
+0x79,0x1A,0x20,0x08,0xA1,0xD2,0x1C,0x29,0x03,0xD1,0x29,0x99,0x2C,0x50,0xB3,0xD1,
+0x08,0x09,0x3C,0x10,0x04,0xB2,0x0D,0x2B,0x59,0x80,0x90,0x01,0x0F,0x3A,0x18,0x01,
+0xA2,0x9B,0x5B,0x3D,0x81,0x03,0xD2,0x98,0x59,0x90,0x81,0x92,0xB4,0x8B,0x1B,0x40,
+0xB2,0xB5,0x08,0x4B,0x01,0x09,0xD1,0x91,0x8B,0x7A,0x10,0xB3,0xC3,0x99,0x49,0x1A,
+0x29,0xB5,0xA2,0xAB,0x40,0x81,0x19,0xB7,0xB0,0x20,0x2B,0xD4,0x88,0xA1,0x91,0x3C,
+0x82,0x37,0xD3,0xB1,0x8A,0x1B,0x30,0xB3,0xF4,0xA1,0x91,0x09,0x10,0x03,0xD0,0x83,
+0xA9,0x8F,0x10,0x01,0x90,0x18,0x80,0x20,0x2B,0xF1,0x28,0x99,0x2A,0x41,0xF0,0x12,
+0xAA,0x83,0x82,0xD1,0xC1,0x08,0x89,0x59,0x09,0x83,0x87,0xB0,0x2A,0x4D,0x18,0x09,
+0x19,0xB3,0x4B,0x3F,0x39,0x19,0x09,0x01,0x89,0x03,0x1F,0x00,0x1A,0x0B,0x10,0x68,
+0xA0,0x18,0x8C,0x6A,0x09,0x08,0x97,0xA1,0x81,0x1B,0x2B,0x4C,0x03,0xB4,0xA8,0x92,
+0x4B,0x3C,0xA1,0x81,0x95,0xA8,0x81,0x12,0xBB,0x92,0x45,0xB9,0x93,0xF4,0x88,0x0A,
+0x2D,0x28,0x00,0xA3,0xA3,0x8A,0x3F,0x48,0xB1,0x92,0xB4,0xA8,0x30,0x80,0xD3,0x80,
+0xD1,0x19,0x3B,0xC4,0x81,0xC1,0x29,0x0D,0x20,0x13,0xC8,0xB4,0x4C,0x09,0x00,0x82,
+0xC2,0x3B,0x0D,0x30,0x0B,0x12,0xF0,0x1B,0x20,0x0A,0xA6,0x80,0x0A,0x4A,0x4A,0x80,
+0x94,0xB1,0x2E,0x3B,0x1A,0x10,0x93,0x10,0x4C,0x3D,0x08,0x82,0xC9,0x19,0x6A,0x2B,
+0x38,0xD1,0x08,0x19,0x2A,0x5A,0x82,0xB1,0x8D,0x29,0x78,0x09,0x82,0x0A,0x2C,0x1B,
+0x19,0x41,0xB8,0x8C,0x79,0x2B,0x11,0x88,0x82,0x91,0xDC,0x28,0x11,0xB0,0x11,0x18,
+0xC9,0x62,0xA1,0x91,0x98,0x3B,0x3A,0xB0,0xF4,0x01,0xC0,0x29,0x39,0xF8,0x95,0x91,
+0x88,0x88,0x91,0x03,0xA1,0xE2,0x18,0x82,0xD1,0xA2,0xD1,0x80,0x19,0x20,0x83,0xB1,
+0xE3,0x80,0x91,0x4D,0x1A,0x03,0xB2,0x09,0x18,0xD1,0x19,0x09,0x92,0xA6,0xA0,0xB6,
+0xB2,0x8B,0x38,0x10,0x42,0xD3,0xD0,0xA8,0x20,0x2C,0x10,0x01,0xB1,0xB4,0xAB,0x5B,
+0x79,0x80,0x10,0x1A,0xA8,0x3D,0x18,0x20,0xB3,0x8F,0x18,0x01,0x00,0x09,0xF3,0x89,
+0x69,0x88,0x81,0x91,0x08,0xE1,0x1A,0x08,0x11,0x81,0x1E,0x29,0xA0,0x01,0x00,0x90,
+0x3E,0x7B,0x18,0x82,0xC3,0xA1,0x2A,0x2C,0x5B,0x81,0xA5,0x90,0x81,0x00,0x0B,0x1A,
+0x1C,0x2C,0x32,0xC0,0xF3,0x80,0x2D,0x2A,0x10,0x02,0xE4,0xC1,0x89,0x4A,0x09,0x01,
+0x03,0xD2,0x98,0x2A,0x39,0x8A,0x89,0x26,0xB1,0xB2,0x12,0xC0,0x0A,0x5A,0x18,0x98,
+0xF3,0x92,0x99,0x99,0x79,0x01,0xB5,0xA1,0x80,0x80,0x90,0x83,0xA0,0xE2,0x81,0x29,
+0x93,0x8A,0x0A,0x6A,0x1F,0x18,0x02,0xC8,0x01,0x19,0x3B,0x4A,0x98,0x17,0xA8,0x0D,
+0x38,0xA1,0x91,0x10,0xA2,0x2B,0x4C,0xA6,0x81,0xBA,0x21,0x4C,0x80,0x21,0xD1,0x92,
+0x2C,0x08,0x30,0x9F,0x93,0x2A,0x89,0x03,0x8B,0x87,0x0A,0x0D,0x12,0x98,0xA4,0x93,
+0xBB,0x59,0x18,0xA1,0x32,0xE9,0x84,0x08,0x8A,0x02,0xA1,0x91,0x4B,0xB4,0x20,0x88,
+0xF0,0x3A,0x1A,0x88,0x87,0xB1,0x92,0x0A,0x08,0x6B,0x83,0xC3,0x91,0xC0,0x2B,0x79,
+0x08,0x8A,0x84,0xA0,0x89,0x40,0x1B,0xA1,0x39,0x98,0x17,0xC2,0xA2,0x12,0xCD,0x20,
+0x89,0x92,0x25,0xB0,0x2D,0x3A,0x8B,0x58,0x2A,0xA0,0x4C,0x08,0x30,0xAE,0x82,0x59,
+0x89,0x1A,0x10,0xC2,0x18,0x2C,0x40,0x1E,0x01,0xA3,0x8A,0x81,0x2C,0x29,0x29,0xA9,
+0x13,0x51,0xAD,0x12,0x89,0x8F,0x18,0x2C,0x39,0x00,0xC1,0x10,0x3C,0x2A,0x41,0xC8,
+0xA2,0x91,0x0A,0x6C,0x10,0x12,0x88,0xE8,0x30,0x91,0x81,0xD8,0x01,0x1B,0x0D,0x07,
+0x00,0xA8,0x92,0x0A,0x28,0xD2,0xC3,0x02,0xAA,0x94,0x81,0xB4,0xB3,0x1A,0x0B,0x13,
+0xF9,0x16,0xA1,0x8A,0x59,0x19,0x02,0xC1,0x91,0x8B,0x3D,0x18,0x3B,0xA4,0x94,0x80,
+0x99,0x88,0x1C,0x79,0x0A,0x02,0x03,0xF8,0x90,0x39,0x5B,0x19,0x02,0xC3,0x90,0xBB,
+0x58,0x6A,0x09,0x02,0x89,0x91,0x88,0x1A,0x69,0x8A,0x19,0x15,0xA0,0xA2,0x00,0x9A,
+0x6B,0x49,0x88,0xA3,0x92,0xBB,0x6B,0x3D,0x38,0x01,0x98,0x91,0x3F,0x09,0x18,0x20,
+0x90,0x80,0xAC,0x70,0x91,0x9B,0x51,0x09,0x88,0x99,0x14,0x8B,0x98,0x83,0x79,0xA0,
+0x99,0x13,0x01,0x19,0xE0,0x83,0x0B,0xB0,0x0C,0x31,0x95,0xB5,0xC2,0x8A,0x39,0x20,
+0x80,0x39,0xF3,0xB1,0x10,0x88,0x5E,0x18,0x94,0xA1,0x88,0xA1,0x98,0x15,0xAA,0x39,
+0xD4,0x84,0xC0,0xA2,0xA2,0x0C,0x81,0x86,0xB5,0xA1,0xB1,0x14,0x1B,0xB1,0x02,0x92,
+0xC3,0xE0,0x88,0x11,0xAA,0x69,0x18,0x81,0xA3,0xB0,0x01,0xBF,0x2A,0x31,0x93,0xF1,
+0x00,0x89,0x18,0x19,0x11,0xD3,0xE0,0x10,0x18,0xB1,0x18,0x24,0x9A,0x2B,0xA4,0xC0,
+0xB0,0x31,0x6C,0x19,0xB4,0x12,0xA8,0xEA,0x58,0x10,0x8B,0x93,0x82,0x88,0x9A,0x41,
+0x10,0xC3,0xEA,0x41,0xA9,0x9C,0x34,0xA1,0x2A,0x79,0xA2,0x01,0xA8,0xB3,0x28,0xCC,
+0x41,0x9A,0xB3,0x4B,0xB3,0x27,0x8B,0x83,0x2B,0x2F,0x08,0x28,0xB2,0x80,0x2C,0x30,
+0x5E,0x09,0x12,0x9B,0x09,0x22,0x5B,0x19,0x8A,0x11,0x59,0x99,0xA4,0x32,0xCD,0x18,
+0x08,0x10,0x85,0xB3,0xB4,0x1E,0x88,0x28,0x8A,0x11,0x09,0xC0,0x79,0x80,0x91,0x3B,
+0x80,0x10,0x0F,0x01,0x80,0x91,0x19,0x3D,0x92,0x28,0xA8,0x37,0x9A,0x0A,0x3A,0x8A,
+0x45,0xA9,0xA4,0x00,0xAA,0x09,0x3D,0x59,0x20,0xE1,0x08,0x98,0x90,0x59,0x10,0x09,
+0xA3,0xC3,0x93,0x99,0x2B,0x69,0x11,0xD1,0xB1,0xA4,0x91,0x3C,0x89,0x83,0xF0,0x10,
+0x91,0xA1,0x89,0x59,0x05,0x99,0x93,0x94,0xC8,0x08,0x0A,0x09,0x17,0xB1,0x83,0xC1,
+0x91,0x40,0xA2,0xC2,0x98,0xC3,0xBA,0x28,0x23,0x0F,0x80,0x50,0xB8,0x19,0x10,0x96,
+0x98,0x8C,0x05,0x98,0x19,0x29,0x2B,0x3B,0x0A,0xE2,0x01,0x0F,0x3C,0x38,0x08,0x09,
+0x81,0x4A,0x6C,0x08,0x00,0x88,0x98,0x38,0x2C,0x5A,0x1B,0x20,0x1A,0x39,0xB0,0x09,
+0xCB,0x5B,0x49,0x09,0x71,0x00,0xC1,0x0E,0x08,0x38,0x0C,0x02,0x10,0x0E,0x10,0x8A,
+0x48,0x19,0x90,0x92,0x0D,0xA3,0x98,0x3B,0x79,0x19,0x01,0x10,0xE1,0x80,0x19,0x2B,
+0x10,0xF2,0x02,0xAB,0x84,0x9A,0x29,0xB4,0x80,0x92,0x03,0x88,0x95,0xD0,0x03,0x90,
+0xA0,0xC7,0xA1,0xB0,0xA2,0x02,0x18,0xB5,0xD4,0x01,0xC0,0x08,0xA2,0x93,0xA8,0xA0,
+0xC3,0x20,0xF3,0x90,0x00,0xD5,0x08,0x89,0xA5,0x80,0xA0,0x81,0x82,0xC2,0x09,0xD1,
+0x13,0xCB,0x03,0x84,0x91,0xE1,0x1B,0x12,0x08,0xAB,0x87,0x18,0xAB,0x58,0x89,0x28,
+0x81,0xC9,0x33,0xA9,0x80,0x2E,0x20,0x83,0xB9,0x20,0x3B,0x9E,0x7A,0x08,0x81,0x18,
+0x0B,0x88,0x79,0x80,0x8B,0x00,0x12,0x0E,0x89,0x51,0x1B,0x81,0xA0,0x3A,0x01,0xAF,
+0x11,0x28,0xBA,0x35,0x98,0x88,0x52,0xC0,0x83,0x2F,0xA9,0x11,0x0A,0x19,0x25,0xD0,
+0x30,0x9C,0x08,0x21,0x98,0x81,0x2A,0xF3,0x2A,0x80,0xB6,0x2B,0x08,0x93,0xE9,0x02,
+0x81,0x8C,0x21,0x00,0xA6,0xA9,0x94,0x01,0x8F,0x80,0x94,0x98,0x93,0xB4,0x00,0x08,
+0xC0,0x14,0x98,0xB3,0xB4,0xC1,0x09,0x18,0xA7,0x00,0xA3,0xC8,0x0A,0x3C,0x19,0x96,
+0x83,0xC1,0x99,0x19,0x4A,0x85,0x80,0xC1,0x91,0x99,0x90,0x2A,0x17,0x95,0x99,0x88,
+0x12,0xAE,0x39,0x08,0x92,0x84,0xB0,0xA8,0x79,0x09,0x19,0x01,0xB2,0xA3,0x8F,0x28,
+0x2B,0xA2,0x40,0x82,0xA0,0x4C,0xA9,0x39,0x8D,0x81,0x70,0x88,0xA0,0x1A,0x49,0x2D,
+0x1A,0x26,0xA8,0x98,0x08,0x29,0x0B,0x12,0x96,0xB1,0xB2,0x3A,0x13,0x9B,0x60,0xA0,
+0x88,0xB2,0x34,0xEA,0x1A,0x2A,0x79,0x98,0x10,0x04,0x8C,0x1C,0x81,0x04,0x8C,0x83,
+0x19,0x2F,0x81,0x93,0x98,0x10,0x08,0x30,0x2A,0xFA,0x05,0x08,0x2A,0x89,0x91,0xA3,
+0xFA,0x11,0x11,0x00,0x8C,0x04,0x8A,0x2A,0xB5,0x10,0xA9,0xC2,0x3D,0x1B,0x32,0x04,
+0x0A,0x1A,0x09,0x40,0x1F,0x92,0x1D,0x2A,0x91,0x10,0x30,0x2F,0x0B,0x68,0x99,0xA2,
+0x92,0x88,0x78,0xA9,0x20,0x28,0xE2,0x92,0x1A,0x99,0x4B,0x19,0x22,0xA1,0xE2,0x21,
+0x2F,0x98,0x29,0x18,0x91,0x08,0xB0,0x79,0x1A,0x82,0x3B,0xB1,0xA7,0x8A,0xB3,0x98,
+0x5B,0x23,0xCA,0x42,0x83,0xF0,0x90,0x18,0x98,0x08,0xB4,0x20,0xA3,0xC0,0x43,0xD8,
+0x80,0x81,0xA3,0x99,0xD9,0xA7,0x19,0x90,0x10,0x05,0xB1,0x8B,0x02,0xA4,0xBD,0x23,
+0x93,0x8A,0x99,0x4B,0x03,0xC1,0xF8,0x38,0x09,0x2B,0x14,0xD0,0x03,0x8A,0x2A,0x39,
+0xB9,0x97,0x90,0xAA,0x50,0x01,0x99,0x51,0xD1,0x09,0x1A,0xB5,0x00,0x8B,0x93,0x08,
+0x98,0x11,0xF9,0x85,0x2B,0x08,0x96,0x89,0x90,0x2A,0x12,0x4A,0xD8,0x85,0x2B,0x0E,
+0x10,0x00,0x01,0xB1,0x9B,0x69,0x1A,0x90,0x40,0xB8,0x01,0x08,0x0A,0x2C,0x09,0x14,
+0x4B,0xE2,0x82,0x88,0xB1,0x78,0x0A,0x01,0xC2,0x93,0x19,0xCE,0x20,0x3C,0x82,0xB4,
+0x1B,0x20,0x8C,0x3B,0x29,0xAB,0x86,0x23,0xD8,0x81,0x9A,0x5A,0x49,0xB0,0x16,0xA0,
+0xB0,0x28,0x1B,0x13,0x93,0xE4,0xA2,0xA9,0x08,0x5A,0xB3,0x12,0xC1,0xE1,0x10,0x88,
+0x01,0x0C,0x92,0x08,0x89,0xB7,0x88,0x81,0x10,0x9A,0x17,0xA0,0xB0,0x13,0x99,0xE0,
+0x39,0x31,0xD2,0xB2,0x80,0x0B,0x2D,0x49,0x80,0x01,0xB0,0x06,0x09,0x0C,0x3A,0x69,
+0xA0,0x08,0xB2,0xA1,0x69,0x2B,0x5A,0x81,0x92,0xBA,0x21,0xB1,0x7D,0x10,0x80,0x08,
+0x88,0x82,0x32,0x0D,0xB0,0x1A,0x1C,0x21,0x94,0xA9,0x58,0xB9,0x5A,0x4A,0xA0,0x13,
+0xA9,0x80,0x7C,0x00,0x20,0x8A,0x04,0x0C,0x00,0x82,0x2A,0xB2,0xAC,0x4B,0x69,0xA0,
+0xA6,0x81,0x9B,0x19,0x38,0x8B,0x17,0xB2,0x81,0x2A,0xBB,0x94,0x29,0xA2,0x15,0xBA,
+0x97,0xA3,0xB9,0x79,0x01,0xB2,0x02,0xF1,0x90,0x0A,0x29,0x11,0x88,0xE5,0xA0,0x81,
+0x19,0x91,0x90,0x28,0xB3,0x14,0xD0,0xB5,0x91,0x9A,0x29,0x0B,0x07,0xA2,0xB3,0x01,
+0x9D,0x28,0x41,0xD0,0x91,0x90,0x82,0x1A,0xA8,0x44,0x9A,0xA9,0x21,0xE3,0xA9,0x4B,
+0x19,0x78,0x89,0x83,0xA3,0xB9,0x5A,0x3D,0x80,0x82,0xA2,0xA0,0x6C,0x10,0x20,0x8B,
+0x93,0x8B,0x0E,0x33,0xA9,0xB1,0x68,0x8A,0x31,0xAC,0x94,0xB4,0x8B,0x32,0x0B,0xB4,
+0x81,0x91,0x1D,0x33,0xD9,0x31,0xE1,0x8B,0x3B,0x30,0x12,0x49,0xD2,0x8E,0x29,0x18,
+0x8A,0x92,0x02,0xAA,0x59,0x1C,0x32,0x88,0x01,0x23,0xFB,0x83,0x29,0xDA,0x59,0x01,
+0x81,0x92,0xE1,0x18,0x8A,0x1D,0x30,0x93,0xF1,0x00,0x01,0x0B,0x39,0x92,0x89,0xA0,
+0x11,0x5B,0xE0,0x82,0x09,0x13,0xAA,0xB4,0x16,0xD8,0x91,0x2A,0x29,0x84,0x1B,0xC5,
+0x98,0x98,0x31,0x98,0x99,0x17,0xA9,0x20,0x92,0xC3,0x18,0x9D,0x20,0x3D,0x89,0x94,
+0xA2,0x1C,0x5C,0x29,0x39,0xA0,0xB3,0x00,0x0C,0x4C,0x48,0x92,0x0A,0x91,0x85,0x9A,
+0x01,0x82,0x1F,0x10,0x99,0x15,0xC1,0xA0,0x39,0x1A,0x1D,0x85,0xB4,0x90,0x1A,0x2A,
+0x4B,0x01,0xB2,0x93,0xBE,0x12,0x83,0xC9,0x18,0x09,0x20,0x78,0xF1,0x08,0x19,0x88,
+0x3A,0x83,0xB3,0xA9,0x93,0x7A,0x0A,0x96,0x98,0x00,0xA8,0x3A,0x30,0x92,0xF2,0x9B,
+0x3D,0x38,0x92,0x92,0xC3,0xB8,0x6B,0x29,0x01,0x01,0xB2,0x2F,0x09,0x19,0x18,0x01,
+0x3B,0x7B,0x10,0xA1,0x90,0x39,0x0F,0x38,0x0A,0xB5,0xA4,0x89,0x8B,0x6A,0x2B,0x12,
+0xC8,0x90,0x40,0x2A,0x9E,0x22,0x88,0x18,0x09,0x3A,0xC3,0xE8,0x09,0x59,0x08,0x12,
+0x94,0xD0,0x1A,0x2C,0x38,0x00,0xA1,0x83,0xE8,0x08,0x3A,0x08,0x10,0x9E,0x83,0x1D,
+0x92,0x19,0x2C,0x39,0x3B,0x59,0x04,0xE1,0x80,0x08,0x8D,0x21,0x81,0xB2,0xB2,0x02,
+0x99,0x91,0xA4,0xD6,0x98,0x99,0x03,0x80,0x98,0xA7,0x91,0x09,0xA1,0xB2,0xB3,0xE1,
+0x12,0x92,0xB1,0x81,0x06,0x99,0x0A,0x23,0xC4,0xB1,0xF2,0x89,0x19,0x3A,0x94,0x82,
+0xE0,0x89,0x38,0x0B,0xA4,0xA5,0x80,0x80,0x8C,0x34,0xB9,0xA9,0x23,0x13,0xB9,0xC1,
+0xC7,0x1B,0x89,0x10,0x20,0x11,0xE3,0xA8,0x4B,0x0B,0x40,0x91,0x90,0x1B,0x5F,0x2A,
+0x18,0x82,0x91,0x0B,0x4A,0x28,0xCA,0x40,0x80,0x5B,0x2C,0x13,0xB0,0x8A,0xA9,0x5A,
+0x58,0x89,0x82,0x88,0x2E,0x3B,0x31,0xA1,0x9B,0x01,0x7A,0x2C,0x01,0x91,0x93,0x3F,
+0x88,0x39,0x10,0xF1,0x91,0x8B,0x48,0x0A,0x12,0xE3,0xA8,0x18,0x28,0x92,0x97,0x98,
+0x99,0x19,0xA1,0x11,0xB6,0x88,0x3B,0x10,0xD3,0xC3,0xA1,0x2A,0x8A,0x49,0x04,0xF1,
+0x91,0x02,0x8A,0x89,0x04,0xF1,0x98,0x80,0x18,0x12,0xE3,0x81,0x98,0x80,0x01,0xB3,
+0xF2,0x99,0x12,0x2A,0xB5,0xB3,0x92,0xAA,0x19,0x50,0xB2,0xC3,0x92,0xD0,0x2B,0x68,
+0x93,0x99,0xC0,0x2C,0x3E,0x80,0x20,0x08,0x93,0x0D,0x2A,0x31,0x8D,0x02,0x2B,0x91,
+0x08,0x0A,0x03,0x2C,0x3C,0x52,0xB9,0xA0,0x12,0xBF,0x3A,0x29,0x01,0x88,0xC0,0x6A,
+0x3C,0x0A,0x49,0x18,0x0B,0x39,0x2B,0x69,0x0A,0x84,0x2A,0x2A,0x1C,0x2A,0xC3,0x8C,
+0x19,0x50,0x09,0x91,0xA7,0x8D,0x18,0x1A,0x28,0x00,0xA0,0x94,0x10,0x1F,0x20,0x90,
+0x8A,0x12,0xD0,0x1A,0x5A,0x81,0x04,0xBC,0x23,0x10,0xE0,0x90,0x90,0x18,0x1A,0xA6,
+0x12,0xB1,0xD0,0x4A,0x08,0x82,0x92,0xB6,0x9A,0x0A,0x12,0x88,0xC3,0xC5,0x8A,0x89,
+0x20,0xB5,0x93,0x0B,0x18,0x00,0x09,0xF2,0x88,0x2A,0x4A,0x08,0x05,0xB2,0xA9,0x3B,
+0x5D,0x28,0xA4,0xB1,0x00,0x19,0x19,0x7A,0xA3,0xB3,0x0A,0x90,0xA1,0xC4,0x80,0xBA,
+0x50,0x13,0xC1,0xC2,0x9A,0x2A,0x7B,0x28,0x84,0xC1,0x09,0x3B,0x4E,0x20,0x91,0xA1,
+0x18,0xAB,0x79,0x10,0xB4,0x08,0x9A,0x11,0x2B,0xF0,0x93,0xAA,0x01,0x6A,0x01,0x93,
+0x80,0xB8,0x2A,0x5B,0x10,0x80,0x89,0x4A,0x5B,0x92,0x15,0xB2,0xA0,0x2F,0x19,0x93,
+0xB8,0x95,0x80,0x1C,0x21,0xA9,0x02,0x0B,0xA0,0x5A,0x18,0x98,0x39,0x1B,0x68,0x00,
+0x91,0x91,0x9C,0x39,0x3E,0x18,0x84,0xB3,0x9B,0x7A,0x08,0x18,0x0A,0xB5,0x91,0x0B,
+0x28,0x39,0x19,0x90,0x0A,0x50,0xAC,0x11,0x01,0xAB,0x88,0x52,0x1B,0x83,0xC4,0xA2,
+0x9A,0xAB,0x03,0x90,0x19,0x93,0x81,0x08,0x92,0x9A,0x68,0x98,0x19,0x39,0xC1,0x92,
+0x8A,0x38,0x4E,0x02,0xB1,0x90,0xC3,0x18,0x2B,0x04,0xC3,0xD2,0x91,0x90,0x81,0x89,
+0x13,0xF1,0x88,0x93,0xA2,0x00,0x91,0xC0,0x5B,0x21,0x99,0x93,0x06,0x9A,0x1B,0x48,
+0x99,0xB7,0x90,0x89,0x18,0x1B,0x11,0xA4,0xB2,0x81,0x9A,0x08,0x97,0x98,0x91,0x10,
+0xB8,0x06,0xA2,0xA0,0x29,0x2B,0x21,0xC2,0xD1,0x10,0x1A,0x4A,0x29,0xF1,0x98,0x29,
+0x1B,0x31,0x10,0xA0,0xA1,0x1D,0x5A,0x29,0xB2,0x82,0xA8,0x0F,0x28,0x21,0x09,0x91,
+0x82,0x4D,0x10,0xA3,0xB0,0x89,0x4C,0x39,0xA0,0xA4,0xA1,0x89,0x1E,0x28,0x29,0xA3,
+0xC3,0x2D,0x19,0x01,0x49,0x01,0x9B,0x0C,0x21,0xC2,0xA2,0x93,0x7C,0x2A,0x10,0x90,
+
+/* Source: 08HH.ROM */
+/* Length: 384 / 0x00000180 */
+
+0x75,0xF2,0xAB,0x7D,0x7E,0x5C,0x3B,0x4B,0x3C,0x4D,0x4A,0x02,0xB3,0xC5,0xE7,0xE3,
+0x92,0xB3,0xC4,0xB3,0xC3,0x8A,0x3B,0x5D,0x5C,0x3A,0x84,0xC2,0x91,0xA4,0xE7,0xF7,
+0xF7,0xF4,0xA1,0x1B,0x49,0xA5,0xB1,0x1E,0x7F,0x5A,0x00,0x89,0x39,0xB7,0xA8,0x3D,
+0x4A,0x84,0xE7,0xF7,0xE2,0x2D,0x4C,0x3A,0x4E,0x7D,0x04,0xB0,0x2D,0x4B,0x10,0x80,
+0xA3,0x99,0x10,0x0E,0x59,0x93,0xC4,0xB1,0x81,0xC4,0xA2,0xB2,0x88,0x08,0x3F,0x3B,
+0x28,0xA6,0xC3,0xA2,0xA2,0xC5,0xC1,0x3F,0x7E,0x39,0x81,0x93,0xC2,0xA3,0xE5,0xD2,
+0x80,0x93,0xB8,0x6D,0x49,0x82,0xD4,0xA1,0x90,0x01,0xA0,0x09,0x04,0xE3,0xB2,0x91,
+0xB7,0xB3,0xA8,0x2A,0x03,0xF3,0xA1,0x92,0xC5,0xC3,0xB2,0x0B,0x30,0xB3,0x8E,0x6D,
+0x4A,0x01,0xB4,0xB4,0xC4,0xC3,0x99,0x3B,0x12,0xE3,0xA1,0x88,0x82,0xB4,0x9A,0x5C,
+0x3A,0x18,0x93,0xC3,0xB3,0xB4,0xA8,0x19,0x04,0xF3,0xA8,0x3B,0x10,0xA2,0x88,0xA5,
+0xB2,0x0B,0x6D,0x4B,0x10,0x91,0x89,0x3C,0x18,0x18,0xA6,0xC4,0xC3,0x98,0x19,0x2B,
+0x20,0x91,0xA0,0x4E,0x28,0x93,0xB3,0xC2,0x92,0xA9,0x5A,0x96,0xC4,0xC2,0x09,0x01,
+0xC4,0xA1,0x92,0xC4,0xA1,0x89,0x10,0xA3,0xA1,0x90,0x1C,0x5A,0x01,0xC5,0xA1,0x92,
+0xD4,0xB3,0xC4,0xC4,0xC3,0xA1,0x88,0x1A,0x28,0x89,0x3C,0x3A,0x3D,0x29,0x00,0x93,
+0xB0,0x3D,0x28,0x80,0x91,0x82,0xE3,0x99,0x2A,0x11,0xD6,0xC3,0x99,0x29,0x82,0xC4,
+0xC3,0xA1,0x0A,0x3B,0x3D,0x3A,0x02,0xC3,0xA2,0x99,0x3B,0x2C,0x7C,0x28,0x81,0xA3,
+0xB2,0xA3,0xB1,0x08,0x1A,0x3C,0x18,0x2E,0x4C,0x39,0xA5,0xB3,0xB4,0xC2,0x88,0x08,
+0x19,0x0A,0x49,0xB7,0xB3,0xA2,0xA1,0x92,0xA1,0x93,0xB1,0x0C,0x7D,0x39,0x93,0xB3,
+0xB1,0x1A,0x19,0x5D,0x28,0xA6,0xC4,0xB2,0x90,0x09,0x2A,0x18,0x1B,0x5B,0x28,0x88,
+0x2C,0x29,0x82,0xA0,0x18,0x91,0x2D,0x29,0x2B,0x5C,0x4C,0x3B,0x4C,0x28,0x80,0x92,
+0x90,0x09,0x2B,0x28,0x1D,0x6B,0x11,0xC5,0xB2,0x0B,0x39,0x09,0x4D,0x28,0x88,0x00,
+0x1B,0x28,0x94,0xE3,0xA0,0x1A,0x28,0xB5,0xB4,0xB3,0xB2,0x93,0xE2,0x91,0x92,0xD4,
+0xA0,0x1B,0x4A,0x01,0xA1,0x88,0x2D,0x5C,0x3B,0x28,0x08,0x93,0xD4,0xB2,0x91,0xB4,
+0xA0,0x3E,0x3B,0x4B,0x3B,0x29,0x08,0x93,0x9B,0x7B,0x3A,0x19,0x00,0x80,0x80,0xA0,
+
+/* Source: 10TOM.ROM */
+/* Length: 640 / 0x00000280 */
+
+0x77,0x27,0x87,0x01,0x2D,0x4F,0xC3,0xC1,0x92,0x91,0x89,0x59,0x83,0x1A,0x32,0xC2,
+0x95,0xB1,0x81,0x88,0x81,0x4A,0x3D,0x11,0x9E,0x0B,0x88,0x0C,0x18,0x3B,0x11,0x11,
+0x91,0x00,0xA0,0xE2,0x0A,0x48,0x13,0x24,0x81,0x48,0x1B,0x39,0x1C,0x83,0x84,0xA1,
+0xD1,0x8E,0x8A,0x0B,0xC0,0x98,0x92,0xB8,0x39,0x90,0x10,0x92,0xF0,0xB5,0x88,0x32,
+0x49,0x51,0x21,0x03,0x82,0x10,0x8A,0x7A,0x09,0x00,0xA2,0xCA,0x1B,0xCC,0x1C,0xB9,
+0x8E,0x89,0x89,0xA1,0x89,0x92,0x29,0x11,0x60,0x40,0x14,0x22,0x32,0x78,0x40,0x01,
+0x02,0x90,0x81,0xAB,0x0B,0x00,0xAF,0x99,0xCC,0xAB,0xDA,0xA9,0x99,0x1B,0x30,0x14,
+0x92,0x22,0x19,0x68,0x32,0x14,0x26,0x13,0x23,0x23,0x20,0x12,0x9A,0xA8,0xB9,0xFA,
+0xAA,0xCA,0xCC,0x0C,0xA8,0xAE,0x88,0xB9,0x88,0xA0,0x02,0x21,0x50,0x43,0x03,0x81,
+0x2A,0x11,0x34,0x63,0x24,0x33,0x22,0x38,0x8B,0xEA,0xAE,0x99,0xA0,0x90,0x82,0x00,
+0x89,0xBF,0x8A,0xE8,0xA9,0x90,0x01,0x12,0x13,0x12,0x08,0xA9,0xAA,0xC9,0x22,0x63,
+0x63,0x12,0x44,0x00,0x10,0x88,0x9C,0x98,0xA1,0x85,0x03,0x32,0x36,0x80,0x89,0xDB,
+0xDB,0xBB,0xB9,0xBA,0x01,0x81,0x28,0x19,0xCB,0xFA,0xBC,0x09,0x13,0x37,0x34,0x34,
+0x23,0x31,0x20,0x10,0x00,0x00,0x28,0x38,0x10,0x88,0xEC,0x8D,0xCB,0xBC,0xCC,0xBB,
+0xBB,0xC9,0x99,0x00,0x00,0x33,0x11,0x22,0x81,0x07,0x41,0x54,0x34,0x34,0x22,0x31,
+0x00,0x88,0x9A,0x9B,0x98,0xAB,0x8E,0x9B,0xBD,0x9C,0xBC,0xBB,0xDA,0xAA,0xA9,0x99,
+0x18,0x38,0x60,0x20,0x31,0x13,0x13,0x51,0x14,0x31,0x53,0x33,0x35,0x22,0x01,0x8A,
+0x9C,0xA9,0xCA,0xC9,0xA8,0x00,0x10,0x81,0x9C,0x9E,0xAB,0xCC,0xAB,0xBA,0x98,0x30,
+0x52,0x03,0x81,0x08,0x9C,0xAC,0xAC,0x18,0x11,0x03,0x51,0x61,0x41,0x31,0x31,0x02,
+0x01,0x20,0x24,0x43,0x44,0x40,0x30,0x10,0xBC,0xBE,0xCB,0xDB,0xAB,0xBA,0x99,0x98,
+0x99,0xAA,0xBD,0xAA,0xC8,0x90,0x11,0x53,0x37,0x23,0x43,0x34,0x33,0x33,0x33,0x11,
+0x28,0x00,0x19,0xA9,0x9A,0xCB,0xCE,0xBB,0xEB,0xBC,0xBB,0xCA,0xBA,0xA8,0x88,0x11,
+0x12,0x21,0x20,0x22,0x26,0x26,0x23,0x23,0x43,0x24,0x22,0x32,0x20,0x31,0x81,0x9A,
+0xBC,0xBC,0xCB,0xBD,0x9A,0xA9,0x90,0x98,0xBA,0xCC,0xCB,0xBC,0x8B,0x88,0x22,0x35,
+0x23,0x12,0x99,0x8B,0xAA,0xAA,0x89,0x82,0x93,0x31,0x42,0x23,0x23,0x21,0x32,0x11,
+0x20,0x13,0x13,0x24,0x24,0x24,0x22,0x11,0x8A,0x9E,0xAC,0xAC,0xAA,0xBA,0xAA,0xAB,
+0xBD,0xBC,0xCB,0xCB,0xA9,0xA8,0x91,0x12,0x44,0x43,0x44,0x34,0x34,0x42,0x33,0x42,
+0x21,0x11,0x11,0x88,0x80,0xAA,0x0B,0xAC,0xCB,0xEC,0xAC,0xBA,0xCA,0xAB,0x9A,0x99,
+0x80,0x91,0x09,0x08,0x10,0x22,0x44,0x43,0x44,0x33,0x43,0x22,0x13,0x21,0x22,0x20,
+0x09,0x88,0xB9,0xC8,0xBB,0xAB,0xAB,0xA9,0xA9,0x9B,0x9B,0x99,0x90,0x90,0x00,0x81,
+0x00,0x08,0x09,0x8A,0x9A,0xAA,0xA9,0xA9,0x99,0x90,0x80,0x01,0x80,0x00,0x09,0x31,
+0x32,0x44,0x33,0x43,0x34,0x33,0x24,0x22,0x23,0x12,0x10,0x09,0x9B,0xAB,0xCA,0xCC,
+0xBB,0xCB,0xDA,0xCA,0xAB,0xCA,0xAB,0xA9,0xA8,0x92,0x12,0x43,0x53,0x35,0x23,0x33,
+0x43,0x43,0x52,0x22,0x22,0x21,0x01,0x09,0x89,0xA9,0xBB,0xBD,0xBC,0xCB,0xDA,0xAB,
+0xAB,0xAB,0xAA,0xA9,0x99,0xA8,0x09,0x01,0x11,0x34,0x25,0x23,0x33,0x51,0x22,0x31,
+0x12,0x20,0x21,0x12,0x10,0x80,0x99,0x9A,0x99,0x99,0x88,0x08,0x00,0x88,0xA9,0x99,
+0x99,0x80,0x80,0x10,0x01,0x00,0x9A,0xAA,0xBB,0xBA,0xBA,0xA9,0x99,0x99,0x89,0x99,
+0x99,0x00,0x01,0x33,0x35,0x24,0x23,0x34,0x23,0x33,0x34,0x33,0x43,0x32,0x21,0x88,
+0xAB,0xBD,0xBB,0xDB,0xAB,0xBA,0xBB,0xDA,0xBB,0xCB,0xBB,0xBC,0xA8,0x90,0x01,0x12,
+0x23,0x43,0x53,0x34,0x34,0x39,0x80,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x08,0x00,
+
+/* Source: 20RIM.ROM */
+/* Length: 128 / 0x00000080 */
+
+0x0F,0xFF,0x73,0x8E,0x71,0xCD,0x00,0x49,0x10,0x90,0x21,0x49,0xA0,0xDB,0x02,0x3A,
+0xE3,0x0A,0x50,0x98,0xC0,0x59,0xA2,0x99,0x09,0x22,0xA2,0x80,0x10,0xA8,0x5B,0xD2,
+0x88,0x21,0x09,0x96,0xA8,0x10,0x0A,0xE0,0x08,0x48,0x19,0xAB,0x52,0xA8,0x92,0x0C,
+0x03,0x19,0xE2,0x0A,0x12,0xC2,0x81,0x1E,0x01,0xD0,0x48,0x88,0x98,0x01,0x49,0x91,
+0xAA,0x2C,0x25,0x89,0x88,0xB5,0x81,0xA2,0x9A,0x12,0x9E,0x38,0x3B,0x81,0x9B,0x59,
+0x01,0x93,0xCA,0x4A,0x21,0xA0,0x3D,0x0A,0x39,0x3D,0x12,0xA8,0x3F,0x18,0x01,0x92,
+0x1C,0x00,0xB2,0x48,0xB9,0x94,0xA3,0x19,0x4F,0x19,0xB2,0x32,0x90,0xBA,0x01,0xE6,
+0x91,0x80,0xC1,0xA4,0x2A,0x08,0xA1,0xB1,0x25,0xD2,0x88,0x99,0x21,0x80,0x88,0x80,
+};
+
+
+
+/* flag enable control 0x110 */
+INLINE void YM2608IRQFlagWrite(FM_OPN *OPN, YM2608 *F2608, int v)
+{
+	if( v & 0x80 )
+	{	/* Reset IRQ flag */
+		FM_STATUS_RESET(&OPN->ST, 0xf7); /* don't touch BUFRDY flag otherwise we'd have to call ymdeltat module to set the flag back */
+	}
+	else
+	{	/* Set status flag mask */
+		F2608->flagmask = (~(v&0x1f));
+		FM_IRQMASK_SET(&OPN->ST, (F2608->irqmask & F2608->flagmask) );
+	}
+}
+
+/* compatible mode & IRQ enable control 0x29 */
+INLINE void YM2608IRQMaskWrite(FM_OPN *OPN, YM2608 *F2608, int v)
+{
+	/* SCH,xx,xxx,EN_ZERO,EN_BRDY,EN_EOS,EN_TB,EN_TA */
+
+	/* extend 3ch. enable/disable */
+	if(v&0x80)
+		OPN->type |= TYPE_6CH;	/* OPNA mode - 6 FM channels */
+	else
+		OPN->type &= ~TYPE_6CH;	/* OPN mode - 3 FM channels */
+
+	/* IRQ MASK store and set */
+	F2608->irqmask = v&0x1f;
+	FM_IRQMASK_SET(&OPN->ST, (F2608->irqmask & F2608->flagmask) );
+}
+
+/* Generate samples for one of the YM2608s */
+void ym2608_update_one(void *chip, FMSAMPLE **buffer, int length)
+{
+	YM2608 *F2608 = (YM2608 *)chip;
+	FM_OPN *OPN = &F2608->OPN;
+	YM_DELTAT *DELTAT = &F2608->deltaT;
+	int i,j;
+	FMSAMPLE *bufL,*bufR;
+	FM_CH	*cch6;
+	INT32 *out_fm = OPN->out_fm;
+
+	/* set bufer */
+	bufL = buffer0;
+	bufR = buffer1;
+
+	cch0 = &F2608->CH0;
+	cch1 = &F2608->CH1;
+	cch2 = &F2608->CH2;
+	cch3 = &F2608->CH3;
+	cch4 = &F2608->CH4;
+	cch5 = &F2608->CH5;
+
+	/* refresh PG and EG */
+	refresh_fc_eg_chan( OPN, cch0 );
+	refresh_fc_eg_chan( OPN, cch1 );
+	if( (OPN->ST.mode & 0xc0) )
+	{
+		/* 3SLOT MODE */
+		if( cch2->SLOTSLOT1.Incr==-1)
+		{
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT1 , OPN->SL3.fc1 , OPN->SL3.kcode1 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT2 , OPN->SL3.fc2 , OPN->SL3.kcode2 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT3 , OPN->SL3.fc0 , OPN->SL3.kcode0 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT4 , cch2->fc , cch2->kcode );
+		}
+	}
+	else
+		refresh_fc_eg_chan( OPN, cch2 );
+	refresh_fc_eg_chan( OPN, cch3 );
+	refresh_fc_eg_chan( OPN, cch4 );
+	refresh_fc_eg_chan( OPN, cch5 );
+
+
+	/* buffering */
+	for(i=0; i < length ; i++)
+	{
+
+		advance_lfo(OPN);
+
+		/* clear output acc. */
+		OPN->out_adpcmOUTD_LEFT = OPN->out_adpcmOUTD_RIGHT = OPN->out_adpcmOUTD_CENTER = 0;
+		OPN->out_deltaOUTD_LEFT = OPN->out_deltaOUTD_RIGHT = OPN->out_deltaOUTD_CENTER = 0;
+		/* clear outputs */
+		out_fm0 = 0;
+		out_fm1 = 0;
+		out_fm2 = 0;
+		out_fm3 = 0;
+		out_fm4 = 0;
+		out_fm5 = 0;
+
+		/* calculate FM */
+		chan_calc(OPN, cch0, 0 );
+		chan_calc(OPN, cch1, 1 );
+		chan_calc(OPN, cch2, 2 );
+		chan_calc(OPN, cch3, 3 );
+		chan_calc(OPN, cch4, 4 );
+		chan_calc(OPN, cch5, 5 );
+
+		/* deltaT ADPCM */
+		if( DELTAT->portstate&0x80 && ! F2608->MuteDeltaT )
+			YM_DELTAT_ADPCM_CALC(DELTAT);
+
+		/* ADPCMA */
+		for( j = 0; j < 6; j++ )
+		{
+			if( F2608->adpcmj.flag )
+				ADPCMA_calc_chan( F2608, &F2608->adpcmj);
+		}
+
+		/* advance envelope generator */
+		OPN->eg_timer += OPN->eg_timer_add;
+		while (OPN->eg_timer >= OPN->eg_timer_overflow)
+		{
+			OPN->eg_timer -= OPN->eg_timer_overflow;
+			OPN->eg_cnt++;
+
+			advance_eg_channel(OPN, &cch0->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch1->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch2->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch3->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch4->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch5->SLOTSLOT1);
+		}
+
+		/* buffering */
+		{
+			int lt,rt;
+
+			/*lt = OPN->out_adpcmOUTD_LEFT + OPN->out_adpcmOUTD_CENTER;
+			rt = OPN->out_adpcmOUTD_RIGHT + OPN->out_adpcmOUTD_CENTER;
+			lt += (OPN->out_deltaOUTD_LEFT + OPN->out_deltaOUTD_CENTER)>>9;
+			rt += (OPN->out_deltaOUTD_RIGHT + OPN->out_deltaOUTD_CENTER)>>9;
+			lt += ((out_fm0>>1) & OPN->pan0);	// shift right verified on real YM2608
+			rt += ((out_fm0>>1) & OPN->pan1);
+			lt += ((out_fm1>>1) & OPN->pan2);
+			rt += ((out_fm1>>1) & OPN->pan3);
+			lt += ((out_fm2>>1) & OPN->pan4);
+			rt += ((out_fm2>>1) & OPN->pan5);
+			lt += ((out_fm3>>1) & OPN->pan6);
+			rt += ((out_fm3>>1) & OPN->pan7);
+			lt += ((out_fm4>>1) & OPN->pan8);
+			rt += ((out_fm4>>1) & OPN->pan9);
+			lt += ((out_fm5>>1) & OPN->pan10);
+			rt += ((out_fm5>>1) & OPN->pan11);*/
+			// this way it's louder (and more accurate)
+			lt = (OPN->out_adpcmOUTD_LEFT + OPN->out_adpcmOUTD_CENTER) << 1;
+			rt = (OPN->out_adpcmOUTD_RIGHT + OPN->out_adpcmOUTD_CENTER) << 1;
+			lt += (OPN->out_deltaOUTD_LEFT + OPN->out_deltaOUTD_CENTER)>>8;
+			rt += (OPN->out_deltaOUTD_RIGHT + OPN->out_deltaOUTD_CENTER)>>8;
+			lt += (out_fm0 & OPN->pan0);
+			rt += (out_fm0 & OPN->pan1);
+			lt += (out_fm1 & OPN->pan2);
+			rt += (out_fm1 & OPN->pan3);
+			lt += (out_fm2 & OPN->pan4);
+			rt += (out_fm2 & OPN->pan5);
+			lt += (out_fm3 & OPN->pan6);
+			rt += (out_fm3 & OPN->pan7);
+			lt += (out_fm4 & OPN->pan8);
+			rt += (out_fm4 & OPN->pan9);
+			lt += (out_fm5 & OPN->pan10);
+			rt += (out_fm5 & OPN->pan11);
+
+			lt >>= FINAL_SH;
+			rt >>= FINAL_SH;
+
+			//Limit( lt, MAXOUT, MINOUT );
+			//Limit( rt, MAXOUT, MINOUT );
+			/* buffering */
+			bufLi = lt;
+			bufRi = rt;
+
+			#ifdef SAVE_SAMPLE
+				SAVE_ALL_CHANNELS
+			#endif
+
+		}
+
+		/* timer A control */
+		INTERNAL_TIMER_A( &OPN->ST , cch2 )
+	}
+	INTERNAL_TIMER_B(&OPN->ST,length)
+
+
+	/* check IRQ for DELTA-T EOS */
+	FM_STATUS_SET(&OPN->ST, 0);
+
+}
+
+#ifdef __STATE_H__
+void ym2608_postload(void *chip)
+{
+	if (chip)
+	{
+		YM2608 *F2608 = (YM2608 *)chip;
+		int r;
+
+		/* prescaler */
+		OPNPrescaler_w(&F2608->OPN,1,2);
+		F2608->deltaT.freqbase = F2608->OPN.ST.freqbase;
+		/* IRQ mask / mode */
+		YM2608IRQMaskWrite(&F2608->OPN, F2608, F2608->REGS0x29);
+		/* SSG registers */
+		for(r=0;r<16;r++)
+		{
+			(*F2608->OPN.ST.SSG->write)(F2608->OPN.ST.param,0,r);
+			(*F2608->OPN.ST.SSG->write)(F2608->OPN.ST.param,1,F2608->REGSr);
+		}
+
+		/* OPN registers */
+		/* DT / MULTI , TL , KS / AR , AMON / DR , SR , SL / RR , SSG-EG */
+		for(r=0x30;r<0x9e;r++)
+			if((r&3) != 3)
+			{
+				OPNWriteReg(&F2608->OPN,r,F2608->REGSr);
+				OPNWriteReg(&F2608->OPN,r|0x100,F2608->REGSr|0x100);
+			}
+		/* FB / CONNECT , L / R / AMS / PMS */
+		for(r=0xb0;r<0xb6;r++)
+			if((r&3) != 3)
+			{
+				OPNWriteReg(&F2608->OPN,r,F2608->REGSr);
+				OPNWriteReg(&F2608->OPN,r|0x100,F2608->REGSr|0x100);
+			}
+		/* FM channels */
+		/*FM_channel_postload(F2608->CH,6);*/
+		/* rhythm(ADPCMA) */
+		FM_ADPCMAWrite(F2608,1,F2608->REGS0x111);
+		for( r=0x08 ; r<0x0c ; r++)
+			FM_ADPCMAWrite(F2608,r,F2608->REGSr+0x110);
+		/* Delta-T ADPCM unit */
+		YM_DELTAT_postload(&F2608->deltaT , &F2608->REGS0x100 );
+	}
+}
+
+static void YM2608_save_state(YM2608 *F2608, const device_config *device)
+{
+	state_save_register_device_item_array(device, 0, F2608->REGS);
+	FMsave_state_st(device,&F2608->OPN.ST);
+	FMsave_state_channel(device,F2608->CH,6);
+	/* 3slots */
+	state_save_register_device_item_array(device, 0, F2608->OPN.SL3.fc);
+	state_save_register_device_item(device, 0, F2608->OPN.SL3.fn_h);
+	state_save_register_device_item_array(device, 0, F2608->OPN.SL3.kcode);
+	/* address register1 */
+	state_save_register_device_item(device, 0, F2608->addr_A1);
+	/* rythm(ADPCMA) */
+	FMsave_state_adpcma(device,F2608->adpcm);
+	/* Delta-T ADPCM unit */
+	YM_DELTAT_savestate(device,&F2608->deltaT);
+}
+#endif /* _STATE_H */
+
+static void YM2608_deltat_status_set(void *chip, UINT8 changebits)
+{
+	YM2608 *F2608 = (YM2608 *)chip;
+	FM_STATUS_SET(&(F2608->OPN.ST), changebits);
+}
+static void YM2608_deltat_status_reset(void *chip, UINT8 changebits)
+{
+	YM2608 *F2608 = (YM2608 *)chip;
+	FM_STATUS_RESET(&(F2608->OPN.ST), changebits);
+}
+/* YM2608(OPNA) */
+//void * ym2608_init(void *param, const device_config *device, int clock, int rate,
+// void *pcmrom,int pcmsize,
+// FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
+void * ym2608_init(void *param, int clock, int rate,
+ FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
+{
+	YM2608 *F2608;
+
+	/* allocate extend state space */
+	if( (F2608 = (YM2608 *)malloc(sizeof(YM2608)))==NULL)
+		return NULL;
+	/* clear */
+	memset(F2608,0,sizeof(YM2608));
+	/* allocate total level table (128kb space) */
+	if( !init_tables() )
+	{
+		free( F2608 );
+		return NULL;
+	}
+
+	F2608->OPN.ST.param = param;
+	F2608->OPN.type = TYPE_YM2608;
+	F2608->OPN.P_CH = F2608->CH;
+	//F2608->OPN.ST.device = device;
+	F2608->OPN.ST.clock = clock;
+	F2608->OPN.ST.rate = rate;
+
+	/* External handlers */
+	F2608->OPN.ST.timer_handler = timer_handler;
+	F2608->OPN.ST.IRQ_Handler = IRQHandler;
+	F2608->OPN.ST.SSG = ssg;
+
+	/* DELTA-T */
+	//F2608->deltaT.memory = (UINT8 *)pcmrom;
+	//F2608->deltaT.memory_size = pcmsize;
+	F2608->deltaT.memory = NULL;
+	F2608->deltaT.memory_size = 0x00;
+	F2608->deltaT.memory_mask = 0x00;
+
+	/*F2608->deltaT.write_time = 20.0 / clock;*/	/* a single byte write takes 20 cycles of main clock */
+	/*F2608->deltaT.read_time = 18.0 / clock;*/	/* a single byte read takes 18 cycles of main clock */
+
+	F2608->deltaT.status_set_handler = YM2608_deltat_status_set;
+	F2608->deltaT.status_reset_handler = YM2608_deltat_status_reset;
+	F2608->deltaT.status_change_which_chip = F2608;
+	F2608->deltaT.status_change_EOS_bit = 0x04;	/* status flag: set bit2 on End Of Sample */
+	F2608->deltaT.status_change_BRDY_bit = 0x08;	/* status flag: set bit3 on BRDY */
+	F2608->deltaT.status_change_ZERO_bit = 0x10;	/* status flag: set bit4 if silence continues for more than 290 miliseconds while recording the ADPCM */
+
+	/* ADPCM Rhythm */
+	F2608->pcmbuf = (UINT8*)YM2608_ADPCM_ROM;
+	F2608->pcm_size = 0x2000;
+
+	Init_ADPCMATable();
+
+#ifdef __STATE_H__
+	YM2608_save_state(F2608, device);
+#endif
+	return F2608;
+}
+
+/* shut down emulator */
+void ym2608_shutdown(void *chip)
+{
+	YM2608 *F2608 = (YM2608 *)chip;
+
+	free(F2608->deltaT.memory);	F2608->deltaT.memory = NULL;
+
+	FMCloseTable();
+	free(F2608);
+}
+
+/* reset one of chips */
+void ym2608_reset_chip(void *chip)
+{
+	int i;
+	YM2608 *F2608 = (YM2608 *)chip;
+	FM_OPN *OPN = &F2608->OPN;
+	YM_DELTAT *DELTAT = &F2608->deltaT;
+
+	/* Reset Prescaler */
+	OPNPrescaler_w(OPN , 0 , 2);
+	F2608->deltaT.freqbase = OPN->ST.freqbase;
+	/* reset SSG section */
+	(*OPN->ST.SSG->reset)(OPN->ST.param);
+
+	/* status clear */
+	FM_BUSY_CLEAR(&OPN->ST);
+
+	/* register 0x29 - default value after reset is:
+ enable only 3 FM channels and enable all the status flags */
+	YM2608IRQMaskWrite(OPN, F2608, 0x1f );	/* default value for D4-D0 is 1 */
+
+	/* register 0x10, A1=1 - default value is 1 for D4, D3, D2, 0 for the rest */
+	YM2608IRQFlagWrite(OPN, F2608, 0x1c );	/* default: enable timer A and B, disable EOS, BRDY and ZERO */
+
+	OPNWriteMode(OPN,0x27,0x30);	/* mode 0 , timer reset */
+
+	OPN->eg_timer = 0;
+	OPN->eg_cnt = 0;
+
+	FM_STATUS_RESET(&OPN->ST, 0xff);
+
+	reset_channels( &OPN->ST , F2608->CH , 6 );
+	/* reset OPerator paramater */
+	for(i = 0xb6 ; i >= 0xb4 ; i-- )
+	{
+		OPNWriteReg(OPN,i ,0xc0);
+		OPNWriteReg(OPN,i|0x100,0xc0);
+	}
+	for(i = 0xb2 ; i >= 0x30 ; i-- )
+	{
+		OPNWriteReg(OPN,i ,0);
+		OPNWriteReg(OPN,i|0x100,0);
+	}
+	for(i = 0x26 ; i >= 0x20 ; i-- ) OPNWriteReg(OPN,i,0);
+
+	/* ADPCM - percussion sounds */
+	for( i = 0; i < 6; i++ )
+	{
+		if (i<=3)	/* channels 0,1,2,3 */
+			F2608->adpcmi.step = (UINT32)((float)(1<<ADPCM_SHIFT)*((float)F2608->OPN.ST.freqbase)/3.0);
+		else		/* channels 4 and 5 work with slower clock */
+			F2608->adpcmi.step = (UINT32)((float)(1<<ADPCM_SHIFT)*((float)F2608->OPN.ST.freqbase)/6.0);
+
+		F2608->adpcmi.start = YM2608_ADPCM_ROM_addri*2;
+		F2608->adpcmi.end = YM2608_ADPCM_ROM_addri*2+1;
+
+		F2608->adpcmi.now_addr = 0;
+		F2608->adpcmi.now_step = 0;
+		/* F2608->adpcmi.delta = 21866; */
+		F2608->adpcmi.vol_mul = 0;
+		F2608->adpcmi.pan = &OPN->out_adpcmOUTD_CENTER; /* default center */
+		F2608->adpcmi.flagMask = 0;
+		F2608->adpcmi.flag = 0;
+		F2608->adpcmi.adpcm_acc = 0;
+		F2608->adpcmi.adpcm_step= 0;
+		F2608->adpcmi.adpcm_out = 0;
+	}
+	F2608->adpcmTL = 0x3f;
+
+	F2608->adpcm_arrivedEndAddress = 0; /* not used */
+
+	/* DELTA-T unit */
+	DELTAT->freqbase = OPN->ST.freqbase;
+	DELTAT->output_pointer = OPN->out_delta;
+	DELTAT->portshift = 5;		/* always 5bits shift */ /* ASG */
+	DELTAT->output_range = 1<<23;
+	YM_DELTAT_ADPCM_Reset(DELTAT,OUTD_CENTER,YM_DELTAT_EMULATION_MODE_NORMAL);
+}
+
+/* YM2608 write */
+/* n = number */
+/* a = address */
+/* v = value */
+int ym2608_write(void *chip, int a,UINT8 v)
+{
+	YM2608 *F2608 = (YM2608 *)chip;
+	FM_OPN *OPN = &F2608->OPN;
+	int addr;
+
+	v &= 0xff;	/*adjust to 8 bit bus */
+
+
+	switch(a&3)
+	{
+	case 0:	/* address port 0 */
+		OPN->ST.address = v;
+		F2608->addr_A1 = 0;
+
+		/* Write register to SSG emulator */
+		if( v < 16 ) (*OPN->ST.SSG->write)(OPN->ST.param,0,v);
+		/* prescaler selecter : 2d,2e,2f */
+		if( v >= 0x2d && v <= 0x2f )
+		{
+			OPNPrescaler_w(OPN , v , 2);
+			//TODO: set ADPCMc.step
+			F2608->deltaT.freqbase = OPN->ST.freqbase;
+		}
+		break;
+
+	case 1:	/* data port 0 */
+		if (F2608->addr_A1 != 0)
+			break;	/* verified on real YM2608 */
+
+		addr = OPN->ST.address;
+		F2608->REGSaddr = v;
+		switch(addr & 0xf0)
+		{
+		case 0x00:	/* SSG section */
+			/* Write data to SSG emulator */
+			(*OPN->ST.SSG->write)(OPN->ST.param,a,v);
+			break;
+		case 0x10:	/* 0x10-0x1f : Rhythm section */
+			ym2608_update_req(OPN->ST.param);
+			FM_ADPCMAWrite(F2608,addr-0x10,v);
+			break;
+		case 0x20:	/* Mode Register */
+			switch(addr)
+			{
+			case 0x29:	/* SCH,xx,xxx,EN_ZERO,EN_BRDY,EN_EOS,EN_TB,EN_TA */
+				YM2608IRQMaskWrite(OPN, F2608, v);
+				break;
+			default:
+				ym2608_update_req(OPN->ST.param);
+				OPNWriteMode(OPN,addr,v);
+			}
+			break;
+		default:	/* OPN section */
+			ym2608_update_req(OPN->ST.param);
+			OPNWriteReg(OPN,addr,v);
+		}
+		break;
+
+	case 2:	/* address port 1 */
+		OPN->ST.address = v;
+		F2608->addr_A1 = 1;
+		break;
+
+	case 3:	/* data port 1 */
+		if (F2608->addr_A1 != 1)
+			break;	/* verified on real YM2608 */
+
+		addr = OPN->ST.address;
+		F2608->REGSaddr | 0x100 = v;
+		ym2608_update_req(OPN->ST.param);
+		switch( addr & 0xf0 )
+		{
+		case 0x00:	/* DELTAT PORT */
+			switch( addr )
+			{
+			case 0x0e:	/* DAC data */
+#ifdef _DEBUG
+				logerror("YM2608: write to DAC data (unimplemented) value=%02x\n",v);
+#endif
+				break;
+			default:
+				/* 0x00-0x0d */
+				YM_DELTAT_ADPCM_Write(&F2608->deltaT,addr,v);
+			}
+			break;
+		case 0x10:	/* IRQ Flag control */
+			if( addr == 0x10 )
+			{
+				YM2608IRQFlagWrite(OPN, F2608, v);
+			}
+			break;
+		default:
+			OPNWriteReg(OPN,addr | 0x100,v);
+		}
+	}
+	return OPN->ST.irq;
+}
+
+UINT8 ym2608_read(void *chip,int a)
+{
+	YM2608 *F2608 = (YM2608 *)chip;
+	int addr = F2608->OPN.ST.address;
+	UINT8 ret = 0;
+
+	switch( a&3 )
+	{
+	case 0:	/* status 0 : YM2203 compatible */
+		/* BUSY:x:x:x:x:x:FLAGB:FLAGA */
+		ret = FM_STATUS_FLAG(&F2608->OPN.ST) & 0x83;
+		break;
+
+	case 1:	/* status 0, ID */
+		if( addr < 16 ) ret = (*F2608->OPN.ST.SSG->read)(F2608->OPN.ST.param);
+		else if(addr == 0xff) ret = 0x01; /* ID code */
+		break;
+
+	case 2:	/* status 1 : status 0 + ADPCM status */
+		/* BUSY : x : PCMBUSY : ZERO : BRDY : EOS : FLAGB : FLAGA */
+		ret = (FM_STATUS_FLAG(&F2608->OPN.ST) & (F2608->flagmask|0x80)) | ((F2608->deltaT.PCM_BSY & 1)<<5) ;
+		break;
+
+	case 3:
+		if(addr == 0x08)
+		{
+			ret = YM_DELTAT_ADPCM_Read(&F2608->deltaT);
+		}
+		else
+		{
+			if(addr == 0x0f)
+			{
+#ifdef _DEBUG
+				logerror("YM2608 A/D convertion is accessed but not implemented !\n");
+#endif
+				ret = 0x80; /* 2's complement PCM data - result from A/D convertion */
+			}
+		}
+		break;
+	}
+	return ret;
+}
+
+int ym2608_timer_over(void *chip,int c)
+{
+	YM2608 *F2608 = (YM2608 *)chip;
+
+ switch(c)
+	{
+#if 0
+	case 2:
+		{	/* BUFRDY flag */
+			YM_DELTAT_BRDY_callback( &F2608->deltaT );
+		}
+		break;
+#endif
+	case 1:
+		{	/* Timer B */
+			TimerBOver( &(F2608->OPN.ST) );
+		}
+		break;
+	case 0:
+		{	/* Timer A */
+			ym2608_update_req(F2608->OPN.ST.param);
+			/* timer update */
+			TimerAOver( &(F2608->OPN.ST) );
+			/* CSM mode key,TL controll */
+			if( F2608->OPN.ST.mode & 0x80 )
+			{	/* CSM mode total level latch and auto key on */
+				CSMKeyControll( F2608->OPN.type, &(F2608->CH2) );
+			}
+		}
+		break;
+	default:
+		break;
+ }
+
+	return F2608->OPN.ST.irq;
+}
+
+void ym2608_write_pcmrom(void *chip, UINT8 rom_id, offs_t ROMSize, offs_t DataStart,
+						 offs_t DataLength, const UINT8* ROMData)
+{
+	YM2608 *F2608 = (YM2608 *)chip;
+	
+	switch(rom_id)
+	{
+	case 0x01:	// ADPCM
+		// unused, it's constant
+		break;
+	case 0x02:	// DELTA-T
+		if (F2608->deltaT.memory_size != ROMSize)
+		{
+			F2608->deltaT.memory = (UINT8*)realloc(F2608->deltaT.memory, ROMSize);
+			F2608->deltaT.memory_size = ROMSize;
+			memset(F2608->deltaT.memory, 0xFF, ROMSize);
+			YM_DELTAT_calc_mem_mask(&F2608->deltaT);
+		}
+		if (DataStart > ROMSize)
+			return;
+		if (DataStart + DataLength > ROMSize)
+			DataLength = ROMSize - DataStart;
+		
+		memcpy(F2608->deltaT.memory + DataStart, ROMData, DataLength);
+		break;
+	}
+	
+	return;
+}
+
+void ym2608_set_mutemask(void *chip, UINT32 MuteMask)
+{
+	YM2608 *F2608 = (YM2608 *)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		F2608->CHCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		F2608->adpcmCurChn.Muted = (MuteMask >> (CurChn + 6)) & 0x01;
+	F2608->MuteDeltaT = (MuteMask >> 12) & 0x01;
+	
+	return;
+}
+#endif /* BUILD_YM2608 */
+
+
+
+#if (BUILD_YM2610||BUILD_YM2610B)
+/* YM2610(OPNB) */
+
+/* Generate samples for one of the YM2610s */
+void ym2610_update_one(void *chip, FMSAMPLE **buffer, int length)
+{
+	YM2610 *F2610 = (YM2610 *)chip;
+	FM_OPN *OPN = &F2610->OPN;
+	YM_DELTAT *DELTAT = &F2610->deltaT;
+	int i,j;
+	FMSAMPLE *bufL,*bufR;
+	FM_CH	*cch4;
+	INT32 *out_fm = OPN->out_fm;
+
+	/* buffer setup */
+	bufL = buffer0;
+	bufR = buffer1;
+
+	cch0 = &F2610->CH1;
+	cch1 = &F2610->CH2;
+	cch2 = &F2610->CH4;
+	cch3 = &F2610->CH5;
+
+#ifdef YM2610B_WARNING
+#define FM_KEY_IS(SLOT) ((SLOT)->key)
+#define FM_MSG_YM2610B "YM2610-%p.CH%d is playing,Check whether the type of the chip is YM2610B\n"
+	/* Check YM2610B warning message */
+	if( FM_KEY_IS(&F2610->CH0.SLOT3) )
+	{
+#ifdef _DEBUG
+		LOG(LOG_WAR,(FM_MSG_YM2610B,F2610->OPN.ST.param,0));
+#endif
+		FM_KEY_IS(&F2610->CH0.SLOT3) = 0;
+	}
+	if( FM_KEY_IS(&F2610->CH3.SLOT3) )
+	{
+#ifdef _DEBUG
+		LOG(LOG_WAR,(FM_MSG_YM2610B,F2610->OPN.ST.param,3));
+#endif
+		FM_KEY_IS(&F2610->CH3.SLOT3) = 0;
+	}
+#endif
+
+	/* refresh PG and EG */
+	refresh_fc_eg_chan( OPN, cch0 );
+	if( (OPN->ST.mode & 0xc0) )
+	{
+		/* 3SLOT MODE */
+		if( cch1->SLOTSLOT1.Incr==-1)
+		{
+			refresh_fc_eg_slot(OPN, &cch1->SLOTSLOT1 , OPN->SL3.fc1 , OPN->SL3.kcode1 );
+			refresh_fc_eg_slot(OPN, &cch1->SLOTSLOT2 , OPN->SL3.fc2 , OPN->SL3.kcode2 );
+			refresh_fc_eg_slot(OPN, &cch1->SLOTSLOT3 , OPN->SL3.fc0 , OPN->SL3.kcode0 );
+			refresh_fc_eg_slot(OPN, &cch1->SLOTSLOT4 , cch1->fc , cch1->kcode );
+		}
+	}
+	else
+		refresh_fc_eg_chan( OPN, cch1 );
+	refresh_fc_eg_chan( OPN, cch2 );
+	refresh_fc_eg_chan( OPN, cch3 );
+
+	/* buffering */
+	for(i=0; i < length ; i++)
+	{
+
+		advance_lfo(OPN);
+
+		/* clear output acc. */
+		OPN->out_adpcmOUTD_LEFT = OPN->out_adpcmOUTD_RIGHT = OPN->out_adpcmOUTD_CENTER = 0;
+		OPN->out_deltaOUTD_LEFT = OPN->out_deltaOUTD_RIGHT = OPN->out_deltaOUTD_CENTER = 0;
+		/* clear outputs */
+		out_fm1 = 0;
+		out_fm2 = 0;
+		out_fm4 = 0;
+		out_fm5 = 0;
+
+		/* advance envelope generator */
+		OPN->eg_timer += OPN->eg_timer_add;
+		while (OPN->eg_timer >= OPN->eg_timer_overflow)
+		{
+			OPN->eg_timer -= OPN->eg_timer_overflow;
+			OPN->eg_cnt++;
+
+			advance_eg_channel(OPN, &cch0->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch1->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch2->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch3->SLOTSLOT1);
+		}
+
+		/* calculate FM */
+		chan_calc(OPN, cch0, 1 );	/*remapped to 1*/
+		chan_calc(OPN, cch1, 2 );	/*remapped to 2*/
+		chan_calc(OPN, cch2, 4 );	/*remapped to 4*/
+		chan_calc(OPN, cch3, 5 );	/*remapped to 5*/
+
+		/* deltaT ADPCM */
+		if( DELTAT->portstate&0x80 && ! F2610->MuteDeltaT )
+			YM_DELTAT_ADPCM_CALC(DELTAT);
+
+		/* ADPCMA */
+		for( j = 0; j < 6; j++ )
+		{
+			if( F2610->adpcmj.flag )
+				ADPCMA_calc_chan( F2610, &F2610->adpcmj);
+		}
+
+		/* buffering */
+		{
+			int lt,rt;
+
+			/*lt = OPN->out_adpcmOUTD_LEFT + OPN->out_adpcmOUTD_CENTER;
+			rt = OPN->out_adpcmOUTD_RIGHT + OPN->out_adpcmOUTD_CENTER;
+			lt += (OPN->out_deltaOUTD_LEFT + OPN->out_deltaOUTD_CENTER)>>9;
+			rt += (OPN->out_deltaOUTD_RIGHT + OPN->out_deltaOUTD_CENTER)>>9;
+
+
+			lt += ((out_fm1>>1) & OPN->pan2);	// the shift right was verified on real chip
+			rt += ((out_fm1>>1) & OPN->pan3);
+			lt += ((out_fm2>>1) & OPN->pan4);
+			rt += ((out_fm2>>1) & OPN->pan5);
+
+			lt += ((out_fm4>>1) & OPN->pan8);
+			rt += ((out_fm4>>1) & OPN->pan9);
+			lt += ((out_fm5>>1) & OPN->pan10);
+			rt += ((out_fm5>>1) & OPN->pan11);*/
+
+			lt = (OPN->out_adpcmOUTD_LEFT + OPN->out_adpcmOUTD_CENTER) << 1;
+			rt = (OPN->out_adpcmOUTD_RIGHT + OPN->out_adpcmOUTD_CENTER) << 1;
+			lt += (OPN->out_deltaOUTD_LEFT + OPN->out_deltaOUTD_CENTER)>>8;
+			rt += (OPN->out_deltaOUTD_RIGHT + OPN->out_deltaOUTD_CENTER)>>8;
+
+
+			lt += (out_fm1 & OPN->pan2);
+			rt += (out_fm1 & OPN->pan3);
+			lt += (out_fm2 & OPN->pan4);
+			rt += (out_fm2 & OPN->pan5);
+
+			lt += (out_fm4 & OPN->pan8);
+			rt += (out_fm4 & OPN->pan9);
+			lt += (out_fm5 & OPN->pan10);
+			rt += (out_fm5 & OPN->pan11);
+
+
+			lt >>= FINAL_SH;
+			rt >>= FINAL_SH;
+
+			//Limit( lt, MAXOUT, MINOUT );
+			//Limit( rt, MAXOUT, MINOUT );
+
+			#ifdef SAVE_SAMPLE
+				SAVE_ALL_CHANNELS
+			#endif
+
+			/* buffering */
+			bufLi = lt;
+			bufRi = rt;
+		}
+
+		/* timer A control */
+		INTERNAL_TIMER_A( &OPN->ST , cch1 )
+	}
+	INTERNAL_TIMER_B(&OPN->ST,length)
+
+}
+
+#if BUILD_YM2610B
+/* Generate samples for one of the YM2610Bs */
+void ym2610b_update_one(void *chip, FMSAMPLE **buffer, int length)
+{
+	YM2610 *F2610 = (YM2610 *)chip;
+	FM_OPN *OPN = &F2610->OPN;
+	YM_DELTAT *DELTAT = &F2610->deltaT;
+	int i,j;
+	FMSAMPLE *bufL,*bufR;
+	FM_CH	*cch6;
+	INT32 *out_fm = OPN->out_fm;
+
+	/* buffer setup */
+	bufL = buffer0;
+	bufR = buffer1;
+
+	cch0 = &F2610->CH0;
+	cch1 = &F2610->CH1;
+	cch2 = &F2610->CH2;
+	cch3 = &F2610->CH3;
+	cch4 = &F2610->CH4;
+	cch5 = &F2610->CH5;
+
+	/* refresh PG and EG */
+	refresh_fc_eg_chan( OPN, cch0 );
+	refresh_fc_eg_chan( OPN, cch1 );
+	if( (OPN->ST.mode & 0xc0) )
+	{
+		/* 3SLOT MODE */
+		if( cch2->SLOTSLOT1.Incr==-1)
+		{
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT1 , OPN->SL3.fc1 , OPN->SL3.kcode1 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT2 , OPN->SL3.fc2 , OPN->SL3.kcode2 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT3 , OPN->SL3.fc0 , OPN->SL3.kcode0 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT4 , cch2->fc , cch2->kcode );
+		}
+	}
+	else
+		refresh_fc_eg_chan( OPN, cch2 );
+	refresh_fc_eg_chan( OPN, cch3 );
+	refresh_fc_eg_chan( OPN, cch4 );
+	refresh_fc_eg_chan( OPN, cch5 );
+
+	/* buffering */
+	for(i=0; i < length ; i++)
+	{
+
+		advance_lfo(OPN);
+
+		/* clear output acc. */
+		OPN->out_adpcmOUTD_LEFT = OPN->out_adpcmOUTD_RIGHT = OPN->out_adpcmOUTD_CENTER = 0;
+		OPN->out_deltaOUTD_LEFT = OPN->out_deltaOUTD_RIGHT = OPN->out_deltaOUTD_CENTER = 0;
+		/* clear outputs */
+		out_fm0 = 0;
+		out_fm1 = 0;
+		out_fm2 = 0;
+		out_fm3 = 0;
+		out_fm4 = 0;
+		out_fm5 = 0;
+
+		/* advance envelope generator */
+		OPN->eg_timer += OPN->eg_timer_add;
+		while (OPN->eg_timer >= OPN->eg_timer_overflow)
+		{
+			OPN->eg_timer -= OPN->eg_timer_overflow;
+			OPN->eg_cnt++;
+
+			advance_eg_channel(OPN, &cch0->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch1->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch2->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch3->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch4->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch5->SLOTSLOT1);
+		}
+
+		/* calculate FM */
+		chan_calc(OPN, cch0, 0 );
+		chan_calc(OPN, cch1, 1 );
+		chan_calc(OPN, cch2, 2 );
+		chan_calc(OPN, cch3, 3 );
+		chan_calc(OPN, cch4, 4 );
+		chan_calc(OPN, cch5, 5 );
+
+		/* deltaT ADPCM */
+		if( DELTAT->portstate&0x80 && ! F2610->MuteDeltaT )
+			YM_DELTAT_ADPCM_CALC(DELTAT);
+
+		/* ADPCMA */
+		for( j = 0; j < 6; j++ )
+		{
+			if( F2610->adpcmj.flag )
+				ADPCMA_calc_chan( F2610, &F2610->adpcmj);
+		}
+
+		/* buffering */
+		{
+			int lt,rt;
+
+			/*lt = OPN->out_adpcmOUTD_LEFT + OPN->out_adpcmOUTD_CENTER;
+			rt = OPN->out_adpcmOUTD_RIGHT + OPN->out_adpcmOUTD_CENTER;
+			lt += (OPN->out_deltaOUTD_LEFT + OPN->out_deltaOUTD_CENTER)>>9;
+			rt += (OPN->out_deltaOUTD_RIGHT + OPN->out_deltaOUTD_CENTER)>>9;
+
+			lt += ((out_fm0>>1) & OPN->pan0);	// the shift right is verified on YM2610
+			rt += ((out_fm0>>1) & OPN->pan1);
+			lt += ((out_fm1>>1) & OPN->pan2);
+			rt += ((out_fm1>>1) & OPN->pan3);
+			lt += ((out_fm2>>1) & OPN->pan4);
+			rt += ((out_fm2>>1) & OPN->pan5);
+			lt += ((out_fm3>>1) & OPN->pan6);
+			rt += ((out_fm3>>1) & OPN->pan7);
+			lt += ((out_fm4>>1) & OPN->pan8);
+			rt += ((out_fm4>>1) & OPN->pan9);
+			lt += ((out_fm5>>1) & OPN->pan10);
+			rt += ((out_fm5>>1) & OPN->pan11);*/
+			lt = (OPN->out_adpcmOUTD_LEFT + OPN->out_adpcmOUTD_CENTER) << 1;
+			rt = (OPN->out_adpcmOUTD_RIGHT + OPN->out_adpcmOUTD_CENTER) << 1;
+			lt += (OPN->out_deltaOUTD_LEFT + OPN->out_deltaOUTD_CENTER)>>8;
+			rt += (OPN->out_deltaOUTD_RIGHT + OPN->out_deltaOUTD_CENTER)>>8;
+
+			lt += (out_fm0 & OPN->pan0);
+			rt += (out_fm0 & OPN->pan1);
+			lt += (out_fm1 & OPN->pan2);
+			rt += (out_fm1 & OPN->pan3);
+			lt += (out_fm2 & OPN->pan4);
+			rt += (out_fm2 & OPN->pan5);
+			lt += (out_fm3 & OPN->pan6);
+			rt += (out_fm3 & OPN->pan7);
+			lt += (out_fm4 & OPN->pan8);
+			rt += (out_fm4 & OPN->pan9);
+			lt += (out_fm5 & OPN->pan10);
+			rt += (out_fm5 & OPN->pan11);
+
+
+			lt >>= FINAL_SH;
+			rt >>= FINAL_SH;
+
+			//Limit( lt, MAXOUT, MINOUT );
+			//Limit( rt, MAXOUT, MINOUT );
+
+			#ifdef SAVE_SAMPLE
+				SAVE_ALL_CHANNELS
+			#endif
+
+			/* buffering */
+			bufLi = lt;
+			bufRi = rt;
+		}
+
+		/* timer A control */
+		INTERNAL_TIMER_A( &OPN->ST , cch2 )
+	}
+	INTERNAL_TIMER_B(&OPN->ST,length)
+
+}
+#endif /* BUILD_YM2610B */
+
+
+#ifdef __STATE_H__
+void ym2610_postload(void *chip)
+{
+	if (chip)
+	{
+		YM2610 *F2610 = (YM2610 *)chip;
+		int r;
+
+		/* SSG registers */
+		for(r=0;r<16;r++)
+		{
+			(*F2610->OPN.ST.SSG->write)(F2610->OPN.ST.param,0,r);
+			(*F2610->OPN.ST.SSG->write)(F2610->OPN.ST.param,1,F2610->REGSr);
+		}
+
+		/* OPN registers */
+		/* DT / MULTI , TL , KS / AR , AMON / DR , SR , SL / RR , SSG-EG */
+		for(r=0x30;r<0x9e;r++)
+			if((r&3) != 3)
+			{
+				OPNWriteReg(&F2610->OPN,r,F2610->REGSr);
+				OPNWriteReg(&F2610->OPN,r|0x100,F2610->REGSr|0x100);
+			}
+		/* FB / CONNECT , L / R / AMS / PMS */
+		for(r=0xb0;r<0xb6;r++)
+			if((r&3) != 3)
+			{
+				OPNWriteReg(&F2610->OPN,r,F2610->REGSr);
+				OPNWriteReg(&F2610->OPN,r|0x100,F2610->REGSr|0x100);
+			}
+		/* FM channels */
+		/*FM_channel_postload(F2610->CH,6);*/
+
+		/* rhythm(ADPCMA) */
+		FM_ADPCMAWrite(F2610,1,F2610->REGS0x101);
+		for( r=0 ; r<6 ; r++)
+		{
+			FM_ADPCMAWrite(F2610,r+0x08,F2610->REGSr+0x108);
+			FM_ADPCMAWrite(F2610,r+0x10,F2610->REGSr+0x110);
+			FM_ADPCMAWrite(F2610,r+0x18,F2610->REGSr+0x118);
+			FM_ADPCMAWrite(F2610,r+0x20,F2610->REGSr+0x120);
+			FM_ADPCMAWrite(F2610,r+0x28,F2610->REGSr+0x128);
+		}
+		/* Delta-T ADPCM unit */
+		YM_DELTAT_postload(&F2610->deltaT , &F2610->REGS0x010 );
+	}
+}
+
+static void YM2610_save_state(YM2610 *F2610, const device_config *device)
+{
+	state_save_register_device_item_array(device, 0, F2610->REGS);
+	FMsave_state_st(device,&F2610->OPN.ST);
+	FMsave_state_channel(device,F2610->CH,6);
+	/* 3slots */
+	state_save_register_device_item_array(device, 0, F2610->OPN.SL3.fc);
+	state_save_register_device_item(device, 0, F2610->OPN.SL3.fn_h);
+	state_save_register_device_item_array(device, 0, F2610->OPN.SL3.kcode);
+	/* address register1 */
+	state_save_register_device_item(device, 0, F2610->addr_A1);
+
+	state_save_register_device_item(device, 0, F2610->adpcm_arrivedEndAddress);
+	/* rythm(ADPCMA) */
+	FMsave_state_adpcma(device,F2610->adpcm);
+	/* Delta-T ADPCM unit */
+	YM_DELTAT_savestate(device,&F2610->deltaT);
+}
+#endif /* _STATE_H */
+
+static void YM2610_deltat_status_set(void *chip, UINT8 changebits)
+{
+	YM2610 *F2610 = (YM2610 *)chip;
+	F2610->adpcm_arrivedEndAddress |= changebits;
+}
+static void YM2610_deltat_status_reset(void *chip, UINT8 changebits)
+{
+	YM2610 *F2610 = (YM2610 *)chip;
+	F2610->adpcm_arrivedEndAddress &= (~changebits);
+}
+
+//void *ym2610_init(void *param, const device_config *device, int clock, int rate,
+// void *pcmroma,int pcmsizea,void *pcmromb,int pcmsizeb,
+// FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
+void *ym2610_init(void *param, int clock, int rate,
+ FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
+{
+	YM2610 *F2610;
+
+	/* allocate extend state space */
+	if( (F2610 = (YM2610 *)malloc(sizeof(YM2610)))==NULL)
+		return NULL;
+	/* clear */
+	memset(F2610,0,sizeof(YM2610));
+	/* allocate total level table (128kb space) */
+	if( !init_tables() )
+	{
+		free( F2610 );
+		return NULL;
+	}
+
+	/* FM */
+	F2610->OPN.ST.param = param;
+	F2610->OPN.type = TYPE_YM2610;
+	F2610->OPN.P_CH = F2610->CH;
+	//F2610->OPN.ST.device = device;
+	F2610->OPN.ST.clock = clock;
+	F2610->OPN.ST.rate = rate;
+	/* Extend handler */
+	F2610->OPN.ST.timer_handler = timer_handler;
+	F2610->OPN.ST.IRQ_Handler = IRQHandler;
+	F2610->OPN.ST.SSG = ssg;
+	/* ADPCM */
+	//F2610->pcmbuf = (const UINT8 *)pcmroma;
+	//F2610->pcm_size = pcmsizea;
+	F2610->pcmbuf = NULL;
+	F2610->pcm_size = 0x00;
+	/* DELTA-T */
+	//F2610->deltaT.memory = (UINT8 *)pcmromb;
+	//F2610->deltaT.memory_size = pcmsizeb;
+	F2610->deltaT.memory = NULL;
+	F2610->deltaT.memory_size = 0x00;
+	F2610->deltaT.memory_mask = 0x00;
+
+	F2610->deltaT.status_set_handler = YM2610_deltat_status_set;
+	F2610->deltaT.status_reset_handler = YM2610_deltat_status_reset;
+	F2610->deltaT.status_change_which_chip = F2610;
+	F2610->deltaT.status_change_EOS_bit = 0x80;	/* status flag: set bit7 on End Of Sample */
+
+	Init_ADPCMATable();
+#ifdef __STATE_H__
+	YM2610_save_state(F2610, device);
+#endif
+	return F2610;
+}
+
+/* shut down emulator */
+void ym2610_shutdown(void *chip)
+{
+	YM2610 *F2610 = (YM2610 *)chip;
+
+	free(F2610->pcmbuf);		F2610->pcmbuf = NULL;
+	free(F2610->deltaT.memory);	F2610->deltaT.memory = NULL;
+
+	FMCloseTable();
+	free(F2610);
+}
+
+/* reset one of chip */
+void ym2610_reset_chip(void *chip)
+{
+	int i;
+	YM2610 *F2610 = (YM2610 *)chip;
+	FM_OPN *OPN = &F2610->OPN;
+	YM_DELTAT *DELTAT = &F2610->deltaT;
+
+	/*astring name;
+	device_t* dev = F2610->OPN.ST.device;*/
+
+	/* setup PCM buffers again */
+	/*name.printf("%s",dev->tag());
+	F2610->pcmbuf = (const UINT8 *)dev->machine->region(name)->base();
+	F2610->pcm_size = dev->machine->region(name)->bytes();
+	name.printf("%s.deltat",dev->tag());
+	F2610->deltaT.memory = (UINT8 *)dev->machine->region(name)->base();
+	if(F2610->deltaT.memory == NULL)
+	{
+		F2610->deltaT.memory = (UINT8*)F2610->pcmbuf;
+		F2610->deltaT.memory_size = F2610->pcm_size;
+	}
+	else
+		F2610->deltaT.memory_size = dev->machine->region(name)->bytes();*/
+
+	/* Reset Prescaler */
+	OPNSetPres( OPN, 6*24, 6*24, 4*2); /* OPN 1/6 , SSG 1/4 */
+	/* reset SSG section */
+	(*OPN->ST.SSG->reset)(OPN->ST.param);
+	/* status clear */
+	FM_IRQMASK_SET(&OPN->ST,0x03);
+	FM_BUSY_CLEAR(&OPN->ST);
+	OPNWriteMode(OPN,0x27,0x30); /* mode 0 , timer reset */
+
+	OPN->eg_timer = 0;
+	OPN->eg_cnt = 0;
+
+	FM_STATUS_RESET(&OPN->ST, 0xff);
+
+	reset_channels( &OPN->ST , F2610->CH , 6 );
+	/* reset OPerator paramater */
+	for(i = 0xb6 ; i >= 0xb4 ; i-- )
+	{
+		OPNWriteReg(OPN,i ,0xc0);
+		OPNWriteReg(OPN,i|0x100,0xc0);
+	}
+	for(i = 0xb2 ; i >= 0x30 ; i-- )
+	{
+		OPNWriteReg(OPN,i ,0);
+		OPNWriteReg(OPN,i|0x100,0);
+	}
+	for(i = 0x26 ; i >= 0x20 ; i-- ) OPNWriteReg(OPN,i,0);
+	/**** ADPCM work initial ****/
+	for( i = 0; i < 6 ; i++ )
+	{
+		F2610->adpcmi.step = (UINT32)((float)(1<<ADPCM_SHIFT)*((float)F2610->OPN.ST.freqbase)/3.0);
+		F2610->adpcmi.now_addr = 0;
+		F2610->adpcmi.now_step = 0;
+		F2610->adpcmi.start = 0;
+		F2610->adpcmi.end = 0;
+		/* F2610->adpcmi.delta = 21866; */
+		F2610->adpcmi.vol_mul = 0;
+		F2610->adpcmi.pan = &OPN->out_adpcmOUTD_CENTER; /* default center */
+		F2610->adpcmi.flagMask = 1<<i;
+		F2610->adpcmi.flag = 0;
+		F2610->adpcmi.adpcm_acc = 0;
+		F2610->adpcmi.adpcm_step= 0;
+		F2610->adpcmi.adpcm_out = 0;
+	}
+	F2610->adpcmTL = 0x3f;
+
+	F2610->adpcm_arrivedEndAddress = 0;
+
+	/* DELTA-T unit */
+	DELTAT->freqbase = OPN->ST.freqbase;
+	DELTAT->output_pointer = OPN->out_delta;
+	DELTAT->portshift = 8;		/* allways 8bits shift */
+	DELTAT->output_range = 1<<23;
+	YM_DELTAT_ADPCM_Reset(DELTAT,OUTD_CENTER,YM_DELTAT_EMULATION_MODE_YM2610);
+}
+
+/* YM2610 write */
+/* n = number */
+/* a = address */
+/* v = value */
+int ym2610_write(void *chip, int a, UINT8 v)
+{
+	YM2610 *F2610 = (YM2610 *)chip;
+	FM_OPN *OPN = &F2610->OPN;
+	int addr;
+	int ch;
+
+	v &= 0xff;	/* adjust to 8 bit bus */
+
+	switch( a&3 )
+	{
+	case 0:	/* address port 0 */
+		OPN->ST.address = v;
+		F2610->addr_A1 = 0;
+
+		/* Write register to SSG emulator */
+		if( v < 16 ) (*OPN->ST.SSG->write)(OPN->ST.param,0,v);
+		break;
+
+	case 1:	/* data port 0 */
+		if (F2610->addr_A1 != 0)
+			break;	/* verified on real YM2608 */
+
+		addr = OPN->ST.address;
+		F2610->REGSaddr = v;
+		switch(addr & 0xf0)
+		{
+		case 0x00:	/* SSG section */
+			/* Write data to SSG emulator */
+			(*OPN->ST.SSG->write)(OPN->ST.param,a,v);
+			break;
+		case 0x10: /* DeltaT ADPCM */
+			ym2610_update_req(OPN->ST.param);
+
+			switch(addr)
+			{
+			case 0x10:	/* control 1 */
+			case 0x11:	/* control 2 */
+			case 0x12:	/* start address L */
+			case 0x13:	/* start address H */
+			case 0x14:	/* stop address L */
+			case 0x15:	/* stop address H */
+
+			case 0x19:	/* delta-n L */
+			case 0x1a:	/* delta-n H */
+			case 0x1b:	/* volume */
+				{
+					YM_DELTAT_ADPCM_Write(&F2610->deltaT,addr-0x10,v);
+				}
+				break;
+
+			case 0x1c: /* FLAG CONTROL : Extend Status Clear/Mask */
+				{
+					UINT8 statusmask = ~v;
+					/* set arrived flag mask */
+					for(ch=0;ch<6;ch++)
+						F2610->adpcmch.flagMask = statusmask&(1<<ch);
+
+					F2610->deltaT.status_change_EOS_bit = statusmask & 0x80;	/* status flag: set bit7 on End Of Sample */
+
+					/* clear arrived flag */
+					F2610->adpcm_arrivedEndAddress &= statusmask;
+				}
+				break;
+
+			default:
+#ifdef _DEBUG
+				logerror("YM2610: write to unknown deltat register %02x val=%02x\n",addr,v);
+#endif
+				break;
+			}
+
+			break;
+		case 0x20:	/* Mode Register */
+			ym2610_update_req(OPN->ST.param);
+			OPNWriteMode(OPN,addr,v);
+			break;
+		default:	/* OPN section */
+			ym2610_update_req(OPN->ST.param);
+			/* write register */
+			OPNWriteReg(OPN,addr,v);
+		}
+		break;
+
+	case 2:	/* address port 1 */
+		OPN->ST.address = v;
+		F2610->addr_A1 = 1;
+		break;
+
+	case 3:	/* data port 1 */
+		if (F2610->addr_A1 != 1)
+			break;	/* verified on real YM2608 */
+
+		ym2610_update_req(OPN->ST.param);
+		addr = OPN->ST.address;
+		F2610->REGSaddr | 0x100 = v;
+		if( addr < 0x30 )
+			/* 100-12f : ADPCM A section */
+			FM_ADPCMAWrite(F2610,addr,v);
+		else
+			OPNWriteReg(OPN,addr | 0x100,v);
+	}
+	return OPN->ST.irq;
+}
+
+UINT8 ym2610_read(void *chip,int a)
+{
+	YM2610 *F2610 = (YM2610 *)chip;
+	int addr = F2610->OPN.ST.address;
+	UINT8 ret = 0;
+
+	switch( a&3)
+	{
+	case 0:	/* status 0 : YM2203 compatible */
+		ret = FM_STATUS_FLAG(&F2610->OPN.ST) & 0x83;
+		break;
+	case 1:	/* data 0 */
+		if( addr < 16 ) ret = (*F2610->OPN.ST.SSG->read)(F2610->OPN.ST.param);
+		if( addr == 0xff ) ret = 0x01;
+		break;
+	case 2:	/* status 1 : ADPCM status */
+		/* ADPCM STATUS (arrived End Address) */
+		/* B,--,A5,A4,A3,A2,A1,A0 */
+		/* B = ADPCM-B(DELTA-T) arrived end address */
+		/* A0-A5 = ADPCM-A arrived end address */
+		ret = F2610->adpcm_arrivedEndAddress;
+		break;
+	case 3:
+		ret = 0;
+		break;
+	}
+	return ret;
+}
+
+int ym2610_timer_over(void *chip,int c)
+{
+	YM2610 *F2610 = (YM2610 *)chip;
+
+	if( c )
+	{	/* Timer B */
+		TimerBOver( &(F2610->OPN.ST) );
+	}
+	else
+	{	/* Timer A */
+		ym2610_update_req(F2610->OPN.ST.param);
+		/* timer update */
+		TimerAOver( &(F2610->OPN.ST) );
+		/* CSM mode key,TL controll */
+		if( F2610->OPN.ST.mode & 0x80 )
+		{	/* CSM mode total level latch and auto key on */
+			CSMKeyControll( F2610->OPN.type, &(F2610->CH2) );
+		}
+	}
+	return F2610->OPN.ST.irq;
+}
+
+void ym2610_write_pcmrom(void *chip, UINT8 rom_id, offs_t ROMSize, offs_t DataStart,
+						 offs_t DataLength, const UINT8* ROMData)
+{
+	YM2610 *F2610 = (YM2610 *)chip;
+	
+	switch(rom_id)
+	{
+	case 0x01:	// ADPCM
+		if (F2610->pcm_size != ROMSize)
+		{
+			F2610->pcmbuf = (UINT8*)realloc(F2610->pcmbuf, ROMSize);
+			F2610->pcm_size = ROMSize;
+			memset(F2610->pcmbuf, 0xFF, ROMSize);
+		}
+		if (DataStart > ROMSize)
+			return;
+		if (DataStart + DataLength > ROMSize)
+			DataLength = ROMSize - DataStart;
+		
+		memcpy(F2610->pcmbuf + DataStart, ROMData, DataLength);
+		break;
+	case 0x02:	// DELTA-T
+		if (F2610->deltaT.memory_size != ROMSize)
+		{
+			F2610->deltaT.memory = (UINT8*)realloc(F2610->deltaT.memory, ROMSize);
+			F2610->deltaT.memory_size = ROMSize;
+			memset(F2610->deltaT.memory, 0xFF, ROMSize);
+			YM_DELTAT_calc_mem_mask(&F2610->deltaT);
+		}
+		if (DataStart > ROMSize)
+			return;
+		if (DataStart + DataLength > ROMSize)
+			DataLength = ROMSize - DataStart;
+		
+		memcpy(F2610->deltaT.memory + DataStart, ROMData, DataLength);
+		break;
+	}
+	
+	return;
+}
+
+void ym2610_set_mutemask(void *chip, UINT32 MuteMask)
+{
+	YM2610 *F2610 = (YM2610 *)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		F2610->CHCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		F2610->adpcmCurChn.Muted = (MuteMask >> (CurChn + 6)) & 0x01;
+	F2610->MuteDeltaT = (MuteMask >> 12) & 0x01;
+	
+	return;
+}
+#endif /* (BUILD_YM2610||BUILD_YM2610B) */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm.h Added

@@ -0,0 +1,238 @@
+/*
+  File: fm.h -- header file for software emulation for FM sound generator
+
+*/
+
+#pragma once
+
+/* --- select emulation chips --- */
+/*
+#define BUILD_YM2203  (HAS_YM2203)		// build YM2203(OPN)   emulator
+#define BUILD_YM2608  (HAS_YM2608)		// build YM2608(OPNA)  emulator
+#define BUILD_YM2610  (HAS_YM2610)		// build YM2610(OPNB)  emulator
+#define BUILD_YM2610B (HAS_YM2610B)		// build YM2610B(OPNB?)emulator
+#define BUILD_YM2612  (HAS_YM2612)		// build YM2612(OPN2)  emulator
+#define BUILD_YM3438  (HAS_YM3438)		// build YM3438(OPN) emulator
+*/
+#define BUILD_YM2203  1
+#define BUILD_YM2608  1
+#define BUILD_YM2610  1
+#define BUILD_YM2610B 1
+#define BUILD_YM2612  1
+#define BUILD_YM3438  1
+
+/* select bit size of output : 8 or 16 */
+#define FM_SAMPLE_BITS 16
+
+/* select timer system internal or external */
+#define FM_INTERNAL_TIMER 1
+
+/* --- speedup optimize --- */
+/* busy flag enulation , The definition of FM_GET_TIME_NOW() is necessary. */
+//#define FM_BUSY_FLAG_SUPPORT 1
+
+/* --- external SSG(YM2149/AY-3-8910)emulator interface port */
+/* used by YM2203,YM2608,and YM2610 */
+typedef struct _ssg_callbacks ssg_callbacks;
+struct _ssg_callbacks
+{
+	void (*set_clock)(void *param, int clock);
+	void (*write)(void *param, int address, int data);
+	int (*read)(void *param);
+	void (*reset)(void *param);
+};
+
+/* --- external callback funstions for realtime update --- */
+
+#if FM_BUSY_FLAG_SUPPORT
+#define TIME_TYPE					attotime
+#define UNDEFINED_TIME				attotime_zero
+#define FM_GET_TIME_NOW(machine)			timer_get_time(machine)
+#define ADD_TIMES(t1, t2)   		attotime_add((t1), (t2))
+#define COMPARE_TIMES(t1, t2)		attotime_compare((t1), (t2))
+#define MULTIPLY_TIME_BY_INT(t,i)	attotime_mul(t, i)
+#endif
+
+#if BUILD_YM2203
+  /* in 2203intf.c */
+  void ym2203_update_request(void *param);
+  #define ym2203_update_req(chip) ym2203_update_request(chip)
+#endif /* BUILD_YM2203 */
+
+#if BUILD_YM2608
+  /* in 2608intf.c */
+  void ym2608_update_request(void *param);
+  #define ym2608_update_req(chip) ym2608_update_request(chip);
+#endif /* BUILD_YM2608 */
+
+#if (BUILD_YM2610||BUILD_YM2610B)
+  /* in 2610intf.c */
+  void ym2610_update_request(void *param);
+  #define ym2610_update_req(chip) ym2610_update_request(chip);
+#endif /* (BUILD_YM2610||BUILD_YM2610B) */
+
+#if (BUILD_YM2612||BUILD_YM3438)
+  /* in 2612intf.c */
+  void ym2612_update_request(void *param);
+  #define ym2612_update_req(chip) ym2612_update_request(chip);
+#endif /* (BUILD_YM2612||BUILD_YM3438) */
+
+/* compiler dependence */
+#if 0
+#ifndef OSD_CPU_H
+#define OSD_CPU_H
+typedef unsigned char	UINT8;   /* unsigned  8bit */
+typedef unsigned short	UINT16;  /* unsigned 16bit */
+typedef unsigned int	UINT32;  /* unsigned 32bit */
+typedef signed char		INT8;    /* signed  8bit   */
+typedef signed short	INT16;   /* signed 16bit   */
+typedef signed int		INT32;   /* signed 32bit   */
+#endif /* OSD_CPU_H */
+#endif
+
+
+
+typedef stream_sample_t FMSAMPLE;
+/*
+#if (FM_SAMPLE_BITS==16)
+typedef INT16 FMSAMPLE;
+#endif
+#if (FM_SAMPLE_BITS==8)
+typedef unsigned char  FMSAMPLE;
+#endif
+*/
+
+typedef void (*FM_TIMERHANDLER)(void *param,int c,int cnt,int clock);
+typedef void (*FM_IRQHANDLER)(void *param,int irq);
+/* FM_TIMERHANDLER : Stop or Start timer         */
+/* int n          = chip number                  */
+/* int c          = Channel 0=TimerA,1=TimerB    */
+/* int count      = timer count (0=stop)         */
+/* doube stepTime = step time of one count (sec.)*/
+
+/* FM_IRQHHANDLER : IRQ level changing sense     */
+/* int n       = chip number                     */
+/* int irq     = IRQ level 0=OFF,1=ON            */
+
+#if BUILD_YM2203
+/* -------------------- YM2203(OPN) Interface -------------------- */
+
+/*
+** Initialize YM2203 emulator(s).
+**
+** 'num'           is the number of virtual YM2203's to allocate
+** 'baseclock'
+** 'rate'          is sampling rate
+** 'TimerHandler'  timer callback handler when timer start and clear
+** 'IRQHandler'    IRQ callback handler when changed IRQ level
+** return      0 = success
+*/
+//void * ym2203_init(void *param, const device_config *device, int baseclock, int rate,
+//               FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
+void * ym2203_init(void *param, int baseclock, int rate,
+               FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
+
+/*
+** shutdown the YM2203 emulators
+*/
+void ym2203_shutdown(void *chip);
+
+/*
+** reset all chip registers for YM2203 number 'num'
+*/
+void ym2203_reset_chip(void *chip);
+
+/*
+** update one of chip
+*/
+void ym2203_update_one(void *chip, FMSAMPLE **buffer, int length);
+
+/*
+** Write
+** return : InterruptLevel
+*/
+int ym2203_write(void *chip,int a,unsigned char v);
+
+/*
+** Read
+** return : InterruptLevel
+*/
+unsigned char ym2203_read(void *chip,int a);
+
+/*
+**  Timer OverFlow
+*/
+int ym2203_timer_over(void *chip, int c);
+
+/*
+**  State Save
+*/
+void ym2203_postload(void *chip);
+
+void ym2203_set_mutemask(void *chip, UINT32 MuteMask);
+#endif /* BUILD_YM2203 */
+
+#if BUILD_YM2608
+/* -------------------- YM2608(OPNA) Interface -------------------- */
+//void * ym2608_init(void *param, const device_config *device, int baseclock, int rate,
+//               void *pcmroma,int pcmsizea,
+//               FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
+void * ym2608_init(void *param, int baseclock, int rate,
+               FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
+void ym2608_shutdown(void *chip);
+void ym2608_reset_chip(void *chip);
+void ym2608_update_one(void *chip, FMSAMPLE **buffer, int length);
+
+int ym2608_write(void *chip, int a,unsigned char v);
+unsigned char ym2608_read(void *chip,int a);
+int ym2608_timer_over(void *chip, int c );
+void ym2608_postload(void *chip);
+void ym2608_write_pcmrom(void *chip, UINT8 rom_id, offs_t ROMSize, offs_t DataStart,
+						 offs_t DataLength, const UINT8* ROMData);
+
+void ym2608_set_mutemask(void *chip, UINT32 MuteMask);
+#endif /* BUILD_YM2608 */
+
+#if (BUILD_YM2610||BUILD_YM2610B)
+/* -------------------- YM2610(OPNB) Interface -------------------- */
+//void * ym2610_init(void *param, const device_config *device, int baseclock, int rate,
+//               void *pcmroma,int pcmasize,void *pcmromb,int pcmbsize,
+//               FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
+void * ym2610_init(void *param, int baseclock, int rate,
+               FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
+void ym2610_shutdown(void *chip);
+void ym2610_reset_chip(void *chip);
+void ym2610_update_one(void *chip, FMSAMPLE **buffer, int length);
+
+#if BUILD_YM2610B
+void ym2610b_update_one(void *chip, FMSAMPLE **buffer, int length);
+#endif /* BUILD_YM2610B */
+
+int ym2610_write(void *chip, int a,unsigned char v);
+unsigned char ym2610_read(void *chip,int a);
+int ym2610_timer_over(void *chip, int c );
+void ym2610_postload(void *chip);
+void ym2610_write_pcmrom(void *chip, UINT8 rom_id, offs_t ROMSize, offs_t DataStart,
+						 offs_t DataLength, const UINT8* ROMData);
+
+void ym2610_set_mutemask(void *chip, UINT32 MuteMask);
+#endif /* (BUILD_YM2610||BUILD_YM2610B) */
+
+#if (BUILD_YM2612||BUILD_YM3438)
+//void * ym2612_init(void *param, const device_config *device, int baseclock, int rate,
+//               FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler);
+void * ym2612_init(void *param, int baseclock, int rate,
+               FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler,
+               UINT8 *IsVGMInit, int Options);
+void ym2612_shutdown(void *chip);
+void ym2612_reset_chip(void *chip);
+void ym2612_update_one(void *chip, FMSAMPLE **buffer, int length);
+
+int ym2612_write(void *chip, int a,unsigned char v);
+unsigned char ym2612_read(void *chip,int a);
+int ym2612_timer_over(void *chip, int c );
+void ym2612_postload(void *chip);
+
+void ym2612_set_mutemask(void *chip, UINT32 MuteMask);
+#endif /* (BUILD_YM2612||BUILD_YM3438) */
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fm2612.c Added

@@ -0,0 +1,2730 @@
+/*
+**
+** File: fm2612.c -- software implementation of Yamaha YM2612 FM sound generator
+** Split from fm.c to keep 2612 fixes from infecting other OPN chips
+**
+** Copyright Jarek Burczynski (bujar at mame dot net)
+** Copyright Tatsuyuki Satoh , MultiArcadeMachineEmulator development
+**
+** Version 1.5.1 (Genesis Plus GX ym2612.c rev. 368)
+**
+*/
+
+/*
+** History:
+**
+** 2006~2012 Eke-Eke (Genesis Plus GX):
+** Huge thanks to Nemesis, lot of those fixes came from his tests on Sega Genesis hardware
+** More informations at http://gendev.spritesmind.net/forum/viewtopic.php?t=386
+**
+** TODO:
+**
+** - core documentation
+** - BUSY flag support
+**
+** CHANGELOG:
+**
+** - fixed LFO implementation:
+** .added support for CH3 special mode: fixes various sound effects (birds in Warlock, bug sound in Aladdin...)
+** .inverted LFO AM waveform: fixes Spider-Man & Venom : Separation Anxiety (intro), California Games (surfing event)
+** .improved LFO timing accuracy: now updated AFTER sample output, like EG/PG updates, and without any precision loss anymore.
+** - improved internal timers emulation
+** - adjusted lowest EG rates increment values
+** - fixed Attack Rate not being updated in some specific cases (Batman & Robin intro)
+** - fixed EG behavior when Attack Rate is maximal
+** - fixed EG behavior when SL=0 (Mega Turrican tracks 03,09...) or/and Key ON occurs at minimal attenuation
+** - implemented EG output immediate changes on register writes
+** - fixed YM2612 initial values (after the reset): fixes missing intro in B.O.B
+** - implemented Detune overflow (Ariel, Comix Zone, Shaq Fu, Spiderman & many other games using GEMS sound engine)
+** - implemented accurate CSM mode emulation
+** - implemented accurate SSG-EG emulation (Asterix, Beavis&Butthead, Bubba'n Stix & many other games)
+** - implemented accurate address/data ports behavior
+**
+** 06-23-2007 Zsolt Vasvari:
+** - changed the timing not to require the use of floating point calculations
+**
+** 03-08-2003 Jarek Burczynski:
+** - fixed YM2608 initial values (after the reset)
+** - fixed flag and irqmask handling (YM2608)
+** - fixed BUFRDY flag handling (YM2608)
+**
+** 14-06-2003 Jarek Burczynski:
+** - implemented all of the YM2608 status register flags
+** - implemented support for external memory read/write via YM2608
+** - implemented support for deltat memory limit register in YM2608 emulation
+**
+** 22-05-2003 Jarek Burczynski:
+** - fixed LFO PM calculations (copy&paste bugfix)
+**
+** 08-05-2003 Jarek Burczynski:
+** - fixed SSG support
+**
+** 22-04-2003 Jarek Burczynski:
+** - implemented 100% correct LFO generator (verified on real YM2610 and YM2608)
+**
+** 15-04-2003 Jarek Burczynski:
+** - added support for YM2608's register 0x110 - status mask
+**
+** 01-12-2002 Jarek Burczynski:
+** - fixed register addressing in YM2608, YM2610, YM2610B chips. (verified on real YM2608)
+** The addressing patch used for early Neo-Geo games can be removed now.
+**
+** 26-11-2002 Jarek Burczynski, Nicola Salmoria:
+** - recreated YM2608 ADPCM ROM using data from real YM2608's output which leads to:
+** - added emulation of YM2608 drums.
+** - output of YM2608 is two times lower now - same as YM2610 (verified on real YM2608)
+**
+** 16-08-2002 Jarek Burczynski:
+** - binary exact Envelope Generator (verified on real YM2203);
+** identical to YM2151
+** - corrected 'off by one' error in feedback calculations (when feedback is off)
+** - corrected connection (algorithm) calculation (verified on real YM2203 and YM2610)
+**
+** 18-12-2001 Jarek Burczynski:
+** - added SSG-EG support (verified on real YM2203)
+**
+** 12-08-2001 Jarek Burczynski:
+** - corrected sin_tab and tl_tab data (verified on real chip)
+** - corrected feedback calculations (verified on real chip)
+** - corrected phase generator calculations (verified on real chip)
+** - corrected envelope generator calculations (verified on real chip)
+** - corrected FM volume level (YM2610 and YM2610B).
+** - changed YMxxxUpdateOne() functions (YM2203, YM2608, YM2610, YM2610B, YM2612) :
+** this was needed to calculate YM2610 FM channels output correctly.
+** (Each FM channel is calculated as in other chips, but the output of the channel
+** gets shifted right by one *before* sending to accumulator. That was impossible to do
+** with previous implementation).
+**
+** 23-07-2001 Jarek Burczynski, Nicola Salmoria:
+** - corrected YM2610 ADPCM type A algorithm and tables (verified on real chip)
+**
+** 11-06-2001 Jarek Burczynski:
+** - corrected end of sample bug in ADPCMA_calc_cha().
+** Real YM2610 checks for equality between current and end addresses (only 20 LSB bits).
+**
+** 08-12-98 hiro-shi:
+** rename ADPCMA -> ADPCMB, ADPCMB -> ADPCMA
+** move ROM limit check.(CALC_CH? -> 2610Write1/2)
+** test program (ADPCMB_TEST)
+** move ADPCM A/B end check.
+** ADPCMB repeat flag(no check)
+** change ADPCM volume rate (8->16) (32->48).
+**
+** 09-12-98 hiro-shi:
+** change ADPCM volume. (8->16, 48->64)
+** replace ym2610 ch0/3 (YM-2610B)
+** change ADPCM_SHIFT (10->8) missing bank change 0x4000-0xffff.
+** add ADPCM_SHIFT_MASK
+** change ADPCMA_DECODE_MIN/MAX.
+*/
+
+
+
+
+/************************************************************************/
+/* comment of hiro-shi(Hiromitsu Shioya) */
+/* YM2610(B) = OPN-B */
+/* YM2610 : PSG:3ch FM:4ch ADPCM(18.5KHz):6ch DeltaT ADPCM:1ch */
+/* YM2610B : PSG:3ch FM:6ch ADPCM(18.5KHz):6ch DeltaT ADPCM:1ch */
+/************************************************************************/
+
+//#include "emu.h"
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "mamedef.h"
+#include "fm.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+/* shared function building option */
+#define BUILD_OPN (BUILD_YM2203||BUILD_YM2608||BUILD_YM2610||BUILD_YM2610B||BUILD_YM2612||BUILD_YM3438)
+#define BUILD_OPN_PRESCALER (BUILD_YM2203||BUILD_YM2608)
+
+
+/* globals */
+#define TYPE_SSG 0x01 /* SSG support */
+#define TYPE_LFOPAN 0x02 /* OPN type LFO and PAN */
+#define TYPE_6CH 0x04 /* FM 6CH / 3CH */
+#define TYPE_DAC 0x08 /* YM2612's DAC device */
+#define TYPE_ADPCM 0x10 /* two ADPCM units */
+#define TYPE_2610 0x20 /* bogus flag to differentiate 2608 from 2610 */
+
+
+#define TYPE_YM2203 (TYPE_SSG)
+#define TYPE_YM2608 (TYPE_SSG |TYPE_LFOPAN |TYPE_6CH |TYPE_ADPCM)
+#define TYPE_YM2610 (TYPE_SSG |TYPE_LFOPAN |TYPE_6CH |TYPE_ADPCM |TYPE_2610)
+#define TYPE_YM2612 (TYPE_DAC |TYPE_LFOPAN |TYPE_6CH)
+
+
+/* globals */
+#define FREQ_SH			16 /* 16.16 fixed point (frequency calculations) */
+#define EG_SH			16 /* 16.16 fixed point (envelope generator timing) */
+#define LFO_SH			24 /* 8.24 fixed point (LFO calculations) */
+#define TIMER_SH		16 /* 16.16 fixed point (timers calculations) */
+
+#define FREQ_MASK		((1<<FREQ_SH)-1)
+
+#define MAXOUT (+32767)
+#define MINOUT (-32768)
+
+/* envelope generator */
+#define ENV_BITS		10
+#define ENV_LEN			(1<<ENV_BITS)
+#define ENV_STEP		(128.0/ENV_LEN)
+
+#define MAX_ATT_INDEX	(ENV_LEN-1) /* 1023 */
+#define MIN_ATT_INDEX	(0)			/* 0 */
+
+#define EG_ATT			4
+#define EG_DEC			3
+#define EG_SUS			2
+#define EG_REL			1
+#define EG_OFF			0
+
+/* operator unit */
+#define SIN_BITS		10
+#define SIN_LEN			(1<<SIN_BITS)
+#define SIN_MASK		(SIN_LEN-1)
+
+#define TL_RES_LEN		(256) /* 8 bits addressing (real chip) */
+
+/* TL_TAB_LEN is calculated as:
+* 13 - sinus amplitude bits (Y axis)
+* 2 - sinus sign bit (Y axis)
+* TL_RES_LEN - sinus resolution (X axis)
+*/
+#define TL_TAB_LEN (13*2*TL_RES_LEN)
+static signed int tl_tabTL_TAB_LEN;
+
+#define ENV_QUIET		(TL_TAB_LEN>>3)
+
+/* sin waveform table in 'decibel' scale */
+static unsigned int sin_tabSIN_LEN;
+
+/* sustain level table (3dB per step) */
+/* bit0, bit1, bit2, bit3, bit4, bit5, bit6 */
+/* 1, 2, 4, 8, 16, 32, 64 (value)*/
+/* 0.75, 1.5, 3, 6, 12, 24, 48 (dB)*/
+
+/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
+/* attenuation value (10 bits) = (SL << 2) << 3 */
+#define SC(db) (UINT32) ( db * (4.0/ENV_STEP) )
+static const UINT32 sl_table16={
+ SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
+ SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)
+};
+#undef SC
+
+
+#define RATE_STEPS (8)
+static const UINT8 eg_inc19*RATE_STEPS={
+
+/*cycle:0 1 2 3 4 5 6 7*/
+
+/* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..11 0 (increment by 0 or 1) */
+/* 1 */ 0,1, 0,1, 1,1, 0,1, /* rates 00..11 1 */
+/* 2 */ 0,1, 1,1, 0,1, 1,1, /* rates 00..11 2 */
+/* 3 */ 0,1, 1,1, 1,1, 1,1, /* rates 00..11 3 */
+
+/* 4 */ 1,1, 1,1, 1,1, 1,1, /* rate 12 0 (increment by 1) */
+/* 5 */ 1,1, 1,2, 1,1, 1,2, /* rate 12 1 */
+/* 6 */ 1,2, 1,2, 1,2, 1,2, /* rate 12 2 */
+/* 7 */ 1,2, 2,2, 1,2, 2,2, /* rate 12 3 */
+
+/* 8 */ 2,2, 2,2, 2,2, 2,2, /* rate 13 0 (increment by 2) */
+/* 9 */ 2,2, 2,4, 2,2, 2,4, /* rate 13 1 */
+/*10 */ 2,4, 2,4, 2,4, 2,4, /* rate 13 2 */
+/*11 */ 2,4, 4,4, 2,4, 4,4, /* rate 13 3 */
+
+/*12 */ 4,4, 4,4, 4,4, 4,4, /* rate 14 0 (increment by 4) */
+/*13 */ 4,4, 4,8, 4,4, 4,8, /* rate 14 1 */
+/*14 */ 4,8, 4,8, 4,8, 4,8, /* rate 14 2 */
+/*15 */ 4,8, 8,8, 4,8, 8,8, /* rate 14 3 */
+
+/*16 */ 8,8, 8,8, 8,8, 8,8, /* rates 15 0, 15 1, 15 2, 15 3 (increment by 8) */
+/*17 */ 16,16,16,16,16,16,16,16, /* rates 15 2, 15 3 for attack */
+/*18 */ 0,0, 0,0, 0,0, 0,0, /* infinity rates for attack and decay(s) */
+};
+
+
+#define O(a) (a*RATE_STEPS)
+
+/*note that there is no O(17) in this table - it's directly in the code */
+static const UINT8 eg_rate_select261232+64+32={ /* Envelope Generator rates (32 + 64 rates + 32 RKS) */
+/* 32 infinite time rates (same as Rate 0) */
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+
+/* rates 00-11 */
+/*
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+*/
+O(18),O(18),O( 0),O( 0),
+O( 0),O( 0),O( 2),O( 2), // Nemesis's tests
+
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+
+/* rate 12 */
+O( 4),O( 5),O( 6),O( 7),
+
+/* rate 13 */
+O( 8),O( 9),O(10),O(11),
+
+/* rate 14 */
+O(12),O(13),O(14),O(15),
+
+/* rate 15 */
+O(16),O(16),O(16),O(16),
+
+/* 32 dummy rates (same as 15 3) */
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16)
+
+};
+#undef O
+
+/*rate 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15*/
+/*shift 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0 */
+/*mask 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1, 0, 0, 0, 0, 0 */
+
+#define O(a) (a*1)
+static const UINT8 eg_rate_shift32+64+32={ /* Envelope Generator counter shifts (32 + 64 rates + 32 RKS) */
+/* 32 infinite time rates */
+/* O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0), */
+
+/* fixed (should be the same as rate 0, even if it makes no difference since increment value is 0 for these rates) */
+O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),
+O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),
+O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),
+O(11),O(11),O(11),O(11),O(11),O(11),O(11),O(11),
+
+/* rates 00-11 */
+O(11),O(11),O(11),O(11),
+O(10),O(10),O(10),O(10),
+O( 9),O( 9),O( 9),O( 9),
+O( 8),O( 8),O( 8),O( 8),
+O( 7),O( 7),O( 7),O( 7),
+O( 6),O( 6),O( 6),O( 6),
+O( 5),O( 5),O( 5),O( 5),
+O( 4),O( 4),O( 4),O( 4),
+O( 3),O( 3),O( 3),O( 3),
+O( 2),O( 2),O( 2),O( 2),
+O( 1),O( 1),O( 1),O( 1),
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 12 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 13 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 14 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 15 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* 32 dummy rates (same as 15 3) */
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0)
+
+};
+#undef O
+
+static const UINT8 dt_tab4 * 32={
+/* this is YM2151 and YM2612 phase increment data (in 10.10 fixed point format)*/
+/* FD=0 */
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* FD=1 */
+	0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2,
+	2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8,
+/* FD=2 */
+	1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5,
+	5, 6, 6, 7, 8, 8, 9,10,11,12,13,14,16,16,16,16,
+/* FD=3 */
+	2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7,
+	8 , 8, 9,10,11,12,13,14,16,17,19,20,22,22,22,22
+};
+
+
+/* OPN key frequency number -> key code follow table */
+/* fnum higher 4bit -> keycode lower 2bit */
+static const UINT8 opn_fktable16 = {0,0,0,0,0,0,0,1,2,3,3,3,3,3,3,3};
+
+
+/* 8 LFO speed parameters */
+/* each value represents number of samples that one LFO level will last for */
+static const UINT32 lfo_samples_per_step8 = {108, 77, 71, 67, 62, 44, 8, 5};
+
+
+
+/*There are 4 different LFO AM depths available, they are:
+ 0 dB, 1.4 dB, 5.9 dB, 11.8 dB
+ Here is how it is generated (in EG steps):
+
+ 11.8 dB = 0, 2, 4, 6, 8, 10,12,14,16...126,126,124,122,120,118,....4,2,0
+ 5.9 dB = 0, 1, 2, 3, 4, 5, 6, 7, 8....63, 63, 62, 61, 60, 59,.....2,1,0
+ 1.4 dB = 0, 0, 0, 0, 1, 1, 1, 1, 2,...15, 15, 15, 15, 14, 14,.....0,0,0
+
+ (1.4 dB is losing precision as you can see)
+
+ It's implemented as generator from 0..126 with step 2 then a shift
+ right N times, where N is:
+ 8 for 0 dB
+ 3 for 1.4 dB
+ 1 for 5.9 dB
+ 0 for 11.8 dB
+*/
+static const UINT8 lfo_ams_depth_shift4 = {8, 3, 1, 0};
+
+
+
+/*There are 8 different LFO PM depths available, they are:
+ 0, 3.4, 6.7, 10, 14, 20, 40, 80 (cents)
+
+ Modulation level at each depth depends on F-NUMBER bits: 4,5,6,7,8,9,10
+ (bits 8,9,10 = FNUM MSB from OCT/FNUM register)
+
+ Here we store only first quarter (positive one) of full waveform.
+ Full table (lfo_pm_table) containing all 128 waveforms is build
+ at run (init) time.
+
+ One value in table below represents 4 (four) basic LFO steps
+ (1 PM step = 4 AM steps).
+
+ For example:
+ at LFO SPEED=0 (which is 108 samples per basic LFO step)
+ one value from "lfo_pm_output" table lasts for 432 consecutive
+ samples (4*108=432) and one full LFO waveform cycle lasts for 13824
+ samples (32*432=13824; 32 because we store only a quarter of whole
+ waveform in the table below)
+*/
+static const UINT8 lfo_pm_output7*88={ /* 7 bits meaningful (of F-NUMBER), 8 LFO output levels per one depth (out of 32), 8 LFO depths */
+/* FNUM BIT 4: 000 0001xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 3 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 4 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 5 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 6 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 7 */ {0, 0, 0, 0, 1, 1, 1, 1},
+
+/* FNUM BIT 5: 000 0010xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 3 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 4 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 5 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 6 */ {0, 0, 0, 0, 1, 1, 1, 1},
+/* DEPTH 7 */ {0, 0, 1, 1, 2, 2, 2, 3},
+
+/* FNUM BIT 6: 000 0100xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 3 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 4 */ {0, 0, 0, 0, 0, 0, 0, 1},
+/* DEPTH 5 */ {0, 0, 0, 0, 1, 1, 1, 1},
+/* DEPTH 6 */ {0, 0, 1, 1, 2, 2, 2, 3},
+/* DEPTH 7 */ {0, 0, 2, 3, 4, 4, 5, 6},
+
+/* FNUM BIT 7: 000 1000xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 2 */ {0, 0, 0, 0, 0, 0, 1, 1},
+/* DEPTH 3 */ {0, 0, 0, 0, 1, 1, 1, 1},
+/* DEPTH 4 */ {0, 0, 0, 1, 1, 1, 1, 2},
+/* DEPTH 5 */ {0, 0, 1, 1, 2, 2, 2, 3},
+/* DEPTH 6 */ {0, 0, 2, 3, 4, 4, 5, 6},
+/* DEPTH 7 */ {0, 0, 4, 6, 8, 8, 0xa, 0xc},
+
+/* FNUM BIT 8: 001 0000xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 1, 1, 1, 1},
+/* DEPTH 2 */ {0, 0, 0, 1, 1, 1, 2, 2},
+/* DEPTH 3 */ {0, 0, 1, 1, 2, 2, 3, 3},
+/* DEPTH 4 */ {0, 0, 1, 2, 2, 2, 3, 4},
+/* DEPTH 5 */ {0, 0, 2, 3, 4, 4, 5, 6},
+/* DEPTH 6 */ {0, 0, 4, 6, 8, 8, 0xa, 0xc},
+/* DEPTH 7 */ {0, 0, 8, 0xc,0x10,0x10,0x14,0x18},
+
+/* FNUM BIT 9: 010 0000xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 2, 2, 2, 2},
+/* DEPTH 2 */ {0, 0, 0, 2, 2, 2, 4, 4},
+/* DEPTH 3 */ {0, 0, 2, 2, 4, 4, 6, 6},
+/* DEPTH 4 */ {0, 0, 2, 4, 4, 4, 6, 8},
+/* DEPTH 5 */ {0, 0, 4, 6, 8, 8, 0xa, 0xc},
+/* DEPTH 6 */ {0, 0, 8, 0xc,0x10,0x10,0x14,0x18},
+/* DEPTH 7 */ {0, 0,0x10,0x18,0x20,0x20,0x28,0x30},
+
+/* FNUM BIT10: 100 0000xxxx */
+/* DEPTH 0 */ {0, 0, 0, 0, 0, 0, 0, 0},
+/* DEPTH 1 */ {0, 0, 0, 0, 4, 4, 4, 4},
+/* DEPTH 2 */ {0, 0, 0, 4, 4, 4, 8, 8},
+/* DEPTH 3 */ {0, 0, 4, 4, 8, 8, 0xc, 0xc},
+/* DEPTH 4 */ {0, 0, 4, 8, 8, 8, 0xc,0x10},
+/* DEPTH 5 */ {0, 0, 8, 0xc,0x10,0x10,0x14,0x18},
+/* DEPTH 6 */ {0, 0,0x10,0x18,0x20,0x20,0x28,0x30},
+/* DEPTH 7 */ {0, 0,0x20,0x30,0x40,0x40,0x50,0x60},
+
+};
+
+/* all 128 LFO PM waveforms */
+static INT32 lfo_pm_table128*8*32; /* 128 combinations of 7 bits meaningful (of F-NUMBER), 8 LFO depths, 32 LFO output levels per one depth */
+
+/* register number to channel number , slot offset */
+#define OPN_CHAN(N) (N&3)
+#define OPN_SLOT(N) ((N>>2)&3)
+
+/* slot number */
+#define SLOT1 0
+#define SLOT2 2
+#define SLOT3 1
+#define SLOT4 3
+
+/* bit0 = Right enable , bit1 = Left enable */
+#define OUTD_RIGHT 1
+#define OUTD_LEFT 2
+#define OUTD_CENTER 3
+
+
+/* save output as raw 16-bit sample */
+/* #define SAVE_SAMPLE */
+
+#ifdef SAVE_SAMPLE
+static FILE *sample1;
+	#if 1	/*save to MONO file */
+		#define SAVE_ALL_CHANNELS \
+		{	signed int pom = lt; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+	#else	/*save to STEREO file */
+		#define SAVE_ALL_CHANNELS \
+		{	signed int pom = lt; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+			pom = rt; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+	#endif
+#endif
+
+
+/* struct describing a single operator (SLOT) */
+typedef struct
+{
+	INT32	*DT;		/* detune :dt_tabDT */
+	UINT8	KSR;		/* key scale rate :3-KSR */
+	UINT32	ar;			/* attack rate */
+	UINT32	d1r;		/* decay rate */
+	UINT32	d2r;		/* sustain rate */
+	UINT32	rr;			/* release rate */
+	UINT8	ksr;		/* key scale rate :kcode>>(3-KSR) */
+	UINT32	mul;		/* multiple :ML_TABLEML */
+
+	/* Phase Generator */
+	UINT32	phase;		/* phase counter */
+	INT32	Incr;		/* phase step */
+
+	/* Envelope Generator */
+	UINT8	state;		/* phase type */
+	UINT32	tl;			/* total level: TL << 3 */
+	INT32	volume;		/* envelope counter */
+	UINT32	sl;			/* sustain level:sl_tableSL */
+	UINT32	vol_out;	/* current output from EG circuit (without AM from LFO) */
+
+	UINT8	eg_sh_ar;	/* (attack state) */
+	UINT8	eg_sel_ar;	/* (attack state) */
+	UINT8	eg_sh_d1r;	/* (decay state) */
+	UINT8	eg_sel_d1r;	/* (decay state) */
+	UINT8	eg_sh_d2r;	/* (sustain state) */
+	UINT8	eg_sel_d2r;	/* (sustain state) */
+	UINT8	eg_sh_rr;	/* (release state) */
+	UINT8	eg_sel_rr;	/* (release state) */
+
+	UINT8	ssg;		/* SSG-EG waveform */
+	UINT8	ssgn;		/* SSG-EG negated output */
+
+	UINT8	key;		/* 0=last key was KEY OFF, 1=KEY ON */
+
+	/* LFO */
+	UINT32	AMmask;		/* AM enable flag */
+
+} FM_SLOT;
+
+typedef struct
+{
+	FM_SLOT	SLOT4;	/* four SLOTs (operators) */
+
+	UINT8	ALGO;		/* algorithm */
+	UINT8	FB;			/* feedback shift */
+	INT32	op1_out2;	/* op1 output for feedback */
+
+	INT32	*connect1;	/* SLOT1 output pointer */
+	INT32	*connect3;	/* SLOT3 output pointer */
+	INT32	*connect2;	/* SLOT2 output pointer */
+	INT32	*connect4;	/* SLOT4 output pointer */
+
+	INT32	*mem_connect;/* where to put the delayed sample (MEM) */
+	INT32	mem_value;	/* delayed sample (MEM) value */
+
+	INT32	pms;		/* channel PMS */
+	UINT8	ams;		/* channel AMS */
+
+	UINT32	fc;			/* fnum,blk:adjusted to sample rate */
+	UINT8	kcode;		/* key code: */
+	UINT32	block_fnum;	/* current blk/fnum value for this slot (can be different betweeen slots of one channel in 3slot mode) */
+	UINT8	Muted;
+	UINT8 *IsVGMInit;
+} FM_CH;
+
+
+typedef struct
+{
+	//running_device *device;
+	void *		param;				/* this chip parameter */
+	double		freqbase;			/* frequency base */
+	int			timer_prescaler;	/* timer prescaler */
+	UINT8		irq;				/* interrupt level */
+	UINT8		irqmask;			/* irq mask */
+#if FM_BUSY_FLAG_SUPPORT
+	TIME_TYPE	busy_expiry_time;	/* expiry time of the busy status */
+#endif
+	UINT32		clock;				/* master clock (Hz) */
+	UINT32		rate;				/* sampling rate (Hz) */
+	UINT8		address;			/* address register */
+	UINT8		status;				/* status flag */
+	UINT32		mode;				/* mode CSM / 3SLOT */
+	UINT8		fn_h;				/* freq latch */
+	UINT8		prescaler_sel;		/* prescaler selector */
+	INT32		TA;					/* timer a */
+	INT32		TAC;				/* timer a counter */
+	UINT8		TB;					/* timer b */
+	INT32		TBC;				/* timer b counter */
+	/* local time tables */
+	INT32		dt_tab832;		/* DeTune table */
+	/* Extention Timer and IRQ handler */
+	FM_TIMERHANDLER	timer_handler;
+	FM_IRQHANDLER	IRQ_Handler;
+	const ssg_callbacks *SSG;
+} FM_ST;
+
+
+
+/***********************************************************/
+/* OPN unit */
+/***********************************************************/
+
+/* OPN 3slot struct */
+typedef struct
+{
+	UINT32 fc3;			/* fnum3,blk3: calculated */
+	UINT8	fn_h;			/* freq3 latch */
+	UINT8	kcode3;		/* key code */
+	UINT32	block_fnum3;	/* current fnum value for this slot (can be different betweeen slots of one channel in 3slot mode) */
+	UINT8 key_csm; /* CSM mode Key-ON flag */
+} FM_3SLOT;
+
+/* OPN/A/B common state */
+typedef struct
+{
+	UINT8	type;			/* chip type */
+	FM_ST	ST;				/* general state */
+	FM_3SLOT SL3;			/* 3 slot mode state */
+	FM_CH	*P_CH;			/* pointer of CH */
+	unsigned int pan6*2;	/* fm channels output masks (0xffffffff = enable) */
+
+	UINT32	eg_cnt;			/* global envelope generator counter */
+	UINT32	eg_timer;		/* global envelope generator counter works at frequency = chipclock/144/3 */
+	UINT32	eg_timer_add;	/* step of eg_timer */
+	UINT32	eg_timer_overflow;/* envelope generator timer overlfows every 3 samples (on real chip) */
+
+
+	/* there are 2048 FNUMs that can be generated using FNUM/BLK registers
+ but LFO works with one more bit of a precision so we really need 4096 elements */
+	UINT32 fn_table4096; /* fnumber->increment counter */
+	UINT32 fn_max; /* maximal phase increment (used for phase overflow) */
+
+	/* LFO */
+	UINT8 lfo_cnt; /* current LFO phase (out of 128) */
+	UINT32 lfo_timer; /* current LFO phase runs at LFO frequency */
+	UINT32 lfo_timer_add; /* step of lfo_timer */
+	UINT32 lfo_timer_overflow; /* LFO timer overflows every N samples (depends on LFO frequency) */
+	UINT32 LFO_AM; /* current LFO AM step */
+	UINT32 LFO_PM; /* current LFO PM step */
+
+	INT32	m2,c1,c2;		/* Phase Modulation input for operators 2,3,4 */
+	INT32	mem;			/* one sample delay memory */
+	INT32	out_fm6;		/* outputs of working channels */
+
+	UINT8 *IsVGMInit;
+} FM_OPN;
+
+/* here's the virtual YM2612 */
+typedef struct
+{
+	UINT8		REGS512;			/* registers */
+	FM_OPN		OPN;				/* OPN state */
+	FM_CH		CH6;				/* channel state */
+	UINT8		addr_A1;			/* address line A1 */
+
+	/* dac output (YM2612) */
+	//int			dacen;
+	UINT8		dacen;
+	UINT8		dac_test;
+	INT32		dacout;
+	UINT8		MuteDAC;
+	
+	UINT8		WaveOutMode;
+	INT32		WaveL;
+	INT32		WaveR;
+
+	UINT8		PseudoSt;
+} YM2612;
+
+/* log output level */
+#define LOG_ERR 3 /* ERROR */
+#define LOG_WAR 2 /* WARNING */
+#define LOG_INF 1 /* INFORMATION */
+#define LOG_LEVEL LOG_INF
+
+#ifndef __RAINE__
+#define LOG(n,x) do { if( (n)>=LOG_LEVEL ) logerror x; } while (0)
+#endif
+
+/* limitter */
+#define Limit(val, max,min) { \
+	if ( val > max ) val = max; \
+	else if ( val < min ) val = min; \
+}
+
+/*#include <stdio.h>
+static FILE* hFile;
+static UINT32 FileSample;*/
+
+/* status set and IRQ handling */
+INLINE void FM_STATUS_SET(FM_ST *ST,int flag)
+{
+	/* set status flag */
+	ST->status |= flag;
+	if ( !(ST->irq) && (ST->status & ST->irqmask) )
+	{
+		ST->irq = 1;
+		/* callback user interrupt handler (IRQ is OFF to ON) */
+		if(ST->IRQ_Handler) (ST->IRQ_Handler)(ST->param,1);
+	}
+}
+
+/* status reset and IRQ handling */
+INLINE void FM_STATUS_RESET(FM_ST *ST,int flag)
+{
+	/* reset status flag */
+	ST->status &=~flag;
+	if ( (ST->irq) && !(ST->status & ST->irqmask) )
+	{
+		ST->irq = 0;
+		/* callback user interrupt handler (IRQ is ON to OFF) */
+		if(ST->IRQ_Handler) (ST->IRQ_Handler)(ST->param,0);
+	}
+}
+
+/* IRQ mask set */
+INLINE void FM_IRQMASK_SET(FM_ST *ST,int flag)
+{
+	ST->irqmask = flag;
+	/* IRQ handling check */
+	FM_STATUS_SET(ST,0);
+	FM_STATUS_RESET(ST,0);
+}
+
+INLINE void FM_KEYON(FM_OPN *OPN, FM_CH *CH , int s )
+{
+	FM_SLOT *SLOT = &CH->SLOTs;
+
+	// Note by Valley Bell:
+	// I assume that the CSM mode shouldn't affect channels
+	// other than FM3, so I added a check for it here.
+	if( !SLOT->key && (!OPN->SL3.key_csm || CH == &OPN->P_CH3))
+	{
+		/* restart Phase Generator */
+		SLOT->phase = 0;
+
+		/* reset SSG-EG inversion flag */
+		SLOT->ssgn = 0;
+
+		if ((SLOT->ar + SLOT->ksr) < 94 /*32+62*/)
+		{
+			SLOT->state = (SLOT->volume <= MIN_ATT_INDEX) ? ((SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC) : EG_ATT;
+		}
+		else
+		{
+			/* force attenuation level to 0 */
+		 	SLOT->volume = MIN_ATT_INDEX;
+
+			/* directly switch to Decay (or Sustain) */
+			SLOT->state = (SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC;
+		}
+
+		/* recalculate EG output */
+		if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04)))
+			SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
+		else
+			SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+	}
+
+	SLOT->key = 1;
+}
+
+INLINE void FM_KEYOFF(FM_OPN *OPN, FM_CH *CH , int s )
+{
+	FM_SLOT *SLOT = &CH->SLOTs;
+
+	if (SLOT->key && (!OPN->SL3.key_csm || CH == &OPN->P_CH3))
+	{
+		if (*OPN->IsVGMInit)	// workaround for VGMs trimmed with VGMTool
+		{
+			SLOT->state = EG_OFF;
+			SLOT->volume = MAX_ATT_INDEX;
+			SLOT->vol_out= MAX_ATT_INDEX;
+		}
+		else if (SLOT->state>EG_REL)
+		{
+			SLOT->state = EG_REL; /* phase -> Release */
+
+			/* SSG-EG specific update */
+			if (SLOT->ssg&0x08)
+			{
+				/* convert EG attenuation level */
+				if (SLOT->ssgn ^ (SLOT->ssg&0x04))
+			 	SLOT->volume = (0x200 - SLOT->volume);
+
+				/* force EG attenuation level */
+				if (SLOT->volume >= 0x200)
+				{
+					SLOT->volume = MAX_ATT_INDEX;
+					SLOT->state = EG_OFF;
+				}
+
+				/* recalculate EG output */
+				SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+			}
+		}
+	}
+
+	SLOT->key = 0;
+}
+
+INLINE void FM_KEYON_CSM(FM_OPN *OPN, FM_CH *CH , int s )
+{
+	FM_SLOT *SLOT = &CH->SLOTs;
+
+	if( !SLOT->key && !OPN->SL3.key_csm)
+	{
+		/* restart Phase Generator */
+		SLOT->phase = 0;
+
+		/* reset SSG-EG inversion flag */
+		SLOT->ssgn = 0;
+
+		if ((SLOT->ar + SLOT->ksr) < 94 /*32+62*/)
+		{
+			SLOT->state = (SLOT->volume <= MIN_ATT_INDEX) ? ((SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC) : EG_ATT;
+		}
+		else
+		{
+			/* force attenuation level to 0 */
+			SLOT->volume = MIN_ATT_INDEX;
+
+			/* directly switch to Decay (or Sustain) */
+			SLOT->state = (SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC;
+		}
+
+		/* recalculate EG output */
+		if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04)))
+			SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
+		else
+			SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+	}
+}
+
+INLINE void FM_KEYOFF_CSM(FM_CH *CH , int s )
+{
+	FM_SLOT *SLOT = &CH->SLOTs;
+	if (!SLOT->key)
+	{
+		if (*CH->IsVGMInit)
+		{
+			SLOT->state = EG_OFF;
+			SLOT->volume = MAX_ATT_INDEX;
+			SLOT->vol_out= MAX_ATT_INDEX;
+		}
+		else if (SLOT->state>EG_REL)
+		{
+			SLOT->state = EG_REL; /* phase -> Release */
+
+			/* SSG-EG specific update */
+			if (SLOT->ssg&0x08)
+			{
+				/* convert EG attenuation level */
+				if (SLOT->ssgn ^ (SLOT->ssg&0x04))
+					SLOT->volume = (0x200 - SLOT->volume);
+
+				/* force EG attenuation level */
+				if (SLOT->volume >= 0x200)
+				{
+					SLOT->volume = MAX_ATT_INDEX;
+					SLOT->state = EG_OFF;
+				}
+
+				/* recalculate EG output */
+				SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+			}
+		}
+	}
+}
+
+/* OPN Mode Register Write */
+INLINE void set_timers( FM_OPN *OPN, FM_ST *ST, void *n, int v )
+{
+	/* b7 = CSM MODE */
+	/* b6 = 3 slot mode */
+	/* b5 = reset b */
+	/* b4 = reset a */
+	/* b3 = timer enable b */
+	/* b2 = timer enable a */
+	/* b1 = load b */
+	/* b0 = load a */
+
+	if ((OPN->ST.mode ^ v) & 0xC0)
+	{
+		/* phase increment need to be recalculated */
+		OPN->P_CH2.SLOTSLOT1.Incr=-1;
+
+		/* CSM mode disabled and CSM key ON active*/
+		if (((v & 0xC0) != 0x80) && OPN->SL3.key_csm)
+		{
+			/* CSM Mode Key OFF (verified by Nemesis on real hardware) */
+			FM_KEYOFF_CSM(&OPN->P_CH2,SLOT1);
+			FM_KEYOFF_CSM(&OPN->P_CH2,SLOT2);
+			FM_KEYOFF_CSM(&OPN->P_CH2,SLOT3);
+			FM_KEYOFF_CSM(&OPN->P_CH2,SLOT4);
+			OPN->SL3.key_csm = 0;
+		}
+	}
+
+	// reset Timer b flag
+	if( v & 0x20 )
+		FM_STATUS_RESET(ST,0x02);
+	// reset Timer a flag
+	if( v & 0x10 )
+		FM_STATUS_RESET(ST,0x01);
+	// load b
+	if ((v&2) && !(ST->mode&2))
+	{
+		ST->TBC = ( 256-ST->TB)<<4;
+		/* External timer handler */
+		if (ST->timer_handler) (ST->timer_handler)(n,1,ST->TBC * ST->timer_prescaler,ST->clock);
+	}
+	// load a
+	if ((v&1) && !(ST->mode&1))
+	{
+		ST->TAC = (1024-ST->TA);
+		/* External timer handler */
+		if (ST->timer_handler) (ST->timer_handler)(n,0,ST->TAC * ST->timer_prescaler,ST->clock);
+		ST->TAC *= 4096;
+	}
+
+	ST->mode = v;
+}
+
+
+/* Timer A Overflow */
+INLINE void TimerAOver(FM_ST *ST)
+{
+	/* set status (if enabled) */
+	if(ST->mode & 0x04) FM_STATUS_SET(ST,0x01);
+	/* clear or reload the counter */
+	ST->TAC = (1024-ST->TA);
+	if (ST->timer_handler) (ST->timer_handler)(ST->param,0,ST->TAC * ST->timer_prescaler,ST->clock);
+	ST->TAC *= 4096;
+}
+/* Timer B Overflow */
+INLINE void TimerBOver(FM_ST *ST)
+{
+	/* set status (if enabled) */
+	if(ST->mode & 0x08) FM_STATUS_SET(ST,0x02);
+	/* clear or reload the counter */
+	ST->TBC = ( 256-ST->TB)<<4;
+	if (ST->timer_handler) (ST->timer_handler)(ST->param,1,ST->TBC * ST->timer_prescaler,ST->clock);
+}
+
+
+#if FM_INTERNAL_TIMER
+/* ----- internal timer mode , update timer */
+// Valley Bell: defines fixed
+
+/* ---------- calculate timer A ---------- */
+	#define INTERNAL_TIMER_A(ST,CSM_CH)					\
+	{													\
+		if( (ST)->TAC && ((ST)->timer_handler==0) )		\
+			if( ((ST)->TAC -= (int)((ST)->freqbase*4096)) <= 0 )	\
+			{											\
+				TimerAOver( ST );						\
+				/* CSM mode total level latch and auto key on */	\
+				if( (ST)->mode & 0x80 )					\
+					CSMKeyControll( OPN, CSM_CH );			\
+			}											\
+	}
+/* ---------- calculate timer B ---------- */
+	#define INTERNAL_TIMER_B(ST,step)						\
+	{														\
+		if( (ST)->TBC && ((ST)->timer_handler==0) )				\
+			if( ((ST)->TBC -= (int)((ST)->freqbase*4096*step)) <= 0 )	\
+				TimerBOver( ST );							\
+	}
+#else /* FM_INTERNAL_TIMER */
+/* external timer mode */
+#define INTERNAL_TIMER_A(ST,CSM_CH)
+#define INTERNAL_TIMER_B(ST,step)
+#endif /* FM_INTERNAL_TIMER */
+
+
+
+#if FM_BUSY_FLAG_SUPPORT
+#define FM_BUSY_CLEAR(ST) ((ST)->busy_expiry_time = UNDEFINED_TIME)
+INLINE UINT8 FM_STATUS_FLAG(FM_ST *ST)
+{
+	if( COMPARE_TIMES(ST->busy_expiry_time, UNDEFINED_TIME) != 0 )
+	{
+		if (COMPARE_TIMES(ST->busy_expiry_time, FM_GET_TIME_NOW(ST->device->machine)) > 0)
+			return ST->status | 0x80;	/* with busy */
+		/* expire */
+		FM_BUSY_CLEAR(ST);
+	}
+	return ST->status;
+}
+INLINE void FM_BUSY_SET(FM_ST *ST,int busyclock )
+{
+	TIME_TYPE expiry_period = MULTIPLY_TIME_BY_INT(ATTOTIME_IN_HZ(ST->clock), busyclock * ST->timer_prescaler);
+	ST->busy_expiry_time = ADD_TIMES(FM_GET_TIME_NOW(ST->device->machine), expiry_period);
+}
+#else
+#define FM_STATUS_FLAG(ST) ((ST)->status)
+#define FM_BUSY_SET(ST,bclock) {}
+#define FM_BUSY_CLEAR(ST) {}
+#endif
+
+
+/* set algorithm connection */
+INLINE void setup_connection( FM_OPN *OPN, FM_CH *CH, int ch )
+{
+	INT32 *carrier = &OPN->out_fmch;
+
+	INT32 **om1 = &CH->connect1;
+	INT32 **om2 = &CH->connect3;
+	INT32 **oc1 = &CH->connect2;
+
+	INT32 **memc = &CH->mem_connect;
+
+	switch( CH->ALGO )
+	{
+	case 0:
+		/* M1---C1---MEM---M2---C2---OUT */
+		*om1 = &OPN->c1;
+		*oc1 = &OPN->mem;
+		*om2 = &OPN->c2;
+		*memc= &OPN->m2;
+		break;
+	case 1:
+		/* M1------+-MEM---M2---C2---OUT */
+		/* C1-+ */
+		*om1 = &OPN->mem;
+		*oc1 = &OPN->mem;
+		*om2 = &OPN->c2;
+		*memc= &OPN->m2;
+		break;
+	case 2:
+		/* M1-----------------+-C2---OUT */
+		/* C1---MEM---M2-+ */
+		*om1 = &OPN->c2;
+		*oc1 = &OPN->mem;
+		*om2 = &OPN->c2;
+		*memc= &OPN->m2;
+		break;
+	case 3:
+		/* M1---C1---MEM------+-C2---OUT */
+		/* M2-+ */
+		*om1 = &OPN->c1;
+		*oc1 = &OPN->mem;
+		*om2 = &OPN->c2;
+		*memc= &OPN->c2;
+		break;
+	case 4:
+		/* M1---C1-+-OUT */
+		/* M2---C2-+ */
+		/* MEM: not used */
+		*om1 = &OPN->c1;
+		*oc1 = carrier;
+		*om2 = &OPN->c2;
+		*memc= &OPN->mem;	/* store it anywhere where it will not be used */
+		break;
+	case 5:
+		/* +----C1----+ */
+		/* M1-+-MEM---M2-+-OUT */
+		/* +----C2----+ */
+		*om1 = 0;	/* special mark */
+		*oc1 = carrier;
+		*om2 = carrier;
+		*memc= &OPN->m2;
+		break;
+	case 6:
+		/* M1---C1-+ */
+		/* M2-+-OUT */
+		/* C2-+ */
+		/* MEM: not used */
+		*om1 = &OPN->c1;
+		*oc1 = carrier;
+		*om2 = carrier;
+		*memc= &OPN->mem;	/* store it anywhere where it will not be used */
+		break;
+	case 7:
+		/* M1-+ */
+		/* C1-+-OUT */
+		/* M2-+ */
+		/* C2-+ */
+		/* MEM: not used*/
+		*om1 = carrier;
+		*oc1 = carrier;
+		*om2 = carrier;
+		*memc= &OPN->mem;	/* store it anywhere where it will not be used */
+		break;
+	}
+
+	CH->connect4 = carrier;
+}
+
+/* set detune & multiple */
+INLINE void set_det_mul(FM_ST *ST,FM_CH *CH,FM_SLOT *SLOT,int v)
+{
+	SLOT->mul = (v&0x0f)? (v&0x0f)*2 : 1;
+	SLOT->DT = ST->dt_tab(v>>4)&7;
+	CH->SLOTSLOT1.Incr=-1;
+}
+
+/* set total level */
+INLINE void set_tl(FM_CH *CH,FM_SLOT *SLOT , int v)
+{
+	SLOT->tl = (v&0x7f)<<(ENV_BITS-7); /* 7bit TL */
+
+	/* recalculate EG output */
+	if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04)) && (SLOT->state > EG_REL))
+		SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
+	else
+		SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+}
+
+/* set attack rate & key scale */
+INLINE void set_ar_ksr(UINT8 type, FM_CH *CH,FM_SLOT *SLOT,int v)
+{
+	UINT8 old_KSR = SLOT->KSR;
+
+	SLOT->ar = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
+
+	SLOT->KSR = 3-(v>>6);
+	if (SLOT->KSR != old_KSR)
+	{
+		CH->SLOTSLOT1.Incr=-1;
+	}
+
+	/* Even if it seems unnecessary, in some odd case, KSR and KC are both modified */
+	/* and could result in SLOT->kc remaining unchanged. */
+	/* In such case, AR values would not be recalculated despite SLOT->ar has changed */
+	/* This fixes the introduction music of Batman & Robin (Eke-Eke) */
+	if ((SLOT->ar + SLOT->ksr) < 94 /*32+62*/)
+	{
+		SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+		SLOT->eg_sel_ar = eg_rate_select2612SLOT->ar + SLOT->ksr ;
+	}
+	else
+	{
+		SLOT->eg_sh_ar = 0;
+		SLOT->eg_sel_ar = 18*RATE_STEPS;	/* verified by Nemesis on real hardware */
+	}
+}
+
+/* set decay rate */
+INLINE void set_dr(UINT8 type, FM_SLOT *SLOT,int v)
+{
+	SLOT->d1r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
+
+	SLOT->eg_sh_d1r = eg_rate_shift SLOT->d1r + SLOT->ksr;
+	SLOT->eg_sel_d1r= eg_rate_select2612SLOT->d1r + SLOT->ksr;
+}
+
+/* set sustain rate */
+INLINE void set_sr(UINT8 type, FM_SLOT *SLOT,int v)
+{
+	SLOT->d2r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
+
+	SLOT->eg_sh_d2r = eg_rate_shift SLOT->d2r + SLOT->ksr;
+	SLOT->eg_sel_d2r= eg_rate_select2612SLOT->d2r + SLOT->ksr;
+}
+
+/* set release rate */
+INLINE void set_sl_rr(UINT8 type, FM_SLOT *SLOT,int v)
+{
+	SLOT->sl = sl_table v>>4 ;
+
+	/* check EG state changes */
+	if ((SLOT->state == EG_DEC) && (SLOT->volume >= (INT32)(SLOT->sl)))
+		SLOT->state = EG_SUS;
+
+	SLOT->rr = 34 + ((v&0x0f)<<2);
+
+	SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr;
+	SLOT->eg_sel_rr = eg_rate_select2612SLOT->rr + SLOT->ksr;
+}
+
+/* advance LFO to next sample */
+INLINE void advance_lfo(FM_OPN *OPN)
+{
+	if (OPN->lfo_timer_overflow) /* LFO enabled ? */
+	{
+		/* increment LFO timer */
+		OPN->lfo_timer += OPN->lfo_timer_add;
+
+		/* when LFO is enabled, one level will last for 108, 77, 71, 67, 62, 44, 8 or 5 samples */
+		while (OPN->lfo_timer >= OPN->lfo_timer_overflow)
+		{
+			OPN->lfo_timer -= OPN->lfo_timer_overflow;
+
+			/* There are 128 LFO steps */
+			OPN->lfo_cnt = ( OPN->lfo_cnt + 1 ) & 127;
+
+			// Valley Bell: Replaced old code (non-inverted triangle) with
+			// the one from Genesis Plus GX 1.71.
+			/* triangle (inverted) */
+			/* AM: from 126 to 0 step -2, 0 to 126 step +2 */
+			if (OPN->lfo_cnt<64)
+				OPN->LFO_AM = (OPN->lfo_cnt ^ 63) << 1;
+			else
+				OPN->LFO_AM = (OPN->lfo_cnt & 63) << 1;
+
+			/* PM works with 4 times slower clock */
+			OPN->LFO_PM = OPN->lfo_cnt >> 2;
+		}
+	}
+}
+
+INLINE void advance_eg_channel(FM_OPN *OPN, FM_SLOT *SLOT)
+{
+	//unsigned int out;
+	unsigned int i = 4; /* four operators per channel */
+
+	do
+	{
+		switch(SLOT->state)
+		{
+			case EG_ATT: /* attack phase */
+			if (!(OPN->eg_cnt & ((1<<SLOT->eg_sh_ar)-1)))
+			{
+			 /* update attenuation level */
+			 SLOT->volume += (~SLOT->volume * (eg_incSLOT->eg_sel_ar + ((OPN->eg_cnt>>SLOT->eg_sh_ar)&7)))>>4;
+
+			 /* check phase transition*/
+			 if (SLOT->volume <= MIN_ATT_INDEX)
+			 {
+				 SLOT->volume = MIN_ATT_INDEX;
+				 SLOT->state = (SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC; /* special case where SL=0 */
+			 }
+
+			 /* recalculate EG output */
+			 if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04))) /* SSG-EG Output Inversion */
+					SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
+			 else
+				 SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+			}
+			break;
+
+			case EG_DEC: /* decay phase */
+			if (!(OPN->eg_cnt & ((1<<SLOT->eg_sh_d1r)-1)))
+			{
+			 /* SSG EG type */
+			 if (SLOT->ssg&0x08)
+			 {
+				 /* update attenuation level */
+				 if (SLOT->volume < 0x200)
+					{
+						SLOT->volume += 4 * eg_incSLOT->eg_sel_d1r + ((OPN->eg_cnt>>SLOT->eg_sh_d1r)&7);
+
+						/* recalculate EG output */
+						if (SLOT->ssgn ^ (SLOT->ssg&0x04)) /* SSG-EG Output Inversion */
+							SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
+						else
+							SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+					}
+
+			 }
+			 else
+			 {
+					/* update attenuation level */
+					SLOT->volume += eg_incSLOT->eg_sel_d1r + ((OPN->eg_cnt>>SLOT->eg_sh_d1r)&7);
+
+					/* recalculate EG output */
+					SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+			 }
+
+			 /* check phase transition*/
+			 if (SLOT->volume >= (INT32)(SLOT->sl))
+				 SLOT->state = EG_SUS;
+			}
+			break;
+
+			case EG_SUS: /* sustain phase */
+			if (!(OPN->eg_cnt & ((1<<SLOT->eg_sh_d2r)-1)))
+			{
+			 /* SSG EG type */
+			 if (SLOT->ssg&0x08)
+			 {
+					/* update attenuation level */
+					if (SLOT->volume < 0x200)
+					{
+						SLOT->volume += 4 * eg_incSLOT->eg_sel_d2r + ((OPN->eg_cnt>>SLOT->eg_sh_d2r)&7);
+
+						/* recalculate EG output */
+						if (SLOT->ssgn ^ (SLOT->ssg&0x04)) /* SSG-EG Output Inversion */
+							SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
+						else
+							SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+					}
+			 }
+			 else
+			 {
+				 /* update attenuation level */
+				 SLOT->volume += eg_incSLOT->eg_sel_d2r + ((OPN->eg_cnt>>SLOT->eg_sh_d2r)&7);
+
+				 /* check phase transition*/
+				 if ( SLOT->volume >= MAX_ATT_INDEX )
+					 SLOT->volume = MAX_ATT_INDEX;
+				 /* do not change SLOT->state (verified on real chip) */
+
+				 /* recalculate EG output */
+				 SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+			 }
+			}
+			break;
+
+			case EG_REL: /* release phase */
+			if (!(OPN->eg_cnt & ((1<<SLOT->eg_sh_rr)-1)))
+			{
+			 /* SSG EG type */
+			 if (SLOT->ssg&0x08)
+			 {
+				 /* update attenuation level */
+				 if (SLOT->volume < 0x200)
+					 SLOT->volume += 4 * eg_incSLOT->eg_sel_rr + ((OPN->eg_cnt>>SLOT->eg_sh_rr)&7);
+					/* check phase transition */
+					if (SLOT->volume >= 0x200)
+					{
+						SLOT->volume = MAX_ATT_INDEX;
+						SLOT->state = EG_OFF;
+					}
+			 }
+			 else
+			 {
+				 /* update attenuation level */
+				 SLOT->volume += eg_incSLOT->eg_sel_rr + ((OPN->eg_cnt>>SLOT->eg_sh_rr)&7);
+
+				 /* check phase transition*/
+				 if (SLOT->volume >= MAX_ATT_INDEX)
+				 {
+					 SLOT->volume = MAX_ATT_INDEX;
+					 SLOT->state = EG_OFF;
+				 }
+			 }
+
+			 /* recalculate EG output */
+			 SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+
+			}
+			break;
+		}
+
+		// Valley Bell: These few lines are missing in Genesis Plus GX' ym2612 core file.
+		// Disabling them fixes the SSG-EG.
+		// Additional Note: Asterix and the Great Rescue: Level 1 sounds "better" with these lines,
+		//					but less accurate.
+		/*out = ((UINT32)SLOT->volume);
+
+		// negate output (changes come from alternate bit, init comes from attack bit)
+		if ((SLOT->ssg&0x08) && (SLOT->ssgn&2) && (SLOT->state > EG_REL))
+			out ^= MAX_ATT_INDEX;
+
+		// we need to store the result here because we are going to change ssgn
+		// in next instruction
+		SLOT->vol_out = out + SLOT->tl;*/
+
+		SLOT++;
+		i--;
+	}while (i);
+
+}
+
+/* SSG-EG update process */
+/* The behavior is based upon Nemesis tests on real hardware */
+/* This is actually executed before each samples */
+INLINE void update_ssg_eg_channel(FM_SLOT *SLOT)
+{
+	unsigned int i = 4; /* four operators per channel */
+
+	do
+	{
+		/* detect SSG-EG transition */
+		/* this is not required during release phase as the attenuation has been forced to MAX and output invert flag is not used */
+		/* if an Attack Phase is programmed, inversion can occur on each sample */
+		if ((SLOT->ssg & 0x08) && (SLOT->volume >= 0x200) && (SLOT->state > EG_REL))
+		{
+			if (SLOT->ssg & 0x01) /* bit 0 = hold SSG-EG */
+			{
+				/* set inversion flag */
+			 if (SLOT->ssg & 0x02)
+				 SLOT->ssgn = 4;
+
+				/* force attenuation level during decay phases */
+				if ((SLOT->state != EG_ATT) && !(SLOT->ssgn ^ (SLOT->ssg & 0x04)))
+					SLOT->volume = MAX_ATT_INDEX;
+			}
+			else /* loop SSG-EG */
+			{
+				/* toggle output inversion flag or reset Phase Generator */
+			 if (SLOT->ssg & 0x02)
+			 	SLOT->ssgn ^= 4;
+			 else
+			 	SLOT->phase = 0;
+
+				/* same as Key ON */
+				if (SLOT->state != EG_ATT)
+				{
+					if ((SLOT->ar + SLOT->ksr) < 94 /*32+62*/)
+					{
+						SLOT->state = (SLOT->volume <= MIN_ATT_INDEX) ? ((SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC) : EG_ATT;
+					}
+					else
+					{
+						/* Attack Rate is maximal: directly switch to Decay or Substain */
+						SLOT->volume = MIN_ATT_INDEX;
+						SLOT->state = (SLOT->sl == MIN_ATT_INDEX) ? EG_SUS : EG_DEC;
+					}
+				}
+			}
+
+			/* recalculate EG output */
+			if (SLOT->ssgn ^ (SLOT->ssg&0x04))
+				SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
+			else
+				SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+		}
+
+		/* next slot */
+		SLOT++;
+		i--;
+	} while (i);
+}
+
+
+INLINE void update_phase_lfo_slot(FM_OPN *OPN, FM_SLOT *SLOT, INT32 pms, UINT32 block_fnum)
+{
+	UINT32 fnum_lfo = ((block_fnum & 0x7f0) >> 4) * 32 * 8;
+	INT32 lfo_fn_table_index_offset = lfo_pm_table fnum_lfo + pms + OPN->LFO_PM ;
+
+	block_fnum = block_fnum*2 + lfo_fn_table_index_offset;
+
+	if (lfo_fn_table_index_offset) /* LFO phase modulation active */
+	{
+		UINT8 blk = (block_fnum&0x7000) >> 12;
+		UINT32 fn = block_fnum & 0xfff;
+
+		/* recalculate keyscale code */
+		/*int kc = (blk<<2) | opn_fktablefn >> 7;*/
+		/* This really stupid bug caused a read outside of the
+		 array size 0x10 and returned invalid values.
+		 This caused an annoying vibrato for some notes.
+		 (Note: seems to be a copy-and-paste from OPNWriteReg -> case 0xA0)
+		 Why are MAME cores always SOO buggy ?! */
+		/* Oh, and before I forget: it's correct in fm.c */
+		int kc = (blk<<2) | opn_fktablefn >> 8;
+		/* Thanks to Blargg - his patch that helped me to find this bug */
+
+		/* recalculate (frequency) phase increment counter */
+		int fc = (OPN->fn_tablefn>>(7-blk)) + SLOT->DTkc;
+
+		/* (frequency) phase overflow (credits to Nemesis) */
+		if (fc < 0) fc += OPN->fn_max;
+
+		/* update phase */
+		SLOT->phase += (fc * SLOT->mul) >> 1;
+	}
+	else /* LFO phase modulation = zero */
+	{
+		SLOT->phase += SLOT->Incr;
+	}
+}
+
+INLINE void update_phase_lfo_channel(FM_OPN *OPN, FM_CH *CH)
+{
+	UINT32 block_fnum = CH->block_fnum;
+
+	UINT32 fnum_lfo = ((block_fnum & 0x7f0) >> 4) * 32 * 8;
+	INT32 lfo_fn_table_index_offset = lfo_pm_table fnum_lfo + CH->pms + OPN->LFO_PM ;
+
+	block_fnum = block_fnum*2 + lfo_fn_table_index_offset;
+
+	if (lfo_fn_table_index_offset) /* LFO phase modulation active */
+	{
+		UINT8 blk = (block_fnum&0x7000) >> 12;
+		UINT32 fn = block_fnum & 0xfff;
+
+		/* recalculate keyscale code */
+		/*int kc = (blk<<2) | opn_fktablefn >> 7;*/
+		/* the same stupid bug as above */
+		int kc = (blk<<2) | opn_fktablefn >> 8;
+
+		/* recalculate (frequency) phase increment counter */
+		int fc = (OPN->fn_tablefn>>(7-blk));
+
+		/* (frequency) phase overflow (credits to Nemesis) */
+		int finc = fc + CH->SLOTSLOT1.DTkc;
+		if (finc < 0) finc += OPN->fn_max;
+		CH->SLOTSLOT1.phase += (finc*CH->SLOTSLOT1.mul) >> 1;
+
+		finc = fc + CH->SLOTSLOT2.DTkc;
+		if (finc < 0) finc += OPN->fn_max;
+		CH->SLOTSLOT2.phase += (finc*CH->SLOTSLOT2.mul) >> 1;
+
+		finc = fc + CH->SLOTSLOT3.DTkc;
+		if (finc < 0) finc += OPN->fn_max;
+		CH->SLOTSLOT3.phase += (finc*CH->SLOTSLOT3.mul) >> 1;
+
+		finc = fc + CH->SLOTSLOT4.DTkc;
+		if (finc < 0) finc += OPN->fn_max;
+		CH->SLOTSLOT4.phase += (finc*CH->SLOTSLOT4.mul) >> 1;
+	}
+	else /* LFO phase modulation = zero */
+	{
+	 CH->SLOTSLOT1.phase += CH->SLOTSLOT1.Incr;
+	 CH->SLOTSLOT2.phase += CH->SLOTSLOT2.Incr;
+	 CH->SLOTSLOT3.phase += CH->SLOTSLOT3.Incr;
+	 CH->SLOTSLOT4.phase += CH->SLOTSLOT4.Incr;
+	}
+}
+
+/* update phase increment and envelope generator */
+INLINE void refresh_fc_eg_slot(FM_OPN *OPN, FM_SLOT *SLOT , int fc , int kc )
+{
+	int ksr = kc >> SLOT->KSR;
+
+	fc += SLOT->DTkc;
+
+	/* detects frequency overflow (credits to Nemesis) */
+	if (fc < 0) fc += OPN->fn_max;
+
+	/* (frequency) phase increment counter */
+	SLOT->Incr = (fc * SLOT->mul) >> 1;
+
+	if( SLOT->ksr != ksr )
+	{
+		SLOT->ksr = ksr;
+
+		/* calculate envelope generator rates */
+		if ((SLOT->ar + SLOT->ksr) < 32+62)
+		{
+			SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+			SLOT->eg_sel_ar = eg_rate_select2612SLOT->ar + SLOT->ksr ;
+		}
+		else
+		{
+			SLOT->eg_sh_ar = 0;
+			SLOT->eg_sel_ar = 18*RATE_STEPS; /* verified by Nemesis on real hardware (Attack phase is blocked) */
+		}
+
+		SLOT->eg_sh_d1r = eg_rate_shift SLOT->d1r + SLOT->ksr;
+		SLOT->eg_sh_d2r = eg_rate_shift SLOT->d2r + SLOT->ksr;
+		SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr;
+
+		SLOT->eg_sel_d1r= eg_rate_select2612SLOT->d1r + SLOT->ksr;
+		SLOT->eg_sel_d2r= eg_rate_select2612SLOT->d2r + SLOT->ksr;
+		SLOT->eg_sel_rr = eg_rate_select2612SLOT->rr + SLOT->ksr;
+	}
+}
+
+/* update phase increment counters */
+INLINE void refresh_fc_eg_chan(FM_OPN *OPN, FM_CH *CH )
+{
+	if( CH->SLOTSLOT1.Incr==-1)
+	{
+		int fc = CH->fc;
+		int kc = CH->kcode;
+		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT1 , fc , kc );
+		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT2 , fc , kc );
+		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT3 , fc , kc );
+		refresh_fc_eg_slot(OPN, &CH->SLOTSLOT4 , fc , kc );
+	}
+}
+
+#define volume_calc(OP) ((OP)->vol_out + (AM & (OP)->AMmask))
+
+INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm)
+{
+ UINT32 p;
+
+ p = (env<<3) + sin_tab ( ((signed int)((phase & ~FREQ_MASK) + (pm<<15))) >> FREQ_SH ) & SIN_MASK ;
+
+ if (p >= TL_TAB_LEN)
+ return 0;
+ return tl_tabp;
+}
+
+INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm)
+{
+ UINT32 p;
+
+ p = (env<<3) + sin_tab ( ((signed int)((phase & ~FREQ_MASK) + pm )) >> FREQ_SH ) & SIN_MASK ;
+
+ if (p >= TL_TAB_LEN)
+ return 0;
+ return tl_tabp;
+}
+
+INLINE void chan_calc(YM2612 *F2612, FM_OPN *OPN, FM_CH *CH)
+{
+ UINT32 AM = OPN->LFO_AM >> CH->ams;
+ unsigned int eg_out;
+
+ if (CH->Muted)
+ return;
+
+ OPN->m2 = OPN->c1 = OPN->c2 = OPN->mem = 0;
+
+ *CH->mem_connect = CH->mem_value; /* restore delayed sample (MEM) value to m2 or c2 */
+
+ eg_out = volume_calc(&CH->SLOTSLOT1);
+ {
+ INT32 out = CH->op1_out0 + CH->op1_out1;
+ CH->op1_out0 = CH->op1_out1;
+
+ if( !CH->connect1 )
+ {
+ /* algorithm 5 */
+ OPN->mem = OPN->c1 = OPN->c2 = CH->op1_out0;
+ }
+ else
+ {
+ /* other algorithms */
+ *CH->connect1 += CH->op1_out0;
+ }
+
+
+ CH->op1_out1 = 0;
+ if( eg_out < ENV_QUIET ) /* SLOT 1 */
+ {
+ if (!CH->FB)
+ out=0;
+
+ CH->op1_out1 = op_calc1(CH->SLOTSLOT1.phase, eg_out, (out<<CH->FB) );
+ }
+ }
+
+ eg_out = volume_calc(&CH->SLOTSLOT3);
+ if( eg_out < ENV_QUIET ) /* SLOT 3 */
+ *CH->connect3 += op_calc(CH->SLOTSLOT3.phase, eg_out, OPN->m2);
+
+ eg_out = volume_calc(&CH->SLOTSLOT2);
+ if( eg_out < ENV_QUIET ) /* SLOT 2 */
+ *CH->connect2 += op_calc(CH->SLOTSLOT2.phase, eg_out, OPN->c1);
+
+ eg_out = volume_calc(&CH->SLOTSLOT4);
+ if( eg_out < ENV_QUIET ) /* SLOT 4 */
+ *CH->connect4 += op_calc(CH->SLOTSLOT4.phase, eg_out, OPN->c2);
+
+
+ /* store current MEM */
+ CH->mem_value = OPN->mem;
+
+ /* update phase counters AFTER output calculations */
+ if(CH->pms)
+ {
+ /* add support for 3 slot mode */
+ if ((OPN->ST.mode & 0xC0) && (CH == &F2612->CH2))
+ {
+ update_phase_lfo_slot(OPN, &CH->SLOTSLOT1, CH->pms, OPN->SL3.block_fnum1);
+ update_phase_lfo_slot(OPN, &CH->SLOTSLOT2, CH->pms, OPN->SL3.block_fnum2);
+ update_phase_lfo_slot(OPN, &CH->SLOTSLOT3, CH->pms, OPN->SL3.block_fnum0);
+ update_phase_lfo_slot(OPN, &CH->SLOTSLOT4, CH->pms, CH->block_fnum);
+ }
+ else update_phase_lfo_channel(OPN, CH);
+ }
+ else /* no LFO phase modulation */
+ {
+ CH->SLOTSLOT1.phase += CH->SLOTSLOT1.Incr;
+ CH->SLOTSLOT2.phase += CH->SLOTSLOT2.Incr;
+ CH->SLOTSLOT3.phase += CH->SLOTSLOT3.Incr;
+ CH->SLOTSLOT4.phase += CH->SLOTSLOT4.Incr;
+ }
+}
+
+static void FMCloseTable( void )
+{
+#ifdef SAVE_SAMPLE
+	fclose(sample0);
+#endif
+	return;
+}
+
+
+/* CSM Key Controll */
+INLINE void CSMKeyControll(FM_OPN *OPN, FM_CH *CH)
+{
+	/* all key ON (verified by Nemesis on real hardware) */
+	FM_KEYON_CSM(OPN,CH,SLOT1);
+	FM_KEYON_CSM(OPN,CH,SLOT2);
+	FM_KEYON_CSM(OPN,CH,SLOT3);
+	FM_KEYON_CSM(OPN,CH,SLOT4);
+	OPN->SL3.key_csm = 1;
+}
+
+#ifdef __STATE_H__
+/* FM channel save , internal state only */
+static void FMsave_state_channel(running_device *device,FM_CH *CH,int num_ch)
+{
+	int slot , ch;
+
+	for(ch=0;ch<num_ch;ch++,CH++)
+	{
+		/* channel */
+		state_save_register_device_item_array(device, ch, CH->op1_out);
+		state_save_register_device_item(device, ch, CH->fc);
+		/* slots */
+		for(slot=0;slot<4;slot++)
+		{
+			FM_SLOT *SLOT = &CH->SLOTslot;
+			state_save_register_device_item(device, ch * 4 + slot, SLOT->phase);
+			state_save_register_device_item(device, ch * 4 + slot, SLOT->state);
+			state_save_register_device_item(device, ch * 4 + slot, SLOT->volume);
+		}
+	}
+}
+
+static void FMsave_state_st(running_device *device,FM_ST *ST)
+{
+#if FM_BUSY_FLAG_SUPPORT
+	state_save_register_device_item(device, 0, ST->busy_expiry_time.seconds );
+	state_save_register_device_item(device, 0, ST->busy_expiry_time.attoseconds );
+#endif
+	state_save_register_device_item(device, 0, ST->address );
+	state_save_register_device_item(device, 0, ST->irq );
+	state_save_register_device_item(device, 0, ST->irqmask );
+	state_save_register_device_item(device, 0, ST->status );
+	state_save_register_device_item(device, 0, ST->mode );
+	state_save_register_device_item(device, 0, ST->prescaler_sel );
+	state_save_register_device_item(device, 0, ST->fn_h );
+	state_save_register_device_item(device, 0, ST->TA );
+	state_save_register_device_item(device, 0, ST->TAC );
+	state_save_register_device_item(device, 0, ST->TB );
+	state_save_register_device_item(device, 0, ST->TBC );
+}
+#endif /* _STATE_H */
+
+#if BUILD_OPN
+/* write a OPN mode register 0x20-0x2f */
+static void OPNWriteMode(FM_OPN *OPN, int r, int v)
+{
+	UINT8 c;
+	FM_CH *CH;
+
+	switch(r)
+	{
+	case 0x21:	/* Test */
+		break;
+	case 0x22:	/* LFO FREQ (YM2608/YM2610/YM2610B/YM2612) */
+		if (v&8) /* LFO enabled ? */
+		{
+			/*if (!OPN->lfo_timer_overflow)
+			{
+				// restart LFO
+				OPN->lfo_cnt = 0;
+				OPN->lfo_timer = 0;
+				OPN->LFO_AM = 0;
+				OPN->LFO_PM = 0;
+			}*/
+
+			OPN->lfo_timer_overflow = lfo_samples_per_stepv&7 << LFO_SH;
+		}
+		else
+		{
+			// Valley Bell: Ported from Genesis Plus GX 1.71
+			// hold LFO waveform in reset state
+			OPN->lfo_timer_overflow = 0;
+			OPN->lfo_timer = 0;
+			OPN->lfo_cnt = 0;
+			
+			
+			OPN->LFO_PM = 0;
+			OPN->LFO_AM = 126;
+			//OPN->lfo_timer_overflow = 0;
+		}
+		break;
+	case 0x24:	/* timer A High 8*/
+		OPN->ST.TA = (OPN->ST.TA & 0x03)|(((int)v)<<2);
+		break;
+	case 0x25:	/* timer A Low 2*/
+		OPN->ST.TA = (OPN->ST.TA & 0x3fc)|(v&3);
+		break;
+	case 0x26:	/* timer B */
+		OPN->ST.TB = v;
+		break;
+	case 0x27:	/* mode, timer control */
+		set_timers( OPN, &(OPN->ST),OPN->ST.param,v );
+		break;
+	case 0x28:	/* key on / off */
+		c = v & 0x03;
+		if( c == 3 ) break;
+		if( (v&0x04) && (OPN->type & TYPE_6CH) ) c+=3;
+		CH = OPN->P_CH;
+		CH = &CHc;
+		if(v&0x10) FM_KEYON(OPN,CH,SLOT1); else FM_KEYOFF(OPN,CH,SLOT1);
+		if(v&0x20) FM_KEYON(OPN,CH,SLOT2); else FM_KEYOFF(OPN,CH,SLOT2);
+		if(v&0x40) FM_KEYON(OPN,CH,SLOT3); else FM_KEYOFF(OPN,CH,SLOT3);
+		if(v&0x80) FM_KEYON(OPN,CH,SLOT4); else FM_KEYOFF(OPN,CH,SLOT4);
+		break;
+	}
+}
+
+/* write a OPN register (0x30-0xff) */
+static void OPNWriteReg(FM_OPN *OPN, int r, int v)
+{
+	FM_CH *CH;
+	FM_SLOT *SLOT;
+
+	UINT8 c = OPN_CHAN(r);
+
+	if (c == 3) return; /* 0xX3,0xX7,0xXB,0xXF */
+
+	if (r >= 0x100) c+=3;
+
+	CH = OPN->P_CH;
+	CH = &CHc;
+
+	SLOT = &(CH->SLOTOPN_SLOT(r));
+
+	switch( r & 0xf0 ) {
+	case 0x30:	/* DET , MUL */
+		set_det_mul(&OPN->ST,CH,SLOT,v);
+		break;
+
+	case 0x40:	/* TL */
+		set_tl(CH,SLOT,v);
+		break;
+
+	case 0x50:	/* KS, AR */
+		set_ar_ksr(OPN->type,CH,SLOT,v);
+		break;
+
+	case 0x60:	/* bit7 = AM ENABLE, DR */
+		set_dr(OPN->type, SLOT,v);
+
+		if(OPN->type & TYPE_LFOPAN) /* YM2608/2610/2610B/2612 */
+		{
+			SLOT->AMmask = (v&0x80) ? ~0 : 0;
+		}
+		break;
+
+	case 0x70:	/* SR */
+		set_sr(OPN->type,SLOT,v);
+		break;
+
+	case 0x80:	/* SL, RR */
+		set_sl_rr(OPN->type,SLOT,v);
+		break;
+
+	case 0x90:	/* SSG-EG */
+		SLOT->ssg = v&0x0f;
+
+	 /* recalculate EG output */
+		if (SLOT->state > EG_REL)
+		{
+			if ((SLOT->ssg&0x08) && (SLOT->ssgn ^ (SLOT->ssg&0x04)))
+				SLOT->vol_out = ((UINT32)(0x200 - SLOT->volume) & MAX_ATT_INDEX) + SLOT->tl;
+			else
+				SLOT->vol_out = (UINT32)SLOT->volume + SLOT->tl;
+		}
+
+		/* SSG-EG envelope shapes :
+
+ E AtAlH
+ 1 0 0 0 \\\\
+
+ 1 0 0 1 \___
+
+ 1 0 1 0 \/\/
+ ___
+ 1 0 1 1 \
+
+ 1 1 0 0 ////
+ ___
+ 1 1 0 1 /
+
+ 1 1 1 0 /\/\
+
+ 1 1 1 1 /___
+
+
+ E = SSG-EG enable
+
+
+ The shapes are generated using Attack, Decay and Sustain phases.
+
+ Each single character in the diagrams above represents this whole
+ sequence:
+
+ - when KEY-ON = 1, normal Attack phase is generated (*without* any
+ difference when compared to normal mode),
+
+ - later, when envelope level reaches minimum level (max volume),
+ the EG switches to Decay phase (which works with bigger steps
+ when compared to normal mode - see below),
+
+ - later when envelope level passes the SL level,
+ the EG swithes to Sustain phase (which works with bigger steps
+ when compared to normal mode - see below),
+
+ - finally when envelope level reaches maximum level (min volume),
+ the EG switches to Attack phase again (depends on actual waveform).
+
+ Important is that when switch to Attack phase occurs, the phase counter
+ of that operator will be zeroed-out (as in normal KEY-ON) but not always.
+ (I havent found the rule for that - perhaps only when the output level is low)
+
+ The difference (when compared to normal Envelope Generator mode) is
+ that the resolution in Decay and Sustain phases is 4 times lower;
+ this results in only 256 steps instead of normal 1024.
+ In other words:
+ when SSG-EG is disabled, the step inside of the EG is one,
+ when SSG-EG is enabled, the step is four (in Decay and Sustain phases).
+
+ Times between the level changes are the same in both modes.
+
+
+ Important:
+ Decay 1 Level (so called SL) is compared to actual SSG-EG output, so
+ it is the same in both SSG and no-SSG modes, with this exception:
+
+ when the SSG-EG is enabled and is generating raising levels
+ (when the EG output is inverted) the SL will be found at wrong level !!!
+ For example, when SL=02:
+ 0 -6 = -6dB in non-inverted EG output
+ 96-6 = -90dB in inverted EG output
+ Which means that EG compares its level to SL as usual, and that the
+ output is simply inverted afterall.
+
+
+ The Yamaha's manuals say that AR should be set to 0x1f (max speed).
+ That is not necessary, but then EG will be generating Attack phase.
+
+ */
+
+
+		break;
+
+	case 0xa0:
+		switch( OPN_SLOT(r) )
+		{
+		case 0:		/* 0xa0-0xa2 : FNUM1 */
+			{
+				UINT32 fn = (((UINT32)( (OPN->ST.fn_h)&7))<<8) + v;
+				UINT8 blk = OPN->ST.fn_h>>3;
+				/* keyscale code */
+				CH->kcode = (blk<<2) | opn_fktablefn >> 7;
+				/* phase increment counter */
+				CH->fc = OPN->fn_tablefn*2>>(7-blk);
+
+				/* store fnum in clear form for LFO PM calculations */
+				CH->block_fnum = (blk<<11) | fn;
+
+				CH->SLOTSLOT1.Incr=-1;
+			}
+			break;
+		case 1:		/* 0xa4-0xa6 : FNUM2,BLK */
+			OPN->ST.fn_h = v&0x3f;
+			break;
+		case 2:		/* 0xa8-0xaa : 3CH FNUM1 */
+			if(r < 0x100)
+			{
+				UINT32 fn = (((UINT32)(OPN->SL3.fn_h&7))<<8) + v;
+				UINT8 blk = OPN->SL3.fn_h>>3;
+				/* keyscale code */
+				OPN->SL3.kcodec= (blk<<2) | opn_fktablefn >> 7;
+				/* phase increment counter */
+				OPN->SL3.fcc = OPN->fn_tablefn*2>>(7-blk);
+				OPN->SL3.block_fnumc = (blk<<11) | fn;
+				(OPN->P_CH)2.SLOTSLOT1.Incr=-1;
+			}
+			break;
+		case 3:		/* 0xac-0xae : 3CH FNUM2,BLK */
+			if(r < 0x100)
+				OPN->SL3.fn_h = v&0x3f;
+			break;
+		}
+		break;
+
+	case 0xb0:
+		switch( OPN_SLOT(r) )
+		{
+		case 0:		/* 0xb0-0xb2 : FB,ALGO */
+			{
+				int feedback = (v>>3)&7;
+				CH->ALGO = v&7;
+				CH->FB = feedback ? feedback+6 : 0;
+				setup_connection( OPN, CH, c );
+			}
+			break;
+		case 1:		/* 0xb4-0xb6 : L , R , AMS , PMS (YM2612/YM2610B/YM2610/YM2608) */
+			if( OPN->type & TYPE_LFOPAN)
+			{
+				/* b0-2 PMS */
+				CH->pms = (v & 7) * 32; /* CH->pms = PM depth * 32 (index in lfo_pm_table) */
+
+				/* b4-5 AMS */
+				CH->ams = lfo_ams_depth_shift(v>>4) & 0x03;
+
+				/* PAN : b7 = L, b6 = R */
+				OPN->pan c*2 = (v & 0x80) ? ~0 : 0;
+				OPN->pan c*2+1 = (v & 0x40) ? ~0 : 0;
+
+			}
+			break;
+		}
+		break;
+	}
+}
+
+/* initialize time tables */
+static void init_timetables(FM_OPN *OPN, double freqbase)
+{
+	int i,d;
+	double rate;
+
+	/* DeTune table */
+	for (d = 0;d <= 3;d++)
+	{
+		for (i = 0;i <= 31;i++)
+		{
+			rate = ((double)dt_tabd*32 + i) * freqbase * (1<<(FREQ_SH-10)); /* -10 because chip works with 10.10 fixed point, while we use 16.16 */
+			OPN->ST.dt_tabdi = (INT32) rate;
+			OPN->ST.dt_tabd+4i = -OPN->ST.dt_tabdi;
+		}
+	}
+
+	/* there are 2048 FNUMs that can be generated using FNUM/BLK registers
+ but LFO works with one more bit of a precision so we really need 4096 elements */
+	/* calculate fnumber -> increment counter table */
+	for(i = 0; i < 4096; i++)
+	{
+		/* freq table for octave 7 */
+		/* OPN phase increment counter = 20bit */
+		/* the correct formula is : F-Number = (144 * fnote * 2^20 / M) / 2^(B-1) */
+		/* where sample clock is M/144 */
+		/* this means the increment value for one clock sample is FNUM * 2^(B-1) = FNUM * 64 for octave 7 */
+		/* we also need to handle the ratio between the chip frequency and the emulated frequency (can be 1.0) */
+		OPN->fn_tablei = (UINT32)( (double)i * 32 * freqbase * (1<<(FREQ_SH-10)) ); /* -10 because chip works with 10.10 fixed point, while we use 16.16 */
+	}
+
+	/* maximal frequency is required for Phase overflow calculation, register size is 17 bits (Nemesis) */
+	OPN->fn_max = (UINT32)( (double)0x20000 * freqbase * (1<<(FREQ_SH-10)) );
+}
+
+/* prescaler set (and make time tables) */
+static void OPNSetPres(FM_OPN *OPN, int pres, int timer_prescaler, int SSGpres)
+{
+	/* frequency base */
+	OPN->ST.freqbase = (OPN->ST.rate) ? ((double)OPN->ST.clock / OPN->ST.rate) / pres : 0;
+
+	/* EG is updated every 3 samples */
+	OPN->eg_timer_add = (UINT32)((1<<EG_SH) * OPN->ST.freqbase);
+	OPN->eg_timer_overflow = ( 3 ) * (1<<EG_SH);
+
+	/* LFO timer increment (every samples) */
+	OPN->lfo_timer_add = (UINT32)((1<<LFO_SH) * OPN->ST.freqbase);
+
+	/* Timer base time */
+	OPN->ST.timer_prescaler = timer_prescaler;
+
+	/* SSG part prescaler set */
+	if( SSGpres ) (*OPN->ST.SSG->set_clock)( OPN->ST.param, OPN->ST.clock * 2 / SSGpres );
+
+	/* make time tables */
+	init_timetables(OPN, OPN->ST.freqbase);
+}
+
+static void reset_channels( FM_ST *ST , FM_CH *CH , int num )
+{
+	int c,s;
+
+	for( c = 0 ; c < num ; c++ )
+	{
+		//memset(&CHc, 0x00, sizeof(FM_CH));
+		CHc.mem_value = 0;
+		CHc.op1_out0 = 0;
+		CHc.op1_out1 = 0;
+		CHc.fc = 0;
+		for(s = 0 ; s < 4 ; s++ )
+		{
+			//memset(&CHc.SLOTs, 0x00, sizeof(FM_SLOT));
+			CHc.SLOTs.Incr = -1;
+			CHc.SLOTs.key = 0;
+			CHc.SLOTs.phase = 0;
+			CHc.SLOTs.ssg = 0;
+			CHc.SLOTs.ssgn = 0;
+			CHc.SLOTs.state= EG_OFF;
+			CHc.SLOTs.volume = MAX_ATT_INDEX;
+			CHc.SLOTs.vol_out= MAX_ATT_INDEX;
+		}
+	}
+}
+
+/* initialize generic tables */
+static void init_tables(void)
+{
+	signed int i,x;
+	signed int n;
+	double o,m;
+
+	/* build Linear Power Table */
+	for (x=0; x<TL_RES_LEN; x++)
+	{
+		m = (1<<16) / pow(2, (x+1) * (ENV_STEP/4.0) / 8.0);
+		m = floor(m);
+
+		/* we never reach (1<<16) here due to the (x+1) */
+		/* result fits within 16 bits at maximum */
+
+		n = (int)m;		/* 16 bits here */
+		n >>= 4;		/* 12 bits here */
+		if (n&1)		/* round to nearest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+						/* 11 bits here (rounded) */
+		n <<= 2;		/* 13 bits here (as in real chip) */
+
+
+		/* 14 bits (with sign bit) */
+		tl_tab x*2 + 0 = n;
+		tl_tab x*2 + 1 = -tl_tab x*2 + 0 ;
+
+		/* one entry in the 'Power' table use the following format, xxxxxyyyyyyyys with: */
+		/* s = sign bit */
+		/* yyyyyyyy = 8-bits decimal part (0-TL_RES_LEN) */
+		/* xxxxx = 5-bits integer 'shift' value (0-31) but, since Power table output is 13 bits, */
+		/* any value above 13 (included) would be discarded. */
+		for (i=1; i<13; i++)
+		{
+			tl_tab x*2+0 + i*2*TL_RES_LEN = tl_tab x*2+0 >>i;
+			tl_tab x*2+1 + i*2*TL_RES_LEN = -tl_tab x*2+0 + i*2*TL_RES_LEN ;
+		}
+	}
+
+	/* build Logarithmic Sinus table */
+	for (i=0; i<SIN_LEN; i++)
+	{
+		/* non-standard sinus */
+		m = sin( ((i*2)+1) * M_PI / SIN_LEN ); /* checked against the real chip */
+		/* we never reach zero here due to ((i*2)+1) */
+
+		if (m>0.0)
+			o = 8*log(1.0/m)/log(2.0);	/* convert to 'decibels' */
+		else
+			o = 8*log(-1.0/m)/log(2.0);	/* convert to 'decibels' */
+
+		o = o / (ENV_STEP/4);
+
+		n = (int)(2.0*o);
+		if (n&1) 		/* round to nearest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+
+		/* 13-bits (8.5) value is formatted for above 'Power' table */
+		sin_tab i = n*2 + (m>=0.0? 0: 1 );
+	}
+
+	/* build LFO PM modulation table */
+	for(i = 0; i < 8; i++) /* 8 PM depths */
+	{
+		UINT8 fnum;
+		for (fnum=0; fnum<128; fnum++) /* 7 bits meaningful of F-NUMBER */
+		{
+			UINT8 value;
+			UINT8 step;
+			UINT32 offset_depth = i;
+			UINT32 offset_fnum_bit;
+			UINT32 bit_tmp;
+
+			for (step=0; step<8; step++)
+			{
+				value = 0;
+				for (bit_tmp=0; bit_tmp<7; bit_tmp++) /* 7 bits */
+				{
+					if (fnum & (1<<bit_tmp)) /* only if bit "bit_tmp" is set */
+					{
+						offset_fnum_bit = bit_tmp * 8;
+						value += lfo_pm_outputoffset_fnum_bit + offset_depthstep;
+					}
+				}
+				/* 32 steps for LFO PM (sinus) */
+				lfo_pm_table(fnum*32*8) + (i*32) + step + 0 = value;
+				lfo_pm_table(fnum*32*8) + (i*32) +(step^7)+ 8 = value;
+				lfo_pm_table(fnum*32*8) + (i*32) + step +16 = -value;
+				lfo_pm_table(fnum*32*8) + (i*32) +(step^7)+24 = -value;
+			}
+
+		}
+	}
+
+#ifdef SAVE_SAMPLE
+	sample0=fopen("sampsum.pcm","wb");
+#endif
+}
+
+#endif /* BUILD_OPN */
+
+#if (BUILD_YM2612||BUILD_YM3438)
+/*******************************************************************************/
+/* YM2612 local section */
+/*******************************************************************************/
+
+/* Generate samples for one of the YM2612s */
+void ym2612_update_one(void *chip, FMSAMPLE **buffer, int length)
+{
+	YM2612 *F2612 = (YM2612 *)chip;
+	FM_OPN *OPN = &F2612->OPN;
+	INT32 *out_fm = OPN->out_fm;
+	int i;
+	FMSAMPLE *bufL,*bufR;
+	INT32 dacout;
+	FM_CH	*cch6;
+	int lt,rt;
+
+	/* set bufer */
+	bufL = buffer0;
+	bufR = buffer1;
+
+	cch0 = &F2612->CH0;
+	cch1 = &F2612->CH1;
+	cch2 = &F2612->CH2;
+	cch3 = &F2612->CH3;
+	cch4 = &F2612->CH4;
+	cch5 = &F2612->CH5;
+	
+	if (! F2612->MuteDAC)
+		dacout = F2612->dacout;
+	else
+		dacout = 0;
+
+	/* refresh PG and EG */
+	refresh_fc_eg_chan( OPN, cch0 );
+	refresh_fc_eg_chan( OPN, cch1 );
+	if( (OPN->ST.mode & 0xc0) )
+	{
+		/* 3SLOT MODE */
+		if( cch2->SLOTSLOT1.Incr==-1)
+		{
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT1 , OPN->SL3.fc1 , OPN->SL3.kcode1 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT2 , OPN->SL3.fc2 , OPN->SL3.kcode2 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT3 , OPN->SL3.fc0 , OPN->SL3.kcode0 );
+			refresh_fc_eg_slot(OPN, &cch2->SLOTSLOT4 , cch2->fc , cch2->kcode );
+		}
+	}else refresh_fc_eg_chan( OPN, cch2 );
+	refresh_fc_eg_chan( OPN, cch3 );
+	refresh_fc_eg_chan( OPN, cch4 );
+	refresh_fc_eg_chan( OPN, cch5 );
+	if (! length)
+	{
+		update_ssg_eg_channel(&cch0->SLOTSLOT1);
+		update_ssg_eg_channel(&cch1->SLOTSLOT1);
+		update_ssg_eg_channel(&cch2->SLOTSLOT1);
+		update_ssg_eg_channel(&cch3->SLOTSLOT1);
+		update_ssg_eg_channel(&cch4->SLOTSLOT1);
+		update_ssg_eg_channel(&cch5->SLOTSLOT1);
+	}
+
+
+	/* buffering */
+	for(i=0; i < length ; i++)
+	{
+		/* clear outputs */
+		out_fm0 = 0;
+		out_fm1 = 0;
+		out_fm2 = 0;
+		out_fm3 = 0;
+		out_fm4 = 0;
+		out_fm5 = 0;
+
+		/* update SSG-EG output */
+		update_ssg_eg_channel(&cch0->SLOTSLOT1);
+		update_ssg_eg_channel(&cch1->SLOTSLOT1);
+		update_ssg_eg_channel(&cch2->SLOTSLOT1);
+		update_ssg_eg_channel(&cch3->SLOTSLOT1);
+		update_ssg_eg_channel(&cch4->SLOTSLOT1);
+		update_ssg_eg_channel(&cch5->SLOTSLOT1);
+
+		/* calculate FM */
+		if (! F2612->dac_test)
+		{
+			chan_calc(F2612, OPN, cch0);
+			chan_calc(F2612, OPN, cch1);
+			chan_calc(F2612, OPN, cch2);
+			chan_calc(F2612, OPN, cch3);
+			chan_calc(F2612, OPN, cch4);
+			if( F2612->dacen )
+				*cch5->connect4 += dacout;
+			else
+				chan_calc(F2612, OPN, cch5);
+		}
+		else
+		{
+			out_fm0 = out_fm1 = dacout;
+			out_fm2 = out_fm3 = dacout;
+			out_fm5 = dacout;
+		}
+
+		/* advance LFO */
+		advance_lfo(OPN);
+
+		/* advance envelope generator */
+		OPN->eg_timer += OPN->eg_timer_add;
+		while (OPN->eg_timer >= OPN->eg_timer_overflow)
+		{
+			OPN->eg_timer -= OPN->eg_timer_overflow;
+			OPN->eg_cnt++;
+
+			advance_eg_channel(OPN, &cch0->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch1->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch2->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch3->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch4->SLOTSLOT1);
+			advance_eg_channel(OPN, &cch5->SLOTSLOT1);
+		}
+
+		/*fprintf(hFile, "%u", FileSample, out_fm0);
+		for (lt = 0; lt < 6; lt ++)
+			fprintf(hFile, "\t%d", out_fmlt);
+		fprintf(hFile, "\n");
+		FileSample ++;*/
+		
+		if (out_fm0 > 8192) out_fm0 = 8192;
+		else if (out_fm0 < -8192) out_fm0 = -8192;
+		if (out_fm1 > 8192) out_fm1 = 8192;
+		else if (out_fm1 < -8192) out_fm1 = -8192;
+		if (out_fm2 > 8192) out_fm2 = 8192;
+		else if (out_fm2 < -8192) out_fm2 = -8192;
+		if (out_fm3 > 8192) out_fm3 = 8192;
+		else if (out_fm3 < -8192) out_fm3 = -8192;
+		if (out_fm4 > 8192) out_fm4 = 8192;
+		else if (out_fm4 < -8192) out_fm4 = -8192;
+		if (out_fm5 > 8192) out_fm5 = 8192;
+		else if (out_fm5 < -8192) out_fm5 = -8192;
+
+		/* 6-channels mixing */
+		lt = ((out_fm0>>0) & OPN->pan0);
+		rt = ((out_fm0>>0) & OPN->pan1);
+		lt += ((out_fm1>>0) & OPN->pan2);
+		rt += ((out_fm1>>0) & OPN->pan3);
+		lt += ((out_fm2>>0) & OPN->pan4);
+		rt += ((out_fm2>>0) & OPN->pan5);
+		lt += ((out_fm3>>0) & OPN->pan6);
+		rt += ((out_fm3>>0) & OPN->pan7);
+		if (! F2612->dac_test)
+		{
+			lt += ((out_fm4>>0) & OPN->pan8);
+			rt += ((out_fm4>>0) & OPN->pan9);
+		}
+		else
+		{
+			lt += dacout;
+			lt += dacout;
+		}
+		lt += ((out_fm5>>0) & OPN->pan10);
+		rt += ((out_fm5>>0) & OPN->pan11);
+
+// Limit( lt, MAXOUT, MINOUT );
+// Limit( rt, MAXOUT, MINOUT );
+
+		#ifdef SAVE_SAMPLE
+			SAVE_ALL_CHANNELS
+		#endif
+
+		/* buffering */
+		if (F2612->WaveOutMode & 0x01)
+			F2612->WaveL = lt;
+		if (F2612->WaveOutMode & 0x02)
+			F2612->WaveR = rt;
+		if (F2612->WaveOutMode ^ 0x03)
+			F2612->WaveOutMode ^= 0x03;
+		bufLi = F2612->WaveL;
+		bufRi = F2612->WaveR;
+
+		/* CSM mode: if CSM Key ON has occured, CSM Key OFF need to be sent */
+		/* only if Timer A does not overflow again (i.e CSM Key ON not set again) */
+		OPN->SL3.key_csm <<= 1;
+
+		/* timer A control */
+		//INTERNAL_TIMER_A( &OPN->ST , cch2 )
+		{
+			if( OPN->ST.TAC && (OPN->ST.timer_handler==0) )
+				if( (OPN->ST.TAC -= (int)(OPN->ST.freqbase*4096)) <= 0 )
+				{
+					TimerAOver( &OPN->ST );
+					// CSM mode total level latch and auto key on
+					if( OPN->ST.mode & 0x80 )
+						CSMKeyControll( OPN, cch2 );
+				}
+		}
+
+		/* CSM Mode Key ON still disabled */
+		if (OPN->SL3.key_csm & 2)
+		{
+			/* CSM Mode Key OFF (verified by Nemesis on real hardware) */
+			FM_KEYOFF_CSM(cch2,SLOT1);
+			FM_KEYOFF_CSM(cch2,SLOT2);
+			FM_KEYOFF_CSM(cch2,SLOT3);
+			FM_KEYOFF_CSM(cch2,SLOT4);
+			OPN->SL3.key_csm = 0;
+		}
+	}
+
+	/* timer B control */
+//	INTERNAL_TIMER_B(&OPN->ST,length)
+}
+
+#ifdef __STATE_H__
+void ym2612_postload(void *chip)
+{
+	if (chip)
+	{
+		YM2612 *F2612 = (YM2612 *)chip;
+		int r;
+
+		/* DAC data & port */
+		F2612->dacout = ((int)F2612->REGS0x2a - 0x80) << 6;	/* level unknown */
+		F2612->dacen = F2612->REGS0x2d & 0x80;
+		/* OPN registers */
+		/* DT / MULTI , TL , KS / AR , AMON / DR , SR , SL / RR , SSG-EG */
+		for(r=0x30;r<0x9e;r++)
+			if((r&3) != 3)
+			{
+				OPNWriteReg(&F2612->OPN,r,F2612->REGSr);
+				OPNWriteReg(&F2612->OPN,r|0x100,F2612->REGSr|0x100);
+			}
+		/* FB / CONNECT , L / R / AMS / PMS */
+		for(r=0xb0;r<0xb6;r++)
+			if((r&3) != 3)
+			{
+				OPNWriteReg(&F2612->OPN,r,F2612->REGSr);
+				OPNWriteReg(&F2612->OPN,r|0x100,F2612->REGSr|0x100);
+			}
+		/* channels */
+		/*FM_channel_postload(F2612->CH,6);*/
+	}
+}
+
+static void YM2612_save_state(YM2612 *F2612, running_device *device)
+{
+	state_save_register_device_item_array(device, 0, F2612->REGS);
+	FMsave_state_st(device,&F2612->OPN.ST);
+	FMsave_state_channel(device,F2612->CH,6);
+	/* 3slots */
+	state_save_register_device_item_array(device, 0, F2612->OPN.SL3.fc);
+	state_save_register_device_item(device, 0, F2612->OPN.SL3.fn_h);
+	state_save_register_device_item_array(device, 0, F2612->OPN.SL3.kcode);
+	/* address register1 */
+	state_save_register_device_item(device, 0, F2612->addr_A1);
+}
+#endif /* _STATE_H */
+
+/* initialize YM2612 emulator(s) */
+//void * ym2612_init(void *param, running_device *device, int clock, int rate,
+// FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler)
+void * ym2612_init(void *param, int clock, int rate,
+ FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler,
+ UINT8 *IsVGMInit, int Flags)
+{
+	int i;
+
+	YM2612 *F2612;
+
+	/* allocate extend state space */
+	//F2612 = auto_alloc_clear(device->machine, YM2612);
+	F2612 = (YM2612 *)malloc(sizeof(YM2612));
+	if (F2612 == NULL)
+		return NULL;
+	memset(F2612, 0x00, sizeof(YM2612));
+	/* allocate total level table (128kb space) */
+	init_tables();
+
+	F2612->OPN.ST.param = param;
+	F2612->OPN.type = TYPE_YM2612;
+	F2612->OPN.P_CH = F2612->CH;
+	//F2612->OPN.ST.device = device;
+	F2612->OPN.ST.clock = clock;
+	F2612->OPN.ST.rate = rate;
+	/* F2612->OPN.ST.irq = 0; */
+	/* F2612->OPN.ST.status = 0; */
+	/* Extend handler */
+	F2612->OPN.ST.timer_handler = timer_handler;
+	F2612->OPN.ST.IRQ_Handler = IRQHandler;
+
+	F2612->PseudoSt = (Flags >> 2) & 0x01;
+	
+	if (F2612->PseudoSt)
+		F2612->WaveOutMode = 0x01;
+	else
+		F2612->WaveOutMode = 0x03;
+	/*hFile = fopen("YM2612.log", "wt");
+	fprintf(hFile, "Clock: %d, Sample Rate: %d\n", clock, rate);
+	fprintf(hFile, "Sample\tCh 0\tCh 1\tCh 2\tCh 3\tCh 4\tCh 5\n");
+	FileSample = 0;*/
+
+#ifdef __STATE_H__
+	YM2612_save_state(F2612, device);
+#endif
+	F2612->OPN.IsVGMInit = IsVGMInit;
+	for (i = 0; i < 6; i++)
+		F2612->CHi.IsVGMInit = IsVGMInit;
+
+	return F2612;
+}
+
+/* shut down emulator */
+void ym2612_shutdown(void *chip)
+{
+	YM2612 *F2612 = (YM2612 *)chip;
+	//fclose(hFile);
+
+	FMCloseTable();
+	//auto_free(F2612->OPN.ST.device->machine, F2612);
+	free(F2612);
+}
+
+/* reset one of chip */
+void ym2612_reset_chip(void *chip)
+{
+	int i;
+	YM2612 *F2612 = (YM2612 *)chip;
+	FM_OPN *OPN = &F2612->OPN;
+
+	OPNSetPres( OPN, 6*24, 6*24, 0);
+	/* status clear */
+	FM_IRQMASK_SET(&OPN->ST,0x03);
+	FM_BUSY_CLEAR(&OPN->ST);
+	//OPNWriteMode(OPN,0x27,0x30); /* mode 0 , timer reset */
+
+	OPN->eg_timer = 0;
+	OPN->eg_cnt = 0;
+
+	OPN->lfo_timer = 0;
+	OPN->lfo_cnt = 0;
+	OPN->LFO_AM = 126;
+	OPN->LFO_PM = 0;
+
+	OPN->ST.TAC = 0;
+	OPN->ST.TBC = 0;
+
+	OPN->SL3.key_csm = 0;
+
+	OPN->ST.status = 0;
+	OPN->ST.mode = 0;
+
+	memset(F2612->REGS, 0x00, sizeof(UINT8) * 512);
+	
+	OPNWriteMode(OPN,0x22,0x00);
+	
+	OPNWriteMode(OPN,0x27,0x30);
+	OPNWriteMode(OPN,0x26,0x00);
+	OPNWriteMode(OPN,0x25,0x00);
+	OPNWriteMode(OPN,0x24,0x00);
+
+	reset_channels( &OPN->ST , &F2612->CH0 , 6 );
+
+	for(i = 0xb6 ; i >= 0xb4 ; i-- )
+	{
+		OPNWriteReg(OPN,i ,0xc0);
+		OPNWriteReg(OPN,i|0x100,0xc0);
+	}
+	for(i = 0xb2 ; i >= 0x30 ; i-- )
+	{
+		OPNWriteReg(OPN,i ,0);
+		OPNWriteReg(OPN,i|0x100,0);
+	}
+
+	/* DAC mode clear */
+	F2612->dacen = 0;
+	F2612->dac_test = 0;
+	F2612->dacout = 0;
+	
+	if (F2612->WaveOutMode == 0x02)
+		F2612->WaveOutMode >>= 1;
+}
+
+/* YM2612 write */
+/* n = number */
+/* a = address */
+/* v = value */
+int ym2612_write(void *chip, int a, UINT8 v)
+{
+	YM2612 *F2612 = (YM2612 *)chip;
+	int addr;
+
+	v &= 0xff;	/* adjust to 8 bit bus */
+
+	switch( a&3)
+	{
+	case 0:	/* address port 0 */
+		F2612->OPN.ST.address = v;
+		F2612->addr_A1 = 0;
+		break;
+
+	case 1:	/* data port 0 */
+		if (F2612->addr_A1 != 0)
+			break;	/* verified on real YM2608 */
+
+		addr = F2612->OPN.ST.address;
+		F2612->REGSaddr = v;
+		switch( addr & 0xf0 )
+		{
+		case 0x20:	/* 0x20-0x2f Mode */
+			switch( addr )
+			{
+			case 0x2a:	/* DAC data (YM2612) */
+				ym2612_update_req(F2612->OPN.ST.param);
+				F2612->dacout = ((int)v - 0x80) << 6;	/* level unknown */
+				break;
+			case 0x2b:	/* DAC Sel (YM2612) */
+				/* b7 = dac enable */
+				F2612->dacen = v & 0x80;
+				break;
+			case 0x2C:	// undocumented: DAC Test Reg
+				// b5 = volume enable
+				F2612->dac_test = v & 0x20;
+				break;
+			default:	/* OPN section */
+				ym2612_update_req(F2612->OPN.ST.param);
+				/* write register */
+				OPNWriteMode(&(F2612->OPN),addr,v);
+			}
+			break;
+		default:	/* 0x30-0xff OPN section */
+			ym2612_update_req(F2612->OPN.ST.param);
+			/* write register */
+			OPNWriteReg(&(F2612->OPN),addr,v);
+		}
+		break;
+
+	case 2:	/* address port 1 */
+		F2612->OPN.ST.address = v;
+		F2612->addr_A1 = 1;
+		break;
+
+	case 3:	/* data port 1 */
+		if (F2612->addr_A1 != 1)
+			break;	/* verified on real YM2608 */
+
+		addr = F2612->OPN.ST.address;
+		F2612->REGSaddr | 0x100 = v;
+		ym2612_update_req(F2612->OPN.ST.param);
+		OPNWriteReg(&(F2612->OPN),addr | 0x100,v);
+		break;
+	}
+	return F2612->OPN.ST.irq;
+}
+
+UINT8 ym2612_read(void *chip,int a)
+{
+	YM2612 *F2612 = (YM2612 *)chip;
+
+	switch( a&3)
+	{
+	case 0:	/* status 0 */
+		return FM_STATUS_FLAG(&F2612->OPN.ST);
+	case 1:
+	case 2:
+	case 3:
+		//LOG(LOG_WAR,("YM2612 #%p:A=%d read unmapped area\n",F2612->OPN.ST.param,a));
+		return FM_STATUS_FLAG(&F2612->OPN.ST);
+	}
+	return 0;
+}
+
+int ym2612_timer_over(void *chip,int c)
+{
+	YM2612 *F2612 = (YM2612 *)chip;
+
+	if( c )
+	{	/* Timer B */
+		TimerBOver( &(F2612->OPN.ST) );
+	}
+	else
+	{	/* Timer A */
+		ym2612_update_req(F2612->OPN.ST.param);
+		/* timer update */
+		TimerAOver( &(F2612->OPN.ST) );
+		/* CSM mode key,TL controll */
+		if ((F2612->OPN.ST.mode & 0xc0) == 0x80)
+		{	/* CSM mode total level latch and auto key on */
+			CSMKeyControll( &F2612->OPN, &(F2612->CH2) );
+		}
+	}
+	return F2612->OPN.ST.irq;
+}
+
+
+void ym2612_set_mutemask(void *chip, UINT32 MuteMask)
+{
+	YM2612 *F2612 = (YM2612 *)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		F2612->CHCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	F2612->MuteDAC = (MuteMask >> 6) & 0x01;
+	
+	return;
+}
+
+#endif /* (BUILD_YM2612||BUILD_YM3238) */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.c Added

@@ -0,0 +1,2748 @@
+/*
+**
+** File: fmopl.c - software implementation of FM sound generator
+** types OPL and OPL2
+**
+** Copyright Jarek Burczynski (bujar at mame dot net)
+** Copyright Tatsuyuki Satoh , MultiArcadeMachineEmulator development
+**
+** Version 0.72
+**
+
+Revision History:
+
+04-08-2003 Jarek Burczynski:
+ - removed BFRDY hack. BFRDY is busy flag, and it should be 0 only when the chip
+ handles memory read/write or during the adpcm synthesis when the chip
+ requests another byte of ADPCM data.
+
+24-07-2003 Jarek Burczynski:
+ - added a small hack for Y8950 status BFRDY flag (bit 3 should be set after
+ some (unknown) delay). Right now it's always set.
+
+14-06-2003 Jarek Burczynski:
+ - implemented all of the status register flags in Y8950 emulation
+ - renamed y8950_set_delta_t_memory() parameters from _rom_ to _mem_ since
+ they can be either RAM or ROM
+
+08-10-2002 Jarek Burczynski (thanks to Dox for the YM3526 chip)
+ - corrected ym3526_read() to always set bit 2 and bit 1
+ to HIGH state - identical to ym3812_read (verified on real YM3526)
+
+04-28-2002 Jarek Burczynski:
+ - binary exact Envelope Generator (verified on real YM3812);
+ compared to YM2151: the EG clock is equal to internal_clock,
+ rates are 2 times slower and volume resolution is one bit less
+ - modified interface functions (they no longer return pointer -
+ that's internal to the emulator now):
+ - new wrapper functions for OPLCreate: ym3526_init(), ym3812_init() and y8950_init()
+ - corrected 'off by one' error in feedback calculations (when feedback is off)
+ - enabled waveform usage (credit goes to Vlad Romascanu and zazzal22)
+ - speeded up noise generator calculations (Nicola Salmoria)
+
+03-24-2002 Jarek Burczynski (thanks to Dox for the YM3812 chip)
+ Complete rewrite (all verified on real YM3812):
+ - corrected sin_tab and tl_tab data
+ - corrected operator output calculations
+ - corrected waveform_select_enable register;
+ simply: ignore all writes to waveform_select register when
+ waveform_select_enable == 0 and do not change the waveform previously selected.
+ - corrected KSR handling
+ - corrected Envelope Generator: attack shape, Sustain mode and
+ Percussive/Non-percussive modes handling
+ - Envelope Generator rates are two times slower now
+ - LFO amplitude (tremolo) and phase modulation (vibrato)
+ - rhythm sounds phase generation
+ - white noise generator (big thanks to Olivier Galibert for mentioning Berlekamp-Massey algorithm)
+ - corrected key on/off handling (the 'key' signal is ORed from three sources: FM, rhythm and CSM)
+ - funky details (like ignoring output of operator 1 in BD rhythm sound when connect == 1)
+
+12-28-2001 Acho A. Tang
+ - reflected Delta-T EOS status on Y8950 status port.
+ - fixed subscription range of attack/decay tables
+
+
+ To do:
+ add delay before key off in CSM mode (see CSMKeyControll)
+ verify volume of the FM part on the Y8950
+*/
+
+#include <math.h>
+#include "mamedef.h"
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+//#include "sndintrf.h"
+#include "fmopl.h"
+#if BUILD_Y8950
+#include "ymdeltat.h"
+#endif
+
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+
+/* output final shift */
+#if (OPL_SAMPLE_BITS==16)
+	#define FINAL_SH	(0)
+	#define MAXOUT		(+32767)
+	#define MINOUT		(-32768)
+#else
+	#define FINAL_SH	(8)
+	#define MAXOUT		(+127)
+	#define MINOUT		(-128)
+#endif
+
+
+#define FREQ_SH			16 /* 16.16 fixed point (frequency calculations) */
+#define EG_SH			16 /* 16.16 fixed point (EG timing) */
+#define LFO_SH			24 /* 8.24 fixed point (LFO calculations) */
+#define TIMER_SH		16 /* 16.16 fixed point (timers calculations) */
+
+#define FREQ_MASK		((1<<FREQ_SH)-1)
+
+/* envelope output entries */
+#define ENV_BITS		10
+#define ENV_LEN			(1<<ENV_BITS)
+#define ENV_STEP		(128.0/ENV_LEN)
+
+#define MAX_ATT_INDEX	((1<<(ENV_BITS-1))-1) /*511*/
+#define MIN_ATT_INDEX	(0)
+
+/* sinwave entries */
+#define SIN_BITS		10
+#define SIN_LEN			(1<<SIN_BITS)
+#define SIN_MASK		(SIN_LEN-1)
+
+#define TL_RES_LEN		(256)	/* 8 bits addressing (real chip) */
+
+
+
+/* register number to channel number , slot offset */
+#define SLOT1 0
+#define SLOT2 1
+
+/* Envelope Generator phases */
+
+#define EG_ATT			4
+#define EG_DEC			3
+#define EG_SUS			2
+#define EG_REL			1
+#define EG_OFF			0
+
+
+/* save output as raw 16-bit sample */
+
+/*#define SAVE_SAMPLE*/
+
+#ifdef SAVE_SAMPLE
+INLINE signed int acc_calc(signed int value)
+{
+	if (value>=0)
+	{
+		if (value < 0x0200)
+			return (value & ~0);
+		if (value < 0x0400)
+			return (value & ~1);
+		if (value < 0x0800)
+			return (value & ~3);
+		if (value < 0x1000)
+			return (value & ~7);
+		if (value < 0x2000)
+			return (value & ~15);
+		if (value < 0x4000)
+			return (value & ~31);
+		return (value & ~63);
+	}
+	/*else value < 0*/
+	if (value > -0x0200)
+		return (~abs(value) & ~0);
+	if (value > -0x0400)
+		return (~abs(value) & ~1);
+	if (value > -0x0800)
+		return (~abs(value) & ~3);
+	if (value > -0x1000)
+		return (~abs(value) & ~7);
+	if (value > -0x2000)
+		return (~abs(value) & ~15);
+	if (value > -0x4000)
+		return (~abs(value) & ~31);
+	return (~abs(value) & ~63);
+}
+
+
+static FILE *sample1;
+	#if 1	/*save to MONO file */
+		#define SAVE_ALL_CHANNELS \
+		{	signed int pom = acc_calc(lt); \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+	#else	/*save to STEREO file */
+		#define SAVE_ALL_CHANNELS \
+		{	signed int pom = lt; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+			pom = rt; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+	#endif
+#endif
+
+//#define LOG_CYM_FILE 0
+//static FILE * cymfile = NULL;
+
+
+
+#define OPL_TYPE_WAVESEL 0x01 /* waveform select */
+#define OPL_TYPE_ADPCM 0x02 /* DELTA-T ADPCM unit */
+#define OPL_TYPE_KEYBOARD 0x04 /* keyboard interface */
+#define OPL_TYPE_IO 0x08 /* I/O port */
+
+/* ---------- Generic interface section ---------- */
+#define OPL_TYPE_YM3526 (0)
+#define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL)
+#define OPL_TYPE_Y8950 (OPL_TYPE_ADPCM|OPL_TYPE_KEYBOARD|OPL_TYPE_IO)
+
+
+
+typedef struct
+{
+	UINT32	ar;			/* attack rate: AR<<2 */
+	UINT32	dr;			/* decay rate: DR<<2 */
+	UINT32	rr;			/* release rate:RR<<2 */
+	UINT8	KSR;		/* key scale rate */
+	UINT8	ksl;		/* keyscale level */
+	UINT8	ksr;		/* key scale rate: kcode>>KSR */
+	UINT8	mul;		/* multiple: mul_tabML */
+
+	/* Phase Generator */
+	UINT32	Cnt;		/* frequency counter */
+	UINT32	Incr;		/* frequency counter step */
+	UINT8 FB;			/* feedback shift value */
+	INT32 *connect1;	/* slot1 output pointer */
+	INT32 op1_out2;	/* slot1 output for feedback */
+	UINT8 CON;		/* connection (algorithm) type */
+
+	/* Envelope Generator */
+	UINT8	eg_type;	/* percussive/non-percussive mode */
+	UINT8	state;		/* phase type */
+	UINT32	TL;			/* total level: TL << 2 */
+	INT32	TLL;		/* adjusted now TL */
+	INT32	volume;		/* envelope counter */
+	UINT32	sl;			/* sustain level: sl_tabSL */
+	UINT8	eg_sh_ar;	/* (attack state) */
+	UINT8	eg_sel_ar;	/* (attack state) */
+	UINT8	eg_sh_dr;	/* (decay state) */
+	UINT8	eg_sel_dr;	/* (decay state) */
+	UINT8	eg_sh_rr;	/* (release state) */
+	UINT8	eg_sel_rr;	/* (release state) */
+	UINT32	key;		/* 0 = KEY OFF, >0 = KEY ON */
+
+	/* LFO */
+	UINT32	AMmask;		/* LFO Amplitude Modulation enable mask */
+	UINT8	vib;		/* LFO Phase Modulation enable flag (active high)*/
+
+	/* waveform select */
+	UINT16	wavetable;
+} OPL_SLOT;
+
+typedef struct
+{
+	OPL_SLOT SLOT2;
+	/* phase generator state */
+	UINT32 block_fnum;	/* block+fnum */
+	UINT32 fc;			/* Freq. Increment base */
+	UINT32 ksl_base;	/* KeyScaleLevel Base step */
+	UINT8 kcode;		/* key code (for key scaling) */
+	UINT8 Muted;
+} OPL_CH;
+
+/* OPL state */
+typedef struct fm_opl_f
+{
+	/* FM channel slots */
+	OPL_CH	P_CH9;				/* OPL/OPL2 chips have 9 channels*/
+	UINT8	MuteSpc6;				/* Mute Special: 5 Rhythm + 1 DELTA-T Channel */
+
+	UINT32	eg_cnt;					/* global envelope generator counter */
+	UINT32	eg_timer;				/* global envelope generator counter works at frequency = chipclock/72 */
+	UINT32	eg_timer_add;			/* step of eg_timer */
+	UINT32	eg_timer_overflow;		/* envelope generator timer overlfows every 1 sample (on real chip) */
+
+	UINT8	rhythm;					/* Rhythm mode */
+
+	UINT32	fn_tab1024;			/* fnumber->increment counter */
+
+	/* LFO */
+	UINT32	LFO_AM;
+	INT32	LFO_PM;
+
+	UINT8	lfo_am_depth;
+	UINT8	lfo_pm_depth_range;
+	UINT32	lfo_am_cnt;
+	UINT32	lfo_am_inc;
+	UINT32	lfo_pm_cnt;
+	UINT32	lfo_pm_inc;
+
+	UINT32	noise_rng;				/* 23 bit noise shift register */
+	UINT32	noise_p;				/* current noise 'phase' */
+	UINT32	noise_f;				/* current noise period */
+
+	UINT8	wavesel;				/* waveform select enable flag */
+
+	UINT32	T2;					/* timer counters */
+	UINT8	st2;					/* timer enable */
+
+#if BUILD_Y8950
+	/* Delta-T ADPCM unit (Y8950) */
+
+	YM_DELTAT *deltat;
+
+	/* Keyboard and I/O ports interface */
+	UINT8	portDirection;
+	UINT8	portLatch;
+	OPL_PORTHANDLER_R porthandler_r;
+	OPL_PORTHANDLER_W porthandler_w;
+	void *	port_param;
+	OPL_PORTHANDLER_R keyboardhandler_r;
+	OPL_PORTHANDLER_W keyboardhandler_w;
+	void *	keyboard_param;
+#endif
+
+	/* external event callback handlers */
+	OPL_TIMERHANDLER timer_handler;	/* TIMER handler */
+	void *TimerParam;					/* TIMER parameter */
+	OPL_IRQHANDLER IRQHandler;	/* IRQ handler */
+	void *IRQParam;					/* IRQ parameter */
+	OPL_UPDATEHANDLER UpdateHandler;/* stream update handler */
+	void *UpdateParam;				/* stream update parameter */
+
+	UINT8 type;						/* chip type */
+	UINT8 address;					/* address register */
+	UINT8 status;					/* status flag */
+	UINT8 statusmask;				/* status mask */
+	UINT8 mode;						/* Reg.08 : CSM,notesel,etc. */
+
+	UINT32 clock;					/* master clock (Hz) */
+	UINT32 rate;					/* sampling rate (Hz) */
+	double freqbase;				/* frequency base */
+	//attotime TimerBase;			/* Timer base time (==sampling time)*/
+
+	signed int phase_modulation;	/* phase modulation input (SLOT 2) */
+	signed int output1;
+#if BUILD_Y8950
+	INT32 output_deltat4;		/* for Y8950 DELTA-T, chip is mono, that 4 here is just for safety */
+#endif
+} FM_OPL;
+
+
+
+/* mapping of register number (offset) to slot number used by the emulator */
+static const int slot_array32=
+{
+	 0, 2, 4, 1, 3, 5,-1,-1,
+	 6, 8,10, 7, 9,11,-1,-1,
+	12,14,16,13,15,17,-1,-1,
+	-1,-1,-1,-1,-1,-1,-1,-1
+};
+
+/* key scale level */
+/* table is 3dB/octave , DV converts this into 6dB/octave */
+/* 0.1875 is bit 0 weight of the envelope counter (volume) expressed in the 'decibel' scale */
+#define DV (0.1875/2.0)
+static const UINT32 ksl_tab8*16=
+{
+	/* OCT 0 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	/* OCT 1 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV,
+	 1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV,
+	/* OCT 2 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV,
+	 3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV,
+	 4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV,
+	/* OCT 3 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV,
+	 3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV,
+	 6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV,
+	 7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV,
+	/* OCT 4 */
+	 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
+	 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
+	 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
+	10.875/DV,11.250/DV,11.625/DV,12.000/DV,
+	/* OCT 5 */
+	 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
+	 9.000/DV,10.125/DV,10.875/DV,11.625/DV,
+	12.000/DV,12.750/DV,13.125/DV,13.500/DV,
+	13.875/DV,14.250/DV,14.625/DV,15.000/DV,
+	/* OCT 6 */
+	 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
+	12.000/DV,13.125/DV,13.875/DV,14.625/DV,
+	15.000/DV,15.750/DV,16.125/DV,16.500/DV,
+	16.875/DV,17.250/DV,17.625/DV,18.000/DV,
+	/* OCT 7 */
+	 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
+	15.000/DV,16.125/DV,16.875/DV,17.625/DV,
+	18.000/DV,18.750/DV,19.125/DV,19.500/DV,
+	19.875/DV,20.250/DV,20.625/DV,21.000/DV
+};
+#undef DV
+
+/* 0 / 3.0 / 1.5 / 6.0 dB/OCT */
+static const UINT32 ksl_shift4 = { 31, 1, 2, 0 };
+
+
+/* sustain level table (3dB per step) */
+/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
+#define SC(db) (UINT32) ( db * (2.0/ENV_STEP) )
+static const UINT32 sl_tab16={
+ SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
+ SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)
+};
+#undef SC
+
+
+#define RATE_STEPS (8)
+static const unsigned char eg_inc15*RATE_STEPS={
+
+/*cycle:0 1 2 3 4 5 6 7*/
+
+/* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..12 0 (increment by 0 or 1) */
+/* 1 */ 0,1, 0,1, 1,1, 0,1, /* rates 00..12 1 */
+/* 2 */ 0,1, 1,1, 0,1, 1,1, /* rates 00..12 2 */
+/* 3 */ 0,1, 1,1, 1,1, 1,1, /* rates 00..12 3 */
+
+/* 4 */ 1,1, 1,1, 1,1, 1,1, /* rate 13 0 (increment by 1) */
+/* 5 */ 1,1, 1,2, 1,1, 1,2, /* rate 13 1 */
+/* 6 */ 1,2, 1,2, 1,2, 1,2, /* rate 13 2 */
+/* 7 */ 1,2, 2,2, 1,2, 2,2, /* rate 13 3 */
+
+/* 8 */ 2,2, 2,2, 2,2, 2,2, /* rate 14 0 (increment by 2) */
+/* 9 */ 2,2, 2,4, 2,2, 2,4, /* rate 14 1 */
+/*10 */ 2,4, 2,4, 2,4, 2,4, /* rate 14 2 */
+/*11 */ 2,4, 4,4, 2,4, 4,4, /* rate 14 3 */
+
+/*12 */ 4,4, 4,4, 4,4, 4,4, /* rates 15 0, 15 1, 15 2, 15 3 (increment by 4) */
+/*13 */ 8,8, 8,8, 8,8, 8,8, /* rates 15 2, 15 3 for attack */
+/*14 */ 0,0, 0,0, 0,0, 0,0, /* infinity rates for attack and decay(s) */
+};
+
+
+#define O(a) (a*RATE_STEPS)
+
+/*note that there is no O(13) in this table - it's directly in the code */
+static const unsigned char eg_rate_select16+64+16={	/* Envelope Generator rates (16 + 64 rates + 16 RKS) */
+/* 16 infinite time rates */
+O(14),O(14),O(14),O(14),O(14),O(14),O(14),O(14),
+O(14),O(14),O(14),O(14),O(14),O(14),O(14),O(14),
+
+/* rates 00-12 */
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+
+/* rate 13 */
+O( 4),O( 5),O( 6),O( 7),
+
+/* rate 14 */
+O( 8),O( 9),O(10),O(11),
+
+/* rate 15 */
+O(12),O(12),O(12),O(12),
+
+/* 16 dummy rates (same as 15 3) */
+O(12),O(12),O(12),O(12),O(12),O(12),O(12),O(12),
+O(12),O(12),O(12),O(12),O(12),O(12),O(12),O(12),
+
+};
+#undef O
+
+/*rate 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 */
+/*shift 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0 */
+/*mask 4095, 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1, 0, 0, 0, 0 */
+
+#define O(a) (a*1)
+static const unsigned char eg_rate_shift16+64+16={	/* Envelope Generator counter shifts (16 + 64 rates + 16 RKS) */
+/* 16 infinite time rates */
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+
+/* rates 00-12 */
+O(12),O(12),O(12),O(12),
+O(11),O(11),O(11),O(11),
+O(10),O(10),O(10),O(10),
+O( 9),O( 9),O( 9),O( 9),
+O( 8),O( 8),O( 8),O( 8),
+O( 7),O( 7),O( 7),O( 7),
+O( 6),O( 6),O( 6),O( 6),
+O( 5),O( 5),O( 5),O( 5),
+O( 4),O( 4),O( 4),O( 4),
+O( 3),O( 3),O( 3),O( 3),
+O( 2),O( 2),O( 2),O( 2),
+O( 1),O( 1),O( 1),O( 1),
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 13 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 14 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 15 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* 16 dummy rates (same as 15 3) */
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+
+};
+#undef O
+
+
+/* multiple table */
+#define ML 2
+static const UINT8 mul_tab16= {
+/* 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,12,12,15,15 */
+ 0.50*ML, 1.00*ML, 2.00*ML, 3.00*ML, 4.00*ML, 5.00*ML, 6.00*ML, 7.00*ML,
+ 8.00*ML, 9.00*ML,10.00*ML,10.00*ML,12.00*ML,12.00*ML,15.00*ML,15.00*ML
+};
+#undef ML
+
+/* TL_TAB_LEN is calculated as:
+* 12 - sinus amplitude bits (Y axis)
+* 2 - sinus sign bit (Y axis)
+* TL_RES_LEN - sinus resolution (X axis)
+*/
+#define TL_TAB_LEN (12*2*TL_RES_LEN)
+static signed int tl_tabTL_TAB_LEN;
+
+#define ENV_QUIET		(TL_TAB_LEN>>4)
+
+/* sin waveform table in 'decibel' scale */
+/* four waveforms on OPL2 type chips */
+static unsigned int sin_tabSIN_LEN * 4;
+
+
+/* LFO Amplitude Modulation table (verified on real YM3812)
+ 27 output levels (triangle waveform); 1 level takes one of: 192, 256 or 448 samples
+
+ Length: 210 elements.
+
+ Each of the elements has to be repeated
+ exactly 64 times (on 64 consecutive samples).
+ The whole table takes: 64 * 210 = 13440 samples.
+
+ When AM = 1 data is used directly
+ When AM = 0 data is divided by 4 before being used (losing precision is important)
+*/
+
+#define LFO_AM_TAB_ELEMENTS 210
+
+static const UINT8 lfo_am_tableLFO_AM_TAB_ELEMENTS = {
+0,0,0,0,0,0,0,
+1,1,1,1,
+2,2,2,2,
+3,3,3,3,
+4,4,4,4,
+5,5,5,5,
+6,6,6,6,
+7,7,7,7,
+8,8,8,8,
+9,9,9,9,
+10,10,10,10,
+11,11,11,11,
+12,12,12,12,
+13,13,13,13,
+14,14,14,14,
+15,15,15,15,
+16,16,16,16,
+17,17,17,17,
+18,18,18,18,
+19,19,19,19,
+20,20,20,20,
+21,21,21,21,
+22,22,22,22,
+23,23,23,23,
+24,24,24,24,
+25,25,25,25,
+26,26,26,
+25,25,25,25,
+24,24,24,24,
+23,23,23,23,
+22,22,22,22,
+21,21,21,21,
+20,20,20,20,
+19,19,19,19,
+18,18,18,18,
+17,17,17,17,
+16,16,16,16,
+15,15,15,15,
+14,14,14,14,
+13,13,13,13,
+12,12,12,12,
+11,11,11,11,
+10,10,10,10,
+9,9,9,9,
+8,8,8,8,
+7,7,7,7,
+6,6,6,6,
+5,5,5,5,
+4,4,4,4,
+3,3,3,3,
+2,2,2,2,
+1,1,1,1
+};
+
+/* LFO Phase Modulation table (verified on real YM3812) */
+static const INT8 lfo_pm_table8*8*2 = {
+
+/* FNUM2/FNUM = 00 0xxxxxxx (0x0000) */
+0, 0, 0, 0, 0, 0, 0, 0,	/*LFO PM depth = 0*/
+0, 0, 0, 0, 0, 0, 0, 0,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 00 1xxxxxxx (0x0080) */
+0, 0, 0, 0, 0, 0, 0, 0,	/*LFO PM depth = 0*/
+1, 0, 0, 0,-1, 0, 0, 0,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 01 0xxxxxxx (0x0100) */
+1, 0, 0, 0,-1, 0, 0, 0,	/*LFO PM depth = 0*/
+2, 1, 0,-1,-2,-1, 0, 1,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 01 1xxxxxxx (0x0180) */
+1, 0, 0, 0,-1, 0, 0, 0,	/*LFO PM depth = 0*/
+3, 1, 0,-1,-3,-1, 0, 1,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 10 0xxxxxxx (0x0200) */
+2, 1, 0,-1,-2,-1, 0, 1,	/*LFO PM depth = 0*/
+4, 2, 0,-2,-4,-2, 0, 2,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 10 1xxxxxxx (0x0280) */
+2, 1, 0,-1,-2,-1, 0, 1,	/*LFO PM depth = 0*/
+5, 2, 0,-2,-5,-2, 0, 2,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 11 0xxxxxxx (0x0300) */
+3, 1, 0,-1,-3,-1, 0, 1,	/*LFO PM depth = 0*/
+6, 3, 0,-3,-6,-3, 0, 3,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 11 1xxxxxxx (0x0380) */
+3, 1, 0,-1,-3,-1, 0, 1,	/*LFO PM depth = 0*/
+7, 3, 0,-3,-7,-3, 0, 3	/*LFO PM depth = 1*/
+};
+
+
+/* lock level of common table */
+static int num_lock = 0;
+
+
+#define SLOT7_1 (&OPL->P_CH7.SLOTSLOT1)
+#define SLOT7_2 (&OPL->P_CH7.SLOTSLOT2)
+#define SLOT8_1 (&OPL->P_CH8.SLOTSLOT1)
+#define SLOT8_2 (&OPL->P_CH8.SLOTSLOT2)
+
+
+
+
+/*INLINE int limit( int val, int max, int min ) {
+	if ( val > max )
+		val = max;
+	else if ( val < min )
+		val = min;
+
+	return val;
+}*/
+
+
+/* status set and IRQ handling */
+INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag)
+{
+	/* set status flag */
+	OPL->status |= flag;
+	if(!(OPL->status & 0x80))
+	{
+		if(OPL->status & OPL->statusmask)
+		{	/* IRQ on */
+			OPL->status |= 0x80;
+			/* callback user interrupt handler (IRQ is OFF to ON) */
+			if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,1);
+		}
+	}
+}
+
+/* status reset and IRQ handling */
+INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
+{
+	/* reset status flag */
+	OPL->status &=~flag;
+	if((OPL->status & 0x80))
+	{
+		if (!(OPL->status & OPL->statusmask) )
+		{
+			OPL->status &= 0x7f;
+			/* callback user interrupt handler (IRQ is ON to OFF) */
+			if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,0);
+		}
+	}
+}
+
+/* IRQ mask set */
+INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
+{
+	OPL->statusmask = flag;
+	/* IRQ handling check */
+	OPL_STATUS_SET(OPL,0);
+	OPL_STATUS_RESET(OPL,0);
+}
+
+
+/* advance LFO to next sample */
+INLINE void advance_lfo(FM_OPL *OPL)
+{
+	UINT8 tmp;
+
+	/* LFO */
+	OPL->lfo_am_cnt += OPL->lfo_am_inc;
+	if (OPL->lfo_am_cnt >= ((UINT32)LFO_AM_TAB_ELEMENTS<<LFO_SH) )	/* lfo_am_table is 210 elements long */
+		OPL->lfo_am_cnt -= ((UINT32)LFO_AM_TAB_ELEMENTS<<LFO_SH);
+
+	tmp = lfo_am_table OPL->lfo_am_cnt >> LFO_SH ;
+
+	if (OPL->lfo_am_depth)
+		OPL->LFO_AM = tmp;
+	else
+		OPL->LFO_AM = tmp>>2;
+
+	OPL->lfo_pm_cnt += OPL->lfo_pm_inc;
+	OPL->LFO_PM = ((OPL->lfo_pm_cnt>>LFO_SH) & 7) | OPL->lfo_pm_depth_range;
+}
+
+INLINE void refresh_eg(FM_OPL* OPL)
+{
+	OPL_CH *CH;
+	OPL_SLOT *op;
+	int i;
+	int new_vol;
+
+	for (i=0; i<9*2; i++)
+	{
+		CH = &OPL->P_CHi/2;
+		op = &CH->SLOTi&1;
+
+		// Envelope Generator
+		switch(op->state)
+		{
+		case EG_ATT:		// attack phase
+			if ( !(OPL->eg_cnt & ((1<<op->eg_sh_ar)-1) ) )
+			{
+				new_vol = op->volume + ((~op->volume *
+							 (eg_incop->eg_sel_ar + ((OPL->eg_cnt>>op->eg_sh_ar)&7))
+							 ) >> 3);
+				if (new_vol <= MIN_ATT_INDEX)
+				{
+					op->volume = MIN_ATT_INDEX;
+					op->state = EG_DEC;
+				}
+			}
+			break;
+		/*case EG_DEC:	// decay phase
+			if ( !(OPL->eg_cnt & ((1<<op->eg_sh_dr)-1) ) )
+			{
+				new_vol = op->volume + eg_incop->eg_sel_dr + ((OPL->eg_cnt>>op->eg_sh_dr)&7);
+
+				if ( new_vol >= op->sl )
+					op->state = EG_SUS;
+			}
+			break;
+		case EG_SUS:	// sustain phase
+			if ( !op->eg_type)	percussive mode
+			{
+				new_vol = op->volume + eg_incop->eg_sel_rr + ((OPL->eg_cnt>>op->eg_sh_rr)&7);
+
+				if ( !(OPL->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
+				{
+					if ( new_vol >= MAX_ATT_INDEX )
+						op->volume = MAX_ATT_INDEX;
+				}
+			}
+			break;
+		case EG_REL:	// release phase
+			if ( !(OPL->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
+			{
+				new_vol = op->volume + eg_incop->eg_sel_rr + ((OPL->eg_cnt>>op->eg_sh_rr)&7);
+				if ( new_vol >= MAX_ATT_INDEX )
+				{
+					op->volume = MAX_ATT_INDEX;
+					op->state = EG_OFF;
+				}
+
+			}
+			break;
+		default:
+			break;*/
+		}
+	}
+	
+	return;
+}
+
+/* advance to next sample */
+INLINE void advance(FM_OPL *OPL)
+{
+	OPL_CH *CH;
+	OPL_SLOT *op;
+	int i;
+
+	OPL->eg_timer += OPL->eg_timer_add;
+
+	while (OPL->eg_timer >= OPL->eg_timer_overflow)
+	{
+		OPL->eg_timer -= OPL->eg_timer_overflow;
+
+		OPL->eg_cnt++;
+
+		for (i=0; i<9*2; i++)
+		{
+			CH = &OPL->P_CHi/2;
+			op = &CH->SLOTi&1;
+
+			/* Envelope Generator */
+			switch(op->state)
+			{
+			case EG_ATT:		/* attack phase */
+				if ( !(OPL->eg_cnt & ((1<<op->eg_sh_ar)-1) ) )
+				{
+					op->volume += (~op->volume *
+							 (eg_incop->eg_sel_ar + ((OPL->eg_cnt>>op->eg_sh_ar)&7))
+							 ) >>3;
+
+					if (op->volume <= MIN_ATT_INDEX)
+					{
+						op->volume = MIN_ATT_INDEX;
+						op->state = EG_DEC;
+					}
+
+				}
+			break;
+
+			case EG_DEC:	/* decay phase */
+				if ( !(OPL->eg_cnt & ((1<<op->eg_sh_dr)-1) ) )
+				{
+					op->volume += eg_incop->eg_sel_dr + ((OPL->eg_cnt>>op->eg_sh_dr)&7);
+
+					if ( op->volume >= op->sl )
+						op->state = EG_SUS;
+
+				}
+			break;
+
+			case EG_SUS:	/* sustain phase */
+
+				/* this is important behaviour:
+ one can change percusive/non-percussive modes on the fly and
+ the chip will remain in sustain phase - verified on real YM3812 */
+
+				if(op->eg_type)		/* non-percussive mode */
+				{
+									/* do nothing */
+				}
+				else				/* percussive mode */
+				{
+					/* during sustain phase chip adds Release Rate (in percussive mode) */
+					if ( !(OPL->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
+					{
+						op->volume += eg_incop->eg_sel_rr + ((OPL->eg_cnt>>op->eg_sh_rr)&7);
+
+						if ( op->volume >= MAX_ATT_INDEX )
+							op->volume = MAX_ATT_INDEX;
+					}
+					/* else do nothing in sustain phase */
+				}
+			break;
+
+			case EG_REL:	/* release phase */
+				if ( !(OPL->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
+				{
+					op->volume += eg_incop->eg_sel_rr + ((OPL->eg_cnt>>op->eg_sh_rr)&7);
+
+					if ( op->volume >= MAX_ATT_INDEX )
+					{
+						op->volume = MAX_ATT_INDEX;
+						op->state = EG_OFF;
+					}
+
+				}
+			break;
+
+			default:
+			break;
+			}
+		}
+	}
+
+	for (i=0; i<9*2; i++)
+	{
+		CH = &OPL->P_CHi/2;
+		op = &CH->SLOTi&1;
+
+		/* Phase Generator */
+		if(op->vib)
+		{
+			UINT8 block;
+			unsigned int block_fnum = CH->block_fnum;
+
+			unsigned int fnum_lfo = (block_fnum&0x0380) >> 7;
+
+			signed int lfo_fn_table_index_offset = lfo_pm_tableOPL->LFO_PM + 16*fnum_lfo ;
+
+			if (lfo_fn_table_index_offset)	/* LFO phase modulation active */
+			{
+				block_fnum += lfo_fn_table_index_offset;
+				block = (block_fnum&0x1c00) >> 10;
+				op->Cnt += (OPL->fn_tabblock_fnum&0x03ff >> (7-block)) * op->mul;
+			}
+			else	/* LFO phase modulation = zero */
+			{
+				op->Cnt += op->Incr;
+			}
+		}
+		else	/* LFO phase modulation disabled for this operator */
+		{
+			op->Cnt += op->Incr;
+		}
+	}
+
+	/* The Noise Generator of the YM3812 is 23-bit shift register.
+ * Period is equal to 2^23-2 samples.
+ * Register works at sampling frequency of the chip, so output
+ * can change on every sample.
+ *
+ * Output of the register and input to the bit 22 is:
+ * bit0 XOR bit14 XOR bit15 XOR bit22
+ *
+ * Simply use bit 22 as the noise output.
+ */
+
+	OPL->noise_p += OPL->noise_f;
+	i = OPL->noise_p >> FREQ_SH;		/* number of events (shifts of the shift register) */
+	OPL->noise_p &= FREQ_MASK;
+	while (i)
+	{
+		/*
+ UINT32 j;
+ j = ( (OPL->noise_rng) ^ (OPL->noise_rng>>14) ^ (OPL->noise_rng>>15) ^ (OPL->noise_rng>>22) ) & 1;
+ OPL->noise_rng = (j<<22) | (OPL->noise_rng>>1);
+ */
+
+		/*
+ Instead of doing all the logic operations above, we
+ use a trick here (and use bit 0 as the noise output).
+ The difference is only that the noise bit changes one
+ step ahead. This doesn't matter since we don't know
+ what is real state of the noise_rng after the reset.
+ */
+
+		if (OPL->noise_rng & 1) OPL->noise_rng ^= 0x800302;
+		OPL->noise_rng >>= 1;
+
+		i--;
+	}
+}
+
+
+INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+{
+	UINT32 p;
+
+	p = (env<<4) + sin_tabwave_tab + ((((signed int)((phase & ~FREQ_MASK) + (pm<<16))) >> FREQ_SH ) & SIN_MASK) ;
+
+	if (p >= TL_TAB_LEN)
+		return 0;
+	return tl_tabp;
+}
+
+INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+{
+	UINT32 p;
+
+	p = (env<<4) + sin_tabwave_tab + ((((signed int)((phase & ~FREQ_MASK) + pm )) >> FREQ_SH ) & SIN_MASK) ;
+
+	if (p >= TL_TAB_LEN)
+		return 0;
+	return tl_tabp;
+}
+
+
+#define volume_calc(OP) ((OP)->TLL + ((UINT32)(OP)->volume) + (OPL->LFO_AM & (OP)->AMmask))
+
+/* calculate output */
+INLINE void OPL_CALC_CH( FM_OPL *OPL, OPL_CH *CH )
+{
+	OPL_SLOT *SLOT;
+	unsigned int env;
+	signed int out;
+
+	if (CH->Muted)
+		return;
+
+	OPL->phase_modulation = 0;
+
+	/* SLOT 1 */
+	SLOT = &CH->SLOTSLOT1;
+	env = volume_calc(SLOT);
+	out = SLOT->op1_out0 + SLOT->op1_out1;
+	SLOT->op1_out0 = SLOT->op1_out1;
+	*SLOT->connect1 += SLOT->op1_out0;
+	SLOT->op1_out1 = 0;
+	if( env < ENV_QUIET )
+	{
+		if (!SLOT->FB)
+			out = 0;
+		SLOT->op1_out1 = op_calc1(SLOT->Cnt, env, (out<<SLOT->FB), SLOT->wavetable );
+	}
+
+	/* SLOT 2 */
+	SLOT++;
+	env = volume_calc(SLOT);
+	if( env < ENV_QUIET )
+		OPL->output0 += op_calc(SLOT->Cnt, env, OPL->phase_modulation, SLOT->wavetable);
+}
+
+/*
+ operators used in the rhythm sounds generation process:
+
+ Envelope Generator:
+
+channel operator register number Bass High Snare Tom Top
+/ slot number TL ARDR SLRR Wave Drum Hat Drum Tom Cymbal
+ 6 / 0 12 50 70 90 f0 +
+ 6 / 1 15 53 73 93 f3 +
+ 7 / 0 13 51 71 91 f1 +
+ 7 / 1 16 54 74 94 f4 +
+ 8 / 0 14 52 72 92 f2 +
+ 8 / 1 17 55 75 95 f5 +
+
+ Phase Generator:
+
+channel operator register number Bass High Snare Tom Top
+/ slot number MULTIPLE Drum Hat Drum Tom Cymbal
+ 6 / 0 12 30 +
+ 6 / 1 15 33 +
+ 7 / 0 13 31 + + +
+ 7 / 1 16 34 ----- n o t u s e d -----
+ 8 / 0 14 32 +
+ 8 / 1 17 35 + +
+
+channel operator register number Bass High Snare Tom Top
+number number BLK/FNUM2 FNUM Drum Hat Drum Tom Cymbal
+ 6 12,15 B6 A6 +
+
+ 7 13,16 B7 A7 + + +
+
+ 8 14,17 B8 A8 + + +
+
+*/
+
+/* calculate rhythm */
+
+INLINE void OPL_CALC_RH( FM_OPL *OPL, OPL_CH *CH, unsigned int noise )
+{
+	OPL_SLOT *SLOT;
+	signed int out;
+	unsigned int env;
+
+
+	/* Bass Drum (verified on real YM3812):
+ - depends on the channel 6 'connect' register:
+ when connect = 0 it works the same as in normal (non-rhythm) mode (op1->op2->out)
+ when connect = 1 _only_ operator 2 is present on output (op2->out), operator 1 is ignored
+ - output sample always is multiplied by 2
+ */
+
+	OPL->phase_modulation = 0;
+	/* SLOT 1 */
+	SLOT = &CH6.SLOTSLOT1;
+	env = volume_calc(SLOT);
+
+	out = SLOT->op1_out0 + SLOT->op1_out1;
+	SLOT->op1_out0 = SLOT->op1_out1;
+
+	if (!SLOT->CON)
+		OPL->phase_modulation = SLOT->op1_out0;
+	/* else ignore output of operator 1 */
+
+	SLOT->op1_out1 = 0;
+	if( env < ENV_QUIET )
+	{
+		if (!SLOT->FB)
+			out = 0;
+		SLOT->op1_out1 = op_calc1(SLOT->Cnt, env, (out<<SLOT->FB), SLOT->wavetable );
+	}
+
+	/* SLOT 2 */
+	SLOT++;
+	env = volume_calc(SLOT);
+	if( env < ENV_QUIET && ! OPL->MuteSpc0 )
+		OPL->output0 += op_calc(SLOT->Cnt, env, OPL->phase_modulation, SLOT->wavetable) * 2;
+
+
+	/* Phase generation is based on: */
+	/* HH (13) channel 7->slot 1 combined with channel 8->slot 2 (same combination as TOP CYMBAL but different output phases) */
+	/* SD (16) channel 7->slot 1 */
+	/* TOM (14) channel 8->slot 1 */
+	/* TOP (17) channel 7->slot 1 combined with channel 8->slot 2 (same combination as HIGH HAT but different output phases) */
+
+	/* Envelope generation based on: */
+	/* HH channel 7->slot1 */
+	/* SD channel 7->slot2 */
+	/* TOM channel 8->slot1 */
+	/* TOP channel 8->slot2 */
+
+
+	/* The following formulas can be well optimized.
+ I leave them in direct form for now (in case I've missed something).
+ */
+
+	/* High Hat (verified on real YM3812) */
+	env = volume_calc(SLOT7_1);
+	if( env < ENV_QUIET && ! OPL->MuteSpc4 )
+	{
+
+		/* high hat phase generation:
+ phase = d0 or 234 (based on frequency only)
+ phase = 34 or 2d0 (based on noise)
+ */
+
+		/* base frequency derived from operator 1 in channel 7 */
+		unsigned char bit7 = ((SLOT7_1->Cnt>>FREQ_SH)>>7)&1;
+		unsigned char bit3 = ((SLOT7_1->Cnt>>FREQ_SH)>>3)&1;
+		unsigned char bit2 = ((SLOT7_1->Cnt>>FREQ_SH)>>2)&1;
+
+		unsigned char res1 = (bit2 ^ bit7) | bit3;
+
+		/* when res1 = 0 phase = 0x000 | 0xd0; */
+		/* when res1 = 1 phase = 0x200 | (0xd0>>2); */
+		UINT32 phase = res1 ? (0x200|(0xd0>>2)) : 0xd0;
+
+		/* enable gate based on frequency of operator 2 in channel 8 */
+		unsigned char bit5e= ((SLOT8_2->Cnt>>FREQ_SH)>>5)&1;
+		unsigned char bit3e= ((SLOT8_2->Cnt>>FREQ_SH)>>3)&1;
+
+		unsigned char res2 = (bit3e ^ bit5e);
+
+		/* when res2 = 0 pass the phase from calculation above (res1); */
+		/* when res2 = 1 phase = 0x200 | (0xd0>>2); */
+		if (res2)
+			phase = (0x200|(0xd0>>2));
+
+
+		/* when phase & 0x200 is set and noise=1 then phase = 0x200|0xd0 */
+		/* when phase & 0x200 is set and noise=0 then phase = 0x200|(0xd0>>2), ie no change */
+		if (phase&0x200)
+		{
+			if (noise)
+				phase = 0x200|0xd0;
+		}
+		else
+		/* when phase & 0x200 is clear and noise=1 then phase = 0xd0>>2 */
+		/* when phase & 0x200 is clear and noise=0 then phase = 0xd0, ie no change */
+		{
+			if (noise)
+				phase = 0xd0>>2;
+		}
+
+		OPL->output0 += op_calc(phase<<FREQ_SH, env, 0, SLOT7_1->wavetable) * 2;
+	}
+
+	/* Snare Drum (verified on real YM3812) */
+	env = volume_calc(SLOT7_2);
+	if( env < ENV_QUIET && ! OPL->MuteSpc1 )
+	{
+		/* base frequency derived from operator 1 in channel 7 */
+		unsigned char bit8 = ((SLOT7_1->Cnt>>FREQ_SH)>>8)&1;
+
+		/* when bit8 = 0 phase = 0x100; */
+		/* when bit8 = 1 phase = 0x200; */
+		UINT32 phase = bit8 ? 0x200 : 0x100;
+
+		/* Noise bit XOR'es phase by 0x100 */
+		/* when noisebit = 0 pass the phase from calculation above */
+		/* when noisebit = 1 phase ^= 0x100; */
+		/* in other words: phase ^= (noisebit<<8); */
+		if (noise)
+			phase ^= 0x100;
+
+		OPL->output0 += op_calc(phase<<FREQ_SH, env, 0, SLOT7_2->wavetable) * 2;
+	}
+
+	/* Tom Tom (verified on real YM3812) */
+	env = volume_calc(SLOT8_1);
+	if( env < ENV_QUIET && ! OPL->MuteSpc2 )
+		OPL->output0 += op_calc(SLOT8_1->Cnt, env, 0, SLOT8_1->wavetable) * 2;
+
+	/* Top Cymbal (verified on real YM3812) */
+	env = volume_calc(SLOT8_2);
+	if( env < ENV_QUIET && ! OPL->MuteSpc3 )
+	{
+		/* base frequency derived from operator 1 in channel 7 */
+		unsigned char bit7 = ((SLOT7_1->Cnt>>FREQ_SH)>>7)&1;
+		unsigned char bit3 = ((SLOT7_1->Cnt>>FREQ_SH)>>3)&1;
+		unsigned char bit2 = ((SLOT7_1->Cnt>>FREQ_SH)>>2)&1;
+
+		unsigned char res1 = (bit2 ^ bit7) | bit3;
+
+		/* when res1 = 0 phase = 0x000 | 0x100; */
+		/* when res1 = 1 phase = 0x200 | 0x100; */
+		UINT32 phase = res1 ? 0x300 : 0x100;
+
+		/* enable gate based on frequency of operator 2 in channel 8 */
+		unsigned char bit5e= ((SLOT8_2->Cnt>>FREQ_SH)>>5)&1;
+		unsigned char bit3e= ((SLOT8_2->Cnt>>FREQ_SH)>>3)&1;
+
+		unsigned char res2 = (bit3e ^ bit5e);
+		/* when res2 = 0 pass the phase from calculation above (res1); */
+		/* when res2 = 1 phase = 0x200 | 0x100; */
+		if (res2)
+			phase = 0x300;
+
+		OPL->output0 += op_calc(phase<<FREQ_SH, env, 0, SLOT8_2->wavetable) * 2;
+	}
+}
+
+
+/* generic table initialize */
+static int init_tables(void)
+{
+	signed int i,x;
+	signed int n;
+	double o,m;
+
+
+	for (x=0; x<TL_RES_LEN; x++)
+	{
+		m = (1<<16) / pow(2, (x+1) * (ENV_STEP/4.0) / 8.0);
+		m = floor(m);
+
+		/* we never reach (1<<16) here due to the (x+1) */
+		/* result fits within 16 bits at maximum */
+
+		n = (int)m;		/* 16 bits here */
+		n >>= 4;		/* 12 bits here */
+		if (n&1)		/* round to nearest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+						/* 11 bits here (rounded) */
+		n <<= 1;		/* 12 bits here (as in real chip) */
+		tl_tab x*2 + 0 = n;
+		tl_tab x*2 + 1 = -tl_tab x*2 + 0 ;
+
+		for (i=1; i<12; i++)
+		{
+			tl_tab x*2+0 + i*2*TL_RES_LEN = tl_tab x*2+0 >>i;
+			tl_tab x*2+1 + i*2*TL_RES_LEN = -tl_tab x*2+0 + i*2*TL_RES_LEN ;
+		}
+	#if 0
+			logerror("tl %04i", x*2);
+			for (i=0; i<12; i++)
+				logerror(", %02i %5i", i*2, tl_tab x*2 /*+1*/ + i*2*TL_RES_LEN );
+			logerror("\n");
+	#endif
+	}
+	/*logerror("FMOPL.C: TL_TAB_LEN = %i elements (%i bytes)\n",TL_TAB_LEN, (int)sizeof(tl_tab));*/
+
+
+	for (i=0; i<SIN_LEN; i++)
+	{
+		/* non-standard sinus */
+		m = sin( ((i*2)+1) * M_PI / SIN_LEN ); /* checked against the real chip */
+
+		/* we never reach zero here due to ((i*2)+1) */
+
+		if (m>0.0)
+			o = 8*log(1.0/m)/log(2.0);	/* convert to 'decibels' */
+		else
+			o = 8*log(-1.0/m)/log(2.0);	/* convert to 'decibels' */
+
+		o = o / (ENV_STEP/4);
+
+		n = (int)(2.0*o);
+		if (n&1)						/* round to nearest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+
+		sin_tab i = n*2 + (m>=0.0? 0: 1 );
+
+		/*logerror("FMOPL.C: sin %4i (hex=%03x)= %4i (tl_tab value=%5i)\n", i, i, sin_tabi, tl_tabsin_tabi );*/
+	}
+
+	for (i=0; i<SIN_LEN; i++)
+	{
+		/* waveform 1: __ __ */
+		/* / \____/ \____*/
+		/* output only first half of the sinus waveform (positive one) */
+
+		if (i & (1<<(SIN_BITS-1)) )
+			sin_tab1*SIN_LEN+i = TL_TAB_LEN;
+		else
+			sin_tab1*SIN_LEN+i = sin_tabi;
+
+		/* waveform 2: __ __ __ __ */
+		/* / \/ \/ \/ \*/
+		/* abs(sin) */
+
+		sin_tab2*SIN_LEN+i = sin_tabi & (SIN_MASK>>1) ;
+
+		/* waveform 3: _ _ _ _ */
+		/* / |_/ |_/ |_/ |_*/
+		/* abs(output only first quarter of the sinus waveform) */
+
+		if (i & (1<<(SIN_BITS-2)) )
+			sin_tab3*SIN_LEN+i = TL_TAB_LEN;
+		else
+			sin_tab3*SIN_LEN+i = sin_tabi & (SIN_MASK>>2);
+
+		/*logerror("FMOPL.C: sin1%4i= %4i (tl_tab value=%5i)\n", i, sin_tab1*SIN_LEN+i, tl_tabsin_tab1*SIN_LEN+i );
+ logerror("FMOPL.C: sin2%4i= %4i (tl_tab value=%5i)\n", i, sin_tab2*SIN_LEN+i, tl_tabsin_tab2*SIN_LEN+i );
+ logerror("FMOPL.C: sin3%4i= %4i (tl_tab value=%5i)\n", i, sin_tab3*SIN_LEN+i, tl_tabsin_tab3*SIN_LEN+i );*/
+	}
+	/*logerror("FMOPL.C: ENV_QUIET= %08x (dec*8=%i)\n", ENV_QUIET, ENV_QUIET*8 );*/
+
+
+#ifdef SAVE_SAMPLE
+	sample0=fopen("sampsum.pcm","wb");
+#endif
+
+	return 1;
+}
+
+static void OPLCloseTable( void )
+{
+#ifdef SAVE_SAMPLE
+	fclose(sample0);
+#endif
+}
+
+
+
+static void OPL_initalize(FM_OPL *OPL)
+{
+	int i;
+
+	/* frequency base */
+	OPL->freqbase = (OPL->rate) ? ((double)OPL->clock / 72.0) / OPL->rate : 0;
+#if 0
+	OPL->rate = (double)OPL->clock / 72.0;
+	OPL->freqbase = 1.0;
+#endif
+
+	/*logerror("freqbase=%f\n", OPL->freqbase);*/
+
+	/* Timer base time */
+	//OPL->TimerBase = attotime_mul(ATTOTIME_IN_HZ(OPL->clock), 72);
+
+	/* make fnumber -> increment counter table */
+	for( i=0 ; i < 1024 ; i++ )
+	{
+		/* opn phase increment counter = 20bit */
+		OPL->fn_tabi = (UINT32)( (double)i * 64 * OPL->freqbase * (1<<(FREQ_SH-10)) ); /* -10 because chip works with 10.10 fixed point, while we use 16.16 */
+#if 0
+		logerror("FMOPL.C: fn_tab%4i = %08x (dec=%8i)\n",
+				 i, OPL->fn_tabi>>6, OPL->fn_tabi>>6 );
+#endif
+	}
+
+#if 0
+	for( i=0 ; i < 16 ; i++ )
+	{
+		logerror("FMOPL.C: sl_tab%i = %08x\n",
+			i, sl_tabi );
+	}
+	for( i=0 ; i < 8 ; i++ )
+	{
+		int j;
+		logerror("FMOPL.C: ksl_taboct=%2i =",i);
+		for (j=0; j<16; j++)
+		{
+			logerror("%08x ", ksl_tabi*16+j );
+		}
+		logerror("\n");
+	}
+#endif
+
+	for(i = 0; i < 9; i ++)
+		OPL->P_CHi.Muted = 0x00;
+	for(i = 0; i < 6; i ++)
+		OPL->MuteSpci = 0x00;
+
+
+	/* Amplitude modulation: 27 output levels (triangle waveform); 1 level takes one of: 192, 256 or 448 samples */
+	/* One entry from LFO_AM_TABLE lasts for 64 samples */
+	OPL->lfo_am_inc = (1.0 / 64.0 ) * (1<<LFO_SH) * OPL->freqbase;
+
+	/* Vibrato: 8 output levels (triangle waveform); 1 level takes 1024 samples */
+	OPL->lfo_pm_inc = (1.0 / 1024.0) * (1<<LFO_SH) * OPL->freqbase;
+
+	/*logerror ("OPL->lfo_am_inc = %8x ; OPL->lfo_pm_inc = %8x\n", OPL->lfo_am_inc, OPL->lfo_pm_inc);*/
+
+	/* Noise generator: a step takes 1 sample */
+	OPL->noise_f = (1.0 / 1.0) * (1<<FREQ_SH) * OPL->freqbase;
+
+	OPL->eg_timer_add = (1<<EG_SH) * OPL->freqbase;
+	OPL->eg_timer_overflow = ( 1 ) * (1<<EG_SH);
+	/*logerror("OPLinit eg_timer_add=%8x eg_timer_overflow=%8x\n", OPL->eg_timer_add, OPL->eg_timer_overflow);*/
+
+}
+
+INLINE void FM_KEYON(OPL_SLOT *SLOT, UINT32 key_set)
+{
+	if( !SLOT->key )
+	{
+		/* restart Phase Generator */
+		SLOT->Cnt = 0;
+		/* phase -> Attack */
+		SLOT->state = EG_ATT;
+	}
+	SLOT->key |= key_set;
+}
+
+INLINE void FM_KEYOFF(OPL_SLOT *SLOT, UINT32 key_clr)
+{
+	if( SLOT->key )
+	{
+		SLOT->key &= key_clr;
+
+		if( !SLOT->key )
+		{
+			/* phase -> Release */
+			if (SLOT->state>EG_REL)
+				SLOT->state = EG_REL;
+		}
+	}
+}
+
+/* update phase increment counter of operator (also update the EG rates if necessary) */
+INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
+{
+	int ksr;
+
+	/* (frequency) phase increment counter */
+	SLOT->Incr = CH->fc * SLOT->mul;
+	ksr = CH->kcode >> SLOT->KSR;
+
+	if( SLOT->ksr != ksr )
+	{
+		SLOT->ksr = ksr;
+
+		/* calculate envelope generator rates */
+		if ((SLOT->ar + SLOT->ksr) < 16+62)
+		{
+			SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+			SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
+		}
+		else
+		{
+			SLOT->eg_sh_ar = 0;
+			SLOT->eg_sel_ar = 13*RATE_STEPS;
+		}
+		SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
+		SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
+		SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
+		SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
+	}
+}
+
+/* set multi,am,vib,EG-TYP,KSR,mul */
+INLINE void set_mul(FM_OPL *OPL,int slot,int v)
+{
+	OPL_CH *CH = &OPL->P_CHslot/2;
+	OPL_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->mul = mul_tabv&0x0f;
+	SLOT->KSR = (v&0x10) ? 0 : 2;
+	SLOT->eg_type = (v&0x20);
+	SLOT->vib = (v&0x40);
+	SLOT->AMmask = (v&0x80) ? ~0 : 0;
+	CALC_FCSLOT(CH,SLOT);
+}
+
+/* set ksl & tl */
+INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v)
+{
+	OPL_CH *CH = &OPL->P_CHslot/2;
+	OPL_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->ksl = ksl_shiftv >> 6;
+	SLOT->TL = (v&0x3f)<<(ENV_BITS-1-7); /* 7 bits TL (bit 6 = always 0) */
+
+	SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+}
+
+/* set attack rate & decay rate */
+INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v)
+{
+	OPL_CH *CH = &OPL->P_CHslot/2;
+	OPL_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->ar = (v>>4) ? 16 + ((v>>4) <<2) : 0;
+
+	if ((SLOT->ar + SLOT->ksr) < 16+62)
+	{
+		SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+		SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
+	}
+	else
+	{
+		SLOT->eg_sh_ar = 0;
+		SLOT->eg_sel_ar = 13*RATE_STEPS;
+	}
+
+	SLOT->dr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
+	SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
+	SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
+}
+
+/* set sustain level & release rate */
+INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v)
+{
+	OPL_CH *CH = &OPL->P_CHslot/2;
+	OPL_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->sl = sl_tab v>>4 ;
+
+	SLOT->rr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
+	SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
+	SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
+}
+
+
+/* write a value v to register r on OPL chip */
+static void OPLWriteReg(FM_OPL *OPL, int r, int v)
+{
+	OPL_CH *CH;
+	int slot;
+	int block_fnum;
+
+
+	/* adjust bus to 8 bits */
+	r &= 0xff;
+	v &= 0xff;
+
+	/*if (LOG_CYM_FILE && (cymfile) && (r!=0) )
+	{
+		fputc( (unsigned char)r, cymfile );
+		fputc( (unsigned char)v, cymfile );
+	}*/
+
+
+	switch(r&0xe0)
+	{
+	case 0x00:	/* 00-1f:control */
+		switch(r&0x1f)
+		{
+		case 0x01:	/* waveform select enable */
+			if(OPL->type&OPL_TYPE_WAVESEL)
+			{
+				OPL->wavesel = v&0x20;
+				/* do not change the waveform previously selected */
+			}
+			break;
+		case 0x02:	/* Timer 1 */
+			OPL->T0 = (256-v)*4;
+			break;
+		case 0x03:	/* Timer 2 */
+			OPL->T1 = (256-v)*16;
+			break;
+		case 0x04:	/* IRQ clear / mask and Timer enable */
+			if(v&0x80)
+			{	/* IRQ flag clear */
+				OPL_STATUS_RESET(OPL,0x7f-0x08); /* don't reset BFRDY flag or we will have to call deltat module to set the flag */
+			}
+			else
+			{	/* set IRQ mask ,timer enable*/
+				UINT8 st1 = v&1;
+				UINT8 st2 = (v>>1)&1;
+
+				/* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */
+				OPL_STATUS_RESET(OPL, v & (0x78-0x08) );
+				OPL_STATUSMASK_SET(OPL, (~v) & 0x78 );
+
+				/* timer 2 */
+				if(OPL->st1 != st2)
+				{
+					//attotime period = st2 ? attotime_mul(OPL->TimerBase, OPL->T1) : attotime_zero;
+					OPL->st1 = st2;
+					//if (OPL->timer_handler) (OPL->timer_handler)(OPL->TimerParam,1,period);
+				}
+				/* timer 1 */
+				if(OPL->st0 != st1)
+				{
+					//attotime period = st1 ? attotime_mul(OPL->TimerBase, OPL->T0) : attotime_zero;
+					OPL->st0 = st1;
+					//if (OPL->timer_handler) (OPL->timer_handler)(OPL->TimerParam,0,period);
+				}
+			}
+			break;
+#if BUILD_Y8950
+		case 0x06:		/* Key Board OUT */
+			if(OPL->type&OPL_TYPE_KEYBOARD)
+			{
+				if(OPL->keyboardhandler_w)
+					OPL->keyboardhandler_w(OPL->keyboard_param,v);
+#ifdef _DEBUG
+				else
+					logerror("Y8950: write unmapped KEYBOARD port\n");
+#endif
+			}
+			break;
+		case 0x07:	/* DELTA-T control 1 : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
+			if(OPL->type&OPL_TYPE_ADPCM)
+				YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
+			break;
+#endif
+		case 0x08:	/* MODE,DELTA-T control 2 : CSM,NOTESEL,x,x,smpl,da/ad,64k,rom */
+			OPL->mode = v;
+#if BUILD_Y8950
+			if(OPL->type&OPL_TYPE_ADPCM)
+				YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v&0x0f); /* mask 4 LSBs in register 08 for DELTA-T unit */
+#endif
+			break;
+
+#if BUILD_Y8950
+		case 0x09:		/* START ADD */
+		case 0x0a:
+		case 0x0b:		/* STOP ADD */
+		case 0x0c:
+		case 0x0d:		/* PRESCALE */
+		case 0x0e:
+		case 0x0f:		/* ADPCM data write */
+		case 0x10:		/* DELTA-N */
+		case 0x11:		/* DELTA-N */
+		case 0x12:		/* ADPCM volume */
+			if(OPL->type&OPL_TYPE_ADPCM)
+				YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
+			break;
+
+		case 0x15:		/* DAC data high 8 bits (F7,F6...F2) */
+		case 0x16:		/* DAC data low 2 bits (F1, F0 in bits 7,6) */
+		case 0x17:		/* DAC data shift (S2,S1,S0 in bits 2,1,0) */
+#ifdef _DEBUG
+			logerror("FMOPL.C: DAC data register written, but not implemented reg=%02x val=%02x\n",r,v);
+#endif
+			break;
+
+		case 0x18:		/* I/O CTRL (Direction) */
+			if(OPL->type&OPL_TYPE_IO)
+				OPL->portDirection = v&0x0f;
+			break;
+		case 0x19:		/* I/O DATA */
+			if(OPL->type&OPL_TYPE_IO)
+			{
+				OPL->portLatch = v;
+				if(OPL->porthandler_w)
+					OPL->porthandler_w(OPL->port_param,v&OPL->portDirection);
+			}
+			break;
+#endif
+		default:
+#ifdef _DEBUG
+			logerror("FMOPL.C: write to unknown register: %02x\n",r);
+#endif
+			break;
+		}
+		break;
+	case 0x20:	/* am ON, vib ON, ksr, eg_type, mul */
+		slot = slot_arrayr&0x1f;
+		if(slot < 0) return;
+		set_mul(OPL,slot,v);
+		break;
+	case 0x40:
+		slot = slot_arrayr&0x1f;
+		if(slot < 0) return;
+		set_ksl_tl(OPL,slot,v);
+		break;
+	case 0x60:
+		slot = slot_arrayr&0x1f;
+		if(slot < 0) return;
+		set_ar_dr(OPL,slot,v);
+		break;
+	case 0x80:
+		slot = slot_arrayr&0x1f;
+		if(slot < 0) return;
+		set_sl_rr(OPL,slot,v);
+		break;
+	case 0xa0:
+		if (r == 0xbd)			/* am depth, vibrato depth, r,bd,sd,tom,tc,hh */
+		{
+			OPL->lfo_am_depth = v & 0x80;
+			OPL->lfo_pm_depth_range = (v&0x40) ? 8 : 0;
+
+			OPL->rhythm = v&0x3f;
+
+			if(OPL->rhythm&0x20)
+			{
+				/* BD key on/off */
+				if(v&0x10)
+				{
+					FM_KEYON (&OPL->P_CH6.SLOTSLOT1, 2);
+					FM_KEYON (&OPL->P_CH6.SLOTSLOT2, 2);
+				}
+				else
+				{
+					FM_KEYOFF(&OPL->P_CH6.SLOTSLOT1,~2);
+					FM_KEYOFF(&OPL->P_CH6.SLOTSLOT2,~2);
+				}
+				/* HH key on/off */
+				if(v&0x01) FM_KEYON (&OPL->P_CH7.SLOTSLOT1, 2);
+				else FM_KEYOFF(&OPL->P_CH7.SLOTSLOT1,~2);
+				/* SD key on/off */
+				if(v&0x08) FM_KEYON (&OPL->P_CH7.SLOTSLOT2, 2);
+				else FM_KEYOFF(&OPL->P_CH7.SLOTSLOT2,~2);
+				/* TOM key on/off */
+				if(v&0x04) FM_KEYON (&OPL->P_CH8.SLOTSLOT1, 2);
+				else FM_KEYOFF(&OPL->P_CH8.SLOTSLOT1,~2);
+				/* TOP-CY key on/off */
+				if(v&0x02) FM_KEYON (&OPL->P_CH8.SLOTSLOT2, 2);
+				else FM_KEYOFF(&OPL->P_CH8.SLOTSLOT2,~2);
+			}
+			else
+			{
+				/* BD key off */
+				FM_KEYOFF(&OPL->P_CH6.SLOTSLOT1,~2);
+				FM_KEYOFF(&OPL->P_CH6.SLOTSLOT2,~2);
+				/* HH key off */
+				FM_KEYOFF(&OPL->P_CH7.SLOTSLOT1,~2);
+				/* SD key off */
+				FM_KEYOFF(&OPL->P_CH7.SLOTSLOT2,~2);
+				/* TOM key off */
+				FM_KEYOFF(&OPL->P_CH8.SLOTSLOT1,~2);
+				/* TOP-CY off */
+				FM_KEYOFF(&OPL->P_CH8.SLOTSLOT2,~2);
+			}
+			return;
+		}
+		/* keyon,block,fnum */
+		if( (r&0x0f) > 8) return;
+		CH = &OPL->P_CHr&0x0f;
+		if(!(r&0x10))
+		{	/* a0-a8 */
+			block_fnum = (CH->block_fnum&0x1f00) | v;
+		}
+		else
+		{	/* b0-b8 */
+			block_fnum = ((v&0x1f)<<8) | (CH->block_fnum&0xff);
+
+			if(v&0x20)
+			{
+				FM_KEYON (&CH->SLOTSLOT1, 1);
+				FM_KEYON (&CH->SLOTSLOT2, 1);
+			}
+			else
+			{
+				FM_KEYOFF(&CH->SLOTSLOT1,~1);
+				FM_KEYOFF(&CH->SLOTSLOT2,~1);
+			}
+		}
+		/* update */
+		if(CH->block_fnum != block_fnum)
+		{
+			UINT8 block = block_fnum >> 10;
+
+			CH->block_fnum = block_fnum;
+
+			CH->ksl_base = ksl_tabblock_fnum>>6;
+			CH->fc = OPL->fn_tabblock_fnum&0x03ff >> (7-block);
+
+			/* BLK 2,1,0 bits -> bits 3,2,1 of kcode */
+			CH->kcode = (CH->block_fnum&0x1c00)>>9;
+
+			 /* the info below is actually opposite to what is stated in the Manuals (verifed on real YM3812) */
+			/* if notesel == 0 -> lsb of kcode is bit 10 (MSB) of fnum */
+			/* if notesel == 1 -> lsb of kcode is bit 9 (MSB-1) of fnum */
+			if (OPL->mode&0x40)
+				CH->kcode |= (CH->block_fnum&0x100)>>8;	/* notesel == 1 */
+			else
+				CH->kcode |= (CH->block_fnum&0x200)>>9;	/* notesel == 0 */
+
+			/* refresh Total Level in both SLOTs of this channel */
+			CH->SLOTSLOT1.TLL = CH->SLOTSLOT1.TL + (CH->ksl_base>>CH->SLOTSLOT1.ksl);
+			CH->SLOTSLOT2.TLL = CH->SLOTSLOT2.TL + (CH->ksl_base>>CH->SLOTSLOT2.ksl);
+
+			/* refresh frequency counter in both SLOTs of this channel */
+			CALC_FCSLOT(CH,&CH->SLOTSLOT1);
+			CALC_FCSLOT(CH,&CH->SLOTSLOT2);
+		}
+		break;
+	case 0xc0:
+		/* FB,C */
+		if( (r&0x0f) > 8) return;
+		CH = &OPL->P_CHr&0x0f;
+		CH->SLOTSLOT1.FB = (v>>1)&7 ? ((v>>1)&7) + 7 : 0;
+		CH->SLOTSLOT1.CON = v&1;
+		CH->SLOTSLOT1.connect1 = CH->SLOTSLOT1.CON ? &OPL->output0 : &OPL->phase_modulation;
+		break;
+	case 0xe0: /* waveform select */
+		/* simply ignore write to the waveform select register if selecting not enabled in test register */
+		if(OPL->wavesel)
+		{
+			slot = slot_arrayr&0x1f;
+			if(slot < 0) return;
+			CH = &OPL->P_CHslot/2;
+
+			CH->SLOTslot&1.wavetable = (v&0x03)*SIN_LEN;
+		}
+		break;
+	}
+}
+
+/*static TIMER_CALLBACK( cymfile_callback )
+{
+	if (cymfile)
+	{
+		fputc( (unsigned char)0, cymfile );
+	}
+}*/
+
+/* lock/unlock for common table */
+static int OPL_LockTable(void)
+{
+	num_lock++;
+	if(num_lock>1) return 0;
+
+	/* first time */
+
+	/* allocate total level table (128kb space) */
+	if( !init_tables() )
+	{
+		num_lock--;
+		return -1;
+	}
+
+	/*if (LOG_CYM_FILE)
+	{
+		cymfile = fopen("3812_.cym","wb");
+		if (cymfile)
+			timer_pulse ( device->machine, ATTOTIME_IN_HZ(110), NULL, 0, cymfile_callback); //110 Hz pulse timer
+		else
+			logerror("Could not create file 3812_.cym\n");
+	}*/
+
+	return 0;
+}
+
+static void OPL_UnLockTable(void)
+{
+	if(num_lock) num_lock--;
+	if(num_lock) return;
+
+	/* last time */
+
+	OPLCloseTable();
+
+	/*if (cymfile)
+		fclose (cymfile);
+	cymfile = NULL;*/
+}
+
+static void OPLResetChip(FM_OPL *OPL)
+{
+	int c,s;
+	int i;
+
+	OPL->eg_timer = 0;
+	OPL->eg_cnt = 0;
+
+	OPL->noise_rng = 1;	/* noise shift register */
+	OPL->mode = 0;	/* normal mode */
+	OPL_STATUS_RESET(OPL,0x7f);
+
+	/* reset with register write */
+	OPLWriteReg(OPL,0x01,0); /* wavesel disable */
+	OPLWriteReg(OPL,0x02,0); /* Timer1 */
+	OPLWriteReg(OPL,0x03,0); /* Timer2 */
+	OPLWriteReg(OPL,0x04,0); /* IRQ mask clear */
+	for(i = 0xff ; i >= 0x20 ; i-- ) OPLWriteReg(OPL,i,0);
+
+	/* reset operator parameters */
+	for( c = 0 ; c < 9 ; c++ )
+	{
+		OPL_CH *CH = &OPL->P_CHc;
+		for(s = 0 ; s < 2 ; s++ )
+		{
+			/* wave table */
+			CH->SLOTs.wavetable = 0;
+			CH->SLOTs.state = EG_OFF;
+			CH->SLOTs.volume = MAX_ATT_INDEX;
+		}
+	}
+#if BUILD_Y8950
+	if(OPL->type&OPL_TYPE_ADPCM)
+	{
+		YM_DELTAT *DELTAT = OPL->deltat;
+
+		DELTAT->freqbase = OPL->freqbase;
+		DELTAT->output_pointer = &OPL->output_deltat0;
+		DELTAT->portshift = 5;
+		DELTAT->output_range = 1<<23;
+		YM_DELTAT_ADPCM_Reset(DELTAT,0,YM_DELTAT_EMULATION_MODE_NORMAL);
+	}
+#endif
+}
+
+
+#if 0
+//static STATE_POSTLOAD( OPL_postload )
+static void OPL_postload(void* param)
+{
+	FM_OPL *OPL = (FM_OPL *)param;
+	int slot, ch;
+
+	for( ch=0 ; ch < 9 ; ch++ )
+	{
+		OPL_CH *CH = &OPL->P_CHch;
+
+		/* Look up key scale level */
+		UINT32 block_fnum = CH->block_fnum;
+		CH->ksl_base = ksl_tabblock_fnum >> 6;
+		CH->fc = OPL->fn_tabblock_fnum & 0x03ff >> (7 - (block_fnum >> 10));
+
+		for( slot=0 ; slot < 2 ; slot++ )
+		{
+			OPL_SLOT *SLOT = &CH->SLOTslot;
+
+			/* Calculate key scale rate */
+			SLOT->ksr = CH->kcode >> SLOT->KSR;
+
+			/* Calculate attack, decay and release rates */
+			if ((SLOT->ar + SLOT->ksr) < 16+62)
+			{
+				SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+				SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
+			}
+			else
+			{
+				SLOT->eg_sh_ar = 0;
+				SLOT->eg_sel_ar = 13*RATE_STEPS;
+			}
+			SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
+			SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
+			SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
+			SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
+
+			/* Calculate phase increment */
+			SLOT->Incr = CH->fc * SLOT->mul;
+
+			/* Total level */
+			SLOT->TLL = SLOT->TL + (CH->ksl_base >> SLOT->ksl);
+
+			/* Connect output */
+			SLOT->connect1 = SLOT->CON ? &OPL->output0 : &OPL->phase_modulation;
+		}
+	}
+#if BUILD_Y8950
+	if ( (OPL->type & OPL_TYPE_ADPCM) && (OPL->deltat) )
+	{
+		// We really should call the postlod function for the YM_DELTAT, but it's hard without registers
+		// (see the way the YM2610 does it)
+		//YM_DELTAT_postload(OPL->deltat, REGS);
+	}
+#endif
+}
+
+
+static void OPLsave_state_channel(OPL_CH *CH)
+{
+	int slot, ch;
+
+	for( ch=0 ; ch < 9 ; ch++, CH++ )
+	{
+		// channel 
+		state_save_register_device_item(device, ch, CH->block_fnum);
+		state_save_register_device_item(device, ch, CH->kcode);
+		// slots 
+		for( slot=0 ; slot < 2 ; slot++ )
+		{
+			OPL_SLOT *SLOT = &CH->SLOTslot;
+
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->ar);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->dr);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->rr);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->KSR);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->ksl);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->mul);
+
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->Cnt);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->FB);
+			state_save_register_device_item_array(device, ch * 2 + slot, SLOT->op1_out);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->CON);
+
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->eg_type);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->state);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->TL);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->volume);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->sl);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->key);
+
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->AMmask);
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->vib);
+
+			state_save_register_device_item(device, ch * 2 + slot, SLOT->wavetable);
+		}
+	}
+}
+#endif
+
+
+/* Register savestate for a virtual YM3812/YM3526/Y8950 */
+
+/*static void OPL_save_state(FM_OPL *OPL)
+{
+	OPLsave_state_channel(device, OPL->P_CH);
+
+	state_save_register_device_item(device, 0, OPL->eg_cnt);
+	state_save_register_device_item(device, 0, OPL->eg_timer);
+
+	state_save_register_device_item(device, 0, OPL->rhythm);
+
+	state_save_register_device_item(device, 0, OPL->lfo_am_depth);
+	state_save_register_device_item(device, 0, OPL->lfo_pm_depth_range);
+	state_save_register_device_item(device, 0, OPL->lfo_am_cnt);
+	state_save_register_device_item(device, 0, OPL->lfo_pm_cnt);
+
+	state_save_register_device_item(device, 0, OPL->noise_rng);
+	state_save_register_device_item(device, 0, OPL->noise_p);
+
+	if( OPL->type & OPL_TYPE_WAVESEL )
+	{
+		state_save_register_device_item(device, 0, OPL->wavesel);
+	}
+
+	state_save_register_device_item_array(device, 0, OPL->T);
+	state_save_register_device_item_array(device, 0, OPL->st);
+
+#if BUILD_Y8950
+	if ( (OPL->type & OPL_TYPE_ADPCM) && (OPL->deltat) )
+	{
+		YM_DELTAT_savestate(device, OPL->deltat);
+	}
+
+	if ( OPL->type & OPL_TYPE_IO )
+	{
+		state_save_register_device_item(device, 0, OPL->portDirection);
+		state_save_register_device_item(device, 0, OPL->portLatch);
+	}
+#endif
+
+	state_save_register_device_item(device, 0, OPL->address);
+	state_save_register_device_item(device, 0, OPL->status);
+	state_save_register_device_item(device, 0, OPL->statusmask);
+	state_save_register_device_item(device, 0, OPL->mode);
+
+	state_save_register_postload(device->machine, OPL_postload, OPL);
+}*/
+
+
+/* Create one of virtual YM3812/YM3526/Y8950 */
+/* 'clock' is chip clock in Hz */
+/* 'rate' is sampling rate */
+static FM_OPL *OPLCreate(UINT32 clock, UINT32 rate, int type)
+{
+	char *ptr;
+	FM_OPL *OPL;
+	int state_size;
+
+	if (OPL_LockTable() == -1) return NULL;
+
+	/* calculate OPL state size */
+	state_size = sizeof(FM_OPL);
+
+#if BUILD_Y8950
+	if (type&OPL_TYPE_ADPCM) state_size+= sizeof(YM_DELTAT);
+#endif
+
+	/* allocate memory block */
+	ptr = (char *)malloc(state_size);
+
+	if (ptr==NULL)
+		return NULL;
+
+	/* clear */
+	memset(ptr,0,state_size);
+
+	OPL = (FM_OPL *)ptr;
+
+	ptr += sizeof(FM_OPL);
+
+#if BUILD_Y8950
+	if (type&OPL_TYPE_ADPCM)
+	{
+		OPL->deltat = (YM_DELTAT *)ptr;
+	}
+	ptr += sizeof(YM_DELTAT);
+#endif
+
+	OPL->type = type;
+	OPL->clock = clock;
+	OPL->rate = rate;
+
+	/* init global tables */
+	OPL_initalize(OPL);
+
+	return OPL;
+}
+
+/* Destroy one of virtual YM3812 */
+static void OPLDestroy(FM_OPL *OPL)
+{
+	OPL_UnLockTable();
+	free(OPL);
+}
+
+/* Optional handlers */
+
+static void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER timer_handler,void *param)
+{
+	OPL->timer_handler = timer_handler;
+	OPL->TimerParam = param;
+}
+static void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,void *param)
+{
+	OPL->IRQHandler = IRQHandler;
+	OPL->IRQParam = param;
+}
+static void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,void *param)
+{
+	OPL->UpdateHandler = UpdateHandler;
+	OPL->UpdateParam = param;
+}
+
+static int OPLWrite(FM_OPL *OPL,int a,int v)
+{
+	if( !(a&1) )
+	{	/* address port */
+		OPL->address = v & 0xff;
+	}
+	else
+	{	/* data port */
+		if(OPL->UpdateHandler) OPL->UpdateHandler(OPL->UpdateParam/*,0*/);
+		OPLWriteReg(OPL,OPL->address,v);
+	}
+	return OPL->status>>7;
+}
+
+static unsigned char OPLRead(FM_OPL *OPL,int a)
+{
+	if( !(a&1) )
+	{
+		/* status port */
+
+		#if BUILD_Y8950
+
+		if(OPL->type&OPL_TYPE_ADPCM)	/* Y8950 */
+		{
+			return (OPL->status & (OPL->statusmask|0x80)) | (OPL->deltat->PCM_BSY&1);
+		}
+
+		#endif
+
+		/* OPL and OPL2 */
+		return OPL->status & (OPL->statusmask|0x80);
+	}
+
+#if BUILD_Y8950
+	/* data port */
+	switch(OPL->address)
+	{
+	case 0x05: /* KeyBoard IN */
+		if(OPL->type&OPL_TYPE_KEYBOARD)
+		{
+			if(OPL->keyboardhandler_r)
+				return OPL->keyboardhandler_r(OPL->keyboard_param);
+#ifdef _DEBUG
+			else
+				logerror("Y8950: read unmapped KEYBOARD port\n");
+#endif
+		}
+		return 0;
+
+	case 0x0f: /* ADPCM-DATA */
+		if(OPL->type&OPL_TYPE_ADPCM)
+		{
+			UINT8 val;
+
+			val = YM_DELTAT_ADPCM_Read(OPL->deltat);
+			/*logerror("Y8950: read ADPCM value read=%02x\n",val);*/
+			return val;
+		}
+		return 0;
+
+	case 0x19: /* I/O DATA */
+		if(OPL->type&OPL_TYPE_IO)
+		{
+			if(OPL->porthandler_r)
+				return OPL->porthandler_r(OPL->port_param);
+#ifdef _DEBUG
+			else
+				logerror("Y8950:read unmapped I/O port\n");
+#endif
+		}
+		return 0;
+	case 0x1a: /* PCM-DATA */
+		if(OPL->type&OPL_TYPE_ADPCM)
+		{
+#ifdef _DEBUG
+			logerror("Y8950 A/D convertion is accessed but not implemented !\n");
+#endif
+			return 0x80; /* 2's complement PCM data - result from A/D convertion */
+		}
+		return 0;
+	}
+#endif
+
+	return 0xff;
+}
+
+/* CSM Key Controll */
+INLINE void CSMKeyControll(OPL_CH *CH)
+{
+	FM_KEYON (&CH->SLOTSLOT1, 4);
+	FM_KEYON (&CH->SLOTSLOT2, 4);
+
+	/* The key off should happen exactly one sample later - not implemented correctly yet */
+
+	FM_KEYOFF(&CH->SLOTSLOT1, ~4);
+	FM_KEYOFF(&CH->SLOTSLOT2, ~4);
+}
+
+
+static int OPLTimerOver(FM_OPL *OPL,int c)
+{
+	if( c )
+	{	/* Timer B */
+		OPL_STATUS_SET(OPL,0x20);
+	}
+	else
+	{	/* Timer A */
+		OPL_STATUS_SET(OPL,0x40);
+		/* CSM mode key,TL controll */
+		if( OPL->mode & 0x80 )
+		{	/* CSM mode total level latch and auto key on */
+			int ch;
+			if(OPL->UpdateHandler) OPL->UpdateHandler(OPL->UpdateParam/*,0*/);
+			for(ch=0; ch<9; ch++)
+				CSMKeyControll( &OPL->P_CHch );
+		}
+	}
+	/* reload timer */
+	//if (OPL->timer_handler) (OPL->timer_handler)(OPL->TimerParam,c,attotime_mul(OPL->TimerBase, OPL->Tc));
+	return OPL->status>>7;
+}
+
+
+#define MAX_OPL_CHIPS 2
+
+
+#if (BUILD_YM3812)
+
+void * ym3812_init(UINT32 clock, UINT32 rate)
+{
+	/* emulator create */
+	FM_OPL *YM3812 = OPLCreate(clock,rate,OPL_TYPE_YM3812);
+	if (YM3812)
+	{
+		//OPL_save_state(YM3812);
+		ym3812_reset_chip(YM3812);
+	}
+	return YM3812;
+}
+
+void ym3812_shutdown(void *chip)
+{
+	FM_OPL *YM3812 = (FM_OPL *)chip;
+	/* emulator shutdown */
+	OPLDestroy(YM3812);
+}
+void ym3812_reset_chip(void *chip)
+{
+	FM_OPL *YM3812 = (FM_OPL *)chip;
+	OPLResetChip(YM3812);
+}
+
+int ym3812_write(void *chip, int a, int v)
+{
+	FM_OPL *YM3812 = (FM_OPL *)chip;
+	return OPLWrite(YM3812, a, v);
+}
+
+unsigned char ym3812_read(void *chip, int a)
+{
+	FM_OPL *YM3812 = (FM_OPL *)chip;
+	/* YM3812 always returns bit2 and bit1 in HIGH state */
+	return OPLRead(YM3812, a) | 0x06 ;
+}
+int ym3812_timer_over(void *chip, int c)
+{
+	FM_OPL *YM3812 = (FM_OPL *)chip;
+	return OPLTimerOver(YM3812, c);
+}
+
+void ym3812_set_timer_handler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
+{
+	FM_OPL *YM3812 = (FM_OPL *)chip;
+	OPLSetTimerHandler(YM3812, timer_handler, param);
+}
+void ym3812_set_irq_handler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
+{
+	FM_OPL *YM3812 = (FM_OPL *)chip;
+	OPLSetIRQHandler(YM3812, IRQHandler, param);
+}
+void ym3812_set_update_handler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
+{
+	FM_OPL *YM3812 = (FM_OPL *)chip;
+	OPLSetUpdateHandler(YM3812, UpdateHandler, param);
+}
+
+
+/*
+** Generate samples for one of the YM3812's
+**
+** 'which' is the virtual YM3812 number
+** '*buffer' is the output buffer pointer
+** 'length' is the number of samples that should be generated
+*/
+void ym3812_update_one(void *chip, OPLSAMPLE **buffer, int length)
+{
+	FM_OPL		*OPL = (FM_OPL *)chip;
+	UINT8		rhythm = OPL->rhythm&0x20;
+	OPLSAMPLE	*bufL = buffer0;
+	OPLSAMPLE	*bufR = buffer1;
+	int i;
+
+	if (! length)
+	{
+		refresh_eg(OPL);
+		return;
+	}
+	
+	for( i=0; i < length ; i++ )
+	{
+		int lt;
+
+		OPL->output0 = 0;
+
+		advance_lfo(OPL);
+
+		/* FM part */
+		OPL_CALC_CH(OPL, &OPL->P_CH0);
+		OPL_CALC_CH(OPL, &OPL->P_CH1);
+		OPL_CALC_CH(OPL, &OPL->P_CH2);
+		OPL_CALC_CH(OPL, &OPL->P_CH3);
+		OPL_CALC_CH(OPL, &OPL->P_CH4);
+		OPL_CALC_CH(OPL, &OPL->P_CH5);
+
+		if(!rhythm)
+		{
+			OPL_CALC_CH(OPL, &OPL->P_CH6);
+			OPL_CALC_CH(OPL, &OPL->P_CH7);
+			OPL_CALC_CH(OPL, &OPL->P_CH8);
+		}
+		else		/* Rhythm part */
+		{
+			OPL_CALC_RH(OPL, &OPL->P_CH0, (OPL->noise_rng>>0)&1 );
+		}
+
+		lt = OPL->output0;
+
+		lt >>= FINAL_SH;
+
+		/* limit check */
+		//lt = limit( lt , MAXOUT, MINOUT );
+
+		#ifdef SAVE_SAMPLE
+		if (which==0)
+		{
+			SAVE_ALL_CHANNELS
+		}
+		#endif
+
+		/* store to sound buffer */
+		bufLi = lt;
+		bufRi = lt;
+
+		advance(OPL);
+	}
+
+}
+#endif /* BUILD_YM3812 */
+
+
+
+#if (BUILD_YM3526)
+
+void *ym3526_init(UINT32 clock, UINT32 rate)
+{
+	/* emulator create */
+	FM_OPL *YM3526 = OPLCreate(clock,rate,OPL_TYPE_YM3526);
+	if (YM3526)
+	{
+		//OPL_save_state(YM3526);
+		ym3526_reset_chip(YM3526);
+	}
+	return YM3526;
+}
+
+void ym3526_shutdown(void *chip)
+{
+	FM_OPL *YM3526 = (FM_OPL *)chip;
+	/* emulator shutdown */
+	OPLDestroy(YM3526);
+}
+void ym3526_reset_chip(void *chip)
+{
+	FM_OPL *YM3526 = (FM_OPL *)chip;
+	OPLResetChip(YM3526);
+}
+
+int ym3526_write(void *chip, int a, int v)
+{
+	FM_OPL *YM3526 = (FM_OPL *)chip;
+	return OPLWrite(YM3526, a, v);
+}
+
+unsigned char ym3526_read(void *chip, int a)
+{
+	FM_OPL *YM3526 = (FM_OPL *)chip;
+	/* YM3526 always returns bit2 and bit1 in HIGH state */
+	return OPLRead(YM3526, a) | 0x06 ;
+}
+int ym3526_timer_over(void *chip, int c)
+{
+	FM_OPL *YM3526 = (FM_OPL *)chip;
+	return OPLTimerOver(YM3526, c);
+}
+
+void ym3526_set_timer_handler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
+{
+	FM_OPL *YM3526 = (FM_OPL *)chip;
+	OPLSetTimerHandler(YM3526, timer_handler, param);
+}
+void ym3526_set_irq_handler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
+{
+	FM_OPL *YM3526 = (FM_OPL *)chip;
+	OPLSetIRQHandler(YM3526, IRQHandler, param);
+}
+void ym3526_set_update_handler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
+{
+	FM_OPL *YM3526 = (FM_OPL *)chip;
+	OPLSetUpdateHandler(YM3526, UpdateHandler, param);
+}
+
+
+/*
+** Generate samples for one of the YM3526's
+**
+** 'which' is the virtual YM3526 number
+** '*buffer' is the output buffer pointer
+** 'length' is the number of samples that should be generated
+*/
+void ym3526_update_one(void *chip, OPLSAMPLE **buffer, int length)
+{
+	FM_OPL		*OPL = (FM_OPL *)chip;
+	UINT8		rhythm = OPL->rhythm&0x20;
+	OPLSAMPLE	*bufL = buffer0;
+	OPLSAMPLE	*bufR = buffer1;
+	int i;
+
+	for( i=0; i < length ; i++ )
+	{
+		int lt;
+
+		OPL->output0 = 0;
+
+		advance_lfo(OPL);
+
+		/* FM part */
+		OPL_CALC_CH(OPL, &OPL->P_CH0);
+		OPL_CALC_CH(OPL, &OPL->P_CH1);
+		OPL_CALC_CH(OPL, &OPL->P_CH2);
+		OPL_CALC_CH(OPL, &OPL->P_CH3);
+		OPL_CALC_CH(OPL, &OPL->P_CH4);
+		OPL_CALC_CH(OPL, &OPL->P_CH5);
+
+		if(!rhythm)
+		{
+			OPL_CALC_CH(OPL, &OPL->P_CH6);
+			OPL_CALC_CH(OPL, &OPL->P_CH7);
+			OPL_CALC_CH(OPL, &OPL->P_CH8);
+		}
+		else		/* Rhythm part */
+		{
+			OPL_CALC_RH(OPL, &OPL->P_CH0, (OPL->noise_rng>>0)&1 );
+		}
+
+		lt = OPL->output0;
+
+		lt >>= FINAL_SH;
+
+		/* limit check */
+		//lt = limit( lt , MAXOUT, MINOUT );
+
+		#ifdef SAVE_SAMPLE
+		if (which==0)
+		{
+			SAVE_ALL_CHANNELS
+		}
+		#endif
+
+		/* store to sound buffer */
+		bufLi = lt;
+		bufRi = lt;
+
+		advance(OPL);
+	}
+
+}
+#endif /* BUILD_YM3526 */
+
+
+
+
+#if BUILD_Y8950
+
+static void Y8950_deltat_status_set(void *chip, UINT8 changebits)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	OPL_STATUS_SET(Y8950, changebits);
+}
+static void Y8950_deltat_status_reset(void *chip, UINT8 changebits)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	OPL_STATUS_RESET(Y8950, changebits);
+}
+
+void *y8950_init(UINT32 clock, UINT32 rate)
+{
+	/* emulator create */
+	FM_OPL *Y8950 = OPLCreate(clock,rate,OPL_TYPE_Y8950);
+	if (Y8950)
+	{
+		Y8950->deltat->memory = NULL;
+		Y8950->deltat->memory_size = 0x00;
+		Y8950->deltat->memory_mask = 0x00;
+
+		Y8950->deltat->status_set_handler = Y8950_deltat_status_set;
+		Y8950->deltat->status_reset_handler = Y8950_deltat_status_reset;
+		Y8950->deltat->status_change_which_chip = Y8950;
+		Y8950->deltat->status_change_EOS_bit = 0x10;		/* status flag: set bit4 on End Of Sample */
+		Y8950->deltat->status_change_BRDY_bit = 0x08;	/* status flag: set bit3 on BRDY (End Of: ADPCM analysis/synthesis, memory reading/writing) */
+
+		/*Y8950->deltat->write_time = 10.0 / clock;*/		/* a single byte write takes 10 cycles of main clock */
+		/*Y8950->deltat->read_time = 8.0 / clock;*/		/* a single byte read takes 8 cycles of main clock */
+		/* reset */
+		//OPL_save_state(Y8950);
+		y8950_reset_chip(Y8950);
+	}
+
+	return Y8950;
+}
+
+void y8950_shutdown(void *chip)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	
+	free(Y8950->deltat->memory);	Y8950->deltat->memory = NULL;
+	
+	/* emulator shutdown */
+	OPLDestroy(Y8950);
+}
+void y8950_reset_chip(void *chip)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	OPLResetChip(Y8950);
+}
+
+int y8950_write(void *chip, int a, int v)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	return OPLWrite(Y8950, a, v);
+}
+
+unsigned char y8950_read(void *chip, int a)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	return OPLRead(Y8950, a);
+}
+int y8950_timer_over(void *chip, int c)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	return OPLTimerOver(Y8950, c);
+}
+
+void y8950_set_timer_handler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	OPLSetTimerHandler(Y8950, timer_handler, param);
+}
+void y8950_set_irq_handler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	OPLSetIRQHandler(Y8950, IRQHandler, param);
+}
+void y8950_set_update_handler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	OPLSetUpdateHandler(Y8950, UpdateHandler, param);
+}
+
+void y8950_set_delta_t_memory(void *chip, void * deltat_mem_ptr, int deltat_mem_size )
+{
+	FM_OPL		*OPL = (FM_OPL *)chip;
+	OPL->deltat->memory = (UINT8 *)(deltat_mem_ptr);
+	OPL->deltat->memory_size = deltat_mem_size;
+}
+
+void y8950_write_pcmrom(void *chip, offs_t ROMSize, offs_t DataStart,
+						 offs_t DataLength, const UINT8* ROMData)
+{
+	FM_OPL *Y8950 = (FM_OPL *)chip;
+	
+	if (Y8950->deltat->memory_size != ROMSize)
+	{
+		Y8950->deltat->memory = (UINT8*)realloc(Y8950->deltat->memory, ROMSize);
+		Y8950->deltat->memory_size = ROMSize;
+		memset(Y8950->deltat->memory, 0xFF, ROMSize);
+		YM_DELTAT_calc_mem_mask(Y8950->deltat);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(Y8950->deltat->memory + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+/*
+** Generate samples for one of the Y8950's
+**
+** 'which' is the virtual Y8950 number
+** '*buffer' is the output buffer pointer
+** 'length' is the number of samples that should be generated
+*/
+void y8950_update_one(void *chip, OPLSAMPLE **buffer, int length)
+{
+	int i;
+	FM_OPL		*OPL = (FM_OPL *)chip;
+	UINT8		rhythm = OPL->rhythm&0x20;
+	YM_DELTAT	*DELTAT = OPL->deltat;
+	OPLSAMPLE	*bufL = buffer0;
+	OPLSAMPLE	*bufR = buffer1;
+
+	for( i=0; i < length ; i++ )
+	{
+		int lt;
+
+		OPL->output0 = 0;
+		OPL->output_deltat0 = 0;
+
+		advance_lfo(OPL);
+
+		/* deltaT ADPCM */
+		if( DELTAT->portstate&0x80 && ! OPL->MuteSpc5 )
+			YM_DELTAT_ADPCM_CALC(DELTAT);
+
+		/* FM part */
+		OPL_CALC_CH(OPL, &OPL->P_CH0);
+		OPL_CALC_CH(OPL, &OPL->P_CH1);
+		OPL_CALC_CH(OPL, &OPL->P_CH2);
+		OPL_CALC_CH(OPL, &OPL->P_CH3);
+		OPL_CALC_CH(OPL, &OPL->P_CH4);
+		OPL_CALC_CH(OPL, &OPL->P_CH5);
+
+		if(!rhythm)
+		{
+			OPL_CALC_CH(OPL, &OPL->P_CH6);
+			OPL_CALC_CH(OPL, &OPL->P_CH7);
+			OPL_CALC_CH(OPL, &OPL->P_CH8);
+		}
+		else		/* Rhythm part */
+		{
+			OPL_CALC_RH(OPL, &OPL->P_CH0, (OPL->noise_rng>>0)&1 );
+		}
+
+		lt = OPL->output0 + (OPL->output_deltat0>>11);
+
+		lt >>= FINAL_SH;
+
+		/* limit check */
+		//lt = limit( lt , MAXOUT, MINOUT );
+
+		#ifdef SAVE_SAMPLE
+		if (which==0)
+		{
+			SAVE_ALL_CHANNELS
+		}
+		#endif
+
+		/* store to sound buffer */
+		bufLi = lt;
+		bufRi = lt;
+
+		advance(OPL);
+	}
+
+}
+
+void y8950_set_port_handler(void *chip,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,void * param)
+{
+	FM_OPL		*OPL = (FM_OPL *)chip;
+	OPL->porthandler_w = PortHandler_w;
+	OPL->porthandler_r = PortHandler_r;
+	OPL->port_param = param;
+}
+
+void y8950_set_keyboard_handler(void *chip,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,void * param)
+{
+	FM_OPL		*OPL = (FM_OPL *)chip;
+	OPL->keyboardhandler_w = KeyboardHandler_w;
+	OPL->keyboardhandler_r = KeyboardHandler_r;
+	OPL->keyboard_param = param;
+}
+
+#endif
+
+void opl_set_mute_mask(void *chip, UINT32 MuteMask)
+{
+	FM_OPL *opl = (FM_OPL *)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 9; CurChn ++)
+		opl->P_CHCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		opl->MuteSpcCurChn = (MuteMask >> (9 + CurChn)) & 0x01;
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/fmopl.h Added

@@ -0,0 +1,122 @@
+#pragma once
+
+//#include "attotime.h"
+
+/* --- select emulation chips --- */
+//#define BUILD_YM3812 (HAS_YM3812)
+//#define BUILD_YM3526 (HAS_YM3526)
+//#define BUILD_Y8950  (HAS_Y8950)
+#define BUILD_YM3812 1
+#define BUILD_YM3526 1
+#ifndef NO_Y8950
+#define BUILD_Y8950  1
+#else
+#define BUILD_Y8950  0
+#endif
+
+/* select output bits size of output : 8 or 16 */
+#define OPL_SAMPLE_BITS 16
+
+/* compiler dependence */
+/*#ifndef __OSDCOMM_H__
+#define __OSDCOMM_H__
+typedef unsigned char	UINT8;   // unsigned  8bit
+typedef unsigned short	UINT16;  // unsigned 16bit
+typedef unsigned int	UINT32;  // unsigned 32bit
+typedef signed char		INT8;    // signed  8bit
+typedef signed short	INT16;   // signed 16bit
+typedef signed int		INT32;   // signed 32bit
+#endif*/ /* __OSDCOMM_H__ */
+
+typedef stream_sample_t OPLSAMPLE;
+/*
+#if (OPL_SAMPLE_BITS==16)
+typedef INT16 OPLSAMPLE;
+#endif
+#if (OPL_SAMPLE_BITS==8)
+typedef INT8 OPLSAMPLE;
+#endif
+*/
+
+//typedef void (*OPL_TIMERHANDLER)(void *param,int timer,attotime period);
+typedef void (*OPL_TIMERHANDLER)(void *param,int timer,int period);
+typedef void (*OPL_IRQHANDLER)(void *param,int irq);
+typedef void (*OPL_UPDATEHANDLER)(void *param/*,int min_interval_us*/);
+typedef void (*OPL_PORTHANDLER_W)(void *param,unsigned char data);
+typedef unsigned char (*OPL_PORTHANDLER_R)(void *param);
+
+
+#if BUILD_YM3812
+
+void *ym3812_init(UINT32 clock, UINT32 rate);
+void ym3812_shutdown(void *chip);
+void ym3812_reset_chip(void *chip);
+int  ym3812_write(void *chip, int a, int v);
+unsigned char ym3812_read(void *chip, int a);
+int  ym3812_timer_over(void *chip, int c);
+void ym3812_update_one(void *chip, OPLSAMPLE **buffer, int length);
+
+void ym3812_set_timer_handler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
+void ym3812_set_irq_handler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
+void ym3812_set_update_handler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
+
+#endif /* BUILD_YM3812 */
+
+
+#if BUILD_YM3526
+
+/*
+** Initialize YM3526 emulator(s).
+**
+** 'num' is the number of virtual YM3526's to allocate
+** 'clock' is the chip clock in Hz
+** 'rate' is sampling rate
+*/
+void *ym3526_init(UINT32 clock, UINT32 rate);
+/* shutdown the YM3526 emulators*/
+void ym3526_shutdown(void *chip);
+void ym3526_reset_chip(void *chip);
+int  ym3526_write(void *chip, int a, int v);
+unsigned char ym3526_read(void *chip, int a);
+int  ym3526_timer_over(void *chip, int c);
+/*
+** Generate samples for one of the YM3526's
+**
+** 'which' is the virtual YM3526 number
+** '*buffer' is the output buffer pointer
+** 'length' is the number of samples that should be generated
+*/
+void ym3526_update_one(void *chip, OPLSAMPLE **buffer, int length);
+
+void ym3526_set_timer_handler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
+void ym3526_set_irq_handler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
+void ym3526_set_update_handler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
+
+#endif /* BUILD_YM3526 */
+
+
+#if BUILD_Y8950
+
+/* Y8950 port handlers */
+void y8950_set_port_handler(void *chip, OPL_PORTHANDLER_W PortHandler_w, OPL_PORTHANDLER_R PortHandler_r, void *param);
+void y8950_set_keyboard_handler(void *chip, OPL_PORTHANDLER_W KeyboardHandler_w, OPL_PORTHANDLER_R KeyboardHandler_r, void *param);
+void y8950_set_delta_t_memory(void *chip, void * deltat_mem_ptr, int deltat_mem_size );
+void y8950_write_pcmrom(void *chip, offs_t ROMSize, offs_t DataStart,
+						 offs_t DataLength, const UINT8* ROMData);
+
+void * y8950_init(UINT32 clock, UINT32 rate);
+void y8950_shutdown(void *chip);
+void y8950_reset_chip(void *chip);
+int  y8950_write(void *chip, int a, int v);
+unsigned char y8950_read (void *chip, int a);
+int  y8950_timer_over(void *chip, int c);
+void y8950_update_one(void *chip, OPLSAMPLE **buffer, int length);
+
+void y8950_set_timer_handler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
+void y8950_set_irq_handler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
+void y8950_set_update_handler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
+
+#endif /* BUILD_Y8950 */
+
+void opl_set_mute_mask(void *chip, UINT32 MuteMask);
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.c Added

@@ -0,0 +1,920 @@
+/**************************************************************************************
+* Game Boy sound emulation (c) Anthony Kruize (trandor@labyrinth.net.au)
+*
+* Anyways, sound on the Game Boy consists of 4 separate 'channels'
+* Sound1 = Quadrangular waves with SWEEP and ENVELOPE functions (NR10,11,12,13,14)
+* Sound2 = Quadrangular waves with ENVELOPE functions (NR21,22,23,24)
+* Sound3 = Wave patterns from WaveRAM (NR30,31,32,33,34)
+* Sound4 = White noise with an envelope (NR41,42,43,44)
+*
+* Each sound channel has 2 modes, namely ON and OFF... whoa
+*
+* These tend to be the two most important equations in
+* converting between Hertz and GB frequency registers:
+* (Sounds will have a 2.4% higher frequency on Super GB.)
+* gb = 2048 - (131072 / Hz)
+* Hz = 131072 / (2048 - gb)
+*
+* Changes:
+*
+* 10/2/2002 AK - Preliminary sound code.
+* 13/2/2002 AK - Added a hack for mode 4, other fixes.
+* 23/2/2002 AK - Use lookup tables, added sweep to mode 1. Re-wrote the square
+* wave generation.
+* 13/3/2002 AK - Added mode 3, better lookup tables, other adjustments.
+* 15/3/2002 AK - Mode 4 can now change frequencies.
+* 31/3/2002 AK - Accidently forgot to handle counter/consecutive for mode 1.
+* 3/4/2002 AK - Mode 1 sweep can still occur if shift is 0. Don't let frequency
+* go past the maximum allowed value. Fixed Mode 3 length table.
+* Slight adjustment to Mode 4's period table generation.
+* 5/4/2002 AK - Mode 4 is done correctly, using a polynomial counter instead
+* of being a total hack.
+* 6/4/2002 AK - Slight tweak to mode 3's frequency calculation.
+* 13/4/2002 AK - Reset envelope value when sound is initialized.
+* 21/4/2002 AK - Backed out the mode 3 frequency calculation change.
+* Merged init functions into gameboy_sound_w().
+* 14/5/2002 AK - Removed magic numbers in the fixed point math.
+* 12/6/2002 AK - Merged SOUNDx structs into one SOUND struct.
+* 26/10/2002 AK - Finally fixed channel 3!
+*
+***************************************************************************************/
+
+#include "mamedef.h"
+#include <stdlib.h>	// for rand
+#include <string.h>	// for memset
+//#include "emu.h"
+#include "gb.h"
+//#include "streams.h"
+
+
+/***************************************************************************
+ CONSTANTS
+***************************************************************************/
+
+#define NR10 0x00
+#define NR11 0x01
+#define NR12 0x02
+#define NR13 0x03
+#define NR14 0x04
+#define NR21 0x06
+#define NR22 0x07
+#define NR23 0x08
+#define NR24 0x09
+#define NR30 0x0A
+#define NR31 0x0B
+#define NR32 0x0C
+#define NR33 0x0D
+#define NR34 0x0E
+#define NR41 0x10
+#define NR42 0x11
+#define NR43 0x12
+#define NR44 0x13
+#define NR50 0x14
+#define NR51 0x15
+#define NR52 0x16
+#define AUD3W0 0x20
+#define AUD3W1 0x21
+#define AUD3W2 0x22
+#define AUD3W3 0x23
+#define AUD3W4 0x24
+#define AUD3W5 0x25
+#define AUD3W6 0x26
+#define AUD3W7 0x27
+#define AUD3W8 0x28
+#define AUD3W9 0x29
+#define AUD3WA 0x2A
+#define AUD3WB 0x2B
+#define AUD3WC 0x2C
+#define AUD3WD 0x2D
+#define AUD3WE 0x2E
+#define AUD3WF 0x2F
+
+#define LEFT 1
+#define RIGHT 2
+#define MAX_FREQUENCIES 2048
+#define FIXED_POINT 16
+
+/* Represents wave duties of 12.5%, 25%, 50% and 75% */
+static const float wave_duty_table4 = { 8.0f, 4.0f, 2.0f, 1.33333f };
+
+
+/***************************************************************************
+ TYPE DEFINITIONS
+***************************************************************************/
+
+struct SOUND
+{
+	/* Common */
+	UINT8 on;
+	UINT8 channel;
+	INT32 length;
+	INT32 pos;
+	//UINT32 pos;
+	UINT32 period;
+	INT32 count;
+	INT8 mode;
+	/* Mode 1, 2, 3 */
+	INT8 duty;
+	/* Mode 1, 2, 4 */
+	INT32 env_value;
+	INT8 env_direction;
+	INT32 env_length;
+	INT32 env_count;
+	INT8 signal;
+	/* Mode 1 */
+	UINT32 frequency;
+	INT32 swp_shift;
+	INT32 swp_direction;
+	INT32 swp_time;
+	INT32 swp_count;
+	/* Mode 3 */
+	INT8 level;
+	UINT8 offset;
+	UINT32 dutycount;
+	/* Mode 4 */
+	INT32 ply_step;
+	INT16 ply_value;
+	UINT8 Muted;
+};
+
+struct SOUNDC
+{
+	UINT8 on;
+	UINT8 vol_left;
+	UINT8 vol_right;
+	UINT8 mode1_left;
+	UINT8 mode1_right;
+	UINT8 mode2_left;
+	UINT8 mode2_right;
+	UINT8 mode3_left;
+	UINT8 mode3_right;
+	UINT8 mode4_left;
+	UINT8 mode4_right;
+};
+
+
+typedef struct _gb_sound_t gb_sound_t;
+struct _gb_sound_t
+{
+	//sound_stream *channel;
+	//int rate;
+	UINT32 rate;	// fixes bad calculations of length_mode3_table
+
+	INT32 env_length_table8;
+	INT32 swp_time_table8;
+	UINT32 period_tableMAX_FREQUENCIES;
+	UINT32 period_mode3_tableMAX_FREQUENCIES;
+	UINT32 period_mode4_table816;
+	UINT32 length_table64;
+	UINT32 length_mode3_table256;
+
+	struct SOUND snd_1;
+	struct SOUND snd_2;
+	struct SOUND snd_3;
+	struct SOUND snd_4;
+	struct SOUNDC snd_control;
+
+	UINT8 snd_regs0x30;
+
+	UINT8 LoudWaveChn;
+	UINT8 LowNoiseChn;
+	UINT8 AccuracyHack;
+};
+
+
+
+
+/***************************************************************************
+ INLINE FUNCTIONS
+***************************************************************************/
+
+/*INLINE gb_sound_t *get_token(running_device *device)
+{
+	assert(device != NULL);
+	assert(device->type() == GAMEBOY);
+	return (gb_sound_t *) downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+/***************************************************************************
+ PROTOTYPES
+***************************************************************************/
+
+//static STREAM_UPDATE( gameboy_update );
+
+
+/***************************************************************************
+ IMPLEMENTATION
+***************************************************************************/
+
+//READ8_DEVICE_HANDLER( gb_wave_r )
+UINT8 gb_wave_r(void *_info, offs_t offset)
+{
+	//gb_sound_t *gb = get_token(device);
+	gb_sound_t *gb = (gb_sound_t *)_info;
+
+	/* TODO: properly emulate scrambling of wave ram area when playback is active */
+	return ( gb->snd_regs AUD3W0 + offset | gb->snd_3.on );
+}
+
+//WRITE8_DEVICE_HANDLER( gb_wave_w )
+void gb_wave_w(void *_info, offs_t offset, UINT8 data)
+{
+	//gb_sound_t *gb = get_token(device);
+	gb_sound_t *gb = (gb_sound_t *)_info;
+
+	gb->snd_regs AUD3W0 + offset = data;
+}
+
+//READ8_DEVICE_HANDLER( gb_sound_r )
+UINT8 gb_sound_r(void *_info, offs_t offset)
+{
+	//gb_sound_t *gb = get_token(device);
+	gb_sound_t *gb = (gb_sound_t *)_info;
+
+	switch( offset ) {
+	case 0x05:
+	case 0x0F:
+		return 0xFF;
+	case NR52:
+		return 0x70 | gb->snd_regsoffset;
+	default:
+		return gb->snd_regsoffset;
+	}
+}
+
+//static void gb_sound_w_internal(running_device *device, int offset, UINT8 data )
+static void gb_sound_w_internal(gb_sound_t *gb, int offset, UINT8 data )
+{
+	//gb_sound_t *gb = get_token(device);
+
+	/* Store the value */
+	gb->snd_regsoffset = data;
+
+	switch( offset )
+	{
+	/*MODE 1 */
+	case NR10: /* Sweep (R/W) */
+		gb->snd_1.swp_shift = data & 0x7;
+		gb->snd_1.swp_direction = (data & 0x8) >> 3;
+		gb->snd_1.swp_direction |= gb->snd_1.swp_direction - 1;
+		gb->snd_1.swp_time = gb->swp_time_table (data & 0x70) >> 4 ;
+		break;
+	case NR11: /* Sound length/Wave pattern duty (R/W) */
+		gb->snd_1.duty = (data & 0xC0) >> 6;
+		gb->snd_1.length = gb->length_tabledata & 0x3F;
+		break;
+	case NR12: /* Envelope (R/W) */
+		gb->snd_1.env_value = data >> 4;
+		gb->snd_1.env_direction = (data & 0x8) >> 3;
+		gb->snd_1.env_direction |= gb->snd_1.env_direction - 1;
+		gb->snd_1.env_length = gb->env_length_tabledata & 0x7;
+		break;
+	case NR13: /* Frequency lo (R/W) */
+		gb->snd_1.frequency = ((gb->snd_regsNR14&0x7)<<8) | gb->snd_regsNR13;
+		gb->snd_1.period = gb->period_tablegb->snd_1.frequency;
+		break;
+	case NR14: /* Frequency hi / Initialize (R/W) */
+		gb->snd_1.mode = (data & 0x40) >> 6;
+		gb->snd_1.frequency = ((gb->snd_regsNR14&0x7)<<8) | gb->snd_regsNR13;
+		gb->snd_1.period = gb->period_tablegb->snd_1.frequency;
+		if( data & 0x80 )
+		{
+			if( !gb->snd_1.on )
+				gb->snd_1.pos = 0;
+			gb->snd_1.on = 1;
+			gb->snd_1.count = 0;
+			gb->snd_1.env_value = gb->snd_regsNR12 >> 4;
+			gb->snd_1.env_count = 0;
+			gb->snd_1.swp_count = 0;
+			gb->snd_1.signal = 0x1;
+			gb->snd_regsNR52 |= 0x1;
+		}
+		break;
+
+	/*MODE 2 */
+	case NR21: /* Sound length/Wave pattern duty (R/W) */
+		gb->snd_2.duty = (data & 0xC0) >> 6;
+		gb->snd_2.length = gb->length_tabledata & 0x3F;
+		break;
+	case NR22: /* Envelope (R/W) */
+//		gb->snd_2.env_value = data >> 4;
+//		gb->snd_2.env_direction = (data & 0x8 ) >> 3;
+		// Thanks to Delek for the fix
+		gb->snd_2.env_direction = (data & 0x8) >> 3;
+		if (gb->snd_2.env_direction)
+		{
+			gb->snd_2.env_value ++;
+			if (gb->snd_2.env_value > 0x0F)
+				gb->snd_2.env_value = 0;
+		}
+		else
+		{
+			gb->snd_2.env_value = data >> 4;
+		}
+		gb->snd_2.env_direction |= gb->snd_2.env_direction - 1;
+		gb->snd_2.env_length = gb->env_length_tabledata & 0x7;
+		break;
+	case NR23: /* Frequency lo (R/W) */
+		gb->snd_2.period = gb->period_table((gb->snd_regsNR24&0x7)<<8) | gb->snd_regsNR23;
+		break;
+	case NR24: /* Frequency hi / Initialize (R/W) */
+		gb->snd_2.mode = (data & 0x40) >> 6;
+		gb->snd_2.period = gb->period_table((gb->snd_regsNR24&0x7)<<8) | gb->snd_regsNR23;
+		if( data & 0x80 )
+		{
+			if( !gb->snd_2.on )
+				gb->snd_2.pos = 0;
+			gb->snd_2.on = 1;
+			gb->snd_2.count = 0;
+			gb->snd_2.env_value = gb->snd_regsNR22 >> 4;
+			gb->snd_2.env_count = 0;
+			gb->snd_2.signal = 0x1;
+			gb->snd_regsNR52 |= 0x2;
+		}
+		break;
+
+	/*MODE 3 */
+	case NR30: /* Sound On/Off (R/W) */
+		gb->snd_3.on = (data & 0x80) >> 7;
+		break;
+	case NR31: /* Sound Length (R/W) */
+		gb->snd_3.length = gb->length_mode3_tabledata;
+		break;
+	case NR32: /* Select Output Level */
+		gb->snd_3.level = (data & 0x60) >> 5;
+		break;
+	case NR33: /* Frequency lo (W) */
+		gb->snd_3.period = gb->period_mode3_table((gb->snd_regsNR34&0x7)<<8) + gb->snd_regsNR33;
+		break;
+	case NR34: /* Frequency hi / Initialize (W) */
+		gb->snd_3.mode = (data & 0x40) >> 6;
+		gb->snd_3.period = gb->period_mode3_table((gb->snd_regsNR34&0x7)<<8) + gb->snd_regsNR33;
+		if( data & 0x80 )
+		{
+			if( !gb->snd_3.on )
+			{
+				gb->snd_3.pos = 0;
+				gb->snd_3.offset = 0;
+				gb->snd_3.duty = 0;
+			}
+			gb->snd_3.on = 1;
+			gb->snd_3.count = 0;
+			gb->snd_3.duty = 1;
+			gb->snd_3.dutycount = 0;
+			gb->snd_regsNR52 |= 0x4;
+		}
+		break;
+
+	/*MODE 4 */
+	case NR41: /* Sound Length (R/W) */
+		gb->snd_4.length = gb->length_tabledata & 0x3F;
+		break;
+	case NR42: /* Envelope (R/W) */
+		gb->snd_4.env_value = data >> 4;
+		gb->snd_4.env_direction = (data & 0x8 ) >> 3;
+		gb->snd_4.env_direction |= gb->snd_4.env_direction - 1;
+		gb->snd_4.env_length = gb->env_length_tabledata & 0x7;
+		break;
+	case NR43: /* Polynomial Counter/Frequency */
+		gb->snd_4.period = gb->period_mode4_tabledata & 0x7(data & 0xF0) >> 4;
+		gb->snd_4.ply_step = (data & 0x8) >> 3;
+		break;
+	case NR44: /* Counter/Consecutive / Initialize (R/W) */
+		gb->snd_4.mode = (data & 0x40) >> 6;
+		if( data & 0x80 )
+		{
+			if( !gb->snd_4.on )
+				gb->snd_4.pos = 0;
+			gb->snd_4.on = 1;
+			gb->snd_4.count = 0;
+			gb->snd_4.env_value = gb->snd_regsNR42 >> 4;
+			gb->snd_4.env_count = 0;
+			//gb->snd_4.signal = mame_rand(device->machine);
+			gb->snd_4.signal = rand() & 0xFF;
+			gb->snd_4.ply_value = 0x7fff;
+			gb->snd_regsNR52 |= 0x8;
+		}
+		break;
+
+	/* CONTROL */
+	case NR50: /* Channel Control / On/Off / Volume (R/W) */
+		gb->snd_control.vol_left = data & 0x7;
+		gb->snd_control.vol_right = (data & 0x70) >> 4;
+		break;
+	case NR51: /* Selection of Sound Output Terminal */
+		gb->snd_control.mode1_right = data & 0x1;
+		gb->snd_control.mode1_left = (data & 0x10) >> 4;
+		gb->snd_control.mode2_right = (data & 0x2) >> 1;
+		gb->snd_control.mode2_left = (data & 0x20) >> 5;
+		gb->snd_control.mode3_right = (data & 0x4) >> 2;
+		gb->snd_control.mode3_left = (data & 0x40) >> 6;
+		gb->snd_control.mode4_right = (data & 0x8) >> 3;
+		gb->snd_control.mode4_left = (data & 0x80) >> 7;
+		break;
+	case NR52: /* Sound On/Off (R/W) */
+		/* Only bit 7 is writable, writing to bits 0-3 does NOT enable or
+ disable sound. They are read-only */
+		gb->snd_control.on = (data & 0x80) >> 7;
+		if( !gb->snd_control.on )
+		{
+			gb_sound_w_internal( gb, NR10, 0x80 );
+			gb_sound_w_internal( gb, NR11, 0x3F );
+			gb_sound_w_internal( gb, NR12, 0x00 );
+			gb_sound_w_internal( gb, NR13, 0xFE );
+			gb_sound_w_internal( gb, NR14, 0xBF );
+// gb_sound_w_internal( gb, NR20, 0xFF );
+			gb_sound_w_internal( gb, NR21, 0x3F );
+			gb_sound_w_internal( gb, NR22, 0x00 );
+			gb_sound_w_internal( gb, NR23, 0xFF );
+			gb_sound_w_internal( gb, NR24, 0xBF );
+			gb_sound_w_internal( gb, NR30, 0x7F );
+			gb_sound_w_internal( gb, NR31, 0xFF );
+			gb_sound_w_internal( gb, NR32, 0x9F );
+			gb_sound_w_internal( gb, NR33, 0xFF );
+			gb_sound_w_internal( gb, NR34, 0xBF );
+// gb_sound_w_internal( gb, NR40, 0xFF );
+			gb_sound_w_internal( gb, NR41, 0xFF );
+			gb_sound_w_internal( gb, NR42, 0x00 );
+			gb_sound_w_internal( gb, NR43, 0x00 );
+			gb_sound_w_internal( gb, NR44, 0xBF );
+			gb_sound_w_internal( gb, NR50, 0x00 );
+			gb_sound_w_internal( gb, NR51, 0x00 );
+			gb->snd_1.on = 0;
+			gb->snd_2.on = 0;
+			gb->snd_3.on = 0;
+			gb->snd_4.on = 0;
+			gb->snd_regsoffset = 0;
+		}
+		break;
+	}
+}
+
+//WRITE8_DEVICE_HANDLER( gb_sound_w )
+void gb_sound_w(void *_info, offs_t offset, UINT8 data)
+{
+	//gb_sound_t *gb = get_token(device);
+	gb_sound_t *gb = (gb_sound_t *)_info;
+
+	/* change in registers so update first */
+	//stream_update(gb->channel);
+
+	if (offset < AUD3W0)
+	{
+		/* Only register NR52 is accessible if the sound controller is disabled */
+		if( !gb->snd_control.on && offset != NR52 )
+		{
+			return;
+		}
+
+		gb_sound_w_internal( gb, offset, data );
+	}
+	else if (offset <= AUD3WF)
+	{
+		gb->snd_regsoffset = data;
+	}
+}
+
+
+
+//static STREAM_UPDATE( gameboy_update )
+void gameboy_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	//gb_sound_t *gb = get_token(device);
+	gb_sound_t *gb = (gb_sound_t *)_info;
+	stream_sample_t *outl = outputs0;
+	stream_sample_t *outr = outputs1;
+	stream_sample_t sample, left, right, mode4_mask;
+
+	while( samples-- > 0 )
+	{
+		left = right = 0;
+
+		/* Mode 1 - Wave with Envelope and Sweep */
+		if( gb->snd_1.on && ! gb->snd_1.Muted )
+		{
+			sample = gb->snd_1.signal * gb->snd_1.env_value;
+			if (! gb->AccuracyHack)
+			{
+				gb->snd_1.pos++;
+				if( gb->snd_1.pos == (UINT32)(gb->snd_1.period / wave_duty_tablegb->snd_1.duty) >> FIXED_POINT)
+				{
+					gb->snd_1.signal = -gb->snd_1.signal;
+				}
+				else if( gb->snd_1.pos > (gb->snd_1.period >> FIXED_POINT) )
+				{
+					gb->snd_1.pos = 0;
+					gb->snd_1.signal = -gb->snd_1.signal;
+				}
+			}
+			else
+			{
+				// accuracy hack - makes high frequencies sound better
+				gb->snd_1.pos += 1 << FIXED_POINT;
+				if( (gb->snd_1.pos >> FIXED_POINT) == (UINT32)(gb->snd_1.period / wave_duty_tablegb->snd_1.duty) >> FIXED_POINT)
+				{
+					gb->snd_1.signal = -gb->snd_1.signal;
+				}
+				else if( gb->snd_1.pos >= gb->snd_1.period )
+				{
+					gb->snd_1.pos -= gb->snd_1.period;
+					gb->snd_1.signal = -gb->snd_1.signal;
+				}
+			}
+
+			if( gb->snd_1.length && gb->snd_1.mode )
+			{
+				gb->snd_1.count++;
+				if( gb->snd_1.count >= gb->snd_1.length )
+				{
+					gb->snd_1.on = 0;
+					gb->snd_regsNR52 &= 0xFE;
+				}
+			}
+
+			if( gb->snd_1.env_length )
+			{
+				gb->snd_1.env_count++;
+				if( gb->snd_1.env_count >= gb->snd_1.env_length )
+				{
+					gb->snd_1.env_count = 0;
+					gb->snd_1.env_value += gb->snd_1.env_direction;
+					if( gb->snd_1.env_value < 0 )
+						gb->snd_1.env_value = 0;
+					if( gb->snd_1.env_value > 15 )
+						gb->snd_1.env_value = 15;
+				}
+			}
+
+			if( gb->snd_1.swp_time )
+			{
+				gb->snd_1.swp_count++;
+				if( gb->snd_1.swp_count >= gb->snd_1.swp_time )
+				{
+					gb->snd_1.swp_count = 0;
+					if( gb->snd_1.swp_direction > 0 )
+					{
+						gb->snd_1.frequency -= gb->snd_1.frequency / (1 << gb->snd_1.swp_shift );
+						if( gb->snd_1.frequency <= 0 )
+						{
+							gb->snd_1.on = 0;
+							gb->snd_regsNR52 &= 0xFE;
+						}
+					}
+					else
+					{
+						gb->snd_1.frequency += gb->snd_1.frequency / (1 << gb->snd_1.swp_shift );
+						if( gb->snd_1.frequency >= MAX_FREQUENCIES )
+						{
+							gb->snd_1.frequency = MAX_FREQUENCIES - 1;
+						}
+					}
+
+					gb->snd_1.period = gb->period_tablegb->snd_1.frequency;
+				}
+			}
+
+			if( gb->snd_control.mode1_left )
+				left += sample;
+			if( gb->snd_control.mode1_right )
+				right += sample;
+		}
+
+		/* Mode 2 - Wave with Envelope */
+		if( gb->snd_2.on && ! gb->snd_2.Muted )
+		{
+			sample = gb->snd_2.signal * gb->snd_2.env_value;
+			if (! gb->AccuracyHack)
+			{
+				gb->snd_2.pos++;
+				if( gb->snd_2.pos == (UINT32)(gb->snd_2.period / wave_duty_tablegb->snd_2.duty) >> FIXED_POINT)
+				{
+					gb->snd_2.signal = -gb->snd_2.signal;
+				}
+				else if( gb->snd_2.pos > (gb->snd_2.period >> FIXED_POINT) )
+				{
+					gb->snd_2.pos = 0;
+					gb->snd_2.signal = -gb->snd_2.signal;
+				}
+			}
+			else
+			{
+				gb->snd_2.pos += 1 << FIXED_POINT;
+				if( (gb->snd_2.pos >> FIXED_POINT) == (UINT32)(gb->snd_2.period / wave_duty_tablegb->snd_2.duty) >> FIXED_POINT)
+				{
+					gb->snd_2.signal = -gb->snd_2.signal;
+				}
+				else if( gb->snd_2.pos >= gb->snd_2.period )
+				{
+					gb->snd_2.pos -= gb->snd_2.period;
+					gb->snd_2.signal = -gb->snd_2.signal;
+				}
+			}
+
+			if( gb->snd_2.length && gb->snd_2.mode )
+			{
+				gb->snd_2.count++;
+				if( gb->snd_2.count >= gb->snd_2.length )
+				{
+					gb->snd_2.on = 0;
+					gb->snd_regsNR52 &= 0xFD;
+				}
+			}
+
+			if( gb->snd_2.env_length )
+			{
+				gb->snd_2.env_count++;
+				if( gb->snd_2.env_count >= gb->snd_2.env_length )
+				{
+					gb->snd_2.env_count = 0;
+					gb->snd_2.env_value += gb->snd_2.env_direction;
+					if( gb->snd_2.env_value < 0 )
+						gb->snd_2.env_value = 0;
+					if( gb->snd_2.env_value > 15 )
+						gb->snd_2.env_value = 15;
+				}
+			}
+
+			if( gb->snd_control.mode2_left )
+				left += sample;
+			if( gb->snd_control.mode2_right )
+				right += sample;
+		}
+
+		/* Mode 3 - Wave patterns from WaveRAM */
+		if( gb->snd_3.on && ! gb->snd_3.Muted )
+		{
+			/* NOTE: This is extremely close, but not quite right.
+ The problem is for GB frequencies above 2000 the frequency gets
+ clipped. This is caused because gb->snd_3.pos is never 0 at the test.*/
+			sample = gb->snd_regsAUD3W0 + (gb->snd_3.offset/2);
+			if( !(gb->snd_3.offset % 2) )
+			{
+				sample >>= 4;
+			}
+			sample = (sample & 0xF) - 8;
+			if (gb->LoudWaveChn)
+				sample <<= 1;
+
+			if( gb->snd_3.level )
+				sample >>= (gb->snd_3.level - 1);
+			else
+				sample = 0;
+
+			if (! gb->AccuracyHack)
+			{
+				gb->snd_3.pos++;
+				if( gb->snd_3.pos >= ((UINT32)(((gb->snd_3.period ) >> 21)) + gb->snd_3.duty) )
+				{
+					gb->snd_3.pos = 0;
+					if( gb->snd_3.dutycount == ((UINT32)(((gb->snd_3.period ) >> FIXED_POINT)) % 32) )
+					{
+						gb->snd_3.duty--;
+					}
+					gb->snd_3.dutycount++;
+					gb->snd_3.offset++;
+					if( gb->snd_3.offset > 31 )
+					{
+						gb->snd_3.offset = 0;
+						gb->snd_3.duty = 1;
+						gb->snd_3.dutycount = 0;
+					}
+				}
+			}
+			else
+			{
+				gb->snd_3.pos += 1 << 21;
+				if( gb->snd_3.pos >= (UINT32)gb->snd_3.period)
+				{
+					gb->snd_3.pos -= (UINT32)gb->snd_3.period;
+					gb->snd_3.dutycount++;
+					gb->snd_3.offset++;
+					if( gb->snd_3.offset > 31 )
+					{
+						gb->snd_3.offset = 0;
+						gb->snd_3.dutycount = 0;
+					}
+				}
+			}
+
+			if( gb->snd_3.length && gb->snd_3.mode )
+			{
+				gb->snd_3.count++;
+				if( gb->snd_3.count >= gb->snd_3.length )
+				{
+					gb->snd_3.on = 0;
+					gb->snd_regsNR52 &= 0xFB;
+				}
+			}
+
+			if( gb->snd_control.mode3_left )
+				left += sample;
+			if( gb->snd_control.mode3_right )
+				right += sample;
+		}
+
+		/* Mode 4 - Noise with Envelope */
+		if( gb->snd_4.on && ! gb->snd_4.Muted )
+		{
+			/* Similar problem to Mode 3, we seem to miss some notes */
+			sample = gb->snd_4.signal & gb->snd_4.env_value;
+			sample -= gb->snd_4.env_value / 2;	// make Bipolar
+			if (! gb->LowNoiseChn)
+				sample <<= 1;	// that's more like VisualBoy Advance (and sounds better)
+			gb->snd_4.pos++;
+			if( gb->snd_4.pos == (gb->snd_4.period >> (FIXED_POINT + 1)) )
+			{
+				/* Using a Polynomial Counter (aka Linear Feedback Shift Register)
+ Mode 4 has a 7 bit and 15 bit counter so we need to shift the
+ bits around accordingly */
+				mode4_mask = (((gb->snd_4.ply_value & 0x2) >> 1) ^ (gb->snd_4.ply_value & 0x1)) << (gb->snd_4.ply_step ? 6 : 14);
+				gb->snd_4.ply_value >>= 1;
+				gb->snd_4.ply_value |= mode4_mask;
+				gb->snd_4.ply_value &= (gb->snd_4.ply_step ? 0x7f : 0x7fff);
+				gb->snd_4.signal = (INT8)gb->snd_4.ply_value;
+			}
+			else if( gb->snd_4.pos > (gb->snd_4.period >> FIXED_POINT) )
+			{
+				gb->snd_4.pos = 0;
+				mode4_mask = (((gb->snd_4.ply_value & 0x2) >> 1) ^ (gb->snd_4.ply_value & 0x1)) << (gb->snd_4.ply_step ? 6 : 14);
+				gb->snd_4.ply_value >>= 1;
+				gb->snd_4.ply_value |= mode4_mask;
+				gb->snd_4.ply_value &= (gb->snd_4.ply_step ? 0x7f : 0x7fff);
+				gb->snd_4.signal = (INT8)gb->snd_4.ply_value;
+			}
+
+			if( gb->snd_4.length && gb->snd_4.mode )
+			{
+				gb->snd_4.count++;
+				if( gb->snd_4.count >= gb->snd_4.length )
+				{
+					gb->snd_4.on = 0;
+					gb->snd_regsNR52 &= 0xF7;
+				}
+			}
+
+			if( gb->snd_4.env_length )
+			{
+				gb->snd_4.env_count++;
+				if( gb->snd_4.env_count >= gb->snd_4.env_length )
+				{
+					gb->snd_4.env_count = 0;
+					gb->snd_4.env_value += gb->snd_4.env_direction;
+					if( gb->snd_4.env_value < 0 )
+						gb->snd_4.env_value = 0;
+					if( gb->snd_4.env_value > 15 )
+						gb->snd_4.env_value = 15;
+				}
+			}
+
+			if( gb->snd_control.mode4_left )
+				left += sample;
+			if( gb->snd_control.mode4_right )
+				right += sample;
+		}
+
+		/* Adjust for master volume */
+		left *= gb->snd_control.vol_left;
+		right *= gb->snd_control.vol_right;
+
+		/* pump up the volume */
+		left <<= 6;
+		right <<= 6;
+
+		/* Update the buffers */
+		*(outl++) = left;
+		*(outr++) = right;
+	}
+
+	gb->snd_regsNR52 = (gb->snd_regsNR52&0xf0) | gb->snd_1.on | (gb->snd_2.on << 1) | (gb->snd_3.on << 2) | (gb->snd_4.on << 3);
+}
+
+
+//static DEVICE_START( gameboy_sound )
+int device_start_gameboy_sound(void **_info, int clock, int Flags, int SampleRate)
+{
+	//gb_sound_t *gb = get_token(device);
+	gb_sound_t *gb;
+	int I, J;
+
+	gb = (gb_sound_t *) calloc(1, sizeof(gb_sound_t));
+	*_info = (void *) gb;
+
+	gb->LoudWaveChn = (Flags & 0x01) >> 0;
+	gb->LowNoiseChn = (Flags & 0x02) >> 1;
+	gb->AccuracyHack = ! ((Flags & 0x04) >> 2);
+	
+	memset(&gb->snd_1, 0, sizeof(gb->snd_1));
+	memset(&gb->snd_2, 0, sizeof(gb->snd_2));
+	memset(&gb->snd_3, 0, sizeof(gb->snd_3));
+	memset(&gb->snd_4, 0, sizeof(gb->snd_4));
+
+	//gb->channel = stream_create(device, 0, 2, device->machine->sample_rate, 0, gameboy_update);
+	//gb->rate = device->machine->sample_rate;
+	gb->rate = SampleRate;
+
+	/* Calculate the envelope and sweep tables */
+	for( I = 0; I < 8; I++ )
+	{
+		gb->env_length_tableI = (I * ((1 << FIXED_POINT) / 64) * gb->rate) >> FIXED_POINT;
+		gb->swp_time_tableI = (((I << FIXED_POINT) / 128) * gb->rate) >> (FIXED_POINT - 1);
+	}
+
+	/* Calculate the period tables */
+	for( I = 0; I < MAX_FREQUENCIES; I++ )
+	{
+		gb->period_tableI = ((1 << FIXED_POINT) / (131072 / (2048 - I))) * gb->rate;
+		gb->period_mode3_tableI = ((1 << FIXED_POINT) / (65536 / (2048 - I))) * gb->rate;
+	}
+	/* Calculate the period table for mode 4 */
+	for( I = 0; I < 8; I++ )
+	{
+		for( J = 0; J < 16; J++ )
+		{
+			/* I is the dividing ratio of frequencies
+ J is the shift clock frequency */
+			gb->period_mode4_tableIJ = ((1 << FIXED_POINT) / (524288 / ((I == 0)?0.5:I) / (1 << (J + 1)))) * gb->rate;
+		}
+	}
+
+	/* Calculate the length table */
+	for( I = 0; I < 64; I++ )
+	{
+		gb->length_tableI = ((64 - I) * ((1 << FIXED_POINT)/256) * gb->rate) >> FIXED_POINT;
+	}
+	/* Calculate the length table for mode 3 */
+	for( I = 0; I < 256; I++ )
+	{
+		gb->length_mode3_tableI = ((256 - I) * ((1 << FIXED_POINT)/256) * gb->rate) >> FIXED_POINT;
+	}
+	
+	gb->snd_1.Muted = 0x00;
+	gb->snd_2.Muted = 0x00;
+	gb->snd_3.Muted = 0x00;
+	gb->snd_4.Muted = 0x00;
+
+	return gb->rate;
+}
+
+void device_stop_gameboy_sound(void *_info)
+{
+	free(_info);
+	return;
+}
+
+void device_reset_gameboy_sound(void *_info)
+{
+	gb_sound_t *gb = (gb_sound_t *)_info;
+
+	// moved there from device_start
+	gb_sound_w_internal( gb, NR52, 0x00 );
+	gb->snd_regsAUD3W0 = 0xac;
+	gb->snd_regsAUD3W1 = 0xdd;
+	gb->snd_regsAUD3W2 = 0xda;
+	gb->snd_regsAUD3W3 = 0x48;
+	gb->snd_regsAUD3W4 = 0x36;
+	gb->snd_regsAUD3W5 = 0x02;
+	gb->snd_regsAUD3W6 = 0xcf;
+	gb->snd_regsAUD3W7 = 0x16;
+	gb->snd_regsAUD3W8 = 0x2c;
+	gb->snd_regsAUD3W9 = 0x04;
+	gb->snd_regsAUD3WA = 0xe5;
+	gb->snd_regsAUD3WB = 0x2c;
+	gb->snd_regsAUD3WC = 0xac;
+	gb->snd_regsAUD3WD = 0xdd;
+	gb->snd_regsAUD3WE = 0xda;
+	gb->snd_regsAUD3WF = 0x48;
+
+	return;
+}
+
+void gameboy_sound_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	gb_sound_t *gb = (gb_sound_t *)_info;
+	
+	gb->snd_1.Muted = (MuteMask >> 0) & 0x01;
+	gb->snd_2.Muted = (MuteMask >> 1) & 0x01;
+	gb->snd_3.Muted = (MuteMask >> 2) & 0x01;
+	gb->snd_4.Muted = (MuteMask >> 3) & 0x01;
+	
+	return;
+}
+
+
+/*DEVICE_GET_INFO( gameboy_sound )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(gb_sound_t);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME(gameboy_sound);	break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "LR35902");				break;
+		case DEVINFO_STR_SOURCE_FILE:					strcpy(info->s, __FILE__);						break;
+	}
+}*/
+
+//DEFINE_LEGACY_SOUND_DEVICE(GAMEBOY, gameboy_sound);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/gb.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.c Added

@@ -0,0 +1,369 @@
+/*********************************************************
+
+Irem GA20 PCM Sound Chip
+
+It's not currently known whether this chip is stereo.
+
+
+Revisions:
+
+04-15-2002 Acho A. Tang
+- rewrote channel mixing
+- added prelimenary volume and sample rate emulation
+
+05-30-2002 Acho A. Tang
+- applied hyperbolic gain control to volume and used
+ a musical-note style progression in sample rate
+ calculation(still very inaccurate)
+
+02-18-2004 R. Belmont
+- sample rate calculation reverse-engineered.
+ Thanks to Fujix, Yasuhiro Ogawa, the Guru, and Tormod
+ for real PCB samples that made this possible.
+
+02-03-2007 R. Belmont
+- Cleaned up faux x86 assembly.
+
+*********************************************************/
+
+//#include "emu.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h>	// for NULL
+#include "mamedef.h"
+#include "iremga20.h"
+
+#define MAX_VOL 256
+
+struct IremGA20_channel_def
+{
+	UINT32 rate;
+	//UINT32 size;
+	UINT32 start;
+	UINT32 pos;
+	UINT32 frac;
+	UINT32 end;
+	UINT32 volume;
+	UINT32 pan;
+	//UINT32 effect;
+	UINT8 play;
+	UINT8 Muted;
+};
+
+typedef struct _ga20_state ga20_state;
+struct _ga20_state
+{
+	UINT8 *rom;
+	UINT32 rom_size;
+	//sound_stream * stream;
+	UINT16 regs0x40;
+	struct IremGA20_channel_def channel4;
+};
+
+
+/*INLINE ga20_state *get_safe_token(device_t *device)
+{
+	assert(device != NULL);
+	assert(device->type() == IREMGA20);
+	return (ga20_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+//static STREAM_UPDATE( IremGA20_update )
+void IremGA20_update(void *param, stream_sample_t **outputs, int samples)
+{
+	ga20_state *chip = (ga20_state *)param;
+	UINT32 rate4, pos4, frac4, end4, vol4, play4;
+	UINT8 *pSamples;
+	stream_sample_t *outL, *outR;
+	int i, sampleout;
+
+	/* precache some values */
+	for (i=0; i < 4; i++)
+	{
+		ratei = chip->channeli.rate;
+		posi = chip->channeli.pos;
+		fraci = chip->channeli.frac;
+		endi = chip->channeli.end - 0x20;
+		voli = chip->channeli.volume;
+		playi = (! chip->channeli.Muted) ? chip->channeli.play : 0;
+	}
+
+	i = samples;
+	pSamples = chip->rom;
+	outL = outputs0;
+	outR = outputs1;
+
+	for (i = 0; i < samples; i++)
+	{
+		sampleout = 0;
+
+		// update the 4 channels inline
+		if (play0)
+		{
+			sampleout += (pSamplespos0 - 0x80) * vol0;
+			frac0 += rate0;
+			pos0 += frac0 >> 24;
+			frac0 &= 0xffffff;
+			play0 = (pos0 < end0);
+		}
+		if (play1)
+		{
+			sampleout += (pSamplespos1 - 0x80) * vol1;
+			frac1 += rate1;
+			pos1 += frac1 >> 24;
+			frac1 &= 0xffffff;
+			play1 = (pos1 < end1);
+		}
+		if (play2)
+		{
+			sampleout += (pSamplespos2 - 0x80) * vol2;
+			frac2 += rate2;
+			pos2 += frac2 >> 24;
+			frac2 &= 0xffffff;
+			play2 = (pos2 < end2);
+		}
+		if (play3)
+		{
+			sampleout += (pSamplespos3 - 0x80) * vol3;
+			frac3 += rate3;
+			pos3 += frac3 >> 24;
+			frac3 &= 0xffffff;
+			play3 = (pos3 < end3);
+		}
+
+		sampleout >>= 2;
+		outLi = sampleout;
+		outRi = sampleout;
+	}
+
+	/* update the regs now */
+	for (i=0; i < 4; i++)
+	{
+		chip->channeli.pos = posi;
+		chip->channeli.frac = fraci;
+		if (! chip->channeli.Muted)
+			chip->channeli.play = playi;
+	}
+}
+
+//WRITE8_DEVICE_HANDLER( irem_ga20_w )
+void irem_ga20_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ga20_state *chip = get_safe_token(device);
+	ga20_state *chip = (ga20_state *)_info;
+	int channel;
+
+	//logerror("GA20: Offset %02x, data %04x\n",offset,data);
+
+	//chip->stream->update();
+
+	channel = offset >> 3;
+
+	chip->regsoffset = data;
+
+	switch (offset & 0x7)
+	{
+		case 0: /* start address low */
+			chip->channelchannel.start = ((chip->channelchannel.start)&0xff000) | (data<<4);
+			break;
+
+		case 1: /* start address high */
+			chip->channelchannel.start = ((chip->channelchannel.start)&0x00ff0) | (data<<12);
+			break;
+
+		case 2: /* end address low */
+			chip->channelchannel.end = ((chip->channelchannel.end)&0xff000) | (data<<4);
+			break;
+
+		case 3: /* end address high */
+			chip->channelchannel.end = ((chip->channelchannel.end)&0x00ff0) | (data<<12);
+			break;
+
+		case 4:
+			chip->channelchannel.rate = 0x1000000 / (256 - data);
+			break;
+
+		case 5: //AT: gain control
+			chip->channelchannel.volume = (data * MAX_VOL) / (data + 10);
+			break;
+
+		case 6: //AT: this is always written 2(enabling both channels?)
+			chip->channelchannel.play = data;
+			chip->channelchannel.pos = chip->channelchannel.start;
+			chip->channelchannel.frac = 0;
+			break;
+	}
+}
+
+//READ8_DEVICE_HANDLER( irem_ga20_r )
+UINT8 irem_ga20_r(void *_info, offs_t offset)
+{
+	//ga20_state *chip = get_safe_token(device);
+	ga20_state *chip = (ga20_state *)_info;
+	int channel;
+
+	//chip->stream->update();
+
+	channel = offset >> 3;
+
+	switch (offset & 0x7)
+	{
+		case 7:	// voice status. bit 0 is 1 if active. (routine around 0xccc in rtypeleo)
+			return chip->channelchannel.play ? 1 : 0;
+
+		default:
+#ifdef _DEBUG
+			logerror("GA20: read unk. register %d, channel %d\n", offset & 0xf, channel);
+#endif
+			break;
+	}
+
+	return 0;
+}
+
+static void iremga20_reset(ga20_state *chip)
+{
+	int i;
+
+	for( i = 0; i < 4; i++ ) {
+		chip->channeli.rate = 0;
+		//chip->channeli.size = 0;
+		chip->channeli.start = 0;
+		chip->channeli.pos = 0;
+		chip->channeli.frac = 0;
+		chip->channeli.end = 0;
+		chip->channeli.volume = 0;
+		chip->channeli.pan = 0;
+		//chip->channeli.effect = 0;
+		chip->channeli.play = 0;
+	}
+}
+
+
+//static DEVICE_RESET( iremga20 )
+void device_reset_iremga20(void *_info)
+{
+	//iremga20_reset(get_safe_token(device));
+	ga20_state *chip = (ga20_state *)_info;
+	
+	iremga20_reset(chip);
+	memset(chip->regs, 0x00, 0x40 * sizeof(UINT16));
+}
+
+//static DEVICE_START( iremga20 )
+int device_start_iremga20(void **_info, int clock)
+{
+	//ga20_state *chip = get_safe_token(device);
+	ga20_state *chip;
+	int i;
+
+	chip = (ga20_state *) calloc(1, sizeof(ga20_state));
+	*_info = (void *) chip;
+
+	/* Initialize our chip structure */
+	//chip->rom = *device->region();
+	//chip->rom_size = device->region()->bytes();
+	chip->rom = NULL;
+	chip->rom_size = 0x00;
+
+	iremga20_reset(chip);
+
+	for ( i = 0; i < 0x40; i++ )
+		chip->regsi = 0;
+
+	//chip->stream = device->machine().sound().stream_alloc( *device, 0, 2, device->clock()/4, chip, IremGA20_update );
+
+	/*device->save_item(NAME(chip->regs));
+	for (i = 0; i < 4; i++)
+	{
+		device->save_item(NAME(chip->channeli.rate), i);
+		device->save_item(NAME(chip->channeli.size), i);
+		device->save_item(NAME(chip->channeli.start), i);
+		device->save_item(NAME(chip->channeli.pos), i);
+		device->save_item(NAME(chip->channeli.end), i);
+		device->save_item(NAME(chip->channeli.volume), i);
+		device->save_item(NAME(chip->channeli.pan), i);
+		device->save_item(NAME(chip->channeli.effect), i);
+		device->save_item(NAME(chip->channeli.play), i);
+	}*/
+	for (i = 0; i < 4; i ++)
+		chip->channeli.Muted = 0x00;
+	
+	return clock / 4;
+}
+
+void device_stop_iremga20(void *_info)
+{
+	ga20_state *chip = (ga20_state *)_info;
+	
+	free(chip->rom);	chip->rom = NULL;
+
+	free(chip);
+	
+	return;
+}
+
+void iremga20_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+						const UINT8* ROMData)
+{
+	ga20_state *chip = (ga20_state *)_info;
+	
+	if (chip->rom_size != ROMSize)
+	{
+		chip->rom = (UINT8*)realloc(chip->rom, ROMSize);
+		chip->rom_size = ROMSize;
+		memset(chip->rom, 0xFF, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(chip->rom + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+
+void iremga20_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	ga20_state *chip = (ga20_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 4; CurChn ++)
+		chip->channelCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( iremga20 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ga20_state);					break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( iremga20 );	break;
+		case DEVINFO_FCT_STOP:							// nothing //									break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( iremga20 );	break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "Irem GA20");					break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Irem custom");					break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(IREMGA20, iremga20);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/iremga20.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.c Added

@@ -0,0 +1,426 @@
+/***************************************************************************
+
+ Konami 051649 - SCC1 sound as used in Haunted Castle, City Bomber
+
+ This file is pieced together by Bryan McPhail from a combination of
+ Namco Sound, Amuse by Cab, Haunted Castle schematics and whoever first
+ figured out SCC!
+
+ The 051649 is a 5 channel sound generator, each channel gets its
+ waveform from RAM (32 bytes per waveform, 8 bit signed data).
+
+ This sound chip is the same as the sound chip in some Konami
+ megaROM cartridges for the MSX. It is actually well researched
+ and documented:
+
+ http://bifi.msxnet.org/msxnet/tech/scc.html
+
+ Thanks to Sean Young (sean@mess.org) for some bugfixes.
+
+ K052539 is more or less equivalent to this chip except channel 5
+ does not share waveram with channel 4.
+
+***************************************************************************/
+
+#include "mamedef.h"
+#include <stdlib.h>
+#include <string.h>
+//#include "emu.h"
+//#include "streams.h"
+#include "k051649.h"
+
+#define FREQ_BITS	16
+#define DEF_GAIN	8
+
+/* this structure defines the parameters for a channel */
+typedef struct
+{
+	unsigned long counter;
+	int frequency;
+	int volume;
+	int key;
+	signed char waveram32;		/* 19991207.CAB */
+	UINT8 Muted;
+} k051649_sound_channel;
+
+typedef struct _k051649_state k051649_state;
+struct _k051649_state
+{
+	k051649_sound_channel channel_list5;
+
+	/* global sound parameters */
+	//sound_stream * stream;
+	int mclock,rate;
+
+	/* mixer tables and internal buffers */
+	INT16 *mixer_table;
+	INT16 *mixer_lookup;
+	short *mixer_buffer;
+
+	int cur_reg;
+	UINT8 test;
+};
+
+/*INLINE k051649_state *get_safe_token(running_device *device)
+{
+	assert(device != NULL);
+	assert(device->type() == K051649);
+	return (k051649_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+/* build a table to divide by the number of voices */
+static void make_mixer_table(/*running_machine *machine,*/ k051649_state *info, int voices)
+{
+	int count = voices * 256;
+	int i;
+
+	/* allocate memory */
+	//info->mixer_table = auto_alloc_array(machine, INT16, 512 * voices);
+	info->mixer_table = (INT16*)malloc(sizeof(INT16) * 2 * count);
+
+	/* find the middle of the table */
+	info->mixer_lookup = info->mixer_table + count;
+
+	/* fill in the table - 16 bit case */
+	for (i = 0; i < count; i++)
+	{
+		int val = i * DEF_GAIN * 16 / voices;
+		//if (val > 32767) val = 32767;
+		if (val > 32768) val = 32768;
+		info->mixer_lookup i = val;
+		info->mixer_lookup-i = -val;
+	}
+}
+
+
+/* generate sound to the mix buffer */
+//static STREAM_UPDATE( k051649_update )
+void k051649_update(void *param, stream_sample_t **outputs, int samples)
+{
+	k051649_state *info = (k051649_state *)param;
+	k051649_sound_channel *voice=info->channel_list;
+	stream_sample_t *buffer = outputs0;
+	stream_sample_t *buffer2 = outputs1;
+	short *mix;
+	int i,j;
+
+	// zap the contents of the mixer buffer
+	memset(info->mixer_buffer, 0, samples * sizeof(short));
+
+	for (j=0; j<5; j++) {
+		// channel is halted for freq < 9
+		if (voicej.frequency > 8 && ! voicej.Muted)
+		{
+			const signed char *w = voicej.waveram;			/* 19991207.CAB */
+			int v=voicej.volume * voicej.key;
+			int c=voicej.counter;
+			/* Amuse source: Cab suggests this method gives greater resolution */
+			/* Sean Young 20010417: the formula is really: f = clock/(16*(f+1))*/
+			int step = (int)(((INT64)info->mclock * (1 << FREQ_BITS)) / (float)((voicej.frequency + 1) * 16 * (info->rate / 32)) + 0.5);
+
+			mix = info->mixer_buffer;
+
+			// add our contribution
+			for (i = 0; i < samples; i++)
+			{
+				int offs;
+
+				c += step;
+				offs = (c >> FREQ_BITS) & 0x1f;
+				*mix++ += (woffs * v)>>3;
+			}
+
+			// update the counter for this voice
+			voicej.counter = c;
+		}
+	}
+
+	// mix it down
+	mix = info->mixer_buffer;
+	for (i = 0; i < samples; i++)
+		*buffer++ = *buffer2++ = info->mixer_lookup*mix++;
+}
+
+//static DEVICE_START( k051649 )
+int device_start_k051649(void **_info, int clock)
+{
+	//k051649_state *info = get_safe_token(device);
+	k051649_state *info;
+	UINT8 CurChn;
+
+	info = (k051649_state *) calloc(1, sizeof(k051649_state));
+	*_info = (void *) info;
+	
+	/* get stream channels */
+	//info->rate = device->clock()/16;
+	//info->stream = stream_create(device, 0, 1, info->rate, info, k051649_update);
+	//info->mclock = device->clock();
+	info->mclock = clock & 0x7FFFFFFF;
+	info->rate = info->mclock / 16;
+
+	/* allocate a buffer to mix into - 1 second's worth should be more than enough */
+	//info->mixer_buffer = auto_alloc_array(device->machine, short, 2 * info->rate);
+	info->mixer_buffer = (short*)malloc(sizeof(short) * info->rate);
+
+	/* build the mixer table */
+	//make_mixer_table(device->machine, info, 5);
+	make_mixer_table(info, 5);
+	
+	for (CurChn = 0; CurChn < 5; CurChn ++)
+		info->channel_listCurChn.Muted = 0x00;
+
+	return info->rate;
+}
+
+void device_stop_k051649(void *_info)
+{
+	k051649_state *info = (k051649_state *)_info;
+	
+	free(info->mixer_buffer);
+	free(info->mixer_table);
+
+	free(info);
+	
+	return;
+}
+
+//static DEVICE_RESET( k051649 )
+void device_reset_k051649(void *_info)
+{
+	//k051649_state *info = get_safe_token(device);
+	k051649_state *info = (k051649_state *)_info;
+	k051649_sound_channel *voice = info->channel_list;
+	int i;
+
+	// reset all the voices
+	for (i = 0; i < 5; i++)
+	{
+		voicei.frequency = 0;
+		voicei.volume = 0;
+		voicei.counter = 0;
+		voicei.key = 0;
+	}
+	
+	// other parameters
+	info->test = 0x00;
+	info->cur_reg = 0x00;
+	
+	return;
+}
+
+/********************************************************************************/
+
+//WRITE8_DEVICE_HANDLER( k051649_waveform_w )
+void k051649_waveform_w(void *_info, offs_t offset, UINT8 data)
+{
+	//k051649_state *info = get_safe_token(device);
+	k051649_state *info = (k051649_state *)_info;
+	
+	// waveram is read-only?
+	if (info->test & 0x40 || (info->test & 0x80 && offset >= 0x60))
+		return;
+
+	//stream_update(info->stream);
+	
+	if (offset >= 0x60)
+	{
+		// channel 5 shares waveram with channel 4
+		info->channel_list3.waveramoffset&0x1f=data;
+		info->channel_list4.waveramoffset&0x1f=data;
+	}
+	else
+		info->channel_listoffset>>5.waveramoffset&0x1f=data;
+}
+
+//READ8_DEVICE_HANDLER ( k051649_waveform_r )
+UINT8 k051649_waveform_r(void *_info, offs_t offset)
+{
+	//k051649_state *info = get_safe_token(device);
+	k051649_state *info = (k051649_state *)_info;
+	
+	// test-register bits 6/7 expose the internal counter
+	if (info->test & 0xc0)
+	{
+		//stream_update(info->stream);
+
+		if (offset >= 0x60)
+			offset += (info->channel_list3 + (info->test >> 6 & 1).counter >> FREQ_BITS);
+		else if (info->test & 0x40)
+			offset += (info->channel_listoffset>>5.counter >> FREQ_BITS);
+	}
+	return info->channel_listoffset>>5.waveramoffset&0x1f;
+}
+
+/* SY 20001114: Channel 5 doesn't share the waveform with channel 4 on this chip */
+//WRITE8_DEVICE_HANDLER( k052539_waveform_w )
+void k052539_waveform_w(void *_info, offs_t offset, UINT8 data)
+{
+	//k051649_state *info = get_safe_token(device);
+	k051649_state *info = (k051649_state *)_info;
+	
+	// waveram is read-only?
+	if (info->test & 0x40)
+		return;
+
+	//stream_update(info->stream);
+	info->channel_listoffset>>5.waveramoffset&0x1f=data;
+}
+
+//READ8_DEVICE_HANDLER ( k052539_waveform_r )
+UINT8 k052539_waveform_r(void *_info, offs_t offset)
+{
+	//k051649_state *info = get_safe_token(device);
+	k051649_state *info = (k051649_state *)_info;
+	
+	// test-register bit 6 exposes the internal counter
+	if (info->test & 0x40)
+	{
+		//stream_update(info->stream);
+		offset += (info->channel_listoffset>>5.counter >> FREQ_BITS);
+	}
+	return info->channel_listoffset>>5.waveramoffset&0x1f;
+}
+
+//WRITE8_DEVICE_HANDLER( k051649_volume_w )
+void k051649_volume_w(void *_info, offs_t offset, UINT8 data)
+{
+	//k051649_state *info = get_safe_token(device);
+	k051649_state *info = (k051649_state *)_info;
+	//stream_update(info->stream);
+	info->channel_listoffset&0x7.volume=data&0xf;
+}
+
+//WRITE8_DEVICE_HANDLER( k051649_frequency_w )
+void k051649_frequency_w(void *_info, offs_t offset, UINT8 data)
+{
+	//k051649_state *info = get_safe_token(device);
+	k051649_state *info = (k051649_state *)_info;
+	k051649_sound_channel* chn = &info->channel_listoffset >> 1;
+
+	//stream_update(info->stream);
+	
+	// test-register bit 5 resets the internal counter
+	if (info->test & 0x20)
+		chn->counter = ~0;
+	else if (chn->frequency < 9)
+		chn->counter |= ((1 << FREQ_BITS) - 1);
+
+	// update frequency
+	if (offset & 1)
+		chn->frequency = (chn->frequency & 0x0FF) | ((data << 8) & 0xF00);
+	else
+		chn->frequency = (chn->frequency & 0xF00) | (data << 0);
+	chn->counter &= 0xFFFF0000;	// Valley Bell: Behaviour according to openMSX
+}
+
+//WRITE8_DEVICE_HANDLER( k051649_keyonoff_w )
+void k051649_keyonoff_w(void *_info, offs_t offset, UINT8 data)
+{
+	//k051649_state *info = get_safe_token(device);
+	k051649_state *info = (k051649_state *)_info;
+	int i;
+	//stream_update(info->stream);
+	
+	for (i = 0; i < 5; i++)
+	{
+		info->channel_listi.key=data&1;
+		data >>= 1;
+	}
+}
+
+//WRITE8_MEMBER( k051649_device::k051649_test_w )
+void k051649_test_w(void *_info, offs_t offset, UINT8 data)
+{
+	k051649_state *info = (k051649_state *)_info;
+	info->test = data;
+}
+
+
+//READ8_MEMBER ( k051649_device::k051649_test_r )
+UINT8 k051649_test_r(void *info, offs_t offset)
+{
+	// reading the test register sets it to $ff!
+	k051649_test_w(info, offset, 0xff);
+	return 0xff;
+}
+
+
+void k051649_w(void *_info, offs_t offset, UINT8 data)
+{
+	k051649_state *info = (k051649_state *)_info;
+	
+	switch(offset & 1)
+	{
+	case 0x00:
+		info->cur_reg = data;
+		break;
+	case 0x01:
+		switch(offset >> 1)
+		{
+		case 0x00:
+			k051649_waveform_w(info, info->cur_reg, data);
+			break;
+		case 0x01:
+			k051649_frequency_w(info, info->cur_reg, data);
+			break;
+		case 0x02:
+			k051649_volume_w(info, info->cur_reg, data);
+			break;
+		case 0x03:
+			k051649_keyonoff_w(info, info->cur_reg, data);
+			break;
+		case 0x04:
+			k052539_waveform_w(info, info->cur_reg, data);
+			break;
+		case 0x05:
+			k051649_test_w(info, info->cur_reg, data);
+			break;
+		}
+		break;
+	}
+	
+	return;
+}
+
+
+void k051649_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	k051649_state *info = (k051649_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 5; CurChn ++)
+		info->channel_listCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( k051649 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(k051649_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( k051649 );		break;
+		case DEVINFO_FCT_STOP:							// nothing //									break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( k051649 );		break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "K051649");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Konami custom");				break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+
+
+//DEFINE_LEGACY_SOUND_DEVICE(K051649, k051649);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k051649.h Added

@@ -0,0 +1,39 @@
+#pragma once
+
+//#ifndef __K051649_H__
+//#define __K051649_H__
+
+//#include "devlegcy.h"
+
+/*WRITE8_DEVICE_HANDLER( k051649_waveform_w );
+READ8_DEVICE_HANDLER( k051649_waveform_r );
+WRITE8_DEVICE_HANDLER( k051649_volume_w );
+WRITE8_DEVICE_HANDLER( k051649_frequency_w );
+WRITE8_DEVICE_HANDLER( k051649_keyonoff_w );
+
+WRITE8_DEVICE_HANDLER( k052539_waveform_w );
+
+DECLARE_LEGACY_SOUND_DEVICE(K051649, k051649);*/
+
+void k051649_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_k051649(void **chip, int clock);
+void device_stop_k051649(void *chip);
+void device_reset_k051649(void *chip);
+
+void k051649_waveform_w(void *chip, offs_t offset, UINT8 data);
+UINT8 k051649_waveform_r(void *chip, offs_t offset);
+void k051649_volume_w(void *chip, offs_t offset, UINT8 data);
+void k051649_frequency_w(void *chip, offs_t offset, UINT8 data);
+void k051649_keyonoff_w(void *chip, offs_t offset, UINT8 data);
+
+void k052539_waveform_w(void *chip, offs_t offset, UINT8 data);
+UINT8 k052539_waveform_r(void *chip, offs_t offset);
+
+void k051649_test_w(void *chip, offs_t offset, UINT8 data);
+UINT8 k051649_test_r(void *chip, offs_t offset);
+
+void k051649_w(void *chip, offs_t offset, UINT8 data);
+
+void k051649_set_mute_mask(void *chip, UINT32 MuteMask);
+
+//#endif /* __K051649_H__ */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.c Added

@@ -0,0 +1,567 @@
+/*********************************************************
+
+ Konami 053260 PCM Sound Chip
+
+*********************************************************/
+
+#include "mamedef.h"
+//#include "emu.h"
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include "k053260.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+/* 2004-02-28: Fixed PPCM decoding. Games sound much better now.*/
+
+#define LOG 0
+
+#define BASE_SHIFT	16
+
+typedef struct _k053260_channel k053260_channel;
+struct _k053260_channel
+{
+	UINT32		rate;
+	UINT32		size;
+	UINT32		start;
+	UINT32		bank;
+	UINT32		volume;
+	int			play;
+	UINT32		pan;
+	UINT32		pos;
+	int			loop;
+	int			ppcm; /* packed PCM ( 4 bit signed ) */
+	int			ppcm_data;
+	UINT8		Muted;
+};
+
+typedef struct _k053260_state k053260_state;
+struct _k053260_state
+{
+	//sound_stream *				channel;
+	int							mode;
+	int							regs0x30;
+	UINT8						*rom;
+	//int							rom_size;
+	UINT32							rom_size;
+	UINT32						*delta_table;
+	k053260_channel				channels4;
+	//const k053260_interface		*intf;
+	//device_t				*device;
+};
+
+/*INLINE k053260_state *get_safe_token(device_t *device)
+{
+	assert(device != NULL);
+	assert(device->type() == K053260);
+	return (k053260_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+static void InitDeltaTable( k053260_state *ic, int rate, int clock )
+{
+	int		i;
+	double	base = ( double )rate;
+	double	max = (double)(clock); /* Hz */
+	UINT32 val;
+
+	for( i = 0; i < 0x1000; i++ ) {
+		double v = ( double )( 0x1000 - i );
+		double target = (max) / v;
+		double fixed = ( double )( 1 << BASE_SHIFT );
+
+		if ( target && base ) {
+			target = fixed / ( base / target );
+			val = ( UINT32 )target;
+			if ( val == 0 )
+				val = 1;
+		} else
+			val = 1;
+
+		ic->delta_tablei = val;
+	}
+}
+
+//static DEVICE_RESET( k053260 )
+void device_reset_k053260(void *_info)
+{
+	//k053260_state *ic = get_safe_token(device);
+	k053260_state *ic = (k053260_state *)_info;
+	int i;
+
+	for( i = 0; i < 4; i++ ) {
+		ic->channelsi.rate = 0;
+		ic->channelsi.size = 0;
+		ic->channelsi.start = 0;
+		ic->channelsi.bank = 0;
+		ic->channelsi.volume = 0;
+		ic->channelsi.play = 0;
+		ic->channelsi.pan = 0;
+		ic->channelsi.pos = 0;
+		ic->channelsi.loop = 0;
+		ic->channelsi.ppcm = 0;
+		ic->channelsi.ppcm_data = 0;
+	}
+}
+
+INLINE int limit( int val, int max, int min )
+{
+	if ( val > max )
+		val = max;
+	else if ( val < min )
+		val = min;
+
+	return val;
+}
+
+//#define MAXOUT 0x7fff
+#define MAXOUT +0x8000
+#define MINOUT -0x8000
+
+//static STREAM_UPDATE( k053260_update )
+void k053260_update(void *param, stream_sample_t **outputs, int samples)
+{
+	static const INT8 dpcmcnv = { 0,1,2,4,8,16,32,64, -128, -64, -32, -16, -8, -4, -2, -1};
+
+	int i, j, lvol4, rvol4, play4, loop4, ppcm4;
+	UINT8 *rom4;
+	UINT32 delta4, end4, pos4;
+	INT8 ppcm_data4;
+	int dataL, dataR;
+	INT8 d;
+	k053260_state *ic = (k053260_state *)param;
+
+	/* precache some values */
+	for ( i = 0; i < 4; i++ ) {
+		if (ic->channelsi.Muted)
+		{
+			playi = 0;
+			continue;
+		}
+		romi= &ic->romic->channelsi.start + ( ic->channelsi.bank << 16 );
+		deltai = ic->delta_tableic->channelsi.rate;
+		lvoli = ic->channelsi.volume * ic->channelsi.pan;
+		rvoli = ic->channelsi.volume * ( 8 - ic->channelsi.pan );
+		endi = ic->channelsi.size;
+		posi = ic->channelsi.pos;
+		playi = ic->channelsi.play;
+		loopi = ic->channelsi.loop;
+		ppcmi = ic->channelsi.ppcm;
+		ppcm_datai = ic->channelsi.ppcm_data;
+		if ( ppcmi )
+			deltai /= 2;
+	}
+
+		for ( j = 0; j < samples; j++ ) {
+
+			dataL = dataR = 0;
+
+			for ( i = 0; i < 4; i++ ) {
+				/* see if the voice is on */
+				if ( playi ) {
+					/* see if we're done */
+					if ( ( posi >> BASE_SHIFT ) >= endi ) {
+
+						ppcm_datai = 0;
+						if ( loopi )
+							posi = 0;
+						else {
+							playi = 0;
+							continue;
+						}
+					}
+
+					if ( ppcmi ) { /* Packed PCM */
+						/* we only update the signal if we're starting or a real sound sample has gone by */
+						/* this is all due to the dynamic sample rate convertion */
+						if ( posi == 0 || ( ( posi ^ ( posi - deltai ) ) & 0x8000 ) == 0x8000 )
+
+						{
+							int newdata;
+							if ( posi & 0x8000 ){
+
+								newdata = ((romiposi >> BASE_SHIFT) >> 4) & 0x0f; /*high nybble*/
+							}
+							else{
+								newdata = ( ( romiposi >> BASE_SHIFT ) ) & 0x0f; /*low nybble*/
+							}
+
+							/*ppcm_datai = (( ( ppcm_datai * 62 ) >> 6 ) + dpcmcnvnewdata);
+
+							if ( ppcm_datai > 127 )
+								ppcm_datai = 127;
+							else
+								if ( ppcm_datai < -128 )
+									ppcm_datai = -128;*/
+							ppcm_datai += dpcmcnvnewdata;
+						}
+
+
+
+						d = ppcm_datai;
+
+						posi += deltai;
+					} else { /* PCM */
+						d = romiposi >> BASE_SHIFT;
+
+						posi += deltai;
+					}
+
+					if ( ic->mode & 2 ) {
+						dataL += ( d * lvoli ) >> 2;
+						dataR += ( d * rvoli ) >> 2;
+					}
+				}
+			}
+
+			outputs1j = limit( dataL, MAXOUT, MINOUT );
+			outputs0j = limit( dataR, MAXOUT, MINOUT );
+		}
+
+	/* update the regs now */
+	for ( i = 0; i < 4; i++ ) {
+		if (ic->channelsi.Muted)
+			continue;
+		ic->channelsi.pos = posi;
+		ic->channelsi.play = playi;
+		ic->channelsi.ppcm_data = ppcm_datai;
+	}
+}
+
+//static DEVICE_START( k053260 )
+int device_start_k053260(void **_info, int clock)
+{
+	//static const k053260_interface defintrf = { 0 };
+	//k053260_state *ic = get_safe_token(device);
+	k053260_state *ic;
+	//int rate = device->clock() / 32;
+	int rate = clock / 32;
+	int i;
+
+	ic = (k053260_state *) calloc(1, sizeof(k053260_state));
+	*_info = (void *) ic;	
+	
+	/* Initialize our chip structure */
+	//ic->device = device;
+	//ic->intf = (device->static_config() != NULL) ? (const k053260_interface *)device->static_config() : &defintrf;
+
+	ic->mode = 0;
+
+	//const memory_region *region = (ic->intf->rgnoverride != NULL) ? device->machine().region(ic->intf->rgnoverride) : device->region();
+
+	//ic->rom = *region;
+	//ic->rom_size = region->bytes();
+	ic->rom = NULL;
+	ic->rom_size = 0x00;
+
+	// has to be done by the player after calling device_start
+	//DEVICE_RESET_CALL(k053260);
+
+	for ( i = 0; i < 0x30; i++ )
+		ic->regsi = 0;
+
+	//ic->delta_table = auto_alloc_array( device->machine(), UINT32, 0x1000 );
+	ic->delta_table = (UINT32*)malloc(0x1000 * sizeof(UINT32));
+
+	//ic->channel = device->machine().sound().stream_alloc( *device, 0, 2, rate, ic, k053260_update );
+
+	//InitDeltaTable( ic, rate, device->clock() );
+	InitDeltaTable( ic, rate, clock );
+
+	/* register with the save state system */
+	/*device->save_item(NAME(ic->mode));
+	device->save_item(NAME(ic->regs));
+
+	for ( i = 0; i < 4; i++ )
+	{
+		device->save_item(NAME(ic->channelsi.rate), i);
+		device->save_item(NAME(ic->channelsi.size), i);
+		device->save_item(NAME(ic->channelsi.start), i);
+		device->save_item(NAME(ic->channelsi.bank), i);
+		device->save_item(NAME(ic->channelsi.volume), i);
+		device->save_item(NAME(ic->channelsi.play), i);
+		device->save_item(NAME(ic->channelsi.pan), i);
+		device->save_item(NAME(ic->channelsi.pos), i);
+		device->save_item(NAME(ic->channelsi.loop), i);
+		device->save_item(NAME(ic->channelsi.ppcm), i);
+		device->save_item(NAME(ic->channelsi.ppcm_data), i);
+	}*/
+
+	/* setup SH1 timer if necessary */
+	//if ( ic->intf->irq )
+	//	device->machine().scheduler().timer_pulse( attotime::from_hz(device->clock()) * 32, ic->intf->irq, "ic->intf->irq" );
+	
+	for (i = 0; i < 4; i ++)
+		ic->channelsi.Muted = 0x00;
+
+	return rate;
+}
+
+void device_stop_k053260(void *_info)
+{
+	k053260_state *ic = (k053260_state *)_info;
+	
+	free(ic->delta_table);
+	free(ic->rom);	ic->rom = NULL;
+
+	free(ic);	
+
+	return;
+}
+
+INLINE void check_bounds( k053260_state *ic, int channel )
+{
+
+	int channel_start = ( ic->channelschannel.bank << 16 ) + ic->channelschannel.start;
+	int channel_end = channel_start + ic->channelschannel.size - 1;
+
+	if ( channel_start > ic->rom_size ) {
+#ifdef _DEBUG
+		logerror("K53260: Attempting to start playing past the end of the ROM ( start = %06x, end = %06x ).\n", channel_start, channel_end );
+#endif
+
+		ic->channelschannel.play = 0;
+
+		return;
+	}
+
+	if ( channel_end > ic->rom_size ) {
+#ifdef _DEBUG
+		logerror("K53260: Attempting to play past the end of the ROM ( start = %06x, end = %06x ).\n", channel_start, channel_end );
+#endif
+
+		ic->channelschannel.size = ic->rom_size - channel_start;
+	}
+#ifdef _DEBUG
+	if (LOG) logerror("K053260: Sample Start = %06x, Sample End = %06x, Sample rate = %04x, PPCM = %s\n", channel_start, channel_end, ic->channelschannel.rate, ic->channelschannel.ppcm ? "yes" : "no" );
+#endif
+}
+
+//WRITE8_DEVICE_HANDLER( k053260_w )
+void k053260_w(void *_info, offs_t offset, UINT8 data)
+{
+	int i, t;
+	int r = offset;
+	int v = data;
+
+	//k053260_state *ic = get_safe_token(device);
+	k053260_state *ic = (k053260_state *)_info;
+
+	if ( r > 0x2f ) {
+#ifdef _DEBUG
+		logerror("K053260: Writing past registers\n" );
+#endif
+		return;
+	}
+
+	 //ic->channel->update();
+
+	/* before we update the regs, we need to check for a latched reg */
+	if ( r == 0x28 ) {
+		t = ic->regsr ^ v;
+
+		for ( i = 0; i < 4; i++ ) {
+			if ( t & ( 1 <channelsi.play = 1;
+					ic->channelsi.pos = 0;
+					ic->channelsi.ppcm_data = 0;
+					check_bounds( ic, i );
+				} else
+					ic->channelsi.play = 0;
+			}
+		}
+
+		ic->regsr = v;
+		return;
+	}
+
+	/* update regs */
+	ic->regsr = v;
+
+	/* communication registers */
+	if ( r < 8 )
+		return;
+
+	/* channel setup */
+	if ( r < 0x28 ) {
+		int channel = ( r - 8 ) / 8;
+
+		switch ( ( r - 8 ) & 0x07 ) {
+			case 0: /* sample rate low */
+				ic->channelschannel.rate &= 0x0f00;
+				ic->channelschannel.rate |= v;
+			break;
+
+			case 1: /* sample rate high */
+				ic->channelschannel.rate &= 0x00ff;
+				ic->channelschannel.rate |= ( v & 0x0f ) << 8;
+			break;
+
+			case 2: /* size low */
+				ic->channelschannel.size &= 0xff00;
+				ic->channelschannel.size |= v;
+			break;
+
+			case 3: /* size high */
+				ic->channelschannel.size &= 0x00ff;
+				ic->channelschannel.size |= v << 8;
+			break;
+
+			case 4: /* start low */
+				ic->channelschannel.start &= 0xff00;
+				ic->channelschannel.start |= v;
+			break;
+
+			case 5: /* start high */
+				ic->channelschannel.start &= 0x00ff;
+				ic->channelschannel.start |= v << 8;
+			break;
+
+			case 6: /* bank */
+				ic->channelschannel.bank = v & 0xff;
+			break;
+
+			case 7: /* volume is 7 bits. Convert to 8 bits now. */
+				ic->channelschannel.volume = ( ( v & 0x7f ) << 1 ) | ( v & 1 );
+			break;
+		}
+
+		return;
+	}
+
+	switch( r ) {
+		case 0x2a: /* loop, ppcm */
+			for ( i = 0; i < 4; i++ )
+				ic->channelsi.loop = ( v & ( 1 <channelsi-4.ppcm = ( v & ( 1 <channels0.pan = v & 7;
+			ic->channels1.pan = ( v >> 3 ) & 7;
+		break;
+
+		case 0x2d: /* more pan */
+			ic->channels2.pan = v & 7;
+			ic->channels3.pan = ( v >> 3 ) & 7;
+		break;
+
+		case 0x2f: /* control */
+			ic->mode = v & 7;
+			/* bit 0 = read ROM */
+			/* bit 1 = enable sound output */
+			/* bit 2 = unknown */
+		break;
+	}
+}
+
+//READ8_DEVICE_HANDLER( k053260_r )
+UINT8 k053260_r(void *_info, offs_t offset)
+{
+	//k053260_state *ic = get_safe_token(device);
+	k053260_state *ic = (k053260_state *)_info;
+
+	switch ( offset ) {
+		case 0x29: /* channel status */
+			{
+				int i, status = 0;
+
+				for ( i = 0; i < 4; i++ )
+					status |= ic->channelsi.play << i;
+
+				return status;
+			}
+		break;
+
+		case 0x2e: /* read ROM */
+			if ( ic->mode & 1 )
+			{
+				UINT32 offs = ic->channels0.start + ( ic->channels0.pos >> BASE_SHIFT ) + ( ic->channels0.bank << 16 );
+
+				ic->channels0.pos += ( 1 << 16 );
+
+				if ( offs > ic->rom_size ) {
+					//logerror("%s: K53260: Attempting to read past ROM size in ROM Read Mode (offs = %06x, size = %06x).\n", device->machine().describe_context(),offs,ic->rom_size );
+#ifdef _DEBUG
+					logerror("K53260: Attempting to read past ROM size in ROM Read Mode (offs = %06x, size = %06x).\n", offs,ic->rom_size );
+#endif
+
+					return 0;
+				}
+
+				return ic->romoffs;
+			}
+		break;
+	}
+
+	return ic->regsoffset;
+}
+
+void k053260_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					 const UINT8* ROMData)
+{
+	k053260_state *info = (k053260_state *)_info;
+	
+	if (info->rom_size != ROMSize)
+	{
+		info->rom = (UINT8*)realloc(info->rom, ROMSize);
+		info->rom_size = ROMSize;
+		memset(info->rom, 0xFF, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(info->rom + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+
+void k053260_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	k053260_state *info = (k053260_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 4; CurChn ++)
+		info->channelsCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( k053260 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers --- //
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(k053260_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions --- //
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( k053260 );		break;
+		case DEVINFO_FCT_STOP:							// nothing //									break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( k053260 );		break;
+
+		// --- the following bits of info are returned as NULL-terminated strings --- //
+		case DEVINFO_STR_NAME:							strcpy(info->s, "K053260");						break;
+		case DEVINFO_STR_FAMILY:						strcpy(info->s, "Konami custom");				break;
+		case DEVINFO_STR_VERSION:						strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:					strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:						strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(K053260, k053260);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k053260.h Added

@@ -0,0 +1,32 @@
+/*********************************************************
+
+    Konami 053260 PCM/ADPCM Sound Chip
+
+*********************************************************/
+
+#pragma once
+
+//#include "devlegcy.h"
+
+/*typedef struct _k053260_interface k053260_interface;
+struct _k053260_interface {
+	const char *rgnoverride;
+	timer_expired_func irq;			// called on SH1 complete cycle ( clock / 32 ) //
+};*/
+
+
+void k053260_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_k053260(void **chip, int clock);
+void device_stop_k053260(void *chip);
+void device_reset_k053260(void *chip);
+
+//WRITE8_DEVICE_HANDLER( k053260_w );
+//READ8_DEVICE_HANDLER( k053260_r );
+void k053260_w(void *chip, offs_t offset, UINT8 data);
+UINT8 k053260_r(void *chip, offs_t offset);
+
+void k053260_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					   const UINT8* ROMData);
+void k053260_set_mute_mask(void *chip, UINT32 MuteMask);
+
+//DECLARE_LEGACY_SOUND_DEVICE(K053260, k053260);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.c Added

@@ -0,0 +1,744 @@
+/*********************************************************
+
+ Konami 054539 (TOP) PCM Sound Chip
+
+ A lot of information comes from Amuse.
+ Big thanks to them.
+
+*********************************************************/
+
+//#include "emu.h"
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "mamedef.h"
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+#include "k054539.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+#define VERBOSE 0
+#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+
+/* Registers:
+ 00..ff: 20 bytes/channel, 8 channels
+ 00..02: pitch (lsb, mid, msb)
+ 03: volume (0=max, 0x40=-36dB)
+ 04: reverb volume (idem)
+ 05: pan (1-f right, 10 middle, 11-1f left)
+ 06..07: reverb delay (0=max, current computation non-trusted)
+ 08..0a: loop (lsb, mid, msb)
+ 0c..0e: start (lsb, mid, msb) (and current position ?)
+
+ 100.1ff: effects?
+ 13f: pan of the analog input (1-1f)
+
+ 200..20f: 2 bytes/channel, 8 channels
+ 00: type (b2-3), reverse (b5)
+ 01: loop (b0)
+
+ 214: Key on (b0-7 = channel 0-7)
+ 215: Key off ""
+ 225: ?
+ 227: Timer frequency
+ 228: ?
+ 229: ?
+ 22a: ?
+ 22b: ?
+ 22c: Channel active? (b0-7 = channel 0-7)
+ 22d: Data read/write port
+ 22e: ROM/RAM select (00..7f == ROM banks, 80 = Reverb RAM)
+ 22f: Global control:
+		.......x - Enable PCM
+		......x. - Timer related?
+		...x.... - Enable ROM/RAM readback from 0x22d
+		..x..... - Timer output enable?
+		x....... - Disable register RAM updates
+
+	The chip has an optional 0x8000 byte reverb buffer.
+	The reverb delay is actually an offset in this buffer.
+*/
+
+typedef struct _k054539_channel k054539_channel;
+struct _k054539_channel {
+	UINT32 pos;
+	UINT32 pfrac;
+	INT32 val;
+	INT32 pval;
+};
+
+typedef struct _k054539_state k054539_state;
+struct _k054539_state {
+	//const k054539_interface *intf;
+	//device_t *device;
+	double voltab256;
+	double pantab0xf;
+
+	double k054539_gain8;
+	UINT8 k054539_posreg_latch83;
+	int k054539_flags;
+
+	unsigned char regs0x230;
+	unsigned char *ram;
+	int reverb_pos;
+
+	INT32 cur_ptr;
+	int cur_limit;
+	unsigned char *cur_zone;
+	unsigned char *rom;
+	UINT32 rom_size;
+	UINT32 rom_mask;
+	//sound_stream * stream;
+
+	k054539_channel channels8;
+	UINT8 Muted8;
+	
+	int clock;
+};
+
+/*INLINE k054539_state *get_safe_token(device_t *device)
+{
+	assert(device != NULL);
+	assert(device->type() == K054539);
+	return (k054539_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+//*
+
+//void k054539_init_flags(device_t *device, int flags)
+void k054539_init_flags(void *_info, int flags)
+{
+	//k054539_state *info = get_safe_token(device);
+	k054539_state *info = (k054539_state *)_info;
+	info->k054539_flags = flags;
+}
+
+//void k054539_set_gain(device_t *device, int channel, double gain)
+void k054539_set_gain(void *_info, int channel, double gain)
+{
+	//k054539_state *info = get_safe_token(device);
+	k054539_state *info = (k054539_state *)_info;
+	if (gain >= 0) info->k054539_gainchannel = gain;
+}
+//*
+
+static int k054539_regupdate(k054539_state *info)
+{
+	return !(info->regs0x22f & 0x80);
+}
+
+static void k054539_keyon(k054539_state *info, int channel)
+{
+	if(k054539_regupdate(info))
+		info->regs0x22c |= 1 << channel;
+}
+
+static void k054539_keyoff(k054539_state *info, int channel)
+{
+	if(k054539_regupdate(info))
+		info->regs0x22c &= ~(1 << channel);
+}
+
+//static STREAM_UPDATE( k054539_update )
+void k054539_update(void *param, stream_sample_t **outputs, int samples)
+{
+	k054539_state *info = (k054539_state *)param;
+#define VOL_CAP 1.80
+
+	static const INT16 dpcm16 = {
+		0<<8, 1<<8, 4<<8, 9<<8, 16<<8, 25<<8, 36<<8, 49<<8,
+		-64*(1<<8), -49*(1<<8), -36*(1<<8), -25*(1<<8), -16*(1<<8), -9*(1<<8), -4*(1<<8), -1*(1<<8)
+	};
+
+	INT16 *rbase = (INT16 *)info->ram;
+	unsigned char *rom;
+	UINT32 rom_mask;
+	int i, ch;
+	double lval, rval;
+	unsigned char *base1, *base2;
+	k054539_channel *chan;
+	int delta, vol, bval, pan;
+	double cur_gain, lvol, rvol, rbvol;
+	int rdelta;
+	UINT32 cur_pos;
+	int fdelta, pdelta;
+	int cur_pfrac, cur_val, cur_pval;
+
+	memset(outputs0, 0, samples*sizeof(*outputs0));
+	memset(outputs1, 0, samples*sizeof(*outputs1));
+
+	if(!(info->regs0x22f & 1))
+		return;
+
+	rom = info->rom;
+	rom_mask = info->rom_mask;
+
+	for(i = 0; i != samples; i++) {
+		if(!(info->k054539_flags & K054539_DISABLE_REVERB))
+			lval = rval = rbaseinfo->reverb_pos;
+		else
+			lval = rval = 0;
+		rbaseinfo->reverb_pos = 0;
+
+		for(ch=0; ch<8; ch++)
+			if(info->regs0x22c & (1<<ch) && ! info->Mutedch) {
+				base1 = info->regs + 0x20*ch;
+				base2 = info->regs + 0x200 + 0x2*ch;
+				chan = info->channels + ch;
+
+				delta = base10x00 | (base10x01 << 8) | (base10x02 << 16);
+
+				vol = base10x03;
+
+				bval = vol + base10x04;
+				if (bval > 255)
+					bval = 255;
+
+				pan = base10x05;
+				// DJ Main: 81-87 right, 88 middle, 89-8f left
+				if (pan >= 0x81 && pan <= 0x8f)
+					pan -= 0x81;
+				else if (pan >= 0x11 && pan <= 0x1f)
+					pan -= 0x11;
+				else
+					pan = 0x18 - 0x11;
+
+				cur_gain = info->k054539_gainch;
+
+				lvol = info->voltabvol * info->pantabpan * cur_gain;
+				if (lvol > VOL_CAP)
+					lvol = VOL_CAP;
+
+				rvol = info->voltabvol * info->pantab0xe - pan * cur_gain;
+				if (rvol > VOL_CAP)
+					rvol = VOL_CAP;
+
+				rbvol= info->voltabbval * cur_gain / 2;
+				if (rbvol > VOL_CAP)
+					rbvol = VOL_CAP;
+
+				rdelta = (base16 | (base17 << 8)) >> 3;
+				rdelta = (rdelta + info->reverb_pos) & 0x3fff;
+
+				cur_pos = (base10x0c | (base10x0d << 8) | (base10x0e << 16)) & rom_mask;
+
+				if(base20 & 0x20) {
+					delta = -delta;
+					fdelta = +0x10000;
+					pdelta = -1;
+				} else {
+					fdelta = -0x10000;
+					pdelta = +1;
+				}
+
+				if(cur_pos != chan->pos) {
+					chan->pos = cur_pos;
+					cur_pfrac = 0;
+					cur_val = 0;
+					cur_pval = 0;
+				} else {
+					cur_pfrac = chan->pfrac;
+					cur_val = chan->val;
+					cur_pval = chan->pval;
+				}
+
+				switch(base20 & 0xc) {
+				case 0x0: { // 8bit pcm
+					cur_pfrac += delta;
+					while(cur_pfrac & ~0xffff) {
+						cur_pfrac += fdelta;
+						cur_pos += pdelta;
+
+						cur_pval = cur_val;
+						cur_val = (INT16)(romcur_pos << 8);
+						if(cur_val == (INT16)0x8000 && (base21 & 1)) {
+							cur_pos = (base10x08 | (base10x09 << 8) | (base10x0a << 16)) & rom_mask;
+							cur_val = (INT16)(romcur_pos << 8);
+						}
+						if(cur_val == (INT16)0x8000) {
+							k054539_keyoff(info, ch);
+							cur_val = 0;
+							break;
+						}
+					}
+					break;
+				}
+
+				case 0x4: { // 16bit pcm lsb first
+					pdelta <<= 1;
+
+					cur_pfrac += delta;
+					while(cur_pfrac & ~0xffff) {
+						cur_pfrac += fdelta;
+						cur_pos += pdelta;
+
+						cur_pval = cur_val;
+						cur_val = (INT16)(romcur_pos | romcur_pos+1<<8);
+						if(cur_val == (INT16)0x8000 && (base21 & 1)) {
+							cur_pos = (base10x08 | (base10x09 << 8) | (base10x0a << 16)) & rom_mask;
+							cur_val = (INT16)(romcur_pos | romcur_pos+1<<8);
+						}
+						if(cur_val == (INT16)0x8000) {
+							k054539_keyoff(info, ch);
+							cur_val = 0;
+							break;
+						}
+					}
+					break;
+				}
+
+				case 0x8: { // 4bit dpcm
+					cur_pos <<= 1;
+					cur_pfrac <<= 1;
+					if(cur_pfrac & 0x10000) {
+						cur_pfrac &= 0xffff;
+						cur_pos |= 1;
+					}
+
+					cur_pfrac += delta;
+					while(cur_pfrac & ~0xffff) {
+						cur_pfrac += fdelta;
+						cur_pos += pdelta;
+
+						cur_pval = cur_val;
+						cur_val = romcur_pos>>1;
+						if(cur_val == 0x88 && (base21 & 1)) {
+							cur_pos = ((base10x08 | (base10x09 << 8) | (base10x0a << 16)) & rom_mask) << 1;
+							cur_val = romcur_pos>>1;
+						}
+						if(cur_val == 0x88) {
+							k054539_keyoff(info, ch);
+							cur_val = 0;
+							break;
+						}
+						if(cur_pos & 1)
+							cur_val >>= 4;
+						else
+							cur_val &= 15;
+						cur_val = cur_pval + dpcmcur_val;
+						if(cur_val < -32768)
+							cur_val = -32768;
+						else if(cur_val > 32767)
+							cur_val = 32767;
+					}
+
+					cur_pfrac >>= 1;
+					if(cur_pos & 1)
+						cur_pfrac |= 0x8000;
+					cur_pos >>= 1;
+					break;
+				}
+				default:
+#ifdef _DEBUG
+					LOG(("Unknown sample type %x for channel %d\n", base20 & 0xc, ch));
+#endif
+					break;
+				}
+				lval += cur_val * lvol;
+				rval += cur_val * rvol;
+				rbase(rdelta + info->reverb_pos) & 0x1fff += (INT16)(cur_val*rbvol);
+
+				chan->pos = cur_pos;
+				chan->pfrac = cur_pfrac;
+				chan->pval = cur_pval;
+				chan->val = cur_val;
+
+				if(k054539_regupdate(info)) {
+					base10x0c = cur_pos & 0xff;
+					base10x0d = cur_pos>> 8 & 0xff;
+					base10x0e = cur_pos>>16 & 0xff;
+				}
+			}
+		info->reverb_pos = (info->reverb_pos + 1) & 0x1fff;
+		outputs0i = (INT32)lval;
+		outputs1i = (INT32)rval;
+	}
+}
+
+
+/*static TIMER_CALLBACK( k054539_irq )
+{
+	k054539_state *info = (k054539_state *)ptr;
+	if(info->regs0x22f & 0x20)
+		info->intf->irq(info->device);
+}*/
+
+//static void k054539_init_chip(device_t *device, k054539_state *info)
+static int k054539_init_chip(k054539_state *info, int clock)
+{
+	//int i;
+
+	if (clock < 1000000)	// if < 1 MHz, then it's the sample rate, not the clock
+		clock *= 384;	// (for backwards compatibility with old VGM logs)
+	info->clock = clock;
+	// most of these are done in device_reset
+//	memset(info->regs, 0, sizeof(info->regs));
+//	memset(info->k054539_posreg_latch, 0, sizeof(info->k054539_posreg_latch)); //*
+	info->k054539_flags |= K054539_UPDATE_AT_KEYON; //* make it default until proven otherwise
+
+	info->ram = (unsigned char*)malloc(0x4000);
+//	info->reverb_pos = 0;
+//	info->cur_ptr = 0;
+//	memset(info->ram, 0, 0x4000);
+
+	/*const memory_region *region = (info->intf->rgnoverride != NULL) ? device->machine().region(info->intf->rgnoverride) : device->region();
+	info->rom = *region;
+	info->rom_size = region->bytes();
+	info->rom_mask = 0xffffffffU;
+	for(i=0; i<32; i++)
+		if((1U<<i) >= info->rom_size) {
+			info->rom_mask = (1U<<i) - 1;
+			break;
+		}*/
+	info->rom = NULL;
+	info->rom_size = 0;
+	info->rom_mask = 0x00;
+
+	//if(info->intf->irq)
+		// One or more of the registers must be the timer period
+		// And anyway, this particular frequency is probably wrong
+		// 480 hz is TRUSTED by gokuparo disco stage - the looping sample doesn't line up otherwise
+	//	device->machine().scheduler().timer_pulse(attotime::from_hz(480), FUNC(k054539_irq), 0, info);
+
+	//info->stream = device->machine().sound().stream_alloc(*device, 0, 2, device->clock() / 384, info, k054539_update);
+
+	//device->save_item(NAME(info->regs));
+	//device->save_pointer(NAME(info->ram), 0x4000);
+	//device->save_item(NAME(info->cur_ptr));
+	
+	return info->clock / 384;
+}
+
+//WRITE8_DEVICE_HANDLER( k054539_w )
+void k054539_w(void *_info, offs_t offset, UINT8 data)
+{
+	//k054539_state *info = get_safe_token(device);
+	k054539_state *info = (k054539_state *)_info;
+
+#if 0
+	int voice, reg;
+
+	/* The K054539 has behavior like many other wavetable chips including
+ the Ensoniq 550x and Gravis GF-1: if a voice is active, writing
+ to it's current position is silently ignored.
+
+ Dadandaan depends on this or the vocals go wrong.
+ */
+	if (offset < 8*0x20)
+	{
+		voice = offset / 0x20;
+		reg = offset & ~0x20;
+
+		if(info->regs0x22c & (1<<voice))
+		{
+			if (reg >= 0xc && reg <= 0xe)
+				return;
+		}
+	}
+#endif
+
+	int latch, offs, ch, pan;
+	UINT8 *regbase, *regptr, *posptr;
+
+	regbase = info->regs;
+	latch = (info->k054539_flags & K054539_UPDATE_AT_KEYON) && (regbase0x22f & 1);
+
+	if (latch && offset < 0x100)
+	{
+		offs = (offset & 0x1f) - 0xc;
+		ch = offset >> 5;
+
+		if (offs >= 0 && offs <= 2)
+		{
+			// latch writes to the position index registers
+			info->k054539_posreg_latchchoffs = data;
+			return;
+		}
+	}
+
+	else switch(offset)
+	{
+		case 0x13f:
+			pan = data >= 0x11 && data <= 0x1f ? data - 0x11 : 0x18 - 0x11;
+			//if(info->intf->apan)
+			//	info->intf->apan(info->device, info->pantabpan, info->pantab0xe - pan);
+		break;
+
+		case 0x214:
+			if (latch)
+			{
+				for(ch=0; ch<8; ch++)
+				{
+					if(data & (1<<ch))
+					{
+						posptr = &info->k054539_posreg_latchch0;
+						regptr = regbase + (ch<<5) + 0xc;
+
+						// update the chip at key-on
+						regptr0 = posptr0;
+						regptr1 = posptr1;
+						regptr2 = posptr2;
+
+						k054539_keyon(info, ch);
+					}
+				}
+			}
+			else
+			{
+				for(ch=0; ch<8; ch++)
+					if(data & (1<<ch))
+						k054539_keyon(info, ch);
+			}
+		break;
+
+		case 0x215:
+			for(ch=0; ch<8; ch++)
+				if(data & (1<<ch))
+					k054539_keyoff(info, ch);
+		break;
+
+		/*case 0x227:
+		{
+			attotime period = attotime::from_hz((float)(38 + data) * (clock()/384.0f/14400.0f)) / 2.0f;
+
+			m_timer->adjust(period, 0, period);
+
+			m_timer_state = 0;
+			m_timer_handler(m_timer_state);
+		}*/
+		break;
+
+		case 0x22d:
+			if(regbase0x22e == 0x80)
+				info->cur_zoneinfo->cur_ptr = data;
+			info->cur_ptr++;
+			if(info->cur_ptr == info->cur_limit)
+				info->cur_ptr = 0;
+		break;
+
+		case 0x22e:
+			info->cur_zone =
+				data == 0x80 ? info->ram :
+				info->rom + 0x20000*data;
+			info->cur_limit = data == 0x80 ? 0x4000 : 0x20000;
+			info->cur_ptr = 0;
+		break;
+		
+		/*case 0x22f:
+			if (!(data & 0x20)) // Disable timer output?
+			{
+				m_timer_state = 0;
+				m_timer_handler(m_timer_state);
+			}
+		break;*/
+
+		default:
+#if 0
+			if(regbaseoffset != data) {
+				if((offset & 0xff00) == 0) {
+					chanoff = offset & 0x1f;
+					if(chanoff < 4 || chanoff == 5 ||
+					 (chanoff >=8 && chanoff <= 0xa) ||
+					 (chanoff >= 0xc && chanoff <= 0xe))
+						break;
+				}
+				if(1 || ((offset >= 0x200) && (offset <= 0x210)))
+					break;
+				logerror("K054539 %03x = %02x\n", offset, data);
+			}
+#endif
+		break;
+	}
+
+	regbaseoffset = data;
+}
+
+/*static void reset_zones(k054539_state *info)
+{
+	int data = info->regs0x22e;
+	info->cur_zone = data == 0x80 ? info->ram : info->rom + 0x20000*data;
+	info->cur_limit = data == 0x80 ? 0x4000 : 0x20000;
+}*/
+
+//READ8_DEVICE_HANDLER( k054539_r )
+UINT8 k054539_r(void *_info, offs_t offset)
+{
+	//k054539_state *info = get_safe_token(device);
+	k054539_state *info = (k054539_state *)_info;
+	switch(offset) {
+	case 0x22d:
+		if(info->regs0x22f & 0x10) {
+			UINT8 res = info->cur_zoneinfo->cur_ptr;
+			info->cur_ptr++;
+			if(info->cur_ptr == info->cur_limit)
+				info->cur_ptr = 0;
+			return res;
+		} else
+			return 0;
+	case 0x22c:
+		break;
+	default:
+#ifdef _DEBUG
+		LOG(("K054539 read %03x\n", offset));
+#endif
+		break;
+	}
+	return info->regsoffset;
+}
+
+//static DEVICE_START( k054539 )
+int device_start_k054539(void **_info, int clock)
+{
+	//static const k054539_interface defintrf = { 0 };
+	int i;
+	//k054539_state *info = get_safe_token(device);
+	k054539_state *info;
+
+	info = (k054539_state *) calloc(1, sizeof(k054539_state));
+	*_info = (void *) info;
+	//info->device = device;
+
+	for (i = 0; i < 8; i++)
+		info->k054539_gaini = 1.0;
+	info->k054539_flags = K054539_RESET_FLAGS;
+
+	//info->intf = (device->static_config() != NULL) ? (const k054539_interface *)device->static_config() : &defintrf;
+
+	/*
+ I've tried various equations on volume control but none worked consistently.
+ The upper four channels in most MW/GX games simply need a significant boost
+ to sound right. For example, the bass and smash sound volumes in Violent Storm
+ have roughly the same values and the voices in Tokimeki Puzzledama are given
+ values smaller than those of the hihats. Needless to say the two K054539 chips
+ in Mystic Warriors are completely out of balance. Rather than forcing a
+ "one size fits all" function to the voltab the current invert exponential
+ appraoch seems most appropriate.
+ */
+	// Factor the 1/4 for the number of channels in the volume (1/8 is too harsh, 1/2 gives clipping)
+	// vol=0 -> no attenuation, vol=0x40 -> -36dB
+	for(i=0; i<256; i++)
+		info->voltabi = pow(10.0, (-36.0 * (double)i / (double)0x40) / 20.0) / 4.0;
+
+	// Pan table for the left channel
+	// Right channel is identical with inverted index
+	// Formula is such that pani**2+pan0xe-i**2 = 1 (constant output power)
+	// and pan0xe = 1 (full panning)
+	for(i=0; i<0xf; i++)
+		info->pantabi = sqrt((double)i) / sqrt((double)0xe);
+
+	//k054539_init_chip(device, info);
+
+	//device->machine().save().register_postload(save_prepost_delegate(FUNC(reset_zones), info));
+	
+	for (i = 0; i < 8; i ++)
+		info->Mutedi = 0x00;
+
+	return k054539_init_chip(info, clock);
+}
+
+void device_stop_k054539(void *_info)
+{
+	k054539_state *info = (k054539_state *)_info;
+	
+	free(info->rom);	info->rom = NULL;
+	free(info->ram);	info->ram = NULL;
+
+	free(info);
+	
+	return;
+}
+
+void device_reset_k054539(void *_info)
+{
+	k054539_state *info = (k054539_state *)_info;
+	
+	memset(info->regs, 0, sizeof(info->regs));
+	memset(info->k054539_posreg_latch, 0, sizeof(info->k054539_posreg_latch));
+	//info->k054539_flags |= K054539_UPDATE_AT_KEYON;
+	
+	info->reverb_pos = 0;
+	info->cur_ptr = 0;
+	memset(info->ram, 0, 0x4000);
+	
+	return;
+}
+
+void k054539_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					 const UINT8* ROMData)
+{
+	k054539_state *info = (k054539_state *)_info;
+	
+	if (info->rom_size != ROMSize)
+	{
+		UINT8 i;
+		
+		info->rom = (UINT8*)realloc(info->rom, ROMSize);
+		info->rom_size = ROMSize;
+		memset(info->rom, 0xFF, ROMSize);
+		
+		info->rom_mask = 0xFFFFFFFF;
+		for (i = 0; i < 32; i ++)
+		{
+			if ((1U << i) >= info->rom_size)
+			{
+				info->rom_mask = (1 << i) - 1;
+				break;
+			}
+		}
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(info->rom + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+
+void k054539_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	k054539_state *info = (k054539_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 8; CurChn ++)
+		info->MutedCurChn = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( k054539 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers --- //
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(k054539_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions --- //
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( k054539 );		break;
+		case DEVINFO_FCT_STOP:							// nothing //									break;
+		case DEVINFO_FCT_RESET:							// nothing //									break;
+
+		// --- the following bits of info are returned as NULL-terminated strings --- //
+		case DEVINFO_STR_NAME:							strcpy(info->s, "K054539");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Konami custom");				break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+
+
+//DEFINE_LEGACY_SOUND_DEVICE(K054539, k054539);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/k054539.h Added

@@ -0,0 +1,61 @@
+/*********************************************************
+
+    Konami 054539 PCM Sound Chip
+
+*********************************************************/
+
+#pragma once
+
+//#include "devlegcy.h"
+
+/*typedef struct _k054539_interface k054539_interface;
+struct _k054539_interface
+{
+	const char *rgnoverride;
+	void (*apan)(device_t *, double, double);	// Callback for analog output mixing levels (0..1 for each channel)
+	void (*irq)(device_t *);
+};*/
+
+
+void k054539_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_k054539(void **chip, int clock);
+void device_stop_k054539(void *chip);
+void device_reset_k054539(void *chip);
+
+
+//WRITE8_DEVICE_HANDLER( k054539_w );
+//READ8_DEVICE_HANDLER( k054539_r );
+void k054539_w(void *chip, offs_t offset, UINT8 data);
+UINT8 k054539_r(void *chip, offs_t offset);
+
+//* control flags, may be set at DRIVER_INIT().
+#define K054539_RESET_FLAGS     0
+#define K054539_REVERSE_STEREO  1
+#define K054539_DISABLE_REVERB  2
+#define K054539_UPDATE_AT_KEYON 4
+
+//void k054539_init_flags(device_t *device, int flags);
+void k054539_init_flags(void *chip, int flags);
+
+/*
+    Note that the eight PCM channels of a K054539 do not have separate
+    volume controls. Considering the global attenuation equation may not
+    be entirely accurate, k054539_set_gain() provides means to control
+    channel gain. It can be called anywhere but preferrably from
+    DRIVER_INIT().
+
+    Parameters:
+        chip    : 0 / 1
+        channel : 0 - 7
+        gain    : 0.0=silent, 1.0=no gain, 2.0=twice as loud, etc.
+*/
+//void k054539_set_gain(device_t *device, int channel, double gain);
+void k054539_set_gain(void *chip, int channel, double gain);
+
+
+void k054539_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					   const UINT8* ROMData);
+void k054539_set_mute_mask(void *chip, UINT32 MuteMask);
+
+
+//DECLARE_LEGACY_SOUND_DEVICE(K054539, k054539);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/mamedef.h Added

@@ -0,0 +1,62 @@
+#ifndef __MAMEDEF_H__
+#define __MAMEDEF_H__
+
+// typedefs to use MAME's (U)INTxx types (copied from MAME\src\ods\odscomm.h)
+/* 8-bit values */
+typedef unsigned char						UINT8;
+typedef signed char 						INT8;
+
+/* 16-bit values */
+typedef unsigned short						UINT16;
+typedef signed short						INT16;
+
+/* 32-bit values */
+#ifndef _WINDOWS_H
+typedef unsigned int						UINT32;
+typedef signed int							INT32;
+#endif
+
+/* 64-bit values */
+#ifndef _WINDOWS_H
+#ifdef _MSC_VER
+typedef signed __int64						INT64;
+typedef unsigned __int64					UINT64;
+#else
+__extension__ typedef unsigned long long	UINT64;
+__extension__ typedef signed long long		INT64;
+#endif
+#endif
+
+/* offsets and addresses are 32-bit (for now...) */
+typedef UINT32	offs_t;
+
+/* stream_sample_t is used to represent a single sample in a sound stream */
+typedef INT32 stream_sample_t;
+
+#ifdef VGM_BIG_ENDIAN
+#define BYTE_XOR_BE(x)	 (x)
+#else
+#define BYTE_XOR_BE(x)	((x) ^ 0x01)
+#endif
+
+#if defined(_MSC_VER)
+//#define INLINE	static __forceinline
+#define INLINE	static __inline
+#elif defined(__GNUC__)
+#define INLINE	static __inline__
+#else
+#define INLINE	static inline
+#endif
+#ifndef M_PI
+#define M_PI	3.14159265358979323846
+#endif
+
+#ifdef _DEBUG
+#define logerror	printf
+#else
+#define logerror
+#endif
+
+typedef void (*SRATE_CALLBACK)(void*, UINT32);
+
+#endif	// __MAMEDEF_H__

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.c Added

@@ -0,0 +1,870 @@
+/*
+ * Sega System 32 Multi/Model 1/Model 2 custom PCM chip (315-5560) emulation.
+ *
+ * by Miguel Angel Horna (ElSemi) for Model 2 Emulator and MAME.
+ * Information by R.Belmont and the YMF278B (OPL4) manual.
+ *
+ * voice registers:
+ * 0: Pan
+ * 1: Index of sample
+ * 2: LSB of pitch (low 2 bits seem unused so)
+ * 3: MSB of pitch (ooooppppppppppxx) (o=octave (4 bit signed), p=pitch (10 bits), x=unused?
+ * 4: voice control: top bit = 1 for key on, 0 for key off
+ * 5: bit 0: 0: interpolate volume changes, 1: direct set volume,
+ bits 1-7 = volume attenuate (0=max, 7f=min)
+ * 6: LFO frequency + Phase LFO depth
+ * 7: Amplitude LFO size
+ *
+ * The first sample ROM contains a variable length table with 12
+ * bytes per instrument/sample. This is very similar to the YMF278B.
+ *
+ * The first 3 bytes are the offset into the file (big endian).
+ * The next 2 are the loop start offset into the file (big endian)
+ * The next 2 are the 2's complement of the total sample size (big endian)
+ * The next byte is LFO freq + depth (copied to reg 6 ?)
+ * The next 3 are envelope params (Attack, Decay1 and 2, sustain level, release, Key Rate Scaling)
+ * The next byte is Amplitude LFO size (copied to reg 7 ?)
+ *
+ * TODO
+ * - The YM278B manual states that the chip supports 512 instruments. The MultiPCM probably supports them
+ * too but the high bit position is unknown (probably reg 2 low bit). Any game use more than 256?
+ *
+ */
+
+//#include "emu.h"
+//#include "streams.h"
+#include "mamedef.h"
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+#include "multipcm.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+//????
+#define MULTIPCM_CLOCKDIV 	(180.0)
+
+struct _Sample
+{
+	unsigned int Start;
+	unsigned int Loop;
+	unsigned int End;
+	unsigned char AR,DR1,DR2,DL,RR;
+	unsigned char KRS;
+	unsigned char LFOVIB;
+	unsigned char AM;
+};
+
+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
+};
+
+struct _LFO
+{
+	unsigned short phase;
+	UINT32 phase_step;
+	int *table;
+	int *scale;
+};
+
+
+struct _SLOT
+{
+	unsigned char Num;
+	unsigned char Regs8;
+	int Playing;
+	struct _Sample *Sample;
+	unsigned int Base;
+	unsigned int offset;
+	unsigned int step;
+	unsigned int Pan,TL;
+	unsigned int DstTL;
+	int TLStep;
+	signed int Prev;
+	struct _EG EG;
+	struct _LFO PLFO;	//Phase lfo
+	struct _LFO ALFO;	//AM lfo
+	
+	UINT8 Muted;
+};
+
+typedef struct _MultiPCM MultiPCM;
+struct _MultiPCM
+{
+	//sound_stream * stream;
+	struct _Sample Samples0x200;		//Max 512 samples
+	struct _SLOT Slots28;
+	unsigned int CurSlot;
+	unsigned int Address;
+	unsigned int BankR,BankL;
+	float Rate;
+	UINT32 ROMMask;
+	UINT32 ROMSize;
+	INT8 *ROM;
+	//I include these in the chip because they depend on the chip clock
+	unsigned int ARStep0x40,DRStep0x40;	//Envelope step table
+	unsigned int FNS_Table0x400;		//Frequency step table
+};
+
+
+static UINT8 IsInit = 0x00;
+static signed int LPANTABLE0x800,RPANTABLE0x800;
+
+#define FIX(v)	((UINT32) ((float) (1<<SHIFT)*(v)))
+
+static const int val2chan =
+{
+	0, 1, 2, 3, 4, 5, 6 , -1,
+	7, 8, 9, 10,11,12,13, -1,
+	14,15,16,17,18,19,20, -1,
+	21,22,23,24,25,26,27, -1,
+};
+
+
+#define SHIFT		12
+
+
+#define MULTIPCM_RATE	44100.0
+
+
+/*INLINE MultiPCM *get_safe_token(running_device *device)
+{
+	assert(device != NULL);
+	assert(device->type() == MULTIPCM);
+	return (MultiPCM *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+/*******************************
+ ENVELOPE SECTION
+*******************************/
+
+//Times are based on a 44100Hz timebase. It's adjusted to the actual sampling rate on startup
+
+static const double BaseTimes64={0,0,0,0,6222.95,4978.37,4148.66,3556.01,3111.47,2489.21,2074.33,1778.00,1555.74,1244.63,1037.19,889.02,
+777.87,622.31,518.59,444.54,388.93,311.16,259.32,222.27,194.47,155.60,129.66,111.16,97.23,77.82,64.85,55.60,
+48.62,38.91,32.43,27.80,24.31,19.46,16.24,13.92,12.15,9.75,8.12,6.98,6.08,4.90,4.08,3.49,
+3.04,2.49,2.13,1.90,1.72,1.41,1.18,1.04,0.91,0.73,0.59,0.50,0.45,0.45,0.45,0.45};
+#define AR2DR	14.32833
+static signed int lin2expvol0x400;
+static int TLSteps2;
+
+#define EG_SHIFT	16
+
+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))
+			{
+				slot->EG.state=DECAY1;
+				if(slot->EG.D1R>=(0x400<<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<=(slot->EG.DL<<(10-4)))
+				slot->EG.state=DECAY2;
+			break;
+		case DECAY2:
+			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;
+				slot->Playing=0;
+			}
+			break;
+		default:
+			return 1<<SHIFT;
+	}
+	return lin2expvolslot->EG.volume>>EG_SHIFT;
+}
+
+static unsigned int Get_RATE(unsigned int *Steps,unsigned int rate,unsigned int val)
+{
+	int r=4*val+rate;
+	if(val==0)
+		return Steps0;
+	if(val==0xf)
+		return Steps0x3f;
+	if(r>0x3f)
+		r=0x3f;
+	return Stepsr;
+}
+
+static void EG_Calc(MultiPCM *ptChip,struct _SLOT *slot)
+{
+	int octave=((slot->Regs3>>4)-1)&0xf;
+	int rate;
+	if(octave&8) octave=octave-16;
+	if(slot->Sample->KRS!=0xf)
+		rate=(octave+slot->Sample->KRS)*2+((slot->Regs3>>3)&1);
+	else
+		rate=0;
+
+	slot->EG.AR=Get_RATE(ptChip->ARStep,rate,slot->Sample->AR);
+	slot->EG.D1R=Get_RATE(ptChip->DRStep,rate,slot->Sample->DR1);
+	slot->EG.D2R=Get_RATE(ptChip->DRStep,rate,slot->Sample->DR2);
+	slot->EG.RR=Get_RATE(ptChip->DRStep,rate,slot->Sample->RR);
+	slot->EG.DL=0xf-slot->Sample->DL;
+
+}
+
+/*****************************
+ LFO SECTION
+*****************************/
+
+#define LFO_SHIFT	8
+
+
+#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_TRI256;
+static int ALFO_TRI256;
+
+static const float LFOFreq8={0.168f,2.019f,3.196f,4.206f,5.215f,5.888f,6.224f,7.066f};	//Hz;
+static const float PSCALE8={0.0f,3.378f,5.065f,6.750f,10.114f,20.170f,40.180f,79.307f};	//cents
+static const float ASCALE8={0.0f,0.4f,0.8f,1.5f,3.0f,6.0f,12.0f,24.0f};					//DB
+static int PSCALES8256;
+static int ASCALES8256;
+
+static void LFO_Init(void)
+{
+	int i,s;
+	for(i=0;i<256;++i)
+	{
+		int a;	//amplitude
+		int p;	//phase
+
+		//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_TRIi=a;
+		PLFO_TRIi=p;
+	}
+
+	for(s=0;s<8;++s)
+	{
+		float limit=PSCALEs;
+		for(i=-128;i<128;++i)
+		{
+			PSCALESsi+128=CENTS(((limit*(float) i)/128.0));
+		}
+		limit=-ASCALEs;
+		for(i=0;i<256;++i)
+		{
+			ASCALESsi=DB(((limit*(float) i)/256.0));
+		}
+	}
+}
+
+INLINE signed int PLFO_Step(struct _LFO *LFO)
+{
+	int p;
+	LFO->phase+=LFO->phase_step;
+	p=LFO->table(LFO->phase>>LFO_SHIFT)&0xff;
+	p=LFO->scalep+128;
+	return p<<(SHIFT-LFO_SHIFT);
+}
+
+INLINE signed int ALFO_Step(struct _LFO *LFO)
+{
+	int p;
+	LFO->phase+=LFO->phase_step;
+	p=LFO->table(LFO->phase>>LFO_SHIFT)&0xff;
+	p=LFO->scalep;
+	return p<<(SHIFT-LFO_SHIFT);
+}
+
+static void LFO_ComputeStep(MultiPCM *ptChip,struct _LFO *LFO,UINT32 LFOF,UINT32 LFOS,int ALFO)
+{
+	float step=(float) LFOFreqLFOF*256.0/(float) ptChip->Rate;
+	LFO->phase_step=(unsigned int) ((float) (1<<LFO_SHIFT)*step);
+	if(ALFO)
+	{
+		LFO->table=ALFO_TRI;
+		LFO->scale=ASCALESLFOS;
+	}
+	else
+	{
+		LFO->table=PLFO_TRI;
+		LFO->scale=PSCALESLFOS;
+	}
+}
+
+
+
+static void WriteSlot(MultiPCM *ptChip,struct _SLOT *slot,int reg,unsigned char data)
+{
+	slot->Regsreg=data;
+
+	switch(reg)
+	{
+		case 0:	//PANPOT
+			slot->Pan=(data>>4)&0xf;
+			break;
+		case 1:	//Sample
+			//according to YMF278 sample write causes some base params written to the regs (envelope+lfos)
+			//the game should never change the sample while playing.
+			{
+				struct _Sample *Sample=ptChip->Samples+slot->Regs1;
+				WriteSlot(ptChip,slot,6,Sample->LFOVIB);
+				WriteSlot(ptChip,slot,7,Sample->AM);
+			}
+			break;
+		case 2:	//Pitch
+		case 3:
+			{
+				unsigned int oct=((slot->Regs3>>4)-1)&0xf;
+				unsigned int pitch=((slot->Regs3&0xf)<<6)|(slot->Regs2>>2);
+				pitch=ptChip->FNS_Tablepitch;
+				if(oct&0x8)
+					pitch>>=(16-oct);
+				else
+					pitch<<=oct;
+				slot->step=pitch/ptChip->Rate;
+			}
+			break;
+		case 4:		//KeyOn/Off (and more?)
+			{
+				if(data&0x80)		//KeyOn
+				{
+					slot->Sample=ptChip->Samples+slot->Regs1;
+					slot->Playing=1;
+					slot->Base=slot->Sample->Start;
+					slot->offset=0;
+					slot->Prev=0;
+					slot->TL=slot->DstTL<<SHIFT;
+
+					EG_Calc(ptChip,slot);
+					slot->EG.state=ATTACK;
+					slot->EG.volume=0;
+
+					if(slot->Base>=0x100000)
+					{
+						if(slot->Pan&8)
+							slot->Base=(slot->Base&0xfffff)|(ptChip->BankL);
+						else
+							slot->Base=(slot->Base&0xfffff)|(ptChip->BankR);
+					}
+
+				}
+				else
+				{
+					if(slot->Playing)
+					{
+						if(slot->Sample->RR!=0xf)
+							slot->EG.state=RELEASE;
+						else
+							slot->Playing=0;
+					}
+				}
+			}
+			break;
+		case 5:	//TL+Interpolation
+			{
+				slot->DstTL=(data>>1)&0x7f;
+				if(!(data&1))	//Interpolate TL
+				{
+					if((slot->TL>>SHIFT)>slot->DstTL)
+						slot->TLStep=TLSteps0;		//decrease
+					else
+						slot->TLStep=TLSteps1;		//increase
+				}
+				else
+					slot->TL=slot->DstTL<<SHIFT;
+			}
+			break;
+		case 6:	//LFO freq+PLFO
+			{
+				if(data)
+				{
+					LFO_ComputeStep(ptChip,&(slot->PLFO),(slot->Regs6>>3)&7,slot->Regs6&7,0);
+					LFO_ComputeStep(ptChip,&(slot->ALFO),(slot->Regs6>>3)&7,slot->Regs7&7,1);
+				}
+			}
+			break;
+		case 7:	//ALFO
+			{
+				if(data)
+				{
+					LFO_ComputeStep(ptChip,&(slot->PLFO),(slot->Regs6>>3)&7,slot->Regs6&7,0);
+					LFO_ComputeStep(ptChip,&(slot->ALFO),(slot->Regs6>>3)&7,slot->Regs7&7,1);
+				}
+			}
+			break;
+	}
+}
+
+//static STREAM_UPDATE( MultiPCM_update )
+void MultiPCM_update(void *param, stream_sample_t **outputs, int samples)
+{
+	MultiPCM *ptChip = (MultiPCM *)param;
+	stream_sample_t *datap2;
+	int i,sl;
+
+	datap0 = outputs0;
+	datap1 = outputs1;
+
+	memset(datap0, 0, sizeof(*datap0)*samples);
+	memset(datap1, 0, sizeof(*datap1)*samples);
+
+
+	for(i=0;i<samples;++i)
+	{
+		signed int smpl=0;
+		signed int smpr=0;
+		for(sl=0;sl<28;++sl)
+		{
+			struct _SLOT *slot=ptChip->Slots+sl;
+			if(slot->Playing && ! slot->Muted)
+			{
+				unsigned int vol=(slot->TL>>SHIFT)|(slot->Pan<<7);
+				unsigned int adr=slot->offset>>SHIFT;
+				signed int sample;
+				unsigned int step=slot->step;
+				signed int csample=(signed short) (ptChip->ROM(slot->Base+adr) & ptChip->ROMMask<<8);
+				signed int fpart=slot->offset&((1<<SHIFT)-1);
+				sample=(csample*fpart+slot->Prev*((1<<SHIFT)-fpart))>>SHIFT;
+
+				if(slot->Regs6&7)	//Vibrato enabled
+				{
+					step=step*PLFO_Step(&(slot->PLFO));
+					step>>=SHIFT;
+				}
+
+				slot->offset+=step;
+				if(slot->offset>=(slot->Sample->End<<SHIFT))
+				{
+					slot->offset=slot->Sample->Loop<<SHIFT;
+				}
+				if(adr^(slot->offset>>SHIFT))
+				{
+					slot->Prev=csample;
+				}
+
+				if((slot->TL>>SHIFT)!=slot->DstTL)
+					slot->TL+=slot->TLStep;
+
+				if(slot->Regs7&7)	//Tremolo enabled
+				{
+					sample=sample*ALFO_Step(&(slot->ALFO));
+					sample>>=SHIFT;
+				}
+
+				sample=(sample*EG_Update(slot))>>10;
+
+				smpl+=(LPANTABLEvol*sample)>>SHIFT;
+				smpr+=(RPANTABLEvol*sample)>>SHIFT;
+			}
+		}
+/*#define ICLIP16(x) (x<-32768)?-32768:((x>32767)?32767:x)
+		datap0i=ICLIP16(smpl);
+		datap1i=ICLIP16(smpr);*/
+		datap0i = smpl;
+		datap1i = smpr;
+	}
+}
+
+//READ8_DEVICE_HANDLER( multipcm_r )
+UINT8 multipcm_r(void *_info, offs_t offset)
+{
+// MultiPCM *ptChip = get_safe_token(device);
+//	MultiPCM *ptChip = &MultiPCMDataChipID;
+	return 0;
+}
+
+//static DEVICE_START( multipcm )
+int device_start_multipcm(void **_info, int clock)
+{
+	//MultiPCM *ptChip = get_safe_token(device);
+	MultiPCM *ptChip;
+	int i;
+
+	ptChip = (MultiPCM *) calloc(1, sizeof(MultiPCM));
+	*_info = (void *) ptChip;
+	
+	//ptChip->ROM=*device->region();
+	ptChip->ROMMask = 0x00;
+	ptChip->ROMSize = 0x00;
+	ptChip->ROM = NULL;
+	//ptChip->Rate=(float) device->clock() / MULTIPCM_CLOCKDIV;
+	ptChip->Rate=(float) clock / MULTIPCM_CLOCKDIV;
+
+	//ptChip->stream = stream_create(device, 0, 2, ptChip->Rate, ptChip, MultiPCM_update);
+
+	if (! IsInit)
+	{
+		//Volume+pan table
+		for(i=0;i<0x800;++i)
+		{
+			float SegaDB=0;
+			float TL;
+			float LPAN,RPAN;
+
+			unsigned char iTL=i&0x7f;
+			unsigned char iPAN=(i>>7)&0xf;
+
+			SegaDB=(float) iTL*(-24.0)/(float) 0x40;
+
+			TL=pow(10.0,SegaDB/20.0);
+
+
+			if(iPAN==0x8)
+			{
+				LPAN=RPAN=0.0;
+			}
+			else if(iPAN==0x0)
+			{
+				LPAN=RPAN=1.0;
+			}
+			else if(iPAN&0x8)
+			{
+				LPAN=1.0;
+
+				iPAN=0x10-iPAN;
+
+				SegaDB=(float) iPAN*(-12.0)/(float) 0x4;
+
+				RPAN=pow(10.0,SegaDB/20.0);
+
+				if((iPAN&0x7)==7)
+					RPAN=0.0;
+			}
+			else
+			{
+				RPAN=1.0;
+
+				SegaDB=(float) iPAN*(-12.0)/(float) 0x4;
+
+				LPAN=pow(10.0,SegaDB/20.0);
+				if((iPAN&0x7)==7)
+					LPAN=0.0;
+			}
+
+			TL/=4.0;
+
+			LPANTABLEi=FIX((LPAN*TL));
+			RPANTABLEi=FIX((RPAN*TL));
+		}
+		IsInit = 0x01;
+	}
+
+	//Pitch steps
+	for(i=0;i<0x400;++i)
+	{
+		float fcent=ptChip->Rate*(1024.0+(float) i)/1024.0;
+		ptChip->FNS_Tablei=(unsigned int ) ((float) (1<<SHIFT) *fcent);
+	}
+
+	//Envelope steps
+	for(i=0;i<0x40;++i)
+	{
+		//Times are based on 44100 clock, adjust to real chip clock
+		ptChip->ARStepi=(float) (0x400<<EG_SHIFT)/(BaseTimesi*44100.0/(1000.0));
+		ptChip->DRStepi=(float) (0x400<<EG_SHIFT)/(BaseTimesi*AR2DR*44100.0/(1000.0));
+	}
+	ptChip->ARStep0=ptChip->ARStep1=ptChip->ARStep2=ptChip->ARStep3=0;
+	ptChip->ARStep0x3f=0x400<<EG_SHIFT;
+	ptChip->DRStep0=ptChip->DRStep1=ptChip->DRStep2=ptChip->DRStep3=0;
+
+	//TL Interpolation steps
+	//lower
+	TLSteps0=-(float) (0x80<<SHIFT)/(78.2*44100.0/1000.0);
+	//raise
+	TLSteps1=(float) (0x80<<SHIFT)/(78.2*2*44100.0/1000.0);
+
+	//build the linear->exponential ramps
+	for(i=0;i<0x400;++i)
+	{
+		float db=-(96.0-(96.0*(float) i/(float) 0x400));
+		lin2expvoli=pow(10.0,db/20.0)*(float) (1<<SHIFT);
+	}
+
+
+	/*for(i=0;i<512;++i)
+	{
+		UINT8 *ptSample=(UINT8 *) ptChip->ROM+i*12;
+		ptChip->Samplesi.Start=(ptSample0<<16)|(ptSample1<<8)|(ptSample2<<0);
+		ptChip->Samplesi.Loop=(ptSample3<<8)|(ptSample4<<0);
+		ptChip->Samplesi.End=0xffff-((ptSample5<<8)|(ptSample6<<0));
+		ptChip->Samplesi.LFOVIB=ptSample7;
+		ptChip->Samplesi.DR1=ptSample8&0xf;
+		ptChip->Samplesi.AR=(ptSample8>>4)&0xf;
+		ptChip->Samplesi.DR2=ptSample9&0xf;
+		ptChip->Samplesi.DL=(ptSample9>>4)&0xf;
+		ptChip->Samplesi.RR=ptSample10&0xf;
+		ptChip->Samplesi.KRS=(ptSample10>>4)&0xf;
+		ptChip->Samplesi.AM=ptSample11;
+	}*/
+
+	/*state_save_register_device_item(device, 0, ptChip->CurSlot);
+	state_save_register_device_item(device, 0, ptChip->Address);
+	state_save_register_device_item(device, 0, ptChip->BankL);
+	state_save_register_device_item(device, 0, ptChip->BankR);*/
+
+	// reset is done via DEVICE_RESET
+	/*for(i=0;i<28;++i)
+	{
+		ptChip->Slotsi.Num=i;
+		ptChip->Slotsi.Playing=0;
+
+		state_save_register_device_item(device, i, ptChip->Slotsi.Num);
+		state_save_register_device_item_array(device, i, ptChip->Slotsi.Regs);
+		state_save_register_device_item(device, i, ptChip->Slotsi.Playing);
+		state_save_register_device_item(device, i, ptChip->Slotsi.Base);
+		state_save_register_device_item(device, i, ptChip->Slotsi.offset);
+		state_save_register_device_item(device, i, ptChip->Slotsi.step);
+		state_save_register_device_item(device, i, ptChip->Slotsi.Pan);
+		state_save_register_device_item(device, i, ptChip->Slotsi.TL);
+		state_save_register_device_item(device, i, ptChip->Slotsi.DstTL);
+		state_save_register_device_item(device, i, ptChip->Slotsi.TLStep);
+		state_save_register_device_item(device, i, ptChip->Slotsi.Prev);
+		state_save_register_device_item(device, i, ptChip->Slotsi.EG.volume);
+		state_save_register_device_item(device, i, ptChip->Slotsi.EG.state);
+		state_save_register_device_item(device, i, ptChip->Slotsi.EG.step);
+		state_save_register_device_item(device, i, ptChip->Slotsi.EG.AR);
+		state_save_register_device_item(device, i, ptChip->Slotsi.EG.D1R);
+		state_save_register_device_item(device, i, ptChip->Slotsi.EG.D2R);
+		state_save_register_device_item(device, i, ptChip->Slotsi.EG.RR);
+		state_save_register_device_item(device, i, ptChip->Slotsi.EG.DL);
+		state_save_register_device_item(device, i, ptChip->Slotsi.PLFO.phase);
+		state_save_register_device_item(device, i, ptChip->Slotsi.PLFO.phase_step);
+		state_save_register_device_item(device, i, ptChip->Slotsi.ALFO.phase);
+		state_save_register_device_item(device, i, ptChip->Slotsi.ALFO.phase_step);
+	}*/
+
+	LFO_Init();
+	
+	multipcm_set_bank(ptChip, 0x00, 0x00);
+
+	return (int)(ptChip->Rate + 0.5);
+}
+
+
+void device_stop_multipcm(void *_info)
+{
+	MultiPCM *ptChip = (MultiPCM *)_info;
+	
+	free(ptChip->ROM);	ptChip->ROM = NULL;
+
+	free(ptChip);	
+
+	return;
+}
+
+void device_reset_multipcm(void *_info)
+{
+	MultiPCM *ptChip = (MultiPCM *)_info;
+	int i;
+	
+	for(i=0;i<28;++i)
+	{
+		ptChip->Slotsi.Num=i;
+		ptChip->Slotsi.Playing=0;
+	}
+	
+	return;
+}
+
+
+//WRITE8_DEVICE_HANDLER( multipcm_w )
+void multipcm_w(void *_info, offs_t offset, UINT8 data)
+{
+	//MultiPCM *ptChip = get_safe_token(device);
+	MultiPCM *ptChip = (MultiPCM *)_info;
+	switch(offset)
+	{
+		case 0:		//Data write
+			WriteSlot(ptChip,ptChip->Slots+ptChip->CurSlot,ptChip->Address,data);
+			break;
+		case 1:
+			ptChip->CurSlot=val2chandata&0x1f;
+			break;
+		case 2:
+			ptChip->Address=(data>7)?7:data;
+			break;
+	}
+	/*ptChip->CurSlot = val2chan(offset >> 3) & 0x1F;
+	ptChip->Address = offset & 0x07;
+	WriteSlot(ptChip, ptChip->Slots + ptChip->CurSlot, ptChip->Address, data);*/
+}
+
+/* MAME/M1 access functions */
+
+//void multipcm_set_bank(running_device *device, UINT32 leftoffs, UINT32 rightoffs)
+void multipcm_set_bank(void *_info, UINT32 leftoffs, UINT32 rightoffs)
+{
+	//MultiPCM *ptChip = get_safe_token(device);
+	MultiPCM *ptChip = (MultiPCM *)_info;
+	ptChip->BankL = leftoffs;
+	ptChip->BankR = rightoffs;
+}
+
+void multipcm_bank_write(void *_info, UINT8 offset, UINT16 data)
+{
+	MultiPCM *ptChip = (MultiPCM *)_info;
+	
+	if (offset & 0x01)
+		ptChip->BankL = data << 16;
+	if (offset & 0x02)
+		ptChip->BankR = data << 16;
+	
+	return;
+}
+
+void multipcm_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+						const UINT8* ROMData)
+{
+	MultiPCM *ptChip = (MultiPCM *)_info;
+	UINT16 CurSmpl;
+	struct _Sample* TempSmpl;
+	UINT8* ptSample;
+	
+	if (ptChip->ROMSize != ROMSize)
+	{
+		ptChip->ROM = (INT8*)realloc(ptChip->ROM, ROMSize);
+		ptChip->ROMSize = ROMSize;
+		
+		for (ptChip->ROMMask = 1; ptChip->ROMMask < ROMSize; ptChip->ROMMask <<= 1)
+			;
+		ptChip->ROMMask --;
+		
+		memset(ptChip->ROM, 0xFF, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(ptChip->ROM + DataStart, ROMData, DataLength);
+	
+	if (DataStart < 0x200 * 12)
+	{
+		for (CurSmpl = 0; CurSmpl < 512; CurSmpl ++)
+		{
+			TempSmpl = &ptChip->SamplesCurSmpl;
+			ptSample = (UINT8*)ptChip->ROM + CurSmpl * 12;
+			
+			TempSmpl->Start = (ptSample0<<16)|(ptSample1<<8)|(ptSample2<<0);
+			TempSmpl->Loop = (ptSample3<<8)|(ptSample4<<0);
+			TempSmpl->End = 0xffff-((ptSample5<<8)|(ptSample6<<0));
+			TempSmpl->LFOVIB = ptSample7;
+			TempSmpl->DR1 = ptSample8&0xf;
+			TempSmpl->AR = (ptSample8>>4)&0xf;
+			TempSmpl->DR2 = ptSample9&0xf;
+			TempSmpl->DL = (ptSample9>>4)&0xf;
+			TempSmpl->RR = ptSample10&0xf;
+			TempSmpl->KRS = (ptSample10>>4)&0xf;
+			TempSmpl->AM = ptSample11;
+		}
+	}
+	
+	return;
+}
+
+
+void multipcm_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	MultiPCM* ptChip = (MultiPCM *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 28; CurChn ++)
+		ptChip->SlotsCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+#if 0	// for debugging only
+UINT8 multipcm_get_channels(UINT8 ChipID, UINT32* ChannelMask)
+{
+	MultiPCM* ptChip = &MultiPCMDataChipID;
+	UINT8 CurChn;
+	UINT8 UsedChns;
+	UINT32 ChnMask;
+	
+	ChnMask = 0x00000000;
+	UsedChns = 0x00;
+	for (CurChn = 0; CurChn < 28; CurChn ++)
+	{
+		if (ptChip->SlotsCurChn.Playing)
+		{
+			ChnMask |= (1 << CurChn);
+			UsedChns ++;
+		}
+	}
+	if (ChannelMask != NULL)
+		*ChannelMask = ChnMask;
+	
+	return UsedChns;
+}
+#endif
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( multipcm )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(MultiPCM);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( multipcm );		break;
+		case DEVINFO_FCT_STOP:							// Nothing										break;
+		case DEVINFO_FCT_RESET:							// Nothing										break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "Sega/Yamaha 315-5560");		break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Sega custom");					break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "2.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+
+
+//DEFINE_LEGACY_SOUND_DEVICE(MULTIPCM, multipcm);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/multipcm.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.c Added

@@ -0,0 +1,941 @@
+/*****************************************************************************
+
+ MAME/MESS NES APU CORE
+
+ Based on the Nofrendo/Nosefart NES N2A03 sound emulation core written by
+ Matthew Conte (matt@conte.com) and redesigned for use in MAME/MESS by
+ Who Wants to Know? (wwtk@mail.com)
+
+ This core is written with the advise and consent of Matthew Conte and is
+ released under the GNU Public License. This core is freely avaiable for
+ use in any freeware project, subject to the following terms:
+
+ Any modifications to this code must be duly noted in the source and
+ approved by Matthew Conte and myself prior to public submission.
+
+ timing notes:
+ master = 21477270
+ 2A03 clock = master/12
+ sequencer = master/89490 or CPU/7457
+
+ *****************************************************************************
+
+ NES_APU.C
+
+ Actual NES APU interface.
+
+ LAST MODIFIED 02/29/2004
+
+ - Based on Matthew Conte's Nofrendo/Nosefart core and redesigned to
+ use MAME system calls and to enable multiple APUs. Sound at this
+ point should be just about 100% accurate, though I cannot tell for
+ certain as yet.
+
+ A queue interface is also available for additional speed. However,
+ the implementation is not yet 100% (DPCM sounds are inaccurate),
+ so it is disabled by default.
+
+ *****************************************************************************
+
+ BUGFIXES:
+
+ - Various bugs concerning the DPCM channel fixed. (Oliver Achten)
+ - Fixed $4015 read behaviour. (Oliver Achten)
+
+ *****************************************************************************/
+
+#include "mamedef.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h>	// for NULL
+//#include "emu.h"
+//#include "streams.h"
+#include "nes_apu.h"
+//#include "cpu/m6502/m6502.h"
+
+#include "nes_defs.h"
+
+/* GLOBAL CONSTANTS */
+#define SYNCS_MAX1 0x20
+#define SYNCS_MAX2 0x80
+
+/* GLOBAL VARIABLES */
+typedef struct _nesapu_state nesapu_state;
+struct _nesapu_state
+{
+	apu_t APU;			 /* Actual APUs */
+	float apu_incsize; /* Adjustment increment */
+	uint32 samps_per_sync; /* Number of samples per vsync */
+	uint32 buffer_size; /* Actual buffer size in bytes */
+	uint32 real_rate; /* Actual playback rate */
+	uint8 noise_lutNOISE_LONG; /* Noise sample lookup table */
+	uint32 vbl_times0x20; /* VBL durations in samples */
+	uint32 sync_times1SYNCS_MAX1; /* Samples per sync table */
+	uint32 sync_times2SYNCS_MAX2; /* Samples per sync table */
+	//sound_stream *stream;
+};
+
+static UINT8 DPCMBase0 = 0x01;
+
+//#define MAX_CHIPS	0x02
+//static nesapu_state NESAPUDataMAX_CHIPS;
+
+/*INLINE nesapu_state *get_safe_token(running_device *device)
+{
+	assert(device != NULL);
+	assert(device->type() == NES);
+	return (nesapu_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+/* INTERNAL FUNCTIONS */
+
+/* INITIALIZE WAVE TIMES RELATIVE TO SAMPLE RATE */
+static void create_vbltimes(uint32 * table,const uint8 *vbl,unsigned int rate)
+{
+	int i;
+
+	for (i = 0; i < 0x20; i++)
+		tablei = vbli * rate;
+}
+
+/* INITIALIZE SAMPLE TIMES IN TERMS OF VSYNCS */
+static void create_syncs(nesapu_state *info, unsigned long sps)
+{
+	int i;
+	unsigned long val = sps;
+
+	for (i = 0; i < SYNCS_MAX1; i++)
+	{
+		info->sync_times1i = val;
+		val += sps;
+	}
+
+	val = 0;
+	for (i = 0; i < SYNCS_MAX2; i++)
+	{
+		info->sync_times2i = val;
+		info->sync_times2i >>= 2;
+		val += sps;
+	}
+}
+
+/* INITIALIZE NOISE LOOKUP TABLE */
+static void create_noise(uint8 *buf, const int bits, int size)
+{
+	int m = 0x0011;
+	int xor_val, i;
+
+	for (i = 0; i < size; i++)
+	{
+		xor_val = m & 1;
+		m >>= 1;
+		xor_val ^= (m & 1);
+		m |= xor_val << (bits - 1);
+
+		bufi = m;
+	}
+}
+
+/* TODO: sound channels should *ALL* have DC volume decay */
+
+/* OUTPUT SQUARE WAVE SAMPLE (VALUES FROM -16 to +15) */
+static int8 apu_square(nesapu_state *info, square_t *chan)
+{
+	int env_delay;
+	int sweep_delay;
+	int8 output;
+	uint8 freq_index;
+
+	/* reg0: 0-3=volume, 4=envelope, 5=hold, 6-7=duty cycle
+ ** reg1: 0-2=sweep shifts, 3=sweep inc/dec, 4-6=sweep length, 7=sweep on
+ ** reg2: 8 bits of freq
+ ** reg3: 0-2=high freq, 7-4=vbl length counter
+ */
+
+	if (FALSE == chan->enabled || chan->Muted)
+		return 0;
+
+	/* enveloping */
+	env_delay = info->sync_times1chan->regs0 & 0x0F;
+
+	/* decay is at a rate of (env_regs + 1) / 240 secs */
+	chan->env_phase -= 4;
+	while (chan->env_phase < 0)
+	{
+		chan->env_phase += env_delay;
+		if (chan->regs0 & 0x20)
+			chan->env_vol = (chan->env_vol + 1) & 15;
+		else if (chan->env_vol < 15)
+			chan->env_vol++;
+	}
+
+	/* vbl length counter */
+	if (chan->vbl_length > 0 && 0 == (chan->regs 0 & 0x20))
+		chan->vbl_length--;
+
+	if (0 == chan->vbl_length)
+		return 0;
+
+	/* freqsweeps */
+	if ((chan->regs1 & 0x80) && (chan->regs1 & 7))
+	{
+		sweep_delay = info->sync_times1(chan->regs1 >> 4) & 7;
+		chan->sweep_phase -= 2;
+		while (chan->sweep_phase < 0)
+		{
+			chan->sweep_phase += sweep_delay;
+			if (chan->regs1 & 8)
+				chan->freq -= chan->freq >> (chan->regs1 & 7);
+			else
+				chan->freq += chan->freq >> (chan->regs1 & 7);
+		}
+	}
+
+//	if ((0 == (chan->regs1 & 8) && (chan->freq >> 16) > freq_limitchan->regs1 & 7)
+//		 || (chan->freq >> 16) < 4)
+//		return 0;
+	
+	// Thanks to Delek for the fix
+	if (chan->regs1 & 0x80)
+		freq_index = chan->regs1 & 7;	//If sweeping is enabled, I choose it as normal.
+	else
+		freq_index = 7;	//If sweeping is disabled, I choose the lower limit.
+	
+	if ((0 == (chan->regs1 & 8) && (chan->freq >> 16) > freq_limitfreq_index)
+		 || (chan->freq >> 16) < 4)
+		return 0;
+
+	chan->phaseacc -= (float) info->apu_incsize; /* # of cycles per sample */
+
+	while (chan->phaseacc < 0)
+	{
+		chan->phaseacc += (chan->freq >> 16);
+		chan->adder = (chan->adder + 1) & 0x0F;
+	}
+
+	if (chan->regs0 & 0x10) /* fixed volume */
+		output = chan->regs0 & 0x0F;
+	else
+		output = 0x0F - chan->env_vol;
+
+	if (chan->adder < (duty_lutchan->regs0 >> 6))
+		output = -output;
+
+	return (int8) output;
+}
+
+/* OUTPUT TRIANGLE WAVE SAMPLE (VALUES FROM -16 to +15) */
+static int8 apu_triangle(nesapu_state *info, triangle_t *chan)
+{
+	int freq;
+	int8 output;
+	/* reg0: 7=holdnote, 6-0=linear length counter
+ ** reg2: low 8 bits of frequency
+ ** reg3: 7-3=length counter, 2-0=high 3 bits of frequency
+ */
+
+	if (FALSE == chan->enabled || chan->Muted)
+		return 0;
+
+	if (FALSE == chan->counter_started && 0 == (chan->regs0 & 0x80))
+	{
+		if (chan->write_latency)
+			chan->write_latency--;
+		if (0 == chan->write_latency)
+			chan->counter_started = TRUE;
+	}
+
+	if (chan->counter_started)
+	{
+		if (chan->linear_length > 0)
+			chan->linear_length--;
+		if (chan->vbl_length && 0 == (chan->regs0 & 0x80))
+				chan->vbl_length--;
+
+		if (0 == chan->vbl_length)
+			return 0;
+	}
+
+	if (0 == chan->linear_length)
+		return 0;
+
+	freq = (((chan->regs3 & 7) << 8) + chan->regs2) + 1;
+
+	if (freq < 4) /* inaudible */
+		return 0;
+
+	chan->phaseacc -= (float) info->apu_incsize; /* # of cycles per sample */
+	while (chan->phaseacc < 0)
+	{
+		chan->phaseacc += freq;
+		chan->adder = (chan->adder + 1) & 0x1F;
+
+		output = (chan->adder & 7) << 1;
+		if (chan->adder & 8)
+			output = 0x10 - output;
+		if (chan->adder & 0x10)
+			output = -output;
+
+		chan->output_vol = output;
+	}
+
+	return (int8) chan->output_vol;
+}
+
+/* OUTPUT NOISE WAVE SAMPLE (VALUES FROM -16 to +15) */
+static int8 apu_noise(nesapu_state *info, noise_t *chan)
+{
+	int freq, env_delay;
+	uint8 outvol;
+	uint8 output;
+
+	/* reg0: 0-3=volume, 4=envelope, 5=hold
+ ** reg2: 7=small(93 byte) sample,3-0=freq lookup
+ ** reg3: 7-4=vbl length counter
+ */
+
+	if (FALSE == chan->enabled || chan->Muted)
+		return 0;
+
+	/* enveloping */
+	env_delay = info->sync_times1chan->regs0 & 0x0F;
+
+	/* decay is at a rate of (env_regs + 1) / 240 secs */
+	chan->env_phase -= 4;
+	while (chan->env_phase < 0)
+	{
+		chan->env_phase += env_delay;
+		if (chan->regs0 & 0x20)
+			chan->env_vol = (chan->env_vol + 1) & 15;
+		else if (chan->env_vol < 15)
+			chan->env_vol++;
+	}
+
+	/* length counter */
+	if (0 == (chan->regs0 & 0x20))
+	{
+		if (chan->vbl_length > 0)
+			chan->vbl_length--;
+	}
+
+	if (0 == chan->vbl_length)
+		return 0;
+
+	freq = noise_freqchan->regs2 & 0x0F;
+	chan->phaseacc -= (float) info->apu_incsize; /* # of cycles per sample */
+	while (chan->phaseacc < 0)
+	{
+		chan->phaseacc += freq;
+
+		chan->cur_pos++;
+		if (NOISE_SHORT == chan->cur_pos && (chan->regs2 & 0x80))
+			chan->cur_pos = 0;
+		else if (NOISE_LONG == chan->cur_pos)
+			chan->cur_pos = 0;
+	}
+
+	if (chan->regs0 & 0x10) /* fixed volume */
+		outvol = chan->regs0 & 0x0F;
+	else
+		outvol = 0x0F - chan->env_vol;
+
+	output = info->noise_lutchan->cur_pos;
+	if (output > outvol)
+		output = outvol;
+
+	if (info->noise_lutchan->cur_pos & 0x80) /* make it negative */
+		output = -output;
+
+	return (int8) output;
+}
+
+/* RESET DPCM PARAMETERS */
+INLINE void apu_dpcmreset(dpcm_t *chan)
+{
+	chan->address = 0xC000 + (uint16) (chan->regs2 << 6);
+	chan->length = (uint16) (chan->regs3 << 4) + 1;
+	chan->bits_left = chan->length << 3;
+	chan->irq_occurred = FALSE;
+	chan->enabled = TRUE; /* Fixed * Proper DPCM channel ENABLE/DISABLE flag behaviour*/
+	// Note: according to NSFPlay, it does NOT do that
+	chan->vol = 0; /* Fixed * DPCM DAC resets itself when restarted */
+}
+
+/* OUTPUT DPCM WAVE SAMPLE (VALUES FROM -64 to +63) */
+/* TODO: centerline naughtiness */
+static int8 apu_dpcm(nesapu_state *info, dpcm_t *chan)
+{
+	int freq, bit_pos;
+
+	/* reg0: 7=irq gen, 6=looping, 3-0=pointer to clock table
+ ** reg1: output dc level, 7 bits unsigned
+ ** reg2: 8 bits of 64-byte aligned address offset : $C000 + (value * 64)
+ ** reg3: length, (value * 16) + 1
+ */
+	if (chan->Muted)
+		return 0;
+
+	if (chan->enabled)
+	{
+		freq = dpcm_clockschan->regs0 & 0x0F;
+		chan->phaseacc -= (float) info->apu_incsize; /* # of cycles per sample */
+
+		while (chan->phaseacc < 0)
+		{
+			chan->phaseacc += freq;
+
+			if (0 == chan->length)
+			{
+				chan->enabled = FALSE; /* Fixed * Proper DPCM channel ENABLE/DISABLE flag behaviour*/
+				chan->vol=0; /* Fixed * DPCM DAC resets itself when restarted */
+				if (chan->regs0 & 0x40)
+					apu_dpcmreset(chan);
+				else
+				{
+					if (chan->regs0 & 0x80) /* IRQ Generator */
+					{
+						chan->irq_occurred = TRUE;
+						//n2a03_irq(info->APU.dpcm.memory->cpu);
+					}
+					break;
+				}
+			}
+
+
+			chan->bits_left--;
+			bit_pos = 7 - (chan->bits_left & 7);
+			if (7 == bit_pos)
+			{
+				//chan->cur_byte = info->APU.dpcm.memory->read_byte(chan->address);
+				chan->cur_byte = info->APU.dpcm.memorychan->address;
+				chan->address++;
+				// On overflow, the address is set to 8000
+				if (chan->address >= 0x10000)
+					chan->address -= 0x8000;
+				chan->length--;
+			}
+
+			if (chan->cur_byte & (1 << bit_pos))
+// chan->regs1++;
+				chan->vol+=2; /* FIXED * DPCM channel only uses the upper 6 bits of the DAC */
+			else
+// chan->regs1--;
+				chan->vol-=2;
+		}
+	}
+
+	if (! DPCMBase0)
+	{
+		if (chan->vol > 63)
+			chan->vol = 63;
+		else if (chan->vol < -64)
+			chan->vol = -64;
+	}
+	else
+	{
+		if (chan->vol > 127)
+			chan->vol = 127;
+		else if (chan->vol < 0)
+			chan->vol = 0;
+	}
+
+	return (int8) (chan->vol);
+	//return (int8) 0;
+}
+
+/* WRITE REGISTER VALUE */
+INLINE void apu_regwrite(nesapu_state *info,int address, uint8 value)
+{
+	int chan = (address & 4) ? 1 : 0;
+
+	switch (address)
+	{
+	/* squares */
+	case APU_WRA0:
+	case APU_WRB0:
+		info->APU.squchan.regs0 = value;
+		break;
+
+	case APU_WRA1:
+	case APU_WRB1:
+		info->APU.squchan.regs1 = value;
+		break;
+
+	case APU_WRA2:
+	case APU_WRB2:
+		info->APU.squchan.regs2 = value;
+		if (info->APU.squchan.enabled)
+			info->APU.squchan.freq = ((((info->APU.squchan.regs3 & 7) << 8) + value) + 1) << 16;
+		break;
+
+	case APU_WRA3:
+	case APU_WRB3:
+		info->APU.squchan.regs3 = value;
+
+		if (info->APU.squchan.enabled)
+		{
+		// TODO: Test, if it sounds better with or without it.
+		//	info->APU.squchan.adder = 0;	// Thanks to Delek
+			info->APU.squchan.vbl_length = info->vbl_timesvalue >> 3;
+			info->APU.squchan.env_vol = 0;
+			info->APU.squchan.freq = ((((value & 7) << 8) + info->APU.squchan.regs2) + 1) << 16;
+		}
+
+		break;
+
+	/* triangle */
+	case APU_WRC0:
+		info->APU.tri.regs0 = value;
+
+		if (info->APU.tri.enabled)
+		{ /* ??? */
+			if (FALSE == info->APU.tri.counter_started)
+				info->APU.tri.linear_length = info->sync_times2value & 0x7F;
+		}
+
+		break;
+
+	//case 0x4009:
+	case APU_WRC1:
+		/* unused */
+		info->APU.tri.regs1 = value;
+		break;
+
+	case APU_WRC2:
+		info->APU.tri.regs2 = value;
+		break;
+
+	case APU_WRC3:
+		info->APU.tri.regs3 = value;
+
+		/* this is somewhat of a hack. there is some latency on the Real
+ ** Thing between when trireg0 is written to and when the linear
+ ** length counter actually begins its countdown. we want to prevent
+ ** the case where the program writes to the freq regs first, then
+ ** to reg 0, and the counter accidentally starts running because of
+ ** the sound queue's timestamp processing.
+ **
+ ** set to a few NES sample -- should be sufficient
+ **
+ ** 3 * (1789772.727 / 44100) = ~122 cycles, just around one scanline
+ **
+ ** should be plenty of time for the 6502 code to do a couple of table
+ ** dereferences and load up the other triregs
+ */
+
+	/* used to be 3, but now we run the clock faster, so base it on samples/sync */
+		info->APU.tri.write_latency = (info->samps_per_sync + 239) / 240;
+
+		if (info->APU.tri.enabled)
+		{
+			info->APU.tri.counter_started = FALSE;
+			info->APU.tri.vbl_length = info->vbl_timesvalue >> 3;
+			info->APU.tri.linear_length = info->sync_times2info->APU.tri.regs0 & 0x7F;
+		}
+
+		break;
+
+	/* noise */
+	case APU_WRD0:
+		info->APU.noi.regs0 = value;
+		break;
+
+	case 0x400D:
+		/* unused */
+		info->APU.noi.regs1 = value;
+		break;
+
+	case APU_WRD2:
+		info->APU.noi.regs2 = value;
+		info->APU.noi.cur_pos = 0;	// Thanks to Delek for this fix.
+		break;
+
+	case APU_WRD3:
+		info->APU.noi.regs3 = value;
+
+		if (info->APU.noi.enabled)
+		{
+			info->APU.noi.vbl_length = info->vbl_timesvalue >> 3;
+			info->APU.noi.env_vol = 0; /* reset envelope */
+		}
+		break;
+
+	/* DMC */
+	case APU_WRE0:
+		info->APU.dpcm.regs0 = value;
+		if (0 == (value & 0x80))
+			info->APU.dpcm.irq_occurred = FALSE;
+		break;
+
+	case APU_WRE1: /* 7-bit DAC */
+		//info->APU.dpcm.regs1 = value - 0x40;
+		info->APU.dpcm.regs1 = value & 0x7F;
+		if (! DPCMBase0)
+			info->APU.dpcm.vol = (info->APU.dpcm.regs1-64);
+		else
+			info->APU.dpcm.vol = info->APU.dpcm.regs1;
+		break;
+
+	case APU_WRE2:
+		info->APU.dpcm.regs2 = value;
+		//apu_dpcmreset(info->APU.dpcm);
+		break;
+
+	case APU_WRE3:
+		info->APU.dpcm.regs3 = value;
+		break;
+
+	case APU_IRQCTRL:
+		if(value & 0x80)
+			info->APU.step_mode = 5;
+		else
+			info->APU.step_mode = 4;
+		break;
+
+	case APU_SMASK:
+		if (value & 0x01)
+			info->APU.squ0.enabled = TRUE;
+		else
+		{
+			info->APU.squ0.enabled = FALSE;
+			info->APU.squ0.vbl_length = 0;
+		}
+
+		if (value & 0x02)
+			info->APU.squ1.enabled = TRUE;
+		else
+		{
+			info->APU.squ1.enabled = FALSE;
+			info->APU.squ1.vbl_length = 0;
+		}
+
+		if (value & 0x04)
+			info->APU.tri.enabled = TRUE;
+		else
+		{
+			info->APU.tri.enabled = FALSE;
+			info->APU.tri.vbl_length = 0;
+			info->APU.tri.linear_length = 0;
+			info->APU.tri.counter_started = FALSE;
+			info->APU.tri.write_latency = 0;
+		}
+
+		if (value & 0x08)
+			info->APU.noi.enabled = TRUE;
+		else
+		{
+			info->APU.noi.enabled = FALSE;
+			info->APU.noi.vbl_length = 0;
+		}
+
+		if (value & 0x10)
+		{
+			/* only reset dpcm values if DMA is finished */
+			if (FALSE == info->APU.dpcm.enabled)
+			{
+				info->APU.dpcm.enabled = TRUE;
+				apu_dpcmreset(&info->APU.dpcm);
+			}
+		}
+		else
+			info->APU.dpcm.enabled = FALSE;
+
+		info->APU.dpcm.irq_occurred = FALSE;
+
+		break;
+	default:
+#ifdef MAME_DEBUG
+logerror("invalid apu write: $%02X at $%04X\n", value, address);
+#endif
+		break;
+	}
+}
+
+/* UPDATE SOUND BUFFER USING CURRENT DATA */
+//INLINE void apu_update(nesapu_state *info, stream_sample_t *buffer16, int samples)
+INLINE void apu_update(nesapu_state *info, stream_sample_t **buffer16, int samples)
+{
+	int accum;
+	stream_sample_t* bufL = buffer160;
+	stream_sample_t* bufR = buffer161;
+
+	while (samples--)
+	{
+		/*accum = apu_square(info, &info->APU.squ0);
+		accum += apu_square(info, &info->APU.squ1);
+		accum += apu_triangle(info, &info->APU.tri);
+		accum += apu_noise(info, &info->APU.noi);
+		accum += apu_dpcm(info, &info->APU.dpcm);
+
+		// 8-bit clamps
+		if (accum > 127)
+			accum = 127;
+		else if (accum < -128)
+			accum = -128;
+
+		*(bufL++)=accum<<8;
+		*(bufR++)=accum<<8;*/
+
+		// These volumes should match NSFPlay's NES core better
+		accum = apu_square(info, &info->APU.squ0) << 8;	// << 8 * 1.0
+		accum += apu_square(info, &info->APU.squ1) << 8;	// << 8 * 1.0
+		accum += apu_triangle(info, &info->APU.tri) * 0xC0;	// << 8 * 0.75
+		accum += apu_noise(info, &info->APU.noi) * 0xC0;	// << 8 * 0.75
+		accum += apu_dpcm(info, &info->APU.dpcm) * 0xC0;	// << 8 * 0.75
+
+		*(bufL++)=accum;
+		*(bufR++)=accum;
+	}
+}
+
+/* READ VALUES FROM REGISTERS */
+INLINE uint8 apu_read(nesapu_state *info,int address)
+{
+	if (address == 0x15) /*FIXED* Address $4015 has different behaviour*/
+	{
+		int readval = 0;
+		if (info->APU.squ0.vbl_length > 0)
+			readval |= 0x01;
+
+		if (info->APU.squ1.vbl_length > 0)
+			readval |= 0x02;
+
+		if (info->APU.tri.vbl_length > 0)
+			readval |= 0x04;
+
+		if (info->APU.noi.vbl_length > 0)
+			readval |= 0x08;
+
+		if (info->APU.dpcm.enabled == TRUE)
+			readval |= 0x10;
+
+		if (info->APU.dpcm.irq_occurred == TRUE)
+			readval |= 0x80;
+
+		return readval;
+	}
+	else
+		return info->APU.regsaddress;
+}
+
+/* WRITE VALUE TO TEMP REGISTRY AND QUEUE EVENT */
+INLINE void apu_write(nesapu_state *info,int address, uint8 value)
+{
+	info->APU.regsaddress=value;
+	//stream_update(info->stream);
+	apu_regwrite(info,address,value);
+}
+
+/* EXTERNAL INTERFACE FUNCTIONS */
+
+/* REGISTER READ/WRITE FUNCTIONS */
+//READ8_DEVICE_HANDLER( nes_psg_r )
+UINT8 nes_psg_r(void* chip, offs_t offset)
+{
+	//return apu_read(get_safe_token(device),offset);
+	return apu_read((nesapu_state*)chip, offset);
+}
+//WRITE8_DEVICE_HANDLER( nes_psg_w )
+void nes_psg_w(void* chip, offs_t offset, UINT8 data)
+{
+	//apu_write(get_safe_token(device),offset,data);
+	apu_write((nesapu_state*)chip, offset, data);
+}
+
+/* UPDATE APU SYSTEM */
+//static STREAM_UPDATE( nes_psg_update_sound )
+void nes_psg_update_sound(void* chip, stream_sample_t **outputs, int samples)
+{
+	//nesapu_state *info = (nesapu_state *)param;
+	nesapu_state *info = (nesapu_state*)chip;
+	//apu_update(info, outputs0, samples);
+	apu_update(info, outputs, samples);
+}
+
+
+/* INITIALIZE APU SYSTEM */
+#define SCREEN_HZ	60
+//static DEVICE_START( nesapu )
+void* device_start_nesapu(int clock, int rate)
+{
+	//const nes_interface *intf = (const nes_interface *)device->baseconfig().static_config();
+	//nesapu_state *info = get_safe_token(device);
+	nesapu_state *info;
+	//int rate = clock / 4;
+	//int i;
+
+//	if (ChipID >= MAX_CHIPS)
+//		return 0;
+	
+	info = (nesapu_state*)malloc(sizeof(nesapu_state));
+	if (info == NULL)
+		return NULL;
+	
+	/* Initialize global variables */
+	//info->samps_per_sync = rate / ATTOSECONDS_TO_HZ(device->machine->primary_screen->frame_period().attoseconds);
+	info->samps_per_sync = rate / SCREEN_HZ;
+	info->buffer_size = info->samps_per_sync;
+	//info->real_rate = info->samps_per_sync * ATTOSECONDS_TO_HZ(device->machine->primary_screen->frame_period().attoseconds);
+	info->real_rate = info->samps_per_sync * SCREEN_HZ;
+	//info->apu_incsize = (float) (device->clock() / (float) info->real_rate);
+	info->apu_incsize = (float) (clock / (float) info->real_rate);
+
+	/* Use initializer calls */
+	create_noise(info->noise_lut, 13, NOISE_LONG);
+	create_vbltimes(info->vbl_times,vbl_length,info->samps_per_sync);
+	create_syncs(info, info->samps_per_sync);
+
+	/* Adjust buffer size if 16 bits */
+	info->buffer_size+=info->samps_per_sync;
+
+	/* Initialize individual chips */
+	//(info->APU.dpcm).memory = cputag_get_address_space(device->machine, intf->cpu_tag, ADDRESS_SPACE_PROGRAM);
+	// no idea how to obtain this
+	info->APU.dpcm.memory = NULL;
+
+	//info->stream = stream_create(device, 0, 1, rate, info, nes_psg_update_sound);
+
+	/* register for save */
+	/*for (i = 0; i < 2; i++)
+	{
+		state_save_register_device_item_array(device, i, info->APU.squi.regs);
+		state_save_register_device_item(device, i, info->APU.squi.vbl_length);
+		state_save_register_device_item(device, i, info->APU.squi.freq);
+		state_save_register_device_item(device, i, info->APU.squi.phaseacc);
+		state_save_register_device_item(device, i, info->APU.squi.output_vol);
+		state_save_register_device_item(device, i, info->APU.squi.env_phase);
+		state_save_register_device_item(device, i, info->APU.squi.sweep_phase);
+		state_save_register_device_item(device, i, info->APU.squi.adder);
+		state_save_register_device_item(device, i, info->APU.squi.env_vol);
+		state_save_register_device_item(device, i, info->APU.squi.enabled);
+	}
+
+	state_save_register_device_item_array(device, 0, info->APU.tri.regs);
+	state_save_register_device_item(device, 0, info->APU.tri.linear_length);
+	state_save_register_device_item(device, 0, info->APU.tri.vbl_length);
+	state_save_register_device_item(device, 0, info->APU.tri.write_latency);
+	state_save_register_device_item(device, 0, info->APU.tri.phaseacc);
+	state_save_register_device_item(device, 0, info->APU.tri.output_vol);
+	state_save_register_device_item(device, 0, info->APU.tri.adder);
+	state_save_register_device_item(device, 0, info->APU.tri.counter_started);
+	state_save_register_device_item(device, 0, info->APU.tri.enabled);
+
+	state_save_register_device_item_array(device, 0, info->APU.noi.regs);
+	state_save_register_device_item(device, 0, info->APU.noi.cur_pos);
+	state_save_register_device_item(device, 0, info->APU.noi.vbl_length);
+	state_save_register_device_item(device, 0, info->APU.noi.phaseacc);
+	state_save_register_device_item(device, 0, info->APU.noi.output_vol);
+	state_save_register_device_item(device, 0, info->APU.noi.env_phase);
+	state_save_register_device_item(device, 0, info->APU.noi.env_vol);
+	state_save_register_device_item(device, 0, info->APU.noi.enabled);
+
+	state_save_register_device_item_array(device, 0, info->APU.dpcm.regs);
+	state_save_register_device_item(device, 0, info->APU.dpcm.address);
+	state_save_register_device_item(device, 0, info->APU.dpcm.length);
+	state_save_register_device_item(device, 0, info->APU.dpcm.bits_left);
+	state_save_register_device_item(device, 0, info->APU.dpcm.phaseacc);
+	state_save_register_device_item(device, 0, info->APU.dpcm.output_vol);
+	state_save_register_device_item(device, 0, info->APU.dpcm.cur_byte);
+	state_save_register_device_item(device, 0, info->APU.dpcm.enabled);
+	state_save_register_device_item(device, 0, info->APU.dpcm.irq_occurred);
+	state_save_register_device_item(device, 0, info->APU.dpcm.vol);
+
+	state_save_register_device_item_array(device, 0, info->APU.regs);
+
+#ifdef USE_QUEUE
+	state_save_register_device_item_array(device, 0, info->APU.queue);
+	state_save_register_device_item(device, 0, info->APU.head);
+	state_save_register_device_item(device, 0, info->APU.tail);
+#else
+	state_save_register_device_item(device, 0, info->APU.buf_pos);
+	state_save_register_device_item(device, 0, info->APU.step_mode);
+#endif
+	*/
+	
+	info->APU.squ0.Muted = 0x00;
+	info->APU.squ1.Muted = 0x00;
+	info->APU.tri.Muted = 0x00;
+	info->APU.noi.Muted = 0x00;
+	info->APU.dpcm.Muted = 0x00;
+	
+	return info;
+}
+
+void device_stop_nesapu(void* chip)
+{
+	nesapu_state *info = (nesapu_state*)chip;
+	
+	info->APU.dpcm.memory = NULL;
+	
+	return;
+}
+
+void device_reset_nesapu(void* chip)
+{
+	nesapu_state *info = (nesapu_state*)chip;
+	const UINT8* MemPtr;
+	UINT8 CurReg;
+	
+	MemPtr = info->APU.dpcm.memory;
+	memset(&info->APU, 0x00, sizeof(apu_t));
+	info->APU.dpcm.memory = MemPtr;
+	apu_dpcmreset(&info->APU.dpcm);
+	
+	for (CurReg = 0x00; CurReg < 0x17; CurReg ++)
+		apu_write(info, CurReg, 0x00);
+	
+	apu_write(info, 0x15, 0x00);
+	apu_write(info, 0x15, 0x0F);
+	
+	return;
+}
+
+void nesapu_set_rom(void* chip, const UINT8* ROMData)
+{
+	nesapu_state *info = (nesapu_state*)chip;
+	info->APU.dpcm.memory = ROMData;
+	
+	return;
+}
+
+void nesapu_set_mute_mask(void* chip, UINT32 MuteMask)
+{
+	nesapu_state *info = (nesapu_state*)chip;
+	
+	info->APU.squ0.Muted = (MuteMask >> 0) & 0x01;
+	info->APU.squ1.Muted = (MuteMask >> 1) & 0x01;
+	info->APU.tri.Muted = (MuteMask >> 2) & 0x01;
+	info->APU.noi.Muted = (MuteMask >> 3) & 0x01;
+	info->APU.dpcm.Muted = (MuteMask >> 4) & 0x01;
+	
+	return;
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( nesapu )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(nesapu_state);			break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( nesapu );			break;
+		case DEVINFO_FCT_STOP:							// Nothing									break;
+		case DEVINFO_FCT_RESET:							// Nothing									break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "N2A03");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Nintendo custom");				break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__); 					break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(NES, nesapu);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_apu.h Added

@@ -0,0 +1,63 @@
+/*****************************************************************************
+
+  MAME/MESS NES APU CORE
+
+  Based on the Nofrendo/Nosefart NES N2A03 sound emulation core written by
+  Matthew Conte (matt@conte.com) and redesigned for use in MAME/MESS by
+  Who Wants to Know? (wwtk@mail.com)
+
+  This core is written with the advise and consent of Matthew Conte and is
+  released under the GNU Public License.  This core is freely avaiable for
+  use in any freeware project, subject to the following terms:
+
+  Any modifications to this code must be duly noted in the source and
+  approved by Matthew Conte and myself prior to public submission.
+
+ *****************************************************************************
+
+   NES_APU.H
+
+   NES APU external interface.
+
+ *****************************************************************************/
+
+#pragma once
+
+#ifndef __NES_APU_H__
+#define __NES_APU_H__
+
+//#include "devlegcy.h"
+
+
+/* AN EXPLANATION
+ *
+ * The NES APU is actually integrated into the Nintendo processor.
+ * You must supply the same number of APUs as you do processors.
+ * Also make sure to correspond the memory regions to those used in the
+ * processor, as each is shared.
+ */
+
+/*typedef struct _nes_interface nes_interface;
+struct _nes_interface
+{
+	const char *cpu_tag;  // CPU tag
+};
+
+READ8_DEVICE_HANDLER( nes_psg_r );
+WRITE8_DEVICE_HANDLER( nes_psg_w );
+
+DECLARE_LEGACY_SOUND_DEVICE(NES, nesapu);*/
+
+UINT8 nes_psg_r(void* chip, offs_t offset);
+void nes_psg_w(void* chip, offs_t offset, UINT8 data);
+
+void nes_psg_update_sound(void* chip, stream_sample_t **outputs, int samples);
+void* device_start_nesapu(int clock, int rate);
+void device_stop_nesapu(void* chip);
+void device_reset_nesapu(void* chip);
+
+void nesapu_set_rom(void* chip, const UINT8* ROMData);
+
+void nesapu_set_mute_mask(void* chip, UINT32 MuteMask);
+
+#endif /* __NES_APU_H__ */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_defs.h Added

@@ -0,0 +1,219 @@
+/*****************************************************************************
+
+  MAME/MESS NES APU CORE
+
+  Based on the Nofrendo/Nosefart NES N2A03 sound emulation core written by
+  Matthew Conte (matt@conte.com) and redesigned for use in MAME/MESS by
+  Who Wants to Know? (wwtk@mail.com)
+
+  This core is written with the advise and consent of Matthew Conte and is
+  released under the GNU Public License.  This core is freely avaiable for
+  use in any freeware project, subject to the following terms:
+
+  Any modifications to this code must be duly noted in the source and
+  approved by Matthew Conte and myself prior to public submission.
+
+ *****************************************************************************
+
+   NES_DEFS.H
+
+   NES APU internal type definitions and constants.
+
+ *****************************************************************************/
+
+#pragma once
+
+#ifndef __NES_DEFS_H__
+#define __NES_DEFS_H__
+
+/* BOOLEAN CONSTANTS */
+#ifndef TRUE
+#define TRUE   1
+#define FALSE  0
+#endif
+
+/* REGULAR TYPE DEFINITIONS */
+typedef INT8          int8;
+typedef INT16         int16;
+typedef INT32         int32;
+typedef UINT8         uint8;
+typedef UINT16        uint16;
+typedef UINT32        uint32;
+typedef UINT8         boolean;
+
+
+/* QUEUE TYPES */
+#ifdef USE_QUEUE
+
+#define QUEUE_SIZE 0x2000
+#define QUEUE_MAX  (QUEUE_SIZE-1)
+
+typedef struct queue_s
+{
+	int pos;
+	unsigned char reg,val;
+} queue_t;
+
+#endif
+
+/* REGISTER DEFINITIONS */
+#define  APU_WRA0    0x00
+#define  APU_WRA1    0x01
+#define  APU_WRA2    0x02
+#define  APU_WRA3    0x03
+#define  APU_WRB0    0x04
+#define  APU_WRB1    0x05
+#define  APU_WRB2    0x06
+#define  APU_WRB3    0x07
+#define  APU_WRC0    0x08
+#define  APU_WRC1    0x09
+#define  APU_WRC2    0x0A
+#define  APU_WRC3    0x0B
+#define  APU_WRD0    0x0C
+#define  APU_WRD2    0x0E
+#define  APU_WRD3    0x0F
+#define  APU_WRE0    0x10
+#define  APU_WRE1    0x11
+#define  APU_WRE2    0x12
+#define  APU_WRE3    0x13
+#define  APU_SMASK   0x15
+#define  APU_IRQCTRL 0x17
+
+#define  NOISE_LONG     0x4000
+#define  NOISE_SHORT    93
+
+/* CHANNEL TYPE DEFINITIONS */
+
+/* Square Wave */
+typedef struct square_s
+{
+	uint8 regs4;
+	int vbl_length;
+	int freq;
+	float phaseacc;
+	float output_vol;
+	float env_phase;
+	float sweep_phase;
+	uint8 adder;
+	uint8 env_vol;
+	boolean enabled;
+	boolean Muted;
+} square_t;
+
+/* Triangle Wave */
+typedef struct triangle_s
+{
+	uint8 regs4; /* regs1 unused */
+	int linear_length;
+	int vbl_length;
+	int write_latency;
+	float phaseacc;
+	float output_vol;
+	uint8 adder;
+	boolean counter_started;
+	boolean enabled;
+	boolean Muted;
+} triangle_t;
+
+/* Noise Wave */
+typedef struct noise_s
+{
+	uint8 regs4; /* regs1 unused */
+	int cur_pos;
+	int vbl_length;
+	float phaseacc;
+	float output_vol;
+	float env_phase;
+	uint8 env_vol;
+	boolean enabled;
+	boolean Muted;
+} noise_t;
+
+/* DPCM Wave */
+typedef struct dpcm_s
+{
+	uint8 regs4;
+	uint32 address;
+	uint32 length;
+	int bits_left;
+	float phaseacc;
+	float output_vol;
+	uint8 cur_byte;
+	boolean enabled;
+	boolean irq_occurred;
+	//address_space *memory;
+	const uint8 *memory;
+	//signed char vol;
+	signed short vol;
+	boolean Muted;
+} dpcm_t;
+
+/* APU type */
+typedef struct apu
+{
+	/* Sound channels */
+	square_t   squ2;
+	triangle_t tri;
+	noise_t    noi;
+	dpcm_t     dpcm;
+
+	/* APU registers */
+	unsigned char regs0x17;
+
+	/* Sound pointers */
+	void *buffer;
+
+#ifdef USE_QUEUE
+
+	/* Event queue */
+	queue_t queueQUEUE_SIZE;
+	int head, tail;
+
+#else
+
+	int buf_pos;
+
+#endif
+
+	int step_mode;
+} apu_t;
+
+/* CONSTANTS */
+
+/* vblank length table used for squares, triangle, noise */
+static const uint8 vbl_length32 =
+{
+   5, 127, 10, 1, 19,  2, 40,  3, 80,  4, 30,  5, 7,  6, 13,  7,
+   6,   8, 12, 9, 24, 10, 48, 11, 96, 12, 36, 13, 8, 14, 16, 15
+};
+
+/* frequency limit of square channels */
+static const int freq_limit8 =
+{
+   //0x3FF, 0x555, 0x666, 0x71C, 0x787, 0x7C1, 0x7E0, 0x7F0,
+   // Fixed, thanks to Delek
+   0x3FF, 0x555, 0x666, 0x71C, 0x787, 0x7C1, 0x7E0, 0x7F2,
+};
+
+/* table of noise frequencies */
+static const int noise_freq16 =
+{
+   //4, 8, 16, 32, 64, 96, 128, 160, 202, 254, 380, 508, 762, 1016, 2034, 2046
+   // Fixed, thanks to Delek
+   4, 8, 16, 32, 64, 96, 128, 160, 202, 254, 380, 508, 762, 1016, 2034, 4068
+};
+
+/* dpcm transfer freqs */
+static const int dpcm_clocks16 =
+{
+   428, 380, 340, 320, 286, 254, 226, 214, 190, 160, 142, 128, 106, 85, 72, 54
+};
+
+/* ratios of pos/neg pulse for square waves */
+/* 2/16 = 12.5%, 4/16 = 25%, 8/16 = 50%, 12/16 = 75% */
+static const int duty_lut4 =
+{
+   2, 4, 8, 12
+};
+
+#endif /* __NES_DEFS_H__ */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.c Added

@@ -0,0 +1,339 @@
+/****************************************************************
+
+ MAME / MESS functions
+
+****************************************************************/
+
+#include "mamedef.h"
+#include <string.h>	// for memset
+#include <stdlib.h>	// for free
+#include <stddef.h>	// for NULL
+#include "../stdbool.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "nes_apu.h"
+#include "np_nes_apu.h"
+#include "np_nes_dmc.h"
+#include "np_nes_fds.h"
+#include "nes_intf.h"
+
+
+#ifdef ENABLE_ALL_CORES
+#define EC_MAME		0x01	// NES core from MAME
+#endif
+#define EC_NSFPLAY	0x00	// NES core from NSFPlay
+// Note: FDS core from NSFPlay is always used
+
+/* for stream system */
+typedef struct _nes_state nes_state;
+struct _nes_state
+{
+	void* chip_apu;
+	void* chip_dmc;
+	void* chip_fds;
+	UINT8* Memory;
+	int EMU_CORE;
+};
+
+void nes_stream_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	nes_state *info = (nes_state *)_info;
+	int CurSmpl;
+	INT32 Buffer4;
+	
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		nes_psg_update_sound(info->chip_apu, outputs, samples);
+		break;
+#endif
+	case EC_NSFPLAY:
+		for (CurSmpl = 0x00; CurSmpl < samples; CurSmpl ++)
+		{
+			NES_APU_np_Render(info->chip_apu, &Buffer0);
+			NES_DMC_np_Render(info->chip_dmc, &Buffer2);
+			outputs0CurSmpl = Buffer0 + Buffer2;
+			outputs1CurSmpl = Buffer1 + Buffer3;
+		}
+		break;
+	}
+	
+	if (info->chip_fds != NULL)
+	{
+		for (CurSmpl = 0x00; CurSmpl < samples; CurSmpl ++)
+		{
+			NES_FDS_Render(info->chip_fds, &Buffer0);
+			outputs0CurSmpl += Buffer0;
+			outputs1CurSmpl += Buffer1;
+		}
+	}
+	
+	return;
+}
+
+static void nes_set_chip_option(nes_state *info, int NesOptions);
+int device_start_nes(void **_info, int EMU_CORE, int clock, int Options, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	nes_state *info;
+	int rate;
+	bool EnableFDS;
+
+#ifdef ENABLE_ALL_CORES
+	if (EMU_CORE >= 0x02)
+		EMU_CORE = EC_NSFPLAY;
+#else
+	EMU_CORE = EC_NSFPLAY;
+#endif
+	
+	EnableFDS = (clock >> 31) & 0x01;
+	clock &= 0x7FFFFFFF;
+	
+	info = (nes_state *) calloc(1, sizeof(nes_state));
+	*_info = (void *) info;
+	
+	info->EMU_CORE = EMU_CORE;
+	rate = clock / 4;
+	if (((CHIP_SAMPLING_MODE & 0x01) && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	
+	switch(EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		info->chip_apu = device_start_nesapu(clock, rate);
+		if (info->chip_apu == NULL)
+			return 0;
+		
+		info->chip_dmc = NULL;
+		info->chip_fds = NULL;
+		
+		info->Memory = (UINT8*)malloc(0x8000);
+		memset(info->Memory, 0x00, 0x8000);
+		nesapu_set_rom(info->chip_apu, info->Memory - 0x8000);
+		break;
+#endif
+	case EC_NSFPLAY:
+		info->chip_apu = NES_APU_np_Create(clock, rate);
+		if (info->chip_apu == NULL)
+			return 0;
+		
+		info->chip_dmc = NES_DMC_np_Create(clock, rate);
+		if (info->chip_dmc == NULL)
+		{
+			NES_APU_np_Destroy(info->chip_apu);
+			info->chip_apu = NULL;
+			return 0;
+		}
+		
+		NES_DMC_np_SetAPU(info->chip_dmc, info->chip_apu);
+		
+		info->Memory = (UINT8*)malloc(0x8000);
+		memset(info->Memory, 0x00, 0x8000);
+		NES_DMC_np_SetMemory(info->chip_dmc, info->Memory - 0x8000);
+		break;
+	}
+	
+	if (EnableFDS)
+	{
+		info->chip_fds = NES_FDS_Create(clock, rate);
+		// If it returns NULL, that's okay.
+	}
+	else
+	{
+		info->chip_fds = NULL;
+	}
+	nes_set_chip_option(info, Options);
+
+	return rate;
+}
+
+void device_stop_nes(void *_info)
+{
+	nes_state *info = (nes_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		device_stop_nesapu(info->chip_apu);
+		break;
+#endif
+	case EC_NSFPLAY:
+		NES_APU_np_Destroy(info->chip_apu);
+		NES_DMC_np_Destroy(info->chip_dmc);
+		break;
+	}
+	if (info->chip_fds != NULL)
+		NES_FDS_Destroy(info->chip_fds);
+	
+	if (info->Memory != NULL)
+	{
+		free(info->Memory);
+		info->Memory = NULL;
+	}
+	info->chip_apu = NULL;
+	info->chip_dmc = NULL;
+	info->chip_fds = NULL;
+
+	free(info);	
+
+	return;
+}
+
+void device_reset_nes(void *_info)
+{
+	nes_state *info = (nes_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		device_reset_nesapu(info->chip_apu);
+		break;
+#endif
+	case EC_NSFPLAY:
+		NES_APU_np_Reset(info->chip_apu);
+		NES_DMC_np_Reset(info->chip_dmc);
+		break;
+	}
+	if (info->chip_fds != NULL)
+		NES_FDS_Reset(info->chip_fds);
+}
+
+
+void nes_w(void *_info, offs_t offset, UINT8 data)
+{
+	nes_state *info = (nes_state *)_info;
+	
+	switch(offset & 0xE0)
+	{
+	case 0x00:	// NES APU
+		switch(info->EMU_CORE)
+		{
+#ifdef ENABLE_ALL_CORES
+		case EC_MAME:
+			nes_psg_w(info->chip_apu, offset, data);
+			break;
+#endif
+		case EC_NSFPLAY:
+			// NES_APU handles the sqaure waves, NES_DMC the rest
+			NES_APU_np_Write(info->chip_apu, 0x4000 | offset, data);
+			NES_DMC_np_Write(info->chip_dmc, 0x4000 | offset, data);
+			break;
+		}
+		break;
+	case 0x20:	// FDS register
+		if (info->chip_fds == NULL)
+			break;
+		if (offset == 0x3F)
+			NES_FDS_Write(info->chip_fds, 0x4023, data);
+		else
+			NES_FDS_Write(info->chip_fds, 0x4080 | (offset & 0x1F), data);
+		break;
+	case 0x40:	// FDS wave RAM
+	case 0x60:
+		if (info->chip_fds == NULL)
+			break;
+		NES_FDS_Write(info->chip_fds, 0x4000 | offset, data);
+		break;
+	}
+}
+
+void nes_write_ram(void *_info, offs_t DataStart, offs_t DataLength, const UINT8* RAMData)
+{
+	nes_state* info = (nes_state *)_info;
+	UINT32 RemainBytes;
+	
+	if (DataStart >= 0x10000)
+		return;
+	
+	if (DataStart < 0x8000)
+	{
+		if (DataStart + DataLength <= 0x8000)
+			return;
+		
+		RemainBytes = 0x8000 - DataStart;
+		DataStart = 0x8000;
+		RAMData += RemainBytes;
+		DataLength -= RemainBytes;
+	}
+	
+	RemainBytes = 0x00;
+	if (DataStart + DataLength > 0x10000)
+	{
+		RemainBytes = DataLength;
+		DataLength = 0x10000 - DataStart;
+		RemainBytes -= DataLength;
+	}
+	memcpy(info->Memory + (DataStart - 0x8000), RAMData, DataLength);
+	if (RemainBytes)
+	{
+		if (RemainBytes > 0x8000)
+			RemainBytes = 0x8000;
+		memcpy(info->Memory, RAMData + DataLength, RemainBytes);
+	}
+	
+	return;
+}
+
+
+static void nes_set_chip_option(nes_state *info, int NesOptions)
+{
+	UINT8 CurOpt;
+	
+	if (NesOptions & 0x8000)
+		return;
+	
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		// no options for MAME's NES core
+		break;
+#endif
+	case EC_NSFPLAY:
+		// shared APU/DMC options
+		for (CurOpt = 0; CurOpt < 2; CurOpt ++)
+		{
+			NES_APU_np_SetOption(info->chip_apu, CurOpt, (NesOptions >> CurOpt) & 0x01);
+			NES_DMC_np_SetOption(info->chip_dmc, CurOpt, (NesOptions >> CurOpt) & 0x01);
+		}
+		// APU-only options
+		for (; CurOpt < 4; CurOpt ++)
+			NES_APU_np_SetOption(info->chip_apu, CurOpt-2+2, (NesOptions >> CurOpt) & 0x01);
+		// DMC-only options
+		for (; CurOpt < 10; CurOpt ++)
+			NES_DMC_np_SetOption(info->chip_dmc, CurOpt-4+2, (NesOptions >> CurOpt) & 0x01);
+		break;
+	}
+	if (info->chip_fds != NULL)
+	{
+		// FDS options
+		// I skip the Cutoff frequency here, since it's not a boolean value.
+		for (CurOpt = 12; CurOpt < 14; CurOpt ++)
+			NES_FDS_SetOption(info->chip_fds, CurOpt-12+1, (NesOptions >> CurOpt) & 0x01);
+	}
+	
+	return;
+}
+
+void nes_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	nes_state *info = (nes_state *)_info;
+	switch(info->EMU_CORE)
+	{
+#ifdef ENABLE_ALL_CORES
+	case EC_MAME:
+		nesapu_set_mute_mask(info->chip_apu, MuteMask);
+		break;
+#endif
+	case EC_NSFPLAY:
+		NES_APU_np_SetMask(info->chip_apu, (MuteMask & 0x03) >> 0);
+		NES_DMC_np_SetMask(info->chip_dmc, (MuteMask & 0x1C) >> 2);
+		break;
+	}
+	if (info->chip_fds != NULL)
+		NES_FDS_SetMask(info->chip_fds, (MuteMask & 0x20) >> 5);
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/nes_intf.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.c Added

@@ -0,0 +1,511 @@
+//
+// NES 2A03
+//
+// Ported from NSFPlay 2.2 to VGMPlay (including C++ -> C conversion)
+// by Valley Bell on 24 September 2013
+// Updated to NSFPlay 2.3 on 26 September 2013
+// (Note: Encoding is UTF-8)
+
+//#include <assert.h>
+#include <stdlib.h>
+#include <string.h>	// for memset()
+#include <stddef.h>	// for NULL
+#include "mamedef.h"
+#include "../stdbool.h"
+#include "np_nes_apu.h"
+
+
+// Master Clock: 21477272 (NTSC)
+// APU Clock = Master Clock / 12
+#define DEFAULT_CLOCK	1789772.0	// not sure if this shouldn't be 1789772,667 instead
+#define DEFAULT_RATE	44100
+
+
+/** Upper half of APU **/
+enum
+{
+	OPT_UNMUTE_ON_RESET=0,
+	OPT_NONLINEAR_MIXER,
+	OPT_PHASE_REFRESH,
+	OPT_DUTY_SWAP,
+	OPT_END
+};
+
+enum
+{
+	SQR0_MASK = 1,
+	SQR1_MASK = 2,
+};
+
+// Note: For increased speed, I'll inline all of NSFPlay's Counter member functions.
+#define COUNTER_SHIFT	24
+
+typedef struct _Counter Counter;
+struct _Counter
+{
+	double ratio;
+	UINT32 val, step;
+};
+#define COUNTER_setcycle(cntr, s)	(cntr).step = (UINT32)((cntr).ratio / (s + 1))
+#define COUNTER_iup(cntr)			(cntr).val += (cntr).step
+#define COUNTER_value(cntr)			((cntr).val >> COUNTER_SHIFT)
+#define COUNTER_init(cntr, clk, rate)							\
+{																\
+	(cntr).ratio = (1 << COUNTER_SHIFT) * (1.0 * clk / rate);	\
+	(cntr).step = (UINT32)((cntr).ratio + 0.5);					\
+	(cntr).val = 0;												\
+}
+
+
+typedef struct _NES_APU NES_APU;
+struct _NES_APU
+{
+	int optionOPT_END;		// 各種オプション
+	int mask;
+	INT32 sm22;
+
+	UINT32 gclock;
+	UINT8 reg0x20;
+	INT32 out2;
+	double rate, clock;
+
+	INT32 square_table32;		// nonlinear mixer
+
+	int scounter2;			// frequency divider
+	int sphase2;				// phase counter
+
+	int duty2;
+	int volume2;
+	int freq2;
+	int sfreq2;
+
+	bool sweep_enable2;
+	bool sweep_mode2;
+	bool sweep_write2;
+	int sweep_div_period2;
+	int sweep_div2;
+	int sweep_amount2;
+
+	bool envelope_disable2;
+	bool envelope_loop2;
+	bool envelope_write2;
+	int envelope_div_period2;
+	int envelope_div2;
+	int envelope_counter2;
+
+	int length_counter2;
+
+	bool enable2;
+
+	Counter tick_count;
+	UINT32 tick_last;
+};
+
+static void sweep_sqr(NES_APU* apu, int ch);	// calculates target sweep frequency
+static INT32 calc_sqr(NES_APU* apu, int ch, UINT32 clocks);
+static void Tick(NES_APU* apu, UINT32 clocks);
+
+
+static void sweep_sqr(NES_APU* apu, int i)
+{
+	int shifted = apu->freqi >> apu->sweep_amounti;
+	if (i == 0 && apu->sweep_modei) shifted += 1;
+	apu->sfreqi = apu->freqi + (apu->sweep_modei ? -shifted : shifted);
+	//DEBUG_OUT("shifted%d = %d (%d >> %d)\n",i,shifted,apu->freqi,apu->sweep_amounti);
+}
+
+void NES_APU_np_FrameSequence(void* chip, int s)
+{
+	NES_APU* apu = (NES_APU*)chip;
+	int i;
+
+	//DEBUG_OUT("FrameSequence(%d)\n",s);
+
+	if (s > 3) return; // no operation in step 4
+
+	// 240hz clock
+	for (i=0; i < 2; ++i)
+	{
+		bool divider = false;
+		if (apu->envelope_writei)
+		{
+			apu->envelope_writei = false;
+			apu->envelope_counteri = 15;
+			apu->envelope_divi = 0;
+		}
+		else
+		{
+			++apu->envelope_divi;
+			if (apu->envelope_divi > apu->envelope_div_periodi)
+			{
+				divider = true;
+				apu->envelope_divi = 0;
+			}
+		}
+		if (divider)
+		{
+			if (apu->envelope_loopi && apu->envelope_counteri == 0)
+				apu->envelope_counteri = 15;
+			else if (apu->envelope_counteri > 0)
+				--apu->envelope_counteri;
+		}
+	}
+
+	// 120hz clock
+	if ((s&1) == 0)
+	 for (i=0; i < 2; ++i)
+	 {
+		if (!apu->envelope_loopi && (apu->length_counteri > 0))
+			--apu->length_counteri;
+
+		if (apu->sweep_enablei)
+		{
+			//DEBUG_OUT("Clock sweep: %d\n", i);
+
+			--apu->sweep_divi;
+			if (apu->sweep_divi <= 0)
+			{
+				sweep_sqr(apu, i);	// calculate new sweep target
+
+				//DEBUG_OUT("sweep_div%d (0/%d)\n",i,apu->sweep_div_periodi);
+				//DEBUG_OUT("freq%d=%d > sfreq%d=%d\n",i,apu->freqi,i,apu->sfreqi);
+
+				if (apu->freqi >= 8 && apu->sfreqi < 0x800 && apu->sweep_amounti > 0) // update frequency if appropriate
+				{
+					apu->freqi = apu->sfreqi < 0 ? 0 : apu->sfreqi;
+					if (apu->scounteri > apu->freqi) apu->scounteri = apu->freqi;
+				}
+				apu->sweep_divi = apu->sweep_div_periodi + 1;
+
+				//DEBUG_OUT("freq%d=%d\n",i,apu->freqi);
+			}
+
+			if (apu->sweep_writei)
+			{
+				apu->sweep_divi = apu->sweep_div_periodi + 1;
+				apu->sweep_writei = false;
+			}
+		}
+	 }
+
+}
+
+static INT32 calc_sqr(NES_APU* apu, int i, UINT32 clocks)
+{
+	static const INT16 sqrtbl416 = {
+		{0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+		{0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+		{0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0},
+		{1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}
+	};
+	INT32 ret = 0;
+
+	apu->scounteri += clocks;
+	while (apu->scounteri > apu->freqi)
+	{
+		apu->sphasei = (apu->sphasei + 1) & 15;
+		apu->scounteri -= (apu->freqi + 1);
+	}
+
+	//INT32 ret = 0;
+	if (apu->length_counteri > 0 &&
+		apu->freqi >= 8 &&
+		apu->sfreqi < 0x800
+		)
+	{
+		int v = apu->envelope_disablei ? apu->volumei : apu->envelope_counteri;
+		ret = sqrtblapu->dutyiapu->sphasei ? v : 0;
+	}
+	
+	return ret;
+}
+
+bool NES_APU_np_Read(void* chip, UINT32 adr, UINT32* val)
+{
+	NES_APU* apu = (NES_APU*)chip;
+
+	if (0x4000 <= adr && adr < 0x4008)
+	{
+		*val |= apu->regadr&0x7;
+		return true;
+	}
+	else if(adr==0x4015)
+	{
+		*val |= (apu->length_counter1?2:0)|(apu->length_counter0?1:0);
+		return true;
+	}
+	else
+		return false;
+}
+
+static void Tick(NES_APU* apu, UINT32 clocks)
+{
+	apu->out0 = calc_sqr(apu, 0, clocks);
+	apu->out1 = calc_sqr(apu, 1, clocks);
+}
+
+// 生成される波形の振幅は0-8191
+UINT32 NES_APU_np_Render(void* chip, INT32 b2)
+{
+	NES_APU* apu = (NES_APU*)chip;
+	INT32 m2;
+
+	COUNTER_iup(apu->tick_count);
+	Tick(apu, (COUNTER_value(apu->tick_count) - apu->tick_last) & 0xFF);
+	apu->tick_last = COUNTER_value(apu->tick_count);
+
+	apu->out0 = (apu->mask & 1) ? 0 : apu->out0;
+	apu->out1 = (apu->mask & 2) ? 0 : apu->out1;
+
+	if(apu->optionOPT_NONLINEAR_MIXER)
+	{
+		INT32 voltage;
+		INT32 ref;
+		
+		voltage = apu->square_tableapu->out0 + apu->out1;
+		m0 = apu->out0 << 6;
+		m1 = apu->out1 << 6;
+		ref = m0 + m1;
+		if (ref > 0)
+		{
+			m0 = (m0 * voltage) / ref;
+			m1 = (m1 * voltage) / ref;
+		}
+		else
+		{
+			m0 = voltage;
+			m1 = voltage;
+		}
+	}
+	else
+	{
+		m0 = apu->out0 << 6;
+		m1 = apu->out1 << 6;
+	}
+
+	// Shifting is (x-2) to match the volume of MAME's NES APU sound core
+	b0 = m0 * apu->sm00;
+	b0 += m1 * apu->sm01;
+	b0 >>= 7-2;	// was 7, but is now 8 for bipolar square
+
+	b1 = m0 * apu->sm10;
+	b1 += m1 * apu->sm11;
+	b1 >>= 7-2;	// see above
+
+	return 2;
+}
+
+void* NES_APU_np_Create(int clock, int rate)
+{
+	NES_APU* apu;
+	int i, c, t;
+
+	apu = (NES_APU*)malloc(sizeof(NES_APU));
+	if (apu == NULL)
+		return NULL;
+	memset(apu, 0x00, sizeof(NES_APU));
+
+	//NES_APU_np_SetClock(apu, DEFAULT_CLOCK);
+	//NES_APU_np_SetRate(apu, DEFAULT_RATE);
+	NES_APU_np_SetClock(apu, clock);
+	NES_APU_np_SetRate(apu, rate);
+	apu->optionOPT_UNMUTE_ON_RESET = true;
+	apu->optionOPT_PHASE_REFRESH = true;
+	apu->optionOPT_NONLINEAR_MIXER = true;
+	apu->optionOPT_DUTY_SWAP = false;
+
+	apu->square_table0 = 0;
+	for(i=1;i<32;i++) 
+		apu->square_tablei=(INT32)((8192.0*95.88)/(8128.0/i+100));
+
+	for(c=0;c<2;++c)
+		for(t=0;t<2;++t)
+			apu->smct = 128;
+
+	return apu;
+}
+
+void NES_APU_np_Destroy(void* chip)
+{
+	free(chip);
+}
+
+void NES_APU_np_Reset(void* chip)
+{
+	NES_APU* apu = (NES_APU*)chip;
+	int i;
+	apu->gclock = 0;
+	apu->mask = 0;
+
+	apu->scounter0 = 0;
+	apu->scounter1 = 0;
+	apu->sphase0 = 0;
+	apu->sphase0 = 0;
+
+	apu->sweep_div0 = 1;
+	apu->sweep_div1 = 1;
+	apu->envelope_div0 = 0;
+	apu->envelope_div1 = 0;
+	apu->length_counter0 = 0;
+	apu->length_counter1 = 0;
+	apu->envelope_counter0 = 0;
+	apu->envelope_counter1 = 0;
+
+	for (i = 0x4000; i < 0x4008; i++)
+		NES_APU_np_Write(apu, i, 0);
+
+	NES_APU_np_Write(apu, 0x4015, 0);
+	if (apu->optionOPT_UNMUTE_ON_RESET)
+		NES_APU_np_Write(apu, 0x4015, 0x0f);
+
+	for (i = 0; i < 2; i++)
+		apu->outi = 0;
+
+	NES_APU_np_SetRate(apu, apu->rate);
+}
+
+void NES_APU_np_SetOption(void* chip, int id, int val)
+{
+	NES_APU* apu = (NES_APU*)chip;
+
+	if(id<OPT_END) apu->optionid = val;
+}
+
+void NES_APU_np_SetClock(void* chip, double c)
+{
+	NES_APU* apu = (NES_APU*)chip;
+
+	apu->clock = c;
+}
+
+void NES_APU_np_SetRate(void* chip, double r)
+{
+	NES_APU* apu = (NES_APU*)chip;
+
+	apu->rate = r ? r : DEFAULT_RATE;
+
+	COUNTER_init(apu->tick_count, apu->clock, apu->rate);
+	apu->tick_last = 0;
+}
+
+void NES_APU_np_SetMask(void* chip, int m)
+{
+	NES_APU* apu = (NES_APU*)chip;
+	apu->mask = m;
+}
+
+void NES_APU_np_SetStereoMix(void* chip, int trk, INT16 mixl, INT16 mixr)
+{
+	NES_APU* apu = (NES_APU*)chip;
+
+	if (trk < 0) return;
+	if (trk > 1) return;
+	apu->sm0trk = mixl;
+	apu->sm1trk = mixr;
+}
+
+bool NES_APU_np_Write(void* chip, UINT32 adr, UINT32 val)
+{
+	NES_APU* apu = (NES_APU*)chip;
+	int ch;
+
+	static const UINT8 length_table32 = {
+		0x0A, 0xFE,
+		0x14, 0x02,
+		0x28, 0x04,
+		0x50, 0x06,
+		0xA0, 0x08,
+		0x3C, 0x0A,
+		0x0E, 0x0C,
+		0x1A, 0x0E,
+		0x0C, 0x10,
+		0x18, 0x12,
+		0x30, 0x14,
+		0x60, 0x16,
+		0xC0, 0x18,
+		0x48, 0x1A,
+		0x10, 0x1C,
+		0x20, 0x1E
+	};
+
+	if (0x4000 <= adr && adr < 0x4008)
+	{
+		//DEBUG_OUT("$%04X = %02X\n",adr,val);
+
+		adr &= 0xf;
+		ch = adr >> 2;
+		switch (adr)
+		{
+		case 0x0:
+		case 0x4:
+			apu->volumech = val & 15;
+			apu->envelope_disablech = (val >> 4) & 1;
+			apu->envelope_loopch = (val >> 5) & 1;
+			apu->envelope_div_periodch = (val & 15);
+			apu->dutych = (val >> 6) & 3;
+			if (apu->optionOPT_DUTY_SWAP)
+			{
+				if (apu->dutych == 1) apu->dutych = 2;
+				else if (apu->dutych == 2) apu->dutych = 1;
+			}
+			break;
+
+		case 0x1:
+		case 0x5:
+			apu->sweep_enablech = (val >> 7) & 1;
+			apu->sweep_div_periodch = (((val >> 4) & 7));
+			apu->sweep_modech = (val >> 3) & 1;
+			apu->sweep_amountch = val & 7;
+			apu->sweep_writech = true;
+			sweep_sqr(apu, ch);
+			break;
+
+		case 0x2:
+		case 0x6:
+			apu->freqch = val | (apu->freqch & 0x700) ;
+			sweep_sqr(apu, ch);
+			if (apu->scounterch > apu->freqch) apu->scounterch = apu->freqch;
+			break;
+
+		case 0x3: 
+		case 0x7:
+			apu->freqch = (apu->freqch & 0xFF) | ((val & 0x7) << 8) ;
+
+			if (apu->optionOPT_PHASE_REFRESH)
+				apu->sphasech = 0;
+			apu->envelope_writech = true;
+			if (apu->enablech)
+			{
+				apu->length_counterch = length_table(val >> 3) & 0x1f;
+			}
+			sweep_sqr(apu, ch);
+			if (apu->scounterch > apu->freqch) apu->scounterch = apu->freqch;
+			break;
+
+		default:
+			return false;
+		}
+		apu->regadr = val;
+		return true;
+	}
+	else if (adr == 0x4015)
+	{
+		apu->enable0 = (val & 1) ? true : false;
+		apu->enable1 = (val & 2) ? true : false;
+
+		if (!apu->enable0)
+			apu->length_counter0 = 0;
+		if (!apu->enable1)
+			apu->length_counter1 = 0;
+
+		apu->regadr-0x4000 = val;
+		return true;
+	}
+
+	// 4017 is handled in np_nes_dmc.c
+	//else if (adr == 0x4017)
+	//{
+	//}
+
+	return false;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_apu.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.c Added

@@ -0,0 +1,872 @@
+// Ported from NSFPlay to VGMPlay (including C++ -> C conversion)
+// by Valley Bell on 25 September 2013
+// Updated to NSFPlay 2.3 on 26 September 2013
+// (Note: Encoding is UTF-8)
+
+#include <stdlib.h>	// for rand()
+#include <string.h>	// for memset()
+#include <stddef.h>	// for NULL
+#include "mamedef.h"
+#include "../stdbool.h"
+#include "np_nes_apu.h"	// for NES_APU_np_FrameSequence
+#include "np_nes_dmc.h"
+
+
+// Master Clock: 21477272 (NTSC)
+// APU Clock = Master Clock / 12
+#define DEFAULT_CLOCK	1789772.0
+#define DEFAULT_CLK_PAL	1662607
+#define DEFAULT_RATE	44100
+
+
+/** Bottom Half of APU **/
+enum
+{
+	OPT_UNMUTE_ON_RESET=0,
+	OPT_NONLINEAR_MIXER,
+	OPT_ENABLE_4011,
+	OPT_ENABLE_PNOISE,
+	OPT_DPCM_ANTI_CLICK,
+	OPT_RANDOMIZE_NOISE,
+	OPT_TRI_MUTE,
+	OPT_TRI_NULL,
+	OPT_END
+};
+
+
+// Note: For increased speed, I'll inline all of NSFPlay's Counter member functions.
+#define COUNTER_SHIFT	24
+
+typedef struct _Counter Counter;
+struct _Counter
+{
+	double ratio;
+	UINT32 val, step;
+};
+#define COUNTER_setcycle(cntr, s)	(cntr).step = (UINT32)((cntr).ratio / (s + 1))
+#define COUNTER_iup(cntr)			(cntr).val += (cntr).step
+#define COUNTER_value(cntr)			((cntr).val >> COUNTER_SHIFT)
+#define COUNTER_init(cntr, clk, rate)							\
+{																\
+	(cntr).ratio = (1 << COUNTER_SHIFT) * (1.0 * clk / rate);	\
+	(cntr).step = (UINT32)((cntr).ratio + 0.5);					\
+	(cntr).val = 0;												\
+}
+
+
+typedef struct _NES_DMC NES_DMC;
+struct _NES_DMC
+{
+	//const int GETA_BITS;
+	//static const UINT32 freq_table216;
+	//static const UINT32 wavlen_table216;
+	UINT32 tnd_table21616128;
+
+	int optionOPT_END;
+	int mask;
+	INT32 sm23;
+	UINT8 reg0x10;
+	UINT32 len_reg;
+	UINT32 adr_reg;
+	//IDevice *memory;
+	const UINT8* memory;
+	UINT32 out3;
+	UINT32 daddress;
+	UINT32 length;
+	UINT32 data;
+	INT16 damp;
+	int dac_lsb;
+	bool dmc_pop;
+	INT32 dmc_pop_offset;
+	INT32 dmc_pop_follow;
+	UINT32 clock;
+	UINT32 rate;
+	int pal;
+	int mode;
+	bool irq;
+	bool active;
+
+	UINT32 counter3;	// frequency dividers
+	int tphase;			// triangle phase
+	UINT32 nfreq;		// noise frequency
+	UINT32 dfreq;		// DPCM frequency
+
+	UINT32 tri_freq;
+	int linear_counter;
+	int linear_counter_reload;
+	bool linear_counter_halt;
+	bool linear_counter_control;
+
+	int noise_volume;
+	UINT32 noise, noise_tap;
+
+	// noise envelope
+	bool envelope_loop;
+	bool envelope_disable;
+	bool envelope_write;
+	int envelope_div_period;
+	int envelope_div;
+	int envelope_counter;
+
+	bool enable3;
+	int length_counter2;	// 0=tri, 1=noise
+
+	// frame sequencer
+	void* apu;	// apu is clocked by DMC's frame sequencer
+	int frame_sequence_count;	// current cycle count
+	int frame_sequence_length;	// CPU cycles per FrameSequence
+	int frame_sequence_step;	// current step of frame sequence
+	int frame_sequence_steps;	// 4/5 steps per frame
+	bool frame_irq;
+	bool frame_irq_enable;
+
+	Counter tick_count;
+	UINT32 tick_last;
+};
+
+INLINE UINT32 calc_tri(NES_DMC* dmc, UINT32 clocks);
+INLINE UINT32 calc_dmc(NES_DMC* dmc, UINT32 clocks);
+INLINE UINT32 calc_noise(NES_DMC* dmc, UINT32 clocks);
+static void FrameSequence(NES_DMC* dmc, int s);
+static void TickFrameSequence(NES_DMC* dmc, UINT32 clocks);
+static void Tick(NES_DMC* dmc, UINT32 clocks);
+
+#define GETA_BITS	20
+static const UINT32 wavlen_table216 = {
+{	// NTSC
+	4, 8, 16, 32, 64, 96, 128, 160, 202, 254, 380, 508, 762, 1016, 2034, 4068
+},
+{	// PAL
+	4, 8, 14, 30, 60, 88, 118, 148, 188, 236, 354, 472, 708, 944, 1890, 3778
+}};
+
+static const UINT32 freq_table216 = {
+{	// NTSC
+	428, 380, 340, 320, 286, 254, 226, 214, 190, 160, 142, 128, 106, 84, 72, 54
+},
+{	// PAL
+	398, 354, 316, 298, 276, 236, 210, 198, 176, 148, 132, 118, 98, 78, 66, 50
+}};
+
+void* NES_DMC_np_Create(int clock, int rate)
+{
+	NES_DMC* dmc;
+	int c, t;
+
+	dmc = (NES_DMC*)malloc(sizeof(NES_DMC));
+	if (dmc == NULL)
+		return NULL;
+	memset(dmc, 0x00, sizeof(NES_DMC));
+
+	//NES_DMC_np_SetClock(dmc, DEFAULT_CLOCK);
+	//NES_DMC_np_SetRate(dmc, DEFAULT_RATE);
+	//NES_DMC_np_SetPal(dmc, false);
+	NES_DMC_np_SetClock(dmc, clock);	// does SetPal, too
+	NES_DMC_np_SetRate(dmc, rate);
+	dmc->optionOPT_ENABLE_4011 = 1;
+	dmc->optionOPT_ENABLE_PNOISE = 1;
+	dmc->optionOPT_UNMUTE_ON_RESET = 1;
+	dmc->optionOPT_DPCM_ANTI_CLICK = 0;
+	dmc->optionOPT_NONLINEAR_MIXER = 1;
+	dmc->optionOPT_RANDOMIZE_NOISE = 1;
+	dmc->optionOPT_TRI_MUTE = 1;
+	dmc->tnd_table0000 = 0;
+	dmc->tnd_table1000 = 0;
+
+	dmc->apu = NULL;
+	dmc->frame_sequence_count = 0;
+	dmc->frame_sequence_length = 7458;
+	dmc->frame_sequence_steps = 4;
+
+	for(c=0;c<2;++c)
+		for(t=0;t<3;++t)
+			dmc->smct = 128;
+
+	return dmc;
+}
+
+
+void NES_DMC_np_Destroy(void* chip)
+{
+	free(chip);
+}
+
+int NES_DMC_np_GetDamp(void* chip)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	return (dmc->damp<<1)|dmc->dac_lsb;
+}
+
+void NES_DMC_np_SetMask(void* chip, int m)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	dmc->mask = m;
+}
+
+void NES_DMC_np_SetStereoMix(void* chip, int trk, INT16 mixl, INT16 mixr)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	if (trk < 0) return;
+	if (trk > 2) return;
+	dmc->sm0trk = mixl;
+	dmc->sm1trk = mixr;
+}
+
+static void FrameSequence(NES_DMC* dmc, int s)
+{
+	//DEBUG_OUT("FrameSequence: %d\n",s);
+
+	if (s > 3) return;	// no operation in step 4
+
+	if (dmc->apu != NULL)
+	{
+		NES_APU_np_FrameSequence(dmc->apu, s);
+	}
+
+	if (s == 0 && (dmc->frame_sequence_steps == 4))
+	{
+		dmc->frame_irq = true;
+	}
+
+	// 240hz clock
+	{
+		bool divider = false;
+		
+		// triangle linear counter
+		if (dmc->linear_counter_halt)
+		{
+			dmc->linear_counter = dmc->linear_counter_reload;
+		}
+		else
+		{
+			if (dmc->linear_counter > 0) --dmc->linear_counter;
+		}
+		if (!dmc->linear_counter_control)
+		{
+			dmc->linear_counter_halt = false;
+		}
+
+		// noise envelope
+		//bool divider = false;
+		if (dmc->envelope_write)
+		{
+			dmc->envelope_write = false;
+			dmc->envelope_counter = 15;
+			dmc->envelope_div = 0;
+		}
+		else
+		{
+			++dmc->envelope_div;
+			if (dmc->envelope_div > dmc->envelope_div_period)
+			{
+				divider = true;
+				dmc->envelope_div = 0;
+			}
+		}
+		if (divider)
+		{
+			if (dmc->envelope_loop && dmc->envelope_counter == 0)
+				dmc->envelope_counter = 15;
+			else if (dmc->envelope_counter > 0)
+				--dmc->envelope_counter;	// TODO: Make this work.
+		}
+	}
+
+	// 120hz clock
+	if ((s&1) == 0)
+	{
+		// triangle length counter
+		if (!dmc->linear_counter_control && (dmc->length_counter0 > 0))
+			--dmc->length_counter0;
+
+		// noise length counter
+		if (!dmc->envelope_loop && (dmc->length_counter1 > 0))
+			--dmc->length_counter1;
+	}
+
+}
+
+// 三角波チャンネルの計算 戻り値は0-15
+UINT32 calc_tri(NES_DMC* dmc, UINT32 clocks)
+{
+	static UINT32 tritbl32 = 
+	{
+	 0, 1, 2, 3, 4, 5, 6, 7,
+	 8, 9,10,11,12,13,14,15,
+	 15,14,13,12,11,10, 9, 8,
+	 7, 6, 5, 4, 3, 2, 1, 0
+	};
+
+	if (dmc->linear_counter > 0 && dmc->length_counter0 > 0
+		&& (!dmc->optionOPT_TRI_MUTE || dmc->tri_freq > 0))
+	{
+		dmc->counter0 += clocks;
+		while (dmc->counter0 > dmc->tri_freq)
+		{
+			dmc->tphase = (dmc->tphase + 1) & 31;
+			dmc->counter0 -= (dmc->tri_freq + 1);
+		}
+	}
+	// Note: else-block added by VB
+	else if (dmc->optionOPT_TRI_NULL)
+	{
+		if (dmc->tphase && dmc->tphase < 31)
+		{
+			// Finish the Triangle wave to prevent clicks.
+			dmc->counter0 += clocks;
+			while(dmc->counter0 > dmc->tri_freq && dmc->tphase)
+			{
+				dmc->tphase = (dmc->tphase + 1) & 31;
+				dmc->counter0 -= (dmc->tri_freq + 1);
+			}
+		}
+	}
+
+	//UINT32 ret = tritbltphase;
+	//return ret;
+	return tritbldmc->tphase;
+}
+
+// ノイズチャンネルの計算 戻り値は0-127
+// 低サンプリングレートで合成するとエイリアスノイズが激しいので
+// ノイズだけはこの関数内で高クロック合成し、簡易なサンプリングレート
+// 変換を行っている。
+UINT32 calc_noise(NES_DMC* dmc, UINT32 clocks)
+{
+	UINT32 env, last, count, accum, clocks_accum;
+	
+	env = dmc->envelope_disable ? dmc->noise_volume : dmc->envelope_counter;
+	if (dmc->length_counter1 < 1) env = 0;
+
+	last = (dmc->noise & 0x4000) ? env : 0;
+	if (clocks < 1) return last;
+
+	// simple anti-aliasing (noise requires it, even when oversampling is off)
+	count = 0;
+	accum = 0;
+
+	dmc->counter1 += clocks;
+//	assert(dmc->nfreq > 0);	// prevent infinite loop
+	if (dmc->nfreq <= 0)	// prevent infinite loop -VB
+		return last;
+	while (dmc->counter1 >= dmc->nfreq)
+	{
+		// tick the noise generator
+		UINT32 feedback = (dmc->noise&1) ^ ((dmc->noise&dmc->noise_tap)?1:0);
+		dmc->noise = (dmc->noise>>1) | (feedback<<14);
+
+		++count;
+		accum += last;
+		last = (dmc->noise & 0x4000) ? env : 0;
+
+		dmc->counter1 -= dmc->nfreq;
+	}
+
+	if (count < 1) // no change over interval, don't anti-alias
+	{
+		return last;
+	}
+
+	clocks_accum = clocks - dmc->counter1;
+	// count = number of samples in accum
+	// counter1 = number of clocks since last sample
+
+	accum = (accum * clocks_accum) + (last * dmc->counter1 * count);
+	// note accum as an average is already premultiplied by count
+
+	return accum / (clocks * count);
+}
+
+// DMCチャンネルの計算 戻り値は0-127
+UINT32 calc_dmc(NES_DMC* dmc, UINT32 clocks)
+{
+	dmc->counter2 += clocks;
+//	assert(dmc->dfreq > 0);	// prevent infinite loop
+	if (dmc->dfreq <= 0)	// prevent infinite loop -VB
+		return (dmc->damp<<1) + dmc->dac_lsb;
+	while (dmc->counter2 >= dmc->dfreq)
+	{
+		if ( dmc->data != 0x100 )	// data = 0x100 は EMPTY を意味する。
+		{
+			if ((dmc->data & 1) && (dmc->damp < 63))
+				dmc->damp++;
+			else if (!(dmc->data & 1) && (0 < dmc->damp))
+				dmc->damp--;
+			dmc->data >>=1;
+		}
+
+		if ( dmc->data == 0x100 && dmc->active )
+		{
+			//dmc->memory->Read(dmc->daddress, dmc->data);
+			dmc->data = dmc->memorydmc->daddress;
+			dmc->data |= (dmc->data&0xFF)|0x10000;	// 8bitシフトで 0x100 になる
+			if ( dmc->length > 0 ) 
+			{
+				dmc->daddress = ((dmc->daddress+1)&0xFFFF)|0x8000 ;
+				dmc->length --;
+			}
+		}
+		
+		if ( dmc->length == 0 )	// 最後のフェッチが終了したら(再生完了より前に)即座に終端処理
+		{
+			if (dmc->mode & 1)
+			{
+				dmc->daddress = ((dmc->adr_reg<<6)|0xC000);
+				dmc->length = (dmc->len_reg<<4)+1;
+			}
+			else
+			{
+				dmc->irq = (dmc->mode==2&&dmc->active)?1:0;	// 直前がactiveだったときはIRQ発行
+				dmc->active = false;
+			}
+		}
+
+		dmc->counter2 -= dmc->dfreq;
+	}
+
+	return (dmc->damp<<1) + dmc->dac_lsb;
+}
+
+static void TickFrameSequence(NES_DMC* dmc, UINT32 clocks)
+{
+	dmc->frame_sequence_count += clocks;
+	while (dmc->frame_sequence_count > dmc->frame_sequence_length)
+	{
+		FrameSequence(dmc, dmc->frame_sequence_step);
+		dmc->frame_sequence_count -= dmc->frame_sequence_length;
+		++dmc->frame_sequence_step;
+		if(dmc->frame_sequence_step >= dmc->frame_sequence_steps)
+			dmc->frame_sequence_step = 0;
+	}
+}
+
+static void Tick(NES_DMC* dmc, UINT32 clocks)
+{
+	dmc->out0 = calc_tri(dmc, clocks);
+	dmc->out1 = calc_noise(dmc, clocks);
+	dmc->out2 = calc_dmc(dmc, clocks);
+}
+
+UINT32 NES_DMC_np_Render(void* chip, INT32 b2)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+	UINT32 clocks;
+	INT32 m3;
+
+	COUNTER_iup(dmc->tick_count);	// increase counter (overflows after 255)
+	clocks = (COUNTER_value(dmc->tick_count) - dmc->tick_last) & 0xFF;
+	TickFrameSequence(dmc, clocks);
+	Tick(dmc, clocks);
+	dmc->tick_last = COUNTER_value(dmc->tick_count);
+
+	dmc->out0 = (dmc->mask & 1) ? 0 : dmc->out0;
+	dmc->out1 = (dmc->mask & 2) ? 0 : dmc->out1;
+	dmc->out2 = (dmc->mask & 4) ? 0 : dmc->out2;
+
+	m0 = dmc->tnd_table0dmc->out000;
+	m1 = dmc->tnd_table00dmc->out10;
+	m2 = dmc->tnd_table000dmc->out2;
+
+	if (dmc->optionOPT_NONLINEAR_MIXER)
+	{
+		INT32 ref = m0 + m1 + m2;
+		INT32 voltage = dmc->tnd_table1dmc->out0dmc->out1dmc->out2;
+		int i;
+		if (ref)
+		{
+			for (i=0; i < 3; ++i)
+				mi = (mi * voltage) / ref;
+		}
+		else
+		{
+			for (i=0; i < 3; ++i)
+				mi = voltage;
+		}
+	}
+
+	// anti-click nullifies any 4011 write but preserves nonlinearity
+	if (dmc->optionOPT_DPCM_ANTI_CLICK)
+	{
+		if (dmc->dmc_pop) // $4011 will cause pop this frame
+		{
+			// adjust offset to counteract pop
+			dmc->dmc_pop_offset += dmc->dmc_pop_follow - m2;
+			dmc->dmc_pop = false;
+
+			// prevent overflow, keep headspace at edges
+			//const INT32 OFFSET_MAX = (1 << 30) - (4 << 16);
+#define OFFSET_MAX	((1 << 30) - (4 << 16))
+			if (dmc->dmc_pop_offset > OFFSET_MAX) dmc->dmc_pop_offset = OFFSET_MAX;
+			if (dmc->dmc_pop_offset < -OFFSET_MAX) dmc->dmc_pop_offset = -OFFSET_MAX;
+		}
+		dmc->dmc_pop_follow = m2; // remember previous position
+
+		m2 += dmc->dmc_pop_offset; // apply offset
+
+		// TODO implement this in a better way
+		// roll off offset (not ideal, but prevents overflow)
+		if (dmc->dmc_pop_offset > 0) --dmc->dmc_pop_offset;
+		else if (dmc->dmc_pop_offset < 0) ++dmc->dmc_pop_offset;
+	}
+
+	b0 = m0 * dmc->sm00;
+	b0 += m1 * dmc->sm01;
+	b0 +=-m2 * dmc->sm02;
+	b0 >>= 7-2;
+
+	b1 = m0 * dmc->sm10;
+	b1 += m1 * dmc->sm11;
+	b1 +=-m2 * dmc->sm12;
+	b1 >>= 7-2;
+
+	return 2;
+}
+
+
+void NES_DMC_np_SetClock(void* chip, double c)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	dmc->clock = (UINT32)(c);
+	
+	/* abs not needed, values are unsigned */
+	if (/*abs*/(dmc->clock - DEFAULT_CLK_PAL) <= 1000)	// check for approximately DEFAULT_CLK_PAL
+		NES_DMC_np_SetPal(dmc, true);
+	else
+		NES_DMC_np_SetPal(dmc, false);
+}
+
+void NES_DMC_np_SetRate(void* chip, double r)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	dmc->rate = (UINT32)(r?r:DEFAULT_RATE);
+
+	COUNTER_init(dmc->tick_count, dmc->clock, dmc->rate);
+	dmc->tick_last = 0;
+}
+
+void NES_DMC_np_SetPal(void* chip, bool is_pal)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	dmc->pal = (is_pal ? 1 : 0);
+	// set CPU cycles in frame_sequence
+	dmc->frame_sequence_length = is_pal ? 8314 : 7458;
+}
+
+void NES_DMC_np_SetAPU(void* chip, void* apu_)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	dmc->apu = apu_;
+}
+
+// Initializing TRI, NOISE, DPCM mixing table
+static void InitializeTNDTable(NES_DMC* dmc, double wt, double wn, double wd)
+{
+	// volume adjusted by 0.75 based on empirical measurements
+	const double MASTER = 8192.0 * 0.75;
+	// truthfully, the nonlinear curve does not appear to match well
+	// with my tests, triangle in particular seems too quiet relatively.
+	// do more testing of the APU/DMC DAC later
+
+	int t, n, d;
+
+	{	// Linear Mixer
+		for(t=0; t<16 ; t++) {
+			for(n=0; n<16; n++) {
+				for(d=0; d<128; d++) {
+						dmc->tnd_table0tnd = (UINT32)(MASTER*(3.0*t+2.0*n+d)/208.0);
+				}
+			}
+		}
+	}
+	{	// Non-Linear Mixer
+		dmc->tnd_table1000 = 0;
+		for(t=0; t<16 ; t++) {
+			for(n=0; n<16; n++) {
+				for(d=0; d<128; d++) {
+					if(t!=0||n!=0||d!=0)
+						dmc->tnd_table1tnd = (UINT32)((MASTER*159.79)/(100.0+1.0/((double)t/wt+(double)n/wn+(double)d/wd)));
+				}
+			}
+		}
+	}
+
+}
+
+void NES_DMC_np_Reset(void* chip)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+	int i;
+	dmc->mask = 0;
+
+	InitializeTNDTable(dmc,8227,12241,22638);
+
+	dmc->counter0 = 0;
+	dmc->counter1 = 0;
+	dmc->counter2 = 0;
+	dmc->tphase = 0;
+	dmc->nfreq = wavlen_table00;
+	dmc->dfreq = freq_table00;
+
+	dmc->envelope_div = 0;
+	dmc->length_counter0 = 0;
+	dmc->length_counter1 = 0;
+	dmc->linear_counter = 0;
+	dmc->envelope_counter = 0;
+
+	dmc->frame_irq = false;
+	dmc->frame_irq_enable = false;
+	dmc->frame_sequence_count = 0;
+	dmc->frame_sequence_steps = 4;
+	dmc->frame_sequence_step = 0;
+
+	for (i = 0; i < 0x10; i++)
+		NES_DMC_np_Write(dmc, 0x4008 + i, 0);
+
+	dmc->irq = false;
+	NES_DMC_np_Write(dmc, 0x4015, 0x00);
+	if (dmc->optionOPT_UNMUTE_ON_RESET)
+		NES_DMC_np_Write(dmc, 0x4015, 0x0f);
+
+	dmc->out0 = dmc->out1 = dmc->out2 = 0;
+	dmc->tri_freq = 0;
+	dmc->damp = 0;
+	dmc->dmc_pop = false;
+	dmc->dmc_pop_offset = 0;
+	dmc->dmc_pop_follow = 0;
+	dmc->dac_lsb = 0;
+	dmc->data = 0x100;
+	dmc->adr_reg = 0;
+	dmc->active = false;
+	dmc->length = 0;
+	dmc->len_reg = 0;
+	dmc->daddress = 0;
+	dmc->noise = 1;
+	dmc->noise_tap = (1<<1);
+	if (dmc->optionOPT_RANDOMIZE_NOISE)
+	{
+		dmc->noise |= rand();
+	}
+
+	NES_DMC_np_SetRate(dmc, dmc->rate);
+}
+
+void NES_DMC_np_SetMemory(void* chip, const UINT8* r)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	dmc->memory = r;
+}
+
+void NES_DMC_np_SetOption(void* chip, int id, int val)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	if(id<OPT_END)
+	{
+		dmc->optionid = val;
+		if(id==OPT_NONLINEAR_MIXER)
+			InitializeTNDTable(dmc, 8227,12241,22638);
+	}
+}
+
+bool NES_DMC_np_Write(void* chip, UINT32 adr, UINT32 val)
+{
+	static const UINT8 length_table32 = {
+		0x0A, 0xFE,
+		0x14, 0x02,
+		0x28, 0x04,
+		0x50, 0x06,
+		0xA0, 0x08,
+		0x3C, 0x0A,
+		0x0E, 0x0C,
+		0x1A, 0x0E,
+		0x0C, 0x10,
+		0x18, 0x12,
+		0x30, 0x14,
+		0x60, 0x16,
+		0xC0, 0x18,
+		0x48, 0x1A,
+		0x10, 0x1C,
+		0x20, 0x1E
+	};
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	if (adr == 0x4015)
+	{
+		dmc->enable0 = (val & 4) ? true : false;
+		dmc->enable1 = (val & 8) ? true : false;
+
+		if (!dmc->enable0)
+		{
+			dmc->length_counter0 = 0;
+		}
+		if (!dmc->enable1)
+		{
+			dmc->length_counter1 = 0;
+		}
+
+		if ((val & 16)&&!dmc->active)
+		{
+			dmc->enable2 = dmc->active = true;
+			dmc->daddress = (0xC000 | (dmc->adr_reg << 6));
+			dmc->length = (dmc->len_reg << 4) + 1;
+			dmc->irq = 0;
+		}
+		else if (!(val & 16))
+		{
+			dmc->enable2 = dmc->active = false;
+		}
+
+		dmc->regadr-0x4008 = val;
+		return true;
+	}
+
+	if (adr == 0x4017)
+	{
+		//DEBUG_OUT("4017 = %02X\n", val);
+		dmc->frame_irq_enable = ((val & 0x40) == 0x40);
+		dmc->frame_irq = (dmc->frame_irq_enable ? dmc->frame_irq : 0);
+		dmc->frame_sequence_count = 0;
+		if (val & 0x80)
+		{
+			dmc->frame_sequence_steps = 5;
+			dmc->frame_sequence_step = 0;
+			FrameSequence(dmc, dmc->frame_sequence_step);
+			++dmc->frame_sequence_step;
+		}
+		else
+		{
+			dmc->frame_sequence_steps = 4;
+			dmc->frame_sequence_step = 1;
+		}
+	}
+
+	if (adr<0x4008||0x4013<adr)
+		return false;
+
+	dmc->regadr-0x4008 = val&0xff;
+
+	//DEBUG_OUT("$%04X %02X\n", adr, val);
+
+	switch (adr)
+	{
+
+	// tri
+
+	case 0x4008:
+		dmc->linear_counter_control = (val >> 7) & 1;
+		dmc->linear_counter_reload = val & 0x7F;
+		break;
+
+	case 0x4009:
+		break;
+
+	case 0x400a:
+		dmc->tri_freq = val | (dmc->tri_freq & 0x700) ;
+		if (dmc->counter0 > dmc->tri_freq) dmc->counter0 = dmc->tri_freq;
+		break;
+
+	case 0x400b:
+		dmc->tri_freq = (dmc->tri_freq & 0xff) | ((val & 0x7) << 8) ;
+		if (dmc->counter0 > dmc->tri_freq) dmc->counter0 = dmc->tri_freq;
+		dmc->linear_counter_halt = true;
+		if (dmc->enable0)
+		{
+			dmc->length_counter0 = length_table(val >> 3) & 0x1f;
+		}
+		break;
+
+	// noise
+
+	case 0x400c:
+		dmc->noise_volume = val & 15;
+		dmc->envelope_div_period = val & 15;
+		dmc->envelope_disable = (val >> 4) & 1;
+		dmc->envelope_loop = (val >> 5) & 1;
+		break;
+
+	case 0x400d:
+		break;
+
+	case 0x400e:
+		if (dmc->optionOPT_ENABLE_PNOISE)
+			dmc->noise_tap = (val & 0x80) ? (1<<6) : (1<<1);
+		else
+			dmc->noise_tap = (1<<1);
+		dmc->nfreq = wavlen_tabledmc->palval&15;
+		if (dmc->counter1 > dmc->nfreq) dmc->counter1 = dmc->nfreq;
+		break;
+
+	case 0x400f:
+		if (dmc->enable1)
+		{
+			dmc->length_counter1 = length_table(val >> 3) & 0x1f;
+		}
+		dmc->envelope_write = true;
+		break;
+
+	// dmc
+
+	case 0x4010:
+		dmc->mode = (val >> 6) & 3;
+		dmc->dfreq = freq_tabledmc->palval&15;
+		if (dmc->counter2 > dmc->dfreq) dmc->counter2 = dmc->dfreq;
+		break;
+
+	case 0x4011:
+		if (dmc->optionOPT_ENABLE_4011)
+		{
+			dmc->damp = (val >> 1) & 0x3f;
+			dmc->dac_lsb = val & 1;
+			dmc->dmc_pop = true;
+		}
+		break;
+
+	case 0x4012:
+		dmc->adr_reg = val&0xff;
+		// ここでdaddressは更新されない
+		break;
+
+	case 0x4013:
+		dmc->len_reg = val&0xff;
+		// ここでlengthは更新されない
+		break;
+
+	default:
+		return false;
+	}
+
+	return true;
+}
+
+bool NES_DMC_np_Read(void* chip, UINT32 adr, UINT32* val)
+{
+	NES_DMC* dmc = (NES_DMC*)chip;
+
+	if (adr == 0x4015)
+	{
+		*val |= (dmc->irq?128:0)
+			 | (dmc->frame_irq ? 0x40 : 0)
+			 | (dmc->active?16:0)
+			 | (dmc->length_counter1?8:0)
+			 | (dmc->length_counter0?4:0)
+			 ;
+
+		dmc->frame_irq = false;
+		return true;
+	}
+	else if (0x4008<=adr&&adr<=0x4014)
+	{
+		*val |= dmc->regadr-0x4008;
+		return true;
+	}
+	else
+		return false;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_dmc.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.c Added

@@ -0,0 +1,547 @@
+// Ported from NSFPlay 2.3 to VGMPlay (including C++ -> C conversion)
+// by Valley Bell on 26 September 2013
+
+#include <stdlib.h>	// for rand()
+#include <string.h>	// for memset()
+#include <stddef.h>	// for NULL
+#include <math.h>	// for exp()
+#include "mamedef.h"
+#include "../stdbool.h"
+#include "np_nes_fds.h"
+
+
+#define DEFAULT_CLOCK	1789772.0
+#define DEFAULT_RATE	44100
+
+
+enum
+{
+	OPT_CUTOFF=0,
+	OPT_4085_RESET,
+	OPT_WRITE_PROTECT,
+	OPT_END
+};
+
+enum
+{
+	EMOD=0,
+	EVOL=1
+};
+
+//const int RC_BITS = 12;
+#define RC_BITS		12
+
+enum
+{
+	TMOD=0,
+	TWAV=1
+};
+
+
+// 8 bit approximation of master volume
+#define MASTER_VOL	(2.4 * 1223.0)	// max FDS vol vs max APU square (arbitrarily 1223)
+#define	MAX_OUT		(32.0 * 63.0)	// value that should map to master vol
+static const INT32 MASTER4 = {
+	(INT32)((MASTER_VOL / MAX_OUT) * 256.0 * 2.0f / 2.0f),
+	(INT32)((MASTER_VOL / MAX_OUT) * 256.0 * 2.0f / 3.0f),
+	(INT32)((MASTER_VOL / MAX_OUT) * 256.0 * 2.0f / 4.0f),
+	(INT32)((MASTER_VOL / MAX_OUT) * 256.0 * 2.0f / 5.0f) };
+
+
+// Although they were pretty much removed from any sound core in NSFPlay 2.3,
+// I find this counter structure very useful.
+#define COUNTER_SHIFT	24
+
+typedef struct _Counter Counter;
+struct _Counter
+{
+	double ratio;
+	UINT32 val, step;
+};
+#define COUNTER_setcycle(cntr, s)	(cntr).step = (UINT32)((cntr).ratio / (s + 1))
+#define COUNTER_iup(cntr)			(cntr).val += (cntr).step
+#define COUNTER_value(cntr)			((cntr).val >> COUNTER_SHIFT)
+#define COUNTER_init(cntr, clk, rate)							\
+{																\
+	(cntr).ratio = (1 << COUNTER_SHIFT) * (1.0 * clk / rate);	\
+	(cntr).step = (UINT32)((cntr).ratio + 0.5);					\
+	(cntr).val = 0;												\
+}
+
+
+typedef struct _NES_FDS NES_FDS;
+struct _NES_FDS
+{
+	double rate, clock;
+	int mask;
+	INT32 sm2;	// stereo mix
+	INT32 fout;		// current output
+	int optionOPT_END;
+
+	bool master_io;
+	UINT8 master_vol;
+	UINT32 last_freq;	// for trackinfo
+	UINT32 last_vol;	// for trackinfo
+
+	// two wavetables
+	//const enum { TMOD=0, TWAV=1 };
+	INT32 wave264;
+	UINT32 freq2;
+	UINT32 phase2;
+	bool wav_write;
+	bool wav_halt;
+	bool env_halt;
+	bool mod_halt;
+	UINT32 mod_pos;
+	UINT32 mod_write_pos;
+
+	// two ramp envelopes
+	//const enum { EMOD=0, EVOL=1 };
+	bool env_mode2;
+	bool env_disable2;
+	UINT32 env_timer2;
+	UINT32 env_speed2;
+	UINT32 env_out2;
+	UINT32 master_env_speed;
+
+	// 1-pole RC lowpass filter
+	INT32 rc_accum;
+	INT32 rc_k;
+	INT32 rc_l;
+
+	Counter tick_count;
+	UINT32 tick_last;
+};
+
+void* NES_FDS_Create(int clock, int rate)
+{
+	NES_FDS* fds;
+
+	fds = (NES_FDS*)malloc(sizeof(NES_FDS));
+	if (fds == NULL)
+		return NULL;
+	memset(fds, 0x00, sizeof(NES_FDS));
+
+	fds->optionOPT_CUTOFF = 2000;
+	fds->optionOPT_4085_RESET = 0;
+	fds->optionOPT_WRITE_PROTECT = 0;	// not used here, see nsfplay.cpp
+
+	fds->rc_k = 0;
+	fds->rc_l = (1<<RC_BITS);
+
+	//NES_FDS_SetClock(fds, DEFAULT_CLOCK);
+	//NES_FDS_SetRate(fds, DEFAULT_RATE);
+	NES_FDS_SetClock(fds, clock);
+	NES_FDS_SetRate(fds, rate);
+	fds->sm0 = 128;
+	fds->sm1 = 128;
+
+	NES_FDS_Reset(fds);
+
+	return fds;
+}
+
+void NES_FDS_Destroy(void* chip)
+{
+	free(chip);
+}
+
+void NES_FDS_SetMask(void* chip, int m)
+{
+	NES_FDS* fds = (NES_FDS*)chip;
+
+	fds->mask = m&1;
+}
+
+void NES_FDS_SetStereoMix(void* chip, int trk, INT16 mixl, INT16 mixr)
+{
+	NES_FDS* fds = (NES_FDS*)chip;
+
+	if (trk < 0) return;
+	if (trk > 1) return;
+	fds->sm0 = mixl;
+	fds->sm1 = mixr;
+}
+
+void NES_FDS_SetClock(void* chip, double c)
+{
+	NES_FDS* fds = (NES_FDS*)chip;
+
+	fds->clock = c;
+}
+
+void NES_FDS_SetRate(void* chip, double r)
+{
+	NES_FDS* fds = (NES_FDS*)chip;
+	double cutoff, leak;
+
+	fds->rate = r;
+
+	COUNTER_init(fds->tick_count, fds->clock, fds->rate);
+	fds->tick_last = 0;
+	
+	// configure lowpass filter
+	cutoff = (double)fds->optionOPT_CUTOFF;
+	leak = 0.0;
+	if (cutoff > 0)
+		leak = exp(-2.0 * 3.14159 * cutoff / fds->rate);
+	fds->rc_k = (INT32)(leak * (double)(1<<RC_BITS));
+	fds->rc_l = (1<<RC_BITS) - fds->rc_k;
+}
+
+void NES_FDS_SetOption(void* chip, int id, int val)
+{
+	NES_FDS* fds = (NES_FDS*)chip;
+
+	if(id<OPT_END) fds->optionid = val;
+
+	// update cutoff immediately
+	if (id == OPT_CUTOFF) NES_FDS_SetRate(fds, fds->rate);
+}
+
+void NES_FDS_Reset(void* chip)
+{
+	NES_FDS* fds = (NES_FDS*)chip;
+	int i;
+
+	fds->master_io = true;
+	fds->master_vol = 0;
+	fds->last_freq = 0;
+	fds->last_vol = 0;
+
+	fds->rc_accum = 0;
+
+	for (i=0; i<2; ++i)
+	{
+		memset(fds->wavei, 0, sizeof(fds->wavei));
+		fds->freqi = 0;
+		fds->phasei = 0;
+	}
+	fds->wav_write = false;
+	fds->wav_halt = true;
+	fds->env_halt = true;
+	fds->mod_halt = true;
+	fds->mod_pos = 0;
+	fds->mod_write_pos = 0;
+
+	for (i=0; i<2; ++i)
+	{
+		fds->env_modei = false;
+		fds->env_disablei = true;
+		fds->env_timeri = 0;
+		fds->env_speedi = 0;
+		fds->env_outi = 0;
+	}
+	fds->master_env_speed = 0xFF;
+
+	// NOTE: the FDS BIOS reset only does the following related to audio:
+	// $4023 = $00
+	// $4023 = $83 enables master_io
+	// $4080 = $80 output volume = 0, envelope disabled
+	// $408A = $FF master envelope speed set to slowest
+	NES_FDS_Write(fds, 0x4023, 0x00);
+	NES_FDS_Write(fds, 0x4023, 0x83);
+	NES_FDS_Write(fds, 0x4080, 0x80);
+	NES_FDS_Write(fds, 0x408A, 0xFF);
+
+	// reset other stuff
+	NES_FDS_Write(fds, 0x4082, 0x00);	// wav freq 0
+	NES_FDS_Write(fds, 0x4083, 0x80);	// wav disable
+	NES_FDS_Write(fds, 0x4084, 0x80);	// mod strength 0
+	NES_FDS_Write(fds, 0x4085, 0x00);	// mod position 0
+	NES_FDS_Write(fds, 0x4086, 0x00);	// mod freq 0
+	NES_FDS_Write(fds, 0x4087, 0x80);	// mod disable
+	NES_FDS_Write(fds, 0x4089, 0x00);	// wav write disable, max global volume}
+}
+
+static void Tick(NES_FDS* fds, UINT32 clocks)
+{
+	INT32 vol_out;
+
+	// clock envelopes
+	if (!fds->env_halt && !fds->wav_halt && (fds->master_env_speed != 0))
+	{
+		int i;
+		
+		for (i=0; i<2; ++i)
+		{
+			if (!fds->env_disablei)
+			{
+				UINT32 period;
+				
+				fds->env_timeri += clocks;
+				period = ((fds->env_speedi+1) * fds->master_env_speed) << 3;
+				while (fds->env_timeri >= period)
+				{
+					// clock the envelope
+					if (fds->env_modei)
+					{
+						if (fds->env_outi < 32) ++fds->env_outi;
+					}
+					else
+					{
+						if (fds->env_outi > 0 ) --fds->env_outi;
+					}
+					fds->env_timeri -= period;
+				}
+			}
+		}
+	}
+
+	// clock the mod table
+	if (!fds->mod_halt)
+	{
+		UINT32 start_pos, end_pos, p;
+
+		// advance phase, adjust for modulator
+		start_pos = fds->phaseTMOD >> 16;
+		fds->phaseTMOD += (clocks * fds->freqTMOD);
+		end_pos = fds->phaseTMOD >> 16;
+
+		// wrap the phase to the 64-step table (+ 16 bit accumulator)
+		fds->phaseTMOD = fds->phaseTMOD & 0x3FFFFF;
+
+		// execute all clocked steps
+		for (p = start_pos; p < end_pos; ++p)
+		{
+			INT32 wv = fds->waveTMODp & 0x3F;
+			if (wv == 4)	// 4 resets mod position
+				fds->mod_pos = 0;
+			else
+			{
+				static const INT32 BIAS8 = { 0, 1, 2, 4, 0, -4, -2, -1 };
+				fds->mod_pos += BIASwv;
+				fds->mod_pos &= 0x7F;	// 7-bit clamp
+			}
+		}
+	}
+
+	// clock the wav table
+	if (!fds->wav_halt)
+	{
+		INT32 mod, f;
+
+		// complex mod calculation
+		mod = 0;
+		if (fds->env_outEMOD != 0)	// skip if modulator off
+		{
+			// convert mod_pos to 7-bit signed
+			INT32 pos = (fds->mod_pos < 64) ? fds->mod_pos : (fds->mod_pos-128);
+
+			// multiply pos by gain,
+			// shift off 4 bits but with odd "rounding" behaviour
+			INT32 temp = pos * fds->env_outEMOD;
+			INT32 rem = temp & 0x0F;
+			temp >>= 4;
+			if ((rem > 0) && ((temp & 0x80) == 0))
+			{
+				if (pos < 0) temp -= 1;
+				else temp += 2;
+			}
+
+			// wrap if range is exceeded
+			while (temp >= 192) temp -= 256;
+			while (temp < -64) temp += 256;
+
+			// multiply result by pitch,
+			// shift off 6 bits, round to nearest
+			temp = fds->freqTWAV * temp;
+			rem = temp & 0x3F;
+			temp >>= 6;
+			if (rem >= 32) temp += 1;
+
+			mod = temp;
+		}
+
+		// advance wavetable position
+		f = fds->freqTWAV + mod;
+		fds->phaseTWAV = fds->phaseTWAV + (clocks * f);
+		fds->phaseTWAV = fds->phaseTWAV & 0x3FFFFF;	// wrap
+
+		// store for trackinfo
+		fds->last_freq = f;
+	}
+
+	// output volume caps at 32
+	vol_out = fds->env_outEVOL;
+	if (vol_out > 32) vol_out = 32;
+
+	// final output
+	if (!fds->wav_write)
+		fds->fout = fds->waveTWAV(fds->phaseTWAV>>16)&0x3F * vol_out;
+
+	// NOTE: during wav_halt, the unit still outputs (at phase 0)
+	// and volume can affect it if the first sample is nonzero.
+	// haven't worked out 100% of the conditions for volume to
+	// effect (vol envelope does not seem to run, but am unsure)
+	// but this implementation is very close to correct
+
+	// store for trackinfo
+	fds->last_vol = vol_out;
+}
+
+UINT32 NES_FDS_Render(void* chip, INT32 b2)
+{
+	NES_FDS* fds = (NES_FDS*)chip;
+
+/*	// 8 bit approximation of master volume
+	static const double MASTER_VOL = 2.4 * 1223.0;	// max FDS vol vs max APU square (arbitrarily 1223)
+	static const double MAX_OUT = 32.0f * 63.0f;	// value that should map to master vol
+	static const INT32 MASTER4 = {
+		(INT32)((MASTER_VOL / MAX_OUT) * 256.0 * 2.0f / 2.0f),
+		(INT32)((MASTER_VOL / MAX_OUT) * 256.0 * 2.0f / 3.0f),
+		(INT32)((MASTER_VOL / MAX_OUT) * 256.0 * 2.0f / 4.0f),
+		(INT32)((MASTER_VOL / MAX_OUT) * 256.0 * 2.0f / 5.0f) };*/
+
+	UINT32 clocks;
+	INT32 v, rc_out, m;
+
+	COUNTER_iup(fds->tick_count);
+	clocks = (COUNTER_value(fds->tick_count) - fds->tick_last) & 0xFF;
+	Tick(fds, clocks);
+	fds->tick_last = COUNTER_value(fds->tick_count);
+
+	v = fds->fout * MASTERfds->master_vol >> 8;
+
+	// lowpass RC filter
+	rc_out = ((fds->rc_accum * fds->rc_k) + (v * fds->rc_l)) >> RC_BITS;
+	fds->rc_accum = rc_out;
+	v = rc_out;
+
+	// output mix
+	m = fds->mask ? 0 : v;
+	b0 = (m * fds->sm0) >> (7-2);
+	b1 = (m * fds->sm1) >> (7-2);
+	return 2;
+}
+
+bool NES_FDS_Write(void* chip, UINT32 adr, UINT32 val)
+{
+	NES_FDS* fds = (NES_FDS*)chip;
+
+	// $4023 master I/O enable/disable
+	if (adr == 0x4023)
+	{
+		fds->master_io = ((val & 2) != 0);
+		return true;
+	}
+
+	if (!fds->master_io)
+		return false;
+	if (adr < 0x4040 || adr > 0x408A)
+		return false;
+
+	if (adr < 0x4080)	// $4040-407F wave table write
+	{
+		if (fds->wav_write)
+			fds->waveTWAVadr - 0x4040 = val & 0x3F;
+		return true;
+	}
+
+	switch (adr & 0x00FF)
+	{
+	case 0x80:	// $4080 volume envelope
+		fds->env_disableEVOL = ((val & 0x80) != 0);
+		fds->env_modeEVOL = ((val & 0x40) != 0);
+		fds->env_timerEVOL = 0;
+		fds->env_speedEVOL = val & 0x3F;
+		if (fds->env_disableEVOL)
+			fds->env_outEVOL = fds->env_speedEVOL;
+		return true;
+	case 0x81:	// $4081 ---
+		return false;
+	case 0x82:	// $4082 wave frequency low
+		fds->freqTWAV = (fds->freqTWAV & 0xF00) | val;
+		return true;
+	case 0x83:	// $4083 wave frequency high / enables
+		fds->freqTWAV = (fds->freqTWAV & 0x0FF) | ((val & 0x0F) << 8);
+		fds->wav_halt = ((val & 0x80) != 0);
+		fds->env_halt = ((val & 0x40) != 0);
+		if (fds->wav_halt)
+			fds->phaseTWAV = 0;
+		if (fds->env_halt)
+		{
+			fds->env_timerEMOD = 0;
+			fds->env_timerEVOL = 0;
+		}
+		return true;
+	case 0x84:	// $4084 mod envelope
+		fds->env_disableEMOD = ((val & 0x80) != 0);
+		fds->env_modeEMOD = ((val & 0x40) != 0);
+		fds->env_timerEMOD = 0;
+		fds->env_speedEMOD = val & 0x3F;
+		if (fds->env_disableEMOD)
+			fds->env_outEMOD = fds->env_speedEMOD;
+		return true;
+	case 0x85:	// $4085 mod position
+		fds->mod_pos = val & 0x7F;
+		// not hardware accurate., but prevents detune due to cycle inaccuracies
+		// (notably in Bio Miracle Bokutte Upa)
+		if (fds->optionOPT_4085_RESET)
+			fds->phaseTMOD = fds->mod_write_pos << 16;
+		return true;
+	case 0x86:	// $4086 mod frequency low
+		fds->freqTMOD = (fds->freqTMOD & 0xF00) | val;
+		return true;
+	case 0x87:	// $4087 mod frequency high / enable
+		fds->freqTMOD = (fds->freqTMOD & 0x0FF) | ((val & 0x0F) << 8);
+		fds->mod_halt = ((val & 0x80) != 0);
+		if (fds->mod_halt)
+			fds->phaseTMOD = fds->phaseTMOD & 0x3F0000;	// reset accumulator phase
+		return true;
+	case 0x88:	// $4088 mod table write
+		if (fds->mod_halt)
+		{
+			// writes to current playback position (there is no direct way to set phase)
+			fds->waveTMOD(fds->phaseTMOD >> 16) & 0x3F = val & 0x7F;
+			fds->phaseTMOD = (fds->phaseTMOD + 0x010000) & 0x3FFFFF;
+			fds->waveTMOD(fds->phaseTMOD >> 16) & 0x3F = val & 0x7F;
+			fds->phaseTMOD = (fds->phaseTMOD + 0x010000) & 0x3FFFFF;
+			fds->mod_write_pos = fds->phaseTMOD >> 16;	// used by OPT_4085_RESET
+		}
+		return true;
+	case 0x89:	// $4089 wave write enable, master volume
+		fds->wav_write = ((val & 0x80) != 0);
+		fds->master_vol = val & 0x03;
+		return true;
+	case 0x8A:	// $408A envelope speed
+		fds->master_env_speed = val;
+		// haven't tested whether this register resets phase on hardware,
+		// but this ensures my inplementation won't spam envelope clocks
+		// if this value suddenly goes low.
+		fds->env_timerEMOD = 0;
+		fds->env_timerEVOL = 0;
+		return true;
+	default:
+		return false;
+	}
+	return false;
+}
+
+bool NES_FDS_Read(void* chip, UINT32 adr, UINT32* val)
+{
+	NES_FDS* fds = (NES_FDS*)chip;
+
+	if (adr >= 0x4040 && adr < 0x407F)
+	{
+		// TODO: if wav_write is not enabled, the
+		// read address may not be reliable? need
+		// to test this on hardware.
+		*val = fds->waveTWAVadr - 0x4040;
+		return true;
+	}
+
+	if (adr == 0x4090)	// $4090 read volume envelope
+	{
+		*val = fds->env_outEVOL | 0x40;
+		return true;
+	}
+
+	if (adr == 0x4092)	// $4092 read mod envelope
+	{
+		*val = fds->env_outEMOD | 0x40;
+		return true;
+	}
+
+	return false;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/np_nes_fds.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.c Added

@@ -0,0 +1,663 @@
+/**********************************************************************************************
+ *
+ * OKI MSM6258 ADPCM
+ *
+ * TODO:
+ * 3-bit ADPCM support
+ * Recording?
+ *
+ **********************************************************************************************/
+
+
+//#include "emu.h"
+#include "mamedef.h"
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+//#include "streams.h"
+#include <stdlib.h>
+#include <math.h>
+#include "okim6258.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+#define COMMAND_STOP		(1 << 0)
+#define COMMAND_PLAY		(1 << 1)
+#define	COMMAND_RECORD		(1 << 2)
+
+#define STATUS_PLAYING		(1 << 1)
+#define STATUS_RECORDING	(1 << 2)
+
+static const int dividers4 = { 1024, 768, 512, 512 };
+
+#define QUEUE_SIZE	(1 << 1)
+#define QUEUE_MASK	(QUEUE_SIZE - 1)
+typedef struct _okim6258_state okim6258_state;
+struct _okim6258_state
+{
+	UINT8 status;
+
+	UINT32 master_clock;	/* master clock frequency */
+	UINT32 divider;			/* master clock divider */
+	UINT8 adpcm_type;		/* 3/4 bit ADPCM select */
+	UINT8 data_in;			/* ADPCM data-in register */
+	UINT8 nibble_shift;		/* nibble select */
+	//sound_stream *stream;	/* which stream are we playing on? */
+
+	UINT8 output_bits;
+	INT32 output_mask;
+
+	// Valley Bell: Added a small queue to prevent race conditions.
+	UINT8 data_buf4;
+	UINT8 data_in_last;
+	UINT8 data_buf_pos;
+	// Data Empty Values:
+	//	00 - data written, but not read yet
+	//	01 - read data, waiting for next write
+	//	02 - tried to read, but had no data
+	UINT8 data_empty;
+	// Valley Bell: Added pan
+	UINT8 pan;
+	INT32 last_smpl;
+
+	INT32 signal;
+	INT32 step;
+	
+	UINT8 clock_buffer0x04;
+	UINT32 initial_clock;
+	UINT8 initial_div;
+	
+	SRATE_CALLBACK SmpRateFunc;
+	void* SmpRateData;
+
+	UINT8 Iternal10Bit;
+	UINT8 DCRemoval;
+ 
+ UINT8 mute;
+};
+
+/* step size index shift table */
+static const int index_shift8 = { -1, -1, -1, -1, 2, 4, 6, 8 };
+
+/* lookup table for the precomputed difference */
+static int diff_lookup49*16;
+
+/* tables computed? */
+static int tables_computed = 0;
+
+
+/*INLINE okim6258_state *get_safe_token(running_device *device)
+{
+	assert(device != NULL);
+	assert(device->type() == OKIM6258);
+	return (okim6258_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+/**********************************************************************************************
+
+ compute_tables -- compute the difference tables
+
+***********************************************************************************************/
+
+static void compute_tables(void)
+{
+	/* nibble to bit map */
+	static const int nbl2bit164 =
+	{
+		{ 1, 0, 0, 0}, { 1, 0, 0, 1}, { 1, 0, 1, 0}, { 1, 0, 1, 1},
+		{ 1, 1, 0, 0}, { 1, 1, 0, 1}, { 1, 1, 1, 0}, { 1, 1, 1, 1},
+		{-1, 0, 0, 0}, {-1, 0, 0, 1}, {-1, 0, 1, 0}, {-1, 0, 1, 1},
+		{-1, 1, 0, 0}, {-1, 1, 0, 1}, {-1, 1, 1, 0}, {-1, 1, 1, 1}
+	};
+
+	int step, nib;
+
+	if (tables_computed)
+		return;
+	
+	/* loop over all possible steps */
+	for (step = 0; step <= 48; step++)
+	{
+		/* compute the step value */
+		int stepval = floor(16.0 * pow(11.0 / 10.0, (double)step));
+
+		/* loop over all nibbles and compute the difference */
+		for (nib = 0; nib < 16; nib++)
+		{
+			diff_lookupstep*16 + nib = nbl2bitnib0 *
+				(stepval * nbl2bitnib1 +
+				 stepval/2 * nbl2bitnib2 +
+				 stepval/4 * nbl2bitnib3 +
+				 stepval/8);
+		}
+	}
+
+	tables_computed = 1;
+}
+
+
+static INT16 clock_adpcm(okim6258_state *chip, UINT8 nibble)
+{
+	INT32 max = chip->output_mask - 1;
+	INT32 min = -chip->output_mask;
+
+	chip->signal += diff_lookupchip->step * 16 + (nibble & 15);
+
+	/* clamp to the maximum */
+	if (chip->signal > max)
+		chip->signal = max;
+	else if (chip->signal < min)
+		chip->signal = min;
+
+	/* adjust the step size and clamp */
+	chip->step += index_shiftnibble & 7;
+	if (chip->step > 48)
+		chip->step = 48;
+	else if (chip->step < 0)
+		chip->step = 0;
+
+	/* return the signal scaled up to 32767 */
+	return chip->signal << 4;
+}
+
+/**********************************************************************************************
+
+ okim6258_update -- update the sound chip so that it is in sync with CPU execution
+
+***********************************************************************************************/
+
+//static STREAM_UPDATE( okim6258_update )
+void okim6258_update(void *param, stream_sample_t **outputs, int samples)
+{
+	okim6258_state *chip = (okim6258_state *)param;
+	//stream_sample_t *buffer = outputs0;
+	stream_sample_t *bufL = outputs0;
+	stream_sample_t *bufR = outputs1;
+ int mute = chip->mute;
+
+	//memset(outputs0, 0, samples * sizeof(*outputs0));
+
+	if (chip->status & STATUS_PLAYING)
+	{
+		int nibble_shift = chip->nibble_shift;
+
+		while (samples)
+		{
+			/* Compute the new amplitude and update the current step */
+			//int nibble = (chip->data_in >> nibble_shift) & 0xf;
+			int nibble;
+			INT16 sample;
+			
+			if (! nibble_shift)
+			{
+				// 1st nibble - get data
+				if (! chip->data_empty)
+				{
+					chip->data_in = chip->data_bufchip->data_buf_pos >> 4;
+					chip->data_buf_pos += 0x10;
+					chip->data_buf_pos &= 0x3F;
+					if ((chip->data_buf_pos >> 4) == (chip->data_buf_pos & 0x0F))
+						chip->data_empty ++;
+				}
+				else
+				{
+					//chip->data_in = chip->data_in_last;
+					if (chip->data_empty < 0x80)
+						chip->data_empty ++;
+				}
+			}
+			nibble = (chip->data_in >> nibble_shift) & 0xf;
+
+			/* Output to the buffer */
+			//INT16 sample = clock_adpcm(chip, nibble);
+			if (chip->data_empty < 0x02)
+			{
+				sample = clock_adpcm(chip, nibble);
+				chip->last_smpl = sample;
+			}
+			else
+			{
+				// Valley Bell: data_empty behaviour (loosely) ported from XM6
+				if (chip->data_empty >= 0x02 + 0x01)
+				{
+					chip->data_empty -= 0x01;
+					/*if (chip->signal < 0)
+						chip->signal ++;
+					else if (chip->signal > 0)
+						chip->signal --;*/
+					chip->signal = chip->signal * 15 / 16;
+					chip->last_smpl = chip->signal << 4;
+				}
+				sample = chip->last_smpl;
+			}
+
+			nibble_shift ^= 4;
+
+			//*buffer++ = sample;
+ if (mute)
+ {
+ *bufL++ = 0;
+ *bufR++ = 0;
+ }
+ else
+ {
+ *bufL++ = (chip->pan & 0x02) ? 0x00 : sample;
+ *bufR++ = (chip->pan & 0x01) ? 0x00 : sample;
+ }
+			samples--;
+		}
+
+		/* Update the parameters */
+		chip->nibble_shift = nibble_shift;
+	}
+	else
+	{
+		/* Fill with 0 */
+		while (samples--)
+		{
+			//*buffer++ = 0;
+			*bufL++ = 0;
+			*bufR++ = 0;
+		}
+	}
+}
+
+
+void okim6258_mute(void *ptr, int mute)
+{
+ okim6258_state *chip = (okim6258_state *)ptr;
+ chip->mute = mute;
+}
+
+
+/**********************************************************************************************
+
+ state save support for MAME
+
+***********************************************************************************************/
+
+/*static void okim6258_state_save_register(okim6258_state *info, running_device *device)
+{
+	state_save_register_device_item(device, 0, info->status);
+	state_save_register_device_item(device, 0, info->master_clock);
+	state_save_register_device_item(device, 0, info->divider);
+	state_save_register_device_item(device, 0, info->data_in);
+	state_save_register_device_item(device, 0, info->nibble_shift);
+	state_save_register_device_item(device, 0, info->signal);
+	state_save_register_device_item(device, 0, info->step);
+}*/
+
+
+/**********************************************************************************************
+
+ OKIM6258_start -- start emulation of an OKIM6258-compatible chip
+
+***********************************************************************************************/
+
+static int get_vclk(okim6258_state* info)
+{
+	int clk_rnd;
+	
+	clk_rnd = info->master_clock;
+	clk_rnd += info->divider / 2;	 // for better rounding - should help some of the streams
+	return clk_rnd / info->divider;
+}
+
+//static DEVICE_START( okim6258 )
+int device_start_okim6258(void **_info, int clock, int Options, int divider, int adpcm_type, int output_12bits)
+{
+	//const okim6258_interface *intf = (const okim6258_interface *)device->baseconfig().static_config();
+	//okim6258_state *info = get_safe_token(device);
+	okim6258_state *info;
+
+	info = (okim6258_state *) calloc(1, sizeof(okim6258_state));
+	*_info = (void *) info;
+
+	info->Iternal10Bit = (Options >> 0) & 0x01;
+	info->DCRemoval = (Options >> 1) & 0x01;
+	
+	compute_tables();
+
+	//info->master_clock = device->clock();
+	info->initial_clock = clock;
+	info->initial_div = divider;
+	info->master_clock = clock;
+	info->adpcm_type = /*intf->*/adpcm_type;
+	info->clock_buffer0x00 = (clock & 0x000000FF) >> 0;
+	info->clock_buffer0x01 = (clock & 0x0000FF00) >> 8;
+	info->clock_buffer0x02 = (clock & 0x00FF0000) >> 16;
+	info->clock_buffer0x03 = (clock & 0xFF000000) >> 24;
+	info->SmpRateFunc = NULL;
+
+	/* D/A precision is 10-bits but 12-bit data can be output serially to an external DAC */
+	info->output_bits = /*intf->*/output_12bits ? 12 : 10;
+	if (info->Iternal10Bit)
+		info->output_mask = (1 << (info->output_bits - 1));
+	else
+		info->output_mask = (1 << (12 - 1));
+	info->divider = dividers/*intf->*/divider;
+
+	//info->stream = stream_create(device, 0, 1, device->clock()/info->divider, info, okim6258_update);
+
+	info->signal = -2;
+	info->step = 0;
+
+	//okim6258_state_save_register(info, device);
+
+	return get_vclk(info);
+}
+
+
+/**********************************************************************************************
+
+ OKIM6258_stop -- stop emulation of an OKIM6258-compatible chip
+
+***********************************************************************************************/
+
+void device_stop_okim6258(void *info)
+{
+	free(info);
+	
+	return;
+}
+
+//static DEVICE_RESET( okim6258 )
+void device_reset_okim6258(void *_info)
+{
+	//okim6258_state *info = get_safe_token(device);
+	okim6258_state *info = (okim6258_state *)_info;
+
+	//stream_update(info->stream);
+	
+	info->master_clock = info->initial_clock;
+	info->clock_buffer0x00 = (info->initial_clock & 0x000000FF) >> 0;
+	info->clock_buffer0x01 = (info->initial_clock & 0x0000FF00) >> 8;
+	info->clock_buffer0x02 = (info->initial_clock & 0x00FF0000) >> 16;
+	info->clock_buffer0x03 = (info->initial_clock & 0xFF000000) >> 24;
+	info->divider = dividersinfo->initial_div;
+	if (info->SmpRateFunc != NULL)
+		info->SmpRateFunc(info->SmpRateData, get_vclk(info));
+	
+	
+	info->signal = -2;
+	info->step = 0;
+	info->status = 0;
+
+	// Valley Bell: Added reset of the Data In register.
+	info->data_in = 0x00;
+	info->data_buf0 = info->data_buf1 = 0x00;
+	info->data_buf_pos = 0x00;
+	info->data_empty = 0xFF;
+	info->pan = 0x00;
+}
+
+
+/**********************************************************************************************
+
+ okim6258_set_divider -- set the master clock divider
+
+***********************************************************************************************/
+
+//void okim6258_set_divider(running_device *device, int val)
+void okim6258_set_divider(void *_info, int val)
+{
+	//okim6258_state *info = get_safe_token(device);
+	okim6258_state *info = (okim6258_state *)_info;
+	//int divider = dividersval;
+
+	info->divider = dividersval;
+	//stream_set_sample_rate(info->stream, info->master_clock / divider);
+	if (info->SmpRateFunc != NULL)
+		info->SmpRateFunc(info->SmpRateData, get_vclk(info));
+}
+
+
+/**********************************************************************************************
+
+ okim6258_set_clock -- set the master clock
+
+***********************************************************************************************/
+
+//void okim6258_set_clock(running_device *device, int val)
+void okim6258_set_clock(void *_info, int val)
+{
+	//okim6258_state *info = get_safe_token(device);
+	okim6258_state *info = (okim6258_state *)_info;
+
+	if (val)
+	{
+		info->master_clock = val;
+	}
+	else
+	{
+		info->master_clock =	(info->clock_buffer0x00 << 0) |
+								(info->clock_buffer0x01 << 8) |
+								(info->clock_buffer0x02 << 16) |
+								(info->clock_buffer0x03 << 24);
+	}
+	//stream_set_sample_rate(info->stream, info->master_clock / info->divider);
+	if (info->SmpRateFunc != NULL)
+		info->SmpRateFunc(info->SmpRateData, get_vclk(info));
+}
+
+
+/**********************************************************************************************
+
+ okim6258_get_vclk -- get the VCLK/sampling frequency
+
+***********************************************************************************************/
+
+//int okim6258_get_vclk(running_device *device)
+int okim6258_get_vclk(void *_info)
+{
+	//okim6258_state *info = get_safe_token(device);
+	okim6258_state *info = (okim6258_state *)_info;
+
+	return get_vclk(info);
+}
+
+
+/**********************************************************************************************
+
+ okim6258_status_r -- read the status port of an OKIM6258-compatible chip
+
+***********************************************************************************************/
+
+//READ8_DEVICE_HANDLER( okim6258_status_r )
+/*UINT8 okim6258_status_r(UINT8 ChipID, offs_t offset)
+{
+	//okim6258_state *info = get_safe_token(device);
+	okim6258_state *info = &OKIM6258DataChipID;
+
+	//stream_update(info->stream);
+
+	return (info->status & STATUS_PLAYING) ? 0x00 : 0x80;
+}*/
+
+
+/**********************************************************************************************
+
+ okim6258_data_w -- write to the control port of an OKIM6258-compatible chip
+
+***********************************************************************************************/
+//WRITE8_DEVICE_HANDLER( okim6258_data_w )
+static void okim6258_data_w(void *_info, /*offs_t offset, */UINT8 data)
+{
+	//okim6258_state *info = get_safe_token(device);
+	okim6258_state *info = (okim6258_state *)_info;
+
+	/* update the stream */
+	//stream_update(info->stream);
+
+	//info->data_in = data;
+	//info->nibble_shift = 0;
+	
+	if (info->data_empty >= 0x02)
+		info->data_buf_pos = 0x00;
+	info->data_in_last = data;
+	info->data_bufinfo->data_buf_pos & 0x0F = data;
+	info->data_buf_pos += 0x01;
+	info->data_buf_pos &= 0xF3;
+	if ((info->data_buf_pos >> 4) == (info->data_buf_pos & 0x0F))
+	{
+#ifdef _DEBUG
+		logerror("Warning: FIFO full!\n");
+#endif
+		info->data_buf_pos = (info->data_buf_pos & 0xF0) | ((info->data_buf_pos-1) & 0x03);
+	}
+	info->data_empty = 0x00;
+}
+
+
+/**********************************************************************************************
+
+ okim6258_ctrl_w -- write to the control port of an OKIM6258-compatible chip
+
+***********************************************************************************************/
+
+//WRITE8_DEVICE_HANDLER( okim6258_ctrl_w )
+static void okim6258_ctrl_w(void *_info, /*offs_t offset, */UINT8 data)
+{
+	//okim6258_state *info = get_safe_token(device);
+	okim6258_state *info = (okim6258_state *)_info;
+
+	//stream_update(info->stream);
+
+	if (data & COMMAND_STOP)
+	{
+		info->status &= ~(STATUS_PLAYING | STATUS_RECORDING);
+		return;
+	}
+
+	if (data & COMMAND_PLAY)
+	{
+		if (!(info->status & STATUS_PLAYING) || info->DCRemoval)
+		{
+			info->status |= STATUS_PLAYING;
+
+			/* Also reset the ADPCM parameters */
+			info->signal = -2;
+			info->step = 0;
+			info->nibble_shift = 0;
+			
+			info->data_buf0x00 = data;
+			info->data_buf_pos = 0x01;	// write pos 01, read pos 00
+			info->data_empty = 0x00;
+		}
+		// Resetting the ADPCM sample always seems to reduce the clicks and improves the waveform.
+		// For games that don't use the Multichannel ADPCM driver (whose waveform looks horrible anyway),
+		// this causes many additional (and loud) clicks though.
+		//info->signal = -2;
+		info->step = 0;	// this was verified with the source of XM6
+		info->nibble_shift = 0;
+	}
+	else
+	{
+		info->status &= ~STATUS_PLAYING;
+	}
+
+	if (data & COMMAND_RECORD)
+	{
+#ifdef _DEBUG
+		logerror("M6258: Record enabled\n");
+#endif
+		info->status |= STATUS_RECORDING;
+	}
+	else
+	{
+		info->status &= ~STATUS_RECORDING;
+	}
+}
+
+static void okim6258_set_clock_byte(void *_info, UINT8 Byte, UINT8 val)
+{
+	okim6258_state *info = (okim6258_state *)_info;
+	
+	info->clock_bufferByte = val;
+	
+	return;
+}
+
+static void okim6258_pan_w(void *_info, UINT8 data)
+{
+	okim6258_state *info = (okim6258_state *)_info;
+
+	info->pan = data;
+	
+	return;
+}
+
+
+void okim6258_write(void *info, UINT8 Port, UINT8 Data)
+{
+	switch(Port)
+	{
+	case 0x00:
+		okim6258_ctrl_w(info, /*0x00, */Data);
+		break;
+	case 0x01:
+		okim6258_data_w(info, /*0x00, */Data);
+		break;
+	case 0x02:
+		okim6258_pan_w(info, Data);
+		break;
+	case 0x08:
+	case 0x09:
+	case 0x0A:
+		okim6258_set_clock_byte(info, Port & 0x03, Data);
+		break;
+	case 0x0B:
+		okim6258_set_clock_byte(info, Port & 0x03, Data);
+		okim6258_set_clock(info, 0);
+		break;
+	case 0x0C:
+		okim6258_set_divider(info, Data);
+		break;
+	}
+	
+	return;
+}
+
+
+void okim6258_set_srchg_cb(void *_info, SRATE_CALLBACK CallbackFunc, void* DataPtr)
+{
+	okim6258_state *info = (okim6258_state *)_info;
+	
+	// set Sample Rate Change Callback routine
+	info->SmpRateFunc = CallbackFunc;
+	info->SmpRateData = DataPtr;
+	
+	return;
+}
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( okim6258 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers --- //
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(okim6258_state);			break;
+
+		// --- the following bits of info are returned as pointers to data or functions --- //
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME(okim6258);		break;
+		case DEVINFO_FCT_STOP:							// nothing //								break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME(okim6258);		break;
+
+		// --- the following bits of info are returned as NULL-terminated strings --- //
+		case DEVINFO_STR_NAME:							strcpy(info->s, "OKI6258");					break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "OKI ADPCM");				break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");						break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);					break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(OKIM6258, okim6258);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6258.h Added

@@ -0,0 +1,52 @@
+#pragma once
+
+//#include "devlegcy.h"
+
+/* an interface for the OKIM6258 and similar chips */
+
+/*typedef struct _okim6258_interface okim6258_interface;
+struct _okim6258_interface
+{
+	int divider;
+	int adpcm_type;
+	int output_12bits;
+};*/
+
+
+#define FOSC_DIV_BY_1024	0
+#define FOSC_DIV_BY_768		1
+#define FOSC_DIV_BY_512		2
+
+#define TYPE_3BITS      	0
+#define TYPE_4BITS			1
+
+#define	OUTPUT_10BITS		0
+#define	OUTPUT_12BITS		1
+
+void okim6258_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_okim6258(void **chip, int clock, int options, int divider, int adpcm_type, int output_12bits);
+void device_stop_okim6258(void *chip);
+void device_reset_okim6258(void *chip);
+
+//void okim6258_set_divider(running_device *device, int val);
+//void okim6258_set_clock(running_device *device, int val);
+//int okim6258_get_vclk(running_device *device);
+
+void okim6258_set_divider(void *chip, int val);
+void okim6258_set_clock(void *chip, int val);
+int okim6258_get_vclk(void *chip);
+
+void okim6258_mute(void *chip, int mute);
+
+//READ8_DEVICE_HANDLER( okim6258_status_r );
+//WRITE8_DEVICE_HANDLER( okim6258_data_w );
+//WRITE8_DEVICE_HANDLER( okim6258_ctrl_w );
+
+/*UINT8 okim6258_status_r(UINT8 ChipID, offs_t offset);
+void okim6258_data_w(UINT8 ChipID, offs_t offset, UINT8 data);
+void okim6258_ctrl_w(UINT8 ChipID, offs_t offset, UINT8 data);*/
+void okim6258_write(void *chip, UINT8 Port, UINT8 Data);
+
+void okim6258_set_srchg_cb(void *chip, SRATE_CALLBACK CallbackFunc, void* DataPtr);
+
+//DECLARE_LEGACY_SOUND_DEVICE(OKIM6258, okim6258);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.c Added

@@ -0,0 +1,827 @@
+/**********************************************************************************************
+ *
+ * streaming ADPCM driver
+ * by Aaron Giles
+ *
+ * Library to transcode from an ADPCM source to raw PCM.
+ * Written by Buffoni Mirko in 08/06/97
+ * References: various sources and documents.
+ *
+ * HJB 08/31/98
+ * modified to use an automatically selected oversampling factor
+ * for the current sample rate
+ *
+ * Mish 21/7/99
+ * Updated to allow multiple OKI chips with different sample rates
+ *
+ * R. Belmont 31/10/2003
+ * Updated to allow a driver to use both MSM6295s and "raw" ADPCM voices (gcpinbal)
+ * Also added some error trapping for MAME_DEBUG builds
+ *
+ **********************************************************************************************/
+
+
+#include "mamedef.h"
+//#include "emu.h"
+//#include "streams.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "okim6295.h"
+
+#define FALSE	0
+#define TRUE	1
+
+//#define MAX_SAMPLE_CHUNK	10000
+#define MAX_SAMPLE_CHUNK	0x10	// that's enough for VGMPlay's update rate
+
+
+/* struct describing a single playing ADPCM voice */
+struct ADPCMVoice
+{
+	UINT8 playing;			/* 1 if we are actively playing */
+
+	UINT32 base_offset;		/* pointer to the base memory location */
+	UINT32 sample;			/* current sample number */
+	UINT32 count;			/* total samples to play */
+
+	struct adpcm_state adpcm;/* current ADPCM state */
+	UINT32 volume;			/* output volume */
+	UINT8 Muted;
+};
+
+typedef struct _okim6295_state okim6295_state;
+struct _okim6295_state
+{
+	#define OKIM6295_VOICES		4
+	struct ADPCMVoice voiceOKIM6295_VOICES;
+	//running_device *device;
+	INT16 command;
+	//UINT8 bank_installed;
+	INT32 bank_offs;
+	UINT8 pin7_state;
+	UINT8 nmk_mode;
+	UINT8 nmk_bank4;
+	//sound_stream *stream;	/* which stream are we playing on? */
+	UINT32 master_clock;	/* master clock frequency */
+	UINT32 initial_clock;
+	
+	UINT32	ROMSize;
+	UINT8*	ROM;
+	
+	SRATE_CALLBACK SmpRateFunc;
+	void* SmpRateData;
+};
+
+/* step size index shift table */
+static const int index_shift8 = { -1, -1, -1, -1, 2, 4, 6, 8 };
+
+/* lookup table for the precomputed difference */
+static int diff_lookup49*16;
+
+/* volume lookup table. The manual lists only 9 steps, ~3dB per step. Given the dB values,
+ that seems to map to a 5-bit volume control. Any volume parameter beyond the 9th index
+ results in silent playback. */
+static const int volume_table16 =
+{
+	0x20,	// 0 dB
+	0x16,	// -3.2 dB
+	0x10,	// -6.0 dB
+	0x0b,	// -9.2 dB
+	0x08,	// -12.0 dB
+	0x06,	// -14.5 dB
+	0x04,	// -18.0 dB
+	0x03,	// -20.5 dB
+	0x02,	// -24.0 dB
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+	0x00,
+};
+
+/* tables computed? */
+static int tables_computed = 0;
+
+/* useful interfaces */
+//const okim6295_interface okim6295_interface_pin7high = { 1 };
+//const okim6295_interface okim6295_interface_pin7low = { 0 };
+
+/* default address map */
+/*static ADDRESS_MAP_START( okim6295, 0, 8 )
+	AM_RANGE(0x00000, 0x3ffff) AM_ROM
+ADDRESS_MAP_END*/
+
+
+/*INLINE okim6295_state *get_safe_token(running_device *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_OKIM6295);
+	return (okim6295_state *)device->token;
+}*/
+
+
+/**********************************************************************************************
+
+ compute_tables -- compute the difference tables
+
+***********************************************************************************************/
+
+static void compute_tables(void)
+{
+	/* nibble to bit map */
+	static const int nbl2bit164 =
+	{
+		{ 1, 0, 0, 0}, { 1, 0, 0, 1}, { 1, 0, 1, 0}, { 1, 0, 1, 1},
+		{ 1, 1, 0, 0}, { 1, 1, 0, 1}, { 1, 1, 1, 0}, { 1, 1, 1, 1},
+		{-1, 0, 0, 0}, {-1, 0, 0, 1}, {-1, 0, 1, 0}, {-1, 0, 1, 1},
+		{-1, 1, 0, 0}, {-1, 1, 0, 1}, {-1, 1, 1, 0}, {-1, 1, 1, 1}
+	};
+
+	int step, nib;
+
+	/* loop over all possible steps */
+	for (step = 0; step <= 48; step++)
+	{
+		/* compute the step value */
+		int stepval = (int)floor(16.0 * pow(11.0 / 10.0, (double)step));
+
+		/* loop over all nibbles and compute the difference */
+		for (nib = 0; nib < 16; nib++)
+		{
+			diff_lookupstep*16 + nib = nbl2bitnib0 *
+				(stepval * nbl2bitnib1 +
+				 stepval/2 * nbl2bitnib2 +
+				 stepval/4 * nbl2bitnib3 +
+				 stepval/8);
+		}
+	}
+
+	tables_computed = 1;
+}
+
+
+
+/**********************************************************************************************
+
+ reset_adpcm -- reset the ADPCM stream
+
+***********************************************************************************************/
+
+void reset_adpcm(struct adpcm_state *state)
+{
+	/* make sure we have our tables */
+	if (!tables_computed)
+		compute_tables();
+
+	/* reset the signal/step */
+	state->signal = -2;
+	state->step = 0;
+}
+
+
+
+/**********************************************************************************************
+
+ clock_adpcm -- clock the next ADPCM byte
+
+***********************************************************************************************/
+
+INT16 clock_adpcm(struct adpcm_state *state, UINT8 nibble)
+{
+	state->signal += diff_lookupstate->step * 16 + (nibble & 15);
+
+	/* clamp to the maximum */
+	if (state->signal > 2047)
+		state->signal = 2047;
+	else if (state->signal < -2048)
+		state->signal = -2048;
+
+	/* adjust the step size and clamp */
+	state->step += index_shiftnibble & 7;
+	if (state->step > 48)
+		state->step = 48;
+	else if (state->step < 0)
+		state->step = 0;
+
+	/* return the signal */
+	return state->signal;
+}
+
+
+
+/**********************************************************************************************
+
+ generate_adpcm -- general ADPCM decoding routine
+
+***********************************************************************************************/
+
+#define NMK_BNKTBLBITS	8
+#define NMK_BNKTBLSIZE	(1 << NMK_BNKTBLBITS)	// 0x100
+#define NMK_TABLESIZE	(4 * NMK_BNKTBLSIZE)	// 0x400
+#define NMK_TABLEMASK	(NMK_TABLESIZE - 1)		// 0x3FF
+
+#define NMK_BANKBITS	16
+#define NMK_BANKSIZE	(1 << NMK_BANKBITS)		// 0x10000
+#define NMK_BANKMASK	(NMK_BANKSIZE - 1)		// 0xFFFF
+#define NMK_ROMBASE		(4 * NMK_BANKSIZE)		// 0x40000
+
+static UINT8 memory_raw_read_byte(okim6295_state *chip, offs_t offset)
+{
+	offs_t CurOfs;
+	
+	if (! chip->nmk_mode)
+	{
+		CurOfs = chip->bank_offs | offset;
+	}
+	else
+	{
+		UINT8 BankID;
+		
+		if (offset < NMK_TABLESIZE && (chip->nmk_mode & 0x80))
+		{
+			// pages sample table
+			BankID = offset >> NMK_BNKTBLBITS;
+			CurOfs = offset & NMK_TABLEMASK;	// 0x3FF, not 0xFF
+		}
+		else
+		{
+			BankID = offset >> NMK_BANKBITS;
+			CurOfs = offset & NMK_BANKMASK;
+		}
+		CurOfs |= (chip->nmk_bankBankID & 0x03 << NMK_BANKBITS);
+		// I modified MAME to write a clean sample ROM.
+		// (Usually it moves the data by NMK_ROMBASE.)
+		//CurOfs += NMK_ROMBASE;
+	}
+	if (CurOfs < chip->ROMSize)
+		return chip->ROMCurOfs;
+	else
+		return 0x00;
+}
+
+static void generate_adpcm(okim6295_state *chip, struct ADPCMVoice *voice, INT16 *buffer, int samples)
+{
+	/* if this voice is active */
+	if (voice->playing)
+	{
+		offs_t base = voice->base_offset;
+		int sample = voice->sample;
+		int count = voice->count;
+
+		/* loop while we still have samples to generate */
+		while (samples)
+		{
+			/* compute the new amplitude and update the current step */
+			//int nibble = memory_raw_read_byte(chip->device->space(), base + sample / 2) >> (((sample & 1) << 2) ^ 4);
+			UINT8 nibble = memory_raw_read_byte(chip, base + sample / 2) >> (((sample & 1) << 2) ^ 4);
+
+			/* output to the buffer, scaling by the volume */
+			/* signal in range -2048..2047, volume in range 2..32 => signal * volume / 2 in range -32768..32767 */
+			*buffer++ = clock_adpcm(&voice->adpcm, nibble) * voice->volume / 2;
+			samples--;
+
+			/* next! */
+			if (++sample >= count)
+			{
+				voice->playing = 0;
+				break;
+			}
+		}
+
+		/* update the parameters */
+		voice->sample = sample;
+	}
+
+	/* fill the rest with silence */
+	while (samples--)
+		*buffer++ = 0;
+}
+
+
+
+/**********************************************************************************************
+ *
+ * OKIM 6295 ADPCM chip:
+ *
+ * Command bytes are sent:
+ *
+ * 1xxx xxxx = start of 2-byte command sequence, xxxxxxx is the sample number to trigger
+ * abcd vvvv = second half of command; one of the abcd bits is set to indicate which voice
+ * the v bits seem to be volumed
+ *
+ * 0abc d000 = stop playing; one or more of the abcd bits is set to indicate which voice(s)
+ *
+ * Status is read:
+ *
+ * ???? abcd = one bit per voice, set to 0 if nothing is playing, or 1 if it is active
+ *
+***********************************************************************************************/
+
+
+/**********************************************************************************************
+
+ okim6295_update -- update the sound chip so that it is in sync with CPU execution
+
+***********************************************************************************************/
+
+//static STREAM_UPDATE( okim6295_update )
+void okim6295_update(void *param, stream_sample_t **outputs, int samples)
+{
+	okim6295_state *chip = (okim6295_state *)param;
+	int i;
+
+	memset(outputs0, 0, samples * sizeof(*outputs0));
+
+	for (i = 0; i < OKIM6295_VOICES; i++)
+	{
+		struct ADPCMVoice *voice = &chip->voicei;
+		if (! voice->Muted)
+		{
+			stream_sample_t *buffer = outputs0;
+			INT16 sample_dataMAX_SAMPLE_CHUNK;
+			int remaining = samples;
+
+			/* loop while we have samples remaining */
+			while (remaining)
+			{
+				int samples = (remaining > MAX_SAMPLE_CHUNK) ? MAX_SAMPLE_CHUNK : remaining;
+				int samp;
+
+				generate_adpcm(chip, voice, sample_data, samples);
+				for (samp = 0; samp < samples; samp++)
+					*buffer++ += sample_datasamp;
+
+				remaining -= samples;
+			}
+		}
+	}
+	
+	memcpy(outputs1, outputs0, samples * sizeof(*outputs0));
+}
+
+
+
+/**********************************************************************************************
+
+ state save support for MAME
+
+***********************************************************************************************/
+
+/*static void adpcm_state_save_register(struct ADPCMVoice *voice, running_device *device, int index)
+{
+	state_save_register_device_item(device, index, voice->playing);
+	state_save_register_device_item(device, index, voice->sample);
+	state_save_register_device_item(device, index, voice->count);
+	state_save_register_device_item(device, index, voice->adpcm.signal);
+	state_save_register_device_item(device, index, voice->adpcm.step);
+	state_save_register_device_item(device, index, voice->volume);
+	state_save_register_device_item(device, index, voice->base_offset);
+}
+
+static STATE_POSTLOAD( okim6295_postload )
+{
+	running_device *device = (running_device *)param;
+	okim6295_state *info = get_safe_token(device);
+	okim6295_set_bank_base(device, info->bank_offs);
+}
+
+static void okim6295_state_save_register(okim6295_state *info, running_device *device)
+{
+	int j;
+
+	state_save_register_device_item(device, 0, info->command);
+	state_save_register_device_item(device, 0, info->bank_offs);
+	for (j = 0; j < OKIM6295_VOICES; j++)
+		adpcm_state_save_register(&info->voicej, device, j);
+
+	state_save_register_postload(device->machine, okim6295_postload, (void *)device);
+}*/
+
+
+
+/**********************************************************************************************
+
+ DEVICE_START( okim6295 ) -- start emulation of an OKIM6295-compatible chip
+
+***********************************************************************************************/
+
+//static DEVICE_START( okim6295 )
+int device_start_okim6295(void **_info, int clock)
+{
+	//const okim6295_interface *intf = (const okim6295_interface *)device->baseconfig().static_config;
+	//okim6295_state *info = get_safe_token(device);
+	okim6295_state *info;
+	//int divisor = intf->pin7 ? 132 : 165;
+	int divisor;
+	//int voice;
+
+	info = (okim6295_state *) calloc(1, sizeof(okim6295_state));
+	*_info = (void *) info;
+	
+	compute_tables();
+
+	info->command = -1;
+	//info->bank_installed = FALSE;
+	info->bank_offs = 0;
+	info->nmk_mode = 0x00;
+	memset(info->nmk_bank, 0x00, 4 * sizeof(UINT8));
+	//info->device = device;
+
+	//info->master_clock = device->clock;
+	info->initial_clock = clock;
+	info->master_clock = clock & 0x7FFFFFFF;
+	info->pin7_state = (clock & 0x80000000) >> 31;
+	info->SmpRateFunc = NULL;
+
+	/* generate the name and create the stream */
+	divisor = info->pin7_state ? 132 : 165;
+	//info->stream = stream_create(device, 0, 1, device->clock/divisor, info, okim6295_update);
+
+	// moved to device_reset
+	/*// initialize the voices //
+	for (voice = 0; voice < OKIM6295_VOICES; voice++)
+	{
+		// initialize the rest of the structure //
+		info->voicevoice.volume = 0;
+		reset_adpcm(&info->voicevoice.adpcm);
+	}*/
+
+	//okim6295_state_save_register(info, device);
+
+	return info->master_clock / divisor;
+}
+
+
+
+void device_stop_okim6295(void *_info)
+{
+	okim6295_state* chip = (okim6295_state *)_info;
+	
+	free(chip->ROM);	chip->ROM = NULL;
+	chip->ROMSize = 0x00;
+
+	free(chip);
+	
+	return;
+}
+
+/**********************************************************************************************
+
+ DEVICE_RESET( okim6295 ) -- stop emulation of an OKIM6295-compatible chip
+
+***********************************************************************************************/
+
+//static DEVICE_RESET( okim6295 )
+void device_reset_okim6295(void *_info)
+{
+	//okim6295_state *info = get_safe_token(device);
+	okim6295_state *info = (okim6295_state *)_info;
+	int voice;
+
+	//stream_update(info->stream);
+	
+	info->command = -1;
+	info->bank_offs = 0;
+	info->nmk_mode = 0x00;
+	memset(info->nmk_bank, 0x00, 4 * sizeof(UINT8));
+	info->master_clock = info->initial_clock & 0x7FFFFFFF;
+	info->pin7_state = (info->initial_clock & 0x80000000) >> 31;
+	
+	for (voice = 0; voice < OKIM6295_VOICES; voice++)
+	{
+		info->voicevoice.volume = 0;
+		reset_adpcm(&info->voicevoice.adpcm);
+		
+		info->voicevoice.playing = 0;
+	}
+}
+
+
+
+/**********************************************************************************************
+
+ okim6295_set_bank_base -- set the base of the bank for a given voice on a given chip
+
+***********************************************************************************************/
+
+//void okim6295_set_bank_base(running_device *device, int base)
+void okim6295_set_bank_base(okim6295_state *info, int base)
+{
+	//okim6295_state *info = get_safe_token(device);
+	//stream_update(info->stream);
+
+	// if we are setting a non-zero base, and we have no bank, allocate one
+	/*if (!info->bank_installed && base != 0)
+	{
+		// override our memory map with a bank
+		//memory_install_read_bank(device->space(), 0x00000, 0x3ffff, 0, 0, device->tag());
+		info->bank_installed = TRUE;
+	}
+
+	// if we have a bank number, set the base pointer
+	if (info->bank_installed)
+	{
+		info->bank_offs = base;
+		//memory_set_bankptr(device->machine, device->tag(), device->region->base.u8 + base);
+	}*/
+	info->bank_offs = base;
+}
+
+
+
+/**********************************************************************************************
+
+ okim6295_set_pin7 -- adjust pin 7, which controls the internal clock division
+
+***********************************************************************************************/
+
+static void okim6295_clock_changed(okim6295_state *info)
+{
+	int divisor;
+	divisor = info->pin7_state ? 132 : 165;
+	//stream_set_sample_rate(info->stream, info->master_clock/divisor);
+	if (info->SmpRateFunc != NULL)
+		info->SmpRateFunc(info->SmpRateData, info->master_clock / divisor);
+}
+
+//void okim6295_set_pin7(running_device *device, int pin7)
+INLINE void okim6295_set_pin7(okim6295_state *info, int pin7)
+{
+	//okim6295_state *info = get_safe_token(device);
+
+	info->pin7_state = pin7;
+	okim6295_clock_changed(info);
+}
+
+
+/**********************************************************************************************
+
+ okim6295_status_r -- read the status port of an OKIM6295-compatible chip
+
+***********************************************************************************************/
+
+//READ8_DEVICE_HANDLER( okim6295_r )
+UINT8 okim6295_r(void *_info, offs_t offset)
+{
+	//okim6295_state *info = get_safe_token(device);
+	okim6295_state *info = (okim6295_state *)_info;
+	int i, result;
+
+	result = 0xf0;	/* naname expects bits 4-7 to be 1 */
+
+	/* set the bit to 1 if something is playing on a given channel */
+	//stream_update(info->stream);
+	for (i = 0; i < OKIM6295_VOICES; i++)
+	{
+		struct ADPCMVoice *voice = &info->voicei;
+
+		/* set the bit if it's playing */
+		if (voice->playing)
+			result |= 1 << i;
+	}
+
+	return result;
+}
+
+
+
+/**********************************************************************************************
+
+ okim6295_data_w -- write to the data port of an OKIM6295-compatible chip
+
+***********************************************************************************************/
+
+//WRITE8_DEVICE_HANDLER( okim6295_w )
+void okim6295_write_command(okim6295_state *info, UINT8 data)
+{
+	//okim6295_state *info = get_safe_token(device);
+
+	/* if a command is pending, process the second half */
+	if (info->command != -1)
+	{
+		int temp = data >> 4, i, start, stop;
+		offs_t base;
+
+		/* the manual explicitly says that it's not possible to start multiple voices at the same time */
+		if (temp != 0 && temp != 1 && temp != 2 && temp != 4 && temp != 8)
+			printf("OKI6295 start %x contact MAMEDEV\n", temp);
+
+		/* update the stream */
+		//stream_update(info->stream);
+
+		/* determine which voice(s) (voice is set by a 1 bit in the upper 4 bits of the second byte) */
+		for (i = 0; i < OKIM6295_VOICES; i++, temp >>= 1)
+		{
+			if (temp & 1)
+			{
+				struct ADPCMVoice *voice = &info->voicei;
+
+				/* determine the start/stop positions */
+				base = info->command * 8;
+
+				//start = memory_raw_read_byte(device->space(), base + 0) << 16;
+				start = memory_raw_read_byte(info, base + 0) << 16;
+				start |= memory_raw_read_byte(info, base + 1) << 8;
+				start |= memory_raw_read_byte(info, base + 2) << 0;
+				start &= 0x3ffff;
+
+				stop = memory_raw_read_byte(info, base + 3) << 16;
+				stop |= memory_raw_read_byte(info, base + 4) << 8;
+				stop |= memory_raw_read_byte(info, base + 5) << 0;
+				stop &= 0x3ffff;
+
+				/* set up the voice to play this sample */
+				if (start < stop)
+				{
+					if (!voice->playing) /* fixes Got-cha and Steel Force */
+					{
+						voice->playing = 1;
+						voice->base_offset = start;
+						voice->sample = 0;
+						voice->count = 2 * (stop - start + 1);
+
+						/* also reset the ADPCM parameters */
+						reset_adpcm(&voice->adpcm);
+						voice->volume = volume_tabledata & 0x0f;
+					}
+					else
+					{
+						//logerror("OKIM6295:'%s' requested to play sample %02x on non-stopped voice\n",device->tag(),info->command);
+						// just displays warnings when seeking
+						//logerror("OKIM6295: Voice %u requested to play sample %02x on non-stopped voice\n",i,info->command);
+					}
+				}
+				/* invalid samples go here */
+				else
+				{
+					//logerror("OKIM6295:'%s' requested to play invalid sample %02x\n",device->tag(),info->command);
+#ifdef _DEBUG
+					logerror("OKIM6295: Voice %u requested to play invalid sample %02x\n",i,info->command);
+#endif
+					voice->playing = 0;
+				}
+			}
+		}
+
+		/* reset the command */
+		info->command = -1;
+	}
+
+	/* if this is the start of a command, remember the sample number for next time */
+	else if (data & 0x80)
+	{
+		info->command = data & 0x7f;
+	}
+
+	/* otherwise, see if this is a silence command */
+	else
+	{
+		int temp = data >> 3, i;
+
+		/* update the stream, then turn it off */
+		//stream_update(info->stream);
+
+		/* determine which voice(s) (voice is set by a 1 bit in bits 3-6 of the command */
+		for (i = 0; i < OKIM6295_VOICES; i++, temp >>= 1)
+		{
+			if (temp & 1)
+			{
+				struct ADPCMVoice *voice = &info->voicei;
+
+				voice->playing = 0;
+			}
+		}
+	}
+}
+
+void okim6295_w(void *_info, offs_t offset, UINT8 data)
+{
+	okim6295_state* chip = (okim6295_state *)_info;
+	
+	switch(offset)
+	{
+	case 0x00:
+		okim6295_write_command(chip, data);
+		break;
+	case 0x08:
+		chip->master_clock &= ~0x000000FF;
+		chip->master_clock |= data << 0;
+		break;
+	case 0x09:
+		chip->master_clock &= ~0x0000FF00;
+		chip->master_clock |= data << 8;
+		break;
+	case 0x0A:
+		chip->master_clock &= ~0x00FF0000;
+		chip->master_clock |= data << 16;
+		break;
+	case 0x0B:
+		if ((data >> 7) != chip->pin7_state)
+			printf("Pin 7 changed!\n");
+		data &= 0x7F;	// fix a bug in MAME VGM logs
+		chip->master_clock &= ~0xFF000000;
+		chip->master_clock |= data << 24;
+		okim6295_clock_changed(chip);
+		break;
+	case 0x0C:
+		okim6295_set_pin7(chip, data);
+		break;
+	case 0x0E:	// NMK112 bank switch enable
+		chip->nmk_mode = data;
+		break;
+	case 0x0F:
+		okim6295_set_bank_base(chip, data << 18);
+		break;
+	case 0x10:
+	case 0x11:
+	case 0x12:
+	case 0x13:
+		chip->nmk_bankoffset & 0x03 = data;
+		break;
+	}
+	
+	return;
+}
+
+void okim6295_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+						const UINT8* ROMData)
+{
+	okim6295_state *chip = (okim6295_state *)_info;
+	
+	if (chip->ROMSize != ROMSize)
+	{
+		chip->ROM = (UINT8*)realloc(chip->ROM, ROMSize);
+		chip->ROMSize = ROMSize;
+		//printf("OKIM6295: New ROM Size: 0x%05X\n", ROMSize);
+		memset(chip->ROM, 0xFF, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(chip->ROM + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+
+void okim6295_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	okim6295_state *chip = (okim6295_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < OKIM6295_VOICES; CurChn ++)
+		chip->voiceCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+void okim6295_set_srchg_cb(void *_info, SRATE_CALLBACK CallbackFunc, void* DataPtr)
+{
+	okim6295_state *info = (okim6295_state *)_info;
+	
+	// set Sample Rate Change Callback routine
+	info->SmpRateFunc = CallbackFunc;
+	info->SmpRateData = DataPtr;
+	
+	return;
+}
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( okim6295 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers --- //
+		case DEVINFO_INT_TOKEN_BYTES:				info->i = sizeof(okim6295_state);				break;
+		case DEVINFO_INT_DATABUS_WIDTH_0:			info->i = 8;									break;
+		case DEVINFO_INT_ADDRBUS_WIDTH_0:			info->i = 18;									break;
+		case DEVINFO_INT_ADDRBUS_SHIFT_0:			info->i = 0;									break;
+
+		// --- the following bits of info are returned as pointers to data --- //
+		case DEVINFO_PTR_DEFAULT_MEMORY_MAP_0:		info->default_map8 = ADDRESS_MAP_NAME(okim6295);break;
+
+		// --- the following bits of info are returned as pointers to functions --- //
+		case DEVINFO_FCT_START:						info->start = DEVICE_START_NAME( okim6295 );	break;
+		case DEVINFO_FCT_RESET:						info->reset = DEVICE_RESET_NAME( okim6295 );	break;
+
+		// --- the following bits of info are returned as NULL-terminated strings --- //
+		case DEVINFO_STR_NAME:						strcpy(info->s, "OKI6295");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "OKI ADPCM");					break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:				strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/okim6295.h Added

@@ -0,0 +1,51 @@
+#pragma once
+
+/* an interface for the OKIM6295 and similar chips */
+
+/*
+  Note about the playback frequency: the external clock is internally divided,
+  depending on pin 7, by 132 (high) or 165 (low).
+*/
+/*typedef struct _okim6295_interface okim6295_interface;
+struct _okim6295_interface
+{
+	int pin7;
+};
+
+extern const okim6295_interface okim6295_interface_pin7high;
+extern const okim6295_interface okim6295_interface_pin7low;*/
+
+
+
+//void okim6295_set_bank_base(running_device *device, int base);
+//void okim6295_set_pin7(running_device *device, int pin7);
+
+void okim6295_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_okim6295(void **chip, int clock);
+void device_stop_okim6295(void *chip);
+void device_reset_okim6295(void *chip);
+
+//READ8_DEVICE_HANDLER( okim6295_r );
+//WRITE8_DEVICE_HANDLER( okim6295_w );
+void okim6295_w(void *chip, offs_t offset, UINT8 data);
+
+void okim6295_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+						const UINT8* ROMData);
+void okim6295_set_mute_mask(void *chip, UINT32 MuteMask);
+void okim6295_set_srchg_cb(void *chip, SRATE_CALLBACK CallbackFunc, void* DataPtr);
+
+
+/*
+    To help the various custom ADPCM generators out there,
+    the following routines may be used.
+*/
+struct adpcm_state
+{
+	INT32	signal;
+	INT32	step;
+};
+void reset_adpcm(struct adpcm_state *state);
+INT16 clock_adpcm(struct adpcm_state *state, UINT8 nibble);
+
+//DEVICE_GET_INFO( okim6295 );
+//#define SOUND_OKIM6295 DEVICE_GET_INFO_NAME( okim6295 )

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/opl.c Added

@@ -0,0 +1,2027 @@
+// IMPORTANT: This file is not meant to be compiled. It's included in adlibemu_opl?.c.
+
+/*
+ * Copyright (C) 2002-2010 The DOSBox Team
+ * OPL2/OPL3 emulation library
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+/*
+ * Originally based on ADLIBEMU.C, an AdLib/OPL2 emulation library by Ken Silverman
+ * Copyright (C) 1998-2001 Ken Silverman
+ * Ken Silverman's official web site: "http://www.advsys.net/ken"
+ */
+
+
+#include <math.h>
+#include <stdlib.h> // rand()
+#include <string.h>	// for memset()
+//#include "dosbox.h"
+#include "../stdbool.h"
+#include "opl.h"
+
+
+//static fltype recipsamp;	// inverse of sampling rate		// moved to OPL_DATA
+static Bit16s wavtableWAVEPREC*3;	// wave form table
+
+// vibrato/tremolo tables
+static Bit32s vib_tableVIBTAB_SIZE;
+static Bit32s trem_tableTREMTAB_SIZE*2;
+
+static Bit32s vibval_constBLOCKBUF_SIZE;
+static Bit32s tremval_constBLOCKBUF_SIZE;
+
+// vibrato value tables (used per-operator)
+static Bit32s vibval_var1BLOCKBUF_SIZE;
+static Bit32s vibval_var2BLOCKBUF_SIZE;
+//static Bit32s vibval_var3BLOCKBUF_SIZE;
+//static Bit32s vibval_var4BLOCKBUF_SIZE;
+
+// vibrato/trmolo value table pointers
+//static Bit32s *vibval1, *vibval2, *vibval3, *vibval4;
+//static Bit32s *tremval1, *tremval2, *tremval3, *tremval4;
+// moved to adlib_getsample
+
+
+// key scale level lookup table
+static const fltype kslmul4 = {
+	0.0, 0.5, 0.25, 1.0		// -> 0, 3, 1.5, 6 dB/oct
+};
+
+// frequency multiplicator lookup table
+static const fltype frqmul_tab16 = {
+	0.5,1,2,3,4,5,6,7,8,9,10,10,12,12,15,15
+};
+// calculated frequency multiplication values (depend on sampling rate)
+//static fltype frqmul16;	// moved to OPL_DATA
+
+// key scale levels
+static Bit8u kslev816;
+
+// map a channel number to the register offset of the modulator (=register base)
+static const Bit8u modulatorbase9	= {
+	0,1,2,
+	8,9,10,
+	16,17,18
+};
+
+// map a register base to a modulator operator number or operator number
+#if defined(OPLTYPE_IS_OPL3)
+static const Bit8u regbase2modop44 = {
+	0,1,2,0,1,2,0,0,3,4,5,3,4,5,0,0,6,7,8,6,7,8,					// first set
+	18,19,20,18,19,20,0,0,21,22,23,21,22,23,0,0,24,25,26,24,25,26	// second set
+};
+static const Bit8u regbase2op44 = {
+	0,1,2,9,10,11,0,0,3,4,5,12,13,14,0,0,6,7,8,15,16,17,			// first set
+	18,19,20,27,28,29,0,0,21,22,23,30,31,32,0,0,24,25,26,33,34,35	// second set
+};
+#else
+static const Bit8u regbase2modop22 = {
+	0,1,2,0,1,2,0,0,3,4,5,3,4,5,0,0,6,7,8,6,7,8
+};
+static const Bit8u regbase2op22 = {
+	0,1,2,9,10,11,0,0,3,4,5,12,13,14,0,0,6,7,8,15,16,17
+};
+#endif
+
+
+// start of the waveform
+static Bit32u waveform8 = {
+	WAVEPREC,
+	WAVEPREC>>1,
+	WAVEPREC,
+	(WAVEPREC*3)>>2,
+	0,
+	0,
+	(WAVEPREC*5)>>2,
+	WAVEPREC<<1
+};
+
+// length of the waveform as mask
+static Bit32u wavemask8 = {
+	WAVEPREC-1,
+	WAVEPREC-1,
+	(WAVEPREC>>1)-1,
+	(WAVEPREC>>1)-1,
+	WAVEPREC-1,
+	((WAVEPREC*3)>>2)-1,
+	WAVEPREC>>1,
+	WAVEPREC-1
+};
+
+// where the first entry resides
+static Bit32u wavestart8 = {
+	0,
+	WAVEPREC>>1,
+	0,
+	WAVEPREC>>2,
+	0,
+	0,
+	0,
+	WAVEPREC>>3
+};
+
+// envelope generator function constants
+static fltype attackconst4 = {
+	(fltype)(1/2.82624),
+	(fltype)(1/2.25280),
+	(fltype)(1/1.88416),
+	(fltype)(1/1.59744)
+};
+static fltype decrelconst4 = {
+	(fltype)(1/39.28064),
+	(fltype)(1/31.41608),
+	(fltype)(1/26.17344),
+	(fltype)(1/22.44608)
+};
+
+
+INLINE void operator_advance(OPL_DATA* chip, op_type* op_pt, Bit32s vib) {
+	op_pt->wfpos = op_pt->tcount;						// waveform position
+	
+	// advance waveform time
+	op_pt->tcount += op_pt->tinc;
+	op_pt->tcount += (Bit32s)(op_pt->tinc)*vib/FIXEDPT;
+
+	op_pt->generator_pos += chip->generator_add;
+}
+
+INLINE void operator_advance_drums(OPL_DATA* chip, op_type* op_pt1, Bit32s vib1, op_type* op_pt2, Bit32s vib2, op_type* op_pt3, Bit32s vib3)
+{
+	Bit32u c1 = op_pt1->tcount/FIXEDPT;
+	Bit32u c3 = op_pt3->tcount/FIXEDPT;
+	Bit32u phasebit = (((c1 & 0x88) ^ ((c1<<5) & 0x80)) | ((c3 ^ (c3<<2)) & 0x20)) ? 0x02 : 0x00;
+
+	Bit32u noisebit = rand()&1;
+
+	Bit32u snare_phase_bit = (((Bitu)((op_pt1->tcount/FIXEDPT) / 0x100))&1);
+
+	//Hihat
+	Bit32u inttm = (phasebit<<8) | (0x34<<(phasebit ^ (noisebit<<1)));
+	op_pt1->wfpos = inttm*FIXEDPT;				// waveform position
+	// advance waveform time
+	op_pt1->tcount += op_pt1->tinc;
+	op_pt1->tcount += (Bit32s)(op_pt1->tinc)*vib1/FIXEDPT;
+	op_pt1->generator_pos += chip->generator_add;
+
+	//Snare
+	inttm = ((1+snare_phase_bit) ^ noisebit)<<8;
+	op_pt2->wfpos = inttm*FIXEDPT;				// waveform position
+	// advance waveform time
+	op_pt2->tcount += op_pt2->tinc;
+	op_pt2->tcount += (Bit32s)(op_pt2->tinc)*vib2/FIXEDPT;
+	op_pt2->generator_pos += chip->generator_add;
+
+	//Cymbal
+	inttm = (1+phasebit)<<8;
+	op_pt3->wfpos = inttm*FIXEDPT;				// waveform position
+	// advance waveform time
+	op_pt3->tcount += op_pt3->tinc;
+	op_pt3->tcount += (Bit32s)(op_pt3->tinc)*vib3/FIXEDPT;
+	op_pt3->generator_pos += chip->generator_add;
+}
+
+
+// output level is sustained, mode changes only when operator is turned off (->release)
+// or when the keep-sustained bit is turned off (->sustain_nokeep)
+INLINE void operator_output(op_type* op_pt, Bit32s modulator, Bit32s trem)
+{
+	if (op_pt->op_state != OF_TYPE_OFF)
+	{
+		Bit32u i;
+		op_pt->lastcval = op_pt->cval;
+		i = (Bit32u)((op_pt->wfpos+modulator)/FIXEDPT);
+
+		// wform: -16384 to 16383 (0x4000)
+		// trem : 32768 to 65535 (0x10000)
+		// step_amp: 0.0 to 1.0
+		// vol : 1/2^14 to 1/2^29 (/0x4000; /1../0x8000)
+
+		op_pt->cval = (Bit32s)(op_pt->step_amp*op_pt->vol*op_pt->cur_wformi&op_pt->cur_wmask*trem/16.0);
+	}
+}
+
+
+// no action, operator is off
+static void operator_off(op_type* op_pt) {
+}
+
+// output level is sustained, mode changes only when operator is turned off (->release)
+// or when the keep-sustained bit is turned off (->sustain_nokeep)
+static void operator_sustain(op_type* op_pt)
+{
+	Bit32u num_steps_add = op_pt->generator_pos/FIXEDPT;	// number of (standardized) samples
+	Bit32u ct;
+	for (ct=0; ct<num_steps_add; ct++)
+	{
+		op_pt->cur_env_step++;
+	}
+	op_pt->generator_pos -= num_steps_add*FIXEDPT;
+}
+
+// operator in release mode, if output level reaches zero the operator is turned off
+static void operator_release(op_type* op_pt)
+{
+	Bit32u num_steps_add;
+	Bit32u ct;
+	
+	// ??? boundary?
+	if (op_pt->amp > 0.00000001)
+	{
+		// release phase
+		op_pt->amp *= op_pt->releasemul;
+	}
+
+	num_steps_add = op_pt->generator_pos/FIXEDPT;	// number of (standardized) samples
+	for (ct=0; ct<num_steps_add; ct++)
+	{
+		op_pt->cur_env_step++;						// sample counter
+		if ((op_pt->cur_env_step & op_pt->env_step_r)==0)
+		{
+			if (op_pt->amp <= 0.00000001)
+			{
+				// release phase finished, turn off this operator
+				op_pt->amp = 0.0;
+				if (op_pt->op_state == OF_TYPE_REL)
+				{
+					op_pt->op_state = OF_TYPE_OFF;
+				}
+			}
+			op_pt->step_amp = op_pt->amp;
+		}
+	}
+	op_pt->generator_pos -= num_steps_add*FIXEDPT;
+}
+
+// operator in decay mode, if sustain level is reached the output level is either
+// kept (sustain level keep enabled) or the operator is switched into release mode
+static void operator_decay(op_type* op_pt)
+{
+	Bit32u num_steps_add;
+	Bit32u ct;
+	
+	if (op_pt->amp > op_pt->sustain_level)
+	{
+		// decay phase
+		op_pt->amp *= op_pt->decaymul;
+	}
+
+	num_steps_add = op_pt->generator_pos/FIXEDPT;	// number of (standardized) samples
+	for (ct=0; ct<num_steps_add; ct++)
+	{
+		op_pt->cur_env_step++;
+		if ((op_pt->cur_env_step & op_pt->env_step_d)==0)
+		{
+			if (op_pt->amp <= op_pt->sustain_level)
+			{
+				// decay phase finished, sustain level reached
+				if (op_pt->sus_keep)
+				{
+					// keep sustain level (until turned off)
+					op_pt->op_state = OF_TYPE_SUS;
+					op_pt->amp = op_pt->sustain_level;
+				}
+				else
+				{
+					// next: release phase
+					op_pt->op_state = OF_TYPE_SUS_NOKEEP;
+				}
+			}
+			op_pt->step_amp = op_pt->amp;
+		}
+	}
+	op_pt->generator_pos -= num_steps_add*FIXEDPT;
+}
+
+// operator in attack mode, if full output level is reached,
+// the operator is switched into decay mode
+static void operator_attack(op_type* op_pt)
+{
+	Bit32u num_steps_add;
+	Bit32u ct;
+	
+	op_pt->amp = ((op_pt->a3*op_pt->amp + op_pt->a2)*op_pt->amp + op_pt->a1)*op_pt->amp + op_pt->a0;
+
+	num_steps_add = op_pt->generator_pos/FIXEDPT;		// number of (standardized) samples
+	for (ct=0; ct<num_steps_add; ct++)
+	{
+		op_pt->cur_env_step++;	// next sample
+		if ((op_pt->cur_env_step & op_pt->env_step_a)==0)
+		{		// check if next step already reached
+			if (op_pt->amp > 1.0)
+			{
+				// attack phase finished, next: decay
+				op_pt->op_state = OF_TYPE_DEC;
+				op_pt->amp = 1.0;
+				op_pt->step_amp = 1.0;
+			}
+			op_pt->step_skip_pos_a <<= 1;
+			if (op_pt->step_skip_pos_a==0) op_pt->step_skip_pos_a = 1;
+			if (op_pt->step_skip_pos_a & op_pt->env_step_skip_a)
+			{	// check if required to skip next step
+				op_pt->step_amp = op_pt->amp;
+			}
+		}
+	}
+	op_pt->generator_pos -= num_steps_add*FIXEDPT;
+}
+
+static void operator_eg_attack_check(op_type* op_pt)
+{
+	if (((op_pt->cur_env_step + 1) & op_pt->env_step_a)==0)
+	{
+		// check if next step already reached
+		if (op_pt->a0 >= 1.0)
+		{
+			// attack phase finished, next: decay
+			op_pt->op_state = OF_TYPE_DEC;
+			op_pt->amp = 1.0;
+			op_pt->step_amp = 1.0;
+		}
+	}
+}
+
+
+typedef void (*optype_fptr)(op_type*);
+
+static optype_fptr opfuncs6 = {
+	operator_attack,
+	operator_decay,
+	operator_release,
+	operator_sustain,	// sustain phase (keeping level)
+	operator_release,	// sustain_nokeep phase (release-style)
+	operator_off
+};
+
+static void change_attackrate(OPL_DATA* chip, Bitu regbase, op_type* op_pt)
+{
+	Bits attackrate = chip->adlibregARC_ATTR_DECR+regbase>>4;
+	if (attackrate)
+	{
+		static Bit8u step_skip_mask5 = {0xff, 0xfe, 0xee, 0xba, 0xaa}; 
+		Bits step_skip;
+		Bits steps;
+		Bits step_num;
+		
+		fltype f = (fltype)(pow(FL2,(fltype)attackrate+(op_pt->toff>>2)-1)*attackconstop_pt->toff&3*chip->recipsamp);
+		// attack rate coefficients
+		op_pt->a0 = (fltype)(0.0377*f);
+		op_pt->a1 = (fltype)(10.73*f+1);
+		op_pt->a2 = (fltype)(-17.57*f);
+		op_pt->a3 = (fltype)(7.42*f);
+
+		step_skip = attackrate*4 + op_pt->toff;
+		steps = step_skip >> 2;
+		op_pt->env_step_a = (1<<(steps<=12?12-steps:0))-1;
+
+		step_num = (step_skip<=48)?(4-(step_skip&3)):0;
+		op_pt->env_step_skip_a = step_skip_maskstep_num;
+
+#if defined(OPLTYPE_IS_OPL3)
+		if (step_skip>=60)
+#else
+		if (step_skip>=62)
+#endif
+		{
+			op_pt->a0 = (fltype)(2.0);	// something that triggers an immediate transition to amp:=1.0
+			op_pt->a1 = (fltype)(0.0);
+			op_pt->a2 = (fltype)(0.0);
+			op_pt->a3 = (fltype)(0.0);
+		}
+	}
+	else
+	{
+		// attack disabled
+		op_pt->a0 = 0.0;
+		op_pt->a1 = 1.0;
+		op_pt->a2 = 0.0;
+		op_pt->a3 = 0.0;
+		op_pt->env_step_a = 0;
+		op_pt->env_step_skip_a = 0;
+	}
+}
+
+static void change_decayrate(OPL_DATA* chip, Bitu regbase, op_type* op_pt)
+{
+	Bits decayrate = chip->adlibregARC_ATTR_DECR+regbase&15;
+	// decaymul should be 1.0 when decayrate==0
+	if (decayrate) {
+		Bits steps;
+		
+		fltype f = (fltype)(-7.4493*decrelconstop_pt->toff&3*chip->recipsamp);
+		op_pt->decaymul = (fltype)(pow(FL2,f*pow(FL2,(fltype)(decayrate+(op_pt->toff>>2)))));
+		steps = (decayrate*4 + op_pt->toff) >> 2;
+		op_pt->env_step_d = (1<<(steps<=12?12-steps:0))-1;
+	}
+	else
+	{
+		op_pt->decaymul = 1.0;
+		op_pt->env_step_d = 0;
+	}
+}
+
+static void change_releaserate(OPL_DATA* chip, Bitu regbase, op_type* op_pt)
+{
+	Bits releaserate = chip->adlibregARC_SUSL_RELR+regbase&15;
+	// releasemul should be 1.0 when releaserate==0
+	if (releaserate)
+	{
+		Bits steps;
+		
+		fltype f = (fltype)(-7.4493*decrelconstop_pt->toff&3*chip->recipsamp);
+		op_pt->releasemul = (fltype)(pow(FL2,f*pow(FL2,(fltype)(releaserate+(op_pt->toff>>2)))));
+		steps = (releaserate*4 + op_pt->toff) >> 2;
+		op_pt->env_step_r = (1<<(steps<=12?12-steps:0))-1;
+	}
+	else
+	{
+		op_pt->releasemul = 1.0;
+		op_pt->env_step_r = 0;
+	}
+}
+
+static void change_sustainlevel(OPL_DATA* chip, Bitu regbase, op_type* op_pt)
+{
+	Bits sustainlevel = chip->adlibregARC_SUSL_RELR+regbase>>4;
+	// sustainlevel should be 0.0 when sustainlevel==15 (max)
+	if (sustainlevel<15)
+	{
+		op_pt->sustain_level = (fltype)(pow(FL2,(fltype)sustainlevel * (-FL05)));
+	}
+	else
+	{
+		op_pt->sustain_level = 0.0;
+	}
+}
+
+static void change_waveform(OPL_DATA* chip, Bitu regbase, op_type* op_pt)
+{
+#if defined(OPLTYPE_IS_OPL3)
+	if (regbase>=ARC_SECONDSET) regbase -= (ARC_SECONDSET-22);	// second set starts at 22
+#endif
+	// waveform selection
+	op_pt->cur_wmask = wavemaskchip->wave_selregbase;
+	op_pt->cur_wform = &wavtablewaveformchip->wave_selregbase;
+	// (might need to be adapted to waveform type here...)
+}
+
+static void change_keepsustain(OPL_DATA* chip, Bitu regbase, op_type* op_pt)
+{
+	op_pt->sus_keep = (chip->adlibregARC_TVS_KSR_MUL+regbase&0x20)>0;
+	if (op_pt->op_state==OF_TYPE_SUS)
+	{
+		if (!op_pt->sus_keep)
+			op_pt->op_state = OF_TYPE_SUS_NOKEEP;
+	}
+	else if (op_pt->op_state==OF_TYPE_SUS_NOKEEP)
+	{
+		if (op_pt->sus_keep)
+			op_pt->op_state = OF_TYPE_SUS;
+	}
+}
+
+// enable/disable vibrato/tremolo LFO effects
+static void change_vibrato(OPL_DATA* chip, Bitu regbase, op_type* op_pt)
+{
+	op_pt->vibrato = (chip->adlibregARC_TVS_KSR_MUL+regbase&0x40)!=0;
+	op_pt->tremolo = (chip->adlibregARC_TVS_KSR_MUL+regbase&0x80)!=0;
+}
+
+// change amount of self-feedback
+static void change_feedback(OPL_DATA* chip, Bitu chanbase, op_type* op_pt)
+{
+	Bits feedback = chip->adlibregARC_FEEDBACK+chanbase&14;
+	if (feedback)
+		op_pt->mfbi = (Bit32s)(pow(FL2,(fltype)((feedback>>1)+8)));
+	else
+		op_pt->mfbi = 0;
+}
+
+static void change_frequency(OPL_DATA* chip, Bitu chanbase, Bitu regbase, op_type* op_pt)
+{
+	Bit32u frn;
+	Bit32u oct;
+	Bit32u note_sel;
+	fltype vol_in;
+	
+	// frequency
+	frn = ((((Bit32u)chip->adlibregARC_KON_BNUM+chanbase)&3)<<8) + (Bit32u)chip->adlibregARC_FREQ_NUM+chanbase;
+	// block number/octave
+	oct = ((((Bit32u)chip->adlibregARC_KON_BNUM+chanbase)>>2)&7);
+	op_pt->freq_high = (Bit32s)((frn>>7)&7);
+
+	// keysplit
+	note_sel = (chip->adlibreg8>>6)&1;
+	op_pt->toff = ((frn>>9)&(note_sel^1)) | ((frn>>8)&note_sel);
+	op_pt->toff += (oct<<1);
+
+	// envelope scaling (KSR)
+	if (!(chip->adlibregARC_TVS_KSR_MUL+regbase&0x10)) op_pt->toff >>= 2;
+
+	// 20+a0+b0:
+	op_pt->tinc = (Bit32u)((((fltype)(frn<<oct))*chip->frqmulchip->adlibregARC_TVS_KSR_MUL+regbase&15));
+	// 40+a0+b0:
+	vol_in = (fltype)((fltype)(chip->adlibregARC_KSL_OUTLEV+regbase&63) +
+							kslmulchip->adlibregARC_KSL_OUTLEV+regbase>>6*kslevoctfrn>>6);
+	op_pt->vol = (fltype)(pow(FL2,(fltype)(vol_in * -0.125 - 14)));
+
+	// operator frequency changed, care about features that depend on it
+	change_attackrate(chip, regbase,op_pt);
+	change_decayrate(chip, regbase,op_pt);
+	change_releaserate(chip, regbase,op_pt);
+}
+
+static void enable_operator(OPL_DATA* chip, Bitu regbase, op_type* op_pt, Bit32u act_type)
+{
+	// check if this is really an off-on transition
+	if (op_pt->act_state == OP_ACT_OFF)
+	{
+		Bits wselbase = regbase;
+		if (wselbase>=ARC_SECONDSET)
+			wselbase -= (ARC_SECONDSET-22);	// second set starts at 22
+
+		op_pt->tcount = wavestartchip->wave_selwselbase*FIXEDPT;
+
+		// start with attack mode
+		op_pt->op_state = OF_TYPE_ATT;
+		op_pt->act_state |= act_type;
+	}
+}
+
+static void disable_operator(op_type* op_pt, Bit32u act_type)
+{
+	// check if this is really an on-off transition
+	if (op_pt->act_state != OP_ACT_OFF)
+	{
+		op_pt->act_state &= (~act_type);
+		if (op_pt->act_state == OP_ACT_OFF)
+		{
+			if (op_pt->op_state != OF_TYPE_OFF)
+				op_pt->op_state = OF_TYPE_REL;
+		}
+	}
+}
+
+//void adlib_init(Bit32u samplerate)
+void* ADLIBEMU(init)(UINT32 clock, UINT32 samplerate,
+					 ADL_UPDATEHANDLER UpdateHandler, void* param)
+{
+	OPL_DATA* OPL;
+	//op_type* op;
+
+	Bits i, j, oct;
+	//Bit32s trem_table_intTREMTAB_SIZE;
+	static Bitu initfirstime = 0;
+
+	OPL = (OPL_DATA*)malloc(sizeof(OPL_DATA));
+	OPL->chip_clock = clock;
+	OPL->int_samplerate = samplerate;
+	OPL->UpdateHandler = UpdateHandler;
+	OPL->UpdateParam = param;
+
+	OPL->generator_add = (Bit32u)(INTFREQU*FIXEDPT/OPL->int_samplerate);
+
+
+	/*memset(OPL->adlibreg,0,sizeof(OPL->adlibreg));
+	memset(OPL->op,0,sizeof(op_type)*MAXOPERATORS);
+	memset(OPL->wave_sel,0,sizeof(OPL->wave_sel));
+
+	for (i=0;i<MAXOPERATORS;i++)
+	{
+		op = &OPL->opi;
+		
+		op->op_state = OF_TYPE_OFF;
+		op->act_state = OP_ACT_OFF;
+		op->amp = 0.0;
+		op->step_amp = 0.0;
+		op->vol = 0.0;
+		op->tcount = 0;
+		op->tinc = 0;
+		op->toff = 0;
+		op->cur_wmask = wavemask0;
+		op->cur_wform = &wavtablewaveform0;
+		op->freq_high = 0;
+
+		op->generator_pos = 0;
+		op->cur_env_step = 0;
+		op->env_step_a = 0;
+		op->env_step_d = 0;
+		op->env_step_r = 0;
+		op->step_skip_pos_a = 0;
+		op->env_step_skip_a = 0;
+
+#if defined(OPLTYPE_IS_OPL3)
+		op->is_4op = false;
+		op->is_4op_attached = false;
+		op->left_pan = 1;
+		op->right_pan = 1;
+#endif
+	}*/
+
+	OPL->recipsamp = 1.0 / (fltype)OPL->int_samplerate;
+	for (i=15;i>=0;i--)
+	{
+		OPL->frqmuli = (fltype)(frqmul_tabi*INTFREQU/(fltype)WAVEPREC*(fltype)FIXEDPT*OPL->recipsamp);
+	}
+
+	//OPL->status = 0;
+	//OPL->opl_index = 0;
+
+
+	if (!initfirstime)
+	{
+		// create vibrato table
+		vib_table0 = 8;
+		vib_table1 = 4;
+		vib_table2 = 0;
+		vib_table3 = -4;
+		for (i=4; i<VIBTAB_SIZE; i++) vib_tablei = vib_tablei-4*-1;
+	}
+
+	// vibrato at ~6.1 ?? (opl3 docs say 6.1, opl4 docs say 6.0, y8950 docs say 6.4)
+	OPL->vibtab_add = (Bit32u)(VIBTAB_SIZE*FIXEDPT_LFO/8192*INTFREQU/OPL->int_samplerate);
+	OPL->vibtab_pos = 0;
+
+	if (!initfirstime)
+	{
+		Bit32s trem_table_intTREMTAB_SIZE;
+		
+		for (i=0; i<BLOCKBUF_SIZE; i++) vibval_consti = 0;
+
+
+		// create tremolo table
+		for (i=0; i<14; i++)	trem_table_inti = i-13;		// upwards (13 to 26 -> -0.5/6 to 0)
+		for (i=14; i<41; i++)	trem_table_inti = -i+14;		// downwards (26 to 0 -> 0 to -1/6)
+		for (i=41; i<53; i++)	trem_table_inti = i-40-26;	// upwards (1 to 12 -> -1/6 to -0.5/6)
+
+		for (i=0; i<TREMTAB_SIZE; i++)
+		{
+			// 0.0 .. -26/26*4.8/6 == 0.0 .. -0.8, 4/53 steps == 1 .. 0.57
+			fltype trem_val1=(fltype)(((fltype)trem_table_inti)*4.8/26.0/6.0);				// 4.8db
+			fltype trem_val2=(fltype)((fltype)((Bit32s)(trem_table_inti/4))*1.2/6.0/6.0);		// 1.2db (larger stepping)
+
+			trem_tablei = (Bit32s)(pow(FL2,trem_val1)*FIXEDPT);
+			trem_tableTREMTAB_SIZE+i = (Bit32s)(pow(FL2,trem_val2)*FIXEDPT);
+		}
+	}
+
+	// tremolo at 3.7hz
+	OPL->tremtab_add = (Bit32u)((fltype)TREMTAB_SIZE * TREM_FREQ * FIXEDPT_LFO / (fltype)OPL->int_samplerate);
+	OPL->tremtab_pos = 0;
+
+	if (!initfirstime)
+	{
+		initfirstime = 1;
+
+		for (i=0; i<BLOCKBUF_SIZE; i++) tremval_consti = FIXEDPT;
+
+
+		// create waveform tables
+		for (i=0;i<(WAVEPREC>>1);i++)
+		{
+			wavtable(i<<1) +WAVEPREC	= (Bit16s)(16384*sin((fltype)((i<<1) )*PI*2/WAVEPREC));
+			wavtable(i<<1)+1+WAVEPREC	= (Bit16s)(16384*sin((fltype)((i<<1)+1)*PI*2/WAVEPREC));
+			wavtablei					= wavtable(i<<1) +WAVEPREC;
+			// alternative: (zero-less)
+/*			wavtable(i<<1) +WAVEPREC	= (Bit16s)(16384*sin((fltype)((i<<2)+1)*PI/WAVEPREC));
+			wavtable(i<<1)+1+WAVEPREC	= (Bit16s)(16384*sin((fltype)((i<<2)+3)*PI/WAVEPREC));
+			wavtablei					= wavtable(i<<1)-1+WAVEPREC; */
+		}
+		for (i=0;i<(WAVEPREC>>3);i++)
+		{
+			wavtablei+(WAVEPREC<<1)		= wavtablei+(WAVEPREC>>3)-16384;
+			wavtablei+((WAVEPREC*17)>>3)	= wavtablei+(WAVEPREC>>2)+16384;
+		}
+
+		// key scale level table verified (table in book*8/3)
+		kslev70 = 0;	kslev71 = 24;	kslev72 = 32;	kslev73 = 37;
+		kslev74 = 40;	kslev75 = 43;	kslev76 = 45;	kslev77 = 47;
+		kslev78 = 48;
+		for (i=9;i<16;i++) kslev7i = (Bit8u)(i+41);
+		for (j=6;j>=0;j--)
+		{
+			for (i=0;i<16;i++)
+			{
+				oct = (Bits)kslevj+1i-8;
+				if (oct < 0) oct = 0;
+				kslevji = (Bit8u)oct;
+			}
+		}
+	}
+	
+	return OPL;
+}
+
+void ADLIBEMU(stop)(void *chip)
+{
+	free(chip);
+	
+	return;
+}
+
+void ADLIBEMU(reset)(void *chip)
+{
+	OPL_DATA* OPL = (OPL_DATA*)chip;
+	Bits i;
+	op_type* op;
+	
+	memset(OPL->adlibreg, 0x00, sizeof(OPL->adlibreg));
+	memset(OPL->op, 0x00, sizeof(op_type) * MAXOPERATORS);
+	memset(OPL->wave_sel, 0x00, sizeof(OPL->wave_sel));
+	
+	for (i=0;i<MAXOPERATORS;i++)
+	{
+		op = &OPL->opi;
+		
+		op->op_state = OF_TYPE_OFF;
+		op->act_state = OP_ACT_OFF;
+		op->amp = 0.0;
+		op->step_amp = 0.0;
+		op->vol = 0.0;
+		op->tcount = 0;
+		op->tinc = 0;
+		op->toff = 0;
+		op->cur_wmask = wavemask0;
+		op->cur_wform = &wavtablewaveform0;
+		op->freq_high = 0;
+
+		op->generator_pos = 0;
+		op->cur_env_step = 0;
+		op->env_step_a = 0;
+		op->env_step_d = 0;
+		op->env_step_r = 0;
+		op->step_skip_pos_a = 0;
+		op->env_step_skip_a = 0;
+
+#if defined(OPLTYPE_IS_OPL3)
+		op->is_4op = false;
+		op->is_4op_attached = false;
+		op->left_pan = 1;
+		op->right_pan = 1;
+#endif
+	}
+	
+	OPL->status = 0;
+	OPL->opl_index = 0;
+	OPL->opl_addr = 0;
+	
+	return;
+}
+
+
+
+void ADLIBEMU(writeIO)(void *chip, UINT32 addr, UINT8 val)
+{
+	OPL_DATA* OPL = (OPL_DATA*)chip;
+	
+	if (addr & 1)
+		adlib_write(OPL, OPL->opl_addr, val);
+	else
+#if defined(OPLTYPE_IS_OPL3)
+		OPL->opl_addr = val | ((addr & 2) << 7);
+#else
+		OPL->opl_addr = val;
+#endif
+}
+
+static void adlib_write(void *chip, Bitu idx, Bit8u val)
+{
+	OPL_DATA* OPL = (OPL_DATA*)chip;
+	
+	Bit32u second_set = idx&0x100;
+	OPL->adlibregidx = val;
+
+	switch (idx&0xf0)
+	{
+	case ARC_CONTROL:
+		// here we check for the second set registers, too:
+		switch (idx)
+		{
+		case 0x02:	// timer1 counter
+		case 0x03:	// timer2 counter
+			break;
+		case 0x04:
+			// IRQ reset, timer mask/start
+			if (val&0x80)
+			{
+				// clear IRQ bits in status register
+				OPL->status &= ~0x60;
+			}
+			else
+			{
+				OPL->status = 0;
+			}
+			break;
+#if defined(OPLTYPE_IS_OPL3)
+		case 0x04|ARC_SECONDSET:
+			// 4op enable/disable switches for each possible channel
+			OPL->op0.is_4op = (val&1)>0;
+			OPL->op3.is_4op_attached = OPL->op0.is_4op;
+			OPL->op1.is_4op = (val&2)>0;
+			OPL->op4.is_4op_attached = OPL->op1.is_4op;
+			OPL->op2.is_4op = (val&4)>0;
+			OPL->op5.is_4op_attached = OPL->op2.is_4op;
+			OPL->op18.is_4op = (val&8)>0;
+			OPL->op21.is_4op_attached = OPL->op18.is_4op;
+			OPL->op19.is_4op = (val&16)>0;
+			OPL->op22.is_4op_attached = OPL->op19.is_4op;
+			OPL->op20.is_4op = (val&32)>0;
+			OPL->op23.is_4op_attached = OPL->op20.is_4op;
+			break;
+		case 0x05|ARC_SECONDSET:
+			break;
+#endif
+		case 0x08:
+			// CSW, note select
+			break;
+		default:
+			break;
+		}
+		break;
+	case ARC_TVS_KSR_MUL:
+	case ARC_TVS_KSR_MUL+0x10:
+		{
+		// tremolo/vibrato/sustain keeping enabled; key scale rate; frequency multiplication
+		int num = idx&7;
+		Bitu base = (idx-ARC_TVS_KSR_MUL)&0xff;
+		if ((num<6) && (base<22)) {
+			Bitu modop = regbase2modopsecond_set?(base+22):base;
+			Bitu regbase = base+second_set;
+			Bitu chanbase = second_set?(modop-18+ARC_SECONDSET):modop;
+
+			// change tremolo/vibrato and sustain keeping of this operator
+			op_type* op_ptr = &OPL->opmodop+((num<3) ? 0 : 9);
+			change_keepsustain(chip, regbase,op_ptr);
+			change_vibrato(chip, regbase,op_ptr);
+
+			// change frequency calculations of this operator as
+			// key scale rate and frequency multiplicator can be changed
+#if defined(OPLTYPE_IS_OPL3)
+			if ((OPL->adlibreg0x105&1) && (OPL->opmodop.is_4op_attached))
+			{
+				// operator uses frequency of channel
+				change_frequency(chip, chanbase-3,regbase,op_ptr);
+			}
+			else
+			{
+				change_frequency(chip, chanbase,regbase,op_ptr);
+			}
+#else
+			change_frequency(chip, chanbase,base,op_ptr);
+#endif
+		}
+		}
+		break;
+	case ARC_KSL_OUTLEV:
+	case ARC_KSL_OUTLEV+0x10:
+		{
+		// key scale level; output rate
+		int num = idx&7;
+		Bitu base = (idx-ARC_KSL_OUTLEV)&0xff;
+		if ((num<6) && (base<22))
+		{
+			Bitu modop = regbase2modopsecond_set?(base+22):base;
+			Bitu chanbase = second_set?(modop-18+ARC_SECONDSET):modop;
+
+			// change frequency calculations of this operator as
+			// key scale level and output rate can be changed
+			op_type* op_ptr = &OPL->opmodop+((num<3) ? 0 : 9);
+#if defined(OPLTYPE_IS_OPL3)
+			Bitu regbase = base+second_set;
+			if ((OPL->adlibreg0x105&1) && (OPL->opmodop.is_4op_attached))
+			{
+				// operator uses frequency of channel
+				change_frequency(chip, chanbase-3,regbase,op_ptr);
+			}
+			else
+			{
+				change_frequency(chip, chanbase,regbase,op_ptr);
+			}
+#else
+			change_frequency(chip, chanbase,base,op_ptr);
+#endif
+		}
+		}
+		break;
+	case ARC_ATTR_DECR:
+	case ARC_ATTR_DECR+0x10:
+		{
+		// attack/decay rates
+		int num = idx&7;
+		Bitu base = (idx-ARC_ATTR_DECR)&0xff;
+		if ((num<6) && (base<22))
+		{
+			Bitu regbase = base+second_set;
+
+			// change attack rate and decay rate of this operator
+			op_type* op_ptr = &OPL->opregbase2opsecond_set?(base+22):base;
+			change_attackrate(chip, regbase,op_ptr);
+			change_decayrate(chip, regbase,op_ptr);
+		}
+		}
+		break;
+	case ARC_SUSL_RELR:
+	case ARC_SUSL_RELR+0x10:
+		{
+		// sustain level; release rate
+		int num = idx&7;
+		Bitu base = (idx-ARC_SUSL_RELR)&0xff;
+		if ((num<6) && (base<22))
+		{
+			Bitu regbase = base+second_set;
+
+			// change sustain level and release rate of this operator
+			op_type* op_ptr = &OPL->opregbase2opsecond_set?(base+22):base;
+			change_releaserate(chip, regbase,op_ptr);
+			change_sustainlevel(chip, regbase,op_ptr);
+		}
+		}
+		break;
+	case ARC_FREQ_NUM:
+		{
+		// 0xa0-0xa8 low8 frequency
+		Bitu base = (idx-ARC_FREQ_NUM)&0xff;
+		if (base<9)
+		{
+			Bits opbase = second_set?(base+18):base;
+			Bits modbase;
+			Bitu chanbase;
+#if defined(OPLTYPE_IS_OPL3)
+		if ((OPL->adlibreg0x105&1) && OPL->opopbase.is_4op_attached) break;
+#endif
+			// regbase of modulator:
+			modbase = modulatorbasebase+second_set;
+
+			chanbase = base+second_set;
+
+			change_frequency(chip, chanbase,modbase,&OPL->opopbase);
+			change_frequency(chip, chanbase,modbase+3,&OPL->opopbase+9);
+#if defined(OPLTYPE_IS_OPL3)
+			// for 4op channels all four operators are modified to the frequency of the channel
+			if ((OPL->adlibreg0x105&1) && OPL->opsecond_set?(base+18):base.is_4op)
+			{
+				change_frequency(chip, chanbase,modbase+8,&OPL->opopbase+3);
+				change_frequency(chip, chanbase,modbase+3+8,&OPL->opopbase+3+9);
+			}
+#endif
+		}
+		}
+		break;
+	case ARC_KON_BNUM:
+		{
+		Bitu base;
+		if (OPL->UpdateHandler != NULL)	// hack for DOSBox logs
+			OPL->UpdateHandler(OPL->UpdateParam);
+		if (idx == ARC_PERC_MODE)
+		{
+#if defined(OPLTYPE_IS_OPL3)
+			if (second_set) return;
+#endif
+
+			if ((val&0x30) == 0x30)
+			{		// BassDrum active
+				enable_operator(chip, 16,&OPL->op6,OP_ACT_PERC);
+				change_frequency(chip, 6,16,&OPL->op6);
+				enable_operator(chip, 16+3,&OPL->op6+9,OP_ACT_PERC);
+				change_frequency(chip, 6,16+3,&OPL->op6+9);
+			}
+			else
+			{
+				disable_operator(&OPL->op6,OP_ACT_PERC);
+				disable_operator(&OPL->op6+9,OP_ACT_PERC);
+			}
+			if ((val&0x28) == 0x28)
+			{		// Snare active
+				enable_operator(chip, 17+3,&OPL->op16,OP_ACT_PERC);
+				change_frequency(chip, 7,17+3,&OPL->op16);
+			}
+			else
+			{
+				disable_operator(&OPL->op16,OP_ACT_PERC);
+			}
+			if ((val&0x24) == 0x24)
+			{		// TomTom active
+				enable_operator(chip, 18,&OPL->op8,OP_ACT_PERC);
+				change_frequency(chip, 8,18,&OPL->op8);
+			}
+			else
+			{
+				disable_operator(&OPL->op8,OP_ACT_PERC);
+			}
+			if ((val&0x22) == 0x22)
+			{		// Cymbal active
+				enable_operator(chip, 18+3,&OPL->op8+9,OP_ACT_PERC);
+				change_frequency(chip, 8,18+3,&OPL->op8+9);
+			}
+			else
+			{
+				disable_operator(&OPL->op8+9,OP_ACT_PERC);
+			}
+			if ((val&0x21) == 0x21)
+			{		// Hihat active
+				enable_operator(chip, 17,&OPL->op7,OP_ACT_PERC);
+				change_frequency(chip, 7,17,&OPL->op7);
+			}
+			else
+			{
+				disable_operator(&OPL->op7,OP_ACT_PERC);
+			}
+
+			break;
+		}
+		// regular 0xb0-0xb8
+		base = (idx-ARC_KON_BNUM)&0xff;
+		if (base<9)
+		{
+			Bits opbase = second_set?(base+18):base;
+			// regbase of modulator:
+			Bits modbase = modulatorbasebase+second_set;
+			Bitu chanbase;
+
+#if defined(OPLTYPE_IS_OPL3)
+			if ((OPL->adlibreg0x105&1) && OPL->opopbase.is_4op_attached) break;
+#endif
+			if (val&32)
+			{
+				// operator switched on
+				enable_operator(chip, modbase,&OPL->opopbase,OP_ACT_NORMAL);		// modulator (if 2op)
+				enable_operator(chip, modbase+3,&OPL->opopbase+9,OP_ACT_NORMAL);	// carrier (if 2op)
+#if defined(OPLTYPE_IS_OPL3)
+				// for 4op channels all four operators are switched on
+				if ((OPL->adlibreg0x105&1) && OPL->opopbase.is_4op)
+				{
+					// turn on chan+3 operators as well
+					enable_operator(chip, modbase+8,&OPL->opopbase+3,OP_ACT_NORMAL);
+					enable_operator(chip, modbase+3+8,&OPL->opopbase+3+9,OP_ACT_NORMAL);
+				}
+#endif
+			}
+			else
+			{
+				// operator switched off
+				disable_operator(&OPL->opopbase,OP_ACT_NORMAL);
+				disable_operator(&OPL->opopbase+9,OP_ACT_NORMAL);
+#if defined(OPLTYPE_IS_OPL3)
+				// for 4op channels all four operators are switched off
+				if ((OPL->adlibreg0x105&1) && OPL->opopbase.is_4op)
+				{
+					// turn off chan+3 operators as well
+					disable_operator(&OPL->opopbase+3,OP_ACT_NORMAL);
+					disable_operator(&OPL->opopbase+3+9,OP_ACT_NORMAL);
+				}
+#endif
+			}
+
+			chanbase = base+second_set;
+
+			// change frequency calculations of modulator and carrier (2op) as
+			// the frequency of the channel has changed
+			change_frequency(chip, chanbase,modbase,&OPL->opopbase);
+			change_frequency(chip, chanbase,modbase+3,&OPL->opopbase+9);
+#if defined(OPLTYPE_IS_OPL3)
+			// for 4op channels all four operators are modified to the frequency of the channel
+			if ((OPL->adlibreg0x105&1) && OPL->opsecond_set?(base+18):base.is_4op)
+			{
+				// change frequency calculations of chan+3 operators as well
+				change_frequency(chip, chanbase,modbase+8,&OPL->opopbase+3);
+				change_frequency(chip, chanbase,modbase+3+8,&OPL->opopbase+3+9);
+			}
+#endif
+		}
+		}
+		break;
+	case ARC_FEEDBACK:
+		{
+		// 0xc0-0xc8 feedback/modulation type (AM/FM)
+		Bitu base = (idx-ARC_FEEDBACK)&0xff;
+		if (base<9)
+		{
+			Bits opbase = second_set?(base+18):base;
+			Bitu chanbase = base+second_set;
+			change_feedback(chip, chanbase,&OPL->opopbase);
+#if defined(OPLTYPE_IS_OPL3)
+			// OPL3 panning
+			OPL->opopbase.left_pan = ((val&0x10)>>4);
+			OPL->opopbase.right_pan = ((val&0x20)>>5);
+			OPL->opopbase.left_pan += ((val&0x40)>>6);
+			OPL->opopbase.right_pan += ((val&0x80)>>7);
+#endif
+		}
+		}
+		break;
+	case ARC_WAVE_SEL:
+	case ARC_WAVE_SEL+0x10:
+		{
+		int num = idx&7;
+		Bitu base = (idx-ARC_WAVE_SEL)&0xff;
+		if ((num<6) && (base<22))
+		{
+#if defined(OPLTYPE_IS_OPL3)
+			Bits wselbase = second_set?(base+22):base;	// for easier mapping onto wave_sel
+			op_type* op_ptr;
+			// change waveform
+			if (OPL->adlibreg0x105&1) OPL->wave_selwselbase = val&7;	// opl3 mode enabled, all waveforms accessible
+			else OPL->wave_selwselbase = val&3;
+			op_ptr = &OPL->opregbase2modopwselbase+((num<3) ? 0 : 9);
+			change_waveform(chip, wselbase,op_ptr);
+#else
+			if (OPL->adlibreg0x01&0x20)
+			{
+				op_type* op_ptr;
+				
+				// wave selection enabled, change waveform
+				OPL->wave_selbase = val&3;
+				op_ptr = &OPL->opregbase2modopbase+((num<3) ? 0 : 9);
+				change_waveform(chip, base,op_ptr);
+			}
+#endif
+		}
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+
+Bitu ADLIBEMU(reg_read)(void *chip, UINT32 port)
+{
+	OPL_DATA* OPL = (OPL_DATA*)chip;
+	
+#if defined(OPLTYPE_IS_OPL3)
+	// opl3-detection routines require ret&6 to be zero
+	if ((port&1)==0)
+	{
+		return OPL->status;
+	}
+	return 0x00;
+#else
+	// opl2-detection routines require ret&6 to be 6
+	if ((port&1)==0)
+	{
+		return OPL->status|6;
+	}
+	return 0xff;
+#endif
+}
+
+void ADLIBEMU(write_index)(void *chip, UINT32 port, UINT8 val)
+{
+	OPL_DATA* OPL = (OPL_DATA*)chip;
+	
+	OPL->opl_index = val;
+#if defined(OPLTYPE_IS_OPL3)
+	if ((port&3)!=0)
+	{
+		// possibly second set
+		if (((OPL->adlibreg0x105&1)!=0) || (OPL->opl_index==5)) OPL->opl_index |= ARC_SECONDSET;
+	}
+#endif
+}
+
+/*static void OPL_INLINE clipit16(Bit32s ival, Bit16s* outval)
+{
+	if (ival<32768)
+	{
+		if (ival>-32769)
+		{
+			*outval=(Bit16s)ival;
+		}
+		else
+		{
+			*outval = -32768;
+		}
+	}
+	else
+	{
+		*outval = 32767;
+	}
+}*/
+
+
+
+// be careful with this
+// uses cptr and chanval, outputs into outbufl(/outbufr)
+// for opl3 check if opl3-mode is enabled (which uses stereo panning)
+// 
+// Changes by Valley Bell:
+//	- Changed to always output to both channels
+//	- added parameter "chn" to fix panning for 4-op channels and the Rhythm Cymbal
+#undef CHANVAL_OUT
+#if defined(OPLTYPE_IS_OPL3)
+#define CHANVAL_OUT(chn)								\
+	if (OPL->adlibreg0x105&1) {						\
+		outbufli += chanval*cptrchn.left_pan;		\
+		outbufri += chanval*cptrchn.right_pan;	\
+	} else {										\
+		outbufli += chanval;						\
+		outbufri += chanval;						\
+	}
+#else
+#define CHANVAL_OUT(chn)								\
+	outbufli += chanval;							\
+	outbufri += chanval;
+#endif
+
+//void adlib_getsample(Bit16s* sndptr, Bits numsamples)
+void ADLIBEMU(getsample)(void *chip, INT32** sndptr, INT32 numsamples)
+{
+	OPL_DATA* OPL = (OPL_DATA*)chip;
+	
+	Bits i, endsamples;
+	op_type* cptr;
+
+	//Bit32s outbuflBLOCKBUF_SIZE;
+#if defined(OPLTYPE_IS_OPL3)
+	// second output buffer (right channel for opl3 stereo)
+	//Bit32s outbufrBLOCKBUF_SIZE;
+#endif
+	Bit32s* outbufl = sndptr0;
+	Bit32s* outbufr = sndptr1;
+
+	// vibrato/tremolo lookup tables (global, to possibly be used by all operators)
+	Bit32s vib_lutBLOCKBUF_SIZE;
+	Bit32s trem_lutBLOCKBUF_SIZE;
+
+	Bits samples_to_process = numsamples;
+
+	Bits cursmp;
+	Bit32s vib_tshift;
+	Bitu max_channel = NUM_CHANNELS;
+	Bits cur_ch;
+	
+	Bit32s *vibval1, *vibval2, *vibval3, *vibval4;
+	Bit32s *tremval1, *tremval2, *tremval3, *tremval4;
+	
+#if defined(OPLTYPE_IS_OPL3)
+	if ((OPL->adlibreg0x105&1)==0) max_channel = NUM_CHANNELS/2;
+#endif
+	
+	if (! samples_to_process)
+	{
+		for (cur_ch = 0; cur_ch < max_channel; cur_ch ++)
+		{
+			if ((OPL->adlibregARC_PERC_MODE & 0x20) && (cur_ch >= 6 && cur_ch < 9))
+				continue;
+			
+#if defined(OPLTYPE_IS_OPL3)
+			if (cur_ch < 9)
+				cptr = &OPL->opcur_ch;
+			else
+				cptr = &OPL->opcur_ch+9;	// second set is operator18-operator35
+			if (cptr->is_4op_attached)
+				continue;
+#else
+			cptr = &OPL->opcur_ch;
+#endif
+			
+			if (cptr0.op_state == OF_TYPE_ATT)
+				operator_eg_attack_check(&cptr0);
+			if (cptr9.op_state == OF_TYPE_ATT)
+				operator_eg_attack_check(&cptr9);
+		}
+		
+		return;
+	}
+	
+	for (cursmp=0; cursmp<samples_to_process; cursmp+=endsamples)
+	{
+		endsamples = samples_to_process-cursmp;
+		//if (endsamples>BLOCKBUF_SIZE) endsamples = BLOCKBUF_SIZE;
+
+		memset(outbufl,0,endsamples*sizeof(Bit32s));
+//#if defined(OPLTYPE_IS_OPL3)
+//		// clear second output buffer (opl3 stereo)
+//		//if (adlibreg0x105&1)
+			memset(outbufr,0,endsamples*sizeof(Bit32s));
+//#endif
+
+		// calculate vibrato/tremolo lookup tables
+		vib_tshift = ((OPL->adlibregARC_PERC_MODE&0x40)==0) ? 1 : 0;	// 14cents/7cents switching
+		for (i=0;i<endsamples;i++)
+		{
+			// cycle through vibrato table
+			OPL->vibtab_pos += OPL->vibtab_add;
+			if (OPL->vibtab_pos/FIXEDPT_LFO>=VIBTAB_SIZE)
+				OPL->vibtab_pos-=VIBTAB_SIZE*FIXEDPT_LFO;
+			vib_luti = vib_tableOPL->vibtab_pos/FIXEDPT_LFO>>vib_tshift;		// 14cents (14/100 of a semitone) or 7cents
+
+			// cycle through tremolo table
+			OPL->tremtab_pos += OPL->tremtab_add;
+			if (OPL->tremtab_pos/FIXEDPT_LFO>=TREMTAB_SIZE)
+				OPL->tremtab_pos-=TREMTAB_SIZE*FIXEDPT_LFO;
+			if (OPL->adlibregARC_PERC_MODE&0x80)
+				trem_luti = trem_tableOPL->tremtab_pos/FIXEDPT_LFO;
+			else
+				trem_luti = trem_tableTREMTAB_SIZE+OPL->tremtab_pos/FIXEDPT_LFO;
+		}
+
+		if (OPL->adlibregARC_PERC_MODE&0x20)
+		{
+			if (! (OPL->MuteChnNUM_CHANNELS + 0))
+			{
+			//BassDrum
+			cptr = &OPL->op6;
+			if (OPL->adlibregARC_FEEDBACK+6&1)
+			{
+				// additive synthesis
+				if (cptr9.op_state != OF_TYPE_OFF)
+				{
+					if (cptr9.vibrato)
+					{
+						vibval1 = vibval_var1;
+						for (i=0;i<endsamples;i++)
+							vibval1i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+					}
+					else
+						vibval1 = vibval_const;
+					if (cptr9.tremolo)
+						tremval1 = trem_lut;	// tremolo enabled, use table
+					else
+						tremval1 = tremval_const;
+
+					// calculate channel output
+					for (i=0;i<endsamples;i++)
+					{
+						Bit32s chanval;
+						
+						operator_advance(OPL, &cptr9,vibval1i);
+						opfuncscptr9.op_state(&cptr9);
+						operator_output(&cptr9,0,tremval1i);
+						
+						chanval = cptr9.cval*2;
+						CHANVAL_OUT(0)
+					}
+				}
+			}
+			else
+			{
+				// frequency modulation
+				if ((cptr9.op_state != OF_TYPE_OFF) || (cptr0.op_state != OF_TYPE_OFF))
+				{
+					if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF))
+					{
+						vibval1 = vibval_var1;
+						for (i=0;i<endsamples;i++)
+							vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+					}
+					else
+						vibval1 = vibval_const;
+					if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF))
+					{
+						vibval2 = vibval_var2;
+						for (i=0;i<endsamples;i++)
+							vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+					}
+					else
+						vibval2 = vibval_const;
+					if (cptr0.tremolo)
+						tremval1 = trem_lut;	// tremolo enabled, use table
+					else
+						tremval1 = tremval_const;
+					if (cptr9.tremolo)
+						tremval2 = trem_lut;	// tremolo enabled, use table
+					else
+						tremval2 = tremval_const;
+
+					// calculate channel output
+					for (i=0;i<endsamples;i++)
+					{
+						Bit32s chanval;
+						
+						operator_advance(OPL, &cptr0,vibval1i);
+						opfuncscptr0.op_state(&cptr0);
+						operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+						operator_advance(OPL, &cptr9,vibval2i);
+						opfuncscptr9.op_state(&cptr9);
+						operator_output(&cptr9,cptr0.cval*FIXEDPT,tremval2i);
+						
+						chanval = cptr9.cval*2;
+						CHANVAL_OUT(0)
+					}
+				}
+			}
+			}	// end if (! Muted)
+
+			//TomTom (j=8)
+			if (! (OPL->MuteChnNUM_CHANNELS + 2) && OPL->op8.op_state != OF_TYPE_OFF)
+			{
+				cptr = &OPL->op8;
+				if (cptr0.vibrato)
+				{
+					vibval3 = vibval_var1;
+					for (i=0;i<endsamples;i++)
+						vibval3i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+				}
+				else
+					vibval3 = vibval_const;
+
+				if (cptr0.tremolo)
+					tremval3 = trem_lut;	// tremolo enabled, use table
+				else
+					tremval3 = tremval_const;
+
+				// calculate channel output
+				for (i=0;i<endsamples;i++)
+				{
+					Bit32s chanval;
+					
+					operator_advance(OPL, &cptr0,vibval3i);
+					opfuncscptr0.op_state(&cptr0);		//TomTom
+					operator_output(&cptr0,0,tremval3i);
+					chanval = cptr0.cval*2;
+					CHANVAL_OUT(0)
+				}
+			}
+
+			//Snare/Hihat (j=7), Cymbal (j=8)
+			if ((OPL->op7.op_state != OF_TYPE_OFF) || (OPL->op16.op_state != OF_TYPE_OFF) ||
+				(OPL->op17.op_state != OF_TYPE_OFF))
+			{
+				cptr = &OPL->op7;
+				if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF))
+				{
+					vibval1 = vibval_var1;
+					for (i=0;i<endsamples;i++)
+						vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+				}
+				else
+					vibval1 = vibval_const;
+				if ((cptr9.vibrato) && (cptr9.op_state == OF_TYPE_OFF))
+				{
+					vibval2 = vibval_var2;
+					for (i=0;i<endsamples;i++)
+						vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+				}
+				else
+					vibval2 = vibval_const;
+
+				if (cptr0.tremolo)
+					tremval1 = trem_lut;	// tremolo enabled, use table
+				else
+					tremval1 = tremval_const;
+				if (cptr9.tremolo)
+					tremval2 = trem_lut;	// tremolo enabled, use table
+				else
+					tremval2 = tremval_const;
+
+				cptr = &OPL->op8;
+				if ((cptr9.vibrato) && (cptr9.op_state == OF_TYPE_OFF))
+				{
+					vibval4 = vibval_var2;
+					for (i=0;i<endsamples;i++)
+						vibval4i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+				}
+				else
+					vibval4 = vibval_const;
+
+				if (cptr9.tremolo) tremval4 = trem_lut;	// tremolo enabled, use table
+				else tremval4 = tremval_const;
+
+				// calculate channel output
+				cptr = &OPL->op0;	// set cptr to something useful (else it stays at op8)
+				for (i=0;i<endsamples;i++)
+				{
+					Bit32s chanval;
+					
+					operator_advance_drums(OPL, &OPL->op7,vibval1i,&OPL->op7+9,vibval2i,&OPL->op8+9,vibval4i);
+
+					if (! (OPL->MuteChnNUM_CHANNELS + 4))
+					{
+						opfuncsOPL->op7.op_state(&OPL->op7);			//Hihat
+						operator_output(&OPL->op7,0,tremval1i);
+					}
+					else
+						OPL->op7.cval = 0;
+
+					if (! (OPL->MuteChnNUM_CHANNELS + 1))
+					{
+						opfuncsOPL->op7+9.op_state(&OPL->op7+9);		//Snare
+						operator_output(&OPL->op7+9,0,tremval2i);
+					}
+					else
+						OPL->op7+9.cval = 0;
+
+					if (! (OPL->MuteChnNUM_CHANNELS + 3))
+					{
+						opfuncsOPL->op8+9.op_state(&OPL->op8+9);		//Cymbal
+						operator_output(&OPL->op8+9,0,tremval4i);
+					}
+					else
+						OPL->op8+9.cval = 0;
+
+					//chanval = (OPL->op7.cval + OPL->op7+9.cval + OPL->op8+9.cval)*2;
+					//CHANVAL_OUT(0)
+					// fix panning of the snare -Valley Bell
+					chanval = (OPL->op7.cval + OPL->op7+9.cval)*2;
+					CHANVAL_OUT(7)
+					chanval = OPL->op8+9.cval*2;
+					CHANVAL_OUT(8)
+				}
+			}
+		}
+
+		for (cur_ch=max_channel-1; cur_ch>=0; cur_ch--)
+		{
+			Bitu k;
+
+			if (OPL->MuteChncur_ch)
+				continue;
+
+			// skip drum/percussion operators
+			if ((OPL->adlibregARC_PERC_MODE&0x20) && (cur_ch >= 6) && (cur_ch < 9)) continue;
+
+			k = cur_ch;
+#if defined(OPLTYPE_IS_OPL3)
+			if (cur_ch < 9)
+			{
+				cptr = &OPL->opcur_ch;
+			}
+			else
+			{
+				cptr = &OPL->opcur_ch+9;	// second set is operator18-operator35
+				k += (-9+256);		// second set uses registers 0x100 onwards
+			}
+			// check if this operator is part of a 4-op
+			//if ((OPL->adlibreg0x105&1) && cptr->is_4op_attached) continue;
+			if (cptr->is_4op_attached) continue;	// this is more correct
+#else
+			cptr = &OPL->opcur_ch;
+#endif
+
+			// check for FM/AM
+			if (OPL->adlibregARC_FEEDBACK+k&1)
+			{
+#if defined(OPLTYPE_IS_OPL3)
+				//if ((OPL->adlibreg0x105&1) && cptr->is_4op)
+				if (cptr->is_4op)	// this is more correct
+				{
+					if (OPL->adlibregARC_FEEDBACK+k+3&1)
+					{
+						// AM-AM-style synthesis (op1fb + (op2 * op3) + op4)
+						if (cptr0.op_state != OF_TYPE_OFF)
+						{
+							if (cptr0.vibrato)
+							{
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+							}
+							else
+								vibval1 = vibval_const;
+							if (cptr0.tremolo)
+								tremval1 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval1 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++)
+							{
+								Bit32s chanval;
+								
+								operator_advance(OPL, &cptr0,vibval1i);
+								opfuncscptr0.op_state(&cptr0);
+								operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+								chanval = cptr0.cval;
+								CHANVAL_OUT(3)	// Note: Op 1 of 4, so it needs to use the panning bits of Op 4 (Ch+3)
+							}
+						}
+
+						if ((cptr3.op_state != OF_TYPE_OFF) || (cptr9.op_state != OF_TYPE_OFF))
+						{
+							if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF))
+							{
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+							}
+							else
+								vibval1 = vibval_const;
+							if (cptr9.tremolo)
+								tremval1 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval1 = tremval_const;
+							if (cptr3.tremolo)
+								tremval2 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval2 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++)
+							{
+								Bit32s chanval;
+								
+								operator_advance(OPL, &cptr9,vibval1i);
+								opfuncscptr9.op_state(&cptr9);
+								operator_output(&cptr9,0,tremval1i);
+
+								operator_advance(OPL, &cptr3,0);
+								opfuncscptr3.op_state(&cptr3);
+								operator_output(&cptr3,cptr9.cval*FIXEDPT,tremval2i);
+
+								chanval = cptr3.cval;
+								CHANVAL_OUT(3)
+							}
+						}
+
+						if (cptr3+9.op_state != OF_TYPE_OFF)
+						{
+							if (cptr3+9.tremolo)
+								tremval1 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval1 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++)
+							{
+								Bit32s chanval;
+								
+								operator_advance(OPL, &cptr3+9,0);
+								opfuncscptr3+9.op_state(&cptr3+9);
+								operator_output(&cptr3+9,0,tremval1i);
+
+								chanval = cptr3+9.cval;
+								CHANVAL_OUT(3)
+							}
+						}
+					}
+					else
+					{
+						// AM-FM-style synthesis (op1fb + (op2 * op3 * op4))
+						if (cptr0.op_state != OF_TYPE_OFF)
+						{
+							if (cptr0.vibrato)
+							{
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+							}
+							else
+								vibval1 = vibval_const;
+							if (cptr0.tremolo)
+								tremval1 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval1 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++)
+							{
+								Bit32s chanval;
+								
+								operator_advance(OPL, &cptr0,vibval1i);
+								opfuncscptr0.op_state(&cptr0);
+								operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+								chanval = cptr0.cval;
+								CHANVAL_OUT(3)
+							}
+						}
+
+						if ((cptr9.op_state != OF_TYPE_OFF) || (cptr3.op_state != OF_TYPE_OFF) || (cptr3+9.op_state != OF_TYPE_OFF))
+						{
+							if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF)) {
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+							}
+							else
+								vibval1 = vibval_const;
+							if (cptr9.tremolo)
+								tremval1 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval1 = tremval_const;
+							if (cptr3.tremolo)
+								tremval2 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval2 = tremval_const;
+							if (cptr3+9.tremolo)
+								tremval3 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval3 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++)
+							{
+								Bit32s chanval;
+								
+								operator_advance(OPL, &cptr9,vibval1i);
+								opfuncscptr9.op_state(&cptr9);
+								operator_output(&cptr9,0,tremval1i);
+
+								operator_advance(OPL, &cptr3,0);
+								opfuncscptr3.op_state(&cptr3);
+								operator_output(&cptr3,cptr9.cval*FIXEDPT,tremval2i);
+
+								operator_advance(OPL, &cptr3+9,0);
+								opfuncscptr3+9.op_state(&cptr3+9);
+								operator_output(&cptr3+9,cptr3.cval*FIXEDPT,tremval3i);
+
+								chanval = cptr3+9.cval;
+								CHANVAL_OUT(3)
+							}
+						}
+					}
+					continue;
+				}
+#endif
+				// 2op additive synthesis
+				if ((cptr9.op_state == OF_TYPE_OFF) && (cptr0.op_state == OF_TYPE_OFF)) continue;
+				if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF))
+				{
+					vibval1 = vibval_var1;
+					for (i=0;i<endsamples;i++)
+						vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+				}
+				else
+					vibval1 = vibval_const;
+				if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF))
+				{
+					vibval2 = vibval_var2;
+					for (i=0;i<endsamples;i++)
+						vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+				}
+				else
+					vibval2 = vibval_const;
+				if (cptr0.tremolo)
+					tremval1 = trem_lut;	// tremolo enabled, use table
+				else
+					tremval1 = tremval_const;
+				if (cptr9.tremolo)
+					tremval2 = trem_lut;	// tremolo enabled, use table
+				else
+					tremval2 = tremval_const;
+
+				// calculate channel output
+				for (i=0;i<endsamples;i++)
+				{
+					Bit32s chanval;
+					
+					// carrier1
+					operator_advance(OPL, &cptr0,vibval1i);
+					opfuncscptr0.op_state(&cptr0);
+					operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+					// carrier2
+					operator_advance(OPL, &cptr9,vibval2i);
+					opfuncscptr9.op_state(&cptr9);
+					operator_output(&cptr9,0,tremval2i);
+
+					chanval = cptr9.cval + cptr0.cval;
+					CHANVAL_OUT(0)
+				}
+			}
+			else
+			{
+#if defined(OPLTYPE_IS_OPL3)
+				//if ((OPL->adlibreg0x105&1) && cptr->is_4op)
+				if (cptr->is_4op)	// this is more correct
+				{
+					if (OPL->adlibregARC_FEEDBACK+k+3&1)
+					{
+						// FM-AM-style synthesis ((op1fb * op2) + (op3 * op4))
+						if ((cptr0.op_state != OF_TYPE_OFF) || (cptr9.op_state != OF_TYPE_OFF))
+						{
+							if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF))
+							{
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+							}
+							else
+								vibval1 = vibval_const;
+							if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF))
+							{
+								vibval2 = vibval_var2;
+								for (i=0;i<endsamples;i++)
+									vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+							}
+							else
+								vibval2 = vibval_const;
+							if (cptr0.tremolo)
+								tremval1 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval1 = tremval_const;
+							if (cptr9.tremolo)
+								tremval2 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval2 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++)
+							{
+								Bit32s chanval;
+								
+								operator_advance(OPL, &cptr0,vibval1i);
+								opfuncscptr0.op_state(&cptr0);
+								operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+								operator_advance(OPL, &cptr9,vibval2i);
+								opfuncscptr9.op_state(&cptr9);
+								operator_output(&cptr9,cptr0.cval*FIXEDPT,tremval2i);
+
+								chanval = cptr9.cval;
+								CHANVAL_OUT(3)
+							}
+						}
+
+						if ((cptr3.op_state != OF_TYPE_OFF) || (cptr3+9.op_state != OF_TYPE_OFF))
+						{
+							if (cptr3.tremolo)
+								tremval1 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval1 = tremval_const;
+							if (cptr3+9.tremolo)
+								tremval2 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval2 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++)
+							{
+								Bit32s chanval;
+								
+								operator_advance(OPL, &cptr3,0);
+								opfuncscptr3.op_state(&cptr3);
+								operator_output(&cptr3,0,tremval1i);
+
+								operator_advance(OPL, &cptr3+9,0);
+								opfuncscptr3+9.op_state(&cptr3+9);
+								operator_output(&cptr3+9,cptr3.cval*FIXEDPT,tremval2i);
+
+								chanval = cptr3+9.cval;
+								CHANVAL_OUT(3)
+							}
+						}
+
+					}
+					else
+					{
+						// FM-FM-style synthesis (op1fb * op2 * op3 * op4)
+						if ((cptr0.op_state != OF_TYPE_OFF) || (cptr9.op_state != OF_TYPE_OFF) || 
+							(cptr3.op_state != OF_TYPE_OFF) || (cptr3+9.op_state != OF_TYPE_OFF))
+						{
+							if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF))
+							{
+								vibval1 = vibval_var1;
+								for (i=0;i<endsamples;i++)
+									vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+							}
+							else
+								vibval1 = vibval_const;
+							if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF))
+							{
+								vibval2 = vibval_var2;
+								for (i=0;i<endsamples;i++)
+									vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+							}
+							else
+								vibval2 = vibval_const;
+							if (cptr0.tremolo)
+								tremval1 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval1 = tremval_const;
+							if (cptr9.tremolo)
+								tremval2 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval2 = tremval_const;
+							if (cptr3.tremolo)
+								tremval3 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval3 = tremval_const;
+							if (cptr3+9.tremolo)
+								tremval4 = trem_lut;	// tremolo enabled, use table
+							else
+								tremval4 = tremval_const;
+
+							// calculate channel output
+							for (i=0;i<endsamples;i++)
+							{
+								Bit32s chanval;
+								
+								operator_advance(OPL, &cptr0,vibval1i);
+								opfuncscptr0.op_state(&cptr0);
+								operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+								operator_advance(OPL, &cptr9,vibval2i);
+								opfuncscptr9.op_state(&cptr9);
+								operator_output(&cptr9,cptr0.cval*FIXEDPT,tremval2i);
+
+								operator_advance(OPL, &cptr3,0);
+								opfuncscptr3.op_state(&cptr3);
+								operator_output(&cptr3,cptr9.cval*FIXEDPT,tremval3i);
+
+								operator_advance(OPL, &cptr3+9,0);
+								opfuncscptr3+9.op_state(&cptr3+9);
+								operator_output(&cptr3+9,cptr3.cval*FIXEDPT,tremval4i);
+
+								chanval = cptr3+9.cval;
+								CHANVAL_OUT(3)
+							}
+						}
+					}
+					continue;
+				}
+#endif
+				// 2op frequency modulation
+				if ((cptr9.op_state == OF_TYPE_OFF) && (cptr0.op_state == OF_TYPE_OFF)) continue;
+				if ((cptr0.vibrato) && (cptr0.op_state != OF_TYPE_OFF))
+				{
+					vibval1 = vibval_var1;
+					for (i=0;i<endsamples;i++)
+						vibval1i = (Bit32s)((vib_luti*cptr0.freq_high/8)*FIXEDPT*VIBFAC);
+				}
+				else
+					vibval1 = vibval_const;
+				if ((cptr9.vibrato) && (cptr9.op_state != OF_TYPE_OFF))
+				{
+					vibval2 = vibval_var2;
+					for (i=0;i<endsamples;i++)
+						vibval2i = (Bit32s)((vib_luti*cptr9.freq_high/8)*FIXEDPT*VIBFAC);
+				}
+				else
+					vibval2 = vibval_const;
+				if (cptr0.tremolo)
+					tremval1 = trem_lut;	// tremolo enabled, use table
+				else
+					tremval1 = tremval_const;
+				if (cptr9.tremolo)
+					tremval2 = trem_lut;	// tremolo enabled, use table
+				else
+					tremval2 = tremval_const;
+
+				// calculate channel output
+				for (i=0;i<endsamples;i++)
+				{
+					Bit32s chanval;
+					
+					// modulator
+					operator_advance(OPL, &cptr0,vibval1i);
+					opfuncscptr0.op_state(&cptr0);
+					operator_output(&cptr0,(cptr0.lastcval+cptr0.cval)*cptr0.mfbi/2,tremval1i);
+
+					// carrier
+					operator_advance(OPL, &cptr9,vibval2i);
+					opfuncscptr9.op_state(&cptr9);
+					operator_output(&cptr9,cptr0.cval*FIXEDPT,tremval2i);
+
+					chanval = cptr9.cval;
+					CHANVAL_OUT(0)
+				}
+			}
+		}
+
+/*#if defined(OPLTYPE_IS_OPL3)
+		if (adlibreg0x105&1)
+		{
+			// convert to 16bit samples (stereo)
+			for (i=0;i<endsamples;i++)
+			{
+				clipit16(outbufli,sndptr++);
+				clipit16(outbufri,sndptr++);
+			}
+		}
+		else
+		{
+			// convert to 16bit samples (mono)
+			for (i=0;i<endsamples;i++)
+			{
+				clipit16(outbufli,sndptr++);
+				clipit16(outbufli,sndptr++);
+			}
+		}
+#else
+		// convert to 16bit samples
+		for (i=0;i<endsamples;i++)
+			clipit16(outbufli,sndptr++);
+#endif*/
+
+	}
+}
+
+void ADLIBEMU(set_mute_mask)(void *chip, UINT32 MuteMask)
+{
+	OPL_DATA* OPL = (OPL_DATA*)chip;
+	
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < NUM_CHANNELS + 5; CurChn ++)
+		OPL->MuteChnCurChn = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/opl.h Added

@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2002-2010 The DOSBox Team
+ * OPL2/OPL3 emulation library
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+/*
+ * Originally based on ADLIBEMU.C, an AdLib/OPL2 emulation library by Ken Silverman
+ * Copyright (C) 1998-2001 Ken Silverman
+ * Ken Silverman's official web site: "http://www.advsys.net/ken"
+ */
+
+
+#define fltype double
+
+/*
+	define Bits, Bitu, Bit32s, Bit32u, Bit16s, Bit16u, Bit8s, Bit8u here
+*/
+/*
+#include <stdint.h>
+typedef uintptr_t	Bitu;
+typedef intptr_t	Bits;
+typedef uint32_t	Bit32u;
+typedef int32_t		Bit32s;
+typedef uint16_t	Bit16u;
+typedef int16_t		Bit16s;
+typedef uint8_t		Bit8u;
+typedef int8_t		Bit8s;
+*/
+
+typedef UINT32		Bitu;
+typedef INT32		Bits;
+typedef UINT32		Bit32u;
+typedef INT32		Bit32s;
+typedef UINT16		Bit16u;
+typedef INT16		Bit16s;
+typedef UINT8		Bit8u;
+typedef INT8		Bit8s;
+
+/*
+	define attribution that inlines/forces inlining of a function (optional)
+*/
+#define OPL_INLINE INLINE
+
+
+#undef NUM_CHANNELS
+#if defined(OPLTYPE_IS_OPL3)
+#define NUM_CHANNELS	18
+#else
+#define NUM_CHANNELS	9
+#endif
+
+#define MAXOPERATORS	(NUM_CHANNELS*2)
+
+
+#define FL05	((fltype)0.5)
+#define FL2		((fltype)2.0)
+#define PI		((fltype)3.1415926535897932384626433832795)
+
+
+#define FIXEDPT			0x10000		// fixed-point calculations using 16+16
+#define FIXEDPT_LFO		0x1000000	// fixed-point calculations using 8+24
+
+#define WAVEPREC		1024		// waveform precision (10 bits)
+
+//#define INTFREQU		((fltype)(14318180.0 / 288.0))		// clocking of the chip
+#if defined(OPLTYPE_IS_OPL3)
+#define INTFREQU		((fltype)(OPL->chip_clock / 288.0))		// clocking of the chip
+#else
+#define INTFREQU		((fltype)(OPL->chip_clock / 72.0))		// clocking of the chip
+#endif
+
+
+#define OF_TYPE_ATT			0
+#define OF_TYPE_DEC			1
+#define OF_TYPE_REL			2
+#define OF_TYPE_SUS			3
+#define OF_TYPE_SUS_NOKEEP	4
+#define OF_TYPE_OFF			5
+
+#define ARC_CONTROL			0x00
+#define ARC_TVS_KSR_MUL		0x20
+#define ARC_KSL_OUTLEV		0x40
+#define ARC_ATTR_DECR		0x60
+#define ARC_SUSL_RELR		0x80
+#define ARC_FREQ_NUM		0xa0
+#define ARC_KON_BNUM		0xb0
+#define ARC_PERC_MODE		0xbd
+#define ARC_FEEDBACK		0xc0
+#define ARC_WAVE_SEL		0xe0
+
+#define ARC_SECONDSET		0x100	// second operator set for OPL3
+
+
+#define OP_ACT_OFF			0x00
+#define OP_ACT_NORMAL		0x01	// regular channel activated (bitmasked)
+#define OP_ACT_PERC			0x02	// percussion channel activated (bitmasked)
+
+#define BLOCKBUF_SIZE		512
+
+
+// vibrato constants
+#define VIBTAB_SIZE			8
+#define VIBFAC				70/50000		// no braces, integer mul/div
+
+// tremolo constants and table
+#define TREMTAB_SIZE		53
+#define TREM_FREQ			((fltype)(3.7))			// tremolo at 3.7hz
+
+
+/* operator struct definition
+ For OPL2 all 9 channels consist of two operators each, carrier and modulator.
+ Channel x has operators x as modulator and operators (9+x) as carrier.
+ For OPL3 all 18 channels consist either of two operators (2op mode) or four
+ operators (4op mode) which is determined through register4 of the second
+ adlib register set.
+ Only the channels 0,1,2 (first set) and 9,10,11 (second set) can act as
+ 4op channels. The two additional operators for a channel y come from the
+ 2op channel y+3 so the operatorss y, (9+y), y+3, (9+y)+3 make up a 4op
+ channel.
+*/
+typedef struct operator_struct {
+	Bit32s cval, lastcval;			// current output/last output (used for feedback)
+	Bit32u tcount, wfpos, tinc;		// time (position in waveform) and time increment
+	fltype amp, step_amp;			// and amplification (envelope)
+	fltype vol;						// volume
+	fltype sustain_level;			// sustain level
+	Bit32s mfbi;					// feedback amount
+	fltype a0, a1, a2, a3;			// attack rate function coefficients
+	fltype decaymul, releasemul;	// decay/release rate functions
+	Bit32u op_state;				// current state of operator (attack/decay/sustain/release/off)
+	Bit32u toff;
+	Bit32s freq_high;				// highest three bits of the frequency, used for vibrato calculations
+	Bit16s* cur_wform;				// start of selected waveform
+	Bit32u cur_wmask;				// mask for selected waveform
+	Bit32u act_state;				// activity state (regular, percussion)
+	bool sus_keep;					// keep sustain level when decay finished
+	bool vibrato,tremolo;			// vibrato/tremolo enable bits
+	
+	// variables used to provide non-continuous envelopes
+	Bit32u generator_pos;			// for non-standard sample rates we need to determine how many samples have passed
+	Bits cur_env_step;				// current (standardized) sample position
+	Bits env_step_a,env_step_d,env_step_r;	// number of std samples of one step (for attack/decay/release mode)
+	Bit8u step_skip_pos_a;			// position of 8-cyclic step skipping (always 2^x to check against mask)
+	Bits env_step_skip_a;			// bitmask that determines if a step is skipped (respective bit is zero then)
+
+#if defined(OPLTYPE_IS_OPL3)
+	bool is_4op,is_4op_attached;	// base of a 4op channel/part of a 4op channel
+	Bit32s left_pan,right_pan;		// opl3 stereo panning amount
+#endif
+} op_type;
+
+typedef struct opl_chip
+{
+	// per-chip variables
+	//Bitu chip_num;
+	op_type opMAXOPERATORS;
+	Bit8u MuteChnNUM_CHANNELS + 5;
+	Bitu chip_clock;
+	
+	Bits int_samplerate;
+	
+	Bit8u status;
+	Bit32u opl_index;
+	Bits opl_addr;
+#if defined(OPLTYPE_IS_OPL3)
+	Bit8u adlibreg512;	// adlib register set (including second set)
+	Bit8u wave_sel44;		// waveform selection
+#else
+	Bit8u adlibreg256;	// adlib register set
+	Bit8u wave_sel22;		// waveform selection
+#endif
+	
+	
+	// vibrato/tremolo increment/counter
+	Bit32u vibtab_pos;
+	Bit32u vibtab_add;
+	Bit32u tremtab_pos;
+	Bit32u tremtab_add;
+	
+	Bit32u generator_add;	// should be a chip parameter
+	
+	fltype recipsamp;	// inverse of sampling rate
+	fltype frqmul16;
+	
+	ADL_UPDATEHANDLER UpdateHandler;	// stream update handler
+	void* UpdateParam;					// stream update parameter
+} OPL_DATA;
+
+
+// enable an operator
+static void enable_operator(OPL_DATA* chip, Bitu regbase, op_type* op_pt, Bit32u act_type);
+
+// functions to change parameters of an operator
+static void change_frequency(OPL_DATA* chip, Bitu chanbase, Bitu regbase, op_type* op_pt);
+
+static void change_attackrate(OPL_DATA* chip, Bitu regbase, op_type* op_pt);
+static void change_decayrate(OPL_DATA* chip, Bitu regbase, op_type* op_pt);
+static void change_releaserate(OPL_DATA* chip, Bitu regbase, op_type* op_pt);
+static void change_sustainlevel(OPL_DATA* chip, Bitu regbase, op_type* op_pt);
+static void change_waveform(OPL_DATA* chip, Bitu regbase, op_type* op_pt);
+static void change_keepsustain(OPL_DATA* chip, Bitu regbase, op_type* op_pt);
+static void change_vibrato(OPL_DATA* chip, Bitu regbase, op_type* op_pt);
+static void change_feedback(OPL_DATA* chip, Bitu chanbase, op_type* op_pt);
+
+// general functions
+/*void* adlib_init(Bitu clock, Bit32u samplerate);
+void adlib_writeIO(void *chip, Bitu addr, Bit8u val);
+void adlib_write(void *chip, Bitu idx, Bit8u val);
+//void adlib_getsample(Bit16s* sndptr, Bits numsamples);
+void adlib_getsample(void *chip, Bit32s** sndptr, Bits numsamples);
+
+Bitu adlib_reg_read(void *chip, Bitu port);
+void adlib_write_index(void *chip, Bitu port, Bit8u val);*/
+static void adlib_write(void *chip, Bitu idx, Bit8u val);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.c Added

@@ -0,0 +1,82 @@
+#include <stdlib.h>
+#include <math.h>
+#include "panning.h"
+
+#ifndef PI
+#define PI 3.14159265359
+#endif
+#ifndef SQRT2
+#define SQRT2 1.414213562
+#endif
+#define RANGE 512
+
+//-----------------------------------------------------------------
+// Set the panning values for the two stereo channels (L,R)
+// for a position -256..0..256 L..C..R
+//-----------------------------------------------------------------
+void calc_panning(float channels2, int position)
+{
+	if ( position > RANGE / 2 )
+		position = RANGE / 2;
+	else if ( position < -RANGE / 2 )
+		position = -RANGE / 2;
+	position += RANGE / 2;	// make -256..0..256 -> 0..256..512
+	
+	// Equal power law: equation is
+	// right = sin( position / range * pi / 2) * sqrt( 2 )
+	// left is equivalent to right with position = range - position
+	// position is in the range 0 .. RANGE
+	// RANGE / 2 = centre, result = 1.0f
+	channels1 = (float)( sin( (double)position / RANGE * PI / 2 ) * SQRT2 );
+	position = RANGE - position;
+	channels0 = (float)( sin( (double)position / RANGE * PI / 2 ) * SQRT2 );
+}
+
+//-----------------------------------------------------------------
+// Reset the panning values to the centre position
+//-----------------------------------------------------------------
+void centre_panning(float channels2)
+{
+	channels0 = channels1 = 1.0f;
+}
+
+/*//-----------------------------------------------------------------
+// Generate a stereo position in the range 0..RANGE
+// with Gaussian distribution, mean RANGE/2, S.D. RANGE/5
+//-----------------------------------------------------------------
+int random_stereo()
+{
+	int n = (int)(RANGE/2 + gauss_rand() * (RANGE * 0.2) );
+	if ( n > RANGE ) n = RANGE;
+	if ( n < 0 ) n = 0;
+	return n;
+}
+
+//-----------------------------------------------------------------
+// Generate a Gaussian random number with mean 0, variance 1
+// Copied from an ancient C newsgroup FAQ
+//-----------------------------------------------------------------
+double gauss_rand()
+{
+	static double V1, V2, S;
+	static int phase = 0;
+	double X;
+
+	if(phase == 0) {
+		do {
+			double U1 = (double)rand() / RAND_MAX;
+			double U2 = (double)rand() / RAND_MAX;
+
+			V1 = 2 * U1 - 1;
+			V2 = 2 * U2 - 1;
+			S = V1 * V1 + V2 * V2;
+			} while(S >= 1 || S == 0);
+
+		X = V1 * sqrt(-2 * log(S) / S);
+	} else
+		X = V2 * sqrt(-2 * log(S) / S);
+
+	phase = 1 - phase;
+
+	return X;
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/panning.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.c Added

@@ -0,0 +1,1498 @@
+/*****************************************************************************
+ *
+ * POKEY chip emulator 4.51
+ * Copyright Nicola Salmoria and the MAME Team
+ *
+ * Based on original info found in Ron Fries' Pokey emulator,
+ * with additions by Brad Oliver, Eric Smith and Juergen Buchmueller,
+ * paddle (a/d conversion) details from the Atari 400/800 Hardware Manual.
+ * Polynome algorithms according to info supplied by Perry McFarlane.
+ *
+ * This code is subject to the MAME license, which besides other
+ * things means it is distributed as is, no warranties whatsoever.
+ * For more details read mame.txt that comes with MAME.
+ *
+ * 4.51:
+ * - changed to use the attotime datatype
+ * 4.5:
+ * - changed the 9/17 bit polynomial formulas such that the values
+ * required for the Tempest Pokey protection will be found.
+ * Tempest expects the upper 4 bits of the RNG to appear in the
+ * lower 4 bits after four cycles, so there has to be a shift
+ * of 1 per cycle (which was not the case before). Bits #6-#13 of the
+ * new RNG give this expected result now, bits #0-7 of the 9 bit poly.
+ * - reading the RNG returns the shift register contents ^ 0xff.
+ * That way resetting the Pokey with SKCTL (which resets the
+ * polynome shifters to 0) returns the expected 0xff value.
+ * 4.4:
+ * - reversed sample values to make OFF channels produce a zero signal.
+ * actually de-reversed them; don't remember that I reversed them ;-/
+ * 4.3:
+ * - for POT inputs returning zero, immediately assert the ALLPOT
+ * bit after POTGO is written, otherwise start trigger timer
+ * depending on SK_PADDLE mode, either 1-228 scanlines or 1-2
+ * scanlines, depending on the SK_PADDLE bit of SKCTL.
+ * 4.2:
+ * - half volume for channels which are inaudible (this should be
+ * close to the real thing).
+ * 4.1:
+ * - default gain increased to closely match the old code.
+ * - random numbers repeat rate depends on POLY9 flag too!
+ * - verified sound output with many, many Atari 800 games,
+ * including the SUPPRESS_INAUDIBLE optimizations.
+ * 4.0:
+ * - rewritten from scratch.
+ * - 16bit stream interface.
+ * - serout ready/complete delayed interrupts.
+ * - reworked pot analog/digital conversion timing.
+ * - optional non-indexing pokey update functions.
+ *
+ *****************************************************************************/
+
+#include "mamedef.h"
+//#include "emu.h"
+#include <stdlib.h>
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+#include "pokey.h"
+
+/*
+ * Defining this produces much more (about twice as much)
+ * but also more efficient code. Ideally this should be set
+ * for processors with big code cache and for healthy compilers :)
+ */
+#ifndef BIG_SWITCH
+#ifndef HEAVY_MACRO_USAGE
+#define HEAVY_MACRO_USAGE 1
+#endif
+#else
+#define HEAVY_MACRO_USAGE	BIG_SWITCH
+#endif
+
+#define SUPPRESS_INAUDIBLE	1
+
+/* Four channels with a range of 0..32767 and volume 0..15 */
+//#define POKEY_DEFAULT_GAIN (32767/15/4)
+
+/*
+ * But we raise the gain and risk clipping, the old Pokey did
+ * this too. It defined POKEY_DEFAULT_GAIN 6 and this was
+ * 6 * 15 * 4 = 360, 360/256 = 1.40625
+ * I use 15/11 = 1.3636, so this is a little lower.
+ */
+#define POKEY_DEFAULT_GAIN (32767/11/4)
+
+#define VERBOSE 		0
+#define VERBOSE_SOUND	0
+#define VERBOSE_TIMER	0
+#define VERBOSE_POLY	0
+#define VERBOSE_RAND	0
+
+#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+
+#define LOG_SOUND(x) do { if (VERBOSE_SOUND) logerror x; } while (0)
+
+#define LOG_TIMER(x) do { if (VERBOSE_TIMER) logerror x; } while (0)
+
+#define LOG_POLY(x) do { if (VERBOSE_POLY) logerror x; } while (0)
+
+#define LOG_RAND(x) do { if (VERBOSE_RAND) logerror x; } while (0)
+
+#define CHAN1	0
+#define CHAN2	1
+#define CHAN3	2
+#define CHAN4	3
+
+#define TIMER1	0
+#define TIMER2	1
+#define TIMER4	2
+
+/* values to add to the divisors for the different modes */
+#define DIVADD_LOCLK		1
+#define DIVADD_HICLK		4
+#define DIVADD_HICLK_JOINED 7
+
+/* AUDCx */
+#define NOTPOLY5	0x80	/* selects POLY5 or direct CLOCK */
+#define POLY4		0x40	/* selects POLY4 or POLY17 */
+#define PURE		0x20	/* selects POLY4/17 or PURE tone */
+#define VOLUME_ONLY 0x10	/* selects VOLUME OUTPUT ONLY */
+#define VOLUME_MASK 0x0f	/* volume mask */
+
+/* AUDCTL */
+#define POLY9		0x80	/* selects POLY9 or POLY17 */
+#define CH1_HICLK	0x40	/* selects 1.78979 MHz for Ch 1 */
+#define CH3_HICLK	0x20	/* selects 1.78979 MHz for Ch 3 */
+#define CH12_JOINED 0x10	/* clocks channel 1 w/channel 2 */
+#define CH34_JOINED 0x08	/* clocks channel 3 w/channel 4 */
+#define CH1_FILTER	0x04	/* selects channel 1 high pass filter */
+#define CH2_FILTER	0x02	/* selects channel 2 high pass filter */
+#define CLK_15KHZ	0x01	/* selects 15.6999 kHz or 63.9211 kHz */
+
+/* IRQEN (D20E) */
+#define IRQ_BREAK	0x80	/* BREAK key pressed interrupt */
+#define IRQ_KEYBD	0x40	/* keyboard data ready interrupt */
+#define IRQ_SERIN	0x20	/* serial input data ready interrupt */
+#define IRQ_SEROR	0x10	/* serial output register ready interrupt */
+#define IRQ_SEROC	0x08	/* serial output complete interrupt */
+#define IRQ_TIMR4	0x04	/* timer channel #4 interrupt */
+#define IRQ_TIMR2	0x02	/* timer channel #2 interrupt */
+#define IRQ_TIMR1	0x01	/* timer channel #1 interrupt */
+
+/* SKSTAT (R/D20F) */
+#define SK_FRAME	0x80	/* serial framing error */
+#define SK_OVERRUN	0x40	/* serial overrun error */
+#define SK_KBERR	0x20	/* keyboard overrun error */
+#define SK_SERIN	0x10	/* serial input high */
+#define SK_SHIFT	0x08	/* shift key pressed */
+#define SK_KEYBD	0x04	/* keyboard key pressed */
+#define SK_SEROUT	0x02	/* serial output active */
+
+/* SKCTL (W/D20F) */
+#define SK_BREAK	0x80	/* serial out break signal */
+#define SK_BPS		0x70	/* bits per second */
+#define SK_FM		0x08	/* FM mode */
+#define SK_PADDLE	0x04	/* fast paddle a/d conversion */
+#define SK_RESET	0x03	/* reset serial/keyboard interface */
+
+#define DIV_64		28		 /* divisor for 1.78979 MHz clock to 63.9211 kHz */
+#define DIV_15		114 	 /* divisor for 1.78979 MHz clock to 15.6999 kHz */
+
+typedef struct _pokey_state pokey_state;
+struct _pokey_state
+{
+	INT32 counter4;		/* channel counter */
+	INT32 divisor4;		/* channel divisor (modulo value) */
+	UINT32 volume4;		/* channel volume - derived */
+	UINT8 output4;		/* channel output signal (1 active, 0 inactive) */
+	UINT8 audible4;		/* channel plays an audible tone/effect */
+	UINT8 Muted4;
+	UINT32 samplerate_24_8; /* sample rate in 24.8 format */
+	UINT32 samplepos_fract; /* sample position fractional part */
+	UINT32 samplepos_whole; /* sample position whole part */
+	UINT32 polyadjust;		/* polynome adjustment */
+	UINT32 p4; /* poly4 index */
+	UINT32 p5; /* poly5 index */
+	UINT32 p9; /* poly9 index */
+	UINT32 p17; /* poly17 index */
+	UINT32 r9;				/* rand9 index */
+	UINT32 r17; /* rand17 index */
+	UINT32 clockmult;		/* clock multiplier */
+	//device_t *device;
+	//sound_stream * channel; /* streams channel */
+	//emu_timer *timer3;	/* timers for channel 1,2 and 4 events */
+	//attotime timer_period3;	/* computed periods for these timers */
+	//int timer_param3;		/* computed parameters for these timers */
+	//emu_timer *rtimer; /* timer for calculating the random offset */
+	//emu_timer *ptimer8;	/* pot timers */
+	//devcb_resolved_read8 pot_r8;
+	//devcb_resolved_read8 allpot_r;
+	//devcb_resolved_read8 serin_r;
+	//devcb_resolved_write8 serout_w;
+	//void (*interrupt_cb)(device_t *device, int mask);
+	UINT8 AUDF4; /* AUDFx (D200, D202, D204, D206) */
+	UINT8 AUDC4;			/* AUDCx (D201, D203, D205, D207) */
+	UINT8 POTx8;			/* POTx (R/D200-D207) */
+	UINT8 AUDCTL;			/* AUDCTL (W/D208) */
+	UINT8 ALLPOT;			/* ALLPOT (R/D208) */
+	UINT8 KBCODE;			/* KBCODE (R/D209) */
+	UINT8 RANDOM;			/* RANDOM (R/D20A) */
+	UINT8 SERIN;			/* SERIN (R/D20D) */
+	UINT8 SEROUT;			/* SEROUT (W/D20D) */
+	UINT8 IRQST;			/* IRQST (R/D20E) */
+	UINT8 IRQEN;			/* IRQEN (W/D20E) */
+	UINT8 SKSTAT;			/* SKSTAT (R/D20F) */
+	UINT8 SKCTL;			/* SKCTL (W/D20F) */
+	//pokey_interface intf;
+	//attotime clock_period;
+	double clock_period;
+	//attotime ad_time_fast;
+	//attotime ad_time_slow;
+
+	UINT8 poly40x0f;
+	UINT8 poly50x1f;
+	UINT8 poly90x1ff;
+	UINT8 poly170x1ffff;
+
+	UINT8 rand90x1ff;
+	UINT8 rand170x1ffff;
+};
+
+
+#define P4(chip) chip->poly4chip->p4
+#define P5(chip) chip->poly5chip->p5
+#define P9(chip) chip->poly9chip->p9
+#define P17(chip) chip->poly17chip->p17
+
+//static TIMER_CALLBACK( pokey_timer_expire );
+//static TIMER_CALLBACK( pokey_pot_trigger );
+
+
+#define SAMPLE	-1
+
+#define ADJUST_EVENT(chip)												\
+	chip->counterCHAN1 -= event;										\
+	chip->counterCHAN2 -= event;										\
+	chip->counterCHAN3 -= event;										\
+	chip->counterCHAN4 -= event;										\
+	chip->samplepos_whole -= event;										\
+	chip->polyadjust += event
+
+#if SUPPRESS_INAUDIBLE
+
+#define PROCESS_CHANNEL(chip,ch) \
+	int toggle = 0; 													\
+	ADJUST_EVENT(chip); 												\
+	/* reset the channel counter */ 									\
+	if( chip->audiblech )												\
+		chip->counterch = chip->divisorch;							\
+	else																\
+		chip->counterch = 0x7fffffff;									\
+	chip->p4 = (chip->p4+chip->polyadjust)%0x0000f;						\
+	chip->p5 = (chip->p5+chip->polyadjust)%0x0001f;						\
+	chip->p9 = (chip->p9+chip->polyadjust)%0x001ff;						\
+	chip->p17 = (chip->p17+chip->polyadjust)%0x1ffff;					\
+	chip->polyadjust = 0;												\
+	if( (chip->AUDCch & NOTPOLY5) || P5(chip) )						\
+	{																	\
+		if( chip->AUDCch & PURE )										\
+			toggle = 1; 												\
+		else															\
+		if( chip->AUDCch & POLY4 )									\
+			toggle = chip->outputch == !P4(chip);						\
+		else															\
+		if( chip->AUDCTL & POLY9 )										\
+			toggle = chip->outputch == !P9(chip);						\
+		else															\
+			toggle = chip->outputch == !P17(chip);					\
+	}																	\
+	if( toggle )														\
+	{																	\
+		if( chip->audiblech && ! chip->Mutedch )					\
+		{																\
+			if( chip->outputch )										\
+				sum -= chip->volumech;								\
+			else														\
+				sum += chip->volumech;								\
+		}																\
+		chip->outputch ^= 1;											\
+	}																	\
+	/* is this a filtering channel (3/4) and is the filter active? */	\
+	if( chip->AUDCTL & ((CH1_FILTER|CH2_FILTER) & (0x10 >> ch)) )		\
+ { \
+		if( chip->outputch-2 )										\
+ { \
+			chip->outputch-2 = 0;										\
+			if( chip->audiblech && ! chip->Mutedch )				\
+				sum -= chip->volumech-2;								\
+ } \
+ } \
+
+#else
+
+#define PROCESS_CHANNEL(chip,ch) \
+	int toggle = 0; 													\
+	ADJUST_EVENT(chip); 												\
+	/* reset the channel counter */ 									\
+	chip->counterch = pchip.divisorch;							\
+	chip->p4 = (chip->p4+chip->polyadjust)%0x0000f;						\
+	chip->p5 = (chip->p5+chip->polyadjust)%0x0001f;						\
+	chip->p9 = (chip->p9+chip->polyadjust)%0x001ff;						\
+	chip->p17 = (chip->p17+chip->polyadjust)%0x1ffff;					\
+	chip->polyadjust = 0;												\
+	if( (chip->AUDCch & NOTPOLY5) || P5(chip) )						\
+	{																	\
+		if( chip->AUDCch & PURE )										\
+			toggle = 1; 												\
+		else															\
+		if( chip->AUDCch & POLY4 )									\
+			toggle = chip->outputch == !P4(chip);						\
+		else															\
+		if( chip->AUDCTL & POLY9 )										\
+			toggle = chip->outputch == !P9(chip);						\
+		else															\
+			toggle = chip->outputch == !P17(chip);					\
+	}																	\
+	if( toggle && ! chip->Mutedch )									\
+	{																	\
+		if( chip->outputch )											\
+			sum -= chip->volumech;									\
+		else															\
+			sum += chip->volumech;									\
+		chip->outputch ^= 1;											\
+	}																	\
+	/* is this a filtering channel (3/4) and is the filter active? */	\
+	if( chip->AUDCTL & ((CH1_FILTER|CH2_FILTER) & (0x10 >> ch)) )		\
+ { \
+		if( chip->outputch-2 && ! chip->Mutedch )					\
+ { \
+			chip->outputch-2 = 0;										\
+			sum -= chip->volumech-2;									\
+ } \
+ } \
+
+#endif
+
+#define PROCESS_SAMPLE(chip) \
+ ADJUST_EVENT(chip); \
+ /* adjust the sample position */ \
+	chip->samplepos_whole++;											\
+	/* store sum of output signals into the buffer */					\
+/*	*buffer++ = (sum > 0x7fff) ? 0x7fff : sum;	*/						\
+	*bufL++ = *bufR++ = sum;											\
+	samples--
+
+#if HEAVY_MACRO_USAGE
+
+/*
+ * This version of PROCESS_POKEY repeats the search for the minimum
+ * event value without using an index to the channel. That way the
+ * PROCESS_CHANNEL macros can be called with fixed values and expand
+ * to much more efficient code
+ */
+
+#define PROCESS_POKEY(chip) 											\
+	UINT32 sum = 0; 													\
+	if( chip->outputCHAN1 && ! chip->MutedCHAN1 )					\
+		sum += chip->volumeCHAN1;										\
+	if( chip->outputCHAN2 && ! chip->MutedCHAN2 )					\
+		sum += chip->volumeCHAN2;										\
+	if( chip->outputCHAN3 && ! chip->MutedCHAN3 )					\
+		sum += chip->volumeCHAN3;										\
+	if( chip->outputCHAN4 && ! chip->MutedCHAN4 )					\
+		sum += chip->volumeCHAN4;										\
+ while( samples > 0 ) \
+	{																	\
+		if( chip->counterCHAN1 < chip->samplepos_whole )				\
+		{																\
+			if( chip->counterCHAN2 < chip->counterCHAN1 )			\
+			{															\
+				if( chip->counterCHAN3 < chip->counterCHAN2 )		\
+				{														\
+					if( chip->counterCHAN4 < chip->counterCHAN3 )	\
+					{													\
+						UINT32 event = chip->counterCHAN4;			\
+ PROCESS_CHANNEL(chip,CHAN4); \
+					}													\
+					else												\
+					{													\
+						UINT32 event = chip->counterCHAN3;			\
+ PROCESS_CHANNEL(chip,CHAN3); \
+					}													\
+				}														\
+				else													\
+				if( chip->counterCHAN4 < chip->counterCHAN2 )		\
+				{														\
+					UINT32 event = chip->counterCHAN4;				\
+ PROCESS_CHANNEL(chip,CHAN4); \
+				}														\
+ else \
+				{														\
+					UINT32 event = chip->counterCHAN2;				\
+ PROCESS_CHANNEL(chip,CHAN2); \
+				}														\
+ } \
+			else														\
+			if( chip->counterCHAN3 < chip->counterCHAN1 )			\
+			{															\
+				if( chip->counterCHAN4 < chip->counterCHAN3 )		\
+				{														\
+					UINT32 event = chip->counterCHAN4;				\
+ PROCESS_CHANNEL(chip,CHAN4); \
+				}														\
+ else \
+				{														\
+					UINT32 event = chip->counterCHAN3;				\
+ PROCESS_CHANNEL(chip,CHAN3); \
+				}														\
+ } \
+			else														\
+			if( chip->counterCHAN4 < chip->counterCHAN1 )			\
+			{															\
+				UINT32 event = chip->counterCHAN4;					\
+ PROCESS_CHANNEL(chip,CHAN4); \
+			}															\
+ else \
+			{															\
+				UINT32 event = chip->counterCHAN1;					\
+ PROCESS_CHANNEL(chip,CHAN1); \
+			}															\
+		}																\
+		else															\
+		if( chip->counterCHAN2 < chip->samplepos_whole )				\
+		{																\
+			if( chip->counterCHAN3 < chip->counterCHAN2 )			\
+			{															\
+				if( chip->counterCHAN4 < chip->counterCHAN3 )		\
+				{														\
+					UINT32 event = chip->counterCHAN4;				\
+ PROCESS_CHANNEL(chip,CHAN4); \
+				}														\
+				else													\
+				{														\
+					UINT32 event = chip->counterCHAN3;				\
+ PROCESS_CHANNEL(chip,CHAN3); \
+				}														\
+			}															\
+			else														\
+			if( chip->counterCHAN4 < chip->counterCHAN2 )			\
+			{															\
+				UINT32 event = chip->counterCHAN4;					\
+ PROCESS_CHANNEL(chip,CHAN4); \
+			}															\
+			else														\
+			{															\
+				UINT32 event = chip->counterCHAN2;					\
+ PROCESS_CHANNEL(chip,CHAN2); \
+			}															\
+		}																\
+		else															\
+		if( chip->counterCHAN3 < chip->samplepos_whole )				\
+ { \
+			if( chip->counterCHAN4 < chip->counterCHAN3 )			\
+			{															\
+				UINT32 event = chip->counterCHAN4;					\
+ PROCESS_CHANNEL(chip,CHAN4); \
+			}															\
+			else														\
+			{															\
+				UINT32 event = chip->counterCHAN3;					\
+ PROCESS_CHANNEL(chip,CHAN3); \
+			}															\
+		}																\
+		else															\
+		if( chip->counterCHAN4 < chip->samplepos_whole )				\
+		{																\
+			UINT32 event = chip->counterCHAN4;						\
+ PROCESS_CHANNEL(chip,CHAN4); \
+ } \
+		else															\
+		{																\
+			UINT32 event = chip->samplepos_whole;						\
+			PROCESS_SAMPLE(chip);										\
+		}																\
+	}/*																	\
+	chip->rtimer->adjust(attotime::never)*/
+
+#else /* no HEAVY_MACRO_USAGE */
+/*
+ * And this version of PROCESS_POKEY uses event and channel variables
+ * so that the PROCESS_CHANNEL macro needs to index memory at runtime.
+ */
+
+#define PROCESS_POKEY(chip) \
+	UINT32 sum = 0; 													\
+	if( chip->outputCHAN1 && ! chip->MutedCHAN1 )					\
+		sum += chip->volumeCHAN1;										\
+	if( chip->outputCHAN2 && ! chip->MutedCHAN2 )					\
+		sum += chip->volumeCHAN2;										\
+	if( chip->outputCHAN3 && ! chip->MutedCHAN3 )					\
+		sum += chip->volumeCHAN3;										\
+	if( chip->outputCHAN4 && ! chip->MutedCHAN4 )					\
+ sum += chip->volumeCHAN4; \
+	while( samples > 0 ) \
+	{																	\
+		UINT32 event = chip->samplepos_whole;							\
+		UINT32 channel = SAMPLE;										\
+		if( chip->counterCHAN1 < event )								\
+ { \
+			event = chip->counterCHAN1;								\
+			channel = CHAN1;											\
+		}																\
+		if( chip->counterCHAN2 < event )								\
+ { \
+			event = chip->counterCHAN2;								\
+			channel = CHAN2;											\
+ } \
+		if( chip->counterCHAN3 < event )								\
+ { \
+			event = chip->counterCHAN3;								\
+			channel = CHAN3;											\
+ } \
+		if( chip->counterCHAN4 < event )								\
+ { \
+			event = chip->counterCHAN4;								\
+			channel = CHAN4;											\
+ } \
+ if( channel == SAMPLE ) \
+		{																\
+ PROCESS_SAMPLE(chip); \
+ } \
+		else															\
+		{																\
+			PROCESS_CHANNEL(chip,channel);								\
+		}																\
+	}/*																	\
+	chip->rtimer->adjust(attotime::never)*/
+
+#endif
+
+
+/*INLINE pokey_state *get_safe_token(device_t *device)
+{
+	assert(device != NULL);
+	assert(device->type() == POKEY);
+	return (pokey_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+//static STREAM_UPDATE( pokey_update )
+void pokey_update(void *param, stream_sample_t **outputs, int samples)
+{
+	pokey_state *chip = (pokey_state *)param;
+	//stream_sample_t *buffer = outputs0;
+	stream_sample_t *bufL = outputs0;
+	stream_sample_t *bufR = outputs1;
+	PROCESS_POKEY(chip);
+}
+
+
+static void poly_init(UINT8 *poly, int size, int left, int right, int add)
+{
+	int mask = (1 << size) - 1;
+ int i, x = 0;
+
+#ifdef _DEBUG
+	LOG_POLY(("poly %d\n", size));
+#endif
+	for( i = 0; i < mask; i++ )
+	{
+		*poly++ = x & 1;
+#ifdef _DEBUG
+		LOG_POLY(("%05x: %d\n", x, x&1));
+#endif
+ /* calculate next bit */
+		x = ((x << left) + (x >> right) + add) & mask;
+	}
+}
+
+static void rand_init(UINT8 *rng, int size, int left, int right, int add)
+{
+ int mask = (1 << size) - 1;
+ int i, x = 0;
+
+#ifdef _DEBUG
+	LOG_RAND(("rand %d\n", size));
+#endif
+ for( i = 0; i < mask; i++ )
+	{
+		if (size == 17)
+			*rng = x >> 6;	/* use bits 6..13 */
+		else
+			*rng = x;		/* use bits 0..7 */
+#ifdef _DEBUG
+ LOG_RAND(("%05x: %02x\n", x, *rng));
+#endif
+ rng++;
+ /* calculate next bit */
+		x = ((x << left) + (x >> right) + add) & mask;
+	}
+}
+
+
+/*static void register_for_save(pokey_state *chip, device_t *device)
+{
+	device->save_item(NAME(chip->counter));
+	device->save_item(NAME(chip->divisor));
+	device->save_item(NAME(chip->volume));
+	device->save_item(NAME(chip->output));
+	device->save_item(NAME(chip->audible));
+	device->save_item(NAME(chip->samplepos_fract));
+	device->save_item(NAME(chip->samplepos_whole));
+	device->save_item(NAME(chip->polyadjust));
+	device->save_item(NAME(chip->p4));
+	device->save_item(NAME(chip->p5));
+	device->save_item(NAME(chip->p9));
+	device->save_item(NAME(chip->p17));
+	device->save_item(NAME(chip->r9));
+	device->save_item(NAME(chip->r17));
+	device->save_item(NAME(chip->clockmult));
+	device->save_item(NAME(chip->timer_period0));
+	device->save_item(NAME(chip->timer_period1));
+	device->save_item(NAME(chip->timer_period2));
+	device->save_item(NAME(chip->timer_param));
+	device->save_item(NAME(chip->AUDF));
+	device->save_item(NAME(chip->AUDC));
+	device->save_item(NAME(chip->POTx));
+	device->save_item(NAME(chip->AUDCTL));
+	device->save_item(NAME(chip->ALLPOT));
+	device->save_item(NAME(chip->KBCODE));
+	device->save_item(NAME(chip->RANDOM));
+	device->save_item(NAME(chip->SERIN));
+	device->save_item(NAME(chip->SEROUT));
+	device->save_item(NAME(chip->IRQST));
+	device->save_item(NAME(chip->IRQEN));
+	device->save_item(NAME(chip->SKSTAT));
+	device->save_item(NAME(chip->SKCTL));
+}*/
+
+
+//static DEVICE_START( pokey )
+int device_start_pokey(void **_info, int clock)
+{
+	//pokey_state *chip = get_safe_token(device);
+	pokey_state *chip;
+	//int sample_rate = device->clock();
+	int sample_rate = clock;
+	//int i;
+
+	chip = (pokey_state *) calloc(1, sizeof(pokey_state));
+	*_info = (void *) chip;
+	
+	//if (device->static_config())
+	//	memcpy(&chip->intf, device->static_config(), sizeof(pokey_interface));
+	//chip->device = device;
+	//chip->clock_period = attotime::from_hz(device->clock());
+	chip->clock_period = 1.0 / clock;
+
+	/* calculate the A/D times
+ * In normal, slow mode (SKCTL bit SK_PADDLE is clear) the conversion
+ * takes N scanlines, where N is the paddle value. A single scanline
+ * takes approximately 64us to finish (1.78979MHz clock).
+ * In quick mode (SK_PADDLE set) the conversion is done very fast
+ * (takes two scanlines) but the result is not as accurate.
+ */
+	//chip->ad_time_fast = (attotime::from_nsec(64000*2/228) * FREQ_17_EXACT) / device->clock();
+	//chip->ad_time_slow = (attotime::from_nsec(64000 ) * FREQ_17_EXACT) / device->clock();
+
+	/* initialize the poly counters */
+	poly_init(chip->poly4, 4, 3, 1, 0x00004);
+	poly_init(chip->poly5, 5, 3, 2, 0x00008);
+	poly_init(chip->poly9, 9, 8, 1, 0x00180);
+	poly_init(chip->poly17, 17,16, 1, 0x1c000);
+
+	/* initialize the random arrays */
+	rand_init(chip->rand9, 9, 8, 1, 0x00180);
+	rand_init(chip->rand17, 17,16, 1, 0x1c000);
+
+	//chip->samplerate_24_8 = (device->clock() << 8) / sample_rate;
+	chip->samplerate_24_8 = (clock << 8) / sample_rate;
+	chip->divisorCHAN1 = 4;
+	chip->divisorCHAN2 = 4;
+	chip->divisorCHAN3 = 4;
+	chip->divisorCHAN4 = 4;
+	chip->clockmult = DIV_64;
+	chip->KBCODE = 0x09;		 /* Atari 800 'no key' */
+	chip->SKCTL = SK_RESET;	 /* let the RNG run after reset */
+	//chip->rtimer = device->machine().scheduler().timer_alloc(FUNC_NULL);
+
+	//chip->timer0 = device->machine().scheduler().timer_alloc(FUNC(pokey_timer_expire), chip);
+	//chip->timer1 = device->machine().scheduler().timer_alloc(FUNC(pokey_timer_expire), chip);
+	//chip->timer2 = device->machine().scheduler().timer_alloc(FUNC(pokey_timer_expire), chip);
+
+	/*for (i=0; i<8; i++)
+	{
+		chip->ptimeri = device->machine().scheduler().timer_alloc(FUNC(pokey_pot_trigger), chip);
+		chip->pot_ri.resolve(chip->intf.pot_ri, *device);
+	}
+	chip->allpot_r.resolve(chip->intf.allpot_r, *device);
+	chip->serin_r.resolve(chip->intf.serin_r, *device);
+	chip->serout_w.resolve(chip->intf.serout_w, *device);
+	chip->interrupt_cb = chip->intf.interrupt_cb;*/
+
+	//chip->channel = device->machine().sound().stream_alloc(*device, 0, 1, sample_rate, chip, pokey_update);
+
+	//register_for_save(chip, device);
+
+	return sample_rate;
+}
+
+void device_stop_pokey(void *chip)
+{
+	free(chip);
+	
+	return;
+}
+
+void device_reset_pokey(void *_info)
+{
+	pokey_state *chip = (pokey_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 4; CurChn ++)
+	{
+		chip->counterCurChn = 0;
+		chip->divisorCurChn = 4;
+		chip->volumeCurChn = 0;
+		chip->outputCurChn = 0;
+		chip->audibleCurChn = 0;
+	}
+	chip->samplepos_fract = 0;
+	chip->samplepos_whole = 0;
+	chip->polyadjust = 0;
+	chip->p4 = 0;
+	chip->p5 = 0;
+	chip->p9 = 0;
+	chip->p17 = 0;
+	chip->r9 = 0;
+	chip->r17 = 0;
+	chip->clockmult = DIV_64;
+	
+	return;
+}
+
+/*static TIMER_CALLBACK( pokey_timer_expire )
+{
+	pokey_state *p = (pokey_state *)ptr;
+	int timers = param;
+
+	LOG_TIMER(("POKEY #%p timer %d with IRQEN $%02x\n", p, timers, p->IRQEN));
+
+ // check if some of the requested timer interrupts are enabled //
+	timers &= p->IRQEN;
+
+ if( timers )
+ {
+		// set the enabled timer irq status bits //
+		p->IRQST |= timers;
+ // call back an application supplied function to handle the interrupt //
+		if( p->interrupt_cb )
+			(*p->interrupt_cb)(p->device, timers);
+ }
+}*/
+
+/*static char *audc2str(int val)
+{
+	static char buff80;
+	if( val & NOTPOLY5 )
+	{
+		if( val & PURE )
+			strcpy(buff,"pure");
+		else
+		if( val & POLY4 )
+			strcpy(buff,"poly4");
+		else
+			strcpy(buff,"poly9/17");
+	}
+	else
+	{
+		if( val & PURE )
+			strcpy(buff,"poly5");
+		else
+		if( val & POLY4 )
+			strcpy(buff,"poly4+poly5");
+		else
+			strcpy(buff,"poly9/17+poly5");
+ }
+	return buff;
+}
+
+static char *audctl2str(int val)
+{
+	static char buff80;
+	if( val & POLY9 )
+		strcpy(buff,"poly9");
+	else
+		strcpy(buff,"poly17");
+	if( val & CH1_HICLK )
+		strcat(buff,"+ch1hi");
+	if( val & CH3_HICLK )
+		strcat(buff,"+ch3hi");
+	if( val & CH12_JOINED )
+		strcat(buff,"+ch1/2");
+	if( val & CH34_JOINED )
+		strcat(buff,"+ch3/4");
+	if( val & CH1_FILTER )
+		strcat(buff,"+ch1filter");
+	if( val & CH2_FILTER )
+		strcat(buff,"+ch2filter");
+	if( val & CLK_15KHZ )
+		strcat(buff,"+clk15");
+ return buff;
+}*/
+
+/*static TIMER_CALLBACK( pokey_serin_ready_cb )
+{
+	pokey_state *p = (pokey_state *)ptr;
+ if( p->IRQEN & IRQ_SERIN )
+	{
+		// set the enabled timer irq status bits //
+		p->IRQST |= IRQ_SERIN;
+		// call back an application supplied function to handle the interrupt //
+		if( p->interrupt_cb )
+			(*p->interrupt_cb)(p->device, IRQ_SERIN);
+	}
+}
+
+static TIMER_CALLBACK( pokey_serout_ready_cb )
+{
+	pokey_state *p = (pokey_state *)ptr;
+ if( p->IRQEN & IRQ_SEROR )
+	{
+		p->IRQST |= IRQ_SEROR;
+		if( p->interrupt_cb )
+			(*p->interrupt_cb)(p->device, IRQ_SEROR);
+	}
+}
+
+static TIMER_CALLBACK( pokey_serout_complete )
+{
+	pokey_state *p = (pokey_state *)ptr;
+ if( p->IRQEN & IRQ_SEROC )
+	{
+		p->IRQST |= IRQ_SEROC;
+		if( p->interrupt_cb )
+			(*p->interrupt_cb)(p->device, IRQ_SEROC);
+	}
+}
+
+static TIMER_CALLBACK( pokey_pot_trigger )
+{
+	pokey_state *p = (pokey_state *)ptr;
+	int pot = param;
+	LOG(("POKEY #%p POT%d triggers after %dus\n", p, pot, (int)(1000000 * p->ptimerpot->elapsed().as_double())));
+	p->ALLPOT &= ~(1 << pot);	// set the enabled timer irq status bits //
+}*/
+
+/*#define AD_TIME ((p->SKCTL & SK_PADDLE) ? p->ad_time_fast : p->ad_time_slow)
+
+static void pokey_potgo(pokey_state *p)
+{
+ int pot;
+
+	LOG(("POKEY #%p pokey_potgo\n", p));
+
+ p->ALLPOT = 0xff;
+
+ for( pot = 0; pot < 8; pot++ )
+	{
+		p->POTxpot = 0xff;
+		if( !p->pot_rpot.isnull() )
+		{
+			int r = p->pot_rpot(pot);
+
+			LOG(("POKEY %s pot_r(%d) returned $%02x\n", p->device->tag(), pot, r));
+			if( r != -1 )
+			{
+				if (r > 228)
+ r = 228;
+
+ // final value //
+ p->POTxpot = r;
+				p->ptimerpot->adjust(AD_TIME * r, pot);
+			}
+		}
+	}
+}*/
+
+//READ8_DEVICE_HANDLER( pokey_r )
+UINT8 pokey_r(void *_info, offs_t offset)
+{
+	//pokey_state *p = get_safe_token(device);
+	pokey_state *p = (pokey_state *)_info;
+	int data = 0, pot;
+	UINT32 adjust = 0;
+
+	switch (offset & 15)
+	{
+	case POT0_C: case POT1_C: case POT2_C: case POT3_C:
+	case POT4_C: case POT5_C: case POT6_C: case POT7_C:
+		pot = offset & 7;
+		/*if( !p->pot_rpot.isnull() )
+		{
+			//
+ * If the conversion is not yet finished (ptimer running),
+ * get the current value by the linear interpolation of
+ * the final value using the elapsed time.
+ //
+			if( p->ALLPOT & (1 << pot) )
+			{
+				//data = p->ptimerpot->elapsed().attoseconds / AD_TIME.attoseconds;
+				data = p->POTxpot;
+				LOG(("POKEY '%s' read POT%d (interpolated) $%02x\n", p->device->tag(), pot, data));
+ }
+			else
+			{
+				data = p->POTxpot;
+				LOG(("POKEY '%s' read POT%d (final value) $%02x\n", p->device->tag(), pot, data));
+			}
+		}
+		else
+			logerror("%s: warning - read '%s' POT%d\n", p->device->machine().describe_context(), p->device->tag(), pot);*/
+		break;
+
+ case ALLPOT_C:
+		/****************************************************************
+ * If the 2 least significant bits of SKCTL are 0, the ALLPOTs
+ * are disabled (SKRESET). Thanks to MikeJ for pointing this out.
+ ****************************************************************/
+		/*if( (p->SKCTL & SK_RESET) == 0)
+		{
+			data = 0;
+			LOG(("POKEY '%s' ALLPOT internal $%02x (reset)\n", p->device->tag(), data));
+		}
+		else if( !p->allpot_r.isnull() )
+		{
+			data = p->allpot_r(offset);
+			LOG(("POKEY '%s' ALLPOT callback $%02x\n", p->device->tag(), data));
+		}
+		else
+		{
+			data = p->ALLPOT;
+			LOG(("POKEY '%s' ALLPOT internal $%02x\n", p->device->tag(), data));
+		}*/
+		break;
+
+	case KBCODE_C:
+		data = p->KBCODE;
+		break;
+
+	case RANDOM_C:
+		/****************************************************************
+ * If the 2 least significant bits of SKCTL are 0, the random
+ * number generator is disabled (SKRESET). Thanks to Eric Smith
+ * for pointing out this critical bit of info! If the random
+ * number generator is enabled, get a new random number. Take
+ * the time gone since the last read into account and read the
+ * new value from an appropriate offset in the rand17 table.
+ ****************************************************************/
+		if( p->SKCTL & SK_RESET )
+		{
+			//adjust = p->rtimer->elapsed().as_double() / p->clock_period.as_double();
+			adjust = 0;
+			p->r9 = (p->r9 + adjust) % 0x001ff;
+			p->r17 = (p->r17 + adjust) % 0x1ffff;
+		}
+		else
+		{
+			adjust = 1;
+			p->r9 = 0;
+			p->r17 = 0;
+ //LOG_RAND(("POKEY '%s' rand17 frozen (SKCTL): $%02x\n", p->device->tag(), p->RANDOM));
+		}
+		if( p->AUDCTL & POLY9 )
+		{
+			p->RANDOM = p->rand9p->r9;
+			//LOG_RAND(("POKEY '%s' adjust %u rand9$%05x: $%02x\n", p->device->tag(), adjust, p->r9, p->RANDOM));
+		}
+		else
+		{
+			p->RANDOM = p->rand17p->r17;
+			//LOG_RAND(("POKEY '%s' adjust %u rand17$%05x: $%02x\n", p->device->tag(), adjust, p->r17, p->RANDOM));
+		}
+		//if (adjust > 0)
+		//	p->rtimer->adjust(attotime::never);
+		data = p->RANDOM ^ 0xff;
+		break;
+
+	case SERIN_C:
+		//if( !p->serin_r.isnull() )
+		//	p->SERIN = p->serin_r(offset);
+		data = p->SERIN;
+		//LOG(("POKEY '%s' SERIN $%02x\n", p->device->tag(), data));
+		break;
+
+	case IRQST_C:
+		/* IRQST is an active low input port; we keep it active high */
+		/* internally to ease the (un-)masking of bits */
+		data = p->IRQST ^ 0xff;
+		//LOG(("POKEY '%s' IRQST $%02x\n", p->device->tag(), data));
+		break;
+
+	case SKSTAT_C:
+		/* SKSTAT is also an active low input port */
+		data = p->SKSTAT ^ 0xff;
+		//LOG(("POKEY '%s' SKSTAT $%02x\n", p->device->tag(), data));
+		break;
+
+	default:
+		//LOG(("POKEY '%s' register $%02x\n", p->device->tag(), offset));
+ break;
+ }
+ return data;
+}
+
+/*READ8_HANDLER( quad_pokey_r )
+{
+	static const char *const devname4 = { "pokey1", "pokey2", "pokey3", "pokey4" };
+	int pokey_num = (offset >> 3) & ~0x04;
+	int control = (offset & 0x20) >> 2;
+	int pokey_reg = (offset % 8) | control;
+
+	return pokey_r(space->machine().device(devnamepokey_num), pokey_reg);
+}*/
+
+
+//WRITE8_DEVICE_HANDLER( pokey_w )
+void pokey_w(void *_info, offs_t offset, UINT8 data)
+{
+	//pokey_state *p = get_safe_token(device);
+	pokey_state *p = (pokey_state *)_info;
+	int ch_mask = 0, new_val;
+
+	//p->channel->update();
+
+ /* determine which address was changed */
+	switch (offset & 15)
+ {
+ case AUDF1_C:
+		if( data == p->AUDFCHAN1 )
+ return;
+		//LOG_SOUND(("POKEY '%s' AUDF1 $%02x\n", p->device->tag(), data));
+		p->AUDFCHAN1 = data;
+ ch_mask = 1 << CHAN1;
+		if( p->AUDCTL & CH12_JOINED )		/* if ch 1&2 tied together */
+ ch_mask |= 1 << CHAN2; /* then also change on ch2 */
+ break;
+
+ case AUDC1_C:
+		if( data == p->AUDCCHAN1 )
+ return;
+		//LOG_SOUND(("POKEY '%s' AUDC1 $%02x (%s)\n", p->device->tag(), data, audc2str(data)));
+		p->AUDCCHAN1 = data;
+ ch_mask = 1 << CHAN1;
+ break;
+
+ case AUDF2_C:
+		if( data == p->AUDFCHAN2 )
+ return;
+		//LOG_SOUND(("POKEY '%s' AUDF2 $%02x\n", p->device->tag(), data));
+		p->AUDFCHAN2 = data;
+ ch_mask = 1 << CHAN2;
+ break;
+
+ case AUDC2_C:
+		if( data == p->AUDCCHAN2 )
+ return;
+		//LOG_SOUND(("POKEY '%s' AUDC2 $%02x (%s)\n", p->device->tag(), data, audc2str(data)));
+		p->AUDCCHAN2 = data;
+ ch_mask = 1 << CHAN2;
+ break;
+
+ case AUDF3_C:
+		if( data == p->AUDFCHAN3 )
+ return;
+		//LOG_SOUND(("POKEY '%s' AUDF3 $%02x\n", p->device->tag(), data));
+		p->AUDFCHAN3 = data;
+ ch_mask = 1 << CHAN3;
+
+		if( p->AUDCTL & CH34_JOINED )	/* if ch 3&4 tied together */
+ ch_mask |= 1 << CHAN4; /* then also change on ch4 */
+ break;
+
+ case AUDC3_C:
+		if( data == p->AUDCCHAN3 )
+ return;
+		//LOG_SOUND(("POKEY '%s' AUDC3 $%02x (%s)\n", p->device->tag(), data, audc2str(data)));
+		p->AUDCCHAN3 = data;
+ ch_mask = 1 << CHAN3;
+ break;
+
+ case AUDF4_C:
+		if( data == p->AUDFCHAN4 )
+ return;
+		//LOG_SOUND(("POKEY '%s' AUDF4 $%02x\n", p->device->tag(), data));
+		p->AUDFCHAN4 = data;
+ ch_mask = 1 << CHAN4;
+ break;
+
+ case AUDC4_C:
+		if( data == p->AUDCCHAN4 )
+ return;
+		//LOG_SOUND(("POKEY '%s' AUDC4 $%02x (%s)\n", p->device->tag(), data, audc2str(data)));
+		p->AUDCCHAN4 = data;
+ ch_mask = 1 << CHAN4;
+ break;
+
+ case AUDCTL_C:
+		if( data == p->AUDCTL )
+ return;
+		//LOG_SOUND(("POKEY '%s' AUDCTL $%02x (%s)\n", p->device->tag(), data, audctl2str(data)));
+		p->AUDCTL = data;
+ ch_mask = 15; /* all channels */
+ /* determine the base multiplier for the 'div by n' calculations */
+		p->clockmult = (p->AUDCTL & CLK_15KHZ) ? DIV_15 : DIV_64;
+ break;
+
+ case STIMER_C:
+ /*// first remove any existing timers //
+		LOG_TIMER(("POKEY '%s' STIMER $%02x\n", p->device->tag(), data));
+
+		p->timerTIMER1->adjust(attotime::never, p->timer_paramTIMER1);
+		p->timerTIMER2->adjust(attotime::never, p->timer_paramTIMER2);
+		p->timerTIMER4->adjust(attotime::never, p->timer_paramTIMER4);
+
+ // reset all counters to zero (side effect) //
+		p->polyadjust = 0;
+		p->counterCHAN1 = 0;
+		p->counterCHAN2 = 0;
+		p->counterCHAN3 = 0;
+		p->counterCHAN4 = 0;
+
+ // joined chan#1 and chan#2 ? //
+		if( p->AUDCTL & CH12_JOINED )
+ {
+			if( p->divisorCHAN2 > 4 )
+			{
+				LOG_TIMER(("POKEY '%s' timer1+2 after %d clocks\n", p->device->tag(), p->divisorCHAN2));
+				// set timer #1 _and_ #2 event after timer_div clocks of joined CHAN1+CHAN2 //
+				p->timer_periodTIMER2 = p->clock_period * p->divisorCHAN2;
+				p->timer_paramTIMER2 = IRQ_TIMR2|IRQ_TIMR1;
+				p->timerTIMER2->adjust(p->timer_periodTIMER2, p->timer_paramTIMER2, p->timer_periodTIMER2);
+			}
+ }
+ else
+ {
+			if( p->divisorCHAN1 > 4 )
+			{
+				LOG_TIMER(("POKEY '%s' timer1 after %d clocks\n", p->device->tag(), p->divisorCHAN1));
+				// set timer #1 event after timer_div clocks of CHAN1 //
+				p->timer_periodTIMER1 = p->clock_period * p->divisorCHAN1;
+				p->timer_paramTIMER1 = IRQ_TIMR1;
+				p->timerTIMER1->adjust(p->timer_periodTIMER1, p->timer_paramTIMER1, p->timer_periodTIMER1);
+			}
+
+			if( p->divisorCHAN2 > 4 )
+			{
+				LOG_TIMER(("POKEY '%s' timer2 after %d clocks\n", p->device->tag(), p->divisorCHAN2));
+				// set timer #2 event after timer_div clocks of CHAN2 //
+				p->timer_periodTIMER2 = p->clock_period * p->divisorCHAN2;
+				p->timer_paramTIMER2 = IRQ_TIMR2;
+				p->timerTIMER2->adjust(p->timer_periodTIMER2, p->timer_paramTIMER2, p->timer_periodTIMER2);
+			}
+ }
+
+		// Note: pchip does not have a timer #3 //
+
+		if( p->AUDCTL & CH34_JOINED )
+ {
+ // not sure about this: if audc4 == 0000xxxx don't start timer 4 ? //
+			if( p->AUDCCHAN4 & 0xf0 )
+ {
+				if( p->divisorCHAN4 > 4 )
+				{
+					LOG_TIMER(("POKEY '%s' timer4 after %d clocks\n", p->device->tag(), p->divisorCHAN4));
+					// set timer #4 event after timer_div clocks of CHAN4 //
+					p->timer_periodTIMER4 = p->clock_period * p->divisorCHAN4;
+					p->timer_paramTIMER4 = IRQ_TIMR4;
+					p->timerTIMER4->adjust(p->timer_periodTIMER4, p->timer_paramTIMER4, p->timer_periodTIMER4);
+				}
+ }
+ }
+ else
+ {
+			if( p->divisorCHAN4 > 4 )
+			{
+				LOG_TIMER(("POKEY '%s' timer4 after %d clocks\n", p->device->tag(), p->divisorCHAN4));
+				// set timer #4 event after timer_div clocks of CHAN4 //
+				p->timer_periodTIMER4 = p->clock_period * p->divisorCHAN4;
+				p->timer_paramTIMER4 = IRQ_TIMR4;
+				p->timerTIMER4->adjust(p->timer_periodTIMER4, p->timer_paramTIMER4, p->timer_periodTIMER4);
+			}
+ }
+
+		p->timerTIMER1->enable(p->IRQEN & IRQ_TIMR1);
+		p->timerTIMER2->enable(p->IRQEN & IRQ_TIMR2);
+		p->timerTIMER4->enable(p->IRQEN & IRQ_TIMR4);*/
+ break;
+
+ case SKREST_C:
+ /* reset SKSTAT */
+		//LOG(("POKEY '%s' SKREST $%02x\n", p->device->tag(), data));
+		p->SKSTAT &= ~(SK_FRAME|SK_OVERRUN|SK_KBERR);
+ break;
+
+ case POTGO_C:
+		//LOG(("POKEY '%s' POTGO $%02x\n", p->device->tag(), data));
+		//pokey_potgo(p);
+ break;
+
+ case SEROUT_C:
+		//LOG(("POKEY '%s' SEROUT $%02x\n", p->device->tag(), data));
+		//p->serout_w(offset, data);
+		//p->SKSTAT |= SK_SEROUT;
+ /*
+ * These are arbitrary values, tested with some custom boot
+ * loaders from Ballblazer and Escape from Fractalus
+ * The real times are unknown
+ */
+ //device->machine().scheduler().timer_set(attotime::from_usec(200), FUNC(pokey_serout_ready_cb), 0, p);
+ /* 10 bits (assumption 1 start, 8 data and 1 stop bit) take how long? */
+ //device->machine().scheduler().timer_set(attotime::from_usec(2000), FUNC(pokey_serout_complete), 0, p);
+ break;
+
+ case IRQEN_C:
+		//LOG(("POKEY '%s' IRQEN $%02x\n", p->device->tag(), data));
+
+ /* acknowledge one or more IRQST bits ? */
+		if( p->IRQST & ~data )
+ {
+ /* reset IRQST bits that are masked now */
+			p->IRQST &= data;
+ }
+ else
+ {
+			/* enable/disable timers now to avoid unneeded
+ breaking of the CPU cores for masked timers */
+			/*if( p->timerTIMER1 && ((p->IRQEN^data) & IRQ_TIMR1) )
+				p->timerTIMER1->enable(data & IRQ_TIMR1);
+			if( p->timerTIMER2 && ((p->IRQEN^data) & IRQ_TIMR2) )
+				p->timerTIMER2->enable(data & IRQ_TIMR2);
+			if( p->timerTIMER4 && ((p->IRQEN^data) & IRQ_TIMR4) )
+				p->timerTIMER4->enable(data & IRQ_TIMR4);*/
+ }
+		/* store irq enable */
+		p->IRQEN = data;
+ break;
+
+ case SKCTL_C:
+		if( data == p->SKCTL )
+ return;
+		//LOG(("POKEY '%s' SKCTL $%02x\n", p->device->tag(), data));
+		p->SKCTL = data;
+ if( !(data & SK_RESET) )
+ {
+ pokey_w(p, IRQEN_C, 0);
+ pokey_w(p, SKREST_C, 0);
+ }
+ break;
+ }
+
+	/************************************************************
+ * As defined in the manual, the exact counter values are
+ * different depending on the frequency and resolution:
+ * 64 kHz or 15 kHz - AUDF + 1
+ * 1.79 MHz, 8-bit - AUDF + 4
+ * 1.79 MHz, 16-bit - AUDFCHAN1+256*AUDFCHAN2 + 7
+ ************************************************************/
+
+ /* only reset the channels that have changed */
+
+ if( ch_mask & (1 << CHAN1) )
+ {
+ /* process channel 1 frequency */
+		if( p->AUDCTL & CH1_HICLK )
+			new_val = p->AUDFCHAN1 + DIVADD_HICLK;
+ else
+			new_val = (p->AUDFCHAN1 + DIVADD_LOCLK) * p->clockmult;
+
+		//LOG_SOUND(("POKEY '%s' chan1 %d\n", p->device->tag(), new_val));
+
+		p->volumeCHAN1 = (p->AUDCCHAN1 & VOLUME_MASK) * POKEY_DEFAULT_GAIN;
+ p->divisorCHAN1 = new_val;
+		if( new_val < p->counterCHAN1 )
+			p->counterCHAN1 = new_val;
+		//if( p->interrupt_cb && p->timerTIMER1 )
+		//	p->timerTIMER1->adjust(p->clock_period * new_val, p->timer_paramTIMER1, p->timer_periodTIMER1);
+		p->audibleCHAN1 = !(
+			(p->AUDCCHAN1 & VOLUME_ONLY) ||
+			(p->AUDCCHAN1 & VOLUME_MASK) == 0 ||
+			((p->AUDCCHAN1 & PURE) && new_val < (p->samplerate_24_8 >> 8)));
+		if( !p->audibleCHAN1 )
+		{
+			p->outputCHAN1 = 1;
+			p->counterCHAN1 = 0x7fffffff;
+			/* 50% duty cycle should result in half volume */
+ p->volumeCHAN1 >>= 1;
+ }
+ }
+
+ if( ch_mask & (1 << CHAN2) )
+ {
+ /* process channel 2 frequency */
+		if( p->AUDCTL & CH12_JOINED )
+ {
+			if( p->AUDCTL & CH1_HICLK )
+				new_val = p->AUDFCHAN2 * 256 + p->AUDFCHAN1 + DIVADD_HICLK_JOINED;
+ else
+				new_val = (p->AUDFCHAN2 * 256 + p->AUDFCHAN1 + DIVADD_LOCLK) * p->clockmult;
+			//LOG_SOUND(("POKEY '%s' chan1+2 %d\n", p->device->tag(), new_val));
+ }
+ else
+		{
+			new_val = (p->AUDFCHAN2 + DIVADD_LOCLK) * p->clockmult;
+			//LOG_SOUND(("POKEY '%s' chan2 %d\n", p->device->tag(), new_val));
+		}
+
+		p->volumeCHAN2 = (p->AUDCCHAN2 & VOLUME_MASK) * POKEY_DEFAULT_GAIN;
+		p->divisorCHAN2 = new_val;
+		if( new_val < p->counterCHAN2 )
+			p->counterCHAN2 = new_val;
+		//if( p->interrupt_cb && p->timerTIMER2 )
+		//	p->timerTIMER2->adjust(p->clock_period * new_val, p->timer_paramTIMER2, p->timer_periodTIMER2);
+		p->audibleCHAN2 = !(
+			(p->AUDCCHAN2 & VOLUME_ONLY) ||
+			(p->AUDCCHAN2 & VOLUME_MASK) == 0 ||
+			((p->AUDCCHAN2 & PURE) && new_val < (p->samplerate_24_8 >> 8)));
+		if( !p->audibleCHAN2 )
+		{
+			p->outputCHAN2 = 1;
+			p->counterCHAN2 = 0x7fffffff;
+			/* 50% duty cycle should result in half volume */
+			p->volumeCHAN2 >>= 1;
+ }
+ }
+
+ if( ch_mask & (1 << CHAN3) )
+ {
+ /* process channel 3 frequency */
+		if( p->AUDCTL & CH3_HICLK )
+			new_val = p->AUDFCHAN3 + DIVADD_HICLK;
+ else
+			new_val = (p->AUDFCHAN3 + DIVADD_LOCLK) * p->clockmult;
+
+		//LOG_SOUND(("POKEY '%s' chan3 %d\n", p->device->tag(), new_val));
+
+		p->volumeCHAN3 = (p->AUDCCHAN3 & VOLUME_MASK) * POKEY_DEFAULT_GAIN;
+		p->divisorCHAN3 = new_val;
+		if( new_val < p->counterCHAN3 )
+			p->counterCHAN3 = new_val;
+		/* channel 3 does not have a timer associated */
+		p->audibleCHAN3 = !(
+			(p->AUDCCHAN3 & VOLUME_ONLY) ||
+			(p->AUDCCHAN3 & VOLUME_MASK) == 0 ||
+			((p->AUDCCHAN3 & PURE) && new_val < (p->samplerate_24_8 >> 8))) ||
+			(p->AUDCTL & CH1_FILTER);
+		if( !p->audibleCHAN3 )
+		{
+			p->outputCHAN3 = 1;
+			p->counterCHAN3 = 0x7fffffff;
+			/* 50% duty cycle should result in half volume */
+			p->volumeCHAN3 >>= 1;
+ }
+ }
+
+ if( ch_mask & (1 << CHAN4) )
+ {
+ /* process channel 4 frequency */
+		if( p->AUDCTL & CH34_JOINED )
+ {
+			if( p->AUDCTL & CH3_HICLK )
+				new_val = p->AUDFCHAN4 * 256 + p->AUDFCHAN3 + DIVADD_HICLK_JOINED;
+ else
+				new_val = (p->AUDFCHAN4 * 256 + p->AUDFCHAN3 + DIVADD_LOCLK) * p->clockmult;
+			//LOG_SOUND(("POKEY '%s' chan3+4 %d\n", p->device->tag(), new_val));
+ }
+ else
+		{
+			new_val = (p->AUDFCHAN4 + DIVADD_LOCLK) * p->clockmult;
+			//LOG_SOUND(("POKEY '%s' chan4 %d\n", p->device->tag(), new_val));
+		}
+
+		p->volumeCHAN4 = (p->AUDCCHAN4 & VOLUME_MASK) * POKEY_DEFAULT_GAIN;
+		p->divisorCHAN4 = new_val;
+		if( new_val < p->counterCHAN4 )
+			p->counterCHAN4 = new_val;
+		//if( p->interrupt_cb && p->timerTIMER4 )
+		//	p->timerTIMER4->adjust(p->clock_period * new_val, p->timer_paramTIMER4, p->timer_periodTIMER4);
+		p->audibleCHAN4 = !(
+			(p->AUDCCHAN4 & VOLUME_ONLY) ||
+			(p->AUDCCHAN4 & VOLUME_MASK) == 0 ||
+			((p->AUDCCHAN4 & PURE) && new_val < (p->samplerate_24_8 >> 8))) ||
+			(p->AUDCTL & CH2_FILTER);
+		if( !p->audibleCHAN4 )
+		{
+			p->outputCHAN4 = 1;
+			p->counterCHAN4 = 0x7fffffff;
+			/* 50% duty cycle should result in half volume */
+			p->volumeCHAN4 >>= 1;
+ }
+ }
+}
+
+/*WRITE8_HANDLER( quad_pokey_w )
+{
+	static const char *const devname4 = { "pokey1", "pokey2", "pokey3", "pokey4" };
+ int pokey_num = (offset >> 3) & ~0x04;
+ int control = (offset & 0x20) >> 2;
+ int pokey_reg = (offset % 8) | control;
+
+ pokey_w(space->machine().device(devnamepokey_num), pokey_reg, data);
+}
+
+void pokey_serin_ready(device_t *device, int after)
+{
+	pokey_state *p = get_safe_token(device);
+	device->machine().scheduler().timer_set(p->clock_period * after, FUNC(pokey_serin_ready_cb), 0, p);
+}
+
+void pokey_break_w(device_t *device, int shift)
+{
+	//pokey_state *p = get_safe_token(device);
+	if( shift ) // shift code ? //
+		p->SKSTAT |= SK_SHIFT;
+	else
+		p->SKSTAT &= ~SK_SHIFT;
+	// check if the break IRQ is enabled //
+	if( p->IRQEN & IRQ_BREAK )
+	{
+		// set break IRQ status and call back the interrupt handler //
+		p->IRQST |= IRQ_BREAK;
+		if( p->interrupt_cb )
+			(*p->interrupt_cb)(device, IRQ_BREAK);
+	}
+}
+
+void pokey_kbcode_w(device_t *device, int kbcode, int make)
+{
+	pokey_state *p = get_safe_token(device);
+ // make code ? //
+	if( make )
+	{
+		p->KBCODE = kbcode;
+		p->SKSTAT |= SK_KEYBD;
+		if( kbcode & 0x40 ) 		// shift code ? //
+			p->SKSTAT |= SK_SHIFT;
+		else
+			p->SKSTAT &= ~SK_SHIFT;
+
+		if( p->IRQEN & IRQ_KEYBD )
+		{
+			// last interrupt not acknowledged ? //
+			if( p->IRQST & IRQ_KEYBD )
+				p->SKSTAT |= SK_KBERR;
+			p->IRQST |= IRQ_KEYBD;
+			if( p->interrupt_cb )
+				(*p->interrupt_cb)(device, IRQ_KEYBD);
+		}
+	}
+	else
+	{
+		p->KBCODE = kbcode;
+		p->SKSTAT &= ~SK_KEYBD;
+ }
+}*/
+
+
+void pokey_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	pokey_state *chip = (pokey_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 4; CurChn ++)
+		chip->MutedCurChn = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( pokey )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers --- //
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(pokey_state);		break;
+
+		// --- the following bits of info are returned as pointers to data or functions --- //
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( pokey );			break;
+		case DEVINFO_FCT_STOP:							// Nothing //									break;
+		case DEVINFO_FCT_RESET:							// Nothing //									break;
+
+		// --- the following bits of info are returned as NULL-terminated strings --- //
+		case DEVINFO_STR_NAME:							strcpy(info->s, "POKEY");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Atari custom");				break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "4.51");						break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(POKEY, pokey);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pokey.h Added

@@ -0,0 +1,99 @@
+/*****************************************************************************
+ *
+ *  POKEY chip emulator 4.3
+ *  Copyright Nicola Salmoria and the MAME Team
+ *
+ *  Based on original info found in Ron Fries' Pokey emulator,
+ *  with additions by Brad Oliver, Eric Smith and Juergen Buchmueller.
+ *  paddle (a/d conversion) details from the Atari 400/800 Hardware Manual.
+ *  Polynome algorithms according to info supplied by Perry McFarlane.
+ *
+ *  This code is subject to the MAME license, which besides other
+ *  things means it is distributed as is, no warranties whatsoever.
+ *  For more details read mame.txt that comes with MAME.
+ *
+ *****************************************************************************/
+
+#pragma once
+
+//#include "devlegcy.h"
+
+/* CONSTANT DEFINITIONS */
+
+/* POKEY WRITE LOGICALS */
+#define AUDF1_C     0x00
+#define AUDC1_C     0x01
+#define AUDF2_C     0x02
+#define AUDC2_C     0x03
+#define AUDF3_C     0x04
+#define AUDC3_C     0x05
+#define AUDF4_C     0x06
+#define AUDC4_C     0x07
+#define AUDCTL_C    0x08
+#define STIMER_C    0x09
+#define SKREST_C    0x0A
+#define POTGO_C     0x0B
+#define SEROUT_C    0x0D
+#define IRQEN_C     0x0E
+#define SKCTL_C     0x0F
+
+/* POKEY READ LOGICALS */
+#define POT0_C      0x00
+#define POT1_C      0x01
+#define POT2_C      0x02
+#define POT3_C      0x03
+#define POT4_C      0x04
+#define POT5_C      0x05
+#define POT6_C      0x06
+#define POT7_C      0x07
+#define ALLPOT_C    0x08
+#define KBCODE_C    0x09
+#define RANDOM_C    0x0A
+#define SERIN_C     0x0D
+#define IRQST_C     0x0E
+#define SKSTAT_C    0x0F
+
+/* exact 1.79 MHz clock freq (of the Atari 800 that is) */
+#define FREQ_17_EXACT   1789790
+
+
+/*****************************************************************************
+ * pot0_r to pot7_r:
+ *  Handlers for reading the pot values. Some Atari games use
+ *  ALLPOT to return dipswitch settings and other things.
+ * serin_r, serout_w, interrupt_cb:
+ *  New function pointers for serial input/output and a interrupt callback.
+ *****************************************************************************/
+
+/*typedef struct _pokey_interface pokey_interface;
+struct _pokey_interface
+{
+	devcb_read8 pot_r8;
+	devcb_read8 allpot_r;
+	devcb_read8 serin_r;
+	devcb_write8 serout_w;
+	void (*interrupt_cb)(device_t *device, int mask);
+};*/
+
+
+void pokey_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_pokey(void **chip, int clock);
+void device_stop_pokey(void *chip);
+void device_reset_pokey(void *chip);
+
+//READ8_DEVICE_HANDLER( pokey_r );
+//WRITE8_DEVICE_HANDLER( pokey_w );
+UINT8 pokey_r(void *chip, offs_t offset);
+void pokey_w(void *chip, offs_t offset, UINT8 data);
+
+/* fix me: eventually this should be a single device with pokey subdevices */
+//READ8_HANDLER( quad_pokey_r );
+//WRITE8_HANDLER( quad_pokey_w );
+
+/*void pokey_serin_ready (device_t *device, int after);
+void pokey_break_w (device_t *device, int shift);
+void pokey_kbcode_w (device_t *device, int kbcode, int make);*/
+
+void pokey_set_mute_mask(void *chip, UINT32 MuteMask);
+
+//DECLARE_LEGACY_SOUND_DEVICE(POKEY, pokey);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.c Added

@@ -0,0 +1,458 @@
+/***************************************************************************
+ * Gens: PWM audio emulator. *
+ * *
+ * Copyright (c) 1999-2002 by Stéphane Dallongeville *
+ * Copyright (c) 2003-2004 by Stéphane Akhoun *
+ * Copyright (c) 2008-2009 by David Korth *
+ * *
+ * 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 "mamedef.h"
+#include "pwm.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+//#include "gens_core/mem/mem_sh2.h"
+//#include "gens_core/cpu/sh2/sh2.h"
+
+#define CHILLY_WILLY_SCALE	1
+
+#if PWM_BUF_SIZE == 8
+unsigned char PWM_FULL_TABPWM_BUF_SIZE * PWM_BUF_SIZE =
+{
+	0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+	0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40,
+};
+#elif PWM_BUF_SIZE == 4
+unsigned char PWM_FULL_TABPWM_BUF_SIZE * PWM_BUF_SIZE =
+{
+	0x40, 0x00, 0x00, 0x80,
+	0x80, 0x40, 0x00, 0x00,
+	0x00, 0x80, 0x40, 0x00,
+	0x00, 0x00, 0x80, 0x40,
+};
+#else
+#error PWM_BUF_SIZE must equal 4 or 8.
+#endif /* PWM_BUF_SIZE */
+
+typedef struct _pwm_chip
+{
+	unsigned short PWM_FIFO_R8;
+	unsigned short PWM_FIFO_L8;
+	unsigned int PWM_RP_R;
+	unsigned int PWM_WP_R;
+	unsigned int PWM_RP_L;
+	unsigned int PWM_WP_L;
+	unsigned int PWM_Cycles;
+	unsigned int PWM_Cycle;
+	unsigned int PWM_Cycle_Cnt;
+	unsigned int PWM_Int;
+	unsigned int PWM_Int_Cnt;
+	unsigned int PWM_Mode;
+	//unsigned int PWM_Enable;
+	unsigned int PWM_Out_R;
+	unsigned int PWM_Out_L;
+
+	unsigned int PWM_Cycle_Tmp;
+	unsigned int PWM_Cycles_Tmp;
+	unsigned int PWM_Int_Tmp;
+	unsigned int PWM_FIFO_L_Tmp;
+	unsigned int PWM_FIFO_R_Tmp;
+
+#if CHILLY_WILLY_SCALE
+// TODO: Fix Chilly Willy's new scaling algorithm.
+	/* PWM scaling variables. */
+	int PWM_Offset;
+	int PWM_Scale;
+	//int PWM_Loudness;
+#endif
+	
+	int clock;
+ 
+ unsigned char Mute;
+} pwm_chip;
+#if CHILLY_WILLY_SCALE
+// TODO: Fix Chilly Willy's new scaling algorithm.
+#define PWM_Loudness	0
+#endif
+
+void PWM_Init(pwm_chip* chip);
+void PWM_Recalc_Scale(pwm_chip* chip);
+
+void PWM_Set_Cycle(pwm_chip* chip, unsigned int cycle);
+void PWM_Set_Int(pwm_chip* chip, unsigned int int_time);
+
+void PWM_Update(pwm_chip* chip, int **buf, int length);
+
+
+/**
+ * PWM_Init(): Initialize the PWM audio emulator.
+ */
+void PWM_Init(pwm_chip* chip)
+{
+	chip->PWM_Mode = 0;
+	chip->PWM_Out_R = 0;
+	chip->PWM_Out_L = 0;
+	
+	memset(chip->PWM_FIFO_R, 0x00, sizeof(chip->PWM_FIFO_R));
+	memset(chip->PWM_FIFO_L, 0x00, sizeof(chip->PWM_FIFO_L));
+	
+	chip->PWM_RP_R = 0;
+	chip->PWM_WP_R = 0;
+	chip->PWM_RP_L = 0;
+	chip->PWM_WP_L = 0;
+	chip->PWM_Cycle_Tmp = 0;
+	chip->PWM_Int_Tmp = 0;
+	chip->PWM_FIFO_L_Tmp = 0;
+	chip->PWM_FIFO_R_Tmp = 0;
+	
+	//PWM_Loudness = 0;
+	PWM_Set_Cycle(chip, 0);
+	PWM_Set_Int(chip, 0);
+}
+
+
+#if CHILLY_WILLY_SCALE
+// TODO: Fix Chilly Willy's new scaling algorithm.
+void PWM_Recalc_Scale(pwm_chip* chip)
+{
+	chip->PWM_Offset = (chip->PWM_Cycle / 2) + 1;
+	chip->PWM_Scale = 0x7FFF00 / chip->PWM_Offset;
+}
+#endif
+
+
+void PWM_Set_Cycle(pwm_chip* chip, unsigned int cycle)
+{
+	cycle--;
+	chip->PWM_Cycle = (cycle & 0xFFF);
+	chip->PWM_Cycle_Cnt = chip->PWM_Cycles;
+	
+#if CHILLY_WILLY_SCALE
+	// TODO: Fix Chilly Willy's new scaling algorithm.
+	PWM_Recalc_Scale(chip);
+#endif
+}
+
+
+void PWM_Set_Int(pwm_chip* chip, unsigned int int_time)
+{
+	int_time &= 0x0F;
+	if (int_time)
+		chip->PWM_Int = chip->PWM_Int_Cnt = int_time;
+	else
+		chip->PWM_Int = chip->PWM_Int_Cnt = 16;
+}
+
+
+void PWM_Clear_Timer(pwm_chip* chip)
+{
+	chip->PWM_Cycle_Cnt = 0;
+}
+
+
+/**
+ * PWM_SHIFT(): Shift PWM data.
+ * @param src: Channel (L or R) with the source data.
+ * @param dest Channel (L or R) for the destination.
+ */
+#define PWM_SHIFT(src, dest)										\
+{													\
+	/* Make sure the source FIFO isn't empty. */							\
+	if (PWM_RP_##src != PWM_WP_##src)								\
+	{												\
+		/* Get destination channel output from the source channel FIFO. */			\
+		PWM_Out_##dest = PWM_FIFO_##srcPWM_RP_##src;						\
+													\
+		/* Increment the source channel read pointer, resetting to 0 if it overflows. */	\
+		PWM_RP_##src = (PWM_RP_##src + 1) & (PWM_BUF_SIZE - 1);					\
+	}												\
+}
+
+
+/*static void PWM_Shift_Data(void)
+{
+	switch (PWM_Mode & 0x0F)
+	{
+		case 0x01:
+		case 0x0D:
+			// Rx_LL: Right -> Ignore, Left -> Left
+			PWM_SHIFT(L, L);
+			break;
+		
+		case 0x02:
+		case 0x0E:
+			// Rx_LR: Right -> Ignore, Left -> Right
+			PWM_SHIFT(L, R);
+			break;
+		
+		case 0x04:
+		case 0x07:
+			// RL_Lx: Right -> Left, Left -> Ignore
+			PWM_SHIFT(R, L);
+			break;
+		
+		case 0x05:
+		case 0x09:
+			// RR_LL: Right -> Right, Left -> Left
+			PWM_SHIFT(L, L);
+			PWM_SHIFT(R, R);
+			break;
+		
+		case 0x06:
+		case 0x0A:
+			// RL_LR: Right -> Left, Left -> Right
+			PWM_SHIFT(L, R);
+			PWM_SHIFT(R, L);
+			break;
+		
+		case 0x08:
+		case 0x0B:
+			// RR_Lx: Right -> Right, Left -> Ignore
+			PWM_SHIFT(R, R);
+			break;
+		
+		case 0x00:
+		case 0x03:
+		case 0x0C:
+		case 0x0F:
+		default:
+			// Rx_Lx: Right -> Ignore, Left -> Ignore
+			break;
+	}
+}
+
+
+void PWM_Update_Timer(unsigned int cycle)
+{
+	// Don't do anything if PWM is disabled in the Sound menu.
+	
+	// Don't do anything if PWM isn't active.
+	if ((PWM_Mode & 0x0F) == 0x00)
+		return;
+	
+	if (PWM_Cycle == 0x00 || (PWM_Cycle_Cnt > cycle))
+		return;
+	
+	PWM_Shift_Data();
+	
+	PWM_Cycle_Cnt += PWM_Cycle;
+	
+	PWM_Int_Cnt--;
+	if (PWM_Int_Cnt == 0)
+	{
+		PWM_Int_Cnt = PWM_Int;
+		
+		if (PWM_Mode & 0x0080)
+		{
+			// RPT => generate DREQ1 as well as INT
+			SH2_DMA1_Request(&M_SH2, 1);
+			SH2_DMA1_Request(&S_SH2, 1);
+		}
+		
+		if (_32X_MINT & 1)
+			SH2_Interrupt(&M_SH2, 6);
+		if (_32X_SINT & 1)
+			SH2_Interrupt(&S_SH2, 6);
+	}
+}*/
+
+
+INLINE int PWM_Update_Scale(pwm_chip* chip, int PWM_In)
+{
+	if (PWM_In == 0)
+		return 0;
+	
+	// TODO: Chilly Willy's new scaling algorithm breaks drx's Sonic 1 32X (with PWM drums).
+#ifdef CHILLY_WILLY_SCALE
+	//return (((PWM_In & 0xFFF) - chip->PWM_Offset) * chip->PWM_Scale) >> (8 - PWM_Loudness);
+	// Knuckles' Chaotix: Tachy Touch uses the values 0xF?? for negative values
+	// This small modification fixes the terrible pops.
+	PWM_In &= 0xFFF;
+	if (PWM_In & 0x800)
+		PWM_In |= ~0xFFF;
+	return ((PWM_In - chip->PWM_Offset) * chip->PWM_Scale) >> (8 - PWM_Loudness);
+#else
+	const int PWM_adjust = ((chip->PWM_Cycle >> 1) + 1);
+	int PWM_Ret = ((chip->PWM_In & 0xFFF) - PWM_adjust);
+	
+	// Increase PWM volume so it's audible.
+	PWM_Ret <<= (5+2);
+	
+	// Make sure the PWM isn't oversaturated.
+	if (PWM_Ret > 32767)
+		PWM_Ret = 32767;
+	else if (PWM_Ret < -32768)
+		PWM_Ret = -32768;
+	
+	return PWM_Ret;
+#endif
+}
+
+
+void PWM_Update(pwm_chip* chip, int **buf, int length)
+{
+	int tmpOutL;
+	int tmpOutR;
+	int i;
+	
+	//if (!PWM_Enable)
+	//	return;
+	
+	if (chip->PWM_Out_L == 0 && chip->PWM_Out_R == 0)
+	{
+		memset(buf0, 0x00, length * sizeof(int));
+		memset(buf1, 0x00, length * sizeof(int));
+		return;
+	}
+	
+	// New PWM scaling algorithm provided by Chilly Willy on the Sonic Retro forums.
+	tmpOutL = PWM_Update_Scale(chip, (int)chip->PWM_Out_L);
+	tmpOutR = PWM_Update_Scale(chip, (int)chip->PWM_Out_R);
+	
+ tmpOutL = chip->Mute ? 0 : tmpOutL;
+ tmpOutR = chip->Mute ? 0 : tmpOutR;
+ 
+	for (i = 0; i < length; i ++)
+	{
+		buf0i = tmpOutL;
+		buf1i = tmpOutR;
+	}
+}
+
+
+void pwm_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	pwm_chip *chip = (pwm_chip *)_info;
+	
+	PWM_Update(chip, outputs, samples);
+}
+
+void pwm_mute(void *_info, UINT8 Mute)
+{
+ pwm_chip *chip = (pwm_chip *)_info;
+ chip->Mute = Mute;
+}
+
+int device_start_pwm(void **_info, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	/* allocate memory for the chip */
+	//pwm_state *chip = get_safe_token(device);
+	pwm_chip *chip;
+	int rate;
+	
+	chip = (pwm_chip *) calloc(1, sizeof(pwm_chip));
+	*_info = (void *) chip;	
+
+	rate = 22020;	// that's the rate the PWM is mostly used
+	if (((CHIP_SAMPLING_MODE & 0x01) && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	chip->clock = clock;
+	
+	PWM_Init(chip);
+	/* allocate the stream */
+	//chip->stream = stream_create(device, 0, 2, device->clock / 384, chip, rf5c68_update);
+
+	return rate;
+}
+
+void device_stop_pwm(void *_info)
+{
+	//pwm_chip *chip = &PWM_ChipChipID;
+	//free(chip->ram);
+
+	free(_info);
+	
+	return;
+}
+
+void device_reset_pwm(void *_info)
+{
+	pwm_chip *chip = (pwm_chip *)_info;
+	PWM_Init(chip);
+}
+
+void pwm_chn_w(void *_info, UINT8 Channel, UINT16 data)
+{
+	pwm_chip *chip = (pwm_chip *)_info;
+	
+	if (chip->clock == 1)
+	{	// old-style commands
+		switch(Channel)
+		{
+		case 0x00:
+			chip->PWM_Out_L = data;
+			break;
+		case 0x01:
+			chip->PWM_Out_R = data;
+			break;
+		case 0x02:
+			PWM_Set_Cycle(chip, data);
+			break;
+		case 0x03:
+			chip->PWM_Out_L = data;
+			chip->PWM_Out_R = data;
+			break;
+		}
+	}
+	else
+	{
+		switch(Channel)
+		{
+		case 0x00/2:	// control register
+			PWM_Set_Int(chip, data >> 8);
+			break;
+		case 0x02/2:	// cycle register
+			PWM_Set_Cycle(chip, data);
+			break;
+		case 0x04/2:	// l ch
+			chip->PWM_Out_L = data;
+			break;
+		case 0x06/2:	// r ch
+			chip->PWM_Out_R = data;
+			if (! chip->PWM_Mode)
+			{
+				if (chip->PWM_Out_L == chip->PWM_Out_R)
+				{
+					// fixes these terrible pops when
+					// starting/stopping/pausing the song
+					chip->PWM_Offset = data;
+					chip->PWM_Mode = 0x01;
+				}
+			}
+			break;
+		case 0x08/2:	// mono ch
+			chip->PWM_Out_L = data;
+			chip->PWM_Out_R = data;
+			if (! chip->PWM_Mode)
+			{
+				chip->PWM_Offset = data;
+				chip->PWM_Mode = 0x01;
+			}
+			break;
+		}
+	}
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/pwm.h Added

@@ -0,0 +1,63 @@
+/***************************************************************************
+ * Gens: PWM audio emulator.                                               *
+ *                                                                         *
+ * Copyright (c) 1999-2002 by Stéphane Dallongeville                       *
+ * Copyright (c) 2003-2004 by Stéphane Akhoun                              *
+ * Copyright (c) 2008 by David Korth                                       *
+ *                                                                         *
+ * This program is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU General Public License as published by the   *
+ * Free Software Foundation; either version 2 of the License, or (at your  *
+ * option) any later version.                                              *
+ *                                                                         *
+ * This program is distributed in the hope that it will be useful, but     *
+ * WITHOUT ANY WARRANTY; without even the implied warranty of              *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           *
+ * GNU General Public License for more details.                            *
+ *                                                                         *
+ * You should have received a copy of the GNU General Public License along *
+ * with this program; if not, write to the Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.           *
+ ***************************************************************************/
+
+#define PWM_BUF_SIZE 4
+/*extern unsigned char PWM_FULL_TABPWM_BUF_SIZE * PWM_BUF_SIZE;
+
+extern unsigned short PWM_FIFO_R8;
+extern unsigned short PWM_FIFO_L8;
+extern unsigned int PWM_RP_R;
+extern unsigned int PWM_WP_R;
+extern unsigned int PWM_RP_L;
+extern unsigned int PWM_WP_L;
+extern unsigned int PWM_Cycles;
+extern unsigned int PWM_Cycle;
+extern unsigned int PWM_Cycle_Cnt;
+extern unsigned int PWM_Int;
+extern unsigned int PWM_Int_Cnt;
+extern unsigned int PWM_Mode;
+extern unsigned int PWM_Enable;
+extern unsigned int PWM_Out_R;
+extern unsigned int PWM_Out_L;*/
+
+//void PWM_Init(void);
+//void PWM_Recalc_Scale(void);
+
+/* Functions called by x86 asm. */
+//void PWM_Set_Cycle(unsigned int cycle);
+//void PWM_Set_Int(unsigned int int_time);
+
+/* Functions called by C/C++ code only. */
+//void PWM_Clear_Timer(void);
+//void PWM_Update_Timer(unsigned int cycle);
+//void PWM_Update(int **buf, int length);
+
+
+void pwm_update(void *chip, stream_sample_t **outputs, int samples);
+
+int device_start_pwm(void **chip, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_pwm(void *chip);
+void device_reset_pwm(void *chip);
+
+void pwm_mute(void *chip, UINT8 Mute);
+
+void pwm_chn_w(void *chip, UINT8 Channel, UINT16 data);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.c Added

@@ -0,0 +1,489 @@
+/***************************************************************************
+
+ 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 "emu.h"
+#include "mamedef.h"
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include "qsound.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+/*
+Debug defines
+*/
+#define LOG_WAVE	0
+#define VERBOSE 0
+#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+
+/* 8 bit source ROM samples */
+typedef INT8 QSOUND_SRC_SAMPLE;
+
+
+#define QSOUND_CLOCKDIV 166			 /* Clock divider */
+#define QSOUND_CHANNELS 16
+typedef stream_sample_t QSOUND_SAMPLE;
+
+struct QSOUND_CHANNEL
+{
+	UINT32 bank; // bank
+	UINT32 address; // start/cur address
+	UINT16 loop; // loop address
+	UINT16 end; // end address
+	UINT32 freq; // frequency
+	UINT16 vol; // master volume
+
+	// work variables
+	UINT8 enabled; // key on / key off
+	int lvol; // left volume
+	int rvol; // right volume
+	UINT32 step_ptr; // current offset counter
+	
+	UINT8 Muted;
+};
+
+typedef struct _qsound_state qsound_state;
+struct _qsound_state
+{
+	/* Private variables */
+	//sound_stream * stream;				/* Audio stream */
+	struct QSOUND_CHANNEL channelQSOUND_CHANNELS;
+	
+	UINT16 data;			/* register latch data */
+	QSOUND_SRC_SAMPLE *sample_rom;	/* Q sound sample ROM */
+	UINT32 sample_rom_length;
+
+	int pan_table33;		/* Pan volume table */
+
+	//FILE *fpRawDataL;
+	//FILE *fpRawDataR;
+};
+
+/*INLINE qsound_state *get_safe_token(device_t *device)
+{
+	assert(device != NULL);
+	assert(device->type() == QSOUND);
+	return (qsound_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+/* Function prototypes */
+//static STREAM_UPDATE( qsound_update );
+static void qsound_set_command(qsound_state *chip, UINT8 address, UINT16 data);
+
+//static DEVICE_START( qsound )
+int device_start_qsound(void **_info, int clock)
+{
+	//qsound_state *chip = get_safe_token(device);
+	qsound_state *chip;
+	int i;
+
+	chip = (qsound_state *) calloc(1, sizeof(qsound_state));
+	*_info = (void *) chip;	
+	
+	//chip->sample_rom = (QSOUND_SRC_SAMPLE *)*device->region();
+	//chip->sample_rom_length = device->region()->bytes();
+	chip->sample_rom = NULL;
+	chip->sample_rom_length = 0x00;
+
+	/* Create pan table */
+	for (i=0; i<33; i++)
+		chip->pan_tablei=(int)((256/sqrt(32.0)) * sqrt((double)i));
+	
+	// init sound regs
+	memset(chip->channel, 0, sizeof(chip->channel));
+
+//	LOG(("Pan table\n"));
+//	for (i=0; i<33; i++)
+//		LOG(("%02x ", chip->pan_tablei));
+
+	/* Allocate stream */
+	/*chip->stream = device->machine().sound().stream_alloc(
+		*device, 0, 2,
+		device->clock() / QSOUND_CLOCKDIV,
+		chip,
+		qsound_update );*/
+
+	/*if (LOG_WAVE)
+	{
+		chip->fpRawDataR=fopen("qsoundr.raw", "w+b");
+		chip->fpRawDataL=fopen("qsoundl.raw", "w+b");
+	}*/
+
+	/* state save */
+	/*for (i=0; i<QSOUND_CHANNELS; i++)
+	{
+		device->save_item(NAME(chip->channeli.bank), i);
+		device->save_item(NAME(chip->channeli.address), i);
+		device->save_item(NAME(chip->channeli.pitch), i);
+		device->save_item(NAME(chip->channeli.loop), i);
+		device->save_item(NAME(chip->channeli.end), i);
+		device->save_item(NAME(chip->channeli.vol), i);
+		device->save_item(NAME(chip->channeli.pan), i);
+		device->save_item(NAME(chip->channeli.key), i);
+		device->save_item(NAME(chip->channeli.lvol), i);
+		device->save_item(NAME(chip->channeli.rvol), i);
+		device->save_item(NAME(chip->channeli.lastdt), i);
+		device->save_item(NAME(chip->channeli.offset), i);
+	}*/
+	
+	for (i = 0; i < QSOUND_CHANNELS; i ++)
+		chip->channeli.Muted = 0x00;
+
+	return clock / QSOUND_CLOCKDIV;
+}
+
+//static DEVICE_STOP( qsound )
+void device_stop_qsound(void *_info)
+{
+	//qsound_state *chip = get_safe_token(device);
+	qsound_state *chip = (qsound_state *)_info;
+	/*if (chip->fpRawDataR)
+	{
+		fclose(chip->fpRawDataR);
+	}
+	chip->fpRawDataR = NULL;
+	if (chip->fpRawDataL)
+	{
+		fclose(chip->fpRawDataL);
+	}
+	chip->fpRawDataL = NULL;*/
+	free(chip->sample_rom);	chip->sample_rom = NULL;
+	free(chip);
+}
+
+void device_reset_qsound(void *_info)
+{
+	qsound_state *chip = (qsound_state *)_info;
+	int adr;
+	
+	// init sound regs
+	memset(chip->channel, 0, sizeof(chip->channel));
+
+	for (adr = 0x7f; adr >= 0; adr--)
+		qsound_set_command(chip, adr, 0);
+	for (adr = 0x80; adr < 0x90; adr++)
+		qsound_set_command(chip, adr, 0x120);
+
+	return;
+}
+
+//WRITE8_DEVICE_HANDLER( qsound_w )
+void qsound_w(void *_info, offs_t offset, UINT8 data)
+{
+	//qsound_state *chip = get_safe_token(device);
+	qsound_state *chip = (qsound_state *)_info;
+	switch (offset)
+	{
+		case 0:
+			chip->data=(chip->data&0xff)|(data<<8);
+			break;
+
+		case 1:
+			chip->data=(chip->data&0xff00)|data;
+			break;
+
+		case 2:
+			qsound_set_command(chip, data, chip->data);
+			break;
+
+		default:
+			//logerror("%s: unexpected qsound write to offset %d == %02X\n", device->machine().describe_context(), offset, data);
+#ifdef _DEBUG
+			logerror("QSound: unexpected qsound write to offset %d == %02X\n", offset, data);
+#endif
+			break;
+	}
+}
+
+//READ8_DEVICE_HANDLER( qsound_r )
+UINT8 qsound_r(void *chip, offs_t offset)
+{
+	/* Port ready bit (0x80 if ready) */
+	return 0x80;
+}
+
+static void qsound_set_command(qsound_state *chip, UINT8 address, UINT16 data)
+{
+	int ch = 0, reg = 0;
+
+	// direct sound reg
+	if (address < 0x80)
+	{
+		ch = address >> 3;
+		reg = address & 0x07;
+	}
+	// >= 0x80 is probably for the dsp?
+	else if (address < 0x90)
+	{
+		ch = address & 0x0F;
+		reg = 8;
+	}
+	else if (address >= 0xba && address < 0xca)
+	{
+		ch = address - 0xba;
+		reg=9;
+	}
+	else
+	{
+		/* Unknown registers */
+		ch = 99;
+		reg = 99;
+	}
+
+	switch (reg)
+	{
+		case 0:
+			// bank, high bits unknown
+			ch = (ch + 1) & 0x0f;	/* strange ... */
+			chip->channelch.bank = (data & 0x7f) << 16;	// Note: The most recent MAME doesn't do "& 0x7F"
+#ifdef _DEBUG
+			if (data && !(data & 0x8000))
+				printf("QSound Ch %u: Bank = %04x\n",ch,data);
+#endif
+			break;
+		case 1:
+			// start/cur address
+			chip->channelch.address = data;
+			break;
+		case 2:
+			// frequency
+			chip->channelch.freq = data;
+			// This was working with the old code, but breaks the songs with the new one.
+			// And I'm pretty sure the hardware won't do this. -Valley Bell
+			/*if (!data)
+			{
+				// key off
+				chip->channelch.enabled = 0;
+			}*/
+			break;
+		case 3:
+#ifdef _DEBUG
+			if (chip->channelch.enabled && data != 0x8000)
+				printf("QSound Ch %u: KeyOn = %04x\n",ch,data);
+#endif
+			// key on (does the value matter? it always writes 0x8000)
+			//chip->channelch.enabled = 1;
+			chip->channelch.enabled = (data & 0x8000) >> 15;
+			chip->channelch.step_ptr = 0;
+			break;
+		case 4:
+			// loop address
+			chip->channelch.loop = data;
+			break;
+		case 5:
+			// end address
+			chip->channelch.end = data;
+			break;
+		case 6:
+			// master volume
+#ifdef _DEBUG
+			if (! chip->channelch.enabled && data)
+				printf("QSound update warning - please report!\n");
+#endif
+			chip->channelch.vol = data;
+			break;
+		case 7:
+			// unused?
+#ifdef MAME_DEBUG
+			popmessage("UNUSED QSOUND REG 7=%04x",data);
+#endif
+			break;
+		case 8:
+			{
+				// panning (left=0x0110, centre=0x0120, right=0x0130)
+				// looks like it doesn't write other values than that
+				int pan = (data & 0x3f) - 0x10;
+				if (pan > 0x20)
+					pan = 0x20;
+				if (pan < 0)
+					pan = 0;
+				
+				chip->channelch.rvol=chip->pan_tablepan;
+				chip->channelch.lvol=chip->pan_table0x20 - pan;
+			}
+			break;
+		case 9:
+			// unknown
+/*
+#ifdef MAME_DEBUG
+ popmessage("QSOUND REG 9=%04x",data);
+#endif
+*/
+			break;
+		default:
+			//logerror("%s: write_data %02x = %04x\n", machine().describe_context(), address, data);
+			break;
+	}
+	//LOG(("QSOUND WRITE %02x CH%02d-R%02d =%04x\n", address, ch, reg, data));
+}
+
+
+//static STREAM_UPDATE( qsound_update )
+void qsound_update(void *param, stream_sample_t **outputs, int samples)
+{
+	qsound_state *chip = (qsound_state *)param;
+	int i,j;
+	UINT32 offset;
+	UINT32 advance;
+	INT8 sample;
+	struct QSOUND_CHANNEL *pC=&chip->channel0;
+
+	memset( outputs0, 0x00, samples * sizeof(*outputs0) );
+	memset( outputs1, 0x00, samples * sizeof(*outputs1) );
+	if (! chip->sample_rom_length)
+		return;
+
+	for (i=0; i<QSOUND_CHANNELS; i++, pC++)
+	{
+		if (pC->enabled && ! pC->Muted)
+		{
+			QSOUND_SAMPLE *pOutL=outputs0;
+			QSOUND_SAMPLE *pOutR=outputs1;
+			
+			for (j=samples-1; j>=0; j--)
+			{
+				advance = (pC->step_ptr >> 12);
+				pC->step_ptr &= 0xfff;
+				pC->step_ptr += pC->freq;
+				
+				if (advance)
+				{
+					pC->address += advance;
+					if (pC->freq && pC->address >= pC->end)
+					{
+						if (pC->loop)
+						{
+							// Reached the end, restart the loop
+							pC->address -= pC->loop;
+							
+							// Make sure we don't overflow (what does the real chip do in this case?)
+							if (pC->address >= pC->end)
+								pC->address = pC->end - pC->loop;
+							
+							pC->address &= 0xffff;
+						}
+						else
+						{
+							// Reached the end of a non-looped sample
+							//pC->enabled = 0;
+							pC->address --;	// ensure that old ripped VGMs still work
+							pC->step_ptr += 0x1000;
+							break;
+						}
+					}
+				}
+				
+				offset = (pC->bank | pC->address) % chip->sample_rom_length;
+				sample = chip->sample_romoffset;
+				*pOutL++ += ((sample * pC->lvol * pC->vol) >> 14);
+				*pOutR++ += ((sample * pC->rvol * pC->vol) >> 14);
+			}
+		}
+	}
+
+	/*if (chip->fpRawDataL)
+		fwrite(outputs0, samples*sizeof(QSOUND_SAMPLE), 1, chip->fpRawDataL);
+	if (chip->fpRawDataR)
+		fwrite(outputs1, samples*sizeof(QSOUND_SAMPLE), 1, chip->fpRawDataR);*/
+}
+
+void qsound_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					 const UINT8* ROMData)
+{
+	qsound_state* info = (qsound_state *)_info;
+	
+	if (info->sample_rom_length != ROMSize)
+	{
+		info->sample_rom = (QSOUND_SRC_SAMPLE*)realloc(info->sample_rom, ROMSize);
+		info->sample_rom_length = ROMSize;
+		memset(info->sample_rom, 0xFF, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(info->sample_rom + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+
+void qsound_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	qsound_state* info = (qsound_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < QSOUND_CHANNELS; CurChn ++)
+		info->channelCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( qsound )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers --- //
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(qsound_state);			break;
+
+		// --- the following bits of info are returned as pointers to data or functions --- //
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( qsound );			break;
+		case DEVINFO_FCT_STOP:							info->stop = DEVICE_STOP_NAME( qsound );			break;
+		case DEVINFO_FCT_RESET:							// Nothing //									break;
+
+		// --- the following bits of info are returned as NULL-terminated strings --- //
+		case DEVINFO_STR_NAME:							strcpy(info->s, "Q-Sound");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Capcom custom");				break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+
+/**************** end of file ****************/
+
+//DEFINE_LEGACY_SOUND_DEVICE(QSOUND, qsound);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/qsound.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.c Added

@@ -0,0 +1,476 @@
+/*********************************************************/
+/* ricoh RF5C68(or clone) PCM controller */
+/*********************************************************/
+
+#include "mamedef.h"
+#include <string.h>
+#include <stdlib.h>
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "rf5c68.h"
+#include <math.h>
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+
+#define NUM_CHANNELS (8)
+#define STEAM_STEP		0x800
+
+
+
+typedef struct _pcm_channel pcm_channel;
+struct _pcm_channel
+{
+	UINT8		enable;
+	UINT8		env;
+	UINT8		pan;
+	UINT8		start;
+	UINT32		addr;
+	UINT16		step;
+	UINT16		loopst;
+	UINT8		Muted;
+};
+
+typedef struct _mem_stream mem_stream;
+struct _mem_stream
+{
+	UINT32 BaseAddr;
+	UINT32 EndAddr;
+	UINT32 CurAddr;
+	UINT16 CurStep;
+	const UINT8* MemPnt;
+};
+
+
+typedef struct _rf5c68_state rf5c68_state;
+struct _rf5c68_state
+{
+	//sound_stream *		stream;
+	pcm_channel			chanNUM_CHANNELS;
+	UINT8				cbank;
+	UINT8				wbank;
+	UINT8				enable;
+	UINT32				datasize;
+	UINT8*				data;
+	//void				(*sample_callback)(running_device* device,int channel);
+	mem_stream			memstrm;
+};
+
+
+static void rf5c68_mem_stream_flush(rf5c68_state *chip);
+
+/*INLINE rf5c68_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_RF5C68);
+	return (rf5c68_state *)device->token;
+}*/
+
+/************************************************/
+/* RF5C68 stream update */
+/************************************************/
+
+static void memstream_sample_check(rf5c68_state *chip, UINT32 addr, UINT16 Speed)
+{
+	mem_stream* ms = &chip->memstrm;
+	UINT32 SmplSpd;
+	
+	SmplSpd = (Speed >= 0x0800) ? (Speed >> 11) : 1;
+	if (addr >= ms->CurAddr)
+	{
+		// Is the stream too fast? (e.g. about to catch up the output)
+		if (addr - ms->CurAddr <= SmplSpd * 5)
+		{
+			// Yes - delay the stream
+			ms->CurAddr -= SmplSpd * 4;
+			if (ms->CurAddr < ms->BaseAddr)
+				ms->CurAddr = ms->BaseAddr;
+		}
+	}
+	else
+	{
+		// Is the stream too slow? (e.g. the output is about to catch up the stream)
+		if (ms->CurAddr - addr <= SmplSpd * 5)
+		{
+			if (ms->CurAddr + SmplSpd * 4 >= ms->EndAddr)
+			{
+				rf5c68_mem_stream_flush(chip);
+			}
+			else
+			{
+				memcpy(chip->data + ms->CurAddr, ms->MemPnt + (ms->CurAddr - ms->BaseAddr), SmplSpd * 4);
+				ms->CurAddr += SmplSpd * 4;
+			}
+		}
+	}
+	
+	return;
+}
+
+//static STREAM_UPDATE( rf5c68_update )
+void rf5c68_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	//rf5c68_state *chip = (rf5c68_state *)param;
+	rf5c68_state *chip = (rf5c68_state *)_info;
+	mem_stream* ms = &chip->memstrm;
+	stream_sample_t *left = outputs0;
+	stream_sample_t *right = outputs1;
+	int i, j;
+
+	/* start with clean buffers */
+	memset(left, 0, samples * sizeof(*left));
+	memset(right, 0, samples * sizeof(*right));
+
+	/* bail if not enabled */
+	if (!chip->enable)
+		return;
+
+	/* loop over channels */
+	for (i = 0; i < NUM_CHANNELS; i++)
+	{
+		pcm_channel *chan = &chip->chani;
+
+		/* if this channel is active, accumulate samples */
+		if (chan->enable && ! chan->Muted)
+		{
+			int lv = (chan->pan & 0x0f) * chan->env;
+			int rv = ((chan->pan >> 4) & 0x0f) * chan->env;
+
+			/* loop over the sample buffer */
+			for (j = 0; j < samples; j++)
+			{
+				int sample;
+
+				/* trigger sample callback */
+				/*if(chip->sample_callback)
+				{
+					if(((chan->addr >> 11) & 0xfff) == 0xfff)
+						chip->sample_callback(chip->device,((chan->addr >> 11)/0x2000));
+				}*/
+
+				memstream_sample_check(chip, (chan->addr >> 11) & 0xFFFF, chan->step);
+				/* fetch the sample and handle looping */
+				sample = chip->data(chan->addr >> 11) & 0xffff;
+				if (sample == 0xff)
+				{
+					chan->addr = chan->loopst << 11;
+					sample = chip->data(chan->addr >> 11) & 0xffff;
+
+					/* if we loop to a loop point, we're effectively dead */
+					if (sample == 0xff)
+						break;
+				}
+				chan->addr += chan->step;
+
+				/* add to the buffer */
+				if (sample & 0x80)
+				{
+					sample &= 0x7f;
+					leftj += (sample * lv) >> 5;
+					rightj += (sample * rv) >> 5;
+				}
+				else
+				{
+					leftj -= (sample * lv) >> 5;
+					rightj -= (sample * rv) >> 5;
+				}
+			}
+		}
+	}
+
+	if (samples && ms->CurAddr < ms->EndAddr)
+	{
+		ms->CurStep += STEAM_STEP * samples;
+		if (ms->CurStep >= 0x0800)	// 1 << 11
+		{
+			i = ms->CurStep >> 11;
+			ms->CurStep &= 0x07FF;
+			
+			if (ms->CurAddr + i > ms->EndAddr)
+				i = ms->EndAddr - ms->CurAddr;
+			
+			memcpy(chip->data + ms->CurAddr, ms->MemPnt + (ms->CurAddr - ms->BaseAddr), i);
+			ms->CurAddr += i;
+		}
+	}
+	
+	// I think, this is completely useless
+	/* now clamp and shift the result (output is only 10 bits) */
+	/*for (j = 0; j < samples; j++)
+	{
+		stream_sample_t temp;
+
+		temp = leftj;
+		if (temp > 32767) temp = 32767;
+		else if (temp < -32768) temp = -32768;
+		leftj = temp & ~0x3f;
+
+		temp = rightj;
+		if (temp > 32767) temp = 32767;
+		else if (temp < -32768) temp = -32768;
+		rightj = temp & ~0x3f;
+	}*/
+}
+
+
+/************************************************/
+/* RF5C68 start */
+/************************************************/
+
+//static DEVICE_START( rf5c68 )
+int device_start_rf5c68(void **_info, int clock)
+{
+	//const rf5c68_interface* intf = (const rf5c68_interface*)device->baseconfig().static_config();
+	
+	/* allocate memory for the chip */
+	//rf5c68_state *chip = get_safe_token(device);
+	rf5c68_state *chip;
+	int chn;
+	
+	chip = (rf5c68_state *) calloc(1, sizeof(rf5c68_state));	
+	*_info = (void *) chip;
+
+	chip->datasize = 0x10000;
+	chip->data = (UINT8*)malloc(chip->datasize);
+	
+	/* allocate the stream */
+	//chip->stream = stream_create(device, 0, 2, device->clock / 384, chip, rf5c68_update);
+
+	/* set up callback */
+	/*if(intf != NULL)
+		chip->sample_callback = intf->sample_end_callback;
+	else
+		chip->sample_callback = NULL;*/
+	for (chn = 0; chn < NUM_CHANNELS; chn ++)
+		chip->chanchn.Muted = 0x00;
+
+	return (clock & 0x7FFFFFFF) / 384;
+}
+
+void device_stop_rf5c68(void *_info)
+{
+	rf5c68_state *chip = (rf5c68_state *)_info;
+	free(chip->data);	chip->data = NULL;
+	free(chip);
+	
+	return;
+}
+
+void device_reset_rf5c68(void *_info)
+{
+	rf5c68_state *chip = (rf5c68_state *)_info;
+	int i;
+	pcm_channel* chan;
+	mem_stream* ms = &chip->memstrm;
+	
+	// Clear the PCM memory.
+	memset(chip->data, 0x00, chip->datasize);
+	
+	chip->enable = 0;
+	chip->cbank = 0;
+	chip->wbank = 0;
+	
+	/* clear channel registers */
+	for (i = 0; i < NUM_CHANNELS; i ++)
+	{
+		chan = &chip->chani;
+		chan->enable = 0;
+		chan->env = 0;
+		chan->pan = 0;
+		chan->start = 0;
+		chan->addr = 0;
+		chan->step = 0;
+		chan->loopst = 0;
+	}
+	
+	ms->BaseAddr = 0x0000;
+	ms->CurAddr = 0x0000;
+	ms->EndAddr = 0x0000;
+	ms->CurStep = 0x0000;
+	ms->MemPnt = NULL;
+}
+
+/************************************************/
+/* RF5C68 write register */
+/************************************************/
+
+//WRITE8_DEVICE_HANDLER( rf5c68_w )
+void rf5c68_w(void *_info, offs_t offset, UINT8 data)
+{
+	//rf5c68_state *chip = get_safe_token(device);
+	rf5c68_state *chip = (rf5c68_state *)_info;
+	pcm_channel *chan = &chip->chanchip->cbank;
+	int i;
+
+	/* force the stream to update first */
+	//stream_update(chip->stream);
+
+	/* switch off the address */
+	switch (offset)
+	{
+		case 0x00:	/* envelope */
+			chan->env = data;
+			break;
+
+		case 0x01:	/* pan */
+			chan->pan = data;
+			break;
+
+		case 0x02:	/* FDL */
+			chan->step = (chan->step & 0xff00) | (data & 0x00ff);
+			break;
+
+		case 0x03:	/* FDH */
+			chan->step = (chan->step & 0x00ff) | ((data << 8) & 0xff00);
+			break;
+
+		case 0x04:	/* LSL */
+			chan->loopst = (chan->loopst & 0xff00) | (data & 0x00ff);
+			break;
+
+		case 0x05:	/* LSH */
+			chan->loopst = (chan->loopst & 0x00ff) | ((data << 8) & 0xff00);
+			break;
+
+		case 0x06:	/* ST */
+			chan->start = data;
+			if (!chan->enable)
+				chan->addr = chan->start << (8 + 11);
+			break;
+
+		case 0x07:	/* control reg */
+			chip->enable = (data >> 7) & 1;
+			if (data & 0x40)
+				chip->cbank = data & 7;
+			else
+				chip->wbank = data & 15;
+			break;
+
+		case 0x08:	/* channel on/off reg */
+			for (i = 0; i < 8; i++)
+			{
+				chip->chani.enable = (~data >> i) & 1;
+				if (!chip->chani.enable)
+					chip->chani.addr = chip->chani.start << (8 + 11);
+			}
+			break;
+	}
+}
+
+
+/************************************************/
+/* RF5C68 read memory */
+/************************************************/
+
+//READ8_DEVICE_HANDLER( rf5c68_mem_r )
+UINT8 rf5c68_mem_r(void *_info, offs_t offset)
+{
+	//rf5c68_state *chip = get_safe_token(device);
+	rf5c68_state *chip = (rf5c68_state *)_info;
+	return chip->datachip->wbank * 0x1000 + offset;
+}
+
+
+/************************************************/
+/* RF5C68 write memory */
+/************************************************/
+
+//WRITE8_DEVICE_HANDLER( rf5c68_mem_w )
+void rf5c68_mem_w(void *_info, offs_t offset, UINT8 data)
+{
+	//rf5c68_state *chip = get_safe_token(device);
+	rf5c68_state *chip = (rf5c68_state *)_info;
+	rf5c68_mem_stream_flush(chip);
+	chip->datachip->wbank * 0x1000 | offset = data;
+}
+
+static void rf5c68_mem_stream_flush(rf5c68_state *chip)
+{
+	mem_stream* ms = &chip->memstrm;
+	
+	if (ms->CurAddr >= ms->EndAddr)
+		return;
+	
+	memcpy(chip->data + ms->CurAddr, ms->MemPnt + (ms->CurAddr - ms->BaseAddr), ms->EndAddr - ms->CurAddr);
+	ms->CurAddr = ms->EndAddr;
+	
+	return;
+}
+
+void rf5c68_write_ram(void *_info, offs_t DataStart, offs_t DataLength, const UINT8* RAMData)
+{
+	rf5c68_state *chip = (rf5c68_state *)_info;
+	mem_stream* ms = &chip->memstrm;
+	UINT16 BytCnt;
+	
+	DataStart |= chip->wbank * 0x1000;
+	if (DataStart >= chip->datasize)
+		return;
+	if (DataStart + DataLength > chip->datasize)
+		DataLength = chip->datasize - DataStart;
+	
+	//memcpy(chip->data + DataStart, RAMData, DataLength);
+	
+	rf5c68_mem_stream_flush(chip);
+	
+	ms->BaseAddr = DataStart;
+	ms->CurAddr = ms->BaseAddr;
+	ms->EndAddr = ms->BaseAddr + DataLength;
+	ms->CurStep = 0x0000;
+	ms->MemPnt = RAMData;
+	
+	//BytCnt = (STEAM_STEP * 32) >> 11;
+	BytCnt = 0x40;	// SegaSonic Arcade: Run! Run! Run! needs such a high value
+	if (ms->CurAddr + BytCnt > ms->EndAddr)
+		BytCnt = ms->EndAddr - ms->CurAddr;
+	
+	memcpy(chip->data + ms->CurAddr, ms->MemPnt + (ms->CurAddr - ms->BaseAddr), BytCnt);
+	ms->CurAddr += BytCnt;
+	
+	return;
+}
+
+
+void rf5c68_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	rf5c68_state *chip = (rf5c68_state *)_info;
+	unsigned char CurChn;
+	
+	for (CurChn = 0; CurChn < NUM_CHANNELS; CurChn ++)
+		chip->chanCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( rf5c68 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(rf5c68_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( rf5c68 );			break;
+		case DEVINFO_FCT_STOP:							// Nothing										break;
+		case DEVINFO_FCT_RESET:							// Nothing										break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "RF5C68");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Ricoh PCM");					break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+
+/**************** end of file ****************/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/rf5c68.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.c Added

@@ -0,0 +1,598 @@
+/***************************************************************************
+
+ Philips SAA1099 Sound driver
+
+ By Juergen Buchmueller and Manuel Abadia
+
+ SAA1099 register layout:
+ ========================
+
+ offs | 7654 3210 | description
+ -----+-----------+---------------------------
+ 0x00 | ---- xxxx | Amplitude channel 0 (left)
+ 0x00 | xxxx ---- | Amplitude channel 0 (right)
+ 0x01 | ---- xxxx | Amplitude channel 1 (left)
+ 0x01 | xxxx ---- | Amplitude channel 1 (right)
+ 0x02 | ---- xxxx | Amplitude channel 2 (left)
+ 0x02 | xxxx ---- | Amplitude channel 2 (right)
+ 0x03 | ---- xxxx | Amplitude channel 3 (left)
+ 0x03 | xxxx ---- | Amplitude channel 3 (right)
+ 0x04 | ---- xxxx | Amplitude channel 4 (left)
+ 0x04 | xxxx ---- | Amplitude channel 4 (right)
+ 0x05 | ---- xxxx | Amplitude channel 5 (left)
+ 0x05 | xxxx ---- | Amplitude channel 5 (right)
+ | |
+ 0x08 | xxxx xxxx | Frequency channel 0
+ 0x09 | xxxx xxxx | Frequency channel 1
+ 0x0a | xxxx xxxx | Frequency channel 2
+ 0x0b | xxxx xxxx | Frequency channel 3
+ 0x0c | xxxx xxxx | Frequency channel 4
+ 0x0d | xxxx xxxx | Frequency channel 5
+ | |
+ 0x10 | ---- -xxx | Channel 0 octave select
+ 0x10 | -xxx ---- | Channel 1 octave select
+ 0x11 | ---- -xxx | Channel 2 octave select
+ 0x11 | -xxx ---- | Channel 3 octave select
+ 0x12 | ---- -xxx | Channel 4 octave select
+ 0x12 | -xxx ---- | Channel 5 octave select
+ | |
+ 0x14 | ---- ---x | Channel 0 frequency enable (0 = off, 1 = on)
+ 0x14 | ---- --x- | Channel 1 frequency enable (0 = off, 1 = on)
+ 0x14 | ---- -x-- | Channel 2 frequency enable (0 = off, 1 = on)
+ 0x14 | ---- x--- | Channel 3 frequency enable (0 = off, 1 = on)
+ 0x14 | ---x ---- | Channel 4 frequency enable (0 = off, 1 = on)
+ 0x14 | --x- ---- | Channel 5 frequency enable (0 = off, 1 = on)
+ | |
+ 0x15 | ---- ---x | Channel 0 noise enable (0 = off, 1 = on)
+ 0x15 | ---- --x- | Channel 1 noise enable (0 = off, 1 = on)
+ 0x15 | ---- -x-- | Channel 2 noise enable (0 = off, 1 = on)
+ 0x15 | ---- x--- | Channel 3 noise enable (0 = off, 1 = on)
+ 0x15 | ---x ---- | Channel 4 noise enable (0 = off, 1 = on)
+ 0x15 | --x- ---- | Channel 5 noise enable (0 = off, 1 = on)
+ | |
+ 0x16 | ---- --xx | Noise generator parameters 0
+ 0x16 | --xx ---- | Noise generator parameters 1
+ | |
+ 0x18 | --xx xxxx | Envelope generator 0 parameters
+ 0x18 | x--- ---- | Envelope generator 0 control enable (0 = off, 1 = on)
+ 0x19 | --xx xxxx | Envelope generator 1 parameters
+ 0x19 | x--- ---- | Envelope generator 1 control enable (0 = off, 1 = on)
+ | |
+ 0x1c | ---- ---x | All channels enable (0 = off, 1 = on)
+ 0x1c | ---- --x- | Synch & Reset generators
+
+***************************************************************************/
+
+//#include "emu.h"
+#include "mamedef.h"
+#include <stdlib.h>
+#include <string.h>
+#include "saa1099.h"
+
+
+#define LEFT	0x00
+#define RIGHT	0x01
+
+/* this structure defines a channel */
+struct saa1099_channel
+{
+	int frequency;			/* frequency (0x00..0xff) */
+	int freq_enable;		/* frequency enable */
+	int noise_enable;		/* noise enable */
+	int octave; 			/* octave (0x00..0x07) */
+	int amplitude2;		/* amplitude (0x00..0x0f) */
+	int envelope2;		/* envelope (0x00..0x0f or 0x10 == off) */
+
+	/* vars to simulate the square wave */
+	double counter;
+	double freq;
+	int level;
+	UINT8 Muted;
+};
+
+/* this structure defines a noise channel */
+struct saa1099_noise
+{
+	/* vars to simulate the noise generator output */
+	double counter;
+	double freq;
+	int level;						/* noise polynomal shifter */
+};
+
+/* this structure defines a SAA1099 chip */
+typedef struct _saa1099_state saa1099_state;
+struct _saa1099_state
+{
+	//device_t *device;
+	//sound_stream * stream;			/* our stream */
+	int noise_params2;			/* noise generators parameters */
+	int env_enable2;				/* envelope generators enable */
+	int env_reverse_right2;		/* envelope reversed for right channel */
+	int env_mode2;				/* envelope generators mode */
+	int env_bits2;				/* non zero = 3 bits resolution */
+	int env_clock2;				/* envelope clock mode (non-zero external) */
+	int env_step2;				/* current envelope step */
+	int all_ch_enable;				/* all channels enable */
+	int sync_state;					/* sync all channels */
+	int selected_reg;				/* selected register */
+	struct saa1099_channel channels6;	/* channels */
+	struct saa1099_noise noise2;	/* noise generators */
+	double sample_rate;
+	int master_clock;
+};
+
+static const int amplitude_lookup16 = {
+	 0*32767/16, 1*32767/16, 2*32767/16, 3*32767/16,
+	 4*32767/16, 5*32767/16, 6*32767/16, 7*32767/16,
+	 8*32767/16, 9*32767/16, 10*32767/16, 11*32767/16,
+	12*32767/16, 13*32767/16, 14*32767/16, 15*32767/16
+};
+
+static const UINT8 envelope864 = {
+	/* zero amplitude */
+	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+	/* maximum amplitude */
+	{15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,
+	 15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15, },
+	/* single decay */
+	{15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+	/* repetitive decay */
+	{15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+	 15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+	 15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+	 15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
+	/* single triangular */
+	{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
+	 15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+	/* repetitive triangular */
+	{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
+	 15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+	 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
+	 15,14,13,12,11,10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 },
+	/* single attack */
+	{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+	/* repetitive attack */
+	{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
+	 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
+	 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
+	 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15 }
+};
+
+
+/*INLINE saa1099_state *get_safe_token(device_t *device)
+{
+	assert(device != NULL);
+	assert(device->type() == SAA1099);
+	return (saa1099_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+static void saa1099_envelope(saa1099_state *saa, int ch)
+{
+	if (saa->env_enablech)
+	{
+		int step, mode, mask;
+		mode = saa->env_modech;
+		/* step from 0..63 and then loop in steps 32..63 */
+		step = saa->env_stepch =
+			((saa->env_stepch + 1) & 0x3f) | (saa->env_stepch & 0x20);
+
+		mask = 15;
+		if (saa->env_bitsch)
+			mask &= ~1; 	/* 3 bit resolution, mask LSB */
+
+		saa->channelsch*3+0.envelope LEFT =
+		saa->channelsch*3+1.envelope LEFT =
+		saa->channelsch*3+2.envelope LEFT = envelopemodestep & mask;
+		if (saa->env_reverse_rightch & 0x01)
+		{
+			saa->channelsch*3+0.envelopeRIGHT =
+			saa->channelsch*3+1.envelopeRIGHT =
+			saa->channelsch*3+2.envelopeRIGHT = (15 - envelopemodestep) & mask;
+		}
+		else
+		{
+			saa->channelsch*3+0.envelopeRIGHT =
+			saa->channelsch*3+1.envelopeRIGHT =
+			saa->channelsch*3+2.envelopeRIGHT = envelopemodestep & mask;
+		}
+	}
+	else
+	{
+		/* envelope mode off, set all envelope factors to 16 */
+		saa->channelsch*3+0.envelope LEFT =
+		saa->channelsch*3+1.envelope LEFT =
+		saa->channelsch*3+2.envelope LEFT =
+		saa->channelsch*3+0.envelopeRIGHT =
+		saa->channelsch*3+1.envelopeRIGHT =
+		saa->channelsch*3+2.envelopeRIGHT = 16;
+ }
+}
+
+
+//static STREAM_UPDATE( saa1099_update )
+void saa1099_update(void *param, stream_sample_t **outputs, int samples)
+{
+	saa1099_state *saa = (saa1099_state *)param;
+	int j, ch;
+	int clk2div512;
+
+	/* if the channels are disabled we're done */
+	if (!saa->all_ch_enable)
+	{
+		/* init output data */
+		memset(outputsLEFT,0,samples*sizeof(*outputsLEFT));
+		memset(outputsRIGHT,0,samples*sizeof(*outputsRIGHT));
+		return;
+	}
+
+	for (ch = 0; ch < 2; ch++)
+	{
+		switch (saa->noise_paramsch)
+		{
+		case 0: saa->noisech.freq = saa->master_clock/ 256.0 * 2; break;
+		case 1: saa->noisech.freq = saa->master_clock/ 512.0 * 2; break;
+		case 2: saa->noisech.freq = saa->master_clock/1024.0 * 2; break;
+		case 3: saa->noisech.freq = saa->channelsch * 3.freq; break;
+		}
+	}
+
+	// clock fix thanks to http://www.vogons.org/viewtopic.php?p=344227#p344227
+	//clk2div512 = 2 * saa->master_clock / 512;
+	clk2div512 = (saa->master_clock + 128) / 256;
+	
+	/* fill all data needed */
+	for( j = 0; j < samples; j++ )
+	{
+		int output_l = 0, output_r = 0;
+
+		/* for each channel */
+		for (ch = 0; ch < 6; ch++)
+		{
+			if (saa->channelsch.freq == 0.0)
+				saa->channelsch.freq = (double)(clk2div512 << saa->channelsch.octave) /
+					(511.0 - (double)saa->channelsch.frequency);
+
+			/* check the actual position in the square wave */
+			saa->channelsch.counter -= saa->channelsch.freq;
+			while (saa->channelsch.counter < 0)
+			{
+				/* calculate new frequency now after the half wave is updated */
+				saa->channelsch.freq = (double)(clk2div512 << saa->channelsch.octave) /
+					(511.0 - (double)saa->channelsch.frequency);
+
+				saa->channelsch.counter += saa->sample_rate;
+				saa->channelsch.level ^= 1;
+
+				/* eventually clock the envelope counters */
+				if (ch == 1 && saa->env_clock0 == 0)
+					saa1099_envelope(saa, 0);
+				if (ch == 4 && saa->env_clock1 == 0)
+					saa1099_envelope(saa, 1);
+			}
+
+			if (saa->channelsch.Muted)
+				continue;	// placed here to ensure that envelopes are updated
+			
+#if 0
+			// if the noise is enabled
+			if (saa->channelsch.noise_enable)
+			{
+				// if the noise level is high (noise 0: chan 0-2, noise 1: chan 3-5)
+				if (saa->noisech/3.level & 1)
+				{
+					// subtract to avoid overflows, also use only half amplitude
+					output_l -= saa->channelsch.amplitude LEFT * saa->channelsch.envelope LEFT / 16 / 2;
+					output_r -= saa->channelsch.amplitudeRIGHT * saa->channelsch.envelopeRIGHT / 16 / 2;
+				}
+			}
+
+			// if the square wave is enabled
+			if (saa->channelsch.freq_enable)
+			{
+				// if the channel level is high
+				if (saa->channelsch.level & 1)
+				{
+					output_l += saa->channelsch.amplitude LEFT * saa->channelsch.envelope LEFT / 16;
+					output_r += saa->channelsch.amplitudeRIGHT * saa->channelsch.envelopeRIGHT / 16;
+				}
+			}
+#else
+			// Now with bipolar output. -Valley Bell
+			if (saa->channelsch.noise_enable)
+			{
+				if (saa->noisech/3.level & 1)
+				{
+					output_l += saa->channelsch.amplitude LEFT * saa->channelsch.envelope LEFT / 32 / 2;
+					output_r += saa->channelsch.amplitudeRIGHT * saa->channelsch.envelopeRIGHT / 32 / 2;
+				}
+				else
+				{
+					output_l -= saa->channelsch.amplitude LEFT * saa->channelsch.envelope LEFT / 32 / 2;
+					output_r -= saa->channelsch.amplitudeRIGHT * saa->channelsch.envelopeRIGHT / 32 / 2;
+				}
+			}
+
+			if (saa->channelsch.freq_enable)
+			{
+				if (saa->channelsch.level & 1)
+				{
+					output_l += saa->channelsch.amplitude LEFT * saa->channelsch.envelope LEFT / 32;
+					output_r += saa->channelsch.amplitudeRIGHT * saa->channelsch.envelopeRIGHT / 32;
+				}
+				else
+				{
+					output_l -= saa->channelsch.amplitude LEFT * saa->channelsch.envelope LEFT / 32;
+					output_r -= saa->channelsch.amplitudeRIGHT * saa->channelsch.envelopeRIGHT / 32;
+				}
+			}
+#endif
+		}
+
+		for (ch = 0; ch < 2; ch++)
+		{
+			/* check the actual position in noise generator */
+			saa->noisech.counter -= saa->noisech.freq;
+			while (saa->noisech.counter < 0)
+			{
+				saa->noisech.counter += saa->sample_rate;
+				if( ((saa->noisech.level & 0x4000) == 0) == ((saa->noisech.level & 0x0040) == 0) )
+					saa->noisech.level = (saa->noisech.level << 1) | 1;
+				else
+					saa->noisech.level <<= 1;
+			}
+		}
+		/* write sound data to the buffer */
+		outputsLEFTj = output_l / 6;
+		outputsRIGHTj = output_r / 6;
+	}
+}
+
+
+
+//static DEVICE_START( saa1099 )
+int device_start_saa1099(void **_info, int clock)
+{
+	//saa1099_state *saa = get_safe_token(device);
+	saa1099_state *saa;
+	UINT8 CurChn;
+
+	saa = (saa1099_state *) calloc(1, sizeof(saa1099_state));
+	*_info = (void *) saa;
+
+	/* copy global parameters */
+	//saa->device = device;
+	//saa->sample_rate = device->clock() / 256;
+	saa->master_clock = clock;
+	saa->sample_rate = clock / 256.0;
+
+	/* for each chip allocate one stream */
+	//saa->stream = device->machine().sound().stream_alloc(*device, 0, 2, saa->sample_rate, saa, saa1099_update);
+	
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		saa->channelsCurChn.Muted = 0x00;
+	
+	return (int)(saa->sample_rate + 0.5);
+}
+
+void device_stop_saa1099(void *chip)
+{
+	free(chip);
+	
+	return;
+}
+
+void device_reset_saa1099(void *_info)
+{
+	saa1099_state *saa = (saa1099_state *)_info;
+	struct saa1099_channel *sachn;
+	UINT8 CurChn;
+
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+	{
+		sachn = &saa->channelsCurChn;
+		sachn->frequency = 0;
+		sachn->octave = 0;
+		sachn->amplitude0 = 0;
+		sachn->amplitude1 = 0;
+		sachn->envelope0 = 0;
+		sachn->envelope1 = 0;
+		sachn->freq_enable = 0;
+		sachn->noise_enable = 0;
+		
+		sachn->counter = 0;
+		sachn->freq = 0;
+		sachn->level = 0;
+	}
+	for (CurChn = 0; CurChn < 2; CurChn ++)
+	{
+		saa->noiseCurChn.counter = 0;
+		saa->noiseCurChn.freq = 0;
+		saa->noiseCurChn.level = 0;
+		
+		saa->noise_params1 = 0x00;
+		saa->env_reverse_rightCurChn = 0x00;
+		saa->env_modeCurChn = 0x00;
+		saa->env_bitsCurChn = 0x00;
+		saa->env_clockCurChn = 0x00;
+		saa->env_enableCurChn = 0x00;
+		saa->env_stepCurChn = 0;
+	}
+	
+	saa->all_ch_enable = 0x00;
+	saa->sync_state = 0x00;
+	
+	return;
+}
+
+//WRITE8_DEVICE_HANDLER( saa1099_control_w )
+void saa1099_control_w(void *_info, offs_t offset, UINT8 data)
+{
+	//saa1099_state *saa = get_safe_token(device);
+	saa1099_state *saa = (saa1099_state *)_info;
+
+	if ((data & 0xff) > 0x1c)
+	{
+		/* Error! */
+		//logerror("%s: (SAA1099 '%s') Unknown register selected\n",device->machine().describe_context(), device->tag());
+#ifdef _DEBUG
+		logerror("SAA1099: Unknown register selected\n");
+#endif
+	}
+
+	saa->selected_reg = data & 0x1f;
+	if (saa->selected_reg == 0x18 || saa->selected_reg == 0x19)
+	{
+		/* clock the envelope channels */
+		if (saa->env_clock0)
+			saa1099_envelope(saa,0);
+		if (saa->env_clock1)
+			saa1099_envelope(saa,1);
+ }
+}
+
+
+//WRITE8_DEVICE_HANDLER( saa1099_data_w )
+void saa1099_data_w(void *_info, offs_t offset, UINT8 data)
+{
+	//saa1099_state *saa = get_safe_token(device);
+	saa1099_state *saa = (saa1099_state *)_info;
+	int reg = saa->selected_reg;
+	int ch;
+
+	/* first update the stream to this point in time */
+	//saa->stream->update();
+
+	switch (reg)
+	{
+	/* channel i amplitude */
+	case 0x00:	case 0x01:	case 0x02:	case 0x03:	case 0x04:	case 0x05:
+		ch = reg & 7;
+		saa->channelsch.amplitudeLEFT = amplitude_lookupdata & 0x0f;
+		saa->channelsch.amplitudeRIGHT = amplitude_lookup(data >> 4) & 0x0f;
+		break;
+	/* channel i frequency */
+	case 0x08:	case 0x09:	case 0x0a:	case 0x0b:	case 0x0c:	case 0x0d:
+		ch = reg & 7;
+		saa->channelsch.frequency = data & 0xff;
+		break;
+	/* channel i octave */
+	case 0x10:	case 0x11:	case 0x12:
+		ch = (reg - 0x10) << 1;
+		saa->channelsch + 0.octave = data & 0x07;
+		saa->channelsch + 1.octave = (data >> 4) & 0x07;
+		break;
+	/* channel i frequency enable */
+	case 0x14:
+		saa->channels0.freq_enable = data & 0x01;
+		saa->channels1.freq_enable = data & 0x02;
+		saa->channels2.freq_enable = data & 0x04;
+		saa->channels3.freq_enable = data & 0x08;
+		saa->channels4.freq_enable = data & 0x10;
+		saa->channels5.freq_enable = data & 0x20;
+		break;
+	/* channel i noise enable */
+	case 0x15:
+		saa->channels0.noise_enable = data & 0x01;
+		saa->channels1.noise_enable = data & 0x02;
+		saa->channels2.noise_enable = data & 0x04;
+		saa->channels3.noise_enable = data & 0x08;
+		saa->channels4.noise_enable = data & 0x10;
+		saa->channels5.noise_enable = data & 0x20;
+		break;
+	/* noise generators parameters */
+	case 0x16:
+		saa->noise_params0 = data & 0x03;
+		saa->noise_params1 = (data >> 4) & 0x03;
+		break;
+	/* envelope generators parameters */
+	case 0x18:	case 0x19:
+		ch = reg - 0x18;
+		saa->env_reverse_rightch = data & 0x01;
+		saa->env_modech = (data >> 1) & 0x07;
+		saa->env_bitsch = data & 0x10;
+		saa->env_clockch = data & 0x20;
+		saa->env_enablech = data & 0x80;
+		/* reset the envelope */
+		saa->env_stepch = 0;
+		break;
+	/* channels enable & reset generators */
+	case 0x1c:
+		saa->all_ch_enable = data & 0x01;
+		saa->sync_state = data & 0x02;
+		if (data & 0x02)
+		{
+			int i;
+
+			/* Synch & Reset generators */
+			//logerror("%s: (SAA1099 '%s') -reg 0x1c- Chip reset\n",device->machine().describe_context(), device->tag());
+#ifdef _DEBUG
+			logerror("SAA1099: -reg 0x1c- Chip reset\n");
+#endif
+			for (i = 0; i < 6; i++)
+			{
+				saa->channelsi.level = 0;
+				saa->channelsi.counter = 0.0;
+			}
+		}
+		break;
+#ifdef _DEBUG
+	default:	/* Error! */
+		//logerror("%s: (SAA1099 '%s') Unknown operation (reg:%02x, data:%02x)\n",device->machine().describe_context(), device->tag(), reg, data);
+		logerror("SAA1099: Unknown operation (reg:%02x, data:%02x)\n",reg, data);
+#endif
+	}
+}
+
+
+void saa1099_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	saa1099_state *saa = (saa1099_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		saa->channelsCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( saa1099 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(saa1099_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( saa1099 );		break;
+		case DEVINFO_FCT_STOP:							// Nothing //									break;
+		case DEVINFO_FCT_RESET:							// Nothing //									break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "SAA1099");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Philips");						break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(SAA1099, saa1099);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/saa1099.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.c Added

@@ -0,0 +1,510 @@
+/***********************************************************/
+/* */
+/* PCM.C : PCM RF5C164 emulator */
+/* */
+/* This source is a part of Gens project */
+/* Written by Stéphane Dallongeville (gens@consolemul.com) */
+/* Copyright (c) 2002 by Stéphane Dallongeville */
+/* */
+/***********************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "mamedef.h"
+#include "scd_pcm.h"
+int PCM_Init(void *chip, int Rate);
+void PCM_Set_Rate(void *chip, int Rate);
+void PCM_Reset(void *chip);
+void PCM_Write_Reg(void *chip, unsigned int Reg, unsigned int Data);
+int PCM_Update(void *chip, int **buf, int Length);
+
+#define PCM_STEP_SHIFT 11
+
+/*static unsigned char VolTabIsInit = 0x00;
+static int PCM_Volume_Tab256 * 256;*/
+
+//unsigned char Ram_PCM64 * 1024;
+//int PCM_Enable;
+
+
+/**
+ * PCM_Init(): Initialize the PCM chip.
+ * @param Rate Sample rate.
+ * @return 0 if successful.
+ */
+int PCM_Init(void *_info, int Rate)
+{
+	struct pcm_chip_ *chip = (struct pcm_chip_ *)_info;
+	int i/*, j, out*/;
+	
+	/*if (! VolTabIsInit)
+	{
+		for (i = 0; i < 0x100; i++)
+		{
+			for (j = 0; j < 0x100; j++)
+			{
+				if (i & 0x80)
+				{
+					out = -(i & 0x7F);
+					out *= j;
+					PCM_Volume_Tab(j << 8) + i = out;
+				}
+				else
+				{
+					out = i * j;
+					PCM_Volume_Tab(j << 8) + i = out;
+				}
+			}
+		}
+		VolTabIsInit = 0x01;
+	}*/
+	
+	chip->Smpl0Patch = 0;
+	for (i = 0; i < 8; i ++)
+		chip->Channeli.Muted = 0x00;
+	
+	chip->RAMSize = 64 * 1024;
+	chip->RAM = (unsigned char*)malloc(chip->RAMSize);
+	PCM_Reset(chip);
+	PCM_Set_Rate(chip, Rate);
+
+	return 0;
+}
+
+
+/**
+ * PCM_Reset(): Reset the PCM chip.
+ */
+void PCM_Reset(void *_info)
+{
+	struct pcm_chip_ *chip = (struct pcm_chip_ *)_info;
+	int i;
+	struct pcm_chan_* chan;
+	
+	// Clear the PCM memory.
+	memset(chip->RAM, 0x00, chip->RAMSize);
+	
+	chip->Enable = 0;
+	chip->Cur_Chan = 0;
+	chip->Bank = 0;
+	
+	/* clear channel registers */
+	for (i = 0; i < 8; i++)
+	{
+		chan = &chip->Channeli;
+		chan->Enable = 0;
+		chan->ENV = 0;
+		chan->PAN = 0;
+		chan->St_Addr = 0;
+		chan->Addr = 0;
+		chan->Loop_Addr = 0;
+		chan->Step = 0;
+		chan->Step_B = 0;
+		chan->Data = 0;
+	}
+}
+
+
+/**
+ * PCM_Set_Rate(): Change the PCM sample rate.
+ * @param Rate New sample rate.
+ */
+void PCM_Set_Rate(void *_info, int Rate)
+{
+	struct pcm_chip_ *chip = (struct pcm_chip_ *)_info;
+	int i;
+	
+	if (Rate == 0)
+		return;
+	
+	//chip->Rate = (float) (32 * 1024) / (float) Rate;
+	chip->Rate = (float) (31.8 * 1024) / (float) Rate;
+	
+	for (i = 0; i < 8; i++)
+	{
+		chip->Channeli.Step =
+			(int) ((float) chip->Channeli.Step_B * chip->Rate);
+	}
+}
+
+
+/**
+ * PCM_Write_Reg(): Write to a PCM register.
+ * @param Reg Register ID.
+ * @param Data Data to write.
+ */
+void PCM_Write_Reg(void *_info, unsigned int Reg, unsigned int Data)
+{
+	struct pcm_chip_ *chip = (struct pcm_chip_ *)_info;
+	int i;
+	struct pcm_chan_* chan = &chip->Channelchip->Cur_Chan;
+	
+	Data &= 0xFF;
+	
+	switch (Reg)
+	{
+		case 0x00:
+			/* evelope register */
+			chan->ENV = Data;
+			chan->MUL_L = (Data * (chan->PAN & 0x0F)) >> 5;
+			chan->MUL_R = (Data * (chan->PAN >> 4)) >> 5;
+		break;
+		
+		case 0x01:
+			/* pan register */
+			chan->PAN = Data;
+			chan->MUL_L = ((Data & 0x0F) * chan->ENV) >> 5;
+			chan->MUL_R = ((Data >> 4) * chan->ENV) >> 5;
+			break;
+		
+		case 0x02:
+			/* frequency step (LB) registers */
+			chan->Step_B &= 0xFF00;
+			chan->Step_B += Data;
+			chan->Step = (int)((float)chan->Step_B * chip->Rate);
+			
+			//LOG_MSG(pcm, LOG_MSG_LEVEL_DEBUG1,
+			//	"Step low = %.2X Step calculated = %.8X",
+			//	Data, chan->Step);
+			break;
+		
+		case 0x03:
+			/* frequency step (HB) registers */
+			chan->Step_B &= 0x00FF;
+			chan->Step_B += Data << 8;
+			chan->Step = (int)((float)chan->Step_B * chip->Rate);
+			
+			//LOG_MSG(pcm, LOG_MSG_LEVEL_DEBUG1,
+			//	"Step high = %.2X Step calculated = %.8X",
+			//	Data, chan->Step);
+			break;
+		
+		case 0x04:
+			chan->Loop_Addr &= 0xFF00;
+			chan->Loop_Addr += Data;			
+			
+			//LOG_MSG(pcm, LOG_MSG_LEVEL_DEBUG1,
+			//	"Loop low = %.2X Loop = %.8X",
+			//	Data, chan->Loop_Addr);
+			break;
+		
+		case 0x05:
+			/* loop address registers */
+			chan->Loop_Addr &= 0x00FF;
+			chan->Loop_Addr += Data << 8;
+			
+			//LOG_MSG(pcm, LOG_MSG_LEVEL_DEBUG1,
+			//	"Loop high = %.2X Loop = %.8X",
+			//	Data, chan->Loop_Addr);
+			break;
+		
+		case 0x06:
+			/* start address registers */
+			chan->St_Addr = Data << (PCM_STEP_SHIFT + 8);
+			//chan->Addr = chan->St_Addr;
+			
+			//LOG_MSG(pcm, LOG_MSG_LEVEL_DEBUG1,
+			//	"Start addr = %.2X New Addr = %.8X",
+			//	Data, chan->Addr);
+			break;
+		
+		case 0x07:
+			/* control register */
+			/* mod is H */
+			if (Data & 0x40)
+			{
+				/* select channel */
+				chip->Cur_Chan = Data & 0x07;
+			}
+			/* mod is L */
+			else
+			{
+				/* pcm ram bank select */
+				chip->Bank = (Data & 0x0F) << 12;
+			}
+			
+			/* sounding bit */
+			if (Data & 0x80)
+				chip->Enable = 0xFF;	// Used as mask
+			else
+				chip->Enable = 0;
+			
+			//LOG_MSG(pcm, LOG_MSG_LEVEL_DEBUG1,
+			//	"General Enable = %.2X", Data);
+			break;
+		
+		case 0x08:
+			/* sound on/off register */
+			Data ^= 0xFF;
+			
+			//LOG_MSG(pcm, LOG_MSG_LEVEL_DEBUG1,
+			//	"Channel Enable = %.2X", Data);
+			
+			for (i = 0; i < 8; i++)
+			{
+				chan = &chip->Channeli;
+				if (!chan->Enable)
+					chan->Addr = chan->St_Addr;
+			}
+			
+			for (i = 0; i < 8; i++)
+			{
+				chip->Channeli.Enable = Data & (1 << i);
+			}
+	}
+}
+
+
+/**
+ * PCM_Update(): Update the PCM buffer.
+ * @param buf PCM buffer.
+ * @param Length Buffer length.
+ */
+int PCM_Update(void *_info, int **buf, int Length)
+{
+	struct pcm_chip_ *chip = (struct pcm_chip_ *)_info;
+	int i, j;
+	int *bufL, *bufR;		//, *volL, *volR;
+	unsigned int Addr, k;
+	struct pcm_chan_ *CH;
+	
+	bufL = buf0;
+	bufR = buf1;
+	
+	// clear buffers
+	memset(bufL, 0, Length * sizeof(int));
+	memset(bufR, 0, Length * sizeof(int));
+
+	// if PCM disable, no sound
+	if (!chip->Enable)
+		return 1;
+	
+#if 0
+	// faster for short update
+	for (j = 0; j < Length; j++)
+	{
+		for (i = 0; i < 8; i++)
+		{
+			CH = &(chip->Channeli);
+
+			// only loop when sounding and on
+			if (CH->Enable && ! CH->Muted)
+			{
+				Addr = CH->Addr >> PCM_STEP_SHIFT;
+
+				if (Addr & 0x10000)
+				{
+					for(k = CH->Old_Addr; k < 0x10000; k++)
+					{
+						if (chip->RAMk == 0xFF)
+						{
+							CH->Old_Addr = Addr = CH->Loop_Addr;
+							CH->Addr = Addr << PCM_STEP_SHIFT;
+							break;
+						}
+					}
+
+					if (Addr & 0x10000)
+					{
+						//CH->Addr -= CH->Step;
+						CH->Enable = 0;
+						break;
+					}
+				}
+				else
+				{
+					for(k = CH->Old_Addr; k <= Addr; k++)
+					{
+						if (chip->RAMk == 0xFF)
+						{
+							CH->Old_Addr = Addr = CH->Loop_Addr;
+							CH->Addr = Addr << PCM_STEP_SHIFT;
+							break;
+						}
+					}
+				}
+				
+				// test for loop signal
+				if (chip->RAMAddr == 0xFF)
+				{
+					Addr = CH->Loop_Addr;
+					CH->Addr = Addr << PCM_STEP_SHIFT;
+				}
+				
+				if (chip->RAMAddr & 0x80)
+				{
+					CH->Data = chip->RAMAddr & 0x7F;
+					bufLj -= CH->Data * CH->MUL_L;
+					bufRj -= CH->Data * CH->MUL_R;
+				}
+				else
+				{
+					CH->Data = chip->RAMAddr;
+					bufLj += CH->Data * CH->MUL_L;
+					bufRj += CH->Data * CH->MUL_R;
+				}
+				
+				// update address register
+				//CH->Addr = (CH->Addr + CH->Step) & 0x7FFFFFF;
+				CH->Addr += CH->Step;
+				CH->Old_Addr = Addr + 1;
+			}
+		}
+	}
+#endif
+
+#if 1
+	// for long update
+	for (i = 0; i < 8; i++)
+	{
+		CH = &(chip->Channeli);
+		
+		// only loop when sounding and on
+		if (CH->Enable && ! CH->Muted)
+		{
+			Addr = CH->Addr >> PCM_STEP_SHIFT;
+			//volL = &(PCM_Volume_TabCH->MUL_L << 8);
+			//volR = &(PCM_Volume_TabCH->MUL_R << 8);
+			
+			for (j = 0; j < Length; j++)
+			{
+				// test for loop signal
+				if (chip->RAMAddr == 0xFF)
+				{
+					CH->Addr = (Addr = CH->Loop_Addr) << PCM_STEP_SHIFT;
+					if (chip->RAMAddr == 0xFF)
+						break;
+					else
+						j--;
+				}
+				else
+				{
+					if (chip->RAMAddr & 0x80)
+					{
+						CH->Data = chip->RAMAddr & 0x7F;
+						bufLj -= CH->Data * CH->MUL_L;
+						bufRj -= CH->Data * CH->MUL_R;
+					}
+					else
+					{
+						CH->Data = chip->RAMAddr;
+						// this improves the sound of Cosmic Fantasy Stories,
+						// although it's definately false behaviour
+						if (! CH->Data && chip->Smpl0Patch)
+							CH->Data = -0x7F;
+						bufLj += CH->Data * CH->MUL_L;
+						bufRj += CH->Data * CH->MUL_R;
+					}
+					
+					// update address register
+					k = Addr + 1;
+					CH->Addr = (CH->Addr + CH->Step) & 0x7FFFFFF;
+					Addr = CH->Addr >> PCM_STEP_SHIFT;
+					
+					for (; k < Addr; k++)
+					{
+						if (chip->RAMk == 0xFF)
+						{
+							CH->Addr = (Addr = CH->Loop_Addr) << PCM_STEP_SHIFT;
+							break;
+						}
+					}
+				}
+			}
+			
+			if (chip->RAMAddr == 0xFF)
+			{
+				CH->Addr = CH->Loop_Addr << PCM_STEP_SHIFT;
+			}
+		}
+	}
+#endif
+	
+	return 0;
+}
+
+
+void rf5c164_update(void *chip, stream_sample_t **outputs, int samples)
+{
+	PCM_Update(chip, outputs, samples);
+}
+
+int device_start_rf5c164(void **_info, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	/* allocate memory for the chip */
+	//rf5c164_state *chip = get_safe_token(device);
+	struct pcm_chip_ *chip;
+	int rate;
+	
+	chip = (struct pcm_chip_ *) calloc(1, sizeof(struct pcm_chip_));
+	*_info = (void *) chip;	
+
+	rate = (clock & 0x7FFFFFFF) / 384;
+	if (((CHIP_SAMPLING_MODE & 0x01) && rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		rate = CHIP_SAMPLE_RATE;
+	
+	PCM_Init(chip, rate);
+	chip->Smpl0Patch = (clock & 0x80000000) >> 31;
+	
+	/* allocate the stream */
+	//chip->stream = stream_create(device, 0, 2, device->clock / 384, chip, rf5c68_update);
+
+	return rate;
+}
+
+void device_stop_rf5c164(void *_info)
+{
+	struct pcm_chip_ *chip = (struct pcm_chip_ *)_info;
+	free(chip->RAM);	chip->RAM = NULL;
+	free(chip);	
+
+	return;
+}
+
+void device_reset_rf5c164(void *chip)
+{
+	//struct pcm_chip_ *chip = &PCM_ChipChipID;
+	PCM_Reset(chip);
+}
+
+void rf5c164_w(void *chip, offs_t offset, UINT8 data)
+{
+	//struct pcm_chip_ *chip = &PCM_ChipChipID;
+	PCM_Write_Reg(chip, offset, data);
+}
+
+void rf5c164_mem_w(void *_info, offs_t offset, UINT8 data)
+{
+	struct pcm_chip_ *chip = (struct pcm_chip_ *)_info;
+	chip->RAMchip->Bank | offset = data;
+}
+
+void rf5c164_write_ram(void *_info, offs_t DataStart, offs_t DataLength, const UINT8* RAMData)
+{
+	struct pcm_chip_ *chip = (struct pcm_chip_ *)_info;
+	
+	DataStart |= chip->Bank;
+	if (DataStart >= chip->RAMSize)
+		return;
+	if (DataStart + DataLength > chip->RAMSize)
+		DataLength = chip->RAMSize - DataStart;
+	
+	memcpy(chip->RAM + DataStart, RAMData, DataLength);
+	
+	return;
+}
+
+
+void rf5c164_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	struct pcm_chip_ *chip = (struct pcm_chip_ *)_info;
+	unsigned char CurChn;
+	
+	for (CurChn = 0; CurChn < 8; CurChn ++)
+		chip->ChannelCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scd_pcm.h Added

@@ -0,0 +1,47 @@
+struct pcm_chip_
+{
+	float Rate;
+	int Smpl0Patch;
+	int Enable;
+	int Cur_Chan;
+	int Bank;
+
+	struct pcm_chan_
+	{
+		unsigned int ENV;		/* envelope register */
+		unsigned int PAN;		/* pan register */
+		unsigned int MUL_L;		/* envelope & pan product letf */
+		unsigned int MUL_R;		/* envelope & pan product right */
+		unsigned int St_Addr;	/* start address register */
+		unsigned int Loop_Addr;	/* loop address register */
+		unsigned int Addr;		/* current address register */
+		unsigned int Step;		/* frequency register */
+		unsigned int Step_B;	/* frequency register binaire */
+		unsigned int Enable;	/* channel on/off register */
+		int Data;				/* wave data */
+		unsigned int Muted;
+	} Channel8;
+	
+	unsigned long int RAMSize;
+	unsigned char* RAM;
+};
+
+//extern struct pcm_chip_ PCM_Chip;
+//extern unsigned char Ram_PCM64 * 1024;
+//extern int PCM_Enable;
+
+//int  PCM_Init(int Rate);
+//void PCM_Set_Rate(int Rate);
+//void PCM_Reset(void);
+//void PCM_Write_Reg(unsigned int Reg, unsigned int Data);
+//int  PCM_Update(int **buf, int Length);
+
+void rf5c164_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_rf5c164(void **chip, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_rf5c164(void *chip);
+void device_reset_rf5c164(void *chip);
+void rf5c164_w(void *chip, offs_t offset, UINT8 data);
+void rf5c164_mem_w(void *chip, offs_t offset, UINT8 data);
+void rf5c164_write_ram(void *chip, offs_t DataStart, offs_t DataLength, const UINT8* RAMData);
+
+void rf5c164_set_mute_mask(void *chip, UINT32 MuteMask);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.c Added

@@ -0,0 +1,215 @@
+//#include "emu.h"
+#include "mamedef.h"
+#include <stdlib.h>	// for malloc/free
+#include <string.h>	// for memset
+
+#include "scsp.h"
+
+#include "yam.h"
+
+enum { SCSPRAM_LENGTH = 0x80000 };
+
+#undef YAMSTATE
+#define SCSPRAM ((unsigned char *)info)
+#define YAMSTATE ((void*)(SCSPRAM+SCSPRAM_LENGTH))
+
+//static STREAM_UPDATE( SCSP_Update )
+void SCSP_Update(void *info, stream_sample_t **outputs, int samples)
+{
+	sint16 buffer400;
+	stream_sample_t *bufferleft = outputs0;
+	stream_sample_t *bufferright = outputs1;
+	while (samples) {
+		int i;
+		int samplesnow = samples>200 ? 200 : samples;
+		yam_beginbuffer(YAMSTATE, buffer);
+		yam_advance(YAMSTATE, samplesnow);
+ yam_flush(YAMSTATE);
+		for (i = 0; i < samplesnow; ++i) {
+			*bufferleft++ = bufferi * 2 << 8;
+			*bufferright++ = bufferi * 2 + 1 << 8;
+		}
+		samples -= samplesnow;
+	}
+}
+
+//static DEVICE_START( scsp )
+
+int device_start_scsp(void **_info, int clock, int Flags)
+{
+	void * info = malloc(SCSPRAM_LENGTH + yam_get_state_size(1));
+	if (info) {
+		memset(SCSPRAM, 0, SCSPRAM_LENGTH);
+ device_reset_scsp(info);
+		*_info = info;
+	}
+	return 44100;
+}
+
+void device_stop_scsp(void *info)
+{
+	free(info);	
+}
+
+void device_reset_scsp(void *info)
+{
+ yam_clear_state(YAMSTATE, 1);
+ yam_setram(YAMSTATE, (uint32*)info, SCSPRAM_LENGTH, 0, EMU_ENDIAN_XOR(1) ^ 1);
+ yam_enable_dry(YAMSTATE, 1);
+ yam_enable_dsp(YAMSTATE, 1);
+ yam_enable_dsp_dynarec(YAMSTATE, 0);
+}
+
+
+/*void scsp_set_ram_base(device_t *device, void *base)
+{
+	scsp_state *scsp = get_safe_token(device);
+	if (scsp)
+	{
+		scsp->SCSPRAM = (unsigned char *)base;
+		scsp->DSP.SCSPRAM = (UINT16 *)base;
+		scsp->SCSPRAM_LENGTH = 0x80000;
+		scsp->DSP.SCSPRAM_LENGTH = 0x80000/2;
+	}
+}*/
+
+
+//READ16_DEVICE_HANDLER( scsp_r )
+UINT16 scsp_r(void *info, offs_t offset)
+{
+	return yam_scsp_load_reg(YAMSTATE, offset*2, 0xFFFF);
+}
+
+//WRITE16_DEVICE_HANDLER( scsp_w )
+void scsp_w(void *info, offs_t offset, UINT8 data)
+{
+	UINT8 tmp8;
+	UINT16 tmp;
+
+	tmp = yam_scsp_load_reg(YAMSTATE, offset & 0xFFFE, 0xFFFF);
+	//COMBINE_DATA(&tmp);
+	if (offset & 1)
+		tmp = (tmp & 0xFF00) | (data << 0);
+	else
+		tmp = (tmp & 0x00FF) | (data << 8);
+	yam_scsp_store_reg(YAMSTATE, offset & 0xFFFE, tmp, 0xFFFF, &tmp8);
+}
+
+/*WRITE16_DEVICE_HANDLER( scsp_midi_in )
+{
+	scsp_state *scsp = get_safe_token(device);
+
+// printf("scsp_midi_in: %02x\n", data);
+
+	scsp->MidiStackscsp->MidiW++=data;
+	scsp->MidiW &= 31;
+
+	//CheckPendingIRQ(scsp);
+}
+
+READ16_DEVICE_HANDLER( scsp_midi_out_r )
+{
+	scsp_state *scsp = get_safe_token(device);
+	unsigned char val;
+
+	val=scsp->MidiStackscsp->MidiR++;
+	scsp->MidiR&=31;
+	return val;
+}*/
+
+
+/*void scsp_write_rom(UINT8 ChipID, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					const UINT8* ROMData)
+{
+	scsp_state *scsp = &SCSPDataChipID;
+	
+	if (scsp->SCSPRAM_LENGTH != ROMSize)
+	{
+		scsp->SCSPRAM = (unsigned char*)realloc(scsp->SCSPRAM, ROMSize);
+		scsp->SCSPRAM_LENGTH = ROMSize;
+		scsp->DSP.SCSPRAM = (UINT16*)scsp->SCSPRAM;
+		scsp->DSP.SCSPRAM_LENGTH = scsp->SCSPRAM_LENGTH / 2;
+		memset(scsp->SCSPRAM, 0x00, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(scsp->SCSPRAM + DataStart, ROMData, DataLength);
+	
+	return;
+}*/
+
+void scsp_write_ram(void *info, offs_t DataStart, offs_t DataLength, const UINT8* RAMData)
+{
+	if (DataStart >= SCSPRAM_LENGTH)
+		return;
+	if (DataStart + DataLength > SCSPRAM_LENGTH)
+		DataLength = SCSPRAM_LENGTH - DataStart;
+	
+	memcpy(SCSPRAM + DataStart, RAMData, DataLength);
+	
+	return;
+}
+
+
+void scsp_set_mute_mask(void *info, UINT32 MuteMask)
+{
+	int CurChn;
+	for (CurChn = 0; CurChn < 32; CurChn ++)
+		yam_set_mute(YAMSTATE, CurChn, (MuteMask >> CurChn) & 0x01);
+}
+
+/*UINT8 scsp_get_channels(void *_info, UINT32* ChannelMask)
+{
+	scsp_state *scsp = (scsp_state *)_info;
+	UINT8 CurChn;
+	UINT8 UsedChns;
+	UINT32 ChnMask;
+	
+	ChnMask = 0x00000000;
+	UsedChns = 0x00;
+	for (CurChn = 0; CurChn < 32; CurChn ++)
+	{
+		if (scsp->SlotsCurChn.active)
+		{
+			ChnMask |= (1 << CurChn);
+			UsedChns ++;
+		}
+	}
+	if (ChannelMask != NULL)
+		*ChannelMask = ChnMask;
+	
+	return UsedChns;
+}*/
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( scsp )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(scsp_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( scsp );		break;
+		case DEVINFO_FCT_STOP:							// Nothing //								break;
+		case DEVINFO_FCT_RESET:							// Nothing //								break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "SCSP");					break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Sega/Yamaha custom");		break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "2.1.1");					break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);					break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+
+
+//DEFINE_LEGACY_SOUND_DEVICE(SCSP, scsp);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/scsp.h Added

@@ -0,0 +1,47 @@
+/*
+    SCSP (YMF292-F) header
+*/
+
+#pragma once
+
+#ifndef __SCSP_H__
+#define __SCSP_H__
+
+//#include "devlegcy.h"
+
+/*typedef struct _scsp_interface scsp_interface;
+struct _scsp_interface
+{
+	int roffset;				// offset in the region 
+	void (*irq_callback)(device_t *device, int state);	// irq callback
+	devcb_write_line   main_irq;
+};
+
+void scsp_set_ram_base(device_t *device, void *base);*/
+
+
+void SCSP_Update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_scsp(void **chip, int clock, int options);
+void device_stop_scsp(void *chip);
+void device_reset_scsp(void *chip);
+
+// SCSP register access
+/*READ16_DEVICE_HANDLER( scsp_r );
+WRITE16_DEVICE_HANDLER( scsp_w );*/
+void scsp_w(void *chip, offs_t offset, UINT8 data);
+//UINT8 scsp_r(void *chip, offs_t offset);
+
+// MIDI I/O access (used for comms on Model 2/3)
+/*WRITE16_DEVICE_HANDLER( scsp_midi_in );
+READ16_DEVICE_HANDLER( scsp_midi_out_r );*/
+
+//void scsp_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+//					const UINT8* ROMData);
+void scsp_write_ram(void *chip, offs_t DataStart, offs_t DataLength, const UINT8* RAMData);
+void scsp_set_mute_mask(void *chip, UINT32 MuteMask);
+
+/*extern UINT32* stv_scu;
+
+DECLARE_LEGACY_SOUND_DEVICE(SCSP, scsp);*/
+
+#endif /* __SCSP_H__ */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.c Added

@@ -0,0 +1,409 @@
+/*********************************************************/
+/* SEGA 16ch 8bit PCM */
+/*********************************************************/
+
+#include "mamedef.h"
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "segapcm.h"
+
+
+typedef struct _segapcm_state segapcm_state;
+struct _segapcm_state
+{
+	UINT8 *ram;
+	UINT8 low16;
+	UINT32 ROMSize;
+	UINT8 *rom;
+#ifdef _DEBUG
+	UINT8 *romusage;
+#endif
+	int bankshift;
+	int bankmask;
+	int rgnmask;
+	sega_pcm_interface intf;
+	UINT8 Muted16;
+	//sound_stream * stream;
+};
+
+#ifndef _DEBUG
+//UINT8 SegaPCM_NewCore = 0x00;
+#else
+//UINT8 SegaPCM_NewCore = 0x01;
+static void sega_pcm_fwrite_romusage(void *_info);
+#endif
+
+/*INLINE segapcm_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_SEGAPCM);
+	return (segapcm_state *)device->token;
+}*/
+
+//static STREAM_UPDATE( SEGAPCM_update )
+void SEGAPCM_update(void *info, stream_sample_t **outputs, int samples)
+{
+	//segapcm_state *spcm = (segapcm_state *)param;
+	segapcm_state *spcm = (segapcm_state *)info;
+	int rgnmask = spcm->rgnmask;
+	int ch;
+
+	/* clear the buffers */
+	memset(outputs0, 0, samples*sizeof(stream_sample_t));
+	memset(outputs1, 0, samples*sizeof(stream_sample_t));
+
+	// reg function
+	// ------------------------------------------------
+	// 0x00 ?
+	// 0x01 ?
+	// 0x02 volume left
+	// 0x03 volume right
+	// 0x04 loop address (08-15)
+	// 0x05 loop address (16-23)
+	// 0x06 end address
+	// 0x07 address delta
+	// 0x80 ?
+	// 0x81 ?
+	// 0x82 ?
+	// 0x83 ?
+	// 0x84 current address (08-15), 00-07 is internal?
+	// 0x85 current address (16-23)
+	// 0x86 bit 0: channel disable?
+	// bit 1: loop disable
+	// other bits: bank
+	// 0x87 ?
+
+	/* loop over channels */
+	for (ch = 0; ch < 16; ch++)
+	{
+#if 0
+//if (! SegaPCM_NewCore)
+//{
+		/* only process active channels */
+		if (!(spcm->ram0x86+8*ch & 1) && ! spcm->Mutedch)
+		{
+			UINT8 *base = spcm->ram+8*ch;
+			UINT8 flags = base0x86;
+			const UINT8 *rom = spcm->rom + ((flags & spcm->bankmask) << spcm->bankshift);
+#ifdef _DEBUG
+			UINT8 *romusage = spcm->romusage + ((flags & spcm->bankmask) << spcm->bankshift);
+#endif
+			UINT32 addr = (base5 << 16) | (base4 << 8) | spcm->lowch;
+			UINT16 loop = (base0x85 << 8) | base0x84;
+			UINT8 end = base6 + 1;
+			UINT8 delta = base7;
+			UINT8 voll = base2 & 0x7F;
+			UINT8 volr = base3 & 0x7F;
+			int i;
+
+			/* loop over samples on this channel */
+			for (i = 0; i < samples; i++)
+			{
+				INT8 v = 0;
+
+				/* handle looping if we've hit the end */
+				if ((addr >> 16) == end)
+				{
+					if (!(flags & 2))
+						addr = loop << 8;
+					else
+					{
+						flags |= 1;
+						break;
+					}
+				}
+
+				/* fetch the sample */
+				v = rom(addr >> 8) & rgnmask - 0x80;
+#ifdef _DEBUG
+				if ((romusage(addr >> 8) & rgnmask & 0x03) == 0x02 && (voll || volr))
+					printf("Access to empty ROM section! (0x%06lX)\n",
+							((flags & spcm->bankmask) << spcm->bankshift) + (addr >> 8) & rgnmask);
+				romusage(addr >> 8) & rgnmask |= 0x01;
+#endif
+
+				/* apply panning and advance */
+				outputs0i += v * voll;
+				outputs1i += v * volr;
+				addr += delta;
+			}
+
+			/* store back the updated address and info */
+			base0x86 = flags;
+			base4 = addr >> 8;
+			base5 = addr >> 16;
+			spcm->lowch = flags & 1 ? 0 : addr;
+		}
+//}
+//else
+//{
+#else
+		UINT8 *regs = spcm->ram+8*ch;
+
+		/* only process active channels */
+		if (!(regs0x86 & 1) && ! spcm->Mutedch)
+		{
+			const UINT8 *rom = spcm->rom + ((regs0x86 & spcm->bankmask) << spcm->bankshift);
+#ifdef _DEBUG
+			UINT8 *romusage = spcm->romusage + ((regs0x86 & spcm->bankmask) << spcm->bankshift);
+#endif
+			UINT32 addr = (regs0x85 << 16) | (regs0x84 << 8) | spcm->lowch;
+			UINT32 loop = (regs0x05 << 16) | (regs0x04 << 8);
+			UINT8 end = regs6 + 1;
+			int i;
+
+			/* loop over samples on this channel */
+			for (i = 0; i < samples; i++)
+			{
+				INT8 v = 0;
+
+				/* handle looping if we've hit the end */
+				if ((addr >> 16) == end)
+				{
+					if (regs0x86 & 2)
+					{
+						regs0x86 |= 1;
+						break;
+					}
+					else addr = loop;
+				}
+
+				/* fetch the sample */
+				v = rom(addr >> 8) & rgnmask - 0x80;
+#ifdef _DEBUG
+				if ((romusage(addr >> 8) & rgnmask & 0x03) == 0x02 && (regs2 || regs3))
+					printf("Access to empty ROM section! (0x%06lX)\n",
+							((regs0x86 & spcm->bankmask) << spcm->bankshift) + (addr >> 8) & rgnmask);
+				romusage(addr >> 8) & rgnmask |= 0x01;
+#endif
+
+				/* apply panning and advance */
+				// fixed Bitmask for volume multiplication, thanks to ctr -Valley Bell
+				outputs0i += v * (regs2 & 0x7F);
+				outputs1i += v * (regs3 & 0x7F);
+				addr = (addr + regs7) & 0xffffff;
+			}
+
+			/* store back the updated address */
+			regs0x84 = addr >> 8;
+			regs0x85 = addr >> 16;
+			spcm->lowch = regs0x86 & 1 ? 0 : addr;
+		}
+//}
+#endif
+	}
+}
+
+//static DEVICE_START( segapcm )
+int device_start_segapcm(void **_info, int clock, int intf_bank)
+{
+	const UINT32 STD_ROM_SIZE = 0x80000;
+	//const sega_pcm_interface *intf = (const sega_pcm_interface *)device->static_config;
+	sega_pcm_interface *intf;
+	int mask, rom_mask, len;
+	//segapcm_state *spcm = get_safe_token(device);
+	segapcm_state *spcm;
+
+	spcm = (segapcm_state *) calloc(1, sizeof(segapcm_state));
+	*_info = (void *) spcm;
+	
+	intf = &spcm->intf;
+	intf->bank = intf_bank;
+	
+	//spcm->rom = (const UINT8 *)device->region;
+	//spcm->ram = auto_alloc_array(device->machine, UINT8, 0x800);
+	spcm->ROMSize = STD_ROM_SIZE;
+	spcm->rom = malloc(STD_ROM_SIZE);
+#ifdef _DEBUG
+	spcm->romusage = malloc(STD_ROM_SIZE);
+#endif
+	spcm->ram = (UINT8*)malloc(0x800);
+	
+#ifndef _DEBUG
+	//memset(spcm->rom, 0xFF, STD_ROM_SIZE);
+	// filling 0xFF would actually be more true to the hardware,
+	// (unused ROMs have all FFs)
+	// but 0x80 is the effective 'zero' byte
+	memset(spcm->rom, 0x80, STD_ROM_SIZE);
+#else
+	// filling with FF makes it easier to find bugs in a .wav-log
+	memset(spcm->rom, 0xFF, STD_ROM_SIZE);
+	memset(spcm->romusage, 0x02, STD_ROM_SIZE);
+#endif
+	//memset(spcm->ram, 0xff, 0x800);	// RAM Clear is done at device_reset
+
+	spcm->bankshift = (UINT8)(intf->bank);
+	mask = intf->bank >> 16;
+	if(!mask)
+		mask = BANK_MASK7>>16;
+
+	len = STD_ROM_SIZE;
+	spcm->rgnmask = len - 1;
+	for(rom_mask = 1; rom_mask < len; rom_mask *= 2);
+	rom_mask--;
+
+	spcm->bankmask = mask & (rom_mask >> spcm->bankshift);
+
+	//spcm->stream = stream_create(device, 0, 2, device->clock / 128, spcm, SEGAPCM_update);
+
+	//state_save_register_device_item_array(device, 0, spcm->low);
+	//state_save_register_device_item_pointer(device, 0, spcm->ram, 0x800);
+	
+	for (mask = 0; mask < 16; mask ++)
+		spcm->Mutedmask = 0x00;
+
+	return clock / 128;
+}
+
+//static DEVICE_STOP( segapcm )
+void device_stop_segapcm(void *_info)
+{
+	//segapcm_state *spcm = get_safe_token(device);
+	segapcm_state *spcm = (segapcm_state *)_info;
+	free(spcm->rom);	spcm->rom = NULL;
+#ifdef _DEBUG
+	//sega_pcm_fwrite_romusage(ChipID);
+	free(spcm->romusage);
+#endif
+	free(spcm->ram);
+
+	free(spcm);
+	
+	return;
+}
+
+//static DEVICE_RESET( segapcm )
+void device_reset_segapcm(void *_info)
+{
+	//segapcm_state *spcm = get_safe_token(device);
+	segapcm_state *spcm = (segapcm_state *)_info;
+	
+	memset(spcm->ram, 0xFF, 0x800);
+	
+	return;
+}
+
+
+//WRITE8_DEVICE_HANDLER( sega_pcm_w )
+void sega_pcm_w(void *_info, offs_t offset, UINT8 data)
+{
+	//segapcm_state *spcm = get_safe_token(device);
+	segapcm_state *spcm = (segapcm_state *)_info;
+	//stream_update(spcm->stream);
+
+	spcm->ramoffset & 0x07ff = data;
+}
+
+//READ8_DEVICE_HANDLER( sega_pcm_r )
+UINT8 sega_pcm_r(void *_info, offs_t offset)
+{
+	//segapcm_state *spcm = get_safe_token(device);
+	segapcm_state *spcm = (segapcm_state *)_info;
+	//stream_update(spcm->stream);
+	return spcm->ramoffset & 0x07ff;
+}
+
+void sega_pcm_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+						const UINT8* ROMData)
+{
+	segapcm_state *spcm = (segapcm_state *)_info;
+	
+	if (spcm->ROMSize != ROMSize)
+	{
+		unsigned long int mask, rom_mask;
+		
+		spcm->rom = (UINT8*)realloc(spcm->rom, ROMSize);
+#ifdef _DEBUG
+		spcm->romusage = (UINT8*)realloc(spcm->romusage, ROMSize);
+#endif
+		spcm->ROMSize = ROMSize;
+		memset(spcm->rom, 0x80, ROMSize);
+#ifdef _DEBUG
+		memset(spcm->romusage, 0x02, ROMSize);
+#endif
+		
+		// recalculate bankmask
+		mask = spcm->intf.bank >> 16;
+		if (! mask)
+			mask = BANK_MASK7 >> 16;
+		
+		//spcm->rgnmask = ROMSize - 1;
+		for (rom_mask = 1; rom_mask < ROMSize; rom_mask *= 2);
+		rom_mask --;
+		spcm->rgnmask = rom_mask;	// fix for ROMs with e.g 0x60000 bytes (stupid M1)
+		
+		spcm->bankmask = mask & (rom_mask >> spcm->bankshift);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(spcm->rom + DataStart, ROMData, DataLength);
+#ifdef _DEBUG
+	memset(spcm->romusage + DataStart, 0x00, DataLength);
+#endif
+	
+	return;
+}
+
+
+#ifdef _DEBUG
+static void sega_pcm_fwrite_romusage(void *_info)
+{
+	segapcm_state *spcm = (segapcm_state *)_info;
+	
+	FILE* hFile;
+	
+	hFile = fopen("SPCM_ROMUsage.bin", "wb");
+	if (hFile == NULL)
+		return;
+	
+	fwrite(spcm->romusage, 0x01, spcm->ROMSize, hFile);
+	
+	fclose(hFile);
+	return;
+}
+#endif
+
+void segapcm_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	segapcm_state *spcm = (segapcm_state *)_info;
+	unsigned char CurChn;
+	
+	for (CurChn = 0; CurChn < 16; CurChn ++)
+		spcm->MutedCurChn = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( segapcm )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(segapcm_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( segapcm );		break;
+		case DEVINFO_FCT_STOP:							// Nothing									break;
+		case DEVINFO_FCT_RESET:							// Nothing									break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "Sega PCM");					break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Sega custom");					break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/segapcm.h Added

@@ -0,0 +1,38 @@
+/*********************************************************/
+/* SEGA 8bit PCM */
+/*********************************************************/
+
+#pragma once
+
+#define BANK_256 (11)
+#define BANK_512 (12)
+#define BANK_12M (13)
+#define BANK_MASK7 (0x70<<16)
+#define BANK_MASKF (0xf0<<16)
+#define BANK_MASKF8 (0xf8<<16)
+
+typedef struct _sega_pcm_interface sega_pcm_interface;
+struct _sega_pcm_interface
+{
+	int bank;
+};
+
+/*WRITE8_DEVICE_HANDLER( sega_pcm_w );
+READ8_DEVICE_HANDLER( sega_pcm_r );
+
+DEVICE_GET_INFO( segapcm );
+#define SOUND_SEGAPCM DEVICE_GET_INFO_NAME( segapcm )*/
+
+void SEGAPCM_update(void *chip, stream_sample_t **outputs, int samples);
+
+int device_start_segapcm(void **chip, int clock, int intf_bank);
+void device_stop_segapcm(void *chip);
+void device_reset_segapcm(void *chip);
+
+void sega_pcm_w(void *chip, offs_t offset, UINT8 data);
+UINT8 sega_pcm_r(void *chip, offs_t offset);
+void sega_pcm_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+						const UINT8* ROMData);
+
+void segapcm_set_mute_mask(void *chip, UINT32 MuteMask);
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.c Added

@@ -0,0 +1,404 @@
+/* 
+	SN76489 emulation
+	by Maxim in 2001 and 2002
+	converted from my original Delphi implementation
+
+	I'm a C newbie so I'm sure there are loads of stupid things
+	in here which I'll come back to some day and redo
+
+	Includes:
+	- Super-high quality tone channel "oversampling" by calculating fractional positions on transitions
+	- Noise output pattern reverse engineered from actual SMS output
+	- Volume levels taken from actual SMS output
+
+	07/08/04 Charles MacDonald
+	Modified for use with SMS Plus:
+	- Added support for multiple PSG chips.
+	- Added reset/config/update routines.
+	- Added context management routines.
+	- Removed SN76489_GetValues().
+	- Removed some unused variables.
+*/
+
+#include <stdlib.h> // malloc/free
+#include <float.h> // for FLT_MIN
+#include <string.h> // for memcpy
+#include "mamedef.h"
+#include "sn76489.h"
+#include "panning.h"
+
+#define NoiseInitialState 0x8000 /* Initial state of shift register */
+#define PSG_CUTOFF 0x6 /* Value below which PSG does not output */
+
+static const int PSGVolumeValues16 = {
+	/* These values are taken from a real SMS2's output */
+/*	{892,892,892,760,623,497,404,323,257,198,159,123,96,75,60,0},*/ /* I can't remember why 892... :P some scaling I did at some point */
+	/* these values are true volumes for 2dB drops at each step (multiply previous by 10^-0.1) */
+	/*1516,1205,957,760,603,479,381,303,240,191,152,120,96,76,60,0*/
+// The MAME core uses 0x2000 as maximum volume (0x1000 for bipolar output)
+	4096, 3254, 2584, 2053, 1631, 1295, 1029, 817, 649, 516, 410, 325, 258, 205, 163, 0
+};
+
+/*static SN76489_Context SN76489MAX_SN76489;*/
+static SN76489_Context* LastChipInit = NULL;
+//static unsigned short int FNumLimit;
+
+
+SN76489_Context* SN76489_Init( int PSGClockValue, int SamplingRate)
+{
+	int i;
+	SN76489_Context* chip = (SN76489_Context*)malloc(sizeof(SN76489_Context));
+	if(chip)
+	{
+		chip->dClock=(float)(PSGClockValue & 0x7FFFFFF)/16/SamplingRate;
+		
+		SN76489_SetMute(chip, MUTE_ALLON);
+		SN76489_Config(chip, /*MUTE_ALLON,*/ FB_SEGAVDP, SRW_SEGAVDP, 1);
+		
+		for( i = 0; i <= 3; i++ )
+			centre_panning(chip->panningi);
+		//SN76489_Reset(chip);
+		
+		if ((PSGClockValue & 0x80000000) && LastChipInit != NULL)
+		{
+			// Activate special NeoGeoPocket Mode
+			LastChipInit->NgpFlags = 0x80 | 0x00;
+			chip->NgpFlags = 0x80 | 0x01;
+			chip->NgpChip2 = LastChipInit;
+			LastChipInit->NgpChip2 = chip;
+			LastChipInit = NULL;
+		}
+		else
+		{
+			chip->NgpFlags = 0x00;
+			chip->NgpChip2 = NULL;
+			LastChipInit = chip;
+		}
+	}
+	return chip;
+}
+
+void SN76489_Reset(SN76489_Context* chip)
+{
+	int i;
+
+	chip->PSGStereo = 0xFF;
+
+	for( i = 0; i <= 3; i++ )
+	{
+		/* Initialise PSG state */
+		chip->Registers2*i = 1;		 /* tone freq=1 */
+		chip->Registers2*i+1 = 0xf;	 /* vol=off */
+		chip->NoiseFreq = 0x10;
+
+		/* Set counters to 0 */
+		chip->ToneFreqValsi = 0;
+
+		/* Set flip-flops to 1 */
+		chip->ToneFreqPosi = 1;
+
+		/* Set intermediate positions to do-not-use value */
+		chip->IntermediatePosi = FLT_MIN;
+
+		/* Set panning to centre */
+		//centre_panning( chip->panningi );
+	}
+
+	chip->LatchedRegister = 0;
+
+	/* Initialise noise generator */
+	chip->NoiseShiftRegister = NoiseInitialState;
+
+	/* Zero clock */
+	chip->Clock = 0;
+}
+
+void SN76489_Shutdown(SN76489_Context* chip)
+{
+	free(chip);
+}
+
+void SN76489_Config(SN76489_Context* chip, /*int mute,*/ int feedback, int sr_width, int boost_noise)
+{
+	//chip->Mute = mute;
+	chip->WhiteNoiseFeedback = feedback;
+	chip->SRWidth = sr_width;
+}
+
+/*
+void SN76489_SetContext(int which, uint8 *data)
+{
+	memcpy( &SN76489which, data, sizeof(SN76489_Context) );
+}
+
+void SN76489_GetContext(int which, uint8 *data)
+{
+	memcpy( data, &SN76489which, sizeof(SN76489_Context) );
+}
+
+uint8 *SN76489_GetContextPtr(int which)
+{
+	return (uint8 *)&SN76489which;
+}
+
+int SN76489_GetContextSize(void)
+{
+	return sizeof(SN76489_Context);
+}
+*/
+void SN76489_Write(SN76489_Context* chip, int data)
+{
+	if ( data & 0x80 )
+	{
+		/* Latch/data byte %1 cc t dddd */
+		chip->LatchedRegister = ( data >> 4 ) & 0x07;
+		chip->Registerschip->LatchedRegister =
+			( chip->Registerschip->LatchedRegister & 0x3f0 ) /* zero low 4 bits */
+			| ( data & 0xf ); /* and replace with data */
+	} else {
+		/* Data byte %0 - dddddd */
+		if ( !( chip->LatchedRegister % 2 ) && ( chip->LatchedRegister < 5 ) )
+			/* Tone register */
+			chip->Registerschip->LatchedRegister =
+				( chip->Registerschip->LatchedRegister & 0x00f) /* zero high 6 bits */
+				| ( ( data & 0x3f ) << 4 ); /* and replace with data */
+		else
+			/* Other register */
+			chip->Registerschip->LatchedRegister=data&0x0f; /* Replace with data */
+	}
+	switch (chip->LatchedRegister) {
+	case 0:
+	case 2:
+	case 4: /* Tone channels */
+		if ( chip->Registerschip->LatchedRegister == 0 )
+			chip->Registerschip->LatchedRegister = 1; /* Zero frequency changed to 1 to avoid div/0 */
+		break;
+	case 6: /* Noise */
+		chip->NoiseShiftRegister = NoiseInitialState; /* reset shift register */
+		chip->NoiseFreq = 0x10 << ( chip->Registers6 & 0x3 ); /* set noise signal generator frequency */
+		break;
+	}
+}
+
+void SN76489_GGStereoWrite(SN76489_Context* chip, int data)
+{
+	chip->PSGStereo=data;
+}
+
+//void SN76489_Update(SN76489_Context* chip, INT16 **buffer, int length)
+void SN76489_Update(SN76489_Context* chip, INT32 **buffer, int length)
+{
+	int i, j;
+	int NGPMode;
+	SN76489_Context* chip2;
+	SN76489_Context* chip_t;
+	SN76489_Context* chip_n;
+
+	NGPMode = (chip->NgpFlags >> 7) & 0x01;
+	if (NGPMode)
+		chip2 = (SN76489_Context*)chip->NgpChip2;
+	
+	if (! NGPMode)
+	{
+		chip_t = chip_n = chip;
+	}
+	else
+	{
+		if (! (chip->NgpFlags & 0x01))
+		{
+			chip_t = chip;
+			chip_n = chip2;
+		}
+		else
+		{
+			chip_t = chip2;
+			chip_n = chip;
+		}
+	}
+	
+	for( j = 0; j < length; j++ )
+	{
+		/* Tone channels */
+		for ( i = 0; i <= 2; ++i )
+			if ( (chip_t->Mute >> i) & 1 )
+			{
+				if ( chip_t->IntermediatePosi != FLT_MIN )
+					/* Intermediate position (antialiasing) */
+					chip->Channelsi = (short)( PSGVolumeValueschip->Registers2 * i + 1 * chip_t->IntermediatePosi );
+				else
+					/* Flat (no antialiasing needed) */
+					chip->Channelsi= PSGVolumeValueschip->Registers2 * i + 1 * chip_t->ToneFreqPosi;
+			}
+			else
+				/* Muted channel */
+				chip->Channelsi = 0;
+
+		/* Noise channel */
+		if ( (chip_t->Mute >> 3) & 1 )
+		{
+			//chip->Channels3 = PSGVolumeValueschip->Registers7 * ( chip_n->NoiseShiftRegister & 0x1 ) * 2; /* double noise volume */
+			// Now the noise is bipolar, too. -Valley Bell
+			chip->Channels3 = PSGVolumeValueschip->Registers7 * (( chip_n->NoiseShiftRegister & 0x1 ) * 2 - 1);
+			// due to the way the white noise works here, it seems twice as loud as it should be
+			if (chip->Registers6 & 0x4 )
+				chip->Channels3 >>= 1;
+		}
+		else
+			chip->Channelsi = 0;
+
+		// Build stereo result into buffer
+		buffer0j = 0;
+		buffer1j = 0;
+		if (! chip->NgpFlags)
+		{
+			// For all 4 channels
+			for ( i = 0; i <= 3; ++i )
+			{
+				if ( ( ( chip->PSGStereo >> i ) & 0x11 ) == 0x11 )
+				{
+					// no GG stereo for this channel
+					if ( chip->panningi0 == 1.0f )
+					{
+						buffer0j += chip->Channelsi; // left
+						buffer1j += chip->Channelsi; // right
+					}
+					else
+					{
+						buffer0j += (INT32)( chip->panningi0 * chip->Channelsi ); // left
+						buffer1j += (INT32)( chip->panningi1 * chip->Channelsi ); // right
+					}
+				}
+				else
+				{
+					// GG stereo overrides panning
+					buffer0j += ( chip->PSGStereo >> (i+4) & 0x1 ) * chip->Channelsi; // left
+					buffer1j += ( chip->PSGStereo >> i & 0x1 ) * chip->Channelsi; // right
+				}
+			}
+		}
+		else
+		{
+			if (! (chip->NgpFlags & 0x01))
+			{
+				// For all 3 tone channels
+				for (i = 0; i < 3; i ++)
+				{
+					buffer0j += (chip->PSGStereo >> (i+4) & 0x1 ) * chip ->Channelsi; // left
+					buffer1j += (chip->PSGStereo >> i & 0x1 ) * chip2->Channelsi; // right
+				}
+			}
+			else
+			{
+				// noise channel
+				i = 3;
+				buffer0j += (chip->PSGStereo >> (i+4) & 0x1 ) * chip2->Channelsi; // left
+				buffer1j += (chip->PSGStereo >> i & 0x1 ) * chip ->Channelsi; // right
+			}
+		}
+
+		/* Increment clock by 1 sample length */
+		chip->Clock += chip->dClock;
+		chip->NumClocksForSample = (int)chip->Clock; /* truncate */
+		chip->Clock -= chip->NumClocksForSample; /* remove integer part */
+	
+		/* Decrement tone channel counters */
+		for ( i = 0; i <= 2; ++i )
+			chip->ToneFreqValsi -= chip->NumClocksForSample;
+	 
+		/* Noise channel: match to tone2 or decrement its counter */
+		if ( chip->NoiseFreq == 0x80 )
+			chip->ToneFreqVals3 = chip->ToneFreqVals2;
+		else
+			chip->ToneFreqVals3 -= chip->NumClocksForSample;
+	
+		/* Tone channels: */
+		for ( i = 0; i <= 2; ++i ) {
+			if ( chip->ToneFreqValsi <= 0 ) { /* If the counter gets below 0... */
+				if (chip->Registersi*2>=PSG_CUTOFF) {
+					/* For tone-generating values, calculate how much of the sample is + and how much is - */
+					/* This is optimised into an even more confusing state than it was in the first place... */
+					chip->IntermediatePosi = ( chip->NumClocksForSample - chip->Clock + 2 * chip->ToneFreqValsi ) * chip->ToneFreqPosi / ( chip->NumClocksForSample + chip->Clock );
+					/* Flip the flip-flop */
+					chip->ToneFreqPosi = -chip->ToneFreqPosi;
+				} else {
+					/* stuck value */
+					chip->ToneFreqPosi = 1;
+					chip->IntermediatePosi = FLT_MIN;
+				}
+				chip->ToneFreqValsi += chip->Registersi*2 * ( chip->NumClocksForSample / chip->Registersi*2 + 1 );
+			}
+			else
+				/* signal no antialiasing needed */
+				chip->IntermediatePosi = FLT_MIN;
+		}
+	
+		/* Noise channel */
+		if ( chip->ToneFreqVals3 <= 0 ) {
+			/* If the counter gets below 0... */
+			/* Flip the flip-flop */
+			chip->ToneFreqPos3 = -chip->ToneFreqPos3;
+			if (chip->NoiseFreq != 0x80)
+				/* If not matching tone2, decrement counter */
+				chip->ToneFreqVals3 += chip->NoiseFreq * ( chip->NumClocksForSample / chip->NoiseFreq + 1 );
+			if (chip->ToneFreqPos3 == 1) {
+				/* On the positive edge of the square wave (only once per cycle) */
+				int Feedback;
+				if ( chip->Registers6 & 0x4 ) {
+					/* White noise */
+					/* Calculate parity of fed-back bits for feedback */
+					switch (chip->WhiteNoiseFeedback) {
+						/* Do some optimised calculations for common (known) feedback values */
+					case 0x0003: /* SC-3000, BBC %00000011 */
+					case 0x0009: /* SMS, GG, MD %00001001 */
+						/* If two bits fed back, I can do Feedback=(nsr & fb) && (nsr & fb ^ fb) */
+						/* since that's (one or more bits set) && (not all bits set) */
+						Feedback = ( ( chip->NoiseShiftRegister & chip->WhiteNoiseFeedback )
+							&& ( (chip->NoiseShiftRegister & chip->WhiteNoiseFeedback ) ^ chip->WhiteNoiseFeedback ) );
+						break;
+					default:
+						/* Default handler for all other feedback values */
+						/* XOR fold bits into the final bit */
+						Feedback = chip->NoiseShiftRegister & chip->WhiteNoiseFeedback;
+						Feedback ^= Feedback >> 8;
+						Feedback ^= Feedback >> 4;
+						Feedback ^= Feedback >> 2;
+						Feedback ^= Feedback >> 1;
+						Feedback &= 1;
+						break;
+					}
+				} else	 /* Periodic noise */
+					Feedback=chip->NoiseShiftRegister&1;
+
+				chip->NoiseShiftRegister=(chip->NoiseShiftRegister>>1) | (Feedback << (chip->SRWidth-1));
+			}
+		}
+	}
+}
+
+/*void SN76489_UpdateOne(SN76489_Context* chip, int *l, int *r)
+{
+ INT16 tl,tr;
+ INT16 *buff2 = { &tl, &tr };
+ SN76489_Update( chip, buff, 1 );
+ *l = tl;
+ *r = tr;
+}*/
+
+
+/*int SN76489_GetMute(SN76489_Context* chip)
+{
+ return chip->Mute;
+}*/
+
+void SN76489_SetMute(SN76489_Context* chip, int val)
+{
+ chip->Mute=val;
+}
+
+void SN76489_SetPanning(SN76489_Context* chip, int ch0, int ch1, int ch2, int ch3)
+{
+	calc_panning( chip->panning0, ch0 );
+	calc_panning( chip->panning1, ch1 );
+	calc_panning( chip->panning2, ch2 );
+	calc_panning( chip->panning3, ch3 );
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76489.h Added

@@ -0,0 +1,108 @@
+#ifndef _SN76489_H_
+#define _SN76489_H_
+
+// all these defines are defined in mamedef.h, but GCC's #ifdef doesn't seem to know typedefs
+/*#ifndef INT32
+#define INT32 signed long
+#endif
+#ifndef UINT16
+#define UINT16 unsigned short
+#endif
+#ifndef INT16
+#define INT16 signed short
+#endif
+#ifndef INT8
+#define INT8 signed char
+#endif*/
+#ifndef uint8
+#define uint8 signed char
+#endif
+
+
+/*#define MAX_SN76489     4*/
+
+/*
+    More testing is needed to find and confirm feedback patterns for
+    SN76489 variants and compatible chips.
+*/
+enum feedback_patterns {
+    FB_BBCMICRO =   0x8005, /* Texas Instruments TMS SN76489N (original) from BBC Micro computer */
+    FB_SC3000   =   0x0006, /* Texas Instruments TMS SN76489AN (rev. A) from SC-3000H computer */
+    FB_SEGAVDP  =   0x0009, /* SN76489 clone in Sega's VDP chips (315-5124, 315-5246, 315-5313, Game Gear) */
+};
+
+enum sr_widths {
+  SRW_SC3000BBCMICRO  = 15,
+  SRW_SEGAVDP = 16
+};
+
+enum volume_modes {
+    VOL_TRUNC   =   0,      /* Volume levels 13-15 are identical */
+    VOL_FULL    =   1,      /* Volume levels 13-15 are unique */
+};
+
+enum mute_values {
+    MUTE_ALLOFF =   0,      /* All channels muted */
+    MUTE_TONE1  =   1,      /* Tone 1 mute control */
+    MUTE_TONE2  =   2,      /* Tone 2 mute control */
+    MUTE_TONE3  =   4,      /* Tone 3 mute control */
+    MUTE_NOISE  =   8,      /* Noise mute control */
+    MUTE_ALLON  =   15,     /* All channels enabled */
+};
+
+typedef struct
+{
+    int Mute; // per-channel muting
+    int BoostNoise; // double noise volume when non-zero
+    
+    /* Variables */
+    float Clock;
+    float dClock;
+    int PSGStereo;
+    int NumClocksForSample;
+    int WhiteNoiseFeedback;
+    int SRWidth;
+    
+    /* PSG registers: */
+    int Registers8;        /* Tone, vol x4 */
+    int LatchedRegister;
+    int NoiseShiftRegister;
+    int NoiseFreq;            /* Noise channel signal generator frequency */
+    
+    /* Output calculation variables */
+    int ToneFreqVals4;      /* Frequency register values (counters) */
+    int ToneFreqPos4;        /* Frequency channel flip-flops */
+    int Channels4;          /* Value of each channel, before stereo is applied */
+    float IntermediatePos4;   /* intermediate values used at boundaries between + and - (does not need double accuracy)*/
+
+    float panning42;            /* fake stereo */
+
+	int NgpFlags;		/* bit 7 - NGP Mode on/off, bit 0 - is 2nd NGP chip */
+	void* NgpChip2;
+} SN76489_Context;
+
+/* Function prototypes */
+SN76489_Context* SN76489_Init(int PSGClockValue, int SamplingRate);
+void SN76489_Reset(SN76489_Context* chip);
+void SN76489_Shutdown(SN76489_Context* chip);
+void SN76489_Config(SN76489_Context* chip, /*int mute,*/ int feedback, int sw_width, int boost_noise);
+/*
+void SN76489_SetContext(SN76489_Context* chip, uint8 *data);
+void SN76489_GetContext(SN76489_Context* chip, uint8 *data);
+uint8 *SN76489_GetContextPtr(int chip);
+int SN76489_GetContextSize(void);*/
+void SN76489_Write(SN76489_Context* chip, int data);
+void SN76489_GGStereoWrite(SN76489_Context* chip, int data);
+//void SN76489_Update(SN76489_Context* chip, INT16 **buffer, int length);
+void SN76489_Update(SN76489_Context* chip, INT32 **buffer, int length);
+
+/* Non-standard getters and setters */
+//int  SN76489_GetMute(SN76489_Context* chip);
+void SN76489_SetMute(SN76489_Context* chip, int val);
+
+void SN76489_SetPanning(SN76489_Context* chip, int ch0, int ch1, int ch2, int ch3);
+
+/* and a non-standard data getter */
+//void SN76489_UpdateOne(SN76489_Context* chip, int *l, int *r);
+
+#endif /* _SN76489_H_ */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.c Added

@@ -0,0 +1,885 @@
+/***************************************************************************
+
+ sn76496.c
+ by Nicola Salmoria
+ with contributions by others
+
+ Routines to emulate the:
+ Texas Instruments SN76489, SN76489A, SN76494/SN76496
+ ( Also known as, or at least compatible with, the TMS9919 and SN94624.)
+ and the Sega 'PSG' used on the Master System, Game Gear, and Megadrive/Genesis
+ This chip is known as the Programmable Sound Generator, or PSG, and is a 4
+ channel sound generator, with three squarewave channels and a noise/arbitrary
+ duty cycle channel.
+
+ Noise emulation for all verified chips should be accurate:
+
+ ** SN76489 uses a 15-bit shift register with taps on bits D and E, output on E,
+ XOR function.
+ It uses a 15-bit ring buffer for periodic noise/arbitrary duty cycle.
+ Its output is inverted.
+ ** SN94624 is the same as SN76489 but lacks the /8 divider on its clock input.
+ ** SN76489A uses a 15-bit shift register with taps on bits D and E, output on F,
+ XOR function.
+ It uses a 15-bit ring buffer for periodic noise/arbitrary duty cycle.
+ Its output is not inverted.
+ ** SN76494 is the same as SN76489A but lacks the /8 divider on its clock input.
+ ** SN76496 is identical in operation to the SN76489A, but the audio input is
+ documented.
+ All the TI-made PSG chips have an audio input line which is mixed with the 4 channels
+ of output. (It is undocumented and may not function properly on the sn76489, 76489a
+ and 76494; the sn76489a input is mentioned in datasheets for the tms5200)
+ All the TI-made PSG chips act as if the frequency was set to 0x400 if 0 is
+ written to the frequency register.
+ ** Sega Master System III/MD/Genesis PSG uses a 16-bit shift register with taps
+ on bits C and F, output on F
+ It uses a 16-bit ring buffer for periodic noise/arbitrary duty cycle.
+ (whether it uses an XOR or XNOR needs to be verified, assumed XOR)
+ (whether output is inverted or not needs to be verified, assumed to be inverted)
+ ** Sega Game Gear PSG is identical to the SMS3/MD/Genesis one except it has an
+ extra register for mapping which channels go to which speaker.
+ The register, connected to a z80 port, means:
+ for bits 7 6 5 4 3 2 1 0
+ L3 L2 L1 L0 R3 R2 R1 R0
+ Noise is an XOR function, and audio output is negated before being output.
+ All the Sega-made PSG chips act as if the frequency was set to 0 if 0 is written
+ to the frequency register.
+ ** NCR7496 (as used on the Tandy 1000) is similar to the SN76489 but with a
+ different noise LFSR patttern: taps on bits A and E, output on E
+ It uses a 15-bit ring buffer for periodic noise/arbitrary duty cycle.
+ (all this chip's info needs to be verified)
+
+ 28/03/2005 : Sebastien Chevalier
+ Update th SN76496Write func, according to SN76489 doc found on SMSPower.
+ - On write with 0x80 set to 0, when LastRegister is other then TONE,
+ the function is similar than update with 0x80 set to 1
+
+ 23/04/2007 : Lord Nightmare
+ Major update, implement all three different noise generation algorithms and a
+ set_variant call to discern among them.
+
+ 28/04/2009 : Lord Nightmare
+ Add READY line readback; cleaned up struct a bit. Cleaned up comments.
+ Add more TODOs. Fixed some unsaved savestate related stuff.
+
+ 04/11/2009 : Lord Nightmare
+ Changed the way that the invert works (it now selects between XOR and XNOR
+ for the taps), and added R->OldNoise to simulate the extra 0 that is always
+ output before the noise LFSR contents are after an LFSR reset.
+ This fixes SN76489/A to match chips. Added SN94624.
+
+ 14/11/2009 : Lord Nightmare
+ Removed STEP mess, vastly simplifying the code. Made output bipolar rather
+ than always above the 0 line, but disabled that code due to pending issues.
+
+ 16/11/2009 : Lord Nightmare
+ Fix screeching in regulus: When summing together four equal channels, the
+ size of the max amplitude per channel should be 1/4 of the max range, not
+ 1/3. Added NCR7496.
+
+ 18/11/2009 : Lord Nightmare
+ Modify Init functions to support negating the audio output. The gamegear
+ psg does this. Change gamegear and sega psgs to use XOR rather than XNOR
+ based on testing. Got rid of R->OldNoise and fixed taps accordingly.
+ Added stereo support for game gear.
+
+ 15/01/2010 : Lord Nightmare
+ Fix an issue with SN76489 and SN76489A having the wrong periodic noise periods.
+ Note that properly emulating the noise cycle bit timing accurately may require
+ extensive rewriting.
+
+ 24/01/2010: Lord Nightmare
+ Implement periodic noise as forcing one of the XNOR or XOR taps to 1 or 0 respectively.
+ Thanks to PlgDavid for providing samples which helped immensely here.
+ Added true clock divider emulation, so sn94624 and sn76494 run 8x faster than
+ the others, as in real life.
+
+ 15/02/2010: Lord Nightmare & Michael Zapf (additional testing by PlgDavid)
+ Fix noise period when set to mirror channel 3 and channel 3 period is set to 0 (tested on hardware for noise, wave needs tests) - MZ
+ Fix phase of noise on sn94624 and sn76489; all chips use a standard XOR, the only inversion is the output itself - LN, Plgdavid
+ Thanks to PlgDavid and Michael Zapf for providing samples which helped immensely here.
+
+ 23/02/2011: Lord Nightmare & Enik
+ Made it so the Sega PSG chips have a frequency of 0 if 0 is written to the
+ frequency register, while the others have 0x400 as before. Should fix a bug
+ or two on sega games, particularly Vigilante on Sega Master System. Verified
+ on SMS hardware.
+
+ TODO: * Implement the TMS9919 - any difference to sn94624?
+ * Implement the T6W28; has registers in a weird order, needs writes
+ to be 'sanitized' first. Also is stereo, similar to game gear.
+ * Test the NCR7496; Smspower says the whitenoise taps are A and E,
+ but this needs verification on real hardware.
+ * Factor out common code so that the SAA1099 can share some code.
+ * Convert to modern device
+***************************************************************************/
+
+/* Note: I patched the core to speed the emulation up (factor 8!!)
+	My Pentium2 233MHz was too slow for two SN76496 chips in release mode!
+	Now a 2xSN76496 vgm takes about 45 % CPU. */
+
+#include "mamedef.h"
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+//#include "emu.h"
+//#include "streams.h"
+#include <string.h>
+#include <stdlib.h>
+#include "sn76496.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+
+//#define MAX_OUTPUT 0x7fff
+#define MAX_OUTPUT 0x8000
+#define NOISEMODE (R->Register6&4)?1:0
+
+
+typedef struct _sn76496_state sn76496_state;
+struct _sn76496_state
+{
+	//sound_stream * Channel;
+	INT32 VolTable16;	/* volume table (for 4-bit to db conversion)*/
+	INT32 Register8;	/* registers */
+	INT32 LastRegister;	/* last register written */
+	INT32 Volume4;	/* db volume of voice 0-2 and noise */
+	UINT32 RNG;			/* noise generator LFSR*/
+	INT32 ClockDivider;	/* clock divider */
+	INT32 CurrentClock;
+	INT32 FeedbackMask;	/* mask for feedback */
+	INT32 WhitenoiseTap1;	/* mask for white noise tap 1 (higher one, usually bit 14) */
+	INT32 WhitenoiseTap2;	/* mask for white noise tap 2 (lower one, usually bit 13)*/
+	INT32 Negate;		/* output negate flag */
+	INT32 Stereo;		/* whether we're dealing with stereo or not */
+	INT32 StereoMask;	/* the stereo output mask */
+	INT32 Period4;	/* Length of 1/2 of waveform */
+	INT32 Count4;		/* Position within the waveform */
+	INT32 Output4;	/* 1-bit output of each channel, pre-volume */
+	INT32 CyclestoREADY;/* number of cycles until the READY line goes active */
+	INT32 Freq0IsMax;	/* flag for if frequency zero acts as if it is one more than max (0x3ff+1) or if it acts like 0 */
+	UINT32 MuteMsk4;
+	UINT8 NgpFlags;		/* bit 7 - NGP Mode on/off, bit 0 - is 2nd NGP chip */
+	sn76496_state* NgpChip2;	/* Pointer to other Chip */
+};
+
+
+static sn76496_state* LastChipInit = NULL;
+static unsigned short int FNumLimit;
+
+/*INLINE sn76496_state *get_safe_token(running_device *device)
+{
+	assert(device != NULL);
+	assert(device->type() == SN76496 ||
+		 device->type() == SN76489 ||
+		 device->type() == SN76489A ||
+		 device->type() == SN76494 ||
+		 device->type() == SN94624 ||
+		 device->type() == NCR7496 ||
+		 device->type() == GAMEGEAR ||
+		 device->type() == SMSIII);
+	return (sn76496_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+//READ_LINE_DEVICE_HANDLER( sn76496_ready_r )
+UINT8 sn76496_ready_r(void *chip, offs_t offset)
+{
+	//sn76496_state *R = get_safe_token(device);
+	sn76496_state *R = (sn76496_state*)chip;
+	//stream_update(R->Channel);
+	return (R->CyclestoREADY? 0 : 1);
+}
+
+//WRITE8_DEVICE_HANDLER( sn76496_stereo_w )
+void sn76496_stereo_w(void *chip, offs_t offset, UINT8 data)
+{
+	//sn76496_state *R = get_safe_token(device);
+	sn76496_state *R = (sn76496_state*)chip;
+	//stream_update(R->Channel);
+	if (R->Stereo) R->StereoMask = data;
+#ifdef _DEBUG
+	else logerror("Call to stereo write with mono chip!\n");
+#endif
+}
+
+//WRITE8_DEVICE_HANDLER( sn76496_w )
+void sn76496_write_reg(void *chip, offs_t offset, UINT8 data)
+{
+	//sn76496_state *R = get_safe_token(device);
+	sn76496_state *R = (sn76496_state*)chip;
+	int n, r, c;
+
+
+	/* update the output buffer before changing the registers */
+	//stream_update(R->Channel);
+
+	/* set number of cycles until READY is active; this is always one
+ 'sample', i.e. it equals the clock divider exactly; until the
+ clock divider is fully supported, we delay until one sample has
+ played. The fact that this below is '2' and not '1' is because
+ of a ?race condition? in the mess crvision driver, where after
+ any sample is played at all, no matter what, the cycles_to_ready
+ ends up never being not ready, unless this value is greater than
+ 1. Once the full clock divider stuff is written, this should no
+ longer be an issue. */
+	R->CyclestoREADY = 2;
+
+	if (data & 0x80)
+	{
+		r = (data & 0x70) >> 4;
+		R->LastRegister = r;
+		R->Registerr = (R->Registerr & 0x3f0) | (data & 0x0f);
+	}
+	else
+ {
+		r = R->LastRegister;
+	}
+	c = r/2;
+	switch (r)
+	{
+		case 0:	/* tone 0 : frequency */
+		case 2:	/* tone 1 : frequency */
+		case 4:	/* tone 2 : frequency */
+		 if ((data & 0x80) == 0) R->Registerr = (R->Registerr & 0x0f) | ((data & 0x3f) << 4);
+			if ((R->Registerr != 0) || (R->Freq0IsMax == 0)) R->Periodc = R->Registerr;
+			else R->Periodc = 0x400;
+			if (r == 4)
+			{
+				/* update noise shift frequency */
+				if ((R->Register6 & 0x03) == 0x03)
+					R->Period3 = 2 * R->Period2;
+			}
+			break;
+		case 1:	/* tone 0 : volume */
+		case 3:	/* tone 1 : volume */
+		case 5:	/* tone 2 : volume */
+		case 7:	/* noise : volume */
+			R->Volumec = R->VolTabledata & 0x0f;
+			if ((data & 0x80) == 0) R->Registerr = (R->Registerr & 0x3f0) | (data & 0x0f);
+			
+		//	// "Every volume write resets the waveform to High level.", TmEE, 2012-11-24 on SMSPower
+		//	R->Outputc = 1;
+		//	R->Countc = R->Periodc;
+		//	disabled for now - sounds awful
+			break;
+		case 6:	/* noise : frequency, mode */
+			{
+#ifdef _DEBUG
+				//if ((data & 0x80) == 0) logerror("sn76489: write to reg 6 with bit 7 clear; data was %03x, new write is %02x! report this to LN!\n", R->Register6, data);
+#endif
+				if ((data & 0x80) == 0) R->Registerr = (R->Registerr & 0x3f0) | (data & 0x0f);
+				n = R->Register6;
+				/* N/512,N/1024,N/2048,Tone #3 output */
+				R->Period3 = ((n&3) == 3) ? 2 * R->Period2 : (1 << (5+(n&3)));
+				R->RNG = R->FeedbackMask;
+			}
+			break;
+	}
+}
+
+//static STREAM_UPDATE( SN76496Update )
+void SN76496Update(void *chip, stream_sample_t **outputs, int samples)
+{
+	int i;
+	//sn76496_state *R = (sn76496_state *)param;
+	sn76496_state *R = (sn76496_state*)chip;
+	sn76496_state *R2;
+	stream_sample_t *lbuffer = outputs0;
+	//stream_sample_t *rbuffer = (R->Stereo)?outputs1:NULL;
+	stream_sample_t *rbuffer = outputs1;
+	INT32 out = 0;
+	INT32 out2 = 0;
+	INT32 vol4;
+	UINT8 NGPMode;
+	INT32 ggst2;
+
+	NGPMode = (R->NgpFlags >> 7) & 0x01;
+	if (NGPMode)
+		R2 = R->NgpChip2;
+
+	if (! NGPMode)
+	{
+		// Speed Hack
+		out = 0;
+		for (i = 0; i < 3; i ++)
+		{
+			if (R->Periodi || R->Volumei)
+			{
+				out = 1;
+				break;
+			}
+		}
+		if (R->Volume3)
+			out = 1;
+		if (! out)
+		{
+			memset(lbuffer, 0x00, sizeof(stream_sample_t) * samples);
+			memset(rbuffer, 0x00, sizeof(stream_sample_t) * samples);
+			return;
+		}
+	}
+	
+	ggst0 = 0x01;
+	ggst1 = 0x01;
+	while (samples > 0)
+	{
+		/* Speed Patch */
+		/*// clock chip once
+		if (R->CurrentClock > 0) // not ready for new divided clock
+		{
+			R->CurrentClock--;
+		}
+		else // ready for new divided clock, make a new sample
+		{
+			R->CurrentClock = R->ClockDivider-1;*/
+			/* decrement Cycles to READY by one */
+			if (R->CyclestoREADY >0) R->CyclestoREADY--;
+
+			// handle channels 0,1,2
+			for (i = 0;i < 3;i++)
+			{
+				R->Counti--;
+				if (R->Counti <= 0)
+				{
+					R->Outputi ^= 1;
+					R->Counti = R->Periodi;
+				}
+			}
+
+			// handle channel 3
+			R->Count3--;
+			if (R->Count3 <= 0)
+			{
+			// if noisemode is 1, both taps are enabled
+			// if noisemode is 0, the lower tap, whitenoisetap2, is held at 0
+				if (((R->RNG & R->WhitenoiseTap1)?1:0) ^ ((((R->RNG & R->WhitenoiseTap2)?1:0))*(NOISEMODE)))
+				{
+					R->RNG >>= 1;
+					R->RNG |= R->FeedbackMask;
+				}
+				else
+				{
+					R->RNG >>= 1;
+				}
+				R->Output3 = R->RNG & 1;
+
+				R->Count3 = R->Period3;
+			}
+		//}
+
+
+		/*if (R->Stereo)
+		{
+			out = (((R->StereoMask&0x10)&&R->Output0)?R->Volume0:0)
+				+ (((R->StereoMask&0x20)&&R->Output1)?R->Volume1:0)
+				+ (((R->StereoMask&0x40)&&R->Output2)?R->Volume2:0)
+				+ (((R->StereoMask&0x80)&&R->Output3)?R->Volume3:0);
+
+			out2 = (((R->StereoMask&0x1)&&R->Output0)?R->Volume0:0)
+				+ (((R->StereoMask&0x2)&&R->Output1)?R->Volume1:0)
+				+ (((R->StereoMask&0x4)&&R->Output2)?R->Volume2:0)
+				+ (((R->StereoMask&0x8)&&R->Output3)?R->Volume3:0);
+		}
+		else
+		{
+			out = (R->Output0?R->Volume0:0)
+				+(R->Output1?R->Volume1:0)
+				+(R->Output2?R->Volume2:0)
+				+(R->Output3?R->Volume3:0);
+		}*/
+
+		// --- CUSTOM CODE START --
+		out = out2 = 0;
+		if (! R->NgpFlags)
+		{
+			for (i = 0; i < 4; i ++)
+			{
+				// --- Preparation Start ---
+				// Bipolar output
+				voli = R->Outputi ? +1 : -1;
+				
+				// Disable high frequencies (> SampleRate / 2) for tone channels
+				// Freq. 0/1 isn't disabled becaus it would also disable PCM
+				if (i != 3)
+				{
+					if (R->Periodi <= FNumLimit && R->Periodi > 1)
+						voli = 0;
+				}
+				voli &= R->MuteMski;
+				// --- Preparation End ---
+				
+				if (R->Stereo)
+				{
+					ggst0 = (R->StereoMask & (0x10 << i)) ? 0x01 : 0x00;
+					ggst1 = (R->StereoMask & (0x01 << i)) ? 0x01 : 0x00;
+				}
+				if (R->Periodi > 1 || i == 3)
+				{
+					out += voli * R->Volumei * ggst0;
+					out2 += voli * R->Volumei * ggst1;
+				}
+				else if (R->MuteMski)
+				{
+					// Make Bipolar Output with PCM possible
+					//out += (2 * R->Volumei - R->VolTable5) * ggst0;
+					//out2 += (2 * R->Volumei - R->VolTable5) * ggst1;
+					out += R->Volumei * ggst0;
+					out2 += R->Volumei * ggst1;
+				}
+			}
+		}
+		else
+		{
+			if (! (R->NgpFlags & 0x01))
+			{
+				// Tone Channel 1-3
+				if (R->Stereo)
+				{
+					ggst0 = (R->StereoMask & (0x10 << i)) ? 0x01 : 0x00;
+					ggst1 = (R->StereoMask & (0x01 << i)) ? 0x01 : 0x00;
+				}
+				for (i = 0; i < 3; i ++)
+				{
+					// --- Preparation Start ---
+					// Bipolar output
+					voli = R->Outputi ? +1 : -1;
+					
+					// Disable high frequencies (> SampleRate / 2) for tone channels
+					// Freq. 0 isn't disabled becaus it would also disable PCM
+					if (R->Periodi <= FNumLimit && R->Periodi)
+						voli = 0;
+					voli &= R->MuteMski;
+					// --- Preparation End ---
+					
+					//out += voli * R->Volumei;
+					//out2 += voli * R2->Volumei;
+					if (R->Periodi)
+					{
+						out += voli * R->Volumei * ggst0;
+						out2 += voli * R2->Volumei * ggst1;
+					}
+					else if (R->MuteMski)
+					{
+						// Make Bipolar Output with PCM possible
+						out += R->Volumei * ggst0;
+						out2 += R2->Volumei * ggst1;
+					}
+				}
+			}
+			else
+			{
+				// --- Preparation Start ---
+				// Bipolar output
+				voli = R->Outputi ? +1 : -1;
+				
+				//voli &= R->MuteMski;
+				voli &= R2->MuteMski;	// use MuteMask from chip 0
+				// --- Preparation End ---
+				
+				// Noise Channel
+				if (R->Stereo)
+				{
+					ggst0 = (R->StereoMask & 0x80) ? 0x01 : 0x00;
+					ggst1 = (R->StereoMask & 0x08) ? 0x01 : 0x00;
+				}
+				else
+				{
+					ggst0 = 0x01;
+					ggst1 = 0x01;
+				}
+				//out += vol3 * R2->Volume3;
+				//out2 += vol3 * R->Volume3;
+				out += vol3 * R2->Volume3 * ggst0;
+				out2 += vol3 * R->Volume3 * ggst1;
+			}
+		}
+		// --- CUSTOM CODE END --
+		
+		if(R->Negate) { out = -out; out2 = -out2; }
+
+		*(lbuffer++) = out >> 1;	// Output is Bipolar
+		//if (R->Stereo) *(rbuffer++) = out2;
+		*(rbuffer++) = out2 >> 1;
+		samples--;
+	}
+}
+
+
+
+static void SN76496_set_gain(sn76496_state *R,int gain)
+{
+	int i;
+	double out;
+
+
+	gain &= 0xff;
+
+	/* increase max output basing on gain (0.2 dB per step) */
+	out = MAX_OUTPUT / 4; // four channels, each gets 1/4 of the total range
+	while (gain-- > 0)
+		out *= 1.023292992;	/* = (10 ^ (0.2/20)) */
+
+	/* build volume table (2dB per step) */
+	for (i = 0;i < 15;i++)
+	{
+		/* limit volume to avoid clipping */
+		if (out > MAX_OUTPUT / 4) R->VolTablei = MAX_OUTPUT / 4;
+		//else R->VolTablei = out;
+		else R->VolTablei = (INT32)(out + 0.5);	// I like rounding
+
+		out /= 1.258925412;	/* = 10 ^ (2/20) = 2dB */
+	}
+	R->VolTable15 = 0;
+}
+
+
+
+//static int SN76496_init(running_device *device, sn76496_state *R, int stereo)
+static int SN76496_init(int clock, sn76496_state *R, int stereo)
+{
+	int sample_rate = clock/2;
+	int i;
+
+	//R->Channel = stream_create(device,0,(stereo?2:1),sample_rate,R,SN76496Update);
+
+	for (i = 0;i < 4;i++) R->Volumei = 0;
+
+	R->LastRegister = 0;
+	for (i = 0;i < 8;i+=2)
+	{
+		R->Registeri = 0;
+		R->Registeri + 1 = 0x0f;	/* volume = 0 */
+	}
+
+	for (i = 0;i < 4;i++)
+	{
+		R->Outputi = R->Periodi = R->Counti = 0;
+		R->MuteMski = ~0x00;
+	}
+
+	/* Default is SN76489A */
+	R->ClockDivider = 8;
+	R->FeedbackMask = 0x10000; /* mask for feedback */
+	R->WhitenoiseTap1 = 0x04; /* mask for white noise tap 1*/
+	R->WhitenoiseTap2 = 0x08; /* mask for white noise tap 2*/
+	R->Negate = 0; /* channels are not negated */
+	R->Stereo = stereo; /* depends on init */
+	R->CyclestoREADY = 1; /* assume ready is not active immediately on init. is this correct?*/
+	R->StereoMask = 0xFF; /* all channels enabled */
+	R->Freq0IsMax = 1; /* frequency set to 0 results in freq = 0x400 rather than 0 */
+
+	R->RNG = R->FeedbackMask;
+	R->Output3 = R->RNG & 1;
+
+	R->NgpFlags = 0x00;
+	R->NgpChip2 = NULL;
+
+	//return 0;
+	return sample_rate;
+}
+
+
+//static void generic_start(running_device *device, int feedbackmask, int noisetap1, int noisetap2, int negate, int stereo, int clockdivider, int freq0)
+static int generic_start(sn76496_state *chip, int clock, int feedbackmask, int noisetap1, int noisetap2, int negate, int stereo, int clockdivider, int freq0)
+{
+	int sample_rate;
+	
+	//sn76496_state *chip = get_safe_token(device);
+	//sn76496_state *chip;
+	sn76496_state *chip2;
+	
+	//if (SN76496_init(device,chip,stereo) != 0)
+	//	fatalerror("Error creating SN76496 chip");
+	sample_rate = SN76496_init(clock & 0x7FFFFFFF, chip, stereo);
+	if ((clock & 0x80000000) && LastChipInit != NULL)
+	{
+		// Activate special NeoGeoPocket Mode
+		chip2 = LastChipInit;
+		chip2->NgpFlags = 0x80 | 0x00;
+		chip->NgpFlags = 0x80 | 0x01;
+		chip->NgpChip2 = chip2;
+		chip2->NgpChip2 = chip;
+		LastChipInit = NULL;
+	}
+	else
+	{
+		LastChipInit = chip;
+	}
+	SN76496_set_gain(chip, 0);
+	
+	chip->FeedbackMask = feedbackmask;
+	chip->WhitenoiseTap1 = noisetap1;
+	chip->WhitenoiseTap2 = noisetap2;
+	chip->Negate = negate;
+	chip->Stereo = stereo;
+	if (clockdivider)
+		chip->ClockDivider = clockdivider;
+	chip->CurrentClock = clockdivider-1;
+	chip->Freq0IsMax = freq0;
+	
+	/* Speed Patch*/
+	sample_rate /= chip->ClockDivider;
+	
+	/*state_save_register_device_item_array(device, 0, chip->VolTable);
+	state_save_register_device_item_array(device, 0, chip->Register);
+	state_save_register_device_item(device, 0, chip->LastRegister);
+	state_save_register_device_item_array(device, 0, chip->Volume);
+	state_save_register_device_item(device, 0, chip->RNG);
+	state_save_register_device_item(device, 0, chip->ClockDivider);
+	state_save_register_device_item(device, 0, chip->CurrentClock);
+	state_save_register_device_item(device, 0, chip->FeedbackMask);
+	state_save_register_device_item(device, 0, chip->WhitenoiseTap1);
+	state_save_register_device_item(device, 0, chip->WhitenoiseTap2);
+	state_save_register_device_item(device, 0, chip->Negate);
+	state_save_register_device_item(device, 0, chip->Stereo);
+	state_save_register_device_item(device, 0, chip->StereoMask);
+	state_save_register_device_item_array(device, 0, chip->Period);
+	state_save_register_device_item_array(device, 0, chip->Count);
+	state_save_register_device_item_array(device, 0, chip->Output);
+	state_save_register_device_item(device, 0, chip->CyclestoREADY);*/
+	
+	return sample_rate;
+}
+
+unsigned long int sn76496_start(void **chip, int clock, int shiftregwidth, int noisetaps,
+								int negate, int stereo, int clockdivider, int freq0)
+{
+	sn76496_state* sn_chip;
+	int ntap2;
+	int curbit;
+	int curtap;
+	
+	sn_chip = (sn76496_state*)malloc(sizeof(sn76496_state));
+	if (sn_chip == NULL)
+		return 0;
+	memset(sn_chip, 0x00, sizeof(sn76496_state));
+	*chip = sn_chip;
+	
+	// extract single noise tap bits
+	curtap = 0;
+	for (curbit = 0; curbit < 16; curbit ++)
+	{
+		if (noisetaps & (1 << curbit))
+		{
+			ntapcurtap = (1 << curbit);
+			curtap ++;
+			if (curtap >= 2)
+				break;
+		}
+	}
+	while(curtap < 2)
+	{
+		ntapcurtap = ntap0;
+		curtap ++;
+	}
+	
+	return generic_start(sn_chip, clock, 1 << (shiftregwidth - 1), ntap0, ntap1,
+						negate, ! stereo, clockdivider ? 1 : 8, freq0);
+}
+
+void sn76496_shutdown(void *chip)
+{
+	sn76496_state *R = (sn76496_state*)chip;
+	
+	free(R);
+	return;
+}
+
+void sn76496_reset(void *chip)
+{
+	sn76496_state *R;
+	UINT8 i;
+	
+	R = (sn76496_state*)chip;
+	
+	for (i = 0;i < 4;i++) R->Volumei = 0;
+
+	R->LastRegister = 0;
+	for (i = 0;i < 8;i+=2)
+	{
+		R->Registeri = 0;
+		R->Registeri + 1 = 0x0f;	/* volume = 0 */
+	}
+
+	for (i = 0;i < 4;i++)
+	{
+		R->Outputi = R->Periodi = R->Counti = 0;
+	}
+
+	R->CyclestoREADY = 1;
+	R->StereoMask = 0xFF; /* all channels enabled */
+
+	R->RNG = R->FeedbackMask;
+	R->Output3 = R->RNG & 1;
+	
+	return;
+}
+
+void sn76496_freq_limiter(int clock, int clockdiv, int sample_rate)
+{
+	FNumLimit = (unsigned short int)((clock / (clockdiv ? 2.0 : 16.0)) / sample_rate);
+	
+	return;
+}
+
+void sn76496_set_mutemask(void *chip, UINT32 MuteMask)
+{
+	sn76496_state *R = (sn76496_state*)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 4; CurChn ++)
+		R->MuteMskCurChn = (MuteMask & (1 << CurChn)) ? 0 : ~0;
+	
+	return;
+}
+
+// function parameters: device, feedback destination tap, feedback source taps,
+// normal(false)/invert(true), mono(false)/stereo(true), clock divider factor
+
+/*static DEVICE_START( sn76489 )
+{
+	generic_start(device, 0x4000, 0x01, 0x02, TRUE, FALSE, 8, TRUE); // SN76489 not verified yet. todo: verify;
+}
+
+static DEVICE_START( sn76489a )
+{
+	generic_start(device, 0x10000, 0x04, 0x08, FALSE, FALSE, 8, TRUE); // SN76489A: whitenoise verified, phase verified, periodic verified (by plgdavid)
+}
+
+static DEVICE_START( sn76494 )
+{
+	generic_start(device, 0x10000, 0x04, 0x08, FALSE, FALSE, 1, TRUE); // SN76494 not verified, (according to datasheet: same as sn76489a but without the /8 divider)
+}
+
+static DEVICE_START( sn76496 )
+{
+	generic_start(device, 0x10000, 0x04, 0x08, FALSE, FALSE, 8, TRUE); // SN76496: Whitenoise verified, phase verified, periodic verified (by Michael Zapf)
+}
+
+static DEVICE_START( sn94624 )
+{
+	generic_start(device, 0x4000, 0x01, 0x02, TRUE, FALSE, 1, TRUE); // SN94624 whitenoise verified, phase verified, period verified; verified by PlgDavid
+}
+
+static DEVICE_START( ncr7496 )
+{
+	generic_start(device, 0x8000, 0x02, 0x20, FALSE, FALSE, 8, TRUE); // NCR7496 not verified; info from smspower wiki
+}
+
+static DEVICE_START( gamegear )
+{
+	generic_start(device, 0x8000, 0x01, 0x08, TRUE, TRUE, 8, FALSE); // Verified by Justin Kerk
+}
+
+static DEVICE_START( smsiii )
+{
+	generic_start(device, 0x8000, 0x01, 0x08, TRUE, FALSE, 8, FALSE); // todo: verify; from smspower wiki, assumed to have same invert as gamegear
+}*/
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( sn76496 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(sn76496_state);				break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( sn76496 );		break;
+		case DEVINFO_FCT_STOP:							// Nothing										break;
+		case DEVINFO_FCT_RESET:							// Nothing										break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "SN76496");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "TI PSG");						break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.1");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+DEVICE_GET_INFO( sn76489 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( sn76489 );		break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "SN76489");						break;
+		default:										DEVICE_GET_INFO_CALL(sn76496);						break;
+	}
+}
+
+DEVICE_GET_INFO( sn76489a )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( sn76489a );		break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "SN76489A");					break;
+		default:										DEVICE_GET_INFO_CALL(sn76496);						break;
+	}
+}
+
+DEVICE_GET_INFO( sn76494 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( sn76494 );		break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "SN76494");						break;
+		default:										DEVICE_GET_INFO_CALL(sn76496);						break;
+	}
+}
+
+DEVICE_GET_INFO( sn94624 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( sn94624 );		break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "SN94624");						break;
+		default:										DEVICE_GET_INFO_CALL(sn76496);						break;
+	}
+}
+
+DEVICE_GET_INFO( ncr7496 )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ncr7496 );		break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "NCR7496");						break;
+		default:										DEVICE_GET_INFO_CALL(sn76496);						break;
+	}
+}
+
+DEVICE_GET_INFO( gamegear )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( gamegear );		break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "Game Gear PSG");				break;
+		default:										DEVICE_GET_INFO_CALL(sn76496);						break;
+	}
+}
+
+DEVICE_GET_INFO( smsiii )
+{
+	switch (state)
+	{
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( smsiii );			break;
+		case DEVINFO_STR_NAME:							strcpy(info->s, "SMSIII PSG");					break;
+		default:										DEVICE_GET_INFO_CALL(sn76496);						break;
+	}
+}*/
+
+
+/*DEFINE_LEGACY_SOUND_DEVICE(SN76496, sn76496);
+DEFINE_LEGACY_SOUND_DEVICE(SN76489, sn76489);
+DEFINE_LEGACY_SOUND_DEVICE(SN76489A, sn76489a);
+DEFINE_LEGACY_SOUND_DEVICE(SN76494, sn76494);
+DEFINE_LEGACY_SOUND_DEVICE(SN94624, sn94624);
+DEFINE_LEGACY_SOUND_DEVICE(NCR7496, ncr7496);
+DEFINE_LEGACY_SOUND_DEVICE(GAMEGEAR, gamegear);
+DEFINE_LEGACY_SOUND_DEVICE(SMSIII, smsiii);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn76496.h Added

@@ -0,0 +1,35 @@
+#pragma once
+
+/*READ8_DEVICE_HANDLER( sn76496_ready_r );
+WRITE8_DEVICE_HANDLER( sn76496_w );
+WRITE8_DEVICE_HANDLER( sn76496_stereo_w );
+
+DEVICE_GET_INFO( sn76496 );
+DEVICE_GET_INFO( sn76489 );
+DEVICE_GET_INFO( sn76489a );
+DEVICE_GET_INFO( sn76494 );
+DEVICE_GET_INFO( sn94624 );
+DEVICE_GET_INFO( ncr7496 );
+DEVICE_GET_INFO( gamegear );
+DEVICE_GET_INFO( smsiii );
+
+#define SOUND_SN76496 DEVICE_GET_INFO_NAME( sn76496 )
+#define SOUND_SN76489 DEVICE_GET_INFO_NAME( sn76489 )
+#define SOUND_SN76489A DEVICE_GET_INFO_NAME( sn76489a )
+#define SOUND_SN76494 DEVICE_GET_INFO_NAME( sn76494 )
+#define SOUND_SN94624 DEVICE_GET_INFO_NAME( sn94624 )
+#define SOUND_NCR7496 DEVICE_GET_INFO_NAME( ncr7496 )
+#define SOUND_GAMEGEAR DEVICE_GET_INFO_NAME( gamegear )
+#define SOUND_SMSIII DEVICE_GET_INFO_NAME( smsiii )*/
+
+UINT8 sn76496_ready_r(void *chip, offs_t offset);
+void sn76496_write_reg(void *chip, offs_t offset, UINT8 data);
+void sn76496_stereo_w(void *chip, offs_t offset, UINT8 data);
+
+void SN76496Update(void *chip, stream_sample_t **outputs, int samples);
+unsigned long int sn76496_start(void **chip, int clock, int shiftregwidth, int noisetaps,
+								int negate, int stereo, int clockdivider, int freq0);
+void sn76496_shutdown(void *chip);
+void sn76496_reset(void *chip);
+void sn76496_freq_limiter(int clock, int clockdiv, int sample_rate);
+void sn76496_set_mutemask(void *chip, UINT32 MuteMask);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.c Added

@@ -0,0 +1,185 @@
+/****************************************************************
+
+ MAME / MESS functions
+
+****************************************************************/
+
+#include <stdlib.h>
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "sn76496.h"
+#include "sn76489.h"
+#include "sn764intf.h"
+
+
+#define EC_MAME		0x00	// SN76496 core from MAME
+#ifdef ENABLE_ALL_CORES
+#define EC_MAXIM	0x01	// SN76489 core by Maxim (from in_vgm)
+#endif
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+/* for stream system */
+typedef struct _sn764xx_state sn764xx_state;
+struct _sn764xx_state
+{
+	void *chip;
+	int EMU_CORE;
+};
+
+void sn764xx_stream_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	sn764xx_state* info = (sn764xx_state*)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		SN76496Update(info->chip, outputs, samples);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_MAXIM:
+		SN76489_Update((SN76489_Context*)info->chip, outputs, samples);
+		break;
+#endif
+	}
+}
+
+int device_start_sn764xx(void **_info, int EMU_CORE, int clock, int SampleRate, int shiftregwidth, int noisetaps,
+						 int negate, int stereo, int clockdivider, int freq0)
+{
+	sn764xx_state *info;
+	int rate;
+
+#ifdef ENABLE_ALL_CORES
+	if (EMU_CORE >= 0x02)
+		EMU_CORE = EC_MAME;
+#else
+	EMU_CORE = EC_MAME;
+#endif
+	
+	info = (sn764xx_state*) calloc(1, sizeof(sn764xx_state));
+	*_info = (void *) info;
+	/* emulator create */
+	info->EMU_CORE = EMU_CORE;
+	switch(EMU_CORE)
+	{
+	case EC_MAME:
+		rate = sn76496_start(&info->chip, clock, shiftregwidth, noisetaps,
+							negate, stereo, clockdivider, freq0);
+		sn76496_freq_limiter(clock & 0x3FFFFFFF, clockdivider, SampleRate);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_MAXIM:
+		rate = SampleRate;
+		info->chip = SN76489_Init(clock, rate);
+		if (info->chip == NULL)
+			return 0;
+		SN76489_Config((SN76489_Context*)info->chip, noisetaps, shiftregwidth, 0);
+		break;
+#endif
+	}
+
+	return rate;
+}
+
+void device_stop_sn764xx(void *_info)
+{
+	sn764xx_state *info = (sn764xx_state*)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		sn76496_shutdown(info->chip);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_MAXIM:
+		SN76489_Shutdown((SN76489_Context*)info->chip);
+		break;
+#endif
+	}
+}
+
+void device_reset_sn764xx(void *_info)
+{
+	sn764xx_state *info = (sn764xx_state*)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		sn76496_reset(info->chip);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_MAXIM:
+		SN76489_Reset((SN76489_Context*)info->chip);
+		break;
+#endif
+	}
+}
+
+
+void sn764xx_w(void *_info, offs_t offset, UINT8 data)
+{
+	sn764xx_state *info = (sn764xx_state*)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		switch(offset)
+		{
+		case 0x00:
+			sn76496_write_reg(info->chip, offset & 1, data);
+			break;
+		case 0x01:
+			sn76496_stereo_w(info->chip, offset, data);
+			break;
+		}
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_MAXIM:
+		switch(offset)
+		{
+		case 0x00:
+			SN76489_Write((SN76489_Context*)info->chip, data);
+			break;
+		case 0x01:
+			SN76489_GGStereoWrite((SN76489_Context*)info->chip, data);
+			break;
+		}
+		break;
+#endif
+	}
+}
+
+void sn764xx_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	sn764xx_state *info = (sn764xx_state*)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		sn76496_set_mutemask(info->chip, MuteMask);
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_MAXIM:
+		SN76489_SetMute(info->chip, ~MuteMask & 0x0F);
+		break;
+#endif
+	}
+	
+	return;
+}
+
+void sn764xx_set_panning(void *_info, INT16* PanVals)
+{
+	sn764xx_state *info = (sn764xx_state*)_info;
+	switch(info->EMU_CORE)
+	{
+	case EC_MAME:
+		break;
+#ifdef ENABLE_ALL_CORES
+	case EC_MAXIM:
+		SN76489_SetPanning(info->chip, PanVals0x00, PanVals0x01, PanVals0x02, PanVals0x03);
+		break;
+#endif
+	}
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/sn764intf.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.c Added

@@ -0,0 +1,976 @@
+/************************************************************
+
+ NEC UPD7759 ADPCM Speech Processor
+ by: Juergen Buchmueller, Mike Balfour, Howie Cohen,
+ Olivier Galibert, and Aaron Giles
+
+*************************************************************
+
+ Description:
+
+ The UPD7759 is a speech processing LSI that utilizes ADPCM to produce
+ speech or other sampled sounds. It can directly address up to 1Mbit
+ (128k) of external data ROM, or the host CPU can control the speech
+ data transfer. The UPD7759 is usually hooked up to a 640 kHz clock and
+ has one 8-bit input port, a start pin, a busy pin, and a clock output.
+
+ The chip is composed of 3 parts:
+ - a clock divider
+ - a rom-reading engine
+ - an adpcm engine
+ - a 4-to-9 bit adpcm converter
+
+ The clock divider takes the base 640KHz clock and divides it first
+ by a fixed divisor of 4 and then by a value between 9 and 32. The
+ result gives a clock between 5KHz and 17.78KHz. It's probably
+ possible, but not recommended and certainly out-of-spec, to push the
+ chip harder by reducing the divider.
+
+ The rom-reading engine reads one byte every two divided clock cycles.
+ The factor two comes from the fact that a byte has two nibbles, i.e.
+ two samples.
+
+ The apdcm engine takes bytes and interprets them as commands:
+
+ 00000000 sample end
+ 00dddddd silence
+ 01ffffff send the 256 following nibbles to the converter
+ 10ffffff nnnnnnnn send the n+1 following nibbles to the converter
+ 11---rrr --ffffff nnnnnnnn send the n+1 following nibbles to the converter, and repeat r+1 times
+
+ "ffffff" is sent to the clock divider to be the base clock for the
+ adpcm converter, i.e., it's the sampling rate. If the number of
+ nibbles to send is odd the last nibble is ignored. The commands
+ are always 8-bit aligned.
+
+ "dddddd" is the duration of the silence. The base speed is unknown,
+ 1ms sounds reasonably. It does not seem linked to the adpcm clock
+ speed because there often is a silence before any 01 or 10 command.
+
+ The adpcm converter converts nibbles into 9-bit DAC values. It has
+ an internal state of 4 bits that's used in conjunction with the
+ nibble to lookup which of the 256 possible steps is used. Then
+ the state is changed according to the nibble value. Essentially, the
+ higher the state, the bigger the steps are, and using big steps
+ increase the state. Conversely, using small steps reduces the state.
+ This allows the engine to be a little more adaptative than a
+ classical ADPCM algorithm.
+
+ The UPD7759 can run in two modes, master (also known as standalone)
+ and slave. The mode is selected through the "md" pin. No known
+ game changes modes on the fly, and it's unsure if that's even
+ possible to do.
+
+
+ Master mode:
+
+ The output of the rom reader is directly connected to the adpcm
+ converter. The controlling cpu only sends a sample number and the
+ 7759 plays it.
+
+ The sample rom has a header at the beginning of the form
+
+ nn 5a a5 69 55
+
+ where nn is the number of the last sample. This is then followed by
+ a vector of 2-bytes msb-first values, one per sample. Multiplying
+ them by two gives the sample start offset in the rom. A 0x00 marks
+ the end of each sample.
+
+ It seems that the UPD7759 reads at least part of the rom header at
+ startup. Games doing rom banking are careful to reset the chip after
+ each change.
+
+
+ Slave mode:
+
+ The rom reader is completely disconnected. The input port is
+ connected directly to the adpcm engine. The first write to the input
+ port activates the engine (the value itself is ignored). The engine
+ activates the clock output and waits for commands. The clock speed
+ is unknown, but its probably a divider of 640KHz. We use 40KHz here
+ because 80KHz crashes altbeast. The chip probably has an internal
+ fifo to the converter and suspends the clock when the fifo is full.
+ The first command is always 0xFF. A second 0xFF marks the end of the
+ sample and the engine stops. OTOH, there is a 0x00 at the end too.
+ Go figure.
+
+*************************************************************/
+
+//#include "emu.h"
+//#include "streams.h"
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+#include <string.h>
+#include <stdlib.h>
+#include "mamedef.h"
+#include "upd7759.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+
+#define DEBUG_STATES	(0)
+//#define DEBUG_METHOD	mame_printf_debug
+#define DEBUG_METHOD	logerror
+
+
+
+/************************************************************
+
+ Constants
+
+*************************************************************/
+
+/* step value fractional bits */
+#define FRAC_BITS		20
+#define FRAC_ONE		(1 << FRAC_BITS)
+#define FRAC_MASK		(FRAC_ONE - 1)
+
+/* chip states */
+enum
+{
+	STATE_IDLE,
+	STATE_DROP_DRQ,
+	STATE_START,
+	STATE_FIRST_REQ,
+	STATE_LAST_SAMPLE,
+	STATE_DUMMY1,
+	STATE_ADDR_MSB,
+	STATE_ADDR_LSB,
+	STATE_DUMMY2,
+	STATE_BLOCK_HEADER,
+	STATE_NIBBLE_COUNT,
+	STATE_NIBBLE_MSN,
+	STATE_NIBBLE_LSN
+};
+
+
+
+/************************************************************
+
+ Type definitions
+
+*************************************************************/
+
+typedef struct _upd7759_state upd7759_state;
+struct _upd7759_state
+{
+	//running_device *device;
+	//sound_stream *channel;					/* stream channel for playback */
+
+	/* internal clock to output sample rate mapping */
+	UINT32		pos;						/* current output sample position */
+	UINT32		step;						/* step value per output sample */
+	//attotime	clock_period;				/* clock period */
+	//emu_timer *timer;						/* timer */
+
+	/* I/O lines */
+	UINT8		fifo_in;					/* last data written to the sound chip */
+	UINT8		reset;						/* current state of the RESET line */
+	UINT8		start;						/* current state of the START line */
+	UINT8		drq;						/* current state of the DRQ line */
+	//void (*drqcallback)(running_device *device, int param);			/* drq callback */
+	//void (*drqcallback)(int param);			/* drq callback */
+
+	/* internal state machine */
+	INT8		state;						/* current overall chip state */
+	INT32		clocks_left;				/* number of clocks left in this state */
+	UINT16		nibbles_left;				/* number of ADPCM nibbles left to process */
+	UINT8		repeat_count;				/* number of repeats remaining in current repeat block */
+	INT8		post_drq_state;				/* state we will be in after the DRQ line is dropped */
+	INT32		post_drq_clocks;			/* clocks that will be left after the DRQ line is dropped */
+	UINT8		req_sample;					/* requested sample number */
+	UINT8		last_sample;				/* last sample number available */
+	UINT8		block_header;				/* header byte */
+	UINT8		sample_rate;				/* number of UPD clocks per ADPCM nibble */
+	UINT8		first_valid_header;			/* did we get our first valid header yet? */
+	UINT32		offset;						/* current ROM offset */
+	UINT32		repeat_offset;				/* current ROM repeat offset */
+
+	/* ADPCM processing */
+	INT8		adpcm_state;				/* ADPCM state index */
+	UINT8		adpcm_data;					/* current byte of ADPCM data */
+	INT16		sample;						/* current sample value */
+
+	/* ROM access */
+	UINT32		romsize;
+	UINT8 *		rom;						/* pointer to ROM data or NULL for slave mode */
+	UINT8 *		rombase;					/* pointer to ROM data or NULL for slave mode */
+	UINT32		romoffset;					/* ROM offset to make save/restore easier */
+	UINT8		ChipMode;					// 0 - Master, 1 - Slave
+	
+	// Valley Bell: Added a FIFO buffer based on Sega Pico.
+	UINT8 data_buf0x40;
+	UINT8 dbuf_pos_read;
+	UINT8 dbuf_pos_write;
+ 
+ UINT8 mute;
+};
+
+
+
+/************************************************************
+
+ Local variables
+
+*************************************************************/
+
+static const int upd7759_step1616 =
+{
+	{ 0, 0, 1, 2, 3, 5, 7, 10, 0, 0, -1, -2, -3, -5, -7, -10 },
+	{ 0, 1, 2, 3, 4, 6, 8, 13, 0, -1, -2, -3, -4, -6, -8, -13 },
+	{ 0, 1, 2, 4, 5, 7, 10, 15, 0, -1, -2, -4, -5, -7, -10, -15 },
+	{ 0, 1, 3, 4, 6, 9, 13, 19, 0, -1, -3, -4, -6, -9, -13, -19 },
+	{ 0, 2, 3, 5, 8, 11, 15, 23, 0, -2, -3, -5, -8, -11, -15, -23 },
+	{ 0, 2, 4, 7, 10, 14, 19, 29, 0, -2, -4, -7, -10, -14, -19, -29 },
+	{ 0, 3, 5, 8, 12, 16, 22, 33, 0, -3, -5, -8, -12, -16, -22, -33 },
+	{ 1, 4, 7, 10, 15, 20, 29, 43, -1, -4, -7, -10, -15, -20, -29, -43 },
+	{ 1, 4, 8, 13, 18, 25, 35, 53, -1, -4, -8, -13, -18, -25, -35, -53 },
+	{ 1, 6, 10, 16, 22, 31, 43, 64, -1, -6, -10, -16, -22, -31, -43, -64 },
+	{ 2, 7, 12, 19, 27, 37, 51, 76, -2, -7, -12, -19, -27, -37, -51, -76 },
+	{ 2, 9, 16, 24, 34, 46, 64, 96, -2, -9, -16, -24, -34, -46, -64, -96 },
+	{ 3, 11, 19, 29, 41, 57, 79, 117, -3, -11, -19, -29, -41, -57, -79, -117 },
+	{ 4, 13, 24, 36, 50, 69, 96, 143, -4, -13, -24, -36, -50, -69, -96, -143 },
+	{ 4, 16, 29, 44, 62, 85, 118, 175, -4, -16, -29, -44, -62, -85, -118, -175 },
+	{ 6, 20, 36, 54, 76, 104, 144, 214, -6, -20, -36, -54, -76, -104, -144, -214 },
+};
+
+static const int upd7759_state_table16 = { -1, -1, 0, 0, 1, 2, 2, 3, -1, -1, 0, 0, 1, 2, 2, 3 };
+
+
+
+/*INLINE upd7759_state *get_safe_token(running_device *device)
+{
+	assert(device != NULL);
+	assert(device->type() == UPD7759);
+	return (upd7759_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+/************************************************************
+
+ ADPCM sample updater
+
+*************************************************************/
+
+INLINE void update_adpcm(upd7759_state *chip, int data)
+{
+	/* update the sample and the state */
+	chip->sample += upd7759_stepchip->adpcm_statedata;
+	chip->adpcm_state += upd7759_state_tabledata;
+
+	/* clamp the state to 0..15 */
+	if (chip->adpcm_state < 0)
+		chip->adpcm_state = 0;
+	else if (chip->adpcm_state > 15)
+		chip->adpcm_state = 15;
+}
+
+
+
+/************************************************************
+
+ Master chip state machine
+
+*************************************************************/
+
+static void get_fifo_data(upd7759_state *chip)
+{
+	if (chip->dbuf_pos_read == chip->dbuf_pos_write)
+	{
+#ifdef _DEBUG
+		logerror("Warning: UPD7759 reading empty FIFO!\n");
+#endif
+		return;
+	}
+	
+	chip->fifo_in = chip->data_bufchip->dbuf_pos_read;
+	chip->dbuf_pos_read ++;
+	chip->dbuf_pos_read &= 0x3F;
+	
+	return;
+}
+
+static void advance_state(upd7759_state *chip)
+{
+	switch (chip->state)
+	{
+		/* Idle state: we stick around here while there's nothing to do */
+		case STATE_IDLE:
+			chip->clocks_left = 4;
+			break;
+
+		/* drop DRQ state: update to the intended state */
+		case STATE_DROP_DRQ:
+			chip->drq = 0;
+
+			if (chip->ChipMode)
+				get_fifo_data(chip);	// Slave Mode only
+			chip->clocks_left = chip->post_drq_clocks;
+			chip->state = chip->post_drq_state;
+			break;
+
+		/* Start state: we begin here as soon as a sample is triggered */
+		case STATE_START:
+			chip->req_sample = chip->rom ? chip->fifo_in : 0x10;
+#ifdef _DEBUG
+			if (DEBUG_STATES) DEBUG_METHOD("UPD7759: req_sample = %02X\n", chip->req_sample);
+#endif
+
+			/* 35+ cycles after we get here, the /DRQ goes low
+ * (first byte (number of samples in ROM) should be sent in response)
+ *
+ * (35 is the minimum number of cycles I found during heavy tests.
+ * Depending on the state the chip was in just before the /MD was set to 0 (reset, standby
+ * or just-finished-playing-previous-sample) this number can range from 35 up to ~24000).
+ * It also varies slightly from test to test, but not much - a few cycles at most.) */
+			chip->clocks_left = 70;	/* 35 - breaks cotton */
+			chip->state = STATE_FIRST_REQ;
+			break;
+
+		/* First request state: issue a request for the first byte */
+		/* The expected response will be the index of the last sample */
+		case STATE_FIRST_REQ:
+#ifdef _DEBUG
+			if (DEBUG_STATES) DEBUG_METHOD("UPD7759: first data request\n");
+#endif
+			chip->drq = 1;
+
+			/* 44 cycles later, we will latch this value and request another byte */
+			chip->clocks_left = 44;
+			chip->state = STATE_LAST_SAMPLE;
+			break;
+
+		/* Last sample state: latch the last sample value and issue a request for the second byte */
+		/* The second byte read will be just a dummy */
+		case STATE_LAST_SAMPLE:
+			chip->last_sample = chip->rom ? chip->rom0 : chip->fifo_in;
+#ifdef _DEBUG
+			if (DEBUG_STATES) DEBUG_METHOD("UPD7759: last_sample = %02X, requesting dummy 1\n", chip->last_sample);
+#endif
+			chip->drq = 1;
+
+			/* 28 cycles later, we will latch this value and request another byte */
+			chip->clocks_left = 28;	/* 28 - breaks cotton */
+			chip->state = (chip->req_sample > chip->last_sample) ? STATE_IDLE : STATE_DUMMY1;
+			break;
+
+		/* First dummy state: ignore any data here and issue a request for the third byte */
+		/* The expected response will be the MSB of the sample address */
+		case STATE_DUMMY1:
+#ifdef _DEBUG
+			if (DEBUG_STATES) DEBUG_METHOD("UPD7759: dummy1, requesting offset_hi\n");
+#endif
+			chip->drq = 1;
+
+			/* 32 cycles later, we will latch this value and request another byte */
+			chip->clocks_left = 32;
+			chip->state = STATE_ADDR_MSB;
+			break;
+
+		/* Address MSB state: latch the MSB of the sample address and issue a request for the fourth byte */
+		/* The expected response will be the LSB of the sample address */
+		case STATE_ADDR_MSB:
+			chip->offset = (chip->rom ? chip->romchip->req_sample * 2 + 5 : chip->fifo_in) << 9;
+#ifdef _DEBUG
+			if (DEBUG_STATES) DEBUG_METHOD("UPD7759: offset_hi = %02X, requesting offset_lo\n", chip->offset >> 9);
+#endif
+			chip->drq = 1;
+
+			/* 44 cycles later, we will latch this value and request another byte */
+			chip->clocks_left = 44;
+			chip->state = STATE_ADDR_LSB;
+			break;
+
+		/* Address LSB state: latch the LSB of the sample address and issue a request for the fifth byte */
+		/* The expected response will be just a dummy */
+		case STATE_ADDR_LSB:
+			chip->offset |= (chip->rom ? chip->romchip->req_sample * 2 + 6 : chip->fifo_in) << 1;
+#ifdef _DEBUG
+			if (DEBUG_STATES) DEBUG_METHOD("UPD7759: offset_lo = %02X, requesting dummy 2\n", (chip->offset >> 1) & 0xff);
+#endif
+			chip->drq = 1;
+
+			/* 36 cycles later, we will latch this value and request another byte */
+			chip->clocks_left = 36;
+			chip->state = STATE_DUMMY2;
+			break;
+
+		/* Second dummy state: ignore any data here and issue a request for the the sixth byte */
+		/* The expected response will be the first block header */
+		case STATE_DUMMY2:
+			chip->offset++;
+			chip->first_valid_header = 0;
+#ifdef _DEBUG
+			if (DEBUG_STATES) DEBUG_METHOD("UPD7759: dummy2, requesting block header\n");
+#endif
+			chip->drq = 1;
+
+			/* 36?? cycles later, we will latch this value and request another byte */
+			chip->clocks_left = 36;
+			chip->state = STATE_BLOCK_HEADER;
+			break;
+
+		/* Block header state: latch the header and issue a request for the first byte afterwards */
+		case STATE_BLOCK_HEADER:
+
+			/* if we're in a repeat loop, reset the offset to the repeat point and decrement the count */
+			if (chip->repeat_count)
+			{
+				chip->repeat_count--;
+				chip->offset = chip->repeat_offset;
+			}
+			chip->block_header = chip->rom ? chip->romchip->offset++ & 0x1ffff : chip->fifo_in;
+#ifdef _DEBUG
+			if (DEBUG_STATES) DEBUG_METHOD("UPD7759: header (@%05X) = %02X, requesting next byte\n", chip->offset, chip->block_header);
+#endif
+			chip->drq = 1;
+
+			/* our next step depends on the top two bits */
+			switch (chip->block_header & 0xc0)
+			{
+				case 0x00:	/* silence */
+					chip->clocks_left = 1024 * ((chip->block_header & 0x3f) + 1);
+					chip->state = (chip->block_header == 0 && chip->first_valid_header) ? STATE_IDLE : STATE_BLOCK_HEADER;
+					chip->sample = 0;
+					chip->adpcm_state = 0;
+					break;
+
+				case 0x40:	/* 256 nibbles */
+					chip->sample_rate = (chip->block_header & 0x3f) + 1;
+					chip->nibbles_left = 256;
+					chip->clocks_left = 36;	/* just a guess */
+					chip->state = STATE_NIBBLE_MSN;
+					break;
+
+				case 0x80:	/* n nibbles */
+					chip->sample_rate = (chip->block_header & 0x3f) + 1;
+					chip->clocks_left = 36;	/* just a guess */
+					chip->state = STATE_NIBBLE_COUNT;
+					break;
+
+				case 0xc0:	/* repeat loop */
+					chip->repeat_count = (chip->block_header & 7) + 1;
+					chip->repeat_offset = chip->offset;
+					chip->clocks_left = 36;	/* just a guess */
+					chip->state = STATE_BLOCK_HEADER;
+					break;
+			}
+
+			/* set a flag when we get the first non-zero header */
+			if (chip->block_header != 0)
+				chip->first_valid_header = 1;
+			break;
+
+		/* Nibble count state: latch the number of nibbles to play and request another byte */
+		/* The expected response will be the first data byte */
+		case STATE_NIBBLE_COUNT:
+			chip->nibbles_left = (chip->rom ? chip->romchip->offset++ & 0x1ffff : chip->fifo_in) + 1;
+#ifdef _DEBUG
+			if (DEBUG_STATES) DEBUG_METHOD("UPD7759: nibble_count = %u, requesting next byte\n", (unsigned)chip->nibbles_left);
+#endif
+			chip->drq = 1;
+
+			/* 36?? cycles later, we will latch this value and request another byte */
+			chip->clocks_left = 36;	/* just a guess */
+			chip->state = STATE_NIBBLE_MSN;
+			break;
+
+		/* MSN state: latch the data for this pair of samples and request another byte */
+		/* The expected response will be the next sample data or another header */
+		case STATE_NIBBLE_MSN:
+			chip->adpcm_data = chip->rom ? chip->romchip->offset++ & 0x1ffff : chip->fifo_in;
+			update_adpcm(chip, chip->adpcm_data >> 4);
+			chip->drq = 1;
+
+			/* we stay in this state until the time for this sample is complete */
+			chip->clocks_left = chip->sample_rate * 4;
+			if (--chip->nibbles_left == 0)
+				chip->state = STATE_BLOCK_HEADER;
+			else
+				chip->state = STATE_NIBBLE_LSN;
+			break;
+
+		/* LSN state: process the lower nibble */
+		case STATE_NIBBLE_LSN:
+			update_adpcm(chip, chip->adpcm_data & 15);
+
+			/* we stay in this state until the time for this sample is complete */
+			chip->clocks_left = chip->sample_rate * 4;
+			if (--chip->nibbles_left == 0)
+				chip->state = STATE_BLOCK_HEADER;
+			else
+				chip->state = STATE_NIBBLE_MSN;
+			break;
+	}
+
+	/* if there's a DRQ, fudge the state */
+	if (chip->drq)
+	{
+		chip->post_drq_state = chip->state;
+		chip->post_drq_clocks = chip->clocks_left - 21;
+		chip->state = STATE_DROP_DRQ;
+		chip->clocks_left = 21;
+	}
+}
+
+
+
+/************************************************************
+
+ Stream callback
+
+*************************************************************/
+
+//static STREAM_UPDATE( upd7759_update )
+void upd7759_update(void *param, stream_sample_t **outputs, int samples)
+{
+	upd7759_state *chip = (upd7759_state *)param;
+	INT32 clocks_left = chip->clocks_left;
+	INT16 sample = chip->sample;
+	UINT32 step = chip->step;
+	UINT32 pos = chip->pos;
+	stream_sample_t *buffer = outputs0;
+	stream_sample_t *buffer2 = outputs1;
+ int mute = chip->mute;
+
+	/* loop until done */
+	if (chip->state != STATE_IDLE)
+		while (samples != 0)
+		{
+			/* store the current sample */
+ if (mute)
+ {
+ *buffer++ = 0;
+ *buffer2++ = 0;
+ }
+ else
+ {
+ *buffer++ = sample << 7;
+ *buffer2++ = sample << 7;
+ }
+			samples--;
+
+			/* advance by the number of clocks/output sample */
+			pos += step;
+
+			/* handle clocks, but only in standalone mode */
+			if (! chip->ChipMode)
+			{
+				while (chip->rom && pos >= FRAC_ONE)
+				{
+					int clocks_this_time = pos >> FRAC_BITS;
+					if (clocks_this_time > clocks_left)
+						clocks_this_time = clocks_left;
+
+					/* clock once */
+					pos -= clocks_this_time * FRAC_ONE;
+					clocks_left -= clocks_this_time;
+
+					/* if we're out of clocks, time to handle the next state */
+					if (clocks_left == 0)
+					{
+						/* advance one state; if we hit idle, bail */
+						advance_state(chip);
+						if (chip->state == STATE_IDLE)
+							break;
+
+						/* reimport the variables that we cached */
+						clocks_left = chip->clocks_left;
+						sample = chip->sample;
+					}
+				}
+			}
+			else
+			{
+				UINT8 CntFour;
+				
+				if (! clocks_left)
+				{
+					advance_state(chip);
+					clocks_left = chip->clocks_left;
+				}
+				
+				// advance the state (4x because of Clock Divider /4)
+				for (CntFour = 0; CntFour < 4; CntFour ++)
+				{
+					clocks_left --;
+					if (! clocks_left)
+					{
+						advance_state(chip);
+						clocks_left = chip->clocks_left;
+					}
+				}
+			}
+		}
+
+	/* if we got out early, just zap the rest of the buffer */
+	if (samples != 0)
+	{
+		memset(buffer, 0, samples * sizeof(*buffer));
+		memset(buffer2, 0, samples * sizeof(*buffer2));
+	}
+
+	/* flush the state back */
+	chip->clocks_left = clocks_left;
+	chip->pos = pos;
+}
+
+void upd7759_mute(void *ptr, int mute)
+{
+ upd7759_state *chip = (upd7759_state *)ptr;
+ chip->mute = mute;
+}
+
+
+/************************************************************
+
+ DRQ callback
+
+*************************************************************/
+
+/*static TIMER_CALLBACK( upd7759_slave_update )
+{
+	upd7759_state *chip = (upd7759_state *)ptr;
+	UINT8 olddrq = chip->drq;
+
+	// update the stream
+	//stream_update(chip->channel);
+
+	// advance the state
+	advance_state(chip);
+
+	// if the DRQ changed, update it
+	logerror("slave_update: DRQ %d->%d\n", olddrq, chip->drq);
+	if (olddrq != chip->drq && chip->drqcallback)
+		//(*chip->drqcallback)(chip->device, chip->drq);
+		(*chip->drqcallback)(chip->drq);
+
+	// set a timer to go off when that is done
+	//if (chip->state != STATE_IDLE)
+	//	timer_adjust_oneshot(chip->timer, attotime_mul(chip->clock_period, chip->clocks_left), 0);
+}*/
+
+
+/************************************************************
+
+ Sound startup
+
+*************************************************************/
+
+static void upd7759_reset(upd7759_state *chip)
+{
+	chip->pos = 0;
+	chip->fifo_in = 0;
+	chip->drq = 0;
+	chip->state = STATE_IDLE;
+	chip->clocks_left = 0;
+	chip->nibbles_left = 0;
+	chip->repeat_count = 0;
+	chip->post_drq_state = STATE_IDLE;
+	chip->post_drq_clocks = 0;
+	chip->req_sample = 0;
+	chip->last_sample = 0;
+	chip->block_header = 0;
+	chip->sample_rate = 0;
+	chip->first_valid_header = 0;
+	chip->offset = 0;
+	chip->repeat_offset = 0;
+	chip->adpcm_state = 0;
+	chip->adpcm_data = 0;
+	chip->sample = 0;
+
+	// Valley Bell: reset buffer
+	chip->data_buf0 = chip->data_buf1 = 0x00;
+	chip->dbuf_pos_read = 0x00;
+	chip->dbuf_pos_write = 0x00;
+
+	/* turn off any timer */
+	//if (chip->timer)
+	//	timer_adjust_oneshot(chip->timer, attotime_never, 0);
+	if (chip->ChipMode)
+		chip->clocks_left = -1;
+}
+
+
+//static DEVICE_RESET( upd7759 )
+void device_reset_upd7759(void *_info)
+{
+	upd7759_state *chip = (upd7759_state *)_info;
+	//upd7759_reset(get_safe_token(device));
+	upd7759_reset(chip);
+}
+
+
+//static STATE_POSTLOAD( upd7759_postload )
+/*static void upd7759_postload(void* param)
+{
+	upd7759_state *chip = (upd7759_state *)param;
+	chip->rom = chip->rombase + chip->romoffset;
+}*/
+
+
+/*static void register_for_save(upd7759_state *chip, running_device *device)
+{
+	state_save_register_device_item(device, 0, chip->pos);
+	state_save_register_device_item(device, 0, chip->step);
+
+	state_save_register_device_item(device, 0, chip->fifo_in);
+	state_save_register_device_item(device, 0, chip->reset);
+	state_save_register_device_item(device, 0, chip->start);
+	state_save_register_device_item(device, 0, chip->drq);
+
+	state_save_register_device_item(device, 0, chip->state);
+	state_save_register_device_item(device, 0, chip->clocks_left);
+	state_save_register_device_item(device, 0, chip->nibbles_left);
+	state_save_register_device_item(device, 0, chip->repeat_count);
+	state_save_register_device_item(device, 0, chip->post_drq_state);
+	state_save_register_device_item(device, 0, chip->post_drq_clocks);
+	state_save_register_device_item(device, 0, chip->req_sample);
+	state_save_register_device_item(device, 0, chip->last_sample);
+	state_save_register_device_item(device, 0, chip->block_header);
+	state_save_register_device_item(device, 0, chip->sample_rate);
+	state_save_register_device_item(device, 0, chip->first_valid_header);
+	state_save_register_device_item(device, 0, chip->offset);
+	state_save_register_device_item(device, 0, chip->repeat_offset);
+
+	state_save_register_device_item(device, 0, chip->adpcm_state);
+	state_save_register_device_item(device, 0, chip->adpcm_data);
+	state_save_register_device_item(device, 0, chip->sample);
+
+	state_save_register_device_item(device, 0, chip->romoffset);
+	state_save_register_postload(device->machine, upd7759_postload, chip);
+}*/
+
+
+//static DEVICE_START( upd7759 )
+int device_start_upd7759(void **_info, int clock)
+{
+	//static const upd7759_interface defintrf = { 0 };
+	//const upd7759_interface *intf = (device->baseconfig().static_config() != NULL) ? (const upd7759_interface *)device->baseconfig().static_config() : &defintrf;
+	//const upd7759_interface *intf = &defintrf;
+	//upd7759_state *chip = get_safe_token(device);
+	upd7759_state *chip;
+
+	chip = (upd7759_state *) calloc(1, sizeof(upd7759_state));
+	*_info = (void *) chip;
+	
+	//chip->device = device;
+	chip->ChipMode = (clock & 0x80000000) >> 31;
+	clock &= 0x7FFFFFFF;
+
+	/* allocate a stream channel */
+	//chip->channel = stream_create(device, 0, 1, device->clock()/4, chip, upd7759_update);
+
+	/* compute the stepping rate based on the chip's clock speed */
+	chip->step = 4 * FRAC_ONE;
+
+	/* compute the clock period */
+	//chip->clock_period = ATTOTIME_IN_HZ(device->clock());
+
+	/* set the intial state */
+	chip->state = STATE_IDLE;
+
+	/* compute the ROM base or allocate a timer */
+	//chip->rom = chip->rombase = *device->region();
+	chip->romsize = 0x00;
+	chip->rom = chip->rombase = NULL;
+	//if (chip->rom == NULL)
+	//	chip->timer = timer_alloc(device->machine, upd7759_slave_update, chip);
+	chip->romoffset = 0x00;
+
+	/* set the DRQ callback */
+	//chip->drqcallback = intf->drqcallback;
+
+	/* assume /RESET and /START are both high */
+	chip->reset = 1;
+	chip->start = 1;
+
+	/* toggle the reset line to finish the reset */
+	upd7759_reset(chip);
+
+	//register_for_save(chip, device);
+
+	return clock / 4;
+}
+
+void device_stop_upd7759(void *_info)
+{
+	upd7759_state *chip = (upd7759_state *)_info;
+	
+	free(chip->rombase);	chip->rombase = NULL;
+
+	free(chip);	
+
+	return;
+}
+
+
+
+/************************************************************
+
+ I/O handlers
+
+*************************************************************/
+
+//void upd7759_reset_w(running_device *device, UINT8 data)
+void upd7759_reset_w(void *_info, UINT8 data)
+{
+	/* update the reset value */
+	//upd7759_state *chip = get_safe_token(device);
+	upd7759_state *chip = (upd7759_state *)_info;
+	UINT8 oldreset = chip->reset;
+	chip->reset = (data != 0);
+
+	/* update the stream first */
+	//stream_update(chip->channel);
+
+	/* on the falling edge, reset everything */
+	if (oldreset && !chip->reset)
+		upd7759_reset(chip);
+}
+
+//void upd7759_start_w(running_device *device, UINT8 data)
+void upd7759_start_w(void *_info, UINT8 data)
+{
+	/* update the start value */
+	//upd7759_state *chip = get_safe_token(device);
+	upd7759_state *chip = (upd7759_state *)_info;
+	UINT8 oldstart = chip->start;
+	chip->start = (data != 0);
+
+#ifdef _DEBUG
+	if (DEBUG_STATES) logerror("upd7759_start_w: %d->%d\n", oldstart, chip->start);
+#endif
+
+	/* update the stream first */
+	//stream_update(chip->channel);
+
+	/* on the rising edge, if we're idle, start going, but not if we're held in reset */
+	if (chip->state == STATE_IDLE && !oldstart && chip->start && chip->reset)
+	{
+		chip->state = STATE_START;
+
+		/* for slave mode, start the timer going */
+		//if (chip->timer)
+		//	timer_adjust_oneshot(chip->timer, attotime_zero, 0);
+		chip->clocks_left = 0;
+	}
+}
+
+
+//WRITE8_DEVICE_HANDLER( upd7759_port_w )
+void upd7759_port_w(void *_info, offs_t offset, UINT8 data)
+{
+	/* update the FIFO value */
+	//upd7759_state *chip = get_safe_token(device);
+	upd7759_state *chip = (upd7759_state *)_info;
+	
+	if (! chip->ChipMode)
+	{
+		chip->fifo_in = data;
+	}
+	else
+	{
+		// Valley Bell: added FIFO buffer for Slave mode
+		chip->data_bufchip->dbuf_pos_write = data;
+		chip->dbuf_pos_write ++;
+		chip->dbuf_pos_write &= 0x3F;
+	}
+}
+
+
+//int upd7759_busy_r(running_device *device)
+int upd7759_busy_r(void *_info)
+{
+	/* return /BUSY */
+	//upd7759_state *chip = get_safe_token(device);
+	upd7759_state *chip = (upd7759_state *)_info;
+	return (chip->state == STATE_IDLE);
+}
+
+
+//void upd7759_set_bank_base(running_device *device, UINT32 base)
+void upd7759_set_bank_base(void *_info, UINT32 base)
+{
+	//upd7759_state *chip = get_safe_token(device);
+	upd7759_state *chip = (upd7759_state *)_info;
+	chip->rom = chip->rombase + base;
+	chip->romoffset = base;
+}
+
+void upd7759_write(void *info, UINT8 Port, UINT8 Data)
+{
+	switch(Port)
+	{
+	case 0x00:
+		upd7759_reset_w(info, Data);
+		break;
+	case 0x01:
+		upd7759_start_w(info, Data);
+		break;
+	case 0x02:
+		upd7759_port_w(info, 0x00, Data);
+		break;
+	case 0x03:
+		upd7759_set_bank_base(info, Data * 0x20000);
+		break;
+	}
+	
+	return;
+}
+
+void upd7759_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					 const UINT8* ROMData)
+{
+	upd7759_state *chip = (upd7759_state *)_info;
+	
+	if (chip->romsize != ROMSize)
+	{
+		chip->rombase = (UINT8*)realloc(chip->rombase, ROMSize);
+		chip->romsize = ROMSize;
+		memset(chip->rombase, 0xFF, ROMSize);
+		
+		chip->rom = chip->rombase + chip->romoffset;
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(chip->rombase + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( upd7759 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(upd7759_state);			break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( upd7759 );		break;
+		case DEVINFO_FCT_STOP:							// Nothing										break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( upd7759 );		break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "UPD7759");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "NEC ADPCM");					break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+
+
+//DEFINE_LEGACY_SOUND_DEVICE(UPD7759, upd7759);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/upd7759.h Added

@@ -0,0 +1,44 @@
+#pragma once
+
+//#include "devlegcy.h"
+
+/* There are two modes for the uPD7759, selected through the !MD pin.
+   This is the mode select input.  High is stand alone, low is slave.
+   We're making the assumption that nobody switches modes through
+   software. */
+
+#define UPD7759_STANDARD_CLOCK		640000
+
+typedef struct _upd7759_interface upd7759_interface;
+struct _upd7759_interface
+{
+	//void (*drqcallback)(running_device *device, int param);	/* drq callback (per chip, slave mode only) */
+	void (*drqcallback)(int param);	/* drq callback (per chip, slave mode only) */
+};
+
+void upd7759_update(void *chip, stream_sample_t **outputs, int samples);
+void device_reset_upd7759(void *chip);
+int device_start_upd7759(void **chip, int clock);
+void device_stop_upd7759(void *chip);
+
+void upd7759_mute(void *chip, int mute);
+
+//void upd7759_set_bank_base(running_device *device, offs_t base);
+
+//void upd7759_reset_w(running_device *device, UINT8 data);
+//void upd7759_start_w(running_device *device, UINT8 data);
+//int upd7759_busy_r(running_device *device);
+//WRITE8_DEVICE_HANDLER( upd7759_port_w );
+
+void upd7759_set_bank_base(void *chip, offs_t base);
+
+void upd7759_reset_w(void *chip, UINT8 data);
+void upd7759_start_w(void *chip, UINT8 data);
+int upd7759_busy_r(void *chip);
+void upd7759_port_w(void *chip, offs_t offset, UINT8 data);
+
+void upd7759_write(void *chip, UINT8 Port, UINT8 Data);
+void upd7759_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					   const UINT8* ROMData);
+
+//DECLARE_LEGACY_SOUND_DEVICE(UPD7759, upd7759);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vrc7tone.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.c Added

@@ -0,0 +1,636 @@
+/* Mednafen - Multi-system Emulator
+	*
+	* 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
+	*/
+
+//#include "vb.h"
+#include <string.h>
+#include <stdlib.h>
+#include "mamedef.h"
+#include "vsu.h"
+
+typedef struct
+{
+	UINT8 IntlControl6;
+	UINT8 LeftLevel6;
+	UINT8 RightLevel6;
+	UINT16 Frequency6;
+	UINT16 EnvControl6;	// Channel 5/6 extra functionality tacked on too.
+
+	UINT8 RAMAddress6;
+
+	UINT8 SweepControl;
+
+	UINT8 WaveData50x20;
+
+	UINT8 ModData0x20;
+
+	//
+	//
+	//
+	INT32 EffFreq6;
+	INT32 Envelope6;
+
+	INT32 WavePos6;
+	INT32 ModWavePos;
+
+	INT32 LatcherClockDivider6;
+
+	INT32 FreqCounter6;
+	INT32 IntervalCounter6;
+	INT32 EnvelopeCounter6;
+	INT32 SweepModCounter;
+
+	INT32 EffectsClockDivider6;
+	INT32 IntervalClockDivider6;
+	INT32 EnvelopeClockDivider6;
+	INT32 SweepModClockDivider;
+
+	INT32 NoiseLatcherClockDivider;
+	UINT32 NoiseLatcher;
+
+	UINT32 lfsr;
+
+	//INT32 last_output62;
+	INT32 last_ts;
+
+	//Blip_Buffer *sbuf2;
+	//Blip_Synth<blip_good_quality, 1024> Synth;
+	int clock;
+	int smplrate;
+	UINT8 Muted6;
+	// values for Timing Calculation
+	int tm_smpl;
+	int tm_clk;
+} vsu_state;
+
+static void VSU_Power(vsu_state* chip);
+//void VSU_Write(UINT8 ChipID, UINT32 A, UINT8 V);
+
+INLINE void VSU_CalcCurrentOutput(vsu_state* chip, int ch, int* left, int* right);
+static void VSU_Update(vsu_state* chip, INT32 timestamp, int* outleft, int* outright);
+
+
+static const int Tap_LUT8 = { 15 - 1, 11 - 1, 14 - 1, 5 - 1, 9 - 1, 7 - 1, 10 - 1, 12 - 1 };
+
+static void VSU_Power(vsu_state* chip)
+{
+	int ch;
+	
+	chip->SweepControl = 0;
+	chip->SweepModCounter = 0;
+	chip->SweepModClockDivider = 1;
+
+	for(ch = 0; ch < 6; ch++)
+	{
+		chip->IntlControlch = 0;
+		chip->LeftLevelch = 0;
+		chip->RightLevelch = 0;
+		chip->Frequencych = 0;
+		chip->EnvControlch = 0;
+		chip->RAMAddressch = 0;
+
+		chip->EffFreqch = 0;
+		chip->Envelopech = 0;
+		chip->WavePosch = 0;
+		chip->FreqCounterch = 0;
+		chip->IntervalCounterch = 0;
+		chip->EnvelopeCounterch = 0;
+
+		chip->EffectsClockDividerch = 4800;
+		chip->IntervalClockDividerch = 4;
+		chip->EnvelopeClockDividerch = 4;
+
+		chip->LatcherClockDividerch = 120;
+	}
+
+
+	chip->NoiseLatcherClockDivider = 120;
+	chip->NoiseLatcher = 0;
+
+	memset(chip->WaveData, 0, sizeof(chip->WaveData));
+	memset(chip->ModData, 0, sizeof(chip->ModData));
+
+	chip->last_ts = 0;
+}
+
+void VSU_Write(void *_info, UINT32 A, UINT8 V)
+{
+	vsu_state* chip = (vsu_state *)_info;
+	
+	A <<= 2;
+	A &= 0x7FF;
+
+	//Update(timestamp);
+
+	//printf("VSU Write: %d, %08x %02x\n", timestamp, A, V);
+
+	if(A < 0x280)
+		chip->WaveDataA >> 7(A >> 2) & 0x1F = V & 0x3F;
+	else if(A < 0x400)
+	{
+		//if(A >= 0x300)
+		// printf("Modulation mirror write? %08x %02x\n", A, V);
+		chip->ModData(A >> 2) & 0x1F = V;
+	}
+	else if(A < 0x600)
+	{
+		int ch = (A >> 6) & 0xF;
+
+		//if(ch < 6)
+		//printf("Ch: %d, Reg: %d, Value: %02x\n", ch, (A >> 2) & 0xF, V);
+	
+		if(ch > 5)
+		{
+			if(A == 0x580 && (V & 1))
+			{
+				int i;
+				//puts("STOP, HAMMER TIME");
+				for(i = 0; i < 6; i++)
+					chip->IntlControli &= ~0x80;
+			}
+		}
+		else
+			switch((A >> 2) & 0xF)
+			{
+			case 0x0:
+				chip->IntlControlch = V & ~0x40;
+
+				if(V & 0x80)
+				{
+					chip->EffFreqch = chip->Frequencych;
+					if(ch == 5)
+						chip->FreqCounterch = 10 * (2048 - chip->EffFreqch);
+					else
+						chip->FreqCounterch = 2048 - chip->EffFreqch;
+					chip->IntervalCounterch = (V & 0x1F) + 1;
+					chip->EnvelopeCounterch = (chip->EnvControlch & 0x7) + 1;
+
+					if(ch == 4)
+					{
+						chip->SweepModCounter = (chip->SweepControl >> 4) & 7;
+						chip->SweepModClockDivider = (chip->SweepControl & 0x80) ? 8 : 1;
+						chip->ModWavePos = 0;
+					}
+
+					chip->WavePosch = 0;
+
+					if(ch == 5)
+						chip->lfsr = 1;
+
+					//if(!(chip->IntlControlch & 0x80))
+					// chip->Envelopech = (chip->EnvControlch >> 4) & 0xF;
+
+					chip->EffectsClockDividerch = 4800;
+					chip->IntervalClockDividerch = 4;
+					chip->EnvelopeClockDividerch = 4;
+				}
+				break;
+
+			case 0x1:
+				chip->LeftLevelch = (V >> 4) & 0xF;
+				chip->RightLevelch = (V >> 0) & 0xF;
+				break;
+
+			case 0x2:
+				chip->Frequencych &= 0xFF00;
+				chip->Frequencych |= V << 0;
+				chip->EffFreqch &= 0xFF00;
+				chip->EffFreqch |= V << 0;
+				break;
+
+			case 0x3:
+				chip->Frequencych &= 0x00FF;
+				chip->Frequencych |= (V & 0x7) << 8;
+				chip->EffFreqch &= 0x00FF;
+				chip->EffFreqch |= (V & 0x7) << 8;
+				break;
+
+			case 0x4:
+				chip->EnvControlch &= 0xFF00;
+				chip->EnvControlch |= V << 0;
+
+				chip->Envelopech = (V >> 4) & 0xF;
+				break;
+
+			case 0x5:
+				chip->EnvControlch &= 0x00FF;
+				if(ch == 4)
+					chip->EnvControlch |= (V & 0x73) << 8;
+				else if(ch == 5)
+					chip->EnvControlch |= (V & 0x73) << 8;
+				else
+					chip->EnvControlch |= (V & 0x03) << 8;
+				break;
+
+			case 0x6:
+				chip->RAMAddressch = V & 0xF;
+				break;
+
+			case 0x7:
+				if(ch == 4)
+				{
+					chip->SweepControl = V;
+				}
+				break;
+			}
+	}
+}
+
+INLINE void VSU_CalcCurrentOutput(vsu_state* chip, int ch, int* left, int* right)
+{
+	int WD;
+	int l_ol, r_ol;
+
+	if(!(chip->IntlControlch & 0x80) || chip->Mutedch)
+	{
+		*left = *right = 0;
+		return;
+	}
+
+	if(ch == 5)
+		WD = chip->NoiseLatcher;	//(NoiseLatcher << 6) - NoiseLatcher;
+	else
+	{
+		if(chip->RAMAddressch > 4)
+			WD = 0x20;	//0;
+		else
+			WD = chip->WaveDatachip->RAMAddresschchip->WavePosch;	// - 0x20;
+	}
+	l_ol = chip->Envelopech * chip->LeftLevelch;
+	if(l_ol)
+	{
+		l_ol >>= 3;
+		l_ol += 1;
+	}
+
+	r_ol = chip->Envelopech * chip->RightLevelch;
+	if(r_ol)
+	{
+		r_ol >>= 3;
+		r_ol += 1;
+	}
+
+	WD -= 0x20;
+	(*left) += WD * l_ol;
+	(*right) += WD * r_ol;
+	return;
+}
+
+static void VSU_Update(vsu_state* chip, INT32 timestamp, int* outleft, int* outright)
+{
+	//int left, right;
+	int ch;
+
+	*outleft = 0;
+	*outright = 0;
+	
+	//puts("VSU Start");
+	for(ch = 0; ch < 6; ch++)
+	{
+		INT32 clocks = timestamp - chip->last_ts;
+		//INT32 running_timestamp = chip->last_ts;
+
+		if(!(chip->IntlControlch & 0x80) || chip->Mutedch)
+			continue;	// channel disabled - don't add anything to output
+		
+		//// Output sound here
+		//VSU_CalcCurrentOutput(chip, ch, &left, &right);
+		//Synth.offset_inline(running_timestamp, left - chip->last_outputch0, sbuf0);
+		//Synth.offset_inline(running_timestamp, right - chip->last_outputch1, sbuf1);
+		//chip->last_outputch0 = left;
+		//chip->last_outputch1 = right;
+
+		//if(!(chip->IntlControlch & 0x80))
+		//	continue;
+
+		while(clocks > 0)
+		{
+			INT32 chunk_clocks = clocks;
+
+			if(chunk_clocks > chip->EffectsClockDividerch)
+				chunk_clocks = chip->EffectsClockDividerch;
+
+			if(ch == 5)
+			{
+				if(chunk_clocks > chip->NoiseLatcherClockDivider)
+					chunk_clocks = chip->NoiseLatcherClockDivider;
+			}
+			else
+			{
+				if(chip->EffFreqch >= 2040)
+				{
+					if(chunk_clocks > chip->LatcherClockDividerch)
+						chunk_clocks = chip->LatcherClockDividerch;
+				}
+				else
+				{
+					if(chunk_clocks > chip->FreqCounterch)
+						chunk_clocks = chip->FreqCounterch;
+				}
+			}
+
+			if(ch == 5 && chunk_clocks > chip->NoiseLatcherClockDivider)
+				chunk_clocks = chip->NoiseLatcherClockDivider;
+
+			chip->FreqCounterch -= chunk_clocks;
+			while(chip->FreqCounterch <= 0)
+			{
+				if(ch == 5)
+				{
+					int feedback = ((chip->lfsr >> 7) & 1) ^ ((chip->lfsr >> Tap_LUT(chip->EnvControl5 >> 12) & 0x7) & 1);
+					chip->lfsr = ((chip->lfsr << 1) & 0x7FFF) | feedback;
+	
+					chip->FreqCounterch += 10 * (2048 - chip->EffFreqch);
+				}
+				else
+				{
+					chip->FreqCounterch += 2048 - chip->EffFreqch;
+					chip->WavePosch = (chip->WavePosch + 1) & 0x1F;
+				}
+			}
+
+			chip->LatcherClockDividerch -= chunk_clocks;
+			while(chip->LatcherClockDividerch <= 0)
+				chip->LatcherClockDividerch += 120;
+
+			if(ch == 5)
+			{
+				chip->NoiseLatcherClockDivider -= chunk_clocks;
+				if(!chip->NoiseLatcherClockDivider)
+				{
+					chip->NoiseLatcherClockDivider = 120;
+					chip->NoiseLatcher = ((chip->lfsr & 1) << 6) - (chip->lfsr & 1);
+				}
+			}
+
+			chip->EffectsClockDividerch -= chunk_clocks;
+			while(chip->EffectsClockDividerch <= 0)
+			{
+				chip->EffectsClockDividerch += 4800;
+
+				chip->IntervalClockDividerch--;
+				while(chip->IntervalClockDividerch <= 0)
+				{
+					chip->IntervalClockDividerch += 4;
+
+					if(chip->IntlControlch & 0x20)
+					{
+						chip->IntervalCounterch--;
+						if(!chip->IntervalCounterch)
+						{
+							chip->IntlControlch &= ~0x80;
+						}
+					}
+
+					chip->EnvelopeClockDividerch--;
+					while(chip->EnvelopeClockDividerch <= 0)
+					{
+						chip->EnvelopeClockDividerch += 4;
+
+						if(chip->EnvControlch & 0x0100)			// Enveloping enabled?
+						{
+							chip->EnvelopeCounterch--;
+							if(!chip->EnvelopeCounterch)
+							{
+								chip->EnvelopeCounterch = (chip->EnvControlch & 0x7) + 1;
+
+								if(chip->EnvControlch & 0x0008)	// Grow
+								{
+									if(chip->Envelopech < 0xF || (chip->EnvControlch & 0x200))
+										chip->Envelopech = (chip->Envelopech + 1) & 0xF;
+								}
+								else						// Decay
+								{
+									if(chip->Envelopech > 0 || (chip->EnvControlch & 0x200))
+										chip->Envelopech = (chip->Envelopech - 1) & 0xF;
+								}
+							}
+						}
+
+					} // end while(chip->EnvelopeClockDividerch <= 0)
+				} // end while(chip->IntervalClockDividerch <= 0)
+
+				if(ch == 4)
+				{
+					chip->SweepModClockDivider--;
+					while(chip->SweepModClockDivider <= 0)
+					{
+						chip->SweepModClockDivider += (chip->SweepControl & 0x80) ? 8 : 1;
+
+						if(((chip->SweepControl >> 4) & 0x7) && (chip->EnvControlch & 0x4000))
+						{
+							if(chip->SweepModCounter)
+								chip->SweepModCounter--;
+
+							if(!chip->SweepModCounter)
+							{
+								chip->SweepModCounter = (chip->SweepControl >> 4) & 0x7;
+
+								if(chip->EnvControlch & 0x1000)	// Modulation
+								{
+									if(chip->ModWavePos < 32 || (chip->EnvControlch & 0x2000))
+									{
+										chip->ModWavePos &= 0x1F;
+
+										chip->EffFreqch = (chip->EffFreqch + (INT8)chip->ModDatachip->ModWavePos);
+										if(chip->EffFreqch < 0)
+										{
+											//puts("Underflow");
+											chip->EffFreqch = 0;
+										}
+										else if(chip->EffFreqch > 0x7FF)
+										{
+											//puts("Overflow");
+											chip->EffFreqch = 0x7FF;
+										}
+										chip->ModWavePos++;
+									}
+									//puts("Mod");
+								}
+								else						// Sweep
+								{
+									INT32 delta = chip->EffFreqch >> (chip->SweepControl & 0x7);
+									INT32 NewFreq = chip->EffFreqch + ((chip->SweepControl & 0x8) ? delta : -delta);
+
+									//printf("Sweep(%d): Old: %d, New: %d\n", ch, EffFreqch, NewFreq);
+
+									if(NewFreq < 0)
+										chip->EffFreqch = 0;
+									else if(NewFreq > 0x7FF)
+									{
+										//chip->EffFreqch = 0x7FF;
+										chip->IntlControlch &= ~0x80;
+									}
+									else
+										chip->EffFreqch = NewFreq;
+								}
+							}
+						}
+					} // end while(chip->SweepModClockDivider <= 0)
+				} // end if(ch == 4)
+			} // end while(chip->EffectsClockDividerch <= 0)
+			clocks -= chunk_clocks;
+			//running_timestamp += chunk_clocks;
+
+			// Output sound here too.
+			//VSU_CalcCurrentOutput(chip, ch, &left, &right);
+			//Synth.offset_inline(running_timestamp, left - chip->last_outputch0, sbuf0);
+			//Synth.offset_inline(running_timestamp, right - chip->last_outputch1, sbuf1);
+			//chip->last_outputch0 = left;
+			//chip->last_outputch1 = right;
+		}
+
+		VSU_CalcCurrentOutput(chip, ch, outleft, outright);
+	}
+	chip->last_ts = timestamp;
+	//puts("VSU End");
+}
+
+/*void VSU_EndFrame(INT32 timestamp)
+{
+	Update(chip, timestamp);
+	chip->last_ts = 0;
+}*/
+
+/*int VSU_StateAction(StateMem *sm, int load, int data_only)
+{
+	SFORMAT StateRegs =
+	{
+		SFARRAY(IntlControl, 6),
+		SFARRAY(LeftLevel, 6),
+		SFARRAY(RightLevel, 6),
+
+		SFARRAY16(Frequency, 6),
+		SFARRAY16(EnvControl, 6),
+		SFARRAY(RAMAddress, 6),
+		SFVAR(SweepControl),
+
+		SFARRAY(&WaveData00, 5 * 0x20),
+		SFARRAY(ModData, 0x20),
+
+		SFARRAY32(EffFreq, 6),
+		SFARRAY32(Envelope, 6),
+	
+		SFARRAY32(WavePos, 6),
+
+		SFVAR(ModWavePos),
+
+		SFARRAY32(LatcherClockDivider, 6),
+		SFARRAY32(FreqCounter, 6),
+		SFARRAY32(IntervalCounter, 6),
+		SFARRAY32(EnvelopeCounter, 6),
+
+		SFVAR(SweepModCounter),
+
+		SFARRAY32(EffectsClockDivider, 6),
+		SFARRAY32(IntervalClockDivider, 6),
+		SFARRAY32(EnvelopeClockDivider, 6),
+
+		SFVAR(SweepModClockDivider),
+
+		SFVAR(NoiseLatcherClockDivider),
+		SFVAR(NoiseLatcher),
+		SFVAR(lfsr),
+		SFEND
+	};
+
+	int ret = MDFNSS_StateAction(sm, load, data_only, StateRegs, "VSU");
+
+
+	if(load)
+	{
+
+	}
+
+	return(ret);
+}*/
+
+
+void vsu_stream_update(void *_info, stream_sample_t **outputs, int samples)
+{
+	vsu_state* chip = (vsu_state *)_info;
+	int curSmpl;
+	
+	for (curSmpl = 0; curSmpl < samples; curSmpl ++)
+	{
+		chip->tm_smpl ++;
+		chip->tm_clk = (int)((INT64)chip->tm_smpl * chip->clock / chip->smplrate);
+		
+		VSU_Update(chip, chip->tm_clk, &outputs0curSmpl, &outputs1curSmpl);
+		if (chip->last_ts >= chip->clock)
+		{
+			chip->last_ts -= chip->clock;
+			chip->tm_clk -= chip->clock;
+			chip->tm_smpl -= chip->smplrate;
+		}
+		
+		// Volume per channel: 0x1F (envelope/volume) * 0x3F (unsigned sample) = 0x7A1 (~0x800)
+		// I turned the samples into signed format (-0x20..0x1F), so the used range is +-0x400.
+		// 16-bit values are up to 0x8000
+		// 0x8000 / 0x400 / 6 = 5.33 (possible boost without clipping)
+		// Because music usually doesn't use the maximum volume (SFX do), I boost by 2^3 = 8.
+		outputs0curSmpl <<= 3;
+		outputs1curSmpl <<= 3;
+	}
+	return;
+}
+
+int device_start_vsu(void **_info, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	vsu_state* chip;
+	UINT8 CurChn;
+	
+	chip = (vsu_state *) calloc(1, sizeof(vsu_state));
+	*_info = (void *) chip;
+
+	chip->clock = clock;
+	chip->smplrate = chip->clock / 120;	// most effects run with a /120 divider
+	if (((CHIP_SAMPLING_MODE & 0x01) && chip->smplrate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		chip->smplrate = CHIP_SAMPLE_RATE;
+	
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		chip->MutedCurChn = 0x00;
+	
+	return chip->smplrate; 
+}
+
+void device_stop_vsu(void *chip)
+{
+	free(chip);
+}
+
+void device_reset_vsu(void *_info)
+{
+	vsu_state* chip = (vsu_state *)_info;
+	
+	VSU_Power(chip);
+	chip->tm_smpl = 0;
+	chip->tm_clk = 0;
+	
+	return;
+}
+
+void vsu_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	vsu_state* chip = (vsu_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 6; CurChn ++)
+		chip->MutedCurChn = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/vsu.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.c Added

@@ -0,0 +1,474 @@
+
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h>	// for NULL
+#include "mamedef.h"
+
+typedef UINT8	BYTE;
+typedef UINT8	byte;
+typedef UINT8	uint8;
+
+//#include <windows.h>
+//#include "types.h"
+//#include "./nec/necintrf.h"
+//#include "ws_memory.h"
+#include "ws_initialIo.h"
+//#include "ws_io.h"
+#include "ws_audio.h"
+//#include "wsr_player.h"
+
+#define SNDP	chip->ws_ioRam0x80
+#define SNDV	chip->ws_ioRam0x88
+#define SNDSWP	chip->ws_ioRam0x8C
+#define SWPSTP	chip->ws_ioRam0x8D
+#define NSCTL	chip->ws_ioRam0x8E
+#define WAVDTP	chip->ws_ioRam0x8F
+#define SNDMOD	chip->ws_ioRam0x90
+#define SNDOUT	chip->ws_ioRam0x91
+#define PCSRL	chip->ws_ioRam0x92
+#define PCSRH	chip->ws_ioRam0x93
+#define DMASL	chip->ws_ioRam0x40
+#define DMASH	chip->ws_ioRam0x41
+#define DMASB	chip->ws_ioRam0x42
+#define DMADB	chip->ws_ioRam0x43
+#define DMADL	chip->ws_ioRam0x44
+#define DMADH	chip->ws_ioRam0x45
+#define DMACL	chip->ws_ioRam0x46
+#define DMACH	chip->ws_ioRam0x47
+#define DMACTL	chip->ws_ioRam0x48
+#define SDMASL	chip->ws_ioRam0x4A
+#define SDMASH	chip->ws_ioRam0x4B
+#define SDMASB	chip->ws_ioRam0x4C
+#define SDMACL	chip->ws_ioRam0x4E
+#define SDMACH	chip->ws_ioRam0x4F
+#define SDMACTL	chip->ws_ioRam0x52
+
+//SoundDMA の転送間隔
+// 実際の数値が分からないので、予想です
+// サンプリング周期から考えてみて以下のようにした
+// 12KHz = 1.00HBlank = 256cycles間隔
+// 16KHz = 0.75HBlank = 192cycles間隔
+// 20KHz = 0.60HBlank = 154cycles間隔
+// 24KHz = 0.50HBlank = 128cycles間隔
+const int DMACycles4 = { 256, 192, 154, 128 };
+
+typedef struct
+{
+	int wave;
+	int lvol;
+	int rvol;
+	long offset;
+	long delta;
+	long pos;
+	UINT8 Muted;
+} WS_AUDIO;
+
+typedef struct
+{
+	WS_AUDIO ws_audio4;
+	int sweepDelta;
+	int sweepOffset;
+	int SweepTime;
+	int SweepStep;
+	int SweepCount;
+	int SweepFreq;
+	int NoiseType;
+	int NoiseRng;
+	int MainVolume;
+	int PCMVolumeLeft;
+	int PCMVolumeRight;
+	//int WaveAdrs;
+
+	UINT8	 ws_ioRam0x100;
+	UINT8	*ws_internalRam;
+	
+	int clock;
+	int smplrate;
+} wsa_state;
+
+#define DEFAULT_CLOCK	3072000
+
+
+static void ws_audio_process(wsa_state* chip);
+
+
+
+int ws_audio_init(void **_info, int clock, int SampleRate, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	wsa_state* chip;
+	UINT8 CurChn;
+	
+	chip = (wsa_state *) calloc(1, sizeof(wsa_state));
+	*_info = (void *) chip;
+	
+	chip->ws_internalRam = (UINT8*)malloc(0x4000);	// actual size is 64 KB, but the audio chip can only access 16 KB
+	
+	chip->clock = clock;
+	chip->smplrate = SampleRate;
+	if (((CHIP_SAMPLING_MODE & 0x01) && chip->smplrate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		chip->smplrate = CHIP_SAMPLE_RATE;
+	
+	for (CurChn = 0; CurChn < 4; CurChn ++)
+		chip->ws_audioCurChn.Muted = 0x00;
+	
+	return chip->smplrate; 
+}
+
+void ws_audio_reset(void *_info)
+{
+	wsa_state* chip = (wsa_state *)_info;
+	int i;
+	
+	memset(&chip->ws_audio, 0, sizeof(WS_AUDIO));
+	chip->SweepTime = 0;
+	chip->SweepStep = 0;
+	chip->NoiseType = 0;
+	chip->NoiseRng = 1;
+	chip->MainVolume = 0x02;	// 0x04
+	chip->PCMVolumeLeft = 0;
+	chip->PCMVolumeRight = 0;
+	
+	chip->sweepDelta = chip->clock * 256 / chip->smplrate;
+	chip->sweepOffset = 0;
+	
+	for (i=0x80;i<0xc9;i++)
+		ws_audio_port_write(chip, i, initialIoValuei);
+}
+
+void ws_audio_done(void *_info)
+{
+	wsa_state* chip = (wsa_state *)_info;
+	
+	free(chip->ws_internalRam);
+	chip->ws_internalRam = NULL;
+
+	free(chip);
+	
+	return;
+}
+
+void ws_audio_update(void *_info, stream_sample_t** buffer, int length)
+{
+	wsa_state* chip = (wsa_state *)_info;
+	stream_sample_t* bufL;
+	stream_sample_t* bufR;
+	int i, ch, cnt;
+	long w, l, r;
+
+	bufL = buffer0;
+	bufR = buffer1;
+	for (i=0; i<length; i++)
+	{
+		chip->sweepOffset += chip->sweepDelta;
+		while(chip->sweepOffset >= 0x10000)
+		{
+			chip->sweepOffset -= 0x10000;
+			ws_audio_process(chip);
+		}
+		l = r = 0;
+
+		for (ch=0; ch<4; ch++)
+		{
+			if (chip->ws_audioch.Muted)
+				continue;
+			
+			if ((ch==1) && (SNDMOD&0x20))
+			{
+				// Voice出力
+				w = chip->ws_ioRam0x89;
+				w -= 0x80;
+				l += chip->PCMVolumeLeft * w;
+				r += chip->PCMVolumeRight * w;
+			}
+			else if (SNDMOD&(1<<ch))
+			{
+				if ((ch==3) && (SNDMOD&0x80))
+				{
+					//Noise
+
+					//OSWANの擬似乱数の処理と同等のつもり
+#define BIT(n) (1<<n)
+					const unsigned long noise_mask8 =
+					{
+						BIT(0)|BIT(1),
+						BIT(0)|BIT(1)|BIT(4)|BIT(5),
+						BIT(0)|BIT(1)|BIT(3)|BIT(4),
+						BIT(0)|BIT(1)|BIT(4)|BIT(6),
+						BIT(0)|BIT(2),
+						BIT(0)|BIT(3),
+						BIT(0)|BIT(4),
+						BIT(0)|BIT(2)|BIT(3)|BIT(4)
+					};
+
+					const unsigned long noise_bit8 =
+					{
+						BIT(15),
+						BIT(14),
+						BIT(13),
+						BIT(12),
+						BIT(11),
+						BIT(10),
+						BIT(9),
+						BIT(8)
+					};
+
+					int Masked, XorReg;
+
+					chip->ws_audioch.offset += chip->ws_audioch.delta;
+					cnt = chip->ws_audioch.offset>>16;
+					chip->ws_audioch.offset &= 0xffff;
+					while (cnt > 0)
+					{
+						cnt--;
+
+						chip->NoiseRng &= noise_bitchip->NoiseType-1;
+						if (!chip->NoiseRng) chip->NoiseRng = noise_bitchip->NoiseType-1;
+
+						Masked = chip->NoiseRng & noise_maskchip->NoiseType;
+						XorReg = 0;
+						while (Masked)
+						{
+							XorReg ^= Masked&1;
+							Masked >>= 1;
+						}
+						if (XorReg)
+							chip->NoiseRng |= noise_bitchip->NoiseType;
+						chip->NoiseRng >>= 1;
+					}
+
+					PCSRL = (byte)(chip->NoiseRng&0xff);
+					PCSRH = (byte)((chip->NoiseRng>>8)&0x7f);
+
+					w = (chip->NoiseRng&1)? 0x7f:-0x80;
+					l += chip->ws_audioch.lvol * w;
+					r += chip->ws_audioch.rvol * w;
+				}
+				else
+				{
+					chip->ws_audioch.offset += chip->ws_audioch.delta;
+					cnt = chip->ws_audioch.offset>>16;
+					chip->ws_audioch.offset &= 0xffff;
+					chip->ws_audioch.pos += cnt;
+					chip->ws_audioch.pos &= 0x1f;
+					w = chip->ws_internalRam(chip->ws_audioch.wave&0xFFF0) + (chip->ws_audioch.pos>>1);
+					if ((chip->ws_audioch.pos&1) == 0)
+						w = (w<<4)&0xf0;	//下位ニブル
+					else
+						w = w&0xf0;			//上位ニブル
+					w -= 0x80;
+					l += chip->ws_audioch.lvol * w;
+					r += chip->ws_audioch.rvol * w;
+				}
+			}
+		}
+
+		/*l = l * chip->MainVolume;
+		if (l > 0x7fff) l = 0x7fff;
+		else if (l < -0x8000) l = -0x8000;
+		r = r * chip->MainVolume;
+		if (r > 0x7fff) r = 0x7fff;
+		else if (r < -0x8000) r = -0x8000;
+
+		*buffer++ = (short)l;
+		*buffer++ = (short)r;*/
+		bufLi = l * chip->MainVolume;
+		bufRi = r * chip->MainVolume;
+	}
+}
+
+void ws_audio_port_write(void *_info, BYTE port, BYTE value)
+{
+	wsa_state* chip = (wsa_state *)_info;
+	int i;
+	long freq;
+
+	//Update_SampleData();
+
+	chip->ws_ioRamport=value;
+
+	switch (port)
+	{
+	// 0x80-0x87の周波数レジスタについて
+	// - ロックマン&フォルテの0x0fの曲では、周波数=0xFFFF の音が不要
+	// - デジモンディープロジェクトの0x0dの曲のノイズは 周波数=0x07FF で音を出す
+	// →つまり、0xFFFF の時だけ音を出さないってことだろうか。
+	// でも、0x07FF の時も音を出さないけど、ノイズだけ音を出すのかも。
+	case 0x80:
+	case 0x81:	i=(((unsigned int)chip->ws_ioRam0x81)<<8)+((unsigned int)chip->ws_ioRam0x80);
+				if (i == 0xffff)
+					freq = 0;
+				else
+					freq = chip->clock/(2048-(i&0x7ff));
+				chip->ws_audio0.delta = (long)((float)freq*(float)65536/(float)chip->smplrate);
+				break;
+	case 0x82:
+	case 0x83:	i=(((unsigned int)chip->ws_ioRam0x83)<<8)+((unsigned int)chip->ws_ioRam0x82);
+				if (i == 0xffff)
+					freq = 0;
+				else
+					freq = chip->clock/(2048-(i&0x7ff));
+				chip->ws_audio1.delta = (long)((float)freq*(float)65536/(float)chip->smplrate);
+				break;
+	case 0x84:
+	case 0x85:	i=(((unsigned int)chip->ws_ioRam0x85)<<8)+((unsigned int)chip->ws_ioRam0x84);
+				chip->SweepFreq = i;
+				if (i == 0xffff)
+					freq = 0;
+				else
+					freq = chip->clock/(2048-(i&0x7ff));
+				chip->ws_audio2.delta = (long)((float)freq*(float)65536/(float)chip->smplrate);
+				break;
+	case 0x86:
+	case 0x87:	i=(((unsigned int)chip->ws_ioRam0x87)<<8)+((unsigned int)chip->ws_ioRam0x86);
+				if (i == 0xffff)
+					freq = 0;
+				else
+					freq = chip->clock/(2048-(i&0x7ff));
+				chip->ws_audio3.delta = (long)((float)freq*(float)65536/(float)chip->smplrate);
+				break;
+	case 0x88:
+				chip->ws_audio0.lvol = (value>>4)&0xf;
+				chip->ws_audio0.rvol = value&0xf;
+				break;
+	case 0x89:
+				chip->ws_audio1.lvol = (value>>4)&0xf;
+				chip->ws_audio1.rvol = value&0xf;
+				break;
+	case 0x8A:
+				chip->ws_audio2.lvol = (value>>4)&0xf;
+				chip->ws_audio2.rvol = value&0xf;
+				break;
+	case 0x8B:
+				chip->ws_audio3.lvol = (value>>4)&0xf;
+				chip->ws_audio3.rvol = value&0xf;
+				break;
+	case 0x8C:
+				chip->SweepStep = (signed char)value;
+				break;
+	case 0x8D:
+				//Sweepの間隔は 1/375s = 2.666..ms
+				//CPU Clockで言うと 3072000/375 = 8192cycles
+				//ここの設定値をnとすると、8192cycles*(n+1) 間隔でSweepすることになる
+				//
+				//これを HBlank (256cycles) の間隔で言うと、
+				//　8192/256 = 32
+				//なので、32HBlank*(n+1) 間隔となる
+				chip->SweepTime = (((unsigned int)value)+1)<<5;
+				chip->SweepCount = chip->SweepTime;
+				break;
+	case 0x8E:
+				chip->NoiseType = value&7;
+				if (value&8) chip->NoiseRng = 1;	//ノイズカウンターリセット
+				break;
+	case 0x8F:
+				//WaveAdrs = (unsigned int)value<<6;
+				chip->ws_audio0.wave = (unsigned int)value<<6;
+				chip->ws_audio1.wave = chip->ws_audio0.wave + 0x10;
+				chip->ws_audio2.wave = chip->ws_audio1.wave + 0x10;
+				chip->ws_audio3.wave = chip->ws_audio2.wave + 0x10;
+				break;
+	case 0x90:
+				break;
+	case 0x91:
+				//ここでのボリューム調整は、内蔵Speakerに対しての調整だけらしいので、
+				//ヘッドフォン接続されていると認識させれば問題無いらしい。
+				chip->ws_ioRamport |= 0x80;
+				break;
+	case 0x92:
+	case 0x93:
+				break;
+	case 0x94:
+				chip->PCMVolumeLeft = (value&0xc)*2;
+				chip->PCMVolumeRight = ((value<<2)&0xc)*2;
+				break;
+	/*case 0x52:
+				if (value&0x80)
+					ws_timer_set(2, DMACyclesvalue&3);
+				break;*/
+	}
+}
+
+BYTE ws_audio_port_read(void *_info, BYTE port)
+{
+	wsa_state* chip = (wsa_state *)_info;
+	return (chip->ws_ioRamport);
+}
+
+// HBlank間隔で呼ばれる
+// Note: Must be called every 256 cycles (3072000 Hz clock), i.e. at 12000 Hz
+static void ws_audio_process(wsa_state* chip)
+{
+	long freq;
+
+	if (chip->SweepStep && (SNDMOD&0x40))
+	{
+		if (chip->SweepCount < 0)
+		{
+			chip->SweepCount = chip->SweepTime;
+			chip->SweepFreq += chip->SweepStep;
+			chip->SweepFreq &= 0x7FF;
+
+			//Update_SampleData();
+
+			freq = chip->clock/(2048-chip->SweepFreq);
+			chip->ws_audio2.delta = (long)((float)freq*(float)65536/(float)chip->smplrate);
+		}
+		chip->SweepCount--;
+	}
+}
+
+/*void ws_audio_sounddma(void)
+{
+	int i, j, b;
+
+	if ((SDMACTL&0x88)==0x80)
+	{
+		i=(SDMACH<<8)|SDMACL;
+		j=(SDMASB<<16)|(SDMASH<<8)|SDMASL;
+		b=cpu_readmem20(j);
+
+		Update_SampleData();
+
+		ws_ioRam0x89=b;
+		i--;
+		j++;
+		if(i<32)
+		{
+			i=0;
+			SDMACTL&=0x7F;
+		}
+		else
+		{
+			ws_timer_set(2, DMACyclesSDMACTL&3);
+		}
+		SDMASB=(byte)((j>>16)&0xFF);
+		SDMASH=(byte)((j>>8)&0xFF);
+		SDMASL=(byte)(j&0xFF);
+		SDMACH=(byte)((i>>8)&0xFF);
+		SDMACL=(byte)(i&0xFF);
+	}
+}*/
+
+void ws_write_ram(void *_info, UINT16 offset, UINT8 value)
+{
+	wsa_state* chip = (wsa_state *)_info;
+	
+	// RAM - 16 KB (WS) / 64 KB (WSC) internal RAM
+	if (offset >= 0x4000)
+		return;	// We only allocated 16 KB.
+	
+	chip->ws_internalRamoffset = value;
+	return;
+}
+
+void ws_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	wsa_state* chip = (wsa_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 4; CurChn ++)
+		chip->ws_audioCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_audio.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ws_initialIo.h Added

@@ -0,0 +1,271 @@
+////////////////////////////////////////////////////////////////////////////////
+// Initial I/O values
+////////////////////////////////////////////////////////////////////////////////
+//
+//
+//
+//
+//
+//
+//////////////////////////////////////////////////////////////////////////////
+
+uint8 initialIoValue256=
+{
+	0x00,//0
+	0x00,//1
+	0x9d,//2
+	0xbb,//3
+	0x00,//4
+	0x00,//5
+	0x00,//6
+	0x26,//7
+	0xfe,//8
+	0xde,//9
+	0xf9,//a
+	0xfb,//b
+	0xdb,//c
+	0xd7,//d
+	0x7f,//e
+	0xf5,//f
+	0x00,//10
+	0x00,//11
+	0x00,//12
+	0x00,//13
+	0x01,//14
+	0x00,//15
+	0x9e,//16
+	0x9b,//17
+	0x00,//18
+	0x00,//19
+	0x00,//1a
+	0x00,//1b
+	0x99,//1c
+	0xfd,//1d
+	0xb7,//1e
+	0xdf,//1f
+	0x30,//20
+	0x57,//21
+	0x75,//22
+	0x76,//23
+	0x15,//24
+	0x73,//25
+	0x77,//26
+	0x77,//27
+	0x20,//28
+	0x75,//29
+	0x50,//2a
+	0x36,//2b
+	0x70,//2c
+	0x67,//2d
+	0x50,//2e
+	0x77,//2f
+	0x57,//30
+	0x54,//31
+	0x75,//32
+	0x77,//33
+	0x75,//34
+	0x17,//35
+	0x37,//36
+	0x73,//37
+	0x50,//38
+	0x57,//39
+	0x60,//3a
+	0x77,//3b
+	0x70,//3c
+	0x77,//3d
+	0x10,//3e
+	0x73,//3f
+	0x00,//40
+	0x00,//41
+	0x00,//42
+	0x00,//43
+	0x00,//44
+	0x00,//45
+	0x00,//46
+	0x00,//47
+	0x00,//48
+	0x00,//49
+	0x00,//4a
+	0x00,//4b
+	0x00,//4c
+	0x00,//4d
+	0x00,//4e
+	0x00,//4f
+	0x00,//50
+	0x00,//51
+	0x00,//52
+	0x00,//53
+	0x00,//54
+	0x00,//55
+	0x00,//56
+	0x00,//57
+	0x00,//58
+	0x00,//59
+	0x00,//5a
+	0x00,//5b
+	0x00,//5c
+	0x00,//5d
+	0x00,//5e
+	0x00,//5f
+	0x0a,//60
+	0x00,//61
+	0x00,//62
+	0x00,//63
+	0x00,//64
+	0x00,//65
+	0x00,//66
+	0x00,//67
+	0x00,//68
+	0x00,//69
+	0x00,//6a
+	0x0f,//6b
+	0x00,//6c
+	0x00,//6d
+	0x00,//6e
+	0x00,//6f
+	0x00,//70
+	0x00,//71
+	0x00,//72
+	0x00,//73
+	0x00,//74
+	0x00,//75
+	0x00,//76
+	0x00,//77
+	0x00,//78
+	0x00,//79
+	0x00,//7a
+	0x00,//7b
+	0x00,//7c
+	0x00,//7d
+	0x00,//7e
+	0x00,//7f
+	0xFF,//80
+	0x07,//81
+	0xFF,//82
+	0x07,//83
+	0xFF,//84
+	0x07,//85
+	0xFF,//86
+	0x07,//87
+	0x00,//88
+	0x00,//89
+	0x00,//8a
+	0x00,//8b
+	0x00,//8c
+	0x1f,//8d 1d ?
+	0x00,//8e
+	0x00,//8f
+	0x00,//90
+	0x00,//91
+	0x00,//92
+	0x00,//93
+	0x00,//94
+	0x00,//95
+	0x00,//96
+	0x00,//97
+	0x00,//98
+	0x00,//99
+	0x00,//9a
+	0x00,//9b
+	0x00,//9c
+	0x00,//9d
+	0x03,//9e
+	0x00,//9f
+	0x87-2,//a0
+	0x00,//a1
+	0x00,//a2
+	0x00,//a3
+	0x0,//a4 2b
+	0x0,//a5 7f
+	0x4f,//a6
+	0xff,//a7 cf ?
+	0x00,//a8
+	0x00,//a9
+	0x00,//aa
+	0x00,//ab
+	0x00,//ac
+	0x00,//ad
+	0x00,//ae
+	0x00,//af
+	0x00,//b0
+	0xdb,//b1
+	0x00,//b2
+	0x00,//b3
+	0x00,//b4
+	0x40,//b5
+	0x00,//b6
+	0x00,//b7
+	0x00,//b8
+	0x00,//b9
+	0x01,//ba
+	0x00,//bb
+	0x42,//bc
+	0x00,//bd
+	0x83,//be
+	0x00,//bf
+	0x2f,//c0
+	0x3f,//c1
+	0xff,//c2
+	0xff,//c3
+	0x00,//c4
+	0x00,//c5
+	0x00,//c6
+	0x00,//c7
+
+	0xd1,//c8?
+	0xd1,//c9
+	0xd1,//ca
+	0xd1,//cb
+	0xd1,//cc
+	0xd1,//cd
+	0xd1,//ce
+	0xd1,//cf
+	0xd1,//d0
+	0xd1,//d1
+	0xd1,//d2
+	0xd1,//d3
+	0xd1,//d4
+	0xd1,//d5
+	0xd1,//d6
+	0xd1,//d7
+	0xd1,//d8
+	0xd1,//d9
+	0xd1,//da
+	0xd1,//db
+	0xd1,//dc
+	0xd1,//dd
+	0xd1,//de
+	0xd1,//df
+	0xd1,//e0
+	0xd1,//e1
+	0xd1,//e2
+	0xd1,//e3
+	0xd1,//e4
+	0xd1,//e5
+	0xd1,//e6
+	0xd1,//e7
+	0xd1,//e8
+	0xd1,//e9
+	0xd1,//ea
+	0xd1,//eb
+	0xd1,//ec
+	0xd1,//ed
+	0xd1,//ee
+	0xd1,//ef
+	0xd1,//f0
+	0xd1,//f1
+	0xd1,//f2
+	0xd1,//f3
+	0xd1,//f4
+	0xd1,//f5
+	0xd1,//f6
+	0xd1,//f7
+	0xd1,//f8
+	0xd1,//f9
+	0xd1,//fa
+	0xd1,//fb
+	0xd1,//fc
+	0xd1,//fd
+	0xd1,//fe
+	0xd1 //ff
+};

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.c Added

@@ -0,0 +1,404 @@
+/***************************************************************************
+
+ -= Seta Hardware =-
+
+ driver by Luca Elia (l.elia@tin.it)
+
+ rewrite by Manbow-J(manbowj@hamal.freemail.ne.jp)
+
+ X1-010 Seta Custom Sound Chip (80 Pin PQFP)
+
+ Custom programmed Mitsubishi M60016 Gate Array, 3608 gates, 148 Max I/O ports
+
+ The X1-010 is 16 Voices sound generator, each channel gets it's
+ waveform from RAM (128 bytes per waveform, 8 bit unsigned data)
+ or sampling PCM(8bit unsigned data).
+
+Registers:
+ 8 registers per channel (mapped to the lower bytes of 16 words on the 68K)
+
+ Reg: Bits: Meaning:
+
+ 0 7654 3---
+ ---- -2-- PCM/Waveform repeat flag (0:Ones 1:Repeat) (*1)
+ ---- --1- Sound out select (0:PCM 1:Waveform)
+ ---- ---0 Key on / off
+
+ 1 7654 ---- PCM Volume 1 (L?)
+ ---- 3210 PCM Volume 2 (R?)
+ Waveform No.
+
+ 2 PCM Frequency
+ Waveform Pitch Lo
+
+ 3 Waveform Pitch Hi
+
+ 4 PCM Sample Start / 0x1000 Start/End in bytes
+ Waveform Envelope Time
+
+ 5 PCM Sample End 0x100 - (Sample End / 0x1000) PCM ROM is Max 1MB?
+ Waveform Envelope No.
+ 6 Reserved
+ 7 Reserved
+
+ offset 0x0000 - 0x0fff Wave form data
+ offset 0x1000 - 0x1fff Envelope data
+
+ *1 : when 0 is specified, hardware interrupt is caused(allways return soon)
+
+***************************************************************************/
+
+//#include "emu.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stddef.h>	// for NULL
+#include "mamedef.h"
+#include "x1_010.h"
+
+
+#define VERBOSE_SOUND 0
+#define VERBOSE_REGISTER_WRITE 0
+#define VERBOSE_REGISTER_READ 0
+
+#define LOG_SOUND(x) do { if (VERBOSE_SOUND) logerror x; } while (0)
+#define LOG_REGISTER_WRITE(x) do { if (VERBOSE_REGISTER_WRITE) logerror x; } while (0)
+#define LOG_REGISTER_READ(x) do { if (VERBOSE_REGISTER_READ) logerror x; } while (0)
+
+#define SETA_NUM_CHANNELS 16
+
+//#define FREQ_BASE_BITS		 8					// Frequency fixed decimal shift bits
+#define FREQ_BASE_BITS		 14					// Frequency fixed decimal shift bits
+#define ENV_BASE_BITS		 16					// wave form envelope fixed decimal shift bits
+#define	VOL_BASE	(2*32*256/30)					// Volume base
+
+/* this structure defines the parameters for a channel */
+typedef struct {
+	unsigned char	status;
+	unsigned char	volume;						// volume / wave form no.
+	unsigned char	frequency;					// frequency / pitch lo
+	unsigned char	pitch_hi;					// reserved / pitch hi
+	unsigned char	start;						// start address / envelope time
+	unsigned char	end;						// end address / envelope no.
+	unsigned char	reserve2;
+} X1_010_CHANNEL;
+
+typedef struct _x1_010_state x1_010_state;
+struct _x1_010_state
+{
+	/* Variables only used here */
+	int	rate;								// Output sampling rate (Hz)
+	//sound_stream *	stream;					// Stream handle
+	//int	address;							// address eor data
+	//const UINT8 *region;					// region name
+	UINT32 ROMSize;
+	UINT8* rom;
+	int	sound_enable;						// sound output enable/disable
+	UINT8	reg0x2000;				// X1-010 Register & wave form area
+//	UINT8	HI_WORD_BUF0x2000;			// X1-010 16bit access ram check avoidance work
+	UINT32	smp_offsetSETA_NUM_CHANNELS;
+	UINT32	env_offsetSETA_NUM_CHANNELS;
+
+	UINT32 base_clock;
+	
+	UINT8 MutedSETA_NUM_CHANNELS;
+};
+
+/* mixer tables and internal buffers */
+//static short *mixer_buffer = NULL;
+
+/*INLINE x1_010_state *get_safe_token(device_t *device)
+{
+	assert(device != NULL);
+	assert(device->type() == X1_010);
+	return (x1_010_state *)downcast<legacy_device_base *>(device)->token();
+}*/
+
+
+/*--------------------------------------------------------------
+ generate sound to the mix buffer
+--------------------------------------------------------------*/
+//static STREAM_UPDATE( seta_update )
+void seta_update(void *param, stream_sample_t **outputs, int samples)
+{
+	x1_010_state *info = (x1_010_state *)param;
+	X1_010_CHANNEL	*reg;
+	int		ch, i, volL, volR, freq, div;
+	register INT8	*start, *end, data;
+	register UINT8	*env;
+	register UINT32	smp_offs, smp_step, env_offs, env_step, delta;
+
+	// mixer buffer zero clear
+	memset( outputs0, 0, samples*sizeof(*outputs0) );
+	memset( outputs1, 0, samples*sizeof(*outputs1) );
+
+// if( info->sound_enable == 0 ) return;
+
+	for( ch = 0; ch < SETA_NUM_CHANNELS; ch++ ) {
+		reg = (X1_010_CHANNEL *)&(info->regch*sizeof(X1_010_CHANNEL));
+		if( (reg->status&1) != 0 && ! info->Mutedch) {		// Key On
+			stream_sample_t *bufL = outputs0;
+			stream_sample_t *bufR = outputs1;
+			div = (reg->status&0x80) ? 1 : 0;
+			if( (reg->status&2) == 0 ) {						// PCM sampling
+				start = (INT8 *)(info->rom + reg->start*0x1000);
+				end = (INT8 *)(info->rom + (0x100-reg->end)*0x1000);
+				volL = ((reg->volume>>4)&0xf)*VOL_BASE;
+				volR = ((reg->volume>>0)&0xf)*VOL_BASE;
+				smp_offs = info->smp_offsetch;
+				freq = reg->frequency>>div;
+				// Meta Fox does write the frequency register, but this is a hack to make it "work" with the current setup
+				// This is broken for Arbalester (it writes 8), but that'll be fixed later.
+				if( freq == 0 ) freq = 4;
+				smp_step = (UINT32)((float)info->base_clock/8192.0f
+							*freq*(1<<FREQ_BASE_BITS)/(float)info->rate+0.5f);
+#ifdef _DEBUG
+				if( smp_offs == 0 ) {
+					LOG_SOUND(( "Play sample %p - %p, channel %X volume %d:%d freq %X step %X offset %X\n",
+						start, end, ch, volL, volR, freq, smp_step, smp_offs ));
+				}
+#endif
+				for( i = 0; i < samples; i++ ) {
+					delta = smp_offs>>FREQ_BASE_BITS;
+					// sample ended?
+					if( start+delta >= end ) {
+						reg->status &= ~0x01;					// Key off
+						break;
+					}
+					data = *(start+delta);
+					*bufL++ += (data*volL/256);
+					*bufR++ += (data*volR/256);
+					smp_offs += smp_step;
+				}
+				info->smp_offsetch = smp_offs;
+			} else {											// Wave form
+				start = (INT8 *)&(info->regreg->volume*128+0x1000);
+				smp_offs = info->smp_offsetch;
+				freq = ((reg->pitch_hi<<8)+reg->frequency)>>div;
+				smp_step = (UINT32)((float)info->base_clock/128.0/1024.0/4.0*freq*(1<<FREQ_BASE_BITS)/(float)info->rate+0.5f);
+
+				env = (UINT8 *)&(info->regreg->end*128);
+				env_offs = info->env_offsetch;
+				env_step = (UINT32)((float)info->base_clock/128.0/1024.0/4.0*reg->start*(1<<ENV_BASE_BITS)/(float)info->rate+0.5f);
+				/* Print some more debug info */
+#ifdef _DEBUG
+				if( smp_offs == 0 ) {
+					LOG_SOUND(( "Play waveform %X, channel %X volume %X freq %4X step %X offset %X\n",
+						reg->volume, ch, reg->end, freq, smp_step, smp_offs ));
+				}
+#endif
+				for( i = 0; i < samples; i++ ) {
+					int vol;
+					delta = env_offs>>ENV_BASE_BITS;
+					// Envelope one shot mode
+					if( (reg->status&4) != 0 && delta >= 0x80 ) {
+						reg->status &= ~0x01;					// Key off
+						break;
+					}
+					vol = *(env+(delta&0x7f));
+					volL = ((vol>>4)&0xf)*VOL_BASE;
+					volR = ((vol>>0)&0xf)*VOL_BASE;
+					data = *(start+((smp_offs>>FREQ_BASE_BITS)&0x7f));
+					*bufL++ += (data*volL/256);
+					*bufR++ += (data*volR/256);
+					smp_offs += smp_step;
+					env_offs += env_step;
+				}
+				info->smp_offsetch = smp_offs;
+				info->env_offsetch = env_offs;
+			}
+		}
+	}
+}
+
+
+
+//static DEVICE_START( x1_010 )
+int device_start_x1_010(void **_info, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE)
+{
+	int i;
+	//const x1_010_interface *intf = (const x1_010_interface *)device->static_config();
+	//x1_010_state *info = get_safe_token(device);
+	x1_010_state *info;
+
+	info = (x1_010_state *) calloc(1, sizeof(x1_010_state));
+	*_info = (void *) info;
+	
+	//info->region		= *device->region();
+	//info->base_clock	= device->clock();
+	//info->rate			= device->clock() / 1024;
+	//info->address		= intf->adr;
+	info->ROMSize		= 0x00;
+	info->rom			= NULL;
+	info->base_clock	= clock;
+	info->rate			= clock / 1024;
+	if (((CHIP_SAMPLING_MODE & 0x01) && info->rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		info->rate = CHIP_SAMPLE_RATE;
+
+	for( i = 0; i < SETA_NUM_CHANNELS; i++ ) {
+		info->smp_offseti = 0;
+		info->env_offseti = 0;
+	}
+	/* Print some more debug info */
+	//LOG_SOUND(("masterclock = %d rate = %d\n", device->clock(), info->rate ));
+
+	/* get stream channels */
+	//info->stream = device->machine().sound().stream_alloc(*device,0,2,info->rate,info,seta_update);
+	return info->rate;
+}
+
+void device_stop_x1_010(void *_info)
+{
+	x1_010_state *info = (x1_010_state *)_info;
+	
+	free(info->rom);	info->rom = NULL;
+
+	free(info);
+	
+	return;
+}
+
+void device_reset_x1_010(void *_info)
+{
+	x1_010_state *info = (x1_010_state *)_info;
+	
+	memset(info->reg, 0, 0x2000);
+	//memset(info->HI_WORD_BUF, 0, 0x2000);
+	memset(info->smp_offset, 0, SETA_NUM_CHANNELS * sizeof(UINT32));
+	memset(info->env_offset, 0, SETA_NUM_CHANNELS * sizeof(UINT32));
+	
+	return;
+}
+
+
+/*void seta_sound_enable_w(device_t *device, int data)
+{
+	x1_010_state *info = get_safe_token(device);
+	info->sound_enable = data;
+}*/
+
+
+
+/* Use these for 8 bit CPUs */
+
+
+//READ8_DEVICE_HANDLER( seta_sound_r )
+UINT8 seta_sound_r(void *_info, offs_t offset)
+{
+	//x1_010_state *info = get_safe_token(device);
+	x1_010_state *info = (x1_010_state *)_info;
+	//offset ^= info->address;
+	return info->regoffset;
+}
+
+
+
+
+//WRITE8_DEVICE_HANDLER( seta_sound_w )
+void seta_sound_w(void *_info, offs_t offset, UINT8 data)
+{
+	//x1_010_state *info = get_safe_token(device);
+	x1_010_state *info = (x1_010_state *)_info;
+	int channel, reg;
+	//offset ^= info->address;
+
+	channel	= offset/sizeof(X1_010_CHANNEL);
+	reg		= offset%sizeof(X1_010_CHANNEL);
+
+	if( channel < SETA_NUM_CHANNELS && reg == 0
+	 && (info->regoffset&1) == 0 && (data&1) != 0 ) {
+		info->smp_offsetchannel = 0;
+		info->env_offsetchannel = 0;
+	}
+	//LOG_REGISTER_WRITE(("%s: offset %6X : data %2X\n", device->machine().describe_context(), offset, data ));
+	info->regoffset = data;
+}
+
+void x1_010_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+						const UINT8* ROMData)
+{
+	x1_010_state *info = (x1_010_state *)_info;
+	
+	if (info->ROMSize != ROMSize)
+	{
+		info->rom = (UINT8*)realloc(info->rom, ROMSize);
+		info->ROMSize = ROMSize;
+		memset(info->rom, 0xFF, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(info->rom + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+
+void x1_010_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	x1_010_state *info = (x1_010_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < SETA_NUM_CHANNELS; CurChn ++)
+		info->MutedCurChn = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+
+
+/* Use these for 16 bit CPUs */
+
+/*READ16_DEVICE_HANDLER( seta_sound_word_r )
+{
+	//x1_010_state *info = get_safe_token(device);
+	x1_010_state *info = &X1010DataChipID;
+	UINT16	ret;
+
+	ret = info->HI_WORD_BUFoffset<<8;
+	ret += (seta_sound_r( device, offset )&0xff);
+	LOG_REGISTER_READ(( "%s: Read X1-010 Offset:%04X Data:%04X\n", device->machine().describe_context(), offset, ret ));
+	return ret;
+}
+
+WRITE16_DEVICE_HANDLER( seta_sound_word_w )
+{
+	//x1_010_state *info = get_safe_token(device);
+	x1_010_state *info = &X1010DataChipID;
+	info->HI_WORD_BUFoffset = (data>>8)&0xff;
+	seta_sound_w( device, offset, data&0xff );
+	LOG_REGISTER_WRITE(( "%s: Write X1-010 Offset:%04X Data:%04X\n", device->machine().describe_context(), offset, data ));
+}*/
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( x1_010 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(x1_010_state); 			break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( x1_010 );			break;
+		case DEVINFO_FCT_STOP:							// Nothing //									break;
+		case DEVINFO_FCT_RESET:							// Nothing //									break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "X1-010");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Seta custom");					break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}
+
+
+DEFINE_LEGACY_SOUND_DEVICE(X1_010, x1_010);*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/x1_010.h Added

@@ -0,0 +1,38 @@
+#pragma once
+
+#ifndef __X1_010_H__
+#define __X1_010_H__
+
+//#include "devlegcy.h"
+
+
+/*typedef struct _x1_010_interface x1_010_interface;
+struct _x1_010_interface
+{
+	int adr;	// address
+};*/
+
+
+void seta_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_x1_010(void **chip, int clock, int CHIP_SAMPLING_MODE, int CHIP_SAMPLE_RATE);
+void device_stop_x1_010(void *chip);
+void device_reset_x1_010(void *chip);
+
+//READ8_DEVICE_HANDLER ( seta_sound_r );
+//WRITE8_DEVICE_HANDLER( seta_sound_w );
+UINT8 seta_sound_r(void *chip, offs_t offset);
+void seta_sound_w(void *chip, offs_t offset, UINT8 data);
+
+//READ16_DEVICE_HANDLER ( seta_sound_word_r );
+//WRITE16_DEVICE_HANDLER( seta_sound_word_w );
+
+//void seta_sound_enable_w(device_t *device, int data);
+
+void x1_010_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+						const UINT8* ROMData);
+
+void x1_010_set_mute_mask(void *chip, UINT32 MuteMask);
+
+//DECLARE_LEGACY_SOUND_DEVICE(X1_010, x1_010);
+
+#endif /* __X1_010_H__ */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.c Added

@@ -0,0 +1,3110 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// yam - Emulates Yamaha SCSP and AICA
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#define EMU_COMPILE
+
+#ifdef VGMPLAY_BIG_ENDIAN
+#define EMU_BIG_ENDIAN
+#else
+#define EMU_LITTLE_ENDIAN
+#endif
+
+#ifndef EMU_COMPILE
+#error "Hi I forgot to set EMU_COMPILE"
+#endif
+
+#include "yam.h"
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#elif defined(HAVE_MPROTECT)
+#include <unistd.h>
+#include <sys/mman.h>
+#include <errno.h>
+#endif
+
+#include <stdlib.h>
+#include <math.h>
+
+#ifndef _WIN32
+#define __cdecl
+#define __fastcall // __attribute__((regparm(3))) // FIXME: not on ARM
+#endif
+
+/* No dynarec for x86_64 yet */
+#if defined(_WIN32) || defined(__i386__)
+#define ENABLE_DYNAREC
+#endif
+#if defined(_WIN64) || defined(__amd64__)
+#undef ENABLE_DYNAREC
+#endif
+
+// no 'conversion from _blah_ possible loss of data' warnings
+#ifdef _MSC_VER
+#pragma warning (disable: 4244)
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+
+#define RENDERMAX (200)
+#define RINGMAX (256) // should be nearest power of two that's at least one greater than RENDERMAX
+
+/////////////////////////////////////////////////////////////////////////////
+
+#define INT_ONE_SAMPLE (10)
+#define INT_MIDI_OUTPUT (9)
+#define INT_TIMER_C (8)
+#define INT_TIMER_B (7)
+#define INT_TIMER_A (6)
+#define INT_CPU (5)
+#define INT_DMA_END (4)
+#define INT_MIDI_INPUT (3)
+#define INT_RESERVED_2 (2)
+#define INT_RESERVED_1 (1)
+#define INT_EXTERNAL (0)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Static information
+//
+
+#define MAKELFOPHASEINC(x) (((uint64)(0x100000000)) / ((uint64)(x)))
+
+static const uint32 lfophaseinctable0x20 = {
+MAKELFOPHASEINC(0x3FC00),MAKELFOPHASEINC(0x37C00),MAKELFOPHASEINC(0x2FC00),MAKELFOPHASEINC(0x27C00),
+MAKELFOPHASEINC(0x1FC00),MAKELFOPHASEINC(0x1BC00),MAKELFOPHASEINC(0x17C00),MAKELFOPHASEINC(0x13C00),
+MAKELFOPHASEINC(0x0FC00),MAKELFOPHASEINC(0x0BC00),MAKELFOPHASEINC(0x0DC00),MAKELFOPHASEINC(0x09C00),
+MAKELFOPHASEINC(0x07C00),MAKELFOPHASEINC(0x06C00),MAKELFOPHASEINC(0x05C00),MAKELFOPHASEINC(0x04C00),
+MAKELFOPHASEINC(0x03C00),MAKELFOPHASEINC(0x03400),MAKELFOPHASEINC(0x02C00),MAKELFOPHASEINC(0x02400),
+MAKELFOPHASEINC(0x01C00),MAKELFOPHASEINC(0x01800),MAKELFOPHASEINC(0x01400),MAKELFOPHASEINC(0x01000),
+MAKELFOPHASEINC(0x00C00),MAKELFOPHASEINC(0x00A00),MAKELFOPHASEINC(0x00800),MAKELFOPHASEINC(0x00600),
+MAKELFOPHASEINC(0x00400),MAKELFOPHASEINC(0x00300),MAKELFOPHASEINC(0x00200),MAKELFOPHASEINC(0x00100)
+};
+
+static const uint8 envattackshift0x3D4 = {
+/* 00-07 */ {4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},
+/* 08-0F */ {4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},
+/* 10-17 */ {4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},
+/* 18-1F */ {4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},
+/* 20-27 */ {4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},
+/* 28-2F */ {4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},{4,4,4,4},
+/* 30-37 */ {4,4,4,4},{3,4,4,4},{3,4,3,4},{3,3,3,4},{3,3,3,3},{2,3,3,3},{2,3,2,3},{2,2,2,3},
+/* 38-3C */ {2,2,2,2},{1,2,2,2},{1,2,1,2},{1,1,1,2},{1,1,1,1}
+};
+
+static const uint8 envdecayvalue0x3D4 = {
+/* 00-07 */ {1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},
+/* 08-0F */ {1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},
+/* 10-17 */ {1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},
+/* 18-1F */ {1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},
+/* 20-27 */ {1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},
+/* 28-2F */ {1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},{1,1,1,1},
+/* 30-37 */ {1,1,1,1},{2,1,1,1},{2,1,2,1},{2,2,2,1},{2,2,2,2},{4,2,2,2},{4,2,4,2},{4,4,4,2},
+/* 38-3C */ {4,4,4,4},{8,4,4,4},{8,4,8,4},{8,8,8,4},{8,8,8,8}
+};
+
+static const int adpcmscale8 = {
+ 0xE6, 0xE6, 0xE6, 0xE6, 0x133, 0x199, 0x200, 0x266
+};
+
+static const int adpcmdiff8 = {
+ 1, 3, 5, 7, 9, 11, 13, 15
+};
+
+static const sint32 qtable32 = {
+0x0E00,0x0E80,0x0F00,0x0F80,
+0x1000,0x1080,0x1100,0x1180,
+0x1200,0x1280,0x1300,0x1280,
+0x1400,0x1480,0x1500,0x1580,
+0x1600,0x1680,0x1700,0x1780,
+0x1800,0x1880,0x1900,0x1980,
+0x1A00,0x1A80,0x1B00,0x1B80,
+0x1C00,0x1D00,0x1E00,0x1F00
+};
+
+static const uint8 pan_att_l32 = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
+static const uint8 pan_att_r32 = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,32 };
+
+static void convert_stereo_send_level(
+ uint8 sdl, uint8 pan,
+ uint8 *att_l, uint8 *att_r,
+ sint32 *lin_l, sint32 *lin_r
+) {
+ uint8 al = 0, ar = 0;
+ sint32 ll = 0, lr = 0;
+ sdl &= 0xF;
+ if(sdl) {
+ pan &= 0x1F;
+ al = sdl ^ 0xF;
+ ar = sdl ^ 0xF;
+ al += pan_att_lpan;
+ ar += pan_att_rpan;
+ ll = 4 - (al & 1);
+ lr = 4 - (ar & 1);
+ al >>= 1; al += 2;
+ ar >>= 1; ar += 2;
+ if(al >= 16) { al = 0; ll = 0; }
+ if(ar >= 16) { ar = 0; lr = 0; }
+ }
+ *att_l = al;
+ *att_r = ar;
+ *lin_l = ll;
+ *lin_r = lr;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+sint32 EMU_CALL yam_init(void) {
+ return 0;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+/*
+static int gfreq201;
+
+void yam_debugoutput(void) {
+ int i;
+ int t=0;
+ int u=0;
+ for(i=0;i<201;i++) {
+ printf("gfreq%3d=%d\n",i,gfreqi);
+ t += i*gfreqi;
+ u += gfreqi;
+ }
+ printf("avg = %d/%d\n",t,u);
+ 
+}
+*/
+/////////////////////////////////////////////////////////////////////////////
+//
+// State information
+//
+#define YAMSTATE ((struct YAM_STATE*)(state))
+
+#define LOOP_NONE (0)
+#define LOOP_FORWARDS (1)
+#define LOOP_BACKWARDS (2)
+#define LOOP_BIDIRECTIONAL (3)
+
+struct YAM_CHAN {
+ uint8 mute;
+ uint8 kyonb;
+ uint8 ssctl;
+ sint8 sampler_dir;
+ uint8 sampler_looptype;
+ sint32 sampler_invert; // bits 15-31 = invert sign bit, bits 0-14 = invert other bits
+ uint8 pcms;
+ uint32 sampleaddr;
+ sint32 loopstart;
+ sint32 loopend;
+ uint8 ar4; // amplitude envelope rate: attack, decay, sustain, release
+ uint8 dl;
+ uint8 krs;
+ uint8 link;
+ uint8 oct;
+ uint16 fns;
+ uint8 lfore;
+ uint8 lfof;
+ uint8 plfows;
+ uint8 plfos;
+ uint8 alfows;
+ uint8 alfos;
+ uint8 dspchan;
+ uint8 dsplevel;
+ uint8 disdl;
+ uint8 dipan;
+ uint8 tl;
+ uint8 voff;
+ uint8 lpoff;
+ uint8 q;
+ uint8 stwinh;
+ uint8 mdl;
+ uint8 mdxsl;
+ uint8 mdysl;
+ uint16 flv5;
+ uint8 fr4; // filter envelope rate: attack, decay, sustain, release
+ uint16 envlevelmask4; // for EGHOLD, the first will be 0
+ uint16 envlevel;
+ uint16 lpflevel;
+ uint8 envstate;
+ uint8 lpfstate;
+ uint8 lp;
+ uint32 playpos;
+ uint32 frcphase;
+ uint32 lfophase;
+ sint32 samplebufcur; // these are 16-bit signed
+ sint32 samplebufnext; // these are 16-bit signed
+ sint32 lpp1;
+ sint32 lpp2;
+ sint32 adpcmstep;
+ sint32 adpcmstep_loopstart;
+ sint32 adpcmprev;
+ sint32 adpcmprev_loopstart;
+ uint8 adpcminloop;
+};
+
+struct MPRO {
+ uint8 c_0rrrrrrr; // CRA (up to 7 bits)
+ uint8 t_0rrrrrrr; // TRA
+ uint8 t_Twwwwwww; // !TWT, TWA
+ sint8 tablemask; // -1 if table
+ sint8 adrmask; // -1 if adreb=1
+ sint8 negb; // -1 if negb
+ uint8 __kisxzbon; // skip, interpolate, saturate, XSEL, ZERO, BSEL, NOFL, NXADR
+ uint8 m_wrAFyyYh; // MWT, MRD, ADRL, FRCL, YSEL, YRL, shift-left-by
+ uint8 i_00rrrrrr; // IRA
+ uint8 i_0T0wwwww; // !IWT, IWA
+ uint8 e_000Twwww; // !EWT, EWA
+ uint8 m_00aaaaaa; // MASA
+};
+
+static uint64 mpro_scsp_read(struct MPRO *mpro) {
+ uint64 value = 0;
+ value |= ((uint64)(mpro->t_0rrrrrrr )) << 56; // TRA
+ value |= ((uint64)(mpro->t_Twwwwwww ^ 0x80)) << 48; // !TWT, TWA
+ value |= ((uint64)(mpro->tablemask & 1)) << 31; // TABLE
+ value |= ((uint64)(mpro->adrmask & 1)) << 1; // ADREB
+ value |= ((uint64)(mpro->negb & 1)) << 18; // NEGB
+ { uint64 sh = mpro->m_wrAFyyYh & 1;
+ if((mpro->__kisxzbon & 0x20) == 0) { sh ^= 3; }
+ value |= (sh << 20); // SHFT
+ }
+ value |= ((uint64)(mpro->__kisxzbon & 0x10)) << 43; // XSEL
+ value |= ((uint64)(mpro->__kisxzbon & 0x0C)) << 14; // ZERO, BSEL
+ value |= ((uint64)(mpro->__kisxzbon & 0x02)) << 6; // NOFL *** THIS IS JUST A GUESS ***
+ value |= ((uint64)(mpro->__kisxzbon & 0x01)) << 0; // NXADR
+ value |= ((uint64)(mpro->m_wrAFyyYh & 0xC0)) << 23; // MWT, MRD
+ value |= ((uint64)(mpro->m_wrAFyyYh & 0x32)) << 18; // ADRL, FRCL, YRL
+ value |= ((uint64)(mpro->m_wrAFyyYh & 0x0C)) << 43; // YSEL
+ value |= ((uint64)(mpro->i_00rrrrrr & 0x3F)) << 38; // IRA
+ value |= ((uint64)(mpro->i_0T0wwwww & 0x1F)) << 32; // IWA
+ value |= ((uint64)((mpro->i_0T0wwwww & 0x40) ^ 0x40)) << 31; // !IWT
+ value |= ((uint64)((mpro->e_000Twwww & 0x1F) ^ 0x10)) << 24; // !EWT, EWA
+ value |= ((uint64)(mpro->m_00aaaaaa & 0x1F)) << 2; // MASA (fewer bits on SCSP)
+ value |= ((uint64)(mpro->c_0rrrrrrr & 0x3F)) << 9; // CRA (SCSP exclusive)
+
+ return value;
+}
+
+static void mpro_scsp_write(struct MPRO *mpro, uint64 value) {
+ mpro->t_0rrrrrrr = ((value >> 56) & 0x7F); // TRA
+ mpro->t_Twwwwwww = ((value >> 48) ^ 0x80); // !TWT, TWA
+ mpro->tablemask = ((value >> 31) & 1) ? (-1) : (0); // TABLE
+ mpro->adrmask = ((value >> 1) & 1) ? (-1) : (0); // ADREB
+ mpro->negb = ((value >> 18) & 1) ? (-1) : (0); // NEGB
+ mpro->__kisxzbon = 0;
+ if(!value) { mpro->__kisxzbon |= 0x80; } // skip
+ if(((value >> 20) & 3) == 3) { mpro->__kisxzbon |= 0x40; } // interpolate
+ if(((value >> 21) & 1) == 0) { mpro->__kisxzbon |= 0x20; } // saturate
+ mpro->__kisxzbon |= (value >> 43) & 0x10; // XSEL
+ mpro->__kisxzbon |= (value >> 14) & 0x0C; // ZERO, BSEL
+ mpro->__kisxzbon |= (value >> 6) & 0x02; // NOFL *** THIS IS JUST A GUESS ***
+ mpro->__kisxzbon |= (value >> 0) & 1; // NXADR
+ mpro->m_wrAFyyYh = (value >> 23) & 0xC0; // MWT, MRD
+ mpro->m_wrAFyyYh |= (value >> 18) & 0x32; // ADRL, FRCL, YRL
+ mpro->m_wrAFyyYh |= (value >> 43) & 0x0C; // YSEL
+ mpro->m_wrAFyyYh |= ((value >> 20) & 1) ^ ((value >> 21) & 1); // shift left by
+ mpro->i_00rrrrrr = (value >> 38) & 0x3F; // IRA
+ mpro->i_0T0wwwww = (value >> 32) & 0x1F; // IWA
+ mpro->i_0T0wwwww |= ((value >> 31) & 0x40) ^ 0x40; // !IWT
+ mpro->e_000Twwww = ((value >> 24) & 0x1F) ^ 0x10; // !EWT, EWA
+ mpro->m_00aaaaaa = (value >> 2) & 0x1F; // MASA (fewer bits on SCSP)
+ mpro->c_0rrrrrrr = (value >> 9) & 0x3F; // CRA (SCSP exclusive)
+}
+
+static void mpro_aica_write(struct MPRO *mpro, uint64 value) {
+ mpro->t_0rrrrrrr = ((value >> 57) & 0x7F); // TRA
+ mpro->t_Twwwwwww = ((value >> 49) ^ 0x80); // !TWT, TWA
+ mpro->tablemask = ((value >> 31) & 1) ? (-1) : (0); // TABLE
+ mpro->adrmask = ((value >> 8) & 1) ? (-1) : (0); // ADREB
+ mpro->negb = ((value >> 18) & 1) ? (-1) : (0); // NEGB
+ mpro->__kisxzbon = 0;
+ if(!value) { mpro->__kisxzbon |= 0x80; } // skip
+ if(((value >> 20) & 3) == 3) { mpro->__kisxzbon |= 0x40; } // interpolate
+ if(((value >> 21) & 1) == 0) { mpro->__kisxzbon |= 0x20; } // saturate
+ mpro->__kisxzbon |= (value >> 43) & 0x10; // XSEL
+ mpro->__kisxzbon |= (value >> 14) & 0x0E; // ZERO, BSEL, NOFL
+ mpro->__kisxzbon |= (value >> 7) & 1; // NXADR
+ mpro->m_wrAFyyYh = (value >> 23) & 0xC0; // MWT, MRD
+ mpro->m_wrAFyyYh |= (value >> 18) & 0x32; // ADRL, FRCL, YRL
+ mpro->m_wrAFyyYh |= (value >> 43) & 0x0C; // YSEL
+ mpro->m_wrAFyyYh |= ((value >> 20) & 1) ^ ((value >> 21) & 1); // shift left by
+ mpro->i_00rrrrrr = (value >> 39) & 0x3F; // IRA
+ mpro->i_0T0wwwww = (value >> 33) & 0x1F; // IWA
+ mpro->i_0T0wwwww |= ((value >> 32) & 0x40) ^ 0x40; // !IWT
+ mpro->e_000Twwww = ((value >> 24) & 0x1F) ^ 0x10; // !EWT, EWA
+ mpro->m_00aaaaaa = (value >> 9) & 0x3F; // MASA
+}
+
+static uint64 mpro_aica_read(struct MPRO *mpro) {
+ uint64 value = 0;
+ value |= ((uint64)(mpro->t_0rrrrrrr )) << 57; // TRA
+ value |= ((uint64)(mpro->t_Twwwwwww ^ 0x80)) << 49; // !TWT, TWA
+ value |= ((uint64)(mpro->tablemask & 1)) << 31; // TABLE
+ value |= ((uint64)(mpro->adrmask & 1)) << 8; // ADREB
+ value |= ((uint64)(mpro->negb & 1)) << 18; // NEGB
+ { uint64 sh = mpro->m_wrAFyyYh & 1;
+ if((mpro->__kisxzbon & 0x20) == 0) { sh ^= 3; }
+ value |= (sh << 20); // SHFT
+ }
+ value |= ((uint64)(mpro->__kisxzbon & 0x10)) << 43; // XSEL
+ value |= ((uint64)(mpro->__kisxzbon & 0x0E)) << 14; // ZERO, BSEL, NOFL
+ value |= ((uint64)(mpro->__kisxzbon & 0x01)) << 7; // NXADR
+ value |= ((uint64)(mpro->m_wrAFyyYh & 0xC0)) << 23; // MWT, MRD
+ value |= ((uint64)(mpro->m_wrAFyyYh & 0x32)) << 18; // ADRL, FRCL, YRL
+ value |= ((uint64)(mpro->m_wrAFyyYh & 0x0C)) << 43; // YSEL
+ value |= ((uint64)(mpro->i_00rrrrrr & 0x3F)) << 39; // IRA
+ value |= ((uint64)(mpro->i_0T0wwwww & 0x1F)) << 33; // IWA
+ value |= ((uint64)((mpro->i_0T0wwwww & 0x40) ^ 0x40)) << 32; // !IWT
+ value |= ((uint64)((mpro->e_000Twwww & 0x1F) ^ 0x10)) << 24; // !EWT, EWA
+ value |= ((uint64)(mpro->m_00aaaaaa & 0x3F)) << 9; // MASA
+ return value;
+}
+
+#define DYNACODE_MAX_SIZE (0x6000)
+#define DYNACODE_SLOP_SIZE (0x80)
+
+struct YAM_STATE {
+ //
+ // Misc.
+ //
+ uint32 version;
+ void *ram_ptr; // EXTERNALLY-REGISTERED pointer
+ uint32 ram_mask;
+ sint16 *out_buf; // EXTERNALLY-REGISTERED pointer
+ uint32 out_pending;
+ uint32 odometer;
+ uint8 dry_out_enabled;
+ uint8 dsp_emulation_enabled;
+#ifdef ENABLE_DYNAREC
+ uint8 dsp_dyna_enabled;
+ uint8 dsp_dyna_valid;
+#endif
+ uint32 randseed;
+ uint32 mem_word_address_xor;
+ uint32 mem_byte_address_xor;
+ //
+ // Common regs
+ //
+ uint8 efsdl18;
+ uint8 efpan18;
+ uint8 mono;
+ uint8 mvol;
+ uint32 rbp;
+ uint8 rbl;
+ uint8 afsel;
+ uint8 mslc;
+ uint8 mrwinh;
+ uint8 tctl3, tim3;
+ uint16 mcieb, mcipd;
+ uint16 scieb, scipd;
+ uint8 scilv0, scilv1, scilv2;
+ uint8 inton, intreq;
+ uint32 rtc;
+ //
+ // DSP regs
+ //
+ sint16 coef128; // stored as 13-bit
+ uint16 madrs64;
+ struct MPRO mpro128;
+ sint32 temp128;
+ // INPUTS all pre-promoted to 24-bit
+ // 0x00-0x1F: MEMS
+ // 0x20-0x2F: MIXS
+ // 0x30-0x31: EXTS
+ // 0x32-0x3F: always zero
+ // 0x40-0x5F: slop area to handle IWTA
+ sint32 inputs0x60;
+ // EFREG
+ // 0x00-0x0F: EFREG
+ // 0x10-0x1F: slop area to handle EWTA
+ sint16 efreg0x20;
+ uint32 mdec_ct;
+ uint32 adrs_reg;
+
+ sint32 xzbchoice5;
+#define XZBCHOICE_TEMP (0)
+#define XZBCHOICE_ACC (1)
+#define XZBCHOICE_ZERO (2)
+#define XZBCHOICE_ZERO_ACC (3)
+#define XZBCHOICE_INPUTS (4)
+
+ sint32 yychoice4;
+#define YYCHOICE_FRC_REG (0)
+#define YYCHOICE_COEF (1)
+#define YYCHOICE_Y_REG_H (2)
+#define YYCHOICE_Y_REG_L (3)
+
+ sint32 mem_in_data4;
+
+ // SCSP modulation data
+ sint16 ringbuf32*RINGMAX;
+ uint32 bufptr;
+ // DMA registers
+ uint32 dmea;
+ uint16 drga;
+ uint16 dtlg;
+ //
+ // Channel regs
+ //
+ struct YAM_CHAN chan64;
+ //
+ // Buffer for dynarec code
+ //
+#ifdef ENABLE_DYNAREC
+ uint8 dynacodeDYNACODE_MAX_SIZE;
+#endif
+};
+
+//
+// Get size
+//
+uint32 EMU_CALL yam_get_state_size(uint8 version) {
+ return sizeof(struct YAM_STATE);
+}
+
+//
+// Initialize DSP state
+//
+void EMU_CALL yam_clear_state(void *state, uint8 version) {
+ int i;
+ if(version != 2) { version = 1; }
+ // Clear to zero
+ memset(state, 0, sizeof(struct YAM_STATE));
+ // Set version
+ YAMSTATE->version = version;
+ // Clear channel regs
+ for(i = 0; i < 64; i++) {
+ YAMSTATE->chani.envstate = 3;
+ YAMSTATE->chani.lpfstate = 3;
+ YAMSTATE->chani.envlevel = 0x1FFF;
+ YAMSTATE->chani.envlevelmask0 = 0x1FFF;
+ YAMSTATE->chani.envlevelmask1 = 0x1FFF;
+ YAMSTATE->chani.envlevelmask2 = 0x1FFF;
+ YAMSTATE->chani.envlevelmask3 = 0x1FFF;
+ YAMSTATE->chani.lpflevel = 0x1FFF;
+ // no lowpass on the SCSP
+ if(version == 1) { YAMSTATE->chani.lpoff = 1; }
+ }
+ // Initialize MPRO
+ for(i = 0; i < 128; i++) {
+ switch(version) {
+ case 1:
+ mpro_scsp_write((YAMSTATE->mpro) + i, 0);
+ break;
+ case 2:
+ YAMSTATE->mproi.c_0rrrrrrr = i;
+ mpro_aica_write((YAMSTATE->mpro) + i, 0);
+ break;
+ }
+ }
+ // Enable dry output
+ YAMSTATE->dry_out_enabled = 1;
+
+ // Enable DSP emulation by default
+ YAMSTATE->dsp_emulation_enabled = 1;
+
+ // Enable DSP dynarec
+#ifdef ENABLE_DYNAREC
+ YAMSTATE->dsp_dyna_enabled = 1;
+#endif
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Ugly hack to log debug output
+//
+/*
+FILE *logfile = NULL;
+
+static void logf(const char *fmt, ...) {
+	va_list a;
+	va_start(a, fmt);
+ if(!logfile) {
+ logfile=fopen("C:\\Corlett\\yam.log","wb");
+ }
+ if(logfile) { vfprintf(logfile, fmt, a); fflush(logfile); }
+}
+
+static void logupdate(struct YAM_STATE *state) {
+ int i;
+ logf("log update\n");
+// for(i=0;i<10;i++) {
+// logf("mpro %d: %08X %08X\n",i,state->mpro322*i+0,state->mpro322*i+1);
+// }
+ for(i = 0; i < 64; i++) {
+ logf("chan %d: dsp %X level %X\n",i,state->chani.dspchan,state->chani.dsplevel);
+ }
+ for(i = 0; i < 16; i++) {
+ logf("efsdl %d: %X pan %X\n",i,state->efsdli,state->efpani);
+ }
+}
+
+static void logstep(struct YAM_STATE *state, uint32 odometer) {
+ static uint32 lastodometer = 0;
+ if((odometer/50000) > (lastodometer/50000)) {
+ lastodometer = odometer;
+ logupdate(state);
+ }
+}
+
+static int st = 0;
+
+static void dumpch(struct YAM_STATE *state, struct YAM_CHAN *chan) {
+ logf("st=%u (%us) envstate=%X level=%X\n",st,st/44100,chan->envstate,chan->envlevel);
+ logf(" playpos=%X ls=%X le=%X\n",chan->playpos,chan->loopstart,chan->loopend);
+ logf(" sample=%X tl=%X oct=%X fns=%X\n",chan->sampleaddr, chan->tl,chan->oct,chan->fns);
+ logf(" rbp=%X rbl=%X\n",state->rbp,state->rbl);
+}
+*/
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Set RAM pointer and size (must be a power of 2)
+//
+void EMU_CALL yam_setram(void *state, uint32 *ram, uint32 size, uint8 mbx, uint8 mwx) {
+ YAMSTATE->ram_ptr = ram;
+ if((size & (size-1)) == 0) {
+ YAMSTATE->ram_mask = size-1;
+ } else {
+ YAMSTATE->ram_mask = 0;
+ }
+ YAMSTATE->mem_byte_address_xor = mbx;
+ YAMSTATE->mem_word_address_xor = mwx;
+ //
+ // Invalidate dynarec code
+ //
+#ifdef ENABLE_DYNAREC
+ YAMSTATE->dsp_dyna_valid = 0;
+#endif
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Set output buffer pointer and begin new execution run
+//
+void EMU_CALL yam_beginbuffer(void *state, sint16 *buf) {
+ YAMSTATE->out_buf = buf;
+ YAMSTATE->out_pending = 0;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Enable or disable various things
+//
+void EMU_CALL yam_enable_dry(void *state, uint8 enable) {
+ YAMSTATE->dry_out_enabled = (enable != 0);
+}
+
+void EMU_CALL yam_enable_dsp(void *state, uint8 enable) {
+ YAMSTATE->dsp_emulation_enabled = (enable != 0);
+#ifdef ENABLE_DYNAREC
+ if(enable == 0) { YAMSTATE->dsp_dyna_valid = 0; }
+#endif
+}
+
+void EMU_CALL yam_enable_dsp_dynarec(void *state, uint8 enable) {
+#ifdef ENABLE_DYNAREC
+ YAMSTATE->dsp_dyna_enabled = (enable != 0);
+ if(enable == 0) { YAMSTATE->dsp_dyna_valid = 0; }
+#endif
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Timers / interrupts
+//
+
+//
+// Recompute intreq
+//
+static void sci_recompute(struct YAM_STATE *state) {
+ int i;
+ uint16 scipd = (state->scipd) & (state->scieb);
+ state->inton = 0;
+ for(i = 10; i >= 0; i--) {
+ if(((scipd) >> i) & 1) {
+ if(i > 7) i = 7;
+ state->intreq =
+ ((((state->scilv0) >> i) & 1) << 0) |
+ ((((state->scilv1) >> i) & 1) << 1) |
+ ((((state->scilv2) >> i) & 1) << 2);
+ state->inton = state->intreq;
+ return;
+ }
+ }
+}
+
+//
+// Signal an interrupt
+//
+static void sci_signal(struct YAM_STATE *state, int n) {
+ state->scipd |= (1 << n);
+ if(!(state->inton)) {
+ sci_recompute(state);
+ }
+}
+
+uint8* EMU_CALL yam_get_interrupt_pending_ptr(void *state) {
+ return &(YAMSTATE->inton);
+}
+
+//
+// Determine how many samples until the next interrupt
+//
+uint32 EMU_CALL yam_get_min_samples_until_interrupt(void *state) {
+ uint32 min = 0xFFFFFFFF;
+ uint32 t, samples;
+
+//return 1;
+
+ for(t = 0; t < 3; t++) {
+ if(YAMSTATE->scieb & (1 << (INT_TIMER_A + t))) {
+ samples = 0x100-((uint32)(YAMSTATE->timt));
+ samples <<= YAMSTATE->tctlt;
+ samples -= (YAMSTATE->odometer) & ((1<<YAMSTATE->tctlt)-1);
+ if(samples < min) { min = samples; }
+ }
+ }
+//printf("yam min: ta=%X %02X tb=%X %02X tc=%X %02X min=%u\n",YAMSTATE->tctl0,YAMSTATE->tim0,YAMSTATE->tctl1,YAMSTATE->tim1,YAMSTATE->tctl2,YAMSTATE->tim2,min);
+// min should never be 1 if the above is correct
+// if(min < 1) { min = 1; }
+ return min;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Advance timers and interrupts
+//
+void EMU_CALL yam_advance(void *state, uint32 samples) {
+ uint32 t;
+//printf("yam_advance(%u)",samples);
+ for(t = 0; t < 3; t++) {
+ uint8 scale = YAMSTATE->tctlt;
+ uint32 whole = YAMSTATE->timt;
+ uint32 frac = (YAMSTATE->odometer) & ((1<<scale)-1);
+ uint32 remain = ((0x100 - whole) << scale) - frac;
+ if(samples >= remain) { sci_signal(state, INT_TIMER_A + t); }
+ YAMSTATE->timt = ((frac + samples + (whole << scale)) >> scale) & 0xFF;
+ }
+ YAMSTATE->out_pending += samples;
+ YAMSTATE->odometer += samples;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Key on/off
+//
+static void keyon(struct YAM_CHAN *chan) {
+//printf("keyon %08X\n",chan);
+ // Ignore redundant key-ons
+ if(chan->envstate != 3) return;
+ chan->sampler_dir = 1;
+ chan->playpos = 0;
+ chan->envlevel = 0x280;
+ chan->lpflevel = chan->flv0;
+ chan->envstate = 0;
+ chan->lpfstate = 0;
+ chan->adpcmstep = 0x7F;
+ chan->adpcmstep_loopstart = 0;
+ chan->adpcmprev = 0;
+ chan->adpcmprev_loopstart = 0;
+ chan->adpcminloop = 0;
+ chan->samplebufcur = 0;
+ chan->samplebufnext = 0;
+//printf("keyon %08X passed\n",chan);
+}
+
+static void keyoff(struct YAM_CHAN *chan) {
+ chan->envstate = 3;
+ chan->lpfstate = 3;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Estimate play position for a channel
+//
+// These are ROUGH approximations, and will not be entirely accurate in the
+// following conditions:
+//
+// - any pitch LFO is applied
+// - bidirectional loop mode
+// - weird values of loopstart or loopend
+//
+static uint32 calculate_playpos(
+ struct YAM_STATE *state,
+ struct YAM_CHAN *chan
+) {
+ sint32 p, deltap, loopsize;
+
+ if(!(chan->sampler_dir)) return 0;
+
+ if(state->out_pending > 100) yam_flush(state);
+
+ loopsize = chan->loopend - chan->loopstart;
+ if(loopsize < 1) { loopsize = 1; }
+
+ { uint32 oct = chan->oct^8;
+ uint32 fns = chan->fns^0x400;
+ uint32 base_phaseinc = fns << oct;
+ // weird ADPCM thing mentioned in official doc
+ if(chan->pcms == 2 && oct >= 0xA) { base_phaseinc <<= 1; }
+ deltap = base_phaseinc * ((uint32)(state->out_pending));
+ deltap &= 0x7FFFFFFF;
+ deltap >>= 18;
+ }
+ p = ((uint16)(chan->playpos));
+
+ switch(chan->sampler_looptype) {
+ case LOOP_NONE:
+ p += deltap;
+ if(p >= chan->loopend) p = 0;
+ break;
+ case LOOP_FORWARDS:
+ p += deltap;
+ if(p >= chan->loopstart) {
+ p -= chan->loopstart;
+ p %= loopsize;
+ p += chan->loopstart;
+ }
+ break;
+ case LOOP_BACKWARDS:
+ if(p >= chan->loopstart) {
+ p -= chan->loopstart;
+ p = loopsize - p;
+ p += chan->loopstart;
+ }
+ p += deltap;
+ if(p >= chan->loopstart) {
+ p -= chan->loopstart;
+ p %= loopsize;
+ p += chan->loopstart;
+ }
+ if(p >= chan->loopstart) {
+ p -= chan->loopstart;
+ p = loopsize - p;
+ p += chan->loopstart;
+ }
+ break;
+ case LOOP_BIDIRECTIONAL:
+ if(chan->sampler_dir < 0) {
+ p = chan->loopend + loopsize - (p - chan->loopstart);
+ }
+ p += deltap;
+ if(p >= chan->loopstart) {
+ p -= chan->loopstart;
+ p %= 2 * loopsize;
+ p += chan->loopstart;
+ }
+ if(p >= chan->loopend) {
+ p = chan->loopend - (p - chan->loopend);
+ }
+ break;
+ }
+ return p & 0xFFFF;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Channel registers
+//
+static uint32 chan_scsp_load_reg(struct YAM_STATE *state, uint8 ch, uint8 a) {
+ struct YAM_CHAN *chan = state->chan + (((uint32)ch) & 0x1F);
+ uint16 d = 0;
+ // don't really need a flush for loading chan regs
+ switch(a & 0x1E) {
+ case 0x00: // PlayControl
+ d = (((uint32)(chan->kyonb )) & 0x0001) << 11;
+ d |= (((uint32)(chan->sampler_invert )) & 0xC000) >> 5;
+ d |= (((uint32)(chan->ssctl )) & 0x0003) << 7;
+ d |= (((uint32)(chan->sampler_looptype)) & 0x0003) << 5;
+ d |= (((uint32)(chan->pcms )) & 0x0001) << 4;
+ d |= ((chan->sampleaddr) >> 16) & 0xF;
+ break;
+ case 0x02: // SampleAddrLow
+ d = chan->sampleaddr;
+ break;
+ case 0x04: // LoopStart
+ d = chan->loopstart;
+ break;
+ case 0x06: // LoopEnd
+ d = chan->loopend;
+ break;
+ case 0x08: // AmpEnv1
+ d = (((uint32)(chan->ar2 )) & 0x001F) << 11;
+ d |= (((uint32)(chan->ar1 )) & 0x001F) << 6;
+ d |= ((((uint32)(chan->envlevelmask0)) & 1) ^ 1) << 5;
+ d |= (((uint32)(chan->ar0 )) & 0x001F) << 0;
+ break;
+ case 0x0A: // AmpEnv2
+ d = (((uint32)(chan->link )) & 0x0001) << 14;
+ d |= (((uint32)(chan->krs )) & 0x000F) << 10;
+ d |= (((uint32)(chan->dl )) & 0x001F) << 5;
+ d |= (((uint32)(chan->ar3 )) & 0x001F) << 0;
+ break;
+ case 0x0C: // TotalLevel
+ d = (((uint32)(chan->stwinh )) & 0x0001) << 9;
+ d |= (((uint32)(chan->voff )) & 0x0001) << 8;
+ d |= (((uint32)(chan->tl )) & 0x00FF) << 0;
+ break;
+ case 0x0E: // Modulation
+ d = (((uint32)(chan->mdl )) & 0x000F) << 12;
+ d |= (((uint32)(chan->mdxsl )) & 0x003F) << 6;
+ d |= (((uint32)(chan->mdysl )) & 0x003F) << 0;
+ break;
+ case 0x10: // SampleRatePitch
+ d = (((uint32)(chan->oct )) & 0x000F) << 11;
+ d |= (((uint32)(chan->fns )) & 0x07FF) << 0;
+ break;
+ case 0x12: // LFOControl
+ d = (((uint32)(chan->lfore )) & 0x0001) << 15;
+ d |= (((uint32)(chan->lfof )) & 0x001F) << 10;
+ d |= (((uint32)(chan->plfows )) & 0x0003) << 8;
+ d |= (((uint32)(chan->plfos )) & 0x0007) << 5;
+ d |= (((uint32)(chan->alfows )) & 0x0003) << 3;
+ d |= (((uint32)(chan->alfos )) & 0x0007) << 0;
+ break;
+ case 0x14: // DSPInputSelect
+ d = (((uint32)(chan->dspchan )) & 0x000F) << 3;
+ d |= (((uint32)(chan->dsplevel )) & 0x000E) >> 1;
+ break;
+ case 0x16: // SendLevels
+ d = (((uint32)(chan->disdl )) & 0x000E) << 12;
+ d |= (((uint32)(chan->dipan )) & 0x001F) << 8;
+ if(ch < 18) {
+ d |= (((uint32)(state->efsdlch)) & 0x0E) << 4;
+ d |= (((uint32)(state->efpanch)) & 0x1F) << 0;
+ }
+ break;
+ }
+ return d;
+}
+
+static void chan_scsp_store_reg(struct YAM_STATE *state, uint8 ch, uint8 a, uint32 d, uint32 mask) {
+ struct YAM_CHAN *chan;
+ a &= 0x1E;
+ if(a >= 0x18) return;
+ yam_flush(YAMSTATE);
+ chan = state->chan + (((uint32)ch) & 0x1F);
+ switch(a & 0x1E) {
+ case 0x00: // PlayControl
+ if(mask & 0x00FF) {
+ chan->sampleaddr &= 0xFFFF;
+ chan->sampleaddr |= (((uint32)d) & 0xF) << 16;
+ chan->pcms = (d >> 4) & 1;
+ chan->sampler_looptype = (d >> 5) & 3;
+ chan->ssctl &= 2;
+ chan->ssctl |= (d >> 7) & 1;
+ }
+ if(mask & 0xFF00) {
+ chan->ssctl &= 1;
+ chan->ssctl |= (d >> 7) & 2;
+ chan->sampler_invert = 0;
+ if(d & (1<< 9)) chan->sampler_invert |= 0x00007FFF;
+ if(d & (1<<10)) chan->sampler_invert |= 0xFFFF8000;
+ chan->kyonb = (d >> 11) & 1;
+ if(d & 0x1000) { // kyonex
+ int ch;
+//for(ch=0;ch<32;ch++){printf("%d",state->chanch.envstate);}printf("\n");
+ for(ch = 0; ch < 32; ch++) {
+ if(state->chanch.kyonb) {
+//printf("*");
+ keyon(state->chan + ch);
+ } else { 
+//printf(".");
+ keyoff(state->chan + ch);
+ }
+ }
+//printf("\n");
+//for(ch=0;ch<32;ch++){printf("%d",state->chanch.envstate);}printf("\n");
+ }
+ }
+ break;
+ case 0x02: // SampleAddrLow
+ chan->sampleaddr &= (0xFFFFF ^ mask);
+ chan->sampleaddr |= (d & mask);
+ break;
+ case 0x04: // LoopStart
+ chan->loopstart &= (0xFFFF ^ mask);
+ chan->loopstart |= (d & mask);
+ break;
+ case 0x06: // LoopEnd
+ chan->loopend &= (0xFFFF ^ mask);
+ chan->loopend |= (d & mask);
+ break;
+ case 0x08: // AmpEnv1
+ if(mask & 0x00FF) {
+ chan->ar0 = d & 0x1F;
+ chan->envlevelmask0 = (d & (1<<5)) ? 0x0000 : 0x1FFF;
+// chan->envlevelmask0 = 0x1FFF;
+ chan->ar1 &= 0x1C;
+ chan->ar1 |= (d >> 6) & 0x03;
+ }
+ if(mask & 0xFF00) {
+ chan->ar1 &= 0x03;
+ chan->ar1 |= (d >> 6) & 0x1C;
+ chan->ar2 = (d >> 11) & 0x1F;
+ }
+ break;
+ case 0x0A: // AmpEnv2
+ if(mask & 0x00FF) {
+ chan->ar3 = d & 0x1F;
+ chan->dl &= 0x18;
+ chan->dl |= (d >> 5) & 0x07;
+ }
+ if(mask & 0xFF00) {
+ chan->dl &= 0x07;
+ chan->dl |= (d >> 5) & 0x18;
+ chan->krs = (d >> 10) & 0xF;
+ chan->link = (d >> 14) & 1;
+ }
+ break;
+ case 0x0C: // TotalLevel
+ if(mask & 0x00FF) {
+ chan->tl = d & 0xFF;
+ }
+ if(mask & 0xFF00) {
+ chan->voff = (d >> 8) & 1;
+ chan->stwinh = (d >> 9) & 1;
+ }
+ break;
+ case 0x0E: // Modulation
+ if(mask & 0x00FF) {
+ chan->mdysl = d & 0x3F;
+ chan->mdxsl &= 0x3C;
+ chan->mdxsl |= (d >> 6) & 0x03;
+ }
+ if(mask & 0xFF00) {
+ chan->mdxsl &= 0x03;
+ chan->mdxsl |= (d >> 6) & 0x3C;
+ chan->mdl = (d >> 12) & 0xF;
+ }
+ break;
+ case 0x10: // SampleRatePitch
+ if(mask & 0x00FF) {
+ chan->fns &= 0x700;
+ chan->fns |= d & 0x0FF;
+ }
+ if(mask & 0xFF00) {
+ chan->fns &= 0x0FF;
+ chan->fns |= d & 0x700;
+ chan->oct = (d >> 11) & 0xF;
+ }
+ break;
+ case 0x12: // LFOControl
+ if(mask & 0x00FF) {
+ chan->alfos = d & 7;
+ chan->alfows = (d >> 3) & 3;
+ chan->plfos = (d >> 5) & 7;
+ }
+ if(mask & 0xFF00) {
+ chan->plfows = (d >> 8) & 3;
+ chan->lfof = (d >> 10) & 0x1F;
+ chan->lfore = (d >> 15) & 1;
+ }
+ break;
+ case 0x14: // DSPInputSelect
+ if(mask & 0x00FF) {
+ chan->dsplevel = (d << 1) & 0xE;
+ if(chan->dsplevel) chan->dsplevel |= 1;
+ chan->dspchan = (d >> 3) & 0xF;
+ }
+ break;
+ case 0x16: // SendLevels
+ if(mask & 0x00FF) {
+ if(ch < 18) {
+ state->efpanch = d & 0x1F;
+ state->efsdlch = (d >> 4) & 0xE;
+ if(state->efsdlch) state->efsdlch |= 1;
+ }
+ }
+ if(mask & 0xFF00) {
+ chan->dipan = (d >> 8) & 0x1F;
+ chan->disdl = (d >> 12) & 0xE;
+ if(chan->disdl) chan->disdl |= 1;
+ }
+ break;
+ }
+}
+
+static uint32 chan_aica_load_reg(struct YAM_STATE *state, uint8 ch, uint8 a) {
+ struct YAM_CHAN *chan = state->chan + (((uint32)ch) & 0x3F);
+ uint16 d = 0;
+ // don't really need a flush for loading chan regs
+ switch(a & 0x7C) {
+ case 0x00: // PlayControl
+ d = (((uint32)(chan->kyonb )) & 0x0001) << 14;
+ d |= (((uint32)(chan->ssctl )) & 0x0001) << 10;
+ d |= (((uint32)(chan->sampler_looptype)) & 0x0001) << 9;
+ d |= (((uint32)(chan->pcms )) & 0x0003) << 7;
+ d |= ((chan->sampleaddr) >> 16) & 0x7F;
+ break;
+ case 0x04: // SampleAddrLow
+ d = chan->sampleaddr;
+ break;
+ case 0x08: // LoopStart
+ d = chan->loopstart;
+ break;
+ case 0x0C: // LoopEnd
+ d = chan->loopend;
+ break;
+ case 0x10: // AmpEnv1
+ d = (((uint32)(chan->ar2 )) & 0x001F) << 11;
+ d |= (((uint32)(chan->ar1 )) & 0x001F) << 6;
+ d |= (((uint32)(chan->ar0 )) & 0x001F) << 0;
+ break;
+ case 0x14: // AmpEnv2
+ d = (((uint32)(chan->link )) & 0x0001) << 14;
+ d |= (((uint32)(chan->krs )) & 0x000F) << 10;
+ d |= (((uint32)(chan->dl )) & 0x001F) << 5;
+ d |= (((uint32)(chan->ar3 )) & 0x001F) << 0;
+ break;
+ case 0x18: // SampleRatePitch
+ d = (((uint32)(chan->oct )) & 0x000F) << 11;
+ d |= (((uint32)(chan->fns )) & 0x07FF) << 0;
+ break;
+ case 0x1C: // LFOControl
+ d = (((uint32)(chan->lfore )) & 0x0001) << 15;
+ d |= (((uint32)(chan->lfof )) & 0x001F) << 10;
+ d |= (((uint32)(chan->plfows )) & 0x0003) << 8;
+ d |= (((uint32)(chan->plfos )) & 0x0007) << 5;
+ d |= (((uint32)(chan->alfows )) & 0x0003) << 3;
+ d |= (((uint32)(chan->alfos )) & 0x0007) << 0;
+ break;
+ case 0x20: // DSPChannelSend
+ d = (((uint32)(chan->dsplevel )) & 0x000F) << 4;
+ d |= (((uint32)(chan->dspchan )) & 0x000F) << 0;
+ break;
+ case 0x24: // DirectPanVolSend
+ d = (((uint32)(chan->disdl )) & 0x000F) << 8;
+ d |= (((uint32)(chan->dipan )) & 0x001F) << 0;
+ break;
+ case 0x28: // LPF1Volume
+ d = (((uint32)(chan->tl )) & 0x00FF) << 8;
+ d |= (((uint32)(chan->voff )) & 0x0001) << 6;
+ d |= (((uint32)(chan->lpoff )) & 0x0001) << 5;
+ d |= (((uint32)(chan->q )) & 0x001F) << 0;
+ break;
+ case 0x2C: // LPF2
+ d = (chan->flv0) & 0x1FFF;
+ break;
+ case 0x30: // LPF3
+ d = (chan->flv1) & 0x1FFF;
+ break;
+ case 0x34: // LPF4
+ d = (chan->flv2) & 0x1FFF;
+ break;
+ case 0x38: // LPF5
+ d = (chan->flv3) & 0x1FFF;
+ break;
+ case 0x3C: // LPF6
+ d = (chan->flv4) & 0x1FFF;
+ break;
+ case 0x40: // LPF7
+ d = (((uint32)(chan->fr0 )) & 0x001F) << 8;
+ d |= (((uint32)(chan->fr1 )) & 0x001F) << 0;
+ break;
+ case 0x44: // LPF8
+ d = (((uint32)(chan->fr2 )) & 0x001F) << 8;
+ d |= (((uint32)(chan->fr3 )) & 0x001F) << 0;
+ break;
+ }
+ return d;
+}
+
+static void chan_aica_store_reg(struct YAM_STATE *state, uint8 ch, uint8 a, uint32 d, uint32 mask) {
+ struct YAM_CHAN *chan;
+ a &= 0x7C;
+ if(a >= 0x48) return;
+ yam_flush(YAMSTATE);
+ chan = state->chan + (((uint32)ch) & 0x3F);
+ switch(a) {
+ case 0x00: // PlayControl
+ if(mask & 0x00FF) {
+ chan->sampleaddr &= 0xFFFF;
+ chan->sampleaddr |= (((uint32)d) & 0x7F) << 16;
+ chan->pcms &= 2;
+ chan->pcms |= (d >> 7) & 1;
+ }
+ if(mask & 0xFF00) {
+ chan->pcms &= 1;
+ chan->pcms |= (d >> 7) & 2;
+ chan->sampler_looptype = (d >> 9) & 1;
+ chan->ssctl = (d >> 10) & 1;
+ chan->kyonb = (d >> 14) & 1;
+ if(d & 0x8000) { // kyonex
+ int ch;
+ for(ch = 0; ch < 64; ch++) {
+ if(state->chanch.kyonb) { keyon(state->chan + ch); }
+ else { keyoff(state->chan + ch); }
+ }
+ }
+ }
+ break;
+ case 0x04: // SampleAddrLow
+ chan->sampleaddr &= (0x7FFFFF ^ mask);
+ chan->sampleaddr |= (d & mask);
+ break;
+ case 0x08: // LoopStart
+ chan->loopstart &= (0xFFFF ^ mask);
+ chan->loopstart |= (d & mask);
+ break;
+ case 0x0C: // LoopEnd
+ chan->loopend &= (0xFFFF ^ mask);
+ chan->loopend |= (d & mask);
+ break;
+ case 0x10: // AmpEnv1
+ if(mask & 0x00FF) {
+ chan->ar0 = d & 0x1F;
+ chan->ar1 &= 0x1C;
+ chan->ar1 |= (d >> 6) & 0x03;
+ }
+ if(mask & 0xFF00) {
+ chan->ar1 &= 0x03;
+ chan->ar1 |= (d >> 6) & 0x1C;
+ chan->ar2 = (d >> 11) & 0x1F;
+ }
+ break;
+ case 0x14: // AmpEnv2
+ if(mask & 0x00FF) {
+ chan->ar3 = d & 0x1F;
+ chan->dl &= 0x18;
+ chan->dl |= (d >> 5) & 0x07;
+ }
+ if(mask & 0xFF00) {
+ chan->dl &= 0x07;
+ chan->dl |= (d >> 5) & 0x18;
+ chan->krs = (d >> 10) & 0xF;
+ chan->link = (d >> 14) & 1;
+ }
+ break;
+ case 0x18: // SampleRatePitch
+ if(mask & 0x00FF) {
+ chan->fns &= 0x700;
+ chan->fns |= d & 0x0FF;
+ }
+ if(mask & 0xFF00) {
+ chan->fns &= 0x0FF;
+ chan->fns |= d & 0x700;
+ chan->oct = (d >> 11) & 0xF;
+ }
+ break;
+ case 0x1C: // LFOControl
+ if(mask & 0x00FF) {
+ chan->alfos = d & 7;
+ chan->alfows = (d >> 3) & 3;
+ chan->plfos = (d >> 5) & 7;
+ }
+ if(mask & 0xFF00) {
+ chan->plfows = (d >> 8) & 3;
+ chan->lfof = (d >> 10) & 0x1F;
+ chan->lfore = (d >> 15) & 1;
+ }
+ break;
+ case 0x20: // DSPChannelSend
+ if(mask & 0x00FF) {
+ chan->dspchan = d & 0xF;
+ chan->dsplevel = (d >> 4) & 0xF;
+ }
+ break;
+ case 0x24: // DirectPanVolSend
+ if(mask & 0x00FF) { chan->dipan = d & 0x1F; }
+ if(mask & 0xFF00) { chan->disdl = (d >> 8) & 0xF; }
+ break;
+ case 0x28: // LPF1Volume
+ if(mask & 0x00FF) {
+ chan->q = d & 0x1F;
+ chan->lpoff = (d >> 5) & 1;
+ chan->voff = (d >> 6) & 1;
+ }
+ if(mask & 0xFF00) {
+ chan->tl = (d >> 8) & 0xFF;
+ }
+ break;
+ case 0x2C: // LPF2
+ chan->flv0 = (((chan->flv0) & (0xFFFF ^ mask)) | (d & mask)) & 0x1FFF;
+ break;
+ case 0x30: // LPF3
+ chan->flv1 = (((chan->flv1) & (0xFFFF ^ mask)) | (d & mask)) & 0x1FFF;
+ break;
+ case 0x34: // LPF4
+ chan->flv2 = (((chan->flv2) & (0xFFFF ^ mask)) | (d & mask)) & 0x1FFF;
+ break;
+ case 0x38: // LPF5
+ chan->flv3 = (((chan->flv3) & (0xFFFF ^ mask)) | (d & mask)) & 0x1FFF;
+ break;
+ case 0x3C: // LPF6
+ chan->flv4 = (((chan->flv4) & (0xFFFF ^ mask)) | (d & mask)) & 0x1FFF;
+ break;
+ case 0x40: // LPF7
+ if(mask & 0x00FF) { chan->fr1 = (d >> 0) & 0x1F; }
+ if(mask & 0xFF00) { chan->fr0 = (d >> 8) & 0x1F; }
+ break;
+ case 0x44: // LPF8
+ if(mask & 0x00FF) { chan->fr3 = (d >> 0) & 0x1F; }
+ if(mask & 0xFF00) { chan->fr2 = (d >> 8) & 0x1F; }
+ break;
+ }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DSP registers
+//
+static void coef_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) {
+ sint16 old = state->coefn;
+ yam_flush(state);
+ n &= 0x7F;
+ state->coefn <<= 3;
+ state->coefn &= ~mask;
+ state->coefn |= d & mask;
+ state->coefn = ((sint16)(state->coefn)) >> 3;
+#ifdef ENABLE_DYNAREC
+ if(old != state->coefn) { state->dsp_dyna_valid = 0; }
+#endif
+}
+
+static void madrs_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) {
+ uint16 old = state->madrsn;
+ yam_flush(state);
+ n &= 0x3F;
+ state->madrsn &= ~mask;
+ state->madrsn |= d & mask;
+#ifdef ENABLE_DYNAREC
+ if(old != state->madrsn) { state->dsp_dyna_valid = 0; }
+#endif
+}
+
+static uint32 temp_read(struct YAM_STATE *state, uint32 n) {
+ yam_flush(state);
+ if((n & 1) == 0) { return ((state->temp(n/2)&0x7F) >> 0) & 0x00FF; }
+ else { return ((state->temp(n/2)&0x7F) >> 8) & 0xFFFF; }
+}
+
+static void temp_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) {
+ yam_flush(state);
+ switch(n & 1) {
+ case 0: mask &= 0x00FF; break;
+ case 1: mask &= 0xFFFF; mask <<= 8; d <<= 8; break;
+ }
+ n /= 2; n &= 0x1F;
+ state->tempn &= ~mask;
+ state->tempn |= d & mask;
+ // redo sign extension
+ state->tempn <<= 8;
+ state->tempn >>= 8;
+}
+
+static uint32 mems_read(struct YAM_STATE *state, uint32 n) {
+ yam_flush(state);
+ if((n & 1) == 0) { return ((state->inputs(n/2)&0x1F) >> 0) & 0x00FF; }
+ else { return ((state->inputs(n/2)&0x1F) >> 8) & 0xFFFF; }
+}
+
+static void mems_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) {
+ yam_flush(state);
+ switch(n & 1) {
+ case 0: mask &= 0x00FF; break;
+ case 1: mask &= 0xFFFF; mask <<= 8; d <<= 8; break;
+ }
+ n /= 2; n &= 0x1F;
+ state->inputsn &= ~mask;
+ state->inputsn |= d & mask;
+ // redo sign extension
+ state->inputsn <<= 8;
+ state->inputsn >>= 8;
+}
+
+static uint32 mixs_read(struct YAM_STATE *state, uint32 n) {
+ yam_flush(state);
+ // MIXS is pre-promoted to 24-bit here, so shift it right by 4
+ if((n & 1) == 0) { return ((state->inputs0x20+((n/2)&0xF)) >> 4) & 0x000F; }
+ else { return ((state->inputs0x20+((n/2)&0xF)) >> 8) & 0xFFFF; }
+}
+
+static uint32 efreg_read(struct YAM_STATE *state, uint32 n) {
+ yam_flush(state);
+ return ((uint32)(state->efregn & 0xF)) & 0xFFFF;
+}
+
+static void efreg_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) {
+ yam_flush(state);
+ state->efregn & 0xF &= ~mask;
+ state->efregn & 0xF |= d & mask;
+}
+
+static uint32 exts_read(struct YAM_STATE *state, uint32 n) {
+ yam_flush(state);
+ return (state->inputs0x30 + (n & 1) >> 8) & 0xFFFF;
+}
+
+static void exts_write(struct YAM_STATE *state, uint32 n, uint32 d, uint32 mask) {
+ yam_flush(state);
+ state->inputs0x30 + (n & 1) >>= 8;
+ state->inputs0x30 + (n & 1) &= ~mask;
+ state->inputs0x30 + (n & 1) |= d & mask;
+ state->inputs0x30 + (n & 1) <<= 16;
+ state->inputs0x30 + (n & 1) >>= 8;
+}
+
+static uint32 dsp_scsp_load_reg(struct YAM_STATE *state, uint32 a) {
+ a &= 0xFFE;
+ if(a < 0x700) return 0;
+ if(a < 0x780) return state->coef(a/2) & 0x3F << 3;
+ if(a < 0x7C0) return state->madrs(a/2) & 0x1F;
+ if(a < 0x800) return 0;
+ if(a < 0xC00) {
+ uint8 shift = ((a&6)^6) * 8;
+ uint32 index = ((a-0x800)/8)&0x7F;
+ return (mpro_scsp_read(state->mpro + index) >> shift) & 0xFFFF;
+ }
+ if(a < 0xE00) return temp_read(state, (a/2) & 0xFF);
+ if(a < 0xE80) return mems_read(state, (a/2) & 0x3F);
+ if(a < 0xEC0) return mixs_read(state, (a/2) & 0x1F);
+ if(a < 0xEE0) return efreg_read(state, (a/2) & 0xF);
+ if(a < 0xEE4) return exts_read(state, (a/2) & 1);
+ return 0;
+}
+
+static void dsp_scsp_store_reg(
+ struct YAM_STATE *state,
+ uint32 a, uint32 d, uint32 mask
+) {
+ a &= 0xFFE;
+ if(a < 0x700) { return; }
+ if(a < 0x780) { coef_write(state, (a/2) & 0x3F, d, mask); return; }
+ if(a < 0x7C0) { madrs_write(state, (a/2) & 0x1F, d, mask); return; }
+ if(a < 0x800) { return; }
+ if(a < 0xC00) {
+ uint8 shift64 = ((a&6)^6) * 8;
+ uint32 index64 = ((a-0x800)/8)&0x7F;
+ uint64 mask64sh = ((uint64)(mask & 0xFFFF)) << shift64;
+ uint64 dm64sh = ((uint64)(d & mask & 0xFFFF)) << shift64;
+ uint64 oldvalue = mpro_scsp_read(state->mpro + index64);
+ uint64 newvalue = (oldvalue & (~mask64sh)) | dm64sh;
+ if(newvalue != oldvalue) {
+ yam_flush(state);
+ mpro_scsp_write(state->mpro + index64, newvalue);
+#ifdef ENABLE_DYNAREC
+ state->dsp_dyna_valid = 0;
+#endif
+ }
+ return;
+ }
+ if(a < 0xE00) { temp_write(state, (a/2) & 0xFF, d, mask); return; }
+ if(a < 0xE80) { mems_write(state, (a/2) & 0x3F, d, mask); return; }
+ // you can't write to MIXS, at least not meaningfully
+ if(a < 0xEC0) { return; }
+ if(a < 0xEE0) { efreg_write(state, (a/2) & 0xF, d, mask); return; }
+ if(a < 0xEE4) { exts_write(state, (a/2) & 1, d, mask); return; }
+}
+
+static uint32 dsp_aica_load_reg(struct YAM_STATE *state, uint32 a) {
+ a &= 0xFFFC;
+ if(a < 0x3000) return 0;
+ if(a < 0x3200) return state->coef(a/4) & 0x7F << 3;
+ if(a < 0x3300) return state->madrs(a/4) & 0x3F;
+ if(a < 0x3400) return 0;
+ if(a < 0x3C00) {
+ uint8 shift64 = ((a&0xC)^0xC) * 4;
+ uint32 index64 = ((a-0x3400)/16)&0x7F;
+ return (mpro_aica_read(state->mpro + index64) >> shift64) & 0xFFFF;
+ }
+ if(a < 0x4000) return 0;
+ if(a < 0x4400) return temp_read(state, (a/4) & 0xFF);
+ if(a < 0x4500) return mems_read(state, (a/4) & 0x3F);
+ if(a < 0x4580) return mixs_read(state, (a/4) & 0x1F);
+ if(a < 0x45C0) return efreg_read(state, (a/4) & 0xF);
+ if(a < 0x45C8) return exts_read(state, (a/4) & 1);
+ return 0;
+}
+
+static void dsp_aica_store_reg(
+ struct YAM_STATE *state,
+ uint32 a, uint32 d, uint32 mask
+) {
+ a &= 0xFFFC;
+ if(a < 0x3000) { return; }
+ if(a < 0x3200) { coef_write(state, (a/4) & 0x7F, d, mask); return; }
+ if(a < 0x3300) { madrs_write(state, (a/4) & 0x3F, d, mask); return; }
+ if(a < 0x3400) { return; }
+ if(a < 0x3C00) {
+ uint8 shift64 = ((a&0xC)^0xC) * 4;
+ uint32 index64 = ((a-0x3400)/16)&0x7F;
+ uint64 mask64sh = ((uint64)(mask & 0xFFFF)) << shift64;
+ uint64 dm64sh = ((uint64)(d & mask & 0xFFFF)) << shift64;
+ uint64 oldvalue = mpro_aica_read(state->mpro + index64);
+ uint64 newvalue = (oldvalue & (~mask64sh)) | dm64sh;
+ if(newvalue != oldvalue) {
+ yam_flush(state);
+ mpro_aica_write(state->mpro + index64, newvalue);
+#ifdef ENABLE_DYNAREC
+ state->dsp_dyna_valid = 0;
+#endif
+ }
+ return;
+ }
+ if(a < 0x4000) { return; }
+ if(a < 0x4400) { temp_write(state, (a/4) & 0xFF, d, mask); return; }
+ if(a < 0x4500) { mems_write(state, (a/4) & 0x3F, d, mask); return; }
+ // you can't write to MIXS, at least not meaningfully
+ if(a < 0x4580) { return; }
+ if(a < 0x45C0) { efreg_write(state, (a/4) & 0xF, d, mask); return; }
+ if(a < 0x45C8) { exts_write(state, (a/4) & 1, d, mask); return; }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Externally-accessible load/store register
+//
+uint32 EMU_CALL yam_scsp_load_reg(void *state, uint32 a, uint32 mask) {
+ uint32 d = 0;
+ a &= 0xFFE;
+ if(a < 0x400) return chan_scsp_load_reg(YAMSTATE, a>>5, a&0x1E) & mask;
+ if(a >= 0x700) return dsp_scsp_load_reg(YAMSTATE, a) & mask;
+ if(a >= 0x600) return YAMSTATE->ringbuf(YAMSTATE->bufptr-64+(a-0x600)/2)&(32*RINGMAX-1) & mask;
+ switch(a) {
+ case 0x400: d = 0x0010; break; // MasterVolume (actually returns the LSI version)
+ case 0x402: // RingBufferAddress
+ d = (((uint32)(YAMSTATE->rbl)) & 3) << 7;
+ d |= ((YAMSTATE->rbp >> 13) & 0x7F);
+ break;
+ case 0x404: d = (1<<11) | (1 << 8); break; // MIDIInput, unimplemented
+ case 0x406: d = 0; break; // MIDI output, unimplemented
+ case 0x408: // CallAddress (playpos in increments of 4K)
+ { int c = (YAMSTATE->mslc) & 0x1F;
+
+ if(YAMSTATE->out_pending > 0) yam_flush(YAMSTATE);
+
+ d = calculate_playpos(YAMSTATE, YAMSTATE->chan + c);
+ d &= 0xF000; d >>= 5;
+
+//
+// might only be checking when envstate is release anyway?
+// 
+
+// d |= (YAMSTATE->chanc.envstate != 3) << 4;
+//d |= 1<<3;
+
+// d |= (YAMSTATE->chanc.lp & 1) << 4;
+// YAMSTATE->chanc.lp = 0;
+
+
+
+//
+// here bit 3 seems to be set to 1 to indicate idle.
+// what idle means, I haven't determined
+//
+
+//d|=1<<3;
+
+ //d|=(YAMSTATE->chanc.sampler_dir!=0)<<4;
+// d|=(YAMSTATE->chanc.envlevel>=0x80)<<4;
+
+// d|=((YAMSTATE->chanc.envlevel)&0x3FF)>>5;
+
+ //if(YAMSTATE->chanc.envstate >= 1) {
+ // d |= 1<<4;
+ // d|=(YAMSTATE->chanc.envlevel>=0x100)<<3;
+ //}
+// //d |= 1<<3;
+// d |= (YAMSTATE->chanc.envlevel >= 0x80) << 3;
+//
+// d |= (YAMSTATE->chanc.sampler_dir!=0) << 3;
+//d|=1<<3;
+
+ // if 1<<3 always set: missing notes
+ // if 1<<3 never set: notes get cut off early, but most are there
+ // if it's >=0x300: missing notes
+ // if it's >=0x3C0: missing notes
+ // if it's <0x300: notes get cut off early
+
+// close but missing notes
+// d |= (YAMSTATE->chanc.envstate == 3) << 4;
+// d |= (YAMSTATE->chanc.envlevel >= 0x281) << 3;
+
+
+// d |= 1<<4;
+
+// d |= (YAMSTATE->chanc.envlevel >= 0x281) << 3;
+// d |= (YAMSTATE->chanc.envstate != 3) << 3;
+
+// d |= (YAMSTATE->chanc.sampler_dir == 0) << 4;
+
+ //d |= ((YAMSTATE->chanc.envlevel) & 0x1FFF) >> 3;
+
+//d ^= 0x00; // few
+//d ^= 0x67; // few (these bits have no effect)
+//d ^= 0x7F; // many missing notes
+//d ^= 1<<4; // few
+//d ^= 1<<3; // few
+//d ^= 3<<3; // many missing notes
+
+// only updates when hardware bit 1<<4 is 1
+// hardware bit 1<<3 means idle?
+
+
+
+// ok but wrong
+// d |= (((uint32)(YAMSTATE->chanc.envstate)) & 3) << 5;
+// d |= ((YAMSTATE->chanc.envlevel) & 0x3FF) >> 5;
+// d ^= 0x7F;
+
+
+// { uint32 l = (YAMSTATE->chanc.envlevel) & (YAMSTATE->chanc.envlevelmaskYAMSTATE->chanc.envstate & 3);
+// if(l>0x3BF)l=0x1FFF;
+// if(YAMSTATE->chanc.sampler_dir == 0) l=0x1FFF;
+//d|=(l>=0x3C0)<<3;
+//d|=(l>=0x3C0)<<4;
+// d |= l >> 8;
+// if(l>=0x3BF) d|=0<<3;
+//d|=l>>5;
+// }
+
+
+//d^=0x1C;
+// d |= ((YAMSTATE->chanc.envlevel) & 0x1FFF) >> 8;
+
+//{ uint32 es = ((uint32)(YAMSTATE->chanc.envstate)) & 3;
+// es = 0;
+// if(YAMSTATE->chanc.sampler_dir == 0) es = 3;
+// d |= es << 3;
+//}
+
+//d ^= 0x18;
+//d |= 0x00;
+
+ }
+
+ break;
+ case 0x412:
+ d = YAMSTATE->dmea & 0xFFFF;
+ break;
+ case 0x414:
+ d = (((uint32)(YAMSTATE->dmea)) & 0xF0000) >> 4;
+ d |= (((uint32)(YAMSTATE->drga)) & 0xFFE) << 0;
+ break;
+ case 0x416:
+ d = (((uint32)(YAMSTATE->dtlg)) & 0xFFE) << 0;
+ break;
+ case 0x418:
+ d = (((uint32)(YAMSTATE->tctl0)) & 0x7) << 8;
+ d |= (((uint32)(YAMSTATE->tim0)) & 0xFF) << 0;
+ break;
+ case 0x41A:
+ d = (((uint32)(YAMSTATE->tctl1)) & 0x7) << 8;
+ d |= (((uint32)(YAMSTATE->tim1)) & 0xFF) << 0;
+ break;
+ case 0x41C:
+ d = (((uint32)(YAMSTATE->tctl2)) & 0x7) << 8;
+ d |= (((uint32)(YAMSTATE->tim2)) & 0xFF) << 0;
+ break;
+ case 0x41E: d = YAMSTATE->scieb & 0x07FF; break;
+ case 0x420: d = YAMSTATE->scipd & 0x07FF; break;
+ case 0x424: d = YAMSTATE->scilv0 & 0xFF; break;
+ case 0x426: d = YAMSTATE->scilv1 & 0xFF; break;
+ case 0x428: d = YAMSTATE->scilv2 & 0xFF; break;
+ case 0x42A: d = YAMSTATE->mcieb & 0x07FF; break;
+ case 0x42C: d = YAMSTATE->mcipd & 0x07FF; break;
+ }
+ return d & mask;
+}
+
+void EMU_CALL yam_scsp_store_reg(void *state, uint32 a, uint32 d, uint32 mask, uint8 *breakcpu) {
+ a &= 0xFFE;
+ d &= 0xFFFF & mask;
+ mask &= 0xFFFF;
+ if(a < 0x400) { chan_scsp_store_reg(YAMSTATE, a>>5, a&0x1E, d, mask); return; }
+ if(a >= 0x700) { dsp_scsp_store_reg(YAMSTATE, a, d, mask); return; }
+ if(a >= 0x600) { uint32 offset = (YAMSTATE->bufptr-64+(a-0x600)/2)&(32*RINGMAX-1); YAMSTATE->ringbufoffset = (d & mask) | (YAMSTATE->ringbufoffset & ~mask); return; }
+ switch(a) {
+ case 0x400: // MasterVolume
+ yam_flush(YAMSTATE);
+ if(mask & 0x00FF) {
+ YAMSTATE->mvol = d & 0xF;
+ }
+ break;
+ case 0x402: // RingBufferAddress
+ { uint32 oldrbp = YAMSTATE->rbp;
+ uint8 oldrbl = YAMSTATE->rbl;
+ if(mask & 0x00FF) {
+ YAMSTATE->rbp = (((uint32)d) & 0x7F) << 13;
+ YAMSTATE->rbl &= 2;
+ YAMSTATE->rbl |= (d >> 7) & 1;
+ }
+ if(mask & 0xFF00) {
+ YAMSTATE->rbl &= 1;
+ YAMSTATE->rbl |= (d >> 7) & 2;
+ }
+ if((oldrbp != YAMSTATE->rbp) || (oldrbl != YAMSTATE->rbl)) {
+ uint32 newrbp = YAMSTATE->rbp;
+ uint8 newrbl = YAMSTATE->rbl;
+ YAMSTATE->rbp = oldrbp;
+ YAMSTATE->rbl = oldrbl;
+ yam_flush(YAMSTATE);
+#ifdef ENABLE_DYNAREC
+ YAMSTATE->dsp_dyna_valid = 0;
+#endif
+ YAMSTATE->rbp = newrbp;
+ YAMSTATE->rbl = newrbl;
+ }
+ }
+ break;
+ case 0x408: // ChnInfoReq
+ if(mask & 0xFF00) {
+ YAMSTATE->mslc = (d >> 11) & 0x1F;
+ }
+ break;
+ case 0x412: // DMA 
+ if(mask & 0x00FF) { YAMSTATE->dmea = (YAMSTATE->dmea & 0xFFF00) | (d & 0xFF); }
+ if(mask & 0xFF00) { YAMSTATE->dmea = (YAMSTATE->dmea & 0xF00FF) | (d & 0xFF00); }
+ break;
+ case 0x414:
+ if(mask & 0xFF) { YAMSTATE->drga = (YAMSTATE->drga & 0xF00) | (d & 0xFE); }
+ if(mask & 0xFF00) { YAMSTATE->drga = (YAMSTATE->drga & 0x0FF) | (d & 0xF00); YAMSTATE->dmea = (YAMSTATE->dmea & 0xFFFF) | ((d & 0xF000) << 4); }
+ break;
+ case 0x416:
+ if(mask & 0xFF) { YAMSTATE->dtlg = (YAMSTATE->dtlg & 0xF00) | (d & 0xFE); }
+ if(mask & 0xFF00) { YAMSTATE->dtlg = (YAMSTATE->dtlg & 0xFF) | (d & 0xF00); }
+ break;
+ case 0x418: // TimerAControl
+ if(mask & 0x00FF) { YAMSTATE->tim0 = d & 0xFF; }
+ if(mask & 0xFF00) { YAMSTATE->tctl0 = (d >> 8) & 7; }
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x41A: // TimerBControl
+ if(mask & 0x00FF) { YAMSTATE->tim1 = d & 0xFF; }
+ if(mask & 0xFF00) { YAMSTATE->tctl1 = (d >> 8) & 7; }
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x41C: // TimerCControl
+ if(mask & 0x00FF) { YAMSTATE->tim2 = d & 0xFF; }
+ if(mask & 0xFF00) { YAMSTATE->tctl2 = (d >> 8) & 7; }
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x41E: // SCIEB
+ YAMSTATE->scieb = (((YAMSTATE->scieb) & (~mask)) | (d & mask)) & 0x7FF;
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x420: // SCIPD
+ YAMSTATE->scipd = (((YAMSTATE->scipd) & (~mask)) | (d & mask)) & 0x7FF;
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x422: // SCIRE
+ YAMSTATE->scipd &= ~(d & mask);
+ // I guess this is how we acknowledge interrupts now
+ sci_recompute(YAMSTATE);
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x424: // SCILV0
+ if(mask & 0x00FF) { YAMSTATE->scilv0 = d; }
+ break;
+ case 0x426: // SCILV1
+ if(mask & 0x00FF) { YAMSTATE->scilv1 = d; }
+ break;
+ case 0x428: // SCILV2
+ if(mask & 0x00FF) { YAMSTATE->scilv2 = d; }
+ break;
+ case 0x42A: // MCIEB
+ YAMSTATE->mcieb = (((YAMSTATE->mcieb) & (~mask)) | (d & mask)) & 0x7FF;
+ break;
+ case 0x42C: // MCIPD
+ YAMSTATE->mcipd = (((YAMSTATE->mcipd) & (~mask)) | (d & mask)) & 0x7FF;
+ break;
+ case 0x42E: // MCIRE
+ YAMSTATE->mcipd &= ~(d & mask);
+ break;
+ }
+}
+
+uint32 EMU_CALL yam_aica_load_reg(void *state, uint32 a, uint32 mask) {
+ uint32 d = 0;
+ a &= 0xFFFC;
+ if(a < 0x2000) return chan_aica_load_reg(YAMSTATE, a>>7, a&0x7C) & mask;
+ if(a >= 0x3000) return dsp_aica_load_reg(YAMSTATE, a) & mask;
+ if(a < 0x2048) {
+ d =
+ ((((uint32)(YAMSTATE->efsdl(a - 0x2000) / 4)) & 0x0F) << 8) |
+ ((((uint32)(YAMSTATE->efpan(a - 0x2000) / 4)) & 0x1F) << 0);
+ return d & mask;
+ }
+ switch(a) {
+ case 0x2800: d = 0x0010; break; // MasterVolume (actually returns the LSI version)
+ case 0x2804: // RingBufferAddress
+ d = (((uint32)(YAMSTATE->rbl)) & 3) << 13;
+ d |= ((YAMSTATE->rbp >> 11) & 0xFFF);
+ break;
+ case 0x2808: d = (1<<11) | (1 << 8); break; // MIDIInput, unimplemented
+ case 0x280C: d = 0; break; // ChnInfoReq, always seems to return 0 when read
+ case 0x2810: // PlayStatus
+// if(YAMSTATE->out_pending > 100) yam_flush(YAMSTATE);
+ if(YAMSTATE->out_pending > 0) yam_flush(YAMSTATE);
+ { int c = (YAMSTATE->mslc) & 0x3F;
+ d = (((uint32)(YAMSTATE->chanc.lp )) & 1) << 15;
+ if(YAMSTATE->afsel == 0) {
+ d |= (((uint32)(YAMSTATE->chanc.envstate)) & 3) << 13;
+ d |= (YAMSTATE->chanc.envlevel) & 0x1FFF;
+ } else {
+ d |= (((uint32)(YAMSTATE->chanc.lpfstate)) & 3) << 13;
+ d |= (YAMSTATE->chanc.lpflevel) & 0x1FFF;
+ }
+ }
+ break;
+ case 0x2814: d = calculate_playpos(YAMSTATE, YAMSTATE->chan + ((YAMSTATE->mslc) & 0x3F)); break;
+ case 0x2880: d = YAMSTATE->mrwinh & 0xF; break;
+ case 0x2884: d = 0; break;
+ case 0x2888: d = 0; break;
+ case 0x288C: d = 0; break;
+ case 0x2890:
+ d = (((uint32)(YAMSTATE->tctl0)) & 0x7) << 8;
+ d |= (((uint32)(YAMSTATE->tim0)) & 0xFF) << 0;
+ break;
+ case 0x2894:
+ d = (((uint32)(YAMSTATE->tctl1)) & 0x7) << 8;
+ d |= (((uint32)(YAMSTATE->tim1)) & 0xFF) << 0;
+ break;
+ case 0x2898:
+ d = (((uint32)(YAMSTATE->tctl2)) & 0x7) << 8;
+ d |= (((uint32)(YAMSTATE->tim2)) & 0xFF) << 0;
+ break;
+ case 0x289C: d = YAMSTATE->scieb & 0x07FF; break;
+ case 0x28A0: d = YAMSTATE->scipd & 0x07FF; break;
+ case 0x28A4: d = 0; break;
+ case 0x28A8: d = YAMSTATE->scilv0 & 0xFF; break;
+ case 0x28AC: d = YAMSTATE->scilv1 & 0xFF; break;
+ case 0x28B0: d = YAMSTATE->scilv2 & 0xFF; break;
+ case 0x28B4: d = YAMSTATE->mcieb & 0x07FF; break;
+ case 0x28B8: d = YAMSTATE->mcipd & 0x07FF; break;
+ case 0x28BC: d = 0; break;
+ case 0x2C00: d = 0; break;
+ case 0x2D00: d = YAMSTATE->intreq & 7; break;
+ case 0x2D04: d = 0; break;
+ case 0x2E00: d = YAMSTATE->rtc >> 16; break;
+ case 0x2E04: d = YAMSTATE->rtc; break;
+ }
+ return d & mask;
+}
+
+void EMU_CALL yam_aica_store_reg(void *state, uint32 a, uint32 d, uint32 mask, uint8 *breakcpu) {
+ a &= 0xFFFC;
+ d &= 0xFFFF & mask;
+ if(a < 0x2000) { chan_aica_store_reg(YAMSTATE, a>>7, a&0x7C, d, mask); return; }
+ if(a >= 0x3000) { dsp_aica_store_reg(YAMSTATE, a, d, mask); return; }
+ if(a < 0x2048) {
+ if(mask & 0x00FF) { YAMSTATE->efpan(a - 0x2000) / 4 = d & 0x1F; }
+ if(mask & 0xFF00) { YAMSTATE->efsdl(a - 0x2000) / 4 = (d >> 8) & 0x0F; }
+ return;
+ }
+ switch(a) {
+ case 0x2800: // MasterVolume
+ yam_flush(YAMSTATE);
+ if(mask & 0x00FF) {
+ YAMSTATE->mvol = d & 0xF;
+ }
+ if(mask & 0xFF00) {
+ YAMSTATE->mono = (d >> 15) & 1;
+ }
+ break;
+ case 0x2804: // RingBufferAddress
+ { uint32 oldrbp = YAMSTATE->rbp;
+ uint8 oldrbl = YAMSTATE->rbl;
+ if(mask & 0x00FF) {
+ YAMSTATE->rbp >>= 11;
+ YAMSTATE->rbp &= 0xF00;
+ YAMSTATE->rbp |= d & 0x0FF;
+ YAMSTATE->rbp <<= 11;
+ }
+ if(mask & 0xFF00) {
+ YAMSTATE->rbp >>= 11;
+ YAMSTATE->rbp &= 0x0FF;
+ YAMSTATE->rbp |= d & 0xF00;
+ YAMSTATE->rbp <<= 11;
+ YAMSTATE->rbl = (d >> 13) & 3;
+ }
+ if((oldrbp != YAMSTATE->rbp) || (oldrbl != YAMSTATE->rbl)) {
+ uint32 newrbp = YAMSTATE->rbp;
+ uint8 newrbl = YAMSTATE->rbl;
+ YAMSTATE->rbp = oldrbp;
+ YAMSTATE->rbl = oldrbl;
+ yam_flush(YAMSTATE);
+#ifdef ENABLE_DYNAREC
+ YAMSTATE->dsp_dyna_valid = 0;
+#endif
+ YAMSTATE->rbp = newrbp;
+ YAMSTATE->rbl = newrbl;
+ }
+ }
+ break;
+ case 0x2808: // MIDIInput, unimplemented
+ break;
+ case 0x280C: // ChnInfoReq
+ if(mask & 0x00FF) {
+ // MIDI output buffer, unimplemented
+ }
+ if(mask & 0xFF00) {
+ YAMSTATE->mslc = (d >> 8) & 0x3F;
+ YAMSTATE->afsel = (d >> 14) & 1;
+ }
+ break;
+ case 0x2810: break; // PlayStatus - writing probably has no effect.
+ case 0x2814: break; // PlayPos - writing probably has no effect.
+ case 0x2880: // misc.
+ if(mask & 0x00FF) {
+ YAMSTATE->mrwinh = d & 0xF;
+ }
+ break;
+ case 0x2884: break; // misc.
+ case 0x2888: break; // misc.
+ case 0x288C: break; // misc.
+ case 0x2890: // TimerAControl
+ if(mask & 0x00FF) { YAMSTATE->tim0 = d & 0xFF; }
+ if(mask & 0xFF00) { YAMSTATE->tctl0 = (d >> 8) & 7; }
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x2894: // TimerBControl
+ if(mask & 0x00FF) { YAMSTATE->tim1 = d & 0xFF; }
+ if(mask & 0xFF00) { YAMSTATE->tctl1 = (d >> 8) & 7; }
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x2898: // TimerCControl
+ if(mask & 0x00FF) { YAMSTATE->tim2 = d & 0xFF; }
+ if(mask & 0xFF00) { YAMSTATE->tctl2 = (d >> 8) & 7; }
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x289C: // SCIEB
+ YAMSTATE->scieb = (((YAMSTATE->scieb) & (~mask)) | (d & mask)) & 0x7FF;
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x28A0: // SCIPD
+ YAMSTATE->scipd = (((YAMSTATE->scipd) & (~mask)) | (d & mask)) & 0x7FF;
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x28A4: // SCIRE
+ YAMSTATE->scipd &= ~(d & mask);
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x28A8: // SCILV0
+ if(mask & 0x00FF) { YAMSTATE->scilv0 = d; }
+ break;
+ case 0x28AC: // SCILV1
+ if(mask & 0x00FF) { YAMSTATE->scilv1 = d; }
+ break;
+ case 0x28B0: // SCILV2
+ if(mask & 0x00FF) { YAMSTATE->scilv2 = d; }
+ break;
+ case 0x28B4: // MCIEB
+ YAMSTATE->mcieb = (((YAMSTATE->mcieb) & (~mask)) | (d & mask)) & 0x7FF;
+ break;
+ case 0x28B8: // MCIPD
+ YAMSTATE->mcipd = (((YAMSTATE->mcipd) & (~mask)) | (d & mask)) & 0x7FF;
+ break;
+ case 0x28BC: // MCIRE
+ YAMSTATE->mcipd &= ~(d & mask);
+ break;
+ case 0x2C00: // ARMReset
+ break;
+ case 0x2D00: // INTRequest
+ break;
+ case 0x2D04: // INTClear
+ // running through the recompute will clear the previous interrupt
+ // as well as enabling the next one, if there is a next one
+ sci_recompute(YAMSTATE);
+ if(breakcpu) *breakcpu = 1;
+ break;
+ case 0x2E00: // RTCHi
+ break;
+ case 0x2E04: // RTCLo
+ break;
+ }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generate random data
+//
+static uint32 yamrand16(struct YAM_STATE *state) {
+ state->randseed = 1103515245 * state->randseed + 12345;
+ return state->randseed >> 16;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Envelope-related calculations
+//
+
+//
+// Adjust actual rate to get effective rate
+//
+static uint32 env_adjustrate(struct YAM_CHAN *chan, uint32 rate) {
+ sint32 effrate = rate * 2;
+ if(chan->krs < 0xF) {
+ effrate += (chan->fns >> 9) & 1;
+ effrate += chan->krs * 2;
+ effrate = (effrate - 8) + (chan->oct ^ 8);
+ }
+ // Clipping is important because of the table lookups
+ if(effrate <= 0) return 0;
+ if(effrate >= 0x3C) return 0x3C;
+ return effrate;
+}
+
+//
+// Determine whether a step is going to occur here
+//
+static int env_needstep(uint32 effrate, uint32 odometer) {
+ uint32 shift;
+ uint32 pattern;
+ uint32 bitplace;
+ if(effrate <= 0x01) return 0;
+ if(effrate >= 0x30) return ((odometer & 1) == 0);
+ shift = 12 - ((effrate - 1) >> 2);
+ pattern = (effrate - 1) & 3;
+ if(odometer & ((1<<shift)-1)) return 0;
+ bitplace = (odometer >> shift) & 7;
+ return (0xFFFDDDD5 >> (pattern * 8 + bitplace)) & 1;
+ // 11010101 0x01 each bit is 4096 samples
+ // 11011101 0x02
+ // 11111101 0x03
+ // 11111111 0x04
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Read next sample
+//
+static void readnextsample(
+ struct YAM_STATE *state,
+ struct YAM_CHAN *chan,
+ sint32 sample_offset,
+ uint8 advance
+) {
+ sint32 s = 0;
+ //
+ // If the sampler is inactive, simply write 0
+ //
+ if(!(chan->sampler_dir)) goto done;
+ //
+ // Process envelope link and lowpass phase reset
+ //
+ if(advance && chan->playpos == chan->loopstart) {
+ if(chan->link && chan->envstate == 0) { chan->envstate = 1; }
+ if(chan->lfore) chan->lfophase = 0;
+ // and save adpcm loop-start values
+ if(!(chan->adpcminloop)) {
+ chan->adpcmstep_loopstart = chan->adpcmstep;
+ chan->adpcmprev_loopstart = chan->adpcmprev;
+ chan->adpcminloop = 1;
+ }
+ // maybe do something if the loop type is fancy
+ switch(chan->sampler_looptype) {
+ case LOOP_NONE:
+ case LOOP_FORWARDS:
+ break;
+ case LOOP_BACKWARDS:
+ chan->playpos = chan->loopend - 1;
+ chan->playpos &= 0xFFFF;
+ chan->sampler_dir = -1;
+ break;
+ case LOOP_BIDIRECTIONAL:
+ chan->sampler_dir = 1;
+ break;
+ }
+ }
+ //
+ // Obtain sample
+ //
+ switch(chan->pcms) {
+ case 0: // 16-bit signed LSB-first
+ s = *(sint16*)(((sint8*)(state->ram_ptr)) + (((chan->sampleaddr + 2 * (chan->playpos + sample_offset)) ^ (state->mem_word_address_xor)) & (state->ram_mask)));
+ s ^= chan->sampler_invert;
+ break;
+ case 1: // 8-bit signed
+ s = *(sint8*)(((sint8*)(state->ram_ptr)) + (((chan->sampleaddr + chan->playpos + sample_offset) ^ (state->mem_byte_address_xor)) & (state->ram_mask)));
+ s ^= chan->sampler_invert >> 8;
+ s <<= 8;
+ break;
+ case 2: // 4-bit ADPCM
+ s = *(uint8*)(((uint8*)(state->ram_ptr)) + (((chan->sampleaddr + (chan->playpos >> 1)) ^ (state->mem_byte_address_xor)) & (state->ram_mask)));
+ s >>= 4 * ((chan->playpos & 1) ^ 0);
+ s &= 0xF;
+ { sint32 out = (chan->adpcmstep * adpcmdiffs & 7) / 8;
+ if(out > ( 0x7FFF)) { out = 0x7FFF; }
+ out*=1-((s >> 2) & 2);
+ out+=chan->adpcmprev;
+ if(out > ( 0x7FFF)) { out = ( 0x7FFF); /* logf("<adpcmoverflow>"); */ }
+ if(out < (-0x8000)) { out = (-0x8000); /* logf("<adpcmunderflow>"); */ }
+ chan->adpcmstep = (chan->adpcmstep * adpcmscales & 7) >> 8;
+ if(chan->adpcmstep > 0x6000) { chan->adpcmstep = 0x6000; }
+ if(chan->adpcmstep < 0x007F) { chan->adpcmstep = 0x007F; }
+ chan->adpcmprev = out;
+ s = out;
+ }
+ break;
+ }
+ switch(chan->ssctl) {
+ case 0: break;
+ case 1: s = ((sint16)(yamrand16(state))); break;
+ case 2: s = 0; break;
+ case 3: s = 0; break;
+ }
+ //
+ // Advance play position
+ //
+ if(advance) {
+ chan->playpos += ((sint32)(chan->sampler_dir));
+ chan->playpos &= 0xFFFF;
+ if(chan->playpos == chan->loopend) {
+ switch(chan->sampler_looptype) {
+ case LOOP_NONE:
+ chan->sampler_dir = 0;
+ chan->playpos = 0;
+ goto done;
+ case LOOP_FORWARDS:
+ chan->playpos = chan->loopstart;
+ chan->adpcmstep = chan->adpcmstep_loopstart;
+ chan->adpcmprev = chan->adpcmprev_loopstart;
+ chan->lp = 1;
+ break;
+ case LOOP_BACKWARDS:
+ break;
+ case LOOP_BIDIRECTIONAL:
+ chan->sampler_dir = -1;
+ chan->playpos -= 2;
+ chan->playpos &= 0xFFFF;
+ break;
+ }
+ }
+ }
+done:
+ //
+ // Write the new sample
+ //
+ chan->samplebufcur = chan->samplebufnext;
+ chan->samplebufnext = s;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generate samples
+// Samples are returned in 20-bit format
+// Returns the number of samples actually generated
+//
+static uint32 generate_samples(
+ struct YAM_STATE *state,
+ struct YAM_CHAN *chan,
+ sint32 *buf,
+ uint32 odometer,
+ uint32 samples
+) {
+ uint32 g;
+ uint32 base_phaseinc;
+ uint32 lfophaseinc = lfophaseinctablechan->lfof;
+ uint32 bufptrsave = state->bufptr;
+
+//gfreqsamples++;
+
+//printf("generate_samples(%08X,%08X,%u)\n",chan,buf,samples);
+
+ { uint32 oct = chan->oct^8;
+ uint32 fns = chan->fns^0x400;
+ base_phaseinc = fns << oct;
+ // weird ADPCM thing mentioned in official doc
+ if(chan->pcms == 2 && oct >= 0xA) { base_phaseinc <<= 1; }
+ }
+
+ for(g = 0; g < samples; g++) {
+//bufg=g*100;continue;
+ //
+ // If the amp envelope is inactive, quit
+ //
+ if(chan->envlevel >= 0x3C0) {
+ chan->envlevel = 0x1FFF;
+ break;
+ }
+ //
+ // If we must generate a sample, generate it
+ //
+ if(buf) {
+ sint32 s, s_cur, s_next, f;
+ // Apply SCSP ring modulation, if necessary
+ if(state->version==1 && (chan->mdl!=0 || chan->mdxsl!=0 || chan->mdysl!=0)) {
+ sint32 smp=(state->ringbuf(state->bufptr-64+chan->mdxsl)&(32*RINGMAX-1)+state->ringbuf(state->bufptr-64+chan->mdysl)&(32*RINGMAX-1))/2;
+ smp<<=0xA; // associate cycle with 1024
+ smp>>=0x1A-chan->mdl; // ex. for MDL=0xF, sample range corresponds to +/- 64 pi (32=2^5 cycles) so shift by 11 (16-5 == 0x1A-0xF)
+ readnextsample(state, chan, smp, 0);
+ readnextsample(state, chan, smp+1, 0);
+ }
+ // Generate interpolated sample
+ s_cur = chan->samplebufcur;
+ s_next = chan->samplebufnext;
+ f = ((chan->frcphase) >> 4) & 0x3FFF;
+ s = (s_next * f) + (s_cur * (0x4000-f));
+ s >>= 14; // s is 16-bit
+ // Apply attenuation, if we want it
+ if(!(chan->voff)) {
+ uint32 attenuation;
+ sint32 linearvol;
+ attenuation = ((uint32)(chan->tl)) << 2;
+ attenuation += ((uint32)(chan->envlevel)) & ((uint32)(chan->envlevelmaskchan->envstate));
+ // LFO amplitude modulation
+ if(chan->alfos) {
+ uint32 att_wave_y = 0;
+ switch(chan->alfows) {
+ case 0: // sawtooth
+ att_wave_y = ((uint32)(chan->lfophase)) >> 24;
+ break;
+ case 1: // square
+ att_wave_y = (((sint32)(chan->lfophase)) >> 31) & 0xFF;
+ break;
+ case 2: // triangle
+ att_wave_y = (chan->lfophase >> 23) & 0xFF;
+ if(chan->lfophase & 0x80000000) { att_wave_y ^= 0xFF; }
+ break;
+ case 3: // noise
+ att_wave_y = yamrand16(state) & 0xFF;
+ break;
+ }
+ attenuation += (att_wave_y >> (7 - (chan->alfos)));
+ }
+ if(attenuation >= 0x3C0) {
+ s = 0;
+ } else {
+ // Convert log attenuation to linear volume
+ linearvol = ((attenuation & 0x3F) ^ 0x7F) + 1;
+ s *= linearvol; s >>= 7 + (attenuation >> 6);
+ }
+ }
+ // Store in ring modulation buffer, if we're SCSP and it's enabled
+ if(state->version == 1 && !chan->stwinh) {
+ state->ringbufstate->bufptr = s;
+ }
+ // Apply filter, if we want it
+ if(!(chan->lpoff)) {
+ uint32 fv = chan->lpflevel;
+ uint32 qv = chan->q & 0x1F;
+ sint32 f = (((fv & 0xFF) | 0x100) << 4) >> ((fv >> 8) ^ 0x1F);
+ sint32 q = qtableqv;
+ s = f * s + (0x2000 - f + q) * (chan->lpp1) - q * (chan->lpp2);
+ s >>= 13;
+ chan->lpp2 = chan->lpp1;
+ chan->lpp1 = s;
+ }
+ // Write output
+ s <<= 4;
+ bufg = s;
+ }
+ state->bufptr = (state->bufptr + 32) & (32*RINGMAX-1);
+ //
+ // Now we need to advance the channel state machine, regardless of
+ // whether we're generating output or not
+ //
+ //
+ // Advance LFO phase
+ //
+ chan->lfophase += lfophaseinc;
+ //
+ // Advance amplitude envelope
+ //
+ { uint32 effectiverate = env_adjustrate(chan, chan->archan->envstate);
+ if(env_needstep(effectiverate, odometer)) {
+ switch(chan->envstate) {
+ case 0: // attack
+ chan->envlevel -= (chan->envlevel >> envattackshifteffectiverateodometer&3) + 1;
+ if(chan->envlevel == 0) { chan->envstate = 1; }
+ break;
+ case 1: // decay
+ chan->envlevel += envdecayvalueeffectiverateodometer&3;
+ if((chan->envlevel >> 5) >= chan->dl) { chan->envstate = 2; }
+ break;
+ case 2: // sustain
+ case 3: // release
+ chan->envlevel += envdecayvalueeffectiverateodometer&3;
+ break;
+ }
+ }
+ }
+ //
+ // Advance filter envelope
+ //
+ { uint32 effectiverate = env_adjustrate(chan, chan->frchan->lpfstate);
+ if(env_needstep(effectiverate, odometer)) {
+ uint32 d = envdecayvalueeffectiverateodometer&3;
+ uint32 target = chan->flvchan->lpfstate+1;
+ if(chan->lpflevel < target) {
+ uint32 maxd = target - chan->lpflevel;
+ if(d > maxd) { d = maxd; }
+ chan->lpflevel += d;
+ } else if(chan->lpflevel > target) {
+ uint32 maxd = chan->lpflevel - target;
+ if(d > maxd) { d = maxd; }
+ chan->lpflevel -= d;
+ } else {
+ if(chan->lpfstate < 3) { chan->lpfstate++; }
+ }
+ }
+ }
+ //
+ // Advance the sample phase
+ //
+ { uint32 realphaseinc = base_phaseinc;
+ //
+ // LFO pitch shifting
+ //
+ if(chan->plfos) {
+ uint32 pitch_wave_y = 0;
+ switch(chan->plfows) {
+ case 0: // sawtooth
+ pitch_wave_y = chan->lfophase ^ 0x80000000;
+ break;
+ case 1: // square
+ pitch_wave_y = (chan->lfophase & 0x80000000) ? 0 : 0xFFFFFFFF;
+ break;
+ case 2: // triangle
+ pitch_wave_y = (chan->lfophase << 1) + 0x80000000;
+ if(chan->lfophase >= 0x40000000 && chan->lfophase < 0xC0000000) {
+ pitch_wave_y = ~pitch_wave_y;
+ }
+ break;
+ case 3: // noise
+ pitch_wave_y = yamrand16(state) << 16;
+ break;
+ }
+ { uint32 maxvary = base_phaseinc >> (10-(chan->plfos));
+ uint32 scaled_pitch_wave_y =
+ (((uint64)(maxvary*2)) * ((uint64)pitch_wave_y)) >> 32;
+ realphaseinc = base_phaseinc + scaled_pitch_wave_y - maxvary;
+ }
+ }
+ //
+ // Advance phase, and read new sample data if necessary
+ //
+ chan->frcphase += realphaseinc;
+ while(chan->frcphase >= 0x40000) {
+ chan->frcphase -= 0x40000;
+ readnextsample(state, chan, 0, 1);
+ }
+ }
+ // Advance our temporary odometer copy
+ odometer++;
+ // Done with this sample!
+ }
+ state->bufptr = bufptrsave;
+ return g;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Render a single channel and add it to the given outputs
+//
+// directout or fxout may be NULL
+//
+static void render_and_add_channel(
+ struct YAM_STATE *state,
+ struct YAM_CHAN *chan,
+ sint32 *directout,
+ sint32 *fxout,
+ uint32 odometer,
+ uint32 samples
+) {
+ uint32 i;
+ sint32 localbufRENDERMAX;
+ uint32 rendersamples;
+
+ // Channel does nothing if attenuation >= 0x3C0
+ if(chan->envlevel >= 0x3C0) { chan->envlevel = 0x1FFF; return; }
+
+ if(!chan->disdl) { directout = NULL; }
+ if(!chan->dsplevel) { fxout = NULL; }
+
+ // Generate samples
+ rendersamples = generate_samples(
+ state,
+ chan,
+ (!chan->mute && (directout || fxout || (state->version == 1 && !chan->stwinh))) ? localbuf : NULL,
+ odometer,
+ samples
+ );
+
+ // Add to output
+ if(directout) {
+ uint8 att_l, att_r;
+ sint32 lin_l, lin_r;
+ convert_stereo_send_level(
+ chan->disdl,
+ (state->mono) ? 0 : (chan->dipan),
+ &att_l, &att_r, &lin_l, &lin_r
+ );
+ for(i = 0; i < rendersamples; i++) {
+ directout0 += (localbufi*lin_l) >> att_l;
+ directout1 += (localbufi*lin_r) >> att_r;
+ directout += 2;
+ }
+ }
+ if(fxout) {
+ uint32 att = (chan->dsplevel) ^ 0xF;
+ sint32 lin = 4 - (att & 1);
+ att >>= 1; att += 2;
+ for(i = 0; i < rendersamples; i++) {
+ fxout0 += (localbufi*lin) >> att;
+ fxout += 16;
+ }
+ }
+
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Floating-point conversion
+//
+static uint32 __fastcall float16_to_int24(uint32 f) {
+ uint32 exponent = (f >> 11) & 0xF;
+ sint32 result;
+ result = (f & 0x8000) << 16; // take the sign in bit 31
+ result >>= 1; // duplicate the sign in bit 30
+ if(exponent >= 12) { exponent = 11; } // cap exponent to 11 for denormals
+ else { result ^= 0x40000000; } // reverse bit 30 for normals
+ result |= (f & 0x7FF) << 19; // set bits 29-0 to the mantissa
+ result >>= exponent + 8; // shift right by the exponent + 8
+ return result;
+}
+
+static uint32 __fastcall int24_to_float16(uint32 i) {
+ uint32 exponent = 0;
+ uint32 sign = i & 0x00800000;
+ if(sign) { i = ~i; }
+ i &= 0x7FFFFF;
+ if(i < 0x020000) { exponent += (6<<11); i <<= 6; }
+ if(i < 0x100000) { exponent += (3<<11); i <<= 3; }
+ if(i < 0x400000) { exponent += (1<<11); i <<= 1; }
+ if(i < 0x400000) { exponent += (1<<11); i <<= 1; }
+ if(i < 0x400000) { exponent += (1<<11); }
+ i >>= 11;
+ i &= 0x7FF;
+ i |= exponent;
+ if(sign) { i ^= 0x87FF; }
+ return i;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+#define SINT32ATOFFSET(a,b) (*((sint32*)(((uint8*)(a))+(b))))
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Execute one sample on the effects DSP
+//
+static void __fastcall dsp_sample_interpret(struct YAM_STATE *state) {
+ const struct MPRO *mpro = state->mpro;
+ uint32 i;
+ // Pre-compute ringbuffer size mask
+ uint32 rbmask = (1 << ((state->rbl)+13)) - 1;
+ //
+ // For 128 steps:
+ //
+ for(i = 0; i < 128; i++, mpro++) {
+ sint32 b, x, y, shifted;
+ //
+ // Proper skip for "empty" instructions
+ //
+ if((mpro->__kisxzbon) & 0x80) {
+ x = state->temp(state->mdec_ct)&0x7F;
+ state->xzbchoiceXZBCHOICE_ACC =
+ ((((sint64)x) * ((sint64)(state->yychoiceYYCHOICE_FRC_REG))) >> 12) + x;
+ continue;
+ }
+ state->xzbchoiceXZBCHOICE_TEMP = state->temp((mpro->t_0rrrrrrr)+(state->mdec_ct))&0x7F;
+ state->yychoiceYYCHOICE_COEF = state->coefmpro->c_0rrrrrrr;
+ //
+ // Input read
+ //
+ state->xzbchoiceXZBCHOICE_INPUTS = state->inputsmpro->i_00rrrrrr;
+ //
+ // Input write
+ //
+ state->inputsmpro->i_0T0wwwww = state->mem_in_datai & 3;
+ //
+ // B selection
+ //
+ b = SINT32ATOFFSET(state->xzbchoice, (mpro->__kisxzbon) & 0x0C);
+ b ^= ((sint32)(mpro->negb));
+ b -= ((sint32)(mpro->negb));
+ //
+ // X selection
+ //
+ x = SINT32ATOFFSET(state->xzbchoice, (mpro->__kisxzbon) & 0x10);
+ //
+ // Y selection
+ //
+ y = SINT32ATOFFSET(state->yychoice, (mpro->m_wrAFyyYh) & 0x0C);
+ //
+ // Y latch
+ //
+ if(mpro->m_wrAFyyYh & 2) {
+ sint32 inputs = state->xzbchoiceXZBCHOICE_INPUTS;
+ state->yychoiceYYCHOICE_Y_REG_H = inputs >> 11;
+ state->yychoiceYYCHOICE_Y_REG_L = (inputs >> 4) & 0xFFF;
+ }
+ //
+ // Shift of previous accumulator
+ //
+ shifted = state->xzbchoiceXZBCHOICE_ACC << ((mpro->m_wrAFyyYh) & 1);
+ if((mpro->__kisxzbon) & 0x20) {
+ if(shifted > ( 0x7FFFFF)) { shifted = ( 0x7FFFFF); }
+ if(shifted < (-0x800000)) { shifted = (-0x800000); }
+ }
+ //
+ // Multiply and accumulate
+ //
+ state->xzbchoiceXZBCHOICE_ACC = ((((sint64)x) * ((sint64)y)) >> 12) + b;
+ //
+ // Temp write
+ //
+ if(mpro->t_Twwwwwww < 0x80) {
+ state->temp((mpro->t_Twwwwwww)+(state->mdec_ct))&0x7F = shifted;
+ }
+ //
+ // Fractional address latch
+ //
+ if((mpro->m_wrAFyyYh) & 0x10) {
+ if((mpro->__kisxzbon) & 0x40) {
+ state->yychoiceYYCHOICE_FRC_REG = shifted & 0xFFF;
+ } else {
+ state->yychoiceYYCHOICE_FRC_REG = shifted >> 11;
+ }
+ }
+ //
+ // Memory operations
+ //
+ if((mpro->m_wrAFyyYh) & 0xC0) {
+ sint32 tm = ((sint32)(mpro->tablemask));
+ uint32 a = state->madrsmpro->m_00aaaaaa;
+ a += (state->adrs_reg) & ((sint32)(mpro->adrmask));
+ a += (mpro->__kisxzbon) & 1;
+ a += (state->mdec_ct) & (~tm);
+ a &= (rbmask | tm) & 0xFFFF;
+ a <<= 1;
+ a += state->rbp;
+ a &= (state->ram_mask);
+ a ^= state->mem_word_address_xor;
+ if(mpro->m_wrAFyyYh & 0x40) { // MRD
+ sint32 memdata = *((sint16*)(((sint8*)(state->ram_ptr))+a));
+ if(!(mpro->__kisxzbon & 2)) { memdata = float16_to_int24(memdata); }
+ else { memdata <<= 8; }
+ state->mem_in_data(i+2)&3 = memdata;
+ }
+ if(mpro->m_wrAFyyYh & 0x80) { // MWT
+ sint32 memdata = shifted;
+ if(!(mpro->__kisxzbon & 2)) { memdata = int24_to_float16(memdata); }
+ else { memdata >>= 8; }
+ *((sint16*)(((sint8*)(state->ram_ptr))+a)) = memdata;
+ }
+ }
+ //
+ // Address latch
+ //
+ if((mpro->m_wrAFyyYh) & 0x20) {
+ if((mpro->__kisxzbon) & 0x40) {
+ state->adrs_reg = shifted >> 12;
+ } else {
+ state->adrs_reg = state->xzbchoiceXZBCHOICE_INPUTS >> 16;
+ }
+ state->adrs_reg &= 0xFFF;
+ }
+ //
+ // Effect output write
+ //
+ state->efregmpro->e_000Twwww = shifted >> 8;
+ // End of step
+ }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+//
+//
+
+#define C(N) { *outp++ = ((uint8)(N)); }
+#define C32(N) { *((uint32*)outp) = ((uint32)(N)); outp += 4; }
+#define C32CALL(N) { *((uint32*)outp) = ((uint32)(N)) - (((uint32)(outp))+4); outp += 4; }
+
+#define STRUCTOFS(thetype,thefield) ((uint32)(&(((struct thetype*)0)->thefield)))
+#define STATEOFS(thefield) STRUCTOFS(YAM_STATE,thefield)
+
+#ifdef ENABLE_DYNAREC
+static int instruction_uses_shifted(struct MPRO *mpro) {
+ // uses SHIFTED if:
+ // - ADRL and INTERP
+ if((mpro->m_wrAFyyYh & 0x20) != 0) {
+ if((mpro->__kisxzbon & 0x40) != 0) return 1;
+ }
+ // - FRCL
+ if((mpro->m_wrAFyyYh & 0x10) != 0) return 1;
+ // - EWT
+ if((mpro->e_000Twwww & 0x10) == 0) return 1;
+ // - TWT
+ if((mpro->t_Twwwwwww & 0x80) == 0) return 1;
+ // - MWT
+ if((mpro->m_wrAFyyYh & 0x80) != 0) return 1;
+ // otherwise not
+ return 0;
+}
+#endif
+
+//
+// Compile x86 code out of the current DSP program/coef/address set
+// Also uses the current ringbuffer pointer and size, and ram pointer/mask/memwordxor
+// So if any of those change, the compiled dynacode must be invalidated
+//
+#ifdef ENABLE_DYNAREC
+static void dynacompile(struct YAM_STATE *state) {
+ // Pre-compute ringbuffer size mask
+ uint32 rbmask = (1 << ((state->rbl)+13)) - 1;
+
+ uint8 *outp = state->dynacode;
+ int i;
+ char ins_uses_acc129;
+ char ins_uses_shifted129;
+ //
+ // Put some slop here to avoid cache problems?
+ //
+ outp += DYNACODE_SLOP_SIZE;
+ //
+ // Figure out which instructions need what things
+ //
+ memset(ins_uses_acc, 0, sizeof(ins_uses_acc));
+ memset(ins_uses_shifted, 0, sizeof(ins_uses_shifted));
+ ins_uses_acc128 = 1;
+ ins_uses_shifted128 = 1;
+ for(i = 0; i < 128; i++) {
+ struct MPRO *mpro = state->mpro + i;
+ ins_uses_shiftedi = instruction_uses_shifted(mpro);
+ ins_uses_acci =
+ (ins_uses_shiftedi) ||
+ ((mpro->__kisxzbon & 0x0C) == 0x04);
+ }
+
+ //
+ // Prefix
+ //
+ C(0x60) // pusha
+ C(0x89) C(0xCF) // mov edi, ecx
+ C(0x8B) C(0xAF) C32(STATEOFS(mdec_ct)) // mov ebp,edi+<OFS32:mdec_ct>
+ C(0x8B) C(0xB7) C32(STATEOFS(xzbchoiceXZBCHOICE_ACC)) // mov esi,edi+<OFS32:acc>
+ // 16 bytes
+ //
+ // Each instruction
+ //
+ for(i = 0; i < 128; i++) {
+ struct MPRO *mpro = state->mpro + i;
+ //
+ // If we need to compute the new accumulator, do so (to EAX)
+ //
+ if(ins_uses_acci + 1) {
+ int need_tra =
+ ((mpro->__kisxzbon & 0x10) == 0x00) ||
+ ((mpro->__kisxzbon & 0x0C) == 0x00);
+ //
+ // If we will need TRA in the future, compute it in ECX
+ //
+ if(need_tra) {
+ C(0x8D) C(0x4D) C(mpro->t_0rrrrrrr) // lea ecx,ebp+<BYTE:TRA>
+ C(0x83) C(0xE1) C(0x7F) // and ecx,7Fh
+ }
+ // 6 bytes max
+ //
+ // Load EAX with the Y value
+ //
+ switch(mpro->m_wrAFyyYh & 0x0C) {
+ case 0x00: // FRC_REG
+ C(0x8B) C(0x87) C32(STATEOFS(yychoiceYYCHOICE_FRC_REG)) // mov eax,edi+yychoice0
+ break;
+ case 0x04: // COEF
+ { sint32 coef = state->coefmpro->c_0rrrrrrr;
+ C(0xB8) C32(coef) // mov eax,<SINT32:COEF>
+ }
+ break;
+ case 0x08: // Y_REG_H
+ C(0x8B) C(0x87) C32(STATEOFS(yychoiceYYCHOICE_Y_REG_H)) // mov eax,edi+yychoice2
+ break;
+ case 0x0C: // Y_REG_L
+ C(0x8B) C(0x87) C32(STATEOFS(yychoiceYYCHOICE_Y_REG_L)) // mov eax,edi+yychoice3
+ break;
+ }
+ // 6 bytes max
+ //
+ // Multiply by the X value
+ //
+ if((mpro->__kisxzbon & 0x10) == 0) {
+ C(0xF7) C(0xAC) C(0x8F) C32(STATEOFS(temp)) // imul dword ptr edi+ecx*4+temp
+ } else {
+ C(0xF7) C(0xAF) C32(STATEOFS(inputsmpro->i_00rrrrrr)) // imul dword ptr edi+<OFS32:INPUTS+4*IRA>
+ }
+ C(0x0F) C(0xAC) C(0xD0) C(0x0C) // shrd eax,edx,12
+ // 11 bytes max
+ //
+ // Add B if necessary
+ //
+ if((mpro->__kisxzbon & 0x08) == 0) {
+ if(mpro->negb == 0) {
+ if((mpro->__kisxzbon & 0x04) == 0) {
+ C(0x03) C(0x84) C(0x8F) C32(STATEOFS(temp)) // add eax,edi+ecx*4+<OFS32:temp>
+ } else {
+ C(0x01) C(0xF0) // add eax,esi
+ }
+ } else {
+ if((mpro->__kisxzbon & 0x04) == 0) {
+ C(0x2B) C(0x84) C(0x8F) C32(STATEOFS(temp)) // sub eax,edi+ecx*4+<OFS32:temp>
+ } else {
+ C(0x29) C(0xF0) // sub eax,esi
+ }
+ }
+ }
+ // 7 bytes max
+ }
+ // 30 bytes max
+ //
+ // If YRL is on, latch Y register
+ //
+ if(mpro->m_wrAFyyYh & 2) {
+ C(0x8B) C(0x97) C32(STATEOFS(inputsmpro->i_00rrrrrr)) // mov edx, edi+<OFS32:INPUTS+4*IRA>
+ C(0xC1) C(0xFA) C(0x0B) // sar edx,11
+ C(0x89) C(0x97) C32(STATEOFS(yychoiceYYCHOICE_Y_REG_H)) // mov edi+<OFS32:yychoice2>,edx
+ C(0x8B) C(0x97) C32(STATEOFS(inputsmpro->i_00rrrrrr)) // mov edx, edi+<OFS32:INPUTS+4*IRA>
+ C(0xC1) C(0xFA) C(0x04) // sar edx,4
+ C(0x81) C(0xE2) C32(0x00000FFF) // and edx,0FFFh
+ C(0x89) C(0x97) C32(STATEOFS(yychoiceYYCHOICE_Y_REG_L)) // mov edi+<OFS32:yychoice3>,edx
+ }
+ // 36 bytes max
+ //
+ // If we will be needing SHIFTED this instruction, edx will become SHIFTED:
+ //
+ if(ins_uses_shiftedi) {
+ if((mpro->__kisxzbon & 0x20) == 0) { // no saturate
+ C(0x89) C(0xF2) // mov edx,esi
+ C(0xC1) C(0xE2) C(8+(mpro->m_wrAFyyYh & 1)) // shl edx,<BYTE:8+sh>
+ C(0xC1) C(0xFA) C(0x08) // sar edx,8
+ // 8 bytes max
+ } else { // saturate
+ if((mpro->m_wrAFyyYh & 1) == 0) { // NOT shifting left
+ C(0x8D) C(0x96) C32(0x00800000) // lea edx,esi+800000h
+ C(0xF7) C(0xC2) C32(0xFF000000) // test edx,0FF000000h
+ C(0x89) C(0xF2) // mov edx,esi
+ // 14 bytes max
+ } else { // shifting left
+ C(0x8D) C(0x94) C(0x36) C32(0x00800000) // lea edx,esi+esi+800000h
+ C(0xF7) C(0xC2) C32(0xFF000000) // test edx,0FF000000h
+ C(0x8D) C(0x14) C(0x36) // lea edx,esi+esi
+ // 16 bytes max
+ }
+ C(0x74) C(0x09) // je +9bytes
+ C(0xC1) C(0xFA) C(0x1F) // sar edx,1Fh
+ C(0x81) C(0xF2) C32(0x007FFFFF) // xor edx,7FFFFFh
+ // 27 bytes max
+ }
+ }
+ // 27 bytes max
+ //
+ // If we need the accumulator next instruction, save it
+ //
+ if(ins_uses_acci + 1) {
+ C(0x89) C(0xC6) // mov esi,eax
+ }
+ // 2 bytes max
+ //
+ // If FRCL is set, latch it
+ //
+ if(mpro->m_wrAFyyYh & 0x10) {
+ C(0x89) C(0xD0) //mov eax,edx
+ if(mpro->__kisxzbon & 0x40) { // interpolate mode
+ C(0x25) C32(0x00000FFF) // and eax,0FFFh
+ } else { // non-interpolate mode
+ C(0xC1) C(0xF8) C(0x0B) // sar eax,11
+ }
+ C(0x89) C(0x87) C32(STATEOFS(yychoiceYYCHOICE_FRC_REG)) // mov edi+<OFS32:yychoice0>,eax
+ }
+ // 13 bytes max
+ //
+ // If TWT is on, perform the temp write of SHIFTED
+ //
+ if((mpro->t_Twwwwwww & 0x80) == 0) {
+ C(0x8D) C(0x4D) C(mpro->t_Twwwwwww) // lea ecx,ebp+<BYTE:TWA>
+ C(0x83) C(0xE1) C(0x7F) // and ecx,7Fh
+ C(0x89) C(0x94) C(0x8F) C32(STATEOFS(temp)) // mov edi+ecx*4+<OFS32:temp>,edx
+ }
+ // 13 bytes max
+ //
+ // If EWT is on, perform write of EFREG
+ //
+ if((mpro->e_000Twwww & 0x10) == 0) {
+ C(0x89) C(0xD0) // mov eax,edx
+ C(0xC1) C(0xF8) C(0x08) // sar eax,8
+ C(0x89) C(0x87) C32(STATEOFS(efregmpro->e_000Twwww)) // mov edi+<OFS32:EFREG+4*EWA>,eax
+ }
+ // 11 bytes max
+ //
+ // If we'll be needing an address, compute it in EBX (a word address)
+ // ODD LINES ONLY
+ //
+ if((i & 1) && (mpro->m_wrAFyyYh & 0xC0)) {
+ uint32 madrsnx = state->madrsmpro->m_00aaaaaa;
+ if(mpro->__kisxzbon & 1) { madrsnx++; }
+ madrsnx &= 0xFFFF;
+ if(mpro->tablemask == 0) {
+ C(0x8D) C(0x9D) C32(madrsnx) // lea ebx,ebp+<DWORD:MADRS+NXADR>
+ if(mpro->adrmask != 0) {
+ C(0x03) C(0x9F) C32(STATEOFS(adrs_reg)) // add ebx,edi+<OFS32:adrs_reg>
+ }
+ C(0x81) C(0xE3) C32(rbmask) // and ebx,<DWORD:rblmask>
+ // 18 bytes max
+ } else {
+ C(0xBB) C32(madrsnx) // mov ebx,<DWORD:MADRS+NXADR masked by 0xFFFF>
+ if(mpro->adrmask != 0) {
+ C(0x03) C(0x9F) C32(STATEOFS(adrs_reg)) // add ebx,edi+<OFS32:adrs_reg>
+ C(0x81) C(0xE3) C32(0x0000FFFF) // and ebx,0FFFFh
+ }
+ // 17 bytes max
+ }
+ C(0x81) C(0xC3) C32(state->rbp / 2) // add ebx,<DWORD:rbp/2>
+ C(0x81) C(0xE3) C32(state->ram_mask / 2) // and ebx,<DWORD:RAMMASK/2>
+ if((state->mem_word_address_xor / 2) != 0) {
+ C(0x83) C(0xF3) C(state->mem_word_address_xor / 2) // xor ebx,<BYTE:memwxor/2>
+ }
+ }
+ // 33 bytes max ODD LINES ONLY
+ //
+ // If ADRL is set, latch address reg
+ //
+ if(mpro->m_wrAFyyYh & 0x20) {
+ if(mpro->__kisxzbon & 0x40) { // interpolate mode
+ C(0x89) C(0xD0) // mov eax,edx
+ C(0xC1) C(0xF8) C(0x0C) // sar eax,12
+ } else {
+ C(0x8B) C(0x87) C32(STATEOFS(inputsmpro->i_00rrrrrr)) // mov eax,edi+<OFS32:INPUTS+4*IRA>
+ C(0xC1) C(0xF8) C(0x10) // sar eax,16
+ }
+ C(0x25) C32(0x00000FFF) // and eax,0FFFh
+ C(0x89) C(0x87) C32(STATEOFS(adrs_reg)) // mov edi+<OFS32:adrs_reg>,eax
+ }
+ // 20 bytes max
+ //
+ // If MRD is set, read from ebx*2:
+ // ODD LINES ONLY
+ //
+ if((i & 1) && (mpro->m_wrAFyyYh & 0x40)) {
+ if((mpro->__kisxzbon & 0x02) == 0) { // NOFL=0
+ C(0x0F) C(0xBF) C(0x8C) C(0x1B) C32(state->ram_ptr) // movsx ecx, word ptr ebx+ebx+<DWORD:RAMPTR>
+ C(0xE8) C32CALL(float16_to_int24) // call float16_to_int24
+ // 13 bytes max
+ } else { // NOFL=1:
+ C(0x0F) C(0xBF) C(0x84) C(0x1B) C32(state->ram_ptr) // movsx eax, word ptr ebx+ebx+<DWORD:RAMPTR>
+ C(0xC1) C(0xE0) C(0x08) // shl eax,8
+ // 11 bytes max
+ }
+ C(0x89) C(0x87) C32(STATEOFS(mem_in_data(i+2)&3)) // mov edi+<OFS32:meminptr>,eax
+ // 19 bytes max
+ //
+ // Or, if MWT is set, write edx to ebx*2:
+ // ODD LINES ONLY
+ //
+ } else if((i & 1) && (mpro->m_wrAFyyYh & 0x80)) {
+ if((mpro->__kisxzbon & 0x02) == 0) { // NOFL=0
+ C(0x89) C(0xD1) // mov ecx,edx
+ C(0xE8) C32CALL(int24_to_float16) // call int24_to_float16
+ C(0x66) C(0x89) C(0x84) C(0x1B) C32(state->ram_ptr) // mov ebx+ebx+<DWORD:RAMPTR>,ax
+ // 15 bytes max
+ } else { // NOFL=1:
+ C(0xC1) C(0xFA) C(0x08) // sar edx,8
+ C(0x66) C(0x89) C(0x94) C(0x1B) C32(state->ram_ptr) // mov ebx+ebx+<DWORD:RAMPTR>,dx
+ // 11 bytes max
+ }
+ // 15 bytes max
+ }
+ // 19 bytes max ODD LINES ONLY
+ //
+ // If IWT is on, perform input write
+ // ODD LINES ONLY
+ //
+ if((i&1) && ((mpro->i_0T0wwwww & 0x40) == 0)) {
+ C(0x8B) C(0x97) C32(STATEOFS(mem_in_datai&3)) // mov edx, edi+<OFS32:memindata>
+ C(0x89) C(0x97) C32(STATEOFS(inputsmpro->i_0T0wwwww)) // mov edi+<OFS32:INPUTS+4*IWA>,edx
+ }
+ // 12 bytes max ODD LINES ONLY
+ }
+ //
+ // Suffix
+ //
+ C(0x89) C(0xB7) C32(STATEOFS(xzbchoiceXZBCHOICE_ACC)) // mov edi+<OFS32:acc>,esi
+ C(0x61) // popa
+ C(0xC3) // retn
+ // 8 bytes
+ //
+ // Set valid flag
+ //
+ state->dsp_dyna_valid = 1;
+
+//{FILE*f=fopen("C:\\Corlett\\yamdyna.bin","wb");if(f){fwrite(state->dynacode,1,0x6000,f);fclose(f);}}
+
+}
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+
+typedef void (__fastcall *dsp_sample_t)(struct YAM_STATE *state);
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Render effects by emulating the DSP
+//
+static void render_effects(
+ struct YAM_STATE *state,
+ sint32 *fxbus,
+ sint32 *out,
+ uint32 samples
+) {
+ dsp_sample_t samplefunc;
+ uint32 i, j;
+ uint8 efatt_l16;
+ uint8 efatt_r16;
+ sint32 eflin_l16;
+ sint32 eflin_r16;
+
+#ifdef ENABLE_DYNAREC
+ if(state->dsp_dyna_enabled) {
+ if(!(state->dsp_dyna_valid)) {
+ dynacompile(state);
+ }
+ samplefunc = (dsp_sample_t)(((uint8*)(state->dynacode)) + DYNACODE_SLOP_SIZE);
+#else
+ if (0) {
+#endif
+ } else {
+ samplefunc = dsp_sample_interpret;
+ }
+
+ //
+ // Determine what the effect out levels are, for left and right
+ //
+ for(j = 0; j < 16; j++) {
+ convert_stereo_send_level(
+ state->efsdlj,
+ (state->mono) ? 0 : state->efpanj,
+ efatt_l + j, efatt_r + j,
+ eflin_l + j, eflin_r + j
+ );
+ }
+ //
+ // For every sample:
+ //
+ for(i = 0; i < samples; i++, fxbus += 16, out += 2) {
+ //
+ // Clip and copy fxbus inputs (20-bit, pre-promote to 24-bit)
+ //
+ for(j = 0; j < 16; j++) {
+ sint32 t = fxbusj;
+ if(t < (-0x80000)) t = (-0x80000);
+ if(t > ( 0x7FFFF)) t = ( 0x7FFFF);
+ state->inputs0x20 + j = t << 4;
+ }
+ //
+ // Execute one DSP sample
+ //
+ samplefunc(state);
+ // Advance MDEC_CT
+ state->mdec_ct--;
+ //
+ // Copy outputs out of EFREG, scale accordingly, and add to output
+ //
+ for(j = 0; j < 16; j++) if(state->efsdlj) {
+ sint32 ef = (sint32)((sint16)(state->efregj));
+ ef <<= 4;
+ out0 += (ef*eflin_lj) >> efatt_lj;
+ out1 += (ef*eflin_rj) >> efatt_rj;
+ }
+ }
+
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Must not render more than RENDERMAX samples at a time
+//
+struct render_priority
+{
+ sint32 channel_number;
+ sint32 priority_level;
+};
+int __cdecl render_priority_compare(const void * a, const void * b) {
+ struct render_priority *_a = (struct render_priority *) a;
+ struct render_priority *_b = (struct render_priority *) b;
+ return _b->priority_level - _a->priority_level;
+}
+static void render(struct YAM_STATE *state, uint32 odometer, uint32 samples) {
+ uint32 i, j;
+ struct render_priority priority_list64;
+ sint32 outbuf2*RENDERMAX;
+ sint32 fxbus16*RENDERMAX;
+ sint32 *directout;
+// sint32 *fxout;
+ sint16 *buf;
+ uint32 nchannels;
+ uint32 bufptr_base;
+ int wantreverb = 0;
+ if(!samples) return;
+ buf = YAMSTATE->out_buf;
+ directout = (buf && (state->dry_out_enabled)) ? outbuf : NULL;
+ nchannels = ((YAMSTATE->version) == 1) ? 32 : 64;
+
+// st=odometer;
+//if(odometer>=11*44100)dumpch(YAMSTATE,YAMSTATE->chan+11);
+/*
+if(odometer >= 11*44100) {
+static int dumped=0;
+if(!dumped) {
+dumped=1;
+{FILE*f=fopen("C:\\Corlett\\yamdump.ram","wb");
+if(f){ 
+fwrite(YAMSTATE->ram_ptr,0x200000,1,f);
+fclose(f);
+}
+}
+}
+}
+*/
+
+//logstep(state,odometer);
+
+ // figure out if we want reverb or not
+ if(buf && (state->dsp_emulation_enabled)) {
+ for(i = 0; i < 16; i++) { if(state->efsdli != 0) break; }
+ wantreverb = (i < 16);
+ } else {
+ wantreverb = 0;
+ }
+ if(buf) {
+ memset(outbuf, 0, 4*2*samples);
+ if(wantreverb) memset(fxbus, 0, 4*16*samples);
+ }
+ //
+ // Figure out if any channels need to be rendered before others
+ //
+ for(i = 0; i < nchannels; i++) {
+ priority_listi.channel_number = i;
+ priority_listi.priority_level = 0;
+ }
+ if (state->version == 1) {
+ for(i = 0; i < nchannels; i++) {
+ struct YAM_CHAN *chan = state->chan + i;
+ sint32 priority_level = priority_listi.priority_level + 1;
+ if (chan->mdxsl) priority_list(i+chan->mdxsl)&31.priority_level = priority_level;
+ if (chan->mdysl) priority_list(i+chan->mdysl)&31.priority_level = priority_level;
+ }
+ qsort(&priority_list, nchannels, sizeof(*priority_list), render_priority_compare);
+ }
+ bufptr_base = state->bufptr;
+ //
+ // Render each channel
+ //
+ for(i = 0; i < nchannels; i++) {
+ struct YAM_CHAN *chan;
+ j = priority_listi.channel_number;
+ chan = state->chan + j;
+ state->bufptr = bufptr_base + j;
+// is 11
+ render_and_add_channel(state, chan, directout,
+ wantreverb ? (fxbus + chan->dspchan) : NULL,
+ odometer, samples
+ );
+ }
+ state->bufptr = (bufptr_base + (32*samples)) & (32*RINGMAX-1);
+ //
+ // Emulate DSP effects if desired
+ //
+ if(wantreverb) { render_effects(state, fxbus, outbuf, samples); }
+ //
+ // Scale, clip and copy output
+ //
+ if(buf) {
+ uint32 att = state->mvol ^ 0xF;
+ sint32 lin = 4 - (att & 1);
+ att >>= 1; att += 2; att += 4;
+ for(i = 0; i < samples; i++) {
+ sint32 l = outbuf2 * i + 0;
+ sint32 r = outbuf2 * i + 1;
+ l *= lin; l >>= att;
+ r *= lin; r >>= att;
+ if(l < (-0x8000)) l = (-0x8000);
+ if(r < (-0x8000)) r = (-0x8000);
+ if(l > ( 0x7FFF)) l = ( 0x7FFF);
+ if(r > ( 0x7FFF)) r = ( 0x7FFF);
+ buf2 * i + 0 = l;
+ buf2 * i + 1 = r;
+ }
+ }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Flush all pending samples into the output buffer
+//
+void EMU_CALL yam_flush(void *state) {
+// return;
+//printf("yam_flush(%up)",YAMSTATE->out_pending);
+
+ for(;;) {
+ uint32 n = YAMSTATE->out_pending;
+ if(n < 1) { break; }
+ if(n > RENDERMAX) { n = RENDERMAX; }
+ render(YAMSTATE, YAMSTATE->odometer - YAMSTATE->out_pending, n);
+ YAMSTATE->out_pending -= n;
+ if(YAMSTATE->out_buf) { YAMSTATE->out_buf += 2 * n; }
+ }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Prepare or unprepare dynacode buffer for execution
+//
+void EMU_CALL yam_prepare_dynacode(void *state) {
+#ifdef ENABLE_DYNAREC
+#ifdef _WIN32
+ DWORD i;
+ VirtualProtect( &YAMSTATE->dynacode, sizeof(YAMSTATE->dynacode), PAGE_EXECUTE_READWRITE, &i );
+#elif defined(HAVE_MPROTECT)
+ unsigned long startaddr = &YAMSTATE->dynacode;
+ unsigned long length = sizeof(YAMSTATE->dynacode);
+ int psize = getpagesize();
+ unsigned long addr = ( startaddr & ~(psize - 1) );
+ mprotect( (char *) addr, length + startaddr - addr + psize, PROT_READ | PROT_WRITE | PROT_EXEC );
+#endif
+#endif
+}
+
+void EMU_CALL yam_unprepare_dynacode(void *state) {
+#ifdef ENABLE_DYNAREC
+#ifdef _WIN32
+ DWORD i;
+ VirtualProtect( &YAMSTATE->dynacode, sizeof(YAMSTATE->dynacode), PAGE_READWRITE, &i );
+#elif defined(HAVE_MPROTECT)
+ unsigned long startaddr = &YAMSTATE->dynacode;
+ unsigned long length = sizeof(YAMSTATE->dynacode);
+ int psize = getpagesize();
+ unsigned long addr = ( startaddr & ~(psize - 1) );
+ mprotect( (char *) addr, length + startaddr - addr + psize, PROT_READ | PROT_WRITE );
+#endif
+#endif
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Mute channels post reset
+//
+void EMU_CALL yam_set_mute(void *state, uint32 channel, uint32 enable) {
+ YAMSTATE->chanchannel.mute = (uint8) enable;
+}
+
+/////////////////////////////////////////////////////////////////////////////

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/yam.h Added

@@ -0,0 +1,54 @@
+/////////////////////////////////////////////////////////////////////////////
+//
+// yam - Emulates Yamaha SCSP and AICA
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __SEGA_YAM_H__
+#define __SEGA_YAM_H__
+
+#include "emuconfig.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+
+// version = 1 for SCSP, 2 for AICA
+// ramsize must be a power of 2
+
+sint32 EMU_CALL yam_init(void);
+uint32 EMU_CALL yam_get_state_size(uint8 version);
+void   EMU_CALL yam_clear_state(void *state, uint8 version);
+
+void   EMU_CALL yam_enable_dry(void *state, uint8 enable);
+void   EMU_CALL yam_enable_dsp(void *state, uint8 enable);
+void   EMU_CALL yam_enable_dsp_dynarec(void *state, uint8 enable);
+
+void   EMU_CALL yam_setram(void *state, uint32 *ram, uint32 size, uint8 mbx, uint8 mwx);
+void   EMU_CALL yam_beginbuffer(void *state, sint16 *buf);
+void   EMU_CALL yam_advance(void *state, uint32 samples);
+void   EMU_CALL yam_flush(void *state);
+
+uint32 EMU_CALL yam_aica_load_reg(void *state, uint32 a, uint32 mask);
+void   EMU_CALL yam_aica_store_reg(void *state, uint32 a, uint32 d, uint32 mask, uint8 *breakcpu);
+
+uint32 EMU_CALL yam_scsp_load_reg(void *state, uint32 a, uint32 mask);
+void   EMU_CALL yam_scsp_store_reg(void *state, uint32 a, uint32 d, uint32 mask, uint8 *breakcpu);
+
+uint8* EMU_CALL yam_get_interrupt_pending_ptr(void *state);
+uint32 EMU_CALL yam_get_min_samples_until_interrupt(void *state);
+
+void   EMU_CALL yam_prepare_dynacode(void *state);
+void   EMU_CALL yam_unprepare_dynacode(void *state);
+
+void   EMU_CALL yam_set_mute(void *state, uint32 channel, uint32 enable);
+
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.c Added

@@ -0,0 +1,2541 @@
+/*****************************************************************************
+*
+* Yamaha YM2151 driver (version 2.150 final beta)
+*
+******************************************************************************/
+
+#include <stdio.h>
+#include <math.h>
+
+#include "mamedef.h"
+#include <stdlib.h>
+#include <string.h>
+//#include "sndintrf.h"
+//#include "streams.h"
+#include "ym2151.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+
+/* undef this to not use MAME timer system */
+//#define USE_MAME_TIMERS
+
+/*#define FM_EMU*/
+#ifdef FM_EMU
+	#ifdef USE_MAME_TIMERS
+		#undef USE_MAME_TIMERS
+	#endif
+#endif
+
+//static char LOG_CYM_FILE = 0x00;
+//static FILE * cymfile = NULL;
+
+typedef struct YM2151 YM2151;
+
+/* struct describing a single operator */
+typedef struct{
+	UINT32		phase;					/* accumulated operator phase */
+	UINT32		freq;					/* operator frequency count */
+	INT32		dt1;					/* current DT1 (detune 1 phase inc/decrement) value */
+	UINT32		mul;					/* frequency count multiply */
+	UINT32		dt1_i;					/* DT1 index * 32 */
+	UINT32		dt2;					/* current DT2 (detune 2) value */
+
+	signed int *connect;				/* operator output 'direction' */
+
+	/* only M1 (operator 0) is filled with this data: */
+	signed int *mem_connect;			/* where to put the delayed sample (MEM) */
+	INT32		mem_value;				/* delayed sample (MEM) value */
+
+	/* channel specific data; note: each operator number 0 contains channel specific data */
+	UINT32		fb_shift;				/* feedback shift value for operators 0 in each channel */
+	INT32		fb_out_curr;			/* operator feedback value (used only by operators 0) */
+	INT32		fb_out_prev;			/* previous feedback value (used only by operators 0) */
+	UINT32		kc;						/* channel KC (copied to all operators) */
+	UINT32		kc_i;					/* just for speedup */
+	UINT32		pms;					/* channel PMS */
+	UINT32		ams;					/* channel AMS */
+	/* end of channel specific data */
+
+	UINT32		AMmask;					/* LFO Amplitude Modulation enable mask */
+	UINT32		state;					/* Envelope state: 4-attack(AR) 3-decay(D1R) 2-sustain(D2R) 1-release(RR) 0-off */
+	UINT8		eg_sh_ar;				/* (attack state) */
+	UINT8		eg_sel_ar;				/* (attack state) */
+	UINT32		tl;						/* Total attenuation Level */
+	INT32		volume;					/* current envelope attenuation level */
+	UINT8		eg_sh_d1r;				/* (decay state) */
+	UINT8		eg_sel_d1r;				/* (decay state) */
+	UINT32		d1l;					/* envelope switches to sustain state after reaching this level */
+	UINT8		eg_sh_d2r;				/* (sustain state) */
+	UINT8		eg_sel_d2r;				/* (sustain state) */
+	UINT8		eg_sh_rr;				/* (release state) */
+	UINT8		eg_sel_rr;				/* (release state) */
+
+	UINT32		key;					/* 0=last key was KEY OFF, 1=last key was KEY ON */
+
+	UINT32		ks;						/* key scale */
+	UINT32		ar;						/* attack rate */
+	UINT32		d1r;					/* decay rate */
+	UINT32		d2r;					/* sustain rate */
+	UINT32		rr;						/* release rate */
+
+	UINT32		reserved0;				/**/
+	UINT32		reserved1;				/**/
+
+} YM2151Operator;
+
+
+struct YM2151
+{
+	YM2151Operator	oper32;			/* the 32 operators */
+
+	UINT32		pan16;				/* channels output masks (0xffffffff = enable) */
+	UINT8		Muted8;				/* used for muting */
+
+	UINT32		eg_cnt;					/* global envelope generator counter */
+	UINT32		eg_timer;				/* global envelope generator counter works at frequency = chipclock/64/3 */
+	UINT32		eg_timer_add;			/* step of eg_timer */
+	UINT32		eg_timer_overflow;		/* envelope generator timer overlfows every 3 samples (on real chip) */
+
+	UINT32		lfo_phase;				/* accumulated LFO phase (0 to 255) */
+	UINT32		lfo_timer;				/* LFO timer */
+	UINT32		lfo_timer_add;			/* step of lfo_timer */
+	UINT32		lfo_overflow;			/* LFO generates new output when lfo_timer reaches this value */
+	UINT32		lfo_counter;			/* LFO phase increment counter */
+	UINT32		lfo_counter_add;		/* step of lfo_counter */
+	UINT8		lfo_wsel;				/* LFO waveform (0-saw, 1-square, 2-triangle, 3-random noise) */
+	UINT8		amd;					/* LFO Amplitude Modulation Depth */
+	INT8		pmd;					/* LFO Phase Modulation Depth */
+	UINT32		lfa;					/* LFO current AM output */
+	INT32		lfp;					/* LFO current PM output */
+
+	UINT8		test;					/* TEST register */
+	UINT8		ct;						/* output control pins (bit1-CT2, bit0-CT1) */
+
+	UINT32		noise;					/* noise enable/period register (bit 7 - noise enable, bits 4-0 - noise period */
+	UINT32		noise_rng;				/* 17 bit noise shift register */
+	UINT32		noise_p;				/* current noise 'phase'*/
+	UINT32		noise_f;				/* current noise period */
+
+	UINT32		csm_req;				/* CSM KEY ON / KEY OFF sequence request */
+
+	UINT32		irq_enable;				/* IRQ enable for timer B (bit 3) and timer A (bit 2); bit 7 - CSM mode (keyon to all slots, everytime timer A overflows) */
+	UINT32		status;					/* chip status (BUSY, IRQ Flags) */
+	UINT8		connect8;				/* channels connections */
+
+#ifdef USE_MAME_TIMERS
+/* ASG 980324 -- added for tracking timers */
+	emu_timer	*timer_A;
+	emu_timer	*timer_B;
+	attotime	timer_A_time1024;		/* timer A times for MAME */
+	attotime	timer_B_time256;		/* timer B times for MAME */
+	int			irqlinestate;
+#else
+	UINT8		tim_A;					/* timer A enable (0-disabled) */
+	UINT8		tim_B;					/* timer B enable (0-disabled) */
+	INT32		tim_A_val;				/* current value of timer A */
+	INT32		tim_B_val;				/* current value of timer B */
+	UINT32		tim_A_tab1024;		/* timer A deltas */
+	UINT32		tim_B_tab256;			/* timer B deltas */
+#endif
+	UINT32		timer_A_index;			/* timer A index */
+	UINT32		timer_B_index;			/* timer B index */
+	UINT32		timer_A_index_old;		/* timer A previous index */
+	UINT32		timer_B_index_old;		/* timer B previous index */
+
+	/* Frequency-deltas to get the closest frequency possible.
+ * There are 11 octaves because of DT2 (max 950 cents over base frequency)
+ * and LFO phase modulation (max 800 cents below AND over base frequency)
+ * Summary: octave explanation
+ * 0 note code - LFO PM
+ * 1 note code
+ * 2 note code
+ * 3 note code
+ * 4 note code
+ * 5 note code
+ * 6 note code
+ * 7 note code
+ * 8 note code
+ * 9 note code + DT2 + LFO PM
+ * 10 note code + DT2 + LFO PM
+ */
+	UINT32		freq11*768;			/* 11 octaves, 768 'cents' per octave */
+
+	/* Frequency deltas for DT1. These deltas alter operator frequency
+ * after it has been taken from frequency-deltas table.
+ */
+	INT32		dt1_freq8*32;			/* 8 DT1 levels, 32 KC values */
+
+	UINT32		noise_tab32;			/* 17bit Noise Generator periods */
+
+	//void (*irqhandler)(const device_config *device, int irq);		/* IRQ function handler */
+	//write8_device_func porthandler;		/* port write function handler */
+
+	//const device_config *device;
+	unsigned int clock;					/* chip clock in Hz (passed from 2151intf.c) */
+	unsigned int sampfreq;				/* sampling frequency in Hz (passed from 2151intf.c) */
+};
+
+
+#define FREQ_SH			16 /* 16.16 fixed point (frequency calculations) */
+#define EG_SH			16 /* 16.16 fixed point (envelope generator timing) */
+#define LFO_SH			10 /* 22.10 fixed point (LFO calculations) */
+#define TIMER_SH		16 /* 16.16 fixed point (timers calculations) */
+
+#define FREQ_MASK		((1<<FREQ_SH)-1)
+
+#define ENV_BITS		10
+#define ENV_LEN			(1<<ENV_BITS)
+#define ENV_STEP		(128.0/ENV_LEN)
+
+#define MAX_ATT_INDEX	(ENV_LEN-1) /* 1023 */
+#define MIN_ATT_INDEX	(0)			/* 0 */
+
+#define EG_ATT			4
+#define EG_DEC			3
+#define EG_SUS			2
+#define EG_REL			1
+#define EG_OFF			0
+
+#define SIN_BITS		10
+#define SIN_LEN			(1<<SIN_BITS)
+#define SIN_MASK		(SIN_LEN-1)
+
+#define TL_RES_LEN		(256) /* 8 bits addressing (real chip) */
+
+
+#if (SAMPLE_BITS==16)
+	#define FINAL_SH	(0)
+	#define MAXOUT		(+32767)
+	#define MINOUT		(-32768)
+#else
+	#define FINAL_SH	(8)
+	#define MAXOUT		(+127)
+	#define MINOUT		(-128)
+#endif
+
+
+/* TL_TAB_LEN is calculated as:
+* 13 - sinus amplitude bits (Y axis)
+* 2 - sinus sign bit (Y axis)
+* TL_RES_LEN - sinus resolution (X axis)
+*/
+#define TL_TAB_LEN (13*2*TL_RES_LEN)
+static signed int tl_tabTL_TAB_LEN;
+
+#define ENV_QUIET		(TL_TAB_LEN>>3)
+
+/* sin waveform table in 'decibel' scale */
+static unsigned int sin_tabSIN_LEN;
+
+
+/* translate from D1L to volume index (16 D1L levels) */
+static UINT32 d1l_tab16;
+
+
+#define RATE_STEPS (8)
+static const UINT8 eg_inc19*RATE_STEPS={
+
+/*cycle:0 1 2 3 4 5 6 7*/
+
+/* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..11 0 (increment by 0 or 1) */
+/* 1 */ 0,1, 0,1, 1,1, 0,1, /* rates 00..11 1 */
+/* 2 */ 0,1, 1,1, 0,1, 1,1, /* rates 00..11 2 */
+/* 3 */ 0,1, 1,1, 1,1, 1,1, /* rates 00..11 3 */
+
+/* 4 */ 1,1, 1,1, 1,1, 1,1, /* rate 12 0 (increment by 1) */
+/* 5 */ 1,1, 1,2, 1,1, 1,2, /* rate 12 1 */
+/* 6 */ 1,2, 1,2, 1,2, 1,2, /* rate 12 2 */
+/* 7 */ 1,2, 2,2, 1,2, 2,2, /* rate 12 3 */
+
+/* 8 */ 2,2, 2,2, 2,2, 2,2, /* rate 13 0 (increment by 2) */
+/* 9 */ 2,2, 2,4, 2,2, 2,4, /* rate 13 1 */
+/*10 */ 2,4, 2,4, 2,4, 2,4, /* rate 13 2 */
+/*11 */ 2,4, 4,4, 2,4, 4,4, /* rate 13 3 */
+
+/*12 */ 4,4, 4,4, 4,4, 4,4, /* rate 14 0 (increment by 4) */
+/*13 */ 4,4, 4,8, 4,4, 4,8, /* rate 14 1 */
+/*14 */ 4,8, 4,8, 4,8, 4,8, /* rate 14 2 */
+/*15 */ 4,8, 8,8, 4,8, 8,8, /* rate 14 3 */
+
+/*16 */ 8,8, 8,8, 8,8, 8,8, /* rates 15 0, 15 1, 15 2, 15 3 (increment by 8) */
+/*17 */ 16,16,16,16,16,16,16,16, /* rates 15 2, 15 3 for attack */
+/*18 */ 0,0, 0,0, 0,0, 0,0, /* infinity rates for attack and decay(s) */
+};
+
+
+#define O(a) (a*RATE_STEPS)
+
+/*note that there is no O(17) in this table - it's directly in the code */
+static const UINT8 eg_rate_select32+64+32={	/* Envelope Generator rates (32 + 64 rates + 32 RKS) */
+/* 32 dummy (infinite time) rates */
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18),
+
+/* rates 00-11 */
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+
+/* rate 12 */
+O( 4),O( 5),O( 6),O( 7),
+
+/* rate 13 */
+O( 8),O( 9),O(10),O(11),
+
+/* rate 14 */
+O(12),O(13),O(14),O(15),
+
+/* rate 15 */
+O(16),O(16),O(16),O(16),
+
+/* 32 dummy rates (same as 15 3) */
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16),
+O(16),O(16),O(16),O(16),O(16),O(16),O(16),O(16)
+
+};
+#undef O
+
+/*rate 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15*/
+/*shift 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0 */
+/*mask 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1, 0, 0, 0, 0, 0 */
+
+#define O(a) (a*1)
+static const UINT8 eg_rate_shift32+64+32={	/* Envelope Generator counter shifts (32 + 64 rates + 32 RKS) */
+/* 32 infinite time rates */
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+
+
+/* rates 00-11 */
+O(11),O(11),O(11),O(11),
+O(10),O(10),O(10),O(10),
+O( 9),O( 9),O( 9),O( 9),
+O( 8),O( 8),O( 8),O( 8),
+O( 7),O( 7),O( 7),O( 7),
+O( 6),O( 6),O( 6),O( 6),
+O( 5),O( 5),O( 5),O( 5),
+O( 4),O( 4),O( 4),O( 4),
+O( 3),O( 3),O( 3),O( 3),
+O( 2),O( 2),O( 2),O( 2),
+O( 1),O( 1),O( 1),O( 1),
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 12 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 13 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 14 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 15 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* 32 dummy rates (same as 15 3) */
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0)
+
+};
+#undef O
+
+/* DT2 defines offset in cents from base note
+*
+* This table defines offset in frequency-deltas table.
+* User's Manual page 22
+*
+* Values below were calculated using formula: value = orig.val / 1.5625
+*
+* DT2=0 DT2=1 DT2=2 DT2=3
+* 0 600 781 950
+*/
+static const UINT32 dt2_tab4 = { 0, 384, 500, 608 };
+
+/* DT1 defines offset in Hertz from base note
+* This table is converted while initialization...
+* Detune table shown in YM2151 User's Manual is wrong (verified on the real chip)
+*/
+
+static const UINT8 dt1_tab4*32 = { /* 4*32 DT1 values */
+/* DT1=0 */
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+/* DT1=1 */
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2,
+ 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8,
+
+/* DT1=2 */
+ 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5,
+ 5, 6, 6, 7, 8, 8, 9,10,11,12,13,14,16,16,16,16,
+
+/* DT1=3 */
+ 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7,
+ 8, 8, 9,10,11,12,13,14,16,17,19,20,22,22,22,22
+};
+
+static const UINT16 phaseinc_rom768={
+1299,1300,1301,1302,1303,1304,1305,1306,1308,1309,1310,1311,1313,1314,1315,1316,
+1318,1319,1320,1321,1322,1323,1324,1325,1327,1328,1329,1330,1332,1333,1334,1335,
+1337,1338,1339,1340,1341,1342,1343,1344,1346,1347,1348,1349,1351,1352,1353,1354,
+1356,1357,1358,1359,1361,1362,1363,1364,1366,1367,1368,1369,1371,1372,1373,1374,
+1376,1377,1378,1379,1381,1382,1383,1384,1386,1387,1388,1389,1391,1392,1393,1394,
+1396,1397,1398,1399,1401,1402,1403,1404,1406,1407,1408,1409,1411,1412,1413,1414,
+1416,1417,1418,1419,1421,1422,1423,1424,1426,1427,1429,1430,1431,1432,1434,1435,
+1437,1438,1439,1440,1442,1443,1444,1445,1447,1448,1449,1450,1452,1453,1454,1455,
+1458,1459,1460,1461,1463,1464,1465,1466,1468,1469,1471,1472,1473,1474,1476,1477,
+1479,1480,1481,1482,1484,1485,1486,1487,1489,1490,1492,1493,1494,1495,1497,1498,
+1501,1502,1503,1504,1506,1507,1509,1510,1512,1513,1514,1515,1517,1518,1520,1521,
+1523,1524,1525,1526,1528,1529,1531,1532,1534,1535,1536,1537,1539,1540,1542,1543,
+1545,1546,1547,1548,1550,1551,1553,1554,1556,1557,1558,1559,1561,1562,1564,1565,
+1567,1568,1569,1570,1572,1573,1575,1576,1578,1579,1580,1581,1583,1584,1586,1587,
+1590,1591,1592,1593,1595,1596,1598,1599,1601,1602,1604,1605,1607,1608,1609,1610,
+1613,1614,1615,1616,1618,1619,1621,1622,1624,1625,1627,1628,1630,1631,1632,1633,
+1637,1638,1639,1640,1642,1643,1645,1646,1648,1649,1651,1652,1654,1655,1656,1657,
+1660,1661,1663,1664,1666,1667,1669,1670,1672,1673,1675,1676,1678,1679,1681,1682,
+1685,1686,1688,1689,1691,1692,1694,1695,1697,1698,1700,1701,1703,1704,1706,1707,
+1709,1710,1712,1713,1715,1716,1718,1719,1721,1722,1724,1725,1727,1728,1730,1731,
+1734,1735,1737,1738,1740,1741,1743,1744,1746,1748,1749,1751,1752,1754,1755,1757,
+1759,1760,1762,1763,1765,1766,1768,1769,1771,1773,1774,1776,1777,1779,1780,1782,
+1785,1786,1788,1789,1791,1793,1794,1796,1798,1799,1801,1802,1804,1806,1807,1809,
+1811,1812,1814,1815,1817,1819,1820,1822,1824,1825,1827,1828,1830,1832,1833,1835,
+1837,1838,1840,1841,1843,1845,1846,1848,1850,1851,1853,1854,1856,1858,1859,1861,
+1864,1865,1867,1868,1870,1872,1873,1875,1877,1879,1880,1882,1884,1885,1887,1888,
+1891,1892,1894,1895,1897,1899,1900,1902,1904,1906,1907,1909,1911,1912,1914,1915,
+1918,1919,1921,1923,1925,1926,1928,1930,1932,1933,1935,1937,1939,1940,1942,1944,
+1946,1947,1949,1951,1953,1954,1956,1958,1960,1961,1963,1965,1967,1968,1970,1972,
+1975,1976,1978,1980,1982,1983,1985,1987,1989,1990,1992,1994,1996,1997,1999,2001,
+2003,2004,2006,2008,2010,2011,2013,2015,2017,2019,2021,2022,2024,2026,2028,2029,
+2032,2033,2035,2037,2039,2041,2043,2044,2047,2048,2050,2052,2054,2056,2058,2059,
+2062,2063,2065,2067,2069,2071,2073,2074,2077,2078,2080,2082,2084,2086,2088,2089,
+2092,2093,2095,2097,2099,2101,2103,2104,2107,2108,2110,2112,2114,2116,2118,2119,
+2122,2123,2125,2127,2129,2131,2133,2134,2137,2139,2141,2142,2145,2146,2148,2150,
+2153,2154,2156,2158,2160,2162,2164,2165,2168,2170,2172,2173,2176,2177,2179,2181,
+2185,2186,2188,2190,2192,2194,2196,2197,2200,2202,2204,2205,2208,2209,2211,2213,
+2216,2218,2220,2222,2223,2226,2227,2230,2232,2234,2236,2238,2239,2242,2243,2246,
+2249,2251,2253,2255,2256,2259,2260,2263,2265,2267,2269,2271,2272,2275,2276,2279,
+2281,2283,2285,2287,2288,2291,2292,2295,2297,2299,2301,2303,2304,2307,2308,2311,
+2315,2317,2319,2321,2322,2325,2326,2329,2331,2333,2335,2337,2338,2341,2342,2345,
+2348,2350,2352,2354,2355,2358,2359,2362,2364,2366,2368,2370,2371,2374,2375,2378,
+2382,2384,2386,2388,2389,2392,2393,2396,2398,2400,2402,2404,2407,2410,2411,2414,
+2417,2419,2421,2423,2424,2427,2428,2431,2433,2435,2437,2439,2442,2445,2446,2449,
+2452,2454,2456,2458,2459,2462,2463,2466,2468,2470,2472,2474,2477,2480,2481,2484,
+2488,2490,2492,2494,2495,2498,2499,2502,2504,2506,2508,2510,2513,2516,2517,2520,
+2524,2526,2528,2530,2531,2534,2535,2538,2540,2542,2544,2546,2549,2552,2553,2556,
+2561,2563,2565,2567,2568,2571,2572,2575,2577,2579,2581,2583,2586,2589,2590,2593
+};
+
+
+/*
+ Noise LFO waveform.
+
+ Here are just 256 samples out of much longer data.
+
+ It does NOT repeat every 256 samples on real chip and I wasnt able to find
+ the point where it repeats (even in strings as long as 131072 samples).
+
+ I only put it here because its better than nothing and perhaps
+ someone might be able to figure out the real algorithm.
+
+
+ Note that (due to the way the LFO output is calculated) it is quite
+ possible that two values: 0x80 and 0x00 might be wrong in this table.
+ To be exact:
+ some 0x80 could be 0x81 as well as some 0x00 could be 0x01.
+*/
+
+static const UINT8 lfo_noise_waveform256 = {
+0xFF,0xEE,0xD3,0x80,0x58,0xDA,0x7F,0x94,0x9E,0xE3,0xFA,0x00,0x4D,0xFA,0xFF,0x6A,
+0x7A,0xDE,0x49,0xF6,0x00,0x33,0xBB,0x63,0x91,0x60,0x51,0xFF,0x00,0xD8,0x7F,0xDE,
+0xDC,0x73,0x21,0x85,0xB2,0x9C,0x5D,0x24,0xCD,0x91,0x9E,0x76,0x7F,0x20,0xFB,0xF3,
+0x00,0xA6,0x3E,0x42,0x27,0x69,0xAE,0x33,0x45,0x44,0x11,0x41,0x72,0x73,0xDF,0xA2,
+
+0x32,0xBD,0x7E,0xA8,0x13,0xEB,0xD3,0x15,0xDD,0xFB,0xC9,0x9D,0x61,0x2F,0xBE,0x9D,
+0x23,0x65,0x51,0x6A,0x84,0xF9,0xC9,0xD7,0x23,0xBF,0x65,0x19,0xDC,0x03,0xF3,0x24,
+0x33,0xB6,0x1E,0x57,0x5C,0xAC,0x25,0x89,0x4D,0xC5,0x9C,0x99,0x15,0x07,0xCF,0xBA,
+0xC5,0x9B,0x15,0x4D,0x8D,0x2A,0x1E,0x1F,0xEA,0x2B,0x2F,0x64,0xA9,0x50,0x3D,0xAB,
+
+0x50,0x77,0xE9,0xC0,0xAC,0x6D,0x3F,0xCA,0xCF,0x71,0x7D,0x80,0xA6,0xFD,0xFF,0xB5,
+0xBD,0x6F,0x24,0x7B,0x00,0x99,0x5D,0xB1,0x48,0xB0,0x28,0x7F,0x80,0xEC,0xBF,0x6F,
+0x6E,0x39,0x90,0x42,0xD9,0x4E,0x2E,0x12,0x66,0xC8,0xCF,0x3B,0x3F,0x10,0x7D,0x79,
+0x00,0xD3,0x1F,0x21,0x93,0x34,0xD7,0x19,0x22,0xA2,0x08,0x20,0xB9,0xB9,0xEF,0x51,
+
+0x99,0xDE,0xBF,0xD4,0x09,0x75,0xE9,0x8A,0xEE,0xFD,0xE4,0x4E,0x30,0x17,0xDF,0xCE,
+0x11,0xB2,0x28,0x35,0xC2,0x7C,0x64,0xEB,0x91,0x5F,0x32,0x0C,0x6E,0x00,0xF9,0x92,
+0x19,0xDB,0x8F,0xAB,0xAE,0xD6,0x12,0xC4,0x26,0x62,0xCE,0xCC,0x0A,0x03,0xE7,0xDD,
+0xE2,0x4D,0x8A,0xA6,0x46,0x95,0x0F,0x8F,0xF5,0x15,0x97,0x32,0xD4,0x28,0x1E,0x55
+};
+
+
+
+/* these variables stay here for speedup purposes only */
+static YM2151 * PSG;
+static signed int chanout8;
+static signed int m2,c1,c2; /* Phase Modulation input for operators 2,3,4 */
+static signed int mem;		/* one sample delay memory */
+
+
+/* save output as raw 16-bit sample */
+// #define SAVE_SAMPLE
+// #define SAVE_SEPARATE_CHANNELS
+#if defined SAVE_SAMPLE || defined SAVE_SEPARATE_CHANNELS
+#include <stdio.h>
+
+static FILE *sample9;
+#endif
+
+
+
+
+static void init_tables(void)
+{
+	signed int i,x,n;
+	double o,m;
+
+	for (x=0; x<TL_RES_LEN; x++)
+	{
+		m = (1<<16) / pow(2, (x+1) * (ENV_STEP/4.0) / 8.0);
+		m = floor(m);
+
+		/* we never reach (1<<16) here due to the (x+1) */
+		/* result fits within 16 bits at maximum */
+
+		n = (int)m;		/* 16 bits here */
+		n >>= 4;		/* 12 bits here */
+		if (n&1)		/* round to closest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+						/* 11 bits here (rounded) */
+		n <<= 2;		/* 13 bits here (as in real chip) */
+		tl_tab x*2 + 0 = n;
+		tl_tab x*2 + 1 = -tl_tab x*2 + 0 ;
+
+		for (i=1; i<13; i++)
+		{
+			tl_tab x*2+0 + i*2*TL_RES_LEN = tl_tab x*2+0 >>i;
+			tl_tab x*2+1 + i*2*TL_RES_LEN = -tl_tab x*2+0 + i*2*TL_RES_LEN ;
+		}
+	#if 0
+		logerror("tl %04i", x*2);
+		for (i=0; i<13; i++)
+			logerror(", %02i %4i", i*2, tl_tab x*2 /*+1*/ + i*2*TL_RES_LEN );
+		logerror("\n");
+	#endif
+	}
+	/*logerror("TL_TAB_LEN = %i (%i bytes)\n",TL_TAB_LEN, (int)sizeof(tl_tab));*/
+	/*logerror("ENV_QUIET= %i\n",ENV_QUIET );*/
+
+
+	for (i=0; i<SIN_LEN; i++)
+	{
+		/* non-standard sinus */
+		m = sin( ((i*2)+1) * M_PI / SIN_LEN ); /* verified on the real chip */
+
+		/* we never reach zero here due to ((i*2)+1) */
+
+		if (m>0.0)
+			o = 8*log(1.0/m)/log(2.0);	/* convert to 'decibels' */
+		else
+			o = 8*log(-1.0/m)/log(2.0);	/* convert to 'decibels' */
+
+		o = o / (ENV_STEP/4);
+
+		n = (int)(2.0*o);
+		if (n&1)						/* round to closest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+
+		sin_tab i = n*2 + (m>=0.0? 0: 1 );
+		/*logerror("sin 0x%4x= %4i (tl_tab value=%8x)\n", i, sin_tabi,tl_tabsin_tabi);*/
+	}
+
+
+	/* calculate d1l_tab table */
+	for (i=0; i<16; i++)
+	{
+		m = (i!=15 ? i : i+16) * (4.0/ENV_STEP); /* every 3 'dB' except for all bits = 1 = 45+48 'dB' */
+		d1l_tabi = m;
+		/*logerror("d1l_tab%02x=%08x\n",i,d1l_tabi );*/
+	}
+
+#ifdef SAVE_SAMPLE
+	sample8=fopen("sampsum.pcm","wb");
+#endif
+#ifdef SAVE_SEPARATE_CHANNELS
+	sample0=fopen("samp0.pcm","wb");
+	sample1=fopen("samp1.pcm","wb");
+	sample2=fopen("samp2.pcm","wb");
+	sample3=fopen("samp3.pcm","wb");
+	sample4=fopen("samp4.pcm","wb");
+	sample5=fopen("samp5.pcm","wb");
+	sample6=fopen("samp6.pcm","wb");
+	sample7=fopen("samp7.pcm","wb");
+#endif
+}
+
+
+static void init_chip_tables(YM2151 *chip)
+{
+	int i,j;
+	double mult,phaseinc,Hz;
+	double scaler;
+	//attotime pom;
+	double pom;
+
+	scaler = ( (double)chip->clock / 64.0 ) / ( (double)chip->sampfreq );
+	/*logerror("scaler = %20.15f\n", scaler);*/
+
+
+	/* this loop calculates Hertz values for notes from c-0 to b-7 */
+	/* including 64 'cents' (100/64 that is 1.5625 of real cent) per note */
+	/* i*100/64/1200 is equal to i/768 */
+
+	/* real chip works with 10 bits fixed point values (10.10) */
+	mult = (1<<(FREQ_SH-10)); /* -10 because phaseinc_rom table values are already in 10.10 format */
+
+	for (i=0; i<768; i++)
+	{
+		/* 3.4375 Hz is note A; C# is 4 semitones higher */
+		Hz = 1000;
+#if 0
+/* Hz is close, but not perfect */
+		//Hz = scaler * 3.4375 * pow (2, (i + 4 * 64 ) / 768.0 );
+		/* calculate phase increment */
+		phaseinc = (Hz*SIN_LEN) / (double)chip->sampfreq;
+#endif
+
+		phaseinc = phaseinc_romi;	/* real chip phase increment */
+		phaseinc *= scaler;			/* adjust */
+
+
+		/* octave 2 - reference octave */
+		chip->freq 768+2*768+i = ((int)(phaseinc*mult)) & 0xffffffc0; /* adjust to X.10 fixed point */
+		/* octave 0 and octave 1 */
+		for (j=0; j<2; j++)
+		{
+			chip->freq768 + j*768 + i = (chip->freq 768+2*768+i >> (2-j) ) & 0xffffffc0; /* adjust to X.10 fixed point */
+		}
+		/* octave 3 to 7 */
+		for (j=3; j<8; j++)
+		{
+			chip->freq768 + j*768 + i = chip->freq 768+2*768+i << (j-2);
+		}
+
+	#if 0
+			pom = (double)chip->freq 768+2*768+i / ((double)(1<<FREQ_SH));
+			pom = pom * (double)chip->sampfreq / (double)SIN_LEN;
+			logerror("1freq%4i%08x= real %20.15f Hz emul %20.15f Hz\n", i, chip->freq 768+2*768+i , Hz, pom);
+	#endif
+	}
+
+	/* octave -1 (all equal to: oct 0, _KC_00_, _KF_00_) */
+	for (i=0; i<768; i++)
+	{
+		chip->freq 0*768 + i = chip->freq1*768+0;
+	}
+
+	/* octave 8 and 9 (all equal to: oct 7, _KC_14_, _KF_63_) */
+	for (j=8; j<10; j++)
+	{
+		for (i=0; i<768; i++)
+		{
+			chip->freq768+ j*768 + i = chip->freq768 + 8*768 -1;
+		}
+	}
+
+#if 0
+		for (i=0; i<11*768; i++)
+		{
+			pom = (double)chip->freqi / ((double)(1<<FREQ_SH));
+			pom = pom * (double)chip->sampfreq / (double)SIN_LEN;
+			logerror("freq%4i%08x= emul %20.15f Hz\n", i, chip->freqi, pom);
+		}
+#endif
+
+	mult = (1<<FREQ_SH);
+	for (j=0; j<4; j++)
+	{
+		for (i=0; i<32; i++)
+		{
+			Hz = ( (double)dt1_tabj*32+i * ((double)chip->clock/64.0) ) / (double)(1<<20);
+
+			/*calculate phase increment*/
+			phaseinc = (Hz*SIN_LEN) / (double)chip->sampfreq;
+
+			/*positive and negative values*/
+			chip->dt1_freq (j+0)*32 + i = phaseinc * mult;
+			chip->dt1_freq (j+4)*32 + i = -chip->dt1_freq (j+0)*32 + i ;
+
+#if 0
+			{
+				int x = j*32 + i;
+				pom = (double)chip->dt1_freqx / mult;
+				pom = pom * (double)chip->sampfreq / (double)SIN_LEN;
+				logerror("DT1(%03i)%02i %02i%08x= real %19.15f Hz emul %19.15f Hz\n",
+						 x, j, i, chip->dt1_freqx, Hz, pom);
+			}
+#endif
+		}
+	}
+
+
+	/* calculate timers' deltas */
+	/* User's Manual pages 15,16 */
+	mult = (1<<TIMER_SH);
+	for (i=0; i<1024; i++)
+	{
+		/* ASG 980324: changed to compute both tim_A_tab and timer_A_time */
+		//pom= attotime_mul(ATTOTIME_IN_HZ(chip->clock), 64 * (1024 - i));
+		pom = ((double)64 * (1024 - i) / chip->clock);
+		#ifdef USE_MAME_TIMERS
+			chip->timer_A_timei = pom;
+		#else
+			//chip->tim_A_tabi = attotime_to_double(pom) * (double)chip->sampfreq * mult; /* number of samples that timer period takes (fixed point) */
+			chip->tim_A_tabi = pom * (double)chip->sampfreq * mult; /* number of samples that timer period takes (fixed point) */
+		#endif
+	}
+	for (i=0; i<256; i++)
+	{
+		/* ASG 980324: changed to compute both tim_B_tab and timer_B_time */
+		//pom= attotime_mul(ATTOTIME_IN_HZ(chip->clock), 1024 * (256 - i));
+		pom = ((double)1024 * (256 - i) / chip->clock);
+		#ifdef USE_MAME_TIMERS
+			chip->timer_B_timei = pom;
+		#else
+			//chip->tim_B_tabi = attotime_to_double(pom) * (double)chip->sampfreq * mult; /* number of samples that timer period takes (fixed point) */
+			chip->tim_B_tabi = pom * (double)chip->sampfreq * mult; /* number of samples that timer period takes (fixed point) */
+		#endif
+	}
+
+	/* calculate noise periods table */
+	scaler = ( (double)chip->clock / 64.0 ) / ( (double)chip->sampfreq );
+	for (i=0; i<32; i++)
+	{
+		j = (i!=31 ? i : 30);				/* rate 30 and 31 are the same */
+		j = 32-j;
+		j = (65536.0 / (double)(j*32.0));	/* number of samples per one shift of the shift register */
+		/*chip->noise_tabi = j * 64;*/	/* number of chip clock cycles per one shift */
+		chip->noise_tabi = j * 64 * scaler;
+		/*logerror("noise_tab%02x=%08x\n", i, chip->noise_tabi);*/
+	}
+}
+
+#define KEY_ON(op, key_set){									\
+		if (!(op)->key)											\
+		{														\
+			(op)->phase = 0;			/* clear phase */		\
+			(op)->state = EG_ATT;		/* KEY ON = attack */	\
+			(op)->volume += (~(op)->volume *					\
+ (eg_inc(op)->eg_sel_ar + ((PSG->eg_cnt>>(op)->eg_sh_ar)&7))	\
+ ) >>4;								\
+			if ((op)->volume <= MIN_ATT_INDEX)					\
+			{													\
+				(op)->volume = MIN_ATT_INDEX;					\
+				(op)->state = EG_DEC;							\
+			}													\
+		}														\
+		(op)->key |= key_set;									\
+}
+
+#define KEY_OFF(op, key_clr){									\
+		if ((op)->key)											\
+		{														\
+			(op)->key &= key_clr;								\
+			if (!(op)->key)										\
+			{													\
+				if ((op)->state>EG_REL)							\
+					(op)->state = EG_REL;/* KEY OFF = release */\
+			}													\
+		}														\
+}
+
+INLINE void envelope_KONKOFF(YM2151Operator * op, int v)
+{
+	if (v&0x08)	/* M1 */
+		KEY_ON (op+0, 1)
+	else
+		KEY_OFF(op+0,~1)
+
+	if (v&0x20)	/* M2 */
+		KEY_ON (op+1, 1)
+	else
+		KEY_OFF(op+1,~1)
+
+	if (v&0x10)	/* C1 */
+		KEY_ON (op+2, 1)
+	else
+		KEY_OFF(op+2,~1)
+
+	if (v&0x40)	/* C2 */
+		KEY_ON (op+3, 1)
+	else
+		KEY_OFF(op+3,~1)
+}
+
+
+#ifdef USE_MAME_TIMERS
+
+/*static TIMER_CALLBACK( irqAon_callback )
+{
+	YM2151 *chip = (YM2151 *)ptr;
+	int oldstate = chip->irqlinestate;
+
+	chip->irqlinestate |= 1;
+
+	if (oldstate == 0 && chip->irqhandler) (*chip->irqhandler)(chip->device, 1);
+}
+
+static TIMER_CALLBACK( irqBon_callback )
+{
+	YM2151 *chip = (YM2151 *)ptr;
+	int oldstate = chip->irqlinestate;
+
+	chip->irqlinestate |= 2;
+
+	if (oldstate == 0 && chip->irqhandler) (*chip->irqhandler)(chip->device, 1);
+}
+
+static TIMER_CALLBACK( irqAoff_callback )
+{
+	YM2151 *chip = (YM2151 *)ptr;
+	int oldstate = chip->irqlinestate;
+
+	chip->irqlinestate &= ~1;
+
+	if (oldstate == 1 && chip->irqhandler) (*chip->irqhandler)(chip->device, 0);
+}
+
+static TIMER_CALLBACK( irqBoff_callback )
+{
+	YM2151 *chip = (YM2151 *)ptr;
+	int oldstate = chip->irqlinestate;
+
+	chip->irqlinestate &= ~2;
+
+	if (oldstate == 2 && chip->irqhandler) (*chip->irqhandler)(chip->device, 0);
+}
+
+static TIMER_CALLBACK( timer_callback_a )
+{
+	YM2151 *chip = (YM2151 *)ptr;
+	timer_adjust_oneshot(chip->timer_A, chip->timer_A_time chip->timer_A_index , 0);
+	chip->timer_A_index_old = chip->timer_A_index;
+	if (chip->irq_enable & 0x04)
+	{
+		chip->status |= 1;
+		timer_set(machine, attotime_zero,chip,0,irqAon_callback);
+	}
+	if (chip->irq_enable & 0x80)
+		chip->csm_req = 2;		// request KEY ON / KEY OFF sequence
+}
+static TIMER_CALLBACK( timer_callback_b )
+{
+	YM2151 *chip = (YM2151 *)ptr;
+	timer_adjust_oneshot(chip->timer_B, chip->timer_B_time chip->timer_B_index , 0);
+	chip->timer_B_index_old = chip->timer_B_index;
+	if (chip->irq_enable & 0x08)
+	{
+		chip->status |= 2;
+		timer_set(machine, attotime_zero,chip,0,irqBon_callback);
+	}
+}*/
+#if 0
+static TIMER_CALLBACK( timer_callback_chip_busy )
+{
+	YM2151 *chip = (YM2151 *)ptr;
+	chip->status &= 0x7f;	/* reset busy flag */
+}
+#endif
+#endif
+
+
+
+
+
+
+INLINE void set_connect( YM2151Operator *om1, int cha, int v)
+{
+	YM2151Operator *om2 = om1+1;
+	YM2151Operator *oc1 = om1+2;
+
+	/* set connect algorithm */
+
+	/* MEM is simply one sample delay */
+
+	switch( v&7 )
+	{
+	case 0:
+		/* M1---C1---MEM---M2---C2---OUT */
+		om1->connect = &c1;
+		oc1->connect = &mem;
+		om2->connect = &c2;
+		om1->mem_connect = &m2;
+		break;
+
+	case 1:
+		/* M1------+-MEM---M2---C2---OUT */
+		/* C1-+ */
+		om1->connect = &mem;
+		oc1->connect = &mem;
+		om2->connect = &c2;
+		om1->mem_connect = &m2;
+		break;
+
+	case 2:
+		/* M1-----------------+-C2---OUT */
+		/* C1---MEM---M2-+ */
+		om1->connect = &c2;
+		oc1->connect = &mem;
+		om2->connect = &c2;
+		om1->mem_connect = &m2;
+		break;
+
+	case 3:
+		/* M1---C1---MEM------+-C2---OUT */
+		/* M2-+ */
+		om1->connect = &c1;
+		oc1->connect = &mem;
+		om2->connect = &c2;
+		om1->mem_connect = &c2;
+		break;
+
+	case 4:
+		/* M1---C1-+-OUT */
+		/* M2---C2-+ */
+		/* MEM: not used */
+		om1->connect = &c1;
+		oc1->connect = &chanoutcha;
+		om2->connect = &c2;
+		om1->mem_connect = &mem;	/* store it anywhere where it will not be used */
+		break;
+
+	case 5:
+		/* +----C1----+ */
+		/* M1-+-MEM---M2-+-OUT */
+		/* +----C2----+ */
+		om1->connect = 0;	/* special mark */
+		oc1->connect = &chanoutcha;
+		om2->connect = &chanoutcha;
+		om1->mem_connect = &m2;
+		break;
+
+	case 6:
+		/* M1---C1-+ */
+		/* M2-+-OUT */
+		/* C2-+ */
+		/* MEM: not used */
+		om1->connect = &c1;
+		oc1->connect = &chanoutcha;
+		om2->connect = &chanoutcha;
+		om1->mem_connect = &mem;	/* store it anywhere where it will not be used */
+		break;
+
+	case 7:
+		/* M1-+ */
+		/* C1-+-OUT */
+		/* M2-+ */
+		/* C2-+ */
+		/* MEM: not used*/
+		om1->connect = &chanoutcha;
+		oc1->connect = &chanoutcha;
+		om2->connect = &chanoutcha;
+		om1->mem_connect = &mem;	/* store it anywhere where it will not be used */
+		break;
+	}
+}
+
+
+INLINE void refresh_EG(YM2151Operator * op)
+{
+	UINT32 kc;
+	UINT32 v;
+
+	kc = op->kc;
+
+	/* v = 32 + 2*RATE + RKS = max 126 */
+
+	v = kc >> op->ks;
+	if ((op->ar+v) < 32+62)
+	{
+		op->eg_sh_ar = eg_rate_shift op->ar + v ;
+		op->eg_sel_ar = eg_rate_selectop->ar + v ;
+	}
+	else
+	{
+		op->eg_sh_ar = 0;
+		op->eg_sel_ar = 17*RATE_STEPS;
+	}
+	op->eg_sh_d1r = eg_rate_shift op->d1r + v;
+	op->eg_sel_d1r= eg_rate_selectop->d1r + v;
+	op->eg_sh_d2r = eg_rate_shift op->d2r + v;
+	op->eg_sel_d2r= eg_rate_selectop->d2r + v;
+	op->eg_sh_rr = eg_rate_shift op->rr + v;
+	op->eg_sel_rr = eg_rate_selectop->rr + v;
+
+
+	op+=1;
+
+	v = kc >> op->ks;
+	if ((op->ar+v) < 32+62)
+	{
+		op->eg_sh_ar = eg_rate_shift op->ar + v ;
+		op->eg_sel_ar = eg_rate_selectop->ar + v ;
+	}
+	else
+	{
+		op->eg_sh_ar = 0;
+		op->eg_sel_ar = 17*RATE_STEPS;
+	}
+	op->eg_sh_d1r = eg_rate_shift op->d1r + v;
+	op->eg_sel_d1r= eg_rate_selectop->d1r + v;
+	op->eg_sh_d2r = eg_rate_shift op->d2r + v;
+	op->eg_sel_d2r= eg_rate_selectop->d2r + v;
+	op->eg_sh_rr = eg_rate_shift op->rr + v;
+	op->eg_sel_rr = eg_rate_selectop->rr + v;
+
+	op+=1;
+
+	v = kc >> op->ks;
+	if ((op->ar+v) < 32+62)
+	{
+		op->eg_sh_ar = eg_rate_shift op->ar + v ;
+		op->eg_sel_ar = eg_rate_selectop->ar + v ;
+	}
+	else
+	{
+		op->eg_sh_ar = 0;
+		op->eg_sel_ar = 17*RATE_STEPS;
+	}
+	op->eg_sh_d1r = eg_rate_shift op->d1r + v;
+	op->eg_sel_d1r= eg_rate_selectop->d1r + v;
+	op->eg_sh_d2r = eg_rate_shift op->d2r + v;
+	op->eg_sel_d2r= eg_rate_selectop->d2r + v;
+	op->eg_sh_rr = eg_rate_shift op->rr + v;
+	op->eg_sel_rr = eg_rate_selectop->rr + v;
+
+	op+=1;
+
+	v = kc >> op->ks;
+	if ((op->ar+v) < 32+62)
+	{
+		op->eg_sh_ar = eg_rate_shift op->ar + v ;
+		op->eg_sel_ar = eg_rate_selectop->ar + v ;
+	}
+	else
+	{
+		op->eg_sh_ar = 0;
+		op->eg_sel_ar = 17*RATE_STEPS;
+	}
+	op->eg_sh_d1r = eg_rate_shift op->d1r + v;
+	op->eg_sel_d1r= eg_rate_selectop->d1r + v;
+	op->eg_sh_d2r = eg_rate_shift op->d2r + v;
+	op->eg_sel_d2r= eg_rate_selectop->d2r + v;
+	op->eg_sh_rr = eg_rate_shift op->rr + v;
+	op->eg_sel_rr = eg_rate_selectop->rr + v;
+}
+
+
+/* write a register on YM2151 chip number 'n' */
+void ym2151_write_reg(void *_chip, int r, int v)
+{
+	YM2151 *chip = (YM2151 *)_chip;
+	YM2151Operator *op = &chip->oper (r&0x07)*4+((r&0x18)>>3) ;
+
+	/* adjust bus to 8 bits */
+	r &= 0xff;
+	v &= 0xff;
+
+#if 0
+	/* There is no info on what YM2151 really does when busy flag is set */
+	if ( chip->status & 0x80 ) return;
+	timer_set ( attotime_mul(ATTOTIME_IN_HZ(chip->clock), 64), chip, 0, timer_callback_chip_busy);
+	chip->status |= 0x80;	/* set busy flag for 64 chip clock cycles */
+#endif
+
+	/*if (LOG_CYM_FILE && (cymfile) && (r!=0) )
+	{
+		fputc( (unsigned char)r, cymfile );
+		fputc( (unsigned char)v, cymfile );
+	}*/
+
+
+	switch(r & 0xe0){
+	case 0x00:
+		switch(r){
+		case 0x01:	/* LFO reset(bit 1), Test Register (other bits) */
+			chip->test = v;
+			if (v&2) chip->lfo_phase = 0;
+			break;
+
+		case 0x08:
+			PSG = chip; /* PSG is used in KEY_ON macro */
+			envelope_KONKOFF(&chip->oper (v&7)*4 , v );
+			break;
+
+		case 0x0f:	/* noise mode enable, noise period */
+			chip->noise = v;
+			chip->noise_f = chip->noise_tab v & 0x1f ;
+			break;
+
+		case 0x10:	/* timer A hi */
+			chip->timer_A_index = (chip->timer_A_index & 0x003) | (v<<2);
+			break;
+
+		case 0x11:	/* timer A low */
+			chip->timer_A_index = (chip->timer_A_index & 0x3fc) | (v & 3);
+			break;
+
+		case 0x12:	/* timer B */
+			chip->timer_B_index = v;
+			break;
+
+		case 0x14:	/* CSM, irq flag reset, irq enable, timer start/stop */
+
+			chip->irq_enable = v;	/* bit 3-timer B, bit 2-timer A, bit 7 - CSM */
+
+			if (v&0x10)	/* reset timer A irq flag */
+			{
+#ifdef USE_MAME_TIMERS
+				chip->status &= ~1;
+				timer_set(chip->device->machine, attotime_zero,chip,0,irqAoff_callback);
+#else
+				//int oldstate = chip->status & 3;
+				chip->status &= ~1;
+				//if ((oldstate==1) && (chip->irqhandler)) (*chip->irqhandler)(chip->device, 0);
+#endif
+			}
+
+			if (v&0x20)	/* reset timer B irq flag */
+			{
+#ifdef USE_MAME_TIMERS
+				chip->status &= ~2;
+				timer_set(chip->device->machine, attotime_zero,chip,0,irqBoff_callback);
+#else
+				//int oldstate = chip->status & 3;
+				chip->status &= ~2;
+				//if ((oldstate==2) && (chip->irqhandler)) (*chip->irqhandler)(chip->device, 0);
+#endif
+			}
+
+			if (v&0x02){	/* load and start timer B */
+				#ifdef USE_MAME_TIMERS
+				/* ASG 980324: added a real timer */
+				/* start timer _only_ if it wasn't already started (it will reload time value next round) */
+					if (!timer_enable(chip->timer_B, 1))
+					{
+						timer_adjust_oneshot(chip->timer_B, chip->timer_B_time chip->timer_B_index , 0);
+						chip->timer_B_index_old = chip->timer_B_index;
+					}
+				#else
+					if (!chip->tim_B)
+					{
+						chip->tim_B = 1;
+						chip->tim_B_val = chip->tim_B_tab chip->timer_B_index ;
+					}
+				#endif
+			}else{		/* stop timer B */
+				#ifdef USE_MAME_TIMERS
+				/* ASG 980324: added a real timer */
+					timer_enable(chip->timer_B, 0);
+				#else
+					chip->tim_B = 0;
+				#endif
+			}
+
+			if (v&0x01){	/* load and start timer A */
+				#ifdef USE_MAME_TIMERS
+				/* ASG 980324: added a real timer */
+				/* start timer _only_ if it wasn't already started (it will reload time value next round) */
+					if (!timer_enable(chip->timer_A, 1))
+					{
+						timer_adjust_oneshot(chip->timer_A, chip->timer_A_time chip->timer_A_index , 0);
+						chip->timer_A_index_old = chip->timer_A_index;
+					}
+				#else
+					if (!chip->tim_A)
+					{
+						chip->tim_A = 1;
+						chip->tim_A_val = chip->tim_A_tab chip->timer_A_index ;
+					}
+				#endif
+			}else{		/* stop timer A */
+				#ifdef USE_MAME_TIMERS
+				/* ASG 980324: added a real timer */
+					timer_enable(chip->timer_A, 0);
+				#else
+					chip->tim_A = 0;
+				#endif
+			}
+			break;
+
+		case 0x18:	/* LFO frequency */
+			{
+				chip->lfo_overflow = ( 1 << ((15-(v>>4))+3) ) * (1<<LFO_SH);
+				chip->lfo_counter_add = 0x10 + (v & 0x0f);
+			}
+			break;
+
+		case 0x19:	/* PMD (bit 7==1) or AMD (bit 7==0) */
+			if (v&0x80)
+				chip->pmd = v & 0x7f;
+			else
+				chip->amd = v & 0x7f;
+			break;
+
+		case 0x1b:	/* CT2, CT1, LFO waveform */
+			chip->ct = v >> 6;
+			chip->lfo_wsel = v & 3;
+			//if (chip->porthandler) (*chip->porthandler)(chip->device, 0 , chip->ct );
+			break;
+
+		default:
+#ifdef _DEBUG
+			//logerror("YM2151 Write %02x to undocumented register #%02x\n",v,r);
+#endif
+			break;
+		}
+		break;
+
+	case 0x20:
+		op = &chip->oper (r&7) * 4 ;
+		switch(r & 0x18){
+		case 0x00:	/* RL enable, Feedback, Connection */
+			op->fb_shift = ((v>>3)&7) ? ((v>>3)&7)+6:0;
+			chip->pan (r&7)*2 = (v & 0x40) ? ~0 : 0;
+			chip->pan (r&7)*2 +1 = (v & 0x80) ? ~0 : 0;
+			chip->connectr&7 = v&7;
+			set_connect(op, r&7, v&7);
+			break;
+
+		case 0x08:	/* Key Code */
+			v &= 0x7f;
+			if (v != op->kc)
+			{
+				UINT32 kc, kc_channel;
+
+				kc_channel = (v - (v>>2))*64;
+				kc_channel += 768;
+				kc_channel |= (op->kc_i & 63);
+
+				(op+0)->kc = v;
+				(op+0)->kc_i = kc_channel;
+				(op+1)->kc = v;
+				(op+1)->kc_i = kc_channel;
+				(op+2)->kc = v;
+				(op+2)->kc_i = kc_channel;
+				(op+3)->kc = v;
+				(op+3)->kc_i = kc_channel;
+
+				kc = v>>2;
+
+				(op+0)->dt1 = chip->dt1_freq (op+0)->dt1_i + kc ;
+				(op+0)->freq = ( (chip->freq kc_channel + (op+0)->dt2 + (op+0)->dt1) * (op+0)->mul ) >> 1;
+
+				(op+1)->dt1 = chip->dt1_freq (op+1)->dt1_i + kc ;
+				(op+1)->freq = ( (chip->freq kc_channel + (op+1)->dt2 + (op+1)->dt1) * (op+1)->mul ) >> 1;
+
+				(op+2)->dt1 = chip->dt1_freq (op+2)->dt1_i + kc ;
+				(op+2)->freq = ( (chip->freq kc_channel + (op+2)->dt2 + (op+2)->dt1) * (op+2)->mul ) >> 1;
+
+				(op+3)->dt1 = chip->dt1_freq (op+3)->dt1_i + kc ;
+				(op+3)->freq = ( (chip->freq kc_channel + (op+3)->dt2 + (op+3)->dt1) * (op+3)->mul ) >> 1;
+
+				refresh_EG( op );
+			}
+			break;
+
+		case 0x10:	/* Key Fraction */
+			v >>= 2;
+			if (v != (op->kc_i & 63))
+			{
+				UINT32 kc_channel;
+
+				kc_channel = v;
+				kc_channel |= (op->kc_i & ~63);
+
+				(op+0)->kc_i = kc_channel;
+				(op+1)->kc_i = kc_channel;
+				(op+2)->kc_i = kc_channel;
+				(op+3)->kc_i = kc_channel;
+
+				(op+0)->freq = ( (chip->freq kc_channel + (op+0)->dt2 + (op+0)->dt1) * (op+0)->mul ) >> 1;
+				(op+1)->freq = ( (chip->freq kc_channel + (op+1)->dt2 + (op+1)->dt1) * (op+1)->mul ) >> 1;
+				(op+2)->freq = ( (chip->freq kc_channel + (op+2)->dt2 + (op+2)->dt1) * (op+2)->mul ) >> 1;
+				(op+3)->freq = ( (chip->freq kc_channel + (op+3)->dt2 + (op+3)->dt1) * (op+3)->mul ) >> 1;
+			}
+			break;
+
+		case 0x18:	/* PMS, AMS */
+			op->pms = (v>>4) & 7;
+			op->ams = (v & 3);
+			break;
+		}
+		break;
+
+	case 0x40:		/* DT1, MUL */
+		{
+			UINT32 olddt1_i = op->dt1_i;
+			UINT32 oldmul = op->mul;
+
+			op->dt1_i = (v&0x70)<<1;
+			op->mul = (v&0x0f) ? (v&0x0f)<<1: 1;
+
+			if (olddt1_i != op->dt1_i)
+				op->dt1 = chip->dt1_freq op->dt1_i + (op->kc>>2) ;
+
+			if ( (olddt1_i != op->dt1_i) || (oldmul != op->mul) )
+				op->freq = ( (chip->freq op->kc_i + op->dt2 + op->dt1) * op->mul ) >> 1;
+		}
+		break;
+
+	case 0x60:		/* TL */
+		op->tl = (v&0x7f)<<(ENV_BITS-7); /* 7bit TL */
+		break;
+
+	case 0x80:		/* KS, AR */
+		{
+			UINT32 oldks = op->ks;
+			UINT32 oldar = op->ar;
+
+			op->ks = 5-(v>>6);
+			op->ar = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
+
+			if ( (op->ar != oldar) || (op->ks != oldks) )
+			{
+				if ((op->ar + (op->kc>>op->ks)) < 32+62)
+				{
+					op->eg_sh_ar = eg_rate_shift op->ar + (op->kc>>op->ks) ;
+					op->eg_sel_ar = eg_rate_selectop->ar + (op->kc>>op->ks) ;
+				}
+				else
+				{
+					op->eg_sh_ar = 0;
+					op->eg_sel_ar = 17*RATE_STEPS;
+				}
+			}
+
+			if (op->ks != oldks)
+			{
+				op->eg_sh_d1r = eg_rate_shift op->d1r + (op->kc>>op->ks) ;
+				op->eg_sel_d1r= eg_rate_selectop->d1r + (op->kc>>op->ks) ;
+				op->eg_sh_d2r = eg_rate_shift op->d2r + (op->kc>>op->ks) ;
+				op->eg_sel_d2r= eg_rate_selectop->d2r + (op->kc>>op->ks) ;
+				op->eg_sh_rr = eg_rate_shift op->rr + (op->kc>>op->ks) ;
+				op->eg_sel_rr = eg_rate_selectop->rr + (op->kc>>op->ks) ;
+			}
+		}
+		break;
+
+	case 0xa0:		/* LFO AM enable, D1R */
+		op->AMmask = (v&0x80) ? ~0 : 0;
+		op->d1r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
+		op->eg_sh_d1r = eg_rate_shift op->d1r + (op->kc>>op->ks) ;
+		op->eg_sel_d1r= eg_rate_selectop->d1r + (op->kc>>op->ks) ;
+		break;
+
+	case 0xc0:		/* DT2, D2R */
+		{
+			UINT32 olddt2 = op->dt2;
+			op->dt2 = dt2_tab v>>6 ;
+			if (op->dt2 != olddt2)
+				op->freq = ( (chip->freq op->kc_i + op->dt2 + op->dt1) * op->mul ) >> 1;
+		}
+		op->d2r = (v&0x1f) ? 32 + ((v&0x1f)<<1) : 0;
+		op->eg_sh_d2r = eg_rate_shift op->d2r + (op->kc>>op->ks) ;
+		op->eg_sel_d2r= eg_rate_selectop->d2r + (op->kc>>op->ks) ;
+		break;
+
+	case 0xe0:		/* D1L, RR */
+		op->d1l = d1l_tab v>>4 ;
+		op->rr = 34 + ((v&0x0f)<<2);
+		op->eg_sh_rr = eg_rate_shift op->rr + (op->kc>>op->ks) ;
+		op->eg_sel_rr = eg_rate_selectop->rr + (op->kc>>op->ks) ;
+		break;
+	}
+}
+
+
+/*static TIMER_CALLBACK( cymfile_callback )
+{
+	if (cymfile)
+		fputc( (unsigned char)0, cymfile );
+}*/
+
+
+int ym2151_read_status( void *_chip )
+{
+	YM2151 *chip = (YM2151 *)_chip;
+	return chip->status;
+}
+
+
+
+//#ifdef USE_MAME_TIMERS
+#if 1 // disabled for now due to crashing with winalloc.c (ERROR_NOT_ENOUGH_MEMORY)
+/*
+* state save support for MAME
+*/
+//STATE_POSTLOAD( ym2151_postload )
+/*void ym2151_postload(void *param)
+{
+	YM2151 *YM2151_chip = (YM2151 *)param;
+	int j;
+
+	for (j=0; j<8; j++)
+		set_connect(&YM2151_chip->operj*4, j, YM2151_chip->connectj);
+}
+
+static void ym2151_state_save_register( YM2151 *chip, const device_config *device )
+{
+	int j;
+
+	// save all 32 operators of chip #i
+	for (j=0; j<32; j++)
+	{
+		YM2151Operator *op;
+
+		op = &chip->oper(j&7)*4+(j>>3);
+
+		state_save_register_device_item(device, j, op->phase);
+		state_save_register_device_item(device, j, op->freq);
+		state_save_register_device_item(device, j, op->dt1);
+		state_save_register_device_item(device, j, op->mul);
+		state_save_register_device_item(device, j, op->dt1_i);
+		state_save_register_device_item(device, j, op->dt2);
+		// operators connection is saved in chip data block
+		state_save_register_device_item(device, j, op->mem_value);
+
+		state_save_register_device_item(device, j, op->fb_shift);
+		state_save_register_device_item(device, j, op->fb_out_curr);
+		state_save_register_device_item(device, j, op->fb_out_prev);
+		state_save_register_device_item(device, j, op->kc);
+		state_save_register_device_item(device, j, op->kc_i);
+		state_save_register_device_item(device, j, op->pms);
+		state_save_register_device_item(device, j, op->ams);
+		state_save_register_device_item(device, j, op->AMmask);
+
+		state_save_register_device_item(device, j, op->state);
+		state_save_register_device_item(device, j, op->eg_sh_ar);
+		state_save_register_device_item(device, j, op->eg_sel_ar);
+		state_save_register_device_item(device, j, op->tl);
+		state_save_register_device_item(device, j, op->volume);
+		state_save_register_device_item(device, j, op->eg_sh_d1r);
+		state_save_register_device_item(device, j, op->eg_sel_d1r);
+		state_save_register_device_item(device, j, op->d1l);
+		state_save_register_device_item(device, j, op->eg_sh_d2r);
+		state_save_register_device_item(device, j, op->eg_sel_d2r);
+		state_save_register_device_item(device, j, op->eg_sh_rr);
+		state_save_register_device_item(device, j, op->eg_sel_rr);
+
+		state_save_register_device_item(device, j, op->key);
+		state_save_register_device_item(device, j, op->ks);
+		state_save_register_device_item(device, j, op->ar);
+		state_save_register_device_item(device, j, op->d1r);
+		state_save_register_device_item(device, j, op->d2r);
+		state_save_register_device_item(device, j, op->rr);
+
+		state_save_register_device_item(device, j, op->reserved0);
+		state_save_register_device_item(device, j, op->reserved1);
+	}
+
+	state_save_register_device_item_array(device, 0, chip->pan);
+
+	state_save_register_device_item(device, 0, chip->eg_cnt);
+	state_save_register_device_item(device, 0, chip->eg_timer);
+	state_save_register_device_item(device, 0, chip->eg_timer_add);
+	state_save_register_device_item(device, 0, chip->eg_timer_overflow);
+
+	state_save_register_device_item(device, 0, chip->lfo_phase);
+	state_save_register_device_item(device, 0, chip->lfo_timer);
+	state_save_register_device_item(device, 0, chip->lfo_timer_add);
+	state_save_register_device_item(device, 0, chip->lfo_overflow);
+	state_save_register_device_item(device, 0, chip->lfo_counter);
+	state_save_register_device_item(device, 0, chip->lfo_counter_add);
+	state_save_register_device_item(device, 0, chip->lfo_wsel);
+	state_save_register_device_item(device, 0, chip->amd);
+	state_save_register_device_item(device, 0, chip->pmd);
+	state_save_register_device_item(device, 0, chip->lfa);
+	state_save_register_device_item(device, 0, chip->lfp);
+
+	state_save_register_device_item(device, 0, chip->test);
+	state_save_register_device_item(device, 0, chip->ct);
+
+	state_save_register_device_item(device, 0, chip->noise);
+	state_save_register_device_item(device, 0, chip->noise_rng);
+	state_save_register_device_item(device, 0, chip->noise_p);
+	state_save_register_device_item(device, 0, chip->noise_f);
+
+	state_save_register_device_item(device, 0, chip->csm_req);
+	state_save_register_device_item(device, 0, chip->irq_enable);
+	state_save_register_device_item(device, 0, chip->status);
+
+	state_save_register_device_item(device, 0, chip->timer_A_index);
+	state_save_register_device_item(device, 0, chip->timer_B_index);
+	state_save_register_device_item(device, 0, chip->timer_A_index_old);
+	state_save_register_device_item(device, 0, chip->timer_B_index_old);
+
+#ifdef USE_MAME_TIMERS
+	state_save_register_device_item(device, 0, chip->irqlinestate);
+#endif
+
+	state_save_register_device_item_array(device, 0, chip->connect);
+
+	state_save_register_postload(device->machine, ym2151_postload, chip);
+}*/
+#else
+/*STATE_POSTLOAD( ym2151_postload )
+{
+}
+
+static void ym2151_state_save_register( YM2151 *chip, const device_config *device )
+{
+}*/
+#endif
+
+
+/*
+* Initialize YM2151 emulator(s).
+*
+* 'num' is the number of virtual YM2151's to allocate
+* 'clock' is the chip clock in Hz
+* 'rate' is sampling rate
+*/
+void * ym2151_init(int clock, int rate)
+{
+	YM2151 *PSG;
+	int chn;
+
+	PSG = (YM2151 *)malloc(sizeof(YM2151));
+	if (PSG == NULL)
+		return NULL;
+
+	memset(PSG, 0, sizeof(YM2151));
+
+	//ym2151_state_save_register( PSG, device );
+
+	init_tables();
+
+	//PSG->device = device;
+	PSG->clock = clock;
+	/*rate = clock/64;*/
+	PSG->sampfreq = rate ? rate : 44100;	/* avoid division by 0 in init_chip_tables() */
+	//PSG->irqhandler = NULL;					/* interrupt handler */
+	//PSG->porthandler = NULL;				/* port write handler */
+	init_chip_tables( PSG );
+
+	PSG->lfo_timer_add = (1<<LFO_SH) * (clock/64.0) / PSG->sampfreq;
+
+	PSG->eg_timer_add = (1<<EG_SH) * (clock/64.0) / PSG->sampfreq;
+	PSG->eg_timer_overflow = ( 3 ) * (1<<EG_SH);
+	/*logerror("YM2151init eg_timer_add=%8x eg_timer_overflow=%8x\n", PSG->eg_timer_add, PSG->eg_timer_overflow);*/
+
+#ifdef USE_MAME_TIMERS
+/* this must be done _before_ a call to ym2151_reset_chip() */
+	PSG->timer_A = timer_alloc(device->machine, timer_callback_a, PSG);
+	PSG->timer_B = timer_alloc(device->machine, timer_callback_b, PSG);
+#else
+	PSG->tim_A = 0;
+	PSG->tim_B = 0;
+#endif
+	for (chn = 0; chn < 8; chn ++)
+		PSG->Mutedchn = 0x00;
+	//ym2151_reset_chip(PSG);
+	/*logerror("YM2151init clock=%i sampfreq=%i\n", PSG->clock, PSG->sampfreq);*/
+
+	/*LOG_CYM_FILE = (options_get_int(mame_options(), OPTION_VGMWRITE) > 0x00);
+	if (LOG_CYM_FILE)
+	{
+		cymfile = fopen("2151_.cym","wb");
+		if (cymfile)
+			timer_pulse ( device->machine, ATTOTIME_IN_HZ(60), NULL, 0, cymfile_callback); //110 Hz pulse timer
+		else
+			logerror("Could not create file 2151_.cym\n");
+	}*/
+
+	return PSG;
+}
+
+
+
+void ym2151_shutdown(void *_chip)
+{
+	YM2151 *chip = (YM2151 *)_chip;
+
+	free (chip);
+
+	/*if (cymfile)
+		fclose (cymfile);
+	cymfile = NULL;*/
+
+#ifdef SAVE_SAMPLE
+	fclose(sample8);
+#endif
+#ifdef SAVE_SEPARATE_CHANNELS
+	fclose(sample0);
+	fclose(sample1);
+	fclose(sample2);
+	fclose(sample3);
+	fclose(sample4);
+	fclose(sample5);
+	fclose(sample6);
+	fclose(sample7);
+#endif
+}
+
+
+
+/*
+* Reset chip number 'n'.
+*/
+void ym2151_reset_chip(void *_chip)
+{
+	int i;
+	YM2151 *chip = (YM2151 *)_chip;
+
+
+	/* initialize hardware registers */
+	for (i=0; i<32; i++)
+	{
+		memset(&chip->operi,'\0',sizeof(YM2151Operator));
+		chip->operi.volume = MAX_ATT_INDEX;
+	 chip->operi.kc_i = 768; /* min kc_i value */
+	}
+
+	chip->eg_timer = 0;
+	chip->eg_cnt = 0;
+
+	chip->lfo_timer = 0;
+	chip->lfo_counter= 0;
+	chip->lfo_phase = 0;
+	chip->lfo_wsel = 0;
+	chip->pmd = 0;
+	chip->amd = 0;
+	chip->lfa = 0;
+	chip->lfp = 0;
+
+	chip->test= 0;
+
+	chip->irq_enable = 0;
+#ifdef USE_MAME_TIMERS
+	/* ASG 980324 -- reset the timers before writing to the registers */
+	timer_enable(chip->timer_A, 0);
+	timer_enable(chip->timer_B, 0);
+#else
+	chip->tim_A = 0;
+	chip->tim_B = 0;
+	chip->tim_A_val = 0;
+	chip->tim_B_val = 0;
+#endif
+	chip->timer_A_index = 0;
+	chip->timer_B_index = 0;
+	chip->timer_A_index_old = 0;
+	chip->timer_B_index_old = 0;
+
+	chip->noise = 0;
+	chip->noise_rng = 0;
+	chip->noise_p = 0;
+	chip->noise_f = chip->noise_tab0;
+
+	chip->csm_req	= 0;
+	chip->status = 0;
+
+	ym2151_write_reg(chip, 0x1b, 0);	/* only because of CT1, CT2 output pins */
+	ym2151_write_reg(chip, 0x18, 0);	/* set LFO frequency */
+	for (i=0x20; i<0x100; i++)		/* set the operators */
+	{
+		ym2151_write_reg(chip, i, 0);
+	}
+}
+
+
+
+INLINE signed int op_calc(YM2151Operator * OP, unsigned int env, signed int pm)
+{
+	UINT32 p;
+
+
+	p = (env<<3) + sin_tab ( ((signed int)((OP->phase & ~FREQ_MASK) + (pm<<15))) >> FREQ_SH ) & SIN_MASK ;
+
+	if (p >= TL_TAB_LEN)
+		return 0;
+
+	return tl_tabp;
+}
+
+INLINE signed int op_calc1(YM2151Operator * OP, unsigned int env, signed int pm)
+{
+	UINT32 p;
+	INT32 i;
+
+
+	i = (OP->phase & ~FREQ_MASK) + pm;
+
+/*logerror("i=%08x (i>>16)&511=%8i phase=%i pm=%08x ",i, (i>>16)&511, OP->phase>>FREQ_SH, pm);*/
+
+	p = (env<<3) + sin_tab (i>>FREQ_SH) & SIN_MASK;
+
+/*logerror("(p&255=%i p>>8=%i) out= %i\n", p&255,p>>8, tl_tabp&255>>(p>>8) );*/
+
+	if (p >= TL_TAB_LEN)
+		return 0;
+
+	return tl_tabp;
+}
+
+
+
+#define volume_calc(OP) ((OP)->tl + ((UINT32)(OP)->volume) + (AM & (OP)->AMmask))
+
+INLINE void chan_calc(unsigned int chan)
+{
+	YM2151Operator *op;
+	unsigned int env;
+	UINT32 AM = 0;
+
+	if (PSG->Mutedchan)
+		return;
+	
+	m2 = c1 = c2 = mem = 0;
+	op = &PSG->operchan*4;	/* M1 */
+
+	*op->mem_connect = op->mem_value;	/* restore delayed sample (MEM) value to m2 or c2 */
+
+	if (op->ams)
+		AM = PSG->lfa << (op->ams-1);
+	env = volume_calc(op);
+	{
+		INT32 out = op->fb_out_prev + op->fb_out_curr;
+		op->fb_out_prev = op->fb_out_curr;
+
+		if (!op->connect)
+			/* algorithm 5 */
+			mem = c1 = c2 = op->fb_out_prev;
+		else
+			/* other algorithms */
+			*op->connect = op->fb_out_prev;
+
+		op->fb_out_curr = 0;
+		if (env < ENV_QUIET)
+		{
+			if (!op->fb_shift)
+				out=0;
+			op->fb_out_curr = op_calc1(op, env, (out<<op->fb_shift) );
+		}
+	}
+
+	env = volume_calc(op+1);	/* M2 */
+	if (env < ENV_QUIET)
+		*(op+1)->connect += op_calc(op+1, env, m2);
+
+	env = volume_calc(op+2);	/* C1 */
+	if (env < ENV_QUIET)
+		*(op+2)->connect += op_calc(op+2, env, c1);
+
+	env = volume_calc(op+3);	/* C2 */
+	if (env < ENV_QUIET)
+		chanoutchan += op_calc(op+3, env, c2);
+	if (chanoutchan > +8192)		chanoutchan = +8192;
+	else if (chanoutchan < -8192)	chanoutchan = -8192;
+
+	/* M1 */
+	op->mem_value = mem;
+}
+INLINE void chan7_calc(void)
+{
+	YM2151Operator *op;
+	unsigned int env;
+	UINT32 AM = 0;
+
+	if (PSG->Muted7)
+		return;
+	
+	m2 = c1 = c2 = mem = 0;
+	op = &PSG->oper7*4;		/* M1 */
+
+	*op->mem_connect = op->mem_value;	/* restore delayed sample (MEM) value to m2 or c2 */
+
+	if (op->ams)
+		AM = PSG->lfa << (op->ams-1);
+	env = volume_calc(op);
+	{
+		INT32 out = op->fb_out_prev + op->fb_out_curr;
+		op->fb_out_prev = op->fb_out_curr;
+
+		if (!op->connect)
+			/* algorithm 5 */
+			mem = c1 = c2 = op->fb_out_prev;
+		else
+			/* other algorithms */
+			*op->connect = op->fb_out_prev;
+
+		op->fb_out_curr = 0;
+		if (env < ENV_QUIET)
+		{
+			if (!op->fb_shift)
+				out=0;
+			op->fb_out_curr = op_calc1(op, env, (out<<op->fb_shift) );
+		}
+	}
+
+	env = volume_calc(op+1);	/* M2 */
+	if (env < ENV_QUIET)
+		*(op+1)->connect += op_calc(op+1, env, m2);
+
+	env = volume_calc(op+2);	/* C1 */
+	if (env < ENV_QUIET)
+		*(op+2)->connect += op_calc(op+2, env, c1);
+
+	env = volume_calc(op+3);	/* C2 */
+	if (PSG->noise & 0x80)
+	{
+		INT32 noiseout;
+
+		noiseout = 0;
+		if (env < 0x3ff)
+			noiseout = (env ^ 0x3ff) * 2;	/* range of the YM2151 noise output is -2044 to 2040 */
+		chanout7 += ((PSG->noise_rng&0x10000) ? noiseout: -noiseout); /* bit 16 -> output */
+	}
+	else
+	{
+		if (env < ENV_QUIET)
+			chanout7 += op_calc(op+3, env, c2);
+	}
+	if (chanout7 > +8192)			chanout7 = +8192;
+	else if (chanout7 < -8192)	chanout7 = -8192;
+	/* M1 */
+	op->mem_value = mem;
+}
+
+
+
+
+
+
+/*
+The 'rate' is calculated from following formula (example on decay rate):
+ rks = notecode after key scaling (a value from 0 to 31)
+ DR = value written to the chip register
+ rate = 2*DR + rks; (max rate = 2*31+31 = 93)
+Four MSBs of the 'rate' above are the 'main' rate (from 00 to 15)
+Two LSBs of the 'rate' above are the value 'x' (the shape type).
+(eg. '11 2' means that 'rate' is 11*4+2=46)
+
+NOTE: A 'sample' in the description below is actually 3 output samples,
+thats because the Envelope Generator clock is equal to internal_clock/3.
+
+Single '-' (minus) character in the diagrams below represents one sample
+on the output; this is for rates 11 x (11 0, 11 1, 11 2 and 11 3)
+
+these 'main' rates:
+00 x: single '-' = 2048 samples; (ie. level can change every 2048 samples)
+01 x: single '-' = 1024 samples;
+02 x: single '-' = 512 samples;
+03 x: single '-' = 256 samples;
+04 x: single '-' = 128 samples;
+05 x: single '-' = 64 samples;
+06 x: single '-' = 32 samples;
+07 x: single '-' = 16 samples;
+08 x: single '-' = 8 samples;
+09 x: single '-' = 4 samples;
+10 x: single '-' = 2 samples;
+11 x: single '-' = 1 sample; (ie. level can change every 1 sample)
+
+Shapes for rates 11 x look like this:
+rate: step:
+11 0 01234567
+
+level:
+0 --
+1 --
+2 --
+3 --
+
+rate: step:
+11 1 01234567
+
+level:
+0 --
+1 --
+2 -
+3 -
+4 --
+
+rate: step:
+11 2 01234567
+
+level:
+0 --
+1 -
+2 -
+3 --
+4 -
+5 -
+
+rate: step:
+11 3 01234567
+
+level:
+0 --
+1 -
+2 -
+3 -
+4 -
+5 -
+6 -
+
+
+For rates 12 x, 13 x, 14 x and 15 x output level changes on every
+sample - this means that the waveform looks like this: (but the level
+changes by different values on different steps)
+12 3 01234567
+
+0 -
+2 -
+4 -
+8 -
+10 -
+12 -
+14 -
+18 -
+20 -
+
+Notes about the timing:
+----------------------
+
+1. Synchronism
+
+Output level of each two (or more) voices running at the same 'main' rate
+(eg 11 0 and 11 1 in the diagram below) will always be changing in sync,
+even if there're started with some delay.
+
+Note that, in the diagram below, the decay phase in channel 0 starts at
+sample #2, while in channel 1 it starts at sample #6. Anyway, both channels
+will always change their levels at exactly the same (following) samples.
+
+(S - start point of this channel, A-attack phase, D-decay phase):
+
+step:
+01234567012345670123456
+
+channel 0:
+ --
+ | --
+ | -
+ | -
+ | --
+ | --
+| --
+| -
+| -
+| --
+AADDDDDDDDDDDDDDDD
+S
+
+01234567012345670123456
+channel 1:
+ -
+ | -
+ | --
+ | --
+ | --
+ | -
+ | -
+ | --
+ | --
+ | --
+ AADDDDDDDDDDDDDDDD
+ S
+01234567012345670123456
+
+
+2. Shifted (delayed) synchronism
+
+Output of each two (or more) voices running at different 'main' rate
+(9 1, 10 1 and 11 1 in the diagrams below) will always be changing
+in 'delayed-sync' (even if there're started with some delay as in "1.")
+
+Note that the shapes are delayed by exactly one sample per one 'main' rate
+increment. (Normally one would expect them to start at the same samples.)
+
+See diagram below (* - start point of the shape).
+
+cycle:
+0123456701234567012345670123456701234567012345670123456701234567
+
+rate 09 1
+*-------
+ --------
+ ----
+ ----
+ --------
+ *-------
+ | --------
+ | ----
+ | ----
+ | --------
+rate 10 1 |
+-- |
+ *--- |
+ ---- |
+ -- |
+ -- |
+ ---- |
+ *--- |
+ | ---- |
+ | -- | | <- one step (two samples) delay between 9 1 and 10 1
+ | -- | |
+ | ----|
+ | *---
+ | ----
+ | --
+ | --
+ | ----
+rate 11 1 |
+- |
+ -- |
+ *- |
+ -- |
+ - |
+ - |
+ -- |
+ *- |
+ -- |
+ - || <- one step (one sample) delay between 10 1 and 11 1
+ - ||
+ --|
+ *-
+ --
+ -
+ -
+ --
+ *-
+ --
+ -
+ -
+ --
+*/
+
+INLINE void advance_eg(void)
+{
+	YM2151Operator *op;
+	unsigned int i;
+
+
+
+	PSG->eg_timer += PSG->eg_timer_add;
+
+	while (PSG->eg_timer >= PSG->eg_timer_overflow)
+	{
+		PSG->eg_timer -= PSG->eg_timer_overflow;
+
+		PSG->eg_cnt++;
+
+		/* envelope generator */
+		op = &PSG->oper0;	/* CH 0 M1 */
+		i = 32;
+		do
+		{
+			switch(op->state)
+			{
+			case EG_ATT:	/* attack phase */
+				if ( !(PSG->eg_cnt & ((1<<op->eg_sh_ar)-1) ) )
+				{
+					op->volume += (~op->volume *
+ (eg_incop->eg_sel_ar + ((PSG->eg_cnt>>op->eg_sh_ar)&7))
+ ) >>4;
+
+					if (op->volume <= MIN_ATT_INDEX)
+					{
+						op->volume = MIN_ATT_INDEX;
+						op->state = EG_DEC;
+					}
+
+				}
+			break;
+
+			case EG_DEC:	/* decay phase */
+				if ( !(PSG->eg_cnt & ((1<<op->eg_sh_d1r)-1) ) )
+				{
+					op->volume += eg_incop->eg_sel_d1r + ((PSG->eg_cnt>>op->eg_sh_d1r)&7);
+
+					if ( op->volume >= op->d1l )
+						op->state = EG_SUS;
+
+				}
+			break;
+
+			case EG_SUS:	/* sustain phase */
+				if ( !(PSG->eg_cnt & ((1<<op->eg_sh_d2r)-1) ) )
+				{
+					op->volume += eg_incop->eg_sel_d2r + ((PSG->eg_cnt>>op->eg_sh_d2r)&7);
+
+					if ( op->volume >= MAX_ATT_INDEX )
+					{
+						op->volume = MAX_ATT_INDEX;
+						op->state = EG_OFF;
+					}
+
+				}
+			break;
+
+			case EG_REL:	/* release phase */
+				if ( !(PSG->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
+				{
+					op->volume += eg_incop->eg_sel_rr + ((PSG->eg_cnt>>op->eg_sh_rr)&7);
+
+					if ( op->volume >= MAX_ATT_INDEX )
+					{
+						op->volume = MAX_ATT_INDEX;
+						op->state = EG_OFF;
+					}
+
+				}
+			break;
+			}
+			op++;
+			i--;
+		}while (i);
+	}
+}
+
+
+INLINE void advance(void)
+{
+	YM2151Operator *op;
+	unsigned int i;
+	int a,p;
+
+	/* LFO */
+	if (PSG->test&2)
+		PSG->lfo_phase = 0;
+	else
+	{
+		PSG->lfo_timer += PSG->lfo_timer_add;
+		if (PSG->lfo_timer >= PSG->lfo_overflow)
+		{
+			PSG->lfo_timer -= PSG->lfo_overflow;
+			PSG->lfo_counter += PSG->lfo_counter_add;
+			PSG->lfo_phase += (PSG->lfo_counter>>4);
+			PSG->lfo_phase &= 255;
+			PSG->lfo_counter &= 15;
+		}
+	}
+
+	i = PSG->lfo_phase;
+	/* calculate LFO AM and PM waveform value (all verified on real chip, except for noise algorithm which is impossible to analyse)*/
+	switch (PSG->lfo_wsel)
+	{
+	case 0:
+		/* saw */
+		/* AM: 255 down to 0 */
+		/* PM: 0 to 127, -127 to 0 (at PMD=127: LFP = 0 to 126, -126 to 0) */
+		a = 255 - i;
+		if (i<128)
+			p = i;
+		else
+			p = i - 255;
+		break;
+	case 1:
+		/* square */
+		/* AM: 255, 0 */
+		/* PM: 128,-128 (LFP = exactly +PMD, -PMD) */
+		if (i<128){
+			a = 255;
+			p = 128;
+		}else{
+			a = 0;
+			p = -128;
+		}
+		break;
+	case 2:
+		/* triangle */
+		/* AM: 255 down to 1 step -2; 0 up to 254 step +2 */
+		/* PM: 0 to 126 step +2, 127 to 1 step -2, 0 to -126 step -2, -127 to -1 step +2*/
+		if (i<128)
+			a = 255 - (i*2);
+		else
+			a = (i*2) - 256;
+
+		if (i<64)						/* i = 0..63 */
+			p = i*2;					/* 0 to 126 step +2 */
+		else if (i<128)					/* i = 64..127 */
+				p = 255 - i*2;			/* 127 to 1 step -2 */
+			else if (i<192)				/* i = 128..191 */
+					p = 256 - i*2;		/* 0 to -126 step -2*/
+				else					/* i = 192..255 */
+					p = i*2 - 511;		/*-127 to -1 step +2*/
+		break;
+	case 3:
+	default:	/*keep the compiler happy*/
+		/* random */
+		/* the real algorithm is unknown !!!
+ We just use a snapshot of data from real chip */
+
+		/* AM: range 0 to 255 */
+		/* PM: range -128 to 127 */
+
+		a = lfo_noise_waveformi;
+		p = a-128;
+		break;
+	}
+	PSG->lfa = a * PSG->amd / 128;
+	PSG->lfp = p * PSG->pmd / 128;
+
+
+	/* The Noise Generator of the YM2151 is 17-bit shift register.
+ * Input to the bit16 is negated (bit0 XOR bit3) (EXNOR).
+ * Output of the register is negated (bit0 XOR bit3).
+ * Simply use bit16 as the noise output.
+ */
+	PSG->noise_p += PSG->noise_f;
+	i = (PSG->noise_p>>16);		/* number of events (shifts of the shift register) */
+	PSG->noise_p &= 0xffff;
+	while (i)
+	{
+		UINT32 j;
+		j = ( (PSG->noise_rng ^ (PSG->noise_rng>>3) ) & 1) ^ 1;
+		PSG->noise_rng = (j<<16) | (PSG->noise_rng>>1);
+		i--;
+	}
+
+
+	/* phase generator */
+	op = &PSG->oper0;	/* CH 0 M1 */
+	i = 8;
+	do
+	{
+		if (op->pms)	/* only when phase modulation from LFO is enabled for this channel */
+		{
+			INT32 mod_ind = PSG->lfp;		/* -128..+127 (8bits signed) */
+			if (op->pms < 6)
+				mod_ind >>= (6 - op->pms);
+			else
+				mod_ind <<= (op->pms - 5);
+
+			if (mod_ind)
+			{
+				UINT32 kc_channel =	op->kc_i + mod_ind;
+				(op+0)->phase += ( (PSG->freq kc_channel + (op+0)->dt2 + (op+0)->dt1) * (op+0)->mul ) >> 1;
+				(op+1)->phase += ( (PSG->freq kc_channel + (op+1)->dt2 + (op+1)->dt1) * (op+1)->mul ) >> 1;
+				(op+2)->phase += ( (PSG->freq kc_channel + (op+2)->dt2 + (op+2)->dt1) * (op+2)->mul ) >> 1;
+				(op+3)->phase += ( (PSG->freq kc_channel + (op+3)->dt2 + (op+3)->dt1) * (op+3)->mul ) >> 1;
+			}
+			else		/* phase modulation from LFO is equal to zero */
+			{
+				(op+0)->phase += (op+0)->freq;
+				(op+1)->phase += (op+1)->freq;
+				(op+2)->phase += (op+2)->freq;
+				(op+3)->phase += (op+3)->freq;
+			}
+		}
+		else			/* phase modulation from LFO is disabled */
+		{
+			(op+0)->phase += (op+0)->freq;
+			(op+1)->phase += (op+1)->freq;
+			(op+2)->phase += (op+2)->freq;
+			(op+3)->phase += (op+3)->freq;
+		}
+
+		op+=4;
+		i--;
+	}while (i);
+
+
+	/* CSM is calculated *after* the phase generator calculations (verified on real chip)
+ * CSM keyon line seems to be ORed with the KO line inside of the chip.
+ * The result is that it only works when KO (register 0x08) is off, ie. 0
+ *
+ * Interesting effect is that when timer A is set to 1023, the KEY ON happens
+ * on every sample, so there is no KEY OFF at all - the result is that
+ * the sound played is the same as after normal KEY ON.
+ */
+
+	if (PSG->csm_req)			/* CSM KEYON/KEYOFF seqeunce request */
+	{
+		if (PSG->csm_req==2)	/* KEY ON */
+		{
+			op = &PSG->oper0;	/* CH 0 M1 */
+			i = 32;
+			do
+			{
+				KEY_ON(op, 2);
+				op++;
+				i--;
+			}while (i);
+			PSG->csm_req = 1;
+		}
+		else					/* KEY OFF */
+		{
+			op = &PSG->oper0;	/* CH 0 M1 */
+			i = 32;
+			do
+			{
+				KEY_OFF(op,~2);
+				op++;
+				i--;
+			}while (i);
+			PSG->csm_req = 0;
+		}
+	}
+}
+
+#if 0
+INLINE signed int acc_calc(signed int value)
+{
+	if (value>=0)
+	{
+		if (value < 0x0200)
+			return (value & ~0);
+		if (value < 0x0400)
+			return (value & ~1);
+		if (value < 0x0800)
+			return (value & ~3);
+		if (value < 0x1000)
+			return (value & ~7);
+		if (value < 0x2000)
+			return (value & ~15);
+		if (value < 0x4000)
+			return (value & ~31);
+		return (value & ~63);
+	}
+	/*else value < 0*/
+	if (value > -0x0200)
+		return (~abs(value) & ~0);
+	if (value > -0x0400)
+		return (~abs(value) & ~1);
+	if (value > -0x0800)
+		return (~abs(value) & ~3);
+	if (value > -0x1000)
+		return (~abs(value) & ~7);
+	if (value > -0x2000)
+		return (~abs(value) & ~15);
+	if (value > -0x4000)
+		return (~abs(value) & ~31);
+	return (~abs(value) & ~63);
+}
+#endif
+
+/* first macro saves left and right channels to mono file */
+/* second macro saves left and right channels to stereo file */
+#if 0	/*MONO*/
+	#ifdef SAVE_SEPARATE_CHANNELS
+	 #define SAVE_SINGLE_CHANNEL(j) \
+	 {	signed int pom= -(chanoutj & PSG->panj*2); \
+		if (pom > 32767) pom = 32767; else if (pom < -32768) pom = -32768; \
+		fputc((unsigned short)pom&0xff,samplej); \
+		fputc(((unsigned short)pom>>8)&0xff,samplej); \
+	 }
+	#else
+	 #define SAVE_SINGLE_CHANNEL(j)
+	#endif
+#else	/*STEREO*/
+	#ifdef SAVE_SEPARATE_CHANNELS
+	 #define SAVE_SINGLE_CHANNEL(j) \
+	 {	signed int pom = -(chanoutj & PSG->panj*2); \
+		if (pom > 32767) pom = 32767; else if (pom < -32768) pom = -32768; \
+		fputc((unsigned short)pom&0xff,samplej); \
+		fputc(((unsigned short)pom>>8)&0xff,samplej); \
+		pom = -(chanoutj & PSG->panj*2+1); \
+		if (pom > 32767) pom = 32767; else if (pom < -32768) pom = -32768; \
+		fputc((unsigned short)pom&0xff,samplej); \
+		fputc(((unsigned short)pom>>8)&0xff,samplej); \
+	 }
+	#else
+	 #define SAVE_SINGLE_CHANNEL(j)
+	#endif
+#endif
+
+/* first macro saves left and right channels to mono file */
+/* second macro saves left and right channels to stereo file */
+#if 1	/*MONO*/
+	#ifdef SAVE_SAMPLE
+	 #define SAVE_ALL_CHANNELS \
+	 {	signed int pom = outl; \
+		/*pom = acc_calc(pom);*/ \
+		/*fprintf(sample8," %i\n",pom);*/ \
+		fputc((unsigned short)pom&0xff,sample8); \
+		fputc(((unsigned short)pom>>8)&0xff,sample8); \
+	 }
+	#else
+	 #define SAVE_ALL_CHANNELS
+	#endif
+#else	/*STEREO*/
+	#ifdef SAVE_SAMPLE
+	 #define SAVE_ALL_CHANNELS \
+	 {	signed int pom = outl; \
+		fputc((unsigned short)pom&0xff,sample8); \
+		fputc(((unsigned short)pom>>8)&0xff,sample8); \
+		pom = outr; \
+		fputc((unsigned short)pom&0xff,sample8); \
+		fputc(((unsigned short)pom>>8)&0xff,sample8); \
+	 }
+	#else
+	 #define SAVE_ALL_CHANNELS
+	#endif
+#endif
+
+
+/* Generate samples for one of the YM2151's
+*
+* 'num' is the number of virtual YM2151
+* '**buffers' is table of pointers to the buffers: left and right
+* 'length' is the number of samples that should be generated
+*/
+void ym2151_update_one(void *chip, SAMP **buffers, int length)
+{
+	int i; // , chn;
+	signed int outl,outr;
+	SAMP *bufL, *bufR;
+
+	bufL = buffers0;
+	bufR = buffers1;
+
+	PSG = (YM2151 *)chip;
+
+#ifdef USE_MAME_TIMERS
+		/* ASG 980324 - handled by real timers now */
+#else
+	if (PSG->tim_B)
+	{
+		PSG->tim_B_val -= ( length << TIMER_SH );
+		if (PSG->tim_B_val<=0)
+		{
+			PSG->tim_B_val += PSG->tim_B_tab PSG->timer_B_index ;
+			if ( PSG->irq_enable & 0x08 )
+			{
+				//int oldstate = PSG->status & 3;
+				PSG->status |= 2;
+				//if ((!oldstate) && (PSG->irqhandler)) (*PSG->irqhandler)(chip->device, 1);
+			}
+		}
+	}
+#endif
+
+	for (i=0; i<length; i++)
+	{
+		advance_eg();
+
+		chanout0 = 0;
+		chanout1 = 0;
+		chanout2 = 0;
+		chanout3 = 0;
+		chanout4 = 0;
+		chanout5 = 0;
+		chanout6 = 0;
+		chanout7 = 0;
+
+		chan_calc(0);
+		SAVE_SINGLE_CHANNEL(0)
+		chan_calc(1);
+		SAVE_SINGLE_CHANNEL(1)
+		chan_calc(2);
+		SAVE_SINGLE_CHANNEL(2)
+		chan_calc(3);
+		SAVE_SINGLE_CHANNEL(3)
+		chan_calc(4);
+		SAVE_SINGLE_CHANNEL(4)
+		chan_calc(5);
+		SAVE_SINGLE_CHANNEL(5)
+		chan_calc(6);
+		SAVE_SINGLE_CHANNEL(6)
+		chan7_calc();
+		SAVE_SINGLE_CHANNEL(7)
+
+		outl = chanout0 & PSG->pan0;
+		outr = chanout0 & PSG->pan1;
+		outl += (chanout1 & PSG->pan2);
+		outr += (chanout1 & PSG->pan3);
+		outl += (chanout2 & PSG->pan4);
+		outr += (chanout2 & PSG->pan5);
+		outl += (chanout3 & PSG->pan6);
+		outr += (chanout3 & PSG->pan7);
+		outl += (chanout4 & PSG->pan8);
+		outr += (chanout4 & PSG->pan9);
+		outl += (chanout5 & PSG->pan10);
+		outr += (chanout5 & PSG->pan11);
+		outl += (chanout6 & PSG->pan12);
+		outr += (chanout6 & PSG->pan13);
+		outl += (chanout7 & PSG->pan14);
+		outr += (chanout7 & PSG->pan15);
+
+		outl >>= FINAL_SH;
+		outr >>= FINAL_SH;
+		//if (outl > MAXOUT) outl = MAXOUT;
+		//	else if (outl < MINOUT) outl = MINOUT;
+		//if (outr > MAXOUT) outr = MAXOUT;
+		//	else if (outr < MINOUT) outr = MINOUT;
+		((SAMP*)bufL)i = (SAMP)outl;
+		((SAMP*)bufR)i = (SAMP)outr;
+
+		SAVE_ALL_CHANNELS
+
+#ifdef USE_MAME_TIMERS
+		/* ASG 980324 - handled by real timers now */
+#else
+		/* calculate timer A */
+		if (PSG->tim_A)
+		{
+			PSG->tim_A_val -= ( 1 << TIMER_SH );
+			if (PSG->tim_A_val <= 0)
+			{
+				PSG->tim_A_val += PSG->tim_A_tab PSG->timer_A_index ;
+				if (PSG->irq_enable & 0x04)
+				{
+					//int oldstate = PSG->status & 3;
+					PSG->status |= 1;
+					//if ((!oldstate) && (PSG->irqhandler)) (*PSG->irqhandler)(chip->device, 1);
+				}
+				if (PSG->irq_enable & 0x80)
+					PSG->csm_req = 2;	/* request KEY ON / KEY OFF sequence */
+			}
+		}
+#endif
+		advance();
+	}
+}
+
+/*void ym2151_set_irq_handler(void *chip, void(*handler)(int irq))
+{
+	YM2151 *PSG = (YM2151 *)chip;
+	PSG->irqhandler = handler;
+}
+
+void ym2151_set_port_write_handler(void *chip, write8_device_func handler)
+{
+	YM2151 *PSG = (YM2151 *)chip;
+	PSG->porthandler = handler;
+}*/
+
+void ym2151_set_mutemask(void *chip, UINT32 MuteMask)
+{
+	YM2151 *PSG = (YM2151 *)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 8; CurChn ++)
+		PSG->MutedCurChn = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2151.h Added

@@ -0,0 +1,87 @@
+/*
+** File: ym2151.h - header file for software implementation of YM2151
+**                                            FM Operator Type-M(OPM)
+**
+** (c) 1997-2002 Jarek Burczynski (s0246@poczta.onet.pl, bujar@mame.net)
+** Some of the optimizing ideas by Tatsuyuki Satoh
+**
+** Version 2.150 final beta May, 11th 2002
+**
+**
+** I would like to thank following people for making this project possible:
+**
+** Beauty Planets - for making a lot of real YM2151 samples and providing
+** additional informations about the chip. Also for the time spent making
+** the samples and the speed of replying to my endless requests.
+**
+** Shigeharu Isoda - for general help, for taking time to scan his YM2151
+** Japanese Manual first of all, and answering MANY of my questions.
+**
+** Nao - for giving me some info about YM2151 and pointing me to Shigeharu.
+** Also for creating fmemu (which I still use to test the emulator).
+**
+** Aaron Giles and Chris Hardy - they made some samples of one of my favourite
+** arcade games so I could compare it to my emulator.
+**
+** Bryan McPhail and Tim (powerjaw) - for making some samples.
+**
+** Ishmair - for the datasheet and motivation.
+*/
+
+#pragma once
+
+
+/* 16- and 8-bit samples (signed) are supported*/
+#define SAMPLE_BITS 16
+
+typedef stream_sample_t SAMP;
+/*
+#if (SAMPLE_BITS==16)
+    typedef INT16 SAMP;
+#endif
+#if (SAMPLE_BITS==8)
+    typedef signed char SAMP;
+#endif
+*/
+
+/*
+** Initialize YM2151 emulator(s).
+**
+** 'num' is the number of virtual YM2151's to allocate
+** 'clock' is the chip clock in Hz
+** 'rate' is sampling rate
+*/
+void *ym2151_init(int clock, int rate);
+
+/* shutdown the YM2151 emulators*/
+void ym2151_shutdown(void *chip);
+
+/* reset all chip registers for YM2151 number 'num'*/
+void ym2151_reset_chip(void *chip);
+
+/*
+** Generate samples for one of the YM2151's
+**
+** 'num' is the number of virtual YM2151
+** '**buffers' is table of pointers to the buffers: left and right
+** 'length' is the number of samples that should be generated
+*/
+void ym2151_update_one(void *chip, SAMP **buffers, int length);
+
+/* write 'v' to register 'r' on YM2151 chip number 'n'*/
+void ym2151_write_reg(void *chip, int r, int v);
+
+/* read status register on YM2151 chip number 'n'*/
+int ym2151_read_status(void *chip);
+
+/* set interrupt handler on YM2151 chip number 'n'*/
+//void ym2151_set_irq_handler(void *chip, void (*handler)(int irq));
+
+/* set port write handler on YM2151 chip number 'n'*/
+//void ym2151_set_port_write_handler(void *chip, write8_device_func handler);
+
+/* refresh chip when load state */
+//STATE_POSTLOAD( ym2151_postload );
+void ym2151_postload(void *param);
+
+void ym2151_set_mutemask(void *chip, UINT32 MuteMask);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.c Added

@@ -0,0 +1,2257 @@
+/*
+**
+** File: ym2413.c - software implementation of YM2413
+** FM sound generator type OPLL
+**
+** Copyright Jarek Burczynski
+**
+** Version 1.0
+**
+
+ Features as listed in LSI-212413A2 data sheet:
+ 1. FM Sound Generator for real sound creation.
+ 2. Two Selectable modes: 9 simultaneous sounds or 6 melody sounds plus 5 rhythm sounds
+ (different tones can be used together in either case).
+ 3. Built-in Instruments data (15 melody tones, 5 rhythm tones, "CAPTAIN and TELETEXT applicalbe tones).
+ 4. Built-in DA Converter.
+ 5. Built-in Quartz Oscillator.
+ 6. Built-in Vibrato Oscillator/AM Oscillator
+ 7. TTL Compatible Input.
+ 8. Si-Gate NMOS LSI
+ 9. A single 5V power source.
+
+to do:
+
+- make sure of the sinus amplitude bits
+
+- make sure of the EG resolution bits (looks like the biggest
+ modulation index generated by the modulator is 123, 124 = no modulation)
+- find proper algorithm for attack phase of EG
+
+- tune up instruments ROM
+
+- support sample replay in test mode (it is NOT as simple as setting bit 0
+ in register 0x0f and using register 0x10 for sample data).
+ Which games use this feature ?
+
+
+*/
+
+#include <stdio.h>
+#include <math.h>
+#include "mamedef.h"
+#include <stdlib.h>
+#include <string.h>
+//#include "sndintrf.h"
+#include "ym2413.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+/* output final shift */
+#if (SAMPLE_BITS==16)
+	#define FINAL_SH	(0)
+	#define MAXOUT		(+32767)
+	#define MINOUT		(-32768)
+#else
+	#define FINAL_SH	(8)
+	#define MAXOUT		(+127)
+	#define MINOUT		(-128)
+#endif
+
+
+#define FREQ_SH			16 /* 16.16 fixed point (frequency calculations) */
+#define EG_SH			16 /* 16.16 fixed point (EG timing) */
+#define LFO_SH			24 /* 8.24 fixed point (LFO calculations) */
+
+#define FREQ_MASK		((1<<FREQ_SH)-1)
+
+/* envelope output entries */
+#define ENV_BITS		10
+#define ENV_LEN			(1<<ENV_BITS)
+#define ENV_STEP		(128.0/ENV_LEN)
+
+#define MAX_ATT_INDEX	((1<<(ENV_BITS-2))-1) /*255*/
+#define MIN_ATT_INDEX	(0)
+
+/* sinwave entries */
+#define SIN_BITS		10
+#define SIN_LEN			(1<<SIN_BITS)
+#define SIN_MASK		(SIN_LEN-1)
+
+#define TL_RES_LEN		(256)	/* 8 bits addressing (real chip) */
+
+
+
+/* register number to channel number , slot offset */
+#define SLOT1 0
+#define SLOT2 1
+
+/* Envelope Generator phases */
+
+#define EG_DMP			5
+#define EG_ATT			4
+#define EG_DEC			3
+#define EG_SUS			2
+#define EG_REL			1
+#define EG_OFF			0
+
+
+/* save output as raw 16-bit sample */
+
+//#define SAVE_SAMPLE
+
+#ifdef SAVE_SAMPLE
+#include <stdio.h>
+
+INLINE signed int acc_calc(signed int value)
+{
+	if (value>=0)
+	{
+		if (value < 0x0200)
+			return (value & ~0);
+		if (value < 0x0400)
+			return (value & ~1);
+		if (value < 0x0800)
+			return (value & ~3);
+		if (value < 0x1000)
+			return (value & ~7);
+		if (value < 0x2000)
+			return (value & ~15);
+		if (value < 0x4000)
+			return (value & ~31);
+		return (value & ~63);
+	}
+	/*else value < 0*/
+	if (value > -0x0200)
+		return (~abs(value) & ~0);
+	if (value > -0x0400)
+		return (~abs(value) & ~1);
+	if (value > -0x0800)
+		return (~abs(value) & ~3);
+	if (value > -0x1000)
+		return (~abs(value) & ~7);
+	if (value > -0x2000)
+		return (~abs(value) & ~15);
+	if (value > -0x4000)
+		return (~abs(value) & ~31);
+	return (~abs(value) & ~63);
+}
+
+
+static FILE *sample1;
+	#if 0	/*save to MONO file */
+		#define SAVE_ALL_CHANNELS \
+		{	signed int pom = acc_calc(mo); \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+	#else	/*save to STEREO file */
+		#define SAVE_ALL_CHANNELS \
+		{	signed int pom = mo; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+			pom = ro; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+		#define SAVE_SEPARATE_CHANNEL(j) \
+		{	signed int pom = outchan; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+			pom = chip->instvol_rj>>4; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+	#endif
+#endif
+
+//#define LOG_CYM_FILE 0
+//static FILE * cymfile = NULL;
+
+
+
+
+typedef struct{
+	UINT32	ar;			/* attack rate: AR<<2 */
+	UINT32	dr;			/* decay rate: DR<<2 */
+	UINT32	rr;			/* release rate:RR<<2 */
+	UINT8	KSR;		/* key scale rate */
+	UINT8	ksl;		/* keyscale level */
+	UINT8	ksr;		/* key scale rate: kcode>>KSR */
+	UINT8	mul;		/* multiple: mul_tabML */
+
+	/* Phase Generator */
+	UINT32	phase;		/* frequency counter */
+	UINT32	freq;		/* frequency counter step */
+	UINT8 fb_shift;	/* feedback shift value */
+	INT32 op1_out2;	/* slot1 output for feedback */
+
+	/* Envelope Generator */
+	UINT8	eg_type;	/* percussive/nonpercussive mode*/
+	UINT8	state;		/* phase type */
+	UINT32	TL;			/* total level: TL << 2 */
+	INT32	TLL;		/* adjusted now TL */
+	INT32	volume;		/* envelope counter */
+	UINT32	sl;			/* sustain level: sl_tabSL */
+
+	UINT8	eg_sh_dp;	/* (dump state) */
+	UINT8	eg_sel_dp;	/* (dump state) */
+	UINT8	eg_sh_ar;	/* (attack state) */
+	UINT8	eg_sel_ar;	/* (attack state) */
+	UINT8	eg_sh_dr;	/* (decay state) */
+	UINT8	eg_sel_dr;	/* (decay state) */
+	UINT8	eg_sh_rr;	/* (release state for non-perc.)*/
+	UINT8	eg_sel_rr;	/* (release state for non-perc.)*/
+	UINT8	eg_sh_rs;	/* (release state for perc.mode)*/
+	UINT8	eg_sel_rs;	/* (release state for perc.mode)*/
+
+	UINT32	key;		/* 0 = KEY OFF, >0 = KEY ON */
+
+	/* LFO */
+	UINT32	AMmask;		/* LFO Amplitude Modulation enable mask */
+	UINT8	vib;		/* LFO Phase Modulation enable flag (active high)*/
+
+	/* waveform select */
+	unsigned int wavetable;
+} OPLL_SLOT;
+
+typedef struct{
+	OPLL_SLOT SLOT2;
+	/* phase generator state */
+	UINT32 block_fnum;	/* block+fnum */
+	UINT32 fc;			/* Freq. freqement base */
+	UINT32 ksl_base;	/* KeyScaleLevel Base step */
+	UINT8 kcode;		/* key code (for key scaling) */
+	UINT8 sus;		/* sus on/off (release speed in percussive mode)*/
+	UINT8 Muted;
+} OPLL_CH;
+
+/* chip state */
+typedef struct {
+	OPLL_CH	P_CH9;				/* OPLL chips have 9 channels*/
+	UINT8	instvol_r9;			/* instrument/volume (or volume/volume in percussive mode)*/
+	UINT8	MuteSpc5;				/* Mute Special: 5 Rhythm */
+
+	UINT32	eg_cnt;					/* global envelope generator counter */
+	UINT32	eg_timer;				/* global envelope generator counter works at frequency = chipclock/72 */
+	UINT32	eg_timer_add;			/* step of eg_timer */
+	UINT32	eg_timer_overflow;		/* envelope generator timer overlfows every 1 sample (on real chip) */
+
+	UINT8	rhythm;					/* Rhythm mode */
+
+	/* LFO */
+	UINT32	LFO_AM;
+	INT32	LFO_PM;
+	UINT32	lfo_am_cnt;
+	UINT32	lfo_am_inc;
+	UINT32	lfo_pm_cnt;
+	UINT32	lfo_pm_inc;
+
+	UINT32	noise_rng;				/* 23 bit noise shift register */
+	UINT32	noise_p;				/* current noise 'phase' */
+	UINT32	noise_f;				/* current noise period */
+
+
+/* instrument settings */
+/*
+ 0-user instrument
+ 1-15 - fixed instruments
+ 16 -bass drum settings
+ 17,18 - other percussion instruments
+*/
+	UINT8 inst_tab198;
+
+	/* external event callback handlers */
+	OPLL_UPDATEHANDLER UpdateHandler; /* stream update handler */
+	void * UpdateParam;				/* stream update parameter */
+
+	UINT32	fn_tab1024;			/* fnumber->increment counter */
+
+	UINT8 address;					/* address register */
+	UINT8 status;					/* status flag */
+
+	UINT8 VRC7_Mode;
+	int clock;						/* master clock (Hz) */
+	int rate;						/* sampling rate (Hz) */
+	double freqbase;				/* frequency base */
+
+	signed int output2;
+	signed int outchan;
+} YM2413;
+
+/* key scale level */
+/* table is 3dB/octave, DV converts this into 6dB/octave */
+/* 0.1875 is bit 0 weight of the envelope counter (volume) expressed in the 'decibel' scale */
+#define DV (0.1875/1.0)
+static const UINT32 ksl_tab8*16=
+{
+	/* OCT 0 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	/* OCT 1 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV,
+	 1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV,
+	/* OCT 2 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV,
+	 3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV,
+	 4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV,
+	/* OCT 3 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV,
+	 3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV,
+	 6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV,
+	 7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV,
+	/* OCT 4 */
+	 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
+	 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
+	 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
+	10.875/DV,11.250/DV,11.625/DV,12.000/DV,
+	/* OCT 5 */
+	 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
+	 9.000/DV,10.125/DV,10.875/DV,11.625/DV,
+	12.000/DV,12.750/DV,13.125/DV,13.500/DV,
+	13.875/DV,14.250/DV,14.625/DV,15.000/DV,
+	/* OCT 6 */
+	 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
+	12.000/DV,13.125/DV,13.875/DV,14.625/DV,
+	15.000/DV,15.750/DV,16.125/DV,16.500/DV,
+	16.875/DV,17.250/DV,17.625/DV,18.000/DV,
+	/* OCT 7 */
+	 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
+	15.000/DV,16.125/DV,16.875/DV,17.625/DV,
+	18.000/DV,18.750/DV,19.125/DV,19.500/DV,
+	19.875/DV,20.250/DV,20.625/DV,21.000/DV
+};
+#undef DV
+
+/* 0 / 1.5 / 3.0 / 6.0 dB/OCT, confirmed on a real YM2413 (the application manual is incorrect) */
+static const UINT32 ksl_shift4 = { 31, 2, 1, 0 };
+
+
+/* sustain level table (3dB per step) */
+/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,45 (dB)*/
+#define SC(db) (UINT32) ( db * (1.0/ENV_STEP) )
+static const UINT32 sl_tab16={
+ SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
+ SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(15)
+};
+#undef SC
+
+
+#define RATE_STEPS (8)
+static const unsigned char eg_inc15*RATE_STEPS={
+
+/*cycle:0 1 2 3 4 5 6 7*/
+
+/* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..12 0 (increment by 0 or 1) */
+/* 1 */ 0,1, 0,1, 1,1, 0,1, /* rates 00..12 1 */
+/* 2 */ 0,1, 1,1, 0,1, 1,1, /* rates 00..12 2 */
+/* 3 */ 0,1, 1,1, 1,1, 1,1, /* rates 00..12 3 */
+
+/* 4 */ 1,1, 1,1, 1,1, 1,1, /* rate 13 0 (increment by 1) */
+/* 5 */ 1,1, 1,2, 1,1, 1,2, /* rate 13 1 */
+/* 6 */ 1,2, 1,2, 1,2, 1,2, /* rate 13 2 */
+/* 7 */ 1,2, 2,2, 1,2, 2,2, /* rate 13 3 */
+
+/* 8 */ 2,2, 2,2, 2,2, 2,2, /* rate 14 0 (increment by 2) */
+/* 9 */ 2,2, 2,4, 2,2, 2,4, /* rate 14 1 */
+/*10 */ 2,4, 2,4, 2,4, 2,4, /* rate 14 2 */
+/*11 */ 2,4, 4,4, 2,4, 4,4, /* rate 14 3 */
+
+/*12 */ 4,4, 4,4, 4,4, 4,4, /* rates 15 0, 15 1, 15 2, 15 3 (increment by 4) */
+/*13 */ 8,8, 8,8, 8,8, 8,8, /* rates 15 2, 15 3 for attack */
+/*14 */ 0,0, 0,0, 0,0, 0,0, /* infinity rates for attack and decay(s) */
+};
+
+
+#define O(a) (a*RATE_STEPS)
+
+/*note that there is no O(13) in this table - it's directly in the code */
+static const unsigned char eg_rate_select16+64+16={	/* Envelope Generator rates (16 + 64 rates + 16 RKS) */
+/* 16 infinite time rates */
+O(14),O(14),O(14),O(14),O(14),O(14),O(14),O(14),
+O(14),O(14),O(14),O(14),O(14),O(14),O(14),O(14),
+
+/* rates 00-12 */
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+
+/* rate 13 */
+O( 4),O( 5),O( 6),O( 7),
+
+/* rate 14 */
+O( 8),O( 9),O(10),O(11),
+
+/* rate 15 */
+O(12),O(12),O(12),O(12),
+
+/* 16 dummy rates (same as 15 3) */
+O(12),O(12),O(12),O(12),O(12),O(12),O(12),O(12),
+O(12),O(12),O(12),O(12),O(12),O(12),O(12),O(12),
+
+};
+#undef O
+
+/*rate 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 */
+/*shift 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0 */
+/*mask 8191, 4095, 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1, 0, 0, 0 */
+
+#define O(a) (a*1)
+static const unsigned char eg_rate_shift16+64+16={	/* Envelope Generator counter shifts (16 + 64 rates + 16 RKS) */
+/* 16 infinite time rates */
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+
+/* rates 00-12 */
+O(13),O(13),O(13),O(13),
+O(12),O(12),O(12),O(12),
+O(11),O(11),O(11),O(11),
+O(10),O(10),O(10),O(10),
+O( 9),O( 9),O( 9),O( 9),
+O( 8),O( 8),O( 8),O( 8),
+O( 7),O( 7),O( 7),O( 7),
+O( 6),O( 6),O( 6),O( 6),
+O( 5),O( 5),O( 5),O( 5),
+O( 4),O( 4),O( 4),O( 4),
+O( 3),O( 3),O( 3),O( 3),
+O( 2),O( 2),O( 2),O( 2),
+O( 1),O( 1),O( 1),O( 1),
+
+/* rate 13 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 14 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 15 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* 16 dummy rates (same as 15 3) */
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+
+};
+#undef O
+
+
+/* multiple table */
+#define ML 2
+static const UINT8 mul_tab16= {
+/* 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,12,12,15,15 */
+ 0.50*ML, 1.00*ML, 2.00*ML, 3.00*ML, 4.00*ML, 5.00*ML, 6.00*ML, 7.00*ML,
+ 8.00*ML, 9.00*ML,10.00*ML,10.00*ML,12.00*ML,12.00*ML,15.00*ML,15.00*ML
+};
+#undef ML
+
+/* TL_TAB_LEN is calculated as:
+* 11 - sinus amplitude bits (Y axis)
+* 2 - sinus sign bit (Y axis)
+* TL_RES_LEN - sinus resolution (X axis)
+*/
+#define TL_TAB_LEN (11*2*TL_RES_LEN)
+static signed int tl_tabTL_TAB_LEN;
+
+#define ENV_QUIET		(TL_TAB_LEN>>5)
+
+/* sin waveform table in 'decibel' scale */
+/* two waveforms on OPLL type chips */
+static unsigned int sin_tabSIN_LEN * 2;
+
+
+/* LFO Amplitude Modulation table (verified on real YM3812)
+ 27 output levels (triangle waveform); 1 level takes one of: 192, 256 or 448 samples
+
+ Length: 210 elements.
+
+ Each of the elements has to be repeated
+ exactly 64 times (on 64 consecutive samples).
+ The whole table takes: 64 * 210 = 13440 samples.
+
+We use data>>1, until we find what it really is on real chip...
+
+*/
+
+#define LFO_AM_TAB_ELEMENTS 210
+
+static const UINT8 lfo_am_tableLFO_AM_TAB_ELEMENTS = {
+0,0,0,0,0,0,0,
+1,1,1,1,
+2,2,2,2,
+3,3,3,3,
+4,4,4,4,
+5,5,5,5,
+6,6,6,6,
+7,7,7,7,
+8,8,8,8,
+9,9,9,9,
+10,10,10,10,
+11,11,11,11,
+12,12,12,12,
+13,13,13,13,
+14,14,14,14,
+15,15,15,15,
+16,16,16,16,
+17,17,17,17,
+18,18,18,18,
+19,19,19,19,
+20,20,20,20,
+21,21,21,21,
+22,22,22,22,
+23,23,23,23,
+24,24,24,24,
+25,25,25,25,
+26,26,26,
+25,25,25,25,
+24,24,24,24,
+23,23,23,23,
+22,22,22,22,
+21,21,21,21,
+20,20,20,20,
+19,19,19,19,
+18,18,18,18,
+17,17,17,17,
+16,16,16,16,
+15,15,15,15,
+14,14,14,14,
+13,13,13,13,
+12,12,12,12,
+11,11,11,11,
+10,10,10,10,
+9,9,9,9,
+8,8,8,8,
+7,7,7,7,
+6,6,6,6,
+5,5,5,5,
+4,4,4,4,
+3,3,3,3,
+2,2,2,2,
+1,1,1,1
+};
+
+/* LFO Phase Modulation table (verified on real YM2413) */
+static const INT8 lfo_pm_table8*8 = {
+
+/* FNUM2/FNUM = 0 00xxxxxx (0x0000) */
+0, 0, 0, 0, 0, 0, 0, 0,
+
+/* FNUM2/FNUM = 0 01xxxxxx (0x0040) */
+1, 0, 0, 0,-1, 0, 0, 0,
+
+/* FNUM2/FNUM = 0 10xxxxxx (0x0080) */
+2, 1, 0,-1,-2,-1, 0, 1,
+
+/* FNUM2/FNUM = 0 11xxxxxx (0x00C0) */
+3, 1, 0,-1,-3,-1, 0, 1,
+
+/* FNUM2/FNUM = 1 00xxxxxx (0x0100) */
+4, 2, 0,-2,-4,-2, 0, 2,
+
+/* FNUM2/FNUM = 1 01xxxxxx (0x0140) */
+5, 2, 0,-2,-5,-2, 0, 2,
+
+/* FNUM2/FNUM = 1 10xxxxxx (0x0180) */
+6, 3, 0,-3,-6,-3, 0, 3,
+
+/* FNUM2/FNUM = 1 11xxxxxx (0x01C0) */
+7, 3, 0,-3,-7,-3, 0, 3,
+};
+
+
+
+
+
+
+/* This is not 100% perfect yet but very close */
+/*
+ - multi parameters are 100% correct (instruments and drums)
+ - LFO PM and AM enable are 100% correct
+ - waveform DC and DM select are 100% correct
+*/
+
+static const unsigned char table198 = {
+/* MULT MULT modTL DcDmFb AR/DR AR/DR SL/RR SL/RR */
+/* 0 1 2 3 4 5 6 7 */
+ {0x49, 0x4c, 0x4c, 0x12, 0x00, 0x00, 0x00, 0x00 },	//0
+
+ {0x61, 0x61, 0x1e, 0x17, 0xf0, 0x78, 0x00, 0x17 },	//1
+ {0x13, 0x41, 0x1e, 0x0d, 0xd7, 0xf7, 0x13, 0x13 },	//2
+ {0x13, 0x01, 0x99, 0x04, 0xf2, 0xf4, 0x11, 0x23 },	//3
+ {0x21, 0x61, 0x1b, 0x07, 0xaf, 0x64, 0x40, 0x27 },	//4
+
+//{0x22, 0x21, 0x1e, 0x09, 0xf0, 0x76, 0x08, 0x28 }, //5
+ {0x22, 0x21, 0x1e, 0x06, 0xf0, 0x75, 0x08, 0x18 },	//5
+
+//{0x31, 0x22, 0x16, 0x09, 0x90, 0x7f, 0x00, 0x08 }, //6
+ {0x31, 0x22, 0x16, 0x05, 0x90, 0x71, 0x00, 0x13 },	//6
+
+ {0x21, 0x61, 0x1d, 0x07, 0x82, 0x80, 0x10, 0x17 },	//7
+ {0x23, 0x21, 0x2d, 0x16, 0xc0, 0x70, 0x07, 0x07 },	//8
+ {0x61, 0x61, 0x1b, 0x06, 0x64, 0x65, 0x10, 0x17 },	//9
+
+//{0x61, 0x61, 0x0c, 0x08, 0x85, 0xa0, 0x79, 0x07 }, //A
+ {0x61, 0x61, 0x0c, 0x18, 0x85, 0xf0, 0x70, 0x07 },	//A
+
+ {0x23, 0x01, 0x07, 0x11, 0xf0, 0xa4, 0x00, 0x22 },	//B
+ {0x97, 0xc1, 0x24, 0x07, 0xff, 0xf8, 0x22, 0x12 },	//C
+
+//{0x61, 0x10, 0x0c, 0x08, 0xf2, 0xc4, 0x40, 0xc8 }, //D
+ {0x61, 0x10, 0x0c, 0x05, 0xf2, 0xf4, 0x40, 0x44 },	//D
+
+ {0x01, 0x01, 0x55, 0x03, 0xf3, 0x92, 0xf3, 0xf3 },	//E
+ {0x61, 0x41, 0x89, 0x03, 0xf1, 0xf4, 0xf0, 0x13 },	//F
+
+/* drum instruments definitions */
+/* MULTI MULTI modTL xxx AR/DR AR/DR SL/RR SL/RR */
+/* 0 1 2 3 4 5 6 7 */
+ {0x01, 0x01, 0x16, 0x00, 0xfd, 0xf8, 0x2f, 0x6d },/* BD(multi verified, modTL verified, mod env - verified(close), carr. env verifed) */
+ {0x01, 0x01, 0x00, 0x00, 0xd8, 0xd8, 0xf9, 0xf8 },/* HH(multi verified), SD(multi not used) */
+ {0x05, 0x01, 0x00, 0x00, 0xf8, 0xba, 0x49, 0x55 },/* TOM(multi,env verified), TOP CYM(multi verified, env verified) */
+};
+
+/* lock level of common table */
+static int num_lock = 0;
+
+/* work table */
+#define SLOT7_1 (&chip->P_CH7.SLOTSLOT1)
+#define SLOT7_2 (&chip->P_CH7.SLOTSLOT2)
+#define SLOT8_1 (&chip->P_CH8.SLOTSLOT1)
+#define SLOT8_2 (&chip->P_CH8.SLOTSLOT2)
+
+
+/*INLINE int limit( int val, int max, int min ) {
+	if ( val > max )
+		val = max;
+	else if ( val < min )
+		val = min;
+
+	return val;
+}*/
+
+
+/* advance LFO to next sample */
+INLINE void advance_lfo(YM2413 *chip)
+{
+	/* LFO */
+	chip->lfo_am_cnt += chip->lfo_am_inc;
+	if (chip->lfo_am_cnt >= ((UINT32)LFO_AM_TAB_ELEMENTS<<LFO_SH) )	/* lfo_am_table is 210 elements long */
+		chip->lfo_am_cnt -= ((UINT32)LFO_AM_TAB_ELEMENTS<<LFO_SH);
+
+	chip->LFO_AM = lfo_am_table chip->lfo_am_cnt >> LFO_SH >> 1;
+
+	chip->lfo_pm_cnt += chip->lfo_pm_inc;
+	chip->LFO_PM = (chip->lfo_pm_cnt>>LFO_SH) & 7;
+}
+
+/* advance to next sample */
+INLINE void advance(YM2413 *chip)
+{
+	OPLL_CH *CH;
+	OPLL_SLOT *op;
+	unsigned int i;
+
+	/* Envelope Generator */
+	chip->eg_timer += chip->eg_timer_add;
+
+	while (chip->eg_timer >= chip->eg_timer_overflow)
+	{
+		chip->eg_timer -= chip->eg_timer_overflow;
+
+		chip->eg_cnt++;
+
+		for (i=0; i<9*2; i++)
+		{
+			CH = &chip->P_CHi/2;
+
+			op = &CH->SLOTi&1;
+
+			switch(op->state)
+			{
+
+			case EG_DMP:		/* dump phase */
+			/*dump phase is performed by both operators in each channel*/
+			/*when CARRIER envelope gets down to zero level,
+ ** phases in BOTH opearators are reset (at the same time ?)
+ */
+				if ( !(chip->eg_cnt & ((1<<op->eg_sh_dp)-1) ) )
+				{
+					op->volume += eg_incop->eg_sel_dp + ((chip->eg_cnt>>op->eg_sh_dp)&7);
+
+					if ( op->volume >= MAX_ATT_INDEX )
+					{
+						op->volume = MAX_ATT_INDEX;
+						op->state = EG_ATT;
+						/* restart Phase Generator */
+						op->phase = 0;
+					}
+				}
+			break;
+
+			case EG_ATT:		/* attack phase */
+				if ( !(chip->eg_cnt & ((1<<op->eg_sh_ar)-1) ) )
+				{
+					op->volume += (~op->volume *
+	 		 (eg_incop->eg_sel_ar + ((chip->eg_cnt>>op->eg_sh_ar)&7))
+ 			 ) >>2;
+
+					if (op->volume <= MIN_ATT_INDEX)
+					{
+						op->volume = MIN_ATT_INDEX;
+						op->state = EG_DEC;
+					}
+				}
+			break;
+
+			case EG_DEC:	/* decay phase */
+				if ( !(chip->eg_cnt & ((1<<op->eg_sh_dr)-1) ) )
+				{
+					op->volume += eg_incop->eg_sel_dr + ((chip->eg_cnt>>op->eg_sh_dr)&7);
+
+					if ( op->volume >= op->sl )
+						op->state = EG_SUS;
+				}
+			break;
+
+			case EG_SUS:	/* sustain phase */
+				/* this is important behaviour:
+ one can change percusive/non-percussive modes on the fly and
+ the chip will remain in sustain phase - verified on real YM3812 */
+
+				if(op->eg_type)		/* non-percussive mode (sustained tone) */
+				{
+									/* do nothing */
+				}
+				else				/* percussive mode */
+				{
+					/* during sustain phase chip adds Release Rate (in percussive mode) */
+					if ( !(chip->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
+					{
+						op->volume += eg_incop->eg_sel_rr + ((chip->eg_cnt>>op->eg_sh_rr)&7);
+
+						if ( op->volume >= MAX_ATT_INDEX )
+							op->volume = MAX_ATT_INDEX;
+					}
+					/* else do nothing in sustain phase */
+				}
+			break;
+
+			case EG_REL:	/* release phase */
+			/* exclude modulators in melody channels from performing anything in this mode*/
+			/* allowed are only carriers in melody mode and rhythm slots in rhythm mode */
+
+			/*This table shows which operators and on what conditions are allowed to perform EG_REL:
+ (a) - always perform EG_REL
+ (n) - never perform EG_REL
+ (r) - perform EG_REL in Rhythm mode ONLY
+ 0: 0 (n), 1 (a)
+ 1: 2 (n), 3 (a)
+ 2: 4 (n), 5 (a)
+ 3: 6 (n), 7 (a)
+ 4: 8 (n), 9 (a)
+ 5: 10(n), 11(a)
+ 6: 12(r), 13(a)
+ 7: 14(r), 15(a)
+ 8: 16(r), 17(a)
+ */
+				if ( (i&1) || ((chip->rhythm&0x20) && (i>=12)) )/* exclude modulators */
+				{
+					if(op->eg_type)		/* non-percussive mode (sustained tone) */
+					/*this is correct: use RR when SUS = OFF*/
+					/*and use RS when SUS = ON*/
+					{
+						if (CH->sus)
+						{
+							if ( !(chip->eg_cnt & ((1<<op->eg_sh_rs)-1) ) )
+							{
+								op->volume += eg_incop->eg_sel_rs + ((chip->eg_cnt>>op->eg_sh_rs)&7);
+								if ( op->volume >= MAX_ATT_INDEX )
+								{
+									op->volume = MAX_ATT_INDEX;
+									op->state = EG_OFF;
+								}
+							}
+						}
+						else
+						{
+							if ( !(chip->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
+							{
+								op->volume += eg_incop->eg_sel_rr + ((chip->eg_cnt>>op->eg_sh_rr)&7);
+								if ( op->volume >= MAX_ATT_INDEX )
+								{
+									op->volume = MAX_ATT_INDEX;
+									op->state = EG_OFF;
+								}
+							}
+						}
+					}
+					else				/* percussive mode */
+					{
+						if ( !(chip->eg_cnt & ((1<<op->eg_sh_rs)-1) ) )
+						{
+							op->volume += eg_incop->eg_sel_rs + ((chip->eg_cnt>>op->eg_sh_rs)&7);
+							if ( op->volume >= MAX_ATT_INDEX )
+							{
+								op->volume = MAX_ATT_INDEX;
+								op->state = EG_OFF;
+							}
+						}
+					}
+				}
+			break;
+
+			default:
+			break;
+			}
+		}
+	}
+
+	for (i=0; i<9*2; i++)
+	{
+		CH = &chip->P_CHi/2;
+		op = &CH->SLOTi&1;
+
+		/* Phase Generator */
+		if(op->vib)
+		{
+			UINT8 block;
+
+			unsigned int fnum_lfo = 8*((CH->block_fnum&0x01c0) >> 6);
+			unsigned int block_fnum = CH->block_fnum * 2;
+			signed int lfo_fn_table_index_offset = lfo_pm_tablechip->LFO_PM + fnum_lfo ;
+
+			if (lfo_fn_table_index_offset)	/* LFO phase modulation active */
+			{
+				block_fnum += lfo_fn_table_index_offset;
+				block = (block_fnum&0x1c00) >> 10;
+				op->phase += (chip->fn_tabblock_fnum&0x03ff >> (7-block)) * op->mul;
+			}
+			else	/* LFO phase modulation = zero */
+			{
+				op->phase += op->freq;
+			}
+		}
+		else	/* LFO phase modulation disabled for this operator */
+		{
+			op->phase += op->freq;
+		}
+	}
+
+	/* The Noise Generator of the YM3812 is 23-bit shift register.
+ * Period is equal to 2^23-2 samples.
+ * Register works at sampling frequency of the chip, so output
+ * can change on every sample.
+ *
+ * Output of the register and input to the bit 22 is:
+ * bit0 XOR bit14 XOR bit15 XOR bit22
+ *
+ * Simply use bit 22 as the noise output.
+ */
+
+	chip->noise_p += chip->noise_f;
+	i = chip->noise_p >> FREQ_SH;		/* number of events (shifts of the shift register) */
+	chip->noise_p &= FREQ_MASK;
+	while (i)
+	{
+		/*
+ UINT32 j;
+ j = ( (chip->noise_rng) ^ (chip->noise_rng>>14) ^ (chip->noise_rng>>15) ^ (chip->noise_rng>>22) ) & 1;
+ chip->noise_rng = (j<<22) | (chip->noise_rng>>1);
+ */
+
+		/*
+ Instead of doing all the logic operations above, we
+ use a trick here (and use bit 0 as the noise output).
+ The difference is only that the noise bit changes one
+ step ahead. This doesn't matter since we don't know
+ what is real state of the noise_rng after the reset.
+ */
+
+		if (chip->noise_rng & 1) chip->noise_rng ^= 0x800302;
+		chip->noise_rng >>= 1;
+
+		i--;
+	}
+}
+
+
+INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+{
+	UINT32 p;
+
+	p = (env<<5) + sin_tabwave_tab + ((((signed int)((phase & ~FREQ_MASK) + (pm<<17))) >> FREQ_SH ) & SIN_MASK) ;
+
+	if (p >= TL_TAB_LEN)
+		return 0;
+	return tl_tabp;
+}
+
+INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+{
+	UINT32 p;
+	INT32 i;
+
+	i = (phase & ~FREQ_MASK) + pm;
+
+/*logerror("i=%08x (i>>16)&511=%8i phase=%i pm=%08x ",i, (i>>16)&511, phase>>FREQ_SH, pm);*/
+
+	p = (env<<5) + sin_tab wave_tab + ((i>>FREQ_SH) & SIN_MASK);
+
+/*logerror("(p&255=%i p>>8=%i) out= %i\n", p&255,p>>8, tl_tabp&255>>(p>>8) );*/
+
+	if (p >= TL_TAB_LEN)
+		return 0;
+	return tl_tabp;
+}
+
+
+#define volume_calc(OP) ((OP)->TLL + ((UINT32)(OP)->volume) + (chip->LFO_AM & (OP)->AMmask))
+
+/* calculate output */
+INLINE void chan_calc( YM2413*chip, OPLL_CH *CH )
+{
+	OPLL_SLOT *SLOT;
+	unsigned int env;
+	signed int out;
+	signed int phase_modulation;	/* phase modulation input (SLOT 2) */
+
+
+	if (CH->Muted)
+		return;
+
+ /* SLOT 1 */
+	SLOT = &CH->SLOTSLOT1;
+	env = volume_calc(SLOT);
+	out = SLOT->op1_out0 + SLOT->op1_out1;
+
+	SLOT->op1_out0 = SLOT->op1_out1;
+	phase_modulation = SLOT->op1_out0;
+
+	SLOT->op1_out1 = 0;
+
+	if( env < ENV_QUIET )
+	{
+		if (!SLOT->fb_shift)
+			out = 0;
+		SLOT->op1_out1 = op_calc1(SLOT->phase, env, (out<<SLOT->fb_shift), SLOT->wavetable );
+	}
+
+	/* SLOT 2 */
+
+	chip->outchan=0;
+
+	SLOT++;
+	env = volume_calc(SLOT);
+	if( env < ENV_QUIET )
+	{
+		signed int outp = op_calc(SLOT->phase, env, phase_modulation, SLOT->wavetable);
+		chip->output0 += outp;
+		chip->outchan = outp;
+		//chip->output0 += op_calc(SLOT->phase, env, phase_modulation, SLOT->wavetable);
+	}
+}
+
+/*
+ operators used in the rhythm sounds generation process:
+
+ Envelope Generator:
+
+channel operator register number Bass High Snare Tom Top
+/ slot number TL ARDR SLRR Wave Drum Hat Drum Tom Cymbal
+ 6 / 0 12 50 70 90 f0 +
+ 6 / 1 15 53 73 93 f3 +
+ 7 / 0 13 51 71 91 f1 +
+ 7 / 1 16 54 74 94 f4 +
+ 8 / 0 14 52 72 92 f2 +
+ 8 / 1 17 55 75 95 f5 +
+
+ Phase Generator:
+
+channel operator register number Bass High Snare Tom Top
+/ slot number MULTIPLE Drum Hat Drum Tom Cymbal
+ 6 / 0 12 30 +
+ 6 / 1 15 33 +
+ 7 / 0 13 31 + + +
+ 7 / 1 16 34 ----- n o t u s e d -----
+ 8 / 0 14 32 +
+ 8 / 1 17 35 + +
+
+channel operator register number Bass High Snare Tom Top
+number number BLK/FNUM2 FNUM Drum Hat Drum Tom Cymbal
+ 6 12,15 B6 A6 +
+
+ 7 13,16 B7 A7 + + +
+
+ 8 14,17 B8 A8 + + +
+
+*/
+
+/* calculate rhythm */
+
+INLINE void rhythm_calc( YM2413 *chip, OPLL_CH *CH, unsigned int noise )
+{
+	OPLL_SLOT *SLOT;
+	signed int out;
+	unsigned int env;
+	signed int phase_modulation;	/* phase modulation input (SLOT 2) */
+
+
+	/* Bass Drum (verified on real YM3812):
+ - depends on the channel 6 'connect' register:
+ when connect = 0 it works the same as in normal (non-rhythm) mode (op1->op2->out)
+ when connect = 1 _only_ operator 2 is present on output (op2->out), operator 1 is ignored
+ - output sample always is multiplied by 2
+ */
+
+
+	/* SLOT 1 */
+	SLOT = &CH6.SLOTSLOT1;
+	env = volume_calc(SLOT);
+
+	out = SLOT->op1_out0 + SLOT->op1_out1;
+	SLOT->op1_out0 = SLOT->op1_out1;
+
+	phase_modulation = SLOT->op1_out0;
+
+	SLOT->op1_out1 = 0;
+	if( env < ENV_QUIET )
+	{
+		if (!SLOT->fb_shift)
+			out = 0;
+		SLOT->op1_out1 = op_calc1(SLOT->phase, env, (out<<SLOT->fb_shift), SLOT->wavetable );
+	}
+
+	/* SLOT 2 */
+	SLOT++;
+	env = volume_calc(SLOT);
+	if( env < ENV_QUIET && ! chip->MuteSpc0 )
+		chip->output1 += op_calc(SLOT->phase, env, phase_modulation, SLOT->wavetable) * 2;
+
+
+	/* Phase generation is based on: */
+	// HH (13) channel 7->slot 1 combined with channel 8->slot 2 (same combination as TOP CYMBAL but different output phases)
+	// SD (16) channel 7->slot 1
+	// TOM (14) channel 8->slot 1
+	// TOP (17) channel 7->slot 1 combined with channel 8->slot 2 (same combination as HIGH HAT but different output phases)
+
+	/* Envelope generation based on: */
+	// HH channel 7->slot1
+	// SD channel 7->slot2
+	// TOM channel 8->slot1
+	// TOP channel 8->slot2
+
+
+	/* The following formulas can be well optimized.
+ I leave them in direct form for now (in case I've missed something).
+ */
+
+	/* High Hat (verified on real YM3812) */
+	env = volume_calc(SLOT7_1);
+	if( env < ENV_QUIET && ! chip->MuteSpc4 )
+	{
+
+		/* high hat phase generation:
+ phase = d0 or 234 (based on frequency only)
+ phase = 34 or 2d0 (based on noise)
+ */
+
+		/* base frequency derived from operator 1 in channel 7 */
+		unsigned char bit7 = ((SLOT7_1->phase>>FREQ_SH)>>7)&1;
+		unsigned char bit3 = ((SLOT7_1->phase>>FREQ_SH)>>3)&1;
+		unsigned char bit2 = ((SLOT7_1->phase>>FREQ_SH)>>2)&1;
+
+		unsigned char res1 = (bit2 ^ bit7) | bit3;
+
+		/* when res1 = 0 phase = 0x000 | 0xd0; */
+		/* when res1 = 1 phase = 0x200 | (0xd0>>2); */
+		UINT32 phase = res1 ? (0x200|(0xd0>>2)) : 0xd0;
+
+		/* enable gate based on frequency of operator 2 in channel 8 */
+		unsigned char bit5e= ((SLOT8_2->phase>>FREQ_SH)>>5)&1;
+		unsigned char bit3e= ((SLOT8_2->phase>>FREQ_SH)>>3)&1;
+
+		unsigned char res2 = (bit3e | bit5e);
+
+		/* when res2 = 0 pass the phase from calculation above (res1); */
+		/* when res2 = 1 phase = 0x200 | (0xd0>>2); */
+		if (res2)
+			phase = (0x200|(0xd0>>2));
+
+
+		/* when phase & 0x200 is set and noise=1 then phase = 0x200|0xd0 */
+		/* when phase & 0x200 is set and noise=0 then phase = 0x200|(0xd0>>2), ie no change */
+		if (phase&0x200)
+		{
+			if (noise)
+				phase = 0x200|0xd0;
+		}
+		else
+		/* when phase & 0x200 is clear and noise=1 then phase = 0xd0>>2 */
+		/* when phase & 0x200 is clear and noise=0 then phase = 0xd0, ie no change */
+		{
+			if (noise)
+				phase = 0xd0>>2;
+		}
+
+		chip->output1 += op_calc(phase<<FREQ_SH, env, 0, SLOT7_1->wavetable) * 2;
+	}
+
+	/* Snare Drum (verified on real YM3812) */
+	env = volume_calc(SLOT7_2);
+	if( env < ENV_QUIET && ! chip->MuteSpc1 )
+	{
+		/* base frequency derived from operator 1 in channel 7 */
+		unsigned char bit8 = ((SLOT7_1->phase>>FREQ_SH)>>8)&1;
+
+		/* when bit8 = 0 phase = 0x100; */
+		/* when bit8 = 1 phase = 0x200; */
+		UINT32 phase = bit8 ? 0x200 : 0x100;
+
+		/* Noise bit XOR'es phase by 0x100 */
+		/* when noisebit = 0 pass the phase from calculation above */
+		/* when noisebit = 1 phase ^= 0x100; */
+		/* in other words: phase ^= (noisebit<<8); */
+		if (noise)
+			phase ^= 0x100;
+
+		chip->output1 += op_calc(phase<<FREQ_SH, env, 0, SLOT7_2->wavetable) * 2;
+	}
+
+	/* Tom Tom (verified on real YM3812) */
+	env = volume_calc(SLOT8_1);
+	if( env < ENV_QUIET && ! chip->MuteSpc2 )
+		chip->output1 += op_calc(SLOT8_1->phase, env, 0, SLOT8_1->wavetable) * 2;
+
+	/* Top Cymbal (verified on real YM2413) */
+	env = volume_calc(SLOT8_2);
+	if( env < ENV_QUIET && ! chip->MuteSpc3 )
+	{
+		/* base frequency derived from operator 1 in channel 7 */
+		unsigned char bit7 = ((SLOT7_1->phase>>FREQ_SH)>>7)&1;
+		unsigned char bit3 = ((SLOT7_1->phase>>FREQ_SH)>>3)&1;
+		unsigned char bit2 = ((SLOT7_1->phase>>FREQ_SH)>>2)&1;
+
+		unsigned char res1 = (bit2 ^ bit7) | bit3;
+
+		/* when res1 = 0 phase = 0x000 | 0x100; */
+		/* when res1 = 1 phase = 0x200 | 0x100; */
+		UINT32 phase = res1 ? 0x300 : 0x100;
+
+		/* enable gate based on frequency of operator 2 in channel 8 */
+		unsigned char bit5e= ((SLOT8_2->phase>>FREQ_SH)>>5)&1;
+		unsigned char bit3e= ((SLOT8_2->phase>>FREQ_SH)>>3)&1;
+
+		unsigned char res2 = (bit3e | bit5e);
+		/* when res2 = 0 pass the phase from calculation above (res1); */
+		/* when res2 = 1 phase = 0x200 | 0x100; */
+		if (res2)
+			phase = 0x300;
+
+		chip->output1 += op_calc(phase<<FREQ_SH, env, 0, SLOT8_2->wavetable) * 2;
+	}
+
+}
+
+
+/* generic table initialize */
+static int init_tables(void)
+{
+	signed int i,x;
+	signed int n;
+	double o,m;
+
+
+	for (x=0; x<TL_RES_LEN; x++)
+	{
+		m = (1<<16) / pow(2, (x+1) * (ENV_STEP/4.0) / 8.0);
+		m = floor(m);
+
+		/* we never reach (1<<16) here due to the (x+1) */
+		/* result fits within 16 bits at maximum */
+
+		n = (int)m;		/* 16 bits here */
+		n >>= 4;		/* 12 bits here */
+		if (n&1)		/* round to nearest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+						/* 11 bits here (rounded) */
+		tl_tab x*2 + 0 = n;
+		tl_tab x*2 + 1 = -tl_tab x*2 + 0 ;
+
+		for (i=1; i<11; i++)
+		{
+			tl_tab x*2+0 + i*2*TL_RES_LEN = tl_tab x*2+0 >>i;
+			tl_tab x*2+1 + i*2*TL_RES_LEN = -tl_tab x*2+0 + i*2*TL_RES_LEN ;
+		}
+	//#if 0
+	//		logerror("tl %04i", x*2);
+	//		for (i=0; i<11; i++)
+	//			logerror(", %02i %5i", i*2, tl_tab x*2 /*+1*/ + i*2*TL_RES_LEN );
+	//		logerror("\n");
+	//#endif*/
+	}
+	/*logerror("ym2413.c: TL_TAB_LEN = %i elements (%i bytes)\n",TL_TAB_LEN, (int)sizeof(tl_tab));*/
+
+
+	for (i=0; i<SIN_LEN; i++)
+	{
+		/* non-standard sinus */
+		m = sin( ((i*2)+1) * M_PI / SIN_LEN ); /* checked against the real chip */
+
+		/* we never reach zero here due to ((i*2)+1) */
+
+		if (m>0.0)
+			o = 8*log(1.0/m)/log(2.0);	/* convert to 'decibels' */
+		else
+			o = 8*log(-1.0/m)/log(2.0);	/* convert to 'decibels' */
+
+		o = o / (ENV_STEP/4);
+
+		n = (int)(2.0*o);
+		if (n&1)						/* round to nearest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+
+		/* waveform 0: standard sinus */
+		sin_tab i = n*2 + (m>=0.0? 0: 1 );
+
+		/*logerror("ym2413.c: sin %4i (hex=%03x)= %4i (tl_tab value=%5i)\n", i, i, sin_tabi, tl_tabsin_tabi );*/
+
+
+		/* waveform 1: __ __ */
+		/* / \____/ \____*/
+		/* output only first half of the sinus waveform (positive one) */
+		if (i & (1<<(SIN_BITS-1)) )
+			sin_tab1*SIN_LEN+i = TL_TAB_LEN;
+		else
+			sin_tab1*SIN_LEN+i = sin_tabi;
+
+		/*logerror("ym2413.c: sin1%4i= %4i (tl_tab value=%5i)\n", i, sin_tab1*SIN_LEN+i, tl_tabsin_tab1*SIN_LEN+i );*/
+	}
+/*#if 0
+	logerror("YM2413.C: ENV_QUIET= %08x (*32=%08x)\n", ENV_QUIET, ENV_QUIET*32 );
+	for (i=0; i<ENV_QUIET; i++)
+	{
+		logerror("tl_tb%4x(%4i)=%8x\n", i<<5, i, tl_tabi<<5 );
+	}
+#endif*/
+#ifdef SAVE_SAMPLE
+	sample0=fopen("sampsum.pcm","wb");
+#endif
+
+	return 1;
+}
+
+static void OPLCloseTable( void )
+{
+#ifdef SAVE_SAMPLE
+	fclose(sample0);
+#endif
+}
+
+
+/*static void OPLL_init_save(YM2413 *chip, const device_config *device)
+{
+	int chnum;
+
+	state_save_register_device_item_array(device, 0, chip->instvol_r);
+	state_save_register_device_item(device, 0, chip->eg_cnt);
+	state_save_register_device_item(device, 0, chip->eg_timer);
+	state_save_register_device_item(device, 0, chip->eg_timer_add);
+	state_save_register_device_item(device, 0, chip->eg_timer_overflow);
+	state_save_register_device_item(device, 0, chip->rhythm);
+	state_save_register_device_item(device, 0, chip->lfo_am_cnt);
+	state_save_register_device_item(device, 0, chip->lfo_am_inc);
+	state_save_register_device_item(device, 0, chip->lfo_pm_cnt);
+	state_save_register_device_item(device, 0, chip->lfo_pm_inc);
+	state_save_register_device_item(device, 0, chip->noise_rng);
+	state_save_register_device_item(device, 0, chip->noise_p);
+	state_save_register_device_item(device, 0, chip->noise_f);
+	state_save_register_device_item_2d_array(device, 0, chip->inst_tab);
+	state_save_register_device_item(device, 0, chip->address);
+	state_save_register_device_item(device, 0, chip->status);
+
+	for (chnum = 0; chnum < ARRAY_LENGTH(chip->P_CH); chnum++)
+	{
+		OPLL_CH *ch = &chip->P_CHchnum;
+		int slotnum;
+
+		state_save_register_device_item(device, chnum, ch->block_fnum);
+		state_save_register_device_item(device, chnum, ch->fc);
+		state_save_register_device_item(device, chnum, ch->ksl_base);
+		state_save_register_device_item(device, chnum, ch->kcode);
+		state_save_register_device_item(device, chnum, ch->sus);
+
+		for (slotnum = 0; slotnum < ARRAY_LENGTH(ch->SLOT); slotnum++)
+		{
+			OPLL_SLOT *sl = &ch->SLOTslotnum;
+
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->ar);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->dr);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->rr);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->KSR);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->ksl);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->ksr);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->mul);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->phase);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->freq);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->fb_shift);
+			state_save_register_device_item_array(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->op1_out);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_type);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->state);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->TL);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->TLL);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->volume);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->sl);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sh_dp);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sel_dp);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sh_ar);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sel_ar);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sh_dr);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sel_dr);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sh_rr);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sel_rr);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sh_rs);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->eg_sel_rs);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->key);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->AMmask);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->vib);
+			state_save_register_device_item(device, chnum * ARRAY_LENGTH(ch->SLOT) + slotnum, sl->wavetable);
+		}
+	}
+}*/
+
+
+//static void OPLL_initalize(YM2413 *chip, const device_config *device)
+static void OPLL_initalize(YM2413 *chip)
+{
+	int i;
+
+	//OPLL_init_save(chip, device);
+
+	/* frequency base */
+	chip->freqbase = (chip->rate) ? ((double)chip->clock / 72.0) / chip->rate : 0;
+/*#if 0
+	chip->rate = (double)chip->clock / 72.0;
+	chip->freqbase = 1.0;
+	logerror("freqbase=%f\n", chip->freqbase);
+#endif*/
+
+
+
+	/* make fnumber -> increment counter table */
+	for( i = 0 ; i < 1024; i++ )
+	{
+		/* OPLL (YM2413) phase increment counter = 18bit */
+
+		chip->fn_tabi = (UINT32)( (double)i * 64 * chip->freqbase * (1<<(FREQ_SH-10)) ); /* -10 because chip works with 10.10 fixed point, while we use 16.16 */
+/*#if 0
+		logerror("ym2413.c: fn_tab%4i = %08x (dec=%8i)\n",
+				 i, chip->fn_tabi>>6, chip->fn_tabi>>6 );
+#endif*/
+	}
+
+/*#if 0
+	for( i=0 ; i < 16 ; i++ )
+	{
+		logerror("ym2413.c: sl_tab%i = %08x\n", i, sl_tabi );
+	}
+	for( i=0 ; i < 8 ; i++ )
+	{
+		int j;
+		logerror("ym2413.c: ksl_taboct=%2i =",i);
+		for (j=0; j<16; j++)
+		{
+			logerror("%08x ", ksl_tabi*16+j );
+		}
+		logerror("\n");
+	}
+#endif*/
+
+	for(i = 0; i < 9; i ++)
+		chip->P_CHi.Muted = 0x00;
+	for(i = 0; i < 5; i ++)
+		chip->MuteSpci = 0x00;
+
+
+	/* Amplitude modulation: 27 output levels (triangle waveform); 1 level takes one of: 192, 256 or 448 samples */
+	/* One entry from LFO_AM_TABLE lasts for 64 samples */
+	chip->lfo_am_inc = (1.0 / 64.0 ) * (1<<LFO_SH) * chip->freqbase;
+
+	/* Vibrato: 8 output levels (triangle waveform); 1 level takes 1024 samples */
+	chip->lfo_pm_inc = (1.0 / 1024.0) * (1<<LFO_SH) * chip->freqbase;
+
+	/*logerror ("chip->lfo_am_inc = %8x ; chip->lfo_pm_inc = %8x\n", chip->lfo_am_inc, chip->lfo_pm_inc);*/
+
+	/* Noise generator: a step takes 1 sample */
+	chip->noise_f = (1.0 / 1.0) * (1<<FREQ_SH) * chip->freqbase;
+	/*logerror("YM2413init noise_f=%8x\n", chip->noise_f);*/
+
+	chip->eg_timer_add = (1<<EG_SH) * chip->freqbase;
+	chip->eg_timer_overflow = ( 1 ) * (1<<EG_SH);
+	/*logerror("YM2413init eg_timer_add=%8x eg_timer_overflow=%8x\n", chip->eg_timer_add, chip->eg_timer_overflow);*/
+}
+
+INLINE void KEY_ON(OPLL_SLOT *SLOT, UINT32 key_set)
+{
+	if( !SLOT->key )
+	{
+		/* do NOT restart Phase Generator (verified on real YM2413)*/
+		/* phase -> Dump */
+		SLOT->state = EG_DMP;
+	}
+	SLOT->key |= key_set;
+}
+
+INLINE void KEY_OFF(OPLL_SLOT *SLOT, UINT32 key_clr)
+{
+	if( SLOT->key )
+	{
+		SLOT->key &= key_clr;
+
+		if( !SLOT->key )
+		{
+			/* phase -> Release */
+			if (SLOT->state>EG_REL)
+				SLOT->state = EG_REL;
+		}
+	}
+}
+
+/* update phase increment counter of operator (also update the EG rates if necessary) */
+INLINE void CALC_FCSLOT(OPLL_CH *CH,OPLL_SLOT *SLOT)
+{
+	int ksr;
+	UINT32 SLOT_rs;
+	UINT32 SLOT_dp;
+
+	/* (frequency) phase increment counter */
+	SLOT->freq = CH->fc * SLOT->mul;
+	ksr = CH->kcode >> SLOT->KSR;
+
+	if( SLOT->ksr != ksr )
+	{
+		SLOT->ksr = ksr;
+
+		/* calculate envelope generator rates */
+		if ((SLOT->ar + SLOT->ksr) < 16+62)
+		{
+			SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+			SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
+		}
+		else
+		{
+			SLOT->eg_sh_ar = 0;
+			SLOT->eg_sel_ar = 13*RATE_STEPS;
+		}
+		SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
+		SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
+		SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
+		SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
+
+	}
+
+	if (CH->sus)
+		SLOT_rs = 16 + (5<<2);
+	else
+		SLOT_rs = 16 + (7<<2);
+
+	SLOT->eg_sh_rs = eg_rate_shift SLOT_rs + SLOT->ksr ;
+	SLOT->eg_sel_rs = eg_rate_selectSLOT_rs + SLOT->ksr ;
+
+	SLOT_dp = 16 + (13<<2);
+	SLOT->eg_sh_dp = eg_rate_shift SLOT_dp + SLOT->ksr ;
+	SLOT->eg_sel_dp = eg_rate_selectSLOT_dp + SLOT->ksr ;
+}
+
+/* set multi,am,vib,EG-TYP,KSR,mul */
+INLINE void set_mul(YM2413 *chip,int slot,int v)
+{
+	OPLL_CH *CH = &chip->P_CHslot/2;
+	OPLL_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->mul = mul_tabv&0x0f;
+	SLOT->KSR = (v&0x10) ? 0 : 2;
+	SLOT->eg_type = (v&0x20);
+	SLOT->vib = (v&0x40);
+	SLOT->AMmask = (v&0x80) ? ~0 : 0;
+	CALC_FCSLOT(CH,SLOT);
+}
+
+/* set ksl, tl */
+INLINE void set_ksl_tl(YM2413 *chip,int chan,int v)
+{
+	OPLL_CH *CH = &chip->P_CHchan;
+/* modulator */
+	OPLL_SLOT *SLOT = &CH->SLOTSLOT1;
+
+	SLOT->ksl = ksl_shiftv >> 6;
+	SLOT->TL = (v&0x3f)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
+	SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+}
+
+/* set ksl , waveforms, feedback */
+INLINE void set_ksl_wave_fb(YM2413 *chip,int chan,int v)
+{
+	OPLL_CH *CH = &chip->P_CHchan;
+/* modulator */
+	OPLL_SLOT *SLOT = &CH->SLOTSLOT1;
+	SLOT->wavetable = ((v&0x08)>>3)*SIN_LEN;
+	SLOT->fb_shift = (v&7) ? (v&7) + 8 : 0;
+
+/*carrier*/
+	SLOT = &CH->SLOTSLOT2;
+
+	SLOT->ksl = ksl_shiftv >> 6;
+	SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+
+	SLOT->wavetable = ((v&0x10)>>4)*SIN_LEN;
+}
+
+/* set attack rate & decay rate */
+INLINE void set_ar_dr(YM2413 *chip,int slot,int v)
+{
+	OPLL_CH *CH = &chip->P_CHslot/2;
+	OPLL_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->ar = (v>>4) ? 16 + ((v>>4) <<2) : 0;
+
+	if ((SLOT->ar + SLOT->ksr) < 16+62)
+	{
+		SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+		SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
+	}
+	else
+	{
+		SLOT->eg_sh_ar = 0;
+		SLOT->eg_sel_ar = 13*RATE_STEPS;
+	}
+
+	SLOT->dr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
+	SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
+	SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
+}
+
+/* set sustain level & release rate */
+INLINE void set_sl_rr(YM2413 *chip,int slot,int v)
+{
+	OPLL_CH *CH = &chip->P_CHslot/2;
+	OPLL_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->sl = sl_tab v>>4 ;
+
+	SLOT->rr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
+	SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
+	SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
+}
+
+static void load_instrument(YM2413 *chip, UINT32 chan, UINT32 slot, UINT8* inst )
+{
+	set_mul			(chip, slot, inst0);
+	set_mul			(chip, slot+1, inst1);
+	set_ksl_tl		(chip, chan, inst2);
+	set_ksl_wave_fb	(chip, chan, inst3);
+	set_ar_dr		(chip, slot, inst4);
+	set_ar_dr		(chip, slot+1, inst5);
+	set_sl_rr		(chip, slot, inst6);
+	set_sl_rr		(chip, slot+1, inst7);
+}
+static void update_instrument_zero(YM2413 *chip, UINT8 r )
+{
+	UINT8* inst = &chip->inst_tab00; /* point to user instrument */
+	UINT32 chan;
+	UINT32 chan_max;
+
+	chan_max = 9;
+	if (chip->rhythm & 0x20)
+		chan_max=6;
+
+	switch(r)
+	{
+	case 0:
+		for (chan=0; chan<chan_max; chan++)
+		{
+			if ((chip->instvol_rchan&0xf0)==0)
+			{
+				set_mul			(chip, chan*2, inst0);
+			}
+		}
+ break;
+	case 1:
+		for (chan=0; chan<chan_max; chan++)
+		{
+			if ((chip->instvol_rchan&0xf0)==0)
+			{
+				set_mul			(chip, chan*2+1,inst1);
+			}
+		}
+ break;
+	case 2:
+		for (chan=0; chan<chan_max; chan++)
+		{
+			if ((chip->instvol_rchan&0xf0)==0)
+			{
+				set_ksl_tl		(chip, chan, inst2);
+			}
+		}
+ break;
+	case 3:
+		for (chan=0; chan<chan_max; chan++)
+		{
+			if ((chip->instvol_rchan&0xf0)==0)
+			{
+				set_ksl_wave_fb	(chip, chan, inst3);
+			}
+		}
+ break;
+	case 4:
+		for (chan=0; chan<chan_max; chan++)
+		{
+			if ((chip->instvol_rchan&0xf0)==0)
+			{
+				set_ar_dr		(chip, chan*2, inst4);
+			}
+		}
+ break;
+	case 5:
+		for (chan=0; chan<chan_max; chan++)
+		{
+			if ((chip->instvol_rchan&0xf0)==0)
+			{
+				set_ar_dr		(chip, chan*2+1,inst5);
+			}
+		}
+ break;
+	case 6:
+		for (chan=0; chan<chan_max; chan++)
+		{
+			if ((chip->instvol_rchan&0xf0)==0)
+			{
+				set_sl_rr		(chip, chan*2, inst6);
+			}
+		}
+ break;
+	case 7:
+		for (chan=0; chan<chan_max; chan++)
+		{
+			if ((chip->instvol_rchan&0xf0)==0)
+			{
+				set_sl_rr		(chip, chan*2+1,inst7);
+			}
+		}
+ break;
+ }
+}
+
+/* write a value v to register r on chip chip */
+static void OPLLWriteReg(YM2413 *chip, int r, int v)
+{
+	OPLL_CH *CH;
+	OPLL_SLOT *SLOT;
+	UINT8 *inst;
+	int chan;
+	int slot;
+
+	/* adjust bus to 8 bits */
+	r &= 0xff;
+	v &= 0xff;
+
+
+	/*if (LOG_CYM_FILE && (cymfile) && (r!=8) )
+	{
+		fputc( (unsigned char)r, cymfile );
+		fputc( (unsigned char)v, cymfile );
+	}*/
+
+
+	switch(r&0xf0)
+	{
+	case 0x00:	/* 00-0f:control */
+	{
+		switch(r&0x0f)
+		{
+		case 0x00:	/* AM/VIB/EGTYP/KSR/MULTI (modulator) */
+		case 0x01:	/* AM/VIB/EGTYP/KSR/MULTI (carrier) */
+		case 0x02:	/* Key Scale Level, Total Level (modulator) */
+		case 0x03:	/* Key Scale Level, carrier waveform, modulator waveform, Feedback */
+		case 0x04:	/* Attack, Decay (modulator) */
+		case 0x05:	/* Attack, Decay (carrier) */
+		case 0x06:	/* Sustain, Release (modulator) */
+		case 0x07:	/* Sustain, Release (carrier) */
+			chip->inst_tab0r & 0x07 = v;
+			update_instrument_zero(chip,r&7);
+		break;
+
+		case 0x0e:	/* x, x, r,bd,sd,tom,tc,hh */
+		{
+			if (chip->VRC7_Mode)
+				break;
+			if(v&0x20)
+			{
+				if ((chip->rhythm&0x20)==0)
+				/*rhythm off to on*/
+				{
+					//logerror("YM2413: Rhythm mode enable\n");
+
+	/* Load instrument settings for channel seven(chan=6 since we're zero based). (Bass drum) */
+					chan = 6;
+					inst = &chip->inst_tab160;
+					slot = chan*2;
+
+					load_instrument(chip, chan, slot, inst);
+
+	/* Load instrument settings for channel eight. (High hat and snare drum) */
+					chan = 7;
+					inst = &chip->inst_tab170;
+					slot = chan*2;
+
+					load_instrument(chip, chan, slot, inst);
+
+					CH = &chip->P_CHchan;
+					SLOT = &CH->SLOTSLOT1; /* modulator envelope is HH */
+					SLOT->TL = ((chip->instvol_rchan>>4)<<2)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
+					SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+
+	/* Load instrument settings for channel nine. (Tom-tom and top cymbal) */
+					chan = 8;
+					inst = &chip->inst_tab180;
+					slot = chan*2;
+
+					load_instrument(chip, chan, slot, inst);
+
+					CH = &chip->P_CHchan;
+					SLOT = &CH->SLOTSLOT1; /* modulator envelope is TOM */
+					SLOT->TL = ((chip->instvol_rchan>>4)<<2)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
+					SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+				}
+				/* BD key on/off */
+				if(v&0x10)
+				{
+					KEY_ON (&chip->P_CH6.SLOTSLOT1, 2);
+					KEY_ON (&chip->P_CH6.SLOTSLOT2, 2);
+				}
+				else
+				{
+					KEY_OFF(&chip->P_CH6.SLOTSLOT1,~2);
+					KEY_OFF(&chip->P_CH6.SLOTSLOT2,~2);
+				}
+				/* HH key on/off */
+				if(v&0x01) KEY_ON (&chip->P_CH7.SLOTSLOT1, 2);
+				else KEY_OFF(&chip->P_CH7.SLOTSLOT1,~2);
+				/* SD key on/off */
+				if(v&0x08) KEY_ON (&chip->P_CH7.SLOTSLOT2, 2);
+				else KEY_OFF(&chip->P_CH7.SLOTSLOT2,~2);
+				/* TOM key on/off */
+				if(v&0x04) KEY_ON (&chip->P_CH8.SLOTSLOT1, 2);
+				else KEY_OFF(&chip->P_CH8.SLOTSLOT1,~2);
+				/* TOP-CY key on/off */
+				if(v&0x02) KEY_ON (&chip->P_CH8.SLOTSLOT2, 2);
+				else KEY_OFF(&chip->P_CH8.SLOTSLOT2,~2);
+			}
+			else
+			{
+				if ((chip->rhythm&0x20)!=0)
+				/*rhythm on to off*/
+				{
+					//logerror("YM2413: Rhythm mode disable\n");
+	/* Load instrument settings for channel seven(chan=6 since we're zero based).*/
+					chan = 6;
+					inst = &chip->inst_tabchip->instvol_rchan>>40;
+					slot = chan*2;
+
+					load_instrument(chip, chan, slot, inst);
+
+	/* Load instrument settings for channel eight.*/
+					chan = 7;
+					inst = &chip->inst_tabchip->instvol_rchan>>40;
+					slot = chan*2;
+
+					load_instrument(chip, chan, slot, inst);
+
+	/* Load instrument settings for channel nine.*/
+					chan = 8;
+					inst = &chip->inst_tabchip->instvol_rchan>>40;
+					slot = chan*2;
+
+					load_instrument(chip, chan, slot, inst);
+				}
+				/* BD key off */
+				KEY_OFF(&chip->P_CH6.SLOTSLOT1,~2);
+				KEY_OFF(&chip->P_CH6.SLOTSLOT2,~2);
+				/* HH key off */
+				KEY_OFF(&chip->P_CH7.SLOTSLOT1,~2);
+				/* SD key off */
+				KEY_OFF(&chip->P_CH7.SLOTSLOT2,~2);
+				/* TOM key off */
+				KEY_OFF(&chip->P_CH8.SLOTSLOT1,~2);
+				/* TOP-CY off */
+				KEY_OFF(&chip->P_CH8.SLOTSLOT2,~2);
+			}
+			chip->rhythm = v&0x3f;
+		}
+		break;
+		}
+	}
+	break;
+
+	case 0x10:
+	case 0x20:
+	{
+		int block_fnum;
+
+		chan = r&0x0f;
+
+		if (chan >= 9)
+			chan -= 9;	/* verified on real YM2413 */
+		if (chip->VRC7_Mode && chan >= 6)
+			break;
+
+		CH = &chip->P_CHchan;
+
+		if(r&0x10)
+		{	/* 10-18: FNUM 0-7 */
+			block_fnum = (CH->block_fnum&0x0f00) | v;
+		}
+		else
+		{	/* 20-28: suson, keyon, block, FNUM 8 */
+			block_fnum = ((v&0x0f)<<8) | (CH->block_fnum&0xff);
+
+			if(v&0x10)
+			{
+				KEY_ON (&CH->SLOTSLOT1, 1);
+				KEY_ON (&CH->SLOTSLOT2, 1);
+			}
+			else
+			{
+				KEY_OFF(&CH->SLOTSLOT1,~1);
+				KEY_OFF(&CH->SLOTSLOT2,~1);
+			}
+
+
+			//if (CH->sus!=(v&0x20))
+			//	logerror("chan=%i sus=%2x\n",chan,v&0x20);
+
+			CH->sus = v & 0x20;
+		}
+		/* update */
+		if(CH->block_fnum != block_fnum)
+		{
+			UINT8 block;
+
+			CH->block_fnum = block_fnum;
+
+			/* BLK 2,1,0 bits -> bits 3,2,1 of kcode, FNUM MSB -> kcode LSB */
+			CH->kcode = (block_fnum&0x0f00)>>8;
+
+			CH->ksl_base = ksl_tabblock_fnum>>5;
+
+			block_fnum = block_fnum * 2;
+			block = (block_fnum&0x1c00) >> 10;
+			CH->fc = chip->fn_tabblock_fnum&0x03ff >> (7-block);
+
+			/* refresh Total Level in both SLOTs of this channel */
+			CH->SLOTSLOT1.TLL = CH->SLOTSLOT1.TL + (CH->ksl_base>>CH->SLOTSLOT1.ksl);
+			CH->SLOTSLOT2.TLL = CH->SLOTSLOT2.TL + (CH->ksl_base>>CH->SLOTSLOT2.ksl);
+
+			/* refresh frequency counter in both SLOTs of this channel */
+			CALC_FCSLOT(CH,&CH->SLOTSLOT1);
+			CALC_FCSLOT(CH,&CH->SLOTSLOT2);
+		}
+	}
+	break;
+
+	case 0x30:	/* inst 4 MSBs, VOL 4 LSBs */
+	{
+		UINT8 old_instvol;
+
+		chan = r&0x0f;
+
+		if (chan >= 9)
+			chan -= 9;	/* verified on real YM2413 */
+		if (chip->VRC7_Mode && chan >= 6)
+			break;
+
+		old_instvol = chip->instvol_rchan;
+		chip->instvol_rchan = v;	/* store for later use */
+
+		CH = &chip->P_CHchan;
+		SLOT = &CH->SLOTSLOT2; /* carrier */
+		SLOT->TL = ((v&0x0f)<<2)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
+		SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+
+
+		/*check whether we are in rhythm mode and handle instrument/volume register accordingly*/
+		if ((chan>=6) && (chip->rhythm&0x20))
+		{
+			/* we're in rhythm mode*/
+
+			if (chan>=7) /* only for channel 7 and 8 (channel 6 is handled in usual way)*/
+			{
+				SLOT = &CH->SLOTSLOT1; /* modulator envelope is HH(chan=7) or TOM(chan=8) */
+				SLOT->TL = ((chip->instvol_rchan>>4)<<2)<<(ENV_BITS-2-7); /* 7 bits TL (bit 6 = always 0) */
+				SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+			}
+		}
+		else
+		{
+			if ( (old_instvol&0xf0) == (v&0xf0) )
+				return;
+
+			inst = &chip->inst_tabchip->instvol_rchan>>40;
+			slot = chan*2;
+
+			load_instrument(chip, chan, slot, inst);
+
+		/*#if 0
+			logerror("YM2413: chan#%02i inst=%02i: (r=%2x, v=%2x)\n",chan,v>>4,r,v);
+			logerror(" 0:%2x 1:%2x\n",inst0,inst1);	logerror(" 2:%2x 3:%2x\n",inst2,inst3);
+			logerror(" 4:%2x 5:%2x\n",inst4,inst5);	logerror(" 6:%2x 7:%2x\n",inst6,inst7);
+		#endif*/
+		}
+	}
+	break;
+
+	default:
+	break;
+	}
+}
+
+/*static TIMER_CALLBACK( cymfile_callback )
+{
+	if (cymfile)
+	{
+		fputc( (unsigned char)8, cymfile );
+	}
+}*/
+
+/* lock/unlock for common table */
+//static int OPLL_LockTable(const device_config *device)
+static int OPLL_LockTable(void)
+{
+	num_lock++;
+	if(num_lock>1) return 0;
+
+	/* first time */
+
+	/* allocate total level table (128kb space) */
+	if( !init_tables() )
+	{
+		num_lock--;
+		return -1;
+	}
+
+	/*if (LOG_CYM_FILE)
+	{
+		cymfile = fopen("2413_.cym","wb");
+		if (cymfile)
+			timer_pulse ( device->machine, ATTOTIME_IN_HZ(110), NULL, 0, cymfile_callback); //110 Hz pulse timer
+		else
+			logerror("Could not create file 2413_.cym\n");
+	}*/
+
+	return 0;
+}
+
+static void OPLL_UnLockTable(void)
+{
+	if(num_lock) num_lock--;
+	if(num_lock) return;
+
+	/* last time */
+
+	OPLCloseTable();
+
+	/*if (cymfile)
+		fclose (cymfile);
+	cymfile = NULL;*/
+}
+
+static void OPLLResetChip(YM2413 *chip)
+{
+	int c,s;
+	int i;
+
+	chip->eg_timer = 0;
+	chip->eg_cnt = 0;
+
+	chip->noise_rng = 1;	/* noise shift register */
+
+
+	/* setup instruments table */
+	for (i=0; i<19; i++)
+	{
+		for (c=0; c<8; c++)
+		{
+			chip->inst_tabic = tableic;
+		}
+	}
+
+
+	/* reset with register write */
+	OPLLWriteReg(chip,0x0f,0); /*test reg*/
+	for(i = 0x3f ; i >= 0x10 ; i-- ) OPLLWriteReg(chip,i,0x00);
+
+	/* reset operator parameters */
+	for( c = 0 ; c < 9 ; c++ )
+	{
+		OPLL_CH *CH = &chip->P_CHc;
+		for(s = 0 ; s < 2 ; s++ )
+		{
+			/* wave table */
+			CH->SLOTs.wavetable = 0;
+			CH->SLOTs.state = EG_OFF;
+			CH->SLOTs.volume = MAX_ATT_INDEX;
+		}
+	}
+}
+
+/* Create one of virtual YM2413 */
+/* 'clock' is chip clock in Hz */
+/* 'rate' is sampling rate */
+//static YM2413 *OPLLCreate(const device_config *device, int clock, int rate)
+static YM2413 *OPLLCreate(int clock, int rate)
+{
+	char *ptr;
+	YM2413 *chip;
+	int state_size;
+
+	if (OPLL_LockTable() == -1) return NULL;
+
+	/* calculate chip state size */
+	state_size = sizeof(YM2413);
+
+	/* allocate memory block */
+	ptr = (char *)malloc(state_size);
+
+	if (ptr==NULL)
+		return NULL;
+
+	/* clear */
+	memset(ptr,0,state_size);
+
+	chip = (YM2413 *)ptr;
+
+	chip->clock = clock;
+	chip->rate = rate;
+
+	/* init global tables */
+	OPLL_initalize(chip);
+
+	/* reset chip */
+	OPLLResetChip(chip);
+	return chip;
+}
+
+/* Destroy one of virtual YM3812 */
+static void OPLLDestroy(YM2413 *chip)
+{
+	OPLL_UnLockTable();
+	free(chip);
+}
+
+/* Option handlers */
+
+static void OPLLSetUpdateHandler(YM2413 *chip,OPLL_UPDATEHANDLER UpdateHandler,void * param)
+{
+	chip->UpdateHandler = UpdateHandler;
+	chip->UpdateParam = param;
+}
+
+/* YM3812 I/O interface */
+static void OPLLWrite(YM2413 *chip,int a,int v)
+{
+	if( !(a&1) )
+	{	/* address port */
+		chip->address = v & 0xff;
+	}
+	else
+	{	/* data port */
+		if(chip->UpdateHandler) chip->UpdateHandler(chip->UpdateParam,0);
+		OPLLWriteReg(chip,chip->address,v);
+	}
+}
+
+static unsigned char OPLLRead(YM2413 *chip,int a)
+{
+	if( !(a&1) )
+	{
+		/* status port */
+		return chip->status;
+	}
+	return 0xff;
+}
+
+
+
+
+
+//void * ym2413_init(const device_config *device, int clock, int rate)
+void * ym2413_init(int clock, int rate)
+{
+	/* emulator create */
+	return OPLLCreate(clock, rate);
+}
+
+void ym2413_shutdown(void *chip)
+{
+	YM2413 *OPLL = (YM2413 *)chip;
+
+	/* emulator shutdown */
+	OPLLDestroy(OPLL);
+}
+
+void ym2413_reset_chip(void *chip)
+{
+	YM2413 *OPLL = (YM2413 *)chip;
+	OPLLResetChip(OPLL);
+}
+
+void ym2413_write(void *chip, int a, int v)
+{
+	YM2413 *OPLL = (YM2413 *)chip;
+	OPLLWrite(OPLL, a, v);
+}
+
+unsigned char ym2413_read(void *chip, int a)
+{
+	YM2413 *OPLL = (YM2413 *)chip;
+	return OPLLRead(OPLL, a) & 0x03 ;
+}
+
+void ym2413_set_update_handler(void *chip,OPLL_UPDATEHANDLER UpdateHandler,void *param)
+{
+	YM2413 *OPLL = (YM2413 *)chip;
+	OPLLSetUpdateHandler(OPLL, UpdateHandler, param);
+}
+
+
+/*
+** Generate samples for one of the YM2413's
+**
+** 'which' is the virtual YM2413 number
+** '*buffer' is the output buffer pointer
+** 'length' is the number of samples that should be generated
+*/
+void ym2413_update_one(void *_chip, SAMP **buffers, int length)
+{
+	YM2413		*chip = (YM2413 *)_chip;
+	UINT8		rhythm = chip->rhythm&0x20;
+	SAMP		*bufMO = buffers0;
+	SAMP		*bufRO = buffers1;
+
+	int i;
+
+	for( i=0; i < length ; i++ )
+	{
+		int mo,ro;
+
+		chip->output0 = 0;
+		chip->output1 = 0;
+
+		advance_lfo(chip);
+
+		/* FM part */
+		chan_calc(chip, &chip->P_CH0);
+//SAVE_SEPARATE_CHANNEL(0);
+		chan_calc(chip, &chip->P_CH1);
+		chan_calc(chip, &chip->P_CH2);
+		chan_calc(chip, &chip->P_CH3);
+		chan_calc(chip, &chip->P_CH4);
+		chan_calc(chip, &chip->P_CH5);
+
+		if (! chip->VRC7_Mode)
+		{
+			if(!rhythm)
+			{
+				chan_calc(chip, &chip->P_CH6);
+				chan_calc(chip, &chip->P_CH7);
+				chan_calc(chip, &chip->P_CH8);
+			}
+			else		/* Rhythm part */
+			{
+				rhythm_calc(chip, &chip->P_CH0, (chip->noise_rng>>0)&1 );
+			}
+		}
+
+		mo = chip->output0;
+		ro = chip->output1;
+
+		mo >>= FINAL_SH;
+		ro >>= FINAL_SH;
+
+		/* limit check */
+		//mo = limit( mo , MAXOUT, MINOUT );
+		//ro = limit( ro , MAXOUT, MINOUT );
+
+		#ifdef SAVE_SAMPLE
+		//if (which==0)
+		//{
+			SAVE_ALL_CHANNELS
+		//}
+		#endif
+
+		/* store to sound buffer */
+		bufMOi = mo + ro;
+		bufROi = mo + ro;
+
+		advance(chip);
+	}
+
+}
+
+void ym2413_set_mutemask(void* chip, UINT32 MuteMask)
+{
+	YM2413* OPLL = (YM2413*)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 9; CurChn ++)
+		OPLL->P_CHCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	for (CurChn = 0; CurChn < 5; CurChn ++)
+		OPLL->MuteSpcCurChn = (MuteMask >> (9 + CurChn)) & 0x01;
+	
+	return;
+}
+
+void ym2413_set_chip_mode(void* chip, UINT8 Mode)
+{
+	// Enable/Disable VRC7 Mode (with only 6 instead of 9 channels and no rhythm part)
+	YM2413* OPLL = (YM2413*)chip;
+	
+	OPLL->VRC7_Mode = Mode;
+	
+	return;
+}
+
+void ym2413_override_patches(void* chip, const UINT8* PatchDump)
+{
+	YM2413* OPLL = (YM2413*)chip;
+	UINT8 CurIns;
+	UINT8 CurReg;
+	
+	for (CurIns = 0; CurIns < 19; CurIns ++)
+	{
+		for (CurReg = 0; CurReg < 8; CurReg ++)
+		{
+			OPLL->inst_tabCurInsCurReg = PatchDumpCurIns * 8 + CurReg;
+		}
+	}
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2413.h Added

@@ -0,0 +1,43 @@
+#pragma once
+
+/* select output bits size of output : 8 or 16 */
+#define SAMPLE_BITS 16
+
+/* compiler dependence */
+//#ifndef __OSDCOMM_H__
+//#define __OSDCOMM_H__
+/*typedef unsigned char	UINT8;   // unsigned  8bit
+typedef unsigned short	UINT16;  // unsigned 16bit
+typedef unsigned int	UINT32;  // unsigned 32bit
+typedef signed char		INT8;    // signed  8bit
+typedef signed short	INT16;   // signed 16bit
+typedef signed int		INT32;   // signed 32bit   */
+//#endif
+
+//typedef INT32 stream_sample_t;
+typedef stream_sample_t SAMP;
+/*
+#if (SAMPLE_BITS==16)
+typedef INT16 SAMP;
+#endif
+#if (SAMPLE_BITS==8)
+typedef INT8 SAMP;
+#endif
+*/
+
+
+
+//void *ym2413_init(const device_config *device, int clock, int rate);
+void *ym2413_init(int clock, int rate);
+void ym2413_shutdown(void *chip);
+void ym2413_reset_chip(void *chip);
+void ym2413_write(void *chip, int a, int v);
+unsigned char ym2413_read(void *chip, int a);
+void ym2413_update_one(void *chip, SAMP **buffers, int length);
+
+typedef void (*OPLL_UPDATEHANDLER)(void *param,int min_interval_us);
+
+void ym2413_set_update_handler(void *chip, OPLL_UPDATEHANDLER UpdateHandler, void *param);
+void ym2413_set_mutemask(void* chip, UINT32 MuteMask);
+void ym2413_set_chip_mode(void* chip, UINT8 Mode);
+void ym2413_override_patches(void* chip, const UINT8* PatchDump);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.c Added

@@ -0,0 +1,2551 @@
+/***********************************************************/
+/* */
+/* YM2612.C : YM2612 emulator */
+/* */
+/* Almost constantes are taken from the MAME core */
+/* */
+/* This source is a part of Gens project */
+/* Written by Stéphane Dallongeville (gens@consolemul.com) */
+/* Copyright (c) 2002 by Stéphane Dallongeville */
+/* */
+/***********************************************************/
+
+/***********************************************************/
+/* */
+/* Modified by Maxim, Blargg */
+/* - removed non-sound-related functionality */
+/* - added high-pass PCM filter */
+/* - added per-channel muting control */
+/* - made it use a context struct to allow multiple */
+/* instances */
+/* */
+/***********************************************************/
+
+#include <stdlib.h> // for malloc
+#include <stdio.h>
+#include <math.h>
+#include <string.h> // for memset()
+#include "mamedef.h"	// for correct INLINE macro
+#include "ym2612.h"
+
+
+/********************************************
+ * Partie définition *
+ ********************************************/
+
+#define YM_DEBUG_LEVEL 0
+
+#ifndef PI
+#define PI 3.14159265358979323846
+#endif
+
+#define ATTACK 0
+#define DECAY 1
+#define SUBSTAIN 2
+#define RELEASE 3
+
+// SIN_LBITS <= 16
+// LFO_HBITS <= 16
+// (SIN_LBITS + SIN_HBITS) <= 26
+// (ENV_LBITS + ENV_HBITS) <= 28
+// (LFO_LBITS + LFO_HBITS) <= 28
+
+#define SIN_HBITS 12 // Sinus phase counter int part
+#define SIN_LBITS (26 - SIN_HBITS) // Sinus phase counter float part (best setting)
+
+#if(SIN_LBITS > 16)
+#define SIN_LBITS 16 // Can't be greater than 16 bits
+#endif
+
+#define ENV_HBITS 12 // Env phase counter int part
+#define ENV_LBITS (28 - ENV_HBITS) // Env phase counter float part (best setting)
+
+#define LFO_HBITS 10 // LFO phase counter int part
+#define LFO_LBITS (28 - LFO_HBITS) // LFO phase counter float part (best setting)
+
+#define SIN_LENGHT (1 << SIN_HBITS)
+#define ENV_LENGHT (1 << ENV_HBITS)
+#define LFO_LENGHT (1 << LFO_HBITS)
+
+#define TL_LENGHT (ENV_LENGHT * 3) // Env + TL scaling + LFO
+
+#define SIN_MASK (SIN_LENGHT - 1)
+#define ENV_MASK (ENV_LENGHT - 1)
+#define LFO_MASK (LFO_LENGHT - 1)
+
+#define ENV_STEP (96.0 / ENV_LENGHT) // ENV_MAX = 96 dB
+
+#define ENV_ATTACK ((ENV_LENGHT * 0) << ENV_LBITS)
+#define ENV_DECAY ((ENV_LENGHT * 1) << ENV_LBITS)
+#define ENV_END ((ENV_LENGHT * 2) << ENV_LBITS)
+
+#define MAX_OUT_BITS (SIN_HBITS + SIN_LBITS + 2) // Modulation = -4 <--> +4
+#define MAX_OUT ((1 << MAX_OUT_BITS) - 1)
+
+//Just for tests stuff...
+//
+//#define COEF_MOD 0.5
+//#define MAX_OUT ((int) (((1 << MAX_OUT_BITS) - 1) * COEF_MOD))
+
+#define OUT_BITS (OUTPUT_BITS - 2)
+#define OUT_SHIFT (MAX_OUT_BITS - OUT_BITS)
+#define LIMIT_CH_OUT ((int) (((1 << OUT_BITS) * 1.5) - 1))
+
+#define PG_CUT_OFF ((int) (78.0 / ENV_STEP))
+#define ENV_CUT_OFF ((int) (68.0 / ENV_STEP))
+
+#define AR_RATE 399128
+#define DR_RATE 5514396
+
+//#define AR_RATE 426136			// good rate ?
+//#define DR_RATE (AR_RATE * 12)
+
+#define LFO_FMS_LBITS 9 // FIXED (LFO_FMS_BASE gives somethink as 1)
+#define LFO_FMS_BASE ((int) (0.05946309436 * 0.0338 * (double) (1 << LFO_FMS_LBITS)))
+
+#define S0 0 // Stupid typo of the YM2612
+#define S1 2
+#define S2 1
+#define S3 3
+
+
+/********************************************
+ * Partie variables *
+ ********************************************/
+
+
+//struct ym2612__ YM2612;
+
+int *SIN_TABSIN_LENGHT; // SINUS TABLE (pointer on TL TABLE)
+int TL_TABTL_LENGHT * 2; // TOTAL LEVEL TABLE (positif and minus)
+unsigned int ENV_TAB2 * ENV_LENGHT + 8; // ENV CURVE TABLE (attack & decay)
+
+//unsigned int ATTACK_TO_DECAYENV_LENGHT; // Conversion from attack to decay phase
+unsigned int DECAY_TO_ATTACKENV_LENGHT; // Conversion from decay to attack phase
+
+unsigned int FINC_TAB2048; // Frequency step table
+
+unsigned int AR_TAB128; // Attack rate table
+unsigned int DR_TAB96; // Decay rate table
+unsigned int DT_TAB832; // Detune table
+unsigned int SL_TAB16; // Substain level table
+unsigned int NULL_RATE32; // Table for NULL rate
+
+int LFO_ENV_TABLFO_LENGHT; // LFO AMS TABLE (adjusted for 11.8 dB)
+int LFO_FREQ_TABLFO_LENGHT; // LFO FMS TABLE
+
+// int INTER_TABMAX_UPDATE_LENGHT; // Interpolation table
+
+int LFO_INC_TAB8; // LFO step table
+
+void (* const UPDATE_CHAN8 * 8)(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght) = // Update Channel functions pointer table
+{
+ Update_Chan_Algo0,
+ Update_Chan_Algo1,
+ Update_Chan_Algo2,
+ Update_Chan_Algo3,
+ Update_Chan_Algo4,
+ Update_Chan_Algo5,
+ Update_Chan_Algo6,
+ Update_Chan_Algo7,
+
+ Update_Chan_Algo0_LFO,
+ Update_Chan_Algo1_LFO,
+ Update_Chan_Algo2_LFO,
+ Update_Chan_Algo3_LFO,
+ Update_Chan_Algo4_LFO,
+ Update_Chan_Algo5_LFO,
+ Update_Chan_Algo6_LFO,
+ Update_Chan_Algo7_LFO,
+
+ Update_Chan_Algo0_Int,
+ Update_Chan_Algo1_Int,
+ Update_Chan_Algo2_Int,
+ Update_Chan_Algo3_Int,
+ Update_Chan_Algo4_Int,
+ Update_Chan_Algo5_Int,
+ Update_Chan_Algo6_Int,
+ Update_Chan_Algo7_Int,
+
+ Update_Chan_Algo0_LFO_Int,
+ Update_Chan_Algo1_LFO_Int,
+ Update_Chan_Algo2_LFO_Int,
+ Update_Chan_Algo3_LFO_Int,
+ Update_Chan_Algo4_LFO_Int,
+ Update_Chan_Algo5_LFO_Int,
+ Update_Chan_Algo6_LFO_Int,
+ Update_Chan_Algo7_LFO_Int
+};
+
+void (* const ENV_NEXT_EVENT8)(slot_ *SL) = // Next Enveloppe phase functions pointer table
+{
+ Env_Attack_Next,
+ Env_Decay_Next,
+ Env_Substain_Next,
+ Env_Release_Next,
+ Env_NULL_Next,
+ Env_NULL_Next,
+ Env_NULL_Next,
+ Env_NULL_Next
+};
+
+const unsigned int DT_DEF_TAB4 * 32 =
+{
+// FD = 0
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+// FD = 1
+ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2,
+ 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 8, 8, 8, 8,
+
+// FD = 2
+ 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5,
+ 5, 6, 6, 7, 8, 8, 9, 10, 11, 12, 13, 14, 16, 16, 16, 16,
+
+// FD = 3
+ 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7,
+ 8 , 8, 9, 10, 11, 12, 13, 14, 16, 17, 19, 20, 22, 22, 22, 22
+};
+
+const unsigned int FKEY_TAB16 =
+{
+ 0, 0, 0, 0,
+ 0, 0, 0, 1,
+ 2, 3, 3, 3,
+ 3, 3, 3, 3
+};
+
+const unsigned int LFO_AMS_TAB4 =
+{
+ 31, 4, 1, 0
+};
+
+const unsigned int LFO_FMS_TAB8 =
+{
+ LFO_FMS_BASE * 0, LFO_FMS_BASE * 1,
+ LFO_FMS_BASE * 2, LFO_FMS_BASE * 3,
+ LFO_FMS_BASE * 4, LFO_FMS_BASE * 6,
+ LFO_FMS_BASE * 12, LFO_FMS_BASE * 24
+};
+
+int int_cnt; // Interpolation calculation
+
+
+#if YM_DEBUG_LEVEL > 0 // Debug
+FILE *debug_file = NULL;
+#endif
+
+
+/* Gens */
+
+//extern unsigned int Sound_Extrapol3122;
+//extern int Seg_L882, Seg_R882;
+//extern int VDP_Current_Line;
+//extern int GYM_Dumping;
+//extern int YM2612_Enable;
+//extern int DAC_Enable=1;
+
+//int Update_GYM_Dump(char v0, char v1, char v2);
+
+int YM2612_Enable;
+int YM2612_Improv;
+//int DAC_Enable = 1;
+int *YM_Buf2;
+int YM_Len = 0;
+int YM2612_Enable_SSGEG = 1; // enable SSG-EG envelope (causes inacurate sound sometimes - rodrigo)
+int DAC_Highpass_Enable = 1; // sometimes it creates a terrible noise
+
+/* end */
+
+
+/***********************************************
+ * fonctions calcul param *
+ ***********************************************/
+
+
+INLINE void CALC_FINC_SL(slot_ *SL, int finc, int kc)
+{
+ int ksr;
+
+ SL->Finc = (finc + SL->DTkc) * SL->MUL;
+
+ ksr = kc >> SL->KSR_S; // keycode atténuation
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "FINC = %d SL->Finc = %d\n", finc, SL->Finc);
+#endif
+
+	if (SL->KSR != ksr)		// si le KSR a changé alors
+	{						// les différents taux pour l'enveloppe sont mis à jour
+ SL->KSR = ksr;
+
+ SL->EincA = SL->ARksr;
+ SL->EincD = SL->DRksr;
+ SL->EincS = SL->SRksr;
+ SL->EincR = SL->RRksr;
+
+ if(SL->Ecurp == ATTACK) SL->Einc = SL->EincA;
+ else if(SL->Ecurp == DECAY) SL->Einc = SL->EincD;
+ else if(SL->Ecnt < ENV_END)
+ {
+ if(SL->Ecurp == SUBSTAIN) SL->Einc = SL->EincS;
+ else if(SL->Ecurp == RELEASE) SL->Einc = SL->EincR;
+ }
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "KSR = %.4X EincA = %.8X EincD = %.8X EincS = %.8X EincR = %.8X\n", ksr, SL->EincA, SL->EincD, SL->EincS, SL->EincR);
+#endif
+ }
+}
+
+
+INLINE void CALC_FINC_CH(channel_ *CH)
+{
+ int finc, kc;
+
+ finc = FINC_TABCH->FNUM0 >> (7 - CH->FOCT0);
+ kc = CH->KC0;
+
+ CALC_FINC_SL(&CH->SLOT0, finc, kc);
+ CALC_FINC_SL(&CH->SLOT1, finc, kc);
+ CALC_FINC_SL(&CH->SLOT2, finc, kc);
+ CALC_FINC_SL(&CH->SLOT3, finc, kc);
+}
+
+
+
+/***********************************************
+ * fonctions setting *
+ ***********************************************/
+
+
+INLINE void KEY_ON(channel_ *CH, int nsl)
+{
+ slot_ *SL = &(CH->SLOTnsl); // on recupère le bon pointeur de slot
+
+ if(SL->Ecurp == RELEASE) // la touche est-elle relâchée ?
+ {
+ SL->Fcnt = 0;
+
+ // Fix Ecco 2 splash sound
+
+ SL->Ecnt = (DECAY_TO_ATTACKENV_TABSL->Ecnt >> ENV_LBITS + ENV_ATTACK) & SL->ChgEnM;
+ SL->ChgEnM = 0xFFFFFFFF;
+
+// SL->Ecnt = DECAY_TO_ATTACKENV_TABSL->Ecnt >> ENV_LBITS + ENV_ATTACK;
+// SL->Ecnt = 0;
+
+ SL->Einc = SL->EincA;
+ SL->Ecmp = ENV_DECAY;
+ SL->Ecurp = ATTACK;
+ }
+}
+
+
+INLINE void KEY_OFF(channel_ *CH, int nsl)
+{
+ slot_ *SL = &(CH->SLOTnsl); // on recupère le bon pointeur de slot
+
+ if(SL->Ecurp != RELEASE) // la touche est-elle appuyée ?
+ {
+ if(SL->Ecnt < ENV_DECAY) // attack phase ?
+ {
+ SL->Ecnt = (ENV_TABSL->Ecnt >> ENV_LBITS << ENV_LBITS) + ENV_DECAY;
+ }
+
+ SL->Einc = SL->EincR;
+ SL->Ecmp = ENV_END;
+ SL->Ecurp = RELEASE;
+ }
+}
+
+
+INLINE void CSM_Key_Control(ym2612_ *YM2612)
+{
+ KEY_ON(&YM2612->CHANNEL2, 0);
+ KEY_ON(&YM2612->CHANNEL2, 1);
+ KEY_ON(&YM2612->CHANNEL2, 2);
+ KEY_ON(&YM2612->CHANNEL2, 3);
+}
+
+
+int SLOT_SET(ym2612_ *YM2612, int Adr, unsigned char data)
+{
+ channel_ *CH;
+ slot_ *SL;
+ int nch, nsl;
+
+ if((nch = Adr & 3) == 3) return 1;
+ nsl = (Adr >> 2) & 3;
+
+ if(Adr & 0x100) nch += 3;
+
+ CH = &(YM2612->CHANNELnch);
+ SL = &(CH->SLOTnsl);
+
+ switch(Adr & 0xF0)
+ {
+ case 0x30:
+ if((SL->MUL = (data & 0x0F))) SL->MUL <<= 1;
+ else SL->MUL = 1;
+
+ SL->DT = (int*) DT_TAB(data >> 4) & 7;
+
+ CH->SLOT0.Finc = -1;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL%d, SLOT%d DTMUL = %.2X\n", nch, nsl, data & 0x7F);
+#endif
+ break;
+
+ case 0x40:
+ SL->TL = data & 0x7F;
+
+ // SOR2 do a lot of TL adjustement and this fix R.Shinobi jump sound...
+ YM2612_Special_Update(YM2612);
+
+#if((ENV_HBITS - 7) < 0)
+ SL->TLL = SL->TL >> (7 - ENV_HBITS);
+#else
+ SL->TLL = SL->TL << (ENV_HBITS - 7);
+#endif
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL%d, SLOT%d TL = %.2X\n", nch, nsl, SL->TL);
+#endif
+ break;
+
+ case 0x50:
+ SL->KSR_S = 3 - (data >> 6);
+
+ CH->SLOT0.Finc = -1;
+
+ if(data &= 0x1F) SL->AR = (int*) &AR_TABdata << 1;
+ else SL->AR = (int*) &NULL_RATE0;
+
+ SL->EincA = SL->ARSL->KSR;
+ if(SL->Ecurp == ATTACK) SL->Einc = SL->EincA;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL%d, SLOT%d AR = %.2X EincA = %.6X\n", nch, nsl, data, SL->EincA);
+#endif
+ break;
+
+ case 0x60:
+ if((SL->AMSon = (data & 0x80))) SL->AMS = CH->AMS;
+ else SL->AMS = 31;
+
+ if((data &= 0x1F)) SL->DR = (int*) &DR_TABdata << 1;
+ else SL->DR = (int*) &NULL_RATE0;
+
+ SL->EincD = SL->DRSL->KSR;
+ if(SL->Ecurp == DECAY) SL->Einc = SL->EincD;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL%d, SLOT%d AMS = %d DR = %.2X EincD = %.6X\n", nch, nsl, SL->AMSon, data, SL->EincD);
+#endif
+ break;
+
+ case 0x70:
+ if((data &= 0x1F)) SL->SR = (int*) &DR_TABdata << 1;
+ else SL->SR = (int*) &NULL_RATE0;
+
+ SL->EincS = SL->SRSL->KSR;
+ if((SL->Ecurp == SUBSTAIN) && (SL->Ecnt < ENV_END)) SL->Einc = SL->EincS;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL%d, SLOT%d SR = %.2X EincS = %.6X\n", nch, nsl, data, SL->EincS);
+#endif
+ break;
+
+ case 0x80:
+ SL->SLL = SL_TABdata >> 4;
+
+ SL->RR = (int*) &DR_TAB((data & 0xF) << 2) + 2;
+
+ SL->EincR = SL->RRSL->KSR;
+ if((SL->Ecurp == RELEASE) && (SL->Ecnt < ENV_END)) SL->Einc = SL->EincR;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL%d, SLOT%d SL = %.8X\n", nch, nsl, SL->SLL);
+ fprintf(debug_file, "CHANNEL%d, SLOT%d RR = %.2X EincR = %.2X\n", nch, nsl, ((data & 0xF) << 1) | 2, SL->EincR);
+#endif
+ break;
+
+ case 0x90:
+ // SSG-EG envelope shapes :
+ //
+ // E At Al H
+ //
+ // 1 0 0 0 \\\\
+ //
+ // 1 0 0 1 \___
+ //
+ // 1 0 1 0 \/\/
+ // ___
+ // 1 0 1 1 \
+ //
+ // 1 1 0 0 ////
+ // ___
+ // 1 1 0 1 /
+ //
+ // 1 1 1 0 /\/\
+ //
+ // 1 1 1 1 /___
+ //
+ // E = SSG-EG enable
+ // At = Start negate
+ // Al = Altern
+ // H = Hold
+ if(YM2612_Enable_SSGEG)
+ {
+ if(data & 0x08) SL->SEG = data & 0x0F;
+ else SL->SEG = 0;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL%d, SLOT%d SSG-EG = %.2X\n", nch, nsl, data);
+#endif
+ }
+ break;
+ }
+
+ return 0;
+}
+
+
+int CHANNEL_SET(ym2612_ *YM2612, int Adr, unsigned char data)
+{
+ channel_ *CH;
+ int num;
+
+ if((num = Adr & 3) == 3) return 1;
+
+ switch(Adr & 0xFC)
+ {
+ case 0xA0:
+ if(Adr & 0x100) num += 3;
+ CH = &(YM2612->CHANNELnum);
+
+ YM2612_Special_Update(YM2612);
+
+ CH->FNUM0 = (CH->FNUM0 & 0x700) + data;
+ CH->KC0 = (CH->FOCT0 << 2) | FKEY_TABCH->FNUM0 >> 7;
+
+ CH->SLOT0.Finc = -1;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL%d part1 FNUM = %d KC = %d\n", num, CH->FNUM0, CH->KC0);
+#endif
+ break;
+
+ case 0xA4:
+ if(Adr & 0x100) num += 3;
+ CH = &(YM2612->CHANNELnum);
+
+ YM2612_Special_Update(YM2612);
+
+ CH->FNUM0 = (CH->FNUM0 & 0x0FF) + ((int) (data & 0x07) << 8);
+ CH->FOCT0 = (data & 0x38) >> 3;
+ CH->KC0 = (CH->FOCT0 << 2) | FKEY_TABCH->FNUM0 >> 7;
+
+ CH->SLOT0.Finc = -1;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL%d part2 FNUM = %d FOCT = %d KC = %d\n", num, CH->FNUM0, CH->FOCT0, CH->KC0);
+#endif
+ break;
+
+ case 0xA8:
+ if(Adr < 0x100)
+ {
+ num++;
+
+ YM2612_Special_Update(YM2612);
+
+ YM2612->CHANNEL2.FNUMnum = (YM2612->CHANNEL2.FNUMnum & 0x700) + data;
+ YM2612->CHANNEL2.KCnum = (YM2612->CHANNEL2.FOCTnum << 2) | FKEY_TABYM2612->CHANNEL2.FNUMnum >> 7;
+
+ YM2612->CHANNEL2.SLOT0.Finc = -1;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL2 part1 FNUM%d = %d KC%d = %d\n", num, YM2612->CHANNEL2.FNUMnum, num, YM2612->CHANNEL2.KCnum);
+#endif
+ }
+ break;
+
+ case 0xAC:
+ if(Adr < 0x100)
+ {
+ num++;
+
+ YM2612_Special_Update(YM2612);
+
+ YM2612->CHANNEL2.FNUMnum = (YM2612->CHANNEL2.FNUMnum & 0x0FF) + ((int) (data & 0x07) << 8);
+ YM2612->CHANNEL2.FOCTnum = (data & 0x38) >> 3;
+ YM2612->CHANNEL2.KCnum = (YM2612->CHANNEL2.FOCTnum << 2) | FKEY_TABYM2612->CHANNEL2.FNUMnum >> 7;
+
+ YM2612->CHANNEL2.SLOT0.Finc = -1;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL2 part2 FNUM%d = %d FOCT%d = %d KC%d = %d\n", num, YM2612->CHANNEL2.FNUMnum, num, YM2612->CHANNEL2.FOCTnum, num, YM2612->CHANNEL2.KCnum);
+#endif
+ }
+ break;
+
+ case 0xB0:
+ if(Adr & 0x100) num += 3;
+ CH = &(YM2612->CHANNELnum);
+
+ if(CH->ALGO != (data & 7))
+ {
+ // Fix VectorMan 2 heli sound (level 1)
+ YM2612_Special_Update(YM2612);
+
+ CH->ALGO = data & 7;
+
+ CH->SLOT0.ChgEnM = 0;
+ CH->SLOT1.ChgEnM = 0;
+ CH->SLOT2.ChgEnM = 0;
+ CH->SLOT3.ChgEnM = 0;
+ }
+
+ CH->FB = 9 - ((data >> 3) & 7); // Real thing ?
+
+// if(CH->FB = ((data >> 3) & 7)) CH->FB = 9 - CH->FB; // Thunder force 4 (music stage 8), Gynoug, Aladdin bug sound...
+// else CH->FB = 31;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "CHANNEL%d ALGO = %d FB = %d\n", num, CH->ALGO, CH->FB);
+#endif
+ break;
+
+ case 0xB4:
+ if(Adr & 0x100) num += 3;
+ CH = &(YM2612->CHANNELnum);
+
+ YM2612_Special_Update(YM2612);
+
+ if(data & 0x80) CH->LEFT = 0xFFFFFFFF;
+ else CH->LEFT = 0;
+
+ if(data & 0x40) CH->RIGHT = 0xFFFFFFFF;
+ else CH->RIGHT = 0;
+
+ CH->AMS = LFO_AMS_TAB(data >> 4) & 3;
+ CH->FMS = LFO_FMS_TABdata & 7;
+
+ if(CH->SLOT0.AMSon) CH->SLOT0.AMS = CH->AMS;
+ else CH->SLOT0.AMS = 31;
+ if(CH->SLOT1.AMSon) CH->SLOT1.AMS = CH->AMS;
+ else CH->SLOT1.AMS = 31;
+ if(CH->SLOT2.AMSon) CH->SLOT2.AMS = CH->AMS;
+ else CH->SLOT2.AMS = 31;
+ if(CH->SLOT3.AMSon) CH->SLOT3.AMS = CH->AMS;
+ else CH->SLOT3.AMS = 31;
+
+#if YM_DEBUG_LEVEL > 0
+ fprintf(debug_file, "CHANNEL%d AMS = %d FMS = %d\n", num, CH->AMS, CH->FMS);
+#endif
+ break;
+ }
+
+ return 0;
+}
+
+
+int YM_SET(ym2612_ *YM2612, int Adr, unsigned char data)
+{
+ channel_ *CH;
+ int nch;
+
+ switch(Adr)
+ {
+ case 0x22:
+ if(data & 8)
+ {
+ // Cool Spot music 1, LFO modified severals time which
+ // distord the sound, have to check that on a real genesis...
+
+ YM2612->LFOinc = LFO_INC_TABdata & 7;
+
+#if YM_DEBUG_LEVEL > 0
+ fprintf(debug_file, "\nLFO Enable, LFOinc = %.8X %d\n", YM2612->LFOinc, data & 7);
+#endif
+ }
+ else
+ {
+ YM2612->LFOinc = YM2612->LFOcnt = 0;
+
+#if YM_DEBUG_LEVEL > 0
+ fprintf(debug_file, "\nLFO Disable\n");
+#endif
+ }
+ break;
+
+ case 0x24:
+ YM2612->TimerA = (YM2612->TimerA & 0x003) | (((int) data) << 2);
+
+ if(YM2612->TimerAL != (1024 - YM2612->TimerA) << 12)
+ {
+ YM2612->TimerAcnt = YM2612->TimerAL = (1024 - YM2612->TimerA) << 12;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "Timer A Set = %.8X\n", YM2612->TimerAcnt);
+#endif
+ }
+ break;
+
+ case 0x25:
+ YM2612->TimerA = (YM2612->TimerA & 0x3fc) | (data & 3);
+
+ if(YM2612->TimerAL != (1024 - YM2612->TimerA) << 12)
+ {
+ YM2612->TimerAcnt = YM2612->TimerAL = (1024 - YM2612->TimerA) << 12;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "Timer A Set = %.8X\n", YM2612->TimerAcnt);
+#endif
+ }
+ break;
+
+ case 0x26:
+ YM2612->TimerB = data;
+
+ if(YM2612->TimerBL != (256 - YM2612->TimerB) << (4 + 12))
+ {
+ YM2612->TimerBcnt = YM2612->TimerBL = (256 - YM2612->TimerB) << (4 + 12);
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "Timer B Set = %.8X\n", YM2612->TimerBcnt);
+#endif
+ }
+ break;
+
+ case 0x27:
+ // Paramètre divers
+ // b7 = CSM MODE
+ // b6 = 3 slot mode
+ // b5 = reset b
+ // b4 = reset a
+ // b3 = timer enable b
+ // b2 = timer enable a
+ // b1 = load b
+ // b0 = load a
+
+ if((data ^ YM2612->Mode) & 0x40)
+ {
+ // We changed the channel 2 mode, so recalculate phase step
+ // This fix the punch sound in Street of Rage 2
+
+ YM2612_Special_Update(YM2612);
+
+ YM2612->CHANNEL2.SLOT0.Finc = -1; // recalculate phase step
+ }
+
+// if((data & 2) && (YM2612->Status & 2)) YM2612->TimerBcnt = YM2612->TimerBL;
+// if((data & 1) && (YM2612->Status & 1)) YM2612->TimerAcnt = YM2612->TimerAL;
+
+// YM2612->Status &= (~data >> 4); // Reset du Status au cas ou c'est demand?
+ YM2612->Status &= (~data >> 4) & (data >> 2); // Reset Status
+
+ YM2612->Mode = data;
+
+#if YM_DEBUG_LEVEL > 0
+ fprintf(debug_file, "Mode reg = %.2X\n", data);
+#endif
+ break;
+
+ case 0x28:
+ if((nch = data & 3) == 3) return 1;
+
+ if(data & 4) nch += 3;
+ CH = &(YM2612->CHANNELnch);
+
+ YM2612_Special_Update(YM2612);
+
+ if(data & 0x10) KEY_ON(CH, S0); // On appuie sur la touche pour le slot 1
+ else KEY_OFF(CH, S0); // On relâche la touche pour le slot 1
+ if(data & 0x20) KEY_ON(CH, S1); // On appuie sur la touche pour le slot 3
+ else KEY_OFF(CH, S1); // On relâche la touche pour le slot 3
+ if(data & 0x40) KEY_ON(CH, S2); // On appuie sur la touche pour le slot 2
+ else KEY_OFF(CH, S2); // On relâche la touche pour le slot 2
+ if(data & 0x80) KEY_ON(CH, S3); // On appuie sur la touche pour le slot 4
+ else KEY_OFF(CH, S3); // On relâche la touche pour le slot 4
+
+#if YM_DEBUG_LEVEL > 0
+ fprintf(debug_file, "CHANNEL%d KEY %.1X\n", nch, ((data & 0xf0) >> 4));
+#endif
+ break;
+
+ case 0x2A:
+ YM2612->DACdata = ((int) data - 0x80) << DAC_SHIFT; // donnée du DAC
+ break;
+
+ case 0x2B:
+ if(YM2612->DAC ^ (data & 0x80)) YM2612_Special_Update(YM2612);
+
+ YM2612->DAC = data & 0x80; // activation/désactivation du DAC
+ break;
+ }
+
+ return 0;
+}
+
+
+
+/***********************************************
+ * fonctions de génération *
+ ***********************************************/
+
+
+void Env_NULL_Next(slot_ *SL)
+{
+}
+
+
+void Env_Attack_Next(slot_ *SL)
+{
+ // Verified with Gynoug even in HQ (explode SFX)
+ SL->Ecnt = ENV_DECAY;
+
+ SL->Einc = SL->EincD;
+ SL->Ecmp = SL->SLL;
+ SL->Ecurp = DECAY;
+}
+
+
+void Env_Decay_Next(slot_ *SL)
+{
+ // Verified with Gynoug even in HQ (explode SFX)
+ SL->Ecnt = SL->SLL;
+
+ SL->Einc = SL->EincS;
+ SL->Ecmp = ENV_END;
+ SL->Ecurp = SUBSTAIN;
+}
+
+
+void Env_Substain_Next(slot_ *SL)
+{
+ if(YM2612_Enable_SSGEG)
+ {
+ if(SL->SEG & 8) // SSG envelope type
+ {
+ if(SL->SEG & 1)
+ {
+ SL->Ecnt = ENV_END;
+ SL->Einc = 0;
+ SL->Ecmp = ENV_END + 1;
+ }
+ else
+ {
+ // re KEY ON
+
+ // SL->Fcnt = 0;
+ // SL->ChgEnM = 0xFFFFFFFF;
+
+ SL->Ecnt = 0;
+ SL->Einc = SL->EincA;
+ SL->Ecmp = ENV_DECAY;
+ SL->Ecurp = ATTACK;
+ }
+
+ SL->SEG ^= (SL->SEG & 2) << 1;
+ }
+ else
+ {
+ SL->Ecnt = ENV_END;
+ SL->Einc = 0;
+ SL->Ecmp = ENV_END + 1;
+ }
+ }
+ else
+ {
+ SL->Ecnt = ENV_END;
+ SL->Einc = 0;
+ SL->Ecmp = ENV_END + 1;
+ }
+}
+
+
+void Env_Release_Next(slot_ *SL)
+{
+ SL->Ecnt = ENV_END;
+ SL->Einc = 0;
+ SL->Ecmp = ENV_END + 1;
+}
+
+
+#define GET_CURRENT_PHASE \
+YM2612->in0 = CH->SLOTS0.Fcnt; \
+YM2612->in1 = CH->SLOTS1.Fcnt; \
+YM2612->in2 = CH->SLOTS2.Fcnt; \
+YM2612->in3 = CH->SLOTS3.Fcnt;
+
+
+#define UPDATE_PHASE \
+CH->SLOTS0.Fcnt += CH->SLOTS0.Finc; \
+CH->SLOTS1.Fcnt += CH->SLOTS1.Finc; \
+CH->SLOTS2.Fcnt += CH->SLOTS2.Finc; \
+CH->SLOTS3.Fcnt += CH->SLOTS3.Finc;
+
+
+#define UPDATE_PHASE_LFO \
+if((freq_LFO = (CH->FMS * YM2612->LFO_FREQ_UPi) >> (LFO_HBITS - 1))) \
+{ \
+ CH->SLOTS0.Fcnt += CH->SLOTS0.Finc + ((CH->SLOTS0.Finc * freq_LFO) >> LFO_FMS_LBITS); \
+ CH->SLOTS1.Fcnt += CH->SLOTS1.Finc + ((CH->SLOTS1.Finc * freq_LFO) >> LFO_FMS_LBITS); \
+ CH->SLOTS2.Fcnt += CH->SLOTS2.Finc + ((CH->SLOTS2.Finc * freq_LFO) >> LFO_FMS_LBITS); \
+ CH->SLOTS3.Fcnt += CH->SLOTS3.Finc + ((CH->SLOTS3.Finc * freq_LFO) >> LFO_FMS_LBITS); \
+} \
+else \
+{ \
+ CH->SLOTS0.Fcnt += CH->SLOTS0.Finc; \
+ CH->SLOTS1.Fcnt += CH->SLOTS1.Finc; \
+ CH->SLOTS2.Fcnt += CH->SLOTS2.Finc; \
+ CH->SLOTS3.Fcnt += CH->SLOTS3.Finc; \
+}
+
+
+#define GET_CURRENT_ENV \
+if(CH->SLOTS0.SEG & 4) \
+{ \
+ if((YM2612->en0 = ENV_TAB(CH->SLOTS0.Ecnt >> ENV_LBITS) + CH->SLOTS0.TLL) > ENV_MASK) YM2612->en0 = 0; \
+ else YM2612->en0 ^= ENV_MASK; \
+} \
+else YM2612->en0 = ENV_TAB(CH->SLOTS0.Ecnt >> ENV_LBITS) + CH->SLOTS0.TLL; \
+if(CH->SLOTS1.SEG & 4) \
+{ \
+ if((YM2612->en1 = ENV_TAB(CH->SLOTS1.Ecnt >> ENV_LBITS) + CH->SLOTS1.TLL) > ENV_MASK) YM2612->en1 = 0; \
+ else YM2612->en1 ^= ENV_MASK; \
+} \
+else YM2612->en1 = ENV_TAB(CH->SLOTS1.Ecnt >> ENV_LBITS) + CH->SLOTS1.TLL; \
+if(CH->SLOTS2.SEG & 4) \
+{ \
+ if((YM2612->en2 = ENV_TAB(CH->SLOTS2.Ecnt >> ENV_LBITS) + CH->SLOTS2.TLL) > ENV_MASK) YM2612->en2 = 0; \
+ else YM2612->en2 ^= ENV_MASK; \
+} \
+else YM2612->en2 = ENV_TAB(CH->SLOTS2.Ecnt >> ENV_LBITS) + CH->SLOTS2.TLL; \
+if(CH->SLOTS3.SEG & 4) \
+{ \
+ if((YM2612->en3 = ENV_TAB(CH->SLOTS3.Ecnt >> ENV_LBITS) + CH->SLOTS3.TLL) > ENV_MASK) YM2612->en3 = 0; \
+ else YM2612->en3 ^= ENV_MASK; \
+} \
+else YM2612->en3 = ENV_TAB(CH->SLOTS3.Ecnt >> ENV_LBITS) + CH->SLOTS3.TLL;
+
+
+#define GET_CURRENT_ENV_LFO \
+env_LFO = YM2612->LFO_ENV_UPi; \
+ \
+if(CH->SLOTS0.SEG & 4) \
+{ \
+ if((YM2612->en0 = ENV_TAB(CH->SLOTS0.Ecnt >> ENV_LBITS) + CH->SLOTS0.TLL) > ENV_MASK) YM2612->en0 = 0; \
+ else YM2612->en0 = (YM2612->en0 ^ ENV_MASK) + (env_LFO >> CH->SLOTS0.AMS); \
+} \
+else YM2612->en0 = ENV_TAB(CH->SLOTS0.Ecnt >> ENV_LBITS) + CH->SLOTS0.TLL + (env_LFO >> CH->SLOTS0.AMS); \
+if(CH->SLOTS1.SEG & 4) \
+{ \
+ if((YM2612->en1 = ENV_TAB(CH->SLOTS1.Ecnt >> ENV_LBITS) + CH->SLOTS1.TLL) > ENV_MASK) YM2612->en1 = 0; \
+ else YM2612->en1 = (YM2612->en1 ^ ENV_MASK) + (env_LFO >> CH->SLOTS1.AMS); \
+} \
+else YM2612->en1 = ENV_TAB(CH->SLOTS1.Ecnt >> ENV_LBITS) + CH->SLOTS1.TLL + (env_LFO >> CH->SLOTS1.AMS); \
+if(CH->SLOTS2.SEG & 4) \
+{ \
+ if((YM2612->en2 = ENV_TAB(CH->SLOTS2.Ecnt >> ENV_LBITS) + CH->SLOTS2.TLL) > ENV_MASK) YM2612->en2 = 0; \
+ else YM2612->en2 = (YM2612->en2 ^ ENV_MASK) + (env_LFO >> CH->SLOTS2.AMS); \
+} \
+else YM2612->en2 = ENV_TAB(CH->SLOTS2.Ecnt >> ENV_LBITS) + CH->SLOTS2.TLL + (env_LFO >> CH->SLOTS2.AMS); \
+if(CH->SLOTS3.SEG & 4) \
+{ \
+ if((YM2612->en3 = ENV_TAB(CH->SLOTS3.Ecnt >> ENV_LBITS) + CH->SLOTS3.TLL) > ENV_MASK) YM2612->en3 = 0; \
+ else YM2612->en3 = (YM2612->en3 ^ ENV_MASK) + (env_LFO >> CH->SLOTS3.AMS); \
+} \
+else YM2612->en3 = ENV_TAB(CH->SLOTS3.Ecnt >> ENV_LBITS) + CH->SLOTS3.TLL + (env_LFO >> CH->SLOTS3.AMS);
+
+
+#define UPDATE_ENV \
+if((CH->SLOTS0.Ecnt += CH->SLOTS0.Einc) >= CH->SLOTS0.Ecmp) \
+ ENV_NEXT_EVENTCH->SLOTS0.Ecurp(&(CH->SLOTS0)); \
+if((CH->SLOTS1.Ecnt += CH->SLOTS1.Einc) >= CH->SLOTS1.Ecmp) \
+ ENV_NEXT_EVENTCH->SLOTS1.Ecurp(&(CH->SLOTS1)); \
+if((CH->SLOTS2.Ecnt += CH->SLOTS2.Einc) >= CH->SLOTS2.Ecmp) \
+ ENV_NEXT_EVENTCH->SLOTS2.Ecurp(&(CH->SLOTS2)); \
+if((CH->SLOTS3.Ecnt += CH->SLOTS3.Einc) >= CH->SLOTS3.Ecmp) \
+ ENV_NEXT_EVENTCH->SLOTS3.Ecurp(&(CH->SLOTS3));
+
+
+#define DO_LIMIT \
+if(CH->OUTd > LIMIT_CH_OUT) CH->OUTd = LIMIT_CH_OUT; \
+else if(CH->OUTd < -LIMIT_CH_OUT) CH->OUTd = -LIMIT_CH_OUT;
+
+
+#define DO_FEEDBACK0 \
+YM2612->in0 += CH->S0_OUT0 >> CH->FB; \
+CH->S0_OUT0 = SIN_TAB(YM2612->in0 >> SIN_LBITS) & SIN_MASKYM2612->en0;
+
+
+#define DO_FEEDBACK \
+YM2612->in0 += (CH->S0_OUT0 + CH->S0_OUT1) >> CH->FB; \
+CH->S0_OUT1 = CH->S0_OUT0; \
+CH->S0_OUT0 = SIN_TAB(YM2612->in0 >> SIN_LBITS) & SIN_MASKYM2612->en0;
+
+
+#define DO_FEEDBACK2 \
+YM2612->in0 += (CH->S0_OUT0 + (CH->S0_OUT0 >> 2) + CH->S0_OUT1) >> CH->FB; \
+CH->S0_OUT1 = CH->S0_OUT0 >> 2; \
+CH->S0_OUT0 = SIN_TAB(YM2612->in0 >> SIN_LBITS) & SIN_MASKYM2612->en0;
+
+
+#define DO_FEEDBACK3 \
+YM2612->in0 += (CH->S0_OUT0 + CH->S0_OUT1 + CH->S0_OUT2 + CH->S0_OUT3) >> CH->FB; \
+CH->S0_OUT3 = CH->S0_OUT2 >> 1; \
+CH->S0_OUT2 = CH->S0_OUT1 >> 1; \
+CH->S0_OUT1 = CH->S0_OUT0 >> 1; \
+CH->S0_OUT0 = SIN_TAB(YM2612->in0 >> SIN_LBITS) & SIN_MASKYM2612->en0;
+
+
+#define DO_ALGO_0 \
+DO_FEEDBACK \
+YM2612->in1 += CH->S0_OUT1; \
+YM2612->in2 += SIN_TAB(YM2612->in1 >> SIN_LBITS) & SIN_MASKYM2612->en1; \
+YM2612->in3 += SIN_TAB(YM2612->in2 >> SIN_LBITS) & SIN_MASKYM2612->en2; \
+CH->OUTd = (SIN_TAB(YM2612->in3 >> SIN_LBITS) & SIN_MASKYM2612->en3) >> OUT_SHIFT;
+
+#define DO_ALGO_1 \
+DO_FEEDBACK \
+YM2612->in2 += CH->S0_OUT1 + SIN_TAB(YM2612->in1 >> SIN_LBITS) & SIN_MASKYM2612->en1; \
+YM2612->in3 += SIN_TAB(YM2612->in2 >> SIN_LBITS) & SIN_MASKYM2612->en2; \
+CH->OUTd = (SIN_TAB(YM2612->in3 >> SIN_LBITS) & SIN_MASKYM2612->en3) >> OUT_SHIFT;
+
+#define DO_ALGO_2 \
+DO_FEEDBACK \
+YM2612->in2 += SIN_TAB(YM2612->in1 >> SIN_LBITS) & SIN_MASKYM2612->en1; \
+YM2612->in3 += CH->S0_OUT1 + SIN_TAB(YM2612->in2 >> SIN_LBITS) & SIN_MASKYM2612->en2; \
+CH->OUTd = (SIN_TAB(YM2612->in3 >> SIN_LBITS) & SIN_MASKYM2612->en3) >> OUT_SHIFT;
+
+#define DO_ALGO_3 \
+DO_FEEDBACK \
+YM2612->in1 += CH->S0_OUT1; \
+YM2612->in3 += SIN_TAB(YM2612->in1 >> SIN_LBITS) & SIN_MASKYM2612->en1 + SIN_TAB(YM2612->in2 >> SIN_LBITS) & SIN_MASKYM2612->en2; \
+CH->OUTd = (SIN_TAB(YM2612->in3 >> SIN_LBITS) & SIN_MASKYM2612->en3) >> OUT_SHIFT;
+
+#define DO_ALGO_4 \
+DO_FEEDBACK \
+YM2612->in1 += CH->S0_OUT1; \
+YM2612->in3 += SIN_TAB(YM2612->in2 >> SIN_LBITS) & SIN_MASKYM2612->en2; \
+CH->OUTd = ((int) SIN_TAB(YM2612->in3 >> SIN_LBITS) & SIN_MASKYM2612->en3 + (int) SIN_TAB(YM2612->in1 >> SIN_LBITS) & SIN_MASKYM2612->en1) >> OUT_SHIFT; \
+DO_LIMIT
+
+#define DO_ALGO_5 \
+DO_FEEDBACK \
+YM2612->in1 += CH->S0_OUT1; \
+YM2612->in2 += CH->S0_OUT1; \
+YM2612->in3 += CH->S0_OUT1; \
+CH->OUTd = ((int) SIN_TAB(YM2612->in3 >> SIN_LBITS) & SIN_MASKYM2612->en3 + (int) SIN_TAB(YM2612->in1 >> SIN_LBITS) & SIN_MASKYM2612->en1 + (int) SIN_TAB(YM2612->in2 >> SIN_LBITS) & SIN_MASKYM2612->en2) >> OUT_SHIFT; \
+DO_LIMIT
+
+#define DO_ALGO_6 \
+DO_FEEDBACK \
+YM2612->in1 += CH->S0_OUT1; \
+CH->OUTd = ((int) SIN_TAB(YM2612->in3 >> SIN_LBITS) & SIN_MASKYM2612->en3 + (int) SIN_TAB(YM2612->in1 >> SIN_LBITS) & SIN_MASKYM2612->en1 + (int) SIN_TAB(YM2612->in2 >> SIN_LBITS) & SIN_MASKYM2612->en2) >> OUT_SHIFT; \
+DO_LIMIT
+
+#define DO_ALGO_7 \
+DO_FEEDBACK \
+CH->OUTd = ((int) SIN_TAB(YM2612->in3 >> SIN_LBITS) & SIN_MASKYM2612->en3 + (int) SIN_TAB(YM2612->in1 >> SIN_LBITS) & SIN_MASKYM2612->en1 + (int) SIN_TAB(YM2612->in2 >> SIN_LBITS) & SIN_MASKYM2612->en2 + CH->S0_OUT1) >> OUT_SHIFT; \
+DO_LIMIT
+
+
+#define DO_OUTPUT \
+buf0i += CH->OUTd & CH->LEFT; \
+buf1i += CH->OUTd & CH->RIGHT;
+
+
+#define DO_OUTPUT_INT0 \
+if((int_cnt += YM2612->Inter_Step) & 0x04000) \
+{ \
+ int_cnt &= 0x3FFF; \
+ buf0i += CH->OUTd & CH->LEFT; \
+ buf1i += CH->OUTd & CH->RIGHT; \
+} \
+else i--;
+
+
+#define DO_OUTPUT_INT1 \
+CH->Old_OUTd = (CH->OUTd + CH->Old_OUTd) >> 1; \
+if((int_cnt += YM2612->Inter_Step) & 0x04000) \
+{ \
+ int_cnt &= 0x3FFF; \
+ buf0i += CH->Old_OUTd & CH->LEFT; \
+ buf1i += CH->Old_OUTd & CH->RIGHT; \
+} \
+else i--;
+
+
+#define DO_OUTPUT_INT2 \
+if((int_cnt += YM2612->Inter_Step) & 0x04000) \
+{ \
+ int_cnt &= 0x3FFF; \
+ CH->Old_OUTd = (CH->OUTd + CH->Old_OUTd) >> 1; \
+ buf0i += CH->Old_OUTd & CH->LEFT; \
+ buf1i += CH->Old_OUTd & CH->RIGHT; \
+} \
+else i--; \
+CH->Old_OUTd = CH->OUTd;
+
+
+#define DO_OUTPUT_INT \
+if((int_cnt += YM2612->Inter_Step) & 0x04000) \
+{ \
+ int_cnt &= 0x3FFF; \
+ CH->Old_OUTd = (((int_cnt ^ 0x3FFF) * CH->OUTd) + (int_cnt * CH->Old_OUTd)) >> 14; \
+ buf0i += CH->Old_OUTd & CH->LEFT; \
+ buf1i += CH->Old_OUTd & CH->RIGHT; \
+} \
+else i--; \
+CH->Old_OUTd = CH->OUTd;
+
+
+void Update_Chan_Algo0(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 0 len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_0
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo1(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 1 len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_1
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo2(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 2 len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_2
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo3(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 3 len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_3
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo4(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 4 len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_4
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo5(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 5 len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_5
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo6(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 6 len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_6
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo7(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if((CH->SLOTS0.Ecnt == ENV_END) && (CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 7 len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_7
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo0_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 0 LFO len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_0
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo1_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 1 LFO len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_1
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo2_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 2 LFO len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_2
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo3_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 3 LFO len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_3
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo4_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 4 LFO len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_4
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo5_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 5 LFO len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_5
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo6_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 6 LFO len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_6
+ DO_OUTPUT
+ }
+}
+
+
+void Update_Chan_Algo7_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if((CH->SLOTS0.Ecnt == ENV_END) && (CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 7 LFO len = %d\n\n", lenght);
+#endif
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_7
+ DO_OUTPUT
+ }
+}
+
+
+/******************************************************
+ * Interpolated output *
+ *****************************************************/
+
+
+void Update_Chan_Algo0_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 0 len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_0
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo1_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 1 len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_1
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo2_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 2 len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_2
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo3_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 3 len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_3
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo4_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 4 len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_4
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo5_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 5 len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_5
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo6_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 6 len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_6
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo7_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i;
+
+ if((CH->SLOTS0.Ecnt == ENV_END) && (CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 7 len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE
+ GET_CURRENT_ENV
+ UPDATE_ENV
+ DO_ALGO_7
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo0_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 0 LFO len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_0
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo1_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 1 LFO len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_1
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo2_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 2 LFO len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_2
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo3_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if(CH->SLOTS3.Ecnt == ENV_END) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 3 LFO len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_3
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo4_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 4 LFO len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_4
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo5_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 5 LFO len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_5
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo6_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if((CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 6 LFO len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_6
+ DO_OUTPUT_INT
+ }
+}
+
+
+void Update_Chan_Algo7_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght)
+{
+ int i, env_LFO, freq_LFO;
+
+ if((CH->SLOTS0.Ecnt == ENV_END) && (CH->SLOTS1.Ecnt == ENV_END) && (CH->SLOTS2.Ecnt == ENV_END) && (CH->SLOTS3.Ecnt == ENV_END)) return;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nAlgo 7 LFO len = %d\n\n", lenght);
+#endif
+
+ int_cnt = YM2612->Inter_Cnt;
+
+ for(i = 0; i < lenght; i++)
+ {
+ GET_CURRENT_PHASE
+ UPDATE_PHASE_LFO
+ GET_CURRENT_ENV_LFO
+ UPDATE_ENV
+ DO_ALGO_7
+ DO_OUTPUT_INT
+ }
+}
+
+
+
+/***********************************************
+ * fonctions publiques *
+ ***********************************************/
+
+
+// Initialisation de l'émulateur YM2612
+ym2612_ *YM2612_Init(int Clock, int Rate, int Interpolation)
+{
+	ym2612_ *YM2612;
+ int i, j;
+ double x;
+
+ if((Rate == 0) || (Clock == 0)) return NULL;
+
+	YM2612 = (ym2612_ *)malloc(sizeof(ym2612_));
+ memset(YM2612, 0, sizeof(ym2612_));
+
+#if YM_DEBUG_LEVEL > 0
+ if(debug_file == NULL)
+ {
+ debug_file = fopen("ym2612.log", "w");
+ fprintf(debug_file, "YM2612 logging :\n\n");
+ }
+#endif
+
+ YM2612->Clock = Clock;
+ YM2612->Rate = Rate;
+
+ // 144 = 12 * (prescale * 2) = 12 * 6 * 2
+ // prescale set to 6 by default
+
+ YM2612->Frequence = ((double) YM2612->Clock / (double) YM2612->Rate) / 144.0;
+ YM2612->TimerBase = (int) (YM2612->Frequence * 4096.0);
+
+ if((Interpolation) && (YM2612->Frequence > 1.0))
+ {
+ YM2612->Inter_Step = (unsigned int) ((1.0 / YM2612->Frequence) * (double) (0x4000));
+ YM2612->Inter_Cnt = 0;
+
+ // We recalculate rate and frequence after interpolation
+
+ YM2612->Rate = YM2612->Clock / 144;
+ YM2612->Frequence = 1.0;
+ }
+ else
+ {
+ YM2612->Inter_Step = 0x4000;
+ YM2612->Inter_Cnt = 0;
+ }
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "YM2612 frequence = %g rate = %d interp step = %.8X\n\n", YM2612->Frequence, YM2612->Rate, YM2612->Inter_Step);
+#endif
+
+ // Tableau TL :
+ // 0 - 4095 = +output 4095 - ... = +output overflow (fill with 0)
+ // 12288 - 16383 = -output 16384 - ... = -output overflow (fill with 0)
+
+ for(i = 0; i < TL_LENGHT; i++)
+ {
+ if(i >= PG_CUT_OFF) // YM2612 cut off sound after 78 dB (14 bits output ?)
+ {
+ TL_TABTL_LENGHT + i = TL_TABi = 0;
+ }
+ else
+ {
+ x = MAX_OUT; // Max output
+ x /= pow(10, (ENV_STEP * i) / 20); // Decibel -> Voltage
+
+ TL_TABi = (int) x;
+ TL_TABTL_LENGHT + i = -TL_TABi;
+ }
+
+#if YM_DEBUG_LEVEL > 2
+ fprintf(debug_file, "TL_TAB%d = %.8X TL_TAB%d = %.8X\n", i, TL_TABi, TL_LENGHT + i, TL_TABTL_LENGHT + i);
+#endif
+ }
+
+#if YM_DEBUG_LEVEL > 2
+ fprintf(debug_file, "\n\n\n\n");
+#endif
+
+ // Tableau SIN :
+ // SIN_TABxy = sin(x) * y;
+ // x = phase and y = volume
+
+ SIN_TAB0 = SIN_TABSIN_LENGHT / 2 = &TL_TAB(int)PG_CUT_OFF;
+
+ for(i = 1; i <= SIN_LENGHT / 4; i++)
+ {
+ x = sin(2.0 * PI * (double) (i) / (double) (SIN_LENGHT)); // Sinus
+ x = 20 * log10(1 / x); // convert to dB
+
+ j = (int) (x / ENV_STEP); // Get TL range
+
+ if(j > PG_CUT_OFF) j = (int) PG_CUT_OFF;
+
+ SIN_TABi = SIN_TAB(SIN_LENGHT / 2) - i = &TL_TABj;
+ SIN_TAB(SIN_LENGHT / 2) + i = SIN_TABSIN_LENGHT - i = &TL_TABTL_LENGHT + j;
+
+#if YM_DEBUG_LEVEL > 2
+ fprintf(debug_file, "SIN%d0 = %.8X SIN%d0 = %.8X SIN%d0 = %.8X SIN%d0 = %.8X\n", i, SIN_TABi0, (SIN_LENGHT / 2) - i, SIN_TAB(SIN_LENGHT / 2) - i0, (SIN_LENGHT / 2) + i, SIN_TAB(SIN_LENGHT / 2) + i0, SIN_LENGHT - i, SIN_TABSIN_LENGHT - i0);
+#endif
+ }
+
+#if YM_DEBUG_LEVEL > 2
+ fprintf(debug_file, "\n\n\n\n");
+#endif
+
+ // Tableau LFO (LFO wav) :
+
+ for(i = 0; i < LFO_LENGHT; i++)
+ {
+ x = sin(2.0 * PI * (double) (i) / (double) (LFO_LENGHT)); // Sinus
+ x += 1.0;
+ x /= 2.0; // positive only
+ x *= 11.8 / ENV_STEP; // ajusted to MAX enveloppe modulation
+
+ LFO_ENV_TABi = (int) x;
+
+ x = sin(2.0 * PI * (double) (i) / (double) (LFO_LENGHT)); // Sinus
+ x *= (double) ((1 << (LFO_HBITS - 1)) - 1);
+
+ LFO_FREQ_TABi = (int) x;
+
+#if YM_DEBUG_LEVEL > 2
+ fprintf(debug_file, "LFO%d = %.8X\n", i, LFO_ENV_TABi);
+#endif
+ }
+
+#if YM_DEBUG_LEVEL > 2
+ fprintf(debug_file, "\n\n\n\n");
+#endif
+
+ // Tableau Enveloppe :
+ // ENV_TAB0 -> ENV_TABENV_LENGHT - 1 = attack curve
+ // ENV_TABENV_LENGHT -> ENV_TAB2 * ENV_LENGHT - 1 = decay curve
+
+ for(i = 0; i < ENV_LENGHT; i++)
+ {
+ // Attack curve (x^8 - music level 2 Vectorman 2)
+ x = pow(((double) ((ENV_LENGHT - 1) - i) / (double) (ENV_LENGHT)), 8);
+ x *= ENV_LENGHT;
+
+ ENV_TABi = (int) x;
+
+ // Decay curve (just linear)
+ x = pow(((double) (i) / (double) (ENV_LENGHT)), 1);
+ x *= ENV_LENGHT;
+
+ ENV_TABENV_LENGHT + i = (int) x;
+
+#if YM_DEBUG_LEVEL > 2
+ fprintf(debug_file, "ATTACK%d = %d DECAY%d = %d\n", i, ENV_TABi, i, ENV_TABENV_LENGHT + i);
+#endif
+ }
+
+ ENV_TABENV_END >> ENV_LBITS = ENV_LENGHT - 1; // for the stopped state
+
+ // Tableau pour la conversion Attack -> Decay and Decay -> Attack
+
+ for(i = 0, j = ENV_LENGHT - 1; i < ENV_LENGHT; i++)
+ {
+ while (j && (ENV_TABj < (unsigned) i)) j--;
+
+ DECAY_TO_ATTACKi = j << ENV_LBITS;
+ }
+
+ // Tableau pour le Substain Level
+
+ for(i = 0; i < 15; i++)
+ {
+ x = i * 3; // 3 and not 6 (Mickey Mania first music for test)
+ x /= ENV_STEP;
+
+ j = (int) x;
+ j <<= ENV_LBITS;
+
+ SL_TABi = j + ENV_DECAY;
+ }
+
+ j = ENV_LENGHT - 1; // special case : volume off
+ j <<= ENV_LBITS;
+ SL_TAB15 = j + ENV_DECAY;
+
+ // Tableau Frequency Step
+
+ for(i = 0; i < 2048; i++)
+ {
+ x = (double) (i) * YM2612->Frequence;
+
+#if((SIN_LBITS + SIN_HBITS - (21 - 7)) < 0)
+ x /= (double) (1 << ((21 - 7) - SIN_LBITS - SIN_HBITS));
+#else
+ x *= (double) (1 << (SIN_LBITS + SIN_HBITS - (21 - 7)));
+#endif
+
+ x /= 2.0; // because MUL = value * 2
+
+ FINC_TABi = (unsigned int) x;
+ }
+
+ // Tableaux Attack & Decay Rate
+
+ for(i = 0; i < 4; i++)
+ {
+ AR_TABi = 0;
+ DR_TABi = 0;
+ }
+
+ for(i = 0; i < 60; i++)
+ {
+ x = YM2612->Frequence;
+
+ x *= 1.0 + ((i & 3) * 0.25); // bits 0-1 : x1.00, x1.25, x1.50, x1.75
+ x *= (double) (1 << ((i >> 2))); // bits 2-5 : shift bits (x2^0 - x2^15)
+ x *= (double) (ENV_LENGHT << ENV_LBITS); // on ajuste pour le tableau ENV_TAB
+
+ AR_TABi + 4 = (unsigned int) (x / AR_RATE);
+ DR_TABi + 4 = (unsigned int) (x / DR_RATE);
+ }
+
+ for(i = 64; i < 96; i++)
+ {
+ AR_TABi = AR_TAB63;
+ DR_TABi = DR_TAB63;
+
+ NULL_RATEi - 64 = 0;
+ }
+
+ // Tableau Detune
+
+ for(i = 0; i < 4; i++)
+ {
+ for (j = 0; j < 32; j++)
+ {
+#if((SIN_LBITS + SIN_HBITS - 21) < 0)
+ x = (double) DT_DEF_TAB(i << 5) + j * YM2612->Frequence / (double) (1 << (21 - SIN_LBITS - SIN_HBITS));
+#else
+ x = (double) DT_DEF_TAB(i << 5) + j * YM2612->Frequence * (double) (1 << (SIN_LBITS + SIN_HBITS - 21));
+#endif
+
+ DT_TABi + 0j = (int) x;
+ DT_TABi + 4j = (int) -x;
+ }
+ }
+
+ // Tableau LFO
+
+ j = (YM2612->Rate * YM2612->Inter_Step) / 0x4000;
+
+ LFO_INC_TAB0 = (unsigned int) (3.98 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j);
+ LFO_INC_TAB1 = (unsigned int) (5.56 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j);
+ LFO_INC_TAB2 = (unsigned int) (6.02 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j);
+ LFO_INC_TAB3 = (unsigned int) (6.37 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j);
+ LFO_INC_TAB4 = (unsigned int) (6.88 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j);
+ LFO_INC_TAB5 = (unsigned int) (9.63 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j);
+ LFO_INC_TAB6 = (unsigned int) (48.1 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j);
+ LFO_INC_TAB7 = (unsigned int) (72.2 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / j);
+
+ YM2612_Reset(YM2612);
+
+ return YM2612;
+}
+
+
+int YM2612_End(ym2612_ *YM2612)
+{
+	free(YM2612);
+
+#if YM_DEBUG_LEVEL > 0
+ if(debug_file) fclose(debug_file);
+ debug_file = NULL;
+#endif
+
+ return 0;
+}
+
+
+int YM2612_Reset(ym2612_ *YM2612)
+{
+ int i, j;
+
+#if YM_DEBUG_LEVEL > 0
+ fprintf(debug_file, "\n\nStarting reseting YM2612 ...\n\n");
+#endif
+
+ YM2612->LFOcnt = 0;
+ YM2612->TimerA = 0;
+ YM2612->TimerAL = 0;
+ YM2612->TimerAcnt = 0;
+ YM2612->TimerB = 0;
+ YM2612->TimerBL = 0;
+ YM2612->TimerBcnt = 0;
+ YM2612->DAC = 0;
+ YM2612->DACdata = 0;
+	YM2612->dac_highpass = 0;
+
+ YM2612->Status = 0;
+
+ YM2612->OPNAadr = 0;
+ YM2612->OPNBadr = 0;
+ YM2612->Inter_Cnt = 0;
+
+ for(i = 0; i < 6; i++)
+ {
+ YM2612->CHANNELi.Old_OUTd = 0;
+ YM2612->CHANNELi.OUTd = 0;
+ YM2612->CHANNELi.LEFT = 0xFFFFFFFF;
+ YM2612->CHANNELi.RIGHT = 0xFFFFFFFF;
+ YM2612->CHANNELi.ALGO = 0;;
+ YM2612->CHANNELi.FB = 31;
+ YM2612->CHANNELi.FMS = 0;
+ YM2612->CHANNELi.AMS = 0;
+
+ for(j = 0 ;j < 4 ; j++)
+ {
+ YM2612->CHANNELi.S0_OUTj = 0;
+ YM2612->CHANNELi.FNUMj = 0;
+ YM2612->CHANNELi.FOCTj = 0;
+ YM2612->CHANNELi.KCj = 0;
+
+ YM2612->CHANNELi.SLOTj.Fcnt = 0;
+ YM2612->CHANNELi.SLOTj.Finc = 0;
+ YM2612->CHANNELi.SLOTj.Ecnt = ENV_END; // Put it at the end of Decay phase...
+ YM2612->CHANNELi.SLOTj.Einc = 0;
+ YM2612->CHANNELi.SLOTj.Ecmp = 0;
+ YM2612->CHANNELi.SLOTj.Ecurp = RELEASE;
+
+ YM2612->CHANNELi.SLOTj.ChgEnM = 0;
+ }
+ }
+
+ for(i = 0; i < 0x100; i++)
+ {
+ YM2612->REG0i = -1;
+ YM2612->REG1i = -1;
+ }
+
+ for(i = 0xB6; i >= 0xB4; i--)
+ {
+ YM2612_Write(YM2612, 0, (unsigned char) i);
+ YM2612_Write(YM2612, 2, (unsigned char) i);
+ YM2612_Write(YM2612, 1, 0xC0);
+ YM2612_Write(YM2612, 3, 0xC0);
+ }
+
+ for(i = 0xB2; i >= 0x22; i--)
+ {
+ YM2612_Write(YM2612, 0, (unsigned char) i);
+ YM2612_Write(YM2612, 2, (unsigned char) i);
+ YM2612_Write(YM2612, 1, 0);
+ YM2612_Write(YM2612, 3, 0);
+ }
+
+ YM2612_Write(YM2612, 0, 0x2A);
+ YM2612_Write(YM2612, 1, 0x80);
+
+#if YM_DEBUG_LEVEL > 0
+ fprintf(debug_file, "\n\nFinishing reseting YM2612 ...\n\n");
+#endif
+
+ return 0;
+}
+
+
+int YM2612_Read(ym2612_ *YM2612)
+{
+/* static int cnt = 0;
+
+ if(cnt++ == 50)
+ {
+ cnt = 0;
+ return YM2612->Status;
+ }
+ else return YM2612->Status | 0x80;
+*/
+ return YM2612->Status;
+}
+
+
+int YM2612_Write(ym2612_ *YM2612, unsigned char adr, unsigned char data)
+{
+ int d;
+
+ data &= 0xFF;
+ adr &= 0x03;
+
+ switch(adr)
+ {
+ case 0:
+ YM2612->OPNAadr = data;
+ break;
+
+ case 1:
+ // Trivial optimisation
+ if(YM2612->OPNAadr == 0x2A)
+ {
+ YM2612->DACdata = ((int)data - 0x80) << DAC_SHIFT;
+ return 0;
+ }
+
+ d = YM2612->OPNAadr & 0xF0;
+
+ if(d >= 0x30)
+ {
+ if(YM2612->REG0YM2612->OPNAadr == data) return 2;
+ YM2612->REG0YM2612->OPNAadr = data;
+
+//				if (GYM_Dumping) Update_GYM_Dump(1, YM2612->OPNAadr, data);
+
+ if(d < 0xA0) // SLOT
+ {
+ SLOT_SET(YM2612, YM2612->OPNAadr, data);
+ }
+ else // CHANNEL
+ {
+ CHANNEL_SET(YM2612, YM2612->OPNAadr, data);
+ }
+ }
+ else // YM2612
+ {
+ YM2612->REG0YM2612->OPNAadr = data;
+
+//				if ((GYM_Dumping) && ((YM2612->OPNAadr == 0x22) || (YM2612->OPNAadr == 0x27) || (YM2612->OPNAadr == 0x28))) Update_GYM_Dump(1, YM2612->OPNAadr, data);
+
+ YM_SET(YM2612, YM2612->OPNAadr, data);
+ }
+ break;
+
+ case 2:
+ YM2612->OPNBadr = data;
+ break;
+
+ case 3:
+ d = YM2612->OPNBadr & 0xF0;
+
+ if(d >= 0x30)
+ {
+ if(YM2612->REG1YM2612->OPNBadr == data) return 2;
+ YM2612->REG1YM2612->OPNBadr = data;
+
+//				if (GYM_Dumping) Update_GYM_Dump(2, YM2612->OPNBadr, data);
+
+ if(d < 0xA0) // SLOT
+ {
+ SLOT_SET(YM2612, YM2612->OPNBadr + 0x100, data);
+ }
+ else // CHANNEL
+ {
+ CHANNEL_SET(YM2612, YM2612->OPNBadr + 0x100, data);
+ }
+ }
+ else return 1;
+ break;
+ }
+
+ return 0;
+}
+
+int YM2612_GetMute(ym2612_ *YM2612)
+{
+ int i, result = 0;
+ for (i = 0; i < 6; ++i)
+ {
+ result |= YM2612->CHANNELi.Mute << i;
+ }
+ result |= YM2612->DAC_Mute << 6;
+	//result &= !(YM2612_Enable_SSGEG);
+ return result; 
+}
+
+void YM2612_SetMute(ym2612_ *YM2612, int val)
+{
+ int i;
+ for (i = 0; i < 6; ++i)
+ {
+ YM2612->CHANNELi.Mute = (val >> i) & 1;
+ }
+ YM2612->DAC_Mute = (val >> 6) & 1;
+	//YM2612_Enable_SSGEG = !(val & 1);
+}
+
+void YM2612_SetOptions(int Flags)
+{
+	DAC_Highpass_Enable = (Flags >> 0) & 0x01;
+	YM2612_Enable_SSGEG = (Flags >> 1) & 0x01;
+}
+
+void YM2612_ClearBuffer(int **buffer, int length)
+{
+	// the MAME core does this before updating,
+	// but the Gens core does this before mixing
+	int *bufL, *bufR;
+	int i;
+	
+	bufL = buffer0;
+	bufR = buffer1;
+	
+	for(i = 0; i < length; i++)
+	{
+		bufLi = 0x0000;
+		bufRi = 0x0000;
+	}
+}
+
+void YM2612_Update(ym2612_ *YM2612, int **buf, int length)
+{
+ int i, j, algo_type;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nStarting generating sound...\n\n");
+#endif
+
+ // Mise ?jour des pas des compteurs-fréquences s'ils ont ét?modifiés
+
+ if(YM2612->CHANNEL0.SLOT0.Finc == -1) CALC_FINC_CH(&YM2612->CHANNEL0);
+ if(YM2612->CHANNEL1.SLOT0.Finc == -1) CALC_FINC_CH(&YM2612->CHANNEL1);
+ if(YM2612->CHANNEL2.SLOT0.Finc == -1)
+ {
+ if(YM2612->Mode & 0x40)
+ {
+ CALC_FINC_SL(&(YM2612->CHANNEL2.SLOTS0), FINC_TABYM2612->CHANNEL2.FNUM2 >> (7 - YM2612->CHANNEL2.FOCT2), YM2612->CHANNEL2.KC2);
+ CALC_FINC_SL(&(YM2612->CHANNEL2.SLOTS1), FINC_TABYM2612->CHANNEL2.FNUM3 >> (7 - YM2612->CHANNEL2.FOCT3), YM2612->CHANNEL2.KC3);
+ CALC_FINC_SL(&(YM2612->CHANNEL2.SLOTS2), FINC_TABYM2612->CHANNEL2.FNUM1 >> (7 - YM2612->CHANNEL2.FOCT1), YM2612->CHANNEL2.KC1);
+ CALC_FINC_SL(&(YM2612->CHANNEL2.SLOTS3), FINC_TABYM2612->CHANNEL2.FNUM0 >> (7 - YM2612->CHANNEL2.FOCT0), YM2612->CHANNEL2.KC0);
+ }
+ else
+ {
+ CALC_FINC_CH(&YM2612->CHANNEL2);
+ }
+ }
+ if(YM2612->CHANNEL3.SLOT0.Finc == -1) CALC_FINC_CH(&YM2612->CHANNEL3);
+ if(YM2612->CHANNEL4.SLOT0.Finc == -1) CALC_FINC_CH(&YM2612->CHANNEL4);
+ if(YM2612->CHANNEL5.SLOT0.Finc == -1) CALC_FINC_CH(&YM2612->CHANNEL5);
+
+/*
+ CALC_FINC_CH(&YM2612->CHANNEL0);
+ CALC_FINC_CH(&YM2612->CHANNEL1);
+ if(YM2612->Mode & 0x40)
+ {
+ CALC_FINC_SL(&(YM2612->CHANNEL2.SLOT0), FINC_TABYM2612->CHANNEL2.FNUM2 >> (7 - YM2612->CHANNEL2.FOCT2), YM2612->CHANNEL2.KC2);
+ CALC_FINC_SL(&(YM2612->CHANNEL2.SLOT1), FINC_TABYM2612->CHANNEL2.FNUM3 >> (7 - YM2612->CHANNEL2.FOCT3), YM2612->CHANNEL2.KC3);
+ CALC_FINC_SL(&(YM2612->CHANNEL2.SLOT2), FINC_TABYM2612->CHANNEL2.FNUM1 >> (7 - YM2612->CHANNEL2.FOCT1), YM2612->CHANNEL2.KC1);
+ CALC_FINC_SL(&(YM2612->CHANNEL2.SLOT3), FINC_TABYM2612->CHANNEL2.FNUM0 >> (7 - YM2612->CHANNEL2.FOCT0), YM2612->CHANNEL2.KC0);
+ }
+ else
+ {
+ CALC_FINC_CH(&YM2612->CHANNEL2);
+ }
+ CALC_FINC_CH(&YM2612->CHANNEL3);
+ CALC_FINC_CH(&YM2612->CHANNEL4);
+ CALC_FINC_CH(&YM2612->CHANNEL5);
+*/
+
+ if(YM2612->Inter_Step & 0x04000) algo_type = 0;
+ else algo_type = 16;
+
+ if(YM2612->LFOinc)
+ {
+ // Precalcul LFO wav
+
+ for(i = 0; i < length; i++)
+ {
+ j = ((YM2612->LFOcnt += YM2612->LFOinc) >> LFO_LBITS) & LFO_MASK;
+
+ YM2612->LFO_ENV_UPi = LFO_ENV_TABj;
+ YM2612->LFO_FREQ_UPi = LFO_FREQ_TABj;
+
+#if YM_DEBUG_LEVEL > 3
+ fprintf(debug_file, "LFO_ENV_UP%d = %d LFO_FREQ_UP%d = %d\n", i, YM2612->LFO_ENV_UPi, i, YM2612->LFO_FREQ_UPi);
+#endif
+ }
+
+ algo_type |= 8;
+ }
+
+
+ if (!YM2612->CHANNEL0.Mute) UPDATE_CHANYM2612->CHANNEL0.ALGO + algo_type(YM2612, &(YM2612->CHANNEL0), buf, length);
+	if (!YM2612->CHANNEL1.Mute) UPDATE_CHANYM2612->CHANNEL1.ALGO + algo_type(YM2612, &(YM2612->CHANNEL1), buf, length);
+	if (!YM2612->CHANNEL2.Mute) UPDATE_CHANYM2612->CHANNEL2.ALGO + algo_type(YM2612, &(YM2612->CHANNEL2), buf, length);
+	if (!YM2612->CHANNEL3.Mute) UPDATE_CHANYM2612->CHANNEL3.ALGO + algo_type(YM2612, &(YM2612->CHANNEL3), buf, length);
+	if (!YM2612->CHANNEL4.Mute) UPDATE_CHANYM2612->CHANNEL4.ALGO + algo_type(YM2612, &(YM2612->CHANNEL4), buf, length);
+	if (!YM2612->CHANNEL5.Mute 
+		&& !(YM2612->DAC)) UPDATE_CHANYM2612->CHANNEL5.ALGO + algo_type(YM2612, &(YM2612->CHANNEL5), buf, length);
+
+ YM2612->Inter_Cnt = int_cnt;
+
+#if YM_DEBUG_LEVEL > 1
+ fprintf(debug_file, "\n\nFinishing generating sound...\n\n");
+#endif
+
+}
+
+
+/*int YM2612_Save(ym2612_ *YM2612, unsigned char SAVE0x200)
+{
+ int i;
+
+ for(i = 0; i < 0x100; i++)
+ {
+ SAVE0x000 + i = YM2612->REG0i;
+ SAVE0x100 + i = YM2612->REG1i;
+ }
+
+ return 0;
+}
+
+
+int YM2612_Restore(ym2612_ *YM2612, unsigned char SAVE0x200)
+{
+ int i;
+
+ YM2612_Reset(YM2612);
+
+ for(i = 0; i < 0x100; i++)
+ {
+ YM2612_Write(YM2612, 0, (unsigned char) i);
+ YM2612_Write(YM2612, 1, SAVE0x000 + i);
+ YM2612_Write(YM2612, 2, (unsigned char) i);
+ YM2612_Write(YM2612, 3, SAVE0x100 + i);
+ }
+
+ return 0;
+}*/
+
+/* Gens */
+
+enum { highpass_fract = 15 };
+enum { highpass_shift = 9 }; // higher values reduce highpass on DAC
+void YM2612_DacAndTimers_Update(ym2612_ *YM2612, int **buffer, int length)
+{
+ int *bufL, *bufR;
+ int i;
+
+ if(YM2612->DAC && YM2612->DACdata && ! YM2612->DAC_Mute)
+ {
+
+ bufL = buffer0;
+ bufR = buffer1;
+
+ for(i = 0; i < length; i++)
+ {
+			long dac = (YM2612->DACdata << highpass_fract) - YM2612->dac_highpass;
+			if (DAC_Highpass_Enable)	// else it's left at 0 and doesn't affect the sound
+				YM2612->dac_highpass += dac >> highpass_shift;
+			dac >>= highpass_fract;
+			bufLi += dac & YM2612->CHANNEL5.LEFT;
+			bufRi += dac & YM2612->CHANNEL5.RIGHT;
+ }
+ }
+
+ i = YM2612->TimerBase * length;
+
+ if(YM2612->Mode & 1) // Timer A ON ?
+ {
+// if((YM2612->TimerAcnt -= 14073) <= 0) // 13879=NTSC (old: 14475=NTSC 14586=PAL)
+ if((YM2612->TimerAcnt -= i) <= 0)
+ {
+ YM2612->Status |= (YM2612->Mode & 0x04) >> 2;
+ YM2612->TimerAcnt += YM2612->TimerAL;
+
+#if YM_DEBUG_LEVEL > 0
+ fprintf(debug_file, "Counter A overflow\n");
+#endif
+
+ if(YM2612->Mode & 0x80) CSM_Key_Control(YM2612);
+ }
+ }
+
+ if(YM2612->Mode & 2) // Timer B ON ?
+ {
+// if((YM2612->TimerBcnt -= 14073) <= 0) // 13879=NTSC (old: 14475=NTSC 14586=PAL)
+ if((YM2612->TimerBcnt -= i) <= 0)
+ {
+ YM2612->Status |= (YM2612->Mode & 0x08) >> 2;
+ YM2612->TimerBcnt += YM2612->TimerBL;
+
+#if YM_DEBUG_LEVEL > 0
+ fprintf(debug_file, "Counter B overflow\n");
+#endif
+ }
+ }
+}
+
+/* Gens */
+
+void YM2612_Special_Update(ym2612_ *YM2612)
+{
+/*	if (YM_Len && YM2612_Enable)
+ {
+ YM2612_Update(YM_Buf, YM_Len);
+
+		YM_Buf0 = Seg_L + Sound_ExtrapolVDP_Current_Line + 10;
+		YM_Buf1 = Seg_R + Sound_ExtrapolVDP_Current_Line + 10;
+ YM_Len = 0;
+	}*/
+}
+
+/* end */

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ym2612.h Added

@@ -0,0 +1,190 @@
+#ifndef _YM2612_H_
+#define _YM2612_H_
+
+// Change it if you need to do long update
+//#define	MAX_UPDATE_LENGHT   4000
+#define	MAX_UPDATE_LENGHT   0x100
+//#define	MAX_UPDATE_LENGHT   1	// for in_vgm
+
+// Gens always uses 16 bits sound (in 32 bits buffer) and do the convertion later if needed.
+#define OUTPUT_BITS         15
+// OUTPUT_BITS 15 is MAME's volume level
+#define DAC_SHIFT			(OUTPUT_BITS - 9)
+// DAC_SHIFT makes sure that FM and DAC volume has the same volume
+
+// VC++ inline
+#ifndef INLINE
+#define INLINE              __inline
+#endif
+
+typedef struct slot__ {
+	int *DT;	// paramètre detune
+	int MUL;	// paramètre "multiple de fréquence"
+	int TL;		// Total Level = volume lorsque l'enveloppe est au plus haut
+	int TLL;	// Total Level ajusted
+	int SLL;	// Sustin Level (ajusted) = volume où l'enveloppe termine sa première phase de régression
+	int KSR_S;	// Key Scale Rate Shift = facteur de prise en compte du KSL dans la variations de l'enveloppe
+	int KSR;	// Key Scale Rate = cette valeur est calculée par rapport à la fréquence actuelle, elle va influer
+				// sur les différents paramètres de l'enveloppe comme l'attaque, le decay ...  comme dans la réalité !
+	int SEG;	// Type enveloppe SSG
+	int *AR;	// Attack Rate (table pointeur) = Taux d'attaque (ARKSR)
+	int *DR;	// Decay Rate (table pointeur) = Taux pour la régression (DRKSR)
+	int *SR;	// Sustin Rate (table pointeur) = Taux pour le maintien (SRKSR)
+	int *RR;	// Release Rate (table pointeur) = Taux pour le relâchement (RRKSR)
+	int Fcnt;	// Frequency Count = compteur-fréquence pour déterminer l'amplitude actuelle (SINFinc >> 16)
+	int Finc;	// frequency step = pas d'incrémentation du compteur-fréquence
+				// plus le pas est grand, plus la fréquence est aïgu (ou haute)
+	int Ecurp;	// Envelope current phase = cette variable permet de savoir dans quelle phase
+				// de l'enveloppe on se trouve, par exemple phase d'attaque ou phase de maintenue ...
+				// en fonction de la valeur de cette variable, on va appeler une fonction permettant
+				// de mettre à jour l'enveloppe courante.
+	int Ecnt;	// Envelope counter = le compteur-enveloppe permet de savoir où l'on se trouve dans l'enveloppe
+	int Einc;	// Envelope step courant
+	int Ecmp;	// Envelope counter limite pour la prochaine phase
+	int EincA;	// Envelope step for Attack = pas d'incrémentation du compteur durant la phase d'attaque
+				// cette valeur est égal à ARKSR
+	int EincD;	// Envelope step for Decay = pas d'incrémentation du compteur durant la phase de regression
+				// cette valeur est égal à DRKSR
+	int EincS;	// Envelope step for Sustain = pas d'incrémentation du compteur durant la phase de maintenue
+				// cette valeur est égal à SRKSR
+	int EincR;	// Envelope step for Release = pas d'incrémentation du compteur durant la phase de relâchement
+				// cette valeur est égal à RRKSR
+	int *OUTp;	// pointeur of SLOT output = pointeur permettant de connecter la sortie de ce slot à l'entrée
+				// d'un autre ou carrement à la sortie de la voie
+	int INd;	// input data of the slot = données en entrée du slot
+	int ChgEnM;	// Change envelop mask.
+	int AMS;	// AMS depth level of this SLOT = degré de modulation de l'amplitude par le LFO
+	int AMSon;	// AMS enable flag = drapeau d'activation de l'AMS
+} slot_;
+
+typedef struct channel__ {
+	int S0_OUT4;			// anciennes sorties slot 0 (pour le feed back)
+	int Old_OUTd;			// ancienne sortie de la voie (son brut)
+	int OUTd;				// sortie de la voie (son brut)
+	int LEFT;				// LEFT enable flag
+	int RIGHT;				// RIGHT enable flag
+	int ALGO;				// Algorythm = détermine les connections entre les opérateurs
+	int FB;					// shift count of self feed back = degré de "Feed-Back" du SLOT 1 (il est son unique entrée)
+	int FMS;				// Fréquency Modulation Sensitivity of channel = degré de modulation de la fréquence sur la voie par le LFO
+	int AMS;				// Amplitude Modulation Sensitivity of channel = degré de modulation de l'amplitude sur la voie par le LFO
+	int FNUM4;			// hauteur fréquence de la voie (+ 3 pour le mode spécial)
+	int FOCT4;			// octave de la voie (+ 3 pour le mode spécial)
+	int KC4;				// Key Code = valeur fonction de la fréquence (voir KSR pour les slots, KSR = KC >> KSR_S)
+	struct slot__ SLOT4;	// four slot.operators = les 4 slots de la voie
+	int FFlag;				// Frequency step recalculation flag
+  int Mute;         // Maxim: channel mute flag
+} channel_;
+
+typedef struct ym2612__ {
+	int Clock;			// Horloge YM2612
+	int Rate;			// Sample Rate (11025/22050/44100)
+	int TimerBase;		// TimerBase calculation
+	int Status;			// YM2612 Status (timer overflow)
+	int OPNAadr;		// addresse pour l'écriture dans l'OPN A (propre à l'émulateur)
+	int OPNBadr;		// addresse pour l'écriture dans l'OPN B (propre à l'émulateur)
+	int LFOcnt;			// LFO counter = compteur-fréquence pour le LFO
+	int LFOinc;			// LFO step counter = pas d'incrémentation du compteur-fréquence du LFO
+						// plus le pas est grand, plus la fréquence est grande
+	int TimerA;			// timerA limit = valeur jusqu'à laquelle le timer A doit compter
+	int TimerAL;
+	int TimerAcnt;		// timerA counter = valeur courante du Timer A
+	int TimerB;			// timerB limit = valeur jusqu'à laquelle le timer B doit compter
+	int TimerBL;
+	int TimerBcnt;		// timerB counter = valeur courante du Timer B
+	int Mode;			// Mode actuel des voie 3 et 6 (normal / spécial)
+	int DAC;			// DAC enabled flag
+	int DACdata;		// DAC data
+	long dac_highpass;
+	double Frequence;	// Fréquence de base, se calcul par rapport à l'horlage et au sample rate
+	unsigned int Inter_Cnt;			// Interpolation Counter
+	unsigned int Inter_Step;		// Interpolation Step
+	struct channel__ CHANNEL6;	// Les 6 voies du YM2612
+	int REG20x100;	// Sauvegardes des valeurs de tout les registres, c'est facultatif
+						// cela nous rend le débuggage plus facile
+
+	int LFO_ENV_UPMAX_UPDATE_LENGHT;      // Temporary calculated LFO AMS (adjusted for 11.8 dB) *
+	int LFO_FREQ_UPMAX_UPDATE_LENGHT;      // Temporary calculated LFO FMS *
+
+	int in0, in1, in2, in3;            // current phase calculation *
+	int en0, en1, en2, en3;            // current enveloppe calculation *
+
+	int DAC_Mute;
+} ym2612_;
+
+/* Gens */
+
+//extern int YM2612_Enable;
+//extern int YM2612_Improv;
+//extern int DAC_Enable;
+//extern int *YM_Buf2;
+//extern int YM_Len;
+
+/* end */
+
+ym2612_ *YM2612_Init(int clock, int rate, int interpolation);
+int YM2612_End(ym2612_ *YM2612);
+int YM2612_Reset(ym2612_ *YM2612);
+int YM2612_Read(ym2612_ *YM2612);
+int YM2612_Write(ym2612_ *YM2612, unsigned char adr, unsigned char data);
+void YM2612_ClearBuffer(int **buffer, int length);
+void YM2612_Update(ym2612_ *YM2612, int **buf, int length);
+/*int YM2612_Save(ym2612_ *YM2612, unsigned char SAVE0x200);
+int YM2612_Restore(ym2612_ *YM2612, unsigned char SAVE0x200);*/
+
+/* Maxim: muting (bits 0-5 for channels 0-5) */
+int YM2612_GetMute(ym2612_ *YM2612);
+void YM2612_SetMute(ym2612_ *YM2612, int val);
+void YM2612_SetOptions(int Flags);
+
+/* Gens */
+
+void YM2612_DacAndTimers_Update(ym2612_ *YM2612, int **buffer, int length);
+void YM2612_Special_Update(ym2612_ *YM2612);
+
+/* end */
+
+// used for foward...
+void Update_Chan_Algo0(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo1(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo2(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo3(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo4(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo5(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo6(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo7(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+
+void Update_Chan_Algo0_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo1_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo2_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo3_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo4_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo5_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo6_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo7_LFO(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+
+void Update_Chan_Algo0_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo1_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo2_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo3_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo4_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo5_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo6_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo7_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+
+void Update_Chan_Algo0_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo1_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo2_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo3_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo4_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo5_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo6_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+void Update_Chan_Algo7_LFO_Int(ym2612_ *YM2612, channel_ *CH, int **buf, int lenght);
+
+// used for foward...
+void Env_Attack_Next(slot_ *SL);
+void Env_Decay_Next(slot_ *SL);
+void Env_Substain_Next(slot_ *SL);
+void Env_Release_Next(slot_ *SL);
+void Env_NULL_Next(slot_ *SL);
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.c Added

@@ -0,0 +1,678 @@
+/*
+**
+** File: ymdeltat.c
+**
+** YAMAHA DELTA-T adpcm sound emulation subroutine
+** used by fmopl.c (Y8950) and fm.c (YM2608 and YM2610/B)
+**
+** Base program is YM2610 emulator by Hiromitsu Shioya.
+** Written by Tatsuyuki Satoh
+** Improvements by Jarek Burczynski (bujar at mame dot net)
+**
+**
+** History:
+**
+** 03-08-2003 Jarek Burczynski:
+** - fixed BRDY flag implementation.
+**
+** 24-07-2003 Jarek Burczynski, Frits Hilderink:
+** - fixed delault value for control2 in YM_DELTAT_ADPCM_Reset
+**
+** 22-07-2003 Jarek Burczynski, Frits Hilderink:
+** - fixed external memory support
+**
+** 15-06-2003 Jarek Burczynski:
+** - implemented CPU -> AUDIO ADPCM synthesis (via writes to the ADPCM data reg $08)
+** - implemented support for the Limit address register
+** - supported two bits from the control register 2 ($01): RAM TYPE (x1 bit/x8 bit), ROM/RAM
+** - implemented external memory access (read/write) via the ADPCM data reg reads/writes
+** Thanks go to Frits Hilderink for the example code.
+**
+** 14-06-2003 Jarek Burczynski:
+** - various fixes to enable proper support for status register flags: BSRDY, PCM BSY, ZERO
+** - modified EOS handling
+**
+** 05-04-2003 Jarek Burczynski:
+** - implemented partial support for external/processor memory on sample replay
+**
+** 01-12-2002 Jarek Burczynski:
+** - fixed first missing sound in gigandes thanks to previous fix (interpolator) by ElSemi
+** - renamed/removed some YM_DELTAT struct fields
+**
+** 28-12-2001 Acho A. Tang
+** - added EOS status report on ADPCM playback.
+**
+** 05-08-2001 Jarek Burczynski:
+** - now_step is initialized with 0 at the start of play.
+**
+** 12-06-2001 Jarek Burczynski:
+** - corrected end of sample bug in YM_DELTAT_ADPCM_CALC.
+** Checked on real YM2610 chip - address register is 24 bits wide.
+** Thanks go to Stefan Jokisch (stefan.jokisch@gmx.de) for tracking down the problem.
+**
+** TO DO:
+** Check size of the address register on the other chips....
+**
+** Version 0.72
+**
+** sound chips that have this unit:
+** YM2608 OPNA
+** YM2610/B OPNB
+** Y8950 MSX AUDIO
+**
+*/
+
+#include "mamedef.h"
+#include <stdio.h>
+//#include "sndintrf.h"
+#include "ymdeltat.h"
+
+#define YM_DELTAT_DELTA_MAX (24576)
+#define YM_DELTAT_DELTA_MIN (127)
+#define YM_DELTAT_DELTA_DEF (127)
+
+#define YM_DELTAT_DECODE_RANGE 32768
+#define YM_DELTAT_DECODE_MIN (-(YM_DELTAT_DECODE_RANGE))
+#define YM_DELTAT_DECODE_MAX ((YM_DELTAT_DECODE_RANGE)-1)
+
+
+/* Forecast to next Forecast (rate = *8) */
+/* 1/8 , 3/8 , 5/8 , 7/8 , 9/8 , 11/8 , 13/8 , 15/8 */
+static const INT32 ym_deltat_decode_tableB116 = {
+ 1, 3, 5, 7, 9, 11, 13, 15,
+ -1, -3, -5, -7, -9, -11, -13, -15,
+};
+/* delta to next delta (rate= *64) */
+/* 0.9 , 0.9 , 0.9 , 0.9 , 1.2 , 1.6 , 2.0 , 2.4 */
+static const INT32 ym_deltat_decode_tableB216 = {
+ 57, 57, 57, 57, 77, 102, 128, 153,
+ 57, 57, 57, 57, 77, 102, 128, 153
+};
+
+#if 0
+void YM_DELTAT_BRDY_callback(YM_DELTAT *DELTAT)
+{
+	logerror("BRDY_callback reached (flag set) !\n");
+
+	/* set BRDY bit in status register */
+	if(DELTAT->status_set_handler)
+		if(DELTAT->status_change_BRDY_bit)
+			(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
+}
+#endif
+
+UINT8 YM_DELTAT_ADPCM_Read(YM_DELTAT *DELTAT)
+{
+	UINT8 v = 0;
+
+	/* external memory read */
+	if ( (DELTAT->portstate & 0xe0)==0x20 )
+	{
+		/* two dummy reads */
+		if (DELTAT->memread)
+		{
+			DELTAT->now_addr = DELTAT->start << 1;
+			DELTAT->memread--;
+			return 0;
+		}
+
+
+		if ( DELTAT->now_addr != (DELTAT->end<<1) )
+		{
+			v = DELTAT->memoryDELTAT->now_addr>>1;
+
+			/*logerror("YM Delta-T memory read $%08x, v=$%02x\n", DELTAT->now_addr >> 1, v);*/
+
+			DELTAT->now_addr+=2; /* two nibbles at a time */
+
+			/* reset BRDY bit in status register, which means we are reading the memory now */
+			if(DELTAT->status_reset_handler)
+				if(DELTAT->status_change_BRDY_bit)
+					(DELTAT->status_reset_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
+
+	/* setup a timer that will callback us in 10 master clock cycles for Y8950
+ * in the callback set the BRDY flag to 1 , which means we have another data ready.
+ * For now, we don't really do this; we simply reset and set the flag in zero time, so that the IRQ will work.
+ */
+			/* set BRDY bit in status register */
+			if(DELTAT->status_set_handler)
+				if(DELTAT->status_change_BRDY_bit)
+					(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
+		}
+		else
+		{
+			/* set EOS bit in status register */
+			if(DELTAT->status_set_handler)
+				if(DELTAT->status_change_EOS_bit)
+					(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_EOS_bit);
+		}
+	}
+
+	return v;
+}
+
+
+/* 0-DRAM x1, 1-ROM, 2-DRAM x8, 3-ROM (3 is bad setting - not allowed by the manual) */
+static const UINT8 dram_rightshift4={3,0,0,0};
+
+/* DELTA-T ADPCM write register */
+void YM_DELTAT_ADPCM_Write(YM_DELTAT *DELTAT,int r,int v)
+{
+	if(r>=0x10) return;
+	DELTAT->regr = v; /* stock data */
+
+	switch( r )
+	{
+	case 0x00:
+/*
+START:
+ Accessing *external* memory is started when START bit (D7) is set to "1", so
+ you must set all conditions needed for recording/playback before starting.
+ If you access *CPU-managed* memory, recording/playback starts after
+ read/write of ADPCM data register $08.
+
+REC:
+ 0 = ADPCM synthesis (playback)
+ 1 = ADPCM analysis (record)
+
+MEMDATA:
+ 0 = processor (*CPU-managed*) memory (means: using register $08)
+ 1 = external memory (using start/end/limit registers to access memory: RAM or ROM)
+
+
+SPOFF:
+ controls output pin that should disable the speaker while ADPCM analysis
+
+RESET and REPEAT only work with external memory.
+
+
+some examples:
+value: START, REC, MEMDAT, REPEAT, SPOFF, x,x,RESET meaning:
+ C8 1 1 0 0 1 0 0 0 Analysis (recording) from AUDIO to CPU (to reg $08), sample rate in PRESCALER register
+ E8 1 1 1 0 1 0 0 0 Analysis (recording) from AUDIO to EXT.MEMORY, sample rate in PRESCALER register
+ 80 1 0 0 0 0 0 0 0 Synthesis (playing) from CPU (from reg $08) to AUDIO,sample rate in DELTA-N register
+ a0 1 0 1 0 0 0 0 0 Synthesis (playing) from EXT.MEMORY to AUDIO, sample rate in DELTA-N register
+
+ 60 0 1 1 0 0 0 0 0 External memory write via ADPCM data register $08
+ 20 0 0 1 0 0 0 0 0 External memory read via ADPCM data register $08
+
+*/
+		/* handle emulation mode */
+		if(DELTAT->emulation_mode == YM_DELTAT_EMULATION_MODE_YM2610)
+		{
+			v |= 0x20;		/* YM2610 always uses external memory and doesn't even have memory flag bit. */
+		}
+
+		DELTAT->portstate = v & (0x80|0x40|0x20|0x10|0x01); /* start, rec, memory mode, repeat flag copy, reset(bit0) */
+
+		if( DELTAT->portstate&0x80 )/* START,REC,MEMDATA,REPEAT,SPOFF,--,--,RESET */
+		{
+			/* set PCM BUSY bit */
+			DELTAT->PCM_BSY = 1;
+
+			/* start ADPCM */
+			DELTAT->now_step = 0;
+			DELTAT->acc = 0;
+			DELTAT->prev_acc = 0;
+			DELTAT->adpcml = 0;
+			DELTAT->adpcmd = YM_DELTAT_DELTA_DEF;
+			DELTAT->now_data = 0;
+#ifdef _DEBUG
+			if (DELTAT->start > DELTAT->end)
+				logerror("DeltaT-Warning: Start: %06X, End: %06X\n", DELTAT->start, DELTAT->end);
+#endif
+		}
+
+		if( DELTAT->portstate&0x20 ) /* do we access external memory? */
+		{
+			DELTAT->now_addr = DELTAT->start << 1;
+			DELTAT->memread = 2;	/* two dummy reads needed before accesing external memory via register $08*/
+
+			/* if yes, then let's check if ADPCM memory is mapped and big enough */
+			if(DELTAT->memory == 0)
+			{
+#ifdef _DEBUG
+				logerror("YM Delta-T ADPCM rom not mapped\n");
+#endif
+				DELTAT->portstate = 0x00;
+				DELTAT->PCM_BSY = 0;
+			}
+			else
+			{
+				if( DELTAT->end >= DELTAT->memory_size )	/* Check End in Range */
+				{
+#ifdef _DEBUG
+					logerror("YM Delta-T ADPCM end out of range: $%08x\n", DELTAT->end);
+#endif
+					DELTAT->end = DELTAT->memory_size - 1;
+				}
+				if( DELTAT->start >= DELTAT->memory_size )	/* Check Start in Range */
+				{
+#ifdef _DEBUG
+					logerror("YM Delta-T ADPCM start out of range: $%08x\n", DELTAT->start);
+#endif
+					DELTAT->portstate = 0x00;
+					DELTAT->PCM_BSY = 0;
+				}
+			}
+		}
+		else	/* we access CPU memory (ADPCM data register $08) so we only reset now_addr here */
+		{
+			DELTAT->now_addr = 0;
+		}
+
+		if( DELTAT->portstate&0x01 )
+		{
+			DELTAT->portstate = 0x00;
+
+			/* clear PCM BUSY bit (in status register) */
+			DELTAT->PCM_BSY = 0;
+
+			/* set BRDY flag */
+			if(DELTAT->status_set_handler)
+				if(DELTAT->status_change_BRDY_bit)
+					(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
+		}
+		break;
+	case 0x01:	/* L,R,-,-,SAMPLE,DA/AD,RAMTYPE,ROM */
+		/* handle emulation mode */
+		if(DELTAT->emulation_mode == YM_DELTAT_EMULATION_MODE_YM2610)
+		{
+			v |= 0x01;		/* YM2610 always uses ROM as an external memory and doesn't have ROM/RAM memory flag bit. */
+		}
+
+		DELTAT->pan = &DELTAT->output_pointer(v>>6)&0x03;
+		if ((DELTAT->control2 & 3) != (v & 3))
+		{
+			/*0-DRAM x1, 1-ROM, 2-DRAM x8, 3-ROM (3 is bad setting - not allowed by the manual) */
+			if (DELTAT->DRAMportshift != dram_rightshiftv&3)
+			{
+				DELTAT->DRAMportshift = dram_rightshiftv&3;
+
+				/* final shift value depends on chip type and memory type selected:
+ 8 for YM2610 (ROM only),
+ 5 for ROM for Y8950 and YM2608,
+ 5 for x8bit DRAMs for Y8950 and YM2608,
+ 2 for x1bit DRAMs for Y8950 and YM2608.
+ */
+
+				/* refresh addresses */
+				DELTAT->start = (DELTAT->reg0x3*0x0100 | DELTAT->reg0x2) << (DELTAT->portshift - DELTAT->DRAMportshift);
+				DELTAT->end = (DELTAT->reg0x5*0x0100 | DELTAT->reg0x4) << (DELTAT->portshift - DELTAT->DRAMportshift);
+				DELTAT->end += (1 << (DELTAT->portshift-DELTAT->DRAMportshift) ) - 1;
+				DELTAT->limit = (DELTAT->reg0xd*0x0100 | DELTAT->reg0xc) << (DELTAT->portshift - DELTAT->DRAMportshift);
+			}
+		}
+		DELTAT->control2 = v;
+		break;
+	case 0x02:	/* Start Address L */
+	case 0x03:	/* Start Address H */
+		DELTAT->start = (DELTAT->reg0x3*0x0100 | DELTAT->reg0x2) << (DELTAT->portshift - DELTAT->DRAMportshift);
+		/*logerror("DELTAT start: 02=%2x 03=%2x addr=%8x\n",DELTAT->reg0x2, DELTAT->reg0x3,DELTAT->start );*/
+		break;
+	case 0x04:	/* Stop Address L */
+	case 0x05:	/* Stop Address H */
+		DELTAT->end = (DELTAT->reg0x5*0x0100 | DELTAT->reg0x4) << (DELTAT->portshift - DELTAT->DRAMportshift);
+		DELTAT->end += (1 << (DELTAT->portshift-DELTAT->DRAMportshift) ) - 1;
+		/*logerror("DELTAT end : 04=%2x 05=%2x addr=%8x\n",DELTAT->reg0x4, DELTAT->reg0x5,DELTAT->end );*/
+		break;
+	case 0x06:	/* Prescale L (ADPCM and Record frq) */
+	case 0x07:	/* Prescale H */
+		break;
+	case 0x08:	/* ADPCM data */
+
+/*
+some examples:
+value: START, REC, MEMDAT, REPEAT, SPOFF, x,x,RESET meaning:
+ C8 1 1 0 0 1 0 0 0 Analysis (recording) from AUDIO to CPU (to reg $08), sample rate in PRESCALER register
+ E8 1 1 1 0 1 0 0 0 Analysis (recording) from AUDIO to EXT.MEMORY, sample rate in PRESCALER register
+ 80 1 0 0 0 0 0 0 0 Synthesis (playing) from CPU (from reg $08) to AUDIO,sample rate in DELTA-N register
+ a0 1 0 1 0 0 0 0 0 Synthesis (playing) from EXT.MEMORY to AUDIO, sample rate in DELTA-N register
+
+ 60 0 1 1 0 0 0 0 0 External memory write via ADPCM data register $08
+ 20 0 0 1 0 0 0 0 0 External memory read via ADPCM data register $08
+
+*/
+
+		/* external memory write */
+		if ( (DELTAT->portstate & 0xe0)==0x60 )
+		{
+			if (DELTAT->memread)
+			{
+				DELTAT->now_addr = DELTAT->start << 1;
+				DELTAT->memread = 0;
+			}
+
+			/*logerror("YM Delta-T memory write $%08x, v=$%02x\n", DELTAT->now_addr >> 1, v);*/
+
+			if ( DELTAT->now_addr != (DELTAT->end<<1) )
+			{
+				DELTAT->memoryDELTAT->now_addr>>1 = v;
+				DELTAT->now_addr+=2; /* two nibbles at a time */
+
+				/* reset BRDY bit in status register, which means we are processing the write */
+				if(DELTAT->status_reset_handler)
+					if(DELTAT->status_change_BRDY_bit)
+						(DELTAT->status_reset_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
+
+	/* setup a timer that will callback us in 10 master clock cycles for Y8950
+ * in the callback set the BRDY flag to 1 , which means we have written the data.
+ * For now, we don't really do this; we simply reset and set the flag in zero time, so that the IRQ will work.
+ */
+				/* set BRDY bit in status register */
+				if(DELTAT->status_set_handler)
+					if(DELTAT->status_change_BRDY_bit)
+						(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
+
+			}
+			else
+			{
+				/* set EOS bit in status register */
+				if(DELTAT->status_set_handler)
+					if(DELTAT->status_change_EOS_bit)
+						(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_EOS_bit);
+			}
+
+			return;
+		}
+
+		/* ADPCM synthesis from CPU */
+		if ( (DELTAT->portstate & 0xe0)==0x80 )
+		{
+			DELTAT->CPU_data = v;
+
+			/* Reset BRDY bit in status register, which means we are full of data */
+			if(DELTAT->status_reset_handler)
+				if(DELTAT->status_change_BRDY_bit)
+					(DELTAT->status_reset_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
+			return;
+		}
+
+	 break;
+	case 0x09:	/* DELTA-N L (ADPCM Playback Prescaler) */
+	case 0x0a:	/* DELTA-N H */
+		DELTAT->delta = (DELTAT->reg0xa*0x0100 | DELTAT->reg0x9);
+		DELTAT->step = (UINT32)( (double)(DELTAT->delta /* *(1<<(YM_DELTAT_SHIFT-16)) */ ) * (DELTAT->freqbase) );
+		/*logerror("DELTAT deltan:09=%2x 0a=%2x\n",DELTAT->reg0x9, DELTAT->reg0xa);*/
+		break;
+	case 0x0b:	/* Output level control (volume, linear) */
+		{
+			INT32 oldvol = DELTAT->volume;
+			DELTAT->volume = (v&0xff) * (DELTAT->output_range/256) / YM_DELTAT_DECODE_RANGE;
+/* v * ((1<<16)>>8) >> 15;
+* thus: v * (1<<8) >> 15;
+* thus: output_range must be (1 << (15+8)) at least
+* v * ((1<<23)>>8) >> 15;
+* v * (1<<15) >> 15;
+*/
+			/*logerror("DELTAT vol = %2x\n",v&0xff);*/
+			if( oldvol != 0 )
+			{
+				DELTAT->adpcml = (int)((double)DELTAT->adpcml / (double)oldvol * (double)DELTAT->volume);
+			}
+		}
+		break;
+	case 0x0c:	/* Limit Address L */
+	case 0x0d:	/* Limit Address H */
+		DELTAT->limit = (DELTAT->reg0xd*0x0100 | DELTAT->reg0xc) << (DELTAT->portshift - DELTAT->DRAMportshift);
+		/*logerror("DELTAT limit: 0c=%2x 0d=%2x addr=%8x\n",DELTAT->reg0xc, DELTAT->reg0xd,DELTAT->limit );*/
+		break;
+	}
+}
+
+void YM_DELTAT_ADPCM_Reset(YM_DELTAT *DELTAT,int pan,int emulation_mode)
+{
+	DELTAT->now_addr = 0;
+	DELTAT->now_step = 0;
+	DELTAT->step = 0;
+	DELTAT->start = 0;
+	DELTAT->end = 0;
+	DELTAT->limit = ~0; /* this way YM2610 and Y8950 (both of which don't have limit address reg) will still work */
+	DELTAT->volume = 0;
+	DELTAT->pan = &DELTAT->output_pointerpan;
+	DELTAT->acc = 0;
+	DELTAT->prev_acc = 0;
+	DELTAT->adpcmd = 127;
+	DELTAT->adpcml = 0;
+	DELTAT->emulation_mode = (UINT8)emulation_mode;
+	DELTAT->portstate = (emulation_mode == YM_DELTAT_EMULATION_MODE_YM2610) ? 0x20 : 0;
+	DELTAT->control2 = (emulation_mode == YM_DELTAT_EMULATION_MODE_YM2610) ? 0x01 : 0;	/* default setting depends on the emulation mode. MSX demo called "facdemo_4" doesn't setup control2 register at all and still works */
+	DELTAT->DRAMportshift = dram_rightshiftDELTAT->control2 & 3;
+
+	/* The flag mask register disables the BRDY after the reset, however
+ ** as soon as the mask is enabled the flag needs to be set. */
+
+	/* set BRDY bit in status register */
+	if(DELTAT->status_set_handler)
+		if(DELTAT->status_change_BRDY_bit)
+			(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
+}
+
+/*void YM_DELTAT_postload(YM_DELTAT *DELTAT,UINT8 *regs)
+{
+	int r;
+
+	// to keep adpcml
+	DELTAT->volume = 0;
+	// update
+	for(r=1;r<16;r++)
+		YM_DELTAT_ADPCM_Write(DELTAT,r,regsr);
+	DELTAT->reg0 = regs0;
+
+	// current rom data
+	if (DELTAT->memory)
+		DELTAT->now_data = *(DELTAT->memory + (DELTAT->now_addr>>1) );
+
+}
+//void YM_DELTAT_savestate(const device_config *device,YM_DELTAT *DELTAT)
+void YM_DELTAT_savestate(YM_DELTAT *DELTAT)
+{
+#ifdef __STATE_H__
+	state_save_register_device_item(device, 0, DELTAT->portstate);
+	state_save_register_device_item(device, 0, DELTAT->now_addr);
+	state_save_register_device_item(device, 0, DELTAT->now_step);
+	state_save_register_device_item(device, 0, DELTAT->acc);
+	state_save_register_device_item(device, 0, DELTAT->prev_acc);
+	state_save_register_device_item(device, 0, DELTAT->adpcmd);
+	state_save_register_device_item(device, 0, DELTAT->adpcml);
+#endif
+}*/
+
+
+#define YM_DELTAT_Limit(val,max,min)	\
+{										\
+	if ( val > max ) val = max;			\
+	else if ( val < min ) val = min;	\
+}
+
+INLINE void YM_DELTAT_synthesis_from_external_memory(YM_DELTAT *DELTAT)
+{
+	UINT32 step;
+	int data;
+
+	DELTAT->now_step += DELTAT->step;
+	if ( DELTAT->now_step >= (1<<YM_DELTAT_SHIFT) )
+	{
+		step = DELTAT->now_step >> YM_DELTAT_SHIFT;
+		DELTAT->now_step &= (1<<YM_DELTAT_SHIFT)-1;
+		do{
+
+			if ( DELTAT->now_addr == (DELTAT->limit<<1) )
+				DELTAT->now_addr = 0;
+
+			if ( DELTAT->now_addr == (DELTAT->end<<1) ) {	/* 12-06-2001 JB: corrected comparison. Was > instead of == */
+				if( DELTAT->portstate&0x10 ){
+					/* repeat start */
+					DELTAT->now_addr = DELTAT->start<<1;
+					DELTAT->acc = 0;
+					DELTAT->adpcmd = YM_DELTAT_DELTA_DEF;
+					DELTAT->prev_acc = 0;
+				}else{
+					/* set EOS bit in status register */
+					if(DELTAT->status_set_handler)
+						if(DELTAT->status_change_EOS_bit)
+							(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_EOS_bit);
+
+					/* clear PCM BUSY bit (reflected in status register) */
+					DELTAT->PCM_BSY = 0;
+
+					DELTAT->portstate = 0;
+					DELTAT->adpcml = 0;
+					DELTAT->prev_acc = 0;
+					return;
+				}
+			}
+
+			if( DELTAT->now_addr&1 ) data = DELTAT->now_data & 0x0f;
+			else
+			{
+				DELTAT->now_data = *(DELTAT->memory + (DELTAT->now_addr>>1));
+				data = DELTAT->now_data >> 4;
+			}
+
+			DELTAT->now_addr++;
+			/* 12-06-2001 JB: */
+			/* YM2610 address register is 24 bits wide.*/
+			/* The "+1" is there because we use 1 bit more for nibble calculations.*/
+			/* WARNING: */
+			/* Side effect: we should take the size of the mapped ROM into account */
+			//DELTAT->now_addr &= ( (1<<(24+1))-1);
+			DELTAT->now_addr &= DELTAT->memory_mask;
+			
+
+			/* store accumulator value */
+			DELTAT->prev_acc = DELTAT->acc;
+
+			/* Forecast to next Forecast */
+			DELTAT->acc += (ym_deltat_decode_tableB1data * DELTAT->adpcmd / 8);
+			YM_DELTAT_Limit(DELTAT->acc,YM_DELTAT_DECODE_MAX, YM_DELTAT_DECODE_MIN);
+
+			/* delta to next delta */
+			DELTAT->adpcmd = (DELTAT->adpcmd * ym_deltat_decode_tableB2data ) / 64;
+			YM_DELTAT_Limit(DELTAT->adpcmd,YM_DELTAT_DELTA_MAX, YM_DELTAT_DELTA_MIN );
+
+			/* ElSemi: Fix interpolator. */
+			/*DELTAT->prev_acc = prev_acc + ((DELTAT->acc - prev_acc) / 2 );*/
+
+		}while(--step);
+
+	}
+
+	/* ElSemi: Fix interpolator. */
+	DELTAT->adpcml = DELTAT->prev_acc * (int)((1<<YM_DELTAT_SHIFT)-DELTAT->now_step);
+	DELTAT->adpcml += (DELTAT->acc * (int)DELTAT->now_step);
+	DELTAT->adpcml = (DELTAT->adpcml>>YM_DELTAT_SHIFT) * (int)DELTAT->volume;
+
+	/* output for work of output channels (outdOPNxxxx)*/
+	*(DELTAT->pan) += DELTAT->adpcml;
+}
+
+
+
+INLINE void YM_DELTAT_synthesis_from_CPU_memory(YM_DELTAT *DELTAT)
+{
+	UINT32 step;
+	int data;
+
+	DELTAT->now_step += DELTAT->step;
+	if ( DELTAT->now_step >= (1<<YM_DELTAT_SHIFT) )
+	{
+		step = DELTAT->now_step >> YM_DELTAT_SHIFT;
+		DELTAT->now_step &= (1<<YM_DELTAT_SHIFT)-1;
+		do{
+
+			if( DELTAT->now_addr&1 )
+			{
+				data = DELTAT->now_data & 0x0f;
+
+				DELTAT->now_data = DELTAT->CPU_data;
+
+				/* after we used CPU_data, we set BRDY bit in status register,
+ * which means we are ready to accept another byte of data */
+				if(DELTAT->status_set_handler)
+					if(DELTAT->status_change_BRDY_bit)
+						(DELTAT->status_set_handler)(DELTAT->status_change_which_chip, DELTAT->status_change_BRDY_bit);
+			}
+			else
+			{
+				data = DELTAT->now_data >> 4;
+			}
+
+			DELTAT->now_addr++;
+
+			/* store accumulator value */
+			DELTAT->prev_acc = DELTAT->acc;
+
+			/* Forecast to next Forecast */
+			DELTAT->acc += (ym_deltat_decode_tableB1data * DELTAT->adpcmd / 8);
+			YM_DELTAT_Limit(DELTAT->acc,YM_DELTAT_DECODE_MAX, YM_DELTAT_DECODE_MIN);
+
+			/* delta to next delta */
+			DELTAT->adpcmd = (DELTAT->adpcmd * ym_deltat_decode_tableB2data ) / 64;
+			YM_DELTAT_Limit(DELTAT->adpcmd,YM_DELTAT_DELTA_MAX, YM_DELTAT_DELTA_MIN );
+
+
+		}while(--step);
+
+	}
+
+	/* ElSemi: Fix interpolator. */
+	DELTAT->adpcml = DELTAT->prev_acc * (int)((1<<YM_DELTAT_SHIFT)-DELTAT->now_step);
+	DELTAT->adpcml += (DELTAT->acc * (int)DELTAT->now_step);
+	DELTAT->adpcml = (DELTAT->adpcml>>YM_DELTAT_SHIFT) * (int)DELTAT->volume;
+
+	/* output for work of output channels (outdOPNxxxx)*/
+	*(DELTAT->pan) += DELTAT->adpcml;
+}
+
+
+
+/* ADPCM B (Delta-T control type) */
+void YM_DELTAT_ADPCM_CALC(YM_DELTAT *DELTAT)
+{
+
+/*
+some examples:
+value: START, REC, MEMDAT, REPEAT, SPOFF, x,x,RESET meaning:
+ 80 1 0 0 0 0 0 0 0 Synthesis (playing) from CPU (from reg $08) to AUDIO,sample rate in DELTA-N register
+ a0 1 0 1 0 0 0 0 0 Synthesis (playing) from EXT.MEMORY to AUDIO, sample rate in DELTA-N register
+ C8 1 1 0 0 1 0 0 0 Analysis (recording) from AUDIO to CPU (to reg $08), sample rate in PRESCALER register
+ E8 1 1 1 0 1 0 0 0 Analysis (recording) from AUDIO to EXT.MEMORY, sample rate in PRESCALER register
+
+ 60 0 1 1 0 0 0 0 0 External memory write via ADPCM data register $08
+ 20 0 0 1 0 0 0 0 0 External memory read via ADPCM data register $08
+
+*/
+
+	if ( (DELTAT->portstate & 0xe0)==0xa0 )
+	{
+		YM_DELTAT_synthesis_from_external_memory(DELTAT);
+		return;
+	}
+
+	if ( (DELTAT->portstate & 0xe0)==0x80 )
+	{
+		/* ADPCM synthesis from CPU-managed memory (from reg $08) */
+		YM_DELTAT_synthesis_from_CPU_memory(DELTAT);	/* change output based on data in ADPCM data reg ($08) */
+		return;
+	}
+
+//todo: ADPCM analysis
+// if ( (DELTAT->portstate & 0xe0)==0xc0 )
+// if ( (DELTAT->portstate & 0xe0)==0xe0 )
+
+	return;
+}
+
+void YM_DELTAT_calc_mem_mask(YM_DELTAT* DELTAT)
+{
+	UINT32 MaskSize;
+	
+	MaskSize = 0x01;
+	while(MaskSize < DELTAT->memory_size)
+		MaskSize <<= 1;
+	
+	DELTAT->memory_mask = (MaskSize << 1) - 1;	// it's Mask<<1 because of the nibbles
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymdeltat.h Added

@@ -0,0 +1,83 @@
+#pragma once
+
+#define YM_DELTAT_SHIFT    (16)
+
+#define YM_DELTAT_EMULATION_MODE_NORMAL	0
+#define YM_DELTAT_EMULATION_MODE_YM2610	1
+
+
+typedef void (*STATUS_CHANGE_HANDLER)(void *chip, UINT8 status_bits);
+
+
+/* DELTA-T (adpcm type B) struct */
+typedef struct deltat_adpcm_state {     /* AT: rearranged and tigntened structure */
+	UINT8	*memory;
+	INT32	*output_pointer;/* pointer of output pointers   */
+	INT32	*pan;			/* pan : &output_pointerpan   */
+	double	freqbase;
+#if 0
+	double	write_time;		/* Y8950: 10 cycles of main clock; YM2608: 20 cycles of main clock */
+	double	read_time;		/* Y8950: 8 cycles of main clock;  YM2608: 18 cycles of main clock */
+#endif
+	UINT32	memory_size;
+	UINT32	memory_mask;
+	int		output_range;
+	UINT32	now_addr;		/* current address      */
+	UINT32	now_step;		/* currect step         */
+	UINT32	step;			/* step                 */
+	UINT32	start;			/* start address        */
+	UINT32	limit;			/* limit address        */
+	UINT32	end;			/* end address          */
+	UINT32	delta;			/* delta scale          */
+	INT32	volume;			/* current volume       */
+	INT32	acc;			/* shift Measurement value*/
+	INT32	adpcmd;			/* next Forecast        */
+	INT32	adpcml;			/* current value        */
+	INT32	prev_acc;		/* leveling value       */
+	UINT8	now_data;		/* current rom data     */
+	UINT8	CPU_data;		/* current data from reg 08 */
+	UINT8	portstate;		/* port status          */
+	UINT8	control2;		/* control reg: SAMPLE, DA/AD, RAM TYPE (x8bit / x1bit), ROM/RAM */
+	UINT8	portshift;		/* address bits shift-left:
+                            ** 8 for YM2610,
+                            ** 5 for Y8950 and YM2608 */
+
+	UINT8	DRAMportshift;	/* address bits shift-right:
+                            ** 0 for ROM and x8bit DRAMs,
+                            ** 3 for x1 DRAMs */
+
+	UINT8	memread;		/* needed for reading/writing external memory */
+
+	/* handlers and parameters for the status flags support */
+	STATUS_CHANGE_HANDLER	status_set_handler;
+	STATUS_CHANGE_HANDLER	status_reset_handler;
+
+	/* note that different chips have these flags on different
+    ** bits of the status register
+    */
+	void *	status_change_which_chip;	/* this chip id */
+	UINT8	status_change_EOS_bit;		/* 1 on End Of Sample (record/playback/cycle time of AD/DA converting has passed)*/
+	UINT8	status_change_BRDY_bit;		/* 1 after recording 2 datas (2x4bits) or after reading/writing 1 data */
+	UINT8	status_change_ZERO_bit;		/* 1 if silence lasts for more than 290 miliseconds on ADPCM recording */
+
+	/* neither Y8950 nor YM2608 can generate IRQ when PCMBSY bit changes, so instead of above,
+    ** the statusflag gets ORed with PCM_BSY (below) (on each read of statusflag of Y8950 and YM2608)
+    */
+	UINT8	PCM_BSY;		/* 1 when ADPCM is playing; Y8950/YM2608 only */
+
+	UINT8	reg16;		/* adpcm registers      */
+	UINT8	emulation_mode;	/* which chip we're emulating */
+}YM_DELTAT;
+
+/*void YM_DELTAT_BRDY_callback(YM_DELTAT *DELTAT);*/
+
+UINT8 YM_DELTAT_ADPCM_Read(YM_DELTAT *DELTAT);
+void YM_DELTAT_ADPCM_Write(YM_DELTAT *DELTAT,int r,int v);
+void YM_DELTAT_ADPCM_Reset(YM_DELTAT *DELTAT,int pan,int emulation_mode);
+void YM_DELTAT_ADPCM_CALC(YM_DELTAT *DELTAT);
+
+/*void YM_DELTAT_postload(YM_DELTAT *DELTAT,UINT8 *regs);
+//void YM_DELTAT_savestate(const device_config *device,YM_DELTAT *DELTAT);
+void YM_DELTAT_savestate(YM_DELTAT *DELTAT);*/
+
+void YM_DELTAT_calc_mem_mask(YM_DELTAT* DELTAT);
\ No newline at end of file

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.c Added

@@ -0,0 +1,2749 @@
+/*
+**
+** File: ymf262.c - software implementation of YMF262
+** FM sound generator type OPL3
+**
+** Copyright Jarek Burczynski
+**
+** Version 0.2
+**
+
+Revision History:
+
+03-03-2003: initial release
+ - thanks to Olivier Galibert and Chris Hardy for YMF262 and YAC512 chips
+ - thanks to Stiletto for the datasheets
+
+ Features as listed in 4MF262A6 data sheet:
+ 1. Registers are compatible with YM3812 (OPL2) FM sound source.
+ 2. Up to six sounds can be used as four-operator melody sounds for variety.
+ 3. 18 simultaneous melody sounds, or 15 melody sounds with 5 rhythm sounds (with two operators).
+ 4. 6 four-operator melody sounds and 6 two-operator melody sounds, or 6 four-operator melody
+ sounds, 3 two-operator melody sounds and 5 rhythm sounds (with four operators).
+ 5. 8 selectable waveforms.
+ 6. 4-channel sound output.
+ 7. YMF262 compabile DAC (YAC512) is available.
+ 8. LFO for vibrato and tremolo effedts.
+ 9. 2 programable timers.
+ 10. Shorter register access time compared with YM3812.
+ 11. 5V single supply silicon gate CMOS process.
+ 12. 24 Pin SOP Package (YMF262-M), 48 Pin SQFP Package (YMF262-S).
+
+
+differences between OPL2 and OPL3 not documented in Yamaha datahasheets:
+- sinus table is a little different: the negative part is off by one...
+
+- in order to enable selection of four different waveforms on OPL2
+ one must set bit 5 in register 0x01(test).
+ on OPL3 this bit is ignored and 4-waveform select works *always*.
+ (Don't confuse this with OPL3's 8-waveform select.)
+
+- Envelope Generator: all 15 x rates take zero time on OPL3
+ (on OPL2 15 0 and 15 1 rates take some time while 15 2 and 15 3 rates
+ take zero time)
+
+- channel calculations: output of operator 1 is in perfect sync with
+ output of operator 2 on OPL3; on OPL and OPL2 output of operator 1
+ is always delayed by one sample compared to output of operator 2
+
+
+differences between OPL2 and OPL3 shown in datasheets:
+- YMF262 does not support CSM mode
+
+
+*/
+
+#include <math.h>
+#include "mamedef.h"
+#include <stdlib.h>
+#include <string.h>
+//#include "sndintrf.h"
+#include "ymf262.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+
+/* output final shift */
+#if (OPL3_SAMPLE_BITS==16)
+	#define FINAL_SH	(0)
+	#define MAXOUT		(+32767)
+	#define MINOUT		(-32768)
+#else
+	#define FINAL_SH	(8)
+	#define MAXOUT		(+127)
+	#define MINOUT		(-128)
+#endif
+
+
+#define FREQ_SH			16 /* 16.16 fixed point (frequency calculations) */
+#define EG_SH			16 /* 16.16 fixed point (EG timing) */
+#define LFO_SH			24 /* 8.24 fixed point (LFO calculations) */
+#define TIMER_SH		16 /* 16.16 fixed point (timers calculations) */
+
+#define FREQ_MASK		((1<<FREQ_SH)-1)
+
+/* envelope output entries */
+#define ENV_BITS		10
+#define ENV_LEN			(1<<ENV_BITS)
+#define ENV_STEP		(128.0/ENV_LEN)
+
+#define MAX_ATT_INDEX	((1<<(ENV_BITS-1))-1) /*511*/
+#define MIN_ATT_INDEX	(0)
+
+/* sinwave entries */
+#define SIN_BITS		10
+#define SIN_LEN			(1<<SIN_BITS)
+#define SIN_MASK		(SIN_LEN-1)
+
+#define TL_RES_LEN		(256)	/* 8 bits addressing (real chip) */
+
+
+
+/* register number to channel number , slot offset */
+#define SLOT1 0
+#define SLOT2 1
+
+/* Envelope Generator phases */
+
+#define EG_ATT			4
+#define EG_DEC			3
+#define EG_SUS			2
+#define EG_REL			1
+#define EG_OFF			0
+
+
+/* save output as raw 16-bit sample */
+
+/*#define SAVE_SAMPLE*/
+
+#ifdef SAVE_SAMPLE
+static FILE *sample1;
+	#if 1	/*save to MONO file */
+		#define SAVE_ALL_CHANNELS \
+		{	signed int pom = a; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+	#else	/*save to STEREO file */
+		#define SAVE_ALL_CHANNELS \
+		{	signed int pom = a; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+			pom = b; \
+			fputc((unsigned short)pom&0xff,sample0); \
+			fputc(((unsigned short)pom>>8)&0xff,sample0); \
+		}
+	#endif
+#endif
+
+//#define LOG_CYM_FILE 0
+//static FILE * cymfile = NULL;
+
+
+
+
+
+#define OPL3_TYPE_YMF262 (0)	/* 36 operators, 8 waveforms */
+
+
+typedef struct{
+	UINT32	ar;			/* attack rate: AR<<2 */
+	UINT32	dr;			/* decay rate: DR<<2 */
+	UINT32	rr;			/* release rate:RR<<2 */
+	UINT8	KSR;		/* key scale rate */
+	UINT8	ksl;		/* keyscale level */
+	UINT8	ksr;		/* key scale rate: kcode>>KSR */
+	UINT8	mul;		/* multiple: mul_tabML */
+
+	/* Phase Generator */
+	UINT32	Cnt;		/* frequency counter */
+	UINT32	Incr;		/* frequency counter step */
+	UINT8 FB;			/* feedback shift value */
+	INT32 *connect;	/* slot output pointer */
+	INT32 op1_out2;	/* slot1 output for feedback */
+	UINT8 CON;		/* connection (algorithm) type */
+
+	/* Envelope Generator */
+	UINT8	eg_type;	/* percussive/non-percussive mode */
+	UINT8	state;		/* phase type */
+	UINT32	TL;			/* total level: TL << 2 */
+	INT32	TLL;		/* adjusted now TL */
+	INT32	volume;		/* envelope counter */
+	UINT32	sl;			/* sustain level: sl_tabSL */
+
+	UINT32	eg_m_ar;	/* (attack state) */
+	UINT8	eg_sh_ar;	/* (attack state) */
+	UINT8	eg_sel_ar;	/* (attack state) */
+	UINT32	eg_m_dr;	/* (decay state) */
+	UINT8	eg_sh_dr;	/* (decay state) */
+	UINT8	eg_sel_dr;	/* (decay state) */
+	UINT32	eg_m_rr;	/* (release state) */
+	UINT8	eg_sh_rr;	/* (release state) */
+	UINT8	eg_sel_rr;	/* (release state) */
+
+	UINT32	key;		/* 0 = KEY OFF, >0 = KEY ON */
+
+	/* LFO */
+	UINT32	AMmask;		/* LFO Amplitude Modulation enable mask */
+	UINT8	vib;		/* LFO Phase Modulation enable flag (active high)*/
+
+	/* waveform select */
+	UINT8	waveform_number;
+	unsigned int wavetable;
+
+//unsigned char reserved128-84;//speedup: pump up the struct size to power of 2
+unsigned char reserved128-100;//speedup: pump up the struct size to power of 2
+
+} OPL3_SLOT;
+
+typedef struct{
+	OPL3_SLOT SLOT2;
+
+	UINT32	block_fnum;	/* block+fnum */
+	UINT32	fc;			/* Freq. Increment base */
+	UINT32	ksl_base;	/* KeyScaleLevel Base step */
+	UINT8	kcode;		/* key code (for key scaling) */
+
+	/*
+ there are 12 2-operator channels which can be combined in pairs
+ to form six 4-operator channel, they are:
+ 0 and 3,
+ 1 and 4,
+ 2 and 5,
+ 9 and 12,
+ 10 and 13,
+ 11 and 14
+ */
+	UINT8	extended;	/* set to 1 if this channel forms up a 4op channel with another channel(only used by first of pair of channels, ie 0,1,2 and 9,10,11) */
+	UINT8	Muted;
+
+unsigned char reserved512-272;//speedup:pump up the struct size to power of 2
+
+} OPL3_CH;
+
+/* OPL3 state */
+typedef struct {
+	OPL3_CH	P_CH18;				/* OPL3 chips have 18 channels */
+
+	UINT32	pan18*4;				/* channels output masks (0xffffffff = enable); 4 masks per one channel */
+	UINT32	pan_ctrl_value18;		/* output control values 1 per one channel (1 value contains 4 masks) */
+	UINT8	MuteSpc5;				/* for the 5 Rhythm Channels */
+
+	signed int chanout18;			/* 18 channels */
+	signed int phase_modulation;	/* phase modulation input (SLOT 2) */
+	signed int phase_modulation2;	/* phase modulation input (SLOT 3 in 4 operator channels) */
+
+	UINT32	eg_cnt;					/* global envelope generator counter */
+	UINT32	eg_timer;				/* global envelope generator counter works at frequency = chipclock/288 (288=8*36) */
+	UINT32	eg_timer_add;			/* step of eg_timer */
+	UINT32	eg_timer_overflow;		/* envelope generator timer overlfows every 1 sample (on real chip) */
+
+	UINT32	fn_tab1024;			/* fnumber->increment counter */
+
+	/* LFO */
+	UINT32	LFO_AM;
+	INT32	LFO_PM;
+	UINT8	lfo_am_depth;
+	UINT8	lfo_pm_depth_range;
+	UINT32	lfo_am_cnt;
+	UINT32	lfo_am_inc;
+	UINT32	lfo_pm_cnt;
+	UINT32	lfo_pm_inc;
+
+	UINT32	noise_rng;				/* 23 bit noise shift register */
+	UINT32	noise_p;				/* current noise 'phase' */
+	UINT32	noise_f;				/* current noise period */
+
+	UINT8	OPL3_mode;				/* OPL3 extension enable flag */
+
+	UINT8	rhythm;					/* Rhythm mode */
+
+	int		T2;					/* timer counters */
+	UINT8	st2;					/* timer enable */
+
+	UINT32	address;				/* address register */
+	UINT8	status;					/* status flag */
+	UINT8	statusmask;				/* status mask */
+
+	UINT8	nts;					/* NTS (note select) */
+
+	/* external event callback handlers */
+	OPL3_TIMERHANDLER timer_handler;/* TIMER handler */
+	void *TimerParam;					/* TIMER parameter */
+	OPL3_IRQHANDLER IRQHandler;	/* IRQ handler */
+	void *IRQParam;					/* IRQ parameter */
+	OPL3_UPDATEHANDLER UpdateHandler;/* stream update handler */
+	void *UpdateParam;				/* stream update parameter */
+
+	UINT8 type;						/* chip type */
+	int clock;						/* master clock (Hz) */
+	int rate;						/* sampling rate (Hz) */
+	double freqbase;				/* frequency base */
+	//attotime TimerBase;			/* Timer base time (==sampling time)*/
+} OPL3;
+
+
+
+/* mapping of register number (offset) to slot number used by the emulator */
+static const int slot_array32=
+{
+	 0, 2, 4, 1, 3, 5,-1,-1,
+	 6, 8,10, 7, 9,11,-1,-1,
+	12,14,16,13,15,17,-1,-1,
+	-1,-1,-1,-1,-1,-1,-1,-1
+};
+
+/* key scale level */
+/* table is 3dB/octave , DV converts this into 6dB/octave */
+/* 0.1875 is bit 0 weight of the envelope counter (volume) expressed in the 'decibel' scale */
+#define DV (0.1875/2.0)
+static const UINT32 ksl_tab8*16=
+{
+	/* OCT 0 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	/* OCT 1 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV,
+	 1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV,
+	/* OCT 2 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	 0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV,
+	 3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV,
+	 4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV,
+	/* OCT 3 */
+	 0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV,
+	 3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV,
+	 6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV,
+	 7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV,
+	/* OCT 4 */
+	 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
+	 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
+	 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
+	10.875/DV,11.250/DV,11.625/DV,12.000/DV,
+	/* OCT 5 */
+	 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
+	 9.000/DV,10.125/DV,10.875/DV,11.625/DV,
+	12.000/DV,12.750/DV,13.125/DV,13.500/DV,
+	13.875/DV,14.250/DV,14.625/DV,15.000/DV,
+	/* OCT 6 */
+	 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
+	12.000/DV,13.125/DV,13.875/DV,14.625/DV,
+	15.000/DV,15.750/DV,16.125/DV,16.500/DV,
+	16.875/DV,17.250/DV,17.625/DV,18.000/DV,
+	/* OCT 7 */
+	 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
+	15.000/DV,16.125/DV,16.875/DV,17.625/DV,
+	18.000/DV,18.750/DV,19.125/DV,19.500/DV,
+	19.875/DV,20.250/DV,20.625/DV,21.000/DV
+};
+#undef DV
+
+/* 0 / 3.0 / 1.5 / 6.0 dB/OCT */
+static const UINT32 ksl_shift4 = { 31, 1, 2, 0 };
+
+
+/* sustain level table (3dB per step) */
+/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
+#define SC(db) (UINT32) ( db * (2.0/ENV_STEP) )
+static const UINT32 sl_tab16={
+ SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
+ SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)
+};
+#undef SC
+
+
+#define RATE_STEPS (8)
+static const unsigned char eg_inc15*RATE_STEPS={
+
+/*cycle:0 1 2 3 4 5 6 7*/
+
+/* 0 */ 0,1, 0,1, 0,1, 0,1, /* rates 00..12 0 (increment by 0 or 1) */
+/* 1 */ 0,1, 0,1, 1,1, 0,1, /* rates 00..12 1 */
+/* 2 */ 0,1, 1,1, 0,1, 1,1, /* rates 00..12 2 */
+/* 3 */ 0,1, 1,1, 1,1, 1,1, /* rates 00..12 3 */
+
+/* 4 */ 1,1, 1,1, 1,1, 1,1, /* rate 13 0 (increment by 1) */
+/* 5 */ 1,1, 1,2, 1,1, 1,2, /* rate 13 1 */
+/* 6 */ 1,2, 1,2, 1,2, 1,2, /* rate 13 2 */
+/* 7 */ 1,2, 2,2, 1,2, 2,2, /* rate 13 3 */
+
+/* 8 */ 2,2, 2,2, 2,2, 2,2, /* rate 14 0 (increment by 2) */
+/* 9 */ 2,2, 2,4, 2,2, 2,4, /* rate 14 1 */
+/*10 */ 2,4, 2,4, 2,4, 2,4, /* rate 14 2 */
+/*11 */ 2,4, 4,4, 2,4, 4,4, /* rate 14 3 */
+
+/*12 */ 4,4, 4,4, 4,4, 4,4, /* rates 15 0, 15 1, 15 2, 15 3 for decay */
+/*13 */ 8,8, 8,8, 8,8, 8,8, /* rates 15 0, 15 1, 15 2, 15 3 for attack (zero time) */
+/*14 */ 0,0, 0,0, 0,0, 0,0, /* infinity rates for attack and decay(s) */
+};
+
+
+#define O(a) (a*RATE_STEPS)
+
+/* note that there is no O(13) in this table - it's directly in the code */
+static const unsigned char eg_rate_select16+64+16={	/* Envelope Generator rates (16 + 64 rates + 16 RKS) */
+/* 16 infinite time rates */
+O(14),O(14),O(14),O(14),O(14),O(14),O(14),O(14),
+O(14),O(14),O(14),O(14),O(14),O(14),O(14),O(14),
+
+/* rates 00-12 */
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+O( 0),O( 1),O( 2),O( 3),
+
+/* rate 13 */
+O( 4),O( 5),O( 6),O( 7),
+
+/* rate 14 */
+O( 8),O( 9),O(10),O(11),
+
+/* rate 15 */
+O(12),O(12),O(12),O(12),
+
+/* 16 dummy rates (same as 15 3) */
+O(12),O(12),O(12),O(12),O(12),O(12),O(12),O(12),
+O(12),O(12),O(12),O(12),O(12),O(12),O(12),O(12),
+
+};
+#undef O
+
+/*rate 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 */
+/*shift 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0 */
+/*mask 4095, 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1, 0, 0, 0, 0 */
+
+#define O(a) (a*1)
+static const unsigned char eg_rate_shift16+64+16={	/* Envelope Generator counter shifts (16 + 64 rates + 16 RKS) */
+/* 16 infinite time rates */
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+O(0),O(0),O(0),O(0),O(0),O(0),O(0),O(0),
+
+/* rates 00-12 */
+O(12),O(12),O(12),O(12),
+O(11),O(11),O(11),O(11),
+O(10),O(10),O(10),O(10),
+O( 9),O( 9),O( 9),O( 9),
+O( 8),O( 8),O( 8),O( 8),
+O( 7),O( 7),O( 7),O( 7),
+O( 6),O( 6),O( 6),O( 6),
+O( 5),O( 5),O( 5),O( 5),
+O( 4),O( 4),O( 4),O( 4),
+O( 3),O( 3),O( 3),O( 3),
+O( 2),O( 2),O( 2),O( 2),
+O( 1),O( 1),O( 1),O( 1),
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 13 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 14 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* rate 15 */
+O( 0),O( 0),O( 0),O( 0),
+
+/* 16 dummy rates (same as 15 3) */
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),O( 0),
+
+};
+#undef O
+
+
+/* multiple table */
+#define ML 2
+static const UINT8 mul_tab16= {
+/* 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,10,12,12,15,15 */
+ 0.50*ML, 1.00*ML, 2.00*ML, 3.00*ML, 4.00*ML, 5.00*ML, 6.00*ML, 7.00*ML,
+ 8.00*ML, 9.00*ML,10.00*ML,10.00*ML,12.00*ML,12.00*ML,15.00*ML,15.00*ML
+};
+#undef ML
+
+/* TL_TAB_LEN is calculated as:
+
+* (12+1)=13 - sinus amplitude bits (Y axis)
+* additional 1: to compensate for calculations of negative part of waveform
+* (if we don't add it then the greatest possible _negative_ value would be -2
+* and we really need -1 for waveform #7)
+* 2 - sinus sign bit (Y axis)
+* TL_RES_LEN - sinus resolution (X axis)
+*/
+#define TL_TAB_LEN (13*2*TL_RES_LEN)
+static signed int tl_tabTL_TAB_LEN;
+
+#define ENV_QUIET		(TL_TAB_LEN>>4)
+
+/* sin waveform table in 'decibel' scale */
+/* there are eight waveforms on OPL3 chips */
+static unsigned int sin_tabSIN_LEN * 8;
+
+
+/* LFO Amplitude Modulation table (verified on real YM3812)
+ 27 output levels (triangle waveform); 1 level takes one of: 192, 256 or 448 samples
+
+ Length: 210 elements.
+
+ Each of the elements has to be repeated
+ exactly 64 times (on 64 consecutive samples).
+ The whole table takes: 64 * 210 = 13440 samples.
+
+ When AM = 1 data is used directly
+ When AM = 0 data is divided by 4 before being used (losing precision is important)
+*/
+
+#define LFO_AM_TAB_ELEMENTS 210
+
+static const UINT8 lfo_am_tableLFO_AM_TAB_ELEMENTS = {
+0,0,0,0,0,0,0,
+1,1,1,1,
+2,2,2,2,
+3,3,3,3,
+4,4,4,4,
+5,5,5,5,
+6,6,6,6,
+7,7,7,7,
+8,8,8,8,
+9,9,9,9,
+10,10,10,10,
+11,11,11,11,
+12,12,12,12,
+13,13,13,13,
+14,14,14,14,
+15,15,15,15,
+16,16,16,16,
+17,17,17,17,
+18,18,18,18,
+19,19,19,19,
+20,20,20,20,
+21,21,21,21,
+22,22,22,22,
+23,23,23,23,
+24,24,24,24,
+25,25,25,25,
+26,26,26,
+25,25,25,25,
+24,24,24,24,
+23,23,23,23,
+22,22,22,22,
+21,21,21,21,
+20,20,20,20,
+19,19,19,19,
+18,18,18,18,
+17,17,17,17,
+16,16,16,16,
+15,15,15,15,
+14,14,14,14,
+13,13,13,13,
+12,12,12,12,
+11,11,11,11,
+10,10,10,10,
+9,9,9,9,
+8,8,8,8,
+7,7,7,7,
+6,6,6,6,
+5,5,5,5,
+4,4,4,4,
+3,3,3,3,
+2,2,2,2,
+1,1,1,1
+};
+
+/* LFO Phase Modulation table (verified on real YM3812) */
+static const INT8 lfo_pm_table8*8*2 = {
+
+/* FNUM2/FNUM = 00 0xxxxxxx (0x0000) */
+0, 0, 0, 0, 0, 0, 0, 0,	/*LFO PM depth = 0*/
+0, 0, 0, 0, 0, 0, 0, 0,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 00 1xxxxxxx (0x0080) */
+0, 0, 0, 0, 0, 0, 0, 0,	/*LFO PM depth = 0*/
+1, 0, 0, 0,-1, 0, 0, 0,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 01 0xxxxxxx (0x0100) */
+1, 0, 0, 0,-1, 0, 0, 0,	/*LFO PM depth = 0*/
+2, 1, 0,-1,-2,-1, 0, 1,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 01 1xxxxxxx (0x0180) */
+1, 0, 0, 0,-1, 0, 0, 0,	/*LFO PM depth = 0*/
+3, 1, 0,-1,-3,-1, 0, 1,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 10 0xxxxxxx (0x0200) */
+2, 1, 0,-1,-2,-1, 0, 1,	/*LFO PM depth = 0*/
+4, 2, 0,-2,-4,-2, 0, 2,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 10 1xxxxxxx (0x0280) */
+2, 1, 0,-1,-2,-1, 0, 1,	/*LFO PM depth = 0*/
+5, 2, 0,-2,-5,-2, 0, 2,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 11 0xxxxxxx (0x0300) */
+3, 1, 0,-1,-3,-1, 0, 1,	/*LFO PM depth = 0*/
+6, 3, 0,-3,-6,-3, 0, 3,	/*LFO PM depth = 1*/
+
+/* FNUM2/FNUM = 11 1xxxxxxx (0x0380) */
+3, 1, 0,-1,-3,-1, 0, 1,	/*LFO PM depth = 0*/
+7, 3, 0,-3,-7,-3, 0, 3	/*LFO PM depth = 1*/
+};
+
+
+/* lock level of common table */
+static int num_lock = 0;
+
+/* work table */
+#define SLOT7_1 (&chip->P_CH7.SLOTSLOT1)
+#define SLOT7_2 (&chip->P_CH7.SLOTSLOT2)
+#define SLOT8_1 (&chip->P_CH8.SLOTSLOT1)
+#define SLOT8_2 (&chip->P_CH8.SLOTSLOT2)
+
+
+
+/*INLINE int limit( int val, int max, int min ) {
+	if ( val > max )
+		val = max;
+	else if ( val < min )
+		val = min;
+
+	return val;
+}*/
+
+
+/* status set and IRQ handling */
+INLINE void OPL3_STATUS_SET(OPL3 *chip,int flag)
+{
+	/* set status flag masking out disabled IRQs */
+	chip->status |= (flag & chip->statusmask);
+	if(!(chip->status & 0x80))
+	{
+		if(chip->status & 0x7f)
+		{	/* IRQ on */
+			chip->status |= 0x80;
+			/* callback user interrupt handler (IRQ is OFF to ON) */
+			if(chip->IRQHandler) (chip->IRQHandler)(chip->IRQParam,1);
+		}
+	}
+}
+
+/* status reset and IRQ handling */
+INLINE void OPL3_STATUS_RESET(OPL3 *chip,int flag)
+{
+	/* reset status flag */
+	chip->status &= ~flag;
+	if(chip->status & 0x80)
+	{
+		if (!(chip->status & 0x7f))
+		{
+			chip->status &= 0x7f;
+			/* callback user interrupt handler (IRQ is ON to OFF) */
+			if(chip->IRQHandler) (chip->IRQHandler)(chip->IRQParam,0);
+		}
+	}
+}
+
+/* IRQ mask set */
+INLINE void OPL3_STATUSMASK_SET(OPL3 *chip,int flag)
+{
+	chip->statusmask = flag;
+	/* IRQ handling check */
+	OPL3_STATUS_SET(chip,0);
+	OPL3_STATUS_RESET(chip,0);
+}
+
+
+/* advance LFO to next sample */
+INLINE void advance_lfo(OPL3 *chip)
+{
+	UINT8 tmp;
+
+	/* LFO */
+	chip->lfo_am_cnt += chip->lfo_am_inc;
+	if (chip->lfo_am_cnt >= ((UINT32)LFO_AM_TAB_ELEMENTS<<LFO_SH) )	/* lfo_am_table is 210 elements long */
+		chip->lfo_am_cnt -= ((UINT32)LFO_AM_TAB_ELEMENTS<<LFO_SH);
+
+	tmp = lfo_am_table chip->lfo_am_cnt >> LFO_SH ;
+
+	if (chip->lfo_am_depth)
+		chip->LFO_AM = tmp;
+	else
+		chip->LFO_AM = tmp>>2;
+
+	chip->lfo_pm_cnt += chip->lfo_pm_inc;
+	chip->LFO_PM = ((chip->lfo_pm_cnt>>LFO_SH) & 7) | chip->lfo_pm_depth_range;
+}
+
+/* advance to next sample */
+INLINE void advance(OPL3 *chip)
+{
+	OPL3_CH *CH;
+	OPL3_SLOT *op;
+	int i;
+
+	chip->eg_timer += chip->eg_timer_add;
+
+	while (chip->eg_timer >= chip->eg_timer_overflow)
+	{
+		chip->eg_timer -= chip->eg_timer_overflow;
+
+		chip->eg_cnt++;
+
+		for (i=0; i<9*2*2; i++)
+		{
+			CH = &chip->P_CHi/2;
+			op = &CH->SLOTi&1;
+#if 1
+			/* Envelope Generator */
+			switch(op->state)
+			{
+			case EG_ATT:	/* attack phase */
+// if ( !(chip->eg_cnt & ((1<<op->eg_sh_ar)-1) ) )
+				if ( !(chip->eg_cnt & op->eg_m_ar) )
+				{
+					op->volume += (~op->volume *
+							 (eg_incop->eg_sel_ar + ((chip->eg_cnt>>op->eg_sh_ar)&7))
+							 ) >>3;
+
+					if (op->volume <= MIN_ATT_INDEX)
+					{
+						op->volume = MIN_ATT_INDEX;
+						op->state = EG_DEC;
+					}
+
+				}
+			break;
+
+			case EG_DEC:	/* decay phase */
+// if ( !(chip->eg_cnt & ((1<<op->eg_sh_dr)-1) ) )
+				if ( !(chip->eg_cnt & op->eg_m_dr) )
+				{
+					op->volume += eg_incop->eg_sel_dr + ((chip->eg_cnt>>op->eg_sh_dr)&7);
+
+					if ( op->volume >= op->sl )
+						op->state = EG_SUS;
+
+				}
+			break;
+
+			case EG_SUS:	/* sustain phase */
+
+				/* this is important behaviour:
+ one can change percusive/non-percussive modes on the fly and
+ the chip will remain in sustain phase - verified on real YM3812 */
+
+				if(op->eg_type)		/* non-percussive mode */
+				{
+									/* do nothing */
+				}
+				else				/* percussive mode */
+				{
+					/* during sustain phase chip adds Release Rate (in percussive mode) */
+// if ( !(chip->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
+					if ( !(chip->eg_cnt & op->eg_m_rr) )
+					{
+						op->volume += eg_incop->eg_sel_rr + ((chip->eg_cnt>>op->eg_sh_rr)&7);
+
+						if ( op->volume >= MAX_ATT_INDEX )
+							op->volume = MAX_ATT_INDEX;
+					}
+					/* else do nothing in sustain phase */
+				}
+			break;
+
+			case EG_REL:	/* release phase */
+// if ( !(chip->eg_cnt & ((1<<op->eg_sh_rr)-1) ) )
+				if ( !(chip->eg_cnt & op->eg_m_rr) )
+				{
+					op->volume += eg_incop->eg_sel_rr + ((chip->eg_cnt>>op->eg_sh_rr)&7);
+
+					if ( op->volume >= MAX_ATT_INDEX )
+					{
+						op->volume = MAX_ATT_INDEX;
+						op->state = EG_OFF;
+					}
+
+				}
+			break;
+
+			default:
+			break;
+			}
+#endif
+		}
+	}
+
+	for (i=0; i<9*2*2; i++)
+	{
+		CH = &chip->P_CHi/2;
+		op = &CH->SLOTi&1;
+
+		/* Phase Generator */
+		if(op->vib)
+		{
+			UINT8 block;
+			unsigned int block_fnum = CH->block_fnum;
+
+			unsigned int fnum_lfo = (block_fnum&0x0380) >> 7;
+
+			signed int lfo_fn_table_index_offset = lfo_pm_tablechip->LFO_PM + 16*fnum_lfo ;
+
+			if (lfo_fn_table_index_offset)	/* LFO phase modulation active */
+			{
+				block_fnum += lfo_fn_table_index_offset;
+				block = (block_fnum&0x1c00) >> 10;
+				op->Cnt += (chip->fn_tabblock_fnum&0x03ff >> (7-block)) * op->mul;
+			}
+			else	/* LFO phase modulation = zero */
+			{
+				op->Cnt += op->Incr;
+			}
+		}
+		else	/* LFO phase modulation disabled for this operator */
+		{
+			op->Cnt += op->Incr;
+		}
+	}
+
+	/* The Noise Generator of the YM3812 is 23-bit shift register.
+ * Period is equal to 2^23-2 samples.
+ * Register works at sampling frequency of the chip, so output
+ * can change on every sample.
+ *
+ * Output of the register and input to the bit 22 is:
+ * bit0 XOR bit14 XOR bit15 XOR bit22
+ *
+ * Simply use bit 22 as the noise output.
+ */
+
+	chip->noise_p += chip->noise_f;
+	i = chip->noise_p >> FREQ_SH;		/* number of events (shifts of the shift register) */
+	chip->noise_p &= FREQ_MASK;
+	while (i)
+	{
+		/*
+ UINT32 j;
+ j = ( (chip->noise_rng) ^ (chip->noise_rng>>14) ^ (chip->noise_rng>>15) ^ (chip->noise_rng>>22) ) & 1;
+ chip->noise_rng = (j<<22) | (chip->noise_rng>>1);
+ */
+
+		/*
+ Instead of doing all the logic operations above, we
+ use a trick here (and use bit 0 as the noise output).
+ The difference is only that the noise bit changes one
+ step ahead. This doesn't matter since we don't know
+ what is real state of the noise_rng after the reset.
+ */
+
+		if (chip->noise_rng & 1) chip->noise_rng ^= 0x800302;
+		chip->noise_rng >>= 1;
+
+		i--;
+	}
+}
+
+
+INLINE signed int op_calc(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+{
+	UINT32 p;
+
+	p = (env<<4) + sin_tabwave_tab + ((((signed int)((phase & ~FREQ_MASK) + (pm<<16))) >> FREQ_SH ) & SIN_MASK) ;
+
+	if (p >= TL_TAB_LEN)
+		return 0;
+	return tl_tabp;
+}
+
+INLINE signed int op_calc1(UINT32 phase, unsigned int env, signed int pm, unsigned int wave_tab)
+{
+	UINT32 p;
+
+	p = (env<<4) + sin_tabwave_tab + ((((signed int)((phase & ~FREQ_MASK) + pm))>>FREQ_SH) & SIN_MASK);
+
+	if (p >= TL_TAB_LEN)
+		return 0;
+	return tl_tabp;
+}
+
+
+#define volume_calc(OP) ((OP)->TLL + ((UINT32)(OP)->volume) + (chip->LFO_AM & (OP)->AMmask))
+
+/* calculate output of a standard 2 operator channel
+ (or 1st part of a 4-op channel) */
+INLINE void chan_calc( OPL3 *chip, OPL3_CH *CH )
+{
+	OPL3_SLOT *SLOT;
+	unsigned int env;
+	signed int out;
+
+	if (CH->Muted)
+		return;
+
+	chip->phase_modulation = 0;
+	chip->phase_modulation2= 0;
+
+	/* SLOT 1 */
+	SLOT = &CH->SLOTSLOT1;
+	env = volume_calc(SLOT);
+	out = SLOT->op1_out0 + SLOT->op1_out1;
+	SLOT->op1_out0 = SLOT->op1_out1;
+	SLOT->op1_out1 = 0;
+	if( env < ENV_QUIET )
+	{
+		if (!SLOT->FB)
+			out = 0;
+		SLOT->op1_out1 = op_calc1(SLOT->Cnt, env, (out<<SLOT->FB), SLOT->wavetable );
+	}
+	*SLOT->connect += SLOT->op1_out1;
+//logerror("out0=%5i vol0=%4i ", SLOT->op1_out1, env );
+
+	/* SLOT 2 */
+	SLOT++;
+	env = volume_calc(SLOT);
+	if( env < ENV_QUIET )
+		*SLOT->connect += op_calc(SLOT->Cnt, env, chip->phase_modulation, SLOT->wavetable);
+
+//logerror("out1=%5i vol1=%4i\n", op_calc(SLOT->Cnt, env, chip->phase_modulation, SLOT->wavetable), env );
+
+}
+
+/* calculate output of a 2nd part of 4-op channel */
+INLINE void chan_calc_ext( OPL3 *chip, OPL3_CH *CH )
+{
+	OPL3_SLOT *SLOT;
+	unsigned int env;
+
+	if (CH->Muted)
+		return;
+
+	chip->phase_modulation = 0;
+
+	/* SLOT 1 */
+	SLOT = &CH->SLOTSLOT1;
+	env = volume_calc(SLOT);
+	if( env < ENV_QUIET )
+		*SLOT->connect += op_calc(SLOT->Cnt, env, chip->phase_modulation2, SLOT->wavetable );
+
+	/* SLOT 2 */
+	SLOT++;
+	env = volume_calc(SLOT);
+	if( env < ENV_QUIET )
+		*SLOT->connect += op_calc(SLOT->Cnt, env, chip->phase_modulation, SLOT->wavetable);
+
+}
+
+/*
+ operators used in the rhythm sounds generation process:
+
+ Envelope Generator:
+
+channel operator register number Bass High Snare Tom Top
+/ slot number TL ARDR SLRR Wave Drum Hat Drum Tom Cymbal
+ 6 / 0 12 50 70 90 f0 +
+ 6 / 1 15 53 73 93 f3 +
+ 7 / 0 13 51 71 91 f1 +
+ 7 / 1 16 54 74 94 f4 +
+ 8 / 0 14 52 72 92 f2 +
+ 8 / 1 17 55 75 95 f5 +
+
+ Phase Generator:
+
+channel operator register number Bass High Snare Tom Top
+/ slot number MULTIPLE Drum Hat Drum Tom Cymbal
+ 6 / 0 12 30 +
+ 6 / 1 15 33 +
+ 7 / 0 13 31 + + +
+ 7 / 1 16 34 ----- n o t u s e d -----
+ 8 / 0 14 32 +
+ 8 / 1 17 35 + +
+
+channel operator register number Bass High Snare Tom Top
+number number BLK/FNUM2 FNUM Drum Hat Drum Tom Cymbal
+ 6 12,15 B6 A6 +
+
+ 7 13,16 B7 A7 + + +
+
+ 8 14,17 B8 A8 + + +
+
+*/
+
+/* calculate rhythm */
+
+INLINE void chan_calc_rhythm( OPL3 *chip, OPL3_CH *CH, unsigned int noise )
+{
+	OPL3_SLOT *SLOT;
+	signed int *chanout = chip->chanout;
+	signed int out;
+	unsigned int env;
+
+
+	/* Bass Drum (verified on real YM3812):
+ - depends on the channel 6 'connect' register:
+ when connect = 0 it works the same as in normal (non-rhythm) mode (op1->op2->out)
+ when connect = 1 _only_ operator 2 is present on output (op2->out), operator 1 is ignored
+ - output sample always is multiplied by 2
+ */
+
+	chip->phase_modulation = 0;
+
+	/* SLOT 1 */
+	SLOT = &CH6.SLOTSLOT1;
+	env = volume_calc(SLOT);
+
+	out = SLOT->op1_out0 + SLOT->op1_out1;
+	SLOT->op1_out0 = SLOT->op1_out1;
+
+	if (!SLOT->CON)
+		chip->phase_modulation = SLOT->op1_out0;
+	//else ignore output of operator 1
+
+	SLOT->op1_out1 = 0;
+	if( env < ENV_QUIET )
+	{
+		if (!SLOT->FB)
+			out = 0;
+		SLOT->op1_out1 = op_calc1(SLOT->Cnt, env, (out<<SLOT->FB), SLOT->wavetable );
+	}
+
+	/* SLOT 2 */
+	SLOT++;
+	env = volume_calc(SLOT);
+	if( env < ENV_QUIET && ! chip->MuteSpc0 )
+		chanout6 += op_calc(SLOT->Cnt, env, chip->phase_modulation, SLOT->wavetable) * 2;
+
+
+	/* Phase generation is based on: */
+	// HH (13) channel 7->slot 1 combined with channel 8->slot 2 (same combination as TOP CYMBAL but different output phases)
+	// SD (16) channel 7->slot 1
+	// TOM (14) channel 8->slot 1
+	// TOP (17) channel 7->slot 1 combined with channel 8->slot 2 (same combination as HIGH HAT but different output phases)
+
+	/* Envelope generation based on: */
+	// HH channel 7->slot1
+	// SD channel 7->slot2
+	// TOM channel 8->slot1
+	// TOP channel 8->slot2
+
+
+	/* The following formulas can be well optimized.
+ I leave them in direct form for now (in case I've missed something).
+ */
+
+	/* High Hat (verified on real YM3812) */
+	env = volume_calc(SLOT7_1);
+	if( env < ENV_QUIET && ! chip->MuteSpc4 )
+	{
+
+		/* high hat phase generation:
+ phase = d0 or 234 (based on frequency only)
+ phase = 34 or 2d0 (based on noise)
+ */
+
+		/* base frequency derived from operator 1 in channel 7 */
+		unsigned char bit7 = ((SLOT7_1->Cnt>>FREQ_SH)>>7)&1;
+		unsigned char bit3 = ((SLOT7_1->Cnt>>FREQ_SH)>>3)&1;
+		unsigned char bit2 = ((SLOT7_1->Cnt>>FREQ_SH)>>2)&1;
+
+		unsigned char res1 = (bit2 ^ bit7) | bit3;
+
+		/* when res1 = 0 phase = 0x000 | 0xd0; */
+		/* when res1 = 1 phase = 0x200 | (0xd0>>2); */
+		UINT32 phase = res1 ? (0x200|(0xd0>>2)) : 0xd0;
+
+		/* enable gate based on frequency of operator 2 in channel 8 */
+		unsigned char bit5e= ((SLOT8_2->Cnt>>FREQ_SH)>>5)&1;
+		unsigned char bit3e= ((SLOT8_2->Cnt>>FREQ_SH)>>3)&1;
+
+		unsigned char res2 = (bit3e ^ bit5e);
+
+		/* when res2 = 0 pass the phase from calculation above (res1); */
+		/* when res2 = 1 phase = 0x200 | (0xd0>>2); */
+		if (res2)
+			phase = (0x200|(0xd0>>2));
+
+
+		/* when phase & 0x200 is set and noise=1 then phase = 0x200|0xd0 */
+		/* when phase & 0x200 is set and noise=0 then phase = 0x200|(0xd0>>2), ie no change */
+		if (phase&0x200)
+		{
+			if (noise)
+				phase = 0x200|0xd0;
+		}
+		else
+		/* when phase & 0x200 is clear and noise=1 then phase = 0xd0>>2 */
+		/* when phase & 0x200 is clear and noise=0 then phase = 0xd0, ie no change */
+		{
+			if (noise)
+				phase = 0xd0>>2;
+		}
+
+		chanout7 += op_calc(phase<<FREQ_SH, env, 0, SLOT7_1->wavetable) * 2;
+	}
+
+	/* Snare Drum (verified on real YM3812) */
+	env = volume_calc(SLOT7_2);
+	if( env < ENV_QUIET && ! chip->MuteSpc1 )
+	{
+		/* base frequency derived from operator 1 in channel 7 */
+		unsigned char bit8 = ((SLOT7_1->Cnt>>FREQ_SH)>>8)&1;
+
+		/* when bit8 = 0 phase = 0x100; */
+		/* when bit8 = 1 phase = 0x200; */
+		UINT32 phase = bit8 ? 0x200 : 0x100;
+
+		/* Noise bit XOR'es phase by 0x100 */
+		/* when noisebit = 0 pass the phase from calculation above */
+		/* when noisebit = 1 phase ^= 0x100; */
+		/* in other words: phase ^= (noisebit<<8); */
+		if (noise)
+			phase ^= 0x100;
+
+		chanout7 += op_calc(phase<<FREQ_SH, env, 0, SLOT7_2->wavetable) * 2;
+	}
+
+	/* Tom Tom (verified on real YM3812) */
+	env = volume_calc(SLOT8_1);
+	if( env < ENV_QUIET && ! chip->MuteSpc2 )
+		chanout8 += op_calc(SLOT8_1->Cnt, env, 0, SLOT8_1->wavetable) * 2;
+
+	/* Top Cymbal (verified on real YM3812) */
+	env = volume_calc(SLOT8_2);
+	if( env < ENV_QUIET && ! chip->MuteSpc3 )
+	{
+		/* base frequency derived from operator 1 in channel 7 */
+		unsigned char bit7 = ((SLOT7_1->Cnt>>FREQ_SH)>>7)&1;
+		unsigned char bit3 = ((SLOT7_1->Cnt>>FREQ_SH)>>3)&1;
+		unsigned char bit2 = ((SLOT7_1->Cnt>>FREQ_SH)>>2)&1;
+
+		unsigned char res1 = (bit2 ^ bit7) | bit3;
+
+		/* when res1 = 0 phase = 0x000 | 0x100; */
+		/* when res1 = 1 phase = 0x200 | 0x100; */
+		UINT32 phase = res1 ? 0x300 : 0x100;
+
+		/* enable gate based on frequency of operator 2 in channel 8 */
+		unsigned char bit5e= ((SLOT8_2->Cnt>>FREQ_SH)>>5)&1;
+		unsigned char bit3e= ((SLOT8_2->Cnt>>FREQ_SH)>>3)&1;
+
+		unsigned char res2 = (bit3e ^ bit5e);
+		/* when res2 = 0 pass the phase from calculation above (res1); */
+		/* when res2 = 1 phase = 0x200 | 0x100; */
+		if (res2)
+			phase = 0x300;
+
+		chanout8 += op_calc(phase<<FREQ_SH, env, 0, SLOT8_2->wavetable) * 2;
+	}
+
+}
+
+
+/* generic table initialize */
+static int init_tables(void)
+{
+	signed int i,x;
+	signed int n;
+	double o,m;
+
+
+	for (x=0; x<TL_RES_LEN; x++)
+	{
+		m = (1<<16) / pow(2, (x+1) * (ENV_STEP/4.0) / 8.0);
+		m = floor(m);
+
+		/* we never reach (1<<16) here due to the (x+1) */
+		/* result fits within 16 bits at maximum */
+
+		n = (int)m;		/* 16 bits here */
+		n >>= 4;		/* 12 bits here */
+		if (n&1)		/* round to nearest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+						/* 11 bits here (rounded) */
+		n <<= 1;		/* 12 bits here (as in real chip) */
+		tl_tab x*2 + 0 = n;
+		tl_tab x*2 + 1 = ~tl_tab x*2 + 0 ; /* this *is* different from OPL2 (verified on real YMF262) */
+
+		for (i=1; i<13; i++)
+		{
+			tl_tab x*2+0 + i*2*TL_RES_LEN = tl_tab x*2+0 >>i;
+			tl_tab x*2+1 + i*2*TL_RES_LEN = ~tl_tab x*2+0 + i*2*TL_RES_LEN ; /* this *is* different from OPL2 (verified on real YMF262) */
+		}
+	#if 0
+			logerror("tl %04i", x*2);
+			for (i=0; i<13; i++)
+				logerror(", %02i %5i", i*2, tl_tab x*2 +0 + i*2*TL_RES_LEN ); /* positive */
+			logerror("\n");
+
+			logerror("tl %04i", x*2);
+			for (i=0; i<13; i++)
+				logerror(", %02i %5i", i*2, tl_tab x*2 +1 + i*2*TL_RES_LEN ); /* negative */
+			logerror("\n");
+	#endif
+	}
+
+	for (i=0; i<SIN_LEN; i++)
+	{
+		/* non-standard sinus */
+		m = sin( ((i*2)+1) * M_PI / SIN_LEN ); /* checked against the real chip */
+
+		/* we never reach zero here due to ((i*2)+1) */
+
+		if (m>0.0)
+			o = 8*log(1.0/m)/log(2.0);	/* convert to 'decibels' */
+		else
+			o = 8*log(-1.0/m)/log(2.0);	/* convert to 'decibels' */
+
+		o = o / (ENV_STEP/4);
+
+		n = (int)(2.0*o);
+		if (n&1)						/* round to nearest */
+			n = (n>>1)+1;
+		else
+			n = n>>1;
+
+		sin_tab i = n*2 + (m>=0.0? 0: 1 );
+
+		/*logerror("YMF262.C: sin %4i (hex=%03x)= %4i (tl_tab value=%5i)\n", i, i, sin_tabi, tl_tabsin_tabi );*/
+	}
+
+	for (i=0; i<SIN_LEN; i++)
+	{
+		/* these 'pictures' represent _two_ cycles */
+		/* waveform 1: __ __ */
+		/* / \____/ \____*/
+		/* output only first half of the sinus waveform (positive one) */
+
+		if (i & (1<<(SIN_BITS-1)) )
+			sin_tab1*SIN_LEN+i = TL_TAB_LEN;
+		else
+			sin_tab1*SIN_LEN+i = sin_tabi;
+
+		/* waveform 2: __ __ __ __ */
+		/* / \/ \/ \/ \*/
+		/* abs(sin) */
+
+		sin_tab2*SIN_LEN+i = sin_tabi & (SIN_MASK>>1) ;
+
+		/* waveform 3: _ _ _ _ */
+		/* / |_/ |_/ |_/ |_*/
+		/* abs(output only first quarter of the sinus waveform) */
+
+		if (i & (1<<(SIN_BITS-2)) )
+			sin_tab3*SIN_LEN+i = TL_TAB_LEN;
+		else
+			sin_tab3*SIN_LEN+i = sin_tabi & (SIN_MASK>>2);
+
+		/* waveform 4: */
+		/* /\ ____/\ ____*/
+		/* \/ \/ */
+		/* output whole sinus waveform in half the cycle(step=2) and output 0 on the other half of cycle */
+
+		if (i & (1<<(SIN_BITS-1)) )
+			sin_tab4*SIN_LEN+i = TL_TAB_LEN;
+		else
+			sin_tab4*SIN_LEN+i = sin_tabi*2;
+
+		/* waveform 5: */
+		/* /\/\____/\/\____*/
+		/* */
+		/* output abs(whole sinus) waveform in half the cycle(step=2) and output 0 on the other half of cycle */
+
+		if (i & (1<<(SIN_BITS-1)) )
+			sin_tab5*SIN_LEN+i = TL_TAB_LEN;
+		else
+			sin_tab5*SIN_LEN+i = sin_tab(i*2) & (SIN_MASK>>1) ;
+
+		/* waveform 6: ____ ____ */
+		/* */
+		/* ____ ____*/
+		/* output maximum in half the cycle and output minimum on the other half of cycle */
+
+		if (i & (1<<(SIN_BITS-1)) )
+			sin_tab6*SIN_LEN+i = 1;	/* negative */
+		else
+			sin_tab6*SIN_LEN+i = 0;	/* positive */
+
+		/* waveform 7: */
+		/* |\____ |\____ */
+		/* \| \|*/
+		/* output sawtooth waveform */
+
+		if (i & (1<<(SIN_BITS-1)) )
+			x = ((SIN_LEN-1)-i)*16 + 1;	/* negative: from 8177 to 1 */
+		else
+			x = i*16;	/*positive: from 0 to 8176 */
+
+		if (x > TL_TAB_LEN)
+			x = TL_TAB_LEN;	/* clip to the allowed range */
+
+		sin_tab7*SIN_LEN+i = x;
+
+		//logerror("YMF262.C: sin1%4i= %4i (tl_tab value=%5i)\n", i, sin_tab1*SIN_LEN+i, tl_tabsin_tab1*SIN_LEN+i );
+		//logerror("YMF262.C: sin2%4i= %4i (tl_tab value=%5i)\n", i, sin_tab2*SIN_LEN+i, tl_tabsin_tab2*SIN_LEN+i );
+		//logerror("YMF262.C: sin3%4i= %4i (tl_tab value=%5i)\n", i, sin_tab3*SIN_LEN+i, tl_tabsin_tab3*SIN_LEN+i );
+		//logerror("YMF262.C: sin4%4i= %4i (tl_tab value=%5i)\n", i, sin_tab4*SIN_LEN+i, tl_tabsin_tab4*SIN_LEN+i );
+		//logerror("YMF262.C: sin5%4i= %4i (tl_tab value=%5i)\n", i, sin_tab5*SIN_LEN+i, tl_tabsin_tab5*SIN_LEN+i );
+		//logerror("YMF262.C: sin6%4i= %4i (tl_tab value=%5i)\n", i, sin_tab6*SIN_LEN+i, tl_tabsin_tab6*SIN_LEN+i );
+		//logerror("YMF262.C: sin7%4i= %4i (tl_tab value=%5i)\n", i, sin_tab7*SIN_LEN+i, tl_tabsin_tab7*SIN_LEN+i );
+	}
+	/*logerror("YMF262.C: ENV_QUIET= %08x (dec*8=%i)\n", ENV_QUIET, ENV_QUIET*8 );*/
+
+#ifdef SAVE_SAMPLE
+	sample0=fopen("sampsum.pcm","wb");
+#endif
+
+	return 1;
+}
+
+static void OPLCloseTable( void )
+{
+#ifdef SAVE_SAMPLE
+	fclose(sample0);
+#endif
+}
+
+
+
+static void OPL3_initalize(OPL3 *chip)
+{
+	int i;
+
+	/* frequency base */
+	chip->freqbase = (chip->rate) ? ((double)chip->clock / (8.0*36)) / chip->rate : 0;
+#if 0
+	chip->rate = (double)chip->clock / (8.0*36);
+	chip->freqbase = 1.0;
+#endif
+
+	/* logerror("YMF262: freqbase=%f\n", chip->freqbase); */
+
+	/* Timer base time */
+	//chip->TimerBase = attotime_mul(ATTOTIME_IN_HZ(chip->clock), 8*36);
+
+	/* make fnumber -> increment counter table */
+	for( i=0 ; i < 1024 ; i++ )
+	{
+		/* opn phase increment counter = 20bit */
+		chip->fn_tabi = (UINT32)( (double)i * 64 * chip->freqbase * (1<<(FREQ_SH-10)) ); /* -10 because chip works with 10.10 fixed point, while we use 16.16 */
+#if 0
+		logerror("YMF262.C: fn_tab%4i = %08x (dec=%8i)\n",
+				 i, chip->fn_tabi>>6, chip->fn_tabi>>6 );
+#endif
+	}
+
+#if 0
+	for( i=0 ; i < 16 ; i++ )
+	{
+		logerror("YMF262.C: sl_tab%i = %08x\n",
+			i, sl_tabi );
+	}
+	for( i=0 ; i < 8 ; i++ )
+	{
+		int j;
+		logerror("YMF262.C: ksl_taboct=%2i =",i);
+		for (j=0; j<16; j++)
+		{
+			logerror("%08x ", ksl_tabi*16+j );
+		}
+		logerror("\n");
+	}
+#endif
+
+
+	/* Amplitude modulation: 27 output levels (triangle waveform); 1 level takes one of: 192, 256 or 448 samples */
+	/* One entry from LFO_AM_TABLE lasts for 64 samples */
+	chip->lfo_am_inc = (1.0 / 64.0 ) * (1<<LFO_SH) * chip->freqbase;
+
+	/* Vibrato: 8 output levels (triangle waveform); 1 level takes 1024 samples */
+	chip->lfo_pm_inc = (1.0 / 1024.0) * (1<<LFO_SH) * chip->freqbase;
+
+	/*logerror ("chip->lfo_am_inc = %8x ; chip->lfo_pm_inc = %8x\n", chip->lfo_am_inc, chip->lfo_pm_inc);*/
+
+	/* Noise generator: a step takes 1 sample */
+	chip->noise_f = (1.0 / 1.0) * (1<<FREQ_SH) * chip->freqbase;
+
+	chip->eg_timer_add = (1<<EG_SH) * chip->freqbase;
+	chip->eg_timer_overflow = ( 1 ) * (1<<EG_SH);
+	/*logerror("YMF262init eg_timer_add=%8x eg_timer_overflow=%8x\n", chip->eg_timer_add, chip->eg_timer_overflow);*/
+
+}
+
+INLINE void FM_KEYON(OPL3_SLOT *SLOT, UINT32 key_set)
+{
+	if( !SLOT->key )
+	{
+		/* restart Phase Generator */
+		SLOT->Cnt = 0;
+		/* phase -> Attack */
+		SLOT->state = EG_ATT;
+	}
+	SLOT->key |= key_set;
+}
+
+INLINE void FM_KEYOFF(OPL3_SLOT *SLOT, UINT32 key_clr)
+{
+	if( SLOT->key )
+	{
+		SLOT->key &= key_clr;
+
+		if( !SLOT->key )
+		{
+			/* phase -> Release */
+			if (SLOT->state>EG_REL)
+				SLOT->state = EG_REL;
+		}
+	}
+}
+
+/* update phase increment counter of operator (also update the EG rates if necessary) */
+INLINE void CALC_FCSLOT(OPL3_CH *CH,OPL3_SLOT *SLOT)
+{
+	int ksr;
+
+	/* (frequency) phase increment counter */
+	SLOT->Incr = CH->fc * SLOT->mul;
+	ksr = CH->kcode >> SLOT->KSR;
+
+	if( SLOT->ksr != ksr )
+	{
+		SLOT->ksr = ksr;
+
+		/* calculate envelope generator rates */
+		if ((SLOT->ar + SLOT->ksr) < 16+60)
+		{
+			SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+			SLOT->eg_m_ar = (1<<SLOT->eg_sh_ar)-1;
+			SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
+		}
+		else
+		{
+			SLOT->eg_sh_ar = 0;
+			SLOT->eg_m_ar = (1<<SLOT->eg_sh_ar)-1;
+			SLOT->eg_sel_ar = 13*RATE_STEPS;
+		}
+		SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
+		SLOT->eg_m_dr = (1<<SLOT->eg_sh_dr)-1;
+		SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
+		SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
+		SLOT->eg_m_rr = (1<<SLOT->eg_sh_rr)-1;
+		SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
+	}
+}
+
+/* set multi,am,vib,EG-TYP,KSR,mul */
+INLINE void set_mul(OPL3 *chip,int slot,int v)
+{
+	OPL3_CH *CH = &chip->P_CHslot/2;
+	OPL3_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->mul = mul_tabv&0x0f;
+	SLOT->KSR = (v&0x10) ? 0 : 2;
+	SLOT->eg_type = (v&0x20);
+	SLOT->vib = (v&0x40);
+	SLOT->AMmask = (v&0x80) ? ~0 : 0;
+
+	if (chip->OPL3_mode & 1)
+	{
+		int chan_no = slot/2;
+
+		/* in OPL3 mode */
+		//DO THIS:
+		//if this is one of the slots of 1st channel forming up a 4-op channel
+		//do normal operation
+		//else normal 2 operator function
+		//OR THIS:
+		//if this is one of the slots of 2nd channel forming up a 4-op channel
+		//update it using channel data of 1st channel of a pair
+		//else normal 2 operator function
+		switch(chan_no)
+		{
+		case 0: case 1: case 2:
+		case 9: case 10: case 11:
+			if (CH->extended)
+			{
+				/* normal */
+				CALC_FCSLOT(CH,SLOT);
+			}
+			else
+			{
+				/* normal */
+				CALC_FCSLOT(CH,SLOT);
+			}
+		break;
+		case 3: case 4: case 5:
+		case 12: case 13: case 14:
+			if ((CH-3)->extended)
+			{
+				/* update this SLOT using frequency data for 1st channel of a pair */
+				CALC_FCSLOT(CH-3,SLOT);
+			}
+			else
+			{
+				/* normal */
+				CALC_FCSLOT(CH,SLOT);
+			}
+		break;
+		default:
+				/* normal */
+				CALC_FCSLOT(CH,SLOT);
+		break;
+		}
+	}
+	else
+	{
+		/* in OPL2 mode */
+		CALC_FCSLOT(CH,SLOT);
+	}
+}
+
+/* set ksl & tl */
+INLINE void set_ksl_tl(OPL3 *chip,int slot,int v)
+{
+	OPL3_CH *CH = &chip->P_CHslot/2;
+	OPL3_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->ksl = ksl_shiftv >> 6;
+	SLOT->TL = (v&0x3f)<<(ENV_BITS-1-7); /* 7 bits TL (bit 6 = always 0) */
+
+	if (chip->OPL3_mode & 1)
+	{
+		int chan_no = slot/2;
+
+		/* in OPL3 mode */
+		//DO THIS:
+		//if this is one of the slots of 1st channel forming up a 4-op channel
+		//do normal operation
+		//else normal 2 operator function
+		//OR THIS:
+		//if this is one of the slots of 2nd channel forming up a 4-op channel
+		//update it using channel data of 1st channel of a pair
+		//else normal 2 operator function
+		switch(chan_no)
+		{
+		case 0: case 1: case 2:
+		case 9: case 10: case 11:
+			if (CH->extended)
+			{
+				/* normal */
+				SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+			}
+			else
+			{
+				/* normal */
+				SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+			}
+		break;
+		case 3: case 4: case 5:
+		case 12: case 13: case 14:
+			if ((CH-3)->extended)
+			{
+				/* update this SLOT using frequency data for 1st channel of a pair */
+				SLOT->TLL = SLOT->TL + ((CH-3)->ksl_base>>SLOT->ksl);
+			}
+			else
+			{
+				/* normal */
+				SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+			}
+		break;
+		default:
+				/* normal */
+				SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+		break;
+		}
+	}
+	else
+	{
+		/* in OPL2 mode */
+		SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
+	}
+
+}
+
+/* set attack rate & decay rate */
+INLINE void set_ar_dr(OPL3 *chip,int slot,int v)
+{
+	OPL3_CH *CH = &chip->P_CHslot/2;
+	OPL3_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->ar = (v>>4) ? 16 + ((v>>4) <<2) : 0;
+
+	if ((SLOT->ar + SLOT->ksr) < 16+60) /* verified on real YMF262 - all 15 x rates take "zero" time */
+	{
+		SLOT->eg_sh_ar = eg_rate_shift SLOT->ar + SLOT->ksr ;
+		SLOT->eg_m_ar = (1<<SLOT->eg_sh_ar)-1;
+		SLOT->eg_sel_ar = eg_rate_selectSLOT->ar + SLOT->ksr ;
+	}
+	else
+	{
+		SLOT->eg_sh_ar = 0;
+		SLOT->eg_m_ar = (1<<SLOT->eg_sh_ar)-1;
+		SLOT->eg_sel_ar = 13*RATE_STEPS;
+	}
+
+	SLOT->dr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
+	SLOT->eg_sh_dr = eg_rate_shift SLOT->dr + SLOT->ksr ;
+	SLOT->eg_m_dr = (1<<SLOT->eg_sh_dr)-1;
+	SLOT->eg_sel_dr = eg_rate_selectSLOT->dr + SLOT->ksr ;
+}
+
+/* set sustain level & release rate */
+INLINE void set_sl_rr(OPL3 *chip,int slot,int v)
+{
+	OPL3_CH *CH = &chip->P_CHslot/2;
+	OPL3_SLOT *SLOT = &CH->SLOTslot&1;
+
+	SLOT->sl = sl_tab v>>4 ;
+
+	SLOT->rr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
+	SLOT->eg_sh_rr = eg_rate_shift SLOT->rr + SLOT->ksr ;
+	SLOT->eg_m_rr = (1<<SLOT->eg_sh_rr)-1;
+	SLOT->eg_sel_rr = eg_rate_selectSLOT->rr + SLOT->ksr ;
+}
+
+
+static void update_channels(OPL3 *chip, OPL3_CH *CH)
+{
+	/* update channel passed as a parameter and a channel at CH+=3; */
+	if (CH->extended)
+	{	/* we've just switched to combined 4 operator mode */
+
+	}
+	else
+	{	/* we've just switched to normal 2 operator mode */
+
+	}
+
+}
+
+/* write a value v to register r on OPL chip */
+static void OPL3WriteReg(OPL3 *chip, int r, int v)
+{
+	OPL3_CH *CH;
+	signed int *chanout = chip->chanout;
+	unsigned int ch_offset = 0;
+	int slot;
+	int block_fnum;
+
+
+
+	/*if (LOG_CYM_FILE && (cymfile) && ((r&255)!=0) && (r!=255) )
+	{
+		if (r>0xff)
+			fputc( (unsigned char)0xff, cymfile );//mark writes to second register set
+
+		fputc( (unsigned char)r&0xff, cymfile );
+		fputc( (unsigned char)v, cymfile );
+	}*/
+
+	if(r&0x100)
+	{
+		switch(r)
+		{
+		case 0x101:	/* test register */
+			return;
+
+		case 0x104:	/* 6 channels enable */
+			{
+				UINT8 prev;
+
+				CH = &chip->P_CH0;	/* channel 0 */
+				prev = CH->extended;
+				CH->extended = (v>>0) & 1;
+				if(prev != CH->extended)
+					update_channels(chip, CH);
+				CH++;					/* channel 1 */
+				prev = CH->extended;
+				CH->extended = (v>>1) & 1;
+				if(prev != CH->extended)
+					update_channels(chip, CH);
+				CH++;					/* channel 2 */
+				prev = CH->extended;
+				CH->extended = (v>>2) & 1;
+				if(prev != CH->extended)
+					update_channels(chip, CH);
+
+
+				CH = &chip->P_CH9;	/* channel 9 */
+				prev = CH->extended;
+				CH->extended = (v>>3) & 1;
+				if(prev != CH->extended)
+					update_channels(chip, CH);
+				CH++;					/* channel 10 */
+				prev = CH->extended;
+				CH->extended = (v>>4) & 1;
+				if(prev != CH->extended)
+					update_channels(chip, CH);
+				CH++;					/* channel 11 */
+				prev = CH->extended;
+				CH->extended = (v>>5) & 1;
+				if(prev != CH->extended)
+					update_channels(chip, CH);
+
+			}
+			return;
+
+		case 0x105:	/* OPL3 extensions enable register */
+
+			chip->OPL3_mode = v&0x01;	/* OPL3 mode when bit0=1 otherwise it is OPL2 mode */
+
+			/* following behaviour was tested on real YMF262,
+ switching OPL3/OPL2 modes on the fly:
+ - does not change the waveform previously selected (unless when ....)
+ - does not update CH.A, CH.B, CH.C and CH.D output selectors (registers c0-c8) (unless when ....)
+ - does not disable channels 9-17 on OPL3->OPL2 switch
+ - does not switch 4 operator channels back to 2 operator channels
+ */
+
+			return;
+
+		default:
+#ifdef _DEBUG
+			if (r < 0x120)
+				logerror("YMF262: write to unknown register (set#2): %03x value=%02x\n",r,v);
+#endif
+		break;
+		}
+
+		ch_offset = 9;	/* register page #2 starts from channel 9 (counting from 0) */
+	}
+
+	/* adjust bus to 8 bits */
+	r &= 0xff;
+	v &= 0xff;
+
+
+	switch(r&0xe0)
+	{
+	case 0x00:	/* 00-1f:control */
+		switch(r&0x1f)
+		{
+		case 0x01:	/* test register */
+		break;
+		case 0x02:	/* Timer 1 */
+			chip->T0 = (256-v)*4;
+		break;
+		case 0x03:	/* Timer 2 */
+			chip->T1 = (256-v)*16;
+		break;
+		case 0x04:	/* IRQ clear / mask and Timer enable */
+			if(v&0x80)
+			{	/* IRQ flags clear */
+				OPL3_STATUS_RESET(chip,0x60);
+			}
+			else
+			{	/* set IRQ mask ,timer enable */
+				UINT8 st1 = v & 1;
+				UINT8 st2 = (v>>1) & 1;
+
+				/* IRQRST,T1MSK,t2MSK,x,x,x,ST2,ST1 */
+				OPL3_STATUS_RESET(chip, v & 0x60);
+				OPL3_STATUSMASK_SET(chip, (~v) & 0x60 );
+
+				/* timer 2 */
+				if(chip->st1 != st2)
+				{
+					//attotime period = st2 ? attotime_mul(chip->TimerBase, chip->T1) : attotime_zero;
+					chip->st1 = st2;
+					//if (chip->timer_handler) (chip->timer_handler)(chip->TimerParam,1,period);
+				}
+				/* timer 1 */
+				if(chip->st0 != st1)
+				{
+					//attotime period = st1 ? attotime_mul(chip->TimerBase, chip->T0) : attotime_zero;
+					chip->st0 = st1;
+					//if (chip->timer_handler) (chip->timer_handler)(chip->TimerParam,0,period);
+				}
+			}
+		break;
+		case 0x08:	/* x,NTS,x,x, x,x,x,x */
+			chip->nts = v;
+		break;
+
+		default:
+#ifdef _DEBUG
+			logerror("YMF262: write to unknown register: %02x value=%02x\n",r,v);
+#endif
+		break;
+		}
+		break;
+	case 0x20:	/* am ON, vib ON, ksr, eg_type, mul */
+		slot = slot_arrayr&0x1f;
+		if(slot < 0) return;
+		set_mul(chip, slot + ch_offset*2, v);
+	break;
+	case 0x40:
+		slot = slot_arrayr&0x1f;
+		if(slot < 0) return;
+		set_ksl_tl(chip, slot + ch_offset*2, v);
+	break;
+	case 0x60:
+		slot = slot_arrayr&0x1f;
+		if(slot < 0) return;
+		set_ar_dr(chip, slot + ch_offset*2, v);
+	break;
+	case 0x80:
+		slot = slot_arrayr&0x1f;
+		if(slot < 0) return;
+		set_sl_rr(chip, slot + ch_offset*2, v);
+	break;
+	case 0xa0:
+		if (r == 0xbd)			/* am depth, vibrato depth, r,bd,sd,tom,tc,hh */
+		{
+			if (ch_offset != 0)	/* 0xbd register is present in set #1 only */
+				return;
+
+			chip->lfo_am_depth = v & 0x80;
+			chip->lfo_pm_depth_range = (v&0x40) ? 8 : 0;
+
+			chip->rhythm = v&0x3f;
+
+			if(chip->rhythm&0x20)
+			{
+				/* BD key on/off */
+				if(v&0x10)
+				{
+					FM_KEYON (&chip->P_CH6.SLOTSLOT1, 2);
+					FM_KEYON (&chip->P_CH6.SLOTSLOT2, 2);
+				}
+				else
+				{
+					FM_KEYOFF(&chip->P_CH6.SLOTSLOT1,~2);
+					FM_KEYOFF(&chip->P_CH6.SLOTSLOT2,~2);
+				}
+				/* HH key on/off */
+				if(v&0x01) FM_KEYON (&chip->P_CH7.SLOTSLOT1, 2);
+				else FM_KEYOFF(&chip->P_CH7.SLOTSLOT1,~2);
+				/* SD key on/off */
+				if(v&0x08) FM_KEYON (&chip->P_CH7.SLOTSLOT2, 2);
+				else FM_KEYOFF(&chip->P_CH7.SLOTSLOT2,~2);
+				/* TOM key on/off */
+				if(v&0x04) FM_KEYON (&chip->P_CH8.SLOTSLOT1, 2);
+				else FM_KEYOFF(&chip->P_CH8.SLOTSLOT1,~2);
+				/* TOP-CY key on/off */
+				if(v&0x02) FM_KEYON (&chip->P_CH8.SLOTSLOT2, 2);
+				else FM_KEYOFF(&chip->P_CH8.SLOTSLOT2,~2);
+			}
+			else
+			{
+				/* BD key off */
+				FM_KEYOFF(&chip->P_CH6.SLOTSLOT1,~2);
+				FM_KEYOFF(&chip->P_CH6.SLOTSLOT2,~2);
+				/* HH key off */
+				FM_KEYOFF(&chip->P_CH7.SLOTSLOT1,~2);
+				/* SD key off */
+				FM_KEYOFF(&chip->P_CH7.SLOTSLOT2,~2);
+				/* TOM key off */
+				FM_KEYOFF(&chip->P_CH8.SLOTSLOT1,~2);
+				/* TOP-CY off */
+				FM_KEYOFF(&chip->P_CH8.SLOTSLOT2,~2);
+			}
+			return;
+		}
+
+		/* keyon,block,fnum */
+		if( (r&0x0f) > 8) return;
+		CH = &chip->P_CH(r&0x0f) + ch_offset;
+
+		if(!(r&0x10))
+		{	/* a0-a8 */
+			block_fnum = (CH->block_fnum&0x1f00) | v;
+		}
+		else
+		{	/* b0-b8 */
+			block_fnum = ((v&0x1f)<<8) | (CH->block_fnum&0xff);
+
+			if (chip->OPL3_mode & 1)
+			{
+				int chan_no = (r&0x0f) + ch_offset;
+
+				/* in OPL3 mode */
+				//DO THIS:
+				//if this is 1st channel forming up a 4-op channel
+				//ALSO keyon/off slots of 2nd channel forming up 4-op channel
+				//else normal 2 operator function keyon/off
+				//OR THIS:
+				//if this is 2nd channel forming up 4-op channel just do nothing
+				//else normal 2 operator function keyon/off
+				switch(chan_no)
+				{
+				case 0: case 1: case 2:
+				case 9: case 10: case 11:
+					if (CH->extended)
+					{
+						//if this is 1st channel forming up a 4-op channel
+						//ALSO keyon/off slots of 2nd channel forming up 4-op channel
+						if(v&0x20)
+						{
+							FM_KEYON (&CH->SLOTSLOT1, 1);
+							FM_KEYON (&CH->SLOTSLOT2, 1);
+							FM_KEYON (&(CH+3)->SLOTSLOT1, 1);
+							FM_KEYON (&(CH+3)->SLOTSLOT2, 1);
+						}
+						else
+						{
+							FM_KEYOFF(&CH->SLOTSLOT1,~1);
+							FM_KEYOFF(&CH->SLOTSLOT2,~1);
+							FM_KEYOFF(&(CH+3)->SLOTSLOT1,~1);
+							FM_KEYOFF(&(CH+3)->SLOTSLOT2,~1);
+						}
+					}
+					else
+					{
+						//else normal 2 operator function keyon/off
+						if(v&0x20)
+						{
+							FM_KEYON (&CH->SLOTSLOT1, 1);
+							FM_KEYON (&CH->SLOTSLOT2, 1);
+						}
+						else
+						{
+							FM_KEYOFF(&CH->SLOTSLOT1,~1);
+							FM_KEYOFF(&CH->SLOTSLOT2,~1);
+						}
+					}
+				break;
+
+				case 3: case 4: case 5:
+				case 12: case 13: case 14:
+					if ((CH-3)->extended)
+					{
+						//if this is 2nd channel forming up 4-op channel just do nothing
+					}
+					else
+					{
+						//else normal 2 operator function keyon/off
+						if(v&0x20)
+						{
+							FM_KEYON (&CH->SLOTSLOT1, 1);
+							FM_KEYON (&CH->SLOTSLOT2, 1);
+						}
+						else
+						{
+							FM_KEYOFF(&CH->SLOTSLOT1,~1);
+							FM_KEYOFF(&CH->SLOTSLOT2,~1);
+						}
+					}
+				break;
+
+				default:
+					if(v&0x20)
+					{
+						FM_KEYON (&CH->SLOTSLOT1, 1);
+						FM_KEYON (&CH->SLOTSLOT2, 1);
+					}
+					else
+					{
+						FM_KEYOFF(&CH->SLOTSLOT1,~1);
+						FM_KEYOFF(&CH->SLOTSLOT2,~1);
+					}
+				break;
+				}
+			}
+			else
+			{
+				if(v&0x20)
+				{
+					FM_KEYON (&CH->SLOTSLOT1, 1);
+					FM_KEYON (&CH->SLOTSLOT2, 1);
+				}
+				else
+				{
+					FM_KEYOFF(&CH->SLOTSLOT1,~1);
+					FM_KEYOFF(&CH->SLOTSLOT2,~1);
+				}
+			}
+		}
+		/* update */
+		if(CH->block_fnum != block_fnum)
+		{
+			UINT8 block = block_fnum >> 10;
+
+			CH->block_fnum = block_fnum;
+
+			CH->ksl_base = ksl_tabblock_fnum>>6;
+			CH->fc = chip->fn_tabblock_fnum&0x03ff >> (7-block);
+
+			/* BLK 2,1,0 bits -> bits 3,2,1 of kcode */
+			CH->kcode = (CH->block_fnum&0x1c00)>>9;
+
+			/* the info below is actually opposite to what is stated in the Manuals (verifed on real YMF262) */
+			/* if notesel == 0 -> lsb of kcode is bit 10 (MSB) of fnum */
+			/* if notesel == 1 -> lsb of kcode is bit 9 (MSB-1) of fnum */
+			if (chip->nts&0x40)
+				CH->kcode |= (CH->block_fnum&0x100)>>8;	/* notesel == 1 */
+			else
+				CH->kcode |= (CH->block_fnum&0x200)>>9;	/* notesel == 0 */
+
+			if (chip->OPL3_mode & 1)
+			{
+				int chan_no = (r&0x0f) + ch_offset;
+				/* in OPL3 mode */
+				//DO THIS:
+				//if this is 1st channel forming up a 4-op channel
+				//ALSO update slots of 2nd channel forming up 4-op channel
+				//else normal 2 operator function keyon/off
+				//OR THIS:
+				//if this is 2nd channel forming up 4-op channel just do nothing
+				//else normal 2 operator function keyon/off
+				switch(chan_no)
+				{
+				case 0: case 1: case 2:
+				case 9: case 10: case 11:
+					if (CH->extended)
+					{
+						//if this is 1st channel forming up a 4-op channel
+						//ALSO update slots of 2nd channel forming up 4-op channel
+
+						/* refresh Total Level in FOUR SLOTs of this channel and channel+3 using data from THIS channel */
+						CH->SLOTSLOT1.TLL = CH->SLOTSLOT1.TL + (CH->ksl_base>>CH->SLOTSLOT1.ksl);
+						CH->SLOTSLOT2.TLL = CH->SLOTSLOT2.TL + (CH->ksl_base>>CH->SLOTSLOT2.ksl);
+						(CH+3)->SLOTSLOT1.TLL = (CH+3)->SLOTSLOT1.TL + (CH->ksl_base>>(CH+3)->SLOTSLOT1.ksl);
+						(CH+3)->SLOTSLOT2.TLL = (CH+3)->SLOTSLOT2.TL + (CH->ksl_base>>(CH+3)->SLOTSLOT2.ksl);
+
+						/* refresh frequency counter in FOUR SLOTs of this channel and channel+3 using data from THIS channel */
+						CALC_FCSLOT(CH,&CH->SLOTSLOT1);
+						CALC_FCSLOT(CH,&CH->SLOTSLOT2);
+						CALC_FCSLOT(CH,&(CH+3)->SLOTSLOT1);
+						CALC_FCSLOT(CH,&(CH+3)->SLOTSLOT2);
+					}
+					else
+					{
+						//else normal 2 operator function
+						/* refresh Total Level in both SLOTs of this channel */
+						CH->SLOTSLOT1.TLL = CH->SLOTSLOT1.TL + (CH->ksl_base>>CH->SLOTSLOT1.ksl);
+						CH->SLOTSLOT2.TLL = CH->SLOTSLOT2.TL + (CH->ksl_base>>CH->SLOTSLOT2.ksl);
+
+						/* refresh frequency counter in both SLOTs of this channel */
+						CALC_FCSLOT(CH,&CH->SLOTSLOT1);
+						CALC_FCSLOT(CH,&CH->SLOTSLOT2);
+					}
+				break;
+
+				case 3: case 4: case 5:
+				case 12: case 13: case 14:
+					if ((CH-3)->extended)
+					{
+						//if this is 2nd channel forming up 4-op channel just do nothing
+					}
+					else
+					{
+						//else normal 2 operator function
+						/* refresh Total Level in both SLOTs of this channel */
+						CH->SLOTSLOT1.TLL = CH->SLOTSLOT1.TL + (CH->ksl_base>>CH->SLOTSLOT1.ksl);
+						CH->SLOTSLOT2.TLL = CH->SLOTSLOT2.TL + (CH->ksl_base>>CH->SLOTSLOT2.ksl);
+
+						/* refresh frequency counter in both SLOTs of this channel */
+						CALC_FCSLOT(CH,&CH->SLOTSLOT1);
+						CALC_FCSLOT(CH,&CH->SLOTSLOT2);
+					}
+				break;
+
+				default:
+					/* refresh Total Level in both SLOTs of this channel */
+					CH->SLOTSLOT1.TLL = CH->SLOTSLOT1.TL + (CH->ksl_base>>CH->SLOTSLOT1.ksl);
+					CH->SLOTSLOT2.TLL = CH->SLOTSLOT2.TL + (CH->ksl_base>>CH->SLOTSLOT2.ksl);
+
+					/* refresh frequency counter in both SLOTs of this channel */
+					CALC_FCSLOT(CH,&CH->SLOTSLOT1);
+					CALC_FCSLOT(CH,&CH->SLOTSLOT2);
+				break;
+				}
+			}
+			else
+			{
+				/* in OPL2 mode */
+
+				/* refresh Total Level in both SLOTs of this channel */
+				CH->SLOTSLOT1.TLL = CH->SLOTSLOT1.TL + (CH->ksl_base>>CH->SLOTSLOT1.ksl);
+				CH->SLOTSLOT2.TLL = CH->SLOTSLOT2.TL + (CH->ksl_base>>CH->SLOTSLOT2.ksl);
+
+				/* refresh frequency counter in both SLOTs of this channel */
+				CALC_FCSLOT(CH,&CH->SLOTSLOT1);
+				CALC_FCSLOT(CH,&CH->SLOTSLOT2);
+			}
+		}
+	break;
+
+	case 0xc0:
+		/* CH.D, CH.C, CH.B, CH.A, FB(3bits), C */
+		if( (r&0xf) > 8) return;
+
+		CH = &chip->P_CH(r&0xf) + ch_offset;
+
+		if( chip->OPL3_mode & 1 )
+		{
+			int base = ((r&0xf) + ch_offset) * 4;
+
+			/* OPL3 mode */
+			chip->pan base = (v & 0x10) ? ~0 : 0;	/* ch.A */
+			chip->pan base +1 = (v & 0x20) ? ~0 : 0;	/* ch.B */
+			chip->pan base +2 = (v & 0x40) ? ~0 : 0;	/* ch.C */
+			chip->pan base +3 = (v & 0x80) ? ~0 : 0;	/* ch.D */
+		}
+		else
+		{
+			int base = ((r&0xf) + ch_offset) * 4;
+
+			/* OPL2 mode - always enabled */
+			chip->pan base = ~0;		/* ch.A */
+			chip->pan base +1 = ~0;		/* ch.B */
+			chip->pan base +2 = ~0;		/* ch.C */
+			chip->pan base +3 = ~0;		/* ch.D */
+		}
+
+		chip->pan_ctrl_value (r&0xf) + ch_offset = v;	/* store control value for OPL3/OPL2 mode switching on the fly */
+
+		CH->SLOTSLOT1.FB = (v>>1)&7 ? ((v>>1)&7) + 7 : 0;
+		CH->SLOTSLOT1.CON = v&1;
+
+		if( chip->OPL3_mode & 1 )
+		{
+			int chan_no = (r&0x0f) + ch_offset;
+
+			switch(chan_no)
+			{
+			case 0: case 1: case 2:
+			case 9: case 10: case 11:
+				if (CH->extended)
+				{
+					UINT8 conn = (CH->SLOTSLOT1.CON<<1) | ((CH+3)->SLOTSLOT1.CON<<0);
+					switch(conn)
+					{
+					case 0:
+						/* 1 -> 2 -> 3 -> 4 - out */
+
+						CH->SLOTSLOT1.connect = &chip->phase_modulation;
+						CH->SLOTSLOT2.connect = &chip->phase_modulation2;
+						(CH+3)->SLOTSLOT1.connect = &chip->phase_modulation;
+						(CH+3)->SLOTSLOT2.connect = &chanout chan_no + 3 ;
+					break;
+					case 1:
+						/* 1 -> 2 -\
+ 3 -> 4 -+- out */
+
+						CH->SLOTSLOT1.connect = &chip->phase_modulation;
+						CH->SLOTSLOT2.connect = &chanout chan_no ;
+						(CH+3)->SLOTSLOT1.connect = &chip->phase_modulation;
+						(CH+3)->SLOTSLOT2.connect = &chanout chan_no + 3 ;
+					break;
+					case 2:
+						/* 1 -----------\
+ 2 -> 3 -> 4 -+- out */
+
+						CH->SLOTSLOT1.connect = &chanout chan_no ;
+						CH->SLOTSLOT2.connect = &chip->phase_modulation2;
+						(CH+3)->SLOTSLOT1.connect = &chip->phase_modulation;
+						(CH+3)->SLOTSLOT2.connect = &chanout chan_no + 3 ;
+					break;
+					case 3:
+						/* 1 ------\
+ 2 -> 3 -+- out
+ 4 ------/ */
+						CH->SLOTSLOT1.connect = &chanout chan_no ;
+						CH->SLOTSLOT2.connect = &chip->phase_modulation2;
+						(CH+3)->SLOTSLOT1.connect = &chanout chan_no + 3 ;
+						(CH+3)->SLOTSLOT2.connect = &chanout chan_no + 3 ;
+					break;
+					}
+				}
+				else
+				{
+					/* 2 operators mode */
+					CH->SLOTSLOT1.connect = CH->SLOTSLOT1.CON ? &chanout(r&0xf)+ch_offset : &chip->phase_modulation;
+					CH->SLOTSLOT2.connect = &chanout(r&0xf)+ch_offset;
+				}
+			break;
+
+			case 3: case 4: case 5:
+			case 12: case 13: case 14:
+				if ((CH-3)->extended)
+				{
+					UINT8 conn = ((CH-3)->SLOTSLOT1.CON<<1) | (CH->SLOTSLOT1.CON<<0);
+					switch(conn)
+					{
+					case 0:
+						/* 1 -> 2 -> 3 -> 4 - out */
+
+						(CH-3)->SLOTSLOT1.connect = &chip->phase_modulation;
+						(CH-3)->SLOTSLOT2.connect = &chip->phase_modulation2;
+						CH->SLOTSLOT1.connect = &chip->phase_modulation;
+						CH->SLOTSLOT2.connect = &chanout chan_no ;
+					break;
+					case 1:
+						/* 1 -> 2 -\
+ 3 -> 4 -+- out */
+
+						(CH-3)->SLOTSLOT1.connect = &chip->phase_modulation;
+						(CH-3)->SLOTSLOT2.connect = &chanout chan_no - 3 ;
+						CH->SLOTSLOT1.connect = &chip->phase_modulation;
+						CH->SLOTSLOT2.connect = &chanout chan_no ;
+					break;
+					case 2:
+						/* 1 -----------\
+ 2 -> 3 -> 4 -+- out */
+
+						(CH-3)->SLOTSLOT1.connect = &chanout chan_no - 3 ;
+						(CH-3)->SLOTSLOT2.connect = &chip->phase_modulation2;
+						CH->SLOTSLOT1.connect = &chip->phase_modulation;
+						CH->SLOTSLOT2.connect = &chanout chan_no ;
+					break;
+					case 3:
+						/* 1 ------\
+ 2 -> 3 -+- out
+ 4 ------/ */
+						(CH-3)->SLOTSLOT1.connect = &chanout chan_no - 3 ;
+						(CH-3)->SLOTSLOT2.connect = &chip->phase_modulation2;
+						CH->SLOTSLOT1.connect = &chanout chan_no ;
+						CH->SLOTSLOT2.connect = &chanout chan_no ;
+					break;
+					}
+				}
+				else
+				{
+					/* 2 operators mode */
+					CH->SLOTSLOT1.connect = CH->SLOTSLOT1.CON ? &chanout(r&0xf)+ch_offset : &chip->phase_modulation;
+					CH->SLOTSLOT2.connect = &chanout(r&0xf)+ch_offset;
+				}
+			break;
+
+			default:
+					/* 2 operators mode */
+					CH->SLOTSLOT1.connect = CH->SLOTSLOT1.CON ? &chanout(r&0xf)+ch_offset : &chip->phase_modulation;
+					CH->SLOTSLOT2.connect = &chanout(r&0xf)+ch_offset;
+			break;
+			}
+		}
+		else
+		{
+			/* OPL2 mode - always 2 operators mode */
+			CH->SLOTSLOT1.connect = CH->SLOTSLOT1.CON ? &chanout(r&0xf)+ch_offset : &chip->phase_modulation;
+			CH->SLOTSLOT2.connect = &chanout(r&0xf)+ch_offset;
+		}
+	break;
+
+	case 0xe0: /* waveform select */
+		slot = slot_arrayr&0x1f;
+		if(slot < 0) return;
+
+		slot += ch_offset*2;
+
+		CH = &chip->P_CHslot/2;
+
+
+		/* store 3-bit value written regardless of current OPL2 or OPL3 mode... (verified on real YMF262) */
+		v &= 7;
+		CH->SLOTslot&1.waveform_number = v;
+
+		/* ... but select only waveforms 0-3 in OPL2 mode */
+		if( !(chip->OPL3_mode & 1) )
+		{
+			v &= 3; /* we're in OPL2 mode */
+		}
+		CH->SLOTslot&1.wavetable = v * SIN_LEN;
+	break;
+	}
+}
+
+/*static TIMER_CALLBACK( cymfile_callback )
+{
+	if (cymfile)
+	{
+		fputc( (unsigned char)0, cymfile );
+	}
+}*/
+
+/* lock/unlock for common table */
+static int OPL3_LockTable()
+{
+	num_lock++;
+	if(num_lock>1) return 0;
+
+	/* first time */
+
+	if( !init_tables() )
+	{
+		num_lock--;
+		return -1;
+	}
+
+	/*if (LOG_CYM_FILE)
+	{
+		cymfile = fopen("ymf262_.cym","wb");
+		if (cymfile)
+			timer_pulse ( device->machine, ATTOTIME_IN_HZ(110), NULL, 0, cymfile_callback); //110 Hz pulse timer
+		else
+			logerror("Could not create ymf262_.cym file\n");
+	}*/
+
+	return 0;
+}
+
+static void OPL3_UnLockTable(void)
+{
+	if(num_lock) num_lock--;
+	if(num_lock) return;
+
+	/* last time */
+
+	OPLCloseTable();
+
+	/*if (LOG_CYM_FILE)
+		fclose (cymfile);
+	cymfile = NULL;*/
+}
+
+static void OPL3ResetChip(OPL3 *chip)
+{
+	int c,s;
+
+	chip->eg_timer = 0;
+	chip->eg_cnt = 0;
+
+	chip->noise_rng = 1;	/* noise shift register */
+	chip->nts = 0;	/* note split */
+	OPL3_STATUS_RESET(chip,0x60);
+
+	/* reset with register write */
+	OPL3WriteReg(chip,0x01,0); /* test register */
+	OPL3WriteReg(chip,0x02,0); /* Timer1 */
+	OPL3WriteReg(chip,0x03,0); /* Timer2 */
+	OPL3WriteReg(chip,0x04,0); /* IRQ mask clear */
+
+
+//FIX IT registers 101, 104 and 105
+
+
+//FIX IT (dont change CH.D, CH.C, CH.B and CH.A in C0-C8 registers)
+	for(c = 0xff ; c >= 0x20 ; c-- )
+		OPL3WriteReg(chip,c,0);
+//FIX IT (dont change CH.D, CH.C, CH.B and CH.A in C0-C8 registers)
+	for(c = 0x1ff ; c >= 0x120 ; c-- )
+		OPL3WriteReg(chip,c,0);
+
+
+
+	/* reset operator parameters */
+	for( c = 0 ; c < 9*2 ; c++ )
+	{
+		OPL3_CH *CH = &chip->P_CHc;
+		for(s = 0 ; s < 2 ; s++ )
+		{
+			CH->SLOTs.state = EG_OFF;
+			CH->SLOTs.volume = MAX_ATT_INDEX;
+		}
+	}
+}
+
+/* Create one of virtual YMF262 */
+/* 'clock' is chip clock in Hz */
+/* 'rate' is sampling rate */
+static OPL3 *OPL3Create(int clock, int rate, int type)
+{
+	OPL3 *chip;
+
+	if (OPL3_LockTable() == -1) return NULL;
+
+	/* allocate memory block */
+	chip = (OPL3 *)malloc(sizeof(OPL3));
+
+	if (chip==NULL)
+		return NULL;
+
+	/* clear */
+	memset(chip, 0, sizeof(OPL3));
+
+	chip->type = type;
+	chip->clock = clock;
+	chip->rate = rate;
+
+	/* init global tables */
+	OPL3_initalize(chip);
+
+	/* reset chip */
+	OPL3ResetChip(chip);
+	return chip;
+}
+
+/* Destroy one of virtual YMF262 */
+static void OPL3Destroy(OPL3 *chip)
+{
+	OPL3_UnLockTable();
+	free(chip);
+}
+
+
+/* Optional handlers */
+
+static void OPL3SetTimerHandler(OPL3 *chip,OPL3_TIMERHANDLER timer_handler,void *param)
+{
+	chip->timer_handler = timer_handler;
+	chip->TimerParam = param;
+}
+static void OPL3SetIRQHandler(OPL3 *chip,OPL3_IRQHANDLER IRQHandler,void *param)
+{
+	chip->IRQHandler = IRQHandler;
+	chip->IRQParam = param;
+}
+static void OPL3SetUpdateHandler(OPL3 *chip,OPL3_UPDATEHANDLER UpdateHandler,void *param)
+{
+	chip->UpdateHandler = UpdateHandler;
+	chip->UpdateParam = param;
+}
+
+/* YMF262 I/O interface */
+static int OPL3Write(OPL3 *chip, int a, int v)
+{
+	/* data bus is 8 bits */
+	v &= 0xff;
+
+	switch(a&3)
+	{
+	case 0:	/* address port 0 (register set #1) */
+		chip->address = v;
+	break;
+
+	case 1:	/* data port - ignore A1 */
+	case 3:	/* data port - ignore A1 */
+		if(chip->UpdateHandler) chip->UpdateHandler(chip->UpdateParam/*,0*/);
+		OPL3WriteReg(chip,chip->address,v);
+	break;
+
+	case 2:	/* address port 1 (register set #2) */
+
+		/* verified on real YMF262:
+ in OPL3 mode:
+ address line A1 is stored during *address* write and ignored during *data* write.
+
+ in OPL2 mode:
+ register set#2 writes go to register set#1 (ignoring A1)
+ verified on registers from set#2: 0x01, 0x04, 0x20-0xef
+ The only exception is register 0x05.
+ */
+		if( chip->OPL3_mode & 1 )
+		{
+			/* OPL3 mode */
+				chip->address = v | 0x100;
+		}
+		else
+		{
+			/* in OPL2 mode the only accessible in set #2 is register 0x05 */
+			if( v==5 )
+				chip->address = v | 0x100;
+			else
+				chip->address = v;	/* verified range: 0x01, 0x04, 0x20-0xef(set #2 becomes set #1 in opl2 mode) */
+		}
+	break;
+	}
+
+	return chip->status>>7;
+}
+
+static unsigned char OPL3Read(OPL3 *chip,int a)
+{
+	if( a==0 )
+	{
+		/* status port */
+		return chip->status;
+	}
+
+	return 0x00;	/* verified on real YMF262 */
+}
+
+
+
+static int OPL3TimerOver(OPL3 *chip,int c)
+{
+	if( c )
+	{	/* Timer B */
+		OPL3_STATUS_SET(chip,0x20);
+	}
+	else
+	{	/* Timer A */
+		OPL3_STATUS_SET(chip,0x40);
+	}
+	/* reload timer */
+	//if (chip->timer_handler) (chip->timer_handler)(chip->TimerParam,c,attotime_mul(chip->TimerBase, chip->Tc));
+	return chip->status>>7;
+}
+
+
+
+
+void * ymf262_init(int clock, int rate)
+{
+	return OPL3Create(clock,rate,OPL3_TYPE_YMF262);
+}
+
+void ymf262_shutdown(void *chip)
+{
+	OPL3Destroy((OPL3 *)chip);
+}
+void ymf262_reset_chip(void *chip)
+{
+	OPL3ResetChip((OPL3 *)chip);
+}
+
+int ymf262_write(void *chip, int a, int v)
+{
+	return OPL3Write((OPL3 *)chip, a, v);
+}
+
+unsigned char ymf262_read(void *chip, int a)
+{
+	/* Note on status register: */
+
+	/* YM3526(OPL) and YM3812(OPL2) return bit2 and bit1 in HIGH state */
+
+	/* YMF262(OPL3) always returns bit2 and bit1 in LOW state */
+	/* which can be used to identify the chip */
+
+	/* YMF278(OPL4) returns bit2 in LOW and bit1 in HIGH state ??? info from manual - not verified */
+
+	return OPL3Read((OPL3 *)chip, a);
+}
+int ymf262_timer_over(void *chip, int c)
+{
+	return OPL3TimerOver((OPL3 *)chip, c);
+}
+
+void ymf262_set_timer_handler(void *chip, OPL3_TIMERHANDLER timer_handler, void *param)
+{
+	OPL3SetTimerHandler((OPL3 *)chip, timer_handler, param);
+}
+void ymf262_set_irq_handler(void *chip,OPL3_IRQHANDLER IRQHandler,void *param)
+{
+	OPL3SetIRQHandler((OPL3 *)chip, IRQHandler, param);
+}
+void ymf262_set_update_handler(void *chip,OPL3_UPDATEHANDLER UpdateHandler,void *param)
+{
+	OPL3SetUpdateHandler((OPL3 *)chip, UpdateHandler, param);
+}
+
+void ymf262_set_mutemask(void *chip, UINT32 MuteMask)
+{
+	OPL3 *opl3 = (OPL3 *)chip;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 18; CurChn ++)
+		opl3->P_CHCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	for (CurChn = 0; CurChn < 5; CurChn ++)
+		opl3->MuteSpcCurChn = (MuteMask >> (CurChn + 18)) & 0x01;
+	
+	return;
+}
+
+
+/*
+** Generate samples for one of the YMF262's
+**
+** 'which' is the virtual YMF262 number
+** '**buffers' is table of 4 pointers to the buffers: CH.A, CH.B, CH.C and CH.D
+** 'length' is the number of samples that should be generated
+*/
+void ymf262_update_one(void *_chip, OPL3SAMPLE **buffers, int length)
+{
+	OPL3		*chip = (OPL3 *)_chip;
+	UINT8		rhythm = chip->rhythm&0x20;
+
+	OPL3SAMPLE	*ch_a = buffers0;
+	OPL3SAMPLE	*ch_b = buffers1;
+	//OPL3SAMPLE	*ch_c = buffers2;
+	//OPL3SAMPLE	*ch_d = buffers3;
+
+	int i;
+	//int chn;
+
+	for( i=0; i < length ; i++ )
+	{
+		int a,b,c,d;
+
+
+		advance_lfo(chip);
+
+		/* clear channel outputs */
+		memset(chip->chanout, 0, sizeof(signed int) * 18);
+
+#if 1
+	/* register set #1 */
+		chan_calc(chip, &chip->P_CH0);			/* extended 4op ch#0 part 1 or 2op ch#0 */
+		if (chip->P_CH0.extended)
+			chan_calc_ext(chip, &chip->P_CH3);	/* extended 4op ch#0 part 2 */
+		else
+			chan_calc(chip, &chip->P_CH3);		/* standard 2op ch#3 */
+
+
+		chan_calc(chip, &chip->P_CH1);			/* extended 4op ch#1 part 1 or 2op ch#1 */
+		if (chip->P_CH1.extended)
+			chan_calc_ext(chip, &chip->P_CH4);	/* extended 4op ch#1 part 2 */
+		else
+			chan_calc(chip, &chip->P_CH4);		/* standard 2op ch#4 */
+
+
+		chan_calc(chip, &chip->P_CH2);			/* extended 4op ch#2 part 1 or 2op ch#2 */
+		if (chip->P_CH2.extended)
+			chan_calc_ext(chip, &chip->P_CH5);	/* extended 4op ch#2 part 2 */
+		else
+			chan_calc(chip, &chip->P_CH5);		/* standard 2op ch#5 */
+
+
+		if(!rhythm)
+		{
+			chan_calc(chip, &chip->P_CH6);
+			chan_calc(chip, &chip->P_CH7);
+			chan_calc(chip, &chip->P_CH8);
+		}
+		else		/* Rhythm part */
+		{
+			chan_calc_rhythm(chip, &chip->P_CH0, (chip->noise_rng>>0)&1 );
+		}
+
+	/* register set #2 */
+		chan_calc(chip, &chip->P_CH 9);
+		if (chip->P_CH9.extended)
+			chan_calc_ext(chip, &chip->P_CH12);
+		else
+			chan_calc(chip, &chip->P_CH12);
+
+
+		chan_calc(chip, &chip->P_CH10);
+		if (chip->P_CH10.extended)
+			chan_calc_ext(chip, &chip->P_CH13);
+		else
+			chan_calc(chip, &chip->P_CH13);
+
+
+		chan_calc(chip, &chip->P_CH11);
+		if (chip->P_CH11.extended)
+			chan_calc_ext(chip, &chip->P_CH14);
+		else
+			chan_calc(chip, &chip->P_CH14);
+
+
+ /* channels 15,16,17 are fixed 2-operator channels only */
+		chan_calc(chip, &chip->P_CH15);
+		chan_calc(chip, &chip->P_CH16);
+		chan_calc(chip, &chip->P_CH17);
+#endif
+
+		/* accumulator register set #1 */
+		a = chip->chanout0 & chip->pan0;
+		b = chip->chanout0 & chip->pan1;
+		c = chip->chanout0 & chip->pan2;
+		d = chip->chanout0 & chip->pan3;
+#if 1
+		a += chip->chanout1 & chip->pan4;
+		b += chip->chanout1 & chip->pan5;
+		c += chip->chanout1 & chip->pan6;
+		d += chip->chanout1 & chip->pan7;
+		a += chip->chanout2 & chip->pan8;
+		b += chip->chanout2 & chip->pan9;
+		c += chip->chanout2 & chip->pan10;
+		d += chip->chanout2 & chip->pan11;
+
+		a += chip->chanout3 & chip->pan12;
+		b += chip->chanout3 & chip->pan13;
+		c += chip->chanout3 & chip->pan14;
+		d += chip->chanout3 & chip->pan15;
+		a += chip->chanout4 & chip->pan16;
+		b += chip->chanout4 & chip->pan17;
+		c += chip->chanout4 & chip->pan18;
+		d += chip->chanout4 & chip->pan19;
+		a += chip->chanout5 & chip->pan20;
+		b += chip->chanout5 & chip->pan21;
+		c += chip->chanout5 & chip->pan22;
+		d += chip->chanout5 & chip->pan23;
+
+		a += chip->chanout6 & chip->pan24;
+		b += chip->chanout6 & chip->pan25;
+		c += chip->chanout6 & chip->pan26;
+		d += chip->chanout6 & chip->pan27;
+		a += chip->chanout7 & chip->pan28;
+		b += chip->chanout7 & chip->pan29;
+		c += chip->chanout7 & chip->pan30;
+		d += chip->chanout7 & chip->pan31;
+		a += chip->chanout8 & chip->pan32;
+		b += chip->chanout8 & chip->pan33;
+		c += chip->chanout8 & chip->pan34;
+		d += chip->chanout8 & chip->pan35;
+
+		/* accumulator register set #2 */
+		a += chip->chanout9 & chip->pan36;
+		b += chip->chanout9 & chip->pan37;
+		c += chip->chanout9 & chip->pan38;
+		d += chip->chanout9 & chip->pan39;
+		a += chip->chanout10 & chip->pan40;
+		b += chip->chanout10 & chip->pan41;
+		c += chip->chanout10 & chip->pan42;
+		d += chip->chanout10 & chip->pan43;
+		a += chip->chanout11 & chip->pan44;
+		b += chip->chanout11 & chip->pan45;
+		c += chip->chanout11 & chip->pan46;
+		d += chip->chanout11 & chip->pan47;
+
+		a += chip->chanout12 & chip->pan48;
+		b += chip->chanout12 & chip->pan49;
+		c += chip->chanout12 & chip->pan50;
+		d += chip->chanout12 & chip->pan51;
+		a += chip->chanout13 & chip->pan52;
+		b += chip->chanout13 & chip->pan53;
+		c += chip->chanout13 & chip->pan54;
+		d += chip->chanout13 & chip->pan55;
+		a += chip->chanout14 & chip->pan56;
+		b += chip->chanout14 & chip->pan57;
+		c += chip->chanout14 & chip->pan58;
+		d += chip->chanout14 & chip->pan59;
+
+		a += chip->chanout15 & chip->pan60;
+		b += chip->chanout15 & chip->pan61;
+		c += chip->chanout15 & chip->pan62;
+		d += chip->chanout15 & chip->pan63;
+		a += chip->chanout16 & chip->pan64;
+		b += chip->chanout16 & chip->pan65;
+		c += chip->chanout16 & chip->pan66;
+		d += chip->chanout16 & chip->pan67;
+		a += chip->chanout17 & chip->pan68;
+		b += chip->chanout17 & chip->pan69;
+		c += chip->chanout17 & chip->pan70;
+		d += chip->chanout17 & chip->pan71;
+#endif
+		a >>= FINAL_SH;
+		b >>= FINAL_SH;
+		c >>= FINAL_SH;
+		d >>= FINAL_SH;
+
+		/* limit check */
+		//a = limit( a , MAXOUT, MINOUT );
+		//b = limit( b , MAXOUT, MINOUT );
+		//c = limit( c , MAXOUT, MINOUT );
+		//d = limit( d , MAXOUT, MINOUT );
+
+		#ifdef SAVE_SAMPLE
+		if (which==0)
+		{
+			SAVE_ALL_CHANNELS
+		}
+		#endif
+
+		/* store to sound buffer */
+		ch_ai = a+c;
+		ch_bi = b+d;
+		//ch_ci = c;
+		//ch_di = d;
+
+		advance(chip);
+	}
+
+}
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf262.h Added

@@ -0,0 +1,49 @@
+#pragma once
+
+//#include "attotime.h"
+
+/* select number of output bits: 8 or 16 */
+#define OPL3_SAMPLE_BITS 16
+
+/* compiler dependence */
+//#ifndef __OSDCOMM_H__
+//#define __OSDCOMM_H__
+/*typedef unsigned char	UINT8;   // unsigned  8bit
+typedef unsigned short	UINT16;  // unsigned 16bit
+typedef unsigned int	UINT32;  // unsigned 32bit
+typedef signed char		INT8;    // signed  8bit
+typedef signed short	INT16;   // signed 16bit
+typedef signed int		INT32;   // signed 32bit*/
+//#endif
+
+typedef stream_sample_t OPL3SAMPLE;
+/*
+#if (OPL3_SAMPLE_BITS==16)
+typedef INT16 OPL3SAMPLE;
+#endif
+#if (OPL3_SAMPLE_BITS==8)
+typedef INT8 OPL3SAMPLE;
+#endif
+*/
+
+//typedef void (*OPL3_TIMERHANDLER)(void *param,int timer,attotime period);
+typedef void (*OPL3_TIMERHANDLER)(void *param,int timer,int period);
+typedef void (*OPL3_IRQHANDLER)(void *param,int irq);
+typedef void (*OPL3_UPDATEHANDLER)(void *param/*,int min_interval_us*/);
+
+
+void *ymf262_init(int clock, int rate);
+void ymf262_shutdown(void *chip);
+void ymf262_reset_chip(void *chip);
+int  ymf262_write(void *chip, int a, int v);
+unsigned char ymf262_read(void *chip, int a);
+int  ymf262_timer_over(void *chip, int c);
+void ymf262_update_one(void *chip, OPL3SAMPLE **buffers, int length);
+
+void ymf262_set_timer_handler(void *chip, OPL3_TIMERHANDLER TimerHandler, void *param);
+void ymf262_set_irq_handler(void *chip, OPL3_IRQHANDLER IRQHandler, void *param);
+void ymf262_set_update_handler(void *chip, OPL3_UPDATEHANDLER UpdateHandler, void *param);
+
+void ymf262_set_emu_core(UINT8 Emulator);
+void ymf262_set_mutemask(void *chip, UINT32 MuteMask);
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.c Added

@@ -0,0 +1,1990 @@
+/*
+ Yamaha YMF271-F "OPX" emulator v0.1
+ By R. Belmont.
+ Based in part on YMF278B emulator by R. Belmont and O. Galibert.
+ 12June04 update by Toshiaki Nijiura
+ Copyright R. Belmont.
+
+ This software is dual-licensed: it may be used in MAME and properly licensed
+ MAME derivatives under the terms of the MAME license. For use outside of
+ MAME and properly licensed derivatives, it is available under the
+ terms of the GNU Lesser General Public License (LGPL), version 2.1.
+ You may read the LGPL at http://www.gnu.org/licenses/lgpl.html
+
+ TODO:
+ - A/L bit (alternate loop)
+ - EN and EXT Out bits
+ - Src B and Src NOTE bits
+ - statusreg Busy and End bits
+ - timer register 0x11
+ - ch2/ch3 (4 speakers)
+ - PFM (FM using external PCM waveform)
+ - detune (should be same as on other Yamaha chips)
+ - Acc On bit (some sound effects in viprp1?). The documentation says
+ "determines if slot output is accumulated(1), or output directly(0)"
+ - Is memory handling 100% correct? At the moment, seibuspi.c is the only
+ hardware currently emulated that uses external handlers.
+*/
+
+#include <math.h>
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include "ymf271.h"
+
+#ifndef __cplusplus	// C++ already has the bool-type
+#define	false	0x00
+#define	true	0x01
+typedef	unsigned char	bool;
+#endif // !__cplusplus
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+//#define DEVCB_NULL							{ DEVCB_TYPE_NULL }
+#define DEVCB_NULL							DEVCB_TYPE_NULL
+#define DEVCB_TYPE_NULL				(0)
+
+#define VERBOSE		(1)
+
+#define STD_CLOCK	(16934400)
+
+#define MAXOUT		(+32767)
+#define MINOUT		(-32768)
+
+#define SIN_BITS		10
+#define SIN_LEN			(1<<SIN_BITS)
+#define SIN_MASK		(SIN_LEN-1)
+
+#define LFO_LENGTH		256
+#define LFO_SHIFT		8
+#define PLFO_MAX		(+1.0)
+#define PLFO_MIN		(-1.0)
+#define ALFO_MAX		(+65536)
+#define ALFO_MIN		(0)
+
+#define ENV_ATTACK		0
+#define ENV_DECAY1		1
+#define ENV_DECAY2		2
+#define ENV_RELEASE		3
+
+#define OP_INPUT_FEEDBACK -1
+#define OP_INPUT_NONE -2
+
+#define ENV_VOLUME_SHIFT	16
+
+#define INF		-1.0
+
+static const double ARTime64 =
+{
+	INF,		INF,		INF,		INF,		6188.12,	4980.68,	4144.76,	3541.04,
+	3094.06,	2490.34,	2072.38,	1770.52,	1547.03,	1245.17,	1036.19,	885.26,
+	773.51,		622.59,		518.10,		441.63,		386.76,		311.29,		259.05,		221.32,
+	193.38,		155.65,		129.52,		110.66,		96.69,		77.82,		64.76,		55.33,
+	48.34,		38.91,		32.38,		27.66,		24.17,		19.46,		16.19,		13.83,
+	12.09,		9.73,		8.10,		6.92,		6.04,		4.86,		4.05,		3.46,
+	3.02,		2.47,		2.14,		1.88,		1.70,		1.38,		1.16,		1.02,
+	0.88,		0.70,		0.57,		0.48,		0.43,		0.43,		0.43,		0.07
+};
+
+static const double DCTime64 =
+{
+	INF,		INF,		INF,		INF,		93599.64,	74837.91,	62392.02,	53475.56,
+	46799.82,	37418.96,	31196.01,	26737.78,	23399.91,	18709.48,	15598.00,	13368.89,
+	11699.95,	9354.74,	7799.00,	6684.44,	5849.98,	4677.37,	3899.50,	3342.22,
+	2924.99,	2338.68,	1949.75,	1671.11,	1462.49,	1169.34,	974.88,		835.56,
+	731.25,		584.67,		487.44,		417.78,		365.62,		292.34,		243.72,		208.89,
+	182.81,		146.17,		121.86,		104.44,		91.41,		73.08,		60.93,		52.22,
+	45.69,		36.55,		33.85,		26.09,		22.83,		18.28,		15.22,		13.03,
+	11.41,		9.12,		7.60,		6.51,		5.69,		5.69,		5.69,		5.69
+};
+
+/* Notes about the LFO Frequency Table below:
+
+ There are 2 known errors in the LFO table listed in the original manual.
+
+ Both 201 & 202 are listed as 3.74490. 202 has been computed/corrected to 3.91513
+ 232 was listed as 13.35547 but has been replaced with the correct value of 14.35547.
+
+ Corrections are computed values based on formulas by Olivier Galibert & Nicola Salmoria listed below:
+
+LFO period seems easy to compute:
+
+Olivier Galibert's version Nicola Salmoria's version
+
+int lfo_period(int entry) or int calc_lfo_period(int entry)
+{ {
+ int ma, ex; entry = 256 - entry;
+ entry = 256-entry;
+ ma = entry & 15; if (entry < 16)
+ {
+ ex = entry >> 4; return (entry & 0x0f) << 7;
+ if(ex) }
+ return (ma | 16) << (ex+6); else
+ else {
+ return ma << 7; int shift = 6 + (entry >> 4);
+} return (0x10 + (entry & 0x0f)) << shift;
+ }
+lfo_freq = 44100 / lfo_period }
+
+*/
+
+static const double LFO_frequency_table256 =
+{
+	0.00066,	0.00068,	0.00070,	0.00073,	0.00075,	0.00078,	0.00081,	0.00084,
+	0.00088,	0.00091,	0.00096,	0.00100,	0.00105,	0.00111,	0.00117,	0.00124,
+	0.00131,	0.00136,	0.00140,	0.00145,	0.00150,	0.00156,	0.00162,	0.00168,
+	0.00175,	0.00183,	0.00191,	0.00200,	0.00210,	0.00221,	0.00234,	0.00247,
+	0.00263,	0.00271,	0.00280,	0.00290,	0.00300,	0.00312,	0.00324,	0.00336,
+	0.00350,	0.00366,	0.00382,	0.00401,	0.00421,	0.00443,	0.00467,	0.00495,
+	0.00526,	0.00543,	0.00561,	0.00580,	0.00601,	0.00623,	0.00647,	0.00673,
+	0.00701,	0.00731,	0.00765,	0.00801,	0.00841,	0.00885,	0.00935,	0.00990,
+	0.01051,	0.01085,	0.01122,	0.01160,	0.01202,	0.01246,	0.01294,	0.01346,
+	0.01402,	0.01463,	0.01529,	0.01602,	0.01682,	0.01771,	0.01869,	0.01979,
+	0.02103,	0.02171,	0.02243,	0.02320,	0.02403,	0.02492,	0.02588,	0.02692,
+	0.02804,	0.02926,	0.03059,	0.03204,	0.03365,	0.03542,	0.03738,	0.03958,
+	0.04206,	0.04341,	0.04486,	0.04641,	0.04807,	0.04985,	0.05176,	0.05383,
+	0.05608,	0.05851,	0.06117,	0.06409,	0.06729,	0.07083,	0.07477,	0.07917,
+	0.08411,	0.08683,	0.08972,	0.09282,	0.09613,	0.09969,	0.10353,	0.10767,
+	0.11215,	0.11703,	0.12235,	0.12817,	0.13458,	0.14167,	0.14954,	0.15833,
+	0.16823,	0.17365,	0.17944,	0.18563,	0.19226,	0.19938,	0.20705,	0.21533,
+	0.22430,	0.23406,	0.24470,	0.25635,	0.26917,	0.28333,	0.29907,	0.31666,
+	0.33646,	0.34731,	0.35889,	0.37126,	0.38452,	0.39876,	0.41410,	0.43066,
+	0.44861,	0.46811,	0.48939,	0.51270,	0.53833,	0.56666,	0.59814,	0.63333,
+	0.67291,	0.69462,	0.71777,	0.74252,	0.76904,	0.79753,	0.82820,	0.86133,
+	0.89722,	0.93623,	0.97878,	1.02539,	1.07666,	1.13333,	1.19629,	1.26666,
+	1.34583,	1.38924,	1.43555,	1.48505,	1.53809,	1.59509,	1.65640,	1.72266,
+	1.79443,	1.87245,	1.95756,	2.05078,	2.15332,	2.26665,	2.39258,	2.53332,
+	2.69165,	2.77848,	2.87109,	2.97010,	3.07617,	3.19010,	3.31280,	3.44531,
+	3.58887,	3.74490,	3.91513,	4.10156,	4.30664,	4.53331,	4.78516,	5.06664,
+	5.38330,	5.55696,	5.74219,	5.94019,	6.15234,	6.38021,	6.62560,	6.89062,
+	7.17773,	7.48981,	7.83026,	8.20312,	8.61328,	9.06661,	9.57031,	10.13327,
+	10.76660,	11.11391,	11.48438,	11.88039,	12.30469,	12.76042,	13.25120,	13.78125,
+	14.35547,	14.97962,	15.66051,	16.40625,	17.22656,	18.13322,	19.14062,	20.26654,
+	21.53320,	22.96875,	24.60938,	26.50240,	28.71094,	31.32102,	34.45312,	38.28125,
+	43.06641,	49.21875,	57.42188,	68.90625,	86.13281,	114.84375,	172.26562,	344.53125
+};
+
+static const int RKS_Table328 =
+{
+	{ 0, 0, 0, 0, 0, 2, 4, 8 },
+	{ 0, 0, 0, 0, 1, 3, 5, 9 },
+	{ 0, 0, 0, 1, 2, 4, 6, 10 },
+	{ 0, 0, 0, 1, 3, 5, 7, 11 },
+	{ 0, 0, 1, 2, 4, 6, 8, 12 },
+	{ 0, 0, 1, 2, 5, 7, 9, 13 },
+	{ 0, 0, 1, 3, 6, 8, 10, 14 },
+	{ 0, 0, 1, 3, 7, 9, 11, 15 },
+	{ 0, 1, 2, 4, 8, 10, 12, 16 },
+	{ 0, 1, 2, 4, 9, 11, 13, 17 },
+	{ 0, 1, 2, 5, 10, 12, 14, 18 },
+	{ 0, 1, 2, 5, 11, 13, 15, 19 },
+	{ 0, 1, 3, 6, 12, 14, 16, 20 },
+	{ 0, 1, 3, 6, 13, 15, 17, 21 },
+	{ 0, 1, 3, 7, 14, 16, 18, 22 },
+	{ 0, 1, 3, 7, 15, 17, 19, 23 },
+	{ 0, 2, 4, 8, 16, 18, 20, 24 },
+	{ 0, 2, 4, 8, 17, 19, 21, 25 },
+	{ 0, 2, 4, 9, 18, 20, 22, 26 },
+	{ 0, 2, 4, 9, 19, 21, 23, 27 },
+	{ 0, 2, 5, 10, 20, 22, 24, 28 },
+	{ 0, 2, 5, 10, 21, 23, 25, 29 },
+	{ 0, 2, 5, 11, 22, 24, 26, 30 },
+	{ 0, 2, 5, 11, 23, 25, 27, 31 },
+	{ 0, 3, 6, 12, 24, 26, 28, 31 },
+	{ 0, 3, 6, 12, 25, 27, 29, 31 },
+	{ 0, 3, 6, 13, 26, 28, 30, 31 },
+	{ 0, 3, 6, 13, 27, 29, 31, 31 },
+	{ 0, 3, 7, 14, 28, 30, 31, 31 },
+	{ 0, 3, 7, 14, 29, 31, 31, 31 },
+	{ 0, 3, 7, 15, 30, 31, 31, 31 },
+	{ 0, 3, 7, 15, 31, 31, 31, 31 },
+};
+
+static const double multiple_table16 = { 0.5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+
+static const double pow_table16 = { 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 0.5, 1, 2, 4, 8, 16, 32, 64 };
+
+static const double fs_frequency4 = { 1.0/1.0, 1.0/2.0, 1.0/4.0, 1.0/8.0 };
+
+static const double channel_attenuation_table16 =
+{
+	0.0, 2.5, 6.0, 8.5, 12.0, 14.5, 18.1, 20.6, 24.1, 26.6, 30.1, 32.6, 36.1, 96.1, 96.1, 96.1
+};
+
+static const int modulation_level8 = { 16, 8, 4, 2, 1, 32, 64, 128 };
+
+// feedback_level * 16
+static const int feedback_level8 = { 0, 1, 2, 4, 8, 16, 32, 64 };
+
+// slot mapping assists
+static const int fm_tab16 = { 0, 1, 2, -1, 3, 4, 5, -1, 6, 7, 8, -1, 9, 10, 11, -1 };
+static const int pcm_tab16 = { 0, 4, 8, -1, 12, 16, 20, -1, 24, 28, 32, -1, 36, 40, 44, -1 };
+
+
+typedef struct
+{
+	UINT8 ext_en;
+	UINT8 ext_out;
+	UINT8 lfoFreq;
+	UINT8 lfowave;
+	UINT8 pms, ams;
+	UINT8 detune;
+	UINT8 multiple;
+	UINT8 tl;
+	UINT8 keyscale;
+	UINT8 ar;
+	UINT8 decay1rate, decay2rate;
+	UINT8 decay1lvl;
+	UINT8 relrate;
+	UINT8 block;
+	UINT8 fns_hi;
+	UINT32 fns;
+	UINT8 feedback;
+	UINT8 waveform;
+	UINT8 accon;
+	UINT8 algorithm;
+	UINT8 ch0_level, ch1_level, ch2_level, ch3_level;
+
+	UINT32 startaddr;
+	UINT32 loopaddr;
+	UINT32 endaddr;
+	UINT8 altloop;
+	UINT8 fs;
+	UINT8 srcnote, srcb;
+
+	UINT32 step;
+	UINT64 stepptr;
+
+	UINT8 active;
+	UINT8 bits;
+
+	// envelope generator
+	INT32 volume;
+	INT32 env_state;
+	INT32 env_attack_step;		// volume increase step in attack state
+	INT32 env_decay1_step;
+	INT32 env_decay2_step;
+	INT32 env_release_step;
+
+	INT64 feedback_modulation0;
+	INT64 feedback_modulation1;
+
+	INT32 lfo_phase, lfo_step;
+	INT32 lfo_amplitude;
+	double lfo_phasemod;
+} YMF271Slot;
+
+typedef struct
+{
+	UINT8 sync, pfm;
+	UINT8 Muted;
+} YMF271Group;
+
+typedef struct
+{
+	// lookup tables
+	INT16 *lut_waves8;
+	double *lut_plfo48;
+	int *lut_alfo4;
+	double lut_ar64;
+	double lut_dc64;
+	double lut_lfo256;
+	int lut_attenuation16;
+	int lut_total_level128;
+	int lut_env_volume256;
+
+	YMF271Slot slots48;
+	YMF271Group groups12;
+
+	UINT8 regs_main0x10;
+
+	UINT32 timerA, timerB;
+	UINT32 timerAVal, timerBVal;
+	UINT32 irqstate;
+	UINT8 status;
+	UINT8 enable;
+
+	UINT32 ext_address;
+	UINT8 ext_rw;
+	UINT8 ext_readlatch;
+
+	UINT8 *mem_base;
+	UINT32 mem_size;
+	UINT32 clock;
+
+	//emu_timer *timA, *timB;
+	//sound_stream * stream;
+	INT32 *mix_buffer;
+	//const device_config *device;
+
+	//devcb_resolved_read8 ext_mem_read;
+	//devcb_resolved_write8 ext_mem_write;
+	//void (*irq_callback)(const device_config *, int);
+	//void (*irq_callback)(int);
+} YMF271Chip;
+
+
+/*INLINE YMF271Chip *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YMF271);
+	return (YMF271Chip *)device->token;
+}*/
+
+static UINT8 ymf271_read_memory(YMF271Chip *chip, UINT32 offset);
+
+
+INLINE void calculate_step(YMF271Slot *slot)
+{
+	double st;
+
+	if (slot->waveform == 7)
+	{
+		// external waveform (PCM)
+		st = (double)(2 * (slot->fns | 2048)) * pow_tableslot->block * fs_frequencyslot->fs;
+		st = st * multiple_tableslot->multiple;
+
+		// LFO phase modulation
+		st *= slot->lfo_phasemod;
+
+		st /= (double)(524288/65536);		// pre-multiply with 65536
+
+		slot->step = (UINT32)st;
+	}
+	else
+	{
+		// internal waveform (FM)
+		st = (double)(2 * slot->fns) * pow_tableslot->block;
+		st = st * multiple_tableslot->multiple * (double)(SIN_LEN);
+
+		// LFO phase modulation
+		st *= slot->lfo_phasemod;
+
+		st /= (double)(536870912/65536);	// pre-multiply with 65536
+
+		slot->step = (UINT32)st;
+	}
+}
+
+INLINE bool check_envelope_end(YMF271Slot *slot)
+{
+	if (slot->volume <= 0)
+	{
+		slot->active = 0;
+		slot->volume = 0;
+		return true;
+	}
+	return false;
+}
+
+static void update_envelope(YMF271Slot *slot)
+{
+	switch (slot->env_state)
+	{
+		case ENV_ATTACK:
+		{
+			slot->volume += slot->env_attack_step;
+
+			if (slot->volume >= (255 << ENV_VOLUME_SHIFT))
+			{
+				slot->volume = (255 << ENV_VOLUME_SHIFT);
+				slot->env_state = ENV_DECAY1;
+			}
+			break;
+		}
+
+		case ENV_DECAY1:
+		{
+			int decay_level = 255 - (slot->decay1lvl << 4);
+			slot->volume -= slot->env_decay1_step;
+
+			if (!check_envelope_end(slot) && (slot->volume >> ENV_VOLUME_SHIFT) <= decay_level)
+			{
+				slot->env_state = ENV_DECAY2;
+			}
+			break;
+		}
+
+		case ENV_DECAY2:
+		{
+			slot->volume -= slot->env_decay2_step;
+			check_envelope_end(slot);
+			break;
+		}
+
+		case ENV_RELEASE:
+		{
+			slot->volume -= slot->env_release_step;
+			check_envelope_end(slot);
+			break;
+		}
+	}
+}
+
+INLINE int get_keyscaled_rate(int rate, int keycode, int keyscale)
+{
+	int newrate = rate + RKS_Tablekeycodekeyscale;
+
+	if (newrate > 63)
+	{
+		newrate = 63;
+	}
+	if (newrate < 0)
+	{
+		newrate = 0;
+	}
+	return newrate;
+}
+
+INLINE int get_internal_keycode(int block, int fns)
+{
+	int n43;
+	if (fns < 0x780)
+	{
+		n43 = 0;
+	}
+	else if (fns < 0x900)
+	{
+		n43 = 1;
+	}
+	else if (fns < 0xa80)
+	{
+		n43 = 2;
+	}
+	else
+	{
+		n43 = 3;
+	}
+
+	return ((block & 7) * 4) + n43;
+}
+
+INLINE int get_external_keycode(int block, int fns)
+{
+	int n43;
+	if (fns < 0x100)
+	{
+		n43 = 0;
+	}
+	else if (fns < 0x300)
+	{
+		n43 = 1;
+	}
+	else if (fns < 0x500)
+	{
+		n43 = 2;
+	}
+	else
+	{
+		n43 = 3;
+	}
+
+	return ((block & 7) * 4) + n43;
+}
+
+static void init_envelope(YMF271Chip *chip, YMF271Slot *slot)
+{
+	int keycode, rate;
+	int decay_level = 255 - (slot->decay1lvl << 4);
+
+	if (slot->waveform != 7)
+	{
+		keycode = get_internal_keycode(slot->block, slot->fns);
+	}
+	else
+	{
+		keycode = get_external_keycode(slot->block, slot->fns & 0x7ff);
+		/* keycode = (keycode + slot->srcb * 4 + slot->srcnote) / 2; */ // not sure
+	}
+
+	// init attack state
+	rate = get_keyscaled_rate(slot->ar * 2, keycode, slot->keyscale);
+	slot->env_attack_step = (rate < 4) ? 0 : (int)(((double)(255-0) / chip->lut_arrate) * 65536.0);
+
+	// init decay1 state
+	rate = get_keyscaled_rate(slot->decay1rate * 2, keycode, slot->keyscale);
+	slot->env_decay1_step = (rate < 4) ? 0 : (int)(((double)(255-decay_level) / chip->lut_dcrate) * 65536.0);
+
+	// init decay2 state
+	rate = get_keyscaled_rate(slot->decay2rate * 2, keycode, slot->keyscale);
+	slot->env_decay2_step = (rate < 4) ? 0 : (int)(((double)(255-0) / chip->lut_dcrate) * 65536.0);
+
+	// init release state
+	rate = get_keyscaled_rate(slot->relrate * 4, keycode, slot->keyscale);
+	slot->env_release_step = (rate < 4) ? 0 : (int)(((double)(255-0) / chip->lut_arrate) * 65536.0);
+
+	slot->volume = (255-160) << ENV_VOLUME_SHIFT;		// -60db
+	slot->env_state = ENV_ATTACK;
+}
+
+static void init_lfo(YMF271Chip *chip, YMF271Slot *slot)
+{
+	slot->lfo_phase = 0;
+	slot->lfo_amplitude = 0;
+	slot->lfo_phasemod = 0;
+
+	slot->lfo_step = (int)((((double)LFO_LENGTH * chip->lut_lfoslot->lfoFreq) / 44100.0) * 256.0);
+}
+
+INLINE void update_lfo(YMF271Chip *chip, YMF271Slot *slot)
+{
+	slot->lfo_phase += slot->lfo_step;
+
+	slot->lfo_amplitude = chip->lut_alfoslot->lfowave(slot->lfo_phase >> LFO_SHIFT) & (LFO_LENGTH-1);
+	slot->lfo_phasemod = chip->lut_plfoslot->lfowaveslot->pms(slot->lfo_phase >> LFO_SHIFT) & (LFO_LENGTH-1);
+
+	calculate_step(slot);
+}
+
+INLINE int calculate_slot_volume(YMF271Chip *chip, YMF271Slot *slot)
+{
+	// Note: Actually everyone of these stores only INT32 (16.16 fixed point),
+	// but the calculations need INT64.
+	INT32 volume;
+	INT64 env_volume;
+	INT64 lfo_volume = 65536;
+
+	switch (slot->ams)
+	{
+		case 0: lfo_volume = 65536; break;	// 0dB
+		case 1: lfo_volume = 65536 - ((slot->lfo_amplitude * 33124) >> 16); break;	// 5.90625dB
+		case 2: lfo_volume = 65536 - ((slot->lfo_amplitude * 16742) >> 16); break;	// 11.8125dB
+		case 3: lfo_volume = 65536 - ((slot->lfo_amplitude * 4277) >> 16); break;	// 23.625dB
+	}
+
+	env_volume = (chip->lut_env_volume255 - (slot->volume >> ENV_VOLUME_SHIFT) * lfo_volume) >> 16;
+
+	volume = (env_volume * chip->lut_total_levelslot->tl) >> 16;
+
+	return volume;
+}
+
+static void update_pcm(YMF271Chip *chip, int slotnum, INT32 *mixp, int length)
+{
+	int i;
+	INT64 final_volume;
+	INT16 sample;
+	INT64 ch0_vol, ch1_vol; //, ch2_vol, ch3_vol;
+
+	YMF271Slot *slot = &chip->slotsslotnum;
+
+	if (!slot->active)
+	{
+		return;
+	}
+
+#ifdef _DEBUG
+	if (slot->waveform != 7)
+	{
+		logerror("Waveform %d in update_pcm !!!\n", slot->waveform);
+	}
+#endif
+
+	for (i = 0; i < length; i++)
+	{
+		// loop
+		if ((slot->stepptr>>16) > slot->endaddr)
+		{
+			slot->stepptr = slot->stepptr - ((UINT64)slot->endaddr<<16) + ((UINT64)slot->loopaddr<<16);
+			if ((slot->stepptr>>16) > slot->endaddr)
+			{
+				// overflow
+				slot->stepptr &= 0xffff;
+				slot->stepptr |= ((UINT64)slot->loopaddr<<16);
+				if ((slot->stepptr>>16) > slot->endaddr)
+				{
+					// still overflow? (triggers in rdft2, rarely)
+					slot->stepptr &= 0xffff;
+					slot->stepptr |= ((UINT64)slot->endaddr<<16);
+				}
+			}
+		}
+
+		if (slot->bits == 8)
+		{
+			// 8bit
+			sample = ymf271_read_memory(chip, slot->startaddr + (slot->stepptr>>16))<<8;
+		}
+		else
+		{
+			// 12bit
+			if (slot->stepptr & 0x10000)
+				sample = ymf271_read_memory(chip, slot->startaddr + (slot->stepptr>>17)*3 + 2)<<8 | ((ymf271_read_memory(chip, slot->startaddr + (slot->stepptr>>17)*3 + 1) << 4) & 0xf0);
+			else
+				sample = ymf271_read_memory(chip, slot->startaddr + (slot->stepptr>>17)*3)<<8 | (ymf271_read_memory(chip, slot->startaddr + (slot->stepptr>>17)*3 + 1) & 0xf0);
+		}
+
+		update_envelope(slot);
+		update_lfo(chip, slot);
+
+		final_volume = calculate_slot_volume(chip, slot);
+
+		ch0_vol = (final_volume * chip->lut_attenuationslot->ch0_level) >> 16;
+		ch1_vol = (final_volume * chip->lut_attenuationslot->ch1_level) >> 16;
+//		ch2_vol = (final_volume * chip->lut_attenuationslot->ch2_level) >> 16;
+//		ch3_vol = (final_volume * chip->lut_attenuationslot->ch3_level) >> 16;
+
+		if (ch0_vol > 65536) ch0_vol = 65536;
+		if (ch1_vol > 65536) ch1_vol = 65536;
+
+		*mixp++ += (sample * ch0_vol) >> 16;
+		*mixp++ += (sample * ch1_vol) >> 16;
+
+		// go to next step
+		slot->stepptr += slot->step;
+	}
+}
+
+// calculates the output of one FM operator
+static INT64 calculate_op(YMF271Chip *chip, int slotnum, INT64 inp)
+{
+	YMF271Slot *slot = &chip->slotsslotnum;
+	INT64 env, slot_output, slot_input = 0;
+
+	update_envelope(slot);
+	update_lfo(chip, slot);
+	env = calculate_slot_volume(chip, slot);
+
+	if (inp == OP_INPUT_FEEDBACK)
+	{
+		// from own feedback
+		slot_input = (slot->feedback_modulation0 + slot->feedback_modulation1) / 2;
+		slot->feedback_modulation0 = slot->feedback_modulation1;
+	}
+	else if (inp != OP_INPUT_NONE)
+	{
+		// from previous slot output
+		slot_input = ((inp << (SIN_BITS-2)) * modulation_levelslot->feedback);
+	}
+
+	slot_output = chip->lut_wavesslot->waveform((slot->stepptr + slot_input) >> 16) & SIN_MASK;
+	slot_output = (slot_output * env) >> 16;
+	slot->stepptr += slot->step;
+
+	return slot_output;
+}
+
+static void set_feedback(YMF271Chip *chip, int slotnum, INT64 inp)
+{
+	YMF271Slot *slot = &chip->slotsslotnum;
+	slot->feedback_modulation1 = (((inp << (SIN_BITS-2)) * feedback_levelslot->feedback) / 16);
+}
+
+//static STREAM_UPDATE( ymf271_update )
+void ymf271_update(void *param, stream_sample_t **outputs, int samples)
+{
+	int i, j;
+	int op;
+	INT32 *mixp;
+	YMF271Chip *chip = (YMF271Chip *)param;
+
+	memset(chip->mix_buffer, 0, sizeof(chip->mix_buffer0)*samples*2);
+
+	for (j = 0; j < 12; j++)
+	{
+		YMF271Group *slot_group = &chip->groupsj;
+		mixp = &chip->mix_buffer0;
+
+		if (slot_group->Muted)
+			continue;
+
+#ifdef _DEBUG
+		if (slot_group->pfm && slot_group->sync != 3)
+		{
+			logerror("ymf271 Group %d: PFM, Sync = %d, Waveform Slot1 = %d, Slot2 = %d, Slot3 = %d, Slot4 = %d\n",
+				j, slot_group->sync, chip->slotsj+0.waveform, chip->slotsj+12.waveform, chip->slotsj+24.waveform, chip->slotsj+36.waveform);
+		}
+#endif
+
+		switch (slot_group->sync)
+		{
+			// 4 operator FM
+			case 0:
+			{
+				int slot1 = j + (0*12);
+				int slot2 = j + (1*12);
+				int slot3 = j + (2*12);
+				int slot4 = j + (3*12);
+				//mixp = chip->mix_buffer;
+
+				if (chip->slotsslot1.active)
+				{
+					for (i = 0; i < samples; i++)
+					{
+						INT64 output1 = 0, output2 = 0, output3 = 0, output4 = 0;
+						INT64 phase_mod1 = 0, phase_mod2 = 0, phase_mod3 = 0;
+						switch (chip->slotsslot1.algorithm)
+						{
+							// <--------|
+							// +--S1--|--+--S3--+--S2--+--S4-->
+							case 0:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								phase_mod3 = calculate_op(chip, slot3, phase_mod1);
+								phase_mod2 = calculate_op(chip, slot2, phase_mod3);
+								output4 = calculate_op(chip, slot4, phase_mod2);
+								break;
+
+							// <-----------------|
+							// +--S1--+--S3--|--+--S2--+--S4-->
+							case 1:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								phase_mod3 = calculate_op(chip, slot3, phase_mod1);
+								set_feedback(chip, slot1, phase_mod3);
+								phase_mod2 = calculate_op(chip, slot2, phase_mod3);
+								output4 = calculate_op(chip, slot4, phase_mod2);
+								break;
+
+							// <--------|
+							// +--S1--|
+							// |
+							// --S3--+--S2--+--S4-->
+							case 2:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								phase_mod3 = calculate_op(chip, slot3, OP_INPUT_NONE);
+								phase_mod2 = calculate_op(chip, slot2, (phase_mod1 + phase_mod3) / 1);
+								output4 = calculate_op(chip, slot4, phase_mod2);
+								break;
+
+							// <--------|
+							// +--S1--|
+							// |
+							// --S3--+--S2--+--S4-->
+							case 3:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								phase_mod3 = calculate_op(chip, slot3, OP_INPUT_NONE);
+								phase_mod2 = calculate_op(chip, slot2, phase_mod3);
+								output4 = calculate_op(chip, slot4, (phase_mod1 + phase_mod2) / 1);
+								break;
+
+							// --S2--|
+							// <--------| |
+							// +--S1--|--+--S3--+--S4-->
+							case 4:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								phase_mod3 = calculate_op(chip, slot3, phase_mod1);
+								phase_mod2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								output4 = calculate_op(chip, slot4, (phase_mod3 + phase_mod2) / 1);
+								break;
+
+							// --S2-----|
+							// <-----------------| |
+							// +--S1--+--S3--|--+--S4-->
+							case 5:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								phase_mod3 = calculate_op(chip, slot3, phase_mod1);
+								set_feedback(chip, slot1, phase_mod3);
+								phase_mod2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								output4 = calculate_op(chip, slot4, (phase_mod3 + phase_mod2) / 1);
+								break;
+
+							// --S2-----+--S4--|
+							// |
+							// <--------| |
+							// +--S1--|--+--S3--+-->
+							case 6:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output3 = calculate_op(chip, slot3, phase_mod1);
+								phase_mod2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								output4 = calculate_op(chip, slot4, phase_mod2);
+								break;
+
+							// --S2--+--S4-----|
+							// |
+							// <-----------------| |
+							// +--S1--+--S3--|--+-->
+							case 7:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								phase_mod3 = calculate_op(chip, slot3, phase_mod1);
+								set_feedback(chip, slot1, phase_mod3);
+								output3 = phase_mod3;
+								phase_mod2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								output4 = calculate_op(chip, slot4, phase_mod2);
+								break;
+
+							// --S3--+--S2--+--S4--|
+							// |
+							// <--------| |
+							// +--S1--|-----------------+-->
+							case 8:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output1 = phase_mod1;
+								phase_mod3 = calculate_op(chip, slot3, OP_INPUT_NONE);
+								phase_mod2 = calculate_op(chip, slot2, phase_mod3);
+								output4 = calculate_op(chip, slot4, phase_mod2);
+								break;
+
+							// <--------|
+							// +--S1--|
+							// |
+							// --S3--| |
+							// --S2--+--S4--+-->
+							case 9:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output1 = phase_mod1;
+								phase_mod3 = calculate_op(chip, slot3, OP_INPUT_NONE);
+								phase_mod2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								output4 = calculate_op(chip, slot4, (phase_mod3 + phase_mod2) / 1);
+								break;
+
+							// --S4--|
+							// --S2--|
+							// <--------| |
+							// +--S1--|--+--S3--+-->
+							case 10:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output3 = calculate_op(chip, slot3, phase_mod1);
+								output2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								output4 = calculate_op(chip, slot4, OP_INPUT_NONE);
+								break;
+
+							// --S4-----|
+							// --S2-----|
+							// <-----------------| |
+							// +--S1--+--S3--|--+-->
+							case 11:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								phase_mod3 = calculate_op(chip, slot3, phase_mod1);
+								set_feedback(chip, slot1, phase_mod3);
+								output3 = phase_mod3;
+								output2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								output4 = calculate_op(chip, slot4, OP_INPUT_NONE);
+								break;
+
+							// |--+--S4--|
+							// <--------| |--+--S3--|
+							// +--S1--|--|--+--S2--+-->
+							case 12:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output3 = calculate_op(chip, slot3, phase_mod1);
+								output2 = calculate_op(chip, slot2, phase_mod1);
+								output4 = calculate_op(chip, slot4, phase_mod1);
+								break;
+
+							// --S3--+--S2--|
+							// |
+							// --S4-----------|
+							// <--------| |
+							// +--S1--|--------+-->
+							case 13:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output1 = phase_mod1;
+								phase_mod3 = calculate_op(chip, slot3, OP_INPUT_NONE);
+								output2 = calculate_op(chip, slot2, phase_mod3);
+								output4 = calculate_op(chip, slot4, OP_INPUT_NONE);
+								break;
+
+							// --S2-----+--S4--|
+							// |
+							// <--------| +--S3--|
+							// +--S1--|--|--------+-->
+							case 14:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output1 = phase_mod1;
+								output3 = calculate_op(chip, slot3, phase_mod1);
+								phase_mod2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								output4 = calculate_op(chip, slot4, phase_mod2);
+								break;
+
+							// --S4-----|
+							// --S2-----|
+							// --S3-----|
+							// <--------| |
+							// +--S1--|--+-->
+							case 15:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output1 = phase_mod1;
+								output3 = calculate_op(chip, slot3, OP_INPUT_NONE);
+								output2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								output4 = calculate_op(chip, slot4, OP_INPUT_NONE);
+								break;
+						}
+
+						*mixp++ += ((output1 * chip->lut_attenuationchip->slotsslot1.ch0_level) +
+									(output2 * chip->lut_attenuationchip->slotsslot2.ch0_level) +
+									(output3 * chip->lut_attenuationchip->slotsslot3.ch0_level) +
+									(output4 * chip->lut_attenuationchip->slotsslot4.ch0_level)) >> 16;
+						*mixp++ += ((output1 * chip->lut_attenuationchip->slotsslot1.ch1_level) +
+									(output2 * chip->lut_attenuationchip->slotsslot2.ch1_level) +
+									(output3 * chip->lut_attenuationchip->slotsslot3.ch1_level) +
+									(output4 * chip->lut_attenuationchip->slotsslot4.ch1_level)) >> 16;
+					}
+				}
+				break;
+			}
+
+			// 2x 2 operator FM
+			case 1:
+			{
+				for (op = 0; op < 2; op++)
+				{
+					int slot1 = j + ((op + 0) * 12);
+					int slot3 = j + ((op + 2) * 12);
+
+					mixp = chip->mix_buffer;
+					if (chip->slotsslot1.active)
+					{
+						for (i = 0; i < samples; i++)
+						{
+							INT64 output1 = 0, output3 = 0;
+							INT64 phase_mod1, phase_mod3 = 0;
+							switch (chip->slotsslot1.algorithm & 3)
+							{
+								// <--------|
+								// +--S1--|--+--S3-->
+								case 0:
+									phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+									set_feedback(chip, slot1, phase_mod1);
+									output3 = calculate_op(chip, slot3, phase_mod1);
+									break;
+
+								// <-----------------|
+								// +--S1--+--S3--|-->
+								case 1:
+									phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+									phase_mod3 = calculate_op(chip, slot3, phase_mod1);
+									set_feedback(chip, slot1, phase_mod3);
+									output3 = phase_mod3;
+									break;
+
+								// --S3-----|
+								// <--------| |
+								// +--S1--|--+-->
+								case 2:
+									phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+									set_feedback(chip, slot1, phase_mod1);
+									output1 = phase_mod1;
+									output3 = calculate_op(chip, slot3, OP_INPUT_NONE);
+									break;
+								//
+								// <--------| +--S3--|
+								// +--S1--|--|--------+-->
+								case 3:
+									phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+									set_feedback(chip, slot1, phase_mod1);
+									output1 = phase_mod1;
+									output3 = calculate_op(chip, slot3, phase_mod1);
+									break;
+							}
+
+							*mixp++ += ((output1 * chip->lut_attenuationchip->slotsslot1.ch0_level) +
+										(output3 * chip->lut_attenuationchip->slotsslot3.ch0_level)) >> 16;
+							*mixp++ += ((output1 * chip->lut_attenuationchip->slotsslot1.ch1_level) +
+										(output3 * chip->lut_attenuationchip->slotsslot3.ch1_level)) >> 16;
+						}
+					}
+				}
+				break;
+			}
+
+			// 3 operator FM + PCM
+			case 2:
+			{
+				int slot1 = j + (0*12);
+				int slot2 = j + (1*12);
+				int slot3 = j + (2*12);
+				//mixp = chip->mix_buffer;
+
+				if (chip->slotsslot1.active)
+				{
+					for (i = 0; i < samples; i++)
+					{
+						INT64 output1 = 0, output2 = 0, output3 = 0;
+						INT64 phase_mod1 = 0, phase_mod3 = 0;
+						switch (chip->slotsslot1.algorithm & 7)
+						{
+							// <--------|
+							// +--S1--|--+--S3--+--S2-->
+							case 0:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								phase_mod3 = calculate_op(chip, slot3, phase_mod1);
+								output2 = calculate_op(chip, slot2, phase_mod3);
+								break;
+
+							// <-----------------|
+							// +--S1--+--S3--|--+--S2-->
+							case 1:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								phase_mod3 = calculate_op(chip, slot3, phase_mod1);
+								set_feedback(chip, slot1, phase_mod3);
+								output2 = calculate_op(chip, slot2, phase_mod3);
+								break;
+
+							// --S3-----|
+							// <--------| |
+							// +--S1--|--+--S2-->
+							case 2:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								phase_mod3 = calculate_op(chip, slot3, OP_INPUT_NONE);
+								output2 = calculate_op(chip, slot2, (phase_mod1 + phase_mod3) / 1);
+								break;
+
+							// --S3--+--S2--|
+							// <--------| |
+							// +--S1--|--------+-->
+							case 3:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output1 = phase_mod1;
+								phase_mod3 = calculate_op(chip, slot3, OP_INPUT_NONE);
+								output2 = calculate_op(chip, slot2, phase_mod3);
+								break;
+
+							// --S2--|
+							// <--------| |
+							// +--S1--|--+--S3--+-->
+							case 4:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output3 = calculate_op(chip, slot3, phase_mod1);
+								output2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								break;
+
+							// --S2--|
+							// <-----------------| |
+							// +--S1--+--S3--|--+-->
+							case 5:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								phase_mod3 = calculate_op(chip, slot3, phase_mod1);
+								set_feedback(chip, slot1, phase_mod3);
+								output3 = phase_mod3;
+								output2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								break;
+
+							// --S2-----|
+							// --S3-----|
+							// <--------| |
+							// +--S1--|--+-->
+							case 6:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output1 = phase_mod1;
+								output3 = calculate_op(chip, slot3, OP_INPUT_NONE);
+								output2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								break;
+
+							// --S2--|
+							// <--------| +--S3--|
+							// +--S1--|--|--------+-->
+							case 7:
+								phase_mod1 = calculate_op(chip, slot1, OP_INPUT_FEEDBACK);
+								set_feedback(chip, slot1, phase_mod1);
+								output1 = phase_mod1;
+								output3 = calculate_op(chip, slot3, phase_mod1);
+								output2 = calculate_op(chip, slot2, OP_INPUT_NONE);
+								break;
+						}
+
+						*mixp++ += ((output1 * chip->lut_attenuationchip->slotsslot1.ch0_level) +
+									(output2 * chip->lut_attenuationchip->slotsslot2.ch0_level) +
+									(output3 * chip->lut_attenuationchip->slotsslot3.ch0_level)) >> 16;
+						*mixp++ += ((output1 * chip->lut_attenuationchip->slotsslot1.ch1_level) +
+									(output2 * chip->lut_attenuationchip->slotsslot2.ch1_level) +
+									(output3 * chip->lut_attenuationchip->slotsslot3.ch1_level)) >> 16;
+					}
+				}
+
+				mixp = chip->mix_buffer;
+				update_pcm(chip, j + (3*12), mixp, samples);
+				break;
+			}
+
+			// PCM
+			case 3:
+			{
+				update_pcm(chip, j + (0*12), mixp, samples);
+				update_pcm(chip, j + (1*12), mixp, samples);
+				update_pcm(chip, j + (2*12), mixp, samples);
+				update_pcm(chip, j + (3*12), mixp, samples);
+				break;
+			}
+		}
+	}
+
+	mixp = chip->mix_buffer;
+	for (i = 0; i < samples; i++)
+	{
+		outputs0i = (*mixp++)>>2;
+		outputs1i = (*mixp++)>>2;
+	}
+}
+
+static void write_register(YMF271Chip *chip, int slotnum, int reg, UINT8 data)
+{
+	YMF271Slot *slot = &chip->slotsslotnum;
+
+	switch (reg)
+	{
+		case 0x0:
+			slot->ext_en = (data & 0x80) ? 1 : 0;
+			slot->ext_out = (data>>3)&0xf;
+
+			if (data & 1)
+			{
+				// key on
+				slot->step = 0;
+				slot->stepptr = 0;
+
+				slot->active = 1;
+
+				calculate_step(slot);
+				init_envelope(chip, slot);
+				init_lfo(chip, slot);
+				slot->feedback_modulation0 = 0;
+				slot->feedback_modulation1 = 0;
+			}
+			else
+			{
+				if (slot->active)
+				{
+					slot->env_state = ENV_RELEASE;
+				}
+			}
+			break;
+
+		case 0x1:
+			slot->lfoFreq = data;
+			break;
+
+		case 0x2:
+			slot->lfowave = data & 3;
+			slot->pms = (data >> 3) & 0x7;
+			slot->ams = (data >> 6) & 0x3;
+			break;
+
+		case 0x3:
+			slot->multiple = data & 0xf;
+			slot->detune = (data >> 4) & 0x7;
+			break;
+
+		case 0x4:
+			slot->tl = data & 0x7f;
+			break;
+
+		case 0x5:
+			slot->ar = data & 0x1f;
+			slot->keyscale = (data >> 5) & 0x7;
+			break;
+
+		case 0x6:
+			slot->decay1rate = data & 0x1f;
+			break;
+
+		case 0x7:
+			slot->decay2rate = data & 0x1f;
+			break;
+
+		case 0x8:
+			slot->relrate = data & 0xf;
+			slot->decay1lvl = (data >> 4) & 0xf;
+			break;
+
+		case 0x9:
+			// write frequency and block here
+			slot->fns = (slot->fns_hi << 8 & 0x0f00) | data;
+			slot->block = slot->fns_hi >> 4 & 0xf;
+			break;
+
+		case 0xa:
+			slot->fns_hi = data;
+			break;
+
+		case 0xb:
+			slot->waveform = data & 0x7;
+			slot->feedback = (data >> 4) & 0x7;
+			slot->accon = (data & 0x80) ? 1 : 0;
+			break;
+
+		case 0xc:
+			slot->algorithm = data & 0xf;
+			break;
+
+		case 0xd:
+			slot->ch0_level = data >> 4;
+			slot->ch1_level = data & 0xf;
+			break;
+
+		case 0xe:
+			slot->ch2_level = data >> 4;
+			slot->ch3_level = data & 0xf;
+			break;
+
+		default:
+			break;
+	}
+}
+
+static void ymf271_write_fm(YMF271Chip *chip, int bank, UINT8 address, UINT8 data)
+{
+	int groupnum = fm_tabaddress & 0xf;
+	int reg = (address >> 4) & 0xf;
+	int sync_reg;
+	int sync_mode;
+
+	if (groupnum == -1)
+	{
+#ifdef _DEBUG
+		logerror("ymf271_write_fm invalid group %02X %02X\n", address, data);
+#endif
+		return;
+	}
+
+	// check if the register is a synchronized register
+	sync_reg = 0;
+	switch (reg)
+	{
+		case 0:
+		case 9:
+		case 10:
+		case 12:
+		case 13:
+		case 14:
+			sync_reg = 1;
+			break;
+
+		default:
+			break;
+	}
+
+	// check if the slot is key on slot for synchronizing
+	sync_mode = 0;
+	switch (chip->groupsgroupnum.sync)
+	{
+		// 4 slot mode
+		case 0:
+			if (bank == 0)
+				sync_mode = 1;
+			break;
+
+		// 2x 2 slot mode
+		case 1:
+			if (bank == 0 || bank == 1)
+				sync_mode = 1;
+			break;
+
+		// 3 slot + 1 slot mode
+		case 2:
+			if (bank == 0)
+				sync_mode = 1;
+			break;
+
+		default:
+			break;
+	}
+
+	// key-on slot & synced register
+	if (sync_mode && sync_reg)
+	{
+		switch (chip->groupsgroupnum.sync)
+		{
+			// 4 slot mode
+			case 0:
+				write_register(chip, (12 * 0) + groupnum, reg, data);
+				write_register(chip, (12 * 1) + groupnum, reg, data);
+				write_register(chip, (12 * 2) + groupnum, reg, data);
+				write_register(chip, (12 * 3) + groupnum, reg, data);
+				break;
+
+			// 2x 2 slot mode
+			case 1:
+				if (bank == 0)
+				{
+					// Slot 1 - Slot 3
+					write_register(chip, (12 * 0) + groupnum, reg, data);
+					write_register(chip, (12 * 2) + groupnum, reg, data);
+				}
+				else
+				{
+					// Slot 2 - Slot 4
+					write_register(chip, (12 * 1) + groupnum, reg, data);
+					write_register(chip, (12 * 3) + groupnum, reg, data);
+				}
+				break;
+
+			// 3 slot + 1 slot mode (1 slot is handled normally)
+			case 2:
+				write_register(chip, (12 * 0) + groupnum, reg, data);
+				write_register(chip, (12 * 1) + groupnum, reg, data);
+				write_register(chip, (12 * 2) + groupnum, reg, data);
+				break;
+		}
+	}
+	else
+	{
+		// write register normally
+		write_register(chip, (12 * bank) + groupnum, reg, data);
+	}
+}
+
+static void ymf271_write_pcm(YMF271Chip *chip, UINT8 address, UINT8 data)
+{
+	int slotnum = pcm_tabaddress & 0xf;
+	YMF271Slot *slot;
+	if (slotnum == -1)
+	{
+#ifdef _DEBUG
+		logerror("ymf271_write_pcm invalid slot %02X %02X\n", address, data);
+#endif
+		return;
+	}
+	slot = &chip->slotsslotnum;
+
+	switch ((address >> 4) & 0xf)
+	{
+		case 0x0:
+			slot->startaddr &= ~0xff;
+			slot->startaddr |= data;
+			break;
+
+		case 0x1:
+			slot->startaddr &= ~0xff00;
+			slot->startaddr |= data<<8;
+			break;
+
+		case 0x2:
+			slot->startaddr &= ~0xff0000;
+			slot->startaddr |= (data & 0x7f)<<16;
+			slot->altloop = (data & 0x80) ? 1 : 0;
+			//if (slot->altloop)
+			//	popmessage("ymf271 A/L, contact MAMEdev");
+			break;
+
+		case 0x3:
+			slot->endaddr &= ~0xff;
+			slot->endaddr |= data;
+			break;
+
+		case 0x4:
+			slot->endaddr &= ~0xff00;
+			slot->endaddr |= data<<8;
+			break;
+
+		case 0x5:
+			slot->endaddr &= ~0xff0000;
+			slot->endaddr |= (data & 0x7f)<<16;
+			break;
+
+		case 0x6:
+			slot->loopaddr &= ~0xff;
+			slot->loopaddr |= data;
+			break;
+
+		case 0x7:
+			slot->loopaddr &= ~0xff00;
+			slot->loopaddr |= data<<8;
+			break;
+
+		case 0x8:
+			slot->loopaddr &= ~0xff0000;
+			slot->loopaddr |= (data & 0x7f)<<16;
+			break;
+
+		case 0x9:
+			slot->fs = data & 0x3;
+			slot->bits = (data & 0x4) ? 12 : 8;
+			slot->srcnote = (data >> 3) & 0x3;
+			slot->srcb = (data >> 5) & 0x7;
+			break;
+
+		default:
+			break;
+	}
+}
+
+/*static TIMER_CALLBACK( ymf271_timer_a_tick )
+{
+	YMF271Chip *chip = (YMF271Chip *)ptr;
+
+	chip->status |= 1;
+
+	if (chip->enable & 4)
+	{
+		chip->irqstate |= 1;
+		if (chip->irq_callback) chip->irq_callback(chip->device, 1);
+	}
+}
+
+static TIMER_CALLBACK( ymf271_timer_b_tick )
+{
+	YMF271Chip *chip = (YMF271Chip *)ptr;
+
+	chip->status |= 2;
+
+	if (chip->enable & 8)
+	{
+		chip->irqstate |= 2;
+		if (chip->irq_callback) chip->irq_callback(chip->device, 1);
+	}
+}*/
+
+static UINT8 ymf271_read_memory(YMF271Chip *chip, UINT32 offset)
+{
+	/*if (m_ext_read_handler.isnull())
+	{
+		if (offset < chip->mem_size)
+			return chip->mem_baseoffset;
+
+		// 8MB chip limit (shouldn't happen)
+		else if (offset > 0x7fffff)
+			return chip->mem_baseoffset & 0x7fffff;
+
+		else
+			return 0;
+	}
+	else
+		return m_ext_read_handler(offset);*/
+	
+	offset &= 0x7FFFFF;
+	if (offset < chip->mem_size)
+		return chip->mem_baseoffset;
+	else
+		return 0;
+}
+
+static void ymf271_write_timer(YMF271Chip *chip, UINT8 address, UINT8 data)
+{
+	if ((address & 0xf0) == 0)
+	{
+		int groupnum = fm_tabaddress & 0xf;
+		YMF271Group *group;
+		if (groupnum == -1)
+		{
+#ifdef _DEBUG
+			logerror("ymf271_write_timer invalid group %02X %02X\n", address, data);
+#endif
+			return;
+		}
+		group = &chip->groupsgroupnum;
+
+		group->sync = data & 0x3;
+		group->pfm = data >> 7;
+	}
+	else
+	{
+		switch (address)
+		{
+			case 0x10:
+				chip->timerA = data;
+				break;
+
+			case 0x11:
+				// According to Yamaha's documentation, this sets timer A upper 2 bits
+				// (it says timer A is 10 bits). But, PCB audio recordings proves
+				// otherwise: it doesn't affect timer A frequency. (see ms32.c tetrisp)
+				// Does this register have another function regarding timer A/B?
+				break;
+
+			case 0x12:
+				chip->timerB = data;
+				break;
+
+			case 0x13:
+				// timer A load
+				if (~chip->enable & data & 1)
+				{
+					//attotime period = attotime::from_hz(chip->clock) * (384 * 4 * (256 - chip->timerA));
+					//chip->timA->adjust((data & 1) ? period : attotime::never, 0);
+				}
+
+				// timer B load
+				if (~chip->enable & data & 2)
+				{
+					//attotime period = attotime::from_hz(chip->clock) * (384 * 16 * (256 - chip->timerB));
+					//chip->timB->adjust((data & 2) ? period : attotime::never, 0);
+				}
+
+				// timer A reset
+				if (data & 0x10)
+				{
+					chip->irqstate &= ~1;
+					chip->status &= ~1;
+
+					//if (!chip->irq_handler.isnull() && ~chip->irqstate & 2)
+					//	chip->irq_handler(0);
+				}
+
+				// timer B reset
+				if (data & 0x20)
+				{
+					chip->irqstate &= ~2;
+					chip->status &= ~2;
+
+					//if (!chip->irq_handler.isnull() && ~chip->irqstate & 1)
+					//	chip->irq_handler(0);
+				}
+
+				chip->enable = data;
+				break;
+
+			case 0x14:
+				chip->ext_address &= ~0xff;
+				chip->ext_address |= data;
+				break;
+			case 0x15:
+				chip->ext_address &= ~0xff00;
+				chip->ext_address |= data << 8;
+				break;
+			case 0x16:
+				chip->ext_address &= ~0xff0000;
+				chip->ext_address |= (data & 0x7f) << 16;
+				chip->ext_rw = (data & 0x80) ? 1 : 0;
+				break;
+			case 0x17:
+				chip->ext_address = (chip->ext_address + 1) & 0x7fffff;
+				//if (!chip->ext_rw && !chip->ext_write_handler.isnull())
+				//	chip->ext_write_handler(chip->ext_address, data);
+				break;
+		}
+	}
+}
+
+//WRITE8_DEVICE_HANDLER( ymf271_w )
+void ymf271_w(void *_info, offs_t offset, UINT8 data)
+{
+	//YMF271Chip *chip = get_safe_token(device);
+	YMF271Chip *chip = (YMF271Chip *)_info;
+
+	chip->regs_mainoffset & 0xf = data;
+
+	switch (offset & 0xf)
+	{
+		case 0x0:
+		case 0x2:
+		case 0x4:
+		case 0x6:
+		case 0x8:
+		case 0xc:
+			// address regs
+			break;
+
+		case 0x1:
+			ymf271_write_fm(chip, 0, chip->regs_main0x0, data);
+			break;
+
+		case 0x3:
+			ymf271_write_fm(chip, 1, chip->regs_main0x2, data);
+			break;
+
+		case 0x5:
+			ymf271_write_fm(chip, 2, chip->regs_main0x4, data);
+			break;
+
+		case 0x7:
+			ymf271_write_fm(chip, 3, chip->regs_main0x6, data);
+			break;
+
+		case 0x9:
+			ymf271_write_pcm(chip, chip->regs_main0x8, data);
+			break;
+
+		case 0xd:
+			ymf271_write_timer(chip, chip->regs_main0xc, data);
+			break;
+
+		default:
+			break;
+	}
+}
+
+//READ8_DEVICE_HANDLER( ymf271_r )
+UINT8 ymf271_r(void *_info, offs_t offset)
+{
+	//YMF271Chip *chip = get_safe_token(device);
+	YMF271Chip *chip = (YMF271Chip *)_info;
+
+	switch (offset & 0xf)
+	{
+		case 0x0:
+			return chip->status;
+
+		case 0x1:
+			// statusreg 2
+			return 0;
+
+		case 0x2:
+		{
+			UINT8 ret;
+			if (!chip->ext_rw)
+				return 0xff;
+
+			ret = chip->ext_readlatch;
+			chip->ext_address = (chip->ext_address + 1) & 0x7fffff;
+			chip->ext_readlatch = ymf271_read_memory(chip, chip->ext_address);
+			return ret;
+		}
+
+		default:
+			break;
+	}
+
+	return 0xff;
+}
+
+static void init_tables(YMF271Chip *chip)
+{
+	int i,j;
+	double clock_correction;
+
+	for (i = 0; i < 8; i++)
+		chip->lut_wavesi = (INT16*)malloc(sizeof(INT16) * SIN_LEN);
+
+	for (i = 0; i < 4*8; i++)
+		chip->lut_plfoi>>3i&7 = (double*)malloc(sizeof(double) * LFO_LENGTH);
+
+	for (i = 0; i < 4; i++)
+		chip->lut_alfoi = (int*)malloc(sizeof(int) * LFO_LENGTH);
+	
+	for (i=0; i < SIN_LEN; i++)
+	{
+		double m = sin( ((i*2)+1) * M_PI / SIN_LEN );
+		double m2 = sin( ((i*4)+1) * M_PI / SIN_LEN );
+
+		// Waveform 0: sin(wt) (0 <= wt <= 2PI)
+		chip->lut_waves0i = (INT16)(m * MAXOUT);
+
+		// Waveform 1: sin?(wt) (0 <= wt <= PI) -sin?(wt) (PI <= wt <= 2PI)
+		chip->lut_waves1i = (i < (SIN_LEN/2)) ? (INT16)((m * m) * MAXOUT) : (INT16)((m * m) * MINOUT);
+
+		// Waveform 2: sin(wt) (0 <= wt <= PI) -sin(wt) (PI <= wt <= 2PI)
+		chip->lut_waves2i = (i < (SIN_LEN/2)) ? (INT16)(m * MAXOUT) : (INT16)(-m * MAXOUT);
+
+		// Waveform 3: sin(wt) (0 <= wt <= PI) 0
+		chip->lut_waves3i = (i < (SIN_LEN/2)) ? (INT16)(m * MAXOUT) : 0;
+
+		// Waveform 4: sin(2wt) (0 <= wt <= PI) 0
+		chip->lut_waves4i = (i < (SIN_LEN/2)) ? (INT16)(m2 * MAXOUT) : 0;
+
+		// Waveform 5: |sin(2wt)| (0 <= wt <= PI) 0
+		chip->lut_waves5i = (i < (SIN_LEN/2)) ? (INT16)(fabs(m2) * MAXOUT) : 0;
+
+		// Waveform 6: 1 (0 <= wt <= 2PI)
+		chip->lut_waves6i = (INT16)(1 * MAXOUT);
+
+		chip->lut_waves7i = 0;
+	}
+
+	for (i = 0; i < LFO_LENGTH; i++)
+	{
+		int tri_wave;
+		double ftri_wave, fsaw_wave;
+		double plfo4;
+
+		// LFO phase modulation
+		plfo0 = 0;
+
+		fsaw_wave = ((i % (LFO_LENGTH/2)) * PLFO_MAX) / (double)((LFO_LENGTH/2)-1);
+		plfo1 = (i < (LFO_LENGTH/2)) ? fsaw_wave : fsaw_wave - PLFO_MAX;
+
+		plfo2 = (i < (LFO_LENGTH/2)) ? PLFO_MAX : PLFO_MIN;
+
+		ftri_wave = ((i % (LFO_LENGTH/4)) * PLFO_MAX) / (double)(LFO_LENGTH/4);
+		switch (i / (LFO_LENGTH/4))
+		{
+			case 0: plfo3 = ftri_wave; break;
+			case 1: plfo3 = PLFO_MAX - ftri_wave; break;
+			case 2: plfo3 = 0 - ftri_wave; break;
+			case 3: plfo3 = 0 - (PLFO_MAX - ftri_wave); break;
+			default: plfo3 = 0; /*assert(0);*/ break;
+		}
+
+		for (j = 0; j < 4; j++)
+		{
+			chip->lut_plfoj0i = pow(2.0, 0.0);
+			chip->lut_plfoj1i = pow(2.0, (3.378 * plfoj) / 1200.0);
+			chip->lut_plfoj2i = pow(2.0, (5.0646 * plfoj) / 1200.0);
+			chip->lut_plfoj3i = pow(2.0, (6.7495 * plfoj) / 1200.0);
+			chip->lut_plfoj4i = pow(2.0, (10.1143 * plfoj) / 1200.0);
+			chip->lut_plfoj5i = pow(2.0, (20.1699 * plfoj) / 1200.0);
+			chip->lut_plfoj6i = pow(2.0, (40.1076 * plfoj) / 1200.0);
+			chip->lut_plfoj7i = pow(2.0, (79.307 * plfoj) / 1200.0);
+		}
+
+		// LFO amplitude modulation
+		chip->lut_alfo0i = 0;
+
+		chip->lut_alfo1i = ALFO_MAX - ((i * ALFO_MAX) / LFO_LENGTH);
+
+		chip->lut_alfo2i = (i < (LFO_LENGTH/2)) ? ALFO_MAX : ALFO_MIN;
+
+		tri_wave = ((i % (LFO_LENGTH/2)) * ALFO_MAX) / (LFO_LENGTH/2);
+		chip->lut_alfo3i = (i < (LFO_LENGTH/2)) ? ALFO_MAX-tri_wave : tri_wave;
+	}
+	
+	for (i = 0; i < 256; i++)
+	{
+		chip->lut_env_volumei = (int)(65536.0 / pow(10.0, ((double)i / (256.0 / 96.0)) / 20.0));
+	}
+
+	for (i = 0; i < 16; i++)
+	{
+		chip->lut_attenuationi = (int)(65536.0 / pow(10.0, channel_attenuation_tablei / 20.0));
+	}
+	for (i = 0; i < 128; i++)
+	{
+		double db = 0.75 * (double)i;
+		chip->lut_total_leveli = (int)(65536.0 / pow(10.0, db / 20.0));
+	}
+
+	// timing may use a non-standard XTAL
+	clock_correction = (double)(STD_CLOCK) / (double)(chip->clock);
+	for (i = 0; i < 256; i++)
+	{
+		chip->lut_lfoi = LFO_frequency_tablei * clock_correction;
+	}
+
+	for (i = 0; i < 64; i++)
+	{
+		// attack/release rate in number of samples
+		chip->lut_ari = (ARTimei * clock_correction * 44100.0) / 1000.0;
+	}
+	for (i = 0; i < 64; i++)
+	{
+		// decay rate in number of samples
+		chip->lut_dci = (DCTimei * clock_correction * 44100.0) / 1000.0;
+	}
+}
+
+/*static void init_state(YMF271Chip *chip, const device_config *device)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_LENGTH(chip->slots); i++)
+	{
+		state_save_register_device_item(device, i, chip->slotsi.ext_out);
+		state_save_register_device_item(device, i, chip->slotsi.lfoFreq);
+		state_save_register_device_item(device, i, chip->slotsi.pms);
+		state_save_register_device_item(device, i, chip->slotsi.ams);
+		state_save_register_device_item(device, i, chip->slotsi.detune);
+		state_save_register_device_item(device, i, chip->slotsi.multiple);
+		state_save_register_device_item(device, i, chip->slotsi.tl);
+		state_save_register_device_item(device, i, chip->slotsi.keyscale);
+		state_save_register_device_item(device, i, chip->slotsi.ar);
+		state_save_register_device_item(device, i, chip->slotsi.decay1rate);
+		state_save_register_device_item(device, i, chip->slotsi.decay2rate);
+		state_save_register_device_item(device, i, chip->slotsi.decay1lvl);
+		state_save_register_device_item(device, i, chip->slotsi.relrate);
+		state_save_register_device_item(device, i, chip->slotsi.fns);
+		state_save_register_device_item(device, i, chip->slotsi.block);
+		state_save_register_device_item(device, i, chip->slotsi.feedback);
+		state_save_register_device_item(device, i, chip->slotsi.waveform);
+		state_save_register_device_item(device, i, chip->slotsi.accon);
+		state_save_register_device_item(device, i, chip->slotsi.algorithm);
+		state_save_register_device_item(device, i, chip->slotsi.ch0_level);
+		state_save_register_device_item(device, i, chip->slotsi.ch1_level);
+		state_save_register_device_item(device, i, chip->slotsi.ch2_level);
+		state_save_register_device_item(device, i, chip->slotsi.ch3_level);
+		state_save_register_device_item(device, i, chip->slotsi.startaddr);
+		state_save_register_device_item(device, i, chip->slotsi.loopaddr);
+		state_save_register_device_item(device, i, chip->slotsi.endaddr);
+		state_save_register_device_item(device, i, chip->slotsi.fs);
+		state_save_register_device_item(device, i, chip->slotsi.srcnote);
+		state_save_register_device_item(device, i, chip->slotsi.srcb);
+		state_save_register_device_item(device, i, chip->slotsi.step);
+		state_save_register_device_item(device, i, chip->slotsi.stepptr);
+		state_save_register_device_item(device, i, chip->slotsi.active);
+		state_save_register_device_item(device, i, chip->slotsi.bits);
+		state_save_register_device_item(device, i, chip->slotsi.volume);
+		state_save_register_device_item(device, i, chip->slotsi.env_state);
+		state_save_register_device_item(device, i, chip->slotsi.env_attack_step);
+		state_save_register_device_item(device, i, chip->slotsi.env_decay1_step);
+		state_save_register_device_item(device, i, chip->slotsi.env_decay2_step);
+		state_save_register_device_item(device, i, chip->slotsi.env_release_step);
+		state_save_register_device_item(device, i, chip->slotsi.feedback_modulation0);
+		state_save_register_device_item(device, i, chip->slotsi.feedback_modulation1);
+		state_save_register_device_item(device, i, chip->slotsi.lfo_phase);
+		state_save_register_device_item(device, i, chip->slotsi.lfo_step);
+		state_save_register_device_item(device, i, chip->slotsi.lfo_amplitude);
+	}
+
+	for (i = 0; i < sizeof(chip->groups) / sizeof(chip->groups0); i++)
+	{
+		state_save_register_device_item(device, i, chip->groupsi.sync);
+		state_save_register_device_item(device, i, chip->groupsi.pfm);
+	}
+
+	state_save_register_device_item(device, 0, chip->timerA);
+	state_save_register_device_item(device, 0, chip->timerB);
+	state_save_register_device_item(device, 0, chip->timerAVal);
+	state_save_register_device_item(device, 0, chip->timerBVal);
+	state_save_register_device_item(device, 0, chip->irqstate);
+	state_save_register_device_item(device, 0, chip->status);
+	state_save_register_device_item(device, 0, chip->enable);
+	state_save_register_device_item(device, 0, chip->reg0);
+	state_save_register_device_item(device, 0, chip->reg1);
+	state_save_register_device_item(device, 0, chip->reg2);
+	state_save_register_device_item(device, 0, chip->reg3);
+	state_save_register_device_item(device, 0, chip->pcmreg);
+	state_save_register_device_item(device, 0, chip->timerreg);
+	state_save_register_device_item(device, 0, chip->ext_address);
+	state_save_register_device_item(device, 0, chip->ext_read);
+}*/
+
+//static DEVICE_START( ymf271 )
+int device_start_ymf271(void **_info, int clock)
+{
+	//static const ymf271_interface defintrf = { DEVCB_NULL };
+	//const ymf271_interface *intf;
+	int i;
+	//YMF271Chip *chip = get_safe_token(device);
+	YMF271Chip *chip;
+
+	chip = (YMF271Chip *) calloc(1, sizeof(YMF271Chip));
+	*_info = (void *) chip;
+
+	//chip->device = device;
+	chip->clock = clock;
+
+	//intf = (device->static_config != NULL) ? (const ymf271_interface *)device->static_config : &defintrf;
+
+	chip->mem_size = 0x00;
+	chip->mem_base = NULL;
+
+	init_tables(chip);
+	//init_state(chip);
+	//chip->stream = stream_create(device, 0, 2, device->clock/384, chip, ymf271_update);
+
+	//chip->mix_buffer = auto_alloc_array(machine, INT32, 44100*2);
+	chip->mix_buffer = (INT32*)malloc(44100*2 * sizeof(INT32));
+	
+	for (i = 0; i < 12; i ++)
+		chip->groupsi.Muted = 0x00;
+
+	return clock/384;
+}
+
+//static DEVICE_STOP( ymf271 )
+void device_stop_ymf271(void *_info)
+{
+	int i;
+	YMF271Chip *chip = (YMF271Chip *)_info;
+	
+	free(chip->mem_base);	chip->mem_base = NULL;
+	
+	for (i=0; i < 8; i++)
+	{
+		free(chip->lut_wavesi);
+		chip->lut_wavesi = NULL;
+	}
+	for (i = 0; i < 4*8; i++)
+	{
+		free(chip->lut_plfoi>>3i&7);
+		chip->lut_plfoi>>3i&7 = NULL;
+	}
+
+	for (i = 0; i < 4; i++)
+	{
+		free(chip->lut_alfoi);
+		chip->lut_alfoi = NULL;
+	}
+	
+	free(chip->mix_buffer);
+	chip->mix_buffer = NULL;
+
+	free(chip);
+	
+	return;
+}
+
+//static DEVICE_RESET( ymf271 )
+void device_reset_ymf271(void *_info)
+{
+	int i;
+	//YMF271Chip *chip = get_safe_token(device);
+	YMF271Chip *chip = (YMF271Chip *)_info;
+
+	for (i = 0; i < 48; i++)
+	{
+		chip->slotsi.active = 0;
+		chip->slotsi.volume = 0;
+	}
+
+	// reset timers and IRQ
+	//chip->timA->reset();
+	//chip->timB->reset();
+
+	chip->irqstate = 0;
+	chip->status = 0;
+	chip->enable = 0;
+
+	//if (!chip->irq_handler.isnull())
+	//	chip->irq_handler(0);
+}
+
+void ymf271_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					 const UINT8* ROMData)
+{
+	YMF271Chip *chip = (YMF271Chip *)_info;
+	
+	if (chip->mem_size != ROMSize)
+	{
+		chip->mem_base = (UINT8*)realloc(chip->mem_base, ROMSize);
+		chip->mem_size = ROMSize;
+		memset(chip->mem_base, 0xFF, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(chip->mem_base + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+void ymf271_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	YMF271Chip *chip = (YMF271Chip *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 12; CurChn ++)
+		chip->groupsCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ymf271 )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(YMF271Chip); 					break;
+
+		// --- the following bits of info are returned as pointers to data or functions
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ymf271 );			break;
+		case DEVINFO_FCT_STOP:							// Nothing									break;
+		case DEVINFO_FCT_RESET:							info->reset = DEVICE_RESET_NAME( ymf271 );			break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YMF271");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha FM");					break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf271.h Added

@@ -0,0 +1,30 @@
+#pragma once
+
+//#include "devcb.h"
+
+//typedef struct _ymf271_interface ymf271_interface;
+//struct _ymf271_interface
+//{
+//	//devcb_read8 ext_read;		/* external memory read */
+//	//devcb_write8 ext_write;	/* external memory write */
+//	//void (*irq_callback)(const device_config *device, int state);	/* irq callback */
+//	void (*irq_callback)(int state);	/* irq callback */
+//};
+
+/*READ8_DEVICE_HANDLER( ymf271_r );
+WRITE8_DEVICE_HANDLER( ymf271_w );
+
+DEVICE_GET_INFO( ymf271 );
+#define SOUND_YMF271 DEVICE_GET_INFO_NAME( ymf271 )*/
+
+void ymf271_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_ymf271(void **chip, int clock);
+void device_stop_ymf271(void *chip);
+void device_reset_ymf271(void *chip);
+
+UINT8 ymf271_r(void *chip, offs_t offset);
+void ymf271_w(void *chip, offs_t offset, UINT8 data);
+void ymf271_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					  const UINT8* ROMData);
+
+void ymf271_set_mute_mask(void *chip, UINT32 MuteMask);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.c Added

@@ -0,0 +1,1224 @@
+/*
+
+ YMF278B FM + Wave table Synthesizer (OPL4)
+
+ Timer and PCM YMF278B. The FM is shared with the ymf262.
+
+ This chip roughly splits the difference between the Sega 315-5560 MultiPCM
+ (Multi32, Model 1/2) and YMF 292-F SCSP (later Model 2, STV, Saturn, Model 3).
+
+ Features as listed in LSI-4MF2782 data sheet:
+ FM Synthesis (same as YMF262)
+ 1. Sound generation mode
+ Two-operater mode
+ Generates eighteen voices or fifteen voices plus five rhythm sounds simultaneously
+ Four-operator mode
+ Generates six voices in four-operator mode plus six voices in two-operator mode simultaneously,
+ or generates six voices in four-operator mode plus three voices in two-operator mode plus five
+ rhythm sounds simultaneously
+ 2. Eight selectable waveforms
+ 3. Stereo output
+ Wave Table Synthesis
+ 1. Generates twenty-four voices simultaneously
+ 2. 44.1kHz sampling rate for output sound data
+ 3. Selectable from 8-bit, 12-bit and 16-bit word lengths for wave data
+ 4. Stereo output (16-stage panpot for each voice)
+ Wave Data
+ 1. Accepts 32M bit external memory at maximum
+ 2. Up to 512 wave tables
+ 3. External ROM or SRAM can be connected. With SRAM connected, the CPU can download wave data
+ 4. Outputs chip select signals for 1Mbit, 4Mbit, 8Mbit or 16Mbit memory
+ 5. Can be directly connected to the Yamaha YRW801 (Wave data ROM)
+ Features of YRW801 as listed in LSI 4RW801A2
+ Built-in wave data of tones which comply with GM system Level 1
+ Melody tone ....... 128 tones
+ Percussion tone ... 47 tones
+ 16Mbit capacity (2,097,152word x 8)
+
+ By R. Belmont and O. Galibert.
+
+ Copyright R. Belmont and O. Galibert.
+
+ This software is dual-licensed: it may be used in MAME and properly licensed
+ MAME derivatives under the terms of the MAME license. For use outside of
+ MAME and properly licensed derivatives, it is available under the
+ terms of the GNU Lesser General Public License (LGPL), version 2.1.
+ You may read the LGPL at http://www.gnu.org/licenses/lgpl.html
+
+ Changelog:
+ Sep. 8, 2002 - fixed ymf278b_compute_rate when OCT is negative (RB)
+ Dec. 11, 2002 - added ability to set non-standard clock rates (RB)
+ fixed envelope target for release (fixes missing
+ instruments in hotdebut).
+ Thanks to Team Japump! for MP3s from a real PCB.
+ fixed crash if MAME is run with no sound.
+ June 4, 2003 - Changed to dual-license with LGPL for use in OpenMSX.
+ OpenMSX contributed a bugfix where looped samples were
+ not being addressed properly, causing pitch fluctuation.
+ August 15, 2010 - Backport to MAME-style C from OpenMSX
+*/
+
+#include <math.h>
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+//#include "cpuintrf.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <string.h>
+#include "ymf262.h"
+#include "ymf278b.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+typedef struct
+{
+	UINT32 startaddr;
+	UINT32 loopaddr;
+	UINT32 endaddr;
+	UINT32 step;	/* fixed-point frequency step */
+	UINT32 stepptr;	/* fixed-point pointer into the sample */
+	UINT16 pos;
+	INT16 sample1, sample2;
+
+	INT32 env_vol;
+	
+	INT32 lfo_cnt;
+	INT32 lfo_step;
+	INT32 lfo_max;
+	
+	INT16 wave;		/* wavetable number */
+	INT16 FN;		/* f-number */
+	INT8 OCT;		/* octave */
+	INT8 PRVB;		/* pseudo-reverb */
+	INT8 LD;		/* level direct */
+	INT8 TL;		/* total level */
+	INT8 pan;		/* panpot */
+	INT8 lfo;		/* LFO */
+	INT8 vib;		/* vibrato */
+	INT8 AM;		/* AM level */
+
+	INT8 AR;
+	INT8 D1R;
+	INT32 DL;
+	INT8 D2R;
+	INT8 RC;		/* rate correction */
+	INT8 RR;
+
+	INT8 bits;		/* width of the samples */
+	INT8 active;		/* slot keyed on */
+	
+	INT8 state;
+	INT8 lfo_active;
+	
+	UINT8 Muted;
+} YMF278BSlot;
+
+typedef struct
+{
+	YMF278BSlot slots24;
+	
+	UINT32 eg_cnt;	/* Global envelope generator counter. */
+	
+	INT8 wavetblhdr;
+	INT8 memmode;
+	INT32 memadr;
+
+	INT32 fm_l, fm_r;
+	INT32 pcm_l, pcm_r;
+
+	//UINT8 timer_a_count, timer_b_count, enable, current_irq;
+	//emu_timer *timer_a, *timer_b;
+	//int irq_line;
+
+	UINT8 port_A, port_B, port_C;
+	//void (*irq_callback)(const device_config *, int);
+	void (*irq_callback)(int);
+	//const device_config *device;
+
+	UINT32 ROMSize;
+	UINT8 *rom;
+	UINT32 RAMSize;
+	UINT8 *ram;
+	int clock;
+
+	INT32 volume256*4;			// precalculated attenuation values with some marging for enveloppe and pan levels
+
+	UINT8 regs256;
+	
+	void *fmchip;
+	UINT8 FMEnabled;	// that saves a whole lot of CPU
+	//sound_stream * stream;
+} YMF278BChip;
+
+#define EG_SH	16	// 16.16 fixed point (EG timing)
+#define EG_TIMER_OVERFLOW	(1 << EG_SH)
+
+// envelope output entries
+#define ENV_BITS	10
+#define ENV_LEN		(1 << ENV_BITS)
+#define ENV_STEP	(128.0 / ENV_LEN)
+#define MAX_ATT_INDEX	((1 << (ENV_BITS - 1)) - 1)	// 511
+#define MIN_ATT_INDEX	0
+
+// Envelope Generator phases
+#define EG_ATT	4
+#define EG_DEC	3
+#define EG_SUS	2
+#define EG_REL	1
+#define EG_OFF	0
+
+#define EG_REV	5	// pseudo reverb
+#define EG_DMP	6	// damp
+
+// Pan values, units are -3dB, i.e. 8.
+const INT32 pan_left16 = {
+	0, 8, 16, 24, 32, 40, 48, 256, 256, 0, 0, 0, 0, 0, 0, 0
+};
+const INT32 pan_right16 = {
+	0, 0, 0, 0, 0, 0, 0, 0, 256, 256, 48, 40, 32, 24, 16, 8
+};
+
+// Mixing levels, units are -3dB, and add some marging to avoid clipping
+const INT32 mix_level8 = {
+	8, 16, 24, 32, 40, 48, 56, 256
+};
+
+// decay level table (3dB per step)
+// 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)
+#define SC(db) (db * (2.0 / ENV_STEP))
+const UINT32 dl_tab16 = {
+ SC( 0), SC( 1), SC( 2), SC(3 ), SC(4 ), SC(5 ), SC(6 ), SC( 7),
+ SC( 8), SC( 9), SC(10), SC(11), SC(12), SC(13), SC(14), SC(31)
+};
+#undef SC
+
+#define RATE_STEPS	8
+const UINT8 eg_inc15 * RATE_STEPS = {
+//cycle:0 1 2 3 4 5 6 7
+	0, 1, 0, 1, 0, 1, 0, 1, // 0 rates 00..12 0 (increment by 0 or 1)
+	0, 1, 0, 1, 1, 1, 0, 1, // 1 rates 00..12 1
+	0, 1, 1, 1, 0, 1, 1, 1, // 2 rates 00..12 2
+	0, 1, 1, 1, 1, 1, 1, 1, // 3 rates 00..12 3
+
+	1, 1, 1, 1, 1, 1, 1, 1, // 4 rate 13 0 (increment by 1)
+	1, 1, 1, 2, 1, 1, 1, 2, // 5 rate 13 1
+	1, 2, 1, 2, 1, 2, 1, 2, // 6 rate 13 2
+	1, 2, 2, 2, 1, 2, 2, 2, // 7 rate 13 3
+
+	2, 2, 2, 2, 2, 2, 2, 2, // 8 rate 14 0 (increment by 2)
+	2, 2, 2, 4, 2, 2, 2, 4, // 9 rate 14 1
+	2, 4, 2, 4, 2, 4, 2, 4, // 10 rate 14 2
+	2, 4, 4, 4, 2, 4, 4, 4, // 11 rate 14 3
+
+	4, 4, 4, 4, 4, 4, 4, 4, // 12 rates 15 0, 15 1, 15 2, 15 3 for decay
+	8, 8, 8, 8, 8, 8, 8, 8, // 13 rates 15 0, 15 1, 15 2, 15 3 for attack (zero time)
+	0, 0, 0, 0, 0, 0, 0, 0, // 14 infinity rates for attack and decay(s)
+};
+
+#define O(a) (a * RATE_STEPS)
+const UINT8 eg_rate_select64 = {
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 0),O( 1),O( 2),O( 3),
+	O( 4),O( 5),O( 6),O( 7),
+	O( 8),O( 9),O(10),O(11),
+	O(12),O(12),O(12),O(12),
+};
+#undef O
+
+// rate 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+// shift 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0
+// mask 4095, 2047, 1023, 511, 255, 127, 63, 31, 15, 7, 3, 1, 0, 0, 0, 0
+#define O(a) (a)
+const UINT8 eg_rate_shift64 = {
+	O(12),O(12),O(12),O(12),
+	O(11),O(11),O(11),O(11),
+	O(10),O(10),O(10),O(10),
+	O( 9),O( 9),O( 9),O( 9),
+	O( 8),O( 8),O( 8),O( 8),
+	O( 7),O( 7),O( 7),O( 7),
+	O( 6),O( 6),O( 6),O( 6),
+	O( 5),O( 5),O( 5),O( 5),
+	O( 4),O( 4),O( 4),O( 4),
+	O( 3),O( 3),O( 3),O( 3),
+	O( 2),O( 2),O( 2),O( 2),
+	O( 1),O( 1),O( 1),O( 1),
+	O( 0),O( 0),O( 0),O( 0),
+	O( 0),O( 0),O( 0),O( 0),
+	O( 0),O( 0),O( 0),O( 0),
+	O( 0),O( 0),O( 0),O( 0),
+};
+#undef O
+
+
+// number of steps to take in quarter of lfo frequency
+// TODO check if frequency matches real chip
+#define O(a) ((EG_TIMER_OVERFLOW / a) / 6)
+const INT32 lfo_period8 = {
+	O(0.168), O(2.019), O(3.196), O(4.206),
+	O(5.215), O(5.888), O(6.224), O(7.066)
+};
+#undef O
+
+
+#define O(a) (a * 65536)
+const INT32 vib_depth8 = {
+	O(0),	 O(3.378), O(5.065), O(6.750),
+	O(10.114), O(20.170), O(40.106), O(79.307)
+};
+#undef O
+
+
+#define SC(db) (INT32)(db * (2.0 / ENV_STEP))
+const INT32 am_depth8 = {
+	SC(0),	 SC(1.781), SC(2.906), SC(3.656),
+	SC(4.406), SC(5.906), SC(7.406), SC(11.91)
+};
+#undef SC
+
+void ymf278b_slot_reset(YMF278BSlot* slot)
+{
+	slot->wave = slot->FN = slot->OCT = slot->PRVB = slot->LD = slot->TL = slot->pan =
+		slot->lfo = slot->vib = slot->AM = 0;
+	slot->AR = slot->D1R = slot->DL = slot->D2R = slot->RC = slot->RR = 0;
+	slot->step = slot->stepptr = 0;
+	slot->bits = slot->startaddr = slot->loopaddr = slot->endaddr = 0;
+	slot->env_vol = MAX_ATT_INDEX;
+
+	slot->lfo_active = 0;
+	slot->lfo_cnt = slot->lfo_step = 0;
+	slot->lfo_max = lfo_period0;
+
+	slot->state = EG_OFF;
+	slot->active = 0;
+
+	// not strictly needed, but avoid UMR on savestate
+	slot->pos = slot->sample1 = slot->sample2 = 0;
+}
+
+INLINE int ymf278b_slot_compute_rate(YMF278BSlot* slot, int val)
+{
+	int res;
+	int oct;
+	
+	if (val == 0)
+		return 0;
+	else if (val == 15)
+		return 63;
+	
+	if (slot->RC != 15)
+	{
+		oct = slot->OCT;
+		
+		if (oct & 8)
+		{
+			oct |= -8;
+		}
+		res = (oct + slot->RC) * 2 + (slot->FN & 0x200 ? 1 : 0) + val * 4;
+	}
+	else
+	{
+		res = val * 4;
+	}
+	
+	if (res < 0)
+		res = 0;
+	else if (res > 63)
+		res = 63;
+	
+	return res;
+}
+
+INLINE int ymf278b_slot_compute_vib(YMF278BSlot* slot)
+{
+	return (((slot->lfo_step << 8) / slot->lfo_max) * vib_depthslot->vib) >> 24;
+}
+
+
+INLINE int ymf278b_slot_compute_am(YMF278BSlot* slot)
+{
+	if (slot->lfo_active && slot->AM)
+		return (((slot->lfo_step << 8) / slot->lfo_max) * am_depthslot->AM) >> 12;
+	else
+		return 0;
+}
+
+INLINE void ymf278b_slot_set_lfo(YMF278BSlot* slot, int newlfo)
+{
+	slot->lfo_step = (((slot->lfo_step << 8) / slot->lfo_max) * newlfo) >> 8;
+	slot->lfo_cnt = (((slot->lfo_cnt << 8) / slot->lfo_max) * newlfo) >> 8;
+
+	slot->lfo = newlfo;
+	slot->lfo_max = lfo_periodslot->lfo;
+}
+
+INLINE void ymf278b_advance(YMF278BChip* chip)
+{
+	YMF278BSlot* op;
+	int i;
+	UINT8 rate;
+	UINT8 shift;
+	UINT8 select;
+	
+	chip->eg_cnt ++;
+	for (i = 0; i < 24; i ++)
+	{
+		op = &chip->slotsi;
+
+		if (op->lfo_active)
+		{
+			op->lfo_cnt ++;
+			if (op->lfo_cnt < op->lfo_max)
+			{
+				op->lfo_step ++;
+			}
+			else if (op->lfo_cnt < (op->lfo_max * 3))
+			{
+				op->lfo_step --;
+			}
+			else
+			{
+				op->lfo_step ++;
+				if (op->lfo_cnt == (op->lfo_max * 4))
+					op->lfo_cnt = 0;
+			}
+		}
+
+		// Envelope Generator
+		switch(op->state)
+		{
+		case EG_ATT:	// attack phase
+			rate = ymf278b_slot_compute_rate(op, op->AR);
+			if (rate < 4)
+				break;
+			
+			shift = eg_rate_shiftrate;
+			if (! (chip->eg_cnt & ((1 << shift) - 1)))
+			{
+				select = eg_rate_selectrate;
+				op->env_vol += (~op->env_vol * eg_incselect + ((chip->eg_cnt >> shift) & 7)) >> 3;
+				if (op->env_vol <= MIN_ATT_INDEX)
+				{
+					op->env_vol = MIN_ATT_INDEX;
+					if (op->DL)
+						op->state = EG_DEC;
+					else
+						op->state = EG_SUS;
+				}
+			}
+			break;
+		case EG_DEC:	// decay phase
+			rate = ymf278b_slot_compute_rate(op, op->D1R);
+			if (rate < 4)
+				break;
+			
+			shift = eg_rate_shiftrate;
+			if (! (chip->eg_cnt & ((1 << shift) - 1)))
+			{
+				select = eg_rate_selectrate;
+				op->env_vol += eg_incselect + ((chip->eg_cnt >> shift) & 7);
+
+				if ((op->env_vol > dl_tab6) && op->PRVB)
+					op->state = EG_REV;
+				else
+				{
+					if (op->env_vol >= op->DL)
+						op->state = EG_SUS;
+				}
+			}
+			break;
+		case EG_SUS:	// sustain phase
+			rate = ymf278b_slot_compute_rate(op, op->D2R);
+			if (rate < 4)
+				break;
+			
+			shift = eg_rate_shiftrate;
+			if (! (chip->eg_cnt & ((1 << shift) - 1)))
+			{
+				select = eg_rate_selectrate;
+				op->env_vol += eg_incselect + ((chip->eg_cnt >> shift) & 7);
+
+				if ((op->env_vol > dl_tab6) && op->PRVB)
+					op->state = EG_REV;
+				else
+				{
+					if (op->env_vol >= MAX_ATT_INDEX)
+					{
+						op->env_vol = MAX_ATT_INDEX;
+						op->active = 0;
+					}
+				}
+			}
+			break;
+		case EG_REL:	// release phase
+			rate = ymf278b_slot_compute_rate(op, op->RR);
+			if (rate < 4)
+				break;
+			
+			shift = eg_rate_shiftrate;
+			if (! (chip->eg_cnt & ((1 << shift) - 1)))
+			{
+				select = eg_rate_selectrate;
+				op->env_vol += eg_incselect + ((chip->eg_cnt >> shift) & 7);
+
+				if ((op->env_vol > dl_tab6) && op->PRVB)
+					op->state = EG_REV;
+				else
+				{
+					if (op->env_vol >= MAX_ATT_INDEX)
+					{
+						op->env_vol = MAX_ATT_INDEX;
+						op->active = 0;
+					}
+				}
+			}
+			break;
+		case EG_REV:	// pseudo reverb
+			// TODO improve env_vol update
+			rate = ymf278b_slot_compute_rate(op, 5);
+			//if (rate < 4)
+			//	break;
+			
+			shift = eg_rate_shiftrate;
+			if (! (chip->eg_cnt & ((1 << shift) - 1)))
+			{
+				select = eg_rate_selectrate;
+				op->env_vol += eg_incselect + ((chip->eg_cnt >> shift) & 7);
+
+				if (op->env_vol >= MAX_ATT_INDEX)
+				{
+					op->env_vol = MAX_ATT_INDEX;
+					op->active = 0;
+				}
+			}
+			break;
+		case EG_DMP:	// damping
+			// TODO improve env_vol update, damp is just fastest decay now
+			rate = 56;
+			shift = eg_rate_shiftrate;
+			if (! (chip->eg_cnt & ((1 << shift) - 1)))
+			{
+				select = eg_rate_selectrate;
+				op->env_vol += eg_incselect + ((chip->eg_cnt >> shift) & 7);
+
+				if (op->env_vol >= MAX_ATT_INDEX)
+				{
+					op->env_vol = MAX_ATT_INDEX;
+					op->active = 0;
+				}
+			}
+			break;
+		case EG_OFF:
+			// nothing
+			break;
+
+		default:
+#ifdef _DEBUG
+			//logerror(...);
+#endif
+			break;
+		}
+	}
+}
+
+INLINE UINT8 ymf278b_readMem(YMF278BChip* chip, offs_t address)
+{
+	if (address < chip->ROMSize)
+		return chip->romaddress&0x3fffff;
+	else if (address < chip->ROMSize + chip->RAMSize)
+		return chip->ramaddress - chip->ROMSize&0x3fffff;
+	else
+		return 255; // TODO check
+}
+
+INLINE UINT8* ymf278b_readMemAddr(YMF278BChip* chip, offs_t address)
+{
+	if (address < chip->ROMSize)
+		return &chip->romaddress&0x3fffff;
+	else if (address < chip->ROMSize + chip->RAMSize)
+		return &chip->ramaddress - chip->ROMSize&0x3fffff;
+	else
+		return NULL; // TODO check
+}
+
+INLINE void ymf278b_writeMem(YMF278BChip* chip, offs_t address, UINT8 value)
+{
+	if (address < chip->ROMSize)
+		return; // can't write to ROM
+	else if (address < chip->ROMSize + chip->RAMSize)
+		chip->ramaddress - chip->ROMSize = value;
+	else
+		return;	// can't write to unmapped memory
+	
+	return;
+}
+
+INLINE INT16 ymf278b_getSample(YMF278BChip* chip, YMF278BSlot* op)
+{
+	INT16 sample;
+	UINT32 addr;
+	UINT8* addrp;
+	
+	switch (op->bits)
+	{
+	case 0:
+		// 8 bit
+		sample = ymf278b_readMem(chip, op->startaddr + op->pos) << 8;
+		break;
+	case 1:
+		// 12 bit
+		addr = op->startaddr + ((op->pos / 2) * 3);
+		addrp = ymf278b_readMemAddr(chip, addr);
+		if (op->pos & 1)
+			sample = (addrp2 << 8) | ((addrp1 << 4) & 0xF0);
+		else
+			sample = (addrp0 << 8) | (addrp1 & 0xF0);
+		break;
+	case 2:
+		// 16 bit
+		addr = op->startaddr + (op->pos * 2);
+		addrp = ymf278b_readMemAddr(chip, addr);
+		sample = (addrp0 << 8) | addrp1;
+		break;
+	default:
+		// TODO unspecified
+		sample = 0;
+		break;
+	}
+	return sample;
+}
+
+int ymf278b_anyActive(YMF278BChip* chip)
+{
+	int i;
+	
+	for (i = 0; i < 24; i ++)
+	{
+		if (chip->slotsi.active)
+			return 1;
+	}
+	return 0;
+}
+
+void ymf278b_pcm_update(void *_info, stream_sample_t** outputs, int samples)
+{
+	YMF278BChip* chip = (YMF278BChip *)_info;
+	int i;
+	unsigned int j;
+	INT32 vl;
+	INT32 vr;
+	
+	if (chip->FMEnabled)
+	{
+		/* memset is done by ymf262_update */
+		ymf262_update_one(chip->fmchip, outputs, samples);
+	}
+	else
+	{
+		memset(outputs0, 0x00, samples * sizeof(stream_sample_t));
+		memset(outputs1, 0x00, samples * sizeof(stream_sample_t));
+	}
+	
+	if (! ymf278b_anyActive(chip))
+	{
+		// TODO update internal state, even if muted
+		// TODO also mute individual channels
+		return;
+	}
+
+	vl = mix_levelchip->pcm_l;
+	vr = mix_levelchip->pcm_r;
+	for (j = 0; j < samples; j ++)
+	{
+		for (i = 0; i < 24; i ++)
+		{
+			YMF278BSlot* sl;
+			INT16 sample;
+			int vol;
+			int volLeft;
+			int volRight;
+			
+			sl = &chip->slotsi;
+			if (! sl->active || sl->Muted)
+			{
+				//outputs0j += 0;
+				//outputs1j += 0;
+				continue;
+			}
+
+			sample = (sl->sample1 * (0x10000 - sl->stepptr) +
+						sl->sample2 * sl->stepptr) >> 16;
+			vol = sl->TL + (sl->env_vol >> 2) + ymf278b_slot_compute_am(sl);
+
+			volLeft = vol + pan_left sl->pan + vl;
+			volRight = vol + pan_rightsl->pan + vr;
+			// TODO prob doesn't happen in real chip
+			//volLeft = std::max(0, volLeft);
+			//volRight = std::max(0, volRight);
+			volLeft &= 0x3FF;	// catch negative Volume values in a hardware-like way
+			volRight &= 0x3FF;	// (anything beyond 0x100 results in *0)
+
+			outputs0j += (sample * chip->volumevolLeft ) >> 17;
+			outputs1j += (sample * chip->volumevolRight) >> 17;
+
+			if (sl->lfo_active && sl->vib)
+			{
+				int oct;
+				unsigned int step;
+				
+				oct = sl->OCT;
+				if (oct & 8)
+					oct |= -8;
+				oct += 5;
+				step = (sl->FN | 1024) + ymf278b_slot_compute_vib(sl);
+				if (oct >= 0)
+					step <<= oct;
+				else
+					step >>= -oct;
+				sl->stepptr += step;
+			}
+			else
+				sl->stepptr += sl->step;
+
+			while (sl->stepptr >= 0x10000)
+			{
+				sl->stepptr -= 0x10000;
+				sl->sample1 = sl->sample2;
+				
+				sl->sample2 = ymf278b_getSample(chip, sl);
+				if (sl->pos == sl->endaddr)
+					sl->pos = sl->pos - sl->endaddr + sl->loopaddr;
+				else
+					sl->pos ++;
+			}
+		}
+		ymf278b_advance(chip);
+	}
+}
+
+INLINE void ymf278b_keyOnHelper(YMF278BChip* chip, YMF278BSlot* slot)
+{
+	int oct;
+	unsigned int step;
+	
+	slot->active = 1;
+
+	oct = slot->OCT;
+	if (oct & 8)
+		oct |= -8;
+	oct += 5;
+	step = slot->FN | 1024;
+	if (oct >= 0)
+		step <<= oct;
+	else
+		step >>= -oct;
+	slot->step = step;
+	slot->state = EG_ATT;
+	slot->stepptr = 0;
+	slot->pos = 0;
+	slot->sample1 = ymf278b_getSample(chip, slot);
+	slot->pos = 1;
+	slot->sample2 = ymf278b_getSample(chip, slot);
+}
+
+static void ymf278b_A_w(YMF278BChip *chip, UINT8 reg, UINT8 data)
+{
+	switch(reg)
+	{
+		case 0x02:
+			//chip->timer_a_count = data;
+			//ymf278b_timer_a_reset(chip);
+			break;
+		case 0x03:
+			//chip->timer_b_count = data;
+			//ymf278b_timer_b_reset(chip);
+			break;
+		case 0x04:
+			/*if(data & 0x80)
+				chip->current_irq = 0;
+			else
+			{
+				UINT8 old_enable = chip->enable;
+				chip->enable = data;
+				chip->current_irq &= ~data;
+				if((old_enable ^ data) & 1)
+					ymf278b_timer_a_reset(chip);
+				if((old_enable ^ data) & 2)
+					ymf278b_timer_b_reset(chip);
+			}
+			ymf278b_irq_check(chip);*/
+			break;
+		default:
+//#ifdef _DEBUG
+//			logerror("YMF278B: Port A write %02x, %02x\n", reg, data);
+//#endif
+			ymf262_write(chip->fmchip, 1, data);
+			if ((reg & 0xF0) == 0xB0 && (data & 0x20))	// Key On set
+				chip->FMEnabled = 0x01;
+			else if (reg == 0xBD && (data & 0x1F))	// one of the Rhythm bits set
+				chip->FMEnabled = 0x01;
+			break;
+	}
+}
+
+static void ymf278b_B_w(YMF278BChip *chip, UINT8 reg, UINT8 data)
+{
+	switch(reg)
+	{
+		case 0x05:	// OPL3/OPL4 Enable
+			// actually Bit 1 enables OPL4 WaveTable Synth
+			ymf262_write(chip->fmchip, 3, data & ~0x02);
+			break;
+		default:
+			ymf262_write(chip->fmchip, 3, data);
+			if ((reg & 0xF0) == 0xB0 && (data & 0x20))
+				chip->FMEnabled = 0x01;
+			break;
+	}
+//#ifdef _DEBUG
+//	logerror("YMF278B: Port B write %02x, %02x\n", reg, data);
+//#endif
+}
+
+void ymf278b_C_w(YMF278BChip* chip, UINT8 reg, UINT8 data)
+{
+	// Handle slot registers specifically
+	if (reg >= 0x08 && reg <= 0xF7)
+	{
+		int snum = (reg - 8) % 24;
+		YMF278BSlot* slot = &chip->slotssnum;
+		int base;
+		UINT8* buf;
+		int oct;
+		unsigned int step;
+		
+		switch((reg - 8) / 24)
+		{
+		case 0:
+			//loadTime = time + LOAD_DELAY;
+
+			slot->wave = (slot->wave & 0x100) | data;
+			base = (slot->wave < 384 || ! chip->wavetblhdr) ?
+					(slot->wave * 12) :
+					(chip->wavetblhdr * 0x80000 + ((slot->wave - 384) * 12));
+			buf = ymf278b_readMemAddr(chip, base);
+			
+			slot->bits = (buf0 & 0xC0) >> 6;
+			ymf278b_slot_set_lfo(slot, (buf7 >> 3) & 7);
+			slot->vib = buf7 & 7;
+			slot->AR = buf8 >> 4;
+			slot->D1R = buf8 & 0xF;
+			slot->DL = dl_tabbuf9 >> 4;
+			slot->D2R = buf9 & 0xF;
+			slot->RC = buf10 >> 4;
+			slot->RR = buf10 & 0xF;
+			slot->AM = buf11 & 7;
+			slot->startaddr = buf2 | (buf1 << 8) |
+								((buf0 & 0x3F) << 16);
+			slot->loopaddr = buf4 + (buf3 << 8);
+			slot->endaddr = ((buf6 + (buf5 << 8)) ^ 0xFFFF);
+			
+			if (chip->regsreg + 4 & 0x080)
+				ymf278b_keyOnHelper(chip, slot);
+			break;
+		case 1:
+			slot->wave = (slot->wave & 0xFF) | ((data & 0x1) << 8);
+			slot->FN = (slot->FN & 0x380) | (data >> 1);
+			
+			oct = slot->OCT;
+			if (oct & 8)
+				oct |= -8;
+			oct += 5;
+			step = slot->FN | 1024;
+			if (oct >= 0)
+				step <<= oct;
+			else
+				step >>= -oct;
+			slot->step = step;
+			break;
+		case 2:
+			slot->FN = (slot->FN & 0x07F) | ((data & 0x07) << 7);
+			slot->PRVB = ((data & 0x08) >> 3);
+			slot->OCT = ((data & 0xF0) >> 4);
+			
+			oct = slot->OCT;
+			if (oct & 8)
+				oct |= -8;
+			oct += 5;
+			step = slot->FN | 1024;
+			if (oct >= 0)
+				step <<= oct;
+			else
+				step >>= -oct;
+			slot->step = step;
+			break;
+		case 3:
+			slot->TL = data >> 1;
+			slot->LD = data & 0x1;
+
+			// TODO
+			if (slot->LD) {
+				// directly change volume
+			} else {
+				// interpolate volume
+			}
+			break;
+		case 4:
+			if (data & 0x10)
+			{
+				// output to DO1 pin:
+				// this pin is not used in moonsound
+				// we emulate this by muting the sound
+				slot->pan = 8; // both left/right -inf dB
+			}
+			else
+				slot->pan = data & 0x0F;
+
+			if (data & 0x020)
+			{
+				// LFO reset
+				slot->lfo_active = 0;
+				slot->lfo_cnt = 0;
+				slot->lfo_max = lfo_periodslot->vib;
+				slot->lfo_step = 0;
+			}
+			else
+			{
+				// LFO activate
+				slot->lfo_active = 1;
+			}
+
+			switch (data >> 6)
+			{
+			case 0: // tone off, no damp
+				if (slot->active && (slot->state != EG_REV))
+					slot->state = EG_REL;
+				break;
+			case 2: // tone on, no damp
+				if (! (chip->regsreg & 0x080))
+					ymf278b_keyOnHelper(chip, slot);
+				break;
+			case 1: // tone off, damp
+			case 3: // tone on, damp
+				slot->state = EG_DMP;
+				break;
+			}
+			break;
+		case 5:
+			slot->vib = data & 0x7;
+			ymf278b_slot_set_lfo(slot, (data >> 3) & 0x7);
+			break;
+		case 6:
+			slot->AR = data >> 4;
+			slot->D1R = data & 0xF;
+			break;
+		case 7:
+			slot->DL = dl_tabdata >> 4;
+			slot->D2R = data & 0xF;
+			break;
+		case 8:
+			slot->RC = data >> 4;
+			slot->RR = data & 0xF;
+			break;
+		case 9:
+			slot->AM = data & 0x7;
+			break;
+		}
+	}
+	else
+	{
+		// All non-slot registers
+		switch (reg)
+		{
+		case 0x00: // TEST
+		case 0x01:
+			break;
+
+		case 0x02:
+			chip->wavetblhdr = (data >> 2) & 0x7;
+			chip->memmode = data & 1;
+			break;
+
+		case 0x03:
+			chip->memadr = (chip->memadr & 0x00FFFF) | (data << 16);
+			break;
+
+		case 0x04:
+			chip->memadr = (chip->memadr & 0xFF00FF) | (data << 8);
+			break;
+
+		case 0x05:
+			chip->memadr = (chip->memadr & 0xFFFF00) | data;
+			break;
+
+		case 0x06: // memory data
+			//busyTime = time + MEM_WRITE_DELAY;
+			ymf278b_writeMem(chip, chip->memadr, data);
+			chip->memadr = (chip->memadr + 1) & 0xFFFFFF;
+			break;
+
+		case 0xF8:
+			// TODO use these
+			chip->fm_l = data & 0x7;
+			chip->fm_r = (data >> 3) & 0x7;
+			break;
+
+		case 0xF9:
+			chip->pcm_l = data & 0x7;
+			chip->pcm_r = (data >> 3) & 0x7;
+			break;
+		}
+	}
+
+	chip->regsreg = data;
+}
+
+UINT8 ymf278b_readReg(YMF278BChip* chip, UINT8 reg)
+{
+	// no need to call updateStream(time)
+	UINT8 result;
+	switch(reg)
+	{
+	case 2: // 3 upper bits are device ID
+		result = (chip->regs2 & 0x1F) | 0x20;
+		break;
+
+	case 6: // Memory Data Register
+		//busyTime = time + MEM_READ_DELAY;
+		result = ymf278b_readMem(chip, chip->memadr);
+		chip->memadr = (chip->memadr + 1) & 0xFFFFFF;
+		break;
+
+	default:
+		result = chip->regsreg;
+		break;
+	}
+	
+	return result;
+}
+
+UINT8 ymf278b_peekReg(YMF278BChip* chip, UINT8 reg)
+{
+	UINT8 result;
+	
+	switch(reg)
+	{
+	case 2: // 3 upper bits are device ID
+		result = (chip->regs2 & 0x1F) | 0x20;
+		break;
+
+	case 6: // Memory Data Register
+		result = ymf278b_readMem(chip, chip->memadr);
+		break;
+
+	default:
+		result = chip->regsreg;
+		break;
+	}
+	return result;
+}
+
+UINT8 ymf278b_readStatus(YMF278BChip* chip)
+{
+	UINT8 result = 0;
+	//if (time < busyTime)
+	//	result |= 0x01;
+	//if (time < loadTime)
+	//	result |= 0x02;
+	return result;
+}
+
+//WRITE8_DEVICE_HANDLER( ymf278b_w )
+void ymf278b_w(void *_info, offs_t offset, UINT8 data)
+{
+	//YMF278BChip *chip = get_safe_token(device);
+	YMF278BChip *chip = (YMF278BChip *)_info;
+
+	switch (offset)
+	{
+		case 0:
+			chip->port_A = data;
+			ymf262_write(chip->fmchip, offset, data);
+			break;
+
+		case 1:
+			ymf278b_A_w(chip, chip->port_A, data);
+			break;
+
+		case 2:
+			chip->port_B = data;
+			ymf262_write(chip->fmchip, offset, data);
+			break;
+
+		case 3:
+			ymf278b_B_w(chip, chip->port_B, data);
+			break;
+
+		case 4:
+			chip->port_C = data;
+			break;
+
+		case 5:
+			ymf278b_C_w(chip, chip->port_C, data);
+			break;
+
+		default:
+#ifdef _DEBUG
+			logerror("YMF278B: unexpected write at offset %X to ymf278b = %02X\n", offset, data);
+#endif
+			break;
+	}
+}
+
+void ymf278b_clearRam(YMF278BChip* chip)
+{
+	memset(chip->ram, 0, chip->RAMSize);
+}
+
+static void ymf278b_load_rom(YMF278BChip *chip)
+{
+	chip->ROMSize = 0x00200000;
+	chip->rom = (UINT8*)malloc(chip->ROMSize);
+	memset(chip->rom, 0xFF, chip->ROMSize);
+	
+	return;
+}
+
+static int ymf278b_init(YMF278BChip *chip, int clock, void (*cb)(int))
+{
+	int rate;
+	
+	rate = clock / 768;
+	//if (((CHIP_SAMPLING_MODE & 0x01) && rate < CHIP_SAMPLE_RATE) ||
+	//	CHIP_SAMPLING_MODE == 0x02)
+	//	rate = CHIP_SAMPLE_RATE;
+	chip->fmchip = ymf262_init(clock * 8 / 19, rate);
+	chip->FMEnabled = 0x00;
+	
+	chip->rom = NULL;
+	chip->irq_callback = cb;
+	//chip->timer_a = timer_alloc(device->machine, ymf278b_timer_a_tick, chip);
+	//chip->timer_b = timer_alloc(device->machine, ymf278b_timer_b_tick, chip);
+	chip->clock = clock;
+
+	ymf278b_load_rom(chip);
+	chip->RAMSize = 0x00080000;
+	chip->ram = (UINT8*)malloc(chip->RAMSize);
+	ymf278b_clearRam(chip);
+
+	return rate;
+}
+
+//static DEVICE_START( ymf278b )
+int device_start_ymf278b(void **_info, int clock)
+{
+	static const ymf278b_interface defintrf = { 0 };
+	const ymf278b_interface *intf;
+	int i;
+	YMF278BChip *chip;
+	int rate;
+
+	chip = (YMF278BChip *) calloc(1, sizeof(YMF278BChip));
+	*_info = (void *) chip;
+	
+	//chip->device = device;
+	//intf = (device->static_config != NULL) ? (const ymf278b_interface *)device->static_config : &defintrf;
+	intf = &defintrf;
+
+	rate = ymf278b_init(chip, clock, intf->irq_callback);
+	//chip->stream = stream_create(device, 0, 2, device->clock/768, chip, ymf278b_pcm_update);
+
+	chip->memadr = 0; // avoid UMR
+
+	// Volume table, 1 = -0.375dB, 8 = -3dB, 256 = -96dB
+	for (i = 0; i < 256; i ++)
+		chip->volumei = 32768 * pow(2.0, (-0.375 / 6) * i);
+	for (i = 256; i < 256 * 4; i ++)
+		chip->volumei = 0;
+	for (i = 0; i < 24; i ++)
+		chip->slotsi.Muted = 0x00;;
+
+	return rate;
+}
+
+//static DEVICE_STOP( ymf278 )
+void device_stop_ymf278b(void *_info)
+{
+	YMF278BChip* chip = (YMF278BChip *)_info;
+	
+	ymf262_shutdown(chip->fmchip);
+	free(chip->rom);	chip->rom = NULL;
+
+	free(chip);	
+
+	return;
+}
+
+void device_reset_ymf278b(void *_info)
+{
+	YMF278BChip* chip = (YMF278BChip *)_info;
+	int i;
+	
+	ymf262_reset_chip(chip->fmchip);
+	chip->FMEnabled = 0x00;
+	
+	chip->eg_cnt = 0;
+
+	for (i = 0; i < 24; i ++)
+		ymf278b_slot_reset(&chip->slotsi);
+	for (i = 255; i >= 0; i --)	// reverse order to avoid UMR
+		ymf278b_C_w(chip, i, 0);
+	
+	chip->wavetblhdr = chip->memmode = chip->memadr = 0;
+	chip->fm_l = chip->fm_r = chip->pcm_l = chip->pcm_r = 0;
+	//busyTime = time;
+	//loadTime = time;
+}
+
+void ymf278b_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					 const UINT8* ROMData)
+{
+	YMF278BChip *chip = (YMF278BChip *)_info;
+	
+	if (chip->ROMSize != ROMSize)
+	{
+		chip->rom = (UINT8*)realloc(chip->rom, ROMSize);
+		chip->ROMSize = ROMSize;
+		memset(chip->rom, 0xFF, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(chip->rom + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+
+void ymf278b_set_mute_mask(void *_info, UINT32 MuteMaskFM, UINT32 MuteMaskWT)
+{
+	YMF278BChip *chip = (YMF278BChip *)_info;
+	UINT8 CurChn;
+	
+	ymf262_set_mutemask(chip->fmchip, MuteMaskFM);
+	for (CurChn = 0; CurChn < 24; CurChn ++)
+		chip->slotsCurChn.Muted = (MuteMaskWT >> CurChn) & 0x01;
+	
+	return;
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymf278b.h Added

@@ -0,0 +1,30 @@
+#pragma once
+
+#define YMF278B_STD_CLOCK (33868800)			/* standard clock for OPL4 */
+
+
+typedef struct _ymf278b_interface ymf278b_interface;
+struct _ymf278b_interface
+{
+	//void (*irq_callback)(const device_config *device, int state);	/* irq callback */
+	void (*irq_callback)(int state);	/* irq callback */
+};
+
+/*READ8_DEVICE_HANDLER( ymf278b_r );
+WRITE8_DEVICE_HANDLER( ymf278b_w );
+
+DEVICE_GET_INFO( ymf278b );
+#define SOUND_YMF278B DEVICE_GET_INFO_NAME( ymf278b )*/
+
+void ymf278b_pcm_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_ymf278b(void **chip, int clock);
+void device_stop_ymf278b(void *chip);
+void device_reset_ymf278b(void *chip);
+
+UINT8 ymf278b_r(void *chip, offs_t offset);
+void ymf278b_w(void *chip, offs_t offset, UINT8 data);
+void ymf278b_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					   const UINT8* ROMData);
+
+void ymf278b_set_mute_mask(void *chip, UINT32 MuteMaskFM, UINT32 MuteMaskWT);
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.c Added

@@ -0,0 +1,1366 @@
+/*
+
+ Yamaha YMZ280B driver
+ by Aaron Giles
+
+ YMZ280B 8-Channel PCMD8 PCM/ADPCM Decoder
+
+ Features as listed in LSI-4MZ280B3 data sheet:
+ Voice data stored in external memory can be played back simultaneously for up to eight voices
+ Voice data format can be selected from 4-bit ADPCM, 8-bit PCM and 16-bit PCM
+ Control of voice data external memory
+ Up to 16M bytes of ROM or SRAM (x 8 bits, access time 150ms max) can be connected
+ Continuous access is possible
+ Loop playback between selective addresses is possible
+ Voice data playback frequency control
+ 4-bit ADPCM ................ 0.172 to 44.1kHz in 256 steps
+ 8-bit PCM, 16-bit PCM ...... 0.172 to 88.2kHz in 512 steps
+ 256 steps total level and 16 steps panpot can be set
+ Voice signal is output in stereo 16-bit 2's complement MSB-first format
+
+ TODO:
+ - Is memory handling 100% correct? At the moment, Konami firebeat.c is the only
+ hardware currently emulated that uses external handlers.
+ It also happens to be the only one using 16-bit PCM.
+
+ Some other drivers (eg. bishi.c, bfm_sc4/5.c) also use ROM readback.
+
+*/
+
+
+#include <math.h>
+
+#include "mamedef.h"
+//#include "sndintrf.h"
+//#include "streams.h"
+#ifdef _DEBUG
+#include <stdio.h>
+#endif
+#include <string.h>
+#include <stdlib.h>
+#include "ymz280b.h"
+
+#ifndef NULL
+#define NULL	((void *)0)
+#endif
+
+static void update_irq_state_timer_common(void *param, int voicenum);
+
+//unsigned char DISABLE_YMZ_FIX = 0x00;
+
+#define MAX_SAMPLE_CHUNK	0x10000
+#define MAKE_WAVS			0
+#define MAKE_WAVS_CH		0
+
+#define FRAC_BITS			14
+#define FRAC_ONE			(1 << FRAC_BITS)
+#define FRAC_MASK			(FRAC_ONE - 1)
+
+#define INTERNAL_BUFFER_SIZE	(1 << 15)
+//#define INTERNAL_SAMPLE_RATE	(chip->master_clock * 2.0)
+#define INTERNAL_SAMPLE_RATE	chip->rate
+
+#if MAKE_WAVS
+#include "wavwrite.h"
+#endif
+#if MAKE_WAVS_CH
+#include <stdio.h>
+FILE* hWavFile8;
+signed short int* wavmem8;
+#endif
+
+
+/* struct describing a single playing ADPCM voice */
+struct YMZ280BVoice
+{
+	UINT8 playing;			/* 1 if we are actively playing */
+
+	UINT8 keyon;			/* 1 if the key is on */
+	UINT8 looping;			/* 1 if looping is enabled */
+	UINT8 mode;				/* current playback mode */
+	UINT16 fnum;			/* frequency */
+	UINT8 level;			/* output level */
+	UINT8 pan;				/* panning */
+
+	UINT32 start;			/* start address, in nibbles */
+	UINT32 stop;			/* stop address, in nibbles */
+	UINT32 loop_start;		/* loop start address, in nibbles */
+	UINT32 loop_end;		/* loop end address, in nibbles */
+	UINT32 position;		/* current position, in nibbles */
+
+	INT32 signal;			/* current ADPCM signal */
+	INT32 step;				/* current ADPCM step */
+
+	INT32 loop_signal;		/* signal at loop start */
+	INT32 loop_step;		/* step at loop start */
+	UINT32 loop_count;		/* number of loops so far */
+
+	INT32 output_left;		/* output volume (left) */
+	INT32 output_right;		/* output volume (right) */
+	INT32 output_step;		/* step value for frequency conversion */
+	INT32 output_pos;		/* current fractional position */
+	INT16 last_sample;		/* last sample output */
+	INT16 curr_sample;		/* current sample target */
+	UINT8 irq_schedule;		/* 1 if the IRQ state is updated by timer */
+	UINT8 Muted;			/* used for muting */
+};
+
+typedef struct _ymz280b_state ymz280b_state;
+struct _ymz280b_state
+{
+	//sound_stream * stream;			/* which stream are we using */
+	UINT8 *region_base;				/* pointer to the base of the region */
+	UINT32 region_size;
+	UINT8 current_register;			/* currently accessible register */
+	UINT8 status_register;			/* current status register */
+	UINT8 irq_state;				/* current IRQ state */
+	UINT8 irq_mask;					/* current IRQ mask */
+	UINT8 irq_enable;				/* current IRQ enable */
+	UINT8 keyon_enable;				/* key on enable */
+	UINT8 ext_mem_enable;			/* external memory enable */
+	UINT8 ext_readlatch;			/* external memory prefetched data */
+	UINT32 ext_mem_address_hi;
+	UINT32 ext_mem_address_mid;
+	UINT32 ext_mem_address;			/* where the CPU can read the ROM */
+	
+	double master_clock;			/* master clock frequency */
+	double rate;
+	//void (*irq_callback)(const device_config *, int);		/* IRQ callback */
+	void (*irq_callback)(int);		/* IRQ callback */
+	struct YMZ280BVoice	voice8;	/* the 8 voices */
+	//devcb_resolved_read8 ext_ram_read;		/* external RAM read handler */
+	//devcb_resolved_write8 ext_ram_write;	/* external RAM write handler */
+
+#if MAKE_WAVS
+	void *		wavresample;			/* resampled waveform */
+#endif
+
+	INT16 *scratch;
+	//const device_config *device;
+};
+
+static void write_to_register(ymz280b_state *chip, int data);
+
+
+/* step size index shift table */
+static const int index_scale8 = { 0x0e6, 0x0e6, 0x0e6, 0x0e6, 0x133, 0x199, 0x200, 0x266 };
+
+/* lookup table for the precomputed difference */
+static int diff_lookup16;
+static unsigned char lookup_init = 0x00;	/* lookup-table is initialized */
+
+/* timer callback */
+/*static TIMER_CALLBACK( update_irq_state_timer_0 );
+static TIMER_CALLBACK( update_irq_state_timer_1 );
+static TIMER_CALLBACK( update_irq_state_timer_2 );
+static TIMER_CALLBACK( update_irq_state_timer_3 );
+static TIMER_CALLBACK( update_irq_state_timer_4 );
+static TIMER_CALLBACK( update_irq_state_timer_5 );
+static TIMER_CALLBACK( update_irq_state_timer_6 );
+static TIMER_CALLBACK( update_irq_state_timer_7 );
+
+static const timer_fired_func update_irq_state_cb =
+{
+	update_irq_state_timer_0,
+	update_irq_state_timer_1,
+	update_irq_state_timer_2,
+	update_irq_state_timer_3,
+	update_irq_state_timer_4,
+	update_irq_state_timer_5,
+	update_irq_state_timer_6,
+	update_irq_state_timer_7
+};*/
+
+
+/*INLINE ymz280b_state *get_safe_token(const device_config *device)
+{
+	assert(device != NULL);
+	assert(device->token != NULL);
+	assert(device->type == SOUND);
+	assert(sound_get_type(device) == SOUND_YMZ280B);
+	return (ymz280b_state *)device->token;
+}*/
+
+INLINE void update_irq_state(ymz280b_state *chip)
+{
+	int irq_bits = chip->status_register & chip->irq_mask;
+
+	/* always off if the enable is off */
+	if (!chip->irq_enable)
+		irq_bits = 0;
+
+	/* update the state if changed */
+	if (irq_bits && !chip->irq_state)
+	{
+		chip->irq_state = 1;
+		if (chip->irq_callback)
+			//(*chip->irq_callback)(chip->device, 1);
+			(*chip->irq_callback)(1);
+		//else logerror("YMZ280B: IRQ generated, but no callback specified!");
+	}
+	else if (!irq_bits && chip->irq_state)
+	{
+		chip->irq_state = 0;
+		if (chip->irq_callback)
+			//(*chip->irq_callback)(chip->device, 0);
+			(*chip->irq_callback)(0);
+		//else logerror("YMZ280B: IRQ generated, but no callback specified!");
+	}
+}
+
+
+INLINE void update_step(ymz280b_state *chip, struct YMZ280BVoice *voice)
+{
+	double frequency;
+
+	/* compute the frequency */
+	if (voice->mode == 1)
+		frequency = chip->master_clock * (double)((voice->fnum & 0x0ff) + 1) * (1.0 / 256.0);
+	else
+		frequency = chip->master_clock * (double)((voice->fnum & 0x1ff) + 1) * (1.0 / 256.0);
+	voice->output_step = (UINT32)(frequency * (double)FRAC_ONE / INTERNAL_SAMPLE_RATE);
+}
+
+
+INLINE void update_volumes(struct YMZ280BVoice *voice)
+{
+	if (voice->pan == 8)
+	{
+		voice->output_left = voice->level;
+		voice->output_right = voice->level;
+	}
+	else if (voice->pan < 8)
+	{
+		voice->output_left = voice->level;
+
+		/* pan 1 is hard-left, what's pan 0? for now assume same as pan 1 */
+		voice->output_right = (voice->pan == 0) ? 0 : voice->level * (voice->pan - 1) / 7;
+	}
+	else
+	{
+		voice->output_left = voice->level * (15 - voice->pan) / 7;
+		voice->output_right = voice->level;
+	}
+}
+
+
+//static STATE_POSTLOAD( YMZ280B_state_save_update_step )
+/*void YMZ280B_state_save_update_step(void *param)
+{
+	ymz280b_state *chip = (ymz280b_state *)param;
+	int j;
+	for (j = 0; j < 8; j++)
+	{
+		struct YMZ280BVoice *voice = &chip->voicej;
+		update_step(chip, voice);
+		if(voice->irq_schedule)
+		//	timer_set(machine, attotime_zero, chip, 0, update_irq_state_cbj);
+			update_irq_state_timer_common(param, j);
+	}
+}*/
+
+
+INLINE UINT8 ymz280b_read_memory(UINT8 *base, UINT32 size, UINT32 offset)
+{
+	offset &= 0xFFFFFF;
+	if (offset < size)
+		return baseoffset;
+
+	/* 16MB chip limit (shouldn't happen) */
+	//else if (offset > 0xffffff)
+	//	return baseoffset & 0xffffff;
+
+	else
+		return 0;
+}
+
+
+static void update_irq_state_timer_common(void *param, int voicenum)
+{
+	ymz280b_state *chip = (ymz280b_state *)param;
+	struct YMZ280BVoice *voice = &chip->voicevoicenum;
+
+	if(!voice->irq_schedule) return;
+
+	voice->playing = 0;
+	chip->status_register |= 1 << voicenum;
+	update_irq_state(chip);
+	voice->irq_schedule = 0;
+}
+
+/*static TIMER_CALLBACK( update_irq_state_timer_0 ) { update_irq_state_timer_common(ptr, 0); }
+static TIMER_CALLBACK( update_irq_state_timer_1 ) { update_irq_state_timer_common(ptr, 1); }
+static TIMER_CALLBACK( update_irq_state_timer_2 ) { update_irq_state_timer_common(ptr, 2); }
+static TIMER_CALLBACK( update_irq_state_timer_3 ) { update_irq_state_timer_common(ptr, 3); }
+static TIMER_CALLBACK( update_irq_state_timer_4 ) { update_irq_state_timer_common(ptr, 4); }
+static TIMER_CALLBACK( update_irq_state_timer_5 ) { update_irq_state_timer_common(ptr, 5); }
+static TIMER_CALLBACK( update_irq_state_timer_6 ) { update_irq_state_timer_common(ptr, 6); }
+static TIMER_CALLBACK( update_irq_state_timer_7 ) { update_irq_state_timer_common(ptr, 7); }*/
+
+
+/**********************************************************************************************
+
+ compute_tables -- compute the difference tables
+
+***********************************************************************************************/
+
+static void compute_tables(void)
+{
+	int nib;
+
+	if (lookup_init)
+		return;
+
+	/* loop over all nibbles and compute the difference */
+	for (nib = 0; nib < 16; nib++)
+	{
+		int value = (nib & 0x07) * 2 + 1;
+		diff_lookupnib = (nib & 0x08) ? -value : value;
+	}
+	
+	lookup_init = 0x01;
+}
+
+
+
+/**********************************************************************************************
+
+ generate_adpcm -- general ADPCM decoding routine
+
+***********************************************************************************************/
+
+static int generate_adpcm(struct YMZ280BVoice *voice, UINT8 *base, UINT32 size, INT16 *buffer, int samples)
+{
+	int position = voice->position;
+	int signal = voice->signal;
+	int step = voice->step;
+	int val;
+
+	/*if (! DISABLE_YMZ_FIX)
+	{
+		if (position >= voice->stop)
+		{
+			voice->playing = 0;
+			return samples;
+		}
+	}*/
+
+	/* two cases: first cases is non-looping */
+	if (!voice->looping)
+	{
+		/* loop while we still have samples to generate */
+		while (samples)
+		{
+			/* compute the new amplitude and update the current step */
+			//val = baseposition / 2 >> ((~position & 1) << 2);
+			val = ymz280b_read_memory(base, size, position / 2) >> ((~position & 1) << 2);
+			signal += (step * diff_lookupval & 15) / 8;
+
+			/* clamp to the maximum */
+			if (signal > 32767)
+				signal = 32767;
+			else if (signal < -32768)
+				signal = -32768;
+
+			/* adjust the step size and clamp */
+			step = (step * index_scaleval & 7) >> 8;
+			if (step > 0x6000)
+				step = 0x6000;
+			else if (step < 0x7f)
+				step = 0x7f;
+
+			/* output to the buffer, scaling by the volume */
+			*buffer++ = signal;
+			samples--;
+
+			/* next! */
+			position++;
+			if (position >= voice->stop)
+			{
+				if (!samples)
+					samples |= 0x10000;
+
+				break;
+			}
+		}
+	}
+
+	/* second case: looping */
+	else
+	{
+		/* loop while we still have samples to generate */
+		while (samples)
+		{
+			/* compute the new amplitude and update the current step */
+			//val = baseposition / 2 >> ((~position & 1) << 2);
+			val = ymz280b_read_memory(base, size, position / 2) >> ((~position & 1) << 2);
+			signal += (step * diff_lookupval & 15) / 8;
+
+			/* clamp to the maximum */
+			if (signal > 32767)
+				signal = 32767;
+			else if (signal < -32768)
+				signal = -32768;
+
+			/* adjust the step size and clamp */
+			step = (step * index_scaleval & 7) >> 8;
+			if (step > 0x6000)
+				step = 0x6000;
+			else if (step < 0x7f)
+				step = 0x7f;
+
+			/* output to the buffer, scaling by the volume */
+			*buffer++ = signal;
+			samples--;
+
+			/* next! */
+			position++;
+			if (position == voice->loop_start && voice->loop_count == 0)
+			{
+				voice->loop_signal = signal;
+				voice->loop_step = step;
+			}
+			if (position >= voice->loop_end)
+			{
+				if (voice->keyon)
+				{
+					position = voice->loop_start;
+					signal = voice->loop_signal;
+					step = voice->loop_step;
+					voice->loop_count++;
+				}
+			}
+			if (position >= voice->stop)
+			{
+				if (!samples)
+					samples |= 0x10000;
+
+				break;
+			}
+		}
+	}
+
+	/* update the parameters */
+	voice->position = position;
+	voice->signal = signal;
+	voice->step = step;
+
+	return samples;
+}
+
+
+
+/**********************************************************************************************
+
+ generate_pcm8 -- general 8-bit PCM decoding routine
+
+***********************************************************************************************/
+
+static int generate_pcm8(struct YMZ280BVoice *voice, UINT8 *base, UINT32 size, INT16 *buffer, int samples)
+{
+	int position = voice->position;
+	int val;
+
+	/*if (! DISABLE_YMZ_FIX)
+	{
+		if (position >= voice->stop)
+		{
+			voice->playing = 0;
+			return samples;
+		}
+	}*/
+
+	/* two cases: first cases is non-looping */
+	if (!voice->looping)
+	{
+		/* loop while we still have samples to generate */
+		while (samples)
+		{
+			/* fetch the current value */
+			//val = baseposition / 2;
+			val = ymz280b_read_memory(base, size, position / 2);
+
+			/* output to the buffer, scaling by the volume */
+			*buffer++ = (INT8)val * 256;
+			samples--;
+
+			/* next! */
+			position += 2;
+			if (position >= voice->stop)
+			{
+				if (!samples)
+					samples |= 0x10000;
+
+				break;
+			}
+		}
+	}
+
+	/* second case: looping */
+	else
+	{
+		/* loop while we still have samples to generate */
+		while (samples)
+		{
+			/* fetch the current value */
+			//val = baseposition / 2;
+			val = ymz280b_read_memory(base, size, position / 2);
+
+			/* output to the buffer, scaling by the volume */
+			*buffer++ = (INT8)val * 256;
+			samples--;
+
+			/* next! */
+			position += 2;
+			if (position >= voice->loop_end)
+			{
+				if (voice->keyon)
+					position = voice->loop_start;
+			}
+			if (position >= voice->stop)
+			{
+				if (!samples)
+					samples |= 0x10000;
+
+				break;
+			}
+		}
+	}
+
+	/* update the parameters */
+	voice->position = position;
+
+	return samples;
+}
+
+
+
+/**********************************************************************************************
+
+ generate_pcm16 -- general 16-bit PCM decoding routine
+
+***********************************************************************************************/
+
+static int generate_pcm16(struct YMZ280BVoice *voice, UINT8 *base, UINT32 size, INT16 *buffer, int samples)
+{
+	int position = voice->position;
+	int val;
+
+	/*if (! DISABLE_YMZ_FIX)
+	{
+		if (position >= voice->stop)
+		{
+			voice->playing = 0;
+			return samples;
+		}
+	}*/
+
+	/* is it even used in any MAME game? */
+	//popmessage("YMZ280B 16-bit PCM contact MAMEDEV");
+
+	/* two cases: first cases is non-looping */
+	if (!voice->looping)
+	{
+		/* loop while we still have samples to generate */
+		while (samples)
+		{
+			/* fetch the current value */
+			//val = (INT16)((baseposition / 2 + 1 << 8) + baseposition / 2 + 0);
+			val = (INT16)((ymz280b_read_memory(base, size, position / 2 + 0) << 8) + ymz280b_read_memory(base, size, position / 2 + 1));
+			// Note: Last MAME updates say it's: ((position / 2 + 1) << 8) + (position / 2 + 0);
+
+			/* output to the buffer, scaling by the volume */
+			*buffer++ = val;
+			samples--;
+
+			/* next! */
+			position += 4;
+			if (position >= voice->stop)
+			{
+				if (!samples)
+					samples |= 0x10000;
+
+				break;
+			}
+		}
+	}
+
+	/* second case: looping */
+	else
+	{
+		/* loop while we still have samples to generate */
+		while (samples)
+		{
+			/* fetch the current value */
+			//val = (INT16)((baseposition / 2 + 1 << 8) + baseposition / 2 + 0);
+			val = (INT16)((ymz280b_read_memory(base, size, position / 2 + 0) << 8) + ymz280b_read_memory(base, size, position / 2 + 1));
+
+			/* output to the buffer, scaling by the volume */
+			*buffer++ = val;
+			samples--;
+
+			/* next! */
+			position += 4;
+			if (position >= voice->loop_end)
+			{
+				if (voice->keyon)
+					position = voice->loop_start;
+			}
+			if (position >= voice->stop)
+			{
+				if (!samples)
+					samples |= 0x10000;
+
+				break;
+			}
+		}
+	}
+
+	/* update the parameters */
+	voice->position = position;
+
+	return samples;
+}
+
+
+
+/**********************************************************************************************
+
+ ymz280b_update -- update the sound chip so that it is in sync with CPU execution
+
+***********************************************************************************************/
+
+//static STREAM_UPDATE( ymz280b_update )
+void ymz280b_update(void *param, stream_sample_t **outputs, int samples)
+{
+	ymz280b_state *chip = (ymz280b_state *)param;
+	stream_sample_t *lacc = outputs0;
+	stream_sample_t *racc = outputs1;
+	int v;
+
+	/* clear out the accumulator */
+	memset(lacc, 0, samples * sizeof(lacc0));
+	memset(racc, 0, samples * sizeof(racc0));
+
+	/* loop over voices */
+	for (v = 0; v < 8; v++)
+	{
+		struct YMZ280BVoice *voice = &chip->voicev;
+		INT16 prev = voice->last_sample;
+		INT16 curr = voice->curr_sample;
+		INT16 *curr_data = chip->scratch;
+		INT32 *ldest = lacc;
+		INT32 *rdest = racc;
+		UINT32 new_samples, samples_left;
+		UINT32 final_pos;
+		int remaining = samples;
+		int lvol = voice->output_left;
+		int rvol = voice->output_right;
+#if MAKE_WAVS_CH
+		signed short int* wavlog;
+
+		memset(wavmemv, 0x00, samples * 0x02);
+		wavlog = wavmemv;
+#endif
+		
+		/* skip if muted */
+		if (voice->Muted)
+			continue;
+
+		/* quick out if we're not playing and we're at 0 */
+		if (!voice->playing && curr == 0 && prev == 0)
+		{
+			/* make sure next sound plays immediately */
+			voice->output_pos = FRAC_ONE;
+
+			continue;
+		}
+
+		/* finish off the current sample */
+		/* interpolate */
+		while (remaining > 0 && voice->output_pos < FRAC_ONE)
+		{
+			int interp_sample = (((INT32)prev * (FRAC_ONE - voice->output_pos)) + ((INT32)curr * voice->output_pos)) >> FRAC_BITS;
+			*ldest++ += interp_sample * lvol;
+			*rdest++ += interp_sample * rvol;
+#if MAKE_WAVS_CH
+			*(wavlog ++) = (signed short int)interp_sample;
+#endif
+			voice->output_pos += voice->output_step;
+			remaining--;
+		}
+
+		/* if we're over, continue; otherwise, we're done */
+		if (voice->output_pos >= FRAC_ONE)
+			voice->output_pos -= FRAC_ONE;
+		else
+			continue;
+
+		/* compute how many new samples we need */
+		final_pos = voice->output_pos + remaining * voice->output_step;
+		new_samples = (final_pos + FRAC_ONE) >> FRAC_BITS;
+		if (new_samples > MAX_SAMPLE_CHUNK)
+			new_samples = MAX_SAMPLE_CHUNK;
+		samples_left = new_samples;
+
+		/* generate them into our buffer */
+		switch (voice->playing << 7 | voice->mode)
+		{
+			case 0x81:	samples_left = generate_adpcm(voice, chip->region_base, chip->region_size, chip->scratch, new_samples);		break;
+			case 0x82:	samples_left = generate_pcm8(voice, chip->region_base, chip->region_size, chip->scratch, new_samples);		break;
+			case 0x83:	samples_left = generate_pcm16(voice, chip->region_base, chip->region_size, chip->scratch, new_samples);		break;
+			default:	samples_left = 0; memset(chip->scratch, 0, new_samples * sizeof(chip->scratch0));							break;
+		}
+
+		/* if there are leftovers, ramp back to 0 */
+		if (samples_left)
+		{
+			/* note: samples_left bit 16 is set if the voice was finished at the same time the function ended */
+			int base;
+			int i, t;
+			
+			samples_left &= 0xffff;
+			base = new_samples - samples_left;
+			t = (base == 0) ? curr : chip->scratchbase - 1;
+			
+			for (i = 0; i < samples_left; i++)
+			{
+				if (t < 0) t = -((-t * 15) >> 4);
+				else if (t > 0) t = (t * 15) >> 4;
+				chip->scratchbase + i = t;
+			}
+
+			/* if we hit the end and IRQs are enabled, signal it */
+			if (base != 0)
+			{
+				voice->playing = 0;
+
+				/* set update_irq_state_timer. IRQ is signaled on next CPU execution. */
+				//timer_set(chip->device->machine, attotime_zero, chip, 0, update_irq_state_cbv);
+				voice->irq_schedule = 1;
+			}
+		}
+
+		/* advance forward one sample */
+		prev = curr;
+		curr = *curr_data++;
+
+		/* then sample-rate convert with linear interpolation */
+		while (remaining > 0)
+		{
+			/* interpolate */
+			while (remaining > 0 && voice->output_pos < FRAC_ONE)
+			{
+				int interp_sample = (((INT32)prev * (FRAC_ONE - voice->output_pos)) + ((INT32)curr * voice->output_pos)) >> FRAC_BITS;
+				*ldest++ += interp_sample * lvol;
+				*rdest++ += interp_sample * rvol;
+#if MAKE_WAVS_CH
+				*(wavlog ++) = (signed short int)interp_sample;
+#endif
+				voice->output_pos += voice->output_step;
+				remaining--;
+			}
+
+			/* if we're over, grab the next samples */
+			if (voice->output_pos >= FRAC_ONE)
+			{
+				voice->output_pos -= FRAC_ONE;
+				prev = curr;
+				curr = *curr_data++;
+			}
+		}
+
+		/* remember the last samples */
+		voice->last_sample = prev;
+		voice->curr_sample = curr;
+	}
+
+	for (v = 0; v < samples; v++)
+	{
+		outputs0v /= 256;
+		outputs1v /= 256;
+	}
+	
+	for (v = 0; v < 8; v++)
+		update_irq_state_timer_common(chip, v);
+	
+#if MAKE_WAVS_CH
+	for (v = 0; v < 8; v++)
+	{
+		fwrite(wavmemv, 0x02, samples, hWavFilev);
+	}
+#endif
+}
+
+
+
+/**********************************************************************************************
+
+ DEVICE_START( ymz280b ) -- start emulation of the YMZ280B
+
+***********************************************************************************************/
+
+//static DEVICE_START( ymz280b )
+int device_start_ymz280b(void **_info, int clock)
+{
+	static const ymz280b_interface defintrf = { 0 };
+	//const ymz280b_interface *intf = (device->static_config != NULL) ? (const ymz280b_interface *)device->static_config : &defintrf;
+	const ymz280b_interface *intf = &defintrf;
+	//ymz280b_state *chip = get_safe_token(device);
+	ymz280b_state *chip;
+	int chn;
+
+	chip = (ymz280b_state *) calloc(1, sizeof(ymz280b_state));
+	*_info = (void *) chip;
+	
+	//chip->device = device;
+	//devcb_resolve_read8(&chip->ext_ram_read, &intf->ext_read, device);
+	//devcb_resolve_write8(&chip->ext_ram_write, &intf->ext_write, device);
+
+	/* compute ADPCM tables */
+	compute_tables();
+
+	/* initialize the rest of the structure */
+	chip->master_clock = (double)clock / 384.0;
+	
+	chip->rate = chip->master_clock * 2.0;
+	// disabled until the frequency calculation gets fixed
+	/*if (((CHIP_SAMPLING_MODE & 0x01) && chip->rate < CHIP_SAMPLE_RATE) ||
+		CHIP_SAMPLING_MODE == 0x02)
+		chip->rate = (double)CHIP_SAMPLE_RATE;*/
+	
+	//chip->region_base = device->region;
+	chip->region_size = 0x00;
+	chip->region_base = NULL;
+	chip->irq_callback = intf->irq_callback;
+
+	/* create the stream */
+	//chip->stream = stream_create(device, 0, 2, INTERNAL_SAMPLE_RATE, chip, ymz280b_update);
+
+	/* allocate memory */
+	//chip->scratch = auto_alloc_array(device->machine, INT16, MAX_SAMPLE_CHUNK);
+	chip->scratch = malloc(MAX_SAMPLE_CHUNK * sizeof(INT16));
+	memset(chip->scratch, 0x00, MAX_SAMPLE_CHUNK * sizeof(INT16));
+
+	/* state save */
+	/*{
+		int j;
+		state_save_register_device_item(device, 0, chip->current_register);
+		state_save_register_device_item(device, 0, chip->status_register);
+		state_save_register_device_item(device, 0, chip->irq_state);
+		state_save_register_device_item(device, 0, chip->irq_mask);
+		state_save_register_device_item(device, 0, chip->irq_enable);
+		state_save_register_device_item(device, 0, chip->keyon_enable);
+		state_save_register_device_item(device, 0, chip->rom_readback_addr);
+		for (j = 0; j < 8; j++)
+		{
+			state_save_register_device_item(device, j, chip->voicej.playing);
+			state_save_register_device_item(device, j, chip->voicej.keyon);
+			state_save_register_device_item(device, j, chip->voicej.looping);
+			state_save_register_device_item(device, j, chip->voicej.mode);
+			state_save_register_device_item(device, j, chip->voicej.fnum);
+			state_save_register_device_item(device, j, chip->voicej.level);
+			state_save_register_device_item(device, j, chip->voicej.pan);
+			state_save_register_device_item(device, j, chip->voicej.start);
+			state_save_register_device_item(device, j, chip->voicej.stop);
+			state_save_register_device_item(device, j, chip->voicej.loop_start);
+			state_save_register_device_item(device, j, chip->voicej.loop_end);
+			state_save_register_device_item(device, j, chip->voicej.position);
+			state_save_register_device_item(device, j, chip->voicej.signal);
+			state_save_register_device_item(device, j, chip->voicej.step);
+			state_save_register_device_item(device, j, chip->voicej.loop_signal);
+			state_save_register_device_item(device, j, chip->voicej.loop_step);
+			state_save_register_device_item(device, j, chip->voicej.loop_count);
+			state_save_register_device_item(device, j, chip->voicej.output_left);
+			state_save_register_device_item(device, j, chip->voicej.output_right);
+			state_save_register_device_item(device, j, chip->voicej.output_pos);
+			state_save_register_device_item(device, j, chip->voicej.last_sample);
+			state_save_register_device_item(device, j, chip->voicej.curr_sample);
+			state_save_register_device_item(device, j, chip->voicej.irq_schedule);
+		}
+	}*/
+	
+	for (chn = 0; chn < 8; chn ++)
+		chip->voicechn.Muted = 0x00;
+
+	//state_save_register_postload(device->machine, YMZ280B_state_save_update_step, chip);
+
+#if MAKE_WAVS
+	chip->wavresample = wav_open("resamp.wav", INTERNAL_SAMPLE_RATE, 2);
+#endif
+#if MAKE_WAVS_CH
+	hWavFile0 = fopen("logwav0.raw", "wb");
+	hWavFile1 = fopen("logwav1.raw", "wb");
+	hWavFile2 = fopen("logwav2.raw", "wb");
+	hWavFile3 = fopen("logwav3.raw", "wb");
+	hWavFile4 = fopen("logwav4.raw", "wb");
+	hWavFile5 = fopen("logwav5.raw", "wb");
+	hWavFile6 = fopen("logwav6.raw", "wb");
+	hWavFile7 = fopen("logwav7.raw", "wb");
+	{
+		char v;
+		for (v = 0; v < 8; v++)
+		{
+			wavmemv = (signed short int*)malloc(0x10 * 0x02);
+		}
+	}
+#endif
+
+	return (int)INTERNAL_SAMPLE_RATE;
+}
+
+//static DEVICE_STOP( ymz280b )
+void device_stop_ymz280b(void *_info)
+{
+	//ymz280b_state *chip = get_safe_token(device);
+	ymz280b_state *chip = (ymz280b_state *)_info;
+	free(chip->region_base);	chip->region_base = NULL;
+	free(chip->scratch);
+	
+#if MAKE_WAVS_CH
+	{
+		char v;
+		for (v = 0; v < 8; v++)
+		{
+			free(wavmemv);
+			fclose(hWavFilev);
+		}
+	}
+#endif
+
+	free(chip);
+
+	return;
+}
+
+//static DEVICE_RESET( ymz280b )
+void device_reset_ymz280b(void *_info)
+{
+	ymz280b_state *chip = (ymz280b_state *)_info;
+	/*struct YMZ280BVoice *voice;
+	unsigned char curvoc;
+	
+	chip->current_register = 0x00;
+	chip->status_register = 0x00;
+	chip->irq_state = 0x00;
+	chip->irq_mask = 0x00;
+	chip->irq_enable = 0x00;
+	chip->keyon_enable = 0x00;
+	chip->ext_mem_address = 0x000000;
+	for (curvoc = 0; curvoc < 8; curvoc ++)
+	{
+		voice = &chip->voicecurvoc;
+		
+		voice->playing = 0;
+			
+		voice->keyon = 0;
+		voice->looping = 0;
+		voice->mode = 0;
+		voice->fnum = 0;
+		voice->level = 0;
+		voice->pan = 8;
+		
+		voice->start = 0x000000;
+		voice->stop = 0x000000;
+		voice->loop_start = 0x000000;
+		voice->loop_end = 0x000000;
+		voice->position = 0x000000;
+	}*/
+	
+	// new code from MAME 0.143u4
+	int i;
+
+	/* initial clear registers */
+	for (i = 0xff; i >= 0; i--)
+	{
+		if (i == 0x83 || (i >= 88 && i <= 0xFD))
+			continue;	// avoid too many debug messages
+		chip->current_register = i;
+		write_to_register(chip, 0);
+	}
+
+	chip->current_register = 0;
+	chip->status_register = 0;
+
+	/* clear other voice parameters */
+	for (i = 0; i < 8; i++)
+	{
+		struct YMZ280BVoice *voice = &chip->voicei;
+
+		voice->curr_sample = 0;
+		voice->last_sample = 0;
+		voice->output_pos = FRAC_ONE;
+		voice->playing = 0;
+	}
+	
+	return;
+}
+
+
+/**********************************************************************************************
+
+ write_to_register -- handle a write to the current register
+
+***********************************************************************************************/
+
+static void write_to_register(ymz280b_state *chip, int data)
+{
+	struct YMZ280BVoice *voice;
+	int i;
+	//UINT8 mode_new;
+
+	/* force an update */
+	//stream_update(chip->stream);
+
+	/* lower registers follow a pattern */
+	if (chip->current_register < 0x80)
+	{
+		voice = &chip->voice(chip->current_register >> 2) & 7;
+
+		switch (chip->current_register & 0xe3)
+		{
+			case 0x00:		/* pitch low 8 bits */
+				voice->fnum = (voice->fnum & 0x100) | (data & 0xff);
+				update_step(chip, voice);
+				break;
+
+			case 0x01:		/* pitch upper 1 bit, loop, key on, mode */
+				voice->fnum = (voice->fnum & 0xff) | ((data & 0x01) << 8);
+				voice->looping = (data & 0x10) >> 4;
+				/*mode_new = (data & 0x60) >> 5;
+				if (! DISABLE_YMZ_FIX)
+				{
+					// that fixes the scratch-bug
+					if (voice->mode != mode_new)
+					{
+						// On-the-fly Mode-Change won't make sense,
+						//	so I'm doing: KeyOff + Mode Change -> Instant Stop.
+						//	(Deroon DeroDero uses this quite often)
+						//	This is done by setting KeyOn to 0.
+						//	Instant Stop/Restarting is done below.
+						voice->keyon = 0;
+						voice->irq_schedule = 0;
+					}
+					if (! mode_new)
+						data &= 0x7F;
+				}
+				voice->mode = mode_new;*/
+				if ((data & 0x60) == 0) data &= 0x7f; /* ignore mode setting and set to same state as KON=0 */
+				else voice->mode = (data & 0x60) >> 5;
+				
+				if (!voice->keyon && (data & 0x80) && chip->keyon_enable)
+				{
+					voice->playing = 1;
+					voice->position = voice->start;
+					voice->signal = voice->loop_signal = 0;
+					voice->step = voice->loop_step = 0x7f;
+					voice->loop_count = 0;
+
+					/* if update_irq_state_timer is set, cancel it. */
+					voice->irq_schedule = 0;
+				}
+				/*else if (voice->keyon && !(data & 0x80) && !voice->looping)
+				{
+					voice->playing = 0;
+
+					// if update_irq_state_timer is set, cancel it.
+					voice->irq_schedule = 0;
+				}
+				else if (! DISABLE_YMZ_FIX && ! voice->keyon && !(data & 0x80) && voice->playing)
+				{
+					// 2x KeyOff -> Instant Stop, too (see Deroon DeroDero: Round Start-Tune)
+					voice->playing = 0;
+					voice->irq_schedule = 0;
+				}*/
+				// new code from MAME 0.143u4
+				else if (voice->keyon && !(data & 0x80))
+				{
+					voice->playing = 0;
+
+					// if update_irq_state_timer is set, cancel it.
+					voice->irq_schedule = 0;
+				}
+				voice->keyon = (data & 0x80) >> 7;
+				update_step(chip, voice);
+				break;
+
+			case 0x02:		/* total level */
+				voice->level = data;
+				update_volumes(voice);
+				break;
+
+			case 0x03:		/* pan */
+				voice->pan = data & 0x0f;
+				update_volumes(voice);
+				break;
+
+			case 0x20:		/* start address high */
+				voice->start = (voice->start & (0x00ffff << 1)) | (data << 17);
+				break;
+
+			case 0x21:		/* loop start address high */
+				voice->loop_start = (voice->loop_start & (0x00ffff << 1)) | (data << 17);
+				break;
+
+			case 0x22:		/* loop end address high */
+				voice->loop_end = (voice->loop_end & (0x00ffff << 1)) | (data << 17);
+				break;
+
+			case 0x23:		/* stop address high */
+				voice->stop = (voice->stop & (0x00ffff << 1)) | (data << 17);
+				break;
+
+			case 0x40:		/* start address middle */
+				voice->start = (voice->start & (0xff00ff << 1)) | (data << 9);
+				break;
+
+			case 0x41:		/* loop start address middle */
+				voice->loop_start = (voice->loop_start & (0xff00ff << 1)) | (data << 9);
+				break;
+
+			case 0x42:		/* loop end address middle */
+				voice->loop_end = (voice->loop_end & (0xff00ff << 1)) | (data << 9);
+				break;
+
+			case 0x43:		/* stop address middle */
+				voice->stop = (voice->stop & (0xff00ff << 1)) | (data << 9);
+				break;
+
+			case 0x60:		/* start address low */
+				voice->start = (voice->start & (0xffff00 << 1)) | (data << 1);
+				break;
+
+			case 0x61:		/* loop start address low */
+				voice->loop_start = (voice->loop_start & (0xffff00 << 1)) | (data << 1);
+				break;
+
+			case 0x62:		/* loop end address low */
+				voice->loop_end = (voice->loop_end & (0xffff00 << 1)) | (data << 1);
+				break;
+
+			case 0x63:		/* stop address low */
+				voice->stop = (voice->stop & (0xffff00 << 1)) | (data << 1);
+				break;
+
+			default:
+#ifdef _DEBUG
+				logerror("YMZ280B: unknown register write %02X = %02X\n", chip->current_register, data);
+#endif
+				break;
+		}
+	}
+
+	/* upper registers are special */
+	else
+	{
+		switch (chip->current_register)
+		{
+			/* DSP related (not implemented yet) */
+			case 0x80: // d0-2: DSP Rch, d3: enable Rch (0: yes, 1: no), d4-6: DSP Lch, d7: enable Lch (0: yes, 1: no)
+			case 0x81: // d0: enable control of $82 (0: yes, 1: no)
+			case 0x82: // DSP data
+#ifdef _DEBUG
+				logerror("YMZ280B: DSP register write %02X = %02X\n", chip->current_register, data);
+#endif
+				break;
+
+			case 0x84:		/* ROM readback / RAM write (high) */
+				chip->ext_mem_address_hi = data << 16;
+				break;
+
+			case 0x85:		/* ROM readback / RAM write (middle) */
+				chip->ext_mem_address_mid = data << 8;
+				break;
+
+			case 0x86: /* ROM readback / RAM write (low) -> update latch */
+				chip->ext_mem_address = chip->ext_mem_address_hi | chip->ext_mem_address_mid | data;
+				if (chip->ext_mem_enable)
+					chip->ext_readlatch = ymz280b_read_memory(chip->region_base, chip->region_size, chip->ext_mem_address);
+				break;
+
+			case 0x87:		/* RAM write */
+				if (chip->ext_mem_enable)
+				{
+					/*if (!chip->ext_ram_write.isnull())
+						chip->ext_ram_write(chip->ext_mem_address, data);
+					else
+						logerror("YMZ280B attempted RAM write to %X\n", chip->ext_mem_address);*/
+					chip->ext_mem_address = (chip->ext_mem_address + 1) & 0xffffff;
+				}
+				break;
+
+			case 0xfe:		/* IRQ mask */
+				chip->irq_mask = data;
+				update_irq_state(chip);
+				break;
+
+			case 0xff:		/* IRQ enable, test, etc */
+				chip->ext_mem_enable = (data & 0x40) >> 6;
+				chip->irq_enable = (data & 0x10) >> 4;
+				update_irq_state(chip);
+
+				if (chip->keyon_enable && !(data & 0x80))
+				{
+					for (i = 0; i < 8; i++)
+					{
+						chip->voicei.playing = 0;
+
+						/* if update_irq_state_timer is set, cancel it. */
+						chip->voicei.irq_schedule = 0;
+					}
+				}
+				else if (!chip->keyon_enable && (data & 0x80))
+				{
+					for (i = 0; i < 8; i++)
+					{
+						if (chip->voicei.keyon && chip->voicei.looping)
+							chip->voicei.playing = 1;
+					}
+				}
+				chip->keyon_enable = (data & 0x80) >> 7;
+				break;
+
+			default:
+#ifdef _DEBUG
+				logerror("YMZ280B: unknown register write %02X = %02X\n", chip->current_register, data);
+#endif
+				break;
+		}
+	}
+}
+
+
+
+/**********************************************************************************************
+
+ compute_status -- determine the status bits
+
+***********************************************************************************************/
+
+static int compute_status(ymz280b_state *chip)
+{
+	UINT8 result;
+
+	/* force an update */
+	//stream_update(chip->stream);
+
+	result = chip->status_register;
+
+	/* clear the IRQ state */
+	chip->status_register = 0;
+	update_irq_state(chip);
+
+	return result;
+}
+
+
+
+/**********************************************************************************************
+
+ ymz280b_r/ymz280b_w -- handle external accesses
+
+***********************************************************************************************/
+
+//READ8_DEVICE_HANDLER( ymz280b_r )
+UINT8 ymz280b_r(void *_info, offs_t offset)
+{
+	//ymz280b_state *chip = get_safe_token(device);
+	ymz280b_state *chip = (ymz280b_state *)_info;
+
+	if ((offset & 1) == 0)
+	{
+		UINT8 ret;
+		
+		if (! chip->ext_mem_enable)
+			return 0xff;
+
+		/* read from external memory */
+		ret = chip->ext_readlatch;
+		ret = ymz280b_read_memory(chip->region_base, chip->region_size, chip->ext_mem_address);
+		chip->ext_mem_address = (chip->ext_mem_address + 1) & 0xffffff;
+		return ret;
+	}
+	else
+	{
+		return compute_status(chip);
+	}
+}
+
+
+//WRITE8_DEVICE_HANDLER( ymz280b_w )
+void ymz280b_w(void *_info, offs_t offset, UINT8 data)
+{
+	//ymz280b_state *chip = get_safe_token(device);
+	ymz280b_state *chip = (ymz280b_state *)_info;
+
+	if ((offset & 1) == 0)
+		chip->current_register = data;
+	else
+	{
+		/* force an update */
+		//chip->stream->update();
+
+		write_to_register(chip, data);
+	}
+}
+
+void ymz280b_write_rom(void *_info, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					 const UINT8* ROMData)
+{
+	ymz280b_state *chip = (ymz280b_state *)_info;
+	
+	if (chip->region_size != ROMSize)
+	{
+		chip->region_base = (UINT8*)realloc(chip->region_base, ROMSize);
+		chip->region_size = ROMSize;
+		memset(chip->region_base, 0xFF, ROMSize);
+	}
+	if (DataStart > ROMSize)
+		return;
+	if (DataStart + DataLength > ROMSize)
+		DataLength = ROMSize - DataStart;
+	
+	memcpy(chip->region_base + DataStart, ROMData, DataLength);
+	
+	return;
+}
+
+
+void ymz280b_set_mute_mask(void *_info, UINT32 MuteMask)
+{
+	ymz280b_state *chip = (ymz280b_state *)_info;
+	UINT8 CurChn;
+	
+	for (CurChn = 0; CurChn < 8; CurChn ++)
+		chip->voiceCurChn.Muted = (MuteMask >> CurChn) & 0x01;
+	
+	return;
+}
+
+
+
+/**************************************************************************
+ * Generic get_info
+ **************************************************************************/
+
+/*DEVICE_GET_INFO( ymz280b )
+{
+	switch (state)
+	{
+		// --- the following bits of info are returned as 64-bit signed integers ---
+		case DEVINFO_INT_TOKEN_BYTES:					info->i = sizeof(ymz280b_state);			break;
+
+		// --- the following bits of info are returned as pointers to data or functions ---
+		case DEVINFO_FCT_START:							info->start = DEVICE_START_NAME( ymz280b );		break;
+		case DEVINFO_FCT_STOP:							// Nothing									break;
+		case DEVINFO_FCT_RESET:							info->start = DEVICE_RESET_NAME( ymz280b );		break;
+
+		// --- the following bits of info are returned as NULL-terminated strings ---
+		case DEVINFO_STR_NAME:							strcpy(info->s, "YMZ280B");						break;
+		case DEVINFO_STR_FAMILY:					strcpy(info->s, "Yamaha Wavetable");			break;
+		case DEVINFO_STR_VERSION:					strcpy(info->s, "1.0");							break;
+		case DEVINFO_STR_SOURCE_FILE:						strcpy(info->s, __FILE__);						break;
+		case DEVINFO_STR_CREDITS:					strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break;
+	}
+}*/
+

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/chips/ymz280b.h Added

@@ -0,0 +1,37 @@
+/**********************************************************************************************
+ *
+ *   Yamaha YMZ280B driver
+ *   by Aaron Giles
+ *
+ **********************************************************************************************/
+
+#pragma once
+
+//#include "devcb.h"
+
+typedef struct _ymz280b_interface ymz280b_interface;
+struct _ymz280b_interface
+{
+	//void (*irq_callback)(const device_config *device, int state);	/* irq callback */
+	void (*irq_callback)(int state);	/* irq callback */
+	//devcb_read8 ext_read;			/* external RAM read */
+	//devcb_write8 ext_write;		/* external RAM write */
+};
+
+/*READ8_DEVICE_HANDLER ( ymz280b_r );
+WRITE8_DEVICE_HANDLER( ymz280b_w );
+
+DEVICE_GET_INFO( ymz280b );
+#define SOUND_YMZ280B DEVICE_GET_INFO_NAME( ymz280b )*/
+
+void ymz280b_update(void *chip, stream_sample_t **outputs, int samples);
+int device_start_ymz280b(void **chip, int clock);
+void device_stop_ymz280b(void *chip);
+void device_reset_ymz280b(void *chip);
+
+UINT8 ymz280b_r(void *chip, offs_t offset);
+void ymz280b_w(void *chip, offs_t offset, UINT8 data);
+void ymz280b_write_rom(void *chip, offs_t ROMSize, offs_t DataStart, offs_t DataLength,
+					   const UINT8* ROMData);
+
+void ymz280b_set_mute_mask(void *chip, UINT32 MuteMask);

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/licenses Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/licenses/GPL.txt Added

@@ -0,0 +1,340 @@
+		 GNU GENERAL PUBLIC LICENSE
+		 Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			 Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+&#xc;
+		 GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+&#xc;
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+&#xc;
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+&#xc;
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			 NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		 END OF TERMS AND CONDITIONS
+&#xc;
+	 How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/licenses/List.txt Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/licenses/mame_license.txt Added

@@ -0,0 +1,35 @@
+Unless otherwise explicitly stated, all code in MAME is released under the
+following license:
+
+Copyright Nicola Salmoria and the MAME team
+All rights reserved.
+
+Redistribution and use of this code or any derivative works are permitted
+provided that the following conditions are met:
+
+* Redistributions may not be sold, nor may they be used in a commercial
+product or activity.
+
+* Redistributions that are modified from the original source must include the
+complete source code, including the source code for all components used by a
+binary built from the modified sources. However, as a special exception, the
+source code distributed need not include anything that is normally distributed
+(in either source or binary form) with the major components (compiler, kernel,
+and so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+* Redistributions 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.
+
+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.

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.c Added

@@ -0,0 +1,372 @@
+#include "resampler.h"
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Copyright (C) 2004-2008 Shay Green.
+ Copyright (C) 2015 Christopher Snowhill. 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 */
+
+#undef PI
+#define PI 3.1415926535897932384626433832795029
+
+enum { imp_scale = 0x7FFF };
+typedef int16_t imp_t;
+typedef int32_t imp_off_t; /* for max_res of 512 and impulse width of 32, end offsets must be 32 bits */
+
+#if RESAMPLER_BITS == 16
+typedef int32_t intermediate_t;
+#elif RESAMPLER_BITS == 32
+typedef int64_t intermediate_t;
+#endif
+
+static void gen_sinc( double rolloff, int width, double offset, double spacing, double scale,
+		int count, imp_t* out )
+{
+	double const maxh = 256;
+	double const step = PI / maxh * spacing;
+	double const to_w = maxh * 2 / width;
+	double const pow_a_n = pow( rolloff, maxh );
+	double angle = (count / 2 - 1 + offset) * -step;
+	scale /= maxh * 2;
+
+	while ( count-- )
+	{
+		double w;
+		*out++ = 0;
+		w = angle * to_w;
+		if ( fabs( w ) < PI )
+		{
+			double rolloff_cos_a = rolloff * cos( angle );
+			double num = 1 - rolloff_cos_a -
+					pow_a_n * cos( maxh * angle ) +
+					pow_a_n * rolloff * cos( (maxh - 1) * angle );
+			double den = 1 - rolloff_cos_a - rolloff_cos_a + rolloff * rolloff;
+			double sinc = scale * num / den - scale;
+
+			out -1 = (imp_t) (cos( w ) * sinc + sinc);
+		}
+		angle += step;
+	}
+}
+
+enum { width = 32 };
+enum { stereo = 2 };
+enum { max_res = 512 };
+enum { min_width = (width < 4 ? 4 : width) };
+enum { adj_width = min_width / 4 * 4 + 2 };
+enum { write_offset = adj_width * stereo };
+
+enum { buffer_size = 128 };
+
+typedef struct _resampler
+{
+	int width_;
+	int rate_;
+	int inptr;
+	int infilled;
+	int outptr;
+	int outfilled;
+
+	int latency;
+
+	imp_t const* imp;
+	imp_t impulses max_res * (adj_width + 2 * (sizeof(imp_off_t) / sizeof(imp_t)));
+	sample_t buffer_inbuffer_size * stereo * 2;
+	sample_t buffer_outbuffer_size * stereo;
+} resampler;
+
+void * resampler_create()
+{
+	resampler *r = (resampler *) malloc(sizeof(resampler));
+	if (r) resampler_clear(r);
+	return r;
+}
+
+void * resampler_dup(void *_r)
+{
+	resampler *r = (resampler *)_r;
+	resampler *t = (resampler *) malloc(sizeof(resampler));
+	if (r && t)
+	{
+		memcpy(t, r, sizeof(resampler));
+		t->imp = t->impulses + (r->imp - r->impulses);
+	}
+	else if (t)
+	{
+		resampler_clear(t);
+	}
+	return t;
+}
+
+void resampler_destroy(void *r)
+{
+	free(r);
+}
+
+void resampler_clear(void *_r)
+{
+	resampler * r = (resampler *)_r;
+	r->width_ = adj_width;
+	r->inptr = 0;
+	r->infilled = 0;
+	r->outptr = 0;
+	r->outfilled = 0;
+	r->latency = 0;
+	r->imp = r->impulses;
+
+	resampler_set_rate(r, 1.0);
+}
+
+void resampler_set_rate( void *_r, double new_factor )
+{
+	resampler *rs = (resampler *)_r;
+
+	double const rolloff = 0.999;
+	double const gain = 1.0;
+
+	int step;
+	double fraction;
+
+	double filter;
+	double pos = 0.0;
+
+	imp_t* out;
+
+	int n;
+
+	/* determine number of sub-phases that yield lowest error */
+	double ratio_ = 0.0;
+	int res = -1;
+	{
+		double least_error = 2;
+		double pos = 0;
+		int r;
+		for ( r = 1; r <= max_res; r++ )
+		{
+			double nearest, error;
+			pos += new_factor;
+			nearest = floor( pos + 0.5 );
+			error = fabs( pos - nearest );
+			if ( error < least_error )
+			{
+				res = r;
+				ratio_ = nearest / res;
+				least_error = error;
+			}
+		}
+	}
+	rs->rate_ = ratio_;
+
+	/* how much of input is used for each output sample */
+	step = stereo * (int) floor( ratio_ );
+	fraction = fmod( ratio_, 1.0 );
+
+	filter = (ratio_ < 1.0) ? 1.0 : 1.0 / ratio_;
+	/*int input_per_cycle = 0;*/
+	out = rs->impulses;
+	for ( n = res; --n >= 0; )
+	{
+		int cur_step;
+
+		gen_sinc( rolloff, (int) (rs->width_ * filter + 1) & ~1, pos, filter,
+				(double)(imp_scale * gain * filter), (int) rs->width_, out );
+		out += rs->width_;
+
+		cur_step = step;
+		pos += fraction;
+		if ( pos >= 0.9999999 )
+		{
+			pos -= 1.0;
+			cur_step += stereo;
+		}
+
+		((imp_off_t*)out)0 = (cur_step - rs->width_ * 2 + 4) * sizeof (sample_t);
+		((imp_off_t*)out)1 = 2 * sizeof (imp_t) + 2 * sizeof (imp_off_t);
+		out += 2 * (sizeof(imp_off_t) / sizeof(imp_t));
+		/*input_per_cycle += cur_step;*/
+	}
+	/* last offset moves back to beginning of impulses*/
+	((imp_off_t*)out) -1 -= (char*) out - (char*) rs->impulses;
+
+	rs->imp = rs->impulses;
+}
+
+int resampler_get_free(void *_r)
+{
+	resampler *r = (resampler *)_r;
+	return buffer_size * stereo - r->infilled;
+}
+
+int resampler_get_min_fill(void *_r)
+{
+	resampler *r = (resampler *)_r;
+	const int min_needed = write_offset + stereo;
+	const int latency = r->latency ? 0 : adj_width;
+	int min_free = min_needed - r->infilled - latency;
+	return min_free < 0 ? 0 : min_free;
+}
+
+void resampler_write_pair(void *_r, sample_t ls, sample_t rs)
+{
+	resampler *r = (resampler *)_r;
+
+	if (!r->latency)
+	{
+		int i;
+		for (i = 0; i < adj_width / 2; ++i)
+		{
+			r->buffer_inr->inptr + 0 = 0;
+			r->buffer_inr->inptr + 1 = 0;
+			r->buffer_inbuffer_size * stereo + r->inptr + 0 = 0;
+			r->buffer_inbuffer_size * stereo + r->inptr + 1 = 0;
+			r->inptr = (r->inptr + stereo) % (buffer_size * stereo);
+			r->infilled += stereo;
+		}
+		r->latency = 1;
+	}
+
+	if (r->infilled < buffer_size * stereo)
+	{
+		r->buffer_inr->inptr + 0 = ls;
+		r->buffer_inr->inptr + 1 = rs;
+		r->buffer_inbuffer_size * stereo + r->inptr + 0 = ls;
+		r->buffer_inbuffer_size * stereo + r->inptr + 1 = rs;
+		r->inptr = (r->inptr + stereo) % (buffer_size * stereo);
+		r->infilled += stereo;
+	}
+}
+
+#ifdef _MSC_VER
+#define restrict __restrict
+#endif
+
+static const sample_t * resampler_inner_loop( resampler *r, sample_t** out_,
+		sample_t const* out_end, sample_t const in , int in_size )
+{
+	in_size -= write_offset;
+	if ( in_size > 0 )
+	{
+		sample_t* restrict out = *out_;
+		sample_t const* const in_end = in + in_size;
+		imp_t const* imp = r->imp;
+
+		do
+		{
+			/* accumulate in extended precision*/
+			int pt = imp 0;
+			int n;
+			intermediate_t l = (intermediate_t)pt * (intermediate_t)(in 0);
+			intermediate_t r = (intermediate_t)pt * (intermediate_t)(in 1);
+			if ( out >= out_end )
+				break;
+			for ( n = (adj_width - 2) / 2; n; --n )
+			{
+				pt = imp 1;
+				l += (intermediate_t)pt * (intermediate_t)(in 2);
+				r += (intermediate_t)pt * (intermediate_t)(in 3);
+
+				/* pre-increment more efficient on some RISC processors*/
+				imp += 2;
+				pt = imp 0;
+				r += (intermediate_t)pt * (intermediate_t)(in 5);
+				in += 4;
+				l += (intermediate_t)pt * (intermediate_t)(in 0);
+			}
+			pt = imp 1;
+			l += (intermediate_t)pt * (intermediate_t)(in 2);
+			r += (intermediate_t)pt * (intermediate_t)(in 3);
+
+			/* these two "samples" after the end of the impulse give the
+			 * proper offsets to the next input sample and next impulse */
+			in = (sample_t const*) ((char const*) in + ((imp_off_t*)(&imp 2))0); /* some negative value */
+			imp = (imp_t const*) ((char const*) imp + ((imp_off_t*)(&imp 2))1); /* small positive or large negative */
+
+			out 0 = (sample_t) (l >> 15);
+			out 1 = (sample_t) (r >> 15);
+			out += 2;
+		}
+		while ( in < in_end );
+
+		r->imp = imp;
+		*out_ = out;
+	}
+	return in;
+}
+
+#undef restrict
+
+static int resampler_wrapper( resampler *r, sample_t out , int* out_size,
+		sample_t const in , int in_size )
+{
+	sample_t* out_ = out;
+	int result = resampler_inner_loop( r, &out_, out + *out_size, in, in_size ) - in;
+
+	*out_size = out_ - out;
+	return result;
+}
+
+static void resampler_fill( resampler *r )
+{
+	while (!r->outfilled && r->infilled)
+	{
+		int writepos = ( r->outptr + r->outfilled ) % (buffer_size * stereo);
+		int writesize = (buffer_size * stereo) - writepos;
+		int inread;
+		if ( writesize > ( buffer_size * stereo - r->outfilled ) )
+				writesize = buffer_size * stereo - r->outfilled;
+		inread = resampler_wrapper(r, &r->buffer_outwritepos, &writesize, &r->buffer_inbuffer_size * stereo + r->inptr - r->infilled, r->infilled);
+		r->infilled -= inread;
+		r->outfilled += writesize;
+		if (!inread)
+			break;
+	}
+}
+
+int resampler_get_avail(void *_r)
+{
+	resampler *r = (resampler *)_r;
+	if (r->outfilled < stereo && r->infilled >= r->width_)
+	 resampler_fill( r );
+	return r->outfilled;
+}
+
+static void resampler_read_pair_internal( resampler *r, sample_t *ls, sample_t *rs, int advance )
+{
+	if (r->outfilled < stereo)
+	 resampler_fill( r );
+	if (r->outfilled < stereo)
+	{
+		*ls = 0;
+		*rs = 0;
+		return;
+	}
+	*ls = r->buffer_outr->outptr + 0;
+	*rs = r->buffer_outr->outptr + 1;
+	if (advance)
+	{
+		r->outptr = (r->outptr + 2) % (buffer_size * stereo);
+		r->outfilled -= stereo;
+	}
+}
+
+void resampler_read_pair( void *_r, sample_t *ls, sample_t *rs )
+{
+	resampler *r = (resampler *)_r;
+	resampler_read_pair_internal(r, ls, rs, 1);
+}
+
+void resampler_peek_pair( void *_r, sample_t *ls, sample_t *rs )
+{
+	resampler *r = (resampler *)_r;
+	resampler_read_pair_internal(r, ls, rs, 0);
+}

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/resampler.h Added

@@ -0,0 +1,73 @@
+#ifndef _RESAMPLER_H_
+#define _RESAMPLER_H_
+
+/* Copyright (C) 2004-2008 Shay Green.
+ Copyright (C) 2015 Christopher Snowhill. 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 */
+
+#define RESAMPLER_BITS 32
+#define RESAMPLER_DECORATE vgmplay
+
+#ifdef RESAMPLER_DECORATE
+#undef PASTE
+#undef EVALUATE
+#define PASTE(a,b) a ## b
+#define EVALUATE(a,b) PASTE(a,b)
+#define resampler_create EVALUATE(RESAMPLER_DECORATE,_resampler_create)
+#define resampler_dup EVALUATE(RESAMPLER_DECORATE,_resampler_dup)
+#define resampler_destroy EVALUATE(RESAMPLER_DECORATE,_resampler_destroy)
+#define resampler_clear EVALUATE(RESAMPLER_DECORATE,_resampler_clear)
+#define resampler_set_rate EVALUATE(RESAMPLER_DECORATE,_resampler_set_rate)
+#define resampler_get_free EVALUATE(RESAMPLER_DECORATE,_resampler_get_free)
+#define resampler_get_min_fill EVALUATE(RESAMPLER_DECORATE,_resampler_get_min_fill)
+#define resampler_write_pair EVALUATE(RESAMPLER_DECORATE,_resampler_write_pair)
+#define resampler_get_avail EVALUATE(RESAMPLER_DECORATE,_resampler_get_avail)
+#define resampler_read_pair EVALUATE(RESAMPLER_DECORATE,_resampler_read_pair)
+#define resampler_peek_pair EVALUATE(RESAMPLER_DECORATE,_resampler_peek_pair)
+#endif
+
+#include <stdint.h>
+
+#if RESAMPLER_BITS == 16
+typedef int16_t sample_t;
+#elif RESAMPLER_BITS == 32
+typedef int32_t sample_t;
+#else
+#error Choose a bit depth!
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void * resampler_create();
+void * resampler_dup(void *);
+void resampler_destroy(void *);
+
+void resampler_clear(void *);
+
+void resampler_set_rate( void *, double new_factor );
+
+int resampler_get_free(void *);
+int resampler_get_min_fill(void *);
+
+void resampler_write_pair(void *, sample_t ls, sample_t rs);
+
+int resampler_get_avail(void *);
+
+void resampler_read_pair( void *, sample_t *ls, sample_t *rs );
+void resampler_peek_pair( void *, sample_t *ls, sample_t *rs );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/stdbool.h Added

deadbeef-1.9.6.tar.bz2/plugins/gme/game-music-emu-0.6pre/vgmplay/VGMPlay/vgmspec171.txt Added

@@ -0,0 +1,847 @@
+VGM Spec v1.71 beta
+==============
+VGM (Video Game Music) is a sample-accurate sound logging format for the Sega
+Master System, the Sega Game Gear and possibly many other machines (e.g. Sega
+Genesis).
+
+The normal file extension is .vgm but files can also be GZip compressed into
+.vgz files. However, a VGM player should attempt to support compressed and
+uncompressed files with either extension. (ZLib's GZIO library makes this
+trivial to implement.)
+
+The format starts with a 256 byte header:
+
+      00  01  02  03   04  05  06  07   08  09  0A  0B  0C  0D  0E  0F
+0x00 "Vgm " ident   EoF offset     Version        SN76489 clock  
+0x10 YM2413 clock   GD3 offset     Total # samplesLoop offset    
+0x20 Loop # samples Rate           SN FB SNWSFYM2612 clock   
+0x30 YM2151 clock   VGM data offsetSega PCM clock SPCM Interface 
+0x40 RF5C68 clock   YM2203 clock   YM2608 clock   YM2610/B clock 
+0x50 YM3812 clock   YM3526 clock   Y8950 clock    YMF262 clock   
+0x60 YMF278B clock  YMF271 clock   YMZ280B clock  RF5C164 clock  
+0x70 PWM clock      AY8910 clock   AYTAY Flags  VM *** LBLM
+0x80 GB DMG clock   NES APU clock  MultiPCM clock uPD7759 clock  
+0x90 OKIM6258 clock OFKFCF *** OKIM6295 clock K051649 clock  
+0xA0 K054539 clock  HuC6280 clock  C140 clock     K053260 clock  
+0xB0 Pokey clock    QSound clock   SCSP clock     Extra Hdr ofs  
+0xC0 WSwan clock    VSU clock      SAA1099 clock  ES5503 clock   
+0xD0 ES5506 clock   ECECCD *** X1-010 clock   C352 clock     
+0xE0 GA20 clock      *** *** *** ***  *** *** *** ***  *** *** *** ***
+0xF0  *** *** *** ***  *** *** *** ***  *** *** *** ***  *** *** *** ***
+
+- Unused space (marked with *) is reserved for future expansion, and must be
+  zero.
+- All integer values are *unsigned* and written in "Intel" byte order (Little
+  Endian), so for example 0x12345678 is written as 0x78 0x56 0x34 0x12.
+- All pointer offsets are written as relative to the current position in the
+  file, so for example the GD3 offset at 0x14 in the header is the file
+  position of the GD3 tag minus 0x14.
+- All header sizes are valid for all versions from 1.50 on, as long as header
+  has at least 64 bytes. If the VGM data starts at an offset that is lower
+  than 0x100, all overlapping header bytes have to be handled as they were
+  zero.
+- VGMs run with a rate of 44100 samples per second. All sample values use this
+  unit.
+
+0x00: "Vgm " (0x56 0x67 0x6d 0x20) file identification (32 bits)
+0x04: Eof offset (32 bits)
+        Relative offset to end of file (i.e. file length - 4).
+        This is mainly used to find the next track when concatenating
+        player stubs and multiple files.
+0x08: Version number (32 bits)
+        Version number in BCD-Code. e.g. Version 1.71 is stored as 0x00000171.
+        This is used for backwards compatibility in players, and defines which
+        header values are valid.
+0x0C: SN76489 clock (32 bits)
+        Input clock rate in Hz for the SN76489 PSG chip. A typical value is
+        3579545. It should be 0 if there is no PSG chip used.
+        Note: Bit 31 (0x80000000) is used on combination with the dual-chip-bit
+        to indicate that this is a T6W28. (PSG variant used in NeoGeo Pocket)
+0x10: YM2413 clock (32 bits)
+        Input clock rate in Hz for the YM2413 chip. A typical value is 3579545.
+        It should be 0 if there is no YM2413 chip used.
+0x14: GD3 offset (32 bits)
+        Relative offset to GD3 tag. 0 if no GD3 tag.
+        GD3 tags are descriptive tags similar in use to ID3 tags in MP3 files.
+        See the GD3 specification for more details. The GD3 tag is usually
+        stored immediately after the VGM data.
+0x18: Total # samples (32 bits)
+        Total of all wait values in the file.
+0x1C: Loop offset (32 bits)
+        Relative offset to loop point, or 0 if no loop.
+        For example, if the data for the one-off intro to a song was in bytes
+        0x0040-0x3FFF of the file, but the main looping section started at
+        0x4000, this would contain the value 0x4000-0x1C = 0x00003FE4.
+0x20: Loop # samples (32 bits)
+        Number of samples in one loop, or 0 if there is no loop.
+        Total of all wait values between the loop point and the end of
+        the file.
+VGM 1.01 additions:
+0x24: Rate (32 bits)
+        "Rate" of recording in Hz, used for rate scaling on playback. It is
+        typically 50 for PAL systems and 60 for NTSC systems. It should be set
+        to zero if rate scaling is not appropriate - for example, if the game
+        adjusts its music engine for the system's speed.
+        VGM 1.00 files will have a value of 0.
+VGM 1.10 additions:
+0x28: SN76489 feedback (16 bits)
+        The white noise feedback pattern for the SN76489 PSG. Known values are:
+        0x0009  Sega Master System 2/Game Gear/Mega Drive
+                (SN76489/SN76496 integrated into Sega VDP chip)
+        0x0003  Sega Computer 3000H, BBC Micro
+                (SN76489AN)
+        0x0006  SN76494, SN76496
+        For version 1.01 and earlier files, the feedback pattern should be
+        assumed to be 0x0009. If the PSG is not used then this may be omitted
+        (left at zero).
+0x2A: SN76489 shift register width (8 bits)
+        The noise feedback shift register width, in bits. Known values are:
+        16  Sega Master System 2/Game Gear/Mega Drive
+            (SN76489/SN76496 integrated into Sega VDP chip)
+        15  Sega Computer 3000H, BBC Micro
+            (SN76489AN)
+        For version 1.01 and earlier files, the shift register width should be
+        assumed to be 16. If the PSG is not used then this may be omitted (left
+        at zero).
+VGM 1.51 additions:
+0x2B: SN76489 Flags (8 bits)
+        Misc flags for the SN76489. Most of them don't make audible changes and
+        can be ignored, if the SN76489 emulator lacks the features.
+        bit 0   frequency 0 is 0x400
+        bit 1   output negate flag
+        bit 2   stereo on/off (on when bit clear)
+        bit 3   /8 Clock Divider on/off (on when bit clear)
+        bit 4-7 reserved (must be zero)
+        For version 1.51 and earlier files, all the flags should not be set.
+        If the PSG is not used then this may be omitted (left at zero).
+VGM 1.10 additions:
+0x2C: YM2612 clock (32 bits)
+        Input clock rate in Hz for the YM2612 chip. A typical value is 7670454.
+        It should be 0 if there us no YM2612 chip used.
+        For version 1.01 and earlier files, the YM2413 clock rate should be
+        used for the clock rate of the YM2612.
+0x30: YM2151 clock (32 bits)
+        Input clock rate in Hz for the YM2151 chip. A typical value is 3579545.
+        It should be 0 if there us no YM2151 chip used.
+        For version 1.01 and earlier files, the YM2413 clock rate should be
+        used for the clock rate of the YM2151.
+VGM 1.50 additions:
+0x34: VGM data offset (32 bits)
+        Relative offset to VGM data stream.
+        If the VGM data starts at absolute offset 0x40, this will contain 
+        value 0x0000000C. For versions prior to 1.50, it should be 0 and the
+        VGM data must start at offset 0x40.
+VGM 1.51 additions:
+0x38: Sega PCM clock (32 bits)
+        Input clock rate in Hz for the Sega PCM chip. A typical value is
+        4000000. It should be 0 if there is no Sega PCM chip used.
+0x3C: Sega PCM interface register (32 bits)
+        The interface register for the Sega PCM chip. It should be 0 if there
+        is no Sega PCM chip used.
+0x40: RF5C68 clock (32 bits)
+        Input clock rate in Hz for the RF5C68 PCM chip. A typical value is
+        12500000. It should be 0 if there is no RF5C68 chip used.
+0x44: YM2203 clock (32 bits)
+        Input clock rate in Hz for the YM2203 chip. A typical value is 3000000.
+        It should be 0 if there is no YM2203 chip used.
+0x48: YM2608 clock (32 bits)
+        Input clock rate in Hz for the YM2608 chip. A typical value is 8000000.
+        It should be 0 if there is no YM2608 chip used.
+0x4C: YM2610/YM2610B clock (32 bits)
+        Input clock rate in Hz for the YM2610/B chip. A typical value is
+        8000000. It should be 0 if there is no YM2610/B chip used.
+        Note: Bit 31 is used to set whether it is a YM2610 or a YM2610B chip.
+        If bit 31 is set it is an YM2610B, if bit 31 is clear it is an YM2610.
+0x50: YM3812 clock (32 bits)
+        Input clock rate in Hz for the YM3812 chip. A typical value is 3579545.
+        It should be 0 if there is no YM3812 chip used.
+0x54: YM3526 clock (32 bits)
+        Input clock rate in Hz for the YM3526 chip. A typical value is 3579545.
+        It should be 0 if there is no YM3526 chip used.
+0x58: Y8950 clock (32 bits)
+        Input clock rate in Hz for the Y8950 chip. A typical value is 3579545.
+        It should be 0 if there is no Y8950 chip used.
+0x5C: YMF262 clock (32 bits)
+        Input clock rate in Hz for the YMF262 chip. A typical value is
+        14318180. It should be 0 if there is no YMF262 chip used.
+0x60: YMF278B clock (32 bits)
+        Input clock rate in Hz for the YMF278B chip. A typical value is
+        33868800. It should be 0 if there is no YMF278B chip used.
+0x64: YMF271 clock (32 bits)
+        Input clock rate in Hz for the YMF271 chip. A typical value is
+        16934400. It should be 0 if there is no YMF271 chip used.
+0x68: YMZ280B clock (32 bits)
+        Input clock rate in Hz for the YMZ280B chip. A typical value is
+        16934400. It should be 0 if there is no YMZ280B chip used.
+0x6C: RF5C164 clock (32 bits)
+        Input clock rate in Hz for the RF5C164 PCM chip. A typical value is
+        12500000. It should be 0 if there is no RF5C164 chip used.
+0x70: PWM clock (32 bits)
+        Input clock rate in Hz for the PWM chip. A typical value is
+        23011361. It should be 0 if there is no PWM chip used.
+0x74: AY8910 clock (32 bits)
+        Input clock rate in Hz for the AY8910 chip. A typical value is 1789750.
+        It should be 0 if there is no AY8910 chip used.
+0x78: AY8910 Chip Type (8 bits)
+        Defines the exact type of AY8910. The values are:
+        0x00 - AY8910
+        0x01 - AY8912
+        0x02 - AY8913
+        0x03 - AY8930
+        0x10 - YM2149
+        0x11 - YM3439
+        0x12 - YMZ284
+        0x13 - YMZ294
+        If the AY8910 is not used then this may be omitted (left at zero).
+0x79: AY8910 Flags (8 bits)
+        Misc flags for the AY8910. Default is 0x01.
+        For additional description see ay8910.h in MAME source code.
+        bit 0   Legacy Output
+        bit 1   Single Output
+        bit 2   Discrete Output
+        bit 3   RAW Output
+        bit 4   YM2149 Pin 26 (additional /2 clock divider)
+        bit 5-7 reserved (must be zero)
+        If the AY8910 is not used then this may be omitted (left at zero).
+0x7A: YM2203/AY8910 Flags (8 bits)
+        Misc flags for the AY8910. This one is specific for the AY8910 that's
+        connected with/part of the YM2203.
+0x7B: YM2608/AY8910 Flags (8 bits)
+        Misc flags for the AY8910. This one is specific for the AY8910 that's
+        connected with/part of the YM2608.
+VGM 1.60 additions:
+0x7C: Volume Modifier (8 bits)
+        Volume = 2 ^ (VolumeModifier / 0x20) where VolumeModifier is a number
+        from -63 to 192 (-63 = 0xC1, 0 = 0x00, 192 = 0xC0). Also the value -63
+        gets replaced with -64 in order to make factor of 0.25 possible.
+        Therefore the volume can reach levels between 0.25 and 64.
+        Default is 0, which is equal to a factor of 1 or 100%.
+        Note: Players should support the Volume Modifier in v1.50 files and
+        higher. This way MegaDrive VGMs can use the Volume Modifier without
+        breaking compatibility with old players.
+0x7D: reserved
+        Reserved byte for future use. It must be 0.
+0x7E: Loop Base (8 bits)
+        Modifies the number of loops that are played before the playback ends.
+        Set this value to eg. 1 to reduce the number of played loops by one.
+        This is useful, if the song is looped twice in the vgm, because there
+        are minor differences between the first and second loop and the song
+        repeats just the second loop.
+        The resulting number of loops that are played is calculated as
+        following: NumLoops = NumLoopsModified - LoopBase
+        Default is 0. Negative numbers are possible (80h...FFh = -128...-1)
+VGM 1.51 additions:
+0x7F: Loop Modifier (8 bits)
+        Modifies the number of loops that are played before the playback ends.
+        You may want to use this, e.g. if a tune has a very short, but non-
+        repetive loop (then set it to 0x20 double the loop number).
+        The resulting number of loops that are played is calculated as
+        following: NumLoops = ProgramNumLoops * LoopModifier / 0x10
+        Default is 0, which is equal to 0x10.
+VGM 1.61 additions:
+0x80: GameBoy DMG clock (32 bits)
+        Input clock rate in Hz for the GameBoy DMG chip, LR35902. A typical
+        value is 4194304. It should be 0 if there is no GB DMG chip used.
+0x84: NES APU clock (32 bits)
+        Input clock rate in Hz for the NES APU chip, N2A03. A typical value is
+        1789772. It should be 0 if there is no NES APU chip used.
+        Note: Bit 31 is used to enable the FDS sound addon. Set to enable,
+        clear to disable.
+0x88: MultiPCM clock (32 bits)
+        Input clock rate in Hz for the MultiPCM chip. A typical value is
+        8053975. It should be 0 if there is no MultiPCM chip used.
+0x8C: uPD7759 clock (32 bits)
+        Input clock rate in Hz for the uPD7759 chip. A typical value is 640000.
+        It should be 0 if there is no uPD7759 chip used.
+0x90: OKIM6258 clock (32 bits)
+        Input clock rate in Hz for the OKIM6258 chip. A typical value is
+        4000000. It should be 0 if there is no OKIM6258 chip used.
+0x94: OKIM6258 Flags (8 bits)
+        Misc flags for the OKIM6258. Default is 0x00.
+        bit 0-1 Clock Divider (clock dividers are 1024, 768, 512, 512)
+        bit 2   3/4-bit ADPCM select (default is 4-bit, doesn't work currently)
+        bit 3   10/12-bit Output (default is 10-bit)
+        bit 4-7 reserved (must be zero)
+        If the OKIM6258 is not used then this may be omitted (left at zero).
+0x95: K054539 Flags (8 bits)
+        Misc flags for the K054539. Default is 0x01.
+        See also k054539.h in MAME source code.
+        bit 0   Reverse Stereo
+        bit 1   Disable Reverb
+        bit 2   Update at KeyOn
+        bit 3-7 reserved (must be zero)
+        If the K054539 is not used then this may be omitted (left at zero).
+0x96: C140 Chip Type (8 bits)
+        Defines the exact type of C140 and its banking method. The values are:
+        0x00 - C140, Namco System 2
+        0x01 - C140, Namco System 21
+        0x02 - 219 ASIC, Namco NA-1/2
+        If the C140 is not used then this may be omitted (left at zero).
+0x97: reserved
+        Reserved byte for future use. It must be 0.
+0x98: OKIM6295 clock (32 bits)
+        Input clock rate in Hz for the OKIM6295 chip. A typical value is
+        8000000. It should be 0 if there is no OKIM6295 chip used.
+0x9C: K051649 clock (32 bits)
+        Input clock rate in Hz for the K051649 chip. A typical value is
+        1500000. It should be 0 if there is no K051649 chip used.
+0xA0: K054539 clock (32 bits)
+        Input clock rate in Hz for the K054539 chip. A typical value is
+        18432000. It should be 0 if there is no K054539 chip used.
+0xA4: HuC6280 clock (32 bits)
+        Input clock rate in Hz for the HuC6280 chip. A typical value is
+        3579545. It should be 0 if there is no HuC6280 chip used.
+0xA8: C140 clock (32 bits)
+        Input clock rate in Hz for the C140 chip. A typical value is 8000000.
+        It should be 0 if there is no C140 chip used.
+0xAC: K053260 clock (32 bits)
+        Input clock rate in Hz for the K053260 chip. A typical value is 
+        3579545. It should be 0 if there is no K053260 chip used.
+0xB0: Pokey clock (32 bits)
+        Input clock rate in Hz for the Pokey chip. A typical value is 1789772.
+        It should be 0 if there is no Pokey chip used.
+0xB4: QSound clock (32 bits)
+        Input clock rate in Hz for the QSound chip. A typical value is 4000000.
+        It should be 0 if there is no QSound chip used.
+VGM 1.71 additions:
+0xB8: SCSP clock (32 bits)
+        Input clock rate in Hz for the SCSP chip. A typical value is 22579200.
+        It should be 0 if there is no SCSP chip used.
+VGM 1.70 additions:
+0xBC: Extra Header Offset (32 bits)
+        Relative offset to the extra header or 0 if no extra header is present.
+VGM 1.71 additions:
+0xC0: WonderSwan clock (32 bits)
+        Input clock rate in Hz for the WonderSwan chip. A typical value is
+        3072000. It should be 0 if there is no WonderSwan chip used.
+0xC4: Virtual Boy VSU clock (32 bits)
+        Input clock rate in Hz for the VSU chip. A typical value is 5000000.
+        It should be 0 if there is no VSU chip used.
+0xC8: SAA1099 clock (32 bits)
+        Input clock rate in Hz for the SAA1099 chip. A typical value is
+        8000000. It should be 0 if there is no SAA1099 chip used.
+0xCC: ES5503 clock (32 bits)
+        Input clock rate in Hz for the ES5503 chip. A typical value is 7159090.
+        It should be 0 if there is no ES5503 chip used.
+0xD0: ES5505/ES5506 clock (32 bits)
+        Input clock rate in Hz for the ES5506 chip. A typical value is
+        16000000. It should be 0 if there is no ES5506 chip used.
+        Note: Bit 31 is used to set whether it is an ES5505 or an ES5506 chip.
+        If bit 31 is set it is an ES5506, if bit 31 is clear it is an ES5505.
+0xD4: ES5503 Channels (8 bits)
+        Defines the internal number of output channels for the ES5503.
+        Possible values are 1 to 8. A typical value is 2.
+        If the ES5503 is not used then this may be omitted (left at zero).
+0xD5: ES5505/6 Channels (8 bits)
+        Defines the internal number of output channels for the ES5506.
+        Possible values are 1 to 4 for the ES5505 and 1 to 8 for the ES5506.
+        A typical value is 1.
+        If the ES5506 is not used then this may be omitted (left at zero).
+0xD6: C352 Clock Divider (8 bits)
+        Defines the clock divider for the C352 chip, divided by 4 in order
+        to achieve a divider range of 0 to 1020. A typical value is 288.
+        If the C352 is not used then this may be omitted (left at zero).
+0xD7: reserved
+        Reserved byte for future use. It must be 0.
+0xD8: Seta X1-010 clock (32 bits)
+        Input clock rate in Hz for the X1-010 chip. A typical value is
+        16000000. It should be 0 if there is no X1-010 chip used.
+0xDC: Namco C352 clock (32 bits)
+        Input clock rate in Hz for the C352 chip. A typical value is 24192000.
+        It should be 0 if there is no C352 chip used.
+0xE0: Irem GA20 clock (32 bits)
+        Input clock rate in Hz for the GA20 chip. A typical value is 3579545.
+        It should be 0 if there is no GA20 chip used.
+0xE4: reserved
+        Reserved bytes for future use. They must be 0.
+
+
+Starting at the location specified by the VGM data offset (or, offset 0x40 for
+file versions below 1.50) is found a sequence of commands containing data
+written to the chips or timing information. A command is one of:
+
+  0x4F dd    : Game Gear PSG stereo, write dd to port 0x06
+  0x50 dd    : PSG (SN76489/SN76496) write value dd
+  0x51 aa dd : YM2413, write value dd to register aa
+  0x52 aa dd : YM2612 port 0, write value dd to register aa
+  0x53 aa dd : YM2612 port 1, write value dd to register aa
+  0x54 aa dd : YM2151, write value dd to register aa
+  0x55 aa dd : YM2203, write value dd to register aa
+  0x56 aa dd : YM2608 port 0, write value dd to register aa
+  0x57 aa dd : YM2608 port 1, write value dd to register aa
+  0x58 aa dd : YM2610 port 0, write value dd to register aa
+  0x59 aa dd : YM2610 port 1, write value dd to register aa
+  0x5A aa dd : YM3812, write value dd to register aa
+  0x5B aa dd : YM3526, write value dd to register aa
+  0x5C aa dd : Y8950, write value dd to register aa
+  0x5D aa dd : YMZ280B, write value dd to register aa
+  0x5E aa dd : YMF262 port 0, write value dd to register aa
+  0x5F aa dd : YMF262 port 1, write value dd to register aa
+  0x61 nn nn : Wait n samples, n can range from 0 to 65535 (approx 1.49
+               seconds). Longer pauses than this are represented by multiple
+               wait commands.
+  0x62       : wait 735 samples (60th of a second), a shortcut for
+               0x61 0xdf 0x02
+  0x63       : wait 882 samples (50th of a second), a shortcut for
+               0x61 0x72 0x03
+  0x64 cc nn nn : override length of 0x62/0x63
+                  cc - command (0x62/0x63)
+                  nn - delay in samples
+                  Note: Not yet implemented. Am I really sure about this?
+  0x66       : end of sound data
+  0x67 ...   : data block: see below
+  0x68 ...   : PCM RAM write: see below
+  0x7n       : wait n+1 samples, n can range from 0 to 15.
+  0x8n       : YM2612 port 0 address 2A write from the data bank, then wait 
+               n samples; n can range from 0 to 15. Note that the wait is n,
+               NOT n+1. (Note: Written to first chip instance only.)
+  0x90-0x95  : DAC Stream Control Write: see below
+  0xA0 aa dd : AY8910, write value dd to register aa
+  0xB0 aa dd : RF5C68, write value dd to register aa
+  0xB1 aa dd : RF5C164, write value dd to register aa
+  0xB2 ad dd : PWM, write value ddd to register a (d is MSB, dd is LSB)
+  0xB3 aa dd : GameBoy DMG, write value dd to register aa
+               Note: Register 00 equals GameBoy address FF10.
+  0xB4 aa dd : NES APU, write value dd to register aa
+               Note: Registers 00-1F equal NES address 4000-401F,
+                     registers 20-3E equal NES address 4080-409E,
+                     register 3F equals NES address 4023,
+                     registers 40-7F equal NES address 4040-407F.
+  0xB5 aa dd : MultiPCM, write value dd to register aa
+  0xB6 aa dd : uPD7759, write value dd to register aa
+  0xB7 aa dd : OKIM6258, write value dd to register aa
+  0xB8 aa dd : OKIM6295, write value dd to register aa
+  0xB9 aa dd : HuC6280, write value dd to register aa
+  0xBA aa dd : K053260, write value dd to register aa
+  0xBB aa dd : Pokey, write value dd to register aa
+  0xBC aa dd : WonderSwan, write value dd to register aa
+  0xBD aa dd : SAA1099, write value dd to register aa
+  0xBE aa dd : ES5506, write 8-bit value dd to register aa
+  0xBF aa dd : GA20, write value dd to register aa
+  0xC0 bbaa dd : Sega PCM, write value dd to memory offset aabb
+  0xC1 bbaa dd : RF5C68, write value dd to memory offset aabb
+  0xC2 bbaa dd : RF5C164, write value dd to memory offset aabb
+  0xC3 cc bbaa : MultiPCM, write set bank offset aabb to channel cc
+  0xC4 mmll rr : QSound, write value mmll to register rr
+                 (mm - data MSB, ll - data LSB)
+  0xC5 mmll dd : SCSP, write value dd to memory offset mmll
+                 (mm - offset MSB, ll - offset LSB)
+  0xC6 mmll dd : WonderSwan, write value dd to memory offset mmll
+                 (mm - offset MSB, ll - offset LSB)
+  0xC7 mmll dd : VSU, write value dd to register mmll
+                 (mm - MSB, ll - LSB)
+  0xC8 mmll dd : X1-010, write value dd to memory offset mmll
+                 (mm - offset MSB, ll - offset LSB)
+  0xD0 pp aa dd : YMF278B port pp, write value dd to register aa
+  0xD1 pp aa dd : YMF271 port pp, write value dd to register aa
+  0xD2 pp aa dd : SCC1 port pp, write value dd to register aa
+  0xD3 pp aa dd : K054539 write value dd to register ppaa
+  0xD4 pp aa dd : C140 write value dd to register ppaa
+  0xD5 pp aa dd : ES5503 write value dd to register ppaa
+  0xD6 aa ddee  : ES5506 write 16-bit value ddee to register aa
+  0xE0 dddddddd : seek to offset dddddddd (Intel byte order) in PCM data bank
+  0xE1 aabb ddee: C352 write 16-bit value ddee to register aabb
+
+Some ranges are reserved for future use, with different numbers of operands:
+
+  0x30..0x3F dd          : one operand, reserved for future use
+                           Note: used for dual-chip support (see below)
+  0x40..0x4E dd dd       : two operands, reserved for future use
+                           Note: was one operand only til v1.60
+  0xA1..0xAF dd dd       : two operands, reserved for future use
+                           Note: used for dual-chip support (see below)
+  0xC9..0xCF dd dd dd    : three operands, reserved for future use
+  0xD7..0xDF dd dd dd    : three operands, reserved for future use
+  0xE2..0xFF dd dd dd dd : four operands, reserved for future use
+
+On encountering these, the correct number of bytes should be skipped.
+
+
+Data blocks
+-----------
+VGM command 0x67 specifies a data block. These are used to store large amounts
+of data, which can be used in parallel with the normal VGM data stream. The
+data block format is:
+
+  0x67 0x66 tt ss ss ss ss (data)
+
+where:
+  0x67 = VGM command
+  0x66 = compatibility command to make older players stop parsing the stream
+  tt   = data type
+  ss ss ss ss (32 bits) = size of data, in bytes
+  (data) = data, of size previously specified
+
+Data blocks of recorded streams, if present, should be at the very start of the
+VGM data. Multiple data blocks expand the data bank. (The start offset and
+length of the block in the data bank should be saved for command 0x95.)
+Because data blocks can happen anywhere in the stream, players must be able to
+parse data blocks anywhere in the stream. 
+
+The data block type specifies what type of data it contains. Currently defined
+types are:
+
+00..3F : data of recorded streams (uncompressed)
+40..7E : data of recorded streams (compressed)
+  data block format for compressed streams:
+    tt (8 bits) = compression type
+                    00 - n-Bit-Compression
+                    01 - DPCM-Compression
+    ss ss ss ss (32 bits) = size of uncompressed data (for memory allocation)
+                            It is assumed that each decompressed value uses
+                            ceil(bd/8) bytes.
+    (attr) = attribute bytes used by the decompression-algorithm
+    n-Bit-Compression:
+        bd (8 bits) = Bits decompressed
+        bc (8 bits) = Bits compressed
+        st (8 bits) = compression sub-type
+                        00 - copy (high bits aren't used)
+                        01 - shift left (low bits aren't used)
+                        02 - use table (data = index into decompression table,
+                                        see data block 7F)
+        aa aa (16 bits) = value that is added (ignored if table is used)
+        The data block is treated as a bitstream with bc bits per value. The
+        top bits in each byte are read first. The extracted bits of each value
+        are transformed into a value with at least bd bits using method st.
+        Finally, aaaa is added to get the resulting value.
+    DPCM-Compression: (uses a decompression table)
+        bd (8 bits) = Bits decompressed
+        bc (8 bits) = Bits compressed
+        st (8 bits) = reserved for future use, must be 00
+        aa aa (16 bits) = start value
+        The data is read as a bitstream (see n-Bit). The read value is used as
+        index into a delta-table (defined by data block 7F). The delta value
+        is added to the "state" value, which is also the result value.
+        The "state" value is initialized with aaaa at the beginning.
+    (data) = compressed data, of size (block size - 0x0A - attr size)
+7F     : Decompression Table
+    tt (8 bits) = compression type (see data block 40..7E)
+    st (8 bits) = compression sub-type (see data block 40..7E)
+    bd (8 bits) = Bits decompressed
+    bc (8 bits) = Bits compressed (only used for verifying against
+                  block 40..7E)
+    cc cc (16 bits) = number of following values (with each of size
+                      ceil(bd / 8))
+    (data) = table data, cccc values with a total size of (block size - 0x06)
+    Note: Multiple decompression tables are valid. The player should keep a
+          list of one table per tt and st combination. If there are multiple
+          tables of the same tt/st type, the new one overrides the old one and
+          all following compressed data blocks will use the new table.
+80..BF : ROM/RAM Image dumps (contain usually samples)
+  data block format for ROM dumps:
+    rr rr rr rr (32 bits) = size of the entire ROM
+    ss ss ss ss (32 bits) = start address of data
+    (data) = ROM data, of size (block size - 0x08)
+  The size of the VGM can be decreased a lot by saving only the used parts
+  of the ROM. This is done by saving multiple small ROM data blocks.
+  The start address is the ROM offset where the data will be written, the
+  ROM size is used to allocate space for the ROM (and some chips rely on it).
+C0..DF : RAM writes (for RAM with up to 64 KB)
+  data block format for direct RAM writes:
+    ss ss (16 bits) = start address of data (affected by a chip's banking
+                      registers)
+    (data) = RAM data, of size (block size - 0x02)
+E0..FF : RAM writes (for RAM with more than 64 KB)
+  data block format for direct RAM writes:
+    ss ss ss ss (32 bits) = start address of data (affected by a chip's banking
+                            registers)
+    (data) = RAM data, of size (block size - 0x04)
+
+00 = YM2612 PCM data for use with associated commands
+01 = RF5C68 PCM data for use with associated commands
+02 = RF5C164 PCM data for use with associated commands
+03 = PWM PCM data for use with associated commands
+04 = OKIM6258 ADPCM data for use with associated commands
+05 = HuC6280 PCM data for use with associated commands
+06 = SCSP PCM data for use with associated commands
+07 = NES APU DPCM data for use with associated commands
+40..7E = same as 00..3E, but compressed
+80 = Sega PCM ROM data
+81 = YM2608 DELTA-T ROM data
+82 = YM2610 ADPCM ROM data
+83 = YM2610 DELTA-T ROM data
+84 = YMF278B ROM data
+85 = YMF271 ROM data
+86 = YMZ280B ROM data
+87 = YMF278B RAM data
+88 = Y8950 DELTA-T ROM data
+89 = MultiPCM ROM data
+8A = uPD7759 ROM data
+8B = OKIM6295 ROM data
+8C = K054539 ROM data
+8D = C140 ROM data
+8E = K053260 ROM data
+8F = Q-Sound ROM data
+90 = ES5506 ROM data
+91 = X1-010 ROM data
+92 = C352 ROM data
+93 = GA20 ROM data
+C0 = RF5C68 RAM write
+C1 = RF5C164 RAM write
+C2 = NES APU RAM write
+E0 = SCSP RAM write
+E1 = ES5503 RAM write
+
+All unknown types must be skipped by the player.
+
+
+PCM RAM writes
+--------------
+VGM command 0x68 specifies a PCM RAM write. These are used to write data from
+data blocks to the RAM of a PCM chip. The data block format is:
+
+  0x68 0x66 cc oo oo oo dd dd dd ss ss ss
+
+where:
+  0x68 = VGM command
+  0x66 = compatibility command to make older players stop parsing the stream
+  cc   = chip type (see data block types 00..3F)
+  oo oo oo (24 bits) = read offset in data block
+  dd dd dd (24 bits) = write offset in chip's ram (affected by chip's
+                        registers)
+  ss ss ss (24 bits) = size of data, in bytes
+    Since size can't be zero, a size of 0 bytes means 0x0100 0000 bytes.
+
+All unknown types must be skipped by the player.
+
+
+DAC Stream Control Write
+------------------------
+VGM commands 0x90 to 0x95 specify writes to the DAC Stream Control Driver.
+These are used to stream data from data blocks to the chips via chip writes.
+To use it you must:
+1. Setup the Stream (set chip type and command) - this activates the stream
+2. Set the Stream Data Bank
+3. Set the Stream Frequency
+4. Now you can start the stream, change its frequency, start it again, stop it,
+    etc ...
+
+There are the following commands:
+
+Note: Stream ID 0xFF is reserved and ignored unless noted otherwise.
+
+Setup Stream Control:
+  0x90 ss tt pp cc
+      ss = Stream ID
+      tt = Chip Type (see clock-order in header, e.g. YM2612 = 0x02)
+            bit 7 is used to select the 2nd chip
+      pp cc = write command/register cc at port pp
+      Note: For chips that use Channel Select Registers (like the RF5C-family
+            and the HuC6280), the format is pp cd where pp is the channel
+            number, c is the channel register and d is the data register.
+            If you set pp to FF, the channel select write is skipped.
+
+Set Stream Data:
+  0x91 ss dd ll bb
+      ss = Stream ID
+      dd = Data Bank ID (see data block types 0x00..0x3f)
+      ll = Step Size (how many data is skipped after every write, usually 1)
+            Set to 2, if you're using an interleaved stream (e.g. for
+             left/right channel).
+      bb = Step Base (data offset added to the Start Offset when starting
+            stream playback, usually 0)
+            If you're using an interleaved stream, set it to 0 in one stream
+            and to 1 in the other one.
+      Note: Step Size/Step Step are given in command-data-size
+             (i.e. 1 for YM2612, 2 for PWM), not bytes
+
+Set Stream Frequency:
+  0x92 ss ff ff ff ff
+      ss = Stream ID
+      ff = Frequency (or Sample Rate, in Hz) at which the writes are done
+
+Start Stream:
+  0x93 ss aa aa aa aa mm ll ll ll ll
+      ss = Stream ID
+      aa = Data Start offset in data bank (byte offset in data bank)
+            Note: if set to -1, the Data Start offset is ignored
+      mm = Length Mode (how the Data Length is calculated)
+            00 - ignore (just change current data position)
+            01 - length = number of commands
+            02 - length in msec
+            03 - play until end of data
+            1? - (bit 4) Reverse Mode
+            8? - (bit 7) Loop (automatically restarts when finished)
+      ll = Data Length
+
+Stop Stream:
+  0x94 ss
+      ss = Stream ID
+            Note: 0xFF stops all streams
+
+Start Stream (fast call):
+  0x95 ss bb bb ff
+      ss = Stream ID
+      bb = Block ID (number of the data block that is part of the data bank set
+            with command 0x91)
+      ff = Flags
+            bit 0 - Loop (see command 0x93, mm bit 7)
+            bit 4 - Reverse Mode (see command 0x93)
+
+General Note to the DAC Stream Control:
+Although it may be quite hard to press already streamed data into these
+commands, it makes it very easy to write vgm-creation tools that need to stream
+something. (like YM2612 DAC drums/voices/etc.)
+The DAC Stream Control can use with almost all chips and is NOT limited to
+chips such as YM2612 and PWM.
+
+
+Dual Chip Support
+-----------------
+These chips support two instances of a chip in one vgm:
+PSG, YM2413, YM2612, YM2151, YM2203, YM2608, YM2610, YM3812, YM3526, Y8950,
+YMZ280B, YMF262, YMF278B, YMF271, AY8910, GameBoy DMG, NES APU, MultiPCM,
+uPD7759, OKIM6258, OKIM6295, K051649, K054539, HuC6280, C140, K053260, Pokey,
+SCSP
+
+Dual chip support is activated by setting bit 30 (0x40000000) in the chip's
+clock value. (Note: The PSG needs this bit set for T6W28 mode.)
+
+Dual Chip Support #1:
+The second chip instance is controlled via separate commands.
+
+The second SN76489 PSG uses 0x30 (0x3F for GG Stereo).
+All chips of the YM-family that use command 0x5n use 0xAn for the second chip.
+n is the last digit of the main command.
+e.g. 0x52 (1st chip) -> 0xA2 (2nd chip)
+
+Dual Chip Support #2:
+All other chips use bit 7 (0x80) of the first parameter byte to distinguish
+between the 1st and 2nd chip. (0x00-7F = Chip 1, 0x80-0xFF = chip 2)
+
+Note: The SegaPCM chip has the 2nd-chip-bit in the high byte of the address
+parameter. This is the second parameter byte.
+
+
+Extra Header
+------------
+With VGM v1.70, there was an extra header added. This one has to be placed
+between the usual header and the actual VGM data.
+
+This is the format of the extra header:
+
+      00  01  02  03   04  05  06  07   08  09  0A  0B  0C  0D  0E  0F
+0x00 Header Size    ChpClock OffsetChpVol Offset  
+
+Header Size is the size of the extra header. It has to be 4 or larger,
+depending in the needed offsets.
+
+Then there are two offsets that point to extra header data for:
+- additional Chip Clocks for second chips
+- user-defined chip volumes
+
+
+Chip Clock Header
+-----------------
+1 byte   - Entry Count (chips with extra clocks)
+5 bytes - List Entry 1
+5 bytes - List Entry 2
+...
+
+Each list entry has the format:
+1 byte  - Chip ID (chip order follows the header)
+4 bytes - clock for second chip of the type above
+
+
+Chip Volume Header
+------------------
+1 byte   - Entry Count (chips with user-defined volumes)
+4 bytes - List Entry 1
+4 bytes - List Entry 2
+...
+
+Each list entry has the format:
+1 byte  - Chip ID (chip order follows the header)
+          Note: If bit 7 is set, it's the volume for a paired chip.
+                (e.g. the AY-part of the YM2203)
+1 byte  - Flags
+          Note: If bit 0 is set, it's the volume for the second chip.
+2 bytes - volume for the chip
+          Note: If Bit 15 is 0, this is an absolute volume setting.
+                If Bit 15 is 1, it's relative and the chip volume gets
+                multiplied by ((Value & 0x7FFF) / 0x0100).
+
+
+History
+-------
+1.00
+Initial public release by Dave
+
+1.01
+Rate value added by Maxim; 1.00 files are fully compatible
+
+1.10
+PSG white noise feedback and shift register width parameters added by Maxim,
+with note on how to handle earlier version files.
+Additional wait command added by Maxim with thanks to Steve Snake for the 
+suggestion.
+1.01 files are fully compatible but 1.01 players might have problems
+with 1.10 files, hence the 0.1 version change.
+
+1.50
+VGM data offset added to header by Maxim.
+Data block support added by blargg, to allow for better handling of YM2612 PCM
+data.
+Both of these changes have the potential to cause problems, but are really good
+changes, so the version number has been increased all the way to 1.50.
+
+1.51
+Sega PCM, RF5C68, YM2203, YM2608, YM2610/B, YM3812, YM3526, Y8950, YMF262,
+YMF278B, YMF271, YMZ280B, RF5C164, PWM and AY8910 chips and commands added.
+
+Additional data block types RF5C68 RAM write, RF5C164 RAM write, Sega PCM ROM,
+YM2608 DELTA-T ROM, YM2610 ADPCM ROM, YM2610 DELTA-T ROM, YMF278B ROM,
+YMF271 ROM, YMF271 RAM, YMZ280B ROM and Y8950 DELTA-T ROM Data added.
+
+Data Block Types splitted into 4 categories. (PCM Stream, compressed PCM
+Stream, ROM/RAM Dump, RAM write)
+
+SN76489 Flags and Loop Modifier added.
+
+It is the first time the header size exceeds 0x40 bytes.
+1.51 files are fully compatible to 1.50 players, but there may be problems with
+the new commands.
+
+Note: Dual chip support was added too, but as a "cheat"-feature. The dual-chip
+-bits in the clock values are not compatible to 1.50, but the rest is.
+
+All changes done by Valley Bell.
+
+1.60
+RF5C68, RF5C164 and PWM PCM blocks and compressed data blocks added.
+
+A whole bunch of new commands (PCM RAM write and DAC Stream Control) added.
+
+Volume Modifier and Loop Base added.
+
+The new commands (especially 0x9?) may cause problems with older players.
+
+All changes done by Valley Bell.
+
+1.61
+GameBoy DMG, NES APU, MultiPCM, uPD7759, OKIM6258, OKIM6295, K051649, K051649,
+HuC6280, C140, K053260, Pokey and Q-Sound chips added.
+(including necessary data blocks)
+
+Changed number of operands from 1 to 2 for reserved commands 0x40-0x4E.
+Although they're still unused, old players might handle future vgm versions
+wrongly.
+
+All changes done by Valley Bell.
+
+1.70
+Added extra header with seperate chip clocks for the second one of dual chips
+and chip volume adjustments.
+
+All changes done by Valley Bell.
+
+1.71
+SCSP, WonderSwan, Virtual Boy VSU, SAA1099, ES5503, ES5506, Seta X1-010,
+Namco C352, Irem GA20 added.
+(including necessary ROM data blocks)
+
+Data blocks (type 0x) for OKIM6258, HuC6280, SCSP and NES added.
+VGM v1.61 players should support the data block of their respective chips
+despite their late addition.
+
+All changes done by Valley Bell.

deadbeef-1.9.6.tar.bz2/plugins/gme/gmewrap.cpp Added

deadbeef-1.9.6.tar.bz2/plugins/gme/gmewrap.h Added

deadbeef-0.6.2.tar.bz2/plugins/gtkui/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/COPYING Changed

@@ -1,16 +1,40 @@
-GTK2/3 UI plugin for DeaDBeeF player
-Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+GTK+ user interface for DeaDBeeF Player.
+Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
 
-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 software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-This program is distributed in the hope that it will be useful,
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+GTK - The GIMP Toolkit
+Copyright (C) GTK Developers
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library. If not, see <http://www.gnu.org/licenses/>.
 
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.

deadbeef-0.6.2.tar.bz2/plugins/gtkui/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/Makefile.am Changed

@@ -1,68 +1,71 @@
-gtkuidir = $(libdir)/$(PACKAGE)
-
-#if HAVE_SM
-#if HAVE_ICE
-#SM_SOURCES = smclient/eggdesktopfile.h\
-#	smclient/eggsmclient-private.h\
-#	smclient/eggsmclient.h\
-#	smclient/eggdesktopfile.c\
-#	smclient/eggsmclient-xsmp.c\
-#	smclient/eggsmclient.c
-#SM_LIBADD = $(SM_LIBS) $(ICE_LIBS)
-#SM_CFLAGS = -DEGG_SM_CLIENT_BACKEND_XSMP -DG_LOG_DOMAIN=\""deadbeef"\"
-#endif
-#endif
-
-if OS_OSX
-osx_sources = retina.m
-endif
-
-GTKUI_SOURCES = 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\
-				 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\
-				 widgets.c widgets.h\
-				 ddbseekbar.h ddbequalizer.h ddbcellrenderertextmultiline.h\
-				 ddbseekbar.c ddbequalizer.c ddbcellrenderertextmultiline.c\
-				 gtkuigl.c gtkuigl.h\
- hotkeys.c hotkeys.h\
- actionhandlers.c actionhandlers.h\
- pltmenu.c\
- ctmapping.c ctmapping.h\
- namedicons.c namedicons.h\
-				 $(SM_SOURCES) $(OSXSRC)
+EXTRA_DIST = deadbeef.glade\
+	gtkui.gresources.xml\
+	gtk/menus.ui
+
+GTKUI_SOURCES = \
+ ../../src/utf8.c\
+	actions.c actions.h\
+	callbacks.c callbacks.h\
+	support.c support.h\
+	interface.c interface.h\
+	ddbseekbar.c ddbseekbar.h\
+ 	ddbcellrenderertextmultiline.c ddbcellrenderertextmultiline.h\
+ 	ddbequalizer.c ddbequalizer.h\
+	ddbtabstrip.c ddbtabstrip.h\
+	ddbvolumebar.c ddbvolumebar.h\
+	drawing.h gdkdrawing.c\
+	dspconfig.c dspconfig.h\
+	eq.c eq.h\
+	fileman.c\
+	gtkui.c gtkui.h\
+	gtkui_deletefromdisk.c gtkui_deletefromdisk.h\
+	plmenu.c plmenu.h\
+	pluginconf.c pluginconf.h\
+	progress.c progress.h\
+	rg.c rg.h\
+	search.c search.h\
+	tagwritersettings.c tagwritersettings.h\
+	trkproperties.c trkproperties.h\
+	widgets.c widgets.h\
+	selpropertieswidget.c selpropertieswidget.h\
+	wingeom.c wingeom.h\
+ actionhandlers.c actionhandlers.h\
+ clipboard.c clipboard.h\
+ ctmapping.c ctmapping.h\
+ ddb_splitter.c ddb_splitter.h\
+ ddb_splitter_size_mode.c ddb_splitter_size_mode.h\
+ hotkeys.c hotkeys.h\
+ namedicons.c namedicons.h\
+ pltmenu.c\
+ tfimport.c tfimport.h\
+	covermanager/covermanager.c covermanager/covermanager.h\
+	covermanager/gobjcache.c covermanager/gobjcache.h\
+	covermanager/albumartwidget.c covermanager/albumartwidget.h\
+	playlist/ddblistview.c playlist/ddblistview.h\
+	playlist/ddblistviewheader.c playlist/ddblistviewheader.h\
+	playlist/mainplaylist.c playlist/mainplaylist.h\
+	playlist/playlistcontroller.c playlist/playlistcontroller.h\
+	playlist/playlistrenderer.c playlist/playlistrenderer.h\
+	playlist/plcommon.c playlist/plcommon.h\
+	playlist/searchplaylist.c playlist/searchplaylist.h\
+	prefwin/prefwin.c prefwin/prefwin.h\
+	prefwin/prefwinappearance.c prefwin/prefwinappearance.h\
+	prefwin/prefwinmisc.c prefwin/prefwinmisc.h\
+	prefwin/prefwinnetwork.c prefwin/prefwinnetwork.h\
+	prefwin/prefwinplayback.c prefwin/prefwinplayback.h\
+	prefwin/prefwinplugins.c prefwin/prefwinplugins.h\
+	prefwin/prefwinsound.c prefwin/prefwinsound.h\
+	$(SM_SOURCES) $(OSXSRC)
 
 sdkdir = $(pkgincludedir)
 sdk_HEADERS = gtkui_api.h
 
-EXTRA_DIST = deadbeef.glade
-
-#GTKGLEXT2_LIBS =
-#GTKGLEXT3_LIBS =
-
 if STATICLINK
 if HAVE_GTK2
 if HAVE_GTK3
-pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la ddb_gui_GTK3.la
+pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK3.la
 else
-pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la
+pkglib_LTLIBRARIES = ddb_gui_GTK2.la
 endif
 else
 if HAVE_GTK3
@@ -83,165 +86,39 @@
 endif
 endif
 
-# normal lib
 if HAVE_GTK2
 GTKUI_SOURCES_GTK2 = $(GTKUI_SOURCES)
 
-#	gtkglext-gtk2/gdk/x11/gdkglconfig-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglconfig-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkglcontext-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglcontext-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkgldrawable-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglglxext.c\
-#	gtkglext-gtk2/gdk/x11/gdkglglxext.h\
-#	gtkglext-gtk2/gdk/x11/gdkgloverlay-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkgloverlay-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkglpixmap-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglpixmap-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkglprivate-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkglquery-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglwindow-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglwindow-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkglx.h\
-#	gtkglext-gtk2/gtk/gtkgldebug.h\
-#	gtkglext-gtk2/gtk/gtkgldefs.h\
-#	gtkglext-gtk2/gtk/gtkgl.h\
-#	gtkglext-gtk2/gtk/gtkglinit.c\
-#	gtkglext-gtk2/gtk/gtkglinit.h\
-#	gtkglext-gtk2/gtk/gtkglprivate.h\
-#	gtkglext-gtk2/gtk/gtkglversion.c\
-#	gtkglext-gtk2/gtk/gtkglversion.h\
-#	gtkglext-gtk2/gtk/gtkglwidget.c\
-#	gtkglext-gtk2/gtk/gtkglwidget.h\
-#	gtkglext-gtk2/gdk/gdkglconfig.c\
-#	gtkglext-gtk2/gdk/gdkglconfig.h\
-#	gtkglext-gtk2/gdk/gdkglcontext.c\
-#	gtkglext-gtk2/gdk/gdkglcontext.h\
-#	gtkglext-gtk2/gdk/gdkgldebug.h\
-#	gtkglext-gtk2/gdk/gdkgldefs.h\
-#	gtkglext-gtk2/gdk/gdkgldrawable.c\
-#	gtkglext-gtk2/gdk/gdkgldrawable.h\
-#	gtkglext-gtk2/gdk/gdkglenumtypes.c\
-#	gtkglext-gtk2/gdk/gdkglenumtypes.h\
-#	gtkglext-gtk2/gdk/gdkglext-config.h\
-#	gtkglext-gtk2/gdk/gdkglglext.c\
-#	gtkglext-gtk2/gdk/gdkglglext.h\
-#	gtkglext-gtk2/gdk/gdkgl.h\
-#	gtkglext-gtk2/gdk/gdkglinit.c\
-#	gtkglext-gtk2/gdk/gdkglinit.h\
-#	gtkglext-gtk2/gdk/gdkglpixmap.c\
-#	gtkglext-gtk2/gdk/gdkglpixmap.h\
-#	gtkglext-gtk2/gdk/gdkglprivate.h\
-#	gtkglext-gtk2/gdk/gdkglquery.c\
-#	gtkglext-gtk2/gdk/gdkglquery.h\
-#	gtkglext-gtk2/gdk/gdkglshapes.c\
-#	gtkglext-gtk2/gdk/gdkglshapes.h\
-#	gtkglext-gtk2/gdk/gdkgltokens.h\
-#	gtkglext-gtk2/gdk/gdkgltypes.h\
-#	gtkglext-gtk2/gdk/gdkglversion.c\
-#	gtkglext-gtk2/gdk/gdkglversion.h\
-#	gtkglext-gtk2/gdk/gdkglwindow.c\
-#	gtkglext-gtk2/gdk/gdkglwindow.h\
-#	gtkglext-gtk2/gdk/gdkglfont.h\
-#	gtkglext-gtk2/gdk/glext/common-header.h\
-#	gtkglext-gtk2/gdk/glext/glext-extra.h\
-#	gtkglext-gtk2/gdk/glext/glext.h\
-#	gtkglext-gtk2/gdk/glext/glxext-extra.h\
-#	gtkglext-gtk2/gdk/glext/glxext.h
-
-#GTKGLEXT_CFLAGS_GTK2 = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
-
 ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2)
 ddb_gui_GTK2_la_LDFLAGS = -module -avoid-version
 
-ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
+ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.la ../../shared/libtrkpropertiesutil.la ../../shared/libeqpreset.la ../../shared/libdeletefromdisk.la ../../shared/libtftintutil.la ../../shared/analyzer/libanalyzer.la ../../shared/scope/libscope.la $(JANSSON_LIBS) $(DISPATCH_LIBS)
 
-ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2) -DDDB_WARN_DEPRECATED=1
+ddb_gui_GTK2_la_CFLAGS = -std=c99 -Werror -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
 
 endif
 
 if HAVE_GTK3
-GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES) $(osx_sources)
-
-#	gtkglext-gtk3/gtk/gtkglinit.c\
-#	gtkglext-gtk3/gtk/gtkglversion.c\
-#	gtkglext-gtk3/gtk/gtkglwidget.c\
-#	gtkglext-gtk3/gtk/gtkgldebug.h\
-#	gtkglext-gtk3/gtk/gtkgldefs.h\
-#	gtkglext-gtk3/gtk/gtkgl.h\
-#	gtkglext-gtk3/gtk/gtkglinit.h\
-#	gtkglext-gtk3/gtk/gtkglprivate.h\
-#	gtkglext-gtk3/gtk/gtkglversion.h\
-#	gtkglext-gtk3/gtk/gtkglwidget.h\
-#	gtkglext-gtk3/gdk/gdkglconfig.c\
-#	gtkglext-gtk3/gdk/gdkglconfigimpl.c\
-#	gtkglext-gtk3/gdk/gdkglcontext.c\
-#	gtkglext-gtk3/gdk/gdkglcontextimpl.c\
-#	gtkglext-gtk3/gdk/gdkgldrawable.c\
-#	gtkglext-gtk3/gdk/gdkglinit.c\
-#	gtkglext-gtk3/gdk/gdkglquery.c\
-#	gtkglext-gtk3/gdk/gdkglversion.c\
-#	gtkglext-gtk3/gdk/gdkglwindow.c\
-#	gtkglext-gtk3/gdk/gdkglwindowimpl.c\
-#	gtkglext-gtk3/gdk/gdkglconfig.h\
-#	gtkglext-gtk3/gdk/gdkglconfigimpl.h\
-#	gtkglext-gtk3/gdk/gdkglcontext.h\
-#	gtkglext-gtk3/gdk/gdkglcontextimpl.h\
-#	gtkglext-gtk3/gdk/gdkgldebug.h\
-#	gtkglext-gtk3/gdk/gdkgldefs.h\
-#	gtkglext-gtk3/gdk/gdkgldrawable.h\
-#	gtkglext-gtk3/gdk/gdkglenumtypes.h\
-#	gtkglext-gtk3/gdk/gdkglext-config.h\
-#	gtkglext-gtk3/gdk/gdkgl.h\
-#	gtkglext-gtk3/gdk/gdkglinit.h\
-#	gtkglext-gtk3/gdk/gdkglprivate.h\
-#	gtkglext-gtk3/gdk/gdkglquery.h\
-#	gtkglext-gtk3/gdk/gdkgltokens.h\
-#	gtkglext-gtk3/gdk/gdkgltypes.h\
-#	gtkglext-gtk3/gdk/gdkglversion.h\
-#	gtkglext-gtk3/gdk/gdkglwindow.h\
-#	gtkglext-gtk3/gdk/gdkglwindowimpl.h\
-#	gtkglext-gtk3/gdk/x11/gdkglconfig-x11.c\
-#	gtkglext-gtk3/gdk/x11/gdkglcontext-x11.c\
-#	gtkglext-gtk3/gdk/x11/gdkglquery-x11.c\
-#	gtkglext-gtk3/gdk/x11/gdkglwindow-x11.c\
-#	gtkglext-gtk3/gdk/x11/gdkx11glconfig.c\
-#	gtkglext-gtk3/gdk/x11/gdkx11glcontext.c\
-#	gtkglext-gtk3/gdk/x11/gdkx11glwindow.c\
-#	gtkglext-gtk3/gdk/x11/gdkglconfig-x11.h\
-#	gtkglext-gtk3/gdk/x11/gdkglcontext-x11.h\
-#	gtkglext-gtk3/gdk/x11/gdkglprivate-x11.h\
-#	gtkglext-gtk3/gdk/x11/gdkglquery-x11.h\
-#	gtkglext-gtk3/gdk/x11/gdkglwindow-x11.h\
-#	gtkglext-gtk3/gdk/x11/gdkglx.h\
-#	gtkglext-gtk3/gdk/x11/gdkx11glconfig.h\
-#	gtkglext-gtk3/gdk/x11/gdkx11glcontext.h\
-#	gtkglext-gtk3/gdk/x11/gdkx11glquery.h\
-#	gtkglext-gtk3/gdk/x11/gdkx11glwindow.h\
-#	gtkglext-gtk3/gdk/gdkglext-config.h\
-#	gtkglext-gtk3/gdk/gdkglversion.h
-
-GTKGLEXT_CFLAGS_GTK3 = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
+GTKUI_SOURCES_GTK3 = deadbeefapp.c deadbeefapp.h $(GTKUI_SOURCES)
 
 ddb_gui_GTK3_la_LDFLAGS = -module -avoid-version
 
 ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
-ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS)
-ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
-ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
+ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.la ../../shared/libtrkpropertiesutil.la ../../shared/libeqpreset.la ../../shared/libdeletefromdisk.la ../../shared/libtftintutil.la ../../shared/analyzer/libanalyzer.la ../../shared/scope/libscope.la $(JANSSON_LIBS) $(DISPATCH_LIBS)
+ddb_gui_GTK3_la_CFLAGS = -std=c99 -Werror -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
+ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS)
 
-endif
-
-# fallback lib
-if STATICLINK
-GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
+nodist_ddb_gui_GTK3_la_SOURCES = gtkui-gresources.c
 
-ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES_GTK2)
-ddb_gui_GTK2_fallback_la_LDFLAGS = -module -avoid-version
+BUILT_SOURCES=gtkui-gresources.c
+CLEANFILES=gtkui-gresources.c
 
-ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
+resource_files = \
+	gtkui.gresources.xml	\
+	gtk/menus.ui
 
-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 $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2)
+gtkui-gresources.c: $(resource_files)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
 endif

deadbeef-0.6.2.tar.bz2/plugins/gtkui/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
 am__make_running_with_option = \
 case $${target_option-} in \
 ?) ;; \
@@ -80,31 +90,27 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = plugins/gtkui
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/depcomp $(sdk_HEADERS) COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
 	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/intmax.m4 \
-	$(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/stdint_h.m4 \
-	$(top_srcdir)/m4/threadlib.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
-	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(sdk_HEADERS) $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -138,112 +144,96 @@
 }
 am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sdkdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
-@STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_DEPENDENCIES = \
-@STATICLINK_TRUE@	../libparser/libparser.a
-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 \
-	search.c search.h fileman.c pluginconf.c 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 widgets.c widgets.h ddbseekbar.h \
-	ddbequalizer.h ddbcellrenderertextmultiline.h ddbseekbar.c \
-	ddbequalizer.c ddbcellrenderertextmultiline.c gtkuigl.c \
-	gtkuigl.h hotkeys.c hotkeys.h actionhandlers.c \
-	actionhandlers.h pltmenu.c ctmapping.c ctmapping.h \
-	namedicons.c namedicons.h
-am__objects_1 = ddb_gui_GTK2_fallback_la-gtkui.lo \
-	ddb_gui_GTK2_fallback_la-callbacks.lo \
-	ddb_gui_GTK2_fallback_la-interface.lo \
-	ddb_gui_GTK2_fallback_la-support.lo \
-	ddb_gui_GTK2_fallback_la-ddblistview.lo \
-	ddb_gui_GTK2_fallback_la-mainplaylist.lo \
-	ddb_gui_GTK2_fallback_la-gdkdrawing.lo \
-	ddb_gui_GTK2_fallback_la-progress.lo \
-	ddb_gui_GTK2_fallback_la-search.lo \
-	ddb_gui_GTK2_fallback_la-fileman.lo \
-	ddb_gui_GTK2_fallback_la-pluginconf.lo \
-	ddb_gui_GTK2_fallback_la-ddbtabstrip.lo \
-	ddb_gui_GTK2_fallback_la-ddbvolumebar.lo \
-	ddb_gui_GTK2_fallback_la-trkproperties.lo \
-	ddb_gui_GTK2_fallback_la-coverart.lo \
-	ddb_gui_GTK2_fallback_la-plcommon.lo \
-	ddb_gui_GTK2_fallback_la-prefwin.lo \
-	ddb_gui_GTK2_fallback_la-eq.lo \
-	ddb_gui_GTK2_fallback_la-actions.lo \
-	ddb_gui_GTK2_fallback_la-dspconfig.lo \
-	ddb_gui_GTK2_fallback_la-tagwritersettings.lo \
-	ddb_gui_GTK2_fallback_la-wingeom.lo \
-	ddb_gui_GTK2_fallback_la-widgets.lo \
-	ddb_gui_GTK2_fallback_la-ddbseekbar.lo \
-	ddb_gui_GTK2_fallback_la-ddbequalizer.lo \
-	ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.lo \
-	ddb_gui_GTK2_fallback_la-gtkuigl.lo \
-	ddb_gui_GTK2_fallback_la-hotkeys.lo \
-	ddb_gui_GTK2_fallback_la-actionhandlers.lo \
-	ddb_gui_GTK2_fallback_la-pltmenu.lo \
-	ddb_gui_GTK2_fallback_la-ctmapping.lo \
-	ddb_gui_GTK2_fallback_la-namedicons.lo
+am__DEPENDENCIES_1 =
+@HAVE_GTK2_TRUE@ddb_gui_GTK2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@HAVE_GTK2_TRUE@	../libparser/libparser.la \
+@HAVE_GTK2_TRUE@	../../shared/libtrkpropertiesutil.la \
+@HAVE_GTK2_TRUE@	../../shared/libeqpreset.la \
+@HAVE_GTK2_TRUE@	../../shared/libdeletefromdisk.la \
+@HAVE_GTK2_TRUE@	../../shared/libtftintutil.la \
+@HAVE_GTK2_TRUE@	../../shared/analyzer/libanalyzer.la \
+@HAVE_GTK2_TRUE@	../../shared/scope/libscope.la \
+@HAVE_GTK2_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__ddb_gui_GTK2_la_SOURCES_DIST = ../../src/utf8.c actions.c \
+	actions.h callbacks.c callbacks.h support.c support.h \
+	interface.c interface.h ddbseekbar.c ddbseekbar.h \
+	ddbcellrenderertextmultiline.c ddbcellrenderertextmultiline.h \
+	ddbequalizer.c ddbequalizer.h ddbtabstrip.c ddbtabstrip.h \
+	ddbvolumebar.c ddbvolumebar.h drawing.h gdkdrawing.c \
+	dspconfig.c dspconfig.h eq.c eq.h fileman.c gtkui.c gtkui.h \
+	gtkui_deletefromdisk.c gtkui_deletefromdisk.h plmenu.c \
+	plmenu.h pluginconf.c pluginconf.h progress.c progress.h rg.c \
+	rg.h search.c search.h tagwritersettings.c tagwritersettings.h \
+	trkproperties.c trkproperties.h widgets.c widgets.h \
+	selpropertieswidget.c selpropertieswidget.h wingeom.c \
+	wingeom.h actionhandlers.c actionhandlers.h clipboard.c \
+	clipboard.h ctmapping.c ctmapping.h ddb_splitter.c \
+	ddb_splitter.h ddb_splitter_size_mode.c \
+	ddb_splitter_size_mode.h hotkeys.c hotkeys.h namedicons.c \
+	namedicons.h pltmenu.c tfimport.c tfimport.h \
+	covermanager/covermanager.c covermanager/covermanager.h \
+	covermanager/gobjcache.c covermanager/gobjcache.h \
+	covermanager/albumartwidget.c covermanager/albumartwidget.h \
+	playlist/ddblistview.c playlist/ddblistview.h \
+	playlist/ddblistviewheader.c playlist/ddblistviewheader.h \
+	playlist/mainplaylist.c playlist/mainplaylist.h \
+	playlist/playlistcontroller.c playlist/playlistcontroller.h \
+	playlist/playlistrenderer.c playlist/playlistrenderer.h \
+	playlist/plcommon.c playlist/plcommon.h \
+	playlist/searchplaylist.c playlist/searchplaylist.h \
+	prefwin/prefwin.c prefwin/prefwin.h \
+	prefwin/prefwinappearance.c prefwin/prefwinappearance.h \
+	prefwin/prefwinmisc.c prefwin/prefwinmisc.h \
+	prefwin/prefwinnetwork.c prefwin/prefwinnetwork.h \
+	prefwin/prefwinplayback.c prefwin/prefwinplayback.h \
+	prefwin/prefwinplugins.c prefwin/prefwinplugins.h \
+	prefwin/prefwinsound.c prefwin/prefwinsound.h
+am__dirstamp = $(am__leading_dot)dirstamp
+am__objects_1 = ../../src/ddb_gui_GTK2_la-utf8.lo \
+	ddb_gui_GTK2_la-actions.lo ddb_gui_GTK2_la-callbacks.lo \
+	ddb_gui_GTK2_la-support.lo ddb_gui_GTK2_la-interface.lo \
+	ddb_gui_GTK2_la-ddbseekbar.lo \
+	ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo \
+	ddb_gui_GTK2_la-ddbequalizer.lo ddb_gui_GTK2_la-ddbtabstrip.lo \
+	ddb_gui_GTK2_la-ddbvolumebar.lo ddb_gui_GTK2_la-gdkdrawing.lo \
+	ddb_gui_GTK2_la-dspconfig.lo ddb_gui_GTK2_la-eq.lo \
+	ddb_gui_GTK2_la-fileman.lo ddb_gui_GTK2_la-gtkui.lo \
+	ddb_gui_GTK2_la-gtkui_deletefromdisk.lo \
+	ddb_gui_GTK2_la-plmenu.lo ddb_gui_GTK2_la-pluginconf.lo \
+	ddb_gui_GTK2_la-progress.lo ddb_gui_GTK2_la-rg.lo \
+	ddb_gui_GTK2_la-search.lo ddb_gui_GTK2_la-tagwritersettings.lo \
+	ddb_gui_GTK2_la-trkproperties.lo ddb_gui_GTK2_la-widgets.lo \
+	ddb_gui_GTK2_la-selpropertieswidget.lo \
+	ddb_gui_GTK2_la-wingeom.lo ddb_gui_GTK2_la-actionhandlers.lo \
+	ddb_gui_GTK2_la-clipboard.lo ddb_gui_GTK2_la-ctmapping.lo \
+	ddb_gui_GTK2_la-ddb_splitter.lo \
+	ddb_gui_GTK2_la-ddb_splitter_size_mode.lo \
+	ddb_gui_GTK2_la-hotkeys.lo ddb_gui_GTK2_la-namedicons.lo \
+	ddb_gui_GTK2_la-pltmenu.lo ddb_gui_GTK2_la-tfimport.lo \
+	covermanager/ddb_gui_GTK2_la-covermanager.lo \
+	covermanager/ddb_gui_GTK2_la-gobjcache.lo \
+	covermanager/ddb_gui_GTK2_la-albumartwidget.lo \
+	playlist/ddb_gui_GTK2_la-ddblistview.lo \
+	playlist/ddb_gui_GTK2_la-ddblistviewheader.lo \
+	playlist/ddb_gui_GTK2_la-mainplaylist.lo \
+	playlist/ddb_gui_GTK2_la-playlistcontroller.lo \
+	playlist/ddb_gui_GTK2_la-playlistrenderer.lo \
+	playlist/ddb_gui_GTK2_la-plcommon.lo \
+	playlist/ddb_gui_GTK2_la-searchplaylist.lo \
+	prefwin/ddb_gui_GTK2_la-prefwin.lo \
+	prefwin/ddb_gui_GTK2_la-prefwinappearance.lo \
+	prefwin/ddb_gui_GTK2_la-prefwinmisc.lo \
+	prefwin/ddb_gui_GTK2_la-prefwinnetwork.lo \
+	prefwin/ddb_gui_GTK2_la-prefwinplayback.lo \
+	prefwin/ddb_gui_GTK2_la-prefwinplugins.lo \
+	prefwin/ddb_gui_GTK2_la-prefwinsound.lo
 @HAVE_GTK2_TRUE@am__objects_2 = $(am__objects_1)
-@STATICLINK_TRUE@am_ddb_gui_GTK2_fallback_la_OBJECTS = \
-@STATICLINK_TRUE@	$(am__objects_2)
-ddb_gui_GTK2_fallback_la_OBJECTS = \
-	$(am_ddb_gui_GTK2_fallback_la_OBJECTS)
+@HAVE_GTK2_TRUE@am_ddb_gui_GTK2_la_OBJECTS = $(am__objects_2)
+ddb_gui_GTK2_la_OBJECTS = $(am_ddb_gui_GTK2_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-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_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_TRUE@am_ddb_gui_GTK2_fallback_la_rpath = \
-@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_TRUE@	-rpath \
-@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_TRUE@	$(pkglibdir)
-@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@am_ddb_gui_GTK2_fallback_la_rpath = \
-@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@	-rpath \
-@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@	$(pkglibdir)
-am__DEPENDENCIES_1 =
-@HAVE_GTK2_TRUE@ddb_gui_GTK2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@HAVE_GTK2_TRUE@	../libparser/libparser.a
-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 \
-	fileman.c pluginconf.c 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 widgets.c widgets.h ddbseekbar.h ddbequalizer.h \
-	ddbcellrenderertextmultiline.h ddbseekbar.c ddbequalizer.c \
-	ddbcellrenderertextmultiline.c gtkuigl.c gtkuigl.h hotkeys.c \
-	hotkeys.h actionhandlers.c actionhandlers.h pltmenu.c \
-	ctmapping.c ctmapping.h namedicons.c namedicons.h
-am__objects_3 = ddb_gui_GTK2_la-gtkui.lo ddb_gui_GTK2_la-callbacks.lo \
-	ddb_gui_GTK2_la-interface.lo ddb_gui_GTK2_la-support.lo \
-	ddb_gui_GTK2_la-ddblistview.lo ddb_gui_GTK2_la-mainplaylist.lo \
-	ddb_gui_GTK2_la-gdkdrawing.lo ddb_gui_GTK2_la-progress.lo \
-	ddb_gui_GTK2_la-search.lo ddb_gui_GTK2_la-fileman.lo \
-	ddb_gui_GTK2_la-pluginconf.lo ddb_gui_GTK2_la-ddbtabstrip.lo \
-	ddb_gui_GTK2_la-ddbvolumebar.lo \
-	ddb_gui_GTK2_la-trkproperties.lo ddb_gui_GTK2_la-coverart.lo \
-	ddb_gui_GTK2_la-plcommon.lo ddb_gui_GTK2_la-prefwin.lo \
-	ddb_gui_GTK2_la-eq.lo ddb_gui_GTK2_la-actions.lo \
-	ddb_gui_GTK2_la-dspconfig.lo \
-	ddb_gui_GTK2_la-tagwritersettings.lo \
-	ddb_gui_GTK2_la-wingeom.lo ddb_gui_GTK2_la-widgets.lo \
-	ddb_gui_GTK2_la-ddbseekbar.lo ddb_gui_GTK2_la-ddbequalizer.lo \
-	ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo \
-	ddb_gui_GTK2_la-gtkuigl.lo ddb_gui_GTK2_la-hotkeys.lo \
-	ddb_gui_GTK2_la-actionhandlers.lo ddb_gui_GTK2_la-pltmenu.lo \
-	ddb_gui_GTK2_la-ctmapping.lo ddb_gui_GTK2_la-namedicons.lo
-@HAVE_GTK2_TRUE@am__objects_4 = $(am__objects_3)
-@HAVE_GTK2_TRUE@am_ddb_gui_GTK2_la_OBJECTS = $(am__objects_4)
-ddb_gui_GTK2_la_OBJECTS = $(am_ddb_gui_GTK2_la_OBJECTS)
 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) \
@@ -261,47 +251,97 @@
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@	-rpath \
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@	$(pkglibdir)
 @HAVE_GTK3_TRUE@ddb_gui_GTK3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@HAVE_GTK3_TRUE@	../libparser/libparser.a
-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 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 widgets.c widgets.h ddbseekbar.h ddbequalizer.h \
-	ddbcellrenderertextmultiline.h ddbseekbar.c ddbequalizer.c \
-	ddbcellrenderertextmultiline.c gtkuigl.c gtkuigl.h hotkeys.c \
-	hotkeys.h actionhandlers.c actionhandlers.h pltmenu.c \
-	ctmapping.c ctmapping.h namedicons.c namedicons.h retina.m
-am__objects_5 = ddb_gui_GTK3_la-gtkui.lo ddb_gui_GTK3_la-callbacks.lo \
-	ddb_gui_GTK3_la-interface.lo ddb_gui_GTK3_la-support.lo \
-	ddb_gui_GTK3_la-ddblistview.lo ddb_gui_GTK3_la-mainplaylist.lo \
-	ddb_gui_GTK3_la-gdkdrawing.lo ddb_gui_GTK3_la-progress.lo \
-	ddb_gui_GTK3_la-search.lo ddb_gui_GTK3_la-fileman.lo \
-	ddb_gui_GTK3_la-pluginconf.lo ddb_gui_GTK3_la-ddbtabstrip.lo \
-	ddb_gui_GTK3_la-ddbvolumebar.lo \
-	ddb_gui_GTK3_la-trkproperties.lo ddb_gui_GTK3_la-coverart.lo \
-	ddb_gui_GTK3_la-plcommon.lo ddb_gui_GTK3_la-prefwin.lo \
-	ddb_gui_GTK3_la-eq.lo ddb_gui_GTK3_la-actions.lo \
-	ddb_gui_GTK3_la-dspconfig.lo \
-	ddb_gui_GTK3_la-tagwritersettings.lo \
-	ddb_gui_GTK3_la-wingeom.lo ddb_gui_GTK3_la-widgets.lo \
-	ddb_gui_GTK3_la-ddbseekbar.lo ddb_gui_GTK3_la-ddbequalizer.lo \
+@HAVE_GTK3_TRUE@	../libparser/libparser.la \
+@HAVE_GTK3_TRUE@	../../shared/libtrkpropertiesutil.la \
+@HAVE_GTK3_TRUE@	../../shared/libeqpreset.la \
+@HAVE_GTK3_TRUE@	../../shared/libdeletefromdisk.la \
+@HAVE_GTK3_TRUE@	../../shared/libtftintutil.la \
+@HAVE_GTK3_TRUE@	../../shared/analyzer/libanalyzer.la \
+@HAVE_GTK3_TRUE@	../../shared/scope/libscope.la \
+@HAVE_GTK3_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am__ddb_gui_GTK3_la_SOURCES_DIST = deadbeefapp.c deadbeefapp.h \
+	../../src/utf8.c actions.c actions.h callbacks.c callbacks.h \
+	support.c support.h interface.c interface.h ddbseekbar.c \
+	ddbseekbar.h ddbcellrenderertextmultiline.c \
+	ddbcellrenderertextmultiline.h ddbequalizer.c ddbequalizer.h \
+	ddbtabstrip.c ddbtabstrip.h ddbvolumebar.c ddbvolumebar.h \
+	drawing.h gdkdrawing.c dspconfig.c dspconfig.h eq.c eq.h \
+	fileman.c gtkui.c gtkui.h gtkui_deletefromdisk.c \
+	gtkui_deletefromdisk.h plmenu.c plmenu.h pluginconf.c \
+	pluginconf.h progress.c progress.h rg.c rg.h search.c search.h \
+	tagwritersettings.c tagwritersettings.h trkproperties.c \
+	trkproperties.h widgets.c widgets.h selpropertieswidget.c \
+	selpropertieswidget.h wingeom.c wingeom.h actionhandlers.c \
+	actionhandlers.h clipboard.c clipboard.h ctmapping.c \
+	ctmapping.h ddb_splitter.c ddb_splitter.h \
+	ddb_splitter_size_mode.c ddb_splitter_size_mode.h hotkeys.c \
+	hotkeys.h namedicons.c namedicons.h pltmenu.c tfimport.c \
+	tfimport.h covermanager/covermanager.c \
+	covermanager/covermanager.h covermanager/gobjcache.c \
+	covermanager/gobjcache.h covermanager/albumartwidget.c \
+	covermanager/albumartwidget.h playlist/ddblistview.c \
+	playlist/ddblistview.h playlist/ddblistviewheader.c \
+	playlist/ddblistviewheader.h playlist/mainplaylist.c \
+	playlist/mainplaylist.h playlist/playlistcontroller.c \
+	playlist/playlistcontroller.h playlist/playlistrenderer.c \
+	playlist/playlistrenderer.h playlist/plcommon.c \
+	playlist/plcommon.h playlist/searchplaylist.c \
+	playlist/searchplaylist.h prefwin/prefwin.c prefwin/prefwin.h \
+	prefwin/prefwinappearance.c prefwin/prefwinappearance.h \
+	prefwin/prefwinmisc.c prefwin/prefwinmisc.h \
+	prefwin/prefwinnetwork.c prefwin/prefwinnetwork.h \
+	prefwin/prefwinplayback.c prefwin/prefwinplayback.h \
+	prefwin/prefwinplugins.c prefwin/prefwinplugins.h \
+	prefwin/prefwinsound.c prefwin/prefwinsound.h
+am__objects_3 = ../../src/ddb_gui_GTK3_la-utf8.lo \
+	ddb_gui_GTK3_la-actions.lo ddb_gui_GTK3_la-callbacks.lo \
+	ddb_gui_GTK3_la-support.lo ddb_gui_GTK3_la-interface.lo \
+	ddb_gui_GTK3_la-ddbseekbar.lo \
 	ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo \
-	ddb_gui_GTK3_la-gtkuigl.lo ddb_gui_GTK3_la-hotkeys.lo \
-	ddb_gui_GTK3_la-actionhandlers.lo ddb_gui_GTK3_la-pltmenu.lo \
-	ddb_gui_GTK3_la-ctmapping.lo ddb_gui_GTK3_la-namedicons.lo
-@OS_OSX_TRUE@am__objects_6 = ddb_gui_GTK3_la-retina.lo
-@HAVE_GTK3_TRUE@am__objects_7 = $(am__objects_5) $(am__objects_6)
-@HAVE_GTK3_TRUE@am_ddb_gui_GTK3_la_OBJECTS = $(am__objects_7)
-ddb_gui_GTK3_la_OBJECTS = $(am_ddb_gui_GTK3_la_OBJECTS)
-ddb_gui_GTK3_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(OBJCLD) \
-	$(ddb_gui_GTK3_la_OBJCFLAGS) $(OBJCFLAGS) \
-	$(ddb_gui_GTK3_la_LDFLAGS) $(LDFLAGS) -o $@
+	ddb_gui_GTK3_la-ddbequalizer.lo ddb_gui_GTK3_la-ddbtabstrip.lo \
+	ddb_gui_GTK3_la-ddbvolumebar.lo ddb_gui_GTK3_la-gdkdrawing.lo \
+	ddb_gui_GTK3_la-dspconfig.lo ddb_gui_GTK3_la-eq.lo \
+	ddb_gui_GTK3_la-fileman.lo ddb_gui_GTK3_la-gtkui.lo \
+	ddb_gui_GTK3_la-gtkui_deletefromdisk.lo \
+	ddb_gui_GTK3_la-plmenu.lo ddb_gui_GTK3_la-pluginconf.lo \
+	ddb_gui_GTK3_la-progress.lo ddb_gui_GTK3_la-rg.lo \
+	ddb_gui_GTK3_la-search.lo ddb_gui_GTK3_la-tagwritersettings.lo \
+	ddb_gui_GTK3_la-trkproperties.lo ddb_gui_GTK3_la-widgets.lo \
+	ddb_gui_GTK3_la-selpropertieswidget.lo \
+	ddb_gui_GTK3_la-wingeom.lo ddb_gui_GTK3_la-actionhandlers.lo \
+	ddb_gui_GTK3_la-clipboard.lo ddb_gui_GTK3_la-ctmapping.lo \
+	ddb_gui_GTK3_la-ddb_splitter.lo \
+	ddb_gui_GTK3_la-ddb_splitter_size_mode.lo \
+	ddb_gui_GTK3_la-hotkeys.lo ddb_gui_GTK3_la-namedicons.lo \
+	ddb_gui_GTK3_la-pltmenu.lo ddb_gui_GTK3_la-tfimport.lo \
+	covermanager/ddb_gui_GTK3_la-covermanager.lo \
+	covermanager/ddb_gui_GTK3_la-gobjcache.lo \
+	covermanager/ddb_gui_GTK3_la-albumartwidget.lo \
+	playlist/ddb_gui_GTK3_la-ddblistview.lo \
+	playlist/ddb_gui_GTK3_la-ddblistviewheader.lo \
+	playlist/ddb_gui_GTK3_la-mainplaylist.lo \
+	playlist/ddb_gui_GTK3_la-playlistcontroller.lo \
+	playlist/ddb_gui_GTK3_la-playlistrenderer.lo \
+	playlist/ddb_gui_GTK3_la-plcommon.lo \
+	playlist/ddb_gui_GTK3_la-searchplaylist.lo \
+	prefwin/ddb_gui_GTK3_la-prefwin.lo \
+	prefwin/ddb_gui_GTK3_la-prefwinappearance.lo \
+	prefwin/ddb_gui_GTK3_la-prefwinmisc.lo \
+	prefwin/ddb_gui_GTK3_la-prefwinnetwork.lo \
+	prefwin/ddb_gui_GTK3_la-prefwinplayback.lo \
+	prefwin/ddb_gui_GTK3_la-prefwinplugins.lo \
+	prefwin/ddb_gui_GTK3_la-prefwinsound.lo
+@HAVE_GTK3_TRUE@am__objects_4 = ddb_gui_GTK3_la-deadbeefapp.lo \
+@HAVE_GTK3_TRUE@	$(am__objects_3)
+@HAVE_GTK3_TRUE@am_ddb_gui_GTK3_la_OBJECTS = $(am__objects_4)
+@HAVE_GTK3_TRUE@nodist_ddb_gui_GTK3_la_OBJECTS = \
+@HAVE_GTK3_TRUE@	ddb_gui_GTK3_la-gtkui-gresources.lo
+ddb_gui_GTK3_la_OBJECTS = $(am_ddb_gui_GTK3_la_OBJECTS) \
+	$(nodist_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@@STATICLINK_FALSE@am_ddb_gui_GTK3_la_rpath = \
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@	-rpath \
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@	$(pkglibdir)
@@ -327,9 +367,8 @@
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -348,28 +387,9 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo " CCLD " $@;
 am__v_CCLD_1 = 
-OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
-LTOBJCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_OBJCFLAGS) $(OBJCFLAGS)
-AM_V_OBJC = $(am__v_OBJC_@AM_V@)
-am__v_OBJC_ = $(am__v_OBJC_@AM_DEFAULT_V@)
-am__v_OBJC_0 = @echo " OBJC " $@;
-am__v_OBJC_1 = 
-OBJCLD = $(OBJC)
-OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_OBJCLD = $(am__v_OBJCLD_@AM_V@)
-am__v_OBJCLD_ = $(am__v_OBJCLD_@AM_DEFAULT_V@)
-am__v_OBJCLD_0 = @echo " OBJCLD " $@;
-am__v_OBJCLD_1 = 
-SOURCES = $(ddb_gui_GTK2_fallback_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) \
+SOURCES = $(ddb_gui_GTK2_la_SOURCES) $(ddb_gui_GTK3_la_SOURCES) \
+	$(nodist_ddb_gui_GTK3_la_SOURCES)
+DIST_SOURCES = $(am__ddb_gui_GTK2_la_SOURCES_DIST) \
 	$(am__ddb_gui_GTK3_la_SOURCES_DIST)
 am__can_run_installinfo = \
 case $$AM_UPDATE_INFO_DIR in \
@@ -396,9 +416,11 @@
 done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 ALSA_DEPS_CFLAGS = @ALSA_DEPS_CFLAGS@
 ALSA_DEPS_LIBS = @ALSA_DEPS_LIBS@
@@ -412,7 +434,6 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CDDA_CFLAGS = @CDDA_CFLAGS@
 CDDA_LIBS = @CDDA_LIBS@
 CFLAGS = @CFLAGS@
@@ -424,14 +445,14 @@
 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@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
@@ -453,6 +474,7 @@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIBC2 = @GLIBC2@
 GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -460,8 +482,6 @@
 GTK2_DEPS_LIBS = @GTK2_DEPS_LIBS@
 GTK3_DEPS_CFLAGS = @GTK3_DEPS_CFLAGS@
 GTK3_DEPS_LIBS = @GTK3_DEPS_LIBS@
-GTK_MAC_CFLAGS = @GTK_MAC_CFLAGS@
-GTK_MAC_LIBS = @GTK_MAC_LIBS@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
 HAVE_NEWLOCALE = @HAVE_NEWLOCALE@
 HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
@@ -472,8 +492,6 @@
 HOTKEYS_CFLAGS = @HOTKEYS_CFLAGS@
 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@
@@ -494,11 +512,10 @@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
-INTL_LIBS = @INTL_LIBS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JPEG_DEPS_CFLAGS = @JPEG_DEPS_CFLAGS@
-JPEG_DEPS_LIBS = @JPEG_DEPS_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIB = @LIB@
@@ -523,12 +540,15 @@
 LTLIBOBJS = @LTLIBOBJS@
 LTLIBPTH = @LTLIBPTH@
 LTLIBTHREAD = @LTLIBTHREAD@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAD_CFLAGS = @MAD_CFLAGS@
 MAD_LIBS = @MAD_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -538,12 +558,13 @@
 NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
 NOTIFY_LIBS = @NOTIFY_LIBS@
 OBJC = @OBJC@
-OBJCDEPMODE = @OBJCDEPMODE@
 OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OGG_CFLAGS = @OGG_CFLAGS@
 OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
 OSS_CFLAGS = @OSS_CFLAGS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -555,12 +576,12 @@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLUGINS_DIRS = @PLUGINS_DIRS@
-PNG_DEPS_CFLAGS = @PNG_DEPS_CFLAGS@
-PNG_DEPS_LIBS = @PNG_DEPS_LIBS@
 POSUB = @POSUB@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
 PULSE_DEPS_CFLAGS = @PULSE_DEPS_CFLAGS@
@@ -575,8 +596,6 @@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-VFS_CURL_CFLAGS = @VFS_CURL_CFLAGS@
-VFS_CURL_LIBS = @VFS_CURL_LIBS@
 VORBIS_CFLAGS = @VORBIS_CFLAGS@
 VORBIS_LIBS = @VORBIS_LIBS@
 WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
@@ -601,9 +620,7 @@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_ct_OBJC = @ac_ct_OBJC@
-am__include = @am__include@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -640,6 +657,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -648,212 +666,96 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-gtkuidir = $(libdir)/$(PACKAGE)
-
-#if HAVE_SM
-#if HAVE_ICE
-#SM_SOURCES = smclient/eggdesktopfile.h\
-#	smclient/eggsmclient-private.h\
-#	smclient/eggsmclient.h\
-#	smclient/eggdesktopfile.c\
-#	smclient/eggsmclient-xsmp.c\
-#	smclient/eggsmclient.c
-#SM_LIBADD = $(SM_LIBS) $(ICE_LIBS)
-#SM_CFLAGS = -DEGG_SM_CLIENT_BACKEND_XSMP -DG_LOG_DOMAIN=\""deadbeef"\"
-#endif
-#endif
-@OS_OSX_TRUE@osx_sources = retina.m
-GTKUI_SOURCES = 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\
-				 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\
-				 widgets.c widgets.h\
-				 ddbseekbar.h ddbequalizer.h ddbcellrenderertextmultiline.h\
-				 ddbseekbar.c ddbequalizer.c ddbcellrenderertextmultiline.c\
-				 gtkuigl.c gtkuigl.h\
- hotkeys.c hotkeys.h\
- actionhandlers.c actionhandlers.h\
- pltmenu.c\
- ctmapping.c ctmapping.h\
- namedicons.c namedicons.h\
-				 $(SM_SOURCES) $(OSXSRC)
+EXTRA_DIST = deadbeef.glade\
+	gtkui.gresources.xml\
+	gtk/menus.ui
+
+GTKUI_SOURCES = \
+ ../../src/utf8.c\
+	actions.c actions.h\
+	callbacks.c callbacks.h\
+	support.c support.h\
+	interface.c interface.h\
+	ddbseekbar.c ddbseekbar.h\
+ 	ddbcellrenderertextmultiline.c ddbcellrenderertextmultiline.h\
+ 	ddbequalizer.c ddbequalizer.h\
+	ddbtabstrip.c ddbtabstrip.h\
+	ddbvolumebar.c ddbvolumebar.h\
+	drawing.h gdkdrawing.c\
+	dspconfig.c dspconfig.h\
+	eq.c eq.h\
+	fileman.c\
+	gtkui.c gtkui.h\
+	gtkui_deletefromdisk.c gtkui_deletefromdisk.h\
+	plmenu.c plmenu.h\
+	pluginconf.c pluginconf.h\
+	progress.c progress.h\
+	rg.c rg.h\
+	search.c search.h\
+	tagwritersettings.c tagwritersettings.h\
+	trkproperties.c trkproperties.h\
+	widgets.c widgets.h\
+	selpropertieswidget.c selpropertieswidget.h\
+	wingeom.c wingeom.h\
+ actionhandlers.c actionhandlers.h\
+ clipboard.c clipboard.h\
+ ctmapping.c ctmapping.h\
+ ddb_splitter.c ddb_splitter.h\
+ ddb_splitter_size_mode.c ddb_splitter_size_mode.h\
+ hotkeys.c hotkeys.h\
+ namedicons.c namedicons.h\
+ pltmenu.c\
+ tfimport.c tfimport.h\
+	covermanager/covermanager.c covermanager/covermanager.h\
+	covermanager/gobjcache.c covermanager/gobjcache.h\
+	covermanager/albumartwidget.c covermanager/albumartwidget.h\
+	playlist/ddblistview.c playlist/ddblistview.h\
+	playlist/ddblistviewheader.c playlist/ddblistviewheader.h\
+	playlist/mainplaylist.c playlist/mainplaylist.h\
+	playlist/playlistcontroller.c playlist/playlistcontroller.h\
+	playlist/playlistrenderer.c playlist/playlistrenderer.h\
+	playlist/plcommon.c playlist/plcommon.h\
+	playlist/searchplaylist.c playlist/searchplaylist.h\
+	prefwin/prefwin.c prefwin/prefwin.h\
+	prefwin/prefwinappearance.c prefwin/prefwinappearance.h\
+	prefwin/prefwinmisc.c prefwin/prefwinmisc.h\
+	prefwin/prefwinnetwork.c prefwin/prefwinnetwork.h\
+	prefwin/prefwinplayback.c prefwin/prefwinplayback.h\
+	prefwin/prefwinplugins.c prefwin/prefwinplugins.h\
+	prefwin/prefwinsound.c prefwin/prefwinsound.h\
+	$(SM_SOURCES) $(OSXSRC)
 
 sdkdir = $(pkgincludedir)
 sdk_HEADERS = gtkui_api.h
-EXTRA_DIST = deadbeef.glade
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@pkglib_LTLIBRARIES = ddb_gui_GTK3.la
 @HAVE_GTK2_FALSE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@pkglib_LTLIBRARIES = ddb_gui_GTK3.la
 @HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_FALSE@pkglib_LTLIBRARIES = ddb_gui_GTK2.la
-@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_TRUE@pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la
+@HAVE_GTK2_TRUE@@HAVE_GTK3_FALSE@@STATICLINK_TRUE@pkglib_LTLIBRARIES = ddb_gui_GTK2.la
 @HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_FALSE@pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK3.la
-
-#GTKGLEXT2_LIBS =
-#GTKGLEXT3_LIBS =
-@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK2.fallback.la ddb_gui_GTK3.la
-
-# normal lib
+@HAVE_GTK2_TRUE@@HAVE_GTK3_TRUE@@STATICLINK_TRUE@pkglib_LTLIBRARIES = ddb_gui_GTK2.la ddb_gui_GTK3.la
 @HAVE_GTK2_TRUE@GTKUI_SOURCES_GTK2 = $(GTKUI_SOURCES)
-
-#	gtkglext-gtk2/gdk/x11/gdkglconfig-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglconfig-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkglcontext-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglcontext-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkgldrawable-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglglxext.c\
-#	gtkglext-gtk2/gdk/x11/gdkglglxext.h\
-#	gtkglext-gtk2/gdk/x11/gdkgloverlay-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkgloverlay-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkglpixmap-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglpixmap-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkglprivate-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkglquery-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglwindow-x11.c\
-#	gtkglext-gtk2/gdk/x11/gdkglwindow-x11.h\
-#	gtkglext-gtk2/gdk/x11/gdkglx.h\
-#	gtkglext-gtk2/gtk/gtkgldebug.h\
-#	gtkglext-gtk2/gtk/gtkgldefs.h\
-#	gtkglext-gtk2/gtk/gtkgl.h\
-#	gtkglext-gtk2/gtk/gtkglinit.c\
-#	gtkglext-gtk2/gtk/gtkglinit.h\
-#	gtkglext-gtk2/gtk/gtkglprivate.h\
-#	gtkglext-gtk2/gtk/gtkglversion.c\
-#	gtkglext-gtk2/gtk/gtkglversion.h\
-#	gtkglext-gtk2/gtk/gtkglwidget.c\
-#	gtkglext-gtk2/gtk/gtkglwidget.h\
-#	gtkglext-gtk2/gdk/gdkglconfig.c\
-#	gtkglext-gtk2/gdk/gdkglconfig.h\
-#	gtkglext-gtk2/gdk/gdkglcontext.c\
-#	gtkglext-gtk2/gdk/gdkglcontext.h\
-#	gtkglext-gtk2/gdk/gdkgldebug.h\
-#	gtkglext-gtk2/gdk/gdkgldefs.h\
-#	gtkglext-gtk2/gdk/gdkgldrawable.c\
-#	gtkglext-gtk2/gdk/gdkgldrawable.h\
-#	gtkglext-gtk2/gdk/gdkglenumtypes.c\
-#	gtkglext-gtk2/gdk/gdkglenumtypes.h\
-#	gtkglext-gtk2/gdk/gdkglext-config.h\
-#	gtkglext-gtk2/gdk/gdkglglext.c\
-#	gtkglext-gtk2/gdk/gdkglglext.h\
-#	gtkglext-gtk2/gdk/gdkgl.h\
-#	gtkglext-gtk2/gdk/gdkglinit.c\
-#	gtkglext-gtk2/gdk/gdkglinit.h\
-#	gtkglext-gtk2/gdk/gdkglpixmap.c\
-#	gtkglext-gtk2/gdk/gdkglpixmap.h\
-#	gtkglext-gtk2/gdk/gdkglprivate.h\
-#	gtkglext-gtk2/gdk/gdkglquery.c\
-#	gtkglext-gtk2/gdk/gdkglquery.h\
-#	gtkglext-gtk2/gdk/gdkglshapes.c\
-#	gtkglext-gtk2/gdk/gdkglshapes.h\
-#	gtkglext-gtk2/gdk/gdkgltokens.h\
-#	gtkglext-gtk2/gdk/gdkgltypes.h\
-#	gtkglext-gtk2/gdk/gdkglversion.c\
-#	gtkglext-gtk2/gdk/gdkglversion.h\
-#	gtkglext-gtk2/gdk/gdkglwindow.c\
-#	gtkglext-gtk2/gdk/gdkglwindow.h\
-#	gtkglext-gtk2/gdk/gdkglfont.h\
-#	gtkglext-gtk2/gdk/glext/common-header.h\
-#	gtkglext-gtk2/gdk/glext/glext-extra.h\
-#	gtkglext-gtk2/gdk/glext/glext.h\
-#	gtkglext-gtk2/gdk/glext/glxext-extra.h\
-#	gtkglext-gtk2/gdk/glext/glxext.h
-
-#GTKGLEXT_CFLAGS_GTK2 = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk2 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk2/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
 @HAVE_GTK2_TRUE@ddb_gui_GTK2_la_SOURCES = $(GTKUI_SOURCES_GTK2)
 @HAVE_GTK2_TRUE@ddb_gui_GTK2_la_LDFLAGS = -module -avoid-version
-@HAVE_GTK2_TRUE@ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
-@HAVE_GTK2_TRUE@ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2) -DDDB_WARN_DEPRECATED=1
-@HAVE_GTK3_TRUE@GTKUI_SOURCES_GTK3 = $(GTKUI_SOURCES) $(osx_sources)
-
-#	gtkglext-gtk3/gtk/gtkglinit.c\
-#	gtkglext-gtk3/gtk/gtkglversion.c\
-#	gtkglext-gtk3/gtk/gtkglwidget.c\
-#	gtkglext-gtk3/gtk/gtkgldebug.h\
-#	gtkglext-gtk3/gtk/gtkgldefs.h\
-#	gtkglext-gtk3/gtk/gtkgl.h\
-#	gtkglext-gtk3/gtk/gtkglinit.h\
-#	gtkglext-gtk3/gtk/gtkglprivate.h\
-#	gtkglext-gtk3/gtk/gtkglversion.h\
-#	gtkglext-gtk3/gtk/gtkglwidget.h\
-#	gtkglext-gtk3/gdk/gdkglconfig.c\
-#	gtkglext-gtk3/gdk/gdkglconfigimpl.c\
-#	gtkglext-gtk3/gdk/gdkglcontext.c\
-#	gtkglext-gtk3/gdk/gdkglcontextimpl.c\
-#	gtkglext-gtk3/gdk/gdkgldrawable.c\
-#	gtkglext-gtk3/gdk/gdkglinit.c\
-#	gtkglext-gtk3/gdk/gdkglquery.c\
-#	gtkglext-gtk3/gdk/gdkglversion.c\
-#	gtkglext-gtk3/gdk/gdkglwindow.c\
-#	gtkglext-gtk3/gdk/gdkglwindowimpl.c\
-#	gtkglext-gtk3/gdk/gdkglconfig.h\
-#	gtkglext-gtk3/gdk/gdkglconfigimpl.h\
-#	gtkglext-gtk3/gdk/gdkglcontext.h\
-#	gtkglext-gtk3/gdk/gdkglcontextimpl.h\
-#	gtkglext-gtk3/gdk/gdkgldebug.h\
-#	gtkglext-gtk3/gdk/gdkgldefs.h\
-#	gtkglext-gtk3/gdk/gdkgldrawable.h\
-#	gtkglext-gtk3/gdk/gdkglenumtypes.h\
-#	gtkglext-gtk3/gdk/gdkglext-config.h\
-#	gtkglext-gtk3/gdk/gdkgl.h\
-#	gtkglext-gtk3/gdk/gdkglinit.h\
-#	gtkglext-gtk3/gdk/gdkglprivate.h\
-#	gtkglext-gtk3/gdk/gdkglquery.h\
-#	gtkglext-gtk3/gdk/gdkgltokens.h\
-#	gtkglext-gtk3/gdk/gdkgltypes.h\
-#	gtkglext-gtk3/gdk/gdkglversion.h\
-#	gtkglext-gtk3/gdk/gdkglwindow.h\
-#	gtkglext-gtk3/gdk/gdkglwindowimpl.h\
-#	gtkglext-gtk3/gdk/x11/gdkglconfig-x11.c\
-#	gtkglext-gtk3/gdk/x11/gdkglcontext-x11.c\
-#	gtkglext-gtk3/gdk/x11/gdkglquery-x11.c\
-#	gtkglext-gtk3/gdk/x11/gdkglwindow-x11.c\
-#	gtkglext-gtk3/gdk/x11/gdkx11glconfig.c\
-#	gtkglext-gtk3/gdk/x11/gdkx11glcontext.c\
-#	gtkglext-gtk3/gdk/x11/gdkx11glwindow.c\
-#	gtkglext-gtk3/gdk/x11/gdkglconfig-x11.h\
-#	gtkglext-gtk3/gdk/x11/gdkglcontext-x11.h\
-#	gtkglext-gtk3/gdk/x11/gdkglprivate-x11.h\
-#	gtkglext-gtk3/gdk/x11/gdkglquery-x11.h\
-#	gtkglext-gtk3/gdk/x11/gdkglwindow-x11.h\
-#	gtkglext-gtk3/gdk/x11/gdkglx.h\
-#	gtkglext-gtk3/gdk/x11/gdkx11glconfig.h\
-#	gtkglext-gtk3/gdk/x11/gdkx11glcontext.h\
-#	gtkglext-gtk3/gdk/x11/gdkx11glquery.h\
-#	gtkglext-gtk3/gdk/x11/gdkx11glwindow.h\
-#	gtkglext-gtk3/gdk/gdkglext-config.h\
-#	gtkglext-gtk3/gdk/gdkglversion.h
-@HAVE_GTK3_TRUE@GTKGLEXT_CFLAGS_GTK3 = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
+@HAVE_GTK2_TRUE@ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.la ../../shared/libtrkpropertiesutil.la ../../shared/libeqpreset.la ../../shared/libdeletefromdisk.la ../../shared/libtftintutil.la ../../shared/analyzer/libanalyzer.la ../../shared/scope/libscope.la $(JANSSON_LIBS) $(DISPATCH_LIBS)
+@HAVE_GTK2_TRUE@ddb_gui_GTK2_la_CFLAGS = -std=c99 -Werror -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
+@HAVE_GTK3_TRUE@GTKUI_SOURCES_GTK3 = deadbeefapp.c deadbeefapp.h $(GTKUI_SOURCES)
 @HAVE_GTK3_TRUE@ddb_gui_GTK3_la_LDFLAGS = -module -avoid-version
 @HAVE_GTK3_TRUE@ddb_gui_GTK3_la_SOURCES = $(GTKUI_SOURCES_GTK3)
-@HAVE_GTK3_TRUE@ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT3_LIBS)
-@HAVE_GTK3_TRUE@ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
-@HAVE_GTK3_TRUE@ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK3)
-
-# fallback lib
-@STATICLINK_TRUE@GTK_ROOT = @top_srcdir@/$(LIB)/gtk-2.12.12/usr
-@STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES_GTK2)
-@STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_LDFLAGS = -module -avoid-version
-@STATICLINK_TRUE@ddb_gui_GTK2_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a $(GTKGLEXT2_LIBS)
-@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 $(SM_CFLAGS) $(GTKGLEXT_CFLAGS_GTK2)
-all: all-am
+@HAVE_GTK3_TRUE@ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) ../libparser/libparser.la ../../shared/libtrkpropertiesutil.la ../../shared/libeqpreset.la ../../shared/libdeletefromdisk.la ../../shared/libtftintutil.la ../../shared/analyzer/libanalyzer.la ../../shared/scope/libscope.la $(JANSSON_LIBS) $(DISPATCH_LIBS)
+@HAVE_GTK3_TRUE@ddb_gui_GTK3_la_CFLAGS = -std=c99 -Werror -DGLIB_DISABLE_DEPRECATION_WARNINGS -DGDK_DISABLE_DEPRECATION_WARNINGS -DGTK_DISABLE_DEPRECATION_WARNINGS $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS) $(DISPATCH_CFLAGS) -I@top_srcdir@/include -DDDB_WARN_DEPRECATED=1
+@HAVE_GTK3_TRUE@ddb_gui_GTK3_la_OBJCFLAGS = $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(JANSSON_CFLAGS)
+@HAVE_GTK3_TRUE@nodist_ddb_gui_GTK3_la_SOURCES = gtkui-gresources.c
+@HAVE_GTK3_TRUE@BUILT_SOURCES = gtkui-gresources.c
+@HAVE_GTK3_TRUE@CLEANFILES = gtkui-gresources.c
+@HAVE_GTK3_TRUE@resource_files = \
+@HAVE_GTK3_TRUE@	gtkui.gresources.xml	\
+@HAVE_GTK3_TRUE@	gtk/menus.ui
+
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .m .o .obj
+.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 \
@@ -863,10 +765,9 @@
 	 exit 1;; \
 	 esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/gtkui/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu --ignore-deps plugins/gtkui/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	 $(AUTOMAKE) --gnu plugins/gtkui/Makefile
-.PRECIOUS: Makefile
+	 $(AUTOMAKE) --gnu --ignore-deps plugins/gtkui/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	 *config.status*) \
@@ -919,846 +820,423 @@
 	 echo rm -f $${locs}; \
 	 rm -f $${locs}; \
 	}
-
-ddb_gui_GTK2.fallback.la: $(ddb_gui_GTK2_fallback_la_OBJECTS) $(ddb_gui_GTK2_fallback_la_DEPENDENCIES) $(EXTRA_ddb_gui_GTK2_fallback_la_DEPENDENCIES) 
-	$(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)
+../../src/$(am__dirstamp):
+	@$(MKDIR_P) ../../src
+	@: > ../../src/$(am__dirstamp)
+../../src/ddb_gui_GTK2_la-utf8.lo: ../../src/$(am__dirstamp)
+covermanager/$(am__dirstamp):
+	@$(MKDIR_P) covermanager
+	@: > covermanager/$(am__dirstamp)
+covermanager/ddb_gui_GTK2_la-covermanager.lo: \
+	covermanager/$(am__dirstamp)
+covermanager/ddb_gui_GTK2_la-gobjcache.lo: \
+	covermanager/$(am__dirstamp)
+covermanager/ddb_gui_GTK2_la-albumartwidget.lo: \
+	covermanager/$(am__dirstamp)
+playlist/$(am__dirstamp):
+	@$(MKDIR_P) playlist
+	@: > playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK2_la-ddblistview.lo: playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK2_la-ddblistviewheader.lo: \
+	playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK2_la-mainplaylist.lo: playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK2_la-playlistcontroller.lo: \
+	playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK2_la-playlistrenderer.lo: \
+	playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK2_la-plcommon.lo: playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK2_la-searchplaylist.lo: playlist/$(am__dirstamp)
+prefwin/$(am__dirstamp):
+	@$(MKDIR_P) prefwin
+	@: > prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK2_la-prefwin.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK2_la-prefwinappearance.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK2_la-prefwinmisc.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK2_la-prefwinnetwork.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK2_la-prefwinplayback.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK2_la-prefwinplugins.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK2_la-prefwinsound.lo: prefwin/$(am__dirstamp)
 
 ddb_gui_GTK2.la: $(ddb_gui_GTK2_la_OBJECTS) $(ddb_gui_GTK2_la_DEPENDENCIES) $(EXTRA_ddb_gui_GTK2_la_DEPENDENCIES) 
 	$(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)
+../../src/ddb_gui_GTK3_la-utf8.lo: ../../src/$(am__dirstamp)
+covermanager/ddb_gui_GTK3_la-covermanager.lo: \
+	covermanager/$(am__dirstamp)
+covermanager/ddb_gui_GTK3_la-gobjcache.lo: \
+	covermanager/$(am__dirstamp)
+covermanager/ddb_gui_GTK3_la-albumartwidget.lo: \
+	covermanager/$(am__dirstamp)
+playlist/ddb_gui_GTK3_la-ddblistview.lo: playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK3_la-ddblistviewheader.lo: \
+	playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK3_la-mainplaylist.lo: playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK3_la-playlistcontroller.lo: \
+	playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK3_la-playlistrenderer.lo: \
+	playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK3_la-plcommon.lo: playlist/$(am__dirstamp)
+playlist/ddb_gui_GTK3_la-searchplaylist.lo: playlist/$(am__dirstamp)
+prefwin/ddb_gui_GTK3_la-prefwin.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK3_la-prefwinappearance.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK3_la-prefwinmisc.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK3_la-prefwinnetwork.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK3_la-prefwinplayback.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK3_la-prefwinplugins.lo: prefwin/$(am__dirstamp)
+prefwin/ddb_gui_GTK3_la-prefwinsound.lo: prefwin/$(am__dirstamp)
 
 ddb_gui_GTK3.la: $(ddb_gui_GTK3_la_OBJECTS) $(ddb_gui_GTK3_la_DEPENDENCIES) $(EXTRA_ddb_gui_GTK3_la_DEPENDENCIES) 
-	$(AM_V_OBJCLD)$(ddb_gui_GTK3_la_LINK) $(am_ddb_gui_GTK3_la_rpath) $(ddb_gui_GTK3_la_OBJECTS) $(ddb_gui_GTK3_la_LIBADD) $(LIBS)
+	$(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)
+	-rm -f ../../src/*.$(OBJEXT)
+	-rm -f ../../src/*.lo
+	-rm -f covermanager/*.$(OBJEXT)
+	-rm -f covermanager/*.lo
+	-rm -f playlist/*.$(OBJEXT)
+	-rm -f playlist/*.lo
+	-rm -f prefwin/*.$(OBJEXT)
+	-rm -f prefwin/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-actions.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-callbacks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-coverart.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbcellrenderertextmultiline.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbequalizer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-ddblistview.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbseekbar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbtabstrip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-ddbvolumebar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-dspconfig.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-eq.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-fileman.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-gdkdrawing.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkui.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-interface.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-mainplaylist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-plcommon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-pluginconf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-prefwin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-progress.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-search.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-support.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-tagwritersettings.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-trkproperties.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_fallback_la-wingeom.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-actions.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-callbacks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-coverart.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-ddbcellrenderertextmultiline.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-ddbequalizer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-ddblistview.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-ddbseekbar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-ddbtabstrip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-ddbvolumebar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-dspconfig.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-eq.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-fileman.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-gdkdrawing.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-gtkui.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-interface.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-mainplaylist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-namedicons.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-plcommon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-pluginconf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-prefwin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-progress.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-search.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK2_la-support.Plo@am__quote@
-@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-widgets.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-actionhandlers.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-ctmapping.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-gtkuigl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-hotkeys.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-namedicons.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-pltmenu.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-retina.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-widgets.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ddb_gui_GTK3_la-wingeom.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
 
 .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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-ddb_gui_GTK2_fallback_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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_fallback_la-widgets.lo: widgets.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-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Tpo -c -o ddb_gui_GTK2_fallback_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-widgets.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='widgets.c' object='ddb_gui_GTK2_fallback_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
-
-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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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_fallback_la-gtkuigl.lo: gtkuigl.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-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Tpo -c -o ddb_gui_GTK2_fallback_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-gtkuigl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtkuigl.c' object='ddb_gui_GTK2_fallback_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
-
-ddb_gui_GTK2_fallback_la-hotkeys.lo: hotkeys.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-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Tpo -c -o ddb_gui_GTK2_fallback_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-hotkeys.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hotkeys.c' object='ddb_gui_GTK2_fallback_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
-
-ddb_gui_GTK2_fallback_la-actionhandlers.lo: actionhandlers.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-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Tpo -c -o ddb_gui_GTK2_fallback_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-actionhandlers.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='actionhandlers.c' object='ddb_gui_GTK2_fallback_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
-
-ddb_gui_GTK2_fallback_la-pltmenu.lo: pltmenu.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-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Tpo -c -o ddb_gui_GTK2_fallback_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-pltmenu.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pltmenu.c' object='ddb_gui_GTK2_fallback_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
-
-ddb_gui_GTK2_fallback_la-ctmapping.lo: ctmapping.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-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Tpo -c -o ddb_gui_GTK2_fallback_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-ctmapping.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctmapping.c' object='ddb_gui_GTK2_fallback_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
-
-ddb_gui_GTK2_fallback_la-namedicons.lo: namedicons.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-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Tpo -c -o ddb_gui_GTK2_fallback_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK2_fallback_la-namedicons.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='namedicons.c' object='ddb_gui_GTK2_fallback_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
 
-ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+../../src/ddb_gui_GTK2_la-utf8.lo: ../../src/utf8.c
+	$(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) -c -o ../../src/ddb_gui_GTK2_la-utf8.lo `test -f '../../src/utf8.c' || echo '$(srcdir)/'`../../src/utf8.c
+
+ddb_gui_GTK2_la-actions.lo: actions.c
+	$(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) -c -o ddb_gui_GTK2_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c
 
 ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+	$(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) -c -o ddb_gui_GTK2_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+
+ddb_gui_GTK2_la-support.lo: support.c
+	$(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) -c -o ddb_gui_GTK2_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
 
 ddb_gui_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) $(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+	$(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) -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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-ddbseekbar.lo: ddbseekbar.c
+	$(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) -c -o ddb_gui_GTK2_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+
+ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
+	$(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) -c -o ddb_gui_GTK2_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+
+ddb_gui_GTK2_la-ddbequalizer.lo: ddbequalizer.c
+	$(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) -c -o ddb_gui_GTK2_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+
+ddb_gui_GTK2_la-ddbtabstrip.lo: ddbtabstrip.c
+	$(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) -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_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) -c -o ddb_gui_GTK2_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.c
 
 ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+	$(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) -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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-dspconfig.lo: dspconfig.c
+	$(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) -c -o ddb_gui_GTK2_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.c
 
-ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-eq.lo: eq.c
+	$(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) -c -o ddb_gui_GTK2_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.c
 
 ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+	$(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) -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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-gtkui.lo: gtkui.c
+	$(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) -c -o ddb_gui_GTK2_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.c
 
-ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-gtkui_deletefromdisk.lo: gtkui_deletefromdisk.c
+	$(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) -c -o ddb_gui_GTK2_la-gtkui_deletefromdisk.lo `test -f 'gtkui_deletefromdisk.c' || echo '$(srcdir)/'`gtkui_deletefromdisk.c
 
-ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-plmenu.lo: plmenu.c
+	$(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) -c -o ddb_gui_GTK2_la-plmenu.lo `test -f 'plmenu.c' || echo '$(srcdir)/'`plmenu.c
 
-ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-pluginconf.lo: pluginconf.c
+	$(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) -c -o ddb_gui_GTK2_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.c
 
-ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-progress.lo: progress.c
+	$(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) -c -o ddb_gui_GTK2_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.c
 
-ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-rg.lo: rg.c
+	$(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) -c -o ddb_gui_GTK2_la-rg.lo `test -f 'rg.c' || echo '$(srcdir)/'`rg.c
 
-ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-search.lo: search.c
+	$(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) -c -o ddb_gui_GTK2_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.c
 
 ddb_gui_GTK2_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_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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+	$(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) -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@	$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-trkproperties.lo: trkproperties.c
+	$(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) -c -o ddb_gui_GTK2_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
 
 ddb_gui_GTK2_la-widgets.lo: widgets.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-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-widgets.Tpo -c -o ddb_gui_GTK2_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK2_la-widgets.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='widgets.c' object='ddb_gui_GTK2_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+	$(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) -c -o ddb_gui_GTK2_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-selpropertieswidget.lo: selpropertieswidget.c
+	$(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) -c -o ddb_gui_GTK2_la-selpropertieswidget.lo `test -f 'selpropertieswidget.c' || echo '$(srcdir)/'`selpropertieswidget.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-wingeom.lo: wingeom.c
+	$(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) -c -o ddb_gui_GTK2_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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_GTK2_la-gtkuigl.lo: gtkuigl.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-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Tpo -c -o ddb_gui_GTK2_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK2_la-gtkuigl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtkuigl.c' object='ddb_gui_GTK2_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ddb_gui_GTK2_la-actionhandlers.lo: actionhandlers.c
+	$(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) -c -o ddb_gui_GTK2_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+
+ddb_gui_GTK2_la-clipboard.lo: clipboard.c
+	$(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) -c -o ddb_gui_GTK2_la-clipboard.lo `test -f 'clipboard.c' || echo '$(srcdir)/'`clipboard.c
+
+ddb_gui_GTK2_la-ctmapping.lo: ctmapping.c
+	$(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) -c -o ddb_gui_GTK2_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+
+ddb_gui_GTK2_la-ddb_splitter.lo: ddb_splitter.c
+	$(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) -c -o ddb_gui_GTK2_la-ddb_splitter.lo `test -f 'ddb_splitter.c' || echo '$(srcdir)/'`ddb_splitter.c
+
+ddb_gui_GTK2_la-ddb_splitter_size_mode.lo: ddb_splitter_size_mode.c
+	$(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) -c -o ddb_gui_GTK2_la-ddb_splitter_size_mode.lo `test -f 'ddb_splitter_size_mode.c' || echo '$(srcdir)/'`ddb_splitter_size_mode.c
 
 ddb_gui_GTK2_la-hotkeys.lo: hotkeys.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-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Tpo -c -o ddb_gui_GTK2_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK2_la-hotkeys.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hotkeys.c' object='ddb_gui_GTK2_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+	$(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) -c -o ddb_gui_GTK2_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
 
-ddb_gui_GTK2_la-actionhandlers.lo: actionhandlers.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-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Tpo -c -o ddb_gui_GTK2_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK2_la-actionhandlers.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='actionhandlers.c' object='ddb_gui_GTK2_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ddb_gui_GTK2_la-namedicons.lo: namedicons.c
+	$(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) -c -o ddb_gui_GTK2_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
 
 ddb_gui_GTK2_la-pltmenu.lo: pltmenu.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-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Tpo -c -o ddb_gui_GTK2_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK2_la-pltmenu.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pltmenu.c' object='ddb_gui_GTK2_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+	$(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) -c -o ddb_gui_GTK2_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
 
-ddb_gui_GTK2_la-ctmapping.lo: ctmapping.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-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Tpo -c -o ddb_gui_GTK2_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK2_la-ctmapping.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctmapping.c' object='ddb_gui_GTK2_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ddb_gui_GTK2_la-tfimport.lo: tfimport.c
+	$(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) -c -o ddb_gui_GTK2_la-tfimport.lo `test -f 'tfimport.c' || echo '$(srcdir)/'`tfimport.c
 
-ddb_gui_GTK2_la-namedicons.lo: namedicons.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-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Tpo -c -o ddb_gui_GTK2_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK2_la-namedicons.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='namedicons.c' object='ddb_gui_GTK2_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
+covermanager/ddb_gui_GTK2_la-covermanager.lo: covermanager/covermanager.c
+	$(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) -c -o covermanager/ddb_gui_GTK2_la-covermanager.lo `test -f 'covermanager/covermanager.c' || echo '$(srcdir)/'`covermanager/covermanager.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+covermanager/ddb_gui_GTK2_la-gobjcache.lo: covermanager/gobjcache.c
+	$(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) -c -o covermanager/ddb_gui_GTK2_la-gobjcache.lo `test -f 'covermanager/gobjcache.c' || echo '$(srcdir)/'`covermanager/gobjcache.c
+
+covermanager/ddb_gui_GTK2_la-albumartwidget.lo: covermanager/albumartwidget.c
+	$(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) -c -o covermanager/ddb_gui_GTK2_la-albumartwidget.lo `test -f 'covermanager/albumartwidget.c' || echo '$(srcdir)/'`covermanager/albumartwidget.c
+
+playlist/ddb_gui_GTK2_la-ddblistview.lo: playlist/ddblistview.c
+	$(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) -c -o playlist/ddb_gui_GTK2_la-ddblistview.lo `test -f 'playlist/ddblistview.c' || echo '$(srcdir)/'`playlist/ddblistview.c
+
+playlist/ddb_gui_GTK2_la-ddblistviewheader.lo: playlist/ddblistviewheader.c
+	$(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) -c -o playlist/ddb_gui_GTK2_la-ddblistviewheader.lo `test -f 'playlist/ddblistviewheader.c' || echo '$(srcdir)/'`playlist/ddblistviewheader.c
+
+playlist/ddb_gui_GTK2_la-mainplaylist.lo: playlist/mainplaylist.c
+	$(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) -c -o playlist/ddb_gui_GTK2_la-mainplaylist.lo `test -f 'playlist/mainplaylist.c' || echo '$(srcdir)/'`playlist/mainplaylist.c
+
+playlist/ddb_gui_GTK2_la-playlistcontroller.lo: playlist/playlistcontroller.c
+	$(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) -c -o playlist/ddb_gui_GTK2_la-playlistcontroller.lo `test -f 'playlist/playlistcontroller.c' || echo '$(srcdir)/'`playlist/playlistcontroller.c
+
+playlist/ddb_gui_GTK2_la-playlistrenderer.lo: playlist/playlistrenderer.c
+	$(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) -c -o playlist/ddb_gui_GTK2_la-playlistrenderer.lo `test -f 'playlist/playlistrenderer.c' || echo '$(srcdir)/'`playlist/playlistrenderer.c
+
+playlist/ddb_gui_GTK2_la-plcommon.lo: playlist/plcommon.c
+	$(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) -c -o playlist/ddb_gui_GTK2_la-plcommon.lo `test -f 'playlist/plcommon.c' || echo '$(srcdir)/'`playlist/plcommon.c
+
+playlist/ddb_gui_GTK2_la-searchplaylist.lo: playlist/searchplaylist.c
+	$(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) -c -o playlist/ddb_gui_GTK2_la-searchplaylist.lo `test -f 'playlist/searchplaylist.c' || echo '$(srcdir)/'`playlist/searchplaylist.c
+
+prefwin/ddb_gui_GTK2_la-prefwin.lo: prefwin/prefwin.c
+	$(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) -c -o prefwin/ddb_gui_GTK2_la-prefwin.lo `test -f 'prefwin/prefwin.c' || echo '$(srcdir)/'`prefwin/prefwin.c
+
+prefwin/ddb_gui_GTK2_la-prefwinappearance.lo: prefwin/prefwinappearance.c
+	$(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) -c -o prefwin/ddb_gui_GTK2_la-prefwinappearance.lo `test -f 'prefwin/prefwinappearance.c' || echo '$(srcdir)/'`prefwin/prefwinappearance.c
+
+prefwin/ddb_gui_GTK2_la-prefwinmisc.lo: prefwin/prefwinmisc.c
+	$(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) -c -o prefwin/ddb_gui_GTK2_la-prefwinmisc.lo `test -f 'prefwin/prefwinmisc.c' || echo '$(srcdir)/'`prefwin/prefwinmisc.c
+
+prefwin/ddb_gui_GTK2_la-prefwinnetwork.lo: prefwin/prefwinnetwork.c
+	$(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) -c -o prefwin/ddb_gui_GTK2_la-prefwinnetwork.lo `test -f 'prefwin/prefwinnetwork.c' || echo '$(srcdir)/'`prefwin/prefwinnetwork.c
+
+prefwin/ddb_gui_GTK2_la-prefwinplayback.lo: prefwin/prefwinplayback.c
+	$(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) -c -o prefwin/ddb_gui_GTK2_la-prefwinplayback.lo `test -f 'prefwin/prefwinplayback.c' || echo '$(srcdir)/'`prefwin/prefwinplayback.c
+
+prefwin/ddb_gui_GTK2_la-prefwinplugins.lo: prefwin/prefwinplugins.c
+	$(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) -c -o prefwin/ddb_gui_GTK2_la-prefwinplugins.lo `test -f 'prefwin/prefwinplugins.c' || echo '$(srcdir)/'`prefwin/prefwinplugins.c
+
+prefwin/ddb_gui_GTK2_la-prefwinsound.lo: prefwin/prefwinsound.c
+	$(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) -c -o prefwin/ddb_gui_GTK2_la-prefwinsound.lo `test -f 'prefwin/prefwinsound.c' || echo '$(srcdir)/'`prefwin/prefwinsound.c
+
+ddb_gui_GTK3_la-deadbeefapp.lo: deadbeefapp.c
+	$(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) -c -o ddb_gui_GTK3_la-deadbeefapp.lo `test -f 'deadbeefapp.c' || echo '$(srcdir)/'`deadbeefapp.c
+
+../../src/ddb_gui_GTK3_la-utf8.lo: ../../src/utf8.c
+	$(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) -c -o ../../src/ddb_gui_GTK3_la-utf8.lo `test -f '../../src/utf8.c' || echo '$(srcdir)/'`../../src/utf8.c
+
+ddb_gui_GTK3_la-actions.lo: actions.c
+	$(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) -c -o ddb_gui_GTK3_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+	$(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) -c -o ddb_gui_GTK3_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+
+ddb_gui_GTK3_la-support.lo: support.c
+	$(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) -c -o ddb_gui_GTK3_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+	$(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) -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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-ddbseekbar.lo: ddbseekbar.c
+	$(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) -c -o ddb_gui_GTK3_la-ddbseekbar.lo `test -f 'ddbseekbar.c' || echo '$(srcdir)/'`ddbseekbar.c
+
+ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo: ddbcellrenderertextmultiline.c
+	$(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) -c -o ddb_gui_GTK3_la-ddbcellrenderertextmultiline.lo `test -f 'ddbcellrenderertextmultiline.c' || echo '$(srcdir)/'`ddbcellrenderertextmultiline.c
+
+ddb_gui_GTK3_la-ddbequalizer.lo: ddbequalizer.c
+	$(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) -c -o ddb_gui_GTK3_la-ddbequalizer.lo `test -f 'ddbequalizer.c' || echo '$(srcdir)/'`ddbequalizer.c
+
+ddb_gui_GTK3_la-ddbtabstrip.lo: ddbtabstrip.c
+	$(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) -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_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) -c -o ddb_gui_GTK3_la-ddbvolumebar.lo `test -f 'ddbvolumebar.c' || echo '$(srcdir)/'`ddbvolumebar.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+	$(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) -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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-dspconfig.lo: dspconfig.c
+	$(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) -c -o ddb_gui_GTK3_la-dspconfig.lo `test -f 'dspconfig.c' || echo '$(srcdir)/'`dspconfig.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-eq.lo: eq.c
+	$(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) -c -o ddb_gui_GTK3_la-eq.lo `test -f 'eq.c' || echo '$(srcdir)/'`eq.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+	$(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) -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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-gtkui.lo: gtkui.c
+	$(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) -c -o ddb_gui_GTK3_la-gtkui.lo `test -f 'gtkui.c' || echo '$(srcdir)/'`gtkui.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-gtkui_deletefromdisk.lo: gtkui_deletefromdisk.c
+	$(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) -c -o ddb_gui_GTK3_la-gtkui_deletefromdisk.lo `test -f 'gtkui_deletefromdisk.c' || echo '$(srcdir)/'`gtkui_deletefromdisk.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-plmenu.lo: plmenu.c
+	$(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) -c -o ddb_gui_GTK3_la-plmenu.lo `test -f 'plmenu.c' || echo '$(srcdir)/'`plmenu.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-pluginconf.lo: pluginconf.c
+	$(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) -c -o ddb_gui_GTK3_la-pluginconf.lo `test -f 'pluginconf.c' || echo '$(srcdir)/'`pluginconf.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-progress.lo: progress.c
+	$(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) -c -o ddb_gui_GTK3_la-progress.lo `test -f 'progress.c' || echo '$(srcdir)/'`progress.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-rg.lo: rg.c
+	$(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) -c -o ddb_gui_GTK3_la-rg.lo `test -f 'rg.c' || echo '$(srcdir)/'`rg.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-search.lo: search.c
+	$(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) -c -o ddb_gui_GTK3_la-search.lo `test -f 'search.c' || echo '$(srcdir)/'`search.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
+	$(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) -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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-trkproperties.lo: trkproperties.c
+	$(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) -c -o ddb_gui_GTK3_la-trkproperties.lo `test -f 'trkproperties.c' || echo '$(srcdir)/'`trkproperties.c
 
 ddb_gui_GTK3_la-widgets.lo: widgets.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-widgets.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-widgets.Tpo -c -o ddb_gui_GTK3_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-widgets.Tpo $(DEPDIR)/ddb_gui_GTK3_la-widgets.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='widgets.c' object='ddb_gui_GTK3_la-widgets.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.c
+	$(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) -c -o ddb_gui_GTK3_la-widgets.lo `test -f 'widgets.c' || echo '$(srcdir)/'`widgets.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-selpropertieswidget.lo: selpropertieswidget.c
+	$(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) -c -o ddb_gui_GTK3_la-selpropertieswidget.lo `test -f 'selpropertieswidget.c' || echo '$(srcdir)/'`selpropertieswidget.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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-wingeom.lo: wingeom.c
+	$(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) -c -o ddb_gui_GTK3_la-wingeom.lo `test -f 'wingeom.c' || echo '$(srcdir)/'`wingeom.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
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)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@	$(AM_V_CC@am__nodep@)$(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
-
-ddb_gui_GTK3_la-gtkuigl.lo: gtkuigl.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-gtkuigl.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Tpo -c -o ddb_gui_GTK3_la-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Tpo $(DEPDIR)/ddb_gui_GTK3_la-gtkuigl.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gtkuigl.c' object='ddb_gui_GTK3_la-gtkuigl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-gtkuigl.lo `test -f 'gtkuigl.c' || echo '$(srcdir)/'`gtkuigl.c
+ddb_gui_GTK3_la-actionhandlers.lo: actionhandlers.c
+	$(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) -c -o ddb_gui_GTK3_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+
+ddb_gui_GTK3_la-clipboard.lo: clipboard.c
+	$(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) -c -o ddb_gui_GTK3_la-clipboard.lo `test -f 'clipboard.c' || echo '$(srcdir)/'`clipboard.c
+
+ddb_gui_GTK3_la-ctmapping.lo: ctmapping.c
+	$(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) -c -o ddb_gui_GTK3_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+
+ddb_gui_GTK3_la-ddb_splitter.lo: ddb_splitter.c
+	$(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) -c -o ddb_gui_GTK3_la-ddb_splitter.lo `test -f 'ddb_splitter.c' || echo '$(srcdir)/'`ddb_splitter.c
+
+ddb_gui_GTK3_la-ddb_splitter_size_mode.lo: ddb_splitter_size_mode.c
+	$(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) -c -o ddb_gui_GTK3_la-ddb_splitter_size_mode.lo `test -f 'ddb_splitter_size_mode.c' || echo '$(srcdir)/'`ddb_splitter_size_mode.c
 
 ddb_gui_GTK3_la-hotkeys.lo: hotkeys.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-hotkeys.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Tpo -c -o ddb_gui_GTK3_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Tpo $(DEPDIR)/ddb_gui_GTK3_la-hotkeys.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='hotkeys.c' object='ddb_gui_GTK3_la-hotkeys.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
+	$(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) -c -o ddb_gui_GTK3_la-hotkeys.lo `test -f 'hotkeys.c' || echo '$(srcdir)/'`hotkeys.c
 
-ddb_gui_GTK3_la-actionhandlers.lo: actionhandlers.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-actionhandlers.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Tpo -c -o ddb_gui_GTK3_la-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Tpo $(DEPDIR)/ddb_gui_GTK3_la-actionhandlers.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='actionhandlers.c' object='ddb_gui_GTK3_la-actionhandlers.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-actionhandlers.lo `test -f 'actionhandlers.c' || echo '$(srcdir)/'`actionhandlers.c
+ddb_gui_GTK3_la-namedicons.lo: namedicons.c
+	$(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) -c -o ddb_gui_GTK3_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
 
 ddb_gui_GTK3_la-pltmenu.lo: pltmenu.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-pltmenu.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Tpo -c -o ddb_gui_GTK3_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Tpo $(DEPDIR)/ddb_gui_GTK3_la-pltmenu.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pltmenu.c' object='ddb_gui_GTK3_la-pltmenu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
+	$(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) -c -o ddb_gui_GTK3_la-pltmenu.lo `test -f 'pltmenu.c' || echo '$(srcdir)/'`pltmenu.c
 
-ddb_gui_GTK3_la-ctmapping.lo: ctmapping.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-ctmapping.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Tpo -c -o ddb_gui_GTK3_la-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Tpo $(DEPDIR)/ddb_gui_GTK3_la-ctmapping.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctmapping.c' object='ddb_gui_GTK3_la-ctmapping.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-ctmapping.lo `test -f 'ctmapping.c' || echo '$(srcdir)/'`ctmapping.c
+ddb_gui_GTK3_la-tfimport.lo: tfimport.c
+	$(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) -c -o ddb_gui_GTK3_la-tfimport.lo `test -f 'tfimport.c' || echo '$(srcdir)/'`tfimport.c
 
-ddb_gui_GTK3_la-namedicons.lo: namedicons.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-namedicons.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Tpo -c -o ddb_gui_GTK3_la-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Tpo $(DEPDIR)/ddb_gui_GTK3_la-namedicons.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='namedicons.c' object='ddb_gui_GTK3_la-namedicons.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(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-namedicons.lo `test -f 'namedicons.c' || echo '$(srcdir)/'`namedicons.c
-
-.m.o:
-@am__fastdepOBJC_TRUE@	$(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepOBJC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@	$(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJC_FALSE@	$(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ $<
-
-.m.obj:
-@am__fastdepOBJC_TRUE@	$(AM_V_OBJC)$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepOBJC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@	$(AM_V_OBJC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJC_FALSE@	$(AM_V_OBJC@am__nodep@)$(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.m.lo:
-@am__fastdepOBJC_TRUE@	$(AM_V_OBJC)$(LTOBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepOBJC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@	$(AM_V_OBJC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJC_FALSE@	$(AM_V_OBJC@am__nodep@)$(LTOBJCCOMPILE) -c -o $@ $<
-
-ddb_gui_GTK3_la-retina.lo: retina.m
-@am__fastdepOBJC_TRUE@	$(AM_V_OBJC)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_OBJCFLAGS) $(OBJCFLAGS) -MT ddb_gui_GTK3_la-retina.lo -MD -MP -MF $(DEPDIR)/ddb_gui_GTK3_la-retina.Tpo -c -o ddb_gui_GTK3_la-retina.lo `test -f 'retina.m' || echo '$(srcdir)/'`retina.m
-@am__fastdepOBJC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ddb_gui_GTK3_la-retina.Tpo $(DEPDIR)/ddb_gui_GTK3_la-retina.Plo
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@	$(AM_V_OBJC)source='retina.m' object='ddb_gui_GTK3_la-retina.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepOBJC_FALSE@	$(AM_V_OBJC@am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_gui_GTK3_la_OBJCFLAGS) $(OBJCFLAGS) -c -o ddb_gui_GTK3_la-retina.lo `test -f 'retina.m' || echo '$(srcdir)/'`retina.m
+covermanager/ddb_gui_GTK3_la-covermanager.lo: covermanager/covermanager.c
+	$(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) -c -o covermanager/ddb_gui_GTK3_la-covermanager.lo `test -f 'covermanager/covermanager.c' || echo '$(srcdir)/'`covermanager/covermanager.c
+
+covermanager/ddb_gui_GTK3_la-gobjcache.lo: covermanager/gobjcache.c
+	$(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) -c -o covermanager/ddb_gui_GTK3_la-gobjcache.lo `test -f 'covermanager/gobjcache.c' || echo '$(srcdir)/'`covermanager/gobjcache.c
+
+covermanager/ddb_gui_GTK3_la-albumartwidget.lo: covermanager/albumartwidget.c
+	$(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) -c -o covermanager/ddb_gui_GTK3_la-albumartwidget.lo `test -f 'covermanager/albumartwidget.c' || echo '$(srcdir)/'`covermanager/albumartwidget.c
+
+playlist/ddb_gui_GTK3_la-ddblistview.lo: playlist/ddblistview.c
+	$(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) -c -o playlist/ddb_gui_GTK3_la-ddblistview.lo `test -f 'playlist/ddblistview.c' || echo '$(srcdir)/'`playlist/ddblistview.c
+
+playlist/ddb_gui_GTK3_la-ddblistviewheader.lo: playlist/ddblistviewheader.c
+	$(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) -c -o playlist/ddb_gui_GTK3_la-ddblistviewheader.lo `test -f 'playlist/ddblistviewheader.c' || echo '$(srcdir)/'`playlist/ddblistviewheader.c
+
+playlist/ddb_gui_GTK3_la-mainplaylist.lo: playlist/mainplaylist.c
+	$(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) -c -o playlist/ddb_gui_GTK3_la-mainplaylist.lo `test -f 'playlist/mainplaylist.c' || echo '$(srcdir)/'`playlist/mainplaylist.c
+
+playlist/ddb_gui_GTK3_la-playlistcontroller.lo: playlist/playlistcontroller.c
+	$(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) -c -o playlist/ddb_gui_GTK3_la-playlistcontroller.lo `test -f 'playlist/playlistcontroller.c' || echo '$(srcdir)/'`playlist/playlistcontroller.c
+
+playlist/ddb_gui_GTK3_la-playlistrenderer.lo: playlist/playlistrenderer.c
+	$(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) -c -o playlist/ddb_gui_GTK3_la-playlistrenderer.lo `test -f 'playlist/playlistrenderer.c' || echo '$(srcdir)/'`playlist/playlistrenderer.c
+
+playlist/ddb_gui_GTK3_la-plcommon.lo: playlist/plcommon.c
+	$(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) -c -o playlist/ddb_gui_GTK3_la-plcommon.lo `test -f 'playlist/plcommon.c' || echo '$(srcdir)/'`playlist/plcommon.c
+
+playlist/ddb_gui_GTK3_la-searchplaylist.lo: playlist/searchplaylist.c
+	$(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) -c -o playlist/ddb_gui_GTK3_la-searchplaylist.lo `test -f 'playlist/searchplaylist.c' || echo '$(srcdir)/'`playlist/searchplaylist.c
+
+prefwin/ddb_gui_GTK3_la-prefwin.lo: prefwin/prefwin.c
+	$(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) -c -o prefwin/ddb_gui_GTK3_la-prefwin.lo `test -f 'prefwin/prefwin.c' || echo '$(srcdir)/'`prefwin/prefwin.c
+
+prefwin/ddb_gui_GTK3_la-prefwinappearance.lo: prefwin/prefwinappearance.c
+	$(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) -c -o prefwin/ddb_gui_GTK3_la-prefwinappearance.lo `test -f 'prefwin/prefwinappearance.c' || echo '$(srcdir)/'`prefwin/prefwinappearance.c
+
+prefwin/ddb_gui_GTK3_la-prefwinmisc.lo: prefwin/prefwinmisc.c
+	$(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) -c -o prefwin/ddb_gui_GTK3_la-prefwinmisc.lo `test -f 'prefwin/prefwinmisc.c' || echo '$(srcdir)/'`prefwin/prefwinmisc.c
+
+prefwin/ddb_gui_GTK3_la-prefwinnetwork.lo: prefwin/prefwinnetwork.c
+	$(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) -c -o prefwin/ddb_gui_GTK3_la-prefwinnetwork.lo `test -f 'prefwin/prefwinnetwork.c' || echo '$(srcdir)/'`prefwin/prefwinnetwork.c
+
+prefwin/ddb_gui_GTK3_la-prefwinplayback.lo: prefwin/prefwinplayback.c
+	$(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) -c -o prefwin/ddb_gui_GTK3_la-prefwinplayback.lo `test -f 'prefwin/prefwinplayback.c' || echo '$(srcdir)/'`prefwin/prefwinplayback.c
+
+prefwin/ddb_gui_GTK3_la-prefwinplugins.lo: prefwin/prefwinplugins.c
+	$(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) -c -o prefwin/ddb_gui_GTK3_la-prefwinplugins.lo `test -f 'prefwin/prefwinplugins.c' || echo '$(srcdir)/'`prefwin/prefwinplugins.c
+
+prefwin/ddb_gui_GTK3_la-prefwinsound.lo: prefwin/prefwinsound.c
+	$(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) -c -o prefwin/ddb_gui_GTK3_la-prefwinsound.lo `test -f 'prefwin/prefwinsound.c' || echo '$(srcdir)/'`prefwin/prefwinsound.c
+
+ddb_gui_GTK3_la-gtkui-gresources.lo: gtkui-gresources.c
+	$(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) -c -o ddb_gui_GTK3_la-gtkui-gresources.lo `test -f 'gtkui-gresources.c' || echo '$(srcdir)/'`gtkui-gresources.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
+	-rm -rf ../../src/.libs ../../src/_libs
+	-rm -rf covermanager/.libs covermanager/_libs
+	-rm -rf playlist/.libs playlist/_libs
+	-rm -rf prefwin/.libs prefwin/_libs
 install-sdkHEADERS: $(sdk_HEADERS)
 	@$(NORMAL_INSTALL)
 	@list='$(sdk_HEADERS)'; test -n "$(sdkdir)" || list=; \
@@ -1864,13 +1342,15 @@
 	 fi; \
 	done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sdkdir)"; do \
 	 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -1892,21 +1372,26 @@
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 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)
+	-rm -f ../../src/$(am__dirstamp)
+	-rm -f covermanager/$(am__dirstamp)
+	-rm -f playlist/$(am__dirstamp)
+	-rm -f prefwin/$(am__dirstamp)
 
 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 \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1952,7 +1437,6 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1971,7 +1455,7 @@
 
 uninstall-am: uninstall-pkglibLTLIBRARIES uninstall-sdkHEADERS
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
@@ -1988,6 +1472,11 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-pkglibLTLIBRARIES uninstall-sdkHEADERS
 
+.PRECIOUS: Makefile
+
+
+@HAVE_GTK3_TRUE@gtkui-gresources.c: $(resource_files)
+@HAVE_GTK3_TRUE@	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
 # 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.6.2.tar.bz2/plugins/gtkui/actionhandlers.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/actionhandlers.c Changed

@@ -1,6 +1,6 @@
 /*
 gtkui hotkey handlers
- Copyright (C) 2009-2013 Alexey Yakovenko and other contributors
+ Copyright (C) 2009-2013 Oleksiy Yakovenko and other contributors
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -24,242 +24,77 @@
 # include <config.h>
 #endif
 
-#include <string.h>
+#include <gio/gio.h>
 #include <gtk/gtk.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
+#include <deadbeef/deadbeef.h>
 #include "../../gettext.h"
-#include "../../deadbeef.h"
+#include "../../shared/deletefromdisk.h"
+#include "callbacks.h"
+#include "playlist/ddblistview.h"
 #include "gtkui.h"
+#include "gtkui_api.h"
+#include "gtkui_deletefromdisk.h"
+#include "interface.h"
+#include "prefwin/prefwin.h"
 #include "progress.h"
-#include "ddblistview.h"
 #include "search.h"
 #include "support.h"
-#include "wingeom.h"
-#include "interface.h"
 #include "trkproperties.h"
-#include "callbacks.h"
-#include <sys/stat.h>
+#include "wingeom.h"
 
 // disable custom title function, until we have new title formatting (0.7)
 #define DISABLE_CUSTOM_TITLE
 
 extern GtkWidget *mainwin;
 extern DB_functions_t *deadbeef;
-
-static gboolean
-file_filter_func (const GtkFileFilterInfo *filter_info, gpointer data) {
- // get ext
- const char *p = strrchr (filter_info->filename, '.');
- if (!p) {
- return FALSE;
- }
- p++;
-
- // get beginning of fname
- const char *fn = strrchr (filter_info->filename, '/');
- if (!fn) {
- fn = filter_info->filename;
- }
- else {
- fn++;
- }
-
-
- DB_decoder_t **codecs = deadbeef->plug_get_decoder_list ();
- for (int i = 0; codecsi; i++) {
- if (codecsi->exts && codecsi->insert) {
- const char **exts = codecsi->exts;
- for (int e = 0; extse; e++) {
- if (!strcasecmp (extse, p)) {
- return TRUE;
- }
- }
- }
- if (codecsi->prefixes && codecsi->insert) {
- const char **prefixes = codecsi->prefixes;
- for (int e = 0; prefixese; e++) {
- if (!strncasecmp (prefixese, fn, strlen(prefixese)) && *(fn + strlen (prefixese)) == '.') {
- return TRUE;
- }
- }
- }
- }
-#if 0
- if (!strcasecmp (p, "pls")) {
- return TRUE;
- }
- if (!strcasecmp (p, "m3u")) {
- return TRUE;
- }
-#endif
-
- // test container (vfs) formats
- DB_vfs_t **vfsplugs = deadbeef->plug_get_vfs_list ();
- for (int i = 0; vfsplugsi; i++) {
- if (vfsplugsi->is_container) {
- if (vfsplugsi->is_container (filter_info->filename)) {
- return TRUE;
- }
- }
- }
-
- return FALSE;
-}
-
-static GtkFileFilter *
-set_file_filter (GtkWidget *dlg, const char *name) {
- if (!name) {
- name = _("Supported sound formats");
- }
-
- GtkFileFilter* flt;
- flt = gtk_file_filter_new ();
- gtk_file_filter_set_name (flt, name);
-
- gtk_file_filter_add_custom (flt, GTK_FILE_FILTER_FILENAME, file_filter_func, NULL, NULL);
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
- gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dlg), flt);
- flt = gtk_file_filter_new ();
- gtk_file_filter_set_name (flt, _("All files (*)"));
- gtk_file_filter_add_pattern (flt, "*");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
- return flt;
-}
+extern ddb_gtkui_t plugin;
+#define trace(...) { deadbeef->log_detailed (&plugin.gui.plugin, 0, __VA_ARGS__); }
 
 gboolean
 action_open_files_handler_cb (void *userdata) {
- GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Open file(s)..."), GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
-
- set_file_filter (dlg, NULL);
-
- gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dlg), TRUE);
- // restore folder
- deadbeef->conf_lock ();
- gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dlg), deadbeef->conf_get_str_fast ("filechooser.lastdir", ""));
- deadbeef->conf_unlock ();
- int response = gtk_dialog_run (GTK_DIALOG (dlg));
- // store folder
- gchar *folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dlg));
- if (folder) {
- deadbeef->conf_set_str ("filechooser.lastdir", folder);
- g_free (folder);
- }
- if (response == GTK_RESPONSE_OK)
- {
- deadbeef->pl_clear ();
- GSList *lst = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (dlg));
- gtk_widget_destroy (dlg);
- if (lst) {
- gtkui_open_files (lst);
- }
- }
- else {
- gtk_widget_destroy (dlg);
+ GSList *lst = show_file_chooser(_("Open file(s)..."), GTKUI_FILECHOOSER_OPENFILE, TRUE);
+ if (lst) {
+ gtkui_open_files (lst);
 }
 return FALSE;
 }
 
 int
-action_open_files_handler (struct DB_plugin_action_s *action, int ctx) {
+action_open_files_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_open_files_handler_cb, NULL);
 return 0;
 }
 
 gboolean
 action_add_files_handler_cb (void *user_data) {
- GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Add file(s) to playlist..."), GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
-
- set_file_filter (dlg, NULL);
-
- gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dlg), TRUE);
-
- // restore folder
- deadbeef->conf_lock ();
- gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dlg), deadbeef->conf_get_str_fast ("filechooser.lastdir", ""));
- deadbeef->conf_unlock ();
- int response = gtk_dialog_run (GTK_DIALOG (dlg));
- // store folder
- gchar *folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dlg));
- if (folder) {
- deadbeef->conf_set_str ("filechooser.lastdir", folder);
- g_free (folder);
- }
- if (response == GTK_RESPONSE_OK)
- {
- GSList *lst = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (dlg));
- gtk_widget_destroy (dlg);
- if (lst) {
- gtkui_add_files (lst);
- }
- }
- else {
- gtk_widget_destroy (dlg);
+ GSList *lst = show_file_chooser(_("Add file(s) to playlist..."), GTKUI_FILECHOOSER_OPENFILE, TRUE);
+ if (lst) {
+ gtkui_add_files (lst);
 }
 return FALSE;
 }
 
 int
-action_add_files_handler (struct DB_plugin_action_s *action, int ctx) {
+action_add_files_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_add_files_handler_cb, NULL);
 return 0;
 }
 
-static void
-on_follow_symlinks_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- deadbeef->conf_set_int ("add_folders_follow_symlinks", gtk_toggle_button_get_active (togglebutton));
-}
-
 gboolean
 action_add_folders_handler_cb (void *user_data) {
- GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Add folder(s) to playlist..."), GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
-
- GtkWidget *box = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (box);
-
- GtkWidget *check = gtk_check_button_new_with_mnemonic (_("Follow symlinks"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), deadbeef->conf_get_int ("add_folders_follow_symlinks", 0));
- g_signal_connect ((gpointer) check, "toggled",
- G_CALLBACK (on_follow_symlinks_toggled),
- NULL);
- gtk_widget_show (check);
- gtk_box_pack_start (GTK_BOX (box), check, FALSE, FALSE, 0);
-
- gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dlg), box);
-
-// gtk devs broke this in 3.6 - thanks guys
-// set_file_filter (dlg, NULL);
-
- gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dlg), TRUE);
- // restore folder
- deadbeef->conf_lock ();
- gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dlg), deadbeef->conf_get_str_fast ("filechooser.lastdir", ""));
- deadbeef->conf_unlock ();
- int response = gtk_dialog_run (GTK_DIALOG (dlg));
- // store folder
- gchar *folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dlg));
- if (folder) {
- deadbeef->conf_set_str ("filechooser.lastdir", folder);
- g_free (folder);
- }
- if (response == GTK_RESPONSE_OK)
- {
- //gchar *folder = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dlg));
- GSList *lst = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (dlg));
- gtk_widget_destroy (dlg);
- if (lst) {
- gtkui_add_dirs (lst);
- }
- }
- else {
- gtk_widget_destroy (dlg);
+ GSList *lst = show_file_chooser(_("Add folder(s) to playlist..."), GTKUI_FILECHOOSER_OPENFOLDER, TRUE);
+ if (lst) {
+ gtkui_add_dirs (lst);
 }
 return FALSE;
 }
 
 int
-action_add_folders_handler (struct DB_plugin_action_s *action, int ctx) {
+action_add_folders_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_add_folders_handler_cb, NULL);
 return 0;
 }
@@ -271,7 +106,7 @@
 }
 
 int
-action_quit_handler (DB_plugin_action_t *act, int ctx) {
+action_quit_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_quit_handler_cb, NULL);
 return 0;
 }
@@ -289,16 +124,12 @@
 it = next;
 }
 deadbeef->pl_unlock ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
- DdbListview *pl = DDB_LISTVIEW (lookup_widget (searchwin, "searchlist"));
- if (pl) {
- ddb_listview_refresh (pl, DDB_REFRESH_LIST);
- }
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_SELECTION, 0);
 return FALSE;
 }
 
 int
-action_deselect_all_handler (struct DB_plugin_action_s *action, int ctx) {
+action_deselect_all_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 g_idle_add (action_deselect_all_handler_cb, NULL);
 return 0;
 }
@@ -306,16 +137,12 @@
 gboolean
 action_select_all_handler_cb (void *user_data) {
 deadbeef->pl_select_all ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
- DdbListview *pl = DDB_LISTVIEW (lookup_widget (searchwin, "searchlist"));
- if (pl) {
- ddb_listview_refresh (pl, DDB_REFRESH_LIST);
- }
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_SELECTION, 0);
 return FALSE;
 }
 
 int
-action_select_all_handler (struct DB_plugin_action_s *action, int ctx) {
+action_select_all_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 g_idle_add (action_select_all_handler_cb, NULL);
 return 0;
 }
@@ -325,22 +152,30 @@
 int pl = gtkui_add_new_playlist ();
 if (pl != -1) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return FALSE;
 }
 
 int
-action_new_playlist_handler (struct DB_plugin_action_s *action, int ctx) {
+action_new_playlist_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_new_playlist_handler_cb, NULL);
 return 0;
 }
 
 int
-action_remove_current_playlist_handler (struct DB_plugin_action_s *action, int ctx) {
+action_remove_current_playlist_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 int idx = deadbeef->plt_get_curr_idx ();
 if (idx != -1) {
- deadbeef->plt_remove (idx);
+ gtkui_remove_playlist_at_index (idx);
+ }
+ return 0;
+}
+
+int
+action_rename_current_playlist_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ int idx = deadbeef->plt_get_curr_idx ();
+ if (idx != -1) {
+ gtkui_rename_playlist_at_index(idx);
 }
 return 0;
 }
@@ -352,7 +187,7 @@
 }
 
 int
-action_toggle_mainwin_handler (struct DB_plugin_action_s *action, int ctx) {
+action_toggle_mainwin_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 g_idle_add (action_toggle_mainwin_handler_cb, NULL);
 return 0;
 }
@@ -373,7 +208,7 @@
 }
 
 int
-action_show_mainwin_handler (struct DB_plugin_action_s *action, int ctx) {
+action_show_mainwin_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 g_idle_add (action_show_mainwin_handler_cb, NULL);
 return 0;
 }
@@ -388,11 +223,13 @@
 }
 
 int
-action_hide_mainwin_handler (struct DB_plugin_action_s *action, int ctx) {
+action_hide_mainwin_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 g_idle_add (action_hide_mainwin_handler_cb, NULL);
 return 0;
 }
 
+// FIXME: this functionality was supposed to be enabled in 0.7.0, but was forgotten
+#ifndef DISABLE_CUSTOM_TITLE
 static void
 on_toggle_set_custom_title (GtkToggleButton *togglebutton, gpointer user_data) {
 gboolean active = gtk_toggle_button_get_active (togglebutton);
@@ -403,6 +240,7 @@
 
 deadbeef->conf_save ();
 }
+#endif
 
 gboolean
 action_add_location_handler_cb (void *user_data) {
@@ -430,30 +268,38 @@
 #endif
 
 gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+ gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (mainwin));
 int res = gtk_dialog_run (GTK_DIALOG (dlg));
 if (res == GTK_RESPONSE_OK) {
 GtkEntry *entry = GTK_ENTRY (lookup_widget (dlg, "addlocation_entry"));
 if (entry) {
 const char *text = gtk_entry_get_text (entry);
 if (text) {
+ char *text_copy = strdup(text);
+ char *trimmed_text = gtkui_trim_whitespace(text_copy, strlen(text_copy));
+
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
 if (!deadbeef->plt_add_files_begin (plt, 0)) {
 DB_playItem_t *tail = deadbeef->plt_get_last (plt, PL_MAIN);
- DB_playItem_t *it = deadbeef->plt_insert_file2 (0, plt, tail, text, NULL, NULL, NULL);
+ DB_playItem_t *it = deadbeef->plt_insert_file2 (0, plt, tail, trimmed_text, NULL, NULL, NULL);
 #ifndef DISABLE_CUSTOM_TITLE
 if (it && deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
 deadbeef->pl_replace_meta (it, ":CUSTOM_TITLE", gtk_entry_get_text (GTK_ENTRY (ct)));
 }
+#else
+# pragma unused(it)
 #endif
 if (tail) {
 deadbeef->pl_item_unref (tail);
 }
 deadbeef->plt_add_files_end (plt, 0);
- playlist_refresh ();
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 }
 if (plt) {
 deadbeef->plt_unref (plt);
 }
+
+ free (text_copy);
 }
 }
 }
@@ -462,7 +308,7 @@
 }
 
 int
-action_add_location_handler (DB_plugin_action_t *act, int ctx) {
+action_add_location_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_add_location_handler_cb, NULL);
 return 0;
 }
@@ -472,19 +318,19 @@
 gboolean
 action_show_help_handler_cb (void *user_data) {
 char fnamePATH_MAX;
- snprintf (fname, sizeof (fname), "%s/%s", deadbeef->get_doc_dir (), _("help.txt"));
+ snprintf (fname, sizeof (fname), "%s/%s", deadbeef->get_system_dir(DDB_SYS_DIR_DOC), _("help.txt"));
 gtkui_show_info_window (fname, _("Help"), &helpwindow);
 return FALSE;
 }
 
 int
-action_show_help_handler (DB_plugin_action_t *act, int ctx) {
+action_show_help_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_show_help_handler_cb, NULL);
 return 0;
 }
 
 int
-action_remove_from_playlist_handler (DB_plugin_action_t *act, int ctx) {
+action_remove_from_playlist_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 if (ctx == DDB_ACTION_CTX_SELECTION) {
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
 if (plt) {
@@ -498,154 +344,116 @@
 }
 deadbeef->plt_save_config (plt);
 deadbeef->plt_unref (plt);
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 }
 }
 else if (ctx == DDB_ACTION_CTX_PLAYLIST) {
- deadbeef->pl_clear ();
- deadbeef->pl_save_current ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ ddb_playlist_t *plt_curr = deadbeef->plt_get_curr ();
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ deadbeef->plt_clear (plt);
+ deadbeef->plt_save_config (plt);
+ if (plt == plt_curr) {
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+ }
+ deadbeef->plt_unref (plt);
+ deadbeef->plt_unref (plt_curr);
 }
 else if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
- int success = 0;
- deadbeef->pl_lock ();
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
 if (it) {
+ deadbeef->pl_lock ();
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
 if (plt) {
 int idx = deadbeef->plt_get_item_idx (plt, it, PL_MAIN);
 if (idx != -1) {
 deadbeef->plt_remove_item (plt, it);
- deadbeef->pl_save_current ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->plt_save_config (plt);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 }
 deadbeef->plt_unref (plt);
 }
+ deadbeef->pl_unlock ();
 deadbeef->pl_item_unref (it);
 }
- deadbeef->pl_unlock ();
 }
 return 0;
 }
 
-void
-delete_and_remove_track (const char *uri, ddb_playlist_t *plt, ddb_playItem_t *it) {
- int res = unlink (uri);
 
- // check if file exists
- struct stat buf;
- memset (&buf, 0, sizeof (buf));
- int stat_res = stat (uri, &buf);
- if (stat_res != 0) {
- deadbeef->plt_remove_item (plt, it);
- }
+static ddbDeleteFromDiskController_t _deleteCtl;
+
+static void
+_deleteCompleted (ddbDeleteFromDiskController_t ctl, int cancelled) {
+ ddbDeleteFromDiskControllerFree(ctl);
+ _deleteCtl = NULL;
 }
 
 gboolean
 action_delete_from_disk_handler_cb (void *data) {
- int ctx = (intptr_t)data;
- if (deadbeef->conf_get_int ("gtkui.delete_files_ask", 1)) {
- GtkWidget *dlg = gtk_message_dialog_new (GTK_WINDOW (mainwin), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("Delete files from disk"));
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), _("Files will be lost. Proceed?\n(This dialog can be turned off in GTKUI plugin settings)"));
- gtk_window_set_title (GTK_WINDOW (dlg), _("Warning"));
-
- int response = gtk_dialog_run (GTK_DIALOG (dlg));
- gtk_widget_destroy (dlg);
- if (response != GTK_RESPONSE_YES) {
- return FALSE;
- }
+ if (_deleteCtl) {
+ return FALSE;
 }
 
+ ddbDeleteFromDiskControllerDelegate_t delegate = {
+ .warningMessageForCtx = gtkui_warning_message_for_ctx,
+ .deleteFile = gtkui_delete_file,
+ .completed = _deleteCompleted,
+ };
+
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
 if (!plt) {
 return FALSE;
 }
- deadbeef->pl_lock ();
 
- if (ctx == DDB_ACTION_CTX_SELECTION) {
- DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
- while (it) {
- const char *uri = deadbeef->pl_find_meta (it, ":URI");
- if (deadbeef->pl_is_selected (it) && deadbeef->is_local_file (uri)) {
- delete_and_remove_track (uri, plt, it);
- }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
- }
+ ddb_action_context_t ctx = (int)(intptr_t)data;
 
- deadbeef->pl_save_current ();
- }
- else if (ctx == DDB_ACTION_CTX_PLAYLIST) {
- DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
- while (it) {
- const char *uri = deadbeef->pl_find_meta (it, ":URI");
- if (deadbeef->is_local_file (uri)) {
- delete_and_remove_track (uri, plt, it);
-// FIXME: this dialog should allow something like "cancel" and "ignore all", then
-// it will be usable
-// else {
-// GtkWidget *dlg = gtk_message_dialog_new (GTK_WINDOW (mainwin), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("Can't delete the file. Perhaps it doesn't exist, read-only, or part of read-only VFS, or all of the above."));
-// gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), uri);
-// gtk_window_set_title (GTK_WINDOW (dlg), _("Warning"));
-//
-// int response = gtk_dialog_run (GTK_DIALOG (dlg));
-// gtk_widget_destroy (dlg);
-// }
- }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
- }
+ _deleteCtl = ddbDeleteFromDiskControllerInitWithPlaylist(ddbDeleteFromDiskControllerAlloc(), plt, ctx);
+
+ ddbDeleteFromDiskControllerSetShouldSkipDeletedTracks(_deleteCtl, deadbeef->conf_get_int ("gtkui.skip_deleted_songs", 0));
+
+ ddbDeleteFromDiskControllerRunWithDelegate(_deleteCtl, delegate);
 
- deadbeef->pl_save_current ();
- }
- else if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
- if (it) {
- const char *uri = deadbeef->pl_find_meta (it, ":URI");
- if (deadbeef->is_local_file (uri)) {
- int idx = deadbeef->plt_get_item_idx (plt, it, PL_MAIN);
- if (idx != -1) {
- delete_and_remove_track (uri, plt, it);
- }
- }
- deadbeef->pl_item_unref (it);
- }
- }
- deadbeef->pl_unlock ();
 deadbeef->plt_unref (plt);
 
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
 return FALSE;
 }
-
 int
-action_delete_from_disk_handler (DB_plugin_action_t *act, int ctx) {
+action_delete_from_disk_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_delete_from_disk_handler_cb, (void *)(intptr_t)ctx);
 return 0;
 }
 
+typedef struct {
+ ddb_action_context_t ctx;
+ ddb_playlist_t *plt;
+} trkproperties_action_ctx_t;
+
 gboolean
 action_show_track_properties_handler_cb (void *data) {
- show_track_properties_dlg ((intptr_t)data);
+ trkproperties_action_ctx_t *ctx = data;
+ show_track_properties_dlg (ctx->ctx, ctx->plt);
+ deadbeef->plt_unref (ctx->plt);
+ free (data);
 return FALSE;
 }
 
 int
-action_show_track_properties_handler (DB_plugin_action_t *act, int ctx) {
- gdk_threads_add_idle (action_show_track_properties_handler_cb, (void *)(intptr_t)ctx);
+action_show_track_properties_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ trkproperties_action_ctx_t *data = calloc (1, sizeof (trkproperties_action_ctx_t));
+ data->ctx = ctx;
+ data->plt = deadbeef->action_get_playlist ();
+ gdk_threads_add_idle (action_show_track_properties_handler_cb, data);
 return 0;
 }
 
 gboolean
 action_find_handler_cb (void *data) {
- search_start (); 
+ search_start ();
 return FALSE;
 }
 
 int
-action_find_handler (DB_plugin_action_t *act, int ctx) {
+action_find_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_find_handler_cb, NULL);
 return 0;
 }
@@ -659,7 +467,7 @@
 }
 
 int
-action_scroll_follows_playback_handler (DB_plugin_action_t *act, int ctx) {
+action_scroll_follows_playback_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_scroll_follows_playback_handler_cb, NULL);
 return 0;
 }
@@ -673,35 +481,11 @@
 }
 
 int
-action_cursor_follows_playback_handler (DB_plugin_action_t *act, int ctx) {
+action_cursor_follows_playback_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_cursor_follows_playback_handler_cb, NULL);
 return 0;
 }
 
-static gboolean
-playlist_filter_func (const GtkFileFilterInfo *filter_info, gpointer data) {
- // get ext
- const char *p = strrchr (filter_info->filename, '.');
- if (!p) {
- return FALSE;
- }
- p++;
- DB_playlist_t **plug = deadbeef->plug_get_playlist_list ();
- for (int i = 0; plugi; i++) {
- if (plugi->extensions && plugi->load) {
- const char **exts = plugi->extensions;
- if (exts) {
- for (int e = 0; extse; e++) {
- if (!strcasecmp (extse, p)) {
- return TRUE;
- }
- }
- }
- }
- }
- return FALSE;
-}
-
 static void
 load_playlist_thread (void *data) {
 char *fname = data;
@@ -710,110 +494,46 @@
 if (!deadbeef->plt_add_files_begin (plt, 0)) {
 deadbeef->plt_clear (plt);
 int abort = 0;
- DB_playItem_t *it = deadbeef->plt_load2 (0, plt, NULL, fname, &abort, NULL, NULL);
+ (void)deadbeef->plt_load2 (0, plt, NULL, fname, &abort, NULL, NULL);
 deadbeef->plt_save_config (plt);
 deadbeef->plt_add_files_end (plt, 0);
 }
 deadbeef->plt_unref (plt);
 }
 g_free (fname);
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 }
 
-
 gboolean
 action_load_playlist_handler_cb (void *data) {
- GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Load Playlist"), GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
+ GSList *lst = show_file_chooser(_("Load Playlist"), GTKUI_FILECHOOSER_LOADPLAYLIST, FALSE);
 
- // restore folder
- deadbeef->conf_lock ();
- gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dlg), deadbeef->conf_get_str_fast ("filechooser.playlist.lastdir", ""));
- deadbeef->conf_unlock ();
-
- GtkFileFilter* flt;
- flt = gtk_file_filter_new ();
- gtk_file_filter_set_name (flt, "Supported playlist formats");
- gtk_file_filter_add_custom (flt, GTK_FILE_FILTER_FILENAME, playlist_filter_func, NULL, NULL);
- gtk_file_filter_add_pattern (flt, "*.dbpl");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
- gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dlg), flt);
- flt = gtk_file_filter_new ();
- gtk_file_filter_set_name (flt, _("Other files (*)"));
- gtk_file_filter_add_pattern (flt, "*");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
- 
- int res = gtk_dialog_run (GTK_DIALOG (dlg));
- // store folder
- gchar *folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dlg));
- if (folder) {
- deadbeef->conf_set_str ("filechooser.playlist.lastdir", folder);
- g_free (folder);
- }
- if (res == GTK_RESPONSE_OK)
+ if (lst)
 {
- gchar *fname = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dlg));
- gtk_widget_destroy (dlg);
+ gchar *fname = g_slist_nth_data (lst, 0);
 if (fname) {
 uintptr_t tid = deadbeef->thread_start (load_playlist_thread, fname);
 deadbeef->thread_detach (tid);
 }
- }
- else {
- gtk_widget_destroy (dlg);
+ g_slist_free(lst);
 }
 return FALSE;
 }
 
 int
-action_load_playlist_handler (DB_plugin_action_t *act, int ctx) {
+action_load_playlist_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_load_playlist_handler_cb, NULL);
 return 0;
 }
 
 gboolean
 action_save_playlist_handler_cb (void *data) {
- GtkWidget *dlg = gtk_file_chooser_dialog_new (_("Save Playlist As"), GTK_WINDOW (mainwin), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL);
+ GSList *lst = show_file_chooser(_("Save Playlist As"), GTKUI_FILECHOOSER_SAVEPLAYLIST, FALSE);
 
- gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dlg), TRUE);
- gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dlg), "untitled.dbpl");
- // restore folder
- deadbeef->conf_lock ();
- gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dlg), deadbeef->conf_get_str_fast ("filechooser.playlist.lastdir", ""));
- deadbeef->conf_unlock ();
 
- GtkFileFilter* flt;
- flt = gtk_file_filter_new ();
- gtk_file_filter_set_name (flt, _("DeaDBeeF playlist files (*.dbpl)"));
- gtk_file_filter_add_pattern (flt, "*.dbpl");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
- DB_playlist_t **plug = deadbeef->plug_get_playlist_list ();
- for (int i = 0; plugi; i++) {
- if (plugi->extensions && plugi->load) {
- const char **exts = plugi->extensions;
- if (exts && plugi->save) {
- for (int e = 0; extse; e++) {
- char s100;
- flt = gtk_file_filter_new ();
- gtk_file_filter_set_name (flt, extse);
- snprintf (s, sizeof (s), "*.%s", extse);
- gtk_file_filter_add_pattern (flt, s);
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
- }
- }
- }
- }
-
- int res = gtk_dialog_run (GTK_DIALOG (dlg));
- // store folder
- gchar *folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dlg));
- if (folder) {
- deadbeef->conf_set_str ("filechooser.playlist.lastdir", folder);
- g_free (folder);
- }
- if (res == GTK_RESPONSE_OK)
+ if (lst)
 {
- gchar *fname = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dlg));
- gtk_widget_destroy (dlg);
+ gchar *fname = g_slist_nth_data (lst, 0);
 
 if (fname) {
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
@@ -825,16 +545,14 @@
 deadbeef->plt_unref (plt);
 }
 g_free (fname);
+ g_slist_free(lst);
 }
 }
- else {
- gtk_widget_destroy (dlg);
- }
 return FALSE;
 }
 
 int
-action_save_playlist_handler (DB_plugin_action_t *act, int ctx) {
+action_save_playlist_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_save_playlist_handler_cb, NULL);
 return 0;
 }
@@ -849,7 +567,7 @@
 }
 
 int
-action_toggle_menu_handler (DB_plugin_action_t *act, int ctx) {
+action_toggle_menu_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_toggle_menu_handler_cb, NULL);
 return 0;
 }
@@ -868,7 +586,7 @@
 }
 
 int
-action_toggle_statusbar_handler (DB_plugin_action_t *act, int ctx) {
+action_toggle_statusbar_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_toggle_statusbar_handler_cb, NULL);
 return 0;
 }
@@ -883,19 +601,19 @@
 }
 
 int
-action_toggle_designmode_handler (DB_plugin_action_t *act, int ctx) {
+action_toggle_designmode_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_toggle_designmode_handler_cb, NULL);
 return 0;
 }
 
 gboolean
 action_preferences_handler_cb (void *data) {
- gtkui_run_preferences_dlg ();
+ prefwin_run (-1);
 return FALSE;
 }
 
 int
-action_preferences_handler (DB_plugin_action_t *act, int ctx) {
+action_preferences_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_preferences_handler_cb, NULL);
 return 0;
 }
@@ -904,32 +622,41 @@
 action_sort_custom_handler_cb (void *data) {
 GtkWidget *dlg = create_sortbydlg ();
 gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
- 
+
 GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (dlg, "sortorder"));
- GtkEntry *entry = GTK_ENTRY (lookup_widget (dlg, "sortfmt"));
- 
+ GtkTextView *sortfmt = GTK_TEXT_VIEW (lookup_widget (dlg, "sortfmt"));
+ GtkTextBuffer *sortbuffer = gtk_text_view_get_buffer(sortfmt);
+
 gtk_combo_box_set_active (combo, deadbeef->conf_get_int ("gtkui.sortby_order", 0));
 deadbeef->conf_lock ();
- gtk_entry_set_text (entry, deadbeef->conf_get_str_fast ("gtkui.sortby_fmt", ""));
+ const char* fmt = deadbeef->conf_get_str_fast ("gtkui.sortby_fmt_v2", "");
+ gtk_text_buffer_set_text (sortbuffer, fmt, (gint)strlen(fmt));
 deadbeef->conf_unlock ();
 
 int r = gtk_dialog_run (GTK_DIALOG (dlg));
 
 if (r == GTK_RESPONSE_OK) {
 GtkComboBox *combo = GTK_COMBO_BOX (lookup_widget (dlg, "sortorder"));
- GtkEntry *entry = GTK_ENTRY (lookup_widget (dlg, "sortfmt"));
+ GtkTextView *sortfmt = GTK_TEXT_VIEW (lookup_widget (dlg, "sortfmt"));
+ GtkTextBuffer *sortbuffer = gtk_text_view_get_buffer(sortfmt);
 int order = gtk_combo_box_get_active (combo);
- const char *fmt = gtk_entry_get_text (entry);
+ GtkTextIter start, end;
+ gtk_text_buffer_get_start_iter(sortbuffer, &start);
+ gtk_text_buffer_get_end_iter(sortbuffer, &end);
+ char *fmt = gtk_text_buffer_get_text (sortbuffer, &start, &end, FALSE);
 
 deadbeef->conf_set_int ("gtkui.sortby_order", order);
- deadbeef->conf_set_str ("gtkui.sortby_fmt", fmt);
+ deadbeef->conf_set_str ("gtkui.sortby_fmt_v2", fmt);
+
 
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- deadbeef->plt_sort (plt, PL_MAIN, -1, fmt, order == 0 ? DDB_SORT_ASCENDING : DDB_SORT_DESCENDING);
+ deadbeef->plt_sort_v2 (plt, PL_MAIN, -1, fmt, order == 0 ? DDB_SORT_ASCENDING : DDB_SORT_DESCENDING);
 deadbeef->plt_save_config (plt);
 deadbeef->plt_unref (plt);
 
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ free( fmt);
+
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 }
 
 gtk_widget_destroy (dlg);
@@ -938,16 +665,16 @@
 }
 
 int
-action_sort_custom_handler (DB_plugin_action_t *act, int ctx) {
+action_sort_custom_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 gdk_threads_add_idle (action_sort_custom_handler_cb, NULL);
 return 0;
 }
 
 int
-action_crop_selected_handler (DB_plugin_action_t *act, int ctx) {
+action_crop_selected_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 deadbeef->pl_crop_selected ();
 deadbeef->pl_save_current ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 return 0;
 }
 
@@ -961,7 +688,7 @@
 }
 
 int
-action_toggle_eq_handler (DB_plugin_action_t *act, int ctx) {
+action_toggle_eq_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_toggle_eq_handler_cb, NULL);
 return 0;
 }
@@ -977,7 +704,7 @@
 }
 
 int
-action_show_eq_handler(DB_plugin_action_t *act, int ctx) {
+action_show_eq_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_show_eq_handler_cb, NULL);
 return 0;
 }
@@ -993,7 +720,7 @@
 }
 
 int
-action_hide_eq_handler(DB_plugin_action_t *act, int ctx) {
+action_hide_eq_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_hide_eq_handler_cb, NULL);
 return 0;
 }
@@ -1005,7 +732,7 @@
 }
 
 int
-action_playback_loop_off_handler(DB_plugin_action_t *act, int ctx) {
+action_playback_loop_off_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_playback_loop_off_handler_cb, NULL);
 return 0;
 }
@@ -1017,7 +744,7 @@
 }
 
 int
-action_playback_loop_single_handler(DB_plugin_action_t *act, int ctx) {
+action_playback_loop_single_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_playback_loop_single_handler_cb, NULL);
 return 0;
 }
@@ -1029,7 +756,7 @@
 }
 
 int
-action_playback_loop_all_handler(DB_plugin_action_t *act, int ctx) {
+action_playback_loop_all_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_playback_loop_all_handler_cb, NULL);
 return 0;
 }
@@ -1041,7 +768,7 @@
 }
 
 int
-action_playback_order_random_handler(DB_plugin_action_t *act, int ctx) {
+action_playback_order_random_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_playback_order_random_handler_cb, NULL);
 return 0;
 }
@@ -1053,7 +780,7 @@
 }
 
 int
-action_playback_order_shuffle_albums_handler(DB_plugin_action_t *act, int ctx) {
+action_playback_order_shuffle_albums_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_playback_order_shuffle_albums_handler_cb, NULL);
 return 0;
 }
@@ -1065,7 +792,7 @@
 }
 
 int
-action_playback_order_shuffle_handler(DB_plugin_action_t *act, int ctx) {
+action_playback_order_shuffle_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_playback_order_shuffle_handler_cb, NULL);
 return 0;
 }
@@ -1077,25 +804,25 @@
 }
 
 int
-action_playback_order_linear_handler(DB_plugin_action_t *act, int ctx) {
+action_playback_order_linear_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_playback_order_linear_handler_cb, NULL);
 return 0;
 }
 
 gboolean
 action_playback_order_cycle_handler_cb (void *data) {
- int ord = deadbeef->conf_get_int ("playback.order", PLAYBACK_ORDER_LINEAR);
- switch (ord) {
- case PLAYBACK_ORDER_LINEAR:
+ int shuffle = deadbeef->streamer_get_shuffle ();
+ switch (shuffle) {
+ case DDB_SHUFFLE_OFF:
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_shuffle")), 1);
 break;
- case PLAYBACK_ORDER_SHUFFLE_TRACKS:
+ case DDB_SHUFFLE_TRACKS:
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_shuffle_albums")), 1);
 break;
- case PLAYBACK_ORDER_SHUFFLE_ALBUMS:
+ case DDB_SHUFFLE_ALBUMS:
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_random")), 1);
 break;
- case PLAYBACK_ORDER_RANDOM:
+ case DDB_SHUFFLE_RANDOM:
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "order_linear")), 1);
 break;
 }
@@ -1103,22 +830,22 @@
 }
 
 int
-action_playback_order_cycle_handler(DB_plugin_action_t *act, int ctx) {
+action_playback_order_cycle_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_playback_order_cycle_handler_cb, NULL);
 return 0;
 }
 
 gboolean
 action_playback_loop_cycle_handler_cb (void *data) {
- int ord = deadbeef->conf_get_int ("playback.loop", PLAYBACK_MODE_LOOP_ALL);
- switch (ord) {
- case PLAYBACK_MODE_LOOP_ALL:
+ int repeat = deadbeef->streamer_get_repeat ();
+ switch (repeat) {
+ case DDB_REPEAT_ALL:
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_single")), 1);
 break;
- case PLAYBACK_MODE_LOOP_SINGLE:
+ case DDB_REPEAT_SINGLE:
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_disable")), 1);
 break;
- case PLAYBACK_MODE_NOLOOP:
+ case DDB_REPEAT_OFF:
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "loop_all")), 1);
 break;
 }
@@ -1126,7 +853,19 @@
 }
 
 int
-action_playback_loop_cycle_handler(DB_plugin_action_t *act, int ctx) {
+action_playback_loop_cycle_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
 g_idle_add (action_playback_loop_cycle_handler_cb, NULL);
 return 0;
 }
+
+gboolean
+action_toggle_logwindow_handler_cb (void *data) {
+ gtkui_toggle_log_window();
+ return FALSE;
+}
+
+int
+action_toggle_logwindow_handler(DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ g_idle_add (action_toggle_logwindow_handler_cb, NULL);
+ return 0;
+}

deadbeef-0.6.2.tar.bz2/plugins/gtkui/actionhandlers.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/actionhandlers.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/actions.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/actions.c Changed

@@ -1,42 +1,49 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>,
- 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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
 #include "gtkui.h"
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include "support.h"
 #include "actions.h"
 
 #define trace(...) { fprintf(stderr, __VA_ARGS__); }
 //#define trace(fmt,...)
 
-#define GLADE_HOOKUP_OBJECT(component,widget,name) \
+#define HOOKUP_OBJECT(component,widget,name) \
 g_object_set_data_full (G_OBJECT (component), name, \
 g_object_ref(G_OBJECT(widget)), (GDestroyNotify) g_object_unref)
 
 static gboolean
 menu_action_cb (void *ctx) {
 DB_plugin_action_t *action = ctx;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 if (action->callback) {
+#pragma GCC diagnostic pop
 gtkui_exec_action_14 (action, -1);
 }
 else if (action->callback2) {
@@ -49,9 +56,6 @@
 on_actionitem_activate (GtkMenuItem *menuitem,
 DB_plugin_action_t *action)
 {
- // these actions are always in the MAIN context, or they are coming from new
- // plugins, so we don't have to care about the user data for <=1.4 plugins.
- // aren't we?..
 gdk_threads_add_idle (menu_action_cb, action);
 }
 
@@ -77,126 +81,217 @@
 }
 }
 
-void
-add_mainmenu_actions (void)
-{
- GtkWidget *menubar = lookup_widget (mainwin, "menubar");
- // remove all plugaction_*** menu items and empty submenus
- gtk_container_foreach (GTK_CONTAINER (menubar), remove_actions, menubar);
-
- // add new
+int
+menu_add_action_items(GtkWidget *menu, int selected_count, ddb_playItem_t *selected_track, ddb_action_context_t action_context, menu_action_activate_callback_t activate_callback) {
+ int hide_remove_from_disk = deadbeef->conf_get_int ("gtkui.hide_remove_from_disk", 0);
 DB_plugin_t **plugins = deadbeef->plug_get_list();
 int i;
-
+ int added_entries = 0;
 for (i = 0; pluginsi; i++)
 {
 if (!pluginsi->get_actions)
 continue;
 
- DB_plugin_action_t *actions = pluginsi->get_actions (NULL);
+ DB_plugin_action_t *actions = pluginsi->get_actions (selected_track);
 DB_plugin_action_t *action;
 
+ int count = 0;
 for (action = actions; action; action = action->next)
 {
- char *tmp = NULL;
+ if (action->name && !strcmp (action->name, "delete_from_disk") && hide_remove_from_disk) {
+ continue;
+ }
 
- int has_addmenu = (action->flags & DB_ACTION_COMMON) && ((action->flags & DB_ACTION_ADD_MENU) || (action->callback));
+ if (action->flags&DB_ACTION_DISABLED) {
+ continue;
+ }
 
- if (!has_addmenu)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ if (!((action->callback2 && (action->flags & DB_ACTION_ADD_MENU)) || action->callback)) {
+#pragma GCC diagnostic pop
 continue;
+ }
 
- // 1st check if we have slashes
- const char *slash = action->title;
- while (NULL != (slash = strchr (slash, '/'))) {
- if (slash && slash > action->title && *(slash-1) == '\\') {
- slash++;
+ if (action_context == DDB_ACTION_CTX_SELECTION) {
+ if ((action->flags & DB_ACTION_COMMON)
+ || !(action->flags & (DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_SINGLE_TRACK))) {
 continue;
 }
- break;
 }
- if (!slash) {
- continue;
+
+ if (action_context == DDB_ACTION_CTX_PLAYLIST) {
+ if (action->flags & DB_ACTION_EXCLUDE_FROM_CTX_PLAYLIST) {
+ continue;
+ }
+ if (action->flags & DB_ACTION_COMMON) {
+ continue;
+ }
+ }
+ else if (action_context == DDB_ACTION_CTX_MAIN) {
+ if (!((action->flags & (DB_ACTION_COMMON|DB_ACTION_ADD_MENU)) == (DB_ACTION_COMMON|DB_ACTION_ADD_MENU))) {
+ continue;
+ }
+ const char *slash_test = action->title;
+ while (NULL != (slash_test = strchr (slash_test, '/'))) {
+ if (slash_test && slash_test > action->title && *(slash_test-1) == '\\') {
+ slash_test++;
+ continue;
+ }
+ break;
+ }
+
+ if (slash_test == NULL) {
+ continue;
+ }
 }
 
- char *ptr = tmp = strdup (action->title);
+
+ // create submenus (separated with '/')
+ const char *prev = action->title;
+ while (*prev && *prev == '/') {
+ prev++;
+ }
 
 char *prev_title = NULL;
 
- GtkWidget *current = menubar;
- GtkWidget *previous;
+ GtkWidget *current = menu;
+ GtkWidget *previous = NULL;
 
- while (1)
- {
- // find unescaped forward slash
- char *slash = strchr (ptr, '/');
- if (slash && slash > ptr && *(slash-1) == '\\') {
- ptr = slash + 1;
- continue;
- }
+ for (;;) {
+ const char *slash = strchr (prev, '/');
+ if (slash && *(slash-1) != '\\') {
+ char nameslash-prev+1;
+ // replace \/ with /
+ const char *p = prev;
+ char *t = name;
+ while (*p && p < slash) {
+ if (*p == '\\' && *(p+1) == '/') {
+ *t++ = '/';
+ p += 2;
+ }
+ else {
+ *t++ = *p++;
+ }
+ }
+ *t = 0;
 
- if (!slash)
- {
- GtkWidget *actionitem;
- actionitem = gtk_image_menu_item_new_with_mnemonic (_(ptr));
- gtk_widget_show (actionitem);
-
- /* Here we have special cases for different submenus */
- if (0 == strcmp ("File", prev_title))
- gtk_menu_shell_insert (GTK_MENU_SHELL (current), actionitem, 5);
- else if (0 == strcmp ("Edit", prev_title))
- gtk_menu_shell_insert (GTK_MENU_SHELL (current), actionitem, 7);
- else {
- gtk_container_add (GTK_CONTAINER (current), actionitem);
+ char menuname 1024;
+
+ snprintf (menuname, sizeof (menuname), "%s_menu", name);
+
+ previous = current;
+ current = (GtkWidget*) g_object_get_data (G_OBJECT (menu), menuname);
+ if (!current) {
+ current = (GtkWidget*) g_object_get_data (G_OBJECT (mainwin), menuname);
 }
+ if (!current)
+ {
+ GtkWidget *newitem;
+
+ newitem = gtk_menu_item_new_with_mnemonic (_(name));
+ gtk_widget_show (newitem);
+
+ //If we add new submenu in main bar, add it before 'Help'
+ if (NULL == prev_title)
+ gtk_menu_shell_insert (GTK_MENU_SHELL (previous), newitem, 4);
+ else
+ gtk_container_add (GTK_CONTAINER (previous), newitem);
 
- g_signal_connect ((gpointer) actionitem, "activate",
- G_CALLBACK (on_actionitem_activate),
- action);
- g_object_set_data_full (G_OBJECT (actionitem), "plugaction", strdup (action->name), free);
+ current = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (newitem), current);
+ HOOKUP_OBJECT (menu, current, menuname);
+ }
+ free (prev_title);
+ prev_title = strdup (name);
+ }
+ else {
 break;
 }
- *slash = 0;
- char menuname 1024;
+ prev = slash+1;
+ }
 
- snprintf (menuname, sizeof (menuname), "%s_menu", ptr);
 
- previous = current;
- current = lookup_widget (mainwin, menuname);
- if (!current)
- {
- GtkWidget *newitem;
+ count++;
+ added_entries++;
+ GtkWidget *actionitem;
 
- newitem = gtk_menu_item_new_with_mnemonic (ptr);
- gtk_widget_show (newitem);
+ // replace \/ with /
+ const char *p = current ? prev : action->title;
+ char titlestrlen (p)+1;
+ char *t = title;
+ while (*p) {
+ if (*p == '\\' && *(p+1) == '/') {
+ *t++ = '/';
+ p += 2;
+ }
+ else {
+ *t++ = *p++;
+ }
+ }
+ *t = 0;
 
- //If we add new submenu in main bar, add it before 'Help'
- if (NULL == prev_title)
- gtk_menu_shell_insert (GTK_MENU_SHELL (previous), newitem, 4);
- else
- gtk_container_add (GTK_CONTAINER (previous), newitem);
+ actionitem = gtk_menu_item_new_with_mnemonic (_(title));
+ gtk_widget_show (actionitem);
 
- current = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (newitem), current);
- GLADE_HOOKUP_OBJECT (mainwin, current, menuname);
- }
- prev_title = ptr;
- ptr = slash + 1;
+ if (action_context == DDB_ACTION_CTX_MAIN && prev_title && 0 == strcmp ("File", prev_title))
+ gtk_menu_shell_insert (GTK_MENU_SHELL (current), actionitem, 5);
+ else if (action_context == DDB_ACTION_CTX_MAIN && prev_title && 0 == strcmp ("Edit", prev_title))
+ gtk_menu_shell_insert (GTK_MENU_SHELL (current), actionitem, 7);
+ else {
+ gtk_container_add (GTK_CONTAINER (current), actionitem);
 }
- if (tmp) {
- free (tmp);
+
+ free(prev_title);
+ prev_title = NULL;
+
+ g_object_set_data (G_OBJECT (actionitem), "plugaction", action);
+
+ g_signal_connect ((gpointer) actionitem, "activate",
+ G_CALLBACK (activate_callback),
+ action);
+
+ int is_playlist_action = (action->flags & DB_ACTION_PLAYLIST) && action_context == DDB_ACTION_CTX_PLAYLIST;
+
+ if (!is_playlist_action) {
+ if ((selected_count > 1 && !(action->flags & DB_ACTION_MULTIPLE_TRACKS)) ||
+ (action->flags & DB_ACTION_DISABLED)) {
+ gtk_widget_set_sensitive (GTK_WIDGET (actionitem), FALSE);
+ }
 }
 }
+ if (count > 0 && deadbeef->conf_get_int ("gtkui.action_separators", 0))
+ {
+ GtkWidget *separator = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator);
+ gtk_container_add (GTK_CONTAINER (menu), separator);
+ gtk_widget_set_sensitive (separator, FALSE);
+ }
 }
+ return added_entries;
+}
+
+
+void
+add_mainmenu_actions (void) {
+ GtkWidget *menubar = lookup_widget (mainwin, "menubar");
+ // remove all plugaction_*** menu items and empty submenus
+ gtk_container_foreach (GTK_CONTAINER (menubar), remove_actions, menubar);
+
+ menu_add_action_items(menubar, 0, NULL, DDB_ACTION_CTX_MAIN, on_actionitem_activate);
 }
 
 void
 gtkui_exec_action_14 (DB_plugin_action_t *action, int cursor) {
 // Plugin can handle all tracks by itself
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 if (action->flags & DB_ACTION_CAN_MULTIPLE_TRACKS)
 {
 action->callback (action, NULL);
 return;
 }
+#pragma GCC diagnostic pop
 
 // For single-track actions just invoke it with first selected track
 if (!(action->flags & DB_ACTION_MULTIPLE_TRACKS))
@@ -209,7 +304,10 @@
 return;
 }
 DB_playItem_t *it = deadbeef->pl_get_for_idx_and_iter (cursor, PL_MAIN);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 action->callback (action, it);
+#pragma GCC diagnostic pop
 deadbeef->pl_item_unref (it);
 return;
 }
@@ -218,7 +316,10 @@
 DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
 while (it) {
 if (deadbeef->pl_is_selected (it)) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 action->callback (action, it);
+#pragma GCC diagnostic pop
 }
 DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
 deadbeef->pl_item_unref (it);

deadbeef-0.6.2.tar.bz2/plugins/gtkui/actions.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/actions.h Changed

@@ -1,29 +1,42 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>,
- 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, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
 
 #ifndef __ACTIONS_H
 #define __ACTIONS_H
 
+#include <gtk/gtk.h>
+#include <deadbeef/deadbeef.h>
+
 void
 add_mainmenu_actions (void);
 
+typedef void (* menu_action_activate_callback_t) (GtkMenuItem *menuitem, DB_plugin_action_t *action);
+
+/// Add plugin action items to the existing menu.
+/// @return The number of items added
+int
+menu_add_action_items(GtkWidget *menu, int selected_count, ddb_playItem_t *selected_track, ddb_action_context_t action_context, menu_action_activate_callback_t activate_callback);
+
 void
 gtkui_exec_action_14 (DB_plugin_action_t *action, int cursor);

deadbeef-0.6.2.tar.bz2/plugins/gtkui/callbacks.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/callbacks.c Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/callbacks.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/callbacks.h Changed

@@ -1,20 +1,26 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
 
- 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 software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
 
- 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.
+ 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:
 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #include <gtk/gtk.h>
 
 
@@ -157,59 +163,6 @@
 gpointer user_data);
 
 gboolean
-on_searchheader_button_press_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data);
-
-gboolean
-on_searchheader_button_release_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data);
-
-gboolean
-on_searchheader_configure_event (GtkWidget *widget,
- GdkEventConfigure *event,
- gpointer user_data);
-
-gboolean
-on_searchheader_expose_event (GtkWidget *widget,
- GdkEventExpose *event,
- gpointer user_data);
-
-gboolean
-on_searchheader_motion_notify_event (GtkWidget *widget,
- GdkEventMotion *event,
- gpointer user_data);
-
-gboolean
-on_searchlist_button_press_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data);
-
-gboolean
-on_searchlist_configure_event (GtkWidget *widget,
- GdkEventConfigure *event,
- gpointer user_data);
-
-gboolean
-on_searchlist_expose_event (GtkWidget *widget,
- GdkEventExpose *event,
- gpointer user_data);
-
-gboolean
-on_searchlist_scroll_event (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data);
-
-void
-on_searchscroll_value_changed (GtkRange *range,
- gpointer user_data);
-
-void
-on_searchlist_realize (GtkWidget *widget,
- gpointer user_data);
-
-gboolean
 on_header_button_press_event (GtkWidget *widget,
 GdkEventButton *event,
 gpointer user_data);
@@ -234,7 +187,6 @@
 GdkEventMotion *event,
 gpointer user_data);
 
-
 void
 on_playlist_load_activate (GtkMenuItem *menuitem,
 gpointer user_data);
@@ -327,10 +279,6 @@
 gpointer user_data);
 
 void
-on_remove1_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-
-void
 on_find_activate (GtkMenuItem *menuitem,
 gpointer user_data);
 
@@ -339,14 +287,6 @@
 on_help1_activate (GtkMenuItem *menuitem,
 gpointer user_data);
 
-void
-on_playhscroll_value_changed (GtkRange *range,
- gpointer user_data);
-
-void
-on_searchhscroll_value_changed (GtkRange *range,
- gpointer user_data);
-
 gboolean
 on_helpwindow_key_press_event (GtkWidget *widget,
 GdkEventKey *event,
@@ -373,10 +313,6 @@
 gpointer user_data);
 
 void
-on_pref_replaygain_scale_clicked (GtkButton *button,
- gpointer user_data);
-
-void
 on_pref_close_send_to_tray_clicked (GtkButton *button,
 gpointer user_data);
 
@@ -433,10 +369,6 @@
 gpointer user_data);
 
 void
-on_remove_column_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-
-void
 on_pref_alsa_resampling_clicked (GtkButton *button,
 gpointer user_data);
 
@@ -541,10 +473,6 @@
 gpointer user_data);
 
 void
-on_remove2_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-
-void
 on_properties1_activate (GtkMenuItem *menuitem,
 gpointer user_data);
 
@@ -580,14 +508,6 @@
 GdkEventKey *event,
 gpointer user_data);
 
-void
-on_add_column_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-
-void
-on_edit_column_activate (GtkMenuItem *menuitem,
- gpointer user_data);
-
 gboolean
 on_trackproperties_delete_event (GtkWidget *widget,
 GdkEvent *event,
@@ -898,11 +818,11 @@
 gpointer user_data);
 
 void
-on_embolden_current_toggled (GtkToggleButton *togglebutton,
+on_hide_delete_from_disk_toggled (GtkToggleButton *togglebutton,
 gpointer user_data);
 
 void
-on_hide_delete_from_disk_toggled (GtkToggleButton *togglebutton,
+on_skip_deleted_songs_toggled (GtkToggleButton *togglebutton,
 gpointer user_data);
 
 void
@@ -977,14 +897,6 @@
 gpointer user_data);
 
 void
-on_dsp_add_clicked (GtkButton *button,
- gpointer user_data);
-
-void
-on_dsp_remove_clicked (GtkButton *button,
- gpointer user_data);
-
-void
 on_dsp_configure_clicked (GtkButton *button,
 gpointer user_data);
 
@@ -1276,11 +1188,6 @@
 on_hotkeys_defaults_clicked (GtkButton *button,
 gpointer user_data);
 
-gboolean
-on_searchwin_key_press_event (GtkWidget *widget,
- GdkEventKey *event,
- gpointer user_data);
-
 void
 on_auto_size_columns_toggled (GtkToggleButton *togglebutton,
 gpointer user_data);
@@ -1305,3 +1212,302 @@
 void
 on_enable_shift_jis_recoding_toggled (GtkToggleButton *togglebutton,
 gpointer user_data);
+
+void
+on_listview_playing_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data);
+
+void
+on_listview_group_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data);
+
+void
+on_listview_group_text_font_set (GtkFontButton *fontbutton,
+ gpointer user_data);
+
+void
+on_listview_text_font_set (GtkFontButton *fontbutton,
+ gpointer user_data);
+
+void
+on_listview_playing_text_bold_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_listview_playing_text_italic_toggled
+ (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_listview_selected_text_bold_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_listview_selected_text_italic_toggled
+ (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_tabstrip_selected_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data);
+
+void
+on_tabstrip_playing_bold_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_tabstrip_playing_italic_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_tabstrip_selected_bold_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_tabstrip_selected_italic_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_tabstrip_text_font_set (GtkFontButton *fontbutton,
+ gpointer user_data);
+
+void
+on_tabstrip_playing_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data);
+
+void
+on_listview_column_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data);
+
+void
+on_listview_column_text_font_set (GtkFontButton *fontbutton,
+ gpointer user_data);
+
+gboolean
+on_prefwin_key_press_event (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data);
+
+void
+on_trkpropertis_edit_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_edit_in_place_activate
+ (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_remove_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_cut_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_copy_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_paste_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_capitalize_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_clean_up_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_format_from_other_fields_activate
+ (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_add_new_field_activate
+ (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_paste_fields_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_automatically_fill_values_activate
+ (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_crop_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_trkproperties_edit_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_pref_replaygain_source_mode_changed (GtkComboBox *combobox,
+ gpointer user_data);
+
+void
+on_pref_replaygain_processing_changed (GtkComboBox *combobox,
+ gpointer user_data);
+
+void
+on_view_log_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_log_clear_clicked (GtkButton *button,
+ gpointer user_data);
+
+gboolean
+on_log_window_key_press_event (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data);
+
+void
+on_display_seltime_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_pref_pluginlist_row_activated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data);
+void
+on_listview_group_spacing_value_changed
+ (GtkSpinButton *spinbutton,
+ gpointer user_data);
+
+void
+on_comboboxentry_direct_sr_changed (GtkComboBox *combobox,
+ gpointer user_data);
+
+void
+on_comboboxentry_sr_mult_48_changed (GtkComboBox *combobox,
+ gpointer user_data);
+
+void
+on_comboboxentry_sr_mult_44_changed (GtkComboBox *combobox,
+ gpointer user_data);
+
+void
+on_checkbutton_sr_override_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+
+void
+on_checkbutton_dependent_sr_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_minimize_on_startup_clicked (GtkButton *button,
+ gpointer user_data);
+
+void
+on_move_to_trash_clicked (GtkButton *button,
+ gpointer user_data);
+
+void
+on_plugin_conf_tab_btn_clicked (GtkRadioButton *button,
+ gpointer user_data);
+
+void
+on_plugin_info_tab_btn_clicked (GtkRadioButton *button,
+ gpointer user_data);
+
+void
+on_plugin_license_tab_btn_clicked (GtkRadioButton *button,
+ gpointer user_data);
+
+
+void
+on_plugin_notebook_switch_page (GtkNotebook *notebook,
+ GtkWidget *page,
+ guint page_num,
+ gpointer user_data);
+
+void
+on_plugin_conf_reset_btn_clicked (GtkButton *button,
+ gpointer user_data);
+
+void
+on_copy_plugin_report_menuitem_activate
+ (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+gboolean
+on_pref_pluginlist_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data);
+
+void
+on_only_show_plugins_with_configuration1_activate
+ (GtkMenuItem *menuitem,
+ gpointer user_data);
+
+void
+on_use_visualization_base_color_toggled
+ (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_visualization_custom_color_button_color_set
+ (GtkColorButton *colorbutton,
+ gpointer user_data);
+
+void
+on_dsp_toolbtn_up_clicked (GtkToolButton *toolbutton,
+ gpointer user_data);
+
+void
+on_dsp_toolbtn_down_clicked (GtkToolButton *toolbutton,
+ gpointer user_data);
+
+void
+on_dsp_configure_toolbtn_clicked (GtkToolButton *toolbutton,
+ gpointer user_data);
+
+void
+on_dsp_listview_row_activated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data);
+
+void
+on_dsp_remove_toolbtn_clicked (GtkToolButton *toolbutton,
+ gpointer user_data);
+
+void
+on_dsp_add_toolbtn_toggled (GtkToggleToolButton *toggletoolbutton,
+ gpointer user_data);
+
+void
+on_sortcancel_clicked (GtkButton *button,
+ gpointer user_data);
+
+void
+on_sortok_clicked (GtkButton *button,
+ gpointer user_data);
+
+void
+on_sortfmt_show (GtkWidget *widget,
+ gpointer user_data);
+
+void
+on_use_visualization_background_color_toggled
+ (GtkToggleButton *togglebutton,
+ gpointer user_data);
+
+void
+on_visualization_custom_background_color_button_color_set
+ (GtkColorButton *colorbutton,
+ gpointer user_data);
+
+void
+on_combo_bit_override_changed (GtkComboBox *combobox,
+ gpointer user_data);

deadbeef-1.9.6.tar.bz2/plugins/gtkui/clipboard.c Added

@@ -0,0 +1,518 @@
+/*
+ Clipboard management
+ Copyright (C) 2016 Christian Boxdörfer
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <string.h>
+#include <gtk/gtk.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "../../gettext.h"
+#include <deadbeef/deadbeef.h>
+#include "gtkui.h"
+#include "playlist/ddblistview.h"
+#include <sys/stat.h>
+
+typedef struct {
+ char *plt_title;
+ DB_playItem_t **tracks;
+ int num_tracks;
+ int cut;
+} clipboard_data_context_t;
+
+static clipboard_data_context_t *current_clipboard_data = NULL;
+static int current_clipboard_refcount = 0;
+
+enum {
+ DDB_URI_LIST = 1,
+ URI_LIST,
+ GNOME_COPIED_FILES,
+ N_CLIPBOARD_TARGETS
+};
+
+static GtkTargetEntry targets=
+{
+ {TARGET_URIS, GTK_TARGET_SAME_WIDGET, DDB_URI_LIST},
+ {"text/uri-list", 0, URI_LIST},
+ {"x-special/gnome-copied-files", 0, GNOME_COPIED_FILES},
+};
+
+static void
+clipboard_write_uri_list (clipboard_data_context_t *ctx, GString* buf)
+{
+ if (ctx->tracks && buf) {
+ for (int i = 0; i < ctx->num_tracks; i++) {
+ char *str = g_filename_to_uri (deadbeef->pl_find_meta (ctx->tracksi,":URI"), NULL, NULL);
+ g_string_append (buf, str);
+ g_free (str);
+ if (i < ctx->num_tracks - 1) {
+ g_string_append (buf, "\r\n");
+ }
+ }
+ }
+}
+
+static void
+clipboard_write_gnome_uri_list (clipboard_data_context_t *ctx, GString* buf)
+{
+ if (ctx->tracks && buf) {
+ for (int i = 0; i < ctx->num_tracks; i++) {
+ char *str = g_filename_to_uri (deadbeef->pl_find_meta (ctx->tracksi,":URI"), NULL, NULL);
+ g_string_append (buf, str);
+ g_free (str);
+ if (i < ctx->num_tracks - 1) {
+ g_string_append_c (buf, '\n');
+ }
+ }
+ }
+}
+
+static void
+clipboard_get_clipboard_data (GtkClipboard *clip, GtkSelectionData *sel, guint info, gpointer user_data)
+{
+ clipboard_data_context_t *clip_ctx = (clipboard_data_context_t *)user_data;
+ GdkAtom target = gtk_selection_data_get_target (sel);
+
+ GString *uri_list = g_string_sized_new (clip_ctx->num_tracks * 256);
+ guchar *buf = NULL;
+ gint buf_len = 0;
+ if (info == DDB_URI_LIST) {
+ buf = (guchar *)clip_ctx;
+ buf_len = sizeof (clipboard_data_context_t);
+ }
+ else if (info == GNOME_COPIED_FILES) {
+ g_string_append (uri_list, clip_ctx->cut ? "cut\n" : "copy\n");
+ clipboard_write_gnome_uri_list (clip_ctx, uri_list);
+ buf = (guchar *)uri_list->str;
+ buf_len = (gint)(uri_list->len + 1);
+ }
+ else /* text/uri-list format */ {
+ clipboard_write_uri_list (clip_ctx, uri_list);
+ buf = (guchar *)uri_list->str;
+ buf_len = (gint)(uri_list->len + 1);
+ }
+ gtk_selection_data_set (sel, target, 8, buf, buf_len);
+ g_string_free (uri_list, TRUE);
+}
+
+static void
+clipboard_free (GtkClipboard *clipboard,
+ gpointer user_data)
+{
+ clipboard_data_context_t *clip_ctx = (clipboard_data_context_t *)user_data;
+ if (clip_ctx) {
+ if (clip_ctx->tracks) {
+ for (int i = 0; i < clip_ctx->num_tracks; i++) {
+ if (clip_ctx->tracksi) {
+ deadbeef->pl_item_unref (clip_ctx->tracksi);
+ }
+ }
+ free (clip_ctx->tracks);
+ clip_ctx->tracks = NULL;
+ }
+ if (clip_ctx->plt_title) {
+ free (clip_ctx->plt_title);
+ clip_ctx->plt_title = NULL;
+ }
+ clip_ctx->num_tracks = 0;
+ clip_ctx->cut = 0;
+ free (clip_ctx);
+ clip_ctx = NULL;
+ }
+ current_clipboard_refcount--;
+}
+
+void
+clipboard_free_current (void)
+{
+ if (current_clipboard_refcount > 0) {
+ clipboard_free (NULL, current_clipboard_data);
+ }
+}
+
+static gboolean
+clipboard_cut_or_copy_files (GtkWidget* src_widget, clipboard_data_context_t *ctx)
+{
+ GdkDisplay *display = src_widget ? gtk_widget_get_display (src_widget) : gdk_display_get_default();
+ GtkClipboard *clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
+ gboolean ret;
+ ret = gtk_clipboard_set_with_data (clipboard, targets, G_N_ELEMENTS(targets),
+ clipboard_get_clipboard_data, clipboard_free, ctx);
+ return ret;
+}
+
+static gboolean
+clipboard_get_selected_tracks (clipboard_data_context_t *ctx, ddb_playlist_t *plt)
+{
+ if (plt == NULL) {
+ return FALSE;
+ }
+
+ deadbeef->pl_lock ();
+ int num = deadbeef->plt_getselcount (plt);
+
+ if (num <= 0) {
+ deadbeef->pl_unlock ();
+ return FALSE;
+ }
+
+ ctx->tracks = malloc (sizeof (DB_playItem_t *) * num);
+ if (!ctx->tracks) {
+ fprintf (stderr, "gtkui: failed to alloc %d bytes to store selected tracks\n", (int)(num * sizeof (void *)));
+ deadbeef->pl_unlock ();
+ return FALSE;
+ }
+
+ int n = 0;
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ if (deadbeef->pl_is_selected (it) && n < num) {
+ deadbeef->pl_item_ref (it);
+ ctx->tracksn++ = it;
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ ctx->num_tracks = num;
+
+ deadbeef->pl_unlock ();
+ return TRUE;
+}
+
+static gboolean
+clipboard_get_all_tracks (clipboard_data_context_t *ctx, ddb_playlist_t *plt)
+{
+ if (plt == NULL) {
+ return FALSE;
+ }
+
+ deadbeef->pl_lock ();
+
+ char plt_title1000 = "";
+ deadbeef->plt_get_title (plt, plt_title, sizeof (plt_title));
+ ctx->plt_title = strdup (plt_title);
+ int num_tracks = deadbeef->plt_get_item_count (plt, PL_MAIN);
+
+ if (num_tracks <= 0) {
+ deadbeef->pl_unlock ();
+ return FALSE;
+ }
+
+ ctx->tracks = malloc (sizeof (DB_playItem_t *) * num_tracks);
+ if (!ctx->tracks) {
+ fprintf (stderr, "gtkui: failed to alloc %d bytes to store playlist tracks\n", (int)(num_tracks * sizeof (void *)));
+ deadbeef->pl_unlock ();
+ return FALSE;
+ }
+
+ int n = 0;
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ deadbeef->pl_item_ref (it);
+ ctx->tracksn++ = it;
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ ctx->num_tracks = num_tracks;
+
+ deadbeef->pl_unlock ();
+ return TRUE;
+}
+
+static void
+clipboard_delete_selected_tracks (ddb_playlist_t *plt)
+{
+ if (plt == NULL) {
+ return;
+ }
+
+ int cursor = deadbeef->plt_delete_selected (plt);
+
+ deadbeef->plt_set_cursor (plt, PL_MAIN, cursor);
+ deadbeef->plt_save_config (plt);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+}
+
+static void
+clipboard_delete_playlist (ddb_playlist_t *plt)
+{
+ if (plt == NULL) {
+ return;
+ }
+ int idx = deadbeef->plt_get_idx (plt);
+ if (idx != -1) {
+ deadbeef->plt_remove (idx);
+ }
+}
+
+void
+clipboard_cut_selection (ddb_playlist_t *plt, int ctx) {
+
+ if (plt == NULL) {
+ return;
+ }
+
+ clipboard_data_context_t *clip_ctx = malloc (sizeof (clipboard_data_context_t));
+
+ // save ptr to free on exit
+ current_clipboard_data = clip_ctx;
+ current_clipboard_refcount++;
+
+ clip_ctx->plt_title = NULL;
+
+ int result = 0;
+ if (ctx == DDB_ACTION_CTX_SELECTION) {
+ result = clipboard_get_selected_tracks (clip_ctx, plt);
+ if (result) {
+ clipboard_delete_selected_tracks (plt);
+ }
+ }
+ else if (ctx == DDB_ACTION_CTX_PLAYLIST) {
+ result = clipboard_get_all_tracks (clip_ctx, plt);
+ if (result) {
+ clipboard_delete_playlist (plt);
+ }
+ }
+
+ if (result) {
+ clip_ctx->cut = 0;
+ clipboard_cut_or_copy_files (mainwin, clip_ctx);
+ }
+}
+
+void
+clipboard_copy_selection (ddb_playlist_t *plt, int ctx) {
+ if (plt == NULL) {
+ return;
+ }
+
+ clipboard_data_context_t *clip_ctx = malloc (sizeof (clipboard_data_context_t));
+
+ // save ptr to free on exit
+ current_clipboard_data = clip_ctx;
+ current_clipboard_refcount++;
+
+ clip_ctx->plt_title = NULL;
+
+ int result = 0;
+ if (ctx == DDB_ACTION_CTX_SELECTION) {
+ result = clipboard_get_selected_tracks (clip_ctx, plt);
+ }
+ else if (ctx == DDB_ACTION_CTX_PLAYLIST) {
+ result = clipboard_get_all_tracks (clip_ctx, plt);
+ }
+
+ if (result) {
+ clip_ctx->cut = 0;
+ clipboard_cut_or_copy_files (mainwin, clip_ctx);
+ }
+}
+
+static void
+clipboard_activate_dest_playlist (const char *pdata, ddb_playlist_t *plt, int ctx)
+{
+ if (plt == NULL) {
+ // no playlist set, use current one
+ deadbeef->plt_set_curr (plt);
+ return;
+ }
+ clipboard_data_context_t *clip_ctx = (clipboard_data_context_t *)pdata;
+ if (ctx == DDB_ACTION_CTX_PLAYLIST) {
+ int playlist = -1;
+ if (clip_ctx && clip_ctx->plt_title) {
+ int cnt = deadbeef->plt_get_count ();
+ playlist = deadbeef->plt_add (cnt, clip_ctx->plt_title);
+ }
+ else {
+ playlist = gtkui_add_new_playlist ();
+ }
+ if (playlist != -1) {
+ deadbeef->plt_set_curr_idx (playlist);
+ }
+ }
+}
+
+static void
+clipboard_received_uri_list (const char *pdata, int length)
+{
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ int cursor = deadbeef->plt_get_cursor (plt, PL_MAIN);
+ DB_playItem_t *it = deadbeef->pl_get_for_idx_and_iter (cursor, PL_MAIN);
+ if (it) {
+ gchar *ptr = (char *)pdata;
+ if (ptr && length > 0) {
+ char *mem = malloc (length+1);
+ memcpy (mem, ptr, length);
+ memlength = 0;
+ // use drop procedure
+ gtkui_receive_fm_drop (it, mem, length);
+ }
+ deadbeef->pl_item_unref (it);
+ }
+ deadbeef->plt_unref (plt);
+ }
+}
+
+static void
+clipboard_received_ddb_uri_list (const char *pdata)
+{
+ clipboard_data_context_t *ctx = (clipboard_data_context_t *)pdata;
+ DB_playItem_t **tracks = ctx->tracks;
+ int num_tracks = ctx->num_tracks;
+ if (!tracks || num_tracks <= 0) {
+ return;
+ }
+ deadbeef->pl_lock ();
+
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+
+ if (plt) {
+ int insert_pos = MAX (-1, deadbeef->plt_get_cursor (plt, PL_MAIN) - 1);
+ deadbeef->plt_deselect_all (plt);
+ for (int i = 0; i < num_tracks; i++) {
+ DB_playItem_t *it = tracksi;
+ if (!it) {
+ printf ("gtkui paste: warning: item %d not found\n", i);
+ continue;
+ }
+ DB_playItem_t *it_new = deadbeef->pl_item_alloc ();
+ deadbeef->pl_item_copy (it_new, it);
+ deadbeef->pl_set_selected (it_new, 1);
+
+ DB_playItem_t *after = deadbeef->pl_get_for_idx_and_iter (insert_pos++, PL_MAIN);
+ deadbeef->plt_insert_item (plt, after, it_new);
+ deadbeef->pl_item_unref (it_new);
+ if (after) {
+ deadbeef->pl_item_unref (after);
+ }
+ }
+ deadbeef->pl_unlock ();
+ deadbeef->plt_save_config (plt);
+ deadbeef->plt_unref (plt);
+ }
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+}
+
+static GdkAtom target_atomN_CLIPBOARD_TARGETS;
+
+static gboolean got_atoms = FALSE;
+
+static void
+clipboard_check_atoms (void)
+{
+ if (!got_atoms) {
+ for (int i = 0; i < N_CLIPBOARD_TARGETS; i++) {
+ target_atomi = GDK_NONE;
+ }
+ for (int i = 0; i < G_N_ELEMENTS (targets); i++) {
+ target_atomtargetsi.info = gdk_atom_intern_static_string (targetsi.target);
+ }
+ got_atoms = TRUE;
+ }
+}
+
+void
+clipboard_paste_selection (ddb_playlist_t *plt, int ctx)
+{
+ if (!plt) {
+ return;
+ }
+ GdkDisplay *display = mainwin ? gtk_widget_get_display (mainwin) : gdk_display_get_default();
+ GtkClipboard *clip = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
+ int type = 0;
+ GdkAtom *avail_targets = NULL;
+ int n = 0;
+
+ // get all available targets currently in the clipboard.
+ if (!gtk_clipboard_wait_for_targets (clip, &avail_targets, &n)) {
+ return;
+ }
+
+ clipboard_check_atoms ();
+
+ // we prefer DDB_URI_LIST, so first check all tragets for that
+ for (int i = 0; i < n; i++) {
+ if (avail_targetsi == target_atomDDB_URI_LIST) {
+ type = DDB_URI_LIST;
+ break;
+ }
+ }
+ if (type == 0) {
+ // no DDB_URI_LIST, check for other supported targets
+ for (int i = 0; i < n; i++) {
+ if (avail_targetsi == target_atomGNOME_COPIED_FILES) {
+ type = GNOME_COPIED_FILES;
+ break;
+ }
+ else if (avail_targetsi == target_atomURI_LIST) {
+ type = URI_LIST;
+ break;
+ }
+ }
+ }
+ g_free (avail_targets);
+
+ if (type) {
+ GtkSelectionData *data = gtk_clipboard_wait_for_contents (clip, target_atomtype);
+ const gchar *pdata = (const gchar *)gtk_selection_data_get_data (data);
+ gint data_len = gtk_selection_data_get_length (data);
+
+ switch (type) {
+ case DDB_URI_LIST:
+ clipboard_activate_dest_playlist (pdata, plt, ctx);
+ clipboard_received_ddb_uri_list (pdata);
+ break;
+ case GNOME_COPIED_FILES:
+ clipboard_activate_dest_playlist (NULL, plt, ctx);
+ clipboard_received_uri_list (pdata, data_len);
+ break;
+ case URI_LIST:
+ clipboard_activate_dest_playlist (NULL, plt, ctx);
+ clipboard_received_uri_list (pdata, data_len);
+ break;
+ default:
+ break;
+ }
+ gtk_selection_data_free (data);
+ }
+}
+
+int
+clipboard_is_clipboard_data_available (void)
+{
+ GdkDisplay *display = mainwin ? gtk_widget_get_display (mainwin) : gdk_display_get_default();
+ GtkClipboard *clipboard = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
+ clipboard_check_atoms ();
+ for (int i = 0; i < N_CLIPBOARD_TARGETS; i++) {
+ if (gtk_clipboard_wait_is_target_available (clipboard, target_atomi)) {
+ return 1;
+ }
+ }
+ return 0;
+}
+

deadbeef-1.9.6.tar.bz2/plugins/gtkui/clipboard.h Added

@@ -0,0 +1,44 @@
+/*
+ Clipboard management
+ Copyright (C) Christian Boxdörfer
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __CLIPBOARD_H
+#define __CLIPBOARD_H
+
+#include <deadbeef/deadbeef.h>
+
+void
+clipboard_free_current (void);
+
+void
+clipboard_cut_selection (ddb_playlist_t *plt, int ctx);
+
+void
+clipboard_copy_selection (ddb_playlist_t *plt, int ctx);
+
+void
+clipboard_paste_selection (ddb_playlist_t *plt, int ctx);
+
+int
+clipboard_is_clipboard_data_available (void);
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gtkui/covermanager Added

deadbeef-1.9.6.tar.bz2/plugins/gtkui/covermanager/albumartwidget.c Added

@@ -0,0 +1,405 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <gtk/gtk.h>
+#include <string.h>
+#include <stdlib.h>
+#include <deadbeef/deadbeef.h>
+#include "../support.h"
+#include "../../artwork/artwork.h"
+#include "albumartwidget.h"
+#include "covermanager.h"
+#include "gobjcache.h"
+#include <Block.h>
+
+#define min(x,y) ((x)<(y)?(x):(y))
+
+extern DB_functions_t *deadbeef;
+extern int design_mode;
+
+typedef enum {
+ MODE_SELECTED,
+ MODE_PLAYING,
+} albumart_mode_t;
+
+typedef struct {
+ ddb_gtkui_widget_t base;
+ ddb_gtkui_widget_extended_api_t exapi;
+ ddb_artwork_plugin_t *plugin;
+ GtkWidget *drawing_area;
+ GdkPixbuf *image;
+ int64_t source_id;
+ guint throttle_id;
+ int64_t request_index;
+
+ albumart_mode_t mode;
+
+ gboolean updating_menu; // suppress menu event handlers
+ GtkWidget *menu;
+ GtkWidget *mode_playing_track;
+ GtkWidget *mode_selected_track;
+} w_albumart_t;
+
+static gboolean
+_dispatch_on_main_wrapper (void *context) {
+ void (^block)(void) = context;
+ block ();
+ Block_release(block);
+ return FALSE;
+}
+
+static void
+_dispatch_on_main(void (^block)(void)) {
+ dispatch_block_t copy_block = Block_copy(block);
+ g_idle_add(_dispatch_on_main_wrapper, copy_block);
+}
+
+static gboolean
+_update (w_albumart_t *w) {
+ if (w->plugin == NULL) {
+ return FALSE;
+ }
+
+ w->throttle_id = 0;
+
+ GtkAllocation frame;
+ gtk_widget_get_allocation(GTK_WIDGET(w->drawing_area), &frame);
+
+ if (frame.width == 0 || frame.height == 0) {
+ return FALSE;
+ }
+
+ ddb_playItem_t *it = NULL;
+ switch (w->mode) {
+ case MODE_SELECTED: {
+ int cursor = deadbeef->pl_get_cursor(PL_MAIN);
+ if (cursor != -1) {
+ ddb_playlist_t *plt = deadbeef->plt_get_curr();
+ if (plt == NULL) {
+ gtk_widget_queue_draw(w->drawing_area);
+ return FALSE;
+ }
+ it = deadbeef->plt_get_item_for_idx(plt, cursor, PL_MAIN);
+ deadbeef->plt_unref (plt);
+ plt = NULL;
+ }
+ } break;
+ case MODE_PLAYING: {
+ it = deadbeef->streamer_get_playing_track_safe();
+ } break;
+ }
+
+ if (it == NULL) {
+ if (w->image != NULL) {
+ gobj_unref(w->image);
+ w->image = NULL;
+ }
+ gtk_widget_queue_draw(w->drawing_area);
+ return FALSE;
+ }
+ w->plugin->cancel_queries_with_source_id(w->source_id);
+
+ GtkAllocation availableSize = {0};
+ availableSize.width = frame.width;
+ availableSize.height = frame.height;
+
+ int64_t currentIndex = w->request_index++;
+
+ covermanager_t *cm = covermanager_shared();
+
+ GdkPixbuf *image = covermanager_cover_for_track(cm, it, w->source_id, ^(GdkPixbuf *img) {
+ if (currentIndex != w->request_index-1) {
+ return;
+ }
+ if (img != NULL) {
+ GtkAllocation originalSize = {0};
+ originalSize.width = gdk_pixbuf_get_width(img);
+ originalSize.height = gdk_pixbuf_get_height(img);
+ GtkAllocation desired_size = covermanager_desired_size_for_image_size(cm, originalSize, availableSize);
+ GdkPixbuf *scaled_image = covermanager_create_scaled_image(cm, img, desired_size);
+ w->image = scaled_image;
+ }
+ else {
+ if (w->image != NULL) {
+ gobj_unref(w->image);
+ w->image = NULL;
+ }
+ }
+ gtk_widget_queue_draw(w->drawing_area);
+ });
+
+ deadbeef->pl_item_unref (it);
+ it = NULL;
+
+ if (image != NULL) {
+ GtkAllocation originalSize = {0};
+ originalSize.width = gdk_pixbuf_get_width(image);
+ originalSize.height = gdk_pixbuf_get_height(image);
+ GtkAllocation desired_size = covermanager_desired_size_for_image_size(cm, originalSize, availableSize);
+
+ GdkPixbuf *scaled_image = covermanager_create_scaled_image(cm, image, desired_size);
+ w->image = scaled_image;
+ gobj_unref(image);
+ }
+
+ gtk_widget_queue_draw(w->drawing_area);
+
+ return FALSE;
+}
+
+static void
+_throttled_update (w_albumart_t *w) {
+ if (w->plugin == NULL) {
+ return;
+ }
+ if (w->throttle_id != 0) {
+ g_source_remove(w->throttle_id);
+ }
+ w->throttle_id = g_timeout_add(10, (gboolean(*)(void*))_update, w);
+
+}
+
+static gboolean
+_size_did_change (GtkWidget* self, GdkEventConfigure *event, w_albumart_t *w) {
+ _throttled_update(w);
+ return FALSE;
+}
+
+
+static int
+_message (ddb_gtkui_widget_t *base, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ w_albumart_t *w = (w_albumart_t *)base;
+ if (w->plugin == NULL) {
+ return FALSE;
+ }
+ switch (id) {
+ case DB_EV_PLAYLISTCHANGED:
+ case DB_EV_PLAYLISTSWITCHED:
+ case DB_EV_CURSOR_MOVED: {
+ _dispatch_on_main(^{
+ _throttled_update(w);
+ });
+ }
+ break;
+ }
+ return 0;
+}
+
+static gboolean
+_draw_event (GtkWidget *widget, cairo_t *cr, gpointer user_data) {
+ w_albumart_t *w = user_data;
+ if (w->plugin == NULL) {
+ return FALSE;
+ }
+
+ GtkAllocation a;
+ gtk_widget_get_allocation(widget, &a);
+
+#if !GTK_CHECK_VERSION(3,0,0)
+ gtk_paint_flat_box(gtk_widget_get_style(widget), gtk_widget_get_window(widget), GTK_STATE_NORMAL, GTK_SHADOW_NONE, &a, widget, NULL, 0, 0, a.width, a.height);
+#else
+ GtkStyleContext *context = gtk_widget_get_style_context(widget);
+ gtk_render_background(context, cr, 0, 0, a.width, a.height);
+#endif
+
+ if (a.width < 8 || a.height < 8) {
+ return TRUE;
+ }
+
+ if (w->image == NULL) {
+ return TRUE;
+ }
+
+ const int pw = gdk_pixbuf_get_width(w->image);
+ const int ph = gdk_pixbuf_get_height(w->image);
+ cairo_rectangle(cr, 0, 0, a.width, a.height);
+ if (pw > a.width || ph > a.height || (pw < a.width && ph < a.height)) {
+ const double scale = min(a.width/(double)pw, a.height/(double)ph);
+ cairo_translate(cr, (a.width - a.width*scale)/2., (a.height - a.height*scale)/2.);
+ cairo_scale(cr, scale, scale);
+ cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_FAST);
+ }
+ gdk_cairo_set_source_pixbuf(cr, w->image, (a.width - pw)/2., (a.height - ph)/2.);
+ cairo_fill(cr);
+
+ return TRUE;
+}
+
+#if !GTK_CHECK_VERSION(3,0,0)
+static gboolean
+_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) {
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
+ gboolean res = _draw_event (widget, cr, user_data);
+ cairo_destroy (cr);
+ return res;
+}
+#endif
+
+static void
+_menu_update (w_albumart_t *s) {
+ s->updating_menu = TRUE;
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->mode_playing_track), s->mode == MODE_PLAYING);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->mode_selected_track), s->mode == MODE_SELECTED);
+ s->updating_menu = FALSE;
+}
+
+static gboolean
+_button_press (GtkWidget* self, GdkEventButton *event, gpointer user_data) {
+ if (design_mode) {
+ return FALSE;
+ }
+ w_albumart_t *s = user_data;
+
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
+ _menu_update(s);
+ gtk_menu_popup_at_pointer (GTK_MENU (s->menu), NULL);
+ }
+ return TRUE;
+}
+
+
+static void
+_menu_activate (GtkWidget* self, gpointer user_data) {
+ w_albumart_t *s = user_data;
+
+ if (s->updating_menu) {
+ return;
+ }
+
+ if (self == s->mode_playing_track) {
+ s->mode = MODE_PLAYING;
+ _update (s);
+ }
+ else if (self == s->mode_selected_track) {
+ s->mode = MODE_SELECTED;
+ _update (s);
+ }
+}
+
+static void
+_deserialize_from_keyvalues (ddb_gtkui_widget_t *widget, const char **keyvalues) {
+ w_albumart_t *s = (w_albumart_t *)widget;
+
+ s->mode = MODE_SELECTED;
+
+ for (int i = 0; keyvaluesi; i += 2) {
+ if (!strcmp (keyvaluesi, "mode")) {
+ if (!strcmp (keyvaluesi+1, "playing")) {
+ s->mode = MODE_PLAYING;
+ }
+ }
+ }
+}
+
+static char const **
+_serialize_to_keyvalues (ddb_gtkui_widget_t *widget) {
+ w_albumart_t *s = (w_albumart_t *)widget;
+
+ char const **keyvalues = calloc (3, sizeof (char *));
+
+ keyvalues0 = "mode";
+ switch (s->mode) {
+ case MODE_SELECTED:
+ keyvalues1 = "selected";
+ break;
+ case MODE_PLAYING:
+ keyvalues1 = "playing";
+ break;
+ }
+ return keyvalues;
+}
+
+static void
+_free_serialized_keyvalues(ddb_gtkui_widget_t *w, char const **keyvalues) {
+ free (keyvalues);
+}
+
+static void
+_artwork_listener (ddb_artwork_listener_event_t event, void *user_data, int64_t p1, int64_t p2) {
+ w_albumart_t *w = (w_albumart_t *)user_data;
+ if (event == DDB_ARTWORK_SETTINGS_DID_CHANGE) {
+ _dispatch_on_main(^{
+ _throttled_update(w);
+ });
+ }
+}
+
+static void
+_destroy (ddb_gtkui_widget_t *base) {
+ w_albumart_t *w = (w_albumart_t *)base;
+ if (w->plugin != NULL) {
+ w->plugin->remove_listener (_artwork_listener, w);
+ }
+}
+
+ddb_gtkui_widget_t *
+w_albumart_create (void) {
+ w_albumart_t *w = malloc (sizeof (w_albumart_t));
+ memset (w, 0, sizeof (w_albumart_t));
+
+ w->base.widget = gtk_event_box_new ();
+ w->base.message = _message;
+ w->base.destroy = _destroy;
+ w->drawing_area = gtk_drawing_area_new();
+ w->exapi._size = sizeof (ddb_gtkui_widget_extended_api_t);
+ w->exapi.deserialize_from_keyvalues = _deserialize_from_keyvalues;
+ w->exapi.serialize_to_keyvalues = _serialize_to_keyvalues;
+ w->exapi.free_serialized_keyvalues = _free_serialized_keyvalues;
+ gtk_widget_show (GTK_WIDGET(w->drawing_area));
+ gtk_container_add (GTK_CONTAINER (w->base.widget), GTK_WIDGET(w->drawing_area));
+ w_override_signals (w->base.widget, w);
+
+ g_signal_connect(G_OBJECT(w->drawing_area), "configure-event", G_CALLBACK(_size_did_change), w);
+#if !GTK_CHECK_VERSION(3,0,0)
+ g_signal_connect_after ((gpointer) w->drawing_area, "expose_event", G_CALLBACK (_expose_event), w);
+#else
+ g_signal_connect_after ((gpointer) w->drawing_area, "draw", G_CALLBACK (_draw_event), w);
+#endif
+ w->plugin = (ddb_artwork_plugin_t *)deadbeef->plug_get_for_id("artwork2");
+ if (w->plugin != NULL) {
+ w->source_id = w->plugin->allocate_source_id();
+ w->plugin->add_listener(_artwork_listener, w);
+ }
+
+ g_signal_connect ((gpointer)w->base.widget, "button-press-event", G_CALLBACK (_button_press), w);
+
+ w->menu = gtk_menu_new();
+
+ w->mode_playing_track = gtk_check_menu_item_new_with_mnemonic( _("Playing Track"));
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->mode_playing_track), TRUE);
+ gtk_widget_show(w->mode_playing_track);
+
+ w->mode_selected_track = gtk_check_menu_item_new_with_mnemonic( _("Selected Track"));
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->mode_selected_track), TRUE);
+ gtk_widget_show(w->mode_selected_track);
+
+ gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), w->mode_playing_track, 0);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), w->mode_selected_track, 1);
+
+ g_signal_connect((gpointer)w->mode_playing_track, "activate", G_CALLBACK(_menu_activate), w);
+ g_signal_connect((gpointer)w->mode_selected_track, "activate", G_CALLBACK(_menu_activate), w);
+
+ return (ddb_gtkui_widget_t *)w;
+}
+
+

deadbeef-1.9.6.tar.bz2/plugins/gtkui/covermanager/albumartwidget.h Added

@@ -0,0 +1,34 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+
+#ifndef albumartwidget_h
+#define albumartwidget_h
+
+#include "widgets.h"
+
+ddb_gtkui_widget_t *
+w_albumart_create (void);
+
+#endif /* albumartwidget_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/covermanager/covermanager.c Added

@@ -0,0 +1,466 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+#include <stdlib.h>
+#include <deadbeef/deadbeef.h>
+#include "../../artwork/artwork.h"
+#include "covermanager.h"
+#include "gobjcache.h"
+#include <Block.h>
+#include "gtkui.h"
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define MAX_ALBUM_ART_FILE_SIZE (40*1024*1024)
+
+extern DB_functions_t *deadbeef;
+
+#define CACHE_SIZE 50
+
+struct covermanager_s {
+ ddb_artwork_plugin_t *plugin;
+ gobj_cache_t *cache;
+ dispatch_queue_t loader_queue;
+ char *name_tf;
+ char *default_cover_path;
+ GdkPixbuf *default_cover;
+ gboolean is_terminating;
+ int image_size;
+};
+
+typedef struct {
+ covermanager_t *impl;
+ dispatch_block_t completion_block;
+} query_userdata_t;
+
+static covermanager_t *_shared;
+
+static gboolean
+_dispatch_on_main_wrapper (void *context) {
+ void (^block)(void) = context;
+ block ();
+ Block_release(block);
+ return FALSE;
+}
+
+static void
+_dispatch_on_main(void (^block)(void)) {
+ dispatch_block_t copy_block = Block_copy(block);
+ g_idle_add(_dispatch_on_main_wrapper, copy_block);
+}
+
+static char *
+_cache_key_for_track (covermanager_t *impl, ddb_playItem_t *track) {
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .flags = DDB_TF_CONTEXT_NO_DYNAMIC,
+ .it = track,
+ };
+
+ char bufferPATH_MAX;
+ deadbeef->tf_eval (&ctx, impl->name_tf, buffer, sizeof (buffer));
+ return strdup (buffer);
+}
+
+static void
+_update_default_cover (covermanager_t *impl) {
+ if (impl->plugin == NULL) {
+ return;
+ }
+ char pathPATH_MAX;
+ impl->plugin->default_image_path(path, sizeof(path));
+
+ if (impl->default_cover_path == NULL || strcmp (path, impl->default_cover_path)) {
+ free (impl->default_cover_path);
+ impl->default_cover_path = strdup (path);
+
+ if (impl->default_cover != NULL) {
+ gobj_unref(impl->default_cover);
+ }
+
+ impl->default_cover = gdk_pixbuf_new_from_file(path, NULL);
+ }
+}
+
+static void
+_settings_did_change_for_track(covermanager_t *manager, ddb_playItem_t *track) {
+ covermanager_t *impl = manager;
+ if (track == NULL) {
+ impl->image_size = deadbeef->conf_get_int("artwork.image_size", 256);
+ _update_default_cover (impl);
+ gobj_cache_remove_all(impl->cache);
+ }
+ else {
+ char *key = _cache_key_for_track(impl, track);
+ gobj_cache_remove(impl->cache, key);
+ free (key);
+ }
+}
+
+static void
+_artwork_listener (ddb_artwork_listener_event_t event, void *user_data, int64_t p1, int64_t p2) {
+ covermanager_t *manager = user_data;
+
+ _dispatch_on_main(^{
+ if (event == DDB_ARTWORK_SETTINGS_DID_CHANGE) {
+ _settings_did_change_for_track (manager, (ddb_playItem_t *)p1);
+ }
+ });
+}
+
+static char *
+_buffer_from_file (const char *fname, long *psize) {
+ char *buffer = NULL;
+ FILE *fp = fopen (fname, "rb");
+ if (fp == NULL) {
+ return NULL;
+ }
+ if (fseek (fp, 0, SEEK_END) < 0) {
+ goto error;
+ }
+ long size = ftell(fp);
+ if (size <= 0 || size > MAX_ALBUM_ART_FILE_SIZE) {
+ goto error; // we don't really want to load ultra-high-res images
+ }
+ rewind(fp);
+
+ buffer = malloc (size);
+ if (buffer == NULL) {
+ goto error;
+ }
+
+ if (fread (buffer, 1, size, fp) != size) {
+ goto error;
+ }
+
+ fclose (fp);
+
+ *psize = size;
+ return buffer;
+
+error:
+ if (fp != NULL) {
+ fclose (fp);
+ }
+ free (buffer);
+ return NULL;
+}
+
+static GdkPixbuf *
+_load_image_from_cover(covermanager_t *impl, ddb_cover_info_t *cover) {
+ GdkPixbuf *img = NULL;
+
+ if (!img && cover && cover->image_filename) {
+ long size = 0;
+ char *buf = _buffer_from_file (cover->image_filename, &size);
+ if (buf != NULL) {
+ GdkPixbufLoader *loader = gdk_pixbuf_loader_new ();
+ gdk_pixbuf_loader_write (loader, (const guchar *)buf, size, NULL);
+ gdk_pixbuf_loader_close(loader, NULL);
+ img = gdk_pixbuf_loader_get_pixbuf (loader);
+ free (buf);
+ }
+ }
+
+ if (img) {
+ const int max_image_size = impl->image_size;
+
+ // downscale
+ GtkAllocation size = {
+ .width = gdk_pixbuf_get_width(img),
+ .height = gdk_pixbuf_get_height(img),
+ };
+
+ if (size.width > max_image_size || size.height > max_image_size) {
+ GtkAllocation new_size = {
+ .width = max_image_size,
+ .height = max_image_size,
+ };
+ new_size = covermanager_desired_size_for_image_size(impl, size, new_size);
+
+ GdkPixbuf *scaled_img = covermanager_create_scaled_image(impl, img, new_size);
+ gobj_unref(img);
+ img = scaled_img;
+ }
+ }
+
+ if (!img) {
+ img = impl->default_cover;
+ if (img != NULL) {
+ gobj_ref (img);
+ }
+ }
+
+ return img;
+}
+
+static void
+_add_cover_for_track(covermanager_t *impl, ddb_playItem_t *track, GdkPixbuf *img) {
+ char *key = _cache_key_for_track(impl, track);
+ gobj_cache_set(impl->cache, key, G_OBJECT(img));
+ free (key);
+}
+
+static void
+_cleanup_query (ddb_cover_query_t *query) {
+ query_userdata_t *user_data = query->user_data;
+ void (^completionBlock)(GdkPixbuf *) = (void (^)(GdkPixbuf *))user_data->completion_block;
+ Block_release(completionBlock);
+ free (user_data);
+
+ // Free the query -- it's fast, so it's OK to free it on main queue
+ deadbeef->pl_item_unref (query->track);
+ free (query);
+}
+
+static void
+_callback_and_cleanup (ddb_cover_query_t *query, ddb_cover_info_t *cover, GdkPixbuf *img) {
+ query_userdata_t *user_data = query->user_data;
+ covermanager_t *impl = user_data->impl;
+
+ if (impl->is_terminating) {
+ _cleanup_query (query);
+ return;
+ }
+
+ if (!(query->flags & DDB_ARTWORK_FLAG_CANCELLED)) {
+ _add_cover_for_track(impl, query->track, img);
+ }
+ void (^completionBlock)(GdkPixbuf *) = (void (^)(GdkPixbuf *))user_data->completion_block;
+ completionBlock(img);
+ if (img != NULL) {
+ gobj_unref(img);
+ img = NULL;
+ }
+ Block_release(completionBlock);
+ free (user_data);
+
+ // Free the query -- it's fast, so it's OK to free it on main queue
+ deadbeef->pl_item_unref (query->track);
+ free (query);
+
+ // Release the cover on background queue
+ if (cover != NULL) {
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+ impl->plugin->cover_info_release (cover);
+ });
+ }
+}
+
+static void
+_cover_loaded_callback (int error, ddb_cover_query_t *query, ddb_cover_info_t *cover) {
+ query_userdata_t *user_data = query->user_data;
+ covermanager_t *impl = user_data->impl;
+
+ if (impl->is_terminating) {
+ _cleanup_query (query);
+ return;
+ }
+
+ _dispatch_on_main(^{
+ // Prevent spurious loading of the same image. The load is already scheduled, so we should just wait for it.
+ char *key = _cache_key_for_track(impl, query->track);
+ gboolean should_wait = gobj_cache_get_should_wait(impl->cache, key) || (gobj_cache_get(impl->cache,key) != NULL);
+
+ if (should_wait) {
+ // append to the end of loader queue
+ dispatch_async(impl->loader_queue, ^{
+ _dispatch_on_main(^{
+ GdkPixbuf *img = GDK_PIXBUF(gobj_cache_get(impl->cache, key));
+ _callback_and_cleanup (query, cover, img);
+ free (key);
+ });
+ });
+ return;
+ }
+ else {
+ gobj_cache_set_should_wait(impl->cache, key, TRUE);
+ free (key);
+ }
+
+ // Load the image on background queue
+ dispatch_async(impl->loader_queue, ^{
+ if (impl->is_terminating) {
+ _cleanup_query (query);
+ return;
+ }
+
+ __block GdkPixbuf *img = NULL;
+
+ if (!(query->flags & DDB_ARTWORK_FLAG_CANCELLED)) {
+ img = _load_image_from_cover(impl, cover);
+ }
+
+ // Update the UI on main queue
+ _dispatch_on_main(^{
+ _callback_and_cleanup (query, cover, img);
+ });
+ });
+ });
+}
+
+covermanager_t *
+covermanager_shared(void) {
+ if (_shared == NULL) {
+ _shared = covermanager_new ();
+ }
+ return _shared;
+}
+
+void
+covermanager_shared_free(void) {
+ if (_shared != NULL) {
+ covermanager_free(_shared);
+ _shared = NULL;
+ }
+}
+
+covermanager_t *
+covermanager_new(void) {
+ covermanager_t *impl = calloc (1, sizeof (covermanager_t));
+
+ impl->plugin = (ddb_artwork_plugin_t *)deadbeef->plug_get_for_id("artwork2");
+
+ if (impl->plugin == NULL) {
+ return impl;
+ }
+
+ impl->cache = gobj_cache_new(CACHE_SIZE);
+
+ impl->image_size = deadbeef->conf_get_int("artwork.image_size", 256);
+
+ impl->name_tf = deadbeef->tf_compile ("%_path_raw%");
+
+ impl->loader_queue = dispatch_queue_create("CoverManagerLoaderQueue", NULL);
+
+ if (impl->plugin != NULL) {
+ impl->plugin->add_listener(_artwork_listener, impl);
+ }
+
+ _update_default_cover(impl);
+
+ return impl;
+}
+
+void
+covermanager_free (covermanager_t *impl) {
+ if (impl->plugin != NULL) {
+ impl->plugin->remove_listener(_artwork_listener, impl);
+ impl->plugin = NULL;
+ }
+ if (impl->name_tf != NULL) {
+ deadbeef->tf_free (impl->name_tf);
+ impl->name_tf = NULL;
+ }
+ if (impl->cache != NULL) {
+ gobj_cache_free(impl->cache);
+ impl->cache = NULL;
+ }
+
+ free (impl->default_cover_path);
+ impl->default_cover_path = NULL;
+
+ if (impl->default_cover) {
+ gobj_unref(impl->default_cover);
+ }
+
+ free(impl);
+}
+
+GdkPixbuf *
+covermanager_cover_for_track(covermanager_t *impl, DB_playItem_t *track, int64_t source_id, covermanager_completion_block_t completion_block) {
+ if (!impl->plugin) {
+ completion_block(NULL);
+ return NULL;
+ }
+
+ char *key = _cache_key_for_track(impl, track);
+ GdkPixbuf *cover = GDK_PIXBUF(gobj_cache_get(impl->cache, key));
+ free (key);
+ key = NULL;
+
+ // FIXME: need to check whether the cache has NULL object for the key
+ if (cover != NULL) {
+ // completion_block is not executed if the image is non-nil, to avoid double drawing.
+ // The caller must release user data if the returned image is not nil.
+ return cover;
+ }
+
+ if (gobj_cache_get_should_wait(impl->cache, key)) {
+ return NULL;
+ }
+
+ ddb_cover_query_t *query = calloc (1, sizeof (ddb_cover_query_t));
+ query->_size = sizeof (ddb_cover_query_t);
+ query->track = track;
+ deadbeef->pl_item_ref (track);
+ query->source_id = source_id;
+
+ query_userdata_t *data = calloc (1, sizeof (query_userdata_t));
+ data->completion_block = (dispatch_block_t)Block_copy(completion_block);
+ data->impl = impl;
+ query->user_data = (void *)data;
+
+ impl->plugin->cover_get (query, _cover_loaded_callback);
+
+ return NULL;
+}
+
+GdkPixbuf *
+covermanager_create_scaled_image (covermanager_t *manager, GdkPixbuf *image, GtkAllocation size) {
+ int originalWidth = gdk_pixbuf_get_width(image);
+ int originalHeight = gdk_pixbuf_get_height(image);
+
+ if (originalWidth <= size.width && originalHeight <= size.height) {
+ gobj_ref (image);
+ return image;
+ }
+
+ gboolean has_alpha = gdk_pixbuf_get_has_alpha(image);
+ int bits_per_sample = gdk_pixbuf_get_bits_per_sample(image);
+
+ GdkPixbuf *scaled_image = gdk_pixbuf_new(GDK_COLORSPACE_RGB, has_alpha, bits_per_sample, size.width, size.height);
+
+ double scale_x = (double)size.width/(double)originalWidth;
+ double scale_y = (double)size.height/(double)originalHeight;
+
+ gdk_pixbuf_scale(image, scaled_image, 0, 0, size.width, size.height, 0, 0, scale_x, scale_y, GDK_INTERP_BILINEAR);
+
+ return scaled_image;
+}
+
+GtkAllocation
+covermanager_desired_size_for_image_size (covermanager_t *manager, GtkAllocation image_size, GtkAllocation availableSize) {
+ double scale = min((double)availableSize.width/(double)image_size.width, (double)availableSize.height/(double)image_size.height);
+
+ GtkAllocation a = {0};
+ a.width = image_size.width * scale;
+ a.height = image_size.height * scale;
+
+ return a;
+}
+
+void
+covermanager_terminate(covermanager_t *manager) {
+ manager->is_terminating = TRUE;
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/covermanager/covermanager.h Added

@@ -0,0 +1,68 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef covermanager_h
+#define covermanager_h
+
+#include <gtk/gtk.h>
+#include <stdint.h>
+#include <dispatch/dispatch.h>
+#include <deadbeef/deadbeef.h>
+
+typedef struct covermanager_s covermanager_t;
+
+/// Called by @c covermanager_cover_for_track when the cover is ready.
+/// The @c img argument is not retained, and will be released after the block completes.
+typedef void (^covermanager_completion_block_t)(GdkPixbuf *img);
+
+covermanager_t *
+covermanager_shared(void);
+
+void
+covermanager_shared_free(void);
+
+covermanager_t *
+covermanager_new(void);
+
+void
+covermanager_free (covermanager_t *manager);
+
+/// Gets the cover from in-memory cache, or initiates asynchronous request to cache it.
+///
+/// If the cover is immediately available -- it will be returned (retained), and the @c completion_block will not be called.
+/// Otherwise the @c completion_block will be called when the requests completes.
+GdkPixbuf *
+covermanager_cover_for_track(covermanager_t *manager, DB_playItem_t *track, int64_t source_id, covermanager_completion_block_t completion_block);
+
+/// Create scaled image with specified dimensions. Returns retained object.
+GdkPixbuf *
+covermanager_create_scaled_image (covermanager_t *manager, GdkPixbuf *image, GtkAllocation size);
+
+/// Calculate the desired image size for specified available size.
+GtkAllocation
+covermanager_desired_size_for_image_size (covermanager_t *manager, GtkAllocation image_size, GtkAllocation availableSize);
+
+void
+covermanager_terminate(covermanager_t *manager);
+
+#endif /* covermanager_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/covermanager/gobjcache.c Added

@@ -0,0 +1,231 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include "gobjcache.h"
+
+typedef struct {
+ char *key;
+ time_t atime;
+ GObject *obj;
+ gboolean should_wait;
+} gobj_cache_item_t;
+
+typedef struct {
+ gobj_cache_item_t *items;
+ int count;
+} gobj_cache_impl_t;
+
+/// Using this for getting gobject reference count when debugging
+guint
+gobj_get_refc (gpointer ptr) {
+ struct _GObject {
+ GTypeInstance g_type_instance;
+ guint ref_count;
+ };
+
+ struct _GObject *gobj = (struct _GObject *)ptr;
+ return gobj->ref_count;
+}
+
+void
+gobj_ref (gpointer obj) {
+ assert (G_IS_OBJECT(obj));
+ g_object_ref (obj);
+}
+
+void
+gobj_unref (gpointer obj) {
+ assert (G_IS_OBJECT(obj));
+ g_object_unref(obj);
+}
+
+static void
+gobj_cache_item_deinit (gobj_cache_item_t * restrict item) {
+ free (item->key);
+ item->key = NULL;
+ if (item->obj) {
+ gobj_unref(item->obj);
+ }
+ item->obj = NULL;
+}
+
+gobj_cache_t
+gobj_cache_new (int max_object_count) {
+ assert (max_object_count);
+ gobj_cache_impl_t *impl = calloc (1, sizeof (gobj_cache_impl_t));
+ impl->items = calloc (max_object_count, sizeof (gobj_cache_item_t));
+ impl->count = max_object_count;
+ return impl;
+}
+
+void
+gobj_cache_free (gobj_cache_t restrict cache) {
+ gobj_cache_impl_t *impl = cache;
+
+ for (int i = 0; i < impl->count; i++) {
+ if (impl->itemsi.key != NULL) {
+ gobj_cache_item_deinit (&impl->itemsi);
+ }
+ }
+ free (impl->items);
+ impl->items = NULL;
+
+ free (impl);
+}
+
+static void
+_gobj_cache_set_int (gobj_cache_t restrict cache, const char * restrict key, GObject *obj, gboolean should_wait) {
+ if (key == NULL) {
+ return;
+ }
+ gobj_cache_impl_t *impl = cache;
+
+ if (obj) {
+ gobj_ref(obj);
+ }
+
+ // find item with that key or empty
+ gobj_cache_item_t *reuse = NULL;
+ gobj_cache_item_t *evict = NULL;
+ for (int i = 0; i < impl->count; i++) {
+ gobj_cache_item_t *item = &impl->itemsi;
+ if (item->key == NULL) {
+ if (reuse == NULL) {
+ reuse = item;
+ }
+ }
+ else if (!strcmp (item->key, key)) {
+ item->atime = time(NULL);
+ if (item->obj) {
+ gobj_unref(item->obj);
+ }
+ item->obj = obj;
+ item->should_wait = should_wait;
+ return;
+ }
+
+ if (!evict) {
+ evict = item;
+ }
+ else {
+ if (item->atime < evict->atime) {
+ evict = item;
+ }
+ }
+ }
+
+ if (!reuse) {
+ // evict
+ gobj_cache_item_deinit(evict);
+ reuse = evict;
+ evict = NULL;
+ }
+
+ reuse->atime = time(NULL);
+ reuse->key = strdup(key);
+ reuse->obj = obj;
+ reuse->should_wait = should_wait;
+}
+
+void
+gobj_cache_set (gobj_cache_t restrict cache, const char * restrict key, GObject *obj) {
+ _gobj_cache_set_int(cache, key, obj, FALSE);
+}
+
+static gobj_cache_item_t *
+_gobj_cache_get_int (gobj_cache_t cache, const char *key) {
+ if (key == NULL) {
+ return NULL;
+ }
+
+ gobj_cache_impl_t *impl = cache;
+
+ for (int i = 0; i < impl->count; i++) {
+ gobj_cache_item_t *item = &impl->itemsi;
+ if (item->key != NULL && !strcmp (item->key, key)) {
+ return item;
+ }
+ }
+ return NULL;
+}
+
+GObject *
+gobj_cache_get (gobj_cache_t cache, const char *key) {
+ gobj_cache_item_t *item = _gobj_cache_get_int(cache, key);
+ if (!item) {
+ return NULL;
+ }
+ item->atime = time(NULL);
+ if (item->obj) {
+ gobj_ref(item->obj);
+ }
+ return item->obj;
+}
+
+void
+gobj_cache_set_should_wait (gobj_cache_t cache, const char *key, gboolean should_wait) {
+ gobj_cache_item_t *item = _gobj_cache_get_int (cache,key);
+ if (!item || !should_wait) {
+ _gobj_cache_set_int(cache, key, NULL, should_wait);
+ }
+}
+
+gboolean
+gobj_cache_get_should_wait (gobj_cache_t cache, const char *key) {
+ gobj_cache_item_t *item = _gobj_cache_get_int(cache, key);
+ if (!item) {
+ return FALSE;
+ }
+ return item->should_wait;
+}
+
+void
+gobj_cache_remove (gobj_cache_t cache, const char *key) {
+ if (key == NULL) {
+ return;
+ }
+
+ gobj_cache_impl_t *impl = cache;
+
+ for (int i = 0; i < impl->count; i++) {
+ gobj_cache_item_t *item = &impl->itemsi;
+ if (item->key != NULL && !strcmp (item->key, key)) {
+ gobj_cache_item_deinit(item);
+ break;
+ }
+ }
+}
+
+void
+gobj_cache_remove_all (gobj_cache_t cache) {
+ gobj_cache_impl_t *impl = cache;
+
+ for (int i = 0; i < impl->count; i++) {
+ gobj_cache_item_t *item = &impl->itemsi;
+ gobj_cache_item_deinit(item);
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/covermanager/gobjcache.h Added

@@ -0,0 +1,64 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef gobjcache_h
+#define gobjcache_h
+
+#include <gtk/gtk.h>
+
+typedef void *gobj_cache_t;
+
+guint
+gobj_get_refc (gpointer ptr);
+
+void
+gobj_ref (gpointer obj);
+
+void
+gobj_unref (gpointer obj);
+
+gobj_cache_t
+gobj_cache_new (int max_object_count);
+
+void
+gobj_cache_free (gobj_cache_t cache);
+
+void
+gobj_cache_set (gobj_cache_t cache, const char *key, GObject *obj);
+
+GObject *
+gobj_cache_get (gobj_cache_t cache, const char *key);
+
+void
+gobj_cache_set_should_wait (gobj_cache_t cache, const char *key, gboolean should_wait);
+
+gboolean
+gobj_cache_get_should_wait (gobj_cache_t cache, const char *key);
+
+void
+gobj_cache_remove (gobj_cache_t cache, const char *key);
+
+void
+gobj_cache_remove_all (gobj_cache_t cache);
+
+#endif /* gobjcache_h */

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ctmapping.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ctmapping.c Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ctmapping.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ctmapping.h Changed

deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddb_splitter.c Added

@@ -0,0 +1,1366 @@
+/*
+ * Copyright (c) 2016 Christian Boxdörfer <christian.boxdoerfer@posteo.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include <gtk/gtk.h>
+#include <math.h>
+#include <string.h>
+#include "support.h"
+#include "ddb_splitter.h"
+
+/**
+ * SECTION: ddb-splitter
+ * @title: DdbSplitter
+ * @short_description: A container widget similar to GtkPaned, but with
+ * the ability to use proportional resizing
+ **/
+
+#define DDB_SPLITTER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
+ DDB_TYPE_SPLITTER, DdbSplitterPrivate))
+
+/* Property identifiers */
+enum
+{
+ PROP_0,
+ PROP_ORIENTATION,
+ PROP_SIZE_MODE,
+ PROP_PROPORTION,
+};
+
+#define DDB_SPLITTER_HANDLE_SIZE 6
+#define DDB_SPLITTER_HANDLE_LOCKED_SIZE 3
+
+#if !GTK_CHECK_VERSION(3,0,0)
+static void
+ddb_splitter_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+#else
+static void
+ddb_splitter_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+
+static void
+ddb_splitter_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+
+static void
+ddb_splitter_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum,
+ gint *natural);
+
+static void
+ddb_splitter_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum,
+ gint *natural);
+#endif
+
+static gboolean
+ddb_splitter_button_press (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean
+ddb_splitter_button_release (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean
+ddb_splitter_grab_broken (GtkWidget *widget,
+ GdkEventGrabBroken *event);
+static void
+ddb_splitter_grab_notify (GtkWidget *widget,
+ gboolean was_grabbed);
+static gboolean
+ddb_splitter_motion (GtkWidget *widget,
+ GdkEventMotion *event);
+#if GTK_CHECK_VERSION(3,0,0)
+static gboolean
+ddb_splitter_draw (GtkWidget *widget,
+ cairo_t *cr);
+#else
+static gboolean
+ddb_splitter_expose (GtkWidget *widget,
+ GdkEventExpose *event);
+#endif
+static void
+ddb_splitter_realize (GtkWidget *widget);
+
+static void
+ddb_splitter_unrealize (GtkWidget *widget);
+
+static void
+ddb_splitter_map (GtkWidget *widget);
+
+static void
+ddb_splitter_unmap (GtkWidget *widget);
+
+static void
+ddb_splitter_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void
+ddb_splitter_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+
+static void
+ddb_splitter_set_orientation (DdbSplitter *splitter,
+ GtkOrientation orientation);
+
+static void
+ddb_splitter_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void
+ddb_splitter_add (GtkContainer *container,
+ GtkWidget *widget);
+static void
+ddb_splitter_remove (GtkContainer *container,
+ GtkWidget *widget);
+static void
+ddb_splitter_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data);
+
+struct _DdbSplitterPrivate
+{
+ GtkWidget *child1;
+ GtkWidget *child2;
+ GdkWindow *handle;
+ GdkRectangle handle_pos;
+ gint handle_size;
+ gint drag_pos;
+ guint in_drag : 1;
+ guint position_set : 1;
+ guint32 grab_time;
+
+ /* configurable parameters */
+ guint child1_size;
+ guint child2_size;
+
+ GtkOrientation orientation;
+ DdbSplitterSizeMode size_mode;
+ gfloat proportion;
+};
+
+G_DEFINE_TYPE (DdbSplitter, ddb_splitter, GTK_TYPE_CONTAINER)
+
+static void
+ddb_splitter_class_init (DdbSplitterClass *klass)
+{
+ GtkContainerClass *gtkcontainer_class;
+ GtkWidgetClass *gtkwidget_class;
+ GObjectClass *gobject_class;
+
+ /* add our private data to the class */
+ g_type_class_add_private (klass, sizeof (DdbSplitterPrivate));
+
+ gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class->get_property = ddb_splitter_get_property;
+ gobject_class->set_property = ddb_splitter_set_property;
+
+ gtkwidget_class = GTK_WIDGET_CLASS (klass);
+#if !GTK_CHECK_VERSION(3,0,0)
+ gtkwidget_class->size_request = ddb_splitter_size_request;
+#else
+ gtkwidget_class->get_preferred_width = ddb_splitter_get_preferred_width;
+ gtkwidget_class->get_preferred_height = ddb_splitter_get_preferred_height;
+ gtkwidget_class->get_preferred_width_for_height = ddb_splitter_get_preferred_width_for_height;
+ gtkwidget_class->get_preferred_height_for_width = ddb_splitter_get_preferred_height_for_width;
+#endif
+ gtkwidget_class->size_allocate = ddb_splitter_size_allocate;
+ gtkwidget_class->realize = ddb_splitter_realize;
+#if GTK_CHECK_VERSION(3,0,0)
+ gtkwidget_class->draw = ddb_splitter_draw;
+#else
+ gtkwidget_class->expose_event = ddb_splitter_expose;
+#endif
+ gtkwidget_class->unrealize = ddb_splitter_unrealize;
+ gtkwidget_class->map = ddb_splitter_map;
+ gtkwidget_class->unmap = ddb_splitter_unmap;
+ gtkwidget_class->button_press_event = ddb_splitter_button_press;
+ gtkwidget_class->button_release_event = ddb_splitter_button_release;
+ gtkwidget_class->motion_notify_event = ddb_splitter_motion;
+ gtkwidget_class->grab_broken_event = ddb_splitter_grab_broken;
+ gtkwidget_class->grab_notify = ddb_splitter_grab_notify;
+
+ gtkcontainer_class = GTK_CONTAINER_CLASS (klass);
+ gtkcontainer_class->add = ddb_splitter_add;
+ gtkcontainer_class->remove = ddb_splitter_remove;
+ gtkcontainer_class->forall = ddb_splitter_forall;
+
+ /**
+ * DdbSplitter::size_mode:
+ *
+ * The size mode of the splitter.
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_SIZE_MODE,
+ g_param_spec_enum ("size-mode",
+ "Size mode",
+ "The size mode of the splitter widget",
+ DDB_SPLITTER_TYPE_SIZE_MODE, DDB_SPLITTER_SIZE_MODE_PROP,
+ G_PARAM_READWRITE));
+ /**
+ * DdbSplitter::orientation:
+ *
+ * The orientation of the splitter.
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_ORIENTATION,
+ g_param_spec_enum ("orientation",
+ "Orientation",
+ "The orientation of the splitter widget",
+ GTK_TYPE_ORIENTATION, GTK_ORIENTATION_HORIZONTAL,
+ G_PARAM_READWRITE));
+ /**
+ * DdbSplitter::proportion:
+ *
+ * The percentage of space allocated to the first child.
+ **/
+ g_object_class_install_property (gobject_class,
+ PROP_PROPORTION,
+ g_param_spec_float ("proportion",
+ "Proportion",
+ "The percentage of space allocated to the first child",
+ -G_MAXFLOAT, 1.0, -1.0,
+ G_PARAM_READWRITE));
+}
+
+static void
+ddb_splitter_init (DdbSplitter *splitter)
+{
+ /* grab a pointer on the private data */
+ splitter->priv = DDB_SPLITTER_GET_PRIVATE (splitter);
+
+ splitter->priv->orientation = GTK_ORIENTATION_HORIZONTAL;
+ splitter->priv->size_mode = DDB_SPLITTER_SIZE_MODE_PROP;
+ splitter->priv->drag_pos = -1;
+ splitter->priv->in_drag = FALSE;
+ splitter->priv->position_set = FALSE;
+ splitter->priv->child1 = NULL;
+ splitter->priv->child2 = NULL;
+ splitter->priv->child1_size = 0;
+ splitter->priv->child2_size = 0;
+ splitter->priv->handle = NULL;
+ splitter->priv->handle_size = DDB_SPLITTER_HANDLE_SIZE;
+ splitter->priv->handle_pos.x = -1;
+ splitter->priv->handle_pos.y = -1;
+ splitter->priv->handle_pos.width = DDB_SPLITTER_HANDLE_SIZE;
+ splitter->priv->handle_pos.height = DDB_SPLITTER_HANDLE_SIZE;
+ splitter->priv->proportion = 0.5f;
+ /* we don't provide our own window */
+ gtk_widget_set_can_focus (GTK_WIDGET (splitter), FALSE);
+ gtk_widget_set_has_window (GTK_WIDGET (splitter), FALSE);
+ gtk_widget_set_redraw_on_allocate (GTK_WIDGET (splitter), FALSE);
+}
+
+static void
+ddb_splitter_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (object);
+
+ switch (prop_id) {
+ case PROP_ORIENTATION:
+ g_value_set_enum (value, ddb_splitter_get_orientation (splitter));
+ break;
+
+ case PROP_SIZE_MODE:
+ g_value_set_enum (value, ddb_splitter_get_size_mode (splitter));
+ break;
+
+ case PROP_PROPORTION:
+ g_value_set_float (value, ddb_splitter_get_proportion (splitter));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+ddb_splitter_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (object);
+
+ switch (prop_id) {
+ case PROP_ORIENTATION:
+ ddb_splitter_set_orientation (splitter, g_value_get_enum (value));
+ break;
+
+ case PROP_SIZE_MODE:
+ ddb_splitter_set_size_mode (splitter, g_value_get_enum (value));
+ break;
+
+ case PROP_PROPORTION:
+ ddb_splitter_set_proportion (splitter, g_value_get_float (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static gboolean
+ddb_splitter_button_press (GtkWidget *widget,
+ GdkEventButton *event)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ if (event->window == splitter->priv->handle
+ && event->button == 1
+ && event->type == GDK_2BUTTON_PRESS) {
+ ddb_splitter_set_proportion (splitter, 0.5f);
+ return TRUE;
+ }
+ if (!splitter->priv->in_drag &&
+ (event->window == splitter->priv->handle) && (event->button == 1))
+ {
+ /* We need a server grab here, not gtk_grab_add(), since
+ * we don't want to pass events on to the widget's children */
+ if (gdk_pointer_grab (splitter->priv->handle, FALSE,
+ GDK_POINTER_MOTION_HINT_MASK
+ | GDK_BUTTON1_MOTION_MASK
+ | GDK_BUTTON_RELEASE_MASK
+ | GDK_ENTER_NOTIFY_MASK
+ | GDK_LEAVE_NOTIFY_MASK,
+ NULL, NULL,
+ event->time) != GDK_GRAB_SUCCESS)
+ return FALSE;
+
+ splitter->priv->in_drag = TRUE;
+ splitter->priv->grab_time = event->time;
+
+ if (splitter->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ splitter->priv->drag_pos = event->x;
+ else
+ splitter->priv->drag_pos = event->y;
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+ddb_splitter_update_cursor (DdbSplitter *splitter)
+{
+ if (gtk_widget_get_realized (GTK_WIDGET (splitter))) {
+ GdkCursor *cursor = NULL;
+ if (splitter->priv->size_mode != DDB_SPLITTER_SIZE_MODE_PROP) {
+ cursor = NULL;
+ }
+ else {
+ if (splitter->priv->orientation == GTK_ORIENTATION_VERTICAL) {
+ cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (splitter)),
+ GDK_SB_V_DOUBLE_ARROW);
+ }
+ else {
+ cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (splitter)),
+ GDK_SB_H_DOUBLE_ARROW);
+ }
+ }
+
+ gdk_window_set_cursor (splitter->priv->handle, cursor);
+
+ if (cursor) {
+ gdk_cursor_unref (cursor);
+ }
+ }
+}
+
+static gboolean
+ddb_splitter_children_visible (DdbSplitter *splitter)
+{
+ g_return_val_if_fail (DDB_IS_SPLITTER (splitter), FALSE);
+ if (splitter->priv->child1
+ && gtk_widget_get_visible (GTK_WIDGET (splitter->priv->child1))
+ && splitter->priv->child2
+ && gtk_widget_get_visible (GTK_WIDGET (splitter->priv->child2))) {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static gboolean
+ddb_splitter_is_child_visible (DdbSplitter *splitter, guint child)
+{
+ g_return_val_if_fail (DDB_IS_SPLITTER (splitter), FALSE);
+ if (child == 0) {
+ if (splitter->priv->child1
+ && gtk_widget_get_visible (GTK_WIDGET (splitter->priv->child1))) {
+ return TRUE;
+ }
+ }
+ else if (child == 1) {
+ if (splitter->priv->child2
+ && gtk_widget_get_visible (GTK_WIDGET (splitter->priv->child2))) {
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+static gboolean
+ddb_splitter_grab_broken (GtkWidget *widget,
+ GdkEventGrabBroken *event)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ splitter->priv->in_drag = FALSE;
+ splitter->priv->drag_pos = -1;
+ splitter->priv->position_set = TRUE;
+
+ return TRUE;
+}
+
+static void
+stop_drag (DdbSplitter *splitter)
+{
+ splitter->priv->in_drag = FALSE;
+ splitter->priv->drag_pos = -1;
+ splitter->priv->position_set = TRUE;
+ gdk_display_pointer_ungrab (gtk_widget_get_display (GTK_WIDGET (splitter)),
+ splitter->priv->grab_time);
+}
+
+static void
+ddb_splitter_grab_notify (GtkWidget *widget,
+ gboolean was_grabbed)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ if (!was_grabbed && splitter->priv->in_drag)
+ stop_drag (splitter);
+}
+
+static gboolean
+ddb_splitter_button_release (GtkWidget *widget,
+ GdkEventButton *event)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ if (splitter->priv->in_drag && (event->button == 1)) {
+ stop_drag (splitter);
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+update_drag (DdbSplitter *splitter)
+{
+ gint pos;
+ gint size;
+
+ if (splitter->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_widget_get_pointer (GTK_WIDGET (splitter), &pos, NULL);
+ else
+ gtk_widget_get_pointer (GTK_WIDGET (splitter), NULL, &pos);
+
+ pos -= splitter->priv->drag_pos;
+
+ size = pos;
+
+ GtkAllocation a;
+ gtk_widget_get_allocation (GTK_WIDGET (splitter), &a);
+ if (size != splitter->priv->child1_size) {
+ if (splitter->priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+ float gripsize = (float)splitter->priv->handle_pos.width/a.width;
+ ddb_splitter_set_proportion (splitter, CLAMP ((float)size/a.width, 0, 1-gripsize));
+ }
+ else {
+ float gripsize = (float)splitter->priv->handle_pos.height/a.height;
+ ddb_splitter_set_proportion (splitter, CLAMP ((float)size/a.height, 0, 1-gripsize));
+ }
+ }
+}
+
+static gboolean
+ddb_splitter_motion (GtkWidget *widget,
+ GdkEventMotion *event)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ if (splitter->priv->in_drag) {
+ update_drag (splitter);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+static gboolean
+ddb_splitter_draw (GtkWidget *widget,
+ cairo_t *cr)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget) &&
+ ddb_splitter_children_visible (splitter))
+ {
+ if (splitter->priv->size_mode == DDB_SPLITTER_SIZE_MODE_PROP) {
+ gtk_render_handle (gtk_widget_get_style_context (widget), cr,
+ splitter->priv->handle_pos.x, splitter->priv->handle_pos.y,
+ splitter->priv->handle_pos.width, splitter->priv->handle_pos.height);
+ }
+ else {
+ gtk_render_background (gtk_widget_get_style_context (widget), cr,
+ splitter->priv->handle_pos.x, splitter->priv->handle_pos.y,
+ splitter->priv->handle_pos.width, splitter->priv->handle_pos.height);
+ }
+ }
+
+ /* Chain up to draw children */
+ GTK_WIDGET_CLASS (ddb_splitter_parent_class)->draw (widget, cr);
+
+ return FALSE;
+}
+
+#else
+
+static gboolean
+ddb_splitter_expose (GtkWidget *widget,
+ GdkEventExpose *event)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget) &&
+ ddb_splitter_children_visible (splitter))
+ {
+ GtkStateType state;
+
+ if (gtk_widget_is_focus (widget))
+ state = GTK_STATE_SELECTED;
+ else
+ state = gtk_widget_get_state (widget);
+
+ //cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
+ if (splitter->priv->size_mode == DDB_SPLITTER_SIZE_MODE_PROP) {
+ gtk_paint_handle (gtk_widget_get_style (widget), gtk_widget_get_window (widget),
+ state, GTK_SHADOW_NONE,
+ &splitter->priv->handle_pos, widget, "paned",
+ splitter->priv->handle_pos.x, splitter->priv->handle_pos.y,
+ splitter->priv->handle_pos.width, splitter->priv->handle_pos.height,
+ !splitter->priv->orientation);
+ }
+ else {
+ gtk_paint_box (gtk_widget_get_style (widget), gtk_widget_get_window (widget),
+ state, GTK_SHADOW_NONE,
+ &splitter->priv->handle_pos, widget, "paned",
+ splitter->priv->handle_pos.x, splitter->priv->handle_pos.y,
+ splitter->priv->handle_pos.width, splitter->priv->handle_pos.height);
+ }
+ //cairo_destroy (cr);
+ }
+
+ /* Chain up to draw children */
+ GTK_WIDGET_CLASS (ddb_splitter_parent_class)->expose_event (widget, event);
+
+ return FALSE;
+}
+#endif
+
+static void
+ddb_splitter_realize (GtkWidget *widget)
+{
+ GdkWindowAttr attributes;
+ gint attributes_mask;
+
+ gtk_widget_set_realized (widget, TRUE);
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ GdkWindow *parent = gtk_widget_get_parent_window (widget);
+ gtk_widget_set_window (widget, parent);
+ if (parent) {
+ g_object_ref (parent);
+
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.wclass = GDK_INPUT_ONLY;
+ attributes.x = splitter->priv->handle_pos.x;
+ attributes.y = splitter->priv->handle_pos.y;
+ attributes.width = splitter->priv->handle_pos.width;
+ attributes.height = splitter->priv->handle_pos.height;
+ attributes.event_mask = gtk_widget_get_events (widget);
+ attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_ENTER_NOTIFY_MASK |
+ GDK_LEAVE_NOTIFY_MASK |
+ GDK_POINTER_MOTION_MASK |
+ GDK_POINTER_MOTION_HINT_MASK);
+ attributes_mask = GDK_WA_X | GDK_WA_Y;
+ if (gtk_widget_is_sensitive (widget)) {
+ if (splitter->priv->size_mode != DDB_SPLITTER_SIZE_MODE_PROP) {
+ attributes.cursor = NULL;
+ }
+ else {
+ if (splitter->priv->orientation == GTK_ORIENTATION_VERTICAL) {
+ attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
+ GDK_SB_V_DOUBLE_ARROW);
+ }
+ else {
+ attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
+ GDK_SB_H_DOUBLE_ARROW);
+ }
+ }
+ attributes_mask |= GDK_WA_CURSOR;
+ }
+
+ splitter->priv->handle = gdk_window_new (parent,
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (splitter->priv->handle, splitter);
+ if (attributes_mask & GDK_WA_CURSOR && attributes.cursor) {
+ gdk_cursor_unref (attributes.cursor);
+ }
+
+
+#if !GTK_CHECK_VERSION(3,0,0)
+ widget->style = gtk_style_attach (widget->style, widget->window);
+#endif
+
+ if (ddb_splitter_children_visible (splitter)) {
+ gdk_window_show (splitter->priv->handle);
+ }
+ }
+}
+
+static void
+ddb_splitter_unrealize (GtkWidget *widget)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ if (splitter->priv->handle) {
+ gdk_window_set_user_data (splitter->priv->handle, NULL);
+ gdk_window_destroy (splitter->priv->handle);
+ splitter->priv->handle = NULL;
+ }
+
+ GTK_WIDGET_CLASS (ddb_splitter_parent_class)->unrealize (widget);
+}
+
+static void
+ddb_splitter_map (GtkWidget *widget)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ gdk_window_show (splitter->priv->handle);
+
+ GTK_WIDGET_CLASS (ddb_splitter_parent_class)->map (widget);
+}
+
+static void
+ddb_splitter_unmap (GtkWidget *widget)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ gdk_window_hide (splitter->priv->handle);
+
+ GTK_WIDGET_CLASS (ddb_splitter_parent_class)->unmap (widget);
+}
+
+// Prevent panes from getting smaller than the underlying widget's natural size,
+// with priority on left/top pane.
+static gfloat
+_ddb_splitter_fix_proportion (DdbSplitter *splitter, gfloat proportion) {
+ GtkAllocation a;
+ gtk_widget_get_allocation (GTK_WIDGET (splitter), &a);
+ if (a.x < 0 || a.y < 0) {
+ return proportion;
+ }
+
+ float pos = proportion * (splitter->priv->orientation == GTK_ORIENTATION_HORIZONTAL ? a.width : a.height);
+
+ GtkRequisition r1, r2;
+#if !GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_size_request (splitter->priv->child1, &r1);
+ gtk_widget_size_request (splitter->priv->child2, &r2);
+#else
+ gtk_widget_get_preferred_size(splitter->priv->child1, NULL, &r1);
+ gtk_widget_get_preferred_size(splitter->priv->child2, NULL, &r2);
+#endif
+
+ if (splitter->priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+ if (pos > a.width - r2.width) {
+ pos = a.width - r2.width;
+ }
+ if (pos < r1.width) {
+ pos = r1.width;
+ }
+ if (pos >= a.width - splitter->priv->handle_size) {
+ pos = a.width - splitter->priv->handle_size;
+ }
+ }
+ else {
+ if (pos > a.height - r2.height) {
+ pos = a.height - r2.height;
+ }
+ if (pos < r1.height) {
+ pos = r1.height;
+ }
+ if (pos >= a.height - splitter->priv->handle_size) {
+ pos = a.height - splitter->priv->handle_size;
+ }
+ }
+
+ if (pos < 0) {
+ pos = 0;
+ }
+
+ return pos / (splitter->priv->orientation == GTK_ORIENTATION_HORIZONTAL ? a.width : a.height);
+}
+
+#if !GTK_CHECK_VERSION(3,0,0)
+
+static void
+ddb_splitter_size_request (GtkWidget *widget,
+ GtkRequisition *requisition)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+
+ gint border_width = gtk_container_get_border_width (GTK_CONTAINER (splitter));
+
+ GtkRequisition req_c1;
+ req_c1.width = 0;
+ req_c1.height = 0;
+ if (ddb_splitter_is_child_visible (splitter, 0)) {
+ gtk_widget_size_request (splitter->priv->child1, &req_c1);
+ }
+
+ GtkRequisition req_c2;
+ req_c2.width = 0;
+ req_c2.height = 0;
+ if (ddb_splitter_is_child_visible (splitter, 1)) {
+ gtk_widget_size_request (splitter->priv->child2, &req_c2);
+ }
+
+ requisition->width = 0;
+ requisition->height = 0;
+ requisition->width += border_width * 2;
+ requisition->height += border_width * 2;
+
+ if (splitter->priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+ requisition->width += req_c1.width + req_c2.width;
+ requisition->height += MAX (req_c1.height, req_c2.height);
+ }
+ else {
+ requisition->width += MAX (req_c1.width, req_c2.width);
+ requisition->height += req_c1.height + req_c2.height;
+ }
+
+ if (ddb_splitter_children_visible (splitter)) {
+ if (splitter->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ requisition->width += splitter->priv->handle_size;
+ else
+ requisition->height += splitter->priv->handle_size;
+ }
+}
+#else
+
+static void
+ddb_splitter_get_preferred_size (GtkWidget *widget,
+ void (func_get_preferred_size) (GtkWidget *, gint *, gint *),
+ GtkOrientation orientation,
+ gint *minimum,
+ gint *natural)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+ gint min = 0;
+ gint nat = 0;
+ gint child1_min = 0;
+ gint child1_nat = 0;
+ gint child2_min = 0;
+ gint child2_nat = 0;
+
+ if (ddb_splitter_is_child_visible (splitter, 0)) {
+ func_get_preferred_size (splitter->priv->child1, &child1_min, &child1_nat);
+ }
+ if (ddb_splitter_is_child_visible (splitter, 1)) {
+ func_get_preferred_size (splitter->priv->child2, &child2_min, &child2_nat);
+ }
+
+ if (splitter->priv->orientation == orientation) {
+ nat = child1_nat + child2_nat;
+ if (ddb_splitter_children_visible (splitter)) {
+ min += splitter->priv->handle_size;
+ nat += splitter->priv->handle_size;
+ }
+ }
+ else {
+ nat = MAX (child1_nat, child2_nat);
+ }
+ *minimum = min;
+ *natural = nat;
+}
+
+static void
+ddb_splitter_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ ddb_splitter_get_preferred_size (widget,
+ &gtk_widget_get_preferred_width,
+ GTK_ORIENTATION_HORIZONTAL,
+ minimum,
+ natural);
+}
+
+static void
+ddb_splitter_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ ddb_splitter_get_preferred_size (widget,
+ &gtk_widget_get_preferred_height,
+ GTK_ORIENTATION_VERTICAL,
+ minimum,
+ natural);
+}
+
+static void
+ddb_splitter_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum,
+ gint *natural)
+{
+ ddb_splitter_get_preferred_width (widget, minimum, natural);
+}
+
+static void
+ddb_splitter_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum,
+ gint *natural)
+{
+ ddb_splitter_get_preferred_height (widget, minimum, natural);
+}
+#endif
+
+static gint
+ddb_splitter_child2_size_calc (DdbSplitter *splitter,
+ gint num_visible_children,
+ gboolean c1_visible,
+ gint con_size,
+ gint handle_size)
+{
+ DdbSplitterPrivate *sp_priv = splitter->priv;
+ gint size = 0;
+ if (sp_priv->size_mode == DDB_SPLITTER_SIZE_MODE_LOCK_C2) {
+ // child 2 locked, use saved size
+ size = sp_priv->child2_size;
+ }
+ else {
+ if (num_visible_children == 1) {
+ // only one child, use full size
+ size = con_size;
+ }
+ else if (c1_visible && sp_priv->size_mode == DDB_SPLITTER_SIZE_MODE_LOCK_C1) {
+ // two children and first one is locked, use all space left
+ size = con_size - sp_priv->child1_size - handle_size;
+ }
+ else {
+ // two children visible and proportional scaling is active
+ size = con_size - sp_priv->child1_size - handle_size;
+ }
+ }
+ return size;
+}
+
+static gint
+ddb_splitter_child1_size_calc (DdbSplitter *splitter,
+ gint num_visible_children,
+ gboolean c2_visible,
+ gint con_size,
+ gint handle_size)
+{
+ DdbSplitterPrivate *sp_priv = splitter->priv;
+ gint size = 0;
+ if (sp_priv->size_mode == DDB_SPLITTER_SIZE_MODE_LOCK_C1) {
+ // child 1 locked, use saved size
+ size = sp_priv->child1_size;
+ }
+ else {
+ if (num_visible_children == 1) {
+ // only one child, use full size
+ size = con_size;
+ }
+ else if (c2_visible && sp_priv->size_mode == DDB_SPLITTER_SIZE_MODE_LOCK_C2) {
+ // two children and second one is locked, use all space left
+ size = con_size - sp_priv->child2_size - handle_size;
+ }
+ else {
+ // two children visible and proportional scaling is active
+ float p = _ddb_splitter_fix_proportion(splitter, sp_priv->proportion);
+ size = ceilf (con_size * p);
+ }
+ }
+ return size;
+}
+
+static void
+ddb_splitter_size_allocate (GtkWidget *widget, GtkAllocation *a_con)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (widget);
+ DdbSplitterPrivate *sp_priv = splitter->priv;
+ GtkWidget *c1 = sp_priv->child1;
+ GtkWidget *c2 = sp_priv->child2;
+
+ gfloat old_proportion = _ddb_splitter_fix_proportion(splitter, sp_priv->proportion);
+
+ gint border_width = gtk_container_get_border_width (GTK_CONTAINER (splitter));
+ gtk_widget_set_allocation (widget, a_con);
+
+ gboolean c1_visible = c1 && gtk_widget_get_visible (c1) ? TRUE : FALSE;
+ gboolean c2_visible = c2 && gtk_widget_get_visible (c2) ? TRUE : FALSE;
+ guint num_visible_children = c1_visible + c2_visible;
+
+ gint con_width = a_con->width - border_width * 2;
+ gint con_height = a_con->height - border_width * 2;
+ gint handle_size = num_visible_children > 1 ? sp_priv->handle_size : 0;
+
+ GdkRectangle old_handle_pos = sp_priv->handle_pos;
+
+ GtkAllocation a_c1;
+ memset (&a_c1, 0, sizeof (a_c1));
+ GtkAllocation a_c2;
+ memset (&a_c2, 0, sizeof (a_c2));
+ if (sp_priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+ if (c1_visible) {
+ // use full height in horitzontal splitter
+ a_c1.height = MAX (1, con_height);
+
+ gint width = ddb_splitter_child1_size_calc (splitter,
+ num_visible_children,
+ c2_visible,
+ con_width,
+ handle_size);
+ a_c1.width = MAX (1, width);
+ a_c1.x = a_con->x + border_width;
+ a_c1.y = a_con->y + border_width;
+
+ gtk_widget_size_allocate (sp_priv->child1, &a_c1);
+ sp_priv->child1_size = a_c1.width;
+ if (sp_priv->size_mode != DDB_SPLITTER_SIZE_MODE_PROP) {
+ sp_priv->proportion = CLAMP ((float)a_c1.width/con_width, 0.0f, 1.0f);
+ }
+ sp_priv->handle_pos.x = a_con->x + sp_priv->child1_size + border_width;
+ sp_priv->handle_pos.y = a_con->y + border_width;
+ sp_priv->handle_pos.width = handle_size;
+ sp_priv->handle_pos.height = MAX (1, a_con->height - 2 * border_width);
+
+ }
+ if (c2_visible) {
+ // use full height in horitzontal splitter
+ a_c2.height = MAX (1, con_height);
+ gint width = ddb_splitter_child2_size_calc (splitter,
+ num_visible_children,
+ c1_visible,
+ con_width,
+ handle_size);
+ a_c2.width = MAX (1, width);
+ a_c2.x = a_c1.x + a_c1.width + handle_size;
+ a_c2.y = a_con->y + border_width;
+
+ gtk_widget_size_allocate (sp_priv->child2, &a_c2);
+ sp_priv->child2_size = a_c2.width;
+ }
+ }
+ else {
+ if (c1_visible) {
+ // use full width in vertical splitter
+ a_c1.width = MAX (1, con_width);
+
+ gint height = ddb_splitter_child1_size_calc (splitter,
+ num_visible_children,
+ c2_visible,
+ con_height,
+ handle_size);
+
+ a_c1.height = MAX (1, height);
+ a_c1.x =a_con->x + border_width;
+ a_c1.y = a_con->y + border_width;
+
+ gtk_widget_size_allocate (sp_priv->child1, &a_c1);
+ sp_priv->child1_size = a_c1.height;
+ if (sp_priv->size_mode != DDB_SPLITTER_SIZE_MODE_PROP) {
+ sp_priv->proportion = CLAMP ((float)a_c1.height/con_height, 0.0f, 1.0f);
+ }
+ sp_priv->handle_pos.x = a_con->x + border_width;
+ sp_priv->handle_pos.y = a_con->y + sp_priv->child1_size + border_width;
+ sp_priv->handle_pos.width = MAX (1, (gint) a_con->width - 2 * border_width);
+ sp_priv->handle_pos.height = handle_size;
+
+ }
+ if (c2_visible) {
+ // use full width in vertical splitter
+ a_c2.width = MAX (1, con_width);
+
+ gint height = ddb_splitter_child2_size_calc (splitter,
+ num_visible_children,
+ c1_visible,
+ con_height,
+ handle_size);
+ a_c2.height = MAX (1, height);
+ a_c2.x = a_con->x + border_width;
+ a_c2.y = a_c1.y + a_c1.height + handle_size;
+
+ gtk_widget_size_allocate (sp_priv->child2, &a_c2);
+ sp_priv->child2_size = a_c2.height;
+ }
+ }
+
+ if (!c1_visible && !c2_visible) {
+ GtkAllocation child_allocation;
+
+ if (sp_priv->child1)
+ gtk_widget_set_child_visible (sp_priv->child1, TRUE);
+ if (sp_priv->child2)
+ gtk_widget_set_child_visible (sp_priv->child2, TRUE);
+
+ child_allocation.x = a_con->x + border_width;
+ child_allocation.y = a_con->y + border_width;
+ child_allocation.width = MAX (1, con_width);
+ child_allocation.height = MAX (1, con_height);
+
+ if (ddb_splitter_is_child_visible (splitter, 0))
+ gtk_widget_size_allocate (sp_priv->child1, &child_allocation);
+ else if (ddb_splitter_is_child_visible (splitter, 1))
+ gtk_widget_size_allocate (sp_priv->child2, &child_allocation);
+ }
+
+ if (gtk_widget_get_mapped (widget) &&
+ (old_handle_pos.x != sp_priv->handle_pos.x ||
+ old_handle_pos.y != sp_priv->handle_pos.y ||
+ old_handle_pos.width != sp_priv->handle_pos.width ||
+ old_handle_pos.height != sp_priv->handle_pos.height))
+ {
+ GdkWindow *window = gtk_widget_get_window (widget);
+ gdk_window_invalidate_rect (window, &old_handle_pos, FALSE);
+ gdk_window_invalidate_rect (window, &sp_priv->handle_pos, FALSE);
+ }
+
+ if (gtk_widget_get_realized (widget)) {
+ if (gtk_widget_get_mapped (widget))
+ gdk_window_show (sp_priv->handle);
+
+ if (sp_priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+ gdk_window_move_resize (sp_priv->handle,
+ sp_priv->handle_pos.x,
+ sp_priv->handle_pos.y,
+ handle_size,
+ sp_priv->handle_pos.height);
+ }
+ else {
+ gdk_window_move_resize (sp_priv->handle,
+ sp_priv->handle_pos.x,
+ sp_priv->handle_pos.y,
+ sp_priv->handle_pos.width,
+ handle_size);
+ }
+ }
+
+ g_object_freeze_notify (G_OBJECT (splitter));
+ if (sp_priv->proportion != old_proportion) {
+ g_object_notify (G_OBJECT (splitter), "proportion");
+ }
+ g_object_thaw_notify (G_OBJECT (splitter));
+}
+
+static void
+ddb_splitter_add (GtkContainer *container, GtkWidget *widget)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (container);
+
+ if (splitter->priv->child1 && splitter->priv->child2) {
+ // Splitter already full
+ return;
+ }
+
+ gtk_widget_set_parent (widget, GTK_WIDGET (splitter));
+
+ if (!splitter->priv->child1) {
+ splitter->priv->child1 = widget;
+ }
+ else if (!splitter->priv->child2) {
+ splitter->priv->child2 = widget;
+ }
+
+ /* realize the widget if required */
+ if (gtk_widget_get_realized (GTK_WIDGET (container)))
+ gtk_widget_realize (widget);
+
+ /* map the widget if required */
+ if (gtk_widget_get_visible (GTK_WIDGET (container)) && gtk_widget_get_visible (widget)) {
+ if (gtk_widget_get_mapped (GTK_WIDGET (container)))
+ gtk_widget_map (widget);
+ }
+
+ gtk_widget_queue_resize (GTK_WIDGET (container));
+ return;
+}
+
+static void
+ddb_splitter_remove (GtkContainer *container, GtkWidget *widget)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (container);
+
+ /* check if the widget was visible */
+ gboolean widget_was_visible = gtk_widget_get_visible (widget);
+
+ /* unparent and remove the widget */
+ gtk_widget_unparent (widget);
+ if (splitter->priv->child1 == widget) {
+ splitter->priv->child1 = NULL;
+ }
+ else if (splitter->priv->child2 == widget) {
+ splitter->priv->child2 = NULL;
+ }
+
+ if (G_LIKELY (widget_was_visible))
+ gtk_widget_queue_resize (GTK_WIDGET (splitter));
+}
+
+static void
+ddb_splitter_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data)
+{
+ DdbSplitter *splitter = DDB_SPLITTER (container);
+ GtkWidget *c1 = splitter->priv->child1;
+ GtkWidget *c2 = splitter->priv->child2;
+
+ if (c1 && GTK_IS_WIDGET (c1)) {
+ (*callback) (c1, callback_data);
+ }
+ if (c2 && GTK_IS_WIDGET (c2)) {
+ (*callback) (c2, callback_data);
+ }
+}
+
+static void
+ddb_splitter_remove_child (DdbSplitter *splitter, guint child)
+{
+ if (child == 1 && splitter->priv->child1) {
+ ddb_splitter_remove (GTK_CONTAINER (splitter), splitter->priv->child1);
+ }
+ else if (child == 2 && splitter->priv->child2) {
+ ddb_splitter_remove (GTK_CONTAINER (splitter), splitter->priv->child2);
+ }
+}
+
+void
+ddb_splitter_remove_c1 (DdbSplitter *splitter)
+{
+ ddb_splitter_remove_child (splitter, 1);
+}
+
+void
+ddb_splitter_remove_c2 (DdbSplitter *splitter)
+{
+ ddb_splitter_remove_child (splitter, 2);
+}
+
+gboolean
+ddb_splitter_add_child_at_pos (DdbSplitter *splitter, GtkWidget *child, guint pos)
+{
+ if (pos == 0 && !splitter->priv->child1) {
+ splitter->priv->child1 = child;
+ }
+ else if (pos == 1 && !splitter->priv->child2) {
+ splitter->priv->child2 = child;
+ }
+ else {
+ return FALSE;
+ }
+
+ gtk_widget_set_parent (child, GTK_WIDGET (splitter));
+ /* realize the widget if required */
+ if (gtk_widget_get_realized (GTK_WIDGET (splitter)))
+ gtk_widget_realize (child);
+
+ /* map the widget if required */
+ if (gtk_widget_get_visible (GTK_WIDGET (splitter)) && gtk_widget_get_visible (child)) {
+ if (gtk_widget_get_mapped (GTK_WIDGET (splitter)))
+ gtk_widget_map (child);
+ }
+
+ gtk_widget_queue_resize (GTK_WIDGET (splitter));
+ return TRUE;
+}
+
+/**
+ * ddb_splitter_get_size_mode:
+ * @splitter : a #DdbSplitter.
+ *
+ * Returns the size mode of the splitter
+ *
+ * Returns: the size mode of @splitter.
+ **/
+DdbSplitterSizeMode
+ddb_splitter_get_size_mode (const DdbSplitter *splitter)
+{
+ g_return_val_if_fail (DDB_IS_SPLITTER (splitter), DDB_SPLITTER_SIZE_MODE_PROP);
+ return splitter->priv->size_mode;
+}
+
+/**
+ * ddb_splitter_set_size_mode:
+ * @splitter : a #DdbSplitter.
+ * @size_mode : The size_mode of the splitter.
+ *
+ * Sets the size_mode of the @splitter
+ **/
+void
+ddb_splitter_set_size_mode (DdbSplitter *splitter, DdbSplitterSizeMode size_mode)
+{
+ g_return_if_fail (DDB_IS_SPLITTER (splitter));
+
+ if (G_LIKELY (splitter->priv->size_mode != size_mode)) {
+ splitter->priv->size_mode = size_mode;
+ if (size_mode == DDB_SPLITTER_SIZE_MODE_LOCK_C1
+ || size_mode == DDB_SPLITTER_SIZE_MODE_LOCK_C2) {
+ splitter->priv->handle_size = DDB_SPLITTER_HANDLE_LOCKED_SIZE;
+ }
+ else {
+ splitter->priv->handle_size = DDB_SPLITTER_HANDLE_SIZE;
+ }
+ ddb_splitter_update_cursor (splitter);
+ gtk_widget_queue_resize (GTK_WIDGET (splitter));
+ g_object_notify (G_OBJECT (splitter), "size_mode");
+ }
+}
+
+/**
+ * ddb_splitter_get_orientation:
+ * @splitter : a #DdbSplitter.
+ *
+ * Returns the orientation of the splitter
+ *
+ * Returns: the orientation of @splitter.
+ **/
+GtkOrientation
+ddb_splitter_get_orientation (const DdbSplitter *splitter)
+{
+ g_return_val_if_fail (DDB_IS_SPLITTER (splitter), GTK_ORIENTATION_HORIZONTAL);
+ return splitter->priv->orientation;
+}
+
+/**
+ * ddb_splitter_set_orientation:
+ * @splitter : a #DdbSplitter.
+ * @orientation : The orientation of the splitter.
+ *
+ * Sets the orientation of the @splitter
+ **/
+void
+ddb_splitter_set_orientation (DdbSplitter *splitter, GtkOrientation orientation)
+{
+ g_return_if_fail (DDB_IS_SPLITTER (splitter));
+
+ if (G_LIKELY (splitter->priv->orientation != orientation)) {
+ splitter->priv->orientation = orientation;
+ gtk_widget_queue_resize (GTK_WIDGET (splitter));
+ g_object_notify (G_OBJECT (splitter), "orientation");
+ }
+}
+
+/**
+ * ddb_splitter_get_proportion:
+ * @splitter : a #DdbSplitter.
+ *
+ * Returns the proportion of the splitter
+ *
+ * Returns: the proportion of the @splitter.
+ **/
+gfloat
+ddb_splitter_get_proportion (const DdbSplitter *splitter)
+{
+ g_return_val_if_fail (DDB_IS_SPLITTER (splitter), 0.f);
+ return splitter->priv->proportion;
+}
+
+/**
+ * ddb_splitter_set_proportion:
+ * @splitter : a #DdbSplitter.
+ * @proportion : The proportion how the child should be arranged.
+ *
+ * Sets the proportion of the @splitter
+ **/
+void
+ddb_splitter_set_proportion (DdbSplitter *splitter, gfloat proportion)
+{
+ g_return_if_fail (DDB_IS_SPLITTER (splitter));
+
+ if (splitter->priv->size_mode == DDB_SPLITTER_SIZE_MODE_PROP
+ && G_LIKELY (splitter->priv->proportion != proportion))
+ {
+ splitter->priv->proportion = proportion;
+ gtk_widget_queue_resize (GTK_WIDGET (splitter));
+ g_object_notify (G_OBJECT (splitter), "proportion");
+ }
+}
+
+guint
+ddb_splitter_get_child1_size (DdbSplitter *splitter)
+{
+ return splitter->priv->child1_size;
+}
+
+guint
+ddb_splitter_get_child2_size (DdbSplitter *splitter)
+{
+ return splitter->priv->child2_size;
+}
+
+void
+ddb_splitter_set_child1_size (DdbSplitter *splitter, guint size)
+{
+ g_return_if_fail (DDB_IS_SPLITTER (splitter));
+
+ splitter->priv->child1_size = size;
+ gtk_widget_queue_resize (GTK_WIDGET (splitter));
+}
+
+void
+ddb_splitter_set_child2_size (DdbSplitter *splitter, guint size)
+{
+ g_return_if_fail (DDB_IS_SPLITTER (splitter));
+
+ splitter->priv->child2_size = size;
+ gtk_widget_queue_resize (GTK_WIDGET (splitter));
+}
+
+/* Return a new PSquare cast to a GtkWidget */
+GtkWidget *
+ddb_splitter_new (GtkOrientation orientation)
+{
+ return GTK_WIDGET (g_object_new (ddb_splitter_get_type (), "orientation", orientation, NULL));
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddb_splitter.h Added

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2016 Christian Boxdörfer <christian.boxdoerfer@posteo.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef __DDB_SPLITTER_H__
+#define __DDB_SPLITTER_H__
+
+#include <gtk/gtk.h>
+#include "ddb_splitter_size_mode.h"
+
+G_BEGIN_DECLS
+
+typedef struct _DdbSplitterPrivate DdbSplitterPrivate;
+typedef struct _DdbSplitterClass DdbSplitterClass;
+typedef struct _DdbSplitter DdbSplitter;
+
+#define DDB_TYPE_SPLITTER (ddb_splitter_get_type ())
+#define DDB_SPLITTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DDB_TYPE_SPLITTER, DdbSplitter))
+#define DDB_SPLITTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DDB_TYPE_SPLITTER, DdbSplitterClass))
+#define DDB_IS_SPLITTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DDB_TYPE_SPLITTER))
+#define DDB_IS_SPLITTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DDB_TYPE_SPLITTER))
+#define DDB_SPLITTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DDB_TYPE_SPLITTER, DdbSplitterClass))
+
+struct _DdbSplitterClass
+{
+ /*< private >*/
+ GtkContainerClass __parent__;
+
+ /* padding for further expansion */
+ void (*reserved1) (void);
+ void (*reserved2) (void);
+ void (*reserved3) (void);
+ void (*reserved4) (void);
+};
+
+/**
+ * DdbSplitter:
+ *
+ * The #DdbSplitter struct contains only private fields
+* and should not be directly accessed.
+ **/
+struct _DdbSplitter
+{
+ /*< private >*/
+ GtkContainer __parent__;
+ DdbSplitterPrivate *priv;
+};
+
+GType
+ddb_splitter_get_type (void) G_GNUC_CONST;
+
+GtkWidget
+*ddb_splitter_new (GtkOrientation orientation);
+
+DdbSplitterSizeMode
+ddb_splitter_get_size_mode (const DdbSplitter *splitter);
+GtkOrientation
+ddb_splitter_get_orientation (const DdbSplitter *splitter);
+gfloat
+ddb_splitter_get_proportion (const DdbSplitter *splitter);
+void
+ddb_splitter_set_size_mode (DdbSplitter *splitter, DdbSplitterSizeMode size_mode);
+gboolean
+ddb_splitter_add_child_at_pos (DdbSplitter *splitter, GtkWidget *child, guint pos);
+void
+ddb_splitter_remove_c1 (DdbSplitter *splitter);
+void
+ddb_splitter_remove_c2 (DdbSplitter *splitter);
+void
+ddb_splitter_set_proportion (DdbSplitter *splitter, gfloat proportion);
+guint
+ddb_splitter_get_child1_size (DdbSplitter *splitter);
+guint
+ddb_splitter_get_child2_size (DdbSplitter *splitter);
+void
+ddb_splitter_set_child1_size (DdbSplitter *splitter, guint size);
+void
+ddb_splitter_set_child2_size (DdbSplitter *splitter, guint size);
+
+G_END_DECLS
+
+#endif /* !__DDB_SPLITTER_H__ */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddb_splitter_size_mode.c Added

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Christian Boxdörfer <christian.boxdoerfer@posteo.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include "ddb_splitter_size_mode.h"
+
+GType
+ddb_splitter_size_mode_get_type (void)
+{
+ static GType type = G_TYPE_INVALID;
+
+ if (G_UNLIKELY (type == G_TYPE_INVALID))
+ {
+ static const GEnumValue values =
+ {
+ { DDB_SPLITTER_SIZE_MODE_PROP, "DDB_SPLITTER_SIZE_MODE_PROP", "Proportional sizing", },
+ { DDB_SPLITTER_SIZE_MODE_LOCK_C1, "DDB_SPLITTER_SIZE_MODE_LOCK_C1", "Size of first child is locked", },
+ { DDB_SPLITTER_SIZE_MODE_LOCK_C2, "DDB_SPLITTER_SIZE_MODE_LOCK_C2", "Size of second child is locked", },
+ { 0, NULL, NULL, },
+ };
+
+ type = g_enum_register_static ("DdbSplitterSizeMode", values);
+ }
+
+ return type;
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddb_splitter_size_mode.h Added

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2016 Christian Boxdörfer <christian.boxdoerfer@posteo.de>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef __DDB_SPLITTER_SIZE_MODE_H__
+#define __DDB_SPLITTER_SIZE_MODE_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define DDB_SPLITTER_TYPE_SIZE_MODE (ddb_splitter_size_mode_get_type ())
+
+typedef enum
+{
+ DDB_SPLITTER_SIZE_MODE_PROP,
+ DDB_SPLITTER_SIZE_MODE_LOCK_C1,
+ DDB_SPLITTER_SIZE_MODE_LOCK_C2,
+} DdbSplitterSizeMode;
+
+GType ddb_splitter_size_mode_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS
+
+#endif /* !__DDB_SPLITTER_SIZE_MODE_H__ */

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddbcellrenderertextmultiline.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddbcellrenderertextmultiline.c Changed

@@ -1,20 +1,24 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
 
 #include <glib.h>
@@ -33,16 +37,19 @@
 #define _gtk_tree_path_free0(var) ((var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL)))
 
 struct _DdbCellRendererTextMultilinePrivate {
-	DdbCellEditableTextView* entry;
-	gulong focus_out_id;
+ DdbCellEditableTextView* entry;
+ gulong focus_out_id;
 
 gulong populate_popup_id;
- gulong entry_menu_popdown_timeout;
+ guint entry_menu_popdown_timeout;
 gboolean in_entry_menu;
+
+ guint is_mult_column;
+ guint value_column;
 };
 
 struct _DdbCellEditableTextViewPrivate {
-	gboolean editing_canceled;
+ gboolean editing_canceled;
 };
 
 static gpointer ddb_cell_editable_text_view_parent_class = NULL;
@@ -51,7 +58,7 @@
 
 GType ddb_cell_editable_text_view_get_type (void);
 enum {
-	DDB_CELL_EDITABLE_TEXT_VIEW_DUMMY_PROPERTY
+ DDB_CELL_EDITABLE_TEXT_VIEW_DUMMY_PROPERTY
 };
 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);
@@ -59,90 +66,74 @@
 DdbCellEditableTextView* ddb_cell_editable_text_view_construct (GType object_type);
 static void ddb_cell_editable_text_view_finalize (GObject* obj);
 GType ddb_cell_renderer_text_multiline_get_type (void);
+DdbCellRendererTextMultiline* ddb_cell_renderer_text_multiline_construct (GType object_type);
+
 #define DDB_CELL_RENDERER_TEXT_MULTILINE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DDB_TYPE_CELL_RENDERER_TEXT_MULTILINE, DdbCellRendererTextMultilinePrivate))
 #define DDB_CELL_EDITABLE_TEXT_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DDB_TYPE_CELL_EDITABLE_TEXT_VIEW, DdbCellEditableTextViewPrivate))
 enum {
-	DDB_CELL_RENDERER_TEXT_MULTILINE_DUMMY_PROPERTY
+ DDB_CELL_RENDERER_TEXT_MULTILINE_DUMMY_PROPERTY
 };
 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 gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags);
+static GtkCellEditable* ddb_cell_renderer_text_multiline_real_start_editing (
+ GtkCellRenderer *cell,
+ GdkEvent *event,
+ GtkWidget *widget,
+ const gchar *path,
+ const GdkRectangle *background_area,
+ const 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;
-	_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);
-			result = TRUE;
-			return result;
-		}
-	} else {
-		GdkEventKey _tmp6_;
-		guint _tmp7_;
-		_tmp6_ = *event;
-		_tmp7_ = _tmp6_.keyval;
-		if (_tmp7_ == ((guint) GDK_Escape)) {
-			self->priv->editing_canceled = TRUE;
-			gtk_cell_editable_editing_done ((GtkCellEditable*) self);
-			gtk_cell_editable_remove_widget ((GtkCellEditable*) self);
-			result = TRUE;
-			return result;
-		} else {
-			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;
-	return result;
+ DdbCellEditableTextView * self;
+ gboolean result = FALSE;
+ gboolean res;
+ guint keyval;
+ self = (DdbCellEditableTextView*) base;
+ g_return_val_if_fail (event != NULL, FALSE);
+ res = TRUE;
+ keyval = event->keyval;
+ if (keyval == ((guint) 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);
+ } else {
+ gtk_cell_editable_editing_done ((GtkCellEditable*) self);
+ gtk_cell_editable_remove_widget ((GtkCellEditable*) self);
+ result = TRUE;
+ return result;
+ }
+ } else {
+ if (keyval == ((guint) GDK_Escape)) {
+ self->priv->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);
+ }
+ }
+ result = res;
+ return result;
 }
 
 static void ddb_cell_editable_text_view_real_start_editing (GtkCellEditable* base, GdkEvent* event) {
-	DdbCellEditableTextView * self;
-	self = (DdbCellEditableTextView*) base;
 }
 
-
-#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);
-	return self;
+ DdbCellEditableTextView * self;
+ self = g_object_newv (object_type, 0, NULL);
+ return self;
 }
 
 
 DdbCellEditableTextView* ddb_cell_editable_text_view_new (void) {
-	return ddb_cell_editable_text_view_construct (DDB_TYPE_CELL_EDITABLE_TEXT_VIEW);
+ return ddb_cell_editable_text_view_construct (DDB_TYPE_CELL_EDITABLE_TEXT_VIEW);
 }
 
 enum
@@ -199,10 +190,10 @@
 }
 
 static void ddb_cell_editable_text_view_class_init (DdbCellEditableTextViewClass * klass) {
-	g_type_class_add_private (klass, sizeof (DdbCellEditableTextViewPrivate));
-	ddb_cell_editable_text_view_parent_class = g_type_class_peek_parent (klass);
-	GTK_WIDGET_CLASS (klass)->key_press_event = ddb_cell_editable_text_view_real_key_press_event;
-	G_OBJECT_CLASS (klass)->finalize = ddb_cell_editable_text_view_finalize;
+ g_type_class_add_private (klass, sizeof (DdbCellEditableTextViewPrivate));
+ ddb_cell_editable_text_view_parent_class = g_type_class_peek_parent (klass);
+ GTK_WIDGET_CLASS (klass)->key_press_event = ddb_cell_editable_text_view_real_key_press_event;
+ G_OBJECT_CLASS (klass)->finalize = ddb_cell_editable_text_view_finalize;
 
 G_OBJECT_CLASS (klass)->set_property = ddb_cell_editable_text_view_set_property;
 G_OBJECT_CLASS (klass)->get_property = ddb_cell_editable_text_view_get_property;
@@ -224,131 +215,110 @@
 }
 
 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;
+ 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;
 }
 
 
 static void ddb_cell_editable_text_view_instance_init (DdbCellEditableTextView * self) {
-	self->priv = DDB_CELL_EDITABLE_TEXT_VIEW_GET_PRIVATE (self);
-	self->priv->editing_canceled = FALSE;
+ self->priv = DDB_CELL_EDITABLE_TEXT_VIEW_GET_PRIVATE (self);
+ self->priv->editing_canceled = FALSE;
 }
 
 
 static void ddb_cell_editable_text_view_finalize (GObject* obj) {
-	DdbCellEditableTextView * self;
-	self = DDB_CELL_EDITABLE_TEXT_VIEW (obj);
-	_g_free0 (self->tree_path);
-	G_OBJECT_CLASS (ddb_cell_editable_text_view_parent_class)->finalize (obj);
+ DdbCellEditableTextView * self;
+ self = DDB_CELL_EDITABLE_TEXT_VIEW (obj);
+ _g_free0 (self->tree_path);
+ G_OBJECT_CLASS (ddb_cell_editable_text_view_parent_class)->finalize (obj);
 }
 
 
 GType ddb_cell_editable_text_view_get_type (void) {
-	static volatile gsize ddb_cell_editable_text_view_type_id__volatile = 0;
-	if (g_once_init_enter (&ddb_cell_editable_text_view_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DdbCellEditableTextViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) ddb_cell_editable_text_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DdbCellEditableTextView), 0, (GInstanceInitFunc) ddb_cell_editable_text_view_instance_init, NULL };
-		static const GInterfaceInfo gtk_cell_editable_info = { (GInterfaceInitFunc) ddb_cell_editable_text_view_gtk_cell_editable_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType ddb_cell_editable_text_view_type_id;
-		ddb_cell_editable_text_view_type_id = g_type_register_static (GTK_TYPE_TEXT_VIEW, "DdbCellEditableTextView", &g_define_type_info, 0);
-		g_type_add_interface_static (ddb_cell_editable_text_view_type_id, GTK_TYPE_CELL_EDITABLE, &gtk_cell_editable_info);
-		g_once_init_leave (&ddb_cell_editable_text_view_type_id__volatile, ddb_cell_editable_text_view_type_id);
-	}
-	return ddb_cell_editable_text_view_type_id__volatile;
+ static volatile gsize ddb_cell_editable_text_view_type_id__volatile = 0;
+ if (g_once_init_enter ((gsize *)(&ddb_cell_editable_text_view_type_id__volatile))) {
+ static const GTypeInfo g_define_type_info = { sizeof (DdbCellEditableTextViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) ddb_cell_editable_text_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DdbCellEditableTextView), 0, (GInstanceInitFunc) ddb_cell_editable_text_view_instance_init, NULL };
+ static const GInterfaceInfo gtk_cell_editable_info = { (GInterfaceInitFunc) ddb_cell_editable_text_view_gtk_cell_editable_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+ GType ddb_cell_editable_text_view_type_id;
+ ddb_cell_editable_text_view_type_id = g_type_register_static (GTK_TYPE_TEXT_VIEW, "DdbCellEditableTextView", &g_define_type_info, 0);
+ g_type_add_interface_static (ddb_cell_editable_text_view_type_id, GTK_TYPE_CELL_EDITABLE, &gtk_cell_editable_info);
+ g_once_init_leave (&ddb_cell_editable_text_view_type_id__volatile, ddb_cell_editable_text_view_type_id);
+ }
+ return ddb_cell_editable_text_view_type_id__volatile;
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-	return self ? g_object_ref (self) : NULL;
+ return self ? g_object_ref (self) : NULL;
 }
 
 
 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};
-	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);
-	_tmp0_ = entry;
-	_tmp1_ = _self_;
-	_tmp2_ = _tmp1_->priv->focus_out_id;
-	g_signal_handler_disconnect ((GObject*) _tmp0_, _tmp2_);
-
- if (_tmp1_->priv->populate_popup_id > 0)
+ GtkTextBuffer* buf;
+ GtkTextIter begin = {0};
+ GtkTextIter end = {0};
+ gboolean canceled = FALSE;
+ gchar* new_text;
+ g_return_if_fail (entry != NULL);
+ g_return_if_fail (_self_ != NULL);
+
+ _g_object_unref0 (_self_->priv->entry);
+
+ if (_self_->priv->focus_out_id > 0) {
+ g_signal_handler_disconnect ((GObject*) entry, _self_->priv->focus_out_id);
+ _self_->priv->focus_out_id = 0;
+ }
+
+ if (_self_->priv->populate_popup_id > 0)
 {
- g_signal_handler_disconnect (entry, _tmp1_->priv->populate_popup_id);
- _tmp1_->priv->populate_popup_id = 0;
+ g_signal_handler_disconnect (entry, _self_->priv->populate_popup_id);
+ _self_->priv->populate_popup_id = 0;
 }
 
- if (_tmp1_->priv->entry_menu_popdown_timeout)
+ if (_self_->priv->entry_menu_popdown_timeout)
 {
- g_source_remove (_tmp1_->priv->entry_menu_popdown_timeout);
- _tmp1_->priv->entry_menu_popdown_timeout = 0;
+ g_source_remove (_self_->priv->entry_menu_popdown_timeout);
+ _self_->priv->entry_menu_popdown_timeout = 0;
 }
 
 
+ g_object_get (entry,
+ "editing-canceled", &canceled,
+ NULL);
 
-	_tmp3_ = _self_;
-	_tmp4_ = entry;
-	_tmp5_ = _tmp4_->priv->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);
-	_g_free0 (new_text);
+ gtk_cell_renderer_stop_editing ((GtkCellRenderer*) _self_, entry->priv->editing_canceled);
+
+ if (canceled) {
+ return;
+ }
+
+ buf = 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);
+ _g_free0 (new_text);
 }
 
 
 static gboolean ddb_cell_renderer_text_multiline_gtk_cell_renderer_focus_out_event (DdbCellEditableTextView* entry, GdkEvent* event, DdbCellRendererTextMultiline* _self_) {
-	gboolean result = FALSE;
-	g_return_val_if_fail (entry != NULL, FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-	g_return_val_if_fail (_self_ != NULL, FALSE);
+ gboolean result = FALSE;
+ g_return_val_if_fail (entry != NULL, FALSE);
+ g_return_val_if_fail (event != NULL, FALSE);
+ g_return_val_if_fail (_self_ != NULL, FALSE);
 
 DdbCellRendererTextMultilinePrivate *priv;
 
 priv = DDB_CELL_RENDERER_TEXT_MULTILINE_GET_PRIVATE (_self_);
 
-	entry->priv->editing_canceled = TRUE;
-	if (priv->in_entry_menu)
-	 return FALSE;
+ entry->priv->editing_canceled = TRUE;
+ if (priv->in_entry_menu)
+ return FALSE;
 
 gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (entry));
-	gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (entry));
-	result = FALSE;
-	return result;
+ gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (entry));
+ result = FALSE;
+ return result;
 }
 
 static gboolean
@@ -405,123 +375,73 @@
 G_CALLBACK (ddb_cell_renderer_text_multiline_popup_unmap), data);
 }
 
-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_ = 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};
-	GtkListStore* _tmp12_;
-	GtkTreeIter _tmp13_;
-	GValue _tmp14_ = {0};
-	gint _tmp15_ = 0;
-	gint mult;
-	DdbCellEditableTextView* _tmp16_;
-	DdbCellEditableTextView* _tmp17_;
-	gint _tmp18_;
-	DdbCellEditableTextView* _tmp19_;
-	const gchar* _tmp20_;
-	gchar* _tmp21_;
-	GtkTextBuffer* _tmp22_;
-	GtkTextBuffer* buf;
-	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 (widget != NULL, NULL);
-	g_return_val_if_fail (path != NULL, NULL);
-	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;
-	}
-	_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);
-	}
-	_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_);
-	}
-	_tmp31_ = self->priv->entry;
-	_tmp32_ = buf;
-	gtk_text_view_set_buffer ((GtkTextView*) _tmp31_, _tmp32_);
-	_tmp33_ = self->priv->entry;
+static GtkCellEditable* ddb_cell_renderer_text_multiline_real_start_editing (
+ GtkCellRenderer *cell,
+ GdkEvent *event,
+ GtkWidget *widget,
+ const gchar *path,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
+ GtkCellRendererState flags
+ ) {
+ DdbCellRendererTextMultiline * self;
+ DdbCellEditableTextView* textview;
+ GValue v = {0};
+ GtkCellEditable* result = NULL;
+ GtkListStore* store;
+ GtkTextBuffer* buf;
+ GtkTreeIter iter = {0};
+ GtkTreePath* p;
+ GtkTreeView* tv;
+ gboolean is_editable = FALSE;
+ gchar* renderer_text = NULL;
+ gint mult;
+
+
+ self = (DdbCellRendererTextMultiline*) cell;
+ g_return_val_if_fail (widget != NULL, NULL);
+ g_return_val_if_fail (path != NULL, NULL);
+ g_return_val_if_fail (background_area != NULL, NULL);
+ g_return_val_if_fail (cell_area != NULL, NULL);
+ g_object_get ((GtkCellRendererText*) self, "editable", &is_editable, NULL);
+ if (!is_editable) {
+ result = GTK_CELL_EDITABLE (NULL);
+ return result;
+ }
+ p = gtk_tree_path_new_from_string (path);
+ tv = GTK_TREE_VIEW (widget);
+ _g_object_ref0 (tv);
+ store = GTK_LIST_STORE (gtk_tree_view_get_model (tv));
+ _g_object_ref0 (store);
+ gtk_tree_model_get_iter ((GtkTreeModel*) store, &iter, p);
+ G_IS_VALUE (&v) ? ((void)(g_value_unset (&v)), NULL) : NULL;
+ gtk_tree_model_get_value ((GtkTreeModel*) store, &iter, self->priv->is_mult_column, &v);
+ mult = g_value_get_int (&v);
+ _g_object_unref0 (self->priv->entry);
+ self->priv->entry = textview = ddb_cell_editable_text_view_new ();
+ g_object_ref_sink (textview);
+ textview->tree_path = g_strdup (path);
+ buf = gtk_text_buffer_new (NULL);
+ if (!mult) {
+ GValue full_textv = {0};
+ gtk_tree_model_get_value ((GtkTreeModel*) store, &iter, self->priv->value_column, &full_textv);
+ if (G_IS_VALUE (&full_textv)) {
+ const char *full_text = g_value_get_string (&full_textv);
+ renderer_text = strdup (full_text);
+ g_value_unset (&full_textv);
+ }
+ if (!renderer_text) {
+ g_object_get ((GtkCellRendererText*) self, "text", &renderer_text, NULL);
+ }
+ }
+ else {
+ renderer_text = strdup ("");
+ }
+ if (renderer_text) {
+ gtk_text_buffer_set_text (buf, renderer_text, -1);
+ _g_free0 (renderer_text);
+ }
+ gtk_text_view_set_buffer ((GtkTextView*) textview, buf);
 
 self->priv->in_entry_menu = FALSE;
 if (self->priv->entry_menu_popdown_timeout)
@@ -530,80 +450,84 @@
 self->priv->entry_menu_popdown_timeout = 0;
 }
 
-	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);
+ g_signal_connect (textview, "editing-done", (GCallback) ddb_cell_renderer_text_multiline_gtk_cell_renderer_text_editing_done, self);
+ self->priv->focus_out_id = g_signal_connect_after (textview, "focus-out-event", (GCallback) ddb_cell_renderer_text_multiline_gtk_cell_renderer_focus_out_event, self);
 
 self->priv->populate_popup_id =
 g_signal_connect (self->priv->entry, "populate-popup",
 G_CALLBACK (ddb_cell_renderer_text_multiline_populate_popup),
 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);
-	_g_object_unref0 (tv);
-	_gtk_tree_path_free0 (p);
-	// evil hack! need to make an event for that
-	extern int trkproperties_block_keyhandler;
-	trkproperties_block_keyhandler = 1;
-	return result;
+ _g_object_unref0 (buf);
+ gtk_widget_set_size_request ((GtkWidget*) textview, cell_area->width, cell_area->height);
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview), GTK_WRAP_WORD);
+ gtk_widget_show ((GtkWidget*) textview);
+ result = GTK_CELL_EDITABLE (textview);
+ G_IS_VALUE (&v) ? ((void)(g_value_unset (&v)), NULL) : NULL;
+ _g_object_unref0 (store);
+ _g_object_unref0 (tv);
+ _gtk_tree_path_free0 (p);
+ // evil hack! need to make an event for that
+ extern int trkproperties_block_keyhandler;
+ trkproperties_block_keyhandler = 1;
+ return result;
 }
 
 
 DdbCellRendererTextMultiline* ddb_cell_renderer_text_multiline_construct (GType object_type) {
-	DdbCellRendererTextMultiline * self;
-	self = g_object_newv (object_type, 0, NULL);
-	return self;
+ DdbCellRendererTextMultiline * self;
+ self = g_object_newv (object_type, 0, NULL);
+ return self;
 }
 
 
 DdbCellRendererTextMultiline* ddb_cell_renderer_text_multiline_new (void) {
-	return ddb_cell_renderer_text_multiline_construct (DDB_TYPE_CELL_RENDERER_TEXT_MULTILINE);
+ return ddb_cell_renderer_text_multiline_construct (DDB_TYPE_CELL_RENDERER_TEXT_MULTILINE);
 }
 
 
 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;
+ ddb_cell_renderer_text_multiline_parent_class = g_type_class_peek_parent (klass);
+ g_type_class_add_private (klass, sizeof (DdbCellRendererTextMultilinePrivate));
+#if GTK_CHECK_VERSION(3,0,0)
+ GTK_CELL_RENDERER_CLASS (klass)->start_editing = ddb_cell_renderer_text_multiline_real_start_editing;
+#else
+ // GTK2 uses a slightly different, but compatible declaration without const modifiers
+ GTK_CELL_RENDERER_CLASS (klass)->start_editing = (GtkCellEditable *(*) (GtkCellRenderer *, GdkEvent *, GtkWidget *, const gchar *, GdkRectangle *, GdkRectangle *cell_area, GtkCellRendererState))ddb_cell_renderer_text_multiline_real_start_editing;
+#endif
+ G_OBJECT_CLASS (klass)->finalize = ddb_cell_renderer_text_multiline_finalize;
 }
 
 
 static void ddb_cell_renderer_text_multiline_instance_init (DdbCellRendererTextMultiline * self) {
-	self->priv = DDB_CELL_RENDERER_TEXT_MULTILINE_GET_PRIVATE (self);
+ self->priv = DDB_CELL_RENDERER_TEXT_MULTILINE_GET_PRIVATE (self);
+ // Default column indexes for Track Properties
+ self->priv->is_mult_column = 3;
+ self->priv->value_column = 4;
 }
 
+void ddb_cell_renderer_text_multiline_set_columns(DdbCellRendererTextMultiline *self, guint is_mult, guint value) {
+ self->priv->is_mult_column = is_mult;
+ self->priv->value_column = value;
+}
 
 static void ddb_cell_renderer_text_multiline_finalize (GObject* obj) {
-	DdbCellRendererTextMultiline * self;
-	self = DDB_CELL_RENDERER_TEXT_MULTILINE (obj);
-	_g_object_unref0 (self->priv->entry);
-	G_OBJECT_CLASS (ddb_cell_renderer_text_multiline_parent_class)->finalize (obj);
+ DdbCellRendererTextMultiline * self;
+ self = DDB_CELL_RENDERER_TEXT_MULTILINE (obj);
+ _g_object_unref0 (self->priv->entry);
+ G_OBJECT_CLASS (ddb_cell_renderer_text_multiline_parent_class)->finalize (obj);
 }
 
 
 GType ddb_cell_renderer_text_multiline_get_type (void) {
-	static volatile gsize ddb_cell_renderer_text_multiline_type_id__volatile = 0;
-	if (g_once_init_enter (&ddb_cell_renderer_text_multiline_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DdbCellRendererTextMultilineClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) ddb_cell_renderer_text_multiline_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DdbCellRendererTextMultiline), 0, (GInstanceInitFunc) ddb_cell_renderer_text_multiline_instance_init, NULL };
-		GType ddb_cell_renderer_text_multiline_type_id;
-		ddb_cell_renderer_text_multiline_type_id = g_type_register_static (GTK_TYPE_CELL_RENDERER_TEXT, "DdbCellRendererTextMultiline", &g_define_type_info, 0);
-		g_once_init_leave (&ddb_cell_renderer_text_multiline_type_id__volatile, ddb_cell_renderer_text_multiline_type_id);
-	}
-	return ddb_cell_renderer_text_multiline_type_id__volatile;
+ static volatile gsize ddb_cell_renderer_text_multiline_type_id__volatile = 0;
+ if (g_once_init_enter ((gsize *)(&ddb_cell_renderer_text_multiline_type_id__volatile))) {
+ static const GTypeInfo g_define_type_info = { sizeof (DdbCellRendererTextMultilineClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) ddb_cell_renderer_text_multiline_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DdbCellRendererTextMultiline), 0, (GInstanceInitFunc) ddb_cell_renderer_text_multiline_instance_init, NULL };
+ GType ddb_cell_renderer_text_multiline_type_id;
+ ddb_cell_renderer_text_multiline_type_id = g_type_register_static (GTK_TYPE_CELL_RENDERER_TEXT, "DdbCellRendererTextMultiline", &g_define_type_info, 0);
+ g_once_init_leave (&ddb_cell_renderer_text_multiline_type_id__volatile, ddb_cell_renderer_text_multiline_type_id);
+ }
+ return ddb_cell_renderer_text_multiline_type_id__volatile;
 }

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddbcellrenderertextmultiline.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddbcellrenderertextmultiline.h Changed

@@ -1,3 +1,26 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
 #ifndef __DDBCELLRENDERERTEXTMULTILINE_H__
 #define __DDBCELLRENDERERTEXTMULTILINE_H__
 
@@ -33,22 +56,22 @@
 typedef struct _DdbCellRendererTextMultilinePrivate DdbCellRendererTextMultilinePrivate;
 
 struct _DdbCellEditableTextView {
-	GtkTextView parent_instance;
-	DdbCellEditableTextViewPrivate * priv;
-	gchar* tree_path;
+    GtkTextView parent_instance;
+    DdbCellEditableTextViewPrivate * priv;
+    gchar* tree_path;
 };
 
 struct _DdbCellEditableTextViewClass {
-	GtkTextViewClass parent_class;
+    GtkTextViewClass parent_class;
 };
 
 struct _DdbCellRendererTextMultiline {
-	GtkCellRendererText parent_instance;
-	DdbCellRendererTextMultilinePrivate * priv;
+    GtkCellRendererText parent_instance;
+    DdbCellRendererTextMultilinePrivate * priv;
 };
 
 struct _DdbCellRendererTextMultilineClass {
-	GtkCellRendererTextClass parent_class;
+    GtkCellRendererTextClass parent_class;
 };
 
 
@@ -58,7 +81,7 @@
 DdbCellEditableTextView* ddb_cell_editable_text_view_construct (GType object_type);
 GType ddb_cell_renderer_text_multiline_get_type (void);
 DdbCellRendererTextMultiline* ddb_cell_renderer_text_multiline_new (void);
-DdbCellRendererTextMultiline* ddb_cell_renderer_text_multiline_construct (GType object_type);
+void ddb_cell_renderer_text_multiline_set_columns(DdbCellRendererTextMultiline *self, guint is_mult, guint value);
 
 
 G_END_DECLS

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddbequalizer.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddbequalizer.c Changed

@@ -1,22 +1,27 @@
 /*
- SuperEQ GTK Widget for for DeaDBeeF
- Copyright (C) 2010 Viktor Semykin <thesame.ml@gmail.com>
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
 
- 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 software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
 
- 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.
+ 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:
 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
-/* sripped down and polished by Alexey Yakovenko <waker@users.sourceforge.net>*/
 
+// Original Vala code: Copyright (C) 2010 Viktor Semykin <thesame.ml@gmail.com>
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -31,6 +36,7 @@
 #include <pango/pangocairo.h>
 #include <pango/pango.h>
 #include "support.h"
+#include "ddbequalizer.h"
 
 #define DDB_TYPE_EQUALIZER (ddb_equalizer_get_type ())
 #define DDB_EQUALIZER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DDB_TYPE_EQUALIZER, DdbEqualizer))
@@ -39,34 +45,22 @@
 #define DDB_IS_EQUALIZER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DDB_TYPE_EQUALIZER))
 #define DDB_EQUALIZER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DDB_TYPE_EQUALIZER, DdbEqualizerClass))
 
-typedef struct _DdbEqualizer DdbEqualizer;
-typedef struct _DdbEqualizerClass DdbEqualizerClass;
-typedef struct _DdbEqualizerPrivate DdbEqualizerPrivate;
 #define _gdk_cursor_unref0(var) ((var == NULL) ? NULL : (var = (gdk_cursor_unref (var), NULL)))
 #define _g_free0(var) (var = (g_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;
-	DdbEqualizerPrivate * priv;
-};
-
-struct _DdbEqualizerClass {
-	GtkDrawingAreaClass parent_class;
-};
-
 struct _DdbEqualizerPrivate {
-	gdouble* values;
-	gint values_length1;
-	gint _values_size_;
-	gdouble preamp;
-	gint mouse_y;
-	gboolean curve_hook;
-	gboolean preamp_hook;
-	gint eq_margin_bottom;
-	gint eq_margin_left;
-	GdkCursor* pointer_cursor;
+ gdouble* values;
+ gint values_length1;
+ gint _values_size_;
+ gdouble preamp;
+ gint mouse_y;
+ gboolean curve_hook;
+ gboolean preamp_hook;
+ gint eq_margin_bottom;
+ gint eq_margin_left;
+ GdkCursor* pointer_cursor;
 };
 
 
@@ -75,7 +69,7 @@
 GType ddb_equalizer_get_type (void);
 #define DDB_EQUALIZER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DDB_TYPE_EQUALIZER, DdbEqualizerPrivate))
 enum {
-	DDB_EQUALIZER_DUMMY_PROPERTY
+ DDB_EQUALIZER_DUMMY_PROPERTY
 };
 #define DDB_EQUALIZER_BANDS 18
 static gboolean ddb_equalizer_real_configure_event (GtkWidget* base, GdkEventConfigure* event);
@@ -102,42 +96,33 @@
 const gchar* freqs18 = {"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;
-
-	_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_ + 4);
-	self->priv->eq_margin_left = (gint) (_tmp3_ + 4) * 4;
-	result = FALSE;
-	return result;
+ 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;
+
+ _tmp0_ = gtk_widget_get_style ((GtkWidget*) self);
+ _tmp1_ = _tmp0_->font_desc;
+ _tmp2_ = pango_font_description_get_size (_tmp1_);
+ _tmp3_ = pango_units_to_double (_tmp2_);
+ self->priv->eq_margin_bottom = (gint) (_tmp3_ + 4);
+ self->priv->eq_margin_left = (gint) (_tmp3_ + 4) * 4;
+ result = FALSE;
+ return result;
 }
 
 
 static void ddb_equalizer_real_realize (GtkWidget* base) {
-	DdbEqualizer * self;
-	self = (DdbEqualizer*) base;
-	GTK_WIDGET_CLASS (ddb_equalizer_parent_class)->realize ((GtkWidget*) GTK_DRAWING_AREA (self));
-	gtk_widget_add_events ((GtkWidget*) self, (gint) ((((GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_LEAVE_NOTIFY_MASK) | GDK_POINTER_MOTION_MASK));
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-	return self ? g_object_ref (self) : NULL;
+ DdbEqualizer * self;
+ self = (DdbEqualizer*) base;
+ GTK_WIDGET_CLASS (ddb_equalizer_parent_class)->realize ((GtkWidget*) GTK_DRAWING_AREA (self));
+ gtk_widget_add_events ((GtkWidget*) self, (gint) ((((GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_LEAVE_NOTIFY_MASK) | GDK_POINTER_MOTION_MASK));
 }
 
 
@@ -204,7 +189,7 @@
 for (i = 0; i < DDB_EQUALIZER_BANDS; i++)
 {
 cairo_save (cr);
- pango_layout_set_text (l, freqsi, strlen (freqsi));
+ pango_layout_set_text (l, freqsi, (int)strlen (freqsi));
 PangoRectangle ink, log;
 pango_layout_get_pixel_extents (l, &ink, &log);
 int offs = 2;
@@ -231,7 +216,7 @@
 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));
+ pango_layout_set_text (l, tmp, (int)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);
@@ -240,7 +225,7 @@
 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));
+ pango_layout_set_text (l, tmp, (int)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);
@@ -248,7 +233,7 @@
 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));
+ pango_layout_set_text (l, tmp, (int)strlen (tmp));
 cairo_move_to (cr, self->priv->eq_margin_left-1, 1);
 pango_cairo_show_layout (cr, l);
 cairo_restore (cr);
@@ -313,535 +298,517 @@
 
 #if !GTK_CHECK_VERSION(3,0,0)
 static gboolean ddb_equalizer_real_expose_event (GtkWidget* base, GdkEventExpose* event) {
-	g_return_val_if_fail (event != NULL, FALSE);
-	cairo_t *cr= gdk_cairo_create ((GdkDrawable*) gtk_widget_get_window (base));
+ 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;
+ _cairo_destroy0 (cr);
+ return FALSE;
 }
 #endif
 
 
 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 = (gdouble) (-40);
-	d = (gdouble) 20;
-	_tmp0_ = val;
-	_tmp1_ = self->priv->preamp;
-	result = (((_tmp0_ + _tmp1_) - 0.5) * k) + d;
-	return result;
+ gdouble result = 0.0;
+ gdouble k;
+ gdouble d;
+ gdouble _tmp0_;
+ gdouble _tmp1_;
+ g_return_val_if_fail (self != NULL, 0.0);
+ 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, 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);
-	_tmp3_ = x;
-	_tmp4_ = self->priv->eq_margin_left;
+ 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);
+ _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;
-	}
-	_tmp8_ = _tmp2_;
-	if (_tmp8_) {
-		gdouble _tmp9_;
-		_tmp9_ = y;
-		_tmp1_ = _tmp9_ > ((gdouble) 1);
-	} else {
-		_tmp1_ = FALSE;
-	}
-	_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;
-	}
-	_tmp15_ = _tmp0_;
-	result = _tmp15_;
-	return result;
+ if (_tmp3_ > ((gdouble) _tmp4_)) {
+ gdouble _tmp5_;
+ gint _tmp7_;
+ _tmp5_ = x;
+ _tmp7_ = _tmp6_.width;
+ _tmp2_ = _tmp5_ < ((gdouble) (_tmp7_ - 1));
+ } else {
+ _tmp2_ = FALSE;
+ }
+ _tmp8_ = _tmp2_;
+ if (_tmp8_) {
+ gdouble _tmp9_;
+ _tmp9_ = y;
+ _tmp1_ = _tmp9_ > ((gdouble) 1);
+ } else {
+ _tmp1_ = FALSE;
+ }
+ _tmp10_ = _tmp1_;
+ if (_tmp10_) {
+ gdouble _tmp11_;
+ gint _tmp13_;
+ gint _tmp14_;
+ _tmp11_ = y;
+ _tmp13_ = _tmp6_.height;
+ _tmp14_ = self->priv->eq_margin_bottom;
+ _tmp0_ = _tmp11_ < ((gdouble) (_tmp13_ - _tmp14_));
+ } else {
+ _tmp0_ = FALSE;
+ }
+ _tmp15_ = _tmp0_;
+ result = _tmp15_;
+ return result;
 }
 
 
 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;
-	gint _tmp7_;
-	gint _tmp8_;
-	gboolean _tmp10_ = FALSE;
-	gint _tmp11_;
-	gboolean _tmp13_;
-	g_return_if_fail (self != NULL);
-	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;
-	}
-	_tmp8_ = band;
-	if (_tmp8_ >= DDB_EQUALIZER_BANDS) {
-		gint _tmp9_;
-		_tmp9_ = band;
-		band = _tmp9_ - 1;
-	}
-	_tmp11_ = band;
-	if (_tmp11_ >= 0) {
-		gint _tmp12_;
-		_tmp12_ = band;
-		_tmp10_ = _tmp12_ < DDB_EQUALIZER_BANDS;
-	} else {
-		_tmp10_ = FALSE;
-	}
-	_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 {
-			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");
-	}
+ GtkAllocation _tmp0_;
+ gint _tmp1_;
+ gint _tmp2_;
+ gdouble band_width;
+ gdouble _tmp3_;
+ gint _tmp4_;
+ gdouble _tmp5_;
+ gdouble _tmp6_ = 0.0;
+ gint band;
+ gint _tmp7_;
+ gint _tmp8_;
+ gboolean _tmp10_ = FALSE;
+ gint _tmp11_;
+ gboolean _tmp13_;
+ g_return_if_fail (self != NULL);
+ 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;
+ }
+ _tmp8_ = band;
+ if (_tmp8_ >= DDB_EQUALIZER_BANDS) {
+ gint _tmp9_;
+ _tmp9_ = band;
+ band = _tmp9_ - 1;
+ }
+ _tmp11_ = band;
+ if (_tmp11_ >= 0) {
+ gint _tmp12_;
+ _tmp12_ = band;
+ _tmp10_ = _tmp12_ < DDB_EQUALIZER_BANDS;
+ } else {
+ _tmp10_ = FALSE;
+ }
+ _tmp13_ = _tmp10_;
+ if (_tmp13_) {
+ gdouble* _tmp14_;
+ gint _tmp15_;
+ gdouble _tmp16_;
+ GtkAllocation _tmp17_;
+ gint _tmp18_;
+ gint _tmp19_;
+ gdouble* _tmp21_;
+ gint _tmp22_;
+ gdouble _tmp23_;
+ _tmp14_ = self->priv->values;
+ _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_));
+ _tmp21_ = self->priv->values;
+ _tmp22_ = band;
+ _tmp23_ = _tmp21__tmp22_;
+ if (_tmp23_ > ((gdouble) 1)) {
+ gdouble* _tmp24_;
+ gint _tmp25_;
+ _tmp24_ = self->priv->values;
+ _tmp25_ = band;
+ _tmp24__tmp25_ = (gdouble) 1;
+ } else {
+ gdouble* _tmp27_;
+ gint _tmp28_;
+ gdouble _tmp29_;
+ _tmp27_ = self->priv->values;
+ _tmp28_ = band;
+ _tmp29_ = _tmp27__tmp28_;
+ if (_tmp29_ < ((gdouble) 0)) {
+ gdouble* _tmp30_;
+ gint _tmp31_;
+ _tmp30_ = self->priv->values;
+ _tmp31_ = band;
+ _tmp30__tmp31_ = (gdouble) 0;
+ }
+ }
+ g_signal_emit_by_name (self, "on-changed");
+ }
 }
 
 
 static gboolean ddb_equalizer_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
-	DdbEqualizer * self;
-	gboolean result = 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;
-	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;
-		_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;
-	}
-	_tmp14_ = *event;
-	_tmp15_ = _tmp14_.x;
-	if (_tmp15_ <= ((gdouble) 11)) {
-		GdkEventButton _tmp16_;
-		gdouble _tmp17_;
-		_tmp16_ = *event;
-		_tmp17_ = _tmp16_.y;
-		_tmp13_ = _tmp17_ > ((gdouble) 1);
-	} else {
-		_tmp13_ = FALSE;
-	}
-	_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 {
-		_tmp12_ = FALSE;
-	}
-	_tmp24_ = _tmp12_;
-	if (_tmp24_) {
-		GdkEventButton _tmp25_;
-		guint _tmp26_;
-		_tmp25_ = *event;
-		_tmp26_ = _tmp25_.button;
-		_tmp11_ = _tmp26_ == ((guint) 1);
-	} else {
-		_tmp11_ = FALSE;
-	}
-	_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;
-		_tmp33_ = *event;
-		_tmp34_ = _tmp33_.y;
-		self->priv->mouse_y = (gint) _tmp34_;
-		gtk_widget_queue_draw ((GtkWidget*) self);
-	}
-	result = FALSE;
-	return result;
+ if (!TEST_LEFT_CLICK (event)) {
+ return FALSE;
+ }
+ DdbEqualizer * self;
+ gboolean result = 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;
+ 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;
+ _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;
+ }
+ _tmp14_ = *event;
+ _tmp15_ = _tmp14_.x;
+ if (_tmp15_ <= ((gdouble) 11)) {
+ GdkEventButton _tmp16_;
+ gdouble _tmp17_;
+ _tmp16_ = *event;
+ _tmp17_ = _tmp16_.y;
+ _tmp13_ = _tmp17_ > ((gdouble) 1);
+ } else {
+ _tmp13_ = FALSE;
+ }
+ _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 {
+ _tmp12_ = FALSE;
+ }
+ _tmp24_ = _tmp12_;
+ if (_tmp24_) {
+ GdkEventButton _tmp25_;
+ guint _tmp26_;
+ _tmp25_ = *event;
+ _tmp26_ = _tmp25_.button;
+ _tmp11_ = _tmp26_ == ((guint) 1);
+ } else {
+ _tmp11_ = FALSE;
+ }
+ _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;
+ _tmp33_ = *event;
+ _tmp34_ = _tmp33_.y;
+ self->priv->mouse_y = (gint) _tmp34_;
+ gtk_widget_queue_draw ((GtkWidget*) self);
+ }
+ result = FALSE;
+ return result;
 }
 
 
 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;
-	_tmp0_ = gtk_widget_get_window ((GtkWidget*) self);
-	_tmp1_ = self->priv->pointer_cursor;
-	gdk_window_set_cursor (_tmp0_, _tmp1_);
-	result = FALSE;
-	return result;
+ DdbEqualizer * self;
+ gboolean result = FALSE;
+ GdkWindow* _tmp0_ = NULL;
+ GdkCursor* _tmp1_;
+ self = (DdbEqualizer*) base;
+ if (!self->priv->curve_hook && !self->priv->preamp_hook) {
+ return FALSE;
+ }
+ g_return_val_if_fail (event != NULL, FALSE);
+ self->priv->curve_hook = FALSE;
+ self->priv->preamp_hook = FALSE;
+ _tmp0_ = gtk_widget_get_window ((GtkWidget*) self);
+ _tmp1_ = self->priv->pointer_cursor;
+ gdk_window_set_cursor (_tmp0_, _tmp1_);
+ result = FALSE;
+ return result;
 }
 
 
 static gboolean ddb_equalizer_real_leave_notify_event (GtkWidget* base, GdkEventCrossing* event) {
-	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;
-	return result;
+ 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;
+ return result;
 }
 
 
 static gboolean ddb_equalizer_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event) {
-	DdbEqualizer * self;
-	gboolean result = FALSE;
-	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;
-	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;
-	}
-	_tmp6_ = y;
-	if (_tmp6_ > ((gdouble) 1)) {
-		y = (gdouble) 1;
-	}
-	_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;
-	}
-	_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 {
-		GdkEventMotion _tmp14_;
-		gdouble _tmp15_;
-		_tmp14_ = *event;
-		_tmp15_ = _tmp14_.y;
-		self->priv->mouse_y = (gint) _tmp15_;
-	}
-	_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;
-	return result;
+ DdbEqualizer * self;
+ gboolean result = FALSE;
+ 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;
+
+ 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;
+ }
+ _tmp6_ = y;
+ if (_tmp6_ > ((gdouble) 1)) {
+ y = (gdouble) 1;
+ }
+ _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;
+ }
+ _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 {
+ GdkEventMotion _tmp14_;
+ gdouble _tmp15_;
+ _tmp14_ = *event;
+ _tmp15_ = _tmp14_.y;
+ self->priv->mouse_y = (gint) _tmp15_;
+ }
+ _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;
+ return result;
 }
 
 
 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);
-	_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_;
+ gdouble* _tmp0_;
+ gint _tmp1_;
+ gdouble _tmp2_;
+ g_return_if_fail (self != NULL);
+ _tmp0_ = self->priv->values;
+ _tmp1_ = band;
+ _tmp2_ = v;
+ _tmp0__tmp1_ = 1 - ((_tmp2_ + 20.0) / 40.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);
-	_tmp0_ = self->priv->values;
-	_tmp0__length1 = self->priv->values_length1;
-	_tmp1_ = band;
-	_tmp2_ = _tmp0__tmp1_;
-	result = ((1 - _tmp2_) * 40.0) - 20.0;
-	return result;
+ gdouble result = 0.0;
+ gdouble* _tmp0_;
+ gint _tmp1_;
+ gdouble _tmp2_;
+ g_return_val_if_fail (self != NULL, 0.0);
+ _tmp0_ = self->priv->values;
+ _tmp1_ = band;
+ _tmp2_ = _tmp0__tmp1_;
+ result = ((1 - _tmp2_) * 40.0) - 20.0;
+ return result;
 }
 
 
 void ddb_equalizer_set_preamp (DdbEqualizer* self, gdouble v) {
-	gdouble _tmp0_;
-	g_return_if_fail (self != NULL);
-	_tmp0_ = v;
-	self->priv->preamp = 1 - ((_tmp0_ + 20.0) / 40.0);
+ gdouble _tmp0_;
+ g_return_if_fail (self != NULL);
+ _tmp0_ = v;
+ self->priv->preamp = 1 - ((_tmp0_ + 20.0) / 40.0);
 }
 
 
 gdouble ddb_equalizer_get_preamp (DdbEqualizer* self) {
-	gdouble result = 0.0;
-	gdouble _tmp0_;
-	g_return_val_if_fail (self != NULL, 0.0);
-	_tmp0_ = self->priv->preamp;
-	result = ((1 - _tmp0_) * 40.0) - 20.0;
-	return result;
+ gdouble result = 0.0;
+ gdouble _tmp0_;
+ g_return_val_if_fail (self != NULL, 0.0);
+ _tmp0_ = self->priv->preamp;
+ result = ((1 - _tmp0_) * 40.0) - 20.0;
+ return result;
 }
 
 
 DdbEqualizer* ddb_equalizer_construct (GType object_type) {
-	DdbEqualizer * self = NULL;
-	self = (DdbEqualizer*) g_object_new (object_type, NULL);
-	return self;
+ DdbEqualizer * self = NULL;
+ self = (DdbEqualizer*) g_object_new (object_type, NULL);
+ return self;
 }
 
 
 DdbEqualizer* ddb_equalizer_new (void) {
-	return ddb_equalizer_construct (DDB_TYPE_EQUALIZER);
+ return ddb_equalizer_construct (DDB_TYPE_EQUALIZER);
 }
 
 
 static GObject * ddb_equalizer_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) {
-	GObject * obj;
-	GObjectClass * parent_class;
-	DdbEqualizer * self;
-	parent_class = G_OBJECT_CLASS (ddb_equalizer_parent_class);
-	obj = parent_class->constructor (type, n_construct_properties, construct_properties);
-	self = DDB_EQUALIZER (obj);
-	return obj;
+ GObject * obj;
+ GObjectClass * parent_class;
+ parent_class = G_OBJECT_CLASS (ddb_equalizer_parent_class);
+ obj = parent_class->constructor (type, n_construct_properties, construct_properties);
+ return obj;
 }
 
 
 static void ddb_equalizer_class_init (DdbEqualizerClass * klass) {
-	ddb_equalizer_parent_class = g_type_class_peek_parent (klass);
-	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;
+ ddb_equalizer_parent_class = g_type_class_peek_parent (klass);
+ 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;
+ GTK_WIDGET_CLASS (klass)->draw = ddb_equalizer_real_draw;
 #else
-	GTK_WIDGET_CLASS (klass)->expose_event = ddb_equalizer_real_expose_event;
+ 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;
-	GTK_WIDGET_CLASS (klass)->motion_notify_event = ddb_equalizer_real_motion_notify_event;
-	G_OBJECT_CLASS (klass)->constructor = ddb_equalizer_constructor;
-	G_OBJECT_CLASS (klass)->finalize = ddb_equalizer_finalize;
-	g_signal_new ("on_changed", DDB_TYPE_EQUALIZER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ 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;
+ GTK_WIDGET_CLASS (klass)->motion_notify_event = ddb_equalizer_real_motion_notify_event;
+ G_OBJECT_CLASS (klass)->constructor = ddb_equalizer_constructor;
+ G_OBJECT_CLASS (klass)->finalize = ddb_equalizer_finalize;
+ g_signal_new ("on_changed", DDB_TYPE_EQUALIZER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 }
 
 
 static void ddb_equalizer_instance_init (DdbEqualizer * self) {
-	gdouble* _tmp0_ = NULL;
-	GdkCursor* _tmp1_;
-	self->priv = DDB_EQUALIZER_GET_PRIVATE (self);
-	_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->eq_margin_bottom = -1;
-	self->priv->eq_margin_left = -1;
-	_tmp1_ = gdk_cursor_new (GDK_LEFT_PTR);
-	self->priv->pointer_cursor = _tmp1_;
+ gdouble* _tmp0_ = NULL;
+ GdkCursor* _tmp1_;
+ self->priv = DDB_EQUALIZER_GET_PRIVATE (self);
+ _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->eq_margin_bottom = -1;
+ self->priv->eq_margin_left = -1;
+ _tmp1_ = gdk_cursor_new (GDK_LEFT_PTR);
+ self->priv->pointer_cursor = _tmp1_;
 }
 
 
 static void ddb_equalizer_finalize (GObject* obj) {
-	DdbEqualizer * self;
-	self = DDB_EQUALIZER (obj);
-	self->priv->values = (g_free (self->priv->values), NULL);
-	_gdk_cursor_unref0 (self->priv->pointer_cursor);
-	G_OBJECT_CLASS (ddb_equalizer_parent_class)->finalize (obj);
+ DdbEqualizer * self;
+ self = DDB_EQUALIZER (obj);
+ self->priv->values = ((void)(g_free (self->priv->values)), NULL);
+ _gdk_cursor_unref0 (self->priv->pointer_cursor);
+ G_OBJECT_CLASS (ddb_equalizer_parent_class)->finalize (obj);
 }
 
 
 GType ddb_equalizer_get_type (void) {
-	static volatile gsize ddb_equalizer_type_id__volatile = 0;
-	if (g_once_init_enter (&ddb_equalizer_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (DdbEqualizerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) ddb_equalizer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DdbEqualizer), 0, (GInstanceInitFunc) ddb_equalizer_instance_init, NULL };
-		GType ddb_equalizer_type_id;
-		ddb_equalizer_type_id = g_type_register_static (GTK_TYPE_DRAWING_AREA, "DdbEqualizer", &g_define_type_info, 0);
-		g_once_init_leave (&ddb_equalizer_type_id__volatile, ddb_equalizer_type_id);
-	}
-	return ddb_equalizer_type_id__volatile;
+ static volatile gsize ddb_equalizer_type_id__volatile = 0;
+ if (g_once_init_enter ((gsize *)(&ddb_equalizer_type_id__volatile))) {
+ static const GTypeInfo g_define_type_info = { sizeof (DdbEqualizerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) ddb_equalizer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (DdbEqualizer), 0, (GInstanceInitFunc) ddb_equalizer_instance_init, NULL };
+ GType ddb_equalizer_type_id;
+ ddb_equalizer_type_id = g_type_register_static (GTK_TYPE_DRAWING_AREA, "DdbEqualizer", &g_define_type_info, 0);
+ g_once_init_leave (&ddb_equalizer_type_id__volatile, ddb_equalizer_type_id);
+ }
+ return ddb_equalizer_type_id__volatile;
 }

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddbequalizer.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddbequalizer.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddbseekbar.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddbseekbar.c Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddbseekbar.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddbseekbar.h Changed

@@ -1,3 +1,26 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2020 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
 #ifndef __DDBSEEKBAR_H__
 #define __DDBSEEKBAR_H__

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddbtabstrip.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddbtabstrip.c Changed

@@ -1,32 +1,37 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
-#include <gtk/gtk.h>
-#include <string.h>
+
 #include <assert.h>
 #include <glib.h>
+#include <gtk/gtk.h>
 #include <stdlib.h>
+#include <string.h>
 #include "ddbtabstrip.h"
 #include "drawing.h"
 #include "gtkui.h"
 #include "interface.h"
+#include "playlist/mainplaylist.h"
 #include "support.h"
-#include "mainplaylist.h"
 
 #define GLADE_HOOKUP_OBJECT(component,widget,name) \
 g_object_set_data_full (G_OBJECT (component), name, \
@@ -39,8 +44,30 @@
 G_DEFINE_TYPE (DdbTabStrip, ddb_tabstrip, GTK_TYPE_WIDGET);
 
 extern GtkWidget *theme_button;
-#define arrow_sz 10
+#define arrow_sz (ts->calculated_arrow_width)
 #define arrow_widget_width (arrow_sz+4)
+#define add_playlist_btn_width arrow_widget_width*2
+
+enum {
+ INFO_TARGET_URIS, // gtk sets this to 0 by default
+ INFO_TARGET_PLAYLIST_ITEM_INDEXES,
+ INFO_TARGET_PLAYITEM_POINTERS,
+};
+
+static void
+plt_get_title_wrapper (int plt, char *buffer, int len) {
+ if (plt == -1) {
+ strcpy (buffer, "");
+ return;
+ }
+ ddb_playlist_t *p = deadbeef->plt_get_for_idx (plt);
+ deadbeef->plt_get_title (p, buffer, len);
+ deadbeef->plt_unref (p);
+ char *end;
+ if (!g_utf8_validate (buffer, -1, (const gchar **)&end)) {
+ *end = 0;
+ }
+}
 
 static void
 ddb_tabstrip_send_configure (DdbTabStrip *darea)
@@ -77,6 +104,7 @@
 else
 {
 gtk_widget_set_realized (widget, TRUE);
+ gtk_widget_set_can_focus (widget, TRUE);
 
 attributes.window_type = GDK_WINDOW_CHILD;
 GtkAllocation a;
@@ -91,27 +119,40 @@
 attributes.colormap = gtk_widget_get_colormap (widget);
 #endif
 attributes.event_mask = gtk_widget_get_events (widget);
- attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK;
+ attributes.event_mask |= GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_KEY_PRESS_MASK |
+ GDK_LEAVE_NOTIFY_MASK;
 
 attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
 #if !GTK_CHECK_VERSION(3,0,0)
 attributes_mask |= GDK_WA_COLORMAP;
 #endif
 
- gtk_widget_set_window(widget, gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask));
+ GdkWindow *window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
+ gtk_widget_set_window(widget, window);
 gdk_window_set_user_data (gtk_widget_get_window(widget), darea);
 
- gtk_widget_set_style (widget, gtk_style_attach (gtk_widget_get_style (widget), gtk_widget_get_window(widget)));
- gtk_style_set_background (gtk_widget_get_style (widget), gtk_widget_get_window(widget), GTK_STATE_NORMAL);
+#if !GTK_CHECK_VERSION(3,0,0)
+ widget->style = gtk_style_attach (widget->style, widget->window);
+ gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+#else
+ gtk_style_context_set_background (gtk_widget_get_style_context (widget), window);
+#endif
 }
 
 ddb_tabstrip_send_configure (DDB_TABSTRIP (widget));
- GtkTargetEntry entry = {
- .target = "STRING",
- .flags = GTK_TARGET_SAME_APP,
- TARGET_SAMEWIDGET
+ GtkTargetEntry entries = {
+ {
+ .target = TARGET_PLAYLIST_AND_ITEM_INDEXES,
+ .flags = GTK_TARGET_SAME_APP,
+ .info = INFO_TARGET_PLAYLIST_ITEM_INDEXES
+ },
+ {
+ .target = TARGET_PLAYITEM_POINTERS,
+ .flags = GTK_TARGET_SAME_APP,
+ .info = INFO_TARGET_PLAYITEM_POINTERS
+ },
 };
- gtk_drag_dest_set (widget, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, &entry, 1, GDK_ACTION_COPY | GDK_ACTION_MOVE);
+ gtk_drag_dest_set (widget, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, entries, 2, GDK_ACTION_COPY | GDK_ACTION_MOVE);
 gtk_drag_dest_add_uri_targets (widget);
 gtk_drag_dest_set_track_motion (widget, TRUE);
 }
@@ -198,21 +239,28 @@
 on_tabstrip_drag_end (GtkWidget *widget,
 GdkDragContext *drag_context);
 
+gboolean
+on_tabstrip_key_press_event (GtkWidget *widget,
+ GdkEventKey *event);
 static int
 get_tab_under_cursor (DdbTabStrip *ts, int x);
 
 static void
-ddb_tabstrip_destroy(GObject *object)
+ddb_tabstrip_unrealize(GtkWidget *w)
 {
 DdbTabStrip *tabstrip;
 
- g_return_if_fail(object != NULL);
- g_return_if_fail(DDB_IS_TABSTRIP(object));
+ g_return_if_fail(w != NULL);
+ g_return_if_fail(DDB_IS_TABSTRIP(w));
 
- tabstrip = DDB_TABSTRIP (object);
+ tabstrip = DDB_TABSTRIP (w);
 draw_free (&tabstrip->drawctx);
+ GTK_WIDGET_CLASS (ddb_tabstrip_parent_class)->unrealize (w);
 }
 
+gboolean
+on_tabstrip_leave_notify_event (GtkWidget *, GdkEventCrossing *);
+
 static void
 ddb_tabstrip_class_init(DdbTabStripClass *class)
 {
@@ -223,6 +271,7 @@
 widget_class->draw = on_tabstrip_draw;
 #endif
 widget_class->realize = ddb_tabstrip_realize;
+ widget_class->unrealize = ddb_tabstrip_unrealize;
 widget_class->size_allocate = ddb_tabstrip_size_allocate;
 widget_class->button_press_event = on_tabstrip_button_press_event;
 widget_class->button_release_event = on_tabstrip_button_release_event;
@@ -234,6 +283,8 @@
 widget_class->drag_end = on_tabstrip_drag_end;
 widget_class->drag_data_received = on_tabstrip_drag_data_received;
 widget_class->drag_leave = on_tabstrip_drag_leave;
+ widget_class->key_press_event = on_tabstrip_key_press_event;
+ widget_class->leave_notify_event = on_tabstrip_leave_notify_event;
 }
 
 gboolean
@@ -257,7 +308,7 @@
 {
 gchar *ptr=(char*)gtk_selection_data_get_data (data);
 int len = gtk_selection_data_get_length (data);
- if (target_type == 0) { // uris
+ if (target_type == INFO_TARGET_URIS) { // uris
 // this happens when dropped from file manager
 char *mem = malloc (len+1);
 memcpy (mem, ptr, len);
@@ -265,7 +316,7 @@
 // we don't pass control structure, but there's only one drag-drop view currently
 gtkui_receive_fm_drop (NULL, mem, len);
 }
- else if (target_type == 1) {
+ else if (target_type == INFO_TARGET_PLAYLIST_ITEM_INDEXES) {
 uint32_t *d= (uint32_t *)ptr;
 int plt = *d;
 d++;
@@ -276,6 +327,9 @@
 deadbeef->plt_unref (p);
 }
 }
+ else if (target_type == INFO_TARGET_PLAYITEM_POINTERS) {
+ // FIXME!
+ }
 gtk_drag_finish (drag_context, TRUE, FALSE, time);
 }
 
@@ -284,6 +338,10 @@
 GdkDragContext *drag_context,
 guint time)
 {
+ DdbTabStrip *ts = DDB_TABSTRIP(widget);
+ if (ts->pick_drag_timer != 0) {
+ g_source_remove(ts->pick_drag_timer);
+ }
 }
 
 void
@@ -292,7 +350,7 @@
 {
 }
 
-GtkWidget * ddb_tabstrip_new() {
+GtkWidget * ddb_tabstrip_new(void) {
 return g_object_new (DDB_TYPE_TABSTRIP, NULL);
 }
 
@@ -308,7 +366,7 @@
 tabstrip->movepos = 0;
 drawctx_init (&tabstrip->drawctx);
 #if GTK_CHECK_VERSION(3,0,0)
- gtk_widget_set_events (GTK_WIDGET (tabstrip), gtk_widget_get_events (GTK_WIDGET (tabstrip)) | GDK_SCROLL_MASK);
+ gtk_widget_set_events (GTK_WIDGET (tabstrip), gtk_widget_get_events (GTK_WIDGET (tabstrip)) | GDK_SCROLL_MASK | GDK_KEY_PRESS_MASK);
 #endif
 }
 
@@ -331,6 +389,7 @@
 #endif
 } coord_t;
 
+#if GTK_CHECK_VERSION(3,0,0)
 static void
 cairo_draw_lines (cairo_t *cr, coord_t *pts, int cnt) {
 cairo_move_to (cr, pts0.x+1, pts0.y+1);
@@ -346,12 +405,13 @@
 cairo_line_to (cr, ptsi.x, ptsi.y);
 }
 }
+#endif
 
 void
 #if !GTK_CHECK_VERSION(3,0,0)
-ddb_tabstrip_draw_tab (GtkWidget *widget, GdkDrawable *drawable, int idx, int selected, int x, int y, int w, int h) {
+ddb_tabstrip_draw_tab (GtkWidget *widget, GdkDrawable *drawable, int idx, int selected, int x, int y, int w, int h, GtkStyle *style) {
 #else
-ddb_tabstrip_draw_tab (GtkWidget *widget, cairo_t *cr, int idx, int selected, int x, int y, int w, int h) {
+ddb_tabstrip_draw_tab (GtkWidget *widget, cairo_t *cr, int idx, int selected, int x, int y, int w, int h, GtkStyle *style) {
 #endif
 coord_t points_filled = {
 { x+2, y + h },
@@ -404,34 +464,44 @@
 }
 }
 deadbeef->pl_unlock ();
+ int theming = !gtkui_override_tabstrip_colors ();
 if (selected) {
 if (fallback) {
- gtkui_get_tabstrip_base_color (&clr_bg);
+ if (theming) {
+ clr_bg = style->bgGTK_STATE_NORMAL;
+ } else {
+ gtkui_get_tabstrip_base_color (&clr_bg);
+ }
+ }
+ if (theming) {
+ clr_outer_frame = style->darkGTK_STATE_NORMAL;
+ clr_inner_frame = style->lightGTK_STATE_NORMAL;
+ } else {
+ gtkui_get_tabstrip_dark_color (&clr_outer_frame);
+ gtkui_get_tabstrip_light_color (&clr_inner_frame);
 }
-#if !GTK_CHECK_VERSION(3,0,0)
- gdk_gc_set_rgb_fg_color (bg, &clr_bg);
- gdk_gc_set_rgb_fg_color (outer_frame, (gtkui_get_tabstrip_dark_color (&clr_outer_frame), &clr_outer_frame));
- gdk_gc_set_rgb_fg_color (inner_frame, (gtkui_get_tabstrip_light_color (&clr_inner_frame), &clr_inner_frame));
-#else
- gtkui_get_tabstrip_dark_color (&clr_outer_frame);
- gtkui_get_tabstrip_light_color (&clr_inner_frame);
-#endif
 }
 else {
 if (fallback) {
- gtkui_get_tabstrip_mid_color (&clr_bg);
+ if (theming) {
+ clr_bg = style->midGTK_STATE_NORMAL;
+ } else {
+ gtkui_get_tabstrip_mid_color (&clr_bg);
+ }
+ }
+ if (theming) {
+ clr_outer_frame = style->darkGTK_STATE_NORMAL;
+ clr_inner_frame = style->midGTK_STATE_NORMAL;
+ } else {
+ gtkui_get_tabstrip_dark_color (&clr_outer_frame);
+ gtkui_get_tabstrip_mid_color (&clr_inner_frame);
 }
-#if !GTK_CHECK_VERSION(3,0,0)
- gdk_gc_set_rgb_fg_color (bg, &clr_bg);
-
- gdk_gc_set_rgb_fg_color (outer_frame, (gtkui_get_tabstrip_dark_color (&clr_outer_frame), &clr_outer_frame));
- gdk_gc_set_rgb_fg_color (inner_frame, (gtkui_get_tabstrip_mid_color (&clr_inner_frame), &clr_inner_frame));
-#else
- gtkui_get_tabstrip_dark_color (&clr_outer_frame);
- gtkui_get_tabstrip_mid_color (&clr_inner_frame);
-#endif
 }
 #if !GTK_CHECK_VERSION(3,0,0)
+ gdk_gc_set_rgb_fg_color (bg, &clr_bg);
+ gdk_gc_set_rgb_fg_color (outer_frame, &clr_outer_frame);
+ gdk_gc_set_rgb_fg_color (inner_frame, &clr_inner_frame);
+
 gdk_draw_polygon (drawable, bg, TRUE, (GdkPoint*)points_filled, sizeof (points_filled)/sizeof(coord_t));
 gdk_draw_lines (drawable, outer_frame, (GdkPoint*)points_frame1, sizeof (points_frame1)/sizeof(coord_t));
 gdk_draw_lines (drawable, inner_frame, (GdkPoint*)points_frame2, sizeof (points_frame2)/sizeof(coord_t));
@@ -459,7 +529,7 @@
 char title1000;
 plt_get_title_wrapper (tab, title, sizeof (title));
 int h = 0;
- draw_get_text_extents (&ts->drawctx, title, strlen (title), &width, &h);
+ draw_get_text_extents (&ts->drawctx, title, (int)strlen (title), &width, &h);
 width += text_left_padding + text_right_padding;
 if (width < min_tab_size) {
 width = min_tab_size;
@@ -479,7 +549,7 @@
 gtk_widget_get_allocation (widget, &a);
 for (int idx = 0; idx < cnt; idx++) {
 w += ddb_tabstrip_get_tab_width (ts, idx) - tab_overlap_size;
- if (w >= a.width) {
+ if (w >= a.width-add_playlist_btn_width-tab_overlap_size) {
 return 1;
 }
 }
@@ -497,7 +567,8 @@
 int cnt = deadbeef->plt_get_count ();
 GtkAllocation a;
 gtk_widget_get_allocation (widget, &a);
- int boundary = a.width - arrow_widget_width*2 + ts->hscrollpos;
+ int tabarea_width = a.width-add_playlist_btn_width;
+ int boundary = tabarea_width - arrow_widget_width*2 + ts->hscrollpos;
 for (int idx = 0; idx < cnt; idx++) {
 int tab_w = ddb_tabstrip_get_tab_width (ts, idx);
 if (idx == cnt-1) {
@@ -539,13 +610,14 @@
 GtkAllocation a;
 gtk_widget_get_allocation (widget, &a);
 int w = 0;
+ int tabarea_width = a.width-add_playlist_btn_width;
 int cnt = deadbeef->plt_get_count ();
 for (int idx = 0; idx < cnt; idx++) {
 w += ddb_tabstrip_get_tab_width (ts, idx) - tab_overlap_size;
 }
 w += tab_overlap_size + 3;
- if (ts->hscrollpos > w - (a.width - arrow_widget_width*2)) {
- ts->hscrollpos = w - (a.width - arrow_widget_width*2);
+ if (ts->hscrollpos > w - (tabarea_width - arrow_widget_width*2)) {
+ ts->hscrollpos = w - (tabarea_width - arrow_widget_width*2);
 deadbeef->conf_set_int ("gtkui.tabscroll", ts->hscrollpos);
 }
 tabstrip_scroll_to_tab_int (ts, deadbeef->plt_get_curr_idx (), 0);
@@ -558,7 +630,7 @@
 }
 
 void
-set_tab_text_color (DdbTabStrip *ts, int idx, int selected) {
+set_tab_text_color (DdbTabStrip *ts, int idx, int selected, int playing, GtkStyle *style) {
 if (idx == -1) {
 return;
 }
@@ -577,7 +649,20 @@
 deadbeef->plt_unref (plt);
 if (fallback) {
 GdkColor color;
- gtkui_get_tabstrip_text_color (&color);
+ if (gtkui_override_tabstrip_colors ()) {
+ if (idx == selected) {
+ gtkui_get_tabstrip_selected_text_color (&color);
+ }
+ else if (idx == playing) {
+ gtkui_get_tabstrip_playing_text_color (&color);
+ }
+ else {
+ gtkui_get_tabstrip_text_color (&color);
+ }
+ }
+ else {
+ color = style->textGTK_STATE_NORMAL;
+ }
 float fg3 = {(float)color.red/0xffff, (float)color.green/0xffff, (float)color.blue/0xffff};
 draw_set_fg_color (&ts->drawctx, fg);
 }
@@ -596,14 +681,11 @@
 
 tabstrip_adjust_hscroll (ts);
 cairo_set_line_width (cr, 1);
-#ifdef __APPLE__
- cairo_set_antialias (cr, gtkui_is_retina ? CAIRO_ANTIALIAS_GRAY : CAIRO_ANTIALIAS_NONE);
-#else
 cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
-#endif
 int cnt = deadbeef->plt_get_count ();
 int hscroll = ts->hscrollpos;
 
+ int theming = !gtkui_override_tabstrip_colors ();
 int need_arrows = tabstrip_need_arrows (ts);
 if (need_arrows) {
 hscroll -= arrow_widget_width;
@@ -616,31 +698,48 @@
 tab_overlap_size = (h-4)/2;
 text_right_padding = h - 3;
 
- const char *detail = "button";
 int tab_selected = deadbeef->plt_get_curr_idx ();
 if (tab_selected == -1) {
 return;
 }
 
+ int tab_playing = -1;
+ DB_playItem_t *playing = deadbeef->streamer_get_playing_track_safe ();
+ if (playing) {
+ ddb_playlist_t *plt = deadbeef->pl_get_playlist (playing);
+ if (plt) {
+ tab_playing = deadbeef->plt_get_idx (plt);
+ deadbeef->plt_unref (plt);
+ }
+ deadbeef->pl_item_unref (playing);
+ }
+
+ GtkStyle *style = gtk_widget_get_style (widget);
+ GdkColor clr_mid, clr_dark, clr_base;
+ if (theming) {
+ clr_mid = style->midGTK_STATE_NORMAL;
+ clr_dark = style->darkGTK_STATE_NORMAL;
+ clr_base = style->baseGTK_STATE_NORMAL;
+ } else {
+ gtkui_get_tabstrip_mid_color (&clr_mid);
+ gtkui_get_tabstrip_dark_color (&clr_dark);
+ gtkui_get_tabstrip_base_color (&clr_base);
+ }
 #if !GTK_CHECK_VERSION(3,0,0)
 GdkGC *gc = gdk_gc_new (backbuf);
 // fill background
- GdkColor clr;
- gdk_gc_set_rgb_fg_color (gc, (gtkui_get_tabstrip_mid_color (&clr), &clr));
+ gdk_gc_set_rgb_fg_color (gc, &clr_mid);
 gdk_draw_rectangle (backbuf, 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_gc_set_rgb_fg_color (gc, &clr_dark);
 gdk_draw_line (backbuf, gc, 0, 0, widget->allocation.width, 0);
 #else
 
 // fill background
- GdkColor clr;
- gtkui_get_tabstrip_mid_color (&clr);
- cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.0);
+ cairo_set_source_rgb (cr, clr_mid.red/65535.f, clr_mid.green/65535.f, clr_mid.blue/65535.0);
 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.0);
+ cairo_set_source_rgb (cr, clr_dark.red/65535.f, clr_dark.green/65535.f, clr_dark.blue/65535.0);
 cairo_move_to (cr, 0, 1);
 cairo_line_to (cr, a.width, 1);
 cairo_stroke (cr);
@@ -656,7 +755,7 @@
 char title1000;
 plt_get_title_wrapper (idx, title, sizeof (title));
 int h = 0;
- draw_get_text_extents (&ts->drawctx, title, strlen (title), &widthsidx, &h);
+ draw_get_text_extents (&ts->drawctx, title, (int)strlen (title), &widthsidx, &h);
 widthsidx += text_left_padding + text_right_padding;
 if (widthsidx < min_tab_size) {
 widthsidx = min_tab_size;
@@ -677,28 +776,35 @@
 area.height = 24;
 if (idx != tab_selected) {
 #if !GTK_CHECK_VERSION(3,0,0)
- ddb_tabstrip_draw_tab (widget, backbuf, idx, idx == tab_selected, x, y, w, h);
+ ddb_tabstrip_draw_tab (widget, backbuf, idx, idx == tab_selected, x, y, w, h, style);
 #else
- ddb_tabstrip_draw_tab (widget, cr, idx, idx == tab_selected, x, y, w, h);
+ ddb_tabstrip_draw_tab (widget, cr, idx, idx == tab_selected, x, y, w, h, style);
 #endif
 char tab_title1000;
 plt_get_title_wrapper (idx, tab_title, sizeof (tab_title));
 
- set_tab_text_color (ts, idx, tab_selected);
- draw_text (&ts->drawctx, x + text_left_padding, y - text_vert_offset, w - (text_left_padding + text_right_padding - 1), 0, tab_title);
+ set_tab_text_color (ts, idx, tab_selected, tab_playing, style);
+ int bold = 0;
+ int italic = 0;
+ if (!theming && idx == tab_playing) {
+ italic = gtkui_tabstrip_italic_playing;
+ bold = gtkui_tabstrip_embolden_playing;
+ }
+ draw_text_custom (&ts->drawctx, x + text_left_padding, y - text_vert_offset, w - (text_left_padding + text_right_padding - 1), 0, DDB_TABSTRIP_FONT, bold, italic, tab_title);
 }
 x += w - tab_overlap_size;
 }
+
 #if !GTK_CHECK_VERSION(3,0,0)
- gdk_draw_line (backbuf, widget->style->dark_gcGTK_STATE_NORMAL, 0, widget->allocation.height-2, widget->allocation.width, widget->allocation.height-2);
- gdk_draw_line (backbuf, widget->style->light_gcGTK_STATE_NORMAL, 0, widget->allocation.height-1, widget->allocation.width, widget->allocation.height-1);
+ gdk_draw_line (backbuf, style->dark_gcGTK_STATE_NORMAL, 0, widget->allocation.height-2, widget->allocation.width, widget->allocation.height-2);
+ gdk_draw_line (backbuf, style->light_gcGTK_STATE_NORMAL, 0, widget->allocation.height-1, widget->allocation.width, widget->allocation.height-1);
 #else
- GdkColor *pclr = &gtk_widget_get_style (widget)->darkGTK_STATE_NORMAL;
+ GdkColor *pclr = &style->darkGTK_STATE_NORMAL;
 cairo_set_source_rgb (cr, pclr->red/65535.f, pclr->green/65535.f, pclr->blue/65535.0);
 cairo_move_to (cr, 0, a.height-1);
 cairo_line_to (cr, a.width, a.height-1);
 cairo_stroke (cr);
- pclr = &gtk_widget_get_style (widget)->lightGTK_STATE_NORMAL;
+ pclr = &style->lightGTK_STATE_NORMAL;
 cairo_set_source_rgb (cr, pclr->red/65535.f, pclr->green/65535.f, pclr->blue/65535.0);
 cairo_move_to (cr, 0, a.height);
 cairo_line_to (cr, a.width, a.height);
@@ -720,14 +826,32 @@
 area.width = w;
 area.height = 24;
 #if !GTK_CHECK_VERSION(3,0,0)
- ddb_tabstrip_draw_tab (widget, backbuf, idx, 1, x, y, w, h);
+ ddb_tabstrip_draw_tab (widget, backbuf, idx, 1, x, y, w, h, style);
 #else
- ddb_tabstrip_draw_tab (widget, cr, idx, 1, x, y, w, h);
+ ddb_tabstrip_draw_tab (widget, cr, idx, 1, x, y, w, h, style);
 #endif
 char tab_title1000;
 plt_get_title_wrapper (idx, tab_title, sizeof (tab_title));
- set_tab_text_color (ts, idx, tab_selected);
- draw_text (&ts->drawctx, x + text_left_padding, y - text_vert_offset, w - (text_left_padding + text_right_padding - 1), 0, tab_title);
+ set_tab_text_color (ts, idx, tab_selected, -1, style);
+ int bold = 0;
+ int italic = 0;
+ if (!theming) {
+ bold = gtkui_tabstrip_embolden_selected;
+ italic = gtkui_tabstrip_italic_selected;
+ }
+ if (gtk_widget_is_focus (GTK_WIDGET (ts))) {
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_render_focus (gtk_widget_get_style_context (widget), cr, x, y, w - ( text_right_padding - 1), ts->row_height);
+#else
+ GdkColor clr;
+ gtkui_get_tabstrip_text_color (&clr);
+ gdk_gc_set_rgb_fg_color (gc, &clr);
+ gdk_gc_set_line_attributes (gc, 1, GDK_LINE_ON_OFF_DASH, GDK_CAP_BUTT, GDK_JOIN_BEVEL);
+ gdk_gc_set_dashes (gc, 0, (gint8) {1,1}, 2);
+ gdk_draw_rectangle (backbuf, gc, FALSE, x, y , w - (text_right_padding - 1), ts->row_height-2);
+#endif
+ }
+ draw_text_custom (&ts->drawctx, x + text_left_padding, y - text_vert_offset, w - (text_left_padding + text_right_padding - 1), 0, DDB_TABSTRIP_FONT, bold, italic, tab_title);
 }
 else {
 need_draw_moving = 1;
@@ -743,73 +867,129 @@
 }
 if (w > 0) {
 #if !GTK_CHECK_VERSION(3,0,0)
- ddb_tabstrip_draw_tab (widget, backbuf, idx, 1, x, y, w, h);
+ ddb_tabstrip_draw_tab (widget, backbuf, idx, 1, x, y, w, h, style);
 #else
- ddb_tabstrip_draw_tab (widget, cr, idx, 1, x, y, w, h);
+ ddb_tabstrip_draw_tab (widget, cr, idx, 1, x, y, w, h, style);
 #endif
 char tab_title1000;
 plt_get_title_wrapper (idx, tab_title, sizeof (tab_title));
- set_tab_text_color (ts, idx, tab_selected);
- draw_text (&ts->drawctx, x + text_left_padding, y - text_vert_offset, w - (text_left_padding + text_right_padding - 1), 0, tab_title);
+ set_tab_text_color (ts, idx, tab_selected, -1, style);
+ int bold = 0;
+ int italic = 0;
+ if (!theming) {
+ bold = gtkui_tabstrip_embolden_selected;
+ italic = gtkui_tabstrip_italic_selected;
+ }
+ draw_text_custom (&ts->drawctx, x + text_left_padding, y - text_vert_offset, w - (text_left_padding + text_right_padding - 1), 0, DDB_TABSTRIP_FONT, bold, italic, tab_title);
 }
 break;
 }
 x += w - tab_overlap_size;
 }
 }
+ int tabarea_width = a.width - add_playlist_btn_width;
 #if !GTK_CHECK_VERSION(3,0,0)
 if (need_arrows) {
 int sz = widget->allocation.height-3;
- GdkColor clr;
- gdk_gc_set_rgb_fg_color (gc, (gtkui_get_tabstrip_mid_color (&clr), &clr));
+ gdk_gc_set_rgb_fg_color (gc, &clr_mid);
 gdk_draw_rectangle (backbuf, gc, TRUE, 0, 1, arrow_widget_width, sz);
- gtk_paint_arrow (widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, NULL, GTK_ARROW_LEFT, TRUE, 2, sz/2-arrow_sz/2, arrow_sz, arrow_sz);
- gdk_draw_rectangle (backbuf, gc, TRUE, widget->allocation.width-arrow_widget_width, 1, arrow_widget_width, sz);
- gtk_paint_arrow (widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, NULL, GTK_ARROW_RIGHT, TRUE, widget->allocation.width-arrow_sz-2, 1+sz/2-arrow_sz/2, arrow_sz, arrow_sz);
+ gtk_paint_arrow (style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, NULL, GTK_ARROW_LEFT, TRUE, 2, sz/2-arrow_sz/2, arrow_sz, arrow_sz);
+ gdk_draw_rectangle (backbuf, gc, TRUE, tabarea_width-arrow_widget_width, 1, arrow_widget_width, sz);
+ gtk_paint_arrow (style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, NULL, GTK_ARROW_RIGHT, TRUE, tabarea_width-arrow_sz-2, 1+sz/2-arrow_sz/2, arrow_sz, arrow_sz);
 }
 #else
 if (need_arrows) {
 int sz = a.height-3;
- gtkui_get_tabstrip_mid_color (&clr);
- cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.0);
+ cairo_set_source_rgb (cr, clr_mid.red/65535.f, clr_mid.green/65535.f, clr_mid.blue/65535.0);
 cairo_rectangle (cr, 0, 1, arrow_widget_width, sz);
 cairo_fill (cr);
 #if GTK_CHECK_VERSION(3,0,0)
- gtk_paint_arrow (gtk_widget_get_style (widget), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, widget, NULL, GTK_ARROW_LEFT, TRUE, 2, sz/2-arrow_sz/2, arrow_sz, arrow_sz);
+ gtk_paint_arrow (style, cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, widget, NULL, GTK_ARROW_LEFT, TRUE, 2, sz/2-arrow_sz/2, arrow_sz, arrow_sz);
 #else
- gtk_paint_arrow (gtk_widget_get_style (widget), gtk_widget_get_window(widget), GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, NULL, GTK_ARROW_LEFT, TRUE, 2, sz/2-arrow_sz/2, arrow_sz, arrow_sz);
+ gtk_paint_arrow (style, gtk_widget_get_window(widget), GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, NULL, GTK_ARROW_LEFT, TRUE, 2, sz/2-arrow_sz/2, arrow_sz, arrow_sz);
 #endif
 
- cairo_rectangle (cr, a.width-arrow_widget_width, 1, arrow_widget_width, sz);
+ cairo_rectangle (cr, tabarea_width-arrow_widget_width, 1, arrow_widget_width, sz);
 cairo_fill (cr);
 #if GTK_CHECK_VERSION(3,0,0)
- gtk_paint_arrow (gtk_widget_get_style (widget), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, widget, NULL, GTK_ARROW_RIGHT, TRUE, a.width-arrow_sz-2, 1+sz/2-arrow_sz/2, arrow_sz, arrow_sz);
+ gtk_paint_arrow (style, cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, widget, NULL, GTK_ARROW_RIGHT, TRUE, tabarea_width-arrow_sz-2, 1+sz/2-arrow_sz/2, arrow_sz, arrow_sz);
 #else
- gtk_paint_arrow (gtk_widget_get_style (widget), gtk_widget_get_window(widget), GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, NULL, GTK_ARROW_RIGHT, TRUE, a.width-arrow_sz-2, 1+sz/2-arrow_sz/2, arrow_sz, arrow_sz);
+ gtk_paint_arrow (style, gtk_widget_get_window(widget), GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, NULL, GTK_ARROW_RIGHT, TRUE, a.width-arrow_sz-2, 1+sz/2-arrow_sz/2, arrow_sz, arrow_sz);
 #endif
 }
 #endif
 
+ // Draw add playlist button
+ {
+ int playlist_button_border = 3;
+ int add_playlist_btn_height = a.height-playlist_button_border;
+ GdkColor textcolor, clr;
+ if (ts->add_playlistbtn_hover) {
+ clr = clr_base;
+ if (theming) {
+ textcolor = style->textGTK_STATE_NORMAL;
+ } else {
+ gtkui_get_tabstrip_selected_text_color (&textcolor);
+ }
+ } else {
+ clr = clr_mid;
+ if (theming) {
+ textcolor = style->textGTK_STATE_NORMAL;
+ } else {
+ gtkui_get_tabstrip_text_color (&textcolor);
+ }
+ }
+ float fg3 = {(float)textcolor.red/0xffff, (float)textcolor.green/0xffff, (float)textcolor.blue/0xffff};
+#if !GTK_CHECK_VERSION(3,0,0)
+ gdk_gc_set_rgb_fg_color (gc, &clr);
+ gdk_draw_rectangle (backbuf, gc, TRUE, tabarea_width, 1, add_playlist_btn_width, add_playlist_btn_height);
+
+ draw_set_fg_color (&ts->drawctx, fg);
+ draw_text_custom (&ts->drawctx, tabarea_width, playlist_button_border, add_playlist_btn_width, 2, DDB_TABSTRIP_FONT, TRUE, FALSE, "+");
+#else
+ cairo_set_source_rgb (cr, clr.red/65535.f, clr.green/65535.f, clr.blue/65535.0);
+ cairo_rectangle (cr, tabarea_width, 1, add_playlist_btn_width, add_playlist_btn_height);
+ cairo_fill (cr);
+
+ draw_set_fg_color (&ts->drawctx, fg);
+ draw_text_custom (&ts->drawctx, tabarea_width, playlist_button_border, add_playlist_btn_width, 2, DDB_TABSTRIP_FONT, TRUE, FALSE, "+");
+#endif
+ }
+
 draw_end (&ts->drawctx);
+
+#if !GTK_CHECK_VERSION(3,0,0)
+ gdk_gc_unref (gc);
+#endif
 }
 
 static int
 get_tab_under_cursor (DdbTabStrip *ts, int x) {
 int hscroll = ts->hscrollpos;
 int need_arrows = tabstrip_need_arrows (ts);
+
+ GtkAllocation a;
+ int buttons_width = add_playlist_btn_width + (need_arrows ? arrow_widget_width : 0);
+ gtk_widget_get_allocation (GTK_WIDGET(ts), &a);
+ if (x > a.width - buttons_width) {
+ return -1;
+ }
+ if (need_arrows && x < arrow_widget_width) {
+ return -1;
+ }
+
 if (need_arrows) {
 hscroll -= arrow_widget_width;
 }
 int idx;
 int cnt = deadbeef->plt_get_count ();
 int fw = tabs_left_margin - hscroll;
- int tab_selected = deadbeef->plt_get_curr_idx ();
 for (idx = 0; idx < cnt; idx++) {
 char title1000;
 plt_get_title_wrapper (idx, title, sizeof (title));
 int w = 0;
 int h = 0;
- draw_get_text_extents (&ts->drawctx, title, strlen (title), &w, &h);
+ draw_get_text_extents (&ts->drawctx, title, (int)strlen (title), &w, &h);
 w += text_left_padding + text_right_padding;
 if (w < min_tab_size) {
 w = min_tab_size;
@@ -831,7 +1011,7 @@
 int tab = deadbeef->plt_get_curr_idx ();
 if (tab > 0) {
 tab--;
- gtkui_playlist_set_curr (tab);
+ deadbeef->plt_set_curr_idx (tab);
 }
 tabstrip_scroll_to_tab (ts, tab);
 }
@@ -841,7 +1021,7 @@
 int tab = deadbeef->plt_get_curr_idx ();
 if (tab < deadbeef->plt_get_count ()-1) {
 tab++;
- gtkui_playlist_set_curr (tab);
+ deadbeef->plt_set_curr_idx (tab);
 }
 tabstrip_scroll_to_tab (ts, tab);
 }
@@ -886,10 +1066,13 @@
 DdbTabStrip *ts = DDB_TABSTRIP (widget);
 tab_clicked = get_tab_under_cursor (ts, event->x);
 if (TEST_LEFT_CLICK(event)) {
+ if (tab_clicked == deadbeef->plt_get_curr_idx ()) {
+ gtk_widget_grab_focus (widget);
+ }
 int need_arrows = tabstrip_need_arrows (ts);
+ GtkAllocation a;
+ gtk_widget_get_allocation (widget, &a);
 if (need_arrows) {
- GtkAllocation a;
- gtk_widget_get_allocation (widget, &a);
 if (event->x < arrow_widget_width) {
 if (event->type == GDK_BUTTON_PRESS) {
 tabstrip_scroll_left (ts);
@@ -898,7 +1081,7 @@
 }
 return TRUE;
 }
- else if (event->x >= a.width - arrow_widget_width) {
+ else if (event->x >= a.width - (arrow_widget_width + add_playlist_btn_width) && event->x < a.width - add_playlist_btn_width) {
 if (event->type == GDK_BUTTON_PRESS) {
 tabstrip_scroll_right (ts);
 ts->scroll_direction = 1;
@@ -907,15 +1090,34 @@
 return TRUE;
 }
 }
+ if (event->x > a.width - add_playlist_btn_width) {
+ int playlist = gtkui_add_new_playlist ();
+ if (playlist != -1) {
+ deadbeef->plt_set_curr_idx (playlist);
+ }
+ return TRUE;
+ }
+
 if (tab_clicked != -1) {
- gtkui_playlist_set_curr (tab_clicked);
+ deadbeef->plt_set_curr_idx (tab_clicked);
+
+ if (event->type == GDK_2BUTTON_PRESS) {
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ int cur = deadbeef->plt_get_cursor (plt, PL_MAIN);
+ deadbeef->plt_unref (plt);
+
+ if (cur == -1) {
+ cur = 0;
+ }
+ deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, cur, 0);
+ }
 }
 else {
 if (event->type == GDK_2BUTTON_PRESS) {
 // new tab
 int playlist = gtkui_add_new_playlist ();
 if (playlist != -1) {
- gtkui_playlist_set_curr (playlist);
+ deadbeef->plt_set_curr_idx (playlist);
 }
 return TRUE;
 }
@@ -945,25 +1147,30 @@
 tab_moved = 0;
 }
 else if (TEST_RIGHT_CLICK(event)) {
- GtkWidget *menu = gtkui_create_pltmenu (tab_clicked);
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, widget, 0, gtk_get_current_event_time());
+ ddb_playlist_t *plt = deadbeef->plt_get_for_idx (tab_clicked);
+ GtkWidget *menu = gtkui_create_pltmenu (plt);
+ if (plt != NULL) {
+ deadbeef->plt_unref (plt);
+ }
+ gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (widget), NULL);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
 }
 else if (event->button == 2) {
 if (tab_clicked == -1) {
 // new tab
 int playlist = gtkui_add_new_playlist ();
 if (playlist != -1) {
- gtkui_playlist_set_curr (playlist);
+ deadbeef->plt_set_curr_idx (playlist);
 }
 return TRUE;
 }
 else if (deadbeef->conf_get_int ("gtkui.mmb_delete_playlist", 1)) {
 if (tab_clicked != -1) {
- deadbeef->plt_remove (tab_clicked);
- // force invalidation of playlist cache
- search_refresh ();
- int playlist = deadbeef->plt_get_curr_idx ();
- deadbeef->conf_set_int ("playlist.current", playlist);
+ ddb_playlist_t *plt = deadbeef->plt_get_for_idx(tab_clicked);
+ if (plt != NULL) {
+ gtkui_remove_playlist(plt);
+ deadbeef->plt_unref (plt);
+ }
 }
 }
 }
@@ -996,10 +1203,14 @@
 GdkEventConfigure *event)
 {
 DdbTabStrip *ts = DDB_TABSTRIP (widget);
- draw_init_font (&ts->drawctx, gtk_widget_get_style (widget));
+ draw_init_font (&ts->drawctx, DDB_TABSTRIP_FONT, 1);
 tabstrip_adjust_hscroll (ts);
- int height = draw_get_listview_rowheight (&ts->drawctx) + 4;
+ ts->row_height = draw_get_listview_rowheight (&ts->drawctx);
+ int height = ts->row_height + 4;
 ts->calculated_height = height;
+ int w;
+ draw_get_text_extents(&ts->drawctx, ">", 1, &w, NULL);
+ ts->calculated_arrow_width = w;
 GtkAllocation a;
 gtk_widget_get_allocation (widget, &a);
 if (height != a.height) {
@@ -1008,9 +1219,26 @@
 return FALSE;
 }
 
+static void
+tabstrip_update_font (DdbTabStrip *ts, GtkWidget *widget)
+{
+ draw_init_font (&ts->drawctx, DDB_TABSTRIP_FONT, 1);
+ tabstrip_adjust_hscroll (ts);
+ int height = draw_get_listview_rowheight (&ts->drawctx) + 4;
+ ts->calculated_height = height;
+ GtkAllocation a;
+ gtk_widget_get_allocation (widget, &a);
+ if (height != a.height) {
+ gtk_widget_set_size_request (widget, -1, height);
+ }
+}
+
 gboolean
-on_tabstrip_draw (GtkWidget *widget, cairo_t *cr) {
- tabstrip_render (DDB_TABSTRIP (widget), cr);
+on_tabstrip_draw (GtkWidget *widget, cairo_t *cr)
+{
+ DdbTabStrip *ts = DDB_TABSTRIP (widget);
+ tabstrip_update_font (ts, widget);
+ tabstrip_render (ts, cr);
 return FALSE;
 }
 
@@ -1018,6 +1246,9 @@
 on_tabstrip_expose_event (GtkWidget *widget,
 GdkEventExpose *event)
 {
+ DdbTabStrip *ts = DDB_TABSTRIP (widget);
+ tabstrip_update_font (ts, widget);
+
 cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
 on_tabstrip_draw (widget, cr);
 cairo_destroy (cr);
@@ -1029,10 +1260,9 @@
 GdkEventMotion *event)
 {
 DdbTabStrip *ts = DDB_TABSTRIP (widget);
- int ev_x, ev_y;
+ int ev_x;
 GdkModifierType ev_state;
 ev_x = event->x;
- ev_y = event->y;
 ev_state = event->state;
 #if GTK_CHECK_VERSION(2,12,0)
 gdk_event_request_motions (event);
@@ -1068,7 +1298,8 @@
 deadbeef->plt_move (ts->dragging, inspos);
 tab_moved = 1;
 ts->dragging = inspos;
- deadbeef->conf_set_int ("playlist.current", ts->dragging);
+ deadbeef->plt_set_curr_idx(ts->dragging);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_POSITION, 0);
 }
 gtk_widget_queue_draw (widget);
 }
@@ -1080,7 +1311,7 @@
 
 int width;
 int height;
- draw_get_text_extents (&ts->drawctx, s, strlen (s), &width, &height);
+ draw_get_text_extents (&ts->drawctx, s, (int)strlen (s), &width, &height);
 width += text_left_padding + text_right_padding;
 if (width > max_tab_size) {
 gtk_widget_set_tooltip_text (widget, s);
@@ -1093,10 +1324,29 @@
 else {
 gtk_widget_set_has_tooltip (widget, FALSE);
 }
+ GtkAllocation a;
+ gtk_widget_get_allocation(widget, &a);
+ ts->add_playlistbtn_hover = (ev_x > a.width - add_playlist_btn_width) ? 1 : 0;
+ gtk_widget_queue_draw (widget);
 }
 return FALSE;
 }
 
+static gboolean
+_tabstrip_drag_pick (void *ctx) {
+ GtkWidget *widget = ctx;
+ DdbTabStrip *ts = DDB_TABSTRIP(widget);
+ gint x, y;
+ gtk_widget_get_pointer(widget, &x, &y);
+ int tab = get_tab_under_cursor (DDB_TABSTRIP (widget), x);
+ int prev = deadbeef->plt_get_curr_idx ();
+ if (tab != -1 && tab != prev) {
+ deadbeef->plt_set_curr_idx (tab);
+ }
+ ts->pick_drag_timer = 0;
+ return FALSE;
+}
+
 gboolean
 on_tabstrip_drag_motion_event (GtkWidget *widget,
 GdkDragContext *drag_context,
@@ -1104,11 +1354,11 @@
 gint y,
 guint time)
 {
- int tab = get_tab_under_cursor (DDB_TABSTRIP (widget), x);
- int prev = deadbeef->plt_get_curr_idx ();
- if (tab != -1 && tab != prev) {
- gtkui_playlist_set_curr (tab);
+ DdbTabStrip *ts = DDB_TABSTRIP(widget);
+ if (ts->pick_drag_timer != 0) {
+ g_source_remove(ts->pick_drag_timer);
 }
+ ts->pick_drag_timer = g_timeout_add(500, _tabstrip_drag_pick, widget);
 
 GList *targets = gdk_drag_context_list_targets (drag_context);
 int cnt = g_list_length (targets);
@@ -1143,3 +1393,38 @@
 ddb_tabstrip_refresh (DdbTabStrip *ts) {
 gtk_widget_queue_draw (GTK_WIDGET (ts));
 }
+
+gboolean
+on_tabstrip_key_press_event (GtkWidget *widget,
+ GdkEventKey *event)
+{
+ switch (event->keyval) {
+ case GDK_Left:
+ tabstrip_scroll_left(DDB_TABSTRIP(widget));
+ return TRUE;
+ case GDK_Right:
+ tabstrip_scroll_right(DDB_TABSTRIP(widget));
+ return TRUE;
+ case GDK_F2:
+ {
+ int idx = deadbeef->plt_get_curr_idx ();
+ if (idx != -1) {
+ gtkui_rename_playlist_at_index(idx);
+ }
+ }
+ break;
+ }
+ return FALSE;
+}
+
+gboolean
+on_tabstrip_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event_crossing)
+{
+ DdbTabStrip *ts = DDB_TABSTRIP (widget);
+
+ ts->add_playlistbtn_hover = 0;
+ gtk_widget_queue_draw(widget);
+
+ return FALSE;
+}
+

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddbtabstrip.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddbtabstrip.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddbvolumebar.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddbvolumebar.c Changed

@@ -1,32 +1,53 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
 
- 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.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #include <string.h>
 #include "ddbvolumebar.h"
 #include "drawing.h"
 #include "gtkui.h"
 #include "interface.h"
 #include "support.h"
+#include <math.h>
 
 #define min(x,y) ((x)<(y)?(x):(y))
 
+struct _DdbVolumeBarPrivate
+{
+ DdbVolumeBarScale scale;
+};
+
 G_DEFINE_TYPE (DdbVolumeBar, ddb_volumebar, GTK_TYPE_WIDGET);
 
+#define DDB_VOLUMEBAR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
+ DDB_TYPE_VOLUMEBAR, DdbVolumeBarPrivate))
+
+/* Property identifiers */
+enum
+{
+ PROP_0,
+ PROP_SCALE_MODE,
+};
+
 static void
 ddb_volumebar_send_configure (DdbVolumeBar *darea)
 {
@@ -94,9 +115,69 @@
 gboolean
 on_volumebar_configure_event (GtkWidget *widget, GdkEventConfigure *event);
 
+GType
+ddb_volumebar_scale_mode_get_type (void)
+{
+ static GType type = G_TYPE_INVALID;
+
+ if (G_UNLIKELY (type == G_TYPE_INVALID))
+ {
+ static const GEnumValue values =
+ {
+ { DDB_VOLUMEBAR_SCALE_DB, "DDB_VOLUMEBAR_SCALE_DB", "dB Scale", },
+ { DDB_VOLUMEBAR_SCALE_LINEAR, "DDB_VOLUMEBAR_SCALE_LINEAR", "Linear scale", },
+ { DDB_VOLUMEBAR_SCALE_CUBIC, "DDB_VOLUMEBAR_SCALE_CUBIC", "Cubic scale", },
+ { 0, NULL, NULL, },
+ };
+
+ type = g_enum_register_static ("DdbVolumeBarScaleMode", values);
+ }
+
+ return type;
+}
+
+static void
+ddb_volumebar_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ DdbVolumeBar *vb = DDB_VOLUMEBAR (object);
+
+ switch (prop_id) {
+ case PROP_SCALE_MODE:
+ g_value_set_enum (value, ddb_volumebar_get_scale (vb));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+ddb_volumebar_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ DdbVolumeBar *vb = DDB_VOLUMEBAR (object);
+
+ switch (prop_id) {
+ case PROP_SCALE_MODE:
+ ddb_volumebar_set_scale (vb, g_value_get_enum (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
 static void
 ddb_volumebar_class_init(DdbVolumeBarClass *class)
 {
+ GObjectClass *gobject_class;
 GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 widget_class->size_allocate = ddb_volumebar_size_allocate;
 #if GTK_CHECK_VERSION(3,0,0)
@@ -109,9 +190,25 @@
 widget_class->motion_notify_event = on_volumebar_motion_notify_event;
 widget_class->scroll_event = on_volumebar_scroll_event;
 widget_class->configure_event = on_volumebar_configure_event;
+
+ /* add our private data to the class */
+ g_type_class_add_private (class, sizeof (DdbVolumeBarPrivate));
+ 
+ gobject_class = G_OBJECT_CLASS (class);
+ gobject_class->get_property = ddb_volumebar_get_property;
+ gobject_class->set_property = ddb_volumebar_set_property;
+
+
+ g_object_class_install_property (gobject_class,
+ PROP_SCALE_MODE,
+ g_param_spec_enum ("scale-mode",
+ "Scale mode",
+ "The scale mode of the volumebar widget",
+ ddb_volumebar_scale_mode_get_type(), DDB_VOLUMEBAR_SCALE_DB,
+ G_PARAM_READWRITE));
 }
 
-GtkWidget * ddb_volumebar_new() {
+GtkWidget * ddb_volumebar_new(void) {
 return g_object_new (DDB_TYPE_VOLUMEBAR, NULL);
 }
 
@@ -123,7 +220,8 @@
 snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
 gtk_widget_set_tooltip_text (GTK_WIDGET (volumebar), s);
 gtk_widget_set_has_window (GTK_WIDGET (volumebar), FALSE);
- gtk_widget_set_events (GTK_WIDGET (volumebar), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
+ volumebar->priv = DDB_VOLUMEBAR_GET_PRIVATE (volumebar);
+ volumebar->priv->scale = DDB_VOLUMEBAR_SCALE_DB;
 }
 
 void
@@ -138,17 +236,33 @@
 cairo_translate (cr, -allocation.x, -allocation.y);
 #endif
 
- float range = -deadbeef->volume_get_min_db ();
 GtkAllocation a;
 gtk_widget_get_allocation (widget, &a);
+
+ float range;
+ float vol;
 int n = a.width / 4;
- float vol = (range + deadbeef->volume_get_db ()) / range * n;
+
+ DdbVolumeBarScale scale = DDB_VOLUMEBAR(widget)->priv->scale;
+
+ switch (scale) {
+ case DDB_VOLUMEBAR_SCALE_LINEAR:
+ vol = (deadbeef->volume_get_amp () ) * n;
+ break;
+ case DDB_VOLUMEBAR_SCALE_CUBIC:
+ vol = (cbrt(deadbeef->volume_get_amp ()) ) * n;
+ break;
+ case DDB_VOLUMEBAR_SCALE_DB:
+ default:
+ range = -deadbeef->volume_get_min_db ();
+ vol = (range + deadbeef->volume_get_db ()) / range * n;
+ break;
+ }
+
 float h = 17;
 
 GdkColor clr_fg;
- GdkColor clr_bg;
 gtkui_get_bar_foreground_color (&clr_fg);
- gtkui_get_bar_background_color (&clr_bg);
 
 for (int i = 0; i < n; i++) {
 float iy = (float)i + 3;
@@ -163,24 +277,11 @@
 cairo_fill (cr);
 }
 else {
- cairo_set_source_rgb (cr, clr_bg.red/65535.f, clr_bg.green/65535.f, clr_bg.blue/65535.f);
+ cairo_set_source_rgba (cr, clr_fg.red/65535.f, clr_fg.green/65535.f, clr_fg.blue/65535.f, 0.3f);
 cairo_rectangle (cr, _x + a.x, _y + a.y, _w, _h);
 cairo_fill (cr);
 }
 }
-#if 0
- if (DDB_VOLUMEBAR (widget)->show_dbs) {
- draw_begin ((uintptr_t)gtk_widget_get_window(widget));
- draw_init_font (widget->style);
- char s100;
- int db = deadbeef->volume_get_db ();
- snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
- draw_text (widget->allocation.x, widget->allocation.y, widget->allocation.width, 0, s);
- gtk_widget_set_tooltip_text (widget, s);
- gtk_widget_trigger_tooltip_query (widget);
- draw_end ();
- }
-#endif
 }
 
 gboolean
@@ -201,6 +302,26 @@
 }
 #endif
 
+void
+ddb_volumebar_update(DdbVolumeBar *volumebar)
+{
+ gtk_widget_queue_draw (GTK_WIDGET (volumebar));
+ char s100;
+ if (volumebar->priv->scale == DDB_VOLUMEBAR_SCALE_DB) {
+ int db = deadbeef->volume_get_db ();
+ snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
+ } else {
+ float volume = deadbeef->volume_get_amp ();
+ if (volumebar->priv->scale == DDB_VOLUMEBAR_SCALE_CUBIC) {
+ volume = cbrt (volume);
+ }
+ int pct = (int)round (volume*100);
+ snprintf (s, sizeof (s), "%d%%", pct);
+ }
+ gtk_widget_set_tooltip_text (GTK_WIDGET (volumebar), s);
+ gtk_widget_trigger_tooltip_query (GTK_WIDGET (volumebar));
+}
+
 gboolean
 on_volumebar_motion_notify_event (GtkWidget *widget,
 GdkEventMotion *event)
@@ -208,21 +329,26 @@
 GtkAllocation a;
 gtk_widget_get_allocation (widget, &a);
 if (event->state & GDK_BUTTON1_MASK) {
- float range = -deadbeef->volume_get_min_db ();
- float volume = (event->x - a.x) / a.width * range - range;
- if (volume > 0) {
- volume = 0;
- }
- if (volume < -range) {
- volume = -range;
+ DdbVolumeBarScale scale = DDB_VOLUMEBAR(widget)->priv->scale;
+
+ if (scale == DDB_VOLUMEBAR_SCALE_DB) {
+ float range = -deadbeef->volume_get_min_db ();
+ float volume = (event->x - a.x) / a.width * range - range;
+ if (volume > 0) {
+ volume = 0;
+ }
+ if (volume < -range) {
+ volume = -range;
+ }
+ deadbeef->volume_set_db (volume);
+ } else {
+ float volume = (event->x - a.x) / a.width;
+ if (scale == DDB_VOLUMEBAR_SCALE_CUBIC) {
+ volume = volume * volume * volume;
+ }
+ deadbeef->volume_set_amp (volume);
 }
- deadbeef->volume_set_db (volume);
- char s100;
- int db = volume;
- snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
- gtk_widget_set_tooltip_text (widget, s);
- gtk_widget_trigger_tooltip_query (widget);
- gtk_widget_queue_draw (widget);
+ ddb_volumebar_update (DDB_VOLUMEBAR (widget));
 }
 return FALSE;
 }
@@ -234,22 +360,26 @@
 GtkAllocation a;
 gtk_widget_get_allocation (widget, &a);
 if (event->button == 1) {
- float range = -deadbeef->volume_get_min_db ();
- float volume = (event->x - a.x)/ a.width * range - range;
- if (volume < -range) {
- volume = -range;
+ DdbVolumeBarScale scale = DDB_VOLUMEBAR(widget)->priv->scale;
+
+ if (scale == DDB_VOLUMEBAR_SCALE_DB) {
+ float range = -deadbeef->volume_get_min_db ();
+ float volume = (event->x - a.x) / a.width * range - range;
+ if (volume > 0) {
+ volume = 0;
+ }
+ if (volume < -range) {
+ volume = -range;
+ }
+ deadbeef->volume_set_db (volume);
+ } else {
+ float volume = (event->x - a.x) / a.width;
+ if (scale == DDB_VOLUMEBAR_SCALE_CUBIC) {
+ volume = volume * volume * volume;
+ }
+ deadbeef->volume_set_amp (volume);
 }
- if (volume > 0) {
- volume = 0;
- }
- deadbeef->volume_set_db (volume);
- char s100;
- int db = volume;
- snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
- gtk_widget_set_tooltip_text (widget, s);
- gtk_widget_trigger_tooltip_query (widget);
-// DDB_VOLUMEBAR (widget)->show_dbs = 1;
- gtk_widget_queue_draw (widget);
+ ddb_volumebar_update (DDB_VOLUMEBAR (widget));
 }
 return FALSE;
 }
@@ -270,27 +400,50 @@
 on_volumebar_scroll_event (GtkWidget *widget,
 GdkEventScroll *event)
 {
- float range = -deadbeef->volume_get_min_db ();
- float vol = deadbeef->volume_get_db ();
- if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_RIGHT) {
- vol += 1;
- }
- else if (event->direction == GDK_SCROLL_DOWN || event->direction == GDK_SCROLL_LEFT) {
- vol -= 1;
- }
- if (vol > 0) {
- vol = 0;
- }
- else if (vol < -range) {
- vol = -range;
+ DdbVolumeBarScale scale = DDB_VOLUMEBAR(widget)->priv->scale;
+ if (scale == DDB_VOLUMEBAR_SCALE_DB) {
+ float range = -deadbeef->volume_get_min_db ();
+ float vol = deadbeef->volume_get_db ();
+ if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_RIGHT) {
+ vol += 1;
+ }
+ else if (event->direction == GDK_SCROLL_DOWN || event->direction == GDK_SCROLL_LEFT) {
+ vol -= 1;
+ }
+ if (vol > 0) {
+ vol = 0;
+ }
+ else if (vol < -range) {
+ vol = -range;
+ }
+ deadbeef->volume_set_db (vol);
+ } else {
+ float dbvol = deadbeef->volume_get_amp ();
+ if (scale == DDB_VOLUMEBAR_SCALE_CUBIC) {
+ dbvol = cbrt(dbvol);
+ }
+
+ int vol = (int)round(dbvol*100.0);
+
+ if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_RIGHT) {
+ vol += 5;
+ }
+ else if (event->direction == GDK_SCROLL_DOWN || event->direction == GDK_SCROLL_LEFT) {
+ vol -= 5;
+ }
+ if (vol > 100) {
+ vol = 100;
+ }
+ else if (vol < 0) {
+ vol = 0;
+ }
+ if (scale == DDB_VOLUMEBAR_SCALE_CUBIC) {
+ deadbeef->volume_set_amp (pow(vol/100.0,3));
+ } else {
+ deadbeef->volume_set_amp (vol/100.0);
+ }
 }
- deadbeef->volume_set_db (vol);
- gtk_widget_queue_draw (widget);
- char s100;
- int db = deadbeef->volume_get_db ();
- snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
- gtk_widget_set_tooltip_text (widget, s);
- gtk_widget_trigger_tooltip_query (widget);
+ ddb_volumebar_update (DDB_VOLUMEBAR (widget));
 return FALSE;
 }
 
@@ -347,3 +500,21 @@
 vb);
 }
 
+DdbVolumeBarScale
+ddb_volumebar_get_scale (const DdbVolumeBar *volumebar)
+{
+ g_return_val_if_fail (DDB_IS_VOLUMEBAR (volumebar), DDB_VOLUMEBAR_SCALE_DB);
+ return volumebar->priv->scale;
+}
+
+void
+ddb_volumebar_set_scale (DdbVolumeBar *volumebar, DdbVolumeBarScale scale)
+{
+ g_return_if_fail (DDB_IS_VOLUMEBAR (volumebar));
+
+ if (G_LIKELY (volumebar->priv->scale != scale)) {
+ volumebar->priv->scale = scale;
+ gtk_widget_queue_resize (GTK_WIDGET (volumebar));
+ g_object_notify (G_OBJECT (volumebar), "scale_mode");
+ }
+}

deadbeef-0.6.2.tar.bz2/plugins/gtkui/ddbvolumebar.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/ddbvolumebar.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/deadbeef.glade -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/deadbeef.glade Changed

@@ -58,7 +58,7 @@
 		 <signal name="activate" handler="on_open_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/>
 
 		 <child internal-child="image">
-			<widget class="GtkImage" id="image663">
+			<widget class="GtkImage" id="image679">
 			 <property name="visible">True</property>
 			 <property name="stock">gtk-open</property>
 			 <property name="icon_size">1</property>
@@ -85,7 +85,7 @@
 		 <signal name="activate" handler="on_add_files_activate" last_modification_time="Sat, 04 Jul 2009 13:04:01 GMT"/>
 
 		 <child internal-child="image">
-			<widget class="GtkImage" id="image664">
+			<widget class="GtkImage" id="image680">
 			 <property name="visible">True</property>
 			 <property name="stock">gtk-add</property>
 			 <property name="icon_size">1</property>
@@ -106,7 +106,7 @@
 		 <signal name="activate" handler="on_add_folders_activate" last_modification_time="Sun, 06 Sep 2009 17:51:40 GMT"/>
 
 		 <child internal-child="image">
-			<widget class="GtkImage" id="image665">
+			<widget class="GtkImage" id="image681">
 			 <property name="visible">True</property>
 			 <property name="stock">gtk-add</property>
 			 <property name="icon_size">1</property>
@@ -175,7 +175,7 @@
 		 <signal name="activate" handler="on_quit_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/>
 
 		 <child internal-child="image">
-			<widget class="GtkImage" id="image666">
+			<widget class="GtkImage" id="image682">
 			 <property name="visible">True</property>
 			 <property name="stock">gtk-quit</property>
 			 <property name="icon_size">1</property>
@@ -209,7 +209,7 @@
 		 <signal name="activate" handler="on_clear1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/>
 
 		 <child internal-child="image">
-			<widget class="GtkImage" id="image667">
+			<widget class="GtkImage" id="image683">
 			 <property name="visible">True</property>
 			 <property name="stock">gtk-clear</property>
 			 <property name="icon_size">1</property>
@@ -266,7 +266,7 @@
 			 <signal name="activate" handler="on_remove1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/>
 
 			 <child internal-child="image">
-				<widget class="GtkImage" id="image668">
+				<widget class="GtkImage" id="image684">
 				 <property name="visible">True</property>
 				 <property name="stock">gtk-remove</property>
 				 <property name="icon_size">1</property>
@@ -434,6 +434,16 @@
 		 <signal name="activate" handler="on_design_mode1_activate" last_modification_time="Fri, 17 Jun 2011 19:10:50 GMT"/>
 		 </widget>
 		 </child>
+
+		 <child>
+		 <widget class="GtkCheckMenuItem" id="view_log">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">Log</property>
+		 <property name="use_underline">True</property>
+		 <property name="active">False</property>
+		 <signal name="activate" handler="on_view_log_activate" last_modification_time="Thu, 06 Apr 2017 17:39:44 GMT"/>
+		 </widget>
+		 </child>
 		</widget>
 	 </child>
 	 </widget>
@@ -451,7 +461,7 @@
 		 <child>
 		 <widget class="GtkMenuItem" id="Order">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Order</property>
+		 <property name="label" translatable="yes">Shuffle</property>
 		 <property name="use_underline">True</property>
 
 		 <child>
@@ -460,7 +470,7 @@
 			 <child>
 			 <widget class="GtkRadioMenuItem" id="order_linear">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Linear</property>
+			 <property name="label" translatable="yes">Off</property>
 			 <property name="use_underline">True</property>
 			 <property name="active">True</property>
 			 <signal name="activate" handler="on_order_linear_activate" last_modification_time="Sat, 08 Aug 2009 12:26:33 GMT"/>
@@ -470,7 +480,7 @@
 			 <child>
 			 <widget class="GtkRadioMenuItem" id="order_shuffle">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Shuffle tracks</property>
+			 <property name="label" translatable="yes">Tracks</property>
 			 <property name="use_underline">True</property>
 			 <property name="active">True</property>
 			 <property name="group">order_linear</property>
@@ -481,7 +491,7 @@
 			 <child>
 			 <widget class="GtkRadioMenuItem" id="order_shuffle_albums">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Shuffle albums</property>
+			 <property name="label" translatable="yes">Albums</property>
 			 <property name="use_underline">True</property>
 			 <property name="active">True</property>
 			 <property name="group">order_linear</property>
@@ -492,7 +502,7 @@
 			 <child>
 			 <widget class="GtkRadioMenuItem" id="order_random">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Random</property>
+			 <property name="label" translatable="yes">Random Tracks</property>
 			 <property name="use_underline">True</property>
 			 <property name="active">True</property>
 			 <property name="group">order_linear</property>
@@ -507,7 +517,7 @@
 		 <child>
 		 <widget class="GtkMenuItem" id="Looping">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Looping</property>
+		 <property name="label" translatable="yes">Repeat</property>
 		 <property name="use_underline">True</property>
 
 		 <child>
@@ -516,7 +526,7 @@
 			 <child>
 			 <widget class="GtkRadioMenuItem" id="loop_all">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Loop all</property>
+			 <property name="label" translatable="yes">All Tracks</property>
 			 <property name="use_underline">True</property>
 			 <property name="active">True</property>
 			 <signal name="activate" handler="on_loop_all_activate" last_modification_time="Sat, 08 Aug 2009 12:26:33 GMT"/>
@@ -526,7 +536,7 @@
 			 <child>
 			 <widget class="GtkRadioMenuItem" id="loop_single">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Loop single song</property>
+			 <property name="label" translatable="yes">One Track</property>
 			 <property name="use_underline">True</property>
 			 <property name="active">True</property>
 			 <property name="group">loop_all</property>
@@ -537,7 +547,7 @@
 			 <child>
 			 <widget class="GtkRadioMenuItem" id="loop_disable">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Don't loop</property>
+			 <property name="label" translatable="yes">Off</property>
 			 <property name="use_underline">True</property>
 			 <property name="active">True</property>
 			 <property name="group">loop_all</property>
@@ -625,7 +635,7 @@
 		 <signal name="activate" handler="on_help1_activate" last_modification_time="Tue, 08 Sep 2009 17:32:06 GMT"/>
 
 		 <child internal-child="image">
-			<widget class="GtkImage" id="image669">
+			<widget class="GtkImage" id="image685">
 			 <property name="visible">True</property>
 			 <property name="stock">gtk-help</property>
 			 <property name="icon_size">1</property>
@@ -685,7 +695,7 @@
 		 <signal name="activate" handler="on_about1_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/>
 
 		 <child internal-child="image">
-			<widget class="GtkImage" id="image670">
+			<widget class="GtkImage" id="image686">
 			 <property name="visible">True</property>
 			 <property name="stock">gtk-about</property>
 			 <property name="icon_size">1</property>
@@ -706,7 +716,7 @@
 		 <signal name="activate" handler="on_translators1_activate" last_modification_time="Sun, 19 Sep 2010 13:38:07 GMT"/>
 
 		 <child internal-child="image">
-			<widget class="GtkImage" id="image671">
+			<widget class="GtkImage" id="image687">
 			 <property name="visible">True</property>
 			 <property name="stock">gtk-about</property>
 			 <property name="icon_size">1</property>
@@ -1173,7 +1183,7 @@
 <signal name="window_state_event" handler="on_trackproperties_window_state_event" last_modification_time="Thu, 10 Mar 2011 11:08:02 GMT"/>
 
 <child>
- <widget class="GtkNotebook" id="notebook3">
+ <widget class="GtkNotebook" id="trkproperties_notebook">
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="show_tabs">True</property>
@@ -2003,17 +2013,7 @@
 	 <child>
 		<widget class="GtkComboBox" id="id">
 		 <property name="visible">True</property>
-		 <property name="items" translatable="yes">Item Index
-Playing
-Album Art
-Artist - Album
-Artist
-Album
-Title
-Duration
-Track Number
-Band / Album Artist
-Custom</property>
+		 <property name="items" translatable="yes"></property>
 		 <property name="add_tearoffs">False</property>
 		 <property name="focus_on_click">True</property>
 		 <signal name="changed" handler="on_column_id_changed" last_modification_time="Mon, 04 Jan 2010 17:31:44 GMT"/>
@@ -2098,7 +2098,7 @@
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
-		 <property name="expand">True</property>
+		 <property name="expand">False</property>
 		 <property name="fill">True</property>
 		 </packing>
 		 </child>
@@ -2118,6 +2118,88 @@
 	 </child>
 
 	 <child>
+	 <widget class="GtkHBox" id="hbox141">
+	 <property name="visible">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">8</property>
+
+	 <child>
+		<widget class="GtkLabel" id="label164">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">Sort format:</property>
+		 <property name="use_underline">False</property>
+		 <property name="use_markup">False</property>
+		 <property name="justify">GTK_JUSTIFY_LEFT</property>
+		 <property name="wrap">False</property>
+		 <property name="selectable">False</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xpad">0</property>
+		 <property name="ypad">0</property>
+		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		 <property name="width_chars">-1</property>
+		 <property name="single_line_mode">False</property>
+		 <property name="angle">0</property>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkEntry" id="sort_format">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="editable">True</property>
+		 <property name="visibility">True</property>
+		 <property name="max_length">0</property>
+		 <property name="text" translatable="yes"></property>
+		 <property name="has_frame">True</property>
+		 <property name="invisible_char">•</property>
+		 <property name="activates_default">False</property>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">True</property>
+		 <property name="fill">True</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkLabel" id="label165">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">(if non-empty)</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">True</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
+
+	 <child>
 	 <widget class="GtkHBox" id="hbox32">
 	 <property name="visible">True</property>
 	 <property name="homogeneous">False</property>
@@ -2152,7 +2234,8 @@
 		<widget class="GtkComboBox" id="align">
 		 <property name="visible">True</property>
 		 <property name="items" translatable="yes">Left
-Right</property>
+Right
+Center</property>
 		 <property name="add_tearoffs">False</property>
 		 <property name="focus_on_click">True</property>
 		</widget>
@@ -2169,6 +2252,52 @@
 	 <property name="fill">False</property>
 	 </packing>
 	 </child>
+
+	 <child>
+	 <widget class="GtkHBox" id="hbox138">
+	 <property name="visible">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">8</property>
+
+	 <child>
+		<widget class="GtkCheckButton" id="color_override">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Text color:</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkColorButton" id="color">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="use_alpha">False</property>
+		 <property name="focus_on_click">True</property>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">True</property>
+		 <property name="fill">True</property>
+		</packing>
+	 </child>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
 	</widget>
 	<packing>
 	 <property name="padding">0</property>
@@ -2181,7 +2310,7 @@
 </widget>
 
 <widget class="GtkDialog" id="prefwin">
- <property name="border_width">12</property>
+ <property name="border_width">6</property>
 <property name="visible">True</property>
 <property name="title" translatable="yes">Preferences</property>
 <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -2200,6 +2329,7 @@
 <signal name="configure_event" handler="on_prefwin_configure_event" last_modification_time="Thu, 10 Mar 2011 11:14:37 GMT"/>
 <signal name="window_state_event" handler="on_prefwin_window_state_event" last_modification_time="Thu, 10 Mar 2011 11:14:42 GMT"/>
 <signal name="realize" handler="on_prefwin_realize" last_modification_time="Thu, 10 Mar 2011 11:20:24 GMT"/>
+ <signal name="key_press_event" handler="on_prefwin_key_press_event" last_modification_time="Mon, 26 Oct 2015 13:11:35 GMT"/>
 
 <child internal-child="vbox">
 <widget class="GtkVBox" id="dialog-vbox2">
@@ -2235,6 +2365,7 @@
 
 <child>
 	<widget class="GtkNotebook" id="notebook">
+	 <property name="border_width">6</property>
 	 <property name="visible">True</property>
 	 <property name="can_focus">True</property>
 	 <property name="show_tabs">True</property>
@@ -2283,6 +2414,7 @@
 
 		 <child>
 		 <widget class="GtkComboBox" id="pref_output_plugin">
+		 <property name="border_width">1</property>
 		 <property name="visible">True</property>
 		 <property name="add_tearoffs">False</property>
 		 <property name="focus_on_click">True</property>
@@ -2391,59 +2523,23 @@
 		 <property name="fill">False</property>
 		</packing>
 	 </child>
-	 </widget>
-	 <packing>
-	 <property name="tab_expand">False</property>
-	 <property name="tab_fill">True</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkLabel" id="Sound">
-	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Sound</property>
-	 <property name="use_underline">False</property>
-	 <property name="use_markup">False</property>
-	 <property name="justify">GTK_JUSTIFY_LEFT</property>
-	 <property name="wrap">False</property>
-	 <property name="selectable">False</property>
-	 <property name="xalign">0.5</property>
-	 <property name="yalign">0.5</property>
-	 <property name="xpad">0</property>
-	 <property name="ypad">0</property>
-	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	 <property name="width_chars">-1</property>
-	 <property name="single_line_mode">False</property>
-	 <property name="angle">0</property>
-	 </widget>
-	 <packing>
-	 <property name="type">tab</property>
-	 </packing>
-	 </child>
-
-	 <child>
-	 <widget class="GtkVBox" id="vbox8">
-	 <property name="border_width">12</property>
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">8</property>
 
 	 <child>
-		<widget class="GtkHBox" id="hbox10">
+		<widget class="GtkHBox" id="hbox151">
 		 <property name="visible">True</property>
 		 <property name="homogeneous">False</property>
 		 <property name="spacing">8</property>
 
 		 <child>
-		 <widget class="GtkLabel" id="label8">
+		 <widget class="GtkLabel" id="label_bit_override">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Replaygain mode:</property>
+		 <property name="label" translatable="yes">Override bit depth:</property>
 		 <property name="use_underline">False</property>
 		 <property name="use_markup">False</property>
 		 <property name="justify">GTK_JUSTIFY_LEFT</property>
 		 <property name="wrap">False</property>
 		 <property name="selectable">False</property>
-		 <property name="xalign">0</property>
+		 <property name="xalign">0.5</property>
 		 <property name="yalign">0.5</property>
 		 <property name="xpad">0</property>
 		 <property name="ypad">0</property>
@@ -2460,15 +2556,17 @@
 		 </child>
 
 		 <child>
-		 <widget class="GtkComboBox" id="pref_replaygain_mode">
-		 <property name="width_request">337</property>
+		 <widget class="GtkComboBox" id="combo_bit_override">
 		 <property name="visible">True</property>
-		 <property name="items" translatable="yes">Disable
-Track
-Album</property>
+		 <property name="items" translatable="yes">Disabled
+8 bit
+16 bit
+24 bit
+32 bit
+32 bit float</property>
 		 <property name="add_tearoffs">False</property>
 		 <property name="focus_on_click">True</property>
-		 <signal name="changed" handler="on_pref_replaygain_mode_changed" last_modification_time="Sat, 10 Oct 2009 19:22:23 GMT"/>
+		 <signal name="changed" handler="on_combo_bit_override_changed" last_modification_time="Fri, 26 May 2023 09:50:38 GMT"/>
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
@@ -2480,160 +2578,725 @@
 		<packing>
 		 <property name="padding">0</property>
 		 <property name="expand">False</property>
-		 <property name="fill">False</property>
+		 <property name="fill">True</property>
 		</packing>
 	 </child>
 
 	 <child>
-		<widget class="GtkCheckButton" id="pref_replaygain_scale">
+		<widget class="GtkFrame" id="frame15">
 		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Replaygain peak scale</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <property name="active">False</property>
-		 <property name="inconsistent">False</property>
-		 <property name="draw_indicator">True</property>
-		 <signal name="clicked" handler="on_pref_replaygain_scale_clicked" last_modification_time="Sat, 10 Oct 2009 18:52:10 GMT"/>
+		 <property name="label_xalign">0</property>
+		 <property name="label_yalign">0.5</property>
+		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		 <child>
+		 <widget class="GtkAlignment" id="alignment31">
+		 <property name="visible">True</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xscale">1</property>
+		 <property name="yscale">1</property>
+		 <property name="top_padding">8</property>
+		 <property name="bottom_padding">0</property>
+		 <property name="left_padding">12</property>
+		 <property name="right_padding">0</property>
+
+		 <child>
+			<widget class="GtkVBox" id="vbox52">
+			 <property name="visible">True</property>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">0</property>
+
+			 <child>
+			 <widget class="GtkHBox" id="hbox145">
+			 <property name="visible">True</property>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">8</property>
+
+			 <child>
+				<widget class="GtkLabel" id="label_direct_sr">
+				 <property name="visible">True</property>
+				 <property name="label" translatable="yes">Target samplerate:</property>
+				 <property name="use_underline">False</property>
+				 <property name="use_markup">False</property>
+				 <property name="justify">GTK_JUSTIFY_LEFT</property>
+				 <property name="wrap">False</property>
+				 <property name="selectable">False</property>
+				 <property name="xalign">0.5</property>
+				 <property name="yalign">0.5</property>
+				 <property name="xpad">0</property>
+				 <property name="ypad">0</property>
+				 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				 <property name="width_chars">-1</property>
+				 <property name="single_line_mode">False</property>
+				 <property name="angle">0</property>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">False</property>
+				 <property name="fill">False</property>
+				</packing>
+			 </child>
+
+			 <child>
+				<widget class="GtkComboBoxEntry" id="comboboxentry_direct_sr">
+				 <property name="visible">True</property>
+				 <property name="items">44100
+48000
+88200
+96000
+176400
+192000</property>
+				 <property name="add_tearoffs">False</property>
+				 <property name="has_frame">True</property>
+				 <property name="focus_on_click">True</property>
+				 <signal name="changed" handler="on_comboboxentry_direct_sr_changed" last_modification_time="Tue, 06 Feb 2018 19:22:54 GMT"/>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">False</property>
+				 <property name="fill">False</property>
+				</packing>
+			 </child>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkFrame" id="frame16">
+			 <property name="border_width">8</property>
+			 <property name="visible">True</property>
+			 <property name="label_xalign">0</property>
+			 <property name="label_yalign">0.5</property>
+			 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+			 <child>
+				<widget class="GtkAlignment" id="alignment32">
+				 <property name="border_width">8</property>
+				 <property name="visible">True</property>
+				 <property name="xalign">0.5</property>
+				 <property name="yalign">0.5</property>
+				 <property name="xscale">1</property>
+				 <property name="yscale">1</property>
+				 <property name="top_padding">0</property>
+				 <property name="bottom_padding">0</property>
+				 <property name="left_padding">12</property>
+				 <property name="right_padding">0</property>
+
+				 <child>
+				 <widget class="GtkVBox" id="vbox53">
+				 <property name="visible">True</property>
+				 <property name="homogeneous">False</property>
+				 <property name="spacing">8</property>
+
+				 <child>
+					<widget class="GtkHBox" id="hbox147">
+					 <property name="visible">True</property>
+					 <property name="homogeneous">False</property>
+					 <property name="spacing">8</property>
+
+					 <child>
+					 <widget class="GtkLabel" id="label_sr_mult_48">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">For multiples of 48KHz (96K, 192K, ...):</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">1</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="GtkComboBoxEntry" id="comboboxentry_sr_mult_48">
+					 <property name="visible">True</property>
+					 <property name="items">44100
+48000
+88200
+96000
+176400
+192000</property>
+					 <property name="add_tearoffs">False</property>
+					 <property name="has_frame">True</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="changed" handler="on_comboboxentry_sr_mult_48_changed" last_modification_time="Tue, 06 Feb 2018 19:23:01 GMT"/>
+					 </widget>
+					 <packing>
+					 <property name="padding">0</property>
+					 <property name="expand">False</property>
+					 <property name="fill">False</property>
+					 </packing>
+					 </child>
+					</widget>
+					<packing>
+					 <property name="padding">0</property>
+					 <property name="expand">True</property>
+					 <property name="fill">True</property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkHBox" id="hbox148">
+					 <property name="visible">True</property>
+					 <property name="homogeneous">False</property>
+					 <property name="spacing">8</property>
+
+					 <child>
+					 <widget class="GtkLabel" id="label_sr_mult_44">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">For multiples of 44.1KHz (88.2K, 176.4K, ...):</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">1</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="GtkComboBoxEntry" id="comboboxentry_sr_mult_44">
+					 <property name="visible">True</property>
+					 <property name="items">44100
+48000
+88200
+96000
+176400
+192000</property>
+					 <property name="add_tearoffs">False</property>
+					 <property name="has_frame">True</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="changed" handler="on_comboboxentry_sr_mult_44_changed" last_modification_time="Tue, 06 Feb 2018 19:23:06 GMT"/>
+					 </widget>
+					 <packing>
+					 <property name="padding">0</property>
+					 <property name="expand">False</property>
+					 <property name="fill">False</property>
+					 </packing>
+					 </child>
+					</widget>
+					<packing>
+					 <property name="padding">0</property>
+					 <property name="expand">True</property>
+					 <property name="fill">True</property>
+					</packing>
+				 </child>
+				 </widget>
+				 </child>
+				</widget>
+			 </child>
+
+			 <child>
+				<widget class="GtkCheckButton" id="checkbutton_dependent_sr">
+				 <property name="visible">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="label" translatable="yes">Based on input samplerate</property>
+				 <property name="use_underline">True</property>
+				 <property name="relief">GTK_RELIEF_NORMAL</property>
+				 <property name="focus_on_click">True</property>
+				 <property name="active">False</property>
+				 <property name="inconsistent">False</property>
+				 <property name="draw_indicator">True</property>
+				 <signal name="toggled" handler="on_checkbutton_dependent_sr_toggled" last_modification_time="Tue, 06 Feb 2018 20:22:52 GMT"/>
+				</widget>
+				<packing>
+				 <property name="type">label_item</property>
+				</packing>
+			 </child>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			 </packing>
+			 </child>
+			</widget>
+		 </child>
+		 </widget>
+		 </child>
+
+		 <child>
+		 <widget class="GtkCheckButton" id="checkbutton_sr_override">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Override samplerate</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		 <signal name="toggled" handler="on_checkbutton_sr_override_toggled" last_modification_time="Tue, 06 Feb 2018 19:48:35 GMT"/>
+		 </widget>
+		 <packing>
+		 <property name="type">label_item</property>
+		 </packing>
+		 </child>
 		</widget>
 		<packing>
 		 <property name="padding">0</property>
 		 <property name="expand">False</property>
-		 <property name="fill">False</property>
+		 <property name="fill">True</property>
 		</packing>
 	 </child>
+	 </widget>
+	 <packing>
+	 <property name="tab_expand">False</property>
+	 <property name="tab_fill">True</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkLabel" id="Sound">
+	 <property name="visible">True</property>
+	 <property name="label" translatable="yes">Sound</property>
+	 <property name="use_underline">False</property>
+	 <property name="use_markup">False</property>
+	 <property name="justify">GTK_JUSTIFY_LEFT</property>
+	 <property name="wrap">False</property>
+	 <property name="selectable">False</property>
+	 <property name="xalign">0.5</property>
+	 <property name="yalign">0.5</property>
+	 <property name="xpad">0</property>
+	 <property name="ypad">0</property>
+	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	 <property name="width_chars">-1</property>
+	 <property name="single_line_mode">False</property>
+	 <property name="angle">0</property>
+	 </widget>
+	 <packing>
+	 <property name="type">tab</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkVBox" id="vbox8">
+	 <property name="border_width">12</property>
+	 <property name="visible">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">8</property>
 
 	 <child>
-		<widget class="GtkTable" id="table1">
+		<widget class="GtkFrame" id="frame14">
 		 <property name="visible">True</property>
-		 <property name="n_rows">2</property>
-		 <property name="n_columns">2</property>
-		 <property name="homogeneous">False</property>
-		 <property name="row_spacing">0</property>
-		 <property name="column_spacing">8</property>
+		 <property name="label_xalign">0</property>
+		 <property name="label_yalign">0.5</property>
+		 <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		 <child>
-		 <widget class="GtkHBox" id="hbox100">
+		 <widget class="GtkAlignment" id="alignment30">
 		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">8</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xscale">1</property>
+		 <property name="yscale">1</property>
+		 <property name="top_padding">0</property>
+		 <property name="bottom_padding">0</property>
+		 <property name="left_padding">12</property>
+		 <property name="right_padding">0</property>
 
 		 <child>
-			<widget class="GtkLabel" id="label125">
+			<widget class="GtkVBox" id="vbox48">
 			 <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>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">8</property>
 
-		 <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="GtkHBox" id="hbox10">
+			 <property name="visible">True</property>
+			 <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="label8">
+				 <property name="visible">True</property>
+				 <property name="label" translatable="yes">Source mode:</property>
+				 <property name="use_underline">False</property>
+				 <property name="use_markup">False</property>
+				 <property name="justify">GTK_JUSTIFY_LEFT</property>
+				 <property name="wrap">False</property>
+				 <property name="selectable">False</property>
+				 <property name="xalign">0</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="GtkComboBox" id="pref_replaygain_source_mode">
+				 <property name="width_request">337</property>
+				 <property name="visible">True</property>
+				 <property name="items" translatable="yes">By playback order
+Track
+Album</property>
+				 <property name="add_tearoffs">False</property>
+				 <property name="focus_on_click">True</property>
+				 <signal name="changed" handler="on_pref_replaygain_source_mode_changed" last_modification_time="Mon, 02 Jan 2017 07:39:18 GMT"/>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">True</property>
+				 <property name="fill">True</property>
+				</packing>
+			 </child>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkHBox" id="hbox139">
+			 <property name="visible">True</property>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">8</property>
+
+			 <child>
+				<widget class="GtkLabel" id="label163">
+				 <property name="visible">True</property>
+				 <property name="label" translatable="yes">Processing:</property>
+				 <property name="use_underline">False</property>
+				 <property name="use_markup">False</property>
+				 <property name="justify">GTK_JUSTIFY_LEFT</property>
+				 <property name="wrap">False</property>
+				 <property name="selectable">False</property>
+				 <property name="xalign">0</property>
+				 <property name="yalign">0.5</property>
+				 <property name="xpad">0</property>
+				 <property name="ypad">0</property>
+				 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				 <property name="width_chars">-1</property>
+				 <property name="single_line_mode">False</property>
+				 <property name="angle">0</property>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">False</property>
+				 <property name="fill">False</property>
+				</packing>
+			 </child>
+
+			 <child>
+				<widget class="GtkComboBox" id="pref_replaygain_processing">
+				 <property name="width_request">337</property>
+				 <property name="visible">True</property>
+				 <property name="items" translatable="yes">None
+Apply gain
+Apply gain and prevent clipping according to peak
+Only prevent clipping</property>
+				 <property name="add_tearoffs">False</property>
+				 <property name="focus_on_click">True</property>
+				 <signal name="changed" handler="on_pref_replaygain_processing_changed" last_modification_time="Mon, 02 Jan 2017 07:39:32 GMT"/>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">True</property>
+				 <property name="fill">True</property>
+				</packing>
+			 </child>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="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="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">
+				 <property name="visible">True</property>
+				 <property name="label" translatable="yes">Preamp with RG info:</property>
+				 <property name="use_underline">False</property>
+				 <property name="use_markup">False</property>
+				 <property name="justify">GTK_JUSTIFY_LEFT</property>
+				 <property name="wrap">False</property>
+				 <property name="selectable">False</property>
+				 <property name="xalign">0</property>
+				 <property name="yalign">0.5</property>
+				 <property name="xpad">0</property>
+				 <property name="ypad">0</property>
+				 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				 <property name="width_chars">-1</property>
+				 <property name="single_line_mode">False</property>
+				 <property name="angle">0</property>
+				</widget>
+				<packing>
+				 <property name="left_attach">0</property>
+				 <property name="right_attach">1</property>
+				 <property name="top_attach">0</property>
+				 <property name="bottom_attach">1</property>
+				 <property name="x_options">fill</property>
+				 <property name="y_options"></property>
+				</packing>
+			 </child>
+
+			 <child>
+				<widget class="GtkLabel" id="label124a">
+				 <property name="visible">True</property>
+				 <property name="label" translatable="yes">Preamp without RG info:</property>
+				 <property name="use_underline">False</property>
+				 <property name="use_markup">False</property>
+				 <property name="justify">GTK_JUSTIFY_LEFT</property>
+				 <property name="wrap">False</property>
+				 <property name="selectable">False</property>
+				 <property name="xalign">0</property>
+				 <property name="yalign">0.5</property>
+				 <property name="xpad">0</property>
+				 <property name="ypad">0</property>
+				 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				 <property name="width_chars">-1</property>
+				 <property name="single_line_mode">False</property>
+				 <property name="angle">0</property>
+				</widget>
+				<packing>
+				 <property name="left_attach">0</property>
+				 <property name="right_attach">1</property>
+				 <property name="top_attach">1</property>
+				 <property name="bottom_attach">2</property>
+				 <property name="x_options">fill</property>
+				 <property name="y_options"></property>
+				</packing>
+			 </child>
+
+			 <child>
+				<widget class="GtkHBox" id="hbox100a">
+				 <property name="visible">True</property>
+				 <property name="homogeneous">False</property>
+				 <property name="spacing">8</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="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>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			 </packing>
+			 </child>
 			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">False</property>
-			 <property name="fill">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">
+		 <widget class="GtkLabel" id="label162">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Replaygain preamp:</property>
+		 <property name="label" translatable="yes">&lt;b&gt;ReplayGain&lt;/b&gt;</property>
 		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
-		 <property name="justify">GTK_JUSTIFY_LEFT</property>
-		 <property name="wrap">False</property>
-		 <property name="selectable">False</property>
-		 <property name="xalign">0</property>
-		 <property name="yalign">0.5</property>
-		 <property name="xpad">0</property>
-		 <property name="ypad">0</property>
-		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		 <property name="width_chars">-1</property>
-		 <property name="single_line_mode">False</property>
-		 <property name="angle">0</property>
-		 </widget>
-		 <packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">0</property>
-		 <property name="bottom_attach">1</property>
-		 <property name="x_options">fill</property>
-		 <property name="y_options"></property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkLabel" id="label124a">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Global preamp:</property>
-		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
+		 <property name="use_markup">True</property>
 		 <property name="justify">GTK_JUSTIFY_LEFT</property>
 		 <property name="wrap">False</property>
 		 <property name="selectable">False</property>
-		 <property name="xalign">0</property>
+		 <property name="xalign">0.5</property>
 		 <property name="yalign">0.5</property>
 		 <property name="xpad">0</property>
 		 <property name="ypad">0</property>
@@ -2643,97 +3306,7 @@
 		 <property name="angle">0</property>
 		 </widget>
 		 <packing>
-		 <property name="left_attach">0</property>
-		 <property name="right_attach">1</property>
-		 <property name="top_attach">1</property>
-		 <property name="bottom_attach">2</property>
-		 <property name="x_options">fill</property>
-		 <property name="y_options"></property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkHBox" id="hbox100a">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">8</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="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>
+		 <property name="type">label_item</property>
 		 </packing>
 		 </child>
 		</widget>
@@ -2914,96 +3487,47 @@
 	 <property name="spacing">8</property>
 
 	 <child>
-		<widget class="GtkHBox" id="hbox80">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">True</property>
-		 <property name="spacing">8</property>
-
-		 <child>
-		 <widget class="GtkButton" id="dsp_add">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label">gtk-add</property>
-		 <property name="use_stock">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="clicked" handler="on_dsp_add_clicked" last_modification_time="Wed, 29 Dec 2010 11:54:39 GMT"/>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkButton" id="dsp_remove">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label">gtk-remove</property>
-		 <property name="use_stock">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="clicked" handler="on_dsp_remove_clicked" last_modification_time="Wed, 29 Dec 2010 11:54:43 GMT"/>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
-
-		 <child>
-		 <widget class="GtkButton" id="dsp_configure">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Configure</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="clicked" handler="on_dsp_configure_clicked" last_modification_time="Wed, 29 Dec 2010 11:54:47 GMT"/>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
-
-	 <child>
-		<widget class="GtkHBox" id="hbox81">
+		<widget class="GtkVBox" id="vbox58">
 		 <property name="visible">True</property>
 		 <property name="homogeneous">False</property>
-		 <property name="spacing">8</property>
+		 <property name="spacing">0</property>
 
 		 <child>
-		 <widget class="GtkScrolledWindow" id="scrolledwindow7">
+		 <widget class="GtkHBox" id="hbox81">
 		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		 <property name="shadow_type">GTK_SHADOW_IN</property>
-		 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">8</property>
 
 		 <child>
-			<widget class="GtkTreeView" id="dsp_listview">
+			<widget class="GtkScrolledWindow" id="scrolledwindow7">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
-			 <property name="headers_visible">False</property>
-			 <property name="rules_hint">False</property>
-			 <property name="reorderable">False</property>
-			 <property name="enable_search">True</property>
-			 <property name="fixed_height_mode">False</property>
-			 <property name="hover_selection">False</property>
-			 <property name="hover_expand">False</property>
+			 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			 <property name="shadow_type">GTK_SHADOW_IN</property>
+			 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+			 <child>
+			 <widget class="GtkTreeView" id="dsp_listview">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+			 <property name="headers_visible">False</property>
+			 <property name="rules_hint">False</property>
+			 <property name="reorderable">False</property>
+			 <property name="enable_search">True</property>
+			 <property name="fixed_height_mode">False</property>
+			 <property name="hover_selection">False</property>
+			 <property name="hover_expand">False</property>
+			 <signal name="row_activated" handler="on_dsp_listview_row_activated" last_modification_time="Sun, 05 Dec 2021 18:50:41 GMT"/>
+			 </widget>
+			 </child>
 			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			</packing>
 		 </child>
 		 </widget>
 		 <packing>
@@ -3014,131 +3538,206 @@
 		 </child>
 
 		 <child>
-		 <widget class="GtkVBox" id="vbox30">
+		 <widget class="GtkToolbar" id="dsp_toolbar">
 		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">8</property>
+		 <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+		 <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
+		 <property name="tooltips">True</property>
+		 <property name="show_arrow">False</property>
 
 		 <child>
-			<widget class="GtkButton" id="dsp_up">
+			<widget class="GtkToggleToolButton" id="dsp_add_toolbtn">
 			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label">gtk-go-up</property>
-			 <property name="use_stock">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <signal name="clicked" handler="on_dsp_up_clicked" last_modification_time="Wed, 29 Dec 2010 11:54:52 GMT"/>
+			 <property name="label" translatable="yes"></property>
+			 <property name="use_underline">True</property>
+			 <property name="stock_id">gtk-add</property>
+			 <property name="visible_horizontal">True</property>
+			 <property name="visible_vertical">True</property>
+			 <property name="is_important">False</property>
+			 <property name="active">False</property>
+			 <signal name="toggled" handler="on_dsp_add_toolbtn_toggled" last_modification_time="Sun, 05 Dec 2021 20:46:47 GMT"/>
 			</widget>
 			<packing>
-			 <property name="padding">0</property>
 			 <property name="expand">False</property>
-			 <property name="fill">False</property>
+			 <property name="homogeneous">True</property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkButton" id="dsp_down">
+			<widget class="GtkToolButton" id="dsp_remove_toolbtn">
 			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="label">gtk-go-down</property>
-			 <property name="use_stock">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <signal name="clicked" handler="on_dsp_down_clicked" last_modification_time="Wed, 29 Dec 2010 11:54:55 GMT"/>
+			 <property name="label" translatable="yes"></property>
+			 <property name="use_underline">True</property>
+			 <property name="stock_id">gtk-remove</property>
+			 <property name="visible_horizontal">True</property>
+			 <property name="visible_vertical">True</property>
+			 <property name="is_important">False</property>
+			 <signal name="clicked" handler="on_dsp_remove_toolbtn_clicked" last_modification_time="Sun, 05 Dec 2021 20:11:01 GMT"/>
 			</widget>
 			<packing>
-			 <property name="padding">0</property>
 			 <property name="expand">False</property>
-			 <property name="fill">False</property>
+			 <property name="homogeneous">True</property>
 			</packing>
 		 </child>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
-		</widget>
-		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		</packing>
-	 </child>
 
-	 <child>
-		<widget class="GtkHBox" id="hbox86">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">8</property>
+		 <child>
+			<widget class="GtkToolButton" id="dsp_up_toolbtn">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes"></property>
+			 <property name="use_underline">True</property>
+			 <property name="stock_id">gtk-go-up</property>
+			 <property name="visible_horizontal">True</property>
+			 <property name="visible_vertical">True</property>
+			 <property name="is_important">False</property>
+			 <signal name="clicked" handler="on_dsp_toolbtn_up_clicked" last_modification_time="Sun, 05 Dec 2021 14:32:14 GMT"/>
+			</widget>
+			<packing>
+			 <property name="expand">False</property>
+			 <property name="homogeneous">True</property>
+			</packing>
+		 </child>
 
-		 <child>
-		 <widget class="GtkLabel" id="label114">
-		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">DSP Chain Preset</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="GtkToolButton" id="dsp_down_toolbtn">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes"></property>
+			 <property name="use_underline">True</property>
+			 <property name="stock_id">gtk-go-down</property>
+			 <property name="visible_horizontal">True</property>
+			 <property name="visible_vertical">True</property>
+			 <property name="is_important">False</property>
+			 <signal name="clicked" handler="on_dsp_toolbtn_down_clicked" last_modification_time="Sun, 05 Dec 2021 14:32:24 GMT"/>
+			</widget>
+			<packing>
+			 <property name="expand">False</property>
+			 <property name="homogeneous">True</property>
+			</packing>
+		 </child>
 
-		 <child>
-		 <widget class="GtkComboBoxEntry" id="dsp_preset">
-		 <property name="visible">True</property>
-		 <property name="add_tearoffs">False</property>
-		 <property name="has_frame">True</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="changed" handler="on_dsp_preset_changed" last_modification_time="Wed, 05 Jan 2011 19:38:28 GMT"/>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
+		 <child>
+			<widget class="GtkToolButton" id="dsp_configure_toolbtn">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes"></property>
+			 <property name="use_underline">True</property>
+			 <property name="stock_id">gtk-preferences</property>
+			 <property name="visible_horizontal">True</property>
+			 <property name="visible_vertical">True</property>
+			 <property name="is_important">False</property>
+			 <signal name="clicked" handler="on_dsp_configure_toolbtn_clicked" last_modification_time="Sun, 05 Dec 2021 14:49:33 GMT"/>
+			</widget>
+			<packing>
+			 <property name="expand">False</property>
+			 <property name="homogeneous">True</property>
+			</packing>
+		 </child>
 
-		 <child>
-		 <widget class="GtkButton" id="dsp_preset_save">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label">gtk-save</property>
-		 <property name="use_stock">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="clicked" handler="on_dsp_preset_save_clicked" last_modification_time="Wed, 05 Jan 2011 19:38:10 GMT"/>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		 </packing>
-		 </child>
+		 <child>
+			<widget class="GtkSeparatorToolItem" id="separatortoolitem1">
+			 <property name="visible">True</property>
+			 <property name="draw">False</property>
+			 <property name="visible_horizontal">True</property>
+			 <property name="visible_vertical">True</property>
+			</widget>
+			<packing>
+			 <property name="expand">True</property>
+			 <property name="homogeneous">False</property>
+			</packing>
+		 </child>
 
-		 <child>
-		 <widget class="GtkButton" id="dsp_preset_load">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">_Load</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <signal name="clicked" handler="on_dsp_preset_load_clicked" last_modification_time="Wed, 05 Jan 2011 19:38:13 GMT"/>
+		 <child>
+			<widget class="GtkToolItem" id="toolitem2">
+			 <property name="visible">True</property>
+			 <property name="visible_horizontal">True</property>
+			 <property name="visible_vertical">True</property>
+			 <property name="is_important">False</property>
+
+			 <child>
+			 <widget class="GtkHBox" id="hbox86">
+			 <property name="visible">True</property>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">8</property>
+
+			 <child>
+				<widget class="GtkLabel" id="label114">
+				 <property name="visible">True</property>
+				 <property name="label" translatable="yes">DSP Chain Preset</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="GtkComboBoxEntry" id="dsp_preset">
+				 <property name="visible">True</property>
+				 <property name="add_tearoffs">False</property>
+				 <property name="has_frame">True</property>
+				 <property name="focus_on_click">True</property>
+				 <signal name="changed" handler="on_dsp_preset_changed" last_modification_time="Wed, 05 Jan 2011 19:38:28 GMT"/>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">False</property>
+				 <property name="fill">True</property>
+				</packing>
+			 </child>
+
+			 <child>
+				<widget class="GtkButton" id="dsp_preset_save">
+				 <property name="visible">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="label">_Save</property>
+				 <property name="use_underline">True</property>
+				 <property name="relief">GTK_RELIEF_NORMAL</property>
+				 <property name="focus_on_click">True</property>
+				 <signal name="clicked" handler="on_dsp_preset_save_clicked" last_modification_time="Wed, 05 Jan 2011 19:38:10 GMT"/>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">False</property>
+				 <property name="fill">False</property>
+				</packing>
+			 </child>
+
+			 <child>
+				<widget class="GtkButton" id="dsp_preset_load">
+				 <property name="visible">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="label" translatable="yes">_Load</property>
+				 <property name="use_underline">True</property>
+				 <property name="relief">GTK_RELIEF_NORMAL</property>
+				 <property name="focus_on_click">True</property>
+				 <signal name="clicked" handler="on_dsp_preset_load_clicked" last_modification_time="Wed, 05 Jan 2011 19:38:13 GMT"/>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">False</property>
+				 <property name="fill">False</property>
+				</packing>
+			 </child>
+			 </widget>
+			 </child>
+			</widget>
+			<packing>
+			 <property name="expand">False</property>
+			 <property name="homogeneous">False</property>
+			</packing>
+		 </child>
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
@@ -3149,7 +3748,7 @@
 		</widget>
 		<packing>
 		 <property name="padding">0</property>
-		 <property name="expand">False</property>
+		 <property name="expand">True</property>
 		 <property name="fill">True</property>
 		</packing>
 	 </child>
@@ -3202,6 +3801,26 @@
 		 <property name="spacing">8</property>
 
 		 <child>
+		 <widget class="GtkCheckButton" id="minimize_on_startup">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Minimize to tray on startup</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		 <signal name="clicked" handler="on_minimize_on_startup_clicked" last_modification_time="Sun, 11 Aug 2019 13:06:16 GMT"/>
+		 </widget>
+		 <packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		 </packing>
+		 </child>
+
+		 <child>
 		 <widget class="GtkCheckButton" id="pref_close_send_to_tray">
 		 <property name="visible">True</property>
 		 <property name="can_focus">True</property>
@@ -3242,6 +3861,26 @@
 		 </child>
 
 		 <child>
+		 <widget class="GtkCheckButton" id="move_to_trash">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Delete from disk should use Trash</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		 <signal name="clicked" handler="on_move_to_trash_clicked" last_modification_time="Tue, 08 Sep 2020 11:46:13 GMT"/>
+		 </widget>
+		 <packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		 </packing>
+		 </child>
+
+		 <child>
 		 <widget class="GtkCheckButton" id="enable_shift_jis_recoding">
 		 <property name="visible">True</property>
 		 <property name="can_focus">True</property>
@@ -3265,7 +3904,7 @@
 		 <widget class="GtkCheckButton" id="enable_cp1251_recoding">
 		 <property name="visible">True</property>
 		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Enable Russian CP1251 detection and recoding</property>
+		 <property name="label" translatable="yes">Enable cyrillic CP1251 detection and recoding</property>
 		 <property name="use_underline">True</property>
 		 <property name="relief">GTK_RELIEF_NORMAL</property>
 		 <property name="focus_on_click">True</property>
@@ -3525,6 +4164,26 @@
 		 <property name="fill">False</property>
 		 </packing>
 		 </child>
+
+		 <child>
+		 <widget class="GtkCheckButton" id="display_seltime">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Display selection playback time in status bar</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		 <signal name="toggled" handler="on_display_seltime_toggled" last_modification_time="Mon, 24 Apr 2017 18:01:40 GMT"/>
+		 </widget>
+		 <packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		 </packing>
+		 </child>
 		</widget>
 		<packing>
 		 <property name="tab_expand">False</property>
@@ -3583,17 +4242,17 @@
 		 </child>
 
 		 <child>
-		 <widget class="GtkCheckButton" id="embolden_current">
+		 <widget class="GtkCheckButton" id="hide_delete_from_disk">
 		 <property name="visible">True</property>
 		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Draw playing track using bold font</property>
+		 <property name="label" translatable="yes">Hide &quot;Delete from Disk&quot; context menu item</property>
 		 <property name="use_underline">True</property>
 		 <property name="relief">GTK_RELIEF_NORMAL</property>
 		 <property name="focus_on_click">True</property>
 		 <property name="active">False</property>
 		 <property name="inconsistent">False</property>
 		 <property name="draw_indicator">True</property>
-		 <signal name="toggled" handler="on_embolden_current_toggled" last_modification_time="Mon, 09 Aug 2010 19:39:55 GMT"/>
+		 <signal name="toggled" handler="on_hide_delete_from_disk_toggled" last_modification_time="Mon, 09 Aug 2010 20:50:29 GMT"/>
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
@@ -3603,17 +4262,17 @@
 		 </child>
 
 		 <child>
-		 <widget class="GtkCheckButton" id="hide_delete_from_disk">
+		 <widget class="GtkCheckButton" id="skip_deleted_songs">
 		 <property name="visible">True</property>
 		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Hide &quot;Remove From Disk&quot; context menu item</property>
+		 <property name="label" translatable="yes">Switch to the next song when the currently played one is removed from disk</property>
 		 <property name="use_underline">True</property>
 		 <property name="relief">GTK_RELIEF_NORMAL</property>
 		 <property name="focus_on_click">True</property>
 		 <property name="active">False</property>
 		 <property name="inconsistent">False</property>
 		 <property name="draw_indicator">True</property>
-		 <signal name="toggled" handler="on_hide_delete_from_disk_toggled" last_modification_time="Mon, 09 Aug 2010 20:50:29 GMT"/>
+		 <signal name="toggled" handler="on_skip_deleted_songs_toggled" last_modification_time="Tue, 19 Nov 2019 15:12:46 GMT"/>
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
@@ -3661,6 +4320,89 @@
 		 <property name="fill">False</property>
 		 </packing>
 		 </child>
+
+		 <child>
+		 <widget class="GtkHBox" id="hbox141">
+		 <property name="visible">True</property>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">8</property>
+
+		 <child>
+			<widget class="GtkLabel" id="label164">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">Group spacing:</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="GtkSpinButton" id="listview_group_spacing">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="climb_rate">1</property>
+			 <property name="digits">0</property>
+			 <property name="numeric">True</property>
+			 <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			 <property name="snap_to_ticks">False</property>
+			 <property name="wrap">False</property>
+			 <property name="adjustment">0 0 1000 1 10 0</property>
+			 <signal name="value_changed" handler="on_listview_group_spacing_value_changed" last_modification_time="Fri, 12 May 2017 23:24:54 GMT"/>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">True</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkLabel" id="label165">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">pixels</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>
+		 </packing>
+		 </child>
 		</widget>
 		<packing>
 		 <property name="tab_expand">False</property>
@@ -3770,7 +4512,7 @@
 		 <child>
 			<widget class="GtkLabel" id="label43">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Foreground</property>
+			 <property name="label" translatable="yes">Bars</property>
 			 <property name="use_underline">False</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3798,7 +4540,7 @@
 		 <child>
 			<widget class="GtkLabel" id="label47">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Background</property>
+			 <property name="label" translatable="yes">Background (EQ)</property>
 			 <property name="use_underline">False</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3875,7 +4617,7 @@
 	 <child>
 		<widget class="GtkLabel" id="label73">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Seekbar/Volumebar colors</property>
+		 <property name="label" translatable="yes">Seekbar/Volumebar/EQ</property>
 		 <property name="use_underline">False</property>
 		 <property name="use_markup">False</property>
 		 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3925,16 +4667,34 @@
 		 <child>
 		 <widget class="GtkTable" id="tabstrip_colors_group">
 		 <property name="visible">True</property>
-		 <property name="n_rows">2</property>
-		 <property name="n_columns">5</property>
-		 <property name="homogeneous">True</property>
-		 <property name="row_spacing">0</property>
+		 <property name="n_rows">7</property>
+		 <property name="n_columns">3</property>
+		 <property name="homogeneous">False</property>
+		 <property name="row_spacing">4</property>
 		 <property name="column_spacing">8</property>
 
 		 <child>
-			<widget class="GtkLabel" id="label45">
+			<widget class="GtkColorButton" id="tabstrip_base">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="use_alpha">False</property>
+			 <property name="focus_on_click">True</property>
+			 <signal name="color_set" handler="on_tabstrip_base_color_set" last_modification_time="Sat, 03 Apr 2010 15:33:56 GMT"/>
+			</widget>
+			<packing>
+			 <property name="left_attach">1</property>
+			 <property name="right_attach">2</property>
+			 <property name="top_attach">6</property>
+			 <property name="bottom_attach">7</property>
+			 <property name="x_options">fill</property>
+			 <property name="y_options"></property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkLabel" id="label76">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Middle</property>
+			 <property name="label" translatable="yes">Base:</property>
 			 <property name="use_underline">False</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3952,17 +4712,35 @@
 			<packing>
 			 <property name="left_attach">0</property>
 			 <property name="right_attach">1</property>
-			 <property name="top_attach">0</property>
-			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</property>
+			 <property name="top_attach">6</property>
+			 <property name="bottom_attach">7</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkLabel" id="label46">
+			<widget class="GtkColorButton" id="tabstrip_dark">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Light</property>
+			 <property name="can_focus">True</property>
+			 <property name="use_alpha">False</property>
+			 <property name="focus_on_click">True</property>
+			 <signal name="color_set" handler="on_tabstrip_dark_color_set" last_modification_time="Sat, 03 Apr 2010 15:33:48 GMT"/>
+			</widget>
+			<packing>
+			 <property name="left_attach">1</property>
+			 <property name="right_attach">2</property>
+			 <property name="top_attach">5</property>
+			 <property name="bottom_attach">6</property>
+			 <property name="x_options">fill</property>
+			 <property name="y_options"></property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkLabel" id="label44">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">Dark:</property>
 			 <property name="use_underline">False</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3978,19 +4756,37 @@
 			 <property name="angle">0</property>
 			</widget>
 			<packing>
+			 <property name="left_attach">0</property>
+			 <property name="right_attach">1</property>
+			 <property name="top_attach">5</property>
+			 <property name="bottom_attach">6</property>
+			 <property name="x_options">fill</property>
+			 <property name="y_options"></property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkColorButton" id="tabstrip_light">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="use_alpha">False</property>
+			 <property name="focus_on_click">True</property>
+			 <signal name="color_set" handler="on_tabstrip_light_color_set" last_modification_time="Sat, 03 Apr 2010 15:33:41 GMT"/>
+			</widget>
+			<packing>
 			 <property name="left_attach">1</property>
 			 <property name="right_attach">2</property>
-			 <property name="top_attach">0</property>
-			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</property>
+			 <property name="top_attach">4</property>
+			 <property name="bottom_attach">5</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkLabel" id="label44">
+			<widget class="GtkLabel" id="label46">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Dark</property>
+			 <property name="label" translatable="yes">Light:</property>
 			 <property name="use_underline">False</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4006,11 +4802,11 @@
 			 <property name="angle">0</property>
 			</widget>
 			<packing>
-			 <property name="left_attach">2</property>
-			 <property name="right_attach">3</property>
-			 <property name="top_attach">0</property>
-			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</property>
+			 <property name="left_attach">0</property>
+			 <property name="right_attach">1</property>
+			 <property name="top_attach">4</property>
+			 <property name="bottom_attach">5</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
@@ -4024,73 +4820,243 @@
 			 <signal name="color_set" handler="on_tabstrip_mid_color_set" last_modification_time="Sat, 03 Apr 2010 15:33:34 GMT"/>
 			</widget>
 			<packing>
+			 <property name="left_attach">1</property>
+			 <property name="right_attach">2</property>
+			 <property name="top_attach">3</property>
+			 <property name="bottom_attach">4</property>
+			 <property name="x_options">fill</property>
+			 <property name="y_options"></property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkLabel" id="label45">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">Middle:</property>
+			 <property name="use_underline">False</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			</widget>
+			<packing>
 			 <property name="left_attach">0</property>
 			 <property name="right_attach">1</property>
-			 <property name="top_attach">1</property>
-			 <property name="bottom_attach">2</property>
-			 <property name="x_options">expand</property>
+			 <property name="top_attach">3</property>
+			 <property name="bottom_attach">4</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkColorButton" id="tabstrip_light">
+			<widget class="GtkLabel" id="label127">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">Text:</property>
+			 <property name="use_underline">False</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			</widget>
+			<packing>
+			 <property name="left_attach">0</property>
+			 <property name="right_attach">1</property>
+			 <property name="top_attach">0</property>
+			 <property name="bottom_attach">1</property>
+			 <property name="x_options">fill</property>
+			 <property name="y_options"></property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkColorButton" id="tabstrip_text">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
 			 <property name="use_alpha">False</property>
 			 <property name="focus_on_click">True</property>
-			 <signal name="color_set" handler="on_tabstrip_light_color_set" last_modification_time="Sat, 03 Apr 2010 15:33:41 GMT"/>
+			 <signal name="color_set" handler="on_tabstrip_text_color_set" last_modification_time="Wed, 23 Mar 2011 20:09:34 GMT"/>
 			</widget>
 			<packing>
 			 <property name="left_attach">1</property>
 			 <property name="right_attach">2</property>
-			 <property name="top_attach">1</property>
-			 <property name="bottom_attach">2</property>
-			 <property name="x_options">expand</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="GtkColorButton" id="tabstrip_dark">
+			<widget class="GtkColorButton" id="tabstrip_selected_text">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
 			 <property name="use_alpha">False</property>
 			 <property name="focus_on_click">True</property>
-			 <signal name="color_set" handler="on_tabstrip_dark_color_set" last_modification_time="Sat, 03 Apr 2010 15:33:48 GMT"/>
+			 <signal name="color_set" handler="on_tabstrip_selected_text_color_set" last_modification_time="Mon, 18 Aug 2014 20:05:16 GMT"/>
+			</widget>
+			<packing>
+			 <property name="left_attach">1</property>
+			 <property name="right_attach">2</property>
+			 <property name="top_attach">2</property>
+			 <property name="bottom_attach">3</property>
+			 <property name="x_options">fill</property>
+			 <property name="y_options"></property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkHBox" id="hbox136">
+			 <property name="visible">True</property>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">8</property>
+
+			 <child>
+			 <widget class="GtkCheckButton" id="tabstrip_playing_bold">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label" translatable="yes">Bold</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			 <signal name="toggled" handler="on_tabstrip_playing_bold_toggled" last_modification_time="Mon, 18 Aug 2014 20:06:50 GMT"/>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkCheckButton" id="tabstrip_playing_italic">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label" translatable="yes">Italic</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			 <signal name="toggled" handler="on_tabstrip_playing_italic_toggled" last_modification_time="Mon, 18 Aug 2014 20:06:58 GMT"/>
+			 </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">2</property>
 			 <property name="right_attach">3</property>
 			 <property name="top_attach">1</property>
 			 <property name="bottom_attach">2</property>
-			 <property name="x_options">expand</property>
-			 <property name="y_options"></property>
+			 <property name="x_options">fill</property>
+			 <property name="y_options">fill</property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkColorButton" id="tabstrip_base">
+			<widget class="GtkHBox" id="hbox137">
+			 <property name="visible">True</property>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">8</property>
+
+			 <child>
+			 <widget class="GtkCheckButton" id="tabstrip_selected_bold">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label" translatable="yes">Bold</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			 <signal name="toggled" handler="on_tabstrip_selected_bold_toggled" last_modification_time="Mon, 18 Aug 2014 20:07:14 GMT"/>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkCheckButton" id="tabstrip_selected_italic">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label" translatable="yes">Italic</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			 <signal name="toggled" handler="on_tabstrip_selected_italic_toggled" last_modification_time="Mon, 18 Aug 2014 20:07:21 GMT"/>
+			 </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">2</property>
+			 <property name="right_attach">3</property>
+			 <property name="top_attach">2</property>
+			 <property name="bottom_attach">3</property>
+			 <property name="x_options">fill</property>
+			 <property name="y_options">fill</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkFontButton" id="tabstrip_text_font">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
-			 <property name="use_alpha">False</property>
+			 <property name="show_style">True</property>
+			 <property name="show_size">True</property>
+			 <property name="use_font">False</property>
+			 <property name="use_size">False</property>
 			 <property name="focus_on_click">True</property>
-			 <signal name="color_set" handler="on_tabstrip_base_color_set" last_modification_time="Sat, 03 Apr 2010 15:33:56 GMT"/>
+			 <signal name="font_set" handler="on_tabstrip_text_font_set" last_modification_time="Mon, 18 Aug 2014 20:08:18 GMT"/>
 			</widget>
 			<packing>
-			 <property name="left_attach">3</property>
-			 <property name="right_attach">4</property>
-			 <property name="top_attach">1</property>
-			 <property name="bottom_attach">2</property>
-			 <property name="x_options">expand</property>
-			 <property name="y_options"></property>
+			 <property name="left_attach">2</property>
+			 <property name="right_attach">3</property>
+			 <property name="top_attach">0</property>
+			 <property name="bottom_attach">1</property>
+			 <property name="y_options">fill</property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkLabel" id="label76">
+			<widget class="GtkLabel" id="label152">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Base</property>
+			 <property name="label" translatable="yes">Playing text:</property>
 			 <property name="use_underline">False</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4106,19 +5072,19 @@
 			 <property name="angle">0</property>
 			</widget>
 			<packing>
-			 <property name="left_attach">3</property>
-			 <property name="right_attach">4</property>
-			 <property name="top_attach">0</property>
-			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</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="GtkLabel" id="label127">
+			<widget class="GtkLabel" id="label153">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Text</property>
+			 <property name="label" translatable="yes">Selected text:</property>
 			 <property name="use_underline">False</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4134,29 +5100,29 @@
 			 <property name="angle">0</property>
 			</widget>
 			<packing>
-			 <property name="left_attach">4</property>
-			 <property name="right_attach">5</property>
-			 <property name="top_attach">0</property>
-			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</property>
+			 <property name="left_attach">0</property>
+			 <property name="right_attach">1</property>
+			 <property name="top_attach">2</property>
+			 <property name="bottom_attach">3</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkColorButton" id="tabstrip_text">
+			<widget class="GtkColorButton" id="tabstrip_playing_text">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
 			 <property name="use_alpha">False</property>
 			 <property name="focus_on_click">True</property>
-			 <signal name="color_set" handler="on_tabstrip_text_color_set" last_modification_time="Wed, 23 Mar 2011 20:09:34 GMT"/>
+			 <signal name="color_set" handler="on_tabstrip_playing_text_color_set" last_modification_time="Mon, 18 Aug 2014 20:05:39 GMT"/>
 			</widget>
 			<packing>
-			 <property name="left_attach">4</property>
-			 <property name="right_attach">5</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">expand</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
@@ -4177,7 +5143,7 @@
 	 <child>
 		<widget class="GtkLabel" id="label74">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Tab strip colors</property>
+		 <property name="label" translatable="yes">Tab strip</property>
 		 <property name="use_underline">False</property>
 		 <property name="use_markup">False</property>
 		 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4205,38 +5171,670 @@
 		 <property name="spacing">8</property>
 
 		 <child>
-		 <widget class="GtkCheckButton" id="override_listview_colors">
+		 <widget class="GtkFrame" id="frame11">
 		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="label" translatable="yes">Override (looses GTK treeview theming, but speeds up rendering)</property>
-		 <property name="use_underline">True</property>
-		 <property name="relief">GTK_RELIEF_NORMAL</property>
-		 <property name="focus_on_click">True</property>
-		 <property name="active">False</property>
-		 <property name="inconsistent">False</property>
-		 <property name="draw_indicator">True</property>
-		 <signal name="toggled" handler="on_override_listview_colors_toggled" last_modification_time="Sat, 03 Apr 2010 17:47:30 GMT"/>
+		 <property name="label_xalign">0</property>
+		 <property name="label_yalign">0.5</property>
+		 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+		 <child>
+			<widget class="GtkHBox" id="listview_colors_group">
+			 <property name="border_width">8</property>
+			 <property name="visible">True</property>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">0</property>
+
+			 <child>
+			 <widget class="GtkFrame" id="frame12">
+			 <property name="visible">True</property>
+			 <property name="label_xalign">0</property>
+			 <property name="label_yalign">0.5</property>
+			 <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+			 <child>
+				<widget class="GtkAlignment" id="alignment28">
+				 <property name="visible">True</property>
+				 <property name="xalign">0.5</property>
+				 <property name="yalign">0.5</property>
+				 <property name="xscale">1</property>
+				 <property name="yscale">1</property>
+				 <property name="top_padding">12</property>
+				 <property name="bottom_padding">12</property>
+				 <property name="left_padding">12</property>
+				 <property name="right_padding">12</property>
+
+				 <child>
+				 <widget class="GtkTable" id="table3">
+				 <property name="visible">True</property>
+				 <property name="n_rows">5</property>
+				 <property name="n_columns">3</property>
+				 <property name="homogeneous">False</property>
+				 <property name="row_spacing">4</property>
+				 <property name="column_spacing">8</property>
+
+				 <child>
+					<widget class="GtkLabel" id="label77">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">Normal track(s):</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">0</property>
+					 <property name="yalign">0.5</property>
+					 <property name="xpad">0</property>
+					 <property name="ypad">0</property>
+					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					 <property name="width_chars">-1</property>
+					 <property name="single_line_mode">False</property>
+					 <property name="angle">0</property>
+					</widget>
+					<packing>
+					 <property name="left_attach">0</property>
+					 <property name="right_attach">1</property>
+					 <property name="top_attach">0</property>
+					 <property name="bottom_attach">1</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkColorButton" id="listview_text">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="use_alpha">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="color_set" handler="on_listview_text_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:22 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">1</property>
+					 <property name="right_attach">2</property>
+					 <property name="top_attach">0</property>
+					 <property name="bottom_attach">1</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkLabel" id="label150">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">Playing track:</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">0</property>
+					 <property name="yalign">0.5</property>
+					 <property name="xpad">0</property>
+					 <property name="ypad">0</property>
+					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					 <property name="width_chars">-1</property>
+					 <property name="single_line_mode">False</property>
+					 <property name="angle">0</property>
+					</widget>
+					<packing>
+					 <property name="left_attach">0</property>
+					 <property name="right_attach">1</property>
+					 <property name="top_attach">1</property>
+					 <property name="bottom_attach">2</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkColorButton" id="listview_playing_text">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="use_alpha">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="color_set" handler="on_listview_playing_text_color_set" last_modification_time="Mon, 18 Aug 2014 10:58:40 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">1</property>
+					 <property name="right_attach">2</property>
+					 <property name="top_attach">1</property>
+					 <property name="bottom_attach">2</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkLabel" id="label61">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">Selected track(s):</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">0</property>
+					 <property name="yalign">0.5</property>
+					 <property name="xpad">0</property>
+					 <property name="ypad">0</property>
+					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					 <property name="width_chars">-1</property>
+					 <property name="single_line_mode">False</property>
+					 <property name="angle">0</property>
+					</widget>
+					<packing>
+					 <property name="left_attach">0</property>
+					 <property name="right_attach">1</property>
+					 <property name="top_attach">2</property>
+					 <property name="bottom_attach">3</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkColorButton" id="listview_selected_text">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="use_alpha">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="color_set" handler="on_listview_selected_text_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:29 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">1</property>
+					 <property name="right_attach">2</property>
+					 <property name="top_attach">2</property>
+					 <property name="bottom_attach">3</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkLabel" id="label154">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">Columns:</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">0</property>
+					 <property name="yalign">0.5</property>
+					 <property name="xpad">0</property>
+					 <property name="ypad">0</property>
+					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					 <property name="width_chars">-1</property>
+					 <property name="single_line_mode">False</property>
+					 <property name="angle">0</property>
+					</widget>
+					<packing>
+					 <property name="left_attach">0</property>
+					 <property name="right_attach">1</property>
+					 <property name="top_attach">3</property>
+					 <property name="bottom_attach">4</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkColorButton" id="listview_column_text">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="use_alpha">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="color_set" handler="on_listview_column_text_color_set" last_modification_time="Tue, 19 Aug 2014 10:54:42 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">1</property>
+					 <property name="right_attach">2</property>
+					 <property name="top_attach">3</property>
+					 <property name="bottom_attach">4</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkFontButton" id="listview_column_text_font">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="show_style">True</property>
+					 <property name="show_size">True</property>
+					 <property name="use_font">False</property>
+					 <property name="use_size">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="font_set" handler="on_listview_column_text_font_set" last_modification_time="Tue, 19 Aug 2014 10:54:29 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">2</property>
+					 <property name="right_attach">3</property>
+					 <property name="top_attach">3</property>
+					 <property name="bottom_attach">4</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkLabel" id="label149">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">Group header:</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">0</property>
+					 <property name="yalign">0.5</property>
+					 <property name="xpad">0</property>
+					 <property name="ypad">0</property>
+					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					 <property name="width_chars">-1</property>
+					 <property name="single_line_mode">False</property>
+					 <property name="angle">0</property>
+					</widget>
+					<packing>
+					 <property name="left_attach">0</property>
+					 <property name="right_attach">1</property>
+					 <property name="top_attach">4</property>
+					 <property name="bottom_attach">5</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkColorButton" id="listview_group_text">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="use_alpha">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="color_set" handler="on_listview_group_text_color_set" last_modification_time="Mon, 18 Aug 2014 10:58:55 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">1</property>
+					 <property name="right_attach">2</property>
+					 <property name="top_attach">4</property>
+					 <property name="bottom_attach">5</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkFontButton" id="listview_group_text_font">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="show_style">True</property>
+					 <property name="show_size">True</property>
+					 <property name="use_font">False</property>
+					 <property name="use_size">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="font_set" handler="on_listview_group_text_font_set" last_modification_time="Mon, 18 Aug 2014 11:02:57 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">2</property>
+					 <property name="right_attach">3</property>
+					 <property name="top_attach">4</property>
+					 <property name="bottom_attach">5</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkFontButton" id="listview_text_font">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="show_style">True</property>
+					 <property name="show_size">True</property>
+					 <property name="use_font">False</property>
+					 <property name="use_size">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="font_set" handler="on_listview_text_font_set" last_modification_time="Mon, 18 Aug 2014 11:02:38 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">2</property>
+					 <property name="right_attach">3</property>
+					 <property name="top_attach">0</property>
+					 <property name="bottom_attach">1</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+				 </widget>
+				 </child>
+				</widget>
+			 </child>
+
+			 <child>
+				<widget class="GtkLabel" id="label158">
+				 <property name="visible">True</property>
+				 <property name="label" translatable="yes">&lt;b&gt;Foreground:&lt;/b&gt;</property>
+				 <property name="use_underline">False</property>
+				 <property name="use_markup">True</property>
+				 <property name="justify">GTK_JUSTIFY_LEFT</property>
+				 <property name="wrap">False</property>
+				 <property name="selectable">False</property>
+				 <property name="xalign">0.5</property>
+				 <property name="yalign">0.5</property>
+				 <property name="xpad">0</property>
+				 <property name="ypad">0</property>
+				 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				 <property name="width_chars">-1</property>
+				 <property name="single_line_mode">False</property>
+				 <property name="angle">0</property>
+				</widget>
+				<packing>
+				 <property name="type">label_item</property>
+				</packing>
+			 </child>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkVSeparator" id="vseparator1">
+			 <property name="visible">True</property>
+			 </widget>
+			 <packing>
+			 <property name="padding">5</property>
+			 <property name="expand">False</property>
+			 <property name="fill">True</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkFrame" id="frame13">
+			 <property name="visible">True</property>
+			 <property name="label_xalign">0</property>
+			 <property name="label_yalign">0.5</property>
+			 <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+			 <child>
+				<widget class="GtkAlignment" id="alignment29">
+				 <property name="visible">True</property>
+				 <property name="xalign">0.5</property>
+				 <property name="yalign">0.5</property>
+				 <property name="xscale">1</property>
+				 <property name="yscale">1</property>
+				 <property name="top_padding">11</property>
+				 <property name="bottom_padding">12</property>
+				 <property name="left_padding">12</property>
+				 <property name="right_padding">12</property>
+
+				 <child>
+				 <widget class="GtkTable" id="table4">
+				 <property name="visible">True</property>
+				 <property name="n_rows">4</property>
+				 <property name="n_columns">2</property>
+				 <property name="homogeneous">False</property>
+				 <property name="row_spacing">4</property>
+				 <property name="column_spacing">8</property>
+
+				 <child>
+					<widget class="GtkLabel" id="label58">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">Even:</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">0</property>
+					 <property name="yalign">0.5</property>
+					 <property name="xpad">0</property>
+					 <property name="ypad">0</property>
+					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					 <property name="width_chars">-1</property>
+					 <property name="single_line_mode">False</property>
+					 <property name="angle">0</property>
+					</widget>
+					<packing>
+					 <property name="left_attach">0</property>
+					 <property name="right_attach">1</property>
+					 <property name="top_attach">0</property>
+					 <property name="bottom_attach">1</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkLabel" id="label59">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">Odd:</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">0</property>
+					 <property name="yalign">0.5</property>
+					 <property name="xpad">0</property>
+					 <property name="ypad">0</property>
+					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					 <property name="width_chars">-1</property>
+					 <property name="single_line_mode">False</property>
+					 <property name="angle">0</property>
+					</widget>
+					<packing>
+					 <property name="left_attach">0</property>
+					 <property name="right_attach">1</property>
+					 <property name="top_attach">1</property>
+					 <property name="bottom_attach">2</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkColorButton" id="listview_odd_row">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="use_alpha">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="color_set" handler="on_listview_odd_row_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:09 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">1</property>
+					 <property name="right_attach">2</property>
+					 <property name="top_attach">1</property>
+					 <property name="bottom_attach">2</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkLabel" id="label78">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">Selected:</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">0</property>
+					 <property name="yalign">0.5</property>
+					 <property name="xpad">0</property>
+					 <property name="ypad">0</property>
+					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					 <property name="width_chars">-1</property>
+					 <property name="single_line_mode">False</property>
+					 <property name="angle">0</property>
+					</widget>
+					<packing>
+					 <property name="left_attach">0</property>
+					 <property name="right_attach">1</property>
+					 <property name="top_attach">2</property>
+					 <property name="bottom_attach">3</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkColorButton" id="listview_selected_row">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="use_alpha">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="color_set" handler="on_listview_selected_row_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:15 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">1</property>
+					 <property name="right_attach">2</property>
+					 <property name="top_attach">2</property>
+					 <property name="bottom_attach">3</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkLabel" id="label62">
+					 <property name="visible">True</property>
+					 <property name="label" translatable="yes">Cursor:</property>
+					 <property name="use_underline">False</property>
+					 <property name="use_markup">False</property>
+					 <property name="justify">GTK_JUSTIFY_LEFT</property>
+					 <property name="wrap">False</property>
+					 <property name="selectable">False</property>
+					 <property name="xalign">0</property>
+					 <property name="yalign">0.5</property>
+					 <property name="xpad">0</property>
+					 <property name="ypad">0</property>
+					 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					 <property name="width_chars">-1</property>
+					 <property name="single_line_mode">False</property>
+					 <property name="angle">0</property>
+					</widget>
+					<packing>
+					 <property name="left_attach">0</property>
+					 <property name="right_attach">1</property>
+					 <property name="top_attach">3</property>
+					 <property name="bottom_attach">4</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkColorButton" id="listview_cursor">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="use_alpha">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="color_set" handler="on_listview_cursor_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:33 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">1</property>
+					 <property name="right_attach">2</property>
+					 <property name="top_attach">3</property>
+					 <property name="bottom_attach">4</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+
+				 <child>
+					<widget class="GtkColorButton" id="listview_even_row">
+					 <property name="visible">True</property>
+					 <property name="can_focus">True</property>
+					 <property name="use_alpha">False</property>
+					 <property name="focus_on_click">True</property>
+					 <signal name="color_set" handler="on_listview_even_row_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:02 GMT"/>
+					</widget>
+					<packing>
+					 <property name="left_attach">1</property>
+					 <property name="right_attach">2</property>
+					 <property name="top_attach">0</property>
+					 <property name="bottom_attach">1</property>
+					 <property name="x_options">fill</property>
+					 <property name="y_options"></property>
+					</packing>
+				 </child>
+				 </widget>
+				 </child>
+				</widget>
+			 </child>
+
+			 <child>
+				<widget class="GtkLabel" id="label159">
+				 <property name="visible">True</property>
+				 <property name="label" translatable="yes">&lt;b&gt;Background:&lt;/b&gt;</property>
+				 <property name="use_underline">False</property>
+				 <property name="use_markup">True</property>
+				 <property name="justify">GTK_JUSTIFY_LEFT</property>
+				 <property name="wrap">False</property>
+				 <property name="selectable">False</property>
+				 <property name="xalign">0.5</property>
+				 <property name="yalign">0.5</property>
+				 <property name="xpad">0</property>
+				 <property name="ypad">0</property>
+				 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				 <property name="width_chars">-1</property>
+				 <property name="single_line_mode">False</property>
+				 <property name="angle">0</property>
+				</widget>
+				<packing>
+				 <property name="type">label_item</property>
+				</packing>
+			 </child>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">True</property>
+			 </packing>
+			 </child>
+			</widget>
+		 </child>
+
+		 <child>
+			<widget class="GtkCheckButton" id="override_listview_colors">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label" translatable="yes">Override (loses GTK treeview theming, but speeds up rendering)</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			 <signal name="toggled" handler="on_override_listview_colors_toggled" last_modification_time="Sat, 03 Apr 2010 17:47:30 GMT"/>
+			</widget>
+			<packing>
+			 <property name="type">label_item</property>
+			</packing>
+		 </child>
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
+		 <property name="expand">True</property>
+		 <property name="fill">True</property>
 		 </packing>
 		 </child>
 
 		 <child>
-		 <widget class="GtkTable" id="listview_colors_group">
+		 <widget class="GtkTable" id="table2">
 		 <property name="visible">True</property>
 		 <property name="n_rows">2</property>
-		 <property name="n_columns">6</property>
-		 <property name="homogeneous">True</property>
-		 <property name="row_spacing">0</property>
+		 <property name="n_columns">3</property>
+		 <property name="homogeneous">False</property>
+		 <property name="row_spacing">4</property>
 		 <property name="column_spacing">8</property>
 
 		 <child>
-			<widget class="GtkLabel" id="label58">
+			<widget class="GtkLabel" id="label155">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Even row</property>
+			 <property name="label" translatable="yes">Playing track:</property>
 			 <property name="use_underline">False</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4256,15 +5854,15 @@
 			 <property name="right_attach">1</property>
 			 <property name="top_attach">0</property>
 			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkLabel" id="label59">
+			<widget class="GtkLabel" id="label156">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Odd row</property>
+			 <property name="label" translatable="yes">Selected track(s):</property>
 			 <property name="use_underline">False</property>
 			 <property name="use_markup">False</property>
 			 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4280,231 +5878,103 @@
 			 <property name="angle">0</property>
 			</widget>
 			<packing>
-			 <property name="left_attach">1</property>
-			 <property name="right_attach">2</property>
-			 <property name="top_attach">0</property>
-			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</property>
-			 <property name="y_options"></property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkColorButton" id="listview_even_row">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="use_alpha">False</property>
-			 <property name="focus_on_click">True</property>
-			 <signal name="color_set" handler="on_listview_even_row_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:02 GMT"/>
-			</widget>
-			<packing>
 			 <property name="left_attach">0</property>
 			 <property name="right_attach">1</property>
 			 <property name="top_attach">1</property>
 			 <property name="bottom_attach">2</property>
-			 <property name="x_options">expand</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkColorButton" id="listview_odd_row">
+			<widget class="GtkCheckButton" id="listview_playing_text_bold">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
-			 <property name="use_alpha">False</property>
+			 <property name="label" translatable="yes">Bold</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
 			 <property name="focus_on_click">True</property>
-			 <signal name="color_set" handler="on_listview_odd_row_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:09 GMT"/>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			 <signal name="toggled" handler="on_listview_playing_text_bold_toggled" last_modification_time="Mon, 18 Aug 2014 11:59:01 GMT"/>
 			</widget>
 			<packing>
 			 <property name="left_attach">1</property>
 			 <property name="right_attach">2</property>
-			 <property name="top_attach">1</property>
-			 <property name="bottom_attach">2</property>
-			 <property name="x_options">expand</property>
-			 <property name="y_options"></property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="label77">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Text</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="left_attach">3</property>
-			 <property name="right_attach">4</property>
 			 <property name="top_attach">0</property>
 			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkLabel" id="label78">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Selected row</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="left_attach">2</property>
-			 <property name="right_attach">3</property>
-			 <property name="top_attach">0</property>
-			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</property>
-			 <property name="y_options"></property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkColorButton" id="listview_selected_row">
+			<widget class="GtkCheckButton" id="listview_selected_text_bold">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
-			 <property name="use_alpha">False</property>
-			 <property name="focus_on_click">True</property>
-			 <signal name="color_set" handler="on_listview_selected_row_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:15 GMT"/>
-			</widget>
-			<packing>
-			 <property name="left_attach">2</property>
-			 <property name="right_attach">3</property>
-			 <property name="top_attach">1</property>
-			 <property name="bottom_attach">2</property>
-			 <property name="x_options">expand</property>
-			 <property name="y_options"></property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkColorButton" id="listview_text">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="use_alpha">False</property>
+			 <property name="label" translatable="yes">Bold</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
 			 <property name="focus_on_click">True</property>
-			 <signal name="color_set" handler="on_listview_text_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:22 GMT"/>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			 <signal name="toggled" handler="on_listview_selected_text_bold_toggled" last_modification_time="Mon, 18 Aug 2014 11:59:16 GMT"/>
 			</widget>
 			<packing>
-			 <property name="left_attach">3</property>
-			 <property name="right_attach">4</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">expand</property>
-			 <property name="y_options"></property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="label61">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Selected text</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="left_attach">4</property>
-			 <property name="right_attach">5</property>
-			 <property name="top_attach">0</property>
-			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkColorButton" id="listview_selected_text">
+			<widget class="GtkCheckButton" id="listview_playing_text_italic">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
-			 <property name="use_alpha">False</property>
+			 <property name="label" translatable="yes">Italic</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
 			 <property name="focus_on_click">True</property>
-			 <signal name="color_set" handler="on_listview_selected_text_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:29 GMT"/>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			 <signal name="toggled" handler="on_listview_playing_text_italic_toggled" last_modification_time="Mon, 18 Aug 2014 11:59:07 GMT"/>
 			</widget>
 			<packing>
-			 <property name="left_attach">4</property>
-			 <property name="right_attach">5</property>
-			 <property name="top_attach">1</property>
-			 <property name="bottom_attach">2</property>
-			 <property name="x_options">expand</property>
-			 <property name="y_options"></property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkLabel" id="label62">
-			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Cursor</property>
-			 <property name="use_underline">False</property>
-			 <property name="use_markup">False</property>
-			 <property name="justify">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap">False</property>
-			 <property name="selectable">False</property>
-			 <property name="xalign">0</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xpad">0</property>
-			 <property name="ypad">0</property>
-			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			 <property name="width_chars">-1</property>
-			 <property name="single_line_mode">False</property>
-			 <property name="angle">0</property>
-			</widget>
-			<packing>
-			 <property name="left_attach">5</property>
-			 <property name="right_attach">6</property>
+			 <property name="left_attach">2</property>
+			 <property name="right_attach">3</property>
 			 <property name="top_attach">0</property>
 			 <property name="bottom_attach">1</property>
-			 <property name="x_options">expand</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
 
 		 <child>
-			<widget class="GtkColorButton" id="listview_cursor">
+			<widget class="GtkCheckButton" id="listview_selected_text_italic">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
-			 <property name="use_alpha">False</property>
+			 <property name="label" translatable="yes">Italic</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
 			 <property name="focus_on_click">True</property>
-			 <signal name="color_set" handler="on_listview_cursor_color_set" last_modification_time="Sat, 03 Apr 2010 18:03:33 GMT"/>
+			 <property name="active">False</property>
+			 <property name="inconsistent">False</property>
+			 <property name="draw_indicator">True</property>
+			 <signal name="toggled" handler="on_listview_selected_text_italic_toggled" last_modification_time="Mon, 18 Aug 2014 11:59:23 GMT"/>
 			</widget>
 			<packing>
-			 <property name="left_attach">5</property>
-			 <property name="right_attach">6</property>
+			 <property name="left_attach">2</property>
+			 <property name="right_attach">3</property>
 			 <property name="top_attach">1</property>
 			 <property name="bottom_attach">2</property>
-			 <property name="x_options">expand</property>
+			 <property name="x_options">fill</property>
 			 <property name="y_options"></property>
 			</packing>
 		 </child>
@@ -4525,7 +5995,128 @@
 	 <child>
 		<widget class="GtkLabel" id="label75">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Playlist colors</property>
+		 <property name="label" translatable="yes">Playlist</property>
+		 <property name="use_underline">False</property>
+		 <property name="use_markup">False</property>
+		 <property name="justify">GTK_JUSTIFY_LEFT</property>
+		 <property name="wrap">False</property>
+		 <property name="selectable">False</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xpad">0</property>
+		 <property name="ypad">0</property>
+		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		 <property name="width_chars">-1</property>
+		 <property name="single_line_mode">False</property>
+		 <property name="angle">0</property>
+		</widget>
+		<packing>
+		 <property name="type">tab</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkTable" id="table5">
+		 <property name="border_width">12</property>
+		 <property name="visible">True</property>
+		 <property name="n_rows">2</property>
+		 <property name="n_columns">2</property>
+		 <property name="homogeneous">False</property>
+		 <property name="row_spacing">8</property>
+		 <property name="column_spacing">8</property>
+
+		 <child>
+		 <widget class="GtkCheckButton" id="use_visualization_base_color">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Custom visualization base color</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		 <signal name="toggled" handler="on_use_visualization_base_color_toggled" last_modification_time="Tue, 16 Nov 2021 17:55:01 GMT"/>
+		 </widget>
+		 <packing>
+		 <property name="left_attach">0</property>
+		 <property name="right_attach">1</property>
+		 <property name="top_attach">0</property>
+		 <property name="bottom_attach">1</property>
+		 <property name="x_options">fill</property>
+		 <property name="y_options"></property>
+		 </packing>
+		 </child>
+
+		 <child>
+		 <widget class="GtkColorButton" id="visualization_custom_color_button">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="use_alpha">False</property>
+		 <property name="focus_on_click">True</property>
+		 <signal name="color_set" handler="on_visualization_custom_color_button_color_set" last_modification_time="Tue, 16 Nov 2021 17:55:41 GMT"/>
+		 </widget>
+		 <packing>
+		 <property name="left_attach">1</property>
+		 <property name="right_attach">2</property>
+		 <property name="top_attach">0</property>
+		 <property name="bottom_attach">1</property>
+		 <property name="x_options">fill</property>
+		 <property name="y_options"></property>
+		 </packing>
+		 </child>
+
+		 <child>
+		 <widget class="GtkCheckButton" id="use_visualization_background_color">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Custom visualization background color</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		 <signal name="toggled" handler="on_use_visualization_background_color_toggled" last_modification_time="Mon, 28 Nov 2022 18:43:27 GMT"/>
+		 </widget>
+		 <packing>
+		 <property name="left_attach">0</property>
+		 <property name="right_attach">1</property>
+		 <property name="top_attach">1</property>
+		 <property name="bottom_attach">2</property>
+		 <property name="x_options">fill</property>
+		 <property name="y_options"></property>
+		 </packing>
+		 </child>
+
+		 <child>
+		 <widget class="GtkColorButton" id="visualization_custom_background_color_button">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="use_alpha">False</property>
+		 <property name="focus_on_click">True</property>
+		 <signal name="color_set" handler="on_visualization_custom_background_color_button_color_set" last_modification_time="Mon, 28 Nov 2022 19:02:38 GMT"/>
+		 </widget>
+		 <packing>
+		 <property name="left_attach">1</property>
+		 <property name="right_attach">2</property>
+		 <property name="top_attach">1</property>
+		 <property name="bottom_attach">2</property>
+		 <property name="x_options">fill</property>
+		 <property name="y_options"></property>
+		 </packing>
+		 </child>
+		</widget>
+		<packing>
+		 <property name="tab_expand">False</property>
+		 <property name="tab_fill">True</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkLabel" id="label175">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">Visualizations</property>
 		 <property name="use_underline">False</property>
 		 <property name="use_markup">False</property>
 		 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4554,7 +6145,188 @@
 	 <child>
 	 <widget class="GtkLabel" id="label100">
 	 <property name="visible">True</property>
-	 <property name="label" translatable="yes">Colors</property>
+	 <property name="label" translatable="yes">Appearance</property>
+	 <property name="use_underline">False</property>
+	 <property name="use_markup">False</property>
+	 <property name="justify">GTK_JUSTIFY_LEFT</property>
+	 <property name="wrap">False</property>
+	 <property name="selectable">False</property>
+	 <property name="xalign">0.5</property>
+	 <property name="yalign">0.5</property>
+	 <property name="xpad">0</property>
+	 <property name="ypad">0</property>
+	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	 <property name="width_chars">-1</property>
+	 <property name="single_line_mode">False</property>
+	 <property name="angle">0</property>
+	 </widget>
+	 <packing>
+	 <property name="type">tab</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkVBox" id="vbox55">
+	 <property name="border_width">12</property>
+	 <property name="visible">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">8</property>
+
+	 <child>
+		<widget class="GtkCheckButton" id="toggle_medialib_on">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label" translatable="yes">Enable media library</property>
+		 <property name="use_underline">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <property name="active">False</property>
+		 <property name="inconsistent">False</property>
+		 <property name="draw_indicator">True</property>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkHSeparator" id="hseparator7">
+		 <property name="visible">True</property>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkLabel" id="label174">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">Add / remove music folders</property>
+		 <property name="use_underline">False</property>
+		 <property name="use_markup">False</property>
+		 <property name="justify">GTK_JUSTIFY_LEFT</property>
+		 <property name="wrap">False</property>
+		 <property name="selectable">False</property>
+		 <property name="xalign">0</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xpad">0</property>
+		 <property name="ypad">0</property>
+		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		 <property name="width_chars">-1</property>
+		 <property name="single_line_mode">False</property>
+		 <property name="angle">0</property>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkVBox" id="vbox56">
+		 <property name="visible">True</property>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">0</property>
+
+		 <child>
+		 <widget class="GtkScrolledWindow" id="scrolledwindow17">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		 <property name="shadow_type">GTK_SHADOW_IN</property>
+		 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		 <child>
+			<widget class="GtkTreeView" id="treeview_medialib_folders">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="headers_visible">False</property>
+			 <property name="rules_hint">False</property>
+			 <property name="reorderable">False</property>
+			 <property name="enable_search">True</property>
+			 <property name="fixed_height_mode">False</property>
+			 <property name="hover_selection">False</property>
+			 <property name="hover_expand">False</property>
+			</widget>
+		 </child>
+		 </widget>
+		 <packing>
+		 <property name="padding">0</property>
+		 <property name="expand">True</property>
+		 <property name="fill">True</property>
+		 </packing>
+		 </child>
+
+		 <child>
+		 <widget class="GtkHBox" id="hbox150">
+		 <property name="visible">True</property>
+		 <property name="homogeneous">False</property>
+		 <property name="spacing">0</property>
+
+		 <child>
+			<widget class="GtkButton" id="button_medialib_add_folder">
+			 <property name="width_request">38</property>
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label">+</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			</packing>
+		 </child>
+
+		 <child>
+			<widget class="GtkButton" id="button_medialib_remove_folder">
+			 <property name="width_request">38</property>
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="label">-</property>
+			 <property name="use_underline">True</property>
+			 <property name="relief">GTK_RELIEF_NORMAL</property>
+			 <property name="focus_on_click">True</property>
+			</widget>
+			<packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			</packing>
+		 </child>
+		 </widget>
+		 <packing>
+		 <property name="padding">0</property>
+		 <property name="expand">False</property>
+		 <property name="fill">True</property>
+		 </packing>
+		 </child>
+		</widget>
+		<packing>
+		 <property name="padding">0</property>
+		 <property name="expand">True</property>
+		 <property name="fill">True</property>
+		</packing>
+	 </child>
+	 </widget>
+	 <packing>
+	 <property name="tab_expand">False</property>
+	 <property name="tab_fill">True</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkLabel" id="label173">
+	 <property name="visible">True</property>
+	 <property name="label" translatable="yes">Media Library</property>
 	 <property name="use_underline">False</property>
 	 <property name="use_markup">False</property>
 	 <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5487,6 +7259,8 @@
 		 <property name="hover_selection">False</property>
 		 <property name="hover_expand">False</property>
 		 <signal name="cursor_changed" handler="on_pref_pluginlist_cursor_changed" last_modification_time="Sat, 10 Oct 2009 19:54:17 GMT"/>
+		 <signal name="row_activated" handler="on_pref_pluginlist_row_activated" last_modification_time="Fri, 12 May 2017 18:53:38 GMT"/>
+		 <signal name="button_press_event" handler="on_pref_pluginlist_button_press_event" last_modification_time="Fri, 05 Mar 2021 19:12:00 GMT"/>
 		 </widget>
 		 </child>
 		</widget>
@@ -5497,35 +7271,138 @@
 	 </child>
 
 	 <child>
-		<widget class="GtkVBox" id="vbox12">
-		 <property name="border_width">12</property>
+		<widget class="GtkAlignment" id="alignment33">
 		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">8</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xscale">1</property>
+		 <property name="yscale">1</property>
+		 <property name="top_padding">0</property>
+		 <property name="bottom_padding">0</property>
+		 <property name="left_padding">16</property>
+		 <property name="right_padding">0</property>
 
 		 <child>
-		 <widget class="GtkHBox" id="hbox103">
+		 <widget class="GtkVBox" id="vbox54">
 		 <property name="visible">True</property>
 		 <property name="homogeneous">False</property>
 		 <property name="spacing">8</property>
 
 		 <child>
-			<widget class="GtkLabel" id="label130">
+			<widget class="GtkHBox" id="hbox149">
 			 <property name="visible">True</property>
-			 <property name="label" translatable="yes">Version: </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>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">0</property>
+
+			 <child>
+			 <widget class="GtkLabel" id="fillerlabel1">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes"></property>
+			 <property name="use_underline">False</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">False</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkHButtonBox" id="plugin_tabbtn_hbtnbox">
+			 <property name="visible">True</property>
+			 <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
+			 <property name="spacing">0</property>
+
+			 <child>
+				<widget class="GtkRadioButton" id="plugin_conf_tab_btn">
+				 <property name="visible">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="label" translatable="yes">Configuration</property>
+				 <property name="use_underline">True</property>
+				 <property name="relief">GTK_RELIEF_NORMAL</property>
+				 <property name="focus_on_click">True</property>
+				 <property name="active">True</property>
+				 <property name="inconsistent">False</property>
+				 <property name="draw_indicator">False</property>
+				 <signal name="clicked" handler="on_plugin_conf_tab_btn_clicked" last_modification_time="Thu, 25 Feb 2021 11:17:56 GMT"/>
+				</widget>
+			 </child>
+
+			 <child>
+				<widget class="GtkRadioButton" id="plugin_info_tab_btn">
+				 <property name="visible">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="label" translatable="yes">Info</property>
+				 <property name="use_underline">True</property>
+				 <property name="relief">GTK_RELIEF_NORMAL</property>
+				 <property name="focus_on_click">True</property>
+				 <property name="active">False</property>
+				 <property name="inconsistent">False</property>
+				 <property name="draw_indicator">False</property>
+				 <property name="group">plugin_conf_tab_btn</property>
+				 <signal name="clicked" handler="on_plugin_info_tab_btn_clicked" last_modification_time="Thu, 25 Feb 2021 11:18:04 GMT"/>
+				</widget>
+			 </child>
+
+			 <child>
+				<widget class="GtkRadioButton" id="plugin_license_tab_btn">
+				 <property name="visible">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="label" translatable="yes">License</property>
+				 <property name="use_underline">True</property>
+				 <property name="relief">GTK_RELIEF_NORMAL</property>
+				 <property name="focus_on_click">True</property>
+				 <property name="active">False</property>
+				 <property name="inconsistent">False</property>
+				 <property name="draw_indicator">False</property>
+				 <property name="group">plugin_conf_tab_btn</property>
+				 <signal name="clicked" handler="on_plugin_license_tab_btn_clicked" last_modification_time="Thu, 25 Feb 2021 11:18:08 GMT"/>
+				</widget>
+			 </child>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">False</property>
+			 <property name="fill">False</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkLabel" id="fillerlabel2">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes"></property>
+			 <property name="use_underline">False</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			 </widget>
+			 <packing>
+			 <property name="padding">0</property>
+			 <property name="expand">True</property>
+			 <property name="fill">False</property>
+			 </packing>
+			 </child>
 			</widget>
 			<packing>
 			 <property name="padding">0</property>
@@ -5535,122 +7412,120 @@
 		 </child>
 
 		 <child>
-			<widget class="GtkEntry" id="plug_version">
+			<widget class="GtkNotebook" id="plugin_notebook">
 			 <property name="visible">True</property>
 			 <property name="can_focus">True</property>
-			 <property name="editable">False</property>
-			 <property name="visibility">True</property>
-			 <property name="max_length">0</property>
-			 <property name="text" translatable="yes"></property>
-			 <property name="has_frame">True</property>
-			 <property name="invisible_char">•</property>
-			 <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">True</property>
-			</packing>
-		 </child>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
+			 <property name="show_tabs">True</property>
+			 <property name="show_border">False</property>
+			 <property name="tab_pos">GTK_POS_TOP</property>
+			 <property name="scrollable">False</property>
+			 <property name="enable_popup">False</property>
+			 <signal name="switch_page" handler="on_plugin_notebook_switch_page" last_modification_time="Thu, 25 Feb 2021 07:50:30 GMT"/>
 
-		 <child>
-		 <widget class="GtkScrolledWindow" id="scrolledwindow8">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		 <property name="shadow_type">GTK_SHADOW_IN</property>
-		 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+			 <child>
+			 <widget class="GtkVBox" id="plugin_conf_tab_vbox">
+			 <property name="visible">True</property>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">8</property>
 
-		 <child>
-			<widget class="GtkTextView" id="plug_description">
-			 <property name="visible">True</property>
-			 <property name="can_focus">True</property>
-			 <property name="editable">False</property>
-			 <property name="overwrite">False</property>
-			 <property name="accepts_tab">True</property>
-			 <property name="justification">GTK_JUSTIFY_LEFT</property>
-			 <property name="wrap_mode">GTK_WRAP_NONE</property>
-			 <property name="cursor_visible">False</property>
-			 <property name="pixels_above_lines">0</property>
-			 <property name="pixels_below_lines">0</property>
-			 <property name="pixels_inside_wrap">0</property>
-			 <property name="left_margin">0</property>
-			 <property name="right_margin">0</property>
-			 <property name="indent">0</property>
-			 <property name="text" translatable="yes"></property>
-			</widget>
-		 </child>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
+			 <child>
+				<widget class="GtkScrolledWindow" id="plug_conf_dlg_scrolledwindow">
+				 <property name="visible">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+				 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+				 <property name="shadow_type">GTK_SHADOW_NONE</property>
+				 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
-		 <child>
-		 <widget class="GtkHBox" id="hbox20">
-		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
+				 <child>
+				 <widget class="GtkViewport" id="plug_conf_dlg_viewport">
+				 <property name="visible">True</property>
+				 <property name="shadow_type">GTK_SHADOW_NONE</property>
 
-		 <child>
-			<widget class="GtkButton" id="configure_plugin">
-			 <property name="visible">True</property>
-			 <property name="sensitive">False</property>
-			 <property name="can_focus">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <signal name="clicked" handler="on_configure_plugin_clicked" last_modification_time="Tue, 01 Dec 2009 16:54:36 GMT"/>
+				 <child>
+					<placeholder/>
+				 </child>
+				 </widget>
+				 </child>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">True</property>
+				 <property name="fill">True</property>
+				</packing>
+			 </child>
+
+			 <child>
+				<widget class="GtkHButtonBox" id="plugin_actions_btnbox">
+				 <property name="layout_style">GTK_BUTTONBOX_END</property>
+				 <property name="spacing">0</property>
+
+				 <child>
+				 <widget class="GtkButton" id="plugin_conf_reset_btn">
+				 <property name="visible">True</property>
+				 <property name="can_default">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="label" translatable="yes">Reset to defaults</property>
+				 <property name="use_underline">True</property>
+				 <property name="relief">GTK_RELIEF_NORMAL</property>
+				 <property name="focus_on_click">True</property>
+				 <signal name="clicked" handler="on_plugin_conf_reset_btn_clicked" last_modification_time="Fri, 26 Feb 2021 21:54:07 GMT"/>
+				 </widget>
+				 </child>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">False</property>
+				 <property name="fill">True</property>
+				</packing>
+			 </child>
+			 </widget>
+			 <packing>
+			 <property name="tab_expand">False</property>
+			 <property name="tab_fill">True</property>
+			 </packing>
+			 </child>
 
 			 <child>
-			 <widget class="GtkAlignment" id="alignment15">
+			 <widget class="GtkLabel" id="label170">
 			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">Configuration</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="xscale">0</property>
-			 <property name="yscale">0</property>
-			 <property name="top_padding">0</property>
-			 <property name="bottom_padding">0</property>
-			 <property name="left_padding">0</property>
-			 <property name="right_padding">0</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			 </widget>
+			 <packing>
+			 <property name="type">tab</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkVBox" id="vbox12">
+			 <property name="visible">True</property>
+			 <property name="homogeneous">False</property>
+			 <property name="spacing">8</property>
 
 			 <child>
-				<widget class="GtkHBox" id="hbox56">
+				<widget class="GtkHBox" id="hbox103">
 				 <property name="visible">True</property>
 				 <property name="homogeneous">False</property>
-				 <property name="spacing">2</property>
+				 <property name="spacing">8</property>
 
 				 <child>
-				 <widget class="GtkImage" id="image394">
+				 <widget class="GtkLabel" id="label130">
 				 <property name="visible">True</property>
-				 <property name="stock">gtk-preferences</property>
-				 <property name="icon_size">4</property>
-				 <property name="xalign">0.5</property>
-				 <property name="yalign">0.5</property>
-				 <property name="xpad">0</property>
-				 <property name="ypad">0</property>
-				 </widget>
-				 <packing>
-				 <property name="padding">0</property>
-				 <property name="expand">False</property>
-				 <property name="fill">False</property>
-				 </packing>
-				 </child>
-
-				 <child>
-				 <widget class="GtkLabel" id="label92">
-				 <property name="visible">True</property>
-				 <property name="label" translatable="yes">Configure</property>
-				 <property name="use_underline">True</property>
+				 <property name="label" translatable="yes">Version: </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>
@@ -5670,122 +7545,195 @@
 				 <property name="fill">False</property>
 				 </packing>
 				 </child>
+
+				 <child>
+				 <widget class="GtkEntry" id="plug_version">
+				 <property name="visible">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="editable">False</property>
+				 <property name="visibility">True</property>
+				 <property name="max_length">0</property>
+				 <property name="text" translatable="yes"></property>
+				 <property name="has_frame">True</property>
+				 <property name="invisible_char">•</property>
+				 <property name="activates_default">False</property>
+				 </widget>
+				 <packing>
+				 <property name="padding">0</property>
+				 <property name="expand">True</property>
+				 <property name="fill">True</property>
+				 </packing>
+				 </child>
 				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">False</property>
+				 <property name="fill">True</property>
+				</packing>
 			 </child>
-			 </widget>
-			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
-
-		 <child>
-			<widget class="GtkButton" id="plug_copyright">
-			 <property name="visible">True</property>
-			 <property name="sensitive">False</property>
-			 <property name="can_focus">True</property>
-			 <property name="relief">GTK_RELIEF_NORMAL</property>
-			 <property name="focus_on_click">True</property>
-			 <signal name="clicked" handler="on_plug_copyright_clicked" last_modification_time="Sun, 27 Feb 2011 10:24:22 GMT"/>
-
-			 <child>
-			 <widget class="GtkAlignment" id="alignment20">
-			 <property name="visible">True</property>
-			 <property name="xalign">0.5</property>
-			 <property name="yalign">0.5</property>
-			 <property name="xscale">0</property>
-			 <property name="yscale">0</property>
-			 <property name="top_padding">0</property>
-			 <property name="bottom_padding">0</property>
-			 <property name="left_padding">0</property>
-			 <property name="right_padding">0</property>
 
 			 <child>
-				<widget class="GtkHBox" id="hbox88">
+				<widget class="GtkScrolledWindow" id="scrolledwindow8">
 				 <property name="visible">True</property>
-				 <property name="homogeneous">False</property>
-				 <property name="spacing">2</property>
+				 <property name="can_focus">True</property>
+				 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+				 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+				 <property name="shadow_type">GTK_SHADOW_IN</property>
+				 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 				 <child>
-				 <widget class="GtkImage" id="image521">
+				 <widget class="GtkTextView" id="plug_description">
 				 <property name="visible">True</property>
-				 <property name="stock">gtk-about</property>
-				 <property name="icon_size">4</property>
-				 <property name="xalign">0.5</property>
-				 <property name="yalign">0.5</property>
-				 <property name="xpad">0</property>
-				 <property name="ypad">0</property>
+				 <property name="can_focus">True</property>
+				 <property name="editable">False</property>
+				 <property name="overwrite">False</property>
+				 <property name="accepts_tab">True</property>
+				 <property name="justification">GTK_JUSTIFY_LEFT</property>
+				 <property name="wrap_mode">GTK_WRAP_NONE</property>
+				 <property name="cursor_visible">False</property>
+				 <property name="pixels_above_lines">0</property>
+				 <property name="pixels_below_lines">0</property>
+				 <property name="pixels_inside_wrap">0</property>
+				 <property name="left_margin">0</property>
+				 <property name="right_margin">0</property>
+				 <property name="indent">0</property>
+				 <property name="text" translatable="yes"></property>
 				 </widget>
-				 <packing>
-				 <property name="padding">0</property>
-				 <property name="expand">False</property>
-				 <property name="fill">False</property>
-				 </packing>
 				 </child>
+				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">True</property>
+				 <property name="fill">True</property>
+				</packing>
+			 </child>
+
+			 <child>
+				<widget class="GtkHBox" id="hbox20">
+				 <property name="visible">True</property>
+				 <property name="homogeneous">False</property>
+				 <property name="spacing">0</property>
 
 				 <child>
-				 <widget class="GtkLabel" id="label117">
+				 <widget class="Custom" id="weblink">
 				 <property name="visible">True</property>
-				 <property name="label" translatable="yes">Copyright</property>
-				 <property name="use_underline">True</property>
-				 <property name="use_markup">False</property>
-				 <property name="justify">GTK_JUSTIFY_LEFT</property>
-				 <property name="wrap">False</property>
-				 <property name="selectable">False</property>
-				 <property name="xalign">0.5</property>
-				 <property name="yalign">0.5</property>
-				 <property name="xpad">0</property>
-				 <property name="ypad">0</property>
-				 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				 <property name="width_chars">-1</property>
-				 <property name="single_line_mode">False</property>
-				 <property name="angle">0</property>
+				 <property name="creation_function">create_plugin_weblink</property>
+				 <property name="int1">0</property>
+				 <property name="int2">0</property>
+				 <property name="last_modification_time">Sun, 27 Feb 2011 11:39:00 GMT</property>
 				 </widget>
 				 <packing>
 				 <property name="padding">0</property>
-				 <property name="expand">False</property>
+				 <property name="expand">True</property>
 				 <property name="fill">False</property>
 				 </packing>
 				 </child>
 				</widget>
+				<packing>
+				 <property name="padding">0</property>
+				 <property name="expand">False</property>
+				 <property name="fill">False</property>
+				</packing>
 			 </child>
 			 </widget>
+			 <packing>
+			 <property name="tab_expand">False</property>
+			 <property name="tab_fill">True</property>
+			 </packing>
 			 </child>
-			</widget>
-			<packing>
-			 <property name="padding">0</property>
-			 <property name="expand">True</property>
-			 <property name="fill">False</property>
-			</packing>
-		 </child>
 
-		 <child>
-			<widget class="Custom" id="weblink">
-			 <property name="visible">True</property>
-			 <property name="creation_function">create_plugin_weblink</property>
-			 <property name="int1">0</property>
-			 <property name="int2">0</property>
-			 <property name="last_modification_time">Sun, 27 Feb 2011 11:39:00 GMT</property>
+			 <child>
+			 <widget class="GtkLabel" id="label171">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">Info</property>
+			 <property name="use_underline">False</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			 </widget>
+			 <packing>
+			 <property name="type">tab</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkScrolledWindow" id="scrolledwindow16">
+			 <property name="visible">True</property>
+			 <property name="can_focus">True</property>
+			 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			 <property name="shadow_type">GTK_SHADOW_IN</property>
+			 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+			 <child>
+				<widget class="GtkTextView" id="plug_license">
+				 <property name="visible">True</property>
+				 <property name="can_focus">True</property>
+				 <property name="editable">False</property>
+				 <property name="overwrite">False</property>
+				 <property name="accepts_tab">True</property>
+				 <property name="justification">GTK_JUSTIFY_LEFT</property>
+				 <property name="wrap_mode">GTK_WRAP_NONE</property>
+				 <property name="cursor_visible">False</property>
+				 <property name="pixels_above_lines">0</property>
+				 <property name="pixels_below_lines">0</property>
+				 <property name="pixels_inside_wrap">0</property>
+				 <property name="left_margin">0</property>
+				 <property name="right_margin">0</property>
+				 <property name="indent">0</property>
+				 <property name="text" translatable="yes"></property>
+				</widget>
+			 </child>
+			 </widget>
+			 <packing>
+			 <property name="tab_expand">False</property>
+			 <property name="tab_fill">True</property>
+			 </packing>
+			 </child>
+
+			 <child>
+			 <widget class="GtkLabel" id="label172">
+			 <property name="visible">True</property>
+			 <property name="label" translatable="yes">License</property>
+			 <property name="use_underline">False</property>
+			 <property name="use_markup">False</property>
+			 <property name="justify">GTK_JUSTIFY_LEFT</property>
+			 <property name="wrap">False</property>
+			 <property name="selectable">False</property>
+			 <property name="xalign">0.5</property>
+			 <property name="yalign">0.5</property>
+			 <property name="xpad">0</property>
+			 <property name="ypad">0</property>
+			 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			 <property name="width_chars">-1</property>
+			 <property name="single_line_mode">False</property>
+			 <property name="angle">0</property>
+			 </widget>
+			 <packing>
+			 <property name="type">tab</property>
+			 </packing>
+			 </child>
 			</widget>
 			<packing>
 			 <property name="padding">0</property>
 			 <property name="expand">True</property>
-			 <property name="fill">False</property>
+			 <property name="fill">True</property>
 			</packing>
 		 </child>
 		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
-		 </packing>
 		 </child>
 		</widget>
 		<packing>
-		 <property name="shrink">True</property>
+		 <property name="shrink">False</property>
 		 <property name="resize">True</property>
 		</packing>
 	 </child>
@@ -5833,7 +7781,7 @@
 <property name="visible">True</property>
 <property name="title">EntryDialog</property>
 <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
 <property name="modal">False</property>
 <property name="resizable">True</property>
 <property name="destroy_with_parent">True</property>
@@ -6659,7 +8607,7 @@
 		 </widget>
 		 <packing>
 		 <property name="padding">0</property>
-		 <property name="expand">True</property>
+		 <property name="expand">False</property>
 		 <property name="fill">True</property>
 		 </packing>
 		 </child>
@@ -6694,6 +8642,8 @@
 <property name="type">GTK_WINDOW_TOPLEVEL</property>
 <property name="window_position">GTK_WIN_POS_NONE</property>
 <property name="modal">True</property>
+ <property name="default_width">540</property>
+ <property name="default_height">180</property>
 <property name="resizable">True</property>
 <property name="destroy_with_parent">False</property>
 <property name="decorated">True</property>
@@ -6715,32 +8665,6 @@
 	<widget class="GtkHButtonBox" id="dialog-action_area7">
 	 <property name="visible">True</property>
 	 <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	 <child>
-	 <widget class="GtkButton" id="cancelbutton5">
-	 <property name="visible">True</property>
-	 <property name="can_default">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="label">gtk-cancel</property>
-	 <property name="use_stock">True</property>
-	 <property name="relief">GTK_RELIEF_NORMAL</property>
-	 <property name="focus_on_click">True</property>
-	 <property name="response_id">-6</property>
-	 </widget>
-	 </child>
-
-	 <child>
-	 <widget class="GtkButton" id="okbutton5">
-	 <property name="visible">True</property>
-	 <property name="can_default">True</property>
-	 <property name="can_focus">True</property>
-	 <property name="label">gtk-ok</property>
-	 <property name="use_stock">True</property>
-	 <property name="relief">GTK_RELIEF_NORMAL</property>
-	 <property name="focus_on_click">True</property>
-	 <property name="response_id">-5</property>
-	 </widget>
-	 </child>
 	</widget>
 	<packing>
 	 <property name="padding">0</property>
@@ -6751,24 +8675,60 @@
 </child>
 
 <child>
-	<widget class="GtkVBox" id="vbox28">
+	<widget class="GtkVBox" id="sortvbox">
 	 <property name="border_width">12</property>
 	 <property name="visible">True</property>
 	 <property name="homogeneous">False</property>
 	 <property name="spacing">8</property>
 
 	 <child>
-	 <widget class="GtkHBox" id="hbox76">
+	 <widget class="GtkFrame" id="sortframe">
 	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">8</property>
+	 <property name="label_xalign">0.019999999553</property>
+	 <property name="label_yalign">0.5</property>
+	 <property name="shadow_type">GTK_SHADOW_IN</property>
 
 	 <child>
-		<widget class="GtkLabel" id="label108">
+		<widget class="GtkAlignment" id="sortfmtalignment">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Format</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xscale">1</property>
+		 <property name="yscale">1</property>
+		 <property name="top_padding">8</property>
+		 <property name="bottom_padding">8</property>
+		 <property name="left_padding">8</property>
+		 <property name="right_padding">12</property>
+
+		 <child>
+		 <widget class="GtkTextView" id="sortfmt">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="editable">True</property>
+		 <property name="overwrite">False</property>
+		 <property name="accepts_tab">False</property>
+		 <property name="justification">GTK_JUSTIFY_LEFT</property>
+		 <property name="wrap_mode">GTK_WRAP_WORD</property>
+		 <property name="cursor_visible">True</property>
+		 <property name="pixels_above_lines">0</property>
+		 <property name="pixels_below_lines">0</property>
+		 <property name="pixels_inside_wrap">0</property>
+		 <property name="left_margin">0</property>
+		 <property name="right_margin">0</property>
+		 <property name="indent">0</property>
+		 <property name="text" translatable="yes"></property>
+		 <signal name="show" handler="on_sortfmt_show" last_modification_time="Sun, 07 Aug 2022 15:14:05 GMT"/>
+		 </widget>
+		 </child>
+		</widget>
+	 </child>
+
+	 <child>
+		<widget class="GtkLabel" id="label188">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">&lt;b&gt;Format&lt;/b&gt;</property>
 		 <property name="use_underline">False</property>
-		 <property name="use_markup">False</property>
+		 <property name="use_markup">True</property>
 		 <property name="justify">GTK_JUSTIFY_LEFT</property>
 		 <property name="wrap">False</property>
 		 <property name="selectable">False</property>
@@ -6782,124 +8742,114 @@
 		 <property name="angle">0</property>
 		</widget>
 		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">False</property>
-		 <property name="fill">False</property>
+		 <property name="type">label_item</property>
 		</packing>
 	 </child>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkHBox" id="sortbtnbox">
+	 <property name="visible">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">0</property>
 
 	 <child>
-		<widget class="GtkHBox" id="hbox77">
+		<widget class="GtkAlignment" id="sorthelpalignment">
 		 <property name="visible">True</property>
-		 <property name="homogeneous">False</property>
-		 <property name="spacing">0</property>
-
-		 <child>
-		 <widget class="GtkEntry" id="sortfmt">
-		 <property name="visible">True</property>
-		 <property name="can_focus">True</property>
-		 <property name="editable">True</property>
-		 <property name="visibility">True</property>
-		 <property name="max_length">0</property>
-		 <property name="text" translatable="yes"></property>
-		 <property name="has_frame">True</property>
-		 <property name="invisible_char">●</property>
-		 <property name="activates_default">False</property>
-		 <signal name="activate" handler="on_sortfmt_activate" last_modification_time="Fri, 03 Dec 2010 22:08:09 GMT"/>
-		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
-		 </child>
+		 <property name="xalign">0</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xscale">0</property>
+		 <property name="yscale">1</property>
+		 <property name="top_padding">0</property>
+		 <property name="bottom_padding">0</property>
+		 <property name="left_padding">0</property>
+		 <property name="right_padding">0</property>
 
 		 <child>
-		 <widget class="Custom" id="custom3">
+		 <widget class="Custom" id="sorthelplink">
 		 <property name="visible">True</property>
 		 <property name="creation_function">title_formatting_help_link_create</property>
 		 <property name="int1">0</property>
 		 <property name="int2">0</property>
 		 <property name="last_modification_time">Fri, 03 Dec 2010 20:39:24 GMT</property>
 		 </widget>
-		 <packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
-		 </packing>
 		 </child>
 		</widget>
 		<packing>
-		 <property name="padding">0</property>
+		 <property name="padding">8</property>
 		 <property name="expand">True</property>
 		 <property name="fill">True</property>
 		</packing>
 	 </child>
-	 </widget>
-	 <packing>
-	 <property name="padding">0</property>
-	 <property name="expand">False</property>
-	 <property name="fill">True</property>
-	 </packing>
-	 </child>
 
-	 <child>
-	 <widget class="GtkHBox" id="hbox78">
-	 <property name="visible">True</property>
-	 <property name="homogeneous">False</property>
-	 <property name="spacing">8</property>
+	 <child>
+		<widget class="GtkComboBox" id="sortorder">
+		 <property name="visible">True</property>
+		 <property name="items" translatable="yes">Ascending
+Descending</property>
+		 <property name="add_tearoffs">False</property>
+		 <property name="focus_on_click">True</property>
+		</widget>
+		<packing>
+		 <property name="padding">8</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
+		</packing>
+	 </child>
 
 	 <child>
-		<widget class="GtkLabel" id="label109">
+		<widget class="GtkButton" id="sortcancel">
 		 <property name="visible">True</property>
-		 <property name="label" translatable="yes">Order</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>
+		 <property name="can_default">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label">gtk-cancel</property>
+		 <property name="use_stock">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
+		 <property name="focus_on_click">True</property>
+		 <signal name="clicked" handler="on_sortcancel_clicked" last_modification_time="Sun, 07 Aug 2022 15:01:31 GMT"/>
 		</widget>
 		<packing>
-		 <property name="padding">0</property>
+		 <property name="padding">8</property>
 		 <property name="expand">False</property>
 		 <property name="fill">False</property>
 		</packing>
 	 </child>
 
 	 <child>
-		<widget class="GtkComboBox" id="sortorder">
+		<widget class="GtkButton" id="sortok">
 		 <property name="visible">True</property>
-		 <property name="items" translatable="yes">Ascending
-Descending</property>
-		 <property name="add_tearoffs">False</property>
+		 <property name="can_default">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="label">gtk-ok</property>
+		 <property name="use_stock">True</property>
+		 <property name="relief">GTK_RELIEF_NORMAL</property>
 		 <property name="focus_on_click">True</property>
+		 <signal name="clicked" handler="on_sortok_clicked" last_modification_time="Sun, 07 Aug 2022 15:01:53 GMT"/>
 		</widget>
 		<packing>
-		 <property name="padding">0</property>
-		 <property name="expand">True</property>
-		 <property name="fill">True</property>
+		 <property name="padding">8</property>
+		 <property name="expand">False</property>
+		 <property name="fill">False</property>
 		</packing>
 	 </child>
 	 </widget>
 	 <packing>
 	 <property name="padding">0</property>
-	 <property name="expand">True</property>
-	 <property name="fill">True</property>
+	 <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="expand">True</property>
+	 <property name="fill">True</property>
 	</packing>
 </child>
 </widget>
@@ -8808,7 +10758,7 @@
 	 <property name="left_margin">8</property>
 	 <property name="right_margin">8</property>
 	 <property name="indent">0</property>
-	 <property name="text" translatable="yes">This dialog allows to set custom title for any track. This is most useful for radio stations. An option to set the custom title is also present in the &quot;Add Location&quot; dialog. The title itself is visible in columns displaying the &quot;Artist&quot; metadata field. It should look like &quot;custom artist&quot; if the Artist field is present, or just &quot;custom&quot; otherwise.</property>
+	 <property name="text" translatable="yes">This dialog allows setting custom title for any track. This is most useful for radio stations. An option to set the custom title is also present in the &quot;Add Location&quot; dialog. The title itself is visible in columns displaying the &quot;Artist&quot; metadata field. It should look like &quot;custom artist&quot; if the Artist field is present, or just &quot;custom&quot; otherwise.</property>
 	 </widget>
 	 <packing>
 	 <property name="padding">0</property>
@@ -8868,6 +10818,958 @@
 	 </packing>
 	 </child>
 	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	</packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkMenu" id="trkproperties_popup_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="trkproperties_edit">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Edit</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_trkproperties_edit_activate" last_modification_time="Wed, 27 Apr 2016 15:40:16 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="trkproperties_edit_in_place">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Edit (in place)</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_trkproperties_edit_in_place_activate" last_modification_time="Wed, 27 Apr 2016 13:25:48 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="trkproperties_remove">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Remove</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_trkproperties_remove_activate" last_modification_time="Wed, 27 Apr 2016 13:25:48 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="trkproperties_crop">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Crop</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_trkproperties_crop_activate" last_modification_time="Wed, 27 Apr 2016 13:27:30 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="trkproperties_add_new_field">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Add new field...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_trkproperties_add_new_field_activate" last_modification_time="Wed, 27 Apr 2016 13:25:48 GMT"/>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkDialog" id="edit_tag_value_dlg">
+ <property name="width_request">300</property>
+ <property name="height_request">250</property>
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Edit Value</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+ <property name="has_separator">False</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox17">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area16">
+	 <property name="visible">True</property>
+	 <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	 <child>
+	 <widget class="GtkButton" id="cancelbutton12">
+	 <property name="visible">True</property>
+	 <property name="can_default">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="label">gtk-cancel</property>
+	 <property name="use_stock">True</property>
+	 <property name="relief">GTK_RELIEF_NORMAL</property>
+	 <property name="focus_on_click">True</property>
+	 <property name="response_id">-6</property>
+	 </widget>
+	 </child>
+
+	 <child>
+	 <widget class="GtkButton" id="okbutton12">
+	 <property name="visible">True</property>
+	 <property name="can_default">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="label">gtk-ok</property>
+	 <property name="use_stock">True</property>
+	 <property name="relief">GTK_RELIEF_NORMAL</property>
+	 <property name="focus_on_click">True</property>
+	 <property name="response_id">-5</property>
+	 </widget>
+	 </child>
+	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">True</property>
+	 <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+ </child>
+
+ <child>
+	<widget class="GtkVBox" id="vbox47">
+	 <property name="border_width">12</property>
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">8</property>
+
+	 <child>
+	 <widget class="GtkLabel" id="label160">
+	 <property name="visible">True</property>
+	 <property name="label" translatable="yes">Field name:</property>
+	 <property name="use_underline">False</property>
+	 <property name="use_markup">False</property>
+	 <property name="justify">GTK_JUSTIFY_LEFT</property>
+	 <property name="wrap">False</property>
+	 <property name="selectable">False</property>
+	 <property name="xalign">0</property>
+	 <property name="yalign">0.5</property>
+	 <property name="xpad">0</property>
+	 <property name="ypad">0</property>
+	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	 <property name="width_chars">-1</property>
+	 <property name="single_line_mode">False</property>
+	 <property name="angle">0</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkEntry" id="field_name">
+	 <property name="visible">True</property>
+	 <property name="editable">False</property>
+	 <property name="visibility">True</property>
+	 <property name="max_length">0</property>
+	 <property name="text" translatable="yes"></property>
+	 <property name="has_frame">True</property>
+	 <property name="invisible_char">•</property>
+	 <property name="activates_default">False</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkLabel" id="label161">
+	 <property name="visible">True</property>
+	 <property name="label" translatable="yes">Field value:</property>
+	 <property name="use_underline">False</property>
+	 <property name="use_markup">False</property>
+	 <property name="justify">GTK_JUSTIFY_LEFT</property>
+	 <property name="wrap">False</property>
+	 <property name="selectable">False</property>
+	 <property name="xalign">0</property>
+	 <property name="yalign">0.5</property>
+	 <property name="xpad">0</property>
+	 <property name="ypad">0</property>
+	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	 <property name="width_chars">-1</property>
+	 <property name="single_line_mode">False</property>
+	 <property name="angle">0</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkScrolledWindow" id="scrolledwindow13">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	 <property name="shadow_type">GTK_SHADOW_IN</property>
+	 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	 <child>
+		<widget class="GtkTextView" id="field_value">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="has_focus">True</property>
+		 <property name="editable">True</property>
+		 <property name="overwrite">False</property>
+		 <property name="accepts_tab">True</property>
+		 <property name="justification">GTK_JUSTIFY_LEFT</property>
+		 <property name="wrap_mode">GTK_WRAP_NONE</property>
+		 <property name="cursor_visible">True</property>
+		 <property name="pixels_above_lines">0</property>
+		 <property name="pixels_below_lines">0</property>
+		 <property name="pixels_inside_wrap">0</property>
+		 <property name="left_margin">0</property>
+		 <property name="right_margin">0</property>
+		 <property name="indent">0</property>
+		 <property name="text" translatable="yes"></property>
+		</widget>
+	 </child>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkLabel" id="label187">
+	 <property name="visible">True</property>
+	 <property name="label" translatable="yes">Use ; character to separate multiple values.</property>
+	 <property name="use_underline">False</property>
+	 <property name="use_markup">False</property>
+	 <property name="justify">GTK_JUSTIFY_LEFT</property>
+	 <property name="wrap">False</property>
+	 <property name="selectable">False</property>
+	 <property name="xalign">0</property>
+	 <property name="yalign">0.5</property>
+	 <property name="xpad">0</property>
+	 <property name="ypad">0</property>
+	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	 <property name="width_chars">-1</property>
+	 <property name="single_line_mode">False</property>
+	 <property name="angle">0</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
+	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	</packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkWindow" id="log_window">
+ <property name="visible">True</property>
+ <property name="events">GDK_KEY_PRESS_MASK</property>
+ <property name="title" translatable="yes">DeaDBeeF Log</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="default_width">400</property>
+ <property name="default_height">200</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="icon_name"></property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+ <signal name="key_press_event" handler="on_log_window_key_press_event" last_modification_time="Fri, 07 Apr 2017 20:09:58 GMT"/>
+
+ <child>
+ <widget class="GtkVBox" id="vbox49">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+	<widget class="GtkScrolledWindow" id="scrolledwindow14">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	 <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+	 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	 <child>
+	 <widget class="GtkTextView" id="logwindow_textview">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="editable">False</property>
+	 <property name="overwrite">False</property>
+	 <property name="accepts_tab">True</property>
+	 <property name="justification">GTK_JUSTIFY_LEFT</property>
+	 <property name="wrap_mode">GTK_WRAP_WORD</property>
+	 <property name="cursor_visible">True</property>
+	 <property name="pixels_above_lines">0</property>
+	 <property name="pixels_below_lines">0</property>
+	 <property name="pixels_inside_wrap">0</property>
+	 <property name="left_margin">10</property>
+	 <property name="right_margin">10</property>
+	 <property name="indent">0</property>
+	 <property name="text" translatable="yes"></property>
+	 </widget>
+	 </child>
+	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	</packing>
+ </child>
+
+ <child>
+	<widget class="GtkHBox" id="hbox140">
+	 <property name="border_width">5</property>
+	 <property name="visible">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">0</property>
+
+	 <child>
+	 <placeholder/>
+	 </child>
+
+	 <child>
+	 <widget class="GtkButton" id="log_clear">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="label" translatable="yes">Clear</property>
+	 <property name="use_underline">True</property>
+	 <property name="relief">GTK_RELIEF_NORMAL</property>
+	 <property name="focus_on_click">True</property>
+	 <signal name="clicked" handler="on_log_clear_clicked" last_modification_time="Fri, 07 Apr 2017 17:25:09 GMT"/>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	 <property name="pack_type">GTK_PACK_END</property>
+	 </packing>
+	 </child>
+	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	</packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkWindow" id="rg_scan_progress">
+ <property name="width_request">650</property>
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">ReplayGain Scan Progress</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox50">
+ <property name="border_width">12</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child>
+	<widget class="GtkHBox" id="hbox142">
+	 <property name="visible">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">8</property>
+
+	 <child>
+	 <widget class="GtkLabel" id="label166">
+	 <property name="visible">True</property>
+	 <property name="label" translatable="yes">Current File:</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="GtkEntry" id="rg_scan_progress_file">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="editable">False</property>
+	 <property name="visibility">True</property>
+	 <property name="max_length">0</property>
+	 <property name="text" translatable="yes"></property>
+	 <property name="has_frame">True</property>
+	 <property name="invisible_char">•</property>
+	 <property name="activates_default">False</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
+	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">True</property>
+	</packing>
+ </child>
+
+ <child>
+	<widget class="GtkProgressBar" id="rg_scan_progress_bar">
+	 <property name="visible">True</property>
+	 <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+	 <property name="fraction">0</property>
+	 <property name="pulse_step">0.10000000149</property>
+	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	</packing>
+ </child>
+
+ <child>
+	<widget class="GtkHBox" id="hbox143">
+	 <property name="visible">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">0</property>
+
+	 <child>
+	 <widget class="GtkLabel" id="rg_scan_progress_status">
+	 <property name="visible">True</property>
+	 <property name="label" translatable="yes">Status</property>
+	 <property name="use_underline">False</property>
+	 <property name="use_markup">False</property>
+	 <property name="justify">GTK_JUSTIFY_LEFT</property>
+	 <property name="wrap">False</property>
+	 <property name="selectable">False</property>
+	 <property name="xalign">0</property>
+	 <property name="yalign">0.5</property>
+	 <property name="xpad">0</property>
+	 <property name="ypad">0</property>
+	 <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+	 <property name="width_chars">-1</property>
+	 <property name="single_line_mode">True</property>
+	 <property name="angle">0</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkButton" id="rg_scan_progress_cancel">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="label" translatable="yes">Cancel</property>
+	 <property name="use_underline">True</property>
+	 <property name="relief">GTK_RELIEF_NORMAL</property>
+	 <property name="focus_on_click">True</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	 </packing>
+	 </child>
+	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">True</property>
+	</packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkWindow" id="rg_scan_results">
+ <property name="width_request">1000</property>
+ <property name="height_request">350</property>
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">ReplayGain Scan Results</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox51">
+ <property name="border_width">12</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child>
+	<widget class="GtkScrolledWindow" id="scrolledwindow15">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	 <property name="shadow_type">GTK_SHADOW_IN</property>
+	 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	 <child>
+	 <widget class="GtkTreeView" id="rg_scan_results_list">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="headers_visible">True</property>
+	 <property name="rules_hint">False</property>
+	 <property name="reorderable">False</property>
+	 <property name="enable_search">True</property>
+	 <property name="fixed_height_mode">False</property>
+	 <property name="hover_selection">False</property>
+	 <property name="hover_expand">False</property>
+	 </widget>
+	 </child>
+	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	</packing>
+ </child>
+
+ <child>
+	<widget class="GtkHBox" id="hbox144">
+	 <property name="visible">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">8</property>
+
+	 <child>
+	 <widget class="GtkLabel" id="rg_scan_results_status">
+	 <property name="visible">True</property>
+	 <property name="label" translatable="yes">Status</property>
+	 <property name="use_underline">False</property>
+	 <property name="use_markup">False</property>
+	 <property name="justify">GTK_JUSTIFY_LEFT</property>
+	 <property name="wrap">False</property>
+	 <property name="selectable">False</property>
+	 <property name="xalign">0</property>
+	 <property name="yalign">0.5</property>
+	 <property name="xpad">0</property>
+	 <property name="ypad">0</property>
+	 <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+	 <property name="width_chars">-1</property>
+	 <property name="single_line_mode">True</property>
+	 <property name="angle">0</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkButton" id="rg_scan_results_update">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="label" translatable="yes">Update File Tags</property>
+	 <property name="use_underline">True</property>
+	 <property name="relief">GTK_RELIEF_NORMAL</property>
+	 <property name="focus_on_click">True</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkButton" id="rg_scan_results_cancel">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="label" translatable="yes">Cancel</property>
+	 <property name="use_underline">True</property>
+	 <property name="relief">GTK_RELIEF_NORMAL</property>
+	 <property name="focus_on_click">True</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	 </packing>
+	 </child>
+	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">True</property>
+	</packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkMenu" id="plugin_list_popup_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="copy_plugin_report_menuitem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Copy report</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_copy_plugin_report_menuitem_activate" last_modification_time="Fri, 05 Mar 2021 18:40:56 GMT"/>
+
+ <child internal-child="image">
+	<widget class="GtkImage" id="image688">
+	 <property name="visible">True</property>
+	 <property name="stock">gtk-copy</property>
+	 <property name="icon_size">1</property>
+	 <property name="xalign">0.5</property>
+	 <property name="yalign">0.5</property>
+	 <property name="xpad">0</property>
+	 <property name="ypad">0</property>
+	</widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="only_show_plugins_with_configuration1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Only show plugins with configuration</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="activate" handler="on_only_show_plugins_with_configuration1_activate" last_modification_time="Wed, 10 Mar 2021 09:56:50 GMT"/>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkDialog" id="edit_multiple_tracks_dialog">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Edit Multiple Tracks</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+ <property name="has_separator">False</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox18">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area17">
+	 <property name="visible">True</property>
+	 <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	 <child>
+	 <widget class="GtkButton" id="cancelbutton13">
+	 <property name="visible">True</property>
+	 <property name="can_default">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="label">gtk-cancel</property>
+	 <property name="use_stock">True</property>
+	 <property name="relief">GTK_RELIEF_NORMAL</property>
+	 <property name="focus_on_click">True</property>
+	 <property name="response_id">-6</property>
+	 </widget>
+	 </child>
+
+	 <child>
+	 <widget class="GtkButton" id="okbutton13">
+	 <property name="visible">True</property>
+	 <property name="can_default">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="label">gtk-ok</property>
+	 <property name="use_stock">True</property>
+	 <property name="relief">GTK_RELIEF_NORMAL</property>
+	 <property name="focus_on_click">True</property>
+	 <property name="response_id">-5</property>
+	 </widget>
+	 </child>
+	</widget>
+	<packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">True</property>
+	 <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+ </child>
+
+ <child>
+	<widget class="GtkVBox" id="vbox60">
+	 <property name="border_width">12</property>
+	 <property name="visible">True</property>
+	 <property name="homogeneous">False</property>
+	 <property name="spacing">8</property>
+
+	 <child>
+	 <widget class="GtkLabel" id="label183">
+	 <property name="visible">True</property>
+	 <property name="label" translatable="yes">Field Name:</property>
+	 <property name="use_underline">False</property>
+	 <property name="use_markup">False</property>
+	 <property name="justify">GTK_JUSTIFY_LEFT</property>
+	 <property name="wrap">False</property>
+	 <property name="selectable">False</property>
+	 <property name="xalign">0</property>
+	 <property name="yalign">0.5</property>
+	 <property name="xpad">0</property>
+	 <property name="ypad">0</property>
+	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	 <property name="width_chars">-1</property>
+	 <property name="single_line_mode">False</property>
+	 <property name="angle">0</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkEntry" id="entry_field_name">
+	 <property name="visible">True</property>
+	 <property name="editable">False</property>
+	 <property name="visibility">True</property>
+	 <property name="max_length">0</property>
+	 <property name="text" translatable="yes"></property>
+	 <property name="has_frame">True</property>
+	 <property name="invisible_char">●</property>
+	 <property name="activates_default">False</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkNotebook" id="notebook">
+	 <property name="visible">True</property>
+	 <property name="can_focus">True</property>
+	 <property name="show_tabs">True</property>
+	 <property name="show_border">True</property>
+	 <property name="tab_pos">GTK_POS_TOP</property>
+	 <property name="scrollable">False</property>
+	 <property name="enable_popup">False</property>
+
+	 <child>
+		<widget class="GtkScrolledWindow" id="scrolledwindow22">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		 <property name="shadow_type">GTK_SHADOW_IN</property>
+		 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		 <child>
+		 <widget class="GtkTextView" id="textview_single_value">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="has_focus">True</property>
+		 <property name="editable">True</property>
+		 <property name="overwrite">False</property>
+		 <property name="accepts_tab">True</property>
+		 <property name="justification">GTK_JUSTIFY_LEFT</property>
+		 <property name="wrap_mode">GTK_WRAP_NONE</property>
+		 <property name="cursor_visible">True</property>
+		 <property name="pixels_above_lines">0</property>
+		 <property name="pixels_below_lines">0</property>
+		 <property name="pixels_inside_wrap">0</property>
+		 <property name="left_margin">0</property>
+		 <property name="right_margin">0</property>
+		 <property name="indent">0</property>
+		 <property name="text" translatable="yes"></property>
+		 </widget>
+		 </child>
+		</widget>
+		<packing>
+		 <property name="tab_expand">False</property>
+		 <property name="tab_fill">True</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkLabel" id="label184">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">Single Value</property>
+		 <property name="use_underline">False</property>
+		 <property name="use_markup">False</property>
+		 <property name="justify">GTK_JUSTIFY_LEFT</property>
+		 <property name="wrap">False</property>
+		 <property name="selectable">False</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xpad">0</property>
+		 <property name="ypad">0</property>
+		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		 <property name="width_chars">-1</property>
+		 <property name="single_line_mode">False</property>
+		 <property name="angle">0</property>
+		</widget>
+		<packing>
+		 <property name="type">tab</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkScrolledWindow" id="scrolledwindow23">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		 <property name="shadow_type">GTK_SHADOW_IN</property>
+		 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		 <child>
+		 <widget class="GtkTreeView" id="treeview_individual_values">
+		 <property name="visible">True</property>
+		 <property name="can_focus">True</property>
+		 <property name="headers_visible">True</property>
+		 <property name="rules_hint">False</property>
+		 <property name="reorderable">False</property>
+		 <property name="enable_search">True</property>
+		 <property name="fixed_height_mode">False</property>
+		 <property name="hover_selection">False</property>
+		 <property name="hover_expand">False</property>
+		 </widget>
+		 </child>
+		</widget>
+		<packing>
+		 <property name="tab_expand">False</property>
+		 <property name="tab_fill">True</property>
+		</packing>
+	 </child>
+
+	 <child>
+		<widget class="GtkLabel" id="label185">
+		 <property name="visible">True</property>
+		 <property name="label" translatable="yes">Individual Values</property>
+		 <property name="use_underline">False</property>
+		 <property name="use_markup">False</property>
+		 <property name="justify">GTK_JUSTIFY_LEFT</property>
+		 <property name="wrap">False</property>
+		 <property name="selectable">False</property>
+		 <property name="xalign">0.5</property>
+		 <property name="yalign">0.5</property>
+		 <property name="xpad">0</property>
+		 <property name="ypad">0</property>
+		 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		 <property name="width_chars">-1</property>
+		 <property name="single_line_mode">False</property>
+		 <property name="angle">0</property>
+		</widget>
+		<packing>
+		 <property name="type">tab</property>
+		</packing>
+	 </child>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">True</property>
+	 <property name="fill">True</property>
+	 </packing>
+	 </child>
+
+	 <child>
+	 <widget class="GtkLabel" id="label186">
+	 <property name="visible">True</property>
+	 <property name="label" translatable="yes">Use ; character to separate multiple values.</property>
+	 <property name="use_underline">False</property>
+	 <property name="use_markup">False</property>
+	 <property name="justify">GTK_JUSTIFY_LEFT</property>
+	 <property name="wrap">False</property>
+	 <property name="selectable">False</property>
+	 <property name="xalign">0</property>
+	 <property name="yalign">0.5</property>
+	 <property name="xpad">0</property>
+	 <property name="ypad">0</property>
+	 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	 <property name="width_chars">-1</property>
+	 <property name="single_line_mode">False</property>
+	 <property name="angle">0</property>
+	 </widget>
+	 <packing>
+	 <property name="padding">0</property>
+	 <property name="expand">False</property>
+	 <property name="fill">False</property>
+	 </packing>
+	 </child>
+	</widget>
 	<packing>
 	 <property name="padding">0</property>
 	 <property name="expand">True</property>

deadbeef-1.9.6.tar.bz2/plugins/gtkui/deadbeefapp.c Added

@@ -0,0 +1,143 @@
+/*
+ DeaDBeeF -- the music player
+ GtkApplication implementation
+ Copyright (C) 2017 Nicolai Syvertsen
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include <gtk/gtk.h>
+
+#if GTK_CHECK_VERSION(3,10,0)
+
+#include "deadbeefapp.h"
+#include "gtkui.h"
+#include "prefwin/prefwin.h"
+#include "support.h"
+
+struct _DeadbeefApp
+{
+ GtkApplication parent;
+
+ GSimpleAction *logaction;
+};
+
+G_DEFINE_TYPE(DeadbeefApp, deadbeef_app, GTK_TYPE_APPLICATION);
+
+DeadbeefApp *gapp;
+
+static void
+appmenu_quit_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
+{
+ gtkui_quit ();
+}
+
+static void
+appmenu_preferences_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
+{
+ prefwin_run (-1);
+}
+
+static void
+appmenu_log_change_state (GSimpleAction *action,
+ GVariant *value,
+ gpointer user_data)
+{
+ gboolean val = g_variant_get_boolean (value);
+ gtkui_show_log_window (val);
+}
+
+static void
+appmenu_about_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer user_data)
+{
+ GtkWidget *item = lookup_widget (mainwin, "about1");
+ gtk_menu_item_activate ( GTK_MENU_ITEM (item));
+}
+
+static GActionEntry app_entries = {
+ { "preferences", appmenu_preferences_activated, NULL, NULL, NULL },
+ { "log", NULL, NULL, "false", appmenu_log_change_state },
+ { "about", appmenu_about_activated, NULL, NULL, NULL },
+ { "quit", appmenu_quit_activated, NULL, NULL, NULL }
+};
+
+static void
+deadbeef_app_init (DeadbeefApp *app)
+{
+}
+
+static void
+deadbeef_app_activate (GApplication *application) {
+ if (mainwin) {
+ gtk_window_present (GTK_WINDOW (mainwin));
+ }
+}
+
+static void
+deadbeef_app_startup (GApplication *application) {
+ G_APPLICATION_CLASS (deadbeef_app_parent_class)->startup (application);
+
+#if GTK_CHECK_VERSION(3,14,0)
+ int preferappmenu = gtk_application_prefers_app_menu (GTK_APPLICATION(application));
+#else
+ int preferappmenu = 1;
+#endif
+
+ if (preferappmenu) {
+ g_action_map_add_action_entries (G_ACTION_MAP (application), app_entries, G_N_ELEMENTS (app_entries), application);
+ DEADBEEF_APP (application)->logaction = G_SIMPLE_ACTION (g_action_map_lookup_action ( G_ACTION_MAP (application), "log"));
+ } else {
+ gtk_application_set_app_menu (GTK_APPLICATION(application), NULL);
+ }
+
+ gtkui_mainwin_init ();
+}
+
+GSimpleAction *
+deadbeef_app_get_log_action(DeadbeefApp *application) {
+ return application->logaction;
+}
+
+static void
+deadbeef_app_shutdown (GApplication *application) {
+ G_APPLICATION_CLASS (deadbeef_app_parent_class)->shutdown (application);
+}
+
+static void
+deadbeef_app_class_init (DeadbeefAppClass *class)
+{
+ G_APPLICATION_CLASS (class)->activate = deadbeef_app_activate;
+ G_APPLICATION_CLASS (class)->startup = deadbeef_app_startup;
+ G_APPLICATION_CLASS (class)->shutdown = deadbeef_app_shutdown;
+}
+
+DeadbeefApp *
+deadbeef_app_new (void)
+{
+ return g_object_new (DEADBEEF_APP_TYPE,
+ "application-id", "music.deadbeef.player",
+ "flags", G_APPLICATION_FLAGS_NONE,
+ NULL);
+}
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gtkui/deadbeefapp.h Added

@@ -0,0 +1,47 @@
+/*
+ DeaDBeeF -- the music player
+ GtkApplication implementation
+ Copyright (C) 2017 Nicolai Syvertsen
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef __GTKUI_DEADBEEFAPP_H
+#define __GTKUI_DEADBEEFAPP_H
+
+#include <gtk/gtk.h>
+
+#define DEADBEEF_APP_TYPE (deadbeef_app_get_type ())
+GType deadbeef_app_get_type (void);
+typedef struct _DeadbeefApp DeadbeefApp;
+typedef struct { GtkApplicationClass parent_class; } DeadbeefAppClass;
+
+static inline DeadbeefApp * DEADBEEF_APP(gpointer ptr) {
+ return G_TYPE_CHECK_INSTANCE_CAST (ptr, deadbeef_app_get_type (), DeadbeefApp);
+}
+// Only available since GLib 2.44:
+//G_DECLARE_FINAL_TYPE (DeadbeefApp, deadbeef_app, DEADBEEF, APP, GtkApplication)
+
+
+DeadbeefApp *
+deadbeef_app_new (void);
+
+GSimpleAction *
+deadbeef_app_get_log_action(DeadbeefApp *application);
+
+#endif /*__GTKUI_DEADBEEFAPP_H*/

deadbeef-0.6.2.tar.bz2/plugins/gtkui/drawing.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/drawing.h Changed

@@ -1,25 +1,31 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifndef __DRAWING_H
 #define __DRAWING_H
 
 #include <stdint.h>
+#include <gtk/gtk.h>
 
 typedef struct {
 cairo_t *drawable;
@@ -34,50 +40,106 @@
 
 // abstract api for drawing primitives
 
+enum {
+ DDB_LIST_FONT = 0,
+ DDB_GROUP_FONT = 1,
+ DDB_TABSTRIP_FONT = 2,
+ DDB_COLUMN_FONT = 3,
+};
+
+
 void
-drawctx_init (drawctx_t *ctx);
+drawctx_init (drawctx_t * const ctx);
 
 void
-draw_begin (drawctx_t *ctx, cairo_t *cr);
+draw_begin (drawctx_t * const ctx, cairo_t *cr);
 
 void
-draw_end (drawctx_t *ctx);
+draw_end (drawctx_t * const ctx);
 
 void
-draw_free (drawctx_t *ctx);
+draw_free (drawctx_t * const ctx);
 
 void
-draw_set_fg_color (drawctx_t *ctx, float *rgb);
+draw_set_fg_color (drawctx_t * const ctx, float *rgb);
 
 void
-draw_line (drawctx_t *ctx, float x1, float y1, float x2, float y2);
+draw_line (drawctx_t * const ctx, float x1, float y1, float x2, float y2);
 
 void
-draw_rect (drawctx_t *ctx, float x, float y, float w, float h, int fill);
+draw_rect (drawctx_t * const ctx, float x, float y, float w, float h, int fill);
 
 float
-draw_get_font_size (drawctx_t *ctx);
+draw_get_font_size (drawctx_t * const ctx);
+
+void
+draw_init_font (drawctx_t * const ctx, int type, int reset);
 
 void
-draw_init_font (drawctx_t *ctx, GtkStyle *style);
+draw_init_font_style (drawctx_t * const ctx, int bold, int italic, int type);
 
 void
-draw_init_font_bold (drawctx_t *ctx);
+draw_init_font_normal (drawctx_t * const ctx);
 
 void
-draw_init_font_normal (drawctx_t *ctx);
+draw_text (drawctx_t * const ctx, float x, float y, int width, int align, const char *text);
 
 void
-draw_text (drawctx_t *ctx, float x, float y, int width, int align, const char *text);
+draw_text_custom (drawctx_t * const ctx, float x, float y, int width, int align, int type, int bold, int italic, const char *text);
 
 void
-draw_text_with_colors (drawctx_t *ctx, float x, float y, int width, int align, const char *text);
+draw_text_with_colors (drawctx_t * const ctx, float x, float y, int width, int align, const char *text);
 
 void
-draw_get_text_extents (drawctx_t *ctx, const char *text, int len, int *w, int *h);
+draw_get_layout_extents (drawctx_t * const ctx, int *w, int *h);
+
+void
+draw_get_text_extents (drawctx_t * const ctx, const char *text, int len, int *w, int *h);
+
+int
+draw_is_ellipsized (drawctx_t * const ctx);
+
+const char *
+draw_get_text (drawctx_t * const ctx);
+
+int
+draw_get_listview_rowheight (drawctx_t * const ctx);
+
+int
+gtkui_listview_override_conf (const char *conf_str);
+
+int
+gtkui_listview_font_conf (const char *conf_str);
 
 int
-draw_get_listview_rowheight (drawctx_t *ctx);
+gtkui_listview_font_style_conf (const char *conf_str);
+
+int
+gtkui_listview_colors_conf (const char *conf_str);
+
+int
+gtkui_tabstrip_override_conf (const char *conf_str);
+
+int
+gtkui_tabstrip_colors_conf (const char *conf_str);
+
+int
+gtkui_tabstrip_font_conf (const char *conf_str);
+
+int
+gtkui_tabstrip_font_style_conf (const char *conf_str);
+
+int
+gtkui_bar_override_conf (const char *conf_str);
+
+int
+gtkui_bar_colors_conf (const char *conf_str);
+
+void
+gtkui_get_vis_custom_base_color (GdkColor *clr);
+
+void
+gtkui_get_vis_custom_background_color (GdkColor *clr);
 
 void
 gtkui_get_bar_foreground_color (GdkColor *clr);
@@ -101,6 +163,12 @@
 gtkui_get_tabstrip_text_color (GdkColor *clr);
 
 void
+gtkui_get_tabstrip_playing_text_color (GdkColor *clr);
+
+void
+gtkui_get_tabstrip_selected_text_color (GdkColor *clr);
+
+void
 gtkui_get_listview_even_row_color (GdkColor *clr);
 
 void
@@ -116,8 +184,29 @@
 gtkui_get_listview_selected_text_color (GdkColor *clr);
 
 void
+gtkui_get_listview_playing_text_color (GdkColor *clr);
+
+void
+gtkui_get_listview_playing_row_color (GdkColor *clr);
+
+void
+gtkui_get_listview_group_text_color (GdkColor *clr);
+
+void
+gtkui_get_listview_column_text_color (GdkColor *clr);
+
+void
 gtkui_get_listview_cursor_color (GdkColor *clr);
 
+const char*
+gtkui_get_listview_text_font (void);
+
+const char *
+gtkui_get_listview_group_text_font (void);
+
+const char *
+gtkui_get_listview_column_text_font (void);
+
 void
 gtkui_init_theme_colors (void);
 
@@ -130,4 +219,7 @@
 int
 gtkui_override_tabstrip_colors (void);
 
+const char *
+gtkui_get_tabstrip_text_font (void);
+
 #endif // __DRAWING_H

deadbeef-0.6.2.tar.bz2/plugins/gtkui/dspconfig.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/dspconfig.c Changed

@@ -1,21 +1,26 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -31,12 +36,13 @@
 #include "callbacks.h"
 #include "interface.h"
 #include "support.h"
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include "gtkui.h"
 #include "pluginconf.h"
 
 static ddb_dsp_context_t *chain;
 static GtkWidget *prefwin;
+static GtkWidget *dsp_popup;
 
 static ddb_dsp_context_t *
 dsp_clone (ddb_dsp_context_t *from) {
@@ -85,7 +91,7 @@
 gtk_list_store_clear (mdl);
 struct dirent **namelist = NULL;
 char path1024;
- if (snprintf (path, sizeof (path), "%s/presets/dsp", deadbeef->get_config_dir ()) > 0) {
+ if (snprintf (path, sizeof (path), "%s/presets/dsp", deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG)) > 0) {
 int n = scandir (path, &namelist, scandir_preset_filter, dirent_alphasort);
 int i;
 for (i = 0; i < n; i++) {
@@ -112,6 +118,152 @@
 }
 }
 
+static void
+on_dsp_list_view_sel_changed(GtkTreeSelection *treeselection, gpointer user_data)
+{
+ GtkWidget *configbtn = lookup_widget (prefwin, "dsp_configure_toolbtn");
+ GtkWidget *removebtn = lookup_widget (prefwin, "dsp_remove_toolbtn");
+ GtkWidget *upbtn = lookup_widget (prefwin, "dsp_up_toolbtn");
+ GtkWidget *downbtn = lookup_widget (prefwin, "dsp_down_toolbtn");
+
+ GtkTreeModel *mdl;
+ GtkTreeIter iter;
+
+ gboolean has_selection = gtk_tree_selection_get_selected (treeselection, &mdl, &iter);
+ if (has_selection) {
+ int count = gtk_tree_model_iter_n_children (mdl, NULL);
+ GtkTreePath *path = gtk_tree_model_get_path (mdl, &iter);
+ int *ind = gtk_tree_path_get_indices (path);
+ gtk_widget_set_sensitive (upbtn, *ind > 0);
+ gtk_widget_set_sensitive (downbtn, *ind < count-1);
+ } else {
+ gtk_widget_set_sensitive (upbtn, FALSE);
+ gtk_widget_set_sensitive (downbtn, FALSE);
+ }
+
+ gtk_widget_set_sensitive (configbtn, has_selection);
+ gtk_widget_set_sensitive (removebtn, has_selection);
+}
+
+static void
+update_streamer (void) {
+ deadbeef->streamer_set_dsp_chain (chain);
+}
+
+static int
+listview_get_index (GtkWidget *list) {
+ GtkTreePath *path;
+ GtkTreeViewColumn *col;
+ gtk_tree_view_get_cursor (GTK_TREE_VIEW (list), &path, &col);
+ if (!path) {
+ // nothing selected
+ return -1;
+ }
+ int *indices = gtk_tree_path_get_indices (path);
+ int idx = *indices;
+ g_free (indices);
+ return idx;
+}
+
+static void
+on_dsp_popup_menu_item_activate(GtkMenuItem* self, gpointer user_data)
+{
+ // create new instance of the selected plugin
+ struct DB_dsp_s* dsp = user_data;
+ ddb_dsp_context_t *inst=NULL;
+ if (dsp && dsp->open) {
+ inst = dsp->open();
+ }
+ if (inst) {
+ GtkWidget *list = lookup_widget (prefwin, "dsp_listview");
+ int idx = listview_get_index (list);
+
+ // append to DSP chain at index
+ ddb_dsp_context_t *p = chain;
+ ddb_dsp_context_t *prev = NULL;
+ int i = idx;
+ while (p && i--) {
+ prev = p;
+ p = p->next;
+ }
+ if (p) {
+ if (prev) {
+ inst->next = p->next;
+ prev->next = p;
+ p->next = inst;
+ }
+ else {
+ inst->next = p->next;
+ chain->next = inst;
+ }
+ } else {
+ chain = inst;
+ }
+
+ // reinit list of instances
+ GtkListStore *mdl = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW(list)));
+ gtk_list_store_clear (mdl);
+ fill_dsp_chain (mdl);
+ // Update cursor to newly inserted item
+ GtkTreePath *path = gtk_tree_path_new_from_indices (idx+1, -1);
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (list), path, NULL, FALSE);
+ gtk_tree_path_free (path);
+
+ update_streamer ();
+ }
+ else {
+ fprintf (stderr, "prefwin: failed to add DSP plugin to chain\n");
+ }
+}
+
+GtkWidget *make_dsp_popup_menu(void)
+{
+ struct DB_dsp_s **dsp = deadbeef->plug_get_dsp_list ();
+ int i;
+ GtkWidget *menu = gtk_menu_new();
+ for (i = 0; dspi; i++) {
+ GtkWidget *item = gtk_menu_item_new_with_label(dspi->plugin.name);
+ gtk_widget_show (item);
+ g_signal_connect(G_OBJECT (item), "activate",
+ G_CALLBACK (on_dsp_popup_menu_item_activate), (void*)dspi);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ }
+ return menu;
+}
+
+static void
+on_dsp_popup_hide(GtkWidget* attach_widget, GtkMenu* menu)
+{
+ GtkWidget *togglebtn = lookup_widget (prefwin, "dsp_add_toolbtn");
+ gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (togglebtn), FALSE);
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+static void
+_dsp_use_symbolic_icons(void) {
+ GtkWidget *addbtn = lookup_widget (prefwin, "dsp_add_toolbtn");
+ GtkWidget *configbtn = lookup_widget (prefwin, "dsp_configure_toolbtn");
+ GtkWidget *removebtn = lookup_widget (prefwin, "dsp_remove_toolbtn");
+ GtkWidget *upbtn = lookup_widget (prefwin, "dsp_up_toolbtn");
+ GtkWidget *downbtn = lookup_widget (prefwin, "dsp_down_toolbtn");
+
+ gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (addbtn), NULL);
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (addbtn), "list-add-symbolic");
+
+ gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (configbtn), NULL);
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (configbtn), "preferences-system-symbolic");
+
+ gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (removebtn), NULL);
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (removebtn), "list-remove-symbolic");
+
+ gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (upbtn), NULL);
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (upbtn), "go-up-symbolic");
+
+ gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (downbtn), NULL);
+ gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (downbtn), "go-down-symbolic");
+}
+#endif
+
 void
 dsp_setup_init (GtkWidget *_prefwin) {
 prefwin = _prefwin;
@@ -133,6 +285,8 @@
 
 // fill dsp_listview
 GtkWidget *listview = lookup_widget (prefwin, "dsp_listview");
+ GtkTreeSelection *listview_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (listview));
+ g_signal_connect ((gpointer)listview_sel, "changed", G_CALLBACK (on_dsp_list_view_sel_changed), NULL);
 
 
 GtkCellRenderer *title_cell = gtk_cell_renderer_text_new ();
@@ -148,6 +302,19 @@
 
 GtkWidget *combobox = lookup_widget (prefwin, "dsp_preset");
 dsp_fill_preset_list (combobox);
+
+ // Make dsp popup menu
+ dsp_popup = make_dsp_popup_menu ();
+ g_signal_connect ((gpointer)dsp_popup, "hide", G_CALLBACK (on_dsp_popup_hide), NULL);
+ gtk_menu_attach_to_widget (GTK_MENU (dsp_popup), prefwin, NULL);
+
+ // Styling
+ GtkWidget *dsp_toolbar = lookup_widget (prefwin, "dsp_toolbar");
+ gtk_toolbar_set_icon_size (GTK_TOOLBAR (dsp_toolbar), GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+#if GTK_CHECK_VERSION(3,0,0)
+ _dsp_use_symbolic_icons ();
+#endif
 }
 
 void
@@ -160,95 +327,8 @@
 prefwin = NULL;
 }
 
-static void
-fill_dsp_plugin_list (GtkListStore *mdl) {
- struct DB_dsp_s **dsp = deadbeef->plug_get_dsp_list ();
- int i;
- for (i = 0; dspi; i++) {
- GtkTreeIter iter;
- gtk_list_store_append (mdl, &iter);
- gtk_list_store_set (mdl, &iter, 0, dspi->plugin.name, -1);
- }
-}
-
-static void
-update_streamer (void) {
- deadbeef->streamer_set_dsp_chain (chain);
-}
-
 void
-on_dsp_add_clicked (GtkButton *button,
- gpointer user_data)
-{
- GtkWidget *dlg = create_select_dsp_plugin ();
- gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
- gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefwin));
- gtk_window_set_title (GTK_WINDOW (dlg), _("Add plugin to DSP chain"));
- 
- GtkComboBox *combo;
- // fill encoder presets
- combo = GTK_COMBO_BOX (lookup_widget (dlg, "plugin"));
- GtkListStore *mdl = GTK_LIST_STORE (gtk_combo_box_get_model (combo));
- fill_dsp_plugin_list (mdl);
- gtk_combo_box_set_active (combo, deadbeef->conf_get_int ("converter.last_selected_dsp", 0));
-
- int r = gtk_dialog_run (GTK_DIALOG (dlg));
- if (r == GTK_RESPONSE_OK) {
- // create new instance of the selected plugin
- int idx = gtk_combo_box_get_active (combo);
- struct DB_dsp_s **dsp = deadbeef->plug_get_dsp_list ();
- int i;
- ddb_dsp_context_t *inst = NULL;
- for (i = 0; dspi; i++) {
- if (i == idx) {
- inst = dspi->open ();
- break;
- }
- }
- if (inst) {
- // append to DSP chain
- ddb_dsp_context_t *tail = chain;
- while (tail && tail->next) {
- tail = tail->next;
- }
- if (tail) {
- tail->next = inst;
- }
- else {
- chain = inst;
- }
-
- // reinit list of instances
- GtkWidget *list = lookup_widget (prefwin, "dsp_listview");
- GtkListStore *mdl = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW(list)));
- gtk_list_store_clear (mdl);
- fill_dsp_chain (mdl);
- update_streamer ();
- }
- else {
- fprintf (stderr, "prefwin: failed to add DSP plugin to chain\n");
- }
- }
- gtk_widget_destroy (dlg);
-}
-
-static int
-listview_get_index (GtkWidget *list) {
- GtkTreePath *path;
- GtkTreeViewColumn *col;
- gtk_tree_view_get_cursor (GTK_TREE_VIEW (list), &path, &col);
- if (!path) {
- // nothing selected
- return -1;
- }
- int *indices = gtk_tree_path_get_indices (path);
- int idx = *indices;
- g_free (indices);
- return idx;
-}
-
-void
-on_dsp_remove_clicked (GtkButton *button,
+on_dsp_remove_toolbtn_clicked (GtkToolButton *toolbutton,
 gpointer user_data)
 {
 GtkWidget *list = lookup_widget (prefwin, "dsp_listview");
@@ -429,7 +509,7 @@
 on_dsp_preset_save_clicked (GtkButton *button,
 gpointer user_data)
 {
- const char *confdir = deadbeef->get_config_dir ();
+ const char *confdir = deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG);
 char path1024;
 if (snprintf (path, sizeof (path), "%s/presets", confdir) < 0) {
 return;
@@ -464,7 +544,7 @@
 if (entry) {
 const char *text = gtk_entry_get_text (GTK_ENTRY (entry));
 char pathPATH_MAX;
- if (snprintf (path, sizeof (path), "%s/presets/dsp/%s.txt", deadbeef->get_config_dir (), text) > 0) {
+ if (snprintf (path, sizeof (path), "%s/presets/dsp/%s.txt", deadbeef->get_system_dir (DDB_SYS_DIR_CONFIG), text) > 0) {
 ddb_dsp_context_t *new_chain = NULL;
 int res = deadbeef->dsp_preset_load (path, &new_chain);
 if (!res) {
@@ -480,3 +560,123 @@
 }
 }
 
+void
+on_dsp_toolbtn_up_clicked (GtkToolButton *toolbutton,
+ gpointer user_data)
+{
+ GtkWidget *list = lookup_widget (prefwin, "dsp_listview");
+ int idx = listview_get_index (list);
+ if (idx <= 0) {
+ return;
+ }
+
+ if (-1 == swap_items (list, idx-1)) {
+ return;
+ }
+ GtkTreePath *path = gtk_tree_path_new_from_indices (idx-1, -1);
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (list), path, NULL, FALSE);
+ gtk_tree_path_free (path);
+ update_streamer ();
+}
+
+
+void
+on_dsp_toolbtn_down_clicked (GtkToolButton *toolbutton,
+ gpointer user_data)
+{
+ GtkWidget *list = lookup_widget (prefwin, "dsp_listview");
+ int idx = listview_get_index (list);
+ if (idx == -1) {
+ return;
+ }
+
+ if (-1 == swap_items (list, idx)) {
+ return;
+ }
+ GtkTreePath *path = gtk_tree_path_new_from_indices (idx+1, -1);
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (list), path, NULL, FALSE);
+ gtk_tree_path_free (path);
+ update_streamer ();
+}
+
+static void
+show_dsp_configure_dlg(void)
+{
+ GtkWidget *list = lookup_widget (prefwin, "dsp_listview");
+ int idx = listview_get_index (list);
+ if (idx == -1) {
+ return;
+ }
+ ddb_dsp_context_t *p = chain;
+ int i = idx;
+ while (p && i--) {
+ p = p->next;
+ }
+ if (!p || !p->plugin->configdialog) {
+ return;
+ }
+ current_dsp_context = p;
+ ddb_dialog_t conf = {
+ .title = p->plugin->plugin.name,
+ .layout = p->plugin->configdialog,
+ .set_param = dsp_ctx_set_param,
+ .get_param = dsp_ctx_get_param,
+ };
+ int response = gtkui_run_dialog (prefwin, &conf, 0, button_cb, NULL);
+ if (response == ddb_button_ok) {
+ update_streamer ();
+ }
+ current_dsp_context = NULL;
+}
+
+void
+on_dsp_configure_toolbtn_clicked (GtkToolButton *toolbutton,
+ gpointer user_data)
+{
+ show_dsp_configure_dlg ();
+}
+
+void
+on_dsp_listview_row_activated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data)
+{
+ show_dsp_configure_dlg ();
+}
+
+#if !GTK_CHECK_VERSION(3,22,0)
+static void
+set_position(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data)
+{
+ GtkWidget *button = GTK_WIDGET(user_data);
+ GtkAllocation a;
+ gtk_widget_get_allocation(GTK_WIDGET (button), &a);
+
+ GtkRequisition r;
+ gtk_widget_size_request(GTK_WIDGET (menu), &r);
+
+ gdk_window_get_origin(gtk_widget_get_window(button), x, y);
+ *x += a.x;
+ *y += a.y - (r.height);
+ *push_in = TRUE;
+}
+#endif
+
+void
+on_dsp_add_toolbtn_toggled (GtkToggleToolButton *toggletoolbutton,
+ gpointer user_data)
+{
+ if (gtk_toggle_tool_button_get_active(toggletoolbutton)) {
+#if GTK_CHECK_VERSION(3,22,0)
+ gtk_menu_popup_at_widget (GTK_MENU (dsp_popup), GTK_WIDGET (toggletoolbutton), GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_SOUTH_WEST, NULL);
+#else
+
+ gtk_menu_popup(GTK_MENU (dsp_popup),
+ NULL, NULL,
+ (GtkMenuPositionFunc) set_position, toggletoolbutton,
+ 0, gtk_get_current_event_time());
+
+#endif
+ }
+}

deadbeef-0.6.2.tar.bz2/plugins/gtkui/dspconfig.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/dspconfig.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/eq.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/eq.c Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/eq.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/eq.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/fileman.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/fileman.c Changed

@@ -1,10 +1,33 @@
-#include "../../deadbeef.h"
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <deadbeef/deadbeef.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 #include "gtkui.h"
-#include "ddblistview.h"
+#include "playlist/ddblistview.h"
 #include "progress.h"
 #include "support.h"
 
@@ -40,7 +63,7 @@
 if (!deadbeef->plt_get_title (plt, t, sizeof (t))) {
 char *def = _("New Playlist");
 if (!strncmp (t, def, strlen (def)) || empty) {
- const char *folder = strrchr ((char*)lst->data, '/');
+ const char *folder = strrchr ((char*)lst->data, G_DIR_SEPARATOR);
 if (!folder) {
 folder = lst->data;
 }
@@ -112,14 +135,14 @@
 deadbeef->pl_save_current ();
 deadbeef->pl_set_cursor (PL_MAIN, 0);
 deadbeef->conf_save ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, 0, 0);
 }
 
 void
 gtkui_open_files (struct _GSList *lst) {
 deadbeef->pl_clear ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 
 intptr_t tid = deadbeef->thread_start (open_files_worker, lst);
 deadbeef->thread_detach (tid);
@@ -171,12 +194,12 @@
 set_dnd_cursor_idle (gpointer data) {
 if (!data) {
 deadbeef->pl_set_cursor (PL_MAIN, -1);
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 return FALSE;
 }
 int cursor = deadbeef->pl_get_idx_of (DB_PLAYITEM (data));
 deadbeef->pl_set_cursor (PL_MAIN, cursor);
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 return FALSE;
 }
 
@@ -200,12 +223,12 @@
 const uint8_t *p = (const uint8_t*)ptr;
 while (*p) {
 const uint8_t *pe = p;
- while (*pe && *pe > ' ') {
+ while (*pe && *pe >= ' ') {
 pe++;
 }
 if (pe - p < 4096 && pe - p > 7) {
 char fname(int)(pe - p)+1;
- strcopy_special (fname, p, pe-p);
+ strcopy_special (fname, (const char *)p, (int)(pe-p));
 //strncpy (fname, p, pe - p);
 //fnamepe - p = 0;
 int abort = 0;
@@ -277,3 +300,382 @@
 intptr_t tid = deadbeef->thread_start (fmdrop_worker, data);
 deadbeef->thread_detach (tid);
 }
+
+#if GTK_CHECK_VERSION(3,20,0)
+# ifdef __MINGW32__
+# define USE_GTK_NATIVE_FILE_CHOOSER
+# endif
+#else // Make sure that native file chooser is off for GTK2
+# undef USE_GTK_NATIVE_FILE_CHOOSER
+#endif
+
+#ifdef USE_GTK_NATIVE_FILE_CHOOSER
+static GtkFileFilter *
+set_file_filter (GtkFileChooser *dlg, const char *name) {
+ if (!name) {
+ name = _("Supported sound formats");
+ }
+
+ GtkFileFilter* flt;
+
+ flt = gtk_file_filter_new ();
+ gtk_file_filter_set_name (flt, name);
+
+ // Add supported extensions
+ DB_decoder_t **codecs = deadbeef->plug_get_decoder_list ();
+ for (int i = 0; codecsi; i++) {
+ if (codecsi->exts && codecsi->insert) {
+ const char **exts = codecsi->exts;
+ char buf100;
+ for (int e = 0; extse; e++) {
+ snprintf (buf, sizeof (buf), "*.%s", extse);
+ gtk_file_filter_add_pattern (flt, buf);
+ }
+ }
+ }
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
+ gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dlg), flt);
+
+ flt = gtk_file_filter_new ();
+ gtk_file_filter_set_name (flt, _("All files (*)"));
+ gtk_file_filter_add_pattern (flt, "*");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
+ return flt;
+}
+
+#else
+
+static gboolean
+file_filter_func (const GtkFileFilterInfo *filter_info, gpointer data) {
+ // get ext
+ const char *p = strrchr (filter_info->filename, '.');
+ if (!p) {
+ return FALSE;
+ }
+ p++;
+
+ // get beginning of fname
+ const char *fn = strrchr (filter_info->filename, '/');
+ if (!fn) {
+ fn = filter_info->filename;
+ }
+ else {
+ fn++;
+ }
+
+ if (!strcasecmp (p, "cue")) {
+ return TRUE;
+ }
+
+ DB_decoder_t **codecs = deadbeef->plug_get_decoder_list ();
+ for (int i = 0; codecsi; i++) {
+ if (codecsi->exts && codecsi->insert) {
+ const char **exts = codecsi->exts;
+ for (int e = 0; extse; e++) {
+ if (!strcasecmp (extse, p)) {
+ return TRUE;
+ }
+ }
+ }
+ if (codecsi->prefixes && codecsi->insert) {
+ const char **prefixes = codecsi->prefixes;
+ for (int e = 0; prefixese; e++) {
+ if (!strncasecmp (prefixese, fn, strlen(prefixese)) && *(fn + strlen (prefixese)) == '.') {
+ return TRUE;
+ }
+ }
+ }
+ }
+
+ // test container (vfs) formats
+ DB_vfs_t **vfsplugs = deadbeef->plug_get_vfs_list ();
+ for (int i = 0; vfsplugsi; i++) {
+ if (vfsplugsi->is_container) {
+ if (vfsplugsi->is_container (filter_info->filename)) {
+ return TRUE;
+ }
+ }
+ }
+
+ return FALSE;
+}
+
+static GtkFileFilter *
+set_file_filter (GtkFileChooser *dlg, const char *name) {
+ if (!name) {
+ name = _("Supported sound formats");
+ }
+
+ GtkFileFilter* flt;
+ flt = gtk_file_filter_new ();
+ gtk_file_filter_set_name (flt, name);
+
+ gtk_file_filter_add_custom (flt, GTK_FILE_FILTER_FILENAME, file_filter_func, NULL, NULL);
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
+ gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dlg), flt);
+ flt = gtk_file_filter_new ();
+ gtk_file_filter_set_name (flt, _("All files (*)"));
+ gtk_file_filter_add_pattern (flt, "*");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
+ return flt;
+}
+#endif //USE_GTK_NATIVE_FILE_CHOOSER
+
+#ifdef USE_GTK_NATIVE_FILE_CHOOSER
+
+static GtkFileFilter *
+set_file_filter_loadplaylist (GtkFileChooser *dlg) {
+ static char extlist10000;
+
+ // Build extension list
+ if (extlist0 == '\0') {
+
+ DB_playlist_t **plug = deadbeef->plug_get_playlist_list ();
+ for (int i = 0; plugi; i++) {
+ if (plugi->extensions && plugi->load) {
+ const char **exts = plugi->extensions;
+ if (exts) {
+ for (int e = 0; extse; e++) {
+ char buf100;
+ snprintf (buf, sizeof (buf), "*.%s;", extse);
+ strcat (extlist, buf);
+ }
+ }
+ }
+ }
+ }
+
+ GtkFileFilter* flt;
+
+ flt = gtk_file_filter_new ();
+ gtk_file_filter_set_name (flt, _("Supported playlist formats"));
+ gtk_file_filter_add_pattern (flt, extlist);
+ gtk_file_filter_add_pattern (flt, "*.dbpl");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
+ gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dlg), flt);
+
+ flt = gtk_file_filter_new ();
+ gtk_file_filter_set_name (flt, _("All files"));
+ gtk_file_filter_add_pattern (flt, "*");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
+ return flt;
+}
+
+#else
+
+static gboolean
+playlist_filter_func (const GtkFileFilterInfo *filter_info, gpointer data) {
+ // get ext
+ const char *p = strrchr (filter_info->filename, '.');
+ if (!p) {
+ return FALSE;
+ }
+ p++;
+ DB_playlist_t **plug = deadbeef->plug_get_playlist_list ();
+ for (int i = 0; plugi; i++) {
+ if (plugi->extensions && plugi->load) {
+ const char **exts = plugi->extensions;
+ if (exts) {
+ for (int e = 0; extse; e++) {
+ if (!strcasecmp (extse, p)) {
+ return TRUE;
+ }
+ }
+ }
+ }
+ }
+ return FALSE;
+}
+
+static void
+set_file_filter_loadplaylist(GtkFileChooser *dlg)
+{
+ GtkFileFilter* flt;
+ flt = gtk_file_filter_new ();
+ gtk_file_filter_set_name (flt, _("Supported playlist formats"));
+ gtk_file_filter_add_custom (flt, GTK_FILE_FILTER_FILENAME, playlist_filter_func, NULL, NULL);
+ gtk_file_filter_add_pattern (flt, "*.dbpl");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
+ gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dlg), flt);
+ flt = gtk_file_filter_new ();
+ gtk_file_filter_set_name (flt, _("Other files (*)"));
+ gtk_file_filter_add_pattern (flt, "*");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
+}
+
+#endif //USE_GTK_NATIVE_FILE_CHOOSER
+
+static void
+set_file_filter_saveplaylist (GtkFileChooser *dlg) {
+ GtkFileFilter* flt;
+ flt = gtk_file_filter_new ();
+ gtk_file_filter_set_name (flt, _("DeaDBeeF playlist files (*.dbpl)"));
+ gtk_file_filter_add_pattern (flt, "*.dbpl");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
+ DB_playlist_t **plug = deadbeef->plug_get_playlist_list ();
+ for (int i = 0; plugi; i++) {
+ if (plugi->extensions && plugi->load) {
+ const char **exts = plugi->extensions;
+ if (exts && plugi->save) {
+ for (int e = 0; extse; e++) {
+ char s100;
+ flt = gtk_file_filter_new ();
+ gtk_file_filter_set_name (flt, extse);
+ snprintf (s, sizeof (s), "*.%s", extse);
+ gtk_file_filter_add_pattern (flt, s);
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dlg), flt);
+ }
+ }
+ }
+ }
+}
+
+#ifndef USE_GTK_NATIVE_FILE_CHOOSER
+static void
+on_follow_symlinks_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("add_folders_follow_symlinks", gtk_toggle_button_get_active (togglebutton));
+}
+#endif
+
+static GtkFileChooser *
+get_file_chooser (const gchar *title,
+ GtkFileChooserAction action,
+ gboolean select_multiple)
+{
+#ifdef USE_GTK_NATIVE_FILE_CHOOSER
+ GtkFileChooserNative *dlg = gtk_file_chooser_native_new (title, GTK_WINDOW (mainwin), action, NULL, NULL);
+#else
+ GtkWidget *dlg = gtk_file_chooser_dialog_new (title, GTK_WINDOW (mainwin), action, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
+
+ if (action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) {
+ GtkWidget *box = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (box);
+
+ GtkWidget *check = gtk_check_button_new_with_mnemonic (_("Follow symlinks"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), deadbeef->conf_get_int ("add_folders_follow_symlinks", 0));
+ g_signal_connect ((gpointer) check, "toggled",
+ G_CALLBACK (on_follow_symlinks_toggled),
+ NULL);
+ gtk_widget_show (check);
+ gtk_box_pack_start (GTK_BOX (box), check, FALSE, FALSE, 0);
+
+ gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dlg), box);
+ }
+#endif
+ gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dlg), select_multiple);
+
+ return GTK_FILE_CHOOSER (dlg);
+}
+
+static int
+run_file_chooser(GtkFileChooser *dlg)
+{
+#ifdef USE_GTK_NATIVE_FILE_CHOOSER
+ return gtk_native_dialog_run (GTK_NATIVE_DIALOG (dlg));
+#else
+ return gtk_dialog_run (GTK_DIALOG (dlg));
+#endif
+}
+
+static void
+destroy_file_chooser(GtkFileChooser *dlg)
+{
+#ifdef USE_GTK_NATIVE_FILE_CHOOSER
+ gtk_native_dialog_destroy (GTK_NATIVE_DIALOG (dlg));
+#else
+ gtk_widget_destroy (GTK_WIDGET (dlg));
+#endif
+}
+
+
+GSList *
+show_file_chooser (const gchar *title,
+ enum GtkuiFileChooserType type,
+ gboolean select_multiple)
+{
+ GtkFileChooserAction action;
+ switch (type) {
+ case GTKUI_FILECHOOSER_OPENFOLDER:
+ action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
+ break;
+ case GTKUI_FILECHOOSER_OPENFILE:
+ case GTKUI_FILECHOOSER_LOADPLAYLIST:
+ action = GTK_FILE_CHOOSER_ACTION_OPEN;
+ break;
+ case GTKUI_FILECHOOSER_SAVEPLAYLIST:
+ action = GTK_FILE_CHOOSER_ACTION_SAVE;
+ break;
+ }
+
+ GtkFileChooser *dlg = get_file_chooser(title, action, select_multiple);
+
+ switch (type) {
+ case GTKUI_FILECHOOSER_OPENFILE:
+ set_file_filter (dlg, NULL);
+ break;
+ case GTKUI_FILECHOOSER_LOADPLAYLIST:
+ set_file_filter_loadplaylist(dlg);
+ break;
+ case GTKUI_FILECHOOSER_SAVEPLAYLIST:
+ gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dlg), TRUE);
+ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dlg), "untitled.dbpl");
+ set_file_filter_saveplaylist(dlg);
+ break;
+ case GTKUI_FILECHOOSER_OPENFOLDER:
+ break;
+ }
+
+ const char *conf_lastdir;
+ switch (type) {
+ case GTKUI_FILECHOOSER_OPENFOLDER:
+ case GTKUI_FILECHOOSER_OPENFILE:
+ conf_lastdir = "filechooser.lastdir";
+ break;
+ case GTKUI_FILECHOOSER_LOADPLAYLIST:
+ case GTKUI_FILECHOOSER_SAVEPLAYLIST:
+ conf_lastdir = "filechooser.playlist.lastdir";
+ break;
+ }
+
+ // restore folder
+ deadbeef->conf_lock ();
+ gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dlg), deadbeef->conf_get_str_fast (conf_lastdir, ""));
+ deadbeef->conf_unlock ();
+
+ int response = run_file_chooser(dlg);
+
+ // store folder
+ gchar *folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dlg));
+ if (folder) {
+ deadbeef->conf_set_str (conf_lastdir, folder);
+ g_free (folder);
+ }
+ GSList *lst = NULL;
+ if (response == GTK_RESPONSE_ACCEPT)
+ {
+ lst = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (dlg));
+#if defined USE_GTK_NATIVE_FILE_CHOOSER && defined __MINGW32__
+ // workaround: Gtk's win32 file chooser uses g_slist_prepend internally and forgets to reverse it before returning
+ lst = g_slist_reverse (lst);
+#endif
+ }
+
+ destroy_file_chooser (dlg);
+ return lst;
+}
+
+char *
+gtkui_trim_whitespace(char *p, size_t len) {
+ char *meta = p;
+ while (*meta == ' ') {
+ meta++;
+ }
+ char *tail = p + len - 1;
+ while (tail > p && ((uint8_t)*tail) <= 0x20) {
+ *tail = 0;
+ tail--;
+ }
+ return meta;
+}

deadbeef-0.6.2.tar.bz2/plugins/gtkui/gdkdrawing.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/gdkdrawing.c Changed

@@ -1,62 +1,118 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #include <gtk/gtk.h>
-//#include <gdk/gdkkeysyms.h>
 #include <string.h>
+#include <stdlib.h>
 #include "drawing.h"
 #include "support.h"
 #include "gtkui.h"
 
+static char gtkui_listview_text_font1000;
+static char gtkui_listview_group_text_font1000;
+static char gtkui_listview_column_text_font1000;
+static char gtkui_tabstrip_text_font1000;
+
+static GtkWidget *theme_entry;
+
+static PangoFontDescription *
+get_new_font_description_from_type (int type)
+{
+ PangoFontDescription *desc;
+ switch (type) {
+ case DDB_LIST_FONT:
+ desc = pango_font_description_from_string (gtkui_listview_text_font);
+ break;
+ case DDB_GROUP_FONT:
+ desc = pango_font_description_from_string (gtkui_listview_group_text_font);
+ break;
+ case DDB_TABSTRIP_FONT:
+ desc = pango_font_description_from_string (gtkui_tabstrip_text_font);
+ break;
+ case DDB_COLUMN_FONT:
+ desc = pango_font_description_from_string (gtkui_listview_column_text_font);
+ break;
+ default:
+ desc = NULL;
+ }
+ return desc;
+}
+
+static int
+get_pango_alignment (int align)
+{
+ int alignment = 0;
+ switch (align) {
+ case 0:
+ alignment = PANGO_ALIGN_LEFT;
+ break;
+ case 1:
+ alignment = PANGO_ALIGN_RIGHT;
+ break;
+ case 2:
+ alignment = PANGO_ALIGN_CENTER;
+ break;
+ default:
+ alignment = PANGO_ALIGN_LEFT;
+ break;
+ }
+ return alignment;
+}
+
 void
-draw_begin (drawctx_t *ctx, cairo_t *cr) {
+draw_begin (drawctx_t * const ctx, cairo_t *cr) {
 ctx->drawable = cr;
 }
 
 void
-draw_end (drawctx_t *ctx) {
+draw_end (drawctx_t * const ctx) {
 ctx->drawable = NULL;
 }
 
 void
-draw_set_fg_color (drawctx_t *ctx, float *rgb) {
+draw_set_fg_color (drawctx_t * const ctx, float *rgb) {
 cairo_set_source_rgb (ctx->drawable, rgb0, rgb1, rgb2);
 }
 
 void
-draw_line (drawctx_t *ctx, float x1, float y1, float x2, float y2) {
+draw_line (drawctx_t * const ctx, float x1, float y1, float x2, float y2) {
 cairo_move_to (ctx->drawable, x1, y1);
 cairo_line_to (ctx->drawable, x2, y2);
 cairo_stroke (ctx->drawable);
 }
 
 void
-draw_rect (drawctx_t *ctx, float x, float y, float w, float h, int fill) {
+draw_rect (drawctx_t * const ctx, float x, float y, float w, float h, int fill) {
 cairo_rectangle (ctx->drawable, x, y, w, h);
 fill ? cairo_fill (ctx->drawable) : cairo_stroke (ctx->drawable);
 }
 
 void
-draw_free (drawctx_t *ctx) {
+draw_free (drawctx_t * const ctx) {
 draw_end (ctx);
 if (ctx->pangoctx) {
 g_object_unref (ctx->pangoctx);
@@ -66,11 +122,15 @@
 g_object_unref (ctx->pangolayout);
 ctx->pangolayout = NULL;
 }
+ if (ctx->font_style) {
+ g_object_unref (ctx->font_style);
+ ctx->font_style = NULL;
+ }
 }
 
 void
-draw_init_font (drawctx_t *ctx, GtkStyle *new_font_style) {
- if (!ctx->pango_ready || (new_font_style && ctx->font_style != new_font_style)) {
+draw_init_font (drawctx_t * const ctx, int type, int reset) {
+ if (reset || !ctx->pango_ready) {
 if (ctx->pangoctx) {
 g_object_unref (ctx->pangoctx);
 ctx->pangoctx = NULL;
@@ -79,8 +139,16 @@
 g_object_unref (ctx->pangolayout);
 ctx->pangolayout = NULL;
 }
+ if (ctx->font_style) {
+ g_object_unref (ctx->font_style);
+ ctx->font_style = NULL;
+ }
 
- ctx->font_style = new_font_style ? new_font_style : gtk_widget_get_default_style ();
+ ctx->font_style = gtk_style_new ();
+ if (ctx->font_style->font_desc) {
+ pango_font_description_free (ctx->font_style->font_desc);
+ ctx->font_style->font_desc = get_new_font_description_from_type (type);
+ }
 
 ctx->pangoctx = gdk_pango_context_get ();
 ctx->pangolayout = pango_layout_new (ctx->pangoctx);
@@ -90,30 +158,38 @@
 pango_layout_set_font_description (ctx->pangolayout, desc);
 ctx->pango_ready = 1;
 }
- else if (new_font_style) {
+ else if (ctx->pango_ready) {
 PangoFontDescription *desc = ctx->font_style->font_desc;
 pango_layout_set_font_description (ctx->pangolayout, desc);
 }
 }
 
 void
-draw_init_font_bold (drawctx_t *ctx) {
- PangoFontDescription *desc = pango_font_description_copy (ctx->font_style->font_desc);
- pango_font_description_set_weight (desc, PANGO_WEIGHT_BOLD);
+draw_init_font_style (drawctx_t * const ctx, int bold, int italic, int type) {
+ PangoFontDescription *desc_default = ctx->font_style->font_desc;
+ if (desc_default != NULL) {
+ pango_layout_set_font_description (ctx->pangolayout, desc_default);
+ }
+ PangoFontDescription *desc = pango_font_description_copy (pango_layout_get_font_description (ctx->pangolayout));
+ if (bold) {
+ pango_font_description_set_weight (desc, PANGO_WEIGHT_BOLD);
+ }
+ if (italic) {
+ pango_font_description_set_style (desc, PANGO_STYLE_ITALIC);
+ }
 pango_layout_set_font_description (ctx->pangolayout, desc);
- pango_font_description_free(desc);
+ pango_font_description_free (desc);
 }
 
 void
-draw_init_font_normal (drawctx_t *ctx) {
+draw_init_font_normal (drawctx_t * const ctx) {
 pango_font_description_set_weight (ctx->font_style->font_desc, ctx->font_weight);
 pango_layout_set_font_description (ctx->pangolayout, ctx->font_style->font_desc);
 }
 
-
 float
-draw_get_font_size (drawctx_t *ctx) {
- draw_init_font (ctx, NULL);
+draw_get_font_size (drawctx_t * const ctx) {
+ draw_init_font (ctx, 0, 0);
 GdkScreen *screen = gdk_screen_get_default ();
 float dpi = gdk_screen_get_resolution (screen);
 PangoFontDescription *desc = ctx->font_style->font_desc;
@@ -121,54 +197,85 @@
 }
 
 void
-draw_text (drawctx_t *ctx, float x, float y, int width, int align, const char *text) {
- draw_init_font (ctx, NULL);
+draw_text (drawctx_t * const ctx, float x, float y, int width, int align, const char *text) {
+ draw_init_font (ctx, 0, 0);
 pango_layout_set_width (ctx->pangolayout, width*PANGO_SCALE);
- pango_layout_set_alignment (ctx->pangolayout, align ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT);
+ pango_layout_set_alignment (ctx->pangolayout, get_pango_alignment (align));
 pango_layout_set_text (ctx->pangolayout, text, -1);
 cairo_move_to (ctx->drawable, x, y);
 pango_cairo_show_layout (ctx->drawable, ctx->pangolayout);
 }
 
 void
-draw_text_with_colors (drawctx_t *ctx, float x, float y, int width, int align, const char *text) {
- draw_init_font (ctx, NULL);
+draw_text_custom (drawctx_t * const ctx, float x, float y, int width, int align, int type, int bold, int italic, const char *text) {
+ draw_init_font (ctx, type, 0);
+ if (bold || italic) {
+ draw_init_font_style (ctx, bold, italic, type);
+ }
 pango_layout_set_width (ctx->pangolayout, width*PANGO_SCALE);
- pango_layout_set_alignment (ctx->pangolayout, align ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT);
+ pango_layout_set_alignment (ctx->pangolayout, get_pango_alignment (align));
+ pango_layout_set_text (ctx->pangolayout, text, -1);
+ cairo_move_to (ctx->drawable, x, y);
+ pango_cairo_show_layout (ctx->drawable, ctx->pangolayout);
+}
+
+void
+draw_text_with_colors (drawctx_t * const ctx, float x, float y, int width, int align, const char *text) {
+ draw_init_font (ctx, 0, 0);
+ pango_layout_set_width (ctx->pangolayout, width*PANGO_SCALE);
+ pango_layout_set_alignment (ctx->pangolayout, get_pango_alignment (align));
 pango_layout_set_text (ctx->pangolayout, text, -1);
 // gdk_draw_layout_with_colors (ctx->drawable, gc, x, y, ctx->pangolayout, &clrfg, &clrbg);
 cairo_move_to (ctx->drawable, x, y);
 pango_cairo_show_layout (ctx->drawable, ctx->pangolayout);
- 
 }
 
 void
-draw_get_text_extents (drawctx_t *ctx, const char *text, int len, int *w, int *h) {
- draw_init_font (ctx, NULL);
- pango_layout_set_width (ctx->pangolayout, 1000 * PANGO_SCALE);
+draw_get_layout_extents (drawctx_t * const ctx, int *w, int *h) {
+ PangoRectangle log;
+ pango_layout_get_pixel_extents (ctx->pangolayout, NULL, &log);
+ if (w) {
+ *w = log.width;
+ }
+ if (h) {
+ *h = log.height;
+ }
+}
+
+void
+draw_get_text_extents (drawctx_t * const ctx, const char *text, int len, int *w, int *h) {
+ draw_init_font (ctx, 0, 0);
+ pango_layout_set_width (ctx->pangolayout, -1);
 pango_layout_set_alignment (ctx->pangolayout, PANGO_ALIGN_LEFT);
 pango_layout_set_text (ctx->pangolayout, text, len);
- PangoRectangle ink;
- PangoRectangle log;
- pango_layout_get_pixel_extents (ctx->pangolayout, &ink, &log);
- *w = ink.width;
- *h = ink.height;
+ draw_get_layout_extents (ctx, w, h);
 }
 
 int
-draw_get_listview_rowheight (drawctx_t *ctx) {
- PangoFontDescription *font_desc = ctx->font_style->font_desc;
+draw_is_ellipsized (drawctx_t * const ctx) {
+ return pango_layout_is_ellipsized (ctx->pangolayout);
+}
+
+const char *
+draw_get_text (drawctx_t * const ctx) {
+ return pango_layout_get_text (ctx->pangolayout);
+}
+
+int
+draw_get_listview_rowheight (drawctx_t * const ctx) {
+ PangoFontDescription *font_desc = pango_font_description_copy (pango_layout_get_font_description (ctx->pangolayout));
 PangoFontMetrics *metrics = pango_context_get_metrics (ctx->pangoctx,
 font_desc,
 pango_context_get_language (ctx->pangoctx));
 int row_height = (pango_font_metrics_get_ascent (metrics) +
 pango_font_metrics_get_descent (metrics));
 pango_font_metrics_unref (metrics);
+ pango_font_description_free (font_desc);
 return PANGO_PIXELS(row_height)+6;
 }
 
 void
-drawctx_init (drawctx_t *ctx) {
+drawctx_init (drawctx_t * const ctx) {
 memset (ctx, 0, sizeof (drawctx_t));
 ctx->font_weight = PANGO_WEIGHT_NORMAL;
 }
@@ -181,17 +288,77 @@
 static GdkColor gtkui_tabstrip_light_color;
 static GdkColor gtkui_tabstrip_base_color;
 static GdkColor gtkui_tabstrip_text_color;
+static GdkColor gtkui_tabstrip_playing_text_color;
+static GdkColor gtkui_tabstrip_selected_text_color;
 
 static GdkColor gtkui_listview_even_row_color;
 static GdkColor gtkui_listview_odd_row_color;
 static GdkColor gtkui_listview_selection_color;
 static GdkColor gtkui_listview_text_color;
 static GdkColor gtkui_listview_selected_text_color;
+static GdkColor gtkui_listview_playing_text_color;
+static GdkColor gtkui_listview_group_text_color;
+static GdkColor gtkui_listview_column_text_color;
 static GdkColor gtkui_listview_cursor_color;
 
+static GdkColor gtkui_visualization_base_color;
+static GdkColor gtkui_visualization_background_color;
+
 static int override_listview_colors = 0;
 static int override_bar_colors = 0;
 static int override_tabstrip_colors = 0;
+static int use_custom_visualization_color = 0;
+static int use_custom_visualization_background_color = 0;
+
+int
+gtkui_listview_override_conf (const char *conf_str) {
+ return !strcmp(conf_str, "gtkui.override_listview_colors");
+}
+
+int
+gtkui_listview_font_conf (const char *conf_str) {
+ return !strncmp(conf_str, "gtkui.font.listview", strlen("gtkui.font.listview"));
+}
+
+int
+gtkui_listview_font_style_conf (const char *conf_str) {
+ return !strncmp(conf_str, "gtkui.italic", strlen("gtkui.italic")) || !strncmp(conf_str, "gtkui.embolden", strlen("gtkui.embolden"));
+}
+
+int
+gtkui_listview_colors_conf (const char *conf_str) {
+ return !strncmp(conf_str, "gtkui.color.listview", strlen("gtkui.color.listview"));
+}
+
+int
+gtkui_tabstrip_override_conf (const char *conf_str) {
+ return !strcmp(conf_str, "gtkui.override_tabstrip_colors");
+}
+
+int
+gtkui_tabstrip_font_conf (const char *conf_str) {
+ return !strncmp(conf_str, "gtkui.font.tabstrip", strlen("gtkui.font.tabstrip"));
+}
+
+int
+gtkui_tabstrip_font_style_conf (const char *conf_str) {
+ return !strncmp(conf_str, "gtkui.tabstrip_italic", strlen("gtkui.tabstrip_italic")) || !strncmp(conf_str, "gtkui.tabstrip_embolden", strlen("gtkui.tabstrip_embolden"));
+}
+
+int
+gtkui_tabstrip_colors_conf (const char *conf_str) {
+ return !strncmp(conf_str, "gtkui.color.tabstrip", strlen("gtkui.color.tabstrip"));
+}
+
+int
+gtkui_bar_override_conf (const char *conf_str) {
+ return !strcmp(conf_str, "gtkui.override_bar_colors");
+}
+
+int
+gtkui_bar_colors_conf (const char *conf_str) {
+ return !strncmp(conf_str, "gtkui.color.bar", strlen("gtkui.color.bar"));
+}
 
 int
 gtkui_override_listview_colors (void) {
@@ -208,31 +375,100 @@
 return override_tabstrip_colors;
 }
 
+#if 0
+static void
+color_dump (const char *name, GdkColor *c) {
+ printf ("%s: %x %x %x\n", name, c->red>>8, c->green>>8, c->blue>>8);
+}
+
+color_lerp_component (guint16 from, guint16 to, float factor) {
+ int32_t result = (int32_t)from + (int32_t)(((int32_t)to - (int32_t)from) * factor);
+ if (result < 0) {
+ return 0;
+ }
+ else if (result > 0xffff) {
+ return 0xffff;
+ }
+ return (guint16)result;
+}
+
+static GdkColor
+color_lerp (GdkColor from, GdkColor to, float factor) {
+ GdkColor result;
+ result.red = color_lerp_component(from.red, to.red, factor);
+ result.green = color_lerp_component(from.green, to.green, factor);
+ result.blue = color_lerp_component(from.blue, to.blue, factor);
+ return result;
+}
+#endif
+
+static void
+_init_color_for_name(GdkColor *color, const char *name, const GdkColor *def) {
+ char color_text100;
+ snprintf (color_text, sizeof (color_text), "%hd %hd %hd", def->red, def->green, def->blue);
+ const char *clr = deadbeef->conf_get_str_fast (name, color_text);
+ sscanf (clr, "%hd %hd %hd", &color->red, &color->green, &color->blue);
+}
+
 void
 gtkui_init_theme_colors (void) {
+ if (!theme_entry) {
+ theme_entry = gtk_entry_new ();
+ }
+
 deadbeef->conf_lock ();
 override_listview_colors= deadbeef->conf_get_int ("gtkui.override_listview_colors", 0);
 override_bar_colors = deadbeef->conf_get_int ("gtkui.override_bar_colors", 0);
 override_tabstrip_colors = deadbeef->conf_get_int ("gtkui.override_tabstrip_colors", 0);
+ use_custom_visualization_color = deadbeef->conf_get_int ("gtkui.vis.use_custom_base_color", 0);
+ use_custom_visualization_background_color = deadbeef->conf_get_int ("gtkui.vis.use_custom_background_color", 0);
 
 extern GtkWidget *mainwin;
 GtkStyle *style = gtk_widget_get_style (mainwin);
- char color_text100;
- const char *clr;
+ GtkStyle *entry_style = gtk_widget_get_style (theme_entry);
+ char *font_name = pango_font_description_to_string (style->font_desc);
 
- if (!override_bar_colors) {
- memcpy (&gtkui_bar_foreground_color, &style->baseGTK_STATE_SELECTED, sizeof (GdkColor));
- memcpy (&gtkui_bar_background_color, &style->fgGTK_STATE_NORMAL, sizeof (GdkColor));
+ // HACK: if gtk says selected color is the same as background -- set it
+ // to a shade of blue
+ int use_hardcoded_accent_color = memcmp (&style->bgGTK_STATE_NORMAL, &gtkui_bar_foreground_color, sizeof (gtkui_bar_foreground_color));
+
+ GdkColor hardcoded_accent_color = {
+ .red = 0x2b84,
+ .green = 0x7fff,
+ .blue = 0xbae0,
+ };
+
+ if (use_hardcoded_accent_color) {
+ memcpy (&gtkui_visualization_base_color, &hardcoded_accent_color, sizeof (GdkColor));
+ }
+ else {
+ memcpy (&gtkui_visualization_base_color, &style->baseGTK_STATE_SELECTED, sizeof (GdkColor));
+ }
+
+ if (use_custom_visualization_color) {
+ _init_color_for_name(&gtkui_visualization_base_color, "gtkui.vis.custom_base_color", &gtkui_visualization_base_color);
+ }
+
+ if (use_custom_visualization_background_color) {
+ _init_color_for_name(&gtkui_visualization_background_color, "gtkui.vis.custom_background_color", &gtkui_visualization_background_color);
 }
 else {
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->baseGTK_STATE_SELECTED.red, style->baseGTK_STATE_SELECTED.green, style->baseGTK_STATE_SELECTED.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.bar_foreground", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_bar_foreground_color.red, &gtkui_bar_foreground_color.green, &gtkui_bar_foreground_color.blue);
+ memcpy (&gtkui_visualization_background_color, &style->black, sizeof (GdkColor));
+ }
 
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->fgGTK_STATE_NORMAL.red, style->fgGTK_STATE_NORMAL.green, style->fgGTK_STATE_NORMAL.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.bar_background", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_bar_background_color.red, &gtkui_bar_background_color.green, &gtkui_bar_background_color.blue);
+ if (!override_bar_colors) {
+ memcpy (&gtkui_bar_background_color, &style->textGTK_STATE_NORMAL, sizeof (GdkColor));
 
+ if (use_hardcoded_accent_color) {
+ memcpy (&gtkui_bar_foreground_color, &hardcoded_accent_color, sizeof (GdkColor));
+ }
+ else {
+ memcpy (&gtkui_bar_foreground_color, &style->baseGTK_STATE_SELECTED, sizeof (GdkColor));
+ }
+ }
+ else {
+ _init_color_for_name(&gtkui_bar_foreground_color, "gtkui.color.bar_foreground", &entry_style->baseGTK_STATE_SELECTED);
+ _init_color_for_name(&gtkui_bar_background_color, "gtkui.color.bar_background", &entry_style->fgGTK_STATE_NORMAL);
 }
 
 if (!override_tabstrip_colors) {
@@ -241,27 +477,20 @@
 memcpy (&gtkui_tabstrip_light_color, &style->lightGTK_STATE_NORMAL, sizeof (GdkColor));
 memcpy (&gtkui_tabstrip_base_color, &style->bgGTK_STATE_NORMAL, sizeof (GdkColor));
 memcpy (&gtkui_tabstrip_text_color, &style->textGTK_STATE_NORMAL, sizeof (GdkColor));
+ memcpy (&gtkui_tabstrip_playing_text_color, &style->textGTK_STATE_NORMAL, sizeof (GdkColor));
+ memcpy (&gtkui_tabstrip_selected_text_color, &style->textGTK_STATE_NORMAL, sizeof (GdkColor));
+ strncpy (gtkui_tabstrip_text_font, font_name, sizeof (gtkui_tabstrip_text_font));
 }
 else {
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->darkGTK_STATE_NORMAL.red, style->darkGTK_STATE_NORMAL.green, style->darkGTK_STATE_NORMAL.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.tabstrip_dark", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_tabstrip_dark_color.red, &gtkui_tabstrip_dark_color.green, &gtkui_tabstrip_dark_color.blue);
-
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->midGTK_STATE_NORMAL.red, style->midGTK_STATE_NORMAL.green, style->midGTK_STATE_NORMAL.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.tabstrip_mid", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_tabstrip_mid_color.red, &gtkui_tabstrip_mid_color.green, &gtkui_tabstrip_mid_color.blue);
-
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->lightGTK_STATE_NORMAL.red, style->lightGTK_STATE_NORMAL.green, style->lightGTK_STATE_NORMAL.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.tabstrip_light", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_tabstrip_light_color.red, &gtkui_tabstrip_light_color.green, &gtkui_tabstrip_light_color.blue);
-
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->bgGTK_STATE_NORMAL.red, style->bgGTK_STATE_NORMAL.green, style->bgGTK_STATE_NORMAL.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.tabstrip_base", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_tabstrip_base_color.red, &gtkui_tabstrip_base_color.green, &gtkui_tabstrip_base_color.blue);
-
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->textGTK_STATE_NORMAL.red, style->textGTK_STATE_NORMAL.green, style->textGTK_STATE_NORMAL.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.tabstrip_text", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_tabstrip_text_color.red, &gtkui_tabstrip_text_color.green, &gtkui_tabstrip_text_color.blue);
+ _init_color_for_name(&gtkui_tabstrip_dark_color, "gtkui.color.tabstrip_dark", &style->darkGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_tabstrip_mid_color, "gtkui.color.tabstrip_mid", &style->midGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_tabstrip_light_color, "gtkui.color.tabstrip_light", &style->lightGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_tabstrip_base_color, "gtkui.color.tabstrip_base", &style->bgGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_tabstrip_text_color, "gtkui.color.tabstrip_text", &style->textGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_tabstrip_playing_text_color, "gtkui.color.tabstrip_playing_text", &style->textGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_tabstrip_selected_text_color, "gtkui.color.tabstrip_selected_text", &style->textGTK_STATE_NORMAL);
+
+ strncpy (gtkui_tabstrip_text_font, deadbeef->conf_get_str_fast ("gtkui.font.tabstrip_text", font_name), sizeof (gtkui_tabstrip_text_font));
 }
 
 if (!override_listview_colors) {
@@ -270,34 +499,44 @@
 memcpy (&gtkui_listview_selection_color, &style->bgGTK_STATE_SELECTED, sizeof (GdkColor));
 memcpy (&gtkui_listview_text_color, &style->fgGTK_STATE_NORMAL, sizeof (GdkColor));
 memcpy (&gtkui_listview_selected_text_color, &style->fgGTK_STATE_SELECTED, sizeof (GdkColor));
+ memcpy (&gtkui_listview_playing_text_color, &style->fgGTK_STATE_NORMAL, sizeof (GdkColor));
+ memcpy (&gtkui_listview_group_text_color, &style->fgGTK_STATE_NORMAL, sizeof (GdkColor));
+ memcpy (&gtkui_listview_column_text_color, &style->fgGTK_STATE_NORMAL, sizeof (GdkColor));
 memcpy (&gtkui_listview_cursor_color, &style->fgGTK_STATE_NORMAL, sizeof (GdkColor));
+ strncpy (gtkui_listview_text_font, font_name, sizeof (gtkui_listview_text_font));
+ strncpy (gtkui_listview_group_text_font, font_name, sizeof (gtkui_listview_group_text_font));
+ strncpy (gtkui_listview_column_text_font, font_name, sizeof (gtkui_listview_column_text_font));
 }
 else {
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->lightGTK_STATE_NORMAL.red, style->lightGTK_STATE_NORMAL.green, style->lightGTK_STATE_NORMAL.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.listview_even_row", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_listview_even_row_color.red, &gtkui_listview_even_row_color.green, &gtkui_listview_even_row_color.blue);
-
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->midGTK_STATE_NORMAL.red, style->midGTK_STATE_NORMAL.green, style->midGTK_STATE_NORMAL.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.listview_odd_row", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_listview_odd_row_color.red, &gtkui_listview_odd_row_color.green, &gtkui_listview_odd_row_color.blue);
+ _init_color_for_name(&gtkui_listview_even_row_color, "gtkui.color.listview_even_row", &style->lightGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_listview_odd_row_color, "gtkui.color.listview_odd_row", &style->midGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_listview_selection_color, "gtkui.color.listview_selection", &style->bgGTK_STATE_SELECTED);
+ _init_color_for_name(&gtkui_listview_text_color, "gtkui.color.listview_text", &style->fgGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_listview_selected_text_color, "gtkui.color.listview_selected_text", &style->fgGTK_STATE_SELECTED);
+ _init_color_for_name(&gtkui_listview_playing_text_color, "gtkui.color.listview_playing_text", &style->fgGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_listview_group_text_color, "gtkui.color.listview_group_text", &style->fgGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_listview_column_text_color, "gtkui.color.listview_column_text", &style->fgGTK_STATE_NORMAL);
+ _init_color_for_name(&gtkui_listview_cursor_color, "gtkui.color.listview_cursor", &style->fgGTK_STATE_SELECTED);
+
+ strncpy (gtkui_listview_text_font, deadbeef->conf_get_str_fast ("gtkui.font.listview_text", font_name), sizeof (gtkui_listview_text_font));
+ strncpy (gtkui_listview_group_text_font, deadbeef->conf_get_str_fast ("gtkui.font.listview_group_text", font_name), sizeof (gtkui_listview_group_text_font));
+ strncpy (gtkui_listview_column_text_font, deadbeef->conf_get_str_fast ("gtkui.font.listview_column_text", font_name), sizeof (gtkui_listview_column_text_font));
+ }
 
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->midGTK_STATE_NORMAL.red, style->midGTK_STATE_NORMAL.green, style->midGTK_STATE_NORMAL.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.listview_selection", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_listview_selection_color.red, &gtkui_listview_selection_color.green, &gtkui_listview_selection_color.blue);
+ free (font_name);
+ font_name = NULL;
 
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->fgGTK_STATE_NORMAL.red, style->fgGTK_STATE_NORMAL.green, style->fgGTK_STATE_NORMAL.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.listview_text", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_listview_text_color.red, &gtkui_listview_text_color.green, &gtkui_listview_text_color.blue);
+ deadbeef->conf_unlock ();
+}
 
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->fgGTK_STATE_SELECTED.red, style->fgGTK_STATE_SELECTED.green, style->fgGTK_STATE_SELECTED.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.listview_selected_text", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_listview_selected_text_color.red, &gtkui_listview_selected_text_color.green, &gtkui_listview_selected_text_color.blue);
+void
+gtkui_get_vis_custom_base_color (GdkColor *clr) {
+ memcpy (clr, &gtkui_visualization_base_color, sizeof (GdkColor));
+}
 
- snprintf (color_text, sizeof (color_text), "%hd %hd %hd", style->fgGTK_STATE_SELECTED.red, style->fgGTK_STATE_SELECTED.green, style->fgGTK_STATE_SELECTED.blue);
- clr = deadbeef->conf_get_str_fast ("gtkui.color.listview_cursor", color_text);
- sscanf (clr, "%hd %hd %hd", &gtkui_listview_cursor_color.red, &gtkui_listview_cursor_color.green, &gtkui_listview_cursor_color.blue);
- }
- deadbeef->conf_unlock ();
+void
+gtkui_get_vis_custom_background_color (GdkColor *clr) {
+ memcpy (clr, &gtkui_visualization_background_color, sizeof (GdkColor));
 }
 
 void
@@ -336,6 +575,16 @@
 }
 
 void
+gtkui_get_tabstrip_playing_text_color (GdkColor *clr) {
+ memcpy (clr, &gtkui_tabstrip_playing_text_color, sizeof (GdkColor));
+}
+
+void
+gtkui_get_tabstrip_selected_text_color (GdkColor *clr) {
+ memcpy (clr, &gtkui_tabstrip_selected_text_color, sizeof (GdkColor));
+}
+
+void
 gtkui_get_listview_even_row_color (GdkColor *clr) {
 memcpy (clr, &gtkui_listview_even_row_color, sizeof (GdkColor));
 }
@@ -361,7 +610,41 @@
 }
 
 void
+gtkui_get_listview_playing_text_color (GdkColor *clr) {
+ memcpy (clr, &gtkui_listview_playing_text_color, sizeof (GdkColor));
+}
+
+void
+gtkui_get_listview_group_text_color (GdkColor *clr) {
+ memcpy (clr, &gtkui_listview_group_text_color, sizeof (GdkColor));
+}
+
+void
+gtkui_get_listview_column_text_color (GdkColor *clr) {
+ memcpy (clr, &gtkui_listview_column_text_color, sizeof (GdkColor));
+}
+
+void
 gtkui_get_listview_cursor_color (GdkColor *clr) {
 memcpy (clr, &gtkui_listview_cursor_color, sizeof (GdkColor));
 }
 
+const char *
+gtkui_get_listview_text_font (void) {
+ return gtkui_listview_text_font;
+}
+
+const char *
+gtkui_get_listview_group_text_font (void) {
+ return gtkui_listview_group_text_font;
+}
+
+const char *
+gtkui_get_listview_column_text_font (void) {
+ return gtkui_listview_column_text_font;
+}
+
+const char *
+gtkui_get_tabstrip_text_font (void) {
+ return gtkui_tabstrip_text_font;
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/gtk Added

deadbeef-1.9.6.tar.bz2/plugins/gtkui/gtk/menus.ui Added

deadbeef-0.6.2.tar.bz2/plugins/gtkui/gtkui.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/gtkui.c Changed

@@ -1,151 +1,169 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
 
- 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.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
-#include "../../deadbeef.h"
-#include <gtk/gtk.h>
+
+
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <sys/stat.h>
 #ifdef __linux__
 #include <sys/prctl.h>
 #endif
+#include <gtk/gtk.h>
+#include <jansson.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <deadbeef/deadbeef.h>
 #include "../../gettext.h"
-#include "gtkui.h"
-#include "ddblistview.h"
-#include "search.h"
-#include "progress.h"
-#include "interface.h"
-#include "callbacks.h"
-#include "support.h"
+#include "../hotkeys/hotkeys.h"
 #include "../libparser/parser.h"
-#include "drawing.h"
-#include "trkproperties.h"
-#include "../artwork/artwork.h"
-#include "coverart.h"
-#include "plcommon.h"
+#include "actionhandlers.h"
+#include "actions.h"
+#include "callbacks.h"
+#include "clipboard.h"
+#include "covermanager/covermanager.h"
 #include "ddbtabstrip.h"
+#include "drawing.h"
 #include "eq.h"
-#include "actions.h"
-#include "pluginconf.h"
+#include "gtkui.h"
 #include "gtkui_api.h"
-#include "wingeom.h"
+#include "hotkeys.h"
+#include "interface.h"
+#if ENABLE_MEDIALIB
+#include "medialib/medialibmanager.h"
+#include "medialib/medialibwidget.h"
+#endif
+#include "playlist/plcommon.h"
+#include "pluginconf.h"
+#include "prefwin/prefwin.h"
+#include "progress.h"
+#include "rg.h"
+#include "search.h"
+#include "support.h"
+#include "trkproperties.h"
 #include "widgets.h"
-#ifndef __APPLE__
-#include "X11/Xlib.h"
-#else
-#include "retina.h"
+#include "wingeom.h"
+#include "plmenu.h"
+#include "covermanager/albumartwidget.h"
+#include "selpropertieswidget.h"
+
+#define USE_GTK_APPLICATION 1
+
+#if GTK_CHECK_VERSION(3,10,0) && USE_GTK_APPLICATION
+#include "deadbeefapp.h"
 #endif
-#include "actionhandlers.h"
-#include "hotkeys.h"
-#include "../hotkeys/hotkeys.h"
 
 #define trace(...) { fprintf(stderr, __VA_ARGS__); }
 //#define trace(fmt,...)
 
-static ddb_gtkui_t plugin;
+ddb_gtkui_t plugin;
 DB_functions_t *deadbeef;
 
-// cover art loading plugin
-DB_artwork_plugin_t *coverart_plugin = NULL;
-
 // main widgets
 GtkWidget *mainwin;
-GtkWidget *searchwin;
+int gtkui_override_statusicon = 0;
 GtkStatusIcon *trayicon;
 GtkWidget *traymenu;
-
-// playlist theming
-GtkWidget *theme_treeview;
-GtkWidget *theme_button;
+GtkWidget *logwindow;
 
 static int gtkui_accept_messages = 0;
 
 static gint refresh_timeout = 0;
+static guint set_title_timeout_id;
 
 int fileadded_listener_id;
 int fileadd_beginend_listener_id;
-// overriden API methods
-#if 0
-int (*gtkui_original_plt_add_dir) (ddb_playlist_t *plt, const char *dirname, int (*cb)(DB_playItem_t *it, void *data), void *user_data);
-int (*gtkui_original_plt_add_file) (ddb_playlist_t *plt, const char *fname, int (*cb)(DB_playItem_t *it, void *data), void *user_data);
-int (*gtkui_original_pl_add_files_begin) (ddb_playlist_t *plt);
-void (*gtkui_original_pl_add_files_end) (void);
-#endif
 
 // cached config variables
 int gtkui_embolden_current_track;
-int gtkui_groups_pinned;
+int gtkui_embolden_tracks;
+int gtkui_embolden_selected_tracks;
+int gtkui_italic_selected_tracks;
+int gtkui_italic_tracks;
+int gtkui_italic_current_track;
 
-#ifdef __APPLE__
-int gtkui_is_retina = 0;
-#endif
+int gtkui_tabstrip_embolden_playing;
+int gtkui_tabstrip_italic_playing;
+int gtkui_tabstrip_embolden_selected;
+int gtkui_tabstrip_italic_selected;
+
+int gtkui_groups_pinned;
+int gtkui_listview_busy;
+int gtkui_groups_spacing;
 
 int gtkui_unicode_playstate = 0;
 int gtkui_disable_seekbar_overlay = 0;
 
+static gboolean _quitting_normally = FALSE;
+
 #define TRAY_ICON "deadbeef_tray_icon"
 
-// that must be called before gtk_init
-void
-gtkpl_init (void) {
- theme_treeview = gtk_tree_view_new ();
- gtk_widget_show (theme_treeview);
- gtk_widget_set_can_focus (theme_treeview, FALSE);
- GtkWidget *vbox1 = lookup_widget (mainwin, "vbox1");
- gtk_box_pack_start (GTK_BOX (vbox1), theme_treeview, FALSE, FALSE, 0);
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (theme_treeview), TRUE);
+const char *gtkui_default_titlebar_playing = "DeaDBeeF - %artist% - %title%";
+const char *gtkui_default_titlebar_stopped = "DeaDBeeF";
 
- theme_button = mainwin;//lookup_widget (mainwin, "stopbtn");
-}
+static char *titlebar_playing_bc;
+static char *titlebar_stopped_bc;
 
-void
-gtkpl_free (DdbListview *pl) {
-#if 0
- if (colhdr_anim.timeline) {
- timeline_free (colhdr_anim.timeline, 1);
- colhdr_anim.timeline = 0;
- }
-#endif
-}
+static char *statusbar_bc;
+static char *statusbar_stopped_bc;
 
-struct fromto_t {
- DB_playItem_t *from;
- DB_playItem_t *to;
+enum {
+ INFO_TARGET_URIS
 };
 
-static gboolean
-update_win_title_idle (gpointer data);
+static void
+init_widget_layout (void);
 
 // update status bar and window title
 static int sb_context_id = -1;
 static char sb_text512;
-static float last_songpos = -1;
-static char sbitrate20 = "";
-static struct timeval last_br_update;
+
+static void
+format_timestr (char *buf, int sz, float time) {
+ time = roundf(time);
+ int daystotal = (int)time / (3600*24);
+ int hourtotal = ((int)time / 3600) % 24;
+ int mintotal = ((int)time/60) % 60;
+ int sectotal = ((int)time) % 60;
+
+ if (daystotal == 0) {
+ snprintf (buf, sz, "%d:%02d:%02d", hourtotal, mintotal, sectotal);
+ }
+ else if (daystotal == 1) {
+ snprintf (buf, sz, _("1 day %d:%02d:%02d"), hourtotal, mintotal, sectotal);
+ }
+ else {
+ snprintf (buf, sz, _("%d days %d:%02d:%02d"), daystotal, hourtotal, mintotal, sectotal);
+ }
+}
 
 static gboolean
-update_songinfo (gpointer ctx) {
+update_songinfo (gpointer unused) {
+ if (w_get_rootwidget() == NULL) return FALSE;
+ 
 int iconified = gdk_window_get_state(gtk_widget_get_window(mainwin)) & GDK_WINDOW_STATE_ICONIFIED;
 if (!gtk_widget_get_visible (mainwin) || iconified) {
 return FALSE;
@@ -154,83 +172,42 @@
 char sbtext_new512 = "-";
 
 float pl_totaltime = deadbeef->pl_get_totaltime ();
- int daystotal = (int)pl_totaltime / (3600*24);
- int hourtotal = ((int)pl_totaltime / 3600) % 24;
- int mintotal = ((int)pl_totaltime/60) % 60;
- int sectotal = ((int)pl_totaltime) % 60;
-
 char totaltime_str512 = "";
- if (daystotal == 0) {
- snprintf (totaltime_str, sizeof (totaltime_str), "%d:%02d:%02d", hourtotal, mintotal, sectotal);
- }
- else if (daystotal == 1) {
- snprintf (totaltime_str, sizeof (totaltime_str), _("1 day %d:%02d:%02d"), hourtotal, mintotal, sectotal);
- }
- else {
- snprintf (totaltime_str, sizeof (totaltime_str), _("%d days %d:%02d:%02d"), daystotal, hourtotal, mintotal, sectotal);
- }
+ format_timestr(totaltime_str, sizeof (totaltime_str), pl_totaltime);
 
- DB_playItem_t *track = deadbeef->streamer_get_playing_track ();
- DB_fileinfo_t *c = deadbeef->streamer_get_current_fileinfo (); // FIXME: might crash streamer
+ DB_playItem_t *track = deadbeef->streamer_get_playing_track_safe ();
 
- float duration = track ? deadbeef->pl_get_item_duration (track) : -1;
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .it = track,
+ .iter = PL_MAIN,
+ .plt = deadbeef->plt_get_curr()
+ };
 
- if (!output || (output->state () == OUTPUT_STATE_STOPPED || !track || !c)) {
- snprintf (sbtext_new, sizeof (sbtext_new), _("Stopped | %d tracks | %s total playtime"), deadbeef->pl_getcount (PL_MAIN), totaltime_str);
- }
- else {
- float playpos = deadbeef->streamer_get_playpos ();
- int minpos = playpos / 60;
- int secpos = playpos - minpos * 60;
- int mindur = duration / 60;
- int secdur = duration - mindur * 60;
-
- const char *mode;
- char temp20;
- if (c->fmt.channels <= 2) {
- mode = c->fmt.channels == 1 ? _("Mono") : _("Stereo");
- }
- else {
- snprintf (temp, sizeof (temp), "%dch Multichannel", c->fmt.channels);
- mode = temp;
- }
- int samplerate = c->fmt.samplerate;
- int bitspersample = c->fmt.bps;
- // codec_unlock ();
+ char buffer200;
+ char *bc = NULL;
 
- char t100;
- if (duration >= 0) {
- snprintf (t, sizeof (t), "%d:%02d", mindur, secdur);
- }
- else {
- strcpy (t, "-:--");
- }
 
- struct timeval tm;
- gettimeofday (&tm, NULL);
- if (tm.tv_sec - last_br_update.tv_sec + (tm.tv_usec - last_br_update.tv_usec) / 1000000.0 >= 0.3) {
- memcpy (&last_br_update, &tm, sizeof (tm));
- int bitrate = deadbeef->streamer_get_apx_bitrate ();
- if (bitrate > 0) {
- snprintf (sbitrate, sizeof (sbitrate), _("| %4d kbps "), bitrate);
- }
- else {
- sbitrate0 = 0;
- }
- }
- const char *spaused = deadbeef->get_output ()->state () == OUTPUT_STATE_PAUSED ? _("Paused | ") : "";
- char filetype20;
- if (!deadbeef->pl_get_meta (track, ":FILETYPE", filetype, sizeof (filetype))) {
- strcpy (filetype, "-");
- }
- snprintf (sbtext_new, sizeof (sbtext_new), _("%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"), spaused, filetype, sbitrate, samplerate, bitspersample, mode, minpos, secpos, t, deadbeef->pl_getcount (PL_MAIN), totaltime_str);
+ if (!output || (output->state () == DDB_PLAYBACK_STATE_STOPPED || !track)) {
+ bc = statusbar_stopped_bc;
 }
+ else {
+ bc = statusbar_bc;
+ }
+
+ deadbeef->tf_eval (&ctx, bc, buffer, sizeof (buffer));
+ snprintf (sbtext_new,
+ sizeof (sbtext_new),
+ "%s | %d tracks | %s %s",
+ buffer,
+ deadbeef->pl_getcount (PL_MAIN),
+ totaltime_str,
+ _("total playtime"));
 
 if (strcmp (sbtext_new, sb_text)) {
 strcpy (sb_text, sbtext_new);
 
 // form statusline
- // FIXME: don't update if window is not visible
 GtkStatusbar *sb = GTK_STATUSBAR (lookup_widget (mainwin, "statusbar"));
 if (sb_context_id == -1) {
 sb_context_id = gtk_statusbar_get_context_id (sb, "msg");
@@ -243,6 +220,9 @@
 if (track) {
 deadbeef->pl_item_unref (track);
 }
+
+ deadbeef->plt_unref (ctx.plt);
+
 return FALSE;
 }
 
@@ -262,6 +242,20 @@
 GdkEventScroll *event,
 gpointer user_data)
 {
+ int change_track = deadbeef->conf_get_int ("tray.scroll_changes_track", 0)
+ ? ((event->state & GDK_CONTROL_MASK) == 0)
+ : ((event->state & GDK_CONTROL_MASK) != 0)
+ ;
+ if (change_track) {
+ if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_RIGHT) {
+ deadbeef->sendmessage (DB_EV_NEXT, 0, 0, 0);
+ }
+ else if (event->direction == GDK_SCROLL_DOWN || event->direction == GDK_SCROLL_LEFT) {
+ deadbeef->sendmessage (DB_EV_PREV, 0, 0, 0);
+ }
+ return FALSE;
+ }
+
 float vol = deadbeef->volume_get_db ();
 int sens = deadbeef->conf_get_int ("gtkui.tray_volume_sensitivity", 1);
 if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_RIGHT) {
@@ -292,6 +286,28 @@
 return FALSE;
 }
 
+static gboolean
+show_traymenu_cb (gpointer data) {
+ if (!traymenu) {
+ traymenu = create_traymenu ();
+ }
+ gtk_menu_popup (GTK_MENU (traymenu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
+ return FALSE;
+}
+
+static void
+show_traymenu (void) {
+ g_idle_add (show_traymenu_cb, NULL);
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+static gboolean
+mainwin_hide_cb (gpointer data) {
+ gtk_widget_hide (mainwin);
+ return FALSE;
+ }
+#endif
+
 void
 mainwin_toggle_visible (void) {
 int iconified = gdk_window_get_state(gtk_widget_get_window(mainwin)) & GDK_WINDOW_STATE_ICONIFIED;
@@ -299,6 +315,8 @@
 gtk_widget_hide (mainwin);
 }
 else {
+ if (w_get_rootwidget() == NULL) init_widget_layout ();
+ 
 wingeom_restore (mainwin, "mainwin", 40, 40, 500, 300, 0);
 if (iconified) {
 gtk_window_deiconify (GTK_WINDOW(mainwin));
@@ -347,132 +365,124 @@
 
 static gboolean
 activate_cb (gpointer nothing) {
+ if (w_get_rootwidget() == NULL) init_widget_layout ();
+ wingeom_restore (mainwin, "mainwin", 40, 40, 500, 300, 0);
 gtk_widget_show (mainwin);
 gtk_window_present (GTK_WINDOW (mainwin));
 return FALSE;
 }
 
-void
-redraw_queued_tracks (DdbListview *pl) {
- DB_playItem_t *it;
- int idx = 0;
- deadbeef->pl_lock ();
- for (it = deadbeef->pl_get_first (PL_MAIN); it; idx++) {
- if (deadbeef->pl_playqueue_test (it) != -1) {
- ddb_listview_draw_row (pl, idx, (DdbListviewIter)it);
- }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
+static void
+titlebar_tf_free (void) {
+ if (titlebar_playing_bc) {
+ deadbeef->tf_free (titlebar_playing_bc);
+ titlebar_playing_bc = NULL;
 }
- deadbeef->pl_unlock ();
-}
 
-gboolean
-redraw_queued_tracks_cb (gpointer plt) {
- DdbListview *list = plt;
- int iconified = gdk_window_get_state(gtk_widget_get_window(mainwin)) & GDK_WINDOW_STATE_ICONIFIED;
- if (!gtk_widget_get_visible (mainwin) || iconified) {
- return FALSE;
+ if (titlebar_stopped_bc) {
+ deadbeef->tf_free (titlebar_stopped_bc);
+ titlebar_stopped_bc = NULL;
+ }
+
+ if (statusbar_bc) {
+ deadbeef->tf_free (statusbar_bc);
+ statusbar_bc = NULL;
+ }
+ if (statusbar_stopped_bc) {
+ deadbeef->tf_free (statusbar_stopped_bc);
+ statusbar_stopped_bc = NULL;
 }
- redraw_queued_tracks (list);
- return FALSE;
 }
 
 void
-gtkpl_songchanged_wrapper (DB_playItem_t *from, DB_playItem_t *to) {
- struct fromto_t *ft = malloc (sizeof (struct fromto_t));
- ft->from = from;
- ft->to = to;
- if (from) {
- deadbeef->pl_item_ref (from);
- }
- if (to) {
- deadbeef->pl_item_ref (to);
- }
- g_idle_add (update_win_title_idle, ft);
- if (searchwin && gtk_widget_get_window (searchwin)) {
- int iconified = gdk_window_get_state(gtk_widget_get_window (searchwin)) & GDK_WINDOW_STATE_ICONIFIED;
- if (gtk_widget_get_visible (searchwin) && !iconified) {
- g_idle_add (redraw_queued_tracks_cb, DDB_LISTVIEW (lookup_widget (searchwin, "searchlist")));
- }
+gtkui_titlebar_tf_init (void) {
+ titlebar_tf_free ();
+
+ char fmt500;
+ deadbeef->conf_get_str ("gtkui.titlebar_playing_tf", gtkui_default_titlebar_playing, fmt, sizeof (fmt));
+ titlebar_playing_bc = deadbeef->tf_compile (fmt);
+ deadbeef->conf_get_str ("gtkui.titlebar_stopped_tf", gtkui_default_titlebar_stopped, fmt, sizeof (fmt));
+ titlebar_stopped_bc = deadbeef->tf_compile (fmt);
+
+ static const char statusbar_tf_with_seltime_fmt = "$if2($strcmp(%%ispaused%%,),%s | )$if2($upper(%%codec%%),-) | %%playback_bitrate%% kbps | %%samplerate%%Hz | %%:BPS%% %s | %%channels%% | %%playback_time%% / %%length%% | %%selection_playback_time%% %s";
+
+ static const char statusbar_tf_fmt = "$if2($strcmp(%%ispaused%%,),%s | )$if2($upper(%%codec%%),-) | %%playback_bitrate%% kbps | %%samplerate%%Hz | %%:BPS%% %s | %%channels%% | %%playback_time%% / %%length%%";
+
+ const char statusbar_stopped_tf_with_seltime_fmt = "%s | %%selection_playback_time%% %s";
+ const char statusbar_stopped_tf_fmt = "%s";
+
+ char statusbar_tf1024;
+ char statusbar_stopped_tf1024;
+
+ if (deadbeef->conf_get_int ("gtkui.statusbar_seltime", 0)) {
+ snprintf (statusbar_tf, sizeof (statusbar_tf), statusbar_tf_with_seltime_fmt, _("Paused"), _("bit"), _("selection playtime"));
+ snprintf (statusbar_stopped_tf, sizeof (statusbar_stopped_tf), statusbar_stopped_tf_with_seltime_fmt, _("Stopped"), _("selection playtime"));
 }
+ else {
+ snprintf (statusbar_tf, sizeof (statusbar_tf), statusbar_tf_fmt, _("Paused"), _("bit"));
+ snprintf (statusbar_stopped_tf, sizeof (statusbar_stopped_tf), statusbar_stopped_tf_fmt, _("Stopped"));
+ }
+
+ statusbar_bc = deadbeef->tf_compile (statusbar_tf);
+ statusbar_stopped_bc = deadbeef->tf_compile (statusbar_stopped_tf);
+}
+
+static gboolean
+set_title_cb (gpointer data) {
+ gtkui_set_titlebar (NULL);
+ return FALSE;
 }
 
 void
 gtkui_set_titlebar (DB_playItem_t *it) {
 if (!it) {
- it = deadbeef->streamer_get_playing_track ();
+ it = deadbeef->streamer_get_playing_track_safe ();
 }
 else {
 deadbeef->pl_item_ref (it);
 }
- char fmt500;
- char str600;
- if (it) {
- deadbeef->conf_get_str ("gtkui.titlebar_playing", "%a - %t - DeaDBeeF-%V", fmt, sizeof (fmt));
+ char str1024;
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .it = it,
+ // FIXME: current playlist is not correct here.
+ // need the playlist corresponding to the pointed track
+ .plt = deadbeef->plt_get_curr (),
+ };
+ deadbeef->tf_eval (&ctx, it ? titlebar_playing_bc : titlebar_stopped_bc, str, sizeof (str));
+ if (ctx.plt) {
+ deadbeef->plt_unref (ctx.plt);
+ ctx.plt = NULL;
 }
- else {
- deadbeef->conf_get_str ("gtkui.titlebar_stopped", "DeaDBeeF-%V", fmt, sizeof (fmt));
- }
- deadbeef->pl_format_title (it, -1, str, sizeof (str), -1, fmt);
 gtk_window_set_title (GTK_WINDOW (mainwin), str);
 if (it) {
 deadbeef->pl_item_unref (it);
 }
 set_tray_tooltip (str);
-}
-
-static void
-trackinfochanged_wrapper (DdbListview *playlist, DB_playItem_t *track, int iter) {
- if (track) {
- int idx = deadbeef->pl_get_idx_of_iter (track, iter);
- if (idx != -1) {
- ddb_listview_draw_row (playlist, idx, (DdbListviewIter)track);
- }
+ if (ctx.update > 0) {
+ set_title_timeout_id = g_timeout_add(ctx.update, set_title_cb, NULL);
 }
 }
 
-void
-gtkui_trackinfochanged (DB_playItem_t *track) {
- if (searchwin && gtk_widget_get_visible (searchwin)) {
- GtkWidget *search = lookup_widget (searchwin, "searchlist");
- trackinfochanged_wrapper (DDB_LISTVIEW (search), track, PL_SEARCH);
- }
-
- DB_playItem_t *curr = deadbeef->streamer_get_playing_track ();
+static gboolean
+trackinfochanged_cb (gpointer data) {
+ DB_playItem_t *track = data;
+ DB_playItem_t *curr = deadbeef->streamer_get_playing_track_safe ();
 if (track == curr) {
 gtkui_set_titlebar (track);
 }
+ if (track) {
+ deadbeef->pl_item_unref (track);
+ }
 if (curr) {
 deadbeef->pl_item_unref (curr);
 }
-}
-
-static gboolean
-trackinfochanged_cb (gpointer data) {
- gtkui_trackinfochanged (data);
- if (data) {
- deadbeef->pl_item_unref ((DB_playItem_t *)data);
- }
- return FALSE;
-}
-
-void
-playlist_refresh (void) {
- search_refresh ();
- trkproperties_fill_metadata ();
-}
-
-static gboolean
-playlistchanged_cb (gpointer none) {
- playlist_refresh ();
 return FALSE;
 }
 
 static gboolean
-playlistswitch_cb (gpointer none) {
- search_refresh ();
+playlistcontentchanged_cb (gpointer none) {
+ trkproperties_fill_metadata ();
 return FALSE;
 }
 
@@ -486,6 +496,9 @@
 static gboolean
 gtkui_update_status_icon (gpointer unused) {
 int hide_tray_icon = deadbeef->conf_get_int ("gtkui.hide_tray_icon", 0);
+ if (gtkui_override_statusicon) {
+ hide_tray_icon = 1;
+ }
 if (hide_tray_icon && !trayicon) {
 return FALSE;
 }
@@ -517,7 +530,7 @@
 
 if (!gtk_icon_theme_has_icon(theme, icon_name)) {
 char iconpath1024;
- snprintf (iconpath, sizeof (iconpath), "%s/deadbeef.png", deadbeef->get_prefix ());
+ snprintf (iconpath, sizeof (iconpath), "%s/deadbeef.png", deadbeef->get_system_dir(DDB_SYS_DIR_PREFIX));
 trayicon = gtk_status_icon_new_from_file(iconpath);
 }
 else {
@@ -542,7 +555,13 @@
 }
 
 static void
-gtkui_hide_status_icon () {
+override_builtin_statusicon (int override) {
+ gtkui_override_statusicon = override;
+ g_idle_add (gtkui_update_status_icon, NULL);
+}
+
+static void
+gtkui_hide_status_icon (void) {
 if (trayicon) {
 g_object_set (trayicon, "visible", FALSE, NULL);
 }
@@ -558,6 +577,72 @@
 return res;
 }
 
+int
+gtkui_rename_playlist (ddb_playlist_t *plt) {
+ GtkWidget *dlg = create_entrydialog ();
+ gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (mainwin));
+ gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+ gtk_window_set_title (GTK_WINDOW (dlg), _("Rename Playlist"));
+ GtkWidget *e;
+ e = lookup_widget (dlg, "title_label");
+ gtk_label_set_text (GTK_LABEL(e), _("Title:"));
+ e = lookup_widget (dlg, "title");
+ char t1000;
+ deadbeef->plt_get_title (plt, t, sizeof (t));
+ gtk_entry_set_text (GTK_ENTRY (e), t);
+ int res = gtk_dialog_run (GTK_DIALOG (dlg));
+ if (res == GTK_RESPONSE_OK) {
+ const char *text = gtk_entry_get_text (GTK_ENTRY (e));
+ deadbeef->plt_set_title (plt, text);
+ }
+ gtk_widget_destroy (dlg);
+ return 0;
+}
+
+int gtkui_remove_playlist (ddb_playlist_t *plt) {
+ int plt_idx = deadbeef->plt_get_idx(plt);
+ if (plt_idx == -1) {
+ return -1;
+ }
+
+ char title500;
+ if (deadbeef->plt_get_first(plt, PL_MAIN) != NULL) {
+ // playlist not empty, confirm first.
+ deadbeef->plt_get_title (plt, title, sizeof (title));
+ GtkWidget *dlg = gtk_message_dialog_new (GTK_WINDOW (mainwin), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("Removing playlist"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), _("Do you really want to remove the playlist '%s'?"), title);
+ gtk_window_set_title (GTK_WINDOW (dlg), _("Warning"));
+ int response = gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+ if (response != GTK_RESPONSE_YES) {
+ return -1;
+ }
+ }
+
+ deadbeef->plt_remove (plt_idx);
+ return 0;
+}
+
+int gtkui_remove_playlist_at_index (int plt_idx) {
+ int res = -1;
+ ddb_playlist_t *p = deadbeef->plt_get_for_idx (plt_idx);
+ if (p != NULL) {
+ res = gtkui_remove_playlist (p);
+ }
+ return res;
+}
+
+int
+gtkui_rename_playlist_at_index (int plt_idx) {
+ int res = -1;
+ ddb_playlist_t *p = deadbeef->plt_get_for_idx (plt_idx);
+ if (p != NULL) {
+ res = gtkui_rename_playlist(p);
+ deadbeef->plt_unref (p);
+ }
+ return res;
+}
+
 void
 gtkui_setup_gui_refresh (void) {
 int tm = 1000/gtkui_get_gui_refresh_rate ();
@@ -578,12 +663,12 @@
 
 // order
 const char *orderwidgets4 = { "order_linear", "order_shuffle", "order_random", "order_shuffle_albums" };
- w = orderwidgetsdeadbeef->conf_get_int ("playback.order", PLAYBACK_ORDER_LINEAR);
+ w = orderwidgetsdeadbeef->streamer_get_shuffle ();
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, w)), TRUE);
 
 // looping
 const char *loopingwidgets3 = { "loop_all", "loop_disable", "loop_single" };
- w = loopingwidgetsdeadbeef->conf_get_int ("playback.loop", PLAYBACK_MODE_LOOP_ALL);
+ w = loopingwidgetsdeadbeef->streamer_get_repeat ();
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, w)), TRUE);
 
 // scroll follows playback
@@ -600,11 +685,23 @@
 int stop_after_album = deadbeef->conf_get_int ("playlist.stop_after_album", 0);
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "stop_after_album")), stop_after_album ? TRUE : FALSE);
 
- // embolden current track
 gtkui_embolden_current_track = deadbeef->conf_get_int ("gtkui.embolden_current_track", 0);
+ gtkui_embolden_tracks = deadbeef->conf_get_int ("gtkui.embolden_tracks", 0);
+ gtkui_embolden_selected_tracks = deadbeef->conf_get_int ("gtkui.embolden_selected_tracks", 0);
+ gtkui_italic_current_track = deadbeef->conf_get_int ("gtkui.italic_current_track", 0);
+ gtkui_italic_tracks = deadbeef->conf_get_int ("gtkui.italic_tracks", 0);
+ gtkui_italic_selected_tracks = deadbeef->conf_get_int ("gtkui.italic_selected_tracks", 0);
+ gtkui_tabstrip_embolden_playing = deadbeef->conf_get_int ("gtkui.tabstrip_embolden_playing", 0);
+ gtkui_tabstrip_italic_playing = deadbeef->conf_get_int ("gtkui.tabstrip_italic_playing", 0);
+ gtkui_tabstrip_embolden_selected = deadbeef->conf_get_int ("gtkui.tabstrip_embolden_selected", 0);
+ gtkui_tabstrip_italic_selected = deadbeef->conf_get_int ("gtkui.tabstrip_italic_selected", 0);
+
+ // titlebar tf
+ gtkui_titlebar_tf_init ();
 
 // pin groups
 gtkui_groups_pinned = deadbeef->conf_get_int ("playlist.pin.groups", 0);
+ gtkui_groups_spacing = deadbeef->conf_get_int ("playlist.groups.spacing", 0);
 
 // play state images
 gtkui_unicode_playstate = deadbeef->conf_get_int ("gtkui.unicode_playstate", 0);
@@ -623,7 +720,7 @@
 
 static gboolean
 outputchanged_cb (gpointer nothing) {
- preferences_fill_soundcards ();
+ prefwin_fill_soundcards ();
 return FALSE;
 }
 
@@ -653,38 +750,6 @@
 gdk_threads_add_idle (action_add_location_handler_cb, NULL);
 }
 
-static gboolean
-update_win_title_idle (gpointer data) {
- struct fromto_t *ft = (struct fromto_t *)data;
- DB_playItem_t *from = ft->from;
- DB_playItem_t *to = ft->to;
- free (ft);
-
- // update window title
- if (from || to) {
- if (to) {
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
- if (it) { // it might have been deleted after event was sent
- gtkui_set_titlebar (it);
- deadbeef->pl_item_unref (it);
- }
- else {
- gtkui_set_titlebar (NULL);
- }
- }
- else {
- gtkui_set_titlebar (NULL);
- }
- }
- if (from) {
- deadbeef->pl_item_unref (from);
- }
- if (to) {
- deadbeef->pl_item_unref (to);
- }
- return FALSE;
-}
-
 int
 gtkui_add_new_playlist (void) {
 int cnt = deadbeef->plt_get_count ();
@@ -718,7 +783,7 @@
 }
 
 int
-gtkui_get_gui_refresh_rate () {
+gtkui_get_gui_refresh_rate (void) {
 int fps = deadbeef->conf_get_int ("gtkui.refresh_rate", 10);
 if (fps < 1) {
 fps = 1;
@@ -746,9 +811,6 @@
 }
 
 int
-gtkui_thread (void *ctx);
-
-int
 gtkui_plt_add_dir (ddb_playlist_t *plt, const char *dirname, int (*cb)(DB_playItem_t *it, void *data), void *user_data);
 
 int
@@ -763,24 +825,152 @@
 DB_playItem_t *
 gtkui_plt_load (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data);
 
-int
+
+static int
+is_current_playlist (DB_playItem_t *it) {
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ ddb_playlist_t *it_plt = deadbeef->pl_get_playlist (it);
+ if (it_plt) {
+ if (it_plt == plt) {
+ deadbeef->plt_unref (it_plt);
+ deadbeef->plt_unref (plt);
+ return 1;
+ }
+ deadbeef->plt_unref (it_plt);
+ }
+ deadbeef->plt_unref (plt);
+ }
+ return 0;
+}
+
+// The intended scroll position is set for background tabs, etc.
+// This will be overwritten if there is a current main listview, or when the playlist is loaded by a listview
+static void
+playlist_set_intended_scroll (DB_playItem_t *it) {
+ ddb_playlist_t *plt = deadbeef->pl_get_playlist (it);
+ if (plt) {
+ int idx = deadbeef->plt_get_item_idx (plt, it, PL_MAIN);
+ if (idx != -1) {
+ deadbeef->plt_set_scroll (plt, -1 * idx);
+ }
+ deadbeef->plt_unref (plt);
+ }
+}
+
+static gboolean
+pre_songstarted_cb (gpointer data) {
+ DB_playItem_t *it = data;
+ if ((!gtkui_listview_busy || !is_current_playlist (it)) && deadbeef->conf_get_int ("playlist.scroll.followplayback", 1)) {
+ playlist_set_intended_scroll (it);
+ }
+ deadbeef->pl_item_unref (it);
+ return FALSE;
+}
+
+static gboolean
+pre_trackfocus_cb (gpointer data) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
+ if (it) {
+ playlist_set_intended_scroll (it);
+ deadbeef->pl_item_unref (it);
+ }
+ return FALSE;
+}
+
+// These functions handle cases that need a playlist switch, or when there is no main listview to take the message
+static void
+playlist_set_cursor (ddb_playlist_t *plt, DB_playItem_t *it) {
+ int idx = deadbeef->plt_get_item_idx (plt, it, PL_MAIN);
+ if (idx != -1) {
+ if (deadbeef->pl_is_selected (it) || idx != deadbeef->plt_get_cursor (plt, PL_MAIN) || deadbeef->plt_getselcount (plt) != 1) {
+ deadbeef->plt_deselect_all (plt);
+ deadbeef->pl_set_selected (it, 1);
+ deadbeef->plt_set_cursor (plt, PL_MAIN, idx);
+ ddb_event_track_t *event = (ddb_event_track_t *)deadbeef->event_alloc(DB_EV_CURSOR_MOVED);
+ event->track = it;
+ deadbeef->pl_item_ref (it);
+ deadbeef->event_send ((ddb_event_t *)event, PL_MAIN, 0);
+ }
+ }
+}
+
+static gboolean
+songstarted_cb (gpointer data) {
+ DB_playItem_t *it = data;
+ if ((!gtkui_listview_busy || !is_current_playlist (it)) && deadbeef->conf_get_int ("playlist.scroll.cursorfollowplayback", 1)) {
+ deadbeef->pl_lock ();
+ ddb_playlist_t *plt = deadbeef->pl_get_playlist (it);
+ if (plt) {
+ playlist_set_cursor (plt, it);
+ deadbeef->plt_unref (plt);
+ }
+ deadbeef->pl_unlock ();
+ }
+ deadbeef->pl_item_unref (it);
+ return FALSE;
+}
+
+static gboolean
+trackfocus_cb (gpointer data) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
+ if (it) {
+ deadbeef->pl_lock ();
+ ddb_playlist_t *plt = deadbeef->pl_get_playlist (it);
+ if (plt) {
+ deadbeef->plt_set_curr (plt);
+ playlist_set_cursor (plt, it);
+ deadbeef->plt_unref (plt);
+ }
+ deadbeef->pl_unlock ();
+ deadbeef->pl_item_unref (it);
+ }
+ return FALSE;
+}
+
+static int
 gtkui_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
 if (!gtkui_accept_messages) {
 return -1;
 }
+
+ switch (id) {
+ case DB_EV_SONGSTARTED:
+ {
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ if (ev->track) {
+ deadbeef->pl_item_ref (ev->track);
+ g_idle_add (pre_songstarted_cb, ev->track);
+ }
+ break;
+ }
+ case DB_EV_TRACKFOCUSCURRENT:
+ g_idle_add (pre_trackfocus_cb, NULL);
+ break;
+ case DB_EV_SONGCHANGED:
+ // update titlebar when to==NULL, i.e. playback has stopped
+ if (!((ddb_event_trackchange_t *)ctx)->to) {
+ g_idle_add (trackinfochanged_cb, NULL);
+ }
+ break;
+ }
+
+ search_message(id, ctx, p1, p2);
 ddb_gtkui_widget_t *rootwidget = w_get_rootwidget ();
 if (rootwidget) {
 send_messages_to_widgets (rootwidget, id, ctx, p1, p2);
 }
- gtkui_cover_message (id, ctx, p1, p2);
+
 switch (id) {
 case DB_EV_ACTIVATED:
 g_idle_add (activate_cb, NULL);
 break;
- case DB_EV_SONGCHANGED:
- {
- ddb_event_trackchange_t *ev = (ddb_event_trackchange_t *)ctx;
- gtkpl_songchanged_wrapper (ev->from, ev->to);
+ case DB_EV_SONGSTARTED:
+ g_idle_add (set_title_cb, NULL);
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ if (ev->track) {
+ deadbeef->pl_item_ref (ev->track);
+ g_idle_add (songstarted_cb, ev->track);
 }
 break;
 case DB_EV_TRACKINFOCHANGED:
@@ -788,15 +978,17 @@
 ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
 if (ev->track) {
 deadbeef->pl_item_ref (ev->track);
+ g_idle_add (trackinfochanged_cb, ev->track);
 }
- g_idle_add (trackinfochanged_cb, ev->track);
 }
 break;
-// case DB_EV_PAUSED:
-// g_idle_add (paused_cb, NULL);
-// break;
 case DB_EV_PLAYLISTCHANGED:
- g_idle_add (playlistchanged_cb, NULL);
+ if (p1 == DDB_PLAYLIST_CHANGE_CONTENT) {
+ g_idle_add (playlistcontentchanged_cb, NULL);
+ }
+ break;
+ case DB_EV_TRACKFOCUSCURRENT:
+ g_idle_add (trackfocus_cb, NULL);
 break;
 case DB_EV_CONFIGCHANGED:
 g_idle_add (gtkui_on_configchanged, NULL);
@@ -804,9 +996,6 @@
 case DB_EV_OUTPUTCHANGED:
 g_idle_add (outputchanged_cb, NULL);
 break;
- case DB_EV_PLAYLISTSWITCHED:
- g_idle_add (playlistswitch_cb, NULL);
- break;
 case DB_EV_ACTIONSCHANGED:
 g_idle_add (add_mainmenu_actions_cb, NULL);
 break;
@@ -814,10 +1003,145 @@
 eq_refresh ();
 break;
 }
- return 0;
-}
+ return 0;
+}
+
+static json_t *
+_convert_062_layout_to_json (const char **script) {
+ const char *s = *script;
+
+ json_t *node = NULL;
+ json_t *type = NULL;
+ json_t *legacy_params = NULL;
+ json_t *children = NULL;
+ json_t *settings = NULL;
+
+ char tMAX_TOKEN;
+ s = gettoken (s, t);
+ if (!s) {
+ goto error;
+ }
+
+ type = json_string(t);
+
+ // load widget params
+ const char *params_begin = s;
+ for (;;) {
+ s = gettoken_ext (s, t, "={}();");
+ if (!s) {
+ goto error;
+ }
+ if (!strcmp (t, "{")) {
+ break;
+ }
+
+ char *key = strdup(t);
+
+ // match '='
+ char eqMAX_TOKEN;
+ s = gettoken_ext (s, eq, "={}();");
+ if (!s || strcmp (eq, "=")) {
+ free(key);
+ goto error;
+ }
+ s = gettoken_ext (s, t, "={}();");
+ if (!s) {
+ free(key);
+ goto error;
+ }
+
+ if (settings == NULL) {
+ settings = json_object();
+ }
+
+ json_object_set (settings, key, json_string(t));
+ free (key);
+ }
+
+ // trim
+ while (*params_begin == ' ') {
+ params_begin++;
+ }
+
+ const char *params_end = s - 1;
+
+ while (params_end > params_begin && *(params_end-1) == ' ') {
+ params_end--;
+ }
+
+ if (params_end > params_begin) {
+ char *params_str = malloc (params_end - params_begin + 1);
+ memcpy (params_str, params_begin, params_end - params_begin);
+ params_strparams_end - params_begin = 0;
+ legacy_params = json_string (params_str);
+ free (params_str);
+ }
+
+ if (strcmp (t, "{")) {
+ goto error;
+ }
+ for (;;) {
+ const char *save = s;
+ s = gettoken (s, t);
+ if (!s) {
+ goto error;
+ }
+
+ if (!strcmp (t, "}")) {
+ break;
+ }
+
+ s = save;
+
+ json_t *child = _convert_062_layout_to_json (&s);
+ if (!child) {
+ goto error;
+ }
+
+ if (children == NULL) {
+ children = json_array();
+ }
+
+ json_array_append(children, child);
+ json_decref(child);
+ child = NULL;
+ }
+
+ node = json_object();
+ json_object_set(node, "type", type);
+ if (legacy_params != NULL) {
+ json_object_set(node, "legacy_params", legacy_params);
+ }
+ if (settings != NULL) {
+ json_object_set(node, "settings", settings);
+ }
+ if (children != NULL) {
+ json_object_set(node, "children", children);
+ }
+
+ *script = s;
+
+error:
+
+ if (type != NULL) {
+ json_decref(type);
+ type = NULL;
+ }
+ if (legacy_params != NULL) {
+ json_decref(legacy_params);
+ legacy_params = NULL;
+ }
+ if (settings != NULL) {
+ json_decref(settings);
+ settings = NULL;
+ }
+ if (children != NULL) {
+ json_decref(children);
+ children = NULL;
+ }
 
-static const char gtkui_def_layout = "vbox expand=\"0 1\" fill=\"1 1\" homogeneous=0 {hbox expand=\"0 1 0\" fill=\"1 1 1\" homogeneous=0 {playtb {} seekbar {} volumebar {} } tabbed_playlist hideheaders=0 {} } ";
+ return node;
+}
 
 static void
 init_widget_layout (void) {
@@ -828,37 +1152,65 @@
 
 // load layout
 // config var name is defined in DDB_GTKUI_CONF_LAYOUT
- // gtkui.layout: 0.6.0 and 0.6.1
 // gtkui.layout.major.minor.point: later versions
 
- char layout20000;
- deadbeef->conf_get_str (DDB_GTKUI_CONF_LAYOUT, "-", layout, sizeof (layout));
- if (!strcmp (layout, "-")) {
- // upgrade from 0.6.0 to 0.6.2
- char layout_06020000;
- deadbeef->conf_get_str ("gtkui.layout", "-", layout_060, sizeof (layout_060));
- if (!strcmp (layout_060, "-")) {
- // new setup
- strcpy (layout, gtkui_def_layout);
- }
- else {
- // upgrade with top bar
- snprintf (layout, sizeof (layout), "vbox expand=\"0 1\" fill=\"1 1\" homogeneous=0 {hbox expand=\"0 1 0\" fill=\"1 1 1\" homogeneous=0 {playtb {} seekbar {} volumebar {} } %s }", layout_060);
- deadbeef->conf_set_str (DDB_GTKUI_CONF_LAYOUT, layout);
- deadbeef->conf_save ();
+ static const char *gtkui_def_layout = "{\"type\":\"vbox\",\"legacy_params\":\"expand=\\\"0 1\\\" fill=\\\"1 1\\\" homogeneous=0\",\"children\":{\"type\":\"hbox\",\"legacy_params\":\"expand=\\\"0 1 0\\\" fill=\\\"1 1 1\\\" homogeneous=0\",\"children\":{\"type\":\"playtb\"},{\"type\":\"seekbar\"},{\"type\":\"volumebar\",\"legacy_params\":\"scale=0\"}},{\"type\":\"tabbed_playlist\",\"legacy_params\":\"hideheaders=0\"}}";
+
+ json_t *layout = NULL;
+
+ char *layout_json = NULL;
+
+ deadbeef->conf_lock();
+ const char *layout_json_conf = deadbeef->conf_get_str_fast(DDB_GTKUI_CONF_LAYOUT, NULL);
+ if (layout_json_conf != NULL) {
+ layout_json = strdup (layout_json_conf);
+ }
+ else {
+ // migrate from 0.6.2 layout format
+ const char *layout_062 = deadbeef->conf_get_str_fast("gtkui.layout.0.6.2", NULL);
+ if (layout_062 != NULL) {
+ const char *script = layout_062;
+ layout = _convert_062_layout_to_json(&script);
+
+ if (layout != NULL) {
+ char * str = json_dumps(layout, JSON_COMPACT);
+ deadbeef->conf_set_str(DDB_GTKUI_CONF_LAYOUT, str);
+ layout_json = str;
+ deadbeef->conf_save();
+ }
 }
 }
+ deadbeef->conf_unlock();
+
+ if (layout_json != NULL) {
+ layout = json_loads(layout_json, 0, NULL);
+ free (layout_json);
+ layout_json = NULL;
+ }
+
+ gboolean is_default = FALSE;
+
+ if (layout == NULL) {
+ layout = json_loads(gtkui_def_layout, 0, NULL);
+ is_default = TRUE;
+ }
 
 ddb_gtkui_widget_t *w = NULL;
- w_create_from_string (layout, &w);
- if (!w) {
- ddb_gtkui_widget_t *plt = w_create ("tabbed_playlist");
- w_append (rootwidget, plt);
- gtk_widget_show (plt->widget);
+ w_create_from_json (layout, &w);
+ json_delete(layout);
+ layout = NULL;
+
+ if (w == NULL && !is_default) {
+ layout = json_loads(gtkui_def_layout, 0, NULL);
+ w_create_from_json (layout, &w);
+ json_delete(layout);
+ layout = NULL;
 }
- else {
- w_append (rootwidget, w);
+
+ if (w == NULL) {
+ abort(); // could not recover
 }
+ w_append (rootwidget, w);
 }
 
 static DB_plugin_t *supereq_plugin;
@@ -880,16 +1232,6 @@
 }
 }
 
- // cover_art
- DB_plugin_t **plugins = deadbeef->plug_get_list ();
- for (int i = 0; pluginsi; i++) {
- DB_plugin_t *p = pluginsi;
- if (p->id && !strcmp (p->id, "artwork") && p->version_major == 1 && p->version_minor >= 2) {
- trace ("gtkui: found cover-art loader plugin\n");
- coverart_plugin = (DB_artwork_plugin_t *)p;
- break;
- }
- }
 add_mainmenu_actions ();
 ddb_event_t *e = deadbeef->event_alloc (DB_EV_TRACKINFOCHANGED);
 deadbeef->event_send(e, 0, 0);
@@ -924,34 +1266,188 @@
 }
 }
 
-int
-gtkui_thread (void *ctx) {
-#ifdef __linux__
- prctl (PR_SET_NAME, "deadbeef-gtkui", 0, 0, 0, 0);
-#endif
+typedef struct {
+ void (*callback) (void *userdata);
+ void *userdata;
+} window_init_hook_t;
 
- int argc = 2;
- const char **argv = alloca (sizeof (char *) * argc);
- argv0 = "deadbeef";
- argv1 = "--sync";
- //argv1 = "--g-fatal-warnings";
- if (!deadbeef->conf_get_int ("gtkui.sync", 0)) {
- argc = 1;
+#define WINDOW_INIT_HOOK_MAX 10
+static window_init_hook_t window_init_hooksWINDOW_INIT_HOOK_MAX;
+static int window_init_hooks_count;
+
+static void
+add_window_init_hook (void (*callback) (void *userdata), void *userdata) {
+ if (window_init_hooks_count >= WINDOW_INIT_HOOK_MAX) {
+ fprintf (stderr, "gtkui: add_window_init_hook can't add another hook, maximum number of hooks (%d) exceeded\n", (int)WINDOW_INIT_HOOK_MAX);
+ return;
 }
 
- gtk_disable_setlocale ();
- add_pixmap_directory (deadbeef->get_pixmap_dir ());
-
- // let's start some gtk
- g_thread_init (NULL);
-#ifndef __FreeBSD__
- // this call makes gtk_main hang on freebsd for unknown reason
- // however, if we don't have this call, deadbeef will crash randomly on
- // gentoo linux
- gdk_threads_init ();
+ window_init_hookswindow_init_hooks_count.callback = callback;
+ window_init_hookswindow_init_hooks_count.userdata = userdata;
+ window_init_hooks_count++;
+}
+
+
+void
+gtkui_toggle_log_window(void) {
+ if (gtk_widget_get_visible (logwindow)) {
+ gtkui_show_log_window(FALSE);
+ }
+ else {
+ gtkui_show_log_window(TRUE);
+ }
+}
+
+void
+gtkui_show_log_window_internal(gboolean show) {
+ show ? gtk_widget_show (logwindow) : gtk_widget_hide (logwindow);
+ GtkWidget *menuitem = lookup_widget (mainwin, "view_log");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), show);
+
+#if GTK_CHECK_VERSION(3,10,0)
+#if USE_GTK_APPLICATION
+ GSimpleAction *act = deadbeef_app_get_log_action (gapp);
+ if (act) {
+ g_simple_action_set_state (act, g_variant_new_boolean (show));
+ }
 #endif
- gtk_init (&argc, (char ***)&argv);
+#endif
+}
+
+void
+gtkui_show_log_window(gboolean show) {
+ if (show) {
+ wingeom_restore (logwindow, "logwindow", 40, 40, 400, 200, 0);
+ }
+ else {
+ wingeom_save(logwindow, "logwindow");
+ }
+ gtkui_show_log_window_internal(show);
+}
+
+gboolean
+on_gtkui_log_window_delete (GtkWidget *widget, GdkEventAny *event, GtkWidget **pwindow) {
+ gtkui_show_log_window(FALSE);
+ return TRUE; // don't destroy window
+}
+
+static int logwindow_scroll_bottomed=1;
+
+void
+logwindow_scroll_changed (GtkAdjustment *adjustment, gpointer user_data)
+{
+ if (gtk_adjustment_get_value (adjustment) >=
+ gtk_adjustment_get_upper (adjustment) -
+ gtk_adjustment_get_page_size (adjustment) - 1e-12)
+ {
+ logwindow_scroll_bottomed = 1;
+ } else {
+ logwindow_scroll_bottomed = 0;
+ }
+}
+
+GtkWidget *
+gtkui_create_log_window (void) {
+ GtkWidget *pwindow = create_log_window ();
+ GtkWidget *scrolledwindow14=lookup_widget(pwindow, "scrolledwindow14");
+ GtkAdjustment *adjustment = gtk_scrolled_window_get_vadjustment ( GTK_SCROLLED_WINDOW (scrolledwindow14));
+ GtkWidget *textview=lookup_widget(pwindow, "logwindow_textview");
+
+ PangoFontDescription *descr = pango_font_description_from_string("monospace");
+ gtk_widget_modify_font(textview, descr);
+ pango_font_description_free(descr);
+
+ g_signal_connect (adjustment, "value-changed", G_CALLBACK (logwindow_scroll_changed), NULL);
+ g_signal_connect (pwindow, "delete_event", G_CALLBACK (on_gtkui_log_window_delete), pwindow);
+ gtk_window_set_transient_for (GTK_WINDOW (pwindow), GTK_WINDOW (mainwin));
+ return pwindow;
+}
+
+typedef struct {
+ char *str;
+ uint32_t layers;
+} addtext_struct_t;
+
+static gboolean
+logwindow_addtext_cb (gpointer data) {
+ addtext_struct_t *addtext = (addtext_struct_t *)data;
+
+ GtkWidget *textview=lookup_widget(logwindow, "logwindow_textview");
+ GtkTextBuffer *buffer;
+ GtkTextIter iter;
+ size_t len;
+ len = strlen(addtext->str);
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
+ gtk_text_buffer_get_end_iter(buffer, &iter);
+ gtk_text_buffer_insert (buffer, &iter, addtext->str, (gint)len);
+ // Make sure it ends on a newline
+ if (addtext->strlen-1 != '\n') {
+ gtk_text_buffer_get_end_iter(buffer, &iter);
+ gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ }
+ if (logwindow_scroll_bottomed) {
+ gtk_text_buffer_get_end_iter(buffer, &iter);
+ GtkTextMark *mark = gtk_text_buffer_create_mark (buffer, NULL, &iter, FALSE);
+ gtk_text_view_scroll_mark_onscreen (GTK_TEXT_VIEW (textview), mark);
+ }
+ if (!w_logviewer_is_present() && addtext->layers == DDB_LOG_LAYER_DEFAULT)
+ gtkui_show_log_window_internal(TRUE);
+ free(addtext->str);
+ free(addtext);
+ return FALSE;
+}
+
+static void
+logwindow_logger_callback (struct DB_plugin_s *plugin, uint32_t layers, const char *text, void *ctx) {
+ addtext_struct_t *data = malloc(sizeof(addtext_struct_t));
+ data->str = strdup(text);
+ data->layers = layers;
+ g_idle_add(logwindow_addtext_cb, (gpointer)data);
+}
 
+
+static gboolean
+gtkui_mainwin_drag_motion (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data)
+{
+ // Don't allow drag from within application
+ if (gtk_drag_get_source_widget (drag_context)) {
+ gdk_drag_status (drag_context, 0, time);
+ }
+
+ return FALSE;
+}
+
+static void
+gtkui_mainwin_drag_data_received (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint target_type,
+ guint time,
+ gpointer user_data)
+{
+ gchar *ptr=(char*)gtk_selection_data_get_data (data);
+ gint len = gtk_selection_data_get_length (data);
+ if (target_type == INFO_TARGET_URIS) { // uris
+ // this happens when dropped from file manager
+ char *mem = malloc (len+1);
+ memcpy (mem, ptr, len);
+ memlen = 0;
+ // we don't pass control structure, but there's only one drag-drop view currently
+ gtkui_receive_fm_drop (NULL, mem, len);
+ }
+
+ gtk_drag_finish (drag_context, TRUE, FALSE, time);
+}
+
+void
+gtkui_mainwin_init(void) {
 // register widget types
 w_reg_widget (_("Playlist with tabs"), DDB_WF_SINGLE_INSTANCE, w_tabbed_playlist_create, "tabbed_playlist", NULL);
 w_reg_widget (_("Playlist"), DDB_WF_SINGLE_INSTANCE, w_playlist_create, "playlist", NULL);
@@ -960,22 +1456,50 @@
 w_reg_widget (_("Splitter (top and bottom)"), 0, w_vsplitter_create, "vsplitter", NULL);
 w_reg_widget (_("Splitter (left and right)"), 0, w_hsplitter_create, "hsplitter", NULL);
 w_reg_widget (NULL, 0, w_placeholder_create, "placeholder", NULL);
-// w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
+ w_reg_widget (_("Tabs"), DDB_WF_SUPPORTS_EXTENDED_API, w_tabs_create, "tabs", NULL);
 w_reg_widget (_("Playlist tabs"), 0, w_tabstrip_create, "tabstrip", NULL);
- w_reg_widget (_("Selection properties"), 0, w_selproperties_create, "selproperties", NULL);
- w_reg_widget (_("Album art display"), 0, w_coverart_create, "coverart", NULL);
- w_reg_widget (_("Scope"), 0, w_scope_create, "scope", NULL);
- w_reg_widget (_("Spectrum"), 0, w_spectrum_create, "spectrum", NULL);
+ w_reg_widget (_("Selection properties"), DDB_WF_SUPPORTS_EXTENDED_API, w_selproperties_create, "selproperties", NULL);
+ w_reg_widget (_("Album art display"), DDB_WF_SUPPORTS_EXTENDED_API, w_albumart_create, "coverart", NULL);
+ w_reg_widget (_("Oscilloscope"), DDB_WF_SUPPORTS_EXTENDED_API, w_scope_create, "scope", NULL);
+ w_reg_widget (_("Spectrum"), DDB_WF_SUPPORTS_EXTENDED_API, w_spectrum_create, "spectrum", NULL);
 w_reg_widget (_("HBox"), 0, w_hbox_create, "hbox", NULL);
 w_reg_widget (_("VBox"), 0, w_vbox_create, "vbox", NULL);
 w_reg_widget (_("Button"), 0, w_button_create, "button", NULL);
 w_reg_widget (_("Seekbar"), 0, w_seekbar_create, "seekbar", NULL);
 w_reg_widget (_("Playback controls"), 0, w_playtb_create, "playtb", NULL);
- w_reg_widget (_("Volume bar"), 0, w_volumebar_create, "volumebar", NULL);
+ w_reg_widget (_("Volume bar"), DDB_WF_SUPPORTS_EXTENDED_API, w_volumebar_create, "volumebar", NULL);
 w_reg_widget (_("Chiptune voices"), 0, w_ctvoices_create, "ctvoices", NULL);
+ w_reg_widget (_("Log viewer"), 0, w_logviewer_create, "logviewer", NULL);
+#if ENABLE_MEDIALIB
+ w_reg_widget (_("Media library viewer"), 0, w_medialib_viewer_create, "medialibviewer", NULL);
+#endif
 
 mainwin = create_mainwin ();
 
+#if GTK_CHECK_VERSION(3,10,0) && USE_GTK_APPLICATION
+ // This must be called before window is shown
+ gtk_application_add_window ( GTK_APPLICATION (gapp), GTK_WINDOW (mainwin));
+#endif
+
+ wingeom_restore (mainwin, "mainwin", 40, 40, 500, 300, 0); 
+ 
+#if GTK_CHECK_VERSION(3,0,0)
+ init_widget_layout ();
+ gtk_widget_set_events (GTK_WIDGET (mainwin), gtk_widget_get_events (GTK_WIDGET (mainwin)) | GDK_SCROLL_MASK);
+
+ if (deadbeef->conf_get_int ("gtkui.start_hidden", 0)) {
+ g_idle_add (mainwin_hide_cb, NULL);
+ }
+#elif GTK_CHECK_VERSION(2,16,0)
+ if (!deadbeef->conf_get_int ("gtkui.start_hidden", 0)) {
+ init_widget_layout ();
+ gtk_widget_show (mainwin);
+ }
+#endif 
+
+ logwindow = gtkui_create_log_window();
+ deadbeef->log_viewer_register (logwindow_logger_callback, logwindow);
+
 // initialize default hotkey mapping
 if (!deadbeef->conf_get_int ("hotkeys_created", 0)) {
 // check if any hotkeys were created manually (e.g. beta versions of 0.6)
@@ -990,27 +1514,38 @@
 deadbeef->conf_set_int ("hotkeys_created", 1);
 deadbeef->conf_save ();
 }
-#if GTK_CHECK_VERSION(3,0,0)
- gtk_widget_set_events (GTK_WIDGET (mainwin), gtk_widget_get_events (GTK_WIDGET (mainwin)) | GDK_SCROLL_MASK);
-#endif
 
- gtkpl_init ();
+ pl_common_init();
+
+ // setup drag-drop target
+ gtk_drag_dest_set (mainwin, GTK_DEST_DEFAULT_ALL, NULL, 0, GDK_ACTION_COPY);
+ gtk_drag_dest_add_uri_targets (mainwin);
+ g_signal_connect ((gpointer) mainwin, "drag_data_received",
+ G_CALLBACK (gtkui_mainwin_drag_data_received),
+ NULL);
+ g_signal_connect ((gpointer) mainwin, "drag_motion",
+ G_CALLBACK (gtkui_mainwin_drag_motion),
+ NULL);
 
 GtkIconTheme *theme = gtk_icon_theme_get_default();
 if (gtk_icon_theme_has_icon(theme, "deadbeef")) {
+ // NOTE: according to valgrind, this leaks memory - seems to be a GTK bug
 gtk_window_set_icon_name (GTK_WINDOW (mainwin), "deadbeef");
 }
 else {
 // try loading icon from $prefix/deadbeef.png (for static build)
 char iconpath1024;
- snprintf (iconpath, sizeof (iconpath), "%s/deadbeef.png", deadbeef->get_prefix ());
- gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), iconpath, NULL);
+ snprintf (iconpath, sizeof (iconpath), "%s/deadbeef.png", deadbeef->get_system_dir(DDB_SYS_DIR_PREFIX));
+ struct stat st = {0};
+ if (stat (iconpath, &st)) {
+ snprintf (iconpath, sizeof (iconpath), "%s/deadbeef.png", deadbeef->get_system_dir(DDB_SYS_DIR_PLUGIN_RESOURCES));
+ }
+ if (!stat (iconpath, &st)) {
+ gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), iconpath, NULL);
+ }
 }
 
- wingeom_restore (mainwin, "mainwin", 40, 40, 500, 300, 0);
-
 gtkui_on_configchanged (NULL);
- gtkui_init_theme_colors ();
 
 // visibility of statusbar and headers
 GtkWidget *sb_mi = lookup_widget (mainwin, "view_status_bar");
@@ -1031,14 +1566,8 @@
 gtk_widget_hide (menu);
 }
 
- searchwin = create_searchwin ();
- gtk_window_set_transient_for (GTK_WINDOW (searchwin), GTK_WINDOW (mainwin));
-
- DdbListview *search_playlist = DDB_LISTVIEW (lookup_widget (searchwin, "searchlist"));
- search_playlist_init (GTK_WIDGET (search_playlist));
-
+ search_playlist_init (mainwin);
 progress_init ();
- cover_art_init ();
 
 #ifdef __APPLE__
 #if 0
@@ -1049,15 +1578,10 @@
 #endif
 #endif
 
- gtk_widget_show (mainwin);
-
- init_widget_layout ();
-
- char fmt500;
- char str600;
- deadbeef->conf_get_str ("gtkui.titlebar_stopped", "DeaDBeeF-%V", fmt, sizeof (fmt));
- deadbeef->pl_format_title (NULL, -1, str, sizeof (str), -1, fmt);
- gtk_window_set_title (GTK_WINDOW (mainwin), str);
+ for (int i = 0; i < window_init_hooks_count; i++) {
+ window_init_hooksi.callback (window_init_hooksi.userdata);
+ }
+ gtkui_set_titlebar (NULL);
 
 fileadded_listener_id = deadbeef->listen_file_added (gtkui_add_file_info_cb, NULL);
 fileadd_beginend_listener_id = deadbeef->listen_file_add_beginend (gtkui_add_file_begin_cb, gtkui_add_file_end_cb, NULL);
@@ -1067,40 +1591,52 @@
 gtkui_connect_cb (NULL);
 
 gtkui_accept_messages = 1;
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+}
 
-#ifdef __APPLE__
- gtkui_is_retina = is_retina (mainwin);
-#endif
- gtk_main ();
+void
+gtkui_mainwin_free(void) {
 deadbeef->unlisten_file_added (fileadded_listener_id);
 deadbeef->unlisten_file_add_beginend (fileadd_beginend_listener_id);
 
+ covermanager_terminate(covermanager_shared());
+// FIXME: can't do this, since artwork holds non-refcounted references to it
+// covermanager_shared_free ();
+
 w_free ();
 
 if (refresh_timeout) {
 g_source_remove (refresh_timeout);
 refresh_timeout = 0;
 }
- cover_art_free ();
+
+ if (set_title_timeout_id) {
+ g_source_remove (set_title_timeout_id);
+ set_title_timeout_id = 0;
+ }
+
+ clipboard_free_current ();
 eq_window_destroy ();
 trkproperties_destroy ();
 progress_destroy ();
 gtkui_hide_status_icon ();
+ pl_common_free();
+ search_destroy ();
 // draw_free ();
- if (theme_treeview) {
- gtk_widget_destroy (theme_treeview);
- theme_treeview = NULL;
+ titlebar_tf_free ();
+ gtkui_free_pltmenu ();
+ plmenu_free();
+
+ if (logwindow) {
+ deadbeef->log_viewer_unregister (logwindow_logger_callback, logwindow);
+ gtk_widget_destroy (logwindow);
+ logwindow = NULL;
 }
 if (mainwin) {
 gtk_widget_destroy (mainwin);
 mainwin = NULL;
 }
- if (searchwin) {
- gtk_widget_destroy (searchwin);
- searchwin = NULL;
- }
- return 0;
+
 }
 
 gboolean
@@ -1114,12 +1650,6 @@
 }
 
 void
-gtkui_playlist_set_curr (int playlist) {
- deadbeef->plt_set_curr_idx (playlist);
- deadbeef->conf_set_int ("playlist.current", playlist);
-}
-
-void
 on_gtkui_info_window_delete (GtkWidget *widget, GtkTextDirection previous_direction, GtkWidget **pwindow) {
 *pwindow = NULL;
 gtk_widget_hide (widget);
@@ -1137,6 +1667,11 @@
 gtk_window_set_title (GTK_WINDOW (widget), title);
 gtk_window_set_transient_for (GTK_WINDOW (widget), GTK_WINDOW (mainwin));
 GtkWidget *txt = lookup_widget (widget, "helptext");
+
+ PangoFontDescription *descr = pango_font_description_from_string("monospace");
+ gtk_widget_modify_font(txt, descr);
+ pango_font_description_free(descr);
+
 GtkTextBuffer *buffer = gtk_text_buffer_new (NULL);
 
 FILE *fp = fopen (fname, "rb");
@@ -1148,25 +1683,31 @@
 if (fread (buf, 1, s, fp) != s) {
 fprintf (stderr, "error reading help file contents\n");
 const char *error = _("Failed while reading help file");
- gtk_text_buffer_set_text (buffer, error, strlen (error));
+ gtk_text_buffer_set_text (buffer, error, (int)strlen (error));
 }
 else {
 bufs = 0;
- gtk_text_buffer_set_text (buffer, buf, s);
+ gtk_text_buffer_set_text (buffer, buf, (gint)s);
 }
 fclose (fp);
 }
 else {
 const char *error = _("Failed to load help file");
- gtk_text_buffer_set_text (buffer, error, strlen (error));
+ gtk_text_buffer_set_text (buffer, error, (gint)strlen (error));
 }
 gtk_text_view_set_buffer (GTK_TEXT_VIEW (txt), buffer);
 g_object_unref (buffer);
 gtk_widget_show (widget);
 }
 
-gboolean
-gtkui_quit_cb (void *ctx) {
+typedef enum {
+ SHUTDOWN_INHIBIT,
+ SHUTDOWN_NORMAL,
+ SHUTDOWN_FORCE
+} shutdown_type;
+
+static shutdown_type
+_should_allow_shutdown (void) {
 if (deadbeef->have_background_jobs ()) {
 GtkWidget *dlg = gtk_message_dialog_new (GTK_WINDOW (mainwin), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("The player is currently running background tasks. If you quit now, the tasks will be cancelled or interrupted. This may result in data loss."));
 gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (mainwin));
@@ -1176,16 +1717,42 @@
 int response = gtk_dialog_run (GTK_DIALOG (dlg));
 gtk_widget_destroy (dlg);
 if (response != GTK_RESPONSE_YES) {
- return FALSE;
+ return SHUTDOWN_INHIBIT;
 }
 else {
- exit (0);
+ return SHUTDOWN_FORCE;
 }
 }
 else {
+ return SHUTDOWN_NORMAL;
+ }
+}
+
+static void
+_delete_running_marker(void) {
+ char crash_markerPATH_MAX;
+ snprintf (crash_marker, sizeof (crash_marker), "%s/running", deadbeef->get_system_dir(DDB_SYS_DIR_CONFIG));
+ unlink(crash_marker);
+}
+
+gboolean
+gtkui_quit_cb (void *ctx) {
+ _quitting_normally = 1;
+ w_save ();
+
+ shutdown_type type = _should_allow_shutdown();
+
+ if (type == 2) {
+ _delete_running_marker();
+ exit(0);
+ }
+ else if (type == 1) {
 progress_abort ();
 deadbeef->sendmessage (DB_EV_TERMINATE, 0, 0, 0);
 }
+ else {
+ _quitting_normally = 0;
+ }
 return FALSE;
 }
 
@@ -1194,47 +1761,96 @@
 gdk_threads_add_idle (gtkui_quit_cb, NULL);
 }
 
+static void
+import_legacy_tf (const char *key_from, const char *key_to) {
+ deadbeef->conf_lock ();
+ if (!deadbeef->conf_get_str_fast (key_to, NULL)
+ && deadbeef->conf_get_str_fast (key_from, NULL)) {
+ char old200, new200;
+ deadbeef->conf_get_str (key_from, "", old, sizeof (old));
+ deadbeef->tf_import_legacy (old, new, sizeof (new));
+ deadbeef->conf_set_str (key_to, new);
+ deadbeef->conf_save ();
+ }
+ deadbeef->conf_unlock ();
+}
+
+#if GTK_CHECK_VERSION(3,10,0) && USE_GTK_APPLICATION
+static void
+gapplication_shutdown_handler (GApplication *app, gpointer user_data) {
+ if (_quitting_normally) {
+ return;
+ }
+ printf ("gapplication_shutdown_handler\n");
+ shutdown_type type = _should_allow_shutdown();
+ if (type != SHUTDOWN_INHIBIT) {
+ _delete_running_marker();
+ }
+}
+#endif
+
 static int
 gtkui_start (void) {
 fprintf (stderr, "gtkui plugin compiled for gtk version: %d.%d.%d\n", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
- gtkui_thread (NULL);
 
- return 0;
-}
+ import_legacy_tf ("gtkui.titlebar_playing", "gtkui.titlebar_playing_tf");
+ import_legacy_tf ("gtkui.titlebar_stopped", "gtkui.titlebar_stopped_tf");
 
-static int
-gtkui_connect (void) {
- return 0;
-}
+ import_legacy_tf ("playlist.group_by", "gtkui.playlist.group_by_tf");
 
-static int
-gtkui_disconnect (void) {
- supereq_plugin = NULL;
- coverart_plugin = NULL;
+ int argc = 1;
+ const char **argv = alloca (sizeof (char *) * argc);
+ argv0 = "deadbeef";
+
+ gtk_disable_setlocale ();
+ add_pixmap_directory (deadbeef->get_system_dir(DDB_SYS_DIR_PIXMAP));
+
+#if GTK_CHECK_VERSION(3,10,0) && USE_GTK_APPLICATION
+ gapp = deadbeef_app_new ();
+ GValue val = G_VALUE_INIT;
+ g_value_init (&val, G_TYPE_BOOLEAN);
+ g_value_set_boolean (&val, TRUE);
+ g_object_set_property (G_OBJECT(gapp), "register-session", &val);
+ g_signal_connect (gapp, "window-removed", G_CALLBACK (gapplication_shutdown_handler), NULL);
+ g_application_run ( G_APPLICATION (gapp), argc, (char**)argv);
+ g_object_unref (gapp);
+#else
+ gtk_init (&argc, (char ***)&argv);
+
+ gtkui_mainwin_init ();
+ gtk_main ();
+ gtkui_mainwin_free ();
+#endif
 
 return 0;
 }
 
-
 static gboolean
 quit_gtk_cb (gpointer nothing) {
 extern int trkproperties_modified;
+
+ gtkui_mainwin_free();
+
+ supereq_plugin = NULL;
 trkproperties_modified = 0;
 trkproperties_destroy ();
 search_destroy ();
+#if ENABLE_MEDIALIB
+ gtkui_medialib_free();
+#endif
+#if GTK_CHECK_VERSION(3,10,0) && USE_GTK_APPLICATION
+ g_application_quit (G_APPLICATION (gapp));
+#else
 gtk_main_quit ();
+#endif
+ trace ("gtkui_stop completed\n");
 return FALSE;
 }
 
 static int
 gtkui_stop (void) {
- if (coverart_plugin) {
- coverart_plugin->plugin.plugin.stop ();
- coverart_plugin = NULL;
- }
 trace ("quitting gtk\n");
 g_idle_add (quit_gtk_cb, NULL);
- trace ("gtkui_stop completed\n");
 return 0;
 }
 
@@ -1243,12 +1859,52 @@
 return mainwin;
 }
 
+static DB_plugin_action_t action_rg_remove_info = {
+ .title = "ReplayGain/Remove ReplayGain Information",
+ .name = "rg_remove_info",
+ .flags = DB_ACTION_SINGLE_TRACK | DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_ADD_MENU,
+ .callback2 = action_rg_remove_info_handler,
+ .next = NULL
+};
+
+static DB_plugin_action_t action_rg_scan_selection_as_albums = {
+ .title = "ReplayGain/Scan Selection As Albums (By Tags)",
+ .name = "rg_scan_selection_as_albums",
+ .flags = DB_ACTION_SINGLE_TRACK | DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_ADD_MENU,
+ .callback2 = action_rg_scan_selection_as_albums_handler,
+ .next = &action_rg_remove_info
+};
+
+static DB_plugin_action_t action_rg_scan_selection_as_album = {
+ .title = "ReplayGain/Scan Selection As Single Album",
+ .name = "rg_scan_selection_as_album",
+ .flags = DB_ACTION_SINGLE_TRACK | DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_ADD_MENU,
+ .callback2 = action_rg_scan_selection_as_album_handler,
+ .next = &action_rg_scan_selection_as_albums
+};
+
+static DB_plugin_action_t action_rg_scan_per_file = {
+ .title = "ReplayGain/Scan Per-file Track Gain",
+ .name = "rg_scan_perfile_track_gain",
+ .flags = DB_ACTION_SINGLE_TRACK | DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_ADD_MENU,
+ .callback2 = action_rg_scan_per_file_handler,
+ .next = &action_rg_scan_selection_as_album
+};
+
+static DB_plugin_action_t action_scan_all_tracks_without_rg = {
+ .title = "ReplayGain/Scan Per-file Track Gain If Not Scanned",
+ .name = "scan_all_tracks_without_Rg",
+ .flags = DB_ACTION_SINGLE_TRACK | DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_ADD_MENU,
+ .callback2 = action_scan_all_tracks_without_rg_handler ,
+ .next = &action_rg_scan_per_file
+};
+
 static DB_plugin_action_t action_deselect_all = {
 .title = "Edit/Deselect All",
 .name = "deselect_all",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_deselect_all_handler,
- .next = NULL
+ .next = &action_scan_all_tracks_without_rg
 };
 
 static DB_plugin_action_t action_select_all = {
@@ -1268,7 +1924,7 @@
 };
 
 static DB_plugin_action_t action_delete_from_disk = {
- .title = "Remove From Disk",
+ .title = "Delete from Disk",
 .name = "delete_from_disk",
 .flags = DB_ACTION_MULTIPLE_TRACKS,
 .callback2 = action_delete_from_disk_handler,
@@ -1325,7 +1981,7 @@
 };
 
 static DB_plugin_action_t action_playback_loop_cycle = {
- .title = "Playback/Cycle Playback Looping Mode",
+ .title = "Playback/Cycle Repeat Mode",
 .name = "loop_cycle",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playback_loop_cycle_handler,
@@ -1333,7 +1989,7 @@
 };
 
 static DB_plugin_action_t action_playback_loop_off = {
- .title = "Playback/Playback Looping - Don't loop",
+ .title = "Playback/Repeat - Off",
 .name = "loop_off",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playback_loop_off_handler,
@@ -1341,7 +1997,7 @@
 };
 
 static DB_plugin_action_t action_playback_loop_single = {
- .title = "Playback/Playback Looping - Single track",
+ .title = "Playback/Repeat - Single Track",
 .name = "loop_track",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playback_loop_single_handler,
@@ -1349,7 +2005,7 @@
 };
 
 static DB_plugin_action_t action_playback_loop_all = {
- .title = "Playback/Playback Looping - All",
+ .title = "Playback/Repeat - All",
 .name = "loop_all",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playback_loop_all_handler,
@@ -1357,7 +2013,7 @@
 };
 
 static DB_plugin_action_t action_playback_order_cycle = {
- .title = "Playback/Cycle Playback Order",
+ .title = "Playback/Cycle Shuffle Mode",
 .name = "order_cycle",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playback_order_cycle_handler,
@@ -1365,7 +2021,7 @@
 };
 
 static DB_plugin_action_t action_playback_order_random = {
- .title = "Playback/Playback Order - Random",
+ .title = "Playback/Shuffle - Random Tracks",
 .name = "order_random",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playback_order_random_handler,
@@ -1373,7 +2029,7 @@
 };
 
 static DB_plugin_action_t action_playback_order_shuffle_albums = {
- .title = "Playback/Playback Order - Shuffle albums",
+ .title = "Playback/Shuffle - Albums",
 .name = "order_shuffle_albums",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playback_order_shuffle_albums_handler,
@@ -1381,7 +2037,7 @@
 };
 
 static DB_plugin_action_t action_playback_order_shuffle = {
- .title = "Playback/Playback Order - Shuffle tracks",
+ .title = "Playback/Shuffle - Tracks",
 .name = "order_shuffle",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playback_order_shuffle_handler,
@@ -1389,7 +2045,7 @@
 };
 
 static DB_plugin_action_t action_playback_order_linear = {
- .title = "Playback/Playback Order - Linear",
+ .title = "Playback/Shuffle - Off",
 .name = "order_linear",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playback_order_linear_handler,
@@ -1463,9 +2119,9 @@
 };
 
 static DB_plugin_action_t action_remove_from_playlist = {
- .title = "Edit/Remove Track(s) From Current Playlist",
+ .title = "Edit/Remove Track(s) from Playlist",
 .name = "remove_from_playlist",
- .flags = DB_ACTION_MULTIPLE_TRACKS,
+ .flags = DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_EXCLUDE_FROM_CTX_PLAYLIST,
 .callback2 = action_remove_from_playlist_handler,
 .next = &action_crop_selected
 };
@@ -1503,12 +2159,20 @@
 .next = &action_remove_current_playlist
 };
 
+static DB_plugin_action_t action_rename_current_playlist = {
+ .title = "File/Rename Current Playlist",
+ .name = "rename_current_playlist",
+ .flags = DB_ACTION_COMMON,
+ .callback2 = action_rename_current_playlist_handler,
+ .next = &action_new_playlist
+};
+
 static DB_plugin_action_t action_toggle_eq = {
 .title = "View/Show\\/Hide Equalizer",
 .name = "toggle_eq",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_toggle_eq_handler,
- .next = &action_new_playlist
+ .next = &action_rename_current_playlist
 };
 
 static DB_plugin_action_t action_hide_eq = {
@@ -1559,10 +2223,18 @@
 .next = &action_show_mainwin
 };
 
+static DB_plugin_action_t action_view_log = {
+ .title = "View/Show\\/Hide Log window",
+ .name = "toggle_log_window",
+ .flags = DB_ACTION_COMMON,
+ .callback2 = action_toggle_logwindow_handler,
+ .next = &action_find
+};
+
 static DB_plugin_action_t *
 gtkui_get_actions (DB_playItem_t *it)
 {
- return &action_find;
+ return &action_view_log;
 }
 
 #if !GTK_CHECK_VERSION(3,0,0)
@@ -1579,24 +2251,61 @@
 }
 #endif
 
+static GtkWidget *
+_create_pltmenu (int plt_index) {
+ ddb_playlist_t *plt = deadbeef->plt_get_for_idx (plt_index);
+ GtkWidget *menu = NULL;
+ if (plt != NULL) {
+ menu = gtkui_create_pltmenu(plt);
+ deadbeef->plt_unref (plt);
+ }
+ return menu;
+}
+
 static const char settings_dlg =
 "property \"Ask confirmation to delete files from disk\" checkbox gtkui.delete_files_ask 1;\n"
+ "property \"Status icon settings:\" label l;\n"
 "property \"Status icon volume control sensitivity\" entry gtkui.tray_volume_sensitivity 1;\n"
 "property \"Custom status icon\" entry gtkui.custom_tray_icon \"" TRAY_ICON "\" ;\n"
- "property \"Run gtk_init with --sync (debug mode)\" checkbox gtkui.sync 0;\n"
+ "property \"Misc:\" label l;\n"
 "property \"Add separators between plugin context menu items\" checkbox gtkui.action_separators 0;\n"
 "property \"Use unicode chars instead of images for track state\" checkbox gtkui.unicode_playstate 0;\n"
 "property \"Disable seekbar overlay text\" checkbox gtkui.disable_seekbar_overlay 0;\n"
 ;
 
+#pragma mark - Obsolete cover art API stubs
+
+GdkPixbuf *
+_get_cover_art_pixbuf (const char *uri, const char *artist, const char *album, int size, void (*callback)(void *user_data), void *user_data) {
+ return NULL;
+}
+
+static GdkPixbuf *
+_cover_get_default_pixbuf (void) {
+ return NULL;
+}
+
+static GdkPixbuf *
+_get_cover_art_primary (const char *uri, const char *artist, const char *album, int size, void (*callback)(void *user_data), void *user_data) {
+ return NULL;
+}
+
+GdkPixbuf *
+_get_cover_art_thumb (const char *uri, const char *artist, const char *album, int size, void (*callback)(void *user_data), void *user_data) {
+ return NULL;
+}
+
+#pragma mark -
+
 // define plugin interface
-static ddb_gtkui_t plugin = {
- .gui.plugin.api_vmajor = 1,
- .gui.plugin.api_vminor = 5,
+ddb_gtkui_t plugin = {
+ .gui.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .gui.plugin.api_vminor = DB_API_VERSION_MINOR,
 .gui.plugin.version_major = DDB_GTKUI_API_VERSION_MAJOR,
 .gui.plugin.version_minor = DDB_GTKUI_API_VERSION_MINOR,
 .gui.plugin.type = DB_PLUGIN_GUI,
 .gui.plugin.id = DDB_GTKUI_PLUGIN_ID,
+ .gui.plugin.flags = DDB_PLUGIN_FLAG_LOGGING,
 #if GTK_CHECK_VERSION(3,0,0)
 .gui.plugin.name = "GTK3 user interface",
 .gui.plugin.descr = "User interface using GTK+ 3.x",
@@ -1604,28 +2313,48 @@
 .gui.plugin.name = "GTK2 user interface",
 .gui.plugin.descr = "User interface using GTK+ 2.x",
 #endif
- .gui.plugin.copyright = 
- "Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ .gui.plugin.copyright =
+ "GTK+ user interface for DeaDBeeF Player.\n"
+ "Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\n"
+ "\n"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\n"
+ "\n"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\n"
+ "\n"
+ "3. This notice may not be removed or altered from any source distribution.\n"
+ "\n"
+ "\n"
+ "GTK - The GIMP Toolkit\n"
+ "Copyright (C) GTK Developers\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"
+ "This library is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU Lesser General Public\n"
+ "License as published by the Free Software Foundation; either\n"
+ "version 2 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"
+ "This library 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"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
+ "Lesser 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"
+ "You should have received a copy of the GNU Lesser General Public\n"
+ "License along with this library. If not, see <http://www.gnu.org/licenses/>.\n"
 ,
 .gui.plugin.website = "http://deadbeef.sf.net",
 .gui.plugin.start = gtkui_start,
 .gui.plugin.stop = gtkui_stop,
- .gui.plugin.connect = gtkui_connect,
- .gui.plugin.disconnect = gtkui_disconnect,
 .gui.plugin.configdialog = settings_dlg,
 .gui.plugin.message = gtkui_message,
 .gui.run_dialog = gtkui_run_dialog_root,
@@ -1643,7 +2372,17 @@
 .w_append = w_append,
 .w_replace = w_replace,
 .w_remove = w_remove,
- .create_pltmenu = gtkui_create_pltmenu,
- .get_cover_art_pixbuf = get_cover_art_callb,
- .cover_get_default_pixbuf = cover_get_default_pixbuf,
+ .create_pltmenu = _create_pltmenu,
+ .get_cover_art_pixbuf = _get_cover_art_pixbuf,
+ .get_cover_art_primary = _get_cover_art_primary,
+ .get_cover_art_thumb = _get_cover_art_thumb,
+ .cover_get_default_pixbuf = _cover_get_default_pixbuf,
+ .add_window_init_hook = add_window_init_hook,
+ .mainwin_toggle_visible = mainwin_toggle_visible,
+ .show_traymenu = show_traymenu,
+ .override_builtin_statusicon = override_builtin_statusicon,
+ .copy_selection = clipboard_copy_selection,
+ .cut_selection = clipboard_cut_selection,
+ .paste_selection = clipboard_paste_selection,
+ .w_get_type_flags = w_get_type_flags,
 };

deadbeef-1.9.6.tar.bz2/plugins/gtkui/gtkui.gresources.xml Added

deadbeef-0.6.2.tar.bz2/plugins/gtkui/gtkui.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/gtkui.h Changed

@@ -1,47 +1,68 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifndef __GTKUI_H
 #define __GTKUI_H
 
-#if HAVE_NOTIFY
-#define NOTIFY_DEFAULT_FORMAT "%a - %t"
-#endif
-
 #include <gtk/gtk.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
 
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+
+#if GTK_CHECK_VERSION(3,0,0)
+#include "deadbeefapp.h"
+extern DeadbeefApp *gapp;
+#endif
 
 extern DB_functions_t *deadbeef;
 extern GtkWidget *mainwin;
-extern GtkWidget *searchwin;
+
+extern int gtkui_embolden_selected_tracks;
+extern int gtkui_embolden_tracks;
 extern int gtkui_embolden_current_track;
-extern int gtkui_is_retina;
+extern int gtkui_italic_selected_tracks;
+extern int gtkui_italic_tracks;
+extern int gtkui_italic_current_track;
+
 extern int gtkui_unicode_playstate;
 extern int gtkui_disable_seekbar_overlay;
 
+extern int gtkui_tabstrip_embolden_selected;
+extern int gtkui_tabstrip_embolden_playing;
+extern int gtkui_tabstrip_italic_selected;
+extern int gtkui_tabstrip_italic_playing;
+
 struct _GSList;
 
 extern int gtkui_groups_pinned;
+extern int gtkui_groups_spacing;
+extern int gtkui_listview_busy;
+
+extern const char *gtkui_default_titlebar_playing;
+extern const char *gtkui_default_titlebar_stopped;
 
 // misc utility functions
 
@@ -57,9 +78,6 @@
 void
 gtkui_receive_fm_drop (DB_playItem_t *before, char *mem, int length);
 
-void
-preferences_fill_soundcards (void);
-
 // color scheme constants
 enum {
 COLO_PLAYLIST_CURSOR,
@@ -77,24 +95,12 @@
 COLO_COUNT
 };
 
-void
-theme_set_cairo_source_rgb (cairo_t *cr, int col);
-
-void
-theme_set_fg_color (int col);
-
-void
-theme_set_bg_color (int col);
-
-void
-playlist_refresh (void);
-
-void
-search_refresh (void);
-
 int
 gtkui_add_new_playlist (void);
 
+int
+gtkui_copy_playlist (ddb_playlist_t *plt);
+
 void
 seekbar_draw (GtkWidget *widget, cairo_t *cr);
 
@@ -122,17 +128,20 @@
 gboolean
 gtkui_set_progress_text_idle (gpointer data);
 
-void
-gtkui_playlist_set_curr (int playlist);
+int
+gtkui_rename_playlist (ddb_playlist_t *plt);
 
 int
-gtkui_get_curr_playlist_mod (void);
+gtkui_rename_playlist_at_index(int plt_idx);
 
-void
-gtkui_trackinfochanged (DB_playItem_t *it);
+int
+gtkui_remove_playlist(ddb_playlist_t *plt);
 
-gboolean
-redraw_queued_tracks_cb (gpointer plt);
+int
+gtkui_remove_playlist_at_index(int plt_idx);
+
+int
+gtkui_get_curr_playlist_mod (void);
 
 void
 mainwin_toggle_visible (void);
@@ -144,18 +153,51 @@
 on_gtkui_info_window_delete (GtkWidget *widget, GtkTextDirection previous_direction, GtkWidget **pwindow);
 
 GtkWidget*
-gtkui_create_pltmenu (int plt_idx);
+gtkui_create_pltmenu (ddb_playlist_t *plt);
 
 void
-plt_get_title_wrapper (int plt, char *buffer, int len);
+gtkui_free_pltmenu(void);
 
 void
 gtkui_quit (void);
 
-void
-gtkui_run_preferences_dlg (void);
+extern int gtkui_hotkey_grabbing;
+gboolean
+on_hotkeys_set_key_key_press_event (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data);
 
 int
-gtkui_get_gui_refresh_rate ();
+gtkui_get_gui_refresh_rate (void);
+
+void
+gtkui_titlebar_tf_init (void);
+
+void
+gtkui_show_log_window(gboolean show);
+
+void
+gtkui_toggle_log_window(void);
+
+void
+gtkui_mainwin_init(void);
+
+void
+gtkui_mainwin_free(void);
+
+enum GtkuiFileChooserType {
+ GTKUI_FILECHOOSER_OPENFILE,
+ GTKUI_FILECHOOSER_OPENFOLDER,
+ GTKUI_FILECHOOSER_LOADPLAYLIST,
+ GTKUI_FILECHOOSER_SAVEPLAYLIST
+};
+
+GSList *
+show_file_chooser (const gchar *title,
+ enum GtkuiFileChooserType type,
+ gboolean select_multiple);
+
+char *
+gtkui_trim_whitespace(char *p, size_t len);
 
 #endif

deadbeef-0.6.2.tar.bz2/plugins/gtkui/gtkui_api.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/gtkui_api.h Changed

@@ -2,7 +2,7 @@
 gtkui_api.h -- API of the DeaDBeeF GTK UI plugin
 http://deadbeef.sourceforge.net
 
- Copyright (C) 2009-2013 Alexey Yakovenko
+ Copyright (C) 2009-2021 Oleksiy 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
@@ -25,6 +25,8 @@
 #ifndef __GTKUI_API_H
 #define __GTKUI_API_H
 
+#include <stdint.h>
+
 // gtkui.version_major=2 corresponds to deadbeef 0.6
 // this is the version which has added design mode.
 // it's guaranteed that the API will remain backwards compatible
@@ -35,22 +37,65 @@
 // for information, about how to port your plugin to the new API correctly,
 // and to learn more about design mode programming,
 // please visit the following page:
-// http://github.com/Alexey-Yakovenko/deadbeef/wiki/Porting-GUI-plugins-to-deadbeef-from-0.5.x-to-0.6.0
+// http://github.com/DeaDBeeF-Player/deadbeef/wiki/Porting-GUI-plugins-to-deadbeef-from-0.5.x-to-0.6.0
 
+#if defined(GTK_CHECK_VERSION)
 #if GTK_CHECK_VERSION(3,0,0)
 #define DDB_GTKUI_PLUGIN_ID "gtkui3_1"
 #else
 #define DDB_GTKUI_PLUGIN_ID "gtkui_1"
 #endif
+#else
+typedef void GtkWidget;
+#endif
 
 #define DDB_GTKUI_API_VERSION_MAJOR 2
-#define DDB_GTKUI_API_VERSION_MINOR 1
+#define DDB_GTKUI_API_VERSION_MINOR 5
+
+#define DDB_GTKUI_DEPRECATED(x)
+
+#ifdef __GNUC__
+// avoid including glibc headers, this is not very portable
+#if defined __GNUC__ && defined __GNUC_MINOR__
+# define __GNUC_PREREQ(maj, min) \
+	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+# define __GNUC_PREREQ(maj, min) 0
+#endif
+#undef DDB_GTKUI_DEPRECATED
+#if __GNUC_PREREQ(4,5)
+#define DDB_GTKUI_DEPRECATED(x) __attribute__ ((deprecated(x)))
+#else
+#define DDB_GTKUI_DEPRECATED(x) __attribute__ ((deprecated))
+#endif
+#endif
+
+#ifndef DDB_GTKUI_API_LEVEL
+#define DDB_GTKUI_API_LEVEL (DDB_GTKUI_API_VERSION_MAJOR * 100 + DDB_GTKUI_API_VERSION_MINOR)
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_GTKUI_API_LEVEL >= 202)
+#define DEPRECATED_202 DDB_GTKUI_DEPRECATED("since GTKUI API 2.2")
+#else
+#define DEPRECATED_202
+#endif
+
+#if (DDB_WARN_DEPRECATED && DDB_GTKUI_API_LEVEL >= 204)
+#define DEPRECATED_204 DDB_GTKUI_DEPRECATED("since GTKUI API 2.4")
+#else
+#define DEPRECATED_204
+#endif
 
-// added in API 2.1
-#define DDB_GTKUI_CONF_LAYOUT "gtkui.layout.0.6.2"
+#if (DDB_WARN_DEPRECATED && DDB_GTKUI_API_LEVEL >= 205)
+#define DEPRECATED_205 DDB_GTKUI_DEPRECATED("since GTKUI API 2.5")
+#else
+#define DEPRECATED_205
+#endif
 
 // this flag tells that the widget should be added to h/vboxes with expand=FALSE
-#define DDB_GTKUI_WIDGET_FLAG_NON_EXPANDABLE 0x00000001
+enum {
+ DDB_GTKUI_WIDGET_FLAG_NON_EXPANDABLE = 1<<0,
+};
 
 // widget config string must look like that:
 // type key1=value1 key2=value2... { child widgets }
@@ -81,17 +126,17 @@
 
 // save your custom parameters in the string using strncat
 // for example, if you need to write width and height:
- // strncat (s, "100 200", sz);
- void (*save) (struct ddb_gtkui_widget_s *w, char *s, int sz);
+ // strncat (s, "x=100 y=200", sz);
+ void (*save) (struct ddb_gtkui_widget_s *w, char *s, int sz) DEPRECATED_205;
 
 // this is to read custom widget parameters, e.g. width and height;
- // you will be passed a string looking like "100 200 {"
+ // you will be passed a string looking like "x=100 y=200 {"
 // you will need to read params, and return the new pointer, normally it
 // should be pointing to the "{"
 //
 // type string is necessary for backwards compatibility, so that load
 // function knows which type it's loading
- const char *(*load) (struct ddb_gtkui_widget_s *w, const char *type, const char *s);
+ const char *(*load) (struct ddb_gtkui_widget_s *w, const char *type, const char *s) DEPRECATED_205;
 
 // custom destructor code
 void (*destroy) (struct ddb_gtkui_widget_s *w);
@@ -133,11 +178,29 @@
 struct ddb_gtkui_widget_s *next; // points to next widget in the same container
 } ddb_gtkui_widget_t;
 
+typedef struct {
+ /// Size must be set to the size of this struct
+ size_t _size;
+
+ /// Load settings from a NULL-terminated list of interleaved key and value strings
+ void (*deserialize_from_keyvalues)(ddb_gtkui_widget_t *widget, const char **keyvalues);
+
+ /// Save settings to a NULL-terminated list of interleaved key and value strings.
+ char const **(*serialize_to_keyvalues)(ddb_gtkui_widget_t *widget);
+
+ /// Free the keyvalues list returned by @c serialize_to_keyvalues
+ void (*free_serialized_keyvalues)(ddb_gtkui_widget_t *widget, char const **keyvalues);
+} ddb_gtkui_widget_extended_api_t;
 
 // flags for passing to w_reg_widget
 
-// tell the widget manager, that this widget can only have single instance
-#define DDB_WF_SINGLE_INSTANCE 0x00000001
+enum {
+ /// The widget can only have single instance
+ DDB_WF_SINGLE_INSTANCE = 1<<0,
+ /// This allows to use the ddb_gtkui_widget_extended_api_t API added in GTKUI 2.5.
+ /// Such widget must provide the @c ddb_gtkui_widget_extended_api_t struct immediately after the @c ddb_gtkui_widget_t struct
+ DDB_WF_SUPPORTS_EXTENDED_API = 1<<1,
+};
 
 typedef struct {
 DB_gui_t gui;
@@ -145,12 +208,16 @@
 // returns main window ptr
 GtkWidget * (*get_mainwin) (void);
 
- // register new widget type;
- // type strings are passed at the end of argument list terminated with NULL
- // for example:
- // w_reg_widget("My Visualization", 0, my_viz_create, "my_viz_ng", "my_viz", NULL);
- // this call will register new type "my_viz_ng", with support for another
- // "my_viz" type string
+ /// Register new widget type.
+ /// @param title Display name of the widget, that will show up in the UI
+ /// @param flags should be a combination of the DDB_WF_* values.
+ /// @param create_func will be called to create the widget.
+ ///
+ /// The remaining arguments are a NULL-terminated list of strings, which determine the valid type names. At list one type name is required. This is the value that will be used for serialization.
+ /// Example:
+ /// w_reg_widget("My Visualization", 0, my_viz_create, "my_viz_ng", "my_viz", NULL);
+ /// this call will register new type "my_viz_ng", with support for another
+ /// "my_viz" type string
 void (*w_reg_widget) (const char *title, uint32_t flags, ddb_gtkui_widget_t *(*create_func) (void), ...);
 
 // unregister existing widget type
@@ -195,15 +262,44 @@
 // appears when right-clicked on playlist tab)
 GtkWidget* (*create_pltmenu) (int plt_idx);
 
- // get_cover_art_pixbuf will return pixbuf, if available.
- // if not available, the requested cover will be loaded asyncronously.
- // the callback will be called when the requested cover is available,
- // in which case you will need to call the get_cover_art_pixbuf again from
- // the callback.
+ /// Obsolete: returns NULL
 GdkPixbuf *(*get_cover_art_pixbuf) (const char *uri, const char *artist, const char *album, int size, void (*callback)(void *user_data), void *user_data);
-
- // get_default_cover_pixbuf returns the default cover art image
+ /// Obsolete: returns NULL
 GdkPixbuf *(*cover_get_default_pixbuf) (void);
+
+#if (DDB_GTKUI_API_LEVEL >= 202)
+ /// Obsolete: returns NULL
+ GdkPixbuf *(*get_cover_art_primary) (const char *uri, const char *artist, const char *album, int size, void (*callback)(void *user_data), void *user_data);
+
+ /// Obsolete: returns NULL
+ GdkPixbuf *(*get_cover_art_thumb) (const char *uri, const char *artist, const char *album, int size, void (*callback)(void *user_data), void *user_data);
+
+ // adds a hook to be called before the main loop starts running, but after
+ // the window was created.
+ void (*add_window_init_hook) (void (*callback) (void *userdata), void *userdata);
+#endif
+
+#if (DDB_GTKUI_API_LEVEL >= 203)
+ // Status icon plugin support functions
+ void (*mainwin_toggle_visible) (void);
+ void (*show_traymenu) (void);
+
+ // Tell GTKUI that the standard status icon must be hidden, because another
+ // plugin wants to make it in a different way
+ void (*override_builtin_statusicon) (int override_);
+#endif
+#if (DDB_GTKUI_API_LEVEL >= 204)
+ // copy and paste actions
+ // plt_idx: the playlist to copy/cut from or paste to
+ // ctx: DDB_ACTION_CTX_SELECTION to copy/cut/paste tracks, DDB_ACTION_CTX_PLAYLIST to copy/cut/paste a playlist
+ void (*copy_selection) (ddb_playlist_t *plt, int ctx);
+ void (*cut_selection) (ddb_playlist_t *plt, int ctx);
+ void (*paste_selection) (ddb_playlist_t *plt, int ctx);
+#endif
+#if (DDB_GTKUI_API_LEVEL >= 205)
+ /// Get flags passed to @c w_reg_widget for this type.
+ uint32_t (*w_get_type_flags) (const char *type);
+#endif
 } ddb_gtkui_t;
 
 #endif

deadbeef-1.9.6.tar.bz2/plugins/gtkui/gtkui_deletefromdisk.c Added

@@ -0,0 +1,109 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <gtk/gtk.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <deadbeef/deadbeef.h>
+#include "../../gettext.h"
+#include "gtkui.h"
+#include "gtkui_api.h"
+#include "gtkui_deletefromdisk.h"
+
+extern DB_functions_t *deadbeef;
+extern ddb_gtkui_t plugin;
+#define trace(...) { deadbeef->log_detailed (&plugin.gui.plugin, 0, __VA_ARGS__); }
+
+void
+gtkui_warning_message_for_ctx (ddbDeleteFromDiskController_t ctl, ddb_action_context_t ctx, unsigned trackcount, ddbDeleteFromDiskControllerWarningCallback_t callback) {
+ if (deadbeef->conf_get_int ("gtkui.delete_files_ask", 1)) {
+ char buf1000;
+ const char *buf2 = deadbeef->conf_get_int ("gtkui.move_to_trash", 1) ?
+ _(" The files will be moved to trash.\n\n(This dialog can be turned off in GTKUI plugin settings)") :
+ _(" The files will be lost.\n\n(This dialog can be turned off in GTKUI plugin settings)");
+
+ if (ctx == DDB_ACTION_CTX_SELECTION) {
+ int selected_files = trackcount;
+ if (selected_files == 1) {
+ snprintf(buf, sizeof (buf), _("Do you really want to delete the selected file?%s"), buf2);
+ } else {
+ snprintf(buf, sizeof (buf), _("Do you really want to delete all %d selected files?%s"), selected_files, buf2);
+ }
+ }
+ else if (ctx == DDB_ACTION_CTX_PLAYLIST) {
+ int files = trackcount;
+ snprintf(buf, sizeof (buf), _("Do you really want to delete all %d files from the current playlist?%s"), files, buf2);
+ }
+ else if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ snprintf(buf, sizeof (buf), _("Do you really want to delete the currently playing file?%s"), buf2);
+ }
+
+ GtkWidget *dlg = gtk_message_dialog_new (GTK_WINDOW (mainwin), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("Delete files from disk"));
+
+ gtk_dialog_add_button(GTK_DIALOG(dlg), _("Cancel"), GTK_RESPONSE_NO);
+ gtk_dialog_add_button(GTK_DIALOG(dlg), _("Delete"), GTK_RESPONSE_YES);
+
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), "%s", buf);
+ gtk_window_set_title (GTK_WINDOW (dlg), _("Warning"));
+
+#if GTK_CHECK_VERSION(3,0,0)
+ GtkWidget *btn = gtk_dialog_get_widget_for_response(GTK_DIALOG(dlg), GTK_RESPONSE_YES);
+ gtk_style_context_add_class (gtk_widget_get_style_context(btn), "destructive-action");
+#endif
+
+ int response = gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+ if (response != GTK_RESPONSE_YES) {
+ callback(ctl, 1);
+ return;
+ }
+ }
+
+ callback(ctl, 0);
+}
+
+int
+gtkui_delete_file (ddbDeleteFromDiskController_t ctl, const char *uri) {
+ if (deadbeef->conf_get_int ("gtkui.move_to_trash", 1)) {
+ GFile *file = g_file_new_for_path (uri);
+ g_file_trash (file, NULL, NULL);
+ g_object_unref (file);
+ } else {
+ (void)unlink (uri);
+ }
+
+ // check if file still exists
+ struct stat buf;
+ memset (&buf, 0, sizeof (buf));
+ int stat_res = stat (uri, &buf);
+
+ if (stat_res == 0) {
+ trace ("Failed to delete file: %s\n", uri);
+ return 0;
+ }
+ return 1;
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/gtkui_deletefromdisk.h Added

@@ -0,0 +1,35 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef gtkui_deletefromdisk_h
+#define gtkui_deletefromdisk_h
+
+#include "../../shared/deletefromdisk.h"
+
+void
+gtkui_warning_message_for_ctx (ddbDeleteFromDiskController_t ctl, ddb_action_context_t ctx, unsigned trackcount, ddbDeleteFromDiskControllerWarningCallback_t callback);
+
+int
+gtkui_delete_file (ddbDeleteFromDiskController_t ctl, const char *uri);
+
+#endif /* gtkui_deletefromdisk_h */

deadbeef-0.6.2.tar.bz2/plugins/gtkui/hotkeys.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/hotkeys.c Changed

@@ -1,6 +1,6 @@
 /*
 GTK hotkeys configuration for Deadbeef player
- Copyright (C) 2009-2013 Alexey Yakovenko and other contributors
+ Copyright (C) 2009-2013 Oleksiy Yakovenko and other contributors
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -58,10 +58,12 @@
 #include "../libparser/parser.h"
 #include "../hotkeys/hotkeys.h"
 #ifndef __APPLE__
+#ifndef __MINGW32__
 #include <X11/Xlib.h> // only for the KeySym type
 #endif
+#endif
 #include "hotkeys.h"
-#include "../../strdupa.h"
+#include <deadbeef/strdupa.h>
 
 int gtkui_hotkeys_changed = 0;
 
@@ -91,9 +93,8 @@
 
 static void
 prettify_forward_slash (const char *src, char *dst, int size) {
- char *start = dst;
 const char arrow = " → ";
- int larrow = strlen (arrow);
+ size_t larrow = strlen (arrow);
 while (*src && size > 1) {
 if (*src == '\\' && *(src+1) == '/') {
 src++;
@@ -205,7 +206,6 @@
 GtkListStore *hkstore = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (hotkeys)));
 deadbeef->conf_remove_items ("hotkey.key");
 
- GtkTreePath *path = gtk_tree_path_new_first ();
 GtkTreeIter iter;
 gboolean res = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (hkstore), &iter);
 int i = 1;
@@ -236,7 +236,7 @@
 char *t = strdupa (title);
 char *p = t;
 GtkTreeIter i;
- int got_iter = 0;
+ GtkTreeIter newroot;
 for (;;) {
 char *s = strchr (p, '/');
 // find unescaped forward slash
@@ -257,7 +257,8 @@
 if (!res) {
 gtk_tree_store_append (store, &i, root_iter);
 gtk_tree_store_set (store, &i, 0, p, 1, NULL, 2, -1, -1);
- root_iter = &i;
+ memcpy (&newroot, &i, sizeof (GtkTreeIter));
+ root_iter = &newroot;
 }
 else {
 int found = 0;
@@ -266,7 +267,8 @@
 gtk_tree_model_get_value (GTK_TREE_MODEL (store), &i, 0, &val);
 const char *n = g_value_get_string (&val);
 if (n && !strcmp (n, p)) {
- root_iter = &i;
+ memcpy (&newroot, &i, sizeof (GtkTreeIter));
+ root_iter = &newroot;
 found = 1;
 break;
 }
@@ -274,7 +276,8 @@
 if (!found) {
 gtk_tree_store_append (store, &i, root_iter);
 gtk_tree_store_set (store, &i, 0, p, 1, NULL, 2, -1, -1);
- root_iter = &i;
+ memcpy (&newroot, &i, sizeof (GtkTreeIter));
+ root_iter = &newroot;
 }
 }
 
@@ -318,6 +321,7 @@
 GtkTreeIter action_main_iter;
 gtk_tree_store_append (actions_store, &action_main_iter, NULL);
 gtk_tree_store_set (actions_store, &action_main_iter, 0, _("Main"), -1);
+
 GtkTreeIter action_selection_iter;
 gtk_tree_store_append (actions_store, &action_selection_iter, NULL);
 gtk_tree_store_set (actions_store, &action_selection_iter, 0, _("Selected track(s)"), -1);
@@ -344,13 +348,18 @@
 unescape_forward_slash (t, title, sizeof (title));
 gtk_tree_store_set (actions_store, &iter, 0, title, 1, actions->name, 2, DDB_ACTION_CTX_MAIN, -1);
 }
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 if (actions->flags & (DB_ACTION_SINGLE_TRACK | DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_CAN_MULTIPLE_TRACKS)) {
+#pragma GCC diagnostic pop
 t = action_tree_append (actions->title, actions_store, &action_selection_iter, &iter);
 unescape_forward_slash (t, title, sizeof (title));
 gtk_tree_store_set (actions_store, &iter, 0, title, 1, actions->name, 2, DDB_ACTION_CTX_SELECTION, -1);
- t = action_tree_append (actions->title, actions_store, &action_playlist_iter, &iter);
- unescape_forward_slash (t, title, sizeof (title));
- gtk_tree_store_set (actions_store, &iter, 0, title, 1, actions->name, 2, DDB_ACTION_CTX_PLAYLIST, -1);
+ if (!(actions->flags & DB_ACTION_EXCLUDE_FROM_CTX_PLAYLIST)) {
+ t = action_tree_append (actions->title, actions_store, &action_playlist_iter, &iter);
+ unescape_forward_slash (t, title, sizeof (title));
+ gtk_tree_store_set (actions_store, &iter, 0, title, 1, actions->name, 2, DDB_ACTION_CTX_PLAYLIST, -1);
+ }
 t = action_tree_append (actions->title, actions_store, &action_nowplaying_iter, &iter);
 unescape_forward_slash (t, title, sizeof (title));
 gtk_tree_store_set (actions_store, &iter, 0, title, 1, actions->name, 2, DDB_ACTION_CTX_NOWPLAYING, -1);
@@ -425,8 +434,6 @@
 prefwin_init_hotkeys (GtkWidget *_prefwin) {
 DB_plugin_t *hkplug = deadbeef->plug_get_for_id ("hotkeys");
 if (!hkplug) {
- // remove hotkeys tab
- gtk_notebook_remove_page (GTK_NOTEBOOK (lookup_widget (_prefwin, "notebook")), 6);
 return;
 }
 
@@ -466,7 +473,7 @@
 
 gtk_tree_view_set_model (GTK_TREE_VIEW (hotkeys), GTK_TREE_MODEL (hkstore));
 
- int n_hotkeys = hotkeys_load ();
+ (void)hotkeys_load ();
 }
 
 void
@@ -665,7 +672,7 @@
 }
 
 
-static int grabbed = 0;
+int gtkui_hotkey_grabbing = 0;
 
 static void
 get_keycombo_string (guint accel_key, GdkModifierType accel_mods, char *new_value) {
@@ -727,22 +734,21 @@
 strcat (new_value, name);
 }
 
+static GtkWidget *hotkey_grabber_button;
 gboolean
 on_hotkeys_set_key_key_press_event (GtkWidget *widget,
 GdkEventKey *event,
 gpointer user_data)
 {
+ widget = hotkey_grabber_button;
 GdkModifierType accel_mods = 0;
 guint accel_key;
- gchar *path;
- gboolean edited;
- gboolean cleared;
 GdkModifierType consumed_modifiers;
 GdkDisplay *display;
 GtkTreePath *curpath;
 GtkTreeIter iter;
 
- if (!grabbed) {
+ if (!gtkui_hotkey_grabbing) {
 return FALSE;
 }
 
@@ -751,29 +757,20 @@
 if (event->is_modifier)
 return TRUE;
 
- edited = FALSE;
- cleared = FALSE;
+ accel_mods = event->state & gtk_accelerator_get_default_mod_mask ();
 
 gdk_keymap_translate_keyboard_state (gdk_keymap_get_for_display (display),
- event->hardware_keycode, event->state,
+ event->hardware_keycode, accel_mods & (~GDK_SHIFT_MASK),
 0, &accel_key, NULL, NULL, &consumed_modifiers);
 
 if (accel_key == GDK_ISO_Left_Tab) 
 accel_key = GDK_Tab;
 
- accel_mods = event->state & gtk_accelerator_get_default_mod_mask ();
 
- /* Filter consumed modifiers 
+ /* Filter consumed modifiers
 */
 accel_mods &= ~(consumed_modifiers&~GDK_SHIFT_MASK);
 
- /* Put shift back if it changed the case of the key, not otherwise.
- */
- int lower = gdk_keyval_to_lower (accel_key);
- if (lower != accel_key) {
- accel_key = lower;
- }
-
 char name1000;
 gtk_button_set_label (GTK_BUTTON (widget), _(""));
 
@@ -825,7 +822,7 @@
 }
 gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME);
 gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
- grabbed = 0;
+ gtkui_hotkey_grabbing = 0;
 gtkui_hotkeys_changed = 1;
 return TRUE;
 }
@@ -833,10 +830,10 @@
 static void
 hotkey_grab_focus (GtkWidget *widget) {
 GdkDisplay *display = gtk_widget_get_display (widget);
- if (grabbed) {
+ if (gtkui_hotkey_grabbing) {
 return;
 }
- grabbed = 0;
+ gtkui_hotkey_grabbing = 0;
 if (GDK_GRAB_SUCCESS != gdk_keyboard_grab (gtk_widget_get_window (widget), FALSE, GDK_CURRENT_TIME)) {
 return;
 }
@@ -850,7 +847,10 @@
 return;
 }
 gtk_button_set_label (GTK_BUTTON (widget), _("New key combination..."));
- grabbed = 1;
+ gtkui_hotkey_grabbing = 1;
+
+ // disable the window accelerators temporarily
+ hotkey_grabber_button = widget;
 }
 
 void
@@ -909,8 +909,7 @@
 deadbeef->conf_set_str ("hotkey.key09", "\"F1\" 0 0 help");
 deadbeef->conf_set_str ("hotkey.key10", "\"Delete\" 1 0 remove_from_playlist");
 deadbeef->conf_set_str ("hotkey.key11", "\"Ctrl w\" 0 0 remove_current_playlist");
- deadbeef->conf_set_str ("hotkey.key11", "\"Ctrl w\" 0 0 remove_current_playlist");
- deadbeef->conf_set_str ("hotkey.key11", "\"Ctrl w\" 0 0 remove_current_playlist");
+ deadbeef->conf_set_str ("hotkey.key13", "\"Alt Return\" 1 0 track_properties");
 deadbeef->conf_set_str ("hotkey.key14", "\"Return\" 0 0 play");
 deadbeef->conf_set_str ("hotkey.key15", "\"Ctrl p\" 0 0 toggle_pause");
 deadbeef->conf_set_str ("hotkey.key16", "\"Alt 1\" 0 0 playlist1");

deadbeef-0.6.2.tar.bz2/plugins/gtkui/hotkeys.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/hotkeys.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/interface.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/interface.c Changed

@@ -35,12 +35,12 @@
 GtkWidget *File;
 GtkWidget *File_menu;
 GtkWidget *open;
- GtkWidget *image663;
+ GtkWidget *image679;
 GtkWidget *separator2;
 GtkWidget *add_files;
- GtkWidget *image664;
+ GtkWidget *image680;
 GtkWidget *add_folders;
- GtkWidget *image665;
+ GtkWidget *image681;
 GtkWidget *add_location1;
 GtkWidget *separatormenuitem1;
 GtkWidget *new_playlist1;
@@ -48,18 +48,18 @@
 GtkWidget *playlist_save_as;
 GtkWidget *separator8;
 GtkWidget *quit;
- GtkWidget *image666;
+ GtkWidget *image682;
 GtkWidget *Edit;
 GtkWidget *Edit_menu;
 GtkWidget *clear1;
- GtkWidget *image667;
+ GtkWidget *image683;
 GtkWidget *select_all1;
 GtkWidget *deselect_all1;
 GtkWidget *invert_selection1;
 GtkWidget *Selection;
 GtkWidget *Selection_menu;
 GtkWidget *remove1;
- GtkWidget *image668;
+ GtkWidget *image684;
 GtkWidget *crop1;
 GtkWidget *find1;
 GtkWidget *sort_by1;
@@ -78,6 +78,7 @@
 GtkWidget *view_status_bar;
 GtkWidget *view_eq;
 GtkWidget *design_mode1;
+ GtkWidget *view_log;
 GtkWidget *Playback;
 GtkWidget *Playback_menu;
 GtkWidget *Order;
@@ -102,16 +103,16 @@
 GtkWidget *Help;
 GtkWidget *Help_menu;
 GtkWidget *help1;
- GtkWidget *image669;
+ GtkWidget *image685;
 GtkWidget *changelog1;
 GtkWidget *separator10;
 GtkWidget *gpl1;
 GtkWidget *lgpl1;
 GtkWidget *separator9;
 GtkWidget *about1;
- GtkWidget *image670;
+ GtkWidget *image686;
 GtkWidget *translators1;
- GtkWidget *image671;
+ GtkWidget *image687;
 GtkWidget *plugins_bottom_vbox;
 GtkWidget *statusbar;
 
@@ -139,9 +140,9 @@
 gtk_widget_show (open);
 gtk_container_add (GTK_CONTAINER (File_menu), open);
 
- image663 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image663);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image663);
+ image679 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image679);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image679);
 
 separator2 = gtk_separator_menu_item_new ();
 gtk_widget_show (separator2);
@@ -152,17 +153,17 @@
 gtk_widget_show (add_files);
 gtk_container_add (GTK_CONTAINER (File_menu), add_files);
 
- image664 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image664);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image664);
+ image680 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image680);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image680);
 
 add_folders = gtk_image_menu_item_new_with_mnemonic (_("Add folder(s)"));
 gtk_widget_show (add_folders);
 gtk_container_add (GTK_CONTAINER (File_menu), add_folders);
 
- image665 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image665);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image665);
+ image681 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image681);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image681);
 
 add_location1 = gtk_menu_item_new_with_mnemonic (_("Add location"));
 gtk_widget_show (add_location1);
@@ -194,9 +195,9 @@
 gtk_widget_show (quit);
 gtk_container_add (GTK_CONTAINER (File_menu), quit);
 
- image666 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image666);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image666);
+ image682 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image682);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image682);
 
 Edit = gtk_menu_item_new_with_mnemonic (_("_Edit"));
 gtk_widget_show (Edit);
@@ -209,9 +210,9 @@
 gtk_widget_show (clear1);
 gtk_container_add (GTK_CONTAINER (Edit_menu), clear1);
 
- image667 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image667);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image667);
+ image683 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image683);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image683);
 
 select_all1 = gtk_menu_item_new_with_mnemonic (_("Select all"));
 gtk_widget_show (select_all1);
@@ -236,9 +237,9 @@
 gtk_widget_show (remove1);
 gtk_container_add (GTK_CONTAINER (Selection_menu), remove1);
 
- image668 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image668);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image668);
+ image684 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image684);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image684);
 
 crop1 = gtk_menu_item_new_with_mnemonic (_("Crop"));
 gtk_widget_show (crop1);
@@ -311,6 +312,10 @@
 gtk_widget_show (design_mode1);
 gtk_container_add (GTK_CONTAINER (View_menu), design_mode1);
 
+ view_log = gtk_check_menu_item_new_with_mnemonic (_("Log"));
+ gtk_widget_show (view_log);
+ gtk_container_add (GTK_CONTAINER (View_menu), view_log);
+
 Playback = gtk_menu_item_new_with_mnemonic (_("_Playback"));
 gtk_widget_show (Playback);
 gtk_container_add (GTK_CONTAINER (menubar), Playback);
@@ -318,57 +323,57 @@
 Playback_menu = gtk_menu_new ();
 gtk_menu_item_set_submenu (GTK_MENU_ITEM (Playback), Playback_menu);
 
- Order = gtk_menu_item_new_with_mnemonic (_("Order"));
+ Order = gtk_menu_item_new_with_mnemonic (_("Shuffle"));
 gtk_widget_show (Order);
 gtk_container_add (GTK_CONTAINER (Playback_menu), Order);
 
 Order_menu = gtk_menu_new ();
 gtk_menu_item_set_submenu (GTK_MENU_ITEM (Order), Order_menu);
 
- order_linear = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Linear"));
+ order_linear = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Off"));
 order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_linear));
 gtk_widget_show (order_linear);
 gtk_container_add (GTK_CONTAINER (Order_menu), order_linear);
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_linear), TRUE);
 
- order_shuffle = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Shuffle tracks"));
+ order_shuffle = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Tracks"));
 order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_shuffle));
 gtk_widget_show (order_shuffle);
 gtk_container_add (GTK_CONTAINER (Order_menu), order_shuffle);
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_shuffle), TRUE);
 
- order_shuffle_albums = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Shuffle albums"));
+ order_shuffle_albums = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Albums"));
 order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_shuffle_albums));
 gtk_widget_show (order_shuffle_albums);
 gtk_container_add (GTK_CONTAINER (Order_menu), order_shuffle_albums);
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_shuffle_albums), TRUE);
 
- order_random = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Random"));
+ order_random = gtk_radio_menu_item_new_with_mnemonic (order_linear_group, _("Random Tracks"));
 order_linear_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (order_random));
 gtk_widget_show (order_random);
 gtk_container_add (GTK_CONTAINER (Order_menu), order_random);
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (order_random), TRUE);
 
- Looping = gtk_menu_item_new_with_mnemonic (_("Looping"));
+ Looping = gtk_menu_item_new_with_mnemonic (_("Repeat"));
 gtk_widget_show (Looping);
 gtk_container_add (GTK_CONTAINER (Playback_menu), Looping);
 
 Looping_menu = gtk_menu_new ();
 gtk_menu_item_set_submenu (GTK_MENU_ITEM (Looping), Looping_menu);
 
- loop_all = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Loop all"));
+ loop_all = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("All Tracks"));
 loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_all));
 gtk_widget_show (loop_all);
 gtk_container_add (GTK_CONTAINER (Looping_menu), loop_all);
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (loop_all), TRUE);
 
- loop_single = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Loop single song"));
+ loop_single = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("One Track"));
 loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_single));
 gtk_widget_show (loop_single);
 gtk_container_add (GTK_CONTAINER (Looping_menu), loop_single);
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (loop_single), TRUE);
 
- loop_disable = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Don't loop"));
+ loop_disable = gtk_radio_menu_item_new_with_mnemonic (loop_all_group, _("Off"));
 loop_all_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (loop_disable));
 gtk_widget_show (loop_disable);
 gtk_container_add (GTK_CONTAINER (Looping_menu), loop_disable);
@@ -411,9 +416,9 @@
 gtk_widget_show (help1);
 gtk_container_add (GTK_CONTAINER (Help_menu), help1);
 
- image669 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image669);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image669);
+ image685 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image685);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image685);
 
 changelog1 = gtk_menu_item_new_with_mnemonic (_("_ChangeLog"));
 gtk_widget_show (changelog1);
@@ -441,17 +446,17 @@
 gtk_widget_show (about1);
 gtk_container_add (GTK_CONTAINER (Help_menu), about1);
 
- image670 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image670);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image670);
+ image686 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image686);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image686);
 
 translators1 = gtk_image_menu_item_new_with_mnemonic (_("_Translators"));
 gtk_widget_show (translators1);
 gtk_container_add (GTK_CONTAINER (Help_menu), translators1);
 
- image671 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image671);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image671);
+ image687 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image687);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image687);
 
 plugins_bottom_vbox = gtk_vbox_new (FALSE, 0);
 gtk_widget_show (plugins_bottom_vbox);
@@ -557,6 +562,9 @@
 g_signal_connect ((gpointer) design_mode1, "activate",
 G_CALLBACK (on_design_mode1_activate),
 NULL);
+ g_signal_connect ((gpointer) view_log, "activate",
+ G_CALLBACK (on_view_log_activate),
+ NULL);
 g_signal_connect ((gpointer) order_linear, "activate",
 G_CALLBACK (on_order_linear_activate),
 NULL);
@@ -619,12 +627,12 @@
 GLADE_HOOKUP_OBJECT (mainwin, File, "File");
 GLADE_HOOKUP_OBJECT (mainwin, File_menu, "File_menu");
 GLADE_HOOKUP_OBJECT (mainwin, open, "open");
- GLADE_HOOKUP_OBJECT (mainwin, image663, "image663");
+ GLADE_HOOKUP_OBJECT (mainwin, image679, "image679");
 GLADE_HOOKUP_OBJECT (mainwin, separator2, "separator2");
 GLADE_HOOKUP_OBJECT (mainwin, add_files, "add_files");
- GLADE_HOOKUP_OBJECT (mainwin, image664, "image664");
+ GLADE_HOOKUP_OBJECT (mainwin, image680, "image680");
 GLADE_HOOKUP_OBJECT (mainwin, add_folders, "add_folders");
- GLADE_HOOKUP_OBJECT (mainwin, image665, "image665");
+ GLADE_HOOKUP_OBJECT (mainwin, image681, "image681");
 GLADE_HOOKUP_OBJECT (mainwin, add_location1, "add_location1");
 GLADE_HOOKUP_OBJECT (mainwin, separatormenuitem1, "separatormenuitem1");
 GLADE_HOOKUP_OBJECT (mainwin, new_playlist1, "new_playlist1");
@@ -632,18 +640,18 @@
 GLADE_HOOKUP_OBJECT (mainwin, playlist_save_as, "playlist_save_as");
 GLADE_HOOKUP_OBJECT (mainwin, separator8, "separator8");
 GLADE_HOOKUP_OBJECT (mainwin, quit, "quit");
- GLADE_HOOKUP_OBJECT (mainwin, image666, "image666");
+ GLADE_HOOKUP_OBJECT (mainwin, image682, "image682");
 GLADE_HOOKUP_OBJECT (mainwin, Edit, "Edit");
 GLADE_HOOKUP_OBJECT (mainwin, Edit_menu, "Edit_menu");
 GLADE_HOOKUP_OBJECT (mainwin, clear1, "clear1");
- GLADE_HOOKUP_OBJECT (mainwin, image667, "image667");
+ GLADE_HOOKUP_OBJECT (mainwin, image683, "image683");
 GLADE_HOOKUP_OBJECT (mainwin, select_all1, "select_all1");
 GLADE_HOOKUP_OBJECT (mainwin, deselect_all1, "deselect_all1");
 GLADE_HOOKUP_OBJECT (mainwin, invert_selection1, "invert_selection1");
 GLADE_HOOKUP_OBJECT (mainwin, Selection, "Selection");
 GLADE_HOOKUP_OBJECT (mainwin, Selection_menu, "Selection_menu");
 GLADE_HOOKUP_OBJECT (mainwin, remove1, "remove1");
- GLADE_HOOKUP_OBJECT (mainwin, image668, "image668");
+ GLADE_HOOKUP_OBJECT (mainwin, image684, "image684");
 GLADE_HOOKUP_OBJECT (mainwin, crop1, "crop1");
 GLADE_HOOKUP_OBJECT (mainwin, find1, "find1");
 GLADE_HOOKUP_OBJECT (mainwin, sort_by1, "sort_by1");
@@ -662,6 +670,7 @@
 GLADE_HOOKUP_OBJECT (mainwin, view_status_bar, "view_status_bar");
 GLADE_HOOKUP_OBJECT (mainwin, view_eq, "view_eq");
 GLADE_HOOKUP_OBJECT (mainwin, design_mode1, "design_mode1");
+ GLADE_HOOKUP_OBJECT (mainwin, view_log, "view_log");
 GLADE_HOOKUP_OBJECT (mainwin, Playback, "Playback");
 GLADE_HOOKUP_OBJECT (mainwin, Playback_menu, "Playback_menu");
 GLADE_HOOKUP_OBJECT (mainwin, Order, "Order");
@@ -684,16 +693,16 @@
 GLADE_HOOKUP_OBJECT (mainwin, Help, "Help");
 GLADE_HOOKUP_OBJECT (mainwin, Help_menu, "Help_menu");
 GLADE_HOOKUP_OBJECT (mainwin, help1, "help1");
- GLADE_HOOKUP_OBJECT (mainwin, image669, "image669");
+ GLADE_HOOKUP_OBJECT (mainwin, image685, "image685");
 GLADE_HOOKUP_OBJECT (mainwin, changelog1, "changelog1");
 GLADE_HOOKUP_OBJECT (mainwin, separator10, "separator10");
 GLADE_HOOKUP_OBJECT (mainwin, gpl1, "gpl1");
 GLADE_HOOKUP_OBJECT (mainwin, lgpl1, "lgpl1");
 GLADE_HOOKUP_OBJECT (mainwin, separator9, "separator9");
 GLADE_HOOKUP_OBJECT (mainwin, about1, "about1");
- GLADE_HOOKUP_OBJECT (mainwin, image670, "image670");
+ GLADE_HOOKUP_OBJECT (mainwin, image686, "image686");
 GLADE_HOOKUP_OBJECT (mainwin, translators1, "translators1");
- GLADE_HOOKUP_OBJECT (mainwin, image671, "image671");
+ GLADE_HOOKUP_OBJECT (mainwin, image687, "image687");
 GLADE_HOOKUP_OBJECT (mainwin, plugins_bottom_vbox, "plugins_bottom_vbox");
 GLADE_HOOKUP_OBJECT (mainwin, statusbar, "statusbar");
 
@@ -999,7 +1008,7 @@
 create_trackproperties (void)
 {
 GtkWidget *trackproperties;
- GtkWidget *notebook3;
+ GtkWidget *trkproperties_notebook;
 GtkWidget *vbox16;
 GtkWidget *hbox109;
 GtkWidget *label136;
@@ -1042,13 +1051,13 @@
 gtk_window_set_skip_taskbar_hint (GTK_WINDOW (trackproperties), TRUE);
 gtk_window_set_skip_pager_hint (GTK_WINDOW (trackproperties), TRUE);
 
- notebook3 = gtk_notebook_new ();
- gtk_widget_show (notebook3);
- gtk_container_add (GTK_CONTAINER (trackproperties), notebook3);
+ trkproperties_notebook = gtk_notebook_new ();
+ gtk_widget_show (trkproperties_notebook);
+ gtk_container_add (GTK_CONTAINER (trackproperties), trkproperties_notebook);
 
 vbox16 = gtk_vbox_new (FALSE, 8);
 gtk_widget_show (vbox16);
- gtk_container_add (GTK_CONTAINER (notebook3), vbox16);
+ gtk_container_add (GTK_CONTAINER (trkproperties_notebook), vbox16);
 gtk_container_set_border_width (GTK_CONTAINER (vbox16), 12);
 
 hbox109 = gtk_hbox_new (FALSE, 8);
@@ -1149,11 +1158,11 @@
 
 label64 = gtk_label_new (_("Metadata"));
 gtk_widget_show (label64);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook3), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook3), 0), label64);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (trkproperties_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (trkproperties_notebook), 0), label64);
 
 vbox24 = gtk_vbox_new (FALSE, 8);
 gtk_widget_show (vbox24);
- gtk_container_add (GTK_CONTAINER (notebook3), vbox24);
+ gtk_container_add (GTK_CONTAINER (trkproperties_notebook), vbox24);
 gtk_container_set_border_width (GTK_CONTAINER (vbox24), 12);
 
 scrolledwindow6 = gtk_scrolled_window_new (NULL, NULL);
@@ -1195,7 +1204,7 @@
 
 label80 = gtk_label_new (_("Properties"));
 gtk_widget_show (label80);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook3), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook3), 1), label80);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (trkproperties_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (trkproperties_notebook), 1), label80);
 
 g_signal_connect ((gpointer) trackproperties, "key_press_event",
 G_CALLBACK (on_trackproperties_key_press_event),
@@ -1227,7 +1236,7 @@
 
 /* Store pointers to all widgets, for use by lookup_widget(). */
 GLADE_HOOKUP_OBJECT_NO_REF (trackproperties, trackproperties, "trackproperties");
- GLADE_HOOKUP_OBJECT (trackproperties, notebook3, "notebook3");
+ GLADE_HOOKUP_OBJECT (trackproperties, trkproperties_notebook, "trkproperties_notebook");
 GLADE_HOOKUP_OBJECT (trackproperties, vbox16, "vbox16");
 GLADE_HOOKUP_OBJECT (trackproperties, hbox109, "hbox109");
 GLADE_HOOKUP_OBJECT (trackproperties, label136, "label136");
@@ -1283,9 +1292,16 @@
 GtkWidget *hbox74;
 GtkWidget *format;
 GtkWidget *title_formatting_help_link;
+ GtkWidget *hbox141;
+ GtkWidget *label164;
+ GtkWidget *sort_format;
+ GtkWidget *label165;
 GtkWidget *hbox32;
 GtkWidget *label38;
 GtkWidget *align;
+ GtkWidget *hbox138;
+ GtkWidget *color_override;
+ GtkWidget *color;
 GtkWidget *dialog_action_area1;
 GtkWidget *cancelbutton1;
 GtkWidget *alignment9;
@@ -1340,17 +1356,6 @@
 id = gtk_combo_box_text_new ();
 gtk_widget_show (id);
 gtk_box_pack_start (GTK_BOX (hbox30), id, TRUE, TRUE, 0);
- 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);
@@ -1373,10 +1378,27 @@
 
 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_box_pack_start (GTK_BOX (hbox74), title_formatting_help_link, FALSE, TRUE, 0);
 gtk_widget_set_can_focus(title_formatting_help_link, FALSE);
 gtk_widget_set_can_default(title_formatting_help_link, FALSE);
 
+ hbox141 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox141);
+ gtk_box_pack_start (GTK_BOX (vbox14), hbox141, TRUE, TRUE, 0);
+
+ label164 = gtk_label_new (_("Sort format:"));
+ gtk_widget_show (label164);
+ gtk_box_pack_start (GTK_BOX (hbox141), label164, FALSE, FALSE, 0);
+
+ sort_format = gtk_entry_new ();
+ gtk_widget_show (sort_format);
+ gtk_box_pack_start (GTK_BOX (hbox141), sort_format, TRUE, TRUE, 0);
+ gtk_entry_set_invisible_char (GTK_ENTRY (sort_format), 8226);
+
+ label165 = gtk_label_new (_("(if non-empty)"));
+ gtk_widget_show (label165);
+ gtk_box_pack_start (GTK_BOX (hbox141), label165, FALSE, FALSE, 0);
+
 hbox32 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox32);
 gtk_box_pack_start (GTK_BOX (vbox14), hbox32, FALSE, FALSE, 0);
@@ -1391,6 +1413,19 @@
 gtk_box_pack_start (GTK_BOX (hbox32), align, TRUE, TRUE, 0);
 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (align), _("Left"));
 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (align), _("Right"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (align), _("Center"));
+
+ hbox138 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox138);
+ gtk_box_pack_start (GTK_BOX (vbox14), hbox138, TRUE, TRUE, 0);
+
+ color_override = gtk_check_button_new_with_mnemonic (_("Text color:"));
+ gtk_widget_show (color_override);
+ gtk_box_pack_start (GTK_BOX (hbox138), color_override, FALSE, FALSE, 0);
+
+ color = gtk_color_button_new ();
+ gtk_widget_show (color);
+ gtk_box_pack_start (GTK_BOX (hbox138), color, TRUE, TRUE, 0);
 
 dialog_action_area1 = gtk_dialog_get_action_area (GTK_DIALOG (editcolumndlg));
 gtk_widget_show (dialog_action_area1);
@@ -1460,9 +1495,16 @@
 GLADE_HOOKUP_OBJECT (editcolumndlg, hbox74, "hbox74");
 GLADE_HOOKUP_OBJECT (editcolumndlg, format, "format");
 GLADE_HOOKUP_OBJECT (editcolumndlg, title_formatting_help_link, "title_formatting_help_link");
+ GLADE_HOOKUP_OBJECT (editcolumndlg, hbox141, "hbox141");
+ GLADE_HOOKUP_OBJECT (editcolumndlg, label164, "label164");
+ GLADE_HOOKUP_OBJECT (editcolumndlg, sort_format, "sort_format");
+ GLADE_HOOKUP_OBJECT (editcolumndlg, label165, "label165");
 GLADE_HOOKUP_OBJECT (editcolumndlg, hbox32, "hbox32");
 GLADE_HOOKUP_OBJECT (editcolumndlg, label38, "label38");
 GLADE_HOOKUP_OBJECT (editcolumndlg, align, "align");
+ GLADE_HOOKUP_OBJECT (editcolumndlg, hbox138, "hbox138");
+ GLADE_HOOKUP_OBJECT (editcolumndlg, color_override, "color_override");
+ GLADE_HOOKUP_OBJECT (editcolumndlg, color, "color");
 GLADE_HOOKUP_OBJECT_NO_REF (editcolumndlg, dialog_action_area1, "dialog_action_area1");
 GLADE_HOOKUP_OBJECT (editcolumndlg, cancelbutton1, "cancelbutton1");
 GLADE_HOOKUP_OBJECT (editcolumndlg, alignment9, "alignment9");
@@ -1493,12 +1535,37 @@
 GtkWidget *pref_soundcard;
 GtkWidget *convert8to16;
 GtkWidget *convert16to24;
+ GtkWidget *hbox151;
+ GtkWidget *label_bit_override;
+ GtkWidget *combo_bit_override;
+ GtkWidget *frame15;
+ GtkWidget *alignment31;
+ GtkWidget *vbox52;
+ GtkWidget *hbox145;
+ GtkWidget *label_direct_sr;
+ GtkWidget *comboboxentry_direct_sr;
+ GtkWidget *frame16;
+ GtkWidget *alignment32;
+ GtkWidget *vbox53;
+ GtkWidget *hbox147;
+ GtkWidget *label_sr_mult_48;
+ GtkWidget *comboboxentry_sr_mult_48;
+ GtkWidget *hbox148;
+ GtkWidget *label_sr_mult_44;
+ GtkWidget *comboboxentry_sr_mult_44;
+ GtkWidget *checkbutton_dependent_sr;
+ GtkWidget *checkbutton_sr_override;
 GtkWidget *Sound;
 GtkWidget *vbox8;
+ GtkWidget *frame14;
+ GtkWidget *alignment30;
+ GtkWidget *vbox48;
 GtkWidget *hbox10;
 GtkWidget *label8;
- GtkWidget *pref_replaygain_mode;
- GtkWidget *pref_replaygain_scale;
+ GtkWidget *pref_replaygain_source_mode;
+ GtkWidget *hbox139;
+ GtkWidget *label163;
+ GtkWidget *pref_replaygain_processing;
 GtkWidget *table1;
 GtkWidget *hbox100;
 GtkWidget *label125;
@@ -1510,6 +1577,7 @@
 GtkWidget *label125a;
 GtkWidget *global_preamp;
 GtkWidget *label126a;
+ GtkWidget *label162;
 GtkWidget *hbox66;
 GtkWidget *cli_add_to_playlist;
 GtkWidget *cli_playlist_name;
@@ -1519,16 +1587,20 @@
 GtkWidget *reset_autostopalbum;
 GtkWidget *label39;
 GtkWidget *vbox29;
- GtkWidget *hbox80;
- GtkWidget *dsp_add;
- GtkWidget *dsp_remove;
- GtkWidget *dsp_configure;
+ GtkWidget *vbox58;
 GtkWidget *hbox81;
 GtkWidget *scrolledwindow7;
 GtkWidget *dsp_listview;
- GtkWidget *vbox30;
- GtkWidget *dsp_up;
- GtkWidget *dsp_down;
+ GtkWidget *dsp_toolbar;
+ GtkIconSize tmp_toolbar_icon_size;
+ GtkWidget *tmp_image;
+ GtkWidget *dsp_add_toolbtn;
+ GtkWidget *dsp_remove_toolbtn;
+ GtkWidget *dsp_up_toolbtn;
+ GtkWidget *dsp_down_toolbtn;
+ GtkWidget *dsp_configure_toolbtn;
+ GtkWidget *separatortoolitem1;
+ GtkWidget *toolitem2;
 GtkWidget *hbox86;
 GtkWidget *label114;
 GtkWidget *dsp_preset;
@@ -1537,8 +1609,10 @@
 GtkWidget *label110;
 GtkWidget *notebook5;
 GtkWidget *vbox9;
+ GtkWidget *minimize_on_startup;
 GtkWidget *pref_close_send_to_tray;
 GtkWidget *hide_tray_icon;
+ GtkWidget *move_to_trash;
 GtkWidget *enable_shift_jis_recoding;
 GtkWidget *enable_cp1251_recoding;
 GtkWidget *enable_cp936_recoding;
@@ -1554,13 +1628,19 @@
 GtkWidget *hbox101;
 GtkWidget *label128;
 GtkWidget *gui_plugin;
+ GtkWidget *display_seltime;
 GtkWidget *label147;
 GtkWidget *vbox44;
 GtkWidget *mmb_delete_playlist;
- GtkWidget *embolden_current;
 GtkWidget *hide_delete_from_disk;
+ GtkWidget *skip_deleted_songs;
 GtkWidget *auto_name_playlist_from_folder;
 GtkWidget *auto_size_columns;
+ GtkWidget *hbox141;
+ GtkWidget *label164;
+ GObject *listview_group_spacing_adj;
+ GtkWidget *listview_group_spacing;
+ GtkWidget *label165;
 GtkWidget *label148;
 GtkWidget *label2;
 GtkWidget *notebook4;
@@ -1575,34 +1655,88 @@
 GtkWidget *vbox22;
 GtkWidget *override_tabstrip_colors;
 GtkWidget *tabstrip_colors_group;
- GtkWidget *label45;
- GtkWidget *label46;
- GtkWidget *label44;
- GtkWidget *tabstrip_mid;
- GtkWidget *tabstrip_light;
- GtkWidget *tabstrip_dark;
 GtkWidget *tabstrip_base;
 GtkWidget *label76;
+ GtkWidget *tabstrip_dark;
+ GtkWidget *label44;
+ GtkWidget *tabstrip_light;
+ GtkWidget *label46;
+ GtkWidget *tabstrip_mid;
+ GtkWidget *label45;
 GtkWidget *label127;
 GtkWidget *tabstrip_text;
+ GtkWidget *tabstrip_selected_text;
+ GtkWidget *hbox136;
+ GtkWidget *tabstrip_playing_bold;
+ GtkWidget *tabstrip_playing_italic;
+ GtkWidget *hbox137;
+ GtkWidget *tabstrip_selected_bold;
+ GtkWidget *tabstrip_selected_italic;
+ GtkWidget *tabstrip_text_font;
+ GtkWidget *label152;
+ GtkWidget *label153;
+ GtkWidget *tabstrip_playing_text;
 GtkWidget *label74;
 GtkWidget *vbox23;
- GtkWidget *override_listview_colors;
+ GtkWidget *frame11;
 GtkWidget *listview_colors_group;
+ GtkWidget *frame12;
+ GtkWidget *alignment28;
+ GtkWidget *table3;
+ GtkWidget *label77;
+ GtkWidget *listview_text;
+ GtkWidget *label150;
+ GtkWidget *listview_playing_text;
+ GtkWidget *label61;
+ GtkWidget *listview_selected_text;
+ GtkWidget *label154;
+ GtkWidget *listview_column_text;
+ GtkWidget *listview_column_text_font;
+ GtkWidget *label149;
+ GtkWidget *listview_group_text;
+ GtkWidget *listview_group_text_font;
+ GtkWidget *listview_text_font;
+ GtkWidget *label158;
+ GtkWidget *vseparator1;
+ GtkWidget *frame13;
+ GtkWidget *alignment29;
+ GtkWidget *table4;
 GtkWidget *label58;
 GtkWidget *label59;
- GtkWidget *listview_even_row;
 GtkWidget *listview_odd_row;
- GtkWidget *label77;
 GtkWidget *label78;
 GtkWidget *listview_selected_row;
- GtkWidget *listview_text;
- GtkWidget *label61;
- GtkWidget *listview_selected_text;
 GtkWidget *label62;
 GtkWidget *listview_cursor;
+ GtkWidget *listview_even_row;
+ GtkWidget *label159;
+ GtkWidget *override_listview_colors;
+ GtkWidget *table2;
+ GtkWidget *label155;
+ GtkWidget *label156;
+ GtkWidget *listview_playing_text_bold;
+ GtkWidget *listview_selected_text_bold;
+ GtkWidget *listview_playing_text_italic;
+ GtkWidget *listview_selected_text_italic;
 GtkWidget *label75;
+ GtkWidget *table5;
+ GtkWidget *use_visualization_base_color;
+ GtkWidget *visualization_custom_color_button;
+ GtkWidget *use_visualization_background_color;
+ GtkWidget *visualization_custom_background_color_button;
+ GtkWidget *label175;
 GtkWidget *label100;
+ GtkWidget *vbox55;
+ GtkWidget *toggle_medialib_on;
+ GtkWidget *hseparator7;
+ GtkWidget *label174;
+ GtkWidget *vbox56;
+ GtkWidget *scrolledwindow17;
+ GtkWidget *treeview_medialib_folders;
+ GtkWidget *hbox150;
+ GtkWidget *button_medialib_add_folder;
+ GtkWidget *button_medialib_remove_folder;
+ GtkWidget *label173;
 GtkWidget *vbox11;
 GtkWidget *pref_network_enableproxy;
 GtkWidget *hbox13;
@@ -1657,6 +1791,23 @@
 GtkWidget *hpaned1;
 GtkWidget *scrolledwindow2;
 GtkWidget *pref_pluginlist;
+ GtkWidget *alignment33;
+ GtkWidget *vbox54;
+ GtkWidget *hbox149;
+ GtkWidget *fillerlabel1;
+ GtkWidget *plugin_tabbtn_hbtnbox;
+ GtkWidget *plugin_conf_tab_btn;
+ GSList *plugin_conf_tab_btn_group = NULL;
+ GtkWidget *plugin_info_tab_btn;
+ GtkWidget *plugin_license_tab_btn;
+ GtkWidget *fillerlabel2;
+ GtkWidget *plugin_notebook;
+ GtkWidget *plugin_conf_tab_vbox;
+ GtkWidget *plug_conf_dlg_scrolledwindow;
+ GtkWidget *plug_conf_dlg_viewport;
+ GtkWidget *plugin_actions_btnbox;
+ GtkWidget *plugin_conf_reset_btn;
+ GtkWidget *label170;
 GtkWidget *vbox12;
 GtkWidget *hbox103;
 GtkWidget *label130;
@@ -1664,23 +1815,17 @@
 GtkWidget *scrolledwindow8;
 GtkWidget *plug_description;
 GtkWidget *hbox20;
- GtkWidget *configure_plugin;
- GtkWidget *alignment15;
- GtkWidget *hbox56;
- GtkWidget *image394;
- GtkWidget *label92;
- GtkWidget *plug_copyright;
- GtkWidget *alignment20;
- GtkWidget *hbox88;
- GtkWidget *image521;
- GtkWidget *label117;
 GtkWidget *weblink;
+ GtkWidget *label171;
+ GtkWidget *scrolledwindow16;
+ GtkWidget *plug_license;
+ GtkWidget *label172;
 GtkWidget *label3;
 GtkWidget *dialog_action_area2;
 GtkWidget *closebutton1;
 
 prefwin = gtk_dialog_new ();
- gtk_container_set_border_width (GTK_CONTAINER (prefwin), 12);
+ gtk_container_set_border_width (GTK_CONTAINER (prefwin), 6);
 gtk_window_set_title (GTK_WINDOW (prefwin), _("Preferences"));
 gtk_window_set_position (GTK_WINDOW (prefwin), GTK_WIN_POS_CENTER);
 gtk_window_set_type_hint (GTK_WINDOW (prefwin), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -1691,6 +1836,7 @@
 notebook = gtk_notebook_new ();
 gtk_widget_show (notebook);
 gtk_box_pack_start (GTK_BOX (dialog_vbox2), notebook, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
 gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE);
 
 vbox10 = gtk_vbox_new (FALSE, 8);
@@ -1710,6 +1856,7 @@
 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);
+ gtk_container_set_border_width (GTK_CONTAINER (pref_output_plugin), 1);
 
 hbox12 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox12);
@@ -1732,6 +1879,116 @@
 gtk_widget_show (convert16to24);
 gtk_box_pack_start (GTK_BOX (vbox10), convert16to24, FALSE, FALSE, 0);
 
+ hbox151 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox151);
+ gtk_box_pack_start (GTK_BOX (vbox10), hbox151, FALSE, TRUE, 0);
+
+ label_bit_override = gtk_label_new (_("Override bit depth:"));
+ gtk_widget_show (label_bit_override);
+ gtk_box_pack_start (GTK_BOX (hbox151), label_bit_override, FALSE, FALSE, 0);
+
+ combo_bit_override = gtk_combo_box_text_new ();
+ gtk_widget_show (combo_bit_override);
+ gtk_box_pack_start (GTK_BOX (hbox151), combo_bit_override, TRUE, TRUE, 0);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_bit_override), _("Disabled"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_bit_override), _("8 bit"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_bit_override), _("16 bit"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_bit_override), _("24 bit"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_bit_override), _("32 bit"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_bit_override), _("32 bit float"));
+
+ frame15 = gtk_frame_new (NULL);
+ gtk_widget_show (frame15);
+ gtk_box_pack_start (GTK_BOX (vbox10), frame15, FALSE, TRUE, 0);
+
+ alignment31 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment31);
+ gtk_container_add (GTK_CONTAINER (frame15), alignment31);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment31), 8, 0, 12, 0);
+
+ vbox52 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox52);
+ gtk_container_add (GTK_CONTAINER (alignment31), vbox52);
+
+ hbox145 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox145);
+ gtk_box_pack_start (GTK_BOX (vbox52), hbox145, TRUE, TRUE, 0);
+
+ label_direct_sr = gtk_label_new (_("Target samplerate:"));
+ gtk_widget_show (label_direct_sr);
+ gtk_box_pack_start (GTK_BOX (hbox145), label_direct_sr, FALSE, FALSE, 0);
+
+ comboboxentry_direct_sr = gtk_combo_box_entry_new_text ();
+ gtk_widget_show (comboboxentry_direct_sr);
+ gtk_box_pack_start (GTK_BOX (hbox145), comboboxentry_direct_sr, FALSE, FALSE, 0);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_direct_sr), "44100");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_direct_sr), "48000");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_direct_sr), "88200");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_direct_sr), "96000");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_direct_sr), "176400");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_direct_sr), "192000");
+
+ frame16 = gtk_frame_new (NULL);
+ gtk_widget_show (frame16);
+ gtk_box_pack_start (GTK_BOX (vbox52), frame16, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame16), 8);
+
+ alignment32 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment32);
+ gtk_container_add (GTK_CONTAINER (frame16), alignment32);
+ gtk_container_set_border_width (GTK_CONTAINER (alignment32), 8);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment32), 0, 0, 12, 0);
+
+ vbox53 = gtk_vbox_new (FALSE, 8);
+ gtk_widget_show (vbox53);
+ gtk_container_add (GTK_CONTAINER (alignment32), vbox53);
+
+ hbox147 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox147);
+ gtk_box_pack_start (GTK_BOX (vbox53), hbox147, TRUE, TRUE, 0);
+
+ label_sr_mult_48 = gtk_label_new (_("For multiples of 48KHz (96K, 192K, ...):"));
+ gtk_widget_show (label_sr_mult_48);
+ gtk_box_pack_start (GTK_BOX (hbox147), label_sr_mult_48, FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label_sr_mult_48), 1, 0.5);
+
+ comboboxentry_sr_mult_48 = gtk_combo_box_entry_new_text ();
+ gtk_widget_show (comboboxentry_sr_mult_48);
+ gtk_box_pack_start (GTK_BOX (hbox147), comboboxentry_sr_mult_48, FALSE, FALSE, 0);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_48), "44100");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_48), "48000");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_48), "88200");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_48), "96000");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_48), "176400");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_48), "192000");
+
+ hbox148 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox148);
+ gtk_box_pack_start (GTK_BOX (vbox53), hbox148, TRUE, TRUE, 0);
+
+ label_sr_mult_44 = gtk_label_new (_("For multiples of 44.1KHz (88.2K, 176.4K, ...):"));
+ gtk_widget_show (label_sr_mult_44);
+ gtk_box_pack_start (GTK_BOX (hbox148), label_sr_mult_44, FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label_sr_mult_44), 1, 0.5);
+
+ comboboxentry_sr_mult_44 = gtk_combo_box_entry_new_text ();
+ gtk_widget_show (comboboxentry_sr_mult_44);
+ gtk_box_pack_start (GTK_BOX (hbox148), comboboxentry_sr_mult_44, FALSE, FALSE, 0);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_44), "44100");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_44), "48000");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_44), "88200");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_44), "96000");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_44), "176400");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (comboboxentry_sr_mult_44), "192000");
+
+ checkbutton_dependent_sr = gtk_check_button_new_with_mnemonic (_("Based on input samplerate"));
+ gtk_widget_show (checkbutton_dependent_sr);
+ gtk_frame_set_label_widget (GTK_FRAME (frame16), checkbutton_dependent_sr);
+
+ checkbutton_sr_override = gtk_check_button_new_with_mnemonic (_("Override samplerate"));
+ gtk_widget_show (checkbutton_sr_override);
+ gtk_frame_set_label_widget (GTK_FRAME (frame15), checkbutton_sr_override);
+
 Sound = gtk_label_new (_("Sound"));
 gtk_widget_show (Sound);
 gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), Sound);
@@ -1741,30 +1998,58 @@
 gtk_container_add (GTK_CONTAINER (notebook), vbox8);
 gtk_container_set_border_width (GTK_CONTAINER (vbox8), 12);
 
+ frame14 = gtk_frame_new (NULL);
+ gtk_widget_show (frame14);
+ gtk_box_pack_start (GTK_BOX (vbox8), frame14, FALSE, FALSE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame14), GTK_SHADOW_NONE);
+
+ alignment30 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment30);
+ gtk_container_add (GTK_CONTAINER (frame14), alignment30);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment30), 0, 0, 12, 0);
+
+ vbox48 = gtk_vbox_new (FALSE, 8);
+ gtk_widget_show (vbox48);
+ gtk_container_add (GTK_CONTAINER (alignment30), vbox48);
+
 hbox10 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox10);
- gtk_box_pack_start (GTK_BOX (vbox8), hbox10, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox48), hbox10, TRUE, TRUE, 0);
 
- label8 = gtk_label_new (_("Replaygain mode:"));
+ label8 = gtk_label_new (_("Source mode:"));
 gtk_widget_show (label8);
 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_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_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);
+ pref_replaygain_source_mode = gtk_combo_box_text_new ();
+ gtk_widget_show (pref_replaygain_source_mode);
+ gtk_box_pack_start (GTK_BOX (hbox10), pref_replaygain_source_mode, TRUE, TRUE, 0);
+ gtk_widget_set_size_request (pref_replaygain_source_mode, 337, -1);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_replaygain_source_mode), _("By playback order"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_replaygain_source_mode), _("Track"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_replaygain_source_mode), _("Album"));
+
+ hbox139 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox139);
+ gtk_box_pack_start (GTK_BOX (vbox48), hbox139, TRUE, TRUE, 0);
+
+ label163 = gtk_label_new (_("Processing:"));
+ gtk_widget_show (label163);
+ gtk_box_pack_start (GTK_BOX (hbox139), label163, FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label163), 0, 0.5);
+
+ pref_replaygain_processing = gtk_combo_box_text_new ();
+ gtk_widget_show (pref_replaygain_processing);
+ gtk_box_pack_start (GTK_BOX (hbox139), pref_replaygain_processing, TRUE, TRUE, 0);
+ gtk_widget_set_size_request (pref_replaygain_processing, 337, -1);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_replaygain_processing), _("None"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_replaygain_processing), _("Apply gain"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_replaygain_processing), _("Apply gain and prevent clipping according to peak"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref_replaygain_processing), _("Only prevent clipping"));
 
 table1 = gtk_table_new (2, 2, FALSE);
 gtk_widget_show (table1);
- gtk_box_pack_start (GTK_BOX (vbox8), table1, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox48), table1, TRUE, TRUE, 0);
 gtk_table_set_col_spacings (GTK_TABLE (table1), 8);
 
 hbox100 = gtk_hbox_new (FALSE, 8);
@@ -1787,14 +2072,14 @@
 gtk_widget_show (label126);
 gtk_box_pack_start (GTK_BOX (hbox100), label126, FALSE, FALSE, 0);
 
- label124 = gtk_label_new (_("Replaygain preamp:"));
+ label124 = gtk_label_new (_("Preamp with RG info:"));
 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:"));
+ label124a = gtk_label_new (_("Preamp without RG info:"));
 gtk_widget_show (label124a);
 gtk_table_attach (GTK_TABLE (table1), label124a, 0, 1, 1, 2,
 (GtkAttachOptions) (GTK_FILL),
@@ -1821,6 +2106,11 @@
 gtk_widget_show (label126a);
 gtk_box_pack_start (GTK_BOX (hbox100a), label126a, FALSE, FALSE, 0);
 
+ label162 = gtk_label_new (_("ReplayGain"));
+ gtk_widget_show (label162);
+ gtk_frame_set_label_widget (GTK_FRAME (frame14), label162);
+ gtk_label_set_use_markup (GTK_LABEL (label162), TRUE);
+
 hbox66 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox66);
 gtk_box_pack_start (GTK_BOX (vbox8), hbox66, FALSE, FALSE, 0);
@@ -1859,25 +2149,13 @@
 gtk_container_add (GTK_CONTAINER (notebook), vbox29);
 gtk_container_set_border_width (GTK_CONTAINER (vbox29), 12);
 
- hbox80 = gtk_hbox_new (TRUE, 8);
- gtk_widget_show (hbox80);
- gtk_box_pack_start (GTK_BOX (vbox29), hbox80, FALSE, TRUE, 0);
-
- dsp_add = gtk_button_new_from_stock ("gtk-add");
- gtk_widget_show (dsp_add);
- gtk_box_pack_start (GTK_BOX (hbox80), dsp_add, FALSE, TRUE, 0);
-
- dsp_remove = gtk_button_new_from_stock ("gtk-remove");
- gtk_widget_show (dsp_remove);
- gtk_box_pack_start (GTK_BOX (hbox80), dsp_remove, FALSE, TRUE, 0);
-
- dsp_configure = gtk_button_new_with_mnemonic (_("Configure"));
- gtk_widget_show (dsp_configure);
- gtk_box_pack_start (GTK_BOX (hbox80), dsp_configure, FALSE, TRUE, 0);
+ vbox58 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox58);
+ gtk_box_pack_start (GTK_BOX (vbox29), vbox58, TRUE, TRUE, 0);
 
 hbox81 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox81);
- gtk_box_pack_start (GTK_BOX (vbox29), hbox81, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox58), hbox81, TRUE, TRUE, 0);
 
 scrolledwindow7 = gtk_scrolled_window_new (NULL, NULL);
 gtk_widget_show (scrolledwindow7);
@@ -1888,23 +2166,61 @@
 dsp_listview = gtk_tree_view_new ();
 gtk_widget_show (dsp_listview);
 gtk_container_add (GTK_CONTAINER (scrolledwindow7), dsp_listview);
+ gtk_widget_set_events (dsp_listview, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
 gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dsp_listview), FALSE);
 
- vbox30 = gtk_vbox_new (FALSE, 8);
- gtk_widget_show (vbox30);
- gtk_box_pack_start (GTK_BOX (hbox81), vbox30, FALSE, TRUE, 0);
-
- dsp_up = gtk_button_new_from_stock ("gtk-go-up");
- gtk_widget_show (dsp_up);
- gtk_box_pack_start (GTK_BOX (vbox30), dsp_up, FALSE, FALSE, 0);
-
- dsp_down = gtk_button_new_from_stock ("gtk-go-down");
- gtk_widget_show (dsp_down);
- gtk_box_pack_start (GTK_BOX (vbox30), dsp_down, FALSE, FALSE, 0);
+ dsp_toolbar = gtk_toolbar_new ();
+ gtk_widget_show (dsp_toolbar);
+ gtk_box_pack_start (GTK_BOX (vbox58), dsp_toolbar, FALSE, FALSE, 0);
+ gtk_toolbar_set_style (GTK_TOOLBAR (dsp_toolbar), GTK_TOOLBAR_BOTH_HORIZ);
+ gtk_toolbar_set_show_arrow (GTK_TOOLBAR (dsp_toolbar), FALSE);
+ tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (dsp_toolbar));
+
+ dsp_add_toolbtn = (GtkWidget*) gtk_toggle_tool_button_new ();
+ gtk_tool_button_set_label (GTK_TOOL_BUTTON (dsp_add_toolbtn), "");
+ tmp_image = gtk_image_new_from_stock ("gtk-add", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (dsp_add_toolbtn), tmp_image);
+ gtk_widget_show (dsp_add_toolbtn);
+ gtk_container_add (GTK_CONTAINER (dsp_toolbar), dsp_add_toolbtn);
+
+ tmp_image = gtk_image_new_from_stock ("gtk-remove", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ dsp_remove_toolbtn = (GtkWidget*) gtk_tool_button_new (tmp_image, "");
+ gtk_widget_show (dsp_remove_toolbtn);
+ gtk_container_add (GTK_CONTAINER (dsp_toolbar), dsp_remove_toolbtn);
+
+ tmp_image = gtk_image_new_from_stock ("gtk-go-up", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ dsp_up_toolbtn = (GtkWidget*) gtk_tool_button_new (tmp_image, "");
+ gtk_widget_show (dsp_up_toolbtn);
+ gtk_container_add (GTK_CONTAINER (dsp_toolbar), dsp_up_toolbtn);
+
+ tmp_image = gtk_image_new_from_stock ("gtk-go-down", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ dsp_down_toolbtn = (GtkWidget*) gtk_tool_button_new (tmp_image, "");
+ gtk_widget_show (dsp_down_toolbtn);
+ gtk_container_add (GTK_CONTAINER (dsp_toolbar), dsp_down_toolbtn);
+
+ tmp_image = gtk_image_new_from_stock ("gtk-preferences", tmp_toolbar_icon_size);
+ gtk_widget_show (tmp_image);
+ dsp_configure_toolbtn = (GtkWidget*) gtk_tool_button_new (tmp_image, "");
+ gtk_widget_show (dsp_configure_toolbtn);
+ gtk_container_add (GTK_CONTAINER (dsp_toolbar), dsp_configure_toolbtn);
+
+ separatortoolitem1 = (GtkWidget*) gtk_separator_tool_item_new ();
+ gtk_widget_show (separatortoolitem1);
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (separatortoolitem1), TRUE);
+ gtk_container_add (GTK_CONTAINER (dsp_toolbar), separatortoolitem1);
+ gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (separatortoolitem1), FALSE);
+
+ toolitem2 = (GtkWidget*) gtk_tool_item_new ();
+ gtk_widget_show (toolitem2);
+ gtk_container_add (GTK_CONTAINER (dsp_toolbar), toolitem2);
 
 hbox86 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox86);
- gtk_box_pack_start (GTK_BOX (vbox29), hbox86, FALSE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (toolitem2), hbox86);
 
 label114 = gtk_label_new (_("DSP Chain Preset"));
 gtk_widget_show (label114);
@@ -1914,7 +2230,7 @@
 gtk_widget_show (dsp_preset);
 gtk_box_pack_start (GTK_BOX (hbox86), dsp_preset, FALSE, TRUE, 0);
 
- dsp_preset_save = gtk_button_new_from_stock ("gtk-save");
+ dsp_preset_save = gtk_button_new_with_mnemonic ("_Save");
 gtk_widget_show (dsp_preset_save);
 gtk_box_pack_start (GTK_BOX (hbox86), dsp_preset_save, FALSE, FALSE, 0);
 
@@ -1936,6 +2252,10 @@
 gtk_container_add (GTK_CONTAINER (notebook5), vbox9);
 gtk_container_set_border_width (GTK_CONTAINER (vbox9), 12);
 
+ minimize_on_startup = gtk_check_button_new_with_mnemonic (_("Minimize to tray on startup"));
+ gtk_widget_show (minimize_on_startup);
+ gtk_box_pack_start (GTK_BOX (vbox9), minimize_on_startup, FALSE, FALSE, 0);
+
 pref_close_send_to_tray = gtk_check_button_new_with_mnemonic (_("Close minimizes to tray"));
 gtk_widget_show (pref_close_send_to_tray);
 gtk_box_pack_start (GTK_BOX (vbox9), pref_close_send_to_tray, FALSE, FALSE, 0);
@@ -1944,11 +2264,15 @@
 gtk_widget_show (hide_tray_icon);
 gtk_box_pack_start (GTK_BOX (vbox9), hide_tray_icon, FALSE, FALSE, 0);
 
+ move_to_trash = gtk_check_button_new_with_mnemonic (_("Delete from disk should use Trash"));
+ gtk_widget_show (move_to_trash);
+ gtk_box_pack_start (GTK_BOX (vbox9), move_to_trash, FALSE, FALSE, 0);
+
 enable_shift_jis_recoding = gtk_check_button_new_with_mnemonic (_("Enable Japanese SHIFT-JIS detection and recoding"));
 gtk_widget_show (enable_shift_jis_recoding);
 gtk_box_pack_start (GTK_BOX (vbox9), enable_shift_jis_recoding, FALSE, FALSE, 0);
 
- enable_cp1251_recoding = gtk_check_button_new_with_mnemonic (_("Enable Russian CP1251 detection and recoding"));
+ enable_cp1251_recoding = gtk_check_button_new_with_mnemonic (_("Enable cyrillic CP1251 detection and recoding"));
 gtk_widget_show (enable_cp1251_recoding);
 gtk_box_pack_start (GTK_BOX (vbox9), enable_cp1251_recoding, FALSE, FALSE, 0);
 
@@ -2010,6 +2334,10 @@
 gtk_widget_show (gui_plugin);
 gtk_box_pack_start (GTK_BOX (hbox101), gui_plugin, TRUE, TRUE, 0);
 
+ display_seltime = gtk_check_button_new_with_mnemonic (_("Display selection playback time in status bar"));
+ gtk_widget_show (display_seltime);
+ gtk_box_pack_start (GTK_BOX (vbox9), display_seltime, FALSE, FALSE, 0);
+
 label147 = gtk_label_new (_("Player"));
 gtk_widget_show (label147);
 gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook5), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook5), 0), label147);
@@ -2023,14 +2351,14 @@
 gtk_widget_show (mmb_delete_playlist);
 gtk_box_pack_start (GTK_BOX (vbox44), mmb_delete_playlist, FALSE, FALSE, 0);
 
- embolden_current = gtk_check_button_new_with_mnemonic (_("Draw playing track using bold font"));
- gtk_widget_show (embolden_current);
- gtk_box_pack_start (GTK_BOX (vbox44), embolden_current, FALSE, FALSE, 0);
-
- hide_delete_from_disk = gtk_check_button_new_with_mnemonic (_("Hide \"Remove From Disk\" context menu item"));
+ hide_delete_from_disk = gtk_check_button_new_with_mnemonic (_("Hide \"Delete from Disk\" context menu item"));
 gtk_widget_show (hide_delete_from_disk);
 gtk_box_pack_start (GTK_BOX (vbox44), hide_delete_from_disk, FALSE, FALSE, 0);
 
+ skip_deleted_songs = gtk_check_button_new_with_mnemonic (_("Switch to the next song when the currently played one is removed from disk"));
+ gtk_widget_show (skip_deleted_songs);
+ gtk_box_pack_start (GTK_BOX (vbox44), skip_deleted_songs, FALSE, FALSE, 0);
+
 auto_name_playlist_from_folder = gtk_check_button_new_with_mnemonic (_("Auto-name playlists when adding a single folder"));
 gtk_widget_show (auto_name_playlist_from_folder);
 gtk_box_pack_start (GTK_BOX (vbox44), auto_name_playlist_from_folder, FALSE, FALSE, 0);
@@ -2039,6 +2367,24 @@
 gtk_widget_show (auto_size_columns);
 gtk_box_pack_start (GTK_BOX (vbox44), auto_size_columns, FALSE, FALSE, 0);
 
+ hbox141 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox141);
+ gtk_box_pack_start (GTK_BOX (vbox44), hbox141, FALSE, FALSE, 0);
+
+ label164 = gtk_label_new (_("Group spacing:"));
+ gtk_widget_show (label164);
+ gtk_box_pack_start (GTK_BOX (hbox141), label164, FALSE, FALSE, 0);
+
+ listview_group_spacing_adj = G_OBJECT(gtk_adjustment_new (0, 0, 1000, 1, 10, 0));
+ listview_group_spacing = gtk_spin_button_new (GTK_ADJUSTMENT (listview_group_spacing_adj), 1, 0);
+ gtk_widget_show (listview_group_spacing);
+ gtk_box_pack_start (GTK_BOX (hbox141), listview_group_spacing, FALSE, TRUE, 0);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (listview_group_spacing), TRUE);
+
+ label165 = gtk_label_new (_("pixels"));
+ gtk_widget_show (label165);
+ gtk_box_pack_start (GTK_BOX (hbox141), label165, FALSE, FALSE, 0);
+
 label148 = gtk_label_new (_("Playlist"));
 gtk_widget_show (label148);
 gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook5), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook5), 1), label148);
@@ -2067,14 +2413,14 @@
 gtk_box_pack_start (GTK_BOX (vbox21), bar_colors_group, TRUE, TRUE, 0);
 gtk_table_set_col_spacings (GTK_TABLE (bar_colors_group), 8);
 
- label43 = gtk_label_new (_("Foreground"));
+ label43 = gtk_label_new (_("Bars"));
 gtk_widget_show (label43);
 gtk_table_attach (GTK_TABLE (bar_colors_group), label43, 0, 1, 0, 1,
 (GtkAttachOptions) (GTK_EXPAND),
 (GtkAttachOptions) (0), 0, 0);
 gtk_misc_set_alignment (GTK_MISC (label43), 0, 0.5);
 
- label47 = gtk_label_new (_("Background"));
+ label47 = gtk_label_new (_("Background (EQ)"));
 gtk_widget_show (label47);
 gtk_table_attach (GTK_TABLE (bar_colors_group), label47, 1, 2, 0, 1,
 (GtkAttachOptions) (GTK_EXPAND),
@@ -2093,7 +2439,7 @@
 (GtkAttachOptions) (GTK_EXPAND),
 (GtkAttachOptions) (0), 0, 0);
 
- label73 = gtk_label_new (_("Seekbar/Volumebar colors"));
+ label73 = gtk_label_new (_("Seekbar/Volumebar/EQ"));
 gtk_widget_show (label73);
 gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook4), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook4), 0), label73);
 
@@ -2106,77 +2452,138 @@
 gtk_widget_show (override_tabstrip_colors);
 gtk_box_pack_start (GTK_BOX (vbox22), override_tabstrip_colors, FALSE, FALSE, 0);
 
- tabstrip_colors_group = gtk_table_new (2, 5, TRUE);
+ tabstrip_colors_group = gtk_table_new (7, 3, FALSE);
 gtk_widget_show (tabstrip_colors_group);
 gtk_box_pack_start (GTK_BOX (vbox22), tabstrip_colors_group, TRUE, TRUE, 0);
+ gtk_table_set_row_spacings (GTK_TABLE (tabstrip_colors_group), 4);
 gtk_table_set_col_spacings (GTK_TABLE (tabstrip_colors_group), 8);
 
- label45 = gtk_label_new (_("Middle"));
- gtk_widget_show (label45);
- gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label45, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ tabstrip_base = gtk_color_button_new ();
+ gtk_widget_show (tabstrip_base);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_base, 1, 2, 6, 7,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label45), 0, 0.5);
 
- label46 = gtk_label_new (_("Light"));
- gtk_widget_show (label46);
- gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label46, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ label76 = gtk_label_new (_("Base:"));
+ gtk_widget_show (label76);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label76, 0, 1, 6, 7,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label46), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (label76), 0, 0.5);
 
- label44 = gtk_label_new (_("Dark"));
- gtk_widget_show (label44);
- gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label44, 2, 3, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ tabstrip_dark = gtk_color_button_new ();
+ gtk_widget_show (tabstrip_dark);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_dark, 1, 2, 5, 6,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label44), 0, 0.5);
 
- tabstrip_mid = gtk_color_button_new ();
- gtk_widget_show (tabstrip_mid);
- gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_mid, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
+ label44 = gtk_label_new (_("Dark:"));
+ gtk_widget_show (label44);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label44, 0, 1, 5, 6,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label44), 0, 0.5);
 
 tabstrip_light = gtk_color_button_new ();
 gtk_widget_show (tabstrip_light);
- gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_light, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_light, 1, 2, 4, 5,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
 
- tabstrip_dark = gtk_color_button_new ();
- gtk_widget_show (tabstrip_dark);
- gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_dark, 2, 3, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
+ label46 = gtk_label_new (_("Light:"));
+ gtk_widget_show (label46);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label46, 0, 1, 4, 5,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label46), 0, 0.5);
 
- tabstrip_base = gtk_color_button_new ();
- gtk_widget_show (tabstrip_base);
- gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_base, 3, 4, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
+ tabstrip_mid = gtk_color_button_new ();
+ gtk_widget_show (tabstrip_mid);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_mid, 1, 2, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
 
- label76 = gtk_label_new (_("Base"));
- gtk_widget_show (label76);
- gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label76, 3, 4, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ label45 = gtk_label_new (_("Middle:"));
+ gtk_widget_show (label45);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label45, 0, 1, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label76), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (label45), 0, 0.5);
 
- label127 = gtk_label_new (_("Text"));
+ label127 = gtk_label_new (_("Text:"));
 gtk_widget_show (label127);
- gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label127, 4, 5, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label127, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
 gtk_misc_set_alignment (GTK_MISC (label127), 0, 0.5);
 
 tabstrip_text = gtk_color_button_new ();
 gtk_widget_show (tabstrip_text);
- gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_text, 4, 5, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_text, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
 
- label74 = gtk_label_new (_("Tab strip colors"));
+ tabstrip_selected_text = gtk_color_button_new ();
+ gtk_widget_show (tabstrip_selected_text);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_selected_text, 1, 2, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ hbox136 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox136);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), hbox136, 2, 3, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+ tabstrip_playing_bold = gtk_check_button_new_with_mnemonic (_("Bold"));
+ gtk_widget_show (tabstrip_playing_bold);
+ gtk_box_pack_start (GTK_BOX (hbox136), tabstrip_playing_bold, FALSE, FALSE, 0);
+
+ tabstrip_playing_italic = gtk_check_button_new_with_mnemonic (_("Italic"));
+ gtk_widget_show (tabstrip_playing_italic);
+ gtk_box_pack_start (GTK_BOX (hbox136), tabstrip_playing_italic, FALSE, FALSE, 0);
+
+ hbox137 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox137);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), hbox137, 2, 3, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+ tabstrip_selected_bold = gtk_check_button_new_with_mnemonic (_("Bold"));
+ gtk_widget_show (tabstrip_selected_bold);
+ gtk_box_pack_start (GTK_BOX (hbox137), tabstrip_selected_bold, FALSE, FALSE, 0);
+
+ tabstrip_selected_italic = gtk_check_button_new_with_mnemonic (_("Italic"));
+ gtk_widget_show (tabstrip_selected_italic);
+ gtk_box_pack_start (GTK_BOX (hbox137), tabstrip_selected_italic, FALSE, FALSE, 0);
+
+ tabstrip_text_font = gtk_font_button_new ();
+ gtk_widget_show (tabstrip_text_font);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_text_font, 2, 3, 0, 1,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+ label152 = gtk_label_new (_("Playing text:"));
+ gtk_widget_show (label152);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label152, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label152), 0, 0.5);
+
+ label153 = gtk_label_new (_("Selected text:"));
+ gtk_widget_show (label153);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), label153, 0, 1, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label153), 0, 0.5);
+
+ tabstrip_playing_text = gtk_color_button_new ();
+ gtk_widget_show (tabstrip_playing_text);
+ gtk_table_attach (GTK_TABLE (tabstrip_colors_group), tabstrip_playing_text, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label74 = gtk_label_new (_("Tab strip"));
 gtk_widget_show (label74);
 gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook4), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook4), 1), label74);
 
@@ -2185,101 +2592,338 @@
 gtk_container_add (GTK_CONTAINER (notebook4), vbox23);
 gtk_container_set_border_width (GTK_CONTAINER (vbox23), 12);
 
- override_listview_colors = gtk_check_button_new_with_mnemonic (_("Override (looses GTK treeview theming, but speeds up rendering)"));
- gtk_widget_show (override_listview_colors);
- gtk_box_pack_start (GTK_BOX (vbox23), override_listview_colors, FALSE, FALSE, 0);
+ frame11 = gtk_frame_new (NULL);
+ gtk_widget_show (frame11);
+ gtk_box_pack_start (GTK_BOX (vbox23), frame11, TRUE, TRUE, 0);
 
- listview_colors_group = gtk_table_new (2, 6, TRUE);
+ listview_colors_group = gtk_hbox_new (FALSE, 0);
 gtk_widget_show (listview_colors_group);
- gtk_box_pack_start (GTK_BOX (vbox23), listview_colors_group, TRUE, TRUE, 0);
- gtk_table_set_col_spacings (GTK_TABLE (listview_colors_group), 8);
+ gtk_container_add (GTK_CONTAINER (frame11), listview_colors_group);
+ gtk_container_set_border_width (GTK_CONTAINER (listview_colors_group), 8);
+
+ frame12 = gtk_frame_new (NULL);
+ gtk_widget_show (frame12);
+ gtk_box_pack_start (GTK_BOX (listview_colors_group), frame12, TRUE, TRUE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame12), GTK_SHADOW_NONE);
+
+ alignment28 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment28);
+ gtk_container_add (GTK_CONTAINER (frame12), alignment28);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment28), 12, 12, 12, 12);
+
+ table3 = gtk_table_new (5, 3, FALSE);
+ gtk_widget_show (table3);
+ gtk_container_add (GTK_CONTAINER (alignment28), table3);
+ gtk_table_set_row_spacings (GTK_TABLE (table3), 4);
+ gtk_table_set_col_spacings (GTK_TABLE (table3), 8);
+
+ label77 = gtk_label_new (_("Normal track(s):"));
+ gtk_widget_show (label77);
+ gtk_table_attach (GTK_TABLE (table3), label77, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label77), 0, 0.5);
+
+ listview_text = gtk_color_button_new ();
+ gtk_widget_show (listview_text);
+ gtk_table_attach (GTK_TABLE (table3), listview_text, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label150 = gtk_label_new (_("Playing track:"));
+ gtk_widget_show (label150);
+ gtk_table_attach (GTK_TABLE (table3), label150, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label150), 0, 0.5);
+
+ listview_playing_text = gtk_color_button_new ();
+ gtk_widget_show (listview_playing_text);
+ gtk_table_attach (GTK_TABLE (table3), listview_playing_text, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label61 = gtk_label_new (_("Selected track(s):"));
+ gtk_widget_show (label61);
+ gtk_table_attach (GTK_TABLE (table3), label61, 0, 1, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label61), 0, 0.5);
+
+ listview_selected_text = gtk_color_button_new ();
+ gtk_widget_show (listview_selected_text);
+ gtk_table_attach (GTK_TABLE (table3), listview_selected_text, 1, 2, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label154 = gtk_label_new (_("Columns:"));
+ gtk_widget_show (label154);
+ gtk_table_attach (GTK_TABLE (table3), label154, 0, 1, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label154), 0, 0.5);
+
+ listview_column_text = gtk_color_button_new ();
+ gtk_widget_show (listview_column_text);
+ gtk_table_attach (GTK_TABLE (table3), listview_column_text, 1, 2, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ listview_column_text_font = gtk_font_button_new ();
+ gtk_widget_show (listview_column_text_font);
+ gtk_table_attach (GTK_TABLE (table3), listview_column_text_font, 2, 3, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label149 = gtk_label_new (_("Group header:"));
+ gtk_widget_show (label149);
+ gtk_table_attach (GTK_TABLE (table3), label149, 0, 1, 4, 5,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label149), 0, 0.5);
+
+ listview_group_text = gtk_color_button_new ();
+ gtk_widget_show (listview_group_text);
+ gtk_table_attach (GTK_TABLE (table3), listview_group_text, 1, 2, 4, 5,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ listview_group_text_font = gtk_font_button_new ();
+ gtk_widget_show (listview_group_text_font);
+ gtk_table_attach (GTK_TABLE (table3), listview_group_text_font, 2, 3, 4, 5,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
 
- label58 = gtk_label_new (_("Even row"));
+ listview_text_font = gtk_font_button_new ();
+ gtk_widget_show (listview_text_font);
+ gtk_table_attach (GTK_TABLE (table3), listview_text_font, 2, 3, 0, 1,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label158 = gtk_label_new (_("Foreground:"));
+ gtk_widget_show (label158);
+ gtk_frame_set_label_widget (GTK_FRAME (frame12), label158);
+ gtk_label_set_use_markup (GTK_LABEL (label158), TRUE);
+
+ vseparator1 = gtk_vseparator_new ();
+ gtk_widget_show (vseparator1);
+ gtk_box_pack_start (GTK_BOX (listview_colors_group), vseparator1, FALSE, TRUE, 5);
+
+ frame13 = gtk_frame_new (NULL);
+ gtk_widget_show (frame13);
+ gtk_box_pack_start (GTK_BOX (listview_colors_group), frame13, TRUE, TRUE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame13), GTK_SHADOW_NONE);
+
+ alignment29 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment29);
+ gtk_container_add (GTK_CONTAINER (frame13), alignment29);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment29), 11, 12, 12, 12);
+
+ table4 = gtk_table_new (4, 2, FALSE);
+ gtk_widget_show (table4);
+ gtk_container_add (GTK_CONTAINER (alignment29), table4);
+ gtk_table_set_row_spacings (GTK_TABLE (table4), 4);
+ gtk_table_set_col_spacings (GTK_TABLE (table4), 8);
+
+ label58 = gtk_label_new (_("Even:"));
 gtk_widget_show (label58);
- gtk_table_attach (GTK_TABLE (listview_colors_group), label58, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ gtk_table_attach (GTK_TABLE (table4), label58, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
 gtk_misc_set_alignment (GTK_MISC (label58), 0, 0.5);
 
- label59 = gtk_label_new (_("Odd row"));
+ label59 = gtk_label_new (_("Odd:"));
 gtk_widget_show (label59);
- gtk_table_attach (GTK_TABLE (listview_colors_group), label59, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ gtk_table_attach (GTK_TABLE (table4), label59, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
 gtk_misc_set_alignment (GTK_MISC (label59), 0, 0.5);
 
- listview_even_row = gtk_color_button_new ();
- gtk_widget_show (listview_even_row);
- gtk_table_attach (GTK_TABLE (listview_colors_group), listview_even_row, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
- (GtkAttachOptions) (0), 0, 0);
-
 listview_odd_row = gtk_color_button_new ();
 gtk_widget_show (listview_odd_row);
- gtk_table_attach (GTK_TABLE (listview_colors_group), listview_odd_row, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
- (GtkAttachOptions) (0), 0, 0);
-
- label77 = gtk_label_new (_("Text"));
- gtk_widget_show (label77);
- gtk_table_attach (GTK_TABLE (listview_colors_group), label77, 3, 4, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ gtk_table_attach (GTK_TABLE (table4), listview_odd_row, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label77), 0, 0.5);
 
- label78 = gtk_label_new (_("Selected row"));
+ label78 = gtk_label_new (_("Selected:"));
 gtk_widget_show (label78);
- gtk_table_attach (GTK_TABLE (listview_colors_group), label78, 2, 3, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ gtk_table_attach (GTK_TABLE (table4), label78, 0, 1, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
 gtk_misc_set_alignment (GTK_MISC (label78), 0, 0.5);
 
 listview_selected_row = gtk_color_button_new ();
 gtk_widget_show (listview_selected_row);
- gtk_table_attach (GTK_TABLE (listview_colors_group), listview_selected_row, 2, 3, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
+ gtk_table_attach (GTK_TABLE (table4), listview_selected_row, 1, 2, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
 
- listview_text = gtk_color_button_new ();
- gtk_widget_show (listview_text);
- gtk_table_attach (GTK_TABLE (listview_colors_group), listview_text, 3, 4, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
+ label62 = gtk_label_new (_("Cursor:"));
+ gtk_widget_show (label62);
+ gtk_table_attach (GTK_TABLE (table4), label62, 0, 1, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label62), 0, 0.5);
 
- label61 = gtk_label_new (_("Selected text"));
- gtk_widget_show (label61);
- gtk_table_attach (GTK_TABLE (listview_colors_group), label61, 4, 5, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ listview_cursor = gtk_color_button_new ();
+ gtk_widget_show (listview_cursor);
+ gtk_table_attach (GTK_TABLE (table4), listview_cursor, 1, 2, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label61), 0, 0.5);
 
- listview_selected_text = gtk_color_button_new ();
- gtk_widget_show (listview_selected_text);
- gtk_table_attach (GTK_TABLE (listview_colors_group), listview_selected_text, 4, 5, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
+ listview_even_row = gtk_color_button_new ();
+ gtk_widget_show (listview_even_row);
+ gtk_table_attach (GTK_TABLE (table4), listview_even_row, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
 
- label62 = gtk_label_new (_("Cursor"));
- gtk_widget_show (label62);
- gtk_table_attach (GTK_TABLE (listview_colors_group), label62, 5, 6, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND),
+ label159 = gtk_label_new (_("Background:"));
+ gtk_widget_show (label159);
+ gtk_frame_set_label_widget (GTK_FRAME (frame13), label159);
+ gtk_label_set_use_markup (GTK_LABEL (label159), TRUE);
+
+ override_listview_colors = gtk_check_button_new_with_mnemonic (_("Override (loses GTK treeview theming, but speeds up rendering)"));
+ gtk_widget_show (override_listview_colors);
+ gtk_frame_set_label_widget (GTK_FRAME (frame11), override_listview_colors);
+
+ table2 = gtk_table_new (2, 3, FALSE);
+ gtk_widget_show (table2);
+ gtk_box_pack_start (GTK_BOX (vbox23), table2, TRUE, TRUE, 0);
+ gtk_table_set_row_spacings (GTK_TABLE (table2), 4);
+ gtk_table_set_col_spacings (GTK_TABLE (table2), 8);
+
+ label155 = gtk_label_new (_("Playing track:"));
+ gtk_widget_show (label155);
+ gtk_table_attach (GTK_TABLE (table2), label155, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label62), 0, 0.5);
+ gtk_misc_set_alignment (GTK_MISC (label155), 0, 0.5);
 
- listview_cursor = gtk_color_button_new ();
- gtk_widget_show (listview_cursor);
- gtk_table_attach (GTK_TABLE (listview_colors_group), listview_cursor, 5, 6, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND),
+ label156 = gtk_label_new (_("Selected track(s):"));
+ gtk_widget_show (label156);
+ gtk_table_attach (GTK_TABLE (table2), label156, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label156), 0, 0.5);
+
+ listview_playing_text_bold = gtk_check_button_new_with_mnemonic (_("Bold"));
+ gtk_widget_show (listview_playing_text_bold);
+ gtk_table_attach (GTK_TABLE (table2), listview_playing_text_bold, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ listview_selected_text_bold = gtk_check_button_new_with_mnemonic (_("Bold"));
+ gtk_widget_show (listview_selected_text_bold);
+ gtk_table_attach (GTK_TABLE (table2), listview_selected_text_bold, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ listview_playing_text_italic = gtk_check_button_new_with_mnemonic (_("Italic"));
+ gtk_widget_show (listview_playing_text_italic);
+ gtk_table_attach (GTK_TABLE (table2), listview_playing_text_italic, 2, 3, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
 (GtkAttachOptions) (0), 0, 0);
 
- label75 = gtk_label_new (_("Playlist colors"));
+ listview_selected_text_italic = gtk_check_button_new_with_mnemonic (_("Italic"));
+ gtk_widget_show (listview_selected_text_italic);
+ gtk_table_attach (GTK_TABLE (table2), listview_selected_text_italic, 2, 3, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label75 = gtk_label_new (_("Playlist"));
 gtk_widget_show (label75);
 gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook4), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook4), 2), label75);
 
- label100 = gtk_label_new (_("Colors"));
+ table5 = gtk_table_new (2, 2, FALSE);
+ gtk_widget_show (table5);
+ gtk_container_add (GTK_CONTAINER (notebook4), table5);
+ gtk_container_set_border_width (GTK_CONTAINER (table5), 12);
+ gtk_table_set_row_spacings (GTK_TABLE (table5), 8);
+ gtk_table_set_col_spacings (GTK_TABLE (table5), 8);
+
+ use_visualization_base_color = gtk_check_button_new_with_mnemonic (_("Custom visualization base color"));
+ gtk_widget_show (use_visualization_base_color);
+ gtk_table_attach (GTK_TABLE (table5), use_visualization_base_color, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ visualization_custom_color_button = gtk_color_button_new ();
+ gtk_widget_show (visualization_custom_color_button);
+ gtk_table_attach (GTK_TABLE (table5), visualization_custom_color_button, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ use_visualization_background_color = gtk_check_button_new_with_mnemonic (_("Custom visualization background color"));
+ gtk_widget_show (use_visualization_background_color);
+ gtk_table_attach (GTK_TABLE (table5), use_visualization_background_color, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ visualization_custom_background_color_button = gtk_color_button_new ();
+ gtk_widget_show (visualization_custom_background_color_button);
+ gtk_table_attach (GTK_TABLE (table5), visualization_custom_background_color_button, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label175 = gtk_label_new (_("Visualizations"));
+ gtk_widget_show (label175);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook4), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook4), 3), label175);
+
+ label100 = gtk_label_new (_("Appearance"));
 gtk_widget_show (label100);
 gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 4), label100);
 
+ vbox55 = gtk_vbox_new (FALSE, 8);
+ gtk_widget_show (vbox55);
+ gtk_container_add (GTK_CONTAINER (notebook), vbox55);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox55), 12);
+
+ toggle_medialib_on = gtk_check_button_new_with_mnemonic (_("Enable media library"));
+ gtk_widget_show (toggle_medialib_on);
+ gtk_box_pack_start (GTK_BOX (vbox55), toggle_medialib_on, FALSE, FALSE, 0);
+
+ hseparator7 = gtk_hseparator_new ();
+ gtk_widget_show (hseparator7);
+ gtk_box_pack_start (GTK_BOX (vbox55), hseparator7, FALSE, FALSE, 0);
+
+ label174 = gtk_label_new (_("Add / remove music folders"));
+ gtk_widget_show (label174);
+ gtk_box_pack_start (GTK_BOX (vbox55), label174, FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label174), 0, 0.5);
+
+ vbox56 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox56);
+ gtk_box_pack_start (GTK_BOX (vbox55), vbox56, TRUE, TRUE, 0);
+
+ scrolledwindow17 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwindow17);
+ gtk_box_pack_start (GTK_BOX (vbox56), scrolledwindow17, TRUE, TRUE, 0);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow17), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow17), GTK_SHADOW_IN);
+
+ treeview_medialib_folders = gtk_tree_view_new ();
+ gtk_widget_show (treeview_medialib_folders);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow17), treeview_medialib_folders);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview_medialib_folders), FALSE);
+
+ hbox150 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox150);
+ gtk_box_pack_start (GTK_BOX (vbox56), hbox150, FALSE, TRUE, 0);
+
+ button_medialib_add_folder = gtk_button_new_with_mnemonic ("+");
+ gtk_widget_show (button_medialib_add_folder);
+ gtk_box_pack_start (GTK_BOX (hbox150), button_medialib_add_folder, FALSE, FALSE, 0);
+ gtk_widget_set_size_request (button_medialib_add_folder, 38, -1);
+
+ button_medialib_remove_folder = gtk_button_new_with_mnemonic ("-");
+ gtk_widget_show (button_medialib_remove_folder);
+ gtk_box_pack_start (GTK_BOX (hbox150), button_medialib_remove_folder, FALSE, FALSE, 0);
+ gtk_widget_set_size_request (button_medialib_remove_folder, 38, -1);
+
+ label173 = gtk_label_new (_("Media Library"));
+ gtk_widget_show (label173);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 5), label173);
+
 vbox11 = gtk_vbox_new (FALSE, 8);
 gtk_widget_show (vbox11);
 gtk_container_add (GTK_CONTAINER (notebook), vbox11);
@@ -2390,7 +3034,7 @@
 
 label16 = gtk_label_new (_("Network"));
 gtk_widget_show (label16);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 5), label16);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 6), label16);
 
 vbox36 = gtk_vbox_new (FALSE, 8);
 gtk_widget_show (vbox36);
@@ -2513,7 +3157,7 @@
 
 label132 = gtk_label_new (_("Hotkeys"));
 gtk_widget_show (label132);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 6), label132);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 7), label132);
 
 hpaned1 = gtk_hpaned_new ();
 gtk_widget_show (hpaned1);
@@ -2533,10 +3177,88 @@
 gtk_container_add (GTK_CONTAINER (scrolledwindow2), pref_pluginlist);
 gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (pref_pluginlist), TRUE);
 
+ alignment33 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment33);
+ gtk_paned_pack2 (GTK_PANED (hpaned1), alignment33, TRUE, FALSE);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment33), 0, 0, 16, 0);
+
+ vbox54 = gtk_vbox_new (FALSE, 8);
+ gtk_widget_show (vbox54);
+ gtk_container_add (GTK_CONTAINER (alignment33), vbox54);
+
+ hbox149 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox149);
+ gtk_box_pack_start (GTK_BOX (vbox54), hbox149, FALSE, FALSE, 0);
+
+ fillerlabel1 = gtk_label_new ("");
+ gtk_widget_show (fillerlabel1);
+ gtk_box_pack_start (GTK_BOX (hbox149), fillerlabel1, TRUE, FALSE, 0);
+
+ plugin_tabbtn_hbtnbox = gtk_hbutton_box_new ();
+ gtk_widget_show (plugin_tabbtn_hbtnbox);
+ gtk_box_pack_start (GTK_BOX (hbox149), plugin_tabbtn_hbtnbox, FALSE, FALSE, 0);
+
+ plugin_conf_tab_btn = gtk_radio_button_new_with_mnemonic (NULL, _("Configuration"));
+ gtk_widget_show (plugin_conf_tab_btn);
+ gtk_container_add (GTK_CONTAINER (plugin_tabbtn_hbtnbox), plugin_conf_tab_btn);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (plugin_conf_tab_btn), plugin_conf_tab_btn_group);
+ plugin_conf_tab_btn_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (plugin_conf_tab_btn));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (plugin_conf_tab_btn), TRUE);
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (plugin_conf_tab_btn), FALSE);
+
+ plugin_info_tab_btn = gtk_radio_button_new_with_mnemonic (NULL, _("Info"));
+ gtk_widget_show (plugin_info_tab_btn);
+ gtk_container_add (GTK_CONTAINER (plugin_tabbtn_hbtnbox), plugin_info_tab_btn);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (plugin_info_tab_btn), plugin_conf_tab_btn_group);
+ plugin_conf_tab_btn_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (plugin_info_tab_btn));
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (plugin_info_tab_btn), FALSE);
+
+ plugin_license_tab_btn = gtk_radio_button_new_with_mnemonic (NULL, _("License"));
+ gtk_widget_show (plugin_license_tab_btn);
+ gtk_container_add (GTK_CONTAINER (plugin_tabbtn_hbtnbox), plugin_license_tab_btn);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (plugin_license_tab_btn), plugin_conf_tab_btn_group);
+ plugin_conf_tab_btn_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (plugin_license_tab_btn));
+ gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (plugin_license_tab_btn), FALSE);
+
+ fillerlabel2 = gtk_label_new ("");
+ gtk_widget_show (fillerlabel2);
+ gtk_box_pack_start (GTK_BOX (hbox149), fillerlabel2, TRUE, FALSE, 0);
+
+ plugin_notebook = gtk_notebook_new ();
+ gtk_widget_show (plugin_notebook);
+ gtk_box_pack_start (GTK_BOX (vbox54), plugin_notebook, TRUE, TRUE, 0);
+ gtk_notebook_set_show_border (GTK_NOTEBOOK (plugin_notebook), FALSE);
+
+ plugin_conf_tab_vbox = gtk_vbox_new (FALSE, 8);
+ gtk_widget_show (plugin_conf_tab_vbox);
+ gtk_container_add (GTK_CONTAINER (plugin_notebook), plugin_conf_tab_vbox);
+
+ plug_conf_dlg_scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (plug_conf_dlg_scrolledwindow);
+ gtk_box_pack_start (GTK_BOX (plugin_conf_tab_vbox), plug_conf_dlg_scrolledwindow, TRUE, TRUE, 0);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (plug_conf_dlg_scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+ plug_conf_dlg_viewport = gtk_viewport_new (NULL, NULL);
+ gtk_widget_show (plug_conf_dlg_viewport);
+ gtk_container_add (GTK_CONTAINER (plug_conf_dlg_scrolledwindow), plug_conf_dlg_viewport);
+ gtk_viewport_set_shadow_type (GTK_VIEWPORT (plug_conf_dlg_viewport), GTK_SHADOW_NONE);
+
+ plugin_actions_btnbox = gtk_hbutton_box_new ();
+ gtk_box_pack_start (GTK_BOX (plugin_conf_tab_vbox), plugin_actions_btnbox, FALSE, TRUE, 0);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (plugin_actions_btnbox), GTK_BUTTONBOX_END);
+
+ plugin_conf_reset_btn = gtk_button_new_with_mnemonic (_("Reset to defaults"));
+ gtk_widget_show (plugin_conf_reset_btn);
+ gtk_container_add (GTK_CONTAINER (plugin_actions_btnbox), plugin_conf_reset_btn);
+ gtk_widget_set_can_default(plugin_conf_reset_btn, TRUE);
+
+ label170 = gtk_label_new (_("Configuration"));
+ gtk_widget_show (label170);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (plugin_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (plugin_notebook), 0), label170);
+
 vbox12 = gtk_vbox_new (FALSE, 8);
 gtk_widget_show (vbox12);
- gtk_paned_pack2 (GTK_PANED (hpaned1), vbox12, TRUE, TRUE);
- gtk_container_set_border_width (GTK_CONTAINER (vbox12), 12);
+ gtk_container_add (GTK_CONTAINER (plugin_notebook), vbox12);
 
 hbox103 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox103);
@@ -2568,57 +3290,35 @@
 gtk_widget_show (hbox20);
 gtk_box_pack_start (GTK_BOX (vbox12), hbox20, FALSE, FALSE, 0);
 
- configure_plugin = gtk_button_new ();
- gtk_widget_show (configure_plugin);
- gtk_box_pack_start (GTK_BOX (hbox20), configure_plugin, TRUE, FALSE, 0);
- gtk_widget_set_sensitive (configure_plugin, FALSE);
-
- alignment15 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment15);
- gtk_container_add (GTK_CONTAINER (configure_plugin), alignment15);
-
- hbox56 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox56);
- gtk_container_add (GTK_CONTAINER (alignment15), hbox56);
-
- image394 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image394);
- gtk_box_pack_start (GTK_BOX (hbox56), image394, FALSE, FALSE, 0);
-
- label92 = gtk_label_new_with_mnemonic (_("Configure"));
- gtk_widget_show (label92);
- gtk_box_pack_start (GTK_BOX (hbox56), label92, FALSE, FALSE, 0);
-
- plug_copyright = gtk_button_new ();
- gtk_widget_show (plug_copyright);
- gtk_box_pack_start (GTK_BOX (hbox20), plug_copyright, TRUE, FALSE, 0);
- gtk_widget_set_sensitive (plug_copyright, FALSE);
-
- alignment20 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment20);
- gtk_container_add (GTK_CONTAINER (plug_copyright), alignment20);
-
- hbox88 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox88);
- gtk_container_add (GTK_CONTAINER (alignment20), hbox88);
-
- image521 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image521);
- gtk_box_pack_start (GTK_BOX (hbox88), image521, FALSE, FALSE, 0);
-
- label117 = gtk_label_new_with_mnemonic (_("Copyright"));
- gtk_widget_show (label117);
- gtk_box_pack_start (GTK_BOX (hbox88), label117, FALSE, FALSE, 0);
-
 weblink = create_plugin_weblink ("weblink", "", "", 0, 0);
 gtk_widget_show (weblink);
 gtk_box_pack_start (GTK_BOX (hbox20), weblink, TRUE, FALSE, 0);
 gtk_widget_set_can_focus(weblink, FALSE);
 gtk_widget_set_can_default(weblink, FALSE);
 
+ label171 = gtk_label_new (_("Info"));
+ gtk_widget_show (label171);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (plugin_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (plugin_notebook), 1), label171);
+
+ scrolledwindow16 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwindow16);
+ gtk_container_add (GTK_CONTAINER (plugin_notebook), scrolledwindow16);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow16), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow16), GTK_SHADOW_IN);
+
+ plug_license = gtk_text_view_new ();
+ gtk_widget_show (plug_license);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow16), plug_license);
+ gtk_text_view_set_editable (GTK_TEXT_VIEW (plug_license), FALSE);
+ gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (plug_license), FALSE);
+
+ label172 = gtk_label_new (_("License"));
+ gtk_widget_show (label172);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (plugin_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (plugin_notebook), 2), label172);
+
 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), 7), label3);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 8), label3);
 gtk_misc_set_alignment (GTK_MISC (label3), 0.48, 0.5);
 
 dialog_action_area2 = gtk_dialog_get_action_area (GTK_DIALOG (prefwin));
@@ -2639,17 +3339,38 @@
 g_signal_connect ((gpointer) prefwin, "realize",
 G_CALLBACK (on_prefwin_realize),
 NULL);
+ g_signal_connect ((gpointer) prefwin, "key_press_event",
+ G_CALLBACK (on_prefwin_key_press_event),
+ NULL);
 g_signal_connect ((gpointer) convert8to16, "toggled",
 G_CALLBACK (on_convert8to16_toggled),
 NULL);
 g_signal_connect ((gpointer) convert16to24, "toggled",
 G_CALLBACK (on_convert16to24_toggled),
 NULL);
- g_signal_connect ((gpointer) pref_replaygain_mode, "changed",
- G_CALLBACK (on_pref_replaygain_mode_changed),
+ g_signal_connect ((gpointer) combo_bit_override, "changed",
+ G_CALLBACK (on_combo_bit_override_changed),
+ NULL);
+ g_signal_connect ((gpointer) comboboxentry_direct_sr, "changed",
+ G_CALLBACK (on_comboboxentry_direct_sr_changed),
+ NULL);
+ g_signal_connect ((gpointer) comboboxentry_sr_mult_48, "changed",
+ G_CALLBACK (on_comboboxentry_sr_mult_48_changed),
+ NULL);
+ g_signal_connect ((gpointer) comboboxentry_sr_mult_44, "changed",
+ G_CALLBACK (on_comboboxentry_sr_mult_44_changed),
+ NULL);
+ g_signal_connect ((gpointer) checkbutton_dependent_sr, "toggled",
+ G_CALLBACK (on_checkbutton_dependent_sr_toggled),
+ NULL);
+ g_signal_connect ((gpointer) checkbutton_sr_override, "toggled",
+ G_CALLBACK (on_checkbutton_sr_override_toggled),
 NULL);
- g_signal_connect ((gpointer) pref_replaygain_scale, "clicked",
- G_CALLBACK (on_pref_replaygain_scale_clicked),
+ g_signal_connect ((gpointer) pref_replaygain_source_mode, "changed",
+ G_CALLBACK (on_pref_replaygain_source_mode_changed),
+ NULL);
+ g_signal_connect ((gpointer) pref_replaygain_processing, "changed",
+ G_CALLBACK (on_pref_replaygain_processing_changed),
 NULL);
 g_signal_connect ((gpointer) replaygain_preamp, "value_changed",
 G_CALLBACK (on_replaygain_preamp_value_changed),
@@ -2675,20 +3396,23 @@
 g_signal_connect ((gpointer) reset_autostopalbum, "toggled",
 G_CALLBACK (on_reset_autostopalbum_toggled),
 NULL);
- g_signal_connect ((gpointer) dsp_add, "clicked",
- G_CALLBACK (on_dsp_add_clicked),
+ g_signal_connect ((gpointer) dsp_listview, "row_activated",
+ G_CALLBACK (on_dsp_listview_row_activated),
+ NULL);
+ g_signal_connect ((gpointer) dsp_add_toolbtn, "toggled",
+ G_CALLBACK (on_dsp_add_toolbtn_toggled),
 NULL);
- g_signal_connect ((gpointer) dsp_remove, "clicked",
- G_CALLBACK (on_dsp_remove_clicked),
+ g_signal_connect ((gpointer) dsp_remove_toolbtn, "clicked",
+ G_CALLBACK (on_dsp_remove_toolbtn_clicked),
 NULL);
- g_signal_connect ((gpointer) dsp_configure, "clicked",
- G_CALLBACK (on_dsp_configure_clicked),
+ g_signal_connect ((gpointer) dsp_up_toolbtn, "clicked",
+ G_CALLBACK (on_dsp_toolbtn_up_clicked),
 NULL);
- g_signal_connect ((gpointer) dsp_up, "clicked",
- G_CALLBACK (on_dsp_up_clicked),
+ g_signal_connect ((gpointer) dsp_down_toolbtn, "clicked",
+ G_CALLBACK (on_dsp_toolbtn_down_clicked),
 NULL);
- g_signal_connect ((gpointer) dsp_down, "clicked",
- G_CALLBACK (on_dsp_down_clicked),
+ g_signal_connect ((gpointer) dsp_configure_toolbtn, "clicked",
+ G_CALLBACK (on_dsp_configure_toolbtn_clicked),
 NULL);
 g_signal_connect ((gpointer) dsp_preset, "changed",
 G_CALLBACK (on_dsp_preset_changed),
@@ -2699,12 +3423,18 @@
 g_signal_connect ((gpointer) dsp_preset_load, "clicked",
 G_CALLBACK (on_dsp_preset_load_clicked),
 NULL);
+ g_signal_connect ((gpointer) minimize_on_startup, "clicked",
+ G_CALLBACK (on_minimize_on_startup_clicked),
+ NULL);
 g_signal_connect ((gpointer) pref_close_send_to_tray, "clicked",
 G_CALLBACK (on_pref_close_send_to_tray_clicked),
 NULL);
 g_signal_connect ((gpointer) hide_tray_icon, "toggled",
 G_CALLBACK (on_hide_tray_icon_toggled),
 NULL);
+ g_signal_connect ((gpointer) move_to_trash, "clicked",
+ G_CALLBACK (on_move_to_trash_clicked),
+ NULL);
 g_signal_connect ((gpointer) enable_shift_jis_recoding, "toggled",
 G_CALLBACK (on_enable_shift_jis_recoding_toggled),
 NULL);
@@ -2726,21 +3456,27 @@
 g_signal_connect ((gpointer) gui_plugin, "changed",
 G_CALLBACK (on_gui_plugin_changed),
 NULL);
+ g_signal_connect ((gpointer) display_seltime, "toggled",
+ G_CALLBACK (on_display_seltime_toggled),
+ NULL);
 g_signal_connect ((gpointer) mmb_delete_playlist, "toggled",
 G_CALLBACK (on_mmb_delete_playlist_toggled),
 NULL);
- g_signal_connect ((gpointer) embolden_current, "toggled",
- G_CALLBACK (on_embolden_current_toggled),
- NULL);
 g_signal_connect ((gpointer) hide_delete_from_disk, "toggled",
 G_CALLBACK (on_hide_delete_from_disk_toggled),
 NULL);
+ g_signal_connect ((gpointer) skip_deleted_songs, "toggled",
+ G_CALLBACK (on_skip_deleted_songs_toggled),
+ NULL);
 g_signal_connect ((gpointer) auto_name_playlist_from_folder, "toggled",
 G_CALLBACK (on_auto_name_playlist_from_folder_toggled),
 NULL);
 g_signal_connect ((gpointer) auto_size_columns, "toggled",
 G_CALLBACK (on_auto_size_columns_toggled),
 NULL);
+ g_signal_connect ((gpointer) listview_group_spacing, "value_changed",
+ G_CALLBACK (on_listview_group_spacing_value_changed),
+ NULL);
 g_signal_connect ((gpointer) override_bar_colors, "toggled",
 G_CALLBACK (on_override_bar_colors_toggled),
 NULL);
@@ -2753,42 +3489,105 @@
 g_signal_connect ((gpointer) override_tabstrip_colors, "toggled",
 G_CALLBACK (on_override_tabstrip_colors_toggled),
 NULL);
- g_signal_connect ((gpointer) tabstrip_mid, "color_set",
- G_CALLBACK (on_tabstrip_mid_color_set),
- NULL);
- g_signal_connect ((gpointer) tabstrip_light, "color_set",
- G_CALLBACK (on_tabstrip_light_color_set),
+ g_signal_connect ((gpointer) tabstrip_base, "color_set",
+ G_CALLBACK (on_tabstrip_base_color_set),
 NULL);
 g_signal_connect ((gpointer) tabstrip_dark, "color_set",
 G_CALLBACK (on_tabstrip_dark_color_set),
 NULL);
- g_signal_connect ((gpointer) tabstrip_base, "color_set",
- G_CALLBACK (on_tabstrip_base_color_set),
+ g_signal_connect ((gpointer) tabstrip_light, "color_set",
+ G_CALLBACK (on_tabstrip_light_color_set),
+ NULL);
+ g_signal_connect ((gpointer) tabstrip_mid, "color_set",
+ G_CALLBACK (on_tabstrip_mid_color_set),
 NULL);
 g_signal_connect ((gpointer) tabstrip_text, "color_set",
 G_CALLBACK (on_tabstrip_text_color_set),
 NULL);
- g_signal_connect ((gpointer) override_listview_colors, "toggled",
- G_CALLBACK (on_override_listview_colors_toggled),
+ g_signal_connect ((gpointer) tabstrip_selected_text, "color_set",
+ G_CALLBACK (on_tabstrip_selected_text_color_set),
 NULL);
- g_signal_connect ((gpointer) listview_even_row, "color_set",
- G_CALLBACK (on_listview_even_row_color_set),
+ g_signal_connect ((gpointer) tabstrip_playing_bold, "toggled",
+ G_CALLBACK (on_tabstrip_playing_bold_toggled),
 NULL);
- g_signal_connect ((gpointer) listview_odd_row, "color_set",
- G_CALLBACK (on_listview_odd_row_color_set),
+ g_signal_connect ((gpointer) tabstrip_playing_italic, "toggled",
+ G_CALLBACK (on_tabstrip_playing_italic_toggled),
 NULL);
- g_signal_connect ((gpointer) listview_selected_row, "color_set",
- G_CALLBACK (on_listview_selected_row_color_set),
+ g_signal_connect ((gpointer) tabstrip_selected_bold, "toggled",
+ G_CALLBACK (on_tabstrip_selected_bold_toggled),
+ NULL);
+ g_signal_connect ((gpointer) tabstrip_selected_italic, "toggled",
+ G_CALLBACK (on_tabstrip_selected_italic_toggled),
+ NULL);
+ g_signal_connect ((gpointer) tabstrip_text_font, "font_set",
+ G_CALLBACK (on_tabstrip_text_font_set),
+ NULL);
+ g_signal_connect ((gpointer) tabstrip_playing_text, "color_set",
+ G_CALLBACK (on_tabstrip_playing_text_color_set),
 NULL);
 g_signal_connect ((gpointer) listview_text, "color_set",
 G_CALLBACK (on_listview_text_color_set),
 NULL);
+ g_signal_connect ((gpointer) listview_playing_text, "color_set",
+ G_CALLBACK (on_listview_playing_text_color_set),
+ NULL);
 g_signal_connect ((gpointer) listview_selected_text, "color_set",
 G_CALLBACK (on_listview_selected_text_color_set),
 NULL);
+ g_signal_connect ((gpointer) listview_column_text, "color_set",
+ G_CALLBACK (on_listview_column_text_color_set),
+ NULL);
+ g_signal_connect ((gpointer) listview_column_text_font, "font_set",
+ G_CALLBACK (on_listview_column_text_font_set),
+ NULL);
+ g_signal_connect ((gpointer) listview_group_text, "color_set",
+ G_CALLBACK (on_listview_group_text_color_set),
+ NULL);
+ g_signal_connect ((gpointer) listview_group_text_font, "font_set",
+ G_CALLBACK (on_listview_group_text_font_set),
+ NULL);
+ g_signal_connect ((gpointer) listview_text_font, "font_set",
+ G_CALLBACK (on_listview_text_font_set),
+ NULL);
+ g_signal_connect ((gpointer) listview_odd_row, "color_set",
+ G_CALLBACK (on_listview_odd_row_color_set),
+ NULL);
+ g_signal_connect ((gpointer) listview_selected_row, "color_set",
+ G_CALLBACK (on_listview_selected_row_color_set),
+ NULL);
 g_signal_connect ((gpointer) listview_cursor, "color_set",
 G_CALLBACK (on_listview_cursor_color_set),
 NULL);
+ g_signal_connect ((gpointer) listview_even_row, "color_set",
+ G_CALLBACK (on_listview_even_row_color_set),
+ NULL);
+ g_signal_connect ((gpointer) override_listview_colors, "toggled",
+ G_CALLBACK (on_override_listview_colors_toggled),
+ NULL);
+ g_signal_connect ((gpointer) listview_playing_text_bold, "toggled",
+ G_CALLBACK (on_listview_playing_text_bold_toggled),
+ NULL);
+ g_signal_connect ((gpointer) listview_selected_text_bold, "toggled",
+ G_CALLBACK (on_listview_selected_text_bold_toggled),
+ NULL);
+ g_signal_connect ((gpointer) listview_playing_text_italic, "toggled",
+ G_CALLBACK (on_listview_playing_text_italic_toggled),
+ NULL);
+ g_signal_connect ((gpointer) listview_selected_text_italic, "toggled",
+ G_CALLBACK (on_listview_selected_text_italic_toggled),
+ NULL);
+ g_signal_connect ((gpointer) use_visualization_base_color, "toggled",
+ G_CALLBACK (on_use_visualization_base_color_toggled),
+ NULL);
+ g_signal_connect ((gpointer) visualization_custom_color_button, "color_set",
+ G_CALLBACK (on_visualization_custom_color_button_color_set),
+ NULL);
+ g_signal_connect ((gpointer) use_visualization_background_color, "toggled",
+ G_CALLBACK (on_use_visualization_background_color_toggled),
+ NULL);
+ g_signal_connect ((gpointer) visualization_custom_background_color_button, "color_set",
+ G_CALLBACK (on_visualization_custom_background_color_button_color_set),
+ NULL);
 g_signal_connect ((gpointer) pref_network_enableproxy, "clicked",
 G_CALLBACK (on_pref_network_enableproxy_clicked),
 NULL);
@@ -2846,11 +3645,26 @@
 g_signal_connect ((gpointer) pref_pluginlist, "cursor_changed",
 G_CALLBACK (on_pref_pluginlist_cursor_changed),
 NULL);
- g_signal_connect ((gpointer) configure_plugin, "clicked",
- G_CALLBACK (on_configure_plugin_clicked),
+ g_signal_connect ((gpointer) pref_pluginlist, "row_activated",
+ G_CALLBACK (on_pref_pluginlist_row_activated),
+ NULL);
+ g_signal_connect ((gpointer) pref_pluginlist, "button_press_event",
+ G_CALLBACK (on_pref_pluginlist_button_press_event),
+ NULL);
+ g_signal_connect ((gpointer) plugin_conf_tab_btn, "clicked",
+ G_CALLBACK (on_plugin_conf_tab_btn_clicked),
+ NULL);
+ g_signal_connect ((gpointer) plugin_info_tab_btn, "clicked",
+ G_CALLBACK (on_plugin_info_tab_btn_clicked),
+ NULL);
+ g_signal_connect ((gpointer) plugin_license_tab_btn, "clicked",
+ G_CALLBACK (on_plugin_license_tab_btn_clicked),
 NULL);
- g_signal_connect ((gpointer) plug_copyright, "clicked",
- G_CALLBACK (on_plug_copyright_clicked),
+ g_signal_connect ((gpointer) plugin_notebook, "switch_page",
+ G_CALLBACK (on_plugin_notebook_switch_page),
+ NULL);
+ g_signal_connect ((gpointer) plugin_conf_reset_btn, "clicked",
+ G_CALLBACK (on_plugin_conf_reset_btn_clicked),
 NULL);
 
 /* Store pointers to all widgets, for use by lookup_widget(). */
@@ -2866,12 +3680,37 @@
 GLADE_HOOKUP_OBJECT (prefwin, pref_soundcard, "pref_soundcard");
 GLADE_HOOKUP_OBJECT (prefwin, convert8to16, "convert8to16");
 GLADE_HOOKUP_OBJECT (prefwin, convert16to24, "convert16to24");
+ GLADE_HOOKUP_OBJECT (prefwin, hbox151, "hbox151");
+ GLADE_HOOKUP_OBJECT (prefwin, label_bit_override, "label_bit_override");
+ GLADE_HOOKUP_OBJECT (prefwin, combo_bit_override, "combo_bit_override");
+ GLADE_HOOKUP_OBJECT (prefwin, frame15, "frame15");
+ GLADE_HOOKUP_OBJECT (prefwin, alignment31, "alignment31");
+ GLADE_HOOKUP_OBJECT (prefwin, vbox52, "vbox52");
+ GLADE_HOOKUP_OBJECT (prefwin, hbox145, "hbox145");
+ GLADE_HOOKUP_OBJECT (prefwin, label_direct_sr, "label_direct_sr");
+ GLADE_HOOKUP_OBJECT (prefwin, comboboxentry_direct_sr, "comboboxentry_direct_sr");
+ GLADE_HOOKUP_OBJECT (prefwin, frame16, "frame16");
+ GLADE_HOOKUP_OBJECT (prefwin, alignment32, "alignment32");
+ GLADE_HOOKUP_OBJECT (prefwin, vbox53, "vbox53");
+ GLADE_HOOKUP_OBJECT (prefwin, hbox147, "hbox147");
+ GLADE_HOOKUP_OBJECT (prefwin, label_sr_mult_48, "label_sr_mult_48");
+ GLADE_HOOKUP_OBJECT (prefwin, comboboxentry_sr_mult_48, "comboboxentry_sr_mult_48");
+ GLADE_HOOKUP_OBJECT (prefwin, hbox148, "hbox148");
+ GLADE_HOOKUP_OBJECT (prefwin, label_sr_mult_44, "label_sr_mult_44");
+ GLADE_HOOKUP_OBJECT (prefwin, comboboxentry_sr_mult_44, "comboboxentry_sr_mult_44");
+ GLADE_HOOKUP_OBJECT (prefwin, checkbutton_dependent_sr, "checkbutton_dependent_sr");
+ GLADE_HOOKUP_OBJECT (prefwin, checkbutton_sr_override, "checkbutton_sr_override");
 GLADE_HOOKUP_OBJECT (prefwin, Sound, "Sound");
 GLADE_HOOKUP_OBJECT (prefwin, vbox8, "vbox8");
+ GLADE_HOOKUP_OBJECT (prefwin, frame14, "frame14");
+ GLADE_HOOKUP_OBJECT (prefwin, alignment30, "alignment30");
+ GLADE_HOOKUP_OBJECT (prefwin, vbox48, "vbox48");
 GLADE_HOOKUP_OBJECT (prefwin, hbox10, "hbox10");
 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, pref_replaygain_source_mode, "pref_replaygain_source_mode");
+ GLADE_HOOKUP_OBJECT (prefwin, hbox139, "hbox139");
+ GLADE_HOOKUP_OBJECT (prefwin, label163, "label163");
+ GLADE_HOOKUP_OBJECT (prefwin, pref_replaygain_processing, "pref_replaygain_processing");
 GLADE_HOOKUP_OBJECT (prefwin, table1, "table1");
 GLADE_HOOKUP_OBJECT (prefwin, hbox100, "hbox100");
 GLADE_HOOKUP_OBJECT (prefwin, label125, "label125");
@@ -2883,6 +3722,7 @@
 GLADE_HOOKUP_OBJECT (prefwin, label125a, "label125a");
 GLADE_HOOKUP_OBJECT (prefwin, global_preamp, "global_preamp");
 GLADE_HOOKUP_OBJECT (prefwin, label126a, "label126a");
+ GLADE_HOOKUP_OBJECT (prefwin, label162, "label162");
 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");
@@ -2892,16 +3732,18 @@
 GLADE_HOOKUP_OBJECT (prefwin, reset_autostopalbum, "reset_autostopalbum");
 GLADE_HOOKUP_OBJECT (prefwin, label39, "label39");
 GLADE_HOOKUP_OBJECT (prefwin, vbox29, "vbox29");
- GLADE_HOOKUP_OBJECT (prefwin, hbox80, "hbox80");
- GLADE_HOOKUP_OBJECT (prefwin, dsp_add, "dsp_add");
- GLADE_HOOKUP_OBJECT (prefwin, dsp_remove, "dsp_remove");
- GLADE_HOOKUP_OBJECT (prefwin, dsp_configure, "dsp_configure");
+ GLADE_HOOKUP_OBJECT (prefwin, vbox58, "vbox58");
 GLADE_HOOKUP_OBJECT (prefwin, hbox81, "hbox81");
 GLADE_HOOKUP_OBJECT (prefwin, scrolledwindow7, "scrolledwindow7");
 GLADE_HOOKUP_OBJECT (prefwin, dsp_listview, "dsp_listview");
- GLADE_HOOKUP_OBJECT (prefwin, vbox30, "vbox30");
- GLADE_HOOKUP_OBJECT (prefwin, dsp_up, "dsp_up");
- GLADE_HOOKUP_OBJECT (prefwin, dsp_down, "dsp_down");
+ GLADE_HOOKUP_OBJECT (prefwin, dsp_toolbar, "dsp_toolbar");
+ GLADE_HOOKUP_OBJECT (prefwin, dsp_add_toolbtn, "dsp_add_toolbtn");
+ GLADE_HOOKUP_OBJECT (prefwin, dsp_remove_toolbtn, "dsp_remove_toolbtn");
+ GLADE_HOOKUP_OBJECT (prefwin, dsp_up_toolbtn, "dsp_up_toolbtn");
+ GLADE_HOOKUP_OBJECT (prefwin, dsp_down_toolbtn, "dsp_down_toolbtn");
+ GLADE_HOOKUP_OBJECT (prefwin, dsp_configure_toolbtn, "dsp_configure_toolbtn");
+ GLADE_HOOKUP_OBJECT (prefwin, separatortoolitem1, "separatortoolitem1");
+ GLADE_HOOKUP_OBJECT (prefwin, toolitem2, "toolitem2");
 GLADE_HOOKUP_OBJECT (prefwin, hbox86, "hbox86");
 GLADE_HOOKUP_OBJECT (prefwin, label114, "label114");
 GLADE_HOOKUP_OBJECT (prefwin, dsp_preset, "dsp_preset");
@@ -2910,8 +3752,10 @@
 GLADE_HOOKUP_OBJECT (prefwin, label110, "label110");
 GLADE_HOOKUP_OBJECT (prefwin, notebook5, "notebook5");
 GLADE_HOOKUP_OBJECT (prefwin, vbox9, "vbox9");
+ GLADE_HOOKUP_OBJECT (prefwin, minimize_on_startup, "minimize_on_startup");
 GLADE_HOOKUP_OBJECT (prefwin, pref_close_send_to_tray, "pref_close_send_to_tray");
 GLADE_HOOKUP_OBJECT (prefwin, hide_tray_icon, "hide_tray_icon");
+ GLADE_HOOKUP_OBJECT (prefwin, move_to_trash, "move_to_trash");
 GLADE_HOOKUP_OBJECT (prefwin, enable_shift_jis_recoding, "enable_shift_jis_recoding");
 GLADE_HOOKUP_OBJECT (prefwin, enable_cp1251_recoding, "enable_cp1251_recoding");
 GLADE_HOOKUP_OBJECT (prefwin, enable_cp936_recoding, "enable_cp936_recoding");
@@ -2927,13 +3771,18 @@
 GLADE_HOOKUP_OBJECT (prefwin, hbox101, "hbox101");
 GLADE_HOOKUP_OBJECT (prefwin, label128, "label128");
 GLADE_HOOKUP_OBJECT (prefwin, gui_plugin, "gui_plugin");
+ GLADE_HOOKUP_OBJECT (prefwin, display_seltime, "display_seltime");
 GLADE_HOOKUP_OBJECT (prefwin, label147, "label147");
 GLADE_HOOKUP_OBJECT (prefwin, vbox44, "vbox44");
 GLADE_HOOKUP_OBJECT (prefwin, mmb_delete_playlist, "mmb_delete_playlist");
- GLADE_HOOKUP_OBJECT (prefwin, embolden_current, "embolden_current");
 GLADE_HOOKUP_OBJECT (prefwin, hide_delete_from_disk, "hide_delete_from_disk");
+ GLADE_HOOKUP_OBJECT (prefwin, skip_deleted_songs, "skip_deleted_songs");
 GLADE_HOOKUP_OBJECT (prefwin, auto_name_playlist_from_folder, "auto_name_playlist_from_folder");
 GLADE_HOOKUP_OBJECT (prefwin, auto_size_columns, "auto_size_columns");
+ GLADE_HOOKUP_OBJECT (prefwin, hbox141, "hbox141");
+ GLADE_HOOKUP_OBJECT (prefwin, label164, "label164");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_group_spacing, "listview_group_spacing");
+ GLADE_HOOKUP_OBJECT (prefwin, label165, "label165");
 GLADE_HOOKUP_OBJECT (prefwin, label148, "label148");
 GLADE_HOOKUP_OBJECT (prefwin, label2, "label2");
 GLADE_HOOKUP_OBJECT (prefwin, notebook4, "notebook4");
@@ -2948,34 +3797,88 @@
 GLADE_HOOKUP_OBJECT (prefwin, vbox22, "vbox22");
 GLADE_HOOKUP_OBJECT (prefwin, override_tabstrip_colors, "override_tabstrip_colors");
 GLADE_HOOKUP_OBJECT (prefwin, tabstrip_colors_group, "tabstrip_colors_group");
- GLADE_HOOKUP_OBJECT (prefwin, label45, "label45");
- GLADE_HOOKUP_OBJECT (prefwin, label46, "label46");
- GLADE_HOOKUP_OBJECT (prefwin, label44, "label44");
- GLADE_HOOKUP_OBJECT (prefwin, tabstrip_mid, "tabstrip_mid");
- GLADE_HOOKUP_OBJECT (prefwin, tabstrip_light, "tabstrip_light");
- GLADE_HOOKUP_OBJECT (prefwin, tabstrip_dark, "tabstrip_dark");
 GLADE_HOOKUP_OBJECT (prefwin, tabstrip_base, "tabstrip_base");
 GLADE_HOOKUP_OBJECT (prefwin, label76, "label76");
+ GLADE_HOOKUP_OBJECT (prefwin, tabstrip_dark, "tabstrip_dark");
+ GLADE_HOOKUP_OBJECT (prefwin, label44, "label44");
+ GLADE_HOOKUP_OBJECT (prefwin, tabstrip_light, "tabstrip_light");
+ GLADE_HOOKUP_OBJECT (prefwin, label46, "label46");
+ GLADE_HOOKUP_OBJECT (prefwin, tabstrip_mid, "tabstrip_mid");
+ GLADE_HOOKUP_OBJECT (prefwin, label45, "label45");
 GLADE_HOOKUP_OBJECT (prefwin, label127, "label127");
 GLADE_HOOKUP_OBJECT (prefwin, tabstrip_text, "tabstrip_text");
+ GLADE_HOOKUP_OBJECT (prefwin, tabstrip_selected_text, "tabstrip_selected_text");
+ GLADE_HOOKUP_OBJECT (prefwin, hbox136, "hbox136");
+ GLADE_HOOKUP_OBJECT (prefwin, tabstrip_playing_bold, "tabstrip_playing_bold");
+ GLADE_HOOKUP_OBJECT (prefwin, tabstrip_playing_italic, "tabstrip_playing_italic");
+ GLADE_HOOKUP_OBJECT (prefwin, hbox137, "hbox137");
+ GLADE_HOOKUP_OBJECT (prefwin, tabstrip_selected_bold, "tabstrip_selected_bold");
+ GLADE_HOOKUP_OBJECT (prefwin, tabstrip_selected_italic, "tabstrip_selected_italic");
+ GLADE_HOOKUP_OBJECT (prefwin, tabstrip_text_font, "tabstrip_text_font");
+ GLADE_HOOKUP_OBJECT (prefwin, label152, "label152");
+ GLADE_HOOKUP_OBJECT (prefwin, label153, "label153");
+ GLADE_HOOKUP_OBJECT (prefwin, tabstrip_playing_text, "tabstrip_playing_text");
 GLADE_HOOKUP_OBJECT (prefwin, label74, "label74");
 GLADE_HOOKUP_OBJECT (prefwin, vbox23, "vbox23");
- GLADE_HOOKUP_OBJECT (prefwin, override_listview_colors, "override_listview_colors");
+ GLADE_HOOKUP_OBJECT (prefwin, frame11, "frame11");
 GLADE_HOOKUP_OBJECT (prefwin, listview_colors_group, "listview_colors_group");
+ GLADE_HOOKUP_OBJECT (prefwin, frame12, "frame12");
+ GLADE_HOOKUP_OBJECT (prefwin, alignment28, "alignment28");
+ GLADE_HOOKUP_OBJECT (prefwin, table3, "table3");
+ GLADE_HOOKUP_OBJECT (prefwin, label77, "label77");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_text, "listview_text");
+ GLADE_HOOKUP_OBJECT (prefwin, label150, "label150");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_playing_text, "listview_playing_text");
+ GLADE_HOOKUP_OBJECT (prefwin, label61, "label61");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_selected_text, "listview_selected_text");
+ GLADE_HOOKUP_OBJECT (prefwin, label154, "label154");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_column_text, "listview_column_text");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_column_text_font, "listview_column_text_font");
+ GLADE_HOOKUP_OBJECT (prefwin, label149, "label149");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_group_text, "listview_group_text");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_group_text_font, "listview_group_text_font");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_text_font, "listview_text_font");
+ GLADE_HOOKUP_OBJECT (prefwin, label158, "label158");
+ GLADE_HOOKUP_OBJECT (prefwin, vseparator1, "vseparator1");
+ GLADE_HOOKUP_OBJECT (prefwin, frame13, "frame13");
+ GLADE_HOOKUP_OBJECT (prefwin, alignment29, "alignment29");
+ GLADE_HOOKUP_OBJECT (prefwin, table4, "table4");
 GLADE_HOOKUP_OBJECT (prefwin, label58, "label58");
 GLADE_HOOKUP_OBJECT (prefwin, label59, "label59");
- GLADE_HOOKUP_OBJECT (prefwin, listview_even_row, "listview_even_row");
 GLADE_HOOKUP_OBJECT (prefwin, listview_odd_row, "listview_odd_row");
- GLADE_HOOKUP_OBJECT (prefwin, label77, "label77");
 GLADE_HOOKUP_OBJECT (prefwin, label78, "label78");
 GLADE_HOOKUP_OBJECT (prefwin, listview_selected_row, "listview_selected_row");
- GLADE_HOOKUP_OBJECT (prefwin, listview_text, "listview_text");
- GLADE_HOOKUP_OBJECT (prefwin, label61, "label61");
- GLADE_HOOKUP_OBJECT (prefwin, listview_selected_text, "listview_selected_text");
 GLADE_HOOKUP_OBJECT (prefwin, label62, "label62");
 GLADE_HOOKUP_OBJECT (prefwin, listview_cursor, "listview_cursor");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_even_row, "listview_even_row");
+ GLADE_HOOKUP_OBJECT (prefwin, label159, "label159");
+ GLADE_HOOKUP_OBJECT (prefwin, override_listview_colors, "override_listview_colors");
+ GLADE_HOOKUP_OBJECT (prefwin, table2, "table2");
+ GLADE_HOOKUP_OBJECT (prefwin, label155, "label155");
+ GLADE_HOOKUP_OBJECT (prefwin, label156, "label156");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_playing_text_bold, "listview_playing_text_bold");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_selected_text_bold, "listview_selected_text_bold");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_playing_text_italic, "listview_playing_text_italic");
+ GLADE_HOOKUP_OBJECT (prefwin, listview_selected_text_italic, "listview_selected_text_italic");
 GLADE_HOOKUP_OBJECT (prefwin, label75, "label75");
+ GLADE_HOOKUP_OBJECT (prefwin, table5, "table5");
+ GLADE_HOOKUP_OBJECT (prefwin, use_visualization_base_color, "use_visualization_base_color");
+ GLADE_HOOKUP_OBJECT (prefwin, visualization_custom_color_button, "visualization_custom_color_button");
+ GLADE_HOOKUP_OBJECT (prefwin, use_visualization_background_color, "use_visualization_background_color");
+ GLADE_HOOKUP_OBJECT (prefwin, visualization_custom_background_color_button, "visualization_custom_background_color_button");
+ GLADE_HOOKUP_OBJECT (prefwin, label175, "label175");
 GLADE_HOOKUP_OBJECT (prefwin, label100, "label100");
+ GLADE_HOOKUP_OBJECT (prefwin, vbox55, "vbox55");
+ GLADE_HOOKUP_OBJECT (prefwin, toggle_medialib_on, "toggle_medialib_on");
+ GLADE_HOOKUP_OBJECT (prefwin, hseparator7, "hseparator7");
+ GLADE_HOOKUP_OBJECT (prefwin, label174, "label174");
+ GLADE_HOOKUP_OBJECT (prefwin, vbox56, "vbox56");
+ GLADE_HOOKUP_OBJECT (prefwin, scrolledwindow17, "scrolledwindow17");
+ GLADE_HOOKUP_OBJECT (prefwin, treeview_medialib_folders, "treeview_medialib_folders");
+ GLADE_HOOKUP_OBJECT (prefwin, hbox150, "hbox150");
+ GLADE_HOOKUP_OBJECT (prefwin, button_medialib_add_folder, "button_medialib_add_folder");
+ GLADE_HOOKUP_OBJECT (prefwin, button_medialib_remove_folder, "button_medialib_remove_folder");
+ GLADE_HOOKUP_OBJECT (prefwin, label173, "label173");
 GLADE_HOOKUP_OBJECT (prefwin, vbox11, "vbox11");
 GLADE_HOOKUP_OBJECT (prefwin, pref_network_enableproxy, "pref_network_enableproxy");
 GLADE_HOOKUP_OBJECT (prefwin, hbox13, "hbox13");
@@ -3030,6 +3933,22 @@
 GLADE_HOOKUP_OBJECT (prefwin, hpaned1, "hpaned1");
 GLADE_HOOKUP_OBJECT (prefwin, scrolledwindow2, "scrolledwindow2");
 GLADE_HOOKUP_OBJECT (prefwin, pref_pluginlist, "pref_pluginlist");
+ GLADE_HOOKUP_OBJECT (prefwin, alignment33, "alignment33");
+ GLADE_HOOKUP_OBJECT (prefwin, vbox54, "vbox54");
+ GLADE_HOOKUP_OBJECT (prefwin, hbox149, "hbox149");
+ GLADE_HOOKUP_OBJECT (prefwin, fillerlabel1, "fillerlabel1");
+ GLADE_HOOKUP_OBJECT (prefwin, plugin_tabbtn_hbtnbox, "plugin_tabbtn_hbtnbox");
+ GLADE_HOOKUP_OBJECT (prefwin, plugin_conf_tab_btn, "plugin_conf_tab_btn");
+ GLADE_HOOKUP_OBJECT (prefwin, plugin_info_tab_btn, "plugin_info_tab_btn");
+ GLADE_HOOKUP_OBJECT (prefwin, plugin_license_tab_btn, "plugin_license_tab_btn");
+ GLADE_HOOKUP_OBJECT (prefwin, fillerlabel2, "fillerlabel2");
+ GLADE_HOOKUP_OBJECT (prefwin, plugin_notebook, "plugin_notebook");
+ GLADE_HOOKUP_OBJECT (prefwin, plugin_conf_tab_vbox, "plugin_conf_tab_vbox");
+ GLADE_HOOKUP_OBJECT (prefwin, plug_conf_dlg_scrolledwindow, "plug_conf_dlg_scrolledwindow");
+ GLADE_HOOKUP_OBJECT (prefwin, plug_conf_dlg_viewport, "plug_conf_dlg_viewport");
+ GLADE_HOOKUP_OBJECT (prefwin, plugin_actions_btnbox, "plugin_actions_btnbox");
+ GLADE_HOOKUP_OBJECT (prefwin, plugin_conf_reset_btn, "plugin_conf_reset_btn");
+ GLADE_HOOKUP_OBJECT (prefwin, label170, "label170");
 GLADE_HOOKUP_OBJECT (prefwin, vbox12, "vbox12");
 GLADE_HOOKUP_OBJECT (prefwin, hbox103, "hbox103");
 GLADE_HOOKUP_OBJECT (prefwin, label130, "label130");
@@ -3037,17 +3956,11 @@
 GLADE_HOOKUP_OBJECT (prefwin, scrolledwindow8, "scrolledwindow8");
 GLADE_HOOKUP_OBJECT (prefwin, plug_description, "plug_description");
 GLADE_HOOKUP_OBJECT (prefwin, hbox20, "hbox20");
- GLADE_HOOKUP_OBJECT (prefwin, configure_plugin, "configure_plugin");
- GLADE_HOOKUP_OBJECT (prefwin, alignment15, "alignment15");
- GLADE_HOOKUP_OBJECT (prefwin, hbox56, "hbox56");
- GLADE_HOOKUP_OBJECT (prefwin, image394, "image394");
- GLADE_HOOKUP_OBJECT (prefwin, label92, "label92");
- GLADE_HOOKUP_OBJECT (prefwin, plug_copyright, "plug_copyright");
- GLADE_HOOKUP_OBJECT (prefwin, alignment20, "alignment20");
- GLADE_HOOKUP_OBJECT (prefwin, hbox88, "hbox88");
- GLADE_HOOKUP_OBJECT (prefwin, image521, "image521");
- GLADE_HOOKUP_OBJECT (prefwin, label117, "label117");
 GLADE_HOOKUP_OBJECT (prefwin, weblink, "weblink");
+ GLADE_HOOKUP_OBJECT (prefwin, label171, "label171");
+ GLADE_HOOKUP_OBJECT (prefwin, scrolledwindow16, "scrolledwindow16");
+ GLADE_HOOKUP_OBJECT (prefwin, plug_license, "plug_license");
+ GLADE_HOOKUP_OBJECT (prefwin, label172, "label172");
 GLADE_HOOKUP_OBJECT (prefwin, label3, "label3");
 GLADE_HOOKUP_OBJECT_NO_REF (prefwin, dialog_action_area2, "dialog_action_area2");
 GLADE_HOOKUP_OBJECT (prefwin, closebutton1, "closebutton1");
@@ -3078,6 +3991,7 @@
 
 entrydialog = gtk_dialog_new ();
 gtk_window_set_title (GTK_WINDOW (entrydialog), "EntryDialog");
+ gtk_window_set_position (GTK_WINDOW (entrydialog), GTK_WIN_POS_CENTER_ON_PARENT);
 gtk_window_set_destroy_with_parent (GTK_WINDOW (entrydialog), TRUE);
 gtk_window_set_type_hint (GTK_WINDOW (entrydialog), GDK_WINDOW_TYPE_HINT_DIALOG);
 
@@ -3360,7 +4274,7 @@
 
 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_box_pack_start (GTK_BOX (hbox75), custom1, FALSE, TRUE, 0);
 gtk_widget_set_can_focus(custom1, FALSE);
 gtk_widget_set_can_default(custom1, FALSE);
 
@@ -3439,102 +4353,114 @@
 {
 GtkWidget *sortbydlg;
 GtkWidget *dialog_vbox8;
- GtkWidget *vbox28;
- GtkWidget *hbox76;
- GtkWidget *label108;
- GtkWidget *hbox77;
+ GtkWidget *sortvbox;
+ GtkWidget *sortframe;
+ GtkWidget *sortfmtalignment;
 GtkWidget *sortfmt;
- GtkWidget *custom3;
- GtkWidget *hbox78;
- GtkWidget *label109;
+ GtkWidget *label188;
+ GtkWidget *sortbtnbox;
+ GtkWidget *sorthelpalignment;
+ GtkWidget *sorthelplink;
 GtkWidget *sortorder;
+ GtkWidget *sortcancel;
+ GtkWidget *sortok;
 GtkWidget *dialog_action_area7;
- GtkWidget *cancelbutton5;
- GtkWidget *okbutton5;
 
 sortbydlg = gtk_dialog_new ();
 gtk_window_set_title (GTK_WINDOW (sortbydlg), _("Sort by ..."));
 gtk_window_set_modal (GTK_WINDOW (sortbydlg), TRUE);
+ gtk_window_set_default_size (GTK_WINDOW (sortbydlg), 540, 180);
 gtk_window_set_type_hint (GTK_WINDOW (sortbydlg), GDK_WINDOW_TYPE_HINT_DIALOG);
 
 dialog_vbox8 = gtk_dialog_get_content_area (GTK_DIALOG (sortbydlg));
 gtk_widget_show (dialog_vbox8);
 
- vbox28 = gtk_vbox_new (FALSE, 8);
- gtk_widget_show (vbox28);
- gtk_box_pack_start (GTK_BOX (dialog_vbox8), vbox28, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (vbox28), 12);
-
- hbox76 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox76);
- gtk_box_pack_start (GTK_BOX (vbox28), hbox76, FALSE, TRUE, 0);
-
- label108 = gtk_label_new (_("Format"));
- gtk_widget_show (label108);
- gtk_box_pack_start (GTK_BOX (hbox76), label108, FALSE, FALSE, 0);
-
- hbox77 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox77);
- gtk_box_pack_start (GTK_BOX (hbox76), hbox77, TRUE, TRUE, 0);
+ sortvbox = gtk_vbox_new (FALSE, 8);
+ gtk_widget_show (sortvbox);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox8), sortvbox, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (sortvbox), 12);
+
+ sortframe = gtk_frame_new (NULL);
+ gtk_widget_show (sortframe);
+ gtk_box_pack_start (GTK_BOX (sortvbox), sortframe, TRUE, TRUE, 0);
+ gtk_frame_set_label_align (GTK_FRAME (sortframe), 0.02, 0.5);
+ gtk_frame_set_shadow_type (GTK_FRAME (sortframe), GTK_SHADOW_IN);
+
+ sortfmtalignment = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (sortfmtalignment);
+ gtk_container_add (GTK_CONTAINER (sortframe), sortfmtalignment);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (sortfmtalignment), 8, 8, 8, 12);
 
- sortfmt = gtk_entry_new ();
+ sortfmt = gtk_text_view_new ();
 gtk_widget_show (sortfmt);
- gtk_box_pack_start (GTK_BOX (hbox77), sortfmt, TRUE, TRUE, 0);
- gtk_entry_set_invisible_char (GTK_ENTRY (sortfmt), 9679);
-
- 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_set_can_focus(custom3, FALSE);
- gtk_widget_set_can_default(custom3, FALSE);
-
- hbox78 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox78);
- gtk_box_pack_start (GTK_BOX (vbox28), hbox78, TRUE, TRUE, 0);
-
- label109 = gtk_label_new (_("Order"));
- gtk_widget_show (label109);
- gtk_box_pack_start (GTK_BOX (hbox78), label109, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (sortfmtalignment), sortfmt);
+ gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (sortfmt), FALSE);
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (sortfmt), GTK_WRAP_WORD);
+
+ label188 = gtk_label_new (_("Format"));
+ gtk_widget_show (label188);
+ gtk_frame_set_label_widget (GTK_FRAME (sortframe), label188);
+ gtk_label_set_use_markup (GTK_LABEL (label188), TRUE);
+
+ sortbtnbox = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (sortbtnbox);
+ gtk_box_pack_start (GTK_BOX (sortvbox), sortbtnbox, FALSE, FALSE, 0);
+
+ sorthelpalignment = gtk_alignment_new (0, 0.5, 0, 1);
+ gtk_widget_show (sorthelpalignment);
+ gtk_box_pack_start (GTK_BOX (sortbtnbox), sorthelpalignment, TRUE, TRUE, 8);
+
+ sorthelplink = title_formatting_help_link_create ("sorthelplink", "", "", 0, 0);
+ gtk_widget_show (sorthelplink);
+ gtk_container_add (GTK_CONTAINER (sorthelpalignment), sorthelplink);
+ gtk_widget_set_can_focus(sorthelplink, FALSE);
+ gtk_widget_set_can_default(sorthelplink, FALSE);
 
 sortorder = gtk_combo_box_text_new ();
 gtk_widget_show (sortorder);
- gtk_box_pack_start (GTK_BOX (hbox78), sortorder, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (sortbtnbox), sortorder, FALSE, FALSE, 8);
 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sortorder), _("Ascending"));
 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sortorder), _("Descending"));
 
+ sortcancel = gtk_button_new_from_stock ("gtk-cancel");
+ gtk_widget_show (sortcancel);
+ gtk_box_pack_start (GTK_BOX (sortbtnbox), sortcancel, FALSE, FALSE, 8);
+ gtk_widget_set_can_default(sortcancel, TRUE);
+
+ sortok = gtk_button_new_from_stock ("gtk-ok");
+ gtk_widget_show (sortok);
+ gtk_box_pack_start (GTK_BOX (sortbtnbox), sortok, FALSE, FALSE, 8);
+ gtk_widget_set_can_default(sortok, TRUE);
+
 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_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_can_default(okbutton5, TRUE);
-
- g_signal_connect ((gpointer) sortfmt, "activate",
- G_CALLBACK (on_sortfmt_activate),
+ g_signal_connect ((gpointer) sortfmt, "show",
+ G_CALLBACK (on_sortfmt_show),
+ NULL);
+ g_signal_connect ((gpointer) sortcancel, "clicked",
+ G_CALLBACK (on_sortcancel_clicked),
+ NULL);
+ g_signal_connect ((gpointer) sortok, "clicked",
+ G_CALLBACK (on_sortok_clicked),
 NULL);
 
 /* Store pointers to all widgets, for use by lookup_widget(). */
 GLADE_HOOKUP_OBJECT_NO_REF (sortbydlg, sortbydlg, "sortbydlg");
 GLADE_HOOKUP_OBJECT_NO_REF (sortbydlg, dialog_vbox8, "dialog_vbox8");
- GLADE_HOOKUP_OBJECT (sortbydlg, vbox28, "vbox28");
- GLADE_HOOKUP_OBJECT (sortbydlg, hbox76, "hbox76");
- GLADE_HOOKUP_OBJECT (sortbydlg, label108, "label108");
- GLADE_HOOKUP_OBJECT (sortbydlg, hbox77, "hbox77");
+ GLADE_HOOKUP_OBJECT (sortbydlg, sortvbox, "sortvbox");
+ GLADE_HOOKUP_OBJECT (sortbydlg, sortframe, "sortframe");
+ GLADE_HOOKUP_OBJECT (sortbydlg, sortfmtalignment, "sortfmtalignment");
 GLADE_HOOKUP_OBJECT (sortbydlg, sortfmt, "sortfmt");
- GLADE_HOOKUP_OBJECT (sortbydlg, custom3, "custom3");
- GLADE_HOOKUP_OBJECT (sortbydlg, hbox78, "hbox78");
- GLADE_HOOKUP_OBJECT (sortbydlg, label109, "label109");
+ GLADE_HOOKUP_OBJECT (sortbydlg, label188, "label188");
+ GLADE_HOOKUP_OBJECT (sortbydlg, sortbtnbox, "sortbtnbox");
+ GLADE_HOOKUP_OBJECT (sortbydlg, sorthelpalignment, "sorthelpalignment");
+ GLADE_HOOKUP_OBJECT (sortbydlg, sorthelplink, "sorthelplink");
 GLADE_HOOKUP_OBJECT (sortbydlg, sortorder, "sortorder");
+ GLADE_HOOKUP_OBJECT (sortbydlg, sortcancel, "sortcancel");
+ GLADE_HOOKUP_OBJECT (sortbydlg, sortok, "sortok");
 GLADE_HOOKUP_OBJECT_NO_REF (sortbydlg, dialog_action_area7, "dialog_action_area7");
- GLADE_HOOKUP_OBJECT (sortbydlg, cancelbutton5, "cancelbutton5");
- GLADE_HOOKUP_OBJECT (sortbydlg, okbutton5, "okbutton5");
 
 return sortbydlg;
 }
@@ -4433,7 +5359,7 @@
 gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (textview2), 8);
 gtk_text_view_set_left_margin (GTK_TEXT_VIEW (textview2), 8);
 gtk_text_view_set_right_margin (GTK_TEXT_VIEW (textview2), 8);
- gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview2)), _("This dialog allows to set custom title for any track. This is most useful for radio stations. An option to set the custom title is also present in the \"Add Location\" dialog. The title itself is visible in columns displaying the \"Artist\" metadata field. It should look like \"custom artist\" if the Artist field is present, or just \"custom\" otherwise."), -1);
+ gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview2)), _("This dialog allows setting custom title for any track. This is most useful for radio stations. An option to set the custom title is also present in the \"Add Location\" dialog. The title itself is visible in columns displaying the \"Artist\" metadata field. It should look like \"custom artist\" if the Artist field is present, or just \"custom\" otherwise."), -1);
 
 hbox123 = gtk_hbox_new (FALSE, 8);
 gtk_widget_show (hbox123);
@@ -4477,3 +5403,505 @@
 return setcustomtitledlg;
 }
 
+GtkWidget*
+create_trkproperties_popup_menu (void)
+{
+ GtkWidget *trkproperties_popup_menu;
+ GtkWidget *trkproperties_edit;
+ GtkWidget *trkproperties_edit_in_place;
+ GtkWidget *trkproperties_remove;
+ GtkWidget *trkproperties_crop;
+ GtkWidget *trkproperties_add_new_field;
+
+ trkproperties_popup_menu = gtk_menu_new ();
+
+ trkproperties_edit = gtk_menu_item_new_with_mnemonic (_("Edit"));
+ gtk_widget_show (trkproperties_edit);
+ gtk_container_add (GTK_CONTAINER (trkproperties_popup_menu), trkproperties_edit);
+
+ trkproperties_edit_in_place = gtk_menu_item_new_with_mnemonic (_("Edit (in place)"));
+ gtk_widget_show (trkproperties_edit_in_place);
+ gtk_container_add (GTK_CONTAINER (trkproperties_popup_menu), trkproperties_edit_in_place);
+
+ trkproperties_remove = gtk_menu_item_new_with_mnemonic (_("Remove"));
+ gtk_widget_show (trkproperties_remove);
+ gtk_container_add (GTK_CONTAINER (trkproperties_popup_menu), trkproperties_remove);
+
+ trkproperties_crop = gtk_menu_item_new_with_mnemonic (_("Crop"));
+ gtk_widget_show (trkproperties_crop);
+ gtk_container_add (GTK_CONTAINER (trkproperties_popup_menu), trkproperties_crop);
+
+ trkproperties_add_new_field = gtk_menu_item_new_with_mnemonic (_("Add new field..."));
+ gtk_widget_show (trkproperties_add_new_field);
+ gtk_container_add (GTK_CONTAINER (trkproperties_popup_menu), trkproperties_add_new_field);
+
+ g_signal_connect ((gpointer) trkproperties_edit, "activate",
+ G_CALLBACK (on_trkproperties_edit_activate),
+ NULL);
+ g_signal_connect ((gpointer) trkproperties_edit_in_place, "activate",
+ G_CALLBACK (on_trkproperties_edit_in_place_activate),
+ NULL);
+ g_signal_connect ((gpointer) trkproperties_remove, "activate",
+ G_CALLBACK (on_trkproperties_remove_activate),
+ NULL);
+ g_signal_connect ((gpointer) trkproperties_crop, "activate",
+ G_CALLBACK (on_trkproperties_crop_activate),
+ NULL);
+ g_signal_connect ((gpointer) trkproperties_add_new_field, "activate",
+ G_CALLBACK (on_trkproperties_add_new_field_activate),
+ NULL);
+
+ /* Store pointers to all widgets, for use by lookup_widget(). */
+ GLADE_HOOKUP_OBJECT_NO_REF (trkproperties_popup_menu, trkproperties_popup_menu, "trkproperties_popup_menu");
+ GLADE_HOOKUP_OBJECT (trkproperties_popup_menu, trkproperties_edit, "trkproperties_edit");
+ GLADE_HOOKUP_OBJECT (trkproperties_popup_menu, trkproperties_edit_in_place, "trkproperties_edit_in_place");
+ GLADE_HOOKUP_OBJECT (trkproperties_popup_menu, trkproperties_remove, "trkproperties_remove");
+ GLADE_HOOKUP_OBJECT (trkproperties_popup_menu, trkproperties_crop, "trkproperties_crop");
+ GLADE_HOOKUP_OBJECT (trkproperties_popup_menu, trkproperties_add_new_field, "trkproperties_add_new_field");
+
+ return trkproperties_popup_menu;
+}
+
+GtkWidget*
+create_edit_tag_value_dlg (void)
+{
+ GtkWidget *edit_tag_value_dlg;
+ GtkWidget *dialog_vbox17;
+ GtkWidget *vbox47;
+ GtkWidget *label160;
+ GtkWidget *field_name;
+ GtkWidget *label161;
+ GtkWidget *scrolledwindow13;
+ GtkWidget *field_value;
+ GtkWidget *label187;
+ GtkWidget *dialog_action_area16;
+ GtkWidget *cancelbutton12;
+ GtkWidget *okbutton12;
+
+ edit_tag_value_dlg = gtk_dialog_new ();
+ gtk_widget_set_size_request (edit_tag_value_dlg, 300, 250);
+ gtk_window_set_title (GTK_WINDOW (edit_tag_value_dlg), _("Edit Value"));
+ gtk_window_set_type_hint (GTK_WINDOW (edit_tag_value_dlg), GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_dialog_set_has_separator (GTK_DIALOG (edit_tag_value_dlg), FALSE);
+
+ dialog_vbox17 = gtk_dialog_get_content_area (GTK_DIALOG (edit_tag_value_dlg));
+ gtk_widget_show (dialog_vbox17);
+
+ vbox47 = gtk_vbox_new (FALSE, 8);
+ gtk_widget_show (vbox47);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox17), vbox47, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox47), 12);
+ gtk_widget_set_can_focus(vbox47, TRUE);
+
+ label160 = gtk_label_new (_("Field name:"));
+ gtk_widget_show (label160);
+ gtk_box_pack_start (GTK_BOX (vbox47), label160, FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label160), 0, 0.5);
+
+ field_name = gtk_entry_new ();
+ gtk_widget_show (field_name);
+ gtk_box_pack_start (GTK_BOX (vbox47), field_name, FALSE, FALSE, 0);
+ gtk_widget_set_can_focus(field_name, FALSE);
+ gtk_editable_set_editable (GTK_EDITABLE (field_name), FALSE);
+ gtk_entry_set_invisible_char (GTK_ENTRY (field_name), 8226);
+
+ label161 = gtk_label_new (_("Field value:"));
+ gtk_widget_show (label161);
+ gtk_box_pack_start (GTK_BOX (vbox47), label161, FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label161), 0, 0.5);
+
+ scrolledwindow13 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwindow13);
+ gtk_box_pack_start (GTK_BOX (vbox47), scrolledwindow13, TRUE, TRUE, 0);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow13), GTK_SHADOW_IN);
+
+ field_value = gtk_text_view_new ();
+ gtk_widget_show (field_value);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow13), field_value);
+
+ label187 = gtk_label_new (_("Use ; character to separate multiple values."));
+ gtk_widget_show (label187);
+ gtk_box_pack_start (GTK_BOX (vbox47), label187, FALSE, TRUE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label187), 0, 0.5);
+
+ dialog_action_area16 = gtk_dialog_get_action_area (GTK_DIALOG (edit_tag_value_dlg));
+ gtk_widget_show (dialog_action_area16);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area16), GTK_BUTTONBOX_END);
+
+ cancelbutton12 = gtk_button_new_from_stock ("gtk-cancel");
+ gtk_widget_show (cancelbutton12);
+ gtk_dialog_add_action_widget (GTK_DIALOG (edit_tag_value_dlg), cancelbutton12, GTK_RESPONSE_CANCEL);
+ gtk_widget_set_can_default(cancelbutton12, TRUE);
+
+ okbutton12 = gtk_button_new_from_stock ("gtk-ok");
+ gtk_widget_show (okbutton12);
+ gtk_dialog_add_action_widget (GTK_DIALOG (edit_tag_value_dlg), okbutton12, GTK_RESPONSE_OK);
+ gtk_widget_set_can_default(okbutton12, TRUE);
+
+ /* Store pointers to all widgets, for use by lookup_widget(). */
+ GLADE_HOOKUP_OBJECT_NO_REF (edit_tag_value_dlg, edit_tag_value_dlg, "edit_tag_value_dlg");
+ GLADE_HOOKUP_OBJECT_NO_REF (edit_tag_value_dlg, dialog_vbox17, "dialog_vbox17");
+ GLADE_HOOKUP_OBJECT (edit_tag_value_dlg, vbox47, "vbox47");
+ GLADE_HOOKUP_OBJECT (edit_tag_value_dlg, label160, "label160");
+ GLADE_HOOKUP_OBJECT (edit_tag_value_dlg, field_name, "field_name");
+ GLADE_HOOKUP_OBJECT (edit_tag_value_dlg, label161, "label161");
+ GLADE_HOOKUP_OBJECT (edit_tag_value_dlg, scrolledwindow13, "scrolledwindow13");
+ GLADE_HOOKUP_OBJECT (edit_tag_value_dlg, field_value, "field_value");
+ GLADE_HOOKUP_OBJECT (edit_tag_value_dlg, label187, "label187");
+ GLADE_HOOKUP_OBJECT_NO_REF (edit_tag_value_dlg, dialog_action_area16, "dialog_action_area16");
+ GLADE_HOOKUP_OBJECT (edit_tag_value_dlg, cancelbutton12, "cancelbutton12");
+ GLADE_HOOKUP_OBJECT (edit_tag_value_dlg, okbutton12, "okbutton12");
+
+ gtk_widget_grab_focus (field_value);
+ return edit_tag_value_dlg;
+}
+
+GtkWidget*
+create_log_window (void)
+{
+ GtkWidget *log_window;
+ GtkWidget *vbox49;
+ GtkWidget *scrolledwindow14;
+ GtkWidget *logwindow_textview;
+ GtkWidget *hbox140;
+ GtkWidget *log_clear;
+
+ log_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_widget_set_events (log_window, GDK_KEY_PRESS_MASK);
+ gtk_window_set_title (GTK_WINDOW (log_window), _("DeaDBeeF Log"));
+ gtk_window_set_default_size (GTK_WINDOW (log_window), 400, 200);
+ gtk_window_set_destroy_with_parent (GTK_WINDOW (log_window), TRUE);
+ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (log_window), TRUE);
+ gtk_window_set_skip_pager_hint (GTK_WINDOW (log_window), TRUE);
+
+ vbox49 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox49);
+ gtk_container_add (GTK_CONTAINER (log_window), vbox49);
+
+ scrolledwindow14 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwindow14);
+ gtk_box_pack_start (GTK_BOX (vbox49), scrolledwindow14, TRUE, TRUE, 0);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow14), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow14), GTK_SHADOW_ETCHED_IN);
+
+ logwindow_textview = gtk_text_view_new ();
+ gtk_widget_show (logwindow_textview);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow14), logwindow_textview);
+ gtk_text_view_set_editable (GTK_TEXT_VIEW (logwindow_textview), FALSE);
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (logwindow_textview), GTK_WRAP_WORD);
+ gtk_text_view_set_left_margin (GTK_TEXT_VIEW (logwindow_textview), 10);
+ gtk_text_view_set_right_margin (GTK_TEXT_VIEW (logwindow_textview), 10);
+
+ hbox140 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox140);
+ gtk_box_pack_start (GTK_BOX (vbox49), hbox140, FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox140), 5);
+
+ log_clear = gtk_button_new_with_mnemonic (_("Clear"));
+ gtk_widget_show (log_clear);
+ gtk_box_pack_end (GTK_BOX (hbox140), log_clear, FALSE, FALSE, 0);
+
+ g_signal_connect ((gpointer) log_window, "key_press_event",
+ G_CALLBACK (on_log_window_key_press_event),
+ NULL);
+ g_signal_connect ((gpointer) log_clear, "clicked",
+ G_CALLBACK (on_log_clear_clicked),
+ NULL);
+
+ /* Store pointers to all widgets, for use by lookup_widget(). */
+ GLADE_HOOKUP_OBJECT_NO_REF (log_window, log_window, "log_window");
+ GLADE_HOOKUP_OBJECT (log_window, vbox49, "vbox49");
+ GLADE_HOOKUP_OBJECT (log_window, scrolledwindow14, "scrolledwindow14");
+ GLADE_HOOKUP_OBJECT (log_window, logwindow_textview, "logwindow_textview");
+ GLADE_HOOKUP_OBJECT (log_window, hbox140, "hbox140");
+ GLADE_HOOKUP_OBJECT (log_window, log_clear, "log_clear");
+
+ return log_window;
+}
+
+GtkWidget*
+create_rg_scan_progress (void)
+{
+ GtkWidget *rg_scan_progress;
+ GtkWidget *vbox50;
+ GtkWidget *hbox142;
+ GtkWidget *label166;
+ GtkWidget *rg_scan_progress_file;
+ GtkWidget *rg_scan_progress_bar;
+ GtkWidget *hbox143;
+ GtkWidget *rg_scan_progress_status;
+ GtkWidget *rg_scan_progress_cancel;
+
+ rg_scan_progress = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_widget_set_size_request (rg_scan_progress, 650, -1);
+ gtk_window_set_title (GTK_WINDOW (rg_scan_progress), _("ReplayGain Scan Progress"));
+
+ vbox50 = gtk_vbox_new (FALSE, 8);
+ gtk_widget_show (vbox50);
+ gtk_container_add (GTK_CONTAINER (rg_scan_progress), vbox50);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox50), 12);
+
+ hbox142 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox142);
+ gtk_box_pack_start (GTK_BOX (vbox50), hbox142, FALSE, TRUE, 0);
+
+ label166 = gtk_label_new (_("Current File:"));
+ gtk_widget_show (label166);
+ gtk_box_pack_start (GTK_BOX (hbox142), label166, FALSE, FALSE, 0);
+
+ rg_scan_progress_file = gtk_entry_new ();
+ gtk_widget_show (rg_scan_progress_file);
+ gtk_box_pack_start (GTK_BOX (hbox142), rg_scan_progress_file, TRUE, TRUE, 0);
+ gtk_editable_set_editable (GTK_EDITABLE (rg_scan_progress_file), FALSE);
+ gtk_entry_set_invisible_char (GTK_ENTRY (rg_scan_progress_file), 8226);
+
+ rg_scan_progress_bar = gtk_progress_bar_new ();
+ gtk_widget_show (rg_scan_progress_bar);
+ gtk_box_pack_start (GTK_BOX (vbox50), rg_scan_progress_bar, FALSE, FALSE, 0);
+
+ hbox143 = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox143);
+ gtk_box_pack_start (GTK_BOX (vbox50), hbox143, FALSE, TRUE, 0);
+
+ rg_scan_progress_status = gtk_label_new (_("Status"));
+ gtk_widget_show (rg_scan_progress_status);
+ gtk_box_pack_start (GTK_BOX (hbox143), rg_scan_progress_status, TRUE, TRUE, 0);
+ gtk_misc_set_alignment (GTK_MISC (rg_scan_progress_status), 0, 0.5);
+ gtk_label_set_ellipsize (GTK_LABEL (rg_scan_progress_status), PANGO_ELLIPSIZE_END);
+ gtk_label_set_single_line_mode (GTK_LABEL (rg_scan_progress_status), TRUE);
+
+ rg_scan_progress_cancel = gtk_button_new_with_mnemonic (_("Cancel"));
+ gtk_widget_show (rg_scan_progress_cancel);
+ gtk_box_pack_start (GTK_BOX (hbox143), rg_scan_progress_cancel, FALSE, FALSE, 0);
+
+ /* Store pointers to all widgets, for use by lookup_widget(). */
+ GLADE_HOOKUP_OBJECT_NO_REF (rg_scan_progress, rg_scan_progress, "rg_scan_progress");
+ GLADE_HOOKUP_OBJECT (rg_scan_progress, vbox50, "vbox50");
+ GLADE_HOOKUP_OBJECT (rg_scan_progress, hbox142, "hbox142");
+ GLADE_HOOKUP_OBJECT (rg_scan_progress, label166, "label166");
+ GLADE_HOOKUP_OBJECT (rg_scan_progress, rg_scan_progress_file, "rg_scan_progress_file");
+ GLADE_HOOKUP_OBJECT (rg_scan_progress, rg_scan_progress_bar, "rg_scan_progress_bar");
+ GLADE_HOOKUP_OBJECT (rg_scan_progress, hbox143, "hbox143");
+ GLADE_HOOKUP_OBJECT (rg_scan_progress, rg_scan_progress_status, "rg_scan_progress_status");
+ GLADE_HOOKUP_OBJECT (rg_scan_progress, rg_scan_progress_cancel, "rg_scan_progress_cancel");
+
+ return rg_scan_progress;
+}
+
+GtkWidget*
+create_rg_scan_results (void)
+{
+ GtkWidget *rg_scan_results;
+ GtkWidget *vbox51;
+ GtkWidget *scrolledwindow15;
+ GtkWidget *rg_scan_results_list;
+ GtkWidget *hbox144;
+ GtkWidget *rg_scan_results_status;
+ GtkWidget *rg_scan_results_update;
+ GtkWidget *rg_scan_results_cancel;
+
+ rg_scan_results = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_widget_set_size_request (rg_scan_results, 1000, 350);
+ gtk_window_set_title (GTK_WINDOW (rg_scan_results), _("ReplayGain Scan Results"));
+
+ vbox51 = gtk_vbox_new (FALSE, 8);
+ gtk_widget_show (vbox51);
+ gtk_container_add (GTK_CONTAINER (rg_scan_results), vbox51);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox51), 12);
+
+ scrolledwindow15 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwindow15);
+ gtk_box_pack_start (GTK_BOX (vbox51), scrolledwindow15, TRUE, TRUE, 0);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow15), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow15), GTK_SHADOW_IN);
+
+ rg_scan_results_list = gtk_tree_view_new ();
+ gtk_widget_show (rg_scan_results_list);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow15), rg_scan_results_list);
+
+ hbox144 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox144);
+ gtk_box_pack_start (GTK_BOX (vbox51), hbox144, FALSE, TRUE, 0);
+
+ rg_scan_results_status = gtk_label_new (_("Status"));
+ gtk_widget_show (rg_scan_results_status);
+ gtk_box_pack_start (GTK_BOX (hbox144), rg_scan_results_status, TRUE, TRUE, 0);
+ gtk_misc_set_alignment (GTK_MISC (rg_scan_results_status), 0, 0.5);
+ gtk_label_set_ellipsize (GTK_LABEL (rg_scan_results_status), PANGO_ELLIPSIZE_END);
+ gtk_label_set_single_line_mode (GTK_LABEL (rg_scan_results_status), TRUE);
+
+ rg_scan_results_update = gtk_button_new_with_mnemonic (_("Update File Tags"));
+ gtk_widget_show (rg_scan_results_update);
+ gtk_box_pack_start (GTK_BOX (hbox144), rg_scan_results_update, FALSE, FALSE, 0);
+
+ rg_scan_results_cancel = gtk_button_new_with_mnemonic (_("Cancel"));
+ gtk_widget_show (rg_scan_results_cancel);
+ gtk_box_pack_start (GTK_BOX (hbox144), rg_scan_results_cancel, FALSE, FALSE, 0);
+
+ /* Store pointers to all widgets, for use by lookup_widget(). */
+ GLADE_HOOKUP_OBJECT_NO_REF (rg_scan_results, rg_scan_results, "rg_scan_results");
+ GLADE_HOOKUP_OBJECT (rg_scan_results, vbox51, "vbox51");
+ GLADE_HOOKUP_OBJECT (rg_scan_results, scrolledwindow15, "scrolledwindow15");
+ GLADE_HOOKUP_OBJECT (rg_scan_results, rg_scan_results_list, "rg_scan_results_list");
+ GLADE_HOOKUP_OBJECT (rg_scan_results, hbox144, "hbox144");
+ GLADE_HOOKUP_OBJECT (rg_scan_results, rg_scan_results_status, "rg_scan_results_status");
+ GLADE_HOOKUP_OBJECT (rg_scan_results, rg_scan_results_update, "rg_scan_results_update");
+ GLADE_HOOKUP_OBJECT (rg_scan_results, rg_scan_results_cancel, "rg_scan_results_cancel");
+
+ return rg_scan_results;
+}
+
+GtkWidget*
+create_plugin_list_popup_menu (void)
+{
+ GtkWidget *plugin_list_popup_menu;
+ GtkWidget *copy_plugin_report_menuitem;
+ GtkWidget *image688;
+ GtkWidget *only_show_plugins_with_configuration1;
+
+ plugin_list_popup_menu = gtk_menu_new ();
+
+ copy_plugin_report_menuitem = gtk_image_menu_item_new_with_mnemonic (_("Copy report"));
+ gtk_widget_show (copy_plugin_report_menuitem);
+ gtk_container_add (GTK_CONTAINER (plugin_list_popup_menu), copy_plugin_report_menuitem);
+
+ image688 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image688);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_plugin_report_menuitem), image688);
+
+ only_show_plugins_with_configuration1 = gtk_check_menu_item_new_with_mnemonic (_("Only show plugins with configuration"));
+ gtk_widget_show (only_show_plugins_with_configuration1);
+ gtk_container_add (GTK_CONTAINER (plugin_list_popup_menu), only_show_plugins_with_configuration1);
+
+ g_signal_connect ((gpointer) copy_plugin_report_menuitem, "activate",
+ G_CALLBACK (on_copy_plugin_report_menuitem_activate),
+ NULL);
+ g_signal_connect ((gpointer) only_show_plugins_with_configuration1, "activate",
+ G_CALLBACK (on_only_show_plugins_with_configuration1_activate),
+ NULL);
+
+ /* Store pointers to all widgets, for use by lookup_widget(). */
+ GLADE_HOOKUP_OBJECT_NO_REF (plugin_list_popup_menu, plugin_list_popup_menu, "plugin_list_popup_menu");
+ GLADE_HOOKUP_OBJECT (plugin_list_popup_menu, copy_plugin_report_menuitem, "copy_plugin_report_menuitem");
+ GLADE_HOOKUP_OBJECT (plugin_list_popup_menu, image688, "image688");
+ GLADE_HOOKUP_OBJECT (plugin_list_popup_menu, only_show_plugins_with_configuration1, "only_show_plugins_with_configuration1");
+
+ return plugin_list_popup_menu;
+}
+
+GtkWidget*
+create_edit_multiple_tracks_dialog (void)
+{
+ GtkWidget *edit_multiple_tracks_dialog;
+ GtkWidget *dialog_vbox18;
+ GtkWidget *vbox60;
+ GtkWidget *label183;
+ GtkWidget *entry_field_name;
+ GtkWidget *notebook;
+ GtkWidget *scrolledwindow22;
+ GtkWidget *textview_single_value;
+ GtkWidget *label184;
+ GtkWidget *scrolledwindow23;
+ GtkWidget *treeview_individual_values;
+ GtkWidget *label185;
+ GtkWidget *label186;
+ GtkWidget *dialog_action_area17;
+ GtkWidget *cancelbutton13;
+ GtkWidget *okbutton13;
+
+ edit_multiple_tracks_dialog = gtk_dialog_new ();
+ gtk_window_set_title (GTK_WINDOW (edit_multiple_tracks_dialog), _("Edit Multiple Tracks"));
+ gtk_window_set_type_hint (GTK_WINDOW (edit_multiple_tracks_dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_dialog_set_has_separator (GTK_DIALOG (edit_multiple_tracks_dialog), FALSE);
+
+ dialog_vbox18 = gtk_dialog_get_content_area (GTK_DIALOG (edit_multiple_tracks_dialog));
+ gtk_widget_show (dialog_vbox18);
+
+ vbox60 = gtk_vbox_new (FALSE, 8);
+ gtk_widget_show (vbox60);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox18), vbox60, TRUE, TRUE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox60), 12);
+
+ label183 = gtk_label_new (_("Field Name:"));
+ gtk_widget_show (label183);
+ gtk_box_pack_start (GTK_BOX (vbox60), label183, FALSE, TRUE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label183), 0, 0.5);
+
+ entry_field_name = gtk_entry_new ();
+ gtk_widget_show (entry_field_name);
+ gtk_box_pack_start (GTK_BOX (vbox60), entry_field_name, FALSE, FALSE, 0);
+ gtk_widget_set_can_focus(entry_field_name, FALSE);
+ gtk_editable_set_editable (GTK_EDITABLE (entry_field_name), FALSE);
+ gtk_entry_set_invisible_char (GTK_ENTRY (entry_field_name), 9679);
+
+ notebook = gtk_notebook_new ();
+ gtk_widget_show (notebook);
+ gtk_box_pack_start (GTK_BOX (vbox60), notebook, TRUE, TRUE, 0);
+
+ scrolledwindow22 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwindow22);
+ gtk_container_add (GTK_CONTAINER (notebook), scrolledwindow22);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow22), GTK_SHADOW_IN);
+
+ textview_single_value = gtk_text_view_new ();
+ gtk_widget_show (textview_single_value);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow22), textview_single_value);
+
+ label184 = gtk_label_new (_("Single Value"));
+ gtk_widget_show (label184);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), label184);
+
+ scrolledwindow23 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_show (scrolledwindow23);
+ gtk_container_add (GTK_CONTAINER (notebook), scrolledwindow23);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow23), GTK_SHADOW_IN);
+
+ treeview_individual_values = gtk_tree_view_new ();
+ gtk_widget_show (treeview_individual_values);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow23), treeview_individual_values);
+
+ label185 = gtk_label_new (_("Individual Values"));
+ gtk_widget_show (label185);
+ gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), label185);
+
+ label186 = gtk_label_new (_("Use ; character to separate multiple values."));
+ gtk_widget_show (label186);
+ gtk_box_pack_start (GTK_BOX (vbox60), label186, FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label186), 0, 0.5);
+
+ dialog_action_area17 = gtk_dialog_get_action_area (GTK_DIALOG (edit_multiple_tracks_dialog));
+ gtk_widget_show (dialog_action_area17);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area17), GTK_BUTTONBOX_END);
+
+ cancelbutton13 = gtk_button_new_from_stock ("gtk-cancel");
+ gtk_widget_show (cancelbutton13);
+ gtk_dialog_add_action_widget (GTK_DIALOG (edit_multiple_tracks_dialog), cancelbutton13, GTK_RESPONSE_CANCEL);
+ gtk_widget_set_can_default(cancelbutton13, TRUE);
+
+ okbutton13 = gtk_button_new_from_stock ("gtk-ok");
+ gtk_widget_show (okbutton13);
+ gtk_dialog_add_action_widget (GTK_DIALOG (edit_multiple_tracks_dialog), okbutton13, GTK_RESPONSE_OK);
+ gtk_widget_set_can_default(okbutton13, TRUE);
+
+ /* Store pointers to all widgets, for use by lookup_widget(). */
+ GLADE_HOOKUP_OBJECT_NO_REF (edit_multiple_tracks_dialog, edit_multiple_tracks_dialog, "edit_multiple_tracks_dialog");
+ GLADE_HOOKUP_OBJECT_NO_REF (edit_multiple_tracks_dialog, dialog_vbox18, "dialog_vbox18");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, vbox60, "vbox60");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, label183, "label183");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, entry_field_name, "entry_field_name");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, notebook, "notebook");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, scrolledwindow22, "scrolledwindow22");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, textview_single_value, "textview_single_value");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, label184, "label184");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, scrolledwindow23, "scrolledwindow23");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, treeview_individual_values, "treeview_individual_values");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, label185, "label185");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, label186, "label186");
+ GLADE_HOOKUP_OBJECT_NO_REF (edit_multiple_tracks_dialog, dialog_action_area17, "dialog_action_area17");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, cancelbutton13, "cancelbutton13");
+ GLADE_HOOKUP_OBJECT (edit_multiple_tracks_dialog, okbutton13, "okbutton13");
+
+ gtk_widget_grab_focus (textview_single_value);
+ return edit_multiple_tracks_dialog;
+}
+

deadbeef-0.6.2.tar.bz2/plugins/gtkui/interface.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/interface.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/namedicons.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/namedicons.c Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/namedicons.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/namedicons.h Changed

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist Added

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/ddblistview.c Added

@@ -0,0 +1,3488 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "../../config.h"
+#endif
+
+#include <assert.h>
+#include <ctype.h>
+#include <gtk/gtk.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+#include <deadbeef/deadbeef.h>
+#include "../../artwork/artwork.h"
+#include "../actionhandlers.h"
+#include "../callbacks.h"
+#include "../clipboard.h"
+#include "../drawing.h"
+#include "../gtkui.h"
+#include "../support.h"
+#include "ddblistview.h"
+#include "ddblistviewheader.h"
+
+// FIXME: these are owned by plcommon, which we don't want to include
+// Should be owned by something else, like "shared resources"
+extern GtkWidget *theme_treeview;
+extern GtkWidget *theme_button;
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define max(x,y) ((x)>(y)?(x):(y))
+
+#define DEFAULT_GROUP_TITLE_HEIGHT 30
+#define SCROLL_STEP 20
+#define AUTOSCROLL_UPDATE_FREQ 0.01f
+#define NUM_ROWS_TO_NOTIFY_SINGLY 10
+#define BLANK_GROUP_SUBDIVISION 100
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+//#define REF(it) {if (it) listview->datasource->ref (it);}
+#define UNREF(it) {if (it) listview->datasource->unref(it);}
+
+enum {
+ INFO_TARGET_URIS, // gtk uses 0 info by default
+ INFO_TARGET_PLAYLIST_ITEM_INDEXES,
+ INFO_TARGET_PLAYITEM_POINTERS,
+};
+
+struct _DdbListviewPrivate {
+ int list_width; // width if the list widget as of the last resize
+ int list_height; // heught of the list widget as of the last resize
+ int totalwidth; // width of listview, including any invisible (scrollable) part
+ int fullheight; // total height of all groups
+ const char *title; // unique id, used for config writing, etc
+ int lastpos2; // last mouse position (for list widget)
+ // current state
+ int scrollpos;
+ int hscrollpos;
+ int rowheight;
+
+ int drag_motion_y;
+
+ int ref_point; // idx of anchor when columns are resized
+ int ref_point_offset; // y pixel-coordinate of anchor relative to view
+
+ // scrolling
+ int scroll_mode; // 0=select, 1=dragndrop
+ int scroll_pointer_x;
+ int scroll_pointer_y;
+ float scroll_direction;
+ int scroll_active;
+ struct timeval tm_prevscroll;
+ float scroll_sleep_time;
+
+ // selection
+ int areaselect; // boolean, whether area selection is active (1), or not (0)
+ int areaselect_x; // x pixel-coordinate of anchor click relative to playlist origin
+ int areaselect_y; // y pixel-coordinate of anchor click relative to playlist origin
+ int dragwait; // set to 1 when mouse was pressed down on already selected track, but not moved since (so we're waiting for dnd to begin)
+ int drag_source_playlist;
+ int shift_sel_anchor;
+
+ // header
+ int col_autoresize;
+ float fwidth;
+ int view_realized;
+
+ struct _DdbListviewColumn *columns;
+ gboolean lock_columns;
+
+ ddb_playlist_t *plt; // current playlist (refcounted), must be unreffed with the group
+ struct _DdbListviewGroup *groups;
+ int artwork_subgroup_level;
+ int subgroup_title_padding;
+ int groups_build_idx; // must be the same as playlist modification idx
+ int grouptitle_height;
+ int calculated_grouptitle_height;
+
+ // previous area selection range
+ int area_selection_start;
+ int area_selection_end;
+
+ // drawing contexts
+ drawctx_t listctx;
+ drawctx_t grpctx;
+
+ // FIXME: should be owned by the delegate (plcommon)
+ DdbListviewGroupFormat *group_formats;
+
+ // FIXME: should be owned by the delegate (plcommon)
+ guint tf_redraw_timeout_id;
+ int tf_redraw_track_idx;
+ DdbListviewIter tf_redraw_track;
+};
+
+#define DDB_LISTVIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DDB_LISTVIEW_TYPE, DdbListviewPrivate))
+G_DEFINE_TYPE (DdbListview, ddb_listview, GTK_TYPE_TABLE);
+
+typedef enum {
+ PICK_ITEM,
+ PICK_GROUP_TITLE,
+ PICK_ALBUM_ART,
+ PICK_EMPTY_SPACE,
+ PICK_ABOVE_PLAYLIST,
+ PICK_BELOW_PLAYLIST,
+} area_type_t;
+
+struct _DdbListviewPickContext {
+ int item_idx; // index of playitem in playlist
+ int item_grp_idx; // index of first playitem in group in playlist
+ int grp_idx; // index of playitem within grp
+ area_type_t type;
+ DdbListviewGroup *grp;
+};
+typedef struct _DdbListviewPickContext DdbListviewPickContext;
+
+static void ddb_listview_class_init(DdbListviewClass *klass);
+static void ddb_listview_init(DdbListview *listview);
+static void ddb_listview_destroy(GObject *object);
+
+#pragma mark - fwd decls
+static void
+ddb_listview_build_groups (DdbListview *listview);
+
+static int
+ddb_listview_resize_subgroup (DdbListview *listview, DdbListviewGroup *grp, int group_depth, int min_height, int min_no_artwork_height);
+static void
+ddb_listview_resize_groups (DdbListview *listview);
+static void
+ddb_listview_free_group (DdbListview *listview, DdbListviewGroup *group);
+static void
+ddb_listview_free_all_groups (DdbListview *listview);
+
+static void
+ddb_listview_update_fonts (DdbListview *listview);
+
+////// list functions ////
+static void
+ddb_listview_list_render (DdbListview *listview, cairo_t *cr, GdkRectangle *clip);
+static void
+ddb_listview_list_render_row_background (DdbListview *listview, cairo_t *cr, DdbListviewIter it, int even, int cursor, int x, int y, int w, int h, GdkRectangle *clip);
+static void
+ddb_listview_list_render_row_foreground (DdbListview *listview, cairo_t *cr, DdbListviewIter it, int even, int idx, int y, int w, int h, int x1, int x2);
+static void
+ddb_listview_list_render_album_art (DdbListview *listview, cairo_t *cr, DdbListviewGroup *grp, int min_y, int grp_next_y, int y, GdkRectangle *clip);
+static void
+ddb_listview_list_track_dragdrop (DdbListview *listview, int x, int y);
+int
+ddb_listview_dragdrop_get_row_from_coord (DdbListview *listview, int x, int y);
+void
+ddb_listview_list_mousemove (DdbListview *listview, GdkEventMotion *event, int x, int y);
+static gboolean
+ddb_listview_list_setup_vscroll (void *user_data);
+static gboolean
+ddb_listview_list_setup_hscroll (void *user_data);
+int
+ddb_listview_get_row_pos (DdbListview *listview, int pos, int *accumulated_title_height);
+
+////// column management functions ////
+void
+ddb_listview_column_move (DdbListview *listview, DdbListviewColumn *which, int inspos);
+void
+ddb_listview_column_free (DdbListview *listview, DdbListviewColumn *c);
+
+
+// signal handlers
+static void
+ddb_listview_vscroll_value_changed (GtkRange *widget,
+ gpointer user_data);
+static void
+ddb_listview_hscroll_value_changed (GtkRange *widget,
+ gpointer user_data);
+
+static void
+ddb_listview_list_realize (GtkWidget *widget,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_list_configure_event (GtkWidget *widget,
+ GdkEventConfigure *event,
+ gpointer user_data);
+
+#if GTK_CHECK_VERSION(3,0,0)
+static gboolean
+ddb_listview_list_draw (GtkWidget *widget,
+ cairo_t *cr,
+ gpointer user_data);
+#else
+static gboolean
+ddb_listview_list_expose_event (GtkWidget *widget,
+ GdkEventExpose *event,
+ gpointer user_data);
+
+#endif
+
+gboolean
+ddb_listview_list_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data);
+
+gboolean
+ddb_listview_list_popup_menu (GtkWidget *widget, gpointer user_data);
+
+static void
+ddb_listview_list_drag_data_received (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_list_drag_motion (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_list_drag_drop (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data);
+
+static void
+ddb_listview_list_drag_data_get (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
+ gpointer user_data);
+
+static void
+ddb_listview_list_drag_end (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_list_drag_failed (GtkWidget *widget,
+ GdkDragContext *arg1,
+ GtkDragResult arg2,
+ gpointer user_data);
+
+static void
+ddb_listview_list_drag_leave (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ guint time,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_list_button_release_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data);
+
+gboolean
+ddb_listview_motion_notify_event (GtkWidget *widget,
+ GdkEventMotion *event,
+ gpointer user_data);
+gboolean
+ddb_listview_list_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_scroll_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_list_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data);
+
+static gboolean
+list_tooltip_handler (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer p);
+
+static void
+ddb_listview_class_init(DdbListviewClass *class) {
+ GObjectClass *object_class = (GObjectClass *) class;
+ object_class->finalize = ddb_listview_destroy;
+ g_type_class_add_private(class, sizeof(DdbListviewPrivate));
+}
+
+static void
+set_column_width (DdbListview *listview, DdbListviewColumn *c, float new_width);
+
+static void
+ddb_listview_column_size_changed (DdbListview *listview, DdbListviewColumn *c);
+
+static void
+ddb_listview_list_update_total_width (DdbListview *listview, int columns_width, int width);
+
+static int
+total_columns_width (DdbListview *listview);
+
+static void
+ddb_listview_update_scroll_ref_point (DdbListview *listview);
+
+static void
+set_fwidth (DdbListview *listview, float list_width);
+
+static void
+autoresize_columns (DdbListview *listview, int list_width, int list_height);
+
+#pragma mark - Header delegate wrappers
+
+static void _header_context_menu (DdbListviewHeader *header, int col) {
+ DdbListview *listview = DDB_LISTVIEW(g_object_get_data(G_OBJECT(header), "owner"));
+ listview->delegate->header_context_menu(listview, col);
+}
+static struct _DdbListviewColumn *_header_get_columns(DdbListviewHeader *header) {
+ DdbListview *listview = DDB_LISTVIEW(g_object_get_data(G_OBJECT(header), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ return priv->columns;
+}
+static void _header_move_column(DdbListviewHeader *header, DdbListviewColumn *c, int pos) {
+ DdbListview *listview = DDB_LISTVIEW(g_object_get_data(G_OBJECT(header), "owner"));
+ ddb_listview_column_move (listview, c, pos);
+ gtk_widget_queue_draw (listview->list);
+}
+
+static void _header_set_column_width(DdbListviewHeader *header, DdbListviewColumn *c, int width) {
+ DdbListview *listview = DDB_LISTVIEW(g_object_get_data(G_OBJECT(header), "owner"));
+ set_column_width(listview, c, width);
+ ddb_listview_column_size_changed(listview, c);
+ g_idle_add_full(GTK_PRIORITY_RESIZE, ddb_listview_list_setup_hscroll, listview, NULL);
+ gtk_widget_queue_draw(listview->list);
+}
+
+static void _header_columns_changed(DdbListviewHeader *header) {
+ DdbListview *listview = DDB_LISTVIEW(g_object_get_data(G_OBJECT(header), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ listview->delegate->columns_changed (listview);
+ ddb_listview_list_update_total_width (listview, total_columns_width(listview), priv->list_width);
+}
+
+static int _header_get_list_height(DdbListviewHeader *header) {
+ DdbListview *listview = DDB_LISTVIEW(g_object_get_data(G_OBJECT(header), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ return priv->list_height;
+}
+
+static void _header_col_sort (DdbListviewHeader *header, DdbListviewColumnSortOrder sort_order, void *user_data) {
+ DdbListview *listview = DDB_LISTVIEW(g_object_get_data(G_OBJECT(header), "owner"));
+ listview->delegate->col_sort (sort_order, user_data);
+ gtk_widget_queue_draw (listview->list);
+}
+
+static void _header_update_scroll_ref_point (DdbListviewHeader *header) {
+ DdbListview *listview = DDB_LISTVIEW(g_object_get_data(G_OBJECT(header), "owner"));
+ ddb_listview_update_scroll_ref_point (listview);
+}
+
+#pragma mark -
+
+static void
+ddb_listview_init(DdbListview *listview) {
+ GtkWidget *hbox;
+ GtkWidget *vbox;
+
+ gtk_table_resize (GTK_TABLE (listview), 2, 2);
+ listview->scrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (NULL));
+ gtk_table_attach (GTK_TABLE (listview), listview->scrollbar, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+ hbox = gtk_hbox_new (FALSE, 0);
+ gtk_widget_show (hbox);
+ gtk_table_attach (GTK_TABLE (listview), hbox, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+ vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+
+
+ static ddb_listview_header_delegate_t _header_delegate = {
+ .context_menu = _header_context_menu,
+ .get_columns = _header_get_columns,
+ .move_column = _header_move_column,
+ .set_column_width = _header_set_column_width,
+ .columns_changed = _header_columns_changed,
+ .get_list_height = _header_get_list_height,
+ .col_sort = _header_col_sort,
+ .update_scroll_ref_point = _header_update_scroll_ref_point,
+ };
+
+ DdbListviewHeader *header = DDB_LISTVIEW_HEADER(ddb_listview_header_new());
+ header->delegate = &_header_delegate;
+ listview->header = GTK_WIDGET(header);
+
+ gtk_widget_show (listview->header);
+ gtk_box_pack_start (GTK_BOX (vbox), listview->header, FALSE, TRUE, 0);
+
+ listview->list = gtk_drawing_area_new ();
+ gtk_widget_show (listview->list);
+ gtk_box_pack_start (GTK_BOX (vbox), listview->list, TRUE, TRUE, 0);
+ gtk_widget_set_can_focus (listview->list, TRUE);
+ gtk_widget_set_can_default (listview->list, TRUE);
+ int events = GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK;
+#if GTK_CHECK_VERSION(3,0,0)
+ events |= GDK_SCROLL_MASK;
+#endif
+#if GTK_CHECK_VERSION(3,4,0)
+ events |= GDK_SMOOTH_SCROLL_MASK;
+#endif
+ gtk_widget_set_events (listview->list, events);
+
+ listview->hscrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT (NULL));
+ gtk_table_attach (GTK_TABLE (listview), listview->hscrollbar, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+
+ g_object_set_data (G_OBJECT (listview->list), "owner", listview);
+ g_object_set_data (G_OBJECT (listview->header), "owner", listview);
+ g_object_set_data (G_OBJECT (listview->scrollbar), "owner", listview);
+ g_object_set_data (G_OBJECT (listview->hscrollbar), "owner", listview);
+
+ g_signal_connect ((gpointer) listview->list, "configure_event",
+ G_CALLBACK (ddb_listview_list_configure_event),
+ NULL);
+
+ g_signal_connect ((gpointer) listview->scrollbar, "value_changed",
+ G_CALLBACK (ddb_listview_vscroll_value_changed),
+ NULL);
+ g_signal_connect ((gpointer) listview->hscrollbar, "value_changed",
+ G_CALLBACK (ddb_listview_hscroll_value_changed),
+ 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);
+ g_signal_connect_after ((gpointer) listview->list, "button_press_event",
+ G_CALLBACK (ddb_listview_list_button_press_event),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "popup_menu",
+ G_CALLBACK (ddb_listview_list_popup_menu),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "scroll_event",
+ G_CALLBACK (ddb_listview_scroll_event),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "drag_motion",
+ G_CALLBACK (ddb_listview_list_drag_motion),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "drag_drop",
+ G_CALLBACK (ddb_listview_list_drag_drop),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "drag_data_get",
+ G_CALLBACK (ddb_listview_list_drag_data_get),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "drag_end",
+ G_CALLBACK (ddb_listview_list_drag_end),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "drag_failed",
+ G_CALLBACK (ddb_listview_list_drag_failed),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "drag_leave",
+ G_CALLBACK (ddb_listview_list_drag_leave),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "button_release_event",
+ G_CALLBACK (ddb_listview_list_button_release_event),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "motion_notify_event",
+ G_CALLBACK (ddb_listview_motion_notify_event),
+ NULL);
+ g_signal_connect ((gpointer) listview->list, "drag_data_received",
+ G_CALLBACK (ddb_listview_list_drag_data_received),
+ NULL);
+
+ g_signal_connect ((gpointer)listview->list, "key_press_event", G_CALLBACK (ddb_listview_list_key_press_event), NULL);
+
+ GValue value = {0, };
+ g_value_init (&value, G_TYPE_BOOLEAN);
+ g_value_set_boolean (&value, TRUE);
+ g_object_set_property (G_OBJECT (listview->list), "has-tooltip", &value);
+ g_signal_connect (G_OBJECT (listview->list), "query-tooltip", G_CALLBACK (list_tooltip_handler), listview);
+
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ memset (priv, 0, sizeof (DdbListviewPrivate));
+ // init instance - create all subwidgets, and insert into table
+ drawctx_init (&priv->listctx);
+ drawctx_init (&priv->grpctx);
+
+ priv->scrollpos = -1;
+
+ priv->rowheight = -1;
+
+ priv->drag_motion_y = -1;
+
+ priv->ref_point = -1;
+ priv->ref_point_offset = -1;
+
+ priv->scroll_mode = 0;
+ priv->scroll_pointer_x = -1;
+ priv->scroll_pointer_y = -1;
+ priv->scroll_direction = 0;
+ priv->scroll_active = 0;
+ memset (&priv->tm_prevscroll, 0, sizeof (priv->tm_prevscroll));
+ priv->scroll_sleep_time = 0;
+
+ priv->areaselect = 0;
+ priv->areaselect_x = -1;
+ priv->areaselect_y = -1;
+ // listview->areaselect_dx = -1;
+ // listview->areaselect_dy = -1;
+ priv->dragwait = 0;
+ priv->drag_source_playlist = -1;
+ priv->shift_sel_anchor = -1;
+
+ priv->fwidth = -1;
+
+ priv->columns = NULL;
+ priv->lock_columns = -1;
+ priv->groups = NULL;
+ priv->plt = NULL;
+
+ priv->calculated_grouptitle_height = DEFAULT_GROUP_TITLE_HEIGHT;
+
+ priv->area_selection_start = 0;
+ priv->area_selection_end = 0;
+
+ priv->tf_redraw_timeout_id = 0;
+ priv->tf_redraw_track_idx = -1;
+
+}
+
+GtkWidget *
+ddb_listview_new(void) {
+ return GTK_WIDGET(g_object_new(ddb_listview_get_type(), NULL));
+}
+
+static void
+ddb_listview_destroy(GObject *object) {
+ DdbListview *listview;
+
+ g_return_if_fail(object != NULL);
+ g_return_if_fail(DDB_IS_LISTVIEW(object));
+
+ listview = DDB_LISTVIEW(object);
+
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+
+ ddb_listview_free_all_groups (listview);
+
+ while (priv->columns) {
+ DdbListviewColumn *next = priv->columns->next;
+ ddb_listview_column_free (listview, priv->columns);
+ priv->columns = next;
+ }
+
+ DdbListviewGroupFormat *fmt = priv->group_formats;
+ while (fmt) {
+ DdbListviewGroupFormat *next_fmt = fmt->next;
+ free (fmt->format);
+ free (fmt->bytecode);
+ free (fmt);
+ fmt = next_fmt;
+ }
+ ddb_listview_cancel_autoredraw (listview);
+
+ draw_free (&priv->listctx);
+ draw_free (&priv->grpctx);
+}
+
+void
+ddb_listview_refresh (DdbListview *listview, uint32_t flags) {
+ if (flags & DDB_REFRESH_CONFIG) {
+ ddb_listview_update_fonts (listview);
+ }
+ if (flags & DDB_LIST_CHANGED) {
+ ddb_listview_build_groups (listview);
+ }
+ if (flags & DDB_REFRESH_LIST) {
+ gtk_widget_queue_draw (listview->list);
+ }
+ if (flags & DDB_REFRESH_VSCROLL) {
+ g_idle_add_full(GTK_PRIORITY_RESIZE, ddb_listview_list_setup_vscroll, listview, NULL);
+ }
+ if (flags & DDB_REFRESH_HSCROLL) {
+ g_idle_add_full(GTK_PRIORITY_RESIZE, ddb_listview_list_setup_hscroll, listview, NULL);
+ }
+ if (flags & DDB_REFRESH_COLUMNS) {
+ gtk_widget_queue_draw (listview->header);
+ }
+}
+
+static gboolean
+ddb_listview_reconf_scrolling (void *listview) {
+ ddb_listview_list_setup_vscroll (listview);
+ ddb_listview_list_setup_hscroll (listview);
+ return FALSE;
+}
+
+static void
+_update_fwidth (DdbListview *listview, int prev_width) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ GtkAllocation a;
+ gtk_widget_get_allocation (GTK_WIDGET (listview), &a);
+ if (priv->lock_columns != -1 && priv->view_realized) {
+ if (!deadbeef->conf_get_int ("gtkui.autoresize_columns", 0) ||
+ ddb_listview_header_is_sizing(DDB_LISTVIEW_HEADER(listview->header))) {
+ set_fwidth (listview, a.width);
+ }
+ else if (a.width != prev_width) {
+ ddb_listview_update_scroll_ref_point (listview);
+ if (priv->fwidth == -1) {
+ set_fwidth (listview, prev_width);
+ }
+ autoresize_columns (listview, a.width, a.height);
+ }
+ }
+}
+
+static gboolean
+_initial_resizing_finished (void *ctx) {
+ DdbListview *listview = ctx;
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+
+ priv->view_realized = 1;
+ GtkAllocation a;
+ gtk_widget_get_allocation (GTK_WIDGET (listview), &a);
+ _update_fwidth (listview, a.width);
+ gtk_widget_queue_draw (GTK_WIDGET(listview));
+ return FALSE;
+}
+
+static void
+ddb_listview_list_realize (GtkWidget *widget,
+ gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW(g_object_get_data(G_OBJECT(widget), "owner"));
+ if (listview->delegate->drag_n_drop) {
+ GtkTargetEntry entries = {
+ {
+ .target = TARGET_PLAYLIST_AND_ITEM_INDEXES,
+ .flags = GTK_TARGET_SAME_APP,
+ .info = INFO_TARGET_PLAYLIST_ITEM_INDEXES
+ },
+ {
+ .target = TARGET_PLAYITEM_POINTERS,
+ .flags = GTK_TARGET_SAME_APP,
+ .info = INFO_TARGET_PLAYITEM_POINTERS,
+ }
+ };
+ // setup drag-drop target
+ gtk_drag_dest_set (widget, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, entries, 2, GDK_ACTION_COPY | GDK_ACTION_MOVE);
+ gtk_drag_dest_add_uri_targets (widget);
+ }
+ ddb_listview_update_fonts(listview);
+
+ // defer column autoresizing until after the initial window resizing settles down
+ g_timeout_add (100, _initial_resizing_finished, listview);
+}
+
+static int
+total_columns_width (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int size = 0;
+ for (DdbListviewColumn *c = priv->columns; c; c = c->next) {
+ size += c->width;
+ }
+ return size;
+}
+
+static void
+ddb_listview_list_update_total_width (DdbListview *listview, int columns_width, int width) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ priv->totalwidth = max (columns_width, width);
+}
+
+static DdbListviewIter
+next_playitem (DdbListview *listview, DdbListviewIter it) {
+ DdbListviewIter next = listview->datasource->next(it);
+ listview->datasource->unref(it);
+ return next;
+}
+
+void
+ddb_listview_groupcheck (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int idx = listview->datasource->modification_idx ();
+ if (idx != priv->groups_build_idx) {
+ ddb_listview_build_groups (listview);
+ }
+}
+
+// returns 1 if X coordinate in list belongs to album art column and 0 if not
+static int
+ddb_listview_is_album_art_column (DdbListview *listview, int x) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int col_x = -priv->hscrollpos;
+ for (DdbListviewColumn *c = priv->columns; c && col_x <= x; c = c->next) {
+ if (x <= col_x + c->width && listview->datasource->is_album_art_column(c->user_data)) {
+ return 1;
+ }
+ col_x += c->width;
+ }
+ return 0;
+}
+
+// returns Y coordinate of an item by its index
+static int
+ddb_listview_get_row_pos_subgroup (DdbListview *listview, DdbListviewGroup *grp, int y, int idx, int row_idx, int *accum) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ while (grp) {
+ int title_height = 0;
+ if (grp->group_label_visible) {
+ title_height = priv->grouptitle_height;
+ }
+ if (idx + grp->num_items > row_idx) {
+ int i;
+ if (grp->subgroups) {
+ i = ddb_listview_get_row_pos_subgroup (listview, grp->subgroups, y + title_height, idx, row_idx, accum);
+ }
+ else {
+ i = y + title_height + (row_idx - idx) * priv->rowheight;
+ }
+ *accum += title_height;
+ return i;
+ }
+ y += grp->height;
+ idx += grp->num_items;
+ grp = grp->next;
+ }
+ return y;
+}
+
+int
+ddb_listview_get_row_pos (DdbListview *listview, int row_idx, int *accumulated_title_height) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int accum = 0;
+ deadbeef->pl_lock ();
+ ddb_listview_groupcheck (listview);
+ int y = ddb_listview_get_row_pos_subgroup (listview, priv->groups, 0, 0, row_idx, &accum);
+ deadbeef->pl_unlock ();
+ if (accumulated_title_height) {
+ *accumulated_title_height = accum;
+ }
+ return y;
+}
+
+static int
+ddb_listview_is_empty_region (DdbListviewPickContext *pick_ctx) {
+ switch (pick_ctx->type) {
+ case PICK_BELOW_PLAYLIST:
+ case PICK_ABOVE_PLAYLIST:
+ case PICK_EMPTY_SPACE:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+static int
+ddb_listview_list_pickpoint_subgroup (DdbListview *listview, DdbListviewGroup *grp, int x, int y, int idx, int grp_y, int group_level, int pin_offset, DdbListviewPickContext *pick_ctx) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ const int orig_y = y;
+ const int ry = y - priv->scrollpos;
+ const int rowheight = priv->rowheight;
+ const int is_album_art_column = ddb_listview_is_album_art_column (listview, x);
+
+ while (grp) {
+ const int h = grp->height;
+ const int grp_title_height = grp->group_label_visible ? priv->grouptitle_height : 0;
+ if (y >= grp_y && y < grp_y + h) {
+ pick_ctx->grp = grp;
+ y -= grp_y;
+ if (y < grp_title_height || (pin_offset < ry && ry < grp_title_height + pin_offset && gtkui_groups_pinned)) {
+ // group title
+ pick_ctx->type = PICK_GROUP_TITLE;
+ pick_ctx->item_grp_idx = idx;
+ pick_ctx->item_idx = idx;
+ pick_ctx->grp_idx = 0;
+ }
+ else if (is_album_art_column && group_level == priv->artwork_subgroup_level) {
+ pick_ctx->type = PICK_ALBUM_ART;
+ pick_ctx->item_grp_idx = idx;
+ pick_ctx->grp_idx = min ((y - grp_title_height) / rowheight, grp->num_items - 1);
+ pick_ctx->item_idx = idx + pick_ctx->grp_idx;
+ }
+ else if (grp->subgroups && ddb_listview_list_pickpoint_subgroup (listview, grp->subgroups, x, orig_y, idx, grp_y + grp_title_height, group_level + 1, pin_offset + grp_title_height, pick_ctx)) {
+ // do nothing: the recursive call already set pick_ctx
+ }
+ else if (y >= grp_title_height + grp->num_items * rowheight) {
+ // whitespace after tracks
+ pick_ctx->type = PICK_EMPTY_SPACE;
+ pick_ctx->item_grp_idx = idx;
+ pick_ctx->grp_idx = grp->num_items - 1;
+ pick_ctx->item_idx = idx + pick_ctx->grp_idx;
+ }
+ else {
+ pick_ctx->type = PICK_ITEM;
+ pick_ctx->item_grp_idx = idx;
+ pick_ctx->grp_idx = (y - grp_title_height) / rowheight;
+ pick_ctx->item_idx = idx + pick_ctx->grp_idx;
+ }
+ return 1;
+ }
+ grp_y += grp->height;
+ idx += grp->num_items;
+ grp = grp->next;
+ }
+ return 0;
+}
+
+// input: absolute y coord in list (not in window)
+// returns -1 if nothing was hit, otherwise returns pointer to a group, and item idx
+// item idx may be set to -1 if group title was hit
+static void
+ddb_listview_list_pickpoint (DdbListview *listview, int x, int y, DdbListviewPickContext *pick_ctx) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ if (y < 0) {
+ // area above playlist
+ pick_ctx->type = PICK_ABOVE_PLAYLIST;
+ pick_ctx->item_grp_idx = 0;
+ pick_ctx->grp_idx = 0;
+ // select first playlist item
+ pick_ctx->item_idx = 0;
+ pick_ctx->grp = NULL;
+ return;
+ }
+ else if (y > priv->fullheight) {
+ // area below playlist
+ pick_ctx->type = PICK_BELOW_PLAYLIST;
+ pick_ctx->item_grp_idx = -1;
+ pick_ctx->grp_idx = -1;
+ // select last playlist item
+ pick_ctx->item_idx = listview->datasource->count () - 1;
+ pick_ctx->grp = NULL;
+ return;
+ }
+
+ deadbeef->pl_lock ();
+ ddb_listview_groupcheck (listview);
+ int found = ddb_listview_list_pickpoint_subgroup (listview, priv->groups, x, y, 0, 0, 0, 0, pick_ctx);
+ deadbeef->pl_unlock ();
+
+ if (!found) {
+ // area at the end of playlist or unknown
+ pick_ctx->type = PICK_EMPTY_SPACE;
+ pick_ctx->item_grp_idx = -1;
+ pick_ctx->grp_idx = -1;
+ pick_ctx->item_idx = listview->datasource->count () - 1;
+ pick_ctx->grp = NULL;
+ }
+ return;
+}
+
+static void
+draw_cairo_rectangle (cairo_t *cr, GdkColor *color, int x, int y, int width, int height) {
+ cairo_set_source_rgb(cr, color->red/65535., color->green/65535., color->blue/65535.);
+ cairo_rectangle(cr, x, y, width, height);
+ cairo_fill(cr);
+}
+
+static void
+render_treeview_background (DdbListview *listview, cairo_t *cr, int selected, int even, int x, int y, int w, int h, GdkRectangle *clip) {
+ if (gtkui_override_listview_colors()) {
+ GdkColor clr;
+ if (selected) {
+ gtkui_get_listview_selection_color(&clr);
+ }
+ else {
+ even ? gtkui_get_listview_even_row_color(&clr) : gtkui_get_listview_odd_row_color(&clr);
+ }
+ draw_cairo_rectangle(cr, &clr, x, y, w, h);
+ }
+ else {
+#if GTK_CHECK_VERSION(3,0,0)
+ GtkStyleContext *context = gtk_widget_get_style_context(theme_treeview);
+ gtk_style_context_save (context);
+ gtk_style_context_set_state(context, selected ? GTK_STATE_FLAG_SELECTED : GTK_STATE_FLAG_NORMAL);
+ gtk_style_context_add_region(context, GTK_STYLE_REGION_ROW, even ? GTK_REGION_EVEN : GTK_REGION_ODD);
+ gtk_render_background(context, cr, x, y, w, h);
+ gtk_style_context_restore (context);
+#else
+ GTK_WIDGET_SET_FLAGS(theme_treeview, GTK_HAS_FOCUS);
+ gtk_paint_flat_box(gtk_widget_get_style(theme_treeview), gtk_widget_get_window(listview->list), selected ? GTK_STATE_SELECTED : GTK_STATE_NORMAL, GTK_SHADOW_NONE, clip, theme_treeview, even ? "cell_even_ruled" : "cell_odd_ruled", x, y, w, h);
+ GTK_WIDGET_UNSET_FLAGS(theme_treeview, GTK_HAS_FOCUS);
+#endif
+ }
+}
+
+static void
+fill_list_background (DdbListview *listview, cairo_t *cr, int x, int y, int w, int h, GdkRectangle *clip) {
+ if (!gtkui_override_listview_colors()) {
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_render_background(gtk_widget_get_style_context(mainwin), cr, x, y, w, h);
+ gtk_render_background(gtk_widget_get_style_context(listview->list), cr, x, y, w, h);
+#else
+ gtk_paint_flat_box(gtk_widget_get_style(mainwin), gtk_widget_get_window(listview->list), GTK_STATE_NORMAL, GTK_SHADOW_NONE, clip, mainwin, NULL, x, y, w, h);
+ gtk_paint_flat_box(gtk_widget_get_style(listview->list), gtk_widget_get_window(listview->list), GTK_STATE_NORMAL, GTK_SHADOW_NONE, clip, listview->list, NULL, x, y, w, h);
+#endif
+ }
+ render_treeview_background(listview, cr, FALSE, TRUE, x, y, w, h, clip);
+}
+
+static void
+ddb_listview_list_render_subgroup (DdbListview *listview, cairo_t *cr, GdkRectangle *clip, DdbListviewGroup *grp, int idx, int grp_y, const int cursor_index, const int current_group_depth, int title_offset, const int subgroup_artwork_offset, const int subgroup_artwork_width, const int pin_offset) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ const int scrollx = -priv->hscrollpos;
+ const int row_height = priv->rowheight;
+ const int total_width = priv->totalwidth;
+
+ // find 1st group
+ while (grp && grp_y + grp->height < clip->y) {
+ grp_y += grp->height;
+ idx += grp->num_items;
+ grp = grp->next;
+ }
+
+ while (grp && grp_y < clip->y + clip->height) {
+ const int title_height = grp->group_label_visible ? priv->grouptitle_height : 0;
+ const int is_pinned = gtkui_groups_pinned && grp_y < pin_offset && grp_y + grp->height >= 0;
+
+ // only render list items when at the deepest group level
+ if (!grp->subgroups) {
+ DdbListviewIter it = grp->head;
+ listview->datasource->ref(it);
+ for (int i = 0, yy = grp_y + title_height; it && i < grp->num_items && yy < clip->y + clip->height; i++, yy += row_height) {
+ if (yy + row_height >= clip->y && (!gtkui_groups_pinned || yy + row_height >= pin_offset)) {
+ ddb_listview_list_render_row_background(listview, cr, it, i & 1, idx+i == cursor_index, scrollx, yy, total_width, row_height, clip);
+ ddb_listview_list_render_row_foreground(listview, cr, it, i & 1, idx+i, yy, total_width, row_height, clip->x, clip->x+clip->width);
+ }
+ it = next_playitem(listview, it);
+ }
+ if (it) {
+ listview->datasource->unref(it);
+ }
+ }
+
+ int subgroup_title_offset;
+ if (current_group_depth == priv->artwork_subgroup_level) {
+ subgroup_title_offset = subgroup_artwork_offset;
+ }
+ else {
+ subgroup_title_offset = title_offset + (grp->group_label_visible ? priv->subgroup_title_padding : 0);
+ }
+
+ if (grp->subgroups) {
+ // render subgroups before album art and titles
+ ddb_listview_list_render_subgroup(listview, cr, clip, grp->subgroups, idx, grp_y + title_height, cursor_index, current_group_depth + 1, subgroup_title_offset, subgroup_artwork_offset, subgroup_artwork_width, pin_offset + title_height);
+ }
+
+ int grp_next_y = grp_y + grp->height;
+ if (current_group_depth == priv->artwork_subgroup_level) {
+ // draw album art
+ int min_y = 0;
+ if (is_pinned) {
+ if (grp->group_label_visible) {
+ min_y = min(title_height+pin_offset, grp_next_y);
+ }
+ }
+ else {
+ min_y = grp_y+title_height;
+ }
+ ddb_listview_list_render_album_art(listview, cr, grp, min_y, grp_next_y, grp_y + title_height, clip);
+ }
+
+ int title_width;
+ if (current_group_depth > priv->artwork_subgroup_level) {
+ title_width = subgroup_artwork_width;
+ }
+ else {
+ title_width = total_width;
+ }
+
+ if (is_pinned && clip->y <= title_height + pin_offset) {
+ // draw pinned group title
+ int y = min(pin_offset, grp_next_y-title_height);
+ fill_list_background(listview, cr, scrollx, y, total_width, title_height, clip);
+ if (listview->renderer->draw_group_title && title_height > 0) {
+ listview->renderer->draw_group_title(listview, cr, grp->head, title_offset, y, title_width, title_height, current_group_depth);
+ }
+ }
+ else if (clip->y <= grp_y + title_height) {
+ // draw normal group title
+ if (listview->renderer->draw_group_title && title_height > 0) {
+ listview->renderer->draw_group_title(listview, cr, grp->head, title_offset, grp_y, title_width, title_height, current_group_depth);
+ }
+ }
+
+ idx += grp->num_items;
+ grp_y += grp->height;
+ grp = grp->next;
+ }
+}
+
+static void
+ddb_listview_list_render (DdbListview *listview, cairo_t *cr, GdkRectangle *clip) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ if (priv->scrollpos == -1) {
+ return; // too early
+ }
+ ddb_listview_groupcheck (listview);
+
+ int cursor_index = listview->datasource->cursor();
+
+ // Calculate which side of the playlist the (first) album art cover is on to tell where to draw subgroup titles
+ int subgroup_artwork_offset = -priv->hscrollpos + priv->subgroup_title_padding;
+ int subgroup_artwork_width = priv->totalwidth;
+ int x = 0;
+ for (DdbListviewColumn *c = priv->columns; c; x += c->width, c = c->next) {
+ if (listview->datasource->is_album_art_column(c->user_data)) {
+ int middle = x + c->width / 2;
+ if (middle < priv->totalwidth / 2) {
+ subgroup_artwork_offset = -priv->hscrollpos + x + c->width;
+ }
+ else {
+ subgroup_artwork_width = -priv->hscrollpos + x;
+ }
+ break;
+ }
+ }
+
+ draw_begin (&priv->listctx, cr);
+ draw_begin (&priv->grpctx, cr);
+ fill_list_background(listview, cr, clip->x, clip->y, clip->width, clip->height, clip);
+
+ ddb_listview_list_render_subgroup(listview, cr, clip, priv->groups, 0, -priv->scrollpos, cursor_index, 0, -priv->hscrollpos, subgroup_artwork_offset, subgroup_artwork_width, 0);
+
+ draw_end (&priv->listctx);
+ draw_end (&priv->grpctx);
+}
+
+static void
+ddb_listview_draw_dnd_marker (DdbListview *listview, cairo_t *cr) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ if (priv->drag_motion_y < 0) {
+ return;
+ }
+ int drag_motion_y = priv->drag_motion_y - priv->scrollpos;
+
+ GdkColor clr;
+ gtkui_get_listview_cursor_color (&clr);
+ draw_cairo_rectangle(cr, &clr, 0, drag_motion_y-1, priv->list_width, 3);
+ draw_cairo_rectangle(cr, &clr, 0, drag_motion_y-3, 3, 7);
+ draw_cairo_rectangle(cr, &clr, priv->list_width-3, drag_motion_y-3, 3, 7);
+
+}
+
+static void
+ddb_listview_update_fonts (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ draw_init_font (&priv->listctx, DDB_LIST_FONT, 1);
+ draw_init_font (&priv->grpctx, DDB_GROUP_FONT, 1);
+ int row_height = draw_get_listview_rowheight (&priv->listctx);
+ int grptitle_height = draw_get_listview_rowheight (&priv->grpctx);
+ if (row_height != priv->rowheight || grptitle_height != priv->calculated_grouptitle_height) {
+ priv->rowheight = row_height;
+ priv->calculated_grouptitle_height = grptitle_height;
+ ddb_listview_build_groups (listview);
+ }
+
+ ddb_listview_header_update_fonts (DDB_LISTVIEW_HEADER(listview->header));
+}
+
+static void
+draw_list_rectangle (DdbListview *listview, cairo_t *cr, GdkRectangle *clip) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ cairo_rectangle(cr, clip->x, clip->y, clip->width, clip->height);
+ cairo_clip(cr);
+ cairo_set_line_width(cr, 1);
+ cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
+ ddb_listview_list_render(listview, cr, clip);
+ if (priv->drag_motion_y >= 0 && priv->drag_motion_y-priv->scrollpos-3 < clip->y+clip->height && priv->drag_motion_y-priv->scrollpos+3 >= clip->y) {
+ ddb_listview_draw_dnd_marker(listview, cr);
+ }
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+static int
+list_is_realized (DdbListview *listview) {
+ return gtk_widget_get_realized (GTK_WIDGET (listview));
+}
+
+static gboolean
+ddb_listview_list_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data(G_OBJECT (widget), "owner"));
+ if (!list_is_realized (listview)) {
+ return FALSE;
+ }
+ cairo_rectangle_list_t *list = cairo_copy_clip_rectangle_list(cr);
+ for (int i = 0; i < list->num_rectangles; i++) {
+ cairo_save(cr);
+ GdkRectangle clip =
+ {
+ .x = floor(list->rectanglesi.x),
+ .y = floor(list->rectanglesi.y),
+ .width = ceil(list->rectanglesi.width),
+ .height = ceil(list->rectanglesi.height)
+ };
+ draw_list_rectangle(listview, cr, &clip);
+ cairo_restore(cr);
+ }
+ cairo_rectangle_list_destroy(list);
+ return TRUE;
+}
+#else
+static int
+list_is_realized (DdbListview *listview) {
+ return GTK_OBJECT_FLAGS(listview) & GTK_REALIZED && gtk_widget_get_style(theme_treeview)->depth != -1;
+}
+static gboolean
+ddb_listview_list_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data(G_OBJECT (widget), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+
+ if (!priv->view_realized) {
+ return FALSE; // drawing was called too early
+ }
+
+ GdkRectangle *rectangles;
+ int num_rectangles;
+ gdk_region_get_rectangles(event->region, &rectangles, &num_rectangles);
+ for (int i = 0; i < num_rectangles; i++) {
+ GdkRectangle *clip = &rectanglesi;
+ cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
+ draw_list_rectangle(listview, cr, clip);
+ cairo_destroy(cr);
+ }
+ g_free(rectangles);
+ return TRUE;
+}
+#endif
+
+static void
+scroll_by (GtkWidget *scrollbar, gdouble delta) {
+ GtkRange *range = GTK_RANGE(scrollbar);
+ gdouble step = pow(gtk_adjustment_get_page_size(gtk_range_get_adjustment(range)), 2./3.);
+ gtk_range_set_value(range, max(0, gtk_range_get_value(range) + step * delta));
+}
+
+static gboolean
+ddb_listview_scroll_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ GdkEventScroll *ev = (GdkEventScroll*)event;
+
+ switch(ev->direction) {
+ case GDK_SCROLL_UP:
+ scroll_by(listview->scrollbar, -1);
+ break;
+ case GDK_SCROLL_DOWN:
+ scroll_by(listview->scrollbar, 1);
+ break;
+ case GDK_SCROLL_LEFT:
+ scroll_by(listview->hscrollbar, -1);
+ break;
+ case GDK_SCROLL_RIGHT:
+ scroll_by(listview->hscrollbar, 1);
+ break;
+#if GTK_CHECK_VERSION(3,4,0)
+ case GDK_SCROLL_SMOOTH:
+ {
+ gdouble x, y;
+ if (gdk_event_get_scroll_deltas(event, &x, &y)) {
+ scroll_by(listview->hscrollbar, x);
+ scroll_by(listview->scrollbar, y);
+ }
+ break;
+ }
+#endif
+ default:
+ break;
+ }
+
+ return FALSE;
+}
+
+static void
+invalidate_album_art_cells (DdbListview *listview, int x1, int x2, int y, int h) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int x = -priv->hscrollpos;
+ for (DdbListviewColumn *c = priv->columns; c && x < x2; x += c->width, c = c->next) {
+ if (x + c->width > x1 && listview->datasource->is_album_art_column(c->user_data)) {
+ gtk_widget_queue_draw_area(listview->list, x, y, c->width, h);
+ }
+ }
+}
+
+static int
+find_subgroup_title_heights (DdbListview *listview, DdbListviewGroup *group, int group_y, int at_y) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ while (group->next && group_y + group->height < at_y) {
+ group_y += group->height;
+ group = group->next;
+ }
+
+ int height = group->group_label_visible ? priv->grouptitle_height : 0;
+ if (group->subgroups) {
+ height += find_subgroup_title_heights(listview, group->subgroups, group_y, at_y);
+ }
+
+ return height;
+}
+
+static void
+invalidate_group (DdbListview *listview, int at_y) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ DdbListviewGroup *group = priv->groups;
+ if (!group) {
+ return;
+ }
+
+ int next_group_y = group->height;
+ while (group->next && next_group_y < at_y) {
+ group = group->next;
+ next_group_y += group->height;
+ }
+
+ int group_titles_height = group->group_label_visible ? priv->grouptitle_height : 0;
+ if (group->subgroups) {
+ group_titles_height += find_subgroup_title_heights(listview, group->subgroups, next_group_y - group->height, at_y);
+ }
+
+ int group_height = next_group_y - at_y;
+ if (next_group_y > at_y) {
+ gtk_widget_queue_draw_area (listview->list, 0, 0, priv->list_width, min(group_titles_height, group_height));
+ }
+ if (group_height > group_titles_height) {
+ invalidate_album_art_cells (listview, 0, priv->list_width, group_titles_height, group_height);
+ }
+}
+
+static void
+ddb_listview_vscroll_value_changed (GtkRange *widget, gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int newscroll = round(gtk_range_get_value (GTK_RANGE (widget)));
+ if (newscroll == priv->scrollpos) {
+ return;
+ }
+
+ if (listview->delegate->vscroll_changed) {
+ listview->delegate->vscroll_changed (newscroll);
+ }
+ if (gtkui_groups_pinned && priv->grouptitle_height > 0) {
+ invalidate_group(listview, max(priv->scrollpos, newscroll));
+ }
+ GdkWindow *list_window = gtk_widget_get_window(listview->list);
+ if (list_window) {
+ gdk_window_scroll(list_window, 0, priv->scrollpos - newscroll);
+ }
+ priv->scrollpos = newscroll;
+}
+
+static void
+ddb_listview_hscroll_value_changed (GtkRange *widget, gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int newscroll = round(gtk_range_get_value (GTK_RANGE (widget)));
+ if (newscroll == priv->hscrollpos) {
+ return;
+ }
+
+ int diff = priv->hscrollpos - newscroll;
+ GdkWindow *list_window = gtk_widget_get_window(listview->list);
+ if (list_window) {
+ gdk_window_scroll(gtk_widget_get_window(listview->list), diff, 0);
+ }
+ priv->hscrollpos = newscroll;
+ ddb_listview_header_set_hscrollpos(DDB_LISTVIEW_HEADER(listview->header), newscroll);
+}
+
+static gboolean
+ddb_listview_list_drag_motion (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ ddb_listview_list_track_dragdrop (listview, x, y);
+
+ // NOTE: we need to check whether the source supports TARGET_PLAYLIST_AND_ITEM_INDEXES
+ // in order to know which GdkDragAction to use
+ GList *targets = gdk_drag_context_list_targets (drag_context);
+ gboolean source_is_listview = FALSE;
+ int cnt = g_list_length (targets);
+ for (int i = 0; i < cnt; i++) {
+ GdkAtom a = GDK_POINTER_TO_ATOM (g_list_nth_data (targets, i));
+ gchar *nm = gdk_atom_name (a);
+ if (!strcmp (nm, TARGET_PLAYLIST_AND_ITEM_INDEXES)) {
+ source_is_listview = TRUE;
+ g_free (nm);
+ break;
+ }
+ g_free (nm);
+ }
+
+ if (!source_is_listview) {
+ // source doesn't support TARGET_PLAYITEMS, so it's probably a file manager
+ // and GDK_ACTION_MOVE wouldn't make any sense: only support GDK_ACTION_COPY
+ gdk_drag_status (drag_context, GDK_ACTION_COPY, time);
+ }
+ else {
+ // source is listview, so we can support both GDK_ACTION_MOVE and GDK_ACTION_COPY
+ GdkModifierType mask;
+
+ GdkWindow *win = gtk_widget_get_window (widget);
+#if GTK_CHECK_VERSION(3,0,0)
+ GdkDeviceManager *device_manager = gdk_display_get_device_manager (gdk_window_get_display (win));
+ GdkDevice *pointer = gdk_device_manager_get_client_pointer (device_manager);
+ gdk_window_get_device_position (win, pointer, NULL, NULL, &mask);
+#else
+ gdk_window_get_pointer (win, NULL, NULL, &mask);
+#endif
+ if (mask & GDK_CONTROL_MASK) {
+ gdk_drag_status (drag_context, GDK_ACTION_COPY, time);
+ }
+ else {
+ gdk_drag_status (drag_context, GDK_ACTION_MOVE, time);
+ }
+ }
+ return FALSE;
+}
+
+
+static gboolean
+ddb_listview_list_drag_drop (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data) {
+ return TRUE;
+}
+
+static gchar **
+ddb_listview_build_drag_uri_list (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+
+ ddb_playlist_t *plt = deadbeef->plt_get_for_idx(priv->drag_source_playlist);
+ if (plt == NULL) {
+ return NULL;
+ }
+
+ deadbeef->pl_lock ();
+ int num_selected = deadbeef->plt_get_sel_count (priv->drag_source_playlist);
+ if (num_selected < 1) {
+ // no track selected
+ deadbeef->pl_unlock ();
+ return NULL;
+ }
+ gchar **uri_list = g_new0 (gchar *, num_selected + 1);
+ if (!uri_list) {
+ deadbeef->pl_unlock ();
+ return NULL;
+ }
+ // NOTE: hash table is used to detect duplicates since we don't want to
+ // copy files more than once
+ GHashTable *table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+ DdbListviewIter it = deadbeef->plt_get_head_item (plt, PL_MAIN);
+ deadbeef->plt_unref(plt);
+ int idx = 0;
+ while (it) {
+ if (listview->datasource->is_selected (it)) {
+ const char *path = deadbeef->pl_find_meta (it, ":URI");
+
+ gboolean is_local_file = FALSE;
+ gboolean is_uri_scheme = FALSE;
+ if (path0 == '/') {
+ is_local_file = TRUE;
+ }
+ else if (!strncasecmp (path, "file://", 7)) {
+ is_local_file = TRUE;
+ is_uri_scheme = TRUE;
+ }
+ if (is_local_file && !g_hash_table_lookup (table, path)) {
+ // new track, add to hash table and uri list
+ gchar *key = g_strdup (path);
+ g_hash_table_replace (table, key, key);
+
+ gchar *uri = NULL;
+ if (!is_uri_scheme) {
+ // we need to convert file name to URI scheme
+ uri = g_filename_to_uri (path, NULL, NULL);
+ }
+ else {
+ // path is already URI scheme, just copy string
+ uri = g_strdup (path);
+ }
+ if (uri) {
+ uri_listidx++ = uri;
+ }
+ }
+ }
+ it = next_playitem (listview, it);
+ }
+ uri_listidx = NULL;
+
+ deadbeef->pl_unlock ();
+
+ g_hash_table_destroy (table);
+ table = NULL;
+
+ return uri_list;
+}
+
+static void
+ddb_listview_list_drag_data_get (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ GtkSelectionData *selection_data,
+ guint target_type,
+ guint time,
+ gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+
+ switch (target_type) {
+ case INFO_TARGET_URIS:
+ {
+ // format as URI_LIST
+ gchar **uris = ddb_listview_build_drag_uri_list (listview);
+ if (uris) {
+ gtk_selection_data_set_uris (selection_data, uris);
+ g_strfreev (uris);
+ uris = NULL;
+ }
+ }
+ break;
+ case INFO_TARGET_PLAYLIST_ITEM_INDEXES:
+ {
+ ddb_playlist_t *plt = deadbeef->plt_get_for_idx(priv->drag_source_playlist);
+ if (plt == NULL) {
+ break;
+ }
+ // format as "STRING" consisting of array of pointers
+ int nsel = deadbeef->plt_getselcount (plt);
+ if (!nsel) {
+ deadbeef->plt_unref(plt);
+ break; // something wrong happened
+ }
+ uint32_t *ptr = malloc ((nsel+1) * sizeof (uint32_t));
+ *ptr = priv->drag_source_playlist;
+ int idx = 0;
+ int i = 1;
+ DdbListviewIter it = deadbeef->plt_get_head_item (plt, PL_MAIN);
+ deadbeef->plt_unref(plt);
+ for (; it; idx++) {
+ if (listview->datasource->is_selected (it)) {
+ ptri = idx;
+ i++;
+ }
+ it = next_playitem(listview, it);
+ }
+ GdkAtom target = gtk_selection_data_get_target (selection_data);
+ gtk_selection_data_set (selection_data, target, sizeof (uint32_t) * 8, (const guchar *)ptr, (nsel+1) * sizeof (uint32_t));
+ free (ptr);
+ }
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+}
+
+
+static void
+ddb_listview_list_drag_data_received (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+
+ priv->scroll_direction = 0; // interrupt autoscrolling, if on
+ priv->scroll_active = 0;
+ priv->drag_motion_y = -1;
+ if (!listview->delegate->external_drag_n_drop || !listview->delegate->drag_n_drop) {
+ gtk_drag_finish (drag_context, TRUE, FALSE, time);
+ return;
+ }
+ int sel = ddb_listview_dragdrop_get_row_from_coord (listview, x, y);
+ DdbListviewIter it = NULL;
+ if (sel == -1) {
+ if (listview->datasource->count () != 0) {
+ sel = listview->datasource->count ();
+ }
+ }
+ if (sel != -1) {
+ it = listview->datasource->get_for_idx (sel);
+ }
+
+ gchar *ptr=(char*)gtk_selection_data_get_data (selection_data);
+ gint len = gtk_selection_data_get_length (selection_data);
+ if (info == INFO_TARGET_PLAYITEM_POINTERS) {
+ ddb_listview_clear_sort (listview);
+
+ DdbListviewIter *tracks = (DdbListviewIter *)ptr;
+ int count = len / sizeof (DdbListviewIter);
+
+ if (listview->delegate->tracks_copy_drag_n_drop != NULL) {
+ listview->delegate->tracks_copy_drag_n_drop (it, tracks, count);
+ }
+
+ for (int i = 0; i < count; i++) {
+ listview->datasource->unref (tracksi);
+ }
+ }
+ else if (info == INFO_TARGET_URIS) {
+ ddb_listview_clear_sort (listview);
+ // this happens when dropped from file manager
+ char *mem = malloc (len+1);
+ memcpy (mem, ptr, len);
+ memlen = 0;
+ // we don't pass control structure, but there's only one drag-drop view currently
+ listview->delegate->external_drag_n_drop (it, mem, len);
+ if (it) {
+ UNREF (it);
+ }
+ }
+ // list of 32bit ints, DDB_URI_LIST target
+ else if (info == INFO_TARGET_PLAYLIST_ITEM_INDEXES) {
+ ddb_listview_clear_sort (listview);
+ uint32_t *d= (uint32_t *)ptr;
+ int plt = *d;
+ d++;
+ int length = (len/4)-1;
+ DdbListviewIter drop_before = it;
+ // find last selected
+ if (plt == deadbeef->plt_get_curr_idx ()) {
+ while (drop_before && listview->datasource->is_selected (drop_before)) {
+ drop_before = next_playitem(listview, drop_before);
+ }
+ }
+ ddb_playlist_t *p = deadbeef->plt_get_for_idx (plt);
+ if (p) {
+ listview->delegate->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) {
+ UNREF (drop_before);
+ }
+ }
+ gtk_drag_finish (drag_context, TRUE, FALSE, time);
+}
+
+static gboolean
+ddb_listview_list_drag_failed (GtkWidget *widget,
+ GdkDragContext *arg1,
+ GtkDragResult arg2,
+ gpointer user_data) {
+ return TRUE;
+}
+
+
+static void
+ddb_listview_list_drag_leave (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ guint time,
+ gpointer user_data) {
+ DdbListview *pl = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ ddb_listview_list_track_dragdrop (pl, -1, -1);
+}
+
+static void
+adjust_scrollbar (GtkWidget *scrollbar, int upper, int page_size) {
+ GtkRange *range = GTK_RANGE(scrollbar);
+ if (page_size >= upper) {
+ gtk_range_set_value(range, 0);
+ gtk_range_set_adjustment(range, NULL);
+ gtk_widget_hide(scrollbar);
+ return;
+ }
+
+ gdouble scrollpos = gtk_range_get_value(range);
+ GtkAdjustment *adj = gtk_range_get_adjustment(range);
+ int old_page_size = gtk_adjustment_get_page_size(adj);
+ int old_upper = gtk_adjustment_get_upper(adj);
+ if (scrollpos > 0 && page_size != old_page_size && scrollpos >= old_upper - old_page_size) {
+ scrollpos = upper - page_size;
+ }
+ gtk_range_set_adjustment(range, GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, upper, SCROLL_STEP, page_size/2, page_size)));
+ gtk_range_set_value(range, round(scrollpos));
+ gtk_widget_show(scrollbar);
+}
+
+static gboolean
+ddb_listview_list_setup_vscroll (void *user_data) {
+ DdbListview *listview = user_data;
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ ddb_listview_groupcheck (listview);
+ adjust_scrollbar (listview->scrollbar, priv->fullheight, priv->list_height);
+ return FALSE;
+}
+
+static gboolean
+ddb_listview_list_setup_hscroll (void *user_data) {
+ DdbListview *listview = user_data;
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int size = total_columns_width (listview);
+ ddb_listview_list_update_total_width (listview, size, priv->list_width);
+ adjust_scrollbar (listview->hscrollbar, size, priv->list_width);
+ return FALSE;
+}
+
+void
+ddb_listview_draw_row (DdbListview *listview, int row, DdbListviewIter it) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int y = ddb_listview_get_row_pos(listview, row, NULL) - priv->scrollpos;
+ if (y + priv->rowheight > 0 && y <= priv->list_height) {
+ gtk_widget_queue_draw_area (listview->list, 0, y, priv->list_width, priv->rowheight);
+ }
+}
+
+// coords passed are window-relative
+static void
+ddb_listview_list_render_row_background (DdbListview *listview, cairo_t *cr, DdbListviewIter it, int even, int cursor, int x, int y, int w, int h, GdkRectangle *clip) {
+ // draw background even for selection -- for theme translucency
+ int draw_selected = it && listview->datasource->is_selected (it);
+ int draw_normal = !gtkui_override_listview_colors() || !draw_selected;
+ if (draw_normal && !even) {
+ render_treeview_background(listview, cr, FALSE, even, x, y, w, h, clip);
+ }
+ if (draw_selected) {
+ render_treeview_background(listview, cr, TRUE, even, x, y, w, h, clip);
+ }
+
+ if (cursor && gtk_widget_has_focus (listview->list)) {
+ // not all gtk engines/themes render focus rectangle in treeviews but we want it anyway
+ GdkColor clr;
+ gtkui_get_listview_cursor_color (&clr);
+ cairo_set_source_rgb (cr, clr.red/65535., clr.green/65535., clr.blue/65535.);
+ cairo_rectangle (cr, x+1, y+1, w-1, h-1);
+ cairo_stroke (cr);
+ }
+}
+
+static void
+ddb_listview_list_render_row_foreground (DdbListview *listview, cairo_t *cr, DdbListviewIter it, int even, int idx, int y, int w, int h, int x1, int x2) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int x = -priv->hscrollpos;
+ for (DdbListviewColumn *c = priv->columns; c && x < x2; x += c->width, c = c->next) {
+ if (x + c->width > x1 && !listview->datasource->is_album_art_column(c->user_data)) {
+ listview->renderer->draw_column_data (listview, cr, it, idx, c->align_right, c->user_data, c->color_override ? &c->color : NULL, x, y, c->width, h, even);
+ }
+ }
+}
+
+static void
+ddb_listview_list_render_album_art (DdbListview *listview, cairo_t *cr, DdbListviewGroup *grp, int min_y, int grp_next_y, int y, GdkRectangle *clip) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int x = -priv->hscrollpos;
+ for (DdbListviewColumn *c = priv->columns; c && x < clip->x+clip->width; x += c->width, c = c->next) {
+ if (listview->datasource->is_album_art_column(c->user_data) && x + c->width > clip->x) {
+ fill_list_background(listview, cr, x, y, c->width, grp->height-priv->grouptitle_height, clip);
+ if (priv->grouptitle_height > 0) {
+ listview->renderer->draw_album_art(listview, cr, grp, c->user_data, min_y, grp_next_y, x, y, c->width, grp->height-priv->grouptitle_height, c->align_right);
+ }
+ }
+ }
+}
+
+// Deselect all items in the current list
+static void
+ddb_listview_deselect_all (DdbListview *listview) {
+ int notify_singly = listview->datasource->sel_count() <= NUM_ROWS_TO_NOTIFY_SINGLY;
+ DdbListviewIter it;
+ int idx = 0;
+ for (it = listview->datasource->head (); it; idx++) {
+ if (listview->datasource->is_selected (it)) {
+ listview->datasource->select (it, 0);
+ if (notify_singly) {
+ ddb_listview_draw_row (listview, idx, it);
+ listview->delegate->selection_changed (listview, it, idx);
+ }
+ }
+ it = next_playitem(listview, it);
+ }
+ if (!notify_singly) {
+ ddb_listview_refresh (listview, DDB_REFRESH_LIST);
+ listview->delegate->selection_changed(listview, NULL, -1);
+ }
+}
+
+// (De)select a whole group
+// grp = group to be (de)selected
+// item_idx = index of first item in the group or -1
+// deselect: 0 = select group, 1 = deselect group
+static void
+ddb_listview_select_group (DdbListview *listview, DdbListviewGroup *grp, int first_item_idx, int deselect) {
+ if (grp == NULL) {
+ return;
+ }
+ int notify_singly = grp->num_items <= NUM_ROWS_TO_NOTIFY_SINGLY;
+ DdbListviewIter it = grp->head;
+ listview->datasource->ref (it);
+ if (first_item_idx == -1) {
+ first_item_idx = listview->datasource->get_idx (it);
+ }
+ for (int group_idx = 0; it && group_idx < grp->num_items; group_idx++) {
+ if (deselect) {
+ listview->datasource->select (it, 0);
+ }
+ else {
+ listview->datasource->select (it, 1);
+ }
+ if (notify_singly) {
+ ddb_listview_draw_row (listview, first_item_idx + group_idx, it);
+ listview->delegate->selection_changed (listview, it, first_item_idx + group_idx);
+ }
+ it = next_playitem(listview, it);
+ }
+ if (it) {
+ listview->datasource->unref (it);
+ }
+
+ if (!notify_singly) {
+ ddb_listview_refresh (listview, DDB_REFRESH_LIST);
+ listview->delegate->selection_changed(listview, NULL, -1);
+ }
+}
+
+// Toggle selection of group
+// if at least one item of the group is selected, deselect the whole group
+// if no item of the group is selected, select all group items
+// grp: group to be toggled
+// item_idx: index of first item in the group or -1
+static void
+ddb_listview_toggle_group_selection (DdbListview *listview, DdbListviewGroup *grp, int item_idx) {
+ if (grp == NULL) {
+ return;
+ }
+ DdbListviewIter it = grp->head;
+ listview->datasource->ref (it);
+ if (item_idx == -1) {
+ item_idx = listview->datasource->get_idx (it);
+ }
+ int deselect = 0;
+ int group_idx = 0;
+ // check if at least one item is selected
+ for (group_idx = 0; it && group_idx < grp->num_items; group_idx++) {
+ if (listview->datasource->is_selected (it)) {
+ deselect = 1;
+ break;
+ }
+ it = next_playitem(listview, it);
+ }
+ if (it) {
+ listview->datasource->unref (it);
+ }
+
+ ddb_listview_select_group (listview, grp, item_idx, deselect);
+}
+
+void
+ddb_listview_select_single (DdbListview *listview, int sel) {
+ deadbeef->pl_lock ();
+ ddb_listview_deselect_all(listview);
+ DdbListviewIter sel_it = listview->datasource->get_for_idx (sel);
+ if (sel_it) {
+ listview->datasource->select (sel_it, 1);
+ ddb_listview_draw_row (listview, sel, sel_it);
+ listview->delegate->selection_changed (listview, sel_it, sel);
+ listview->datasource->unref(sel_it);
+ }
+ deadbeef->pl_unlock ();
+}
+
+ void
+ddb_listview_update_cursor (DdbListview *listview, int cursor) {
+ int prev = listview->datasource->cursor ();
+ listview->datasource->set_cursor (cursor);
+ if (cursor != -1) {
+ DdbListviewIter it = listview->datasource->get_for_idx (cursor);
+ ddb_listview_draw_row (listview, cursor, it);
+ UNREF (it);
+ }
+ if (prev != -1 && prev != cursor) {
+ DdbListviewIter it = listview->datasource->get_for_idx (prev);
+ ddb_listview_draw_row (listview, prev, it);
+ UNREF (it);
+ }
+}
+
+struct set_cursor_t {
+ int cursor;
+ DdbListview *pl;
+};
+
+static gboolean
+set_cursor_and_scroll_cb (gpointer data) {
+ struct set_cursor_t *sc = (struct set_cursor_t *)data;
+ DdbListview *listview = sc->pl;
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+
+ ddb_listview_update_cursor (listview, sc->cursor);
+ ddb_listview_select_single (listview, sc->cursor);
+
+ int accumulated_title_height;
+ int cursor_scroll = ddb_listview_get_row_pos (listview, sc->cursor, &accumulated_title_height);
+ int newscroll = priv->scrollpos;
+ if (!gtkui_groups_pinned && cursor_scroll < priv->scrollpos) {
+ newscroll = cursor_scroll;
+ }
+ else if (gtkui_groups_pinned && cursor_scroll < priv->scrollpos + accumulated_title_height) {
+ newscroll = cursor_scroll - accumulated_title_height;
+ }
+ else if (cursor_scroll + priv->rowheight >= priv->scrollpos + priv->list_height) {
+ newscroll = cursor_scroll + priv->rowheight - priv->list_height + 1;
+ if (newscroll < 0) {
+ newscroll = 0;
+ }
+ }
+ if (priv->scrollpos != newscroll) {
+ GtkWidget *range = listview->scrollbar;
+ gtk_range_set_value (GTK_RANGE (range), newscroll);
+ }
+
+ free (data);
+
+ return FALSE;
+}
+
+void
+ddb_listview_set_cursor_and_scroll (DdbListview *listview, int cursor) {
+ struct set_cursor_t *data = malloc (sizeof (struct set_cursor_t));
+ data->cursor = cursor;
+ data->pl = listview;
+ g_idle_add (set_cursor_and_scroll_cb, data);
+}
+
+void
+ddb_listview_select_range (DdbListview *listview, int start, int end) {
+ int nchanged = 0;
+ int idx = 0;
+ DdbListviewIter it;
+ for (it = listview->datasource->head (); it; idx++) {
+ if (idx >= start && idx <= end) {
+ if (!listview->datasource->is_selected (it)) {
+ nchanged++;
+ listview->datasource->select (it, 1);
+ ddb_listview_draw_row (listview, idx, it);
+ if (nchanged <= NUM_ROWS_TO_NOTIFY_SINGLY) {
+ listview->delegate->selection_changed (listview, it, idx);
+ }
+ }
+ }
+ else {
+ if (listview->datasource->is_selected (it)) {
+ nchanged++;
+ listview->datasource->select (it, 0);
+ ddb_listview_draw_row (listview, idx, it);
+ if (nchanged <= NUM_ROWS_TO_NOTIFY_SINGLY) {
+ listview->delegate->selection_changed (listview, it, idx);
+ }
+ }
+ }
+ it = next_playitem(listview, it);
+ }
+ if (nchanged > NUM_ROWS_TO_NOTIFY_SINGLY) {
+ listview->delegate->selection_changed (listview, NULL, -1);
+ }
+}
+
+static int
+ddb_listview_is_group_selected (DdbListview *listview, DdbListviewGroup *grp) {
+ if (!listview || !grp) {
+ return 0;
+ }
+
+ DdbListviewIter it = grp->head;
+ listview->datasource->ref(it);
+ for (int i = 0; i < grp->num_items && it; ++i) {
+ if (!listview->datasource->is_selected (it)) {
+ listview->datasource->unref (it);
+ return 0;
+ }
+ it = next_playitem(listview, it);
+ }
+ if (it) {
+ listview->datasource->unref (it);
+ }
+
+ return 1;
+}
+
+void
+ddb_listview_click_selection (DdbListview *listview, int ex, int ey, DdbListviewPickContext *pick_ctx, int dnd, int button) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ deadbeef->pl_lock ();
+ priv->areaselect = 0;
+ ddb_listview_groupcheck (listview);
+
+ if (dnd) {
+ // prepare area selection or drag
+ int selected = 0;
+ if (pick_ctx->type == PICK_ALBUM_ART || pick_ctx->type == PICK_GROUP_TITLE) {
+ selected = ddb_listview_is_group_selected (listview, pick_ctx->grp);
+ }
+ else {
+ DdbListviewIter it = listview->datasource->get_for_idx (pick_ctx->item_idx);
+ if (it) {
+ selected = listview->datasource->is_selected (it);
+ UNREF (it);
+ }
+ }
+ if (!selected || pick_ctx->type == PICK_EMPTY_SPACE) {
+ priv->areaselect = 1;
+ priv->areaselect_x = ex + priv->hscrollpos;
+ priv->areaselect_y = ey + priv->scrollpos;
+ priv->shift_sel_anchor = pick_ctx->item_idx;
+ }
+ else if (selected && pick_ctx->type != PICK_EMPTY_SPACE && listview->delegate->drag_n_drop) {
+ priv->dragwait = 1;
+ }
+ }
+
+ if (pick_ctx->type == PICK_EMPTY_SPACE) {
+ // clicked empty space, deselect everything
+ ddb_listview_deselect_all (listview);
+ }
+ else if (pick_ctx->item_idx != -1
+ && (pick_ctx->type == PICK_GROUP_TITLE
+ || pick_ctx->type == PICK_ALBUM_ART)) {
+ // clicked group title or album art column, select group
+ int start = pick_ctx->item_grp_idx;
+ int end = start + pick_ctx->grp->num_items - 1;
+ ddb_listview_select_range (listview, start, end);
+ }
+ else if (pick_ctx->item_idx != -1 && pick_ctx->type == PICK_ITEM) {
+ // clicked specific item - select, or start drag-n-drop
+ DdbListviewIter it = listview->datasource->get_for_idx (pick_ctx->item_idx);
+ if (it) {
+ if (!listview->datasource->is_selected (it)) {
+ // reset selection, and set it to single item
+ ddb_listview_select_single (listview, pick_ctx->item_idx);
+ }
+ UNREF (it);
+ }
+ }
+ deadbeef->pl_unlock ();
+}
+
+// {{{ expected behaviour for mouse1 without modifiers:
+// {{{ + if clicked unselected item:
+// unselect all
+// select clicked item
+// deadbeef->pl_get_cursor (priv->iterator) = clicked
+// redraw
+// start 'area selection' mode
+// }}}
+// {{{ + if clicked selected item:
+// deadbeef->pl_get_cursor (priv->iterator) = clicked
+// redraw
+// wait until next release or motion event, whichever is 1st
+// if release is 1st:
+// unselect all except clicked, redraw
+// else if motion is 1st:
+// enter drag-drop mode
+// }}}
+// }}}
+void
+ddb_listview_list_mouse1_pressed (DdbListview *listview, int state, int ex, int ey, GdkEventType type) {
+ // cursor must be set here, but selection must be handled in keyrelease
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ deadbeef->pl_lock ();
+ ddb_listview_groupcheck (listview);
+ int cnt = listview->datasource->count ();
+ if (cnt == 0) {
+ deadbeef->pl_unlock ();
+ return;
+ }
+ // remember mouse coords for doubleclick detection
+ priv->lastpos0 = ex;
+ priv->lastpos1 = ey;
+
+ // get item under cursor
+ DdbListviewPickContext pick_ctx;
+ ddb_listview_list_pickpoint (listview, ex, ey + priv->scrollpos, &pick_ctx);
+
+ int group_clicked = (pick_ctx.type == PICK_ALBUM_ART
+ || pick_ctx.type == PICK_GROUP_TITLE) ? 1 : 0;
+
+ int cursor = listview->datasource->cursor ();
+ if (type == GDK_2BUTTON_PRESS
+ && abs(priv->lastpos0 - ex) < 3
+ && abs(priv->lastpos1 - ey) < 3) {
+ // doubleclick - play this item
+ if (pick_ctx.item_idx != -1
+ && !ddb_listview_is_empty_region (&pick_ctx)
+ && cursor != -1) {
+ int idx = cursor;
+ DdbListviewIter it = listview->datasource->get_for_idx (idx);
+ if (listview->delegate->handle_doubleclick && it) {
+ listview->delegate->handle_doubleclick (listview, it, idx);
+ }
+ if (it) {
+ listview->datasource->unref (it);
+ }
+ deadbeef->pl_unlock ();
+ return;
+ }
+ }
+
+ gtkui_listview_busy = 1;
+
+ // set cursor
+ int prev = cursor;
+ if (!ddb_listview_is_empty_region (&pick_ctx)
+ && pick_ctx.item_idx != -1) {
+ int new_cursor = -1;
+ if (pick_ctx.type == PICK_ALBUM_ART) {
+ // set cursor to first item in clicked group
+ new_cursor = pick_ctx.item_grp_idx;
+ }
+ else {
+ // set cursor on clicked item
+ new_cursor = pick_ctx.item_idx;
+ }
+ ddb_listview_update_cursor (listview, new_cursor);
+ priv->shift_sel_anchor = listview->datasource->cursor ();
+ }
+
+ // handle multiple selection
+#ifndef __APPLE__
+ int selmask = GDK_CONTROL_MASK;
+#else
+ int selmask = GDK_MOD2_MASK;
+#endif
+ if (!(state & (selmask|GDK_SHIFT_MASK)))
+ {
+ ddb_listview_click_selection (listview, ex, ey, &pick_ctx, 1, 1);
+ }
+ else if (state & selmask) {
+ // toggle selection
+ if (pick_ctx.type != PICK_EMPTY_SPACE
+ && pick_ctx.item_idx != -1) {
+ if (group_clicked) {
+ // toggle group items
+ ddb_listview_toggle_group_selection (listview, pick_ctx.grp, pick_ctx.item_grp_idx);
+ }
+ else if (pick_ctx.type == PICK_ITEM) {
+ // toggle single item
+ DdbListviewIter it = listview->datasource->get_for_idx (pick_ctx.item_idx);
+ if (it) {
+ listview->datasource->select (it, 1 - listview->datasource->is_selected (it));
+ ddb_listview_draw_row (listview, pick_ctx.item_idx, it);
+ listview->delegate->selection_changed (listview, it, pick_ctx.item_idx);
+ UNREF (it);
+ }
+ }
+ }
+ }
+ else if (state & GDK_SHIFT_MASK) {
+ if (group_clicked) {
+ // deselect everything
+ ddb_listview_deselect_all (listview);
+ // select group
+ ddb_listview_select_group (listview, pick_ctx.grp, pick_ctx.item_grp_idx, 0);
+ }
+ else if (pick_ctx.type == PICK_ITEM || pick_ctx.type == PICK_EMPTY_SPACE) {
+ // select range
+ int cursor = pick_ctx.item_idx;
+ if (prev > cursor && pick_ctx.type == PICK_EMPTY_SPACE) {
+ cursor++;
+ }
+ int start = min (prev, cursor);
+ int end = max (prev, cursor);
+
+ ddb_listview_select_range (listview, start, end);
+ ddb_listview_update_cursor (listview, cursor);
+ }
+ }
+ cursor = listview->datasource->cursor ();
+ if (cursor != -1 && pick_ctx.item_idx == -1) {
+ DdbListviewIter it = listview->datasource->get_for_idx (cursor);
+ ddb_listview_draw_row (listview, cursor, it);
+ UNREF (it);
+ }
+ if (prev != -1 && prev != cursor) {
+ DdbListviewIter it = listview->datasource->get_for_idx (prev);
+ ddb_listview_draw_row (listview, prev, it);
+ UNREF (it);
+ }
+ deadbeef->pl_unlock ();
+}
+
+void
+ddb_listview_list_mouse1_released (DdbListview *listview, int state, int ex, int ey, double time) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ gtkui_listview_busy = 0;
+
+#ifndef __APPLE__
+ int selmask = GDK_CONTROL_MASK;
+#else
+ int selmask = GDK_MOD2_MASK;
+#endif
+
+ int select_single = 0;
+
+ if (!listview->delegate->drag_n_drop) {
+ // playlist doesn't support drag and drop (e.g. search list)
+ // select single track
+ select_single = 1;
+ }
+
+ if (priv->dragwait) {
+ // reset dragdrop and select single track
+ priv->dragwait = 0;
+ select_single = 1;
+ }
+
+ if (priv->areaselect) {
+ // reset areaselection ctx without clearing selection
+ priv->scroll_direction = 0;
+ priv->scroll_pointer_x = -1;
+ priv->scroll_pointer_y = -1;
+ priv->areaselect = 0;
+ priv->areaselect_x = -1;
+ priv->areaselect_y = -1;
+ }
+ else if (select_single && !(state & (selmask|GDK_SHIFT_MASK))) {
+ // clear selection and select single track
+ DdbListviewPickContext pick_ctx;
+ ddb_listview_list_pickpoint (listview, ex, ey + priv->scrollpos, &pick_ctx);
+ if (pick_ctx.type == PICK_ITEM) {
+ ddb_listview_select_single (listview, pick_ctx.item_idx);
+ }
+ }
+}
+
+#if 0
+void
+ddb_listview_list_dbg_draw_areasel (GtkWidget *widget, int x, int y) {
+ // erase previous rect using 4 blits from priv->list->windowfer
+ if (areaselect_dx != -1) {
+ int sx = min (areaselect_x, areaselect_dx);
+ int sy = min (areaselect_y, areaselect_dy);
+ int dx = max (areaselect_x, areaselect_dx);
+ int dy = max (areaselect_y, areaselect_dy);
+ int w = dx - sx + 1;
+ int h = dy - sy + 1;
+ //draw_drawable (widget->window, widget->style->black_gc, priv->list->window, sx, sy, sx, sy, dx - sx + 1, dy - sy + 1);
+ draw_drawable (widget->window, widget->style->black_gc, priv->list->window, sx, sy, sx, sy, w, 1);
+ draw_drawable (widget->window, widget->style->black_gc, priv->list->window, sx, sy, sx, sy, 1, h);
+ draw_drawable (widget->window, widget->style->black_gc, priv->list->window, sx, sy + h - 1, sx, sy + h - 1, w, 1);
+ draw_drawable (widget->window, widget->style->black_gc, priv->list->window, sx + w - 1, sy, sx + w - 1, sy, 1, h);
+ }
+ areaselect_dx = x;
+ areaselect_dy = y;
+ cairo_t *cr;
+ cr = gdk_cairo_create (widget->window);
+ if (!cr) {
+ return;
+ }
+ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+ cairo_set_line_width (cr, 1);
+ int sx = min (areaselect_x, x);
+ int sy = min (areaselect_y, y);
+ int dx = max (areaselect_x, x);
+ int dy = max (areaselect_y, y);
+ cairo_rectangle (cr, sx, sy, dx-sx, dy-sy);
+ cairo_stroke (cr);
+ cairo_destroy (cr);
+}
+#endif
+
+static gboolean
+ddb_listview_list_scroll_cb (gpointer data) {
+ DdbListview *listview = (DdbListview *)data;
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ priv->scroll_active = 1;
+ struct timeval tm;
+ gettimeofday (&tm, NULL);
+ float dt = tm.tv_sec - priv->tm_prevscroll.tv_sec + (tm.tv_usec - priv->tm_prevscroll.tv_usec) / 1000000.0;
+ if (dt < priv->scroll_sleep_time) {
+ return TRUE;
+ }
+ memcpy (&priv->tm_prevscroll, &tm, sizeof (tm));
+ if (priv->scroll_pointer_y == -1) {
+ priv->scroll_active = 0;
+ return FALSE;
+ }
+ if (priv->scroll_direction == 0) {
+ priv->scroll_active = 0;
+ return FALSE;
+ }
+ int sc = priv->scrollpos + (priv->scroll_direction * 100 * dt);
+ if (sc < 0) {
+ priv->scroll_active = 0;
+ return FALSE;
+ }
+// trace ("scroll to %d speed %f\n", sc, priv->scroll_direction);
+ gtk_range_set_value (GTK_RANGE (listview->scrollbar), sc);
+ if (priv->scroll_mode == 0) {
+ ddb_listview_list_mousemove (listview, NULL, priv->scroll_pointer_x, priv->scroll_pointer_y);
+ }
+ else if (priv->scroll_mode == 1) {
+ ddb_listview_list_track_dragdrop (listview, priv->scroll_pointer_x, priv->scroll_pointer_y);
+ }
+ if (priv->scroll_direction < 0) {
+ priv->scroll_direction -= (10 * dt);
+ if (priv->scroll_direction < -30) {
+ priv->scroll_direction = -30;
+ }
+ }
+ else {
+ priv->scroll_direction += (10 * dt);
+ if (priv->scroll_direction > 30) {
+ priv->scroll_direction = 30;
+ }
+ }
+ return TRUE;
+}
+
+static void
+ddb_listview_select_tracks_within_region (DdbListview *listview, int x, int start_y, int end_y) {
+ DdbListviewPickContext pick_ctx_start;
+ DdbListviewPickContext pick_ctx_end;
+
+ int start_idx = -1;
+ int end_idx = -1;
+
+ // find start point
+ ddb_listview_list_pickpoint (listview, x, start_y, &pick_ctx_start);
+ start_idx = pick_ctx_start.item_idx;
+
+ // find end point
+ ddb_listview_list_pickpoint (listview, x, end_y, &pick_ctx_end);
+ end_idx = pick_ctx_end.item_idx;
+
+ if (start_idx == -1 || end_idx == -1) {
+ // failed to find start or end track
+ return;
+ }
+
+ if (start_idx == end_idx) {
+ if (pick_ctx_start.type != PICK_EMPTY_SPACE || pick_ctx_end.type != PICK_EMPTY_SPACE) {
+ ddb_listview_select_range (listview, start_idx, start_idx);
+ ddb_listview_update_cursor (listview, start_idx);
+ }
+ else {
+ ddb_listview_deselect_all (listview);
+ }
+ return;
+ }
+
+ int swapped = 0;
+ if (start_idx > end_idx) {
+ // swap start and end track
+ swapped = 1;
+ int temp_idx = end_idx;
+ end_idx = start_idx;
+ start_idx = temp_idx;
+
+ DdbListviewPickContext pick_ctx_temp = pick_ctx_end;
+ pick_ctx_end = pick_ctx_start;
+ pick_ctx_start = pick_ctx_temp;
+ }
+
+ int total_tracks = listview->datasource->count ();
+ if (pick_ctx_start.type == PICK_EMPTY_SPACE) {
+ start_idx = min (total_tracks - 1, start_idx + 1);
+ }
+
+ int cursor = -1;
+ if (swapped) {
+ cursor = start_idx;
+ }
+ else {
+ cursor = end_idx;
+ }
+
+ ddb_listview_select_range (listview, start_idx, end_idx);
+ ddb_listview_update_cursor (listview, cursor);
+}
+
+void
+ddb_listview_list_mousemove (DdbListview *listview, GdkEventMotion *ev, int ex, int ey) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ deadbeef->pl_lock ();
+ GtkWidget *widget = listview->list;
+ int move_threshold = gtk_drag_check_threshold (widget, priv->lastpos0, priv->lastpos1, ex, ey);
+
+ if (move_threshold) {
+ if (priv->dragwait) {
+ priv->dragwait = 0;
+ priv->drag_source_playlist = deadbeef->plt_get_curr_idx ();
+ GtkTargetEntry entry = {
+ .target = TARGET_PLAYLIST_AND_ITEM_INDEXES,
+ .flags = GTK_TARGET_SAME_WIDGET,
+ .info = INFO_TARGET_PLAYLIST_ITEM_INDEXES
+ };
+ GtkTargetList *lst = gtk_target_list_new (&entry, 1);
+ gtk_target_list_add_uri_targets (lst, INFO_TARGET_URIS);
+ gtk_drag_begin (widget, lst, GDK_ACTION_COPY | GDK_ACTION_MOVE, 1, (GdkEvent *)ev);
+ }
+ else if (priv->areaselect) {
+ ddb_listview_select_tracks_within_region (listview, priv->areaselect_x, priv->areaselect_y, ey + priv->scrollpos);
+
+ if (ey < 10) {
+ priv->scroll_mode = 0;
+ priv->scroll_pointer_x = ex;
+ priv->scroll_pointer_y = ey;
+ // start scrolling up
+ if (!priv->scroll_active) {
+ priv->scroll_direction = -1;
+ priv->scroll_sleep_time = AUTOSCROLL_UPDATE_FREQ;
+ gettimeofday (&priv->tm_prevscroll, NULL);
+ g_idle_add (ddb_listview_list_scroll_cb, listview);
+ }
+ }
+ else if (ey > priv->list_height-10) {
+ priv->scroll_mode = 0;
+ priv->scroll_pointer_x = ex;
+ priv->scroll_pointer_y = ey;
+ // start scrolling down
+ if (!priv->scroll_active) {
+ priv->scroll_direction = 1;
+ priv->scroll_sleep_time = AUTOSCROLL_UPDATE_FREQ;
+ gettimeofday (&priv->tm_prevscroll, NULL);
+ g_idle_add (ddb_listview_list_scroll_cb, listview);
+ }
+ }
+ else {
+ priv->scroll_direction = 0;
+ priv->scroll_pointer_x = -1;
+ priv->scroll_pointer_y = -1;
+ }
+ // debug only
+ // ddb_listview_list_dbg_draw_areasel (widget, event->x, event->y);
+ }
+ }
+ deadbeef->pl_unlock ();
+}
+
+gboolean
+ddb_listview_list_popup_menu (GtkWidget *widget, gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+
+ ddb_playlist_t *playlist = deadbeef->plt_get_curr();
+ if (playlist != NULL) {
+ listview->delegate->list_context_menu (playlist, PL_MAIN);
+ deadbeef->plt_unref (playlist);
+ }
+ return TRUE;
+}
+
+int
+ddb_listview_dragdrop_get_row_from_coord (DdbListview *listview, int x, int y) {
+ if (y == -1) {
+ return -1;
+ }
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ DdbListviewPickContext pick_ctx;
+ ddb_listview_list_pickpoint (listview, x, y + priv->scrollpos, &pick_ctx);
+
+ int row_idx = -1;
+ if (pick_ctx.type == PICK_ITEM || pick_ctx.type == PICK_ALBUM_ART) {
+ row_idx = pick_ctx.item_idx;
+ int it_y = ddb_listview_get_row_pos (listview, row_idx, NULL) - priv->scrollpos;
+ if (y > it_y + priv->rowheight/2) {
+ row_idx++;
+ }
+ }
+ else if (pick_ctx.type == PICK_GROUP_TITLE) {
+ // select first item item group
+ row_idx = pick_ctx.item_grp_idx;
+ }
+ else if (pick_ctx.type == PICK_EMPTY_SPACE
+ || pick_ctx.type == PICK_BELOW_PLAYLIST) {
+ row_idx = pick_ctx.item_idx + 1;
+ }
+ else if (pick_ctx.type == PICK_ABOVE_PLAYLIST) {
+ row_idx = 0;
+ }
+ return row_idx;
+}
+
+static void
+ddb_listview_list_track_dragdrop (DdbListview *listview, int x, int y) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int prev_drag_y = priv->drag_motion_y;
+
+ if (y == -1) {
+ priv->drag_motion_y = -1;
+ priv->scroll_active = 0;
+ priv->scroll_direction = 0;
+ }
+ else {
+ int sel = ddb_listview_dragdrop_get_row_from_coord (listview, x, y);
+ if (sel == -1) {
+ if (listview->datasource->count () == 0) {
+ priv->drag_motion_y = 0;
+ }
+ else {
+ // after last row
+ priv->drag_motion_y = ddb_listview_get_row_pos (listview, listview->datasource->count ()-1, NULL) + priv->rowheight;
+ }
+ }
+ else {
+ priv->drag_motion_y = ddb_listview_get_row_pos (listview, sel, NULL);
+ }
+ if (priv->scrollpos > 0 && priv->drag_motion_y == priv->fullheight) {
+ priv->drag_motion_y -= 3;
+ }
+ }
+
+ if (prev_drag_y != priv->drag_motion_y) {
+ if (prev_drag_y != -1) {
+ // erase previous track
+ gtk_widget_queue_draw_area (listview->list, 0, prev_drag_y-priv->scrollpos-3, priv->list_width, 7);
+ }
+ if (priv->drag_motion_y != -1) {
+ // new track
+ gtk_widget_queue_draw_area (listview->list, 0, priv->drag_motion_y-priv->scrollpos-3, priv->list_width, 7);
+ }
+ }
+
+ if (y < 10) {
+ priv->scroll_pointer_x = x;
+ priv->scroll_pointer_y = y;
+ priv->scroll_mode = 1;
+ // start scrolling up
+ if (!priv->scroll_active) {
+ priv->scroll_direction = -1;
+ priv->scroll_sleep_time = AUTOSCROLL_UPDATE_FREQ;
+ gettimeofday (&priv->tm_prevscroll, NULL);
+ g_idle_add (ddb_listview_list_scroll_cb, listview);
+ }
+ }
+ else if (y > priv->list_height-10) {
+ priv->scroll_mode = 1;
+ priv->scroll_pointer_x = x;
+ priv->scroll_pointer_y = y;
+ // start scrolling up
+ if (!priv->scroll_active) {
+ priv->scroll_direction = 1;
+ priv->scroll_sleep_time = AUTOSCROLL_UPDATE_FREQ;
+ gettimeofday (&priv->tm_prevscroll, NULL);
+ g_idle_add (ddb_listview_list_scroll_cb, listview);
+ }
+ }
+ else {
+ priv->scroll_direction = 0;
+ priv->scroll_pointer_x = -1;
+ priv->scroll_pointer_y = -1;
+ }
+}
+
+static void
+ddb_listview_list_drag_end (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ priv->scroll_direction = 0;
+ priv->scroll_pointer_x = -1;
+ priv->scroll_pointer_y = -1;
+}
+
+static void
+ddb_listview_column_size_changed (DdbListview *listview, DdbListviewColumn *c) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ if (listview->datasource->is_album_art_column(c->user_data)) {
+ ddb_listview_resize_groups(listview);
+ if (!priv->lock_columns) {
+ int pos = ddb_listview_get_row_pos(listview, priv->ref_point, NULL);
+ gtk_range_set_value(GTK_RANGE(listview->scrollbar), pos - priv->ref_point_offset);
+ }
+ }
+}
+
+static void
+ddb_listview_update_scroll_ref_point_subgroup (DdbListview *listview, DdbListviewGroup *grp, int abs_idx, int grp_y) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ // find 1st group
+ while (grp && grp_y + grp->height < priv->scrollpos) {
+ grp_y += grp->height;
+ abs_idx += grp->num_items;
+ grp = grp->next;
+ }
+
+ if (!grp) {
+ priv->ref_point = 0;
+ priv->ref_point_offset = 0;
+ return;
+ }
+
+ int grp_content_pos = grp_y + (grp->group_label_visible ? priv->grouptitle_height : 0);
+
+ if (grp->subgroups) {
+ // search subgroups for anchor
+ ddb_listview_update_scroll_ref_point_subgroup (listview, grp->subgroups, abs_idx, grp_content_pos);
+ }
+ else {
+ // choose first visible item as anchor
+ int first_item_idx = max(0, (priv->scrollpos - grp_content_pos)/priv->rowheight);
+ priv->ref_point = abs_idx + first_item_idx;
+ priv->ref_point_offset = grp_content_pos + (first_item_idx * priv->rowheight) - priv->scrollpos;
+ }
+}
+
+static void
+ddb_listview_update_scroll_ref_point (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ ddb_listview_groupcheck (listview);
+
+ if (priv->groups) {
+ priv->ref_point = 0;
+ priv->ref_point_offset = 0;
+
+ // choose cursor_pos as anchor
+ int cursor_pos = ddb_listview_get_row_pos (listview, listview->datasource->cursor (), NULL);
+ if (priv->scrollpos < cursor_pos && cursor_pos < priv->scrollpos + priv->list_height && cursor_pos < priv->fullheight) {
+ priv->ref_point = listview->datasource->cursor ();
+ priv->ref_point_offset = cursor_pos - priv->scrollpos;
+ }
+ else {
+ ddb_listview_update_scroll_ref_point_subgroup (listview, priv->groups, 0, 0);
+ }
+ }
+}
+
+static void
+set_column_width (DdbListview *listview, DdbListviewColumn *c, float new_width) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ if (priv->fwidth != -1) {
+ priv->fwidth -= (float)c->width / priv->list_width;
+ c->fwidth = new_width / priv->list_width;
+ priv->fwidth += c->fwidth;
+ }
+ c->width = new_width;
+}
+
+static void
+set_fwidth (DdbListview *listview, float list_width) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int total_width = 0;
+ for (DdbListviewColumn *c = priv->columns; c; c = c->next) {
+ c->fwidth = c->width / list_width;
+ total_width += c->width;
+ }
+ priv->fwidth = total_width / list_width;
+}
+
+void
+ddb_listview_init_autoresize (DdbListview *listview, int totalwidth) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ if (totalwidth > 0) {
+ DdbListviewColumn *c;
+ if (!priv->col_autoresize) {
+ for (c = priv->columns; c; c = c->next) {
+ c->fwidth = (float)c->width / (float)totalwidth;
+ }
+ priv->col_autoresize = 1;
+ }
+ }
+}
+
+// Calculate the total height of all groups for a given min-height column width
+static int
+groups_full_height (DdbListview *listview, DdbListviewColumn *c, int new_width) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int min_height = c->minheight_cb (c->user_data, new_width);
+ int full_height = 0;
+ deadbeef->pl_lock ();
+ for (DdbListviewGroup *grp = priv->groups; grp; grp = grp->next) {
+ full_height += priv->grouptitle_height + max (grp->num_items * priv->rowheight, min_height);
+ }
+ deadbeef->pl_unlock ();
+ return full_height;
+}
+
+// Calculate whether this width would cause auto-resize thrashing
+static int
+unsafe_group_height (DdbListview *listview, DdbListviewColumn *c, int new_width, int list_width, int list_height) {
+ if (!c->minheight_cb) {
+ return 0;
+ }
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+
+ GtkAllocation a;
+ gtk_widget_get_allocation (listview->scrollbar, &a);
+ int scrollbar_width = a.width > 1 ? a.width : 16;
+ if (priv->fullheight > list_height) {
+ if (groups_full_height (listview, c, new_width) <= list_height) {
+ int width_wo_scrollbar = roundf ((list_width + scrollbar_width) * c->fwidth);
+ if (groups_full_height (listview, c, width_wo_scrollbar) >= list_height) {
+ return 1;
+ }
+ }
+ }
+ else {
+ if (groups_full_height (listview, c, new_width) >= list_height) {
+ int width_w_scrollbar = roundf ((list_width - scrollbar_width) * c->fwidth);
+ if (groups_full_height (listview, c, width_w_scrollbar) <= list_height) {
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
+static void
+autoresize_columns (DdbListview *listview, int list_width, int list_height) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int total_width;
+ int expected_width = roundf (list_width * priv->fwidth);
+ float working_width = list_width;
+ if (priv->fwidth > 1) {
+ do {
+ total_width = 0;
+ for (DdbListviewColumn *c = priv->columns; c; c = c->next) {
+ int new_width = max (DDB_LISTVIEW_MIN_COLUMN_WIDTH, roundf(working_width * c->fwidth));
+ if (unsafe_group_height (listview, c, new_width, list_width, list_height)) {
+ new_width = c->width;
+ }
+ total_width += new_width;
+ if (new_width != c->width) {
+ c->width = new_width;
+ ddb_listview_column_size_changed (listview, c);
+ }
+ }
+ working_width++;
+ } while (total_width <= expected_width);
+ }
+ else {
+ do {
+ total_width = 0;
+ for (DdbListviewColumn *c = priv->columns; c; c = c->next) {
+ int new_width = roundf (working_width * c->fwidth);
+ if (new_width < DDB_LISTVIEW_MIN_COLUMN_WIDTH) {
+ working_width -= DDB_LISTVIEW_MIN_COLUMN_WIDTH - new_width;
+ new_width = DDB_LISTVIEW_MIN_COLUMN_WIDTH;
+ }
+ else if (unsafe_group_height (listview, c, new_width, list_width, list_height)) {
+ new_width = c->width;
+ }
+ total_width += new_width;
+ if (new_width != c->width) {
+ c->width = new_width;
+ ddb_listview_column_size_changed (listview, c);
+ }
+ }
+ working_width--;
+ } while (total_width > expected_width && working_width > 0);
+ }
+ listview->delegate->columns_changed (listview);
+ ddb_listview_list_update_total_width (listview, total_width, list_width);
+}
+
+static gboolean
+ddb_listview_list_configure_event (GtkWidget *widget,
+ GdkEventConfigure *event,
+ gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int prev_width = priv->list_width;
+
+ // the values in event->width/height are broken since GTK-3.22.1, so let's use widget's allocation instead, and hope this is reliable.
+ GtkAllocation a;
+ gtk_widget_get_allocation (GTK_WIDGET (widget), &a);
+
+ if (a.width != prev_width || a.height != priv->list_height) {
+ priv->list_width = a.width;
+ priv->list_height = a.height;
+ g_idle_add_full (GTK_PRIORITY_RESIZE, ddb_listview_reconf_scrolling, listview, NULL);
+ }
+ if (a.width != prev_width) {
+ ddb_listview_list_update_total_width (listview, total_columns_width(listview), a.width);
+ }
+
+ _update_fwidth (listview, prev_width);
+
+ return FALSE;
+}
+
+void
+ddb_listview_size_columns_without_scrollbar (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ if (deadbeef->conf_get_int ("gtkui.autoresize_columns", 0) && gtk_widget_get_visible (listview->scrollbar)) {
+ GtkAllocation a;
+ gtk_widget_get_allocation (listview->scrollbar, &a);
+ autoresize_columns (listview, priv->list_width + a.width, priv->list_height);
+ }
+}
+
+void
+ddb_listview_col_sort_update (DdbListview *listview) {
+ if (deadbeef->conf_get_int ("gtkui.sticky_sort", 0)) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ for (DdbListviewColumn *c = priv->columns; c; c = c->next) {
+ if (c->sort_order != DdbListviewColumnSortOrderNone) {
+ listview->delegate->col_sort(c->sort_order, c->user_data);
+ }
+ }
+ }
+ else {
+ ddb_listview_clear_sort (listview);
+ }
+}
+
+gboolean
+ddb_listview_list_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data) {
+ gtk_widget_grab_focus (widget);
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ if (TEST_LEFT_CLICK (event)) {
+ ddb_listview_list_mouse1_pressed (listview, event->state, event->x, event->y, event->type);
+ }
+ else if (TEST_RIGHT_CLICK(event)) {
+ // get item under cursor
+ DdbListviewPickContext pick_ctx;
+ ddb_listview_list_pickpoint (listview, event->x, event->y + priv->scrollpos, &pick_ctx);
+
+ ddb_listview_click_selection (listview, event->x, event->y, &pick_ctx, 0, event->button);
+
+ int cursor = pick_ctx.item_idx;
+ int group_clicked = (pick_ctx.type == PICK_ALBUM_ART
+ || pick_ctx.type == PICK_GROUP_TITLE) ? 1 : 0;
+
+ if (group_clicked) {
+ cursor = pick_ctx.item_grp_idx;
+ }
+ ddb_listview_update_cursor (listview, cursor);
+
+ ddb_playlist_t *playlist = deadbeef->plt_get_curr();
+ if (playlist != NULL) {
+ listview->delegate->list_context_menu (playlist, PL_MAIN);
+ deadbeef->plt_unref (playlist);
+ }
+ }
+ return TRUE;
+}
+
+static gboolean
+ddb_listview_list_button_release_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ if (event->button == 1) {
+ ddb_listview_list_mouse1_released (listview, event->state, event->x, event->y, event->time);
+ }
+ return FALSE;
+}
+
+gboolean
+ddb_listview_motion_notify_event (GtkWidget *widget,
+ GdkEventMotion *event,
+ gpointer user_data) {
+ int x = event->x;
+ int y = event->y;
+#if GTK_CHECK_VERSION(2,12,0)
+ gdk_event_request_motions (event);
+#endif
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ ddb_listview_list_mousemove (listview, event, x, y);
+ return FALSE;
+}
+
+void
+ddb_listview_scroll_to (DdbListview *listview, int pos) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ pos = ddb_listview_get_row_pos (listview, pos, NULL);
+ if (pos < priv->scrollpos || pos + priv->rowheight >= priv->scrollpos + priv->list_height) {
+ gtk_range_set_value (GTK_RANGE (listview->scrollbar), pos - priv->list_height/2);
+ }
+}
+
+/////// column management code
+
+int
+ddb_listview_column_get_count (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int cnt = 0;
+ DdbListviewColumn *c = priv->columns;
+ while (c) {
+ cnt++;
+ c = c->next;
+ }
+ return cnt;
+}
+
+static DdbListviewColumn *
+ddb_listview_column_alloc (const char *title, int align_right, minheight_cb_t minheight_cb, int is_artwork, int color_override, GdkColor color, void *user_data) {
+ DdbListviewColumn * c = malloc (sizeof (DdbListviewColumn));
+ memset (c, 0, sizeof (DdbListviewColumn));
+ c->title = strdup (title);
+ c->align_right = align_right;
+ c->color_override = color_override;
+ c->color = color;
+ c->minheight_cb = minheight_cb;
+ c->is_artwork = is_artwork;
+ c->user_data = user_data;
+ return c;
+}
+
+void
+ddb_listview_column_append (DdbListview *listview, const char *title, int width, int align_right, minheight_cb_t minheight_cb, int is_artwork, int color_override, GdkColor color, void *user_data) {
+ ddb_listview_column_insert (listview, -1, title, width, align_right, minheight_cb, is_artwork, color_override, color, user_data);
+}
+
+void
+ddb_listview_column_insert (DdbListview *listview, int before, const char *title, int width, int align_right, minheight_cb_t minheight_cb, int is_artwork, int color_override, GdkColor color, void *user_data) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ DdbListviewColumn *c = ddb_listview_column_alloc (title, align_right, minheight_cb, is_artwork, color_override, color, user_data);
+ set_column_width (listview, c, c->width);
+ if (priv->columns) {
+ DdbListviewColumn * prev = NULL;
+ DdbListviewColumn * next = priv->columns;
+ int idx = 0;
+ while (next) {
+ if (idx == before) {
+ break;
+ }
+ prev = next;
+ next = next->next;
+ idx++;
+ }
+ c->next = next;
+ if (prev) {
+ prev->next = c;
+ }
+ else {
+ priv->columns = c;
+ }
+ }
+ else {
+ priv->columns = c;
+ }
+ set_column_width (listview, c, width);
+ listview->delegate->columns_changed (listview);
+}
+
+void
+ddb_listview_column_free (DdbListview *listview, DdbListviewColumn *c) {
+ if (c->title) {
+ free (c->title);
+ }
+ listview->delegate->col_free_user_data (c->user_data);
+ free (c);
+}
+
+static void
+remove_column (DdbListview *listview, DdbListviewColumn **c_ptr) {
+ DdbListviewColumn *c = *c_ptr;
+ assert (c);
+ DdbListviewColumn *next = c->next;
+ if (c->sort_order != DdbListviewColumnSortOrderNone) {
+ // HACK: do nothing on main playlist, refresh search playlist
+ listview->delegate->col_sort (0, c->user_data);
+ }
+ set_column_width (listview, c, 0);
+ ddb_listview_column_free (listview, c);
+ *c_ptr = next;
+ listview->delegate->columns_changed (listview);
+}
+
+void
+ddb_listview_column_remove (DdbListview *listview, int idx) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ DdbListviewColumn *c = priv->columns;
+ if (idx == 0) {
+ remove_column (listview, &priv->columns);
+ return;
+ }
+ int i = 1;
+ while (c) {
+ if (i == idx) {
+ remove_column (listview, &c->next);
+ return;
+ }
+ c = c->next;
+ i++;
+ }
+
+ if (!c) {
+ trace ("ddblv: attempted to remove column that is not in list\n");
+ }
+}
+
+void
+ddb_listview_column_move (DdbListview *listview, DdbListviewColumn *which, int inspos) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ // remove c from list
+ DdbListviewColumn *c = (DdbListviewColumn *)which;
+ if (c == priv->columns) {
+ priv->columns = c->next;
+ }
+ else {
+ DdbListviewColumn *cc;
+ for (cc = priv->columns; cc; cc = cc->next) {
+ if (cc->next == c) {
+ cc->next = c->next;
+ break;
+ }
+ }
+ }
+ c->next = NULL;
+ // reinsert c at position inspos update header_dragging to new idx
+ if (inspos == 0) {
+ c->next = priv->columns;
+ priv->columns = c;
+ }
+ else {
+ int idx = 0;
+ DdbListviewColumn *prev = NULL;
+ DdbListviewColumn *cc = NULL;
+ for (cc = priv->columns; cc; cc = cc->next, idx++, prev = cc) {
+ if (idx+1 == inspos) {
+ DdbListviewColumn *next = cc->next;
+ cc->next = c;
+ c->next = next;
+ break;
+ }
+ }
+ }
+ listview->delegate->columns_changed (listview);
+}
+
+int
+ddb_listview_column_get_info (DdbListview *listview, int col, const char **title, int *width, int *align_right, minheight_cb_t *minheight_cb, int *is_artwork, int *color_override, GdkColor *color, void **user_data) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ DdbListviewColumn *c;
+ int idx = 0;
+ for (c = priv->columns; c; c = c->next, idx++) {
+ if (idx == col) {
+ *title = c->title;
+ *width = c->width;
+ *align_right = c->align_right;
+ if (minheight_cb) *minheight_cb = c->minheight_cb;
+ if (is_artwork) *is_artwork = c->is_artwork;
+ *color_override = c->color_override;
+ *color = c->color;
+ *user_data = c->user_data;
+ return 0;
+ }
+ }
+ return -1;
+}
+
+int
+ddb_listview_column_set_info (DdbListview *listview, int col, const char *title, int width, int align_right, minheight_cb_t minheight_cb, int is_artwork, int color_override, GdkColor color, void *user_data) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ DdbListviewColumn *c;
+ int idx = 0;
+ for (c = priv->columns; c; c = c->next, idx++) {
+ if (idx == col) {
+ free (c->title);
+ c->title = strdup (title);
+ set_column_width (listview, c, width);
+ c->align_right = align_right;
+ c->minheight_cb = minheight_cb;
+ c->is_artwork = is_artwork;
+ c->color_override = color_override;
+ c->color = color;
+ c->user_data = user_data;
+ listview->delegate->columns_changed (listview);
+ return 0;
+ }
+ }
+ return -1;
+}
+
+void
+ddb_listview_invalidate_album_art_columns (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ invalidate_album_art_cells (listview, 0, priv->list_width, 0, priv->list_height);
+}
+/////// end of column management code
+
+/////// grouping /////
+static void
+ddb_listview_free_group (DdbListview *listview, DdbListviewGroup *group) {
+ while (group) {
+ if (group->subgroups) {
+ ddb_listview_free_group(listview, group->subgroups);
+ }
+ DdbListviewGroup *next = group->next;
+ if (group->head) {
+ listview->datasource->unref (group->head);
+ }
+
+ free (group);
+ group = next;
+ }
+}
+
+static void
+ddb_listview_free_all_groups (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ ddb_listview_free_group(listview, priv->groups);
+ priv->groups = NULL;
+ if (priv->plt) {
+ deadbeef->plt_unref (priv->plt);
+ priv->plt = NULL;
+ }
+}
+
+static int
+ddb_listview_min_group_height(DdbListviewColumn *columns) {
+ int min_height = 0;
+ for (DdbListviewColumn *c = columns; c; c = c->next) {
+ if (c->minheight_cb) {
+ int col_min_height = c->minheight_cb(c->user_data, c->width);
+ if (min_height < col_min_height) {
+ min_height = col_min_height;
+ }
+ }
+ }
+ return min_height;
+}
+
+static int
+ddb_listview_min_no_artwork_group_height(DdbListviewColumn *columns) {
+ int min_height = 0;
+ for (DdbListviewColumn *c = columns; c; c = c->next) {
+ if (c->minheight_cb && !c->is_artwork) {
+ int col_min_height = c->minheight_cb(c->user_data, c->width);
+ if (min_height < col_min_height) {
+ min_height = col_min_height;
+ }
+ }
+ }
+ return min_height;
+}
+
+static DdbListviewGroup *
+new_group (DdbListview *listview, DdbListviewIter it, int group_label_visible) {
+ listview->datasource->ref(it);
+ DdbListviewGroup *grp = calloc(1, sizeof(DdbListviewGroup));
+ grp->head = it;
+ grp->group_label_visible = group_label_visible;
+ return grp;
+}
+
+static int
+calc_subgroups_height(DdbListviewGroup *grp) {
+ int height = 0;
+ while (grp) {
+ height += grp->height;
+ grp = grp->next;
+ }
+ return height;
+}
+
+static int
+calc_group_height(DdbListview *listview, DdbListviewGroup *grp, int min_height, int is_last) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ // if we have subgroups, add their heights
+ if (grp->subgroups) {
+ grp->height = max(calc_subgroups_height(grp->subgroups), min_height);
+ }
+ else {
+ grp->height = max(grp->num_items * priv->rowheight, min_height);
+ }
+ if (grp->group_label_visible) {
+ grp->height += priv->grouptitle_height;
+ }
+ if (!is_last) {
+ grp->height += gtkui_groups_spacing;
+ }
+ return grp->height;
+}
+
+static int
+build_groups (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ priv->groups_build_idx = listview->datasource->modification_idx();
+ ddb_listview_free_all_groups(listview);
+ priv->plt = deadbeef->plt_get_curr();
+
+ DdbListviewIter it = listview->datasource->head();
+ if (!it) {
+ return 0;
+ }
+ if (!priv->group_formats->format || !priv->group_formats->format0) {
+ priv->grouptitle_height = 0;
+ }
+ else {
+ priv->grouptitle_height = priv->calculated_grouptitle_height;
+ }
+ int group_depth = 1;
+ DdbListviewGroupFormat *fmt = priv->group_formats;
+ while (fmt->next) {
+ group_depth++;
+ fmt = fmt->next;
+ }
+ priv->groups = new_group(listview, it, 0);
+ DdbListviewGroup *grps = priv->groups;
+ for (int i = 1; i < group_depth; i++) {
+ grps->subgroups = new_group(listview, it, 0);
+ grps = grps->subgroups;
+ }
+ int min_height = ddb_listview_min_group_height(priv->columns);
+ int min_no_artwork_height = ddb_listview_min_no_artwork_group_height(priv->columns);
+ int full_height = 0;
+ // groups
+ if (priv->grouptitle_height) {
+ DdbListviewGroup *last_groupgroup_depth;
+ char (*group_titles)1024 = malloc(sizeof(char1024) * group_depth);
+ DdbListviewGroup *grp = priv->groups;
+ // populate all subgroups from the first item
+ for (int i = 0; i < group_depth; i++) {
+ last_groupi = grp;
+ grp = grp->subgroups;
+ listview->datasource->get_group_text(listview, it, group_titlesi, sizeof(*group_titles), i);
+ last_groupi->group_label_visible = group_titlesi0 != 0;
+ }
+ while ((it = next_playitem(listview, it))) {
+ int make_new_group_offset = -1;
+ for (int i = 0; i < group_depth; i++) {
+ char next_title1024;
+ listview->datasource->get_group_text(listview, it, next_title, sizeof(next_title), i);
+ if (strcmp (group_titlesi, next_title)) {
+ make_new_group_offset = i;
+ break;
+ }
+ last_groupi->num_items++;
+ }
+ if (make_new_group_offset >= 0) {
+ // finish remaining groups
+ // must be done in reverse order so heights are calculated correctly
+ for (int i = group_depth - 1; i >= make_new_group_offset; i--) {
+ char next_title1024;
+ last_groupi->num_items++;
+ listview->datasource->get_group_text(listview, it, next_title, sizeof(next_title), i);
+ int height = calc_group_height (listview, last_groupi, i == priv->artwork_subgroup_level ? min_height : min_no_artwork_height, !(it > 0));
+ if (i == 0) {
+ full_height += height;
+ }
+ DdbListviewGroup *new_grp = NULL;
+ if (it != NULL) {
+ // ensure that the top-level groups always have titles
+ int title_visible = i == 0 || next_title0 != 0;
+ new_grp = new_group(listview, it, title_visible);
+ }
+ if (i == make_new_group_offset) {
+ last_groupi->next = new_grp;
+ }
+ last_groupi = new_grp;
+ if (last_groupi && i < group_depth - 1) {
+ last_groupi->subgroups = last_groupi + 1;
+ }
+ strcpy (group_titlesi, next_title);
+ }
+ }
+ }
+ // calculate final group heights
+ for (int i = group_depth - 1; i >= 0; i--) {
+ last_groupi->num_items++;
+ int height = calc_group_height (listview, last_groupi, i == priv->artwork_subgroup_level ? min_height : min_no_artwork_height, 1);
+ if (i == 0) {
+ full_height += height;
+ }
+ }
+ free(group_titles);
+ }
+ // no groups fast path
+ else {
+ for (DdbListviewGroup *grp = priv->groups; grp; grp = grp->next) {
+ do {
+ grp->num_items++;
+ it = next_playitem(listview, it);
+ } while (it && grp->num_items < BLANK_GROUP_SUBDIVISION);
+ full_height += calc_group_height (listview, grp, min_height, !(it > 0));
+ if (it) {
+ grp->next = new_group(listview, it, 0);
+ }
+ }
+ }
+ return full_height;
+}
+
+static void
+ddb_listview_build_groups (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ deadbeef->pl_lock();
+ int height = build_groups(listview);
+ if (height != priv->fullheight) {
+ priv->fullheight = height;
+ g_idle_add_full(GTK_PRIORITY_RESIZE, ddb_listview_list_setup_vscroll, listview, NULL);
+ }
+ deadbeef->pl_unlock();
+}
+
+static int
+ddb_listview_resize_subgroup (DdbListview *listview, DdbListviewGroup *grp, int group_depth, int min_height, int min_no_artwork_height) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int full_height = 0;
+ while (grp) {
+ if (grp->subgroups) {
+ ddb_listview_resize_subgroup (listview, grp->subgroups, group_depth + 1, min_height, min_no_artwork_height);
+ }
+ full_height += calc_group_height (listview, grp, group_depth == priv->artwork_subgroup_level ? min_height : min_no_artwork_height, !grp->next);
+ grp = grp->next;
+ }
+ return full_height;
+}
+
+static void
+ddb_listview_resize_groups (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ int min_height = ddb_listview_min_group_height(priv->columns);
+ int min_no_artwork_height = ddb_listview_min_no_artwork_group_height(priv->columns);
+ int full_height = ddb_listview_resize_subgroup (listview, priv->groups, 0, min_height, min_no_artwork_height);
+
+ if (full_height != priv->fullheight) {
+ priv->fullheight = full_height;
+ adjust_scrollbar (listview->scrollbar, priv->fullheight, priv->list_height);
+ }
+}
+
+static gboolean
+unlock_columns_cb (gpointer p) {
+ DdbListview *listview = DDB_LISTVIEW(p);
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ priv->lock_columns = 0;
+ return FALSE;
+}
+
+int
+ddb_listview_list_setup (DdbListview *listview, int scroll_to) {
+ if (!list_is_realized(listview)) {
+ return FALSE;
+ }
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ priv->lock_columns = 1;
+ if (priv->scrollpos == -1) {
+ priv->scrollpos = 0;
+ }
+ deadbeef->pl_lock();
+ priv->fullheight = build_groups(listview);
+ deadbeef->pl_unlock();
+ adjust_scrollbar (listview->scrollbar, priv->fullheight, priv->list_height);
+ gtk_range_set_value (GTK_RANGE (listview->scrollbar), scroll_to);
+ g_idle_add (unlock_columns_cb, listview);
+ return TRUE;
+}
+
+void
+ddb_listview_show_header (DdbListview *listview, int show) {
+ show ? gtk_widget_show (listview->header) : gtk_widget_hide (listview->header);
+}
+
+void
+ddb_listview_clear_sort (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ DdbListviewColumn *c;
+ for (c = priv->columns; c; c = c->next) {
+ c->sort_order = DdbListviewColumnSortOrderNone;
+ }
+ gtk_widget_queue_draw (listview->header);
+}
+
+static gboolean
+ddb_listview_list_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) {
+ DdbListview *listview = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
+ if (!listview->delegate->list_handle_keypress (listview, event->keyval, event->state, PL_MAIN)) {
+ return on_mainwin_key_press_event (widget, event, user_data);
+ }
+ return TRUE;
+}
+
+static void
+set_tooltip (GtkTooltip *tooltip, const char *text, int x, int y, int width, int height) {
+ GdkRectangle rect = {
+ .x = x,
+ .y = y,
+ .width = width,
+ .height = height
+ };
+ gtk_tooltip_set_tip_area (tooltip, &rect);
+ gtk_tooltip_set_text (tooltip, text);
+}
+
+static gboolean
+list_tooltip_handler (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer p) {
+ DdbListview *listview = DDB_LISTVIEW (p);
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ DdbListviewPickContext pick_ctx;
+ ddb_listview_list_pickpoint (listview, x, y + priv->scrollpos, &pick_ctx);
+ if (pick_ctx.type == PICK_ITEM) {
+ int idx = pick_ctx.item_idx;
+ DdbListviewIter it = listview->datasource->get_for_idx (idx);
+ if (it) {
+ DdbListviewColumn *c;
+ int col_x = -priv->hscrollpos;
+ for (c = priv->columns; c && col_x + c->width < x; col_x += c->width, c = c->next);
+ if (c) {
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
+ draw_begin (&priv->listctx, cr);
+ cairo_rectangle (cr, 0, 0, 0, 0);
+ cairo_clip (cr);
+ GdkColor clr = { 0 };
+ int row_y = ddb_listview_get_row_pos (listview, idx, NULL) - priv->scrollpos;
+ listview->renderer->draw_column_data (listview, cr, it, idx, c->align_right, c->user_data, &clr, col_x, row_y, c->width, priv->rowheight, 0);
+ cairo_destroy (cr);
+ if (draw_is_ellipsized (&priv->listctx)) {
+ set_tooltip (tooltip, draw_get_text (&priv->listctx), col_x, row_y, c->width, priv->rowheight);
+ deadbeef->pl_item_unref (it);
+ return TRUE;
+ }
+ }
+ deadbeef->pl_item_unref (it);
+ }
+ }
+ return FALSE;
+}
+
+void
+ddb_listview_cancel_autoredraw (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ if (priv->tf_redraw_timeout_id) {
+ g_source_remove (priv->tf_redraw_timeout_id);
+ priv->tf_redraw_timeout_id = 0;
+ }
+ if (priv->tf_redraw_track) {
+ listview->datasource->unref (priv->tf_redraw_track);
+ priv->tf_redraw_track = NULL;
+ }
+}
+
+DdbListviewGroup *
+ddb_listview_get_group_by_head (DdbListview *listview, DdbListviewIter head) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ for (DdbListviewGroup *grp = priv->groups; grp != NULL; grp = grp->next) {
+ if (grp->head == head) {
+ return grp;
+ }
+ }
+ return NULL;
+}
+
+int
+ddb_listview_get_scroll_pos (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ return priv->scrollpos;
+}
+
+void
+ddb_listview_redraw_tf (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ ddb_listview_draw_row (listview, priv->tf_redraw_track_idx, priv->tf_redraw_track);
+ priv->tf_redraw_track_idx = -1;
+ if (priv->tf_redraw_track) {
+ listview->datasource->unref (priv->tf_redraw_track);
+ priv->tf_redraw_track = NULL;
+ }
+ priv->tf_redraw_timeout_id = 0;
+}
+
+void
+ddb_listview_schedule_draw_tf(DdbListview *listview, int row_idx, guint source_id, DdbListviewIter it) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ ddb_listview_cancel_autoredraw (listview);
+ priv->tf_redraw_track_idx = row_idx;
+ priv->tf_redraw_timeout_id = source_id;
+ priv->tf_redraw_track = it;
+ listview->datasource->ref (it);
+}
+
+int
+ddb_listview_get_list_height (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ return priv->list_height;
+}
+
+int
+ddb_listview_get_shift_sel_anchor (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ return priv->shift_sel_anchor;
+}
+
+void
+ddb_listview_set_shift_sel_anchor(DdbListview *listview, int anchor) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ priv->shift_sel_anchor = anchor;
+}
+
+DdbListviewGroupFormat *
+ddb_listview_get_group_formats (DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ return priv->group_formats;
+}
+
+void
+ddb_listview_set_group_formats (DdbListview *listview, DdbListviewGroupFormat *formats) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+
+ DdbListviewGroupFormat *fmt = priv->group_formats;
+ while (fmt) {
+ DdbListviewGroupFormat *next_fmt = fmt->next;
+ free (fmt->format);
+ free (fmt->bytecode);
+ free (fmt);
+ fmt = next_fmt;
+ }
+
+ priv->group_formats = formats;
+}
+
+drawctx_t * const
+ddb_listview_get_listctx(DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ return &priv->listctx;
+}
+
+drawctx_t * const
+ddb_listview_get_grpctx(DdbListview *listview) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ return &priv->grpctx;
+}
+
+void
+ddb_listview_set_artwork_subgroup_level(DdbListview *listview, int artwork_subgroup_level) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ priv->artwork_subgroup_level = artwork_subgroup_level;
+}
+
+void
+ddb_listview_set_subgroup_title_padding(DdbListview *listview, int subgroup_title_padding) {
+ DdbListviewPrivate *priv = DDB_LISTVIEW_GET_PRIVATE(listview);
+ priv->subgroup_title_padding = subgroup_title_padding;
+}
+
+void
+ddb_listview_reset_artwork (DdbListview *listview) {
+ gtk_widget_queue_draw(GTK_WIDGET(listview));
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/ddblistview.h Added

@@ -0,0 +1,290 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __DDBLISTVIEW_H
+#define __DDBLISTVIEW_H
+
+#include <gtk/gtk.h>
+#include <sys/time.h>
+#include <stdint.h>
+#include "../drawing.h"
+#include <deadbeef/deadbeef.h>
+
+#define DDB_LISTVIEW_MIN_COLUMN_WIDTH 16
+
+// drag and drop targets
+#define TARGET_PLAYLIST_AND_ITEM_INDEXES "DDB_PLAYLIST_AND_ITEM_INDEXES"
+#define TARGET_URIS "DDB_PLAYLIST_URIS"
+#define TARGET_PLAYITEM_POINTERS "DDB_PLAYITEM_POINTERLIST"
+
+G_BEGIN_DECLS
+
+#define DDB_LISTVIEW_TYPE (ddb_listview_get_type ())
+#define DDB_LISTVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), DDB_LISTVIEW_TYPE, DdbListview))
+#define DDB_LISTVIEW_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST((obj), DDB_LISTVIEW_TYPE, DdbListviewClass))
+#define DDB_IS_LISTVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DDB_LISTVIEW_TYPE))
+#define DDB_IS_LISTVIEW_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), DDB_LISTVIEW_TYPE))
+
+typedef struct _DdbListview DdbListview;
+typedef struct _DdbListviewPrivate DdbListviewPrivate;
+typedef struct _DdbListviewClass DdbListviewClass;
+
+typedef void * DdbListviewIter;
+typedef void * DdbPlaylistHandle;
+
+typedef struct _DdbListviewGroup {
+ DdbListviewIter head;
+ struct _DdbListviewGroup *subgroups;
+ int32_t height;
+ int32_t num_items;
+ int group_label_visible;
+
+ struct _DdbListviewGroup *next;
+} DdbListviewGroup;
+
+typedef int (*minheight_cb_t) (void *user_data, int width);
+
+typedef enum {
+ DdbListviewColumnSortOrderNone,
+ DdbListviewColumnSortOrderAscending,
+ DdbListviewColumnSortOrderDescending
+} DdbListviewColumnSortOrder;
+
+typedef struct _DdbListviewColumn {
+ char *title;
+ int width;
+ float fwidth; // only in autoresize mode
+ minheight_cb_t minheight_cb;
+ struct _DdbListviewColumn *next;
+ int color_override;
+ GdkColor color;
+ void *user_data;
+ DdbListviewColumnSortOrder sort_order;
+ unsigned align_right : 2; // 0=left, 1=right, 2=center
+ unsigned show_tooltip : 1;
+ unsigned is_artwork : 1;
+} DdbListviewColumn;
+
+typedef struct {
+ void (*drag_n_drop) (DdbListviewIter before, DdbPlaylistHandle playlist_from, uint32_t *indices, int length, int copy);
+ void (*external_drag_n_drop) (DdbListviewIter before, char *mem, int length);
+ void (*tracks_copy_drag_n_drop) (DdbListviewIter before, DdbListviewIter *tracks, int count);
+
+ void (*columns_changed) (DdbListview *listview);
+ void (*col_sort) (DdbListviewColumnSortOrder sort_order, void *user_data);
+ void (*col_free_user_data) (void *user_data);
+
+ void (*list_context_menu) (ddb_playlist_t *playlist, int plt_iter);
+ void (*header_context_menu) (DdbListview *listview, int col);
+ void (*handle_doubleclick) (DdbListview *listview, DdbListviewIter iter, int idx);
+ gboolean (*list_handle_keypress) (DdbListview *ps, int keyval, int state, int iter);
+ void (*selection_changed) (DdbListview *listview, DdbListviewIter it, int idx);
+ void (*groups_changed) (const char *format);
+ void (*vscroll_changed) (int pos);
+ void (*cursor_changed) (int pos);
+} ddb_listview_delegate_t;
+
+typedef struct {
+ int (*count) (void);
+ int (*sel_count) (void);
+
+ int (*cursor) (void);
+ void (*set_cursor) (int cursor);
+
+ DdbListviewIter (*head) (void);
+ DdbListviewIter (*tail) (void);
+ DdbListviewIter (*next) (DdbListviewIter);
+ DdbListviewIter (*prev) (DdbListviewIter);
+
+ DdbListviewIter (*get_for_idx) (int idx);
+ int (*get_idx) (DdbListviewIter);
+
+ void (*ref) (DdbListviewIter);
+ void (*unref) (DdbListviewIter);
+
+ void (*select) (DdbListviewIter, int sel);
+ int (*is_selected) (DdbListviewIter);
+
+ int (*is_album_art_column) (void *user_data);
+
+ int (*modification_idx) (void);
+ int (*get_group_text) (DdbListview *listview, DdbListviewIter it, char *str, int size, int index);
+} ddb_listview_datasource_t;
+
+typedef struct {
+ void (*draw_group_title) (DdbListview *listview, cairo_t *drawable, DdbListviewIter iter, int x, int y, int width, int height, int group_depth);
+ void (*draw_album_art) (DdbListview *listview, cairo_t *cr, DdbListviewGroup *grp, void *user_data, int pinned, int next_y, int x, int y, int width, int height, int alignment);
+ void (*draw_column_data) (DdbListview *listview, cairo_t *cr, DdbListviewIter it, int idx, int align, void *user_data, GdkColor *fg_clr, int x, int y, int width, int height, int even);
+} ddb_listview_renderer_t;
+
+struct _DdbListviewColumn;
+struct _DdbListviewGroup;
+
+struct _DdbListviewGroupFormat {
+ // group format string that's supposed to get parsed by tf
+ char *format;
+ // tf bytecode for group title
+ char *bytecode;
+
+ struct _DdbListviewGroupFormat *next;
+};
+
+typedef struct _DdbListviewGroupFormat DdbListviewGroupFormat;
+
+struct _DdbListview {
+ GtkTable parent;
+
+ ddb_listview_datasource_t *datasource;
+ ddb_listview_delegate_t *delegate;
+ ddb_listview_renderer_t *renderer;
+
+ // cached gtk/gdk object pointers
+ GtkWidget *list;
+ GtkWidget *header;
+ GtkWidget *scrollbar;
+ GtkWidget *hscrollbar;
+
+ DdbListviewPrivate *priv;
+};
+
+struct _DdbListviewClass {
+ GtkTableClass parent_class;
+};
+
+GType ddb_listview_get_type(void);
+
+GtkWidget * ddb_listview_new(void);
+
+void
+ddb_listview_draw_row (DdbListview *listview, int idx, DdbListviewIter iter);
+void
+ddb_listview_select_single (DdbListview *listview, int sel);
+void
+ddb_listview_select_range (DdbListview *ps, int start, int end);
+void
+ddb_listview_scroll_to (DdbListview *listview, int rowpos);
+int
+ddb_listview_list_setup (DdbListview *listview, int scroll_to);
+void
+ddb_listview_size_columns_without_scrollbar (DdbListview *listview);
+int
+ddb_listview_column_get_count (DdbListview *listview);
+void
+ddb_listview_column_append (DdbListview *listview, const char *title, int width, int align_right, minheight_cb_t, int is_artwork, int color_override, GdkColor color, void *user_data);
+void
+ddb_listview_column_insert (DdbListview *listview, int before, const char *title, int width, int align_right, minheight_cb_t, int is_artwork, int color_override, GdkColor color, void *user_data);
+void
+ddb_listview_column_remove (DdbListview *listview, int idx);
+int
+ddb_listview_column_get_info (DdbListview *listview, int col, const char **title, int *width, int *align_right, minheight_cb_t *, int *is_artwork, int *color_override, GdkColor *color, void **user_data);
+int
+ddb_listview_column_set_info (DdbListview *listview, int col, const char *title, int width, int align_right, minheight_cb_t, int is_artwork, int color_override, GdkColor color, void *user_data);
+
+// if 'gtkui.sticky_sort' is 1: sort columns by their current sort order
+// otherwise clear sort order
+void
+ddb_listview_col_sort_update (DdbListview *listview);
+
+void
+ddb_listview_show_header (DdbListview *listview, int show);
+void
+ddb_listview_init_autoresize (DdbListview *ps, int totalwidth);
+
+enum {
+ DDB_REFRESH_COLUMNS = 1,
+ DDB_REFRESH_HSCROLL = 2,
+ DDB_REFRESH_VSCROLL = 4,
+ DDB_REFRESH_LIST = 8,
+ DDB_LIST_CHANGED = 16,
+ DDB_REFRESH_CONFIG = 32,
+};
+
+void
+ddb_listview_refresh (DdbListview *listview, uint32_t flags);
+
+void
+ddb_listview_invalidate_album_art_columns (DdbListview *listview);
+
+void
+ddb_listview_clear_sort (DdbListview *listview);
+
+int
+ddb_listview_get_row_pos (DdbListview *listview, int row_idx, int *accumulated_title_height);
+
+void
+ddb_listview_groupcheck (DdbListview *listview);
+
+void
+ddb_listview_cancel_autoredraw (DdbListview *listview);
+
+void
+ddb_listview_update_cursor (DdbListview *ps, int cursor);
+
+void
+ddb_listview_set_cursor_and_scroll (DdbListview *listview, int cursor);
+
+DdbListviewGroup *
+ddb_listview_get_group_by_head (DdbListview *listview, DdbListviewIter head);
+
+int
+ddb_listview_get_scroll_pos (DdbListview *listview);
+
+void
+ddb_listview_redraw_tf (DdbListview *listview);
+
+void
+ddb_listview_schedule_draw_tf(DdbListview *listview, int row_idx, guint source_id, DdbListviewIter it);
+
+int
+ddb_listview_get_list_height (DdbListview *listview);
+
+int
+ddb_listview_get_shift_sel_anchor (DdbListview *listview);
+
+void
+ddb_listview_set_shift_sel_anchor(DdbListview *listview, int anchor);
+
+DdbListviewGroupFormat *
+ddb_listview_get_group_formats (DdbListview *listview);
+
+void
+ddb_listview_set_group_formats (DdbListview *listview, DdbListviewGroupFormat *formats);
+
+drawctx_t * const
+ddb_listview_get_listctx(DdbListview *listview);
+
+drawctx_t * const
+ddb_listview_get_grpctx(DdbListview *listview);
+
+void
+ddb_listview_set_artwork_subgroup_level(DdbListview *listview, int artwork_subgroup_level);
+
+void
+ddb_listview_set_subgroup_title_padding(DdbListview *listview, int subgroup_title_padding);
+
+void
+ddb_listview_reset_artwork (DdbListview *listview);
+
+G_END_DECLS
+
+#endif // __DDBLISTVIEW_H

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/ddblistviewheader.c Added

@@ -0,0 +1,636 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <math.h>
+#include <string.h>
+#include "../drawing.h"
+#include "../gtkui.h"
+#include "../support.h"
+#include "ddblistview.h"
+#include "ddblistviewheader.h"
+#include "plcommon.h"
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define max(x,y) ((x)>(y)?(x):(y))
+
+struct _DdbListviewHeaderPrivate {
+ GdkCursor *cursor_sz;
+ GdkCursor *cursor_drag;
+ drawctx_t hdrctx;
+ int hscrollpos;
+ int header_dragging;
+ int header_sizing;
+ int header_dragpt2;
+ gdouble prev_header_x;
+ int header_prepare;
+ int col_movepos;
+};
+
+#define DDB_LISTVIEW_HEADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DDB_LISTVIEW_HEADER_TYPE, DdbListviewHeaderPrivate))
+G_DEFINE_TYPE (DdbListviewHeader, ddb_listview_header, GTK_TYPE_DRAWING_AREA);
+
+static void ddb_listview_header_class_init(DdbListviewHeaderClass *klass);
+static void ddb_listview_header_init(DdbListviewHeader *listview);
+static void ddb_listview_header_destroy(GObject *object);
+
+static void
+ddb_listview_header_class_init(DdbListviewHeaderClass *class) {
+ GObjectClass *object_class = (GObjectClass *) class;
+ object_class->finalize = ddb_listview_header_destroy;
+ g_type_class_add_private(class, sizeof(DdbListviewHeaderPrivate));
+}
+
+#pragma mark - Forward decls
+
+static void
+ddb_listview_header_render (DdbListviewHeader *header, cairo_t *cr, int x1, int x2);
+
+#if GTK_CHECK_VERSION(3,0,0)
+static gboolean
+ddb_listview_header_draw (GtkWidget *widget,
+ cairo_t *cr,
+ gpointer user_data);
+#else
+static gboolean
+ddb_listview_header_expose_event (GtkWidget *widget,
+ GdkEventExpose *event,
+ gpointer user_data);
+#endif
+
+static void
+ddb_listview_header_realize (GtkWidget *widget,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_header_motion_notify_event (GtkWidget *widget,
+ GdkEventMotion *event,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_header_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_header_button_release_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data);
+
+static gboolean
+ddb_listview_header_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data);
+
+static gboolean
+header_tooltip_handler (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer p);
+
+#pragma mark -
+
+static void
+ddb_listview_header_init(DdbListviewHeader *header) {
+ gtk_widget_set_events (GTK_WIDGET(header), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK);
+
+#if !GTK_CHECK_VERSION(3,0,0)
+ g_signal_connect ((gpointer) header, "expose_event",
+ G_CALLBACK (ddb_listview_header_expose_event),
+ NULL);
+#else
+ g_signal_connect ((gpointer) header, "draw",
+ G_CALLBACK (ddb_listview_header_draw),
+ NULL);
+#endif
+ g_signal_connect ((gpointer) header, "realize",
+ G_CALLBACK (ddb_listview_header_realize),
+ NULL);
+ g_signal_connect ((gpointer) header, "motion_notify_event",
+ G_CALLBACK (ddb_listview_header_motion_notify_event),
+ NULL);
+ g_signal_connect_after ((gpointer) header, "button_press_event",
+ G_CALLBACK (ddb_listview_header_button_press_event),
+ NULL);
+ g_signal_connect ((gpointer) header, "button_release_event",
+ G_CALLBACK (ddb_listview_header_button_release_event),
+ NULL);
+ g_signal_connect ((gpointer) header, "enter-notify-event",
+ G_CALLBACK (ddb_listview_header_enter),
+ NULL);
+
+ GValue value = {0, };
+ g_value_init (&value, G_TYPE_BOOLEAN);
+ g_value_set_boolean (&value, TRUE);
+ g_object_set_property (G_OBJECT (header), "has-tooltip", &value);
+ g_signal_connect (G_OBJECT (header), "query-tooltip", G_CALLBACK (header_tooltip_handler), NULL);
+
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ memset (priv, 0, sizeof (DdbListviewHeaderPrivate));
+
+ drawctx_init (&priv->hdrctx);
+
+ priv->col_movepos = -1;
+ priv->header_dragging = -1;
+ priv->header_sizing = -1;
+ priv->header_dragpt0 = 0;
+ priv->header_dragpt1 = 0;
+ priv->prev_header_x = -1;
+ priv->header_prepare = 0;
+ priv->cursor_sz = NULL;
+ priv->cursor_drag = NULL;
+}
+
+GtkWidget *
+ddb_listview_header_new(void) {
+ return GTK_WIDGET(g_object_new(ddb_listview_header_get_type(), NULL));
+}
+
+static void
+ddb_listview_header_destroy(GObject *object) {
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(object);
+ draw_free (&priv->hdrctx);
+ if (priv->cursor_sz) {
+ gdk_cursor_unref (priv->cursor_sz);
+ priv->cursor_sz = NULL;
+ }
+ if (priv->cursor_drag) {
+ gdk_cursor_unref (priv->cursor_drag);
+ priv->cursor_drag = NULL;
+ }
+}
+
+static void
+ddb_listview_header_expose (DdbListviewHeader *header, cairo_t *cr, int x, int y, int w, int h) {
+ ddb_listview_header_render (header, cr, x, x+w);
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+static gboolean
+ddb_listview_header_draw (GtkWidget *widget,
+ cairo_t *cr,
+ gpointer user_data) {
+ GdkRectangle clip;
+ gdk_cairo_get_clip_rectangle(cr, &clip);
+ ddb_listview_header_expose (DDB_LISTVIEW_HEADER(widget), cr, clip.x, clip.y, clip.width, clip.height);
+ return TRUE;
+}
+#else
+static gboolean
+ddb_listview_header_expose_event (GtkWidget *widget,
+ GdkEventExpose *event,
+ gpointer user_data) {
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
+ ddb_listview_header_expose (DDB_LISTVIEW_HEADER(widget), cr, event->area.x, event->area.y, event->area.width, event->area.height);
+ cairo_destroy (cr);
+ return TRUE;
+}
+#endif
+
+static void
+set_tooltip (GtkTooltip *tooltip, const char *text, int x, int y, int width, int height) {
+ GdkRectangle rect = {
+ .x = x,
+ .y = y,
+ .width = width,
+ .height = height
+ };
+ gtk_tooltip_set_tip_area (tooltip, &rect);
+ gtk_tooltip_set_text (tooltip, text);
+}
+
+static gboolean
+header_tooltip_handler (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer p) {
+ DdbListviewHeader *header = DDB_LISTVIEW_HEADER (widget);
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ DdbListviewColumn *c;
+ int col_x = -priv->hscrollpos;
+ for (c = header->delegate->get_columns(header); c && col_x + c->width < x; col_x += c->width, c = c->next);
+ if (c && c->show_tooltip && x < col_x + c->width - (c->sort_order != DdbListviewColumnSortOrderNone ? 14 : 4)) {
+ GtkAllocation a;
+ gtk_widget_get_allocation(GTK_WIDGET(header), &a);
+ set_tooltip (tooltip, c->title, col_x, 0, c->width - 4, a.height);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static void
+ddb_listview_header_realize (GtkWidget *widget,
+ gpointer user_data) {
+ // create cursor for sizing headers
+ DdbListviewHeader *header = DDB_LISTVIEW_HEADER (widget);
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ priv->cursor_sz = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
+ priv->cursor_drag = gdk_cursor_new (GDK_FLEUR);
+ ddb_listview_header_update_fonts(header);
+}
+
+static void
+draw_cairo_rectangle (cairo_t *cr, GdkColor *color, int x, int y, int width, int height) {
+ cairo_set_source_rgb(cr, color->red/65535., color->green/65535., color->blue/65535.);
+ cairo_rectangle(cr, x, y, width, height);
+ cairo_fill(cr);
+}
+
+static void
+draw_cairo_line(cairo_t *cr, GdkColor *color, int x1, int y1, int x2, int y2) {
+ cairo_set_source_rgb (cr, color->red/65535., color->green/65535., color->blue/65535.);
+ cairo_move_to (cr, x1, y1);
+ cairo_line_to (cr, x2, y2);
+ cairo_stroke (cr);
+}
+
+static void
+draw_header_fg(DdbListviewHeader *header, cairo_t *cr, DdbListviewColumn *c, GdkColor *clr, int x, int xx, int h) {
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ int text_width = xx - x - 10;
+ if (c->sort_order != DdbListviewColumnSortOrderNone) {
+ int arrow_sz = 10;
+ text_width = max(0, text_width - arrow_sz);
+#if GTK_CHECK_VERSION(3,0,0)
+ gdouble angle = 0;
+ if (c->sort_order == DdbListviewColumnSortOrderAscending) {
+ angle = G_PI;
+ }
+ gtk_render_arrow(gtk_widget_get_style_context(theme_treeview), cr, angle, xx-arrow_sz-5, h/2-arrow_sz/2, arrow_sz);
+#else
+ int dir = c->sort_order == DdbListviewColumnSortOrderAscending ? GTK_ARROW_DOWN : GTK_ARROW_UP;
+ gtk_paint_arrow(GTK_WIDGET(header)->style, GTK_WIDGET(header)->window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, GTK_WIDGET(header), NULL, dir, TRUE, xx-arrow_sz-5, h/2-arrow_sz/2, arrow_sz, arrow_sz);
+#endif
+ }
+
+ float fg3 = {clr->red/65535., clr->green/65535., clr->blue/65535.};
+ draw_set_fg_color(&priv->hdrctx, fg);
+ cairo_save(cr);
+ cairo_rectangle(cr, x+5, 0, text_width, h);
+ cairo_clip(cr);
+ draw_text_custom(&priv->hdrctx, x+5, 3, text_width, 0, DDB_COLUMN_FONT, 0, 0, c->title);
+ c->show_tooltip = draw_is_ellipsized(&priv->hdrctx);
+ cairo_restore(cr);
+}
+
+#if GTK_CHECK_VERSION(3,0,0)
+static void
+render_column_button (DdbListviewHeader *header, cairo_t *cr, GtkStateFlags state, int x, int y, int w, int h, GdkColor *clr) {
+ GtkStyleContext *context = gtk_widget_get_style_context(theme_button);
+ gtk_style_context_save(context);
+ gtk_style_context_add_class(context, GTK_STYLE_CLASS_BUTTON);
+ gtk_style_context_add_class(context, GTK_STYLE_CLASS_DEFAULT);
+ gtk_style_context_set_state(context, state);
+ // gtk_style_context_add_region(context, GTK_STYLE_REGION_COLUMN_HEADER, 0);
+ gtk_render_background(context, cr, x, y, w, h);
+ gtk_render_frame(context, cr, x, y, w, h);
+ if (clr) {
+ GdkRGBA rgba;
+ gtk_style_context_get_color(context, state, &rgba);
+ clr->red = round(rgba.red * 65535);
+ clr->green = round(rgba.green * 65535);
+ clr->blue = round(rgba.blue * 65535);
+ }
+ gtk_style_context_restore(context);
+}
+#endif
+
+static void
+ddb_listview_header_render (DdbListviewHeader *header, cairo_t *cr, int x1, int x2) {
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ cairo_set_line_width (cr, 1);
+ cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
+ GtkAllocation a;
+ gtk_widget_get_allocation (GTK_WIDGET(header), &a);
+ draw_begin(&priv->hdrctx, cr);
+ int h = a.height;
+
+ GtkStyle *style = gtk_widget_get_style(mainwin);
+ // Paint the background for the whole header
+ GdkColor gdkfg;
+#if !GTK_HEADERS
+ GdkColor clr_base, clr_dark, clr_light;
+ if (gtkui_override_tabstrip_colors()) {
+ gtkui_get_tabstrip_base_color(&clr_base);
+ gtkui_get_tabstrip_dark_color(&clr_dark);
+ gtkui_get_tabstrip_light_color (&clr_light);
+ gtkui_get_listview_column_text_color(&gdkfg);
+ } else {
+ clr_base = style->bgGTK_STATE_NORMAL;
+ clr_dark = style->darkGTK_STATE_NORMAL;
+ clr_light = style->lightGTK_STATE_NORMAL;
+ gdkfg = style->fgGTK_STATE_NORMAL;
+ }
+
+ draw_cairo_rectangle(cr, &clr_base, 0, 0, a.width, h);
+ draw_cairo_line(cr, &clr_dark, 0, h, a.width, h);
+ draw_cairo_line(cr, &gtk_widget_get_style(GTK_WIDGET(header))->midGTK_STATE_NORMAL, 0, h, a.width, h);
+#else
+#if GTK_CHECK_VERSION(3,0,0)
+ render_column_button(listview, cr, GTK_STATE_FLAG_NORMAL, 0, -1, a.width, h+2, &gdkfg);
+#else
+ gtk_paint_box(gtk_widget_get_style(theme_button), gtk_widget_get_window(priv->header), GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, priv->header, "button", -2, -2, a.width+4, h+4);
+ gdkfg = gtk_widget_get_style(theme_button)->fgGTK_STATE_NORMAL;
+ draw_cairo_line(cr, &gtk_widget_get_style(priv->header)->midGTK_STATE_NORMAL, 0, h, a.width, h);
+#endif
+#endif
+ int x = -priv->hscrollpos;
+ int idx = 0;
+ // Add a column header pseudo-button for each configured treeview column, by drawing lines across the background
+ for (DdbListviewColumn *c = header->delegate->get_columns(header); c && x < x2; c = c->next, idx++) {
+ int xx = x + c->width;
+
+ // Only render for columns within the clip region, and not any column which is being dragged
+ if (idx != priv->header_dragging && xx >= x1) {
+ // Paint the button text
+ draw_header_fg(header, cr, c, &gdkfg, x, xx, h);
+
+ // Add a vertical line near the right side of the column width, but not right next to an empty slot
+ if (c->width > 0 && priv->header_dragging != idx + 1) {
+ draw_cairo_line(cr, &clr_dark, xx-2, 2, xx-2, h-4);
+ draw_cairo_line(cr, &clr_light, xx-1, 2, xx-1, h-4);
+ }
+ }
+ x = xx;
+ }
+
+ // Do special drawing when a column is being dragged
+ if (priv->header_dragging != -1) {
+ x = -priv->hscrollpos;
+ idx = 0;
+ DdbListviewColumn *c = header->delegate->get_columns(header);
+ while (c && idx++ != priv->header_dragging) {
+ x += c->width;
+ c = c->next;
+ }
+
+ if (!c) {
+ draw_end (&priv->hdrctx);
+ return;
+ }
+
+ // Mark the position where the dragged column used to be with an indented/active/dark position
+ int xx = x - 2; // Where the divider line is
+ int w = c->width + 2;
+ if (xx < x2) {
+#if GTK_CHECK_VERSION(3,0,0)
+ render_column_button(header, cr, GTK_STATE_FLAG_ACTIVE, xx, 0, w, h, NULL);
+#else
+ gtk_paint_box(gtk_widget_get_style(theme_button), gtk_widget_get_window(GTK_WIDGET(header)), GTK_STATE_ACTIVE, GTK_SHADOW_ETCHED_IN, NULL, GTK_WIDGET(header), "button", xx, 0, w, h);
+#endif
+ }
+
+ // Draw a highlighted/selected "button" wherever the dragged column is currently positioned
+ xx = priv->col_movepos - priv->hscrollpos - 2;
+ if (w > 0 && xx < x2) {
+#if GTK_CHECK_VERSION(3,0,0)
+ render_column_button(header, cr, GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_FOCUSED, xx, 0, w, h, &gdkfg);
+#else
+ gtk_paint_box(gtk_widget_get_style(theme_button), gtk_widget_get_window(GTK_WIDGET(header)), GTK_STATE_SELECTED, GTK_SHADOW_OUT, NULL, GTK_WIDGET(header), "button", xx, 0, w, h);
+ gdkfg = gtk_widget_get_style(theme_button)->fgGTK_STATE_SELECTED;
+#endif
+ if (gtkui_override_listview_colors()) {
+ gtkui_get_listview_selected_text_color(&gdkfg);
+ }
+ draw_header_fg(header, cr, c, &gdkfg, xx, xx+w, h);
+ }
+ }
+
+ draw_end (&priv->hdrctx);
+}
+
+static void
+set_header_cursor (DdbListviewHeader *header, gdouble mousex) {
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ int x = -priv->hscrollpos;
+ for (DdbListviewColumn *c = header->delegate->get_columns(header); c; c = c->next) {
+ if (mousex >= x + c->width - 4 && mousex <= x + c->width) {
+ gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(header)), priv->cursor_sz);
+ return;
+ }
+ x += c->width;
+ }
+
+ gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(header)), NULL);
+}
+
+static gboolean
+ddb_listview_header_motion_notify_event (GtkWidget *widget,
+ GdkEventMotion *event,
+ gpointer user_data) {
+ DdbListviewHeader *header = DDB_LISTVIEW_HEADER(widget);
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(widget);
+#if GTK_CHECK_VERSION(2,12,0)
+ gdk_event_request_motions (event);
+#endif
+
+ if (priv->header_prepare) {
+ if (priv->header_dragging != -1 && gtk_drag_check_threshold(widget, round(priv->prev_header_x), 0, round(event->x), 0)) {
+ priv->header_prepare = 0;
+ }
+ else {
+ return FALSE;
+ }
+ }
+
+ if (priv->header_dragging >= 0) {
+ gdk_window_set_cursor (gtk_widget_get_window (widget), priv->cursor_drag);
+ DdbListviewColumn *c = header->delegate->get_columns(header);
+ for (int i = 0; c && i < priv->header_dragging; c = c->next, i++);
+ if (c) {
+ int left = event->x - priv->header_dragpt0 + priv->hscrollpos;
+ int right = left + c->width;
+ DdbListviewColumn *cc = header->delegate->get_columns(header);
+ for (int xx = 0, ii = 0; cc; xx += cc->width, cc = cc->next, ii++) {
+ if ((priv->header_dragging > ii && left < xx + cc->width/2) || (priv->header_dragging < ii && right > xx + cc->width/2)) {
+ header->delegate->move_column(header, c, ii);
+ priv->header_dragging = ii;
+ break;
+ }
+ }
+ priv->col_movepos = left;
+ gtk_widget_queue_draw (GTK_WIDGET(header));
+ }
+ }
+ else if (priv->header_sizing >= 0) {
+ int x = -priv->hscrollpos;
+ DdbListviewColumn *c = header->delegate->get_columns(header);
+ for (int i = 0; i < priv->header_sizing; i++, c = c->next) {
+ x += c->width;
+ }
+ header->delegate->set_column_width(header, c, max(DDB_LISTVIEW_MIN_COLUMN_WIDTH, round (event->x) - priv->header_dragpt0 - x));
+ gtk_widget_queue_draw(GTK_WIDGET(header));
+ }
+ else {
+ set_header_cursor(header, event->x);
+ }
+ return FALSE;
+}
+
+static int
+ddb_listview_header_get_column_idx_for_coord (DdbListviewHeader *header, int click_x) {
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ int x = -priv->hscrollpos;
+ int idx = 0;
+ for (DdbListviewColumn *c = header->delegate->get_columns(header); c; c = c->next, idx++) {
+ int w = c->width;
+ if (click_x >= x && click_x < x + w) {
+ return idx;
+ }
+ x += w;
+ }
+ return -1;
+}
+
+static gboolean
+ddb_listview_header_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data) {
+ DdbListviewHeader *header = DDB_LISTVIEW_HEADER(widget);
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ priv->prev_header_x = -1;
+ if (TEST_LEFT_CLICK (event)) {
+ header->delegate->update_scroll_ref_point(header);
+ int x = -priv->hscrollpos;
+ int i = 0;
+ DdbListviewColumn *c = header->delegate->get_columns(header);
+ while (c && event->x > x + c->width) {
+ i++;
+ x += c->width;
+ c = c->next;
+
+ }
+ priv->header_dragpt0 = round(event->x);
+ priv->header_dragpt1 = round(event->y);
+ priv->prev_header_x = event->x;
+ if (!c) {
+ priv->header_prepare = 1;
+ }
+ else if (event->x < x + c->width - 4) {
+ priv->header_prepare = 1;
+ priv->header_dragging = i;
+ priv->header_dragpt0 -= x;
+ }
+ else {
+ priv->header_sizing = i;
+ priv->header_dragpt0 -= (x + c->width);
+ }
+ }
+ else if (TEST_RIGHT_CLICK (event)) {
+ if (priv->header_dragging != -1) {
+ gtk_widget_queue_draw (GTK_WIDGET(header));
+ priv->header_dragging = -1;
+ }
+ priv->header_sizing = -1;
+ priv->header_prepare = 0;
+ int idx = ddb_listview_header_get_column_idx_for_coord (header, event->x);
+ header->delegate->context_menu (header, idx);
+ }
+ return TRUE;
+}
+
+static gboolean
+ddb_listview_header_button_release_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data) {
+ DdbListviewHeader *header = DDB_LISTVIEW_HEADER(widget);
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ if (event->button == 1) {
+ if (priv->header_sizing != -1) {
+ header->delegate->columns_changed (header);
+ priv->header_sizing = -1;
+ }
+ else if (priv->header_dragging != -1) {
+ if (priv->header_prepare) {
+ if (event->y >= 0 && event->y <= header->delegate->get_list_height(header)) {
+ // sort
+ int x = -priv->hscrollpos;
+ int i = 0;
+ DdbListviewColumn *c = header->delegate->get_columns(header);
+ while (c && event->x > x + c->width) {
+ i++;
+ x += c->width;
+ c = c->next;
+
+ }
+ if (c && event->x > x + 1 && event->x < x + c->width - 5) {
+ for (DdbListviewColumn *cc = header->delegate->get_columns(header); cc; cc = cc->next) {
+ if (cc != c) {
+ cc->sort_order = DdbListviewColumnSortOrderNone;
+ }
+ }
+ c->sort_order = c->sort_order == DdbListviewColumnSortOrderDescending
+ ? DdbListviewColumnSortOrderAscending
+ : DdbListviewColumnSortOrderDescending;
+ header->delegate->col_sort (header, c->sort_order, c->user_data);
+ gtk_widget_queue_draw (GTK_WIDGET(header));
+ }
+ }
+ }
+ else {
+ gtk_widget_queue_draw (GTK_WIDGET(header));
+ }
+ priv->header_dragging = -1;
+ }
+ priv->header_prepare = 0;
+ set_header_cursor(header, event->x);
+ }
+ return FALSE;
+}
+
+static gboolean
+ddb_listview_header_enter (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data) {
+ DdbListviewHeader *header = DDB_LISTVIEW_HEADER(widget);
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ if (!priv->header_prepare && priv->header_dragging == -1 && priv->header_sizing == -1) {
+ int x = event->x;
+#if GTK_CHECK_VERSION(3,0,0)
+ if (event->send_event) {
+ GdkWindow *win = gtk_widget_get_window(widget);
+ GdkDeviceManager *device_manager = gdk_display_get_device_manager(gdk_window_get_display(win));
+ gdk_window_get_device_position(win, gdk_device_manager_get_client_pointer(device_manager), &x, NULL, NULL);
+ }
+#endif
+ set_header_cursor(header, x);
+ }
+ return FALSE;
+}
+
+void
+ddb_listview_header_set_hscrollpos(DdbListviewHeader *header, int hscrollpos) {
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+
+ int diff = priv->hscrollpos - hscrollpos;
+ gdk_window_scroll(gtk_widget_get_window(GTK_WIDGET(header)), diff, 0);
+ priv->hscrollpos = hscrollpos;
+}
+
+gboolean
+ddb_listview_header_is_sizing (DdbListviewHeader *header) {
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ return priv->header_sizing != -1;
+}
+
+void
+ddb_listview_header_update_fonts (DdbListviewHeader *header) {
+ DdbListviewHeaderPrivate *priv = DDB_LISTVIEW_HEADER_GET_PRIVATE(header);
+ draw_init_font (&priv->hdrctx, DDB_COLUMN_FONT, 1);
+ int height = draw_get_listview_rowheight (&priv->hdrctx);
+ GtkAllocation a;
+ gtk_widget_get_allocation (GTK_WIDGET(header), &a);
+ if (height != a.height) {
+ gtk_widget_set_size_request (GTK_WIDGET(header), -1, height);
+ }
+}
+

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/ddblistviewheader.h Added

@@ -0,0 +1,78 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef ddblistviewheader_h
+#define ddblistviewheader_h
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define DDB_LISTVIEW_HEADER_TYPE (ddb_listview_header_get_type ())
+#define DDB_LISTVIEW_HEADER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), DDB_LISTVIEW_HEADER_TYPE, DdbListviewHeader))
+#define DDB_LISTVIEW_HEADER_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST((obj), DDB_LISTVIEW_HEADER_TYPE, DdbListviewHeaderClass))
+#define DDB_IS_LISTVIEW_HEADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DDB_LISTVIEW_HEADER_TYPE))
+#define DDB_IS_LISTVIEW_HEADER_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), DDB_LISTVIEW_HEADER_TYPE))
+
+typedef struct _DdbListviewHeader DdbListviewHeader;
+typedef struct _DdbListviewHeaderPrivate DdbListviewHeaderPrivate;
+typedef struct _DdbListviewHeaderClass DdbListviewHeaderClass;
+
+typedef struct {
+ void (*context_menu) (DdbListviewHeader *header, int col);
+ struct _DdbListviewColumn *(*get_columns)(DdbListviewHeader *header);
+ void (*move_column)(DdbListviewHeader *header, DdbListviewColumn *c, int pos);
+ void (*set_column_width)(DdbListviewHeader *header, DdbListviewColumn *c, int width);
+ void (*columns_changed)(DdbListviewHeader *header);
+ int (*get_list_height)(DdbListviewHeader *header);
+ void (*col_sort) (DdbListviewHeader *header, DdbListviewColumnSortOrder sort_order, void *user_data);
+ void (*update_scroll_ref_point) (DdbListviewHeader *header);
+} ddb_listview_header_delegate_t;
+
+struct _DdbListviewHeader {
+ GtkDrawingArea parent;
+ ddb_listview_header_delegate_t *delegate;
+};
+
+struct _DdbListviewHeaderClass {
+ GtkDrawingAreaClass parent_class;
+};
+
+G_END_DECLS
+
+GType
+ddb_listview_header_get_type(void);
+
+GtkWidget *
+ddb_listview_header_new(void);
+
+void
+ddb_listview_header_set_hscrollpos(DdbListviewHeader *header, int hscrollpos);
+
+gboolean
+ddb_listview_header_is_sizing (DdbListviewHeader *header);
+
+void
+ddb_listview_header_update_fonts (DdbListviewHeader *header);
+
+#endif /* ddblistviewheader_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/mainplaylist.c Added

@@ -0,0 +1,238 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include "../../../gettext.h"
+#include "../../libparser/parser.h"
+#include "../drawing.h"
+#include "../gtkui.h"
+#include "../interface.h"
+#include "../plmenu.h"
+#include "../search.h"
+#include "../support.h"
+#include "../trkproperties.h"
+#include "ddblistview.h"
+#include "mainplaylist.h"
+#include "playlistrenderer.h"
+#include "plcommon.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+#define min(x,y) ((x)<(y)?(x):(y))
+
+static int
+main_get_count (void) {
+ return deadbeef->pl_getcount (PL_MAIN);
+}
+
+static int
+main_get_sel_count (void) {
+ return deadbeef->pl_getselcount ();
+}
+
+static int
+main_get_cursor (void) {
+ return deadbeef->pl_get_cursor (PL_MAIN);
+}
+
+static void
+main_set_cursor (int cursor) {
+ deadbeef->pl_set_cursor (PL_MAIN, cursor);
+ DB_playItem_t *it = deadbeef->pl_get_for_idx (cursor);
+ if (it) {
+ ddb_event_track_t *event = (ddb_event_track_t *)deadbeef->event_alloc(DB_EV_CURSOR_MOVED);
+ event->track = it;
+ deadbeef->event_send ((ddb_event_t *)event, PL_MAIN, 0);
+ }
+}
+
+static DdbListviewIter main_head (void) {
+ return (DdbListviewIter)deadbeef->pl_get_first (PL_MAIN);
+}
+
+static DdbListviewIter main_tail (void) {
+ return (DdbListviewIter)deadbeef->pl_get_last(PL_MAIN);
+}
+
+static DdbListviewIter main_next (DdbListviewIter it) {
+ return (DdbListviewIter)deadbeef->pl_get_next(it, PL_MAIN);
+}
+
+static DdbListviewIter main_prev (DdbListviewIter it) {
+ return (DdbListviewIter)deadbeef->pl_get_prev(it, PL_MAIN);
+}
+
+void
+main_drag_n_drop (DdbListviewIter before, DdbPlaylistHandle from_playlist, uint32_t *indices, int length, int copy) {
+ deadbeef->pl_lock ();
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (copy) {
+ deadbeef->plt_copy_items (plt, PL_MAIN, (ddb_playlist_t *)from_playlist, (DB_playItem_t *)before, indices, length);
+ }
+ else {
+ deadbeef->plt_move_items (plt, PL_MAIN, (ddb_playlist_t *)from_playlist, (DB_playItem_t *)before, indices, length);
+ }
+ if (!copy && from_playlist != plt) {
+ deadbeef->plt_save_config (from_playlist);
+ }
+ deadbeef->plt_save_config (plt);
+ deadbeef->plt_unref (plt);
+ deadbeef->pl_unlock ();
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+}
+
+void
+main_tracks_copy_drag_n_drop (DdbListviewIter before, DdbListviewIter *tracks, int count) {
+ deadbeef->pl_lock ();
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+
+ ddb_playItem_t *prev = NULL;
+ if (before != NULL) {
+ prev = deadbeef->pl_get_prev(before, PL_MAIN);
+ }
+ else {
+ prev = deadbeef->plt_get_last (plt, PL_MAIN);
+ }
+
+ for (int i = 0; i < count; i++) {
+ ddb_playItem_t *it = deadbeef->pl_item_alloc();
+ deadbeef->pl_item_copy (it, tracksi);
+ deadbeef->plt_insert_item(plt, prev, it);
+ if (prev) {
+ deadbeef->pl_item_unref(prev);
+ }
+ prev = it;
+ }
+ if (prev) {
+ deadbeef->pl_item_unref(prev);
+ }
+ deadbeef->plt_unref (plt);
+ deadbeef->pl_unlock ();
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+}
+
+
+void main_external_drag_n_drop (DdbListviewIter before, char *mem, int length) {
+ gtkui_receive_fm_drop ((DB_playItem_t *)before, mem, length);
+}
+
+// columns
+
+static void
+main_col_sort (DdbListviewColumnSortOrder sort_order, void *user_data) {
+ if (sort_order) {
+ pl_common_col_sort (sort_order, PL_MAIN, user_data);
+ }
+}
+
+static void main_handle_doubleclick (DdbListview *listview, DdbListviewIter iter, int idx) {
+ deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, idx, 0);
+}
+
+static void main_selection_changed (DdbListview *ps, DdbListviewIter it, int idx) {
+ pl_common_selection_changed (ps, PL_MAIN, it);
+}
+
+static void
+main_groups_changed (const char* format) {
+ deadbeef->conf_set_str ("gtkui.playlist.group_by_tf", format);
+}
+
+static void
+main_columns_changed_before_loaded (DdbListview *listview) {
+}
+
+static void
+main_columns_changed (DdbListview *listview) {
+ pl_common_rewrite_column_config (listview, "gtkui.columns.playlist");
+}
+
+static void
+main_vscroll_changed (int pos) {
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ deadbeef->plt_set_scroll (plt, pos);
+ deadbeef->plt_unref (plt);
+ }
+}
+
+void
+main_init_listview_api (DdbListview *listview) {
+ listview->datasource->count = main_get_count;
+ listview->datasource->sel_count = main_get_sel_count;
+ listview->datasource->cursor = main_get_cursor;
+ listview->datasource->set_cursor = main_set_cursor;
+ listview->datasource->head = main_head;
+ listview->datasource->tail = main_tail;
+ listview->datasource->next = main_next;
+ listview->datasource->prev = main_prev;
+ listview->datasource->is_album_art_column = pl_common_is_album_art_column;
+ listview->datasource->modification_idx = gtkui_get_curr_playlist_mod;
+ listview->datasource->get_group_text = pl_common_get_group_text;
+ listview->datasource->ref = (void (*) (DdbListviewIter))deadbeef->pl_item_ref;
+ listview->datasource->unref = (void (*) (DdbListviewIter))deadbeef->pl_item_unref;
+ listview->datasource->is_selected = (int (*) (DdbListviewIter))deadbeef->pl_is_selected;
+ listview->datasource->select = (void (*) (DdbListviewIter, int))deadbeef->pl_set_selected;
+ listview->datasource->get_for_idx = (DdbListviewIter)deadbeef->pl_get_for_idx;
+ listview->datasource->get_idx = (int (*) (DdbListviewIter))deadbeef->pl_get_idx_of;
+
+ listview->renderer->draw_column_data = main_draw_column_data;
+ listview->renderer->draw_album_art = pl_common_draw_album_art;
+ listview->renderer->draw_group_title = main_draw_group_title;
+ listview->delegate->groups_changed = main_groups_changed;
+ listview->delegate->drag_n_drop = main_drag_n_drop;
+ listview->delegate->external_drag_n_drop = main_external_drag_n_drop;
+ listview->delegate->tracks_copy_drag_n_drop = main_tracks_copy_drag_n_drop;
+ listview->delegate->col_sort = main_col_sort;
+ listview->delegate->columns_changed = main_columns_changed_before_loaded;
+ listview->delegate->col_free_user_data = pl_common_free_col_info;
+ listview->delegate->handle_doubleclick = main_handle_doubleclick;
+ listview->delegate->list_handle_keypress = list_handle_keypress;
+ listview->delegate->selection_changed = main_selection_changed;
+ listview->delegate->header_context_menu = pl_common_header_context_menu;
+ listview->delegate->list_context_menu = list_context_menu;
+ listview->delegate->vscroll_changed = main_vscroll_changed;
+ listview->delegate->columns_changed = main_columns_changed;
+
+ ddb_listview_set_artwork_subgroup_level(listview, deadbeef->conf_get_int ("gtkui.playlist.group_artwork_level", 0));
+ ddb_listview_set_subgroup_title_padding(listview, deadbeef->conf_get_int ("gtkui.playlist.subgroup_title_padding", 10));
+ deadbeef->conf_lock();
+ char *format = strdup(deadbeef->conf_get_str_fast ("gtkui.playlist.group_by_tf", ""));
+ deadbeef->conf_unlock();
+ pl_common_set_group_format (listview, format);
+ free (format);
+
+ // create default set of columns
+ if (pl_common_load_column_config (listview, "gtkui.columns.playlist") < 0) {
+ pl_common_add_column_helper (listview, "♫", 50, DB_COLUMN_PLAYING, "%playstatus%", NULL, 0);
+ pl_common_add_column_helper (listview, _("Artist / Album"), 150, DB_COLUMN_STANDARD, COLUMN_FORMAT_ARTISTALBUM, NULL, 0);
+ pl_common_add_column_helper (listview, _("Track No"), 50, DB_COLUMN_STANDARD, COLUMN_FORMAT_TRACKNUMBER, NULL, 1);
+ pl_common_add_column_helper (listview, _("Title"), 150, DB_COLUMN_STANDARD, COLUMN_FORMAT_TITLE, NULL, 0);
+ pl_common_add_column_helper (listview, _("Duration"), 50, DB_COLUMN_STANDARD, COLUMN_FORMAT_LENGTH, NULL, 0);
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/mainplaylist.h Added

@@ -0,0 +1,35 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __MAINPLAYLIST_H
+#define __MAINPLAYLIST_H
+
+#include "ddblistview.h"
+
+void
+main_init_listview_api (DdbListview *widget);
+
+void
+main_drag_n_drop (DdbListviewIter before, DdbPlaylistHandle from_playlist, uint32_t *indices, int length, int copy);
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/playlistcontroller.c Added

@@ -0,0 +1,394 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <Block.h>
+#include <dispatch/dispatch.h>
+#include <stdlib.h>
+#include <string.h>
+#include "../gtkui.h"
+#include <deadbeef/deadbeef.h>
+#include "../../artwork/artwork.h"
+#include "mainplaylist.h"
+#include "playlistcontroller.h"
+#include "plcommon.h"
+#include "searchplaylist.h"
+
+extern DB_functions_t *deadbeef;
+
+struct playlist_controller_s {
+ ddb_artwork_plugin_t *artwork_plugin;
+ DdbListview *listview;
+ gboolean is_search;
+ ddb_listview_datasource_t datasource;
+ ddb_listview_renderer_t renderer;
+ ddb_listview_delegate_t delegate;
+};
+
+static gboolean
+_dispatch_on_main_wrapper (void *context) {
+ void (^block)(void) = context;
+ block ();
+ Block_release(block);
+ return FALSE;
+}
+
+static void
+_dispatch_on_main(void (^block)(void)) {
+ dispatch_block_t copy_block = Block_copy(block);
+ g_idle_add(_dispatch_on_main_wrapper, copy_block);
+}
+
+static void
+_artwork_listener (ddb_artwork_listener_event_t event, void *user_data, int64_t p1, int64_t p2) {
+ _dispatch_on_main(^{
+ playlist_controller_t *ctl = user_data;
+ ddb_listview_reset_artwork (ctl->listview);
+ });
+}
+
+playlist_controller_t *
+playlist_controller_new(DdbListview *listview, gboolean is_search) {
+ playlist_controller_t *ctl = calloc (1, sizeof (playlist_controller_t));
+ ctl->is_search = is_search;
+
+ ctl->artwork_plugin = (ddb_artwork_plugin_t *)deadbeef->plug_get_for_id("artwork2");
+
+ if (ctl->artwork_plugin != NULL) {
+ ctl->artwork_plugin->add_listener(_artwork_listener, ctl);
+ }
+
+ g_object_ref_sink(listview);
+
+ ctl->listview = listview;
+ ctl->listview->delegate = &ctl->delegate;
+ ctl->listview->datasource = &ctl->datasource;
+ ctl->listview->renderer = &ctl->renderer;
+
+ if (is_search) {
+ search_init_listview_api(listview);
+ }
+ else {
+ main_init_listview_api(listview);
+ }
+
+ return ctl;
+}
+
+void
+playlist_controller_free(playlist_controller_t *ctl) {
+ if (ctl->artwork_plugin) {
+ ctl->artwork_plugin->remove_listener(_artwork_listener, ctl);
+ }
+ g_object_unref(ctl->listview);
+ free (ctl);
+}
+
+typedef struct {
+ DdbListview *listview;
+ DB_playItem_t *trk;
+} w_trackdata_t;
+
+static w_trackdata_t *
+playlist_trackdata (DdbListview *listview, DB_playItem_t *track) {
+ w_trackdata_t *td = malloc (sizeof (w_trackdata_t));
+ td->listview = listview;
+ g_object_ref(listview);
+ td->trk = track;
+ deadbeef->pl_item_ref(track);
+ return td;
+}
+
+static gboolean
+trackinfochanged_cb (gpointer data) {
+ w_trackdata_t *d = data;
+ int idx = deadbeef->pl_get_idx_of (d->trk);
+ if (idx != -1) {
+ ddb_listview_draw_row (d->listview, idx, d->trk);
+ }
+ g_object_unref(d->listview);
+ deadbeef->pl_item_unref (d->trk);
+ free (d);
+ return FALSE;
+}
+
+static gboolean
+paused_cb (gpointer data) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
+ if (it) {
+ int idx = deadbeef->pl_get_idx_of (it);
+ if (idx != -1) {
+ ddb_listview_draw_row (DDB_LISTVIEW(data), idx, it);
+ }
+ deadbeef->pl_item_unref (it);
+ }
+ g_object_unref(DDB_LISTVIEW(data));
+ return FALSE;
+}
+
+static gboolean
+playlist_config_changed_cb (gpointer data) {
+ ddb_listview_refresh (DDB_LISTVIEW(data), DDB_REFRESH_COLUMNS | DDB_REFRESH_LIST | DDB_REFRESH_CONFIG);
+ return FALSE;
+}
+
+static gboolean
+songfinished_cb (gpointer data) {
+ w_trackdata_t *d = data;
+ int idx = deadbeef->pl_get_idx_of (d->trk);
+ if (idx != -1) {
+ ddb_listview_draw_row (d->listview, idx, d->trk);
+ }
+ g_object_unref(d->listview);
+ deadbeef->pl_item_unref (d->trk);
+ free (data);
+ return FALSE;
+}
+
+// This only actually does anything if the track is in the current playlist, otherwise gtkui.c will handle it
+static gboolean
+songstarted_cb (gpointer data) {
+ w_trackdata_t *d = data;
+ int idx = deadbeef->pl_get_idx_of (d->trk);
+ if (idx != -1) {
+ if (!gtkui_listview_busy) {
+ if (deadbeef->conf_get_int ("playlist.scroll.cursorfollowplayback", 1)) {
+ ddb_listview_select_single (d->listview, idx);
+ deadbeef->pl_set_cursor (PL_MAIN, idx);
+ }
+ if (deadbeef->conf_get_int ("playlist.scroll.followplayback", 1)) {
+ ddb_listview_scroll_to (d->listview, idx);
+ }
+ }
+ ddb_listview_draw_row (d->listview, idx, d->trk);
+ }
+ g_object_unref(d->listview);
+ deadbeef->pl_item_unref (d->trk);
+ free (data);
+ return FALSE;
+}
+
+static void
+playlist_set_cursor (DdbListview *listview, DB_playItem_t *it) {
+ int new_cursor = deadbeef->pl_get_idx_of_iter (it, PL_MAIN);
+ if (new_cursor != -1) {
+ int cursor = deadbeef->pl_get_cursor (PL_MAIN);
+ if (new_cursor != cursor) {
+ deadbeef->pl_set_cursor (PL_MAIN, new_cursor);
+ ddb_listview_draw_row (listview, new_cursor, NULL);
+ if (cursor != -1) {
+ ddb_listview_draw_row (listview, cursor, NULL);
+ }
+ }
+ ddb_listview_scroll_to (listview, new_cursor);
+ }
+}
+
+static gboolean
+cursor_moved_cb (gpointer data) {
+ w_trackdata_t *d = data;
+ playlist_set_cursor (d->listview, d->trk);
+ g_object_unref(d->listview);
+ deadbeef->pl_item_unref (d->trk);
+ free (data);
+ return FALSE;
+}
+
+static gboolean
+focus_selection_cb (gpointer data) {
+ DdbListview *listview = data;
+ deadbeef->pl_lock ();
+ DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
+ while (it && !deadbeef->pl_is_selected (it)) {
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ if (it) {
+ playlist_set_cursor (listview, it);
+ deadbeef->pl_item_unref (it);
+ }
+ deadbeef->pl_unlock ();
+ return FALSE;
+}
+
+// This only actually does anything if the track is in the current playlist
+// Otherwise gtkui.c will handle it and send a PLAYLISTSWITCHED message
+static gboolean
+trackfocus_cb (gpointer data) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
+ if (it) {
+ deadbeef->pl_lock ();
+ int cursor = deadbeef->pl_get_idx_of (it);
+ if (cursor != -1) {
+ ddb_listview_select_single (data, cursor);
+ deadbeef->pl_set_cursor (PL_MAIN, cursor);
+ ddb_listview_scroll_to (data, cursor);
+ }
+ deadbeef->pl_unlock ();
+ deadbeef->pl_item_unref (it);
+ }
+ return FALSE;
+}
+
+static gboolean
+playlist_sort_reset_cb (gpointer data) {
+ ddb_listview_col_sort_update (DDB_LISTVIEW(data));
+ return FALSE;
+}
+
+static gboolean
+playlist_list_refresh_cb (gpointer data) {
+ ddb_listview_refresh (DDB_LISTVIEW(data), DDB_REFRESH_LIST);
+ return FALSE;
+}
+
+static gboolean
+playlist_header_refresh_cb (gpointer data) {
+ ddb_listview_refresh (DDB_LISTVIEW(data), DDB_REFRESH_COLUMNS);
+ return FALSE;
+}
+
+static gboolean
+playlist_setup_cb (gpointer data) {
+ DdbListview *listview = DDB_LISTVIEW(data);
+ ddb_listview_clear_sort (listview);
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ int scroll = deadbeef->plt_get_scroll (plt);
+ if (!ddb_listview_list_setup(listview, scroll)) {
+ deadbeef->plt_unref (plt);
+ return TRUE;
+ }
+
+ int cursor = deadbeef->plt_get_cursor (plt, PL_MAIN);
+ if (cursor != -1) {
+ DB_playItem_t *it = deadbeef->pl_get_for_idx (cursor);
+ if (it) {
+ deadbeef->pl_set_selected (it, 1);
+ deadbeef->pl_item_unref (it);
+ }
+ }
+ deadbeef->plt_unref (plt);
+
+ if (scroll < 0) {
+ ddb_listview_scroll_to (listview, scroll * -1);
+ }
+
+ ddb_listview_refresh(listview, DDB_REFRESH_LIST);
+ }
+ return FALSE;
+}
+
+void
+playlist_controller_init (playlist_controller_t *ctl, gboolean show_headers, int width) {
+ ddb_listview_show_header (ctl->listview, show_headers);
+ ddb_listview_init_autoresize (ctl->listview, width);
+ g_idle_add (playlist_setup_cb, ctl->listview);
+}
+
+void
+playlist_controller_message (playlist_controller_t *ctl, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ if (ctl->is_search) {
+ return; // search has its own message handler
+ }
+
+ switch (id) {
+ case DB_EV_PAUSED:
+ g_object_ref(ctl->listview);
+ g_idle_add (paused_cb, ctl->listview);
+ break;
+ case DB_EV_SONGFINISHED:
+ {
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ if (ev->track) {
+ g_idle_add (songfinished_cb, playlist_trackdata(ctl->listview, ev->track));
+ }
+ break;
+ }
+ case DB_EV_SONGSTARTED:
+ {
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ if (ev->track) {
+ g_idle_add (songstarted_cb, playlist_trackdata(ctl->listview, ev->track));
+ }
+ break;
+ }
+ case DB_EV_TRACKINFOCHANGED:
+ if (p1 == DDB_PLAYLIST_CHANGE_CONTENT || p1 == DDB_PLAYLIST_CHANGE_PLAYQUEUE) {
+ g_idle_add (playlist_sort_reset_cb, ctl->listview);
+ }
+ if (p1 == DDB_PLAYLIST_CHANGE_CONTENT || (p1 == DDB_PLAYLIST_CHANGE_SELECTION && p2 != PL_MAIN) || p1 == DDB_PLAYLIST_CHANGE_PLAYQUEUE) {
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ if (ev->track) {
+ g_idle_add (trackinfochanged_cb, playlist_trackdata(ctl->listview, ev->track));
+ }
+ }
+ break;
+ case DB_EV_PLAYLISTCHANGED:
+ if (p1 == DDB_PLAYLIST_CHANGE_CONTENT || p1 == DDB_PLAYLIST_CHANGE_PLAYQUEUE) {
+ g_idle_add (playlist_sort_reset_cb, ctl->listview);
+ }
+ if (p1 == DDB_PLAYLIST_CHANGE_CONTENT ||
+ (p1 == DDB_PLAYLIST_CHANGE_SELECTION && (p2 != PL_MAIN || (DdbListview *)ctx != ctl->listview)) ||
+ p1 == DDB_PLAYLIST_CHANGE_PLAYQUEUE) {
+ g_idle_add (playlist_list_refresh_cb, ctl->listview);
+ }
+ break;
+ case DB_EV_PLAYLISTSWITCHED:
+ g_idle_add (playlist_setup_cb, ctl->listview);
+ break;
+ case DB_EV_FOCUS_SELECTION:
+ g_idle_add (focus_selection_cb, ctl->listview);
+ break;
+ case DB_EV_TRACKFOCUSCURRENT:
+ g_idle_add (trackfocus_cb, ctl->listview);
+ break;
+ case DB_EV_CURSOR_MOVED:
+ if (p1 != PL_MAIN) {
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ if (ev->track) {
+ g_idle_add (cursor_moved_cb, playlist_trackdata(ctl->listview, ev->track));
+ }
+ }
+ break;
+ case DB_EV_CONFIGCHANGED:
+ if (ctx) {
+ char *conf_str = (char *)ctx;
+ if (gtkui_listview_override_conf(conf_str) || gtkui_listview_font_conf(conf_str)) {
+ g_idle_add (playlist_config_changed_cb, ctl->listview);
+ }
+ else if (gtkui_listview_colors_conf(conf_str)) {
+ g_idle_add (playlist_list_refresh_cb, ctl->listview);
+ g_idle_add (playlist_header_refresh_cb, ctl->listview);
+ }
+ else if (gtkui_listview_font_style_conf(conf_str) || !strcmp (conf_str, "playlist.pin.groups") ||
+ !strcmp (conf_str, "playlist.groups.spacing") ) {
+ g_idle_add (playlist_list_refresh_cb, ctl->listview);
+ }
+ else if (gtkui_tabstrip_override_conf(conf_str) || gtkui_tabstrip_colors_conf(conf_str)) {
+ g_idle_add (playlist_header_refresh_cb, ctl->listview);
+ }
+ }
+ break;
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/playlistcontroller.h Added

@@ -0,0 +1,43 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef playlistcontroller_h
+#define playlistcontroller_h
+
+#include "ddblistview.h"
+
+typedef struct playlist_controller_s playlist_controller_t;
+
+playlist_controller_t *
+playlist_controller_new(DdbListview *listview, gboolean is_search);
+
+void
+playlist_controller_free(playlist_controller_t *ctl);
+
+void
+playlist_controller_init (playlist_controller_t *ctl, gboolean show_headers, int width);
+
+void
+playlist_controller_message (playlist_controller_t *ctl, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
+
+#endif /* playlistcontroller_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/playlistrenderer.c Added

@@ -0,0 +1,334 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <deadbeef/deadbeef.h>
+#include "../covermanager/covermanager.h"
+#include "../covermanager/gobjcache.h"
+#include "../drawing.h"
+#include "../gtkui.h"
+#include "playlistrenderer.h"
+#include "plcommon.h"
+
+#define min(x,y) ((x)<(y)?(x):(y))
+
+extern DB_functions_t *deadbeef;
+
+static gboolean
+tf_redraw_cb (gpointer user_data) {
+ DdbListview *lv = user_data;
+ ddb_listview_redraw_tf(lv);
+ return FALSE;
+}
+
+void
+pl_common_draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, int idx, int iter, int align, void *user_data, GdkColor *fg_clr, int x, int y, int width, int height, int even) {
+ col_info_t *info = user_data;
+
+ DB_playItem_t *playing_track = deadbeef->streamer_get_playing_track_safe ();
+
+ if (!gtkui_unicode_playstate && it && it == playing_track && info->id == DB_COLUMN_PLAYING) {
+ int paused = deadbeef->get_output ()->state () == DDB_PLAYBACK_STATE_PAUSED;
+ int buffering = !deadbeef->streamer_ok_to_read (-1);
+ GdkPixbuf *pixbuf;
+ if (paused) {
+ pixbuf = pause16_pixbuf;
+ }
+ else if (!buffering) {
+ pixbuf = play16_pixbuf;
+ }
+ else {
+ pixbuf = buffering16_pixbuf;
+ }
+
+ if (pixbuf) {
+ gdk_cairo_set_source_pixbuf (cr, pixbuf, x + width/2 - 8, y + height/2 - 8);
+ cairo_rectangle (cr, x + width/2 - 8, y + height/2 - 8, 16, 16);
+ cairo_fill (cr);
+ }
+ }
+ else if (it) {
+ char text1024 = "";
+ int is_dimmed = 0;
+ if (it == playing_track && info->id == DB_COLUMN_PLAYING) {
+ int paused = deadbeef->get_output ()->state () == DDB_PLAYBACK_STATE_PAUSED;
+ int buffering = !deadbeef->streamer_ok_to_read (-1);
+ if (paused) {
+ strcpy (text, "||");
+ }
+ else if (!buffering) {
+ strcpy (text, "►");
+ }
+ else {
+ strcpy (text, "⋯");
+ }
+ }
+ else {
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .it = it,
+ .plt = deadbeef->plt_get_curr (),
+ .iter = iter,
+ .id = info->id,
+ .idx = idx,
+ .flags = DDB_TF_CONTEXT_HAS_ID | DDB_TF_CONTEXT_HAS_INDEX,
+ };
+ if (!deadbeef->pl_is_selected (it)) {
+ ctx.flags |= DDB_TF_CONTEXT_TEXT_DIM;
+ }
+ deadbeef->tf_eval (&ctx, info->bytecode, text, sizeof (text));
+ is_dimmed = ctx.dimmed;
+ if (ctx.update > 0) {
+ int idx;
+
+ if ((ctx.flags & DDB_TF_CONTEXT_HAS_INDEX) && ctx.iter == PL_MAIN) {
+ idx = ctx.idx;
+ }
+ else {
+ idx = deadbeef->plt_get_item_idx (ctx.plt, it, ctx.iter);
+ }
+
+ ddb_listview_schedule_draw_tf(listview, idx, g_timeout_add (ctx.update, tf_redraw_cb, listview), it);
+ }
+ if (ctx.plt) {
+ deadbeef->plt_unref (ctx.plt);
+ ctx.plt = NULL;
+ }
+ char *lb = strchr (text, '\r');
+ if (lb) {
+ *lb = 0;
+ }
+ lb = strchr (text, '\n');
+ if (lb) {
+ *lb = 0;
+ }
+ }
+ GdkColor *color = NULL;
+ GdkColor temp_color;
+ if (!gtkui_override_listview_colors ()) {
+ if (deadbeef->pl_is_selected (it)) {
+ color = &gtk_widget_get_style (theme_treeview)->textGTK_STATE_SELECTED;
+ }
+ else {
+ if (fg_clr) {
+ color = fg_clr;
+ }
+ else {
+ color = &gtk_widget_get_style (theme_treeview)->textGTK_STATE_NORMAL;
+ }
+ }
+ }
+ else {
+ if (deadbeef->pl_is_selected (it)) {
+ color = ((void)(gtkui_get_listview_selected_text_color (&temp_color)), &temp_color);
+ }
+ else if (it && it == playing_track) {
+ if (fg_clr) {
+ color = fg_clr;
+ }
+ else {
+ color = ((void)(gtkui_get_listview_playing_text_color (&temp_color)), &temp_color);
+ }
+ }
+ else {
+ if (fg_clr) {
+ color = fg_clr;
+ }
+ else {
+ color = ((void)(gtkui_get_listview_text_color (&temp_color)), &temp_color);
+ }
+ }
+ }
+ float fg3 = {(float)color->red/0xffff, (float)color->green/0xffff, (float)color->blue/0xffff};
+ drawctx_t * const listctx = ddb_listview_get_listctx(listview);
+ draw_set_fg_color (listctx, fg);
+
+ int bold = 0;
+ int italic = 0;
+ if (deadbeef->pl_is_selected (it)) {
+ bold = gtkui_embolden_selected_tracks;
+ italic = gtkui_italic_selected_tracks;
+ }
+ if (it == playing_track) {
+ bold = gtkui_embolden_current_track;
+ italic = gtkui_italic_current_track;
+ }
+ cairo_save(cr);
+ cairo_rectangle(cr, x+5, y, width-10, height);
+ cairo_clip(cr);
+
+ GdkColor *highlight_color;
+ GdkColor hlclr;
+ if (!gtkui_override_listview_colors ()) {
+ highlight_color = &gtk_widget_get_style(theme_treeview)->fgGTK_STATE_NORMAL;
+ }
+ else {
+ highlight_color = ((void)(gtkui_get_listview_group_text_color (&hlclr)), &hlclr);
+ }
+
+ float highlight = {highlight_color->red/65535., highlight_color->green/65535., highlight_color->blue/65535.};
+
+ GdkColor *background_color;
+ GdkColor bgclr;
+
+ if (!gtkui_override_listview_colors ()) {
+ if (deadbeef->pl_is_selected (it)) {
+ background_color = &gtk_widget_get_style (theme_treeview)->bgGTK_STATE_SELECTED;
+ } else {
+ background_color = &gtk_widget_get_style(theme_treeview)->bgGTK_STATE_NORMAL;
+ }
+ } else {
+ if (deadbeef->pl_is_selected (it)) {
+ gtkui_get_listview_selection_color (&bgclr);
+ } else {
+ if (even) {
+ gtkui_get_listview_even_row_color (&bgclr);
+ } else {
+ gtkui_get_listview_odd_row_color (&bgclr);
+ }
+ }
+ background_color = &bgclr;
+ }
+ float bg = {background_color->red/65535., background_color->green/65535., background_color->blue/65535.};
+
+ if (is_dimmed) {
+ char *plainString;
+ PangoAttrList *attrs = convert_escapetext_to_pango_attrlist(text, &plainString, fg, bg, highlight);
+
+ drawctx_t * const listctx = ddb_listview_get_listctx(listview);
+
+ pango_layout_set_attributes (listctx->pangolayout, attrs);
+ pango_attr_list_unref(attrs);
+ draw_text_custom (listctx, x + 5, y + 3, width-10, align, DDB_LIST_FONT, bold, italic, plainString);
+ free (plainString);
+ pango_layout_set_attributes (listctx->pangolayout, NULL);
+ } else {
+ draw_text_custom (listctx, x + 5, y + 3, width-10, align, DDB_LIST_FONT, bold, italic, text);
+ }
+
+ cairo_restore(cr);
+ }
+ if (playing_track) {
+ deadbeef->pl_item_unref (playing_track);
+ }
+}
+
+void
+main_draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, int idx, int align, void *user_data, GdkColor *fg_clr, int x, int y, int width, int height, int even)
+{
+ pl_common_draw_column_data (listview, cr, it, idx, PL_MAIN, align, user_data, fg_clr, x, y, width, height, even);
+}
+
+void
+main_draw_group_title (DdbListview *listview, cairo_t *drawable, DdbListviewIter it, int x, int y, int width, int height, int group_depth)
+{
+ pl_common_draw_group_title (listview, drawable, it, PL_MAIN, x, y, width, height, group_depth);
+}
+
+static void
+cover_draw_cairo (GdkPixbuf *pixbuf, int x, int min_y, int max_y, int width, int height, cairo_t *cr, int filter) {
+ int pw = gdk_pixbuf_get_width(pixbuf);
+ int ph = gdk_pixbuf_get_height(pixbuf);
+ int real_y = min(min_y, max_y - ph);
+ cairo_save(cr);
+ cairo_rectangle(cr, x, min_y, width, max_y - min_y);
+ cairo_translate (cr, x, real_y);
+ if (pw > width || ph > height || (pw < width && ph < height)) {
+ const double scale = min(width/(double)pw, height/(double)ph);
+ cairo_translate(cr, (width - width*scale)/2., min(min_y, max_y - ph*scale) - real_y);
+ cairo_scale(cr, scale, scale);
+ cairo_pattern_set_filter(cairo_get_source(cr), filter);
+ }
+ gdk_cairo_set_source_pixbuf(cr, pixbuf, (width - pw)/2., 0);
+ cairo_fill(cr);
+ cairo_restore(cr);
+}
+
+void
+pl_common_draw_album_art (DdbListview *listview, cairo_t *cr, DdbListviewGroup *grp, void *user_data, int min_y, int next_y, int x, int y, int width, int height, int alignment) {
+ int art_width = width - ART_PADDING_HORZ * 2;
+ int art_height = height - ART_PADDING_VERT * 2;
+ if (art_width < 8 || art_height < 8 || !grp->head) {
+ return;
+ }
+
+ DB_playItem_t *it = (DB_playItem_t *)grp->head;
+ if (it == NULL) {
+ return;
+ }
+
+ covermanager_t *cm = covermanager_shared();
+
+ GdkPixbuf *image = NULL;
+
+ deadbeef->pl_item_ref (it);
+ image = covermanager_cover_for_track(cm, it, 0, ^(GdkPixbuf *img) { // img only valid in this block
+ deadbeef->pl_item_unref (it);
+
+ gtk_widget_queue_draw(GTK_WIDGET(listview));
+ // FIXME: redraw only the group rect
+ });
+ if (image != NULL) { // completion block won't be called
+ deadbeef->pl_item_unref (it);
+ it = NULL;
+ }
+ if (image == NULL) {
+ // FIXME: the problem here is that if the cover is not found (yet) -- it won't draw anything, but the rect is already invalidated, and will come out as background color
+ return;
+ }
+
+ // image is retained: release at the end
+
+ int art_x = x + ART_PADDING_HORZ;
+ min_y += ART_PADDING_VERT;
+
+ GtkAllocation size = {0};
+ size.width = gdk_pixbuf_get_width(image);
+ size.height = gdk_pixbuf_get_height(image);
+ GtkAllocation availableSize = {0};
+ availableSize.width = art_width;
+ availableSize.height = art_height;
+ GtkAllocation desiredSize = covermanager_desired_size_for_image_size(cm, size, availableSize);
+
+ GdkPixbuf *scaled_image = covermanager_create_scaled_image(cm, image, desiredSize);
+ int scaled_image_width = gdk_pixbuf_get_width(scaled_image);
+ int scaled_image_height = gdk_pixbuf_get_height(scaled_image);
+
+ // center horizontally
+ if (size.width < size.height) {
+ if (alignment == 1) { // align
+ art_x += art_width - scaled_image_width;
+ }
+ else if (alignment == 2) { // center
+ art_x += art_width/2 - scaled_image_width/2;
+ }
+ }
+
+ cover_draw_cairo(scaled_image, art_x, min_y, next_y, scaled_image_width, scaled_image_height, cr, CAIRO_FILTER_FAST);
+ g_object_unref(scaled_image);
+
+ gobj_unref(image);
+ image = NULL;
+}
+

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/playlistrenderer.h Added

@@ -0,0 +1,38 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef playlistrenderer_h
+#define playlistrenderer_h
+
+#include <gtk/gtk.h>
+#include "ddblistview.h"
+
+void
+main_draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, int idx, int align, void *user_data, GdkColor *fg_clr, int x, int y, int width, int height, int even);
+void
+main_draw_group_title (DdbListview *listview, cairo_t *drawable, DdbListviewIter it, int x, int y, int width, int height, int group_depth);
+
+void
+pl_common_draw_album_art (DdbListview *listview, cairo_t *cr, DdbListviewGroup *grp, void *user_data, int min_y, int next_y, int x, int y, int width, int height, int alignment);
+
+#endif /* playlistrenderer_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/plcommon.c Added

@@ -0,0 +1,1169 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <jansson.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <gdk/gdkkeysyms.h>
+#include "gtkui.h"
+#include <deadbeef/strdupa.h>
+#include "../../libparser/parser.h"
+#include "../../../shared/deletefromdisk.h"
+#include "actions.h"
+#include "actionhandlers.h"
+#include "clipboard.h"
+#include "drawing.h"
+#include "../interface.h"
+#include "plcommon.h"
+#include "../support.h"
+#include "trkproperties.h"
+#include "../../../shared/tftintutil.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,...)
+
+#define SUBGROUP_DELIMITER "|||"
+
+// playlist theming
+GtkWidget *theme_button;
+GtkWidget *theme_treeview;
+GdkPixbuf *play16_pixbuf;
+GdkPixbuf *pause16_pixbuf;
+GdkPixbuf *buffering16_pixbuf;
+
+struct pl_preset_column_format {
+ enum pl_column_t id;
+ char *title;
+ char *format;
+};
+
+#define PRESET_COLUMN_NUMITEMS 14
+
+static struct pl_preset_column_format pl_preset_column_formatsPRESET_COLUMN_NUMITEMS;
+
+static void
+init_preset_column_struct(void) {
+ // There can only be one instance of columns of type DB_COLUMN_FILENUMBER, DB_COLUMN_PLAYING, DB_COLUMN_ALBUM_ART and DB_COLUMN_CUSTOM
+ struct pl_preset_column_format data = {
+ {DB_COLUMN_FILENUMBER, _("Item Index"), NULL},
+ {DB_COLUMN_PLAYING, _("Playing"), NULL},
+ {DB_COLUMN_ALBUM_ART, _("Album Art"), NULL},
+ {DB_COLUMN_STANDARD, _("Artist - Album"), COLUMN_FORMAT_ARTISTALBUM},
+ {DB_COLUMN_STANDARD, _("Artist"), COLUMN_FORMAT_ARTIST},
+ {DB_COLUMN_STANDARD, _("Album"), COLUMN_FORMAT_ALBUM},
+ {DB_COLUMN_STANDARD, _("Title"), COLUMN_FORMAT_TITLE},
+ {DB_COLUMN_STANDARD, _("Year"), COLUMN_FORMAT_YEAR},
+ {DB_COLUMN_STANDARD, _("Duration"), COLUMN_FORMAT_LENGTH},
+ {DB_COLUMN_STANDARD, _("Track Number"), COLUMN_FORMAT_TRACKNUMBER},
+ {DB_COLUMN_STANDARD, _("Band / Album Artist"), COLUMN_FORMAT_BAND},
+ {DB_COLUMN_STANDARD, _("Codec"), COLUMN_FORMAT_CODEC},
+ {DB_COLUMN_STANDARD, _("Bitrate"), COLUMN_FORMAT_BITRATE},
+ {DB_COLUMN_CUSTOM, _("Custom"), NULL}
+ };
+ memcpy(pl_preset_column_formats, data, sizeof(pl_preset_column_formats));
+}
+
+int
+find_first_preset_column_type (int type) {
+ int idx = -1;
+ for (int i = 0; i < PRESET_COLUMN_NUMITEMS; i++) {
+ if (pl_preset_column_formatsi.id == type) {
+ idx = i;
+ break;
+ }
+ }
+ return idx;
+}
+
+void
+pl_common_init(void) {
+ play16_pixbuf = create_pixbuf("play_16.png");
+ g_object_ref_sink(play16_pixbuf);
+ pause16_pixbuf = create_pixbuf("pause_16.png");
+ g_object_ref_sink(pause16_pixbuf);
+ buffering16_pixbuf = create_pixbuf("buffering_16.png");
+ g_object_ref_sink(buffering16_pixbuf);
+
+ theme_treeview = gtk_tree_view_new();
+ gtk_widget_show(theme_treeview);
+ gtk_widget_set_can_focus(theme_treeview, FALSE);
+ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(theme_treeview), TRUE);
+ gtk_box_pack_start(GTK_BOX(gtk_bin_get_child(GTK_BIN(mainwin))), theme_treeview, FALSE, FALSE, 0);
+#if GTK_CHECK_VERSION(3,0,0)
+ GtkStyleContext *context = gtk_widget_get_style_context(theme_treeview);
+ gtk_style_context_add_class(context, GTK_STYLE_CLASS_CELL);
+ gtk_style_context_add_class(context, GTK_STYLE_CLASS_VIEW);
+#endif
+ theme_button = mainwin;
+
+ init_preset_column_struct();
+}
+
+void
+pl_common_free (void) {
+ if (play16_pixbuf) {
+ g_object_unref(play16_pixbuf);
+ play16_pixbuf = NULL;
+ }
+ if (pause16_pixbuf) {
+ g_object_unref(pause16_pixbuf);
+ pause16_pixbuf = NULL;
+ }
+ if (buffering16_pixbuf) {
+ g_object_unref(buffering16_pixbuf);
+ buffering16_pixbuf = NULL;
+ }
+}
+
+static col_info_t *
+create_col_info (DdbListview *listview, int id) {
+ col_info_t *info = calloc(1, sizeof(col_info_t));
+ info->id = id;
+ info->listview = listview;
+ return info;
+}
+
+void
+pl_common_free_col_info (void *data) {
+ if (!data) {
+ return;
+ }
+
+ col_info_t *info = data;
+ if (info->format) {
+ free (info->format);
+ }
+ if (info->bytecode) {
+ free (info->bytecode);
+ }
+ if (info->sort_format) {
+ free (info->sort_format);
+ }
+ if (info->sort_bytecode) {
+ free (info->sort_bytecode);
+ }
+ free (info);
+}
+
+#define COL_CONF_BUFFER_SIZE 10000
+
+int
+pl_common_rewrite_column_config (DdbListview *listview, const char *name) {
+ char *buffer = malloc (COL_CONF_BUFFER_SIZE);
+ strcpy (buffer, "");
+ char *p = buffer+1;
+ int n = COL_CONF_BUFFER_SIZE-3;
+
+ int cnt = ddb_listview_column_get_count (listview);
+ for (int i = 0; i < cnt; i++) {
+ const char *title;
+ int width;
+ int align;
+ col_info_t *info;
+ int color_override;
+ GdkColor color;
+ ddb_listview_column_get_info (listview, i, &title, &width, &align, NULL, NULL, &color_override, &color, (void **)&info);
+
+ char *esctitle = parser_escape_string (title);
+ char *escformat = info->format ? parser_escape_string (info->format) : NULL;
+ char *escsortformat = info->sort_format ? parser_escape_string (info->sort_format) : NULL;
+
+ size_t written = snprintf (p, n, "{\"title\":\"%s\",\"id\":\"%d\",\"format\":\"%s\",\"sort_format\":\"%s\",\"size\":\"%d\",\"align\":\"%d\",\"color_override\":\"%d\",\"color\":\"#ff%02x%02x%02x\"}%s", esctitle, info->id, escformat ? escformat : "", escsortformat ? escsortformat : "", width, align, color_override, color.red>>8, color.green>>8, color.blue>>8, i < cnt-1 ? "," : "");
+ free (esctitle);
+ if (escformat) {
+ free (escformat);
+ }
+ if (escsortformat) {
+ free (escsortformat);
+ }
+ p += written;
+ n -= written;
+ if (n <= 0) {
+ fprintf (stderr, "Column configuration is too large, doesn't fit in the buffer. Won't be written.\n");
+ free (buffer);
+ return -1;
+ }
+ }
+ strcpy (p, "");
+ deadbeef->conf_set_str (name, buffer);
+ deadbeef->conf_save ();
+ free (buffer);
+ return 0;
+}
+
+static int
+min_group_height(void *user_data, int width) {
+ col_info_t *info = (col_info_t *)user_data;
+ if (info->id == DB_COLUMN_ALBUM_ART) {
+ return width - 2*ART_PADDING_HORZ + 2*ART_PADDING_VERT;
+ }
+ return 0;
+}
+
+///// cover art display
+int
+pl_common_is_album_art_column (void *user_data) {
+ col_info_t *info = (col_info_t *)user_data;
+ return info->id == DB_COLUMN_ALBUM_ART;
+}
+
+
+#define CHANNEL_BLENDR(CHANNELA,CHANNELB,BLEND) ( \
+	sqrt(((1.0 - BLEND) * (CHANNELA * CHANNELA)) + (BLEND * (CHANNELB * CHANNELB))) \
+)
+
+
+
+PangoAttrList *
+convert_escapetext_to_pango_attrlist (char *text, char **plainString, float *fg, float *bg, float *highlight) {
+ const int maxTintStops = 100;
+ tint_stop_t tintStopsmaxTintStops;
+ int numTintStops;
+
+ numTintStops = calculate_tint_stops_from_string (text, tintStops, maxTintStops, plainString);
+
+ size_t strLength = strlen(*plainString);
+
+ PangoAttrList *lst = pango_attr_list_new ();
+ PangoAttribute *attr = NULL;
+
+ // add attributes
+ for (guint i = 0; i < numTintStops; i++) {
+ int index0 = tintStopsi.byteindex;
+ size_t len = strLength - index0;
+
+ GdkColor finalColor = { .red = fg0*65535, .green = fg1*65535, .blue = fg2*65535};
+ if (tintStopsi.has_rgb) {
+ finalColor.red = tintStopsi.r * 65535/255.;
+ finalColor.green = tintStopsi.g * 65535/255.;
+ finalColor.blue = tintStopsi.b * 65535/255.;
+ }
+
+ int tint = tintStopsi.tint;
+
+ if (tint >= 1 && tint <= 3) {
+ const float blend = {.50f, .25f, 0};
+ finalColor.red = CHANNEL_BLENDR(highlight0, finalColor.red/65535., blendtint-1) * 65535;
+ finalColor.green = CHANNEL_BLENDR(highlight1, finalColor.green/65535., blendtint-1) * 65535;
+ finalColor.blue = CHANNEL_BLENDR(highlight2, finalColor.blue/65535., blendtint-1) * 65535;
+
+ } else if (tint >= -3 && tint <= -1) {
+ const float blend = {.30f, .60f, .80f};
+ finalColor.red = CHANNEL_BLENDR(finalColor.red/65535., bg0, blend-tint-1) * 65535;
+ finalColor.green = CHANNEL_BLENDR(finalColor.green/65535., bg1, blend-tint-1) * 65535;
+ finalColor.blue = CHANNEL_BLENDR(finalColor.blue/65535., bg2, blend-tint-1) * 65535;
+ }
+
+ attr = pango_attr_foreground_new (finalColor.red, finalColor.green, finalColor.blue);
+ attr->start_index = index0;
+ attr->end_index = (guint)(index0 + len);
+ pango_attr_list_insert (lst, attr);
+ }
+
+ return lst;
+}
+
+// FIXME: duplicate with plmenu.c
+static GtkWidget*
+find_popup (GtkWidget *widget) {
+ GtkWidget *parent = widget;
+ do {
+ widget = parent;
+ if (GTK_IS_MENU (widget))
+ parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
+ else
+ parent = gtk_widget_get_parent (widget);
+ if (!parent)
+ parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
+ } while (parent);
+
+ return widget;
+}
+
+static DdbListview *
+get_context_menu_listview (GtkMenuItem *menuitem) {
+ return DDB_LISTVIEW (g_object_get_data (G_OBJECT (find_popup (GTK_WIDGET (menuitem))), "ps"));
+}
+
+static int
+get_context_menu_column (GtkMenuItem *menuitem) {
+ return GPOINTER_TO_INT (g_object_get_data (G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (menuitem))), "column"));
+}
+
+static char *
+strtok_stringdelim_r (char *str, const char *delim, char **next_start) {
+ if (*next_start) {
+ str = *next_start;
+ }
+
+ if (!str || str0 == 0) {
+ *next_start = NULL;
+ return NULL;
+ }
+
+ char *next = strstr(str, delim);
+
+ if (next) {
+ *next = 0;
+ *next_start = next + strlen(delim);
+ }
+ else {
+ *next_start = str + strlen(str);
+ }
+
+ return str;
+}
+
+gboolean
+list_handle_keypress (DdbListview *ps, int keyval, int state, int iter) {
+ int prev = ps->datasource->cursor ();
+ int cursor = prev;
+ GtkWidget *range = ps->scrollbar;
+ GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (range));
+
+ state &= (GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK);
+
+ if (state & GDK_CONTROL_MASK) {
+ int res = 0;
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ if (keyval == GDK_c) {
+ clipboard_copy_selection (plt, DDB_ACTION_CTX_SELECTION);
+ res = 1;
+ }
+ else if (keyval == GDK_v && iter != PL_SEARCH) {
+ clipboard_paste_selection (plt, DDB_ACTION_CTX_SELECTION);
+ res = 1;
+ }
+ else if (keyval == GDK_x) {
+ clipboard_cut_selection (plt, DDB_ACTION_CTX_SELECTION);
+ res = 1;
+ }
+ deadbeef->plt_unref (plt);
+ return res;
+ }
+ }
+
+ if (state & ~GDK_SHIFT_MASK) {
+ return FALSE;
+ }
+
+ if (keyval == GDK_Down) {
+ if (cursor < ps->datasource->count () - 1) {
+ cursor++;
+ }
+ else {
+ gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_upper (adj));
+ }
+ }
+ else if (keyval == GDK_Up) {
+ if (cursor > 0) {
+ cursor--;
+ }
+ else {
+ gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_lower (adj));
+ if (cursor < 0 && ps->datasource->count () > 0) {
+ cursor = 0;
+ }
+ }
+ }
+ else if (keyval == GDK_Page_Down) {
+ if (cursor < ps->datasource->count () - 1) {
+ cursor += 10;
+ if (cursor >= ps->datasource->count ()) {
+ cursor = ps->datasource->count () - 1;
+ }
+ }
+ else {
+ 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), gtk_adjustment_get_lower (adj));
+ cursor = 0;
+ }
+ }
+ else {
+ if (cursor < 0 && ps->datasource->count () > 0) {
+ cursor = 0;
+ }
+ gtk_range_set_value (GTK_RANGE (range), gtk_adjustment_get_lower (adj));
+ }
+ }
+ else if (keyval == GDK_End) {
+ cursor = ps->datasource->count () - 1;
+ 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), gtk_adjustment_get_lower (adj));
+ }
+ else {
+ return FALSE;
+ }
+
+ if (state & GDK_SHIFT_MASK) {
+ if (cursor != prev) {
+ int scrollpos = ddb_listview_get_scroll_pos(ps);
+ int list_height = ddb_listview_get_list_height(ps);
+ int newscroll = scrollpos;
+ int cursor_scroll = ddb_listview_get_row_pos (ps, cursor, NULL);
+ if (cursor_scroll < scrollpos) {
+ newscroll = cursor_scroll;
+ }
+ else if (cursor_scroll >= scrollpos + list_height) {
+ newscroll = cursor_scroll - list_height + 1;
+ if (newscroll < 0) {
+ newscroll = 0;
+ }
+ }
+ if (scrollpos != newscroll) {
+ GtkWidget *range = ps->scrollbar;
+ gtk_range_set_value (GTK_RANGE (range), newscroll);
+ }
+
+ // select all between shift_sel_anchor and deadbeef->pl_get_cursor (ps->iterator)
+ int shift_sel_anchor = ddb_listview_get_shift_sel_anchor(ps);
+ int start = min (cursor, shift_sel_anchor);
+ int end = max (cursor, shift_sel_anchor);
+
+ ddb_listview_select_range (ps, start, end);
+ ddb_listview_update_cursor (ps, cursor);
+ }
+ }
+ else {
+ ddb_listview_set_shift_sel_anchor(ps, cursor);
+ ddb_listview_set_cursor_and_scroll (ps, cursor);
+ }
+
+ return TRUE;
+}
+
+static void
+on_group_by_none_activate (GtkMenuItem *menuitem,
+ gpointer user_data) {
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref (plt);
+ }
+ pl_common_set_group_format (get_context_menu_listview (menuitem) , "");
+}
+
+static void
+on_pin_groups_active (GtkMenuItem *menuitem,
+ gpointer user_data) {
+ int old_val = deadbeef->conf_get_int ("playlist.pin.groups", 0);
+ deadbeef->conf_set_int ("playlist.pin.groups", old_val ? 0 : 1);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, (uintptr_t)"playlist.pin.groups", 0, 0);
+ gtk_check_menu_item_toggled(GTK_CHECK_MENU_ITEM(menuitem));
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref(plt);
+ }
+}
+
+static void
+on_group_by_artist_date_album_activate (GtkMenuItem *menuitem,
+ gpointer user_data) {
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref (plt);
+ }
+ pl_common_set_group_format (get_context_menu_listview (menuitem), "%album artist% - ''$year(%date%)'' %album%");
+}
+
+static void
+on_group_by_artist_activate (GtkMenuItem *menuitem,
+ gpointer user_data) {
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref (plt);
+ }
+ pl_common_set_group_format (get_context_menu_listview (menuitem), "%artist%");
+}
+
+
+static void
+_make_format (char *format, size_t size, const DdbListviewGroupFormat *fmt) {
+ format0 = 0;
+ while (fmt) {
+ if (format0 != 0) {
+ strncat(format, SUBGROUP_DELIMITER, size - strlen(format) - 1);
+ }
+ strncat(format, fmt->format, size - strlen(format) - 1);
+ fmt = fmt->next;
+ }
+}
+
+static void
+on_group_by_custom_activate (GtkMenuItem *menuitem,
+ gpointer user_data) {
+ GtkWidget *dlg = create_groupbydlg ();
+
+ DdbListview *listview = get_context_menu_listview (menuitem);
+ gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+ gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (mainwin));
+ GtkWidget *entry = lookup_widget (dlg, "format");
+ char format1024;
+
+ const DdbListviewGroupFormat *group_formats = ddb_listview_get_group_formats (listview);
+ _make_format(format, sizeof (format), group_formats);
+
+ gtk_entry_set_text (GTK_ENTRY (entry), format);
+ gint response = gtk_dialog_run (GTK_DIALOG (dlg));
+
+ if (response == GTK_RESPONSE_OK) {
+ const gchar *text = gtk_entry_get_text (GTK_ENTRY (entry));
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref (plt);
+ }
+ pl_common_set_group_format (listview, text);
+ }
+ gtk_widget_destroy (dlg);
+}
+
+int
+pl_common_load_column_config (DdbListview *listview, const char *key) {
+ deadbeef->conf_lock ();
+ const char *json = deadbeef->conf_get_str_fast (key, NULL);
+ json_error_t error;
+ if (!json) {
+ deadbeef->conf_unlock ();
+ return -1;
+ }
+ json_t *root = json_loads (json, 0, &error);
+ deadbeef->conf_unlock ();
+ if(!root) {
+ printf ("json parse error for config variable %s\n", key);
+ return -1;
+ }
+ if (!json_is_array (root))
+ {
+ goto error;
+ }
+ for (int i = 0; i < json_array_size(root); i++) {
+ json_t *title, *align, *id, *format, *sort_format, *width, *color_override, *color;
+ json_t *data = json_array_get (root, i);
+ if (!json_is_object (data)) {
+ goto error;
+ }
+ title = json_object_get (data, "title");
+ align = json_object_get (data, "align");
+ id = json_object_get (data, "id");
+ format = json_object_get (data, "format");
+ sort_format = json_object_get (data, "sort_format");
+ width = json_object_get (data, "size");
+ color_override = json_object_get (data, "color_override");
+ color = json_object_get (data, "color");
+ if (!json_is_string (title)
+ || !json_is_string (id)
+ || !json_is_string (width)
+ ) {
+ goto error;
+ }
+ const char *stitle = NULL;
+ int ialign = -1;
+ int iid = -1;
+ const char *sformat = NULL;
+ const char *ssort_format = NULL;
+ int iwidth = 0;
+ int icolor_override = 0;
+ const char *scolor = NULL;
+ GdkColor gdkcolor = {0};
+ stitle = json_string_value (title);
+ if (json_is_string (align)) {
+ ialign = atoi (json_string_value (align));
+ }
+ if (json_is_string (id)) {
+ iid = atoi (json_string_value (id));
+ }
+ if (json_is_string (format)) {
+ sformat = json_string_value (format);
+ if (!sformat0) {
+ sformat = NULL;
+ }
+ }
+ if (json_is_string (sort_format)) {
+ ssort_format = json_string_value (sort_format);
+ if (!ssort_format0) {
+ ssort_format = NULL;
+ }
+ }
+ if (json_is_string (width)) {
+ iwidth = atoi (json_string_value (width));
+ if (iwidth < 0) {
+ iwidth = 50;
+ }
+ }
+ if (json_is_string (color_override)) {
+ icolor_override = atoi (json_string_value (color_override));
+ }
+ if (json_is_string (color)) {
+ scolor = json_string_value (color);
+ int r, g, b, a;
+ if (4 == sscanf (scolor, "#%02x%02x%02x%02x", &a, &r, &g, &b)) {
+ gdkcolor.red = r<<8;
+ gdkcolor.green = g<<8;
+ gdkcolor.blue = b<<8;
+ }
+ else {
+ icolor_override = 0;
+ }
+ }
+
+ col_info_t *inf = create_col_info(listview, iid);
+ if (sformat) {
+ inf->format = strdup (sformat);
+ inf->bytecode = deadbeef->tf_compile (inf->format);
+ }
+ if (ssort_format) {
+ inf->sort_format = strdup (ssort_format);
+ inf->sort_bytecode = deadbeef->tf_compile (inf->sort_format);
+ }
+ ddb_listview_column_append (listview, stitle, iwidth, ialign, inf->id == DB_COLUMN_ALBUM_ART ? min_group_height : NULL, inf->id == DB_COLUMN_ALBUM_ART, icolor_override, gdkcolor, inf);
+ }
+ json_decref(root);
+ return 0;
+error:
+ fprintf (stderr, "%s config variable contains invalid data, ignored\n", key);
+ json_decref(root);
+ return -1;
+}
+
+static void
+init_column (col_info_t *inf, int id, const char *format, const char *sort_format) {
+ if (inf->format) {
+ free (inf->format);
+ inf->format = NULL;
+ }
+ if (inf->sort_format) {
+ free (inf->sort_format);
+ inf->sort_format = NULL;
+ }
+ if (inf->bytecode) {
+ deadbeef->tf_free (inf->bytecode);
+ inf->bytecode = NULL;
+ }
+ if (inf->sort_bytecode) {
+ deadbeef->tf_free (inf->sort_bytecode);
+ inf->sort_bytecode = NULL;
+ }
+
+ inf->id = pl_preset_column_formatsid.id;
+
+ if (pl_preset_column_formatsid.id == DB_COLUMN_CUSTOM) {
+ inf->format = strdup (format);
+ } else if (pl_preset_column_formatsid.id == DB_COLUMN_STANDARD && pl_preset_column_formatsid.format) {
+ inf->format = strdup (pl_preset_column_formatsid.format);
+ }
+
+ if (inf->format) {
+ inf->bytecode = deadbeef->tf_compile (inf->format);
+ }
+
+ if (sort_format) {
+ inf->sort_format = strdup(sort_format);
+ inf->sort_bytecode = deadbeef->tf_compile (inf->sort_format);
+ }
+}
+
+static void
+populate_column_id_combo_box(GtkComboBoxText *combo_box) {
+ for (int i = 0; i < PRESET_COLUMN_NUMITEMS; i++) {
+ gtk_combo_box_text_append_text (combo_box, pl_preset_column_formatsi.title);
+ }
+}
+
+int editcolumn_title_changed = 0;
+
+static void
+on_add_column_activate (GtkMenuItem *menuitem,
+ gpointer user_data) {
+ editcolumn_title_changed = 0;
+ GdkColor color;
+ gtkui_get_listview_text_color (&color);
+
+ GtkWidget *dlg = create_editcolumndlg ();
+ gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+ gtk_window_set_title (GTK_WINDOW (dlg), _("Add column"));
+ gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (mainwin));
+ populate_column_id_combo_box (GTK_COMBO_BOX_TEXT (lookup_widget (dlg, "id")));
+ gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "id")), 0);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "align")), 0);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "color_override")), 0);
+
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (dlg, "color")), &color);
+ gint response = gtk_dialog_run (GTK_DIALOG (dlg));
+ if (response == GTK_RESPONSE_OK) {
+ const gchar *title = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "title")));
+ const gchar *format = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "format")));
+ const gchar *sort_format = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "sort_format")));
+ int sel = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (dlg, "id")));
+
+ int clr_override = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "color_override")));
+ GdkColor clr;
+ gtk_color_button_get_color (GTK_COLOR_BUTTON (lookup_widget (dlg, "color")), &clr);
+
+ col_info_t *inf = create_col_info(user_data, 0);
+ init_column (inf, sel, format, sort_format);
+
+ int align = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (dlg, "align")));
+ DdbListview *listview = get_context_menu_listview (menuitem);
+ int before = get_context_menu_column (menuitem);
+ ddb_listview_column_insert (listview, before, title, 100, align, inf->id == DB_COLUMN_ALBUM_ART ? min_group_height : NULL, inf->id == DB_COLUMN_ALBUM_ART, clr_override, clr, inf);
+ ddb_listview_refresh (listview, DDB_LIST_CHANGED | DDB_REFRESH_COLUMNS | DDB_REFRESH_LIST | DDB_REFRESH_HSCROLL);
+ }
+ gtk_widget_destroy (dlg);
+}
+
+static void
+on_edit_column_activate (GtkMenuItem *menuitem,
+ gpointer user_data) {
+ int active_column = get_context_menu_column (menuitem);
+ if (active_column == -1)
+ return;
+
+ DdbListview *listview = get_context_menu_listview (menuitem);
+ GtkWidget *dlg = create_editcolumndlg ();
+ gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+ gtk_window_set_title (GTK_WINDOW (dlg), _("Edit column"));
+ gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (mainwin));
+ populate_column_id_combo_box (GTK_COMBO_BOX_TEXT (lookup_widget (dlg, "id")));
+
+ const char *title;
+ int width;
+ int align_right;
+ col_info_t *inf;
+ int color_override;
+ GdkColor color;
+ int res = ddb_listview_column_get_info (listview, active_column, &title, &width, &align_right, NULL, NULL, &color_override, &color, (void **)&inf);
+ if (res == -1) {
+ trace ("attempted to edit non-existing column\n");
+ return;
+ }
+
+ int idx = -1;
+
+ // get index for id
+ if (inf->id == DB_COLUMN_STANDARD) {
+ for (int i = 0; i < PRESET_COLUMN_NUMITEMS; i++) {
+ if (pl_preset_column_formatsi.id == DB_COLUMN_STANDARD && inf->format &&
+ pl_preset_column_formatsi.format && !strcmp (inf->format, pl_preset_column_formatsi.format)) {
+ idx = i;
+ break;
+ }
+ }
+ // old style custom column
+ if (idx == -1) {
+ idx = find_first_preset_column_type(DB_COLUMN_CUSTOM);
+ }
+ } else {
+ idx = find_first_preset_column_type(inf->id);
+ }
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "id")), idx);
+ if (idx == PRESET_COLUMN_NUMITEMS-1) {
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "format")), inf->format);
+ }
+ if (inf->sort_format) {
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "sort_format")), inf->sort_format);
+ }
+ gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "align")), align_right);
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "title")), title);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "color_override")), color_override);
+
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (dlg, "color")), &color);
+ editcolumn_title_changed = 0;
+ gint response = gtk_dialog_run (GTK_DIALOG (dlg));
+ if (response == GTK_RESPONSE_OK) {
+ const gchar *title = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "title")));
+ const gchar *format = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "format")));
+ const gchar *sort_format = gtk_entry_get_text (GTK_ENTRY (lookup_widget (dlg, "sort_format")));
+ int id = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (dlg, "id")));
+ int align = gtk_combo_box_get_active (GTK_COMBO_BOX (lookup_widget (dlg, "align")));
+
+ int clr_override = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (dlg, "color_override")));
+ GdkColor clr;
+ gtk_color_button_get_color (GTK_COLOR_BUTTON (lookup_widget (dlg, "color")), &clr);
+
+ init_column (inf, id, format, sort_format);
+ ddb_listview_column_set_info (listview, active_column, title, width, align, inf->id == DB_COLUMN_ALBUM_ART ? min_group_height : NULL, inf->id == DB_COLUMN_ALBUM_ART, clr_override, clr, inf);
+
+ ddb_listview_refresh (listview, DDB_LIST_CHANGED | DDB_REFRESH_COLUMNS | DDB_REFRESH_LIST);
+ }
+ gtk_widget_destroy (dlg);
+}
+
+
+static void
+on_remove_column_activate (GtkMenuItem *menuitem,
+ gpointer user_data) {
+ int active_column = get_context_menu_column (menuitem);
+ if (active_column == -1)
+ return;
+
+ DdbListview *listview = get_context_menu_listview (menuitem);
+ ddb_listview_column_remove (listview, active_column);
+ ddb_listview_refresh (listview, DDB_LIST_CHANGED | DDB_REFRESH_COLUMNS | DDB_REFRESH_LIST | DDB_REFRESH_HSCROLL);
+}
+
+static GtkWidget*
+create_headermenu (DdbListview *listview, int column, int groupby) {
+ GtkWidget *headermenu;
+ GtkWidget *add_column;
+ GtkWidget *edit_column;
+ GtkWidget *remove_column;
+ GtkWidget *separator;
+ GtkWidget *group_by;
+ GtkWidget *pin_groups;
+ GtkWidget *group_by_menu;
+ GtkWidget *none;
+ GtkWidget *artist_date_album;
+ GtkWidget *artist;
+ GtkWidget *custom;
+
+ headermenu = gtk_menu_new ();
+
+ add_column = gtk_menu_item_new_with_mnemonic (_("Add column"));
+ gtk_widget_show (add_column);
+ gtk_container_add (GTK_CONTAINER (headermenu), add_column);
+
+ edit_column = gtk_menu_item_new_with_mnemonic (_("Edit column"));
+ gtk_widget_show (edit_column);
+ gtk_container_add (GTK_CONTAINER (headermenu), edit_column);
+
+ remove_column = gtk_menu_item_new_with_mnemonic (_("Remove column"));
+ gtk_widget_show (remove_column);
+ gtk_container_add (GTK_CONTAINER (headermenu), remove_column);
+
+ if (column == -1) {
+ gtk_widget_set_sensitive (edit_column, FALSE);
+ gtk_widget_set_sensitive (remove_column, FALSE);
+ }
+
+ if (groupby) {
+ separator = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator);
+ gtk_container_add (GTK_CONTAINER (headermenu), separator);
+ gtk_widget_set_sensitive (separator, FALSE);
+
+ pin_groups = gtk_check_menu_item_new_with_mnemonic(_("Pin groups when scrolling"));
+ gtk_widget_show (pin_groups);
+ gtk_container_add (GTK_CONTAINER (headermenu), pin_groups);
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (pin_groups), (gboolean)deadbeef->conf_get_int("playlist.pin.groups",0));
+
+ group_by = gtk_menu_item_new_with_mnemonic (_("Group by"));
+ gtk_widget_show (group_by);
+ gtk_container_add (GTK_CONTAINER (headermenu), group_by);
+
+ group_by_menu = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (group_by), group_by_menu);
+
+ none = gtk_menu_item_new_with_mnemonic (_("None"));
+ gtk_widget_show (none);
+ gtk_container_add (GTK_CONTAINER (group_by_menu), none);
+
+ artist_date_album = gtk_menu_item_new_with_mnemonic (_("Artist/Date/Album"));
+ gtk_widget_show (artist_date_album);
+ gtk_container_add (GTK_CONTAINER (group_by_menu), artist_date_album);
+
+ artist = gtk_menu_item_new_with_mnemonic (_("Artist"));
+ gtk_widget_show (artist);
+ gtk_container_add (GTK_CONTAINER (group_by_menu), artist);
+
+ custom = gtk_menu_item_new_with_mnemonic (_("Custom"));
+ gtk_widget_show (custom);
+ gtk_container_add (GTK_CONTAINER (group_by_menu), custom);
+
+ g_signal_connect ((gpointer) none, "activate",
+ G_CALLBACK (on_group_by_none_activate),
+ NULL);
+
+ g_signal_connect ((gpointer) pin_groups, "activate",
+ G_CALLBACK (on_pin_groups_active),
+ NULL);
+
+ g_signal_connect ((gpointer) artist_date_album, "activate",
+ G_CALLBACK (on_group_by_artist_date_album_activate),
+ NULL);
+
+ g_signal_connect ((gpointer) artist, "activate",
+ G_CALLBACK (on_group_by_artist_activate),
+ NULL);
+
+ g_signal_connect ((gpointer) custom, "activate",
+ G_CALLBACK (on_group_by_custom_activate),
+ NULL);
+ }
+
+ g_signal_connect ((gpointer) add_column, "activate",
+ G_CALLBACK (on_add_column_activate),
+ listview);
+ g_signal_connect ((gpointer) edit_column, "activate",
+ G_CALLBACK (on_edit_column_activate),
+ listview);
+ g_signal_connect ((gpointer) remove_column, "activate",
+ G_CALLBACK (on_remove_column_activate),
+ listview);
+
+ return headermenu;
+}
+
+void
+pl_common_header_context_menu (DdbListview *ps, int column) {
+ GtkWidget *menu = create_headermenu (ps, column, 1);
+ g_object_set_data (G_OBJECT (menu), "ps", ps);
+ g_object_set_data (G_OBJECT (menu), "column", GINT_TO_POINTER (column));
+
+ gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+}
+
+void
+pl_common_add_column_helper (DdbListview *listview, const char *title, int width, int id, const char *format, const char *sort_format, int align_right) {
+ if (!format) {
+ format = "";
+ }
+ if (!sort_format) {
+ sort_format = "";
+ }
+ col_info_t *inf = create_col_info(listview, id);
+ inf->format = strdup (format);
+ inf->bytecode = deadbeef->tf_compile (inf->format);
+ inf->sort_format = strdup (sort_format);
+ inf->sort_bytecode = deadbeef->tf_compile (inf->sort_format);
+ GdkColor color = { 0, 0, 0, 0 };
+ ddb_listview_column_append (listview, title, width, align_right, inf->id == DB_COLUMN_ALBUM_ART ? min_group_height : NULL, inf->id == DB_COLUMN_ALBUM_ART, 0, color, inf);
+}
+
+int
+pl_common_get_group_text (DdbListview *listview, DdbListviewIter it, char *str, int size, int index) {
+ const DdbListviewGroupFormat *fmt = ddb_listview_get_group_formats(listview);
+ if (!fmt->format || !fmt->format0) {
+ return -1;
+ }
+ while (index > 0) {
+ index--;
+ fmt = fmt->next;
+ if (fmt == NULL) {
+ return -1;
+ }
+ }
+ if (fmt->bytecode) {
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .it = it,
+ .plt = deadbeef->plt_get_curr (),
+ .flags = DDB_TF_CONTEXT_NO_DYNAMIC,
+ };
+ deadbeef->tf_eval (&ctx, fmt->bytecode, str, size);
+ if (ctx.plt) {
+ deadbeef->plt_unref (ctx.plt);
+ ctx.plt = NULL;
+ }
+
+ char *lb = strchr (str, '\r');
+ if (lb) {
+ *lb = 0;
+ }
+ lb = strchr (str, '\n');
+ if (lb) {
+ *lb = 0;
+ }
+ }
+ return fmt->next == NULL ? 0 : 1;
+}
+
+void
+pl_common_draw_group_title (DdbListview *listview, cairo_t *drawable, DdbListviewIter it, int iter, int x, int y, int width, int height, int group_depth) {
+ const DdbListviewGroupFormat *fmt = ddb_listview_get_group_formats(listview);
+ if (fmt->format && fmt->format0) {
+ char str1024 = "";
+ while (group_depth--) {
+ fmt = fmt->next;
+ }
+ int isdimmed=0;
+ if (fmt->bytecode) {
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .it = it,
+ .plt = deadbeef->plt_get_curr (),
+ .flags = DDB_TF_CONTEXT_NO_DYNAMIC | DDB_TF_CONTEXT_TEXT_DIM,
+ .iter = iter,
+ };
+ deadbeef->tf_eval (&ctx, fmt->bytecode, str, sizeof (str));
+ if (ctx.plt) {
+ deadbeef->plt_unref (ctx.plt);
+ ctx.plt = NULL;
+ }
+ isdimmed = ctx.dimmed;
+
+
+ char *lb = strchr (str, '\r');
+ if (lb) {
+ *lb = 0;
+ }
+ lb = strchr (str, '\n');
+ if (lb) {
+ *lb = 0;
+ }
+ }
+
+ int theming = !gtkui_override_listview_colors ();
+ GdkColor clr;
+ if (theming) {
+ clr = gtk_widget_get_style(theme_treeview)->fgGTK_STATE_NORMAL;
+ }
+ else {
+ gtkui_get_listview_group_text_color (&clr);
+ }
+
+ drawctx_t * const ctx = ddb_listview_get_grpctx(listview);
+
+ float rgb = {clr.red/65535., clr.green/65535., clr.blue/65535.};
+ draw_set_fg_color (ctx, rgb);
+
+ int ew;
+ int text_width = width-x-10;
+ if (text_width > 0) {
+ if (isdimmed) {
+ GdkColor *highlight_color;
+ GdkColor hlclr;
+ if (!gtkui_override_listview_colors ()) {
+ highlight_color = &gtk_widget_get_style(theme_treeview)->fgGTK_STATE_NORMAL;
+ }
+ else {
+ highlight_color = ((void)(gtkui_get_listview_group_text_color (&hlclr)), &hlclr);
+ }
+
+ float highlight = {highlight_color->red/65535., highlight_color->green/65535., highlight_color->blue/65535.};
+
+ GdkColor *background_color;
+ GdkColor bgclr;
+
+ if (!gtkui_override_listview_colors ()) {
+ background_color = &gtk_widget_get_style(theme_treeview)->bgGTK_STATE_NORMAL;
+ } else {
+ gtkui_get_listview_odd_row_color (&bgclr);
+ background_color = &bgclr;
+ }
+ float bg = {background_color->red/65535., background_color->green/65535., background_color->blue/65535.};
+
+ PangoAttrList *attrs;
+ char *plainString;
+
+ attrs = convert_escapetext_to_pango_attrlist(str, &plainString, rgb, bg, highlight);
+ pango_layout_set_attributes (ctx->pangolayout, attrs);
+ pango_attr_list_unref(attrs);
+ draw_text_custom (ctx, x + 5, y + height/2 - draw_get_listview_rowheight (ctx)/2 + 3, text_width, 0, DDB_GROUP_FONT, 0, 0, plainString);
+ free (plainString);
+ pango_layout_set_attributes (ctx->pangolayout, NULL);
+ } else {
+ draw_text_custom (ctx, x + 5, y + height/2 - draw_get_listview_rowheight (ctx)/2 + 3, text_width, 0, DDB_GROUP_FONT, 0, 0, str);
+ }
+ draw_get_layout_extents (ctx, &ew, NULL);
+
+ size_t len = strlen (str);
+ int line_x = x + 10 + ew + (len ? ew / len / 2 : 0);
+ if (line_x+20 < x + width) {
+ draw_line (ctx, line_x, y+height/2, x+width, y+height/2);
+ }
+ }
+ }
+}
+
+void
+pl_common_selection_changed (DdbListview *ps, int iter, DB_playItem_t *it) {
+ if (it) {
+ ddb_event_track_t *ev = (ddb_event_track_t *)deadbeef->event_alloc(DB_EV_TRACKINFOCHANGED);
+ ev->track = it;
+ deadbeef->pl_item_ref(ev->track);
+ deadbeef->event_send((ddb_event_t *)ev, DDB_PLAYLIST_CHANGE_SELECTION, iter);
+ }
+ else {
+ deadbeef->sendmessage(DB_EV_PLAYLISTCHANGED, (uintptr_t)ps, DDB_PLAYLIST_CHANGE_SELECTION, iter);
+ }
+}
+
+void
+pl_common_col_sort (DdbListviewColumnSortOrder sort_order, int iter, void *user_data) {
+ col_info_t *c = (col_info_t*)user_data;
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ char *format = (c->sort_format && strlen(c->sort_format)) ? c->sort_format : c->format;
+ deadbeef->plt_sort_v2 (plt, iter, c->id, format, sort_order == DdbListviewColumnSortOrderDescending ? DDB_SORT_DESCENDING : DDB_SORT_ASCENDING);
+ deadbeef->plt_unref (plt);
+}
+
+void
+pl_common_set_group_format (DdbListview *listview, const char *_format) {
+ char *format = strdup (_format);
+ parser_unescape_quoted_string (format);
+
+ DdbListviewGroupFormat *group_formats = NULL;
+ DdbListviewGroupFormat *fmt = NULL;
+ char *saveptr = NULL;
+ char *token;
+ while ((token = strtok_stringdelim_r(format, SUBGROUP_DELIMITER, &saveptr)) != NULL) {
+ if (strlen(token) > 0) {
+ DdbListviewGroupFormat *new_fmt = calloc(1, sizeof(DdbListviewGroupFormat));
+ if (!fmt) {
+ group_formats = new_fmt;
+ fmt = group_formats;
+ }
+ else {
+ fmt->next = new_fmt;
+ fmt = fmt->next;
+ }
+ fmt->format = strdup (token);
+ fmt->bytecode = deadbeef->tf_compile (fmt->format);
+ }
+ }
+
+ free (format);
+
+ // always have at least one
+ if (!group_formats) {
+ group_formats = calloc(1, sizeof(DdbListviewGroupFormat));
+ fmt = group_formats;
+ fmt->format = strdup ("");
+ fmt->bytecode = deadbeef->tf_compile (fmt->format);
+ }
+
+ listview->delegate->groups_changed(_format);
+
+ ddb_listview_set_group_formats(listview, group_formats);
+ ddb_listview_refresh (listview, DDB_LIST_CHANGED | DDB_REFRESH_LIST);
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/plcommon.h Added

@@ -0,0 +1,113 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __PLCOLUMNS_H
+#define __PLCOLUMNS_H
+
+#include "ddblistview.h"
+#include "trkproperties.h"
+
+#define COLUMN_FORMAT_ARTISTALBUM "$if(%artist%,%artist%,Unknown Artist) - %album%"
+#define COLUMN_FORMAT_ARTIST "$if(%artist%,%artist%,Unknown Artist)"
+#define COLUMN_FORMAT_ALBUM "%album%"
+#define COLUMN_FORMAT_TITLE "%title%"
+#define COLUMN_FORMAT_YEAR "%year%"
+#define COLUMN_FORMAT_LENGTH "%length%"
+#define COLUMN_FORMAT_TRACKNUMBER "%tracknumber%"
+#define COLUMN_FORMAT_BAND "$if(%album artist%,%album artist%,Unknown Artist)"
+#define COLUMN_FORMAT_CODEC "%codec%"
+#define COLUMN_FORMAT_BITRATE "%bitrate%"
+
+#define ART_PADDING_HORZ 8
+#define ART_PADDING_VERT 0
+
+extern GdkPixbuf *play16_pixbuf;
+extern GdkPixbuf *pause16_pixbuf;
+extern GdkPixbuf *buffering16_pixbuf;
+extern GtkWidget *theme_treeview;
+extern GtkWidget *theme_button;
+
+typedef struct {
+    int id;
+    char *format;
+    char *sort_format;
+    char *bytecode;
+    char *sort_bytecode;
+    DdbListview *listview;
+} col_info_t;
+
+int
+pl_common_rewrite_column_config (DdbListview *listview, const char *name);
+
+int
+pl_common_is_album_art_column (void *user_data);
+
+void
+pl_common_draw_album_art (DdbListview *listview, cairo_t *cr, DdbListviewGroup *group, void *user_data, int min_y, int next_y, int x, int y, int width, int height, int alignment);
+
+gboolean
+list_handle_keypress (DdbListview *ps, int keyval, int state, int iter);
+
+void
+pl_common_draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, int idx, int iter, int align, void *user_data, GdkColor *fg_clr, int x, int y, int width, int height, int even);
+
+int
+pl_common_load_column_config (DdbListview *listview, const char *key);
+
+void
+pl_common_add_column_helper (DdbListview *listview, const char *title, int width, int id, const char *format, const char *sort_format, int align_right);
+
+void
+pl_common_header_context_menu (DdbListview *ps, int column);
+
+void
+pl_common_init(void);
+
+void
+pl_common_free (void);
+
+void
+pl_common_free_col_info (void *data);
+
+int
+pl_common_get_group_text (DdbListview *listview, DdbListviewIter it, char *str, int size, int index);
+
+void
+pl_common_draw_group_title (DdbListview *listview, cairo_t *drawable, DdbListviewIter it, int iter, int x, int y, int width, int height, int group_depth);
+
+void
+pl_common_selection_changed (DdbListview *ps, int iter, DB_playItem_t *it);
+
+void
+pl_common_col_sort (DdbListviewColumnSortOrder sort_order, int iter, void *user_data);
+
+void
+pl_common_set_group_format (DdbListview *listview, const char *format);
+
+int
+find_first_preset_column_type (int type);
+
+PangoAttrList *
+convert_escapetext_to_pango_attrlist (char *text, char **plainString, float *fg, float *bg, float *highlight);
+
+#endif // __PLCOLUMNS_H

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/searchplaylist.c Added

@@ -0,0 +1,205 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+#include <stdlib.h>
+#include <deadbeef/deadbeef.h>
+#include "../../../gettext.h"
+#include "gtkui.h"
+#include "plcommon.h"
+#include "plmenu.h"
+#include "search.h"
+#include "searchplaylist.h"
+
+extern DB_functions_t *deadbeef;
+
+static DB_playItem_t *
+next_playitem (DB_playItem_t *it) {
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_SEARCH);
+ deadbeef->pl_item_unref (it);
+ return next;
+}
+
+static int
+search_get_sel_count (void) {
+ int cnt = 0;
+ for (DB_playItem_t *it = deadbeef->pl_get_first (PL_SEARCH); it; it = next_playitem (it)) {
+ if (deadbeef->pl_is_selected (it)) {
+ cnt++;
+ }
+ }
+ return cnt;
+}
+
+static int search_get_count (void) {
+ return deadbeef->pl_getcount (PL_SEARCH);
+}
+
+static int search_get_cursor (void) {
+ return deadbeef->pl_get_cursor (PL_SEARCH);
+}
+
+static void search_set_cursor (int cursor) {
+ deadbeef->pl_set_cursor (PL_SEARCH, cursor);
+ DB_playItem_t *it = deadbeef->pl_get_for_idx_and_iter (cursor, PL_SEARCH);
+ if (it) {
+ ddb_event_track_t *event = (ddb_event_track_t *)deadbeef->event_alloc(DB_EV_CURSOR_MOVED);
+ event->track = it;
+ deadbeef->event_send ((ddb_event_t *)event, PL_SEARCH, 0);
+ }
+}
+
+static DdbListviewIter search_head (void) {
+ return (DdbListviewIter)deadbeef->pl_get_first (PL_SEARCH);
+}
+
+static DdbListviewIter search_tail (void) {
+ return (DdbListviewIter)deadbeef->pl_get_last(PL_SEARCH);
+}
+
+static DdbListviewIter search_next (DdbListviewIter it) {
+ return (DdbListviewIter)deadbeef->pl_get_next(it, PL_SEARCH);
+}
+
+static DdbListviewIter search_prev (DdbListviewIter it) {
+ return (DdbListviewIter)deadbeef->pl_get_prev(it, PL_SEARCH);
+}
+
+static DdbListviewIter search_get_for_idx (int idx) {
+ return deadbeef->pl_get_for_idx_and_iter (idx, PL_SEARCH);
+}
+
+static int search_get_idx (DdbListviewIter it) {
+ return deadbeef->pl_get_idx_of_iter(it, PL_SEARCH);
+}
+
+static void
+search_col_sort (DdbListviewColumnSortOrder sort_order, void *user_data) {
+ if (sort_order != DdbListviewColumnSortOrderNone) {
+ pl_common_col_sort (sort_order, PL_SEARCH, user_data);
+ }
+ else {
+ search_submit_refresh ();
+ }
+}
+
+static void
+search_groups_changed (const char *format) {
+ deadbeef->conf_set_str ("gtkui.search.group_by_tf", format);
+}
+
+static void
+search_columns_changed_before_loaded (DdbListview *listview) {
+}
+
+static void
+search_columns_changed (DdbListview *listview) {
+ pl_common_rewrite_column_config (listview, "gtkui.columns.search");
+}
+
+static void
+search_handle_doubleclick (DdbListview *listview, DdbListviewIter iter, int idx) {
+ deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, deadbeef->pl_get_idx_of ((DB_playItem_t *)iter), 0);
+}
+
+static void
+search_selection_changed (DdbListview *ps, DdbListviewIter it, int idx) {
+ pl_common_selection_changed (ps, PL_SEARCH, it);
+}
+
+static void
+search_draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, int idx, int align, void *user_data, GdkColor *fg_clr, int x, int y, int width, int height, int even)
+{
+ pl_common_draw_column_data (listview, cr, it, idx, PL_SEARCH, align, user_data, fg_clr, x, y, width, height, even);
+}
+
+static void
+search_draw_group_title (DdbListview *listview, cairo_t *drawable, DdbListviewIter it, int x, int y, int width, int height, int group_depth)
+{
+ pl_common_draw_group_title (listview, drawable, it, PL_SEARCH, x, y, width, height, group_depth);
+}
+
+static void
+search_list_context_menu (ddb_playlist_t *playlist, int iter) {
+ list_context_menu (playlist, PL_SEARCH);
+}
+
+static gboolean
+search_list_handle_keypress (DdbListview *ps, int keyval, int state, int iter) {
+ return list_handle_keypress (ps, keyval, state, PL_SEARCH);
+}
+
+void
+search_init_listview_api(DdbListview *listview) {
+ listview->datasource->count = search_get_count;
+ listview->datasource->sel_count = search_get_sel_count;
+ listview->datasource->cursor = search_get_cursor;
+ listview->datasource->set_cursor = search_set_cursor;
+ listview->datasource->head = search_head;
+ listview->datasource->tail = search_tail;
+ listview->datasource->next = search_next;
+ listview->datasource->prev = search_prev;
+ listview->datasource->get_for_idx = search_get_for_idx;
+ listview->datasource->get_idx = search_get_idx;
+ listview->datasource->is_album_art_column = pl_common_is_album_art_column;
+ listview->datasource->modification_idx = gtkui_get_curr_playlist_mod;
+ listview->datasource->get_group_text = pl_common_get_group_text;
+ listview->datasource->ref = (void (*) (DdbListviewIter))deadbeef->pl_item_ref;
+ listview->datasource->unref = (void (*) (DdbListviewIter))deadbeef->pl_item_unref;
+ listview->datasource->is_selected = (int (*) (DdbListviewIter))deadbeef->pl_is_selected;
+ listview->datasource->select = (void (*) (DdbListviewIter, int))deadbeef->pl_set_selected;
+
+ listview->renderer->draw_column_data = search_draw_column_data;
+ listview->renderer->draw_album_art = pl_common_draw_album_art;
+ listview->renderer->draw_group_title = search_draw_group_title;
+
+ listview->delegate->groups_changed = search_groups_changed;
+ listview->delegate->drag_n_drop = NULL;
+ listview->delegate->external_drag_n_drop = NULL;
+ listview->delegate->col_sort = search_col_sort;
+ listview->delegate->columns_changed = search_columns_changed_before_loaded;
+ listview->delegate->col_free_user_data = pl_common_free_col_info;
+ listview->delegate->handle_doubleclick = search_handle_doubleclick;
+ listview->delegate->list_handle_keypress = search_list_handle_keypress;
+ listview->delegate->selection_changed = search_selection_changed;
+ listview->delegate->header_context_menu = pl_common_header_context_menu;
+ listview->delegate->list_context_menu = search_list_context_menu;
+ listview->delegate->columns_changed = search_columns_changed;
+
+ // create default set of columns
+ if (pl_common_load_column_config (listview, "gtkui.columns.search") < 0) {
+ pl_common_add_column_helper (listview, _("Artist / Album"), 150, DB_COLUMN_STANDARD, COLUMN_FORMAT_ARTISTALBUM, NULL, 0);
+ pl_common_add_column_helper (listview, _("Track No"), 50, DB_COLUMN_STANDARD, COLUMN_FORMAT_TRACKNUMBER, NULL, 1);
+ pl_common_add_column_helper (listview, _("Title"), 150, DB_COLUMN_STANDARD, COLUMN_FORMAT_TITLE, NULL, 0);
+ pl_common_add_column_helper (listview, _("Duration"), 50, DB_COLUMN_STANDARD, COLUMN_FORMAT_LENGTH, NULL, 0);
+ }
+
+ ddb_listview_set_artwork_subgroup_level(listview, deadbeef->conf_get_int ("gtkui.search.group_artwork_level", 0));
+ ddb_listview_set_subgroup_title_padding(listview, deadbeef->conf_get_int ("gtkui.search.subgroup_title_padding", 10));
+
+ deadbeef->conf_lock();
+ char *format = strdup(deadbeef->conf_get_str_fast ("gtkui.search.group_by_tf", ""));
+ deadbeef->conf_unlock();
+ pl_common_set_group_format (listview, format);
+ free (format);
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/playlist/searchplaylist.h Added

@@ -0,0 +1,32 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef searchplaylist_h
+#define searchplaylist_h
+
+#include "ddblistview.h"
+
+void
+search_init_listview_api(DdbListview *listview);
+
+#endif /* searchplaylist_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/plmenu.c Added

@@ -0,0 +1,683 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <gtk/gtk.h>
+#include <stdlib.h>
+#include "../../shared/deletefromdisk.h"
+#include <deadbeef/strdupa.h>
+#include "actions.h"
+#include "actionhandlers.h"
+#include "clipboard.h"
+#include "gtkui_deletefromdisk.h"
+#include "interface.h"
+#include "playlist/plcommon.h"
+#include "plmenu.h"
+#include "support.h"
+
+// disable custom title function, until we have new title formatting (0.7)
+#define DISABLE_CUSTOM_TITLE
+
+extern DB_functions_t *deadbeef;
+
+static ddbUtilTrackList_t _menuPlaylist;
+static ddbUtilTrackList_t _menuTrackList;
+static ddb_action_context_t _menuActionContext;
+static int _menuPlaylistIsDynamic; // Hide items like Remove, Cut, Paste
+static trkproperties_delegate_t _trkproperties_delegate;
+
+static void
+_run_menu (int show_paste);
+
+static void
+_set_playlist (ddb_playlist_t *playlist) {
+ if (_menuPlaylist != NULL) {
+ deadbeef->plt_unref (_menuPlaylist);
+ }
+ _menuPlaylist = playlist;
+ if (_menuPlaylist != NULL) {
+ deadbeef->plt_ref (_menuPlaylist);
+ }
+
+ deadbeef->action_set_playlist(playlist);
+}
+
+void
+plmenu_free (void) {
+ if (_menuTrackList != NULL) {
+ ddbUtilTrackListFree(_menuTrackList);
+ _menuTrackList = NULL;
+ }
+ _set_playlist(NULL);
+}
+
+static void
+_capture_selected_track_list (void) {
+ if (_menuTrackList != NULL) {
+ ddbUtilTrackListFree(_menuTrackList);
+ _menuTrackList = NULL;
+ }
+
+ ddb_playItem_t **tracks = NULL;
+
+ ddb_playItem_t *current = deadbeef->streamer_get_playing_track_safe ();
+
+ deadbeef->pl_lock ();
+
+ int count = 0;
+
+ if (_menuActionContext == DDB_ACTION_CTX_SELECTION) {
+ count = deadbeef->plt_getselcount(_menuPlaylist);
+ }
+ else if (_menuActionContext == DDB_ACTION_CTX_PLAYLIST) {
+ count = deadbeef->plt_get_item_count (_menuPlaylist, PL_MAIN);
+ }
+
+ if (count == 0) {
+ deadbeef->pl_unlock ();
+ if (current != NULL) {
+ deadbeef->pl_item_unref (current);
+ }
+ return;
+ }
+
+ int current_idx = -1;
+ int all_idx = 0;
+ int idx = 0;
+ if (count) {
+ tracks = calloc (count, sizeof (ddb_playItem_t *));
+
+ ddb_playItem_t *it = deadbeef->plt_get_first (_menuPlaylist, PL_MAIN);
+ while (it) {
+ ddb_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ if (current != NULL && it == current) {
+ current_idx = all_idx;
+ }
+ if (_menuActionContext != DDB_ACTION_CTX_SELECTION || deadbeef->pl_is_selected (it)) {
+ tracksidx++ = it;
+ }
+ else {
+ deadbeef->pl_item_unref (it);
+ }
+ it = next;
+ all_idx++;
+ }
+ }
+
+
+ deadbeef->pl_unlock ();
+
+ _menuTrackList = ddbUtilTrackListInitWithWithTracks(ddbUtilTrackListAlloc(), _menuPlaylist, _menuActionContext, tracks, count, current, current_idx);
+
+ if (current) {
+ deadbeef->pl_item_unref (current);
+ current = NULL;
+ }
+
+ for (int i = 0; i < idx; i++) {
+ deadbeef->pl_item_unref (tracksi);
+ }
+
+ free (tracks);
+}
+
+void
+trk_context_menu_update_with_playlist (ddb_playlist_t *playlist, ddb_action_context_t action_context) {
+ _set_playlist(playlist);
+ _menuPlaylistIsDynamic = 0;
+ _menuActionContext = action_context;
+ _capture_selected_track_list();
+}
+
+static void
+play_later_activate (GtkMenuItem *menuitem, gpointer user_data) {
+ int count = ddbUtilTrackListGetTrackCount(_menuTrackList);
+ ddb_playItem_t **tracks = ddbUtilTrackListGetTracks(_menuTrackList);
+
+ for (int i = 0; i < count; i++) {
+ deadbeef->playqueue_push (tracksi);
+ }
+}
+
+static void
+play_next_activate (GtkMenuItem *menuitem, gpointer user_data) {
+ int count = ddbUtilTrackListGetTrackCount(_menuTrackList);
+ ddb_playItem_t **tracks = ddbUtilTrackListGetTracks(_menuTrackList);
+
+ for (int i = 0; i < count; i++) {
+ deadbeef->playqueue_insert_at (i, tracksi);
+ }
+}
+
+static void
+remove_from_playback_queue_activate (GtkMenuItem *menuitem, gpointer user_data) {
+ int count = ddbUtilTrackListGetTrackCount(_menuTrackList);
+ ddb_playItem_t **tracks = ddbUtilTrackListGetTracks(_menuTrackList);
+
+ for (int i = 0; i < count; i++) {
+ deadbeef->playqueue_remove (tracksi);
+ }
+}
+
+void
+on_cut_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ clipboard_cut_selection (_menuPlaylist, _menuActionContext);
+}
+
+void
+on_copy_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ clipboard_copy_selection (_menuPlaylist, _menuActionContext);
+}
+
+void
+on_paste_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ clipboard_paste_selection (_menuPlaylist, _menuActionContext);
+}
+
+static void
+reload_metadata_activate (GtkMenuItem *menuitem, gpointer user_data) {
+ int count = ddbUtilTrackListGetTrackCount(_menuTrackList);
+ ddb_playItem_t **tracks = ddbUtilTrackListGetTracks(_menuTrackList);
+
+ for (int i = 0; i < count; i++) {
+ ddb_playItem_t *it = tracksi;
+ deadbeef->pl_lock ();
+ char decoder_id100;
+ const char *dec = deadbeef->pl_find_meta (it, ":DECODER");
+ if (dec) {
+ strncpy (decoder_id, dec, sizeof (decoder_id));
+ }
+ int match = deadbeef->pl_is_selected (it) && deadbeef->is_local_file (deadbeef->pl_find_meta (it, ":URI")) && dec;
+ deadbeef->pl_unlock ();
+
+ if (match) {
+ uint32_t f = deadbeef->pl_get_item_flags (it);
+ if (!(f & DDB_IS_SUBTRACK)) {
+ f &= ~DDB_TAG_MASK;
+ deadbeef->pl_set_item_flags (it, f);
+ DB_decoder_t **decoders = deadbeef->plug_get_decoder_list ();
+ for (int i = 0; decodersi; i++) {
+ if (!strcmp (decodersi->plugin.id, decoder_id)) {
+ if (decodersi->read_metadata) {
+ decodersi->read_metadata (it);
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if (_trkproperties_delegate.trkproperties_did_reload_metadata != NULL) {
+ _trkproperties_delegate.trkproperties_did_reload_metadata (_trkproperties_delegate.user_data);
+ }
+}
+
+static void
+_trkproperties_did_update_tracks (void *user_data) {
+ deadbeef->pl_save_current();
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+}
+
+static void
+_trkproperties_did_reload_metadata (void *user_data) {
+ deadbeef->pl_save_current ();
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+}
+
+static void
+_trkproperties_did_delete_files (void *user_data, int cancelled) {
+ if (!cancelled) {
+ deadbeef->pl_save_all ();
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+ }
+}
+
+static void
+properties_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ int count = ddbUtilTrackListGetTrackCount(_menuTrackList);
+ ddb_playItem_t **tracks = ddbUtilTrackListGetTracks(_menuTrackList);
+ show_track_properties_dlg_with_track_list (tracks, count);
+ trkproperties_set_delegate(&_trkproperties_delegate);
+}
+
+void
+on_clear1_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ deadbeef->pl_clear ();
+ deadbeef->pl_save_current ();
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+}
+
+void
+on_remove1_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ action_remove_from_playlist_handler (NULL, _menuActionContext);
+}
+
+
+void
+on_crop1_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ action_crop_selected_handler (NULL, 0);
+}
+
+static void
+on_remove2_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ int count = ddbUtilTrackListGetTrackCount(_menuTrackList);
+ ddb_playItem_t **tracks = ddbUtilTrackListGetTracks(_menuTrackList);
+ ddb_playlist_t *plt = ddbUtilTrackListGetPlaylist(_menuTrackList);
+
+ for (int i = 0; i < count; i++) {
+ deadbeef->plt_remove_item (plt, tracksi);
+ }
+ deadbeef->pl_save_current();
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+}
+
+#ifndef DISABLE_CUSTOM_TITLE
+static void
+on_toggle_set_custom_title (GtkToggleButton *togglebutton, gpointer user_data) {
+ gboolean active = gtk_toggle_button_get_active (togglebutton);
+ deadbeef->conf_set_int ("gtkui.location_set_custom_title", active);
+
+ GtkWidget *ct = lookup_widget (GTK_WIDGET (user_data), "custom_title");
+ gtk_widget_set_sensitive (ct, active);
+
+ deadbeef->conf_save ();
+}
+
+static void
+on_set_custom_title_activate (GtkMenuItem *menuitem, gpointer user_data)
+{
+ DdbListview *lv = user_data;
+ int idx = lv->binding->cursor ();
+ if (idx < 0) {
+ return;
+ }
+ DdbListviewIter it = lv->binding->get_for_idx (idx);
+ if (!it) {
+ return;
+ }
+
+ GtkWidget *dlg = create_setcustomtitledlg ();
+ GtkWidget *sct = lookup_widget (dlg, "set_custom_title");
+ GtkWidget *ct = lookup_widget (dlg, "custom_title");
+ if (deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sct), TRUE);
+ gtk_widget_set_sensitive (ct, TRUE);
+ }
+ else {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sct), FALSE);
+ gtk_widget_set_sensitive (ct, FALSE);
+ }
+ deadbeef->pl_lock ();
+ const char *custom_title = deadbeef->pl_find_meta ((DB_playItem_t *)it, ":CUSTOM_TITLE");
+ if (custom_title) {
+ custom_title = strdupa (custom_title);
+ }
+ else {
+ custom_title = "";
+ }
+ deadbeef->pl_unlock ();
+
+ g_signal_connect ((gpointer) sct, "toggled",
+ G_CALLBACK (on_toggle_set_custom_title),
+ dlg);
+ gtk_entry_set_text (GTK_ENTRY (ct), custom_title);
+
+ gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+ gint response = gtk_dialog_run (GTK_DIALOG (dlg));
+ if (response == GTK_RESPONSE_OK) {
+ if (it && deadbeef->conf_get_int ("gtkui.location_set_custom_title", 0)) {
+ deadbeef->pl_replace_meta ((DB_playItem_t *)it, ":CUSTOM_TITLE", gtk_entry_get_text (GTK_ENTRY (ct)));
+ }
+ else {
+ deadbeef->pl_delete_meta ((DB_playItem_t *)it, ":CUSTOM_TITLE");
+ }
+ }
+ gtk_widget_destroy (dlg);
+ lv->binding->unref (it);
+}
+#endif
+
+static ddbDeleteFromDiskController_t _deleteCtl;
+
+static void
+_deleteCompleted (ddbDeleteFromDiskController_t ctl, int cancelled) {
+ ddbDeleteFromDiskControllerFree(ctl);
+ _deleteCtl = NULL;
+
+ if (_trkproperties_delegate.trkproperties_did_delete_files != NULL) {
+ _trkproperties_delegate.trkproperties_did_delete_files(_trkproperties_delegate.user_data, cancelled);
+ }
+}
+
+static void
+delete_from_disk_with_track_list (ddbUtilTrackList_t trackList) {
+ if (_deleteCtl) {
+ return;
+ }
+
+ ddbDeleteFromDiskControllerDelegate_t delegate = {
+ .warningMessageForCtx = gtkui_warning_message_for_ctx,
+ .deleteFile = gtkui_delete_file,
+ .completed = _deleteCompleted,
+ };
+
+ _deleteCtl = ddbDeleteFromDiskControllerInitWithTrackList(ddbDeleteFromDiskControllerAlloc(), trackList);
+
+ ddbDeleteFromDiskControllerSetShouldSkipDeletedTracks(_deleteCtl, deadbeef->conf_get_int ("gtkui.skip_deleted_songs", 0));
+
+ ddbDeleteFromDiskControllerRunWithDelegate(_deleteCtl, delegate);
+}
+
+static void
+on_remove_from_disk_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ delete_from_disk_with_track_list(_menuTrackList);
+}
+
+static void
+actionitem_activate (GtkMenuItem *menuitem,
+ DB_plugin_action_t *action)
+{
+ if (action->callback2) {
+ action->callback2 (action, _menuActionContext);
+ }
+}
+
+void
+list_context_menu_with_dynamic_track_list (ddb_playlist_t *playlist, trkproperties_delegate_t *delegate) {
+ _set_playlist(playlist);
+ _menuPlaylistIsDynamic = 1;
+ _menuActionContext = DDB_ACTION_CTX_PLAYLIST;
+
+ _capture_selected_track_list();
+
+ _trkproperties_delegate.trkproperties_did_update_tracks = delegate->trkproperties_did_update_tracks;
+ _trkproperties_delegate.trkproperties_did_reload_metadata = delegate->trkproperties_did_reload_metadata;
+ _trkproperties_delegate.trkproperties_did_delete_files = delegate->trkproperties_did_delete_files;
+ _trkproperties_delegate.user_data = delegate->user_data;
+
+ _run_menu (0);
+}
+
+void
+list_context_menu (ddb_playlist_t *playlist, int iter) {
+ _menuActionContext = DDB_ACTION_CTX_SELECTION;
+ _set_playlist (playlist);
+ _menuPlaylistIsDynamic = 0;
+ _capture_selected_track_list();
+
+ _trkproperties_delegate.trkproperties_did_update_tracks = _trkproperties_did_update_tracks;
+ _trkproperties_delegate.trkproperties_did_reload_metadata = _trkproperties_did_reload_metadata;
+ _trkproperties_delegate.trkproperties_did_delete_files = _trkproperties_did_delete_files;
+ _trkproperties_delegate.user_data = NULL;
+ _run_menu (iter != PL_SEARCH);
+}
+
+void
+trk_context_menu_build (GtkWidget *menu) {
+ int selected_count = 0;
+ ddb_playItem_t *selected_track = NULL;
+
+ if (_menuTrackList != NULL) {
+ selected_count = ddbUtilTrackListGetTrackCount (_menuTrackList);
+ if (selected_count != 0) {
+ ddb_playItem_t **tracks = ddbUtilTrackListGetTracks(_menuTrackList);
+ selected_track = tracks0;
+ }
+
+ }
+
+ // remove all items
+ GList *children = gtk_container_get_children(GTK_CONTAINER(menu));
+ for (GList *item = children; item; item = item->next) {
+ gtk_container_remove(GTK_CONTAINER(menu), GTK_WIDGET(item));
+ }
+ g_list_free(children);
+
+ // add all items
+ GtkWidget *play_later;
+ GtkWidget *play_next;
+ GtkWidget *remove_from_playback_queue1;
+ GtkWidget *separator;
+ GtkWidget *remove_from_disk = NULL;
+ GtkWidget *separator9;
+ GtkWidget *properties1;
+ GtkWidget *reload_metadata;
+
+ GtkAccelGroup *accel_group = NULL;
+ accel_group = gtk_accel_group_new ();
+
+#ifndef DISABLE_CUSTOM_TITLE
+ GtkWidget *set_custom_title;
+#endif
+
+ play_next = gtk_menu_item_new_with_mnemonic (_("Play Next"));
+ gtk_widget_show (play_next);
+ gtk_container_add (GTK_CONTAINER (menu), play_next);
+ gtk_widget_set_sensitive(play_next, selected_count != 0);
+
+ play_later = gtk_menu_item_new_with_mnemonic (_("Play Later"));
+ gtk_widget_show (play_later);
+ gtk_container_add (GTK_CONTAINER (menu), play_later);
+ gtk_widget_set_sensitive(play_later, selected_count != 0);
+
+ remove_from_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Remove from Playback Queue"));
+ if (selected_count > 0 && _menuPlaylist != NULL) {
+ int pqlen = deadbeef->playqueue_get_count ();
+ int no_playqueue_items = 1;
+ // NOTE: this can be an extremely slow operation
+ for (int i = 0; i < pqlen && no_playqueue_items; i++) {
+ DB_playItem_t *pqitem = deadbeef->playqueue_get_item (i);
+ if (deadbeef->pl_get_playlist (pqitem) == _menuPlaylist
+ && (_menuActionContext != DDB_ACTION_CTX_SELECTION || deadbeef->pl_is_selected (pqitem))) {
+ no_playqueue_items = 0;
+ }
+ deadbeef->pl_item_unref (pqitem);
+ }
+ if (no_playqueue_items) {
+ gtk_widget_set_sensitive (remove_from_playback_queue1, FALSE);
+ }
+ }
+
+ gtk_widget_show (remove_from_playback_queue1);
+ gtk_container_add (GTK_CONTAINER (menu), remove_from_playback_queue1);
+
+ reload_metadata = gtk_menu_item_new_with_mnemonic (_("Reload Metadata"));
+ gtk_widget_show (reload_metadata);
+ gtk_container_add (GTK_CONTAINER (menu), reload_metadata);
+ gtk_widget_set_sensitive(reload_metadata, selected_count != 0);
+
+ separator = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator);
+ gtk_container_add (GTK_CONTAINER (menu), separator);
+ gtk_widget_set_sensitive (separator, FALSE);
+
+ if (!_menuPlaylistIsDynamic) {
+ GtkWidget *cut;
+ GtkWidget *cut_image;
+
+ cut = gtk_image_menu_item_new_with_mnemonic (_("Cu_t"));
+ gtk_widget_show (cut);
+ gtk_container_add (GTK_CONTAINER (menu), cut);
+ gtk_widget_set_sensitive(cut, selected_count != 0);
+ gtk_widget_add_accelerator (cut, "activate", accel_group, GDK_x, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+ cut_image = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (cut_image);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut), cut_image);
+ g_signal_connect ((gpointer) cut, "activate",
+ G_CALLBACK (on_cut_activate),
+ NULL);
+ }
+
+ GtkWidget *copy;
+ GtkWidget *copy_image;
+ copy = gtk_image_menu_item_new_with_mnemonic (_("_Copy"));
+ gtk_widget_show (copy);
+ gtk_container_add (GTK_CONTAINER (menu), copy);
+ gtk_widget_set_sensitive(copy, selected_count != 0);
+ gtk_widget_add_accelerator (copy, "activate", accel_group, GDK_c, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+ copy_image = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (copy_image);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy), copy_image);
+
+ g_signal_connect ((gpointer) copy, "activate",
+ G_CALLBACK (on_copy_activate),
+ NULL);
+
+ if (!_menuPlaylistIsDynamic) {
+ GtkWidget *paste;
+ GtkWidget *paste_image;
+ paste = gtk_image_menu_item_new_with_mnemonic (_("_Paste"));
+ int show_paste = 1; // FIXME
+ if (show_paste) {
+ gtk_widget_show (paste);
+ }
+ else {
+ gtk_widget_hide (paste);
+ }
+ gtk_container_add (GTK_CONTAINER (menu), paste);
+ gtk_widget_set_sensitive(paste, clipboard_is_clipboard_data_available());
+ gtk_widget_add_accelerator (paste, "activate", accel_group, GDK_v, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+ paste_image = gtk_image_new_from_stock ("gtk-paste", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (paste_image);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (paste), paste_image);
+
+ g_signal_connect ((gpointer) paste, "activate",
+ G_CALLBACK (on_paste_activate),
+ NULL);
+ }
+
+ separator9 = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator9);
+ gtk_container_add (GTK_CONTAINER (menu), separator9);
+ gtk_widget_set_sensitive (separator9, FALSE);
+
+ if (!_menuPlaylistIsDynamic) {
+ GtkWidget *remove2;
+ remove2 = gtk_menu_item_new_with_mnemonic (_("Remove"));
+ gtk_widget_show (remove2);
+ gtk_container_add (GTK_CONTAINER (menu), remove2);
+ gtk_widget_set_sensitive(remove2, selected_count != 0 && _menuPlaylist != NULL);
+
+ g_signal_connect ((gpointer) remove2, "activate",
+ G_CALLBACK (on_remove2_activate),
+ NULL);
+ }
+
+ int hide_remove_from_disk = deadbeef->conf_get_int ("gtkui.hide_remove_from_disk", 0);
+
+ if (!hide_remove_from_disk) {
+ remove_from_disk = gtk_menu_item_new_with_mnemonic (_("Delete from Disk"));
+ gtk_widget_show (remove_from_disk);
+ gtk_container_add (GTK_CONTAINER (menu), remove_from_disk);
+ gtk_widget_set_sensitive(remove_from_disk, selected_count != 0);
+ }
+
+ separator = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator);
+ gtk_container_add (GTK_CONTAINER (menu), separator);
+ gtk_widget_set_sensitive (separator, FALSE);
+
+ int added_entries = menu_add_action_items(menu, selected_count, selected_track, _menuActionContext, actionitem_activate);
+ if (added_entries > 0 && !deadbeef->conf_get_int ("gtkui.action_separators", 0))
+ {
+ GtkWidget *separator = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator);
+ gtk_container_add (GTK_CONTAINER (menu), separator);
+ gtk_widget_set_sensitive (separator, FALSE);
+ }
+
+#ifndef DISABLE_CUSTOM_TITLE
+ set_custom_title = gtk_menu_item_new_with_mnemonic (_("Set Custom Title"));
+ gtk_widget_show (set_custom_title);
+ gtk_container_add (GTK_CONTAINER (playlist_menu), set_custom_title);
+ if (selected_count != 1) {
+ gtk_widget_set_sensitive (GTK_WIDGET (set_custom_title), FALSE);
+ }
+
+ separator = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator);
+ gtk_container_add (GTK_CONTAINER (playlist_menu), separator);
+ gtk_widget_set_sensitive (separator, FALSE);
+#endif
+
+ properties1 = gtk_menu_item_new_with_mnemonic (_("Track Properties"));
+ gtk_widget_show (properties1);
+ gtk_container_add (GTK_CONTAINER (menu), properties1);
+ gtk_widget_set_sensitive (properties1, selected_count != 0);
+
+ g_signal_connect ((gpointer) play_later, "activate",
+ G_CALLBACK (play_later_activate),
+ NULL);
+ g_signal_connect ((gpointer) play_next, "activate",
+ G_CALLBACK (play_next_activate),
+ NULL);
+ g_signal_connect ((gpointer) remove_from_playback_queue1, "activate",
+ G_CALLBACK (remove_from_playback_queue_activate),
+ NULL);
+ g_signal_connect ((gpointer) reload_metadata, "activate",
+ G_CALLBACK (reload_metadata_activate),
+ NULL);
+ if (!hide_remove_from_disk && remove_from_disk != NULL) {
+ g_signal_connect ((gpointer) remove_from_disk, "activate",
+ G_CALLBACK (on_remove_from_disk_activate),
+ NULL);
+ }
+#ifndef DISABLE_CUSTOM_TITLE
+ g_signal_connect ((gpointer) set_custom_title, "activate",
+ G_CALLBACK (on_set_custom_title_activate),
+ NULL);
+#endif
+ g_signal_connect ((gpointer) properties1, "activate",
+ G_CALLBACK (properties_activate),
+ NULL);
+}
+
+
+static void
+_run_menu (int show_paste) {
+ GtkWidget *menu = gtk_menu_new();
+
+ trk_context_menu_build (menu);
+ gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/plmenu.h Added

@@ -0,0 +1,50 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef plmenu_h
+#define plmenu_h
+
+#include <deadbeef/deadbeef.h>
+#include "trkproperties.h"
+
+/// This must be called before terminating the app, to ensure global variables are freed.
+void
+plmenu_free (void);
+
+// Run context menu for selected items of the specified playlist and iter.
+void
+list_context_menu (ddb_playlist_t *playlist, int iter);
+
+/// For use cases when track list is dynamic, such as medialib
+void
+list_context_menu_with_dynamic_track_list (ddb_playlist_t *playlist, trkproperties_delegate_t *delegate);
+
+/// For use case when the caller needs more control of the menu, such as Playlist Tab context menu
+void
+trk_context_menu_build (GtkWidget *menu);
+
+/// Call this before the @c trk_context_menu_build to initialize the internal track list
+void
+trk_context_menu_update_with_playlist (ddb_playlist_t *playlist, ddb_action_context_t action_context);
+
+#endif /* plmenu_h */

deadbeef-0.6.2.tar.bz2/plugins/gtkui/pltmenu.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/pltmenu.c Changed

@@ -1,6 +1,6 @@
 /*
 DeaDBeeF -- the music player
- Copyright (C) 2009-2013 Alexey Yakovenko and other contributors
+ Copyright (C) 2009-2013 Oleksiy Yakovenko and other contributors
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -20,7 +20,7 @@
 
 3. This notice may not be removed or altered from any source distribution.
 */
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include <gtk/gtk.h>
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
@@ -29,66 +29,55 @@
 #include <string.h>
 #include <stdlib.h>
 #include "gtkui.h"
+#include "clipboard.h"
 #include "interface.h"
 #include "support.h"
+#include "plmenu.h"
 
 #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
 g_object_set_data (G_OBJECT (component), name, widget)
 
 // selected playlist for the context menu
-static int pltmenu_idx;
+static ddb_playlist_t *current_playlist;
 
-void
-plt_get_title_wrapper (int plt, char *buffer, int len) {
- if (plt == -1) {
- strcpy (buffer, "");
- return;
+static void
+_set_playlist (ddb_playlist_t *playlist) {
+ if (current_playlist != NULL) {
+ deadbeef->plt_unref (current_playlist);
+ current_playlist = NULL;
 }
- ddb_playlist_t *p = deadbeef->plt_get_for_idx (plt);
- deadbeef->plt_get_title (p, buffer, len);
- deadbeef->plt_unref (p);
- char *end;
- if (!g_utf8_validate (buffer, -1, (const gchar **)&end)) {
- *end = 0;
+
+ current_playlist = playlist;
+ if (current_playlist != NULL) {
+ deadbeef->plt_ref (current_playlist);
 }
 }
 
+void
+gtkui_free_pltmenu (void) {
+ _set_playlist(NULL);
+}
+
 static void
 on_rename_playlist1_activate (GtkMenuItem *menuitem,
 gpointer user_data)
 {
- GtkWidget *dlg = create_entrydialog ();
- gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
- gtk_window_set_title (GTK_WINDOW (dlg), _("Edit playlist"));
- GtkWidget *e;
- e = lookup_widget (dlg, "title_label");
- gtk_label_set_text (GTK_LABEL(e), _("Title:"));
- e = lookup_widget (dlg, "title");
- char t1000;
- plt_get_title_wrapper (pltmenu_idx, t, sizeof (t));
- gtk_entry_set_text (GTK_ENTRY (e), t);
- int res = gtk_dialog_run (GTK_DIALOG (dlg));
- if (res == GTK_RESPONSE_OK) {
- const char *text = gtk_entry_get_text (GTK_ENTRY (e));
- deadbeef->pl_lock ();
- ddb_playlist_t *p = deadbeef->plt_get_for_idx (pltmenu_idx);
- deadbeef->plt_set_title (p, text);
- deadbeef->plt_unref (p);
- deadbeef->pl_unlock ();
+ if (current_playlist != NULL) {
+ gtkui_rename_playlist(current_playlist);
 }
- gtk_widget_destroy (dlg);
 }
 
 static void
 on_remove_playlist1_activate (GtkMenuItem *menuitem,
 gpointer user_data)
 {
- if (pltmenu_idx != -1) {
- deadbeef->plt_remove (pltmenu_idx);
- search_refresh ();
- int playlist = deadbeef->plt_get_curr_idx ();
- deadbeef->conf_set_int ("playlist.current", playlist);
+ if (current_playlist == NULL) {
+ return;
+ }
+ if (gtkui_remove_playlist(current_playlist) == -1) {
+ return;
 }
+ _set_playlist(NULL);
 }
 
 static void
@@ -97,201 +86,105 @@
 {
 int playlist = gtkui_add_new_playlist ();
 if (playlist != -1) {
- gtkui_playlist_set_curr (playlist);
+ deadbeef->plt_set_curr_idx (playlist);
 }
 }
 
 static void
-on_actionitem_activate (GtkMenuItem *menuitem,
- DB_plugin_action_t *action)
-{
- if (action->callback) {
- ddb_playlist_t *plt = NULL;
- if (pltmenu_idx != -1) {
- plt = deadbeef->plt_get_for_idx (pltmenu_idx);
- }
- action->callback (action, plt);
- if (plt) {
- deadbeef->plt_unref (plt);
- }
- }
- else {
- action->callback2 (action, DDB_ACTION_CTX_PLAYLIST);
- }
-}
-
-static GtkWidget*
-find_popup (GtkWidget *widget,
- const gchar *widget_name)
+on_autosort_toggled (GtkMenuItem *menuitem,
+ gpointer user_data)
 {
- GtkWidget *parent, *found_widget;
-
- for (;;)
- {
- if (GTK_IS_MENU (widget))
- parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
- else
- parent = gtk_widget_get_parent (widget);
- if (!parent)
- parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
- if (parent == NULL)
- break;
- widget = parent;
+ if (current_playlist == NULL) {
+ return;
 }
-
- found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
- widget_name);
- return found_widget;
+ int enabled = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(menuitem));
+ deadbeef->plt_set_meta_int (current_playlist, "autosort_enabled", enabled);
 }
 
-static void
-add_tab_actions (GtkWidget *menu) {
- DB_plugin_t **plugins = deadbeef->plug_get_list();
- int i;
-
- int added_entries = 0;
-
- int hide_remove_from_disk = deadbeef->conf_get_int ("gtkui.hide_remove_from_disk", 0);
-
- for (i = 0; pluginsi; i++)
- {
- if (!pluginsi->get_actions)
- continue;
-
- DB_plugin_action_t *actions = pluginsi->get_actions (NULL);
- DB_plugin_action_t *action;
-
- int count = 0;
- for (action = actions; action; action = action->next)
- {
- char *tmp = NULL;
- if (!(action->flags & DB_ACTION_MULTIPLE_TRACKS))
- continue;
-
- if (action->name && !strcmp (action->name, "delete_from_disk") && hide_remove_from_disk) {
- continue;
- }
-
- // create submenus (separated with '/')
- const char *prev = action->title;
- while (*prev && *prev == '/') {
- prev++;
- }
- 
- GtkWidget *popup = NULL;
- 
- for (;;) {
- const char *slash = strchr (prev, '/');
- if (slash && *(slash-1) != '\\') {
- char nameslash-prev+1;
- // replace \/ with /
- const char *p = prev;
- char *t = name;
- while (*p && p < slash) {
- if (*p == '\\' && *(p+1) == '/') {
- *t++ = '/';
- p += 2;
- }
- else {
- *t++ = *p++;
- }
- }
- *t = 0;
-
- // add popup
- GtkWidget *prev_menu = popup ? popup : menu;
-
- popup = find_popup (prev_menu, name);
- if (!popup) {
- GtkWidget *item = gtk_image_menu_item_new_with_mnemonic (_(name));
- gtk_widget_show (item);
- gtk_container_add (GTK_CONTAINER (prev_menu), item);
- popup = gtk_menu_new ();
- GLADE_HOOKUP_OBJECT_NO_REF (prev_menu, popup, name);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), popup);
- }
- }
- else {
- break;
- }
- prev = slash+1;
- }
-
+GtkWidget*
+gtkui_create_pltmenu (ddb_playlist_t *playlist) {
+ GtkWidget *menu = NULL;
+ GtkWidget *rename_playlist1 = NULL;
+ GtkWidget *remove_playlist1 = NULL;
+ GtkWidget *add_new_playlist1 = NULL;
+ GtkWidget *autosort = NULL;
+ GtkWidget *separator11 = NULL;
+
+ _set_playlist(playlist);
+
+ menu = gtk_menu_new ();
+
+ if (playlist != NULL) {
+ int selected_count = 0;
+ ddb_playItem_t *track = NULL;
+ selected_count = deadbeef->plt_get_item_count (playlist, PL_MAIN);
+ if (selected_count != 0) {
+ track = deadbeef->plt_get_first (playlist, PL_MAIN);
+ }
 
- count++;
- added_entries++;
- GtkWidget *actionitem;
+ trk_context_menu_update_with_playlist(playlist, DDB_ACTION_CTX_PLAYLIST);
+ trk_context_menu_build(menu);
 
- // replace \/ with /
- const char *p = popup ? prev : action->title;
- char titlestrlen (p)+1;
- char *t = title;
- while (*p) {
- if (*p == '\\' && *(p+1) == '/') {
- *t++ = '/';
- p += 2;
- }
- else {
- *t++ = *p++;
- }
- }
- *t = 0;
+ if (track != NULL) {
+ deadbeef->pl_item_unref (track);
+ track = NULL;
+ }
 
- actionitem = gtk_menu_item_new_with_mnemonic (_(title));
- gtk_widget_show (actionitem);
- gtk_container_add (popup ? GTK_CONTAINER (popup) : GTK_CONTAINER (menu), actionitem);
+ rename_playlist1 = gtk_menu_item_new_with_mnemonic (_("Rename Playlist"));
+ if (current_playlist == NULL) {
+ gtk_widget_set_sensitive (rename_playlist1, FALSE);
+ }
+ gtk_widget_show (rename_playlist1);
+ gtk_menu_shell_insert(GTK_MENU_SHELL(menu), rename_playlist1, 0);
 
- g_signal_connect ((gpointer) actionitem, "activate",
- G_CALLBACK (on_actionitem_activate),
- action);
+ remove_playlist1 = gtk_menu_item_new_with_mnemonic (_("Remove Playlist"));
+ if (current_playlist == NULL) {
+ gtk_widget_set_sensitive (remove_playlist1, FALSE);
 }
+ gtk_widget_show (remove_playlist1);
+ gtk_menu_shell_insert(GTK_MENU_SHELL(menu), remove_playlist1, 1);
 }
-}
 
-GtkWidget*
-gtkui_create_pltmenu (int plt_idx) {
- GtkWidget *plmenu;
- GtkWidget *rename_playlist1;
- GtkWidget *remove_playlist1;
- GtkWidget *add_new_playlist1;
- GtkWidget *separator11;
- GtkWidget *load_playlist1;
- GtkWidget *save_playlist1;
- GtkWidget *save_all_playlists1;
-
- plmenu = gtk_menu_new ();
- pltmenu_idx = plt_idx;
+ add_new_playlist1 = gtk_menu_item_new_with_mnemonic (_("Add New Playlist"));
+ gtk_widget_show (add_new_playlist1);
+ gtk_menu_shell_insert(GTK_MENU_SHELL(menu), add_new_playlist1, playlist != NULL ? 2 : 0);
 
- rename_playlist1 = gtk_menu_item_new_with_mnemonic (_("Rename Playlist"));
- if (pltmenu_idx == -1) {
- gtk_widget_set_sensitive (rename_playlist1, FALSE);
- }
- gtk_widget_show (rename_playlist1);
- gtk_container_add (GTK_CONTAINER (plmenu), rename_playlist1);
+ if (playlist != NULL) {
+ int autosort_enabled = 0;
+ if (current_playlist != NULL) {
+ autosort_enabled = deadbeef->plt_find_meta_int (current_playlist, "autosort_enabled", 0);
+ }
+ autosort = gtk_check_menu_item_new_with_label (_("Enable Autosort"));
+ gtk_widget_set_tooltip_text(autosort, _("Re-apply the last sort you chose every time when adding new files to this playlist"));
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(autosort), autosort_enabled);
+ gtk_widget_show (autosort);
+ gtk_menu_shell_insert(GTK_MENU_SHELL(menu), autosort, 3);
+ if (current_playlist == NULL) {
+ gtk_widget_set_sensitive (autosort, FALSE);
+ }
 
- remove_playlist1 = gtk_menu_item_new_with_mnemonic (_("Remove Playlist"));
- if (pltmenu_idx == -1) {
- gtk_widget_set_sensitive (remove_playlist1, FALSE);
+ separator11 = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator11);
+ gtk_menu_shell_insert(GTK_MENU_SHELL(menu), separator11, 4);
+ gtk_widget_set_sensitive (separator11, FALSE);
 }
- gtk_widget_show (remove_playlist1);
- gtk_container_add (GTK_CONTAINER (plmenu), remove_playlist1);
-
- add_new_playlist1 = gtk_menu_item_new_with_mnemonic (_("Add New Playlist"));
- gtk_widget_show (add_new_playlist1);
- gtk_container_add (GTK_CONTAINER (plmenu), add_new_playlist1);
 
- g_signal_connect ((gpointer) rename_playlist1, "activate",
- G_CALLBACK (on_rename_playlist1_activate),
- NULL);
- g_signal_connect ((gpointer) remove_playlist1, "activate",
- G_CALLBACK (on_remove_playlist1_activate),
- NULL);
 g_signal_connect ((gpointer) add_new_playlist1, "activate",
- G_CALLBACK (on_add_new_playlist1_activate),
- NULL);
-
- add_tab_actions (plmenu);
+ G_CALLBACK (on_add_new_playlist1_activate),
+ NULL);
+
+ if (playlist != NULL) {
+ g_signal_connect ((gpointer) rename_playlist1, "activate",
+ G_CALLBACK (on_rename_playlist1_activate),
+ NULL);
+ g_signal_connect ((gpointer) remove_playlist1, "activate",
+ G_CALLBACK (on_remove_playlist1_activate),
+ NULL);
+ g_signal_connect ((gpointer) autosort, "toggled",
+ G_CALLBACK (on_autosort_toggled),
+ NULL);
+ }
 
- return plmenu;
+ return menu;
 }

deadbeef-0.6.2.tar.bz2/plugins/gtkui/pluginconf.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/pluginconf.c Changed

@@ -1,21 +1,26 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -26,7 +31,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include "../../gettext.h"
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include "gtkui.h"
 #include "../libparser/parser.h"
 #include "support.h"
@@ -68,12 +73,13 @@
 }
 }
 
-static void apply_conf (GtkWidget *w, ddb_dialog_t *conf) {
+// Apply the configuration. *w is the container that holds the references to the widgets looked up with g_object_get_data(w,...)
+void apply_conf (GtkWidget *w, ddb_dialog_t *conf, int reset_settings) {
 // parse script
 char tokenMAX_TOKEN;
 const char *script = conf->layout;
 parser_line = 1;
- while (script = gettoken (script, token)) {
+ while ((script = gettoken (script, token))) {
 if (strcmp (token, "property")) {
 fprintf (stderr, "invalid token while loading plugin %s config dialog: %s at line %d\n", conf->title, token, parser_line);
 break;
@@ -93,7 +99,7 @@
 if (!strncmp (type, "hbox", 5) || !strncmp (type, "vbox", 5)) {
 // skip to ;
 char semicolonMAX_TOKEN;
- while (script = gettoken_warn_eof (script, semicolon)) {
+ while ((script = gettoken_warn_eof (script, semicolon))) {
 if (!strcmp (semicolon, ";")) {
 break;
 }
@@ -119,58 +125,76 @@
 if (!script) {
 break;
 }
+
+ int islabel = !strcmp(type, "label");
+
 char defMAX_TOKEN;
- script = gettoken_warn_eof (script, def);
- if (!script) {
- break;
+ if (!islabel) {
+ script = gettoken_warn_eof (script, def);
+ if (!script) {
+ break;
+ }
 }
 
- // fetch data
- GtkWidget *widget = lookup_widget (w, key);
- if (widget) {
- if (!strcmp (type, "entry") || !strcmp (type, "password")) {
- conf->set_param (key, gtk_entry_get_text (GTK_ENTRY (widget)));
- }
- else if (!strcmp (type, "file")) {
- if (deadbeef->conf_get_int ("gtkui.pluginconf.use_filechooser_button", 0)) {
- // filechooser
- conf->set_param (key, gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)));
+ if (!islabel && reset_settings) {
+ conf->set_param (key, def);
+
+ // skip to ;
+ char semicolonMAX_TOKEN;
+ while ((script = gettoken_warn_eof (script, semicolon))) {
+ if (!strcmp (semicolon, ";")) {
+ break;
 }
- else {
+ }
+ continue;
+ } else if (!islabel) {
+ // fetch data
+ GtkWidget *widget = g_object_get_data (G_OBJECT(w), key);
+ if (widget) {
+ if (!strcmp (type, "entry") || !strcmp (type, "password")) {
 conf->set_param (key, gtk_entry_get_text (GTK_ENTRY (widget)));
 }
- }
- else if (!strcmp (type, "checkbox")) {
- conf->set_param (key, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) ? "1" : "0");
- }
- else if (!strncmp (type, "hscale", 7) || !strncmp (type, "vscale", 7)) {
- char s20;
- snprintf (s, sizeof (s), "%f", gtk_range_get_value (GTK_RANGE (widget)));
- conf->set_param (key, s);
- }
- else if (!strncmp (type, "spinbtn", 8)) {
- char s20;
- snprintf (s, sizeof (s), "%f", (float)gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget)));
- conf->set_param (key, s);
- }
- else if (!strncmp (type, "select", 7)) {
- int n;
- if (1 != sscanf (type+6, "%d", &n)) {
- break;
+ else if (!strcmp (type, "file")) {
+ if (deadbeef->conf_get_int ("gtkui.pluginconf.use_filechooser_button", 0)) {
+ // filechooser
+ conf->set_param (key, gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)));
+ }
+ else {
+ conf->set_param (key, gtk_entry_get_text (GTK_ENTRY (widget)));
+ }
+ }
+ else if (!strcmp (type, "checkbox")) {
+ conf->set_param (key, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) ? "1" : "0");
 }
- for (int i = 0; i < n; i++) {
- char valueMAX_TOKEN;
- script = gettoken_warn_eof (script, value);
+ else if (!strncmp (type, "hscale", 7) || !strncmp (type, "vscale", 7)) {
+ char s20;
+ snprintf (s, sizeof (s), "%f", gtk_range_get_value (GTK_RANGE (widget)));
+ conf->set_param (key, s);
+ }
+ else if (!strncmp (type, "spinbtn", 8)) {
+ char s20;
+ snprintf (s, sizeof (s), "%f", (float)gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget)));
+ conf->set_param (key, s);
+ }
+ else if (!strncmp (type, "select", 7)) {
+ int n;
+ if (1 != sscanf (type+6, "%d", &n)) {
+ break;
+ }
+ for (int i = 0; i < n; i++) {
+ char valueMAX_TOKEN;
+ script = gettoken_warn_eof (script, value);
+ if (!script) {
+ break;
+ }
+ }
 if (!script) {
 break;
 }
+ char s20;
+ snprintf (s, sizeof (s), "%d", gtk_combo_box_get_active (GTK_COMBO_BOX (widget)));
+ conf->set_param (key, s);
 }
- if (!script) {
- break;
- }
- char s20;
- snprintf (s, sizeof (s), "%d", gtk_combo_box_get_active (GTK_COMBO_BOX (widget)));
- conf->set_param (key, s);
 }
 }
 
@@ -179,7 +203,7 @@
 break;
 }
 if (strcmp (token, ";")) {
- fprintf (stderr, "expected `;' while loading plugin %s config dialog: %s at line %d\n", conf->title, token, parser_line);
+ fprintf (stderr, "apply_conf: expected `;' while loading plugin %s config dialog: %s at line %d\n", conf->title, token, parser_line);
 break;
 }
 }
@@ -188,7 +212,12 @@
 
 static void
 prop_changed (GtkWidget *editable, gpointer user_data) {
- gtk_dialog_set_response_sensitive (GTK_DIALOG (user_data), GTK_RESPONSE_APPLY, TRUE);
+ ddb_pluginprefs_dialog_t *conf = (ddb_pluginprefs_dialog_t*)g_object_get_data (G_OBJECT (user_data), "dialog_conf_struct");
+ if (conf->prop_changed) conf->prop_changed(conf);
+}
+
+void run_dialog_prop_changed_cb (ddb_pluginprefs_dialog_t *make_dialog_conf) {
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (make_dialog_conf->parent), GTK_RESPONSE_APPLY, TRUE);
 }
 
 int
@@ -210,63 +239,59 @@
 return -1;
 }
 
-int
-gtkui_run_dialog (GtkWidget *parentwin, ddb_dialog_t *conf, uint32_t buttons, int (*callback)(int button, void *ctx), void *ctx) {
- if (!parentwin) {
- parentwin = mainwin;
- }
- // create window
- char title200;
- snprintf (title, sizeof (title), _("Configure %s"), conf->title);
- GtkWidget *win;
- if (!buttons) {
- win = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parentwin), GTK_DIALOG_MODAL, GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
- gtk_dialog_set_default_response (GTK_DIALOG (win), GTK_RESPONSE_OK);
- }
- else {
- win = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parentwin), GTK_DIALOG_MODAL, NULL);
- if (buttons & (1<<ddb_button_ok)) {
- gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_OK, GTK_RESPONSE_OK);
- }
- if (buttons & (1<<ddb_button_cancel)) {
- gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- }
- if (buttons & (1<<ddb_button_close)) {
- gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
- }
- if (buttons & (1<<ddb_button_apply)) {
- gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_APPLY, GTK_RESPONSE_APPLY);
- }
- if (buttons & (1<<ddb_button_yes)) {
- gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_YES, GTK_RESPONSE_YES);
- }
- if (buttons & (1<<ddb_button_no)) {
- gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_NO, GTK_RESPONSE_NO);
+static int
+backout_pack_level(int ncurr, int *pack)
+{
+ if (ncurr > 0) {
+ packncurr--;
+ if (packncurr < 0) {
+ ncurr--;
+ ncurr = backout_pack_level(ncurr, pack);
 }
 }
- gtk_window_set_type_hint (GTK_WINDOW (win), GDK_WINDOW_TYPE_HINT_DIALOG);
- gtk_container_set_border_width (GTK_CONTAINER(win), 12);
+ return ncurr;
+}
 
- gtk_window_set_title (GTK_WINDOW (win), title);
- gtk_window_set_modal (GTK_WINDOW (win), TRUE);
- gtk_window_set_transient_for (GTK_WINDOW (win), GTK_WINDOW (parentwin));
+static int
+check_semicolon(const char **script, char *token, const char *plugintitle)
+{
+ *script = gettoken_warn_eof (*script, token);
+ if (!script) {
+ return -1;
+ }
+ if (strcmp (token, ";")) {
+ fprintf (stderr, "make_dialog: expected `;' while loading plugin %s config dialog: %s at line %d\n", plugintitle, token, parser_line);
+ return -1;
+ }
+ return 0;
+}
 
+void
+gtkui_make_dialog (ddb_pluginprefs_dialog_t *make_dialog_conf) {
 GtkWidget *widgets100 = {NULL};
+ ddb_dialog_t *conf = &make_dialog_conf->dialog_conf;
 int pack100 = {0};
 int ncurr = 0;
 
- widgetsncurr = gtk_dialog_get_content_area (GTK_DIALOG (win));
- gtk_box_set_spacing (GTK_BOX (widgetsncurr), 8);
- GtkWidget *action_area = gtk_dialog_get_action_area (GTK_DIALOG (win));
- gtk_widget_show (action_area);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END);
+ GtkWidget *containervbox = make_dialog_conf->containerbox;
+
+ // This needs to be set on an object that is tied to the lifetime of the plugin preferences container
+ make_dialog_conf = (ddb_pluginprefs_dialog_t *)g_memdup (make_dialog_conf, sizeof(ddb_pluginprefs_dialog_t));
+ g_object_set_data_full (G_OBJECT(containervbox), "dialog_conf_struct", make_dialog_conf, g_free);
+
 
+ // Temporarily disable the callback until dialog script has been fully parsed
+ void (*temp_prop_changed) = make_dialog_conf->prop_changed;
+ make_dialog_conf->prop_changed = NULL;
+
+ widgetsncurr = containervbox;
+ gtk_box_set_spacing (GTK_BOX (widgetsncurr), 8);
 
 // parse script
 char tokenMAX_TOKEN;
 const char *script = conf->layout;
 parser_line = 1;
- while (script = gettoken (script, token)) {
+ while ((script = gettoken (script, token))) {
 if (strcmp (token, "property")) {
 fprintf (stderr, "invalid token while loading plugin %s config dialog: %s at line %d\n", conf->title, token, parser_line);
 break;
@@ -277,12 +302,7 @@
 break;
 }
 
- if (ncurr > 0) {
- packncurr--;
- if (packncurr < 0) {
- ncurr--;
- }
- }
+ ncurr = backout_pack_level(ncurr, pack);
 
 char typeMAX_TOKEN;
 script = gettoken_warn_eof (script, type);
@@ -298,7 +318,7 @@
 }
 packncurr = n;
 
- int vert = 0;
+ int vert = !strncmp (type, "vbox", 5);
 int hmg = FALSE;
 int fill = FALSE;
 int expand = FALSE;
@@ -335,8 +355,8 @@
 }
 }
 
- widgetsncurr = vert ? gtk_vbox_new (TRUE, spacing) : gtk_hbox_new (TRUE, spacing);
- gtk_widget_set_size_request (widgetsncurr, -1, height);
+ widgetsncurr = vert ? gtk_vbox_new (hmg, spacing) : gtk_hbox_new (hmg, spacing);
+ gtk_widget_set_size_request (widgetsncurr, vert ? height : -1, vert ? -1 : height);
 gtk_widget_show (widgetsncurr);
 gtk_box_pack_start (GTK_BOX(widgetsncurr-1), widgetsncurr, fill, expand, border);
 continue;
@@ -358,6 +378,23 @@
 }
 }
 
+ if (!strcmp(type, "label")) {
+ GtkWidget *label = gtk_label_new (_(labeltext));
+ gtk_widget_show (label);
+ if (!strncmp(key, "l", 1)) {
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ } else if (!strncmp(key, "c", 1)) {
+ gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
+ } else if (!strncmp(key, "r", 1)) {
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ }
+ gtk_box_pack_start (GTK_BOX (widgetsncurr), label, FALSE, TRUE, 0);
+
+ if (check_semicolon(&script, token, conf->title) < 0) break;
+
+ continue;
+ }
+
 char defMAX_TOKEN;
 script = gettoken_warn_eof (script, def);
 if (!script) {
@@ -374,8 +411,9 @@
 label = gtk_label_new (_(labeltext));
 gtk_widget_show (label);
 prop = gtk_entry_new ();
+ gtk_entry_set_width_chars (GTK_ENTRY(prop), 5);
 gtk_entry_set_activates_default (GTK_ENTRY (prop), TRUE);
- g_signal_connect (G_OBJECT (prop), "changed", G_CALLBACK (prop_changed), win);
+ g_signal_connect (G_OBJECT (prop), "changed", G_CALLBACK (prop_changed), containervbox);
 gtk_widget_show (prop);
 gtk_entry_set_text (GTK_ENTRY (prop), value);
 
@@ -385,7 +423,7 @@
 }
 else if (!strcmp (type, "checkbox")) {
 prop = gtk_check_button_new_with_label (_(labeltext));
- g_signal_connect (G_OBJECT (prop), "toggled", G_CALLBACK (prop_changed), win);
+ g_signal_connect (G_OBJECT (prop), "toggled", G_CALLBACK (prop_changed), containervbox);
 gtk_widget_show (prop);
 int val = atoi (value);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop), val);
@@ -397,14 +435,14 @@
 prop = gtk_file_chooser_button_new (_(labeltext), GTK_FILE_CHOOSER_ACTION_OPEN);
 gtk_widget_show (prop);
 gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (prop), value);
- g_signal_connect (G_OBJECT (prop), "file-set", G_CALLBACK (prop_changed), win);
+ g_signal_connect (G_OBJECT (prop), "file-set", G_CALLBACK (prop_changed), containervbox);
 }
 else {
 cont = gtk_hbox_new (FALSE, 2);
 gtk_widget_show (cont);
 prop = gtk_entry_new ();
 gtk_entry_set_activates_default (GTK_ENTRY (prop), TRUE);
- g_signal_connect (G_OBJECT (prop), "changed", G_CALLBACK (prop_changed), win);
+ g_signal_connect (G_OBJECT (prop), "changed", G_CALLBACK (prop_changed), containervbox);
 gtk_widget_show (prop);
 gtk_editable_set_editable (GTK_EDITABLE (prop), FALSE);
 gtk_entry_set_text (GTK_ENTRY (prop), value);
@@ -442,7 +480,7 @@
 gtk_combo_box_set_active (GTK_COMBO_BOX (prop), atoi (value));
 g_signal_connect ((gpointer) prop, "changed",
 G_CALLBACK (prop_changed),
- win);
+ containervbox);
 }
 else if (!strncmp (type, "hscale", 7) || !strncmp (type, "vscale", 7) || !strncmp (type, "spinbtn", 8)) {
 float min, max, step;
@@ -476,22 +514,15 @@
 gtk_range_set_inverted (GTK_RANGE (prop), TRUE);
 }
 gtk_range_set_value (GTK_RANGE (prop), (gdouble)atof (value));
- gtk_scale_set_value_pos (GTK_SCALE (prop), GTK_POS_RIGHT);
+ gtk_scale_set_value_pos (GTK_SCALE (prop), vertical?GTK_POS_BOTTOM:GTK_POS_RIGHT);
 }
 label = gtk_label_new (_(labeltext));
 gtk_widget_show (label);
- g_signal_connect (G_OBJECT (prop), "value-changed", G_CALLBACK (prop_changed), win);
+ g_signal_connect (G_OBJECT (prop), "value-changed", G_CALLBACK (prop_changed), containervbox);
 gtk_widget_show (prop);
 }
 
- script = gettoken_warn_eof (script, token);
- if (!script) {
- break;
- }
- if (strcmp (token, ";")) {
- fprintf (stderr, "expected `;' while loading plugin %s config dialog: %s at line %d\n", conf->title, token, parser_line);
- break;
- }
+ if (check_semicolon(&script, token, conf->title) < 0) break;
 
 
 if (label && prop) {
@@ -506,19 +537,77 @@
 cont = prop;
 }
 if (prop) {
- g_object_set_data (G_OBJECT (win), key, prop);
+ g_object_set_data (G_OBJECT (containervbox), key, prop);
 }
 if (cont) {
- gtk_box_pack_start (GTK_BOX (widgetsncurr), cont, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (widgetsncurr), cont, FALSE, TRUE, 0);
+ }
+ }
+
+ // Now that all signal handlers are installed, reinstate the callback
+ make_dialog_conf->prop_changed = temp_prop_changed;
+
+}
+
+int
+gtkui_run_dialog (GtkWidget *parentwin, ddb_dialog_t *conf, uint32_t buttons, int (*callback)(int button, void *ctx), void *ctx) {
+ if (!parentwin) {
+ parentwin = mainwin;
+ }
+ // create window
+ char title200;
+ snprintf (title, sizeof (title), _("Configure %s"), conf->title);
+ GtkWidget *win;
+ if (!buttons) {
+ win = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parentwin), GTK_DIALOG_MODAL, GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (win), GTK_RESPONSE_OK);
+ }
+ else {
+ win = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parentwin), GTK_DIALOG_MODAL, NULL, NULL);
+ if (buttons & (1<<ddb_button_ok)) {
+ gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_OK, GTK_RESPONSE_OK);
+ }
+ if (buttons & (1<<ddb_button_cancel)) {
+ gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ }
+ if (buttons & (1<<ddb_button_close)) {
+ gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ }
+ if (buttons & (1<<ddb_button_apply)) {
+ gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_APPLY, GTK_RESPONSE_APPLY);
+ }
+ if (buttons & (1<<ddb_button_yes)) {
+ gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_YES, GTK_RESPONSE_YES);
+ }
+ if (buttons & (1<<ddb_button_no)) {
+ gtk_dialog_add_button (GTK_DIALOG (win), GTK_STOCK_NO, GTK_RESPONSE_NO);
 }
 }
+ gtk_window_set_type_hint (GTK_WINDOW (win), GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_container_set_border_width (GTK_CONTAINER(win), 12);
+
+ gtk_window_set_title (GTK_WINDOW (win), title);
+ gtk_window_set_modal (GTK_WINDOW (win), TRUE);
+ gtk_window_set_transient_for (GTK_WINDOW (win), GTK_WINDOW (parentwin));
+
+ GtkWidget *action_area = gtk_dialog_get_action_area (GTK_DIALOG (win));
+ gtk_widget_show (action_area);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END);
+
+ ddb_pluginprefs_dialog_t make_dialog_conf = {
+ .dialog_conf = *conf,
+ .parent = win,
+ .containerbox = gtk_dialog_get_content_area (GTK_DIALOG (win)),
+ .prop_changed = run_dialog_prop_changed_cb,
+ };
+ gtkui_make_dialog (&make_dialog_conf);
 
 int response;
 do {
 gtk_dialog_set_response_sensitive (GTK_DIALOG (win), GTK_RESPONSE_APPLY, FALSE);
 response = gtk_dialog_run (GTK_DIALOG (win));
 if (response == GTK_RESPONSE_APPLY || response == GTK_RESPONSE_OK) {
- apply_conf (win, conf);
+ apply_conf (make_dialog_conf.containerbox, conf, 0);
 }
 if (callback) {
 int btn = ddb_button_from_gtk_response (response);

deadbeef-0.6.2.tar.bz2/plugins/gtkui/pluginconf.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/pluginconf.h Changed

@@ -1,28 +1,51 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifndef __PLUGINCONF_H
 #define __PLUGINCONF_H
 
+
+typedef struct ddb_pluginprefs_dialog_s ddb_pluginprefs_dialog_t;
+
+struct ddb_pluginprefs_dialog_s {
+ ddb_dialog_t dialog_conf;
+
+ GtkWidget *parent;
+ GtkWidget *containerbox; // The container widget (typically a GtkVBox) that holds all the fields.
+
+ void (*prop_changed) (ddb_pluginprefs_dialog_t *make_dialog_conf);
+};
+
 int
 gtkui_run_dialog (GtkWidget *parentwin, ddb_dialog_t *conf, uint32_t buttons, int (*callback)(int button, void *ctx), void *ctx);
 
 int
 gtkui_run_dialog_root (ddb_dialog_t *conf, uint32_t buttons, int (*callback)(int button, void *ctx), void *ctx);
 
+void
+gtkui_make_dialog (ddb_pluginprefs_dialog_t *make_dialog_conf);
+
+void
+apply_conf (GtkWidget *w, ddb_dialog_t *conf, int reset_settings);
+
 #endif

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin Added

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwin.c Added

@@ -0,0 +1,265 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <assert.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <stdlib.h>
+#include <string.h>
+#include "../../../gettext.h"
+#include "../callbacks.h"
+#include "../ctmapping.h"
+#include "../drawing.h"
+#include "../dspconfig.h"
+#include "../eq.h"
+#include "../gtkui.h"
+#include "../hotkeys.h"
+#include "../interface.h"
+#include "../pluginconf.h"
+#include "../support.h"
+#include "../wingeom.h"
+#include "prefwin.h"
+#include "prefwinappearance.h"
+#if ENABLE_MEDIALIVB
+#include "prefwinmedialib.h"
+#endif
+#include "prefwinmisc.h"
+#include "prefwinnetwork.h"
+#include "prefwinplayback.h"
+#include "prefwinplugins.h"
+#include "prefwinsound.h"
+
+int PREFWIN_TAB_INDEX_SOUND = 0;
+int PREFWIN_TAB_INDEX_PLAYBACK = 1;
+int PREFWIN_TAB_INDEX_DSP = 2;
+int PREFWIN_TAB_INDEX_GUI = 3;
+int PREFWIN_TAB_INDEX_APPEARANCE = 4;
+int PREFWIN_TAB_INDEX_MEDIALIB = 5;
+int PREFWIN_TAB_INDEX_NETWORK = 6;
+int PREFWIN_TAB_INDEX_HOTKEYS = 7;
+int PREFWIN_TAB_INDEX_PLUGINS = 8;
+
+static GtkWidget *prefwin;
+
+void
+prefwin_init_theme_colors (void) {
+ GdkColor clr;
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "bar_background")), ((void)(gtkui_get_bar_background_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "bar_foreground")), ((void)(gtkui_get_bar_foreground_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_dark")), ((void)(gtkui_get_tabstrip_dark_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_mid")), ((void)(gtkui_get_tabstrip_mid_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_light")), ((void)(gtkui_get_tabstrip_light_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_base")), ((void)(gtkui_get_tabstrip_base_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_text")), ((void)(gtkui_get_tabstrip_text_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_playing_text")), ((void)(gtkui_get_tabstrip_playing_text_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "tabstrip_selected_text")), ((void)(gtkui_get_tabstrip_selected_text_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_even_row")), ((void)(gtkui_get_listview_even_row_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_odd_row")), ((void)(gtkui_get_listview_odd_row_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_selected_row")), ((void)(gtkui_get_listview_selection_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_text")), ((void)(gtkui_get_listview_text_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_selected_text")), ((void)(gtkui_get_listview_selected_text_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_playing_text")), ((void)(gtkui_get_listview_playing_text_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_group_text")), ((void)(gtkui_get_listview_group_text_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_column_text")), ((void)(gtkui_get_listview_column_text_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "listview_cursor")), ((void)(gtkui_get_listview_cursor_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "visualization_custom_color_button")), ((void)(gtkui_get_vis_custom_base_color (&clr)), &clr));
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (lookup_widget (prefwin, "visualization_custom_background_color_button")), ((void)(gtkui_get_vis_custom_background_color (&clr)), &clr));
+}
+
+void
+prefwin_set_scale (const char *scale_name, int value) {
+ GtkWidget *scale = lookup_widget (prefwin, scale_name);
+ GSignalMatchType mask = G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_DATA;
+ GQuark detail = g_quark_from_static_string("value_changed");
+ g_signal_handlers_block_matched ((gpointer)scale, mask, detail, 0, NULL, NULL, NULL);
+ gtk_range_set_value (GTK_RANGE (scale), value);
+ g_signal_handlers_unblock_matched ((gpointer)scale, mask, detail, 0, NULL, NULL, NULL);
+}
+
+void
+prefwin_set_combobox (GtkComboBox *combo, int i) {
+ GSignalMatchType mask = G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_DATA;
+ GQuark detail = g_quark_from_static_string("changed");
+ g_signal_handlers_block_matched ((gpointer)combo, mask, detail, 0, NULL, NULL, NULL);
+ gtk_combo_box_set_active (combo, i);
+ g_signal_handlers_unblock_matched ((gpointer)combo, mask, detail, 0, NULL, NULL, NULL);
+}
+
+void
+prefwin_set_toggle_button (const char *button_name, int value) {
+ GtkToggleButton *button = GTK_TOGGLE_BUTTON (lookup_widget (prefwin, button_name));
+ GSignalMatchType mask = G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_DATA;
+ GQuark detail = g_quark_from_static_string("toggled");
+ g_signal_handlers_block_matched ((gpointer)button, mask, detail, 0, NULL, NULL, NULL);
+ gtk_toggle_button_set_active (button, value);
+ g_signal_handlers_unblock_matched ((gpointer)button, mask, detail, 0, NULL, NULL, NULL);
+}
+
+void
+prefwin_set_entry_text (const char *entry_name, const char *text) {
+ GtkEntry *entry = GTK_ENTRY (lookup_widget (prefwin, entry_name));
+ GSignalMatchType mask = G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_DATA;
+ GQuark detail = g_quark_from_static_string("changed");
+ g_signal_handlers_block_matched ((gpointer)entry, mask, detail, 0, NULL, NULL, NULL);
+ gtk_entry_set_text (entry, text);
+ g_signal_handlers_unblock_matched ((gpointer)entry, mask, detail, 0, NULL, NULL, NULL);
+}
+
+void
+on_prefwin_response_cb (GtkDialog *dialog,
+ int response_id,
+ gpointer user_data) {
+ if (response_id != GTK_RESPONSE_CLOSE && response_id != GTK_RESPONSE_DELETE_EVENT) {
+ return;
+ }
+
+ if (gtkui_hotkeys_changed) {
+ GtkWidget *dlg = gtk_message_dialog_new (GTK_WINDOW (prefwin), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, _("You modified the hotkeys settings, but didn't save your changes."));
+ gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefwin));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg), _("Are you sure you want to continue without saving?"));
+ gtk_window_set_title (GTK_WINDOW (dlg), _("Warning"));
+ int response = gtk_dialog_run (GTK_DIALOG (dlg));
+ gtk_widget_destroy (dlg);
+ if (response == GTK_RESPONSE_NO) {
+ return;
+ }
+ }
+
+ dsp_setup_free ();
+ ctmapping_setup_free ();
+ gtk_widget_destroy (prefwin);
+ deadbeef->conf_save ();
+ prefwin_free_plugins ();
+#if ENABLE_MEDIALIVB
+ prefwin_free_medialib ();
+#endif
+
+ prefwin = NULL;
+}
+
+static void
+_init_prefwin(void) {
+ if (prefwin != NULL) {
+ return;
+ }
+ GtkWidget *w = prefwin = create_prefwin ();
+
+ // hide unavailable tabs
+ if (!deadbeef->plug_get_for_id ("hotkeys")) {
+ gtk_notebook_remove_page (GTK_NOTEBOOK (lookup_widget (prefwin, "notebook")), 7);
+ PREFWIN_TAB_INDEX_HOTKEYS = -1;
+ }
+ if (!deadbeef->plug_get_for_id ("medialib")) {
+ gtk_notebook_remove_page (GTK_NOTEBOOK (lookup_widget (prefwin, "notebook")), 5);
+ PREFWIN_TAB_INDEX_MEDIALIB = -1;
+ }
+
+ gtkui_init_theme_colors();
+
+ gtk_window_set_transient_for (GTK_WINDOW (w), GTK_WINDOW (mainwin));
+
+ deadbeef->conf_lock ();
+
+ // output plugin selection
+ prefwin_init_sound_tab (prefwin);
+
+ // replaygain_mode
+ prefwin_init_playback_tab (prefwin);
+
+ // dsp
+ dsp_setup_init (prefwin);
+
+ // minimize_on_startup
+ prefwin_init_gui_misc_tab (prefwin);
+
+ // override bar colors
+ prefwin_init_appearance_tab (prefwin);
+
+#if ENABLE_MEDIALIB
+ prefwin_init_medialib (prefwin);
+#endif
+
+ // network
+ ctmapping_setup_init (w);
+ prefwin_init_network_tab (prefwin);
+
+ // list of plugins
+ prefwin_init_plugins_tab (prefwin);
+
+ // hotkeys
+ if (PREFWIN_TAB_INDEX_HOTKEYS != -1) {
+ prefwin_init_hotkeys (prefwin);
+ }
+
+ deadbeef->conf_unlock ();
+
+ g_signal_connect (GTK_DIALOG (prefwin), "response", G_CALLBACK (on_prefwin_response_cb), NULL);
+
+ gtk_window_set_modal (GTK_WINDOW (prefwin), FALSE);
+ gtk_window_set_position (GTK_WINDOW (prefwin), GTK_WIN_POS_CENTER_ON_PARENT);
+}
+
+void
+prefwin_run (int tab_index) {
+ _init_prefwin();
+
+ if (tab_index != -1) {
+ gtk_notebook_set_current_page(GTK_NOTEBOOK (lookup_widget (prefwin, "notebook")), tab_index);
+ }
+
+#if GTK_CHECK_VERSION(2,28,0)
+ gtk_window_present_with_time (GTK_WINDOW(prefwin), (guint32)(g_get_monotonic_time() / 1000));
+#else
+ gtk_window_present_with_time (GTK_WINDOW(prefwin), GDK_CURRENT_TIME);
+#endif
+}
+
+gboolean
+on_prefwin_configure_event (GtkWidget *widget,
+ GdkEventConfigure *event,
+ gpointer user_data)
+{
+ wingeom_save (widget, "prefwin");
+ return FALSE;
+}
+
+
+gboolean
+on_prefwin_window_state_event (GtkWidget *widget,
+ GdkEventWindowState *event,
+ gpointer user_data)
+{
+ wingeom_save_max (event, widget, "prefwin");
+ return FALSE;
+}
+
+
+void
+on_prefwin_realize (GtkWidget *widget,
+ gpointer user_data)
+{
+ wingeom_restore (widget, "prefwin", -1, -1, -1, -1, 0);
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwin.h Added

@@ -0,0 +1,59 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef prefwin_h
+#define prefwin_h
+
+extern int PREFWIN_TAB_INDEX_SOUND;
+extern int PREFWIN_TAB_INDEX_PLAYBACK;
+extern int PREFWIN_TAB_INDEX_DSP;
+extern int PREFWIN_TAB_INDEX_GUI;
+extern int PREFWIN_TAB_INDEX_APPEARANCE;
+extern int PREFWIN_TAB_INDEX_MEDIALIB;
+extern int PREFWIN_TAB_INDEX_NETWORK;
+extern int PREFWIN_TAB_INDEX_HOTKEYS;
+extern int PREFWIN_TAB_INDEX_PLUGINS;
+
+/// Run the Preferences window.
+/// @param tab_index The page index to activate, or -1 to keep the previous one active.
+void
+prefwin_run (int tab_index);
+
+void
+prefwin_fill_soundcards (void);
+
+void
+prefwin_set_scale (const char *scale_name, int value);
+
+void
+prefwin_set_combobox (GtkComboBox *combo, int i);
+
+void
+prefwin_set_toggle_button (const char *button_name, int value);
+
+void
+prefwin_set_entry_text (const char *entry_name, const char *text);
+
+void
+prefwin_init_theme_colors (void);
+
+#endif /* prefwin_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinappearance.c Added

@@ -0,0 +1,400 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <gtk/gtk.h>
+#include "../drawing.h"
+#include "../eq.h"
+#include "../gtkui.h"
+#include "../support.h"
+#include "prefwin.h"
+#include "prefwinappearance.h"
+
+static GtkWidget *prefwin;
+
+void
+prefwin_init_appearance_tab(GtkWidget *_prefwin) {
+ GtkWidget *w = prefwin = _prefwin;
+ int override = deadbeef->conf_get_int ("gtkui.override_bar_colors", 0);
+ prefwin_set_toggle_button("override_bar_colors", override);
+ gtk_widget_set_sensitive (lookup_widget (w, "bar_colors_group"), override);
+
+ // override tabstrip colors
+ override = deadbeef->conf_get_int ("gtkui.override_tabstrip_colors", 0);
+ prefwin_set_toggle_button("override_tabstrip_colors", override);
+ gtk_widget_set_sensitive (lookup_widget (w, "tabstrip_colors_group"), override);
+
+ prefwin_set_toggle_button("tabstrip_playing_bold", deadbeef->conf_get_int ("gtkui.tabstrip_embolden_playing", 0));
+ prefwin_set_toggle_button("tabstrip_playing_italic", deadbeef->conf_get_int ("gtkui.tabstrip_italic_playing", 0));
+ prefwin_set_toggle_button("tabstrip_selected_bold", deadbeef->conf_get_int ("gtkui.tabstrip_embolden_selected", 0));
+ prefwin_set_toggle_button("tabstrip_selected_italic", deadbeef->conf_get_int ("gtkui.tabstrip_italic_selected", 0));
+
+ // get default gtk font
+ GtkStyle *style = gtk_widget_get_style (mainwin);
+ const char *gtk_style_font = pango_font_description_to_string (style->font_desc);
+
+ gtk_font_button_set_font_name (GTK_FONT_BUTTON (lookup_widget (w, "tabstrip_text_font")), deadbeef->conf_get_str_fast ("gtkui.font.tabstrip_text", gtk_style_font));
+
+ // override listview colors
+ override = deadbeef->conf_get_int ("gtkui.override_listview_colors", 0);
+ prefwin_set_toggle_button("override_listview_colors", override);
+ gtk_widget_set_sensitive (lookup_widget (w, "listview_colors_group"), override);
+
+ // embolden/italic listview text
+ prefwin_set_toggle_button("listview_selected_text_bold", deadbeef->conf_get_int ("gtkui.embolden_selected_tracks", 0));
+ prefwin_set_toggle_button("listview_selected_text_italic", deadbeef->conf_get_int ("gtkui.italic_selected_tracks", 0));
+ prefwin_set_toggle_button("listview_playing_text_bold", deadbeef->conf_get_int ("gtkui.embolden_current_track", 0));
+ prefwin_set_toggle_button("listview_playing_text_italic", deadbeef->conf_get_int ("gtkui.italic_current_track", 0));
+
+ gtk_font_button_set_font_name (GTK_FONT_BUTTON (lookup_widget (w, "listview_text_font")), deadbeef->conf_get_str_fast ("gtkui.font.listview_text", gtk_style_font));
+ gtk_font_button_set_font_name (GTK_FONT_BUTTON (lookup_widget (w, "listview_group_text_font")), deadbeef->conf_get_str_fast ("gtkui.font.listview_group_text", gtk_style_font));
+ gtk_font_button_set_font_name (GTK_FONT_BUTTON (lookup_widget (w, "listview_column_text_font")), deadbeef->conf_get_str_fast ("gtkui.font.listview_column_text", gtk_style_font));
+
+ // visualizations
+ override = deadbeef->conf_get_int ("gtkui.vis.use_custom_base_color", 0);
+ prefwin_set_toggle_button("use_visualization_base_color", override);
+ gtk_widget_set_sensitive (lookup_widget (w, "visualization_custom_color_button"), override);
+
+ override = deadbeef->conf_get_int ("gtkui.vis.use_custom_background_color", 0);
+ prefwin_set_toggle_button("use_visualization_background_color", override);
+ gtk_widget_set_sensitive (lookup_widget (w, "visualization_custom_background_color_button"), override);
+
+ // colors
+ prefwin_init_theme_colors ();
+}
+
+
+static void
+override_set_helper (GtkToggleButton *togglebutton, const char* conf_str, const char *group_name)
+{
+ int active = gtk_toggle_button_get_active (togglebutton);
+ deadbeef->conf_set_int (conf_str, active);
+ gtk_widget_set_sensitive (lookup_widget (prefwin, group_name), active);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, (uintptr_t)conf_str, 0, 0);
+ gtkui_init_theme_colors ();
+ prefwin_init_theme_colors ();
+}
+
+static void
+font_set_helper (GtkFontButton *fontbutton, const char* conf_str)
+{
+ deadbeef->conf_set_str (conf_str, gtk_font_button_get_font_name (fontbutton));
+ gtkui_init_theme_colors ();
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, (uintptr_t)conf_str, 0, 0);
+}
+
+static int
+font_style_set_helper (GtkToggleButton *togglebutton, const char* conf_str)
+{
+ int active = gtk_toggle_button_get_active (togglebutton);
+ deadbeef->conf_set_int (conf_str, active);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, (uintptr_t)conf_str, 0, 0);
+ return active;
+}
+
+static void
+color_set_helper (GtkColorButton *colorbutton, const char* conf_str)
+{
+ if (conf_str == NULL) {
+ return;
+ }
+ GdkColor clr;
+ gtk_color_button_get_color (colorbutton, &clr);
+ char str100;
+ snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
+ deadbeef->conf_set_str (conf_str, str);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, (uintptr_t)conf_str, 0, 0);
+ gtkui_init_theme_colors ();
+}
+
+void
+on_tabstrip_light_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.tabstrip_light");
+}
+
+
+void
+on_tabstrip_mid_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.tabstrip_mid");
+}
+
+void
+on_tabstrip_dark_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.tabstrip_dark");
+}
+
+void
+on_tabstrip_base_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.tabstrip_base");
+}
+
+void
+on_tabstrip_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.tabstrip_text");
+}
+
+void
+on_tabstrip_selected_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.tabstrip_selected_text");
+}
+
+void
+on_tabstrip_playing_bold_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ gtkui_tabstrip_embolden_playing = font_style_set_helper (togglebutton, "gtkui.tabstrip_embolden_playing");
+}
+
+void
+on_tabstrip_playing_italic_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ gtkui_tabstrip_italic_playing = font_style_set_helper (togglebutton, "gtkui.tabstrip_italic_playing");
+}
+
+void
+on_tabstrip_selected_bold_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ gtkui_tabstrip_embolden_selected = font_style_set_helper (togglebutton, "gtkui.tabstrip_embolden_selected");
+}
+
+void
+on_tabstrip_selected_italic_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ gtkui_tabstrip_italic_selected = font_style_set_helper (togglebutton, "gtkui.tabstrip_italic_selected");
+}
+
+void
+on_tabstrip_text_font_set (GtkFontButton *fontbutton,
+ gpointer user_data)
+{
+ font_set_helper (fontbutton, "gtkui.font.tabstrip_text");
+}
+
+void
+on_tabstrip_playing_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.tabstrip_playing_text");
+}
+
+void
+on_bar_foreground_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.bar_foreground");
+ eq_redraw ();
+}
+
+void
+on_bar_background_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.bar_background");
+ eq_redraw ();
+}
+
+void
+on_override_listview_colors_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ override_set_helper (togglebutton, "gtkui.override_listview_colors", "listview_colors_group");
+}
+
+
+void
+on_listview_even_row_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.listview_even_row");
+}
+
+void
+on_listview_odd_row_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.listview_odd_row");
+}
+
+void
+on_listview_selected_row_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.listview_selection");
+}
+
+void
+on_listview_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.listview_text");
+}
+
+
+void
+on_listview_selected_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.listview_selected_text");
+}
+
+void
+on_listview_cursor_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.listview_cursor");
+}
+
+void
+on_listview_playing_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.listview_playing_text");
+}
+
+void
+on_listview_group_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.listview_group_text");
+}
+
+void
+on_listview_group_text_font_set (GtkFontButton *fontbutton,
+ gpointer user_data)
+{
+ font_set_helper (fontbutton, "gtkui.font.listview_group_text");
+}
+
+void
+on_listview_text_font_set (GtkFontButton *fontbutton,
+ gpointer user_data)
+{
+ font_set_helper (fontbutton, "gtkui.font.listview_text");
+}
+
+void
+on_listview_playing_text_bold_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ gtkui_embolden_current_track = font_style_set_helper (togglebutton, "gtkui.embolden_current_track");
+}
+
+void
+on_listview_playing_text_italic_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ gtkui_italic_current_track = font_style_set_helper (togglebutton, "gtkui.italic_current_track");
+}
+
+void
+on_listview_selected_text_bold_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ gtkui_embolden_selected_tracks = font_style_set_helper (togglebutton, "gtkui.embolden_selected_tracks");
+}
+
+void
+on_listview_selected_text_italic_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ gtkui_italic_selected_tracks = font_style_set_helper (togglebutton, "gtkui.italic_selected_tracks");
+}
+
+void
+on_listview_column_text_color_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.color.listview_column_text");
+}
+
+void
+on_listview_column_text_font_set (GtkFontButton *fontbutton,
+ gpointer user_data)
+{
+ font_set_helper (fontbutton, "gtkui.font.listview_column_text");
+}
+
+void
+on_override_bar_colors_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ override_set_helper (togglebutton, "gtkui.override_bar_colors", "bar_colors_group");
+ eq_redraw ();
+}
+
+void
+on_override_tabstrip_colors_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ override_set_helper (togglebutton, "gtkui.override_tabstrip_colors", "tabstrip_colors_group");
+}
+
+
+void
+on_use_visualization_base_color_toggled
+(GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ override_set_helper (togglebutton, "gtkui.vis.use_custom_base_color", "visualization_custom_color_button");
+}
+
+
+void
+on_visualization_custom_color_button_color_set
+(GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.vis.custom_base_color");
+}
+
+
+void
+on_use_visualization_background_color_toggled
+(GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ override_set_helper (togglebutton, "gtkui.vis.use_custom_background_color", "visualization_custom_background_color_button");
+}
+
+void
+on_visualization_custom_background_color_button_color_set
+(GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ color_set_helper (colorbutton, "gtkui.vis.custom_background_color");
+}
+

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinappearance.h Added

@@ -0,0 +1,30 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef prefwinappearance_h
+#define prefwinappearance_h
+
+void
+prefwin_init_appearance_tab(GtkWidget *prefwin);
+
+#endif /* prefwinappearance_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinmisc.c Added

@@ -0,0 +1,264 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <gtk/gtk.h>
+#include <string.h>
+#include "../gtkui.h"
+#include "../support.h"
+#include "prefwin.h"
+#include "prefwinmisc.h"
+
+void
+prefwin_init_gui_misc_tab (GtkWidget *_prefwin) {
+ GtkWidget *w = _prefwin;
+ prefwin_set_toggle_button("minimize_on_startup", deadbeef->conf_get_int ("gtkui.start_hidden", 0));
+
+ // close_send_to_tray
+ prefwin_set_toggle_button("pref_close_send_to_tray", deadbeef->conf_get_int ("close_send_to_tray", 0));
+
+ // hide tray icon
+ prefwin_set_toggle_button("hide_tray_icon", deadbeef->conf_get_int ("gtkui.hide_tray_icon", 0));
+
+ // move_to_trash
+ prefwin_set_toggle_button("move_to_trash", deadbeef->conf_get_int ("gtkui.move_to_trash", 1));
+
+ // mmb_delete_playlist
+ prefwin_set_toggle_button("mmb_delete_playlist", deadbeef->conf_get_int ("gtkui.mmb_delete_playlist", 1));
+
+ // hide_delete_from_disk
+ prefwin_set_toggle_button("hide_delete_from_disk", deadbeef->conf_get_int ("gtkui.hide_remove_from_disk", 0));
+
+ // play next song when currently played is deleted
+ prefwin_set_toggle_button("skip_deleted_songs", deadbeef->conf_get_int ("gtkui.skip_deleted_songs", 0));
+
+ // auto-rename playlist from folder name
+ prefwin_set_toggle_button("auto_name_playlist_from_folder", deadbeef->conf_get_int ("gtkui.name_playlist_from_folder", 1));
+
+ // refresh rate
+ int val = deadbeef->conf_get_int ("gtkui.refresh_rate", 10);
+ prefwin_set_scale("gui_fps", val);
+
+ // titlebar text
+ char titlebar1024;
+ deadbeef->conf_get_str ("gtkui.titlebar_playing_tf", gtkui_default_titlebar_playing, titlebar, sizeof (titlebar));
+ if (*titlebar == 0) {
+ strncat (titlebar, gtkui_default_titlebar_playing, sizeof (titlebar)-1);
+ }
+
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "titlebar_format_playing")), titlebar);
+
+ deadbeef->conf_get_str ("gtkui.titlebar_stopped_tf", gtkui_default_titlebar_stopped, titlebar, sizeof (titlebar));
+ if (*titlebar == 0) {
+ strncat (titlebar, gtkui_default_titlebar_stopped, sizeof (titlebar)-1);
+ }
+
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "titlebar_format_stopped")), titlebar);
+
+ // statusbar selection playback time
+ prefwin_set_toggle_button ("display_seltime", deadbeef->conf_get_int ("gtkui.statusbar_seltime", 0));
+
+ // enable shift-jis recoding
+ prefwin_set_toggle_button("enable_shift_jis_recoding", deadbeef->conf_get_int ("junk.enable_shift_jis_detection", 0));
+
+ // enable cp1251 recoding
+ prefwin_set_toggle_button("enable_cp1251_recoding", deadbeef->conf_get_int ("junk.enable_cp1251_detection", 1));
+
+ // enable cp936 recoding
+ prefwin_set_toggle_button("enable_cp936_recoding", deadbeef->conf_get_int ("junk.enable_cp936_detection", 0));
+
+ // enable auto-sizing of columns
+ prefwin_set_toggle_button("auto_size_columns", deadbeef->conf_get_int ("gtkui.autoresize_columns", 0));
+
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON (lookup_widget (w, "listview_group_spacing")), deadbeef->conf_get_int ("playlist.groups.spacing", 0));
+
+ // fill gui plugin list
+ GtkComboBox *combobox = GTK_COMBO_BOX (lookup_widget (w, "gui_plugin"));
+ const char **names = deadbeef->plug_get_gui_names ();
+ for (int i = 0; namesi; i++) {
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), namesi);
+ if (!strcmp (namesi, deadbeef->conf_get_str_fast ("gui_plugin", "GTK2"))) {
+ prefwin_set_combobox (combobox, i);
+ }
+ }
+}
+
+void
+on_minimize_on_startup_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ deadbeef->conf_set_int ("gtkui.start_hidden", active);
+ if (active == 1) {
+ prefwin_set_toggle_button("hide_tray_icon", 0);
+ deadbeef->conf_set_int ("gtkui.hide_tray_icon", 0);
+ }
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_move_to_trash_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ deadbeef->conf_set_int ("gtkui.move_to_trash", active);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_pref_close_send_to_tray_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ deadbeef->conf_set_int ("close_send_to_tray", active);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_hide_tray_icon_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (togglebutton);
+ deadbeef->conf_set_int ("gtkui.hide_tray_icon", active);
+ if (active == 1) {
+ prefwin_set_toggle_button("minimize_on_startup", 0);
+ deadbeef->conf_set_int ("gtkui.start_hidden", 0);
+ }
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_mmb_delete_playlist_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("gtkui.mmb_delete_playlist", gtk_toggle_button_get_active (togglebutton));
+}
+
+void
+on_hide_delete_from_disk_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
+ deadbeef->conf_set_int ("gtkui.hide_remove_from_disk", active);
+}
+
+void
+on_skip_deleted_songs_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
+ deadbeef->conf_set_int ("gtkui.skip_deleted_songs", active);
+}
+
+void
+on_titlebar_format_playing_changed (GtkEditable *editable,
+ gpointer user_data)
+{
+ const char *text = gtk_entry_get_text (GTK_ENTRY (editable));
+ if (*text == 0) {
+ text = NULL;
+ }
+ deadbeef->conf_set_str ("gtkui.titlebar_playing_tf", text);
+ gtkui_titlebar_tf_init ();
+ gtkui_set_titlebar (NULL);
+}
+
+
+void
+on_titlebar_format_stopped_changed (GtkEditable *editable,
+ gpointer user_data)
+{
+ const char *text = gtk_entry_get_text (GTK_ENTRY (editable));
+ if (*text == 0) {
+ text = NULL;
+ }
+ deadbeef->conf_set_str ("gtkui.titlebar_stopped_tf", text);
+ gtkui_titlebar_tf_init ();
+ gtkui_set_titlebar (NULL);
+}
+
+void
+on_enable_shift_jis_recoding_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
+ deadbeef->conf_set_int ("junk.enable_shift_jis_detection", active);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_enable_cp1251_recoding_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
+ deadbeef->conf_set_int ("junk.enable_cp1251_detection", active);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+
+void
+on_enable_cp936_recoding_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
+ deadbeef->conf_set_int ("junk.enable_cp936_detection", active);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+
+void
+on_auto_name_playlist_from_folder_toggled
+(GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
+ deadbeef->conf_set_int ("gtkui.name_playlist_from_folder", active);
+}
+
+void
+on_auto_size_columns_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("gtkui.autoresize_columns", gtk_toggle_button_get_active (togglebutton));
+}
+
+void
+on_display_seltime_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("gtkui.statusbar_seltime", gtk_toggle_button_get_active (togglebutton));
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_listview_group_spacing_value_changed
+(GtkSpinButton *spinbutton,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("playlist.groups.spacing", gtk_spin_button_get_value_as_int (spinbutton));
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, (uintptr_t)"playlist.groups.spacing", 0, 0);
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref(plt);
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinmisc.h Added

@@ -0,0 +1,30 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef prefwinmisc_h
+#define prefwinmisc_h
+
+void
+prefwin_init_gui_misc_tab (GtkWidget *prefwin);
+
+#endif /* prefwinmisc_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinnetwork.c Added

@@ -0,0 +1,148 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <gtk/gtk.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../ctmapping.h"
+#include "../gtkui.h"
+#include "../support.h"
+#include "prefwin.h"
+#include "prefwinnetwork.h"
+
+void
+prefwin_init_network_tab (GtkWidget *_prefwin) {
+ GtkWidget *w = _prefwin;
+
+ prefwin_set_toggle_button("pref_network_enableproxy", deadbeef->conf_get_int ("network.proxy", 0));
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "pref_network_proxyaddress")), deadbeef->conf_get_str_fast ("network.proxy.address", ""));
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "pref_network_proxyport")), deadbeef->conf_get_str_fast ("network.proxy.port", "8080"));
+ GtkComboBox *combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_network_proxytype"));
+ const char *type = deadbeef->conf_get_str_fast ("network.proxy.type", "HTTP");
+ if (!strcasecmp (type, "HTTP")) {
+ prefwin_set_combobox (combobox, 0);
+ }
+ else if (!strcasecmp (type, "HTTP_1_0")) {
+ prefwin_set_combobox (combobox, 1);
+ }
+ else if (!strcasecmp (type, "SOCKS4")) {
+ prefwin_set_combobox (combobox, 2);
+ }
+ else if (!strcasecmp (type, "SOCKS5")) {
+ prefwin_set_combobox (combobox, 3);
+ }
+ else if (!strcasecmp (type, "SOCKS4A")) {
+ prefwin_set_combobox (combobox, 4);
+ }
+ else if (!strcasecmp (type, "SOCKS5_HOSTNAME")) {
+ prefwin_set_combobox (combobox, 5);
+ }
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "proxyuser")), deadbeef->conf_get_str_fast ("network.proxy.username", ""));
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "proxypassword")), deadbeef->conf_get_str_fast ("network.proxy.password", ""));
+
+ char ua100;
+ deadbeef->conf_get_str ("network.http_user_agent", "deadbeef", ua, sizeof (ua));
+ prefwin_set_entry_text("useragent", ua);
+}
+
+void
+on_pref_network_proxyaddress_changed (GtkEditable *editable,
+ gpointer user_data)
+{
+ deadbeef->conf_set_str ("network.proxy.address", gtk_entry_get_text (GTK_ENTRY (editable)));
+}
+
+
+void
+on_pref_network_enableproxy_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("network.proxy", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)));
+}
+
+
+void
+on_pref_network_proxyport_changed (GtkEditable *editable,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("network.proxy.port", atoi (gtk_entry_get_text (GTK_ENTRY (editable))));
+}
+
+
+void
+on_pref_network_proxytype_changed (GtkComboBox *combobox,
+ gpointer user_data)
+{
+
+ int active = gtk_combo_box_get_active (combobox);
+ switch (active) {
+ case 0:
+ deadbeef->conf_set_str ("network.proxy.type", "HTTP");
+ break;
+ case 1:
+ deadbeef->conf_set_str ("network.proxy.type", "HTTP_1_0");
+ break;
+ case 2:
+ deadbeef->conf_set_str ("network.proxy.type", "SOCKS4");
+ break;
+ case 3:
+ deadbeef->conf_set_str ("network.proxy.type", "SOCKS5");
+ break;
+ case 4:
+ deadbeef->conf_set_str ("network.proxy.type", "SOCKS4A");
+ break;
+ case 5:
+ deadbeef->conf_set_str ("network.proxy.type", "SOCKS5_HOSTNAME");
+ break;
+ default:
+ deadbeef->conf_set_str ("network.proxy.type", "HTTP");
+ break;
+ }
+}
+
+void
+on_proxyuser_changed (GtkEditable *editable,
+ gpointer user_data)
+{
+ deadbeef->conf_set_str ("network.proxy.username", gtk_entry_get_text (GTK_ENTRY (editable)));
+}
+
+
+void
+on_proxypassword_changed (GtkEditable *editable,
+ gpointer user_data)
+{
+ deadbeef->conf_set_str ("network.proxy.password", gtk_entry_get_text (GTK_ENTRY (editable)));
+}
+
+void
+on_useragent_changed (GtkEditable *editable,
+ gpointer user_data)
+{
+ deadbeef->conf_set_str ("network.http_user_agent", gtk_entry_get_text (GTK_ENTRY (editable)));
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinnetwork.h Added

@@ -0,0 +1,30 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef prefwinnetwork_h
+#define prefwinnetwork_h
+
+void
+prefwin_init_network_tab (GtkWidget *prefwin);
+
+#endif /* prefwinnetwork_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinplayback.c Added

@@ -0,0 +1,192 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <gtk/gtk.h>
+#include "../gtkui.h"
+#include "../support.h"
+#include "prefwin.h"
+#include "prefwinplayback.h"
+
+static GtkWidget *prefwin;
+
+void
+prefwin_init_playback_tab (GtkWidget *_prefwin) {
+ GtkWidget *w = prefwin = _prefwin;
+ GtkComboBox *combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_replaygain_source_mode"));
+ prefwin_set_combobox (combobox, deadbeef->conf_get_int ("replaygain.source_mode", 0));
+
+ // replaygain_processing
+ combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_replaygain_processing"));
+ int processing_idx = 0;
+ int processing_flags = deadbeef->conf_get_int ("replaygain.processing_flags", 0);
+ if (processing_flags == DDB_RG_PROCESSING_GAIN) {
+ processing_idx = 1;
+ }
+ else if (processing_flags == (DDB_RG_PROCESSING_GAIN|DDB_RG_PROCESSING_PREVENT_CLIPPING)) {
+ processing_idx = 2;
+ }
+ else if (processing_flags == DDB_RG_PROCESSING_PREVENT_CLIPPING) {
+ processing_idx = 3;
+ }
+
+ prefwin_set_combobox (combobox, processing_idx);
+
+ // preamp with rg
+ prefwin_set_scale("replaygain_preamp", deadbeef->conf_get_int ("replaygain.preamp_with_rg", 0));
+
+ // preamp without rg
+ prefwin_set_scale("global_preamp", deadbeef->conf_get_int ("replaygain.preamp_without_rg", 0));
+
+ // cli playlist
+ int active = deadbeef->conf_get_int ("cli_add_to_specific_playlist", 1);
+ prefwin_set_toggle_button("cli_add_to_playlist", active);
+ gtk_widget_set_sensitive (lookup_widget (w, "cli_playlist_name"), active);
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "cli_playlist_name")), deadbeef->conf_get_str_fast ("cli_add_playlist_name", "Default"));
+
+ // resume last session
+ prefwin_set_toggle_button("resume_last_session", deadbeef->conf_get_int ("resume_last_session", 1));
+
+ // add from archives
+ prefwin_set_toggle_button("ignore_archives", deadbeef->conf_get_int ("ignore_archives", 1));
+
+ // reset autostop
+ prefwin_set_toggle_button("reset_autostop", deadbeef->conf_get_int ("playlist.stop_after_current_reset", 0));
+
+ // reset album autostop
+ prefwin_set_toggle_button("reset_autostopalbum", deadbeef->conf_get_int ("playlist.stop_after_album_reset", 0));
+}
+
+void
+on_pref_replaygain_source_mode_changed (GtkComboBox *combobox,
+ gpointer user_data)
+{
+ int active = gtk_combo_box_get_active (combobox);
+ deadbeef->conf_set_int ("replaygain.source_mode", active);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_pref_replaygain_processing_changed (GtkComboBox *combobox,
+ gpointer user_data)
+{
+ uint32_t flags = 0;
+ int idx = gtk_combo_box_get_active (combobox);
+ if (idx == 1) {
+ flags = DDB_RG_PROCESSING_GAIN;
+ }
+ if (idx == 2) {
+ flags = DDB_RG_PROCESSING_GAIN | DDB_RG_PROCESSING_PREVENT_CLIPPING;
+ }
+ if (idx == 3) {
+ flags = DDB_RG_PROCESSING_PREVENT_CLIPPING;
+ }
+
+ deadbeef->conf_set_int ("replaygain.processing_flags", flags);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+
+void
+on_replaygain_preamp_value_changed (GtkRange *range,
+ gpointer user_data)
+{
+ float val = gtk_range_get_value (range);
+ deadbeef->conf_set_float ("replaygain.preamp_with_rg", val);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_global_preamp_value_changed (GtkRange *range,
+ gpointer user_data)
+{
+ float val = gtk_range_get_value (range);
+ deadbeef->conf_set_float ("replaygain.preamp_without_rg", val);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_cli_add_to_playlist_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
+ deadbeef->conf_set_int ("cli_add_to_specific_playlist", active);
+ gtk_widget_set_sensitive (lookup_widget (prefwin, "cli_playlist_name"), active);
+}
+
+
+void
+on_cli_playlist_name_changed (GtkEditable *editable,
+ gpointer user_data)
+{
+ deadbeef->conf_set_str ("cli_add_playlist_name", gtk_entry_get_text (GTK_ENTRY (editable)));
+}
+
+void
+on_resume_last_session_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton));
+ deadbeef->conf_set_int ("resume_last_session", active);
+}
+
+void
+on_gui_plugin_changed (GtkComboBox *combobox,
+ gpointer user_data)
+{
+ gchar *txt = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combobox));
+ if (txt) {
+ deadbeef->conf_set_str ("gui_plugin", txt);
+ g_free (txt);
+ }
+}
+
+void
+on_gui_fps_value_changed (GtkRange *range,
+ gpointer user_data)
+{
+ int val = gtk_range_get_value (range);
+ deadbeef->conf_set_int ("gtkui.refresh_rate", val);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_ignore_archives_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+
+ deadbeef->conf_set_int ("ignore_archives", gtk_toggle_button_get_active (togglebutton));
+}
+
+void
+on_reset_autostop_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("playlist.stop_after_current_reset", gtk_toggle_button_get_active (togglebutton));
+}
+
+void
+on_reset_autostopalbum_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("playlist.stop_after_album_reset", gtk_toggle_button_get_active (togglebutton));
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinplayback.h Added

@@ -0,0 +1,30 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef prefwinplayback_h
+#define prefwinplayback_h
+
+void
+prefwin_init_playback_tab (GtkWidget *prefwin);
+
+#endif /* prefwinplayback_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinplugins.c Added

@@ -0,0 +1,370 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <assert.h>
+#include <gtk/gtk.h>
+#include <string.h>
+#include "../support.h"
+#include "../interface.h"
+#include "../ctmapping.h"
+#include "../gtkui.h"
+#include "../pluginconf.h"
+#include "prefwin.h"
+#include "prefwinplugins.h"
+
+
+enum {
+ PLUGIN_LIST_COL_TITLE,
+ PLUGIN_LIST_COL_IDX,
+ PLUGIN_LIST_COL_BUILTIN,
+ PLUGIN_LIST_COL_HASCONFIG
+};
+
+static GtkWidget *prefwin;
+static GtkListStore *pluginliststore;
+static GtkTreeModelFilter *pluginliststore_filtered;
+static GtkMenu *pluginlistmenu;
+static GtkWidget *copyright_window;
+
+void
+on_only_show_plugins_with_configuration1_activate
+(GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ GtkWidget *w = prefwin;
+ GtkTreeView *tree = GTK_TREE_VIEW (lookup_widget (w, "pref_pluginlist"));
+ int active = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem));
+ if (active) {
+ gtk_tree_view_set_model (tree, GTK_TREE_MODEL (pluginliststore_filtered));
+ } else {
+ gtk_tree_view_set_model (tree, GTK_TREE_MODEL (pluginliststore));
+ }
+}
+
+gboolean
+on_pref_pluginlist_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
+{
+ if (event->button == 3) {
+ gtk_menu_popup (GTK_MENU (pluginlistmenu), NULL, NULL, NULL, NULL, event->button, gtk_get_current_event_time());
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+plugin_pref_prop_changed_cb(ddb_pluginprefs_dialog_t *make_dialog_conf) {
+ apply_conf (GTK_WIDGET (make_dialog_conf->containerbox), &make_dialog_conf->dialog_conf, 0);
+}
+
+static void
+gtkui_conf_get_str (const char *key, char *value, int len, const char *def) {
+ deadbeef->conf_get_str (key, def, value, len);
+}
+
+void
+on_pref_pluginlist_cursor_changed (GtkTreeView *treeview,
+ gpointer user_data)
+{
+ GtkTreePath *path;
+ GtkTreeViewColumn *col;
+ gtk_tree_view_get_cursor (treeview, &path, &col);
+ if (!path || !col) {
+ // reset
+ return;
+ }
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ int idx;
+ model = gtk_tree_view_get_model (treeview);
+ if (!gtk_tree_model_get_iter (model, &iter, path)) {
+ return;
+ }
+
+ gtk_tree_model_get (model, &iter, PLUGIN_LIST_COL_IDX, &idx, -1);
+
+ DB_plugin_t **plugins = deadbeef->plug_get_list ();
+ DB_plugin_t *p = pluginsidx;
+
+ assert (p);
+ GtkWidget *w = prefwin;
+ assert (w);
+
+ char s20;
+ snprintf (s, sizeof (s), "%d.%d", p->version_major, p->version_minor);
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (w, "plug_version")), s);
+
+ if (p->descr) {
+ GtkTextView *tv = GTK_TEXT_VIEW (lookup_widget (w, "plug_description"));
+
+ GtkTextBuffer *buffer = gtk_text_buffer_new (NULL);
+
+ gtk_text_buffer_set_text (buffer, p->descr, (gint)strlen(p->descr));
+ gtk_text_view_set_buffer (GTK_TEXT_VIEW (tv), buffer);
+ g_object_unref (buffer);
+ }
+
+ GtkWidget *link = lookup_widget (w, "weblink");
+ if (p->website) {
+ gtk_link_button_set_uri (GTK_LINK_BUTTON(link), p->website);
+ gtk_widget_set_sensitive (link, TRUE);
+ }
+ else {
+ gtk_link_button_set_uri (GTK_LINK_BUTTON(link), "");
+ gtk_widget_set_sensitive (link, FALSE);
+ }
+
+ GtkTextView *lictv = GTK_TEXT_VIEW (lookup_widget (w, "plug_license"));
+ if (p->copyright) {
+ GtkTextBuffer *buffer = gtk_text_buffer_new (NULL);
+
+ gtk_text_buffer_set_text (buffer, p->copyright, (gint)strlen(p->copyright));
+ gtk_text_view_set_buffer (GTK_TEXT_VIEW (lictv), buffer);
+ g_object_unref (buffer);
+ }
+ else {
+ gtk_text_view_set_buffer(lictv, NULL);
+ }
+
+ GtkWidget *plugin_actions_btnbox = lookup_widget (w, "plugin_actions_btnbox");
+
+ GtkWidget *container = (lookup_widget (w, "plug_conf_dlg_viewport"));
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (container));
+ if (child)
+ gtk_widget_destroy(child);
+
+ if (p->configdialog) {
+ ddb_dialog_t conf = {
+ .title = p->name,
+ .layout = p->configdialog,
+ .set_param = deadbeef->conf_set_str,
+ .get_param = gtkui_conf_get_str,
+ };
+ ddb_pluginprefs_dialog_t make_dialog_conf = {
+ .dialog_conf = conf,
+ .parent = prefwin,
+ .prop_changed = plugin_pref_prop_changed_cb,
+ };
+ GtkWidget *box = gtk_vbox_new(FALSE, 0);
+ gtk_widget_show (box);
+ if (user_data == (void *)1) {
+ apply_conf (box, &conf, 1);
+ }
+ make_dialog_conf.containerbox = box;
+ gtk_container_add (GTK_CONTAINER (container), box);
+ gtkui_make_dialog (&make_dialog_conf);
+
+ gtk_widget_show (plugin_actions_btnbox);
+ } else {
+ gtk_widget_hide (plugin_actions_btnbox);
+ }
+}
+
+void
+on_plugin_conf_reset_btn_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ GtkWidget *w = prefwin;
+ GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (w, "pref_pluginlist"));
+ on_pref_pluginlist_cursor_changed(treeview, (void *)1);
+}
+
+void
+on_pref_pluginlist_row_activated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data)
+{
+ GtkWidget *w = prefwin;
+ GtkNotebook *notebook = GTK_NOTEBOOK (lookup_widget (w, "plugin_notebook"));
+ gtk_notebook_set_current_page (notebook, 0);
+}
+
+void
+on_plugin_conf_tab_btn_clicked (GtkRadioButton *button,
+ gpointer user_data)
+{
+ GtkWidget *w = prefwin;
+ GtkNotebook *notebook = GTK_NOTEBOOK (lookup_widget (w, "plugin_notebook"));
+ gtk_notebook_set_current_page (notebook, 0);
+}
+
+
+void
+on_plugin_info_tab_btn_clicked (GtkRadioButton *button,
+ gpointer user_data)
+{
+ GtkWidget *w = prefwin;
+ GtkNotebook *notebook = GTK_NOTEBOOK (lookup_widget (w, "plugin_notebook"));
+ gtk_notebook_set_current_page (notebook, 1);
+}
+
+
+void
+on_plugin_license_tab_btn_clicked (GtkRadioButton *button,
+ gpointer user_data)
+{
+ GtkWidget *w = prefwin;
+ GtkNotebook *notebook = GTK_NOTEBOOK (lookup_widget (w, "plugin_notebook"));
+ gtk_notebook_set_current_page (notebook, 2);
+}
+
+// This code is only here so you can programmatically switch page
+// of the notebook and have the radio buttons update accordingly.
+void
+on_plugin_notebook_switch_page (GtkNotebook *notebook,
+ GtkWidget *page,
+ guint page_num,
+ gpointer user_data)
+{
+ GtkWidget *w = prefwin;
+ GtkToggleButton *plugin_conf_tab_btn = GTK_TOGGLE_BUTTON (lookup_widget (w, "plugin_conf_tab_btn"));
+ GtkToggleButton *plugin_info_tab_btn = GTK_TOGGLE_BUTTON (lookup_widget (w, "plugin_info_tab_btn"));
+ GtkToggleButton *plugin_license_tab_btn = GTK_TOGGLE_BUTTON (lookup_widget (w, "plugin_license_tab_btn"));
+
+ GSignalMatchType mask = G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_DATA;
+ GQuark detail = g_quark_from_static_string ("switch_page");
+ g_signal_handlers_block_matched ((gpointer)notebook, mask, detail, 0, NULL, NULL, NULL);
+
+ switch (page_num) {
+ case 0:
+ gtk_toggle_button_set_active (plugin_conf_tab_btn, 1);
+ break;
+ case 1:
+ gtk_toggle_button_set_active (plugin_info_tab_btn, 1);
+ break;
+ case 2:
+ gtk_toggle_button_set_active (plugin_license_tab_btn, 1);
+ }
+ g_signal_handlers_unblock_matched ((gpointer)notebook, mask, detail, 0, NULL, NULL, NULL);
+}
+
+void
+prefwin_init_plugins_tab (GtkWidget *_prefwin) {
+ GtkWidget *w = prefwin = _prefwin;
+ GtkTreeView *tree = GTK_TREE_VIEW (lookup_widget (w, "pref_pluginlist"));
+ GtkCellRenderer *rend_text = gtk_cell_renderer_text_new ();
+ // Order is: title, index, builtin, hasconfig
+ GtkListStore *store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_BOOLEAN);
+ pluginliststore = store;
+ GtkTreeViewColumn *col = gtk_tree_view_column_new_with_attributes (_("Title"), rend_text, "text", PLUGIN_LIST_COL_TITLE, "weight", PLUGIN_LIST_COL_BUILTIN, NULL);
+ gtk_tree_view_append_column (tree, col);
+ gtk_tree_view_set_headers_visible (tree, FALSE);
+ g_object_set (G_OBJECT (rend_text), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+
+ DB_plugin_t **plugins = deadbeef->plug_get_list ();
+ int i;
+ const char *plugindir = deadbeef->get_system_dir (DDB_SYS_DIR_PLUGIN);
+ for (i = 0; pluginsi; i++) {
+ GtkTreeIter it;
+ const char *pluginpath;
+ gtk_list_store_append (store, &it);
+ pluginpath = deadbeef->plug_get_path_for_plugin_ptr (pluginsi);
+ if (!pluginpath) {
+ pluginpath = plugindir;
+ }
+ gtk_list_store_set (store, &it,
+ PLUGIN_LIST_COL_TITLE, pluginsi->name,
+ PLUGIN_LIST_COL_IDX, i,
+ PLUGIN_LIST_COL_BUILTIN, strstr(pluginpath, plugindir) ? PANGO_WEIGHT_NORMAL : PANGO_WEIGHT_BOLD,
+ PLUGIN_LIST_COL_HASCONFIG, pluginsi->configdialog ? 1 : 0,
+ -1);
+ }
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store), PLUGIN_LIST_COL_TITLE, GTK_SORT_ASCENDING);
+
+ // Create a filtered model, then we switch between the two models to show/hide configurable plugins
+ pluginliststore_filtered = GTK_TREE_MODEL_FILTER(gtk_tree_model_filter_new (GTK_TREE_MODEL(store), NULL));
+ gtk_tree_model_filter_set_visible_column (pluginliststore_filtered, PLUGIN_LIST_COL_HASCONFIG);
+
+ gtk_tree_view_set_model (tree, GTK_TREE_MODEL (store));
+
+ pluginlistmenu = GTK_MENU(create_plugin_list_popup_menu ());
+ gtk_menu_attach_to_widget (GTK_MENU (pluginlistmenu), GTK_WIDGET (tree), NULL);
+
+ // We do this here so one can leave the tabs visible in the Glade designer for convenience.
+ GtkNotebook *notebook = GTK_NOTEBOOK (lookup_widget (w, "plugin_notebook"));
+ gtk_notebook_set_show_tabs(notebook, FALSE);
+ gtk_notebook_set_current_page(notebook, 0);
+
+ // Some styling changes since Glade doesn't support setting it
+#if GTK_CHECK_VERSION(3,12,0)
+ GtkButtonBox *bbox = GTK_BUTTON_BOX (lookup_widget (w, "plugin_tabbtn_hbtnbox"));
+ gtk_button_box_set_layout (bbox, GTK_BUTTONBOX_EXPAND);
+#endif
+}
+
+void
+prefwin_free_plugins (void) {
+ prefwin = NULL;
+ copyright_window = NULL;
+ pluginliststore = NULL;
+ pluginliststore_filtered = NULL;
+}
+
+static void
+show_copyright_window (const char *text, const char *title, GtkWidget **pwindow) {
+ if (*pwindow) {
+ return;
+ }
+ GtkWidget *widget = *pwindow = create_helpwindow ();
+ g_object_set_data (G_OBJECT (widget), "pointer", pwindow);
+ g_signal_connect (widget, "delete_event", G_CALLBACK (on_gtkui_info_window_delete), pwindow);
+ gtk_window_set_title (GTK_WINDOW (widget), title);
+ gtk_window_set_transient_for (GTK_WINDOW (widget), GTK_WINDOW (prefwin));
+ GtkWidget *txt = lookup_widget (widget, "helptext");
+ GtkTextBuffer *buffer = gtk_text_buffer_new (NULL);
+
+ gtk_text_buffer_set_text (buffer, text, (gint)strlen(text));
+ gtk_text_view_set_buffer (GTK_TEXT_VIEW (txt), buffer);
+ g_object_unref (buffer);
+ gtk_widget_show (widget);
+}
+
+void
+on_plug_copyright_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ GtkTreeView *treeview = GTK_TREE_VIEW(lookup_widget (prefwin, "pref_pluginlist"));
+ GtkTreePath *path;
+ GtkTreeViewColumn *col;
+ gtk_tree_view_get_cursor (treeview, &path, &col);
+ if (!path || !col) {
+ // reset
+ return;
+ }
+ int *indices = gtk_tree_path_get_indices (path);
+ DB_plugin_t **plugins = deadbeef->plug_get_list ();
+ DB_plugin_t *p = plugins*indices;
+ g_free (indices);
+ assert (p);
+
+ if (p->copyright) {
+ show_copyright_window (p->copyright, "Copyright", &copyright_window);
+ }
+}
+

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinplugins.h Added

@@ -0,0 +1,33 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef prefwinplugins_h
+#define prefwinplugins_h
+
+void
+prefwin_init_plugins_tab (GtkWidget *prefwin);
+
+void
+prefwin_free_plugins (void);
+
+#endif /* prefwinplugins_h */

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinsound.c Added

@@ -0,0 +1,296 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <gtk/gtk.h>
+#include <string.h>
+#include <stdlib.h>
+#include "../gtkui.h"
+#include "../support.h"
+#include "prefwin.h"
+#include "prefwinsound.h"
+
+static GtkWidget *prefwin;
+static GSList *output_device_names;
+
+static const char *
+_get_output_soundcard_conf_name (void) {
+ static char name100;
+ snprintf (name, sizeof (name), "%s_soundcard", deadbeef->get_output ()->plugin.id);
+ return name;
+}
+
+static void
+gtk_enum_sound_callback (const char *name, const char *desc, void *userdata) {
+ GtkComboBox *combobox = GTK_COMBO_BOX (userdata);
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), desc);
+
+ deadbeef->conf_lock ();
+ const char *curr = deadbeef->conf_get_str_fast (_get_output_soundcard_conf_name(), "default");
+ if (!strcmp (curr, name)) {
+ gtk_combo_box_set_active (combobox, g_slist_length (output_device_names));
+ }
+ deadbeef->conf_unlock ();
+
+ output_device_names = g_slist_append (output_device_names, g_strdup (name));
+}
+
+void
+prefwin_fill_soundcards (void) {
+ if (!prefwin) {
+ return;
+ }
+ GtkComboBox *combobox = GTK_COMBO_BOX (lookup_widget (prefwin, "pref_soundcard"));
+ GtkTreeModel *mdl = gtk_combo_box_get_model (combobox);
+ gtk_list_store_clear (GTK_LIST_STORE (mdl));
+
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Default Audio Device"));
+
+ deadbeef->conf_lock ();
+ const char *s = deadbeef->conf_get_str_fast (_get_output_soundcard_conf_name(), "default");
+ if (!strcmp (s, "default")) {
+ gtk_combo_box_set_active (combobox, 0);
+ }
+ deadbeef->conf_unlock ();
+
+ if (output_device_names) {
+ for (GSList *dev = output_device_names; dev; dev = dev->next) {
+ g_free (dev->data);
+ dev->data = NULL;
+ }
+ g_slist_free (output_device_names);
+ output_device_names = NULL;
+ }
+ output_device_names = g_slist_append (output_device_names, g_strdup ("default"));
+ if (deadbeef->get_output ()->enum_soundcards) {
+ deadbeef->get_output ()->enum_soundcards (gtk_enum_sound_callback, combobox);
+ gtk_widget_set_sensitive (GTK_WIDGET (combobox), TRUE);
+ }
+ else {
+ gtk_widget_set_sensitive (GTK_WIDGET (combobox), FALSE);
+ }
+}
+
+static void
+on_pref_output_plugin_changed (GtkComboBox *combobox,
+ gpointer user_data)
+{
+ int active = gtk_combo_box_get_active (combobox);
+
+ DB_output_t **out_plugs = deadbeef->plug_get_output_list ();
+ DB_output_t *prev = NULL;
+ DB_output_t *new = NULL;
+
+ deadbeef->conf_lock ();
+ const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", "alsa");
+ for (int i = 0; out_plugsi; i++) {
+ if (!strcmp (out_plugsi->plugin.id, outplugname)) {
+ prev = out_plugsi;
+ }
+ if (i == active) {
+ new = out_plugsi;
+ }
+ }
+ deadbeef->conf_unlock ();
+
+ if (!new) {
+ fprintf (stderr, "failed to find output plugin selected in preferences window\n");
+ }
+ else {
+ if (prev != new) {
+ deadbeef->conf_set_str ("output_plugin", new->plugin.id);
+ deadbeef->sendmessage (DB_EV_REINIT_SOUND, 0, 0, 0);
+ }
+ }
+}
+
+static void
+on_pref_soundcard_changed (GtkComboBox *combobox,
+ gpointer user_data)
+{
+ int active = gtk_combo_box_get_active (combobox);
+ if (active >= 0 && active < g_slist_length(output_device_names)) {
+ deadbeef->conf_lock ();
+ const char *soundcard = deadbeef->conf_get_str_fast (_get_output_soundcard_conf_name(), "default");
+ const char *active_name = g_slist_nth_data (output_device_names, active);
+ if (strcmp (soundcard, active_name)) {
+ deadbeef->conf_set_str (_get_output_soundcard_conf_name(), active_name);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+ }
+ deadbeef->conf_unlock ();
+ }
+}
+
+static void
+update_samplerate_widget_sensitivity (int override_sr, int dep_active) {
+ gtk_widget_set_sensitive (lookup_widget (prefwin, "label_direct_sr"), override_sr);
+ gtk_widget_set_sensitive (lookup_widget (prefwin, "comboboxentry_direct_sr"), override_sr);
+ gtk_widget_set_sensitive (lookup_widget (prefwin, "checkbutton_dependent_sr"), override_sr);
+ gtk_widget_set_sensitive (lookup_widget (prefwin, "comboboxentry_sr_mult_48"), override_sr && dep_active);
+ gtk_widget_set_sensitive (lookup_widget (prefwin, "comboboxentry_sr_mult_44"), override_sr && dep_active);
+ gtk_widget_set_sensitive (lookup_widget (prefwin, "label_sr_mult_48"), override_sr && dep_active);
+ gtk_widget_set_sensitive (lookup_widget (prefwin, "label_sr_mult_44"), override_sr && dep_active);
+}
+
+void
+on_checkbutton_sr_override_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int override_sr = gtk_toggle_button_get_active (togglebutton);
+ int dep_active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (prefwin, "checkbutton_dependent_sr")));
+ update_samplerate_widget_sensitivity (override_sr, dep_active);
+ deadbeef->conf_set_int ("streamer.override_samplerate", override_sr);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_checkbutton_dependent_sr_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ int override_sr = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (lookup_widget (prefwin, "checkbutton_sr_override")));
+ int dep_active = gtk_toggle_button_get_active (togglebutton);
+ update_samplerate_widget_sensitivity (override_sr, dep_active);
+ deadbeef->conf_set_int ("streamer.use_dependent_samplerate", dep_active);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+
+static int
+clamp_samplerate (int val) {
+ if (val < 8000) {
+ return 8000;
+ }
+ else if (val > 768000) {
+ return 768000;
+ }
+ return val;
+}
+
+void
+on_comboboxentry_direct_sr_changed (GtkComboBox *combobox,
+ gpointer user_data)
+{
+ int val = atoi(gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combobox)))));
+ int out = clamp_samplerate (val);
+ deadbeef->conf_set_int ("streamer.samplerate", out);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_comboboxentry_sr_mult_48_changed (GtkComboBox *combobox,
+ gpointer user_data)
+{
+ int val = atoi(gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combobox)))));
+ int out = clamp_samplerate (val);
+ deadbeef->conf_set_int ("streamer.samplerate_mult_48", out);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+
+void
+on_comboboxentry_sr_mult_44_changed (GtkComboBox *combobox,
+ gpointer user_data)
+{
+ int val = atoi(gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combobox)))));
+ int out = clamp_samplerate (val);
+ deadbeef->conf_set_int ("streamer.samplerate_mult_44", out);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+prefwin_init_sound_tab (GtkWidget *_prefwin) {
+ GtkWidget *w = prefwin = _prefwin;
+ GtkComboBox *combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_output_plugin"));
+
+ const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", "alsa");
+ DB_output_t **out_plugs = deadbeef->plug_get_output_list ();
+ for (int i = 0; out_plugsi; i++) {
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), out_plugsi->plugin.name);
+ if (!strcmp (outplugname, out_plugsi->plugin.id)) {
+ gtk_combo_box_set_active (combobox, i);
+ }
+ }
+
+ // soundcard (output device) selection
+ prefwin_fill_soundcards ();
+
+ g_signal_connect ((gpointer) combobox, "changed",
+ G_CALLBACK (on_pref_output_plugin_changed),
+ NULL);
+ GtkWidget *pref_soundcard = lookup_widget (prefwin, "pref_soundcard");
+ g_signal_connect ((gpointer) pref_soundcard, "changed",
+ G_CALLBACK (on_pref_soundcard_changed),
+ NULL);
+
+ // 8_to_16
+ prefwin_set_toggle_button("convert8to16", deadbeef->conf_get_int ("streamer.8_to_16", 1));
+
+ // 16_to_24
+ prefwin_set_toggle_button("convert16to24", deadbeef->conf_get_int ("streamer.16_to_24", 0));
+
+ // override bit depth
+ GtkComboBox *combo_bit_override = GTK_COMBO_BOX (lookup_widget (w, "combo_bit_override"));
+ gtk_combo_box_set_active(combo_bit_override, deadbeef->conf_get_int ("streamer.bit_override", 0));
+
+ // override samplerate checkbox
+ int override_sr = deadbeef->conf_get_int ("streamer.override_samplerate", 0);
+ prefwin_set_toggle_button ("checkbutton_sr_override", override_sr);
+
+ // direct/dependent samplerate radio buttons
+ int use_dependent_samplerate = deadbeef->conf_get_int ("streamer.use_dependent_samplerate", 0);
+ prefwin_set_toggle_button ("checkbutton_dependent_sr", use_dependent_samplerate);
+
+ // direct samplerate value
+ gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (lookup_widget (w, "comboboxentry_direct_sr")))), deadbeef->conf_get_str_fast ("streamer.samplerate", "44100"));
+ gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (lookup_widget (w, "comboboxentry_sr_mult_48")))), deadbeef->conf_get_str_fast ("streamer.samplerate_mult_48", "48000"));
+ gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (lookup_widget (w, "comboboxentry_sr_mult_44")))), deadbeef->conf_get_str_fast ("streamer.samplerate_mult_44", "44100"));
+
+ update_samplerate_widget_sensitivity (override_sr, use_dependent_samplerate);
+}
+
+void
+on_convert8to16_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("streamer.8_to_16", gtk_toggle_button_get_active (togglebutton));
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_convert16to24_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ deadbeef->conf_set_int ("streamer.16_to_24", gtk_toggle_button_get_active (togglebutton));
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+void
+on_combo_bit_override_changed (GtkComboBox *combobox,
+ gpointer user_data)
+{
+ int active = gtk_combo_box_get_active (combobox);
+ deadbeef->conf_set_int ("streamer.bit_override", active);
+ deadbeef->sendmessage (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/prefwin/prefwinsound.h Added

@@ -0,0 +1,30 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef prefwinsound_h
+#define prefwinsound_h
+
+void
+prefwin_init_sound_tab (GtkWidget *prefwin);
+
+#endif /* prefwinsound_h */

deadbeef-0.6.2.tar.bz2/plugins/gtkui/progress.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/progress.c Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/progress.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/progress.h Changed

@@ -1,19 +1,24 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
 
- 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 software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
 
- 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.
+ 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:
 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
 
 #ifndef __PROGRESS_H

deadbeef-1.9.6.tar.bz2/plugins/gtkui/rg.c Added

@@ -0,0 +1,766 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include <sys/time.h>
+#include <math.h>
+#include "interface.h"
+#include "support.h"
+#include <deadbeef/deadbeef.h>
+
+#include "../rg_scanner/rg_scanner.h"
+
+extern DB_functions_t *deadbeef;
+
+typedef struct rgs_controller_s {
+ GtkWidget *progress_window;
+ GtkWidget *results_window;
+ GtkWidget *update_progress_window;
+
+ ddb_rg_scanner_settings_t _rg_settings;
+ ddb_rg_scanner_t *_rg;
+ int _abort_flag;
+ struct timeval _rg_start_tv;
+ int _abortTagWriting;
+ struct rgs_controller_s *next;
+} rgs_controller_t;
+
+static rgs_controller_t *g_rgControllers;
+static char *_title_tf;
+static ddb_rg_scanner_t *_rg;
+
+typedef struct {
+ rgs_controller_t *ctl;
+ int current;
+} progress_data_t;
+
+static float
+_getScanSpeed (uint64_t cd_samples_processed, float time) {
+ return cd_samples_processed / 44100.f / time;
+}
+
+static void
+_formatTime (float sec, int extraPrecise, char *buf, int bufsize) {
+ int hr;
+ int min;
+ hr = (int)floor (sec / 3600);
+ sec -= hr * 3600;
+ min = (int)floor (sec / 60);
+ sec -= min * 60;
+
+ if (extraPrecise) {
+ if (hr > 0) {
+ snprintf (buf, bufsize, "%d:%02d:%0.3f", hr, min, sec);
+ return;
+ }
+ snprintf (buf, bufsize, "%02d:%0.3f", min, sec);
+ return;
+ }
+ if (hr > 0) {
+ snprintf (buf, bufsize, "%d:%02d:%02d", hr, min, (int)floor(sec));
+ return;
+ }
+ snprintf (buf, bufsize, "%02d:%02d", min, (int)floor(sec));
+}
+
+
+static void
+_ctl_progress (rgs_controller_t *ctl, int current) {
+ deadbeef->pl_lock ();
+ const char *uri = deadbeef->pl_find_meta (ctl->_rg_settings.trackscurrent, ":URI");
+
+ GtkWidget *progressText = lookup_widget (ctl->progress_window, "rg_scan_progress_file");
+ gtk_entry_set_text (GTK_ENTRY (progressText), uri);
+ GtkWidget *progressBar = lookup_widget (ctl->progress_window, "rg_scan_progress_bar");
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressBar), (double)current/ctl->_rg_settings.num_tracks);
+ GtkWidget *statusLabel = lookup_widget (ctl->progress_window, "rg_scan_progress_status");
+
+ struct timeval tv;
+ gettimeofday (&tv, NULL);
+ float timePassed = (tv.tv_sec-ctl->_rg_start_tv.tv_sec) + (tv.tv_usec - ctl->_rg_start_tv.tv_usec) / 1000000.f;
+ if (timePassed > 0 && ctl->_rg_settings.cd_samples_processed > 0 && current > 0) {
+ float speed = _getScanSpeed (ctl->_rg_settings.cd_samples_processed, timePassed);
+ float predicted_samples_total = ctl->_rg_settings.cd_samples_processed / (float)current * ctl->_rg_settings.num_tracks;
+
+ float frac = (float)((double)predicted_samples_total / ctl->_rg_settings.cd_samples_processed);
+ float est = timePassed * frac;
+
+ char elapsed50;
+ _formatTime (timePassed, 0, elapsed, sizeof (elapsed));
+ char estimated50;
+ _formatTime (est, 0, estimated, sizeof (estimated));
+
+ char status200;
+ snprintf (status, sizeof (status), "Time elapsed: %s, estimated: %s, speed: %0.2fx (%i of %i files)", elapsed, estimated, speed, current, ctl->_rg_settings.num_tracks);
+ gtk_label_set_text (GTK_LABEL (statusLabel), status);
+ }
+ else {
+ gtk_label_set_text (GTK_LABEL (statusLabel), "");
+ }
+
+ deadbeef->pl_unlock ();
+}
+
+static gboolean
+_scan_progress_cb (void *ctx) {
+ progress_data_t *dt = ctx;
+ _ctl_progress (dt->ctl, dt->current);
+ free (dt);
+ return FALSE;
+}
+
+static void
+_scan_progress (int current, void *user_data) {
+ progress_data_t *dt = calloc (1, sizeof (progress_data_t));
+ dt->current = current;
+ dt->ctl = user_data;
+ g_idle_add (_scan_progress_cb, dt);
+}
+
+static void
+_ctl_dismiss (rgs_controller_t *ctl) {
+ if (ctl->_rg_settings.tracks) {
+ for (int i = 0; i < ctl->_rg_settings.num_tracks; i++) {
+ deadbeef->pl_item_unref (ctl->_rg_settings.tracksi);
+ }
+ free (ctl->_rg_settings.tracks);
+ }
+ if (ctl->_rg_settings.results) {
+ free (ctl->_rg_settings.results);
+ }
+ memset (&ctl->_rg_settings, 0, sizeof (ctl->_rg_settings));
+
+ // remove from list 
+ rgs_controller_t *prev = NULL;
+ for (rgs_controller_t *c = g_rgControllers; c; c = c->next) {
+ if (c == ctl) {
+ if (prev) {
+ prev->next = ctl->next;
+ }
+ else {
+ g_rgControllers = ctl->next;
+ }
+ break;
+ }
+ prev = c;
+ }
+
+ if (ctl->progress_window) {
+ gtk_widget_destroy (ctl->progress_window);
+ ctl->progress_window = NULL;
+ }
+
+ if (ctl->results_window) {
+ gtk_widget_destroy (ctl->results_window);
+ ctl->results_window = NULL;
+ }
+
+ if (ctl->update_progress_window) {
+ gtk_widget_destroy (ctl->update_progress_window);
+ ctl->update_progress_window = NULL;
+ }
+
+ free (ctl);
+}
+
+static void
+on_results_cancel_btn (GtkButton *button, gpointer user_data) {
+ _ctl_dismiss (user_data);
+}
+
+static void
+on_results_delete_event (GtkWidget *window,GdkEvent *event, gpointer user_data) {
+ _ctl_dismiss (user_data);
+}
+
+typedef struct {
+ rgs_controller_t *ctl;
+ int current;
+} updateProgressData_t;
+
+static gboolean
+_setUpdateProgress (void *ctx) {
+ updateProgressData_t *dt = ctx;
+ rgs_controller_t *ctl = dt->ctl;
+ const char *path = deadbeef->pl_find_meta_raw (ctl->_rg_settings.tracksdt->current, ":URI");
+ GtkWidget *progressText = lookup_widget (ctl->update_progress_window, "rg_scan_progress_file");
+ gtk_entry_set_text (GTK_ENTRY (progressText), path);
+
+ GtkWidget *progressBar = lookup_widget (ctl->update_progress_window, "rg_scan_progress_bar");
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressBar), (double)dt->current/ctl->_rg_settings.num_tracks);
+ free (dt);
+
+ return FALSE;
+}
+
+static gboolean
+_ctl_dismiss_cb (void *ctx) {
+ _ctl_dismiss (ctx);
+ return FALSE;
+}
+
+static void
+_update_tags (void *ctx) {
+ rgs_controller_t *ctl = ctx;
+
+ for (int i = 0; i < ctl->_rg_settings.num_tracks; i++) {
+ if (ctl->_abortTagWriting) {
+ break;
+ }
+
+ if (ctl->_rg_settings.resultsi.scan_result == DDB_RG_SCAN_RESULT_SUCCESS) {
+ updateProgressData_t *dt = calloc (1, sizeof (updateProgressData_t));
+ dt->ctl = ctl;
+ dt->current = i;
+
+ g_idle_add (_setUpdateProgress, dt);
+ 
+ uint32_t flags = (1<<DDB_REPLAYGAIN_TRACKGAIN)|(1<<DDB_REPLAYGAIN_TRACKPEAK);
+ if (ctl->_rg_settings.mode != DDB_RG_SCAN_MODE_TRACK) {
+ flags |= (1<<DDB_REPLAYGAIN_ALBUMGAIN)|(1<<DDB_REPLAYGAIN_ALBUMPEAK);
+ }
+ _rg->apply (ctl->_rg_settings.tracksi, flags, ctl->_rg_settings.resultsi.track_gain, ctl->_rg_settings.resultsi.track_peak, ctl->_rg_settings.resultsi.album_gain, ctl->_rg_settings.resultsi.album_peak);
+ }
+ }
+
+ deadbeef->pl_save_all ();
+
+ g_idle_add (_ctl_dismiss_cb, ctl);
+}
+
+static void
+on_update_progress_cancel_btn (GtkWidget *button, void *user_data) {
+ rgs_controller_t *ctl = user_data;
+ ctl->_abortTagWriting = 1;
+}
+
+static void
+on_update_progress_delete_event (GtkWidget *window, GdkEvent *event, void *user_data) {
+ rgs_controller_t *ctl = user_data;
+ ctl->_abortTagWriting = 1;
+}
+
+static void
+on_results_update_btn (GtkButton *button, gpointer user_data) {
+ rgs_controller_t *ctl = user_data;
+
+ gtk_widget_hide (ctl->results_window);
+
+ ctl->update_progress_window = create_rg_scan_progress ();
+
+ GtkWidget *cancel_btn = lookup_widget (ctl->update_progress_window, "rg_scan_progress_cancel");
+ g_signal_connect ((gpointer) cancel_btn, "clicked",
+ G_CALLBACK (on_update_progress_cancel_btn),
+ ctl);
+ g_signal_connect ((gpointer) ctl->update_progress_window, "delete-event",
+ G_CALLBACK (on_update_progress_delete_event),
+ ctl);
+
+ gtk_window_set_title (GTK_WINDOW (ctl->update_progress_window), _("Updating File Tags Progress"));
+ gtk_widget_show (ctl->update_progress_window);
+ ctl->_abortTagWriting = 0;
+
+ deadbeef->thread_detach (deadbeef->thread_start (_update_tags, ctl));
+}
+
+void _ctl_scanFinished (rgs_controller_t *ctl) {
+ struct timeval tv;
+ gettimeofday (&tv, NULL);
+ float timePassed = (tv.tv_sec-ctl->_rg_start_tv.tv_sec) + (tv.tv_usec - ctl->_rg_start_tv.tv_usec) / 1000000.f;
+
+ char elapsed50;
+ _formatTime (timePassed, 1, elapsed, sizeof (elapsed));
+
+ float speed = _getScanSpeed (ctl->_rg_settings.cd_samples_processed, timePassed);
+
+ gtk_widget_hide (ctl->progress_window);
+
+ ctl->results_window = create_rg_scan_results ();
+ GtkWidget *status = lookup_widget (ctl->results_window, "rg_scan_results_status");
+ char statusText200;
+ snprintf (statusText, sizeof (statusText), "Calculated in: %s, speed: %0.2fx", elapsed, speed);
+ gtk_label_set_text (GTK_LABEL (status), statusText);
+ gtk_widget_show (ctl->results_window);
+
+ GtkTreeView *tree = GTK_TREE_VIEW (lookup_widget (ctl->results_window, "rg_scan_results_list"));
+ GtkListStore *store = gtk_list_store_new (6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+ gtk_tree_view_append_column (tree, gtk_tree_view_column_new_with_attributes (_("Name"), gtk_cell_renderer_text_new (), "text", 0, NULL));
+ gtk_tree_view_append_column (tree, gtk_tree_view_column_new_with_attributes (_("Status"), gtk_cell_renderer_text_new (), "text", 1, NULL));
+ gtk_tree_view_append_column (tree, gtk_tree_view_column_new_with_attributes (_("Album Gain"), gtk_cell_renderer_text_new (), "text", 2, NULL));
+ gtk_tree_view_append_column (tree, gtk_tree_view_column_new_with_attributes (_("Track Gain"), gtk_cell_renderer_text_new (), "text", 3, NULL));
+ gtk_tree_view_append_column (tree, gtk_tree_view_column_new_with_attributes (_("Album Peak"), gtk_cell_renderer_text_new (), "text", 4, NULL));
+ gtk_tree_view_append_column (tree, gtk_tree_view_column_new_with_attributes (_("Track Peak"), gtk_cell_renderer_text_new (), "text", 5, NULL));
+
+ const char *status_str = {
+ _("Success"),
+ _("File not found"),
+ _("Invalid file"),
+ };
+
+ for (int i = 0; i < ctl->_rg_settings.num_tracks; i++) {
+ GtkTreeIter it;
+ gtk_list_store_append (store, &it);
+
+ ddb_tf_context_t ctx;
+ memset (&ctx, 0, sizeof(ctx));
+ ctx._size = sizeof (ddb_tf_context_t);
+ ctx.it = ctl->_rg_settings.tracksi;
+
+ char name100;
+ deadbeef->tf_eval (&ctx, _title_tf, name, sizeof (name));
+
+ const char *status = -ctl->_rg_settings.resultsi.scan_result < 3 ? status_str-ctl->_rg_settings.resultsi.scan_result : "Unknown error";
+
+ char albumGain50 = "";
+ if (ctl->_rg_settings.mode != DDB_RG_SCAN_MODE_TRACK) {
+ snprintf (albumGain, sizeof (albumGain), "%0.2f dB", ctl->_rg_settings.resultsi.album_gain);
+ }
+
+ char trackGain50 = "";
+ snprintf (trackGain, sizeof (trackGain), "%0.2f dB", ctl->_rg_settings.resultsi.track_gain);
+
+ char albumPeak50 = "";
+ if (ctl->_rg_settings.mode != DDB_RG_SCAN_MODE_TRACK) {
+ snprintf (albumPeak, sizeof (albumPeak), "%0.6f", ctl->_rg_settings.resultsi.album_peak);
+ }
+
+ char trackPeak50 = "";
+ snprintf (trackPeak, sizeof (trackPeak), "%0.6f", ctl->_rg_settings.resultsi.track_peak);
+
+ gtk_list_store_set (store, &it, 0, name, 1, status, 2, albumGain, 3, trackGain, 4, albumPeak, 5, trackPeak, -1);
+ }
+ gtk_tree_view_set_model (tree, GTK_TREE_MODEL (store));
+
+ GtkWidget *cancel_btn = lookup_widget (ctl->results_window, "rg_scan_results_cancel");
+ GtkWidget *update_btn = lookup_widget (ctl->results_window, "rg_scan_results_update");
+ g_signal_connect ((gpointer) cancel_btn, "clicked",
+ G_CALLBACK (on_results_cancel_btn),
+ ctl);
+ g_signal_connect ((gpointer) ctl->results_window, "delete-event",
+ G_CALLBACK (on_results_delete_event),
+ ctl);
+ g_signal_connect ((gpointer) update_btn, "clicked",
+ G_CALLBACK (on_results_update_btn),
+ ctl);
+}
+
+
+static gboolean
+_rgs_finished_cb (void *ctx) {
+ rgs_controller_t *ctl = ctx;
+ if (ctl->_abort_flag) {
+ _ctl_dismiss (ctl);
+ return FALSE;
+ }
+ _ctl_scanFinished (ctl);
+ return FALSE;
+}
+
+static void
+_rgs_job (void *ctx) {
+ rgs_controller_t *ctl = ctx;
+ _rg->scan (&ctl->_rg_settings);
+ deadbeef->background_job_decrement ();
+
+ g_idle_add (_rgs_finished_cb, ctl);
+}
+
+static void
+on_progress_cancel_btn (GtkButton *button, gpointer user_data) {
+ rgs_controller_t *ctl = user_data;
+ ctl->_abort_flag = 1;
+}
+
+static void
+on_progress_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) {
+ rgs_controller_t *ctl = user_data;
+ ctl->_abort_flag = 1;
+}
+
+static int
+_init_plugin (void) {
+ if (_rg) {
+ return 1;
+ }
+
+ _rg = (ddb_rg_scanner_t *)deadbeef->plug_get_for_id ("rg_scanner");
+ if (_rg && _rg->misc.plugin.version_major != 1) {
+ _rg = NULL;
+ deadbeef->log ("Invalid version of rg_scanner plugin");
+ return 0;
+ }
+
+ if (!_rg) {
+ deadbeef->log ("ReplayGain plugin is not found");
+ return 0;
+ }
+
+ return 1;
+}
+
+static void
+runScanner (int mode, DB_playItem_t ** tracks, int count) {
+ if (!_init_plugin ()) {
+ return;
+ }
+
+ deadbeef->background_job_increment ();
+
+ rgs_controller_t *ctl = calloc (1, sizeof (rgs_controller_t));
+
+ if (!_title_tf) {
+ _title_tf = deadbeef->tf_compile ("%title%");
+ }
+
+ ctl->progress_window = create_rg_scan_progress ();
+ GtkWidget *cancel_btn = lookup_widget (ctl->progress_window, "rg_scan_progress_cancel");
+ g_signal_connect ((gpointer) cancel_btn, "clicked",
+ G_CALLBACK (on_progress_cancel_btn),
+ ctl);
+ g_signal_connect ((gpointer) ctl->progress_window, "delete-event",
+ G_CALLBACK (on_progress_delete_event),
+ ctl);
+
+ gtk_widget_show (ctl->progress_window);
+
+ memset (&ctl->_rg_settings, 0, sizeof (ddb_rg_scanner_settings_t));
+ ctl->_rg_settings._size = sizeof (ddb_rg_scanner_settings_t);
+ ctl->_rg_settings.mode = mode;
+ ctl->_rg_settings.tracks = tracks;
+ ctl->_rg_settings.num_tracks = count;
+ ctl->_rg_settings.ref_loudness = deadbeef->conf_get_float ("rg_scanner.target_db", DDB_RG_SCAN_DEFAULT_LOUDNESS);
+ ctl->_rg_settings.results = calloc (count, sizeof (ddb_rg_scanner_result_t));
+ ctl->_rg_settings.pabort = &ctl->_abort_flag;
+ ctl->_rg_settings.progress_callback = _scan_progress;
+ ctl->_rg_settings.progress_cb_user_data = ctl;
+
+ gettimeofday (&ctl->_rg_start_tv, NULL);
+ _ctl_progress (ctl, 0);
+
+ // FIXME: need to use some sort of job queue
+ uint64_t tid = deadbeef->thread_start (_rgs_job, ctl);
+ deadbeef->thread_detach (tid);
+
+ ctl->next = g_rgControllers;
+ g_rgControllers = ctl;
+}
+
+static DB_playItem_t **
+_get_action_track_list (DB_plugin_action_t *action, int ctx, int *pcount, int onlyWithRgInfo) {
+ int count = 0;
+ DB_playItem_t **tracks = NULL;
+
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ if (!plt) {
+ return NULL;
+ }
+
+ ddb_replaygain_settings_t s;
+ s._size = sizeof (ddb_replaygain_settings_t);
+
+ DB_playItem_t *playing_track = NULL;
+ if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ deadbeef->streamer_get_playing_track_safe ();
+ }
+
+ deadbeef->pl_lock ();
+
+ if (ctx == DDB_ACTION_CTX_SELECTION) {
+ int tc = deadbeef->plt_getselcount (plt);
+ if (!tc) {
+ deadbeef->pl_unlock ();
+ deadbeef->plt_unref (plt);
+ if (playing_track != NULL) {
+ deadbeef->pl_item_unref (playing_track);
+ }
+ return NULL;
+ }
+ tracks = calloc (tc, sizeof (DB_playItem_t *));
+
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ const char *uri = deadbeef->pl_find_meta (it, ":URI");
+
+ if (deadbeef->pl_is_selected (it) && deadbeef->is_local_file (uri)) {
+ int hasRgTags = 0;
+ if (onlyWithRgInfo) {
+ deadbeef->replaygain_init_settings (&s, it);
+ if (s.has_album_gain || s.has_track_gain) {
+ hasRgTags = 1;
+ }
+ }
+
+ if (!onlyWithRgInfo || hasRgTags) {
+ trackscount++ = it;
+ deadbeef->pl_item_ref (it);
+ }
+ }
+
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ }
+ else if (ctx == DDB_ACTION_CTX_PLAYLIST) {
+ int tc = deadbeef->plt_get_item_count (plt, PL_MAIN);
+ if (!tc) {
+ deadbeef->pl_unlock ();
+ deadbeef->plt_unref (plt);
+ if (playing_track != NULL) {
+ deadbeef->pl_item_unref (playing_track);
+ }
+ return NULL;
+ }
+ tracks = calloc (tc, sizeof (DB_playItem_t *));
+
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ const char *uri = deadbeef->pl_find_meta (it, ":URI");
+ if (deadbeef->is_local_file (uri)) {
+ int hasRgTags = 0;
+ if (onlyWithRgInfo) {
+ deadbeef->replaygain_init_settings (&s, it);
+ if (s.has_album_gain || s.has_track_gain) {
+ hasRgTags = 1;
+ }
+ }
+
+ if (!onlyWithRgInfo || hasRgTags) {
+ trackscount++ = it;
+ deadbeef->pl_item_ref (it);
+ }
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+
+ deadbeef->pl_save_current ();
+ }
+ else if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ if (playing_track) {
+ const char *uri = deadbeef->pl_find_meta (playing_track, ":URI");
+ if (deadbeef->is_local_file (uri)) {
+ int hasRgTags = 0;
+ if (onlyWithRgInfo) {
+ deadbeef->replaygain_init_settings (&s, playing_track);
+ if (s.has_album_gain || s.has_track_gain) {
+ hasRgTags = 1;
+ }
+ }
+
+ if (!onlyWithRgInfo || hasRgTags) {
+ count = 1;
+ tracks = calloc (1, sizeof (DB_playItem_t *));
+ tracks0 = playing_track;
+ deadbeef->pl_item_ref (playing_track);
+ }
+ }
+ }
+ }
+ deadbeef->pl_unlock ();
+ deadbeef->plt_unref (plt);
+ if (playing_track != NULL) {
+ deadbeef->pl_item_unref (playing_track);
+ }
+
+ if (!count) {
+ free (tracks);
+ return NULL;
+ }
+ *pcount = count;
+ return tracks;
+}
+
+int
+action_rg_scan_per_file_handler (struct DB_plugin_action_s *action, int ctx) {
+ int count;
+ DB_playItem_t **tracks = _get_action_track_list (action, ctx, &count, 0);
+
+ if (!tracks) {
+ return 0;
+ }
+
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref (plt);
+ }
+
+ runScanner (DDB_RG_SCAN_MODE_TRACK, tracks, count);
+ return 0;
+}
+
+int
+action_rg_scan_selection_as_albums_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ int count;
+ DB_playItem_t **tracks = _get_action_track_list (action, ctx, &count, 0);
+
+ if (!tracks) {
+ return 0;
+ }
+
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref (plt);
+ }
+
+ runScanner (DDB_RG_SCAN_MODE_ALBUMS_FROM_TAGS, tracks, count);
+ return 0;
+}
+
+int
+action_rg_scan_selection_as_album_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ int count;
+ DB_playItem_t **tracks = _get_action_track_list (action, ctx, &count, 0);
+
+ if (!tracks) {
+ return 0;
+ }
+
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref (plt);
+ }
+
+ runScanner (DDB_RG_SCAN_MODE_SINGLE_ALBUM, tracks, count);
+ return 0;
+}
+
+static void
+_remove_rg_tags (void *ctx) {
+ rgs_controller_t *ctl = ctx;
+
+ for (int i = 0; i < ctl->_rg_settings.num_tracks; i++) {
+ _rg->remove (ctl->_rg_settings.tracksi);
+ if (ctl->_abortTagWriting) {
+ break;
+ }
+
+ updateProgressData_t *dt = calloc (1, sizeof (updateProgressData_t));
+ dt->ctl = ctl;
+ dt->current = i;
+
+ g_idle_add (_setUpdateProgress, dt);
+ }
+
+ deadbeef->pl_save_all ();
+ deadbeef->background_job_decrement ();
+
+ g_idle_add (_ctl_dismiss_cb, ctl);
+}
+
+int
+action_rg_remove_info_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ if (!_init_plugin ()) {
+ return -1;
+ }
+
+ int count;
+ DB_playItem_t **tracks = _get_action_track_list (action, ctx, &count, 1);
+
+ if (!tracks) {
+ return 0;
+ }
+
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref (plt);
+ }
+
+ deadbeef->background_job_increment ();
+
+ rgs_controller_t *ctl = calloc (1, sizeof (rgs_controller_t));
+ memset (&ctl->_rg_settings, 0, sizeof (ddb_rg_scanner_settings_t));
+ ctl->_rg_settings._size = sizeof (ddb_rg_scanner_settings_t);
+ ctl->_rg_settings.tracks = tracks;
+ ctl->_rg_settings.num_tracks = count;
+ ctl->update_progress_window = create_rg_scan_progress ();
+
+ gtk_widget_show (ctl->update_progress_window);
+ ctl->_abortTagWriting = 0;
+
+ deadbeef->thread_detach (deadbeef->thread_start (_remove_rg_tags, ctl));
+
+ return 0;
+}
+
+int
+action_scan_all_tracks_without_rg_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ int count = 0;
+ DB_playItem_t **tracks = NULL;
+
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ if (!plt) {
+ return 0;
+ }
+
+ ddb_replaygain_settings_t s;
+ s._size = sizeof (ddb_replaygain_settings_t);
+
+ deadbeef->pl_lock ();
+
+ int tc = deadbeef->plt_get_item_count (plt, PL_MAIN);
+ if (!tc) {
+ deadbeef->pl_unlock ();
+ deadbeef->plt_unref (plt);
+ return 0;
+ }
+ tracks = calloc (tc, sizeof (DB_playItem_t *));
+ 
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ const char *uri = deadbeef->pl_find_meta (it, ":URI");
+
+ if (deadbeef->is_local_file (uri)) {
+ deadbeef->replaygain_init_settings (&s, it);
+ if (!s.has_track_gain) {
+ trackscount++ = it;
+ deadbeef->pl_item_ref (it);
+ }
+ }
+
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+
+ deadbeef->pl_unlock ();
+
+ if (count > 0) {
+ deadbeef->plt_modified (plt);
+ }
+
+ deadbeef->plt_unref (plt);
+
+ if (count > 0) {
+ runScanner (DDB_RG_SCAN_MODE_TRACK, tracks, count);
+ }
+
+ return 0;
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/rg.h Added

@@ -0,0 +1,40 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+int
+action_scan_all_tracks_without_rg_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx);
+
+int
+action_rg_scan_per_file_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx);
+
+int
+action_rg_remove_info_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx);
+
+int
+action_rg_scan_selection_as_albums_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx);
+
+int
+action_rg_scan_selection_as_album_handler (struct DB_plugin_action_s *action, ddb_action_context_t ctx);
+
+
+

deadbeef-0.6.2.tar.bz2/plugins/gtkui/search.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/search.c Changed

@@ -1,20 +1,26 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
 
- 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 software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
 
- 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.
+ 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:
 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -24,177 +30,416 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
+
+#include <deadbeef/deadbeef.h>
 #include "../../gettext.h"
 
 #include "callbacks.h"
+#include "gtkui.h"
 #include "interface.h"
-#include "support.h"
-
+#include "playlist/ddblistview.h"
+#include "playlist/mainplaylist.h"
+#include "playlist/playlistcontroller.h"
+#include "playlist/playlistrenderer.h"
+#include "playlist/plcommon.h"
+#include "plmenu.h"
 #include "search.h"
-#include "ddblistview.h"
-#include "plcommon.h"
-#include "../../deadbeef.h"
-#include "mainplaylist.h"
-
-#include "gtkui.h"
-
+#include "support.h"
 #include "wingeom.h"
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
 
-extern DB_functions_t *deadbeef; // defined in gtkui.c
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
-extern GtkWidget *searchwin;
-extern GtkWidget *mainwin;
+static GtkWidget *searchwin;
+static playlist_controller_t *_playlist_controller;
+static int refresh_source_id = 0;
+static char *window_title_bytecode = NULL;
+
+static DdbListview *
+playlist_visible (void) {
+ if (searchwin) {
+ GdkWindow *window = gtk_widget_get_window(searchwin);
+ if (window) {
+ if (!(gdk_window_get_state(window) & GDK_WINDOW_STATE_ICONIFIED) && gtk_widget_get_visible(searchwin)) {
+ return DDB_LISTVIEW(lookup_widget(searchwin, "searchlist"));
+ }
+ }
+ }
+ return NULL;
+}
+
+static void
+search_process (DdbListview *listview, ddb_playlist_t *plt) {
+ GtkEntry *entry = GTK_ENTRY(lookup_widget(searchwin, "searchentry"));
+ const gchar *text = gtk_entry_get_text(entry);
+ deadbeef->plt_search_process2 (plt, text, 0);
+ ddb_listview_col_sort_update (listview);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_SEARCHRESULT, 0);
+
+ int row = deadbeef->pl_get_cursor (PL_SEARCH);
+ if (row >= deadbeef->pl_getcount (PL_SEARCH)) {
+ deadbeef->pl_set_cursor (PL_SEARCH, deadbeef->pl_getcount (PL_SEARCH) - 1);
+ }
+ ddb_listview_list_setup (listview, ddb_listview_get_scroll_pos(listview));
+ ddb_listview_refresh (listview, DDB_REFRESH_LIST);
+
+ char title1024 = "";
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .plt = plt,
+ .iter = PL_SEARCH
+ };
+ deadbeef->tf_eval (&ctx, window_title_bytecode, title, sizeof (title));
+
+ gtk_window_set_title (GTK_WINDOW (searchwin), title);
+
+}
 
 static gboolean
-unlock_search_columns_cb (void *ctx) {
- ddb_listview_lock_columns (DDB_LISTVIEW (lookup_widget (searchwin, "searchlist")), 0);
+search_start_cb (gpointer p) {
+ GtkWidget *entry = lookup_widget (searchwin, "searchentry");
+ if (!playlist_visible ()) {
+ DdbListview *listview = DDB_LISTVIEW (lookup_widget (searchwin, "searchlist"));
+ refresh_source_id = 0;
+ ddb_listview_clear_sort (listview);
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ deadbeef->plt_search_reset (plt);
+ deadbeef->plt_deselect_all (plt);
+ deadbeef->plt_unref (plt);
+ }
+ wingeom_restore (searchwin, "searchwin", -1, -1, 450, 150, 0);
+ gtk_widget_show (searchwin);
+ gtk_entry_set_text (GTK_ENTRY (entry), "");
+ ddb_listview_refresh (listview, DDB_REFRESH_CONFIG);
+ }
+ gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
+ gtk_widget_grab_focus (entry);
+ gtk_window_present (GTK_WINDOW (searchwin));
 return FALSE;
 }
 
 void
 search_start (void) {
- ddb_listview_lock_columns (DDB_LISTVIEW (lookup_widget (searchwin, "searchlist")), 1);
- wingeom_restore (searchwin, "searchwin", -1, -1, 450, 150, 0);
- gtk_entry_set_text (GTK_ENTRY (lookup_widget (searchwin, "searchentry")), "");
- gtk_widget_grab_focus (lookup_widget (searchwin, "searchentry"));
- gtk_widget_show (searchwin);
- gtk_window_present (GTK_WINDOW (searchwin));
- g_idle_add (unlock_search_columns_cb, NULL);
- search_refresh ();
- main_refresh ();
+ if (searchwin) {
+ g_idle_add (search_start_cb, NULL);
+ }
 }
 
 void
 search_destroy (void) {
- gtk_widget_destroy (searchwin);
- searchwin = NULL;
-}
+ if (searchwin) {
+ ddb_listview_size_columns_without_scrollbar (DDB_LISTVIEW (lookup_widget (searchwin, "searchlist")));
+ gtk_widget_destroy (searchwin);
+ searchwin = NULL;
 
-void
-search_process (const char *text) {
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- deadbeef->plt_search_process (plt, text);
- deadbeef->plt_unref (plt);
-
- int row = deadbeef->pl_get_cursor (PL_SEARCH);
- if (row >= deadbeef->pl_getcount (PL_SEARCH)) {
- deadbeef->pl_set_cursor (PL_SEARCH, deadbeef->pl_getcount (PL_SEARCH) - 1);
+ playlist_controller_free(_playlist_controller);
+ _playlist_controller = NULL;
+ }
+ if (window_title_bytecode) {
+ deadbeef->tf_free (window_title_bytecode);
+ window_title_bytecode = NULL;
 }
 }
 
-void
-on_searchentry_changed (GtkEditable *editable,
- gpointer user_data)
-{
- search_refresh ();
- main_refresh ();
+static DB_playItem_t *
+next_playitem (DB_playItem_t *it) {
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_SEARCH);
+ deadbeef->pl_item_unref (it);
+ return next;
 }
 
-void
-search_refresh (void) {
- if (searchwin && gtk_widget_get_visible (searchwin)) {
- GtkEntry *entry = GTK_ENTRY (lookup_widget (searchwin, "searchentry"));
- const gchar *text = gtk_entry_get_text (entry);
- search_process (text);
- GtkWidget *pl = lookup_widget (searchwin, "searchlist");
- ddb_listview_refresh (DDB_LISTVIEW (pl), DDB_REFRESH_VSCROLL | DDB_REFRESH_LIST | DDB_LIST_CHANGED);
+static gboolean
+paused_cb (gpointer p) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe();
+ if (it) {
+ int idx = deadbeef->pl_get_idx_of_iter(it, PL_SEARCH);
+ if (idx != -1) {
+ ddb_listview_draw_row(DDB_LISTVIEW(p), idx, (DdbListviewIter)it);
+ }
+ deadbeef->pl_item_unref(it);
 }
+ return FALSE;
 }
 
-void
-search_redraw (void) {
- if (searchwin && gtk_widget_get_visible (searchwin)) {
- GtkWidget *pl = lookup_widget (searchwin, "searchlist");
- ddb_listview_refresh (DDB_LISTVIEW (pl), DDB_REFRESH_VSCROLL | DDB_REFRESH_LIST | DDB_LIST_CHANGED);
+static gboolean
+row_redraw_cb (gpointer p) {
+ DB_playItem_t *it = (DB_playItem_t *)p;
+ DdbListview *listview = playlist_visible();
+ if (listview) {
+ int idx = deadbeef->pl_get_idx_of_iter(it, PL_SEARCH);
+ if (idx != -1) {
+ ddb_listview_draw_row(listview, idx, it);
+ }
 }
+ deadbeef->pl_item_unref(it);
+ return FALSE;
 }
 
-///////// searchwin header handlers
-
-gboolean
-on_searchheader_button_press_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data)
-{
-
- return FALSE;
+static gboolean
+list_redraw_cb (gpointer p) {
+ ddb_listview_refresh (DDB_LISTVIEW(p), DDB_REFRESH_LIST);
+ return FALSE;
 }
 
+static gboolean
+header_redraw_cb (gpointer p) {
+ ddb_listview_refresh (DDB_LISTVIEW(p), DDB_REFRESH_COLUMNS);
+ return FALSE;
+}
 
-gboolean
-on_searchheader_button_release_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data)
-{
+static gboolean
+songstarted_cb (gpointer p) {
+ DB_playItem_t *it = p;
+ DdbListview *listview = playlist_visible();
+ if (listview) {
+ int idx = deadbeef->pl_get_idx_of_iter (it, PL_SEARCH);
+ if (idx != -1) {
+ if (!gtkui_listview_busy) {
+ if (deadbeef->conf_get_int ("playlist.scroll.cursorfollowplayback", 1)) {
+ ddb_listview_select_single (listview, idx);
+ deadbeef->pl_set_cursor (PL_SEARCH, idx);
+ }
+ if (deadbeef->conf_get_int ("playlist.scroll.followplayback", 1)) {
+ ddb_listview_scroll_to (listview, idx);
+ }
+ }
+ ddb_listview_draw_row (listview, idx, it);
+ }
+ }
+ deadbeef->pl_item_unref (it);
+ return FALSE;
+}
 
- return FALSE;
+static void
+set_cursor (DdbListview *listview, DB_playItem_t *it) {
+ int new_cursor = deadbeef->pl_get_idx_of_iter (it, PL_SEARCH);
+ if (new_cursor != -1) {
+ int cursor = deadbeef->pl_get_cursor (PL_SEARCH);
+ if (new_cursor != cursor) {
+ deadbeef->pl_set_cursor (PL_SEARCH, new_cursor);
+ ddb_listview_draw_row (listview, new_cursor, NULL);
+ if (cursor != -1) {
+ ddb_listview_draw_row (listview, cursor, NULL);
+ }
+ }
+ ddb_listview_scroll_to (listview, new_cursor);
+ }
 }
 
+static gboolean
+cursor_moved_cb (gpointer p) {
+ DdbListview *listview = playlist_visible();
+ if (listview) {
+ set_cursor (listview, p);
+ }
+ deadbeef->pl_item_unref (p);
+ return FALSE;
+}
 
-gboolean
-on_searchheader_configure_event (GtkWidget *widget,
- GdkEventConfigure *event,
- gpointer user_data)
-{
+static gboolean
+focus_selection_cb (gpointer data) {
+ DdbListview *listview = playlist_visible();
+ if (listview) {
+ deadbeef->pl_lock ();
+ DB_playItem_t *it = deadbeef->pl_get_first (PL_SEARCH);
+ while (it && !deadbeef->pl_is_selected (it)) {
+ it = next_playitem (it);
+ }
+ if (it) {
+ set_cursor (listview, it);
+ deadbeef->pl_item_unref (it);
+ }
+ deadbeef->pl_unlock ();
+ }
 return FALSE;
 }
 
+static gboolean
+trackfocus_cb (gpointer p) {
+ DdbListview *listview = playlist_visible();
+ if (listview) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
+ if (it) {
+ deadbeef->pl_lock ();
+ int idx = deadbeef->pl_get_idx_of_iter (it, PL_SEARCH);
+ if (idx != -1) {
+ ddb_listview_select_single (listview, idx);
+ deadbeef->pl_set_cursor (PL_SEARCH, idx);
+ ddb_listview_scroll_to (listview, idx);
+ }
+ deadbeef->pl_unlock ();
+ deadbeef->pl_item_unref (it);
+ }
+ }
+ return FALSE;
+}
 
-gboolean
-on_searchheader_expose_event (GtkWidget *widget,
- GdkEventExpose *event,
- gpointer user_data)
-{
+static gboolean
+configchanged_cb (gpointer p) {
+ ddb_listview_refresh (DDB_LISTVIEW(p), DDB_REFRESH_COLUMNS | DDB_REFRESH_LIST | DDB_REFRESH_CONFIG);
+ return FALSE;
+}
 
- return FALSE;
+static gboolean
+refresh_cb (gpointer p) {
+ refresh_source_id = 0;
+ DdbListview *listview = playlist_visible();
+ if (listview) {
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ search_process (listview, plt);
+ deadbeef->plt_unref (plt);
+ }
+ }
+ return FALSE;
 }
 
+void
+search_submit_refresh (void) {
+ if (refresh_source_id == 0) {
+ refresh_source_id = g_idle_add (refresh_cb, NULL);
+ }
+}
 
-gboolean
-on_searchheader_motion_notify_event (GtkWidget *widget,
- GdkEventMotion *event,
- gpointer user_data)
-{
+int
+search_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ DdbListview *listview = playlist_visible();
+ if (!listview) {
+ return 0;
+ }
 
- return FALSE;
+ switch (id) {
+ case DB_EV_PAUSED:
+ g_idle_add(paused_cb, listview);
+ break;
+ case DB_EV_SONGFINISHED:
+ {
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ if (ev->track) {
+ deadbeef->pl_item_ref(ev->track);
+ g_idle_add(row_redraw_cb, ev->track);
+ }
+ break;
+ }
+ case DB_EV_SONGSTARTED:
+ {
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ if (ev->track) {
+ deadbeef->pl_item_ref(ev->track);
+ g_idle_add(songstarted_cb, ev->track);
+ }
+ break;
+ }
+ case DB_EV_TRACKINFOCHANGED:
+ if ((p1 == DDB_PLAYLIST_CHANGE_SELECTION && p2 != PL_SEARCH) || p1 == DDB_PLAYLIST_CHANGE_PLAYQUEUE) {
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ if (ev->track) {
+ deadbeef->pl_item_ref (ev->track);
+ g_idle_add(row_redraw_cb, ev->track);
+ }
+ }
+ else if (p1 == DDB_PLAYLIST_CHANGE_CONTENT) {
+ search_submit_refresh();
+ }
+ break;
+ case DB_EV_PLAYLISTCHANGED:
+ if ((p1 == DDB_PLAYLIST_CHANGE_SELECTION && p2 != PL_SEARCH) || p1 == DDB_PLAYLIST_CHANGE_PLAYQUEUE) {
+ g_idle_add(list_redraw_cb, listview);
+ }
+ else if (p1 == DDB_PLAYLIST_CHANGE_CONTENT) {
+ search_submit_refresh();
+ }
+ break;
+ case DB_EV_PLAYLISTSWITCHED:
+ search_submit_refresh();
+ break;
+ case DB_EV_FOCUS_SELECTION:
+ g_idle_add (focus_selection_cb, NULL);
+ break;
+ case DB_EV_TRACKFOCUSCURRENT:
+ g_idle_add (trackfocus_cb, NULL);
+ break;
+ case DB_EV_CURSOR_MOVED:
+ if (p1 != PL_SEARCH) {
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ if (ev->track) {
+ deadbeef->pl_item_ref (ev->track);
+ g_idle_add (cursor_moved_cb, ev->track);
+ }
+ }
+ break;
+ case DB_EV_CONFIGCHANGED:
+ if (ctx) {
+ char *conf_str = (char *)ctx;
+ if (gtkui_listview_override_conf(conf_str) || gtkui_listview_font_conf(conf_str)) {
+ g_idle_add(configchanged_cb, listview);
+ }
+ else if (gtkui_listview_colors_conf(conf_str)) {
+ g_idle_add (list_redraw_cb, listview);
+ g_idle_add (header_redraw_cb, listview);
+ }
+ else if (gtkui_listview_font_style_conf(conf_str) || !strcmp (conf_str, "playlist.pin.groups")) {
+ g_idle_add (list_redraw_cb, listview);
+ }
+ else if (gtkui_tabstrip_override_conf(conf_str) || gtkui_tabstrip_colors_conf(conf_str)) {
+ g_idle_add (header_redraw_cb, listview);
+ }
+ }
+ break;
+ }
+ return 0;
 }
 
-
 ///////// searchwin playlist navigation and rendering
 
 void
-on_searchentry_activate (GtkEntry *entry,
+on_searchentry_changed (GtkEditable *editable,
 gpointer user_data)
 {
- if (deadbeef->pl_getcount (PL_SEARCH) > 0) {
- int row = deadbeef->pl_get_cursor (PL_SEARCH);
- DB_playItem_t *it = deadbeef->pl_get_for_idx_and_iter (max (row, 0), PL_SEARCH);
- if (it) {
- deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, deadbeef->pl_get_idx_of (it), 0);
- deadbeef->pl_item_unref (it);
+ DdbListview *listview = playlist_visible();
+ if (listview) {
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ deadbeef->plt_deselect_all (plt);
+ search_process (listview, plt);
+ for (DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_SEARCH); it; it = next_playitem (it)) {
+ deadbeef->pl_set_selected (it, 1);
+ }
+ deadbeef->plt_unref (plt);
+ }
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_SELECTION, 0);
+ DB_playItem_t *head = deadbeef->pl_get_first (PL_SEARCH);
+ if (head) {
+ ddb_event_track_t *event = (ddb_event_track_t *)deadbeef->event_alloc(DB_EV_CURSOR_MOVED);
+ event->track = head;
+ deadbeef->event_send ((ddb_event_t *)event, PL_SEARCH, 0);
 }
 }
 }
 
+void
+on_searchentry_activate (GtkEntry *entry,
+ gpointer user_data)
+{
+ // Never happens, intercepted and passed to hotkeys
+ return;
+}
 
 gboolean
 on_searchwin_key_press_event (GtkWidget *widget,
 GdkEventKey *event,
 gpointer user_data)
 {
- // that's for when user attempts to navigate list while entry has focus
 if (event->keyval == GDK_Escape) {
 gtk_widget_hide (searchwin);
 return TRUE;
 }
- else if (event->keyval == GDK_Return) {
- on_searchentry_activate (NULL, 0);
- return TRUE;
+ if (event->keyval == GDK_Return || event->keyval == GDK_ISO_Enter || event->keyval == GDK_KP_Enter) {
+ return on_mainwin_key_press_event (widget, event, user_data);
 }
 return FALSE;
 }
@@ -217,215 +462,11 @@
 return FALSE;
 }
 
-static int
-search_get_count (void) {
- return deadbeef->pl_getcount (PL_SEARCH);
-}
-
-static int
-search_get_sel_count (void) {
- int cnt = 0;
- DB_playItem_t *it = deadbeef->pl_get_first (PL_SEARCH);
- while (it) {
- if (deadbeef->pl_is_selected (it)) {
- cnt++;
- }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_SEARCH);
- deadbeef->pl_item_unref (it);
- it = next;
- }
- return cnt;
-}
-
-static int
-search_get_cursor (void) {
- return deadbeef->pl_get_cursor (PL_SEARCH);
-}
-
-static void
-search_set_cursor (int cursor) {
- return deadbeef->pl_set_cursor (PL_SEARCH, cursor);
-}
-
-static DdbListviewIter search_head (void) {
- return (DdbListviewIter)deadbeef->pl_get_first (PL_SEARCH);
-}
-
-static DdbListviewIter search_tail (void) {
- return (DdbListviewIter)deadbeef->pl_get_last(PL_SEARCH);
-}
-
-static DdbListviewIter search_next (DdbListviewIter it) {
- return (DdbListviewIter)deadbeef->pl_get_next(it, PL_SEARCH);
-}
-
-static DdbListviewIter search_prev (DdbListviewIter it) {
- return (DdbListviewIter)deadbeef->pl_get_prev(it, PL_SEARCH);
-}
-
-static DdbListviewIter search_get_for_idx (int idx) {
- return deadbeef->pl_get_for_idx_and_iter (idx, PL_SEARCH);
-}
-
-int search_get_idx (DdbListviewIter it) {
- DB_playItem_t *c = deadbeef->pl_get_first (PL_SEARCH);
- int idx = 0;
- while (c && c != it) {
- DB_playItem_t *next = deadbeef->pl_get_next (c, PL_SEARCH); 
- deadbeef->pl_item_unref (c);
- c = next;
- idx++;
- }
- if (!c) {
- return -1;
- }
- deadbeef->pl_item_unref (c);
- return idx;
-}
-
-int
-search_is_selected (DdbListviewIter it) {
- return deadbeef->pl_is_selected ((DB_playItem_t *)it);
-}
-
 void
-search_select (DdbListviewIter it, int sel) {
- deadbeef->pl_set_selected ((DB_playItem_t *)it, sel);
- deadbeef->sendmessage (DB_EV_SELCHANGED, 0, deadbeef->plt_get_curr_idx (), PL_SEARCH);
-}
-
-int
-search_get_group (DdbListviewIter it, char *str, int size) {
- return -1;
-}
-
-void
-search_col_sort (int col, int sort_order, void *user_data) {
- col_info_t *c = (col_info_t*)user_data;
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- deadbeef->plt_sort (plt, PL_SEARCH, c->id, c->format, sort_order-1);
- deadbeef->plt_unref (plt);
-}
-
-static int lock_column_config = 0;
-
-void
-search_columns_changed (DdbListview *listview) {
- if (!lock_column_config) {
- rewrite_column_config (listview, "search");
- }
-}
-
-void
-search_column_size_changed (DdbListview *listview, int col) {
- const char *title;
- int width;
- int align_right;
- col_info_t *inf;
- int minheight;
- int res = ddb_listview_column_get_info (listview, col, &title, &width, &align_right, &minheight, (void **)&inf);
- if (res == -1) {
- return;
- }
-}
-
-void search_col_free_user_data (void *data) {
- if (data) {
- col_info_t *inf = data;
- if (inf->format) {
- free (inf->format);
- }
- free (data);
- }
-}
-
-void search_handle_doubleclick (DdbListview *listview, DdbListviewIter iter, int idx) {
- deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, deadbeef->pl_get_idx_of ((DB_playItem_t *)iter), 0);
-}
-
-void search_selection_changed (DdbListview *ps, DdbListviewIter it, int idx) {
- deadbeef->sendmessage (DB_EV_SELCHANGED, (uintptr_t)ps, -1, -1);
-}
-
-void
-search_delete_selected (void) {
- deadbeef->pl_delete_selected ();
- main_refresh ();
- search_refresh ();
-}
-
-void
-search_header_context_menu (DdbListview *ps, int column) {
- GtkWidget *menu = create_headermenu (0);
- set_last_playlist_cm (ps); // playlist ptr for context menu
- set_active_column_cm (column);
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, ps, 3, gtk_get_current_event_time());
-}
-
-DdbListviewBinding search_binding = {
- // rows
- .count = search_get_count,
- .sel_count = search_get_sel_count,
-
- .cursor = search_get_cursor,
- .set_cursor = search_set_cursor,
-
- .head = search_head,
- .tail = search_tail,
- .next = search_next,
- .prev = search_prev,
-
- .get_for_idx = search_get_for_idx,
- .get_idx = search_get_idx,
-
- .is_selected = search_is_selected,
- .select = search_select,
-
- .get_group = search_get_group,
-
- .drag_n_drop = NULL,
- .external_drag_n_drop = NULL,
-
- .draw_column_data = draw_column_data,
- .draw_group_title = NULL,
-
- // columns
- .col_sort = search_col_sort,
- .columns_changed = search_columns_changed,
- .column_size_changed = search_column_size_changed,
- .col_free_user_data = search_col_free_user_data,
-
- // callbacks
- .handle_doubleclick = search_handle_doubleclick,
- .selection_changed = search_selection_changed,
- .header_context_menu = search_header_context_menu,
- .list_context_menu = list_context_menu,
- .delete_selected = search_delete_selected,
- .modification_idx = gtkui_get_curr_playlist_mod,
-};
-
-void
-search_playlist_init (GtkWidget *widget) {
- DdbListview *listview = DDB_LISTVIEW(widget);
- g_signal_connect ((gpointer)listview->list, "key_press_event", G_CALLBACK (on_searchwin_key_press_event), listview);
- search_binding.ref = (void (*) (DdbListviewIter))deadbeef->pl_item_ref;
- search_binding.unref = (void (*) (DdbListviewIter))deadbeef->pl_item_unref;
- search_binding.is_selected = (int (*) (DdbListviewIter))deadbeef->pl_is_selected;
- ddb_listview_set_binding (listview, &search_binding);
- lock_column_config = 1;
- // create default set of columns
- DB_conf_item_t *col = deadbeef->conf_find ("search.column.", NULL);
- if (!col) {
- add_column_helper (listview, _("Artist / Album"), 150, -1, "%a - %b", 0);
- add_column_helper (listview, _("Track No"), 50, -1, "%n", 1);
- add_column_helper (listview, _("Title"), 150, -1, "%t", 0);
- add_column_helper (listview, _("Duration"), 50, -1, "%l", 0);
- }
- else {
- while (col) {
- append_column_from_textdef (listview, col->value);
- col = deadbeef->conf_find ("search.column.", col);
- }
- }
- lock_column_config = 0;
+search_playlist_init (GtkWidget *mainwin) {
+ searchwin = create_searchwin ();
+ gtk_window_set_transient_for (GTK_WINDOW (searchwin), GTK_WINDOW (mainwin));
+ window_title_bytecode = deadbeef->tf_compile (_("Search (%list_total% results)"));
+ DdbListview *listview = DDB_LISTVIEW (lookup_widget (searchwin, "searchlist"));
+ _playlist_controller = playlist_controller_new(listview, TRUE);
 }

deadbeef-0.6.2.tar.bz2/plugins/gtkui/search.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/search.h Changed

@@ -1,27 +1,30 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
 
- 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 software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
 
- 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.
+ 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:
 
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifndef __SEARCH_H
 #define __SEARCH_H
 
-#include "ddblistview.h"
-
-extern struct playItem_s *search_current;
-extern int search_count;
+#include "playlist/ddblistview.h"
 
 void
 search_start (void);
@@ -29,17 +32,13 @@
 void
 search_destroy (void);
 
-// should be called whenever playlist was changed
-void
-search_refresh (void);
-
-void
-search_redraw (void);
-
 int
-search_get_idx (DdbListviewIter it);
+search_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
 
 void
 search_playlist_init (GtkWidget *widget);
 
+void
+search_submit_refresh (void);
+
 #endif // __SEARCH_H

deadbeef-1.9.6.tar.bz2/plugins/gtkui/selpropertieswidget.c Added

@@ -0,0 +1,333 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <assert.h>
+#include <jansson.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "support.h"
+#include "trkproperties.h"
+#include "selpropertieswidget.h"
+
+extern DB_functions_t *deadbeef;
+extern int design_mode;
+
+typedef enum {
+ SECTION_PROPERTIES = 1 << 0,
+ SECTION_METADATA = 1 << 1,
+} selproperties_section_t;
+
+typedef struct {
+ ddb_gtkui_widget_t base;
+ ddb_gtkui_widget_extended_api_t exapi;
+ GtkWidget *tree;
+ guint refresh_timeout;
+
+ guint visible_sections;
+ guint show_headers;
+
+ gboolean updating_menu; // suppress menu event handlers
+ GtkWidget *menu;
+ GtkWidget *menu_properties;
+ GtkWidget *menu_metadata;
+} w_selproperties_t;
+
+gboolean
+fill_selproperties_cb (gpointer data) {
+ w_selproperties_t *w = data;
+ DB_playItem_t **tracks = NULL;
+ if (w->refresh_timeout) {
+ g_source_remove (w->refresh_timeout);
+ w->refresh_timeout = 0;
+ }
+ int numtracks = 0;
+ deadbeef->pl_lock ();
+ int nsel = deadbeef->pl_getselcount ();
+ if (0 < nsel) {
+ tracks = malloc (sizeof (DB_playItem_t *) * nsel);
+ if (tracks) {
+ int n = 0;
+ DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
+ while (it) {
+ if (deadbeef->pl_is_selected (it)) {
+ assert (n < nsel);
+ deadbeef->pl_item_ref (it);
+ tracksn++ = it;
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ numtracks = nsel;
+ }
+ else {
+ deadbeef->pl_unlock ();
+ return FALSE;
+ }
+ }
+ GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (w->tree)));
+ gtk_list_store_clear (store);
+ if (w->visible_sections & SECTION_PROPERTIES) {
+ add_field_section(store, _("Properties"), "");
+ trkproperties_fill_prop (store, tracks, numtracks);
+ }
+ if (w->visible_sections & SECTION_METADATA) {
+ add_field_section(store, _("Metadata"), "");
+ trkproperties_fill_meta (store, tracks, numtracks);
+ }
+
+ if (tracks) {
+ for (int i = 0; i < numtracks; i++) {
+ deadbeef->pl_item_unref (tracksi);
+ }
+ free (tracks);
+ tracks = NULL;
+ numtracks = 0;
+ }
+ deadbeef->pl_unlock ();
+ return FALSE;
+}
+
+static void
+_init (struct ddb_gtkui_widget_s *widget) {
+ w_selproperties_t *w = (w_selproperties_t *)widget;
+ w->refresh_timeout = 0;
+ fill_selproperties_cb (widget);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (w->tree), w->show_headers);
+}
+
+static void
+_menu_activate (GtkWidget* self, gpointer user_data) {
+ w_selproperties_t *s = user_data;
+
+ if (s->updating_menu) {
+ return;
+ }
+
+ if (self == s->menu_properties) {
+ s->visible_sections ^= SECTION_PROPERTIES;
+ }
+ else if (self == s->menu_metadata) {
+ s->visible_sections ^= SECTION_METADATA;
+ }
+ fill_selproperties_cb (s);
+}
+
+static void
+selection_changed (gpointer user_data)
+{
+ w_selproperties_t *s = user_data;
+ if (s->refresh_timeout) {
+ g_source_remove (s->refresh_timeout);
+ s->refresh_timeout = 0;
+ }
+ s->refresh_timeout = g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE, 10, fill_selproperties_cb, user_data, NULL);
+}
+
+static int
+_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ switch (id) {
+ case DB_EV_TRACKINFOCHANGED:
+ case DB_EV_PLAYLISTCHANGED:
+ if (p1 == DDB_PLAYLIST_CHANGE_CONTENT || p1 == DDB_PLAYLIST_CHANGE_SELECTION) {
+ selection_changed (w);
+ }
+ break;
+ case DB_EV_PLAYLISTSWITCHED:
+ selection_changed (w);
+ break;
+ }
+ return 0;
+}
+
+static void
+_menu_update (w_selproperties_t *s) {
+ s->updating_menu = TRUE;
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->menu_properties), s->visible_sections & SECTION_PROPERTIES);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->menu_metadata), s->visible_sections & SECTION_METADATA);
+ s->updating_menu = FALSE;
+}
+
+static gboolean
+_button_press (GtkWidget* self, GdkEventButton *event, gpointer user_data) {
+ if (design_mode) {
+ return FALSE;
+ }
+ w_selproperties_t *s = user_data;
+
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
+ _menu_update(s);
+ gtk_menu_popup_at_pointer (GTK_MENU (s->menu), NULL);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+_deserialize_from_keyvalues (ddb_gtkui_widget_t *widget, const char **keyvalues) {
+ w_selproperties_t *s = (w_selproperties_t *)widget;
+
+ s->visible_sections = 0;
+ s->show_headers = 1;
+ gboolean live = FALSE;
+
+ for (int i = 0; keyvaluesi; i += 2) {
+ if (!strcmp (keyvaluesi, "section")) {
+ live = TRUE;
+ char *sect = strdup(keyvaluesi+1);
+ char *token = strtok(sect, ",");
+
+ while (token) {
+ if (!strcmp(token, "properties")) {
+ s->visible_sections |= SECTION_PROPERTIES;
+ }
+ else if (!strcmp(token, "metadata")) {
+ s->visible_sections |= SECTION_METADATA;
+ }
+ token = strtok(NULL, ",");
+ }
+
+ free(sect);
+
+ } else if (!strcmp (keyvaluesi, "showheaders")) {
+ s->show_headers = atoi(keyvaluesi+1);
+ }
+ }
+
+ if (!live) {
+ s->visible_sections = SECTION_PROPERTIES | SECTION_METADATA;
+ }
+}
+
+static char const **
+_serialize_to_keyvalues (ddb_gtkui_widget_t *widget) {
+ w_selproperties_t *s = (w_selproperties_t *)widget;
+
+ char const **keyvalues = calloc (5, sizeof (char *));
+
+ keyvalues0 = "section";
+
+ if (s->visible_sections == (SECTION_PROPERTIES | SECTION_METADATA)) {
+ keyvalues1 = "properties,metadata";
+ } else if (s->visible_sections == SECTION_PROPERTIES) {
+ keyvalues1 = "properties";
+ } else if (s->visible_sections == SECTION_METADATA) {
+ keyvalues1 = "metadata";
+ } else {
+ keyvalues1 = "";
+ }
+
+ keyvalues2 = "showheaders";
+ keyvalues3 = s->show_headers ? "1" : "0";
+
+ return keyvalues;
+}
+
+static void
+_free_serialized_keyvalues(ddb_gtkui_widget_t *w, char const **keyvalues) {
+ free (keyvalues);
+}
+
+static void
+on_properties_showheaders_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) {
+ w_selproperties_t *w = user_data;
+ int showheaders = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (checkmenuitem));
+ w->show_headers = showheaders;
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (w->tree), showheaders);
+}
+
+static void
+_initmenu (struct ddb_gtkui_widget_s *w, GtkWidget *menu) {
+ w_selproperties_t *s = (w_selproperties_t *)w;
+ GtkWidget *item;
+ item = gtk_check_menu_item_new_with_mnemonic (_("Show Column Headers"));
+ gtk_widget_show (item);
+ int showheaders = s->show_headers;
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), showheaders);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "toggled",
+ G_CALLBACK (on_properties_showheaders_toggled),
+ w);
+}
+
+ddb_gtkui_widget_t *
+w_selproperties_create (void) {
+ w_selproperties_t *w = malloc (sizeof (w_selproperties_t));
+ memset (w, 0, sizeof (w_selproperties_t));
+
+ w->base.widget = gtk_event_box_new ();
+ w->base.init = _init;
+ w->base.message = _message;
+ w->base.initmenu = _initmenu;
+ w->visible_sections = SECTION_METADATA | SECTION_PROPERTIES;
+ w->exapi._size = sizeof (ddb_gtkui_widget_extended_api_t);
+ w->exapi.deserialize_from_keyvalues = _deserialize_from_keyvalues;
+ w->exapi.serialize_to_keyvalues = _serialize_to_keyvalues;
+ w->exapi.free_serialized_keyvalues = _free_serialized_keyvalues;
+
+ gtk_widget_set_can_focus (w->base.widget, FALSE);
+
+ GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_set_can_focus (scroll, FALSE);
+ gtk_widget_show (scroll);
+ gtk_container_add (GTK_CONTAINER (w->base.widget), scroll);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_ETCHED_IN);
+
+ w->tree = gtk_tree_view_new ();
+ gtk_widget_show (w->tree);
+ gtk_tree_view_set_enable_search (GTK_TREE_VIEW (w->tree), FALSE);
+ gtk_container_add (GTK_CONTAINER (scroll), w->tree);
+
+ GtkListStore *store = gtk_list_store_new (META_COL_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (w->tree), GTK_TREE_MODEL (store));
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (w->tree), TRUE);
+
+ GtkCellRenderer *rend1 = gtk_cell_renderer_text_new ();
+ GtkCellRenderer *rend2 = gtk_cell_renderer_text_new ();
+ GtkTreeViewColumn *col1 = gtk_tree_view_column_new_with_attributes (_("Name"), rend1, "text", META_COL_TITLE, "weight", META_COL_PANGO_WEIGHT, NULL);
+ gtk_tree_view_column_set_sizing (col1, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ GtkTreeViewColumn *col2 = gtk_tree_view_column_new_with_attributes (_("Value"), rend2, "text", META_COL_DISPLAY_VAL, NULL);
+ gtk_tree_view_column_set_sizing (col2, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (w->tree), col1);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (w->tree), col2);
+ gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (w->tree), TRUE);
+
+ w_override_signals (w->base.widget, w);
+ g_signal_connect ((gpointer)w->tree, "button-press-event", G_CALLBACK (_button_press), w);
+
+ w->menu = gtk_menu_new();
+ w->menu_properties = gtk_check_menu_item_new_with_mnemonic( _("Properties"));
+ gtk_widget_show(w->menu_properties);
+ w->menu_metadata = gtk_check_menu_item_new_with_mnemonic( _("Metadata"));
+ gtk_widget_show(w->menu_metadata);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), w->menu_properties, 0);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), w->menu_metadata, 1);
+
+ g_signal_connect((gpointer)w->menu_properties, "activate", G_CALLBACK(_menu_activate), w);
+ g_signal_connect((gpointer)w->menu_metadata, "activate", G_CALLBACK(_menu_activate), w);
+
+ return (ddb_gtkui_widget_t *)w;
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/selpropertieswidget.h Added

@@ -0,0 +1,34 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+
+#ifndef selpropertieswidget_h
+#define selpropertieswidget_h
+
+#include "widgets.h"
+
+ddb_gtkui_widget_t *
+w_selproperties_create (void);
+
+#endif /* propertieswidget_h */

deadbeef-0.6.2.tar.bz2/plugins/gtkui/support.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/support.h Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/tagwritersettings.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/tagwritersettings.c Changed

deadbeef-0.6.2.tar.bz2/plugins/gtkui/tagwritersettings.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/tagwritersettings.h Changed

deadbeef-1.9.6.tar.bz2/plugins/gtkui/tfimport.c Added

@@ -0,0 +1,27 @@
+/*
+    Import from legacy column config into 0.6.3+ title formatting
+    Copyright (C) 2009-2014 Oleksiy 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
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+#include "gtkui.h"
+
+void
+import_column_config_to_063 (void) {
+}

deadbeef-1.9.6.tar.bz2/plugins/gtkui/tfimport.h Added

@@ -0,0 +1,29 @@
+/*
+    Import from legacy column config into 0.6.3+ title formatting
+    Copyright (C) 2009-2014 Oleksiy 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
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef __TFIMPORT_H
+#define __TFIMPORT_H
+
+void
+import_column_config_to_063 (void);
+
+#endif // __TFIMPORT_H

deadbeef-0.6.2.tar.bz2/plugins/gtkui/trkproperties.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/trkproperties.c Changed

@@ -1,40 +1,49 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
+#include "pango/pango-font.h"
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <gtk/gtk.h>
+#include <assert.h>
+#include <ctype.h>
 #include <gdk/gdkkeysyms.h>
-#include <string.h>
+#include <gtk/gtk.h>
 #include <math.h>
-#include <assert.h>
+#include <string.h>
+#include <deadbeef/deadbeef.h>
 #include "../../gettext.h"
-#include "ddblistview.h"
-#include "trkproperties.h"
-#include "interface.h"
-#include "support.h"
-#include "../../deadbeef.h"
+#include "../../shared/trkproperties_shared.h"
+#include "callbacks.h"
+#include "ddbcellrenderertextmultiline.h"
 #include "gtkui.h"
-#include "mainplaylist.h"
+#include "interface.h"
+#include "playlist/ddblistview.h"
+#include "playlist/mainplaylist.h"
 #include "search.h"
-#include "ddbcellrenderertextmultiline.h"
+#include "support.h"
 #include "tagwritersettings.h"
+#include "trkproperties.h"
 #include "wingeom.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
@@ -42,123 +51,62 @@
 
 #define min(x,y) ((x)<(y)?(x):(y))
 
-// some versions of cairo crash when fields are too long
-// this is the workaround
-// the fields are limited to be no more than 1000 bytes
-// if they are larger - they will be treated as "multiple values".
-#define MAX_GUI_FIELD_LEN 5000
-
 static GtkWidget *trackproperties;
 static GtkCellRenderer *rend_text2;
 static GtkListStore *store;
 static GtkListStore *propstore;
 int trkproperties_modified;
-static DB_playItem_t **tracks;
+static DB_playItem_t **tracks; // This is a copy to act as the model while editing and saving
+static DB_playItem_t **orig_tracks; // This is a reference to the original tracks in the playlist
 static int numtracks;
 static GtkWidget *progressdlg;
 static int progress_aborted;
 static int last_ctx;
+static ddb_playlist_t *last_plt;
+static trkproperties_delegate_t *_delegate;
 
-int
-build_key_list (const char ***pkeys, int props, DB_playItem_t **tracks, int numtracks) {
- int sz = 20;
- const char **keys = malloc (sizeof (const char *) * sz);
- if (!keys) {
- fprintf (stderr, "fatal: out of memory allocating key list\n");
- assert (0);
- return 0;
- }
 
- int n = 0;
+// Max length of a string displayed in the TableView
+// If a string is longer -- it gets clipped, and appended with " (…)", like with linebreaks
+#define MAX_GUI_FIELD_LEN 500
 
- for (int i = 0; i < numtracks; i++) {
- DB_metaInfo_t *meta = deadbeef->pl_get_metadata_head (tracksi);
- while (meta) {
- if (meta->key0 != '!' && ((props && meta->key0 == ':') || (!props && meta->key0 != ':'))) {
- int k = 0;
- for (; k < n; k++) {
- if (meta->key == keysk) {
- break;
- }
- }
- if (k == n) {
- if (n >= sz) {
- sz *= 2;
- keys = realloc (keys, sizeof (const char *) * sz);
- if (!keys) {
- fprintf (stderr, "fatal: out of memory reallocating key list (%d keys)\n", sz);
- assert (0);
- }
- }
- keysn++ = meta->key;
- }
- }
- meta = meta->next;
- }
- }
+static void
+_iterate_semicolon_separated_substrings(const char *svalue, void (^completion_block)(const char *item));
 
- *pkeys = keys;
- return n;
-}
+static void
+_cleanup_track_list (void);
 
-static int
-equals_ptr (const char *a, const char *b) {
- return a == b;
-}
+static void
+_set_metadata_row(GtkListStore *store, GtkTreeIter *iter, const char *key, int is_mult, const char *title, char *value);
 
-static int
-get_field_value (char *out, int size, const char *key, const char *(*getter)(DB_playItem_t *it, const char *key), int (*equals)(const char *a, const char *b), DB_playItem_t **tracks, int numtracks) {
- int multiple = 0;
- *out = 0;
- if (numtracks == 0) {
- return 0;
- }
- char *p = out;
- deadbeef->pl_lock ();
- const char **prev = malloc (sizeof (const char *) * numtracks);
- memset (prev, 0, sizeof (const char *) * numtracks);
- for (int i = 0; i < numtracks; i++) {
- const char *val = getter (tracksi, key);
- if (val && val0 == 0) {
- val = NULL;
- }
- if (i > 0 || (val && strlen (val) >= MAX_GUI_FIELD_LEN)) {
- int n = 0;
- for (; n < i; n++) {
- if (equals (prevn, val)) {
- break;
- }
- }
- if (n == i || (val && strlen (val) >= MAX_GUI_FIELD_LEN)) {
- multiple = 1;
- if (val) {
- size_t l = snprintf (out, size, out == p ? "%s" : "; %s", val ? val : "");
- l = min (l, size);
- out += l;
- size -= l;
- }
- }
- }
- else if (val) {
- size_t l = snprintf (out, size, "%s", val ? val : "");
- l = min (l, size);
- out += l;
- size -= l;
- }
- previ = val;
- if (size <= 1) {
+static void
+_remove_field(GtkListStore *model, GtkTreeIter *iter, const char *skey);
+
+static char *
+clip_multiline_value (const char *v) {
+ char *clipped_val = NULL;
+ size_t l = strlen (v);
+ const char multiline_ellipsis = " (…)";
+ int i;
+ for (i = 0; i < l; i++) {
+ if (vi == '\r' || vi == '\n') {
 break;
 }
 }
- deadbeef->pl_unlock ();
- if (size <= 1) {
- gchar *prev = g_utf8_prev_char (out-4);
- strcpy (prev, "...");
+
+ if (l >= MAX_GUI_FIELD_LEN && (i == l || i >= MAX_GUI_FIELD_LEN)) {
+ i = MAX_GUI_FIELD_LEN;
+ }
+
+ if (i != l) {
+ clipped_val = malloc (i + sizeof (multiline_ellipsis));
+ memcpy (clipped_val, v, i);
+ memcpy (clipped_val + i, multiline_ellipsis, sizeof (multiline_ellipsis));
 }
- free (prev);
- return multiple;
+ return clipped_val;
 }
 
+
 gboolean
 on_trackproperties_delete_event (GtkWidget *widget,
 GdkEvent *event,
@@ -179,28 +127,14 @@
 gtk_widget_destroy (widget);
 rend_text2 = NULL;
 trackproperties = NULL;
- if (tracks) {
- for (int i = 0; i < numtracks; i++) {
- deadbeef->pl_item_unref (tracksi);
- }
- free (tracks);
- tracks = NULL;
- numtracks = 0;
- }
- return TRUE;
-}
 
-void
-on_remove_field_activate (GtkMenuItem *menuitem,
- gpointer user_data);
+ _cleanup_track_list();
 
-void
-on_add_field_activate (GtkMenuItem *menuitem,
- gpointer user_data);
+ return TRUE;
+}
 
 int trkproperties_block_keyhandler = 0;
 
-
 gboolean
 on_trackproperties_key_press_event (GtkWidget *widget,
 GdkEventKey *event,
@@ -209,17 +143,20 @@
 if (trkproperties_block_keyhandler) {
 return FALSE;
 }
+
 if (event->keyval == GDK_Escape) {
 on_trackproperties_delete_event (trackproperties, NULL, NULL);
 return TRUE;
 }
- else if (event->keyval == GDK_Delete) {
- on_remove_field_activate (NULL, NULL);
- return TRUE;
- }
- else if (event->keyval == GDK_Insert) {
- on_add_field_activate (NULL, NULL);
- return TRUE;
+ else if (gtk_widget_is_focus(lookup_widget (trackproperties, "metalist"))) {
+ if (event->keyval == GDK_Delete) {
+ on_trkproperties_remove_activate (NULL, NULL);
+ return TRUE;
+ }
+ else if (event->keyval == GDK_Insert) {
+ on_trkproperties_add_new_field_activate (NULL, NULL);
+ return TRUE;
+ }
 }
 return FALSE;
 }
@@ -229,6 +166,11 @@
 if (trackproperties) {
 on_trackproperties_delete_event (trackproperties, NULL, NULL);
 }
+ if (last_plt) {
+ deadbeef->plt_unref (last_plt);
+ last_plt = NULL;
+ }
+ last_ctx = -1;
 }
 
 void
@@ -238,6 +180,41 @@
 trkproperties_destroy ();
 }
 
+static void _apply_field_to_track(ddb_playItem_t *track, const char *key, const char *new_text) {
+ deadbeef->pl_delete_meta(track, key);
+
+ static const char *special_fields = {
+ "comment",
+ "lyrics",
+ NULL
+ };
+
+ int should_split = 1;
+ for (int n = 0; special_fieldsn != NULL; n++) {
+ if (!strcasecmp(key, special_fieldsn)) {
+ should_split = 0;
+ break;
+ }
+ }
+
+ if (!should_split) {
+ deadbeef->pl_append_meta(track, key, new_text);
+ return;
+ }
+
+ _iterate_semicolon_separated_substrings(new_text, ^(const char *item) {
+ deadbeef->pl_append_meta(track, key, item);
+ });
+}
+
+static void
+_apply_field_to_all_tracks (const char *key, const char *new_text) {
+ for (int i = 0; i < numtracks; i++) {
+ _apply_field_to_track(tracksi, key, new_text);
+ }
+}
+
+
 void
 on_metadata_edited (GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer user_data) {
 GtkListStore *store = GTK_LIST_STORE (user_data);
@@ -255,107 +232,111 @@
 return;
 }
 
- GValue value = {0,};
- GValue mult = {0,};
- gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 1, &value);
+ GValue title = {};
+ GValue key = {};
+ GValue value = {};
+ GValue mult = {};
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 0, &title);
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 2, &key);
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 4, &value);
 gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 3, &mult);
+ const char *stitle = g_value_get_string (&title);
+ const char *skey = g_value_get_string (&key);
 const char *svalue = g_value_get_string (&value);
+ if (!svalue) {
+ svalue = "";
+ }
+
+ // The multiple values case gets cleared on attempt to edit,
+ // that's why the change gets applied unconditionally for multivalue case
 int imult = g_value_get_int (&mult);
- if (strcmp (svalue, new_text) && (!imult || strlen (new_text))) {
- gtk_list_store_set (store, &iter, 1, new_text, 3, 0, -1);
+ if (strcmp (svalue, new_text) || imult) {
+ _apply_field_to_all_tracks (skey, new_text);
+ _set_metadata_row(store, &iter, skey, 0, stitle, new_text);
 trkproperties_modified = 1;
 }
+
+ G_IS_VALUE (&title) ? ((void)(g_value_unset (&title)), NULL) : NULL;
+ G_IS_VALUE (&key) ? ((void)(g_value_unset (&key)), NULL) : NULL;
+ G_IS_VALUE (&value) ? ((void)(g_value_unset (&value)), NULL) : NULL;
+ G_IS_VALUE (&mult) ? ((void)(g_value_unset (&mult)), NULL) : NULL;
 trkproperties_block_keyhandler = 0;
 }
 
-// full metadata
-static const char *types = {
- "artist", "Artist",
- "title", "Track Title",
- "album", "Album",
- "year", "Date",
- "track", "Track Number",
- "numtracks", "Total Tracks",
- "genre", "Genre",
- "composer", "Composer",
- "disc", "Disc Number",
- "comment", "Comment",
- NULL
-};
-
-static const char *hc_props = {
- ":URI", "Location",
- ":TRACKNUM", "Subtrack Index",
- ":DURATION", "Duration",
- ":TAGS", "Tag Type(s)",
- ":HAS_EMBEDDED_CUESHEET", "Embedded Cuesheet",
- ":DECODER", "Codec",
- NULL
-};
+static void
+_set_metadata_row(GtkListStore *store, GtkTreeIter *iter, const char *key, int is_mult, const char *title, char *value) {
+ char *clipped_val = clip_multiline_value (value);
+ char *display_val = clipped_val ?: value;
+ gtk_list_store_set (store, iter, META_COL_TITLE, title, META_COL_DISPLAY_VAL, display_val, META_COL_KEY, key, META_COL_IS_MULT, is_mult ? 1 : 0, META_COL_VALUE, value, META_COL_PANGO_WEIGHT, PANGO_WEIGHT_NORMAL, -1);
+ free (clipped_val);
+}
 
 void
 add_field (GtkListStore *store, const char *key, const char *title, int is_prop, DB_playItem_t **tracks, int numtracks) {
+ size_t val_len = 5000;
+ char *val = malloc(val_len);
+
 // get value to edit
 const char *mult = is_prop ? "" : _("Multiple values ");
- char valMAX_GUI_FIELD_LEN;
 size_t ml = strlen (mult);
 memcpy (val, mult, ml+1);
- int n = get_field_value (val + ml, sizeof (val) - ml, key, deadbeef->pl_find_meta_raw, equals_ptr, tracks, numtracks);
+ int n = trkproperties_get_field_value (val + ml, (int)(val_len - ml), key, tracks, numtracks);
 
 GtkTreeIter iter;
 gtk_list_store_append (store, &iter);
 if (!is_prop) {
- if (n) {
- gtk_list_store_set (store, &iter, 0, title, 1, val, 2, key, 3, n ? 1 : 0, -1);
- }
- else {
- deadbeef->pl_lock ();
- const char *val = deadbeef->pl_find_meta_raw (tracks0, key);
- if (!val) {
- val = "";
- }
- gtk_list_store_set (store, &iter, 0, title, 1, val, 2, key, 3, n ? 1 : 0, -1);
- deadbeef->pl_unlock ();
+ char *v = val;
+ if (!n) {
+ v += ml;
 }
+
+ _set_metadata_row(store, &iter, key, n, title, v);
 }
 else {
- gtk_list_store_set (store, &iter, 0, title, 1, n ? val : val + ml, -1);
+ gtk_list_store_set (store, &iter, META_COL_TITLE, title, META_COL_DISPLAY_VAL, n ? val : val + ml, META_COL_PANGO_WEIGHT, PANGO_WEIGHT_NORMAL, -1);
 }
+
+ free (val);
+}
+
+void
+add_field_section(GtkListStore *store, const char *title, const char *value) {
+	GtkTreeIter iter;
+	gtk_list_store_append (store, &iter);
+	gtk_list_store_set(store, &iter, META_COL_TITLE, title, META_COL_DISPLAY_VAL, value, META_COL_PANGO_WEIGHT, PANGO_WEIGHT_BOLD, -1);
 }
 
 void
 trkproperties_fill_meta (GtkListStore *store, DB_playItem_t **tracks, int numtracks) {
- gtk_list_store_clear (store);
+ // no clear here
+ // gtk_list_store_clear (store);
 if (!tracks) {
 return;
 }
 
 const char **keys = NULL;
- int nkeys = build_key_list (&keys, 0, tracks, numtracks);
-
- int k;
+ int nkeys = trkproperties_build_key_list (&keys, 0, tracks, numtracks);
 
 // add "standard" fields
- for (int i = 0; typesi; i += 2) {
- add_field (store, typesi, _(typesi+1), 0, tracks, numtracks);
+ for (int i = 0; trkproperties_typesi; i += 2) {
+ add_field (store, trkproperties_typesi, _(trkproperties_typesi+1), 0, tracks, numtracks);
 }
 
 // add all other fields
 for (int k = 0; k < nkeys; k++) {
 int i;
- for (i = 0; typesi; i += 2) {
- if (!strcasecmp (keysk, typesi)) {
+ for (i = 0; trkproperties_typesi; i += 2) {
+ if (!strcasecmp (keysk, trkproperties_typesi)) {
 break;
 }
 }
- if (typesi) {
+ if (trkproperties_typesi) {
 continue;
 }
 
- char titleMAX_GUI_FIELD_LEN;
- if (!typesi) {
- snprintf (title, sizeof (title), "<%s>", keysk);
- }
+ size_t l = strlen (keysk);
+ char titlel + 3;
+ snprintf (title, sizeof (title), "<%s>", keysk);
 add_field (store, keysk, title, 0, tracks, numtracks);
 }
 if (keys) {
@@ -364,113 +345,83 @@
 }
 
 void
-trkproperties_fill_metadata (void) {
- if (!trackproperties) {
+trkproperties_fill_prop (GtkListStore *store, DB_playItem_t **tracks, int numtracks) {
+ // no clear here
+ // gtk_list_store_clear (propstore);
+ if (!tracks) {
 return;
 }
- trkproperties_modified = 0;
- deadbeef->pl_lock ();
 
- trkproperties_fill_meta (store, tracks, numtracks);
- gtk_list_store_clear (propstore);
+ const char **keys = NULL;
+ int nkeys = trkproperties_build_key_list (&keys, 1, tracks, numtracks);
 
- // hardcoded properties
- for (int i = 0; hc_propsi; i += 2) {
- add_field (propstore, hc_propsi, _(hc_propsi+1), 1, tracks, numtracks);
+ // add "standard" fields
+ for (int i = 0; trkproperties_hc_propsi; i += 2) {
+ add_field (store, trkproperties_hc_propsi, _(trkproperties_hc_propsi+1), 1, tracks, numtracks);
 }
- // properties
- const char **keys = NULL;
- int nkeys = build_key_list (&keys, 1, tracks, numtracks);
+
+ // add all other fields
 for (int k = 0; k < nkeys; k++) {
 int i;
- for (i = 0; hc_propsi; i += 2) {
- if (!strcasecmp (keysk, hc_propsi)) {
+ for (i = 0; trkproperties_hc_propsi; i += 2) {
+ if (!strcasecmp (keysk, trkproperties_hc_propsi)) {
 break;
 }
 }
- if (hc_propsi) {
+ if (trkproperties_hc_propsi) {
 continue;
 }
- char titleMAX_GUI_FIELD_LEN;
+
+ size_t l = strlen (keysk);
+ char titlel + 3;
 snprintf (title, sizeof (title), "<%s>", keysk+1);
- add_field (propstore, keysk, title, 1, tracks, numtracks);
+ add_field (store, keysk, title, 1, tracks, numtracks);
 }
 if (keys) {
 free (keys);
 }
-
- deadbeef->pl_unlock ();
 }
 
 void
-show_track_properties_dlg (int ctx) {
- last_ctx = ctx;
-
- if (tracks) {
- for (int i = 0; i < numtracks; i++) {
- deadbeef->pl_item_unref (tracksi);
- }
- free (tracks);
- tracks = NULL;
- numtracks = 0;
- }
-
- deadbeef->pl_lock ();
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (!plt) {
- deadbeef->pl_unlock ();
- return;
- }
- int num = 0;
- if (ctx == DDB_ACTION_CTX_SELECTION) {
- num = deadbeef->plt_getselcount (plt);
- }
- else if (ctx == DDB_ACTION_CTX_PLAYLIST) {
- num = deadbeef->plt_get_item_count (plt, PL_MAIN);
- }
- else if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
- num = 1;
- }
- if (num <= 0) {
- deadbeef->pl_unlock ();
+trkproperties_fill_metadata (void) {
+ if (!trackproperties) {
 return;
 }
+ trkproperties_modified = 0;
 
- tracks = malloc (sizeof (DB_playItem_t *) * num);
- if (!tracks) {
- fprintf (stderr, "gtkui: failed to alloc %d bytes to store selected tracks\n", (int)(num * sizeof (void *)));
- deadbeef->pl_unlock ();
- return;
- }
+ gtk_list_store_clear (store);
+ trkproperties_fill_meta (store, tracks, numtracks);
+ gtk_list_store_clear (propstore);
 
- if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
- if (!it) {
- free (tracks);
- tracks = NULL;
- deadbeef->pl_unlock ();
- return;
- }
- tracks0 = it;
+ // hardcoded properties
+ for (int i = 0; trkproperties_hc_propsi; i += 2) {
+ add_field (propstore, trkproperties_hc_propsi, _(trkproperties_hc_propsi+1), 1, tracks, numtracks);
 }
- else {
- int n = 0;
- DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
- while (it) {
- if (ctx == DDB_ACTION_CTX_PLAYLIST || deadbeef->pl_is_selected (it)) {
- assert (n < num);
- deadbeef->pl_item_ref (it);
- tracksn++ = it;
+ // properties
+ const char **keys = NULL;
+ int nkeys = trkproperties_build_key_list (&keys, 1, tracks, numtracks);
+ for (int k = 0; k < nkeys; k++) {
+ int i;
+ for (i = 0; trkproperties_hc_propsi; i += 2) {
+ if (!strcasecmp (keysk, trkproperties_hc_propsi)) {
+ break;
 }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
 }
+ if (trkproperties_hc_propsi) {
+ continue;
+ }
+ size_t l = strlen (keysk);
+ char titlel + 3;
+ snprintf (title, sizeof (title), "<%s>", keysk+1);
+ add_field (propstore, keysk, title, 1, tracks, numtracks);
 }
- numtracks = num;
-
- deadbeef->pl_unlock ();
+ if (keys) {
+ free (keys);
+ }
+}
 
+void
+show_track_properties_dlg_with_current_track_list (void) {
 GtkTreeView *tree;
 GtkTreeView *proptree;
 if (!trackproperties) {
@@ -480,27 +431,29 @@
 
 // metadata tree
 tree = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
- store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
+ store = gtk_list_store_new (6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT);
 gtk_tree_view_set_model (tree, GTK_TREE_MODEL (store));
 GtkCellRenderer *rend_text = gtk_cell_renderer_text_new ();
 rend_text2 = GTK_CELL_RENDERER (ddb_cell_renderer_text_multiline_new ());
- g_signal_connect ((gpointer)rend_text2, "edited",
- G_CALLBACK (on_metadata_edited),
- store);
- GtkTreeViewColumn *col1 = gtk_tree_view_column_new_with_attributes (_("Key"), rend_text, "text", 0, NULL);
- GtkTreeViewColumn *col2 = gtk_tree_view_column_new_with_attributes (_("Value"), rend_text2, "text", 1, NULL);
+ g_object_set (G_OBJECT (rend_text2), "editable", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+
+ g_signal_connect ((gpointer)rend_text2, "edited", G_CALLBACK (on_metadata_edited), store);
+
+ GtkTreeViewColumn *col1 = gtk_tree_view_column_new_with_attributes (_("Name"), rend_text, "text", META_COL_TITLE, NULL);
+ GtkTreeViewColumn *col2 = gtk_tree_view_column_new_with_attributes (_("Value"), rend_text2, "text", META_COL_DISPLAY_VAL, NULL);
+
 gtk_tree_view_append_column (tree, col1);
 gtk_tree_view_append_column (tree, col2);
 
 // properties tree
 proptree = GTK_TREE_VIEW (lookup_widget (trackproperties, "properties"));
- propstore = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+ propstore = gtk_list_store_new (6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT);
 gtk_tree_view_set_model (proptree, GTK_TREE_MODEL (propstore));
 GtkCellRenderer *rend_propkey = gtk_cell_renderer_text_new ();
 GtkCellRenderer *rend_propvalue = gtk_cell_renderer_text_new ();
- g_object_set (G_OBJECT (rend_propvalue), "editable", TRUE, NULL);
- col1 = gtk_tree_view_column_new_with_attributes (_("Key"), rend_propkey, "text", 0, NULL);
- col2 = gtk_tree_view_column_new_with_attributes (_("Value"), rend_propvalue, "text", 1, NULL);
+ g_object_set (G_OBJECT (rend_propvalue), "editable", FALSE, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+ col1 = gtk_tree_view_column_new_with_attributes (_("Key"), rend_propkey, "text", META_COL_TITLE, NULL);
+ col2 = gtk_tree_view_column_new_with_attributes (_("Value"), rend_propvalue, "text", META_COL_DISPLAY_VAL, NULL);
 gtk_tree_view_append_column (proptree, col1);
 gtk_tree_view_append_column (proptree, col2);
 }
@@ -514,20 +467,13 @@
 }
 
 if (numtracks == 1) {
- deadbeef->pl_lock ();
 gtk_entry_set_text (GTK_ENTRY (lookup_widget (trackproperties, "filename")), deadbeef->pl_find_meta_raw (tracks0, ":URI"));
- deadbeef->pl_unlock ();
 }
 else {
 gtk_entry_set_text (GTK_ENTRY (lookup_widget (trackproperties, "filename")), _("Multiple values"));
 }
 
- g_object_set (G_OBJECT (rend_text2), "editable", TRUE, NULL);
-
 GtkWidget *widget = trackproperties;
- GtkWidget *w;
- const char *meta;
-
 trkproperties_fill_metadata ();
 
 gtk_widget_set_sensitive (lookup_widget (widget, "write_tags"), TRUE);
@@ -536,50 +482,101 @@
 gtk_window_present (GTK_WINDOW (widget));
 }
 
-static gboolean
-set_metadata_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) {
- GValue mult = {0,};
- gtk_tree_model_get_value (model, iter, 3, &mult);
- int smult = g_value_get_int (&mult);
- if (!smult) {
- GValue key = {0,}, value = {0,};
- gtk_tree_model_get_value (model, iter, 2, &key);
- gtk_tree_model_get_value (model, iter, 1, &value);
- const char *skey = g_value_get_string (&key);
- const char *svalue = g_value_get_string (&value);
+static void
+_cleanup_track_list (void) {
+ for (int i = 0; i < numtracks; i++) {
+ deadbeef->pl_item_unref (orig_tracksi);
+ }
+ free (orig_tracks);
+ orig_tracks = NULL;
+ trkproperties_free_track_list (&tracks, &numtracks);
+}
 
- for (int i = 0; i < numtracks; i++) {
- const char *oldvalue= deadbeef->pl_find_meta_raw (tracksi, skey);
- if (oldvalue && strlen (oldvalue) > MAX_GUI_FIELD_LEN) {
- fprintf (stderr, "trkproperties: value is too long, ignored\n");
- continue;
- }
+void
+show_track_properties_dlg_with_track_list (ddb_playItem_t **track_list, int count) {
+ _cleanup_track_list ();
 
- if (*svalue) {
- deadbeef->pl_replace_meta (tracksi, skey, svalue);
- }
- else {
- deadbeef->pl_delete_meta (tracksi, skey);
- }
- }
+ if (count == 0) {
+ return;
 }
 
- return FALSE;
+ orig_tracks = calloc (count, sizeof (ddb_playItem_t *));
+ tracks = calloc (count, sizeof (ddb_playItem_t *));
+ for (int i = 0; i < count; i++) {
+ orig_tracksi = track_listi;
+ deadbeef->pl_item_ref(track_listi);
+ tracksi = deadbeef->pl_item_alloc();
+ deadbeef->pl_item_copy(tracksi, track_listi);
+ }
+ numtracks = count;
+ show_track_properties_dlg_with_current_track_list();
+ _delegate = NULL;
+}
+
+void
+show_track_properties_dlg (int ctx, ddb_playlist_t *plt) {
+ _cleanup_track_list();
+
+ last_ctx = ctx;
+ deadbeef->plt_ref (plt);
+ if (last_plt) {
+ deadbeef->plt_unref (last_plt);
+ }
+ last_plt = plt;
+
+ trkproperties_build_track_list_for_ctx (plt, ctx, &orig_tracks, &numtracks);
+
+ if (numtracks == 0) {
+ return;
+ }
+
+ tracks = calloc (numtracks, sizeof (ddb_playItem_t *));
+ for (int i = 0; i < numtracks; i++) {
+ tracksi = deadbeef->pl_item_alloc();
+ deadbeef->pl_item_copy(tracksi, orig_tracksi);
+ }
+
+ show_track_properties_dlg_with_current_track_list();
+ _delegate = NULL;
+}
+
+void
+trkproperties_set_delegate (trkproperties_delegate_t *delegate) {
+ _delegate = delegate;
 }
 
 static gboolean
 write_finished_cb (void *ctx) {
+ deadbeef->pl_lock ();
+
+ const char **keys = NULL;
+ int nkeys = trkproperties_build_key_list (&keys, 0, orig_tracks, numtracks);
+
+ for (int i = 0 ; i < numtracks; i++) {
+ // Remove all existing affected fields before adding the new ones
+ for (int j = 0; j < nkeys; j++) {
+ deadbeef->pl_delete_meta(orig_tracksi, keysj);
+ }
+
+ // Update the original items
+ deadbeef->pl_item_copy (orig_tracksi, tracksi);
+ }
+
+ free (keys);
+
+ deadbeef->pl_unlock();
+
 gtk_widget_destroy (progressdlg);
 progressdlg = NULL;
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- deadbeef->plt_modified (plt);
- deadbeef->plt_unref (plt);
- }
- main_refresh ();
- search_refresh ();
 trkproperties_modified = 0;
- show_track_properties_dlg (last_ctx);
+ if (last_plt) {
+ deadbeef->plt_modified (last_plt);
+ }
+ if (_delegate != NULL) {
+ _delegate->trkproperties_did_update_tracks (_delegate->user_data);
+ }
+
+ show_track_properties_dlg_with_current_track_list();
 
 return FALSE;
 }
@@ -588,9 +585,7 @@
 set_progress_cb (void *ctx) {
 DB_playItem_t *track = ctx;
 GtkWidget *progressitem = lookup_widget (progressdlg, "progresstitle");
- deadbeef->pl_lock ();
 gtk_entry_set_text (GTK_ENTRY (progressitem), deadbeef->pl_find_meta_raw (track, ":URI"));
- deadbeef->pl_unlock ();
 deadbeef->pl_item_unref (track);
 return FALSE;
 }
@@ -602,14 +597,12 @@
 break;
 }
 DB_playItem_t *track = trackst;
- deadbeef->pl_lock ();
 const char *dec = deadbeef->pl_find_meta_raw (track, ":DECODER");
 char decoder_id100;
 if (dec) {
 strncpy (decoder_id, dec, sizeof (decoder_id));
 }
 int match = track && dec;
- deadbeef->pl_unlock ();
 if (match) {
 int is_subtrack = deadbeef->pl_get_item_flags (track) & DDB_IS_SUBTRACK;
 if (is_subtrack) {
@@ -645,55 +638,23 @@
 
 static void
 on_progress_abort (GtkButton *button,
- gpointer user_data)
-{
+ gpointer user_data) {
 progress_aborted = 1;
 }
 
 void
 on_write_tags_clicked (GtkButton *button,
- gpointer user_data)
-{
- deadbeef->pl_lock ();
- GtkTreeView *tree = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
- GtkTreeModel *model = GTK_TREE_MODEL (gtk_tree_view_get_model (tree));
-
- // delete all metadata properties that are not in the listview
- for (int i = 0; i < numtracks; i++) {
- DB_metaInfo_t *meta = deadbeef->pl_get_metadata_head (tracksi);
- while (meta) {
- DB_metaInfo_t *next = meta->next;
- if (meta->key0 != ':' && meta->key0 != '!' && meta->key0 != '_') {
- GtkTreeIter iter;
- gboolean res = gtk_tree_model_get_iter_first (model, &iter);
- while (res) {
- GValue key = {0,};
- gtk_tree_model_get_value (model, &iter, 2, &key);
- const char *skey = g_value_get_string (&key);
-
- if (!strcasecmp (skey, meta->key)) {
- // field found, don't delete
- break;
- }
- res = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter);
- }
- if (!res) {
- // field not found, delete
- deadbeef->pl_delete_metadata (tracksi, meta);
- }
- }
- meta = next;
- }
+ gpointer user_data) {
+ if (numtracks > 25) {
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 }
- // put all metainfo into track
- gtk_tree_model_foreach (model, set_metadata_cb, NULL);
- deadbeef->pl_unlock ();
-
- for (int i = 0; i < numtracks; i++) {
- ddb_event_track_t *ev = (ddb_event_track_t *)deadbeef->event_alloc (DB_EV_TRACKINFOCHANGED);
- ev->track = tracksi;
- deadbeef->pl_item_ref (ev->track);
- deadbeef->event_send ((ddb_event_t*)ev, 0, 0);
+ else {
+ for (int i = 0; i < numtracks; i++) {
+ ddb_event_track_t *ev = (ddb_event_track_t *)deadbeef->event_alloc (DB_EV_TRACKINFOCHANGED);
+ ev->track = tracksi;
+ deadbeef->pl_item_ref (ev->track);
+ deadbeef->event_send ((ddb_event_t*)ev, 0, 0);
+ }
 }
 
 progress_aborted = 0;
@@ -717,24 +678,544 @@
 deadbeef->thread_detach (tid);
 }
 
-void
-on_add_field_activate (GtkMenuItem *menuitem,
- gpointer user_data) {
- GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
- if (!gtk_widget_is_focus(GTK_WIDGET (treeview))) {
- return; // do not add field if Metadata tab is not focused
+gboolean
+on_metalist_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
+{
+ if (event->button == 3) {
+ GtkWidget *menu = create_trkproperties_popup_menu ();
+ gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (widget), NULL);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, gtk_get_current_event_time());
+ }
+ return FALSE;
+}
+
+void
+on_tagwriter_settings_clicked (GtkButton *button,
+ gpointer user_data)
+{
+ run_tagwriter_settings (trackproperties);
+}
+
+gboolean
+on_trackproperties_configure_event (GtkWidget *widget,
+ GdkEventConfigure *event,
+ gpointer user_data)
+{
+ wingeom_save (widget, "trkproperties");
+ return FALSE;
+}
+
+
+gboolean
+on_trackproperties_window_state_event (GtkWidget *widget,
+ GdkEventWindowState *event,
+ gpointer user_data)
+{
+ wingeom_save_max (event, widget, "trkproperties");
+ return FALSE;
+}
+
+static void _update_single_value(GtkTextBuffer *buffer, GtkTreeIter *iter, const char *skey, const char *stitle) {
+ GtkTextIter begin, end;
+
+ gtk_text_buffer_get_start_iter (buffer, &begin);
+ gtk_text_buffer_get_end_iter (buffer, &end);
+
+ char *new_text = gtk_text_buffer_get_text (buffer, &begin, &end, TRUE);
+
+ for (int i = 0; i < numtracks; i++) {
+ _apply_field_to_track(tracksi, skey, new_text);
+ }
+ free (new_text);
+
+ size_t val_len = 5000;
+ char *val = malloc(val_len);
+
+ // get value to edit
+ trkproperties_get_field_value (val, (int)val_len, skey, tracks, numtracks);
+
+ _set_metadata_row(store, iter, skey, 0, stitle, val);
+
+ free (val);
+
+ trkproperties_modified = 1;
+}
+
+static void
+_edit_field_single_track (void) {
+ GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
+ GtkTreeSelection *sel = gtk_tree_view_get_selection (treeview);
+ int count = gtk_tree_selection_count_selected_rows (sel);
+ if (count != 1) {
+ return; // multiple fields can't be edited at the same time
+ }
+
+
+ GtkWidget *dlg = create_edit_tag_value_dlg ();
+ gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (trackproperties));
+ gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+
+ GList *lst = gtk_tree_selection_get_selected_rows (sel, NULL);
+
+ GtkTreePath *path = lst->data;
+
+ GtkTreeIter iter;
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
+ for (GList *l = lst; l; l = l->next) {
+ gtk_tree_path_free (l->data);
+ }
+ g_list_free (lst);
+ path = NULL;
+ lst = NULL;
+
+ GValue title = {};
+ GValue key = {};
+ GValue value = {};
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 0, &title);
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 2, &key);
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 4, &value);
+ const char *skey = g_value_get_string (&key);
+ const char *svalue = g_value_get_string (&value);
+ const char *stitle = g_value_get_string (&title);
+
+ char *uppercase_key = strdup (skey);
+ for (char *p = uppercase_key; *p; p++) {
+ *p = toupper (*p);
+ }
+
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "field_name")), uppercase_key);
+
+ free (uppercase_key);
+
+ GtkTextBuffer *buffer = gtk_text_buffer_new (NULL);
+ gtk_text_buffer_set_text (buffer, svalue, (gint)strlen (svalue));
+ gtk_text_view_set_buffer (GTK_TEXT_VIEW (lookup_widget (dlg, "field_value")), buffer);
+
+ g_value_unset (&value);
+
+ int response = gtk_dialog_run (GTK_DIALOG (dlg));
+ if (response == GTK_RESPONSE_OK) {
+ _update_single_value(buffer, &iter, skey, stitle);
+ }
+ g_value_unset (&key);
+ g_value_unset (&title);
+ g_object_unref (buffer);
+ gtk_widget_destroy (dlg);
+}
+
+void
+on_individual_field_edited (GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer user_data) {
+ GtkListStore *store = GTK_LIST_STORE (user_data);
+ GtkTreePath *treepath = gtk_tree_path_new_from_string (path);
+ GtkTreeIter iter;
+
+ if (!treepath) {
+ return;
+ }
+
+ gboolean valid = gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, treepath);
+ gtk_tree_path_free (treepath);
+
+ if (!valid) {
+ return;
+ }
+
+ GValue value = {};
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 4, &value);
+ const char *svalue = g_value_get_string (&value);
+ if (!svalue) {
+ svalue = "";
+ }
+
+ // The multiple values case gets cleared on attempt to edit,
+ // that's why the change gets applied unconditionally for multivalue case
+ if (strcmp (svalue, new_text)) {
+ gtk_list_store_set (store, &iter, META_COL_KEY, new_text, META_COL_IS_MULT, 0, META_COL_VALUE, new_text, -1);
+ }
+
+ G_IS_VALUE (&value) ? ((void)(g_value_unset (&value)), NULL) : NULL;
+}
+
+
+static char *
+_semicolon_separated_string_for_meta(DB_metaInfo_t *meta) {
+ if (meta == NULL) {
+ return strdup("");
 }
- GtkWidget *dlg = create_entrydialog ();
- gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (trackproperties));
- gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
- gtk_window_set_title (GTK_WINDOW (dlg), _("Field name"));
- GtkWidget *e;
- e = lookup_widget (dlg, "title_label");
- gtk_label_set_text (GTK_LABEL(e), _("Name:"));
- for (;;) {
- int res = gtk_dialog_run (GTK_DIALOG (dlg));
- if (res == GTK_RESPONSE_OK) {
- e = lookup_widget (dlg, "title");
+
+ char *field = NULL;
+ size_t valuelen = 0;
+ size_t len = 0;
+ const char *value = meta->value;
+ while (len < meta->valuesize) {
+ size_t metalen = strlen (value);
+ if (metalen == 0) {
+ break;
+ }
+
+ size_t newlen = valuelen + metalen;
+ int add_semicolon = 0;
+ if (field != NULL) {
+ newlen += 2;
+ add_semicolon = 1;
+ }
+
+ field = realloc (field, newlen+1);
+
+ if (add_semicolon) {
+ memcpy (field + valuelen, "; ", 2);
+ valuelen += 2;
+ }
+
+ memcpy (field + valuelen, value, metalen);
+ valuelen = newlen;
+
+ len += metalen + 1;
+ value += metalen + 1;
+ }
+
+ if (field != NULL) {
+ fieldvaluelen = 0;
+ }
+ else {
+ field = strdup("");
+ }
+
+ return field;
+}
+
+static void
+_iterate_semicolon_separated_substrings(const char *svalue, void (^completion_block)(const char *item)) {
+ while (*svalue) {
+ char *semicolon = strchr(svalue, ';');
+
+ size_t len;
+ if (semicolon == NULL) {
+ len = strlen(svalue);
+ }
+ else {
+ len = semicolon - svalue;
+ }
+
+ char *item = malloc (len + 1);
+ memcpy (item, svalue, len);
+ itemlen = 0;
+
+ char *trimmed_item = gtkui_trim_whitespace(item, len);
+
+ if (*trimmed_item) {
+ completion_block(trimmed_item);
+ }
+
+ free (item);
+
+ if (semicolon != NULL) {
+ len += 1;
+ }
+ svalue += len;
+ }
+}
+
+static void
+_edit_field_multiple_tracks (void) {
+ GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
+ GtkTreeSelection *sel = gtk_tree_view_get_selection (treeview);
+ int count = gtk_tree_selection_count_selected_rows (sel);
+ if (count != 1) {
+ return; // multiple fields can't be edited at the same time
+ }
+
+ GtkWidget *dlg = create_edit_multiple_tracks_dialog();
+ gtk_widget_set_size_request(dlg, 400, 300);
+ gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (trackproperties));
+ gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+
+ GList *lst = gtk_tree_selection_get_selected_rows (sel, NULL);
+
+ GtkTreePath *path = lst->data;
+
+ GtkTreeIter iter;
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
+ for (GList *l = lst; l; l = l->next) {
+ gtk_tree_path_free (l->data);
+ }
+ g_list_free (lst);
+ path = NULL;
+ lst = NULL;
+
+ GValue title = {};
+ GValue key = {};
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 0, &title);
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 2, &key);
+
+ const char *stitle = g_value_get_string (&title);
+ const char *skey = g_value_get_string (&key);
+
+ char *uppercase_key = strdup (skey);
+ for (char *p = uppercase_key; *p; p++) {
+ *p = toupper (*p);
+ }
+
+ gtk_entry_set_text (GTK_ENTRY (lookup_widget (dlg, "entry_field_name")), uppercase_key);
+ free (uppercase_key);
+
+ // Initialize the single value tab
+
+ // Allow editing the value if it's the same on all tracks
+ GValue mult = {};
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 3, &mult);
+ int imult = g_value_get_int (&mult);
+
+ if (!imult) {
+ GValue value = {};
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 4, &value);
+ const char *svalue = g_value_get_string (&value);
+
+ GtkTextBuffer *buffer = gtk_text_buffer_new (NULL);
+ gtk_text_buffer_set_text (buffer, svalue, (gint)strlen (svalue));
+ g_value_unset (&value);
+ gtk_text_view_set_buffer (GTK_TEXT_VIEW (lookup_widget (dlg, "textview_single_value")), buffer);
+ }
+
+ // Initialize the individual values tab
+ GtkListStore *list_store = gtk_list_store_new(META_COL_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_INT);
+
+ GtkTreeView *tree = GTK_TREE_VIEW (lookup_widget (dlg, "treeview_individual_values"));
+ gtk_tree_view_set_model (tree, GTK_TREE_MODEL (list_store));
+
+ GtkCellRenderer *rend_text = gtk_cell_renderer_text_new ();
+ GtkCellRenderer *rend_text2 = gtk_cell_renderer_text_new();
+ GtkCellRenderer *rend_text3 = GTK_CELL_RENDERER (ddb_cell_renderer_text_multiline_new ());
+
+ g_object_set (G_OBJECT (rend_text3), "editable", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+ g_signal_connect ((gpointer)rend_text3, "edited", G_CALLBACK (on_individual_field_edited), list_store);
+
+ GtkTreeViewColumn *col1 = gtk_tree_view_column_new_with_attributes ("#", rend_text, "text", META_COL_TITLE, NULL);
+ GtkTreeViewColumn *col2 = gtk_tree_view_column_new_with_attributes (_("Item"), rend_text2, "text", META_COL_DISPLAY_VAL, NULL);
+ GtkTreeViewColumn *col3 = gtk_tree_view_column_new_with_attributes (_("Field"), rend_text3, "text", META_COL_KEY, NULL);
+
+ gtk_tree_view_column_set_resizable(col2, TRUE);
+ gtk_tree_view_column_set_resizable(col3, TRUE);
+
+ gtk_tree_view_append_column (tree, col1);
+ gtk_tree_view_append_column (tree, col2);
+ gtk_tree_view_append_column (tree, col3);
+
+ char *item_tf = deadbeef->tf_compile ("%title% // %track artist%");
+
+ ddb_tf_context_t ctx;
+ memset (&ctx, 0, sizeof (ctx));
+
+ ctx._size = sizeof (ctx);
+ ctx.plt = NULL;
+ ctx.idx = -1;
+ ctx.id = -1;
+
+ for (int i = 0; i < numtracks; i++) {
+ char item1000;
+ ctx.it = tracksi;
+ deadbeef->tf_eval(&ctx, item_tf, item, sizeof (item));
+
+ char idx10;
+ snprintf (idx, sizeof (idx), "%d", i+1);
+ DB_metaInfo_t *meta = deadbeef->pl_meta_for_key(tracksi, skey);
+ char *field = _semicolon_separated_string_for_meta(meta);
+
+ GtkTreeIter new_iter;
+ gtk_list_store_append(list_store, &new_iter);
+ gtk_list_store_set (list_store, &new_iter, META_COL_TITLE, idx, META_COL_DISPLAY_VAL, item, META_COL_KEY, field, META_COL_IS_MULT, 0, META_COL_VALUE, field, -1);
+
+
+ free (field);
+ }
+
+ deadbeef->tf_free (item_tf);
+
+ gint response = gtk_dialog_run (GTK_DIALOG (dlg));
+
+ if (response == GTK_RESPONSE_OK) {
+ GtkWidget *tabs = lookup_widget(dlg, "notebook");
+ gint tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
+
+ if (tab == 0) {
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(lookup_widget (dlg, "textview_single_value")));
+ _update_single_value(buffer, &iter, skey, stitle);
+ }
+ else if (tab == 1) {
+ GtkTreeIter curr_item_iter;
+ gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &curr_item_iter);
+ for (int i = 0; i < numtracks; i++) {
+ GValue value = {};
+ gtk_tree_model_get_value(GTK_TREE_MODEL(list_store), &curr_item_iter, 2, &value);
+ const char *svalue = g_value_get_string (&value);
+
+ _apply_field_to_track(tracksi, skey, svalue);
+
+ g_value_unset (&value);
+
+ gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), &curr_item_iter);
+ }
+
+ // create new text from tracks
+ size_t val_len = 5000;
+ char *val = malloc(val_len);
+
+ // get value to edit
+ const char *mult = _("Multiple values ");
+ size_t ml = strlen (mult);
+ memcpy (val, mult, ml+1);
+ int n = trkproperties_get_field_value (val + ml, (int)(val_len - ml), skey, tracks, numtracks);
+
+ char *display_val = val;
+ if (!n) {
+ display_val += ml;
+ }
+
+ _set_metadata_row(store, &iter, skey, 0, stitle, display_val);
+
+ free (val);
+
+ trkproperties_modified = 1;
+ }
+ }
+
+ g_value_unset (&title);
+ g_value_unset (&key);
+ gtk_widget_destroy (dlg);
+}
+
+void
+on_trkproperties_edit_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ if (numtracks == 1) {
+ _edit_field_single_track();
+ }
+ else if (numtracks > 1) {
+ _edit_field_multiple_tracks();
+ }
+}
+
+
+void
+on_trkproperties_edit_in_place_activate
+ (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
+ GtkTreePath *path;
+ gtk_tree_view_get_cursor (treeview, &path, NULL);
+ if (!path) {
+ return;
+ }
+
+ GtkTreeViewColumn *col = gtk_tree_view_get_column (treeview, 1);
+
+ gtk_tree_view_set_cursor (treeview, path, col, TRUE); // set cursor onto new field
+ gtk_tree_path_free(path);
+}
+
+
+void
+on_trkproperties_remove_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
+ GtkTreePath *path;
+ GtkTreeViewColumn *col;
+ gtk_tree_view_get_cursor (treeview, &path, &col);
+ if (!path || !col) {
+ return;
+ }
+
+ GtkTreeIter iter;
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
+ GValue key = {};
+ gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 2, &key);
+ const char *skey = g_value_get_string (&key);
+
+ for (int i = 0; i < numtracks; i++) {
+ deadbeef->pl_delete_meta(tracksi, skey);
+ }
+
+ _remove_field(store, &iter, skey);
+ g_value_unset (&key);
+
+ gtk_tree_view_set_cursor (treeview, path, NULL, FALSE); // restore cursor after deletion
+ gtk_tree_path_free (path);
+
+ trkproperties_modified = 1;
+}
+
+
+void
+on_trkproperties_cut_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+
+}
+
+
+void
+on_trkproperties_copy_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+
+}
+
+
+void
+on_trkproperties_paste_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+
+}
+
+
+void
+on_trkproperties_capitalize_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+
+}
+
+
+void
+on_trkproperties_clean_up_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+
+}
+
+
+void
+on_trkproperties_format_from_other_fields_activate
+ (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+
+}
+
+
+void
+on_trkproperties_add_new_field_activate
+ (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ GtkWidget *dlg = create_entrydialog ();
+ gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (trackproperties));
+ gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+ gtk_window_set_title (GTK_WINDOW (dlg), _("Field name"));
+ GtkWidget *e;
+ e = lookup_widget (dlg, "title_label");
+ gtk_label_set_text (GTK_LABEL(e), _("Name:"));
+ GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
+ for (;;) {
+ int res = gtk_dialog_run (GTK_DIALOG (dlg));
+ if (res == GTK_RESPONSE_OK) {
+ e = lookup_widget (dlg, "title");
 
 const char *text = gtk_entry_get_text (GTK_ENTRY(e));
 
@@ -754,25 +1235,27 @@
 int dup = 0;
 gboolean res = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter);
 while (res) {
- GValue value = {0,};
+ GValue value = {0};
 gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 2, &value);
 const char *svalue = g_value_get_string (&value);
 if (!strcasecmp (svalue, text)) {
+ g_value_unset(&value);
 dup = 1;
 break;
 }
+ g_value_unset(&value);
 res = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter);
 }
 
 if (!dup) {
- int l = strlen (text);
+ size_t l = strlen (text);
 char titlel+3;
 snprintf (title, sizeof (title), "<%s>", text);
 const char *value = "";
 const char *key = text;
 
 gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, title, 1, value, 2, key, -1);
+ gtk_list_store_set (store, &iter, META_COL_TITLE, title, META_COL_DISPLAY_VAL, value, META_COL_KEY, key, META_COL_IS_MULT, 0, META_COL_VALUE, value, -1);
 GtkTreePath *path;
 gint rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
 path = gtk_tree_path_new_from_indices (rows - 1, -1);
@@ -796,97 +1279,96 @@
 }
 
 void
-on_remove_field_activate (GtkMenuItem *menuitem,
- gpointer user_data) {
+on_trkproperties_paste_fields_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
 
- GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
- if (!gtk_widget_is_focus(GTK_WIDGET (treeview))) {
- return; // do not remove field if Metadata tab is not focused
- }
- GtkTreePath *path;
- GtkTreeViewColumn *col;
- gtk_tree_view_get_cursor (treeview, &path, &col);
- if (!path || !col) {
- return;
- }
+}
 
- GtkTreeIter iter;
- gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
- GValue value = {0,};
- gtk_tree_model_get_value (GTK_TREE_MODEL (store), &iter, 2, &value);
- const char *svalue = g_value_get_string (&value);
+void
+on_trkproperties_automatically_fill_values_activate
+ (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
 
- // delete unknown fields completely; otherwise just clear
- int i = 0;
- for (; typesi; i += 2) {
- if (!strcasecmp (svalue, typesi)) {
+}
+
+// predefined keys clear, otherwise remove
+static void
+_remove_field(GtkListStore *model, GtkTreeIter *iter, const char *skey) {
+ GValue title = {};
+ gtk_tree_model_get_value (GTK_TREE_MODEL(model), iter, 0, &title);
+ const char *stitle = g_value_get_string (&title);
+ int cleared = 0;
+ for (int i = 0; trkproperties_typesi != NULL; i += 2) {
+ if (!strcasecmp (trkproperties_typesi, skey)) {
+ _set_metadata_row(store, iter, skey, 0, stitle, "");
+ cleared = 1;
 break;
 }
 }
- if (typesi) { // known val, clear
- gtk_list_store_set (store, &iter, 1, "", 3, 0, -1);
- }
- else {
- gtk_list_store_remove (store, &iter);
+
+ if (!cleared) {
+ gtk_list_store_remove(store, iter);
 }
- gtk_tree_view_set_cursor (treeview, path, NULL, FALSE); // restore cursor after deletion
- gtk_tree_path_free (path);
- trkproperties_modified = 1;
+ g_value_unset(&title);
 }
 
-gboolean
-on_metalist_button_press_event (GtkWidget *widget,
- GdkEventButton *event,
- gpointer user_data)
-{
- if (event->button == 3) {
- GtkWidget *menu;
- GtkWidget *add;
- GtkWidget *remove;
- menu = gtk_menu_new ();
- add = gtk_menu_item_new_with_mnemonic (_("Add field"));
- gtk_widget_show (add);
- gtk_container_add (GTK_CONTAINER (menu), add);
- remove = gtk_menu_item_new_with_mnemonic (_("Remove field"));
- gtk_widget_show (remove);
- gtk_container_add (GTK_CONTAINER (menu), remove);
+void
+on_trkproperties_crop_activate (GtkMenuItem *menuitem,
+ gpointer user_data) {
+ GtkTreeView *treeview = GTK_TREE_VIEW (lookup_widget (trackproperties, "metalist"));
+ GtkTreeModel *model = gtk_tree_view_get_model (treeview);
+
+ GtkTreePath *path;
+ gtk_tree_view_get_cursor (treeview, &path, NULL);
+ if (!path) {
+ return;
+ }
 
- g_signal_connect ((gpointer) add, "activate",
- G_CALLBACK (on_add_field_activate),
- NULL);
+ GtkTreeIter iter_curr;
+ gtk_tree_model_get_iter (model, &iter_curr, path);
 
- g_signal_connect ((gpointer) remove, "activate",
- G_CALLBACK (on_remove_field_activate),
- NULL);
+ // Create a list of iters to remove
+ GtkTreeIter **iters_to_remove = calloc (gtk_tree_model_iter_n_children(model, NULL), sizeof (GtkTreeIter *));
+ int count = 0;
 
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, widget, event->button, gtk_get_current_event_time());
+ GtkTreeIter iter;
+ gboolean res = gtk_tree_model_get_iter_first (model, &iter);
+ while (res) {
+ int getnext = 1;
+ GtkTreePath *iter_path = gtk_tree_model_get_path (model, &iter);
+
+ if (gtk_tree_path_compare (path, iter_path)) {
+ iters_to_removecount++ = gtk_tree_iter_copy(&iter);
+ }
+
+ gtk_tree_path_free (iter_path);
+ if (getnext) {
+ res = gtk_tree_model_iter_next (model, &iter);
+ }
 }
- return FALSE;
-}
 
-void
-on_tagwriter_settings_clicked (GtkButton *button,
- gpointer user_data)
-{
- run_tagwriter_settings (trackproperties);
-}
+ // Remove the collected iters
+ for (int i = 0; i < count; i++) {
+ GValue key = {};
+ gtk_tree_model_get_value (model, iters_to_removei, 2, &key);
+ const char *skey = g_value_get_string (&key);
 
-gboolean
-on_trackproperties_configure_event (GtkWidget *widget,
- GdkEventConfigure *event,
- gpointer user_data)
-{
- wingeom_save (widget, "trkproperties");
- return FALSE;
-}
+ for (int i = 0; i < numtracks; i++) {
+ deadbeef->pl_delete_meta(tracksi, skey);
+ }
 
+ _remove_field(store, iters_to_removei, skey);
+ g_value_unset(&key);
 
-gboolean
-on_trackproperties_window_state_event (GtkWidget *widget,
- GdkEventWindowState *event,
- gpointer user_data)
-{
- wingeom_save_max (event, widget, "trkproperties");
- return FALSE;
+ gtk_tree_iter_free(iters_to_removei);
+ }
+ free (iters_to_remove);
+ iters_to_remove = NULL;
+
+ gtk_tree_view_set_cursor (treeview, path, NULL, FALSE); // restore cursor after deletion
+ gtk_tree_path_free (path);
+ trkproperties_modified = 1;
 }

deadbeef-0.6.2.tar.bz2/plugins/gtkui/trkproperties.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/trkproperties.h Changed

@@ -1,30 +1,58 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifndef __TRKPROPERTIES_H
 #define __TRKPROPERTIES_H
 
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+
+// list store column meanings (for Metadata and Properties, also used by Selection properties widget)
+enum {
+ META_COL_TITLE = 0,
+ META_COL_DISPLAY_VAL = 1,
+ META_COL_KEY = 2,
+ META_COL_IS_MULT = 3,
+ META_COL_VALUE = 4,
+ META_COL_PANGO_WEIGHT = 5,
+ META_COL_COUNT
+};
 
 struct DB_playItem_s;
 
+typedef struct {
+ void (*trkproperties_did_update_tracks)(void *user_data);
+ void (*trkproperties_did_reload_metadata)(void *user_data);
+ void (*trkproperties_did_delete_files)(void *user_data, int cancelled);
+ void *user_data;
+} trkproperties_delegate_t;
+
 void
-show_track_properties_dlg (int ctx);
+show_track_properties_dlg (int ctx, ddb_playlist_t *plt);
+
+/// Sets the delegate for the currently displayed track properties dialog.
+/// The next call of @c show_track_properties_dlg or similar will reset the delegate to NULL.
+void
+trkproperties_set_delegate (trkproperties_delegate_t *delegate);
 
 void
 trkproperties_destroy (void);
@@ -38,4 +66,13 @@
 void
 trkproperties_fill_meta (GtkListStore *store, DB_playItem_t **tracks, int numtracks);
 
+void
+trkproperties_fill_prop (GtkListStore *propstore, DB_playItem_t **tracks, int numtracks);
+
+void
+add_field_section(GtkListStore *store, const char *title, const char *value);
+
+void
+show_track_properties_dlg_with_track_list (ddb_playItem_t **track_list, int count);
+
 #endif

deadbeef-0.6.2.tar.bz2/plugins/gtkui/widgets.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/widgets.c Changed

@@ -1,47 +1,58 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
 
- 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.
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
+#include <ctype.h>
+#include <gtk/gtk.h>
+#include <jansson.h>
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <deadbeef/fastftoi.h>
+#include <deadbeef/strdupa.h>
+#include "../../shared/analyzer/analyzer.h"
+#include "../../shared/scope/scope.h"
+#include "../libparser/parser.h"
+#include "actions.h"
+#include "callbacks.h"
+#include "ddb_splitter.h"
+#include "ddbseekbar.h"
+#include "ddbtabstrip.h"
+#include "ddbvolumebar.h"
+#include "drawing.h"
 #include "gtkui.h"
+#include "hotkeys.h" // for building action treeview
 #include "interface.h"
+#include "namedicons.h"
+#include "playlist/ddblistview.h"
+#include "playlist/mainplaylist.h"
+#include "playlist/playlistcontroller.h"
 #include "support.h"
-#include "widgets.h"
-#include "ddbtabstrip.h"
-#include "ddblistview.h"
-#include "mainplaylist.h"
-#include "../libparser/parser.h"
 #include "trkproperties.h"
-#include "coverart.h"
-#if USE_OPENGL
-#include "gtkuigl.h"
+#ifdef DDB_WARN_DEPRECATED
+#undef DDB_WARN_DEPRECATED
 #endif
-#include "namedicons.h"
-#include "hotkeys.h" // for building action treeview
-#include "../../strdupa.h"
-#include "../../fastftoi.h"
-#include "actions.h"
-#include "ddbseekbar.h"
-#include "ddbvolumebar.h"
-#include "callbacks.h"
+#include "widgets.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
@@ -89,7 +100,11 @@
 typedef struct {
 ddb_gtkui_widget_t base;
 GtkWidget *box;
- int position;
+ // size of first child
+ int size1;
+ // size of second child
+ int size2;
+ float ratio;
 int locked;
 } w_splitter_t;
 
@@ -104,8 +119,10 @@
 
 typedef struct {
 ddb_gtkui_widget_t base;
- DdbListview *list;
+ playlist_controller_t *controller;
+ DdbListview *listview;
 int hideheaders;
+ int width;
 } w_playlist_t;
 
 typedef struct {
@@ -120,58 +137,103 @@
 
 typedef struct {
 ddb_gtkui_widget_t base;
+ ddb_gtkui_widget_extended_api_t exapi;
 int clicked_page;
+ int active;
+
+ // These fields are used only during deserialization, and then get freed
+ int num_tabs;
+ char **titles;
 } w_tabs_t;
 
-typedef struct {
- ddb_gtkui_widget_t base;
- GtkWidget *tree;
-} w_selproperties_t;
+typedef enum {
+ SCOPE_SCALE_AUTO,
+ SCOPE_SCALE_1X,
+ SCOPE_SCALE_2X,
+ SCOPE_SCALE_3X,
+ SCOPE_SCALE_4X,
+} scope_scale_t;
 
 typedef struct {
 ddb_gtkui_widget_t base;
+ ddb_gtkui_widget_extended_api_t exapi;
 GtkWidget *drawarea;
- int cover_size;
- int new_cover_size;
- guint cover_refresh_timeout_id;
-} w_coverart_t;
 
-typedef struct {
- ddb_gtkui_widget_t base;
- GtkWidget *drawarea;
 guint drawtimer;
-#if USE_OPENGL
- GdkGLContext *glcontext;
-#endif
- float *samples;
- int nsamples;
- int resized;
+
 intptr_t mutex;
+
+ scope_scale_t scale;
+
+ gboolean is_listening;
+ ddb_scope_t scope;
+ ddb_scope_draw_data_t draw_data;
+
+ uint32_t draw_color;
+ uint32_t background_color;
+
 cairo_surface_t *surf;
+
+ gboolean updating_menu; // suppress menu event handlers
+ GtkWidget *menu;
+
+ GtkWidget *mode_multichannel_item;
+ GtkWidget *mode_mono_item;
+
+ GtkWidget *scale_auto_item;
+ GtkWidget *scale_1x_item;
+ GtkWidget *scale_2x_item;
+ GtkWidget *scale_3x_item;
+ GtkWidget *scale_4x_item;
+
+ GtkWidget *fragment_duration_50ms_item;
+ GtkWidget *fragment_duration_100ms_item;
+ GtkWidget *fragment_duration_200ms_item;
+ GtkWidget *fragment_duration_300ms_item;
+ GtkWidget *fragment_duration_500ms_item;
 } w_scope_t;
 
-// spectrum analyzer based on cairo-spectrum from audacious
-// Copyright (c) 2011 William Pitcock <nenolod@dereferenced.org>
-#define MAX_BANDS DDB_FREQ_BANDS
-#define VIS_DELAY 1
-#define VIS_DELAY_PEAK 10
-#define VIS_FALLOFF 1
-#define VIS_FALLOFF_PEAK 1
-#define BAND_WIDTH 20
+
+#define SpectrumVisXOffset 40
+#define SpectrumVisYOffset 12
+
 typedef struct {
 ddb_gtkui_widget_t base;
+ ddb_gtkui_widget_extended_api_t exapi;
 GtkWidget *drawarea;
 guint drawtimer;
-#if USE_OPENGL
- GdkGLContext *glcontext;
-#endif
- float dataDDB_FREQ_BANDS * DDB_FREQ_MAX_CHANNELS;
- float xscaleMAX_BANDS + 1;
- int barsMAX_BANDS + 1;
- int delayMAX_BANDS + 1;
- int peaksMAX_BANDS + 1;
- int delay_peakMAX_BANDS + 1;
+
+ intptr_t mutex;
+
+ gboolean is_listening;
+ ddb_analyzer_t analyzer;
+ ddb_analyzer_draw_data_t draw_data;
+ ddb_waveformat_t fmt;
+ ddb_audio_data_t input_data;
+
+ float grid_color3;
+ float peak_color3;
+ float bar_color3;
+ float background_color3;
+
 cairo_surface_t *surf;
+
+ gboolean updating_menu; // suppress menu event handlers
+ GtkWidget *menu;
+ GtkWidget *mode_discrete_item;
+ GtkWidget *mode_12_item;
+ GtkWidget *mode_24_item;
+
+ GtkWidget *gap_none_item;
+ GtkWidget *gap_2_item;
+ GtkWidget *gap_3_item;
+ GtkWidget *gap_4_item;
+ GtkWidget *gap_5_item;
+ GtkWidget *gap_6_item;
+ GtkWidget *gap_7_item;
+ GtkWidget *gap_8_item;
+ GtkWidget *gap_9_item;
+ GtkWidget *gap_10_item;
 } w_spectrum_t;
 
 typedef struct {
@@ -209,6 +271,7 @@
 
 typedef struct {
 ddb_gtkui_widget_t base;
+ ddb_gtkui_widget_extended_api_t exapi;
 GtkWidget *volumebar;
 } w_volumebar_t;
 
@@ -217,9 +280,24 @@
 GtkWidget *voices8;
 } w_ctvoices_t;
 
-static int design_mode;
+typedef struct {
+ ddb_gtkui_widget_t base;
+ GtkWidget *textview;
+ int scroll_bottomed;
+} w_logviewer_t;
+
+static int w_logviewer_instancecount;
+
+typedef struct {
+ w_logviewer_t *w;
+ char *text_to_add;
+} logviewer_addtexts_t;
+
+int design_mode;
 static ddb_gtkui_widget_t *rootwidget;
 
+static const char associated_widget_data_id = "uiwidget";
+
 //// common functions
 
 void
@@ -229,13 +307,18 @@
 
 void
 w_free (void) {
- w_save ();
 w_creator_t *next = NULL;
 for (w_creator_t *cr = w_creators; cr; cr = next) {
 next = cr->next;
 free (cr);
 }
 w_creators = NULL;
+
+ if (rootwidget != NULL) {
+ w_remove (NULL, rootwidget);
+ w_destroy (rootwidget);
+ rootwidget = NULL;
+ }
 }
 
 ddb_gtkui_widget_t *
@@ -295,24 +378,26 @@
 w_destroy (c);
 }
 
- if (cont->remove) {
- cont->remove (cont, child);
- }
- child->widget = NULL;
- ddb_gtkui_widget_t *prev = NULL;
- for (ddb_gtkui_widget_t *c = cont->children; c; c = c->next) {
- if (c == child) {
- if (prev) {
- prev->next = c->next;
- }
- else {
- cont->children = c->next;
+ if (cont) {
+ if (cont->remove) {
+ cont->remove (cont, child);
+ }
+ ddb_gtkui_widget_t *prev = NULL;
+ for (ddb_gtkui_widget_t *c = cont->children; c; c = c->next) {
+ if (c == child) {
+ if (prev) {
+ prev->next = c->next;
+ }
+ else {
+ cont->children = c->next;
+ }
+ break;
 }
- break;
+ prev = c;
 }
- prev = c;
 }
 child->parent = NULL;
+ child->widget = NULL;
 }
 
 GtkWidget *
@@ -339,96 +424,27 @@
 }
 }
 
+static const char *
+w_get_title (ddb_gtkui_widget_t *w)
+{
+ for (w_creator_t *cr = w_creators; cr; cr = cr->next) {
+ if (cr->type == w->type && cr->title) {
+ return cr->title;
+ }
+ }
+ return NULL;
+}
+
 // unknown widget wrapper
 typedef struct {
 ddb_gtkui_widget_t base;
 GtkWidget *drawarea;
- char *expected_type;
- char *parms;
- char *children;
+ char *data; // json string of the whole node
 } w_unknown_t;
 
-const char *
-w_unknown_load (struct ddb_gtkui_widget_s *base, const char *type, const char *s) {
- w_unknown_t *w = (w_unknown_t *)base;
- char buffer_parms4000;
- char buffer_children4000;
-
- const char *p = s;
- while (*p && *p != '{') {
- p++;
- }
-
- if (!(*p)) {
- fprintf (stderr, "reached EOL before expected { while trying to load unknown widget %s\n", w->expected_type);
- return NULL;
- }
-
- if (p - s + 1 > sizeof (buffer_parms)) {
- fprintf (stderr, "buffer to small to load unknown widget %s\n", w->expected_type);
- return NULL;
- }
-
- memcpy (buffer_parms, s, p-s);
- buffer_parmsp-s = 0;
-
- p++;
- s = p;
-
- int nb = 1;
- while (*p) {
- if (*p == '{') {
- nb++;
- }
- if (*p == '}') {
- nb--;
- if (nb == 0) {
- break;
- }
- }
- p++;
- }
- if (!(*p)) {
- fprintf (stderr, "reached EOL before expected } while trying to load unknown widget %s\n", w->expected_type);
- return NULL;
- }
- if (p - s + 1 > sizeof (buffer_parms)) {
- fprintf (stderr, "buffer to small to load unknown widget %s\n", w->expected_type);
- return NULL;
- }
- memcpy (buffer_children, s, p-s);
- buffer_childrenp-s = 0;
-
- w->parms = strdup (buffer_parms);
- w->children = strdup (buffer_children);
-
- // caller expects 's' to point to '}'
- return p;
-}
-
-static void
-w_unknown_save (struct ddb_gtkui_widget_s *base, char *s, int sz) {
- w_unknown_t *w = (w_unknown_t *)base;
- int l = strlen (s);
- s += l;
- sz -= l;
- snprintf (s, sz, "%s%s {%s}", w->expected_type, w->parms, w->children);
-}
-
 void w_unknown_destroy (ddb_gtkui_widget_t *_w) {
 w_unknown_t *w = (w_unknown_t *)_w;
- if (w->expected_type) {
- free (w->expected_type);
- w->expected_type = NULL;
- }
- if (w->parms) {
- free (w->parms);
- w->parms = NULL;
- }
- if (w->children) {
- free (w->children);
- w->children = NULL;
- }
+ free (w->data);
 }
 
 static gboolean
@@ -441,12 +457,13 @@
 cairo_move_to(cr, 20, 30);
 
 char s1000;
- snprintf (s, sizeof (s), _("Widget \"%s\" is not available"), ((w_unknown_t *)w)->expected_type);
+ snprintf (s, sizeof (s), _("Widget \"%s\" is not available"), w->type);
 
 cairo_show_text(cr, s);
 return TRUE;
 }
 
+#if !GTK_CHECK_VERSION(3,0,0)
 static gboolean
 unknown_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) {
 cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
@@ -454,16 +471,15 @@
 cairo_destroy (cr);
 return res;
 }
+#endif
 
 ddb_gtkui_widget_t *
-w_unknown_create (const char *type) {
+w_unknown_create (const char *type, const char *node_str) {
 w_unknown_t *w = malloc (sizeof (w_unknown_t));
 memset (w, 0, sizeof (w_unknown_t));
 w->base.type = "unknown";
- w->base.load = w_unknown_load;
- w->base.save = w_unknown_save;
 w->base.destroy = w_unknown_destroy;
- w->expected_type = strdup (type);
+ w->data = strdup (node_str);
 
 w->base.widget = gtk_event_box_new ();
 w->drawarea = gtk_drawing_area_new ();
@@ -478,80 +494,96 @@
 return (ddb_gtkui_widget_t *)w;
 }
 
-const char *
-w_create_from_string (const char *s, ddb_gtkui_widget_t **parent) {
- char tMAX_TOKEN;
- s = gettoken (s, t);
- if (!s) {
- return NULL;
+int
+w_create_from_json (json_t *node, ddb_gtkui_widget_t **parent) {
+ json_t *node_type = NULL;
+ json_t *node_legacy_params = NULL;
+ json_t *node_settings = NULL;
+ json_t *node_children = NULL;
+
+ int err = -1;
+
+ node_type = json_object_get(node, "type");
+ if (node_type == NULL || !json_is_string(node_type)) {
+ goto error;
 }
- char *type = strdupa (t);
- ddb_gtkui_widget_t *w = w_create (type);
- if (!w) {
- w = w_unknown_create (type);
+
+ node_legacy_params = json_object_get(node, "legacy_params");
+ if (node_legacy_params != NULL && !json_is_string(node_legacy_params)) {
+ goto error;
 }
- // nuke all default children
- while (w->children) {
- w_remove (w, w->children);
+
+ node_settings = json_object_get(node, "settings");
+ if (node_settings != NULL && !json_is_object(node_settings)) {
+ goto error;
 }
 
- // load widget params
- if (w->load) {
- s = w->load (w, type, s);
- if (!s) {
- w_destroy (w);
- return NULL;
- }
+ node_children = json_object_get(node, "children");
+ if (node_children != NULL && !json_is_array(node_children)) {
+ goto error;
+ }
+
+ const char *type = json_string_value(node_type);
+ const char *legacy_params = node_legacy_params ? json_string_value(node_legacy_params) : "";
+
+ ddb_gtkui_widget_t *w = w_create (type);
+ if (!w) {
+ char *node_str = json_dumps(node, JSON_COMPACT);
+ w = w_unknown_create (type, node_str);
+ free (node_str);
 }
 else {
- // skip all params (if any)
- for (;;) {
- s = gettoken_ext (s, t, "={}();");
- if (!s) {
- w_destroy (w);
- return NULL;
- }
- if (!strcmp (t, "{")) {
- break;
+ // nuke all default children
+ while (w->children) {
+ ddb_gtkui_widget_t *c = w->children;
+ w_remove (w, w->children);
+ w_destroy (c);
+ }
+
+ uint32_t flags = w_get_type_flags(type);
+
+ if ((flags & DDB_WF_SUPPORTS_EXTENDED_API) && node_settings != NULL) {
+ ddb_gtkui_widget_extended_api_t *api = (ddb_gtkui_widget_extended_api_t *)(w + 1);
+ if (api->_size >= sizeof (ddb_gtkui_widget_extended_api_t)) {
+ size_t count = json_object_size(node_settings);
+ if (count != 0) {
+ char const ** keyvalues = calloc (count*2+1, sizeof (char *));
+
+ const char *key;
+ json_t *value;
+ int index = 0;
+ json_object_foreach(node_settings, key, value) {
+ keyvaluesindex*2+0 = key;
+ keyvaluesindex*2+1 = json_string_value(value);
+ index += 1;
+ }
+
+ api->deserialize_from_keyvalues(w, keyvalues);
+
+ free (keyvalues);
+ }
 }
- // match '='
- char eqMAX_TOKEN;
- s = gettoken_ext (s, eq, "={}();");
- if (!s || strcmp (eq, "=")) {
- w_destroy (w);
- return NULL;
- }
- s = gettoken_ext (s, eq, "={}();");
- if (!s) {
- w_destroy (w);
- return NULL;
+ else {
+ trace ("widget %s doesn't has unsupported extended api _size=%lld\n", api->_size);
 }
 }
- }
-
- // we don't need to match '{' here, it's already done above
- const char *back = s;
- s = gettoken (s, t);
- if (!s) {
- w_destroy (w);
- return NULL;
- }
- for (;;) {
- if (!strcmp (t, "}")) {
- break;
+ else if (w->load != NULL && legacy_params != NULL) {
+ // load from legacy params
+ w->load (w, type, legacy_params);
 }
 
- s = w_create_from_string (back, &w);
- if (!s) {
- w_destroy (w);
- return NULL;
- }
+ size_t children_count = json_array_size(node_children);
+ for (int i = 0; i < children_count; i++) {
+ json_t *child = json_array_get(node_children, i);
+
+ if (child == NULL || !json_is_object(child)) {
+ goto error;
+ }
 
- back = s;
- s = gettoken (s, t);
- if (!s) {
- w_destroy (w);
- return NULL;
+ int res = w_create_from_json(child, &w);
+ if (res < 0) {
+ goto error;
+ }
 }
 }
 
@@ -561,7 +593,12 @@
 else {
 *parent = w;
 }
- return s;
+
+ err = 0;
+
+error:
+
+ return err;
 }
 
 static ddb_gtkui_widget_t *current_widget;
@@ -572,7 +609,7 @@
 if (hidden && user_data == current_widget) {
 GtkAllocation allocation;
 gtk_widget_get_allocation (widget, &allocation);
- cairo_set_source_rgb (cr, 0.17f, 0, 0.83f);
+ cairo_set_source_rgb (cr, 0.17, 0, 0.83);
 
 if (!gtk_widget_get_has_window (widget)) {
 #if GTK_CHECK_VERSION(3,0,0)
@@ -600,47 +637,90 @@
 
 static char paste_buffer20000;
 
-void
-save_widget_to_string (char *str, int sz, ddb_gtkui_widget_t *w) {
- // uknown is special case
+static json_t *
+_save_widget_to_json (ddb_gtkui_widget_t *w) {
+ json_t *node = NULL;
 if (!strcmp (w->type, "unknown")) {
- w->save (w, str, sz);
- return;
+ w_unknown_t *unk = (w_unknown_t *)w;
+ node = json_loads(unk->data, 0, NULL);
 }
+ else {
+ node = json_object();
+
+ json_object_set(node, "type", json_string(w->type));
 
- strcat (str, w->type);
- if (w->save) {
- w->save (w, str, sz);
+ uint32_t flags = w_get_type_flags(w->type);
+
+ if (flags & DDB_WF_SUPPORTS_EXTENDED_API) {
+ ddb_gtkui_widget_extended_api_t *api = (ddb_gtkui_widget_extended_api_t *)(w + 1);
+ if (api->_size >= sizeof (ddb_gtkui_widget_extended_api_t)) {
+ char const **keyvalues = api->serialize_to_keyvalues(w);
+
+ if (keyvalues != NULL) {
+ json_t *settings = json_object();
+ for (int i = 0; keyvaluesi; i += 2) {
+ json_t *value = json_string(keyvaluesi+1);
+ json_object_set(settings, keyvaluesi, value);
+ json_decref(value);
+ }
+ json_object_set(node, "settings", settings);
+ json_decref(settings);
+ }
+ }
+ else {
+ trace ("widget %s doesn't has unsupported extended api _size=%lld\n", api->_size);
+ }
+ }
+ else if (w->save) {
+ char params1000 = "";
+ w->save (w, params, sizeof (params));
+ json_object_set(node, "legacy_params", json_string(params));
+ }
 }
 
- strcat (str, " {");
- for (ddb_gtkui_widget_t *c = w->children; c; c = c->next) {
- save_widget_to_string (str, sz, c);
+ if (w->children != NULL) {
+ json_t *children = json_array();
+ for (ddb_gtkui_widget_t *c = w->children; c; c = c->next) {
+ json_t *child = _save_widget_to_json(c);
+ json_array_append(children, child);
+ }
+ json_object_set(node, "children", children);
 }
- strcat (str, "} ");
+
+ return node;
 }
 
 void
 w_save (void) {
- char buf20000 = "";
- save_widget_to_string (buf, sizeof (buf), rootwidget->children);
- deadbeef->conf_set_str (DDB_GTKUI_CONF_LAYOUT, buf);
+ if (rootwidget == NULL) {
+ return;
+ }
+
+ json_t *layout = _save_widget_to_json(rootwidget->children);
+
+ char *layout_str = json_dumps(layout, JSON_COMPACT);
+
+ deadbeef->conf_set_str (DDB_GTKUI_CONF_LAYOUT, layout_str);
 deadbeef->conf_save ();
+
+ free (layout_str);
+ json_delete(layout);
 }
 
 static void
 on_replace_activate (GtkMenuItem *menuitem, gpointer user_data) {
+ ddb_gtkui_widget_t *ui_widget = g_object_get_data(G_OBJECT(menuitem), associated_widget_data_id);
 for (w_creator_t *cr = w_creators; cr; cr = cr->next) {
 if (cr->type == user_data) {
 // hack for single-instance
 // first replace with a placeholder, so that the original widget is destroyed
 // then do the real replacement
 ddb_gtkui_widget_t *w = w_create ("placeholder");
- w_replace (current_widget->parent, current_widget, w);
- current_widget = w;
+ w_replace (ui_widget->parent, ui_widget, w);
+ ui_widget = w;
 w = w_create (user_data);
- w_replace (current_widget->parent, current_widget, w);
- current_widget = w;
+ w_replace (ui_widget->parent, ui_widget, w);
+ ui_widget = w;
 }
 }
 w_save ();
@@ -648,73 +728,92 @@
 
 static void
 on_delete_activate (GtkMenuItem *menuitem, gpointer user_data) {
- ddb_gtkui_widget_t *parent = current_widget->parent;
- if (!strcmp (current_widget->type, "placeholder")) {
+ ddb_gtkui_widget_t *ui_widget = user_data;
+ ddb_gtkui_widget_t *parent = ui_widget->parent;
+ if (!strcmp (ui_widget->type, "placeholder")) {
 return;
 }
 if (parent->replace) {
- parent->replace (parent, current_widget, w_create ("placeholder"));
+ parent->replace (parent, ui_widget, w_create ("placeholder"));
 }
 else {
- w_remove (parent, current_widget);
- w_destroy (current_widget);
- current_widget = w_create ("placeholder");
- w_append (parent, current_widget);
+ w_remove (parent, ui_widget);
+ w_destroy (ui_widget);
+ ui_widget = w_create ("placeholder");
+ w_append (parent, ui_widget);
 }
 w_save ();
 }
 
 static void
 on_cut_activate (GtkMenuItem *menuitem, gpointer user_data) {
- ddb_gtkui_widget_t *parent = current_widget->parent;
- if (!strcmp (current_widget->type, "placeholder")) {
+ ddb_gtkui_widget_t *ui_widget = user_data;
+ ddb_gtkui_widget_t *parent = ui_widget->parent;
+ if (!strcmp (ui_widget->type, "placeholder")) {
 return;
 }
 // save hierarchy to string
- // FIXME: use real clipboard
 paste_buffer0 = 0;
- save_widget_to_string (paste_buffer, sizeof (paste_buffer), current_widget);
+ json_t *layout = _save_widget_to_json(ui_widget);
+ char *layout_str = json_dumps(layout, JSON_COMPACT);
+ if (strlen(layout_str) < sizeof (paste_buffer)) {
+ strcpy (paste_buffer, layout_str);
+ }
+ free (layout_str);
+ json_delete(layout);
 
 if (parent->replace) {
- parent->replace (parent, current_widget, w_create ("placeholder"));
+ parent->replace (parent, ui_widget, w_create ("placeholder"));
 }
 else {
- w_remove (parent, current_widget);
- w_destroy (current_widget);
- current_widget = w_create ("placeholder");
- w_append (parent, current_widget);
+ w_remove (parent, ui_widget);
+ w_destroy (ui_widget);
+ ui_widget = w_create ("placeholder");
+ w_append (parent, ui_widget);
 }
 w_save ();
 }
 
 static void
 on_copy_activate (GtkMenuItem *menuitem, gpointer user_data) {
- ddb_gtkui_widget_t *parent = current_widget->parent;
- if (!strcmp (current_widget->type, "placeholder")) {
+ ddb_gtkui_widget_t *ui_widget = user_data;
+ if (!strcmp (ui_widget->type, "placeholder")) {
 return;
 }
 // save hierarchy to string
- // FIXME: use real clipboard
 paste_buffer0 = 0;
- save_widget_to_string (paste_buffer, sizeof (paste_buffer), current_widget);
+ paste_buffer0 = 0;
+ json_t *layout = _save_widget_to_json(ui_widget);
+ char *layout_str = json_dumps(layout, JSON_COMPACT);
+ if (strlen(layout_str) < sizeof (paste_buffer)) {
+ strcpy (paste_buffer, layout_str);
+ }
+ free (layout_str);
+ json_delete(layout);
 }
 
 static void
 on_paste_activate (GtkMenuItem *menuitem, gpointer user_data) {
- ddb_gtkui_widget_t *parent = current_widget->parent;
+ ddb_gtkui_widget_t *ui_widget = user_data;
+ ddb_gtkui_widget_t *parent = ui_widget->parent;
 if (!paste_buffer0) {
 return;
 }
 
 ddb_gtkui_widget_t *w = w_create ("placeholder");
- w_replace (current_widget->parent, current_widget, w);
- current_widget = w;
+ w_replace (parent, ui_widget, w);
+ ui_widget = w;
 
 w = NULL;
- w_create_from_string (paste_buffer, &w);
- w_replace (parent, current_widget, w);
- w_save ();
- current_widget = w;
+
+ json_t *layout = json_loads(paste_buffer, 0, NULL);
+ if (layout != NULL) {
+ w_create_from_json (layout, &w);
+ w_replace (parent, ui_widget, w);
+ w_save ();
+ ui_widget = w;
+ json_delete(layout);
+ }
 }
 
 void
@@ -745,30 +844,34 @@
 gtk_widget_queue_draw (w->widget);
 }
 
-gboolean
-w_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
- if (!design_mode || !TEST_RIGHT_CLICK(event)) {
- return FALSE;
- }
-
- current_widget = user_data;
- widget = current_widget->widget;
- hidden = 1;
-
- if (GTK_IS_CONTAINER (widget)) {
- // hide all children
- gtk_widget_size_request (widget, &prev_req);
- gtk_container_foreach (GTK_CONTAINER (widget), hide_widget, NULL);
- gtk_widget_set_size_request (widget, prev_req.width, prev_req.height);
- }
+static void
+add_menu_separator (GtkWidget *menu)
+{
+ GtkWidget *separator = gtk_separator_menu_item_new ();
+ gtk_widget_show (separator);
+ gtk_container_add (GTK_CONTAINER (menu), separator);
+ gtk_widget_set_sensitive (separator, FALSE);
+}
 
- gtk_widget_set_app_paintable (widget, TRUE);
- gtk_widget_queue_draw (((ddb_gtkui_widget_t *)user_data)->widget);
+static GtkWidget *
+create_widget_menu(ddb_gtkui_widget_t *ui_widget) {
 GtkWidget *menu;
 GtkWidget *submenu;
 GtkWidget *item;
 menu = gtk_menu_new ();
- if (strcmp (current_widget->type, "placeholder")) {
+
+ const char *widget_title = w_get_title (ui_widget);
+ if (widget_title) {
+ // Add title of widget at the top of the menu
+ item = gtk_menu_item_new_with_mnemonic (widget_title);
+ gtk_widget_show (item);
+ gtk_widget_set_sensitive (item, FALSE);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+
+ add_menu_separator (menu);
+ }
+
+ if (strcmp (ui_widget->type, "placeholder")) {
 item = gtk_menu_item_new_with_mnemonic (_("Replace with..."));
 gtk_widget_show (item);
 gtk_container_add (GTK_CONTAINER (menu), item);
@@ -787,50 +890,95 @@
 item = gtk_menu_item_new_with_mnemonic (cr->title);
 gtk_widget_show (item);
 gtk_container_add (GTK_CONTAINER (submenu), item);
+ g_object_set_data(G_OBJECT(item), associated_widget_data_id, ui_widget);
 g_signal_connect ((gpointer) item, "activate",
 G_CALLBACK (on_replace_activate),
 (void *)cr->type);
 }
 }
 
- if (strcmp (current_widget->type, "placeholder")) {
+ if (strcmp (ui_widget->type, "placeholder")) {
 item = gtk_menu_item_new_with_mnemonic (_("Delete"));
 gtk_widget_show (item);
 gtk_container_add (GTK_CONTAINER (menu), item);
 g_signal_connect ((gpointer) item, "activate",
 G_CALLBACK (on_delete_activate),
- NULL);
+ ui_widget);
 
 item = gtk_menu_item_new_with_mnemonic (_("Cut"));
 gtk_widget_show (item);
 gtk_container_add (GTK_CONTAINER (menu), item);
 g_signal_connect ((gpointer) item, "activate",
 G_CALLBACK (on_cut_activate),
- NULL);
+ ui_widget);
 
 item = gtk_menu_item_new_with_mnemonic (_("Copy"));
 gtk_widget_show (item);
 gtk_container_add (GTK_CONTAINER (menu), item);
 g_signal_connect ((gpointer) item, "activate",
 G_CALLBACK (on_copy_activate),
- NULL);
+ ui_widget);
 }
+
 item = gtk_menu_item_new_with_mnemonic (_("Paste"));
 gtk_widget_show (item);
 gtk_container_add (GTK_CONTAINER (menu), item);
 g_signal_connect ((gpointer) item, "activate",
 G_CALLBACK (on_paste_activate),
- NULL);
+ ui_widget);
+
+ if (ui_widget->initmenu) {
+ add_menu_separator (menu);
+ ui_widget->initmenu (ui_widget, menu);
+ }
+ if (ui_widget->parent && ui_widget->parent->initchildmenu) {
+ add_menu_separator (menu);
+ ui_widget->parent->initchildmenu (ui_widget, menu);
+ }
+
+ return menu;
+}
+
+gboolean
+w_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
+ if (!design_mode || !TEST_RIGHT_CLICK(event)) {
+ return FALSE;
+ }
+
+ current_widget = user_data;
+ widget = current_widget->widget;
+ hidden = 1;
 
- if (current_widget->initmenu) {
- current_widget->initmenu (current_widget, menu);
+ if (GTK_IS_CONTAINER (widget)) {
+ // hide all children
+#if !GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_size_request (widget, &prev_req);
+#else
+ gtk_widget_get_preferred_size (widget, NULL, &prev_req);
+#endif
+ gtk_container_foreach (GTK_CONTAINER (widget), hide_widget, NULL);
+ gtk_widget_set_size_request (widget, prev_req.width, prev_req.height);
 }
- if (current_widget->parent && current_widget->parent->initchildmenu) {
- current_widget->parent->initchildmenu (current_widget, menu);
+
+ gtk_widget_set_app_paintable (widget, TRUE);
+ gtk_widget_queue_draw (((ddb_gtkui_widget_t *)user_data)->widget);
+
+ GtkWidget *menu;
+ menu = create_widget_menu(current_widget);
+
+ if (current_widget->parent && strcmp(current_widget->parent->type, "box")) {
+ GtkWidget *item, *submenu;
+ add_menu_separator (menu);
+ item = gtk_menu_item_new_with_mnemonic (_("Parent"));
+ gtk_widget_show (item);
+ submenu = create_widget_menu (current_widget->parent);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM(item), submenu);
+ gtk_container_add (GTK_CONTAINER (menu), item);
 }
 
 g_signal_connect ((gpointer) menu, "deactivate", G_CALLBACK (w_menu_deactivate), user_data);
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, widget, 0, gtk_get_current_event_time());
+ gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (widget), NULL);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
 return TRUE;
 }
 
@@ -953,6 +1101,16 @@
 return NULL;
 }
 
+uint32_t
+w_get_type_flags(const char *type) {
+ for (w_creator_t *c = w_creators; c; c = c->next) {
+ if (!strcmp (c->type, type)) {
+ return c->flags;
+ }
+ }
+ return 0;
+}
+
 void
 w_destroy (ddb_gtkui_widget_t *w) {
 if (w->destroy) {
@@ -1048,9 +1206,6 @@
 // dummy widget
 static const char *
 w_dummy_load (struct ddb_gtkui_widget_s *w, const char *type, const char *s) {
- if (strcmp (type, "dummy")) {
- return NULL;
- }
 w_dummy_t *b = (w_dummy_t *)w;
 char keyMAX_TOKEN, valMAX_TOKEN;
 for (;;) {
@@ -1122,45 +1277,58 @@
 if (strcmp (type, "vsplitter") && strcmp (type, "hsplitter")) {
 return NULL;
 }
+
+ w_splitter_t *sp = (w_splitter_t *)w;
+
+ int got_ratio = 0;
+
 char keyMAX_TOKEN, valMAX_TOKEN;
 for (;;) {
 get_keyvalue (s,key,val);
 
- if (!strcmp (key, "pos")) {
- ((w_splitter_t *)w)->position = atoi (val);
+ if (!strcmp (key, "locked")) {
+ sp->locked = atoi (val);
 }
- else if (!strcmp (key, "locked")) {
- ((w_splitter_t *)w)->locked = atoi (val);
+ else if (!strcmp (key, "ratio")) {
+ sp->ratio = atof (val);
+ if (sp->ratio < 0) {
+ sp->ratio = 0;
+ }
+ if (sp->ratio > 1) {
+ sp->ratio = 1;
+ }
+ got_ratio = 1;
+ }
+ else if (!strcmp (key, "pos")) {
+ sp->size1 = atoi (val);
+ }
+ else if (!strcmp (key, "size2")) {
+ sp->size2 = atoi (val);
 }
 }
 
+ if (!got_ratio) {
+ sp->ratio = 0.5;
+ }
+
 return s;
 }
 
 void
 w_splitter_save (struct ddb_gtkui_widget_s *w, char *s, int sz) {
- int pos = ((w_splitter_t *)w)->locked ? ((w_splitter_t *)w)->position : gtk_paned_get_position (GTK_PANED(((w_splitter_t *)w)->box));
+ w_splitter_t *sp = (w_splitter_t *)w;
+ int locked = ddb_splitter_get_size_mode (DDB_SPLITTER (sp->box));
+
+ float ratio = ddb_splitter_get_proportion (DDB_SPLITTER (sp->box));
 char spos100;
- snprintf (spos, sizeof (spos), " pos=%d locked=%d", pos, ((w_splitter_t *)w)->locked);
+ // NOTE: we use pos instead of size1 to ensure compatiblity with older deadbeef versions
+ snprintf (spos, sizeof (spos), " locked=%d ratio=%f pos=%d size2=%d", locked, ratio, sp->size1, sp->size2);
 strncat (s, spos, sz);
 }
 
 void
 w_splitter_add (ddb_gtkui_widget_t *w, ddb_gtkui_widget_t *child) {
 w_container_add (w, child);
- if (((w_splitter_t *)w)->locked) {
- if (child == w->children) {
- if (GTK_IS_VBOX (((w_splitter_t *)w)->box)) {
- gtk_widget_set_size_request (child->widget, -1, ((w_splitter_t *)w)->position);
- }
- else {
- gtk_widget_set_size_request (child->widget, ((w_splitter_t *)w)->position, -1);
- }
- }
- }
- else {
- gtk_paned_set_position (GTK_PANED(((w_splitter_t *)w)->box), ((w_splitter_t *)w)->position);
- }
 }
 
 GtkWidget *
@@ -1169,89 +1337,82 @@
 }
 
 void
-w_splitter_lock (w_splitter_t *w) {
- // we can't change GtkPaned behavior, so convert to vbox for now
- if (w->locked) {
- return;
+on_splitter_lock_c1_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) {
+ w_splitter_t *sp = (w_splitter_t *)user_data;
+ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (checkmenuitem))) {
+ sp->locked = DDB_SPLITTER_SIZE_MODE_LOCK_C1;
+ sp->size1 = ddb_splitter_get_child1_size (DDB_SPLITTER (sp->box));
+ ddb_splitter_set_size_mode (DDB_SPLITTER (sp->box), DDB_SPLITTER_SIZE_MODE_LOCK_C1);
 }
- w->locked = 1;
-
- int vert = w->base.type == "vsplitter";
-
- GtkAllocation a;
- gtk_widget_get_allocation (w->base.widget, &a);
-
- GtkWidget *box = vert ? gtk_vbox_new (FALSE, 3) : gtk_hbox_new (FALSE, 3);
- gtk_widget_show (box);
-
- w->position = gtk_paned_get_position (GTK_PANED (w->box));
-
- GtkWidget *c1 = gtk_paned_get_child1 (GTK_PANED (w->box));
- g_object_ref (c1);
- GtkWidget *c2 = gtk_paned_get_child2 (GTK_PANED (w->box));
- g_object_ref (c2);
- gtk_container_remove (GTK_CONTAINER (w->box), c1);
- gtk_container_remove (GTK_CONTAINER (w->box), c2);
-
- gtk_box_pack_start (GTK_BOX (box), c1, FALSE, FALSE, 0);
- gtk_widget_set_size_request (c1, vert ? -1 : w->position, vert ? w->position : -1);
- gtk_box_pack_end (GTK_BOX (box), c2, TRUE, TRUE, 0);
-
- gtk_container_remove (GTK_CONTAINER (w->base.widget), w->box);
- gtk_container_add (GTK_CONTAINER (w->base.widget), box);
- w->box = box;
 }
 
 void
-w_splitter_unlock (w_splitter_t *w) {
- if (!w->locked) {
- return;
+on_splitter_lock_c2_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) {
+ w_splitter_t *sp = (w_splitter_t *)user_data;
+ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (checkmenuitem))) {
+ sp->locked = DDB_SPLITTER_SIZE_MODE_LOCK_C2;
+ sp->size2 = ddb_splitter_get_child2_size (DDB_SPLITTER (sp->box));
+ ddb_splitter_set_size_mode (DDB_SPLITTER (sp->box), DDB_SPLITTER_SIZE_MODE_LOCK_C2);
 }
- w->locked = 0;
-
- int vert = w->base.type == "vsplitter";
- // convert back to vpaned
- GtkWidget *paned = vert ? gtk_vpaned_new () : gtk_hpaned_new ();
- gtk_widget_set_can_focus (paned, FALSE);
- gtk_widget_show (paned);
-
- GList *lst = gtk_container_get_children (GTK_CONTAINER (w->box));
-
- GtkWidget *c1 = lst->data;
- g_object_ref (c1);
- GtkWidget *c2 = lst->next->data;
- g_object_ref (c2);
- gtk_container_remove (GTK_CONTAINER (w->box), c1);
- gtk_container_remove (GTK_CONTAINER (w->box), c2);
-
- gtk_container_add (GTK_CONTAINER (paned), c1);
- gtk_container_add (GTK_CONTAINER (paned), c2);
- gtk_paned_set_position (GTK_PANED (paned), w->position);
-
- gtk_container_remove (GTK_CONTAINER (w->base.widget), w->box);
- gtk_container_add (GTK_CONTAINER (w->base.widget), paned);
- w->box = paned;
 }
 
 void
-on_splitter_lock_movement_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) {
+on_splitter_lock_prop_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) {
+ w_splitter_t *sp = (w_splitter_t *)user_data;
 if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (checkmenuitem))) {
- w_splitter_lock (user_data);
- }
- else {
- w_splitter_unlock (user_data);
+ sp->locked = DDB_SPLITTER_SIZE_MODE_PROP;
+ ddb_splitter_set_size_mode (DDB_SPLITTER (sp->box), DDB_SPLITTER_SIZE_MODE_PROP);
 }
 }
 
 void
 w_splitter_initmenu (struct ddb_gtkui_widget_s *w, GtkWidget *menu) {
- GtkWidget *item;
- item = gtk_check_menu_item_new_with_mnemonic (_("Lock movement"));
+ w_splitter_t *sp = (w_splitter_t *)w;
+ GtkOrientation orientation = ddb_splitter_get_orientation (DDB_SPLITTER (sp->box));
+
+ GSList *group = NULL;
+
+ GtkWidget *item = gtk_radio_menu_item_new_with_mnemonic (group, _("Proportional Sizing"));
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+ gtk_widget_show (item);
+ if (sp->locked == DDB_SPLITTER_SIZE_MODE_PROP) {
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+ }
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "toggled",
+ G_CALLBACK (on_splitter_lock_prop_toggled),
+ w);
+
+ if (orientation == GTK_ORIENTATION_VERTICAL) {
+ item = gtk_radio_menu_item_new_with_mnemonic (group, _("Lock Top Pane Height"));
+ }
+ else {
+ item = gtk_radio_menu_item_new_with_mnemonic (group, _("Lock Left Pane Width"));
+ }
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+ gtk_widget_show (item);
+ if (sp->locked == DDB_SPLITTER_SIZE_MODE_LOCK_C1) {
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+ }
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "toggled",
+ G_CALLBACK (on_splitter_lock_c1_toggled),
+ w);
+
+ if (orientation == GTK_ORIENTATION_VERTICAL) {
+ item = gtk_radio_menu_item_new_with_mnemonic (group, _("Lock Bottom Pane Height"));
+ }
+ else {
+ item = gtk_radio_menu_item_new_with_mnemonic (group, _("Lock Right Pane Width"));
+ }
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
 gtk_widget_show (item);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), ((w_splitter_t *)w)->locked);
+ if (sp->locked == DDB_SPLITTER_SIZE_MODE_LOCK_C2) {
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+ }
 gtk_container_add (GTK_CONTAINER (menu), item);
 g_signal_connect ((gpointer) item, "toggled",
- G_CALLBACK (on_splitter_lock_movement_toggled),
+ G_CALLBACK (on_splitter_lock_c2_toggled),
 w);
 }
 
@@ -1273,21 +1434,11 @@
 w_destroy (child);
 GtkWidget *container = ((w_splitter_t *)cont)->box;
 gtk_widget_show (newchild->widget);
- if (((w_splitter_t *)cont)->locked) {
- if (ntab == 0) {
- gtk_box_pack_start (GTK_BOX (container), newchild->widget, TRUE, TRUE, 0);
- }
- else {
- gtk_box_pack_end (GTK_BOX (container), newchild->widget, TRUE, TRUE, 0);
- }
+ if (ntab == 0) {
+ ddb_splitter_add_child_at_pos (DDB_SPLITTER (container), newchild->widget, 0);
 }
 else {
- if (ntab == 0) {
- gtk_paned_add1 (GTK_PANED (container), newchild->widget);
- }
- else {
- gtk_paned_add2 (GTK_PANED (container), newchild->widget);
- }
+ ddb_splitter_add_child_at_pos (DDB_SPLITTER (container), newchild->widget, 1);
 }
 break;
 }
@@ -1301,50 +1452,38 @@
 gtk_container_remove (GTK_CONTAINER (container), child->widget);
 }
 
-////// vsplitter widget
 void
-w_vsplitter_init (ddb_gtkui_widget_t *base) {
+w_splitter_init (ddb_gtkui_widget_t *base) {
 w_splitter_t *w = (w_splitter_t *)base;
- int pos = ((w_splitter_t *)w)->position; // prevent lock/unlock from overwriting position
- if (w->locked && !GTK_IS_BOX(w->box)) {
- w->locked = 0;
- w_splitter_lock (w);
- }
- if (!w->locked && GTK_IS_BOX(w->box)) {
- w->locked = 1;
- w_splitter_unlock (w);
- }
- if (pos == -1) {
- GtkAllocation a;
- gtk_widget_get_allocation (w->base.widget, &a);
- pos = a.height/2;
- }
- w->position = pos;
- if (!w->locked) {
- gtk_widget_set_size_request (w->base.children->widget, -1, -1);
- gtk_paned_set_position (GTK_PANED(w->box), pos);
+
+ ddb_splitter_set_proportion (DDB_SPLITTER (w->box), w->ratio);
+ ddb_splitter_set_size_mode (DDB_SPLITTER (w->box), w->locked);
+ if (w->locked == DDB_SPLITTER_SIZE_MODE_LOCK_C1) {
+ ddb_splitter_set_child1_size (DDB_SPLITTER (w->box), w->size1);
 }
- else {
- gtk_widget_set_size_request (w->base.children->widget, -1, w->position);
+ else if (w->locked == DDB_SPLITTER_SIZE_MODE_LOCK_C2) {
+ ddb_splitter_set_child2_size (DDB_SPLITTER (w->box), w->size2);
 }
 }
 
+////// vsplitter widget
 ddb_gtkui_widget_t *
 w_vsplitter_create (void) {
 w_splitter_t *w = malloc (sizeof (w_splitter_t));
 memset (w, 0, sizeof (w_splitter_t));
- w->position = -1;
+ w->ratio = 0.5f;
+ w->locked = DDB_SPLITTER_SIZE_MODE_PROP;
 w->base.append = w_splitter_add;
 w->base.remove = w_splitter_remove;
 w->base.replace = w_splitter_replace;
 w->base.get_container = w_splitter_get_container;
 w->base.load = w_splitter_load;
 w->base.save = w_splitter_save;
- w->base.init = w_vsplitter_init;
+ w->base.init = w_splitter_init;
 w->base.initmenu = w_splitter_initmenu;
 
 w->base.widget = gtk_event_box_new ();
- w->box = gtk_vpaned_new ();
+ w->box = ddb_splitter_new (GTK_ORIENTATION_VERTICAL);
 gtk_widget_show (w->box);
 gtk_container_add (GTK_CONTAINER (w->base.widget), w->box);
 w_override_signals (w->base.widget, w);
@@ -1360,49 +1499,23 @@
 }
 
 ////// hsplitter widget
-void
-w_hsplitter_init (ddb_gtkui_widget_t *base) {
- w_splitter_t *w = (w_splitter_t *)base;
- int pos = ((w_splitter_t *)w)->position; // prevent lock/unlock from overwriting position
- if (w->locked && !GTK_IS_BOX(w->box)) {
- w->locked = 0;
- w_splitter_lock (w);
- }
- else if (!w->locked && GTK_IS_BOX(w->box)) {
- w->locked = 1;
- w_splitter_unlock (w);
- }
- if (pos == -1) {
- GtkAllocation a;
- gtk_widget_get_allocation (w->base.widget, &a);
- pos = a.width/2;
- }
- w->position = pos;
- if (!w->locked) {
- gtk_widget_set_size_request (w->base.children->widget, -1, -1);
- gtk_paned_set_position (GTK_PANED(w->box), pos);
- }
- else {
- gtk_widget_set_size_request (w->base.children->widget, w->position, -1);
- }
-}
-
 ddb_gtkui_widget_t *
 w_hsplitter_create (void) {
 w_splitter_t *w = malloc (sizeof (w_splitter_t));
 memset (w, 0, sizeof (w_splitter_t));
- w->position = -1;
+ w->ratio = 0.5f;
+ w->locked = DDB_SPLITTER_SIZE_MODE_PROP;
 w->base.append = w_splitter_add;
 w->base.remove = w_splitter_remove;
 w->base.replace = w_splitter_replace;
 w->base.get_container = w_splitter_get_container;
 w->base.load = w_splitter_load;
 w->base.save = w_splitter_save;
- w->base.init = w_hsplitter_init;
+ w->base.init = w_splitter_init;
 w->base.initmenu = w_splitter_initmenu;
 
 w->base.widget = gtk_event_box_new ();
- w->box = gtk_hpaned_new ();
+ w->box = ddb_splitter_new (GTK_ORIENTATION_HORIZONTAL);
 gtk_widget_show (w->box);
 gtk_container_add (GTK_CONTAINER (w->base.widget), w->box);
 w_override_signals (w->base.widget, w);
@@ -1418,24 +1531,106 @@
 }
 
 ///// tabs widget
+
+static void
+w_tabs_destroy (ddb_gtkui_widget_t *w) {
+ w_tabs_t *s = (w_tabs_t *)w;
+ if (s->titles) {
+ for (int i = 0; i < s->num_tabs; i++) {
+ if (s->titlesi) {
+ free (s->titlesi);
+ }
+ }
+ free (s->titles);
+ }
+}
+
+
 static gboolean
-tab_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data);
+_is_tab_title_key (const char *key) {
+ if (strncmp(key, "tab", 3)) {
+ return FALSE;
+ }
+
+ key += 3;
+ while (*key) {
+ if (!isdigit(*key)) {
+ return FALSE;
+ }
+ key++;
+ }
+
+ return TRUE;
+}
 
 static void
-on_remove_tab_activate (GtkMenuItem *menuitem, gpointer user_data) {
- w_tabs_t *w = user_data;
+w_tabs_deserialize_from_keyvalues (ddb_gtkui_widget_t *base, char const **keyvalues) {
+ w_tabs_t *w = (w_tabs_t *)base;
 
- int i = 0;
- for (ddb_gtkui_widget_t *c = w->base.children; c; c = c->next, i++) {
- if (i == w->clicked_page) {
- w_remove ((ddb_gtkui_widget_t *)w, c);
- return;
+ for (int i = 0; keyvaluesi; i += 2) {
+ if (!strcmp(keyvaluesi, "active")) {
+ w->active = atoi(keyvaluesi+1);
+ }
+ else if (!strcmp (keyvaluesi, "num_tabs")) {
+ w->num_tabs = atoi (keyvaluesi+1);
+ w->titles = calloc (w->num_tabs, sizeof (char *));
+ }
+ else if (_is_tab_title_key(keyvaluesi)) {
+ int index = atoi(keyvaluesi+3);
+ w->titlesindex = strdup (keyvaluesi+1);
 }
 }
 }
 
+static char const **
+w_tabs_serialize_to_keyvalues (ddb_gtkui_widget_t *base) {
+ w_tabs_t *w = (w_tabs_t *)base;
+
+ w->active = gtk_notebook_get_current_page (GTK_NOTEBOOK (w->base.widget));
+ int num_tabs = gtk_notebook_get_n_pages (GTK_NOTEBOOK (w->base.widget));
+
+ char const **keyvalues = calloc(2 * (2 + num_tabs) + 1, sizeof (char *));
+
+ char temp10;
+
+ keyvalues0 = "active";
+ snprintf(temp, sizeof(temp), "%d", w->active);
+ keyvalues1 = strdup(temp);
+ keyvalues2 = "num_tabs";
+ snprintf(temp, sizeof(temp), "%d", num_tabs);
+ keyvalues3 = strdup(temp);
+
+ for (int i = 0; i < num_tabs; i++) {
+ char key7;
+
+ GtkWidget *child = gtk_notebook_get_nth_page (GTK_NOTEBOOK (w->base.widget), i);
+ const char *text = gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (w->base.widget), child);
+ char *esctext = parser_escape_string (text);
+
+ snprintf(key, sizeof (key), "tab%03d", i);
+ keyvalues4 + i*2 + 0 = strdup(key);
+ keyvalues4 + i*2 + 1 = esctext;
+ }
+ return keyvalues;
+}
+
+
 static void
-on_add_tab_activate (GtkMenuItem *menuitem, gpointer user_data) {
+w_tabs_free_serialized_keyvalues (ddb_gtkui_widget_t *base, char const **keyvalues) {
+ for (int i = 0; keyvaluesi; i += 2) {
+ if (i < 4) {
+ free ((char *)keyvaluesi+1);
+ }
+ else {
+ free ((char *)keyvaluesi);
+ }
+ }
+ free (keyvalues);
+}
+
+static void
+tabs_add_tab (gpointer user_data)
+{
 w_tabs_t *w = user_data;
 
 ddb_gtkui_widget_t *ph;
@@ -1450,28 +1645,81 @@
 }
 
 static void
+tabs_remove_tab (gpointer user_data, int tab)
+{
+ w_tabs_t *w = user_data;
+ int i = 0;
+ int num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (w->base.widget));
+ for (ddb_gtkui_widget_t *c = w->base.children; c; c = c->next, i++) {
+ if (i == tab) {
+ w_remove ((ddb_gtkui_widget_t *)w, c);
+ w_destroy (c);
+ if (num_pages == 1) {
+ // if last tab was deleted add a new placeholder tab
+ tabs_add_tab (w);
+ }
+ return;
+ }
+ }
+}
+
+static void
+on_rename_tab_activate (GtkMenuItem *menuitem, gpointer user_data) {
+ w_tabs_t *w = user_data;
+
+ GtkWidget *dlg = create_entrydialog ();
+ gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+ gtk_window_set_title (GTK_WINDOW (dlg), _("Rename Tab"));
+ GtkWidget *e;
+ e = lookup_widget (dlg, "title_label");
+ gtk_label_set_text (GTK_LABEL(e), _("Title:"));
+ e = lookup_widget (dlg, "title");
+ int active = gtk_notebook_get_current_page (GTK_NOTEBOOK (w->base.widget));
+ GtkWidget *child = gtk_notebook_get_nth_page (GTK_NOTEBOOK (w->base.widget), active);
+ gtk_entry_set_text (GTK_ENTRY (e), gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (w->base.widget), child));
+ int res = gtk_dialog_run (GTK_DIALOG (dlg));
+ if (res == GTK_RESPONSE_OK) {
+ gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (w->base.widget), child, gtk_entry_get_text (GTK_ENTRY (e)));
+ }
+ gtk_widget_destroy (dlg);
+}
+
+static void
+on_remove_tab_activate (GtkMenuItem *menuitem, gpointer user_data) {
+ w_tabs_t *w = user_data;
+ tabs_remove_tab (w, w->clicked_page);
+}
+
+static void
+on_add_tab_activate (GtkMenuItem *menuitem, gpointer user_data) {
+ tabs_add_tab (user_data);
+}
+
+static void
 on_move_tab_left_activate (GtkMenuItem *menuitem, gpointer user_data) {
 w_tabs_t *w = user_data;
 if (w->clicked_page <= 0) {
 return;
 }
-
 // remove and save widget
 int i = 0;
 ddb_gtkui_widget_t *newchild = NULL;
 ddb_gtkui_widget_t *prev = NULL;
+ char *title = NULL;
 for (ddb_gtkui_widget_t *c = w->base.children; c; c = c->next, i++) {
 if (i == w->clicked_page) {
- char buf20000 = "";
- save_widget_to_string (buf, sizeof (buf), c);
- w_create_from_string (buf, &newchild);
-
+ json_t *layout = _save_widget_to_json(c);
+ GtkWidget *child = gtk_notebook_get_nth_page (GTK_NOTEBOOK (w->base.widget), i);
+ title = strdup (gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (w->base.widget), child));
 w_remove ((ddb_gtkui_widget_t *)w, c);
+ w_destroy (c);
+ w_create_from_json (layout, &newchild);
+ json_delete(layout);
 break;
 }
 }
 if (!newchild) {
- return;
+ goto out;
 }
 
 // add new child at new position
@@ -1487,98 +1735,115 @@
 newchild->next = w->base.children;
 w->base.children = newchild;
 }
- GtkWidget *eventbox = gtk_event_box_new ();
- GtkWidget *label = gtk_label_new (newchild->type);
- gtk_widget_show (eventbox);
- g_object_set_data (G_OBJECT (eventbox), "owner", w);
- g_signal_connect ((gpointer) eventbox, "button_press_event", G_CALLBACK (tab_button_press_event), newchild->widget);
+ GtkWidget *label = gtk_label_new (title);
 gtk_widget_show (label);
- gtk_container_add (GTK_CONTAINER (eventbox), label);
 gtk_widget_show (newchild->widget);
 
- gtk_notebook_insert_page (GTK_NOTEBOOK (w->base.widget), newchild->widget, eventbox, w->clicked_page-1);
+ gtk_notebook_insert_page (GTK_NOTEBOOK (w->base.widget), newchild->widget, label, w->clicked_page-1);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ gtk_misc_set_padding (GTK_MISC (label), 0, 0);
+ gtk_container_child_set (GTK_CONTAINER (w->base.widget),
+ newchild->widget,
+ "tab-expand", TRUE,
+ "tab-fill", TRUE,
+ NULL);
+#endif
 gtk_notebook_set_current_page (GTK_NOTEBOOK (w->base.widget), w->clicked_page-1);
 w->clicked_page--;
 break;
 }
 prev = c;
 }
+
+out:
+ if (title) {
+ free (title);
+ }
 }
 
 static void
 on_move_tab_right_activate (GtkMenuItem *menuitem, gpointer user_data) {
 w_tabs_t *w = user_data;
 
- int i = 0;
- for (ddb_gtkui_widget_t *c = w->base.children; c; c = c->next, i++);
- if (w->clicked_page >= i)
+ int num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (w->base.widget));
+ if (w->clicked_page == num_pages - 1) {
 return;
+ }
 
 gtk_notebook_set_current_page (GTK_NOTEBOOK (w->base.widget), ++w->clicked_page);
 on_move_tab_left_activate (menuitem, user_data);
 gtk_notebook_set_current_page (GTK_NOTEBOOK (w->base.widget), ++w->clicked_page);
 }
 
-static gboolean
-tab_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) {
- if (event->button != 3) {
- return FALSE;
- }
- // user_data is child widget
- if (design_mode) {
- w_tabs_t *w = (w_tabs_t *)g_object_get_data (G_OBJECT (widget), "owner");
- GtkWidget *menu;
- GtkWidget *item;
- menu = gtk_menu_new ();
+static void
+on_tab_popup_menu (GtkWidget *widget, gpointer user_data)
+{
+ w_tabs_t *w = user_data;
+ GtkWidget *menu;
+ GtkWidget *item;
+ menu = gtk_menu_new ();
 
- item = gtk_menu_item_new_with_mnemonic (_("Move tab left"));
- gtk_widget_show (item);
- gtk_container_add (GTK_CONTAINER (menu), item);
- g_signal_connect ((gpointer) item, "activate",
- G_CALLBACK (on_move_tab_left_activate),
- w);
+ item = gtk_menu_item_new_with_mnemonic (_("Rename Tab"));
+ gtk_widget_show (item);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "activate",
+ G_CALLBACK (on_rename_tab_activate),
+ w);
 
- item = gtk_menu_item_new_with_mnemonic (_("Move tab right"));
- gtk_widget_show (item);
- gtk_container_add (GTK_CONTAINER (menu), item);
- g_signal_connect ((gpointer) item, "activate",
- G_CALLBACK (on_move_tab_right_activate),
- w);
+ item = gtk_menu_item_new_with_mnemonic (_("Remove Tab"));
+ gtk_widget_show (item);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "activate",
+ G_CALLBACK (on_remove_tab_activate),
+ w);
 
- item = gtk_menu_item_new_with_mnemonic (_("Remove tab"));
- gtk_widget_show (item);
- gtk_container_add (GTK_CONTAINER (menu), item);
- g_signal_connect ((gpointer) item, "activate",
- G_CALLBACK (on_remove_tab_activate),
- w);
+ item = gtk_menu_item_new_with_mnemonic (_("Add New Tab"));
+ gtk_widget_show (item);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "activate",
+ G_CALLBACK (on_add_tab_activate),
+ w);
 
- item = gtk_menu_item_new_with_mnemonic (_("Rename tab"));
- gtk_widget_show (item);
- gtk_container_add (GTK_CONTAINER (menu), item);
+ add_menu_separator (menu);
 
- w->clicked_page = gtk_notebook_page_num (GTK_NOTEBOOK (w->base.widget), user_data);
- gtk_notebook_set_current_page (GTK_NOTEBOOK (w->base.widget), w->clicked_page);
+ item = gtk_menu_item_new_with_mnemonic (_("Move Tab Left"));
+ gtk_widget_show (item);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "activate",
+ G_CALLBACK (on_move_tab_left_activate),
+ w);
 
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, widget, 0, gtk_get_current_event_time());
- return TRUE;
- }
- return FALSE;
+ item = gtk_menu_item_new_with_mnemonic (_("Move Tab Right"));
+ gtk_widget_show (item);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "activate",
+ G_CALLBACK (on_move_tab_right_activate),
+ w);
+
+ gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (widget), NULL);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
 }
 
-void
+static void
 w_tabs_add (ddb_gtkui_widget_t *cont, ddb_gtkui_widget_t *child) {
- GtkWidget *eventbox = gtk_event_box_new ();
- GtkWidget *label = gtk_label_new (child->type);
- gtk_widget_show (eventbox);
- g_object_set_data (G_OBJECT (eventbox), "owner", cont);
- g_signal_connect ((gpointer) eventbox, "button_press_event", G_CALLBACK (tab_button_press_event), child->widget);
+ const char *title = w_get_title (child);
+ GtkWidget *label = gtk_label_new (title ? title : child->type);
 gtk_widget_show (label);
- gtk_container_add (GTK_CONTAINER (eventbox), label);
 gtk_widget_show (child->widget);
- gtk_notebook_append_page (GTK_NOTEBOOK (cont->widget), child->widget, eventbox);
+ gtk_notebook_append_page (GTK_NOTEBOOK (cont->widget), child->widget, label);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ gtk_misc_set_padding (GTK_MISC (label), 0, 0);
+ gtk_container_child_set (GTK_CONTAINER (cont->widget),
+ child->widget,
+ "tab-expand", TRUE,
+ "tab-fill", TRUE,
+ NULL);
+#endif
 }
 
-void
+static void
 w_tabs_replace (ddb_gtkui_widget_t *cont, ddb_gtkui_widget_t *child, ddb_gtkui_widget_t *newchild) {
 int ntab = 0;
 ddb_gtkui_widget_t *prev = NULL;
@@ -1595,25 +1860,124 @@
 gtk_notebook_remove_page (GTK_NOTEBOOK(cont->widget), ntab);
 c->widget = NULL;
 w_destroy (c);
- GtkWidget *eventbox = gtk_event_box_new ();
- GtkWidget *label = gtk_label_new (newchild->type);
- gtk_widget_show (eventbox);
- g_object_set_data (G_OBJECT (eventbox), "owner", cont);
- g_signal_connect ((gpointer) eventbox, "button_press_event", G_CALLBACK (tab_button_press_event), newchild->widget);
+ const char *title = w_get_title (newchild);
+ GtkWidget *label = gtk_label_new (title ? title : newchild->type);
 gtk_widget_show (label);
- gtk_container_add (GTK_CONTAINER (eventbox), label);
 gtk_widget_show (newchild->widget);
- int pos = gtk_notebook_insert_page (GTK_NOTEBOOK (cont->widget), newchild->widget, eventbox, ntab);
+ int pos = gtk_notebook_insert_page (GTK_NOTEBOOK (cont->widget), newchild->widget, label, ntab);
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ gtk_misc_set_padding (GTK_MISC (label), 0, 0);
+ gtk_container_child_set (GTK_CONTAINER (cont->widget),
+ newchild->widget,
+ "tab-expand", TRUE,
+ "tab-fill", TRUE,
+ NULL);
+#endif
 gtk_notebook_set_current_page (GTK_NOTEBOOK (cont->widget), pos);
 break;
 }
 }
 }
 
-void
+static gboolean
+get_event_coordinates_in_widget (GtkWidget *widget,
+			GdkEventButton *event,
+			gint *x,
+			gint *y)
+{
+ GdkWindow *window = event->window;
+ gdouble tx, ty;
+ tx = event->x;
+ ty = event->y;
+
+ while (window && window != gtk_widget_get_window (widget)) {
+ gint window_x, window_y;
+ gdk_window_get_position (window, &window_x, &window_y);
+ tx += window_x;
+ ty += window_y;
+ window = gdk_window_get_parent (window);
+ }
+
+ if (window) {
+ *x = tx;
+ *y = ty;
+ return TRUE;
+ }
+ else {
+ return FALSE;
+ }
+}
+
+static gboolean
+on_tabs_button_press_event (GtkWidget *notebook,
+ GdkEventButton *event,
+ gpointer user_data)
+{
+ w_tabs_t *w = user_data;
+
+ int page_num = 0;
+ GtkWidget *page;
+ GtkWidget *label_box;
+ GtkAllocation alloc;
+
+ int event_x, event_y;
+ if (!get_event_coordinates_in_widget (notebook, event, &event_x, &event_y)) {
+ // clicked outside the tabstrip (e.g. in one of its children)
+ return FALSE;
+ }
+
+ /* lookup the clicked tab */
+ while ((page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), page_num)) != NULL)
+ {
+ label_box = gtk_notebook_get_tab_label (GTK_NOTEBOOK (notebook), page);
+ gtk_widget_get_allocation (label_box, &alloc);
+
+ if (event_x >= alloc.x && event_x < alloc.x + alloc.width
+ && event_y >= alloc.y && event_y < alloc.y + alloc.height)
+ break;
+
+ page_num++;
+ }
+ w->clicked_page = page_num;
+
+ if (event->type == GDK_BUTTON_PRESS) {
+ /* leave if no tab could be found */
+ if (page == NULL) {
+ return FALSE;
+ }
+
+ if (event->button == 2) {
+ /* check if we should close the tab */
+ if (design_mode) {
+ tabs_remove_tab (w, page_num);
+ }
+ }
+ else if (event->button == 3) {
+ if (!design_mode) {
+ /* update the current tab before we show the menu */
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), page_num);
+
+ /* show the tab menu */
+ on_tab_popup_menu (notebook, user_data);
+ return TRUE;
+ }
+ }
+ }
+ else if (event->type == GDK_2BUTTON_PRESS) {
+ if (event->button == 1 && page == NULL && design_mode) {
+ // open new tab
+ tabs_add_tab (w);
+ }
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static void
 w_tabs_initmenu (struct ddb_gtkui_widget_s *w, GtkWidget *menu) {
 GtkWidget *item;
- item = gtk_menu_item_new_with_mnemonic (_("Add new tab"));
+ item = gtk_menu_item_new_with_mnemonic (_("Add New Tab"));
 gtk_widget_show (item);
 gtk_container_add (GTK_CONTAINER (menu), item);
 g_signal_connect ((gpointer) item, "activate",
@@ -1621,6 +1985,30 @@
 w);
 }
 
+static void
+w_tabs_init (ddb_gtkui_widget_t *base) {
+ w_tabs_t *w = (w_tabs_t *)base;
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (w->base.widget), w->active);
+ if (w->titles) {
+ int page = 0;
+ while (page < w->num_tabs) {
+ GtkWidget *child = gtk_notebook_get_nth_page (GTK_NOTEBOOK (w->base.widget), page);
+ if (w->titlespage) {
+ gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (w->base.widget), child, w->titlespage);
+#if GTK_CHECK_VERSION(3,0,0)
+ GtkLabel *label = GTK_LABEL(gtk_notebook_get_tab_label (GTK_NOTEBOOK (w->base.widget), child));
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ gtk_misc_set_padding (GTK_MISC (label), 0, 0);
+#endif
+ }
+ free (w->titlespage);
+ page++;
+ }
+ free (w->titles);
+ w->titles = NULL;
+ }
+}
+
 ddb_gtkui_widget_t *
 w_tabs_create (void) {
 w_tabs_t *w = malloc (sizeof (w_tabs_t));
@@ -1630,23 +2018,32 @@
 w->base.remove = w_container_remove;
 w->base.replace = w_tabs_replace;
 w->base.initmenu = w_tabs_initmenu;
+ w->base.init = w_tabs_init;
+ w->base.destroy = w_tabs_destroy;
+ w->exapi._size = sizeof (ddb_gtkui_widget_extended_api_t);
+ w->exapi.serialize_to_keyvalues = w_tabs_serialize_to_keyvalues;
+ w->exapi.deserialize_from_keyvalues = w_tabs_deserialize_from_keyvalues;
+ w->exapi.free_serialized_keyvalues = w_tabs_free_serialized_keyvalues;
 
 ddb_gtkui_widget_t *ph1, *ph2, *ph3;
 ph1 = w_create ("placeholder");
 ph2 = w_create ("placeholder");
 ph3 = w_create ("placeholder");
 
+ gtk_notebook_set_scrollable (GTK_NOTEBOOK (w->base.widget), TRUE);
+
 #if !GTK_CHECK_VERSION(3,0,0)
 g_signal_connect ((gpointer) w->base.widget, "expose_event", G_CALLBACK (w_expose_event), w);
 #else
 g_signal_connect ((gpointer) w->base.widget, "draw", G_CALLBACK (w_draw_event), w);
 #endif
- g_signal_connect ((gpointer) w->base.widget, "button_press_event", G_CALLBACK (w_button_press_event), w);
+ g_signal_connect ((gpointer) w->base.widget, "button_press_event", G_CALLBACK (on_tabs_button_press_event), w);
 
 w_append ((ddb_gtkui_widget_t*)w, ph1);
 w_append ((ddb_gtkui_widget_t*)w, ph2);
 w_append ((ddb_gtkui_widget_t*)w, ph3);
 
+ w_override_signals (w->base.widget, w);
 return (ddb_gtkui_widget_t*)w;
 }
 
@@ -1675,7 +2072,23 @@
 static int
 w_tabstrip_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
 switch (id) {
+ case DB_EV_PLAYLISTCHANGED:
+ if (p1 == DDB_PLAYLIST_CHANGE_TITLE
+ || p1 == DDB_PLAYLIST_CHANGE_POSITION
+ || p1 == DDB_PLAYLIST_CHANGE_DELETED
+ || p1 == DDB_PLAYLIST_CHANGE_CREATED) {
+ g_idle_add (tabstrip_refresh_cb, w);
+ }
+ break;
+ case DB_EV_CONFIGCHANGED:
+ if (ctx) {
+ char *conf_str = (char *)ctx;
+ if (gtkui_tabstrip_override_conf(conf_str) || gtkui_tabstrip_colors_conf(conf_str) || gtkui_tabstrip_font_conf(conf_str)) {
+ g_idle_add (tabstrip_refresh_cb, w);
+ }
+ }
 case DB_EV_PLAYLISTSWITCHED:
+ case DB_EV_TRACKINFOCHANGED:
 g_idle_add (tabstrip_refresh_cb, w);
 break;
 }
@@ -1699,295 +2112,54 @@
 
 //// tabbed playlist widget
 
-typedef struct {
- ddb_gtkui_widget_t *w;
- DB_playItem_t *trk;
-} w_trackdata_t;
-
-static gboolean
-tabbed_trackinfochanged_cb (gpointer p) {
- w_trackdata_t *d = p;
- w_playlist_t *tp = (w_playlist_t *)d->w;
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- int idx = deadbeef->plt_get_item_idx (plt, (DB_playItem_t *)d->trk, PL_MAIN);
- if (idx != -1) {
- ddb_listview_draw_row (tp->list, idx, (DdbListviewIter)d->trk);
- }
- deadbeef->plt_unref (plt);
- }
- if (d->trk) {
- deadbeef->pl_item_unref (d->trk);
- }
- free (d);
- return FALSE;
-}
-
-static gboolean
-trackinfochanged_cb (gpointer data) {
- w_trackdata_t *d = data;
- w_playlist_t *p = (w_playlist_t *)d->w;
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- int idx = deadbeef->plt_get_item_idx (plt, (DB_playItem_t *)d->trk, PL_MAIN);
- if (idx != -1) {
- ddb_listview_draw_row (DDB_LISTVIEW (p->list), idx, (DdbListviewIter)d->trk);
- }
- deadbeef->plt_unref (plt);
- }
- if (d->trk) {
- deadbeef->pl_item_unref (d->trk);
- }
- free (d);
- return FALSE;
-}
-
-static gboolean
-tabbed_paused_cb (gpointer p) {
- w_playlist_t *tp = (w_playlist_t *)p;
- DB_playItem_t *curr = deadbeef->streamer_get_playing_track ();
- if (curr) {
- int idx = deadbeef->pl_get_idx_of (curr);
- ddb_listview_draw_row (tp->list, idx, (DdbListviewIter)curr);
- deadbeef->pl_item_unref (curr);
- }
- return FALSE;
-}
-
-static gboolean
-paused_cb (gpointer data) {
- w_playlist_t *p = (w_playlist_t *)data;
- DB_playItem_t *curr = deadbeef->streamer_get_playing_track ();
- if (curr) {
- int idx = deadbeef->pl_get_idx_of (curr);
- ddb_listview_draw_row (p->list, idx, (DdbListviewIter)curr);
- deadbeef->pl_item_unref (curr);
- }
- return FALSE;
-}
-
-static gboolean
-refresh_cb (gpointer data) {
- DdbListview *p = DDB_LISTVIEW (data);
- ddb_listview_lock_columns (p, 0);
- ddb_listview_clear_sort (p);
- ddb_listview_refresh (DDB_LISTVIEW (p), DDB_REFRESH_LIST | DDB_REFRESH_VSCROLL);
- return FALSE;
-}
-
-static gboolean
-playlistswitch_cb (gpointer p) {
- w_playlist_t *tp = (w_playlist_t *)p;
- if (!strcmp (tp->base.type, "tabbed_playlist")) {
- ddb_tabstrip_refresh (((w_tabbed_playlist_t *)tp)->tabstrip);
- }
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- int cursor = deadbeef->plt_get_cursor (plt, PL_MAIN);
- int scroll = deadbeef->plt_get_scroll (plt);
- if (cursor != -1) {
- DB_playItem_t *it = deadbeef->pl_get_for_idx_and_iter (cursor, PL_MAIN);
- if (it) {
- deadbeef->pl_set_selected (it, 1);
- deadbeef->pl_item_unref (it);
- }
- }
- deadbeef->plt_unref (plt);
-
- ddb_listview_refresh (tp->list, DDB_LIST_CHANGED | DDB_REFRESH_LIST | DDB_REFRESH_VSCROLL);
- ddb_listview_set_vscroll (tp->list, scroll);
- }
- return FALSE;
-}
-
-struct fromto_t {
- ddb_gtkui_widget_t *w;
- DB_playItem_t *from;
- DB_playItem_t *to;
-};
 
 static gboolean
-songchanged_cb (gpointer p) {
- struct fromto_t *ft = p;
- DB_playItem_t *from = ft->from;
- DB_playItem_t *to = ft->to;
- w_playlist_t *tp = (w_playlist_t *)ft->w;
- int to_idx = -1;
- if (!ddb_listview_is_scrolling (tp->list) && to) {
- int cursor_follows_playback = deadbeef->conf_get_int ("playlist.scroll.cursorfollowplayback", 1);
- int scroll_follows_playback = deadbeef->conf_get_int ("playlist.scroll.followplayback", 1);
- int plt = deadbeef->streamer_get_current_playlist ();
- if (plt != -1) {
- if (plt != deadbeef->plt_get_curr_idx ()) {
- ddb_playlist_t *p = deadbeef->plt_get_for_idx (plt);
- if (p) {
- to_idx = deadbeef->plt_get_item_idx (p, to, PL_MAIN);
- if (cursor_follows_playback) {
- deadbeef->plt_deselect_all (p);
- deadbeef->pl_set_selected (to, 1);
- deadbeef->plt_set_cursor (p, PL_MAIN, to_idx);
- }
- deadbeef->plt_unref (p);
- }
- goto end;
- }
- to_idx = deadbeef->pl_get_idx_of (to);
- if (to_idx != -1) {
- if (cursor_follows_playback) {
- ddb_listview_set_cursor_noscroll (tp->list, to_idx);
- }
- if (scroll_follows_playback && plt == deadbeef->plt_get_curr_idx ()) {
- ddb_listview_scroll_to (tp->list, to_idx);
- }
- }
- }
- }
-end:
- if (from) {
- int idx = deadbeef->pl_get_idx_of (from);
- if (idx != -1) {
- ddb_listview_draw_row (tp->list, idx, from);
- }
- }
- if (to && to_idx != -1) {
- ddb_listview_draw_row (tp->list, to_idx, to);
- }
- if (ft->from) {
- deadbeef->pl_item_unref (ft->from);
- }
- if (ft->to) {
- deadbeef->pl_item_unref (ft->to);
- }
- free (ft);
- return FALSE;
-}
-
-static gboolean
-trackfocus_cb (gpointer p) {
- w_playlist_t *tp = p;
- deadbeef->pl_lock ();
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
- if (it) {
- ddb_playlist_t *plt = deadbeef->pl_get_playlist (it);
- if (plt) {
- deadbeef->plt_set_curr (plt);
- int idx = deadbeef->pl_get_idx_of (it);
- if (idx != -1) {
- ddb_listview_scroll_to (tp->list, idx);
- ddb_listview_set_cursor (tp->list, idx);
- }
- deadbeef->plt_unref (plt);
- }
- deadbeef->pl_item_unref (it);
- }
- deadbeef->pl_unlock ();
-
+playlist_tabstriprefresh_cb (gpointer p) {
+ w_tabbed_playlist_t *tp = p;
+ ddb_tabstrip_refresh (tp->tabstrip);
+ g_object_unref (tp->tabstrip);
 return FALSE;
 }
 
 static int
-w_tabbed_playlist_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
- w_playlist_t *tp = (w_playlist_t *)w;
- switch (id) {
- case DB_EV_SONGCHANGED:
- g_idle_add (redraw_queued_tracks_cb, tp->list);
- ddb_event_trackchange_t *ev = (ddb_event_trackchange_t *)ctx;
- struct fromto_t *ft = malloc (sizeof (struct fromto_t));
- ft->from = ev->from;
- ft->to = ev->to;
- if (ft->from) {
- deadbeef->pl_item_ref (ft->from);
- }
- if (ft->to) {
- deadbeef->pl_item_ref (ft->to);
- }
- ft->w = w;
- g_idle_add (songchanged_cb, ft);
- break;
- case DB_EV_TRACKINFOCHANGED:
- {
- ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
- if (ev->track) {
- deadbeef->pl_item_ref (ev->track);
- }
- w_trackdata_t *d = malloc (sizeof (w_trackdata_t));
- memset (d, 0, sizeof (w_trackdata_t));
- d->w = w;
- d->trk = ev->track;
- g_idle_add (tabbed_trackinfochanged_cb, d);
- }
- break;
- case DB_EV_PAUSED:
- g_idle_add (tabbed_paused_cb, w);
- break;
- case DB_EV_PLAYLISTCHANGED:
- g_idle_add (refresh_cb, tp->list);
- break;
- case DB_EV_PLAYLISTSWITCHED:
- g_idle_add (playlistswitch_cb, w);
- break;
- case DB_EV_TRACKFOCUSCURRENT:
- g_idle_add (trackfocus_cb, w);
- break;
- case DB_EV_SELCHANGED:
- if (ctx != (uintptr_t)tp->list || p2 == PL_SEARCH) {
- g_idle_add (refresh_cb, tp->list);
- }
- break;
- }
+w_playlist_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ w_playlist_t *p = (w_playlist_t *)w;
+ playlist_controller_message (p->controller, id, ctx, p1, p2);
 return 0;
 }
 
 static int
-w_playlist_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
- w_playlist_t *p = (w_playlist_t *)w;
+w_tabbed_playlist_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
 switch (id) {
- case DB_EV_SONGCHANGED:
- g_idle_add (redraw_queued_tracks_cb, p->list);
- ddb_event_trackchange_t *ev = (ddb_event_trackchange_t *)ctx;
- struct fromto_t *ft = malloc (sizeof (struct fromto_t));
- ft->from = ev->from;
- ft->to = ev->to;
- if (ft->from) {
- deadbeef->pl_item_ref (ft->from);
- }
- if (ft->to) {
- deadbeef->pl_item_ref (ft->to);
+ case DB_EV_CONFIGCHANGED:
+ if (ctx) {
+ char *str = (char *)ctx;
+ if (gtkui_tabstrip_override_conf(str) || gtkui_tabstrip_colors_conf(str) || gtkui_tabstrip_font_conf(str) || gtkui_tabstrip_font_style_conf(str)) {
+ w_tabbed_playlist_t *p = (w_tabbed_playlist_t *)w;
+ g_object_ref (p->tabstrip);
+ g_idle_add (playlist_tabstriprefresh_cb, w);
+ }
 }
- ft->w = w;
- g_idle_add (songchanged_cb, ft);
 break;
 case DB_EV_TRACKINFOCHANGED:
- {
- ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
- if (ev->track) {
- deadbeef->pl_item_ref (ev->track);
- }
- w_trackdata_t *d = malloc (sizeof (w_trackdata_t));
- memset (d, 0, sizeof (w_trackdata_t));
- d->w = w;
- d->trk = ev->track;
- g_idle_add (trackinfochanged_cb, d);
- }
- break;
- case DB_EV_PAUSED:
- g_idle_add (paused_cb, w);
+ case DB_EV_PLAYLISTSWITCHED: {
+ w_tabbed_playlist_t *p = (w_tabbed_playlist_t *)w;
+ g_object_ref (p->tabstrip);
+ g_idle_add (playlist_tabstriprefresh_cb, w);
+ }
 break;
 case DB_EV_PLAYLISTCHANGED:
- g_idle_add (refresh_cb, p->list);
- break;
- case DB_EV_PLAYLISTSWITCHED:
- g_idle_add (playlistswitch_cb, w);
- break;
- case DB_EV_TRACKFOCUSCURRENT:
- g_idle_add (trackfocus_cb, w);
- break;
- case DB_EV_SELCHANGED:
- if (ctx != (uintptr_t)p->list || p2 == PL_SEARCH) {
- g_idle_add (refresh_cb, p->list);
+ if (p1 == DDB_PLAYLIST_CHANGE_TITLE
+ || p1 == DDB_PLAYLIST_CHANGE_POSITION
+ || p1 == DDB_PLAYLIST_CHANGE_DELETED
+ || p1 == DDB_PLAYLIST_CHANGE_CREATED) {
+ w_tabbed_playlist_t *p = (w_tabbed_playlist_t *)w;
+ g_object_ref (p->tabstrip);
+ g_idle_add (playlist_tabstriprefresh_cb, w);
 }
 break;
 }
+ w_playlist_message (w, id, ctx, p1, p2);
 return 0;
 }
 
@@ -2002,6 +2174,9 @@
 if (!strcmp (key, "hideheaders")) {
 ((w_playlist_t *)w)->hideheaders = atoi (val);
 }
+ if (!strcmp (key, "width")) {
+ ((w_playlist_t *)w)->width = atoi (val);
+ }
 }
 
 return s;
@@ -2009,25 +2184,37 @@
 
 static void
 w_playlist_save (struct ddb_gtkui_widget_s *w, char *s, int sz) {
+ w_playlist_t *ww = (w_playlist_t *)w;
+
+ GtkAllocation a;
+ gtk_widget_get_allocation(ww->base.widget, &a);
+ int width = a.width;
+
 char save100;
- snprintf (save, sizeof (save), " hideheaders=%d", ((w_playlist_t *)w)->hideheaders);
+ snprintf (save, sizeof (save), " hideheaders=%d width=%d", ww->hideheaders, width);
 strncat (s, save, sz);
 }
 
 static void
 w_playlist_init (ddb_gtkui_widget_t *base) {
 w_playlist_t *w = (w_playlist_t *)base;
- ddb_listview_show_header (w->list, !w->hideheaders);
 
- g_idle_add (playlistswitch_cb, w);
- g_idle_add (refresh_cb, w->list);
+ playlist_controller_init (w->controller, !w->hideheaders, w->width);
+
 }
 
 static void
-on_playlist_showheaders_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) {
+w_playlist_destroy(ddb_gtkui_widget_t *base) {
+ w_playlist_t *w = (w_playlist_t *)base;
+ playlist_controller_free(w->controller);
+ w->controller = NULL;
+}
+
+static void
+on_playlist_showheaders_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) {
 w_playlist_t *w = user_data;
 w->hideheaders = !gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (checkmenuitem));
- ddb_listview_show_header (DDB_LISTVIEW (w->list), !w->hideheaders);
+ ddb_listview_show_header (DDB_LISTVIEW (w->listview), !w->hideheaders);
 }
 
 static void
@@ -2052,24 +2239,35 @@
 w->plt.base.save = w_playlist_save;
 w->plt.base.load = w_playlist_load;
 w->plt.base.init = w_playlist_init;
+ w->plt.base.destroy = w_playlist_destroy;
 w->plt.base.initmenu = w_playlist_initmenu;
 gtk_widget_show (vbox);
 
 GtkWidget *tabstrip = ddb_tabstrip_new ();
 w->tabstrip = DDB_TABSTRIP (tabstrip);
 gtk_widget_show (tabstrip);
- GtkWidget *list = ddb_listview_new ();
- gtk_widget_set_size_request (vbox, 100, 100);
- w->plt.list = (DdbListview *)list;
- gtk_widget_show (list);
+ DdbListview *listview = DDB_LISTVIEW(ddb_listview_new ());
+ gtk_widget_set_size_request (vbox, 250, 100);
+
+ w->plt.listview = listview;
+ w->plt.controller = playlist_controller_new(listview, FALSE);
+
+ gtk_widget_show (GTK_WIDGET(listview));
+
+ GtkWidget *sepbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (sepbox);
+ gtk_container_set_border_width (GTK_CONTAINER (sepbox), 1);
+
+ GtkWidget *hsep = gtk_hseparator_new ();
+ gtk_widget_show (hsep);
+ gtk_box_pack_start (GTK_BOX (sepbox), hsep, FALSE, TRUE, 0);
 
 gtk_box_pack_start (GTK_BOX (vbox), tabstrip, FALSE, TRUE, 0);
 gtk_widget_set_can_focus (tabstrip, FALSE);
 gtk_widget_set_can_default (tabstrip, FALSE);
 
- gtk_box_pack_start (GTK_BOX (vbox), list, TRUE, TRUE, 0);
-
- main_playlist_init (list);
+ gtk_box_pack_start (GTK_BOX (vbox), sepbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET(listview), TRUE, TRUE, 0);
 
 w_override_signals (w->plt.base.widget, w);
 
@@ -2085,313 +2283,33 @@
 memset (w, 0, sizeof (w_playlist_t));
 
 w->base.widget = gtk_event_box_new ();
- w->list = DDB_LISTVIEW (ddb_listview_new ());
+ DdbListview *listview = DDB_LISTVIEW (ddb_listview_new ());
+
+ w->listview = listview;
+ w->controller = playlist_controller_new(listview, FALSE);
+
 gtk_widget_set_size_request (GTK_WIDGET (w->base.widget), 100, 100);
 w->base.save = w_playlist_save;
 w->base.load = w_playlist_load;
 w->base.init = w_playlist_init;
+ w->base.destroy = w_playlist_destroy;
 w->base.initmenu = w_playlist_initmenu;
- gtk_widget_show (GTK_WIDGET (w->list));
- main_playlist_init (GTK_WIDGET (w->list));
+
+ gtk_widget_show (GTK_WIDGET (listview));
+
 if (deadbeef->conf_get_int ("gtkui.headers.visible", 1)) {
- ddb_listview_show_header (DDB_LISTVIEW (w->list), 1);
+ ddb_listview_show_header (DDB_LISTVIEW (listview), 1);
 }
 else {
- ddb_listview_show_header (DDB_LISTVIEW (w->list), 0);
+ ddb_listview_show_header (DDB_LISTVIEW (listview), 0);
 }
 
- gtk_container_add (GTK_CONTAINER (w->base.widget), GTK_WIDGET (w->list));
+ gtk_container_add (GTK_CONTAINER (w->base.widget), GTK_WIDGET (listview));
 w_override_signals (w->base.widget, w);
 w->base.message = w_playlist_message;
 return (ddb_gtkui_widget_t*)w;
 }
 
-////// selection properties widget
-
-gboolean
-fill_selproperties_cb (gpointer data) {
- w_selproperties_t *w = data;
- DB_playItem_t **tracks = NULL;
- int numtracks = 0;
- deadbeef->pl_lock ();
- int nsel = deadbeef->pl_getselcount ();
- if (0 < nsel) {
- tracks = malloc (sizeof (DB_playItem_t *) * nsel);
- if (tracks) {
- int n = 0;
- DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
- while (it) {
- if (deadbeef->pl_is_selected (it)) {
- assert (n < nsel);
- deadbeef->pl_item_ref (it);
- tracksn++ = it;
- }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
- }
- numtracks = nsel;
- }
- else {
- deadbeef->pl_unlock ();
- return FALSE;
- }
- }
- GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (w->tree)));
- trkproperties_fill_meta (store, tracks, numtracks);
- if (tracks) {
- for (int i = 0; i < numtracks; i++) {
- deadbeef->pl_item_unref (tracksi);
- }
- free (tracks);
- tracks = NULL;
- numtracks = 0;
- }
- deadbeef->pl_unlock ();
- return FALSE;
-}
-
-static int
-selproperties_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
- switch (id) {
- case DB_EV_PLAYLISTCHANGED:
- case DB_EV_SELCHANGED:
- {
- g_idle_add (fill_selproperties_cb, w);
- }
- break;
- }
- return 0;
-}
-
-static void
-w_selproperties_init (struct ddb_gtkui_widget_s *w) {
- fill_selproperties_cb (w);
-}
-
-ddb_gtkui_widget_t *
-w_selproperties_create (void) {
- w_selproperties_t *w = malloc (sizeof (w_selproperties_t));
- memset (w, 0, sizeof (w_selproperties_t));
-
- w->base.widget = gtk_event_box_new ();
- w->base.init = w_selproperties_init;
- w->base.message = selproperties_message;
-
- gtk_widget_set_can_focus (w->base.widget, FALSE);
-
- GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_set_can_focus (scroll, FALSE);
- gtk_widget_show (scroll);
- gtk_container_add (GTK_CONTAINER (w->base.widget), scroll);
-
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- w->tree = gtk_tree_view_new ();
- gtk_widget_show (w->tree);
- gtk_tree_view_set_enable_search (GTK_TREE_VIEW (w->tree), FALSE);
- gtk_container_add (GTK_CONTAINER (scroll), w->tree);
-
- GtkListStore *store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
- gtk_tree_view_set_model (GTK_TREE_VIEW (w->tree), GTK_TREE_MODEL (store));
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (w->tree), TRUE);
-
- GtkCellRenderer *rend1 = gtk_cell_renderer_text_new ();
- GtkCellRenderer *rend2 = gtk_cell_renderer_text_new ();
- GtkTreeViewColumn *col1 = gtk_tree_view_column_new_with_attributes (_("Key"), rend1, "text", 0, NULL);
- gtk_tree_view_column_set_resizable (col1, TRUE);
- GtkTreeViewColumn *col2 = gtk_tree_view_column_new_with_attributes (_("Value"), rend2, "text", 1, NULL);
- gtk_tree_view_column_set_resizable (col2, TRUE);
- gtk_tree_view_append_column (GTK_TREE_VIEW (w->tree), col1);
- gtk_tree_view_append_column (GTK_TREE_VIEW (w->tree), col2);
- gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (w->tree), TRUE);
- w_override_signals (w->base.widget, w);
-
- return (ddb_gtkui_widget_t *)w;
-}
-
-///// cover art display
-static gboolean
-coverart_redraw_cb (void *user_data) {
- w_coverart_t *w = user_data;
- w->cover_size = w->new_cover_size;
- gtk_widget_queue_draw (w->drawarea);
- return FALSE;
-}
-
-void
-coverart_avail_callback (void *user_data) {
- g_idle_add (coverart_redraw_cb, user_data);
-}
-
-static gboolean
-coverart_redraw_single_cb (void *user_data) {
- w_coverart_t *w = user_data;
- gtk_widget_queue_draw (w->drawarea);
- return FALSE;
-}
-
-static void
-coverart_avail_callback_single (gpointer user_data) {
- g_idle_add (coverart_redraw_single_cb, user_data);
-}
-
-static gboolean
-deferred_cover_load_cb (void *ctx) {
- w_coverart_t *w = ctx;
- w->cover_refresh_timeout_id = 0;
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
- if (!it) {
- return FALSE;
- }
- GtkAllocation a;
- gtk_widget_get_allocation (GTK_WIDGET (w->drawarea), &a);
- deadbeef->pl_lock ();
- const char *album = deadbeef->pl_find_meta (it, "album");
- const char *artist = deadbeef->pl_find_meta (it, "artist");
- if (!album || !*album) {
- album = deadbeef->pl_find_meta (it, "title");
- }
- GdkPixbuf *pixbuf = get_cover_art_callb (deadbeef->pl_find_meta (((DB_playItem_t *)it), ":URI"), artist, album, w->new_cover_size, NULL, NULL);
- deadbeef->pl_unlock ();
- deadbeef->pl_item_unref (it);
- queue_cover_callback (coverart_avail_callback, w);
- if (pixbuf) {
- g_object_unref (pixbuf);
- }
-
- return FALSE;
-}
-
-static gboolean
-coverart_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data) {
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
- GtkAllocation a;
- gtk_widget_get_allocation (widget, &a);
- int width = a.width;
- int height = a.height;
-
- w_coverart_t *w = user_data;
- int real_size = min (width, height);
-
- if (real_size > 0 && it) {
- if (w->new_cover_size != real_size) {
- w->new_cover_size = real_size;
- if (w->cover_refresh_timeout_id) {
- g_source_remove (w->cover_refresh_timeout_id);
- w->cover_refresh_timeout_id = 0;
- }
- if (w->cover_size == -1) {
- w->cover_size = real_size;
- g_idle_add (deferred_cover_load_cb, w);
- }
- else {
- if (!w->cover_refresh_timeout_id) {
- w->cover_refresh_timeout_id = g_timeout_add (1000, deferred_cover_load_cb, w);
- }
- }
- }
- int size = w->cover_size;
-
- float scale = (float)real_size / size;
-
- deadbeef->pl_lock ();
- const char *album = deadbeef->pl_find_meta (it, "album");
- const char *artist = deadbeef->pl_find_meta (it, "artist");
- if (!album || !*album) {
- album = deadbeef->pl_find_meta (it, "title");
- }
- GdkPixbuf *pixbuf = get_cover_art_callb (deadbeef->pl_find_meta ((it), ":URI"), artist, album, real_size == size ? size : -1, coverart_avail_callback_single, user_data);
- deadbeef->pl_unlock ();
-
- int hq = 0;
- if (!pixbuf) {
- pixbuf = cover_get_default_pixbuf ();
- hq = 1;
- }
-
- if (pixbuf) {
- size = gdk_pixbuf_get_width (pixbuf);
- float art_scale = (float)real_size / size;
- int pw = real_size;
- if (gdk_pixbuf_get_width (pixbuf) < gdk_pixbuf_get_height (pixbuf)) {
- art_scale *= (float)gdk_pixbuf_get_width (pixbuf) / gdk_pixbuf_get_height (pixbuf);
- }
- int ph = pw;
- int x = 0;
- int y = 0;
- if (gdk_pixbuf_get_width (pixbuf) > gdk_pixbuf_get_height (pixbuf)) {
- y = (a.height - gdk_pixbuf_get_height (pixbuf)) / 2;
- }
- else if (gdk_pixbuf_get_width (pixbuf) < gdk_pixbuf_get_height (pixbuf)) {
- x = (a.width - gdk_pixbuf_get_width (pixbuf)) / 2;
- }
- cairo_rectangle (cr, x, y, pw, ph);
- cairo_scale (cr, art_scale, art_scale);
- gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y);
- cairo_pattern_set_filter (cairo_get_source(cr), hq ? CAIRO_FILTER_GAUSSIAN : CAIRO_FILTER_FAST);
- cairo_fill (cr);
- g_object_unref (pixbuf);
- }
- deadbeef->pl_item_unref (it);
- }
- return TRUE;
-}
-
-static gboolean
-coverart_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) {
- cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
- gboolean res = coverart_draw (widget, cr, user_data);
- cairo_destroy (cr);
- return res;
-}
-
-static int
-coverart_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
- w_coverart_t *ca = (w_coverart_t *)w;
- switch (id) {
- case DB_EV_PLAYLIST_REFRESH:
- g_idle_add (coverart_redraw_cb, w);
- break;
- case DB_EV_SONGSTARTED:
- g_idle_add (coverart_redraw_cb, w);
- break;
- case DB_EV_TRACKINFOCHANGED:
- {
- ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
- if (it == ev->track) {
- g_idle_add (coverart_redraw_cb, w);
- }
- if (it) {
- deadbeef->pl_item_unref (it);
- }
- }
- break;
- }
- return 0;
-}
-
-ddb_gtkui_widget_t *
-w_coverart_create (void) {
- w_coverart_t *w = malloc (sizeof (w_coverart_t));
- memset (w, 0, sizeof (w_coverart_t));
-
- w->base.widget = gtk_event_box_new ();
- w->base.message = coverart_message;
- w->drawarea = gtk_drawing_area_new ();
- w->cover_size = -1;
- w->new_cover_size = -1;
- gtk_widget_show (w->drawarea);
- gtk_container_add (GTK_CONTAINER (w->base.widget), w->drawarea);
-#if !GTK_CHECK_VERSION(3,0,0)
- g_signal_connect_after ((gpointer) w->drawarea, "expose_event", G_CALLBACK (coverart_expose_event), w);
-#else
- g_signal_connect_after ((gpointer) w->drawarea, "draw", G_CALLBACK (coverart_draw), w);
-#endif
- w_override_signals (w->base.widget, w);
- return (ddb_gtkui_widget_t *)w;
-}
-
 ///// scope vis
 void
 w_scope_destroy (ddb_gtkui_widget_t *w) {
@@ -2401,20 +2319,14 @@
 g_source_remove (s->drawtimer);
 s->drawtimer = 0;
 }
-#if USE_OPENGL
- if (s->glcontext) {
- gdk_gl_context_destroy (s->glcontext);
- s->glcontext = NULL;
- }
-#endif
 if (s->surf) {
 cairo_surface_destroy (s->surf);
 s->surf = NULL;
 }
- if (s->samples) {
- free (s->samples);
- s->samples = NULL;
- }
+
+ ddb_scope_dealloc(&s->scope);
+ ddb_scope_draw_data_dealloc(&s->draw_data);
+
 if (s->mutex) {
 deadbeef->mutex_free (s->mutex);
 s->mutex = 0;
@@ -2429,167 +2341,194 @@
 }
 
 static void
-scope_wavedata_listener (void *ctx, ddb_audio_data_t *data) {
+scope_wavedata_listener (void *ctx, const ddb_audio_data_t *data) {
 w_scope_t *w = ctx;
- if (w->nsamples != w->resized) {
- deadbeef->mutex_lock (w->mutex);
- float *oldsamples = w->samples;
- int oldnsamples = w->nsamples;
- w->samples = NULL;
- w->nsamples = w->resized;
- if (w->nsamples > 0) {
- w->samples = malloc (sizeof (float) * w->nsamples);
- memset (w->samples, 0, sizeof (float) * w->nsamples);
- if (oldsamples) {
- int n = min (oldnsamples, w->nsamples);
- memcpy (w->samples + w->nsamples - n, oldsamples + oldnsamples - n, n * sizeof (float));
- }
- }
- if (oldnsamples) {
- free (oldsamples);
- }
- deadbeef->mutex_unlock (w->mutex);
- }
 
- if (w->samples) {
- // append
- int nsamples = data->nframes / data->fmt->channels;
- float ratio = data->fmt->samplerate / 44100.f;
- int size = nsamples / ratio;
+ deadbeef->mutex_lock (w->mutex);
+ ddb_scope_process(&w->scope, data->fmt->samplerate, data->fmt->channels, data->data, data->nframes);
+ deadbeef->mutex_unlock (w->mutex);
+}
+
+static inline uint32_t
+_alpha_blend (uint32_t color, uint32_t background_color, float alpha) {
+ uint32_t sr = color & 0xff;
+ uint32_t sg = (color & 0xff00) >> 8;
+ uint32_t sb = (color & 0xff0000) >> 16;
+
+ uint32_t dr = background_color & 0xff;
+ uint32_t dg = (background_color & 0xff00) >> 8;
+ uint32_t db = (background_color & 0xff0000) >> 16;
+
+ uint32_t r = min(0xff,ftoi(sr * alpha + dr * (1-alpha)));
+ uint32_t g = min(0xff,ftoi(sg * alpha + dg * (1-alpha)));
+ uint32_t b = min(0xff,ftoi(sb * alpha + db * (1-alpha)));
 
- int sz = min (w->nsamples, size);
- int n = w->nsamples-sz;
+ uint32_t res = r | (g<<8) | (b<<16) | 0xff000000;
+ return res;
+}
 
- memmove (w->samples, w->samples + sz, n * sizeof (float));
- float pos = 0;
- for (int i = 0; i < sz && pos < nsamples; i++, pos += ratio) {
- w->samplesn + i = data->dataftoi(pos * data->fmt->channels) * data->fmt->channels + 0;
- for (int j = 1; j < data->fmt->channels; j++) {
- w->samplesn + i += data->dataftoi(pos * data->fmt->channels) * data->fmt->channels + j;
+static inline void
+_draw_vline_aa (uint8_t * restrict data, int stride, int x0, float y0, float y1, uint32_t color, uint32_t background_color) {
+ int floor_y0 = ftoi(floorf(y0));
+ int ceil_y1 = ftoi(ceilf(y1));
+ uint32_t *ptr = (uint32_t*)&datafloor_y0*stride+x0*4;
+ int y = floor_y0;
+ while (y <= ceil_y1) {
+ float d = y0 - y;
+
+ uint32_t final_color = color;
+
+ if (d > 0 && d < 1) {
+ final_color = _alpha_blend (color, background_color, 1-d);
+ }
+ else {
+ d = y - y1;
+ if (d > 0 && d < 1) {
+ final_color = _alpha_blend (color, background_color, 1-d);
 }
- w->samplesn+i /= data->fmt->channels;
 }
+
+ *ptr = final_color;
+ y++;
+ ptr += stride/sizeof(uint32_t);
 }
 }
 
-#if 0
-// Bresenham's line drawing from http://rosettacode.org
-static inline void
-_draw_line (uint8_t *data, int stride, int x0, int y0, int x1, int y1) {
- int dx = abs(x1-x0), sx = x0<x1 ? 1 : -1;
- int dy = abs(y1-y0), sy = y0<y1 ? 1 : -1;
- int err = (dx>dy ? dx : -dy)/2, e2;
-
- for(;;){
- uint32_t *ptr = (uint32_t*)&datay0*stride+x0*4;
- *ptr = 0xffffffff;
- if (x0==x1 && y0==y1) break;
- e2 = err;
- if (e2 >-dx) { err -= dy; x0 += sx; }
- if (e2 < dy) { err += dx; y0 += sy; }
- }
+static uint32_t _gdk_color_convert_to_uint32(const GdkColor *base_color) {
+ uint8_t red = (base_color->red & 0xff00) >> 8;
+ uint8_t green = (base_color->green & 0xff00) >> 8;
+ uint8_t blue = (base_color->blue & 0xff00) >> 8;
+
+ uint32_t color = (0xff<<24) | (red<<16) | (green<<8) | blue;
+ return color;
 }
-#endif
 
-static inline void
-_draw_vline (uint8_t *data, int stride, int x0, int y0, int y1) {
- if (y0 > y1) {
- int tmp = y0;
- y0 = y1;
- y1 = tmp;
- y1--;
- }
- else if (y0 < y1) {
- y0++;
- }
- while (y0 <= y1) {
- uint32_t *ptr = (uint32_t*)&datay0*stride+x0*4;
- *ptr = 0xffffffff;
- y0++;
- }
+static void
+_scope_update_preferences (w_scope_t *scope) {
+ GdkColor base_color;
+ gtkui_get_vis_custom_base_color(&base_color);
+ scope->draw_color = _gdk_color_convert_to_uint32(&base_color);
+
+ GdkColor background_color;
+ gtkui_get_vis_custom_background_color(&background_color);
+ scope->background_color = _gdk_color_convert_to_uint32(&background_color);
 }
 
-static inline void
-_draw_bar (uint8_t *data, int stride, int x0, int y0, int w, int h, uint32_t color) {
- int y1 = y0+h-1;
- int x1 = x0+w-1;
- uint32_t *ptr = (uint32_t*)&datay0*stride+x0*4;
- while (y0 <= y1) {
- int x = x0;
- while (x++ <= x1) {
- *ptr++ = color;
- }
- y0++;
- ptr += stride/4-w;
+static void
+_scope_update_listening(w_scope_t *w) {
+ gboolean is_visible = gtk_widget_get_mapped(w->drawarea);
+ if (w->is_listening && !is_visible) {
+ deadbeef->vis_waveform_unlisten(w);
+ w->is_listening = FALSE;
+ }
+ else if (!w->is_listening && is_visible) {
+ deadbeef->vis_waveform_listen(w, scope_wavedata_listener);
+ w->is_listening = TRUE;
 }
 }
 
+static void
+_scope_unmap(GtkWidget* self, gpointer user_data) {
+ _scope_update_listening(user_data);
+}
+
 gboolean
 scope_draw_cairo (GtkWidget *widget, cairo_t *cr, gpointer user_data) {
- GtkAllocation a;
- gtk_widget_get_allocation (widget, &a);
+ GtkAllocation draw_rect;
+ gtk_widget_get_allocation (widget, &draw_rect);
+
+ GtkAllocation orig_size = draw_rect;
 
 w_scope_t *w = user_data;
+ _scope_update_listening(w);
+ _scope_update_preferences (w);
 
- if (!w->surf || cairo_image_surface_get_width (w->surf) != a.width || cairo_image_surface_get_height (w->surf) != a.height) {
+ float scale_factor;
+ switch (w->scale) {
+ case SCOPE_SCALE_AUTO:
+ scale_factor = 1;
+ break;
+ case SCOPE_SCALE_1X:
+ scale_factor = 1;
+ break;
+ case SCOPE_SCALE_2X:
+ scale_factor = 1/2.f;
+ break;
+ case SCOPE_SCALE_3X:
+ scale_factor = 1/3.f;
+ break;
+ case SCOPE_SCALE_4X:
+ scale_factor = 1/4.f;
+ break;
+ }
+
+ draw_rect.width *= scale_factor;
+ draw_rect.height *= scale_factor;
+
+ deadbeef->mutex_lock (w->mutex);
+ if (w->scope.sample_count != 0) {
+
+ ddb_scope_tick(&w->scope);
+ ddb_scope_get_draw_data(&w->scope, (int)(draw_rect.width), (int)(draw_rect.height), 1, &w->draw_data);
+ }
+ deadbeef->mutex_unlock (w->mutex);
+
+ if (!w->surf || cairo_image_surface_get_width (w->surf) != draw_rect.width || cairo_image_surface_get_height (w->surf) != draw_rect.height) {
 if (w->surf) {
 cairo_surface_destroy (w->surf);
 w->surf = NULL;
 }
- w->surf = cairo_image_surface_create (CAIRO_FORMAT_RGB24, a.width, a.height);
+ w->surf = cairo_image_surface_create (CAIRO_FORMAT_RGB24, draw_rect.width, draw_rect.height);
 }
 
- int nsamples = a.width;
- if (w->nsamples != nsamples) {
- w->resized = nsamples;
- }
 cairo_surface_flush (w->surf);
 unsigned char *data = cairo_image_surface_get_data (w->surf);
 if (!data) {
 return FALSE;
 }
 int stride = cairo_image_surface_get_stride (w->surf);
- memset (data, 0, a.height * stride);
- if (w->samples && a.height > 2) {
- deadbeef->mutex_lock (w->mutex);
- float incr = a.width / (float)w->nsamples;
- float h = a.height;
- if (h > 50) {
- h -= 20;
- }
- if (h > 100) {
- h -= 40;
+
+// memset (data, 0, draw_rect.height * stride);
+
+ // fill with background color
+ uint8_t *color_data = data;
+ for (int y = 0; y < draw_rect.height; y++) {
+ uint32_t *row_data = (uint32_t *)color_data;
+ for (int x = 0; x < draw_rect.width; x++) {
+ *row_data = w->background_color;
+ row_data++;
 }
- h /= 2;
- float hh = a.height/2.f;
+ color_data += stride;
+ }
 
- int prev_y = w->samples0 * h + hh;
+ if (w->draw_data.point_count != 0 && draw_rect.height > 2) {
 
- int n = min (w->nsamples, a.width);
- for (int i = 1; i < n; i++) {
- int y = ftoi (w->samplesi * h + hh);
- if (y < 0) {
- y = 0;
- }
- if (y >= a.height) {
- y = a.height-1;
+ int width = w->draw_data.point_count;
+ ddb_scope_point_t *minmax = w->draw_data.points;
+ int channels = w->draw_data.mode == DDB_SCOPE_MONO ? 1 : w->draw_data.channels;
+
+ fpu_control ctl = 0;
+ fpu_setround (&ctl);
+
+ for (int c = 0; c < channels; c++) {
+ for (int x = 0; x < width; x++) {
+ float ymin = min(draw_rect.height-1, max(0, minmax->ymin));
+ float ymax = min(draw_rect.height-1, max(0, minmax->ymax));
+ _draw_vline_aa (data, stride, x, ymin, ymax, w->draw_color, w->background_color);
+ minmax++;
 }
- _draw_vline (data, stride, i, prev_y, y);
- prev_y = y;
- }
- if (n < a.width) {
- memset (data + a.height / 2 * stride + n * 4, 0xff, (a.width-n)*4);
 }
- deadbeef->mutex_unlock (w->mutex);
- }
- else if (a.height > 0) {
- memset (data + a.height / 2 *stride, 0xff, stride);
+
+ fpu_restore (ctl);
 }
 cairo_surface_mark_dirty (w->surf);
 cairo_save (cr);
+
+ cairo_scale(cr, (double)orig_size.width/(double)draw_rect.width, (double)orig_size.height/(double)draw_rect.height);
 cairo_set_source_surface (cr, w->surf, 0, 0);
- cairo_rectangle (cr, 0, 0, a.width, a.height);
- cairo_fill (cr);
+ cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_FAST);
+ cairo_paint(cr);
+
 cairo_restore (cr);
 
 return FALSE;
@@ -2597,58 +2536,13 @@
 
 gboolean
 scope_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data) {
-#if USE_OPENGL
- GtkAllocation a;
- gtk_widget_get_allocation (widget, &a);
- w_scope_t *w = user_data;
- int nsamples = a.width;
- if (w->nsamples != nsamples) {
- w->resized = nsamples;
- return FALSE;
- }
- float incr = a.width / (float)w->nsamples;
- float h = a.height;
- if (h > 50) {
- h -= 20;
- }
- if (h > 100) {
- h -= 40;
- }
- h /= 2;
- float hh = a.height/2.f;
-
- GdkGLDrawable *d = gtk_widget_get_gl_drawable (widget);
- gdk_gl_drawable_gl_begin (d, w->glcontext);
-
- glClear (GL_COLOR_BUFFER_BIT);
- glMatrixMode (GL_PROJECTION);
- glLoadIdentity ();
- gluOrtho2D(0,a.width,a.height,0);
- glMatrixMode (GL_MODELVIEW);
- glViewport (0, 0, a.width, a.height);
-
- glBegin (GL_LINE_STRIP);
-
- for (int i = 0; i < w->nsamples; i++) {
- float y = w->samplesi * h + hh;
- glVertex2f (i, y);
- }
-
- glEnd();
- gdk_gl_drawable_swap_buffers (d);
-
- gdk_gl_drawable_gl_end (d);
-
-#else
- gboolean res = scope_draw_cairo (widget, cr, user_data);
-#endif
- return FALSE;
+ return scope_draw_cairo (widget, cr, user_data);
 }
 
 gboolean
 scope_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) {
 cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
- gboolean res = scope_draw (widget, cr, user_data);
+ gboolean res = scope_draw_cairo (widget, cr, user_data);
 cairo_destroy (cr);
 return res;
 }
@@ -2660,21 +2554,192 @@
 g_source_remove (s->drawtimer);
 s->drawtimer = 0;
 }
-#if USE_OPENGL
- if (!gtkui_gl_init ()) {
- s->drawtimer = g_timeout_add (33, w_scope_draw_cb, w);
- }
-#else
+ _scope_update_listening(s);
 s->drawtimer = g_timeout_add (33, w_scope_draw_cb, w);
-#endif
 }
 
-void
-scope_realize (GtkWidget *widget, gpointer data) {
- w_scope_t *w = data;
-#if USE_OPENGL
- w->glcontext = gtk_widget_create_gl_context (w->drawarea, NULL, TRUE, GDK_GL_RGBA_TYPE);
-#endif
+static void
+_scope_menu_update (w_scope_t *s) {
+ s->updating_menu = TRUE;
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->mode_mono_item), s->scope.mode == DDB_SCOPE_MONO);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->mode_multichannel_item), s->scope.mode == DDB_SCOPE_MULTICHANNEL);
+
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->fragment_duration_50ms_item), s->scope.fragment_duration == 50);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->fragment_duration_100ms_item), s->scope.fragment_duration == 100);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->fragment_duration_200ms_item), s->scope.fragment_duration == 200);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->fragment_duration_300ms_item), s->scope.fragment_duration == 300);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->fragment_duration_500ms_item), s->scope.fragment_duration == 500);
+
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->scale_auto_item), s->scale == SCOPE_SCALE_AUTO);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->scale_1x_item), s->scale == SCOPE_SCALE_1X);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->scale_2x_item), s->scale == SCOPE_SCALE_2X);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->scale_3x_item), s->scale == SCOPE_SCALE_3X);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->scale_4x_item), s->scale == SCOPE_SCALE_4X);
+ s->updating_menu = FALSE;
+}
+
+static gboolean
+_scope_button_press (GtkWidget* self, GdkEventButton *event, gpointer user_data) {
+ if (design_mode) {
+ return FALSE;
+ }
+ w_scope_t *s = user_data;
+
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
+ _scope_menu_update(s);
+ gtk_menu_popup_at_pointer (GTK_MENU (s->menu), NULL);
+ }
+ return TRUE;
+}
+
+static void
+_scope_menu_activate (GtkWidget* self, gpointer user_data) {
+ w_scope_t *s = user_data;
+
+ if (s->updating_menu) {
+ return;
+ }
+
+ if (self == s->mode_multichannel_item) {
+ s->scope.mode = DDB_SCOPE_MULTICHANNEL;
+ }
+ else if (self == s->mode_mono_item) {
+ s->scope.mode = DDB_SCOPE_MONO;
+ }
+ else if (self == s->scale_auto_item) {
+ s->scale = SCOPE_SCALE_AUTO;
+ }
+ else if (self == s->scale_1x_item) {
+ s->scale = SCOPE_SCALE_1X;
+ }
+ else if (self == s->scale_2x_item) {
+ s->scale = SCOPE_SCALE_2X;
+ }
+ else if (self == s->scale_3x_item) {
+ s->scale = SCOPE_SCALE_3X;
+ }
+ else if (self == s->scale_4x_item) {
+ s->scale = SCOPE_SCALE_4X;
+ }
+ else if (self == s->fragment_duration_50ms_item) {
+ s->scope.fragment_duration = 50;
+ }
+ else if (self == s->fragment_duration_100ms_item) {
+ s->scope.fragment_duration = 100;
+ }
+ else if (self == s->fragment_duration_200ms_item) {
+ s->scope.fragment_duration = 200;
+ }
+ else if (self == s->fragment_duration_300ms_item) {
+ s->scope.fragment_duration = 300;
+ }
+ else if (self == s->fragment_duration_500ms_item) {
+ s->scope.fragment_duration = 500;
+ }
+}
+
+static void
+_scope_deserialize_from_keyvalues (ddb_gtkui_widget_t *widget, const char **keyvalues) {
+ w_scope_t *w = (w_scope_t *)widget;
+ w->scope.mode = DDB_SCOPE_MULTICHANNEL;
+ w->scale = SCOPE_SCALE_AUTO;
+ w->scope.fragment_duration = 300;
+ for (int i = 0; keyvaluesi; i += 2) {
+ if (!strcmp(keyvaluesi, "renderMode")) {
+ if (!strcmp (keyvaluesi+1, "mono")) {
+ w->scope.mode = DDB_SCOPE_MONO;
+ }
+ }
+ else if (!strcmp (keyvaluesi, "scaleMode")) {
+ if (!strcmp (keyvaluesi+1, "1x")) {
+ w->scale = SCOPE_SCALE_1X;
+ }
+ else if (!strcmp (keyvaluesi+1, "2x")) {
+ w->scale = SCOPE_SCALE_2X;
+ }
+ else if (!strcmp (keyvaluesi+1, "3x")) {
+ w->scale = SCOPE_SCALE_3X;
+ }
+ else if (!strcmp (keyvaluesi+1, "4x")) {
+ w->scale = SCOPE_SCALE_4X;
+ }
+ }
+ else if (!strcmp (keyvaluesi, "fragmentDuration")) {
+ if (!strcmp (keyvaluesi+1, "50")) {
+ w->scope.fragment_duration = 50;
+ }
+ else if (!strcmp (keyvaluesi+1, "100")) {
+ w->scope.fragment_duration = 100;
+ }
+ else if (!strcmp (keyvaluesi+1, "200")) {
+ w->scope.fragment_duration = 200;
+ }
+ else if (!strcmp (keyvaluesi+1, "300")) {
+ w->scope.fragment_duration = 300;
+ }
+ else if (!strcmp (keyvaluesi+1, "500")) {
+ w->scope.fragment_duration = 500;
+ }
+ }
+ }
+}
+
+static char const **
+_scope_serialize_to_keyvalues (ddb_gtkui_widget_t *widget) {
+ w_scope_t *w = (w_scope_t *)widget;
+ char const **keyvalues = calloc (3*2+1, sizeof (char *));
+ keyvalues0 = "renderMode";
+ switch (w->scope.mode) {
+ case DDB_SCOPE_MONO:
+ keyvalues1 = "mono";
+ break;
+ case DDB_SCOPE_MULTICHANNEL:
+ keyvalues1 = "multichannel";
+ break;
+ }
+ keyvalues2 = "scaleMode";
+ switch (w->scale) {
+ case SCOPE_SCALE_AUTO:
+ keyvalues3 = "auto";
+ break;
+ case SCOPE_SCALE_1X:
+ keyvalues3 = "1x";
+ break;
+ case SCOPE_SCALE_2X:
+ keyvalues3 = "2x";
+ break;
+ case SCOPE_SCALE_3X:
+ keyvalues3 = "3x";
+ break;
+ case SCOPE_SCALE_4X:
+ keyvalues3 = "4x";
+ break;
+ }
+ keyvalues4 = "fragmentDuration";
+ switch (w->scope.fragment_duration) {
+ case 50:
+ keyvalues5 = "50";
+ break;
+ case 100:
+ keyvalues5 = "100";
+ break;
+ case 200:
+ keyvalues5 = "200";
+ break;
+ case 500:
+ keyvalues5 = "500";
+ break;
+ case 300:
+ default:
+ keyvalues5 = "300";
+ break;
+ }
+ return keyvalues;
+}
+
+static void
+_scope_free_serialized_keyvalues (ddb_gtkui_widget_t *widget, char const **keyvalues) {
+ free (keyvalues);
 }
 
 ddb_gtkui_widget_t *
@@ -2685,13 +2750,15 @@
 w->base.widget = gtk_event_box_new ();
 w->base.init = w_scope_init;
 w->base.destroy = w_scope_destroy;
+ w->exapi._size = sizeof (ddb_gtkui_widget_extended_api_t);
+ w->exapi.deserialize_from_keyvalues = _scope_deserialize_from_keyvalues;
+ w->exapi.serialize_to_keyvalues = _scope_serialize_to_keyvalues;
+ w->exapi.free_serialized_keyvalues = _scope_free_serialized_keyvalues;
 w->drawarea = gtk_drawing_area_new ();
-#if USE_OPENGL
- int attrlist = {GDK_GL_ATTRIB_LIST_NONE};
- GdkGLConfig *conf = gdk_gl_config_new_by_mode ((GdkGLConfigMode)(GDK_GL_MODE_RGB |
- GDK_GL_MODE_DOUBLE));
- gboolean cap = gtk_widget_set_gl_capability (w->drawarea, conf, NULL, TRUE, GDK_GL_RGBA_TYPE);
-#endif
+
+ ddb_scope_init(&w->scope);
+ w->scope.mode = DDB_SCOPE_MULTICHANNEL;
+ w->scope.fragment_duration = 300;
 
 w->mutex = deadbeef->mutex_create ();
 gtk_widget_show (w->drawarea);
@@ -2701,9 +2768,112 @@
 #else
 g_signal_connect_after ((gpointer) w->drawarea, "draw", G_CALLBACK (scope_draw), w);
 #endif
- g_signal_connect_after (G_OBJECT (w->drawarea), "realize", G_CALLBACK (scope_realize), w);
+
+ g_signal_connect((gpointer)w->drawarea, "unmap", G_CALLBACK(_scope_unmap), w);
+
+ g_signal_connect ((gpointer)w->base.widget, "button-press-event", G_CALLBACK (_scope_button_press), w);
+
 w_override_signals (w->base.widget, w);
- deadbeef->vis_waveform_listen(w, scope_wavedata_listener);
+
+ w->menu = gtk_menu_new();
+
+ GtkWidget *rendering_mode_item = gtk_menu_item_new_with_mnemonic( _("Rendering Mode"));
+ gtk_widget_show(rendering_mode_item);
+ GtkWidget *rendering_mode_menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(rendering_mode_item), rendering_mode_menu);
+
+ w->mode_multichannel_item = gtk_check_menu_item_new_with_mnemonic( _("Multichannel"));
+ gtk_widget_show(w->mode_multichannel_item);
+
+ w->mode_mono_item = gtk_check_menu_item_new_with_mnemonic( _("Mono"));
+ gtk_widget_show(w->mode_mono_item);
+
+ gtk_menu_shell_insert (GTK_MENU_SHELL(rendering_mode_menu), w->mode_multichannel_item, 0);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(rendering_mode_menu), w->mode_mono_item, 1);
+
+ GtkWidget *scale_item = gtk_menu_item_new_with_mnemonic(_("Scale"));
+ gtk_widget_show(scale_item);
+ GtkWidget *scale_menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(scale_item), scale_menu);
+
+ w->scale_auto_item = gtk_check_menu_item_new_with_mnemonic(_("Auto"));
+ gtk_widget_show(w->scale_auto_item);
+ w->scale_1x_item = gtk_check_menu_item_new_with_mnemonic(_("1x"));
+ gtk_widget_show(w->scale_1x_item);
+ w->scale_2x_item = gtk_check_menu_item_new_with_mnemonic(_("2x"));
+ gtk_widget_show(w->scale_2x_item);
+ w->scale_3x_item = gtk_check_menu_item_new_with_mnemonic(_("3x"));
+ gtk_widget_show(w->scale_3x_item);
+ w->scale_4x_item = gtk_check_menu_item_new_with_mnemonic(_("4x"));
+ gtk_widget_show(w->scale_4x_item);
+
+ gtk_menu_shell_insert (GTK_MENU_SHELL(scale_menu), w->scale_auto_item, 0);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(scale_menu), w->scale_1x_item, 1);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(scale_menu), w->scale_2x_item, 2);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(scale_menu), w->scale_3x_item, 3);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(scale_menu), w->scale_4x_item, 4);
+
+ GtkWidget *fragment_duration_item = gtk_menu_item_new_with_mnemonic(_("Fragment Duration"));
+ gtk_widget_show(fragment_duration_item);
+ GtkWidget *fragment_duration_menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(fragment_duration_item), fragment_duration_menu);
+
+ w->fragment_duration_50ms_item = gtk_check_menu_item_new_with_mnemonic(_("50 ms"));
+ gtk_widget_show(w->fragment_duration_50ms_item);
+ w->fragment_duration_100ms_item = gtk_check_menu_item_new_with_mnemonic(_("100 ms"));
+ gtk_widget_show(w->fragment_duration_100ms_item);
+ w->fragment_duration_200ms_item = gtk_check_menu_item_new_with_mnemonic(_("200 ms"));
+ gtk_widget_show(w->fragment_duration_200ms_item);
+ w->fragment_duration_300ms_item = gtk_check_menu_item_new_with_mnemonic(_("300 ms"));
+ gtk_widget_show(w->fragment_duration_300ms_item);
+ w->fragment_duration_500ms_item = gtk_check_menu_item_new_with_mnemonic(_("500 ms"));
+ gtk_widget_show(w->fragment_duration_500ms_item);
+
+ gtk_menu_shell_insert (GTK_MENU_SHELL(fragment_duration_menu), w->fragment_duration_50ms_item, 0);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(fragment_duration_menu), w->fragment_duration_100ms_item, 1);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(fragment_duration_menu), w->fragment_duration_200ms_item, 2);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(fragment_duration_menu), w->fragment_duration_300ms_item, 3);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(fragment_duration_menu), w->fragment_duration_500ms_item, 4);
+
+
+// GtkWidget *separator_item = gtk_separator_menu_item_new ();
+// gtk_widget_show(separator_item);
+//
+// GtkWidget *preferences_item = gtk_menu_item_new_with_mnemonic(_("Preferences"));
+// gtk_widget_show(preferences_item);
+
+ gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), rendering_mode_item, 0);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), scale_item, 1);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), fragment_duration_item, 2);
+// gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), separator_item, 3);
+// gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), preferences_item, 4);
+
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->mode_multichannel_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->mode_mono_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->scale_auto_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->scale_1x_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->scale_2x_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->scale_3x_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->scale_4x_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->fragment_duration_50ms_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->fragment_duration_100ms_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->fragment_duration_200ms_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->fragment_duration_300ms_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->fragment_duration_500ms_item), TRUE);
+
+ g_signal_connect((gpointer)w->mode_multichannel_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->mode_mono_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->scale_auto_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->scale_1x_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->scale_2x_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->scale_3x_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->scale_4x_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->fragment_duration_50ms_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->fragment_duration_100ms_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->fragment_duration_200ms_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->fragment_duration_300ms_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+ g_signal_connect((gpointer)w->fragment_duration_500ms_item, "activate", G_CALLBACK(_scope_menu_activate), w);
+
 return (ddb_gtkui_widget_t *)w;
 }
 
@@ -2720,12 +2890,16 @@
 cairo_surface_destroy (s->surf);
 s->surf = NULL;
 }
-#if USE_OPENGL
- if (s->glcontext) {
- gdk_gl_context_destroy (s->glcontext);
- s->glcontext = NULL;
+
+ ddb_analyzer_dealloc(&s->analyzer);
+ ddb_analyzer_draw_data_dealloc(&s->draw_data);
+ free (s->input_data.data);
+ s->input_data.data = NULL;
+
+ if (s->mutex) {
+ deadbeef->mutex_free (s->mutex);
+ s->mutex = 0;
 }
-#endif
 }
 
 gboolean
@@ -2735,164 +2909,173 @@
 return TRUE;
 }
 
+static void
+spectrum_audio_listener (void *ctx, const ddb_audio_data_t *data) {
+ w_spectrum_t *w = ctx;
 
-static void calculate_bands(w_spectrum_t *w, int bands)
-{
-	int i;
+ deadbeef->mutex_lock (w->mutex);
+ // copy the input data for later consumption
+ if (w->input_data.nframes != data->nframes || w->input_data.fmt->channels != data->fmt->channels) {
+ free (w->input_data.data);
+ w->input_data.data = malloc (data->nframes * data->fmt->channels * sizeof (float));
+ w->input_data.nframes = data->nframes;
+ }
+ memcpy (w->input_data.fmt, data->fmt, sizeof (ddb_waveformat_t));
+ memcpy (w->input_data.data, data->data, data->nframes * data->fmt->channels * sizeof (float));
+ deadbeef->mutex_unlock (w->mutex);
+}
 
-	for (i = 0; i <= bands; i++)
-		w->xscalei = powf((float)(MAX_BANDS+1), ((float) i / (float) bands)) - 1;
+static void
+_spectrum_update_listening(w_spectrum_t *w) {
+ gboolean is_visible = gtk_widget_get_mapped(w->drawarea);
+ if (w->is_listening && !is_visible) {
+ deadbeef->vis_spectrum_unlisten (w);
+ w->is_listening = FALSE;
+ }
+ else if (!w->is_listening && is_visible) {
+ deadbeef->vis_spectrum_listen2(w, spectrum_audio_listener);
+ w->is_listening = TRUE;
+ }
 }
 
 static void
-spectrum_audio_listener (void *ctx, ddb_audio_data_t *data) {
- w_spectrum_t *w = ctx;
- memcpy (w->data, data->data, DDB_FREQ_BANDS * sizeof (float));
+_spectrum_unmap(GtkWidget* self, gpointer user_data) {
+ _spectrum_update_listening(user_data);
+}
+
+static void
+_spectrum_update_preferences (w_spectrum_t *spectrum) {
+ GdkColor color;
+ gtkui_get_vis_custom_base_color(&color);
+
+ spectrum->grid_color0 = 0.5f;
+ spectrum->grid_color1 = 0.5f;
+ spectrum->grid_color2 = 0.5f;
+
+ // saturate the peaks slightly
+ spectrum->peak_color0 = color.red / 65535.f;
+ spectrum->peak_color1 = color.green / 65535.f;
+ spectrum->peak_color2 = color.blue / 65535.f;
+
+ spectrum->peak_color0 += (1.f - spectrum->peak_color0) * 0.5f;
+ spectrum->peak_color1 += (1.f - spectrum->peak_color1) * 0.5f;
+ spectrum->peak_color2 += (1.f - spectrum->peak_color2) * 0.5f;
+
+ spectrum->bar_color0 = color.red / 65535.f;
+ spectrum->bar_color1 = color.green / 65535.f;
+ spectrum->bar_color2 = color.blue / 65535.f;
+
+ gtkui_get_vis_custom_background_color(&color);
+ spectrum->background_color0 = color.red / 65535.f;
+ spectrum->background_color1 = color.green / 65535.f;
+ spectrum->background_color2 = color.blue / 65535.f;
 }
 
+static void
+_spectrum_draw_grid(w_spectrum_t *w, cairo_t *cr, GtkAllocation size) {
+ // horz lines, db scale
+ float lower = -floor(w->analyzer.db_lower_bound);
+ for (int db = 0; db < lower; db += 10) {
+ float y = (float)(db / lower) * (size.height - SpectrumVisYOffset);
+
+ cairo_move_to (cr, SpectrumVisXOffset, y + SpectrumVisYOffset);
+ cairo_line_to (cr, size.width-1, y + SpectrumVisYOffset);
+ }
+
+ static const double dash2 = {1, 2};
+ cairo_set_dash(cr, dash, 2, 0);
+ cairo_stroke(cr);
+ cairo_set_dash(cr, NULL, 0, 0);
+
+ // db text
+ cairo_set_font_size(cr, 10);
+
+ for (int db = 0; db < lower; db += 10) {
+ float y = (float)(db / lower) * (size.height - SpectrumVisYOffset);
+
+ char str20;
+ snprintf (str, sizeof (str), "%d dB", -db);
+
+ cairo_move_to(cr, 0, y + 9 + SpectrumVisYOffset);
+ cairo_show_text(cr, str);
+ }
+}
+
+static void
+_spectrum_draw_frequency_labels (w_spectrum_t *w, cairo_t *cr, GtkAllocation size) {
+ // octaves text
+ for (int i = 0; i < w->draw_data.label_freq_count; i++) {
+ if (w->draw_data.label_freq_positions < 0) {
+ continue;
+ }
+
+ cairo_move_to(cr, w->draw_data.label_freq_positionsi + SpectrumVisXOffset, 9);
+ cairo_show_text(cr, w->draw_data.label_freq_textsi);
+ }
+}
+
+
 static gboolean
 spectrum_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data) {
 w_spectrum_t *w = user_data;
- float *freq = w->data;
+
+ _spectrum_update_listening (w);
+
+ cairo_set_source_rgb (cr, w->background_color0, w->background_color1, w->background_color2);
+ cairo_paint (cr);
+
+ if (w->input_data.nframes == 0) {
+ return FALSE;
+ }
+
+ _spectrum_update_preferences (w);
 
 GtkAllocation a;
 gtk_widget_get_allocation (widget, &a);
 
- int width, height, bands;
- bands = a.width/BAND_WIDTH;
- bands = CLAMP(bands, 4, MAX_BANDS);
- width = a.width;
- height = a.height;
-	calculate_bands(w, bands);
-
-	for (int i = 0; i <= bands; i ++)
-	{
-		int a = ceil (w->xscalei);
-		int b = floor (w->xscalei + 1);
-		float n = 0;
-
-		if (b < a)
-			n += freqb * (w->xscalei + 1 - w->xscalei);
-		else
-		{
-			if (a > 0)
-				n += freqa - 1 * (a - w->xscalei);
-			for (; a < b; a ++)
-				n += freqa;
-			if (b < MAX_BANDS)
-				n += freqb * (w->xscalei + 1 - b);
-		}
-
-		/* 40 dB range */
-		int x = 20 * log10 (n * 200);
-		x = CLAMP (x, 0, 40);
-
-		w->barsi -= MAX (0, VIS_FALLOFF - w->delayi);
-		w->peaksi -= MAX (0, VIS_FALLOFF_PEAK - w->delay_peaki);;
-
-		if (w->delayi)
-			w->delayi--;
-		if (w->delay_peaki)
-			w->delay_peaki--;
-
-		if (x > w->barsi)
-		{
-			w->barsi = x;
-			w->delayi = VIS_DELAY;
-		}
-		if (x > w->peaksi) {
- w->peaksi = x;
- w->delay_peaki = VIS_DELAY_PEAK;
- }
- if (w->peaksi < w->barsi) {
- w->peaksi = w->barsi;
- }
-	}
-
-#if USE_OPENGL
- GdkGLDrawable *d = gtk_widget_get_gl_drawable (widget);
- gdk_gl_drawable_gl_begin (d, w->glcontext);
-
- glClear (GL_COLOR_BUFFER_BIT);
- glMatrixMode (GL_PROJECTION);
- glLoadIdentity ();
- gluOrtho2D(0,a.width,a.height,0);
- glMatrixMode (GL_MODELVIEW);
- glViewport (0, 0, a.width, a.height);
-
- glBegin (GL_QUADS);
-	float base_s = (height / 40.f);
-
-	for (gint i = 0; i <= bands; i++)
-	{
-		gint x = ((width / bands) * i) + 2;
- int y = a.height - w->barsi * base_s;
- glColor3f (0, 0.5, 1);
-		glVertex2f (x + 1, y);
-		glVertex2f (x + 1 + (width / bands) - 1, y);
-		glVertex2f (x + 1 + (width / bands) - 1, a.height);
-		glVertex2f (x + 1, a.height);
-
- // peak
- glColor3f (1, 1, 1);
- y = a.height - w->peaksi * base_s;
-		glVertex2f (x + 1, y);
-		glVertex2f (x + 1 + (width / bands) - 1, y);
-		glVertex2f (x + 1 + (width / bands) - 1, y+1);
-		glVertex2f (x + 1, y+1);
-	}
- glEnd();
- gdk_gl_drawable_swap_buffers (d);
-
- gdk_gl_drawable_gl_end (d);
-#else
- if (!w->surf || cairo_image_surface_get_width (w->surf) != a.width || cairo_image_surface_get_height (w->surf) != a.height) {
- if (w->surf) {
- cairo_surface_destroy (w->surf);
- w->surf = NULL;
+ deadbeef->mutex_lock (w->mutex);
+ ddb_analyzer_process(&w->analyzer, w->input_data.fmt->samplerate, w->input_data.fmt->channels, w->input_data.data, w->input_data.nframes);
+ ddb_analyzer_tick(&w->analyzer);
+
+ ddb_analyzer_get_draw_data(&w->analyzer, a.width - SpectrumVisXOffset, a.height - SpectrumVisYOffset, &w->draw_data);
+ deadbeef->mutex_unlock(w->mutex);
+
+ cairo_set_source_rgb(cr, w->grid_color0, w->grid_color1, w->grid_color2);
+ _spectrum_draw_grid(w, cr, a);
+ _spectrum_draw_frequency_labels(w, cr, a);
+
+ // bars
+ ddb_analyzer_draw_bar_t *bar = w->draw_data.bars;
+ cairo_set_source_rgb(cr, w->bar_color0, w->bar_color1, w->bar_color2);
+ for (int i = 0; i < w->draw_data.bar_count; i++, bar++) {
+ if (w->analyzer.mode == DDB_ANALYZER_MODE_FREQUENCIES) {
+ cairo_move_to(cr, bar->xpos + SpectrumVisXOffset, a.height - bar->bar_height + SpectrumVisYOffset);
+ cairo_line_to(cr, bar->xpos + SpectrumVisXOffset, a.height - 1);
+ }
+ else {
+ cairo_rectangle(cr, bar->xpos + SpectrumVisXOffset, a.height-bar->bar_height + SpectrumVisYOffset, w->draw_data.bar_width, bar->bar_height);
 }
- w->surf = cairo_image_surface_create (CAIRO_FORMAT_RGB24, a.width, a.height);
 }
-	float base_s = (height / 40.f);
 
- cairo_surface_flush (w->surf);
- unsigned char *data = cairo_image_surface_get_data (w->surf);
- if (!data) {
- return FALSE;
+ if (w->analyzer.mode == DDB_ANALYZER_MODE_FREQUENCIES) {
+ cairo_set_line_width(cr, 1);
+ cairo_stroke(cr);
+ }
+ else {
+ cairo_fill(cr);
 }
- int stride = cairo_image_surface_get_stride (w->surf);
- memset (data, 0, a.height * stride);
 
- int barw = width / bands;
-	for (gint i = 0; i <= bands; i++)
-	{
-		int x = barw * i;
- int y = a.height - w->barsi * base_s;
- if (y < 0) {
- y = 0;
- }
- int bw = barw-1;
- if (x + bw >= a.width) {
- bw = a.width-x-1;
- }
- _draw_bar (data, stride, x+1, y, bw, a.height-y, 0xff007fff);
- y = a.height - w->peaksi * base_s;
- if (y < a.height-1) {
- _draw_bar (data, stride, x + 1, y, bw, 1, 0xffffffff);
- }
-	}
- cairo_surface_mark_dirty (w->surf);
- cairo_save (cr);
- cairo_set_source_surface (cr, w->surf, 0, 0);
- cairo_rectangle (cr, 0, 0, a.width, a.height);
- cairo_fill (cr);
- cairo_restore (cr);
+ // peaks
+ bar = w->draw_data.bars;
+ cairo_set_source_rgb(cr, w->peak_color0, w->peak_color1, w->peak_color2);
+ for (int i = 0; i < w->draw_data.bar_count; i++, bar++) {
+ cairo_rectangle(cr, bar->xpos + SpectrumVisXOffset, a.height-bar->peak_ypos-1 + SpectrumVisYOffset, w->draw_data.bar_width, 1);
+ }
+ cairo_fill(cr);
 
-#endif
 return FALSE;
 }
 
-
 gboolean
 spectrum_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) {
 cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
@@ -2900,6 +3083,7 @@
 cairo_destroy (cr);
 return res;
 }
+
 void
 w_spectrum_init (ddb_gtkui_widget_t *w) {
 w_spectrum_t *s = (w_spectrum_t *)w;
@@ -2907,38 +3091,167 @@
 g_source_remove (s->drawtimer);
 s->drawtimer = 0;
 }
-#if USE_OPENGL
- if (!gtkui_gl_init ()) {
- s->drawtimer = g_timeout_add (33, w_spectrum_draw_cb, w);
- }
-#else
 s->drawtimer = g_timeout_add (33, w_spectrum_draw_cb, w);
-#endif
 }
 
-void
-spectrum_realize (GtkWidget *widget, gpointer data) {
- w_spectrum_t *w = data;
-#if USE_OPENGL
- w->glcontext = gtk_widget_create_gl_context (w->drawarea, NULL, TRUE, GDK_GL_RGBA_TYPE);
-#endif
+static void
+_spectrum_menu_update (w_spectrum_t *s) {
+ s->updating_menu = TRUE;
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->mode_discrete_item), s->analyzer.mode == DDB_ANALYZER_MODE_FREQUENCIES);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->mode_12_item), s->analyzer.mode == DDB_ANALYZER_MODE_OCTAVE_NOTE_BANDS && s->analyzer.octave_bars_step == 2);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->mode_24_item), s->analyzer.mode == DDB_ANALYZER_MODE_OCTAVE_NOTE_BANDS && s->analyzer.octave_bars_step == 1);
+
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->gap_none_item), s->analyzer.bar_gap_denominator == 0);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->gap_2_item), s->analyzer.bar_gap_denominator == 2);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->gap_3_item), s->analyzer.bar_gap_denominator == 3);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->gap_4_item), s->analyzer.bar_gap_denominator == 4);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->gap_5_item), s->analyzer.bar_gap_denominator == 5);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->gap_6_item), s->analyzer.bar_gap_denominator == 6);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->gap_7_item), s->analyzer.bar_gap_denominator == 7);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->gap_8_item), s->analyzer.bar_gap_denominator == 8);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->gap_9_item), s->analyzer.bar_gap_denominator == 9);
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->gap_10_item), s->analyzer.bar_gap_denominator == 10);
+ s->updating_menu = FALSE;
+}
+
+static gboolean
+_spectrum_button_press (GtkWidget* self, GdkEventButton *event, gpointer user_data) {
+ if (design_mode) {
+ return FALSE;
+ }
+ w_spectrum_t *s = user_data;
+
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
+ _spectrum_menu_update(s);
+ gtk_menu_popup_at_pointer (GTK_MENU (s->menu), NULL);
+ }
+ return TRUE;
+}
+
+static void
+_spectrum_menu_activate (GtkWidget* self, gpointer user_data) {
+ w_spectrum_t *s = user_data;
+
+ if (s->updating_menu) {
+ return;
+ }
+
+ if (self == s->mode_discrete_item) {
+ s->analyzer.mode = DDB_ANALYZER_MODE_FREQUENCIES;
+ s->analyzer.mode_did_change = 1;
+ }
+ else if (self == s->mode_12_item) {
+ s->analyzer.mode = DDB_ANALYZER_MODE_OCTAVE_NOTE_BANDS;
+ s->analyzer.octave_bars_step = 2;
+ s->analyzer.mode_did_change = 1;
+ }
+ else if (self == s->mode_24_item) {
+ s->analyzer.mode = DDB_ANALYZER_MODE_OCTAVE_NOTE_BANDS;
+ s->analyzer.octave_bars_step = 1;
+ s->analyzer.mode_did_change = 1;
+ }
+ else if (self == s->gap_none_item) {
+ s->analyzer.bar_gap_denominator = 0;
+ }
+ else if (self == s->gap_2_item) {
+ s->analyzer.bar_gap_denominator = 2;
+ }
+ else if (self == s->gap_3_item) {
+ s->analyzer.bar_gap_denominator = 3;
+ }
+ else if (self == s->gap_4_item) {
+ s->analyzer.bar_gap_denominator = 4;
+ }
+ else if (self == s->gap_5_item) {
+ s->analyzer.bar_gap_denominator = 5;
+ }
+ else if (self == s->gap_6_item) {
+ s->analyzer.bar_gap_denominator = 6;
+ }
+ else if (self == s->gap_7_item) {
+ s->analyzer.bar_gap_denominator = 7;
+ }
+ else if (self == s->gap_8_item) {
+ s->analyzer.bar_gap_denominator = 8;
+ }
+ else if (self == s->gap_9_item) {
+ s->analyzer.bar_gap_denominator = 9;
+ }
+ else if (self == s->gap_10_item) {
+ s->analyzer.bar_gap_denominator = 10;
+ }
+}
+
+static void
+_spectrum_deserialize_from_keyvalues (ddb_gtkui_widget_t *widget, const char **keyvalues) {
+ w_spectrum_t *s = (w_spectrum_t *)widget;
+
+ s->analyzer.mode = DDB_ANALYZER_MODE_OCTAVE_NOTE_BANDS;
+ s->analyzer.bar_gap_denominator = 3;
+
+ for (int i = 0; keyvaluesi; i += 2) {
+ if (!strcmp (keyvaluesi, "renderMode")) {
+ if (!strcmp (keyvaluesi+1, "frequencies")) {
+ s->analyzer.mode = DDB_ANALYZER_MODE_FREQUENCIES;
+ }
+ }
+ else if (!strcmp (keyvaluesi, "distanceBetweenBars")) {
+ s->analyzer.bar_gap_denominator = atoi(keyvaluesi+1);
+ }
+ else if (!strcmp (keyvaluesi, "barGranularity")) {
+ s->analyzer.octave_bars_step = atoi(keyvaluesi+1);
+ }
+ }
+}
+
+static char const **
+_spectrum_serialize_to_keyvalues (ddb_gtkui_widget_t *widget) {
+ w_spectrum_t *s = (w_spectrum_t *)widget;
+
+ char const **keyvalues = calloc (7, sizeof (char *));
+
+ keyvalues0 = "renderMode";
+ switch (s->analyzer.mode) {
+ case DDB_ANALYZER_MODE_FREQUENCIES:
+ keyvalues1 = "frequencies";
+ break;
+ case DDB_ANALYZER_MODE_OCTAVE_NOTE_BANDS:
+ keyvalues1 = "bands";
+ break;
+ }
+
+ char temp10;
+
+ keyvalues2 = "distanceBetweenBars";
+ snprintf (temp, sizeof (temp), "%d", s->analyzer.bar_gap_denominator);
+ keyvalues3 = strdup(temp);
+
+ keyvalues4 = "barGranularity";
+ snprintf (temp, sizeof (temp), "%d", s->analyzer.octave_bars_step);
+ keyvalues5 = strdup(temp);
+
+ return keyvalues;
+}
+
+static void
+_spectrum_free_serialized_keyvalues (ddb_gtkui_widget_t *widget, char const **keyvalues) {
+ free ((char *)keyvalues3);
+ free ((char *)keyvalues5);
+ free (keyvalues);
 }
 
 ddb_gtkui_widget_t *
 w_spectrum_create (void) {
- w_spectrum_t *w = malloc (sizeof (w_spectrum_t));
- memset (w, 0, sizeof (w_spectrum_t));
+ w_spectrum_t *w = calloc (1, sizeof (w_spectrum_t));
 
 w->base.widget = gtk_event_box_new ();
 w->base.init = w_spectrum_init;
 w->base.destroy = w_spectrum_destroy;
+ w->exapi._size = sizeof (ddb_gtkui_widget_extended_api_t);
+ w->exapi.deserialize_from_keyvalues = _spectrum_deserialize_from_keyvalues;
+ w->exapi.serialize_to_keyvalues = _spectrum_serialize_to_keyvalues;
+ w->exapi.free_serialized_keyvalues = _spectrum_free_serialized_keyvalues;
 w->drawarea = gtk_drawing_area_new ();
-#if USE_OPENGL
- int attrlist = {GDK_GL_ATTRIB_LIST_NONE};
- GdkGLConfig *conf = gdk_gl_config_new_by_mode ((GdkGLConfigMode)(GDK_GL_MODE_RGB |
- GDK_GL_MODE_DOUBLE));
- gboolean cap = gtk_widget_set_gl_capability (w->drawarea, conf, NULL, TRUE, GDK_GL_RGBA_TYPE);
-#endif
 gtk_widget_show (w->drawarea);
 gtk_container_add (GTK_CONTAINER (w->base.widget), w->drawarea);
 #if !GTK_CHECK_VERSION(3,0,0)
@@ -2946,9 +3259,132 @@
 #else
 g_signal_connect_after ((gpointer) w->drawarea, "draw", G_CALLBACK (spectrum_draw), w);
 #endif
- g_signal_connect_after (G_OBJECT (w->drawarea), "realize", G_CALLBACK (spectrum_realize), w);
+
+ g_signal_connect((gpointer)w->drawarea, "unmap", G_CALLBACK(_spectrum_unmap), w);
+ g_signal_connect ((gpointer)w->base.widget, "button-press-event", G_CALLBACK (_spectrum_button_press), w);
+
 w_override_signals (w->base.widget, w);
- deadbeef->vis_spectrum_listen (w, spectrum_audio_listener);
+
+ w->menu = gtk_menu_new();
+
+ GtkWidget *rendering_mode_item = gtk_menu_item_new_with_mnemonic( _("Rendering Mode"));
+ gtk_widget_show(rendering_mode_item);
+ GtkWidget *rendering_mode_menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(rendering_mode_item), rendering_mode_menu);
+
+ w->mode_discrete_item = gtk_check_menu_item_new_with_mnemonic( _("Discrete Frequencies"));
+ gtk_widget_show(w->mode_discrete_item);
+
+ w->mode_12_item = gtk_check_menu_item_new_with_mnemonic( _("1/12 Octave Bands"));
+ gtk_widget_show(w->mode_12_item);
+
+ w->mode_24_item = gtk_check_menu_item_new_with_mnemonic( _("1/24 Octave Bands"));
+ gtk_widget_show(w->mode_24_item);
+
+ gtk_menu_shell_insert (GTK_MENU_SHELL(rendering_mode_menu), w->mode_discrete_item, 0);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(rendering_mode_menu), w->mode_12_item, 1);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(rendering_mode_menu), w->mode_24_item, 1);
+
+ GtkWidget *gap_size_item = gtk_menu_item_new_with_mnemonic(_("Gap Size"));
+ gtk_widget_show(gap_size_item);
+ GtkWidget *gap_size_menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(gap_size_item), gap_size_menu);
+
+ w->gap_none_item = gtk_check_menu_item_new_with_mnemonic(_("None"));
+ gtk_widget_show(w->gap_none_item);
+
+ w->gap_2_item = gtk_check_menu_item_new_with_mnemonic(_("1/2 Bar"));
+ gtk_widget_show(w->gap_2_item);
+
+ w->gap_3_item = gtk_check_menu_item_new_with_mnemonic(_("1/3 Bar"));
+ gtk_widget_show(w->gap_3_item);
+
+ w->gap_4_item = gtk_check_menu_item_new_with_mnemonic(_("1/4 Bar"));
+ gtk_widget_show(w->gap_4_item);
+
+ w->gap_5_item = gtk_check_menu_item_new_with_mnemonic(_("1/5 Bar"));
+ gtk_widget_show(w->gap_5_item);
+
+ w->gap_6_item = gtk_check_menu_item_new_with_mnemonic(_("1/6 Bar"));
+ gtk_widget_show(w->gap_6_item);
+
+ w->gap_7_item = gtk_check_menu_item_new_with_mnemonic(_("1/7 Bar"));
+ gtk_widget_show(w->gap_7_item);
+
+ w->gap_8_item = gtk_check_menu_item_new_with_mnemonic(_("1/8 Bar"));
+ gtk_widget_show(w->gap_8_item);
+
+ w->gap_9_item = gtk_check_menu_item_new_with_mnemonic(_("1/9 Bar"));
+ gtk_widget_show(w->gap_9_item);
+
+ w->gap_10_item = gtk_check_menu_item_new_with_mnemonic(_("1/10 Bar"));
+ gtk_widget_show(w->gap_10_item);
+
+ gtk_menu_shell_insert (GTK_MENU_SHELL(gap_size_menu), w->gap_none_item, 0);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(gap_size_menu), w->gap_2_item, 1);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(gap_size_menu), w->gap_3_item, 2);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(gap_size_menu), w->gap_4_item, 3);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(gap_size_menu), w->gap_5_item, 4);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(gap_size_menu), w->gap_6_item, 5);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(gap_size_menu), w->gap_7_item, 6);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(gap_size_menu), w->gap_8_item, 7);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(gap_size_menu), w->gap_9_item, 8);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(gap_size_menu), w->gap_10_item, 9);
+
+ // GtkWidget *separator_item = gtk_separator_menu_item_new ();
+ // gtk_widget_show(separator_item);
+ //
+ // GtkWidget *preferences_item = gtk_menu_item_new_with_mnemonic(_("Preferences"));
+ // gtk_widget_show(preferences_item);
+
+ gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), rendering_mode_item, 0);
+ gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), gap_size_item, 1);
+ // gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), separator_item, 2);
+ // gtk_menu_shell_insert (GTK_MENU_SHELL(w->menu), preferences_item, 3);
+
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->mode_discrete_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->mode_12_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->mode_24_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->gap_none_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->gap_2_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->gap_3_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->gap_4_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->gap_5_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->gap_6_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->gap_7_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->gap_8_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->gap_9_item), TRUE);
+ gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(w->gap_10_item), TRUE);
+
+ g_signal_connect((gpointer)w->mode_discrete_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->mode_12_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->mode_24_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->gap_none_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->gap_2_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->gap_3_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->gap_4_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->gap_5_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->gap_6_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->gap_7_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->gap_8_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->gap_9_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+ g_signal_connect((gpointer)w->gap_10_item, "activate", G_CALLBACK(_spectrum_menu_activate), w);
+
+ w->input_data.fmt = &w->fmt;
+
+ // using the analyzer framework
+ ddb_analyzer_init(&w->analyzer);
+ w->analyzer.db_lower_bound = -80;
+ w->analyzer.peak_hold = 10;
+ w->analyzer.view_width = 1000;
+ w->analyzer.fractional_bars = 1;
+ w->analyzer.octave_bars_step = 2;
+ w->analyzer.max_of_stereo_data = 1;
+ w->analyzer.mode = DDB_ANALYZER_MODE_OCTAVE_NOTE_BANDS;
+
+ w->mutex = deadbeef->mutex_create ();
+
+ _spectrum_update_listening(w);
 return (ddb_gtkui_widget_t *)w;
 }
 
@@ -3028,7 +3464,7 @@
 
 static void
 w_hvbox_save (struct ddb_gtkui_widget_s *w, char *s, int sz) {
- char save300;
+ char save1000;
 
 w_hvbox_save_info_t info;
 memset (&info, 0, sizeof (info));
@@ -3127,6 +3563,7 @@
 for (c = w->children; c && c->next; c = c->next);
 if (c) {
 w_remove (w, c);
+ w_destroy (c);
 }
 if (!w->children) {
 w_append (w, w_create ("placeholder"));
@@ -3144,12 +3581,12 @@
 static void
 w_hvbox_initmenu (struct ddb_gtkui_widget_s *w, GtkWidget *menu) {
 GtkWidget *item;
- item = gtk_menu_item_new_with_mnemonic (_("Expand the box by 1 item"));
+ item = gtk_menu_item_new_with_mnemonic (_("Expand Box by 1 Item"));
 gtk_widget_show (item);
 gtk_container_add (GTK_CONTAINER (menu), item);
 g_signal_connect ((gpointer) item, "activate", G_CALLBACK (on_hvbox_expand), w);
 
- item = gtk_menu_item_new_with_mnemonic (_("Shrink the box by 1 item"));
+ item = gtk_menu_item_new_with_mnemonic (_("Shrink Box by 1 Item"));
 gtk_widget_show (item);
 gtk_container_add (GTK_CONTAINER (menu), item);
 g_signal_connect ((gpointer) item, "activate", G_CALLBACK (on_hvbox_shrink), w);
@@ -3304,7 +3741,7 @@
 b->icon = val0 ? strdup (val) : NULL;
 }
 else if (!strcmp (key, "label")) {
- b->label = val0 ? strdup (val) : NULL;
+ b->label = strdup (val);
 }
 else if (!strcmp (key, "action")) {
 b->action = val0 ? strdup (val) : NULL;
@@ -3376,7 +3813,6 @@
 w_button_t *w = user_data;
 DB_plugin_t **plugins = deadbeef->plug_get_list();
 int i;
- int added_entries = 0;
 for (i = 0; pluginsi; i++) {
 if (!pluginsi->get_actions) {
 continue;
@@ -3384,7 +3820,10 @@
 DB_plugin_action_t *acts = pluginsi->get_actions (NULL);
 while (acts) {
 if (!strcmp (acts->name, w->action)) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 if (acts->callback) {
+#pragma GCC diagnostic pop
 gtkui_exec_action_14 (acts, -1);
 }
 else if (acts->callback2) {
@@ -3500,6 +3939,7 @@
 on_button_config (GtkMenuItem *menuitem, gpointer user_data) {
 w_button_t *b = user_data;
 GtkWidget *dlg = create_button_properties ();
+ gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (mainwin));
 GtkWidget *color = lookup_widget (dlg, "color");
 GtkWidget *use_color = lookup_widget (dlg, "use_color");
 GtkWidget *textcolor = lookup_widget (dlg, "textcolor");
@@ -3511,7 +3951,7 @@
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (use_color), b->use_color);
 gtk_color_button_set_color (GTK_COLOR_BUTTON (textcolor), &b->textcolor);
 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (use_textcolor), b->use_textcolor);
- gtk_entry_set_text (GTK_ENTRY (label), b->label ? b->label : "");
+ gtk_entry_set_text (GTK_ENTRY (label), b->label ? b->label : _("Button"));
 set_button_action_label (b->action, b->action_ctx, action);
 g_signal_connect ((gpointer) action, "clicked",
 G_CALLBACK (on_button_set_action_clicked),
@@ -3573,9 +4013,7 @@
 free (b->label);
 b->label = NULL;
 }
- if (l0) {
- b->label = strdup (l);
- }
+ b->label = strdup (l);
 
 const char *ic = NULL;
 int sel = gtk_combo_box_get_active (GTK_COMBO_BOX (icon));
@@ -3603,7 +4041,7 @@
 static void
 w_button_initmenu (struct ddb_gtkui_widget_s *w, GtkWidget *menu) {
 GtkWidget *item;
- item = gtk_menu_item_new_with_mnemonic (_("Configure button"));
+ item = gtk_menu_item_new_with_mnemonic (_("Configure Button"));
 gtk_widget_show (item);
 gtk_container_add (GTK_CONTAINER (menu), item);
 g_signal_connect ((gpointer) item, "activate", G_CALLBACK (on_button_config), w);
@@ -3640,11 +4078,10 @@
 seekbar_frameupdate (gpointer data) {
 w_seekbar_t *w = data;
 DB_output_t *output = deadbeef->get_output ();
- DB_playItem_t *track = deadbeef->streamer_get_playing_track ();
- DB_fileinfo_t *c = deadbeef->streamer_get_current_fileinfo (); // FIXME: might crash streamer
+ DB_playItem_t *track = deadbeef->streamer_get_playing_track_safe ();
 float songpos = w->last_songpos;
 float duration = track ? deadbeef->pl_get_item_duration (track) : -1;
- if (!output || (output->state () == OUTPUT_STATE_STOPPED || !track || !c)) {
+ if (!output || (output->state () == DDB_PLAYBACK_STATE_STOPPED || !track)) {
 songpos = 0;
 }
 else {
@@ -3679,11 +4116,17 @@
 static int
 w_seekbar_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
 switch (id) {
- case DB_EV_SONGCHANGED:
- g_idle_add (redraw_seekbar_cb, w);
- break;
 case DB_EV_CONFIGCHANGED:
 w_seekbar_init (w);
+ if (ctx) {
+ char *conf_str = (char *)ctx;
+ if (gtkui_bar_override_conf(conf_str) || gtkui_bar_colors_conf(conf_str)) {
+ g_idle_add (redraw_seekbar_cb, w);
+ }
+ }
+ break;
+ case DB_EV_SONGCHANGED:
+ g_idle_add (redraw_seekbar_cb, w);
 break;
 }
 return 0;
@@ -3703,6 +4146,9 @@
 w_seekbar_t *w = malloc (sizeof (w_seekbar_t));
 memset (w, 0, sizeof (w_seekbar_t));
 w->base.widget = gtk_event_box_new ();
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_add_events (GTK_WIDGET (w->base.widget), GDK_SCROLL_MASK);
+#endif
 w->base.message = w_seekbar_message;
 w->base.destroy = w_seekbar_destroy;
 w->base.init = w_seekbar_init;
@@ -3810,12 +4256,7 @@
 static gboolean
 redraw_volumebar_cb (gpointer data) {
 w_volumebar_t *w = data;
- gtk_widget_queue_draw (w->volumebar);
- char s100;
- int db = deadbeef->volume_get_db ();
- snprintf (s, sizeof (s), "%s%ddB", db < 0 ? "" : "+", db);
- gtk_widget_set_tooltip_text (w->volumebar, s);
- gtk_widget_trigger_tooltip_query (w->volumebar);
+ ddb_volumebar_update (DDB_VOLUMEBAR (w->volumebar));
 return FALSE;
 }
 
@@ -3823,6 +4264,13 @@
 w_volumebar_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
 switch (id) {
 case DB_EV_CONFIGCHANGED:
+ if (ctx) {
+ char *conf_str = (char *)ctx;
+ if (gtkui_bar_override_conf(conf_str) || gtkui_bar_colors_conf(conf_str)) {
+ g_idle_add (redraw_volumebar_cb, w);
+ }
+ }
+ break;
 case DB_EV_VOLUMECHANGED:
 g_idle_add (redraw_volumebar_cb, w);
 break;
@@ -3830,14 +4278,161 @@
 return 0;
 }
 
+static void
+w_volumebar_dbscale_activate (GtkWidget *item, struct ddb_gtkui_widget_s *w)
+{
+ DdbVolumeBar *bar = DDB_VOLUMEBAR (((w_volumebar_t *)w)->volumebar);
+ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item))) {
+ ddb_volumebar_set_scale (bar, DDB_VOLUMEBAR_SCALE_DB);
+ ddb_volumebar_update (bar);
+ }
+}
+
+static void
+w_volumebar_linearscale_activate (GtkWidget *item, struct ddb_gtkui_widget_s *w)
+{
+ DdbVolumeBar *bar = DDB_VOLUMEBAR (((w_volumebar_t *)w)->volumebar);
+ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item))) {
+ ddb_volumebar_set_scale (bar, DDB_VOLUMEBAR_SCALE_LINEAR);
+ ddb_volumebar_update (bar);
+ }
+}
+
+static void
+w_volumebar_cubicscale_activate (GtkWidget *item, struct ddb_gtkui_widget_s *w)
+{
+ DdbVolumeBar *bar = DDB_VOLUMEBAR (((w_volumebar_t *)w)->volumebar);
+ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item))) {
+ ddb_volumebar_set_scale (bar, DDB_VOLUMEBAR_SCALE_CUBIC);
+ ddb_volumebar_update (bar);
+ }
+}
+
+static void
+w_volumebar_initmenu (struct ddb_gtkui_widget_s *w, GtkWidget *menu) {
+ GtkWidget *item;
+ GSList *group = NULL;
+ w_volumebar_t *widget = (w_volumebar_t *)w;
+ DdbVolumeBarScale scale = ddb_volumebar_get_scale (DDB_VOLUMEBAR (widget->volumebar));
+ item = gtk_radio_menu_item_new_with_mnemonic (group, _("_dB Scale"));
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+ gtk_widget_show (item);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "toggled",
+ G_CALLBACK (w_volumebar_dbscale_activate),
+ w);
+ if (scale == DDB_VOLUMEBAR_SCALE_DB) {
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+ }
+
+ item = gtk_radio_menu_item_new_with_mnemonic (group, _("_Linear Scale"));
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+ gtk_widget_show (item);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "toggled",
+ G_CALLBACK (w_volumebar_linearscale_activate),
+ w);
+ if (scale == DDB_VOLUMEBAR_SCALE_LINEAR) {
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+ }
+
+ item = gtk_radio_menu_item_new_with_mnemonic (group, _("_Cubic Scale"));
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+ gtk_widget_show (item);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "toggled",
+ G_CALLBACK (w_volumebar_cubicscale_activate),
+ w);
+ if (scale == DDB_VOLUMEBAR_SCALE_CUBIC) {
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
+ }
+
+}
+
+static gboolean
+on_volumebar_evbox_button_press_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
+{
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
+ GtkWidget *menu;
+
+ menu = gtk_menu_new ();
+ w_volumebar_initmenu (user_data, menu);
+ gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (widget), NULL);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
+ return TRUE;
+ }
+ return FALSE;
+}
+
+static void
+w_volumebar_deserialize_from_keyvalues(ddb_gtkui_widget_t *base, const char **keyvalues) {
+ w_volumebar_t *vb = (w_volumebar_t *)base;
+ for (int i = 0; keyvaluesi != NULL; i += 2) {
+ if (!strcmp (keyvaluesi, "scale")) {
+ DdbVolumeBarScale scale = DDB_VOLUMEBAR_SCALE_DB;
+ if (!strcmp (keyvaluesi+1, "linear")) {
+ scale = DDB_VOLUMEBAR_SCALE_LINEAR;
+ }
+ else if (!strcmp (keyvaluesi+1, "cubic")) {
+ scale = DDB_VOLUMEBAR_SCALE_CUBIC;
+ }
+ else {
+ int iscale = atoi(keyvaluesi+1);
+ if (iscale > 0 && iscale < DDB_VOLUMEBAR_SCALE_COUNT) {
+ scale = (DdbVolumeBarScale)iscale;
+ }
+ }
+ ddb_volumebar_set_scale (DDB_VOLUMEBAR (vb->volumebar), scale);
+ }
+ }
+}
+
+static char const **
+w_volumebar_serialize_to_keyvalues(ddb_gtkui_widget_t *base) {
+ w_volumebar_t *vb = (w_volumebar_t *)base;
+ DdbVolumeBarScale scale = ddb_volumebar_get_scale (DDB_VOLUMEBAR (vb->volumebar));
+ char const **kv = calloc (3, sizeof (char *));
+ kv0 = "scale";
+ switch (scale) {
+ case DDB_VOLUMEBAR_SCALE_LINEAR:
+ kv1 = "linear";
+ break;
+ case DDB_VOLUMEBAR_SCALE_CUBIC:
+ kv1 = "cubic";
+ break;
+ case DDB_VOLUMEBAR_SCALE_DB:
+ default:
+ kv1 = "db";
+ break;
+ }
+ return kv;
+}
+
+static void
+w_volumebar_free_serialized_keyvalues(ddb_gtkui_widget_t *w, char const **keyvalues) {
+ free (keyvalues);
+}
+
 ddb_gtkui_widget_t *
 w_volumebar_create (void) {
 w_volumebar_t *w = malloc (sizeof (w_volumebar_t));
 memset (w, 0, sizeof (w_volumebar_t));
 w->base.widget = gtk_event_box_new ();
 w->base.message = w_volumebar_message;
+ w->base.initmenu = w_volumebar_initmenu;
+ w->exapi._size = sizeof (ddb_gtkui_widget_extended_api_t);
+ w->exapi.deserialize_from_keyvalues = w_volumebar_deserialize_from_keyvalues;
+ w->exapi.serialize_to_keyvalues = w_volumebar_serialize_to_keyvalues;
+ w->exapi.free_serialized_keyvalues = w_volumebar_free_serialized_keyvalues;
+
 w->volumebar = ddb_volumebar_new ();
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_set_events (GTK_WIDGET (w->base.widget), gtk_widget_get_events (GTK_WIDGET (w->base.widget)) | GDK_SCROLL_MASK);
+#endif
 ddb_volumebar_init_signals (DDB_VOLUMEBAR (w->volumebar), w->base.widget);
+ g_signal_connect ((gpointer) w->base.widget, "button_press_event", G_CALLBACK (on_volumebar_evbox_button_press_event), w);
 gtk_widget_show (w->volumebar);
 gtk_widget_set_size_request (w->base.widget, 70, -1);
 gtk_container_add (GTK_CONTAINER (w->base.widget), w->volumebar);
@@ -3883,3 +4478,121 @@
 w_override_signals (w->base.widget, w);
 return (ddb_gtkui_widget_t*)w;
 }
+
+
+////// Log viewer widget
+
+static void
+logviewer_logger_callback (struct DB_plugin_s *plugin, uint32_t layers, const char *text, void *ctx);
+
+
+static void
+w_logviewer_init (struct ddb_gtkui_widget_s *widget) {
+ GtkTextBuffer *buffer;
+ w_logviewer_t *w = (w_logviewer_t *)widget;
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (w->textview));
+ gtk_text_buffer_set_text (buffer, "Log\n", -1);
+}
+
+static void
+w_logviewer_scroll_changed (GtkAdjustment *adjustment, gpointer user_data)
+{
+ w_logviewer_t *w = (w_logviewer_t *)user_data;
+
+ if (gtk_adjustment_get_value (adjustment) >=
+ gtk_adjustment_get_upper (adjustment) -
+ gtk_adjustment_get_page_size (adjustment) - 1e-12)
+ {
+ w->scroll_bottomed = 1;
+ } else {
+ w->scroll_bottomed= 0;
+ }
+}
+
+
+static gboolean
+logviewer_addtext_cb (gpointer data) {
+ logviewer_addtexts_t *s = (logviewer_addtexts_t *)data;
+ w_logviewer_t *w = s->w;
+
+ GtkTextBuffer *buffer;
+ GtkTextIter iter;
+ size_t len;
+ len = strlen(s->text_to_add);
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (w->textview));
+ gtk_text_buffer_get_end_iter(buffer, &iter);
+ gtk_text_buffer_insert (buffer, &iter, s->text_to_add, (gint)len);
+ // Make sure it ends on a newline
+ if (s->text_to_addlen-1 != '\n') {
+ gtk_text_buffer_get_end_iter(buffer, &iter);
+ gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ }
+ if (w->scroll_bottomed) {
+ gtk_text_buffer_get_end_iter(buffer, &iter);
+ GtkTextMark *mark = gtk_text_buffer_create_mark (buffer, NULL, &iter, FALSE);
+ gtk_text_view_scroll_mark_onscreen (GTK_TEXT_VIEW (w->textview), mark);
+ }
+ free (s->text_to_add);
+ free(s);
+ return FALSE;
+}
+
+static void
+logviewer_logger_callback (struct DB_plugin_s *plugin, uint32_t layers, const char *text, void *ctx) {
+ logviewer_addtexts_t *s = malloc (sizeof (logviewer_addtexts_t));
+ s->w = (w_logviewer_t *)ctx;
+ s->text_to_add = strdup(text);
+ g_idle_add(logviewer_addtext_cb, (gpointer)s);
+}
+
+void
+w_logviewer_destroy (ddb_gtkui_widget_t *w) {
+ // This is only called if removing widget in design mode
+ deadbeef->log_viewer_unregister (logviewer_logger_callback, w);
+ if (w_logviewer_instancecount > 0) {
+ w_logviewer_instancecount--;
+ }
+}
+
+ddb_gtkui_widget_t *
+w_logviewer_create (void) {
+ w_logviewer_t *w = malloc (sizeof (w_logviewer_t));
+ memset (w, 0, sizeof (w_logviewer_t));
+
+ w->base.widget = gtk_event_box_new ();
+ w->base.init = w_logviewer_init;
+ w->base.destroy = w_logviewer_destroy;
+
+ gtk_widget_set_can_focus (w->base.widget, FALSE);
+
+ GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_set_can_focus (scroll, FALSE);
+ gtk_widget_show (scroll);
+ gtk_container_add (GTK_CONTAINER (w->base.widget), scroll);
+
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_ETCHED_IN);
+ w->textview = gtk_text_view_new ();
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(w->textview), FALSE);
+ //gtk_widget_set_size_request(w->textview, 320, 240);
+ gtk_widget_show (w->textview);
+ gtk_container_add (GTK_CONTAINER (scroll), w->textview);
+
+ w_override_signals (w->base.widget, w);
+
+ GtkAdjustment *adjustment = gtk_scrolled_window_get_vadjustment ( GTK_SCROLLED_WINDOW (scroll));
+ w->scroll_bottomed=1;
+ g_signal_connect (adjustment, "value-changed", G_CALLBACK (w_logviewer_scroll_changed), w);
+
+ deadbeef->log_viewer_register (logviewer_logger_callback, w);
+
+ w_logviewer_instancecount++;
+
+ return (ddb_gtkui_widget_t *)w;
+}
+
+gboolean
+w_logviewer_is_present(void) {
+ return w_logviewer_instancecount > 0;
+}
+

deadbeef-0.6.2.tar.bz2/plugins/gtkui/widgets.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/widgets.h Changed

@@ -1,26 +1,35 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2011 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifndef __WIDGETS_H
 #define __WIDGETS_H
 
 #include "gtkui_api.h"
 
+#define DDB_GTKUI_CONF_LAYOUT "gtkui.layout.1.9.0"
+
+struct json_t;
+
 void
 w_init (void);
 
@@ -54,8 +63,11 @@
 ddb_gtkui_widget_t *
 w_create (const char *type);
 
-const char *
-w_create_from_string (const char *s, ddb_gtkui_widget_t **parent);
+uint32_t
+w_get_type_flags(const char *type);
+
+int
+w_create_from_json (struct json_t *json, ddb_gtkui_widget_t **parent);
 
 void
 w_destroy (ddb_gtkui_widget_t *w);
@@ -102,12 +114,6 @@
 w_tabs_create (void);
 
 ddb_gtkui_widget_t *
-w_selproperties_create (void);
-
-ddb_gtkui_widget_t *
-w_coverart_create (void);
-
-ddb_gtkui_widget_t *
 w_scope_create (void);
 
 ddb_gtkui_widget_t *
@@ -134,4 +140,10 @@
 ddb_gtkui_widget_t *
 w_ctvoices_create (void);
 
+ddb_gtkui_widget_t *
+w_logviewer_create (void);
+
+gboolean
+w_logviewer_is_present(void);
+
 #endif

deadbeef-0.6.2.tar.bz2/plugins/gtkui/wingeom.c -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/wingeom.c Changed

@@ -1,32 +1,56 @@
 /*
- DeaDBeeF - The Ultimate Music Player
- Copyright (C) 2009-2013 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.
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
 */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #include <gtk/gtk.h>
 #include "wingeom.h"
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include "gtkui.h"
 #include "support.h"
 
+void get_deadbeef_monitor_rect (GdkRectangle *rect)
+{
+#if GTK_CHECK_VERSION(3,22,0)
+ GdkDisplay *display = gdk_window_get_display (gtk_widget_get_window (mainwin));
+ GdkMonitor *monitor = gdk_display_get_monitor_at_window (display, gtk_widget_get_window (mainwin));
+ gdk_monitor_get_geometry (monitor, rect);
+#else
+ GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (mainwin));
+ gint monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (mainwin));
+ gdk_screen_get_monitor_geometry (screen, monitor, rect);
+#endif
+}
+
 void
 wingeom_save (GtkWidget *widget, const char *name) {
+
+ GdkRectangle r = {0,};
+ if (widget != mainwin) {
+ get_deadbeef_monitor_rect(&r);
+ }
+
 #if GTK_CHECK_VERSION(2,2,0)
 	GdkWindowState window_state = gdk_window_get_state (gtk_widget_get_window (widget));
 #else
@@ -39,9 +63,9 @@
 gtk_window_get_position (GTK_WINDOW (widget), &x, &y);
 gtk_window_get_size (GTK_WINDOW (widget), &w, &h);
 snprintf (key, sizeof (key), "%s.geometry.x", name);
- deadbeef->conf_set_int (key, x);
+ deadbeef->conf_set_int (key, x - r.x);
 snprintf (key, sizeof (key), "%s.geometry.y", name);
- deadbeef->conf_set_int (key, y);
+ deadbeef->conf_set_int (key, y - r.y);
 snprintf (key, sizeof (key), "%s.geometry.w", name);
 deadbeef->conf_set_int (key, w);
 snprintf (key, sizeof (key), "%s.geometry.h", name);
@@ -82,10 +106,17 @@
 void
 wingeom_restore (GtkWidget *win, const char *name, int dx, int dy, int dw, int dh, int dmax) {
 char key100;
+
+
+ GdkRectangle r = {0,};
+ if (win != mainwin) {
+ get_deadbeef_monitor_rect(&r);
+ }
+
 snprintf (key, sizeof (key), "%s.geometry.x", name);
- int x = deadbeef->conf_get_int (key, dx);
+ int x = deadbeef->conf_get_int (key, dx) + r.x;
 snprintf (key, sizeof (key), "%s.geometry.y", name);
- int y = deadbeef->conf_get_int (key, dy);
+ int y = deadbeef->conf_get_int (key, dy) + r.y;
 snprintf (key, sizeof (key), "%s.geometry.w", name);
 int w = deadbeef->conf_get_int (key, dw);
 snprintf (key, sizeof (key), "%s.geometry.h", name);

deadbeef-0.6.2.tar.bz2/plugins/gtkui/wingeom.h -> deadbeef-1.9.6.tar.bz2/plugins/gtkui/wingeom.h Changed

deadbeef-0.6.2.tar.bz2/plugins/hotkeys/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/hotkeys/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/hotkeys/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/hotkeys/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/hotkeys/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/hotkeys/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/hotkeys/actionhandlers.c -> deadbeef-1.9.6.tar.bz2/plugins/hotkeys/actionhandlers.c Changed

@@ -1,6 +1,6 @@
 /*
 hotkey action handlers for deadbeef hotkeys plugin
- Copyright (C) 2009-2013 Alexey Yakovenko and other contributors
+ Copyright (C) 2009-2013 Oleksiy Yakovenko and other contributors
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -26,18 +26,296 @@
 
 #include <string.h>
 #include "../../gettext.h"
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 extern DB_functions_t *deadbeef;
 
 int
-action_jump_to_current_handler (DB_plugin_action_t *act, int ctx) {
+action_jump_to_current_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 deadbeef->sendmessage (DB_EV_TRACKFOCUSCURRENT, 0, 0, 0);
 return 0;
 }
 
+static DB_playItem_t*
+skip_to_get_track_helper (void) {
+ DB_playItem_t *current = deadbeef->streamer_get_playing_track_safe ();
+ if (!current) {
+ return NULL;
+ }
+
+ ddb_playlist_t *plt_curr = deadbeef->plt_get_curr ();
+ ddb_playlist_t *plt = deadbeef->pl_get_playlist (current);
+
+ DB_playItem_t *it = NULL;
+ if (plt && plt_curr && plt != plt_curr) {
+ deadbeef->pl_item_unref (current);
+ it = deadbeef->plt_get_first (plt_curr, PL_MAIN);
+ while (it) {
+ if (deadbeef->pl_is_selected (it)) {
+ break;
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ }
+ else {
+ it = current;
+ }
+
+ if (plt) {
+ deadbeef->plt_unref (plt);
+ }
+ if (plt_curr) {
+ deadbeef->plt_unref (plt_curr);
+ }
+ return it;
+}
+
+static void
+skip_to_prev_helper (const char *meta) {
+ if (!meta) {
+ return;
+ }
+ deadbeef->pl_lock ();
+ DB_output_t *output = deadbeef->get_output ();
+ if (output->state () == DDB_PLAYBACK_STATE_STOPPED) {
+ deadbeef->pl_unlock ();
+ return;
+ }
+
+ DB_playItem_t *it = skip_to_get_track_helper ();
+ if (!it) {
+ deadbeef->pl_unlock ();
+ return;
+ }
+
+ const char *cur_meta = deadbeef->pl_find_meta_raw (it, meta);
+ int c = 0;
+ while (it) {
+ DB_playItem_t *prev = deadbeef->pl_get_prev (it, PL_MAIN);
+ if (!prev) {
+ if (c == 1) {
+ deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, deadbeef->pl_get_idx_of (it), 0);
+ }
+ deadbeef->pl_item_unref (it);
+ break;
+ }
+ const char *prev_meta = deadbeef->pl_find_meta_raw (prev, meta);
+ if (cur_meta != prev_meta) {
+ if (c == 0) {
+ cur_meta = prev_meta;
+ c = 1;
+ }
+ else {
+ deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, deadbeef->pl_get_idx_of (it), 0);
+ deadbeef->pl_item_unref (it);
+ deadbeef->pl_item_unref (prev);
+ break;
+ }
+ }
+ deadbeef->pl_item_unref (it);
+ it = prev;
+ }
+ deadbeef->pl_unlock ();
+}
+
+static void
+skip_to_next_helper (const char *meta) {
+ if (!meta) {
+ return;
+ }
+ deadbeef->pl_lock ();
+ DB_output_t *output = deadbeef->get_output ();
+ if (output->state () == DDB_PLAYBACK_STATE_STOPPED) {
+ deadbeef->pl_unlock ();
+ return;
+ }
+
+ DB_playItem_t *it = skip_to_get_track_helper ();
+ if (!it) {
+ deadbeef->pl_unlock ();
+ return;
+ }
+
+ const char *cur_meta = deadbeef->pl_find_meta_raw (it, meta);
+ while (it) {
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ if (!next) {
+ deadbeef->pl_item_unref (it);
+ break;
+ }
+ const char *next_meta = deadbeef->pl_find_meta_raw (next, meta);
+ if (cur_meta != next_meta) {
+ deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, deadbeef->pl_get_idx_of (next), 0);
+ deadbeef->pl_item_unref (it);
+ deadbeef->pl_item_unref (next);
+ break;
+ }
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ deadbeef->pl_unlock ();
+}
+
+int
+action_skip_to_next_album_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ skip_to_next_helper ("album");
+ return 0;
+}
+
+int
+action_skip_to_next_genre_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ skip_to_next_helper ("genre");
+ return 0;
+}
+
+int
+action_skip_to_next_composer_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ skip_to_next_helper ("composer");
+ return 0;
+}
+
+int
+action_skip_to_prev_album_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ skip_to_prev_helper ("album");
+ return 0;
+}
+
+int
+action_skip_to_prev_genre_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ skip_to_prev_helper ("genre");
+ return 0;
+}
+
+int
+action_skip_to_prev_composer_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ skip_to_prev_helper ("composer");
+ return 0;
+}
+
+int
+action_skip_to_next_artist_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ deadbeef->pl_lock ();
+ DB_output_t *output = deadbeef->get_output ();
+ if (output->state () == DDB_PLAYBACK_STATE_STOPPED) {
+ deadbeef->pl_unlock ();
+ return 0;
+ }
+
+ DB_playItem_t *it = skip_to_get_track_helper ();
+ if (!it) {
+ deadbeef->pl_unlock ();
+ return 0;
+ }
+
+ const char *cur_artist = deadbeef->pl_find_meta_raw (it, "band");
+ if (!cur_artist) {
+ cur_artist = deadbeef->pl_find_meta_raw (it, "album artist");
+ }
+ if (!cur_artist) {
+ cur_artist = deadbeef->pl_find_meta_raw (it, "albumartist");
+ }
+ if (!cur_artist) {
+ cur_artist = deadbeef->pl_find_meta_raw (it, "artist");
+ }
+ while (it) {
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ if (!next) {
+ deadbeef->pl_item_unref (it);
+ break;
+ }
+ const char *next_artist = deadbeef->pl_find_meta_raw (next, "band");
+ if (!next_artist) {
+ next_artist = deadbeef->pl_find_meta_raw (next, "album artist");
+ }
+ if (!next_artist) {
+ next_artist = deadbeef->pl_find_meta_raw (next, "albumartist");
+ }
+ if (!next_artist) {
+ next_artist = deadbeef->pl_find_meta_raw (next, "artist");
+ }
+
+ if (cur_artist != next_artist) {
+ deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, deadbeef->pl_get_idx_of (next), 0);
+ deadbeef->pl_item_unref (it);
+ deadbeef->pl_item_unref (next);
+ break;
+ }
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ deadbeef->pl_unlock ();
+ return 0;
+}
+
+int
+action_skip_to_prev_artist_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ deadbeef->pl_lock ();
+ DB_output_t *output = deadbeef->get_output ();
+ if (output->state () == DDB_PLAYBACK_STATE_STOPPED) {
+ deadbeef->pl_unlock ();
+ return 0;
+ }
+
+ DB_playItem_t *it = skip_to_get_track_helper ();
+ if (!it) {
+ deadbeef->pl_unlock ();
+ return 0;
+ }
+
+ const char *cur_artist = deadbeef->pl_find_meta_raw (it, "band");
+ if (!cur_artist) {
+ cur_artist = deadbeef->pl_find_meta_raw (it, "album artist");
+ }
+ if (!cur_artist) {
+ cur_artist = deadbeef->pl_find_meta_raw (it, "albumartist");
+ }
+ if (!cur_artist) {
+ cur_artist = deadbeef->pl_find_meta_raw (it, "artist");
+ }
+ int c = 0;
+ while (it) {
+ DB_playItem_t *prev = deadbeef->pl_get_prev (it, PL_MAIN);
+ if (!prev) {
+ if (c == 1) {
+ deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, deadbeef->pl_get_idx_of (it), 0);
+ }
+ deadbeef->pl_item_unref (it);
+ break;
+ }
+ const char *prev_artist = deadbeef->pl_find_meta_raw (prev, "band");
+ if (!prev_artist) {
+ prev_artist = deadbeef->pl_find_meta_raw (prev, "album artist");
+ }
+ if (!prev_artist) {
+ prev_artist = deadbeef->pl_find_meta_raw (prev, "albumartist");
+ }
+ if (!prev_artist) {
+ prev_artist = deadbeef->pl_find_meta_raw (prev, "artist");
+ }
+
+ if (cur_artist != prev_artist) {
+ if (c == 0) {
+ cur_artist = prev_artist;
+ c = 1;
+ }
+ else {
+ deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, deadbeef->pl_get_idx_of (it), 0);
+ deadbeef->pl_item_unref (it);
+ deadbeef->pl_item_unref (prev);
+ break;
+ }
+ }
+ deadbeef->pl_item_unref (it);
+ it = prev;
+ }
+ deadbeef->pl_unlock ();
+ return 0;
+}
+
 int
-action_reload_metadata_handler (DB_plugin_action_t *act, int ctx) {
+action_reload_metadata_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
 while (it) {
 deadbeef->pl_lock ();
@@ -46,7 +324,13 @@
 if (dec) {
 strncpy (decoder_id, dec, sizeof (decoder_id));
 }
- int match = deadbeef->pl_is_selected (it) && deadbeef->is_local_file (deadbeef->pl_find_meta (it, ":URI")) && dec;
+ int match;
+ if (ctx == DDB_ACTION_CTX_PLAYLIST) {
+ match = deadbeef->is_local_file (deadbeef->pl_find_meta (it, ":URI")) && dec;
+ }
+ else {
+ match = deadbeef->pl_is_selected (it) && deadbeef->is_local_file (deadbeef->pl_find_meta (it, ":URI")) && dec;
+ }
 deadbeef->pl_unlock ();
 
 if (match) {
@@ -74,7 +358,7 @@
 }
 
 int
-action_next_playlist_handler (DB_plugin_action_t *act, int ctx) {
+action_next_playlist_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int tab = deadbeef->plt_get_curr_idx ();
 
 if (tab == deadbeef->plt_get_count ()-1) {
@@ -85,13 +369,12 @@
 }
 
 deadbeef->plt_set_curr_idx (tab);
- deadbeef->conf_set_int ("playlist.current", tab);
 
 return 0;
 }
 
 int
-action_prev_playlist_handler (DB_plugin_action_t *act, int ctx) {
+action_prev_playlist_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int tab = deadbeef->plt_get_curr_idx ();
 
 if (tab == 0) {
@@ -102,167 +385,156 @@
 }
 
 deadbeef->plt_set_curr_idx (tab);
- deadbeef->conf_set_int ("playlist.current", tab);
 
 return 0;
 }
 
 int
-action_playlist1_handler (DB_plugin_action_t *act, int ctx) {
+action_playlist1_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int pl = 0;
 if (pl < deadbeef->plt_get_count ()) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return 0;
 }
 
 int
-action_playlist2_handler (DB_plugin_action_t *act, int ctx) {
+action_playlist2_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int pl = 1;
 if (pl < deadbeef->plt_get_count ()) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return 0;
 }
 
 int
-action_playlist3_handler (DB_plugin_action_t *act, int ctx) {
+action_playlist3_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int pl = 2;
 if (pl < deadbeef->plt_get_count ()) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return 0;
 }
 
 int
-action_playlist4_handler (DB_plugin_action_t *act, int ctx) {
+action_playlist4_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int pl = 3;
 if (pl < deadbeef->plt_get_count ()) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return 0;
 }
 
 int
-action_playlist5_handler (DB_plugin_action_t *act, int ctx) {
+action_playlist5_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int pl = 4;
 if (pl < deadbeef->plt_get_count ()) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return 0;
 }
 
 int
-action_playlist6_handler (DB_plugin_action_t *act, int ctx) {
+action_playlist6_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int pl = 5;
 if (pl < deadbeef->plt_get_count ()) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return 0;
 }
 
 int
-action_playlist7_handler (DB_plugin_action_t *act, int ctx) {
+action_playlist7_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int pl = 6;
 if (pl < deadbeef->plt_get_count ()) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return 0;
 }
 
 int
-action_playlist8_handler (DB_plugin_action_t *act, int ctx) {
+action_playlist8_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int pl = 7;
 if (pl < deadbeef->plt_get_count ()) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return 0;
 }
 
 int
-action_playlist9_handler (DB_plugin_action_t *act, int ctx) {
+action_playlist9_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int pl = 8;
 if (pl < deadbeef->plt_get_count ()) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return 0;
 }
 
 int
-action_playlist10_handler (DB_plugin_action_t *act, int ctx) {
+action_playlist10_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int pl = 9;
 if (pl < deadbeef->plt_get_count ()) {
 deadbeef->plt_set_curr_idx (pl);
- deadbeef->conf_set_int ("playlist.current", pl);
 }
 return 0;
 }
 
 int
-action_sort_randomize_handler (DB_plugin_action_t *act, int ctx) {
+action_sort_randomize_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- deadbeef->plt_sort (plt, PL_MAIN, -1, NULL, DDB_SORT_RANDOM);
+ deadbeef->plt_sort_v2 (plt, PL_MAIN, -1, NULL, DDB_SORT_RANDOM);
 deadbeef->plt_unref (plt);
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 return 0;
 }
 
 int
-action_sort_by_date_handler (DB_plugin_action_t *act, int ctx) {
+action_sort_by_date_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- deadbeef->plt_sort (plt, PL_MAIN, -1, "%y", DDB_SORT_ASCENDING);
+ deadbeef->plt_sort_v2 (plt, PL_MAIN, -1, "%year%", DDB_SORT_ASCENDING);
 deadbeef->plt_unref (plt);
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 return 0;
 }
 
 int
-action_sort_by_artist_handler (DB_plugin_action_t *act, int ctx) {
+action_sort_by_artist_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- deadbeef->plt_sort (plt, PL_MAIN, -1, "%a", DDB_SORT_ASCENDING);
+ deadbeef->plt_sort_v2 (plt, PL_MAIN, -1, "%artist%", DDB_SORT_ASCENDING);
 deadbeef->plt_unref (plt);
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 return 0;
 }
 
 int
-action_sort_by_album_handler (DB_plugin_action_t *act, int ctx) {
+action_sort_by_album_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- deadbeef->plt_sort (plt, PL_MAIN, -1, "%b", DDB_SORT_ASCENDING);
+ deadbeef->plt_sort_v2 (plt, PL_MAIN, -1, "%album%", DDB_SORT_ASCENDING);
 deadbeef->plt_unref (plt);
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 return 0;
 }
 
 int
-action_sort_by_tracknr_handler (DB_plugin_action_t *act, int ctx) {
+action_sort_by_tracknr_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- deadbeef->plt_sort (plt, PL_MAIN, -1, "%n", DDB_SORT_ASCENDING);
+ deadbeef->plt_sort_v2 (plt, PL_MAIN, -1, "%tracknumber%", DDB_SORT_ASCENDING);
 deadbeef->plt_unref (plt);
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 return 0;
 }
 
 int
-action_sort_by_title_handler (DB_plugin_action_t *act, int ctx) {
+action_sort_by_title_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- deadbeef->plt_sort (plt, PL_MAIN, -1, "%t", DDB_SORT_ASCENDING);
+ deadbeef->plt_sort_v2 (plt, PL_MAIN, -1, "%title%", DDB_SORT_ASCENDING);
 deadbeef->plt_unref (plt);
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 return 0;
 }
 
 int
-action_invert_selection_handler (DB_plugin_action_t *act, int ctx) {
+action_invert_selection_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 deadbeef->pl_lock ();
 DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
 while (it) {
@@ -277,51 +549,323 @@
 it = next;
 }
 deadbeef->pl_unlock ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_SELECTION, 0);
 return 0;
 }
 
 int
-action_clear_playlist_handler (DB_plugin_action_t *act, int ctx) {
+action_clear_playlist_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 deadbeef->pl_clear ();
 deadbeef->pl_save_current ();
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 return 0;
 }
 
 int
-action_add_to_playqueue_handler (DB_plugin_action_t *act, int ctx) {
- DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
+action_toggle_in_playqueue_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
 while (it) {
 if (ctx == DDB_ACTION_CTX_PLAYLIST || (ctx == DDB_ACTION_CTX_SELECTION && deadbeef->pl_is_selected (it))) {
- deadbeef->pl_playqueue_push (it);
+ if(deadbeef->playqueue_test(it) != -1)
+ deadbeef->playqueue_remove (it);
+ else
+ deadbeef->playqueue_push (it);
+
 }
 DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
 deadbeef->pl_item_unref (it);
 it = next;
 }
- deadbeef->sendmessage (DB_EV_PLAYLIST_REFRESH, 0, 0, 0);
+
+ deadbeef->plt_unref (plt);
 return 0;
 }
 
 int
-action_remove_from_playqueue_handler (DB_plugin_action_t *act, int ctx) {
- DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
+action_move_tracks_up_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ ddb_playItem_t *playing_track = NULL;
+ if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ playing_track = deadbeef->streamer_get_playing_track_safe ();
+ }
+
+ deadbeef->pl_lock ();
+
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ DB_playItem_t *it;
+
+ int it_count = 0;
+ if (ctx == DDB_ACTION_CTX_SELECTION) {
+ it_count = deadbeef->pl_getselcount ();
+ if (it_count) {
+ int i = 0;
+ uint32_t indexesit_count;
+ memset (indexes, 0, sizeof (indexes));
+
+ it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ if (deadbeef->pl_is_selected (it)) {
+ indexesi = deadbeef->pl_get_idx_of (it);
+ i++;
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ DB_playItem_t *drop_before = deadbeef->pl_get_for_idx (indexes0-1);
+ if (drop_before) {
+ deadbeef->plt_move_items (plt, PL_MAIN, plt, drop_before, indexes, it_count);
+ deadbeef->pl_item_unref (drop_before);
+ }
+ }
+ }
+ else if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ if (playing_track) {
+ it_count = 1;
+ uint32_t indexes1;
+ indexes0 = deadbeef->pl_get_idx_of (playing_track);
+ DB_playItem_t *drop_before = deadbeef->pl_get_prev (playing_track,PL_MAIN);
+ if (drop_before) {
+ deadbeef->plt_move_items (plt, PL_MAIN, plt, drop_before, indexes, it_count);
+ deadbeef->pl_item_unref (drop_before);
+ }
+ }
+ }
+
+ deadbeef->plt_save_config (plt);
+ deadbeef->plt_unref (plt);
+ deadbeef->pl_unlock ();
+
+ if (playing_track != NULL) {
+ deadbeef->pl_item_unref (playing_track);
+ }
+
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+ return 0;
+}
+
+int
+action_move_tracks_down_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ ddb_playItem_t *playing_track = NULL;
+ if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ playing_track = deadbeef->streamer_get_playing_track_safe ();
+ }
+
+ deadbeef->pl_lock ();
+
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ DB_playItem_t *it;
+
+ int it_count = 0;
+ if (ctx == DDB_ACTION_CTX_SELECTION) {
+ int it_count = deadbeef->pl_getselcount ();
+ if (it_count) {
+ int i = 0;
+ uint32_t indexesit_count;
+ memset (indexes, 0, sizeof (indexes));
+
+ it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ if (deadbeef->pl_is_selected (it)) {
+ indexesi = deadbeef->pl_get_idx_of (it);
+ i++;
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ DB_playItem_t *drop_before = deadbeef->pl_get_for_idx (indexesi-1+2);
+ deadbeef->plt_move_items (plt, PL_MAIN, plt, drop_before, indexes, it_count);
+ if (drop_before)
+ deadbeef->pl_item_unref (drop_before);
+ }
+ }
+ else if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ if (playing_track) {
+ it_count = 1;
+ uint32_t indexes1;
+ indexes0 = deadbeef->pl_get_idx_of (playing_track);
+ DB_playItem_t *drop_before = deadbeef->pl_get_for_idx (indexes0+2);
+ deadbeef->plt_move_items (plt, PL_MAIN, plt, drop_before, indexes, it_count);
+ if (drop_before)
+ deadbeef->pl_item_unref (drop_before);
+ }
+ }
+
+ deadbeef->plt_save_config (plt);
+ deadbeef->plt_unref (plt);
+ deadbeef->pl_unlock ();
+
+ if (playing_track != NULL) {
+ deadbeef->pl_item_unref (playing_track);
+ }
+
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+ return 0;
+}
+
+int
+action_add_to_playqueue_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
 while (it) {
 if (ctx == DDB_ACTION_CTX_PLAYLIST || (ctx == DDB_ACTION_CTX_SELECTION && deadbeef->pl_is_selected (it))) {
- deadbeef->pl_playqueue_remove (it);
+ deadbeef->playqueue_push (it);
 }
 DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
 deadbeef->pl_item_unref (it);
 it = next;
 }
- deadbeef->sendmessage (DB_EV_PLAYLIST_REFRESH, 0, 0, 0);
+
+ deadbeef->plt_unref (plt);
+
+ return 0;
+}
+
+int
+action_prepend_to_playqueue_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+
+ DB_playItem_t *it = deadbeef->plt_get_last (plt, PL_MAIN);
+ while (it) {
+ if (ctx == DDB_ACTION_CTX_PLAYLIST || (ctx == DDB_ACTION_CTX_SELECTION && deadbeef->pl_is_selected (it))) {
+ deadbeef->playqueue_insert_at (0, it);
+ }
+ DB_playItem_t *prev = deadbeef->pl_get_prev (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = prev;
+ }
+
+ deadbeef->plt_unref (plt);
+ return 0;
+}
+
+int
+action_remove_from_playqueue_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ if (ctx == DDB_ACTION_CTX_PLAYLIST || (ctx == DDB_ACTION_CTX_SELECTION && deadbeef->pl_is_selected (it))) {
+ deadbeef->playqueue_remove (it);
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+
+ deadbeef->plt_unref (plt);
 return 0;
 }
 
 int
-action_toggle_mute_handler (DB_plugin_action_t *act, int ctx) {
+action_toggle_mute_handler (DB_plugin_action_t *act, ddb_action_context_t ctx) {
 int mute = 1-deadbeef->audio_is_mute ();
 deadbeef->audio_set_mute (mute);
 return 0;
 }
+
+int
+action_prev_or_restart_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
+ if (it) {
+ float dur = deadbeef->pl_get_item_duration (it);
+ deadbeef->pl_item_unref (it);
+ if (dur > 0) {
+ float pos = deadbeef->streamer_get_playpos ();
+ if (pos > 3) {
+ deadbeef->sendmessage (DB_EV_SEEK, 0, 0, 0);
+ return 0;
+ }
+ }
+ }
+ deadbeef->sendmessage (DB_EV_PREV, 0, 0, 0);
+ return 0;
+}
+
+static void
+_copy_playlist_int (ddb_playlist_t *src, ddb_playlist_t *dst) {
+ deadbeef->pl_lock ();
+ DB_playItem_t *it = deadbeef->plt_get_first (src, PL_MAIN);
+ DB_playItem_t *after = NULL;
+ while (it) {
+ DB_playItem_t *it_new = deadbeef->pl_item_alloc ();
+ deadbeef->pl_item_copy (it_new, it);
+ deadbeef->plt_insert_item (dst, after, it_new);
+
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ if (after) {
+ deadbeef->pl_item_unref (after);
+ }
+ after = it_new;
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ if (after) {
+ deadbeef->pl_item_unref (after);
+ }
+ deadbeef->pl_unlock ();
+ deadbeef->plt_save_config (dst);
+}
+
+static int
+_copy_playlist (ddb_playlist_t *plt) {
+ char orig_title100;
+ deadbeef->plt_get_title (plt, orig_title, sizeof (orig_title));
+
+ int cnt = deadbeef->plt_get_count ();
+ int i;
+ int idx = 0;
+ for (;;) {
+ char name100;
+ if (!idx) {
+ snprintf (name, sizeof (name), _("Copy of %s"), orig_title);
+ }
+ else {
+ snprintf (name, sizeof (name), _("Copy of %s (%d)"), orig_title, idx);
+ }
+ deadbeef->pl_lock ();
+ for (i = 0; i < cnt; i++) {
+ char t100;
+ ddb_playlist_t *plt = deadbeef->plt_get_for_idx (i);
+ deadbeef->plt_get_title (plt, t, sizeof (t));
+ deadbeef->plt_unref (plt);
+ if (!strcasecmp (t, name)) {
+ break;
+ }
+ }
+ deadbeef->pl_unlock ();
+ if (i == cnt) {
+ int new_plt_idx = deadbeef->plt_add (cnt, name);
+ if (new_plt_idx < 0) {
+ return -1;
+ }
+ ddb_playlist_t *new_plt = deadbeef->plt_get_for_idx (new_plt_idx);
+ if (!new_plt) {
+ return -1;
+ }
+ _copy_playlist_int(plt, new_plt);
+ return new_plt_idx;
+ }
+ idx++;
+ }
+ return -1;
+}
+
+
+int
+action_duplicate_playlist_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
+ if (plt == NULL) {
+ return -1;
+ }
+
+ int playlist = _copy_playlist (plt);
+ if (playlist != -1) {
+ deadbeef->plt_set_curr_idx (playlist);
+ }
+ deadbeef->plt_unref (plt);
+ return 0;
+}

deadbeef-0.6.2.tar.bz2/plugins/hotkeys/actionhandlers.h -> deadbeef-1.9.6.tar.bz2/plugins/hotkeys/actionhandlers.h Changed

deadbeef-0.6.2.tar.bz2/plugins/hotkeys/hotkeys.c -> deadbeef-1.9.6.tar.bz2/plugins/hotkeys/hotkeys.c Changed

@@ -1,7 +1,7 @@
 /*
 Hotkeys plugin for DeaDBeeF
 Copyright (C) 2009-2011 Viktor Semykin <thesame.ml@gmail.com>
- Copyright (C) 2012-2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2012-2013 Oleksiy Yakovenko <waker@users.sourceforge.net>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -25,7 +25,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#ifndef __APPLE__
+#if defined(__MINGW32__) || defined(__APPLE__)
+#define NO_XLIB_H
+#endif
+#ifndef NO_XLIB_H
 #include <X11/Xlib.h>
 #endif
 #include <ctype.h>
@@ -35,7 +38,7 @@
 
 #include "../libparser/parser.h"
 #include "hotkeys.h"
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include "actionhandlers.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
@@ -44,7 +47,7 @@
 static DB_hotkeys_plugin_t plugin;
 DB_functions_t *deadbeef;
 
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 static int finished;
 static Display *disp;
 static intptr_t loop_tid;
@@ -56,7 +59,7 @@
 typedef struct {
 const char *name;
 int keysym;
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 int keycode; // after mapping
 #endif
 } xkey_t;
@@ -69,11 +72,11 @@
 
 typedef struct command_s {
 int keycode;
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 int x11_keycode;
 #endif
 int modifier;
- int ctx;
+ ddb_action_context_t ctx;
 int isglobal;
 DB_plugin_action_t *action;
 } command_t;
@@ -81,7 +84,7 @@
 static command_t commands MAX_COMMAND_COUNT;
 static int command_count = 0;
 
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 static void
 init_mapped_keycodes (Display *disp, Atom *syms, int first_kk, int last_kk, int ks_per_kk) {
 int i, ks;
@@ -110,19 +113,9 @@
 return 0;
 }
 
-static char*
-trim (char* s)
-{
- char *h, *t;
- 
- for (h = s; *h == ' ' || *h == '\t'; h++);
- for (t = s + strlen (s); *t == ' ' || *t == '\t'; t--);
- * (t+1) = 0;
- return h;
-}
-
+#ifndef NO_XLIB_H
 static void
-cmd_invoke_plugin_command (DB_plugin_action_t *action, int ctx)
+cmd_invoke_plugin_command (DB_plugin_action_t *action, ddb_action_context_t ctx)
 {
 if (action->callback) {
 if (ctx == DDB_ACTION_CTX_MAIN) {
@@ -203,6 +196,7 @@
 action->callback2 (action, ctx);
 }
 }
+#endif
 
 static DB_plugin_action_t *
 find_action_by_name (const char *command) {
@@ -227,7 +221,7 @@
 return actions;
 }
 
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 static int
 get_x11_keycode (const char *name, Atom *syms, int first_kk, int last_kk, int ks_per_kk) {
 int i, ks;
@@ -349,7 +343,7 @@
 else {
 // lookup name table
 cmd_entry->keycode = get_keycode (p);
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 cmd_entry->x11_keycode = get_x11_keycode (p, syms, first_kk, last_kk, ks_per_kk);
 trace ("%s: kc=%d, xkc=%d\n", p, cmd_entry->keycode, cmd_entry->x11_keycode);
 #endif
@@ -373,7 +367,7 @@
 out:
 item = deadbeef->conf_find ("hotkey.", item);
 }
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 XFree (syms);
 int i;
 // need to grab it here to prevent gdk_x_error from being called while we're
@@ -412,9 +406,9 @@
 }
 
 static void
-cleanup () {
+cleanup (void) {
 command_count = 0;
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 if (disp) {
 XCloseDisplay (disp);
 disp = NULL;
@@ -422,7 +416,7 @@
 #endif
 }
 
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 static int
 x_err_handler (Display *d, XErrorEvent *evt) {
 #if 0
@@ -502,7 +496,7 @@
 
 static int
 hotkeys_connect (void) {
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 finished = 0;
 loop_tid = 0;
 disp = XOpenDisplay (NULL);
@@ -531,8 +525,16 @@
 }
 
 static int
+hotkeys_message(uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ if (id == DB_EV_PLUGINSLOADED) {
+ hotkeys_connect();
+ }
+ return 0;
+}
+
+static int
 hotkeys_disconnect (void) {
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 if (loop_tid) {
 finished = 1;
 deadbeef->thread_join (loop_tid);
@@ -579,22 +581,25 @@
 
 void
 hotkeys_reset (void) {
-#ifndef __APPLE__
+#ifndef NO_XLIB_H
 need_reset = 1;
 trace ("hotkeys: reset flagged\n");
+#else
+ // When not using X11, it's assumed that this is always called from UI branch.
+ read_config();
 #endif
 }
 
 int
-action_play_cb (struct DB_plugin_action_s *action, int ctx) {
+action_play_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 // NOTE: this function is copied as on_playbtn_clicked in gtkui
 DB_output_t *output = deadbeef->get_output ();
- if (output->state () == OUTPUT_STATE_PAUSED) {
+ if (output->state () == DDB_PLAYBACK_STATE_PAUSED) {
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
 int cur = deadbeef->plt_get_cursor (plt, PL_MAIN);
 if (cur != -1) {
 ddb_playItem_t *it = deadbeef->plt_get_item_for_idx (plt, cur, PL_MAIN);
- ddb_playItem_t *it_playing = deadbeef->streamer_get_playing_track ();
+ ddb_playItem_t *it_playing = deadbeef->streamer_get_playing_track_safe ();
 if (it) {
 deadbeef->pl_item_unref (it);
 }
@@ -629,33 +634,33 @@
 }
 
 int
-action_prev_cb (struct DB_plugin_action_s *action, int ctx) {
+action_prev_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 deadbeef->sendmessage (DB_EV_PREV, 0, 0, 0);
 return 0;
 }
 
 int
-action_next_cb (struct DB_plugin_action_s *action, int ctx) {
+action_next_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 deadbeef->sendmessage (DB_EV_NEXT, 0, 0, 0);
 return 0;
 }
 
 int
-action_stop_cb (struct DB_plugin_action_s *action, int ctx) {
+action_stop_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 deadbeef->sendmessage (DB_EV_STOP, 0, 0, 0);
 return 0;
 }
 
 int
-action_toggle_pause_cb (struct DB_plugin_action_s *action, int ctx) {
+action_toggle_pause_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 deadbeef->sendmessage (DB_EV_TOGGLE_PAUSE, 0, 0, 0);
 return 0;
 }
 
 int
-action_play_pause_cb (struct DB_plugin_action_s *action, int ctx) {
- int state = deadbeef->get_output ()->state ();
- if (state == OUTPUT_STATE_PLAYING) {
+action_play_pause_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ ddb_playback_state_t state = deadbeef->get_output ()->state ();
+ if (state == DDB_PLAYBACK_STATE_PLAYING) {
 deadbeef->sendmessage (DB_EV_PAUSE, 0, 0, 0);
 }
 else {
@@ -665,98 +670,148 @@
 }
 
 int
-action_play_random_cb (struct DB_plugin_action_s *action, int ctx) {
+action_play_random_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 deadbeef->sendmessage (DB_EV_PLAY_RANDOM, 0, 0, 0);
 return 0;
 }
 
 int
-action_seek_5p_forward_cb (struct DB_plugin_action_s *action, int ctx) {
- deadbeef->pl_lock ();
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
+action_seek_5p_forward_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
 if (it) {
+ deadbeef->pl_lock ();
 float dur = deadbeef->pl_get_item_duration (it);
 if (dur > 0) {
 float pos = deadbeef->streamer_get_playpos ();
- deadbeef->sendmessage (DB_EV_SEEK, 0, (pos + dur * 0.05f) * 1000, 0);
+ pos += dur * 0.05f;
+ if (pos > dur) {
+ pos = dur;
+ }
+ deadbeef->sendmessage (DB_EV_SEEK, 0, (uint32_t)(pos * 1000), 0);
 }
+ deadbeef->pl_unlock ();
 deadbeef->pl_item_unref (it);
 }
- deadbeef->pl_unlock ();
 return 0;
 }
 
 int
-action_seek_5p_backward_cb (struct DB_plugin_action_s *action, int ctx) {
- deadbeef->pl_lock ();
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
+action_seek_5p_backward_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
 if (it) {
+ deadbeef->pl_lock ();
 float dur = deadbeef->pl_get_item_duration (it);
 if (dur > 0) {
 float pos = deadbeef->streamer_get_playpos ();
- pos = (pos - dur * 0.05f) * 1000;
+ pos -= dur * 0.05f;
 if (pos < 0) {
 pos = 0;
 }
-
- deadbeef->sendmessage (DB_EV_SEEK, 0, pos, 0);
+ deadbeef->sendmessage (DB_EV_SEEK, 0, (uint32_t)(pos * 1000), 0);
 }
+ deadbeef->pl_unlock ();
 deadbeef->pl_item_unref (it);
 }
- deadbeef->pl_unlock ();
 return 0;
 }
 
 int
-action_seek_1p_forward_cb (struct DB_plugin_action_s *action, int ctx) {
- deadbeef->pl_lock ();
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
+action_seek_1p_forward_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
 if (it) {
+ deadbeef->pl_lock ();
 float dur = deadbeef->pl_get_item_duration (it);
 if (dur > 0) {
 float pos = deadbeef->streamer_get_playpos ();
- deadbeef->sendmessage (DB_EV_SEEK, 0, (pos + dur * 0.01f) * 1000, 0);
+ pos += dur * 0.01f;
+ if (pos > dur) {
+ pos = dur;
+ }
+ deadbeef->sendmessage (DB_EV_SEEK, 0, (uint32_t)(pos * 1000), 0);
 }
+ deadbeef->pl_unlock ();
 deadbeef->pl_item_unref (it);
 }
- deadbeef->pl_unlock ();
 return 0;
 }
 
 int
-action_seek_1p_backward_cb (struct DB_plugin_action_s *action, int ctx) {
- deadbeef->pl_lock ();
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
+action_seek_1p_backward_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
 if (it) {
+ deadbeef->pl_lock ();
 float dur = deadbeef->pl_get_item_duration (it);
 if (dur > 0) {
 float pos = deadbeef->streamer_get_playpos ();
- pos = (pos - dur * 0.01f) * 1000;
+ pos -= dur * 0.01f;
 if (pos < 0) {
 pos = 0;
 }
- deadbeef->sendmessage (DB_EV_SEEK, 0, pos, 0);
+ deadbeef->sendmessage (DB_EV_SEEK, 0, (uint32_t)(pos * 1000), 0);
 }
+ deadbeef->pl_unlock ();
 deadbeef->pl_item_unref (it);
 }
- deadbeef->pl_unlock ();
 return 0;
 }
 
+static int
+seek_sec (float sec) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
+ if (it) {
+ deadbeef->pl_lock ();
+ float dur = deadbeef->pl_get_item_duration (it);
+ if (dur > 0) {
+ float pos = deadbeef->streamer_get_playpos ();
+ pos += sec;
+ if (pos > dur) {
+ pos = dur;
+ }
+ if (pos < 0) {
+ pos = 0;
+ }
+ deadbeef->sendmessage (DB_EV_SEEK, 0, (uint32_t)(pos * 1000), 0);
+ }
+ deadbeef->pl_unlock ();
+ deadbeef->pl_item_unref (it);
+ }
+ return 0;
+}
+
+int
+action_seek_1s_forward_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ return seek_sec (1.f);
+}
+
+int
+action_seek_1s_backward_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ return seek_sec (-1.f);
+}
+
 int
-action_volume_up_cb (struct DB_plugin_action_s *action, int ctx) {
- deadbeef->volume_set_db (deadbeef->volume_get_db () + 2);
+action_seek_5s_forward_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ return seek_sec (5.f);
+}
+
+int
+action_seek_5s_backward_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ return seek_sec (-5.f);
+}
+
+int
+action_volume_up_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ deadbeef->volume_set_db (deadbeef->volume_get_db () + 1);
 return 0;
 }
 
 int
-action_volume_down_cb (struct DB_plugin_action_s *action, int ctx) {
- deadbeef->volume_set_db (deadbeef->volume_get_db () - 2);
+action_volume_down_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
+ deadbeef->volume_set_db (deadbeef->volume_get_db () - 1);
 return 0;
 }
 
 int
-action_toggle_stop_after_current_cb (struct DB_plugin_action_s *action, int ctx) {
+action_toggle_stop_after_current_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 int var = deadbeef->conf_get_int ("playlist.stop_after_current", 0);
 var = 1 - var;
 deadbeef->conf_set_int ("playlist.stop_after_current", var);
@@ -765,7 +820,7 @@
 }
 
 int
-action_toggle_stop_after_album_cb (struct DB_plugin_action_s *action, int ctx) {
+action_toggle_stop_after_album_cb (struct DB_plugin_action_s *action, ddb_action_context_t ctx) {
 int var = deadbeef->conf_get_int ("playlist.stop_after_album", 0);
 var = 1 - var;
 deadbeef->conf_set_int ("playlist.stop_after_album", var);
@@ -773,32 +828,112 @@
 return 0;
 }
 
+static DB_plugin_action_t action_prev_or_restart = {
+ .title = "Playback/Previous or Restart Current Track",
+ .name = "prev_or_restart",
+ .flags = DB_ACTION_COMMON,
+ .callback2 = action_prev_or_restart_cb,
+ .next = NULL
+};
+
+static DB_plugin_action_t action_duplicate_playlist = {
+ .title = "Duplicate Playlist",
+ .name = "duplicate_playlist",
+ .flags = DB_ACTION_PLAYLIST | DB_ACTION_ADD_MENU,
+ .callback2 = action_duplicate_playlist_cb,
+ .next = &action_prev_or_restart
+};
+
 static DB_plugin_action_t action_reload_metadata = {
 .title = "Reload Metadata",
 .name = "reload_metadata",
 .flags = DB_ACTION_MULTIPLE_TRACKS,
 .callback2 = action_reload_metadata_handler,
- .next = NULL
+ .next = &action_duplicate_playlist
 };
 
 static DB_plugin_action_t action_jump_to_current = {
- .title = "Playback/Jump To Currently Playing Track",
+ .title = "Playback/Jump to Currently Playing Track",
 .name = "jump_to_current_track",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_jump_to_current_handler,
 .next = &action_reload_metadata
 };
 
+static DB_plugin_action_t action_skip_to_prev_genre = {
+ .title = "Playback/Skip to/Previous Genre",
+ .name = "skip_to_prev_genre",
+ .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
+ .callback2 = action_skip_to_prev_genre_handler,
+ .next = &action_jump_to_current
+};
+
+static DB_plugin_action_t action_skip_to_prev_composer = {
+ .title = "Playback/Skip to/Previous Composer",
+ .name = "skip_to_prev_composer",
+ .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
+ .callback2 = action_skip_to_prev_composer_handler,
+ .next = &action_skip_to_prev_genre
+};
+
+static DB_plugin_action_t action_skip_to_prev_artist = {
+ .title = "Playback/Skip to/Previous Artist",
+ .name = "skip_to_prev_artist",
+ .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
+ .callback2 = action_skip_to_prev_artist_handler,
+ .next = &action_skip_to_prev_composer
+};
+
+static DB_plugin_action_t action_skip_to_prev_album = {
+ .title = "Playback/Skip to/Previous Album",
+ .name = "skip_to_prev_album",
+ .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
+ .callback2 = action_skip_to_prev_album_handler,
+ .next = &action_skip_to_prev_artist
+};
+
+static DB_plugin_action_t action_skip_to_next_genre = {
+ .title = "Playback/Skip to/Next Genre",
+ .name = "skip_to_next_genre",
+ .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
+ .callback2 = action_skip_to_next_genre_handler,
+ .next = &action_skip_to_prev_album
+};
+
+static DB_plugin_action_t action_skip_to_next_composer = {
+ .title = "Playback/Skip to/Next Composer",
+ .name = "skip_to_next_composer",
+ .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
+ .callback2 = action_skip_to_next_composer_handler,
+ .next = &action_skip_to_next_genre
+};
+
+static DB_plugin_action_t action_skip_to_next_artist = {
+ .title = "Playback/Skip to/Next Artist",
+ .name = "skip_to_next_artist",
+ .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
+ .callback2 = action_skip_to_next_artist_handler,
+ .next = &action_skip_to_next_composer
+};
+
+static DB_plugin_action_t action_skip_to_next_album = {
+ .title = "Playback/Skip to/Next Album",
+ .name = "skip_to_next_album",
+ .flags = DB_ACTION_COMMON | DB_ACTION_ADD_MENU,
+ .callback2 = action_skip_to_next_album_handler,
+ .next = &action_skip_to_next_artist
+};
+
 static DB_plugin_action_t action_next_playlist = {
 .title = "Next Playlist",
 .name = "next_playlist",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_next_playlist_handler,
- .next = &action_jump_to_current
+ .next = &action_skip_to_next_album
 };
 
 static DB_plugin_action_t action_prev_playlist = {
- .title = "Prev Playlist",
+ .title = "Previous Playlist",
 .name = "prev_playlist",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_prev_playlist_handler,
@@ -806,7 +941,7 @@
 };
 
 static DB_plugin_action_t action_playlist10 = {
- .title = "Switch To Playlist 10",
+ .title = "Switch to Playlist 10",
 .name = "playlist10",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playlist10_handler,
@@ -814,7 +949,7 @@
 };
 
 static DB_plugin_action_t action_playlist9 = {
- .title = "Switch To Playlist 9",
+ .title = "Switch to Playlist 9",
 .name = "playlist9",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playlist9_handler,
@@ -822,7 +957,7 @@
 };
 
 static DB_plugin_action_t action_playlist8 = {
- .title = "Switch To Playlist 8",
+ .title = "Switch to Playlist 8",
 .name = "playlist8",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playlist8_handler,
@@ -830,7 +965,7 @@
 };
 
 static DB_plugin_action_t action_playlist7 = {
- .title = "Switch To Playlist 7",
+ .title = "Switch to Playlist 7",
 .name = "playlist7",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playlist7_handler,
@@ -838,7 +973,7 @@
 };
 
 static DB_plugin_action_t action_playlist6 = {
- .title = "Switch To Playlist 6",
+ .title = "Switch to Playlist 6",
 .name = "playlist6",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playlist6_handler,
@@ -846,7 +981,7 @@
 };
 
 static DB_plugin_action_t action_playlist5 = {
- .title = "Switch To Playlist 5",
+ .title = "Switch to Playlist 5",
 .name = "playlist5",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playlist5_handler,
@@ -854,7 +989,7 @@
 };
 
 static DB_plugin_action_t action_playlist4 = {
- .title = "Switch To Playlist 4",
+ .title = "Switch to Playlist 4",
 .name = "playlist4",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playlist4_handler,
@@ -862,7 +997,7 @@
 };
 
 static DB_plugin_action_t action_playlist3 = {
- .title = "Switch To Playlist 3",
+ .title = "Switch to Playlist 3",
 .name = "playlist3",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playlist3_handler,
@@ -870,7 +1005,7 @@
 };
 
 static DB_plugin_action_t action_playlist2 = {
- .title = "Switch To Playlist 2",
+ .title = "Switch to Playlist 2",
 .name = "playlist2",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playlist2_handler,
@@ -878,7 +1013,7 @@
 };
 
 static DB_plugin_action_t action_playlist1 = {
- .title = "Switch To Playlist 1",
+ .title = "Switch to Playlist 1",
 .name = "playlist1",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_playlist1_handler,
@@ -894,7 +1029,7 @@
 };
 
 static DB_plugin_action_t action_sort_by_date = {
- .title = "Edit/Sort By Date",
+ .title = "Edit/Sort by Date",
 .name = "sort_date",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_sort_by_date_handler,
@@ -902,7 +1037,7 @@
 };
 
 static DB_plugin_action_t action_sort_by_artist = {
- .title = "Edit/Sort By Artist",
+ .title = "Edit/Sort by Artist",
 .name = "sort_artist",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_sort_by_artist_handler,
@@ -911,7 +1046,7 @@
 
 
 static DB_plugin_action_t action_sort_by_album = {
- .title = "Edit/Sort By Album",
+ .title = "Edit/Sort by Album",
 .name = "sort_album",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_sort_by_album_handler,
@@ -919,7 +1054,7 @@
 };
 
 static DB_plugin_action_t action_sort_by_tracknr = {
- .title = "Edit/Sort By Track Number",
+ .title = "Edit/Sort by Track Number",
 .name = "sort_tracknr",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_sort_by_tracknr_handler,
@@ -927,7 +1062,7 @@
 };
 
 static DB_plugin_action_t action_sort_by_title = {
- .title = "Edit/Sort By Title",
+ .title = "Edit/Sort by Title",
 .name = "sort_title",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_sort_by_title_handler,
@@ -939,7 +1074,7 @@
 .name = "invert_selection",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_invert_selection_handler,
- .next = &action_sort_by_tracknr
+ .next = &action_sort_by_title
 };
 
 static DB_plugin_action_t action_clear_playlist = {
@@ -951,7 +1086,7 @@
 };
 
 static DB_plugin_action_t action_remove_from_playqueue = {
- .title = "Playback/Remove From Playback Queue",
+ .title = "Playback/Remove from Playback Queue",
 .name = "remove_from_playback_queue",
 .flags = DB_ACTION_MULTIPLE_TRACKS,
 .callback2 = action_remove_from_playqueue_handler,
@@ -959,19 +1094,51 @@
 };
 
 static DB_plugin_action_t action_add_to_playqueue = {
- .title = "Playback/Add To Playback Queue",
+ .title = "Playback/Add to Playback Queue",
 .name = "add_to_playback_queue",
 .flags = DB_ACTION_MULTIPLE_TRACKS,
 .callback2 = action_add_to_playqueue_handler,
 .next = &action_remove_from_playqueue
 };
 
+static DB_plugin_action_t action_play_next = {
+ .title = "Playback/Add to Front of Playback Queue",
+ .name = "add_to_front_of_playback_queue",
+ .flags = DB_ACTION_MULTIPLE_TRACKS,
+ .callback2 = action_prepend_to_playqueue_handler,
+ .next = &action_add_to_playqueue
+};
+
+static DB_plugin_action_t action_toggle_in_playqueue = {
+ .title = "Playback/Toggle in Playback Queue",
+ .name = "toggle_in_playback_queue",
+ .flags = DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_EXCLUDE_FROM_CTX_PLAYLIST,
+ .callback2 = action_toggle_in_playqueue_handler,
+ .next = &action_play_next
+};
+
+static DB_plugin_action_t action_move_tracks_down = {
+ .title = "Move/Move Tracks Down",
+ .name = "move_tracks_down",
+ .flags = DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_EXCLUDE_FROM_CTX_PLAYLIST,
+ .callback2 = action_move_tracks_down_handler,
+ .next = &action_toggle_in_playqueue
+};
+
+static DB_plugin_action_t action_move_tracks_up = {
+ .title = "Move/Move Tracks Up",
+ .name = "move_tracks_up",
+ .flags = DB_ACTION_MULTIPLE_TRACKS | DB_ACTION_EXCLUDE_FROM_CTX_PLAYLIST,
+ .callback2 = action_move_tracks_up_handler,
+ .next = &action_move_tracks_down
+};
+
 static DB_plugin_action_t action_toggle_mute = {
 .title = "Playback/Toggle Mute",
 .name = "toggle_mute",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_toggle_mute_handler,
- .next = &action_add_to_playqueue
+ .next = &action_move_tracks_up
 };
 
 static DB_plugin_action_t action_play = {
@@ -1030,12 +1197,45 @@
 .next = &action_play_pause
 };
 
+static DB_plugin_action_t action_seek_1s_forward = {
+ .title = "Playback/Seek 1s Forward",
+ .name = "seek_1s_fwd",
+ .flags = DB_ACTION_COMMON,
+ .callback2 = action_seek_1s_forward_cb,
+ .next = &action_play_random
+};
+
+static DB_plugin_action_t action_seek_1s_backward = {
+ .title = "Playback/Seek 1s Backward",
+ .name = "seek_1s_back",
+ .flags = DB_ACTION_COMMON,
+ .callback2 = action_seek_1s_backward_cb,
+ .next = &action_seek_1s_forward
+};
+
+static DB_plugin_action_t action_seek_5s_forward = {
+ .title = "Playback/Seek 5s Forward",
+ .name = "seek_5s_fwd",
+ .flags = DB_ACTION_COMMON,
+ .callback2 = action_seek_5s_forward_cb,
+ .next = &action_seek_1s_backward
+};
+
+static DB_plugin_action_t action_seek_5s_backward = {
+ .title = "Playback/Seek 5s Backward",
+ .name = "seek_5s_back",
+ .flags = DB_ACTION_COMMON,
+ .callback2 = action_seek_5s_backward_cb,
+ .next = &action_seek_5s_forward
+};
+
+
 static DB_plugin_action_t action_seek_1p_forward = {
 .title = "Playback/Seek 1% Forward",
 .name = "seek_1p_fwd",
 .flags = DB_ACTION_COMMON,
 .callback2 = action_seek_1p_forward_cb,
- .next = &action_play_random
+ .next = &action_seek_5s_backward
 };
 
 static DB_plugin_action_t action_seek_1p_backward = {
@@ -1102,8 +1302,8 @@
 
 // define plugin interface
 static DB_hotkeys_plugin_t plugin = {
- .misc.plugin.api_vmajor = 1,
- .misc.plugin.api_vminor = 5,
+ .misc.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .misc.plugin.api_vminor = DB_API_VERSION_MINOR,
 .misc.plugin.version_major = 1,
 .misc.plugin.version_minor = 1,
 .misc.plugin.type = DB_PLUGIN_MISC,
@@ -1118,7 +1318,7 @@
 " * added local hotkeys support\n"
 ,
 .misc.plugin.copyright = 
- "Copyright (C) 2012-2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2012-2013 Oleksiy 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"
@@ -1137,10 +1337,10 @@
 ,
 .misc.plugin.website = "http://deadbeef.sf.net",
 .misc.plugin.get_actions = hotkeys_get_actions,
- .misc.plugin.start = hotkeys_connect,
 .misc.plugin.stop = hotkeys_disconnect,
 .get_name_for_keycode = hotkeys_get_name_for_keycode,
 .get_action_for_keycombo = hotkeys_get_action_for_keycombo,
 .reset = hotkeys_reset,
+ .misc.plugin.message = hotkeys_message,
 };

deadbeef-0.6.2.tar.bz2/plugins/hotkeys/hotkeys.h -> deadbeef-1.9.6.tar.bz2/plugins/hotkeys/hotkeys.h Changed

deadbeef-0.6.2.tar.bz2/plugins/lastfm/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/lastfm/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/lastfm/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/lastfm/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/lastfm/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/lastfm/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/lastfm/lastfm.c -> deadbeef-1.9.6.tar.bz2/plugins/lastfm/lastfm.c Changed

@@ -1,6 +1,6 @@
 /*
 Last.fm scrobbler plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko 
+ Copyright (C) 2009-2014 Oleksiy Yakovenko 
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -17,15 +17,21 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+#include <dispatch/dispatch.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <curl/curl.h>
 #include <math.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
+#define trace(...) { deadbeef->log_detailed (&plugin.plugin, 0, __VA_ARGS__); }
 
 #define LFM_TESTMODE 0
 #define LFM_IGNORE_RULES 0
@@ -35,20 +41,30 @@
 static DB_functions_t *deadbeef;
 
 #define LFM_CLIENTID "ddb"
-#define SCROBBLER_URL_LFM "http://post.audioscrobbler.com"
-#define SCROBBLER_URL_LIBRE "http://turtle.libre.fm"
+#define SCROBBLER_URL_LFM "https://post.audioscrobbler.com"
+#define SCROBBLER_URL_LIBRE "https://turtle.libre.fm"
+
+#if defined(__MINGW32__)
+#define LOOKUP_URL_FORMAT "cmd /c start https://www.last.fm/music/%s/_/%s"
+#elif defined(__APPLE__)
+#define LOOKUP_URL_FORMAT "open 'https://www.last.fm/music/%s/_/%s' &"
+#else
+#define LOOKUP_URL_FORMAT "xdg-open 'https://www.last.fm/music/%s/_/%s' &"
+#endif
 
 static char lfm_user100;
 static char lfm_pass100;
 
-static char lfm_sess33;
+#define SESS_ID_MAX 100
+
+static char lfm_sessSESS_ID_MAX;
 static char lfm_nowplaying_url256;
 static char lfm_submission_url256;
 
-static uintptr_t lfm_mutex;
-static uintptr_t lfm_cond;
-static int lfm_stopthread;
-static intptr_t lfm_tid;
+static int terminate;
+static dispatch_queue_t sync_queue;
+static dispatch_queue_t request_queue;
+
 
 #define META_FIELD_SIZE 200
 
@@ -59,20 +75,15 @@
 }
 
 #define MAX_REPLY 4096
-static char lfm_replyMAX_REPLY;
-static int lfm_reply_sz;
+static uint8_t lfm_replyMAX_REPLY;
+static size_t lfm_reply_sz;
 static char lfm_errCURL_ERROR_SIZE;
 
-static char lfm_nowplaying2048; // packet for nowplaying, or ""
-#define LFM_SUBMISSION_QUEUE_SIZE 50
-
-typedef struct {
- DB_playItem_t *it;
- time_t started_timestamp;
- float playtime;
-} subm_item_t;
+static void
+lfm_submit (ddb_playItem_t *it, time_t started_timestamp, float playtime);
 
-static subm_item_t lfm_subm_queueLFM_SUBMISSION_QUEUE_SIZE;
+static void
+lfm_send_nowplaying (const char *lfm_nowplaying);
 
 static void
 lfm_update_auth (void) {
@@ -90,27 +101,31 @@
 static size_t
 lastfm_curl_res (void *ptr, size_t size, size_t nmemb, void *stream)
 {
- if (lfm_stopthread) {
+ __block int need_cancel = 0;
+ dispatch_sync(sync_queue, ^{
+ need_cancel = terminate;
+ });
+ if (need_cancel) {
 trace ("lfm: lastfm_curl_res: aborting current request\n");
 return 0;
 }
- int len = size * nmemb;
+ size_t len = size * nmemb;
 if (lfm_reply_sz + len >= MAX_REPLY) {
 trace ("reply is too large. stopping.\n");
 return 0;
 }
 memcpy (lfm_reply + lfm_reply_sz, ptr, len);
 lfm_reply_sz += len;
-// char ssize*nmemb+1;
-// memcpy (s, ptr, size*nmemb);
-// ssize*nmemb = 0;
-// trace ("got from net: %s\n", s);
 return len;
 }
 
 static int
 lfm_curl_control (void *stream, double dltotal, double dlnow, double ultotal, double ulnow) {
- if (lfm_stopthread) {
+ __block int need_cancel = 0;
+ dispatch_sync(sync_queue, ^{
+ need_cancel = terminate;
+ });
+ if (need_cancel) {
 trace ("lfm: aborting current request\n");
 return -1;
 }
@@ -217,10 +232,10 @@
 uint8_t sig16;
 char passmd533;
 char token100;
- deadbeef->md5 (sig, lfm_pass, strlen (lfm_pass));
+ deadbeef->md5 (sig, lfm_pass, (int)strlen (lfm_pass));
 deadbeef->md5_to_str (passmd5, sig);
 snprintf (token, sizeof (token), "%s%d", passmd5, (int)timestamp);
- deadbeef->md5 (sig, token, strlen (token));
+ deadbeef->md5 (sig, token, (int)strlen (token));
 deadbeef->md5_to_str (token, sig);
 
 deadbeef->conf_lock ();
@@ -235,7 +250,7 @@
 int status = curl_req_send (req, NULL);
 if (!status) {
 // check status and extract session id, nowplaying url, submission url
- if (strncmp (lfm_reply, "OK", 2)) {
+ if (strncmp ((char *)lfm_reply, "OK", 2)) {
 uint8_t *p = lfm_reply;
 while (*p && *p >= 0x20) {
 p++;
@@ -258,11 +273,11 @@
 while (*end && *end >= 0x20) {
 end++;
 }
- if (end-p > 32) {
- trace ("scrobbler session id is invalid length. probably plugin needs fixing.\n");
+ if (end-p >= SESS_ID_MAX) {
+ trace ("scrobbler session id is too large (%d).\n", (int)(end-p));
 goto fail;
 }
- strncpy (lfm_sess, p, 32);
+ strncpy (lfm_sess, (char *)p, 32);
 lfm_sess32 = 0;
 trace ("obtained scrobbler session: %s\n", lfm_sess);
 p = end;
@@ -283,7 +298,7 @@
 trace ("scrobbler nowplaying url is too long %d:\n", (int)(end-p));
 goto fail;
 }
- strncpy (lfm_nowplaying_url, p, end-p);
+ strncpy (lfm_nowplaying_url, (char *)p, end-p);
 lfm_nowplaying_urlend-p = 0;
 trace ("obtained scrobbler nowplaying url: %s\n", lfm_nowplaying_url);
 p = end;
@@ -304,7 +319,7 @@
 trace ("scrobbler submission url is too long: %d\n", (int)(end-p));
 goto fail;
 }
- strncpy (lfm_submission_url, p, end-p);
+ strncpy (lfm_submission_url, (char *)p, end-p);
 lfm_submission_urlend-p = 0;
 trace ("obtained scrobbler submission url: %s\n", lfm_submission_url);
 p = end;
@@ -326,10 +341,10 @@
 static int
 lfm_fetch_song_info (DB_playItem_t *song, float playtime, char *a, char *t, char *b, float *l, char *n, char *m) {
 if (deadbeef->conf_get_int ("lastfm.prefer_album_artist", 0)) {
- if (!deadbeef->pl_get_meta (song, "band", a, META_FIELD_SIZE)) {
- if (!deadbeef->pl_get_meta (song, "album artist", a, META_FIELD_SIZE)) {
- if (!deadbeef->pl_get_meta (song, "albumartist", a, META_FIELD_SIZE)) {
- if (!deadbeef->pl_get_meta (song, "artist", a, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "band", a, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "album artist", a, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "albumartist", a, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "artist", a, META_FIELD_SIZE)) {
 return -1;
 }
 }
@@ -337,20 +352,20 @@
 }
 }
 else {
- if (!deadbeef->pl_get_meta (song, "artist", a, META_FIELD_SIZE)) {
- if (!deadbeef->pl_get_meta (song, "band", a, META_FIELD_SIZE)) {
- if (!deadbeef->pl_get_meta (song, "album artist", a, META_FIELD_SIZE)) {
- if (!deadbeef->pl_get_meta (song, "albumartist", a, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "artist", a, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "band", a, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "album artist", a, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "albumartist", a, META_FIELD_SIZE)) {
 return -1;
 }
 }
 }
 }
 }
- if (!deadbeef->pl_get_meta (song, "title", t, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "title", t, META_FIELD_SIZE)) {
 return -1;
 }
- if (!deadbeef->pl_get_meta (song, "album", b, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "album", b, META_FIELD_SIZE)) {
 *b = 0;
 }
 *l = deadbeef->pl_get_item_duration (song);
@@ -360,10 +375,10 @@
 if (*l < 30 && deadbeef->conf_get_int ("lastfm.submit_tiny_tracks", 0)) {
 *l = 30;
 }
- if (!deadbeef->pl_get_meta (song, "track", n, META_FIELD_SIZE)) {
+ if (!deadbeef->pl_get_meta_with_override (song, "track", n, META_FIELD_SIZE)) {
 *n = 0;
 }
- if (!deadbeef->conf_get_int ("lastfm.mbid", 0) || !deadbeef->pl_get_meta (song, "musicbrainz_trackid", m, META_FIELD_SIZE)) {
+ if (!deadbeef->conf_get_int ("lastfm.mbid", 0) || !deadbeef->pl_get_meta_with_override (song, "musicbrainz_trackid", m, META_FIELD_SIZE)) {
 *m = 0;
 }
 return 0;
@@ -371,8 +386,8 @@
 
 // returns number of encoded chars on success, or -1 in case of error
 static int
-lfm_uri_encode (char *out, int outl, const char *str) {
- int l = outl;
+lfm_uri_encode (char *out, size_t outl, const char *str) {
+ size_t l = outl;
 //trace ("lfm_uri_encode %p %d %s\n", out, outl, str);
 while (*str && *((uint8_t*)str) >= 32) {
 if (outl <= 1) {
@@ -404,7 +419,7 @@
 }
 }
 *out = 0;
- return l - outl;
+ return (int)(l - outl);
 }
 
 // returns number of encoded chars on success
@@ -412,7 +427,7 @@
 static int
 lfm_add_keyvalue_uri_encoded (char **out, int *outl, const char *key, const char *value) {
 int ll = *outl;
- int keyl = strlen (key);
+ size_t keyl = strlen (key);
 if (*outl <= keyl+1) {
 return -1;
 }
@@ -525,16 +540,28 @@
 if (!deadbeef->conf_get_int ("lastfm.enable", 0)) {
 return 0;
 }
- deadbeef->mutex_lock (lfm_mutex);
- if (lfm_format_uri (-1, ev->track, lfm_nowplaying, sizeof (lfm_nowplaying), ev->started_timestamp, 120) < 0) {
- lfm_nowplaying0 = 0;
- }
-// trace ("%s\n", lfm_nowplaying);
- deadbeef->mutex_unlock (lfm_mutex);
- if (lfm_nowplaying0) {
- deadbeef->cond_signal (lfm_cond);
- }
 
+ ddb_playItem_t *it = ev->track;
+ time_t started_timestamp = ev->started_timestamp;
+ deadbeef->pl_item_ref (it);
+ dispatch_async(request_queue, ^{
+ __block int need_cancel = 0;
+ dispatch_sync(sync_queue, ^{
+ need_cancel = terminate;
+ });
+ if (need_cancel) {
+ deadbeef->pl_item_unref (it);
+ return;
+ }
+ char lfm_nowplaying2048;
+ if (lfm_format_uri (-1, it, lfm_nowplaying, sizeof (lfm_nowplaying), started_timestamp, 120) > 0) {
+ // try to send nowplaying
+ if (lfm_nowplaying0 && !deadbeef->conf_get_int ("lastfm.disable_np", 0)) {
+ lfm_send_nowplaying (lfm_nowplaying);
+ }
+ }
+ deadbeef->pl_item_unref (it);
+ });
 return 0;
 }
 
@@ -568,50 +595,46 @@
 
 #endif
 
- if (!deadbeef->pl_meta_exists (ev->from, "artist")
- || !deadbeef->pl_meta_exists (ev->from, "title")
+ if (!deadbeef->pl_meta_exists_with_override (ev->from, "artist")
+ || !deadbeef->pl_meta_exists_with_override (ev->from, "title")
 ) {
- trace ("lfm: not enough metadata for submission, artist=%s, title=%s, album=%s\n", deadbeef->pl_find_meta (ev->from, "artist"), deadbeef->pl_find_meta (ev->from, "title"), deadbeef->pl_find_meta (ev->from, "album"));
+ trace ("lfm: not enough metadata for submission, artist=%s, title=%s, album=%s\n", deadbeef->pl_find_meta_with_override (ev->from, "artist"), deadbeef->pl_find_meta_with_override (ev->from, "title"), deadbeef->pl_find_meta_with_override (ev->from, "album"));
 return 0;
 }
- deadbeef->mutex_lock (lfm_mutex);
- // find free place in queue
- for (int i = 0; i < LFM_SUBMISSION_QUEUE_SIZE; i++) {
- if (!lfm_subm_queuei.it) {
- trace ("lfm: song is now in queue for submission\n");
- lfm_subm_queuei.it = ev->from;
- lfm_subm_queuei.started_timestamp = ev->started_timestamp;
- lfm_subm_queuei.playtime = ev->playtime;
- deadbeef->pl_item_ref (ev->from);
- break;
- }
- }
- deadbeef->mutex_unlock (lfm_mutex);
- deadbeef->cond_signal (lfm_cond);
+
+ ddb_playItem_t *it = ev->from;
+ deadbeef->pl_item_ref (it); // unreffed by lfm_submit
+ time_t started_timestamp = ev->started_timestamp;
+ float playtime = ev->playtime;
+
+ dispatch_async(request_queue, ^{
+ lfm_submit (it, started_timestamp, playtime);
+ });
 
 return 0;
 }
 
 static void
-lfm_send_nowplaying (void) {
+lfm_send_nowplaying (const char *nowplaying_uri) {
 if (auth () < 0) {
 trace ("auth failed! nowplaying cancelled.\n");
- lfm_nowplaying0 = 0;
 return;
 }
 trace ("auth successful! setting nowplaying\n");
- char s100;
+ char sSESS_ID_MAX + 4;
 snprintf (s, sizeof (s), "s=%s&", lfm_sess);
- int l = strlen (lfm_nowplaying);
- strcpy (lfm_nowplaying+l, s);
+
+ char lfm_nowplaying2048 = "";
+
+ snprintf (lfm_nowplaying, sizeof (lfm_nowplaying), "%s%s", nowplaying_uri, s);
 trace ("content:\n%s\n", lfm_nowplaying);
 #if !LFM_NOSEND
 for (int attempts = 2; attempts > 0; attempts--) {
 int status = curl_req_send (lfm_nowplaying_url, lfm_nowplaying);
 if (!status) {
- if (strncmp (lfm_reply, "OK", 2)) {
+ if (strncmp ((char *)lfm_reply, "OK", 2)) {
 trace ("nowplaying failed, response:\n%s\n", lfm_reply);
- if (!strncmp (lfm_reply, "BADSESSION", 7)) {
+ if (!strncmp ((char *)lfm_reply, "BADSESSION", 7)) {
 trace ("got badsession; trying to restore session...\n");
 lfm_sess0 = 0;
 curl_req_cleanup ();
@@ -621,7 +644,7 @@
 }
 trace ("success! retrying send nowplaying...\n");
 snprintf (s, sizeof (s), "s=%s&", lfm_sess);
- strcpy (lfm_nowplaying+l, s);
+ snprintf (lfm_nowplaying, sizeof (lfm_nowplaying), "%s%s", nowplaying_uri, s);
 continue; // retry with new session
 }
 }
@@ -633,40 +656,35 @@
 break;
 }
 #endif
- lfm_nowplaying0 = 0;
 }
 
 static void
-lfm_send_submissions (void) {
- trace ("lfm_send_submissions\n");
- int i;
+lfm_send_submission (ddb_playItem_t *it, time_t started_timestamp, float playtime) {
+ trace ("lfm_send_submission\n");
 char req1024*50;
 int idx = 0;
 char *r = req;
 int len = sizeof (req);
- int res;
- deadbeef->mutex_lock (lfm_mutex);
- for (i = 0; i < LFM_SUBMISSION_QUEUE_SIZE; i++) {
- if (lfm_subm_queuei.it) {
- res = lfm_format_uri (idx, lfm_subm_queuei.it, r, len, lfm_subm_queuei.started_timestamp, lfm_subm_queuei.playtime);
- if (res < 0) {
- trace ("lfm: failed to format uri\n");
- return;
- }
- len -= res;
- r += res;
- idx++;
- }
+ int res = lfm_format_uri (idx, it, r, len, started_timestamp, playtime);
+ if (res < 0) {
+ trace ("lfm: failed to format uri\n");
+ deadbeef->pl_item_unref (it);
+ return;
 }
- deadbeef->mutex_unlock (lfm_mutex);
+ len -= res;
+ r += res;
+ idx++;
 if (!idx) {
+ deadbeef->pl_item_unref (it);
 return;
 }
 if (auth () < 0) {
+ deadbeef->pl_item_unref (it);
 return;
 }
 res = snprintf (r, len, "s=%s&", lfm_sess);
 if (res > len) {
+ deadbeef->pl_item_unref (it);
 return;
 }
 trace ("submission req string:\n%s\n", req);
@@ -674,9 +692,9 @@
 for (int attempts = 2; attempts > 0; attempts--) {
 int status = curl_req_send (lfm_submission_url, req);
 if (!status) {
- if (strncmp (lfm_reply, "OK", 2)) {
+ if (strncmp ((char *)lfm_reply, "OK", 2)) {
 trace ("submission failed, response:\n%s\n", lfm_reply);
- if (!strncmp (lfm_reply, "BADSESSION", 7)) {
+ if (!strncmp ((char *)lfm_reply, "BADSESSION", 7)) {
 trace ("got badsession; trying to restore session...\n");
 lfm_sess0 = 0;
 curl_req_cleanup ();
@@ -689,155 +707,35 @@
 continue; // retry with new session
 }
 }
- else {
- trace ("submission successful, response:\n%s\n", lfm_reply);
- deadbeef->mutex_lock (lfm_mutex);
- for (i = 0; i < LFM_SUBMISSION_QUEUE_SIZE; i++) {
- if (lfm_subm_queuei.it) {
- deadbeef->pl_item_unref (lfm_subm_queuei.it);
- lfm_subm_queuei.it = NULL;
- lfm_subm_queuei.started_timestamp = 0;
- }
- }
- deadbeef->mutex_unlock (lfm_mutex);
- }
 }
 curl_req_cleanup ();
 break;
 }
+ deadbeef->pl_item_unref (it);
 #else
 trace ("submission successful (NOSEND=1):\n");
- deadbeef->mutex_lock (lfm_mutex);
- for (i = 0; i < LFM_SUBMISSION_QUEUE_SIZE; i++) {
- if (lfm_subm_queuei.it) {
- deadbeef->pl_item_unref (lfm_subm_queuei.it);
- lfm_subm_queuei.it = NULL;
- lfm_subm_queuei.started_timestamp = 0;
-
- }
- }
- deadbeef->mutex_unlock (lfm_mutex);
+ deadbeef->pl_item_unref (it);
 #endif
 }
 
 static void
-lfm_thread (void *ctx) {
- //trace ("lfm_thread started\n");
- for (;;) {
- if (lfm_stopthread) {
- deadbeef->mutex_unlock (lfm_mutex);
- trace ("lfm_thread end\n");
- return;
- }
- trace ("lfm wating for cond...\n");
- deadbeef->cond_wait (lfm_cond, lfm_mutex);
- if (lfm_stopthread) {
- deadbeef->mutex_unlock (lfm_mutex);
- trace ("lfm_thread end2\n");
- return;
- }
- trace ("cond signalled!\n");
- deadbeef->mutex_unlock (lfm_mutex);
-
- if (!deadbeef->conf_get_int ("lastfm.enable", 0)) {
- continue;
- }
- trace ("lfm sending nowplaying...\n");
- lfm_send_submissions ();
- // try to send nowplaying
- if (lfm_nowplaying0 && !deadbeef->conf_get_int ("lastfm.disable_np", 0)) {
- lfm_send_nowplaying ();
- }
+lfm_submit (ddb_playItem_t *it, time_t started_timestamp, float playtime) {
+ __block int need_cancel = 0;
+ dispatch_sync(sync_queue, ^{
+ need_cancel = terminate;
+ });
+ if (need_cancel) {
+ deadbeef->pl_item_unref (it);
+ return;
 }
-}
-
 
-// {{{ lastfm v2 get session
-#if 0
-int
-auth_v2 (void) {
- if (lfm_sess0) {
- return 0;
- }
- char msg4096;
- char sigstr4096;
- uint8_t sig16;
- snprintf (sigstr, sizeof (sigstr), "api_key%smethodauth.getToken%s", LASTFM_API_KEY, LASTFM_API_SECRET);
- deadbeef->md5 (sig, sigstr, strlen (sigstr));
- deadbeef->md5_to_str (sigstr, sig);
- snprintf (msg, sizeof (msg), "%s/?api_key=%s&method=auth.getToken&api_sig=%s", SCROBBLER_URL, LASTFM_API_KEY, sigstr);
- // get token
- char lfm_token33 = "";
- int status = curl_req_send (msg, NULL);
- if (!status) {
- // parse output
- if (strstr (lfm_reply, "<lfm status=\"ok\">")) {
- char *token = strstr (lfm_reply, "<token>");
- if (token) {
- token += 7;
- char *end = strstr (token, "</token>");
- if (end) {
- *end = 0;
- snprintf (msg, sizeof (msg), "http://www.last.fm/api/auth/?api_key=%s&token=%s", LASTFM_API_KEY, token);
- trace ("Dear user. Please visit this URL and authenticate deadbeef. Thanks.\n");
-
- trace ("%s\n", msg);
- strncpy (lfm_token, token, 32);
- lfm_token32 = 0;
- }
- }
- }
- }
- curl_req_cleanup ();
- if (!lfm_token0) {
- // total fail, give up
- return -1;
- }
- // get session
- snprintf (sigstr, sizeof (sigstr), "api_key%smethodauth.getSessiontoken%s%s", LASTFM_API_KEY, lfm_token, LASTFM_API_SECRET);
- deadbeef->md5 (sig, sigstr, strlen (sigstr));
- deadbeef->md5_to_str (sigstr, sig);
- snprintf (msg, sizeof (msg), "method=auth.getSession&token=%s&api_key=%s&api_sig=%s", lfm_token, LASTFM_API_KEY, sigstr);
- for (;;) {
- status = curl_req_send (SCROBBLER_URL, msg);
- if (!status) {
- char *sess = strstr (lfm_reply, "<key>");
- if (sess) {
- sess += 5;
- char *end = strstr (sess, "</key>");
- if (end) {
- *end = 0;
- char config1024;
- snprintf (config, sizeof (config), "%s/.config/deadbeef/lastfmv2", getenv ("HOME"));
- trace ("got session key %s\n", sess);
- FILE *fp = fopen (config, "w+b");
- if (!fp) {
- trace ("lastfm: failed to write config file %s\n", config);
- curl_req_cleanup ();
- return -1;
- }
- if (fwrite (sess, 1, 32, fp) != 32) {
- fclose (fp);
- trace ("lastfm: failed to write config file %s\n", config);
- curl_req_cleanup ();
- return -1;
- }
- fclose (fp);
- strcpy (lfm_sess, sess);
- }
- }
-// trace ("reply: %s\n", lfm_reply);
- }
- curl_req_cleanup ();
- if (lfm_sess0) {
- break;
- }
- sleep (5);
+ if (!deadbeef->conf_get_int ("lastfm.enable", 0)) {
+ deadbeef->pl_item_unref (it);
+ return;
 }
- return 0;
+ trace ("lfm sending submissions...\n");
+ lfm_send_submission (it, started_timestamp, playtime);
 }
-#endif
-// }}}
 
 static int
 lfm_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
@@ -854,13 +752,9 @@
 
 static int
 lastfm_start (void) {
- if (lfm_mutex) {
- return -1;
- }
- lfm_stopthread = 0;
- lfm_mutex = deadbeef->mutex_create_nonrecursive ();
- lfm_cond = deadbeef->cond_create ();
- lfm_tid = deadbeef->thread_start (lfm_thread, NULL);
+ terminate = 0;
+ request_queue = dispatch_queue_create("LastfmRequestQueue", NULL);
+ sync_queue = dispatch_queue_create("LastfmSyncQueue", NULL);
 
 return 0;
 }
@@ -868,60 +762,62 @@
 static int
 lastfm_stop (void) {
 trace ("lastfm_stop\n");
- if (lfm_mutex) {
- lfm_stopthread = 1;
-
- trace ("lfm_stop signalling cond\n");
- deadbeef->cond_signal (lfm_cond);
- trace ("waiting for thread to finish\n");
- deadbeef->thread_join (lfm_tid);
- lfm_tid = 0;
- deadbeef->cond_free (lfm_cond);
- deadbeef->mutex_free (lfm_mutex);
- }
+ dispatch_sync(sync_queue, ^{
+ terminate = 1; // prevent any new items from being scheduled
+ });
+
+ dispatch_sync(request_queue, ^{
+ });
+ dispatch_release(request_queue);
+ dispatch_release(sync_queue);
 return 0;
 }
 
 static int
-lfm_action_lookup (DB_plugin_action_t *action, int ctx)
-{
+lfm_action_lookup (DB_plugin_action_t *action, ddb_action_context_t ctx) {
 char *command = NULL;
 DB_playItem_t *it = NULL;
 char artistMETA_FIELD_SIZE;
 char titleMETA_FIELD_SIZE;
 
+ ddb_playlist_t *plt = NULL;
 if (ctx == DDB_ACTION_CTX_SELECTION) {
 // find first selected
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
- if (plt) {
- it = deadbeef->plt_get_first (plt, PL_MAIN);
- while (it) {
- if (deadbeef->pl_is_selected (it)) {
- break;
- }
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
- }
- deadbeef->plt_unref (plt);
- }
+ plt = deadbeef->plt_get_curr ();
+ }
+ else if (ctx == DDB_ACTION_CTX_PLAYLIST) {
+ plt = deadbeef->action_get_playlist();
 }
 else if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
- it = deadbeef->streamer_get_playing_track ();
+ it = deadbeef->streamer_get_playing_track_safe ();
 }
+
+ if (plt) {
+ it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ if (deadbeef->pl_is_selected (it)) {
+ break;
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ deadbeef->plt_unref (plt);
+ }
+
 if (!it) {
 goto out;
 }
 
- if (!deadbeef->pl_get_meta (it, "artist", artist, sizeof (artist))) {
+ if (!deadbeef->pl_get_meta_with_override (it, "artist", artist, sizeof (artist))) {
 goto out;
 }
- if (!deadbeef->pl_get_meta (it, "title", title, sizeof (title))) {
+ if (!deadbeef->pl_get_meta_with_override (it, "title", title, sizeof (title))) {
 goto out;
 }
 
- int la = strlen (artist) * 3 + 1;
- int lt = strlen (title) * 3 + 1;
+ size_t la = strlen (artist) * 3 + 1;
+ size_t lt = strlen (title) * 3 + 1;
 char *eartist = alloca (la);
 char *etitle = alloca (lt);
 
@@ -933,11 +829,11 @@
 goto out;
 }
 
- if (-1 == asprintf (&command, "xdg-open 'http://www.last.fm/music/%s/_/%s' &", eartist, etitle)) {
+ if (-1 == asprintf (&command, LOOKUP_URL_FORMAT, eartist, etitle)) {
 goto out;
 }
 
- int res = system (command);
+ system (command);
 out:
 if (it) {
 deadbeef->pl_item_unref (it);
@@ -949,7 +845,7 @@
 }
 
 static DB_plugin_action_t lookup_action = {
- .title = "Lookup On Last.fm",
+ .title = "Lookup on Last.fm",
 .name = "lfm_lookup",
 .flags = DB_ACTION_SINGLE_TRACK | DB_ACTION_ADD_MENU,
 .callback2 = lfm_action_lookup,
@@ -961,8 +857,8 @@
 {
 deadbeef->pl_lock ();
 if (!it ||
- !deadbeef->pl_meta_exists (it, "artist") ||
- !deadbeef->pl_meta_exists (it, "title"))
+ !deadbeef->pl_find_meta_with_override (it, "artist") ||
+ !deadbeef->pl_find_meta_with_override (it, "title"))
 {
 lookup_action.flags |= DB_ACTION_DISABLED;
 }
@@ -987,16 +883,16 @@
 
 // define plugin interface
 static DB_misc_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 5,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_MISC,
+// .plugin.flags = DDB_PLUGIN_FLAG_LOGGING,
 .plugin.name = "last.fm scrobbler",
 .plugin.descr = "Sends played songs information to your last.fm account, or other service that use AudioScrobbler protocol",
 .plugin.copyright =
 "Last.fm scrobbler plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\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"

deadbeef-0.6.2.tar.bz2/plugins/liboggedit/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/liboggedit/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/liboggedit/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/liboggedit/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/liboggedit/oggedit.h -> deadbeef-1.9.6.tar.bz2/plugins/liboggedit/oggedit.h Changed

@@ -63,7 +63,7 @@
 #define OGGEDIT_WRITE_ERROR -14
 /* Failed to flush pages from a stream, fatal Ogg internal error */
 #define OGGEDIT_FLUSH_FAILED -15
-/* Renaming tewmporary file failed (usually sticky bit or directory permissions) */
+/* Renaming temporary file failed (usually sticky bit or directory permissions) */
 #define OGGEDIT_RENAME_FAILED -16
 /* Image file length not acceptable */
 #define OGGEDIT_BAD_FILE_LENGTH -100
@@ -71,11 +71,14 @@
 #define OGGEDIT_CANT_READ_IMAGE_FILE -101
 
 /* oggedit_utils.c */
-uint8_t *oggedit_vorbis_channel_map(const int channel_count);
+uint8_t *oggedit_vorbis_channel_map(const unsigned channel_count);
+
+// map deadbeef key to vorbiscomment key
+// NOTE: this function may modify the key value, e.g. when upper-casing
 const char *oggedit_map_tag(char *key, const char *in_or_out);
 
 /* oggedit_art.c */
-const char *oggedit_album_art_type(const int type);
+const char *oggedit_album_art_type(const uint32_t type);
 char *oggedit_album_art_tag(DB_FILE *fp, int *res);
 
 /* oggedit_flac.c */
@@ -89,6 +92,6 @@
 /* oggedit_opus.c */
 int oggedit_write_opus_file(DB_FILE *in, const char *outname, const off_t offset, const bool all_streams);
 off_t oggedit_opus_stream_info(DB_FILE *in, const off_t start_offset, const off_t end_offset, char **codecs);
-off_t oggedit_write_opus_metadata(DB_FILE *in, const char *fname, const off_t offset, const size_t stream_size, const int output_gain, const int num_tags, char **tags);
+off_t oggedit_write_opus_metadata(DB_FILE *in, const char *fname, const off_t offset, const off_t stream_size, const int output_gain, const uint32_t num_tags, char **tags);
 
 #endif /* __OGGEDIT_H */

deadbeef-0.6.2.tar.bz2/plugins/liboggedit/oggedit_art.c -> deadbeef-1.9.6.tar.bz2/plugins/liboggedit/oggedit_art.c Changed

deadbeef-0.6.2.tar.bz2/plugins/liboggedit/oggedit_flac.c -> deadbeef-1.9.6.tar.bz2/plugins/liboggedit/oggedit_flac.c Changed

@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <limits.h>
 #include "oggedit_internal.h"
 
 #define PADTYPE 0x01
@@ -58,7 +59,7 @@
 
 static ogg_packet **headers_alloc(ogg_packet **headers, const size_t packets)
 {
- ogg_packet **new_headers = realloc(headers, (packets+2) * sizeof(headers));
+ ogg_packet **new_headers = realloc(headers, (packets+2) * sizeof(ogg_packet *));
 if (!new_headers) {
 clear_header_list(headers);
 return NULL;
@@ -73,14 +74,14 @@
 return new_headers;
 }
 
-static ogg_packet **metadata_block_packets(DB_FILE *in, ogg_sync_state *oy, const off_t offset, char **vendor, int *res)
+static ogg_packet **metadata_block_packets(DB_FILE *in, ogg_sync_state *oy, const off_t offset, char **vendor, int64_t *res)
 {
 ogg_stream_state os;
 ogg_page og;
 if ((*res = init_read_stream(in, oy, &os, &og, offset, FLACNAME)) <= OGGEDIT_EOF)
 return NULL;
 
- int pages = 1;
+ int64_t pages = 1;
 size_t packets = 0;
 ogg_packet **headers = NULL;
 while ((headers = headers_alloc(headers, packets)) &&
@@ -115,7 +116,7 @@
 return headers;
 }
 
-static long write_metadata_block_packets(FILE *out, const int serial, const char *vendor, const size_t num_tags, char **tags, size_t padding, ogg_packet **metadata)
+static long write_metadata_block_packets(FILE *out, const int64_t serial, const char *vendor, const size_t num_tags, char **tags, size_t padding, ogg_packet **metadata)
 {
 const size_t header_length = vc_size(vendor, num_tags, tags);
 if (header_length > (2<<24))
@@ -131,7 +132,7 @@
 return OGGEDIT_ALLOCATION_FAILURE;
 
 ogg_stream_state os;
- if (ogg_stream_init(&os, serial))
+ if (ogg_stream_init(&os, (int)serial))
 return OGGEDIT_FAILED_TO_INIT_STREAM;
 os.b_o_s = 1;
 os.pageno = 1;
@@ -147,7 +148,7 @@
 
 off_t oggedit_write_flac_metadata(DB_FILE *in, const char *fname, const off_t offset, const int num_tags, char **tags)
 {
- off_t res;
+ int64_t res;
 char tempnamePATH_MAX = "";
 ogg_packet **headers = NULL;
 char *vendor = NULL;
@@ -162,7 +163,7 @@
 }
 
 /* See if we can write the tags packet directly into the existing file ... */
- if (!(headers = metadata_block_packets(in, &oy, offset, &vendor, (int *)&res)))
+ if (!(headers = metadata_block_packets(in, &oy, offset, &vendor, &res)))
 goto cleanup;
 const off_t stream_size_k = in->vfs->getlength(in) / 1000; // use file size for now
 const size_t metadata_size = 4 + vc_size(vendor, num_tags, tags);
@@ -190,13 +191,16 @@
 
 /* Write pages until we reach the correct comment header */
 ogg_page og;
- const int flac_serial = copy_up_to_codec(in, out, &oy, &og, *tempname ? 0 : offset, offset, FLACNAME);
+ int64_t flac_serial = copy_up_to_codec(in, out, &oy, &og, *tempname ? 0 : offset, offset, FLACNAME);
 if (flac_serial <= OGGEDIT_EOF) {
 res = flac_serial;
 goto cleanup;
 }
- if ((res = copy_up_to_header(in, out, &oy, &og, flac_serial)) <= OGGEDIT_EOF)
+ flac_serial = copy_up_to_header(in, out, &oy, &og, flac_serial);
+ if (flac_serial <= OGGEDIT_EOF) {
+ res = flac_serial;
 goto cleanup;
+ }
 const long pageno = write_metadata_block_packets(out, flac_serial, vendor, num_tags, tags, padding, headers);
 if (pageno < OGGEDIT_EOF) {
 res = pageno;
@@ -205,8 +209,11 @@
 
 /* If we have tempfile, copy the remaining pages */
 if (*tempname) {
- if ((res = copy_remaining_pages(in, out, &oy, flac_serial, pageno)) <= OGGEDIT_EOF)
+ flac_serial = copy_remaining_pages(in, out, &oy, flac_serial, (uint32_t)pageno);
+ if (flac_serial <= OGGEDIT_EOF) {
+ res = flac_serial;
 goto cleanup;
+ }
 if (rename(tempname, fname)) {
 res = OGGEDIT_RENAME_FAILED;
 goto cleanup;

deadbeef-0.6.2.tar.bz2/plugins/liboggedit/oggedit_internal.c -> deadbeef-1.9.6.tar.bz2/plugins/liboggedit/oggedit_internal.c Changed

@@ -34,6 +34,7 @@
 #include <libgen.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <limits.h>
 #include "oggedit_internal.h"
 
 static char *cat_string(char *dest, const char *src, const char *sep)
@@ -46,10 +47,16 @@
 return strcat(strcat(more, sep), src);
 }
 
+static int64_t int32_to_unsigned(int32_t value)
+{
+ /* Represent a 32-bit numeric field as a positive signed integer, maintaining order */
+ return value < 0 ? value + UINT32_MAX + 1 : value;
+}
+
 static const char *codec_name(ogg_page *og)
 {
 typedef struct {
- const size_t length;
+ const unsigned length;
 const char *codec;
 const char *magic;
 } codec_t;
@@ -79,7 +86,7 @@
 };
 
 for (const codec_t *match = codecs; match->codec; match++)
- if ((size_t)og->body_len >= match->length && !memcmp(og->body, match->magic, strlen(match->codec)))
+ if (og->body_len >= match->length && !memcmp(og->body, match->magic, strlen(match->codec)))
 return match->codec;
 
 return "unknown";
@@ -108,7 +115,7 @@
 {
 struct stat stat_struct;
 if (!stat(path, &stat_struct))
- return !S_ISDIR(stat_struct.st_mode);
+ return S_ISDIR(stat_struct.st_mode);
 
 if (errno != ENOENT)
 return false;
@@ -117,10 +124,10 @@
 if (!dir)
 return false;
 
- const int bad_dir = ensure_directory(dirname(dir));
+ const int is_dir = ensure_directory(dirname(dir));
 free(dir);
 
- return !bad_dir && !mkdir(path, 0777);
+ return is_dir && !mkdir(path, 0755);
 }
 
 FILE *open_new_file(const char *outname)
@@ -172,7 +179,7 @@
 free(buffer);
 }
 
-static int get_page(DB_FILE *in, ogg_sync_state *oy, ogg_page *og)
+static int64_t get_page(DB_FILE *in, ogg_sync_state *oy, ogg_page *og)
 {
 uint16_t chunks_left = MAXPAGE / CHUNKSIZE;
 while (ogg_sync_pageout(oy, og) != 1) {
@@ -187,10 +194,10 @@
 ogg_sync_wrote(oy, bytes);
 }
 
- return ogg_page_serialno(og);
+ return int32_to_unsigned(ogg_page_serialno(og));
 }
 
-static int skip_to_bos(DB_FILE *in, ogg_sync_state *oy, ogg_page *og, const off_t offset)
+static int64_t skip_to_bos(DB_FILE *in, ogg_sync_state *oy, ogg_page *og, const off_t offset)
 {
 if (!in)
 return OGGEDIT_FILE_NOT_OPEN;
@@ -199,7 +206,7 @@
 return OGGEDIT_SEEK_FAILED;
 
 ogg_sync_reset(oy);
- int serial;
+ int64_t serial;
 do
 serial = get_page(in, oy, og);
 while (serial > OGGEDIT_EOF && !ogg_page_bos(og));
@@ -207,16 +214,16 @@
 return serial;
 }
 
-static int skip_to_codec(DB_FILE *in, ogg_sync_state *oy, ogg_page *og, const off_t offset, const char *codec)
+static int64_t skip_to_codec(DB_FILE *in, ogg_sync_state *oy, ogg_page *og, const off_t offset, const char *codec)
 {
- int serial = skip_to_bos(in, oy, og, offset);
+ int64_t serial = skip_to_bos(in, oy, og, offset);
 while (serial > OGGEDIT_EOF && strcmp(codec_name(og), codec))
 serial = get_page(in, oy, og);
 
 return serial;
 }
 
-static int skip_to_header(DB_FILE *in, ogg_sync_state *oy, ogg_page *og, int serial, const int codec_serial)
+static int64_t skip_to_header(DB_FILE *in, ogg_sync_state *oy, ogg_page *og, int64_t serial, const int64_t codec_serial)
 {
 while (serial > OGGEDIT_EOF && (ogg_page_bos(og) || serial != codec_serial))
 serial = get_page(in, oy, og);
@@ -240,7 +247,7 @@
 return true;
 }
 
-static int write_page_and_get_next(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og)
+static int64_t write_page_and_get_next(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og)
 {
 if (!write_page(out, og))
 return OGGEDIT_WRITE_ERROR;
@@ -248,9 +255,9 @@
 return get_page(in, oy, og);
 }
 
-int copy_up_to_codec(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const off_t start_offset, const off_t link_offset, const char *codec)
+int64_t copy_up_to_codec(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const off_t start_offset, const off_t link_offset, const char *codec)
 {
- int serial = skip_to_bos(in, oy, og, start_offset);
+ int64_t serial = skip_to_bos(in, oy, og, start_offset);
 
 if (fseek(out, sync_tell(in, oy, og), SEEK_SET))
 return OGGEDIT_SEEK_FAILED;
@@ -261,16 +268,16 @@
 return serial;
 }
 
-int copy_up_to_header(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const int codec_serial)
+int64_t copy_up_to_header(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const int64_t codec_serial)
 {
- int serial;
+ int64_t serial;
 do
 serial = write_page_and_get_next(in, out, oy, og);
 while (serial > OGGEDIT_EOF && serial != codec_serial);
 return serial;
 }
 
-long flush_stream(FILE *out, ogg_stream_state *os)
+int64_t flush_stream(FILE *out, ogg_stream_state *os)
 {
 ogg_page og;
 #ifdef HAVE_OGG_STREAM_FLUSH_FILL
@@ -281,7 +288,7 @@
 if (!write_page(out, &og))
 return OGGEDIT_WRITE_ERROR;
 
- const long pageno = ogg_stream_check(os) ? OGGEDIT_FLUSH_FAILED : ogg_page_pageno(&og);
+ const int64_t pageno = ogg_stream_check(os) ? OGGEDIT_FLUSH_FAILED : int32_to_unsigned((int32_t)ogg_page_pageno(&og));
 ogg_stream_clear(os);
 return pageno;
 }
@@ -289,7 +296,7 @@
 char *codec_names(DB_FILE *in, ogg_sync_state *oy, const off_t link_offset)
 {
 ogg_page og;
- int serial = skip_to_bos(in, oy, &og, link_offset);
+ int64_t serial = skip_to_bos(in, oy, &og, link_offset);
 char *codecs = strdup("Ogg");
 while (codecs && serial > OGGEDIT_EOF && ogg_page_bos(&og)) {
 codecs = cat_string(codecs, codec_name(&og), strcmp(codecs, "Ogg") ? "/" : " ");
@@ -309,8 +316,8 @@
 /* Find codec serial and any other codecs */
 bool multiplex = false;
 ogg_page og;
- int codec_serial = -1;
- int serial = skip_to_bos(in, oy, &og, start_offset);
+ int64_t codec_serial = -1;
+ int64_t serial = skip_to_bos(in, oy, &og, start_offset);
 while (serial > OGGEDIT_EOF && ogg_page_bos(&og)) {
 if (strcmp(codec_name(&og), codec))
 multiplex = true;
@@ -320,7 +327,7 @@
 }
 
 /* Skip to the first codec data page */
- while (serial > OGGEDIT_EOF && !(ogg_page_granulepos(&og) > 0 && serial == codec_serial))
+ while (serial > OGGEDIT_EOF && !(ogg_page_granulepos(&og) != 0 && serial == codec_serial))
 serial = get_page(in, oy, &og);
 if (serial <= OGGEDIT_EOF)
 return serial;
@@ -366,14 +373,14 @@
 return vendor;
 }
 
-int init_read_stream(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, const off_t offset, const char *codec)
+int64_t init_read_stream(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, const off_t offset, const char *codec)
 {
- int serial = skip_to_codec(in, oy, og, offset, codec);
+ int64_t serial = skip_to_codec(in, oy, og, offset, codec);
 serial = skip_to_header(in, oy, og, serial, serial);
 if (serial <= OGGEDIT_EOF)
 return serial;
 
- if (ogg_stream_init(os, serial))
+ if (ogg_stream_init(os, (uint32_t)serial))
 return OGGEDIT_FAILED_TO_INIT_STREAM;
 
 os->b_o_s = 1;
@@ -382,16 +389,16 @@
 return OGGEDIT_OK;
 }
 
-int read_packet(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, ogg_packet *header, int pages)
+int64_t read_packet(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, ogg_packet *header, int64_t pages)
 {
 ogg_packet op;
 do {
 while (ogg_stream_packetpeek(os, NULL) == 0) {
- const int serial = get_page(in, oy, og);
+ const int64_t serial = get_page(in, oy, og);
 if (serial <= OGGEDIT_EOF) {
 return serial;
 }
- if (os->serialno == serial) {
+ if ((uint32_t)os->serialno == (uint32_t)serial) {
 pages++;
 ogg_stream_pagein(os, og);
 }
@@ -431,13 +438,11 @@
 if (oggpack_writecheck(&opb))
 return NULL;
 
- if (op) {
- memset(op, '\0', sizeof(*op));
- op->bytes = oggpack_bytes(&opb);
- op->packet = malloc(op->bytes);
- if (op->packet) {
- memcpy(op->packet, oggpack_get_buffer(&opb), op->bytes);
- }
+ memset(op, '\0', sizeof(*op));
+ op->bytes = oggpack_bytes(&opb);
+ op->packet = malloc(op->bytes);
+ if (op->packet) {
+ memcpy(op->packet, oggpack_get_buffer(&opb), op->bytes);
 }
 oggpack_writeclear(&opb);
 
@@ -455,14 +460,14 @@
 return metadata_size;
 }
 
-int copy_remaining_pages(DB_FILE *in, FILE *out, ogg_sync_state *oy, const int codec_serial, uint32_t pageno)
+int64_t copy_remaining_pages(DB_FILE *in, FILE *out, ogg_sync_state *oy, const int64_t codec_serial, uint32_t pageno)
 {
 /* Skip past the codec header packets */
 ogg_page og;
- int serial;
+ int64_t serial;
 do
 serial = get_page(in, oy, &og);
- while (serial > OGGEDIT_EOF && serial == codec_serial && ogg_page_granulepos(&og) <= 0);
+ while (serial > OGGEDIT_EOF && serial == codec_serial && ogg_page_granulepos(&og) == 0);
 if (serial <= OGGEDIT_EOF)
 return serial;
 
@@ -487,11 +492,11 @@
 return OGGEDIT_OK;
 }
 
-int write_all_streams(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset)
+int64_t write_all_streams(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset)
 {
 /* Copy BOS page(s) */
 ogg_page og;
- int serial = skip_to_bos(in, oy, &og, offset);
+ int64_t serial = skip_to_bos(in, oy, &og, offset);
 while (serial > OGGEDIT_EOF && ogg_page_bos(&og))
 serial = write_page_and_get_next(in, out, oy, &og);
 if (serial <= OGGEDIT_EOF)
@@ -506,16 +511,16 @@
 return OGGEDIT_OK;
 }
 
-int write_one_stream(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset, const char *codec)
+int64_t write_one_stream(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset, const char *codec)
 {
 /* Find codec BOS page */
 ogg_page og;
- const int codec_serial = skip_to_codec(in, oy, &og, offset, codec);
+ const int64_t codec_serial = skip_to_codec(in, oy, &og, offset, codec);
 if (codec_serial <= OGGEDIT_EOF)
 return codec_serial;
 
 /* Write it and skip the other BOS pages */
- int serial = write_page_and_get_next(in, out, oy, &og);
+ int64_t serial = write_page_and_get_next(in, out, oy, &og);
 if ((serial = skip_to_header(in, oy, &og, serial, codec_serial)) <= OGGEDIT_EOF)
 return serial;

deadbeef-0.6.2.tar.bz2/plugins/liboggedit/oggedit_internal.h -> deadbeef-1.9.6.tar.bz2/plugins/liboggedit/oggedit_internal.h Changed

@@ -29,10 +29,8 @@
 
 #include <stdbool.h>
 #include <ogg/ogg.h>
-#if HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
-#include "../../deadbeef.h"
+#include <limits.h>
+#include <deadbeef/deadbeef.h>
 #include "oggedit.h"
 
 #define OPUSNAME "Opus"
@@ -50,18 +48,18 @@
 FILE *open_new_file(const char *outname);
 off_t file_size(const char *fname);
 void cleanup(DB_FILE *in, FILE *out, ogg_sync_state *oy, void *buffer);
-int copy_up_to_codec(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const off_t start_offset, const off_t link_offset, const char *codec);
-int copy_up_to_header(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const int codec_serial);
-long flush_stream(FILE *out, ogg_stream_state *os);
+int64_t copy_up_to_codec(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const off_t start_offset, const off_t link_offset, const char *codec);
+int64_t copy_up_to_header(DB_FILE *in, FILE *out, ogg_sync_state *oy, ogg_page *og, const int64_t codec_serial);
+int64_t flush_stream(FILE *out, ogg_stream_state *os);
 char *codec_names(DB_FILE *in, ogg_sync_state *oy, const off_t link_offset);
 off_t codec_stream_size(DB_FILE *in, ogg_sync_state *oy, const off_t start_offset, const off_t end_offset, const char *codec);
 char *parse_vendor(const ogg_packet *op, const size_t magic_length);
-int init_read_stream(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, const off_t offset, const char *codec);
-int read_packet(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, ogg_packet *header, int pages);
+int64_t init_read_stream(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, const off_t offset, const char *codec);
+int64_t read_packet(DB_FILE *in, ogg_sync_state *oy, ogg_stream_state *os, ogg_page *og, ogg_packet *header, int64_t pages);
 ogg_packet *fill_vc_packet(const char *magic, const size_t magic_length, const char *vendor, const size_t num_tags, char **tags, const bool framing, const size_t padding, ogg_packet *op);
 size_t vc_size(const char *vendor, size_t num_tags, char **tags);
-int copy_remaining_pages(DB_FILE *in, FILE *out, ogg_sync_state *oy, const int codec_serial, uint32_t pageno);
-int write_all_streams(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset);
-int write_one_stream(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset, const char *codec);
+int64_t copy_remaining_pages(DB_FILE *in, FILE *out, ogg_sync_state *oy, const int64_t codec_serial, uint32_t pageno);
+int64_t write_all_streams(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset);
+int64_t write_one_stream(DB_FILE *in, FILE *out, ogg_sync_state *oy, const off_t offset, const char *codec);
 
 #endif /* __OGGEDIT_INT_H */

deadbeef-0.6.2.tar.bz2/plugins/liboggedit/oggedit_opus.c -> deadbeef-1.9.6.tar.bz2/plugins/liboggedit/oggedit_opus.c Changed

@@ -46,9 +46,9 @@
 
 int res;
 if (all_streams)
- res = write_one_stream(in, out, &oy, offset, OPUSNAME);
+ res = (int)write_one_stream(in, out, &oy, offset, OPUSNAME);
 else
- res = write_all_streams(in, out, &oy, offset);
+ res = (int)write_all_streams(in, out, &oy, offset);
 
 cleanup(in, out, &oy, NULL);
 
@@ -68,16 +68,16 @@
 return stream_size;
 }
 
-static ptrdiff_t check_opus_header(DB_FILE *in, ogg_sync_state *oy, const off_t offset, char **vendor)
+static long check_opus_header(DB_FILE *in, ogg_sync_state *oy, const off_t offset, char **vendor)
 {
 ogg_stream_state os;
 ogg_page og;
- const int serial = init_read_stream(in, oy, &os, &og, offset, OPUSNAME);
+ const int64_t serial = init_read_stream(in, oy, &os, &og, offset, OPUSNAME);
 if (serial <= OGGEDIT_EOF)
 return serial;
 
 ogg_packet op;
- const int pages = read_packet(in, oy, &os, &og, &op, 1);
+ const long pages = read_packet(in, oy, &os, &og, &op, 1);
 ogg_stream_clear(&os);
 if (pages <= OGGEDIT_EOF)
 return pages;
@@ -98,14 +98,14 @@
 return op.bytes;
 }
 
-static long write_opus_tags(FILE *out, const int serial, const char *vendor, const size_t num_tags, char **tags, const size_t padding)
+static int64_t write_opus_tags(FILE *out, const int64_t serial, const char *vendor, const uint32_t num_tags, char **tags, const size_t padding)
 {
 ogg_packet op;
 if (!fill_vc_packet(TAGMAGIC, strlen(TAGMAGIC), vendor, num_tags, tags, false, padding, &op))
 return OGGEDIT_ALLOCATION_FAILURE;
 
 ogg_stream_state os;
- if (ogg_stream_init(&os, serial))
+ if (ogg_stream_init(&os, (int)serial))
 return OGGEDIT_FAILED_TO_INIT_STREAM;
 os.b_o_s = 1;
 os.pageno = 1;
@@ -115,7 +115,7 @@
 return flush_stream(out, &os);
 }
 
-off_t oggedit_write_opus_metadata(DB_FILE *in, const char *fname, const off_t offset, const size_t stream_size, const int output_gain, const int num_tags, char **tags)
+off_t oggedit_write_opus_metadata(DB_FILE *in, const char *fname, const off_t offset, const off_t stream_size, const int output_gain, const uint32_t num_tags, char **tags)
 {
 off_t res;
 char tempnamePATH_MAX = "";
@@ -131,15 +131,15 @@
 }
 
 /* Should we write the tags packet directly into the existing file ... */
- const ptrdiff_t tags_packet_size = check_opus_header(in, &oy, offset, &vendor);
+ const long tags_packet_size = check_opus_header(in, &oy, offset, &vendor);
 if (tags_packet_size <= OGGEDIT_EOF) {
 res = tags_packet_size;
 goto cleanup;
 }
- const size_t metadata_size = strlen(TAGMAGIC) + vc_size(vendor, num_tags, tags);
- ptrdiff_t padding = tags_packet_size - metadata_size;
+ const int64_t metadata_size = strlen(TAGMAGIC) + vc_size(vendor, num_tags, tags);
+ int64_t padding = tags_packet_size - metadata_size;
 const off_t file_size_k = in->vfs->getlength(in) / 1000;
- const size_t stream_size_k = stream_size ? stream_size / 1000 : file_size_k;
+ const off_t stream_size_k = stream_size ? stream_size / 1000 : file_size_k;
 if (file_size_k < 100 || padding < 0 || padding > file_size_k/10+stream_size_k+metadata_size) {
 res = open_temp_file(fname, tempname, &out);
 if (res) {
@@ -153,7 +153,7 @@
 
 /* Write pages until we reach the correct OpusHead, then write OpusTags */
 ogg_page og;
- const int opus_serial = copy_up_to_codec(in, out, &oy, &og, *tempname ? 0 : offset, offset, OPUSNAME);
+ int64_t opus_serial = copy_up_to_codec(in, out, &oy, &og, *tempname ? 0 : offset, offset, OPUSNAME);
 if (opus_serial <= OGGEDIT_EOF) {
 res = opus_serial;
 goto cleanup;
@@ -163,9 +163,12 @@
 og.body17 = output_gain >> 8 & 0xFF;
 ogg_page_checksum_set(&og);
 }
- if ((res = copy_up_to_header(in, out, &oy, &og, opus_serial)) <= OGGEDIT_EOF)
+ opus_serial = copy_up_to_header(in, out, &oy, &og, opus_serial);
+ if (opus_serial <= OGGEDIT_EOF) {
+ res = opus_serial;
 goto cleanup;
- const long pageno = write_opus_tags(out, opus_serial, vendor, num_tags, tags, (size_t)padding);
+ }
+ const int64_t pageno = write_opus_tags(out, opus_serial, vendor, num_tags, tags, padding);
 if (pageno < OGGEDIT_EOF) {
 res = pageno;
 goto cleanup;
@@ -173,8 +176,13 @@
 
 /* If we have tempfile, copy the remaining pages */
 if (*tempname) {
- if ((res = copy_remaining_pages(in, out, &oy, opus_serial, pageno)) <= OGGEDIT_EOF)
+ opus_serial = copy_remaining_pages(in, out, &oy, opus_serial, (uint32_t)pageno);
+ if (opus_serial <= OGGEDIT_EOF) {
+ res = opus_serial;
 goto cleanup;
+ }
+ fclose (out);
+ out = NULL;
 if (rename(tempname, fname)) {
 res = OGGEDIT_RENAME_FAILED;
 goto cleanup;

deadbeef-0.6.2.tar.bz2/plugins/liboggedit/oggedit_utils.c -> deadbeef-1.9.6.tar.bz2/plugins/liboggedit/oggedit_utils.c Changed

@@ -33,9 +33,9 @@
 #include <ctype.h>
 #include "oggedit_internal.h"
 
-uint8_t *oggedit_vorbis_channel_map(const int channel_count)
+uint8_t *oggedit_vorbis_channel_map(const unsigned channel_count)
 {
- size_t map_size = channel_count * sizeof(uint8_t);
+ unsigned map_size = channel_count * sizeof(uint8_t);
 uint8_t *map = malloc(map_size);
 if (!map)
 return NULL;
@@ -56,13 +56,14 @@
 }
 }
 
+// FIXME: oggedit_map_tag expects key to be writable, and uppercases it in-place, returning the result
 const char *oggedit_map_tag(char *key, const char *in_or_out)
 {
 typedef struct {
 const char *tag;
 const char *meta;
 } key_t;
- const key_t keys = {
+ static const key_t keys = {
 /* Permanent named tags in DeaDBeef */
 // {.tag = "ARTIST", .meta = "artist"},
 // {.tag = "TITLE", .meta = "title"},
@@ -70,9 +71,12 @@
 {.tag = "DATE", .meta = "year"},
 {.tag = "TRACKNUMBER", .meta = "track"},
 {.tag = "TRACKTOTAL", .meta = "numtracks"},
+ {.tag = "TOTALTRACKS", .meta = "numtracks"},
 // {.tag = "GENRE", .meta = "genre"},
 // {.tag = "COMPOSER", .meta = "composer"},
 {.tag = "DISCNUMBER", .meta = "disc"},
+ {.tag = "TOTALDISCS", .meta = "numdiscs"},
+ {.tag = "DISCTOTAL", .meta = "numdiscs"},
 // {.tag = "COMMENT", .meta = "comment"},
 /* Vorbis standard tags */
 // {.tag = "ARRANGER", .meta = "Arranger"},
@@ -82,7 +86,6 @@
 // {.tag = "LYRICIST", .meta = "Lyricist"},
 // {.tag = "PERFORMER", .meta = "Performer"},
 // {.tag = "PUBLISHER", .meta = "Publisher"},
-// {.tag = "DISCTOTAL", .meta = "Disctotal"},
 // {.tag = "OPUS", .meta = "Opus"},
 // {.tag = "PART", .meta = "Part"},
 // {.tag = "PARTNUMBER", .meta = "Partnumber"},
@@ -101,13 +104,14 @@
 // {.tag = "ENCODED-BY", .meta = "Encoded-by"},
 // {.tag = "ENCODING", .meta = "Encoding"},
 /* Other tags */
-// {.tag = "ALBUMARTIST", .meta = "Albumartist"},
+ {.tag = "ALBUMARTIST", .meta = "Album Artist"},
 // {.tag = "ALBUM ARTIST", .meta = "Album artist"},
 // {.tag = "BAND", .meta = "Band"},
 // {.tag = "COMPILATION", .meta = "Compilation"},
-// {.tag = "TOTALTRACKS", .meta = "Totaltracks"},
 // {.tag = "ENCODED_BY", .meta = "Encoded_by"},
 // {.tag = "ENCODER_OPTIONS",.meta = "Encoder_options"},
+ {.tag = "ORIGINALDATE", .meta = "original_release_time"},
+ {.tag = "ORIGINALYEAR", .meta = "original_release_year"},
 {.tag = NULL}
 };
 
@@ -118,7 +122,7 @@
 
 /* Upper-case all Vorbis Comment tag names */
 if (*in_or_out == 'm')
- for (size_t i = 0; keyi; i++)
+ for (unsigned i = 0; keyi; i++)
 keyi = toupper(keyi);
 
 return key;

deadbeef-0.6.2.tar.bz2/plugins/liboggedit/oggedit_vorbis.c -> deadbeef-1.9.6.tar.bz2/plugins/liboggedit/oggedit_vorbis.c Changed

@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <limits.h>
 #include "oggedit_internal.h"
 
 #define VCMAGIC "\3vorbis"
@@ -49,12 +50,12 @@
 {
 ogg_stream_state os;
 ogg_page og;
- const int serial = init_read_stream(in, oy, &os, &og, offset, VORBISNAME);
+ const int64_t serial = init_read_stream(in, oy, &os, &og, offset, VORBISNAME);
 if (serial <= OGGEDIT_EOF)
 return serial;
 
 ogg_packet vc;
- int pages = read_packet(in, oy, &os, &og, &vc, 1);
+ int64_t pages = read_packet(in, oy, &os, &og, &vc, 1);
 if (pages > OGGEDIT_EOF)
 pages = read_packet(in, oy, &os, &og, codebooks, pages);
 ogg_stream_clear(&os);
@@ -78,14 +79,14 @@
 return vc.bytes;
 }
 
-static long write_vorbis_tags(FILE *out, const int serial, const char *vendor, const size_t num_tags, char **tags, const size_t padding, ogg_packet *codebooks)
+static long write_vorbis_tags(FILE *out, const int64_t serial, const char *vendor, const size_t num_tags, char **tags, const size_t padding, ogg_packet *codebooks)
 {
 ogg_packet op;
 if (!fill_vc_packet(VCMAGIC, strlen(VCMAGIC), vendor, num_tags, tags, true, padding, &op))
 return OGGEDIT_ALLOCATION_FAILURE;
 
 ogg_stream_state os;
- if (ogg_stream_init(&os, serial))
+ if (ogg_stream_init(&os, (uint32_t)serial))
 return OGGEDIT_FAILED_TO_INIT_STREAM;
 os.b_o_s = 1;
 os.pageno = 1;
@@ -136,13 +137,16 @@
 
 /* Write pages until the correct comment header */
 ogg_page og;
- const int vorbis_serial = copy_up_to_codec(in, out, &oy, &og, *tempname ? 0 : offset, offset, VORBISNAME);
+ int64_t vorbis_serial = copy_up_to_codec(in, out, &oy, &og, *tempname ? 0 : offset, offset, VORBISNAME);
 if (vorbis_serial <= OGGEDIT_EOF) {
 res = vorbis_serial;
 goto cleanup;
 }
- if ((res = copy_up_to_header(in, out, &oy, &og, vorbis_serial)) <= OGGEDIT_EOF)
+ vorbis_serial = copy_up_to_header(in, out, &oy, &og, vorbis_serial);
+ if (vorbis_serial <= OGGEDIT_EOF) {
+ res = vorbis_serial;
 goto cleanup;
+ }
 const long pageno = write_vorbis_tags(out, vorbis_serial, vendor, num_tags, tags, padding, &codebooks);
 if (pageno < OGGEDIT_EOF) {
 res = pageno;
@@ -151,8 +155,14 @@
 
 /* If we have tempfile, copy the remaining pages */
 if (*tempname) {
- if ((res = copy_remaining_pages(in, out, &oy, vorbis_serial, pageno)) <= OGGEDIT_EOF)
+ vorbis_serial = copy_remaining_pages(in, out, &oy, vorbis_serial, (uint32_t)pageno);
+ if (vorbis_serial <= OGGEDIT_EOF) {
+ res = vorbis_serial;
 goto cleanup;
+ }
+
+ fclose (out);
+ out = NULL;
 if (rename(tempname, fname)) {
 res = OGGEDIT_RENAME_FAILED;
 goto cleanup;

deadbeef-0.6.2.tar.bz2/plugins/libparser/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/libparser/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/libparser/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/libparser/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/libparser/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/libparser/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/libparser/parser.c -> deadbeef-1.9.6.tar.bz2/plugins/libparser/parser.c Changed

@@ -1,6 +1,6 @@
 /*
     Simple text parsing library
-    Copyright (C) 2009-2014 Alexey Yakovenko
+    Copyright (C) 2009-2014 Oleksiy 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
@@ -66,6 +66,9 @@
             if (*c == '\n') {
                 parser_line++;
             }
+            if (*c == '\\' && (*(c+1) == '"' || *(c+1) == '\\')) {
+                c++;
+            }
             *tok++ = *c++;
             n--;
         }
@@ -113,7 +116,7 @@
 gettoken_warn_eof (const char *p, char *tok) {
     p = gettoken (p, tok);
     if (!p) {
-        fprintf (stderr, "parser: unexpected eof at line %d", parser_line);
+        fprintf (stderr, "parser: unexpected eof at line %d\n", parser_line);
     }
     return p;
 }
@@ -122,9 +125,46 @@
 gettoken_err_eof (const char *p, char *tok) {
     p = gettoken (p, tok);
     if (!p) {
-        fprintf (stderr, "parser: unexpected eof at line %d", parser_line);
+        fprintf (stderr, "parser: unexpected eof at line %d\n", parser_line);
         exit (-1);
     }
     return p;
 }
 
+char *
+parser_escape_string (const char *in) {
+    char *output;
+    size_t len = 0;
+    const char *p;
+    for (p = in; *p; p++, len++) {
+        if (*p == '"' || *p == '\\') {
+            len++;
+        }
+    }
+    output = malloc (len + 1);
+    char *out = output;
+    for (p = in; *p; p++) {
+        if (*p == '"' || *p == '\\') {
+            *out++ = '\\';
+        }
+        *out++ = *p;
+    }
+    *out = 0;
+    return output;
+}
+
+void
+parser_unescape_quoted_string (char *in) {
+    char *out = in;
+    char *next = in;
+    if (next0 == '"') {
+        next++;
+    }
+    while (*next && *next != '"') {
+        if (*next == '\\' && (*(next+1) == '"' || *(next+1) == '\\')) {
+            next++;
+        }
+        *out++ = *next++;
+    }
+    *out = '\0';
+}

deadbeef-0.6.2.tar.bz2/plugins/libparser/parser.h -> deadbeef-1.9.6.tar.bz2/plugins/libparser/parser.h Changed

deadbeef-0.6.2.tar.bz2/plugins/m3u/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/m3u/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/m3u/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/m3u/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/m3u/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/m3u/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/m3u/m3u.c -> deadbeef-1.9.6.tar.bz2/plugins/m3u/m3u.c Changed

@@ -1,6 +1,6 @@
 /*
 M3U and PLS playlist plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy 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
@@ -26,12 +26,10 @@
 #endif
 #include <string.h>
 #include <stdlib.h>
+#include <limits.h>
 #include <math.h> // for ceil
-#if HAVE_SYS_SYSLIMITS_H
-#include <sys/syslimits.h>
-#endif
 
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
@@ -49,44 +47,25 @@
 return p;
 }
 
-static DB_playItem_t *
-load_m3u (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) {
+DB_playItem_t *
+load_m3u_from_buffer(DB_playItem_t *after, const char *buffer, int64_t sz, int (*cb)(DB_playItem_t *, void *), const char *fname, int *pabort, ddb_playlist_t *plt, void *user_data) {
 const char *slash = strrchr (fname, '/');
- trace ("enter pl_insert_m3u\n");
- // skip all empty lines and comments
- DB_FILE *fp = deadbeef->fopen (fname);
- if (!fp) {
- trace ("failed to open file %s\n", fname);
- return NULL;
- }
- int sz = deadbeef->fgetlength (fp);
- trace ("loading m3u...\n");
- uint8_t *membuffer = malloc (sz);
- if (!membuffer) {
- deadbeef->fclose (fp);
- trace ("failed to allocate %d bytes to read the file %s\n", sz, fname);
- return NULL;
- }
- uint8_t *buffer = membuffer;
- deadbeef->fread (buffer, 1, sz, fp);
- deadbeef->fclose (fp);
-
- if (sz >= 3 && buffer0 == 0xef && buffer1 == 0xbb && buffer2 == 0xbf) {
+ if (sz >= 3 && (uint8_t)buffer0 == 0xef && (uint8_t)buffer1 == 0xbb && (uint8_t)buffer2 == 0xbf) {
 buffer += 3;
 sz -= 3;
 }
 int line = 0;
 int read_extm3u = 0;
 
- const uint8_t *p = buffer;
- const uint8_t *end = buffer+sz;
- const uint8_t *e;
+ const char *p = buffer;
+ const char *end = buffer+sz;
+ const char *e;
 int length = -1;
 char title1000 = "";
 char artist1000 = "";
 while (p < end) {
 line++;
- p = skipspaces (p, end);
+ p = (const char *)skipspaces ((const uint8_t *)p, (const uint8_t *)end);
 if (p >= end) {
 break;
 }
@@ -98,16 +77,15 @@
 }
 else if (read_extm3u) {
 if (end - p >= 8 && !strncmp (p, "#EXTINF:", 8)) {
- length = -1;
 memset (title, 0, sizeof (title));
 memset (artist, 0, sizeof (artist));
 p += 8;
 e = p;
- while (e < end && *e >= 0x20) {
+ while (e < end && ((uint8_t)(*e)) >= 0x20) {
 e++;
 }
- int n = e-p;
- uint8_t nmn+1;
+ long n = e-p;
+ char nmn+1;
 memcpy (nm, p, n);
 nmn = 0;
 length = atoi (nm);
@@ -117,6 +95,9 @@
 }
 if (*c == ',') {
 c++;
+ while (*c && ((uint8_t)*c) <= 0x20) {
+ c++;
+ }
 const char *dash = NULL;
 const char *newdash = strstr (c, " - ");
 
@@ -128,7 +109,7 @@
 if (dash) {
 strncpy (title, dash+3, sizeof (title)-1);
 titlesizeof(title)-1 = 0;
- int l = dash - c;
+ long l = dash - c;
 strncpy (artist, c, min(l, sizeof (artist)));
 artistsizeof(artist)-1 = 0;
 }
@@ -140,7 +121,7 @@
 }
 }
 }
- while (p < end && *p >= 0x20) {
+ while (p < end && ((uint8_t)(*p)) >= 0x20) {
 p++;
 }
 if (p >= end) {
@@ -149,11 +130,11 @@
 continue;
 }
 e = p;
- while (e < end && *e >= 0x20) {
+ while (e < end && ((uint8_t)(*e)) >= 0x20) {
 e++;
 }
- int n = e-p;
- uint8_t nmn+1;
+ long n = e-p;
+ char nmn+1;
 memcpy (nm, p, n);
 nmn = 0;
 
@@ -161,7 +142,7 @@
 const char *cs = deadbeef->junk_detect_charset (title);
 if (cs) {
 char tmp1000;
- if (deadbeef->junk_iconv (title, strlen (title), tmp, sizeof (tmp), cs, "utf-8") >= 0) {
+ if (deadbeef->junk_iconv (title, (int)strlen (title), tmp, sizeof (tmp), cs, "utf-8") >= 0) {
 strcpy (title, tmp);
 }
 }
@@ -170,7 +151,7 @@
 const char *cs = deadbeef->junk_detect_charset (artist);
 if (cs) {
 char tmp1000;
- if (deadbeef->junk_iconv (artist, strlen (artist), tmp, sizeof (tmp), cs, "utf-8") >= 0) {
+ if (deadbeef->junk_iconv (artist, (int)strlen (artist), tmp, sizeof (tmp), cs, "utf-8") >= 0) {
 strcpy (artist, tmp);
 }
 }
@@ -182,7 +163,7 @@
 is_fullpath = 1;
 }
 else {
- uint8_t *p = strstr (nm, "://");
+ char *p = strstr (nm, "://");
 if (p) {
 p--;
 while (p >= nm) {
@@ -215,7 +196,7 @@
 memset (artist, 0, sizeof (artist));
 }
 else {
- int l = strlen (nm);
+ size_t l = strlen (nm);
 char fullpathslash - fname + l + 2;
 memcpy (fullpath, fname, slash - fname + 1);
 strcpy (fullpath + (slash - fname + 1), nm);
@@ -226,7 +207,6 @@
 after = it;
 }
 if (pabort && *pabort) {
- free (membuffer);
 return after;
 }
 p = e;
@@ -234,6 +214,32 @@
 break;
 }
 }
+
+ return after;
+}
+
+static DB_playItem_t *
+load_m3u (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) {
+ trace ("enter pl_insert_m3u\n");
+ // skip all empty lines and comments
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
+ trace ("failed to open file %s\n", fname);
+ return NULL;
+ }
+ int64_t sz = deadbeef->fgetlength (fp);
+ trace ("loading m3u...\n");
+ char *membuffer = malloc (sz);
+ if (!membuffer) {
+ deadbeef->fclose (fp);
+ trace ("failed to allocate %d bytes to read the file %s\n", sz, fname);
+ return NULL;
+ }
+ char *buffer = membuffer;
+ deadbeef->fread (buffer, 1, sz, fp);
+ deadbeef->fclose (fp);
+
+ after = load_m3u_from_buffer(after, buffer, sz, cb, fname, pabort, plt, user_data);
 trace ("leave pl_insert_m3u\n");
 free (membuffer);
 return after;
@@ -255,7 +261,7 @@
 slash = strrchr (fname, '/');
 }
 if (slash) {
- int l = strlen (uri);
+ size_t l = strlen (uri);
 char fullpathslash - fname + l + 2;
 memcpy (fullpath, fname, slash - fname + 1);
 strcpy (fullpath + (slash - fname + 1), uri);
@@ -276,13 +282,12 @@
 static DB_playItem_t *
 load_pls (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) {
 trace ("load_pls %s\n", fname);
- const char *slash = strrchr (fname, '/');
 DB_FILE *fp = deadbeef->fopen (fname);
 if (!fp) {
 trace ("failed to open file %s\n", fname);
 return NULL;
 }
- int sz = deadbeef->fgetlength (fp);
+ int64_t sz = deadbeef->fgetlength (fp);
 deadbeef->rewind (fp);
 uint8_t *buffer = malloc (sz);
 if (!buffer) {
@@ -293,15 +298,15 @@
 deadbeef->fread (buffer, 1, sz, fp);
 deadbeef->fclose (fp);
 // 1st line must be "playlist"
- const uint8_t *p = buffer;
- const uint8_t *end = buffer+sz;
+ const char *p = (const char *)buffer;
+ const char *end = (const char *)buffer+sz;
 if (strncasecmp (p, "playlist", 10)) {
 trace ("file %s doesn't begin with playlist\n", fname);
 free (buffer);
 return NULL;
 }
 p += 10;
- p = skipspaces (p, end);
+ p = (const char *)skipspaces ((const uint8_t *)p, (const uint8_t *)end);
 if (p >= end) {
 trace ("file %s finished before numberofentries had been read\n", fname);
 free (buffer);
@@ -313,15 +318,15 @@
 char length20 = "";
 int lastidx = -1;
 while (p < end) {
- p = skipspaces (p, end);
+ p = (const char *)skipspaces ((const uint8_t *)p, (const uint8_t *)end);
 if (p >= end) {
 break;
 }
 if (end-p < 6) {
 break;
 }
- const uint8_t *e;
- int n;
+ const char *e;
+ long n;
 if (!strncasecmp (p, "file", 4)) {
 int idx = atoi (p + 4);
 if (uri0 && idx != lastidx && lastidx != -1) {
@@ -343,14 +348,14 @@
 p++;
 }
 p++;
- while (p < end && *p <= 0x20) {
+ while (p < end && ((uint8_t)(*p)) <= 0x20) {
 p++;
 }
 if (p >= end) {
 break;
 }
 e = p;
- while (e < end && *e >= 0x20) {
+ while (e < end && ((uint8_t)(*e)) >= 0x20) {
 e++;
 }
 n = e-p;
@@ -359,7 +364,7 @@
 urin = 0;
 trace ("uri: %s\n", uri);
 trace ("uri%d=%s\n", idx, uri);
- p = ++e;
+ e++;
 }
 else if (!strncasecmp (p, "title", 5)) {
 int idx = atoi (p + 5);
@@ -383,14 +388,14 @@
 p++;
 }
 p++;
- while (p < end && *p <= 0x20) {
+ while (p < end && ((uint8_t)(*p)) <= 0x20) {
 p++;
 }
 if (p >= end) {
 break;
 }
 e = p;
- while (e < end && *e >= 0x20) {
+ while (e < end && ((uint8_t)(*e)) >= 0x20) {
 e++;
 }
 n = e-p;
@@ -398,7 +403,7 @@
 memcpy (title, p, n);
 titlen = 0;
 trace ("title%d=%s\n", idx, title);
- p = ++e;
+ e++;
 }
 else if (!strncasecmp (p, "length", 6)) {
 int idx = atoi (p + 6);
@@ -427,7 +432,7 @@
 break;
 }
 e = p;
- while (e < end && *e >= 0x20) {
+ while (e < end && ((uint8_t)(*e)) >= 0x20) {
 e++;
 }
 n = e-p;
@@ -438,11 +443,11 @@
 else {
 trace ("pls: skipping unrecognized entry in pls file: %s\n", p);
 e = p;
- while (e < end && *e >= 0x20) {
+ while (e < end && ((uint8_t)(*e)) >= 0x20) {
 e++;
 }
 }
- while (e < end && *e < 0x20) {
+ while (e < end && ((uint8_t)(*e)) < 0x20) {
 e++;
 }
 p = e;
@@ -496,6 +501,10 @@
 if (!fp) {
 return -1;
 }
+
+ char *tf = deadbeef->tf_compile ("%artist% - %title%");
+ char s1000;
+
 DB_playItem_t *it = first;
 deadbeef->pl_item_ref (it);
 fprintf (fp, "#EXTM3U\n");
@@ -503,23 +512,21 @@
 // skip subtracks, pls and m3u formats don't support that
 uint32_t flags = deadbeef->pl_get_item_flags (it);
 if (flags & DDB_IS_SUBTRACK) {
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
- continue;
+ if (deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0)) {
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ continue;
+ }
 }
 int dur = (int)floor(deadbeef->pl_get_item_duration (it));
- char s1000;
- int has_artist = deadbeef->pl_meta_exists (it, "artist");
- int has_title = deadbeef->pl_meta_exists (it, "title");
- if (has_artist && has_title) {
- deadbeef->pl_format_title (it, -1, s, sizeof (s), -1, "%a - %t");
- fprintf (fp, "#EXTINF:%d,%s\n", dur, s);
- }
- else if (has_title) {
- deadbeef->pl_format_title (it, -1, s, sizeof (s), -1, "%t");
- fprintf (fp, "#EXTINF:%d,%s\n", dur, s);
- }
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .it = it,
+ };
+ deadbeef->tf_eval (&ctx, tf, s, sizeof (s));
+ fprintf (fp, "#EXTINF:%d,%s\n", dur, s);
+
 deadbeef->pl_lock ();
 {
 const char *fname = deadbeef->pl_find_meta (it, ":URI");
@@ -535,6 +542,8 @@
 it = next;
 }
 fclose (fp);
+
+ deadbeef->tf_free (tf);
 return 0;
 }
 
@@ -552,10 +561,12 @@
 // skip subtracks, pls and m3u formats don't support that
 uint32_t flags = deadbeef->pl_get_item_flags (it);
 if (flags & DDB_IS_SUBTRACK) {
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
- continue;
+ if (deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0)) {
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ continue;
+ }
 }
 n++;
 if (it == last) {
@@ -576,10 +587,12 @@
 // skip subtracks, pls and m3u formats don't support that
 uint32_t flags = deadbeef->pl_get_item_flags (it);
 if (flags & DDB_IS_SUBTRACK) {
- DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
- deadbeef->pl_item_unref (it);
- it = next;
- continue;
+ if (deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0)) {
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ continue;
+ }
 }
 deadbeef->pl_lock ();
 {
@@ -617,8 +630,7 @@
 
 static const char * exts = { "m3u", "m3u8", "pls", NULL };
 DB_playlist_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_PLAYLIST,
@@ -627,7 +639,7 @@
 .plugin.descr = "Importing and exporting M3U and PLS formats\nRecognizes .pls, .m3u and .m3u8 file types\n\nNOTE: only utf8 file names are currently supported",
 .plugin.copyright = 
 "M3U and PLS playlist plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "This software is provided 'as-is', without any express or implied\n"
 "warranty. In no event will the authors be held liable for any damages\n"

deadbeef-0.6.2.tar.bz2/plugins/mms/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/mms/COPYING Changed

@@ -1,5 +1,5 @@
 MMS transport VFS plugin for DeaDBeeF Player
-Copyright (C) 2009-2014 Alexey Yakovenko
+Copyright (C) 2009-2014 Oleksiy 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
@@ -22,19 +22,21 @@
 
 
 libmms - MMS over TCP protocol
-Copyright (C) 2002-2004 the xine project
-Modifications for DeaDBeeF (C) 2009-2014 Alexey Yakovenko
+Copyright (C) 2002-2003 the xine project
+Copyright (C) 2004-2012 the libmms project
+Modifications for DeaDBeeF (C) 2009-2016 Oleksiy Yakovenko
 
-xine is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the ree Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Libmms is free software; you can redistribute it and/or modify it
+under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
 
-xine is distributed in the hope that it will be useful,
+Libmms is distributed in the hope that 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
+You should have received a copy of the GNU Library 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

deadbeef-0.6.2.tar.bz2/plugins/mms/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/mms/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/mms/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/mms/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/mms/libmms/asfheader.h -> deadbeef-1.9.6.tar.bz2/plugins/mms/libmms/asfheader.h Changed

@@ -1,23 +1,25 @@
 /*
  * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2004-2012 the libmms project
  *
- * This file is part of xine, a free video player.
+ * This file is part of LibMMS, an MMS protocol handling library.
+ * This file was originally a part of xine, a free video player.
  *
- * xine 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.
+ * Libmms is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
  *
- * xine is distributed in the hope that it will be useful,
+ * Libmms is distributed in the hope that 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
+ * You should have received a copy of the GNU Library 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: asfheader.h,v 1.2 2005/12/12 09:24:19 theuraeus Exp $
  *
  * demultiplexer for asf streams
  *

deadbeef-0.6.2.tar.bz2/plugins/mms/libmms/bswap.h -> deadbeef-1.9.6.tar.bz2/plugins/mms/libmms/bswap.h Changed

deadbeef-0.6.2.tar.bz2/plugins/mms/libmms/mms.c -> deadbeef-1.9.6.tar.bz2/plugins/mms/libmms/mms.c Changed

@@ -1,21 +1,24 @@
 /*
 * Copyright (C) 2002-2004 the xine project
+ * Copyright (C) 2004-2012 the libmms project
 * 
 * This file is part of LibMMS, an MMS protocol handling library.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the ree Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * xine is distributed in the hope that it will be useful,
+ * This file was originally a part of xine, a free video player.
+ *
+ * Libmms is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Libmms is distributed in the hope that 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
+ *
+ * You should have received a copy of the GNU Library 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: mms.c,v 1.31 2007/12/11 20:35:01 jwrdegoede Exp $
 *
@@ -36,6 +39,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -47,7 +51,7 @@
 #include <iconv.h>
 #else
 // use deadbeef's charset conversion instead of iconv
-#include "../../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 extern DB_functions_t *deadbeef;
 #endif
 
@@ -1106,6 +1110,11 @@
 }
 }
 
+ if (this->streams0.stream_id < 0) {
+ lprintf("mms: invalid stream id: %d\n", this->streams0.stream_id);
+ return 0;
+ }
+
 lprintf("mms: send command 0x33\n");
 if (!send_command (io, this, 0x33, this->num_stream_ids, 
 0xFFFF | this->streams0.stream_id << 16, 
@@ -1144,7 +1153,7 @@
 return NULL;
 
 /* FIXME: needs proper error-signalling work */
- this = (mms_t*) malloc (sizeof (mms_t));
+ this = (mms_t*) calloc (1, sizeof (mms_t));
 
 this->url = strdup (url);
 this->s = -1;

deadbeef-0.6.2.tar.bz2/plugins/mms/libmms/mms.h -> deadbeef-1.9.6.tar.bz2/plugins/mms/libmms/mms.h Changed

deadbeef-0.6.2.tar.bz2/plugins/mms/libmms/mmsh.c -> deadbeef-1.9.6.tar.bz2/plugins/mms/libmms/mmsh.c Changed

@@ -1,21 +1,24 @@
 /*
 * Copyright (C) 2002-2003 the xine project
+ * Copyright (C) 2004-2012 the libmms project
+ * 
+ * This file is part of LibMMS, an MMS protocol handling library.
+ * This file was originally a part of xine, a free video player.
 *
- * This file is part of xine, a free video player.
+ * Libmms is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
 *
- * xine 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.
- *
- * xine is distributed in the hope that it will be useful,
+ * Libmms is distributed in the hope that 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
+ * You should have received a copy of the GNU Library 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: mmsh.c,v 1.16 2007/12/11 20:50:43 jwrdegoede Exp $
 *
@@ -43,6 +46,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -250,46 +254,122 @@
 
 static int fallback_io_tcp_connect(void *data, const char *host, int port, int *need_abort)
 {
- 
- struct hostent *h;
- int i, s;
- 
- h = gethostbyname(host);
- if (h == NULL) {
- lprintf("mmsh: unable to resolve host: %s\n", host);
- return -1;
- }
 
- s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); 
- if (s == -1) {
- lprintf("mmsh: failed to create socket: %s\n", strerror(errno));
- return -1;
- }
+ struct hostent *h;
+ int i, s;
 
- if (fcntl (s, F_SETFL, fcntl (s, F_GETFL) & ~O_NONBLOCK) == -1) {
- lprintf("mmsh: failed to set socket flags: %s\n", strerror(errno));
- return -1;
- }
+#ifdef USE_GETHOSTBYNAME
+ h = gethostbyname(host);
+ if (h == NULL) {
+ lprintf("mms: unable to resolve host: %s\n", host);
+ return -1;
+ }
+ char **h_addr_list = h->h_addr_list;
+#else
+ char sport10;
+ snprintf (sport, 10, "%d", port);
+ struct addrinfo *res;
+ for (;;) {
+ int err = getaddrinfo (host, sport, NULL, &res);
+ if (need_abort && *need_abort) {
+ if (res) {
+ freeaddrinfo(res);
+ }
+ return -1;
+ }
 
- for (i = 0; h->h_addr_listi; i++) {
- struct in_addr ia;
- struct sockaddr_in sin;
- 
- memcpy (&ia, h->h_addr_listi, 4);
- sin.sin_family = AF_INET;
- sin.sin_addr = ia;
- sin.sin_port = htons(port);
- 
- if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) ==-1 && errno != EINPROGRESS) {
- continue;
+ if (err == EAI_AGAIN) {
+ lprintf ("getaddrinfo again\n");
+ continue;
+ }
+ else if (err == 0) {
+ lprintf ("getaddrinfo success\n");
+ break;
+ }
+ lprintf ("getaddrinfo err: %d\n", err);
+ return -1;
 }
- 
- return s;
- }
- close(s);
- return -1;
-}
+#endif
+
+ s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (s == -1) {
+ lprintf("mms: failed to create socket: %s\n", strerror(errno));
+ return -1;
+ }
+
+ if (fcntl (s, F_SETFL, fcntl (s, F_GETFL) | O_NONBLOCK) == -1) {
+ lprintf("mms: failed to set socket flags: %s\n", strerror(errno));
+ return -1;
+ }
+
+#ifdef USE_GETHOSTBYNAME
+ for (i = 0; h_addr_listi; i++) {
+ struct in_addr ia;
+ struct sockaddr_in sin;
+
+ memcpy (&ia, h_addr_listi, 4);
+ sin.sin_family = AF_INET;
+ sin.sin_addr = ia;
+ sin.sin_port = htons(port);
+#else
+ struct addrinfo *rp;
+ for (rp = res; rp != NULL; rp = rp->ai_next) {
+ struct sockaddr_in sin;
+ memset (&sin, 0, sizeof (sin));
+ int l = rp->ai_addrlen;
+ if (l > sizeof (sin)) {
+ l = sizeof (sin);
+ }
+ memcpy (&sin, rp->ai_addr, l);
+#endif
+
+ time_t t = time (NULL);
+ int error = 0;
+ while (!need_abort || !(*need_abort)) {
+ int res = connect(s, (struct sockaddr *)&sin, sizeof(sin));
+ if (res == -1 && (errno == EINPROGRESS || errno == EALREADY)) {
+ if (time (NULL) - t > 3) {
+ error = -1;
+ break;
+ }
+ usleep(100000);
+ continue;
+ }
+ else if (res == -1 && errno == EISCONN) {
+ break;
+ }
+ else if (res == -1) {
+ error = -1;
+ break;
+ }
+ }
+ if (need_abort && *need_abort) {
+ lprintf ("fallback_io_tcp_connect: aborted\n");
+ s = -1;
+ break;
+ }
+ // if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) ==-1 && errno != EINPROGRESS) {
+ // continue;
+ // }
+ if (error) {
+ continue;
+ }
 
+#ifndef USE_GETHOSTBYNAME
+ if (res) {
+ freeaddrinfo(res);
+ }
+#endif
+ return s;
+ }
+#ifndef USE_GETHOSTBYNAME
+ if (res) {
+ freeaddrinfo(res);
+ }
+#endif
+ close(s);
+ return -1;
+ }
 
 static mms_io_t fallback_io =
 {
@@ -438,7 +518,10 @@
 len = 0;
 }
 } else {
- len ++;
+ if (++len >= sizeof(this->buf)) {
+ lprintf("answer too large\n");
+ return 0;
+ }
 }
 }
 if (this->stream_type == MMSH_UNKNOWN) {
@@ -1160,7 +1243,7 @@
 }
 
 static int get_media_packet (mms_io_t *io, mmsh_t *this) {
- int ret, len = 0;
+ int ret = ERROR, len = 0;
 
 if (get_chunk_header(io, this) == SUCCESS) {
 switch (this->chunk_type) {

deadbeef-0.6.2.tar.bz2/plugins/mms/libmms/mmsh.h -> deadbeef-1.9.6.tar.bz2/plugins/mms/libmms/mmsh.h Changed

@@ -1,21 +1,24 @@
 /*
  * Copyright (C) 2002-2003 the xine project
+ * Copyright (C) 2004-2012 the libmms project
  * 
- * This file is part of xine, a free video player.
- * 
- * xine 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.
- * 
- * xine is distributed in the hope that it will be useful,
+ * This file is part of LibMMS, an MMS protocol handling library.
+ * This file was originally a part of xine, a free video player.
+ *
+ * Libmms is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Libmms is distributed in the hope that 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
+ *
+ * You should have received a copy of the GNU Library 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: mmsh.h,v 1.8 2007/12/11 20:24:48 jwrdegoede Exp $
  *

deadbeef-0.6.2.tar.bz2/plugins/mms/libmms/mmsio.h -> deadbeef-1.9.6.tar.bz2/plugins/mms/libmms/mmsio.h Changed

@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2004-2012 the libmms project
+ * 
+ * This file is part of LibMMS, an MMS protocol handling library.
+ *
+ * Libmms is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * Libmms is distributed in the hope that 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 Library General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA
+ */
+
 #ifndef __MMS_IO_H__
 #define __MMS_IO_H__
 
@@ -84,7 +105,7 @@
    parameter. Structure is referenced, not copied, must remain valid for entire
    usage period. Passing NULL reverts to default, POSIX based implementation */
 void mms_set_default_io_impl(const mms_io_t *io);
-const mms_io_t* mms_get_default_io_impl();
+const mms_io_t* mms_get_default_io_impl(void);
 
 #ifdef __cplusplus
 }

deadbeef-0.6.2.tar.bz2/plugins/mms/libmms/uri.c -> deadbeef-1.9.6.tar.bz2/plugins/mms/libmms/uri.c Changed

deadbeef-0.6.2.tar.bz2/plugins/mms/mmsplug.c -> deadbeef-1.9.6.tar.bz2/plugins/mms/mmsplug.c Changed

@@ -1,6 +1,6 @@
 /*
 MMS transport VFS plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy 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
@@ -21,7 +21,7 @@
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -97,7 +97,7 @@
 return connect_err;
 }
 MMS_FILE *fp = (MMS_FILE *)stream;
- int res = mmsx_read ((mms_io_t *)fp->io, fp->stream, ptr, size * nmemb);
+ int res = mmsx_read ((mms_io_t *)fp->io, fp->stream, ptr, (int)(size * nmemb));
 fp->pos += res;
 if (fp->need_abort) {
 return -1;
@@ -170,8 +170,7 @@
 }
 
 static DB_vfs_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_VFS,
@@ -179,7 +178,7 @@
 .plugin.descr = "MMS streaming plugin based on libmms",
 .plugin.copyright = 
 "MMS transport VFS plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "Uses modified libmms-0.6.1\n"
 "\n"
@@ -204,22 +203,24 @@
 "\n"
 "\n"
 "libmms - MMS over TCP protocol\n"
- "Copyright (C) 2002-2004 the xine project\n"
- "Modifications for DeaDBeeF (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2002-2003 the xine project\n"
+ "Copyright (C) 2004-2012 the libmms project\n"
+ "Modifications for DeaDBeeF (C) 2009-2016 Oleksiy Yakovenko\n"
 "\n"
- "xine is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
- "the ree Software Foundation; either version 2 of the License, or\n"
- "(at your option) any later version.\n"
+ "Libmms is free software; you can redistribute it and/or modify it\n"
+ "under the terms of the GNU Library General Public License as\n"
+ "published by the Free Software Foundation; either version 2 of the\n"
+ "License, or (at your option) any later version.\n"
 "\n"
- "xine is distributed in the hope that it will be useful,\n"
+ "Libmms is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
 "GNU General Public License for more details.\n"
 "\n"
- "You should have received a copy of the GNU General Public License\n"
- "along with this program; if not, write to the Free Software\n"
- "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n"
+ "You should have received a copy of the GNU Library General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+ "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+ "02111-1307, USA\n"
 ,
 .plugin.website = "http://deadbeef.sf.net",
 .open = mms_open,

deadbeef-0.6.2.tar.bz2/plugins/mono2stereo/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/mono2stereo/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/mono2stereo/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/mono2stereo/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/mono2stereo/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/mono2stereo/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/mono2stereo/mono2stereo.c -> deadbeef-1.9.6.tar.bz2/plugins/mono2stereo/mono2stereo.c Changed

@@ -1,6 +1,6 @@
 /*
 Mono to stereo converter DSP plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy 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
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 enum {
 M2S_PARAM_LEFTMIX,
@@ -39,6 +39,8 @@
 ddb_dsp_context_t ctx;
 float leftmix;
 float rightmix;
+ float *buffer;
+ int buffer_nframes;
 } ddb_m2s_t;
 
 ddb_dsp_context_t*
@@ -58,6 +60,7 @@
 ddb_m2s_t *m2s = (ddb_m2s_t *)ctx;
 
 // free instance-specific allocations
+ free (m2s->buffer);
 
 free (m2s);
 }
@@ -67,17 +70,32 @@
 // use this method to flush dsp buffers, reset filters, etc
 }
 
+static void
+_m2s_alloc_buffer (ddb_m2s_t *m2s, int nframes) {
+ if (m2s->buffer_nframes < nframes) {
+ free (m2s->buffer);
+ m2s->buffer = malloc (nframes * 2 * sizeof (float));
+ m2s->buffer_nframes = nframes;
+ }
+}
+
 int
-m2s_process (ddb_dsp_context_t *ctx, float *samples, int nframes, int maxframes, ddb_waveformat_t *fmt, float *r) {
+m2s_process (ddb_dsp_context_t *ctx, float * restrict samples, int nframes, int maxframes, ddb_waveformat_t * restrict fmt, float * restrict r) {
 if (fmt->channels >= 2) {
 return nframes;
 }
 ddb_m2s_t *m2s = (ddb_m2s_t *)ctx;
 
- for (int i = nframes-1; i >= 0; i--) {
- samplesi*2+1 = samplesi * m2s->rightmix;
- samplesi*2+0 = samplesi * m2s->leftmix;
+ _m2s_alloc_buffer(m2s, nframes);
+ float *input = samples;
+ float *output = m2s->buffer;
+ for (int i = 0; i < nframes; i++) {
+ float sample = *input++;
+ *output++ = sample * m2s->leftmix;
+ *output++ = sample * m2s->rightmix;
 }
+ memcpy (samples, m2s->buffer, nframes * 2 * sizeof (float));
+
 fmt->channels = 2;
 fmt->channelmask = 3;
 return nframes;
@@ -132,13 +150,12 @@
 }
 
 static const char settings_dlg =
- "property \"Left mix:\" hscale0,1,0.001 0 1;\n"
- "property \"Right mix:\" hscale0,1,0.001 1 1;\n"
+ "property \"Left mix\" hscale0,1,0.001 0 1;\n"
+ "property \"Right mix\" hscale0,1,0.001 1 1;\n"
 ;
 
 static DB_dsp_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .open = m2s_open,
 .close = m2s_close,
 .process = m2s_process,
@@ -150,7 +167,7 @@
 .plugin.descr = "Mono to stereo converter DSP",
 .plugin.copyright = 
 "Mono to stereo converter DSP plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "This software is provided 'as-is', without any express or implied\n"
 "warranty. In no event will the authors be held liable for any damages\n"

deadbeef-1.9.6.tar.bz2/plugins/mp3 Added

deadbeef-1.9.6.tar.bz2/plugins/mp3/COPYING Added

@@ -0,0 +1,59 @@
+MPEG decoder plugin for DeaDBeeF Player
+Copyright (C) 2009-2014 Oleksiy 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
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+libmad - MPEG audio decoder library
+Copyright (C) 2000-2004 Underbit Technologies, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 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
+
+
+
+libmpg123
+Copyright (c) 1995-2013 by Michael Hipp and others,
+free software under the terms of the LGPL v2.1
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

deadbeef-1.9.6.tar.bz2/plugins/mp3/Makefile.am Added

deadbeef-1.9.6.tar.bz2/plugins/mp3/Makefile.in Added

@@ -0,0 +1,798 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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/mp3
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+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, filesdir }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+@HAVE_MP3_TRUE@mp3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@HAVE_MP3_TRUE@	$(am__DEPENDENCIES_1)
+am__mp3_la_SOURCES_DIST = mp3.c mp3.h mp3parser.c mp3parser.h \
+	mp3_mad.c mp3_mad.h mp3_mpg123.c mp3_mpg123.h
+@HAVE_LIBMAD_TRUE@@HAVE_MP3_TRUE@am__objects_1 = mp3_la-mp3_mad.lo
+@HAVE_LIBMPG123_TRUE@@HAVE_MP3_TRUE@am__objects_2 = \
+@HAVE_LIBMPG123_TRUE@@HAVE_MP3_TRUE@	mp3_la-mp3_mpg123.lo
+@HAVE_MP3_TRUE@am_mp3_la_OBJECTS = mp3_la-mp3.lo mp3_la-mp3parser.lo \
+@HAVE_MP3_TRUE@	$(am__objects_1) $(am__objects_2)
+mp3_la_OBJECTS = $(am_mp3_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+mp3_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mp3_la_CFLAGS) $(CFLAGS) \
+	$(mp3_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_MP3_TRUE@am_mp3_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(mp3_la_SOURCES)
+DIST_SOURCES = $(am__mp3_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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_MP3_TRUE@pkglib_LTLIBRARIES = mp3.la
+@HAVE_LIBMAD_TRUE@@HAVE_MP3_TRUE@SOURCES_LIBMAD = mp3_mad.c mp3_mad.h
+@HAVE_LIBMAD_TRUE@@HAVE_MP3_TRUE@USE_LIBMAD = -DUSE_LIBMAD=1
+@HAVE_LIBMPG123_TRUE@@HAVE_MP3_TRUE@SOURCES_LIBMPG123 = mp3_mpg123.c mp3_mpg123.h
+@HAVE_LIBMPG123_TRUE@@HAVE_MP3_TRUE@USE_LIBMPG123 = -DUSE_LIBMPG123=1
+@HAVE_MP3_TRUE@mp3_la_SOURCES = mp3.c mp3.h mp3parser.c mp3parser.h $(SOURCES_LIBMAD) $(SOURCES_LIBMPG123)
+@HAVE_MP3_TRUE@mp3_la_LDFLAGS = -module -avoid-version
+@HAVE_MP3_TRUE@mp3_la_LIBADD = $(LDADD) $(MAD_LIBS) $(MPG123_LIBS)
+@HAVE_MP3_TRUE@mp3_la_CFLAGS = $(CFLAGS) $(MAD_CFLAGS) $(USE_LIBMAD) $(MPG123_CFLAGS) $(USE_LIBMPG123) -std=c99 -fPIC -I@top_srcdir@/include
+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 --ignore-deps plugins/mp3/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps plugins/mp3/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)
+	@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 " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
+	 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)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+
+mp3.la: $(mp3_la_OBJECTS) $(mp3_la_DEPENDENCIES) $(EXTRA_mp3_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mp3_la_LINK) $(am_mp3_la_rpath) $(mp3_la_OBJECTS) $(mp3_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+mp3_la-mp3.lo: mp3.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mp3_la_CFLAGS) $(CFLAGS) -c -o mp3_la-mp3.lo `test -f 'mp3.c' || echo '$(srcdir)/'`mp3.c
+
+mp3_la-mp3parser.lo: mp3parser.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mp3_la_CFLAGS) $(CFLAGS) -c -o mp3_la-mp3parser.lo `test -f 'mp3parser.c' || echo '$(srcdir)/'`mp3parser.c
+
+mp3_la-mp3_mad.lo: mp3_mad.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mp3_la_CFLAGS) $(CFLAGS) -c -o mp3_la-mp3_mad.lo `test -f 'mp3_mad.c' || echo '$(srcdir)/'`mp3_mad.c
+
+mp3_la-mp3_mpg123.lo: mp3_mpg123.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mp3_la_CFLAGS) $(CFLAGS) -c -o mp3_la-mp3_mpg123.lo `test -f 'mp3_mpg123.c' || echo '$(srcdir)/'`mp3_mpg123.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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 -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 -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 TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am 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 tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/plugins/mp3/mp3.c Added

@@ -0,0 +1,797 @@
+/*
+ MPEG decoder plugin for DeaDBeeF Player
+ Copyright (C) 2009-2014 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
+#include "mp3.h"
+#ifdef USE_LIBMAD
+#include "mp3_mad.h"
+#endif
+#ifdef USE_LIBMPG123
+#include "mp3_mpg123.h"
+#endif
+
+#define trace(...) { deadbeef->log_detailed (&plugin.decoder.plugin, 0, __VA_ARGS__); }
+
+//#define WRITE_DUMP 1
+
+#if WRITE_DUMP
+FILE *out;
+#endif
+
+#define MAX_INVALID_BYTES 100000
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define max(x,y) ((x)>(y)?(x):(y))
+
+#define likely(x) __builtin_expect((x),1)
+#define unlikely(x) __builtin_expect((x),0)
+
+static ddb_decoder2_t plugin;
+DB_functions_t *deadbeef;
+
+static int
+cmp3_seek_sample64 (DB_fileinfo_t *_info, int64_t sample);
+
+int
+cmp3_seek_stream (DB_fileinfo_t *_info, int64_t sample) {
+ mp3_info_t *info = (mp3_info_t *)_info;
+
+#if WRITE_DUMP
+ if (out) {
+ fclose (out);
+ out = fopen ("out.raw", "w+b");
+ }
+#endif
+
+ mp3info_t mp3info;
+ int res = mp3_parse_file(&mp3info, info->mp3flags, info->file, deadbeef->fgetlength(info->file), info->startoffs, info->endoffs, sample);
+
+ if (!res) {
+ deadbeef->fseek (info->file, mp3info.packet_offs, SEEK_SET);
+ info->currentsample = sample;
+ if (sample > mp3info.pcmsample) {
+ info->skipsamples = sample - mp3info.pcmsample;
+ }
+ else {
+ info->skipsamples = 0;
+ }
+ }
+
+
+ return res;
+}
+
+
+static DB_fileinfo_t *
+cmp3_open (uint32_t hints) {
+ mp3_info_t *info = calloc (1, sizeof (mp3_info_t));
+
+ if (hints & DDB_DECODER_HINT_RAW_SIGNAL) {
+ info->raw_signal = 1;
+ }
+
+#ifndef ANDROID // force 16 bit on android
+ if ((hints & DDB_DECODER_HINT_16BIT) || deadbeef->conf_get_int ("mp3.force16bit", 0))
+#endif
+ {
+ info->want_16bit = 1;
+ }
+
+ if (hints & (1UL<<31)) {
+ info->mp3flags |= MP3_PARSE_ESTIMATE_DURATION;
+ }
+ return &info->info;
+}
+
+void
+cmp3_set_extra_properties (DB_playItem_t *it, mp3info_t *mp3info, int fake) {
+ char s100;
+ int64_t size = mp3info->fsize;
+ if (size >= 0) {
+ snprintf (s, sizeof (s), "%lld", (long long)size);
+ deadbeef->pl_replace_meta (it, ":FILE_SIZE", s);
+ }
+ else {
+ deadbeef->pl_replace_meta (it, ":FILE_SIZE", "∞");
+ }
+
+
+ if (mp3info->datasize >= 0 && mp3info->have_duration) {
+ // bitrate from file size
+ double dur = (double)deadbeef->pl_get_item_duration (it);
+ int bitrate = mp3info->datasize * 8 / dur / 1000;
+ snprintf (s, sizeof (s), "%d", bitrate);
+ deadbeef->pl_replace_meta (it, ":BITRATE", s);
+ }
+ else if (mp3info->avg_bitrate > 0) {
+ snprintf (s, sizeof (s), "%d", (int)(mp3info->avg_bitrate/1000));
+ deadbeef->pl_replace_meta (it, ":BITRATE", s);
+ }
+
+ snprintf (s, sizeof (s), "%d", mp3info->ref_packet.nchannels);
+ deadbeef->pl_replace_meta (it, ":CHANNELS", s);
+ snprintf (s, sizeof (s), "%d", mp3info->ref_packet.samplerate);
+ deadbeef->pl_replace_meta (it, ":SAMPLERATE", s);
+
+ // set codec profile (cbr or vbr) and mp3 vbr method (guessed, or from Xing/Info header)
+
+ char codec_profile100;
+ snprintf (codec_profile, sizeof (codec_profile), "MP3 %s", (!mp3info->vbr_type || mp3info->vbr_type == XING_CBR || mp3info->vbr_type == XING_CBR2) ? "CBR" : "VBR");
+ if (mp3info->vbr_type != XING_CBR && mp3info->vbr_type != XING_CBR2 && (mp3info->lamepreset & 0x7ff)) {
+ const static struct {
+ int v;
+ const char *name;
+ } presets = {
+ { 8, "ABR_8" },
+ { 320, "ABR_320" },
+ { 410, "V9" },
+ { 420, "V8" },
+ { 430, "V7" },
+ { 440, "V6" },
+ { 450, "V5" },
+ { 460, "V4" },
+ { 470, "V3" },
+ { 480, "V2" },
+ { 490, "V1" },
+ { 500, "V0" },
+ { 1000, "R3MIX" },
+ { 1001, "STANDARD" },
+ { 1002, "EXTREME" },
+ { 1003, "INSANE" },
+ { 1004, "STANDARD_FAST" },
+ { 1005, "EXTREME_FAST" },
+ { 1006, "MEDIUM" },
+ { 1007, "MEDIUM_FAST" },
+ { 0, NULL },
+ };
+
+ for (int i = 0; presetsi.name; i++) {
+ if (presetsi.v == (mp3info->lamepreset&0x7ff)) {
+ size_t l = strlen (codec_profile);
+ char *preset = codec_profile + l;
+ snprintf (preset, sizeof (codec_profile) - l, " %s", presetsi.name);
+ break;
+ }
+ }
+ }
+
+ deadbeef->pl_replace_meta (it, ":CODEC_PROFILE", codec_profile);
+
+ switch (mp3info->vbr_type) {
+ case XING_ABR:
+ deadbeef->pl_replace_meta (it, ":MP3_VBR_METHOD", "ABR");
+ break;
+ case XING_VBR1:
+ deadbeef->pl_replace_meta (it, ":MP3_VBR_METHOD", "full VBR method 1");
+ break;
+ case XING_VBR2:
+ deadbeef->pl_replace_meta (it, ":MP3_VBR_METHOD", "full VBR method 2");
+ break;
+ case XING_VBR3:
+ deadbeef->pl_replace_meta (it, ":MP3_VBR_METHOD", "full VBR method 3");
+ break;
+ case XING_VBR4:
+ deadbeef->pl_replace_meta (it, ":MP3_VBR_METHOD", "full VBR method 4");
+ break;
+ case XING_ABR2:
+ deadbeef->pl_replace_meta (it, ":MP3_VBR_METHOD", "ABR 2 pass");
+ break;
+ case DETECTED_VBR:
+ deadbeef->pl_replace_meta (it, ":MP3_VBR_METHOD", "unspecified");
+ break;
+ }
+ const char *versions = {"1", "2", "2.5"};
+ snprintf (s, sizeof (s), "MPEG%s layer%d", versionsmp3info->ref_packet.ver-1, mp3info->ref_packet.layer);
+ deadbeef->pl_replace_meta (it, ":MPEG_VERSION", s);
+ deadbeef->pl_replace_meta (it, ":XING_HEADER", mp3info->have_xing_header ? "Yes" : "No");
+ deadbeef->pl_replace_meta (it, fake ? "!FILETYPE" : ":FILETYPE", "MP3");
+}
+
+static int
+_mp3_parse_and_validate (mp3info_t *info, uint32_t flags, DB_FILE *fp, int64_t fsize, int startoffs, int endoffs, int64_t seek_to_sample) {
+ int res = mp3_parse_file(info, flags, fp, fsize, startoffs, endoffs, seek_to_sample);
+ if (res < 0) {
+ return res;
+ }
+
+ if (info->valid_packets == 0) {
+ return -1;
+ }
+
+ if (info->ref_packet.samplerate == 0 || info->ref_packet.nchannels == 0) {
+ return -1;
+ }
+
+ return res;
+}
+
+static int
+cmp3_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ mp3_info_t *info = (mp3_info_t *)_info;
+
+#if defined(USE_LIBMAD) && defined(USE_LIBMPG123)
+ int backend = deadbeef->conf_get_int ("mp3.backend", 0);
+ switch (backend) {
+ case 0:
+ info->dec = &mpg123_api;
+ break;
+ case 1:
+ info->dec = &mad_api;
+ break;
+ default:
+ info->dec = &mpg123_api;
+ break;
+ }
+#else
+#if defined(USE_LIBMAD)
+ info->dec = &mad_api;
+#else
+ info->dec = &mpg123_api;
+#endif
+#endif
+
+ _info->plugin = &plugin.decoder;
+ deadbeef->pl_lock ();
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ info->file = deadbeef->fopen (uri);
+ if (!info->file) {
+ return -1;
+ }
+ deadbeef->fset_track (info->file, it);
+ info->info.file = info->file;
+ deadbeef->pl_item_ref (it);
+ info->it = it;
+ info->info.readpos = 0;
+ if (!info->file->vfs->is_streaming () && !(info->mp3flags & MP3_PARSE_ESTIMATE_DURATION)) {
+ deadbeef->junk_get_tag_offsets (info->file, &info->startoffs, &info->endoffs);
+ if (info->startoffs > 0) {
+ trace ("mp3: skipping %d(%xH) bytes of junk\n", info->startoffs, info->endoffs);
+ }
+ int res = _mp3_parse_and_validate(&info->mp3info, info->mp3flags, info->file, deadbeef->fgetlength(info->file), info->startoffs, info->endoffs, -1);
+ if (res < 0) {
+ trace ("mp3: cmp3_init: initial mp3_parse_file failed\n");
+ return -1;
+ }
+ info->currentsample = info->mp3info.pcmsample;
+
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample (it) + info->mp3info.delay;
+ info->endsample = endsample + info->mp3info.delay;
+ // that comes from cue, don't calc duration, just seek and play
+ }
+ else {
+ ddb_playlist_t *plt = deadbeef->pl_get_playlist (it);
+ int64_t totalsamples = info->mp3info.totalsamples - info->mp3info.delay - info->mp3info.padding;
+ deadbeef->plt_set_item_duration (plt, it, (float)((double)totalsamples/info->mp3info.ref_packet.samplerate));
+ if (plt) {
+ deadbeef->plt_unref (plt);
+ }
+ info->startsample = info->mp3info.delay;
+ info->endsample = info->mp3info.totalsamples-info->mp3info.padding-1;
+ deadbeef->fseek (info->file, info->mp3info.packet_offs, SEEK_SET);
+ }
+ }
+ else {
+ info->startoffs = (uint32_t)deadbeef->junk_get_leading_size(info->file);
+ deadbeef->pl_add_meta (it, "title", NULL);
+ int res = _mp3_parse_and_validate(&info->mp3info, info->mp3flags, info->file, deadbeef->fgetlength(info->file), info->startoffs, 0, -1);
+ if (res < 0) {
+ trace ("mp3: cmp3_init: initial mp3_parse_file failed\n");
+ return -1;
+ }
+
+ ddb_playlist_t *plt = deadbeef->pl_get_playlist (it);
+ info->startsample = info->mp3info.delay;
+ if (info->mp3info.totalsamples >= 0) {
+ deadbeef->plt_set_item_duration (plt, it, (float)((double)info->mp3info.totalsamples/info->mp3info.ref_packet.samplerate));
+ info->endsample = info->mp3info.totalsamples-info->mp3info.padding-1;
+ }
+ else {
+ deadbeef->plt_set_item_duration (plt, it, -1);
+ info->endsample = -1;
+ }
+
+ cmp3_set_extra_properties (it, &info->mp3info, 1);
+
+ if (plt) {
+ deadbeef->plt_unref (plt);
+ }
+ info->skipsamples = 0;
+ info->currentsample = info->mp3info.pcmsample;
+ }
+ if (info->want_16bit && !info->raw_signal) {
+ _info->fmt.bps = 16;
+ _info->fmt.is_float = 0;
+ }
+ else {
+ _info->fmt.bps = 32;
+ _info->fmt.is_float = 1;
+ }
+ _info->fmt.samplerate = info->mp3info.ref_packet.samplerate;
+ _info->fmt.channels = info->mp3info.ref_packet.nchannels;
+ _info->fmt.channelmask = _info->fmt.channels == 1 ? DDB_SPEAKER_FRONT_LEFT : (DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT);
+ trace ("mp3 format: bps:%d sr:%d channels:%d\n", _info->fmt.bps, _info->fmt.samplerate, _info->fmt.channels);
+
+ if (info->want_16bit) {
+ deadbeef->pl_replace_meta (it, ":BPS", "16");
+ }
+ else {
+ deadbeef->pl_replace_meta (it, ":BPS", "32");
+ }
+
+ info->dec->init (info);
+ cmp3_seek_sample64 (_info, 0);
+ return 0;
+}
+
+#if 0
+static void
+dump_buffer (buffer_t *buffer) {
+ printf ("*** DUMP ***\n");
+ printf ("remaining: %d\n", buffer->remaining);
+
+ printf ("readsize: %d\n", buffer->readsize);
+ printf ("decode_remaining: %d\n", buffer->decode_remaining);
+
+ // information, filled by mp3_parse_file
+ printf ("%d\n", buffer->version);
+ printf ("%d\n", buffer->layer);
+ printf ("%d\n", buffer->bitrate);
+ printf ("%d\n", buffer->samplerate);
+ printf ("%d\n", buffer->packetlength);
+ printf ("%d\n", buffer->bitspersample);
+ printf ("%d\n", buffer->channels);
+ printf ("%f\n", buffer->duration);
+
+ printf ("%d\n", buffer->currentsample);
+ printf ("%d\n", buffer->totalsamples);
+ printf ("%d\n", buffer->skipsamples);
+ printf ("%d\n", buffer->startoffset);
+ printf ("%d\n", buffer->endoffset);
+ printf ("%d\n", buffer->startsample);
+ printf ("%d\n", buffer->endsample);
+ printf ("%d\n", buffer->delay);
+ printf ("%d\n", buffer->padding);
+
+ printf ("%f\n", buffer->avg_packetlength);
+ printf ("%d\n", buffer->avg_samplerate);
+ printf ("%d\n", buffer->avg_samples_per_frame);
+ printf ("%d\n", buffer->nframes);
+ printf ("%d\n", buffer->last_comment_update);
+ printf ("%d\n", buffer->vbr);
+ printf ("%d\n", buffer->have_xing_header);
+ printf ("%d\n", buffer->current_decode_frame);
+ printf ("%lld\n", buffer->lastframe_filepos);
+
+ printf ("*** END ***\n");
+}
+#endif
+
+// stream, decode and copy enough samples to fill the output buffer
+// `skipsamples` is accounted for
+static void
+cmp3_decode (mp3_info_t *info) {
+ int eof = 0;
+ while (!eof) {
+ eof = info->dec->decode_next_packet (info);
+ if (info->decoded_samples_remaining > 0) {
+ if (info->skipsamples > 0) {
+ int64_t skip = min (info->skipsamples, info->decoded_samples_remaining);
+ info->skipsamples -= skip;
+ info->decoded_samples_remaining -= skip;
+ }
+ if (info->skipsamples > 0) {
+ continue;
+ }
+ info->dec->consume_decoded_data (info);
+
+ assert (info->bytes_to_decode >= 0);
+ if (info->bytes_to_decode == 0) {
+ return;
+ }
+ }
+ }
+}
+
+static void
+cmp3_free (DB_fileinfo_t *_info) {
+ mp3_info_t *info = (mp3_info_t *)_info;
+ if (info->it) {
+ deadbeef->pl_item_unref (info->it);
+ }
+ if (info->conv_buf) {
+ free (info->conv_buf);
+ }
+ if (info->file) {
+ deadbeef->fclose (info->file);
+ info->file = NULL;
+ info->info.file = NULL;
+ info->dec->free (info);
+ }
+ free (info);
+}
+
+static int
+cmp3_read (DB_fileinfo_t *_info, char *bytes, int size) {
+#if WRITE_DUMP
+ if (!out) {
+ out = fopen ("out.raw", "w+b");
+ }
+#endif
+ int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
+ mp3_info_t *info = (mp3_info_t *)_info;
+ if (!info->file->vfs->is_streaming () && !(info->mp3flags&MP3_PARSE_ESTIMATE_DURATION)) {
+ int64_t curr = info->currentsample;
+ //printf ("curr: %d -> end %d, padding: %d\n", curr, info->endsample, info->padding);
+ if (size / samplesize + curr > info->endsample) {
+ size = (int)((info->endsample - curr + 1) * samplesize);
+ trace ("\0330;32mmp3: size truncated to %d bytes (%d samples), cursample=%d, endsample=%d\03337;0m\n", size, info->endsample - curr + 1, curr, info->endsample);
+ if (size <= 0) {
+ return 0;
+ }
+ }
+ }
+
+ int initsize = size;
+
+ int req_size;
+ if (info->want_16bit && !info->raw_signal) {
+ req_size = size * 2;
+ // decode in 32 bit temp buffer, then convert to 16 below
+ if (info->conv_buf_size < req_size) {
+ info->conv_buf_size = req_size;
+ if (info->conv_buf) {
+ free (info->conv_buf);
+ }
+ info->conv_buf = malloc (info->conv_buf_size);
+ }
+ info->bytes_to_decode = req_size;
+ info->out = info->conv_buf;
+ }
+ else {
+ req_size = size;
+ // decode straight to 32 bit
+ info->bytes_to_decode = size;
+ info->out = bytes;
+ }
+
+ cmp3_decode (info);
+
+ if (!info->raw_signal) {
+ ddb_waveformat_t fmt;
+ memcpy (&fmt, &info->info.fmt, sizeof (fmt));
+ fmt.bps = 32;
+ fmt.is_float = 1;
+
+ // apply replaygain, before clipping
+ deadbeef->replaygain_apply (&fmt, info->want_16bit ? info->conv_buf : bytes, req_size - info->bytes_to_decode);
+
+ // convert to 16 bit, if needed
+ if (info->want_16bit) {
+ int sz = req_size - info->bytes_to_decode;
+ int ret = deadbeef->pcm_convert (&fmt, info->conv_buf, &_info->fmt, bytes, sz);
+ info->bytes_to_decode = size-ret;
+ }
+ }
+
+ info->currentsample += (size - info->bytes_to_decode) / samplesize;
+ _info->readpos = (float)(info->currentsample - info->startsample) / info->mp3info.ref_packet.samplerate;
+#if WRITE_DUMP
+ if (size - info->readsize > 0) {
+ fwrite (bytes, 1, size - info->readsize, out);
+ }
+#endif
+ return initsize - info->bytes_to_decode;
+}
+
+static int
+cmp3_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
+ mp3_info_t *info = (mp3_info_t *)_info;
+ if (!info->file) {
+ return -1;
+ }
+
+ sample += info->startsample;
+ if (sample > info->endsample) {
+ sample = info->endsample;
+ }
+
+
+// {{{ handle net streaming case
+ if (info->file->vfs->is_streaming () || (info->mp3flags & MP3_PARSE_ESTIMATE_DURATION)) {
+ if (info->mp3info.totalsamples > 0 && info->mp3info.avg_samples_per_frame > 0 && info->mp3info.avg_packetlength > 0) { // that means seekable remote stream, like podcast
+ trace ("seeking is possible!\n");
+
+ int r;
+
+ // seek to beginning of the frame
+ int64_t frm = sample / info->mp3info.avg_samples_per_frame;
+ r = deadbeef->fseek (info->file, frm * info->mp3info.avg_packetlength + info->startoffs, SEEK_SET);
+
+ if (r < 0) {
+ trace ("seek failed!\n");
+ return -1;
+ }
+
+ info->skipsamples = sample - frm * info->mp3info.avg_samples_per_frame;
+
+ info->currentsample = sample;
+ _info->readpos = (float)((double)(info->currentsample - info->startsample) / info->mp3info.ref_packet.samplerate);
+
+ info->dec->free (info);
+ info->decoded_samples_remaining = 0;
+ info->dec->init (info);
+ return 0;
+ }
+ trace ("seek is impossible (avg_samples_per_frame=%d, avg_packetlength=%f)!\n", info->mp3info.avg_samples_per_frame, info->mp3info.avg_packetlength);
+ return 0;
+ }
+// }}}
+
+ info->bytes_to_decode = 0;
+ info->decoded_samples_remaining = 0;
+
+ // force flush the decoder by reinitializing it
+ info->dec->free (info);
+
+// struct timeval tm1;
+// gettimeofday (&tm1, NULL);
+ if (cmp3_seek_stream (_info, sample) == -1) {
+ trace ("failed to seek to sample %d\n", sample);
+ _info->readpos = 0;
+ return -1;
+ }
+
+ info->dec->init (info);
+
+// struct timeval tm2;
+// gettimeofday (&tm2, NULL);
+// int ms = (tm2.tv_sec*1000+tm2.tv_usec/1000) - (tm1.tv_sec*1000+tm1.tv_usec/1000);
+// printf ("mp3_parse_file took %d ms\n", ms);
+	trace ("seeked to %d\n", info->currentsample);
+ _info->readpos = (float)(info->currentsample - info->startsample) / info->mp3info.ref_packet.samplerate;
+ return 0;
+}
+
+static int
+cmp3_seek_sample (DB_fileinfo_t *_info, int sample) {
+ return cmp3_seek_sample64(_info, sample);
+}
+
+static int
+cmp3_seek (DB_fileinfo_t *_info, float time) {
+ mp3_info_t *info = (mp3_info_t *)_info;
+ int64_t sample = (double)time * (int64_t)info->mp3info.ref_packet.samplerate;
+ return cmp3_seek_sample64 (_info, sample);
+}
+
+static DB_playItem_t *
+cmp3_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+ trace ("cmp3_insert %s\n", fname);
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
+ trace ("failed to open file %s\n", fname);
+ return NULL;
+ }
+ if (fp->vfs->is_streaming ()) {
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
+ deadbeef->fclose (fp);
+ deadbeef->pl_add_meta (it, "title", NULL);
+ deadbeef->plt_set_item_duration (plt, it, -1);
+ after = deadbeef->plt_insert_item (plt, after, it);
+ deadbeef->pl_item_unref (it);
+ return after;
+ }
+
+ uint32_t start;
+ uint32_t end;
+ deadbeef->junk_get_tag_offsets (fp, &start, &end);
+
+ mp3info_t mp3info;
+
+ uint64_t fsize = deadbeef->fgetlength(fp);
+ uint32_t mp3flags = 0;
+ if (fp->vfs->is_streaming () && fsize >= 0) {
+ mp3flags = MP3_PARSE_ESTIMATE_DURATION;
+ }
+
+ int res = _mp3_parse_and_validate(&mp3info, mp3flags, fp, fsize, start, end, -1);
+
+ if (res < 0) {
+ trace ("mp3: mp3_parse_file returned error\n");
+ deadbeef->fclose (fp);
+ return NULL;
+ }
+
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
+
+ deadbeef->rewind (fp);
+ // reset tags
+ uint32_t f = deadbeef->pl_get_item_flags (it);
+ f &= ~DDB_TAG_MASK;
+ deadbeef->pl_set_item_flags (it, f);
+ /*int apeerr = */deadbeef->junk_apev2_read (it, fp);
+ /*int v2err = */deadbeef->junk_id3v2_read (it, fp);
+ /*int v1err = */deadbeef->junk_id3v1_read (it, fp);
+ deadbeef->pl_set_meta_int (it, ":MP3_DELAY", mp3info.delay);
+ deadbeef->pl_set_meta_int (it, ":MP3_PADDING", mp3info.padding);
+
+ deadbeef->plt_set_item_duration (plt, it, (float)((double)mp3info.totalsamples/mp3info.ref_packet.samplerate));
+
+ cmp3_set_extra_properties (it, &mp3info, 0);
+
+ deadbeef->fclose (fp);
+
+ DB_playItem_t *cue = deadbeef->plt_process_cue (plt, after, it, mp3info.totalsamples-mp3info.delay-mp3info.padding, mp3info.ref_packet.samplerate);
+ if (cue) {
+ deadbeef->pl_item_unref (it);
+ return cue;
+ }
+
+ after = deadbeef->plt_insert_item (plt, after, it);
+ deadbeef->pl_item_unref (it);
+ return after;
+}
+
+int
+cmp3_read_metadata (DB_playItem_t *it) {
+ deadbeef->pl_lock ();
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
+ if (!fp) {
+ return -1;
+ }
+ deadbeef->pl_delete_all_meta (it);
+ // FIXME: reload and apply the Xing header
+ /*int apeerr = */deadbeef->junk_apev2_read (it, fp);
+ /*int v2err = */deadbeef->junk_id3v2_read (it, fp);
+ /*int v1err = */deadbeef->junk_id3v1_read (it, fp);
+ deadbeef->pl_add_meta (it, "title", NULL);
+ deadbeef->fclose (fp);
+ return 0;
+}
+
+int
+cmp3_write_metadata (DB_playItem_t *it) {
+ // get options
+
+ int strip_id3v2 = deadbeef->conf_get_int ("mp3.strip_id3v2", 0);
+ int strip_id3v1 = deadbeef->conf_get_int ("mp3.strip_id3v1", 0);
+ int strip_apev2 = deadbeef->conf_get_int ("mp3.strip_apev2", 0);
+ int write_id3v2 = deadbeef->conf_get_int ("mp3.write_id3v2", 1);
+ int write_id3v1 = deadbeef->conf_get_int ("mp3.write_id3v1", 1);
+ int write_apev2 = deadbeef->conf_get_int ("mp3.write_apev2", 0);
+
+ uint32_t junk_flags = 0;
+ if (strip_id3v2) {
+ junk_flags |= JUNK_STRIP_ID3V2;
+ }
+ if (strip_id3v1) {
+ junk_flags |= JUNK_STRIP_ID3V1;
+ }
+ if (strip_apev2) {
+ junk_flags |= JUNK_STRIP_APEV2;
+ }
+ if (write_id3v2) {
+ junk_flags |= JUNK_WRITE_ID3V2;
+ }
+ if (write_id3v1) {
+ junk_flags |= JUNK_WRITE_ID3V1;
+ }
+ if (write_apev2) {
+ junk_flags |= JUNK_WRITE_APEV2;
+ }
+
+ int id3v2_version = deadbeef->conf_get_int ("mp3.id3v2_version", 3);
+ if (id3v2_version != 3 && id3v2_version != 4) {
+ id3v2_version = 3;
+ }
+ char id3v1_encoding50;
+ deadbeef->conf_get_str ("mp3.id3v1_encoding", "cp1252", id3v1_encoding, sizeof (id3v1_encoding));
+ return deadbeef->junk_rewrite_tags (it, junk_flags, id3v2_version, id3v1_encoding);
+}
+
+static const char *exts = {
+	"mp1", "mp2", "mp3", "mpga", NULL
+};
+
+static const char settings_dlg =
+ "property \"Force 16 bit output\" checkbox mp3.force16bit 0;\n"
+#if defined(USE_LIBMAD) && defined(USE_LIBMPG123)
+ "property \"Backend\" select2 mp3.backend 0 mpg123 mad;\n"
+#endif
+;
+
+// define plugin interface
+static ddb_decoder2_t plugin = {
+ .decoder.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .decoder.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .decoder.plugin.version_major = 1,
+ .decoder.plugin.version_minor = 0,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_REPLAYGAIN|DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.id = "stdmpg",
+ .decoder.plugin.name = "MP3 player",
+ .decoder.plugin.descr = "MPEG v1/2 layer1/2/3 decoder\n\n"
+#if defined(USE_LIBMPG123) && defined(USE_LIBMAD)
+ "Can use libmad and libmpg123 backends.\n"
+ "Changing the backend will take effect when the next track starts.\n"
+#elif defined(USE_LIBMAD)
+ "Using libmad backend.\n"
+#elif defined(USE_LIBMPG123)
+ "Using libmpg123 backend.\n"
+#endif
+ ,
+ .decoder.plugin.copyright =
+ "MPEG decoder plugin for DeaDBeeF Player\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\n"
+ "\n"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\n"
+ "\n"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\n"
+ "\n"
+ "3. This notice may not be removed or altered from any source distribution.\n"
+ ,
+ .decoder.plugin.website = "http://deadbeef.sf.net",
+ .decoder.plugin.configdialog = settings_dlg,
+ .decoder.open = cmp3_open,
+ .decoder.init = cmp3_init,
+ .decoder.free = cmp3_free,
+ .decoder.read = cmp3_read,
+ .decoder.seek = cmp3_seek,
+ .decoder.seek_sample = cmp3_seek_sample,
+ .decoder.insert = cmp3_insert,
+ .decoder.read_metadata = cmp3_read_metadata,
+ .decoder.write_metadata = cmp3_write_metadata,
+ .decoder.exts = exts,
+ .seek_sample64 = cmp3_seek_sample64,
+};
+
+DB_plugin_t *
+mp3_load (DB_functions_t *api) {
+ deadbeef = api;
+ return DB_PLUGIN (&plugin);
+}

deadbeef-1.9.6.tar.bz2/plugins/mp3/mp3.h Added

@@ -0,0 +1,111 @@
+/*
+ MPEG decoder plugin for DeaDBeeF Player
+ Copyright (C) 2009-2014 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+#ifndef deadbeef_mp3_h
+#define deadbeef_mp3_h
+
+#include <deadbeef/deadbeef.h>
+
+#ifdef USE_LIBMAD
+#include <mad.h>
+#endif
+#ifdef USE_LIBMPG123
+#include <mpg123.h>
+#endif
+
+#include "mp3parser.h"
+
+extern DB_functions_t *deadbeef;
+
+#define READBUFFER 0x2800 // 10k is enough for single frame
+
+struct mp3_decoder_api_s;
+
+typedef struct {
+ DB_fileinfo_t info;
+
+ uint32_t startoffs;
+ uint32_t endoffs;
+
+ int64_t startsample;
+ int64_t endsample;
+
+ mp3info_t mp3info;
+ uint32_t mp3flags; // extra flags to pass to mp3parser
+
+ int64_t currentsample;
+ int64_t skipsamples; // how many samples to skip after seek, usually "seek_sample - mp3info.pcmsample"
+
+ DB_FILE *file;
+ DB_playItem_t *it;
+
+ // output buffer, supplied by player
+ int bytes_to_decode; // how many bytes is asked to be written to `out`
+ int decoded_samples_remaining; // number of samples left of current decoded mpeg frame
+ char *out;
+
+ // temp buffer for 32bit decoding, before converting to 16 bit
+ char *conv_buf;
+ int conv_buf_size;
+
+ char inputREADBUFFER; // input buffer, for MPEG data
+
+ union {
+#ifdef USE_LIBMAD
+ struct {
+ struct mad_stream mad_stream;
+ struct mad_frame mad_frame;
+ struct mad_synth mad_synth;
+ long input_remaining_bytes;
+ };
+#endif
+#ifdef USE_LIBMPG123
+ struct {
+ mpg123_handle *mpg123_handle;
+ int mpg123_status;
+ unsigned char *mpg123_audio;
+ int total_decoded_samples;
+ };
+#endif
+ };
+
+ int want_16bit;
+ int raw_signal;
+ struct mp3_decoder_api_s *dec;
+} mp3_info_t;
+
+typedef struct mp3_decoder_api_s {
+ // initialize the decoder, get ready to receive/decode packets
+ void (*init)(mp3_info_t *info);
+
+ // free the decoder
+ void (*free)(mp3_info_t *info);
+
+ // consume decoded samples into output buffer
+ void (*consume_decoded_data)(mp3_info_t *info);
+
+ // read and decode a single mpeg frame, only if `decoded_samples_remaining` is <=0
+ // return 1 if eof
+ int (*decode_next_packet)(mp3_info_t *info);
+} mp3_decoder_api_t;
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/mp3/mp3_mad.c Added

@@ -0,0 +1,287 @@
+/*
+ MPEG decoder plugin for DeaDBeeF Player
+ Copyright (C) 2009-2014 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include <string.h>
+#include "mp3_mad.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+#define min(x,y) ((x)<(y)?(x):(y))
+
+void
+mp3_mad_init (mp3_info_t *info) {
+ mad_stream_init(&info->mad_stream);
+ mad_stream_options (&info->mad_stream, MAD_OPTION_IGNORECRC);
+ mad_frame_init(&info->mad_frame);
+ mad_synth_init(&info->mad_synth);
+ info->input_remaining_bytes = 0;
+}
+
+void
+mp3_mad_free (mp3_info_t *info) {
+ mad_synth_finish (&info->mad_synth);
+ mad_frame_finish (&info->mad_frame);
+ mad_stream_finish (&info->mad_stream);
+}
+
+#if 0
+/****************************************************************************
+ * Converts a sample from libmad's fixed point number format to a signed	*
+ * short (16 bits).															*
+ ****************************************************************************/
+static inline int16_t
+MadFixedToSshort(mad_fixed_t Fixed)
+{
+ /* A fixed point number is formed of the following bit pattern:
+ *
+ * SWWWFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+ * MSB LSB
+ * S ==> Sign (0 is positive, 1 is negative)
+ * W ==> Whole part bits
+ * F ==> Fractional part bits
+ *
+ * This pattern contains MAD_F_FRACBITS fractional bits, one
+ * should alway use this macro when working on the bits of a fixed
+ * point number. It is not guaranteed to be constant over the
+ * different platforms supported by libmad.
+ *
+ * The signed short value is formed, after clipping, by the least
+ * significant whole part bit, followed by the 15 most significant
+ * fractional part bits. Warning: this is a quick and dirty way to
+ * compute the 16-bit number, madplay includes much better
+ * algorithms.
+ */
+
+ /* Clipping */
+ if(Fixed>=MAD_F_ONE)
+ return(32767);
+ if(Fixed<=-MAD_F_ONE)
+ return(-32768);
+
+ /* Conversion. */
+ Fixed=Fixed>>(MAD_F_FRACBITS-15);
+ return((signed short)Fixed);
+}
+#endif
+
+static inline float
+MadFixedToFloat (mad_fixed_t Fixed) {
+ return (float)((Fixed) / (float)(1L << MAD_F_FRACBITS));
+}
+
+#define MadErrorString(x) mad_stream_errorstr(x)
+
+#if 0
+static void
+mp3_mad_decode_int16 (mp3_info_t *info) {
+ // copy synthesized samples into readbuffer
+ int idx = info->mad_synth.pcm.length-info->decoded_samples_remaining;
+ // stereo
+ if (MAD_NCHANNELS(&info->mad_frame.header) == 2 && info->info.fmt.channels == 2) {
+ while (info->decoded_samples_remaining > 0 && info->bytes_to_decode > 0) {
+ *((int16_t*)info->out) = MadFixedToSshort (info->mad_synth.pcm.samples0idx);
+ info->bytes_to_decode -= 2;
+ info->out += 2;
+ *((int16_t*)info->out) = MadFixedToSshort (info->mad_synth.pcm.samples1idx);
+ info->bytes_to_decode -= 2;
+ info->out += 2;
+ info->decoded_samples_remaining--;
+ idx++;
+ }
+ }
+ // mono
+ else if (MAD_NCHANNELS(&info->mad_frame.header) == 1 && info->info.fmt.channels == 1){
+ while (info->decoded_samples_remaining > 0 && info->bytes_to_decode > 0) {
+ *((int16_t*)info->out) = MadFixedToSshort (info->mad_synth.pcm.samples0idx);
+ info->bytes_to_decode -= 2;
+ info->out += 2;
+ info->decoded_samples_remaining--;
+ idx++;
+ }
+ }
+ // workaround for bad mp3s that have both mono and stereo frames
+ else if (MAD_NCHANNELS(&info->mad_frame.header) == 1 && info->info.fmt.channels == 2) {
+ while (info->decoded_samples_remaining > 0 && info->bytes_to_decode > 0) {
+ int16_t sample = MadFixedToSshort (info->mad_synth.pcm.samples0idx);
+ *((int16_t*)info->out) = sample;
+ info->bytes_to_decode -= 2;
+ info->out += 2;
+ *((int16_t*)info->out) = sample;
+ info->bytes_to_decode -= 2;
+ info->out += 2;
+ info->decoded_samples_remaining--;
+ idx++;
+ }
+ }
+ else if (MAD_NCHANNELS(&info->mad_frame.header) == 2 && info->info.fmt.channels == 1) {
+ while (info->decoded_samples_remaining > 0 && info->bytes_to_decode > 0) {
+ int16_t sample = MadFixedToSshort (info->mad_synth.pcm.samples0idx);
+ *((int16_t*)info->out) = sample;
+ info->bytes_to_decode -= 2;
+ info->out += 2;
+ info->decoded_samples_remaining--;
+ idx++;
+ }
+ }
+}
+#endif
+
+void
+mp3_mad_consume_decoded_data (mp3_info_t *info) {
+ // copy synthesized samples into readbuffer
+ int idx = info->mad_synth.pcm.length-info->decoded_samples_remaining;
+ // stereo
+ if (MAD_NCHANNELS(&info->mad_frame.header) == 2 && info->info.fmt.channels == 2) {
+ while (info->decoded_samples_remaining > 0 && info->bytes_to_decode > 0) {
+ *((float*)info->out) = MadFixedToFloat (info->mad_synth.pcm.samples0idx);
+ info->bytes_to_decode -= 4;
+ info->out += 4;
+ *((float*)info->out) = MadFixedToFloat (info->mad_synth.pcm.samples1idx);
+ info->bytes_to_decode -= 4;
+ info->out += 4;
+ info->decoded_samples_remaining--;
+ idx++;
+ }
+ }
+ // mono
+ else if (MAD_NCHANNELS(&info->mad_frame.header) == 1 && info->info.fmt.channels == 1){
+ while (info->decoded_samples_remaining > 0 && info->bytes_to_decode > 0) {
+ *((float*)info->out) = MadFixedToFloat (info->mad_synth.pcm.samples0idx);
+ info->bytes_to_decode -= 4;
+ info->out += 4;
+ info->decoded_samples_remaining--;
+ idx++;
+ }
+ }
+ // workaround for bad mp3s that have both mono and stereo frames
+ else if (MAD_NCHANNELS(&info->mad_frame.header) == 1 && info->info.fmt.channels == 2) {
+ while (info->decoded_samples_remaining > 0 && info->bytes_to_decode > 0) {
+ int16_t sample = MadFixedToFloat (info->mad_synth.pcm.samples0idx);
+ *((float*)info->out) = sample;
+ info->bytes_to_decode -= 4;
+ info->out += 4;
+ *((float*)info->out) = sample;
+ info->bytes_to_decode -= 4;
+ info->out += 4;
+ info->decoded_samples_remaining--;
+ idx++;
+ }
+ }
+ else if (MAD_NCHANNELS(&info->mad_frame.header) == 2 && info->info.fmt.channels == 1) {
+ while (info->decoded_samples_remaining > 0 && info->bytes_to_decode > 0) {
+ float sample = MadFixedToFloat (info->mad_synth.pcm.samples0idx);
+ *((float*)info->out) = sample;
+ info->bytes_to_decode -= 4;
+ info->out += 4;
+ info->decoded_samples_remaining--;
+ idx++;
+ }
+ }
+}
+
+int
+mp3_mad_decode_next_packet (mp3_info_t *info) {
+ int eof = 0;
+ while (!eof && (info->mad_stream.buffer == NULL || info->decoded_samples_remaining <= 0)) {
+ // read more MPEG data if needed
+ if(info->mad_stream.buffer==NULL || info->mad_stream.error==MAD_ERROR_BUFLEN) {
+ // copy part of last frame to beginning
+ if (info->mad_stream.next_frame && info->mad_stream.bufend <= info->mad_stream.next_frame) {
+ eof = 1;
+ break;
+ }
+ if (info->mad_stream.next_frame != NULL) {
+ info->input_remaining_bytes = info->mad_stream.bufend - info->mad_stream.next_frame;
+ memmove (info->input, info->mad_stream.next_frame, info->input_remaining_bytes);
+ }
+ long size = READBUFFER - info->input_remaining_bytes;
+ size_t bytesread = 0;
+ uint8_t *bytes = (uint8_t *)(info->input + info->input_remaining_bytes);
+ bytesread = deadbeef->fread (bytes, 1, size, info->file);
+ if (!bytesread) {
+ // add guard
+ eof = 1;
+ memset (bytes, 0, 8);
+ bytesread = 8;
+ }
+ if (bytesread < size) {
+ // end of file
+ bytes += bytesread;
+ }
+ bytesread += info->input_remaining_bytes;
+ mad_stream_buffer(&info->mad_stream,(const unsigned char *)info->input,bytesread);
+ if (info->mad_stream.buffer==NULL) {
+ // check sync bits
+ if (bytes0 != 0xff || (bytes1&(3<<5)) != (3<<5)) {
+ trace ("mp3: read didn't start at frame boundary!\ncmp3_scan_stream is broken\n");
+ }
+ else {
+ trace ("mp3: streambuffer=NULL\n");
+ }
+ }
+ }
+ info->mad_stream.error=0;
+
+ // decode next frame
+ retry:
+ if(mad_frame_decode(&info->mad_frame, &info->mad_stream))
+ {
+ if(MAD_RECOVERABLE(info->mad_stream.error))
+ {
+ // MAD_ERROR_BADDATAPTR is reported when bit reservoir doesn't have enough data from previous frames,
+ // however we want to synth those frames anyway.
+ // For any other recoverable errors, just rerun mad_frame_decode.
+ if (info->mad_stream.error != MAD_ERROR_BADDATAPTR) {
+ goto retry;
+ }
+ }
+ else {
+ if(info->mad_stream.error==MAD_ERROR_BUFLEN) {
+ continue;
+ }
+ else
+ {
+ return -1; // fatal error
+ }
+ }
+ }
+ mad_synth_frame(&info->mad_synth,&info->mad_frame);
+
+ info->info.fmt.samplerate = info->mad_frame.header.samplerate;
+
+ // synthesize single frame
+ info->decoded_samples_remaining = info->mad_synth.pcm.length;
+ deadbeef->streamer_set_bitrate ((int)(info->mad_frame.header.bitrate/1000));
+ break;
+ }
+ 
+ return eof;
+}
+
+mp3_decoder_api_t mad_api = {
+ .init = mp3_mad_init,
+ .free = mp3_mad_free,
+ .consume_decoded_data = mp3_mad_consume_decoded_data,
+ .decode_next_packet = mp3_mad_decode_next_packet,
+};

deadbeef-1.9.6.tar.bz2/plugins/mp3/mp3_mad.h Added

@@ -0,0 +1,31 @@
+/*
+ MPEG decoder plugin for DeaDBeeF Player
+ Copyright (C) 2009-2014 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef __deadbeef__mp3_mad__
+#define __deadbeef__mp3_mad__
+
+#include "mp3.h"
+
+extern mp3_decoder_api_t mad_api;
+
+#endif /* defined(__deadbeef__mp3_mad__) */

deadbeef-1.9.6.tar.bz2/plugins/mp3/mp3_mpg123.c Added

@@ -0,0 +1,135 @@
+/*
+ MPEG decoder plugin for DeaDBeeF Player
+ Copyright (C) 2009-2014 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include <string.h>
+#include "mp3_mpg123.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define max(x,y) ((x)>(y)?(x):(y))
+
+void
+mp3_mpg123_init (mp3_info_t *info) {
+ int ret;
+ mpg123_init();
+ info->mpg123_handle = mpg123_new (NULL, &ret);
+// ret = mpg123_param (info->mpg123_handle, MPG123_VERBOSE, 2, 0);
+ ret = mpg123_format_none (info->mpg123_handle);
+// ret = mpg123_param (info->mpg123_handle, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS, 0);
+ ret = mpg123_param (info->mpg123_handle, MPG123_FLAGS, MPG123_QUIET, 0);
+ ret = mpg123_format (info->mpg123_handle, info->info.fmt.samplerate, MPG123_MONO | MPG123_STEREO, MPG123_ENC_FLOAT_32);
+ ret = mpg123_param (info->mpg123_handle, MPG123_FORCE_RATE, info->info.fmt.samplerate, 0);
+ ret = mpg123_open_feed (info->mpg123_handle);
+
+ info->mpg123_status = MPG123_NEED_MORE;
+}
+
+void
+mp3_mpg123_free (mp3_info_t *info) {
+ if (info->mpg123_handle) {
+ mpg123_delete (info->mpg123_handle);
+ info->mpg123_handle = NULL;
+ }
+ info->mpg123_status = MPG123_NEED_MORE;
+// mpg123_exit();
+}
+
+void
+mp3_mpg123_consume_decoded_data (mp3_info_t *info) {
+ int samplesize = (info->info.fmt.bps>>3)*info->info.fmt.channels;
+ unsigned char *dataptr = info->mpg123_audio + (info->total_decoded_samples - info->decoded_samples_remaining) * samplesize;
+ int bytes = info->decoded_samples_remaining * samplesize;
+ bytes = min (bytes, info->bytes_to_decode);
+ memcpy (info->out, dataptr, bytes);
+ info->out += bytes;
+ info->bytes_to_decode -= bytes;
+ info->decoded_samples_remaining -= bytes / samplesize;
+}
+
+int
+mp3_mpg123_decode_next_packet (mp3_info_t *info) {
+ int eof = 0;
+ while (!eof && (info->decoded_samples_remaining <= 0)) {
+ if (info->mpg123_status == MPG123_NEED_MORE) {
+ size_t bytesread = 0;
+ bytesread = deadbeef->fread (info->input, 1, READBUFFER, info->file);
+ if (!bytesread) {
+ // add guard
+ eof = 1;
+ memset (info->input, 0, 8);
+ bytesread = 8;
+ }
+ info->mpg123_status = mpg123_feed (info->mpg123_handle, (const uint8_t *)info->input, bytesread);
+
+ if (info->mpg123_status == MPG123_ERR || info->mpg123_status == MPG123_NEED_MORE) {
+ continue;
+ }
+ }
+
+ off_t num;
+ unsigned char *audio;
+ size_t nbytes;
+ for (;;) {
+ info->mpg123_status = mpg123_decode_frame (info->mpg123_handle, &num, &audio, &nbytes);
+ if (info->mpg123_status == MPG123_NEW_FORMAT) {
+ long rate;
+ int channels, enc;
+ mpg123_getformat (info->mpg123_handle, &rate, &channels, &enc);
+ info->info.fmt.samplerate = (int)rate;
+ info->info.fmt.channels = channels;
+ continue;
+ }
+ else if (info->mpg123_status != MPG123_OK) {
+ break;
+ }
+
+ break;
+ }
+ if (info->mpg123_status != MPG123_OK) {
+ continue;
+ }
+
+ // synthesize single frame
+ int samplesize = (info->info.fmt.bps>>3)*info->info.fmt.channels;
+ info->total_decoded_samples = info->decoded_samples_remaining = (int)nbytes/samplesize;
+ info->mpg123_audio = audio;
+
+ // NOTE: calling frame_bitrate directly would be much faster, but the API is private,
+ // and mpg123_frameinfo struct is opaque, so we can't even get the parameters directly
+ struct mpg123_frameinfo inf;
+ mpg123_info (info->mpg123_handle, &inf);
+ deadbeef->streamer_set_bitrate (inf.bitrate);
+ break;
+ }
+
+ return eof;
+}
+
+mp3_decoder_api_t mpg123_api = {
+ .init = mp3_mpg123_init,
+ .free = mp3_mpg123_free,
+ .consume_decoded_data = mp3_mpg123_consume_decoded_data,
+ .decode_next_packet = mp3_mpg123_decode_next_packet,
+};

deadbeef-1.9.6.tar.bz2/plugins/mp3/mp3_mpg123.h Added

@@ -0,0 +1,31 @@
+/*
+ MPEG decoder plugin for DeaDBeeF Player
+ Copyright (C) 2009-2014 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#ifndef __deadbeef__mp3_mpg123__
+#define __deadbeef__mp3_mpg123__
+
+#include "mp3.h"
+
+extern mp3_decoder_api_t mpg123_api;
+
+#endif /* defined(__deadbeef__mp3_mpg123__) */

deadbeef-1.9.6.tar.bz2/plugins/mp3/mp3parser.c Added

@@ -0,0 +1,670 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2018 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "mp3parser.h"
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <math.h>
+#include <sys/time.h>
+
+//#define PERFORMANCE_STATS 1
+
+extern DB_functions_t *deadbeef;
+
+#define MIN_PACKET_SAMPLES 384
+#define MAX_PACKET_SAMPLES 1152
+#define MAX_BITRATE 320
+#define MIN_BITRATE 8
+#define MIN_SAMPLERATE 8000
+#define MAX_SAMPLERATE 48000
+#define MIN_PACKET_LENGTH (MIN_PACKET_SAMPLES / 8 * MIN_BITRATE*1000 / MAX_SAMPLERATE)
+#define MAX_PACKET_LENGTH 1441
+#define MAX_INVALID_BYTES 1000000
+#define MAX_INVALID_BYTES_STREAM 1000
+#define MAX_FREEFORMAT_PACKETS 10
+
+static const int vertbl = {3, -1, 2, 1}; // 3 is 2.5
+static const int ltbl = { -1, 3, 2, 1 };
+
+// samplerate
+static const int srtable34 = {
+ {44100, 48000, 32000, -1},
+ {22050, 24000, 16000, -1},
+ {11025, 12000, 8000, -1},
+};
+
+static const int chantbl4 = { 2, 2, 2, 1 };
+
+// bitrate
+static const int brtable516 = {
+ { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, -1 },
+ { 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, -1 },
+ { 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, -1 },
+ { 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, -1 },
+ { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, -1 }
+};
+
+// xing header flags
+#define FRAMES_FLAG 0x0001
+#define BYTES_FLAG 0x0002
+#define TOC_FLAG 0x0004
+#define VBR_SCALE_FLAG 0x0008
+
+// -1 recoverable failure
+// -2 freeformat (bitrate=0) stream detected
+static int
+_parse_packet (mp3packet_t * restrict packet, uint8_t * restrict fb) {
+ memset (packet, 0, sizeof (mp3packet_t));
+ uint32_t hdr;
+ uint8_t sync;
+
+ sync = fb0;
+ if (sync != 0xff) {
+ return -1;
+ }
+ else {
+ // 2nd sync byte
+ sync = fb1;
+ if ((sync >> 5) != 7) {
+ return -1;
+ }
+ }
+ // found frame
+ hdr = 0xff000000 | (sync << 16);
+ sync = fb2;
+ hdr |= sync << 8;
+ sync = fb3;
+ hdr |= sync;
+
+ // parse header
+
+ // sync bits
+ int usync = hdr & 0xffe00000;
+ if (usync != 0xffe00000) {
+ fprintf (stderr, "fatal error: mp3 header parser is broken\n");
+ }
+
+ // mpeg version
+ packet->ver = (hdr & (3<<19)) >> 19;
+ packet->ver = vertblpacket->ver;
+ if (packet->ver < 0) {
+ // trace ("frame %d bad mpeg version %d\n", nframe, (hdr & (3<<19)) >> 19);
+ return -1;
+ }
+
+ // layer info
+ packet->layer = (hdr & (3<<17)) >> 17;
+ packet->layer = ltblpacket->layer;
+ if (packet->layer < 0) {
+ // trace ("frame %d bad layer %d\n", nframe, (hdr & (3<<17)) >> 17);
+ return -1;
+ }
+
+ // protection bit (crc)
+ // int prot = (hdr & (1<<16)) >> 16;
+
+ packet->bitrate = (hdr & (0x0f<<12)) >> 12;
+ int idx = 0;
+ if (packet->ver == 1) {
+ idx = packet->layer - 1;
+ }
+ else {
+ idx = packet->layer == 1 ? 3 : 4;
+ }
+ if (packet->bitrate == 0) {
+ return -2; // freeformat not supported
+ }
+ packet->bitrate = brtableidxpacket->bitrate;
+ if (packet->bitrate <= 0) {
+ // trace ("frame %d bad bitrate %d\n", nframe, (hdr & (0x0f<<12)) >> 12);
+ return -1;
+ }
+
+ packet->samplerate = (hdr & (0x03<<10))>>10;
+ packet->samplerate = srtablepacket->ver-1packet->samplerate;
+ if (packet->samplerate < 0) {
+ // trace ("frame %d bad samplerate %d\n", nframe, (hdr & (0x03<<10))>>10);
+ return -1;
+ }
+
+ // padding
+ int padding = (hdr & (0x1 << 9)) >> 9;
+
+ packet->nchannels = (hdr & (0x3 << 6)) >> 6;
+ packet->nchannels = chantblpacket->nchannels;
+
+ // check if channel/bitrate combination is valid for layer2
+ if (packet->layer == 2) {
+ if ((packet->bitrate <= 56 || packet->bitrate == 80) && packet->nchannels != 1) {
+ // trace ("mp3: bad frame %d: layer %d, channels %d, bitrate %d\n", nframe, layer, nchannels, bitrate);
+ return -1;
+ }
+ if (packet->bitrate >= 224 && packet->nchannels == 1) {
+ // trace ("mp3: bad frame %d: layer %d, channels %d, bitrate %d\n", nframe, layer, nchannels, bitrate);
+ return -1;
+ }
+ }
+
+ // get side info ptr
+ // uint8_t *si = fb + 4;
+ // if (prot) {
+ // si += 2;
+ // }
+ // int data_ptr = ((uint16_t)si1) | (((uint16_t)si1&0)<<8);
+
+ // calc packet length, number of samples in a frame
+ // packetlength
+ packet->packetlength = 0;
+ packet->bitrate *= 1000;
+ packet->samples_per_frame = 0;
+ if (packet->samplerate > 0 && packet->bitrate > 0) {
+ if (packet->layer == 1) {
+ packet->samples_per_frame = 384;
+ }
+ else if (packet->layer == 2) {
+ packet->samples_per_frame = 1152;
+ }
+ else if (packet->layer == 3) {
+ if (packet->ver == 1) {
+ packet->samples_per_frame = 1152;
+ }
+ else {
+ packet->samples_per_frame = 576;
+ }
+ }
+ else {
+ return -1;
+ }
+ packet->packetlength = packet->samples_per_frame / 8 * packet->bitrate / packet->samplerate + padding;
+ if (packet->packetlength > MAX_PACKET_LENGTH) {
+ return -1;
+ }
+ }
+ else {
+ return -1;
+ }
+
+ return packet->packetlength;
+}
+
+#define READ_UINT8() ({if (buffer_size < 1) return -1; uint8_t _temp8 = *buffer; buffer++; buffer_size--; _temp8;})
+#define READ_UINT32() ({if (buffer_size < 4) return -1; uint32_t _temp32 = (uint32_t)buffer3 | ((uint32_t)buffer2<<8) | ((uint32_t)buffer1<<16) | ((uint32_t)buffer0<<24); buffer+=4; buffer_size-=4; _temp32;})
+
+static int
+_check_xing_header (mp3info_t *info, mp3packet_t *packet, uint8_t *buffer, int buffer_size) {
+ const char cookieXing = "Xing";
+ const char cookieInfo = "Info";
+
+ // ignore mpeg version, and try both 17 and 32 byte offsets
+ buffer += 17;
+ buffer_size -= 17;
+ if (buffer_size < 4) {
+ return -1;
+ }
+
+ int havecookie = !memcmp (cookieXing, buffer, 4) || !memcmp (cookieInfo, buffer, 4);
+
+ if (!havecookie) {
+ buffer += 15;
+ buffer_size -= 15;
+ if (buffer_size < 4) {
+ return -1;
+ }
+
+ havecookie = !memcmp (cookieXing, buffer, 4) || !memcmp (cookieInfo, buffer, 4);;
+ }
+
+ if (!havecookie) {
+ return -1;
+ }
+
+ buffer += 4;
+ buffer_size -= 4;
+
+ info->packet_offs = packet->offs+packet->packetlength;
+
+ // read flags
+ uint32_t flags = READ_UINT32();
+
+ if (flags & FRAMES_FLAG) {
+ if (buffer_size < 4) {
+ return -1;
+ }
+ // read number of frames
+ uint32_t nframes = READ_UINT32();
+ info->totalsamples = nframes * packet->samples_per_frame;
+ info->have_duration = 1;
+ info->have_xing_nframes = 1;
+ }
+ if (flags & BYTES_FLAG) {
+ READ_UINT32();
+ }
+ if (flags & TOC_FLAG) {
+ if (buffer_size < 100) {
+ return -1;
+ }
+ buffer += 100;
+ buffer_size -= 100;
+ }
+ if (flags & VBR_SCALE_FLAG) {
+ READ_UINT32();
+ }
+ if (buffer_size < 4) {
+ return -1;
+ }
+ // lame header
+ int lame_header = 0;
+ if (!memcmp (buffer, "LAME", 4)) {
+ lame_header = 1;
+ }
+ buffer += 4;
+ buffer_size -= 4;
+
+ if (buffer_size < 5) {
+ return -1;
+ }
+
+ buffer += 5; // what is this?
+ buffer_size -= 5;
+
+ if (buffer_size < 1) {
+ return -1;
+ }
+ uint8_t rev = READ_UINT8();
+
+ switch (rev & 0x0f) {
+ case XING_CBR ... XING_ABR2:
+ info->vbr_type = rev & 0x0f;
+ break;
+ }
+ if (lame_header) {
+ if (buffer_size < 22) {
+ return -1;
+ }
+ buffer += 1; //uint8_t lpf = *data++;
+ buffer_size -= 1;
+
+ //3 floats: replay gain
+
+ buffer += 4; // float rg_peaksignalamp = extract_f32 (buf);
+ buffer_size -= 4;
+
+ buffer += 2; // uint16_t rg_radio = extract_i16 (buf);
+ buffer_size -= 2;
+
+ buffer += 2; // uint16_t rg_audiophile = extract_i16 (buf);
+ buffer_size -= 2;
+
+ // skip
+ buffer += 2;
+ buffer_size -= 2;
+
+ info->delay = (((uint32_t)buffer0) << 4) | ((((uint32_t)buffer1) & 0xf0)>>4);
+ info->padding = ((((uint32_t)buffer1)&0x0f)<<8) | ((uint32_t)buffer2);
+ buffer += 3;
+ buffer_size -= 3;
+
+ // skip
+ buffer++;
+ buffer_size -= 1;
+
+ buffer++; // uint8_t mp3gain = *data++;
+ buffer_size -= 1;
+
+ // lame preset nr
+ info->lamepreset = buffer1 | (buffer0<<8);
+ buffer += 2;
+ buffer_size -= 2;
+
+ // musiclen
+ info->lame_musiclength = READ_UINT32();
+ }
+
+ return 0;
+}
+
+// returns 0 to continue, 1 to stop (seek position reached, or another reason to stop scanning)
+static int
+_process_packet (mp3info_t *info, mp3packet_t *packet, int64_t seek_to_sample) {
+ if (info->vbr_type != DETECTED_VBR
+ && (!info->have_xing_header || !info->vbr_type)
+ && info->prev_packet.bitrate
+ && info->prev_packet.bitrate != packet->bitrate) {
+ info->vbr_type = DETECTED_VBR;
+ }
+
+ info->valid_packets++;
+
+ // update stream parameters, only when sample!=0 or 1st frame
+ if (seek_to_sample != 0 || info->npackets == 0)
+ {
+ // don't get parameters from frames coming after any bad frame
+ int ch = info->ref_packet.nchannels;
+ memcpy (&info->ref_packet, packet, sizeof (mp3packet_t));
+ if (info->ref_packet.nchannels < ch) {
+ info->ref_packet.nchannels = ch;
+ }
+ }
+
+ info->lastpacket_valid = 1;
+
+ info->avg_packetlength += packet->packetlength;
+ info->avg_samples_per_frame += packet->samples_per_frame;
+ info->avg_bitrate += packet->bitrate;
+
+ if (seek_to_sample == 0) {
+ int ch = info->ref_packet.nchannels;
+ memcpy (&info->ref_packet, packet, sizeof (mp3packet_t));
+ if (info->ref_packet.nchannels < ch) {
+ info->ref_packet.nchannels = ch;
+ }
+ return 1;
+ }
+
+ if (seek_to_sample > 0) {
+ info->pcmsample += packet->samples_per_frame;
+ }
+ if (!info->have_duration) {
+ info->totalsamples += packet->samples_per_frame;
+ }
+ info->npackets++;
+ return 0;
+}
+
+static int
+_packet_same_fmt (mp3packet_t *ref_packet, mp3packet_t *packet) {
+ return packet->layer == ref_packet->layer
+ && packet->nchannels == ref_packet->nchannels
+ && packet->samplerate == ref_packet->samplerate
+ && packet->ver == ref_packet->ver;
+}
+
+int
+mp3_parse_file (mp3info_t *info, uint32_t flags, DB_FILE *fp, int64_t fsize, int startoffs, int endoffs, int64_t seek_to_sample) {
+#if PERFORMANCE_STATS
+ struct timeval start_tv;
+ struct timeval end_tv;
+ gettimeofday (&start_tv, NULL);
+#endif
+
+ memset (info, 0, sizeof (mp3info_t));
+ info->fsize = fsize;
+ info->datasize = fsize-startoffs-endoffs;
+
+ if (seek_to_sample > 0) {
+ // add 9 extra packets to fill bit-reservoir
+ seek_to_sample -= MAX_PACKET_SAMPLES*10;
+ if (seek_to_sample < 0) {
+ seek_to_sample = 0;
+ }
+ }
+
+ int err = -1;
+
+ deadbeef->fseek (fp, startoffs, SEEK_SET);
+ info->num_seeks++;
+
+ int64_t datasize = fsize;
+ if (datasize > 0) {
+ datasize -= startoffs+endoffs;
+ }
+
+ if (fsize < 0) {
+ info->checked_xing_header = 1; // ignore Info tag in streams
+ }
+
+ info->is_streaming = fp->vfs->is_streaming ();
+
+ mp3packet_t packet;
+
+ int64_t offs = startoffs;
+ int64_t fileoffs = startoffs;
+
+ int prev_br = -1;
+ int prev_length = -1;
+ int variable_packets = 0;
+ int freeformat_packets = 0;
+
+ while (fsize > 0 || fsize < 0) {
+ int64_t readsize = 4; // fe ff + frame header
+ if (fsize > 0 && offs + readsize >= fsize - endoffs) {
+ readsize = fsize - endoffs - offs;
+ }
+
+ if (readsize <= 0) {
+ break;
+ }
+
+ uint8_t fhdr4;
+
+ if (fileoffs != offs) {
+ deadbeef->fseek (fp, offs, SEEK_SET);
+ info->num_seeks++;
+ fileoffs = offs;
+ }
+ if (deadbeef->fread (fhdr, 1, readsize, fp) != readsize) {
+ goto error;
+ }
+ info->num_reads++;
+ info->bytes_read += readsize;
+ fileoffs += readsize;
+
+ int res = _parse_packet (&packet, fhdr);
+ if (res < 0 || (info->npackets && !_packet_same_fmt (&info->ref_packet, &packet))) {
+ if (res == -2 && info->valid_packets == 0) {
+ freeformat_packets++;
+ }
+
+ if (freeformat_packets > MAX_FREEFORMAT_PACKETS) {
+ goto error; // ignore freeformat streams
+ }
+
+ // bail if a valid packet could not be found at the start of stream
+ if (!info->valid_packets && offs - startoffs > MAX_INVALID_BYTES) {
+ goto error;
+ }
+
+ if (info->is_streaming && offs - startoffs > MAX_INVALID_BYTES_STREAM) {
+ goto error;
+ }
+
+ // prevent misdetected garbage packets to be used as ref_packet
+ if (info->npackets == 1) {
+ info->npackets = 0;
+ }
+
+ // bad packet in the stream, try to resync
+ memset (&info->prev_packet, 0, sizeof (mp3packet_t));
+ info->packet_offs = -1;
+ info->lastpacket_valid = 0;
+ if (info->pcmsample == 0 && seek_to_sample != -1) {
+ info->valid_packets = 0;
+ }
+
+ offs++;
+ continue;
+ }
+ else {
+ // EOF
+ if (fsize >= 0 && offs + res > fsize - endoffs) {
+ if (info->valid_packets) {
+ goto end;
+ }
+ else {
+ goto error;
+ }
+ }
+
+ packet.offs = offs;
+
+ if (!info->packet_offs || seek_to_sample >= 0) {
+ info->packet_offs = offs;
+ }
+
+ // try to read xing/info tag (only on initial scans)
+ int got_xing = 0;
+ if (!info->have_xing_header && !info->checked_xing_header)
+ {
+ // need whole packet for checking xing!
+
+ info->checked_xing_header = 1;
+ uint8_t xinghdrpacket.packetlength;
+ if (deadbeef->fread (xinghdr, 1, sizeof (xinghdr), fp) != sizeof (xinghdr)) {
+ return -1;
+ }
+ info->num_reads++;
+ info->bytes_read += sizeof (xinghdr);
+
+ fileoffs += sizeof (xinghdr);
+ int xingres = _check_xing_header (info, &packet, xinghdr, (int)sizeof (xinghdr));
+ if (!xingres) {
+ got_xing = 1;
+ info->have_xing_header = 1;
+ // trust the xing header -- even if requested to scan for precise duration
+ // parameters have been discovered from xing header, no need to continue
+ memcpy (&info->ref_packet, &packet, sizeof (mp3packet_t));
+
+ if (seek_to_sample > 0) {
+ offs += res;
+ continue;
+ }
+ else if (flags & MP3_PARSE_FULLSCAN) {
+ // reset counters for full scan
+ info->pcmsample = 0;
+ info->delay = 0;
+ info->padding = 0;
+ memset (&info->ref_packet, 0, sizeof (mp3packet_t));
+ }
+ }
+ }
+
+ if (!got_xing) {
+ // interrupt if the current packet contains the sample being seeked to
+ if (seek_to_sample > 0 && info->pcmsample+packet.samples_per_frame >= seek_to_sample) {
+ goto end;
+ }
+
+ if (_process_packet (info, &packet, seek_to_sample) > 0) {
+ goto end;
+ }
+ memcpy (&info->prev_packet, &packet, sizeof (packet));
+ }
+
+ if (!variable_packets && (prev_br != -1 || prev_length != -1)) {
+ if (prev_br != packet.bitrate || prev_length != packet.packetlength) {
+ variable_packets = 1;
+ }
+ }
+ prev_br = packet.bitrate;
+ prev_length = packet.packetlength;
+
+ // Even if we already got everything we need from lame header,
+ // we still need to fetch a few packets to get averages right.
+ // 200 packets give a pretty accurate value, and correspond
+ // to less than 40KB or data
+ if (info->have_xing_nframes && seek_to_sample < 0 && !(flags & MP3_PARSE_FULLSCAN) && info->npackets >= 200) {
+ goto end;
+ }
+ // Calculate CBR duration from file size
+ else if (!variable_packets && !info->have_xing_header && seek_to_sample < 0 && !(flags & MP3_PARSE_FULLSCAN) && info->npackets >= 200) {
+ // calculate total number of packets from file size
+ // 8876 - 9485
+ int64_t npackets = ceil(datasize/(float)info->ref_packet.packetlength);
+ info->totalsamples = npackets * info->ref_packet.samples_per_frame;
+ info->have_duration = 1;
+ goto end;
+ }
+
+
+ // Handle infinite streams
+ if (fsize < 0 && info->npackets >= 20) {
+ goto end;
+ }
+
+ offs += res;
+
+ // for streaming tracks -- approximate duration
+ if (seek_to_sample == -1
+ && fsize > 0
+ && offs > (startoffs+50000)
+ && (info->is_streaming || (flags&MP3_PARSE_ESTIMATE_DURATION))) {
+ if (!info->valid_packets) {
+ goto error;
+ }
+
+ info->avg_packetlength = floor (info->avg_packetlength/info->valid_packets);
+ info->avg_samples_per_frame /= info->valid_packets;
+ info->npackets = datasize / info->avg_packetlength;
+ info->avg_bitrate /= info->valid_packets;
+ if (info->have_xing_header) {
+ info->npackets--;
+ }
+ else {
+ info->totalsamples = info->npackets * info->avg_samples_per_frame;
+ }
+ info->have_duration = 1;
+
+ goto end_noaverages;
+ }
+ }
+ }
+
+end:
+
+ if (info->npackets > 0) {
+ info->avg_samples_per_frame /= info->npackets;
+ info->avg_packetlength /= info->npackets;
+ info->avg_bitrate /= info->npackets;
+ if (offs < datasize && info->avg_packetlength != 0) {
+ info->npackets = datasize / info->avg_packetlength;
+ if (info->have_xing_header) {
+ info->npackets--;
+ }
+ }
+ }
+
+end_noaverages:
+
+ if (fsize >= 0) {
+ info->delay += 529;
+ if (info->padding > 529) {
+ info->padding -= 529;
+ }
+
+ if (seek_to_sample == -1) {
+ info->have_duration = 1;
+ }
+ }
+ else {
+ info->totalsamples = -1;
+ }
+ err = 0;
+error:
+#if PERFORMANCE_STATS
+ gettimeofday (&end_tv, NULL);
+ float elapsed = (end_tv.tv_sec-start_tv.tv_sec) + (end_tv.tv_usec - start_tv.tv_usec) / 1000000.f;
+ printf ("mp3 stats:\nSeeks: %llu\nReads: %llu\nBytes: %llu\nTime: %f sec\n", info->num_seeks, info->num_reads, info->bytes_read, elapsed);
+#endif
+ return err;
+}

deadbeef-1.9.6.tar.bz2/plugins/mp3/mp3parser.h Added

@@ -0,0 +1,125 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2018 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef mp3parser_h
+#define mp3parser_h
+
+#include <stdint.h>
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum {
+ MP3_PARSE_FULLSCAN = 1,
+ MP3_PARSE_ESTIMATE_DURATION = 2,
+};
+
+// vbrmethod constants
+#define XING_CBR 1
+#define XING_ABR 2
+#define XING_VBR1 3
+#define XING_VBR2 4
+#define XING_VBR3 5
+#define XING_VBR4 6
+#define XING_CBR2 8
+#define XING_ABR2 9
+#define DETECTED_VBR 100
+
+typedef struct {
+ uint64_t offs;
+ int ver;
+ int samplerate;
+ int bitrate;
+ int nchannels;
+ int samples_per_frame;
+ int layer;
+ int packetlength;
+} mp3packet_t;
+
+typedef struct {
+ // outputs
+ int64_t packet_offs; // stream position of the packet corresponding to the requested seek position
+ int64_t pcmsample; // sample position corresponding to packet_offs
+ int64_t npackets;
+
+ int have_duration; // set to 1 if totalsamples has final value (e.g. from Xing packet)
+ int64_t totalsamples; // total samples in the stream, or -1 for infinite
+
+ int lastpacket_valid;
+ int64_t valid_packets;
+
+ mp3packet_t ref_packet; // packet representing the stream format
+
+ int have_xing_header;
+ int have_xing_nframes;
+ int vbr_type;
+
+ // FIXME: these fields should be filled/used only for network streams of finite length
+ double avg_packetlength;
+ int64_t avg_samples_per_frame;
+ int64_t avg_bitrate;
+
+ int is_streaming;
+
+ int delay;
+ int padding;
+
+ uint16_t lamepreset;
+ uint32_t lame_musiclength; // file size from beginning of LAME info packet until the last byte of packet with audio, as encoded by Lame
+
+ uint64_t fsize;
+ uint64_t datasize;
+
+ // intermediates
+ mp3packet_t prev_packet;
+
+ int checked_xing_header;
+
+ // read statistics
+ uint64_t num_seeks;
+ uint64_t num_reads;
+ uint64_t bytes_read;
+} mp3info_t;
+
+// Params:
+// seek_to_sample: -1 means to the end (scan whole file), otherwise a sample to seek to
+// When seeking, the packet offset returned will be the one containing seek_to_sample, not accounting for delay.
+// `totalsamples` will be set to the sample count at the packet start.
+// So the caller is responsible for adding delay to seek_to_sample, and then adjusting skipsamples based on returned "totalsamples".
+//
+//
+// returns:
+// 0: success
+// -1: error
+//
+// the caller is supposed to start decoding from info->packet_offs, and skip info->skipsamples samples
+int
+mp3_parse_file (mp3info_t *info, uint32_t flags, DB_FILE *fp, int64_t fsize, int startoffs, int endoffs, int64_t seek_to_sample);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* mp3parser_h */

deadbeef-0.6.2.tar.bz2/plugins/musepack/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/musepack/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/musepack/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/musepack/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/musepack/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/musepack/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/musepack/mpc_demux.c -> deadbeef-1.9.6.tar.bz2/plugins/musepack/mpc_demux.c Changed

@@ -86,8 +86,8 @@
 		mpc_uint32_t bytes_free = DEMUX_BUFFER_SIZE - d->bytes_total;
 
 		if (flags & MPC_BUFFER_SWAP) {
-			bytes2read &= -1 << 2;
-			offset = (unread_bytes + 3) & ( -1 << 2);
+			bytes2read &= -(1 << 2);
+			offset = (unread_bytes + 3) & ( -(1 << 2));
 			offset -= unread_bytes;
 		}
 
@@ -140,7 +140,7 @@
 
 	next_pos = fpos >> 3;
 	if (d->si.stream_version == 7)
-		next_pos = ((next_pos - d->si.header_position) & (-1 << 2)) + d->si.header_position;
+		next_pos = ((next_pos - d->si.header_position) & (-(1 << 2))) + d->si.header_position;
 	bit_offset = (int) (fpos - (next_pos << 3));
 
 	d->r->seek(d->r, (mpc_int32_t) next_pos);
@@ -282,7 +282,7 @@
 	for (i = 2; i < file_table_size; i++) {
 		int code = mpc_bits_golomb_dec(&r, 12);
 		if (code & 1)
-			code = -(code & (-1 << 1));
+			code = -(code & (-(1 << 1)));
 		code <<= 2;
 		lasti & 1 = code + 2 * last(i-1) & 1 - lasti & 1;
 		if ((i & mask) == 0)
@@ -613,7 +613,11 @@
 				d->d->decoded_samples += block_samples;
 				i++;
 			}
-			fpos += ((mpc_uint32_t)b.size + size) * 8;
+			mpc_uint32_t offs = ((mpc_uint32_t)b.size + size) * 8;
+			if (fpos + offs >= d->si.total_file_length) {
+				break;
+			}
+			fpos += offs;
 			mpc_demux_seek(d, fpos, 11);
 			size = mpc_bits_get_block(&d->bits_reader, &b);
 		}

deadbeef-0.6.2.tar.bz2/plugins/musepack/musepack.c -> deadbeef-1.9.6.tar.bz2/plugins/musepack/musepack.c Changed

@@ -1,6 +1,6 @@
 /*
 MusePack decoder plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy Yakovenko
 Uses Musepack SV8 libs (r435), (C) 2005-2009, The Musepack Development Team
 
 This software is provided 'as-is', without any express or implied
@@ -32,7 +32,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
@@ -40,7 +41,7 @@
 //#define trace(...) { fprintf (stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
-static DB_decoder_t plugin;
+static ddb_decoder2_t plugin;
 static DB_functions_t *deadbeef;
 
 typedef struct {
@@ -49,17 +50,20 @@
 mpc_demux *demux;
 // mpc_decoder *mpcdec;
 mpc_reader reader;
- int currentsample;
- int startsample;
- int endsample;
+ int64_t currentsample;
+ int64_t startsample;
+ int64_t endsample;
 mpc_uint32_t vbr_update_acc;
 mpc_uint32_t vbr_update_bits;
 MPC_SAMPLE_FORMAT bufferMPC_DECODER_BUFFER_LENGTH;
 int remaining;
 } musepack_info_t;
 
+static int
+musepack_seek_sample64 (DB_fileinfo_t *_info, int64_t sample);
+
 mpc_int32_t musepack_vfs_read (mpc_reader *r, void *ptr, mpc_int32_t size) {
- return deadbeef->fread(ptr, 1, size, (DB_FILE *)r->data);
+ return (mpc_int32_t)deadbeef->fread(ptr, 1, (size_t)size, (DB_FILE *)r->data);
 }
 
 /// Seeks to byte position offset.
@@ -73,12 +77,12 @@
 
 /// Returns the current byte offset in the stream.
 mpc_int32_t musepack_vfs_tell (mpc_reader *r) {
- return deadbeef->ftell ((DB_FILE *)r->data);
+ return (mpc_int32_t)deadbeef->ftell ((DB_FILE *)r->data);
 }
 
 /// Returns the total length of the source stream, in bytes.
 mpc_int32_t musepack_vfs_get_size (mpc_reader *r) {
- return deadbeef->fgetlength ((DB_FILE *)r->data);
+ return (mpc_int32_t)deadbeef->fgetlength ((DB_FILE *)r->data);
 }
 
 /// True if the stream is a seekable stream.
@@ -105,8 +109,9 @@
 info->reader.canseek = musepack_vfs_canseek;
 
 deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
 if (!fp) {
 return -1;
 }
@@ -134,12 +139,13 @@
 _info->fmt.channelmask |= 1 << i;
 }
 _info->readpos = 0;
- _info->plugin = &plugin;
+ _info->plugin = &plugin.decoder;
 
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
- plugin.seek_sample (_info, 0);
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample (it);
+ info->endsample = endsample;
+ musepack_seek_sample64(_info, 0);
 }
 else {
 info->startsample = 0;
@@ -239,7 +245,7 @@
 int samplesize = _info->fmt.bps / 8 * _info->fmt.channels;
 
 if (info->currentsample + size / samplesize > info->endsample) {
- size = (info->endsample - info->currentsample + 1) * samplesize;
+ size = (int)((info->endsample - info->currentsample + 1) * samplesize);
 if (size <= 0) {
 return 0;
 }
@@ -279,7 +285,7 @@
 }
 
 static int
-musepack_seek_sample (DB_fileinfo_t *_info, int sample) {
+musepack_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
 musepack_info_t *info = (musepack_info_t *)_info;
 mpc_status err = mpc_demux_seek_sample (info->demux, sample + info->startsample);
 if (err != 0) {
@@ -293,15 +299,19 @@
 }
 
 static int
+musepack_seek_sample (DB_fileinfo_t *_info, int sample) {
+ return musepack_seek_sample64(_info, sample);
+}
+
+static int
 musepack_seek (DB_fileinfo_t *_info, float time) {
- musepack_info_t *info = (musepack_info_t *)_info;
- return musepack_seek_sample (_info, time * _info->fmt.samplerate);
+ return musepack_seek_sample64 (_info, time * _info->fmt.samplerate);
 }
 
 void
 mpc_set_trk_properties (DB_playItem_t *it, mpc_streaminfo *si, int64_t fsize) {
 char s100;
- snprintf (s, sizeof (s), "%lld", fsize);
+ snprintf (s, sizeof (s), "%lld", (long long)fsize);
 deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
 deadbeef->pl_add_meta (it, ":BPS", "32");
 snprintf (s, sizeof (s), "%d", si->channels);
@@ -318,7 +328,7 @@
 deadbeef->pl_add_meta (it, ":MPC_ENCODER_VERSION", s);
 deadbeef->pl_add_meta (it, ":MPC_PNS_USED", si->pns ? "1" : "0");
 deadbeef->pl_add_meta (it, ":MPC_TRUE_GAPLESS", si->is_true_gapless ? "1" : "0");
- snprintf (s, sizeof (s), "%lld", (int64_t)si->beg_silence);
+ snprintf (s, sizeof (s), "%lld", (long long)si->beg_silence);
 deadbeef->pl_add_meta (it, ":MPC_BEG_SILENCE", s);
 snprintf (s, sizeof (s), "%d", si->stream_version);
 deadbeef->pl_add_meta (it, ":MPC_STREAM_VERSION", s);
@@ -355,30 +365,11 @@
 }
 
 mpc_streaminfo si;
- //mpc_streaminfo_init (&si);
 mpc_demux_get_info (demux, &si);
 
- int totalsamples = mpc_streaminfo_get_length_samples (&si);
+ int64_t totalsamples = mpc_streaminfo_get_length_samples (&si);
 double dur = mpc_streaminfo_get_length (&si);
 
- // replay gain
- float gain_title = 0.f;
- float gain_album = 0.f;
- float peak_title = 1.f;
- float peak_album = 1.f;
- if (si.gain_title != 0) {
- gain_title = 64.82-si.gain_title/256.0;
- }
- if (si.gain_album != 0) {
- gain_album = 64.82-si.gain_album/256.0;
- }
- if (si.peak_title != 0) {
- peak_title = pow (10, si.peak_title / (20.0 * 256.0)) / (1<<15);
- }
- if (si.peak_album != 0) {
- peak_album = pow (10, si.peak_album / (20.0 * 256.0)) / (1<<15);
- }
-
 // chapters
 int nchapters = mpc_demux_chap_nb (demux);
 DB_playItem_t *prev = NULL;
@@ -387,37 +378,30 @@
 int i;
 for (i = 0; i < nchapters; i++) {
 const mpc_chap_info *ch = mpc_demux_chap (demux, i);
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
 deadbeef->pl_add_meta (it, ":FILETYPE", "MusePack");
 deadbeef->pl_set_meta_int (it, ":TRACKNUM", i);
- it->startsample = ch->sample;
- it->endsample = totalsamples-1;
- float gain = gain_title, peak = peak_title;
- if (ch->gain != 0) {
- gain = 64.82-ch->gain/256.0;
- }
- if (ch->peak != 0) {
- peak = pow (10, ch->peak / (20.0 * 256.0)) / (1<<15);
- }
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, gain_album);
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, peak_album);
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, gain_title);
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, peak_title);
+ deadbeef->pl_item_set_startsample (it, ch->sample);
+ deadbeef->pl_item_set_endsample (it, totalsamples-1);
 if (!prev) {
 meta = deadbeef->pl_item_alloc ();
 /*int apeerr = */deadbeef->junk_apev2_read (meta, fp);
 }
 else {
- prev->endsample = it->startsample-1;
- float dur = (prev->endsample - prev->startsample) / (float)si.sample_freq;
+ int64_t startsample = deadbeef->pl_item_get_startsample (it);
+ int64_t prev_startsample = deadbeef->pl_item_get_startsample (prev);
+
+ deadbeef->pl_item_set_endsample(prev, startsample-1);
+ float dur = (startsample-1 - prev_startsample) / (float)si.sample_freq;
 deadbeef->plt_set_item_duration (plt, prev, dur);
 }
 if (i == nchapters - 1) {
- float dur = (it->endsample - it->startsample) / (float)si.sample_freq;
+ int64_t startsample = deadbeef->pl_item_get_startsample (it);
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ float dur = (endsample - startsample) / (float)si.sample_freq;
 deadbeef->plt_set_item_duration (plt, it, dur);
 }
 if (ch->tag_size > 0) {
- uint8_t *tag = ch->tag;
 deadbeef->junk_apev2_read_mem (it, ch->tag, ch->tag_size);
 if (meta) {
 deadbeef->pl_items_copy_junk (meta, it, it);
@@ -440,44 +424,20 @@
 return after;
 }
 
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
 deadbeef->pl_add_meta (it, ":FILETYPE", "MusePack");
 deadbeef->plt_set_item_duration (plt, it, dur);
 
 /*int apeerr = */deadbeef->junk_apev2_read (it, fp);
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, gain_album);
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, peak_album);
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, gain_title);
- deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, peak_title);
 
 deadbeef->fclose (fp);
 
- deadbeef->pl_lock ();
-
- // embedded cue
- const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
- DB_playItem_t *cue = NULL;
- if (cuesheet) {
- cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), totalsamples, si.sample_freq);
- if (cue) {
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
- deadbeef->pl_unlock ();
- mpc_demux_exit (demux);
- demux = NULL;
- return cue;
- }
- }
- deadbeef->pl_unlock ();
-
 mpc_set_trk_properties (it, &si, fsize);
- cue = deadbeef->plt_insert_cue (plt, after, it, totalsamples, si.sample_freq);
+
+ DB_playItem_t *cue = deadbeef->plt_process_cue (plt, after, it, totalsamples, si.sample_freq);
 if (cue) {
 deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
 mpc_demux_exit (demux);
- demux = NULL;
-
 return cue;
 }
 
@@ -493,8 +453,9 @@
 
 static int musepack_read_metadata (DB_playItem_t *it) {
 deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
 if (!fp) {
 return -1;
 }
@@ -535,18 +496,19 @@
 static const char * exts = { "mpc", "mpp", "mp+", NULL };
 
 // 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 = "musepack",
- .plugin.name = "MusePack decoder",
- .plugin.descr = "Musepack decoder using libmppdec",
- .plugin.copyright = 
+static ddb_decoder2_t plugin = {
+ .decoder.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .decoder.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .decoder.plugin.version_major = 1,
+ .decoder.plugin.version_minor = 0,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.id = "musepack",
+ .decoder.plugin.name = "MusePack decoder",
+ .decoder.plugin.descr = "Musepack decoder using libmppdec",
+ .decoder.plugin.copyright =
 "MusePack decoder plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "Uses Musepack SV8 libs (r435), (C) 2005-2009, The Musepack Development Team\n"
 "\n"
 "This software is provided 'as-is', without any express or implied\n"
@@ -567,19 +529,20 @@
 "\n"
 "3. This notice may not be removed or altered from any source distribution.\n"
 ,
- .plugin.website = "http://deadbeef.sf.net",
- .plugin.start = musepack_start,
- .plugin.stop = musepack_stop,
- .open = musepack_open,
- .init = musepack_init,
- .free = musepack_free,
- .read = musepack_read,
- .seek = musepack_seek,
- .seek_sample = musepack_seek_sample,
- .insert = musepack_insert,
- .read_metadata = musepack_read_metadata,
- .write_metadata = musepack_write_metadata,
- .exts = exts,
+ .decoder.plugin.website = "http://deadbeef.sf.net",
+ .decoder.plugin.start = musepack_start,
+ .decoder.plugin.stop = musepack_stop,
+ .decoder.open = musepack_open,
+ .decoder.init = musepack_init,
+ .decoder.free = musepack_free,
+ .decoder.read = musepack_read,
+ .decoder.seek = musepack_seek,
+ .decoder.seek_sample = musepack_seek_sample,
+ .decoder.insert = musepack_insert,
+ .decoder.read_metadata = musepack_read_metadata,
+ .decoder.write_metadata = musepack_write_metadata,
+ .decoder.exts = exts,
+ .seek_sample64 = musepack_seek_sample64,
 };
 
 DB_plugin_t *

deadbeef-0.6.2.tar.bz2/plugins/notify/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/notify/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/notify/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/notify/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/notify/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/notify/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/notify/notify.c -> deadbeef-1.9.6.tar.bz2/plugins/notify/notify.c Changed

@@ -1,6 +1,6 @@
 /*
 OSD Notification plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko and contributors
+ Copyright (C) 2009-2014 Oleksiy Yakovenko and contributors
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -16,8 +16,10 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
+#include <Block.h>
 #include <dbus/dbus.h>
-#include "../../deadbeef.h"
+#include <dispatch/dispatch.h>
+#include <deadbeef/deadbeef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,19 +30,27 @@
 #define E_NOTIFICATION_INTERFACE "org.freedesktop.Notifications"
 #define E_NOTIFICATION_PATH "/org/freedesktop/Notifications"
 
-DB_functions_t *deadbeef;
-DB_misc_t plugin;
-DB_artwork_plugin_t *artwork_plugin;
+static DB_functions_t *deadbeef;
+static DB_misc_t plugin;
+static ddb_artwork_plugin_t *artwork_plugin;
+static dispatch_queue_t queue;
+static DB_playItem_t *last_track = NULL;
+static dbus_uint32_t _replaces_id;
+static time_t request_timer = 0;
+static int terminate;
 
-static dbus_uint32_t replaces_id = 0;
+#define NOTIFY_DEFAULT_TITLE "%title%"
+#define NOTIFY_DEFAULT_CONTENT "%artist% - %album%"
 
-#define NOTIFY_DEFAULT_TITLE "%t"
-#define NOTIFY_DEFAULT_CONTENT "%a - %b"
+static char *tf_title;
+static char *tf_content;
 
-static void
-notify_thread (void *ctx) {
+// @return new replaces_id
+static dbus_uint32_t
+show_notification (DB_playItem_t *track, char *image_filename, dbus_uint32_t replaces_id, int force);
 
- DBusMessage *msg = (DBusMessage*) ctx;
+static dbus_uint32_t
+notify_send (DBusMessage *msg, dbus_uint32_t replaces_id) {
 DBusMessage *reply = NULL;
 
 DBusError error;
@@ -50,7 +60,7 @@
 fprintf(stderr, "connection failed: %s",error.message);
 dbus_error_free(&error);
 dbus_message_unref (msg);
- deadbeef->thread_exit(NULL);
+ return 0;
 }
 
 reply = dbus_connection_send_with_reply_and_block (conn, msg, -1, &error);
@@ -58,20 +68,17 @@
 fprintf(stderr, "send_with_reply_and_block error: (%s)\n", error.message); 
 dbus_error_free(&error);
 dbus_message_unref (msg);
- deadbeef->thread_exit(NULL);
+ return 0;
 }
 
+ dbus_uint32_t id = 0;
 if (reply != NULL) {
 // Process the reply message
 DBusMessageIter args;
 
- dbus_uint32_t id = 0;
 if (dbus_message_iter_init(reply, &args)) {
 if (DBUS_TYPE_UINT32 == dbus_message_iter_get_arg_type(&args)) {
 dbus_message_iter_get_basic(&args, &id);
- if (id != replaces_id) {
- replaces_id = id;
- }
 dbus_message_unref (reply);
 } else {
 fprintf(stderr, "Argument is not uint32\n"); 
@@ -83,8 +90,7 @@
 
 dbus_message_unref (msg);
 dbus_connection_unref (conn);
- deadbeef->thread_exit(NULL);
-
+ return id;
 }
 
 static void
@@ -117,6 +123,7 @@
 dst += 4;
 src++;
 }
+#if 0 // &apos; is not supported by KDE
 else if (*src == '\'') {
 if (end - dst < 6) {
 break;
@@ -125,6 +132,7 @@
 dst += 6;
 src++;
 }
+#endif
 else if (*src == '"') {
 if (end - dst < 6) {
 break;
@@ -145,123 +153,178 @@
 *dst = 0;
 }
 
-static void show_notification (DB_playItem_t *track);
-static DB_playItem_t *last_track = NULL;
-static time_t request_timer = 0;
-
 static void
-cover_avail_callback (const char *fname, const char *artist, const char *album, void *user_data) {
- if (!fname) {
- // Give up
- return;
- }
- deadbeef->pl_lock ();
- if (last_track && (time (NULL) - request_timer < 4)) {
- show_notification (last_track);
- }
- if (last_track) {
- deadbeef->pl_item_unref (last_track);
- last_track = NULL;
- }
- deadbeef->pl_unlock ();
+_cover_loaded_callback (int error, ddb_cover_query_t *query, ddb_cover_info_t *cover) {
+ void (^completion_block)(int error, ddb_cover_query_t *query, ddb_cover_info_t *cover) = (void (^)(int error, ddb_cover_query_t *query, ddb_cover_info_t *cover))query->user_data;
+ completion_block(error, query, cover);
+ Block_release(completion_block);
 }
 
-static void show_notification (DB_playItem_t *track) {
+static dbus_uint32_t
+show_notification (DB_playItem_t *track, char *image_filename, dbus_uint32_t replaces_id, int force) {
 char title1024;
 char content1024;
 
- char format200;
- char format_content200;
- deadbeef->conf_get_str ("notify.format", NOTIFY_DEFAULT_TITLE, format, sizeof (format));
- deadbeef->conf_get_str ("notify.format_content", NOTIFY_DEFAULT_CONTENT, format_content, sizeof (format_content));
- deadbeef->pl_format_title (track, -1, title, sizeof (title), -1, format);
- deadbeef->pl_format_title (track, -1, content, sizeof (content), -1, format_content);
-
- // escape &
-// char esc_title1024;
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .it = track,
+ .flags = DDB_TF_CONTEXT_MULTILINE | DDB_TF_CONTEXT_NO_DYNAMIC,
+ };
+
+ deadbeef->tf_eval (&ctx, tf_title, title, sizeof (title));
+ deadbeef->tf_eval (&ctx, tf_content, content, sizeof (content));
+
 char esc_content1024;
-// esc_xml (title, esc_title, sizeof (esc_title));
 esc_xml (content, esc_content, sizeof (esc_content));
 DBusMessage *msg = dbus_message_new_method_call (E_NOTIFICATION_BUS_NAME, E_NOTIFICATION_PATH, E_NOTIFICATION_INTERFACE, "Notify");
 
- deadbeef->pl_lock ();
- if (last_track) {
- deadbeef->pl_item_unref (last_track);
- last_track = 0;
+ if (replaces_id == 0) {
+ time_t new_time = time(NULL);
+ if (last_track == track && !force) {
+ if (new_time - request_timer < 1) {
+ return replaces_id; // same track, less than 1 sec after previous notification -- pass
+ }
+ }
+ else {
+ if (last_track) {
+ deadbeef->pl_item_unref (last_track);
+ last_track = 0;
+ }
+ last_track = track;
+ deadbeef->pl_item_ref (last_track);
+ }
+ request_timer = new_time;
 }
- last_track = track;
- deadbeef->pl_item_ref (last_track);
- request_timer = time (NULL);
- deadbeef->pl_unlock ();
 
 const char *v_appname = "DeaDBeeF";
- dbus_uint32_t v_id = 0;
- char *v_iconname = NULL;
- if (deadbeef->conf_get_int("notify.albumart", 0) && artwork_plugin) {
- deadbeef->pl_lock ();
- const char *album = deadbeef->pl_find_meta (track, "album");
- const char *artist = deadbeef->pl_find_meta (track, "artist");
- const char *fname = deadbeef->pl_find_meta (track, ":URI");
- if (!album || !*album) {
- album = deadbeef->pl_find_meta (track, "title");
- }
- v_iconname = artwork_plugin->get_album_art (fname, artist, album, deadbeef->conf_get_int ("notify.albumart_size", 64), cover_avail_callback, NULL);
- deadbeef->pl_unlock ();
- }
- if (!v_iconname) {
- v_iconname = strdup ("deadbeef");
- }
- const char *v_summary = title;
- const char *v_body = esc_content;
- dbus_int32_t v_timeout = -1;
-
- dbus_message_append_args (msg
- , DBUS_TYPE_STRING, &v_appname
- , DBUS_TYPE_UINT32, &replaces_id
- , DBUS_TYPE_STRING, &v_iconname
- , DBUS_TYPE_STRING, &v_summary
- , DBUS_TYPE_STRING, &v_body
- , DBUS_TYPE_INVALID
- );
-
- DBusMessageIter iter, sub;
- // actions
- dbus_message_iter_init_append(msg, &iter);
- dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub);
- dbus_message_iter_close_container(&iter, &sub);
- // hints
- dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub);
- dbus_message_iter_close_container(&iter, &sub);
-
- dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &v_timeout);
-
- intptr_t tid = 0;
- if ((tid=deadbeef->thread_start(notify_thread, msg)) != 0) {
- dbus_message_ref (msg);
- deadbeef->thread_detach (tid); 
+
+ bool should_wait_for_cover = !image_filename && deadbeef->conf_get_int("notify.albumart", 0) && artwork_plugin;
+ bool should_apply_kde_fix = deadbeef->conf_get_int ("notify.fix_kde_5_23_5", 0) ? true : false;
+
+ // KDE won't re-&#x10;display notification via reuse,
+ // so don't show it now and wait for cover callback.
+ if (!(should_wait_for_cover && should_apply_kde_fix)) {
+ char *v_iconname = image_filename ?: "deadbeef";
+ const char *v_summary = title;
+ const char *v_body = esc_content;
+ dbus_int32_t v_timeout = -1;
+
+ dbus_message_append_args (msg
+ , DBUS_TYPE_STRING, &v_appname
+ , DBUS_TYPE_UINT32, &replaces_id
+ , DBUS_TYPE_STRING, &v_iconname
+ , DBUS_TYPE_STRING, &v_summary
+ , DBUS_TYPE_STRING, &v_body
+ , DBUS_TYPE_INVALID
+ );
+
+ DBusMessageIter iter, sub;
+ // actions
+ dbus_message_iter_init_append(msg, &iter);
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &sub);
+ dbus_message_iter_close_container(&iter, &sub);
+ // hints
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub);
+ dbus_message_iter_close_container(&iter, &sub);
+
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &v_timeout);
+
+ replaces_id = notify_send (msg, replaces_id);
 }
- dbus_message_unref (msg);
- if (v_iconname) {
- free (v_iconname);
+
+ if (should_wait_for_cover) {
+ ddb_cover_query_t *query = calloc (sizeof (ddb_cover_query_t), 1);
+ query->_size = sizeof (ddb_cover_query_t);
+ query->track = track;
+ deadbeef->pl_item_ref (track);
+ query->source_id = 0;
+
+ void (^completion_block)(int error, ddb_cover_query_t *query, ddb_cover_info_t *cover) = ^(int error, ddb_cover_query_t *query, ddb_cover_info_t *cover) {
+ if (!(query->flags & DDB_ARTWORK_FLAG_CANCELLED)) {
+ char *image_filename;
+ if (cover != NULL && cover->image_filename != NULL) {
+ image_filename = strdup (cover->image_filename);
+ }
+ else {
+ image_filename = strdup("deadbeef");
+ }
+ // redisplay notification with the album art
+ ddb_playItem_t *track = query->track;
+ deadbeef->pl_item_ref (track);
+ dispatch_async (queue, ^{
+ _replaces_id = show_notification (track, image_filename, replaces_id, 1);
+ free (image_filename);
+ deadbeef->pl_item_unref (track);
+ });
+ }
+ deadbeef->pl_item_unref (query->track);
+ free (query);
+ if (cover != NULL) {
+ artwork_plugin->cover_info_release (cover);
+ }
+ };
+
+ query->user_data = (dispatch_block_t)Block_copy(completion_block);
+ artwork_plugin->cover_get (query, _cover_loaded_callback);
 }
+
+ return replaces_id;
 }
 
 static int
-on_songstarted (ddb_event_track_t *ev) {
- if (ev->track && deadbeef->conf_get_int ("notify.enable", 0)) {
- DB_playItem_t *track = ev->track;
+on_songstarted (DB_playItem_t *track) {
+ if (track && deadbeef->conf_get_int ("notify.enable", 0)) {
 if (track) {
- show_notification (track);
+ if (terminate) {
+ return 0;
+ }
+ deadbeef->pl_item_ref (track);
+ dispatch_async (queue, ^{
+ bool should_apply_kde_fix = deadbeef->conf_get_int ("notify.fix_kde_5_23_5", 0) ? true : false;
+
+ // KDE fix: don't reuse notifications;
+ // Other environments: need to reuse
+
+ _replaces_id = show_notification (track, NULL, should_apply_kde_fix ? 0 : _replaces_id, 0);
+ deadbeef->pl_item_unref (track);
+ });
 }
 }
 return 0;
 }
 
+static void
+init_tf (void) {
+ if (tf_title) {
+ deadbeef->tf_free (tf_title);
+ }
+ if (tf_content) {
+ deadbeef->tf_free (tf_content);
+ }
+ char format200;
+ deadbeef->conf_get_str ("notify.format_title_tf", NOTIFY_DEFAULT_TITLE, format, sizeof (format));
+ tf_title = deadbeef->tf_compile (format);
+ deadbeef->conf_get_str ("notify.format_content_tf", NOTIFY_DEFAULT_CONTENT, format, sizeof (format));
+ tf_content = deadbeef->tf_compile (format);
+}
+
 static int
 notify_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
 switch (id) {
 case DB_EV_SONGSTARTED:
- on_songstarted ((ddb_event_track_t *)ctx);
+ {
+ ddb_event_track_t *ev = (ddb_event_track_t *)ctx;
+ on_songstarted (ev->track);
+ }
+ break;
+ case DB_EV_SONGCHANGED:
+ {
+ ddb_event_trackchange_t *ev = (ddb_event_trackchange_t *)ctx;
+ on_songstarted (ev->to);
+ }
+ break;
+ case DB_EV_CONFIGCHANGED:
+ init_tf ();
 break;
 }
 return 0;
@@ -269,23 +332,37 @@
 
 int
 notify_start (void) {
+ queue = dispatch_queue_create("OSDNotifyQueue", NULL);
 return 0;
 }
 
 int
 notify_stop (void) {
+ terminate = 1;
+ dispatch_release (queue);
+ queue = NULL;
+
 deadbeef->pl_lock ();
 if (last_track) {
 deadbeef->pl_item_unref (last_track);
 last_track = NULL;
 }
 deadbeef->pl_unlock ();
+
+ if (tf_title) {
+ deadbeef->tf_free (tf_title);
+ tf_title = NULL;
+ }
+ if (tf_content) {
+ deadbeef->tf_free (tf_content);
+ tf_content = NULL;
+ }
 return 0;
 }
 
 static int
 notify_connect (void) {
- artwork_plugin = (DB_artwork_plugin_t *)deadbeef->plug_get_for_id ("artwork");
+ artwork_plugin = (ddb_artwork_plugin_t *)deadbeef->plug_get_for_id ("artwork2");
 return 0;
 }
 
@@ -297,15 +374,15 @@
 
 static const char settings_dlg =
 "property \"Enable\" checkbox notify.enable 0;\n"
- "property \"Notification title format\" entry notify.format \"" NOTIFY_DEFAULT_TITLE "\";\n"
- "property \"Notification content format\" entry notify.format_content \"" NOTIFY_DEFAULT_CONTENT "\";\n"
+ "property \"Notification title format\" entry notify.format_title_tf \"" NOTIFY_DEFAULT_TITLE "\";\n"
+ "property \"Notification content format\" entry notify.format_content_tf \"" NOTIFY_DEFAULT_CONTENT "\";\n"
 "property \"Show album art\" checkbox notify.albumart 1;\n"
 "property \"Album art size (px)\" entry notify.albumart_size 64;\n"
+ "property \"Don't reuse notifications (KDE quirk)\" checkbox notify.fix_kde_5_23_5 0;\n"
 ;
 
-DB_misc_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+static DB_misc_t plugin = {
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.type = DB_PLUGIN_MISC,
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
@@ -314,7 +391,7 @@
 .plugin.descr = "Displays notifications when new track starts.\nRequires dbus and notification daemon to be running.\nNotification daemon should be provided by your desktop environment.\n",
 .plugin.copyright = 
 "OSD Notification plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko and contributors\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko and contributors\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"

deadbeef-0.6.2.tar.bz2/plugins/nullout/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/nullout/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/nullout/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/nullout/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/nullout/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/nullout/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/nullout/nullout.c -> deadbeef-1.9.6.tar.bz2/plugins/nullout/nullout.c Changed

@@ -1,6 +1,6 @@
 /*
 Null output plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy 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
@@ -28,13 +28,13 @@
 #endif
 #include <stdio.h>
 #include <string.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
 static DB_output_t plugin;
-DB_functions_t *deadbeef;
+static DB_functions_t *deadbeef;
 
 static intptr_t null_tid;
 static int null_terminate;
@@ -70,7 +70,7 @@
 int
 pnull_init (void) {
 trace ("pnull_init\n");
- state = OUTPUT_STATE_STOPPED;
+ state = DDB_PLAYBACK_STATE_STOPPED;
 null_terminate = 0;
 null_tid = deadbeef->thread_start (pnull_thread, NULL);
 return 0;
@@ -91,7 +91,7 @@
 deadbeef->thread_join (null_tid);
 }
 null_tid = 0;
- state = OUTPUT_STATE_STOPPED;
+ state = DDB_PLAYBACK_STATE_STOPPED;
 null_terminate = 0;
 }
 return 0;
@@ -102,45 +102,36 @@
 if (!null_tid) {
 pnull_init ();
 }
- state = OUTPUT_STATE_PLAYING;
+ state = DDB_PLAYBACK_STATE_PLAYING;
 return 0;
 }
 
 int
 pnull_stop (void) {
- state = OUTPUT_STATE_STOPPED;
+ state = DDB_PLAYBACK_STATE_STOPPED;
 deadbeef->streamer_reset (1);
 return 0;
 }
 
 int
 pnull_pause (void) {
- if (state == OUTPUT_STATE_STOPPED) {
+ if (state == DDB_PLAYBACK_STATE_STOPPED) {
 return -1;
 }
 // set pause state
- state = OUTPUT_STATE_PAUSED;
+ state = DDB_PLAYBACK_STATE_PAUSED;
 return 0;
 }
 
 int
 pnull_unpause (void) {
 // unset pause state
- if (state == OUTPUT_STATE_PAUSED) {
- state = OUTPUT_STATE_PLAYING;
+ if (state == DDB_PLAYBACK_STATE_PAUSED) {
+ state = DDB_PLAYBACK_STATE_PLAYING;
 }
 return 0;
 }
 
-static int
-pnull_get_endianness (void) {
-#if WORDS_BIGENDIAN
- return 1;
-#else
- return 0;
-#endif
-}
-
 static void
 pnull_thread (void *context) {
 #ifdef __linux__
@@ -150,13 +141,14 @@
 if (null_terminate) {
 break;
 }
- if (state != OUTPUT_STATE_PLAYING) {
+ if (state != DDB_PLAYBACK_STATE_PLAYING) {
 usleep (10000);
 continue;
 }
 
 char buf4096;
 pnull_callback (buf, 1024);
+ usleep(1);
 }
 }
 
@@ -173,7 +165,7 @@
 }
 }
 
-int
+ddb_playback_state_t
 pnull_get_state (void) {
 return state;
 }
@@ -196,17 +188,16 @@
 
 // define plugin interface
 static DB_output_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_OUTPUT,
 .plugin.id = "nullout",
 .plugin.name = "Null output plugin",
- .plugin.descr = "This plugin takes the audio data, and discards it\n, so nothing will play.\nThis is useful for testing.",
+ .plugin.descr = "This plugin takes the audio data, and discards it,\nso nothing will play.\nThis is useful for testing.",
 .plugin.copyright = 
 "Null output plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "This software is provided 'as-is', without any express or implied\n"
 "warranty. In no event will the authors be held liable for any damages\n"

deadbeef-1.9.6.tar.bz2/plugins/opus Added

deadbeef-1.9.6.tar.bz2/plugins/opus/COPYING Added

@@ -0,0 +1,134 @@
+deadbeef opus
+
+Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+libogg
+
+Copyright (c) 2002, Xiph.org Foundation
+
+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 name of the Xiph.org Foundation 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 FOUNDATION
+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.
+
+
+opus
+
+Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic,
+                    Jean-Marc Valin, Timothy B. Terriberry,
+                    CSIRO, Gregory Maxwell, Mark Borgerding,
+                    Erik de Castro Lopo
+
+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 name of Internet Society, IETF or IETF Trust, nor the
+names of specific 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.
+
+Opus is subject to the royalty-free patent licenses which are
+specified at:
+
+Xiph.Org Foundation:
+https://datatracker.ietf.org/ipr/1524/
+
+Microsoft Corporation:
+https://datatracker.ietf.org/ipr/1914/
+
+Broadcom Corporation:
+https://datatracker.ietf.org/ipr/1526/
+
+
+opusfile
+
+Copyright (c) 1994-2013 Xiph.Org Foundation and contributors
+
+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 name of the Xiph.Org Foundation 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 FOUNDATION
+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.

deadbeef-1.9.6.tar.bz2/plugins/opus/Makefile.am Added

deadbeef-1.9.6.tar.bz2/plugins/opus/Makefile.in Added

@@ -0,0 +1,780 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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/opus
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+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, filesdir }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+@HAVE_OPUS_TRUE@opus_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@HAVE_OPUS_TRUE@	../liboggedit/liboggedit.la
+am__opus_la_SOURCES_DIST = opus.c
+@HAVE_OPUS_TRUE@am_opus_la_OBJECTS = opus_la-opus.lo
+opus_la_OBJECTS = $(am_opus_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+opus_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(opus_la_CFLAGS) \
+	$(CFLAGS) $(opus_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_OPUS_TRUE@am_opus_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(opus_la_SOURCES)
+DIST_SOURCES = $(am__opus_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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_OPUS_TRUE@pkglib_LTLIBRARIES = opus.la
+@HAVE_OPUS_TRUE@opus_la_SOURCES = opus.c
+@HAVE_OPUS_TRUE@opus_la_LDFLAGS = -module -avoid-version -lm -export-symbols-regex opus_load
+@HAVE_OPUS_TRUE@opus_la_LIBADD = $(LDADD) $(OPUS_LIBS) ../liboggedit/liboggedit.la
+@HAVE_OPUS_TRUE@opus_la_CFLAGS = $(CFLAGS) $(OPUS_CFLAGS) -std=c99 -I@top_srcdir@/include
+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 --ignore-deps plugins/opus/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps plugins/opus/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)
+	@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 " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
+	 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)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+
+opus.la: $(opus_la_OBJECTS) $(opus_la_DEPENDENCIES) $(EXTRA_opus_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(opus_la_LINK) $(am_opus_la_rpath) $(opus_la_OBJECTS) $(opus_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+opus_la-opus.lo: opus.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(opus_la_CFLAGS) $(CFLAGS) -c -o opus_la-opus.lo `test -f 'opus.c' || echo '$(srcdir)/'`opus.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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 -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 -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 TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am 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 tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/plugins/opus/opus.c Added

@@ -0,0 +1,832 @@
+/*
+ deadbeef-opus
+ Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <opusfile.h>
+#include <deadbeef/deadbeef.h>
+#include <stdbool.h>
+#include "../liboggedit/oggedit.h"
+#include <deadbeef/strdupa.h>
+
+#define trace(...) { deadbeef->log_detailed (&plugin.decoder.plugin, 0, __VA_ARGS__); }
+
+static ddb_decoder2_t plugin;
+static DB_functions_t *deadbeef;
+
+typedef struct {
+ DB_fileinfo_t info;
+ int64_t currentsample;
+
+ OggOpusFile *opusfile;
+ uint8_t *channelmap;
+
+ int cur_bit_stream;
+
+ int set_bitrate;
+ float next_update;
+ DB_playItem_t *it;
+ DB_playItem_t *new_track;
+
+ float prev_playpos;
+ time_t started_timestamp;
+} opusdec_info_t;
+
+static const char * exts = { "ogg", "opus", "ogv", NULL };
+
+// opus file wrapper
+static int
+opus_file_read(void *source, unsigned char *ptr, const int bytes) {
+ size_t res = ((DB_FILE *)source)->vfs->read(ptr, 1, bytes, source);
+ return (int)res;
+}
+
+static int
+opus_file_seek(void *source, const opus_int64 offset, const int whence) {
+ int is_streaming = ((DB_FILE *)source)->vfs->is_streaming();
+ if (is_streaming) {
+ return -1;
+ }
+
+ return ((DB_FILE *)source)->vfs->seek(source, offset, whence);
+}
+
+static opus_int64
+opus_file_tell (void *source) {
+ return (opus_int64)((DB_FILE *)source)->vfs->tell(source);
+}
+
+static int
+opus_file_close (void *source) {
+ return 0;
+}
+
+static OpusFileCallbacks opcb = {
+ .read = opus_file_read,
+ .seek = opus_file_seek,
+ .tell = opus_file_tell,
+ .close = opus_file_close
+};
+
+static OggOpusFile *
+opus_file_open(DB_FILE *fp)
+{
+ int res = 0;
+ return op_open_callbacks(fp, &opcb, NULL, 0, &res);
+}
+
+static DB_fileinfo_t *
+opusdec_open (uint32_t hints) {
+ opusdec_info_t *info = calloc (1, sizeof (opusdec_info_t));
+ return &info->info;
+}
+
+static DB_fileinfo_t *
+opusdec_open2 (uint32_t hints, DB_playItem_t *it) {
+ deadbeef->pl_lock ();
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
+
+ if (!fp) {
+ return NULL;
+ }
+
+ opusdec_info_t *info = calloc (1, sizeof (opusdec_info_t));
+
+ info->info.file = fp;
+ info->it = it;
+ deadbeef->pl_item_ref (it);
+
+ return &info->info;
+}
+
+static const char *tag_rg_names = {
+ "REPLAYGAIN_ALBUM_GAIN",
+ "REPLAYGAIN_ALBUM_PEAK",
+ "REPLAYGAIN_TRACK_GAIN",
+ "REPLAYGAIN_TRACK_PEAK",
+ NULL
+};
+
+// replaygain key names in deadbeef internal metadata
+static const char *ddb_internal_rg_keys = {
+ ":REPLAYGAIN_ALBUMGAIN",
+ ":REPLAYGAIN_ALBUMPEAK",
+ ":REPLAYGAIN_TRACKGAIN",
+ ":REPLAYGAIN_TRACKPEAK",
+ NULL
+};
+
+
+
+static bool
+_is_replaygain_tag(DB_playItem_t *it, const char *tag)
+{
+ for (int i = 0; i <= DDB_REPLAYGAIN_TRACKPEAK; i++) {
+ if (!strcasecmp(tag_rg_namesi, tag)) {
+ return 1;
+ }
+ }
+ return 0;
+}
+
+static int
+update_vorbis_comments (DB_playItem_t *it, OggOpusFile *opusfile, const int tracknum) {
+ const OpusTags *vc = op_tags (opusfile, tracknum);
+ if (!vc) {
+ return -1;
+ }
+
+ deadbeef->pl_delete_all_meta (it);
+
+ for (int i = 0; i < vc->comments; i++) {
+ char *tag = strdup(vc->user_commentsi);
+ char *value;
+ if (tag && (value = strchr(tag, '='))
+#ifdef ANDROID
+ && strlen (value) < 4000
+#endif
+ ) {
+ // skip the ignored RG fields, and the picture
+ if (_is_replaygain_tag (it, tag) || !strcasecmp (tag, "METADATA_BLOCK_PICTURE")) {
+ free (tag);
+ continue;
+ }
+ *value++ = '\0';
+ deadbeef->pl_append_meta(it, oggedit_map_tag(tag, "tag2meta"), value);
+ }
+ if (tag) {
+ free(tag);
+ }
+ }
+
+ const char *r128_trackgain = deadbeef->pl_find_meta (it, "R128_TRACK_GAIN");
+ if (r128_trackgain) {
+ int trackgain = atoi (r128_trackgain) + op_head (opusfile, tracknum)->output_gain;
+ if (trackgain != 0) {
+ deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, trackgain / 256.0f + 5.0f);
+ deadbeef->pl_delete_meta (it, "R128_TRACK_GAIN");
+ }
+ }
+
+ int albumgain = op_head (opusfile, tracknum)->output_gain;
+ const char *r128_albumgain = deadbeef->pl_find_meta (it, "R128_ALBUM_GAIN");
+ if (r128_albumgain) {
+ albumgain += atoi (r128_albumgain);
+ deadbeef->pl_delete_meta (it, "R128_ALBUM_GAIN");
+ }
+ if (albumgain != 0) {
+ deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, albumgain / 256.0f + 5.0f);
+ }
+
+ char s100;
+ int output_gain = op_head (opusfile, tracknum)->output_gain;
+ snprintf (s, sizeof (s), "%0.2f dB", output_gain / 256.0f + 5.0f);
+ deadbeef->pl_replace_meta (it, ":OPUS_HEADER_GAIN", s);
+
+ deadbeef->pl_set_meta_int (it, ":SAMPLERATE_ORIGINAL", op_head (opusfile, tracknum)->input_sample_rate);
+
+ deadbeef->pl_add_meta (it, "title", NULL);
+ uint32_t f = deadbeef->pl_get_item_flags (it);
+ f &= ~DDB_TAG_MASK;
+ f |= DDB_TAG_VORBISCOMMENTS;
+ deadbeef->pl_set_item_flags (it, f);
+ ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ if (plt) {
+ deadbeef->plt_modified (plt);
+ deadbeef->plt_unref (plt);
+ }
+
+ return 0;
+}
+
+static void
+set_meta_ll(DB_playItem_t *it, const char *key, const int64_t value)
+{
+ char string11;
+ sprintf(string, "%lld", (long long)value);
+ deadbeef->pl_replace_meta(it, key, string);
+}
+
+static int
+opusdec_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
+ opusdec_info_t *info = (opusdec_info_t *)_info;
+ if (sample < 0) {
+ return -1;
+ }
+ if (!info->info.file) {
+ return -1;
+ }
+ int64_t startsample = deadbeef->pl_item_get_startsample (info->it);
+
+ int res = op_pcm_seek (info->opusfile, sample + startsample);
+ if (res != 0 && res != OP_ENOSEEK) {
+ return -1;
+ }
+ info->currentsample = sample;
+ _info->readpos = (float)sample/_info->fmt.samplerate;
+ info->next_update = -2;
+ return 0;
+}
+
+static int
+opusdec_seek_sample (DB_fileinfo_t *_info, int sample) {
+ return opusdec_seek_sample64(_info, sample);
+}
+
+static int
+opusdec_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ opusdec_info_t *info = (opusdec_info_t *)_info;
+
+ if (!info->info.file) {
+ deadbeef->pl_lock ();
+	const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
+
+ if (!fp) {
+ return -1;
+ }
+ info->info.file = fp;
+ info->it = it;
+ deadbeef->pl_item_ref (it);
+ }
+
+ info->opusfile = opus_file_open (info->info.file);
+ if (!info->opusfile) {
+ return -1;
+ }
+
+ const OpusHead *head = op_head (info->opusfile, 0);
+
+ if (head->channel_count > 8) {
+ trace ("opus: the track has %d channels, but 8 is max supported.\n");
+ return -1;
+ }
+
+ // take this parameters from your input file
+ // we set constants for clarity sake
+ _info->fmt.bps = 32;
+ _info->fmt.is_float = 1;
+ _info->fmt.channels = head->channel_count;
+ _info->fmt.samplerate = 48000;
+ if (head->mapping_family == 1) {
+ info->channelmap = oggedit_vorbis_channel_map (head->channel_count);
+ }
+
+ for (int i = 0; i < (_info->fmt.channels&0x1f); i++) {
+ _info->fmt.channelmask |= 1 << i;
+ }
+ _info->readpos = 0;
+ _info->plugin = &plugin.decoder;
+
+ // set all gain adjustment to 0, because deadbeef is performing that.
+ op_set_gain_offset (info->opusfile, OP_ABSOLUTE_GAIN, 0);
+
+ if (info->info.file->vfs->is_streaming ()) {
+ deadbeef->pl_item_set_startsample (it, 0);
+ if (deadbeef->pl_get_item_duration (it) < 0) {
+ deadbeef->pl_item_set_endsample (it, -1);
+ }
+ else {
+ deadbeef->pl_item_set_endsample (it, op_pcm_total (info->opusfile, -1) - 1);
+ }
+
+ if (update_vorbis_comments (it, info->opusfile, -1))
+ return -1;
+
+ deadbeef->pl_set_meta_int(it, ":TRACKNUM", 0);
+ }
+ else {
+ opusdec_seek_sample64 (_info, 0);
+ }
+
+ deadbeef->pl_replace_meta (it, "!FILETYPE", "Ogg Opus");
+ deadbeef->pl_set_meta_int (it, ":CHANNELS", head->channel_count);
+
+ info->cur_bit_stream = -1;
+
+ info->started_timestamp = time(NULL);
+
+ return 0;
+}
+
+// free everything allocated in _init
+static void
+opusdec_free (DB_fileinfo_t *_info) {
+ opusdec_info_t *info = (opusdec_info_t *)_info;
+
+ if (info->opusfile) {
+ op_free(info->opusfile);
+ info->opusfile = NULL;
+ }
+ if (info->info.file) {
+ deadbeef->fclose (info->info.file);
+ info->info.file = NULL;
+ }
+ if (info->it) {
+ deadbeef->pl_item_unref (info->it);
+ info->it = NULL;
+ }
+
+ if (info) {
+ free (info);
+ }
+}
+
+static void send_event(DB_playItem_t *it, const int event_enum)
+{
+ ddb_event_track_t *event = (ddb_event_track_t *)deadbeef->event_alloc(event_enum);
+ event->track = it;
+ if (event->track) {
+ deadbeef->pl_item_ref(event->track);
+ }
+ deadbeef->event_send((ddb_event_t *)event, 0, 0);
+}
+
+static bool
+new_streaming_link(opusdec_info_t *info, const int new_link)
+{
+ if (!info->info.file->vfs->is_streaming () || new_link < 0) {
+ return false;
+ }
+
+ DB_playItem_t *from = deadbeef->pl_item_alloc ();
+ deadbeef->pl_items_copy_junk (info->it, from, from);
+
+ update_vorbis_comments(info->it, info->opusfile, new_link);
+
+ ddb_event_trackchange_t *ev = (ddb_event_trackchange_t *)deadbeef->event_alloc (DB_EV_SONGCHANGED);
+ float playpos = deadbeef->streamer_get_playpos ();
+ ev->from = from;
+ ev->to = info->it;
+ ev->playtime = playpos - info->prev_playpos;
+ ev->started_timestamp = info->started_timestamp;
+ deadbeef->pl_item_ref (ev->from);
+ deadbeef->pl_item_ref (ev->to);
+ deadbeef->event_send ((ddb_event_t *)ev, 0, 0);
+ deadbeef->pl_item_unref (from);
+ from = NULL;
+
+ info->started_timestamp = time(NULL);
+ info->prev_playpos = playpos;
+
+ send_event(info->it, DB_EV_SONGSTARTED);
+ send_event(info->it, DB_EV_TRACKINFOCHANGED);
+ deadbeef->sendmessage(DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+ info->cur_bit_stream = new_link;
+
+ const OpusHead *head = op_head (info->opusfile, new_link);
+ if (head && info->info.fmt.channels != head->channel_count) {
+ info->info.fmt.channels = head->channel_count;
+ deadbeef->pl_set_meta_int (info->it, ":CHANNELS", head->channel_count);
+ return true;
+ }
+
+ return false;
+}
+
+static bool
+is_playing_track(const DB_playItem_t *it)
+{
+ DB_playItem_t *track = deadbeef->streamer_get_playing_track_safe();
+ if (track)
+ deadbeef->pl_item_unref(track);
+ return track == it;
+}
+
+static int
+opusdec_read (DB_fileinfo_t *_info, char *bytes, int size) {
+ opusdec_info_t *info = (opusdec_info_t *)_info;
+
+ // Work round some streamer limitations and infobar issue #22
+ if (info->new_track && is_playing_track(info->new_track)) {
+ info->new_track = NULL;
+ send_event(info->it, DB_EV_TRACKINFOCHANGED);
+ info->next_update = -2;
+ }
+
+ // Don't read past the end of a sub-track
+ int samples_to_read = size / sizeof(float) / _info->fmt.channels;
+ int64_t endsample = deadbeef->pl_item_get_endsample (info->it);
+ if (endsample > 0) {
+ opus_int64 samples_left = endsample - op_pcm_tell (info->opusfile);
+ if (samples_left < samples_to_read) {
+ samples_to_read = (int)samples_left;
+ size = samples_to_read * sizeof(float) * _info->fmt.channels;
+ }
+ }
+
+ // Read until we have enough bytes to satisfy streamer, or there are none left
+ int bytes_read = 0;
+ int ret = OP_HOLE;
+
+ int samples_read = 0;
+ while (samples_read < samples_to_read && (ret > 0 || ret == OP_HOLE))
+ {
+ int nframes = samples_to_read-samples_read;
+ float pcmnframes * _info->fmt.channels;
+ int new_link = -1;
+ ret = op_read_float(info->opusfile, pcm, nframes * _info->fmt.channels, &new_link);
+
+ if (ret < 0) {
+ }
+ else if (new_link != info->cur_bit_stream && !op_seekable (info->opusfile) && new_streaming_link(info, new_link)) {
+ samples_read = samples_to_read;
+ break;
+ }
+ else if (ret > 0) {
+ for (int channel = 0; channel < _info->fmt.channels; channel++) {
+ const float *pcm_channel = &pcminfo->channelmap ? info->channelmapchannel : channel;
+ float *ptr = ((float *)bytes + samples_read*_info->fmt.channels) + channel;
+ for (int sample = 0; sample < ret; sample ++, pcm_channel += _info->fmt.channels) {
+ *ptr = *pcm_channel;
+ ptr += _info->fmt.channels;
+ }
+ }
+ samples_read += ret;
+ }
+ }
+ bytes_read = samples_read * sizeof(float) * _info->fmt.channels;
+ info->currentsample += bytes_read / (sizeof (float) * _info->fmt.channels);
+
+
+ int64_t startsample = deadbeef->pl_item_get_startsample (info->it);
+ _info->readpos = (float)(op_pcm_tell(info->opusfile) - startsample) / _info->fmt.samplerate;
+ if (info->set_bitrate && _info->readpos > info->next_update) {
+ const int rate = (int)op_bitrate_instant(info->opusfile) / 1000;
+ if (rate > 0) {
+ deadbeef->streamer_set_bitrate(rate);
+ info->next_update = info->next_update <= 0 ? info->next_update + 1 : _info->readpos + 5;
+ }
+ }
+
+ return bytes_read;
+}
+
+static int
+opusdec_seek (DB_fileinfo_t *_info, float time) {
+ return opusdec_seek_sample64 (_info, (int64_t)((double)time * (int64_t)_info->fmt.samplerate));
+}
+
+static off_t
+sample_offset(OggOpusFile *opusfile, const opus_int64 sample)
+{
+ if (sample <= 0 || sample == op_pcm_total(opusfile, -1))
+ return 0;
+
+ if (op_pcm_seek(opusfile, sample)) {
+ return -1;
+ }
+
+ return op_raw_tell(opusfile);
+}
+
+static DB_playItem_t *
+opusdec_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
+ return NULL;
+ }
+ int64_t fsize = deadbeef->fgetlength (fp);
+ if (fp->vfs->is_streaming ()) {
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
+ deadbeef->plt_set_item_duration (plt, it, -1);
+ deadbeef->pl_add_meta (it, "title", NULL);
+ after = deadbeef->plt_insert_item (plt, after, it);
+ deadbeef->pl_item_unref (it);
+ deadbeef->fclose (fp);
+ return after;
+ }
+
+ OggOpusFile *opusfile = opus_file_open (fp);
+ if (!opusfile) {
+ deadbeef->fclose (fp);
+ return NULL;
+ }
+
+ long nstreams = op_link_count (opusfile);
+ int64_t currentsample = 0;
+ for (int stream = 0; stream < nstreams; stream++) {
+ const OpusHead *head = op_head (opusfile, stream);
+ if (!head) {
+ continue;
+ }
+ int64_t totalsamples = op_pcm_total (opusfile, stream);
+ const float duration = totalsamples / 48000.f;
+
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
+ deadbeef->pl_set_meta_int (it, ":TRACKNUM", stream);
+ deadbeef->plt_set_item_duration (plt, it, duration);
+ if (nstreams > 1) {
+ deadbeef->pl_item_set_startsample (it, currentsample);
+ deadbeef->pl_item_set_endsample (it, currentsample + totalsamples - 1);
+ deadbeef->pl_set_item_flags (it, DDB_IS_SUBTRACK);
+ }
+
+ if (update_vorbis_comments (it, opusfile, stream))
+ continue;
+ int samplerate = 48000;
+
+ int64_t startsample = deadbeef->pl_item_get_startsample (it);
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+
+ const off_t start_offset = sample_offset(opusfile, startsample-1);
+ const off_t end_offset = sample_offset(opusfile, endsample);
+ char *filetype = NULL;
+ const off_t stream_size = oggedit_opus_stream_info(deadbeef->fopen(fname), start_offset, end_offset, &filetype);
+ if (filetype) {
+ deadbeef->pl_replace_meta(it, ":FILETYPE", filetype);
+ free(filetype);
+ }
+ if (stream_size > 0) {
+ set_meta_ll(it, ":OPUS_STREAM_SIZE", stream_size);
+ deadbeef->pl_set_meta_int(it, ":BITRATE", 8.f * samplerate * stream_size / totalsamples / 1000);
+ }
+ set_meta_ll (it, ":FILE_SIZE", fsize);
+ deadbeef->pl_set_meta_int (it, ":CHANNELS", head->channel_count);
+ deadbeef->pl_set_meta_int (it, ":SAMPLERATE", samplerate);
+
+ if (nstreams == 1) {
+ DB_playItem_t *cue = deadbeef->plt_process_cue (plt, after, it, totalsamples, samplerate);
+ if (cue) {
+ deadbeef->pl_item_unref (it);
+ op_free(opusfile);
+ deadbeef->fclose (fp);
+ return cue;
+ }
+ }
+ else {
+ currentsample += totalsamples;
+ }
+
+ after = deadbeef->plt_insert_item (plt, after, it);
+ deadbeef->pl_item_unref (it);
+ }
+ op_free(opusfile);
+ deadbeef->fclose (fp);
+ return after;
+}
+
+static int
+opusdec_read_metadata (DB_playItem_t *it) {
+ int res = -1;
+
+ DB_FILE *fp = NULL;
+ OggOpusFile *opusfile = NULL;
+ const OpusHead *head = NULL;
+
+ deadbeef->pl_lock ();
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ fp = deadbeef->fopen (uri);
+ if (!fp) {
+ goto error;
+ }
+ if (fp->vfs->is_streaming ()) {
+ goto error;
+ }
+
+ opusfile = opus_file_open (fp);
+ if (!opusfile) {
+ goto error;
+ }
+
+ int tracknum = deadbeef->pl_find_meta_int (it, ":TRACKNUM", -1);
+ head = op_head (opusfile, tracknum);
+ if (!head) {
+ goto error;
+ }
+
+ if (update_vorbis_comments (it, opusfile, tracknum)) {
+ goto error;
+ }
+
+ res = 0;
+error:
+ if (opusfile) {
+ op_free (opusfile);
+ }
+ if (fp) {
+ deadbeef->fclose (fp);
+ }
+ return res;
+}
+
+static void
+split_tag(OpusTags *tags, const char *key, const char *value, int valuesize)
+{
+ while (valuesize > 0) {
+ opus_tags_add(tags, key, value);
+ size_t l = strlen (value) + 1;
+ value += l;
+ valuesize -= l;
+ }
+}
+
+static OpusTags *
+tags_list(DB_playItem_t *it, OggOpusFile *opusfile, int link)
+{
+ const OpusTags *orig = op_tags (opusfile, link);
+
+ OpusTags *tags = calloc (1, sizeof (OpusTags));
+ if (!tags)
+ return NULL;
+
+ deadbeef->pl_lock ();
+ for (DB_metaInfo_t *m = deadbeef->pl_get_metadata_head (it); m; m = m->next) {
+ if (strchr (":!_", m->key0)) {
+ break;
+ }
+ char *key = strdupa (m->key);
+ if (!strcasecmp(key, "R128_TRACK_GAIN")) {
+ continue;
+ }
+ split_tag (tags, oggedit_map_tag (key, "meta2tag"), m->value, m->valuesize);
+ }
+
+ deadbeef->pl_unlock ();
+
+ // preserve album art
+ int i = 0;
+ const char *tag;
+ while ((tag = opus_tags_query(orig, ALBUM_ART_KEY, i++))) {
+ split_tag (tags, ALBUM_ART_KEY, tag, (int)strlen (tag) + 1);
+ }
+
+ return tags;
+}
+
+static int
+opusdec_write_metadata (DB_playItem_t *it) {
+ char fnamePATH_MAX;
+ deadbeef->pl_get_meta (it, ":URI", fname, sizeof (fname));
+
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
+ return -1;
+ }
+
+ int is_streaming = fp->vfs->is_streaming();
+ const OpusFileCallbacks opcb = {
+ .read = opus_file_read,
+ .seek = is_streaming ? NULL : opus_file_seek,
+ .tell = is_streaming ? NULL : opus_file_tell,
+ .close = opus_file_close
+ };
+
+ int res = 0;
+
+ OggOpusFile *opusfile = op_test_callbacks(fp, &opcb, NULL, 0, &res);
+ if (!opusfile) {
+ deadbeef->fclose (fp);
+ return -1;
+ }
+
+ int link = 0;
+ if (deadbeef->pl_get_item_flags (it) & DDB_IS_SUBTRACK) {
+ link = deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0);
+ }
+
+ OpusTags *tags = tags_list(it, opusfile, link);
+ if (!tags) {
+ op_free (opusfile);
+ deadbeef->fclose (fp);
+ return -1;
+ }
+
+ deadbeef->pl_lock();
+
+ // RG info
+ const char *track_gain_str = deadbeef->pl_find_meta (it, ddb_internal_rg_keysDDB_REPLAYGAIN_TRACKGAIN);
+ float track_gain = 0;
+ if (track_gain_str) {
+ track_gain = atof (track_gain_str);
+ }
+
+ const char *album_gain_str = deadbeef->pl_find_meta (it, ddb_internal_rg_keysDDB_REPLAYGAIN_ALBUMGAIN);
+ float album_gain = 0;
+ if (album_gain_str) {
+ album_gain = atof (album_gain_str);
+ }
+
+ if (track_gain_str) {
+ char s100;
+ snprintf (s, sizeof (s), "%d", 0);
+ split_tag (tags, oggedit_map_tag (strdupa ("R128_TRACK_GAIN"), "meta2tag"), s, (int)strlen (s) + 1);
+ }
+
+ float value = deadbeef->pl_get_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN);
+ if (value != 0) {
+ char s100;
+ snprintf (s, sizeof (s), "%d", (int)(album_gain - track_gain) * 256);
+ split_tag (tags, oggedit_map_tag (strdupa ("R128_ALBUM_GAIN"), "meta2tag"), s, (int)strlen (s) + 1);
+ }
+
+ int header_gain = 0;
+ if (track_gain_str) {
+ header_gain = (track_gain - 5.f) * 256;
+ }
+
+ const char *stream_size_string = deadbeef->pl_find_meta(it, ":STREAM SIZE");
+ const size_t stream_size = stream_size_string ? (off_t)atoll(stream_size_string) : 0;
+ deadbeef->pl_unlock();
+ const off_t file_size = oggedit_write_opus_metadata (deadbeef->fopen(fname), fname, 0, stream_size, header_gain, tags->comments, tags->user_comments);
+ opus_tags_clear(tags);
+
+ res = 0;
+ if (file_size <= 0) {
+ res = -1;
+ }
+
+ op_free (opusfile);
+ deadbeef->fclose (fp);
+
+ if (!res) {
+ set_meta_ll(it, ":FILE_SIZE", (int64_t)file_size);
+ res = opusdec_read_metadata(it);
+ }
+ return res;
+}
+
+
+// define plugin interface
+static ddb_decoder2_t plugin = {
+ .decoder.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .decoder.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .decoder.plugin.version_major = 1,
+ .decoder.plugin.version_minor = 0,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_LOGGING | DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.id = "opus",
+ .decoder.plugin.name = "Opus player",
+ .decoder.plugin.descr = "Opus player based on libogg, libopus and libopusfile.",
+ .decoder.plugin.copyright =
+ "deadbeef-opus\n"
+ "Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\n"
+ "\n"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\n"
+ "\n"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\n"
+ "\n"
+ "3. This notice may not be removed or altered from any source distribution.\n"
+ "\n\n\n"
+ "libogg, opus, opusfile\n"
+ "Copyright (c) 1994-2013 Xiph.Org Foundation and contributors\n"
+ "\n\n\n"
+ "liboggedit\n"
+ "Copyright (C) 2014 Ian Nartowicz <deadbeef@nartowicz.co.uk>\n",
+ .decoder.open = opusdec_open,
+ .decoder.open2 = opusdec_open2,
+ .decoder.init = opusdec_init,
+ .decoder.free = opusdec_free,
+ .decoder.read = opusdec_read,
+ .decoder.seek = opusdec_seek,
+ .decoder.seek_sample = opusdec_seek_sample,
+ .decoder.insert = opusdec_insert,
+ .decoder.read_metadata = opusdec_read_metadata,
+ .decoder.write_metadata = opusdec_write_metadata,
+ .decoder.exts = exts,
+ .seek_sample64 = opusdec_seek_sample64,
+};
+
+DB_plugin_t *
+opus_load (DB_functions_t *api) {
+ deadbeef = api;
+ return DB_PLUGIN (&plugin);
+}
+

deadbeef-0.6.2.tar.bz2/plugins/oss/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/oss/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/oss/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/oss/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/oss/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/oss/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/oss/oss.c -> deadbeef-1.9.6.tar.bz2/plugins/oss/oss.c Changed

@@ -1,6 +1,6 @@
 /*
 OSS output plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko and contributors
+ Copyright (C) 2009-2014 Oleksiy Yakovenko and contributors
 
 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
@@ -25,15 +25,11 @@
 #endif
 #include <stdio.h>
 #include <string.h>
-#if HAVE_SYS_SOUNDCARD_H
 #include <sys/soundcard.h>
-#else
-#include <soundcard.h>
-#endif
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <stdlib.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
@@ -44,7 +40,7 @@
 static intptr_t oss_tid;
 static int oss_terminate;
 static int oss_rate = 44100;
-static int state;
+static ddb_playback_state_t state;
 static int fd;
 static uintptr_t mutex;
 
@@ -128,7 +124,7 @@
 static int
 oss_init (void) {
 trace ("oss_init\n");
- state = OUTPUT_STATE_STOPPED;
+ state = DDB_PLAYBACK_STATE_STOPPED;
 oss_terminate = 0;
 mutex = 0;
 
@@ -158,7 +154,7 @@
 deadbeef->thread_join (oss_tid);
 }
 oss_tid = 0;
- state = OUTPUT_STATE_STOPPED;
+ state = DDB_PLAYBACK_STATE_STOPPED;
 oss_terminate = 0;
 if (fd) {
 close (fd);
@@ -179,23 +175,23 @@
 return -1;
 }
 }
- state = OUTPUT_STATE_PLAYING;
+ state = DDB_PLAYBACK_STATE_PLAYING;
 return 0;
 }
 
 static int
 oss_stop (void) {
- state = OUTPUT_STATE_STOPPED;
+ state = DDB_PLAYBACK_STATE_STOPPED;
 deadbeef->streamer_reset (1);
 return 0;
 }
 
 static int
 oss_pause (void) {
- if (state == OUTPUT_STATE_STOPPED) {
+ if (state == DDB_PLAYBACK_STATE_STOPPED) {
 return -1;
 }
- state = OUTPUT_STATE_PAUSED;
+ state = DDB_PLAYBACK_STATE_PAUSED;
 return 0;
 }
 
@@ -228,11 +224,11 @@
 deadbeef->mutex_unlock (mutex);
 
 switch (_state) {
- case OUTPUT_STATE_STOPPED:
+ case DDB_PLAYBACK_STATE_STOPPED:
 return oss_stop ();
- case OUTPUT_STATE_PLAYING:
+ case DDB_PLAYBACK_STATE_PLAYING:
 return oss_play ();
- case OUTPUT_STATE_PAUSED:
+ case DDB_PLAYBACK_STATE_PAUSED:
 if (0 != oss_play ()) {
 return -1;
 }
@@ -283,7 +279,7 @@
 if (oss_terminate) {
 break;
 }
- if (state != OUTPUT_STATE_PLAYING || !deadbeef->streamer_ok_to_read (-1)) {
+ if (state != DDB_PLAYBACK_STATE_PLAYING || !deadbeef->streamer_ok_to_read (-1)) {
 usleep (10000);
 continue;
 }
@@ -318,7 +314,7 @@
 return deadbeef->streamer_read (stream, len);
 }
 
-static int
+static ddb_playback_state_t
 oss_get_state (void) {
 return state;
 }
@@ -368,8 +364,7 @@
 
 // define plugin interface
 static DB_output_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_OUTPUT,
@@ -378,7 +373,7 @@
 .plugin.descr = "plays sound via OSS API",
 .plugin.copyright = 
 "OSS output plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko and contributors\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko and contributors\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"

deadbeef-0.6.2.tar.bz2/plugins/pltbrowser/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/pltbrowser/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/pltbrowser/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/pltbrowser/Makefile.am Changed

@@ -12,28 +12,18 @@
 endif
 endif
 
-AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
-
 if HAVE_GTK2
 pltbrowser_gtk2_la_SOURCES = pltbrowser.c support.c support.h
 pltbrowser_gtk2_la_LDFLAGS = -module -avoid-version
-if STATICLINK
-GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
-
-pltbrowser_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
-
-pltbrowser_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
 pltbrowser_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
-pltbrowser_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
-endif
+pltbrowser_gtk2_la_CFLAGS = $(CFLAGS) -std=c99 $(GTK2_DEPS_CFLAGS) -I@top_srcdir@/include -fPIC
 endif
 
 if HAVE_GTK3
 pltbrowser_gtk3_la_SOURCES = pltbrowser.c
 pltbrowser_gtk3_la_LDFLAGS = -module -avoid-version
 pltbrowser_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
-pltbrowser_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
+pltbrowser_gtk3_la_CFLAGS = $(CFLAGS) -std=c99 $(GTK3_DEPS_CFLAGS) -I@top_srcdir@/include -fPIC
 endif
 
 endif

deadbeef-0.6.2.tar.bz2/plugins/pltbrowser/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/pltbrowser/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/pltbrowser/pltbrowser.c -> deadbeef-1.9.6.tar.bz2/plugins/pltbrowser/pltbrowser.c Changed

@@ -1,6 +1,6 @@
 /*
 Playlist browser widget plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy 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
@@ -20,7 +20,7 @@
 
 3. This notice may not be removed or altered from any source distribution.
 */
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,18 +37,83 @@
 typedef struct {
 ddb_gtkui_widget_t base;
 GtkWidget *tree;
+ GtkTreeViewColumn *col_playing;
+ GtkTreeViewColumn *col_items;
+ GtkTreeViewColumn *col_duration;
 int last_selected;
 gulong cc_id;
 gulong ri_id;
 } w_pltbrowser_t;
 
+enum
+{
+ COL_PLAYING,
+ COL_NAME,
+ COL_ITEMS,
+ COL_DURATION,
+};
+
+// copied from gtkui.c
+static int
+add_new_playlist (void) {
+ int cnt = deadbeef->plt_get_count ();
+ int i;
+ int idx = 0;
+ for (;;) {
+ char name100;
+ if (!idx) {
+ strcpy (name, _("New Playlist"));
+ }
+ else {
+ snprintf (name, sizeof (name), _("New Playlist (%d)"), idx);
+ }
+ deadbeef->pl_lock ();
+ for (i = 0; i < cnt; i++) {
+ char t100;
+ ddb_playlist_t *plt = deadbeef->plt_get_for_idx (i);
+ deadbeef->plt_get_title (plt, t, sizeof (t));
+ deadbeef->plt_unref (plt);
+ if (!strcasecmp (t, name)) {
+ break;
+ }
+ }
+ deadbeef->pl_unlock ();
+ if (i == cnt) {
+ return deadbeef->plt_add (cnt, name);
+ }
+ idx++;
+ }
+ return -1;
+}
+
+static int
+get_treeview_cursor_pos (GtkTreeView *tree)
+{
+ if (!tree) {
+ return -1;
+ }
+ GtkTreePath *path;
+ GtkTreeViewColumn *col;
+ gtk_tree_view_get_cursor (GTK_TREE_VIEW (tree), &path, &col);
+ if (!path || !col) {
+ return -1;
+ }
+ int result = -1;
+ int *indices = gtk_tree_path_get_indices (path);
+ if (indices) {
+ result = indices0;
+ g_free (indices);
+ }
+ return result;
+}
+
 static void
 on_pltbrowser_row_inserted (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data) {
 w_pltbrowser_t *plt = user_data;
 int *indices = gtk_tree_path_get_indices (path);
 int idx = *indices;
 if (idx > plt->last_selected) {
- idx--;
+ idx--; // this is necessary, because in this case the rows will shift "up".
 }
 if (idx == plt->last_selected) {
 return;
@@ -57,31 +122,109 @@
 deadbeef->plt_move (plt->last_selected, idx);
 plt->last_selected = idx;
 deadbeef->plt_set_curr_idx (idx);
- deadbeef->sendmessage (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_POSITION, 0);
 }
 
+static gboolean
+update_pltbrowser_cb (gpointer data);
+
 static void
 on_pltbrowser_cursor_changed (GtkTreeView *treeview, gpointer user_data) {
 w_pltbrowser_t *w = user_data;
- GtkTreePath *path;
- GtkTreeViewColumn *col;
- gtk_tree_view_get_cursor (treeview, &path, &col);
- if (!path) {
- return;
- }
- int *indices = gtk_tree_path_get_indices (path);
- if (indices) {
- if (indices0 >= 0) {
- deadbeef->plt_set_curr_idx (indices0);
- w->last_selected = indices0;
- }
- g_free (indices);
+ int cursor = get_treeview_cursor_pos (treeview);
+ if (cursor >= 0) {
+ deadbeef->plt_set_curr_idx (cursor);
+ w->last_selected = cursor;
 }
 }
 
 gboolean
 on_pltbrowser_popup_menu (GtkWidget *widget, gpointer user_data);
 
+static void
+fill_pltbrowser_rows (gpointer user_data)
+{
+ w_pltbrowser_t *w = user_data;
+
+ GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (w->tree)));
+ deadbeef->pl_lock ();
+ int n = deadbeef->plt_get_count ();
+ int plt_active = deadbeef->streamer_get_current_playlist ();
+ int highlight_curr = deadbeef->conf_get_int ("gtkui.pltbrowser.highlight_curr_plt", 0);
+ ddb_playback_state_t playback_state = deadbeef->get_output ()->state ();
+
+ for (int i = 0; i < n; i++) {
+ ddb_playlist_t *plt = deadbeef->plt_get_for_idx (i);
+ if (!plt) {
+ continue;
+ }
+ GtkTreeIter iter;
+ gtk_tree_model_iter_nth_child (gtk_tree_view_get_model (GTK_TREE_VIEW (w->tree)), &iter, NULL, i);
+ GdkPixbuf *playing_pixbuf = NULL;
+ char title1000;
+ char title_temp1000;
+ char num_items_str100;
+ deadbeef->plt_get_title (plt, title_temp, sizeof (title_temp));
+ if (plt_active == i && highlight_curr) {
+ if (playback_state == DDB_PLAYBACK_STATE_PAUSED) {
+ snprintf (title, sizeof (title), "%s%s", title_temp, _(" (paused)"));
+ }
+ else if (playback_state == DDB_PLAYBACK_STATE_STOPPED) {
+ snprintf (title, sizeof (title), "%s%s", title_temp, _(" (stopped)"));
+ }
+ else {
+ snprintf (title, sizeof (title), "%s%s", title_temp, _(" (playing)"));
+ }
+ }
+ else {
+ snprintf (title, sizeof (title), "%s", title_temp);
+ }
+
+ if (plt_active == i) {
+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
+ if (icon_theme) {
+ if (playback_state == DDB_PLAYBACK_STATE_PAUSED) {
+ playing_pixbuf = gtk_icon_theme_load_icon (icon_theme, "media-playback-pause", 16, 0, NULL);
+ }
+ else if (playback_state == DDB_PLAYBACK_STATE_STOPPED) {
+ playing_pixbuf = gtk_icon_theme_load_icon (icon_theme, "media-playback-stop", 16, 0, NULL);
+ }
+ else {
+ playing_pixbuf = gtk_icon_theme_load_icon (icon_theme, "media-playback-start", 16, 0, NULL);
+ }
+ }
+ }
+
+ int num_items = deadbeef->plt_get_item_count (plt, PL_MAIN);
+ snprintf (num_items_str, sizeof (num_items_str), "%d", num_items);
+
+ float pl_totaltime = deadbeef->plt_get_totaltime (plt);
+ int daystotal = (int)pl_totaltime / (3600*24);
+ int hourtotal = ((int)pl_totaltime / 3600) % 24;
+ int mintotal = ((int)pl_totaltime/60) % 60;
+ int sectotal = ((int)pl_totaltime) % 60;
+
+ char totaltime_str512 = "";
+ if (daystotal == 0) {
+ snprintf (totaltime_str, sizeof (totaltime_str), "%d:%02d:%02d", hourtotal, mintotal, sectotal);
+ }
+ else {
+ // NOTE: localizable because of the "d" suffix for days
+ snprintf (totaltime_str, sizeof (totaltime_str), _("%dd %d:%02d:%02d"), daystotal, hourtotal, mintotal, sectotal);
+ }
+
+ gtk_list_store_set (store, &iter, COL_PLAYING, playing_pixbuf, COL_NAME, title, COL_ITEMS, num_items_str, COL_DURATION, totaltime_str, -1);
+ deadbeef->plt_unref (plt);
+ }
+ deadbeef->pl_unlock ();
+}
+
+static gboolean
+update_pltbrowser_cb (gpointer data) {
+ fill_pltbrowser_rows (data);
+ return FALSE;
+}
+
 static gboolean
 fill_pltbrowser_cb (gpointer data) {
 w_pltbrowser_t *w = data;
@@ -96,13 +239,10 @@
 gtk_list_store_clear (store);
 int n = deadbeef->plt_get_count ();
 int curr = deadbeef->plt_get_curr_idx ();
+
 for (int i = 0; i < n; i++) {
- ddb_playlist_t *plt = deadbeef->plt_get_for_idx (i);
 GtkTreeIter iter;
 gtk_list_store_append (store, &iter);
- char buf1000;
- deadbeef->plt_get_title (plt, buf, sizeof (buf));
- gtk_list_store_set (store, &iter, 0, buf, -1);
 }
 if (curr != -1) {
 GtkTreePath *path = gtk_tree_path_new_from_indices (curr, -1);
@@ -110,69 +250,567 @@
 gtk_tree_path_free (path);
 }
 deadbeef->pl_unlock ();
+
+ fill_pltbrowser_rows (data);
+
 w->ri_id = g_signal_connect ((gpointer)store, "row_inserted", G_CALLBACK (on_pltbrowser_row_inserted), w);
 w->cc_id = g_signal_connect ((gpointer)w->tree, "cursor_changed", G_CALLBACK (on_pltbrowser_cursor_changed), w);
 g_signal_connect ((gpointer) w->tree, "popup_menu", G_CALLBACK (on_pltbrowser_popup_menu), NULL);
 return FALSE;
 }
 
+static gboolean
+update_treeview_cursor (gpointer user_data)
+{
+ w_pltbrowser_t *w = user_data;
+ int curr = deadbeef->plt_get_curr_idx ();
+ if (curr != -1) {
+ GtkTreePath *path = gtk_tree_path_new_from_indices (curr, -1);
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (w->tree), path, NULL, FALSE);
+ gtk_tree_path_free (path);
+ }
+ return FALSE;
+}
+
 static int
 pltbrowser_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
 switch (id) {
+ case DB_EV_SONGCHANGED:
+ {
+ int highlight_curr_plt = deadbeef->conf_get_int ("gtkui.pltbrowser.highlight_curr_plt", 0);
+ // only fill when playlist changed
+ if (highlight_curr_plt) {
+ ddb_event_trackchange_t *ev = (ddb_event_trackchange_t *)ctx;
+ if (ev->from && ev->to) {
+ ddb_playlist_t *plt_from = deadbeef->pl_get_playlist (ev->from);
+ ddb_playlist_t *plt_to = deadbeef->pl_get_playlist (ev->to);
+ if (plt_from != plt_to) {
+ g_idle_add (update_pltbrowser_cb, w);
+ }
+ if (plt_from) {
+ deadbeef->plt_unref (plt_from);
+ }
+ if (plt_to) {
+ deadbeef->plt_unref (plt_to);
+ }
+ }
+ else if (!ev->from) {
+ g_idle_add (update_pltbrowser_cb, w);
+ }
+ }
+ }
+ break;
 case DB_EV_PLAYLISTSWITCHED:
- g_idle_add (fill_pltbrowser_cb, w);
+ g_idle_add (update_treeview_cursor, w);
+ break;
+ case DB_EV_CONFIGCHANGED:
+ case DB_EV_PAUSED:
+ case DB_EV_STOP:
+ case DB_EV_TRACKINFOCHANGED:
+ g_idle_add (update_pltbrowser_cb, w);
+ break;
+ case DB_EV_PLAYLISTCHANGED:
+ if (p1 == DDB_PLAYLIST_CHANGE_CONTENT
+ || p1 == DDB_PLAYLIST_CHANGE_TITLE)
+ g_idle_add (update_pltbrowser_cb, w);
+ else if (p1 == DDB_PLAYLIST_CHANGE_POSITION
+ || p1 == DDB_PLAYLIST_CHANGE_DELETED
+ || p1 == DDB_PLAYLIST_CHANGE_CREATED) {
+ g_idle_add (fill_pltbrowser_cb, w);
+ }
 break;
 }
 return 0;
 }
 
+// x, y must be relative to GtkTreeView's bin_window (see GtkTreeView documentation)
+static int
+get_treeview_row_at_pos (GtkTreeView *widget, int x, int y)
+{
+ GtkTreePath *path = NULL;
+ gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), x, y, &path, NULL, NULL, NULL);
+
+ int row = -1;
+ if (!path) {
+ // (probably) clicked empty area
+ return row;
+ }
+ else {
+ int *indices = gtk_tree_path_get_indices (path);
+ if (indices) {
+ if (indices0 >= 0) {
+ row = indices0;
+ }
+ g_free (indices);
+ }
+ }
+ return row;
+}
 
 static void
 w_pltbrowser_init (struct ddb_gtkui_widget_s *w) {
 fill_pltbrowser_cb (w);
 }
 
+static GtkTreeViewColumn *
+add_treeview_column (w_pltbrowser_t *w, GtkTreeView *tree, int pos, int expand, int align_right, const char *title, int is_pixbuf);
+
+static void
+on_popup_header_playing_clicked (GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+{
+ w_pltbrowser_t *w = user_data;
+ int active = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (checkmenuitem));
+ deadbeef->conf_set_int ("gtkui.pltbrowser.show_playing_column", active);
+ if (active) {
+ gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (w->col_playing), 1);
+ }
+ else if (w->col_playing) {
+ gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (w->col_playing), 0);
+ }
+}
+
+static void
+on_popup_header_items_clicked (GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+{
+ w_pltbrowser_t *w = user_data;
+ int active = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (checkmenuitem));
+ deadbeef->conf_set_int ("gtkui.pltbrowser.show_items_column", active);
+ if (active) {
+ gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (w->col_items), 1);
+ }
+ else if (w->col_items) {
+ gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (w->col_items), 0);
+ }
+}
+
+static void
+on_popup_header_duration_clicked (GtkCheckMenuItem *checkmenuitem, gpointer user_data)
+{
+ w_pltbrowser_t *w = user_data;
+ int active = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (checkmenuitem));
+ deadbeef->conf_set_int ("gtkui.pltbrowser.show_duration_column", active);
+ if (active) {
+ gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (w->col_duration), 1);
+ }
+ else if (w->col_duration) {
+ gtk_tree_view_column_set_visible (GTK_TREE_VIEW_COLUMN (w->col_duration), 0);
+ }
+}
+
+static gboolean
+on_pltbrowser_header_popup_menu (GtkWidget *widget, gpointer user_data)
+{
+ w_pltbrowser_t *w = user_data;
+ GtkWidget *popup = gtk_menu_new ();
+ GtkWidget *playing = gtk_check_menu_item_new_with_mnemonic (_("Playing"));
+ GtkWidget *items = gtk_check_menu_item_new_with_mnemonic (_("Items"));
+ GtkWidget *duration = gtk_check_menu_item_new_with_mnemonic (_("Duration"));
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (playing), deadbeef->conf_get_int ("gtkui.pltbrowser.show_playing_column", 0));
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (items), deadbeef->conf_get_int ("gtkui.pltbrowser.show_items_column", 0));
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (duration), deadbeef->conf_get_int ("gtkui.pltbrowser.show_duration_column", 0));
+ gtk_container_add (GTK_CONTAINER (popup), playing);
+ gtk_container_add (GTK_CONTAINER (popup), items);
+ gtk_container_add (GTK_CONTAINER (popup), duration);
+ gtk_widget_show (popup);
+ gtk_widget_show (playing);
+ gtk_widget_show (items);
+ gtk_widget_show (duration);
+ g_signal_connect_after ((gpointer) playing, "toggled", G_CALLBACK (on_popup_header_playing_clicked), w);
+ g_signal_connect_after ((gpointer) items, "toggled", G_CALLBACK (on_popup_header_items_clicked), w);
+ g_signal_connect_after ((gpointer) duration, "toggled", G_CALLBACK (on_popup_header_duration_clicked), w);
+ gtk_menu_attach_to_widget (GTK_MENU (popup), GTK_WIDGET (widget), NULL);
+ gtk_menu_popup (GTK_MENU (popup), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
+ return TRUE;
+}
+
+static int
+cmp_playlist_name_func (const void *a, const void *b) {
+ ddb_playlist_t *aa = *((ddb_playlist_t **)a);
+ ddb_playlist_t *bb = *((ddb_playlist_t **)b);
+ char title01000;
+ char title11000;
+ deadbeef->plt_get_title (aa, title0, sizeof (title0));
+ deadbeef->plt_get_title (bb, title1, sizeof (title1));
+ return strcasecmp (title0, title1);
+}
+
+static int
+cmp_playlist_items_func (const void *a, const void *b) {
+ ddb_playlist_t *aa = *((ddb_playlist_t **)a);
+ ddb_playlist_t *bb = *((ddb_playlist_t **)b);
+ int num_items0 = deadbeef->plt_get_item_count (aa, PL_MAIN);
+ int num_items1 = deadbeef->plt_get_item_count (bb, PL_MAIN);
+ return num_items0 - num_items1;
+}
+
+static int
+cmp_playlist_duration_func (const void *a, const void *b) {
+ ddb_playlist_t *aa = *((ddb_playlist_t **)a);
+ ddb_playlist_t *bb = *((ddb_playlist_t **)b);
+ float pl_totaltime0 = deadbeef->plt_get_totaltime (aa);
+ float pl_totaltime1 = deadbeef->plt_get_totaltime (bb);
+ if (pl_totaltime0 > pl_totaltime1) {
+ return 1;
+ }
+ else if (pl_totaltime0 == pl_totaltime1) {
+ return 0;
+ }
+ else {
+ return -1;
+ }
+}
+
+static void
+sort_playlists (int order, int (*qsort_cmp_func)(const void *, const void*))
+{
+ deadbeef->pl_lock ();
+ int plt_count = deadbeef->plt_get_count ();
+ ddb_playlist_t **array = malloc (plt_count * sizeof (ddb_playlist_t *));
+ int idx = 0;
+ for (ddb_playlist_t *plt = deadbeef->plt_get_for_idx (idx); plt; idx++, plt = deadbeef->plt_get_for_idx (idx)) {
+ arrayidx = plt;
+ }
+ qsort (array, plt_count, sizeof (ddb_playlist_t *), qsort_cmp_func);
+ deadbeef->pl_unlock ();
+
+ for (int i = 0; i < plt_count; i++) {
+ int idx = deadbeef->plt_get_idx (arrayi);
+ if (order == GTK_SORT_ASCENDING) {
+ deadbeef->plt_move (idx, i);
+ }
+ else {
+ deadbeef->plt_move (idx, plt_count - i - 1);
+ }
+ deadbeef->plt_unref (arrayi);
+ }
+
+ free (array);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_POSITION, 0);
+}
+
+static void
+sort_by_name (int order)
+{
+ sort_playlists (order, cmp_playlist_name_func);
+ return;
+}
+
+static void
+sort_by_items (int order)
+{
+ sort_playlists (order, cmp_playlist_items_func);
+ return;
+}
+
+static void
+sort_by_duration (int order)
+{
+ sort_playlists (order, cmp_playlist_duration_func);
+ return;
+}
+
+static gint
+get_col_number_from_tree_view_column (GtkTreeView *view, GtkTreeViewColumn *col)
+{
+ GList *cols = gtk_tree_view_get_columns(GTK_TREE_VIEW (view));
+ gint num = g_list_index(cols, (gpointer) col);
+ g_list_free(cols);
+ return num;
+}
+
+static gboolean
+on_pltbrowser_column_clicked (GtkTreeViewColumn *col,
+ gpointer user_data)
+{
+ GtkWidget *view = gtk_tree_view_column_get_tree_view (GTK_TREE_VIEW_COLUMN (col));
+ int order = gtk_tree_view_column_get_sort_order (GTK_TREE_VIEW_COLUMN (col));
+
+ // remove sort indicator from every column
+ GList *list = gtk_tree_view_get_columns (GTK_TREE_VIEW (view));
+ GList *node = list;
+ GtkTreeViewColumn *column = node->data;
+ while (node) {
+ column = node->data;
+ gtk_tree_view_column_set_sort_indicator (GTK_TREE_VIEW_COLUMN (column), FALSE);
+ node = node->next;
+ }
+ g_list_free (list);
+
+ // add sort indicator to current column
+ gtk_tree_view_column_set_sort_indicator (GTK_TREE_VIEW_COLUMN (col), TRUE);
+ gtk_tree_view_column_set_sort_order (GTK_TREE_VIEW_COLUMN (col), !order);
+
+ // sort clicked column
+ int col_id = get_col_number_from_tree_view_column (GTK_TREE_VIEW (view), GTK_TREE_VIEW_COLUMN (col));
+ switch (col_id) {
+ case COL_PLAYING:
+ break;
+ case COL_NAME:
+ sort_by_name (order);
+ break;
+ case COL_ITEMS:
+ sort_by_items (order);
+ break;
+ case COL_DURATION:
+ sort_by_duration (order);
+ break;
+ default:
+ sort_by_name (order);
+ break;
+ }
+ return FALSE;
+}
+
+static gboolean
+on_pltbrowser_header_clicked (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
+{
+ w_pltbrowser_t *w = user_data;
+ if (gtkui_plugin->w_get_design_mode ()) {
+ return FALSE;
+ }
+ if (event->type == GDK_BUTTON_PRESS) {
+ if (event->button == 3) {
+ return on_pltbrowser_header_popup_menu (widget, w);
+ }
+ }
+ return FALSE;
+}
+
+static gboolean
+on_pltbrowser_key_press_event (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data)
+{
+ w_pltbrowser_t *w = user_data;
+ if (event->state & GDK_CONTROL_MASK) {
+ int row = get_treeview_cursor_pos (GTK_TREE_VIEW (w->tree));
+ if (row >= 0) {
+ deadbeef->pl_lock ();
+ ddb_playlist_t *plt = deadbeef->plt_get_for_idx (row);
+ deadbeef->pl_unlock ();
+ if (plt) {
+ int res = 0;
+ if (event->keyval == GDK_c) {
+ gtkui_plugin->copy_selection (plt, DDB_ACTION_CTX_PLAYLIST);
+ res = 1;
+ }
+ else if (event->keyval == GDK_v) {
+ gtkui_plugin->paste_selection (plt, DDB_ACTION_CTX_PLAYLIST);
+ res = 1;
+ }
+ else if (event->keyval == GDK_x) {
+ gtkui_plugin->cut_selection (plt, DDB_ACTION_CTX_PLAYLIST);
+ res = 1;
+ }
+ deadbeef->plt_unref (plt);
+ return res;
+ }
+ }
+ }
+ return FALSE;
+}
+
+static GtkTreeViewColumn *
+add_treeview_column (w_pltbrowser_t *w, GtkTreeView *tree, int pos, int expand, int align_right, const char *title, int is_pixbuf)
+{
+ GtkCellRenderer *rend = NULL;
+ GtkTreeViewColumn *col = NULL;
+ if (is_pixbuf) {
+ rend = gtk_cell_renderer_pixbuf_new ();
+ col = gtk_tree_view_column_new_with_attributes (title, rend, "pixbuf", pos, NULL);
+ }
+ else {
+ rend = gtk_cell_renderer_text_new ();
+ col = gtk_tree_view_column_new_with_attributes (title, rend, "text", pos, NULL);
+ }
+ if (align_right) {
+ g_object_set (rend, "xalign", 1.0, NULL);
+ }
+ // GTK+ breaks row activation on editable rows, so we have to disable
+ // inline editing for now
+ /*
+ if (pos == COL_NAME) {
+ g_object_set (rend, "editable", TRUE, NULL);
+ g_signal_connect (rend, "editing_started",
+ G_CALLBACK (on_pltbrowser_cell_edititing_started),
+ w);
+ g_signal_connect (rend, "edited",
+ G_CALLBACK (on_pltbrowser_cell_edited),
+ w);
+ }
+ */
+ gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_column_set_expand (col, expand);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (tree), col, pos);
+ GtkWidget *label = gtk_label_new (title);
+ gtk_tree_view_column_set_widget (col, label);
+ gtk_widget_show (label);
+ GtkWidget *col_button = gtk_widget_get_ancestor(label, GTK_TYPE_BUTTON);
+ g_signal_connect (col_button, "button-press-event",
+ G_CALLBACK (on_pltbrowser_header_clicked),
+ w);
+ g_signal_connect (col, "clicked",
+ G_CALLBACK (on_pltbrowser_column_clicked),
+ w);
+ return col;
+}
+
+static gboolean drag_row_active = FALSE;
+
+static gboolean
+on_pltbrowser_drag_begin_event (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data)
+{
+ drag_row_active = TRUE;
+ return FALSE;
+}
+
+static gboolean
+on_pltbrowser_drag_end_event (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data)
+{
+ drag_row_active = FALSE;
+ return FALSE;
+}
+
+static gboolean
+on_pltbrowser_drag_motion_event (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data)
+{
+ w_pltbrowser_t *w = user_data;
+ if (drag_row_active) {
+ return FALSE;
+ }
+ GdkWindow *window = gtk_tree_view_get_bin_window (GTK_TREE_VIEW (widget));
+
+ int bin_x = 0;
+ int bin_y = 0;
+ gdk_window_get_position (window, &bin_x, &bin_y);
+
+ int row = get_treeview_row_at_pos (GTK_TREE_VIEW (widget), x - bin_x, y - bin_y);
+ if (row >= 0) {
+ deadbeef->plt_set_curr_idx (row);
+ w->last_selected = row;
+ }
+ return FALSE;
+}
+
 gboolean
-on_pltbrowser_button_press_event (GtkWidget *widget,
+on_pltbrowser_button_press_event (GtkWidget *widget,
 GdkEventButton *event,
 gpointer user_data)
 {
 if (gtkui_plugin->w_get_design_mode ()) {
 return FALSE;
 }
- if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
- return on_pltbrowser_popup_menu (widget, user_data);
+ if (event->type == GDK_BUTTON_PRESS) {
+ if (event->button == 3) {
+ int row_clicked = get_treeview_row_at_pos (GTK_TREE_VIEW (widget), event->x, event->y);
+ GtkWidget *menu = gtkui_plugin->create_pltmenu (row_clicked);
+ gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (widget), NULL);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, gtk_get_current_event_time());
+ return TRUE;
+ }
 }
 return FALSE;
 }
 
 gboolean
-on_pltbrowser_popup_menu (GtkWidget *widget, gpointer user_data) {
- GtkTreePath *path;
- GtkTreeViewColumn *col;
- gtk_tree_view_get_cursor (GTK_TREE_VIEW(widget), &path, &col);
- if (!path || !col) {
- // reset
+on_pltbrowser_button_press_end_event (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
+{
+ if (gtkui_plugin->w_get_design_mode ()) {
 return FALSE;
 }
- int *indices = gtk_tree_path_get_indices (path);
- int plt_idx;
- if (indices) {
- plt_idx = indices0;
- g_free (indices);
+ if (event->type == GDK_BUTTON_PRESS) {
+ if (event->button == 2) {
+ int row_clicked = get_treeview_row_at_pos (GTK_TREE_VIEW (widget), event->x, event->y);
+ if (row_clicked == -1) {
+ // new tab
+ int playlist = add_new_playlist ();
+ if (playlist != -1) {
+ deadbeef->plt_set_curr_idx (playlist);
+ }
+ return TRUE;
+ }
+ else if (deadbeef->conf_get_int ("gtkui.pltbrowser.mmb_delete_playlist", 0)) {
+ if (row_clicked != -1) {
+ deadbeef->plt_remove (row_clicked);
+ }
+ }
+ }
 }
- else {
- return FALSE;
+ else if (event->type == GDK_2BUTTON_PRESS) {
+ if (event->button == 1) {
+ int row_clicked = get_treeview_row_at_pos (GTK_TREE_VIEW (widget), event->x, event->y);
+ if (row_clicked == -1) {
+ // new tab
+ int playlist = add_new_playlist ();
+ if (playlist != -1) {
+ deadbeef->plt_set_curr_idx (playlist);
+ }
+ return TRUE;
+ }
+ }
 }
+ return FALSE;
+}
 
- GtkWidget *menu = gtkui_plugin->create_pltmenu (plt_idx);
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, widget, 0, gtk_get_current_event_time());
- return TRUE;
+gboolean
+on_pltbrowser_popup_menu (GtkWidget *widget, gpointer user_data) {
+ int row = get_treeview_cursor_pos (GTK_TREE_VIEW (widget));
+ if (row >= 0) {
+ int plt_idx = row;
+ GtkWidget *menu = gtkui_plugin->create_pltmenu (plt_idx);
+ gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (widget), NULL);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
+ return TRUE;
+ }
+ return FALSE;
 }
 
 static void
 on_pltbrowser_row_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer user_data) {
- deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, 0, 0);
+ if (deadbeef->conf_get_int ("gtkui.pltbrowser.play_on_double_click", 1)) {
+ deadbeef->sendmessage (DB_EV_STOP, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_NEXT, 0, 0, 0);
+ }
+}
+
+static void
+on_pltbrowser_showheaders_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) {
+ w_pltbrowser_t *w = user_data;
+ int showheaders = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (checkmenuitem));
+ deadbeef->conf_set_int ("gtkui.pltbrowser.show_headers", showheaders);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (w->tree), showheaders);
+}
+
+static void
+w_pltbrowser_initmenu (struct ddb_gtkui_widget_s *w, GtkWidget *menu) {
+ GtkWidget *item;
+ item = gtk_check_menu_item_new_with_mnemonic (_("Show Column Headers"));
+ gtk_widget_show (item);
+ int showheaders = deadbeef->conf_get_int ("gtkui.pltbrowser.show_headers", 1);
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), showheaders);
+ gtk_container_add (GTK_CONTAINER (menu), item);
+ g_signal_connect ((gpointer) item, "toggled",
+ G_CALLBACK (on_pltbrowser_showheaders_toggled),
+ w);
 }
 
 static ddb_gtkui_widget_t *
@@ -183,6 +821,7 @@
 w->base.widget = gtk_event_box_new ();
 w->base.init = w_pltbrowser_init;
 w->base.message = pltbrowser_message;
+ w->base.initmenu = w_pltbrowser_initmenu;
 
 gtk_widget_set_can_focus (w->base.widget, FALSE);
 
@@ -192,9 +831,9 @@
 gtk_container_add (GTK_CONTAINER (w->base.widget), scroll);
 
 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_ETCHED_IN);
 w->tree = gtk_tree_view_new ();
 gtk_tree_view_set_reorderable (GTK_TREE_VIEW (w->tree), TRUE);
- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (w->tree), FALSE);
 gtk_tree_view_set_enable_search (GTK_TREE_VIEW (w->tree), TRUE);
 GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (w->tree));
 gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE);
@@ -202,27 +841,61 @@
 
 gtk_container_add (GTK_CONTAINER (scroll), w->tree);
 
- GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
+ GtkListStore *store = gtk_list_store_new (4, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 gtk_tree_view_set_model (GTK_TREE_VIEW (w->tree), GTK_TREE_MODEL (store));
 
 w->ri_id = g_signal_connect ((gpointer) store, "row_inserted", G_CALLBACK (on_pltbrowser_row_inserted), w);
 
 gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (w->tree), TRUE);
+ add_treeview_column (w, GTK_TREE_VIEW (w->tree), COL_NAME, 1, 0, _("Name"), 0);
+
+ int show_playing_column = deadbeef->conf_get_int ("gtkui.pltbrowser.show_playing_column", 0);
+ w->col_playing = add_treeview_column (w, GTK_TREE_VIEW (w->tree), COL_PLAYING, 0, 1, _("♫"), 1);
+ if (!show_playing_column) {
+ gtk_tree_view_column_set_visible (w->col_playing, 0);
+ }
+
+ int show_item_column = deadbeef->conf_get_int ("gtkui.pltbrowser.show_items_column", 0);
+ w->col_items = add_treeview_column (w, GTK_TREE_VIEW (w->tree), COL_ITEMS, 0, 1, _("Items"), 0);
+ if (!show_item_column) {
+ gtk_tree_view_column_set_visible (w->col_items, 0);
+ }
+
+ w->col_duration = add_treeview_column (w, GTK_TREE_VIEW (w->tree), COL_DURATION, 0, 1, _("Duration"), 0);
+ int show_duration_column = deadbeef->conf_get_int ("gtkui.pltbrowser.show_duration_column", 0);
+ if (!show_duration_column) {
+ gtk_tree_view_column_set_visible (w->col_duration, 0);
+ }
 
- GtkCellRenderer *rend1 = gtk_cell_renderer_text_new ();
- GtkTreeViewColumn *col1 = gtk_tree_view_column_new_with_attributes (_("Name"), rend1, "text", 0, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (w->tree), col1);
+ gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (w->tree), TRUE);
 
+ int showheaders = deadbeef->conf_get_int ("gtkui.pltbrowser.show_headers", 1);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (w->tree), showheaders);
 
 w->cc_id = g_signal_connect ((gpointer) w->tree, "cursor_changed",
 G_CALLBACK (on_pltbrowser_cursor_changed),
 w);
 g_signal_connect ((gpointer) w->tree, "event_after",
+ G_CALLBACK (on_pltbrowser_button_press_end_event),
+ w);
+ g_signal_connect ((gpointer) w->tree, "button-press-event",
 G_CALLBACK (on_pltbrowser_button_press_event),
 w);
 g_signal_connect ((gpointer) w->tree, "row_activated",
 G_CALLBACK (on_pltbrowser_row_activated),
 w);
+ g_signal_connect ((gpointer) w->tree, "drag_begin",
+ G_CALLBACK (on_pltbrowser_drag_begin_event),
+ w);
+ g_signal_connect ((gpointer) w->tree, "drag_end",
+ G_CALLBACK (on_pltbrowser_drag_end_event),
+ w);
+ g_signal_connect ((gpointer) w->tree, "drag_motion",
+ G_CALLBACK (on_pltbrowser_drag_motion_event),
+ w);
+ g_signal_connect ((gpointer) w->tree, "key_press_event",
+ G_CALLBACK (on_pltbrowser_key_press_event),
+ w);
 
 gtkui_plugin->w_override_signals (w->base.widget, w);
 
@@ -248,9 +921,14 @@
 return 0;
 }
 
+static const char pltbrowser_settings_dlg =
+ "property \"Close playlists with middle mouse button\" checkbox gtkui.pltbrowser.mmb_delete_playlist 0;\n"
+ "property \"Highlight current playlist\" checkbox gtkui.pltbrowser.highlight_curr_plt 0;\n"
+ "property \"Play on double-click\" checkbox gtkui.pltbrowser.play_on_double_click 1;\n"
+;
+
 static DB_misc_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 5,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_MISC,
@@ -259,15 +937,11 @@
 #else
 .plugin.id = "pltbrowser_gtk2",
 #endif
-#if GTK_CHECK_VERSION(3,0,0)
- .plugin.name = "Playlist browser GTK3",
-#else
- .plugin.name = "Playlist browser GTK2",
-#endif
+ .plugin.name = "Playlist Browser",
 .plugin.descr = "Use View -> Design Mode to add playlist browser into main window",
 .plugin.copyright = 
 "Playlist browser widget plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "This software is provided 'as-is', without any express or implied\n"
 "warranty. In no event will the authors be held liable for any damages\n"
@@ -290,6 +964,7 @@
 .plugin.website = "http://deadbeef.sf.net",
 .plugin.connect = pltbrowser_connect,
 .plugin.disconnect = pltbrowser_disconnect,
+ .plugin.configdialog = pltbrowser_settings_dlg,
 };
 
 DB_plugin_t *

deadbeef-0.6.2.tar.bz2/plugins/pltbrowser/support.h -> deadbeef-1.9.6.tar.bz2/plugins/pltbrowser/support.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf Added

deadbeef-1.9.6.tar.bz2/plugins/psf/COPYING Added

@@ -0,0 +1,255 @@
+AudioOverload DeaDBeeF plugin
+Copyright (C) 2009-2014 Oleksiy 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.
+
+
+
+Here is a list of the licenses each file in this package are under, and their text.
+
+The upshot is this: if you create anything from this SDK and include any MAME licensed components
+(which are an integral part of each engine supplied) you must distribute the source code to your
+derivative program.
+
+
+=====================================================================================
+
+BSD license:
+
+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.
+
+=====================================================================================
+
+MAME license:
+
+Copyright (c) 1997-2008, Nicola Salmoria and the MAME team
+All rights reserved.
+
+Redistribution and use of this code or any derivative works are permitted provided that the following conditions are met:
+
+ * Redistributions may not be sold, nor may they be used in a commercial product or activity.
+ * Redistributions that are modified from the original source must include the complete source code, including the source code for all components used by a binary built from the modified sources. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+ * Redistributions 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.
+
+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.
+
+=====================================================================================
+
+GPL license:
+
+Too long to include here.
+
+See eng_psf/peops/License.txt or eng_psf/peops2/License.txt for the complete text.
+
+While legally combining GPL with BSD and MAME licensed software is unclear, Pete Bernert 
+will probably be OK with anything you do as long as you distribute the source for your
+AOSDK based creations.
+										 
+=====================================================================================
+
+ZLIB license:
+
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+ version 1.2.2, October 3rd, 2004
+
+ Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly jloup@gzip.org
+ Mark Adler madler@alumni.caltech.edu
+
+*/
+
+=====================================================================================
+
+List of files and their licenses:
+
+ao.h			BSD
+corlett.c		BSD 
+corlett.h		BSD 
+cpuintrf.h		BSD 
+dsnd.c			BSD 
+eng_protos.h		BSD 
+main.c			BSD 
+Makefile		BSD 
+mem.h			BSD 
+osd_cpu.h		MAME
+oss.c			BSD 
+oss.h			BSD 
+
+eng_dsf:
+
+aica.c			MAME
+aica.h			MAME
+aicadsp.c		MAME
+aicadsp.h		MAME
+aicalfo.c		MAME
+arm7.c			MAME
+arm7.h			MAME
+arm7i.c			MAME
+arm7i.h			MAME
+arm7memil.c		MAME
+eng_dsf.c		BSD
+dc_hw.c			BSD
+dc_hw.h			BSD
+
+eng_qsf:
+
+eng_qsf.c		BSD
+kabuki.c		MAME
+qsound.c		MAME
+qsound.h		MAME
+z80.c			MAME
+z80dasm.c		MAME
+z80dasm.h		MAME
+z80.h			MAME
+
+eng_ssf:
+
+eng_ssf.c		BSD
+m68kconf.h		MAME
+m68kcpu.c		MAME
+m68kcpu.h		MAME
+m68k.h			MAME
+m68k_in.c		MAME
+m68kmake.c		MAME
+m68kmame.h		MAME
+m68kopac.c		MAME
+m68kopdm.c		MAME
+m68kopnz.c		MAME
+m68kops.c		MAME
+m68kops.h		MAME
+sat_hw.c		BSD
+sat_hw.h		BSD
+scsp.c			MAME
+scspdsp.c		MAME
+scspdsp.h		MAME
+scsp.h			MAME
+scsplfo.c		MAME
+
+eng_psf:
+
+eng_psf2.c		BSD
+eng_psf.c		BSD
+eng_spu.c		BSD
+psx_hw.c		BSD
+psx.c			MAME
+psx.h			MAME
+cpuintrf.h		MAME
+mamemem.h		MAME
+
+eng_psf/peops:
+
+adsr.c			GPL
+adsr.h			GPL
+dma.c			GPL
+dma.h			GPL
+externals.h		GPL
+gauss_i.h		GPL
+registers.c		GPL
+registers.h		GPL
+regs.h			GPL
+reverb.c		GPL
+spu.c			GPL
+spu.h			GPL
+stdafx.h		GPL
+
+
+eng_psf/peops2:
+
+adsr.c			GPL
+adsr.h			GPL
+dma.c			GPL
+dma.h			GPL
+externals.h		GPL
+gauss_i.h		GPL
+psemuxa.h		GPL
+registers.c		GPL
+registers.h		GPL
+regs.h			GPL
+reverb.c		GPL
+reverb.h		GPL
+spu.c			GPL
+spu.h			GPL
+stdafx.h		GPL
+xa.c			GPL
+
+
+
+zlib:
+
+adler32.c		ZLIB
+compress.c		ZLIB
+crc32.c			ZLIB
+crc32.h			ZLIB
+crypt.h			ZLIB
+deflate.c		ZLIB
+deflate.h		ZLIB
+gzio.c			ZLIB
+infback.c		ZLIB
+inffast.c		ZLIB
+inffast.h		ZLIB
+inffixed.h		ZLIB
+inflate.c		ZLIB
+inflate.h		ZLIB
+inftrees.c		ZLIB
+inftrees.h		ZLIB
+ioapi.c			ZLIB
+ioapi.h			ZLIB
+trees.c			ZLIB
+trees.h			ZLIB
+uncompr.c		ZLIB
+unzip.c			ZLIB
+unzip.h			ZLIB
+zconf.h			ZLIB
+zlib.h			ZLIB
+zutil.c			ZLIB
+zutil.h			ZLIB
+

deadbeef-1.9.6.tar.bz2/plugins/psf/Makefile.am Added

@@ -0,0 +1,26 @@
+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/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c
+
+if HAVE_PSF
+pkglib_LTLIBRARIES = psf.la
+psf_la_SOURCES = plugin.c psfmain.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 
+
+psf_la_LDFLAGS = -module -avoid-version $(ZLIB_LIBS)
+
+psf_la_LIBADD = $(LDADD)
+psf_la_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -Wall -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC -I@top_srcdir@/include
+endif
+

deadbeef-1.9.6.tar.bz2/plugins/psf/Makefile.in Added

@@ -0,0 +1,1010 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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/psf
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+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, filesdir }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+psf_la_DEPENDENCIES =
+am__psf_la_SOURCES_DIST = plugin.c psfmain.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
+am__dirstamp = $(am__leading_dot)dirstamp
+@HAVE_PSF_TRUE@am_psf_la_OBJECTS = psf_la-plugin.lo psf_la-psfmain.lo \
+@HAVE_PSF_TRUE@	psf_la-corlett.lo eng_dsf/psf_la-eng_dsf.lo \
+@HAVE_PSF_TRUE@	eng_dsf/psf_la-dc_hw.lo eng_dsf/psf_la-aica.lo \
+@HAVE_PSF_TRUE@	eng_dsf/psf_la-aicadsp.lo \
+@HAVE_PSF_TRUE@	eng_dsf/psf_la-arm7.lo eng_dsf/psf_la-arm7i.lo \
+@HAVE_PSF_TRUE@	eng_ssf/psf_la-m68kcpu.lo \
+@HAVE_PSF_TRUE@	eng_ssf/psf_la-m68kopac.lo \
+@HAVE_PSF_TRUE@	eng_ssf/psf_la-m68kopdm.lo \
+@HAVE_PSF_TRUE@	eng_ssf/psf_la-m68kopnz.lo \
+@HAVE_PSF_TRUE@	eng_ssf/psf_la-m68kops.lo \
+@HAVE_PSF_TRUE@	eng_ssf/psf_la-scsp.lo \
+@HAVE_PSF_TRUE@	eng_ssf/psf_la-scspdsp.lo \
+@HAVE_PSF_TRUE@	eng_ssf/psf_la-sat_hw.lo \
+@HAVE_PSF_TRUE@	eng_ssf/psf_la-eng_ssf.lo \
+@HAVE_PSF_TRUE@	eng_qsf/psf_la-eng_qsf.lo \
+@HAVE_PSF_TRUE@	eng_qsf/psf_la-kabuki.lo \
+@HAVE_PSF_TRUE@	eng_qsf/psf_la-qsound.lo eng_qsf/psf_la-z80.lo \
+@HAVE_PSF_TRUE@	eng_qsf/psf_la-z80dasm.lo \
+@HAVE_PSF_TRUE@	eng_psf/psf_la-eng_psf.lo eng_psf/psf_la-psx.lo \
+@HAVE_PSF_TRUE@	eng_psf/psf_la-psx_hw.lo \
+@HAVE_PSF_TRUE@	eng_psf/peops/psf_la-spu.lo \
+@HAVE_PSF_TRUE@	eng_psf/psf_la-eng_psf2.lo \
+@HAVE_PSF_TRUE@	eng_psf/peops2/psf_la-spu2.lo \
+@HAVE_PSF_TRUE@	eng_psf/peops2/psf_la-dma2.lo \
+@HAVE_PSF_TRUE@	eng_psf/peops2/psf_la-registers2.lo \
+@HAVE_PSF_TRUE@	eng_psf/psf_la-eng_spu.lo
+psf_la_OBJECTS = $(am_psf_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+psf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(psf_la_CFLAGS) $(CFLAGS) \
+	$(psf_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_PSF_TRUE@am_psf_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(psf_la_SOURCES)
+DIST_SOURCES = $(am__psf_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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@
+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/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c
+@HAVE_PSF_TRUE@pkglib_LTLIBRARIES = psf.la
+@HAVE_PSF_TRUE@psf_la_SOURCES = plugin.c psfmain.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@psf_la_LDFLAGS = -module -avoid-version $(ZLIB_LIBS)
+@HAVE_PSF_TRUE@psf_la_LIBADD = $(LDADD)
+@HAVE_PSF_TRUE@psf_la_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -Wall -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm -fPIC -I@top_srcdir@/include
+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 --ignore-deps plugins/psf/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps plugins/psf/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)
+	@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 " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
+	 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)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+eng_dsf/$(am__dirstamp):
+	@$(MKDIR_P) eng_dsf
+	@: > eng_dsf/$(am__dirstamp)
+eng_dsf/psf_la-eng_dsf.lo: eng_dsf/$(am__dirstamp)
+eng_dsf/psf_la-dc_hw.lo: eng_dsf/$(am__dirstamp)
+eng_dsf/psf_la-aica.lo: eng_dsf/$(am__dirstamp)
+eng_dsf/psf_la-aicadsp.lo: eng_dsf/$(am__dirstamp)
+eng_dsf/psf_la-arm7.lo: eng_dsf/$(am__dirstamp)
+eng_dsf/psf_la-arm7i.lo: eng_dsf/$(am__dirstamp)
+eng_ssf/$(am__dirstamp):
+	@$(MKDIR_P) eng_ssf
+	@: > eng_ssf/$(am__dirstamp)
+eng_ssf/psf_la-m68kcpu.lo: eng_ssf/$(am__dirstamp)
+eng_ssf/psf_la-m68kopac.lo: eng_ssf/$(am__dirstamp)
+eng_ssf/psf_la-m68kopdm.lo: eng_ssf/$(am__dirstamp)
+eng_ssf/psf_la-m68kopnz.lo: eng_ssf/$(am__dirstamp)
+eng_ssf/psf_la-m68kops.lo: eng_ssf/$(am__dirstamp)
+eng_ssf/psf_la-scsp.lo: eng_ssf/$(am__dirstamp)
+eng_ssf/psf_la-scspdsp.lo: eng_ssf/$(am__dirstamp)
+eng_ssf/psf_la-sat_hw.lo: eng_ssf/$(am__dirstamp)
+eng_ssf/psf_la-eng_ssf.lo: eng_ssf/$(am__dirstamp)
+eng_qsf/$(am__dirstamp):
+	@$(MKDIR_P) eng_qsf
+	@: > eng_qsf/$(am__dirstamp)
+eng_qsf/psf_la-eng_qsf.lo: eng_qsf/$(am__dirstamp)
+eng_qsf/psf_la-kabuki.lo: eng_qsf/$(am__dirstamp)
+eng_qsf/psf_la-qsound.lo: eng_qsf/$(am__dirstamp)
+eng_qsf/psf_la-z80.lo: eng_qsf/$(am__dirstamp)
+eng_qsf/psf_la-z80dasm.lo: eng_qsf/$(am__dirstamp)
+eng_psf/$(am__dirstamp):
+	@$(MKDIR_P) eng_psf
+	@: > eng_psf/$(am__dirstamp)
+eng_psf/psf_la-eng_psf.lo: eng_psf/$(am__dirstamp)
+eng_psf/psf_la-psx.lo: eng_psf/$(am__dirstamp)
+eng_psf/psf_la-psx_hw.lo: eng_psf/$(am__dirstamp)
+eng_psf/peops/$(am__dirstamp):
+	@$(MKDIR_P) eng_psf/peops
+	@: > eng_psf/peops/$(am__dirstamp)
+eng_psf/peops/psf_la-spu.lo: eng_psf/peops/$(am__dirstamp)
+eng_psf/psf_la-eng_psf2.lo: eng_psf/$(am__dirstamp)
+eng_psf/peops2/$(am__dirstamp):
+	@$(MKDIR_P) eng_psf/peops2
+	@: > eng_psf/peops2/$(am__dirstamp)
+eng_psf/peops2/psf_la-spu2.lo: eng_psf/peops2/$(am__dirstamp)
+eng_psf/peops2/psf_la-dma2.lo: eng_psf/peops2/$(am__dirstamp)
+eng_psf/peops2/psf_la-registers2.lo: eng_psf/peops2/$(am__dirstamp)
+eng_psf/psf_la-eng_spu.lo: eng_psf/$(am__dirstamp)
+
+psf.la: $(psf_la_OBJECTS) $(psf_la_DEPENDENCIES) $(EXTRA_psf_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(psf_la_LINK) $(am_psf_la_rpath) $(psf_la_OBJECTS) $(psf_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f eng_dsf/*.$(OBJEXT)
+	-rm -f eng_dsf/*.lo
+	-rm -f eng_psf/*.$(OBJEXT)
+	-rm -f eng_psf/*.lo
+	-rm -f eng_psf/peops/*.$(OBJEXT)
+	-rm -f eng_psf/peops/*.lo
+	-rm -f eng_psf/peops2/*.$(OBJEXT)
+	-rm -f eng_psf/peops2/*.lo
+	-rm -f eng_qsf/*.$(OBJEXT)
+	-rm -f eng_qsf/*.lo
+	-rm -f eng_ssf/*.$(OBJEXT)
+	-rm -f eng_ssf/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+psf_la-plugin.lo: plugin.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o psf_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
+
+psf_la-psfmain.lo: psfmain.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o psf_la-psfmain.lo `test -f 'psfmain.c' || echo '$(srcdir)/'`psfmain.c
+
+psf_la-corlett.lo: corlett.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o psf_la-corlett.lo `test -f 'corlett.c' || echo '$(srcdir)/'`corlett.c
+
+eng_dsf/psf_la-eng_dsf.lo: eng_dsf/eng_dsf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_dsf/psf_la-eng_dsf.lo `test -f 'eng_dsf/eng_dsf.c' || echo '$(srcdir)/'`eng_dsf/eng_dsf.c
+
+eng_dsf/psf_la-dc_hw.lo: eng_dsf/dc_hw.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_dsf/psf_la-dc_hw.lo `test -f 'eng_dsf/dc_hw.c' || echo '$(srcdir)/'`eng_dsf/dc_hw.c
+
+eng_dsf/psf_la-aica.lo: eng_dsf/aica.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_dsf/psf_la-aica.lo `test -f 'eng_dsf/aica.c' || echo '$(srcdir)/'`eng_dsf/aica.c
+
+eng_dsf/psf_la-aicadsp.lo: eng_dsf/aicadsp.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_dsf/psf_la-aicadsp.lo `test -f 'eng_dsf/aicadsp.c' || echo '$(srcdir)/'`eng_dsf/aicadsp.c
+
+eng_dsf/psf_la-arm7.lo: eng_dsf/arm7.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_dsf/psf_la-arm7.lo `test -f 'eng_dsf/arm7.c' || echo '$(srcdir)/'`eng_dsf/arm7.c
+
+eng_dsf/psf_la-arm7i.lo: eng_dsf/arm7i.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_dsf/psf_la-arm7i.lo `test -f 'eng_dsf/arm7i.c' || echo '$(srcdir)/'`eng_dsf/arm7i.c
+
+eng_ssf/psf_la-m68kcpu.lo: eng_ssf/m68kcpu.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_ssf/psf_la-m68kcpu.lo `test -f 'eng_ssf/m68kcpu.c' || echo '$(srcdir)/'`eng_ssf/m68kcpu.c
+
+eng_ssf/psf_la-m68kopac.lo: eng_ssf/m68kopac.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_ssf/psf_la-m68kopac.lo `test -f 'eng_ssf/m68kopac.c' || echo '$(srcdir)/'`eng_ssf/m68kopac.c
+
+eng_ssf/psf_la-m68kopdm.lo: eng_ssf/m68kopdm.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_ssf/psf_la-m68kopdm.lo `test -f 'eng_ssf/m68kopdm.c' || echo '$(srcdir)/'`eng_ssf/m68kopdm.c
+
+eng_ssf/psf_la-m68kopnz.lo: eng_ssf/m68kopnz.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_ssf/psf_la-m68kopnz.lo `test -f 'eng_ssf/m68kopnz.c' || echo '$(srcdir)/'`eng_ssf/m68kopnz.c
+
+eng_ssf/psf_la-m68kops.lo: eng_ssf/m68kops.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_ssf/psf_la-m68kops.lo `test -f 'eng_ssf/m68kops.c' || echo '$(srcdir)/'`eng_ssf/m68kops.c
+
+eng_ssf/psf_la-scsp.lo: eng_ssf/scsp.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_ssf/psf_la-scsp.lo `test -f 'eng_ssf/scsp.c' || echo '$(srcdir)/'`eng_ssf/scsp.c
+
+eng_ssf/psf_la-scspdsp.lo: eng_ssf/scspdsp.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_ssf/psf_la-scspdsp.lo `test -f 'eng_ssf/scspdsp.c' || echo '$(srcdir)/'`eng_ssf/scspdsp.c
+
+eng_ssf/psf_la-sat_hw.lo: eng_ssf/sat_hw.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_ssf/psf_la-sat_hw.lo `test -f 'eng_ssf/sat_hw.c' || echo '$(srcdir)/'`eng_ssf/sat_hw.c
+
+eng_ssf/psf_la-eng_ssf.lo: eng_ssf/eng_ssf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_ssf/psf_la-eng_ssf.lo `test -f 'eng_ssf/eng_ssf.c' || echo '$(srcdir)/'`eng_ssf/eng_ssf.c
+
+eng_qsf/psf_la-eng_qsf.lo: eng_qsf/eng_qsf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_qsf/psf_la-eng_qsf.lo `test -f 'eng_qsf/eng_qsf.c' || echo '$(srcdir)/'`eng_qsf/eng_qsf.c
+
+eng_qsf/psf_la-kabuki.lo: eng_qsf/kabuki.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_qsf/psf_la-kabuki.lo `test -f 'eng_qsf/kabuki.c' || echo '$(srcdir)/'`eng_qsf/kabuki.c
+
+eng_qsf/psf_la-qsound.lo: eng_qsf/qsound.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_qsf/psf_la-qsound.lo `test -f 'eng_qsf/qsound.c' || echo '$(srcdir)/'`eng_qsf/qsound.c
+
+eng_qsf/psf_la-z80.lo: eng_qsf/z80.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_qsf/psf_la-z80.lo `test -f 'eng_qsf/z80.c' || echo '$(srcdir)/'`eng_qsf/z80.c
+
+eng_qsf/psf_la-z80dasm.lo: eng_qsf/z80dasm.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_qsf/psf_la-z80dasm.lo `test -f 'eng_qsf/z80dasm.c' || echo '$(srcdir)/'`eng_qsf/z80dasm.c
+
+eng_psf/psf_la-eng_psf.lo: eng_psf/eng_psf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_psf/psf_la-eng_psf.lo `test -f 'eng_psf/eng_psf.c' || echo '$(srcdir)/'`eng_psf/eng_psf.c
+
+eng_psf/psf_la-psx.lo: eng_psf/psx.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_psf/psf_la-psx.lo `test -f 'eng_psf/psx.c' || echo '$(srcdir)/'`eng_psf/psx.c
+
+eng_psf/psf_la-psx_hw.lo: eng_psf/psx_hw.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_psf/psf_la-psx_hw.lo `test -f 'eng_psf/psx_hw.c' || echo '$(srcdir)/'`eng_psf/psx_hw.c
+
+eng_psf/peops/psf_la-spu.lo: eng_psf/peops/spu.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_psf/peops/psf_la-spu.lo `test -f 'eng_psf/peops/spu.c' || echo '$(srcdir)/'`eng_psf/peops/spu.c
+
+eng_psf/psf_la-eng_psf2.lo: eng_psf/eng_psf2.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_psf/psf_la-eng_psf2.lo `test -f 'eng_psf/eng_psf2.c' || echo '$(srcdir)/'`eng_psf/eng_psf2.c
+
+eng_psf/peops2/psf_la-spu2.lo: eng_psf/peops2/spu2.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_psf/peops2/psf_la-spu2.lo `test -f 'eng_psf/peops2/spu2.c' || echo '$(srcdir)/'`eng_psf/peops2/spu2.c
+
+eng_psf/peops2/psf_la-dma2.lo: eng_psf/peops2/dma2.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_psf/peops2/psf_la-dma2.lo `test -f 'eng_psf/peops2/dma2.c' || echo '$(srcdir)/'`eng_psf/peops2/dma2.c
+
+eng_psf/peops2/psf_la-registers2.lo: eng_psf/peops2/registers2.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_psf/peops2/psf_la-registers2.lo `test -f 'eng_psf/peops2/registers2.c' || echo '$(srcdir)/'`eng_psf/peops2/registers2.c
+
+eng_psf/psf_la-eng_spu.lo: eng_psf/eng_spu.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(psf_la_CFLAGS) $(CFLAGS) -c -o eng_psf/psf_la-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
+	-rm -rf eng_dsf/.libs eng_dsf/_libs
+	-rm -rf eng_psf/.libs eng_psf/_libs
+	-rm -rf eng_psf/peops/.libs eng_psf/peops/_libs
+	-rm -rf eng_psf/peops2/.libs eng_psf/peops2/_libs
+	-rm -rf eng_qsf/.libs eng_qsf/_libs
+	-rm -rf eng_ssf/.libs eng_ssf/_libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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)
+	-rm -f eng_dsf/$(am__dirstamp)
+	-rm -f eng_psf/$(am__dirstamp)
+	-rm -f eng_psf/peops/$(am__dirstamp)
+	-rm -f eng_psf/peops2/$(am__dirstamp)
+	-rm -f eng_qsf/$(am__dirstamp)
+	-rm -f eng_ssf/$(am__dirstamp)
+
+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 -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 -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 TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am 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 tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/plugins/psf/ao.h Added

@@ -0,0 +1,232 @@
+//
+// 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
+#include <limits.h>
+
+#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 title9MAX_DISP_INFO_LENGTH;
+	char info9MAX_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-1.9.6.tar.bz2/plugins/psf/corlett.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/corlett.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/cpuintrf.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf Added

deadbeef-1.9.6.tar.bz2/plugins/psf/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.data0x0>>0x0)&0x8000)
+#define KEYONB(slot)		((slot->udata.data0x0>>0x0)&0x4000)
+#define SSCTL(slot)		((slot->udata.data0x0>>0xA)&0x0001)
+#define LPCTL(slot)		((slot->udata.data0x0>>0x9)&0x0001)
+#define PCMS(slot)		((slot->udata.data0x0>>0x7)&0x0003)
+
+#define SA(slot)		(((slot->udata.data0x0&0x7F)<<16)|(slot->udata.data0x4/2))
+
+#define LSA(slot)		(slot->udata.data0x8/2)
+
+#define LEA(slot)		(slot->udata.data0xc/2)
+
+#define D2R(slot)		((slot->udata.data0x10/2>>0xB)&0x001F)
+#define D1R(slot)		((slot->udata.data0x10/2>>0x6)&0x001F)
+#define AR(slot)		((slot->udata.data0x10/2>>0x0)&0x001F)
+
+#define LPSLNK(slot)		((slot->udata.data0x14/2>>0x0)&0x4000)
+#define KRS(slot)		((slot->udata.data0x14/2>>0xA)&0x000F)
+#define DL(slot)		((slot->udata.data0x14/2>>0x5)&0x001F)
+#define RR(slot)		((slot->udata.data0x14/2>>0x0)&0x001F)
+
+#define TL(slot)		((slot->udata.data0x28/2>>0x8)&0x00FF)
+
+#define OCT(slot)		((slot->udata.data0x18/2>>0xB)&0x000F)
+#define FNS(slot)		((slot->udata.data0x18/2>>0x0)&0x03FF)
+
+#define LFORE(slot)		((slot->udata.data0x1c/2>>0x0)&0x8000)
+#define LFOF(slot)		((slot->udata.data0x1c/2>>0xA)&0x001F)
+#define PLFOWS(slot)		((slot->udata.data0x1c/2>>0x8)&0x0003)
+#define PLFOS(slot)		((slot->udata.data0x1c/2>>0x5)&0x0007)
+#define ALFOWS(slot)		((slot->udata.data0x1c/2>>0x3)&0x0003)
+#define ALFOS(slot)		((slot->udata.data0x1c/2>>0x0)&0x0007)
+
+#define ISEL(slot)		((slot->udata.data0x20/2>>0x0)&0x000F)
+#define IMXL(slot)		((slot->udata.data0x20/2>>0x4)&0x000F)
+
+#define DISDL(slot)		((slot->udata.data0x24/2>>0x8)&0x000F)
+#define DIPAN(slot)		((slot->udata.data0x24/2>>0x0)&0x001F)
+
+#define EFSDL(slot)		((AICA->EFSPANslot*4>>8)&0x000f)
+#define EFPAN(slot)		((AICA->EFSPANslot*4>>0)&0x001f) 
+
+//Envelope times in ms
+static const double ARTimes64={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 DRTimes64={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_Table0x400;
+static INT32 EG_TABLE0x400;
+
+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 data0x40;	//only 0x1a bytes used
+		UINT8 datab0x80;
+	} 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.data0>>0x0)&0x0200)
+#define DAC18B(aica)		((aica->udata.data0>>0x0)&0x0100)
+#define MVOL(aica)		((aica->udata.data0>>0x0)&0x000F)
+#define RBL(aica)		((aica->udata.data2>>0xD)&0x0003)
+#define RBP(aica)		((aica->udata.data2>>0x0)&0x0fff)
+#define MOFULL(aica) 		((aica->udata.data4>>0x0)&0x1000)
+#define MOEMPTY(aica)		((aica->udata.data4>>0x0)&0x0800)
+#define MIOVF(aica)		((aica->udata.data4>>0x0)&0x0400)
+#define MIFULL(aica)		((aica->udata.data4>>0x0)&0x0200)
+#define MIEMPTY(aica)		((aica->udata.data4>>0x0)&0x0100)
+
+#define AFSEL(aica)		((aica->udata.data6>>0x0)&0x4000)
+#define MSLC(aica)		((aica->udata.data6>>0x8)&0x3F)
+
+#define SCILV0(aica) 	((aica->udata.data0xa8/2>>0x0)&0xff)
+#define SCILV1(aica) 	((aica->udata.data0xac/2>>0x0)&0xff)
+#define SCILV2(aica) 	((aica->udata.data0xb0/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 data0xc0/2;
+		UINT8 datab0xc0;
+	} udata;
+	UINT16 IRQL, IRQR;
+	UINT16 EFSPAN0x48;
+	struct _SLOT Slots64;
+	signed short RINGBUF64;
+	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 MidiStack16;
+	UINT8 MidiW,MidiR;
+
+	int LPANTABLE0x20000;
+	int RPANTABLE0x20000;
+
+	int TimPris3;
+	int TimCnt3;
+
+	// DMA stuff
+	UINT32 aica_dmea;
+	UINT16 aica_drga;
+	UINT16 aica_dtlg;
+
+	int ARTABLE64, DRTABLE64;
+
+	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 SDLT16={-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.data0xa4/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.data0xa0/2;
+	UINT32 en=AICA->udata.data0x9c/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->ARTABLERate;
+}
+
+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->DRTABLERate;
+}
+
+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->DRTABLERate;
+}
+
+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_TableFNS(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 TableQuant8={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_mul16= { 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;
+}
+
+static 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*TableQuantDelta&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->AICARAMstart_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.data0xc/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.data0&=~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;
+		}
+
+ AICA->AICARAM = &intf->cpu->dc_ram0;
+ 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_Tablei=(float) (1<<SHIFT) *fcent;
+	}
+
+	for(i=0;i<0x400;++i)
+	{
+		float envDB=((float)(3*(i-0x3ff)))/32.0;
+		float scale=(float)(1<<SHIFT);
+		EG_TABLEi=(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,(SDLTiSDL)/20.0);
+		else
+			fSDL=0.0;
+
+		AICA->LPANTABLEi=FIX((4.0*LPAN*TL*fSDL));
+		AICA->RPANTABLEi=FIX((4.0*RPAN*TL*fSDL));
+	}
+
+	AICA->ARTABLE0=AICA->DRTABLE0=0;	//Infinite time
+	AICA->ARTABLE1=AICA->DRTABLE1=0;	//Infinite time
+	for(i=2;i<64;++i)
+	{
+		double t,step,scale;
+		t=ARTimesi;	//In ms
+		if(t!=0.0)
+		{
+			step=(1023*1000.0)/((float) 44100.0f*t);
+			scale=(double) (1<<EG_SHIFT);
+			AICA->ARTABLEi=(int) (step*scale);
+		}
+		else
+			AICA->ARTABLEi=1024<<EG_SHIFT;
+
+		t=DRTimesi;	//In ms
+		step=(1023*1000.0)/((float) 44100.0f*t);
+		scale=(double) (1<<EG_SHIFT);
+		AICA->DRTABLEi=(int) (step*scale);
+	}
+
+	// make sure all the slots are off
+	for(i=0;i<64;++i)
+	{
+		AICA->Slotsi.slot=i;
+		AICA->Slotsi.active=0;
+		AICA->Slotsi.base=NULL;
+		AICA->Slotsi.EG.state=RELEASE;
+		AICA->Slotsi.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"
+	AICA0.udata.data0xa0/2 = 0;
+	//AICA1.udata.data0x20/2 = 0;
+	AICA->TimCnt0 = 0xffff;
+	AICA->TimCnt1 = 0xffff;
+	AICA->TimCnt2 = 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.data0x10 &= 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.data0&=~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.data0x24/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.data0x8/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->TimPris0=1<<((AICA->udata.data0x90/2>>8)&0x7);
+				AICA->TimCnt0=(AICA->udata.data0x90/2&0xff)<<8;
+			}
+			break;
+		case 0x94:
+		case 0x95:
+			if(AICA->Master)
+			{
+				AICA->TimPris1=1<<((AICA->udata.data0x94/2>>8)&0x7);
+				AICA->TimCnt1=(AICA->udata.data0x94/2&0xff)<<8;
+			}
+			break;
+		case 0x98:
+		case 0x99:
+			if(AICA->Master)
+			{
+				AICA->TimPris2=1<<((AICA->udata.data0x98/2>>8)&0x7);
+				AICA->TimCnt2=(AICA->udata.data0x98/2&0xff)<<8;
+			}
+			break;
+		case 0xa4:	//SCIRE
+		case 0xa5:
+
+			if(AICA->Master)		 
+			{
+				AICA->udata.data0xa0/2 &= ~AICA->udata.data0xa4/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->TimCnt0 >= 0xff00)
+				{
+					AICA->udata.data0xa0/2 |= 0x40;
+				}
+				if (AICA->TimCnt1 >= 0xff00)
+				{
+					AICA->udata.data0xa0/2 |= 0x80;
+				}
+				if (AICA->TimCnt2 >= 0xff00)
+				{
+					AICA->udata.data0xa0/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.data0x8/2;
+				v&=0xff00;
+				v|=AICA->MidiStackAICA->MidiR;
+				AICA->IntARMCB(AICA->cpu, 0);	// cancel the IRQ
+				if(AICA->MidiR!=AICA->MidiW)
+				{
+					++AICA->MidiR;
+					AICA->MidiR&=15;
+				}
+				AICA->udata.data0x8/2=v;
+			}
+			break;
+
+		case 0x10:	// LP check
+		case 0x11:
+			{
+				//int MSLC = (AICA->udata.data0xc/2>>8) & 0x3f;	// which slot are we monitoring?
+			}
+			break;
+			
+		case 0x14:	// CA (slot address)
+		case 0x15:
+			{
+				int MSLC = (AICA->udata.data0xc/2>>8) & 0x3f;	// which slot are we monitoring?
+				unsigned int CA = AICA->SlotsMSLC.cur_addr>>(SHIFT+12);
+
+				AICA->udata.data0x14/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->Slotsslot.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->EFSPANaddr&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->Slotsslot.udata.datab+(addr)));
+	}
+	else if(addr<0x3000)
+	{
+		if (addr <= 0x2044)
+		{
+			v = AICA->EFSPANaddr&0x7f;
+		}
+		else if (addr < 0x28be)
+		{
+			AICA_UpdateRegR(AICA, addr&0xff);
+			v= *((unsigned short *) (AICA->udata.datab+((addr&0xff))));
+			if((addr&0xfe)==0x10) AICA->udata.data0x10/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->TimCnt0<=0xff00)
+	{
+ 		AICA->TimCnt0 += ticks << (8-((AICA->udata.data0x90/2>>8)&0x7));
+		if (AICA->TimCnt0 >= 0xFF00)
+		{
+			AICA->TimCnt0 = 0xFFFF;
+			AICA->udata.data0xa0/2|=0x40;
+		}
+		AICA->udata.data0x90/2&=0xff00;
+		AICA->udata.data0x90/2|=AICA->TimCnt0>>8;
+	}
+
+	if(AICA->TimCnt1<=0xff00)
+	{
+		AICA->TimCnt1 += ticks << (8-((AICA->udata.data0x94/2>>8)&0x7));
+		if (AICA->TimCnt1 >= 0xFF00)
+		{
+			AICA->TimCnt1 = 0xFFFF;
+			AICA->udata.data0xa0/2|=0x80;
+		}
+		AICA->udata.data0x94/2&=0xff00;
+		AICA->udata.data0x94/2|=AICA->TimCnt1>>8;
+	}
+
+	if(AICA->TimCnt2<=0xff00)
+	{
+		AICA->TimCnt2 += ticks << (8-((AICA->udata.data0x98/2>>8)&0x7));
+		if (AICA->TimCnt2 >= 0xFF00)
+		{
+			AICA->TimCnt2 = 0xFFFF;
+			AICA->udata.data0xa0/2|=0x100;
+		}
+		AICA->udata.data0x98/2&=0xff00;
+		AICA->udata.data0x98/2|=AICA->TimCnt2>>8;
+	}
+}
+
+static 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 = p10 << 8;
+		nxt_sample = p20 << 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(p10);
+		nxt_sample = LE16(p20);
+	}
+	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.data8 |= 0x8000;
+		AICA_StopSlot(slot,0);
+		}
+		break;
+	case 1: //normal loop
+		if(addr2>=LEA(slot))
+		{
+			INT32 rem_addr;
+			if(slot->mslc) AICA->udata.data8 |= 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->AICARAMSA(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_TABLEEG_Update(slot)>>(SHIFT-10))>>SHIFT;
+		
+	if(slot->mslc) 
+	{
+		AICA->udata.data0x14/2 = addr1;
+		if (!(AFSEL(AICA)))
+		{
+			UINT16 res;
+
+			AICA->udata.data0x10/2 |= slot->EG.state<<13;
+
+			res = 0x3FF - (slot->EG.volume>>EG_SHIFT);
+
+			res *= 959;
+			res /= 1024;
+
+			if (res > 959) res = 959;
+
+			AICA->udata.data0x10/2 = res;
+
+			//AICA->udata.data0x10/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->Slotssl.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->LPANTABLEEnc)>>(SHIFT-2),ISEL(slot),IMXL(slot));
+				Enc=((TL(slot))<<0x0)|((DIPAN(slot))<<0x8)|((DISDL(slot))<<0xd);
+				{
+					smpl+=(sample*AICA->LPANTABLEEnc)>>SHIFT;
+					smpr+=(sample*AICA->RPANTABLEEnc)>>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.EFREGi*AICA->LPANTABLEEnc)>>SHIFT;
+				smpr+=(AICA->DSP.EFREGi*AICA->RPANTABLEEnc)>>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 = buf0;
+	AICA->bufferr = buf1;
+	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_callback0;
+
+//		AICA->stream = stream_create(0, 2, 44100, AICA, AICA_Update);
+	}
+
+	return AICA;
+}
+
+void aica_stop(struct _AICA *AICA)
+{
+ if (!AICA) {
+ return;
+ }
+ 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->MidiStackAICA->MidiW++=data;
+	AICA->MidiW &= 15;
+}
+
+READ16_HANDLER( AICA_MidiOutR )
+{
+	unsigned char val;
+
+	val=AICA->MidiStackAICA->MidiR++;
+	AICA->MidiR&=7;
+	return val;
+}
+

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/aica.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/aicadsp.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/aicadsp.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/aicalfo.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/arm7.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/arm7.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/arm7i.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/arm7i.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/arm7memil.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/arm7thumb.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/dc_hw.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/dc_hw.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_dsf/eng_dsf.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_protos.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf Added

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/cpuintrf.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/eng_psf.c Added

@@ -0,0 +1,474 @@
+/*
+	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 psfby256;
+ 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 *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 = file0x18 | file0x19<<8 | file0x1a<<16 | file0x1b<<24;
+	printf("Text section start: %x\n", offset);
+	offset = file0x1c | file0x1d<<8 | file0x1e<<16 | file0x1f<<24;
+	printf("Text section size: %x\n", offset);
+	printf("Region: %s\n", &file0x4c);
+	printf("refresh: %s\n", c->inf_refresh);			
+	#endif
+
+	PC = file0x10 | file0x11<<8 | file0x12<<16 | file0x13<<24;
+	GP = file0x14 | file0x15<<8 | file0x16<<16 | file0x17<<24;
+	SP = file0x30 | file0x31<<8 | file0x32<<16 | file0x33<<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_refresh0 == '5')
+	{
+		s->mips_cpu->psf_refresh = 50;
+	}
+	if (s->c->inf_refresh0 == '6')
+	{
+		s->mips_cpu->psf_refresh = 60;
+	}
+
+	// Get the library file, if any
+	if (s->c->lib0 != 0)
+	{
+		uint64 tmp_length;
+ char libpathPATH_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_decoded0x18 | lib_decoded0x19<<8 | lib_decoded0x1a<<16 | lib_decoded0x1b<<24;
+		printf("Text section start: %x\n", offset);
+		offset = lib_decoded0x1c | lib_decoded0x1d<<8 | lib_decoded0x1e<<16 | lib_decoded0x1f<<24;
+		printf("Text section size: %x\n", offset);
+		printf("Region: %s\n", &lib_decoded0x4c);
+		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_refresh0 == '5')
+			{
+				s->mips_cpu->psf_refresh = 50;
+			}
+			if (lib->inf_refresh0 == '6')
+			{
+				s->mips_cpu->psf_refresh = 60;
+			}
+		}
+
+		PC = lib_decoded0x10 | lib_decoded0x11<<8 | lib_decoded0x12<<16 | lib_decoded0x13<<24;
+		GP = lib_decoded0x14 | lib_decoded0x15<<8 | lib_decoded0x16<<16 | lib_decoded0x17<<24;
+		SP = lib_decoded0x30 | lib_decoded0x31<<8 | lib_decoded0x32<<16 | lib_decoded0x33<<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_decoded0x18 | lib_decoded0x19<<8 | lib_decoded0x1a<<16 | lib_decoded0x1b<<24;
+		offset &= 0x3fffffff;	// kill any MIPS cache segment indicators
+		plength = lib_decoded0x1c | lib_decoded0x1d<<8 | lib_decoded0x1e<<16 | lib_decoded0x1f<<24;
+		#if DEBUG_LOADER
+		printf("library offset: %x plength: %d\n", offset, plength);
+		#endif
+		memcpy(&s->mips_cpu->psx_ramoffset/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 = file0x18 | file0x19<<8 | file0x1a<<16 | file0x1b<<24;
+	offset &= 0x3fffffff;	// kill any MIPS cache segment indicators
+	plength = file0x1c | file0x1d<<8 | file0x1e<<16 | file0x1f<<24;
+
+	// Philosoma has an illegal "plength". *sigh*
+	if (plength > (file_len-2048))
+	{
+		plength = file_len-2048;
+	}
+	memcpy(&s->mips_cpu->psx_ramoffset/4, file+2048, plength);
+
+	// load any auxiliary libraries now
+	for (i = 0; i < 8; i++)
+	{
+		if (s->c->libauxi0 != 0)
+		{
+			uint64 tmp_length;
+ char libpathPATH_MAX;
+ ao_getlibpath (path, s->c->libauxi, 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_decoded0x18 | alib_decoded0x19<<8 | alib_decoded0x1a<<16 | alib_decoded0x1b<<24;
+			printf("Text section start: %x\n", offset);
+			offset = alib_decoded0x1c | alib_decoded0x1d<<8 | alib_decoded0x1e<<16 | alib_decoded0x1f<<24;
+			printf("Text section size: %x\n", offset);
+			printf("Region: %s\n", &alib_decoded0x4c);
+			#endif
+
+			// now patch the file into RAM
+			offset = alib_decoded0x18 | alib_decoded0x19<<8 | alib_decoded0x1a<<16 | alib_decoded0x1b<<24;
+			offset &= 0x3fffffff;	// kill any MIPS cache segment indicators
+			plength = alib_decoded0x1c | alib_decoded0x1d<<8 | alib_decoded0x1e<<16 | alib_decoded0x1f<<24;
+			memcpy(&s->mips_cpu->psx_ramoffset/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_namei, "psfby"))
+				strcpy(s->psfby, s->c->tag_datai);
+		}
+	}
+
+	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 (!strcmp(s->c->inf_game, "Chocobo Dungeon 2"))
+ {
+ if (s->mips_cpu->psx_ram0xbc090/4 == LE32(0x0802f040))
+ {
+ s->mips_cpu->psx_ram0xbc090/4 = LE32(0);
+ s->mips_cpu->psx_ram0xbc094/4 = LE32(0x0802f040);
+ s->mips_cpu->psx_ram0xbc098/4 = LE32(0);
+ }
+ }
+
+//	psx_ram0x118b8/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->title1, "Name: ");
+	sprintf(info->info1, "%s", s->c->inf_title);
+
+	strcpy(info->title2, "Game: ");
+	sprintf(info->info2, "%s", s->c->inf_game);
+	
+	strcpy(info->title3, "Artist: ");
+	sprintf(info->info3, "%s", s->c->inf_artist);
+
+	strcpy(info->title4, "Copyright: ");
+	sprintf(info->info4, "%s", s->c->inf_copy);
+
+	strcpy(info->title5, "Year: ");
+	sprintf(info->info5, "%s", s->c->inf_year);
+
+	strcpy(info->title6, "Length: ");
+	sprintf(info->info6, "%s", s->c->inf_length);
+
+	strcpy(info->title7, "Fade: ");
+	sprintf(info->info7, "%s", s->c->inf_fade);
+
+	strcpy(info->title8, "Ripper: ");
+	sprintf(info->info8, "%s", s->psfby);
+
+	return AO_SUCCESS;
+}

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/eng_psf2.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/eng_spu.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/mamemem.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops Added

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/adsr.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/adsr.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/dma.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/dma.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/externals.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/gauss_i.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/registers.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/registers.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/regs.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/reverb.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/spu.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/spu.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops/stdafx.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2 Added

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/adsr.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/adsr2.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/dma.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/dma2.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/externals.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/gauss_i.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/psemuxa.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/registers.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/registers2.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/regs.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/reverb.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/reverb2.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/spu.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/spu2.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/peops2/stdafx.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/psx.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/psx.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_psf/psx_hw.c Added

@@ -0,0 +1,3395 @@
+/*
+	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->threadstateNamesTS_MAXSTATE = { "RUNNING", "READY", "WAITEVFLAG", "WAITSEMA", "WAITDELAY", "SLEEPING", "CREATED" };
+#endif
+
+#if DEBUG_HLE_IOP
+static char *seek_types3 = { "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->threadsiThread.save_regsi = mipsinfo.i;
+	}
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+	cpu->threadsiThread.save_regs32 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+	cpu->threadsiThread.save_regs33 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
+	cpu->threadsiThread.save_regs35 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
+	cpu->threadsiThread.save_regs36 = 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->threadsiThread.save_regs34 = mipsinfo.i;
+
+	#if DEBUG_THREADING
+	{
+		char buffer256;
+
+		DasmMIPS(buffer, mipsinfo.i, &psx_ram(mipsinfo.i & 0x7fffffff)/4);
+
+		printf("IOP: FreezeThread(%d) => %08x %s\n", iThread, cpu->threadsiThread.save_regs34, buffer);
+	}
+	#endif
+
+	// if thread was running, now it's ready
+	if (cpu->threadsiThread.iState == TS_RUNNING)
+	{
+		cpu->threadsiThread.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->threadsiThread.iState == TS_CREATED)
+	{
+		// PC = starting routine
+		cpu->threadsiThread.save_regs34 = cpu->threadsiThread.routine-4;	// compensate for weird delay slot effects
+		// SP = thread's stack area
+		cpu->threadsiThread.save_regs29 = (cpu->threadsiThread.stackloc + cpu->threadsiThread.stacksize) - 16;
+		cpu->threadsiThread.save_regs29 |= 0x80000000;
+
+		cpu->threadsiThread.save_regs35 = cpu->threadsiThread.save_regs36 = 0;
+
+		#if DEBUG_THREADING
+//		printf("IOP: Initial setup for thread %d => PC %x SP %x\n", iThread, cpu->threadsiThread.save_regs34+4, cpu->threadsiThread.save_regs29);
+		#endif
+	}
+											 
+	#if DEBUG_THREADING
+	{
+		char buffer256;
+
+		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->threadsiThread.save_regs34, buffer, wakecount);
+	}
+	#endif
+
+	for (i = 0; i < 32; i++)
+	{
+		mipsinfo.i = cpu->threadsiThread.save_regsi;
+		mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
+	}
+
+	mipsinfo.i = cpu->threadsiThread.save_regs32;
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+	mipsinfo.i = cpu->threadsiThread.save_regs33;
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+	mipsinfo.i = cpu->threadsiThread.save_regs34;
+	mips_set_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+	mipsinfo.i = cpu->threadsiThread.save_regs35;
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
+	mipsinfo.i = cpu->threadsiThread.save_regs36;
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
+
+	cpu->threadsiThread.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->threadsi.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->threadsi.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->threadstateNamescpu->threadsi.iState);
+		}
+		#endif
+
+		if (cpu->iCurThread != -1)
+		{
+			FreezeThread(cpu, cpu->iCurThread, 0);
+		}
+		ThawThread(cpu, iNextThread);
+		cpu->iCurThread = iNextThread;
+		cpu->threadscpu->iCurThread.iState = TS_RUNNING;
+	}
+	else
+	{
+		// no thread to switch to, is the current one still running?
+		if (cpu->iCurThread != -1)
+		{
+			if (cpu->threadscpu->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->threadstateNamescpu->threadsi.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_ramoffset>>2);
+	}
+
+	if (offset >= 0x80000000 && offset <= 0x807fffff)
+	{
+		offset &= 0x1fffff;
+		return LE32(cpu->psx_ramoffset>>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_cntscnt.count);
+				return cpu->root_cntscnt.count;
+				break;
+			case 4:
+//				printf("RC: read counter %d mode\n", cnt);
+				return cpu->root_cntscnt.mode;
+				break;
+			case 8:
+//				printf("RC: read counter %d target\n", cnt);
+				return cpu->root_cntscnt.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 == 0xbf801504)
+	{
+		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) * 2;
+		SPU2writeDMA4Mem(cpu, madr&0x1fffff, bcr);
+	}
+	else
+	{
+		#if DEBUG_HLE_IOP
+		printf("DMA4: SPU2 to RAM %08x\n", madr);
+		#endif
+		bcr = (bcr>>16) * (bcr & 0xffff) * 2;
+		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) * 2;
+		SPU2writeDMA7Mem(cpu, madr&0x1fffff, bcr);
+	}
+	else
+	{
+		#if DEBUG_HLE_IOP
+		printf("DMA7: SPU2 to RAM %08x\n", madr);
+		#endif
+		bcr = (bcr>>16) * (bcr & 0xffff) * 2;
+//		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_ramoffset>>2 &= LE32(mem_mask);
+		cpu->psx_ramoffset>>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_ramoffset>>2 &= LE32(mem_mask);
+		cpu->psx_ramoffset>>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_cntscnt.count = data;
+//				printf("RC: counter %d count = %x\n", cnt, data);
+				break;
+			case 4:
+				cpu->root_cntscnt.mode = data;
+//				printf("RC: counter %d mode = %x\n", cnt, data);
+				break;
+			case 8:
+				cpu->root_cntscnt.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 == 0xbf801508)
+	{
+		cpu->dma7_chcr = data;
+		ps2_dma7(cpu, cpu->dma7_madr, cpu->dma7_bcr, cpu->dma7_chcr);
+		return;
+	}
+							 
+	if (offset == 0xbf801504 || offset == 0xbf801506)
+	{
+		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_regsj = mipsinfo.i;
+	}
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+	cpu->irq_regs32 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+	cpu->irq_regs33 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+	cpu->irq_regs34 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
+	cpu->irq_regs35 = mipsinfo.i;
+	mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYR, &mipsinfo);
+	cpu->irq_regs36 = 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_ram0x1000/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_regsj;
+		mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_R0 + j, &mipsinfo);
+	}
+
+	mipsinfo.i = cpu->irq_regs32;
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+	mipsinfo.i = cpu->irq_regs33;
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+	mipsinfo.i = cpu->irq_regs34;
+	mips_set_info(cpu, CPUINFO_INT_PC, &mipsinfo);
+	mipsinfo.i = cpu->irq_regs35;
+	mips_set_info(cpu, CPUINFO_INT_REGISTER + MIPS_DELAYV, &mipsinfo);
+	mipsinfo.i = cpu->irq_regs36;
+	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_regsi = mipsinfo.i;
+			}
+			mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+			cpu->irq_regs32 = mipsinfo.i;
+			mips_get_info(cpu, CPUINFO_INT_REGISTER + MIPS_LO, &mipsinfo);
+			cpu->irq_regs33 = mipsinfo.i;
+
+			// check BIOS-driven interrupts
+			if (cpu->irq_data & 1)	// VSync
+			{
+				if (cpu->CounterEvent31.status == LE32(EvStACTIVE))
+				{
+					// run the handler
+					mipsinfo.i = LE32(cpu->CounterEvent31.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_ram0x1000/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->CounterEventi1.status == LE32(EvStACTIVE))
+						{
+							// run the handler
+							mipsinfo.i = LE32(cpu->CounterEventi1.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_ram0x1000/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_regsi;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
+				}
+
+				mipsinfo.i = cpu->irq_regs32;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+				mipsinfo.i = cpu->irq_regs33;
+				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->threads0.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_ram0xa0/4 = LE32(FUNCT_HLECALL);
+	cpu->psx_ram0xb0/4 = LE32(FUNCT_HLECALL);
+	cpu->psx_ram0xc0/4 = LE32(FUNCT_HLECALL);
+
+	cpu->Event = (EvtCtrlBlk *)&cpu->psx_ram0x1000/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_cnts0.mode = RC_EN;
+	cpu->root_cnts1.mode = RC_EN;
+	cpu->root_cnts2.mode = RC_EN;
+	cpu->root_cnts0.sysclock = 0;
+	cpu->root_cnts1.sysclock = 0;
+	cpu->root_cnts2.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->Eventevspec.status != LE32(EvStACTIVE))
+						{
+							#if DEBUG_HLE_BIOS
+							printf("event not active\n");
+							#endif
+							return;
+						}
+
+						// if interrupt mode, do the call
+						if (cpu->Eventevspec.mode == LE32(EvMdINTR))
+						{
+							#if DEBUG_HLE_BIOS
+							printf("INTR type, need to call handler %x\n", LE32(Eventevspec.fhandler));
+							#endif
+						}
+						else
+						{
+							cpu->Eventevspec.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->Eventevspec.status = LE32(EvStWAIT);
+						cpu->Eventevspec.mode = LE32(a2);
+						cpu->Eventevspec.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->Eventevspec.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->Eventevspec.status == LE32(EvStALREADY))
+						{
+							cpu->Eventevspec.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->Eventevspec.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->Eventevspec.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_regsi;
+						mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R0 + i, &mipsinfo);
+					}
+
+					mipsinfo.i = cpu->irq_regs32;
+					mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_HI, &mipsinfo);
+					mipsinfo.i = cpu->irq_regs33;
+					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->threadsi.iState == TS_WAITDELAY)
+			{
+				if (cpu->threadsi.waitparm > CLOCK_DIV)
+				{
+					cpu->threadsi.waitparm -= CLOCK_DIV;
+				}
+				else	// time's up
+				{
+					cpu->threadsi.waitparm = 0;
+					cpu->threadsi.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_timersi.iActive > 0)
+				{
+					cpu->iop_timersi.count += 836;
+					if (cpu->iop_timersi.count >= cpu->iop_timersi.target)
+					{
+						cpu->iop_timersi.count -= cpu->iop_timersi.target;
+
+	//					printf("Timer %d: handler = %08x, param = %08x\n", i, cpu->iop_timersi.handler, cpu->iop_timersi.hparam);
+						call_irq_routine(cpu, cpu->iop_timersi.handler, cpu->iop_timersi.hparam);
+
+						cpu->timerexp = 1;
+					} 
+				}
+			}
+		}
+	}
+
+// PS1 root counters
+	for (i = 0; i < 3; i++)
+	{
+		if ((!(cpu->root_cntsi.mode & RC_EN)) && (cpu->root_cntsi.mode != 0))
+		{
+			if (cpu->root_cntsi.mode & RC_DIV8)
+			{
+				cpu->root_cntsi.count += 768/8;
+			}
+			else
+			{
+				cpu->root_cntsi.count += 768;
+			}
+
+			if (cpu->root_cntsi.count >= cpu->root_cntsi.target)
+			{
+				if (!(cpu->root_cntsi.mode & RC_RESET))
+				{
+					cpu->root_cntsi.mode |= RC_EN;
+				}
+				else
+				{
+					cpu->root_cntsi.count %= cpu->root_cntsi.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 temp64, tfmt64;
+	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++;
+
+			tfmt0 = '%';
+			fp = 1;
+			while (((*cf >= '0') && (*cf <= '9')) || (*cf == '.'))
+			{
+				tfmtfp = *cf;
+				fp++;
+				cf++;
+			}
+
+			tfmtfp = *cf;
+			tfmtfp+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 = &temp0;
+			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 name9, out512;
+	uint32 a0, a1, a2, a3;
+	union cpuinfo mipsinfo;
+	int i;
+
+	memset (out, 0, sizeof (out));
+
+//	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_ramscan != LE32(0x41e00000)) && (scan >= (0x10000/4)))
+	{
+		scan--;
+	}
+
+	if (cpu->psx_ramscan != LE32(0x41e00000))
+	{
+		printf("FATAL ERROR: couldn't find IOP link signature\n");
+		return;
+	}
+
+	scan += 3;	// skip zero and version
+	memcpy(name, &cpu->psx_ramscan, 8);
+	name8 = '\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 (outstrlen(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_rama0, cpu->psx_rama0+1, cpu->psx_rama0+2, cpu->psx_rama0+3, cpu->psx_rama0+4);
+				#endif
+
+				newAlloc = psf2_get_loadaddr();
+				// force 16-byte alignment
+				if (newAlloc & 0xf)
+				{
+					newAlloc &= ~0xf;
+					newAlloc += 16;
+				}
+				psf2_set_loadaddr(newAlloc + LE32(cpu->psx_rama0+3));
+				
+				cpu->threadscpu->iNumThreads.iState = TS_CREATED;
+				cpu->threadscpu->iNumThreads.stackloc = newAlloc;
+				cpu->threadscpu->iNumThreads.flags = LE32(cpu->psx_rama0);
+				cpu->threadscpu->iNumThreads.routine = LE32(cpu->psx_rama0+2);
+				cpu->threadscpu->iNumThreads.stacksize = LE32(cpu->psx_rama0+3);
+				cpu->threadscpu->iNumThreads.refCon = LE32(cpu->psx_rama0+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->threadscpu->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->threadsa0.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->threadsa0.iState != TS_RUNNING)
+				{
+					cpu->threadsa0.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->threadscpu->iCurThread.iState = TS_WAITDELAY;
+					dTicks /= (double)1000000.0;
+					dTicks *= (double)36864000.0;	// 768*48000 = IOP native-mode clock rate
+					cpu->threadscpu->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_rama0 = LE32(cpu->sys_time & 0xffffffff); 	// low
+				cpu->psx_rama0+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_rama0);
+					temp |= (uint64)LE32(cpu->psx_rama0+1)<<32;
+
+					temp *= (uint64)1000000;
+					temp /= (uint64)36864000;
+
+					// temp now is USec
+					seconds = (temp / 1000000) & 0xffffffff;
+					usec = (temp % 1000000) & 0xffffffff;
+
+					cpu->psx_rama1 = LE32(seconds);
+					cpu->psx_rama2 = 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->evflagscpu->iNumFlags.type = LE32(cpu->psx_rama0);
+				cpu->evflagscpu->iNumFlags.value = LE32(cpu->psx_rama0+1);
+				cpu->evflagscpu->iNumFlags.param = LE32(cpu->psx_rama0+2);
+				cpu->evflagscpu->iNumFlags.inUse = 1;
+
+				#if DEBUG_HLE_IOP
+				printf(" Flag %02d: type %d init %08x param %08x\n", cpu->iNumFlags, cpu->evflagscpu->iNumFlags.type, cpu->evflagscpu->iNumFlags.value, cpu->evflagscpu->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->evflagsa0.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->evflagsa0.value |= a1;
+
+				mipsinfo.i = 0;
+				mips_set_info(cpu,CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
+
+				for (i=0; i < cpu->iNumThreads; i++)
+				{
+					if ((cpu->threadsi.iState == TS_WAITEVFLAG) && (cpu->threadsi.waitparm == a0))
+					{
+						cpu->threadsi.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->evflagsa0.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->evflagsa0.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->evflagsa0.value & a1))
+				{
+					FreezeThread(cpu, cpu->iCurThread, 1);
+					cpu->threadscpu->iCurThread.iState = TS_WAITEVFLAG;
+					cpu->threadscpu->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->semaphoresi.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_rama0, cpu->psx_rama0+1, cpu->psx_rama0+2, cpu->psx_rama0+3);
+	
+				if (mipsinfo.i != -1)
+				{
+					cpu->semaphoresmipsinfo.i.attr = LE32(cpu->psx_rama0);
+					cpu->semaphoresmipsinfo.i.option = LE32(cpu->psx_rama0+1);
+					cpu->semaphoresmipsinfo.i.init = LE32(cpu->psx_rama0+2);
+					cpu->semaphoresmipsinfo.i.max = LE32(cpu->psx_rama0+3);
+
+					cpu->semaphoresmipsinfo.i.current = cpu->semaphoresmipsinfo.i.init;
+
+					cpu->semaphoresmipsinfo.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->semaphoresa0.current);
+				#endif
+
+				foundthread = 0;
+				for (i=0; i < cpu->iNumThreads; i++)
+				{
+					if ((cpu->threadsi.iState == TS_WAITSEMA) && (cpu->threadsi.waitparm == a0))
+					{
+						cpu->threadsi.iState = TS_READY;	
+						cpu->semaphoresa0.threadsWaiting--;
+						foundthread = 1;
+						break;
+					}
+				}
+
+				mipsinfo.i = 0;
+
+				if (!foundthread)
+				{
+					if (cpu->semaphoresa0.current < cpu->semaphoresa0.max)
+					{
+						cpu->semaphoresa0.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->threadsi.iState == TS_WAITSEMA) && (cpu->threadsi.waitparm == a0))
+					{
+						cpu->threadsi.iState = TS_READY;	
+						cpu->semaphoresa0.threadsWaiting--;
+						foundthread = 1;
+						break;
+					}
+				}
+
+				mipsinfo.i = 0;
+
+				if (!foundthread)
+				{
+					if (cpu->semaphoresa0.current < cpu->semaphoresa0.max)
+					{
+						cpu->semaphoresa0.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->semaphoresa0.current, mipsinfo.i);
+				#endif
+		
+				if (cpu->semaphoresa0.current > 0)
+				{
+					cpu->semaphoresa0.current--;
+				}
+				else
+				{
+					FreezeThread(cpu,cpu->iCurThread, 1);
+					cpu->threadscpu->iCurThread.iState = TS_WAITSEMA;
+					cpu->threadscpu->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_timerscpu->iNumTimers.source = a0;
+				cpu->iop_timerscpu->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_timersa0-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_timersa0-1.target = a1;
+				cpu->iop_timersa0-1.handler = a2;
+				cpu->iop_timersa0-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_timersa0-1.source = a1;
+				cpu->iop_timersa0-1.mode = a2;
+				cpu->iop_timersa0-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_timersa0-1.iActive = 1;
+				cpu->iop_timersa0-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_timersa0-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_rama0/4 == LE32(0x41c00000))
+				{
+					a0 += 3*4;
+					memcpy(&cpu->reglibscpu->iNumLibs.name, &cpu->psx_rama0/4, 8);
+					cpu->reglibscpu->iNumLibs.name8 = '\0';
+					#if DEBUG_HLE_IOP
+					printf("Lib name %s\n", &cpu->reglibscpu->iNumLibs.name);
+					#endif
+					a0 += 2*4;
+					cpu->reglibscpu->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 (outstrlen(out)-1 != '\n')
+				{
+					strcat(out, "\n");
+				}
+
+				// filter out ESC characters
+				{
+					int ch;
+
+					for (ch = 0; ch < strlen(out); ch++)
+					{
+						if (outch == 27)
+						{
+							outch = '';
+						}
+					}
+				}
+
+				#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 args20, numargs = 1, argofs;
+						uint8 *argwalk = (uint8 *)cpu->psx_ram, *argbase;
+						
+						argwalk += (a2 & 0x1fffff);
+						argbase = argwalk;
+
+						args0 = a0;	// program name is argc0
+
+						argofs = 0;
+
+						if (a1 > 0)
+						{
+							argsnumargs = a2;
+							numargs++;
+
+							while (a1)
+							{
+								if ((*argwalk == 0) && (a1 > 1))
+								{
+									argsnumargs = a2 + argofs + 1;
+									numargs++;
+								}
+								argwalk++;
+								argofs++;
+								a1--;
+							}
+						}
+
+						for (i = 0; i < numargs; i++) 
+						{
+							#if DEBUG_HLE_IOP
+//							printf("Arg %d: %08x %s\n", i, argsi, &argbaseargsi-a2); 
+							#endif
+							cpu->psx_ram(newAlloc/4)+i = LE32(argsi);
+						}
+
+						// 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->filestati == 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->filedataslot2use = malloc(6*1024*1024);
+					cpu->filesizeslot2use = psf2_load_file(cpu, mname, cpu->filedataslot2use, 6*1024*1024);
+					cpu->fileposslot2use = 0;
+					cpu->filestatslot2use = 1;
+
+					if (cpu->filesizeslot2use == 0xffffffff)
+					{
+						mipsinfo.i = cpu->filesizeslot2use;
+					}
+					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->filedataa0);
+				cpu->filedataa0 = (uint8 *)NULL;
+				cpu->fileposa0 = 0;
+				cpu->filesizea0 = 0;
+				cpu->filestata0 = 0;
+				break;
+
+			case 6:	// read
+				#if DEBUG_HLE_IOP
+				printf("IOP: read(%x %x %d) pos %d size %d\n", a0, a1, a2, cpu->fileposa0, cpu->filesizea0);
+				#endif
+
+				if (cpu->fileposa0 >= cpu->filesizea0)
+				{
+					mipsinfo.i = 0;
+				}
+				else
+				{
+					uint8 *rp;
+
+					if ((cpu->fileposa0 + a2) > cpu->filesizea0)
+					{
+						a2 = cpu->filesizea0 - cpu->fileposa0;
+					}
+
+					rp = (uint8 *)cpu->psx_ram;
+					rp += (a1 & 0x1fffff);
+					memcpy(rp, &cpu->filedataa0cpu->fileposa0, a2);
+
+					cpu->fileposa0 += 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_typesa2, mipsinfo.i);
+				#endif
+
+				switch (a2)
+				{
+					case 0:	// SEEK_SET
+						if (a1 <= cpu->filesizea0)
+						{
+							cpu->fileposa0 = a1;
+						}
+						break;
+					case 1:	// SEEK_CUR
+						if ((a1 + cpu->fileposa0) < cpu->filesizea0)
+						{
+							cpu->fileposa0 += a1;
+						}
+						break;
+					case 2:	// SEEK_END
+						cpu->fileposa0 = cpu->filesizea0 - a1;
+						break;
+				}
+
+				mipsinfo.i = cpu->fileposa0;
+				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->reglibslib.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->reglibslib.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->reglibslib.name, 
+							 lib,
+							 callnum, 
+							 (uint32)mipsinfo.i, 
+							 a0, a1, a2, a3, PC);
+					#endif
+
+					#if 0
+					if (!strcmp(cpu->reglibslib.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-1.9.6.tar.bz2/plugins/psf/eng_qsf Added

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_qsf/eng_qsf.c Added

@@ -0,0 +1,523 @@
+/*
+	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 qsfby256;
+ uint32 skey1, skey2;
+ uint16 akey;
+ uint8 xkey;
+ int32 uses_kabuki;
+ char *Z80ROM, *QSamples;
+ char RAM0x1000, RAM20x1000;
+ char initRAM0x1000, initRAM20x1000;
+ 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 = cbuf3 | cbuf4<<8 | cbuf5<<16 | cbuf6<<24;
+		length = cbuf7 | cbuf8<<8 | cbuf9<<16 | cbuf10<<24;
+
+		#if DEBUG_LOADER				
+		printf("Tag: %c%c%c @ %08x, length %08x\n", cbuf0, cbuf1, cbuf2, offset, length);
+		#endif
+
+		switch (cbuf0)
+		{
+			case 'Z':
+				memcpy(&s->Z80ROMoffset, &cbuf11, length);
+				break;
+
+			case 'S':
+				memcpy(&s->QSamplesoffset, &cbuf11, length);
+				break;
+
+			case 'K':
+				s->skey1 = cbuf11<<24 | cbuf12<<16 | cbuf13<<8 | cbuf14;
+				s->skey2 = cbuf15<<24 | cbuf16<<16 | cbuf17<<8 | cbuf18;
+				s->akey = cbuf19<<8 | cbuf20;
+				s->xkey = cbuf20;
+				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->lib0 != 0)
+	{
+		uint64 tmp_length;
+	
+ char libpathPATH_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_namei, "qsfby"))
+			{
+				strcpy(s->qsfby, s->c->tag_datai);
+			}
+		}
+	}
+
+	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 output44100/30, output244100/30;
+	int16 *stereo2;
+	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);
+		stereo0 = &outputopos;
+		stereo1 = &output2opos;
+		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));
+		stereo0 = &outputopos;
+		stereo1 = &output2opos;
+		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++ = outputi;
+		*outp++ = output2i;
+	}
+
+	return AO_SUCCESS;
+}
+
+int32 qsf_stop(void *handle)
+{
+ if (handle == NULL) {
+ return AO_SUCCESS;
+ }
+ 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->title1, "Name: ");
+	sprintf(info->info1, "%s", s->c->inf_title);
+
+	strcpy(info->title2, "Game: ");
+	sprintf(info->info2, "%s", s->c->inf_game);
+	
+	strcpy(info->title3, "Artist: ");
+	sprintf(info->info3, "%s", s->c->inf_artist);
+
+	strcpy(info->title4, "Copyright: ");
+	sprintf(info->info4, "%s", s->c->inf_copy);
+
+	strcpy(info->title5, "Year: ");
+	sprintf(info->info5, "%s", s->c->inf_year);
+
+	strcpy(info->title6, "Length: ");
+	sprintf(info->info6, "%s", s->c->inf_length);
+
+	strcpy(info->title7, "Fade: ");
+	sprintf(info->info7, "%s", s->c->inf_fade);
+
+	strcpy(info->title8, "Ripper: ");
+	sprintf(info->info8, "%s", s->qsfby);
+
+	return AO_SUCCESS;
+}
+
+uint8 qsf_memory_read(qsf_synth_t *s, uint16 addr)
+{
+	if (addr < 0x8000)
+	{
+		return s->Z80ROMaddr;
+	}
+	else if (addr < 0xc000)
+	{
+		return s->Z80ROM(addr - 0x8000) + s->cur_bank;
+	}
+	else if (addr <= 0xcfff)
+	{
+		return s->RAMaddr - 0xc000;
+	}
+	else if (addr == 0xd007)
+	{
+		return qsound_status_r(s->qs);
+	}
+	else if (addr >= 0xf000)
+	{
+		return s->RAM2addr-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->Z80ROMaddr + (256*1024);
+	}
+
+	return qsf_memory_read(s, addr);
+}
+
+uint8 qsf_memory_readport(qsf_synth_t *s, uint16 addr)
+{
+	return s->Z80ROM0x11;
+}
+
+void qsf_memory_write(qsf_synth_t *s, uint16 addr, uint8 byte)
+{
+	if (addr >= 0xc000 && addr <= 0xcfff)
+	{
+		
+		s->RAMaddr-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->RAM2addr-0xf000 = byte;
+		return;
+	}
+}
+
+void qsf_memory_writeport(qsf_synth_t *s, uint16 addr, uint8 byte)
+{
+	printf("Unk port %x @ %x\n", byte, addr);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_qsf/kabuki.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_qsf/qsound.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_qsf/qsound.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_qsf/z80.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_qsf/z80.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_qsf/z80dasm.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_qsf/z80dasm.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf Added

deadbeef-1.9.6.tar.bz2/plugins/psf/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 		psfby256;
+ uint32		decaybegin, decayend, total_samples;
+ uint8 init_sat_ram512*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->libauxi-1 : s->c->lib;
+		if (libfile0 != 0)
+		{
+			uint64 tmp_length;
+	
+ char libpathPATH_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(libpath, &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_decoded0 | lib_decoded1<<8 | lib_decoded2<<16 | lib_decoded3<<24;
+
+			// guard against invalid data
+			if ((offset + (lib_len-4)) > 0x7ffff)
+			{
+				lib_len = 0x80000-offset+4;
+			}
+			memcpy(&s->cpu->sat_ramoffset, 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 = file3<<24 | file2<<16 | file1<<8 | file0;
+
+	// guard against invalid data
+	if ((offset + (file_len-4)) > 0x7ffff)
+	{
+		file_len = 0x80000-offset+4;
+	}
+
+	memcpy(&s->cpu->sat_ramoffset, 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_namei, "psfby"))
+				strcpy(s->psfby, s->c->tag_datai);
+		}
+	}
+
+	#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_rami;
+		s->cpu->sat_rami = s->cpu->sat_rami+1;
+		s->cpu->sat_rami+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 outputsamples, output2samples;
+	int16 *stereo2;
+	int16 *outp = buffer;
+
+	for (i = 0; i < samples; i++)
+	{
+		m68k_execute(s->cpu, (11300000/60)/735);
+		stereo0 = &outputi;
+		stereo1 = &output2i;
+		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
+				outputi = 0;
+				output2i = 0;
+			}
+			else
+			{
+				int32 fader = 256 - (256*(s->total_samples - s->decaybegin)/(s->decayend-s->decaybegin));
+				outputi = (outputi * fader)>>8;
+				output2i = (output2i * fader)>>8;
+
+				s->total_samples++;
+			}
+		}
+		else
+		{
+			s->total_samples++;
+		}
+
+		*outp++ = outputi;
+		*outp++ = output2i;
+	}
+
+	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->title1, "Name: ");
+	sprintf(info->info1, "%s", s->c->inf_title);
+
+	strcpy(info->title2, "Game: ");
+	sprintf(info->info2, "%s", s->c->inf_game);
+	
+	strcpy(info->title3, "Artist: ");
+	sprintf(info->info3, "%s", s->c->inf_artist);
+
+	strcpy(info->title4, "Copyright: ");
+	sprintf(info->info4, "%s", s->c->inf_copy);
+
+	strcpy(info->title5, "Year: ");
+	sprintf(info->info5, "%s", s->c->inf_year);
+
+	strcpy(info->title6, "Length: ");
+	sprintf(info->info6, "%s", s->c->inf_length);
+
+	strcpy(info->title7, "Fade: ");
+	sprintf(info->info7, "%s", s->c->inf_fade);
+
+	strcpy(info->title8, "Ripper: ");
+	sprintf(info->info8, "%s", s->psfby);
+
+	return AO_SUCCESS;
+}

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/m68k.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/m68kconf.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/m68kcpu.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/m68kcpu.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/m68kmame.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/m68kopac.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/m68kopdm.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/m68kopnz.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/m68kops.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/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(void);
+
+extern void (*m68ki_instruction_jump_table0x10000)(m68ki_cpu_core *cpu); /* opcode handler jump table */
+extern unsigned char m68ki_cycles0x10000;
+
+
+/* ======================================================================== */
+/* ============================== END OF FILE ============================= */
+/* ======================================================================== */
+
+#endif /* M68KOPS__HEADER */
+
+

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/sat_hw.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/sat_hw.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/scsp.c Added

@@ -0,0 +1,1274 @@
+/*
+ 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.data0x0>>0x0)&0x1000)
+#define KEYONB(slot)		((slot->udata.data0x0>>0x0)&0x0800)
+#define SBCTL(slot)		((slot->udata.data0x0>>0x9)&0x0003)
+#define SSCTL(slot)		((slot->udata.data0x0>>0x7)&0x0003)
+#define LPCTL(slot)		((slot->udata.data0x0>>0x5)&0x0003)
+#define PCM8B(slot)		((slot->udata.data0x0>>0x0)&0x0010)
+
+#define SA(slot)		(((slot->udata.data0x0&0xF)<<16)|(slot->udata.data0x1))
+
+#define LSA(slot)		(slot->udata.data0x2)
+
+#define LEA(slot)		(slot->udata.data0x3)
+
+#define D2R(slot)		((slot->udata.data0x4>>0xB)&0x001F)
+#define D1R(slot)		((slot->udata.data0x4>>0x6)&0x001F)
+#define EGHOLD(slot)		((slot->udata.data0x4>>0x0)&0x0020)
+#define AR(slot)		((slot->udata.data0x4>>0x0)&0x001F)
+
+#define LPSLNK(slot)		((slot->udata.data0x5>>0x0)&0x4000)
+#define KRS(slot)		((slot->udata.data0x5>>0xA)&0x000F)
+#define DL(slot)		((slot->udata.data0x5>>0x5)&0x001F)
+#define RR(slot)		((slot->udata.data0x5>>0x0)&0x001F)
+
+#define STWINH(slot)		((slot->udata.data0x6>>0x0)&0x0200)
+#define SDIR(slot)		((slot->udata.data0x6>>0x0)&0x0100)
+#define TL(slot)		((slot->udata.data0x6>>0x0)&0x00FF)
+
+#define MDL(slot)		((slot->udata.data0x7>>0xC)&0x000F)
+#define MDXSL(slot)		((slot->udata.data0x7>>0x6)&0x003F)
+#define MDYSL(slot)		((slot->udata.data0x7>>0x0)&0x003F)
+
+#define OCT(slot)		((slot->udata.data0x8>>0xB)&0x000F)
+#define FNS(slot)		((slot->udata.data0x8>>0x0)&0x03FF)
+
+#define LFORE(slot)		((slot->udata.data0x9>>0x0)&0x8000)
+#define LFOF(slot)		((slot->udata.data0x9>>0xA)&0x001F)
+#define PLFOWS(slot)		((slot->udata.data0x9>>0x8)&0x0003)
+#define PLFOS(slot)		((slot->udata.data0x9>>0x5)&0x0007)
+#define ALFOWS(slot)		((slot->udata.data0x9>>0x3)&0x0003)
+#define ALFOS(slot)		((slot->udata.data0x9>>0x0)&0x0007)
+
+#define ISEL(slot)		((slot->udata.data0xA>>0x3)&0x000F)
+#define IMXL(slot)		((slot->udata.data0xA>>0x0)&0x0007)
+
+#define DISDL(slot)		((slot->udata.data0xB>>0xD)&0x0007)
+#define DIPAN(slot)		((slot->udata.data0xB>>0x8)&0x001F)
+#define EFSDL(slot)		((slot->udata.data0xB>>0x5)&0x0007)
+#define EFPAN(slot)		((slot->udata.data0xB>>0x0)&0x001F)
+
+//Envelope times in ms
+static const double ARTimes64={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 DRTimes64={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_Table0x400;
+static INT32 EG_TABLE0x400;
+
+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 data0x10;	//only 0x1a bytes used
+		UINT8 datab0x20;
+	} 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.data0>>0x0)&0x0200)
+#define DAC18B(scsp)		((scsp->udata.data0>>0x0)&0x0100)
+#define MVOL(scsp)		((scsp->udata.data0>>0x0)&0x000F)
+#define RBL(scsp)		((scsp->udata.data1>>0x7)&0x0003)
+#define RBP(scsp)		((scsp->udata.data1>>0x0)&0x003F)
+#define MOFULL(scsp) 		((scsp->udata.data2>>0x0)&0x1000)
+#define MOEMPTY(scsp)		((scsp->udata.data2>>0x0)&0x0800)
+#define MIOVF(scsp)		((scsp->udata.data2>>0x0)&0x0400)
+#define MIFULL(scsp)		((scsp->udata.data2>>0x0)&0x0200)
+#define MIEMPTY(scsp)		((scsp->udata.data2>>0x0)&0x0100)
+
+#define SCILV0(scsp) 	((scsp->udata.data0x24/2>>0x0)&0xff)
+#define SCILV1(scsp) 	((scsp->udata.data0x26/2>>0x0)&0xff)
+#define SCILV2(scsp) 	((scsp->udata.data0x28/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 data0x30/2;
+		UINT8 datab0x30;
+	} udata;
+	struct _SLOT Slots32;
+	signed short RINGBUF64;
+	unsigned char BUFPTR;
+#if FM_DELAY
+	signed short DELAYBUFFM_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 MidiStack16;
+	UINT8 MidiW,MidiR;
+
+	int LPANTABLE0x10000;
+	int RPANTABLE0x10000;
+
+	int TimPris3;
+	int TimCnt3;
+
+	// DMA stuff
+	UINT32 scsp_dmea;
+	UINT16 scsp_drga;
+	UINT16 scsp_dtlg;
+
+	int ARTABLE64, DRTABLE64;
+
+ 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_regs0x16/2 & 0x4000
+#define	scsp_ddir		scsp_regs0x16/2 & 0x2000
+#define scsp_dexe 		scsp_regs0x16/2 & 0x1000
+#define dma_transfer_end	((scsp_regs0x24/2 & 0x10)>>4)|(((scsp_regs0x26/2 & 0x10)>>4)<<1)|(((scsp_regs0x28/2 & 0x10)>>4)<<2)
+
+static const float SDLT8={-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.data0x22/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.data0x20/2;
+	UINT32 en=SCSP->udata.data0x1e/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->ARTABLERate;
+}
+
+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->DRTABLERate;
+}
+
+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->DRTABLERate;
+}
+
+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_TableFNS(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.data0&=~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;
+		}
+
+ SCSP->SCSPRAM = (unsigned char *)intf->region0;
+ 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_Tablei=(float) (1<<SHIFT) *fcent;
+	}
+	
+	for(i=0;i<0x400;++i)
+	{
+		float envDB=((float)(3*(i-0x3ff)))/32.0;
+		float scale=(float)(1<<SHIFT);
+		EG_TABLEi=(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,(SDLTiSDL)/20.0);
+		else
+			fSDL=0.0;
+
+		SCSP->LPANTABLEi=FIX((4.0*LPAN*TL*fSDL));
+		SCSP->RPANTABLEi=FIX((4.0*RPAN*TL*fSDL));
+	}
+
+	SCSP->ARTABLE0=SCSP->DRTABLE0=0;	//Infinite time
+	SCSP->ARTABLE1=SCSP->DRTABLE1=0;	//Infinite time
+	for(i=2;i<64;++i)
+	{
+		double t,step,scale;
+		t=ARTimesi;	//In ms
+		if(t!=0.0)
+		{
+			step=(1023*1000.0)/((float) 44100.0f*t);
+			scale=(double) (1<<EG_SHIFT);
+			SCSP->ARTABLEi=(int) (step*scale);
+		}
+		else
+			SCSP->ARTABLEi=1024<<EG_SHIFT;
+
+		t=DRTimesi;	//In ms
+		step=(1023*1000.0)/((float) 44100.0f*t);
+		scale=(double) (1<<EG_SHIFT);
+		SCSP->DRTABLEi=(int) (step*scale);
+	}
+
+	// make sure all the slots are off
+	for(i=0;i<32;++i)
+	{
+		SCSP->Slotsi.slot=i;
+		SCSP->Slotsi.active=0;
+		SCSP->Slotsi.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"
+	SCSP0.udata.data0x20/2 = 0;
+	//SCSP1.udata.data0x20/2 = 0;
+	SCSP->TimCnt0 = 0xffff;
+	SCSP->TimCnt1 = 0xffff;
+	SCSP->TimCnt2 = 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.data0&=~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.data0x6/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->TimPris0=1<<((SCSP->udata.data0x18/2>>8)&0x7);
+				SCSP->TimCnt0=(SCSP->udata.data0x18/2&0xff)<<8;
+			}
+			break;
+		case 0x1a:
+		case 0x1b:
+			if(SCSP->Master)
+			{
+				SCSP->TimPris1=1<<((SCSP->udata.data0x1A/2>>8)&0x7);
+				SCSP->TimCnt1=(SCSP->udata.data0x1A/2&0xff)<<8;
+			}
+			break;
+		case 0x1C:
+		case 0x1D:
+			if(SCSP->Master)
+			{
+				SCSP->TimPris2=1<<((SCSP->udata.data0x1C/2>>8)&0x7);
+				SCSP->TimCnt2=(SCSP->udata.data0x1C/2&0xff)<<8;
+			}
+			break;
+		case 0x22:	//SCIRE
+		case 0x23:
+
+			if(SCSP->Master)		 
+			{
+				SCSP->udata.data0x20/2&=~SCSP->udata.data0x22/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->TimCnt0 >= 0xff00)
+				{
+					SCSP->udata.data0x20/2 |= 0x40;
+				}
+				if (SCSP->TimCnt1 >= 0xff00)
+				{
+					SCSP->udata.data0x20/2 |= 0x80;
+				}
+				if (SCSP->TimCnt2 >= 0xff00)
+				{
+					SCSP->udata.data0x20/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.data0x5/2;
+				v&=0xff00;
+				v|=SCSP->MidiStackSCSP->MidiR;
+				SCSP->Int68kCB(SCSP->cpu, 0);	// cancel the IRQ
+				if(SCSP->MidiR!=SCSP->MidiW)
+				{
+					++SCSP->MidiR;
+					SCSP->MidiR&=15;
+				}
+				SCSP->udata.data0x5/2=v;
+			}
+			break;
+		case 8:
+		case 9:
+			{
+				unsigned char slot=SCSP->udata.data0x8/2>>11;
+				unsigned int CA=SCSP->Slotsslot&0x1f.cur_addr>>(SHIFT+12);
+				SCSP->udata.data0x8/2&=~(0x780);
+				SCSP->udata.data0x8/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->Slotsslot.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->Slotsslot.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->TimCnt0<=0xff00)
+	{
+ 		SCSP->TimCnt0 += ticks << (8-((SCSP->udata.data0x18/2>>8)&0x7));
+		if (SCSP->TimCnt0 > 0xFF00)
+		{
+			SCSP->TimCnt0 = 0xFFFF;
+			SCSP->udata.data0x20/2|=0x40;
+		}
+		SCSP->udata.data0x18/2&=0xff00;
+		SCSP->udata.data0x18/2|=SCSP->TimCnt0>>8;
+	}
+
+	if(SCSP->TimCnt1<=0xff00)
+	{
+		SCSP->TimCnt1 += ticks << (8-((SCSP->udata.data0x1a/2>>8)&0x7));
+		if (SCSP->TimCnt1 > 0xFF00)
+		{
+			SCSP->TimCnt1 = 0xFFFF;
+			SCSP->udata.data0x20/2|=0x80;
+		}
+		SCSP->udata.data0x1a/2&=0xff00;
+		SCSP->udata.data0x1a/2|=SCSP->TimCnt1>>8;
+	}
+
+	if(SCSP->TimCnt2<=0xff00)
+	{
+		SCSP->TimCnt2 += ticks << (8-((SCSP->udata.data0x1c/2>>8)&0x7));
+		if (SCSP->TimCnt2 > 0xFF00)
+		{
+			SCSP->TimCnt2 = 0xFFFF;
+			SCSP->udata.data0x20/2|=0x100;
+		}
+		SCSP->udata.data0x1c/2&=0xff00;
+		SCSP->udata.data0x1c/2|=SCSP->TimCnt2>>8;
+	}
+}
+
+static 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 *addr2 = {&addr1, &addr2}; // used for linear interpolation
+	UINT32 *slot_addr2 = {&(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=(p0)<<8;
+		INT32 s;
+		INT32 fpart=slot->cur_addr&((1<<SHIFT)-1);
+		s=(int) (p10<<8)*((1<<SHIFT)-fpart)+(int) (p20<<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(p0);
+		INT32 s;
+		INT32 fpart=slot->cur_addr&((1<<SHIFT)-1);
+		s=(int) LE16(p10)*((1<<SHIFT)-fpart)+(int) LE16(p20)*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(*addraddr_select>=LSA(slot) && *addraddr_select>=LEA(slot))
+			{
+			//slot->active=0;
+			SCSP_StopSlot(slot,0);
+			}
+			break;
+		case 1: //normal loop
+			if(*addraddr_select>=LEA(slot))
+			{
+				rem_addr = *slot_addraddr_select - (LEA(slot)<<SHIFT);
+				*slot_addraddr_select=(LSA(slot)<<SHIFT) + rem_addr;
+			}
+			break;
+		case 2:	//reverse loop
+			if((*addraddr_select>=LSA(slot)) && !(slot->Backwards))
+			{
+				rem_addr = *slot_addraddr_select - (LSA(slot)<<SHIFT);
+				*slot_addraddr_select=(LEA(slot)<<SHIFT) - rem_addr;
+				slot->Backwards=1;
+			}
+			else if((*addraddr_select<LSA(slot) || (*slot_addraddr_select&0x80000000)) && slot->Backwards)
+			{
+				rem_addr = (LSA(slot)<<SHIFT) - *slot_addraddr_select;
+				*slot_addraddr_select=(LEA(slot)<<SHIFT) - rem_addr;
+			}
+			break;
+		case 3: //ping-pong
+			if(*addraddr_select>=LEA(slot)) //reached end, reverse till start
+			{
+				rem_addr = *slot_addraddr_select - (LEA(slot)<<SHIFT); 
+				*slot_addraddr_select=(LEA(slot)<<SHIFT) - rem_addr;
+				slot->Backwards=1;
+			}
+			else if((*addraddr_select<LSA(slot) || (*slot_addraddr_select&0x80000000)) && slot->Backwards)//reached start or negative
+			{
+				rem_addr = (LSA(slot)<<SHIFT) - *slot_addraddr_select;
+				*slot_addraddr_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_TABLEEG_Update(slot)>>(SHIFT-10))>>SHIFT;
+
+	if(!STWINH(slot))
+	{
+		unsigned short Enc=((TL(slot))<<0x0)|(0x7<<0xd);
+		*SCSP->RBUFDST=(sample*SCSP->LPANTABLEEnc)>>(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->Slotssl.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->LPANTABLEEnc)>>(SHIFT-2),ISEL(slot),IMXL(slot));
+				Enc=((TL(slot))<<0x0)|((DIPAN(slot))<<0x8)|((DISDL(slot))<<0xd);
+				{
+					smpl+=(sample*SCSP->LPANTABLEEnc)>>SHIFT;
+					smpr+=(sample*SCSP->RPANTABLEEnc)>>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.EFREGi*SCSP->LPANTABLEEnc)>>SHIFT;
+				smpr+=(SCSP->DSP.EFREGi*SCSP->RPANTABLEEnc)>>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_dma3, *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_dma0 = scsp_regs0x12/2;
+		tmp_dma1 = scsp_regs0x14/2;
+		tmp_dma2 = scsp_regs0x16/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_regs0x12/2 = tmp_dma0;
+		scsp_regs0x14/2 = tmp_dma1;
+		scsp_regs0x16/2 = tmp_dma2;
+	}
+
+	/*Job done,request a dma end irq*/
+//	if(scsp_regs0x1e/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 = buf0;
+	SCSP->bufferr = buf1;
+	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_callback0;
+
+//		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_regs0x14/2 & 0xf000)>>12)*0x10000) | (scsp_regs0x12/2 & 0xfffe);
+		break;
+		case 0x414:
+		/*DMEA 19:16*/
+		SCSP->scsp_dmea = (((scsp_regs0x14/2 & 0xf000)>>12)*0x10000) | (scsp_regs0x12/2 & 0xfffe);
+		/*DRGA 11:1*/
+		/*Register memory address*/
+		SCSP->scsp_drga = scsp_regs0x14/2 & 0x0ffe;
+		break;
+		case 0x416:
+		/*DGATE14*/
+		/*DDIR13*/
+		/*if 0 sound_mem -> reg*/
+		/*if 1 sound_mem <- reg*/
+		/*DEXE12*/
+		/*starting bit*/
+		/*DTLG11:1*/
+		/*size of transfer*/
+		SCSP->scsp_dtlg = scsp_regs0x16/2 & 0x0ffe;
+		if(scsp_dexe)
+		{
+			dma_scsp(SCSP);
+			scsp_regs0x16/2^=0x1000;//disable starting bit
+		}
+		break;
+		//check main cpu IRQ
+		case 0x42a:
+#if 0
+ extern UINT32* stv_scu;
+
+			if(stv_scu && !(stv_scu40 & 0x40) /*&& scsp_regs0x42c/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->MidiStackSCSP->MidiW++=data;
+	SCSP->MidiW &= 15;
+}
+
+READ16_HANDLER( SCSP_MidiOutR )
+{
+	struct _SCSP *SCSP = param; 
+	unsigned char val;
+
+	val=SCSP->MidiStackSCSP->MidiR++;
+	SCSP->MidiR&=7;
+	return val;
+}
+

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/scsp.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/scspdsp.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/scspdsp.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/eng_ssf/scsplfo.c Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/mem.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/osd_cpu.h Changed

deadbeef-1.9.6.tar.bz2/plugins/psf/plugin.c Added

@@ -0,0 +1,423 @@
+/*
+ DeaDBeeF - The Ultimate Music Player
+ Copyright (C) 2009-2013 Oleksiy 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/deadbeef.h>
+#include <deadbeef/strdupa.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(...) { deadbeef->log_detailed (&plugin.plugin, 0, __VA_ARGS__); }
+
+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;
+ int type;
+ void *decoder;
+ char *filebuffer;
+ size_t filesize;
+ char buffer735*4; // psf2 decoder only works with 735 samples buffer
+ int remaining;
+ int skipsamples;
+ float duration;
+} psfplug_info_t;
+
+static DB_fileinfo_t *
+psfplug_open (uint32_t hints) {
+ psfplug_info_t *info = calloc (1, sizeof (psfplug_info_t));
+ return &info->info;
+}
+
+static int
+psfplug_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ psfplug_info_t *info = (psfplug_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);
+
+ deadbeef->pl_lock ();
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ DB_FILE *file = deadbeef->fopen (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) {
+		trace ("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) {
+ deadbeef->pl_lock ();
+		trace ("psf: file read error: %s\n", deadbeef->pl_find_meta (it, ":URI"));
+		deadbeef->pl_unlock ();
+		deadbeef->fclose (file);
+ return -1;
+ }
+ deadbeef->fclose (file);
+
+ info->type = ao_identify (info->filebuffer);
+ if (info->type < 0) {
+ trace ("psf: ao_identify failed\n");
+ return -1;
+ }
+
+ deadbeef->pl_lock ();
+ info->decoder = ao_start (info->type, deadbeef->pl_find_meta (it, ":URI"), (uint8 *)info->filebuffer, (uint32)info->filesize);
+ deadbeef->pl_unlock ();
+ if (!info->decoder) {
+ trace ("psf: ao_start failed\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+static void
+psfplug_free (DB_fileinfo_t *_info) {
+ psfplug_info_t *info = (psfplug_info_t *)_info;
+ if (info) {
+ if (info->type >= 0) {
+ ao_stop (info->type, info->decoder);
+ }
+ if (info->filebuffer) {
+ free (info->filebuffer);
+ info->filebuffer = NULL;
+ }
+ free (info);
+ }
+}
+
+static int
+psfplug_read (DB_fileinfo_t *_info, char *bytes, int size) {
+ psfplug_info_t *info = (psfplug_info_t *)_info;
+// printf ("psfplug_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
+psfplug_seek_sample (DB_fileinfo_t *_info, int sample) {
+ psfplug_info_t *info = (psfplug_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
+psfplug_seek (DB_fileinfo_t *_info, float time) {
+ return psfplug_seek_sample (_info, time * _info->fmt.samplerate);
+}
+
+static void
+psfplug_add_meta (DB_playItem_t *it, const char *key, const char *value, const char *comment_title) {
+// const char *res = NULL;
+ char tmp200;
+ // check utf8
+ if (deadbeef->junk_recode (value, (int)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, (int)strlen (value), tmp, sizeof (tmp), "SHIFT-JIS") >= 0) {
+ if (key) {
+ deadbeef->pl_add_meta (it, key, tmp);
+ }
+// res = tmp;
+ }
+
+// if (res) {
+// char s1024;
+// snprintf (s, sizeof (s), "%s%s", comment_title, res);
+// deadbeef->pl_append_meta (it, "comment", s);
+// }
+}
+
+static DB_playItem_t *
+psfplug_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
+ trace ("psf: failed to open %s\n", fname);
+ return NULL;
+ }
+
+ int64_t fsize = deadbeef->fgetlength (fp);
+ if (fsize > 4*1024*1024) {
+ deadbeef->fclose (fp);
+ return NULL; // don't try loading large files
+ }
+
+ // identify by first 200 bytes
+ size_t size = 200;
+ char *buffer = malloc (size);
+ if (!buffer) {
+ deadbeef->fclose (fp);
+		trace ("psf: could not allocate %d bytes of memory\n", (int)size);
+ return NULL;
+ }
+
+	if (deadbeef->fread(buffer, 1, size, fp) != size) {
+ deadbeef->fclose (fp);
+ free (buffer);
+		trace ("psf: file read error: %s\n", fname);
+ return NULL;
+ }
+
+ int type = ao_identify (buffer);
+ if (type < 0) {
+ free (buffer);
+ return NULL;
+ }
+
+ free (buffer);
+
+ // try loading the whole file
+ deadbeef->rewind (fp);
+ size = fsize;
+ buffer = malloc (size);
+ if (deadbeef->fread(buffer, 1, size, fp) != size) {
+ deadbeef->fclose (fp);
+ free (buffer);
+ trace ("psf: file read error: %s\n", fname);
+ return NULL;
+ }
+ deadbeef->fclose (fp);
+
+ void *dec = ao_start (type, fname, (uint8*)buffer, (uint32_t)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.titlei, "Length: ", 8)) {
+ int min;
+ float sec;
+ if (sscanf (info.infoi, "%d:%f", &min, &sec) == 2) {
+ duration = min * 60 + sec;
+ }
+ else if (sscanf (info.infoi, "%f", &sec) == 1) {
+ duration = sec;
+ }
+ psfplug_add_meta (it, NULL, info.infoi, info.titlei);
+ }
+ else if (!strncasecmp (info.titlei, "Name: ", 6) || !strncasecmp (info.titlei, "Song: ", 6)) {
+ psfplug_add_meta (it, "title", info.infoi, info.titlei);
+ }
+ else if (!strncasecmp (info.titlei, "Game: ", 6)) {
+ psfplug_add_meta (it, "album", info.infoi, info.titlei);
+ }
+ else if (!strncasecmp (info.titlei, "Artist: ", 8)) {
+ psfplug_add_meta (it, "artist", info.infoi, info.titlei);
+ }
+ else if (!strncasecmp (info.titlei, "Copyright: ", 11)) {
+ psfplug_add_meta (it, "copyright", info.infoi, info.titlei);
+ }
+ else if (!strncasecmp (info.titlei, "Year: ", 6)) {
+ psfplug_add_meta (it, "year", info.infoi, info.titlei);
+ }
+ else if (!strncasecmp (info.titlei, "Fade: ", 6)) {
+ fade = atof (info.infoi);
+ psfplug_add_meta (it, "fade", info.infoi, info.titlei);
+ }
+ else {
+ char *colon = strchr (info.titlei, ':');
+ if (colon != NULL) {
+ char namecolon-info.titlei+1;
+ memcpy (name, info.titlei, colon-info.titlei);
+ namecolon-info.titlei = 0;
+ psfplug_add_meta (it, name, info.infoi, info.titlei);
+ }
+ }
+ }
+ }
+ 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
+psfplug_start (void) {
+ return 0;
+}
+
+static int
+psfplug_stop (void) {
+ return 0;
+}
+
+static DB_decoder_t plugin = {
+ DDB_PLUGIN_SET_API_VERSION
+ .plugin.version_major = 1,
+ .plugin.version_minor = 1,
+ .plugin.type = DB_PLUGIN_DECODER,
+ .plugin.flags = DDB_PLUGIN_FLAG_LOGGING,
+ .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-2013 Oleksiy 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 = psfplug_start,
+ .plugin.stop = psfplug_stop,
+ .open = psfplug_open,
+ .init = psfplug_init,
+ .free = psfplug_free,
+ .read = psfplug_read,
+ .seek = psfplug_seek,
+ .seek_sample = psfplug_seek_sample,
+ .insert = psfplug_insert,
+ .exts = exts,
+};
+
+DB_plugin_t *
+psf_load (DB_functions_t *api) {
+ deadbeef = api;
+ return DB_PLUGIN (&plugin);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/psf/psfmain.c Added

@@ -0,0 +1,279 @@
+/*
+	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/deadbeef.h>
+
+#include "ao.h"
+#include "eng_protos.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+extern DB_functions_t *deadbeef;
+
+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;
+	int64_t size;
+	DB_FILE *auxfile;
+
+	auxfile = deadbeef->fopen(filename);
+	if (!auxfile)
+	{
+		trace("PSF: 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 %lld bytes of memory\n", (long long)size);
+		return AO_FAIL;
+	}
+
+	deadbeef->fread(filebuf, size, 1, auxfile);
+	deadbeef->fclose(auxfile);
+
+	*buffer = filebuf;
+	*length = (uint64)size;
+
+	return AO_SUCCESS;
+}
+
+#if 0
+/* file types */
+static uint32 type;
+
+static void do_frame(uint32 size, int16 *buffer)
+{
+	(*typestype.gen)(buffer, size);
+}
+
+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(argc1, "rb");
+
+	if (!file)
+	{
+		printf("ERROR: could not open file %s\n", argc1);
+		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 = buffer0<<24 | buffer1<<16 | buffer2<<8 | buffer3;
+	while (typestype.sig != 0xffffffff)
+	{
+		if (filesig == typestype.sig)
+		{
+			break;
+		}
+		else
+		{
+			type++;
+		}
+	}
+
+	// now did we identify it above or just fall through?
+	if (typestype.sig != 0xffffffff)
+	{
+		printf("File identified as %s\n", typestype.name);
+	}
+	else
+	{
+		printf("ERROR: File is unknown, signature bytes are %02x %02x %02x %02x\n", buffer0, buffer1, buffer2, buffer3);
+		free(buffer);
+		return -1;
+	}
+
+ void *handle = (*typestype.start)(argc1, 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;
+}
+#endif
+
+// stub for MAME stuff
+int change_pc(int foo)
+{
+ return 0;
+}
+
+int
+ao_identify (char *buffer) {
+ uint32 filesig;
+ uint32 type = 0;
+
+	filesig = buffer0<<24 | buffer1<<16 | buffer2<<8 | buffer3;
+	while (typestype.sig != 0xffffffff)
+	{
+		if (filesig == typestype.sig)
+		{
+			break;
+		}
+		else
+		{
+			type++;
+		}
+	}
+
+	// now did we identify it above or just fall through?
+	if (typestype.sig != 0xffffffff)
+	{
+		trace ("psf: File identified as %s\n", typestype.name);
+	}
+	else
+	{
+		trace ("psf: File is unknown, signature bytes are %02x %02x %02x %02x\n", buffer0, buffer1, buffer2, buffer3);
+		return -1;
+ }
+ return type;
+}
+
+void *
+ao_start (uint32 type, const char *path, uint8 *buffer, uint32 size) {
+	return (*typestype.start)(path, buffer, size);
+}
+
+int
+ao_stop (uint32 type, void *handle) {
+	return (*typestype.stop)(handle);
+}
+
+int
+ao_get_info (uint32 type, void *handle, ao_display_info *info) {
+	return (*typestype.fillinfo)(handle, info);
+}
+
+int
+ao_decode (uint32 type, void *handle, int16 *buffer, uint32 size) {
+	(*typestype.gen)(handle, buffer, size);
+	return size;
+}
+
+int
+ao_command (uint32 type, void *handle, int32 command, int32 param) {
+	return (*typestype.command)(handle, command, param);
+}
+
+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);
+ libpathe-path = 0;
+ strcat (libpath, libname);
+ }
+ else {
+ strcpy (libpath, libname);
+ }
+}

deadbeef-0.6.2.tar.bz2/plugins/pulse/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/pulse/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/pulse/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/pulse/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/pulse/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/pulse/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/pulse/pulse.c -> deadbeef-1.9.6.tar.bz2/plugins/pulse/pulse.c Changed

@@ -1,7 +1,7 @@
 /*
 PulseAudio output plugin for DeaDBeeF Player
 Copyright (C) 2011 Jan D. Behrens <zykure@web.de>
- Copyright (C) 2010-2012 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2010-2012 Oleksiy Yakovenko <waker@users.sourceforge.net>
 Copyright (C) 2010 Anton Novikov <tonn.post@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 #endif
 
 #include <pulse/simple.h>
+#include <pulse/error.h>
 
 #include <stdint.h>
 #include <unistd.h>
@@ -33,46 +34,34 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
-//#define trace(...) { fprintf(stdout, __VA_ARGS__); }
-#define trace(fmt,...)
+#define trace(...) { deadbeef->log_detailed (&plugin.plugin, 0, __VA_ARGS__); }
 
 static DB_output_t plugin;
 DB_functions_t * deadbeef;
 
-#define CONFSTR_PULSE_SERVERADDR "pulse.serveraddr"
+// serveraddr2 is a version bump, since the handling has changed, and "default"
+// value has different meaning.
+#define CONFSTR_PULSE_SERVERADDR "pulse.serveraddr2"
 #define CONFSTR_PULSE_BUFFERSIZE "pulse.buffersize"
+#define PULSE_DEFAULT_BUFFERSIZE 4096
 
 static intptr_t pulse_tid;
 static int pulse_terminate;
 
 static pa_simple *s;
 static pa_sample_spec ss;
+static int _setformat_requested;
 static ddb_waveformat_t requested_fmt;
-static int state;
+static ddb_playback_state_t state = DDB_PLAYBACK_STATE_STOPPED;
 static uintptr_t mutex;
+static int in_callback;
 
 static int buffer_size;
 
 static void pulse_thread(void *context);
 
-static void pulse_callback(char *stream, int len);
-
-static int pulse_init();
-
-static int pulse_free();
-
-static int pulse_setformat(ddb_waveformat_t *fmt);
-
-static int pulse_play();
-
-static int pulse_stop();
-
-static int pulse_pause();
-
-static int pulse_unpause();
-
 static int pulse_set_spec(ddb_waveformat_t *fmt)
 {
 memcpy (&plugin.fmt, fmt, sizeof (ddb_waveformat_t));
@@ -94,7 +83,6 @@
 trace ("pulse: channels: %d\n", ss.channels);
 
 // Read samplerate from config
- //ss.rate = deadbeef->conf_get_int(CONFSTR_PULSE_SAMPLERATE, 44100);
 ss.rate = plugin.fmt.samplerate;
 trace ("pulse: samplerate: %d\n", ss.rate);
 
@@ -131,7 +119,7 @@
 //attr->minreq = Playback only: minimum request.
 //attr->fragsize = Recording only: fragment size.
 
- buffer_size = deadbeef->conf_get_int(CONFSTR_PULSE_BUFFERSIZE, 4096);
+ buffer_size = deadbeef->conf_get_int(CONFSTR_PULSE_BUFFERSIZE, PULSE_DEFAULT_BUFFERSIZE);
 
 // TODO: where list of all available devices? add this option to config too..
 char * dev = NULL;
@@ -139,77 +127,93 @@
 int error;
 
 // Read serveraddr from config
+ char server1000;
+
+ // migrate from 0.7.x
 deadbeef->conf_lock ();
- const char * server = deadbeef->conf_get_str_fast (CONFSTR_PULSE_SERVERADDR, NULL);
+ int has_server2 = deadbeef->conf_get_str_fast (CONFSTR_PULSE_SERVERADDR, NULL) != NULL;
+ deadbeef->conf_unlock ();
 
- if (server) {
- server = strcmp(server, "default") ? server : NULL;
+ if (!has_server2) {
+ deadbeef->conf_get_str ("pulse.serveraddr", "", server, sizeof (server));
+ // convert default
+ if (!strcasecmp (server, "default")) {
+ *server = 0;
+ }
+ }
+ else {
+ deadbeef->conf_get_str (CONFSTR_PULSE_SERVERADDR, "", server, sizeof (server));
 }
 
- s = pa_simple_new(server, "Deadbeef", PA_STREAM_PLAYBACK, dev, "Music", &ss, &channel_map, attr, &error);
- deadbeef->conf_unlock ();
+ for (;;) {
+ s = pa_simple_new(*server ? server : NULL, "Deadbeef", PA_STREAM_PLAYBACK, dev, "Music", &ss, &channel_map, attr, &error);
+
+ if (s != NULL || ss.rate <= 192000) {
+ break;
+ }
+
+ // Older pulseaudio versions couldn't handle more than 192KHz,
+ // so try to lower it down
+ ss.rate = plugin.fmt.samplerate = 192000;
+ }
 
- if (!s)
+ if (s == NULL)
 {
- trace ("pulse_init failed (%d)\n", error);
+ const char *strerr = pa_strerror (error);
+ fprintf (stderr, "pa_simple_new failed: %s\n", strerr);
 return -1;
 }
 
 return 0;
 }
 
-static int pulse_init(void)
-{
+static int
+pulse_init(void) {
 trace ("pulse_init\n");
- state = OUTPUT_STATE_STOPPED;
- pulse_terminate = 0;
+ deadbeef->mutex_lock (mutex);
+ state = DDB_PLAYBACK_STATE_STOPPED;
+ trace ("pulse_terminate=%d\n", pulse_terminate);
+ if (pulse_terminate) {
+ deadbeef->mutex_unlock (mutex);
+ return -1;
+ }
 
 if (requested_fmt.samplerate != 0) {
 memcpy (&plugin.fmt, &requested_fmt, sizeof (ddb_waveformat_t));
 }
 
 if (0 != pulse_set_spec(&plugin.fmt)) {
+ deadbeef->mutex_unlock (mutex);
 return -1;
 }
 
 pulse_tid = deadbeef->thread_start(pulse_thread, NULL);
+ deadbeef->mutex_unlock (mutex);
 
 return 0;
 }
 
-static int pulse_setformat (ddb_waveformat_t *fmt)
-{
- memcpy (&requested_fmt, fmt, sizeof (ddb_waveformat_t));
- if (!s) {
- return -1;
- }
- if (!memcmp (fmt, &plugin.fmt, sizeof (ddb_waveformat_t))) {
- trace ("pulse_setformat ignored\n");
+static int pulse_free(void);
+static int pulse_play(void);
+static int pulse_pause(void);
+
+static int
+_setformat_apply (void) {
+ _setformat_requested = 0;
+ if (!memcmp (&requested_fmt, &plugin.fmt, sizeof (ddb_waveformat_t))) {
 return 0;
 }
- trace ("pulse_setformat %dbit %s %dch %dHz channelmask=%X\n", fmt->bps, fmt->is_float ? "float" : "int", fmt->channels, fmt->samplerate, fmt->channelmask);
 
- int prev_state = state;
- pulse_stop ();
+ return pulse_set_spec(&requested_fmt);
+}
+
+static int
+pulse_setformat (ddb_waveformat_t *fmt)
+{
 deadbeef->mutex_lock(mutex);
- pulse_set_spec(fmt);
+ _setformat_requested = 1;
+ memcpy (&requested_fmt, fmt, sizeof (ddb_waveformat_t));
 deadbeef->mutex_unlock(mutex);
- trace ("new format %dbit %s %dch %dHz channelmask=%X\n", plugin.fmt.bps, plugin.fmt.is_float ? "float" : "int", plugin.fmt.channels, plugin.fmt.samplerate, plugin.fmt.channelmask);
-
- switch (prev_state) {
- case OUTPUT_STATE_STOPPED:
- return pulse_stop ();
- case OUTPUT_STATE_PLAYING:
- return pulse_play ();
- case OUTPUT_STATE_PAUSED:
- if (0 != pulse_play ()) {
- return -1;
- }
- if (0 != pulse_pause ()) {
- return -1;
- }
- break;
- }
 return 0;
 }
 
@@ -217,63 +221,80 @@
 {
 trace("pulse_free\n");
 
- if (pulse_tid)
- {
- pulse_terminate = 1;
- deadbeef->thread_join(pulse_tid);
+ state = DDB_PLAYBACK_STATE_STOPPED;
+ deadbeef->mutex_lock(mutex);
+
+ if (!pulse_tid || pulse_terminate == 1) {
+ deadbeef->mutex_unlock(mutex);
+ return 0;
 }
 
- pulse_tid = 0;
- state = OUTPUT_STATE_STOPPED;
- if (s)
- {
- pa_simple_free(s);
- s = NULL;
+ if (in_callback) {
+ pulse_terminate = 1;
+ deadbeef->mutex_unlock(mutex);
+ return 0;
 }
 
+ pulse_terminate = 1;
+ deadbeef->mutex_unlock(mutex);
+
+ deadbeef->thread_join(pulse_tid);
+ pulse_terminate = 0;
+
 return 0;
 }
 
 static int pulse_play(void)
 {
+ trace ("pulse_play\n");
+ deadbeef->mutex_lock (mutex);
 if (!pulse_tid)
 {
 if (pulse_init () < 0)
 {
+ deadbeef->mutex_unlock (mutex);
 return -1;
 }
 }
 
- state = OUTPUT_STATE_PLAYING;
+ pa_simple_flush (s, NULL);
+ state = DDB_PLAYBACK_STATE_PLAYING;
+ deadbeef->mutex_unlock (mutex);
+
 return 0;
 }
 
 static int pulse_stop(void)
 {
- state = OUTPUT_STATE_STOPPED;
- deadbeef->streamer_reset(1);
+ trace ("pulse_stop\n");
+ pulse_free();
 return 0;
 }
 
 static int pulse_pause(void)
 {
- if (state == OUTPUT_STATE_STOPPED)
- {
- return -1;
- }
-
- state = OUTPUT_STATE_PAUSED;
-
+ trace ("pulse_pause\n");
+ pulse_free();
+ state = DDB_PLAYBACK_STATE_PAUSED;
 return 0;
 }
 
 static int pulse_unpause(void)
 {
- if (state == OUTPUT_STATE_PAUSED)
+ trace ("pulse_unpause\n");
+ deadbeef->mutex_lock (mutex);
+ if (state == DDB_PLAYBACK_STATE_PAUSED)
 {
- state = OUTPUT_STATE_PLAYING;
+ if (pulse_init () < 0)
+ {
+ deadbeef->mutex_unlock (mutex);
+ return -1;
+ }
+ state = DDB_PLAYBACK_STATE_PLAYING;
 }
 
+ deadbeef->mutex_unlock (mutex);
+
 return 0;
 }
 
@@ -283,49 +304,76 @@
 prctl(PR_SET_NAME, "deadbeef-pulse", 0, 0, 0, 0);
 #endif
 
+ trace ("pulse thread started \n");
 while (!pulse_terminate)
 {
- if (state != OUTPUT_STATE_PLAYING || !deadbeef->streamer_ok_to_read (-1))
+ if (state != DDB_PLAYBACK_STATE_PLAYING || !deadbeef->streamer_ok_to_read (-1))
 {
 usleep(10000);
 continue;
 }
 
+ // setformat
+ deadbeef->mutex_lock (mutex);
+ int res = 0;
+ if (_setformat_requested) {
+ res = _setformat_apply ();
+ }
+ if (res != 0) {
+ deadbeef->thread_detach (pulse_tid);
+ pulse_terminate = 1;
+ deadbeef->mutex_unlock(mutex);
+ break;
+ }
+ deadbeef->mutex_unlock(mutex);
+
 int sample_size = plugin.fmt.channels * (plugin.fmt.bps / 8);
- int bs = buffer_size;
- int mod = bs % sample_size;
- if (mod > 0) {
- bs -= mod;
+ char bufbuffer_size;
+
+ in_callback = 1;
+ int bytesread = deadbeef->streamer_read(buf, buffer_size);
+ in_callback = 0;
+ if (pulse_terminate) {
+ break;
+ }
+ if (bytesread < 0) {
+ bytesread = 0;
 }
 
- char bufbs;
- pulse_callback (buf, sizeof (buf));
 int error;
 
- deadbeef->mutex_lock(mutex);
- int res = pa_simple_write(s, buf, sizeof (buf), &error);
- deadbeef->mutex_unlock(mutex);
+ res = 0;
+ if (bytesread > 0) {
+ deadbeef->mutex_lock (mutex);
+ res = pa_simple_write(s, buf, bytesread, &error);
+ deadbeef->mutex_unlock(mutex);
+ }
+
+ if (pulse_terminate) {
+ break;
+ }
 
 if (res < 0)
 {
- fprintf(stderr, "pulse: failed to write buffer\n");
- pulse_tid = 0;
- pulse_free ();
- break;
+ usleep(10000);
 }
 }
-}
 
-static void pulse_callback(char *stream, int len)
-{
- int bytesread = deadbeef->streamer_read(stream, len);
- if (bytesread < len)
+ deadbeef->mutex_lock (mutex);
+ state = DDB_PLAYBACK_STATE_STOPPED;
+ if (s)
 {
- memset (stream + bytesread, 0, len-bytesread);
+ pa_simple_drain (s, NULL);
+ pa_simple_free(s);
+ s = NULL;
 }
+ pulse_terminate = 0;
+ pulse_tid = 0;
+ deadbeef->mutex_unlock (mutex);
+ trace ("pulse_thread finished\n");
 }
 
-static int pulse_get_state(void)
+static ddb_playback_state_t pulse_get_state(void)
 {
 return state;
 }
@@ -350,24 +398,27 @@
 return DB_PLUGIN (&plugin);
 }
 
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+
 static const char settings_dlg =
- "property \"PulseAudio server\" entry " CONFSTR_PULSE_SERVERADDR " default;\n"
- "property \"Preferred buffer size\" entry " CONFSTR_PULSE_BUFFERSIZE " 8192;\n";
+ "property \"PulseAudio server (leave empty for default)\" entry " CONFSTR_PULSE_SERVERADDR " \"\";\n"
+ "property \"Preferred buffer size\" entry " CONFSTR_PULSE_BUFFERSIZE " " STR(PULSE_DEFAULT_BUFFERSIZE) ";\n";
 
 static DB_output_t plugin =
 {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 0,
 .plugin.version_minor = 1,
 .plugin.type = DB_PLUGIN_OUTPUT,
+// .plugin.flags = DDB_PLUGIN_FLAG_LOGGING,
 .plugin.id = "pulseaudio",
 .plugin.name = "PulseAudio output plugin",
 .plugin.descr = "At the moment of this writing, PulseAudio seems to be very unstable in many (or most) GNU/Linux distributions.\nIf you experience problems - please try switching to ALSA or OSS output.\nIf that doesn't help - please uninstall PulseAudio from your system, and try ALSA or OSS again.\nThanks for understanding",
 .plugin.copyright =
 "PulseAudio output plugin for DeaDBeeF Player\n"
 "Copyright (C) 2011 Jan D. Behrens <zykure@web.de>\n"
- "Copyright (C) 2010-2012 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2010-2012 Oleksiy Yakovenko <waker@users.sourceforge.net>\n"
 "Copyright (C) 2010 Anton Novikov <tonn.post@gmail.com>\n"
 "\n"
 "This program is free software; you can redistribute it and/or\n"

deadbeef-1.9.6.tar.bz2/plugins/rg_scanner Added

deadbeef-1.9.6.tar.bz2/plugins/rg_scanner/COPYING Added

@@ -0,0 +1,26 @@
+ReplayGain Scanner plugin for DeaDBeeF Player
+
+Copyright (c) 2016 Oleksiy Yakovenko
+
+Based on ddb_misc_replaygain_scan (c) 2015 Ivan Pilipenko
+
+libEBUR128
+Copyright (c) 2011 Jan Kokemüller
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

deadbeef-1.9.6.tar.bz2/plugins/rg_scanner/Makefile.am Added

deadbeef-1.9.6.tar.bz2/plugins/rg_scanner/Makefile.in Added

@@ -0,0 +1,798 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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@
+@HAVE_RGSCANNER_TRUE@@HAVE_SSE2_TRUE@am__append_1 = -msse2 -mfpmath=sse
+subdir = plugins/rg_scanner
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+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, filesdir }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+@HAVE_RGSCANNER_TRUE@rg_scanner_la_DEPENDENCIES = \
+@HAVE_RGSCANNER_TRUE@	$(am__DEPENDENCIES_1)
+am__rg_scanner_la_SOURCES_DIST = rg_scanner.c rg_scanner.h \
+	ebur128/ebur128.c ebur128/ebur128.h
+am__dirstamp = $(am__leading_dot)dirstamp
+@HAVE_RGSCANNER_TRUE@am_rg_scanner_la_OBJECTS = \
+@HAVE_RGSCANNER_TRUE@	rg_scanner_la-rg_scanner.lo \
+@HAVE_RGSCANNER_TRUE@	ebur128/rg_scanner_la-ebur128.lo
+rg_scanner_la_OBJECTS = $(am_rg_scanner_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+rg_scanner_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(rg_scanner_la_CFLAGS) \
+	$(CFLAGS) $(rg_scanner_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_RGSCANNER_TRUE@am_rg_scanner_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(rg_scanner_la_SOURCES)
+DIST_SOURCES = $(am__rg_scanner_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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_RGSCANNER_TRUE@pkglib_LTLIBRARIES = rg_scanner.la
+@HAVE_RGSCANNER_TRUE@rg_scanner_la_SOURCES = rg_scanner.c rg_scanner.h ebur128/ebur128.c ebur128/ebur128.h
+@HAVE_RGSCANNER_TRUE@rg_scanner_la_LDFLAGS = -module -avoid-version
+@HAVE_RGSCANNER_TRUE@rg_scanner_la_LIBADD = $(LDADD) $(DISPATCH_LIBS)
+@HAVE_RGSCANNER_TRUE@rg_scanner_la_CFLAGS = -std=c99 \
+@HAVE_RGSCANNER_TRUE@	$(DISPATCH_CFLAGS) -I@top_srcdir@/include \
+@HAVE_RGSCANNER_TRUE@	$(am__append_1)
+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 --ignore-deps plugins/rg_scanner/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps plugins/rg_scanner/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)
+	@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 " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
+	 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)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+ebur128/$(am__dirstamp):
+	@$(MKDIR_P) ebur128
+	@: > ebur128/$(am__dirstamp)
+ebur128/rg_scanner_la-ebur128.lo: ebur128/$(am__dirstamp)
+
+rg_scanner.la: $(rg_scanner_la_OBJECTS) $(rg_scanner_la_DEPENDENCIES) $(EXTRA_rg_scanner_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(rg_scanner_la_LINK) $(am_rg_scanner_la_rpath) $(rg_scanner_la_OBJECTS) $(rg_scanner_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f ebur128/*.$(OBJEXT)
+	-rm -f ebur128/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+rg_scanner_la-rg_scanner.lo: rg_scanner.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rg_scanner_la_CFLAGS) $(CFLAGS) -c -o rg_scanner_la-rg_scanner.lo `test -f 'rg_scanner.c' || echo '$(srcdir)/'`rg_scanner.c
+
+ebur128/rg_scanner_la-ebur128.lo: ebur128/ebur128.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rg_scanner_la_CFLAGS) $(CFLAGS) -c -o ebur128/rg_scanner_la-ebur128.lo `test -f 'ebur128/ebur128.c' || echo '$(srcdir)/'`ebur128/ebur128.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf ebur128/.libs ebur128/_libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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)
+	-rm -f ebur128/$(am__dirstamp)
+
+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 -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 -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 TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am 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 tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/plugins/rg_scanner/ebur128 Added

deadbeef-1.9.6.tar.bz2/plugins/rg_scanner/ebur128/ebur128.c Added

@@ -0,0 +1,997 @@
+/* See COPYING file for copyright and license details. */
+
+#include "ebur128.h"
+
+#include <float.h>
+#include <limits.h>
+#include <math.h> /* You may have to define _USE_MATH_DEFINES if you use MSVC */
+#include <stdio.h>
+#include <stdlib.h>
+
+/* This can be replaced by any BSD-like queue implementation. */
+#include <sys/queue.h>
+
+#ifdef USE_SPEEX_RESAMPLER
+ #include <speex/speex_resampler.h>
+#endif
+
+#define CHECK_ERROR(condition, errorcode, goto_point) \
+ if ((condition)) { \
+ errcode = (errorcode); \
+ goto goto_point; \
+ }
+
+SLIST_HEAD(ebur128_double_queue, ebur128_dq_entry);
+struct ebur128_dq_entry {
+ double z;
+ SLIST_ENTRY(ebur128_dq_entry) entries;
+};
+
+struct ebur128_state_internal {
+ /** Filtered audio data (used as ring buffer). */
+ double* audio_data;
+ /** Size of audio_data array. */
+ size_t audio_data_frames;
+ /** Current index for audio_data. */
+ size_t audio_data_index;
+ /** How many frames are needed for a gating block. Will correspond to 400ms
+ * of audio at initialization, and 100ms after the first block (75% overlap
+ * as specified in the 2011 revision of BS1770). */
+ unsigned long needed_frames;
+ /** The channel map. Has as many elements as there are channels. */
+ int* channel_map;
+ /** How many samples fit in 100ms (rounded). */
+ unsigned long samples_in_100ms;
+ /** BS.1770 filter coefficients (nominator). */
+ double b5;
+ /** BS.1770 filter coefficients (denominator). */
+ double a5;
+ /** BS.1770 filter state. */
+ double v55;
+ /** Linked list of block energies. */
+ struct ebur128_double_queue block_list;
+ /** Linked list of 3s-block energies, used to calculate LRA. */
+ struct ebur128_double_queue short_term_block_list;
+ int use_histogram;
+ unsigned long *block_energy_histogram;
+ unsigned long *short_term_block_energy_histogram;
+ /** Keeps track of when a new short term block is needed. */
+ size_t short_term_frame_counter;
+ /** Maximum sample peak, one per channel */
+ double* sample_peak;
+ /** Maximum true peak, one per channel */
+ double* true_peak;
+#ifdef USE_SPEEX_RESAMPLER
+ SpeexResamplerState* resampler;
+#endif
+ size_t oversample_factor;
+ float* resampler_buffer_input;
+ size_t resampler_buffer_input_frames;
+ float* resampler_buffer_output;
+ size_t resampler_buffer_output_frames;
+};
+
+static double relative_gate = -10.0;
+
+/* Those will be calculated when initializing the library */
+static double relative_gate_factor;
+static double minus_twenty_decibels;
+static double histogram_energies1000;
+static double histogram_energy_boundaries1001;
+
+static void ebur128_init_filter(ebur128_state* st) {
+ int i, j;
+
+ double f0 = 1681.974450955533;
+ double G = 3.999843853973347;
+ double Q = 0.7071752369554196;
+
+ double K = tan(M_PI * f0 / (double) st->samplerate);
+ double Vh = pow(10.0, G / 20.0);
+ double Vb = pow(Vh, 0.4996667741545416);
+
+ double pb3 = {0.0, 0.0, 0.0};
+ double pa3 = {1.0, 0.0, 0.0};
+ double rb3 = {1.0, -2.0, 1.0};
+ double ra3 = {1.0, 0.0, 0.0};
+
+ double a0 = 1.0 + K / Q + K * K ;
+ pb0 = (Vh + Vb * K / Q + K * K) / a0;
+ pb1 = 2.0 * (K * K - Vh) / a0;
+ pb2 = (Vh - Vb * K / Q + K * K) / a0;
+ pa1 = 2.0 * (K * K - 1.0) / a0;
+ pa2 = (1.0 - K / Q + K * K) / a0;
+
+ /* fprintf(stderr, "%.14f %.14f %.14f %.14f %.14f\n",
+ b10, b11, b12, a11, a12); */
+
+ f0 = 38.13547087602444;
+ Q = 0.5003270373238773;
+ K = tan(M_PI * f0 / (double) st->samplerate);
+
+ ra1 = 2.0 * (K * K - 1.0) / (1.0 + K / Q + K * K);
+ ra2 = (1.0 - K / Q + K * K) / (1.0 + K / Q + K * K);
+
+ /* fprintf(stderr, "%.14f %.14f\n", a21, a22); */
+
+ st->d->b0 = pb0 * rb0;
+ st->d->b1 = pb0 * rb1 + pb1 * rb0;
+ st->d->b2 = pb0 * rb2 + pb1 * rb1 + pb2 * rb0;
+ st->d->b3 = pb1 * rb2 + pb2 * rb1;
+ st->d->b4 = pb2 * rb2;
+
+ st->d->a0 = pa0 * ra0;
+ st->d->a1 = pa0 * ra1 + pa1 * ra0;
+ st->d->a2 = pa0 * ra2 + pa1 * ra1 + pa2 * ra0;
+ st->d->a3 = pa1 * ra2 + pa2 * ra1;
+ st->d->a4 = pa2 * ra2;
+
+ for (i = 0; i < 5; ++i) {
+ for (j = 0; j < 5; ++j) {
+ st->d->vij = 0.0;
+ }
+ }
+}
+
+static int ebur128_init_channel_map(ebur128_state* st) {
+ size_t i;
+ st->d->channel_map = (int*) malloc(st->channels * sizeof(int));
+ if (!st->d->channel_map) return EBUR128_ERROR_NOMEM;
+ if (st->channels == 4) {
+ st->d->channel_map0 = EBUR128_LEFT;
+ st->d->channel_map1 = EBUR128_RIGHT;
+ st->d->channel_map2 = EBUR128_LEFT_SURROUND;
+ st->d->channel_map3 = EBUR128_RIGHT_SURROUND;
+ } else if (st->channels == 5) {
+ st->d->channel_map0 = EBUR128_LEFT;
+ st->d->channel_map1 = EBUR128_RIGHT;
+ st->d->channel_map2 = EBUR128_CENTER;
+ st->d->channel_map3 = EBUR128_LEFT_SURROUND;
+ st->d->channel_map4 = EBUR128_RIGHT_SURROUND;
+ } else {
+ for (i = 0; i < st->channels; ++i) {
+ switch (i) {
+ case 0: st->d->channel_mapi = EBUR128_LEFT; break;
+ case 1: st->d->channel_mapi = EBUR128_RIGHT; break;
+ case 2: st->d->channel_mapi = EBUR128_CENTER; break;
+ case 3: st->d->channel_mapi = EBUR128_UNUSED; break;
+ case 4: st->d->channel_mapi = EBUR128_LEFT_SURROUND; break;
+ case 5: st->d->channel_mapi = EBUR128_RIGHT_SURROUND; break;
+ default: st->d->channel_mapi = EBUR128_UNUSED; break;
+ }
+ }
+ }
+ return EBUR128_SUCCESS;
+}
+
+#ifdef USE_SPEEX_RESAMPLER
+static int ebur128_init_resampler(ebur128_state* st) {
+ int errcode = EBUR128_SUCCESS;
+
+ if (st->samplerate < 96000) {
+ st->d->oversample_factor = 4;
+ } else if (st->samplerate < 192000) {
+ st->d->oversample_factor = 2;
+ } else {
+ st->d->oversample_factor = 1;
+ st->d->resampler_buffer_input = NULL;
+ st->d->resampler_buffer_output = NULL;
+ st->d->resampler = NULL;
+ }
+
+ st->d->resampler_buffer_input_frames = st->d->samples_in_100ms * 4;
+ st->d->resampler_buffer_input = malloc(st->d->resampler_buffer_input_frames *
+ st->channels *
+ sizeof(float));
+ CHECK_ERROR(!st->d->resampler_buffer_input, EBUR128_ERROR_NOMEM, exit)
+
+ st->d->resampler_buffer_output_frames =
+ st->d->resampler_buffer_input_frames *
+ st->d->oversample_factor;
+ st->d->resampler_buffer_output = malloc
+ (st->d->resampler_buffer_output_frames *
+ st->channels *
+ sizeof(float));
+ CHECK_ERROR(!st->d->resampler_buffer_output, EBUR128_ERROR_NOMEM, free_input)
+
+ st->d->resampler = speex_resampler_init
+ ((spx_uint32_t) st->channels,
+ (spx_uint32_t) st->samplerate,
+ (spx_uint32_t) (st->samplerate * st->d->oversample_factor),
+ 8, NULL);
+ CHECK_ERROR(!st->d->resampler, EBUR128_ERROR_NOMEM, free_output)
+
+ return errcode;
+
+free_output:
+ free(st->d->resampler_buffer_output);
+ st->d->resampler_buffer_output = NULL;
+free_input:
+ free(st->d->resampler_buffer_input);
+ st->d->resampler_buffer_input = NULL;
+exit:
+ return errcode;
+}
+
+static void ebur128_destroy_resampler(ebur128_state* st) {
+ free(st->d->resampler_buffer_input);
+ st->d->resampler_buffer_input = NULL;
+ free(st->d->resampler_buffer_output);
+ st->d->resampler_buffer_output = NULL;
+ speex_resampler_destroy(st->d->resampler);
+ st->d->resampler = NULL;
+}
+#endif
+
+void ebur128_get_version(int* major, int* minor, int* patch) {
+ *major = EBUR128_VERSION_MAJOR;
+ *minor = EBUR128_VERSION_MINOR;
+ *patch = EBUR128_VERSION_PATCH;
+}
+
+ebur128_state* ebur128_init(unsigned int channels,
+ unsigned long samplerate,
+ int mode) {
+ int errcode, result;
+ ebur128_state* st;
+ unsigned int i;
+
+ st = (ebur128_state*) malloc(sizeof(ebur128_state));
+ CHECK_ERROR(!st, 0, exit)
+ st->d = (struct ebur128_state_internal*)
+ malloc(sizeof(struct ebur128_state_internal));
+ CHECK_ERROR(!st->d, 0, free_state)
+ st->channels = channels;
+ errcode = ebur128_init_channel_map(st);
+ CHECK_ERROR(errcode, 0, free_internal)
+
+ st->d->sample_peak = (double*) malloc(channels * sizeof(double));
+ CHECK_ERROR(!st->d->sample_peak, 0, free_channel_map)
+ st->d->true_peak = (double*) malloc(channels * sizeof(double));
+ CHECK_ERROR(!st->d->true_peak, 0, free_sample_peak)
+ for (i = 0; i < channels; ++i) {
+ st->d->sample_peaki = 0.0;
+ st->d->true_peaki = 0.0;
+ }
+
+ st->d->use_histogram = mode & EBUR128_MODE_HISTOGRAM ? 1 : 0;
+
+ st->samplerate = samplerate;
+ st->d->samples_in_100ms = (st->samplerate + 5) / 10;
+ st->mode = mode;
+ if ((mode & EBUR128_MODE_S) == EBUR128_MODE_S) {
+ st->d->audio_data_frames = st->d->samples_in_100ms * 30;
+ } else if ((mode & EBUR128_MODE_M) == EBUR128_MODE_M) {
+ st->d->audio_data_frames = st->d->samples_in_100ms * 4;
+ } else {
+ goto free_true_peak;
+ }
+ st->d->audio_data = (double*) malloc(st->d->audio_data_frames *
+ st->channels *
+ sizeof(double));
+ CHECK_ERROR(!st->d->audio_data, 0, free_true_peak)
+ ebur128_init_filter(st);
+
+ if (st->d->use_histogram) {
+ st->d->block_energy_histogram = malloc(1000 * sizeof(unsigned long));
+ CHECK_ERROR(!st->d->block_energy_histogram, 0, free_audio_data)
+ for (i = 0; i < 1000; ++i) {
+ st->d->block_energy_histogrami = 0;
+ }
+ } else {
+ st->d->block_energy_histogram = NULL;
+ }
+ if (st->d->use_histogram) {
+ st->d->short_term_block_energy_histogram = malloc(1000 * sizeof(unsigned long));
+ CHECK_ERROR(!st->d->short_term_block_energy_histogram, 0, free_block_energy_histogram)
+ for (i = 0; i < 1000; ++i) {
+ st->d->short_term_block_energy_histogrami = 0;
+ }
+ } else {
+ st->d->short_term_block_energy_histogram = NULL;
+ }
+ SLIST_INIT(&st->d->block_list);
+ SLIST_INIT(&st->d->short_term_block_list);
+ st->d->short_term_frame_counter = 0;
+
+#ifdef USE_SPEEX_RESAMPLER
+ result = ebur128_init_resampler(st);
+ CHECK_ERROR(result, 0, free_short_term_block_energy_histogram)
+#endif
+
+ /* the first block needs 400ms of audio data */
+ st->d->needed_frames = st->d->samples_in_100ms * 4;
+ /* start at the beginning of the buffer */
+ st->d->audio_data_index = 0;
+
+ /* initialize static constants */
+ relative_gate_factor = pow(10.0, relative_gate / 10.0);
+ minus_twenty_decibels = pow(10.0, -20.0 / 10.0);
+ histogram_energy_boundaries0 = pow(10.0, (-70.0 + 0.691) / 10.0);
+ if (st->d->use_histogram) {
+ for (i = 0; i < 1000; ++i) {
+ histogram_energiesi = pow(10.0, ((double) i / 10.0 - 69.95 + 0.691) / 10.0);
+ }
+ for (i = 1; i < 1001; ++i) {
+ histogram_energy_boundariesi = pow(10.0, ((double) i / 10.0 - 70.0 + 0.691) / 10.0);
+ }
+ }
+
+ return st;
+
+free_short_term_block_energy_histogram:
+ free(st->d->short_term_block_energy_histogram);
+free_block_energy_histogram:
+ free(st->d->block_energy_histogram);
+free_audio_data:
+ free(st->d->audio_data);
+free_true_peak:
+ free(st->d->true_peak);
+free_sample_peak:
+ free(st->d->sample_peak);
+free_channel_map:
+ free(st->d->channel_map);
+free_internal:
+ free(st->d);
+free_state:
+ free(st);
+exit:
+ return NULL;
+}
+
+void ebur128_destroy(ebur128_state** st) {
+ struct ebur128_dq_entry* entry;
+ free((*st)->d->block_energy_histogram);
+ free((*st)->d->short_term_block_energy_histogram);
+ free((*st)->d->audio_data);
+ free((*st)->d->channel_map);
+ free((*st)->d->sample_peak);
+ free((*st)->d->true_peak);
+ while (!SLIST_EMPTY(&(*st)->d->block_list)) {
+ entry = SLIST_FIRST(&(*st)->d->block_list);
+ SLIST_REMOVE_HEAD(&(*st)->d->block_list, entries);
+ free(entry);
+ }
+ while (!SLIST_EMPTY(&(*st)->d->short_term_block_list)) {
+ entry = SLIST_FIRST(&(*st)->d->short_term_block_list);
+ SLIST_REMOVE_HEAD(&(*st)->d->short_term_block_list, entries);
+ free(entry);
+ }
+#ifdef USE_SPEEX_RESAMPLER
+ ebur128_destroy_resampler(*st);
+#endif
+
+ free((*st)->d);
+ free(*st);
+ *st = NULL;
+}
+
+static int ebur128_use_speex_resampler(ebur128_state* st) {
+#ifdef USE_SPEEX_RESAMPLER
+ return ((st->mode & EBUR128_MODE_TRUE_PEAK) == EBUR128_MODE_TRUE_PEAK);
+#else
+ (void) st;
+ return 0;
+#endif
+}
+
+static void ebur128_check_true_peak(ebur128_state* st, size_t frames) {
+#ifdef USE_SPEEX_RESAMPLER
+ size_t c, i;
+ spx_uint32_t in_len = (spx_uint32_t) frames;
+ spx_uint32_t out_len = (spx_uint32_t) st->d->resampler_buffer_output_frames;
+ speex_resampler_process_interleaved_float(
+ st->d->resampler,
+ st->d->resampler_buffer_input, &in_len,
+ st->d->resampler_buffer_output, &out_len);
+ for (c = 0; c < st->channels; ++c) {
+ for (i = 0; i < out_len; ++i) {
+ if (st->d->resampler_buffer_outputi * st->channels + c >
+ st->d->true_peakc) {
+ st->d->true_peakc =
+ st->d->resampler_buffer_outputi * st->channels + c;
+ } else if (-st->d->resampler_buffer_outputi * st->channels + c >
+ st->d->true_peakc) {
+ st->d->true_peakc =
+ -st->d->resampler_buffer_outputi * st->channels + c;
+ }
+ }
+ }
+#else
+ (void) st; (void) frames;
+#endif
+}
+
+#ifdef __SSE2_MATH__
+#include <xmmintrin.h>
+#define TURN_ON_FTZ \
+ unsigned int mxcsr = _mm_getcsr(); \
+ _mm_setcsr(mxcsr | _MM_FLUSH_ZERO_ON);
+#define TURN_OFF_FTZ _mm_setcsr(mxcsr);
+#define FLUSH_MANUALLY
+#else
+#warning "manual FTZ is being used, please enable SSE2 (-msse2 -mfpmath=sse)"
+#define TURN_ON_FTZ
+#define TURN_OFF_FTZ
+#define FLUSH_MANUALLY \
+ st->d->vci4 = fabs(st->d->vci4) < DBL_MIN ? 0.0 : st->d->vci4; \
+ st->d->vci3 = fabs(st->d->vci3) < DBL_MIN ? 0.0 : st->d->vci3; \
+ st->d->vci2 = fabs(st->d->vci2) < DBL_MIN ? 0.0 : st->d->vci2; \
+ st->d->vci1 = fabs(st->d->vci1) < DBL_MIN ? 0.0 : st->d->vci1;
+#endif
+
+#define EBUR128_FILTER(type, min_scale, max_scale) \
+static void ebur128_filter_##type(ebur128_state* st, const type* src, \
+ size_t frames) { \
+ static double scaling_factor = -((double) min_scale) > (double) max_scale ? \
+ -((double) min_scale) : (double) max_scale; \
+ double* audio_data = st->d->audio_data + st->d->audio_data_index; \
+ size_t i, c; \
+ \
+ TURN_ON_FTZ \
+ \
+ if ((st->mode & EBUR128_MODE_SAMPLE_PEAK) == EBUR128_MODE_SAMPLE_PEAK) { \
+ for (c = 0; c < st->channels; ++c) { \
+ double max = 0.0; \
+ for (i = 0; i < frames; ++i) { \
+ if (srci * st->channels + c > max) { \
+ max = srci * st->channels + c; \
+ } else if (-srci * st->channels + c > max) { \
+ max = -1.0 * srci * st->channels + c; \
+ } \
+ } \
+ max /= scaling_factor; \
+ if (max > st->d->sample_peakc) st->d->sample_peakc = max; \
+ } \
+ } \
+ if (ebur128_use_speex_resampler(st)) { \
+ for (c = 0; c < st->channels; ++c) { \
+ for (i = 0; i < frames; ++i) { \
+ st->d->resampler_buffer_inputi * st->channels + c = \
+ (float) (srci * st->channels + c / scaling_factor); \
+ } \
+ } \
+ ebur128_check_true_peak(st, frames); \
+ } \
+ for (c = 0; c < st->channels; ++c) { \
+ int ci = st->d->channel_mapc - 1; \
+ if (ci < 0) continue; \
+ else if (ci > 4) ci = 0; /* dual mono */ \
+ for (i = 0; i < frames; ++i) { \
+ st->d->vci0 = (double) (srci * st->channels + c / scaling_factor) \
+ - st->d->a1 * st->d->vci1 \
+ - st->d->a2 * st->d->vci2 \
+ - st->d->a3 * st->d->vci3 \
+ - st->d->a4 * st->d->vci4; \
+ audio_datai * st->channels + c = \
+ st->d->b0 * st->d->vci0 \
+ + st->d->b1 * st->d->vci1 \
+ + st->d->b2 * st->d->vci2 \
+ + st->d->b3 * st->d->vci3 \
+ + st->d->b4 * st->d->vci4; \
+ st->d->vci4 = st->d->vci3; \
+ st->d->vci3 = st->d->vci2; \
+ st->d->vci2 = st->d->vci1; \
+ st->d->vci1 = st->d->vci0; \
+ } \
+ FLUSH_MANUALLY \
+ } \
+ TURN_OFF_FTZ \
+}
+EBUR128_FILTER(short, SHRT_MIN, SHRT_MAX)
+EBUR128_FILTER(int, INT_MIN, INT_MAX)
+EBUR128_FILTER(float, -1.0f, 1.0f)
+EBUR128_FILTER(double, -1.0, 1.0)
+
+static double ebur128_energy_to_loudness(double energy) {
+ return 10 * (log(energy) / log(10.0)) - 0.691;
+}
+
+static size_t find_histogram_index(double energy) {
+ size_t index_min = 0;
+ size_t index_max = 1000;
+ size_t index_mid;
+
+ do {
+ index_mid = (index_min + index_max) / 2;
+ if (energy >= histogram_energy_boundariesindex_mid) {
+ index_min = index_mid;
+ } else {
+ index_max = index_mid;
+ }
+ } while (index_max - index_min != 1);
+
+ return index_min;
+}
+
+static int ebur128_calc_gating_block(ebur128_state* st, size_t frames_per_block,
+ double* optional_output) {
+ size_t i, c;
+ double sum = 0.0;
+ double channel_sum;
+ for (c = 0; c < st->channels; ++c) {
+ if (st->d->channel_mapc == EBUR128_UNUSED) continue;
+ channel_sum = 0.0;
+ if (st->d->audio_data_index < frames_per_block * st->channels) {
+ for (i = 0; i < st->d->audio_data_index / st->channels; ++i) {
+ channel_sum += st->d->audio_datai * st->channels + c *
+ st->d->audio_datai * st->channels + c;
+ }
+ for (i = st->d->audio_data_frames -
+ (frames_per_block -
+ st->d->audio_data_index / st->channels);
+ i < st->d->audio_data_frames; ++i) {
+ channel_sum += st->d->audio_datai * st->channels + c *
+ st->d->audio_datai * st->channels + c;
+ }
+ } else {
+ for (i = st->d->audio_data_index / st->channels - frames_per_block;
+ i < st->d->audio_data_index / st->channels;
+ ++i) {
+ channel_sum += st->d->audio_datai * st->channels + c *
+ st->d->audio_datai * st->channels + c;
+ }
+ }
+ if (st->d->channel_mapc == EBUR128_LEFT_SURROUND ||
+ st->d->channel_mapc == EBUR128_RIGHT_SURROUND) {
+ channel_sum *= 1.41;
+ } else if (st->d->channel_mapc == EBUR128_DUAL_MONO) {
+ channel_sum *= 2.0;
+ }
+ sum += channel_sum;
+ }
+ sum /= (double) frames_per_block;
+ if (optional_output) {
+ *optional_output = sum;
+ return EBUR128_SUCCESS;
+ } else if (sum >= histogram_energy_boundaries0) {
+ if (st->d->use_histogram) {
+ ++st->d->block_energy_histogramfind_histogram_index(sum);
+ } else {
+ struct ebur128_dq_entry* block;
+ block = (struct ebur128_dq_entry*) malloc(sizeof(struct ebur128_dq_entry));
+ if (!block) return EBUR128_ERROR_NOMEM;
+ block->z = sum;
+ SLIST_INSERT_HEAD(&st->d->block_list, block, entries);
+ }
+ return EBUR128_SUCCESS;
+ } else {
+ return EBUR128_SUCCESS;
+ }
+}
+
+int ebur128_set_channel(ebur128_state* st,
+ unsigned int channel_number,
+ int value) {
+ if (channel_number >= st->channels) {
+ return 1;
+ }
+ if (value == EBUR128_DUAL_MONO &&
+ (st->channels != 1 || channel_number != 0)) {
+ fprintf(stderr, "EBUR128_DUAL_MONO only works with mono files!\n");
+ return 1;
+ }
+ st->d->channel_mapchannel_number = value;
+ return 0;
+}
+
+int ebur128_change_parameters(ebur128_state* st,
+ unsigned int channels,
+ unsigned long samplerate) {
+ int errcode;
+ if (channels == st->channels &&
+ samplerate == st->samplerate) {
+ return 2;
+ }
+ free(st->d->audio_data);
+ st->d->audio_data = NULL;
+
+ if (channels != st->channels) {
+ unsigned int i;
+
+ free(st->d->channel_map); st->d->channel_map = NULL;
+ free(st->d->sample_peak); st->d->sample_peak = NULL;
+ free(st->d->true_peak); st->d->true_peak = NULL;
+ st->channels = channels;
+
+#ifdef USE_SPEEX_RESAMPLER
+ ebur128_destroy_resampler(st);
+ ebur128_init_resampler(st);
+#endif
+
+ errcode = ebur128_init_channel_map(st);
+ CHECK_ERROR(errcode, EBUR128_ERROR_NOMEM, exit)
+
+ st->d->sample_peak = (double*) malloc(channels * sizeof(double));
+ CHECK_ERROR(!st->d->sample_peak, EBUR128_ERROR_NOMEM, exit)
+ st->d->true_peak = (double*) malloc(channels * sizeof(double));
+ CHECK_ERROR(!st->d->true_peak, EBUR128_ERROR_NOMEM, exit)
+ for (i = 0; i < channels; ++i) {
+ st->d->sample_peaki = 0.0;
+ st->d->true_peaki = 0.0;
+ }
+ }
+ if (samplerate != st->samplerate) {
+ st->samplerate = samplerate;
+ ebur128_init_filter(st);
+ }
+ if ((st->mode & EBUR128_MODE_S) == EBUR128_MODE_S) {
+ st->d->audio_data_frames = st->d->samples_in_100ms * 30;
+ } else if ((st->mode & EBUR128_MODE_M) == EBUR128_MODE_M) {
+ st->d->audio_data_frames = st->d->samples_in_100ms * 4;
+ } else {
+ return 1;
+ }
+ st->d->audio_data = (double*) malloc(st->d->audio_data_frames *
+ st->channels *
+ sizeof(double));
+ CHECK_ERROR(!st->d->audio_data, EBUR128_ERROR_NOMEM, exit)
+
+ /* the first block needs 400ms of audio data */
+ st->d->needed_frames = st->d->samples_in_100ms * 4;
+ /* start at the beginning of the buffer */
+ st->d->audio_data_index = 0;
+ /* reset short term frame counter */
+ st->d->short_term_frame_counter = 0;
+
+ return 0;
+
+exit:
+ return 1;
+}
+
+
+static int ebur128_energy_shortterm(ebur128_state* st, double* out);
+#define EBUR128_ADD_FRAMES(type) \
+int ebur128_add_frames_##type(ebur128_state* st, \
+ const type* src, size_t frames) { \
+ size_t src_index = 0; \
+ while (frames > 0) { \
+ if (frames >= st->d->needed_frames) { \
+ ebur128_filter_##type(st, src + src_index, st->d->needed_frames); \
+ src_index += st->d->needed_frames * st->channels; \
+ frames -= st->d->needed_frames; \
+ st->d->audio_data_index += st->d->needed_frames * st->channels; \
+ /* calculate the new gating block */ \
+ if ((st->mode & EBUR128_MODE_I) == EBUR128_MODE_I) { \
+ if (ebur128_calc_gating_block(st, st->d->samples_in_100ms * 4, NULL)) {\
+ return EBUR128_ERROR_NOMEM; \
+ } \
+ } \
+ if ((st->mode & EBUR128_MODE_LRA) == EBUR128_MODE_LRA) { \
+ st->d->short_term_frame_counter += st->d->needed_frames; \
+ if (st->d->short_term_frame_counter == st->d->samples_in_100ms * 30) { \
+ struct ebur128_dq_entry* block; \
+ double st_energy; \
+ ebur128_energy_shortterm(st, &st_energy); \
+ if (st_energy >= histogram_energy_boundaries0) { \
+ if (st->d->use_histogram) { \
+ ++st->d->short_term_block_energy_histogram \
+ find_histogram_index(st_energy);\
+ } else { \
+ block = (struct ebur128_dq_entry*) \
+ malloc(sizeof(struct ebur128_dq_entry)); \
+ if (!block) return EBUR128_ERROR_NOMEM; \
+ block->z = st_energy; \
+ SLIST_INSERT_HEAD(&st->d->short_term_block_list, block, entries);\
+ } \
+ } \
+ st->d->short_term_frame_counter = st->d->samples_in_100ms * 20; \
+ } \
+ } \
+ /* 100ms are needed for all blocks besides the first one */ \
+ st->d->needed_frames = st->d->samples_in_100ms; \
+ /* reset audio_data_index when buffer full */ \
+ if (st->d->audio_data_index == st->d->audio_data_frames * st->channels) {\
+ st->d->audio_data_index = 0; \
+ } \
+ } else { \
+ ebur128_filter_##type(st, src + src_index, frames); \
+ st->d->audio_data_index += frames * st->channels; \
+ if ((st->mode & EBUR128_MODE_LRA) == EBUR128_MODE_LRA) { \
+ st->d->short_term_frame_counter += frames; \
+ } \
+ st->d->needed_frames -= frames; \
+ frames = 0; \
+ } \
+ } \
+ return EBUR128_SUCCESS; \
+}
+EBUR128_ADD_FRAMES(short)
+EBUR128_ADD_FRAMES(int)
+EBUR128_ADD_FRAMES(float)
+EBUR128_ADD_FRAMES(double)
+
+static int ebur128_gated_loudness(ebur128_state** sts, size_t size,
+ double* out) {
+ struct ebur128_dq_entry* it;
+ double relative_threshold = 0.0;
+ double gated_loudness = 0.0;
+ size_t above_thresh_counter = 0;
+ size_t i, j, start_index;
+
+ for (i = 0; i < size; i++) {
+ if (stsi && (stsi->mode & EBUR128_MODE_I) != EBUR128_MODE_I) {
+ return EBUR128_ERROR_INVALID_MODE;
+ }
+ }
+
+ for (i = 0; i < size; i++) {
+ if (!stsi) continue;
+ if (stsi->d->use_histogram) {
+ for (j = 0; j < 1000; ++j) {
+ relative_threshold += stsi->d->block_energy_histogramj *
+ histogram_energiesj;
+ above_thresh_counter += stsi->d->block_energy_histogramj;
+ }
+ } else {
+ SLIST_FOREACH(it, &stsi->d->block_list, entries) {
+ ++above_thresh_counter;
+ relative_threshold += it->z;
+ }
+ }
+ }
+ if (!above_thresh_counter) {
+ *out = -HUGE_VAL;
+ return EBUR128_SUCCESS;
+ }
+ relative_threshold /= (double) above_thresh_counter;
+ relative_threshold *= relative_gate_factor;
+ above_thresh_counter = 0;
+ if (relative_threshold < histogram_energy_boundaries0) {
+ start_index = 0;
+ } else {
+ start_index = find_histogram_index(relative_threshold);
+ if (relative_threshold > histogram_energiesstart_index) {
+ ++start_index;
+ }
+ }
+ for (i = 0; i < size; i++) {
+ if (!stsi) continue;
+ if (stsi->d->use_histogram) {
+ for (j = start_index; j < 1000; ++j) {
+ gated_loudness += stsi->d->block_energy_histogramj *
+ histogram_energiesj;
+ above_thresh_counter += stsi->d->block_energy_histogramj;
+ }
+ } else {
+ SLIST_FOREACH(it, &stsi->d->block_list, entries) {
+ if (it->z >= relative_threshold) {
+ ++above_thresh_counter;
+ gated_loudness += it->z;
+ }
+ }
+ }
+ }
+ if (!above_thresh_counter) {
+ *out = -HUGE_VAL;
+ return EBUR128_SUCCESS;
+ }
+ gated_loudness /= (double) above_thresh_counter;
+ *out = ebur128_energy_to_loudness(gated_loudness);
+ return EBUR128_SUCCESS;
+}
+
+int ebur128_loudness_global(ebur128_state* st, double* out) {
+ return ebur128_gated_loudness(&st, 1, out);
+}
+
+int ebur128_loudness_global_multiple(ebur128_state** sts, size_t size,
+ double* out) {
+ return ebur128_gated_loudness(sts, size, out);
+}
+
+static int ebur128_energy_in_interval(ebur128_state* st,
+ size_t interval_frames,
+ double* out) {
+ if (interval_frames > st->d->audio_data_frames) {
+ return EBUR128_ERROR_INVALID_MODE;
+ }
+ ebur128_calc_gating_block(st, interval_frames, out);
+ return EBUR128_SUCCESS;
+}
+
+static int ebur128_energy_shortterm(ebur128_state* st, double* out) {
+ return ebur128_energy_in_interval(st, st->d->samples_in_100ms * 30, out);
+}
+
+int ebur128_loudness_momentary(ebur128_state* st, double* out) {
+ double energy;
+ int error = ebur128_energy_in_interval(st, st->d->samples_in_100ms * 4,
+ &energy);
+ if (error) {
+ return error;
+ } else if (energy <= 0.0) {
+ *out = -HUGE_VAL;
+ return EBUR128_SUCCESS;
+ }
+ *out = ebur128_energy_to_loudness(energy);
+ return EBUR128_SUCCESS;
+}
+
+int ebur128_loudness_shortterm(ebur128_state* st, double* out) {
+ double energy;
+ int error = ebur128_energy_shortterm(st, &energy);
+ if (error) {
+ return error;
+ } else if (energy <= 0.0) {
+ *out = -HUGE_VAL;
+ return EBUR128_SUCCESS;
+ }
+ *out = ebur128_energy_to_loudness(energy);
+ return EBUR128_SUCCESS;
+}
+
+static int ebur128_double_cmp(const void *p1, const void *p2) {
+ const double* d1 = (const double*) p1;
+ const double* d2 = (const double*) p2;
+ return (*d1 > *d2) - (*d1 < *d2);
+}
+
+/* EBU - TECH 3342 */
+int ebur128_loudness_range_multiple(ebur128_state** sts, size_t size,
+ double* out) {
+ size_t i, j;
+ struct ebur128_dq_entry* it;
+ double* stl_vector;
+ size_t stl_size;
+ double* stl_relgated;
+ size_t stl_relgated_size;
+ double stl_power, stl_integrated;
+ /* High and low percentile energy */
+ double h_en, l_en;
+ int use_histogram = 0;
+
+ for (i = 0; i < size; ++i) {
+ if (stsi) {
+ if ((stsi->mode & EBUR128_MODE_LRA) != EBUR128_MODE_LRA) {
+ return EBUR128_ERROR_INVALID_MODE;
+ }
+ if (i == 0 && stsi->mode & EBUR128_MODE_HISTOGRAM) {
+ use_histogram = 1;
+ } else if (use_histogram != !!(stsi->mode & EBUR128_MODE_HISTOGRAM)) {
+ return EBUR128_ERROR_INVALID_MODE;
+ }
+ }
+ }
+
+ if (use_histogram) {
+ unsigned long hist1000 = { 0 };
+ size_t percentile_low, percentile_high;
+ size_t index;
+
+ stl_size = 0;
+ stl_power = 0.0;
+ for (i = 0; i < size; ++i) {
+ if (!stsi) continue;
+ for (j = 0; j < 1000; ++j) {
+ histj += stsi->d->short_term_block_energy_histogramj;
+ stl_size += stsi->d->short_term_block_energy_histogramj;
+ stl_power += stsi->d->short_term_block_energy_histogramj
+ * histogram_energiesj;
+ }
+ }
+ if (!stl_size) {
+ *out = 0.0;
+ return EBUR128_SUCCESS;
+ }
+
+ stl_power /= stl_size;
+ stl_integrated = minus_twenty_decibels * stl_power;
+
+ if (stl_integrated < histogram_energy_boundaries0) {
+ index = 0;
+ } else {
+ index = find_histogram_index(stl_integrated);
+ if (stl_integrated > histogram_energiesindex) {
+ ++index;
+ }
+ }
+ stl_size = 0;
+ for (j = index; j < 1000; ++j) {
+ stl_size += histj;
+ }
+ if (!stl_size) {
+ *out = 0.0;
+ return EBUR128_SUCCESS;
+ }
+
+ percentile_low = (size_t) ((stl_size - 1) * 0.1 + 0.5);
+ percentile_high = (size_t) ((stl_size - 1) * 0.95 + 0.5);
+
+ stl_size = 0;
+ j = index;
+ while (stl_size <= percentile_low) {
+ stl_size += histj++;
+ }
+ l_en = histogram_energiesj - 1;
+ while (stl_size <= percentile_high) {
+ stl_size += histj++;
+ }
+ h_en = histogram_energiesj - 1;
+ *out = ebur128_energy_to_loudness(h_en) - ebur128_energy_to_loudness(l_en);
+ return EBUR128_SUCCESS;
+
+ } else {
+ stl_size = 0;
+ for (i = 0; i < size; ++i) {
+ if (!stsi) continue;
+ SLIST_FOREACH(it, &stsi->d->short_term_block_list, entries) {
+ ++stl_size;
+ }
+ }
+ if (!stl_size) {
+ *out = 0.0;
+ return EBUR128_SUCCESS;
+ }
+ stl_vector = (double*) malloc(stl_size * sizeof(double));
+ if (!stl_vector)
+ return EBUR128_ERROR_NOMEM;
+
+ for (j = 0, i = 0; i < size; ++i) {
+ if (!stsi) continue;
+ SLIST_FOREACH(it, &stsi->d->short_term_block_list, entries) {
+ stl_vectorj = it->z;
+ ++j;
+ }
+ }
+ qsort(stl_vector, stl_size, sizeof(double), ebur128_double_cmp);
+ stl_power = 0.0;
+ for (i = 0; i < stl_size; ++i) {
+ stl_power += stl_vectori;
+ }
+ stl_power /= (double) stl_size;
+ stl_integrated = minus_twenty_decibels * stl_power;
+
+ stl_relgated = stl_vector;
+ stl_relgated_size = stl_size;
+ while (stl_relgated_size > 0 && *stl_relgated < stl_integrated) {
+ ++stl_relgated;
+ --stl_relgated_size;
+ }
+
+ if (stl_relgated_size) {
+ h_en = stl_relgated(size_t) ((stl_relgated_size - 1) * 0.95 + 0.5);
+ l_en = stl_relgated(size_t) ((stl_relgated_size - 1) * 0.1 + 0.5);
+ free(stl_vector);
+ *out = ebur128_energy_to_loudness(h_en) - ebur128_energy_to_loudness(l_en);
+ return EBUR128_SUCCESS;
+ } else {
+ free(stl_vector);
+ *out = 0.0;
+ return EBUR128_SUCCESS;
+ }
+ }
+}
+
+int ebur128_loudness_range(ebur128_state* st, double* out) {
+ return ebur128_loudness_range_multiple(&st, 1, out);
+}
+
+int ebur128_sample_peak(ebur128_state* st,
+ unsigned int channel_number,
+ double* out) {
+ if ((st->mode & EBUR128_MODE_SAMPLE_PEAK) != EBUR128_MODE_SAMPLE_PEAK) {
+ return EBUR128_ERROR_INVALID_MODE;
+ } else if (channel_number >= st->channels) {
+ return EBUR128_ERROR_INVALID_CHANNEL_INDEX;
+ }
+ *out = st->d->sample_peakchannel_number;
+ return EBUR128_SUCCESS;
+}
+
+#ifdef USE_SPEEX_RESAMPLER
+int ebur128_true_peak(ebur128_state* st,
+ unsigned int channel_number,
+ double* out) {
+ if ((st->mode & EBUR128_MODE_TRUE_PEAK) != EBUR128_MODE_TRUE_PEAK) {
+ return EBUR128_ERROR_INVALID_MODE;
+ } else if (channel_number >= st->channels) {
+ return EBUR128_ERROR_INVALID_CHANNEL_INDEX;
+ }
+ *out = st->d->true_peakchannel_number > st->d->sample_peakchannel_number
+ ? st->d->true_peakchannel_number
+ : st->d->sample_peakchannel_number;
+ return EBUR128_SUCCESS;
+}
+#endif

deadbeef-1.9.6.tar.bz2/plugins/rg_scanner/ebur128/ebur128.h Added

@@ -0,0 +1,288 @@
+/* See COPYING file for copyright and license details. */
+
+#ifndef EBUR128_H_
+#define EBUR128_H_
+
+/** \file ebur128.h
+ * \brief libebur128 - a library for loudness measurement according to
+ * the EBU R128 standard.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define EBUR128_VERSION_MAJOR 1
+#define EBUR128_VERSION_MINOR 0
+#define EBUR128_VERSION_PATCH 1
+
+#include <stddef.h> /* for size_t */
+
+/** \enum channel
+ * Use these values when setting the channel map with ebur128_set_channel().
+ */
+enum channel {
+ EBUR128_UNUSED = 0, /**< unused channel (for example LFE channel) */
+ EBUR128_LEFT, /**< left channel */
+ EBUR128_RIGHT, /**< right channel */
+ EBUR128_CENTER, /**< center channel */
+ EBUR128_LEFT_SURROUND, /**< left surround channel */
+ EBUR128_RIGHT_SURROUND, /**< right surround channel */
+ EBUR128_DUAL_MONO /**< a channel that is counted twice */
+};
+
+/** \enum error
+ * Error return values.
+ */
+enum error {
+ EBUR128_SUCCESS = 0,
+ EBUR128_ERROR_NOMEM,
+ EBUR128_ERROR_INVALID_MODE,
+ EBUR128_ERROR_INVALID_CHANNEL_INDEX,
+ EBUR128_ERROR_NO_CHANGE
+};
+
+/** \enum mode
+ * Use these values in ebur128_init (or'ed). Try to use the lowest possible
+ * modes that suit your needs, as performance will be better.
+ */
+enum mode {
+ /** can call ebur128_loudness_momentary */
+ EBUR128_MODE_M = (1 << 0),
+ /** can call ebur128_loudness_shortterm */
+ EBUR128_MODE_S = (1 << 1) | EBUR128_MODE_M,
+ /** can call ebur128_loudness_global_* */
+ EBUR128_MODE_I = (1 << 2) | EBUR128_MODE_M,
+ /** can call ebur128_loudness_range */
+ EBUR128_MODE_LRA = (1 << 3) | EBUR128_MODE_S,
+ /** can call ebur128_sample_peak */
+ EBUR128_MODE_SAMPLE_PEAK = (1 << 4) | EBUR128_MODE_M,
+ /** can call ebur128_true_peak */
+ EBUR128_MODE_TRUE_PEAK = (1 << 5) | EBUR128_MODE_M
+ | EBUR128_MODE_SAMPLE_PEAK,
+ /** uses histogram algorithm to calculate loudness */
+ EBUR128_MODE_HISTOGRAM = (1 << 6)
+};
+
+/** forward declaration of ebur128_state_internal */
+struct ebur128_state_internal;
+
+/** \brief Contains information about the state of a loudness measurement.
+ *
+ * You should not need to modify this struct directly.
+ */
+typedef struct {
+ int mode; /**< The current mode. */
+ unsigned int channels; /**< The number of channels. */
+ unsigned long samplerate; /**< The sample rate. */
+ struct ebur128_state_internal* d; /**< Internal state. */
+} ebur128_state;
+
+/** \brief Get library version number. Do not pass null pointers here.
+ *
+ * @param major major version number of library
+ * @param minor minor version number of library
+ * @param patch patch version number of library
+ */
+void ebur128_get_version(int* major, int* minor, int* patch);
+
+/** \brief Initialize library state.
+ *
+ * @param channels the number of channels.
+ * @param samplerate the sample rate.
+ * @param mode see the mode enum for possible values.
+ * @return an initialized library state.
+ */
+ebur128_state* ebur128_init(unsigned int channels,
+ unsigned long samplerate,
+ int mode);
+
+/** \brief Destroy library state.
+ *
+ * @param st pointer to a library state.
+ */
+void ebur128_destroy(ebur128_state** st);
+
+/** \brief Set channel type.
+ *
+ * The default is:
+ * - 0 -> EBUR128_LEFT
+ * - 1 -> EBUR128_RIGHT
+ * - 2 -> EBUR128_CENTER
+ * - 3 -> EBUR128_UNUSED
+ * - 4 -> EBUR128_LEFT_SURROUND
+ * - 5 -> EBUR128_RIGHT_SURROUND
+ *
+ * @param st library state.
+ * @param channel_number zero based channel index.
+ * @param value channel type from the "channel" enum.
+ * @return
+ * - EBUR128_SUCCESS on success.
+ * - EBUR128_ERROR_INVALID_CHANNEL_INDEX if invalid channel index.
+ */
+int ebur128_set_channel(ebur128_state* st,
+ unsigned int channel_number,
+ int value);
+
+/** \brief Change library parameters.
+ *
+ * Note that the channel map will be reset when setting a different number of
+ * channels. The current unfinished block will be lost.
+ *
+ * @param st library state.
+ * @param channels new number of channels.
+ * @param samplerate new sample rate.
+ * @return
+ * - EBUR128_SUCCESS on success.
+ * - EBUR128_ERROR_NOMEM on memory allocation error. The state will be
+ * invalid and must be destroyed.
+ * - EBUR128_ERROR_NO_CHANGE if channels and sample rate were not changed.
+ */
+int ebur128_change_parameters(ebur128_state* st,
+ unsigned int channels,
+ unsigned long samplerate);
+
+/** \brief Add frames to be processed.
+ *
+ * @param st library state.
+ * @param src array of source frames. Channels must be interleaved.
+ * @param frames number of frames. Not number of samples!
+ * @return
+ * - EBUR128_SUCCESS on success.
+ * - EBUR128_ERROR_NOMEM on memory allocation error.
+ */
+int ebur128_add_frames_short(ebur128_state* st,
+ const short* src,
+ size_t frames);
+/** \brief See \ref ebur128_add_frames_short */
+int ebur128_add_frames_int(ebur128_state* st,
+ const int* src,
+ size_t frames);
+/** \brief See \ref ebur128_add_frames_short */
+int ebur128_add_frames_float(ebur128_state* st,
+ const float* src,
+ size_t frames);
+/** \brief See \ref ebur128_add_frames_short */
+int ebur128_add_frames_double(ebur128_state* st,
+ const double* src,
+ size_t frames);
+
+/** \brief Get global integrated loudness in LUFS.
+ *
+ * @param st library state.
+ * @param out integrated loudness in LUFS. -HUGE_VAL if result is negative
+ * infinity.
+ * @return
+ * - EBUR128_SUCCESS on success.
+ * - EBUR128_ERROR_INVALID_MODE if mode "EBUR128_MODE_I" has not been set.
+ */
+int ebur128_loudness_global(ebur128_state* st, double* out);
+/** \brief Get global integrated loudness in LUFS across multiple instances.
+ *
+ * @param sts array of library states.
+ * @param size length of sts
+ * @param out integrated loudness in LUFS. -HUGE_VAL if result is negative
+ * infinity.
+ * @return
+ * - EBUR128_SUCCESS on success.
+ * - EBUR128_ERROR_INVALID_MODE if mode "EBUR128_MODE_I" has not been set.
+ */
+int ebur128_loudness_global_multiple(ebur128_state** sts,
+ size_t size,
+ double* out);
+
+/** \brief Get momentary loudness (last 400ms) in LUFS.
+ *
+ * @param st library state.
+ * @param out momentary loudness in LUFS. -HUGE_VAL if result is negative
+ * infinity.
+ * @return
+ * - EBUR128_SUCCESS on success.
+ */
+int ebur128_loudness_momentary(ebur128_state* st, double* out);
+/** \brief Get short-term loudness (last 3s) in LUFS.
+ *
+ * @param st library state.
+ * @param out short-term loudness in LUFS. -HUGE_VAL if result is negative
+ * infinity.
+ * @return
+ * - EBUR128_SUCCESS on success.
+ * - EBUR128_ERROR_INVALID_MODE if mode "EBUR128_MODE_S" has not been set.
+ */
+int ebur128_loudness_shortterm(ebur128_state* st, double* out);
+
+/** \brief Get loudness range (LRA) of programme in LU.
+ *
+ * Calculates loudness range according to EBU 3342.
+ *
+ * @param st library state.
+ * @param out loudness range (LRA) in LU. Will not be changed in case of
+ * error. EBUR128_ERROR_NOMEM or EBUR128_ERROR_INVALID_MODE will be
+ * returned in this case.
+ * @return
+ * - EBUR128_SUCCESS on success.
+ * - EBUR128_ERROR_NOMEM in case of memory allocation error.
+ * - EBUR128_ERROR_INVALID_MODE if mode "EBUR128_MODE_LRA" has not been set.
+ */
+int ebur128_loudness_range(ebur128_state* st, double* out);
+/** \brief Get loudness range (LRA) in LU across multiple instances.
+ *
+ * Calculates loudness range according to EBU 3342.
+ *
+ * @param sts array of library states.
+ * @param size length of sts
+ * @param out loudness range (LRA) in LU. Will not be changed in case of
+ * error. EBUR128_ERROR_NOMEM or EBUR128_ERROR_INVALID_MODE will be
+ * returned in this case.
+ * @return
+ * - EBUR128_SUCCESS on success.
+ * - EBUR128_ERROR_NOMEM in case of memory allocation error.
+ * - EBUR128_ERROR_INVALID_MODE if mode "EBUR128_MODE_LRA" has not been set.
+ */
+int ebur128_loudness_range_multiple(ebur128_state** sts,
+ size_t size,
+ double* out);
+
+/** \brief Get maximum sample peak of selected channel in float format.
+ *
+ * @param st library state
+ * @param channel_number channel to analyse
+ * @param out maximum sample peak in float format (1.0 is 0 dBFS)
+ * @return
+ * - EBUR128_SUCCESS on success.
+ * - EBUR128_ERROR_INVALID_MODE if mode "EBUR128_MODE_SAMPLE_PEAK" has not
+ * been set.
+ * - EBUR128_ERROR_INVALID_CHANNEL_INDEX if invalid channel index.
+ */
+int ebur128_sample_peak(ebur128_state* st,
+ unsigned int channel_number,
+ double* out);
+
+/** \brief Get maximum true peak of selected channel in float format.
+ *
+ * Uses an implementation defined algorithm to calculate the true peak. Do not
+ * try to compare resulting values across different versions of the library,
+ * as the algorithm may change.
+ *
+ * The current implementation uses the Speex resampler with quality level 8 to
+ * calculate true peak. Will oversample 4x for sample rates < 96000 Hz, 2x for
+ * sample rates < 192000 Hz and leave the signal unchanged for 192000 Hz.
+ *
+ * @param st library state
+ * @param channel_number channel to analyse
+ * @param out maximum true peak in float format (1.0 is 0 dBFS)
+ * @return
+ * - EBUR128_SUCCESS on success.
+ * - EBUR128_ERROR_INVALID_MODE if mode "EBUR128_MODE_TRUE_PEAK" has not
+ * been set.
+ * - EBUR128_ERROR_INVALID_CHANNEL_INDEX if invalid channel index.
+ */
+int ebur128_true_peak(ebur128_state* st,
+ unsigned int channel_number,
+ double* out);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* EBUR128_H_ */

deadbeef-1.9.6.tar.bz2/plugins/rg_scanner/rg_scanner.c Added

@@ -0,0 +1,570 @@
+/*
+ * ReplayGain Scanner plugin for DeaDBeeF Player
+ *
+ * Copyright (c) 2016 Oleksiy Yakovenko
+ *
+ * Based on ddb_misc_replaygain_scan (c) 2015 Ivan Pilipenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+#include "rg_scanner.h"
+
+#include <dispatch/dispatch.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include <deadbeef/deadbeef.h>
+#include "ebur128/ebur128.h"
+#include <deadbeef/strdupa.h>
+
+#ifndef DISPATCH_QUEUE_CONCURRENT
+#define DISPATCH_QUEUE_CONCURRENT NULL
+#endif
+
+#define trace(...) { deadbeef->log_detailed (&plugin.misc.plugin, 0, __VA_ARGS__); }
+
+static const char *album_signature = "$if2(%album artist% - %album%,%filename%)";
+
+static ddb_rg_scanner_t plugin;
+static DB_functions_t *deadbeef;
+
+typedef struct {
+ int track_index;
+ ddb_rg_scanner_settings_t *settings;
+ ebur128_state **gain_state;
+ ebur128_state **peak_state;
+ dispatch_queue_t sync_queue;
+} track_state_t;
+
+void
+rg_calc_track(track_state_t *st) {
+ DB_decoder_t *dec = NULL;
+ DB_fileinfo_t *fileinfo = NULL;
+
+ char *buffer = NULL;
+ float *bufferf = NULL;
+
+ if (st->settings->pabort && *(st->settings->pabort)) {
+ return;
+ }
+ if (deadbeef->pl_get_item_duration (st->settings->tracksst->track_index) <= 0) {
+ st->settings->resultsst->track_index.scan_result = DDB_RG_SCAN_RESULT_INVALID_FILE;
+ return;
+ }
+
+
+ deadbeef->pl_lock ();
+ dec = (DB_decoder_t *)deadbeef->plug_get_for_id (deadbeef->pl_find_meta (st->settings->tracksst->track_index, ":DECODER"));
+ deadbeef->pl_unlock ();
+
+ if (dec) {
+ fileinfo = dec->open (DDB_DECODER_HINT_RAW_SIGNAL);
+
+ if (!fileinfo || dec->init (fileinfo, DB_PLAYITEM (st->settings->tracksst->track_index)) != 0) {
+ st->settings->resultsst->track_index.scan_result = DDB_RG_SCAN_RESULT_FILE_NOT_FOUND;
+ goto error;
+ }
+
+ st->gain_statest->track_index = ebur128_init(fileinfo->fmt.channels, fileinfo->fmt.samplerate, EBUR128_MODE_I);
+ st->peak_statest->track_index = ebur128_init(fileinfo->fmt.channels, fileinfo->fmt.samplerate, EBUR128_MODE_SAMPLE_PEAK);
+
+ // speaker mask mapping from WAV to EBUR128
+ static const int chmap18 = {
+ EBUR128_LEFT,
+ EBUR128_RIGHT,
+ EBUR128_CENTER,
+ EBUR128_UNUSED,
+ EBUR128_LEFT_SURROUND,
+ EBUR128_RIGHT_SURROUND,
+ EBUR128_LEFT_SURROUND,
+ EBUR128_RIGHT_SURROUND,
+ EBUR128_CENTER,
+ EBUR128_LEFT_SURROUND,
+ EBUR128_RIGHT_SURROUND,
+ EBUR128_CENTER,
+ EBUR128_LEFT_SURROUND,
+ EBUR128_CENTER,
+ EBUR128_RIGHT_SURROUND,
+ EBUR128_LEFT_SURROUND,
+ EBUR128_CENTER,
+ EBUR128_RIGHT_SURROUND,
+ };
+
+ uint32_t channelmask = fileinfo->fmt.channelmask;
+
+ // first 18 speaker positions are known, the rest will be marked as UNUSED
+ int ch = 0;
+ for (int i = 0; i < 32 && ch < fileinfo->fmt.channels; i++) {
+ if (i < 18) {
+ if (channelmask & (1<<i))
+ {
+ ebur128_set_channel (st->gain_statest->track_index, ch, chmapi);
+ ebur128_set_channel (st->peak_statest->track_index, ch, chmapi);
+ ch++;
+ }
+ }
+ else {
+ ebur128_set_channel (st->gain_statest->track_index, ch, EBUR128_UNUSED);
+ ebur128_set_channel (st->peak_statest->track_index, ch, EBUR128_UNUSED);
+ ch++;
+ }
+ }
+
+ int samplesize = fileinfo->fmt.channels * fileinfo->fmt.bps / 8;
+
+ int bs = 2000 * samplesize;
+ ddb_waveformat_t fmt;
+
+ buffer = malloc (bs);
+
+ if (!fileinfo->fmt.is_float) {
+ bufferf = malloc (2000 * sizeof (float) * fileinfo->fmt.channels);
+ memcpy (&fmt, &fileinfo->fmt, sizeof (fmt));
+ fmt.bps = 32;
+ fmt.is_float = 1;
+ }
+ else {
+ bufferf = (float *)buffer;
+ }
+
+ int eof = 0;
+ for (;;) {
+ if (eof) {
+ break;
+ }
+ if (st->settings->pabort && *(st->settings->pabort)) {
+ break;
+ }
+
+ int sz = dec->read (fileinfo, buffer, bs); // read one block
+
+ dispatch_sync(st->sync_queue, ^{
+ int samplesize = fileinfo->fmt.channels * (fileinfo->fmt.bps >> 3);
+ int numsamples = sz / samplesize;
+ st->settings->cd_samples_processed += numsamples * 44100 / fileinfo->fmt.samplerate;
+ });
+
+ if (sz != bs) {
+ eof = 1;
+ }
+
+ // convert from native output to float,
+ // only if the input is not float already
+ if (!fileinfo->fmt.is_float) {
+ deadbeef->pcm_convert (&fileinfo->fmt, buffer, &fmt, (char *)bufferf, sz);
+ }
+
+ int frames = sz / samplesize;
+
+ ebur128_add_frames_float (st->gain_statest->track_index, bufferf, frames); // collect data
+ ebur128_add_frames_float (st->peak_statest->track_index, bufferf, frames); // collect data
+ }
+
+ if (!st->settings->pabort || !(*(st->settings->pabort))) {
+ // calculating track peak
+ // libEBUR128 calculates peak per channel, so we have to pick the highest value
+ double tr_peak = 0;
+ double ch_peak = 0;
+ int res;
+ for (int ch = 0; ch < fileinfo->fmt.channels; ++ch) {
+ res = ebur128_sample_peak (st->peak_statest->track_index, ch, &ch_peak);
+ //trace ("rg_scanner: peak for ch %d: %f\n", ch, ch_peak);
+ if (ch_peak > tr_peak) {
+ //trace ("rg_scanner: %f > %f\n", ch_peak, tr_peak);
+ tr_peak = ch_peak;
+ }
+ }
+
+ st->settings->resultsst->track_index.track_peak = (float) tr_peak;
+
+ // calculate track loudness
+ double loudness = st->settings->ref_loudness;
+ ebur128_loudness_global (st->gain_statest->track_index, &loudness);
+ /*
+ * EBUR128 sets the target level to -23 LUFS = 84dB
+ * -> -23 - loudness = track gain to get to 84dB
+ *
+ * The old implementation of RG used 89dB, most people still use that
+ * -> the above + (loudness - 84) = track gain to get to 89dB (or user specified)
+ */
+ if (loudness != -HUGE_VAL) {
+ st->settings->resultsst->track_index.track_gain = -23 - loudness + st->settings->ref_loudness - 84;
+ }
+ }
+ }
+
+error:
+ // clean up
+ if (fileinfo) {
+ dec->free (fileinfo);
+ }
+
+ if (buffer && buffer != (char *)bufferf) {
+ free (buffer);
+ buffer = NULL;
+ }
+
+ if (bufferf) {
+ free (bufferf);
+ bufferf = NULL;
+ }
+}
+
+static int
+_update_album_gain (ddb_rg_scanner_settings_t *settings, int i, int album_start, char *current_album, char *album, double loudness, ebur128_state **gain_state) {
+ if (strcmp (album, current_album)) {
+ if (i > 0) {
+ // update current album gain/peak
+ float album_peak = 0;
+
+ for (int n = album_start; n < i; ++n) {
+ if (album_peak < settings->resultsn.track_peak) {
+ album_peak = settings->resultsn.track_peak;
+ }
+ }
+
+ // calculate gain of all tracks of the current album
+ ebur128_loudness_global_multiple(&gain_statealbum_start, (size_t)i-album_start, &loudness);
+
+ float album_gain = -23 - (float)loudness + settings->ref_loudness - 84;
+
+ for (int n = album_start; n < i; ++n) {
+ settings->resultsn.album_gain = album_gain;
+ settings->resultsn.album_peak = album_peak;
+ }
+ }
+
+ // proceed to next album
+ strcpy (current_album, album);
+
+ //trace ("next album found %d -> %d\n", album_start, i);
+ return i;
+ }
+ return album_start;
+}
+
+int
+rg_scan (ddb_rg_scanner_settings_t *settings) {
+ if (settings->_size != sizeof (ddb_rg_scanner_settings_t)) {
+ return -1;
+ }
+
+ if (settings->num_threads <= 0) {
+ settings->num_threads = 4;
+ }
+
+ char *album_signature_tf = NULL;
+ if (settings->mode == DDB_RG_SCAN_MODE_ALBUMS_FROM_TAGS) {
+ album_signature_tf = deadbeef->tf_compile (album_signature);
+ deadbeef->sort_track_array (NULL, settings->tracks, settings->num_tracks, album_signature, DDB_SORT_ASCENDING);
+ }
+
+ //trace ("rg_scanner: using %d thread(s)\n", settings->num_threads);
+
+ ebur128_state **gain_state = NULL;
+ ebur128_state **peak_state = NULL;
+
+ if (settings->ref_loudness == 0) {
+ settings->ref_loudness = DDB_RG_SCAN_DEFAULT_LOUDNESS;
+ }
+
+ double loudness = settings->ref_loudness;
+
+ // allocate status array
+ gain_state = calloc (settings->num_tracks, sizeof (ebur128_state *));
+ peak_state = calloc (settings->num_tracks, sizeof (ebur128_state *));
+
+ track_state_t *track_states = calloc (settings->num_tracks, sizeof (track_state_t));
+
+ dispatch_semaphore_t semaphore = dispatch_semaphore_create(settings->num_threads);
+ dispatch_queue_t queue = dispatch_queue_create("rg_scanner", DISPATCH_QUEUE_CONCURRENT);
+ dispatch_queue_t sync_queue = dispatch_queue_create("rg_scanner_sync", 0);
+
+ // calculate gain for each track and album
+ for (int i = 0; i < settings->num_tracks; ++i) {
+ if (settings->progress_callback) {
+ settings->progress_callback (i, settings->progress_cb_user_data);
+ }
+
+ if (settings->pabort && *(settings->pabort)) {
+ // wait for remaining jobs / close semaphore
+ for (int i = 0; i < settings->num_threads; i++) {
+ dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+ }
+ goto cleanup;
+ }
+
+ // close semaphore before starting the next job
+ dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+
+ // initialize arguments
+ track_statesi.track_index = i;
+ track_statesi.settings = settings;
+ track_statesi.gain_state = gain_state;
+ track_statesi.peak_state = peak_state;
+ track_statesi.sync_queue = sync_queue;
+
+ dispatch_async(queue, ^{
+ rg_calc_track(&track_statesi);
+
+ // open semaphore when the job is done
+ dispatch_semaphore_signal(semaphore);
+ });
+ }
+
+ // wait for remaining jobs / close semaphore
+ for (int i = 0; i < settings->num_threads; i++) {
+ dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+ }
+
+ if (settings->mode == DDB_RG_SCAN_MODE_ALBUMS_FROM_TAGS) {
+ int album_start = -1;
+ char current_album1000 = "";
+ char album1000;
+
+ ddb_tf_context_t ctx;
+ memset (&ctx, 0, sizeof (ctx));
+
+ ctx._size = sizeof (ctx);
+ ctx.plt = NULL;
+ ctx.idx = -1;
+ ctx.id = -1;
+
+ for (int i = 0; i <= settings->num_tracks; i++) {
+ // set album gain when the album change is detected
+ if (i < settings->num_tracks) {
+ ctx.it = settings->tracksi;
+ deadbeef->tf_eval(&ctx, album_signature_tf, album, sizeof (album));
+ }
+ else {
+ *album = 0;
+ }
+ album_start = _update_album_gain (settings, i, album_start, current_album, album, loudness, gain_state);
+ }
+ }
+
+ if (settings->mode == DDB_RG_SOURCE_MODE_ALBUM) {
+ float album_peak = 0;
+
+ for (int i = 0; i < settings->num_tracks; ++i) {
+ if (album_peak < settings->resultsi.track_peak) {
+ album_peak = settings->resultsi.track_peak;
+ }
+ }
+
+ // calculate gain of all tracks combined
+ ebur128_loudness_global_multiple(gain_state, (size_t)settings->num_tracks, &loudness);
+
+ float album_gain = -23 - (float)loudness + settings->ref_loudness - 84;
+
+ for (int i = 0; i < settings->num_tracks; ++i) {
+ settings->resultsi.album_gain = album_gain;
+ settings->resultsi.album_peak = album_peak;
+ }
+ }
+
+cleanup:
+ // It is assumed that semaphore is closed at this point,
+ // need to open before calling release.
+ for (int i = 0; i < settings->num_threads; i++) {
+ dispatch_semaphore_signal (semaphore);
+ }
+ dispatch_release(semaphore);
+ semaphore = NULL;
+ dispatch_release(queue);
+ queue = NULL;
+ dispatch_release(sync_queue);
+ sync_queue = NULL;
+
+ if (track_states) {
+ free (track_states);
+ track_states = NULL;
+ }
+
+ if (gain_state) {
+ for (int i = 0; i < settings->num_tracks; ++i) {
+ if (gain_statei) {
+ ebur128_destroy (&gain_statei);
+ }
+ }
+ free (gain_state);
+ gain_state = NULL;
+ }
+
+ if (peak_state) {
+ for (int i = 0; i < settings->num_tracks; ++i) {
+ if (peak_statei) {
+ ebur128_destroy (&peak_statei);
+ }
+ }
+ free (peak_state);
+ peak_state = NULL;
+ }
+
+ if (album_signature_tf) {
+ deadbeef->tf_free (album_signature_tf);
+ album_signature_tf = NULL;
+ }
+
+ return 0;
+}
+
+static int
+_rg_write_meta (DB_playItem_t *track) {
+ const char *path = NULL;
+ const char *decoder_id = NULL;
+
+ deadbeef->pl_lock ();
+ path = strdupa (deadbeef->pl_find_meta_raw (track, ":URI"));
+ int is_subtrack = deadbeef->pl_get_item_flags (track) & DDB_IS_SUBTRACK;
+ if (is_subtrack) {
+ trace ("rg_scanner: Can't write to subtrack of file: %s\n", path);
+ deadbeef->pl_unlock ();
+ return -1;
+ }
+ decoder_id = deadbeef->pl_find_meta_raw (track, ":DECODER");
+ if (!decoder_id) {
+ trace ("rg_scanner: Invalid decoder in track %s\n", path);
+ deadbeef->pl_unlock ();
+ return -1;
+ }
+ decoder_id = strdupa (decoder_id);
+
+ int match = track && decoder_id;
+ deadbeef->pl_unlock ();
+
+ if (match) {
+ int is_subtrack = deadbeef->pl_get_item_flags (track) & DDB_IS_SUBTRACK;
+ if (is_subtrack) {
+ return 0; // only write tags for actual tracks
+ }
+ // find decoder
+ DB_decoder_t *dec = NULL;
+ DB_decoder_t **decoders = deadbeef->plug_get_decoder_list ();
+ for (int i = 0; decodersi; i++) {
+ if (!strcmp (decodersi->plugin.id, decoder_id)) {
+ dec = decodersi;
+ if (dec->write_metadata) {
+ if (dec->write_metadata (track)) {
+ trace ("rg_scanner: Failed to write tag to %s\n", path);
+ return -1;
+ }
+ }
+ else {
+ trace ("rg_scanner: Writing tags is not supported for the file %s\n", path);
+ }
+ break;
+ }
+ }
+ }
+ else {
+ trace ("rg_scanner: Could not find matching decoder for %s\n", path);
+ return -1;
+ }
+ return 0;
+}
+
+static void
+_rg_remove_meta (DB_playItem_t *track) {
+ deadbeef->pl_delete_meta (track, ":REPLAYGAIN_ALBUMGAIN");
+ deadbeef->pl_delete_meta (track, ":REPLAYGAIN_ALBUMPEAK");
+ deadbeef->pl_delete_meta (track, ":REPLAYGAIN_TRACKGAIN");
+ deadbeef->pl_delete_meta (track, ":REPLAYGAIN_TRACKPEAK");
+}
+
+int
+rg_apply (DB_playItem_t *track, uint32_t flags, float track_gain, float track_peak, float album_gain, float album_peak) {
+ _rg_remove_meta(track);
+
+ if (flags & (1<<DDB_REPLAYGAIN_TRACKGAIN)) {
+ deadbeef->pl_set_item_replaygain (track, DDB_REPLAYGAIN_TRACKGAIN, track_gain);
+ }
+ if (flags & (1<<DDB_REPLAYGAIN_TRACKPEAK)) {
+ deadbeef->pl_set_item_replaygain (track, DDB_REPLAYGAIN_TRACKPEAK, track_peak);
+ }
+ if (flags & (1<<DDB_REPLAYGAIN_ALBUMGAIN)) {
+ deadbeef->pl_set_item_replaygain (track, DDB_REPLAYGAIN_ALBUMGAIN, album_gain);
+ }
+ if (flags & (1<<DDB_REPLAYGAIN_ALBUMPEAK)) {
+ deadbeef->pl_set_item_replaygain (track, DDB_REPLAYGAIN_ALBUMPEAK, album_peak);
+ }
+
+ return _rg_write_meta (track);
+}
+
+int
+rg_remove (DB_playItem_t *track) {
+ _rg_remove_meta (track);
+
+ return _rg_write_meta (track);
+}
+
+// plugin structure and info
+static ddb_rg_scanner_t plugin = {
+ .misc.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .misc.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .misc.plugin.version_major = 1,
+ .misc.plugin.version_minor = 0,
+ .misc.plugin.flags = DDB_PLUGIN_FLAG_LOGGING,
+ .misc.plugin.type = DB_PLUGIN_MISC,
+ .misc.plugin.name = "ReplayGain Scanner",
+ .misc.plugin.id = "rg_scanner",
+ .misc.plugin.descr =
+ "Calculates and writes ReplayGain tags, according to EBUR128 spec.",
+ .misc.plugin.copyright =
+ "ReplayGain Scanner plugin for DeaDBeeF Player\n"
+ "\n"
+ "Copyright (c) 2016 Oleksiy Yakovenko\n"
+ "\n"
+ "Based on ddb_misc_replaygain_scan (c) 2015 Ivan Pilipenko\n"
+ "\n"
+ "libEBUR128\n"
+ "Copyright (c) 2011 Jan Kokemüller\n"
+ "\n"
+ "Permission is hereby granted, free of charge, to any person obtaining a copy\n"
+ "of this software and associated documentation files (the \"Software\"), to deal\n"
+ "in the Software without restriction, including without limitation the rights\n"
+ "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n"
+ "copies of the Software, and to permit persons to whom the Software is\n"
+ "furnished to do so, subject to the following conditions:\n"
+ "\n"
+ "The above copyright notice and this permission notice shall be included in\n"
+ "all copies or substantial portions of the Software.\n"
+ "\n"
+ "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n"
+ "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
+ "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n"
+ "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n"
+ "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n"
+ "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n"
+ "THE SOFTWARE.\n",
+ .misc.plugin.website = "http://deadbeef.sf.net",
+ .scan = rg_scan,
+ .apply = rg_apply,
+ .remove = rg_remove
+};
+
+DB_plugin_t *
+rg_scanner_load (DB_functions_t *api) {
+ deadbeef = api;
+ return DB_PLUGIN (&plugin);
+}

deadbeef-1.9.6.tar.bz2/plugins/rg_scanner/rg_scanner.h Added

@@ -0,0 +1,101 @@
+/*
+ * ReplayGain Scanner plugin for DeaDBeeF Player
+ *
+ * Copyright (c) 2016 Oleksiy Yakovenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+#ifndef __RG_SCANNER_H
+#define __RG_SCANNER_H
+
+#include <deadbeef/deadbeef.h>
+
+enum {
+ DDB_RG_SCAN_MODE_TRACK = 1,
+ DDB_RG_SCAN_MODE_SINGLE_ALBUM = 2,
+ DDB_RG_SCAN_MODE_ALBUMS_FROM_TAGS = 3,
+};
+
+enum {
+ DDB_RG_SCAN_RESULT_SUCCESS = 0,
+ DDB_RG_SCAN_RESULT_FILE_NOT_FOUND = -1,
+ DDB_RG_SCAN_RESULT_INVALID_FILE = -2,
+};
+
+#define DDB_RG_SCAN_DEFAULT_LOUDNESS 89.f
+
+typedef struct {
+ float track_gain;
+ float album_gain;
+ float track_peak;
+ float album_peak;
+ int scan_result;
+} ddb_rg_scanner_result_t;
+
+typedef struct {
+ // Size of this structure
+ int _size;
+
+ // The scanning mode, one of DDB_RG_SCAN_MODE_*
+ int mode;
+
+ // The list of tracks and results.
+ // The caller is responsible to allocate and free these buffers.
+ DB_playItem_t **tracks;
+ ddb_rg_scanner_result_t *results;
+
+ int num_tracks;
+
+ // Requested reference loudness, will be automatically set to DDB_RG_SCAN_DEFAULT_LOUDNESS
+ // Preferred config variable: rg_scanner.target_db=89
+ float ref_loudness;
+
+ // Max number of concurrent threads
+ int num_threads;
+
+ // Optional pointer to the abort flag; the scanner will abort if the pointed value is non-zero
+ int *pabort;
+
+ // Optional progress callback, with the current track index.
+ void (*progress_callback) (int current_track, void *user_data);
+
+ // An additional user-defined parameter, which will be passed to the progress_callback.
+ void *progress_cb_user_data;
+
+ // How many 44.1kHz samples of PCM data have been processed.
+ // Set by the scanner, can be used in the progress callback, to calculate scanning speed.
+ uint64_t cd_samples_processed;
+} ddb_rg_scanner_settings_t;
+
+typedef struct {
+ DB_misc_t misc;
+
+ int (*scan) (ddb_rg_scanner_settings_t *settings);
+
+ // flags specify which fields must be set / added
+ // each bit is 1 shifted left by DDB_REPLAYGAIN_* constant
+ // Example (1<<DDB_REPLAYGAIN_ALBUMGAIN)|(1<<DDB_REPLAYGAIN_ALBUMPEAK) would set album values, but not track values
+ int (*apply) (DB_playItem_t *track, uint32_t flags, float track_gain, float track_peak, float album_gain, float album_peak);
+
+ int (*remove) (DB_playItem_t *track);
+} ddb_rg_scanner_t;
+
+#endif //__RG_SCANNER_H

deadbeef-1.9.6.tar.bz2/plugins/sc68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/COPYING Added

@@ -0,0 +1,47 @@
+in_sc86 (Atari ST SNDH YM2149) input plugin for deadbeef
+Copyright (C) 2015 Oleksiy Yakovenko
+based on sc68 library, see below for more information
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+
+
+sc68 - Atari ST and Amiga music player
+Copyright (C) 1998-2003 Benjamin Gerard
+<ben@sashipa.com>
+<http://sashipa.ben.free.fr/sc68/>
+<http://sourceforge.net/projects/sc68/>
+
+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.
+
+
+
+NOTE This source distribution contains a modified copy of sc68 library.

deadbeef-1.9.6.tar.bz2/plugins/sc68/Makefile.am Added

@@ -0,0 +1,284 @@
+sc68path=@top_srcdir@/plugins/sc68
+
+sc68replaydata = \
+	file68/data68/Replay/aenigmatica.bin\
+	file68/data68/Replay/alteredbeast.bin\
+	file68/data68/Replay/armalyte.bin\
+	file68/data68/Replay/asidifier.bin\
+	file68/data68/Replay/azidifier.bin\
+	file68/data68/Replay/bendaglish.deli.bin\
+	file68/data68/Replay/big.bin\
+	file68/data68/Replay/blipblop.bin\
+	file68/data68/Replay/blipp079.bin\
+	file68/data68/Replay/bs22.bin\
+	file68/data68/Replay/cabal.bin\
+	file68/data68/Replay/chipmon2.bin\
+	file68/data68/Replay/cosotfmx.bin\
+	file68/data68/Replay/crapman1.bin\
+	file68/data68/Replay/crapman2.bin\
+	file68/data68/Replay/deltamusic1.bin\
+	file68/data68/Replay/deltamusic2.bin\
+	file68/data68/Replay/digitfmx.bin\
+	file68/data68/Replay/dmu.bin\
+	file68/data68/Replay/dwaga.bin\
+	file68/data68/Replay/dyter07.bin\
+	file68/data68/Replay/elf.bin\
+	file68/data68/Replay/fc13_14.bin\
+	file68/data68/Replay/fireice.bin\
+	file68/data68/Replay/fred.bin\
+	file68/data68/Replay/gemx.bin\
+	file68/data68/Replay/harlequin.bin\
+	file68/data68/Replay/hippel-coso_note.deli.bin\
+	file68/data68/Replay/hpn-jam.bin\
+	file68/data68/Replay/huelsbeck.bin\
+	file68/data68/Replay/huntforredoct.bin\
+	file68/data68/Replay/ivanhoe.bin\
+	file68/data68/Replay/jamcracker10.bin\
+	file68/data68/Replay/jamcrackerpro.bin\
+	file68/data68/Replay/lastninja3.bin\
+	file68/data68/Replay/lastninjaiii.bin\
+	file68/data68/Replay/lcd.bin\
+	file68/data68/Replay/lx_mmme.bin\
+	file68/data68/Replay/mcoder.bin\
+	file68/data68/Replay/megatizer.bin\
+	file68/data68/Replay/metrocross.bin\
+	file68/data68/Replay/midi.bin\
+	file68/data68/Replay/mmme.bin\
+	file68/data68/Replay/mmmesid.bin\
+	file68/data68/Replay/mon.bin\
+	file68/data68/Replay/mon_old.deli.bin\
+	file68/data68/Replay/musmon1.bin\
+	file68/data68/Replay/musmon2.bin\
+	file68/data68/Replay/ninjaremix.bin\
+	file68/data68/Replay/ninjatfmx.bin\
+	file68/data68/Replay/nobuddiesland.bin\
+	file68/data68/Replay/none.bin\
+	file68/data68/Replay/note.bin\
+	file68/data68/Replay/note2.bin\
+	file68/data68/Replay/page.bin\
+	file68/data68/Replay/protracker.bin\
+	file68/data68/Replay/psg1.bin\
+	file68/data68/Replay/psgtrackerv2.bin\
+	file68/data68/Replay/puma.bin\
+	file68/data68/Replay/puma2.bin\
+	file68/data68/Replay/quartet.bin\
+	file68/data68/Replay/quartet_mindbomb.bin\
+	file68/data68/Replay/realms.bin\
+	file68/data68/Replay/robhubbard.deli.bin\
+	file68/data68/Replay/rollingronny.bin\
+	file68/data68/Replay/shadowdancer.bin\
+	file68/data68/Replay/sidmon1.bin\
+	file68/data68/Replay/sidmon2.bin\
+	file68/data68/Replay/sidsound.bin\
+	file68/data68/Replay/sndh_ice.bin\
+	file68/data68/Replay/soundfx.bin\
+	file68/data68/Replay/spacecrusade.bin\
+	file68/data68/Replay/spacegun.bin\
+	file68/data68/Replay/ssd1.bin\
+	file68/data68/Replay/stos.bin\
+	file68/data68/Replay/synthiv.bin\
+	file68/data68/Replay/tao_digi.bin\
+	file68/data68/Replay/tao_hubbard.bin\
+	file68/data68/Replay/tao_ms211.bin\
+	file68/data68/Replay/tao_ms25.bin\
+	file68/data68/Replay/tao_ms27.bin\
+	file68/data68/Replay/tao_tsd.bin\
+	file68/data68/Replay/tcbtracker.bin\
+	file68/data68/Replay/test.bin\
+	file68/data68/Replay/tfmx.bin\
+	file68/data68/Replay/tfmx_aga.bin\
+	file68/data68/Replay/tfmx_old.bin\
+	file68/data68/Replay/tfmx_st.bin\
+	file68/data68/Replay/timerc.bin\
+	file68/data68/Replay/toki.bin\
+	file68/data68/Replay/tsd1.bin\
+	file68/data68/Replay/utopia.bin\
+	file68/data68/Replay/vikingchild.bin\
+	file68/data68/Replay/xbiossound.bin\
+	file68/data68/Replay/zonewarrior.bin
+
+EXTRA_DIST = \
+	$(sc68replaydata)\
+	libsc68/emu68/lines/table.c\
+	libsc68/emu68/lines/lineE.c\
+	libsc68/emu68/lines/line3.c\
+	libsc68/emu68/lines/line6.c\
+	libsc68/emu68/lines/lineB.c\
+	libsc68/emu68/lines/line5.c\
+	libsc68/emu68/lines/line8.c\
+	libsc68/emu68/lines/lineC.c\
+	libsc68/emu68/lines/line1.c\
+	libsc68/emu68/lines/lineD.c\
+	libsc68/emu68/lines/lineF.c\
+	libsc68/emu68/lines/line2.c\
+	libsc68/emu68/lines/lineA.c\
+	libsc68/emu68/lines/line0.c\
+	libsc68/emu68/lines/line4.c\
+	libsc68/emu68/lines/line7.c\
+	libsc68/emu68/lines/line9.c\
+	libsc68/emu68/line3_68.c\
+	libsc68/emu68/line7_68.c\
+	libsc68/emu68/line5_68.c\
+	libsc68/emu68/lineC_68.c\
+	libsc68/emu68/lineB_68.c\
+	libsc68/emu68/line9_68.c\
+	libsc68/emu68/lineE_68.c\
+	libsc68/emu68/line8_68.c\
+	libsc68/emu68/line4_68.c\
+	libsc68/emu68/line6_68.c\
+	libsc68/emu68/lineF_68.c\
+	libsc68/emu68/lineA_68.c\
+	libsc68/emu68/line0_68.c\
+	libsc68/emu68/lineD_68.c\
+	libsc68/emu68/line1_68.c\
+	libsc68/emu68/line2_68.c\
+	libsc68/io68/ym_linear_table.c\
+	libsc68/io68/ym_atarist_table.c\
+	libsc68/emu68/crc32.c\
+	libsc68/emu68/table68.c
+
+if HAVE_SC68
+pkglib_LTLIBRARIES = in_sc68.la
+
+sc68replaydatadir = $(libdir)/deadbeef/data68/Replay
+sc68replaydata_DATA = $(sc68replaydata)
+
+in_sc68_la_SOURCES=in_sc68.c\
+	file68/src/gzip68.c\
+	file68/src/vfs68.c\
+	file68/src/ice68.c\
+	file68/src/vfs68_ao.c\
+	file68/src/vfs68_null.c\
+	file68/src/replay.inc.h\
+	file68/src/msg68.c\
+	file68/src/timedb68.c\
+	file68/src/timedb.inc.h\
+	file68/src/init68.c\
+	file68/src/vfs68_z.c\
+	file68/src/replay68.c\
+	file68/src/registry68.c\
+	file68/src/uri68.c\
+	file68/src/rsc68.c\
+	file68/src/vfs68_fd.c\
+	file68/src/vfs68_file.c\
+	file68/src/vfs68_mem.c\
+	file68/src/file68.c\
+	file68/src/string68.c\
+	file68/src/endian68.c\
+	file68/src/vfs68_curl.c\
+	file68/src/option68.c\
+	file68/src/ferror68.c\
+	file68/sc68/file68_vfs_ao.h\
+	file68/sc68/file68.h\
+	file68/sc68/file68_ord.h\
+	file68/sc68/file68_tag.h\
+	file68/sc68/file68_vfs_curl.h\
+	file68/sc68/file68_str.h\
+	file68/sc68/file68_features.h\
+	file68/sc68/file68_vfs_def.h\
+	file68/sc68/file68_msg.h\
+	file68/sc68/file68_vfs_file.h\
+	file68/sc68/file68_api.h\
+	file68/sc68/file68_chk.h\
+	file68/sc68/file68_ice.h\
+	file68/sc68/file68_err.h\
+	file68/sc68/file68_opt.h\
+	file68/sc68/file68_vfs_mem.h\
+	file68/sc68/file68_rsc.h\
+	file68/sc68/file68_zip.h\
+	file68/sc68/file68_vfs_null.h\
+	file68/sc68/file68_tdb.h\
+	file68/sc68/file68_reg.h\
+	file68/sc68/file68_vfs_fd.h\
+	file68/sc68/file68_vfs.h\
+	file68/sc68/file68_uri.h\
+	file68/sc68/file68_vfs_z.h\
+	libsc68/dial68/dial68.h\
+	libsc68/dial68/dial68.c\
+	libsc68/dial68/dial_conf.c\
+	libsc68/dial68/dial_finf.c\
+	libsc68/dial68/dial_tsel.c\
+	unice68/unice68.h\
+	unice68/unice68_unpack.c\
+	unice68/unice68_pack.c\
+	unice68/unice68_version.c\
+	libsc68/conf68.c\
+	libsc68/api68.c\
+	libsc68/mixer68.c\
+	libsc68/io68/io68_api.h\
+	libsc68/io68/paulaemul.c\
+	libsc68/io68/io68.h\
+	libsc68/io68/shifter_io.h\
+	libsc68/io68/ym_envel.c\
+	libsc68/io68/mfp_io.h\
+	libsc68/io68/ym_dump.h\
+	libsc68/io68/ym_blep.h\
+	libsc68/io68/ymemul.c\
+	libsc68/io68/mwemul.h\
+	libsc68/io68/ymoutorg.h\
+	libsc68/io68/shifter_io.c\
+	libsc68/io68/paula_io.c\
+	libsc68/io68/mw_io.c\
+	libsc68/io68/mw_io.h\
+	libsc68/io68/mfpemul.h\
+	libsc68/io68/paula_io.h\
+	libsc68/io68/ym_dump.c\
+	libsc68/io68/mfp_io.c\
+	libsc68/io68/mwemul.c\
+	libsc68/io68/paulaemul.h\
+	libsc68/io68/ym_fixed_vol.h\
+	libsc68/io68/ym_io.c\
+	libsc68/io68/io68.c\
+	libsc68/io68/ym_puls.h\
+	libsc68/io68/ym_blep.c\
+	libsc68/io68/ymemul.h\
+	libsc68/io68/ymout2k9.h\
+	libsc68/io68/default.h\
+	libsc68/io68/mfpemul.c\
+	libsc68/io68/ym_io.h\
+	libsc68/io68/ym_puls.c\
+	libsc68/libsc68.c\
+	libsc68/emu68/inl68_datamove.h\
+	libsc68/emu68/lines68.c\
+	libsc68/emu68/lines68.h\
+	libsc68/emu68/inl68_bitmanip.h\
+	libsc68/emu68/inst68.h\
+	libsc68/emu68/inl68_progctrl.h\
+	libsc68/emu68/cc68.h\
+	libsc68/emu68/macro68.h\
+	libsc68/emu68/mem68.h\
+	libsc68/emu68/error68.h\
+	libsc68/emu68/ioplug68.c\
+	libsc68/emu68/inl68_logic.h\
+	libsc68/emu68/mem68.c\
+	libsc68/emu68/assert68.h\
+	libsc68/emu68/getea68.c\
+	libsc68/emu68/inl68_exception.h\
+	libsc68/emu68/inst68.c\
+	libsc68/emu68/emu68.c\
+	libsc68/emu68/srdef68.h\
+	libsc68/emu68/type68.h\
+	libsc68/emu68/struct68.h\
+	libsc68/emu68/error68.c\
+	libsc68/emu68/excep68.h\
+	libsc68/emu68/emu68.h\
+	libsc68/emu68/inl68_shifting.h\
+	libsc68/emu68/inl68_arithmetic.h\
+	libsc68/emu68/inl68_bcd.h\
+	libsc68/emu68/inl68_systctrl.h\
+	libsc68/emu68/emu68_api.h\
+	libsc68/emu68/ioplug68.h\
+	libsc68/sc68/trap68.h\
+	libsc68/sc68/conf68.h\
+	libsc68/sc68/sc68.h\
+	libsc68/sc68/mixer68.h\
+	desa68/desa68.h\
+	desa68/desa68.c
+
+in_sc68_la_LDFLAGS = -module -avoid-version
+in_sc68_la_LIBADD = $(ZLIB_LIBS)
+
+in_sc68_la_CFLAGS = $(CFLAGS) -std=c99 -DSC68_SHARED_DATA_PATH='"."' -DHAVE_GETENV=1 -DHAVE_CONFIG_CONFIG68_H=1 -DHAVE_STRING_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STDINT_H=1 -DHAVE_ASSERT_H -DHAVE_LIMITS_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_BASENAME=1 -DEMU68_MONOLITIC=1 -DPACKAGE_VERNUM=300 -DEMU68_EXPORT -DNDEBUG=1 -DNDEBUG_LIBSC68=1 -DUSE_FILE68=1 -DUSE_UNICE68=1 -DHAVE_INTMAX_T -DHAVE_GETENV=1 -DHAVE_STDIO_H=1 -DHAVE_MEMORY_H=1 -DHAVE_MALLOC=1 -DHAVE_FREE=1 -DHAVE_LONG_LONG_INT=1 -DHAVE_LONG_FILE_NAMES=1 -DHAVE_LIMITS_H=1 -DHAVE_LIBGEN_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_DLFCN_H=1 -I$(sc68path)/file68 -I$(sc68path)/file68/sc68 -I$(sc68path)/unice68 -I$(sc68path)/libsc68 -I$(sc68path)/libsc68/sc68 -I$(sc68path)/libsc68/emu68 -I@top_srcdir@/include
+
+endif
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/Makefile.in Added

@@ -0,0 +1,1466 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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/sc68
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+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, filesdir }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkglibdir)" \
+	"$(DESTDIR)$(sc68replaydatadir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+@HAVE_SC68_TRUE@in_sc68_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am__in_sc68_la_SOURCES_DIST = in_sc68.c file68/src/gzip68.c \
+	file68/src/vfs68.c file68/src/ice68.c file68/src/vfs68_ao.c \
+	file68/src/vfs68_null.c file68/src/replay.inc.h \
+	file68/src/msg68.c file68/src/timedb68.c \
+	file68/src/timedb.inc.h file68/src/init68.c \
+	file68/src/vfs68_z.c file68/src/replay68.c \
+	file68/src/registry68.c file68/src/uri68.c file68/src/rsc68.c \
+	file68/src/vfs68_fd.c file68/src/vfs68_file.c \
+	file68/src/vfs68_mem.c file68/src/file68.c \
+	file68/src/string68.c file68/src/endian68.c \
+	file68/src/vfs68_curl.c file68/src/option68.c \
+	file68/src/ferror68.c file68/sc68/file68_vfs_ao.h \
+	file68/sc68/file68.h file68/sc68/file68_ord.h \
+	file68/sc68/file68_tag.h file68/sc68/file68_vfs_curl.h \
+	file68/sc68/file68_str.h file68/sc68/file68_features.h \
+	file68/sc68/file68_vfs_def.h file68/sc68/file68_msg.h \
+	file68/sc68/file68_vfs_file.h file68/sc68/file68_api.h \
+	file68/sc68/file68_chk.h file68/sc68/file68_ice.h \
+	file68/sc68/file68_err.h file68/sc68/file68_opt.h \
+	file68/sc68/file68_vfs_mem.h file68/sc68/file68_rsc.h \
+	file68/sc68/file68_zip.h file68/sc68/file68_vfs_null.h \
+	file68/sc68/file68_tdb.h file68/sc68/file68_reg.h \
+	file68/sc68/file68_vfs_fd.h file68/sc68/file68_vfs.h \
+	file68/sc68/file68_uri.h file68/sc68/file68_vfs_z.h \
+	libsc68/dial68/dial68.h libsc68/dial68/dial68.c \
+	libsc68/dial68/dial_conf.c libsc68/dial68/dial_finf.c \
+	libsc68/dial68/dial_tsel.c unice68/unice68.h \
+	unice68/unice68_unpack.c unice68/unice68_pack.c \
+	unice68/unice68_version.c libsc68/conf68.c libsc68/api68.c \
+	libsc68/mixer68.c libsc68/io68/io68_api.h \
+	libsc68/io68/paulaemul.c libsc68/io68/io68.h \
+	libsc68/io68/shifter_io.h libsc68/io68/ym_envel.c \
+	libsc68/io68/mfp_io.h libsc68/io68/ym_dump.h \
+	libsc68/io68/ym_blep.h libsc68/io68/ymemul.c \
+	libsc68/io68/mwemul.h libsc68/io68/ymoutorg.h \
+	libsc68/io68/shifter_io.c libsc68/io68/paula_io.c \
+	libsc68/io68/mw_io.c libsc68/io68/mw_io.h \
+	libsc68/io68/mfpemul.h libsc68/io68/paula_io.h \
+	libsc68/io68/ym_dump.c libsc68/io68/mfp_io.c \
+	libsc68/io68/mwemul.c libsc68/io68/paulaemul.h \
+	libsc68/io68/ym_fixed_vol.h libsc68/io68/ym_io.c \
+	libsc68/io68/io68.c libsc68/io68/ym_puls.h \
+	libsc68/io68/ym_blep.c libsc68/io68/ymemul.h \
+	libsc68/io68/ymout2k9.h libsc68/io68/default.h \
+	libsc68/io68/mfpemul.c libsc68/io68/ym_io.h \
+	libsc68/io68/ym_puls.c libsc68/libsc68.c \
+	libsc68/emu68/inl68_datamove.h libsc68/emu68/lines68.c \
+	libsc68/emu68/lines68.h libsc68/emu68/inl68_bitmanip.h \
+	libsc68/emu68/inst68.h libsc68/emu68/inl68_progctrl.h \
+	libsc68/emu68/cc68.h libsc68/emu68/macro68.h \
+	libsc68/emu68/mem68.h libsc68/emu68/error68.h \
+	libsc68/emu68/ioplug68.c libsc68/emu68/inl68_logic.h \
+	libsc68/emu68/mem68.c libsc68/emu68/assert68.h \
+	libsc68/emu68/getea68.c libsc68/emu68/inl68_exception.h \
+	libsc68/emu68/inst68.c libsc68/emu68/emu68.c \
+	libsc68/emu68/srdef68.h libsc68/emu68/type68.h \
+	libsc68/emu68/struct68.h libsc68/emu68/error68.c \
+	libsc68/emu68/excep68.h libsc68/emu68/emu68.h \
+	libsc68/emu68/inl68_shifting.h \
+	libsc68/emu68/inl68_arithmetic.h libsc68/emu68/inl68_bcd.h \
+	libsc68/emu68/inl68_systctrl.h libsc68/emu68/emu68_api.h \
+	libsc68/emu68/ioplug68.h libsc68/sc68/trap68.h \
+	libsc68/sc68/conf68.h libsc68/sc68/sc68.h \
+	libsc68/sc68/mixer68.h desa68/desa68.h desa68/desa68.c
+am__dirstamp = $(am__leading_dot)dirstamp
+@HAVE_SC68_TRUE@am_in_sc68_la_OBJECTS = in_sc68_la-in_sc68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-gzip68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-vfs68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-ice68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-vfs68_ao.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-vfs68_null.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-msg68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-timedb68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-init68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-vfs68_z.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-replay68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-registry68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-uri68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-rsc68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-vfs68_fd.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-vfs68_file.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-vfs68_mem.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-file68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-string68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-endian68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-vfs68_curl.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-option68.lo \
+@HAVE_SC68_TRUE@	file68/src/in_sc68_la-ferror68.lo \
+@HAVE_SC68_TRUE@	libsc68/dial68/in_sc68_la-dial68.lo \
+@HAVE_SC68_TRUE@	libsc68/dial68/in_sc68_la-dial_conf.lo \
+@HAVE_SC68_TRUE@	libsc68/dial68/in_sc68_la-dial_finf.lo \
+@HAVE_SC68_TRUE@	libsc68/dial68/in_sc68_la-dial_tsel.lo \
+@HAVE_SC68_TRUE@	unice68/in_sc68_la-unice68_unpack.lo \
+@HAVE_SC68_TRUE@	unice68/in_sc68_la-unice68_pack.lo \
+@HAVE_SC68_TRUE@	unice68/in_sc68_la-unice68_version.lo \
+@HAVE_SC68_TRUE@	libsc68/in_sc68_la-conf68.lo \
+@HAVE_SC68_TRUE@	libsc68/in_sc68_la-api68.lo \
+@HAVE_SC68_TRUE@	libsc68/in_sc68_la-mixer68.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-paulaemul.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-ym_envel.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-ymemul.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-shifter_io.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-paula_io.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-mw_io.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-ym_dump.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-mfp_io.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-mwemul.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-ym_io.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-io68.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-ym_blep.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-mfpemul.lo \
+@HAVE_SC68_TRUE@	libsc68/io68/in_sc68_la-ym_puls.lo \
+@HAVE_SC68_TRUE@	libsc68/in_sc68_la-libsc68.lo \
+@HAVE_SC68_TRUE@	libsc68/emu68/in_sc68_la-lines68.lo \
+@HAVE_SC68_TRUE@	libsc68/emu68/in_sc68_la-ioplug68.lo \
+@HAVE_SC68_TRUE@	libsc68/emu68/in_sc68_la-mem68.lo \
+@HAVE_SC68_TRUE@	libsc68/emu68/in_sc68_la-getea68.lo \
+@HAVE_SC68_TRUE@	libsc68/emu68/in_sc68_la-inst68.lo \
+@HAVE_SC68_TRUE@	libsc68/emu68/in_sc68_la-emu68.lo \
+@HAVE_SC68_TRUE@	libsc68/emu68/in_sc68_la-error68.lo \
+@HAVE_SC68_TRUE@	desa68/in_sc68_la-desa68.lo
+in_sc68_la_OBJECTS = $(am_in_sc68_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+in_sc68_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(in_sc68_la_CFLAGS) \
+	$(CFLAGS) $(in_sc68_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_SC68_TRUE@am_in_sc68_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(in_sc68_la_SOURCES)
+DIST_SOURCES = $(am__in_sc68_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+DATA = $(sc68replaydata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in COPYING
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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@
+sc68path = @top_srcdir@/plugins/sc68
+sc68replaydata = \
+	file68/data68/Replay/aenigmatica.bin\
+	file68/data68/Replay/alteredbeast.bin\
+	file68/data68/Replay/armalyte.bin\
+	file68/data68/Replay/asidifier.bin\
+	file68/data68/Replay/azidifier.bin\
+	file68/data68/Replay/bendaglish.deli.bin\
+	file68/data68/Replay/big.bin\
+	file68/data68/Replay/blipblop.bin\
+	file68/data68/Replay/blipp079.bin\
+	file68/data68/Replay/bs22.bin\
+	file68/data68/Replay/cabal.bin\
+	file68/data68/Replay/chipmon2.bin\
+	file68/data68/Replay/cosotfmx.bin\
+	file68/data68/Replay/crapman1.bin\
+	file68/data68/Replay/crapman2.bin\
+	file68/data68/Replay/deltamusic1.bin\
+	file68/data68/Replay/deltamusic2.bin\
+	file68/data68/Replay/digitfmx.bin\
+	file68/data68/Replay/dmu.bin\
+	file68/data68/Replay/dwaga.bin\
+	file68/data68/Replay/dyter07.bin\
+	file68/data68/Replay/elf.bin\
+	file68/data68/Replay/fc13_14.bin\
+	file68/data68/Replay/fireice.bin\
+	file68/data68/Replay/fred.bin\
+	file68/data68/Replay/gemx.bin\
+	file68/data68/Replay/harlequin.bin\
+	file68/data68/Replay/hippel-coso_note.deli.bin\
+	file68/data68/Replay/hpn-jam.bin\
+	file68/data68/Replay/huelsbeck.bin\
+	file68/data68/Replay/huntforredoct.bin\
+	file68/data68/Replay/ivanhoe.bin\
+	file68/data68/Replay/jamcracker10.bin\
+	file68/data68/Replay/jamcrackerpro.bin\
+	file68/data68/Replay/lastninja3.bin\
+	file68/data68/Replay/lastninjaiii.bin\
+	file68/data68/Replay/lcd.bin\
+	file68/data68/Replay/lx_mmme.bin\
+	file68/data68/Replay/mcoder.bin\
+	file68/data68/Replay/megatizer.bin\
+	file68/data68/Replay/metrocross.bin\
+	file68/data68/Replay/midi.bin\
+	file68/data68/Replay/mmme.bin\
+	file68/data68/Replay/mmmesid.bin\
+	file68/data68/Replay/mon.bin\
+	file68/data68/Replay/mon_old.deli.bin\
+	file68/data68/Replay/musmon1.bin\
+	file68/data68/Replay/musmon2.bin\
+	file68/data68/Replay/ninjaremix.bin\
+	file68/data68/Replay/ninjatfmx.bin\
+	file68/data68/Replay/nobuddiesland.bin\
+	file68/data68/Replay/none.bin\
+	file68/data68/Replay/note.bin\
+	file68/data68/Replay/note2.bin\
+	file68/data68/Replay/page.bin\
+	file68/data68/Replay/protracker.bin\
+	file68/data68/Replay/psg1.bin\
+	file68/data68/Replay/psgtrackerv2.bin\
+	file68/data68/Replay/puma.bin\
+	file68/data68/Replay/puma2.bin\
+	file68/data68/Replay/quartet.bin\
+	file68/data68/Replay/quartet_mindbomb.bin\
+	file68/data68/Replay/realms.bin\
+	file68/data68/Replay/robhubbard.deli.bin\
+	file68/data68/Replay/rollingronny.bin\
+	file68/data68/Replay/shadowdancer.bin\
+	file68/data68/Replay/sidmon1.bin\
+	file68/data68/Replay/sidmon2.bin\
+	file68/data68/Replay/sidsound.bin\
+	file68/data68/Replay/sndh_ice.bin\
+	file68/data68/Replay/soundfx.bin\
+	file68/data68/Replay/spacecrusade.bin\
+	file68/data68/Replay/spacegun.bin\
+	file68/data68/Replay/ssd1.bin\
+	file68/data68/Replay/stos.bin\
+	file68/data68/Replay/synthiv.bin\
+	file68/data68/Replay/tao_digi.bin\
+	file68/data68/Replay/tao_hubbard.bin\
+	file68/data68/Replay/tao_ms211.bin\
+	file68/data68/Replay/tao_ms25.bin\
+	file68/data68/Replay/tao_ms27.bin\
+	file68/data68/Replay/tao_tsd.bin\
+	file68/data68/Replay/tcbtracker.bin\
+	file68/data68/Replay/test.bin\
+	file68/data68/Replay/tfmx.bin\
+	file68/data68/Replay/tfmx_aga.bin\
+	file68/data68/Replay/tfmx_old.bin\
+	file68/data68/Replay/tfmx_st.bin\
+	file68/data68/Replay/timerc.bin\
+	file68/data68/Replay/toki.bin\
+	file68/data68/Replay/tsd1.bin\
+	file68/data68/Replay/utopia.bin\
+	file68/data68/Replay/vikingchild.bin\
+	file68/data68/Replay/xbiossound.bin\
+	file68/data68/Replay/zonewarrior.bin
+
+EXTRA_DIST = \
+	$(sc68replaydata)\
+	libsc68/emu68/lines/table.c\
+	libsc68/emu68/lines/lineE.c\
+	libsc68/emu68/lines/line3.c\
+	libsc68/emu68/lines/line6.c\
+	libsc68/emu68/lines/lineB.c\
+	libsc68/emu68/lines/line5.c\
+	libsc68/emu68/lines/line8.c\
+	libsc68/emu68/lines/lineC.c\
+	libsc68/emu68/lines/line1.c\
+	libsc68/emu68/lines/lineD.c\
+	libsc68/emu68/lines/lineF.c\
+	libsc68/emu68/lines/line2.c\
+	libsc68/emu68/lines/lineA.c\
+	libsc68/emu68/lines/line0.c\
+	libsc68/emu68/lines/line4.c\
+	libsc68/emu68/lines/line7.c\
+	libsc68/emu68/lines/line9.c\
+	libsc68/emu68/line3_68.c\
+	libsc68/emu68/line7_68.c\
+	libsc68/emu68/line5_68.c\
+	libsc68/emu68/lineC_68.c\
+	libsc68/emu68/lineB_68.c\
+	libsc68/emu68/line9_68.c\
+	libsc68/emu68/lineE_68.c\
+	libsc68/emu68/line8_68.c\
+	libsc68/emu68/line4_68.c\
+	libsc68/emu68/line6_68.c\
+	libsc68/emu68/lineF_68.c\
+	libsc68/emu68/lineA_68.c\
+	libsc68/emu68/line0_68.c\
+	libsc68/emu68/lineD_68.c\
+	libsc68/emu68/line1_68.c\
+	libsc68/emu68/line2_68.c\
+	libsc68/io68/ym_linear_table.c\
+	libsc68/io68/ym_atarist_table.c\
+	libsc68/emu68/crc32.c\
+	libsc68/emu68/table68.c
+
+@HAVE_SC68_TRUE@pkglib_LTLIBRARIES = in_sc68.la
+@HAVE_SC68_TRUE@sc68replaydatadir = $(libdir)/deadbeef/data68/Replay
+@HAVE_SC68_TRUE@sc68replaydata_DATA = $(sc68replaydata)
+@HAVE_SC68_TRUE@in_sc68_la_SOURCES = in_sc68.c\
+@HAVE_SC68_TRUE@	file68/src/gzip68.c\
+@HAVE_SC68_TRUE@	file68/src/vfs68.c\
+@HAVE_SC68_TRUE@	file68/src/ice68.c\
+@HAVE_SC68_TRUE@	file68/src/vfs68_ao.c\
+@HAVE_SC68_TRUE@	file68/src/vfs68_null.c\
+@HAVE_SC68_TRUE@	file68/src/replay.inc.h\
+@HAVE_SC68_TRUE@	file68/src/msg68.c\
+@HAVE_SC68_TRUE@	file68/src/timedb68.c\
+@HAVE_SC68_TRUE@	file68/src/timedb.inc.h\
+@HAVE_SC68_TRUE@	file68/src/init68.c\
+@HAVE_SC68_TRUE@	file68/src/vfs68_z.c\
+@HAVE_SC68_TRUE@	file68/src/replay68.c\
+@HAVE_SC68_TRUE@	file68/src/registry68.c\
+@HAVE_SC68_TRUE@	file68/src/uri68.c\
+@HAVE_SC68_TRUE@	file68/src/rsc68.c\
+@HAVE_SC68_TRUE@	file68/src/vfs68_fd.c\
+@HAVE_SC68_TRUE@	file68/src/vfs68_file.c\
+@HAVE_SC68_TRUE@	file68/src/vfs68_mem.c\
+@HAVE_SC68_TRUE@	file68/src/file68.c\
+@HAVE_SC68_TRUE@	file68/src/string68.c\
+@HAVE_SC68_TRUE@	file68/src/endian68.c\
+@HAVE_SC68_TRUE@	file68/src/vfs68_curl.c\
+@HAVE_SC68_TRUE@	file68/src/option68.c\
+@HAVE_SC68_TRUE@	file68/src/ferror68.c\
+@HAVE_SC68_TRUE@	file68/sc68/file68_vfs_ao.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_ord.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_tag.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_vfs_curl.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_str.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_features.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_vfs_def.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_msg.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_vfs_file.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_api.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_chk.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_ice.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_err.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_opt.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_vfs_mem.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_rsc.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_zip.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_vfs_null.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_tdb.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_reg.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_vfs_fd.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_vfs.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_uri.h\
+@HAVE_SC68_TRUE@	file68/sc68/file68_vfs_z.h\
+@HAVE_SC68_TRUE@	libsc68/dial68/dial68.h\
+@HAVE_SC68_TRUE@	libsc68/dial68/dial68.c\
+@HAVE_SC68_TRUE@	libsc68/dial68/dial_conf.c\
+@HAVE_SC68_TRUE@	libsc68/dial68/dial_finf.c\
+@HAVE_SC68_TRUE@	libsc68/dial68/dial_tsel.c\
+@HAVE_SC68_TRUE@	unice68/unice68.h\
+@HAVE_SC68_TRUE@	unice68/unice68_unpack.c\
+@HAVE_SC68_TRUE@	unice68/unice68_pack.c\
+@HAVE_SC68_TRUE@	unice68/unice68_version.c\
+@HAVE_SC68_TRUE@	libsc68/conf68.c\
+@HAVE_SC68_TRUE@	libsc68/api68.c\
+@HAVE_SC68_TRUE@	libsc68/mixer68.c\
+@HAVE_SC68_TRUE@	libsc68/io68/io68_api.h\
+@HAVE_SC68_TRUE@	libsc68/io68/paulaemul.c\
+@HAVE_SC68_TRUE@	libsc68/io68/io68.h\
+@HAVE_SC68_TRUE@	libsc68/io68/shifter_io.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ym_envel.c\
+@HAVE_SC68_TRUE@	libsc68/io68/mfp_io.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ym_dump.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ym_blep.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ymemul.c\
+@HAVE_SC68_TRUE@	libsc68/io68/mwemul.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ymoutorg.h\
+@HAVE_SC68_TRUE@	libsc68/io68/shifter_io.c\
+@HAVE_SC68_TRUE@	libsc68/io68/paula_io.c\
+@HAVE_SC68_TRUE@	libsc68/io68/mw_io.c\
+@HAVE_SC68_TRUE@	libsc68/io68/mw_io.h\
+@HAVE_SC68_TRUE@	libsc68/io68/mfpemul.h\
+@HAVE_SC68_TRUE@	libsc68/io68/paula_io.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ym_dump.c\
+@HAVE_SC68_TRUE@	libsc68/io68/mfp_io.c\
+@HAVE_SC68_TRUE@	libsc68/io68/mwemul.c\
+@HAVE_SC68_TRUE@	libsc68/io68/paulaemul.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ym_fixed_vol.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ym_io.c\
+@HAVE_SC68_TRUE@	libsc68/io68/io68.c\
+@HAVE_SC68_TRUE@	libsc68/io68/ym_puls.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ym_blep.c\
+@HAVE_SC68_TRUE@	libsc68/io68/ymemul.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ymout2k9.h\
+@HAVE_SC68_TRUE@	libsc68/io68/default.h\
+@HAVE_SC68_TRUE@	libsc68/io68/mfpemul.c\
+@HAVE_SC68_TRUE@	libsc68/io68/ym_io.h\
+@HAVE_SC68_TRUE@	libsc68/io68/ym_puls.c\
+@HAVE_SC68_TRUE@	libsc68/libsc68.c\
+@HAVE_SC68_TRUE@	libsc68/emu68/inl68_datamove.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/lines68.c\
+@HAVE_SC68_TRUE@	libsc68/emu68/lines68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/inl68_bitmanip.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/inst68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/inl68_progctrl.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/cc68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/macro68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/mem68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/error68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/ioplug68.c\
+@HAVE_SC68_TRUE@	libsc68/emu68/inl68_logic.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/mem68.c\
+@HAVE_SC68_TRUE@	libsc68/emu68/assert68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/getea68.c\
+@HAVE_SC68_TRUE@	libsc68/emu68/inl68_exception.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/inst68.c\
+@HAVE_SC68_TRUE@	libsc68/emu68/emu68.c\
+@HAVE_SC68_TRUE@	libsc68/emu68/srdef68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/type68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/struct68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/error68.c\
+@HAVE_SC68_TRUE@	libsc68/emu68/excep68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/emu68.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/inl68_shifting.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/inl68_arithmetic.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/inl68_bcd.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/inl68_systctrl.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/emu68_api.h\
+@HAVE_SC68_TRUE@	libsc68/emu68/ioplug68.h\
+@HAVE_SC68_TRUE@	libsc68/sc68/trap68.h\
+@HAVE_SC68_TRUE@	libsc68/sc68/conf68.h\
+@HAVE_SC68_TRUE@	libsc68/sc68/sc68.h\
+@HAVE_SC68_TRUE@	libsc68/sc68/mixer68.h\
+@HAVE_SC68_TRUE@	desa68/desa68.h\
+@HAVE_SC68_TRUE@	desa68/desa68.c
+
+@HAVE_SC68_TRUE@in_sc68_la_LDFLAGS = -module -avoid-version
+@HAVE_SC68_TRUE@in_sc68_la_LIBADD = $(ZLIB_LIBS)
+@HAVE_SC68_TRUE@in_sc68_la_CFLAGS = $(CFLAGS) -std=c99 -DSC68_SHARED_DATA_PATH='"."' -DHAVE_GETENV=1 -DHAVE_CONFIG_CONFIG68_H=1 -DHAVE_STRING_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STDINT_H=1 -DHAVE_ASSERT_H -DHAVE_LIMITS_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_BASENAME=1 -DEMU68_MONOLITIC=1 -DPACKAGE_VERNUM=300 -DEMU68_EXPORT -DNDEBUG=1 -DNDEBUG_LIBSC68=1 -DUSE_FILE68=1 -DUSE_UNICE68=1 -DHAVE_INTMAX_T -DHAVE_GETENV=1 -DHAVE_STDIO_H=1 -DHAVE_MEMORY_H=1 -DHAVE_MALLOC=1 -DHAVE_FREE=1 -DHAVE_LONG_LONG_INT=1 -DHAVE_LONG_FILE_NAMES=1 -DHAVE_LIMITS_H=1 -DHAVE_LIBGEN_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_DLFCN_H=1 -I$(sc68path)/file68 -I$(sc68path)/file68/sc68 -I$(sc68path)/unice68 -I$(sc68path)/libsc68 -I$(sc68path)/libsc68/sc68 -I$(sc68path)/libsc68/emu68 -I@top_srcdir@/include
+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 --ignore-deps plugins/sc68/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps plugins/sc68/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)
+	@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 " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
+	 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)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+file68/src/$(am__dirstamp):
+	@$(MKDIR_P) file68/src
+	@: > file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-gzip68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-vfs68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-ice68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-vfs68_ao.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-vfs68_null.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-msg68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-timedb68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-init68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-vfs68_z.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-replay68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-registry68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-uri68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-rsc68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-vfs68_fd.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-vfs68_file.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-vfs68_mem.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-file68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-string68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-endian68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-vfs68_curl.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-option68.lo: file68/src/$(am__dirstamp)
+file68/src/in_sc68_la-ferror68.lo: file68/src/$(am__dirstamp)
+libsc68/dial68/$(am__dirstamp):
+	@$(MKDIR_P) libsc68/dial68
+	@: > libsc68/dial68/$(am__dirstamp)
+libsc68/dial68/in_sc68_la-dial68.lo: libsc68/dial68/$(am__dirstamp)
+libsc68/dial68/in_sc68_la-dial_conf.lo: \
+	libsc68/dial68/$(am__dirstamp)
+libsc68/dial68/in_sc68_la-dial_finf.lo: \
+	libsc68/dial68/$(am__dirstamp)
+libsc68/dial68/in_sc68_la-dial_tsel.lo: \
+	libsc68/dial68/$(am__dirstamp)
+unice68/$(am__dirstamp):
+	@$(MKDIR_P) unice68
+	@: > unice68/$(am__dirstamp)
+unice68/in_sc68_la-unice68_unpack.lo: unice68/$(am__dirstamp)
+unice68/in_sc68_la-unice68_pack.lo: unice68/$(am__dirstamp)
+unice68/in_sc68_la-unice68_version.lo: unice68/$(am__dirstamp)
+libsc68/$(am__dirstamp):
+	@$(MKDIR_P) libsc68
+	@: > libsc68/$(am__dirstamp)
+libsc68/in_sc68_la-conf68.lo: libsc68/$(am__dirstamp)
+libsc68/in_sc68_la-api68.lo: libsc68/$(am__dirstamp)
+libsc68/in_sc68_la-mixer68.lo: libsc68/$(am__dirstamp)
+libsc68/io68/$(am__dirstamp):
+	@$(MKDIR_P) libsc68/io68
+	@: > libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-paulaemul.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-ym_envel.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-ymemul.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-shifter_io.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-paula_io.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-mw_io.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-ym_dump.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-mfp_io.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-mwemul.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-ym_io.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-io68.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-ym_blep.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-mfpemul.lo: libsc68/io68/$(am__dirstamp)
+libsc68/io68/in_sc68_la-ym_puls.lo: libsc68/io68/$(am__dirstamp)
+libsc68/in_sc68_la-libsc68.lo: libsc68/$(am__dirstamp)
+libsc68/emu68/$(am__dirstamp):
+	@$(MKDIR_P) libsc68/emu68
+	@: > libsc68/emu68/$(am__dirstamp)
+libsc68/emu68/in_sc68_la-lines68.lo: libsc68/emu68/$(am__dirstamp)
+libsc68/emu68/in_sc68_la-ioplug68.lo: libsc68/emu68/$(am__dirstamp)
+libsc68/emu68/in_sc68_la-mem68.lo: libsc68/emu68/$(am__dirstamp)
+libsc68/emu68/in_sc68_la-getea68.lo: libsc68/emu68/$(am__dirstamp)
+libsc68/emu68/in_sc68_la-inst68.lo: libsc68/emu68/$(am__dirstamp)
+libsc68/emu68/in_sc68_la-emu68.lo: libsc68/emu68/$(am__dirstamp)
+libsc68/emu68/in_sc68_la-error68.lo: libsc68/emu68/$(am__dirstamp)
+desa68/$(am__dirstamp):
+	@$(MKDIR_P) desa68
+	@: > desa68/$(am__dirstamp)
+desa68/in_sc68_la-desa68.lo: desa68/$(am__dirstamp)
+
+in_sc68.la: $(in_sc68_la_OBJECTS) $(in_sc68_la_DEPENDENCIES) $(EXTRA_in_sc68_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(in_sc68_la_LINK) $(am_in_sc68_la_rpath) $(in_sc68_la_OBJECTS) $(in_sc68_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f desa68/*.$(OBJEXT)
+	-rm -f desa68/*.lo
+	-rm -f file68/src/*.$(OBJEXT)
+	-rm -f file68/src/*.lo
+	-rm -f libsc68/*.$(OBJEXT)
+	-rm -f libsc68/*.lo
+	-rm -f libsc68/dial68/*.$(OBJEXT)
+	-rm -f libsc68/dial68/*.lo
+	-rm -f libsc68/emu68/*.$(OBJEXT)
+	-rm -f libsc68/emu68/*.lo
+	-rm -f libsc68/io68/*.$(OBJEXT)
+	-rm -f libsc68/io68/*.lo
+	-rm -f unice68/*.$(OBJEXT)
+	-rm -f unice68/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+in_sc68_la-in_sc68.lo: in_sc68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o in_sc68_la-in_sc68.lo `test -f 'in_sc68.c' || echo '$(srcdir)/'`in_sc68.c
+
+file68/src/in_sc68_la-gzip68.lo: file68/src/gzip68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-gzip68.lo `test -f 'file68/src/gzip68.c' || echo '$(srcdir)/'`file68/src/gzip68.c
+
+file68/src/in_sc68_la-vfs68.lo: file68/src/vfs68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-vfs68.lo `test -f 'file68/src/vfs68.c' || echo '$(srcdir)/'`file68/src/vfs68.c
+
+file68/src/in_sc68_la-ice68.lo: file68/src/ice68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-ice68.lo `test -f 'file68/src/ice68.c' || echo '$(srcdir)/'`file68/src/ice68.c
+
+file68/src/in_sc68_la-vfs68_ao.lo: file68/src/vfs68_ao.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-vfs68_ao.lo `test -f 'file68/src/vfs68_ao.c' || echo '$(srcdir)/'`file68/src/vfs68_ao.c
+
+file68/src/in_sc68_la-vfs68_null.lo: file68/src/vfs68_null.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-vfs68_null.lo `test -f 'file68/src/vfs68_null.c' || echo '$(srcdir)/'`file68/src/vfs68_null.c
+
+file68/src/in_sc68_la-msg68.lo: file68/src/msg68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-msg68.lo `test -f 'file68/src/msg68.c' || echo '$(srcdir)/'`file68/src/msg68.c
+
+file68/src/in_sc68_la-timedb68.lo: file68/src/timedb68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-timedb68.lo `test -f 'file68/src/timedb68.c' || echo '$(srcdir)/'`file68/src/timedb68.c
+
+file68/src/in_sc68_la-init68.lo: file68/src/init68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-init68.lo `test -f 'file68/src/init68.c' || echo '$(srcdir)/'`file68/src/init68.c
+
+file68/src/in_sc68_la-vfs68_z.lo: file68/src/vfs68_z.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-vfs68_z.lo `test -f 'file68/src/vfs68_z.c' || echo '$(srcdir)/'`file68/src/vfs68_z.c
+
+file68/src/in_sc68_la-replay68.lo: file68/src/replay68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-replay68.lo `test -f 'file68/src/replay68.c' || echo '$(srcdir)/'`file68/src/replay68.c
+
+file68/src/in_sc68_la-registry68.lo: file68/src/registry68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-registry68.lo `test -f 'file68/src/registry68.c' || echo '$(srcdir)/'`file68/src/registry68.c
+
+file68/src/in_sc68_la-uri68.lo: file68/src/uri68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-uri68.lo `test -f 'file68/src/uri68.c' || echo '$(srcdir)/'`file68/src/uri68.c
+
+file68/src/in_sc68_la-rsc68.lo: file68/src/rsc68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-rsc68.lo `test -f 'file68/src/rsc68.c' || echo '$(srcdir)/'`file68/src/rsc68.c
+
+file68/src/in_sc68_la-vfs68_fd.lo: file68/src/vfs68_fd.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-vfs68_fd.lo `test -f 'file68/src/vfs68_fd.c' || echo '$(srcdir)/'`file68/src/vfs68_fd.c
+
+file68/src/in_sc68_la-vfs68_file.lo: file68/src/vfs68_file.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-vfs68_file.lo `test -f 'file68/src/vfs68_file.c' || echo '$(srcdir)/'`file68/src/vfs68_file.c
+
+file68/src/in_sc68_la-vfs68_mem.lo: file68/src/vfs68_mem.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-vfs68_mem.lo `test -f 'file68/src/vfs68_mem.c' || echo '$(srcdir)/'`file68/src/vfs68_mem.c
+
+file68/src/in_sc68_la-file68.lo: file68/src/file68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-file68.lo `test -f 'file68/src/file68.c' || echo '$(srcdir)/'`file68/src/file68.c
+
+file68/src/in_sc68_la-string68.lo: file68/src/string68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-string68.lo `test -f 'file68/src/string68.c' || echo '$(srcdir)/'`file68/src/string68.c
+
+file68/src/in_sc68_la-endian68.lo: file68/src/endian68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-endian68.lo `test -f 'file68/src/endian68.c' || echo '$(srcdir)/'`file68/src/endian68.c
+
+file68/src/in_sc68_la-vfs68_curl.lo: file68/src/vfs68_curl.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-vfs68_curl.lo `test -f 'file68/src/vfs68_curl.c' || echo '$(srcdir)/'`file68/src/vfs68_curl.c
+
+file68/src/in_sc68_la-option68.lo: file68/src/option68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-option68.lo `test -f 'file68/src/option68.c' || echo '$(srcdir)/'`file68/src/option68.c
+
+file68/src/in_sc68_la-ferror68.lo: file68/src/ferror68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o file68/src/in_sc68_la-ferror68.lo `test -f 'file68/src/ferror68.c' || echo '$(srcdir)/'`file68/src/ferror68.c
+
+libsc68/dial68/in_sc68_la-dial68.lo: libsc68/dial68/dial68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/dial68/in_sc68_la-dial68.lo `test -f 'libsc68/dial68/dial68.c' || echo '$(srcdir)/'`libsc68/dial68/dial68.c
+
+libsc68/dial68/in_sc68_la-dial_conf.lo: libsc68/dial68/dial_conf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/dial68/in_sc68_la-dial_conf.lo `test -f 'libsc68/dial68/dial_conf.c' || echo '$(srcdir)/'`libsc68/dial68/dial_conf.c
+
+libsc68/dial68/in_sc68_la-dial_finf.lo: libsc68/dial68/dial_finf.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/dial68/in_sc68_la-dial_finf.lo `test -f 'libsc68/dial68/dial_finf.c' || echo '$(srcdir)/'`libsc68/dial68/dial_finf.c
+
+libsc68/dial68/in_sc68_la-dial_tsel.lo: libsc68/dial68/dial_tsel.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/dial68/in_sc68_la-dial_tsel.lo `test -f 'libsc68/dial68/dial_tsel.c' || echo '$(srcdir)/'`libsc68/dial68/dial_tsel.c
+
+unice68/in_sc68_la-unice68_unpack.lo: unice68/unice68_unpack.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o unice68/in_sc68_la-unice68_unpack.lo `test -f 'unice68/unice68_unpack.c' || echo '$(srcdir)/'`unice68/unice68_unpack.c
+
+unice68/in_sc68_la-unice68_pack.lo: unice68/unice68_pack.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o unice68/in_sc68_la-unice68_pack.lo `test -f 'unice68/unice68_pack.c' || echo '$(srcdir)/'`unice68/unice68_pack.c
+
+unice68/in_sc68_la-unice68_version.lo: unice68/unice68_version.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o unice68/in_sc68_la-unice68_version.lo `test -f 'unice68/unice68_version.c' || echo '$(srcdir)/'`unice68/unice68_version.c
+
+libsc68/in_sc68_la-conf68.lo: libsc68/conf68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/in_sc68_la-conf68.lo `test -f 'libsc68/conf68.c' || echo '$(srcdir)/'`libsc68/conf68.c
+
+libsc68/in_sc68_la-api68.lo: libsc68/api68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/in_sc68_la-api68.lo `test -f 'libsc68/api68.c' || echo '$(srcdir)/'`libsc68/api68.c
+
+libsc68/in_sc68_la-mixer68.lo: libsc68/mixer68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/in_sc68_la-mixer68.lo `test -f 'libsc68/mixer68.c' || echo '$(srcdir)/'`libsc68/mixer68.c
+
+libsc68/io68/in_sc68_la-paulaemul.lo: libsc68/io68/paulaemul.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-paulaemul.lo `test -f 'libsc68/io68/paulaemul.c' || echo '$(srcdir)/'`libsc68/io68/paulaemul.c
+
+libsc68/io68/in_sc68_la-ym_envel.lo: libsc68/io68/ym_envel.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-ym_envel.lo `test -f 'libsc68/io68/ym_envel.c' || echo '$(srcdir)/'`libsc68/io68/ym_envel.c
+
+libsc68/io68/in_sc68_la-ymemul.lo: libsc68/io68/ymemul.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-ymemul.lo `test -f 'libsc68/io68/ymemul.c' || echo '$(srcdir)/'`libsc68/io68/ymemul.c
+
+libsc68/io68/in_sc68_la-shifter_io.lo: libsc68/io68/shifter_io.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-shifter_io.lo `test -f 'libsc68/io68/shifter_io.c' || echo '$(srcdir)/'`libsc68/io68/shifter_io.c
+
+libsc68/io68/in_sc68_la-paula_io.lo: libsc68/io68/paula_io.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-paula_io.lo `test -f 'libsc68/io68/paula_io.c' || echo '$(srcdir)/'`libsc68/io68/paula_io.c
+
+libsc68/io68/in_sc68_la-mw_io.lo: libsc68/io68/mw_io.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-mw_io.lo `test -f 'libsc68/io68/mw_io.c' || echo '$(srcdir)/'`libsc68/io68/mw_io.c
+
+libsc68/io68/in_sc68_la-ym_dump.lo: libsc68/io68/ym_dump.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-ym_dump.lo `test -f 'libsc68/io68/ym_dump.c' || echo '$(srcdir)/'`libsc68/io68/ym_dump.c
+
+libsc68/io68/in_sc68_la-mfp_io.lo: libsc68/io68/mfp_io.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-mfp_io.lo `test -f 'libsc68/io68/mfp_io.c' || echo '$(srcdir)/'`libsc68/io68/mfp_io.c
+
+libsc68/io68/in_sc68_la-mwemul.lo: libsc68/io68/mwemul.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-mwemul.lo `test -f 'libsc68/io68/mwemul.c' || echo '$(srcdir)/'`libsc68/io68/mwemul.c
+
+libsc68/io68/in_sc68_la-ym_io.lo: libsc68/io68/ym_io.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-ym_io.lo `test -f 'libsc68/io68/ym_io.c' || echo '$(srcdir)/'`libsc68/io68/ym_io.c
+
+libsc68/io68/in_sc68_la-io68.lo: libsc68/io68/io68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-io68.lo `test -f 'libsc68/io68/io68.c' || echo '$(srcdir)/'`libsc68/io68/io68.c
+
+libsc68/io68/in_sc68_la-ym_blep.lo: libsc68/io68/ym_blep.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-ym_blep.lo `test -f 'libsc68/io68/ym_blep.c' || echo '$(srcdir)/'`libsc68/io68/ym_blep.c
+
+libsc68/io68/in_sc68_la-mfpemul.lo: libsc68/io68/mfpemul.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-mfpemul.lo `test -f 'libsc68/io68/mfpemul.c' || echo '$(srcdir)/'`libsc68/io68/mfpemul.c
+
+libsc68/io68/in_sc68_la-ym_puls.lo: libsc68/io68/ym_puls.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/io68/in_sc68_la-ym_puls.lo `test -f 'libsc68/io68/ym_puls.c' || echo '$(srcdir)/'`libsc68/io68/ym_puls.c
+
+libsc68/in_sc68_la-libsc68.lo: libsc68/libsc68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/in_sc68_la-libsc68.lo `test -f 'libsc68/libsc68.c' || echo '$(srcdir)/'`libsc68/libsc68.c
+
+libsc68/emu68/in_sc68_la-lines68.lo: libsc68/emu68/lines68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/emu68/in_sc68_la-lines68.lo `test -f 'libsc68/emu68/lines68.c' || echo '$(srcdir)/'`libsc68/emu68/lines68.c
+
+libsc68/emu68/in_sc68_la-ioplug68.lo: libsc68/emu68/ioplug68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/emu68/in_sc68_la-ioplug68.lo `test -f 'libsc68/emu68/ioplug68.c' || echo '$(srcdir)/'`libsc68/emu68/ioplug68.c
+
+libsc68/emu68/in_sc68_la-mem68.lo: libsc68/emu68/mem68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/emu68/in_sc68_la-mem68.lo `test -f 'libsc68/emu68/mem68.c' || echo '$(srcdir)/'`libsc68/emu68/mem68.c
+
+libsc68/emu68/in_sc68_la-getea68.lo: libsc68/emu68/getea68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/emu68/in_sc68_la-getea68.lo `test -f 'libsc68/emu68/getea68.c' || echo '$(srcdir)/'`libsc68/emu68/getea68.c
+
+libsc68/emu68/in_sc68_la-inst68.lo: libsc68/emu68/inst68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/emu68/in_sc68_la-inst68.lo `test -f 'libsc68/emu68/inst68.c' || echo '$(srcdir)/'`libsc68/emu68/inst68.c
+
+libsc68/emu68/in_sc68_la-emu68.lo: libsc68/emu68/emu68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/emu68/in_sc68_la-emu68.lo `test -f 'libsc68/emu68/emu68.c' || echo '$(srcdir)/'`libsc68/emu68/emu68.c
+
+libsc68/emu68/in_sc68_la-error68.lo: libsc68/emu68/error68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o libsc68/emu68/in_sc68_la-error68.lo `test -f 'libsc68/emu68/error68.c' || echo '$(srcdir)/'`libsc68/emu68/error68.c
+
+desa68/in_sc68_la-desa68.lo: desa68/desa68.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(in_sc68_la_CFLAGS) $(CFLAGS) -c -o desa68/in_sc68_la-desa68.lo `test -f 'desa68/desa68.c' || echo '$(srcdir)/'`desa68/desa68.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf desa68/.libs desa68/_libs
+	-rm -rf file68/src/.libs file68/src/_libs
+	-rm -rf libsc68/.libs libsc68/_libs
+	-rm -rf libsc68/dial68/.libs libsc68/dial68/_libs
+	-rm -rf libsc68/emu68/.libs libsc68/emu68/_libs
+	-rm -rf libsc68/io68/.libs libsc68/io68/_libs
+	-rm -rf unice68/.libs unice68/_libs
+install-sc68replaydataDATA: $(sc68replaydata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(sc68replaydata_DATA)'; test -n "$(sc68replaydatadir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(sc68replaydatadir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(sc68replaydatadir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	 echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sc68replaydatadir)'"; \
+	 $(INSTALL_DATA) $$files "$(DESTDIR)$(sc68replaydatadir)" || exit $$?; \
+	done
+
+uninstall-sc68replaydataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sc68replaydata_DATA)'; test -n "$(sc68replaydatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(sc68replaydatadir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(sc68replaydatadir)"; 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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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)
+	-rm -f desa68/$(am__dirstamp)
+	-rm -f file68/src/$(am__dirstamp)
+	-rm -f libsc68/$(am__dirstamp)
+	-rm -f libsc68/dial68/$(am__dirstamp)
+	-rm -f libsc68/emu68/$(am__dirstamp)
+	-rm -f libsc68/io68/$(am__dirstamp)
+	-rm -f unice68/$(am__dirstamp)
+
+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 -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-sc68replaydataDATA
+
+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 -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 uninstall-sc68replaydataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am 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-sc68replaydataDATA 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 tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES uninstall-sc68replaydataDATA
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/plugins/sc68/desa68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/desa68/desa68.c Added

@@ -0,0 +1,1971 @@
+/*
+ * @file desa68.c
+ * @brief 68000 disassembler
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "desa68.h"
+
+#ifdef HAVE_ASSERT_H
+# include <assert.h>
+#endif
+
+/* ======================================================================
+ * Integer types.
+ *
+ * Only tested with proper stdint.h types, but i should work without
+ * in most cases.
+ * ====================================================================== */
+
+#if defined(HAVE_STDINT_H)
+#include <stdint.h>
+typedef int8_t s8;
+typedef uint8_t u8;
+typedef int16_t s16;
+typedef uint16_t u16;
+typedef int32_t s32;
+typedef uint32_t u32;
+#define U32(v) ( (u32) (v) )
+#define U16(v) ( (u16) (v) )
+#define U8(v) ( (u8) (v) )
+#define S32(v) ( (s32) (v) )
+#define S16(v) ( (s16) (v) )
+#define S8(v) ( (s8) (v) )
+#else
+typedef signed char s8;
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef short s16;
+typedef int s32;
+typedef unsigned int u32;
+#define U32(v) ((v) & 0xFFFFFFFF)
+#define U16(v) ((v) & 0x0000FFFF)
+#define U8(v) ((v) & 0x000000FF)
+#define S32(v) ((s32)(((s32)(v) << (sizeof(s32)-4)) >> (sizeof(s32)-4)))
+#define S16(v) ((s16)(((s16)(v) << (sizeof(s16)-2)) >> (sizeof(s16)-2)))
+#define S8(v) ((s8)(v))
+#endif
+
+typedef unsigned int uint;
+
+/* ======================================================================
+ * Opcode decoding helpers
+ * ====================================================================== */
+
+#define REG0(W) (((W))&7)
+#define REG9(W) (((W)>>9)&7)
+#define OPSZ(W) (((W)>>6)&3)
+#define LINE(W) (((W)>>12)&15)
+#define MODE3(W) (((W)>>3)&7)
+#define MODE6(W) (((W)>>6)&7)
+
+/* Bit macros */
+#define BTST(V,N) ( (V) & ( 1u << (N) ) ) /* bit test */
+#define BITV(V,N) ( ( (V) >> (N) ) & 1u ) /* vit value */
+#define BIT8(V) BITV(V,8)
+
+
+/* ======================================================================
+ * Addressing modes
+ * ====================================================================== */
+
+/* Junk address for assertion only. ~0 is used as final value but it's
+ * mostly the backward compatibility. Only desa68_ref::type should be
+ * used to test if the address is valid. */
+#define NDEF_ADDR (0x55555555 | (0x55555555 << ((sizeof(int)-4)*8 )))
+
+
+/* Extended adress mode number. */
+enum {
+ MODE_DN, MODE_AN, MODE_iAN, MODE_ANp,
+ MODE_pAN, MODE_dAN, MODE_dANXI, MODE_ABSW,
+ MODE_ABSL, MODE_dPC, MODE_dPCXI, MODE_IMM,
+ MODE_LAST
+};
+
+/* Addressing modes bit mask. */
+enum {
+ MBIT_DN = 1 << MODE_DN,
+ MBIT_AN = 1 << MODE_AN,
+ MBIT_iAN = 1 << MODE_iAN,
+ MBIT_ANp = 1 << MODE_ANp,
+ MBIT_pAN = 1 << MODE_pAN,
+ MBIT_dAN = 1 << MODE_dAN,
+ MBIT_dANXI = 1 << MODE_dANXI,
+ MBIT_ABSW = 1 << MODE_ABSW,
+ MBIT_ABSL = 1 << MODE_ABSL,
+ MBIT_dPC = 1 << MODE_dPC,
+ MBIT_dPCXI = 1 << MODE_dPCXI,
+ MBIT_IMM = 1 << MODE_IMM,
+
+ MBIT_SRC = MBIT_dPC | MBIT_dPCXI | MBIT_IMM,
+ MBIT_ALL = ( 1 << MODE_LAST ) - 1,
+ MBIT_DST = MBIT_ALL & ~MBIT_SRC
+};
+
+enum {
+ SZ_BYTE = DESA68_OP_B,
+ SZ_WORD = DESA68_OP_W,
+ SZ_LONG = DESA68_OP_L,
+ SZ_IMPL = DESA68_OP_A,
+ SZ_ADDR = DESA68_OP_A,
+ SZ_NDEF = DESA68_OP_NDEF
+};
+
+
+/* ======================================================================
+ * Disassembler string tables
+ * ====================================================================== */
+
+/* Hexa digit table */
+static const char Thex16 = {
+ '0','1','2','3','4','5','6','7',
+ '8','9','A','B','C','D','E','F'
+};
+
+/* Branch Condition Code String Tables */
+static const u16 bcc_ascii16 = {
+ 'RA','SR','HI','LS',
+ 'CC','CS','NE','EQ',
+ 'VC','VS','PL','MI',
+ 'GE','LT','GT','LE'
+};
+
+/* Scc Condition Code String Tables */
+static const u16 scc_ascii16 = {
+ 'T', 'F','HI','LS',
+ 'CC','CS','NE','EQ',
+ 'VC','VS','PL','MI',
+ 'GE','LT','GT','LE'
+};
+
+/* Dbcc Condition Code String Tables */
+static const u16 dbcc_ascii16 = {
+ 'RA', 'F','HI','LS',
+ 'CC','CS','NE','EQ',
+ 'VC','VS','PL','MI',
+ 'GE','LT','GT','LE'
+};
+
+/* ======================================================================
+ * String functions
+ * ====================================================================== */
+
+
+static int my_isfalse(desa68_t * d, int c)
+{
+ return 0;
+}
+
+static int my_isalnum(desa68_t * d, int c)
+{
+ return 0
+ || (c>='a' && c<='z')
+ || (c>='A' && c<='Z')
+ || (c>='0' && c<='9');
+}
+
+static int my_isgraph(desa68_t * d, int c)
+{
+ return c >= 32 && c < 127 && c != '\'';
+}
+
+/* not really ASCII ... just a name */
+static int my_isascii(desa68_t * d, int c)
+{
+ return
+ c == '-' || c=='_' || c==' ' || c == '!' || c == '.' || c == '#'
+ || (c>='a' && c<='z')
+ || (c>='A' && c<='Z')
+ || (c>='0' && c<='9');
+}
+
+/* #define desa_char(D,C) (D)->strput((D),(C)) */
+
+/* Add a char to disassembly string */
+static void desa_char(desa68_t *d, int c)
+{
+ if (d->_quote == c)
+ d->_quote = 0;
+ else if (!d->_quote) {
+ if (c == '\'')
+ d->_quote = c;
+ else if ( (d->flags & DESA68_LCASE_FLAG) && c >= 'A' && c <= 'Z')
+ c += 'a'-'A';
+ }
+ d->strput(d,c);
+}
+
+static void def_strput(desa68_t * d, int c)
+{
+ if (d->out < d->strmax)
+ d->strd->out++ = c;
+ else if (d->str) {
+ d->error |= DESA68_ERR_OUT;
+ if (d->strmax > 0)
+ d->strd->strmax-1 = 0;
+ }
+}
+
+#if 0
+static void def_strput(desa68_t * d, int c)
+{
+ uint nxt;
+ if (c != ' ')
+ nxt = d->out + 1;
+ else {
+ const uint tabs = 13;
+ nxt = d->out + tabs - (d->out % tabs);
+ }
+ while (d->out < nxt) {
+ if (d->out < d->strmax)
+ d->strd->out++ = c;
+ else {
+ if (d->str) {
+ d->error |= DESA68_ERR_OUT;
+ if (d->strmax > 0)
+ d->strd->strmax-1 = 0;
+ }
+ nxt = d->out;
+ }
+ }
+}
+#endif
+
+/* ======================================================================
+ * symbol functions
+ * ====================================================================== */
+
+static const char * def_symget(desa68_t * d, uint v, int type)
+{
+ uint min, max;
+ const int flag = (type == DESA68_SYM_DABW || type == DESA68_SYM_DABL)
+ ? DESA68_DSTSYM_FLAG : DESA68_SRCSYM_FLAG;
+
+ assert ( d->flags & DESA68_SYMBOL_FLAG );
+
+ /* Select range for symbol candidat */
+ if (type == DESA68_SYM_SIMM) {
+ min = d->immsym_min;
+ max = d->immsym_max;
+ } else {
+ min = d->memorg;
+ max = min+d->memlen;
+ }
+
+ if ( (d->flags & flag) || (v >= min && v < max ) ) {
+ char * s = d->_tmp; int j;
+ *s++ = 'L';
+ j = (v >= 0x1000000 ? 5 : 7 ) << 2;
+ do {
+ *s++ = Thex 15 & (v>>j) ;
+ } while ( j -= 4 >= 0);
+ *s = 0;
+ return d->_tmp;
+ }
+ return 0;
+}
+
+static const char * desa_symget(desa68_t * d, uint v, int stype)
+{
+ assert ( stype > DESA68_SYM_NDEF && stype < DESA68_SYM_LAST );
+ return (d->flags & DESA68_SYMBOL_FLAG)
+ ? d->symget(d,v,stype) : 0;
+}
+
+/* ======================================================================
+ * Disassembly output helpers
+ * ====================================================================== */
+
+static inline void desa_space(desa68_t * d)
+{
+ desa_char(d,' ');
+}
+
+static inline void desa_comma(desa68_t * d)
+{
+ desa_char(d,',');
+}
+
+/* Add a string to disassembly string */
+static void desa_str(desa68_t * d, const char * str)
+{
+ char c;
+ while (c=*str++, c)
+ desa_char(d, c);
+}
+
+static void desa_str_notr(desa68_t * d, const char * str)
+{
+ int flags = d->flags;
+ d->flags &= ~DESA68_LCASE_FLAG;
+ desa_str(d,str);
+ d->flags = flags;
+}
+
+/* Add a string to disassembly string */
+static void desa_ascii(desa68_t * d, uint n)
+{
+ int shift;
+ for (shift=24; shift>=0; shift-=8) {
+ u8 c = U8(n >> shift);
+ if (c)
+ desa_char(d, c);
+ }
+}
+
+/* Add a N-digit unsigned hexa number with header char
+ to disassembly string */
+static void desa_uhexacat(desa68_t * d, uint n,
+ int ndigit, int header_char)
+{
+ int shf;
+ desa_char(d,header_char);
+ for (shf=(ndigit-1)*4; shf>=0; shf-=4) {
+ desa_char(d,Thex(n>>shf)&15 );
+ }
+}
+
+/* Add a signifiant digit only unsigned hexa number
+ * with heading '$' to disassembly string
+ */
+static void desa_usignifiant(desa68_t * d, uint n)
+{
+ int shf;
+ desa_char(d,'$');
+ for (shf=(sizeof(int)*2-1)*4; shf>=0 && !(n>>shf); shf-=4)
+ ;
+ if (shf<0) shf=0;
+ for (; shf>=0; shf-=4)
+ desa_char(d,Thex(n>>shf)&15 );
+}
+
+/* idem desa_usignifiant, but signed */
+static void desa_signifiant(desa68_t * d, int n)
+{
+ if ( n < 0 ) {
+ desa_char(d,'-');
+ n = -n;
+ }
+ desa_usignifiant(d,n);
+}
+
+/* ======================================================================
+ * Memory access
+ * ====================================================================== */
+
+static int def_memget(desa68_t * d, uint addr, int flag)
+{
+ addr &= d->memmsk;
+ return (addr >= d->memlen)
+ ? -1
+ : U8(d->memptraddr)
+ ;
+}
+
+static int _uB(desa68_t * d, uint addr, int flag)
+{
+ int c = d->memget(d,addr,flag);
+ if (c < 0) {
+ d->error |= DESA68_ERR_MEM;
+ c = 0;
+ }
+ return c;
+}
+
+static int _sB(desa68_t * d, uint addr, int flag)
+{
+ return S8(_uB(d,addr,flag));
+}
+
+static int _uW(desa68_t * d, uint addr)
+{
+ if ( addr & 1 )
+ d->error |= DESA68_ERR_ODD;
+ return ( _uB(d,addr,2) << 8 ) | _uB(d,addr+1,0);
+}
+
+static int _sW(desa68_t * d, uint addr)
+{
+ return S16(_uW(d,addr));
+}
+
+static int _sL(desa68_t * d, uint addr)
+{
+ if ( addr & 1 )
+ d->error |= DESA68_ERR_ODD;
+ return 0
+ | (_sB(d, addr+0,4)<<24)
+ | (_uB(d, addr+1,0)<<16)
+ | (_uB(d, addr+2,0)<<8)
+ | (_uB(d, addr+3,0)<<0)
+ ;
+}
+
+/* Read next word and increment pc */
+static int _pcW(desa68_t * d)
+{
+ d->_w = _sW(d, d->pc);
+ d->pc += 2;
+ return d->_w;
+}
+
+/* Read next long and increment pc */
+static int _pcL(desa68_t * d)
+{
+ int r = _sL(d, d->pc);
+ d->_w = S16(r);
+ d->pc += 4;
+ return r;
+}
+
+static int immB(desa68_t * d)
+{
+ int w = _pcW(d), v = S8(w);
+
+ /* How to handle the MSB ? Need testing on a real 68k but it's most
+ * probable that it's simply ignored. However when it comes to
+ * disassembly and more specially to sourcing it can be a problem.
+ * A re-assembly could differ because of that. Moreover if the MSB
+ * is not $00 or the sign extension it is highly probable we are not
+ * dealing with a real instruction.
+ */
+ if (v != w) {
+ w &= 0xFF00; /* sign extension */
+ if (w && w != ( v & 0xff00 ) )
+ d->error |= DESA68_ERR_IMM;
+ }
+ return v;
+}
+
+static int immW(desa68_t * d)
+{
+ return _pcW(d);
+}
+
+static int immL(desa68_t * d)
+{
+ return _pcL(d);
+}
+
+static int adrW(desa68_t * d)
+{
+ return immW(d);
+}
+
+static int adrL(desa68_t * d)
+{
+ return immL(d);
+}
+
+static int relPC(desa68_t * d)
+{
+ const int w = _pcW(d);
+ return (d->pc + w - 2) & d->memmsk;
+}
+
+/* ======================================================================
+ * General disassembly function
+ * ====================================================================== */
+
+static inline void ref_set(struct desa68_ref * ref, uint v, int rtype)
+{
+ v = U32(v);
+ /* This assert can be triggered in rare legit cases only if host
+ * integers are 32 bits. */
+ assert (v != NDEF_ADDR);
+ assert (ref->addr == NDEF_ADDR);
+ assert (rtype != SZ_NDEF);
+ ref->type = rtype;
+ ref->addr = v;
+}
+
+static void set_branch(desa68_t * d, uint addr, int itype)
+{
+ assert(itype == DESA68_INT || itype ==DESA68_BRA || itype ==DESA68_BSR);
+ d->itype = itype;
+ d->dref.type = SZ_ADDR;
+ d->dref.addr = addr;
+ assert (addr != NDEF_ADDR);
+}
+
+static void set_interrupt(desa68_t * d, uint vector)
+{
+ set_branch(d,vector,DESA68_INT);
+}
+
+static void desa_op_DN(desa68_t * d, u8 reg)
+{
+ assert(reg < 8);
+ desa_char(d,'D');
+ desa_char(d,'0'+reg);
+ d->regs |= 1 << (DESA68_REG_DN+reg);
+}
+
+static void desa_op_AN(desa68_t * d, u8 reg)
+{
+ assert(reg < 8);
+ desa_char(d,'A');
+ desa_char(d,'0'+reg);
+ d->regs |= 1 << (DESA68_REG_AN+reg);
+}
+
+static void desa_op_RN(desa68_t * d, u8 reg)
+{
+ assert(reg < 16);
+ desa_char(d,"DA"reg>>3);
+ desa_char(d,'0'+(reg&7));
+ d->regs |= 1 << (DESA68_REG_DN+reg);
+}
+
+static void desa_op_iAN(desa68_t * d, u8 reg)
+{
+ desa_char(d,'(');
+ desa_op_AN(d,reg);
+ desa_char(d,')');
+}
+
+static void desa_op_pAN(desa68_t * d, u8 reg)
+{
+ desa_char(d,'-');
+ desa_op_iAN(d,reg);
+}
+
+static void desa_op_ANp(desa68_t * d, u8 reg)
+{
+ desa_op_iAN(d,reg);
+ desa_char(d,'+');
+}
+
+/* Could use a table for that. */
+static void desa_op_anyreg(desa68_t * d, u8 reg)
+{
+ uint name;
+ if (reg < DESA68_REG_AN)
+ name = 'D0'+(reg-DESA68_REG_DN);
+ else if (reg <= DESA68_REG_SP)
+ name = 'A0'+(reg-DESA68_REG_AN);
+ else
+ switch (reg) {
+ case DESA68_REG_USP: name = 'USP'; break;
+ case DESA68_REG_CCR: name = 'CCR'; break;
+ case DESA68_REG_SR: name = 'SR'; break;
+ case DESA68_REG_PC: name = 'PC'; break;
+ default:
+ assert(!"invalid register");
+ name = 'R?';
+ }
+ desa_ascii(d,name);
+ d->regs |= 1 << reg;
+}
+
+static void desa_op_xi(desa68_t * d, u16 w)
+{
+ int r = (w >> 12) & 7; /* register base */
+ if (w & 0x8000)
+ desa_op_AN(d,r);
+ else
+ desa_op_DN(d,r);
+ desa_char(d,'.');
+ desa_char(d,"WL" 1 & (w >> 11));
+}
+
+static void desa_opsz(desa68_t *d, u8 size)
+{
+ if (size <= SZ_LONG) {
+ desa_char(d,'.');
+ desa_char(d,"BWL"size);
+ }
+}
+
+
+/* Immediate long values can sometime be disassembled as symbols. The
+ * default symbol lookup function will do that if the source symbol
+ * disassembly is forced (with DESA68_SRCSYM_FLAG) or if the value is
+ * in the range immsym_min:immsym_max-1.
+ *
+ * It means the source reference is only set if the immediate value is
+ * detected as a symbol. It can only happen if DESA68_SYMBOL_FLAG is
+ * set. Not sure this is the best way to do it. It could be useful to
+ * have eligible address value to the source reference even if the
+ * disassembler is not producing auto symbols.
+ */
+static void desa_immL(desa68_t * d, uint v)
+{
+ const char * symb = desa_symget(d,v,DESA68_SYM_SIMM);
+
+ assert(!d->_quote);
+
+ if (symb) {
+ ref_set(&d->sref, v, SZ_ADDR);
+ desa_str_notr(d,symb);
+#if 0 /* See comment paragraph 2. */
+ } else if ( v >= d->immsym_min && v < d->immsym_max ) {
+ ref_set(&d->sref, v, SZ_ADDR);
+ desa_signifiant(d,S32(v));
+#endif
+ } else {
+ const int q = '\'';
+ if (
+ d->ischar(d,U8(v)) && d->ischar(d,U8(v>>8)) &&
+ d->ischar(d,U8(v>>16)) && d->ischar(d,U8(v>>24))) {
+ desa_char(d,q);
+ d->_quote = q;
+ desa_ascii(d,U32(v));
+ /* d->_quote = 0; */
+ desa_char(d,q);
+ } else {
+ desa_signifiant(d,S32(v));
+ }
+ }
+}
+
+static void desa_addr(desa68_t * d, uint v, int stype)
+{
+ const char * symb = desa_symget(d,v,stype);
+ if (symb)
+ desa_str_notr(d,symb);
+ else
+ desa_usignifiant(d, v);
+}
+
+static void desa_absL(desa68_t * d, uint v, int stype)
+{
+ desa_addr(d,v,stype);
+}
+
+static void desa_jmp_label(desa68_t * d, uint v)
+{
+ desa_addr(d,v,DESA68_SYM_SPCR);
+}
+
+static void get_ea_2(desa68_t * d,
+ struct desa68_ref * ref, u8 rtype,
+ u8 mode, u8 reg, u8 immsz)
+{
+ const u8 is_src = ref == &d->sref;
+ int v;
+
+ assert(ref == &d->sref || ref == &d->dref);
+ assert(ref->type == SZ_NDEF);
+ assert(ref->addr == NDEF_ADDR);
+ if (mode == MODE_ABSW)
+ mode += reg;
+
+ assert( is_src || !( MBIT_SRC & (1<<mode) ) );
+
+ switch (mode) {
+ case MODE_DN:
+ desa_op_DN(d, reg);
+ break;
+ case MODE_AN:
+ desa_op_AN(d, reg);
+ break;
+ case MODE_pAN:
+ desa_op_pAN(d,reg);
+ break;
+ case MODE_ANp:
+ desa_op_ANp(d,reg);
+ break;
+ case MODE_dAN:
+ _pcW(d);
+ desa_signifiant(d,d->_w);
+ /* continue on MODE_iAN */
+ case MODE_iAN:
+ desa_op_iAN(d,reg);
+ break;
+ case MODE_dANXI:
+ v = _pcW(d); /* control word */
+ desa_signifiant(d,S8(v));
+ desa_char(d,'(');
+ desa_op_AN(d,reg);
+ desa_comma(d);
+ desa_op_xi(d,v);
+ desa_char(d,')');
+ break;
+ case MODE_ABSW:
+ /* ea_set(d, v = adrW(d)); DELME */
+ v = adrW(d);
+ desa_absL(d, v, is_src ? DESA68_SYM_SABW : DESA68_SYM_DABW);
+ desa_ascii(d,'.W');
+ ref_set(ref, v, rtype);
+ break;
+ case MODE_ABSL:
+ /* ea_set(d, v = adrL(d)); DELME */
+ v = adrL(d);
+ desa_absL(d, v, is_src ? DESA68_SYM_SABL : DESA68_SYM_DABL);
+ if ( S16(v) == v )
+ desa_ascii(d,'.L');
+ ref_set(ref, v, rtype);
+ break;
+ case MODE_dPC:
+ assert(is_src);
+ /* ea_set(d, v = relPC(d)); DELME */
+ v = relPC(d);
+ desa_addr(d,v,DESA68_SYM_SPCR);
+ /* Don't use DESA68_REG_PC here, only for (PC,Xi). We don't really
+ * need to know if the addressing is PCR but we need to know if
+ * the reference is an effective address or a base address.
+ *
+ * desa_op_anyreg(d, DESA68_REG_PC);
+ */
+ desa_ascii(d,'(PC)');
+ ref_set(ref, v, rtype);
+ break;
+ case MODE_dPCXI: {
+ uint addr;
+ assert(is_src);
+ v = _pcW(d);
+ addr = d->pc-2+S8(v);
+ ref_set(ref,addr,rtype);
+ desa_addr(d, addr, DESA68_SYM_SPCI);
+ desa_char(d,'(');
+ desa_op_anyreg(d, DESA68_REG_PC);
+ desa_comma(d);
+ desa_op_xi(d, v);
+ desa_char(d,')');
+ } break;
+ case MODE_IMM:
+ assert(is_src);
+ desa_char(d,'#');
+ switch (immsz) {
+ case SZ_BYTE:
+ v = immB(d);
+ if (v < -0x3f) v = U8(v);
+ desa_signifiant(d,v);
+ break;
+ case SZ_WORD:
+ v = immW(d);
+ if (v < -0x3fff) v = U16(v);
+ desa_signifiant(d,v);
+ break;
+ case SZ_LONG:
+ v = U32(immL(d));
+ desa_immL(d, v); /* set the source reference */
+ break;
+
+ default:
+ assert(!"invalid immediat size");
+ desa_ascii(d,'#?');
+ break;
+ }
+ break;
+
+ default:
+ assert(!"invalid addressing mode");
+ desa_char(d,'?');
+ desa_usignifiant(d, mode);
+ desa_char(d,'?');
+ break;
+ }
+}
+
+/* Get move operand
+ * bit : 0/6 -> src/dest
+ * w : current opcode
+ */
+static void get_ea_move(desa68_t * d, int bit, int w, u8 easz)
+{
+ int ea = (w>>bit) & 63;
+ assert(bit == 0 || bit == 6);
+
+ if (!bit)
+ get_ea_2(d, &d->sref, easz, ea>>3, ea&7, easz);
+ else
+ get_ea_2(d, &d->dref, easz, ea&7, ea>>3, easz);
+}
+
+/* Used with ABCD, SBCD, ADDX, SUBX */
+static void desa_ry_rx(desa68_t * d, int inst, int size)
+{
+ desa_ascii(d,inst);
+ if (size != SZ_IMPL)
+ desa_opsz(d,size); /* ADDX */
+ /* else */
+ /* d->opsz = SZ_BYTE; */ /* ABCD */
+ desa_space(d);
+ if (d->_mode3&1) { /* -(Ay),-(Ax) */
+ desa_op_pAN(d,d->_reg0);
+ desa_comma(d);
+ desa_op_pAN(d,d->_reg9);
+ } else { /* Dy,Dx */
+ desa_op_DN(d, d->_reg0);
+ desa_comma(d);
+ desa_op_DN(d, d->_reg9);
+ }
+ /* d->opsz = size; */
+
+}
+
+/* Used by ALU (add/sub/or/eor/and) */
+static void desa_dn_ae(desa68_t * d, int name)
+{
+ desa_ascii(d,name);
+ desa_opsz(d,d->_opsz);
+ desa_space(d);
+ /* dn,<ae> */
+ if (d->_opw&0400) {
+ desa_op_DN(d,d->_reg9);
+ desa_comma(d);
+ get_ea_2(d, &d->dref, d->_opsz, d->_mode3, d->_reg0, d->_opsz);
+ }
+
+ /* <ae>,dn */
+ else {
+ get_ea_2(d, &d->sref, d->_opsz, d->_mode3, d->_reg0, d->_opsz);
+ desa_comma(d);
+ desa_op_DN(d, d->_reg9);
+ }
+}
+
+
+static void desa_dcw(desa68_t * d)
+{
+ desa_ascii(d,'DC.W');
+ desa_space(d);
+ desa_uhexacat(d,U16(d->_opw),4,'$');
+ d->itype = DESA68_DCW;
+}
+
+/* ======================================================================
+ *
+ * LINE 0 :
+ * -Immediat operations
+ * -SR & CCR operations
+ * -Bit operations
+ * -Movep
+ *
+ * ====================================================================== */
+
+static int desa_check_bitop(desa68_t * d)
+{
+ static u32 fn = { 'BTST', 'BCHG', 'BCLR', 'BSET' };
+ int modemsk = 00775;
+ uint inst;
+
+ if (!(modemsk&(1<<d->_adrm0)))
+ return 0;
+
+ inst = fnd->_opsz;
+ if (!(d->_opw&0400)) {
+ /* B... #x,<AE>*/
+ if ((d->_opw&0xF00)!=0x800)
+ return 0;
+ desa_ascii(d,inst);
+ desa_space(d);
+ desa_char(d,'#');
+ _pcW(d);
+ desa_usignifiant(d,U8(d->_w));
+ } else {
+ /* B... dn,<AE>*/
+ desa_ascii(d,inst);
+ desa_space(d);
+ desa_op_DN(d, d->_reg9);
+ }
+ desa_comma(d);
+
+ if (!d->_mode3)
+ ;
+ else
+ ;
+ get_ea_2(d, &d->dref, SZ_BYTE, d->_mode3, d->_reg0, SZ_NDEF);
+
+ /* if (d->_mode3) */
+ /* set_dst_ref(d, SZ_BYTE); /\* AE is not a register *\/ */
+ /* d->opsz = d->_mode3 ? SZ_BYTE : SZ_LONG; */
+
+ return 1;
+}
+
+static int desa_check_IMM_SR(desa68_t * d)
+{
+ int modemsk = 1 + (1<<2) + (1<<10);
+ int mode = (d->_opw>>8)&15, inst='ORI';
+
+ if ((d->_opw&0677)!=0074 || !(modemsk&(1<<mode)))
+ return 0;
+
+ switch(mode) {
+ case 0xA: /* EORI */
+ inst = 'EORI';
+ break;
+#if 0
+ case 0x0: /* ORI */
+ inst = 'ORI';
+ break;
+#endif
+ case 0x2: /* ANDI */
+ inst = 'ANDI';
+ break;
+ }
+ desa_ascii(d,inst);
+ desa_space(d);
+ get_ea_2(d, &d->sref, SZ_WORD, MODE_ABSW, MODE_IMM-MODE_ABSW, SZ_WORD);
+ desa_comma(d);
+ desa_op_anyreg(d, (d->_mode6&1) ? DESA68_REG_SR : DESA68_REG_CCR);
+ return 1;
+}
+
+static int desa_check_movep(desa68_t * d)
+{
+ int opsz;
+ if ((d->_opw & 0470) != 0410 )
+ return 0;
+
+ opsz = SZ_WORD + (d->_opsz & 1);
+ desa_str(d,"MOVEP");
+ desa_opsz(d,opsz);
+ desa_space(d);
+
+ if (!(d->_opw&(1<<7))) {
+ /* MOVEP.? d(Ax),Dy */
+ get_ea_2(d, &d->sref, opsz, MODE_dAN, d->_reg0, SZ_NDEF);
+ desa_comma(d);
+ desa_op_DN(d,d->_reg9);
+ } else {
+ /* MOVEP.? Dx,d(Ay) */
+ desa_op_DN(d,d->_reg9);
+ desa_comma(d);
+ get_ea_2(d, &d->dref, opsz, MODE_dAN, d->_reg0, SZ_NDEF);
+ }
+ return 1;
+}
+
+
+static int desa_check_imm_op(desa68_t * d)
+{
+ /* FEDC BA9 8 76 543 210
+ * 0000 INS 0 SZ MOD REG */
+ static u32 fn8 = {
+ 'ORI', 'ANDI', 'SUBI', 'ADDI', 0, 'EORI', 'CMPI', 0
+ };
+ const int modes = MBIT_DST & ~MBIT_AN;
+
+ if ( (d->_opw & 256) || !( modes & (1<<d->_adrm0) )
+ || d->_opsz==3 || !fnd->_reg9 )
+ return 0;
+
+ desa_ascii(d,fnd->_reg9);
+ desa_opsz(d,d->_opsz);
+ desa_space(d);
+ /* LONG immediate can be address */
+ get_ea_2(d, &d->sref, SZ_ADDR, MODE_ABSW, MODE_IMM-MODE_ABSW, d->_opsz);
+ desa_comma(d);
+ get_ea_2(d, &d->dref, d->_opsz, d->_mode3, d->_reg0, SZ_NDEF);
+ return 1;
+}
+
+static void desa_line0(desa68_t * d)
+{
+ if (!desa_check_movep(d) &&
+ !desa_check_bitop(d) &&
+ !desa_check_IMM_SR(d) &&
+ !desa_check_imm_op(d) )
+ desa_dcw(d);
+}
+
+/* General move(a) disassemble
+ */
+static void desa_move(desa68_t * d)
+{
+ static const u8 mvsz4 = {
+ SZ_NDEF, SZ_BYTE, SZ_LONG, SZ_WORD
+ };
+ const int w = d->_opw;
+ const int rtype = mvsz3 & (w>>12);
+ desa_ascii(d,'MOVE');
+ if (d->_adrm6==MODE_AN)
+ desa_char(d,'A'); /* MOVEA */
+ desa_opsz(d,rtype);
+ desa_space(d);
+ get_ea_move(d,0,w,rtype);
+ /* set_src_ref(d,rtype); */
+
+ desa_comma(d);
+ get_ea_move(d,6,w,rtype);
+ /* set_dst_ref(d,rtype); */
+}
+
+/* Check and disassemble a valid move
+ * return TRUE if valid move
+ */
+static int desa_check_move(desa68_t * d)
+{
+ u32 srcmsk = 0xFFF, dstmsk = 0x1FF;
+ /* Remove An source & destination addressing mode for byte access */
+ if (d->_line==0x1) {
+ srcmsk &= ~(1<<MODE_AN);
+ dstmsk &= ~(1<<MODE_AN);
+ }
+ if ((srcmsk&(1<<d->_adrm0)) && (dstmsk&(1<<d->_adrm6)) ) {
+ desa_move(d);
+ return 1;
+ }
+ return 0;
+}
+
+/* ======================================================================
+ *
+ * LINE 1 :
+ * -MOVE.B
+ * LINE 2 :
+ * -MOVE.L
+ * LINE 3 :
+ * -MOVE.W
+ *
+ * ====================================================================== */
+
+static void desa_li123(desa68_t * d)
+{
+ if (!desa_check_move(d))
+ desa_dcw(d);
+}
+
+/* ======================================================================
+ *
+ * LINE 4 :
+ * -Other instructions
+ *
+ * ====================================================================== */
+
+static void get_movemsub(desa68_t * d, u8 i, u8 j)
+{
+ assert(j <= DESA68_REG_SP);
+ assert(i <= j);
+ desa_op_anyreg(d, i);
+ if ( i != j ) {
+ desa_char(d,'-');
+ desa_op_anyreg(d, j);
+ }
+}
+
+static void get_movemreg(desa68_t * d, uint v, uint rev)
+{
+ int i,j,p=0;
+
+ assert(v < 0x10000);
+ assert(rev == 0 || rev == 15);
+
+ for (i=0 ; i<16; i++) {
+ for (; i<16 && (v&(1<<(i^rev)))==0; i++);
+ if (i==16) break;
+ j = i;
+ for (; i<16 && (v&(1<<(i^rev))); i++)
+ d->regs |= 1<<(DESA68_REG_DN+i);
+ if (p) desa_char(d,'/');
+ get_movemsub(d,j,(i-1));
+ p = 1;
+ }
+}
+
+static int desa_check_imp(desa68_t * d, uint name, int mskmode,
+ u8 opsz, u8 memsz)
+{
+ if ((d->_opw&0400) || !(mskmode&(1<<d->_adrm0)))
+ return 0;
+ desa_ascii(d,name);
+ desa_opsz(d,opsz);
+ desa_space(d);
+
+ get_ea_2(d, &d->sref, opsz, d->_mode3, d->_reg0, SZ_NDEF);
+
+ if (opsz <= SZ_LONG)
+ d->dref = d->sref;
+ return 1;
+}
+
+static int desa_check_lea(desa68_t * d)
+{
+ int modemsk = 03744;
+ if ((d->_opw&0700) != 0700 || !(modemsk&(1<<d->_adrm0)))
+ return 0;
+ desa_ascii(d,'LEA');
+ desa_space(d);
+
+ get_ea_2(d, &d->sref, SZ_ADDR, d->_mode3, d->_reg0, SZ_NDEF);
+ desa_comma(d);
+ desa_op_AN(d,d->_reg9);
+ return 1;
+}
+
+static int desa_check_chk(desa68_t * d)
+{
+ int modemsk = 07775;
+ if ((d->_opw&0700) != 0600 || !(modemsk&(1<<d->_adrm0)))
+ return 0;
+ desa_ascii(d,'CHK');
+ desa_space(d);
+ get_ea_2(d, &d->sref, SZ_WORD, d->_mode3, d->_reg0, SZ_WORD);
+ desa_comma(d);
+ desa_op_DN(d, d->_reg9);
+ set_interrupt(d, 0x18);
+ return 1;
+}
+
+static int desa_check_ext(desa68_t * d)
+{
+ if ((d->_opw&07670)!=04200)
+ return 0;
+ desa_ascii(d,'EXT');
+ desa_opsz(d,1+(1&(d->_opw>>6)));
+ desa_space(d);
+ desa_op_DN(d,d->_reg0);
+ return 1;
+}
+
+static int desa_check_movem(desa68_t * d)
+{
+ int modemsk, regmsk;
+ int mode3, reg0, w, opsz;
+ if ((d->_opw&05600)!=04200)
+ return 0;
+ modemsk = !(d->_opw&02000) ? 00764 : 03754;
+ if (!(modemsk&(1<<d->_adrm0)))
+ return 0;
+
+ desa_str(d,"MOVEM");
+ opsz = 1 + (1 & (d->_opw>>6));
+ desa_opsz(d,opsz);
+ desa_space(d);
+
+ w = d->_opw;
+ mode3 = d->_mode3;
+ reg0 = d->_reg0;
+ regmsk = U16(immW(d));
+
+ if (w&02000) {
+ /* -> reg */
+ get_ea_2(d, &d->sref, opsz, mode3, reg0, SZ_NDEF);
+ desa_comma(d);
+ get_movemreg(d,regmsk,0);
+ } else {
+ /* -> mem */
+ get_movemreg(d, regmsk, (mode3==MODE_pAN) ? 15 : 0);
+ desa_comma(d);
+ get_ea_2(d, &d->dref, opsz, mode3, reg0, SZ_NDEF);
+ }
+ return 1;
+}
+
+static int desa_check_jmp(desa68_t * d)
+{
+ /* FEDCBA987 6 543 210
+ * 010011101 T MOD REG T:= (0:JSR 1:JMP) */
+ int type;
+ const int modes =
+ MBIT_ALL & ~(MBIT_DN|MBIT_AN|MBIT_ANp|MBIT_pAN|MBIT_IMM);
+
+ if ( (d->_opw & 0xFF80) != 0x4E80 || ! (modes & (1<<d->_adrm0)) )
+ return 0;
+
+ desa_char(d,'J');
+ if (d->_opsz==2) {
+ type = DESA68_BSR;
+ desa_ascii(d,'SR');
+ } else {
+ type = DESA68_BRA;
+ desa_ascii(d,'MP');
+ }
+ desa_space(d);
+ get_ea_2(d, &d->sref, SZ_ADDR, d->_mode3, d->_reg0, SZ_NDEF);
+ if (d->sref.type != SZ_NDEF)
+ set_branch(d, d->sref.addr, type);
+ return 1;
+}
+
+static int desa_check_line4_mode3(desa68_t * d)
+{
+ if (d->_mode6 != 3)
+ return 0;
+
+ switch(d->_reg9) {
+
+ case 0: /* MOVE FROM SR */
+ if (!(00775 & (1<<d->_adrm0)))
+ break;
+ desa_ascii(d,'MOVE');
+ desa_space(d);
+ desa_op_anyreg(d, DESA68_REG_SR);
+ desa_comma(d);
+ get_ea_2(d, &d->dref, SZ_WORD, d->_mode3, d->_reg0, SZ_WORD);
+ return 1;
+
+ case 2: /* MOVE TO CCR */
+ if (!(07775 & (1<<d->_adrm0)))
+ break;
+ desa_ascii(d,'MOVE');
+ desa_space(d);
+ /* Word indeed ;) */
+ get_ea_2(d, &d->sref, SZ_WORD, d->_mode3, d->_reg0, SZ_BYTE);
+ desa_comma(d);
+ desa_op_anyreg(d,DESA68_REG_CCR);
+ return 1;
+
+ case 3: /* MOVE TO SR */
+ if (!(07775 & (1<<d->_adrm0)))
+ break;
+ desa_ascii(d,'MOVE');
+ desa_space(d);
+ get_ea_2(d, &d->sref, SZ_WORD, d->_mode3, d->_reg0, SZ_WORD);
+ desa_comma(d);
+ desa_op_anyreg(d,DESA68_REG_SR);
+ return 1;
+
+ case 5: /* TAS */
+ if (desa_check_imp(d, 'TAS', 00775, SZ_IMPL, SZ_BYTE)) {
+ return 1;
+ } else if (d->_w == 0x4AFC) {
+ desa_str(d,"ILLEGAL");
+ set_interrupt(d, 0x10);
+ return 1;
+ }
+ }
+ return 0;
+}
+
+
+static void desa_line4(desa68_t * d)
+{
+ switch (d->_mode6) {
+
+ case 7:
+ if (desa_check_lea(d)) return; /* LEA <ea>,An */
+ /* TODO for 32bit support */ /* EXTB.L (>=68020) */
+ break;
+
+ case 6: /* CHK <ea>,Dn*/
+ if (desa_check_chk(d)) return;
+ break;
+
+ case 4: /* CHK.L (>=68020) */
+ break;
+
+ case 3:
+ case 2:
+ if (desa_check_ext(d)) return;
+ if (desa_check_movem(d)) return;
+ if (desa_check_jmp(d)) return;
+ if (desa_check_line4_mode3(d)) return; /* mode 3 only ? */
+
+ default:
+ switch(d->_reg9) {
+ case 0: /* NEGX */
+ if (desa_check_imp(d, 'NEGX', 00775, d->_opsz, d->_opsz))
+ return;
+ break;
+
+ case 1: /* CLR */
+ if (desa_check_imp(d, 'CLR', 00775, d->_opsz, d->_opsz)) {
+ /* d->sref.type = SZ_NDEF; */ /* to keep only dst ref */
+ return;
+ }
+ break;
+
+ case 2: /* NEG */
+ if (desa_check_imp(d, 'NEG', 00775, d->_opsz, d->_opsz))
+ return;
+ break;
+
+ case 3: /* NOT */
+ if (desa_check_imp(d, 'NOT', 00775, d->_opsz, d->_opsz))
+ return;
+ break;
+
+ case 4:
+ if (d->_mode6==0) {
+ /* NBCD */
+ if (desa_check_imp(d, 'NBCD', 00775, SZ_IMPL, SZ_BYTE))
+ return;
+ } else if (d->_mode6==1) {
+ if (d->_mode3 == MODE_DN) {
+ /* SWAP */
+ desa_ascii(d,'SWAP');
+ desa_space(d);
+ desa_op_DN(d, d->_reg0);
+ return;
+ } else {
+ /* PEA */
+ if (desa_check_imp(d, 'PEA', 0x7E4, SZ_IMPL, SZ_ADDR))
+ return;
+ }
+ }
+ break;
+
+ case 5: /* TST */
+ if (desa_check_imp(d, 'TST', 00775, d->_opsz, d->_opsz)) {
+ /* d->dref.type = SZ_NDEF; */ /* to keep only src ref */
+ return;
+ }
+ break;
+
+ case 6:
+ break;
+
+ case 7:
+ if (d->_mode6 == 1) {
+ /* FUNKY LINE 4 */
+ switch(d->_mode3) {
+ case 0:
+ case 1: {
+ const int num = d->_opw & 0xF;
+ /* TRAP #$X 0100 1110 0100 TRAP */
+ assert ( (d->_opw & 0xFFF0) == 0x4E40);
+ desa_ascii(d,'TRAP');
+ desa_space(d);
+ desa_ascii(d,'#$');
+ desa_char(d, Thexnum);
+ set_interrupt(d,0x80 + (num<<2));
+ /* d->opsz = SZ_IMPL; */
+ } return;
+ case 2:
+ /* LINK An,#d 0100 1110 0101 0 REG */
+ assert ( (d->_opw & 0xFFF8) == 0x4E50);
+ desa_ascii(d,'LINK');
+ desa_space(d);
+ desa_op_AN(d,d->_reg0);
+ desa_comma(d);
+ get_ea_2(d, &d->sref, SZ_IMPL, MODE_ABSW, MODE_IMM-MODE_ABSW, SZ_WORD);
+ d->regs |= 1 << DESA68_REG_SP;
+ /* d->opsz = SZ_IMPL; */
+ return;
+ case 3:
+ /* UNLK An 0100 1110 0101 1 REG */
+ assert ( (d->_opw & 0xFFF8) == 0x4E58);
+ desa_ascii(d,'UNLK');
+ desa_space(d);
+ desa_op_AN(d,d->_reg0);
+ d->regs |= 1 << DESA68_REG_SP;
+ /* d->opsz = SZ_IMPL; */
+ return;
+ case 4:
+ /* MOVE An,USP 0100 1110 0110 0 REG */
+ assert ( (d->_opw & 0xFFF8) == 0x4E60);
+ desa_ascii(d,'MOVE');
+ desa_space(d);
+ desa_op_AN(d,d->_reg0);
+ desa_comma(d);
+ desa_op_anyreg(d,DESA68_REG_USP);
+ /* d->opsz = SZ_LONG; */
+ return;
+
+ case 5:
+ /* MOVE USP,An 0100 1110 0110 1 REG */
+ assert ( (d->_opw & 0xFFF8) == 0x4E68);
+ desa_ascii(d,'MOVE');
+ desa_space(d);
+ desa_op_anyreg(d,DESA68_REG_USP);
+ desa_comma(d);
+ desa_op_AN(d,d->_reg0);
+ /* d->opsz = SZ_LONG; */
+ return;
+
+ case 6: {
+ /* FUNKY LINE 4 MODE 6 (4E */
+ static char *str8 = { /* $4E70 - $4E77 */
+ /* 0 1 2 3 4 5 6 7 */
+ "RESET","NOP","STOP ","RTE",0,"RTS","TRAPV","RTR"
+ };
+ assert ( (d->_opw & 0xFFF8) == 0x4E70);
+
+ if (d->_reg0 == 4)
+ break;
+
+ if ((d->_reg0 & 1))
+ d->itype = (d->_reg0 == 1) ? DESA68_NOP : DESA68_RTS;
+
+ desa_str(d, strd->_reg0);
+ if (d->_reg0 == 2)
+ /* STOP */
+ get_ea_2(d, &d->sref, SZ_WORD, MODE_IMM, 0,SZ_WORD);
+ } return;
+ }
+ }
+ }
+ }
+ desa_dcw(d);
+}
+
+
+/* ======================================================================
+ *
+ * LINE 5:
+ * - ADDQ #x,<ea>
+ * - SUBQ #x,<ea>
+ * - Scc <ea>
+ * - Dcc dn,Addr
+ *
+ * ====================================================================== */
+
+static int desa_check_addq_subq(desa68_t * d)
+{
+ int v;
+ const int modes = MBIT_DST;
+
+ /* ADDQ #VAL,<ea> 0101 VAL 0 SZ ADRMOD
+ * SUBQ #VAL,<ea> 0101 VAL 1 SZ ADRMOD */
+
+ assert (d->_opsz != 3); /* tested upstream */
+ if ( ! (modes & (1<<d->_adrm0) ) )
+ return 0;
+
+ v = d->_reg9;
+ v += (!v) << 3;
+ desa_ascii(d, BTST(d->_opw,8) ? 'SUBQ':'ADDQ');
+ desa_opsz(d,d->_opsz);
+ desa_space(d);
+ desa_ascii(d,'#0' + v);
+ desa_comma(d);
+ get_ea_2(d, &d->dref, d->_opsz, d->_mode3, d->_reg0, d->_opsz);
+
+ return 1;
+}
+
+static void desa_Dcc(desa68_t * d)
+{
+ int addr;
+
+ /* DBcc Dn,<addr> 0101 COND 11001 REG <offset.w> */
+
+ assert ( (d->_opw & 0xF0F8) == 0x50C8 );
+
+ desa_ascii(d,('DB'<<16) + dbcc_ascii(d->_opw>>8)&15);
+ desa_space(d);
+ desa_op_DN(d,d->_reg0);
+ desa_comma(d);
+ addr = relPC(d);
+ desa_jmp_label(d, addr);
+ set_branch(d,addr,DESA68_BSR);
+}
+
+static int desa_check_Scc(desa68_t * d)
+{
+ const int modes = MBIT_DST & ~MBIT_AN;
+
+ /* Scc <ae> 0101 COND 11 ADRMOD */
+
+ assert ( ( d->_opw & 0xF0C0 ) == 0x50C0 );
+
+ if ( !( modes & (1<<d->_adrm0) ) )
+ return 0;
+
+ desa_char(d,'S');
+ desa_ascii(d,scc_ascii(d->_opw>>8)&15);
+ desa_space(d);
+ get_ea_2(d, &d->dref, SZ_BYTE, d->_mode3, d->_reg0, SZ_NDEF);
+ return 1;
+}
+
+static void desa_line5(desa68_t * d)
+{
+ if (d->_opsz == 3) {
+ if (d->_adrm0 == MODE_AN)
+ desa_Dcc(d);
+ else if (!desa_check_Scc(d))
+ desa_dcw(d);
+ } else if (!desa_check_addq_subq(d)) {
+ desa_dcw(d);
+ }
+}
+
+
+/* ======================================================================
+ *
+ * LINE 6 :
+ * -Bcc
+ *
+ * Format 0110 COND OFFSET08 OFFSET16 if OFFSET08==0
+ * !!! COND=0001(false) => BSR
+ *
+ * ====================================================================== */
+
+static void desa_line6(desa68_t * d)
+{
+ int a, cond = (d->_opw>>8) & 0xF;
+
+ desa_ascii(d,('B'<<16) + bcc_asciicond);
+
+ /* Bcc.S */
+ if (d->_opw & 255) {
+ desa_ascii(d,'.S');
+ a = (int)S8(d->_opw);
+ a += (int)d->pc;
+ }
+ /* Bcc.W */
+ else {
+ desa_ascii(d,'.W');
+ a = relPC(d);
+ }
+ desa_space(d);
+ desa_jmp_label(d, a);
+ set_branch(d, a, !cond ? DESA68_BRA : DESA68_BSR);
+
+}
+
+/* ======================================================================
+ *
+ * LINE 7 - MOVEQ
+ *
+ *
+ ***************/
+static void desa_line7(desa68_t * d)
+{
+ /* MOVEQ #VAL,Dn 01111 REG 0 8-BITVAL */
+
+ if ( BTST(d->_opw,8) ) {
+ desa_dcw(d);
+ } else {
+ int v = S8(d->_opw);
+ desa_str(d,"MOVEQ");
+ desa_space(d);
+ desa_char(d,'#');
+ desa_signifiant(d,v);
+ desa_comma(d);
+ desa_op_DN(d,d->_reg9);
+ }
+}
+
+
+/* ======================================================================
+ *
+ * LINE B :
+ * -CMP <ea>,Dn
+ * -CMPA <ea>,An
+ * -CMPM (An)+,(An)+,
+ * -EOR <ea>,Dn
+ *
+ *
+ * ====================================================================== */
+
+static int desa_check_cmpa(desa68_t * d)
+{
+ int modes = MBIT_ALL, opsz;
+
+ /* CMPA <ea>,An 1011 REG S11 ADRMOD */
+ if ( d->_opsz != 3 || !(modes & (1<<d->_adrm0)) )
+ return 0;
+ desa_ascii(d,'CMPA');
+ opsz = SZ_WORD + BIT8(d->_opw);
+ desa_opsz(d,opsz);
+ desa_space(d);
+ get_ea_2(d, &d->sref, opsz, d->_mode3, d->_reg0, opsz);
+ desa_comma(d);
+ desa_op_AN(d,d->_reg9);
+ return 1;
+}
+
+static int desa_check_eor_cmp(desa68_t * d)
+{
+ int modes, inst;
+
+ if (d->_opsz == 3)
+ return 0;
+
+ /* EOR Dn,<ea> 1011 REG 1SZ ADRMOD */
+ if (d->_opw & 256) {
+ modes = MBIT_ALL & ~(MBIT_AN|MBIT_SRC);
+ inst = 'EOR';
+ }
+ /* CMP <ea>,Dn 1011 REG 0SZ ADRMOD */
+ else {
+ modes = MBIT_ALL & ~(!d->_opsz ? MBIT_AN : 0);
+ inst = 'CMP';
+ }
+ if ( ! (modes & (1<<d->_adrm0) ) )
+ return 0;
+
+ desa_dn_ae(d,inst);
+ return 1;
+}
+
+static int desa_check_cmpm(desa68_t * d)
+{
+ /* CMPM (Ay)+,(Ax)+ 1011 RAX 1 SZ 001 RAY */
+ /* Equiv EOR Dn,An */
+ if ((d->_opw&0470) != 0410)
+ return 0;
+ desa_ascii(d,'CMPM');
+ desa_space(d);
+ desa_op_ANp(d, d->_reg0);
+ desa_comma(d);
+ desa_op_ANp(d, d->_reg9);
+ return 1;
+}
+
+static void desa_lineB(desa68_t * d)
+{
+ if ( !desa_check_cmpm(d) &&
+ !desa_check_cmpa(d) &&
+ !desa_check_eor_cmp(d)
+ ) desa_dcw(d);
+}
+
+/* ======================================================================
+ *
+ * LINE 8 - OR / SBCD / DIV
+ * LINE C - AND / ABCD / MUL / EXG
+ *
+ * ====================================================================== */
+
+static int desa_check_exg(desa68_t * d)
+{
+ /* EXG Dx,Dy 1100 RGx 101000 RGy
+ * EXG Ax,Ay 1100 RGx 101001 RGy
+ * EXG Dx,Ay 1100 RGx 110001 RGy */
+ u8 rx,ry;
+ switch ( d->_opw & 0770) {
+ case 0500:
+ rx = ry = 0;
+ break;
+ case 0510:
+ rx = ry = 8;
+ break;
+ case 0610:
+ rx = 0; ry = 8;
+ break;
+ default:
+ return 0;
+ }
+ desa_ascii(d,'EXG');
+ desa_space(d);
+ desa_op_RN(d, d->_reg9 + rx);
+ desa_comma(d);
+ desa_op_RN(d, d->_reg0 + ry);
+ return 1;
+}
+
+static int desa_check_mul_div(desa68_t * d)
+{
+ /* MUL <ea>,Dn 1100 REG U11 ADRMOD U:{Unsigned,Signed)
+ * DIV <ea>,Dn 1000 REG U11 ADRMOD */
+
+ const int modes = MBIT_ALL & ~MBIT_AN;
+
+ if ( d->_opsz != 3 || !( modes & (1<<d->_adrm0) ) )
+ return 0;
+ desa_ascii(d, BTST(d->_opw,14) ? 'MUL' : 'DIV');
+ desa_char(d, BTST(d->_opw,8) ? 'S' : 'U');
+ desa_space(d);
+ get_ea_2(d, &d->sref, SZ_WORD, d->_mode3, d->_reg0, SZ_WORD);
+ desa_comma(d);
+ desa_op_DN(d,d->_reg9);
+ return 1;
+}
+
+static int desa_check_abcd_sbcd(desa68_t * d)
+{
+ if ( (d->_opw&0x1f0) != 0x100 )
+ return 0;
+ desa_ry_rx(d,(d->_line==0xC) ? 'ABCD' : 'SBCD', SZ_IMPL);
+ return 1;
+}
+
+static int desa_check_and_or(desa68_t * d)
+{
+ int modemsk = !(d->_opw&0400)? 0xFFD : 0x1FC;
+ if ( ! (modemsk & (1<<d->_adrm0) ) )
+ return 0;
+ desa_dn_ae(d, (d->_line==0xC) ? 'AND' : 'OR');
+ return 1;
+}
+
+static void desa_lin8C(desa68_t * d)
+{
+ if (!desa_check_abcd_sbcd(d) &&
+ !desa_check_mul_div(d) &&
+ !desa_check_exg(d) &&
+ !desa_check_and_or(d))
+ desa_dcw(d);
+}
+
+/* ======================================================================
+ *
+ * LINE 9 - SUB / SUBX / SUBA
+ * LINE D - ADD / ADDX / ADDA
+ *
+ * ====================================================================== */
+
+static int desa_check_addx(desa68_t * d)
+{
+ /* ADDX Dy,Dx 1101 RGx 1 SZ 00 0 RGy
+ * ADDX -(Ay),-(Ax) 1101 RGx 1 SZ 00 1 RGy
+ * SUBX Dy,Dx 1001 RGx 1 SZ 00 0 RGy
+ * SUBX -(Ay),-(Ax) 1001 RGx 1 SZ 00 1 RGy */
+
+ assert( d->_opsz != 3 ); /* tested upstream */
+
+ if ( (d->_opw & 0460) != 0400 )
+ return 0;
+ desa_ry_rx(d, BTST(d->_opw,14) ? 'ADDX' : 'SUBX', d->_opsz);
+ return 1;
+}
+
+static int desa_check_adda(desa68_t * d)
+{
+ /* ADDA 1101 REG S11 ADRMOD S: {.W,.L}
+ * SUBA 1001 REG S11 ADRMOD
+ */
+ const int modes = MBIT_ALL;
+ int opsz;
+
+ assert(d->_opsz == 3); /* tested ipstream */
+
+ if (!(modes & (1<<d->_adrm0)))
+ return 0;
+
+ opsz = SZ_WORD + BIT8(d->_opw);
+ desa_ascii(d, BTST(d->_opw,14) ? 'ADDA' : 'SUBA');
+ desa_opsz(d,opsz);
+ desa_space(d);
+ get_ea_2(d, &d->sref, opsz, d->_mode3, d->_reg0, opsz);
+ desa_comma(d);
+ desa_op_AN(d, d->_reg9);
+ return 1;
+}
+
+static int desa_check_add(desa68_t * d)
+{
+ /* SUB <ea>,Dn 1001 REG 0SZ ADRMOD
+ * SUB Dn,<ea> 1001 REG 1SZ ADRMOD
+ * ADD <ea>,Dn 1101 REG 0SZ ADRMOD
+ * ADD Dn,<ea> 1101 REG 1SZ ADRMOD */
+
+ int modes = BTST(d->_opw,8) ? MBIT_DST : MBIT_ALL;
+
+ assert( d->_opsz != 3 ); /* tested upstream */
+
+ if (d->_opsz == 0) /* Forbid An for byte access size. */
+ modes &= ~MBIT_AN;
+
+ if ( ! (modes & (1<<d->_adrm0) ) )
+ return 0;
+ desa_dn_ae(d, BTST(d->_opw,14) ? 'ADD' : 'SUB');
+ return 1;
+}
+
+static void desa_lin9D(desa68_t * d)
+{
+ if (d->_opsz == 3) {
+ if (desa_check_adda(d))
+ return;
+ } else {
+ if (desa_check_addx(d) ||
+ desa_check_add(d))
+ return;
+ }
+ desa_dcw(d);
+}
+
+/* ======================================================================
+ *
+ * LINE E - bit Shift
+ *
+ * ====================================================================== */
+
+static void desa_lineE(desa68_t * d)
+{
+ /* SHIFT Dx,Dy 1110 RGx D SZ 1 TY RGy TY:type D:direction
+ * SHIFT #N,Dy 1110 VAL D SZ 0 TY RGy
+ * SHIFT <ea> 1110 0TY D 11 -ADRMOD- */
+
+ static u16 shf_ascii4 = { 'AS', 'LS', 'RO', 'RO' };
+
+ /* <ea> */
+ if (d->_opsz == 3) {
+ const int modes = MBIT_DST & ~(MBIT_DN|MBIT_AN);
+ const int type = d->_reg9;
+ if ( !(modes & (1<<d->_adrm0)) || (type&4)) {
+ desa_dcw(d);
+ return;
+ }
+ desa_ascii(d,shf_asciitype);
+ if (type == 2) desa_char(d,'X');
+ desa_char(d, BTST(d->_opw,8) ? 'L' :'R');
+ desa_space(d);
+ get_ea_2(d, &d->sref, SZ_BYTE, d->_mode3, d->_reg0, SZ_NDEF);
+ d->dref = d->sref;
+ }
+
+ /* Dn */
+ else {
+ const int type = ( d->_opw >> 3) & 3;
+ desa_ascii (d,shf_asciitype);
+ if (type==2) desa_char(d,'X');
+ desa_char (d, (d->_opw&0400) ? 'L' :'R');
+ desa_opsz(d,d->_opsz);
+ desa_space(d);
+ /* Dn,Dn */
+ if (d->_opw&(1<<5))
+ desa_op_DN(d,d->_reg9);
+ /* #N,Dn */
+ else {
+ desa_char(d,'#');
+ desa_char(d,'1' + ( ( d->_reg9 - 1 ) & 7 ));
+ }
+ desa_comma(d);
+ desa_op_DN(d,d->_reg0);
+ }
+}
+
+/* ======================================================================
+ *
+ * LINE A/F - instruction emulator
+ *
+ * ====================================================================== */
+
+static void desa_linAF(desa68_t * d)
+{
+ desa_dcw(d); /* before set_interrupt() call. */
+ set_interrupt(d, 0x40 + ( BITV(d->_opw,12) << 2 ) );
+}
+
+/* ======================================================================
+ *
+ * Main
+ *
+ * ====================================================================== */
+
+static void (*desa_line16)(desa68_t *) =
+{
+ desa_line0, desa_li123, desa_li123, desa_li123,
+ desa_line4, desa_line5, desa_line6, desa_line7,
+ desa_lin8C, desa_lin9D, desa_linAF, desa_lineB,
+ desa_lin8C, desa_lin9D, desa_lineE, desa_linAF,
+};
+
+static void rtcheck(void)
+{
+ assert( sizeof(s8) == 1 );
+ assert( sizeof(u8) == 1 );
+ assert( sizeof(s16) >= 2 );
+ assert( sizeof(u16) >= 2 );
+ assert( sizeof(s32) >= 4 );
+ assert( sizeof(u32) >= 4 );
+ assert( U8(0x18D) == 0x8D );
+ assert( S8(0x181) == -127 );
+ assert( U16(0x15D5D) == 0x5D5D );
+ assert( S16(0x18001) == -32767 );
+ assert( U32(~0) == 0xFFFFFFFF );
+ assert( S32(~1) == -2 );
+}
+
+int desa68(desa68_t * d)
+{
+ rtcheck();
+
+ /* Clean slate. */
+ d->sref.type = SZ_NDEF;
+ d->sref.addr = NDEF_ADDR;
+ d->dref = d->sref;
+ d->regs = 0; /* clear used registers. */
+ d->itype = DESA68_INS; /* assume valid generic instruction. */
+ d->error = 0; /* clear error flags. */
+
+ /* Setup 68k memory access. */
+ if (!d->memget)
+ d->memget = def_memget;
+ if (!d->memmsk)
+ d->memmsk = (1<<24)-1;
+
+ /* Setup symbol control */
+ if (!d->symget)
+ d->symget = def_symget;
+ if (!d->immsym_min && !d->immsym_max) {
+ d->immsym_min = d->memorg;
+ d->immsym_max = d->memorg + d->memlen;
+ }
+
+ /* Setup output string writer. */
+ if (!d->strput)
+ d->strput = def_strput;
+ if (!d->str)
+ d->strmax = 0;
+ d->out = 0;
+
+ /* Setup the ASCII disassembly. */
+ if (!d->ischar)
+ switch(d->flags & DESA68_GRAPH_FLAG) {
+ case DESA68_ASCII_FLAG:
+ d->ischar = my_isascii; break;
+ case DESA68_ALNUM_FLAG:
+ d->ischar = my_isalnum; break;
+ case DESA68_GRAPH_FLAG:
+ d->ischar = my_isgraph; break;
+ case 0:
+ default:
+ d->ischar = my_isfalse; break;
+ }
+
+ /* Setup instruction decoder. */
+ d->_pc = d->pc &= d->memmsk;
+ _pcW(d);
+
+ d->_quote = 0;
+ d->_opw = U16(d->_w);
+ d->_reg0 = REG0(d->_opw);
+ d->_reg9 = REG9(d->_opw);
+ d->_mode3 = MODE3(d->_opw);
+ d->_mode6 = MODE6(d->_opw);
+ d->_line = LINE(d->_opw);
+ d->_opsz = OPSZ(d->_opw);
+ d->_adrm0 = d->_mode3 + ((d->_mode3==MODE_ABSW)? d->_reg0 : 0);
+ d->_adrm6 = d->_mode6 + ((d->_mode6==MODE_ABSW)? d->_reg9 : 0);
+
+ (desa_lined->_line)(d);
+ desa_char(d,0);
+
+ /* Restore current status to caller struct */
+ d->pc &= d->memmsk;
+
+ assert(d->sref.type == SZ_NDEF || d->sref.addr != NDEF_ADDR);
+ assert(d->dref.type == SZ_NDEF || d->dref.addr != NDEF_ADDR);
+
+ if (d->sref.type != SZ_NDEF)
+ d->sref.addr &= d->memmsk;
+ else
+ d->sref.addr = ~0;
+
+ if (d->dref.type != SZ_NDEF)
+ d->dref.addr &= d->memmsk;
+ else
+ d->dref.addr = ~0;
+
+ return d->error ? DESA68_ERR : d->itype;
+}
+
+int desa68_version(void)
+{
+#ifndef PACKAGE_VERNUM
+# define PACKAGE_VERNUM 0
+#endif
+ return PACKAGE_VERNUM;
+}
+
+const char * desa68_versionstr(void)
+{
+#ifndef PACKAGE_STRING
+# define PACKAGE_STRING "desa68 n/a"
+#endif
+ return PACKAGE_STRING;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/desa68/desa68.h Added

@@ -0,0 +1,453 @@
+/**
+ * @ingroup lib_desa68
+ * @file desa68.h
+ * @brief Motorola 68K disassembler header.
+ * @author Benjamin Gerard
+ * @date 1999-03-17
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef DESA68_H
+#define DESA68_H
+
+#ifndef DESA68_EXTERN
+# ifdef __cplusplus
+# define DESA68_EXTERN extern "C"
+# else
+# define DESA68_EXTERN extern
+# endif
+#endif
+
+#ifndef DESA68_API
+/* Building */
+# ifdef DESA68_EXPORT
+# if defined(DLL_EXPORT) && defined(HAVE_DECLSPEC)
+# define DESA68_API __declspec(dllexport)
+# elif defined(HAVE_VISIBILITY)
+# define DESA68_API DESA68_EXTERN __attribute__ ((visibility("default")))
+# else
+# define DESA68_API DESA68_EXTERN
+# endif
+/* Using */
+# else
+# if defined(DESA68_DLL)
+# define DESA68_API __declspec(dllimport)
+# else
+# define DESA68_API DESA68_EXTERN
+# endif
+# endif
+#endif
+
+/**
+ * @defgroup lib_desa68 desa68 library
+ * @ingroup sc68_dev_lib
+ *
+ * desa68 is a standalone library to disassemble 68000 machine code.
+ *
+ * Additionally desa68 classes instructions by category; along with it
+ * determines possible program branch. Together with it helps to
+ * source machine code.
+ *
+ * Optionnally the disassembler may disassemble with symbol instead of
+ * absolute address or long immediat. A supplemental control is
+ * available to choose the range of address that must be disassembled
+ * as symbol.
+ *
+ * A complete example of how to use it may be found in the @ref
+ * prg_sourcer68 sourcer68 directory. This library is also used by the
+ * deprecated @ref prg_debug68 debug68 and @ref prg_cdbg68 cdbg68
+ * programs.
+ *
+ * Memory access
+ *
+ * There is 2 ways for the disassembler to access instruction data
+ * bytes. The legacy method and the new user callback method. The
+ * callback field desa68_t::memget is set to a function that is
+ * called by the disassembler or each bytes. The legacy method is a
+ * buffer pointed by desa68_t::memptr of desa68_t::memlen bytes
+ * starting at address/origin desa68_t::memorg. Internally the
+ * legacy method calls its own callback so in term of performance
+ * it's mostly the same (depending on the user callback
+ * complexity). When using the callback method desa68_t::memptr can
+ * be null. It's also possible not to set desa68_t::memorg and
+ * desa68_t::memlen fileds, only if a user callback is used for
+ * symbols or the disassembler is set not to generated symbols.
+ *
+ * Symbol lookup
+ *
+ * Just as memory access there is 2 ways for the disassembler to
+ * replace an address value by a symbol. The legacy method and the
+ * new user callback method. The callback field desa68_t::symget is
+ * set to a function that is called by the disassembler or each time
+ * it needs to determine if a value is a symbol. The legacy method
+ * is limited to simple generated symbol (L123456). If the
+ * DESA68_SYMBOL_FLAG is set in desa68_t::flags and the value is in
+ * the memory range, an address will be replaced by its
+ * symbol. There is an additionnal range for immediat long to be
+ * replace defined by the 2 fields desa68_t::immsym_min and
+ * desa68_t::immsym_max.
+ *
+ * @{
+ */
+
+#ifndef DESA68_API
+# error "DESA68_API should be defined"
+#endif
+
+/**
+ * Disassembly option flags.
+ * @anchor desa68_opt_flags
+ *
+ * Use bitwise OR operation with these values to set the the
+ * desa68_parm_t::flags in order to configure the disassembler.
+ *
+ * @note DESA68_ASCII_FLAG, DESA68_ALNUM_FLAG and DESA68_GRAPH_FLAG
+ * are mutualy exclusive.
+ */
+enum {
+ /**
+ * Disassemble with symbol.
+ *
+ * DESA68_SYMBOL_FLAG bit controls the general symbolic
+ * disassembly. If it is set all valid candidats are transformed to
+ * symbol. A valid candidat is an address within the memory range or
+ * an immediat higher or equal to desa68_t::immsym_min and lower
+ * than desa68_t::immsym_max.
+ */
+ DESA68_SYMBOL_FLAG = (1<<0),
+
+ /**
+ * Force source operand to be a valid candidat for symbol.
+ */
+ DESA68_SRCSYM_FLAG = (1<<1),
+
+ /**
+ * Force destination operand to be a valid candidat for symbol.
+ */
+ DESA68_DSTSYM_FLAG = (1<<2),
+
+ /**
+ * Disassemble immediate values to ASCII chars.
+ *
+ * DESA68_ASCII_FLAG is set to enable the conversion of immediate
+ * values to a corresponding quoted string if all its bytes belong
+ * to a special char set (alpha-numeric, space and a few other chars
+ * -_!.#).
+ *
+ * @warning The name of this flag cab be misleading.
+ * @see DESA68_ALNUM_FLAG
+ * @see DESA68_GRAPH_FLAG
+ */
+ DESA68_ASCII_FLAG = (1<<3),
+
+ /**
+ * Disassemble immediate values to alpha-numeric chars.
+ *
+ * DESA68_ALNUM_FLAG works like DESA68_ASCII_FLAG but for a pure
+ * alpha-numeric charset.
+ *
+ * @see DESA68_ASCII_FLAG
+ * @see DESA68_GRAPH_FLAG
+ */
+ DESA68_ALNUM_FLAG = (1<<4),
+
+ /**
+ * Disassemble immediate values to graphic chars.
+ *
+ * DESA68_GRAPH_FLAG works like DESA68_ASCII_FLAG but for a graphical
+ * charset 32 to 126.
+ *
+ * @see DESA68_ASCII_FLAG
+ * @see DESA68_ALNUM_FLAG
+ */
+ DESA68_GRAPH_FLAG = DESA68_ASCII_FLAG|DESA68_ALNUM_FLAG,
+
+ /**
+ * Lowercase disassembly.
+ */
+ DESA68_LCASE_FLAG = (1<<5),
+
+};
+
+/**
+ * Instruction types
+ * @anchor desa68_inst_types
+ *
+ * These values are used by the desa68_t::itype to help determine what
+ * kind of instruction was disassenbled.
+ *
+ */
+enum {
+ /* An error occured. */
+ DESA68_ERR = -1,
+
+ /** Invalid instruction (disassembled as data). */
+ DESA68_DCW = 0,
+
+ /** Generic instruction. */
+ DESA68_INS,
+
+ /** Branch always instruction (bra/jmp). */
+ DESA68_BRA,
+
+ /** Subroutine (bsr/jsr) or Conditionnal branch instruction (bcc/dbcc). */
+ DESA68_BSR,
+
+ /** Return from subroutine/Interruption instruction (rts/rte). */
+ DESA68_RTS,
+
+ /** Software interrupt instruction (trap/chk). */
+ DESA68_INT,
+
+ /** Nop instruction. */
+ DESA68_NOP
+};
+
+/**
+ * Error flags.
+ * @anchor desa68_error_flags
+ */
+enum {
+ /** Output writer failed. */
+ DESA68_ERR_OUT = 1,
+
+ /** Attempt to read word or long at odd address. */
+ DESA68_ERR_ODD = 2,
+
+ /** Memory access failed. */
+ DESA68_ERR_MEM = 4,
+
+ /** Uncommon byte immediate MSB. */
+ DESA68_ERR_IMM = 8
+};
+
+/**
+ * Operand types.
+ */
+
+/**
+ * Reference type.
+ * @anchor desa68_ref_types
+ * @warning DO NOT CHANGE ORDER.
+ */
+enum {
+ DESA68_OP_B, /**< Byte memory access. */
+ DESA68_OP_W, /**< Word memory access. */
+ DESA68_OP_L, /**< Long memory access. */
+ DESA68_OP_A, /**< Address Loaded. */
+ DESA68_OP_NDEF = 255 /**< Not defined. */
+};
+
+/**
+ * 68k registers identifier (8bit).
+ *
+ * @warning DO NOT CHANGE ORDER.
+ */
+enum {
+ DESA68_REG_DN = 0, /**< First data register. */
+ DESA68_REG_AN = 8, /**< First address register. */
+ DESA68_REG_SP = 15, /**< Stack pointer. */
+ DESA68_REG_USP, /**< User stack pointer. */
+ DESA68_REG_CCR, /**< Code condition register. */
+ DESA68_REG_SR, /**< Status register. */
+ DESA68_REG_PC, /**< Program counter. */
+ DESA68_REG_LAST, /**< Not real registers. */
+ };
+
+/**
+ * Symbol type for the desa68_t::symget() type argument.
+ */
+enum {
+ DESA68_SYM_NDEF, /**< Undefined. */
+ DESA68_SYM_DABW, /**< destination operand absolute address. */
+ DESA68_SYM_DABL, /**< destination operand absolute address. */
+ DESA68_SYM_SABW, /**< source operand absolute address. */
+ DESA68_SYM_SABL, /**< source operand absolute address. */
+ DESA68_SYM_SIMM, /**< source operand immediat value. */
+ DESA68_SYM_SPCR, /**< source operand pc relativ address. */
+ DESA68_SYM_SPCI, /**< source operand pc indexed address. */
+
+ DESA68_SYM_LAST
+};
+
+/**
+ * type for the 68K disassemble pass parameters structure.
+ */
+typedef struct desa68_parm_s desa68_t;
+
+/**
+ * 68K disassemble pass parameters.
+ *
+ * The desa68_t data structure contains the information necessary to
+ * disassemble 68K instructions.
+ *
+ * There are 3 categories of fields in this structure.
+ * - Input parameters; Must be set before calling the desa68() function.
+ * - Output parameters; Information on disassembled instruction
+ * filled by desa68() function.
+ * - Internal fields (start with an underscore "_").
+ *
+ * @note The desa68_t::pc field is both input and output since it
+ * is use to set the address of the instruction to decode and
+ * returns with the value of the next one.
+ */
+struct desa68_parm_s
+{
+ /**
+ * @name Input parameters.
+ *
+ * These parameters must be set before calling the desa68() functions.
+ *
+ * @{
+ */
+
+ /** User private data (cookie). */
+ void *user;
+
+ /** Function to read memory (or null). */
+ int (*memget)(desa68_t *, unsigned int addr, int flag);
+ /** 68K memory buffer. */
+ unsigned char *memptr;
+
+ /** Start address of the memory buffer. */
+ unsigned int memorg;
+
+ /** Size of memory. */
+ unsigned int memlen;
+
+ /** 68k memory addressing space (normally 24 bits). */
+ unsigned int memmsk;
+
+ /**
+ * Address (Offset in mem) of instruction to disassemble; Returns
+ * with the address of the next instruction.
+ */
+ unsigned int pc;
+ int flags; /**< @ref desa68_opt_flags "Disassemble options" */
+
+ /**
+ * A function to test for graphical chars. If not set (null) an
+ * appropriate function is selected according to desa68_t::flags
+ * DESA68_GRAPH_FLAG family flags.
+ */
+ int (*ischar)(desa68_t *, int);
+
+ /** Writer function (0:use default writer). */
+ void (*strput)(desa68_t *, int);
+ /** String used by default writer (can be 0) */
+ char *str;
+ /** Size of the buffer pointed by str (forced to 0 on null pointer). */
+ int strmax;
+
+ /** Output symbol function (or 0). */
+ const char * (*symget)(desa68_t *, unsigned int addr, int type);
+
+ /**
+ * Minimum value to select long immediate as symbol or address.
+ * @see DESA68_SYMBOL_FLAG for more details
+ * @see immsym_max
+ */
+ unsigned int immsym_min;
+
+ /**
+ * Maximum value to select long immediate as symbol or address.
+ * @see DESA68_SYMBOL_FLAG for more details
+ * @see immsym_min
+ */
+ unsigned int immsym_max;
+
+ /**
+ * @}
+ */
+
+
+ /**
+ * @name Output parameters.
+ *
+ * These parameters are setted by the desa68() functions.
+ * @{
+ */
+
+ unsigned int regs; /**< used registers bit mask. */
+ struct desa68_ref {
+ unsigned int type; /**< reference types. @see desa68_ref_types */
+ unsigned int addr; /**< reference address (if type is defined). */
+ }
+ sref, /**< source operand reference. */
+ dref; /**< destination operand reference. */
+
+ unsigned char itype; /**< Instruction type. @see desa68_inst_types */
+ unsigned char error; /**< Error flags. @see desa68_error_flags */
+
+ /**
+ * Output char count.
+ */
+ unsigned int out;
+
+ /**
+ * @}
+ */
+
+
+ /**
+ * @name Miscellaneous internal variables.
+ * @internal
+ * @{
+ */
+
+ /**
+ * Intermediat opcode decoding.
+ */
+ unsigned int _pc; /**< pc origin at start of disassembly. */
+ signed int _w; /**< Last decoded word (sign extended). */
+ unsigned int _opw; /**< First decoded word (opcode). */
+ unsigned char _reg0; /**< bit 2:0 of opcode word. */
+ unsigned char _mode3; /**< bit 5:3 of opcode word. */
+ unsigned char _opsz; /**< bit 7:6 of opcode word. */
+ unsigned char _mode6; /**< bit 8:6 of opcode word. */
+ unsigned char _reg9; /**< bit B:9 of opcode word. */
+ unsigned char _line; /**< bit F:C of opcode word. */
+ unsigned char _adrm0; /**< _mode3+_reg0. */
+ unsigned char _adrm6; /**< _mode6+_reg9. */
+ int _quote; /**< set when quoting. */
+ char _tmp16; /**< small scratch pad */
+
+ /**
+ * @}
+ */
+
+};
+
+DESA68_API
+/**
+ * Disassemble a single 68000 instruction.
+ *
+ * @param d Pointer to disassemble pass parameter structure.
+ * @return @ref desa68_inst_types instruction type
+ */
+int desa68(desa68_t *d);
+
+
+DESA68_API
+/**
+ * Get version number.
+ *
+ * @return X*100+Y*10+Z.
+ */
+int desa68_version(void);
+
+
+DESA68_API
+/**
+ * Get version string.
+ *
+ * @return version string.
+ */
+const char * desa68_versionstr(void);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/aenigmatica.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/alteredbeast.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/armalyte.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/asidifier.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/azidifier.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/bendaglish.deli.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/big.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/blipblop.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/blipp079.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/bs22.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/cabal.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/chipmon2.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/cosotfmx.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/crapman1.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/crapman2.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/deltamusic1.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/deltamusic2.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/digitfmx.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/dmu.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/dwaga.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/dyter07.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/elf.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/fc13_14.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/fireice.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/fred.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/gemx.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/harlequin.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/hippel-coso_note.deli.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/hpn-jam.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/huelsbeck.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/huntforredoct.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/ivanhoe.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/jamcracker10.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/jamcrackerpro.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/lastninja3.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/lastninjaiii.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/lcd.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/lx_mmme.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/mcoder.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/megatizer.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/metrocross.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/midi.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/mmme.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/mmmesid.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/mon.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/mon_old.deli.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/musmon1.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/musmon2.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/ninjaremix.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/ninjatfmx.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/nobuddiesland.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/none.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/note.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/note2.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/page.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/protracker.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/psg1.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/psgtrackerv2.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/puma.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/puma2.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/quartet.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/quartet_mindbomb.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/realms.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/robhubbard.deli.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/rollingronny.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/shadowdancer.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/sidmon1.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/sidmon2.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/sidsound.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/sndh_ice.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/soundfx.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/spacecrusade.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/spacegun.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/ssd1.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/stos.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/synthiv.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tao_digi.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tao_hubbard.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tao_ms211.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tao_ms25.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tao_ms27.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tao_tsd.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tcbtracker.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/test.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tfmx.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tfmx_aga.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tfmx_old.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tfmx_st.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/timerc.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/toki.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/tsd1.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/utopia.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/vikingchild.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/xbiossound.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/data68/Replay/zonewarrior.bin Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68.h Added

@@ -0,0 +1,512 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68.h
+ * @author Benjamin Gerard
+ * @date 1998-09-03
+ * @brief Music file header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_H
+#define FILE68_H
+
+#ifndef FILE68_API
+# include "file68_api.h"
+#endif
+#include "file68_vfs.h"
+#include "file68_tag.h"
+
+/**
+ * @defgroup lib_file68_fil Music file manipulation
+ * @ingroup lib_file68
+ *
+ * Provides various functions for sc68 file manipulation.
+ *
+ * @{
+ */
+
+/**
+ * SC68 (not IANA) official mime-type.
+ * @see file68_idstr
+ */
+#define SC68_MIMETYPE "audio/x-sc68"
+
+/**
+ * SC68 file identification string definition.
+ * @see file68_identifier()
+ */
+#define SC68_IDSTR "SC68 Music-file / (c) (BeN)jamin Gerard / SasHipA-Dev "
+
+/**
+ * SC68 file identification string definition V2.
+ * @see file68_identifier()
+ */
+#define SC68_IDSTR_V2 "SC68 M2"
+
+/* Old V2 never use except for experiental files ...
+#define SC68_IDSTR_V2 "SC68\0\002\377\251\337\353\321"
+*/
+
+#define SC68_NOFILENAME "n/a" /**< SC68 unknown filename or author. */
+
+/* Only for development purpose. Do not change that. */
+#ifndef SC68_DEFADDR
+# define SC68_DEFADDR 0x10000
+#endif
+
+enum {
+ SC68_DISK_ID = (('d' << 24) | ('i' << 16) | ('s' << 8) | 'k'),
+ SC68_LOADADDR = SC68_DEFADDR, /**< Default load address in 68K memory. */
+ SC68_MAX_TRACK = 63, /**< Maximum track per disk. */
+};
+
+/**
+ * @name Features flag definitions for file flags (portability). 
+ * @{
+ */
+enum {
+ SC68_PSG = 1 << 0, /**< YM-2149 (PSG). */
+ SC68_DMA = 1 << 1, /**< STE DMA. */
+ SC68_AGA = 1 << 2, /**< AMIGA/PAULA. */
+ SC68_XTD = 1 << 3, /**< Has extra info (following). */
+ SC68_LMC = 1 << 4, /**< STE LMC-1992. */
+
+ SC68_MFP_BIT = 5, /**< MFP timers bit position. */
+ SC68_MFP_TA = 1 << 5, /**< Timer-A used. */
+ SC68_MFP_TB = 1 << 6, /**< Timer-B used. */
+ SC68_MFP_TC = 1 << 7, /**< Timer-C used. */
+ SC68_MFP_TD = 1 << 8, /**< Timer-D used. */
+
+ SC68_HBL = 1 << 9, /**< HBL interrupt. */
+ SC68_BLT = 1 << 10, /**< STE blitter. */
+ SC68_DSP = 1 << 11, /**< Falcon DSP. */
+
+};
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+/**
+ * Hardware and features flags.
+ */
+typedef unsigned int hwflags68_t;
+
+/* typedef union { */
+/* struct { */
+/* unsigned psg:1; /\**< Require YM-2149 (ST PSG) *\/ */
+/* unsigned dma:1; /\**< Require STE DMA sound. *\/ */
+/* unsigned aga:1; /\**< Require Amiga/paula hardware. *\/ */
+/* unsigned xtd:1; /\**< Extended info available. *\/ */
+/* unsigned lmc:1; /\**< xtd: Require LMC-1992. *\/ */
+/* unsigned mfp:4; /\**< xtd: MFP timers (1 bit/timer). *\/ */
+/* unsigned hbl:1; /\**< xtd: HBL interrupt. *\/ */
+/* unsigned blt:1; /\**< xtd: STE/Mega-ST blitter. *\/ */
+/* unsigned dsp:1; /\**< xtd: Falcon DSP. *\/ */
+/* } bit; /\**< Flags bit field. *\/ */
+/* unsigned clr; /\**< All flags (clear only). *\/ */
+/* } hwflags68_t; */
+
+
+
+
+
+/**
+ * SC68 music (track) structure.
+ */
+typedef struct {
+ unsigned int d0; /**< D0 value to init this music. */
+ unsigned int a0; /**< A0 Loading address. @see SC68_LOADADDR. */
+ unsigned int frq; /**< Frequency in Hz (default:50). */
+
+ unsigned int first_ms; /**< First loop duration in ms. */
+ unsigned int first_fr; /**< First loop duration in frames. */
+ unsigned int loops_ms; /**< Loop duration in ms (0:no loop). */
+ unsigned int loops_fr; /**< Loop duration in frames (0:no loop). */
+ int loops; /**< Default number of loop (-1:infinite). */
+
+ struct {
+ unsigned sfx : 1; /**< Track is a sound-fx not a music. */
+ unsigned pic : 1; /**< Track is position independant code. */
+ unsigned time : 1; /**< Track has time info. */
+ unsigned loop : 1; /**< Track has loop info. */
+ } has; /**< Track flags. */
+
+ char *replay; /**< External replay name. */
+ hwflags68_t hwflags; /**< Hardware and features. */
+ tagset68_t tags; /**< Meta data. */
+ unsigned int datasz; /**< data size in bytes. */
+ char *data; /**< Music data. */
+} music68_t;
+
+
+/**
+ * SC68 music disk structure.
+ *
+ * The disk68_t structure is the memory representation for an SC68
+ * disk. Each SC68 file could several music or tracks, in the limit
+ * of a maximum of 256 tracks per file. Each music is independant,
+ * but some information, including music data, could be inherit from
+ * previous track. In a general case, tracks are grouped by theme,
+ * that could be a demo or a game.
+ *
+ */
+typedef struct {
+ int magic; /**< Magic identifier is FILE68_MAGIC. */
+ int def_mus; /**< Preferred default music (default is 0). */
+ int nb_mus; /**< Number of music track in file. */
+ unsigned int time_ms; /**< Total time for all tracks in ms. */
+ hwflags68_t hwflags; /**< All tracks flags ORed. */
+ int hash; /**< Caclulated hash (for sndh timedb). */
+ tagset68_t tags; /**< Meta tags for the disk (album) */
+
+ unsigned int force_track; /**< Forced track. */
+ int force_loops; /**< Forced loops (>0, -1:infinite). */
+ unsigned int force_ms; /**< Forced time in ms. */
+
+ music68_t musSC68_MAX_TRACK; /**< Information for each music. */
+ unsigned int datasz; /**< data size in byte. */
+ char *data; /**< points to data. */
+ char buffer4; /**< raw data. MUST be last member. */
+} disk68_t;
+
+/**
+ * @name Meta tag functions.
+ * @{
+ */
+
+FILE68_API
+/**
+ * Count and re-order metatags.
+ *
+ * The file68_tag_count() function counts metatags and ensures no
+ * empty tag within that count.
+ *
+ * @param mb pointer to SC68 disk
+ * @param track track number (0:disk)
+ *
+ * @retval -1 on error
+ * @retval >=0 number of tag (in fact it should always be >= 3)
+ */
+int file68_tag_count(const disk68_t * mb, int track);
+
+FILE68_API
+/**
+ * Enumerate metatags.
+ *
+ * The file68_tag_enum() function enumerates defined metatags.
+ *
+ * @param mb pointer to SC68 disk
+ * @param track track number (0:disk)
+ * @param idx index of the metatag
+ * @param key pointer to tag name
+ * @param val pointer to tag value
+ *
+ * @retval -1 on error
+ * @retval 0 on success
+ */
+int file68_tag_enum(const disk68_t * mb, int track, int idx,
+ const char ** key, const char ** val);
+
+FILE68_API
+/**
+ * Get metatag from disk or track.
+ *
+ * The file68_tag_get() function gets the value of a metatag.
+ *
+ * @param mb pointer to SC68 disk
+ * @param track track number (0:disk)
+ * @param key tag name
+ *
+ * @return tag value
+ * @retval 0 tag is not set
+ *
+ * @see file68_tag_set()
+ */
+const char * file68_tag_get(const disk68_t * mb, int track,
+ const char * key);
+
+FILE68_API
+/**
+ * Get a copy of a metatag from disk or track.
+ *
+ * The file68_tag() function gets a copy of the value of a metatag.
+ *
+ * Contrary to the file68_tag_get() function the file68_tag()
+ * function returns a wider range of tag. It can handle disk and
+ * track information that are avaiable in the disk68_t or music68_t
+ * structures.
+ *
+ * List of sipplemental metatags:
+ *
+ * - "track" returns track number (01) or default track for disk
+ * query.
+ * - "tracks" returns the number of tracks (01).
+ *
+ * @param mb pointer to SC68 disk
+ * @param track track number (0:disk)
+ * @param key tag name
+ *
+ * @return allocated copy of tag value
+ * @retval 0 tag is not set or copy failed.
+ *
+ * @note The caller have to free the returned string by itself.
+ * @todo Implements the dynamic part and use it in mksc68 and info68.
+ *
+ * @see file68_tag_get()
+ */
+char * file68_tag(const disk68_t * mb, int track, const char * key);
+
+/**
+ * @}
+ */
+
+
+FILE68_API
+/**
+ * Get metatag from disk or track.
+ *
+ * The file68_tag_set() function sets the value of a metatag.
+ *
+ * @param mb pointer to SC68 disk
+ * @param track track number (0:disk)
+ * @param key tag name
+ * @param val tag value to set (0 to unset)
+ *
+ * @return tag value
+ * @retval 0 tag is not set
+ *
+ * @see file68_tag_set()
+ */
+const char * file68_tag_set(disk68_t * mb, int track,
+ const char * key, const char * val);
+
+FILE68_API
+/**
+ * Check if an URI is a standard sc68 one.
+ *
+ * @param uri URI to check.
+ * @param exts extension list. (0 is default: ".sc68\0.sndh\0.snd\0").
+ * @param is_remote fill with 0/1 if respectevely URI is a local/remote
+ * file. May be 0.
+ * @return bool
+ * @retval 0 not compatible sc68 file
+ * @retval 1 sc68 compatible file
+ *
+ * @todo Implements file68_is_our()
+ * @warning Not implemented.
+ */
+int file68_is_our(const char * uri, const char * exts, int * is_remote);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name File load functions.
+ * @{
+ */
+
+FILE68_API
+/**
+ * Load SC68 file from stream.
+ *
+ * The file68_load() function allocates memory and loads an SC68
+ * file. The function performs all necessary initializations in the
+ * returned disk68_t structure. A single buffer has been allocated
+ * including disk68_t structure followed by music data. It is user
+ * charge to free memory by calling file68_free() function.
+ *
+ * @param is input stream
+ *
+ * @return pointer to allocated disk68_t disk structure
+ * @retval 0 failure
+ *
+ * @see file68_save()
+ */
+disk68_t * file68_load(vfs68_t * is);
+
+FILE68_API
+/**
+ * Load SC68 file.
+ *
+ * @param uri URI to load.
+ *
+ * @return pointer to allocated disk68_t disk structure
+ * @retval 0 failure
+ */
+disk68_t * file68_load_uri(const char * uri);
+
+FILE68_API
+/**
+ * Load SC68 file mapped into memory buffer.
+ *
+ * @param buffer buffer address
+ * @param len buffer length
+ *
+ * @return pointer to allocated disk68_t disk structure
+ * @retval 0 failure
+ */
+disk68_t * file68_load_mem(const void * buffer, int len);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name File save functions.
+ * @{
+ */
+
+FILE68_API
+/**
+ * Save SC68 disk into stream.
+ *
+ * @param os output stream (must be seekable)
+ * @param mb pointer to SC68 disk to save
+ * @param version file version 0:default
+ * @param gzip gzip compression level 0:no-gzip, 1..9 or -1
+ *
+ * @return error-code
+ * @retval 0 success
+ * @retval <0 failure
+ *
+ * @see file68_load()
+ * @see file68_verify()
+ * @see file68_diskname()
+ */
+int file68_save(vfs68_t * os, const disk68_t * mb,
+ int version, int gzip);
+
+FILE68_API
+/**
+ * Save SC68 disk into file.
+ *
+ * @param uri URI to save.
+ * @param mb pointer to SC68 disk to save
+ * @param version file version 0:default
+ * @param gzip gzip compression level 0:no-gzip, 1..9 or -1
+ */
+int file68_save_uri(const char * uri, const disk68_t * mb,
+ int version, int gzip);
+
+FILE68_API
+/**
+ * Save SC68 disk into memory buffer.
+ *
+ * @param buffer destination buffer.
+ * @param len size of destination buffer.
+ * @param mb pointer to SC68 disk to save
+ * @param version file version 0:default
+ * @param gzip gzip compression level 0:no-gzip, 1..9 or -1
+ */
+int file68_save_mem(const char * buffer, int len, const disk68_t * mb,
+ int version, int gzip);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Memory allocation functions.
+ * @{
+ */
+
+FILE68_API
+/**
+ * Create fresh new disk.
+ *
+ * @param extra extra bytes to allocate
+ *
+ * @return a pointer to allocated disk
+ * @retval 0 failure
+ *
+ */
+disk68_t * file68_new(int extra);
+
+FILE68_API
+/**
+ * Destroy loaded or allocated disk.
+ *
+ * @param disk disk to free.
+ *
+ * @see file68_new()
+ * @see file68_load()
+ */
+void file68_free(const disk68_t * disk);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Library functions.
+ * @{
+ */
+
+FILE68_API
+/**
+ * Get package version string.
+ *
+ * @return "file68 X.Y.Z"
+ */
+const char * file68_versionstr(void);
+
+FILE68_API
+/**
+ * Get package version number.
+ *
+ * @return X*100+Y*10+Z
+ */
+int file68_version(void);
+
+FILE68_API
+/**
+ * Get identifier string.
+ * @param version 0:default 1:v1 2:v2
+ * @return a static string of the identifier
+ * @see SC68_IDSTR
+ * @see SC68_IDSTR_V2
+ */
+const char * file68_identifier(int version);
+
+FILE68_API
+/**
+ * Get sc68 official (no IANA) mime type.
+ * @return a static string of the mimetype (should be audio/x-sc68).
+ */
+const char * file68_mimetype(void);
+
+FILE68_API
+/**
+ * Initialize file68 library.
+ *
+ * @param argc argument count
+ * @param argv argument array
+ * @return new argument count
+ */
+int file68_init(int argc, char **argv);
+
+FILE68_API
+/**
+ * Shutdown file68 library.
+ */
+void file68_shutdown(void);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_api.h Added

@@ -0,0 +1,65 @@
+/**
+ * @ingroup  lib_file68
+ * @file     sc68/file68_api.h
+ * @author   Benjamin Gerard
+ * @date     2007-02-25
+ * @brief    Symbol exportation header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_API_H
+#define FILE68_API_H
+
+/**
+ * @defgroup lib_file68 file68 library
+ * @ingroup  sc68_dev_lib
+ *
+ *   file68 is a library to manipulate sc68 files and access sc68
+ *   resources and much more.
+ *
+ * @{
+ */
+
+#ifndef FILE68_EXTERN
+# ifdef __cplusplus
+/** Decorate symbols exported locally. */
+#   define FILE68_EXTERN extern "C"
+# else
+#   define FILE68_EXTERN extern
+# endif
+#endif
+
+#ifndef FILE68_API
+/* Building */
+# ifdef FILE68_EXPORT
+#  if defined(DLL_EXPORT) && defined(HAVE_DECLSPEC)
+#   define FILE68_API __declspec(dllexport)
+#  elif defined(HAVE_VISIBILITY)
+#   define FILE68_API FILE68_EXTERN __attribute__ ((visibility("default")))
+#  else
+#   define FILE68_API FILE68_EXTERN
+#  endif
+/* Using */
+# else
+#  if defined(FILE68_DLL)
+#   define FILE68_API __declspec(dllimport)
+#  else
+#   define FILE68_API FILE68_EXTERN
+#  endif
+# endif
+#endif
+
+/**
+ * Decorate symbols exported for public.
+*/
+#ifndef FILE68_API
+#define FILE68_API FILE68_EXTERN
+#error "FILE68_API should be defined"
+#endif
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_chk.h Added

@@ -0,0 +1,68 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_chk.h
+ * @author Benjamin Gerard
+ * @date 2011-10-02
+ * @brief Chunk definition header file.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_CHK_H
+#define FILE68_CHK_H
+
+/**
+ * @addtogroup lib_file68
+ * @{
+ */
+
+/**
+ * SC68 file chunk header.
+ */
+typedef struct
+{
+ char id4; /**< Must be "SC??". */
+ char size4; /**< Size in bytes (MSB first). */
+} chunk68_t;
+
+/**
+ * @name SC68 file chunk definitions.
+ * @{
+ */
+
+#define CH68_CHUNK "SC" /**< Chunk identifier. */
+#define CH68_BASE "68" /**< Start of file. */
+#define CH68_FNAME "FN" /**< File name (album). */
+#define CH68_DEFAULT "DF" /**< Album default music. */
+#define CH68_MUSIC "MU" /**< Music (track) section start. */
+#define CH68_MNAME "MN" /**< Track name (title). */
+#define CH68_ANAME "AN" /**< Track or album artist. */
+#define CH68_CNAME "CN" /**< Track or album original artist. */
+#define CH68_D0 "D0" /**< Track 'd0' value. */
+#define CH68_AT "AT" /**< Track load address. */
+#define CH68_TIME "TI" /**< Track length in seconds. @deprecated */
+#define CH68_FRAME "FR" /**< Track length in frames. */
+#define CH68_FRQ "FQ" /**< Track replay rate in Hz. */
+#define CH68_LOOP "LP" /**< Track number of loop. */
+#define CH68_LOOPFR "LF" /**< Track loop length in frames. */
+#define CH68_TYP "TY" /**< Track HW feature flag. */
+#define CH68_YEAR "YY" /**< Track publishing year. */
+#define CH68_COPYRIGHT "CR" /**< Track or album copyright owner. */
+#define CH68_TAG "TG" /**< Track or album Meta tag. */
+#define CH68_REPLAY "RE" /**< Track external replay. */
+#define CH68_UTF8 "U8" /**< String are UTF-8 encoded. */
+#define CH68_ALIGN "32" /**< Chunks are 32bit aligned. */
+#define CH68_SFX "FX" /**< Track is a sound-fx. */
+#define CH68_MDATA "DA" /**< Music data. */
+#define CH68_EOF "EF" /**< End of file. */
+#define CH68_NULL "\0\0" /**< Null. */
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_err.h Added

@@ -0,0 +1,87 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_err.h
+ * @author Benjamin Gerard
+ * @date 2003-08-08
+ * @brief Error message header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_ERR_H
+#define FILE68_ERR_H
+
+#ifndef FILE68_API
+# include "file68_api.h"
+#endif
+#include <stdarg.h>
+
+
+/**
+ * @defgroup lib_file68_err Error message
+ * @ingroup lib_file68
+ *
+ * Provides error message facilities.
+ *
+ * @{
+ */
+
+FILE68_API
+/**
+ * Print a formatted error message.
+ *
+ * The error68() function prints an error message via the
+ * msg68_error() function.
+ *
+ * @param format printf() like format string
+ *
+ * @return error-code
+ * @retval -1
+ */
+int error68(const char * format, ... );
+
+FILE68_API
+/**
+ * Extended version of error68() function.
+ *
+ * @param cookie user parameter
+ * @param format printf() like format string
+ *
+ * @return error-code
+ * @retval -1
+ *
+ * @see error68()
+ */
+int error68x(void * cookie, const char * format, ... );
+
+FILE68_API
+/**
+ * Print a formatted error message (variable argument version).
+ *
+ * @param format printf() like format string
+ * @param list variable argument list
+ *
+ * @see error68()
+ */
+int error68_va(const char * format, va_list list);
+
+FILE68_API
+/**
+ * Extended version of error68() function.
+ *
+ * @param cookie user parameter
+ * @param format printf() like format string
+ * @param list variable argument list
+ *
+ * @return error-code
+ * @retval -1
+ *
+ * @see error68()
+ */
+int error68x_va(void * cookie, const char * format, va_list list);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_features.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_ice.h Added

@@ -0,0 +1,82 @@
+/**
+ * @ingroup  lib_file68
+ * @file     sc68/file68_ice.h
+ * @author   Benjamin Gerard
+ * @date     2003-09-06
+ * @brief    ICE loader header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_ICE_H
+#define FILE68_ICE_H
+
+#include "file68_vfs.h"
+
+/**
+ * @defgroup  lib_file68_ice  ICE loader support.
+ * @ingroup   lib_file68
+ *
+ *   Provides functions for loading ICE stream.
+ *
+ * @{
+ */
+
+FILE68_API
+/**
+ * Get ICE! depacker version.
+ *
+ * @retval   1  ICE! is supported but unknown version
+ * @retval   0  ICE! is not supported
+ * @return  ICE! depacker version
+ *
+ * @see unice68_ice_version()
+ */
+int file68_ice_version(void);
+
+FILE68_API
+/**
+ * Test ice file header magic header.
+ *
+ * @param  buffer  Buffer containing at least 12 bytes from ice header.
+ *
+ * @retval  1  buffer seems to be ice packed..
+ * @retval  0  buffer is not ice packed.
+ */
+int file68_ice_is_magic(const void * buffer);
+
+FILE68_API
+/**
+ * Load an iced stream.
+ *
+ *   The file68_ice_load() function loads and depack an ice packed
+ *   file from a stream and returns a allocate buffer with unpacked
+ *   data.
+ *
+ * @param  is     Stream to load (must be opened in read mode).
+ * @param  ulen   Pointer to save uncompressed size.
+ *
+ * @return Pointer to the uncompressed data buffer.
+ * @retval 0 Error
+ */
+void * file68_ice_load(vfs68_t * is, int * ulen);
+
+FILE68_API
+/**
+ * Load an iced file.
+ *
+ * @param  fname    File to load.
+ * @param  ulen     Pointer to save uncompressed size.
+ *
+ * @return Pointer to the uncompressed data buffer.
+ * @retval 0 Error
+ *
+ * @see file68_ice_load()
+ */
+void * file68_ice_load_file(const char * fname, int * ulen);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_msg.h Added

@@ -0,0 +1,398 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_msg.h
+ * @brief Message header.
+ * @author Benjamin Gerard
+ * @date 2003-08-22
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_MSG_H
+#define FILE68_MSG_H
+
+#ifndef FILE68_API
+# include "file68_api.h"
+#endif
+#include <stdarg.h>
+
+#ifdef __GNUC__
+# define FMT12 __attribute__ ((format (printf, 1, 2)))
+# define FMT23 __attribute__ ((format (printf, 2, 3)))
+# define FMT34 __attribute__ ((format (printf, 3, 4)))
+#else
+# define FMT12 /**< @nodoc */
+# define FMT23 /**< @nodoc */
+# define FMT34 /**< @nodoc */
+#endif
+
+/**
+ * @defgroup lib_file68_msg Output messages
+ * @ingroup lib_file68
+ * @brief Provides functions to output text messages.
+ *
+ * The output message system defines fixed categories of message:
+ * msg68_CRITICAL, msg68_ERROR, msg68_WARNING, msg68_NOTICE,
+ * msg68_INFO, msg68_DEBUG and msg68_TRACE. Each of them can be
+ * freely enabled (output) or disabled (filter out). msg68_TRACE
+ * also enable any user defined categories created by the
+ * msg68_category() function. Special value msg68_NEVER always
+ * filter out the message. In the contrary the special value
+ * msg68_ALWAYS always output the message.
+ *
+ * @{
+ */
+
+/**
+ * Message handler type.
+ *
+ * @param bit one of the @ref msg68_cat_e enum value.
+ * @param user_data user private data.
+ * @param format printf like format string.
+ * @param va_list variable argument list.
+ */
+typedef void (*msg68_t)(int, void*, const char*, va_list);
+
+/**
+ * Message category help display function.
+ *
+ * @param user_data user private data.
+ * @param bit one of the @ref msg68_cat_e enum value.
+ * @param name category name.
+ * @param description short description.
+ */
+typedef void (*msg68_help_t)(void*, int, const char*, const char*);
+
+/**
+ * Predefined message categories.
+ */
+enum msg68_cat_e
+{
+ msg68_NEVER = -3, /**< Never printed message. */
+ msg68_ALWAYS = -2, /**< Always printed message. */
+ msg68_CRITICAL = 0, /**< Critical error message. */
+ msg68_ERROR , /**< Error message. */
+ msg68_WARNING , /**< Warning message. */
+ msg68_INFO , /**< Informationnal message. */
+ msg68_NOTICE , /**< Notice message. */
+ msg68_DEBUG , /**< Debug message. */
+ msg68_TRACE , /**< Trace message. */
+
+# ifndef DEBUG
+ msg68_DEFAULT = msg68_NEVER
+# else
+ msg68_DEFAULT = msg68_DEBUG
+# endif
+
+};
+
+/**
+ * @name Category manipulation functions.
+ * @{
+ */
+
+FILE68_API
+/**
+ * Modify message category filter mask.
+ *
+ * The msg68_cat_filter() function modifies the current message mask
+ * allowing to control message category filter.
+ *
+ * @param clr bit to clear in the category mask.
+ * @param set bit to set in the category mask.
+ * @return modified mask
+ */
+unsigned int msg68_cat_filter(unsigned int clr, unsigned int set);
+
+FILE68_API
+/**
+ * Get named categories.
+ *
+ * @param name name of category.
+ * @return bit number of named category.
+ * @retval -1 on error (category does not exist).
+ */
+int msg68_cat_bit(const char * name);
+
+FILE68_API
+/**
+ * Create/Modify a category.
+ *
+ * @param name category name.
+ * @param desc a short description the the category.
+ * @param filter 0:set to disable the category.
+ */
+int msg68_cat(const char * name, const char * desc, int filter);
+
+FILE68_API
+/**
+ * Free/Destroy a category.
+ */
+void msg68_cat_free(int cat);
+
+FILE68_API
+/**
+ * Set all predefined categories mask according to given level.
+ *
+ * @param cat message category (@see msg68_cat_e)
+ *
+ * @return mofidied mask
+ */
+int msg68_cat_level(int cat);
+
+FILE68_API
+/**
+ * Get info on a category.
+ */
+int msg68_cat_info(int cat, const char **name, const char **desc, int * next);
+
+FILE68_API
+/**
+ * Print defined categories.
+ */
+void msg68_cat_help(void * cookie, msg68_help_t fct);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Customize functions.
+ * @{
+ */
+
+FILE68_API
+/**
+ * Set message handler.
+ *
+ * @param handler pointer to a function to display debug messages
+ * (0 desactive debug message).
+ * @return previous handler
+ */
+msg68_t msg68_set_handler(msg68_t handler);
+
+FILE68_API
+/**
+ * Set message handler user-data parameter.
+ *
+ * @param cookie user parameter that will be sent as first parameter to
+ * the output handler.
+ *
+ * @see msg68_set_handler();
+ */
+void * msg68_set_cookie(void * cookie);
+
+/**
+ * @} */
+
+
+/**
+ * @name Simple message functions
+ * @{
+ *
+ * The msg68_ output functions have no userdata parameter therefore
+ * the value set by the msg68_set_cookie() will be passed to the
+ * message handler function.
+ */
+
+FILE68_API
+/**
+ * Print generic message (variable argument).
+ *
+ * @param cat message type @ref msg68_cat_e.
+ * @param fmt printf() like format string.
+ * @param list variable argument list (stdarg.h)
+ */
+void msg68_va(int cat, const char * fmt, va_list list);
+
+FILE68_API FMT23
+/**
+ * Print generic message.
+ *
+ * @param cat message type @ref msg68_cat_e.
+ * @param fmt printf() like format string.
+ */
+void msg68(int cat, const char * fmt, ...);
+
+FILE68_API FMT12
+/**
+ * Print critical message.
+ *
+ * @param fmt printf() like format string.
+ */
+void msg68_critical(const char * fmt, ...);
+
+FILE68_API FMT12
+/**
+ * Print error message.
+ *
+ * @param fmt printf() like format string.
+ */
+void msg68_error(const char * fmt, ...);
+
+FILE68_API FMT12
+/**
+ * Print warning message.
+ *
+ * @param fmt printf() like format string.
+ */
+void msg68_warning(const char * fmt, ...);
+
+FILE68_API FMT12
+/**
+ * Print notice message.
+ *
+ * @param fmt printf() like format string.
+ */
+void msg68_notice(const char * fmt, ...);
+
+FILE68_API FMT12
+/**
+ * Print info message.
+ *
+ * @param fmt printf() like format string.
+ */
+void msg68_info(const char * fmt, ...);
+
+FILE68_API FMT12
+/**
+ * Print debug message.
+ *
+ * @param fmt printf() like format string.
+ */
+void msg68_debug(const char * fmt, ...);
+
+FILE68_API FMT12
+/**
+ * Print trace message.
+ *
+ * @param fmt printf() like format string.
+ */
+void msg68_trace(const char * fmt, ...);
+
+/**
+ * @}
+ */
+
+/**
+ * @name Extended message functions
+ * @{
+ *
+ * The msg68x_ output functions are identical to the msg68_ ones
+ * except for an additionnal cookie parameter which will be pass to
+ * the handler function instead of the one set by the
+ * msg68_set_cookie() function.
+ */
+
+FILE68_API FMT34
+/**
+ * Print message (eXtended version).
+ *
+ * @param cat message type @ref msg68_cat_e.
+ * @param cookie user data.
+ * @param fmt printf() like format string.
+ */
+void msg68x(int cat, void * cookie, const char * fmt, ...);
+
+FILE68_API
+/**
+ * Print message (eXtended version; variable argument).
+ *
+ * @param cat message type @ref msg68_cat_e.
+ * @param cookie user data.
+ * @param fmt printf() like format string.
+ * @param list variable argument list (stdarg.h)
+ */
+void msg68x_va(int cat, void * cookie, const char * fmt, va_list list);
+
+FILE68_API FMT23
+/**
+ * Print critical message (eXtended version).
+ *
+ * @param cookie user data.
+ * @param fmt printf() like format string.
+ */
+void msg68x_critical(void * cookie, const char * fmt, ...);
+
+FILE68_API FMT23
+/**
+ * Print error message (eXtended version).
+ *
+ * @param cookie user data.
+ * @param fmt printf() like format string.
+ */
+void msg68x_error(void * cookie, const char * fmt, ...);
+
+FILE68_API FMT23
+/**
+ * Print warning message (eXtended version).
+ *
+ * @param cookie user data.
+ * @param fmt printf() like format string.
+ */
+void msg68x_warning(void * cookie, const char * fmt, ...);
+
+FILE68_API FMT23
+/**
+ * Print notice message (eXtended version).
+ *
+ * @param cookie user data.
+ * @param fmt printf() like format string.
+ */
+void msg68x_notice(void * cookie, const char * fmt, ...);
+
+FILE68_API FMT23
+/**
+ * Print info message (eXtended version).
+ *
+ * @param cookie user data.
+ * @param fmt printf() like format string.
+ */
+void msg68x_info(void * cookie, const char * fmt, ...);
+
+FILE68_API FMT23
+/**
+ * Print debug message (eXtended version).
+ *
+ * @param cookie user data.
+ * @param fmt printf() like format string.
+ */
+void msg68x_debug(void * cookie, const char * fmt, ...);
+
+FILE68_API FMT23
+/**
+ * Print trace message (eXtended version).
+ *
+ * @param cookie user data.
+ * @param fmt printf() like format string.
+ */
+void msg68x_trace(void * cookie, const char * fmt, ...);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#ifndef TRACE68
+# ifdef NDEBUG
+# if defined(__GNUC__) || defined(CPP_SUPPORTS_VA_MACROS)
+# define TRACE68(cat,fmt,...)
+# ifndef CPP_SUPPORTS_VA_MACROS
+# define CPP_SUPPORTS_VA_MACROS 1
+# endif
+# else
+# define TRACE68 if (0);else msg68_dummy
+FMT23 static void msg68_dummy(int cat, const char * fmt, ...) {}
+# endif
+# define VTRACE68(cat,fmt,list)
+# else
+# define TRACE68 msg68 /**< @nodoc */
+# define VTRACE68 msg68_va /**< @nodoc */
+# endif
+#endif
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_opt.h Added

@@ -0,0 +1,301 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_opt.h
+ * @brief Command line option manipulation header.
+ * @author Benjamin Gerard
+ * @date 2009-02-04
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_OPT_H
+#define FILE68_OPT_H
+
+#ifndef FILE68_API
+# include "file68_api.h"
+#endif
+
+/**
+ * @defgroup lib_file68_opt Options manipulation
+ * @ingroup lib_file68
+ *
+ * Provides command line options manipulation functions.
+ *
+ * @{
+ */
+
+/**
+ * Option value types.
+ */
+enum option68_type_e {
+ opt68_BOL = 0, /**< Value type boolean. */
+ opt68_STR, /**< Value type string. */
+ opt68_INT, /**< Value type integer. */
+ opt68_ENU, /**< Value type enum. */
+ opt68_TYP /**< Number of types. */
+};
+
+/**
+ * Option value origin (sorted by priority).
+ */
+enum option68_org_e {
+ opt68_UDF = 0, /**< Option not defined (set). */
+ opt68_CFG, /**< Option set by config. */
+ opt68_ENV, /**< Option set by environment var. */
+ opt68_CLI, /**< Option set by command line. */
+ opt68_APP, /**< Option set by application. */
+ opt68_ORG /**< Number of origin. */
+};
+
+/**
+ * Option set polocies.
+ */
+enum option68_set_e {
+ opt68_NEVER = 0, /**< Never set. */
+ opt68_ALWAYS, /**< Always set. */
+ opt68_NOTSET, /**< If not already set. */
+ opt68_ISSET, /**< If is already set. */
+ opt68_PRIO, /**< If origin priority is higher or same . */
+};
+
+/**
+ * Option type.
+ */
+typedef struct option68_s option68_t;
+
+/**
+ * option value.
+ */
+typedef union {
+ const char * str; /**< Value for string argument. */
+ int num; /**< Value for integer argument. */
+} value68_t;
+
+/**
+ * Options help display function.
+ */
+typedef void (*option68_help_t)(void * cookie,
+ const char * option,
+ const char * envvar,
+ const char * values,
+ const char * desc);
+
+/**
+ * Callback on change value.
+ *
+ * @retval 0 Accept new value
+ */
+typedef int (*option68_cb_t)(const option68_t *, value68_t *);
+
+/**
+ * Macro to declare a generic option.
+ */
+#define OPT68(PREFIX,NAME,CAT,DESC,SET,NSET,MIN,MAX,TYPE,SAVE,ONCHG) \
+ { PREFIX,NAME,CAT,DESC,ONCHG,MIN,MAX,SET,NSET,TYPE,SAVE,0,opt68_UDF,{0} }
+
+/**
+ * Macro to declare a boolean option
+ */
+#define OPT68_BOOL(PREFIX,NAME,CAT,DESC,SAVE,ONCHG) \
+ OPT68(PREFIX,NAME,CAT,DESC,0,0,-1,0,opt68_BOL,SAVE,ONCHG)
+
+/**
+ * Macro to declare a simple integer option.
+ */
+#define OPT68_INTE(PREFIX,NAME,CAT,DESC,SAVE,ONCHG) \
+ OPT68(PREFIX,NAME,CAT,DESC,0,0,0,0,opt68_INT,SAVE,ONCHG)
+
+/**
+ * Macro to declare a integer enum option.
+ */
+#define OPT68_ENUM(PREFIX,NAME,CAT,DESC,SET,NSET,SAVE,ONCHG) \
+ OPT68(PREFIX,NAME,CAT,DESC,SET,NSET,0,(NSET)-1,opt68_ENU,SAVE,ONCHG)
+
+/**
+ * Macro to declare a simple string option.
+ */
+#define OPT68_STRG(PREFIX,NAME,CAT,DESC,SAVE,ONCHG) \
+ OPT68(PREFIX,NAME,CAT,DESC,0,0,0,0,opt68_STR,SAVE,ONCHG)
+
+/**
+ * Macro to declare an integer option with a set of values.
+ */
+#define OPT68_ISET(PREFIX,NAME,CAT,DESC,SET,NSET,SAVE,ONCHG) \
+ OPT68(PREFIX,NAME,CAT,DESC,SET,NSET,0,0,opt68_INT,SAVE,ONCHG)
+
+/**
+ * Macro to declare an string option with a set of values.
+ */
+#define OPT68_SSET(PREFIX,NAME,CAT,DESC,SET,NSET,SAVE,ONCHG) \
+ OPT68(PREFIX,NAME,CAT,DESC,SET,NSET,0,0,opt68_STR,SAVE,ONCHG)
+
+/**
+ * Macro to declare an integer option within a range.
+ */
+#define OPT68_IRNG(PREFIX,NAME,CAT,DESC,MIN,MAX,SAVE,ONCHG) \
+ OPT68(PREFIX,NAME,CAT,DESC,0,0,MIN,MAX,opt68_INT,SAVE,ONCHG)
+
+/**
+ * Command line option description and parsing info.
+ */
+struct option68_s {
+ const char * prefix; /**< Key prefix. */
+ const char * name; /**< Key name (bare). */
+ const char * cat; /**< Category name. */
+ const char * desc; /**< Short description. */
+
+ option68_cb_t onchange; /**< Call on value change. */
+
+ int min; /**< Mininal for integer values. */
+ int max; /**< Maximal for integer values. */
+
+ const void * set; /**< Set of acceptable values. */
+
+ unsigned int sets : 5; /**< Size of set */
+ unsigned int type : 2; /**< @see option68_type_e. */
+ unsigned int save : 1; /**< Save in config. */
+ unsigned int hide : 1; /**< Hide from user. */
+ unsigned int org : 3; /**< @see option68_org_e. */
+ value68_t val; /**< Option value. */
+
+ int prefix_len; /**< length of option68_t::prefix. */
+ int name_len; /**< length of option68_t::name. */
+ option68_t * next; /**< Chain to next option. */
+};
+
+FILE68_API
+/**
+ * Print defined options.
+ *
+ * @param cookie User data used as 1st argument for fct
+ * @param fct Function call for each selected option
+ * @param flags filter selection. At the moment only bit#0 is
+ * used to unhide options. Other bits are reserved
+ * for future use and must be clear.
+ */
+void option68_help(void * cookie, option68_help_t fct, int flags);
+
+
+FILE68_API
+/**
+ * Append option definitions.
+ *
+ * @param options Array of options
+ * @param n Array size
+ *
+ * @note Options are not internally copied.
+ */
+int option68_append(option68_t * options, int n);
+
+FILE68_API
+/**
+ * Parse command line options.
+ *
+ * @param argc argument count
+ * @param argv arguments
+ * @retval remaining argc
+ */
+int option68_parse(int argc, char ** argv);
+
+FILE68_API
+/**
+ * Get option type.
+ *
+ * @param opt option
+ * @return one of option68_e value
+ * @retval option68_ERR on error
+ */
+int option68_type(const option68_t * opt);
+
+FILE68_API
+/**
+ * Enumerate options.
+ *
+ * @param idx options index (0-based).
+ * @return option
+ * @retval 0 not found
+ */
+option68_t * option68_enum(int idx);
+
+FILE68_API
+/**
+ * Get option by name.
+ *
+ * @param key argument count
+ * @param set set policy (@see option68_set_e)
+ * @return option
+ * @retval 0 not found
+ */
+option68_t * option68_get(const char * key, int set);
+
+FILE68_API
+/**
+ * Test if option has been set.
+ *
+ * @param opt option to test
+ * @retval 1 option has been set
+ * @retval 0 option has not been set
+ */
+int option68_isset(const option68_t * opt);
+
+FILE68_API
+/**
+ * Set option.
+ *
+ * @param opt option to set
+ * @return option origin (@see option68_org_e)
+ */
+int option68_org(const option68_t * opt);
+
+FILE68_API
+/**
+ * Set option (integer and boolean only).
+ *
+ * @param opt option to set
+ * @param val integer value
+ * @param set set policy (@see option68_set_e)
+ * @param org origin (@see option68_org_e)
+ * @retval 0 on success
+ * @retval -1 on failure
+ */
+int option68_iset(option68_t * opt, int val, int set, int org);
+
+FILE68_API
+/**
+ * Set option.
+ *
+ * @param opt option to set
+ * @param str integer value
+ * @param set set policy (@see option68_set_e)
+ * @param org origin (@see option68_org_e)
+ * @retval 0 on success
+ * @retval -1 on failure
+ */
+int option68_set(option68_t * opt, const char * str, int set, int org);
+
+FILE68_API
+/**
+ * Unset option.
+ *
+ * @param opt option to unset
+ * @retval 0 on success
+ * @retval -1 on failure
+ */
+int option68_unset(option68_t * opt);
+
+
+FILE68_API
+/**
+ * Get associate environment variable value.
+ *
+ * @param opt option
+ * @param set set policy (@see option68_set_e)
+ * @retval 0 on error (or envvar does not exist)
+ */
+const char * option68_getenv(option68_t * opt, int set);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_ord.h Added

@@ -0,0 +1,79 @@
+/**
+ * @ingroup  lib_file68
+ * @file     sc68/file68_ord.h
+ * @author   Benjamin Gerard
+ * @date     2003-08-12
+ * @brief    Byte ordering header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_ORD_H
+#define FILE68_ORD_H
+
+#ifndef FILE68_API
+# include "file68_api.h"
+#endif
+
+/**
+ * @defgroup  lib_file68_ord  Byte ordering
+ * @ingroup   lib_file68
+ *
+ *   Provides functions for dealing with host byte order.
+ *
+ * @{
+ */
+
+FILE68_API
+/**
+ * Get integer byte order.
+ *
+ *   The endian68_byte_order() function returns an integer which gives
+ *   the position of each byte in the memory.
+ *
+ *   Examples:
+ *   - Intel little endian will return 0x03020100.
+ *   - Motorola big endian will return 0x00010203.
+ *
+ * @return byte order.
+ */
+int endian68_byte_order(void);
+
+FILE68_API
+/**
+ * Check if byte order is little endian.
+ *
+ *   The endian68_is_little() function checks if the byte order is
+ *   little endian.
+ *
+ * @return little endian test.
+ * @retval  1  byte order is little endian.
+ * @retval  0  byte order is not little endian.
+ *
+ * @warning The function only test if the less signifiant byte is
+ *          stored at offset 0.
+ *
+ * @see endian68_is_big();
+ */
+int endian68_is_little(void);
+
+FILE68_API
+/**
+ * Check if byte order is big endian.
+ *
+ *   The endian68_is_big() function checks if the byte order is big
+ *   endian. By the way it returns !endian68_is_little().
+ *
+ * @return big endian test.
+ * @retval  1  byte order is big endian.
+ * @retval  0  byte order is not big endian.
+ *
+ * @see endian68_is_little();
+ */
+int endian68_is_big(void);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_reg.h Added

@@ -0,0 +1,154 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_reg.h
+ * @author Benjamin Gerard
+ * @date 2003-08-11
+ * @brief Windows registry header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_REG_H
+#define FILE68_REG_H
+
+#ifndef FILE68_API
+# include "file68_api.h"
+#endif
+
+/**
+ * @defgroup lib_file68_reg Registry access
+ * @ingroup lib_file68
+ *
+ * Provides Windows registry access functions.
+ *
+ * @{
+ */
+
+/**
+ * Enumerate registry key type.
+ *
+ * @warning Do not change order
+ */
+enum registry68_key_e {
+ REGISTRY68_INK = -1, /**< INvalid Key. */
+ REGISTRY68_CRK = 0, /**< Classes Root Key. */
+ REGISTRY68_CUK, /**< Current User Key. */
+ REGISTRY68_LMK, /**< Local Machine Key. */
+ REGISTRY68_USK, /**< USers Key. */
+ REGISTRY68_PDK, /**< Performance Data Key. */
+ REGISTRY68_CCK, /**< Current Config Key. */
+ REGISTRY68_DDK, /**< Dynamic Data Key. */
+
+ REGISTRY68_LST /**< Last element. */
+};
+
+/**
+ * Registry key type (override Microsoft HKEY type)
+ */
+typedef void * registry68_key_t;
+
+FILE68_API
+/**
+ * Check for registry support.
+ *
+ * @retval 0 registry not supported
+ * @retval 1 registry supported
+ */
+int registry68_support(void);
+
+
+FILE68_API
+/**
+ * Get key handler for a registry root type.
+ *
+ * @param rootkey One of the M$ registry key-type/root-key/entry-point.
+ * @return key handler
+ * @retval 0 error (key invalid)
+ */
+registry68_key_t registry68_rootkey(enum registry68_key_e rootkey);
+
+FILE68_API
+/**
+ * Open a named hierarchic key.
+ *
+ * @param hkey Opened key handle or one of reserved registry key handles.
+ * @param kname Hierarchic key name. Slash '/' character is interpreted
+ * as sub-key separator.
+ * @param mode bit#0:read bit#1:write
+ *
+ * @return registry key handle
+ * @retval registry68_key_e::REGISTRY68_INK on error
+ */
+registry68_key_t registry68_open(registry68_key_t hkey,
+ const char *kname, int mode);
+
+FILE68_API
+/**
+ * Get a string value of a named hierarchic string key.
+ *
+ * @param hkey Opened key handle or one of reserved registry key handles.
+ * @param kname Hierarchic key name. Slash '/' character is interpreted
+ * as sub-key separator.
+ * @param kdata Returned string storage location
+ * @param kdatasz Maximum size of kdata buffer.
+ *
+ * @return error status
+ * @retval 0 Success
+ * @retval -1 Error
+ */
+int registry68_gets(registry68_key_t hkey, const char *kname,
+ char *kdata, int kdatasz);
+
+FILE68_API
+/**
+ * Get integer value of a named hierarchic string key.
+ *
+ * @param hkey Opened key handle or one of reserved registry key handles.
+ * @param kname Hierarchic key name. Slash '/' character is interpreted
+ * as sub-key separator.
+ * @param kdata Pointer to returned int.
+ *
+ * @return error status
+ * @retval 0 Success
+ * @retval -1 Error
+ */
+int registry68_geti(registry68_key_t hkey, const char *kname, int * kdata);
+
+
+FILE68_API
+/**
+ * Put a string value of a named hierarchic string key.
+ *
+ * @param hkey Opened key handle or one of reserved registry key handles.
+ * @param kname Hierarchic key name. Slash '/' character is interpreted
+ * as sub-key separator.
+ * @param kdata Nul-terminated string.
+ *
+ * @return error status
+ * @retval 0 Success
+ * @retval -1 Error
+ */
+int registry68_puts(registry68_key_t hkey, const char * kname,
+ const char * kdata);
+
+FILE68_API
+/**
+ * Put integer value of a named hierarchic string key.
+ *
+ * @param hkey Opened key handle or one of reserved registry key handles.
+ * @param kname Hierarchic key name. Slash '/' character is interpreted
+ * as sub-key separator.
+ * @param kdata Integer value.
+ *
+ * @return error status
+ * @retval 0 Success
+ * @retval -1 Error
+ */
+int registry68_puti(registry68_key_t hkey, const char * kname, int kdata);
+
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_rsc.h Added

@@ -0,0 +1,260 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_rsc.h
+ * @author Benjamin Gerard
+ * @date 1998-10-07
+ * @brief Resources access header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_RSC_H
+#define FILE68_RSC_H
+
+#include "file68_vfs.h"
+
+
+/**
+ * @defgroup lib_file68_rsc Resource access
+ * @ingroup lib_file68
+ *
+ * Provides resource access functions.
+ *
+ * @{
+ */
+
+/**
+ * Resource type.
+ */
+typedef enum
+{
+ rsc68_replay, /**< 68000 external replay. */
+ rsc68_config, /**< Config file. */
+ rsc68_music, /**< sc68 music files. */
+
+ rsc68_last /**< last valid type. */
+} rsc68_t;
+
+/** Resource specific information. */
+typedef struct {
+ rsc68_t type; /**< Resource type. */
+ /** Information depending on type. */
+ union {
+ /** rsc68_music resource information. */
+ struct {
+ int track; /**< Force this track. */
+ int loops; /**< Force track(s) default loop. */
+ int time_ms; /**< Force track(s) time in second. */
+ } music;
+ } data;
+} rsc68_info_t;
+
+/**
+ * Resource handle function type.
+ */
+typedef vfs68_t * (*rsc68_handler_t)(rsc68_t type,
+ const char * name,
+ int mode,
+ rsc68_info_t * info);
+
+FILE68_API
+/**
+ * Initialize resource.
+ *
+ * Initialized internal data and reset all pathes to
+ * default.
+ *
+ * @return error-code
+ * @retval -1 error
+ */
+int rsc68_init(void);
+
+FILE68_API
+/**
+ * Shutdown resource.
+ *
+ * Clean up and free all pathes.
+ *
+ */
+void rsc68_shutdown(void);
+
+FILE68_API
+/**
+ * Set shared resource path.
+ *
+ * The rsc68_set_share() function set the shared resource
+ * path. The path will be duplicate by SC68strdup(). If path is
+ * null the current path is freed.
+ *
+ * @param path New shared resource path (0 for free).
+ *
+ * @return new path (duplicated string).
+ * @retval 0 error (except for freeing)
+ *
+ */
+const char * rsc68_set_share(const char *path);
+
+FILE68_API
+/**
+ * Set user resource path.
+ *
+ * The rsc68_set_user() function set the user resource path. The
+ * path will be duplicate by SC68strdup(). If path is null the
+ * current path is freed.
+ *
+ * @param path New user resource path (0 for free).
+ *
+ * @return new path (duplicated string).
+ * @retval 0 error (except for freeing)
+ */
+const char * rsc68_set_user(const char *path);
+
+FILE68_API
+/**
+ * Set sc68 local music database path.
+ *
+ * The rsc68_set_music() function set the local music database
+ * path. The path will be duplicate by SC68strdup(). If path is
+ * null the current path is freed.
+ *
+ * @param path New local music database path (0 for free).
+ *
+ * @return new path (duplicated string).
+ * @retval 0 error (except for freeing)
+ */
+const char * rsc68_set_music(const char *path);
+
+FILE68_API
+/**
+ * Set sc68 remote music database path.
+ *
+ * The rsc68_set_remote_music() function set the remote music
+ * database path. The path will be duplicate by SC68strdup(). If
+ * path is null the current path is freed.
+ *
+ * @param path New remote music database path (0 for free).
+ *
+ * @return new path (duplicated string).
+ * @retval 0 error (except for freeing)
+ */
+const char * rsc68_set_remote_music(const char *path);
+
+FILE68_API
+/**
+ * Get resource pathes.
+ *
+ * @param share Get the shared resource path (0 to ignore).
+ * @param user Get the user resource path (0 to ignore).
+ * @param lmusic Get the local music database path (0 to ignore).
+ * @param rmusic Get the remote music database path (0 to ignore).
+ */
+void rsc68_get_path(const char ** share,
+ const char ** user,
+ const char ** lmusic,
+ const char ** rmusic);
+
+FILE68_API
+/**
+ * Set/Get resource handler.
+ *
+ * The rsc68_set_handler() function set the current resource
+ * handler. If 0 is given as fct parameter the function does not
+ * set the handler. In all case the function returns the current
+ * handler. See below for more information about the default
+ * resource handler.
+ *
+ * @par Resource handler
+ * The resource handler is a function called by the rsc68_open()
+ * function. Some preliminary tests has already been performed. So
+ * the handler can assume that the name is not a NULL pointer and
+ * the mode is valid (either 1:reading or 2:writing). The resource
+ * handler @b must return an @b already opened vfs68_t or 0 in
+ * error case.
+ *
+ * @par Default resource handler
+ * The Default handler use a the vfs68_file_create() function.
+ * - If open mode is 2 (write mode) the default handler use the user
+ * resource path.
+ * - If open mode is 1 (read mode) the default handler tries in this
+ * order the user resource path and the shared resource path.
+ *
+ * @param fct New resource handler (0 for reading current value).
+ * @return previous value.
+ */
+rsc68_handler_t rsc68_set_handler(rsc68_handler_t fct);
+
+FILE68_API
+/**
+ * Open a resource in given mode.
+ *
+ * The function rsc68_open() function opens an vfs68_t to
+ * access a resource.
+ *
+ * @param type Type of resource to open.
+ * @param name Name of resource.
+ * @param mode 1:read-access, 2:write-access.
+ * @param info Get additionnal info (depends on type)
+ *
+ * @return already opened vfs68_t stream.
+ * @retval 0 error.
+ *
+ * @see rsc68_set_handler() for more info on resource handler.
+ */
+vfs68_t * rsc68_open(rsc68_t type, const char *name, int mode,
+ rsc68_info_t * info);
+
+FILE68_API
+/**
+ * Open a resource URI in given mode.
+ *
+ * @param uri Any valid sc68://type/ URI
+ * @param mode 1:read-access, 2:write-access.
+ * @param info Get additionnal info (depends on type)
+ *
+ * @return already opened vfs68_t stream.
+ * @retval 0 error.
+ *
+ * @see rsc68_open()
+ */
+vfs68_t * rsc68_open_uri(const char *uri, int mode,
+ rsc68_info_t * info);
+
+FILE68_API
+/**
+ * Create a resource from URI in given mode.
+ *
+ * @param uri Any valid sc68://type/ URI
+ * @param mode 1:read-access, 2:write-access.
+ * @param info Get additionnal info (depends on type)
+ *
+ * @return vfs68_t stream.
+ * @retval 0 error.
+ *
+ * @see rsc68_open_uri()
+ */
+vfs68_t * rsc68_create_uri(const char *uri, int mode, rsc68_info_t * info);
+
+
+FILE68_API
+/**
+ * Get music parameters from string.
+ *
+ * The rsc68_get_music_params() function parses the str string and
+ * stores track loop and time in the info struct. If it successes the
+ * info::type is set to rsc68_music else it is set rsc68_last.
+ *
+ * @param info info to fill (0:parse only)
+ * @param str URI part containing music parameter ":track:loop:time"
+ *
+ * @return Parsing stop position
+ * @retval str on invalid string
+ * @retval >str next '/' or end of string
+ */
+const char * rsc68_get_music_params(rsc68_info_t *info,
+ const char * str);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_str.h Added

@@ -0,0 +1,209 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_str.h
+ * @brief String manipulation header.
+ * @author Benjamin Gerard
+ * @date 2003-08-11
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_STR_H
+#define FILE68_STR_H
+
+#ifndef FILE68_API
+# include "file68_api.h"
+#endif
+
+/**
+ * @defgroup lib_file68_str String manipulation
+ * @ingroup lib_file68
+ *
+ * Provides string manipulation functions.
+ *
+ * @{
+ */
+
+FILE68_API
+/**
+ * Compare two string (case insensitive).
+ *
+ * The strcmp68() function compares the two strings a and b,
+ * ignoring the case of the characters. It returns an integer less
+ * than, equal to, or greater than zero if a is found, respectively,
+ * to be less than, to match, or be greater than b.
+ *
+ * @param a First string to compare
+ * @param b String to compare with
+ *
+ * @return Integer result of the two string compare. The difference
+ * between last tested characters of a and b.
+ * @retval 0 a and b are equal
+ * @retval <0 a is less than b
+ * @retval >0 a is greater than b
+ */
+int strcmp68(const char *a, const char *b);
+
+FILE68_API
+/**
+ * Compare two string (case insensitive, size limited).
+ *
+ * The strcmp68() function compares the two strings a and b,
+ * ignoring the case of the characters. It returns an integer less
+ * than, equal to, or greater than zero if a is found, respectively,
+ * to be less than, to match, or be greater than b.
+ *
+ * @param a First string to compare
+ * @param b String to compare with
+ * @param max Strings max length
+ *
+ * @return Integer result of the two string compare. The difference
+ * between last tested characters of a and b.
+ * @retval 0 a and b are equal
+ * @retval <0 a is less than b
+ * @retval >0 a is greater than b
+ */
+int strncmp68(const char *a, const char *b, int max);
+
+
+FILE68_API
+/**
+ * Concatenate two strings.
+ *
+ * The strcat68() function appends the b string to the a string
+ * overwriting the 0 character at the end of dest, and then adds a
+ * terminating 0 character. The strings may not overlap. Destination
+ * string has a maximum size of l characters. On overflow, the
+ * trailing 0 is omitted.
+ *
+ * @param a Destination string.
+ * @param b String to append.
+ * @param l Destination maximum size (including trailing 0)
+ *
+ * @return Destination string
+ * @retval a
+ */
+char * strcat68(char * a, const char * b, int l);
+
+FILE68_API
+/**
+ * Duplicate a string.
+ *
+ * The strdup68() function returns a pointer to a new string which
+ * is a duplicate of the string s. Memory for the new string is
+ * obtained with SC68alloc(), and can be freed with SC68free().
+ *
+ * @param s String to duplicate.
+ *
+ * @return Duplicated string
+ * @return 0 error
+ */
+char * strdup68(const char * s);
+
+FILE68_API
+/**
+ * Concat two strings in a duplicate buffer.
+ *
+ * The strcatdup68() function returns a pointer to a new string
+ * which is a duplicate of the string a+b. Memory for the new string
+ * is obtained with SC68alloc(), and can be freed with
+ * SC68free(). If either a or b is null the function does not failed
+ * but replace it by an empty string. If both a and b are null the
+ * function returns 0.
+ *
+ * @param a Left string.
+ * @param b Right string.
+ *
+ * @return Duplicated string a+b
+ * @return 0 error
+ */
+char * strcatdup68(const char * a, const char * b);
+
+FILE68_API
+/**
+ * Make a track and time information string.
+ *
+ * The strtime68() function formats a string with track time info.
+ * The general format is "TK MN:SS" where:
+ * - TK is track_num or "--" if track_num < 0 or track_num > 99
+ * - MN:SS is time minutes and seconds or "--:--" if seconds < 0
+ *
+ * @param buffer Destination buffer (0 use default static buffer).
+ * @param track_num Track number from 00 to 99, minus values disable.
+ * @param seconds Time to display in seconds 00..5999, other values
+ * disable.
+ *
+ * @return Pointer to result formatted string in a static buffer.
+ *
+ * @warning The function returns a static buffer. Do try to modify it.
+ * @warning Not thread safe.
+ */
+char * strtime68(char * buffer, int track_num, int seconds);
+
+FILE68_API
+/**
+ * Convert time (in second) to string.
+ *
+ * The strlongtime68() function converts a time in seconds to days,
+ * hours, minutes and second string. Day and hour unit are removed
+ * if they are null (not signifiant). The output string looks like :
+ * D days, H h, MN' SS"
+ *
+ * @param buffer Destination buffer (0 use default static buffer).
+ * @param time Time in second to convert to string.
+ *
+ * @return pointer to result time string (given buffer or static buffer).
+ *
+ * @warning Not thread safe when using static buffer.
+ *
+ */
+char * strlongtime68(char * buffer, int time);
+
+#define strnevernull68 strnevernull68 /**< @see strnevernull68 */
+#ifdef strnevernull68
+static inline
+const char * strnevernull68(const char *s)
+{
+ return s ? s : "<nul>";
+}
+#else
+FILE68_API
+/**
+ * Returns a never null string.
+ *
+ * @param s String to test
+ *
+ * @return a never null string
+ * @retval s if s was not null
+ * @retval "<nul>" if s was null
+ */
+const char * strnevernull68(const char *s);
+#endif
+
+#define strok68(V) strok68(V) /**< inlined version of strok68() */
+#ifdef strok68
+static inline
+const char * strok68(const int v)
+{
+ static const char r28 = { "failure","success" };
+ return r!v;
+}
+#else
+FILE68_API
+/**
+ * Returns success string.
+ *
+ * @param v Value to test
+ *
+ * @return a success string
+ * @retval "success" if v == 0
+ * @retval "failure" if v != 0
+ */
+const char * strok68(const int v);
+#endif
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_tag.h Added

@@ -0,0 +1,111 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_tag.h
+ * @author Benjamin Gerard
+ * @date 2011-10-03
+ * @brief Metatags definition header file.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_TAG_H
+#define FILE68_TAG_H
+
+/**
+ * @addtogroup lib_file68
+ * @{
+ */
+
+/**
+ * SC68 meta data.
+ */
+typedef struct {
+ char * key; /**< Tag name. */
+ char * val; /**< Tag value. */
+} tag68_t;
+
+enum {
+ TAG68_ID_TITLE = 0, /**< Album or track name. */
+ TAG68_ID_ARTIST, /**< Artist full name. */
+ TAG68_ID_GENRE, /**< Genre is for tracks only. */
+ TAG68_ID_CUSTOM, /**< First custom metatag. */
+ TAG68_ID_ALBUM = TAG68_ID_TITLE,
+ TAG68_ID_AUTHOR = TAG68_ID_ARTIST,
+ TAG68_ID_FORMAT = TAG68_ID_GENRE, /**< FORMAT is for album only. */
+ TAG68_ID_MAX = 12, /**< Maximum number of tag. */
+
+ /** Maximun number of custom tag. */
+ TAG68_ID_CUSTOM_MAX = TAG68_ID_MAX-TAG68_ID_CUSTOM
+
+};
+
+/**
+ * tag set type.
+ */
+typedef union {
+ tag68_t arrayTAG68_ID_MAX; /**< Tags indexed by TAG68_ID enum. */
+ struct {
+ tag68_t title; /**< Static tag for title/album. */
+ tag68_t artist; /**< Static tag for artist. */
+ tag68_t genre; /**< Static tag for genre/format */
+ /** Other custom tags. */
+ tag68_t customTAG68_ID_MAX-TAG68_ID_CUSTOM;
+ } tag; /**< Common tags fast access. */
+} tagset68_t;
+
+/**
+ * @name Fixed position tags
+ * @{
+ */
+#define TAG68_TITLE "title"
+#define TAG68_ARTIST "artist"
+#define TAG68_GENRE "genre"
+#define TAG68_FORMAT "format"
+/**
+ * @}
+ */
+
+/**
+ * @name Well-known Custom tags
+ * @{
+ */
+#define TAG68_COMMENT "comment"
+#define TAG68_COPYRIGHT "copyright"
+#define TAG68_IMAGE "image"
+#define TAG68_RATE "rate"
+#define TAG68_REPLAY "replay"
+#define TAG68_RIPPER "ripper"
+#define TAG68_YEAR "year"
+#define TAG68_AKA "aka"
+#define TAG68_COMPOSER "composer"
+#define TAG68_CONVERTER "converter"
+#define TAG68_LENGTH "length"
+#define TAG68_FRAMES "frames"
+#define TAG68_HASH "hash"
+#define TAG68_URI "uri"
+#define TAG68_HARDWARE "hardware"
+/**
+ * @}
+ */
+
+/**
+ * @name Tag aliases
+ * @{
+ */
+#define TAG68_ALBUM TAG68_TITLE
+#define TAG68_AUTHOR TAG68_ARTIST
+#define TAG68_ALIAS TAG68_TAG
+#define TAG68_DURATION TAG68_LENGTH
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_tdb.h Added

@@ -0,0 +1,70 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_tdb.h
+ * @author Benjamin Gerard
+ * @date 2013-05-30
+ * @brief music duration database header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_TDB_H
+#define FILE68_TDB_H
+
+#include "file68_api.h"
+
+/**
+ * @defgroup lib_file68_tdb External music info database.
+ * @ingroup lib_file68
+ *
+ * Provides function for accessing the music length database.
+ *
+ * Because many sndh files do not have a song length information and
+ * many people seems to be using sndh files rather than sc68 ones,
+ * the use of this database should help exposing a proper song
+ * length in most cases.
+ *
+ * @{
+ */
+
+/**
+ * flags values.
+ */
+enum {
+ TDB_STE = 1 << 4, /**< set if STE hardware is used */
+ TDB_TD = 1 << 3, /**< set if timer D *NOT* used */
+ TDB_TC = 1 << 2, /**< set if timer C *NOT* used */
+ TDB_TB = 1 << 1, /**< set if timer B *NOT* used */
+ TDB_TA = 1 << 0, /**< set if timer A *NOT* used */
+};
+
+
+FILE68_API
+/**
+ * Load the database,
+ */
+int timedb68_load(void);
+
+FILE68_API
+/**
+ * Save the database (only if it has been modified).
+ */
+int timedb68_save(void);
+
+FILE68_API
+/**
+ * Add an entry to the database (in memory only).
+ */
+int timedb68_add(int hash, int track, unsigned int frames, int flags);
+
+FILE68_API
+/**
+ * Retrieve an entry from the database.
+ */
+int timedb68_get(int hash, int track, unsigned int * frames, int * flags);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_uri.h Added

@@ -0,0 +1,134 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_uri.h
+ * @author Benjamin Gerard
+ * @date 2003-10-28
+ * @brief URI manipulation header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_URI_H
+#define FILE68_URI_H
+
+#ifndef FILE68_API
+# include "file68_api.h"
+#endif
+#include "file68_vfs.h"
+#include "file68_vfs_def.h"
+
+#include <stdarg.h>
+
+/**
+ * @defgroup lib_file68_uri URI manipulation
+ * @ingroup lib_file68
+ *
+ * Provides functions for sc68 URI manipulation and access.
+ *
+ * @{
+ */
+
+/**
+ * Enum for the scheme68_t::ismine() return value.
+ */
+enum scheme68_e {
+ SCHEME68_READ = VFS68_OPEN_READ, /**< can be open for read. */
+ SCHEME68_WRITE = VFS68_OPEN_WRITE, /**< can be open for write. */
+ SCHEME68_ISMINE = SCHEME68_WRITE<<1, /**< URI might be mime. */
+ SCHEME68_REMOTE = SCHEME68_ISMINE<<1 /**< access might be remote. */
+};
+
+/**
+ * Type definition for struct scheme68_s.
+ */
+typedef struct scheme68_s scheme68_t;
+
+/**
+ * Declare and register an URI scheme handler.
+ */
+struct scheme68_s {
+ scheme68_t * next; /**< next scheme in the list. */
+ char * name; /**< register name (curl ...). */
+
+ /** is mine callback.
+ * @return @ref scheme68_e "capabilities flags"
+ * @retval 0 not mine
+ */
+ int (*ismine)(const char *);
+
+ /** VFS stream create callback. */
+ vfs68_t * (*create)(const char *, int, int, va_list);
+};
+
+FILE68_API
+/**
+ * Register a scheme handler.
+ *
+ * @param scheme scheme info
+ *
+ * @return error code
+ * @retval 0 success
+ * @retval -1 failure
+ */
+int uri68_register(scheme68_t * scheme);
+
+FILE68_API
+/**
+ * Unregister a scheme handler.
+ *
+ * @param scheme scheme info
+ * @todo implements uri68_unregister() for real !
+ */
+void uri68_unregister(scheme68_t * scheme);
+
+FILE68_API
+/**
+ * Test if a scheme is local.
+ *
+ * @param uri uri to test
+ *
+ * @retval 1 scheme is local
+ * @retval 0 scheme may be remote
+ */
+int uri68_is_local(const char * uri);
+
+FILE68_API
+/**
+ * Create a stream for an URI.
+ *
+ * @param uri URI or path
+ * @param mode open mode (1:read, 2:write).
+ * @param argc number of supplemental arguments
+ *
+ * @return stream
+ * @retval 0 error
+ */
+vfs68_t * uri68_vfs(const char * uri, int mode, int argc, ...);
+
+FILE68_API
+/**
+ * Create a stream for an URI (va version).
+ *
+ * @see uri68_vfs()
+ */
+vfs68_t * uri68_vfs_va(const char * uri, int mode, int argc, va_list list);
+
+FILE68_API
+/**
+ * Retrieve scheme from an URI.
+ *
+ * @param scheme Buffer to store scheme or 0
+ * @param max Size of scheme buffer
+ * @param uri URI
+ *
+ * @return scheme length
+ * @retval -1 on error
+ * @retval 0 no scheme
+ */
+int uri68_get_scheme(char * scheme, int max, const char *uri);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_vfs.h Added

@@ -0,0 +1,219 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_vfs.h
+ * @author Benjamin Gerard
+ * @date 2003-08-08
+ * @brief Stream interface header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_VFS_H
+#define FILE68_VFS_H
+
+
+#ifndef FILE68_API
+# include "file68_api.h"
+#endif
+
+
+/**
+ * @defgroup lib_file68_vfs Virtual File System.
+ * @ingroup lib_file68
+ *
+ * Provides access functions for generic I/O streams.
+ *
+ * @{
+ */
+
+/**
+ * VFS type.
+ */
+#ifndef HAVE_VFS68
+typedef struct _vfs68_t vfs68_t;
+#define HAVE_VFS68 1 /**< defined if type vfs68_t is known */
+#endif
+
+/**
+ * @name Generic access functions.
+ * @{
+ */
+
+FILE68_API
+/**
+ * Get stream name.
+ *
+ * @param vfs stream
+ *
+ * @return stream name
+ * @retval 0 Failure.
+ */
+const char * vfs68_filename(vfs68_t *vfs);
+
+FILE68_API
+/**
+ * Open stream.
+ *
+ * @param vfs stream
+ *
+ * @return error code
+ * @retval 0 Success
+ * @retval -1 Failure
+ */
+int vfs68_open(vfs68_t *vfs);
+
+FILE68_API
+/**
+ * Close stream.
+ *
+ * @param vfs stream
+ *
+ * @return error code
+ * @retval 0 Success
+ * @retval -1 Failure
+ */
+int vfs68_close(vfs68_t *vfs);
+
+FILE68_API
+/**
+ * Read data from stream.
+ *
+ * @param vfs stream
+ * @param data destination buffer
+ * @param len number of byte to read
+ *
+ * @return number of byte read
+ * @retval -1 Failure.
+ */
+int vfs68_read(vfs68_t *vfs, void * data, int len);
+
+FILE68_API
+/**
+ * Write data into stream.
+ *
+ * @param vfs stream
+ * @param data destination buffer
+ * @param len number of byte to read
+ *
+ * @return number of byte written
+ * @retval -1 Failure.
+ */
+int vfs68_write(vfs68_t *vfs, const void * data, int len);
+
+FILE68_API
+/**
+ * Get stream length.
+ *
+ * @param vfs stream
+ *
+ * @return number of bytes.
+ * @retval -1 Failure.
+ */
+int vfs68_length(vfs68_t *vfs);
+
+FILE68_API
+/**
+ * Get stream current position.
+ *
+ * @param vfs stream
+ *
+ * @return stream position
+ * @retval -1 Failure.
+ */
+int vfs68_tell(vfs68_t *vfs);
+
+FILE68_API
+/**
+ * Set stream relative position.
+ *
+ * @param vfs stream
+ * @param offset displacement from current position
+ *
+ * @return Absolute position after seeking
+ * @retval -1 Failure.
+ *
+ * @see vfs68_seek_to()
+ */
+int vfs68_seek(vfs68_t *vfs, int offset);
+
+FILE68_API
+/**
+ * Set stream absolute position.
+ *
+ * @param vfs stream
+ * @param pos position to reach
+ *
+ * @return Absolute position after seeking
+ * @retval -1 Failure.
+ *
+ * @see vfs68_seek()
+ */
+int vfs68_seek_to(vfs68_t *vfs, int pos);
+
+FILE68_API
+/**
+ * Close and destroy stream.
+ *
+ * @param vfs stream
+ *
+ */
+void vfs68_destroy(vfs68_t *vfs);
+
+FILE68_API
+/**
+ * Read a '\\0' or '\\n' terminated string.
+ *
+ * @param vfs stream
+ * @param buffer destination buffer
+ * @param max destination buffer size
+ *
+ * @return number of char read
+ * @retval -1 Failure.
+ */
+int vfs68_gets(vfs68_t *vfs, char * buffer, int max);
+
+FILE68_API
+/**
+ * Read next character.
+ *
+ * @param vfs stream
+ *
+ * @return char value 0..255
+ * @retval -1 EOF or error.
+ */
+int vfs68_getc(vfs68_t *vfs);
+
+FILE68_API
+/**
+ * Write a '\\0' terminated string.
+ *
+ * @param vfs stream
+ * @param s string
+ *
+ * @return number of char written
+ * @retval -1 Failure.
+ */
+int vfs68_puts(vfs68_t *vfs, const char * s);
+
+FILE68_API
+/**
+ * Write a character.
+ *
+ * @param vfs stream
+ * @param c char 0..255
+ *
+ * @return error code
+ * @retval 0 Success
+ * @retval -1 Failure
+ */
+int vfs68_putc(vfs68_t *vfs, const int c);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_vfs_ao.h Added

@@ -0,0 +1,79 @@
+/**
+ * @ingroup  lib_file68
+ * @file     sc68/file68_vfs_ao.h
+ * @author   Benjamin Gerard
+ * @date     2007-03-08
+ * @brief    AO stream header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_VFS_AO_H
+#define FILE68_VFS_AO_H
+
+#include "file68_vfs.h"
+
+/**
+ * @name     Audio VFS
+ * @ingroup  lib_file68_vfs
+ *
+ *   Implements vfs68_t for XIPH libao (audio output).
+ *
+ * @{
+ */
+
+FILE68_EXTERN
+/**
+ * Initialize ao virtual file system.
+ */
+int vfs68_ao_init(void);
+
+FILE68_EXTERN
+/**
+ * Shutdown ao virtual file system.
+ */
+void vfs68_ao_shutdown(void);
+
+FILE68_EXTERN
+/**
+ * Get sampling rate.
+ */
+int vfs68_ao_sampling(vfs68_t * vfs);
+
+FILE68_EXTERN
+/**
+ * Create audio VFS.
+ *
+ * @param  uri  ao stream URI starts with the audio: scheme. It is
+ *              composed by "/key=value" pairs.
+ *        - driver=list lists available ao driver (MSG68_INFO).
+ *        - driver=default|null|alsa|pulse|oss|esd|au|raw|wav ...
+ *        - rate=hz
+ *        - format=endiansignchannelsformat
+ *          with (first value is the default)
+ *          - endian   := n|l|b
+ *          - sign     := -|+
+ *          - channels := 1|2
+ *          - format   := W|B|F
+ *
+ *        Others keys are used to set specific driver options as
+ *        defined by libao.
+ *
+ *        The first non-option component of the URI is used as the
+ *        start of the output path for non-live (file) drivers
+ *        (wav,raw ...).
+ *
+ * @param  mode  Only mode supported is write (VFS68_OPEN_WRITE=2).
+ * @param  spr   Sampling rate (in hertz).
+ *
+ * @return VFS object
+ * @retval 0  on failure
+ *
+ */
+vfs68_t * vfs68_ao_create(const char * uri, int mode, int spr);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_vfs_curl.h Added

@@ -0,0 +1,55 @@
+/**
+ * @ingroup  lib_file68
+ * @file     sc68/file68_vfs_curl.h
+ * @author   Benjamin Gerard
+ * @date     2003-08-08
+ * @brief    @ref cURL stream header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_VFS_CURL_H
+#define FILE68_VFS_CURL_H
+
+#include "file68_vfs.h"
+
+/**
+ * @name     cURL stream
+ * @ingroup  lib_file68_vfs
+ *
+ * @anchor cURL
+ *
+ *   @b cURL is a client-side URL transfer library. For more informations
+ *   see cURL official website(http://curl.planetmirror.com/libcurl/).
+ *
+ * @{
+ */
+
+FILE68_EXTERN
+/**
+ * Initialize curl engine.
+ *
+ *   The vfs68_curl_init() function initializes curl library.  It
+ *   is called by the file68_init() function and everytime a new curl
+ *   stream is created with the vfs68_curl_create() function.
+ *
+ * @return error code
+ * @retval  0   success
+ * @retval  -1  failure
+ */
+int vfs68_curl_init(void);
+
+FILE68_EXTERN
+/**
+ * Shutdown curl engine.
+ *
+ *  The vfs68_curl_shutdoen() function shutdown curl library. It
+ *  is called by the file68_shutdown() function.
+ */
+void vfs68_curl_shutdown(void);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_vfs_def.h Added

@@ -0,0 +1,95 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_vfs_def.h
+ * @author Benjamin Gerard
+ * @date 2003-08-08
+ * @brief Generic stream definition header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_VFS_DEF_H
+#define FILE68_VFS_DEF_H
+
+#include "file68_vfs.h"
+
+/**
+ * @name Open modes
+ * @ingroup lib_file68_vfs
+ * @{
+ */
+enum {
+ VFS68_OPEN_READ_BIT = 0, /**< Read open mode bit. */
+ VFS68_OPEN_WRITE_BIT = 1, /**< Write open mode bit. */
+ VFS68_SLAVE_BIT = 7, /**< Slave mode bit. */
+ VFS68_OPEN_READ = 1<<VFS68_OPEN_READ_BIT, /**< Read open mode value. */
+ VFS68_OPEN_WRITE = 1<<VFS68_OPEN_WRITE_BIT, /**< Write open mode value. */
+ VFS68_OPEN_MASK= VFS68_OPEN_READ|VFS68_OPEN_WRITE, /**< Open modes mask. */
+ VFS68_SLAVE = 1<<VFS68_SLAVE_BIT, /**< Slave mode value. */
+};
+
+/**
+ * Test SLAVE mode.
+ */
+#define VFS68_IS_SLAVE(V) (((V)>>VFS68_SLAVE_BIT)&1)
+
+/**
+ * Test if any open flags is set (returns 0 or 1).
+ */
+#define VFS68_IS_OPEN(V) (!!((V)&VFS68_OPEN_MASK))
+
+/**
+ * Test if READ open flags is set (returns 0 or 1).
+ */
+#define VFS68_IS_OPEN_READ(V) (((V)>>VFS68_OPEN_READ_BIT)&1)
+
+/**
+ * Test if WRITE open flags is set (returns 0 or 1).
+ */
+#define VFS68_IS_OPEN_WRITE(V) (((V)>>VFS68_OPEN_WRITE_BIT)&1)
+
+/**
+ * @}
+ */
+
+/**
+ * @name Stream function prototypes.
+ * @ingroup lib_file68_vfs
+ * @{
+ */
+typedef const char * (* vfs68_name_t) (vfs68_t *);
+typedef int (* vfs68_open_t) (vfs68_t *);
+typedef int (* vfs68_close_t) (vfs68_t *);
+typedef int (* vfs68_length_t) (vfs68_t *);
+typedef int (* vfs68_flush_t) (vfs68_t *);
+typedef int (* vfs68_tell_t) (vfs68_t *);
+typedef int (* vfs68_seek_t) (vfs68_t *, int);
+typedef int (* vfs68_read_t) (vfs68_t *, void *, int);
+typedef int (* vfs68_write_t) (vfs68_t *, const void *, int);
+typedef void (* vfs68_destroy_t) (vfs68_t *);
+/**
+ * @}
+ */
+
+/**
+ * Generic stream structure.
+ *
+ * Set of functions needed to handle a stream.
+ *
+ * @ingroup lib_file68_vfs
+ */
+struct _vfs68_t {
+ vfs68_name_t name; /**< Get stream name. */
+ vfs68_open_t open; /**< Open stream. */
+ vfs68_close_t close; /**< Close stream. */
+ vfs68_read_t read; /**< Read data from stream. */
+ vfs68_write_t write; /**< Write data to stream. */
+ vfs68_flush_t flush; /**< Flush data. */
+ vfs68_length_t length; /**< Get stream data length. */
+ vfs68_tell_t tell; /**< Get stream position. */
+ vfs68_seek_t seekf; /**< Seek forward. */
+ vfs68_seek_t seekb; /**< Seek backward. */
+ vfs68_destroy_t destroy; /**< Destructor. */
+};
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_vfs_fd.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_vfs_file.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_vfs_mem.h Added

@@ -0,0 +1,63 @@
+/**
+ * @ingroup  lib_file68
+ * @file     sc68/file68_vfs_mem.h
+ * @author   Benjamin Gerard
+ * @date     2003-08-08
+ * @brief    Memory stream header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_VFS_MEM_H
+#define FILE68_VFS_MEM_H
+
+#include "file68_vfs.h"
+
+/**
+ * @name     Memory stream
+ * @ingroup  lib_file68_vfs
+ *
+ *   Implements vfs68_t for memory buffer.
+ *
+ * @note   mem vfs scheme is "mem:".
+ *
+ * @{
+ */
+
+FILE68_EXTERN
+/**
+ * Init memory VFS (register mem: scheme).
+ *
+ * @retval  0  always success
+ */
+int vfs68_mem_init(void);
+
+FILE68_EXTERN
+/**
+ * shutdown memory VFS (unregister mem: scheme).
+ */
+void vfs68_mem_shutdown(void);
+
+FILE68_EXTERN
+/**
+ * Creates a stream for memory buffer.
+ *
+ * If mode is enslaved the destroy callback call the free68() function
+ * to release the memory buffer addr.
+ *
+ * @param  addr     Buffer base address.
+ * @param  len      Buffer length.
+ * @param  mode     Allowed open mode.
+ *
+ * @return stream
+ * @retval 0 on error
+ *
+ * @note   filename is build with memory range.
+ */
+vfs68_t * vfs68_mem_create(const void * addr, int len, int mode);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_vfs_null.h Added

@@ -0,0 +1,53 @@
+/**
+ * @ingroup  lib_file68
+ * @file     sc68/file68_vfs_null.h
+ * @author   Benjamin Gerard
+ * @date     2003-10-10
+ * @brief    Null stream header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_VFS_NULL_H
+#define FILE68_VFS_NULL_H
+
+#include "file68_vfs.h"
+
+/**
+ * @name     Null VFS
+ * @ingroup  lib_file68_vfs
+ *
+ *   Implements a null vfs68_t.
+ *
+ *   Null stream does nothing but checking some trivial errors (like
+ *   access without opening) and dealing with a virtual stream
+ *   position.  The null stream length is the position the highest
+ *   byte that has been either read or write. The length is resetted
+ *   at open.  It implies that stream length can be retrieved by the
+ *   vfs68_length() function after vfs68_close() call.
+ *
+ * @note   null vfs scheme is "null:".
+ *
+ * @{
+ */
+
+FILE68_EXTERN
+/**
+ * Init null vfs (register null: scheme).
+ *
+ * @retval  0 on success
+ * @retval -1 on error
+ */
+int vfs68_null_init(void);
+
+FILE68_EXTERN
+/**
+ * Shutdown null vfs (unregister null: scheme).
+ */
+void vfs68_null_shutdown(void);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_vfs_z.h Added

@@ -0,0 +1,76 @@
+/**
+ * @ingroup lib_file68
+ * @file sc68/file68_vfs_z.h
+ * @author Benjamin Gerard
+ * @date 2003-10-06
+ * @brief Zlib stream header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_VFS_Z
+#define FILE68_VFS_Z
+
+#include "file68_vfs.h"
+
+/**
+ * @name Z stream
+ * @ingroup lib_file68_vfs
+ *
+ * @anchor zlib
+ *
+ * Implements vfs68_t for Z library. Z is a famous
+ * compression/decompression library. For more informations see
+ * <a href="http://www.gzip.org">gzip website</a>.
+ *
+ * @todo deflate (compression) mode.
+ * @{
+ */
+
+/**
+ * gzip options.
+ */
+typedef struct {
+ unsigned int gzip:1; /**< Read/Write gzip file format. */
+ unsigned int level:4; /**< Compression level 0..9 or -1 for default. */
+ unsigned int strategy:3; /**< Compression strategy (0 is default). */
+ unsigned int name:1; /**< Include original name to gzip. */
+} vfs68_z_option_t;
+
+/**
+ * Default gzip option.
+ */
+FILE68_EXTERN
+const vfs68_z_option_t vfs68_z_default_option;
+
+FILE68_EXTERN
+/**
+ * Create a @ref zlib "Z" stream.
+ *
+ * @param is Stream to compress/decompress.
+ * @param mode bit-0: read access, bit-1: write access.
+ * @param opt gzip options.
+ *
+ * @return stream
+ * @retval 0 on error
+ */
+vfs68_t * vfs68_z_create(vfs68_t * is, int mode,
+ const vfs68_z_option_t opt);
+
+FILE68_EXTERN
+/**
+ * Init gzip vfs.
+ */
+int vfs68_z_init(void);
+
+FILE68_EXTERN
+/**
+ * Shutdown gzip vfs.
+ */
+void vfs68_z_shutdown(void);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/sc68/file68_zip.h Added

@@ -0,0 +1,72 @@
+/**
+ * @ingroup  lib_file68
+ * @file     sc68/file68_zip.h
+ * @author   Benjamin Gerard
+ * @date     2003-09-03
+ * @brief    Gzip loader header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef FILE68_ZIP_H
+#define FILE68_ZIP_H
+
+#ifndef FILE68_API
+# include "file68_api.h"
+#endif
+
+/**
+ * @defgroup  lib_file68_zip  gzip file support.
+ * @ingroup   lib_file68
+ *
+ *   Provides functions for loading and saving gzip file.
+ *
+ * @{
+ */
+
+FILE68_API
+/**
+ * Test gzip file header magic header.
+ *
+ * @param  buffer  Buffer containing at least 3 bytes from gzip header.
+ *
+ * @retval  1  buffer may be gzipped.
+ * @retval  0  buffer is not gzipped.
+ */
+int gzip68_is_magic(const void * buffer);
+
+FILE68_API
+/**
+ * Load an optionnally gzipped file.
+ *
+ *   The gzip68_load() function allocates memory and loads the
+ *   totality of the given file. If the file is a gzipped file, it
+ *   will be inflate.
+ *
+ * @param  fname    Name of file to load.
+ * @param  ulen     Pointer to uncompressed or total size of file.
+ *
+ * @return A pointer to loaded file buffer.
+ * @retval 0 on error.
+ */
+void * gzip68_load(const char * fname, int * ulen);
+
+FILE68_API
+/**
+ * Unzip from and to memory.
+ *
+ * @param  dst   destination buffer
+ * @param  dsize destination buffer size
+ * @param  src   COmpressed buffer
+ * @param  csize compressed buffer size
+ *
+ * @return size of deflated buffer
+ * @retval -1 on error.
+ */
+int gzip68_buffer(void * dst, int dsize, const void * src, int csize);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/endian68.c Added

@@ -0,0 +1,53 @@
+/*
+ * @file endian68.c
+ * @brief machine endianess
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_ord.h"
+
+int endian68_byte_order(void)
+{
+ static int endian = 0;
+
+ if (!endian) {
+ char * s;
+ int i;
+ for (i=0, s = (char *)&endian; i<sizeof(int); ++i) {
+ si = i;
+ }
+ }
+ return endian;
+}
+
+int endian68_is_little(void)
+{
+ return !(endian68_byte_order() & 255);
+}
+
+int endian68_is_big(void)
+{
+ return !endian68_is_little();
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/ferror68.c Added

@@ -0,0 +1,82 @@
+/*
+ * @file error68.c
+ * @brief error messages
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_err.h"
+#include "file68_msg.h"
+
+#include <string.h>
+
+/* Process error message (printf like fmt). */
+int error68_va(const char * fmt, va_list list)
+{
+ if (fmt) {
+ int len = strlen(fmt);
+ msg68_va(msg68_ERROR, fmt, list);
+ if (len > 0 && fmtlen-1 != '\n') {
+ msg68(msg68_ERROR,"\n");
+ }
+ }
+ return -1;
+}
+
+int error68x_va(void * cookie, const char * fmt, va_list list)
+{
+ if (fmt) {
+ int len = strlen(fmt);
+ msg68x_va(msg68_ERROR, cookie, fmt, list);
+ if (len > 0 && fmtlen-1 != '\n') {
+ msg68x(msg68_ERROR, cookie, "\n");
+ }
+ }
+ return -1;
+}
+
+/* Process error message (printf like fmt). */
+int error68(const char * fmt, ...)
+{
+ int err;
+ va_list list;
+
+ va_start(list, fmt);
+ err = error68_va(fmt, list);
+ va_end(list);
+
+ return err;
+}
+
+/* Process error message (printf like fmt). */
+int error68x(void * cookie, const char * fmt, ...)
+{
+ int err;
+ va_list list;
+
+ va_start(list, fmt);
+ err = error68x_va(cookie, fmt, list);
+ va_end(list);
+
+ return err;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/file68.c Added

@@ -0,0 +1,2152 @@
+/*
+ * @file file68.c
+ * @brief load and save sc68 stream
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68.h"
+#include "file68_chk.h"
+#include "file68_err.h"
+#include "file68_msg.h"
+#include "file68_str.h"
+#include "file68_rsc.h"
+#include "file68_opt.h"
+
+#include "file68_vfs_def.h"
+#include "file68_vfs.h"
+#include "file68_vfs_z.h"
+#include "file68_ice.h"
+#include "file68_zip.h"
+#include "file68_uri.h"
+#include "file68_tdb.h"
+
+#ifndef u64
+# ifdef HAVE_STDINT_H
+# include <stdint.h>
+# define u64 uint_least64_t
+# elif defined(_MSC_VER)
+# define u64 unsigned __int64
+# elif defined(__GNUC__)
+# define u64 unsigned long long
+# endif
+#endif
+
+#ifndef u64
+# error u64 must be defined as an integer of at least 64 bit
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <assert.h>
+
+#define FOURCC(A,B,C,D) ((int)( ((A)<<24) | ((B)<<16) | ((C)<<8) | (D) ))
+#define gzip_cc FOURCC('g','z','i','p')
+#define ice_cc FOURCC('i','c','e','!')
+#define sndh_cc FOURCC('S','N','D','H')
+#define sc68_cc FOURCC('S','C','6','8')
+
+/* SC68 file identifier strings */
+const char file68_idstr_v1 = SC68_IDSTR;
+const char file68_idstr_v2 = SC68_IDSTR_V2;
+const char file68_mimestr = SC68_MIMETYPE;
+
+#ifndef DEBUG_FILE68_O
+# define DEBUG_FILE68_O 0
+#endif
+int file68_cat = msg68_DEFAULT;
+
+#define ISCHK(A,B) ( (A)0 == (B)0 && (A)1 == (B)1 )
+
+#define MIN_TRACK_MS (45u*1000u) /* minimum time to be played. */
+#define MAX_TRACK_LP 4u /* max guessed loop allowed */
+
+
+/* Array of static strings, mainly used by metatags. */
+static /* const */ struct strings_table {
+ char n_a4;
+ char aka4;
+ char sc685;
+ char sndh5;
+ char rate5;
+ char year5;
+ char album6;
+ char genre6;
+ char image6;
+ char title6;
+ char replay7;
+ char artist7;
+ char author7;
+ char ripper7;
+ char format7;
+ char comment8;
+ char composer9;
+ char converter10;
+ char copyright10;
+ char amiga_chiptune15;
+ char atari_st_chiptune18;
+
+ char _reserved; /* must be last */
+} tagstr = {
+ SC68_NOFILENAME,
+ TAG68_AKA,
+ "sc68",
+ "sndh",
+ TAG68_RATE,
+ TAG68_YEAR,
+ TAG68_ALBUM,
+ TAG68_GENRE,
+ TAG68_IMAGE,
+ TAG68_TITLE,
+ TAG68_REPLAY,
+ TAG68_ARTIST,
+ TAG68_AUTHOR,
+ TAG68_RIPPER,
+ TAG68_FORMAT,
+ TAG68_COMMENT,
+ TAG68_COMPOSER,
+ TAG68_CONVERTER,
+ TAG68_COPYRIGHT,
+ "Amiga chiptune",
+ "Atari-ST chiptune",
+ -1,
+};
+
+
+/***********************************************************************
+ * Check functions
+ **********************************************************************/
+
+/* valid year ? */
+static int is_year(const char * const s) {
+ int year = 0;
+ if (isdigit((int)s0) && isdigit((int)s1) &&
+ isdigit((int)s2) && isdigit((int)s3) )
+ year = (s0-'0')*1000u + (s1-'0')*100u
+ + (s2-'0')*10u + (s3-'0');
+ if (year < 1980 || year >= 2100) /* Hopefully :) */
+ year = 0;
+ return year;
+}
+
+/* valid disk ? */
+static inline int is_disk(const disk68_t * const mb) {
+ return mb && mb->magic == SC68_DISK_ID;
+}
+
+/* null or valid disk ? */
+static inline int null_or_disk(const disk68_t * const mb) {
+ return !mb || mb->magic == SC68_DISK_ID;
+}
+
+/* Track value in range ? */
+static inline int in_range(const disk68_t * mb, const int track) {
+ return track > 0 && track <= mb->nb_mus;
+}
+
+/* Track in disk ? */
+static inline int in_disk(const disk68_t * mb, const int track) {
+ return is_disk(mb) && in_range(mb, track);
+}
+
+/* Does this memory belongs to the disk data ? */
+static inline int is_disk_data(const disk68_t * const mb, const void * const _s)
+{
+ const char * const s = (const char *) _s;
+ return is_disk(mb) && s >= mb->data && s < mb->data+mb->datasz;
+}
+
+/* Does this memory belongs to the static string array ? */
+static inline int is_static_str(const char * const s)
+{
+ const char * const tagstr0 = (const char *) &tagstr;
+ const char * const tagstr1 = tagstr0+sizeof(tagstr);
+ return (s >= tagstr0 && s < tagstr1);
+}
+
+/* Free buffer unless it is allocated inside disk data or inside
+ * static tag string array */
+static void free_string(const disk68_t * const mb, void * const s)
+{
+ if (s && !is_static_str(s) && !is_disk_data(mb,s))
+ free(s);
+}
+
+static inline void safe_free_string(const disk68_t * const mb, void * const _s)
+{
+ void ** s = _s;
+ free_string(mb, *s); *s = 0;
+}
+
+static char *strdup_not_static(const disk68_t * const mb, const char * s)
+{
+ return (char *) ( (s && !is_static_str(s) && !is_disk_data(mb,s))
+ ? strdup68(s)
+ : s );
+}
+
+
+/* Peek Little Endian Unaligned 32 bit value */
+static inline int LPeek(const void * const a)
+{
+ int r;
+ const unsigned char * const c = (const unsigned char *) a;
+ r = c0 + (c1 << 8) + (c2 << 16) + ((int)(signed char)c3 << 24);
+ return r;
+}
+
+/* Peek big Endian Unaligned 16 bit value */
+static inline int WPeekBE(const void * const a)
+{
+ int r;
+ const unsigned char * const c = (const unsigned char *) a;
+ r = c1 + ((int)(signed char)c0 << 8);
+ return r;
+}
+
+/* Peek Big Endian Unaligned 32 bit value */
+static inline int LPeekBE(const void * const a)
+{
+ int r;
+ const unsigned char * const c = (const unsigned char *) a;
+ r = ((int)(signed char)c0 << 24) + (c1 << 16) + (c2 << 8) + c3;
+ return r;
+}
+
+/* Poke Little Endian Unaligned 32 bit value */
+static inline void LPoke(void * const a, int r)
+{
+ unsigned char * const c = (unsigned char *) a;
+ c0 = r;
+ c1 = r >> 8;
+ c2 = r >> 16;
+ c3 = r >> 24;
+}
+
+static int myatoi(const char *s, int i, int max, int * pv)
+{
+ int v = 0;
+ for (; i<max; ++i) {
+ int c = si;
+ if (isdigit(c))
+ v = v * 10 + c - '0';
+ else
+ break;
+ }
+ if (pv) *pv = v;
+ return i;
+}
+
+/* Match regexpr : :alpha:-_:alnum:* */
+static int is_valid_key(const char * key)
+{
+ int c;
+ if (!key || (c = *key++, !isalpha(c)))
+ return 0;
+ do {
+ if (!isalnum(c) || c == '-' || c == '_')
+ return 0;
+ } while (c = *key++, c);
+ return 1;
+}
+
+/* Searching a key (key can be nullptr to search an empty slot) */
+static int get_customtag(const tagset68_t * tags, const char * key)
+{
+ int i;
+ if (!strcmp68(key, tagstr.title))
+ return TAG68_ID_TITLE;
+ if (!strcmp68(key, tagstr.album))
+ return TAG68_ID_ALBUM;
+ if (!strcmp68(key, tagstr.artist))
+ return TAG68_ID_ARTIST;
+ if (!strcmp68(key, tagstr.author))
+ return TAG68_ID_AUTHOR;
+ if (!strcmp68(key, tagstr.genre))
+ return TAG68_ID_GENRE;
+ if (!strcmp68(key, tagstr.format))
+ return TAG68_ID_FORMAT;
+ for (i=TAG68_ID_CUSTOM; i<TAG68_ID_MAX; ++i) {
+ if (!strcmp68(key, tags->arrayi.key))
+ return i;
+ }
+ return -1;
+}
+
+/* Set/Replace a custom key (val can be 0 to remove the tag). */
+static int set_customtag(disk68_t * mb, tagset68_t * tags,
+ const char * key, const char * val)
+{
+ int i
+ = get_customtag(tags, key);
+ if (!val) {
+ if (i >= 0) {
+ safe_free_string(mb,&tags->arrayi.val);
+ if (i >= TAG68_ID_CUSTOM)
+ safe_free_string(mb,&tags->arrayi.key);
+ }
+ } else {
+ if (i < 0)
+ i = get_customtag(tags, 0);
+ if (i >= 0) {
+ safe_free_string(mb,&tags->arrayi.val);
+ if (!tags->arrayi.key &&
+ !(tags->arrayi.key = strdup_not_static(mb, key)))
+ i = -1;
+ else if (!(tags->arrayi.val = strdup_not_static(mb, val)))
+ i = -1;
+ }
+ }
+ return i;
+}
+
+#define ok_int(V) strok68(V)
+#define strnull(S) strnevernull68(S)
+
+static int gzip_is_magic(const char * buffer)
+{
+ return 1
+ && buffer0 == 0x1f
+ && buffer1 == (char)0x8b
+ && buffer2 == 8;
+}
+
+static int ice_is_magic(const char * buffer)
+{
+ return 1
+ && buffer0 == 'I'
+ && (buffer1|0x20) == 'c'
+ && (buffer2|0x20) == 'e'
+ && buffer3 == '!';
+}
+
+struct sndh_boot { int init, kill, play, data; };
+
+/* Decode 68k instruction at the beginning of sndh files.
+ * @return offset of the jump or org if it's a rts.
+ * @retval -1 on error
+ */
+static int sndh_decode(const char * buf, int org, int off)
+{
+ if (off <= 10) {
+ unsigned int w0, w1;
+ w0 = WPeekBE(buf + off + 0);
+
+ /* Skip nop */
+ if (w0 == 0x4e71)
+ return sndh_decode(buf,org,off+2);
+ w1 = WPeekBE(buf + off + 2);
+
+ /* Decode 68k instructions allowed instructions: jmp(pc)/bra/bra.s/rts
+ */
+ if (w0 == 0x6000 || w0 == 0x4efa)
+ return off + 2 + w1; /* bra and jmp(pc) */
+ else if ( (w0 & 0xff00) == 0x6000 )
+ return off + (int8_t) w0; /* bra.s */
+ else if ( w0 == 0x4e75 || (w0 == 0x4e00 && off == 4))
+ return org; /* rts or illegal-fix */
+ }
+ return -1;
+}
+
+/* @retval 0 on error
+ * @retval 12 nornal 'SNDH' tag position.
+ */
+static int sndh_is_magic(const char *buffer, int max, struct sndh_boot * sb)
+{
+ struct sndh_boot tmp, * boot = sb ? sb : &tmp;
+ const int start = 10;
+ int i=0, v = 0;
+
+ boot->init = boot->kill = boot->play = -1;
+ boot->data = 0x8000;
+
+ if (max >= 12
+ && (boot->init = sndh_decode(buffer,0,0)) >= 0
+ && (boot->kill = sndh_decode(buffer,4,4)) >= 0
+ && (boot->play = sndh_decode(buffer,8,8)) >= 0 ) {
+
+ if (boot->init >= 16 && boot->init < boot->data)
+ boot->data = boot->init;
+ if (boot->kill >= 16 && boot->kill < boot->data)
+ boot->data = boot->kill;
+ if (boot->play >= 16 && boot->play < boot->data)
+ boot->data = boot->play;
+ if (boot->data == 0x1000)
+ return 0;
+ max = boot->data;
+
+ for (i=start, v = LPeekBE(buffer+i); i < max && v != sndh_cc;
+ v = ((v<<8) | (bufferi++&255)) & 0xFFFFFFFF)
+ ;
+ }
+ i = (v == sndh_cc) ? i-4: 0;
+
+ assert(i==0 || i == 12);
+
+ return i;
+}
+
+static
+int isread(vfs68_t * const is, void * data, int len, unsigned int * hptr)
+{
+ int read = vfs68_read(is, data, len);
+ if (read > 0 && hptr) {
+ uint32_t h = *hptr;
+ int n = read;
+ uint8_t * k = (uint8_t *) data;
+ do {
+ h += *k++;
+ h += h << 10;
+ h ^= h >> 6;
+ } while (--n);
+ *hptr = h;
+ }
+ return read;
+}
+
+
+/* Ensure enough data in id buffer;
+ * retval 0 on error
+ * retval count on success
+ */
+static inline
+int ensure_header(vfs68_t * const is, char *id,
+ int have, int need, unsigned int * hptr)
+{
+ if (have < need) {
+ int miss = need - have;
+ int read = isread(is, id+have, miss, hptr);
+ if (read != miss) {
+ /* msg68_error("not a sc68 file (%s)\n", read==-1?"read error":"eof"); */
+ have = 0;
+ } else {
+ have = need;
+ }
+ }
+ return have;
+}
+
+/* Verify header; returns # bytes to alloc & read
+ * or -1 if error
+ * or -gzip_cc if may be gzipped
+ * or -ice_cc if may be iced
+ * or -sndh_cc if may be sndh
+ */
+static int read_header(vfs68_t * const is, unsigned int * hptr)
+{
+ char id256;
+ const int idv1_req = sizeof(file68_idstr_v1);
+ const int idv2_req = sizeof(file68_idstr_v2);
+ const int sndh_req = 32;
+ int have = 0;
+ const char missing_id = "not a sc68 file (no magic)";
+
+ assert( idv1_req == 56 );
+ assert( idv2_req == 8 );
+
+ /* Read ID v2 string */
+ if(have = ensure_header(is, id, have, idv2_req, hptr), !have)
+ return -1;
+
+ if (!memcmp(id, file68_idstr_v1, idv2_req)) {
+ /* looks like idv1; need more bytes to confirm */
+ if (have = ensure_header(is, id, have, idv1_req, hptr), !have) {
+ return -1;
+ }
+ if (memcmp(id, file68_idstr_v1, idv1_req)) {
+ return error68(missing_id);
+ }
+ TRACE68(file68_cat,"file68: found %s signature\n", "SC68_v1");
+ } else if (!memcmp(id, file68_idstr_v2, idv2_req)) {
+ TRACE68(file68_cat,"file68: found %s signature\n","SC68_v2");
+ } else {
+ if (have = ensure_header(is, id, have, sndh_req, hptr), !have) {
+ return -1;
+ }
+ if (gzip_is_magic(id)) {
+ TRACE68(file68_cat,"file68: found %s signature\n","GZIP");
+ return -gzip_cc;
+ } else if (ice_is_magic(id)) {
+ TRACE68(file68_cat,"file68: found %s signature\n","ICE!");
+ return -ice_cc;
+ } else {
+ /* Must be done after gzip or ice because id-string may appear
+ * in compressed buffer too.
+ */
+ if (sndh_is_magic(id,sndh_req,0)) {
+ TRACE68(file68_cat,"file68: found %s signature\n","SNDH");
+ return -sndh_cc;
+ }
+ }
+ return error68(missing_id);
+ }
+
+ /* Check 1st chunk */
+ if (isread(is, id, 4, hptr) != 4
+ || memcmp(id, CH68_CHUNK CH68_BASE, 4)) {
+ return error68("file68: not sc68 file -- missing base chunk");
+ }
+
+ /* Get base chunk : file total size */
+ if (isread(is, id, 4, hptr) != 4
+ || (have = LPeek(id), have <= 8)) {
+ return error68("file68: not sc68 file -- weird base chunk size");
+ }
+ /* TRACE68(file68_cat,"file68: header have %d bytes\n",have-8); */
+ return have-8;
+}
+
+static const char * not_noname(const char * s)
+{
+ return (s && strcmp68(s,tagstr.n_a)) ? s : 0;
+}
+
+/* FR = SEC * HZ
+ * FR = MS*HZ/1000
+ *
+ * SEC = FR / HZ
+ * MS = FR*1000/HZ
+ */
+
+static unsigned int fr_to_ms(unsigned int fr, unsigned int hz)
+{
+ u64 ms;
+ ms = fr;
+ ms *= 1000u;
+ ms /= hz;
+ return (unsigned int) ms;
+}
+
+static unsigned int ms_to_fr(unsigned int ms, unsigned int hz)
+{
+ u64 fr;
+ fr = ms;
+ fr *= hz;
+ fr /= 1000u;
+ return (unsigned int) fr;
+}
+
+static inline int is_aka_char(int c) {
+ return c >= 32 && c != ')';
+}
+
+/* match ".+ (^)+)$" */
+static int has_parenthesis(char * name, char ** sptr, char ** eptr)
+{
+ int i, l = strlen(name);
+
+ if (l < 5 || namel-1 != ')')
+ return 0;
+ for (i = l-2; i > 1 && namei != '('; --i)
+ if (!is_aka_char(namei)) return 0;
+ if (i < 2 || i == l-2 || namei-1 != ' ')
+ return 0;
+ *sptr = name+i;
+ *eptr = name+l-1;
+
+ return 1;
+}
+
+/* A bit of cooking here
+ *
+ * For sc68 file: extract AKA from legacy sc68 artist nomenclature
+ * `ARTIST (AKA)' excepted for unknown (replay) ones.
+ *
+ * For sndh file: extract YEAR from title or artist.
+ *
+ * always returns AKA tag id or -1
+ */
+static int decode_artist(disk68_t * mb, tagset68_t * tags)
+{
+ char *s, *e;
+ const int is_sc68 = mb->tags.tag.genre.val == tagstr.sc68;
+ int id_aka
+ = get_customtag(tags, tagstr.aka);
+
+ if (is_sc68) {
+ /* sc68 file format */
+ if (id_aka >= 0)
+ return id_aka;
+ if ( !tags->tag.artist.val ||
+ !has_parenthesis(tags->tag.artist.val, &s, &e) ||
+ !strncmp68(tags->tag.artist.val,"unknown",7) )
+ return id_aka;
+ s-1 = e0 = 0; /* strip */
+ id_aka = set_customtag(mb, tags, tagstr.aka, s+1);
+ TRACE68(file68_cat, "file68 guessed %s='%s'\n", tagstr.aka, s+1);
+ } else {
+ /* Some sndhs have a "(year)" in the title or in the artist. Only
+ * search for it if the file does not provide a YEAR tag. */
+ if (get_customtag(&mb->tags, tagstr.year) < 0 &&
+ (
+ (
+ ( tags->tag.title.val &&
+ has_parenthesis(tags->tag.title.val, &s, &e) &&
+ e - s == 5 && is_year(s+1) )
+ ||
+ ( tags->tag.artist.val &&
+ has_parenthesis(tags->tag.artist.val, &s, &e) &&
+ e - s == 5 && is_year(s+1) )
+ )
+ )
+ ) {
+ s-1 = e0 = 0; /* strip */
+ set_customtag(mb, &mb->tags, tagstr.year, s+1);
+ TRACE68(file68_cat, "file68 guessed %s='%s'\n",
+ tagstr.year, s+1);
+ }
+ }
+ return id_aka;
+}
+
+/* This function inits all pointers for this music files. It setup non
+ * initialized data to defaut value. It verifies most values are in
+ * good range.
+ */
+static int valid(disk68_t * mb)
+{
+ music68_t *m;
+ int i, pdatasz = 0, has_xtd = SC68_XTD, has_time = 0;
+ void * pdata = 0;
+ char * title, * artist, * aalias;
+ int is_sndh = mb->tags.tag.genre.val == tagstr.sndh;
+
+ if (mb->nb_mus <= 0)
+ return error68("file68: disk has no track");
+
+ /* Ensure default music in valid range */
+ if (mb->def_mus < 0 || mb->def_mus >= mb->nb_mus)
+ mb->def_mus = 0;
+
+ /* default album is 'n/a' */
+ if (!mb->tags.tag.title.val)
+ mb->tags.tag.title.val = tagstr.n_a;
+ /* default title is album */
+ title = mb->tags.tag.title.val;
+ /* default album artist is default track artist. Postpone ... */
+ /* default artist is album artist or 'n/a' */
+ artist = mb->tags.tag.artist.val ? mb->tags.tag.artist.val : tagstr.n_a;
+ /* default alias */
+ aalias = (i = decode_artist(mb, &mb->tags), i<0)
+ ? 0 : mb->tags.arrayi.val;
+
+ /* Disk total time : 00:00 */
+ mb->time_ms = 0;
+
+ /* Clear flags */
+ mb->hwflags = 0;
+
+ /* Init all music in this file */
+ for (m = mb->mus, i = 0; m < mb->mus + mb->nb_mus; m++, i++) {
+
+ /* Default load address */
+ if ( (m->has.pic = !m->a0) )
+ m->a0 = SC68_LOADADDR;
+
+ /* Default replay frequency is 50Hz */
+ if (!m->frq)
+ m->frq = 50u;
+
+ /* Compute ms from frames prior to frames from ms. */
+ if ( (m->has.time = m->first_fr > 0u) ) {
+ m->first_ms = fr_to_ms(m->first_fr, m->frq);
+ } else {
+ m->has.time = m->first_ms > 0u;
+ m->first_fr = ms_to_fr(m->first_ms, m->frq);
+ }
+
+ /* For sndh file that does not have time or hardware flags look up
+ * in sc68 hardcoded database. */
+ if (is_sndh && ( ! m->has.time || ! (m->hwflags & SC68_XTD) ) ) {
+ unsigned int frames;
+ int flags;
+
+ /* TODO: check sndh time */
+ TRACE68(file68_cat,
+ "file68: searching track #%02d:%08x in sndh timedb\n",
+ i+1, mb->hash);
+
+ if (-1 != timedb68_get(mb->hash, i, &frames, &flags)) {
+ m->has.time = 1;
+ m->first_fr = frames;
+ m->first_ms = fr_to_ms(m->first_fr, m->frq);
+
+ m->hwflags |= SC68_XTD;
+ if (flags & TDB_STE)
+ m->hwflags |= (SC68_DMA|SC68_LMC);
+ /* Invert the flag as timerdb knows about unused timers. */
+ m->hwflags |=
+ (15^(flags&(TDB_TA|TDB_TB|TDB_TC|TDB_TD))/TDB_TA) << SC68_MFP_BIT;
+ TRACE68(file68_cat,
+ "file68: found track #%02d:%08x in sndh timedb"
+ " -- %d ms, %d frames, %c%c%c%c%s\n",
+ i+1, mb->hash, m->first_ms, m->first_fr,
+ (m->hwflags & SC68_MFP_TA) ? 'A' : '.',
+ (m->hwflags & SC68_MFP_TB) ? 'B' : '.',
+ (m->hwflags & SC68_MFP_TC) ? 'C' : '.',
+ (m->hwflags & SC68_MFP_TD) ? 'D' : '.',
+ (m->hwflags & SC68_DMA) ? ",STE" : "");
+ }
+ }
+
+ if (m->has.loop) {
+ /* Compute ms from frames. */
+ m->loops_ms = fr_to_ms(m->loops_fr, m->frq);
+ } else {
+ /* loop time not set, default to track time. */
+ m->loops_fr = m->first_fr;
+ m->loops_ms = m->first_ms;
+ }
+
+ if (!m->loops_fr) {
+ /* Track does not loop, force number of loops to 1. */
+ m->loops = 1;
+ } else if (!m->loops) {
+ /* Number of loop unspeficied: calcultate it so that the total
+ * time never be less than MIN_TRACK_MS, unless it requires more
+ * loop than MAX_TRACK_LP.
+ */
+ m->loops = 1;
+ if ( m->first_ms < MIN_TRACK_MS)
+ m->loops += (MIN_TRACK_MS - m->first_ms + (m->loops_ms>>1)) / m->loops_ms;
+ if (m->loops > MAX_TRACK_LP)
+ m->loops = MAX_TRACK_LP;
+ }
+
+ if (m->loops > 0) {
+ mb->time_ms += fr_to_ms(m->first_fr+m->loops_fr*(m->loops-1), m->frq);
+ has_time ++;
+ } else
+ m->loops = 0;
+
+ /* default mode is Atari-ST YM2149 PSG */
+ if (!m->hwflags)
+ m->hwflags |= SC68_PSG;
+ mb->hwflags |= m->hwflags;
+ has_xtd &= (m->hwflags & SC68_XTD);
+
+ /* default genre */
+ if (!m->tags.tag.genre.val)
+ m->tags.tag.genre.val = (m->hwflags & SC68_AGA)
+ ? tagstr.amiga_chiptune
+ : tagstr.atari_st_chiptune
+ ;
+
+ /* default music name is album name */
+ if (!m->tags.tag.title.val)
+ m->tags.tag.title.val = title; /* inherits title */
+ else
+ title = m->tags.tag.title.val; /* new inheririted title */
+
+ /* default artist */
+ if (!m->tags.tag.artist.val) {
+ m->tags.tag.artist.val = artist; /* inherit artist */
+ if (aalias)
+ set_customtag(mb, &m->tags, tagstr.aka, aalias);
+ } else {
+ int id;
+ artist = m->tags.tag.artist.val; /* new inherited artist */
+ aalias = (id = decode_artist(mb, &m->tags), id < 0)
+ ? 0 : m->tags.arrayid.val;
+ }
+
+ /* use data from previous music */
+ if (!m->data) {
+ m->data = (char *) pdata; /* inherit music data */
+ m->datasz = pdatasz;
+ }
+ if (!m->data)
+ return error68("file68: track #%d has no data", i+1);
+ pdata = m->data; /* new inherited music data */
+ pdatasz = m->datasz;
+ }
+
+ /* album artist inherits default track artist */
+ if (!mb->tags.tag.artist.val) {
+ mb->tags.tag.artist.val = mb->musmb->def_mus.tags.tag.artist.val;
+ if (i = get_customtag(&mb->musmb->def_mus.tags, tagstr.aka), i>=0)
+ set_customtag(mb, &mb->tags, tagstr.aka,
+ mb->musmb->def_mus.tags.arrayi.val);
+ }
+
+ /* All tracks must have time onfo for disk tine info to be valid. */
+ if (has_time != mb->nb_mus)
+ mb->time_ms = 0;
+
+ /* All tracks must have extended info for the disk to have it. */
+ mb->hwflags |= has_xtd; /* all tracks must have it */
+
+ return 0;
+}
+
+int file68_is_our(const char * uri, const char * exts, int * is_remote)
+{
+ assert(!"do not use, needs a freshen up");
+ return 0;
+}
+
+static vfs68_t * uri_or_file_create(const char * uri, int mode,
+ rsc68_info_t * info)
+{
+ vfs68_t *vfs = 0;
+
+ TRACE68(file68_cat,"file68: create -- %s -- mode:%d -- with%s info\n",
+ strnull(uri),mode,info?"":"out");
+
+ if (info && !strncmp68(uri,"sc68://music/", 13)) {
+ info->type = rsc68_last;
+ vfs = uri68_vfs(uri, mode, 1, &info);
+ } else {
+ vfs = uri68_vfs(uri, mode, 0);
+ }
+
+ if (vfs68_open(vfs) < 0) {
+ vfs68_destroy(vfs);
+ vfs = 0;
+ }
+
+ TRACE68(file68_cat,"file68: create -- %s,%s\n",
+ ok_int(!vfs),
+ strnull(vfs68_filename(vfs)));
+ return vfs;
+}
+
+disk68_t * file68_load_uri(const char * fname)
+{
+ disk68_t * d;
+ vfs68_t * is;
+ rsc68_info_t info;
+
+ TRACE68(file68_cat,"file68: load -- %s\n", strnull(fname));
+
+ is = uri_or_file_create(fname, 1, &info);
+ d = file68_load(is);
+ vfs68_destroy(is);
+
+ if (d && info.type == rsc68_music) {
+ // int i;
+
+ TRACE68(file68_cat,
+ "file68: load -- on the fly patch -- #%d/%d/%d\n",
+ info.data.music.track,
+ info.data.music.loops,
+ info.data.music.time_ms);
+
+ d->force_track = info.data.music.track;
+ d->force_loops = info.data.music.loops;
+ d->force_ms = info.data.music.time_ms;
+ }
+ TRACE68(file68_cat,"file68: load -- %s\n", ok_int(!d));
+ return d;
+}
+
+disk68_t * file68_load_mem(const void * buffer, int len)
+{
+ disk68_t * d;
+ vfs68_t * is;
+
+ is = uri68_vfs("mem:", 1, 2, buffer, len);
+ d = vfs68_open(is) ? 0 : file68_load(is);
+ vfs68_destroy(is);
+
+ return d;
+}
+
+
+static int sndh_flags(hwflags68_t * hw, const char * b, int len)
+{
+ int k, f;
+
+ TRACE68(file68_cat,
+ "file68: sndh -- FLAGS are '%s'\n", b);
+
+ for (f=SC68_XTD, k=0; k<len && bk; ++k)
+ switch (bk) {
+ case '~': break; /* Ignore '~' */
+ case 'y': f |= SC68_PSG; break;
+ case 'e': f |= SC68_DMA; break;
+ case 'a': f |= SC68_MFP_TA; break;
+ case 'b': f |= SC68_MFP_TB; break;
+ case 'c': f |= SC68_MFP_TC; break;
+ case 'd': f |= SC68_MFP_TD; break;
+ case 'p': f |= SC68_AGA; break;
+ case 'l': f |= SC68_LMC; break;
+ case 's': f |= SC68_DSP; break;
+ case 't': f |= SC68_BLT; break;
+ case 'h': f |= SC68_HBL; break;
+ case 'x': break; /* reserved for SFX */
+ case 'g': break; /* reserved for digital only */
+ case 'j': break; /* reserved for jingles */
+ default:
+ TRACE68(file68_cat,"file68: sndh -- unexpected FLAG '%c'\n", bk);
+ assert(!"unexpected FLAG");
+ }
+ if (++k > len)
+ k = len;
+ *hw = f;
+ return k;
+}
+
+static int st_isupper( int c )
+{
+ return (c >= 'A' && c <= 'Z');
+}
+
+static int st_isdigit( int c )
+{
+ return c >= '0' && c <= '9';
+}
+
+static int st_istag( int c )
+{
+ return c == '!' || c == '#';
+}
+
+static int st_isgraph( int c )
+{
+ return st_isupper(c) || st_isdigit(c) || st_istag(c);
+}
+
+/* check memory range, trims space, clean control chars and returns
+ * its length */
+static int chkstr(char *b, int off, int len)
+{
+ const int max = 256, org = off; /* limit string length to that */
+ int spc = len; /* fake value */
+ if (off+max < len)
+ len = off+max; /* limit string length */
+ for (; off < len; ++off) {
+ int c = boff;
+ if (!c) { /* end of string */
+ if (spc+1 < len)
+ bspc+1 = 0; /* trim space */
+ return off-org; /* return real length not trim */
+ }
+ if (c <= 32)
+ boff = 32; /* remove cntl char */
+ else {
+ spc = off; /* last non-space char */
+ if (c & 128)
+ /* TODO ? */;
+ }
+ }
+ return -1; /* reach the limit */
+}
+
+/* @see http://sndh.atari.org/fileformat.php
+ */
+static int sndh_info(disk68_t * mb, int len)
+{
+ const int unknowns_max = 8;
+ int i, vbl = 0, frq = 0/* , steonly = 0 */,
+ unknowns = 0, fail = 0;
+ int dtag = 0, ttag = 0;
+ char * b = mb->data;
+ char empty_tag4 = { 0, 0, 0, 0 };
+ struct sndh_boot boot;
+
+ /* Default */
+ mb->mus0.data = b;
+ mb->mus0.datasz = len;
+
+#if 1
+ mb->nb_mus = -1; /* Make validate failed */
+#else
+ mb->nb_mus = 1; /* Assume default of 1 track */
+#endif
+
+ mb->mus0.replay = 0;
+
+ i = sndh_is_magic(b, len, &boot);
+ if (!i) {
+ /* should not happen since we already have tested it. */
+ msg68_critical("file68: sndh -- info mising magic!\n");
+ return -1;
+ }
+ if (boot.data >= len) {
+ msg68_error("file68: sndh -- unable to locate music data\n");
+ return -1;
+ }
+ len = boot.data;
+
+
+ TRACE68(file68_cat,
+ "file68: sndh -- init:%04x kill:%04x play:%04x data:%04x\n",
+ boot.init, boot.kill, boot.play, boot.data);
+
+ /* HAXXX:
+ Some music have 0 after values. I don't know what are
+ sndh rules. May be 0 must be skipped or may be tag must be word
+ aligned.
+ Anyway the current parser allows a given number of successive
+ unknown tags. May be this number should be increase in order to prevent
+ some "large" unknown tag to break the parser.
+ */
+
+ for (;;) {
+ char ** p;
+ int j, t, s, ctypes;
+
+ /* skip zeros */
+ for ( ; i < len && !bi ; i++ )
+ ;
+
+ if (i+4 > len)
+ break;
+
+ /* check char types for the next 4 chars */
+ for (ctypes = 0, j=0; j<4; ++j) {
+ ctypes |= (st_isgraph( bi+j ) << j );
+ ctypes |= (st_isdigit( bi+j ) << (j + 8) );
+ }
+
+ TRACE68(file68_cat,
+ "file68: sndh -- pos:%d/%d ctypes:%04X -- '%c%c%c%c'\n",
+ i, len, ctypes, bi+0, bi+1, bi+2, bi+3);
+
+ t = -1; /* offset on tag */
+ s = -1; /* offset on arg */
+ p = 0; /* store arg */
+
+ if ( (ctypes & 0x000F) != 0x000F ) {
+ /* Not graphical ... should not be a valid tag */
+ } else if (!memcmp(b+i,"SNDH",4)) {
+ /* Header */
+ t = i; i += 4;
+ } else if (!memcmp(b+i,"COMM",4)) {
+ /* Artist */
+ t = i; s = i += 4;
+ p = &mb->mus0.tags.tag.artist.val;
+ } else if (!memcmp(b+i,"TITL",4)) { /* title */
+ /* Title */
+ t = i; s = i += 4;
+ p = &mb->tags.tag.title.val;
+ } else if (!memcmp(b+i,"RIPP",4)) {
+ /* Ripper */
+ if (ttag < TAG68_ID_CUSTOM_MAX) {
+ t = i; s = i += 4;
+ mb->mus0.tags.tag.customttag.key = tagstr.ripper;
+ p = &mb->mus0.tags.tag.customttag++.val;
+ }
+ } else if (!memcmp(b+i,"CONV",4)) {
+ /* Converter */
+ if (ttag < TAG68_ID_CUSTOM_MAX) {
+ t = i; s = i += 4;
+ mb->mus0.tags.tag.customttag.key = tagstr.converter;
+ p = &mb->mus0.tags.tag.customttag++.val;
+ }
+ } else if (!memcmp(b+i, "YEAR", 4)) {
+ /* year */
+ if (dtag < TAG68_ID_CUSTOM_MAX) {
+ t = i; s = i += 4;
+ mb->tags.tag.customdtag.key = tagstr.year;
+ p = &mb->tags.tag.customdtag++.val;
+ }
+#if 0 /* Does not happen probably just a typo in the sndh format doc. */
+ } else if ( (ctypes & 0x0F00) == 0x0F00 && is_year(b+i) && !b4 ) {
+ assert(0);
+ /* match direct a YEAR */
+ if (dtag < TAG68_ID_CUSTOM_MAX) {
+ t = i; s = i += 4;
+ mb->tags.tag.customdtag.key = tagstr.year;
+ mb->tags.tag.customdtag++.val = b;
+ }
+#endif
+ } else if (!memcmp(b+i,"MuMo",4)) {
+ /* MusicMon ??? */
+ msg68_warning("file68: sndh -- %s\n","what to do with 'MuMo' tag ?");
+ /* musicmon = 1; */
+ t = i; i += 4;
+ } else if (!memcmp(b+i,"TIME",4)) {
+ /* Time in second */
+ int j, tracks = mb->nb_mus <= 0 ? 1 : mb->nb_mus;
+ t = i; i += 4 + (i&1); /* Force alignment on the table */
+ for ( j = 0; j < tracks; ++j ) {
+ if (i < len-2 && j < SC68_MAX_TRACK)
+ mb->musj.first_ms = 1000u *
+ ( ( ( (unsigned char) bi) << 8 ) | (unsigned char) bi+1 );
+ TRACE68(file68_cat,
+ "file68: sndh -- TIME #%02d -- 0x%02X%02X (%c%c) -- %u ms\n",
+ j+1, (unsigned char)bi, (unsigned char)bi+1,
+ isgraph((int)(unsigned char)bi)?bi:'.',
+ isgraph((int)(unsigned char)bi+1)?bi+1:'.',
+ mb->musj.first_ms);
+ i += 2;
+ }
+ } else if (!memcmp(b+i, "FLAG", 4)) {
+ /* Track features (hardware,fx...) */
+
+ int j, max=0, tracks=mb->nb_mus <= 0 ? 1 : mb->nb_mus;
+
+ t = i;
+
+ /* Disambiguate FLAG 2 forms: unique string vs string table */
+ if ((i&1) || bi+4 == '~') {
+ /* single string form */
+ max = i+5;
+ max += sndh_flags(&mb->hwflags, b+max, len-max);
+ for ( j = 0; j < tracks; ++j )
+ mb->musj.hwflags = mb->hwflags;
+ } else {
+ /* multiple string form */
+ for ( j = 0; j < tracks; ++j ) {
+ music68_t * m = mb->mus+j;
+ int k, off = WPeekBE(b+i+4+j*2);
+ k = i+off;
+ k += sndh_flags(&m->hwflags, b+k, len-k);
+ if (k > max)
+ max = k;
+ }
+ }
+ i = max;
+
+ } else if ( !memcmp(b+i,"##",2) && ( (ctypes & 0xC00) == 0xC00 ) ) {
+ mb->nb_mus = ( bi+2 - '0' ) * 10 + ( bi+3 - '0' );
+ /* assert(0); */
+ t = i; i += 4;
+ } else if ( ( !memcmp(b+i,"!#",2) || !memcmp(b+i,"#!",2) )
+ && ( (ctypes & 0xC00) == 0xC00 ) ) {
+ mb->def_mus = ( bi+2 - '0' ) * 10 + ( bi+3 - '0' ) - 1;
+ t = i; i += 4;
+ } else if (!memcmp(b+i,"!#SN",4) || !memcmp(b+i,"#!SN",4)) {
+ /* track names (which it is ? The doc uses both ! */
+ int torg, tend, j, max=0, tracks = mb->nb_mus <= 0 ? 1 : mb->nb_mus;
+
+ torg = t = i; /* tag offset can be unaligned */
+ i += 4 + (i&1); /* the table however has to be aligned */
+ tend = i+tracks*2; /* offset end of table */
+
+ if (tend >= len) {
+ i = len; continue; /* mark the end */
+ }
+
+ /* FIXME: normally (according to the documentation) the subname
+ * table are offset relative the tag itself. However in some
+ * files they are obviously relative to the end of the offset
+ * table. Those are most probably faulty files, but I'll keep
+ * loading them by guessing the offset is wrong since it points
+ * in middle of the offset table instead of an actual string. */
+ for (j = 0; j < tracks; ++j) {
+ int off = WPeekBE(b + i + j*2); /* string offset */
+ if (t+off < tend) {
+ TRACE68(file68_cat,
+ "file68: sndh -- faulty !#SN (table:%u-%u string#%d:%u)\n",
+ t,tend,j+1,t+off);
+ torg = tend; /* origin is the end of the offset table */
+ break;
+ }
+ }
+
+ /* Now we can start the real thing ! */
+ for (j = 0; j < tracks; ++j, i+=2) {
+ int off = WPeekBE(b + i); /* string offset */
+ off += torg; /* add table origin */
+ if ( (unsigned int) off >= (unsigned int) len ) {
+ /* This is bad !!! the string is outside! */
+ TRACE68(file68_cat,
+ "file68: sndh -- !#SN%02d @%d out of range\n",j+1,off);
+ assert(!"subsong name offset out of range");
+ } else {
+ int l = chkstr(b, off, len);
+ if (l >= 0) {
+ mb->musj.tags.tag.title.val = b + off;
+ TRACE68(file68_cat,
+ "file68: sndh -- !#SN%02d @%d:+%d -- '%s' \n",
+ j+1, off, l, mb->musj.tags.tag.title.val);
+ off += l+1;
+ if (off > max)
+ max = off;
+ } else {
+ TRACE68(file68_cat,
+ "file68: sndh -- !#SN%02d @%d overflow\n",
+ j+1, off);
+ max = len;
+ }
+ }
+ }
+ /* Position on the last sub name and skip zeros. */
+ for (i = max; i < len && !bi ; i++ )
+ ;
+ TRACE68(file68_cat,
+ "file68: sndh -- !#SN @%d-%d\n", t, i);
+ } else if ( !memcmp(b+i,"!V",2) && ( (ctypes & 0xC00) == 0xC00 ) ) {
+ vbl = ( bi+2 - '0' ) * 10 + ( bi+3 - '0' );
+ i += 4;
+#if 0
+ /* Deprecated / Unknown anyway */
+ } else if (!memcmp(b+i,"**",2)) {
+ /* FX + string 2 char ??? */
+ msg68_warning("file68: sndh -- what to do with tag ? -- '**%c%c'\n",
+ bi+2, bi+3);
+ i += 4;
+#endif
+ } else if ( bi == 'T' && bi+1 >= 'A' && bi+1 <= 'D'
+ && ( (ctypes & 0xC00) == 0xC00 ) ) {
+ t = i; s = i += 2;
+ myatoi(b, i, len, &frq);
+ } else if( memcmp( b + i, empty_tag, 4 ) == 0 ||
+ memcmp( b + i, "HDNS", 4 ) == 0 ) {
+ t = i;
+ i = len;
+ } else {
+ /* skip until next 0 byte, as long as it's inside the tag area */
+ i += 4;
+ while( *(b + i) != 0 && i < len ) {
+ i++;
+ }
+ }
+
+ if ( t < 0 ) {
+ /* Unkwown tag, finish here. */
+ ++unknowns;
+ TRACE68(file68_cat,
+ "file68: sndh -- not a tag at offset %d -- %02X%02X%02X%02X\n",
+ i, bi&255, bi+1&255, bi+2&255, bi+3&255);
+ ++i;
+
+ if (fail || unknowns >= unknowns_max) {
+ i = len;
+ }
+
+ } else {
+ /* Well known tag */
+
+ TRACE68(file68_cat,
+ "file68: sndh -- got TAG -- '%c%c%c%c'\n",
+ bt, bt+1, bt+2, bt+3);
+ unknowns = 0; /* Reset successive unkwown. */
+
+ if (s >= 0) {
+ int l = chkstr(b, s, len);
+ if (l < 0) {
+ TRACE68(file68_cat,
+ "file68: sndh -- string out of range @%d\n", s);
+ i = len;
+ } else {
+ TRACE68(file68_cat,
+ "file68: sndh -- %s ARG -- '%s'\n",
+ p ? "store" : "got", b+s);
+ if (p)
+ *p = b+s; /* store tag */
+ i = s + l + 1;
+ }
+ }
+ }
+ }
+
+ if (mb->nb_mus <= 0) {
+ TRACE68(file68_cat,
+ "file68: sndh -- %d track; assuming 1 track\n", mb->nb_mus);
+ mb->nb_mus = 1;
+ }
+
+ if (mb->nb_mus > SC68_MAX_TRACK) {
+ mb->nb_mus = SC68_MAX_TRACK;
+ }
+
+ for (i=0; i<mb->nb_mus; ++i) {
+ mb->musi.d0 = i+1;
+ mb->musi.loops = 0;
+ mb->musi.frq = frq ? frq : vbl;
+ if (!(mb->musi.hwflags & SC68_XTD)) {
+ /* Did not have the 'FLAG' tag, fallback to YM+STE */
+ mb->musi.hwflags |= SC68_PSG | SC68_DMA | SC68_LMC;
+ }
+ }
+ return 0;
+}
+
+int file68_tag_count(const disk68_t * mb, int track)
+{
+ int cnt = -1;
+
+ if (mb && track >= 0 && track <= mb->nb_mus) {
+ int idx;
+ tagset68_t * tags = (tagset68_t *)
+ (!track ? &mb->tags : &mb->mustrack-1.tags); /* /!\ discard const */
+ for (idx = cnt = TAG68_ID_CUSTOM; idx<TAG68_ID_MAX; ++idx)
+ if (tags->arrayidx.key && tags->arrayidx.val) {
+ if (cnt != idx) {
+ tags->arraycnt.key = tags->arrayidx.key;
+ tags->arraycnt.val = tags->arrayidx.val;
+ }
+ ++cnt;
+ }
+ }
+ return cnt;
+}
+
+int file68_tag_enum(const disk68_t * mb, int track, int idx,
+ const char ** key, const char ** val)
+{
+ const char * k = 0, * v = 0;
+
+ if (mb && idx >= 0 && idx < TAG68_ID_MAX) {
+ const tagset68_t * tags = 0;
+ if (!track)
+ tags = &mb->tags;
+ else if (track > 0 && track <= mb->nb_mus)
+ tags = &mb->mustrack-1.tags;
+ if (tags) {
+ k = tags->arrayidx.key;
+ v = tags->arrayidx.val;
+ }
+ }
+ if (key) *key = k;
+ if (val) *val = v;
+
+ return -!(k && v);
+}
+
+static const char * get_tag(const disk68_t * mb, int track, const char * key)
+{
+ const char * val = 0;
+ const tagset68_t * tags;
+
+ assert(is_disk(mb));
+ assert(!track || in_range(mb,track));
+ assert(key);
+
+ if (!track)
+ tags = &mb->tags;
+ else if (in_range(mb, track))
+ tags = &mb->mustrack-1.tags;
+ else
+ tags = 0;
+
+ if (tags) {
+ int i = get_customtag(tags, key);
+ if (i >= 0)
+ val = tags->arrayi.val;
+ }
+ return val;
+}
+
+
+const char * file68_tag_get(const disk68_t * mb, int track, const char * key)
+{
+ return (key && is_disk(mb) && (!track || in_range(mb,track)))
+ ? get_tag(mb, track, key)
+ : 0
+ ;
+}
+
+char * file68_tag(const disk68_t * mb, int track, const char * key)
+{
+ const char * val = 0;
+
+ if (key && is_disk(mb) && (!track || in_range(mb,track))) {
+ val = get_tag(mb, track, key);
+ if (!val) {
+ /* $$$ TODO */
+ }
+ }
+
+ return strdup68(val);
+}
+
+const char * file68_tag_set(disk68_t * mb, int track,
+ const char * key, const char * val)
+{
+ const char * ret = 0;
+
+ if (mb && is_valid_key(key)) {
+ tagset68_t * tags = 0;
+
+ if (!track)
+ tags = &mb->tags;
+ else if (track <= mb->nb_mus)
+ tags = &mb->mustrack-1.tags;
+ if (tags) {
+ int i = set_customtag(mb, tags, key, val);
+ if (i >= 0)
+ ret = tags->arrayi.val;
+ else
+ ret = 0;
+ }
+ }
+
+ return ret;
+}
+
+static void free_tags(disk68_t * mb, tagset68_t *tags)
+{
+ int i;
+ for (i=0; i<TAG68_ID_MAX; ++i) {
+ free_string(mb, tags->arrayi.key); tags->arrayi.key = 0;
+ free_string(mb, tags->arrayi.val); tags->arrayi.val = 0;
+ }
+}
+
+void file68_free(const disk68_t * const_disk)
+{
+ disk68_t * disk = (disk68_t *)const_disk;
+
+ if (is_disk(disk)) {
+ const int max = disk->nb_mus;
+ int i;
+
+ free_tags(disk, &disk->tags);
+
+ for (i=0; i<max; ++i) {
+ free_string(disk, disk->musi.replay);
+ free_tags(disk, &disk->musi.tags);
+ if (disk->musi.data) {
+ int j;
+ free_string(disk, disk->musi.data);
+ for (j=max-1; j>=i; --j) {
+ if (disk->musj.replay == disk->musi.replay)
+ disk->musj.replay = 0;
+ if ( disk->musj.data == disk->musi.data )
+ disk->musj.data = 0;
+ disk->musj.datasz = 0;
+ }
+ disk->musi.data = 0;
+ disk->musi.datasz = 0;
+ }
+ }
+ if (disk->data != disk->buffer) {
+ free(disk->data);
+ disk->data = 0;
+ }
+ free(disk);
+ }
+}
+
+/* Allocate disk buffer */
+static disk68_t * alloc_disk(int datasz)
+{
+ disk68_t * mb;
+ int room = datasz + sizeof(disk68_t);
+
+ if (mb = calloc(room,1), mb) {
+ music68_t *cursix;
+
+ /* Set a little bit of magic */
+ mb->magic = SC68_DISK_ID;
+
+ /* data points into buffer */
+ mb->data = mb->buffer;
+ mb->datasz = datasz;
+
+ /* Setup static tags */
+ mb->tags.tag.title.key = tagstr.title;
+ mb->tags.tag.artist.key = tagstr.artist;
+ mb->tags.tag.genre.key = tagstr.format;
+ for (cursix = mb->mus; cursix < mb->mus+SC68_MAX_TRACK; ++cursix) {
+ cursix->tags.tag.title.key = tagstr.title;
+ cursix->tags.tag.artist.key = tagstr.artist;
+ cursix->tags.tag.genre.key = tagstr.genre;
+ }
+ }
+ return mb;
+}
+
+disk68_t * file68_new(int extra)
+{
+ disk68_t * d = 0;
+ if (extra < 0 || extra >= 1<<21)
+ msg68_error("file68: invalid amount of extra data -- %d\n", extra);
+ else
+ d = alloc_disk(extra);
+ return d;
+}
+
+
+/* Load , allocate memory and valid struct for SC68 music
+ */
+disk68_t * file68_load(vfs68_t * is)
+{
+ disk68_t *mb = 0;
+ int len;
+ unsigned int hash = 0, *h = &hash;
+ int chk_size;
+ int opened = 0;
+ music68_t *cursix;
+ tagset68_t * tags;
+ char *b;
+ const char *fname = vfs68_filename(is);
+ const char *errorstr = 0;
+
+ fname = strnevernull68(fname);
+
+ /* Read header and get data length. */
+ if (len = read_header(is, h), len < 0) {
+ /* Verify tells it is a gzip or unice file, so we may give it a try.
+ */
+ if (1) {
+ void * buffer = 0;
+ int l;
+ switch (len) {
+ case -gzip_cc:
+ /* gzipped */
+ if (vfs68_seek_to(is,0) == 0) {
+ vfs68_t * zis;
+ zis=vfs68_z_create(is,VFS68_OPEN_READ,
+ vfs68_z_default_option);
+ if (!vfs68_open(zis)) {
+ mb = file68_load(zis);
+ }
+ vfs68_destroy(zis);
+ if (mb) {
+ goto already_valid;
+ }
+ }
+ break;
+
+ case -ice_cc:
+ if (vfs68_seek_to(is,0) == 0) {
+ buffer = file68_ice_load(is, &l);
+ }
+ break;
+
+ case -sndh_cc:
+ if (vfs68_seek_to(is,0) != 0) {
+ break;
+ }
+ len = vfs68_length(is);
+ if (len <= 32 || len > 1<<21) {
+ break;
+ }
+ mb = alloc_disk(len);
+ if (!mb) {
+ errorstr = "memory allocation";
+ break;
+ }
+ mb->tags.tag.genre.val = tagstr.sndh;
+ if (isread(is, mb->data, len, h) != len) {
+ break;
+ }
+ if (sndh_info(mb, len)) {
+ break;
+ }
+ goto validate;
+ }
+
+ if (buffer) {
+ mb = file68_load_mem(buffer, l);
+ free(buffer);
+ if (mb) {
+ return mb;
+ }
+ }
+ }
+ if (!errorstr)
+ errorstr = "read header";
+ goto error;
+ }
+
+ mb = alloc_disk(len);
+ if (!mb) {
+ errorstr = "memory allocation";
+ goto error;
+ }
+ mb->tags.tag.genre.val = tagstr.sc68;
+
+ if (isread(is, mb->data, len, h) != len) {
+ errorstr = "read data";
+ goto error;
+ }
+
+ for (b = mb->data, cursix = 0, tags = &mb->tags;
+ len >= 8;
+ b += chk_size, len -= chk_size) {
+ char chk8;
+ if (b0 != 'S' || b1 != 'C') {
+ break;
+ }
+
+ chk0 = b2;
+ chk1 = b3;
+ chk2 = 0;
+ chk_size = LPeek(b + 4);
+ b += 8;
+ len -= 8;
+
+ if (ISCHK(chk, CH68_BASE)) {
+ /* nothing to do. */
+ }
+ /* Default track */
+ else if (ISCHK(chk, CH68_DEFAULT)) {
+ mb->def_mus = LPeek(b);
+ }
+ /* Album or track title */
+ else if (ISCHK(chk, CH68_FNAME) || ISCHK(chk, CH68_MNAME)) {
+ tags->tag.title.val = b;
+ }
+ /* Start music session. */
+ else if (ISCHK(chk, CH68_MUSIC)) {
+ if (mb->nb_mus == SC68_MAX_TRACK) {
+ /* Can't have more than SC68_MAX_TRACK tracks */
+ len = 0;
+ break;
+ }
+ cursix = mb->mus + mb->nb_mus;
+ /* cursix->loops = 0; /\* default loop *\/ */
+ /* cursix->loops_fr = ~0; /\* loop length not set *\/ */
+ tags = &cursix->tags;
+ mb->nb_mus++;
+ }
+ /* Author name */
+ else if (ISCHK(chk, CH68_ANAME)) {
+ tags->tag.artist.val = b;
+ }
+ /* Composer name */
+ else if (ISCHK(chk, CH68_CNAME)) {
+ if (strcmp68(b,tags->tag.artist.val))
+ set_customtag(mb, tags, tagstr.composer, b);
+ }
+ /* External replay */
+ else if (ISCHK(chk, CH68_REPLAY)) {
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ cursix->replay = b;
+ }
+ /* 68000 D0 init value */
+ else if (ISCHK(chk, CH68_D0)) {
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ cursix->d0 = LPeek(b);
+ }
+ /* 68000 memory load address */
+ else if (ISCHK(chk, CH68_AT)) {
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ cursix->a0 = LPeek(b);
+ }
+ /* Playing time (ms) */
+ else if (ISCHK(chk, CH68_TIME)) {
+ int sec;
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ sec = LPeek(b);
+ /* sanity check */
+ if (sec < 0 || sec > 60*60*24)
+ sec = 0;
+ cursix->first_ms = sec * 1000u;
+ }
+ /* Playing time (frames) */
+ else if (ISCHK(chk, CH68_FRAME)) {
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ cursix->first_fr = LPeek(b);
+ /* $$$ Workaround some buggy musics */
+ if (cursix->first_fr >= 0x1000000u)
+ cursix->first_fr = 0;
+ }
+ /* Replay frequency */
+ else if (ISCHK(chk, CH68_FRQ)) {
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ cursix->frq = LPeek(b);
+ }
+ /* Loop */
+ else if (ISCHK(chk, CH68_LOOP)) {
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ cursix->loops = LPeek(b);
+ /* force sanity */
+ if (cursix->loops < -1)
+ cursix->loops = 0;
+ }
+ /* Loop length */
+ else if (ISCHK(chk, CH68_LOOPFR)) {
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ cursix->loops_fr = LPeek(b);
+ cursix->has.loop = 1;
+ }
+ /* SFX flag */
+ else if (ISCHK(chk, CH68_SFX)) {
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ cursix->has.sfx = 1;
+ }
+ /* Replay flags */
+ else if (ISCHK(chk, CH68_TYP)) {
+ int f;
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ f = LPeek(b);
+
+ /* force eXTenDed if anything is set at a higher rank. */
+ if (f & ~(SC68_XTD-1))
+ f |= SC68_XTD;
+ cursix->hwflags = f;
+ }
+ /* meta data */
+ else if (ISCHK(chk, CH68_TAG)) {
+ const char * key, * val;
+ key = b;
+ val = b + strlen(b) + 1;
+ TRACE68(file68_cat,"file68: got a tag '%s' '%s'\n", key, val);
+ if (set_customtag(mb, tags, key, val) < 0) {
+ msg68_warning("file68: unable to set %s tag '%s' '%s'\n",
+ cursix ? "track" : "disk", key, val);
+ }
+ }
+ /* music data */
+ else if (ISCHK(chk, CH68_MDATA)) {
+ if (!cursix) {
+ errorstr = chk;
+ goto error;
+ }
+ cursix->data = b;
+ cursix->datasz = chk_size;
+ }
+ /* EOF */
+ else if (ISCHK(chk, CH68_EOF)) {
+ len = 0;
+ break;
+ }
+ }
+
+ /* Check it */
+ if (len) {
+ errorstr = "prematured end of file";
+ goto error;
+ }
+
+validate:
+ mb->hash = hash;
+ if (valid(mb)) {
+ errorstr = "validation test";
+ goto error;
+ }
+
+already_valid:
+ if (opened) {
+ vfs68_close(is);
+ }
+
+ return mb;
+
+error:
+ if (opened) {
+ vfs68_close(is);
+ }
+ free(mb);
+ msg68_error("file68: load '%s' failed %s\n",
+ fname, errorstr ? errorstr : "no reason");
+ return 0;
+}
+
+
+
+static int get_version(const int version) {
+ return version == 2 ? 2 : 1;
+}
+
+static void get_header(const int version,
+ const char ** const header, int * const headsz)
+{
+ switch (get_version(version)) {
+ case 1:
+ *header = file68_idstr_v1;
+ *headsz = sizeof(file68_idstr_v1);
+ break;
+ case 2:
+ *header = file68_idstr_v2;
+ *headsz = sizeof(file68_idstr_v2);
+ break;
+ }
+}
+
+#ifndef _FILE68_NO_SAVE_FUNCTION_
+
+/* save CHUNK and data */
+/* $$$ NEW: Add auto 16-bit alignement. */
+static int save_chunk(vfs68_t * os,
+ const char * chunk, const void * data, int size)
+{
+ static char zero4 = {0,0,0,0};
+ chunk68_t chk;
+ int align;
+
+ memcpy(chk.id, CH68_CHUNK, 2);
+ memcpy(chk.id + 2, chunk, 2);
+ align = size & 1;
+ LPoke(chk.size, size + align);
+ if (vfs68_write(os, &chk, (int)sizeof(chunk68_t)) != sizeof(chunk68_t)) {
+ goto error;
+ }
+ /* Special case data is 0 should happen only for SC68 total size
+ * chunk.
+ */
+ if (size && data) {
+ if (vfs68_write(os, data, size) != size) {
+ goto error;
+ }
+ if (align && vfs68_write(os, zero, align) != align) {
+ goto error;
+ }
+ }
+ return 0;
+
+error:
+ return -1;
+}
+
+/* save CHUNK and string (only if non-0 & lenght>0) */
+static int save_string(vfs68_t * os,
+ const char * chunk, const char * str)
+{
+ int len;
+
+ if (!str || !(len = strlen(str))) {
+ return 0;
+ }
+ return save_chunk(os, chunk, str, len + 1);
+}
+
+/* save CHUNK and string (only if non-0 & lenght>0) */
+static int save_noname(vfs68_t * os,
+ const char * chunk, const char * str)
+{
+ return save_string(os, chunk, not_noname(str));
+}
+
+/* save CHUNK & string str ( only if oldstr!=str & lenght>0 ) */
+static int save_differstr(vfs68_t * os,
+ const char *chunk, char *str, char *oldstr)
+{
+ int len;
+
+ if (oldstr == str
+ || !str
+ || (oldstr && !strcmp(oldstr, str))) {
+ return 0;
+ }
+ len = strlen(str);
+ return !len ? 0 :save_chunk(os, chunk, str, len + 1);
+}
+
+/* save CHUNK and 4 bytes Big Endian integer */
+static int save_number(vfs68_t * os, const char * chunk, int n)
+{
+ char number4;
+
+ LPoke(number, n);
+ return save_chunk(os, chunk, number, 4);
+}
+
+/* save CHUNK and number (only if n!=0) */
+static int save_nonzero(vfs68_t * os, const char * chunk, int n)
+{
+ return !n ? 0 : save_number(os, chunk, n);
+}
+
+int file68_save_uri(const char * fname, const disk68_t * mb,
+ int version, int gzip)
+{
+ vfs68_t * os;
+ int err;
+
+ os = uri_or_file_create(fname, 2, 0);
+ err = file68_save(os, mb, version, gzip);
+ vfs68_destroy(os);
+
+ return err;
+}
+
+static int save_tags(vfs68_t *os, const tagset68_t * tags,
+ int start, const char ** skip)
+{
+ int i, max = 0, err = 0;
+ char * tmp = 0;
+
+ for (i=start; i<TAG68_ID_MAX; ++i) {
+ int keylen, vallen;
+
+ /* Skip those tags. */
+ if (skip) {
+ const char ** skip_tag;
+ for (skip_tag = skip;
+ *skip_tag && strcmp68(*skip_tag, tags->arrayi.key); skip_tag++)
+ ;
+ if (*skip_tag)
+ continue;
+ }
+
+ if (tags->arrayi.key && (keylen = strlen(tags->arrayi.key)) &&
+ tags->arrayi.val && (vallen = strlen(tags->arrayi.val))) {
+ int len = keylen + vallen + 2;
+ if (len > max) {
+ char * new = realloc(tmp, len);
+ if (!new) continue;
+ tmp = new;
+ max = len;
+ }
+ memcpy(tmp ,tags->arrayi.key, keylen+1);
+ memcpy(tmp+keylen+1,tags->arrayi.val, vallen+1);
+ if (err = save_chunk(os, CH68_TAG, tmp, len), err)
+ break;
+ }
+ }
+ free(tmp);
+ return err;
+}
+
+int file68_save_mem(const char * buffer, int len, const disk68_t * mb,
+ int version, int gzip)
+{
+ vfs68_t * vfs;
+ int err;
+
+ vfs = uri68_vfs("mem:", 2, 2, buffer, len);
+ err = file68_save(vfs, mb, version, gzip);
+ vfs68_destroy(vfs);
+
+ return err;
+}
+
+static const char * save_sc68(vfs68_t * os, const disk68_t * mb,
+ int len, int version);
+
+/* Save disk into file. */
+int file68_save(vfs68_t * os, const disk68_t * mb, int version, int gzip)
+{
+ int len;
+ const char * fname = 0;
+ const char * errstr = 0;
+ vfs68_t * null_os = 0;
+ vfs68_t * org_os = 0;
+
+ const char * header;
+ int headsz;
+
+ get_header(version, &header, &headsz);
+
+ /* Get filename (for error message) */
+ fname = vfs68_filename(os);
+
+ /* Create a null stream to calculate total size.
+ Needed by gzip stream that can't seek back. */
+ null_os = uri68_vfs("null:", 3, 0);
+ if (vfs68_open(null_os)) {
+ errstr = "open";
+ } else {
+ errstr = save_sc68(null_os, mb, 0, version);
+ }
+ if (errstr) {
+ goto error;
+ }
+ len = vfs68_length(null_os) - headsz;
+ if (len <= 0) {
+ errstr = "invalid stream length";
+ goto error;
+ }
+
+ /* Wrap to gzip stream */
+ if (gzip) {
+ vfs68_z_option_t gzopt;
+
+ org_os = os;
+ gzopt = vfs68_z_default_option;
+ gzopt.level = gzip;
+ gzopt.name = 0;
+ os = vfs68_z_create(org_os, 2, gzopt);
+ if (vfs68_open(os)) {
+ errstr = "open";
+ goto error;
+ }
+ }
+
+ errstr = save_sc68(os, mb, len, version);
+
+error:
+ if (org_os) {
+ /* Was gzipped: clean-up */
+ vfs68_destroy(os);
+ }
+ vfs68_destroy(null_os);
+
+ return errstr
+ ? error68("file68: %s error -- %s",errstr,fname)
+ : 0;
+}
+
+static const char * save_sc68(vfs68_t * os, const disk68_t * mb,
+ int len, int version)
+{
+ const char * errstr = 0;
+
+ int opened = 0;
+
+ const music68_t * mus;
+ char * mname, * aname, /* * cname, */ * data;
+
+ const char * header;
+ int headsz;
+
+ get_header(version, &header, &headsz);
+
+ /* Check vfs */
+ if (!os) {
+ errstr = "null stream";
+ goto error;
+ }
+
+ /* Check disk */
+ if (!is_disk(mb)) {
+ errstr = "not a sc68 disk";
+ goto error;
+ }
+
+ /* Check number of music */
+ if (mb->nb_mus <= 0 || mb->nb_mus > SC68_MAX_TRACK) {
+ errstr = "invalid number of track";
+ goto error;
+ }
+
+ /* SC68 file header string */
+ if (vfs68_write(os, header, headsz) != headsz) {
+ errstr = "header write";
+ goto error;
+ }
+ /* SC68 disk-info chunks */
+ if (save_chunk(os, CH68_BASE, 0, len)
+ || save_noname (os, CH68_FNAME, mb->tags.tag.title.val)
+ || save_noname (os, CH68_ANAME, mb->tags.tag.artist.val)
+ || save_nonzero (os, CH68_DEFAULT, mb->def_mus)
+ || save_tags (os, &mb->tags, TAG68_ID_CUSTOM, 0)
+ ) {
+ errstr = "chunk write";
+ goto error;
+ }
+
+ /* Reset previous value for various string */
+ mname = mb->tags.tag.title.val;
+ aname = mb->tags.tag.artist.val;
+ /* cname = */data = 0;
+ for (mus = mb->mus; mus < mb->mus + mb->nb_mus; mus++) {
+ int flags = mus->hwflags;
+
+ /* Save track-name, author, composer, replay */
+ if (0
+ || save_chunk(os, CH68_MUSIC, 0, 0) == -1
+ || save_differstr(os, CH68_MNAME, mus->tags.tag.title.val, mname)
+ || save_differstr(os, CH68_ANAME, mus->tags.tag.artist.val, aname)
+ || save_tags(os, &mus->tags, TAG68_ID_CUSTOM, 0) /* skip title/artist */
+ ) {
+ errstr = "chunk write";
+ goto error;
+ }
+ if (mus->tags.tag.title.val) {
+ mname = mus->tags.tag.title.val;
+ }
+ if (mus->tags.tag.artist.val) {
+ aname = mus->tags.tag.artist.val;
+ }
+
+ /* Save play parms */
+ if (0
+ || save_string (os, CH68_REPLAY, mus->replay)
+ || save_nonzero(os, CH68_D0, mus->d0)
+ || save_nonzero(os, CH68_AT, !mus->has.pic * mus->a0)
+ || save_nonzero(os, CH68_FRQ, (mus->frq != 50) * mus->frq)
+ || save_nonzero(os, CH68_FRAME, mus->has.time * mus->first_fr)
+ || save_nonzero(os, CH68_LOOP, mus->has.loop * mus->loops)
+ || ( mus->has.loop &&
+ save_number(os, CH68_LOOPFR, mus->loops_fr) )
+ || save_number (os, CH68_TYP, flags)
+ || ( mus->has.sfx &&
+ save_chunk(os, CH68_SFX, 0, 0) )
+ ) {
+ errstr = "chunk write";
+ goto error;
+ }
+
+ /* Save music data */
+ if (mus->data && mus->data != data) {
+ if (save_chunk(os, CH68_MDATA, mus->data, mus->datasz)) {
+ errstr = "chunk write";
+ goto error;
+ }
+ data = mus->data;
+ }
+ }
+
+ /* SC68 last chunk */
+ if (save_chunk(os, CH68_EOF, 0, 0)) {
+ errstr = "chunk write";
+ goto error;
+ }
+
+error:
+ if (opened) {
+ vfs68_close(os);
+ }
+ return errstr;
+}
+
+#endif /* #ifndef _FILE68_NO_SAVE_FUNCTION_ */
+
+const char * file68_identifier(int version)
+{
+ return version == 1
+ ? file68_idstr_v1
+ : file68_idstr_v2
+ ;
+}
+
+const char * file68_mimetype(void)
+{
+ return file68_mimestr;
+}
+
+int file68_loader_init(void)
+{
+ file68_cat = msg68_cat("loader", "music file loader", DEBUG_FILE68_O);
+ return 0;
+}
+
+void file68_loader_shutdown(void)
+{
+ msg68_cat_free(file68_cat);
+ file68_cat = msg68_DEFAULT;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/gzip68.c Added

@@ -0,0 +1,311 @@
+/*
+ * @file gzip68.c
+ * @brief gzip file loader
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_zip.h"
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+typedef uint8_t byte;
+#else
+typedef unsigned char byte;
+#endif
+
+#ifdef USE_Z
+# include <zlib.h>
+/* gzip flag byte (from gzio.c) */
+# define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */
+# define HEAD_CRC 0x02 /* bit 1 set: header CRC present */
+# define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
+# define ORIG_NAME 0x08 /* bit 3 set: original file name present */
+# define COMMENT 0x10 /* bit 4 set: file comment present */
+# define RESERVED 0xE0 /* bits 5..7: reserved */
+#else
+# define Z_DEFLATED 8 /* From zlib.h */
+#endif
+
+/* gzip magic header */
+static byte gz_magic = {0x1f, (char)0x8b, Z_DEFLATED};
+
+int gzip68_is_magic(const void * buffer)
+{
+ return !memcmp(gz_magic, buffer, sizeof(gz_magic));
+}
+
+#ifdef USE_Z
+
+#include "file68_err.h"
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+
+#ifdef _MSC_VER
+# include <stdio.h>
+# define __STDC__ 0
+# include <io.h>
+#elif defined(HAVE_UNISTD_H)
+# include <unistd.h>
+#endif
+
+
+static int is_gz(int fd, int len)
+{
+ byte magicsizeof(gz_magic);
+ int inflate_len = -1;
+
+ /* header + inflate len */
+ if (len < 10+4) {
+ goto error;
+ }
+
+ /* Read and check magic. */
+ if (read(fd, magic, sizeof(magic)) != sizeof(magic) ||
+ memcmp(magic, gz_magic, sizeof(magic))) {
+ goto error;
+ }
+
+ /* Get uncompressed size at the end of file.
+ */
+ if (lseek(fd, -4, SEEK_END) == (off_t) -1) {
+ goto error;
+ } else {
+ unsigned char buffer4;
+ if(read(fd, buffer, 4) != 4) {
+ goto error;
+ }
+ inflate_len =
+ buffer0
+ | (buffer1 << 8)
+ | (buffer2 << 16)
+ | (buffer3 << 24);
+ if (inflate_len < 0) {
+ inflate_len = -1;
+ }
+ }
+error:
+
+ /* Rewind */
+ lseek(fd, 0, SEEK_SET);
+ return inflate_len;
+}
+
+/* Windows opens streams in Text mode by default. */
+#ifndef _O_BINARY
+# ifdef O_BINARY
+# define _O_BINARY O_BINARY
+# else
+# define _O_BINARY 0
+# endif
+#endif
+
+void *gzip68_load(const char *fname, int *ptr_ulen)
+{
+ int fd, err;
+ gzFile f = 0;
+ int ulen = 0;
+ void * uncompr = 0;
+ off_t len;
+ const int omode = O_RDONLY | _O_BINARY;
+
+ fd = open(fname, omode);
+ if (fd == -1) {
+ error68("gzip68: load '%s' -- %s", fname, strerror(errno));
+ goto error;
+ }
+
+ len = lseek(fd, 0, SEEK_END);
+ if (len == (off_t) -1) {
+ error68("gzip68: load '%s' -- %s", fname, strerror(errno));
+ goto error;
+ }
+
+ if (lseek(fd, 0, SEEK_SET) != 0) {
+ error68("gzip68: load '%s' -- %s", fname, strerror(errno));
+ goto error;
+ }
+
+ ulen = is_gz(fd, len);
+ if (ulen == -1) {
+ ulen = len;
+ }
+
+ f = gzdopen(fd, "rb");
+ if (!f) {
+ error68("gzip68: load '%s' -- %s", fname, gzerror(f, &err));
+ goto error;
+ }
+ fd = 0; /* $$$ Closed by gzclose(). Verify fdopen() rules. */
+
+ uncompr = malloc(ulen);
+ if (!uncompr) {
+ error68("gzip68: load '%s' -- alloc error", fname);
+ goto error;
+ }
+ len = gzread(f, uncompr, ulen);
+
+ if (len != ulen) {
+ error68("gzip68: load '%s' -- read error (%s)",fname, gzerror(f, &err));
+ goto error;
+ }
+ goto end;
+
+error:
+ if (uncompr) {
+ free(uncompr);
+ uncompr = 0;
+ ulen = 0;
+ }
+
+end:
+ if (fd) {
+ close(fd);
+ }
+ if (f) {
+ gzclose(f);
+ }
+ if (ptr_ulen) {
+ *ptr_ulen = ulen;
+ }
+
+ return uncompr;
+}
+
+int gzip68_buffer(void * dst, int dsize, const void * src, int csize)
+{
+ const struct {
+ byte magic2; /* gz header */
+ byte method; /* method (Z_DEFLATED) */
+ byte flags; /* Xtra,name,comment... */
+ byte info6; /* time, xflags and OS code */
+ } * header = src;
+ int err = -(!dst || !src || csize < sizeof(*header) || dsize <= 0);
+ byte crc2;
+ z_stream c_stream;
+
+ for (;;) {
+ int len = sizeof(*header), flags;
+ byte * d = (byte *)dst;
+ const byte * s = (const byte *) src;
+
+ /* check gzip header */
+ if (0
+ || gz_magic0 != header->magic0
+ || gz_magic1 != header->magic1
+ || header->method != Z_DEFLATED
+ || (header->flags & RESERVED) != 0) {
+ err = -1;
+ break;
+ }
+
+ /* Skip the extra field. */
+ if ((header->flags & EXTRA_FIELD) != 0) {
+ if (len + 2 < csize)
+ len += slen + (slen+1<<8);
+ len += 2;
+ }
+
+ /* Skip the original file name & .gz file comment. */
+ flags = header->flags & (ORIG_NAME|COMMENT);
+ while (len < csize && flags) {
+ if (flags & ORIG_NAME) {
+ flags &= ~ORIG_NAME;
+ } else {
+ flags &= ~COMMENT;
+ }
+ while (len < csize && !!slen++)
+ ;
+ }
+
+ /* Skip the header crc */
+ if (header->flags & HEAD_CRC) {
+ if (len + 2 < csize) {
+ crc0 = slen+0;
+ crc1 = slen+1;
+ } else {
+ crc0 = crc1 = 0;
+ }
+ len += 2;
+ }
+
+ /* Deflate now */
+ if (len < csize) {
+ const int z_flush_mode = Z_FINISH;
+
+ memset(&c_stream,0,sizeof(c_stream));
+ err = -(Z_OK != inflateInit2(&c_stream, -MAX_WBITS));
+ if (err)
+ break;
+
+ c_stream.next_in = (byte *)(s + len);
+ c_stream.avail_in = csize - len;
+ c_stream.next_out = d;
+ c_stream.avail_out = dsize;
+ err = inflate(&c_stream, z_flush_mode);
+ inflateEnd(&c_stream);
+ if (err != Z_STREAM_END) {
+ err = -1;
+ } else {
+ err = c_stream.total_out;
+ }
+ } else {
+ err = -1;
+ }
+ break;
+ }
+
+ return err;
+}
+
+#else
+
+#include "file68_err.h"
+
+void *gzip68_load(const char *fname, int *ptr_ulen)
+{
+ if (ptr_ulen) *ptr_ulen=0;
+ error68("gzip68: *NOT SUPPORTED*");
+ return 0;
+}
+
+int gzip68_buffer(void * dst, int dsize, const void * src, int csize)
+{
+ error68("gzip68: *NOT SUPPORTED*");
+ return -1;
+}
+
+#endif /* #ifdef HAVE_ZLIB_H */

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/ice68.c Added

@@ -0,0 +1,145 @@
+/*
+ * @file ice68.c
+ * @brief ICE! file loader
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_ice.h"
+#include "file68_vfs_def.h"
+#include "file68_err.h"
+#ifdef USE_UNICE68
+# include "file68_msg.h"
+# include "file68_uri.h"
+# include "unice68.h"
+# include <string.h>
+# include <stdlib.h>
+
+int file68_ice_version(void)
+{
+ return unice68_ice_version();
+}
+
+int file68_ice_is_magic(const void * buffer)
+{
+ return unice68_depacked_size(buffer,0) > 0;
+}
+
+
+#define TERROR(S) do { errstr = S; goto error; } while(0)
+
+
+void * file68_ice_load(vfs68_t *is, int *ulen)
+{
+ char header12, *inbuf = 0, * outbuf = 0;
+ int dsize, csize;
+ const char * fname;
+ const char * errstr = 0;
+
+ fname = vfs68_filename(is);
+
+ if (vfs68_read(is, header, 12) != 12)
+ TERROR("not ICE! (too small)");
+
+ csize = 0;
+ dsize = unice68_depacked_size(header, &csize);
+
+ if (dsize < 0)
+ TERROR("not ICE! (not magic)");
+
+ if(inbuf = malloc(csize), !inbuf)
+ TERROR("input alloc failed");
+
+ csize -= 12;
+ memcpy(inbuf, header, 12);
+ if (vfs68_read(is, inbuf+12, csize) != csize)
+ TERROR("read error");
+
+ if (outbuf = malloc(dsize), !outbuf)
+ TERROR("output alloc failed");
+
+ if (unice68_depacker(outbuf, inbuf))
+ TERROR("depack failed");
+
+ goto success;
+
+error:
+ error68("ice68: load: %s -- %s", errstr, fname);
+ free(outbuf);
+ outbuf = 0;
+ dsize = 0;
+
+success:
+ free(inbuf);
+ if (ulen) {
+ *ulen = dsize;
+ }
+ return outbuf;
+}
+
+void * file68_ice_load_file(const char * fname, int * ulen)
+{
+ void * ret = 0;
+ vfs68_t * is;
+
+ is = uri68_vfs(fname, 1, 0);
+ if (vfs68_open(is) != -1) {
+ ret = file68_ice_load(is, ulen);
+ vfs68_close(is);
+ }
+ vfs68_destroy(is);
+
+ return ret;
+}
+
+#else /* #ifdef USE_UNICE68 */
+
+int file68_ice_version(void)
+{
+ return 0;
+}
+
+int file68_ice_is_magic(const void * buffer)
+{
+ return buffer
+ && 0(char *)buffer == 'I'
+ && (1(char *)buffer | 0x20) == 'c'
+ && (2(char *)buffer | 0x20) == 'e'
+ && 3(char *)buffer == '!';
+}
+
+void * file68_ice_load(vfs68_t * is, int * ulen)
+{
+ const char * fname = vfs68_filename(is);
+ error68("ice68: *NOT SUPPORTED*");
+ return 0;
+}
+
+void * file68_ice_load_file(const char * fname, int * ulen)
+{
+ error68("ice68: *NOT SUPPORTED*");
+ return 0;
+}
+
+#endif /* #ifdef USE_UNICE68 */

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/init68.c Added

@@ -0,0 +1,338 @@
+/*
+ * @file init68.c
+ * @brief library initialization
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "file68_api.h"
+#include "file68.h"
+#include "file68_opt.h"
+#include "file68_msg.h"
+#include "file68_err.h"
+#include "file68_reg.h"
+#include "file68_vfs_ao.h"
+#include "file68_vfs_curl.h"
+#include "file68_vfs_fd.h"
+#include "file68_vfs_file.h"
+#include "file68_vfs_mem.h"
+#include "file68_vfs_null.h"
+#include "file68_vfs_z.h"
+#include "file68_rsc.h"
+#include "file68_str.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+static volatile int init;
+
+int option68_init(void); /* defined in option68.c */
+void option68_shutdown(void); /* defined in option68.c */
+int file68_loader_init(void); /* defined in file68.c */
+void file68_loader_shutdown(void); /* defined in file68.c */
+
+static char * mygetenv(const char *name)
+{
+#ifndef HAVE_GETENV
+ return 0;
+#else
+ return getenv(name);
+#endif
+}
+
+#ifdef NATIVE_WIN32
+/* Get path from registry, converts '\' to '/' and remove trailing '/'.
+ *
+ * @return pointer to the end of string
+ * @retval 0 error
+ */
+static char * get_reg_path(registry68_key_t key, char * kname,
+ char * buffer, int buflen)
+{
+ char * e = 0;
+
+ if (registry68_support() &&
+ !registry68_gets(key,kname,buffer,buflen)) {
+ for (e=buffer; *e; ++e) {
+ if (*e == '\\') *e = '/';
+ }
+ if (e > buffer && e-1 == '/')
+ --e;
+ *e = 0;
+ }
+ if (!e) buffer0 = 0;
+ return e;
+}
+#endif
+
+static const char dbgcat = "debug";
+static const char rsccat = "files";
+static const char prefix = "sc68-";
+
+
+static int ocp(const option68_t * opt, value68_t * value);
+static int ocd(const option68_t * opt, value68_t * value);
+
+/* list of options / envvars
+ *
+ * !!! DON'T CHANGE ORDER OR MODIFY ocp() !!!
+ *
+ * "debug" is a string to be evaluted as an integer later in the
+ * process (once debug features have been defined).
+ *
+ */
+static option68_t opts = {
+ OPT68_STRG(prefix,"share-path",rsccat,"shared resource path" ,1,ocp),
+ OPT68_STRG(prefix,"user-path" ,rsccat,"user resource path" ,0,ocp),
+ OPT68_STRG(prefix,"music-path",rsccat,"music database path" ,1,ocp),
+ OPT68_STRG(prefix,"remote-uri",rsccat,"online music base URI" ,1,ocp),
+ OPT68_BOOL(prefix,"no-debug" ,dbgcat,"disable all debug output",0,0),
+ OPT68_STRG(prefix,"debug" ,dbgcat,"set debug features" ,0,ocd),
+};
+
+static int ocp(const option68_t * opt, value68_t * value)
+{
+ static const char * (*f4)(const char *) = {
+ rsc68_set_share,rsc68_set_user,rsc68_set_music,rsc68_set_remote_music
+ };
+ int idx = opt - opts;
+ assert(idx >= 0 && idx < 4);
+
+ return -!fidx(value->str);
+}
+
+static int ocd(const option68_t * opt, value68_t * value)
+{
+ static const char delim = "+/|-~=";
+ int op, j = 0;
+ const char * str = value->str;
+ char arg64;
+
+ op = strchr(delim, *str) ? *str++ : '=';
+ while (op) {
+ int c = *str++;
+ if (!c || strchr(delim,c)) {
+ if (j > 0) {
+ unsigned int bits;
+ argj = 0; j = 0;
+ if (!strcmp68(arg,"all"))
+ bits = -1;
+ else if (arg0 == '#' && isdigit((int)arg1))
+ bits = 1 << strtol(arg+1,0,0);
+ else if (isdigit((int)arg0))
+ bits = strtol(arg,0,0);
+ else {
+ int bit = msg68_cat_bit(arg);
+ if (bit >= 0)
+ bits = 1 << bit;
+ else
+ bits = 0;
+ }
+ switch (op) {
+ case '=':
+ msg68_cat_filter(~0, bits); break;
+ case '-': case '~':
+ msg68_cat_filter(bits, 0); break;
+ case '+': case '/': case '|':
+ msg68_cat_filter(0, bits); break;
+ }
+ }
+ op = c;
+ } else if (j < sizeof(arg)-1)
+ argj++ = c;
+ }
+ return 0;
+}
+
+
+static char * convert_backslash(char * s) {
+ int i;
+ for (i=0; si; ++i)
+ if (si == '\\')
+ si = '/';
+ return s;
+}
+
+int file68_init(int argc, char **argv)
+{
+ char tmp1024;
+ option68_t * opt;
+
+ if (init)
+ return -1;
+ init = 3;
+
+ /* Options */
+ option68_init();
+
+#if !defined(DEBUG) || defined(NDEBUG)
+ opts4.hide = opts5.hide = 1; /* hide debugs option */
+#endif
+
+ option68_append(opts,sizeof(opts)/sizeof(*opts));
+ argc = option68_parse(argc, argv);
+
+ /* Check for --sc68-no-debug */
+ opt = option68_get("no-debug", opt68_ISSET);
+ if (opt && opt->val.num) {
+ /* Remove all debug messages whatsoever. */
+ msg68_set_handler(0);
+ }
+
+ /* Zlib */
+ vfs68_z_init();
+
+ /* Curl */
+ vfs68_curl_init();
+
+ /* Xiph AO */
+ vfs68_ao_init();
+
+ /* Memory */
+ vfs68_mem_init();
+
+ /* NUll */
+ vfs68_null_init();
+
+ /* File descriptor */
+ vfs68_fd_init();
+
+ /* File */
+ vfs68_file_init();
+
+ /* Resource locator */
+ rsc68_init();
+
+ /* Loader */
+ file68_loader_init();
+
+#ifdef NATIVE_WIN32
+ /* Get share path from registry */
+ opt = option68_get("share-path", opt68_ALWAYS);
+ if (opt) {
+ /* Get data path from registry */
+ if (!option68_isset(opt)) {
+ if (get_reg_path(0, "LMK:SOFTWARE/sashipa/sc68/Install_Dir",
+ tmp, sizeof(tmp)))
+ option68_set(opt,tmp,opt68_ALWAYS,opt68_CFG);
+ }
+ }
+#endif
+
+ /* Get user path */
+ opt = option68_get("user-path", opt68_ALWAYS);
+ if (opt) {
+
+#ifdef NATIVE_WIN32
+ static const char path = "/sc68";
+
+ /* Get user path from registry */
+ if (!option68_isset(opt)) {
+ char * env;
+ env = get_reg_path(0, "CUK:Volatile Environment/APPDATA",
+ tmp, sizeof(tmp));
+ if(env && strlen(env)+sizeof(path) < sizeof(tmp)) {
+ strcpy(tmp,env);
+ strcat(tmp,path);
+ option68_set(opt,tmp,opt68_ALWAYS,opt68_CFG);
+ }
+ }
+ if (!option68_isset(opt)) {
+ /* Get user from win32 env */
+ const char * drv = mygetenv("HOMEDRIVE");
+ const char * env = mygetenv("HOMEPATH");
+ if (drv && env && strlen(drv)+strlen(env)+sizeof(path) < sizeof(tmp)) {
+ strcpy(tmp,drv);
+ strcat(tmp,env);
+ strcat(tmp,path);
+ option68_set(opt,convert_backslash(tmp),opt68_ALWAYS,opt68_CFG);
+ }
+ }
+#endif
+ /* Get user path from HOME (usually not defined for win32 platform) */
+ if (!option68_isset(opt)) {
+ const char path = "/.sc68";
+ const char * env = mygetenv("HOME");
+ if(env && strlen(env)+sizeof(path) < sizeof(tmp)) {
+ strcpy(tmp,env);
+ strcat(tmp,path);
+ option68_set(opt,convert_backslash(tmp),opt68_ALWAYS,opt68_CFG);
+ }
+ }
+ }
+
+ init = 1;
+ return argc;
+}
+
+void file68_shutdown(void)
+{
+ if (init == 1) {
+ init = 2;
+
+ /* Options */
+ option68_shutdown();
+
+ /* Loader */
+ file68_loader_shutdown();
+
+ /* Shutdown resource */
+ rsc68_shutdown();
+
+ /* Zlib */
+ vfs68_z_shutdown();
+
+ /* Curl */
+ vfs68_curl_shutdown();
+
+ /* Xiph AO */
+ vfs68_ao_shutdown();
+
+ /* Memory */
+ vfs68_mem_shutdown();
+
+ /* NUll */
+ vfs68_null_shutdown();
+
+ /* File descriptor */
+ vfs68_fd_shutdown();
+
+ /* File */
+ vfs68_file_shutdown();
+
+ init = 0;
+ }
+}
+
+int file68_version(void)
+{
+ return PACKAGE_VERNUM;
+}
+
+const char * file68_versionstr()
+{
+ return PACKAGE_STRING;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/msg68.c Added

@@ -0,0 +1,367 @@
+/*
+ * @file msg68.c
+ * @brief message logging
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_msg.h"
+#include "file68_str.h"
+
+static msg68_t output = 0; /* Output function. */
+static void * cookie = 0; /* User data. */
+
+/** Default message filter mask.
+ *
+ * Corresponding bit have to be cleared to mask/filter a message
+ * category. The default value depend on compilation.
+ */
+static unsigned int msg68_bitmsk =
+#if defined(DEBUGMSG_MASK)
+ DEBUGMSG_MASK
+#elif defined(DEBUG)
+ (1 << (msg68_DEBUG+1)) - 1
+#else
+ (1 << (msg68_INFO+1)) - 1
+#endif
+ ;
+
+#define MAX_CATEGORIES (((sizeof(int)<<3)))
+
+struct struct_cat_bit {
+ int bit; /* equal to its array's index when entry is used. */
+ const char * name; /* category name. */
+ const char * desc; /* short descrition. */
+} cat_bitsMAX_CATEGORIES = {
+ { msg68_CRITICAL, "critical", "critical error message" },
+ { msg68_ERROR , "error" , "error message" },
+ { msg68_WARNING , "warning" , "warning message" },
+ { msg68_INFO , "info" , "informational message" },
+ { msg68_NOTICE , "notice" , "notice message" },
+ { msg68_DEBUG , "debug" , "debug message" },
+ { msg68_TRACE , "trace" , "trace message" }
+};
+
+msg68_t msg68_set_handler(msg68_t handler)
+{
+ msg68_t old = output;
+ output = handler;
+ return old;
+}
+
+void * msg68_set_cookie(void * userdata)
+{
+ void * old = cookie;
+ cookie = userdata;
+ return old;
+}
+
+/* Print message (variable argument). */
+void msg68x_va(int cat, void * cookie, const char * fmt, va_list list)
+{
+ if (output) {
+ switch (cat) {
+ default:
+ if (cat >= 0) {
+ const int bit = cat & (MAX_CATEGORIES-1);
+ const int msk = (1 << bit) | ((bit > msg68_TRACE) << msg68_TRACE);
+ if ( ! (msg68_bitmsk & msk) )
+ break;
+ } else break;
+ case msg68_ALWAYS:
+ output(cat, cookie, fmt, list);
+ case msg68_NEVER:
+ break;
+ }
+ }
+}
+
+void msg68x(int bit, void * cookie, const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68x_va(bit, cookie, fmt, list);
+ va_end(list);
+}
+
+void msg68_va(int bit, const char * fmt, va_list list)
+{
+ msg68x_va(bit, cookie, fmt, list);
+}
+
+void msg68(int bit, const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68x_va(bit, cookie, fmt, list);
+ va_end(list);
+}
+
+void msg68_trace(const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68_va(msg68_TRACE, fmt, list);
+ va_end(list);
+}
+
+void msg68x_trace(void * userdata, const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68x_va(msg68_TRACE, userdata, fmt, list);
+ va_end(list);
+}
+
+void msg68_debug(const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68_va(msg68_DEBUG, fmt, list);
+ va_end(list);
+}
+
+void msg68x_debug(void * userdata, const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68x_va(msg68_DEBUG, userdata, fmt, list);
+ va_end(list);
+}
+
+void msg68_info(const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68_va(msg68_INFO, fmt, list);
+ va_end(list);
+}
+
+void msg68x_info(void * userdata, const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68x_va(msg68_INFO, userdata, fmt, list);
+ va_end(list);
+}
+
+void msg68_notice(const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68_va(msg68_NOTICE, fmt, list);
+ va_end(list);
+}
+
+void msg68x_notice(void * userdata, const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68x_va(msg68_NOTICE, userdata, fmt, list);
+ va_end(list);
+}
+
+void msg68_warning(const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68_va(msg68_WARNING, fmt, list);
+ va_end(list);
+}
+
+void msg68x_warning(void * userdata, const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68x_va(msg68_WARNING, userdata, fmt, list);
+ va_end(list);
+}
+
+void msg68_error(const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68_va(msg68_ERROR, fmt, list);
+ va_end(list);
+}
+
+void msg68x_error(void * userdata, const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68x_va(msg68_ERROR, userdata, fmt, list);
+ va_end(list);
+}
+
+void msg68_critical(const char * fmt, ...)
+{
+ va_list list;
+ va_start(list, fmt);
+ msg68_va(msg68_CRITICAL, fmt, list);
+ va_end(list);
+}
+
+void msg68x_critical(void * userdata, const char * fmt, ...)
+{
+ va_list list; va_start(list, fmt);
+ msg68x_va(msg68_CRITICAL, userdata, fmt, list);
+ va_end(list);
+}
+
+void msg68_always(const char * fmt, ...)
+{
+ va_list list; va_start(list, fmt);
+ msg68_va(msg68_ALWAYS, fmt, list);
+ va_end(list);
+}
+
+void msg68x_always(void * userdata, const char * fmt, ...)
+{
+ va_list list; va_start(list, fmt);
+ msg68x_va(msg68_ALWAYS, userdata, fmt, list);
+ va_end(list);
+}
+
+static inline int is_valid_category(const int i)
+{
+ return i>=0 && i<MAX_CATEGORIES;
+}
+
+static inline int get_category(const char *name)
+{
+ int i;
+ for (i=MAX_CATEGORIES; --i>=0 && strcmp68(name,cat_bitsi.name);)
+ ;
+ return i;
+}
+
+static inline int is_free_category(const int i)
+{
+ return cat_bitsi.bit != i;
+}
+
+static inline int get_free_category(void)
+{
+ int i;
+ for (i=MAX_CATEGORIES; --i>=0 && !is_free_category(i);)
+ ;
+ if (i>=0)
+ cat_bitsi.bit = i;
+ return i;
+}
+
+
+/* Get named categories. */
+int msg68_cat_bit(const char * name)
+{
+ return name ? get_category(name) : -1;
+}
+
+/* Create/Modify a category. */
+int msg68_cat(const char * name, const char * desc, int masked)
+{
+ int i = msg68_NEVER;
+
+ if (name) {
+ i = get_category(name);
+ if (i < 0) {
+ i = get_free_category();
+ }
+ if (i >= 0) {
+ cat_bitsi.name = name;
+ cat_bitsi.desc = desc ? desc : "N/A";
+ if (masked) {
+ msg68_bitmsk |= 1<<i;
+ } else {
+ msg68_bitmsk &= ~(1UL<<i);
+ }
+ }
+ }
+
+ return i;
+}
+
+/* Free/Destroy a debug category. */
+void msg68_cat_free(int category)
+{
+ if (is_valid_category(category) && category > msg68_TRACE) {
+ cat_bitscategory.bit = -1;
+ msg68_bitmsk |= 1 << category;
+ }
+}
+
+/* Set all predefined categories mask according to given level. */
+int msg68_cat_level(int category)
+{
+ if (category == msg68_NEVER)
+ msg68_bitmsk &= ~((1<<(msg68_TRACE+1))-1);
+ else if (category == msg68_ALWAYS)
+ msg68_bitmsk |= ((1<<(msg68_TRACE+1))-1);
+ else if (category >= msg68_CRITICAL && category <= msg68_TRACE) {
+ msg68_bitmsk &= ~((1<<(msg68_TRACE+1))-1);
+ msg68_bitmsk |= (1<<(category+1))-1;
+ }
+ return msg68_bitmsk;
+}
+
+/* Get info on category */
+int msg68_cat_info(int category, const char **pname,
+ const char **pdesc, int *pnext)
+{
+ int ret = -1, next = category;
+ if (is_valid_category(category)) {
+ if (pname) *pname = cat_bitscategory.name;
+ if (pdesc) *pdesc = cat_bitscategory.desc;
+ ret = 1 & (msg68_bitmsk>>category);
+ } else {
+ next = -1;
+ }
+ if (pnext) {
+ while (++next<MAX_CATEGORIES && is_free_category(next))
+ ;
+ if (category<MAX_CATEGORIES) {
+ *pnext = next;
+ }
+ }
+ return ret;
+}
+
+void msg68_cat_help(void * cookie, msg68_help_t fct)
+{
+ if (fct) {
+ int i;
+ for (i=0; i<MAX_CATEGORIES; ++i) {
+ const int isfree = is_free_category(i);
+ if (!isfree)
+ fct (cookie, i, cat_bitsi.name, cat_bitsi.desc);
+ }
+ }
+}
+
+unsigned int msg68_cat_filter(unsigned int clr, unsigned int set)
+{
+ msg68_bitmsk &= ~clr;
+ msg68_bitmsk |= set;
+ return msg68_bitmsk;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/option68.c Added

@@ -0,0 +1,563 @@
+/*
+ * @file option68.c
+ * @brief command line options
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "file68_api.h"
+#include "file68_msg.h"
+#include "file68_opt.h"
+#include "file68_str.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+
+static option68_t * opts;
+static char empty = "";
+
+#define FOREACH_OPT(opt) for (opt=opts; opt; opt = opt->next)
+
+static inline int in_range(const option68_t * const opt, const int val)
+{
+ return opt->min == opt->max || (val >= opt->min && val <= opt->max);
+}
+
+static inline int opt_isset(const option68_t * const opt)
+{
+ return opt->org != opt68_UDF;
+}
+
+static inline int opt_type(const option68_t * const opt)
+{
+ return opt->type;
+}
+
+static inline int opt_org(const option68_t * const opt)
+{
+ return opt->org;
+}
+
+static int opt_policy(const option68_t * const opt, int set, int org)
+{
+ switch (set) {
+ case opt68_PRIO: set = org >= (int)opt->org; break;
+ case opt68_NOTSET: set = !opt_isset(opt); break;
+ case opt68_ISSET: set = opt_isset(opt); break;
+ }
+ return set;
+}
+
+static inline void opt_free_str(option68_t * opt)
+{
+ if (opt->type == opt68_STR) {
+ if (opt->val.str != empty) {
+ free((void *) opt->val.str);
+ opt->val.str = empty;
+ }
+ }
+}
+
+static inline void opt_unset(option68_t * opt)
+{
+ opt_free_str(opt);
+ opt->org = opt68_UDF;
+}
+
+static inline void opt_set_int(option68_t * opt, int org, int val)
+{
+ value68_t value;
+
+ assert(opt->type == opt68_INT ||
+ opt->type == opt68_BOL ||
+ opt->type == opt68_ENU);
+
+ value.num = val;
+ if (!opt->onchange || !opt->onchange(opt, &value)) {
+ opt->org = org;
+ opt->val.num = value.num;
+ }
+ /* return value.num; */
+}
+
+static inline void opt_set_str(option68_t * opt, int org, const char * val)
+{
+ value68_t value;
+
+ assert(opt->type == opt68_STR);
+ value.str = val;
+ if (!opt->onchange || !opt->onchange(opt, &value)) {
+ char * s;
+ s = strdup68(value.str);
+ if (s) {
+ opt_free_str(opt);
+ opt->val.str = s;
+ opt->org = org;
+ }
+ }
+}
+
+static int in_enum(const char * str, const char * enums, const int n)
+{
+ int i;
+ for (i=0; i<n; ++i)
+ if (!strcmp68(str,enumsi))
+ return i;
+ return -1;
+}
+
+const char * f_true = { "true", "yes", "on", "1" };
+const char * f_false = { "false", "no", "off", "0" };
+
+static void opt_set_strtol(option68_t * opt, int org, const char * val)
+{
+ int res = 0, ok = 0;
+ int type = opt_type(opt);
+
+ switch (type) {
+ case opt68_BOL:
+ ok = 1;
+ if (!val || !*val)
+ res = -1;
+ else if (in_enum(val,f_true,sizeof(f_true)/sizeof(*f_true)) >= 0)
+ res = -1;
+ else if (in_enum(val,f_false,sizeof(f_false)/sizeof(*f_false)) >= 0)
+ res = 0;
+ else
+ ok = 0;
+ break;
+
+ case opt68_ENU:
+ res = in_enum(val, (const char **)opt->set, opt->sets);
+ ok = res >= 0;
+ if (ok)
+ break;
+
+ case opt68_INT:
+ ok = val*val=='-' || *val=='+';
+ ok = ok >= '0' && ok <= '9';
+ if (ok) {
+ res = strtol(val,0,0);
+ ok = in_range(opt,res);
+ }
+ break;
+
+ default:
+ assert(!"invalid option type");
+ }
+
+ /* if (!ok) { */
+ /* res = opt->val.num; */
+ /* } else { */
+ if (ok)
+ opt_set_int(opt, org, res);
+}
+
+static option68_t * opt_of(const char * key)
+{
+ option68_t * opt;
+ FOREACH_OPT(opt) if (!strcmp68(key, opt->name)) break;
+ return opt;
+}
+
+int option68_type(const option68_t * opt)
+{
+ return opt ? opt_type(opt) : -1;
+}
+
+int option68_unset(option68_t * opt)
+{
+ int err = -1;
+ if (opt) {
+ opt_unset(opt);
+ err = 0;
+ }
+ return err;
+}
+
+void option68_unset_all(void)
+{
+ option68_t * opt;
+ FOREACH_OPT(opt) opt_unset(opt);
+}
+
+int option68_set(option68_t * opt, const char * str, int set, int org)
+{
+ int err = -1;
+ if (opt) {
+ if (opt_policy(opt, set, org)) {
+ err = 0;
+ switch (opt_type(opt)) {
+ case opt68_STR:
+ opt_set_str(opt,org,str); break;
+ case opt68_BOL: case opt68_INT: case opt68_ENU:
+ opt_set_strtol(opt,org,str); break;
+ default:
+ err = -1;
+ }
+ }
+ }
+ return err;
+}
+
+int option68_iset(option68_t * opt, int val, int set, int org)
+{
+ int err = -1;
+ if (opt) {
+ if (opt_policy(opt, set, org)) {
+ err = 0;
+ switch (opt_type(opt)) {
+ case opt68_BOL:
+ val = -!!val;
+ case opt68_ENU: case opt68_INT:
+ if (!in_range(opt,val))
+ err = -1;
+ else
+ /* err = */opt_set_int(opt,org,val);
+ break;
+
+ case opt68_STR: {
+ char tmp64;
+ snprintf(tmp,sizeof(tmp),"%d",val);
+ tmpsizeof(tmp)-1 = 0;
+ /* err = */opt_set_str(opt,org,tmp);
+ msg68_warning("option68: %s\n", "setting string option with integer");
+ } break;
+ default:
+ err = -1;
+ }
+ }
+ }
+ return err;
+}
+
+int option68_parse(int argc, char ** argv)
+{
+ int i,n;
+ option68_t * opt;
+
+ /* Parse arguments */
+ for (i=n=1; i<argc; ++i) {
+ int negate = 0;
+ char * arg = argvi, * rearg;
+
+ /* Check for `--' prefix */
+ if (arg0 != '-' || arg1 != '-') {
+ goto keep_it; /* Not an option; keep it */
+ }
+
+ /* '--' breaks options parsing */
+ if (!arg2) {
+ argvn++ = argvi++;
+ break;
+ }
+ arg += 2;
+
+ /* Checking for sc68 prefixed options (--sc68- or --no-sc68-) */
+ if (arg0=='n' && arg1 == 'o' && arg2 == '-') {
+ negate = 1;
+ arg += 3;
+ }
+
+ rearg = arg;
+ FOREACH_OPT(opt) {
+ const int opttype = opt_type(opt);
+ arg = rearg;
+
+ if (opt->prefix) {
+ if (strncmp(arg,opt->prefix,opt->prefix_len)) {
+ continue; /* prefix does not match */
+ }
+ arg += opt->prefix_len;
+ }
+
+ if (strncmp(arg,opt->name,opt->name_len)) {
+ continue; /* name does not match */
+ }
+
+ arg += opt->name_len;
+ if (*arg != 0 && *arg != '=') {
+ continue; /* name does not match (incomplet) */
+ }
+
+ if (0 == *arg) {
+ if (opttype == opt68_BOL) {
+ opt_set_int(opt,opt68_CLI,-!negate);
+ /* No arg required, set the option */
+ break;
+ }
+ if (i+1 >= argc) {
+ break; /* $$$ should trigger an error */
+ }
+ arg = argv++i; /* Get next arg */
+ } else {
+ ++arg;
+ }
+
+ if (opttype == opt68_STR) {
+ /* string option; ``negate'' does not have much meaning. */
+ opt_set_str(opt, opt68_CLI, arg);
+ } else {
+ opt_set_strtol(opt, opt68_CLI, arg);
+ if (negate) opt_set_int(opt, opt68_CLI, ~opt->val.num);
+ }
+ break;
+ }
+
+ if (opt) continue;
+
+ /* Not our option; keep it */
+ keep_it:
+ argvn++ = argvi;
+
+ }
+
+ /* Keep remaining arguments */
+ for (; i<argc; ++i) {
+ argvn++ = argvi;
+ }
+ argc = n;
+
+ return argc;
+}
+
+int option68_init(void)
+{
+ assert(!opts);
+ opts = 0;
+ return 0;
+}
+
+void option68_shutdown(void)
+{
+ option68_t * opt, * nxt;
+
+ option68_unset_all();
+ for (nxt=opts; (opt=nxt); ) {
+ nxt = opt->next;
+ opt->next = 0;
+ }
+ opts = 0;
+}
+
+int option68_append(option68_t * options, int n)
+{
+ int i;
+
+ if (! (options && n > 0) )
+ *(int*)0 = 0;
+ assert(options && n > 0);
+
+ for (i=0; i<n; ++i) {
+ option68_t * const opt = options+i;
+
+ assert(opt->name && *opt->name); /* valid name */
+ assert(!opt->next); /* not attached */
+ assert(opt->org == opt68_UDF); /* is not defined */
+ /* Either there is a set with at least 1 element or not */
+ assert( (opt->set && opt->sets > 0) || (!opt->set && !opt->sets) );
+ /* Either no limit (min=max=0) or valid limit (min < max) */
+ assert( (opt->min == opt->max && !opt->min) || opt->min < opt->max );
+
+ switch (opt->type) {
+ case opt68_STR:
+ opt->val.str = empty; break;
+ case opt68_BOL:
+ assert(opt->min == -1 && !opt->max); break;
+ case opt68_ENU:
+ assert(opt->set && !opt->min && opt->max == opt->sets-1); break;
+ case opt68_INT:
+ break;
+ default:
+ assert(!"invalid option type"); break;
+ }
+
+ opt->prefix_len = opt->prefix ? strlen(opt->prefix) : 0;
+ opt->name_len = strlen(opt->name);
+ opt->next = opts;
+ opts = opt;
+
+ option68_getenv(opt, opt68_ALWAYS);
+ }
+ return 0;
+}
+
+option68_t * option68_get(const char * key, int set)
+{
+ option68_t * opt = 0;
+
+ if (key && (opt = opt_of(key)) && !opt_policy(opt,set,opt->org))
+ opt = 0;
+ return opt;
+}
+
+int option68_isset(const option68_t * option)
+{
+ return option
+ ? opt_isset(option)
+ : 0
+ ;
+}
+
+/* Convert option name to envvar name */
+static
+char * opt2env(char * tmp, const int max,
+ const char * prefix, const char * name)
+{
+ int i = 0,c;
+ if (!prefix) prefix = "sc68-";
+ for (; i<max && (c=*prefix++); )
+ tmpi++ = (c=='-')
+ ? '_'
+ : (c>'9') ? c+'A'-'a' : c
+ ;
+ for (; i<max && (c=*name++); )
+ tmpi++ = (c=='-')
+ ? '_'
+ : (c>'9') ? c+'A'-'a' : c
+ ;
+ tmpi = 0;
+ return tmp;
+}
+
+/* Get environment variable */
+static
+char * mygetenv(const option68_t * opt)
+{
+#ifndef HAVE_GETENV
+ return 0;
+#else
+ char tmp64;
+ opt2env(tmp,sizeof(tmp)-1,opt->prefix,opt->name);
+ return getenv(tmp);
+#endif
+}
+
+const char * option68_getenv(option68_t * opt, int set)
+{
+ const char * val = opt ? mygetenv(opt) : 0;
+
+ if (val && opt_policy(opt,set,opt68_ENV)) {
+ switch (opt_type(opt)) {
+ case opt68_STR: opt_set_str(opt,opt68_ENV,val); break;
+ case opt68_BOL:
+ case opt68_ENU:
+ case opt68_INT: opt_set_strtol(opt,opt68_ENV,val); break;
+ }
+ }
+
+ return val;
+}
+
+void option68_help(void * cookie, option68_help_t fct, int flags)
+{
+ option68_t * opt;
+ char option64, envvar64, values256;
+ const int omax = sizeof(option)-1;
+ const int emax = sizeof(envvar)-1;
+ const int vmax = sizeof(values)-1;
+ optionomax = envvaremax = valuesvmax = 0;
+
+ assert(fct);
+
+ FOREACH_OPT(opt) {
+ int l, j;
+
+ /* Ignore hidden options unless specified by bit#0 of flags */
+ if (opt->hide && !(flags&1))
+ continue;
+
+ /* Build envvar name */
+ /* snprintf(option, omax,"%s%s", */
+ /* opt->prefix ? opt->prefix : "", opt->name); */
+ opt2env(envvar, emax, opt->prefix, opt->name);
+
+ /* Build option name */
+ l = snprintf(option,omax,"--%s%s%s",
+ opt_type(opt) == opt68_BOL ? "(no-)" : "",
+ opt->prefix ? opt->prefix : "",
+ opt->name);
+
+ /* Build option values */
+ switch (opt_type(opt)) {
+ case opt68_BOL:
+ *values = 0;
+ break;
+ case opt68_INT:
+ if (!opt->sets) {
+ if (opt->min < opt->max)
+ snprintf(values,vmax,"%d..%d",opt->min,opt->max);
+ else
+ strncpy(values,"<int>",vmax);
+ } else {
+ values0 = ''; values1 = 0; l = 1;
+ for (j=0; j<(int)opt->sets; ++j) {
+ const int * set = (const int*)opt->set;
+ const char * me
+ = opt_isset(opt) && opt->val.num == setj ? "*" : "";
+ l += snprintf(values+l, vmax-l,"%d%s%c",
+ setj, me, j+1 == opt->sets ? '' : '|');
+ }
+ }
+ break;
+ case opt68_STR:
+ if (!opt->sets) {
+ strncpy(values,"<str>",vmax);
+ break;
+ }
+ case opt68_ENU:
+ values0 = ''; values1 = 0; l = 1;
+ for (j=0; j<(int)opt->sets; ++j) {
+ const char ** set = (const char **)opt->set;
+ const char * me = opt_isset(opt) &&
+ !strcmp68(setj,(opt->type==opt68_STR)
+ ? opt->val.str
+ : setopt->val.num)
+ ? "*" : "";
+ l += snprintf(values+l, vmax, "%s%s%c",
+ setj, me, j+1 == opt->sets ? '' : '|');
+ }
+ break;
+
+ default:
+ assert(!"invalid option type");
+ break;
+ }
+
+ fct (cookie, option, envvar, values, opt->desc);
+ }
+}
+
+option68_t * option68_enum(int idx)
+{
+ option68_t * opt;
+
+ FOREACH_OPT(opt) {
+ if (!idx--)
+ return opt;
+ }
+ return 0;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/registry68.c Added

@@ -0,0 +1,477 @@
+/*
+ * @file registry68.c
+ * @brief ms-Windows registry
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/* TODO: remove the recursive stuff as it is totally useless. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "file68_reg.h"
+
+#ifdef USE_REGISTRY68
+
+int registry68_support(void) { return 1; }
+
+#include "file68_msg.h"
+#include "file68_str.h"
+#include <windows.h>
+#include <winreg.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifndef HKEY_INVALID
+# define HKEY_INVALID ((HKEY)0)
+#endif
+
+/* this table *MUST* match enum registry68_key_e definition. */
+static struct reg68_keytable_s {
+ const char name4;
+ HKEY hkey;
+} keysREGISTRY68_LST+1 = {
+ { /* 00 */ {'C','R','K',0}, HKEY_CLASSES_ROOT },
+ { /* 01 */ {'C','U','K',0}, HKEY_CURRENT_USER },
+ { /* 02 */ {'L','M','K',0}, HKEY_LOCAL_MACHINE },
+ { /* 03 */ {'U','S','K',0}, HKEY_USERS },
+ { /* 04 */ {'P','D','K',0}, HKEY_PERFORMANCE_DATA },
+ { /* 05 */ {'C','C','K',0}, HKEY_CURRENT_CONFIG },
+ { /* 06 */ {'D','D','K',0}, HKEY_DYN_DATA },
+ { /* xx */ {'I','N','K',0}, HKEY_INVALID }
+};
+
+static const char * keyhdlname(const registry68_key_t key)
+{
+ int i;
+
+ for (i=0; i < REGISTRY68_LST && (HKEY)key != keysi.hkey; ++i)
+ ;
+ return keysi.name;
+}
+
+#if 0
+static const char * keyname(const enum registry68_key_e key)
+{
+ return keys
+ (unsigned int)key >= (unsigned int)REGISTRY68_LST
+ ? REGISTRY68_LST
+ : key
+ . name;
+}
+#endif
+
+static HKEY keyhandle(const enum registry68_key_e key)
+{
+ return keys
+ (unsigned int)key >= (unsigned int)REGISTRY68_LST
+ ? REGISTRY68_LST
+ : key
+ . hkey;
+}
+
+registry68_key_t registry68_rootkey(enum registry68_key_e rootkey)
+{
+ registry68_key_t key = (registry68_key_t) keyhandle(rootkey);
+ return key;
+}
+
+static char * SetSystemError(char * str, int max, int err)
+{
+ int l;
+
+ *str = 0;
+ if (err == ERROR_SUCCESS)
+ return str;
+
+ /* if (!str) { */
+ /* msg68_critical("registry68: race condition may occur\n"); */
+ /* str = registry68_errorstr; */
+ /* max = sizeof(registry68_errorstr); */
+ /* } */
+
+ FormatMessageA(
+ /* source and processing options */
+ FORMAT_MESSAGE_FROM_SYSTEM,
+ /* pointer to message source */
+ 0,
+ /* requested message identifier */
+ err,
+ /* language identifier for requested message */
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ /* pointer to message buffer */
+ str,
+ /* maximum size of message buffer */
+ max,
+ /* pointer to array of message inserts */
+ 0);
+ strmax-1 = 0;
+ l = strlen(str);
+ while (--l>=0 && (strl == '\n' || strl == '\r' ||strl == ' '))
+ strl = 0;
+
+ return str;
+}
+
+static int GetOneLevelKey(HKEY hkey, char **kname, HKEY *hkeyres, int secu)
+{
+ char *s;
+ LONG hres;
+
+ /* Find next sub-key */
+ s=strchr(*kname,'/');
+ if (s) {
+ s0 = 0;
+ }
+
+ if (secu & KEY_CREATE_SUB_KEY) {
+ hres =
+ RegCreateKeyExA(hkey, /* handle to open key */
+ *kname, /* address of name of subkey to open */
+ 0, /* reserved */
+ 0, /* user-defined class type */
+ REG_OPTION_NON_VOLATILE, /* Options */
+ secu, /* Access right */
+ 0, /* security attributs */
+ hkeyres, /* address of handle to open key */
+ 0 /* Disposition */
+ );
+ } else {
+ /* Open this sub-key */
+ hres =
+ RegOpenKeyExA(hkey, /* handle to open key */
+ *kname, /* address of name of subkey to open */
+ 0, /* reserved */
+ secu, /* security access mask */
+ hkeyres /* address of handle to open key */
+ );
+ }
+
+
+ /* If next sub-key exist, advance pointer to beginning of key-name */
+ if (s) {
+ s0 = '/';
+ ++s;
+ }
+
+ if (hres != ERROR_SUCCESS) {
+ *hkeyres = HKEY_INVALID;
+ } else {
+ *kname = s;
+ }
+ return hres;
+}
+
+static int rGetRegistryKey(HKEY hkey, char *kname, HKEY *hkeyres, int secu)
+{
+ HKEY subkey = HKEY_INVALID;
+ int err;
+
+ if (!kname) {
+ *hkeyres = hkey;
+ return 0;
+ }
+
+ err = GetOneLevelKey(hkey, &kname, &subkey, secu);
+ *hkeyres = subkey;
+ if (!err && kname) {
+ err = rGetRegistryKey(subkey, kname, hkeyres, secu);
+ RegCloseKey(subkey);
+ }
+ return err;
+}
+
+registry68_key_t registry68_open(registry68_key_t hkey,
+ const char *kname_cst, int mode)
+{
+ HKEY hdl = HKEY_INVALID;
+ int len, secu, hres;
+ char kname1024, error256;
+
+ if (!kname_cst) {
+ msg68_critical("registry68: open '%s::<null> null pointer\n",
+ keyhdlname(hkey));
+ goto error;
+ }
+
+ if ( (len = strlen(kname_cst)) >= sizeof(kname) ) {
+ msg68_critical("registry68: key name too long '%s::%s'\n",
+ keyhdlname(hkey), kname_cst);
+ goto error;
+ }
+ memcpy(kname, kname_cst, len+1);
+
+ secu = 0;
+ if (mode & 1)
+ secu |= KEY_READ;
+ if (mode & 2)
+ secu |= KEY_WRITE;
+
+ hres = rGetRegistryKey((HKEY)hkey, kname, (HKEY *)&hdl, secu);
+ if (hres != ERROR_SUCCESS) {
+ SetSystemError(error,sizeof(error)-1, hres);
+ hdl = HKEY_INVALID;
+ }
+
+error:
+ msg68_trace("registry68: open '%s::%s' => %s\n",
+ keyhdlname(hdl), kname_cst, strok68(hdl==HKEY_INVALID));
+
+ return (registry68_key_t) hdl;
+}
+
+
+static void prepare_key(registry68_key_t * p_rootkey,
+ const char ** p_kname_cst, int * p_len)
+{
+ registry68_key_t rootkey = *p_rootkey;
+ const char * kname_cst = *p_kname_cst;
+ int len = strlen(kname_cst);
+
+ /* Extract rootkey from path. */
+ if (rootkey == HKEY_INVALID &&
+ len>=4 && (kname_cst2=='K'||kname_cst2=='k') && kname_cst3==':') {
+ int i;
+ for (i=0; i<REGISTRY68_LST &&
+ (keysi.name0 != (kname_cst0 & ~32) ||
+ keysi.name1 != (kname_cst1 & ~32)); ++i)
+ ;
+ if (i < REGISTRY68_LST) {
+ rootkey = keysi.hkey;
+ kname_cst += 4;
+ len -= 4;
+ }
+ }
+
+ *p_len = len;
+ *p_rootkey = rootkey;
+ *p_kname_cst = kname_cst;
+}
+
+static int put_data(registry68_key_t rootkey,
+ const char * kname_cst, const char * kdata, int kdatasz,
+ int type)
+{
+ HKEY hkey = HKEY_INVALID;
+ int len;
+ LONG hres;
+ char * name, kname1024/* , error256 */;
+ const char * kname_save = kname_cst;
+
+ if (!kname_cst|| !kdata || kdatasz <= 0) {
+ msg68_critical("registry68: puts -- invalid parameters\n");
+ goto error_out;
+ }
+ prepare_key(&rootkey, &kname_cst, &len);
+ if (rootkey == HKEY_INVALID) {
+ msg68_critical("registry68: puts '%s' -- invalid rootkey\n", kname_save);
+ kdata = 0;
+ goto error_out;
+ }
+ if (len >= sizeof(kname)) {
+ msg68_critical("registry68: puts '%s' -- key-path too long\n", kname_save);
+ kdata = 0;
+ goto error_out;
+ }
+ memcpy(kname, kname_cst, len+1);
+ name = strrchr(kname,'/');
+ if (name) {
+ *name++ = 0;
+ }
+
+ hres = rGetRegistryKey((HKEY)rootkey, kname, &hkey, KEY_WRITE);
+ if (hres != ERROR_SUCCESS) {
+ /* SetSystemError(error, sizeof(error)-1, hres); */
+ kdata = 0;
+ hres = ERROR_FILE_NOT_FOUND;
+ } else {
+ hres =
+ /* RegSetValue(hkey, */
+ /* name, */
+ /* type, */
+ /* kdata, */
+ /* kdatasz); */
+
+ RegSetValueExA(hkey,
+ name,
+ 0,
+ type,
+ (const BYTE *)kdata,
+ kdatasz);
+
+ if (hres != ERROR_SUCCESS) {
+ /* SetSystemError(error, sizeof(error)-1, hres); */
+ kdata = 0;
+ }
+ RegCloseKey(hkey);
+ }
+ if (name) {
+ *--name = '/';
+ }
+error_out:
+ return -!kdata;
+}
+
+
+/* Get a string value from register path
+ */
+static int get_data(registry68_key_t rootkey,
+ const char * kname_cst, char *kdata, int kdatasz,
+ int type)
+{
+ DWORD vtype;
+ HKEY hkey = HKEY_INVALID;
+ int len;
+ LONG hres;
+ char * name, kname1024/* , error256 */;
+ const char * kname_save = kname_cst;
+
+ if (!kname_cst|| !kdata || kdatasz <= 0) {
+ msg68_critical("registry68: gets -- invalid parameters\n");
+ goto error_out;
+ }
+ kdata0=0;
+ prepare_key(&rootkey, &kname_cst, &len);
+ if (rootkey == HKEY_INVALID) {
+ msg68_critical("registry68: gets '%s' -- invalid rootkey\n", kname_save);
+ kdata = 0;
+ goto error_out;
+ }
+ if (len >= sizeof(kname)) {
+ msg68_critical("registry68: gets '%s' -- key-path too long\n", kname_save);
+ kdata = 0;
+ goto error_out;
+ }
+ memcpy(kname, kname_cst, len+1);
+ name = strrchr(kname,'/');
+ if (name) {
+ *name++ = 0;
+ }
+ hres = rGetRegistryKey((HKEY)rootkey, kname, &hkey, KEY_READ);
+ if (hres != ERROR_SUCCESS) {
+ /* SetSystemError(error, sizeof(error)-1, hres); */
+ kdata = 0;
+ hres = ERROR_FILE_NOT_FOUND;
+ } else {
+ hres =
+ RegQueryValueExA(hkey, /* handle to key to query */
+ name, /* address of name of value to query */
+ NULL, /* reserved */
+ &vtype, /* address of buffer for value type */
+ (LPBYTE)kdata, /* address of data buffer */
+ (LPDWORD)&kdatasz /* address of data buffer size */
+ );
+ if (hres != ERROR_SUCCESS) {
+ /* SetSystemError(error, sizeof(error)-1, hres); */
+ kdata = 0;
+ } else if (vtype != type) {
+ msg68_error("registry68: gets '%s' -- unexpected data type\n",
+ kname_save);
+ kdata = 0;
+ }
+ RegCloseKey(hkey);
+ }
+ if (name) {
+ *--name = '/';
+ }
+error_out:
+ return -!kdata;
+}
+
+int registry68_geti(registry68_key_t rootkey,
+ const char * kname_cst, int * dword)
+{
+ DWORD data;
+ int err =
+ get_data(rootkey, kname_cst, (char*)&data, 4, REG_DWORD);
+ if (!err && dword)
+ *dword = data; /* assuming registry is stored in native endian */
+ return err;
+}
+
+/* Get a string value from register path
+ */
+int registry68_puti(registry68_key_t rootkey,
+ const char * kname_cst, int kdata)
+{
+ DWORD dword = kdata;
+ return put_data(rootkey, kname_cst, (char*)&dword, 4, REG_DWORD);
+}
+
+
+/* Get a string value from register path
+ */
+int registry68_gets(registry68_key_t rootkey,
+ const char * kname_cst, char *kdata, int kdatasz)
+{
+ return get_data(rootkey, kname_cst, kdata, kdatasz, REG_SZ);
+}
+
+/* Get a string value from register path
+ */
+int registry68_puts(registry68_key_t rootkey,
+ const char * kname_cst, const char * kdata)
+{
+ int l = kdata ? strlen(kdata): 0;
+ return put_data(rootkey, kname_cst, kdata, l, REG_SZ);
+}
+
+#else
+
+int registry68_support(void) { return 0; }
+
+registry68_key_t registry68_rootkey(enum registry68_key_e rootkey)
+{
+ return (registry68_key_t)0;
+}
+
+registry68_key_t registry68_open(registry68_key_t hkey,
+ const char *kname, int mode)
+{
+ return (registry68_key_t)0;
+}
+
+int registry68_gets(registry68_key_t rootkey, const char * kname_cst,
+ char *kdata, int kdatasz)
+{
+ return -1;
+}
+
+int registry68_geti(registry68_key_t hkey, const char *kname,int * kdata)
+{
+ return -1;
+}
+
+int registry68_puts(registry68_key_t rootkey, const char * kname_cst,
+ const char * kdata)
+{
+ return -1;
+}
+
+int registry68_puti(registry68_key_t rootkey, const char * kname_cst,
+ int kdata)
+{
+ return -1;
+}
+
+#endif /* #ifdef USE_REGISTRY68 */

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/replay.inc.h Added

@@ -0,0 +1,8728 @@
+/* aenigmatica data */
+static const unsigned char dat_aenigmatica = {
+  31,139,8,0,0,0,0,0,0,3,237,86,111,108,83,215,
+  21,255,189,231,247,158,157,224,36,198,128,227,12,148,56,105,
+  134,58,154,63,142,73,25,132,132,216,78,178,56,1,123,129,
+  164,40,97,72,123,94,146,247,18,88,50,131,98,117,116,17,
+  56,217,196,16,162,29,67,93,212,15,168,155,42,180,118,19,
+  31,216,86,49,42,101,17,165,210,154,78,83,213,49,134,16,
+  66,27,148,142,117,8,178,40,66,89,49,73,188,223,125,38,
+  108,235,231,73,251,194,149,238,249,221,243,231,158,119,238,185,
+  231,30,91,135,82,28,75,198,146,85,117,136,153,243,21,173,
+  177,171,120,58,158,142,167,227,233,176,70,52,141,233,150,244,
+  163,116,92,55,118,71,211,143,46,255,102,218,112,85,213,45,
+  120,226,192,9,129,58,240,189,138,200,250,246,150,244,226,213,
+  120,189,17,168,218,128,10,234,18,85,207,89,56,224,219,135,
+  14,202,106,185,30,174,170,123,52,101,106,21,173,149,17,40,
+  212,11,89,36,150,164,215,43,225,137,88,114,67,172,170,120,
+  106,178,39,218,217,101,202,177,228,182,226,169,209,20,12,247,
+  182,98,165,181,39,250,215,175,86,20,223,120,249,139,71,19,
+  208,239,156,11,138,110,245,232,85,238,206,21,200,8,228,246,
+  239,155,206,200,223,50,75,236,95,19,59,254,114,36,19,75,
+  62,150,28,206,74,14,83,34,60,167,208,19,229,161,36,98,
+  12,18,64,220,73,222,65,236,36,190,74,236,34,190,73,124,
+  129,56,69,236,32,30,35,118,19,175,16,123,184,125,7,113,
+  15,241,83,226,215,136,243,196,189,196,52,145,97,201,231,137,
+  223,0,84,157,216,203,125,39,136,125,196,147,159,207,110,168,
+  127,120,208,28,138,143,12,246,198,125,7,251,19,223,140,31,
+  66,215,64,191,47,58,56,220,231,171,246,253,135,22,209,131,
+  85,157,35,135,122,247,127,219,247,172,191,166,218,191,169,122,
+  203,151,191,196,253,105,233,102,83,218,94,223,146,118,228,151,
+  231,182,164,209,231,115,191,157,50,247,148,143,151,65,27,227,
+  7,126,187,222,117,62,53,180,238,252,216,176,247,252,36,36,
+  195,107,186,44,116,153,142,137,212,213,113,223,119,187,34,93,
+  145,95,124,240,173,107,244,52,209,148,214,230,202,114,20,238,
+  251,245,137,63,190,37,121,57,19,244,254,147,172,236,66,140,
+  60,239,11,82,255,13,90,15,248,234,99,7,98,7,74,131,
+  234,102,206,250,166,52,238,212,140,198,30,226,120,105,27,78,
+  52,165,37,144,123,71,170,45,109,147,54,149,6,165,58,206,
+  109,180,249,76,72,109,111,148,182,217,206,148,6,109,111,113,
+  158,173,9,218,206,81,243,192,210,92,167,230,6,185,89,225,
+  75,253,74,105,155,26,33,55,87,51,186,234,34,230,233,249,
+  179,154,32,22,4,39,127,88,218,38,127,84,19,148,175,144,
+  123,215,182,84,218,166,160,38,168,40,177,164,239,165,165,55,
+  124,147,69,189,69,131,58,84,31,171,99,138,18,70,132,159,
+  174,28,20,119,79,202,155,39,149,161,146,218,160,144,42,200,
+  33,85,225,32,213,144,71,106,71,1,169,3,54,210,28,216,
+  73,115,177,34,150,108,68,107,26,123,93,181,46,20,166,92,
+  8,200,151,67,203,107,162,68,148,252,37,252,230,28,173,54,
+  21,166,124,40,28,243,73,220,37,147,95,191,186,22,40,28,
+  231,28,131,84,91,18,75,82,230,230,26,214,170,192,115,22,
+  118,102,247,115,67,84,181,127,139,200,185,9,91,95,248,144,
+  88,109,19,252,167,161,135,188,199,215,19,114,187,31,48,29,
+  157,164,134,44,189,191,115,58,51,187,241,125,161,111,125,136,
+  204,49,180,209,170,127,174,86,236,248,196,132,156,254,145,240,
+  112,167,15,242,172,118,8,125,98,61,37,36,119,205,230,122,
+  97,115,119,68,86,237,134,115,231,239,50,105,203,203,93,189,
+  66,213,140,217,128,220,17,242,140,21,142,184,88,220,1,249,
+  118,219,242,122,215,19,105,28,202,105,125,58,42,98,58,62,
+  42,151,11,159,247,218,119,155,74,231,110,211,25,157,201,204,
+  236,252,48,51,167,67,126,105,187,176,112,111,170,130,82,23,
+  240,99,63,240,81,251,48,114,77,175,75,149,129,146,162,32,
+  180,60,187,185,195,51,9,173,48,8,89,15,135,155,189,170,
+  233,186,38,252,205,58,155,161,247,203,225,230,219,59,120,118,
+  214,168,219,31,132,203,31,148,106,181,219,237,69,204,117,17,
+  115,205,221,249,158,113,177,119,87,152,24,130,236,87,103,34,
+  194,254,66,172,254,28,208,208,4,87,87,19,169,226,215,46,
+  46,192,123,253,34,191,239,48,55,136,40,140,242,172,95,191,
+  63,184,116,50,17,132,169,125,18,49,228,132,180,53,8,197,
+  55,4,71,56,24,135,124,150,150,154,137,76,197,246,251,112,
+  90,210,90,61,171,57,165,35,227,185,25,149,85,28,49,114,
+  27,134,89,95,10,37,46,135,42,236,145,146,91,208,88,27,
+  240,203,145,75,190,246,63,92,234,182,98,104,87,13,55,253,
+  68,182,142,178,38,21,250,136,232,88,250,243,114,100,78,85,
+  188,216,6,161,211,196,215,158,88,149,209,234,2,181,178,145,
+  111,105,29,148,229,83,118,134,50,155,129,165,211,225,144,59,
+  224,95,108,8,193,217,16,134,208,28,103,20,170,137,165,113,
+  63,179,158,61,63,227,41,113,182,64,97,99,74,5,180,221,
+  33,198,82,30,102,22,242,88,135,182,123,176,243,156,78,83,
+  235,20,84,156,38,95,156,102,41,172,55,91,81,185,172,239,
+  230,230,209,206,70,123,189,202,138,70,19,251,244,178,199,81,
+  120,132,70,14,162,241,241,173,98,73,89,190,87,193,45,206,
+  51,234,1,29,139,51,180,87,12,119,64,187,36,78,253,174,
+  200,71,248,5,202,175,82,174,26,171,151,229,140,77,11,15,
+  193,73,205,36,53,218,191,119,80,227,176,118,136,243,219,13,
+  44,158,230,87,11,196,251,232,191,185,50,165,131,154,227,86,
+  221,237,105,177,100,163,154,107,141,169,253,176,146,107,207,246,
+  251,153,7,172,205,217,141,11,60,15,223,86,246,215,67,171,
+  20,111,195,175,57,248,2,13,191,147,241,155,221,1,190,222,
+  91,61,167,134,32,223,236,217,194,87,251,113,68,178,155,198,
+  237,136,39,85,56,2,241,22,130,92,177,222,244,93,31,71,
+  152,255,90,56,46,211,118,159,18,14,233,185,191,12,0,189,
+  138,155,180,104,12,14,238,171,234,88,182,46,167,109,5,180,
+  39,182,14,103,8,37,189,242,193,146,162,16,52,43,95,180,
+  234,172,228,121,145,233,18,245,230,170,132,221,205,215,190,95,
+  139,23,179,190,130,178,132,35,166,168,64,23,185,64,120,13,
+  105,197,115,17,81,173,95,96,189,175,77,136,234,225,165,203,
+  239,221,135,178,149,190,186,177,54,8,123,152,167,143,37,69,
+  119,137,239,115,158,20,221,210,216,251,204,180,120,181,221,199,
+  54,94,19,221,194,234,53,119,194,33,235,77,27,126,175,89,
+  220,192,155,227,84,56,179,117,231,172,231,111,137,117,47,188,
+  129,232,12,220,187,66,140,222,102,92,126,102,161,160,160,0,
+  34,215,255,157,215,108,255,178,168,200,184,93,244,169,199,120,
+  55,252,142,232,103,77,214,215,18,207,135,139,216,201,22,44,
+  206,157,232,204,114,137,188,38,171,155,101,185,108,103,43,26,
+  197,102,216,179,189,110,36,207,25,230,253,43,204,132,131,111,
+  127,196,199,91,97,39,187,23,75,50,143,118,87,5,171,17,
+  104,116,175,98,198,46,166,36,81,135,162,223,230,207,228,123,
+  243,162,206,87,86,92,95,81,157,251,131,156,127,230,12,56,
+  110,57,226,246,191,219,95,180,59,181,55,181,86,245,190,250,
+  154,218,170,44,40,111,43,9,165,198,246,192,54,105,59,106,
+  235,180,149,203,243,242,239,229,51,242,97,121,143,188,89,246,
+  74,105,233,134,244,158,244,115,233,148,244,29,201,144,118,73,
+  141,82,165,180,78,114,98,17,255,192,45,252,9,31,96,10,
+  191,194,207,240,99,76,224,21,28,197,17,188,136,3,216,199,
+  58,251,58,122,208,133,14,108,71,43,154,208,136,122,158,232,
+  121,4,80,141,74,108,192,179,88,143,114,148,193,135,98,172,
+  195,90,20,193,11,15,214,96,53,86,193,141,149,112,49,191,
+  236,52,252,213,114,192,73,206,75,75,255,255,252,111,224,255,
+  105,252,11,116,198,240,69,158,14,0,0,
+};
+/* alteredbeast data */
+static const unsigned char dat_alteredbeast = {
+  31,139,8,0,0,0,0,0,0,3,237,89,127,124,84,213,
+  149,63,247,190,201,204,155,201,155,204,100,18,211,153,16,194,
+  228,71,227,24,67,72,32,210,64,179,144,12,1,146,8,35,
+  36,80,1,41,4,8,73,80,148,16,50,32,154,197,0,21,
+  137,117,149,165,148,34,101,237,110,235,10,90,107,93,202,162,
+  132,16,82,176,24,16,1,249,213,143,148,86,44,254,64,180,
+  238,174,101,17,134,48,179,223,123,231,77,24,6,252,172,109,
+  247,159,253,124,120,239,115,238,249,121,239,61,231,158,115,239,
+  187,147,212,146,33,221,231,247,249,243,135,147,175,225,98,222,
+  88,223,73,186,245,220,122,110,61,183,30,249,140,15,80,207,
+  232,192,149,192,172,218,250,239,140,15,92,57,186,171,167,222,
+  158,63,188,55,101,22,209,83,2,215,18,125,47,175,34,167,
+  106,116,224,234,201,89,37,245,131,243,115,41,15,186,166,252,
+  59,37,110,116,223,79,19,32,43,2,253,80,254,240,43,93,
+  13,198,188,177,3,43,200,0,189,144,85,248,252,24,245,184,
+  119,189,207,159,235,203,79,239,234,156,58,190,102,82,3,247,
+  249,71,164,119,181,182,81,189,99,68,186,97,236,212,241,31,
+  222,147,151,126,250,31,190,185,170,137,106,63,122,181,84,156,
+  86,87,214,161,183,69,96,120,192,171,158,104,208,42,62,14,
+  5,113,126,173,31,247,222,99,33,159,95,151,44,11,75,150,
+  65,34,70,110,163,169,227,17,20,3,246,17,35,2,158,8,
+  94,5,174,1,94,7,60,9,248,69,224,201,192,239,2,79,
+  0,94,13,60,5,248,115,224,169,232,94,4,60,13,211,14,
+  6,190,15,88,140,59,29,120,10,48,220,82,182,2,207,38,
+  234,167,1,207,65,191,167,128,235,128,215,196,174,110,217,252,
+  150,185,205,115,235,220,222,185,179,22,181,184,155,231,54,205,
+  159,181,148,202,103,45,158,235,30,183,96,201,92,247,32,119,
+  205,130,250,150,37,179,154,231,186,107,90,252,117,243,22,184,
+  7,186,203,230,180,204,91,60,111,209,188,5,15,185,61,133,
+  195,138,139,239,160,241,205,249,53,45,75,231,60,240,48,4,
+  119,13,42,44,28,52,12,194,178,0,223,51,42,208,255,64,
+  182,58,58,64,67,221,142,109,109,13,153,217,43,50,201,184,
+  92,248,149,99,223,222,246,160,182,125,249,67,234,250,182,147,
+  43,220,43,39,85,76,170,248,183,253,11,206,161,215,83,133,
+  173,181,69,230,18,159,159,148,142,143,192,183,186,75,124,11,
+  125,11,11,91,33,57,55,42,192,102,128,218,161,118,103,84,
+  170,123,50,74,213,125,128,3,133,165,234,33,104,26,165,230,
+  20,52,167,33,61,3,248,0,210,38,33,53,91,50,42,205,
+  90,70,169,217,94,88,106,78,134,116,13,164,151,205,5,144,
+  14,134,100,40,36,181,210,174,25,146,22,216,61,12,104,5,
+  180,65,83,39,109,159,132,230,41,216,174,129,228,5,105,27,
+  128,164,183,176,212,66,144,76,17,18,203,152,140,74,75,5,
+  252,79,176,140,139,248,99,193,136,150,22,112,171,4,23,95,
+  155,81,25,63,27,156,71,114,31,129,59,39,236,227,63,131,
+  172,88,200,180,180,140,74,45,189,176,84,203,244,249,203,2,
+  108,89,70,171,168,23,74,245,54,82,66,162,160,179,51,31,
+  9,122,51,42,201,80,75,74,42,32,232,126,36,152,143,222,
+  229,137,243,132,37,90,212,21,90,78,113,104,21,50,160,53,
+  144,25,109,28,169,104,141,100,69,107,34,27,90,149,20,180,
+  102,50,161,181,80,188,207,255,122,239,106,170,79,171,152,84,
+  25,160,11,188,140,108,174,45,148,102,39,94,42,169,254,68,
+  158,153,186,77,138,180,57,226,28,206,94,230,229,208,118,176,
+  127,45,189,166,181,75,237,86,238,133,102,163,59,182,215,70,
+  33,79,77,221,56,156,222,112,61,30,165,213,164,182,213,53,
+  153,76,158,153,25,85,164,250,252,82,114,191,240,36,113,20,
+  165,185,86,134,125,73,113,128,235,239,90,73,177,51,150,138,
+  145,189,69,55,140,233,113,77,37,99,180,23,35,13,78,151,
+  240,27,58,205,245,108,41,21,15,16,218,216,221,81,106,71,
+  99,200,249,41,25,238,104,146,89,136,126,116,46,238,47,58,
+  205,66,127,145,245,255,193,99,8,82,8,143,164,141,95,101,
+  148,216,75,214,213,162,165,213,28,173,22,69,199,71,209,150,
+  40,218,28,69,171,81,180,41,138,54,70,209,113,81,180,33,
+  138,86,162,104,30,69,179,40,154,110,24,63,180,154,39,161,
+  37,101,103,49,238,142,59,128,15,121,209,118,244,122,151,130,
+  126,33,34,115,151,32,184,135,203,46,147,242,102,83,1,70,
+  152,216,19,10,8,187,157,217,194,14,214,195,64,123,188,109,
+  110,129,233,72,233,145,210,81,151,197,169,115,172,59,123,226,
+  224,18,74,59,254,107,111,91,102,85,214,126,104,15,20,164,
+  30,237,22,212,155,109,5,169,153,98,150,3,58,127,36,204,
+  69,244,61,110,111,91,129,67,140,179,107,147,24,241,88,119,
+  214,59,208,191,154,133,88,119,190,4,251,150,62,234,141,8,
+  213,147,44,169,151,33,107,237,163,14,70,168,158,180,33,240,
+  29,146,102,29,239,9,227,30,7,190,50,34,142,115,245,9,
+  226,219,35,98,222,245,114,248,235,67,202,225,0,41,71,62,
+  35,229,157,83,210,230,139,122,226,249,85,34,118,67,131,61,
+  235,178,192,114,5,164,68,200,59,46,213,19,37,11,219,157,
+  185,160,90,106,137,5,1,1,185,162,169,114,189,46,138,117,
+  234,184,36,162,202,108,37,229,248,43,217,11,137,50,167,101,
+  157,130,69,65,214,1,180,121,210,186,40,235,93,180,154,108,
+  83,100,235,200,234,149,133,134,222,240,157,137,57,132,183,93,
+  199,117,206,142,153,214,200,185,139,26,136,173,202,22,84,158,
+  182,22,61,66,240,165,122,202,147,146,166,6,162,20,25,205,
+  69,72,181,172,163,98,188,90,10,205,144,179,230,134,87,101,
+  167,93,140,220,185,24,227,140,24,34,226,204,22,113,94,163,
+  48,83,142,92,135,130,6,10,149,215,72,10,50,71,95,205,
+  136,90,208,42,218,38,183,157,173,200,10,244,230,147,178,123,
+  104,89,32,121,99,6,178,177,59,157,21,21,20,16,37,117,
+  83,40,224,58,83,33,241,0,26,70,110,224,36,129,109,161,
+  128,9,171,223,106,162,138,143,207,156,241,150,202,218,112,140,
+  190,44,70,177,15,115,20,125,231,225,234,181,156,168,87,212,
+  228,177,151,6,151,152,169,168,196,66,142,2,98,201,5,164,
+  148,93,182,133,86,139,45,33,182,11,253,234,232,131,9,227,
+  222,51,153,212,29,56,100,66,1,155,111,145,78,185,116,108,
+  138,214,234,43,89,36,107,122,168,111,81,105,55,47,117,147,
+  200,169,119,243,200,18,114,251,202,166,63,35,170,114,231,136,
+  204,54,159,127,144,176,26,17,145,251,252,205,134,188,98,67,
+  71,231,235,134,142,134,64,77,89,253,23,122,101,161,106,232,
+  121,153,245,222,240,254,194,133,34,156,135,167,229,60,157,162,
+  22,142,148,138,104,14,123,51,113,70,110,237,149,218,4,221,
+  155,142,90,34,251,148,213,66,163,103,167,67,29,38,241,102,
+  225,153,220,47,141,234,229,176,4,182,197,208,178,235,180,175,
+  67,203,116,109,42,180,92,106,247,9,221,126,11,116,146,215,
+  150,134,199,174,95,167,207,187,197,211,26,194,74,230,182,138,
+  19,66,214,149,29,94,169,30,193,143,9,159,7,17,63,32,
+  31,33,36,61,117,77,212,204,90,212,244,18,186,40,42,97,
+  207,122,185,2,23,224,73,113,184,95,110,84,239,176,5,124,
+  74,235,179,114,196,246,135,47,252,107,249,210,29,137,186,207,
+  151,109,77,188,89,105,49,99,172,63,253,175,190,116,223,212,
+  151,152,254,240,197,240,117,124,233,177,71,214,24,242,18,33,
+  217,111,108,50,52,199,181,88,48,214,239,98,124,73,141,245,
+  165,199,30,182,208,171,231,2,198,48,248,252,177,253,125,254,
+  204,70,210,180,68,185,183,11,180,29,68,50,122,170,119,214,
+  8,143,212,122,123,56,139,29,23,194,59,210,231,207,104,36,
+  59,105,162,151,247,123,197,137,121,242,188,253,253,27,25,62,
+  50,76,106,199,77,72,43,232,36,86,75,124,122,85,35,241,
+  6,220,134,245,90,43,169,1,95,226,193,186,120,40,21,190,
+  140,129,30,187,158,44,144,99,207,211,208,106,49,82,137,183,
+  220,233,161,126,195,61,148,171,121,16,187,176,76,216,84,222,
+  49,102,46,106,16,86,150,211,160,113,121,86,75,226,188,24,
+  7,54,113,148,51,71,244,22,59,160,4,188,74,57,208,107,
+  103,199,84,123,40,7,61,90,255,40,41,104,44,148,131,24,
+  231,227,222,102,148,154,217,240,36,7,227,79,131,39,121,186,
+  39,121,144,87,85,201,60,212,224,28,164,17,246,45,196,250,
+  198,86,228,216,246,98,15,101,110,42,215,199,79,3,151,125,
+  186,92,159,35,78,206,161,98,14,70,57,50,167,37,226,156,
+  44,28,67,105,206,229,174,70,74,35,238,108,3,238,143,95,
+  41,66,187,29,90,187,83,172,236,118,151,224,95,35,158,221,
+  72,170,230,144,249,48,76,126,178,88,204,253,66,143,208,109,
+  209,202,229,126,46,114,174,72,77,117,141,198,72,157,100,58,
+  124,91,114,42,228,76,172,211,89,14,138,139,60,159,229,143,
+  223,134,155,27,23,247,54,248,56,69,27,70,131,40,212,203,
+  49,102,158,204,235,54,57,251,54,240,226,123,54,88,208,53,
+  98,38,11,226,179,224,107,110,21,180,152,103,163,148,70,207,
+  118,109,228,42,121,234,96,190,135,36,213,37,215,80,82,62,
+  127,146,56,221,118,11,58,77,72,118,105,225,93,213,13,155,
+  180,77,178,95,39,238,3,152,63,59,41,124,74,116,195,79,
+  231,233,136,38,189,62,236,135,168,254,110,204,108,116,141,33,
+  158,180,79,140,36,43,214,80,216,72,249,148,231,93,153,226,
+  210,20,10,98,212,70,224,171,192,227,144,85,159,200,1,234,
+  52,25,183,86,172,237,222,237,226,204,63,122,224,196,222,148,
+  84,100,97,20,113,113,127,117,182,233,55,87,240,41,46,249,
+  149,123,245,196,222,161,142,66,240,226,70,239,243,59,87,120,
+  243,64,99,71,253,6,57,169,61,37,110,140,41,137,217,130,
+  127,36,167,185,128,124,199,176,131,70,128,219,3,248,0,112,
+  14,128,47,253,190,100,128,27,144,11,40,194,169,128,40,246,
+  77,3,212,3,90,0,203,0,207,1,112,219,216,183,13,240,
+  89,117,123,226,68,242,77,106,143,217,81,201,0,117,82,59,
+  190,170,78,241,171,171,186,189,112,42,165,2,114,1,216,51,
+  33,94,221,94,240,108,198,84,202,44,156,72,121,144,229,163,
+  238,184,168,202,224,57,140,216,138,223,18,130,62,141,157,146,
+  83,141,81,130,71,171,219,197,174,1,213,83,221,46,246,60,
+  214,203,1,28,148,85,248,44,238,229,188,246,156,152,47,184,
+  69,182,129,234,246,33,226,198,176,29,244,122,125,31,111,175,
+  174,4,183,186,186,50,199,149,57,10,212,178,234,202,36,97,
+  211,153,36,110,86,93,146,222,125,45,167,193,25,225,111,147,
+  236,85,45,111,3,255,12,234,249,234,246,155,229,41,197,117,
+  93,126,92,145,252,32,54,61,39,145,149,202,152,136,213,153,
+  72,234,20,248,121,53,224,92,225,18,191,198,56,190,61,242,
+  139,35,234,90,221,17,254,166,200,123,167,213,45,239,60,184,
+  115,94,242,249,97,197,163,172,216,205,173,160,225,55,215,252,
+  149,183,255,91,207,255,235,39,136,211,151,148,183,95,9,186,
+  227,235,180,129,86,156,5,65,59,99,168,221,100,92,206,53,
+  158,172,190,79,180,216,29,204,142,216,109,144,52,19,244,30,
+  217,167,196,74,65,170,229,65,183,17,24,45,151,173,65,182,
+  70,217,170,178,181,200,86,147,109,130,108,237,178,117,200,54,
+  89,182,41,178,117,202,54,85,182,105,178,77,199,12,110,96,
+  6,239,34,158,236,17,189,66,180,65,204,220,95,88,197,135,
+  52,213,26,246,193,165,243,118,157,55,234,188,162,243,105,58,
+  31,167,243,41,58,207,117,62,81,231,205,58,111,147,124,186,
+  86,39,248,182,24,79,14,57,130,30,163,88,171,245,9,159,
+  99,235,25,130,121,55,104,122,132,102,220,205,52,158,27,250,
+  20,71,247,105,253,74,77,116,31,153,137,116,205,98,37,185,
+  142,17,11,245,198,21,131,149,3,86,234,87,91,29,250,3,
+  102,209,214,25,86,241,62,62,108,153,190,216,142,25,175,183,
+  61,130,17,187,52,102,77,8,207,171,164,211,18,92,219,53,
+  244,72,87,58,113,25,210,110,42,115,203,42,139,140,209,49,
+  134,247,209,179,101,237,165,83,29,217,208,51,89,244,92,172,
+  126,165,118,2,62,143,125,218,183,15,72,237,4,188,98,141,
+  44,114,245,206,23,157,111,61,95,7,88,7,72,147,24,156,
+  122,125,13,197,15,70,222,81,175,27,98,243,122,36,40,254,
+  54,83,135,151,201,149,227,86,212,237,6,167,136,137,141,36,
+  218,160,201,250,103,66,218,232,190,62,42,57,178,67,246,17,
+  35,219,99,50,209,133,49,88,130,147,168,203,14,95,153,240,
+  181,211,46,101,58,117,157,236,235,216,69,124,158,129,153,226,
+  67,212,118,254,234,249,155,193,13,126,36,99,52,27,214,148,
+  102,92,91,149,173,209,39,128,162,137,44,172,115,199,104,211,
+  241,138,190,158,136,214,142,232,109,0,187,14,54,21,24,115,
+  89,129,53,85,188,241,170,69,53,171,170,106,82,141,106,156,
+  106,192,75,106,88,111,19,175,154,0,218,10,172,1,44,232,
+  99,67,157,106,100,128,204,10,222,70,97,187,4,188,144,144,
+  134,55,30,151,95,149,76,184,248,198,137,159,30,248,176,145,
+  156,25,99,225,197,104,125,243,94,155,85,81,185,156,215,198,
+  194,150,54,221,50,98,43,172,133,159,102,233,171,232,39,122,
+  138,190,97,159,21,57,130,120,89,120,28,120,106,210,41,27,
+  188,181,133,41,213,0,184,54,171,81,172,138,212,196,195,95,
+  77,120,201,196,155,160,191,86,188,154,108,5,142,125,227,1,
+  150,216,55,66,152,245,87,213,95,35,139,99,6,166,48,206,
+  136,133,108,114,125,241,11,235,105,64,189,60,240,149,253,27,
+  195,248,128,83,199,63,213,113,167,142,79,234,248,63,195,248,
+  45,139,142,179,117,92,165,227,38,29,111,210,241,25,82,14,
+  90,128,63,11,243,7,61,58,158,174,227,71,116,188,93,199,
+  199,195,248,237,124,29,79,7,172,1,52,11,14,203,20,143,
+  229,74,162,111,80,63,26,64,89,116,59,221,137,219,254,16,
+  250,22,125,155,70,210,40,26,75,119,211,61,84,67,247,210,
+  125,52,147,230,224,39,196,3,180,128,22,161,30,31,165,199,
+  104,37,61,65,223,167,103,232,7,244,35,250,49,253,132,126,
+  70,155,233,231,244,75,250,21,189,70,59,105,55,237,165,55,
+  233,45,58,76,199,232,183,244,59,122,143,206,210,199,244,41,
+  253,7,253,153,190,164,43,20,194,250,153,176,236,54,150,196,
+  190,193,250,177,1,44,139,221,206,238,100,131,216,16,246,45,
+  246,109,54,146,141,98,99,217,221,236,30,86,195,238,101,247,
+  177,153,108,14,107,96,15,176,5,108,17,91,194,30,101,143,
+  177,149,236,9,246,125,246,12,251,1,251,17,251,49,251,9,
+  251,25,219,204,126,142,2,101,40,212,56,148,173,25,216,34,
+  118,152,124,197,10,27,32,75,64,188,78,252,138,202,68,180,
+  121,84,72,67,17,107,41,141,166,42,68,58,137,166,210,12,
+  196,217,72,15,82,51,162,108,165,229,180,10,49,174,161,31,
+  210,70,68,248,60,189,72,175,32,190,215,105,23,237,65,116,
+  7,233,29,58,137,216,206,208,135,116,30,145,93,160,203,20,
+  68,92,42,74,204,129,168,210,88,6,203,65,76,5,236,46,
+  54,28,17,149,179,74,230,67,60,83,216,119,217,108,68,51,
+  159,45,100,139,17,75,27,123,156,61,137,72,214,177,103,217,
+  115,136,99,11,251,5,219,202,94,99,157,236,215,108,31,123,
+  139,29,97,39,216,41,246,30,251,128,125,194,62,103,127,102,
+  151,216,85,206,185,137,107,60,145,167,136,187,166,220,158,26,
+  182,172,17,109,170,92,3,241,39,237,120,74,68,110,251,35,
+  179,119,32,175,119,33,210,50,228,116,60,50,58,21,249,156,
+  139,108,46,68,148,127,143,76,182,35,143,63,68,22,255,5,
+  57,252,5,34,220,129,252,253,6,217,123,7,185,251,61,50,
+  247,9,162,251,111,186,194,24,114,102,69,198,92,200,215,55,
+  17,89,33,114,245,119,200,84,37,242,52,25,89,154,133,168,
+  30,68,134,150,34,63,143,35,59,255,136,220,252,19,34,122,
+  145,253,146,253,59,219,137,120,222,100,111,179,99,236,93,68,
+  243,33,251,148,253,23,251,18,177,40,220,204,109,252,54,222,
+  143,103,240,219,249,64,62,132,15,227,35,249,104,126,55,159,
+  200,239,229,223,229,115,248,60,190,128,251,249,163,124,57,98,
+  21,117,107,146,71,129,104,7,32,90,17,175,29,177,58,144,
+  219,100,186,141,82,144,97,23,106,58,13,39,168,27,153,206,
+  166,28,242,80,46,13,196,42,12,198,58,20,83,73,95,125,
+  79,144,89,159,137,47,208,253,114,53,30,67,198,159,166,245,
+  200,246,139,88,135,46,218,79,39,232,125,68,127,21,7,68,
+  26,27,136,44,86,179,122,228,108,45,123,137,237,101,127,96,
+  1,238,228,197,124,26,95,198,159,231,7,249,69,37,91,169,
+  81,86,41,157,202,5,67,161,161,201,176,205,208,27,55,54,
+  110,67,220,159,140,99,141,155,77,154,105,137,233,19,117,150,
+  250,190,185,209,252,165,229,153,248,65,241,167,180,167,173,227,
+  19,156,9,159,27,77,135,81,196,173,88,190,41,108,60,10,
+  101,4,43,102,69,40,156,60,118,7,182,133,89,145,251,151,
+  75,96,50,98,113,20,27,100,173,115,100,154,203,255,10,24,
+  37,22,213,96,192,218,112,128,192,113,56,192,185,248,31,17,
+  192,0,136,195,46,224,0,69,238,16,179,228,141,226,191,71,
+  216,35,10,64,236,26,177,127,140,0,113,66,16,128,1,56,
+  192,0,16,117,101,148,135,108,60,70,11,131,89,130,6,91,
+  13,182,26,108,53,140,133,79,11,64,84,166,168,75,85,7,
+  115,20,88,80,179,248,141,4,123,43,236,173,176,183,194,94,
+  212,177,21,227,91,97,31,6,51,172,18,195,103,216,137,76,
+  29,6,235,224,5,84,3,102,3,154,1,43,116,88,171,219,
+  175,253,27,97,187,126,141,15,233,227,237,137,225,215,198,240,
+  167,98,248,231,98,248,151,98,248,67,215,241,34,139,202,137,
+  47,72,249,244,168,60,177,174,209,170,196,202,85,45,44,239,
+  163,77,18,27,140,243,195,242,62,218,36,177,248,191,87,31,
+  157,122,137,232,127,0,104,219,189,80,170,35,0,0,
+};
+/* armalyte data */
+static const unsigned char dat_armalyte = {
+  31,139,8,0,0,0,0,0,0,3,237,85,109,108,83,101,
+  20,126,238,237,109,123,183,93,216,109,173,163,235,74,233,182,
+  110,43,115,108,99,193,240,33,193,181,147,180,12,118,217,151,
+  232,38,49,45,219,218,178,1,54,99,23,68,39,44,168,72,
+  200,92,148,32,38,254,145,168,49,51,209,132,96,226,31,101,
+  153,196,152,37,98,50,231,32,33,209,136,196,143,197,32,225,
+  7,193,229,14,172,207,237,24,33,254,214,127,123,211,115,158,
+  115,207,123,158,247,61,231,188,111,222,198,32,249,52,93,211,
+  171,55,64,75,222,174,138,104,151,177,56,22,199,226,88,28,
+  217,209,100,96,98,179,49,103,196,99,137,29,77,198,220,212,
+  249,137,132,90,189,225,78,65,28,24,54,49,6,188,82,21,
+  45,111,220,108,220,189,28,223,152,168,171,174,68,21,231,210,
+  213,143,100,49,229,239,69,51,125,107,104,239,171,222,48,55,
+  150,180,85,69,86,69,33,113,222,244,69,53,157,171,78,135,
+  79,107,122,165,86,237,27,251,162,163,169,173,61,41,106,250,
+  38,223,216,224,16,18,206,77,62,41,210,209,244,235,246,42,
+  223,15,175,151,29,75,35,246,219,217,122,243,181,154,59,69,
+  118,174,137,204,64,108,124,45,169,68,127,207,252,205,247,235,
+  244,182,159,142,100,52,253,158,231,240,188,231,48,61,230,202,
+  67,232,104,98,81,2,81,131,0,16,91,204,42,137,109,132,
+  83,196,118,226,7,196,39,137,223,18,155,137,199,137,79,19,
+  175,17,59,136,191,16,59,137,55,137,207,16,103,137,59,137,
+  119,136,76,75,136,18,119,1,214,48,177,139,254,97,98,55,
+  241,141,127,119,55,212,191,55,190,231,208,64,143,191,191,39,
+  189,39,126,8,141,250,254,129,221,251,252,109,93,169,120,255,
+  129,231,246,197,253,53,254,80,127,151,127,149,191,61,21,223,
+  19,223,171,239,247,7,87,175,95,191,122,37,154,250,171,219,
+  6,14,117,245,61,79,71,109,13,127,235,215,173,132,166,135,
+  12,236,90,61,168,233,194,136,166,251,95,200,188,195,222,180,
+  154,66,251,68,131,33,5,28,187,205,234,169,89,59,181,8,
+  43,181,5,18,181,132,28,106,43,100,106,27,150,80,219,145,
+  79,45,195,66,157,3,59,117,46,242,52,157,235,229,82,198,
+  40,103,34,134,212,25,216,26,152,40,137,6,163,181,133,209,
+  241,43,227,129,139,74,75,38,147,184,25,236,3,214,14,114,
+  85,87,86,23,132,251,224,78,139,33,195,242,113,131,97,153,
+  10,108,121,107,162,36,183,164,15,210,1,33,60,10,137,34,
+  83,20,138,139,226,14,167,224,29,192,154,194,233,97,255,209,
+  64,216,229,145,69,216,147,138,40,226,136,35,140,229,173,47,
+  199,174,139,71,89,201,145,233,163,129,62,200,107,234,252,8,
+  108,155,190,80,220,8,181,184,1,210,119,95,182,76,100,70,
+  205,110,88,234,210,57,97,55,191,238,208,46,119,12,98,22,
+  118,230,125,49,98,88,222,51,51,220,106,88,212,182,62,184,
+  122,125,156,119,242,232,190,38,154,247,114,140,184,131,248,217,
+  218,62,20,192,85,52,136,117,176,135,12,241,70,28,194,173,
+  181,245,112,123,134,138,88,17,132,162,16,100,89,96,118,54,
+  249,19,118,210,78,219,70,251,79,102,103,198,207,48,254,43,
+  51,190,168,30,98,150,97,33,35,231,62,67,122,128,33,100,
+  25,87,201,56,121,143,33,101,25,86,50,114,239,51,172,15,
+  48,216,149,116,46,57,79,57,198,143,195,113,245,184,200,74,
+  111,107,122,91,16,249,189,16,158,8,7,17,40,73,65,85,
+  11,207,110,68,38,1,36,2,205,151,102,32,181,178,227,170,
+  39,235,11,20,15,154,55,2,82,160,89,118,114,7,167,234,
+  17,217,87,71,61,150,103,103,68,70,58,101,214,146,92,186,
+  224,87,61,38,95,28,50,251,63,57,100,246,255,210,120,26,
+  181,158,201,225,226,122,168,177,19,140,182,38,193,174,204,112,
+  221,96,150,203,119,128,236,21,100,231,171,133,89,230,138,44,
+  83,169,173,131,121,114,227,170,199,209,10,197,209,201,123,215,
+  137,114,218,101,196,10,158,167,76,241,61,176,151,186,192,96,
+  140,151,49,37,156,119,81,220,142,14,148,198,202,185,155,45,
+  233,90,216,139,245,151,242,204,5,4,98,202,130,207,140,99,
+  102,54,4,139,183,64,149,131,102,142,9,183,35,133,37,220,
+  63,133,18,120,139,83,112,193,77,237,99,13,163,230,188,166,
+  167,193,158,122,19,222,249,136,64,10,110,246,192,173,56,217,
+  65,101,62,62,246,135,233,85,157,147,220,147,178,92,2,148,
+  94,49,141,6,67,104,93,200,255,251,241,90,135,105,103,50,
+  253,240,6,217,27,27,179,5,118,122,4,119,16,101,206,32,
+  42,232,177,39,108,212,72,86,82,91,19,234,201,32,202,187,
+  61,204,216,138,96,63,98,234,20,191,207,73,61,102,102,244,
+  56,37,71,8,21,215,148,147,82,183,36,133,120,45,172,56,
+  211,45,79,133,136,238,238,217,201,144,156,226,206,228,53,242,
+  38,36,74,88,131,146,40,152,175,149,247,66,86,86,34,3,
+  33,105,222,7,217,252,118,58,52,253,222,195,52,251,95,253,
+  127,252,31,99,233,141,165,203,150,52,41,35,121,87,242,106,
+  114,71,114,254,202,73,202,87,229,184,125,198,126,208,158,103,
+  251,208,22,177,94,183,190,109,141,72,115,210,167,82,90,170,
+  181,220,178,124,110,121,213,210,102,41,21,111,139,223,136,239,
+  139,47,137,29,226,58,209,45,24,194,143,194,5,225,35,225,
+  77,225,69,161,71,104,17,54,9,85,130,87,80,112,23,55,
+  240,51,166,49,129,243,56,135,81,188,139,211,24,193,49,28,
+  198,65,164,209,139,110,60,139,14,180,99,59,182,34,130,6,
+  60,142,199,248,58,60,138,58,212,160,10,149,168,64,25,74,
+  81,140,21,88,14,47,60,40,196,50,190,33,15,227,33,56,
+  225,128,138,124,224,31,164,81,224,55,118,11,0,0,
+};
+/* asidifier data */
+static const unsigned char dat_asidifier = {
+  31,139,8,0,0,0,0,0,0,3,197,149,111,104,19,119,
+  24,199,191,247,39,119,105,9,221,37,141,105,180,137,158,181,
+  106,45,237,200,164,136,104,171,151,84,99,99,237,173,85,215,
+  249,106,36,86,146,210,213,246,232,76,55,74,232,194,216,88,
+  95,140,189,24,34,123,177,191,224,11,95,136,148,225,198,24,
+  50,110,221,16,7,194,100,136,238,197,104,55,81,171,163,202,
+  24,123,81,126,214,102,207,239,146,198,232,186,215,11,244,185,
+  239,239,251,124,239,242,185,231,126,185,38,1,45,9,161,141,
+  254,222,130,243,233,154,47,44,71,89,225,111,253,253,30,38,
+  126,164,155,214,235,41,136,129,171,57,72,59,218,225,122,240,
+  106,71,39,44,82,178,163,198,202,234,84,71,14,10,146,84,
+  129,227,84,39,48,228,232,19,29,57,177,9,195,164,69,164,
+  59,114,210,77,140,144,22,48,152,130,60,115,232,230,155,5,
+  243,12,175,244,93,145,3,139,83,160,94,225,113,127,74,57,
+  52,71,157,236,41,116,223,24,139,254,254,233,7,234,62,225,
+  103,33,241,72,107,252,229,122,68,236,53,82,13,221,15,160,
+  31,142,93,36,170,244,108,248,13,86,135,113,247,34,36,86,
+  103,102,93,219,93,55,148,9,117,199,238,17,88,88,71,117,
+  12,33,170,167,176,158,106,18,213,84,143,195,67,245,4,106,
+  168,166,161,81,29,132,143,234,16,252,84,135,17,160,58,130,
+  96,243,123,107,13,184,205,211,22,204,243,80,218,134,225,111,
+  60,15,205,146,248,202,204,242,57,245,176,229,171,122,32,99,
+  196,62,137,189,210,98,152,23,32,167,32,104,81,186,143,206,
+  197,41,209,152,183,16,95,218,10,237,18,220,190,60,213,42,
+  167,86,251,242,150,77,71,213,214,242,237,216,235,203,199,231,
+  138,119,171,239,90,158,76,139,102,182,147,45,79,236,241,166,
+  21,221,48,239,193,253,109,174,80,72,247,211,51,104,209,141,
+  30,38,84,55,245,91,2,39,104,26,129,94,86,70,81,153,
+  231,224,238,97,184,203,39,73,36,253,148,149,202,89,169,156,
+  117,20,61,241,95,15,170,25,101,251,165,66,33,121,54,214,
+  71,231,93,112,206,243,208,153,182,62,241,248,47,254,237,116,
+  5,148,175,128,242,21,96,46,64,233,154,183,243,99,210,76,
+  254,246,84,198,125,196,136,125,216,119,165,176,116,43,113,66,
+  142,5,15,10,25,49,118,236,208,156,32,153,89,99,158,207,
+  160,251,198,164,216,178,38,227,105,138,175,204,51,229,227,207,
+  176,239,167,194,31,222,135,24,103,117,241,57,51,27,161,25,
+  235,231,17,156,94,18,252,105,143,119,9,54,219,68,181,151,
+  133,45,193,110,65,104,76,156,105,65,56,31,229,223,142,255,
+  233,99,204,143,237,229,119,20,160,39,56,83,27,191,105,61,
+  87,90,9,118,109,216,128,76,10,225,35,112,89,27,72,185,
+  29,79,161,84,149,29,37,165,222,74,148,243,146,211,107,36,
+  37,82,126,179,147,175,114,188,45,229,252,214,138,188,203,233,
+  237,35,37,83,126,191,147,175,118,188,120,57,127,224,86,226,
+  232,139,102,214,204,78,210,196,83,53,147,66,247,67,232,41,
+  101,82,164,163,17,105,133,59,163,12,209,14,59,98,52,189,
+  20,106,133,178,171,21,178,91,129,156,81,168,183,62,25,90,
+  27,167,221,217,10,245,139,118,74,214,144,183,206,45,64,202,
+  200,164,66,187,233,183,144,30,251,230,36,170,7,134,219,90,
+  225,33,229,31,8,146,170,33,21,24,168,33,165,145,10,14,
+  200,164,124,17,215,193,216,144,188,47,118,103,240,246,201,148,
+  209,128,174,40,61,115,185,184,243,156,95,210,225,47,23,224,
+  121,249,242,85,162,232,85,3,239,214,197,33,246,169,179,92,
+  237,135,120,88,253,173,167,168,232,94,78,39,103,167,115,194,
+  231,35,123,166,115,24,28,221,66,90,30,213,236,165,143,19,
+  215,104,210,121,68,218,65,187,204,94,122,116,174,188,22,249,
+  186,216,215,113,103,138,28,193,204,78,231,148,119,70,26,167,
+  115,174,224,168,135,119,111,115,223,197,147,63,30,165,164,8,
+  56,142,204,147,213,47,140,250,74,190,27,184,199,125,181,156,
+  148,129,187,220,113,222,1,246,149,4,131,29,101,56,211,201,
+  112,54,21,73,48,225,88,148,9,207,119,50,161,61,213,64,
+  171,63,105,117,153,86,215,83,254,4,19,63,139,50,113,188,
+  147,137,111,243,55,92,45,113,111,235,130,103,91,2,26,223,
+  249,219,122,17,180,160,53,35,224,107,70,93,116,145,169,215,
+  108,73,235,95,64,72,106,130,135,31,205,44,225,32,227,167,
+  119,157,139,169,164,133,146,174,165,206,215,43,94,122,193,209,
+  228,121,25,90,166,208,71,239,162,141,12,205,66,155,249,26,
+  57,235,166,64,53,224,120,62,238,37,67,73,61,185,61,121,
+  182,114,151,11,109,112,21,85,108,39,91,107,102,121,221,200,
+  10,119,133,54,239,119,108,131,215,230,222,52,121,153,26,222,
+  121,226,113,85,65,137,10,74,148,40,81,65,137,85,40,245,
+  85,40,245,255,160,212,87,20,81,212,59,148,245,14,165,78,
+  28,27,137,168,222,161,172,119,40,235,159,120,92,61,53,203,
+  170,138,89,174,41,205,178,170,98,150,107,254,69,233,95,133,
+  210,239,80,54,36,247,60,67,233,23,75,179,20,119,66,101,
+  97,250,191,166,254,176,147,133,189,51,44,76,180,179,130,159,
+  120,54,221,119,231,69,162,163,238,125,183,159,186,227,234,101,
+  241,180,116,17,25,205,251,61,101,41,145,151,138,125,174,43,
+  232,229,10,122,185,68,47,87,208,203,171,208,107,171,208,107,
+  37,250,246,103,232,53,81,46,211,91,14,189,245,20,189,70,
+  60,155,87,216,159,144,127,197,201,103,28,242,114,151,107,51,
+  251,15,88,87,122,37,116,8,0,0,
+};
+/* azidifier data */
+static const unsigned char dat_azidifier = {
+  31,139,8,0,0,0,0,0,0,3,237,154,109,80,83,87,
+  26,199,159,123,19,146,16,17,46,121,129,136,34,9,224,27,
+  21,141,20,82,10,1,115,19,137,129,64,132,96,109,218,177,
+  154,216,54,169,88,105,74,19,107,105,186,70,171,43,85,135,
+  58,214,250,214,173,110,91,167,117,172,90,117,44,118,90,106,
+  83,42,136,248,86,95,138,104,173,1,172,36,160,80,235,116,
+  186,206,29,215,187,231,38,44,51,221,15,59,211,25,103,118,
+  63,156,95,230,156,231,156,255,121,206,57,247,60,57,207,253,
+  116,237,0,148,29,32,96,7,34,30,34,152,66,236,3,83,
+  200,239,167,25,193,124,181,22,42,29,64,166,208,12,47,206,
+  93,134,90,20,105,4,30,205,76,106,66,35,130,193,23,212,
+  1,100,121,255,97,21,156,45,15,18,132,3,136,122,7,76,
+  154,236,128,41,123,208,220,56,51,195,238,204,106,180,108,161,
+  25,118,135,186,25,88,7,240,128,102,200,195,51,102,131,201,
+  180,7,117,0,213,113,160,64,181,26,212,110,178,50,12,137,
+  51,124,72,151,164,191,0,178,58,241,38,93,247,246,12,26,
+  196,168,196,211,97,80,84,181,179,215,203,131,43,88,139,151,
+  123,230,10,134,213,41,147,92,58,253,78,253,130,169,58,203,
+  1,224,163,253,239,210,247,26,192,112,175,129,212,133,220,96,
+  188,63,9,168,102,16,73,252,168,142,141,212,98,137,223,29,
+  64,86,24,160,208,209,103,74,252,198,96,116,69,101,193,131,
+  187,78,210,226,53,48,15,134,138,19,157,2,165,206,18,6,
+  209,49,31,203,58,147,28,139,80,111,15,136,116,33,110,69,
+  116,178,109,198,160,197,91,38,116,9,114,154,89,214,222,171,
+  175,114,240,29,197,246,211,166,80,119,119,212,199,67,150,48,
+  68,135,225,30,3,202,26,116,18,161,27,168,201,32,108,129,
+  62,19,239,16,8,81,145,150,12,160,243,116,176,189,220,254,
+  66,161,197,59,61,118,166,48,58,183,88,11,1,116,2,144,
+  160,167,60,155,216,88,79,116,72,103,3,89,92,64,248,18,
+  222,2,64,118,195,176,253,27,103,141,193,226,180,244,133,209,
+  136,248,160,142,215,179,139,47,4,186,158,215,33,28,213,86,
+  117,146,189,219,172,133,4,151,96,154,22,96,78,5,205,240,
+  173,6,134,191,172,142,151,222,149,222,149,211,101,232,7,49,
+  242,249,141,102,136,241,72,95,80,71,246,236,226,102,118,220,
+  7,89,201,175,149,160,42,3,89,36,238,39,217,112,52,74,
+  213,58,61,247,47,220,183,120,225,79,97,10,5,238,68,79,
+  135,238,66,27,23,151,18,134,55,228,70,207,171,169,1,80,
+  159,82,94,68,150,84,159,162,178,64,64,5,2,82,42,128,
+  226,35,67,251,246,18,177,32,36,117,42,181,58,128,90,210,
+  104,139,234,135,100,46,110,9,60,238,220,129,123,35,43,191,
+  200,173,28,157,113,253,28,241,22,160,184,215,145,185,182,137,
+  182,124,27,165,48,66,64,230,87,40,252,153,235,209,186,183,
+  209,185,196,255,246,244,219,56,223,232,250,195,61,169,212,22,
+  221,35,141,247,103,207,250,223,224,110,167,59,1,221,63,34,
+  64,245,152,144,5,63,149,163,21,165,113,183,180,133,242,112,
+  35,188,227,84,79,25,178,228,106,74,163,141,229,70,98,219,
+  168,229,220,72,76,59,213,83,142,44,191,129,42,208,138,185,
+  17,113,7,85,172,21,206,228,238,243,89,202,226,117,0,251,
+  119,148,21,86,211,129,72,110,29,136,228,214,1,46,183,138,
+  80,198,249,192,3,110,48,15,1,148,50,19,231,22,8,111,
+  47,21,197,0,207,41,40,40,200,232,178,167,163,54,184,184,
+  246,89,123,146,40,27,248,192,139,244,90,236,162,130,108,136,
+  119,41,170,75,10,75,144,165,42,7,33,81,191,31,248,133,
+  62,16,128,196,62,63,55,27,189,80,114,149,40,43,50,252,
+  155,233,173,134,163,250,205,6,13,132,205,86,67,168,166,80,
+  15,226,131,75,129,114,229,228,66,161,14,168,186,132,22,93,
+  88,116,1,46,208,57,133,212,50,77,54,72,170,13,77,245,
+  25,246,69,98,253,82,110,69,2,64,80,72,131,8,245,36,
+  86,84,204,131,160,176,26,155,209,27,193,9,108,229,95,192,
+  7,21,204,3,143,3,160,198,71,160,214,42,212,178,251,72,
+  212,218,136,90,243,162,183,160,2,69,120,28,138,135,47,112,
+  58,137,156,13,194,198,250,7,235,54,8,83,141,64,114,57,
+  11,157,68,12,4,136,118,194,75,236,131,251,228,76,226,12,
+  153,65,200,137,26,98,45,145,65,252,66,148,18,37,4,73,
+  104,137,231,224,56,52,194,43,176,55,179,22,100,179,25,98,
+  75,231,0,136,202,106,33,222,9,4,148,71,162,75,18,144,
+  230,2,184,123,16,197,225,37,128,1,51,147,126,68,51,13,
+  4,157,181,32,46,50,128,96,200,236,1,89,94,37,92,170,
+  5,62,42,162,34,61,240,135,202,234,33,37,79,9,249,211,
+  32,78,195,239,52,116,25,184,114,117,86,95,69,81,9,82,
+  160,211,96,102,136,171,185,121,106,64,43,111,211,144,221,230,
+  54,148,15,164,30,216,106,210,170,207,39,143,183,118,151,61,
+  217,186,57,102,155,254,201,214,109,49,114,26,226,244,89,64,
+  201,245,32,145,207,2,105,1,202,32,133,60,133,143,222,53,
+  104,86,187,206,8,29,186,38,190,75,150,178,38,7,229,88,
+  250,122,84,243,37,171,214,241,82,214,216,21,57,214,172,196,
+  29,235,231,181,182,196,120,68,151,4,38,189,140,232,89,167,
+  106,65,119,83,88,7,146,44,244,118,36,250,74,35,185,244,
+  43,37,68,69,42,234,71,103,78,30,125,194,226,29,189,150,
+  219,135,219,193,8,223,202,45,94,34,151,25,195,164,37,160,
+  219,67,40,153,177,140,42,1,96,42,33,99,82,153,140,59,
+  114,176,17,20,106,77,72,144,193,234,135,151,67,81,36,185,
+  42,134,109,106,0,83,61,196,171,130,68,110,34,195,30,98,
+  210,44,175,32,117,55,167,178,189,195,234,142,97,117,231,136,
+  175,18,169,219,25,85,68,221,48,226,203,169,171,134,213,191,
+  142,248,202,144,186,146,201,136,168,158,17,95,78,173,25,86,
+  107,71,124,41,164,46,102,38,68,212,249,35,190,156,106,229,
+  212,135,29,1,12,6,131,193,96,48,24,12,6,131,193,96,
+  48,24,12,6,131,193,96,48,24,12,6,131,193,96,48,255,
+  11,248,189,113,121,210,134,162,88,139,178,94,242,91,166,41,
+  116,39,64,51,193,1,3,195,134,115,180,137,176,12,220,132,
+  222,22,184,175,128,76,88,125,254,136,143,128,151,20,115,75,
+  5,116,34,144,244,171,224,28,208,219,172,134,38,31,5,206,
+  223,237,241,18,82,253,173,213,160,228,69,250,167,203,131,188,
+  4,139,151,251,186,38,242,101,141,36,108,235,94,220,111,179,
+  120,65,0,60,244,83,196,15,197,39,143,174,136,107,28,117,
+  101,212,116,113,99,236,63,98,93,162,110,145,67,24,22,190,
+  234,95,249,230,234,53,107,27,214,173,223,208,248,246,198,77,
+  239,188,187,101,235,246,29,239,189,191,115,215,7,31,126,180,
+  251,227,79,246,236,253,116,223,254,207,14,30,58,124,228,243,
+  166,163,95,124,249,85,243,215,199,190,9,180,124,119,188,181,
+  237,68,251,201,142,83,167,207,156,61,247,253,249,11,23,47,
+  253,208,121,249,114,215,149,171,63,94,187,246,211,245,96,176,
+  187,167,167,247,198,141,159,111,222,236,235,11,133,194,225,254,
+  254,129,129,91,183,110,223,190,61,56,56,56,132,248,37,194,
+  157,63,18,21,185,97,228,133,124,111,221,26,24,232,239,15,
+  135,67,161,190,190,155,55,127,190,113,163,183,167,167,59,24,
+  188,254,211,181,107,63,94,189,210,117,249,114,231,15,151,46,
+  94,56,255,253,185,179,103,78,159,234,56,217,126,162,173,245,
+  248,119,45,129,111,142,125,221,252,213,151,95,28,109,250,252,
+  200,225,67,7,63,219,191,239,211,189,123,62,249,120,247,71,
+  31,126,176,107,231,251,239,237,216,190,117,203,187,239,108,218,
+  248,118,227,134,245,235,26,214,174,89,253,230,74,255,138,55,
+  124,175,191,182,124,153,215,83,247,178,187,118,233,146,154,197,
+  46,231,243,207,46,114,44,92,240,204,252,167,159,178,205,123,
+  98,110,117,85,229,28,75,185,185,172,212,100,44,153,101,208,
+  211,186,226,34,109,97,193,227,249,143,105,242,114,31,205,153,
+  161,158,62,45,123,234,35,89,83,166,76,158,52,113,66,102,
+  102,70,186,74,165,76,75,27,159,154,58,110,236,216,148,148,
+  49,99,20,138,228,228,164,36,185,92,38,147,73,165,82,9,
+  34,49,2,245,71,162,34,55,140,188,144,175,92,158,148,148,
+  156,172,80,140,25,147,146,50,118,236,184,212,212,241,105,105,
+  74,149,42,61,35,51,115,194,196,73,147,167,76,201,122,100,
+  106,246,180,233,234,25,57,143,230,230,105,30,203,127,188,160,
+  80,91,84,172,163,245,134,89,37,70,83,105,153,185,220,50,
+  167,178,170,122,238,19,243,108,79,61,61,255,153,5,11,29,
+  139,158,125,222,233,90,92,179,100,105,173,251,229,58,143,119,
+  217,242,215,94,247,189,177,194,20,98,209,29,252,103,183,129,
+  161,244,117,224,1,141,34,95,209,57,171,215,92,172,77,96,
+  143,25,94,76,177,234,143,248,32,206,41,66,62,199,60,96,
+  165,53,138,222,37,39,13,156,135,154,232,23,249,73,41,84,
+  157,99,187,208,253,99,31,230,87,114,24,12,6,131,193,96,
+  48,24,12,6,131,193,96,254,95,249,23,175,200,177,21,90,
+  58,0,0,
+};
+/* blipblop data */
+static const unsigned char dat_blipblop = {
+  31,139,8,0,0,0,0,0,0,3,237,150,109,76,92,89,
+  25,199,255,247,206,157,87,166,48,51,80,96,16,198,203,240,
+  34,197,233,5,42,172,88,217,10,101,9,3,237,220,165,128,
+  107,217,109,220,153,210,153,225,77,58,11,204,182,197,177,226,
+  166,86,136,177,113,73,83,77,179,137,31,52,155,245,75,211,
+  172,126,114,119,27,74,54,13,209,196,176,116,183,218,117,221,
+  197,181,171,104,42,26,99,186,245,242,50,254,239,133,174,132,
+  37,209,15,250,173,55,57,207,239,156,255,61,231,57,207,121,
+  185,231,158,48,36,159,154,84,147,202,126,168,241,123,129,86,
+  245,22,30,62,15,159,135,207,195,199,120,66,26,102,90,180,
+  21,45,114,52,214,29,210,86,22,94,155,139,185,148,253,171,
+  185,17,224,156,206,48,144,10,4,203,219,91,180,181,91,145,
+  218,88,181,82,137,0,223,245,41,159,54,24,150,7,208,65,
+  173,150,249,152,178,127,229,90,220,18,104,221,27,132,196,247,
+  186,214,168,38,43,85,197,119,237,213,158,80,87,119,92,84,
+  147,7,124,215,82,19,136,121,14,248,164,214,158,208,7,143,
+  7,124,239,124,167,236,124,2,225,63,92,109,212,79,169,149,
+  23,216,202,161,147,61,139,237,223,138,59,131,127,76,175,243,
+  220,186,116,248,189,175,167,213,228,166,114,118,67,57,75,69,
+  247,60,129,158,16,7,35,144,42,4,128,60,194,178,135,236,
+  34,95,32,187,201,87,200,47,146,111,146,95,34,255,68,118,
+  144,223,37,143,178,185,76,246,144,181,228,147,100,130,124,138,
+  60,77,30,211,221,147,12,79,108,32,143,3,182,115,100,47,
+  219,95,36,79,144,223,223,62,187,7,135,250,19,7,135,78,
+  38,228,103,171,149,207,214,202,209,211,99,209,145,225,200,144,
+  60,18,77,12,69,206,64,237,239,29,138,140,202,29,209,225,
+  225,209,193,147,113,185,74,238,86,14,41,221,10,66,35,74,
+  215,216,153,222,193,211,114,197,190,218,170,234,154,170,207,213,
+  239,65,119,95,255,232,102,75,57,57,26,29,149,199,250,162,
+  114,87,119,139,60,26,249,74,98,40,42,159,76,142,37,146,
+  99,50,29,70,228,218,177,62,249,217,147,253,189,81,160,73,
+  19,10,228,6,245,25,245,153,226,70,196,152,52,53,73,205,
+  82,147,82,147,194,229,154,84,216,41,30,104,214,112,133,229,
+  127,154,198,139,219,76,41,150,206,233,37,105,95,113,155,84,
+  203,82,194,40,61,193,210,81,53,41,143,167,253,92,155,27,
+  100,1,249,75,50,179,89,179,94,115,247,67,132,64,107,1,
+  104,29,48,211,102,66,162,245,192,78,155,11,27,109,1,118,
+  209,250,144,69,235,135,137,182,28,86,218,74,100,212,164,210,
+  105,20,170,201,162,20,52,148,5,59,228,241,245,159,30,172,
+  128,199,221,131,108,210,229,78,209,171,91,126,90,77,78,79,
+  188,223,22,236,44,29,95,191,88,214,136,183,235,154,240,110,
+  93,74,40,196,98,93,10,141,120,191,108,64,168,196,29,230,
+  5,44,209,166,240,103,67,191,91,151,226,2,254,140,121,224,
+  213,210,167,195,48,93,97,252,39,152,194,76,199,152,142,50,
+  45,133,33,92,36,15,51,5,153,30,235,230,44,235,235,152,
+  144,245,149,76,68,71,228,80,114,60,50,40,119,114,190,251,
+  135,163,178,190,178,1,249,212,72,255,216,88,116,88,62,126,
+  70,222,182,170,10,87,192,86,232,239,131,227,230,156,255,200,
+  205,185,144,102,157,14,76,21,233,81,72,134,53,27,214,98,
+  88,91,203,50,50,247,182,195,241,191,172,85,209,7,255,237,
+  57,111,10,102,152,188,250,172,72,250,14,176,78,110,232,93,
+  1,72,177,49,239,16,76,144,18,24,129,43,0,48,218,220,
+  155,115,158,26,96,118,213,212,200,146,239,230,220,194,245,17,
+  120,2,48,207,174,98,215,194,245,78,230,156,1,206,170,57,
+  150,223,169,235,194,203,136,73,108,43,122,27,1,175,17,75,
+  72,179,188,20,129,80,79,222,32,171,201,59,100,5,163,22,
+  201,119,88,158,140,64,26,32,95,36,143,147,175,147,79,70,
+  96,122,164,73,51,15,29,158,207,76,7,239,103,166,39,161,
+  38,91,52,44,231,76,208,222,41,157,218,136,155,181,219,249,
+  49,190,77,246,145,11,228,121,242,231,172,243,186,205,3,83,
+  220,70,229,50,251,25,35,101,250,21,201,3,244,173,145,199,
+  200,191,179,230,101,214,68,204,209,170,153,215,243,54,230,76,
+  195,121,106,130,174,89,92,31,105,35,212,68,67,243,111,104,
+  17,136,211,77,154,52,247,239,24,229,113,4,93,171,72,51,
+  97,75,250,79,101,238,14,243,115,205,154,249,71,45,154,249,
+  6,227,88,82,147,27,103,71,2,46,239,160,84,212,8,187,
+  203,27,111,47,231,254,249,213,220,7,65,249,51,64,121,240,
+  214,76,209,83,15,86,60,240,109,142,122,213,200,103,25,214,
+  101,216,28,195,230,62,170,219,124,35,95,96,88,191,203,235,
+  193,76,3,178,150,236,237,66,220,54,205,92,81,19,114,219,
+  17,179,180,187,99,192,187,87,27,32,196,33,136,164,184,73,
+  137,76,145,230,56,160,145,86,242,62,105,163,158,67,218,201,
+  71,200,44,114,164,115,74,77,234,177,199,187,115,160,71,95,
+  218,7,207,91,140,252,173,25,217,227,175,132,52,63,185,48,
+  25,152,112,207,76,89,23,39,105,205,139,65,90,147,251,250,
+  84,246,226,20,173,123,177,141,54,203,189,138,111,76,21,211,
+  98,74,160,21,166,4,70,159,5,155,154,108,213,76,211,191,
+  15,238,227,60,60,218,4,139,209,151,2,59,213,212,199,212,
+  221,84,99,91,213,205,177,255,109,86,31,127,240,193,247,193,
+  40,245,57,208,231,77,64,14,207,159,30,228,234,117,159,31,
+  70,190,206,55,12,82,205,83,147,140,37,99,18,238,219,147,
+  34,115,78,230,24,161,145,223,101,228,29,147,226,127,83,103,
+  227,132,51,124,250,227,62,35,86,63,87,56,115,219,10,151,
+  238,61,4,223,182,168,109,140,246,19,140,182,192,136,150,167,
+  165,247,8,191,234,30,253,155,110,214,196,250,236,20,210,240,
+  133,52,147,82,173,192,50,207,200,179,27,33,46,6,105,45,
+  217,195,176,113,253,21,148,197,247,115,181,214,98,153,226,30,
+  172,195,199,54,78,20,132,203,169,173,26,218,135,31,105,30,
+  106,43,49,39,181,123,134,230,64,65,72,19,239,111,241,237,
+  48,124,103,26,190,203,183,249,94,219,193,247,95,119,240,253,
+  151,45,190,103,183,248,246,24,190,115,13,223,149,219,124,175,
+  236,224,251,189,29,124,255,230,129,111,53,217,165,192,60,160,
+  20,13,67,130,217,255,132,203,205,58,233,152,197,181,39,157,
+  14,231,116,94,106,87,144,27,119,122,104,231,133,1,201,213,
+  0,125,247,218,88,219,142,221,124,231,143,13,176,189,39,86,
+  97,204,187,199,63,12,199,166,7,71,179,190,143,218,224,8,
+  47,119,94,129,227,13,238,187,8,214,38,88,59,111,208,105,
+  81,24,143,94,78,132,55,78,229,60,250,42,136,23,114,52,
+  69,243,10,10,175,178,212,107,121,140,185,240,93,246,87,196,
+  214,86,35,210,146,129,90,246,93,138,146,4,216,151,111,179,
+  47,27,125,172,161,44,156,223,142,1,11,235,151,117,78,185,
+  188,244,99,143,96,117,137,49,112,183,88,78,11,37,207,53,
+  6,59,212,62,99,175,193,253,107,238,201,112,147,134,130,174,
+  142,152,139,127,254,176,219,56,193,196,122,100,105,69,252,155,
+  142,110,156,55,2,239,77,162,8,152,76,252,153,72,60,88,
+  204,252,145,240,95,110,181,222,79,219,108,128,221,206,139,153,
+  99,231,91,100,230,114,102,222,174,144,243,66,198,237,140,42,
+  199,5,251,135,246,184,109,209,22,177,46,89,79,89,51,44,
+  47,90,90,205,119,205,223,51,183,74,43,210,79,164,132,84,
+  109,250,135,233,21,211,55,77,93,166,18,241,158,248,11,241,
+  135,226,215,196,30,177,94,204,23,52,225,183,194,172,240,99,
+  225,121,225,171,66,84,56,34,28,16,2,66,161,224,228,136,
+  151,241,59,188,137,57,188,134,151,241,18,126,128,75,184,128,
+  243,56,139,83,60,38,7,112,2,95,70,15,186,241,56,14,
+  161,21,205,248,2,62,143,122,212,97,31,170,16,224,205,226,
+  83,40,67,9,138,241,73,20,161,144,55,16,47,242,120,27,
+  217,141,108,222,76,220,112,241,92,217,254,164,133,143,15,114,
+  237,255,83,235,95,185,145,93,28,162,15,0,0,
+};
+/* blipp079 data */
+static const unsigned char dat_blipp079 = {
+  31,139,8,0,0,0,0,0,0,3,181,85,93,108,83,101,
+  24,126,190,243,215,211,174,116,109,55,182,117,174,179,116,63,
+  2,41,101,34,226,162,128,171,131,172,20,86,97,35,198,41,
+  209,22,88,187,31,82,154,177,6,197,105,144,68,210,198,132,
+  132,197,96,194,141,23,26,130,55,134,224,165,49,25,11,33,
+  141,222,140,77,84,252,157,17,147,93,224,52,198,192,114,216,
+  168,79,207,6,46,99,137,94,104,147,239,125,222,239,233,123,
+  158,239,249,126,206,119,98,128,45,154,137,102,98,128,155,237,
+  32,91,140,109,31,219,243,108,83,49,136,119,136,187,216,194,
+  108,219,246,246,116,251,158,57,212,155,78,51,30,78,167,187,
+  7,124,237,153,99,241,126,95,199,225,204,96,111,170,219,215,
+  20,124,98,99,192,119,116,160,119,112,176,59,229,219,255,170,
+  47,218,123,224,80,252,136,111,119,119,42,117,164,255,112,50,
+  136,144,161,215,248,123,96,155,200,251,247,76,228,219,13,203,
+  112,32,231,29,2,160,152,81,53,163,102,70,125,251,52,28,
+  235,34,176,253,151,85,171,123,224,191,158,247,12,65,133,204,
+  40,160,68,51,33,195,146,157,231,59,3,80,18,131,158,67,
+  144,161,164,49,0,103,0,160,219,138,137,188,251,81,96,116,
+  86,110,97,175,118,34,63,126,105,0,238,0,212,209,89,172,
+  24,191,212,193,204,30,64,11,212,68,85,71,145,23,23,145,
+  80,248,172,228,105,1,60,166,151,118,67,59,31,135,104,38,
+  94,33,54,17,111,16,87,211,181,68,252,142,253,108,28,74,
+  31,241,28,113,63,241,50,241,133,56,228,77,33,67,61,180,
+  107,204,81,8,207,56,10,89,68,51,219,13,76,151,31,103,
+  188,81,159,155,247,205,234,72,28,248,134,216,67,28,39,158,
+  36,126,198,154,203,186,27,114,82,39,115,150,227,12,18,125,
+  212,149,136,91,169,109,16,247,17,255,96,229,89,86,34,97,
+  107,51,212,187,149,243,107,102,224,36,57,81,228,52,231,125,
+  110,128,156,100,114,254,121,46,14,105,56,100,40,249,191,61,
+  250,142,33,236,156,69,129,13,139,218,63,245,121,58,212,19,
+  173,134,250,193,118,67,189,66,31,83,209,12,204,95,26,78,
+  79,191,226,109,129,213,233,73,70,26,121,126,190,202,255,18,
+  246,61,6,52,134,191,28,241,190,120,111,199,3,111,115,214,
+  179,102,94,106,70,167,25,203,205,88,177,165,24,171,204,188,
+  218,140,126,167,199,141,145,205,40,157,178,70,68,82,31,102,
+  230,13,161,34,130,132,22,113,37,128,31,46,108,134,72,66,
+  72,68,105,1,21,226,16,81,77,2,6,209,66,156,33,234,
+  228,203,137,86,226,38,98,41,113,160,35,23,205,20,189,39,
+  247,150,163,232,190,190,7,238,107,116,126,109,196,231,246,175,
+  133,50,150,29,207,6,142,187,70,114,150,201,44,163,58,25,
+  102,148,93,151,114,101,147,57,70,215,228,14,198,82,215,44,
+  222,204,173,98,68,78,48,138,156,160,251,82,232,209,76,155,
+  33,15,255,28,222,192,117,216,18,130,102,142,21,132,149,236,
+  208,3,236,74,178,137,197,236,194,220,127,31,45,206,63,124,
+  239,253,160,203,226,26,20,215,77,160,60,154,241,118,161,162,
+  88,123,58,133,170,34,94,53,145,108,101,52,67,47,37,89,
+  184,174,103,37,102,118,102,116,104,230,43,204,220,150,149,254,
+  77,13,71,50,208,96,106,250,147,181,166,87,63,119,216,177,
+  100,135,235,215,237,68,237,18,215,58,221,62,68,183,213,166,
+  219,154,104,198,179,135,111,117,87,241,157,110,53,164,230,178,
+  33,20,80,219,110,200,193,166,32,180,49,58,47,107,129,52,
+  25,102,212,202,82,208,185,255,65,52,36,159,228,110,205,37,
+  28,210,26,220,69,45,159,177,163,58,214,72,110,214,228,110,
+  223,231,220,228,238,36,236,228,110,153,156,13,213,237,134,52,
+  179,72,219,102,106,59,76,237,198,37,218,115,203,104,255,182,
+  140,246,175,139,180,71,23,105,187,77,237,10,83,123,237,18,
+  237,59,203,104,255,184,140,246,183,247,180,163,153,206,32,212,
+  190,160,55,5,5,170,255,57,167,139,53,133,132,230,92,83,
+  40,196,202,59,206,68,130,168,72,218,221,140,99,162,79,113,
+  110,70,241,244,234,172,182,98,37,255,243,39,250,248,188,59,
+  177,218,92,119,183,63,5,219,130,130,173,181,120,142,118,192,
+  22,155,238,248,8,182,171,60,119,113,204,29,103,117,101,191,
+  93,11,210,79,177,159,142,205,223,202,149,212,170,78,214,112,
+  54,222,177,32,106,46,176,119,64,219,198,44,118,147,227,121,
+  249,180,197,116,90,215,183,145,99,215,163,46,13,142,85,187,
+  48,150,78,141,57,52,196,170,34,232,211,88,223,208,145,115,
+  122,168,99,141,99,118,138,30,120,90,180,87,68,221,137,150,
+  240,238,104,143,121,214,224,250,154,103,50,22,50,80,221,185,
+  59,225,12,25,34,230,50,111,48,169,25,165,134,215,247,114,
+  244,200,252,125,35,4,32,73,128,44,243,99,162,240,98,81,
+  249,33,209,0,139,101,166,160,235,128,213,202,15,167,13,203,
+  254,28,211,142,202,21,237,246,83,37,215,75,214,219,78,89,
+  111,91,147,250,164,30,183,76,89,142,90,74,180,115,90,155,
+  122,83,125,87,109,83,238,40,31,43,105,165,73,254,83,254,
+  68,126,75,238,148,235,164,91,210,231,210,251,210,235,82,151,
+  212,44,85,9,67,124,47,70,197,135,226,180,120,77,116,139,
+  61,98,171,8,136,26,97,231,140,167,241,19,190,64,30,159,
+  226,34,206,227,61,156,193,41,156,196,27,56,202,107,178,15,
+  7,241,18,186,176,23,207,98,39,218,208,138,167,241,20,154,
+  241,56,54,96,61,2,88,139,71,208,128,58,172,194,195,240,
+  162,6,213,240,160,18,21,88,137,50,184,225,130,147,247,202,
+  210,95,65,60,56,201,185,255,167,234,47,114,183,68,123,144,
+  8,0,0,
+};
+/* chipmon2 data */
+static const unsigned char dat_chipmon2 = {
+  31,139,8,0,0,0,0,0,0,3,237,149,109,76,91,215,
+  25,199,159,123,125,241,27,198,92,94,2,182,177,47,14,5,
+  154,69,177,147,176,4,209,20,40,47,1,28,3,46,5,74,
+  137,23,37,14,74,8,91,3,115,129,180,84,67,172,74,89,
+  26,117,25,66,85,181,177,116,203,170,105,90,181,42,138,18,
+  53,169,242,33,139,162,54,137,200,198,38,198,40,202,146,41,
+  100,82,86,69,145,122,67,105,154,129,125,49,251,159,107,59,
+  139,210,79,251,180,125,184,127,235,127,206,121,206,239,121,206,
+  189,62,247,45,68,100,14,17,89,97,61,92,22,34,110,2,
+  238,132,7,221,181,61,223,13,55,127,191,207,93,226,110,221,
+  31,62,184,247,245,253,253,94,247,239,55,63,243,204,183,221,
+  53,222,106,111,251,198,182,215,3,251,91,15,236,116,83,115,
+  196,120,201,109,252,203,196,127,126,158,16,21,194,110,216,9,
+  139,176,5,54,246,83,65,31,89,50,215,145,125,47,209,231,
+  106,36,34,114,124,162,144,174,189,26,115,51,108,198,179,147,
+  178,97,155,103,7,137,106,142,19,57,121,160,103,93,61,100,
+  91,58,211,234,93,58,227,26,38,78,106,3,51,22,98,197,
+  48,137,246,233,42,79,63,17,9,168,50,86,203,79,9,30,
+  31,181,194,29,112,16,217,233,82,107,173,156,47,132,211,11,
+  38,171,239,146,251,133,201,213,37,150,85,135,57,143,63,159,
+  250,173,197,254,130,201,176,181,224,38,136,82,119,143,170,94,
+  184,182,42,215,202,197,149,88,207,11,151,192,165,112,61,236,
+  135,3,240,54,152,241,154,90,185,232,42,250,221,112,23,220,
+  189,151,244,71,224,243,129,67,94,83,136,159,255,57,214,82,
+  2,135,154,35,134,137,189,100,168,105,92,58,74,235,47,24,
+  141,132,214,100,98,173,217,76,164,242,161,106,156,143,171,74,
+  106,237,79,127,167,234,139,29,213,11,34,121,124,249,113,182,
+  171,205,43,181,117,19,157,198,191,33,169,205,221,71,66,152,
+  252,226,203,164,227,11,250,242,73,180,121,94,193,255,111,77,
+  244,29,137,62,216,36,91,137,68,209,118,192,86,81,69,235,
+  18,179,94,117,175,234,61,3,104,183,37,216,250,4,43,81,
+  153,95,101,149,9,182,33,193,74,85,22,80,25,254,181,116,
+  66,180,149,108,198,196,67,145,212,81,230,163,81,33,27,97,
+  239,133,38,249,57,28,239,204,31,123,5,156,113,253,71,83,
+  189,2,174,154,255,220,159,122,5,92,185,64,147,92,134,115,
+  198,245,179,185,176,166,116,84,180,187,6,209,31,19,29,174,
+  67,232,199,27,228,34,161,233,20,25,104,221,180,109,198,62,
+  235,200,177,217,236,14,135,239,77,223,168,239,71,115,168,184,
+  62,32,210,141,1,55,225,238,229,147,118,213,74,61,174,237,
+  82,216,85,39,13,249,62,112,146,107,143,116,16,30,132,135,
+  69,91,166,61,219,81,115,138,250,167,105,134,219,47,184,118,
+  210,192,44,143,62,72,135,70,8,35,222,233,152,55,128,240,
+  78,251,188,97,154,208,219,230,13,179,60,155,99,241,188,193,
+  213,32,141,186,234,165,55,212,250,13,13,50,189,58,39,83,
+  191,234,203,115,151,51,100,233,24,191,79,189,223,222,206,184,
+  25,201,207,248,107,196,110,92,162,148,136,33,100,49,158,103,
+  61,152,73,122,27,71,74,214,14,170,190,50,119,5,181,227,
+  252,168,90,59,134,218,34,212,186,80,43,68,76,106,45,122,
+  48,179,52,86,233,149,142,227,204,10,216,217,73,182,105,218,
+  103,116,218,202,234,157,182,144,241,110,163,83,119,187,177,172,
+  214,226,165,52,169,181,87,64,134,213,120,10,251,56,90,227,
+  149,122,224,131,56,231,2,246,239,36,251,12,135,58,59,234,
+  236,168,107,114,10,183,155,202,182,39,235,144,193,234,56,181,
+  46,12,15,226,124,11,216,238,72,142,89,30,117,14,212,57,
+  80,215,236,76,185,221,92,86,23,175,59,40,32,131,213,241,
+  106,221,16,60,12,98,148,90,251,50,49,43,72,71,213,246,
+  152,218,142,179,167,160,94,121,154,46,122,165,247,14,24,211,
+  127,66,132,157,125,15,59,251,110,185,5,237,132,79,54,224,
+  190,105,146,243,87,165,110,223,103,249,171,245,202,83,120,14,
+  112,15,185,69,27,158,117,31,25,221,184,35,195,184,242,43,
+  124,147,172,35,50,158,145,169,240,224,173,39,169,114,199,175,
+  84,12,19,191,124,25,153,187,212,209,228,163,209,84,124,196,
+  135,151,47,187,58,149,103,225,231,49,83,138,153,241,229,73,
+  68,123,224,1,204,120,49,115,122,121,10,209,155,240,207,48,
+  83,188,3,207,188,190,143,72,41,181,244,21,87,42,165,189,
+  250,138,225,162,171,74,105,185,115,132,228,238,185,122,228,132,
+  31,229,4,213,156,96,34,39,24,207,185,206,114,90,30,229,
+  140,168,57,35,137,156,145,120,206,13,150,179,201,131,39,135,
+  188,248,47,191,192,200,79,37,137,81,128,74,19,163,109,120,
+  162,89,139,108,101,8,163,74,60,197,172,245,35,238,199,168,
+  6,79,46,107,3,136,15,86,12,235,124,108,55,148,0,70,
+  237,108,55,212,81,136,237,134,18,144,214,173,174,250,222,154,
+  107,96,63,196,39,165,111,177,248,122,3,251,33,126,95,90,
+  207,226,27,13,236,135,248,221,138,97,161,133,237,94,204,1,
+  231,193,57,112,46,92,128,247,192,179,164,15,68,69,158,4,
+  202,174,24,142,30,143,109,96,187,30,43,14,81,116,166,98,
+  56,102,100,49,31,102,113,236,48,214,233,102,123,30,219,2,
+  111,133,55,193,155,225,242,111,172,51,26,171,87,215,169,194,
+  58,56,126,44,147,197,252,56,139,99,77,88,103,152,93,169,
+  88,0,126,30,246,195,141,112,199,55,214,233,139,133,212,117,
+  130,88,167,3,235,56,89,204,159,102,113,44,71,168,197,199,
+  4,215,37,150,227,239,139,229,116,235,147,247,80,244,184,176,
+  61,65,54,129,108,74,16,236,98,116,84,168,75,16,63,136,
+  63,65,176,171,209,190,120,181,171,5,95,174,78,169,45,68,
+  145,153,120,213,99,51,127,136,103,63,54,243,201,90,133,125,
+  31,142,210,102,133,15,113,165,129,1,22,167,167,171,113,75,
+  60,102,95,14,53,126,131,203,76,196,113,30,102,241,14,188,
+  97,106,118,189,202,53,200,210,172,191,237,229,194,143,191,211,
+  43,116,254,56,244,160,60,111,91,222,212,167,127,191,64,228,
+  166,127,142,249,234,109,87,109,87,90,107,63,30,182,202,221,
+  179,129,67,85,151,216,115,233,26,138,228,74,237,104,237,210,
+  139,104,93,82,7,218,124,233,37,180,69,82,167,103,136,66,
+  82,208,51,196,137,210,110,180,91,164,174,154,178,136,61,67,
+  33,46,98,199,40,95,125,231,101,197,223,120,136,93,42,113,
+  97,84,164,190,209,214,196,223,103,104,117,145,220,234,37,190,
+  165,118,137,15,215,201,177,137,6,57,118,126,237,36,183,101,
+  237,53,78,44,41,39,131,251,6,190,200,215,86,35,213,114,
+  108,110,237,36,133,234,47,37,207,143,47,163,249,136,1,237,
+  253,136,73,29,103,169,227,53,120,139,182,71,114,209,190,136,
+  243,145,165,14,28,91,150,94,194,155,88,150,58,35,69,107,
+  101,41,72,33,180,187,57,17,109,23,183,133,173,72,154,52,
+  105,210,164,73,147,38,77,154,52,105,210,164,73,147,38,77,
+  154,52,105,210,164,73,147,38,77,154,52,105,210,164,73,211,
+  127,37,14,230,97,29,44,192,41,176,30,54,192,70,216,4,
+  155,225,84,216,2,167,193,209,91,209,219,209,88,244,115,229,
+  125,229,162,34,175,148,199,186,48,115,79,17,163,11,202,135,
+  202,159,149,165,149,209,216,32,102,30,40,5,209,136,114,86,
+  185,181,194,175,76,197,142,80,207,47,173,196,113,41,149,51,
+  196,115,191,126,186,150,116,41,14,203,56,9,250,163,166,105,
+  74,49,111,213,251,72,111,189,175,43,36,195,234,234,255,100,
+  43,52,105,210,244,127,43,241,9,37,231,185,132,146,243,25,
+  9,61,206,120,232,113,150,9,37,49,99,188,78,167,75,98,
+  198,50,179,178,178,226,56,1,117,130,16,199,9,152,149,157,
+  173,242,56,21,4,33,37,69,229,113,154,157,157,189,102,13,
+  227,42,86,169,94,207,184,138,85,154,147,19,231,12,51,106,
+  48,196,57,195,140,230,230,62,129,141,79,96,91,156,171,24,
+  212,104,138,115,21,131,218,236,140,163,60,137,205,140,163,60,
+  137,29,42,71,57,195,38,179,57,85,229,40,103,216,238,112,
+  228,145,186,60,59,182,138,45,162,186,60,59,182,138,157,20,
+  95,62,137,211,196,248,242,73,236,98,60,185,58,176,149,241,
+  228,234,192,82,146,39,112,122,146,39,112,62,145,85,182,230,
+  166,53,91,198,82,255,150,186,209,60,102,250,151,233,128,241,
+  182,113,175,225,174,225,53,131,69,255,129,190,33,229,139,148,
+  137,148,6,65,17,206,10,97,97,179,238,129,238,130,238,136,
+  174,77,87,200,63,228,167,248,223,240,35,124,144,47,227,109,
+  92,132,187,197,125,202,125,200,189,195,253,128,235,230,90,185,
+  231,56,15,231,228,44,180,66,247,233,31,244,25,93,163,139,
+  244,17,253,142,126,69,63,165,49,58,66,63,164,215,232,21,
+  250,30,237,163,61,180,147,218,169,133,26,169,129,106,233,57,
+  42,167,50,218,74,37,180,145,60,180,158,214,81,49,21,82,
+  1,185,73,34,39,229,145,157,108,148,67,107,40,155,178,40,
+  147,50,8,119,40,119,82,215,46,44,234,15,27,201,212,99,
+  62,151,122,199,178,152,118,211,122,34,189,44,253,183,233,247,
+  68,74,191,135,190,204,122,34,237,166,101,49,245,142,249,156,
+  169,199,72,250,195,194,162,174,157,59,73,20,107,87,78,70,
+  173,203,35,75,244,112,226,235,198,7,206,175,172,139,69,95,
+  118,45,76,46,4,23,114,22,8,14,46,76,126,217,181,88,
+  244,149,245,129,243,235,198,135,19,75,180,60,18,181,42,39,
+  99,237,184,179,241,5,93,253,55,112,166,77,199,77,47,0,
+  0,
+};
+/* cosotfmx data */
+static const unsigned char dat_cosotfmx = {
+  31,139,8,0,0,0,0,0,0,3,221,85,95,108,83,215,
+  25,255,221,235,227,123,111,28,215,185,190,11,198,118,108,18,
+  59,193,187,138,76,234,88,44,66,73,4,190,246,32,169,129,
+  44,36,168,226,95,87,103,10,118,22,182,42,205,138,90,121,
+  25,36,104,67,108,66,136,33,202,212,189,20,105,85,69,43,
+  30,42,198,219,88,149,118,85,75,213,106,138,12,164,163,218,
+  24,157,170,45,15,43,138,166,169,67,183,20,239,119,111,2,
+  98,15,83,247,188,107,253,206,249,206,119,206,249,190,239,124,
+  255,92,2,180,18,96,148,140,130,141,169,228,149,161,103,135,
+  158,229,122,31,145,38,238,16,129,193,97,203,110,48,244,217,
+  182,167,135,14,15,14,203,64,171,101,171,255,208,231,249,187,
+  7,184,220,191,213,239,243,204,242,24,112,32,89,213,62,94,
+  200,45,228,106,243,59,109,109,177,255,165,41,100,34,99,16,
+  61,59,254,124,180,190,114,114,76,89,161,121,227,205,177,206,
+  98,174,18,27,205,241,214,249,249,123,80,106,243,153,72,54,
+  178,211,86,207,247,191,52,6,143,226,156,82,207,13,47,208,
+  142,239,108,238,85,39,202,123,40,245,88,250,68,114,2,226,
+  218,85,210,7,210,63,37,173,185,244,110,151,246,187,116,206,
+  165,245,71,232,102,151,238,77,191,79,58,124,237,106,250,125,
+  106,9,15,47,146,215,213,127,5,112,53,197,138,122,101,211,
+  168,9,105,50,27,28,134,52,50,1,57,99,66,126,99,6,
+  190,178,47,127,154,39,124,180,37,100,217,202,109,61,3,112,
+  157,208,103,131,57,244,16,223,219,105,43,39,183,219,202,167,
+  197,13,16,149,52,71,111,185,99,248,51,120,167,16,207,33,
+  73,164,136,78,163,87,125,183,236,223,113,7,77,136,13,222,
+  69,211,9,106,30,125,170,220,214,183,166,138,23,40,81,121,
+  157,94,124,115,248,29,82,139,164,46,83,135,224,124,145,146,
+  143,145,119,146,94,57,178,5,241,167,161,80,154,28,183,144,
+  36,247,34,185,19,46,55,64,174,143,220,20,185,31,146,59,
+  226,114,67,228,26,228,118,102,28,219,54,111,113,244,124,202,
+  221,141,142,239,106,75,240,251,131,248,164,44,242,223,135,216,
+  220,90,176,189,203,183,6,110,13,212,222,155,65,44,194,251,
+  179,37,206,241,151,221,113,174,132,117,113,168,152,143,15,144,
+  120,10,81,189,87,249,188,236,219,177,168,214,7,239,170,245,
+  19,57,190,198,68,122,242,110,112,2,27,144,166,124,83,143,
+  188,209,143,122,25,56,214,49,1,92,95,130,40,138,114,108,
+  116,2,217,201,80,119,85,57,139,108,247,86,8,162,151,152,
+  114,206,76,195,48,130,147,144,176,134,163,140,102,189,19,158,
+  102,200,121,44,95,158,193,114,217,79,90,70,83,48,143,142,
+  146,126,185,31,183,203,62,119,183,169,47,15,185,102,165,170,
+  74,190,231,7,58,62,178,149,61,137,237,48,21,230,4,68,
+  9,245,231,104,199,253,178,63,184,11,27,130,123,157,252,174,
+  151,201,249,178,28,120,192,73,60,1,115,232,48,99,169,24,
+  145,160,5,85,182,112,187,34,184,211,230,236,36,182,162,171,
+  136,67,207,24,38,84,93,226,94,107,205,68,115,71,213,251,
+  199,154,181,113,90,199,13,219,187,196,23,248,131,35,88,27,
+  220,135,16,95,17,229,220,18,156,65,14,173,228,198,184,138,
+  19,235,18,69,104,172,163,92,69,80,86,27,37,156,123,40,
+  225,85,238,5,40,197,8,110,69,132,8,59,121,41,126,156,
+  63,221,133,180,116,102,118,228,248,239,239,193,255,33,97,217,
+  222,125,153,185,41,153,187,47,20,108,161,108,181,133,143,86,
+  6,242,19,48,56,107,156,253,187,150,160,16,42,17,37,218,
+  105,137,68,219,156,49,196,117,152,136,16,45,68,140,136,19,
+  235,136,54,34,17,50,228,2,154,22,11,139,5,90,156,76,
+  85,133,253,209,123,139,191,163,63,209,61,227,248,179,187,42,
+  62,70,150,111,108,169,89,102,85,44,108,122,78,199,77,91,
+  252,53,177,3,38,117,167,169,69,70,42,184,159,49,220,143,
+  102,74,92,79,116,24,45,205,142,231,150,47,57,113,84,206,
+  74,78,12,243,23,208,101,45,161,103,215,213,122,206,178,61,
+  175,100,174,64,162,4,49,116,120,99,175,56,155,237,21,167,
+  138,249,10,112,156,47,205,108,183,61,51,188,163,48,58,73,
+  202,99,205,200,57,212,59,170,98,207,66,110,227,52,232,65,
+  49,254,104,12,244,168,179,255,223,163,192,155,209,135,55,59,
+  31,248,254,129,111,28,203,28,171,29,159,140,88,125,150,99,
+  211,17,4,7,144,40,154,136,84,52,102,122,132,157,233,30,
+  179,60,192,42,50,244,8,253,1,193,172,57,4,220,170,89,
+  217,62,93,25,250,66,15,3,208,17,69,39,122,81,196,30,
+  148,49,139,147,120,125,10,122,164,155,117,233,220,190,54,95,
+  122,59,248,221,250,125,68,41,239,98,247,0,95,224,70,137,
+  29,200,40,93,96,6,182,16,177,39,157,21,234,191,164,5,
+  41,174,19,187,87,214,63,115,207,166,70,86,86,51,43,158,
+  95,93,61,99,244,179,189,71,62,123,34,89,245,100,106,111,
+  57,25,66,233,206,206,110,74,136,172,74,200,246,204,156,152,
+  10,93,65,227,218,189,144,219,250,253,120,204,39,125,0,109,
+  117,183,147,18,219,160,58,117,176,202,9,179,70,162,142,6,
+  250,33,92,81,232,135,112,105,146,99,168,60,206,186,95,139,
+  208,131,190,50,205,55,174,122,36,255,208,31,205,78,77,227,
+  209,47,54,116,152,158,139,236,183,186,45,248,221,187,111,149,
+  222,113,253,209,94,50,168,211,169,217,112,233,12,181,182,83,
+  171,95,55,17,61,164,45,152,80,136,53,140,240,209,130,45,
+  79,47,228,178,200,116,3,33,19,201,102,19,169,178,166,190,
+  248,100,65,125,177,212,197,30,33,149,147,234,13,103,69,251,
+  20,36,194,148,48,233,147,5,142,6,191,137,68,201,127,211,
+  228,168,184,231,111,240,77,137,74,128,82,18,219,60,178,7,
+  173,45,5,72,49,19,173,228,175,115,223,186,174,116,32,42,
+  81,66,236,144,248,131,40,9,71,10,235,56,94,84,38,69,
+  147,82,78,105,10,59,127,224,140,137,150,241,144,246,46,188,
+  211,40,5,216,41,90,46,137,131,138,118,28,94,67,48,123,
+  227,127,241,159,17,227,66,88,18,20,47,206,31,212,106,22,
+  231,240,248,221,5,171,105,91,112,27,90,53,19,94,168,149,
+  40,253,194,30,49,56,55,104,45,205,117,152,232,186,62,151,
+  200,163,107,48,127,58,79,126,59,181,116,16,235,39,229,105,
+  254,143,72,43,222,252,4,146,236,18,18,25,236,148,240,120,
+  0,33,0,175,23,80,20,64,85,235,117,77,3,26,26,0,
+  159,111,229,146,172,36,225,11,164,96,132,58,221,171,178,71,
+  120,21,85,107,240,53,54,185,223,127,196,75,64,212,241,127,
+  251,229,254,183,99,129,59,129,181,143,237,244,159,106,188,217,
+  248,184,239,84,195,191,26,42,218,109,109,76,93,82,159,87,
+  27,149,87,149,1,239,223,189,191,240,14,136,47,196,175,197,
+  148,200,120,254,233,249,141,231,39,158,81,79,187,252,185,252,
+  129,252,43,249,71,242,94,121,147,28,150,108,233,79,210,219,
+  210,107,210,207,165,31,74,7,165,93,210,102,41,45,197,36,
+  63,190,196,29,70,242,58,174,226,183,184,132,11,120,25,231,
+  112,10,199,113,4,207,99,10,147,24,199,183,177,23,187,241,
+  45,108,199,0,10,216,130,62,108,194,55,144,197,227,72,179,
+  215,124,29,235,209,142,4,90,17,71,140,221,39,226,212,37,
+  214,224,107,108,81,65,246,163,166,175,126,225,87,125,43,57,
+  240,111,9,221,128,23,68,10,0,0,
+};
+/* deltamusic1 data */
+static const unsigned char dat_deltamusic1 = {
+  31,139,8,0,0,0,0,0,0,3,229,149,109,104,83,103,
+  20,199,255,247,230,230,201,109,218,166,183,177,198,174,54,93,
+  140,253,208,183,92,211,166,76,45,213,221,198,129,82,108,240,
+  101,136,27,34,105,193,164,84,27,162,152,225,74,87,179,49,
+  166,147,189,168,136,27,50,70,25,226,7,25,82,138,140,33,
+  82,58,17,41,34,46,237,64,100,31,170,248,178,137,3,41,
+  34,99,11,165,217,255,62,221,138,58,6,253,190,27,126,231,
+  60,247,121,206,57,247,158,243,156,251,36,14,109,40,150,137,
+  101,226,128,186,233,215,194,92,87,222,117,166,27,184,77,125,
+  131,58,71,61,71,61,209,149,215,195,212,227,145,217,108,25,
+  238,204,156,14,183,99,98,235,132,180,239,171,75,1,13,41,
+  136,206,16,60,201,202,181,253,168,102,80,172,15,161,106,250,
+  83,113,4,64,77,253,70,128,150,3,139,182,60,182,104,203,
+  51,139,179,220,124,231,112,33,150,249,199,118,187,137,85,9,
+  40,65,255,187,128,120,138,85,157,23,80,157,104,11,164,224,
+  93,111,194,23,14,167,49,50,88,40,36,12,142,84,213,114,
+  21,238,91,235,44,248,226,211,126,11,45,15,178,106,22,120,
+  125,60,119,201,213,27,178,80,249,102,10,62,122,86,78,62,
+  65,117,103,29,212,100,137,191,23,42,86,83,58,176,38,13,
+  163,14,74,18,56,155,51,209,66,255,186,176,9,77,179,178,
+  136,140,219,117,76,131,115,17,70,15,147,86,142,95,123,222,
+  123,67,222,165,27,198,195,108,160,89,7,159,37,26,44,145,
+  181,51,226,184,36,106,194,144,57,235,209,126,230,104,1,225,
+  16,42,239,89,107,45,104,254,126,20,33,96,132,80,204,136,
+  43,72,240,190,253,156,149,244,169,39,229,182,47,105,32,141,
+  235,250,161,161,137,35,115,39,171,80,114,129,241,45,86,67,
+  139,242,206,142,159,232,233,164,71,210,174,89,121,124,7,35,
+  151,161,156,249,150,12,162,154,81,46,183,35,188,87,216,241,
+  6,49,121,109,8,53,70,95,205,88,59,10,9,119,13,243,
+  246,111,132,17,159,82,93,56,188,124,35,202,182,209,42,126,
+  245,183,35,114,87,98,211,23,32,236,157,217,54,159,71,105,
+  178,167,197,132,59,81,149,198,134,188,150,50,76,212,221,183,
+  194,205,108,193,148,172,141,59,30,77,227,32,42,104,201,245,
+  216,139,235,163,86,178,118,143,247,100,116,212,234,19,210,214,
+  183,174,131,210,152,226,204,222,249,25,205,158,97,38,1,153,
+  73,32,190,62,141,3,96,148,96,5,188,33,184,199,127,160,
+  85,173,110,242,205,34,137,138,109,234,69,19,43,19,194,109,
+  66,65,196,31,69,48,238,217,174,62,127,159,70,144,125,100,
+  212,163,164,79,127,3,147,124,135,184,118,130,242,239,168,107,
+  188,38,86,111,200,59,42,84,5,175,62,124,63,184,223,64,
+  236,68,176,235,167,89,198,55,210,182,69,171,183,89,230,222,
+  170,154,112,161,149,182,3,118,78,57,197,206,74,103,148,131,
+  96,140,21,204,215,125,229,202,241,14,59,75,89,37,193,254,
+  97,54,209,20,220,156,171,229,110,139,3,182,101,61,189,35,
+  42,224,233,68,162,137,121,54,36,117,230,217,192,239,250,20,
+  247,76,65,195,84,8,24,109,135,181,199,195,119,80,97,146,
+  136,151,247,35,237,80,165,71,163,172,76,99,188,135,246,14,
+  52,242,201,250,201,16,212,81,181,199,195,10,233,244,18,244,
+  18,136,208,67,36,124,157,41,52,209,131,50,30,230,154,135,
+  107,30,185,230,73,4,24,205,148,209,204,120,5,163,185,96,
+  50,146,232,211,153,107,17,34,7,224,239,64,253,218,14,232,
+  177,76,71,94,59,212,241,8,189,220,83,247,80,101,112,98,
+  235,143,133,217,193,101,188,219,197,149,221,92,209,76,17,168,
+  156,60,193,249,252,91,31,111,189,89,120,220,241,39,191,155,
+  225,174,188,250,180,59,49,41,235,217,149,119,4,186,223,94,
+  24,199,186,99,11,227,193,238,40,79,44,5,112,141,80,179,
+  60,174,199,212,26,160,215,82,51,39,125,247,202,188,227,56,
+  231,199,168,63,161,254,131,250,40,231,91,168,63,164,222,23,
+  203,132,54,1,205,131,48,160,69,123,161,135,6,89,136,103,
+  16,246,14,4,218,28,189,242,139,52,228,23,153,226,87,197,
+  211,32,52,224,136,161,210,254,126,72,128,212,146,58,219,143,
+  251,208,196,113,152,180,210,114,141,125,242,242,165,202,146,98,
+  201,184,125,18,197,50,118,15,197,50,147,82,198,50,203,45,
+  20,73,233,150,178,88,202,18,41,75,99,25,214,186,99,175,
+  102,112,15,121,175,203,89,67,202,114,41,189,82,46,145,178,
+  66,202,165,82,250,164,92,54,111,191,176,86,190,176,238,93,
+  176,89,50,111,247,194,115,32,87,148,151,102,85,57,235,144,
+  82,147,210,249,146,133,144,179,174,88,6,112,178,98,206,15,
+  8,235,238,60,77,190,34,95,147,179,228,60,25,33,223,145,
+  203,228,6,153,34,183,201,52,121,64,30,147,25,242,59,225,
+  78,11,65,12,82,69,106,73,43,105,35,157,100,11,217,65,
+  118,145,125,246,179,105,252,175,171,106,252,21,107,89,206,151,
+  93,26,230,105,112,183,60,103,228,202,238,150,193,19,40,141,
+  151,12,23,63,42,182,220,95,186,81,148,214,31,233,189,174,
+  25,87,214,101,136,17,177,197,249,204,57,236,220,236,132,246,
+  189,118,80,107,117,140,59,142,58,118,58,234,212,188,154,83,
+  207,169,89,117,151,218,166,86,41,179,202,93,229,170,242,173,
+  114,74,121,79,233,85,182,43,150,98,42,126,165,20,115,152,
+  193,61,220,194,117,140,225,34,206,99,24,95,224,115,28,193,
+  97,28,194,254,255,252,177,239,237,94,94,228,181,120,203,255,
+  233,101,23,72,251,133,60,33,236,37,109,142,253,193,246,112,
+  242,132,116,250,72,13,97,47,57,143,193,62,100,33,222,33,
+  3,100,136,176,127,197,71,196,94,251,140,156,36,236,101,113,
+  134,176,151,197,55,228,28,97,63,11,254,167,138,81,194,158,
+  22,151,200,24,185,66,174,145,235,228,38,97,143,139,91,228,
+  103,194,62,23,247,8,223,77,176,215,197,147,2,175,191,0,
+  8,112,58,250,170,9,0,0,
+};
+/* deltamusic2 data */
+static const unsigned char dat_deltamusic2 = {
+  31,139,8,0,0,0,0,0,0,3,75,96,96,224,242,43,
+  245,43,77,96,96,96,43,96,76,96,41,96,72,96,1,0,
+  71,148,151,161,20,0,0,0,
+};
+/* DMU data */
+static const unsigned char dat_dmu = {
+  31,139,8,0,0,0,0,0,0,3,221,87,121,120,20,213,
+  178,175,58,231,244,50,61,61,51,157,201,144,132,176,36,146,
+  24,3,36,56,144,120,217,97,102,146,144,100,192,1,2,122,
+  65,121,108,98,0,53,60,228,18,132,136,33,1,92,88,228,
+  34,70,68,229,34,42,168,32,15,17,17,21,163,128,160,198,
+  149,16,4,53,136,34,138,16,2,38,23,4,97,140,228,85,
+  119,22,227,251,174,223,125,223,251,243,205,124,167,171,186,78,
+  85,253,234,212,169,179,244,68,0,109,34,240,41,212,86,244,
+  24,16,186,59,116,247,208,48,239,209,237,3,243,223,239,3,
+  226,39,119,107,48,165,77,207,254,243,67,133,152,57,202,55,
+  17,48,156,115,170,241,234,76,152,4,88,175,246,5,25,118,
+  31,199,124,104,188,52,9,120,204,176,111,23,52,134,10,1,
+  96,12,181,133,212,150,82,91,75,109,23,181,74,106,63,2,
+  160,240,135,27,223,201,8,55,86,179,18,146,40,39,125,7,
+  255,169,66,104,101,168,112,104,216,81,30,40,128,30,212,198,
+  83,91,65,237,29,127,24,182,5,167,1,155,10,88,226,53,
+  252,97,71,153,183,36,84,72,116,169,215,176,232,252,94,134,
+  55,25,24,113,69,233,134,229,99,174,55,21,68,175,84,72,
+  79,79,133,41,127,73,133,178,60,95,158,63,47,144,151,97,
+  245,222,66,189,6,245,250,168,119,38,245,174,183,164,153,36,
+  77,36,233,104,146,46,38,233,142,80,161,240,3,50,63,112,
+  234,77,122,183,1,188,67,47,198,0,11,128,171,127,0,122,
+  88,200,26,189,53,122,13,239,66,138,81,247,150,244,156,15,
+  8,204,26,61,20,3,201,222,200,8,183,251,100,126,180,39,
+  102,71,251,124,128,231,71,126,214,120,105,46,244,129,1,162,
+  102,72,110,184,221,213,161,225,118,91,111,164,113,164,44,63,
+  182,58,247,44,148,100,157,131,142,179,161,72,73,138,61,181,
+  232,141,0,89,200,169,195,64,228,5,114,127,238,3,35,63,
+  109,60,147,148,10,3,106,22,145,76,53,37,244,230,171,51,
+  223,140,230,183,76,226,99,106,23,153,111,115,128,70,16,251,
+  157,217,235,49,223,137,118,36,141,28,147,15,22,64,204,84,
+  0,149,100,122,168,208,124,14,26,0,141,129,142,35,15,52,
+  54,132,10,139,105,246,226,111,188,41,59,55,35,215,31,186,
+  126,212,240,33,163,179,198,102,141,138,239,217,183,175,55,222,
+  28,179,238,241,150,76,130,198,46,122,118,99,227,84,104,252,
+  137,36,90,241,132,192,24,211,218,31,182,159,9,172,9,140,
+  25,157,19,88,147,214,0,243,225,219,250,13,205,116,71,51,
+  221,223,76,63,39,10,68,95,108,166,111,52,211,138,102,250,
+  37,81,23,209,213,228,243,89,175,81,204,77,154,81,233,221,
+  19,24,243,239,255,25,53,224,245,31,164,136,170,102,194,44,
+  136,47,210,147,221,201,192,179,194,246,113,233,165,244,28,147,
+  94,14,62,146,48,226,251,165,151,26,200,0,92,12,193,85,
+  67,5,75,178,116,75,43,41,144,71,207,142,164,139,68,163,
+  154,40,164,4,243,104,94,18,105,110,199,101,132,113,69,194,
+  60,138,246,46,96,9,21,38,109,137,217,212,109,170,130,150,
+  95,75,79,86,184,241,76,48,143,242,118,130,138,49,140,161,
+  132,26,96,166,165,63,172,237,111,201,98,168,208,92,93,89,
+  97,225,78,44,47,161,95,118,88,136,164,165,147,64,139,207,
+  8,107,75,111,188,66,126,214,15,13,107,101,105,102,181,105,
+  243,205,85,168,223,248,19,24,67,207,129,119,62,75,27,2,
+  218,36,128,112,171,68,52,75,78,183,72,200,78,37,59,153,
+  100,159,183,122,27,66,107,119,115,139,6,241,235,218,240,171,
+  218,240,15,4,54,1,19,35,129,214,59,44,238,181,9,156,
+  108,36,184,250,117,37,154,5,46,175,73,125,80,127,218,87,
+  147,181,212,151,150,5,78,43,70,33,79,167,167,74,90,110,
+  125,58,248,64,165,234,211,118,77,7,149,124,248,2,68,45,
+  45,102,105,201,164,101,80,159,108,102,57,190,72,155,49,19,
+  130,6,233,27,145,51,85,4,37,208,21,228,137,96,142,231,
+  234,86,147,166,53,148,88,121,181,118,157,43,102,166,73,127,
+  186,185,87,64,44,89,167,83,68,242,41,223,215,190,14,51,
+  167,1,112,122,34,216,168,95,208,94,114,137,250,19,105,205,
+  179,239,124,254,122,21,72,83,61,233,11,122,85,160,190,106,
+  83,162,39,67,176,201,83,135,17,160,4,147,1,137,119,118,
+  152,70,81,74,34,213,124,38,23,217,142,152,59,77,141,47,
+  247,103,21,58,220,69,121,141,100,169,48,24,164,64,42,184,
+  200,222,7,236,118,0,55,217,48,112,145,205,32,112,81,212,
+  106,7,115,188,46,146,114,112,232,169,160,131,139,60,103,90,
+  90,118,221,244,236,162,209,231,103,133,109,235,204,250,117,167,
+  130,157,80,212,156,146,42,31,81,119,37,237,143,148,101,87,
+  157,47,235,188,10,85,254,254,179,98,0,186,145,223,116,138,
+  211,78,86,211,254,247,86,132,102,183,208,156,237,11,192,1,
+  130,165,128,2,98,22,36,21,217,132,219,211,26,155,166,35,
+  196,79,1,101,74,157,63,251,66,12,164,44,35,255,41,128,
+  3,253,32,90,117,76,109,173,73,59,173,134,56,154,149,96,
+  10,216,233,61,143,122,152,213,147,67,156,176,184,65,173,118,
+  233,51,193,72,1,189,206,151,84,164,174,204,190,160,210,12,
+  26,158,58,95,98,145,186,208,140,52,144,2,114,49,20,199,
+  37,30,53,215,6,229,216,9,93,201,150,91,182,241,173,254,
+  162,90,253,233,253,205,236,198,208,201,17,69,45,133,44,20,
+  232,68,92,103,106,177,164,37,89,90,62,226,100,139,27,65,
+  156,98,113,49,196,169,173,156,195,226,198,133,10,213,55,201,
+  31,157,112,196,93,105,225,40,70,210,8,250,166,2,219,166,
+  251,192,55,25,216,139,105,62,112,183,244,152,153,118,67,13,
+  148,96,144,170,134,45,167,252,185,72,103,49,233,56,179,194,
+  87,104,245,135,10,205,26,105,210,118,131,185,251,88,154,147,
+  45,190,222,226,111,110,214,222,97,106,183,221,77,40,58,155,
+  53,107,154,58,175,41,162,153,144,92,164,4,127,175,69,115,
+  7,105,206,126,177,238,49,231,14,230,36,22,53,150,103,135,
+  27,203,45,76,41,207,183,173,3,245,78,180,158,183,88,207,
+  209,214,51,228,217,67,187,212,42,121,21,1,97,48,21,186,
+  230,155,149,101,229,61,43,140,251,173,217,178,159,244,197,247,
+  82,105,175,252,229,178,57,71,73,69,242,145,57,16,229,169,
+  203,200,190,208,7,66,171,204,26,183,86,72,87,115,93,54,
+  159,55,249,162,192,156,23,243,141,60,142,33,143,28,218,203,
+  166,44,138,21,192,2,136,162,158,40,234,241,168,41,205,43,
+  64,163,25,139,33,95,41,52,174,40,179,38,229,153,84,117,
+  172,206,95,229,51,171,144,106,48,82,70,40,205,196,31,252,
+  84,137,106,127,63,36,102,133,229,59,204,234,167,115,92,166,
+  241,211,58,135,68,178,75,167,152,69,173,207,172,46,242,21,
+  91,149,166,130,133,28,75,200,113,16,251,111,215,137,65,167,
+  169,241,123,133,181,174,81,243,38,161,231,148,100,250,14,82,
+  165,17,166,81,69,148,226,48,104,44,58,105,246,83,193,178,
+  232,184,189,0,186,77,166,245,70,58,221,86,101,144,70,10,
+  141,77,167,177,197,152,61,180,71,24,127,236,161,216,37,115,
+  46,40,255,157,76,68,43,155,157,72,127,64,82,145,116,135,
+  181,250,164,166,181,72,118,157,173,177,116,182,178,216,153,144,
+  59,231,155,123,204,93,84,35,113,238,180,24,200,41,205,244,
+  31,42,0,99,32,53,144,205,74,178,209,93,76,167,115,214,
+  126,132,232,78,106,239,19,95,76,141,54,73,125,28,209,53,
+  68,189,0,14,15,77,194,0,106,85,196,247,35,25,221,214,
+  244,234,38,251,255,123,155,67,39,178,120,62,202,92,243,25,
+  254,122,243,174,146,88,36,86,211,187,163,46,35,235,124,31,
+  144,205,249,151,105,39,90,0,178,85,109,178,78,235,149,42,
+  184,71,18,104,28,26,89,6,12,46,134,206,164,245,141,50,
+  42,219,29,227,137,205,41,205,89,248,238,158,253,251,62,247,
+  159,13,68,189,75,251,196,89,186,199,180,106,204,89,176,186,
+  36,158,183,88,254,153,190,21,149,241,63,162,130,127,17,85,
+  92,155,168,140,63,68,229,250,179,168,78,255,171,168,226,218,
+  68,229,250,51,253,172,67,217,181,116,47,60,3,190,226,193,
+  209,93,162,221,36,13,155,82,127,85,241,224,168,234,188,160,
+  249,158,85,105,242,77,55,135,182,185,179,170,68,54,199,197,
+  251,52,141,195,28,151,21,59,86,194,40,159,199,27,3,238,
+  1,192,15,117,168,98,35,43,76,191,150,174,254,199,28,176,
+  134,223,115,48,27,60,228,177,45,198,239,227,49,98,220,189,
+  146,33,167,36,167,180,202,119,194,31,181,87,102,116,119,102,
+  176,128,226,250,177,201,51,219,254,123,20,127,176,139,108,178,
+  138,218,75,186,231,173,29,148,80,50,205,53,106,33,53,197,
+  187,141,100,147,225,183,128,121,30,180,213,49,207,161,74,242,
+  91,133,163,252,123,240,79,172,244,38,171,226,98,35,50,170,
+  22,208,204,90,212,30,243,221,204,174,145,16,125,91,179,172,
+  196,204,45,221,139,58,103,87,181,122,145,201,135,35,31,26,
+  42,76,31,19,225,234,98,211,75,78,137,187,59,96,203,88,
+  201,246,39,178,172,133,226,226,251,2,1,163,67,78,73,47,
+  168,244,85,250,91,116,126,240,71,149,230,5,154,50,209,86,
+  171,141,143,166,254,179,214,55,71,124,173,63,169,8,151,155,
+  171,187,251,80,136,183,206,51,79,98,17,22,251,171,14,30,
+  74,121,168,75,119,16,171,30,61,81,106,158,190,45,39,237,
+  68,184,124,150,52,198,229,134,97,226,208,48,204,109,186,215,
+  21,113,218,13,60,180,127,36,211,158,226,73,42,128,248,224,
+  75,214,237,43,41,163,234,80,45,168,41,75,44,95,36,107,
+  242,102,222,241,204,187,30,125,107,84,132,10,83,150,15,156,
+  79,167,107,91,233,246,63,158,67,109,126,18,197,232,251,147,
+  190,255,55,63,247,87,17,31,25,31,187,190,114,94,114,198,
+  57,70,235,101,246,227,246,27,180,50,91,131,237,46,245,164,
+  122,187,114,78,185,87,113,201,155,229,160,84,47,61,41,5,
+  197,85,177,83,252,77,164,241,75,252,109,254,16,191,137,95,
+  203,46,179,79,217,70,182,128,221,202,250,178,246,248,43,126,
+  139,251,113,51,62,138,243,113,42,230,225,96,236,129,157,208,
+  1,87,161,14,78,192,97,248,16,222,129,87,97,19,172,135,
+  199,97,5,60,0,11,220,103,34,142,26,213,174,211,46,238,
+  76,113,76,212,215,219,107,237,131,181,117,154,100,43,84,207,
+  169,5,202,207,202,66,37,74,222,38,143,144,46,74,235,165,
+  225,18,23,111,137,123,68,111,30,230,123,249,50,62,134,39,
+  179,95,89,37,123,129,149,178,255,96,253,89,7,252,13,143,
+  227,123,184,5,203,240,62,156,134,163,209,143,215,99,103,116,
+  18,126,61,124,15,71,224,35,216,13,59,96,179,133,255,119,
+  120,144,240,27,34,106,141,51,174,95,92,17,206,190,142,2,
+  125,139,253,146,61,168,189,168,57,109,197,234,37,181,80,249,
+  85,89,162,116,148,119,202,55,75,191,74,27,165,209,146,34,
+  118,139,123,69,63,126,149,239,231,43,248,173,188,59,251,141,
+  85,177,205,108,49,155,192,6,178,78,216,136,39,240,3,220,
+  138,143,225,2,156,142,55,97,0,189,24,135,46,104,132,127,
+  194,15,240,5,124,76,248,175,17,254,51,176,198,194,47,137,
+  116,70,52,24,87,12,217,21,231,28,226,152,167,191,174,163,
+  125,180,246,138,22,99,123,80,189,170,222,167,114,101,165,146,
+  32,151,203,227,100,144,54,75,99,37,93,236,19,11,196,32,
+  129,188,130,175,226,227,121,15,14,236,48,219,194,30,96,147,
+  217,96,22,199,16,127,192,15,241,101,124,28,75,240,78,188,
+  25,51,176,39,198,163,129,0,231,9,255,75,194,223,67,248,
+  47,89,248,43,225,33,194,143,115,235,17,54,195,227,74,117,
+  142,114,220,175,239,211,117,251,4,237,45,237,26,219,74,155,
+  172,222,175,106,202,227,74,55,121,159,60,89,150,165,151,165,
+  241,82,132,168,16,139,68,64,72,252,99,254,24,159,196,123,
+  114,206,190,100,47,179,135,216,20,22,96,215,48,142,63,226,
+  71,248,10,174,193,82,188,11,255,138,153,216,11,175,193,8,
+  68,184,0,39,9,255,19,216,11,59,97,11,60,11,79,88,
+  248,165,145,61,221,157,34,218,27,9,174,254,206,73,142,85,
+  250,1,61,218,62,93,123,79,235,110,91,99,115,169,203,85,
+  183,178,78,241,202,31,202,83,101,187,244,154,116,155,212,78,
+  124,34,30,20,67,132,141,31,224,107,248,20,158,206,101,86,
+  205,94,97,203,88,62,203,100,9,76,224,41,252,4,183,227,
+  147,184,8,11,112,44,102,97,26,118,65,55,125,14,255,12,
+  63,194,87,240,41,225,191,78,248,207,193,147,240,8,44,33,
+  252,12,119,143,136,174,70,47,87,174,115,134,99,157,126,84,
+  239,98,159,173,29,208,210,109,207,216,162,213,50,181,189,178,
+  81,233,45,31,144,11,228,8,105,151,52,77,138,21,7,197,
+  50,17,20,14,94,197,159,226,211,120,111,110,99,199,216,14,
+  246,48,155,198,134,176,107,153,140,53,248,25,238,192,167,112,
+  49,206,192,91,112,8,166,99,2,70,34,135,139,112,10,170,
+  225,51,120,151,240,255,171,21,127,97,228,104,247,224,136,190,
+  134,223,53,198,121,175,227,37,253,148,158,106,47,214,190,210,
+  6,218,54,219,226,212,181,234,53,202,22,101,144,124,68,254,
+  155,28,45,237,150,10,164,56,113,88,172,20,33,97,240,35,
+  252,105,126,39,239,199,237,236,56,219,201,254,206,238,100,57,
+  236,58,166,98,45,30,192,215,240,31,248,0,206,196,91,49,
+  7,111,192,68,244,160,32,252,211,112,148,240,247,193,27,176,
+  21,54,192,83,176,10,150,18,126,190,123,68,68,174,49,194,
+  149,239,92,226,120,67,191,160,247,181,47,209,190,215,178,109,
+  175,218,146,213,13,106,178,242,170,146,41,127,45,207,147,59,
+  74,239,73,179,164,4,81,45,202,68,158,240,240,175,248,179,
+  124,6,31,200,157,236,4,123,147,173,98,5,44,200,186,50,
+  13,207,225,65,124,29,215,225,131,120,55,142,195,92,252,11,
+  94,139,237,80,130,75,244,233,112,20,14,192,126,120,179,13,
+  254,162,200,185,238,73,17,99,141,9,174,217,206,213,142,253,
+  122,163,158,105,47,211,206,105,35,108,229,54,175,186,69,245,
+  42,187,148,161,242,9,121,129,220,69,250,72,186,71,74,22,
+  223,136,53,226,102,17,195,143,241,231,249,221,220,199,35,216,
+  73,246,22,43,99,255,201,134,177,238,76,199,58,60,132,111,
+  226,122,124,8,103,225,120,250,84,233,131,73,24,133,50,252,
+  66,248,95,67,165,133,255,50,108,132,181,240,40,44,35,252,
+  165,238,89,17,211,141,25,174,133,206,13,142,131,14,187,62,
+  220,190,78,251,69,187,197,246,158,173,175,186,67,237,173,236,
+  85,242,228,26,249,126,57,89,58,32,205,151,82,197,247,98,
+  173,184,69,116,228,223,241,77,124,54,207,224,30,118,154,189,
+  195,86,179,187,89,136,165,50,39,214,227,231,184,11,159,193,
+  165,56,27,39,224,80,236,139,215,97,52,42,112,25,206,192,
+  49,56,8,239,193,46,194,127,158,240,203,44,252,181,238,69,
+  17,243,140,98,215,35,206,87,28,223,56,162,245,91,237,155,
+  236,76,187,205,246,153,205,175,150,171,131,149,10,101,172,92,
+  39,47,147,83,165,195,82,169,212,75,156,18,207,136,241,34,
+  142,255,192,183,240,123,248,16,30,205,206,176,61,236,9,54,
+  155,141,96,215,51,3,207,227,17,44,199,231,112,25,22,226,
+  68,28,134,253,48,25,99,80,133,43,80,11,223,16,254,251,
+  240,22,108,35,252,127,16,254,114,88,28,249,178,187,44,98,
+  137,241,176,235,105,231,110,71,173,35,65,207,183,239,176,235,
+  90,129,237,11,91,80,221,175,14,81,42,149,9,242,69,249,
+  17,57,77,170,150,30,144,122,139,179,98,163,152,44,18,248,
+  105,190,141,223,203,115,121,44,59,199,246,177,167,216,28,150,
+  199,122,50,55,254,140,95,226,219,184,1,31,198,57,56,9,
+  67,216,31,187,98,123,180,65,24,206,194,183,80,101,225,191,
+  2,47,16,254,99,22,254,94,247,198,136,39,140,181,174,173,
+  206,79,28,151,29,215,235,179,236,187,237,81,218,61,182,227,
+  182,81,234,167,106,72,249,66,201,151,27,228,53,114,95,233,
+  91,105,153,212,95,212,139,77,34,95,92,199,107,249,171,188,
+  152,15,227,29,89,61,123,159,173,99,115,217,77,44,141,121,
+  240,18,86,227,110,124,30,87,224,92,188,13,135,227,0,236,
+  134,177,168,193,175,112,142,240,15,193,7,80,110,225,175,35,
+  252,135,225,254,200,67,238,157,17,155,140,45,174,114,103,181,
+  83,114,244,215,239,179,127,100,143,215,74,108,103,108,183,170,
+  135,213,155,149,111,148,2,133,201,235,228,193,210,73,105,165,
+  228,19,23,197,86,113,135,232,206,235,248,235,188,148,15,231,
+  113,236,60,171,96,235,89,17,251,43,187,129,181,195,203,120,
+  20,247,226,11,184,18,231,225,20,28,129,3,177,59,118,64,
+  59,52,192,79,112,28,62,135,10,120,27,182,195,139,240,52,
+  172,182,240,79,186,43,34,118,25,111,185,62,118,158,118,186,
+  29,217,250,18,251,97,123,119,109,169,237,130,109,138,122,76,
+  29,175,156,84,102,43,54,121,131,156,41,157,145,30,147,178,
+  196,21,177,93,204,16,215,243,11,124,23,95,204,243,120,23,
+  118,145,125,204,158,99,247,177,177,172,55,139,198,43,120,12,
+  223,197,77,248,8,222,139,183,227,72,28,132,41,216,17,117,
+  248,141,240,191,35,252,15,9,223,60,129,77,124,58,129,255,
+  27,211,106,46,130,48,23,0,0,
+};
+/* DWaga data */
+static const unsigned char dat_dwaga = {
+  31,139,8,0,0,0,0,0,0,3,75,96,96,16,241,43,
+  245,43,213,179,98,224,72,255,166,207,238,87,42,100,18,86,
+  17,236,192,228,192,80,239,251,235,255,23,239,23,12,124,60,
+  1,30,207,211,117,188,95,48,114,241,100,120,105,51,112,164,
+  41,216,105,48,112,237,171,97,97,73,103,1,202,223,242,50,
+  40,96,72,231,225,49,96,248,95,192,144,198,226,4,228,233,
+  244,250,93,0,0,156,115,96,248,90,0,0,0,
+};
+/* dyter07 data */
+static const unsigned char dat_dyter07 = {
+  31,139,8,0,0,0,0,0,0,3,237,91,125,112,20,199,
+  149,127,51,179,51,59,90,173,86,131,190,208,183,6,33,240,
+  70,172,196,26,20,16,66,134,17,216,214,242,181,150,129,248,
+  192,166,46,43,98,107,249,18,200,10,114,140,138,216,11,225,
+  98,206,225,114,10,69,48,127,184,28,146,114,28,151,203,149,
+  16,151,139,227,82,28,145,93,41,142,184,238,202,178,235,138,
+  184,92,254,208,217,133,145,93,56,225,82,20,200,107,161,189,
+  95,247,140,180,35,173,36,86,2,108,72,244,84,221,239,245,
+  235,55,239,189,126,221,253,186,103,88,66,228,40,14,182,5,
+  219,42,107,40,24,190,236,171,15,158,165,73,152,132,73,152,
+  4,14,171,162,116,230,158,232,151,209,198,80,211,3,171,162,
+  95,190,253,31,103,154,180,202,154,190,156,70,162,3,12,135,
+  136,246,249,2,51,151,223,19,189,122,182,177,182,105,78,101,
+  57,249,208,215,82,57,139,227,77,250,22,106,0,175,10,244,
+  246,202,154,47,79,133,21,95,125,69,128,28,232,103,188,64,
+  176,13,90,255,103,201,225,96,91,121,176,178,248,212,201,245,
+  171,214,172,13,139,193,182,69,197,167,118,71,168,41,99,81,
+  177,163,126,253,170,115,247,249,138,223,251,151,25,63,108,161,
+  208,39,199,12,150,173,190,60,132,167,93,12,195,3,113,249,
+  83,97,119,224,124,172,31,249,235,240,202,15,159,140,5,219,
+  44,206,19,38,231,9,112,152,230,8,173,95,133,65,9,192,
+  65,18,136,128,239,71,91,5,94,3,124,8,120,45,240,49,
+  224,111,1,159,5,110,0,222,15,188,14,248,2,240,122,60,
+  190,18,248,65,224,14,224,135,128,79,3,111,0,126,3,24,
+  110,137,57,192,27,137,210,143,0,127,7,207,29,0,126,24,
+  184,99,120,116,239,222,181,243,145,86,221,63,95,175,208,239,
+  219,184,89,95,179,107,251,206,77,122,235,35,45,219,26,119,
+  209,138,198,214,239,238,124,100,59,58,64,108,221,172,207,214,
+  87,55,110,222,190,113,199,247,244,186,214,157,223,213,189,119,
+  46,88,224,255,6,173,106,173,92,179,115,215,119,182,62,206,
+  24,179,253,11,102,47,152,255,13,162,186,168,224,93,26,213,
+  78,150,169,247,68,169,65,207,120,53,18,38,170,42,219,91,
+  74,202,30,230,215,76,237,120,164,185,240,248,158,237,185,199,
+  79,146,80,176,59,172,113,108,132,213,195,145,179,123,245,31,
+  172,13,172,13,252,246,143,59,222,169,139,82,183,94,27,124,
+  52,248,232,52,67,216,135,178,63,216,70,66,222,3,117,124,
+  85,104,27,234,163,52,175,174,135,196,223,190,177,77,119,119,
+  80,108,63,53,169,250,143,24,39,212,195,219,98,83,183,213,
+  102,186,14,221,185,59,216,38,70,161,3,176,152,90,168,145,
+  132,195,40,47,160,239,113,248,235,158,182,140,54,46,141,78,
+  117,1,55,149,182,247,191,11,188,165,145,196,191,250,75,214,
+  24,173,20,34,209,8,145,180,72,111,239,63,185,52,170,92,
+  156,178,217,249,62,9,168,223,35,66,253,57,201,168,47,144,
+  3,245,85,74,65,221,71,234,148,205,106,26,165,129,62,71,
+  233,168,63,32,9,245,159,201,137,186,159,82,225,201,124,250,
+  32,22,133,59,213,116,28,88,160,5,244,12,176,56,129,173,
+  34,144,194,80,236,139,33,92,125,68,73,226,22,36,20,25,
+  37,133,28,156,239,78,241,137,84,88,33,82,86,165,72,185,
+  179,69,74,247,139,84,118,167,72,197,115,68,202,153,43,146,
+  86,37,82,218,55,69,242,204,131,204,124,145,220,213,34,77,
+  93,32,82,102,141,72,249,11,7,84,94,127,169,251,130,205,
+  242,249,64,87,231,220,30,140,74,200,107,13,182,129,135,249,
+  93,26,77,11,106,39,201,169,105,162,65,157,44,110,115,13,
+  242,44,217,5,153,103,121,253,60,175,159,91,17,77,107,42,
+  216,141,113,165,128,58,56,72,157,26,164,62,51,41,118,247,
+  88,190,128,168,100,109,211,229,192,249,197,253,117,209,254,190,
+  121,194,185,64,221,69,34,77,203,240,146,16,136,4,246,84,
+  9,222,246,254,19,31,47,123,231,146,70,93,62,150,149,220,
+  251,209,39,6,246,124,186,172,252,49,141,124,143,105,142,130,
+  37,36,46,92,74,126,232,85,169,106,73,5,73,40,14,20,
+  185,145,84,55,178,66,95,176,141,229,136,185,175,193,191,227,
+  176,179,243,92,96,238,69,204,131,144,183,159,251,252,180,223,
+  207,118,78,255,90,29,88,137,176,249,152,222,9,254,75,140,
+  22,136,211,191,102,180,195,164,95,129,23,98,171,104,122,0,
+  59,85,173,82,156,70,26,56,202,181,190,96,139,202,33,94,
+  31,230,245,17,94,119,240,250,192,220,190,88,140,69,208,204,
+  93,72,139,240,211,140,105,93,52,245,185,165,209,212,119,91,
+  164,242,134,134,207,217,94,133,199,41,75,54,147,130,93,165,
+  45,253,148,180,251,207,196,62,129,181,57,211,251,84,149,45,
+  191,253,52,189,47,37,101,128,114,185,76,106,64,115,35,57,
+  102,66,250,193,96,91,11,45,229,51,10,11,187,119,106,173,
+  98,70,36,115,19,57,73,92,109,112,74,97,212,91,175,223,
+  255,199,88,79,188,7,178,13,188,149,206,90,214,51,42,104,
+  226,146,127,101,217,60,181,114,69,52,21,187,150,54,96,103,
+  151,2,119,191,223,7,31,52,112,159,70,235,94,112,221,192,
+  111,12,114,95,66,203,143,114,25,229,213,229,124,245,132,41,
+  182,113,176,191,19,124,13,229,44,10,178,126,44,192,124,215,
+  42,72,244,182,247,61,255,113,224,157,75,108,84,180,26,122,
+  215,34,87,96,116,226,126,148,207,192,59,115,87,51,229,147,
+  226,175,32,79,231,231,228,239,14,88,218,197,7,12,109,33,
+  169,69,6,169,102,46,34,65,148,28,178,226,84,83,92,169,
+  238,52,79,58,131,186,168,235,97,45,251,88,45,105,77,56,
+  143,206,171,203,155,105,78,216,189,6,245,189,244,154,151,210,
+  131,109,123,120,237,174,160,24,169,236,204,90,83,65,42,60,
+  203,222,195,103,188,165,180,235,128,47,178,252,101,114,52,105,
+  126,31,137,119,25,228,184,107,55,22,146,43,216,134,182,194,
+  218,252,233,254,248,211,92,90,52,251,59,182,65,222,96,210,
+  238,109,56,168,196,237,27,151,111,131,228,6,120,224,221,82,
+  179,16,52,121,25,13,191,124,225,172,213,24,41,90,229,91,
+  244,37,168,239,5,47,148,3,94,185,187,153,158,164,242,29,
+  174,133,187,25,102,252,186,11,84,138,136,148,179,197,18,118,
+  212,245,8,236,248,35,182,223,124,60,187,23,119,160,116,145,
+  80,130,125,95,162,243,72,167,32,10,220,47,236,203,104,236,
+  3,48,41,216,181,190,153,92,91,193,131,61,87,193,54,202,
+  164,212,112,6,244,186,143,249,40,99,155,170,52,99,155,184,
+  131,109,171,241,180,37,145,69,169,160,220,160,50,40,13,231,
+  241,208,231,179,108,207,103,239,80,29,67,159,103,79,101,179,
+  167,120,180,5,22,47,155,230,28,150,201,135,233,3,47,236,
+  65,108,220,137,186,144,113,124,84,16,86,150,87,64,211,106,
+  212,90,152,201,24,164,133,238,230,56,99,91,46,228,50,160,
+  37,151,50,195,126,140,69,165,44,177,153,22,81,150,222,76,
+  57,240,50,107,14,114,132,230,163,188,238,205,204,231,176,187,
+  163,110,139,216,66,11,145,11,131,109,11,97,131,97,88,209,
+  45,43,65,212,133,150,149,194,144,193,113,49,183,82,12,43,
+  69,84,18,246,113,43,58,183,162,195,10,155,35,221,178,82,
+  28,216,211,221,104,173,93,229,163,186,144,216,74,111,55,147,
+  178,176,142,242,97,5,250,183,206,196,138,113,99,180,51,195,
+  249,91,197,187,141,183,64,225,249,153,3,235,253,110,227,39,
+  205,76,22,82,218,28,31,121,14,50,73,117,203,24,146,188,
+  253,44,155,243,213,140,58,234,175,249,162,244,88,251,23,133,
+  219,107,120,94,58,26,194,14,38,65,239,65,233,69,185,144,
+  12,93,31,85,222,126,66,42,127,200,247,80,195,143,176,59,
+  213,251,223,140,93,194,185,18,141,157,240,215,244,190,126,46,
+  96,174,43,220,241,114,177,230,100,156,47,233,97,35,228,182,
+  232,139,225,170,158,64,70,5,203,249,222,246,222,151,173,179,
+  160,153,42,77,207,155,114,63,198,218,20,223,96,57,60,195,
+  135,83,99,79,71,29,102,67,9,182,205,169,165,213,7,233,
+  96,123,239,166,143,151,65,226,69,191,95,179,36,186,44,137,
+  22,210,219,123,87,250,23,176,147,224,28,206,188,233,93,44,
+  63,99,229,227,244,249,52,208,245,187,222,42,158,239,15,232,
+  6,56,18,243,171,73,108,81,186,218,175,116,207,101,252,95,
+  172,136,42,237,171,162,202,188,123,112,106,222,129,251,12,125,
+  176,238,223,153,252,138,207,105,222,170,63,147,198,249,47,128,
+  127,122,4,254,113,240,127,109,69,63,119,132,254,211,232,255,
+  49,124,169,185,114,132,207,196,211,199,218,175,68,118,176,117,
+  206,91,188,39,178,181,12,220,199,118,168,92,226,176,213,119,
+  152,183,246,139,187,112,213,2,14,182,97,23,199,216,140,2,
+  247,55,185,205,243,165,145,190,56,196,57,87,155,92,115,163,
+  87,202,216,41,21,234,68,187,175,41,203,95,115,69,223,250,
+  170,169,11,125,89,166,22,172,183,170,176,130,108,85,21,108,
+  131,109,185,51,187,201,205,253,127,26,119,204,135,131,109,122,
+  251,229,143,52,45,139,157,206,75,80,11,136,87,172,179,79,
+  136,116,177,177,189,194,35,217,49,211,152,83,115,249,119,175,
+  247,145,242,167,215,48,130,89,36,50,191,214,80,96,111,215,
+  18,182,143,10,12,150,221,47,159,54,179,251,242,89,36,52,
+  101,185,51,41,198,246,125,252,20,12,182,205,216,29,3,144,
+  27,26,112,79,192,108,250,161,45,179,43,139,217,12,44,97,
+  218,10,182,226,58,35,161,118,144,3,181,76,50,164,42,217,
+  90,161,231,134,175,21,148,124,110,27,55,97,74,65,203,53,
+  203,32,55,138,6,58,11,184,16,88,71,41,71,241,153,25,
+  56,236,96,57,24,180,139,102,98,55,207,193,110,158,70,115,
+  177,103,243,63,15,224,174,32,148,29,198,115,57,224,78,37,
+  205,204,39,45,108,71,151,152,189,51,115,208,91,10,126,33,
+  21,154,121,0,35,139,177,83,41,157,60,222,180,144,251,104,
+  106,79,170,225,58,226,162,148,22,181,71,221,228,188,232,140,
+  56,179,148,99,74,131,124,73,62,42,175,148,201,113,194,177,
+  211,81,37,245,74,157,210,126,105,157,228,21,123,197,46,241,
+  69,49,34,110,16,107,197,66,161,79,232,22,254,32,188,44,
+  28,18,118,11,155,132,181,130,33,84,10,197,130,7,103,206,
+  69,250,136,206,98,15,159,162,87,233,37,58,74,207,208,191,
+  210,83,56,35,30,167,71,105,43,61,66,223,166,7,233,91,
+  212,64,43,168,158,150,98,5,213,226,134,252,77,154,67,179,
+  9,103,7,121,105,6,77,199,72,75,216,25,141,59,174,31,
+  249,172,1,23,244,22,156,84,29,208,118,12,119,195,46,234,
+  134,149,107,245,95,68,221,133,214,49,112,59,208,139,237,15,
+  73,204,36,158,210,240,244,181,250,175,87,255,237,14,79,97,
+  222,158,161,159,209,175,232,55,244,111,244,123,250,79,122,147,
+  254,68,31,210,121,250,11,93,193,90,114,226,174,54,21,243,
+  116,7,102,110,62,230,177,158,238,163,127,192,236,134,105,7,
+  125,15,243,253,36,234,29,104,125,27,220,251,208,187,24,82,
+  179,33,93,130,167,210,241,116,12,90,254,2,109,31,66,235,
+  155,208,254,123,88,249,13,172,253,204,90,49,215,154,239,221,
+  180,141,54,208,74,172,31,31,86,185,155,250,232,2,189,71,
+  255,69,39,233,101,122,150,14,64,62,23,210,245,88,109,91,
+  232,49,250,62,252,249,62,240,22,180,235,193,207,69,255,121,
+  216,61,65,191,164,159,210,63,211,94,216,219,11,252,83,180,
+  79,128,127,158,143,96,172,191,200,53,254,126,69,255,68,167,
+  225,221,124,232,250,37,172,254,156,254,151,62,198,136,30,132,
+  23,243,232,255,168,149,214,209,62,122,159,94,135,220,78,140,
+  248,77,250,111,250,49,168,117,244,22,98,115,132,4,111,14,
+  178,116,252,171,169,224,93,137,246,39,182,246,94,180,47,219,
+  218,39,80,148,27,53,253,194,132,158,154,200,235,45,89,47,
+  169,227,5,117,66,79,209,15,233,69,100,167,11,130,71,240,
+  11,171,133,157,194,225,17,254,78,8,239,10,125,98,177,104,
+  224,111,163,184,79,124,65,60,35,126,38,126,38,185,165,74,
+  169,65,106,149,14,73,199,165,119,164,168,163,208,177,200,17,
+  114,236,117,60,239,56,237,232,145,93,178,79,14,202,45,242,
+  65,249,85,249,172,220,171,228,43,181,202,63,42,17,229,23,
+  202,31,148,79,156,170,249,119,223,146,101,15,212,5,47,145,
+  180,207,116,7,113,246,179,82,13,74,48,7,165,179,119,199,
+  94,242,88,89,68,232,228,239,250,186,129,3,71,160,208,128,
+  68,202,37,114,14,132,160,27,187,130,200,48,216,131,86,96,
+  84,246,154,75,202,43,150,142,8,231,170,76,135,68,157,138,
+  96,74,184,245,65,29,120,63,95,204,138,41,97,250,161,224,
+  24,112,247,165,158,176,172,68,120,94,211,140,65,79,5,29,
+  231,158,203,77,210,134,65,43,131,126,136,100,56,44,63,220,
+  238,184,167,22,24,124,228,161,129,121,76,119,51,237,156,29,
+  235,54,179,167,78,46,205,33,24,78,172,168,144,140,202,146,
+  208,249,135,4,63,43,126,82,177,220,67,138,72,138,46,73,
+  131,18,42,151,224,158,86,147,148,229,1,7,222,232,16,163,
+  75,166,68,36,190,184,241,170,84,136,14,214,169,75,113,43,
+  67,36,156,126,133,233,136,145,193,196,202,98,150,4,243,148,
+  207,75,53,57,188,25,2,27,173,105,165,108,64,7,3,127,
+  12,193,168,37,201,231,229,157,166,4,37,140,165,154,68,31,
+  198,2,79,37,93,198,52,151,73,54,29,28,170,200,81,86,
+  72,17,153,89,113,218,61,101,122,116,83,34,213,171,10,134,
+  204,230,133,69,44,119,64,98,112,83,86,147,83,55,199,34,
+  135,120,60,98,195,173,192,83,183,148,24,15,157,111,81,205,
+  180,226,244,41,214,236,43,16,189,36,13,143,24,226,225,19,
+  185,132,24,81,134,250,97,74,9,152,102,67,229,126,148,242,
+  185,29,18,49,203,74,138,223,33,68,28,220,202,144,209,34,
+  234,106,12,170,171,200,227,175,226,115,43,25,178,125,110,109,
+  163,85,10,71,28,139,20,183,162,90,99,145,116,121,104,76,
+  173,21,228,35,169,80,165,78,60,225,176,251,129,120,92,197,
+  115,253,160,171,4,143,223,48,117,216,215,233,24,171,48,119,
+  64,135,56,176,130,106,73,206,85,205,253,194,230,69,24,180,
+  162,12,220,37,170,200,141,85,24,194,196,143,16,15,46,225,
+  21,60,122,42,177,165,225,8,13,137,58,219,149,220,138,65,
+  106,153,71,8,57,89,76,5,153,148,65,63,4,129,6,86,
+  114,10,254,116,153,197,67,148,121,20,44,29,18,159,36,166,
+  99,58,77,23,35,146,181,247,23,199,247,11,252,72,7,149,
+  110,128,237,20,13,110,5,171,70,200,183,175,211,197,196,51,
+  76,26,165,9,102,30,147,101,90,56,100,239,115,29,181,236,
+  82,77,196,71,43,58,108,163,117,196,104,32,7,185,25,151,
+  13,212,176,86,222,128,149,208,128,21,137,60,20,146,56,71,
+  38,79,60,98,98,8,225,68,72,113,49,39,197,244,131,73,
+  200,131,126,136,146,153,160,140,90,76,35,94,157,205,140,235,
+  32,41,30,211,254,110,115,223,226,10,79,26,14,9,140,246,
+  40,153,135,102,60,98,121,160,242,112,73,167,28,33,34,90,
+  81,95,60,68,194,242,84,102,31,107,185,21,209,30,83,138,
+  13,102,237,50,42,227,158,202,161,161,58,224,215,34,212,139,
+  12,24,203,23,248,194,101,243,178,40,30,83,33,52,160,195,
+  69,46,211,83,172,60,156,66,107,214,7,215,6,26,234,150,
+  174,208,169,63,189,92,232,79,175,74,233,103,159,133,211,13,
+  41,150,110,56,174,162,128,150,89,233,75,55,20,180,113,227,
+  51,84,208,46,208,169,160,221,40,105,40,30,148,244,190,116,
+  186,77,65,224,235,232,18,223,176,12,48,23,10,187,70,169,
+  86,73,67,27,251,151,108,3,228,183,172,129,75,62,22,168,
+  146,10,236,234,101,5,235,242,106,207,144,246,20,172,228,12,
+  180,51,45,249,129,118,150,213,206,70,59,7,120,170,213,206,
+  189,156,35,231,225,114,156,111,181,11,82,73,46,196,245,182,
+  200,106,23,243,54,13,182,11,82,37,180,99,182,126,214,150,
+  108,253,50,218,194,96,187,132,88,91,30,108,15,140,135,38,
+  219,147,237,191,205,246,36,220,194,48,205,152,129,58,70,51,
+  146,228,148,24,51,134,171,224,144,201,249,249,70,92,198,206,
+  177,107,27,155,83,48,138,254,209,192,174,231,118,4,205,192,
+  189,102,157,253,117,218,226,36,202,112,240,48,122,125,162,30,
+  59,223,164,109,245,252,4,201,81,57,233,140,174,143,241,79,
+  52,127,15,144,109,8,35,210,83,12,101,68,126,133,17,255,
+  94,82,98,72,35,202,23,26,242,4,244,155,181,93,255,223,
+  3,20,122,203,190,110,23,174,11,10,110,115,255,167,84,179,
+  143,253,69,188,46,224,117,46,175,115,120,157,101,163,77,254,
+  120,229,77,186,148,215,186,237,89,179,55,207,166,167,104,66,
+  242,166,63,163,130,193,170,24,21,223,144,88,221,12,152,98,
+  20,12,203,198,99,75,38,202,143,205,225,116,117,210,250,171,
+  19,229,199,230,140,230,127,140,10,146,49,58,46,184,25,58,
+  115,109,57,57,25,201,68,249,177,57,95,141,254,228,173,220,
+  106,160,27,133,252,19,83,28,74,18,56,118,153,162,132,222,
+  177,161,52,65,190,44,129,99,151,153,193,233,196,218,222,91,
+  150,224,79,140,10,147,119,233,150,130,172,219,252,252,202,184,
+  205,253,207,171,46,26,70,199,236,223,134,190,114,40,246,142,
+  108,189,208,63,50,127,234,45,230,191,29,166,234,113,79,166,
+  218,198,53,213,54,150,124,191,237,110,175,57,7,233,41,122,
+  252,126,94,100,227,151,84,199,255,149,117,150,30,191,231,219,
+  245,20,85,75,35,242,175,75,127,245,40,250,171,111,111,253,
+  51,252,211,72,232,140,209,52,208,62,208,252,215,199,195,96,
+  6,231,155,50,229,73,200,36,163,199,14,118,157,94,27,125,
+  135,73,243,119,243,233,54,126,177,141,78,194,174,118,179,253,
+  191,99,20,249,100,32,77,47,157,216,131,147,112,67,64,53,
+  166,99,2,191,110,47,38,225,102,65,138,17,127,103,17,108,
+  180,58,10,255,86,147,191,217,48,154,93,101,156,126,126,93,
+  242,183,218,124,141,87,222,62,46,251,251,245,36,255,171,225,
+  219,193,57,138,140,56,10,127,82,254,70,200,231,209,205,4,
+  209,24,249,253,52,70,55,230,189,85,171,102,119,239,84,179,
+  246,243,218,203,107,157,215,185,206,49,159,190,54,184,109,95,
+  150,242,141,248,221,62,223,118,207,207,247,219,104,175,141,214,
+  175,253,139,212,28,99,248,109,118,108,200,230,242,137,119,224,
+  209,32,119,156,250,111,53,200,231,254,123,108,163,240,140,51,
+  2,99,131,61,47,217,247,139,157,47,142,194,159,148,191,126,
+  121,251,247,219,34,246,187,204,33,28,59,223,132,204,219,124,
+  61,223,106,224,52,198,151,255,175,231,188,200,180,229,79,59,
+  109,7,205,198,215,70,145,113,219,248,37,183,249,247,79,143,
+  49,107,24,103,74,2,39,219,198,49,123,51,19,100,254,86,
+  161,172,122,130,255,211,34,73,200,247,231,12,227,20,37,112,
+  166,217,56,102,111,73,130,204,36,76,12,166,217,190,133,218,
+  105,59,148,112,190,89,15,249,54,107,216,105,97,68,250,246,
+  5,15,207,114,86,205,111,155,30,126,207,244,240,91,165,71,
+  155,216,255,118,26,14,5,134,62,236,215,86,55,86,39,167,
+  235,111,130,126,75,167,206,232,164,126,63,144,60,216,117,114,
+  250,38,254,196,46,183,58,155,216,169,154,61,140,206,172,206,
+  27,140,225,104,50,147,242,215,47,159,195,115,197,44,47,251,
+  213,89,134,206,242,73,46,255,151,157,98,190,239,42,249,191,
+  224,204,210,227,189,166,188,41,99,114,204,103,77,121,187,30,
+  243,217,107,232,247,202,195,122,175,161,223,63,78,253,185,227,
+  244,127,188,250,245,36,252,215,199,138,79,73,18,249,167,36,
+  137,28,82,50,60,231,44,27,91,254,122,192,174,63,25,255,
+  237,144,204,88,18,228,199,161,191,108,156,249,176,132,221,36,
+  175,25,255,89,73,196,63,46,147,140,206,164,245,220,0,157,
+  19,3,243,203,216,255,3,140,180,168,124,74,82,0,0,
+};
+/* fc13_14 data */
+static const unsigned char dat_fc13_14 = {
+  31,139,8,0,0,0,0,0,0,3,237,87,123,76,91,215,
+  25,255,221,235,107,251,66,47,96,59,148,135,67,136,177,44,
+  231,150,242,48,15,5,180,65,114,205,163,60,2,212,129,164,
+  202,82,84,57,109,122,237,80,69,162,8,178,12,209,96,39,
+  90,211,165,105,134,210,108,75,163,110,178,180,42,66,213,84,
+  161,170,141,178,170,138,12,235,104,182,106,155,235,32,2,234,
+  164,146,108,210,156,74,153,208,52,77,204,66,176,207,151,112,
+  182,120,93,175,54,109,210,254,224,67,231,124,191,115,126,231,
+  252,190,239,188,46,224,7,170,253,128,201,15,110,173,233,167,
+  248,124,249,170,86,95,211,234,89,173,158,175,89,69,14,249,
+  239,55,39,197,234,38,107,207,8,249,82,223,167,205,9,28,
+  149,38,250,186,159,108,9,8,205,247,224,235,78,138,238,178,
+  239,56,219,111,37,32,150,119,64,208,144,133,144,168,161,2,
+  66,146,67,134,16,90,69,22,205,149,91,147,25,246,161,140,
+  218,69,215,226,220,42,50,247,255,98,253,47,78,49,62,9,
+  71,91,82,92,115,79,159,16,135,81,187,45,126,58,126,250,
+  64,120,126,21,146,123,122,255,39,235,203,52,231,244,70,76,
+  181,168,45,105,165,140,178,135,134,42,92,133,115,175,186,102,
+  92,139,181,139,253,157,164,243,39,191,51,149,155,187,253,118,
+  2,174,161,39,135,225,250,36,183,176,118,166,233,112,237,76,
+  127,231,252,204,252,12,141,249,163,99,212,124,114,24,185,50,
+  36,85,200,109,128,161,59,105,238,109,56,221,216,4,158,80,
+  75,211,83,155,107,174,89,53,135,200,95,57,133,40,229,61,
+  102,240,38,141,107,205,73,115,87,107,210,44,151,116,32,147,
+  138,173,41,8,161,106,12,89,48,17,18,155,38,145,109,29,
+  3,135,124,173,46,104,146,81,72,125,118,226,138,201,187,201,
+  151,146,47,163,226,33,92,127,2,213,246,221,182,151,87,97,
+  56,9,243,71,85,45,112,236,182,243,103,0,172,243,225,84,
+  221,253,87,138,31,249,237,116,217,135,212,66,227,24,7,8,
+  141,99,4,77,90,45,150,244,160,193,241,129,233,237,146,81,
+  211,85,212,126,58,137,218,219,84,62,159,184,61,225,246,217,
+  182,109,104,220,239,144,71,77,231,23,166,75,186,224,180,190,
+  64,89,149,81,205,35,207,155,64,231,254,95,175,215,247,140,
+  236,75,154,122,58,143,67,84,249,158,145,190,227,16,212,210,
+  175,31,135,9,194,40,198,76,180,230,204,35,192,10,249,46,
+  242,203,228,47,144,79,144,143,145,95,106,58,168,229,8,111,
+  82,184,123,4,92,188,92,193,85,226,28,132,103,9,95,35,
+  252,12,225,15,8,207,18,126,147,240,59,132,231,105,252,187,
+  206,32,90,226,9,40,174,32,46,204,37,112,206,29,196,194,
+  124,2,115,114,144,115,46,36,184,226,106,25,77,181,50,206,
+  239,150,49,95,47,115,142,65,126,20,123,30,69,91,8,53,
+  31,167,206,135,52,174,237,177,4,44,125,190,27,138,154,233,
+  249,54,221,178,72,163,23,111,81,127,226,161,254,78,76,209,
+  233,190,71,241,237,15,245,239,67,180,177,25,31,165,214,246,
+  80,127,23,98,141,45,152,235,25,161,12,157,148,161,44,89,
+  209,17,200,148,130,80,32,171,64,111,85,43,100,151,143,114,
+  54,189,159,64,173,106,162,182,201,229,107,75,26,197,33,174,
+  119,155,180,13,70,213,146,23,182,149,66,10,136,117,94,240,
+  84,4,155,221,122,152,246,254,48,242,238,31,115,142,10,201,
+  248,52,221,31,167,41,152,186,59,182,199,192,89,10,85,145,
+  247,34,26,200,243,11,164,87,111,109,69,165,200,193,28,48,
+  89,143,209,121,85,242,10,198,3,192,128,85,129,104,179,90,
+  189,200,160,125,113,156,61,88,243,179,212,94,208,204,189,113,
+  25,121,174,81,97,242,254,177,185,105,82,176,88,123,233,30,
+  30,70,193,16,180,216,219,233,78,42,168,160,222,34,106,237,
+  160,82,92,210,137,76,154,49,148,154,65,216,70,179,170,41,
+  110,33,21,251,129,32,228,158,145,83,232,148,97,15,136,125,
+  84,211,119,226,101,218,17,27,237,72,53,237,200,157,0,184,
+  19,22,171,68,183,64,205,77,173,32,149,67,149,23,213,218,
+  152,105,141,185,171,62,65,167,232,56,115,176,102,58,149,229,
+  32,44,52,174,35,105,44,184,215,190,16,165,243,110,112,22,
+  185,195,37,94,180,212,245,67,40,57,0,133,222,146,1,237,
+  85,109,148,189,246,142,40,139,212,55,106,141,180,126,175,122,
+  54,231,11,11,95,61,255,193,172,155,52,235,30,157,215,179,
+  95,150,131,112,41,165,225,58,32,93,233,235,235,246,169,187,
+  59,190,224,20,218,169,199,192,223,235,152,155,94,140,167,212,
+  221,231,119,13,64,32,229,46,180,148,12,208,155,80,254,158,
+  217,70,164,167,82,145,158,161,56,127,80,237,27,202,247,131,
+  206,81,131,35,30,77,125,29,104,52,229,177,54,71,252,23,
+  170,141,206,145,131,160,157,166,81,155,231,166,254,132,154,173,
+  245,219,55,114,94,187,40,21,226,119,170,148,226,173,223,160,
+  51,219,143,162,205,61,39,252,120,47,245,211,137,20,106,39,
+  82,72,107,60,79,173,28,181,159,90,249,234,41,107,16,5,
+  200,167,241,153,52,222,162,157,192,157,64,240,31,162,103,107,
+  209,115,72,221,226,151,181,232,18,197,181,104,92,161,127,143,
+  118,150,158,212,42,232,182,237,125,26,85,10,141,155,122,66,
+  134,59,224,164,8,57,54,25,217,183,100,148,15,228,14,129,
+  110,96,14,149,114,191,72,121,149,83,94,22,139,140,199,95,
+  16,99,50,82,165,108,104,60,26,110,78,242,238,152,82,141,
+  120,212,99,45,150,81,65,185,22,7,76,164,84,236,239,29,
+  54,218,185,2,25,69,11,2,169,238,232,52,15,152,68,51,
+  160,58,140,102,85,186,40,99,251,81,155,241,227,33,248,37,
+  186,213,219,223,21,158,23,140,103,109,2,197,219,113,87,186,
+  40,28,21,4,47,7,147,17,145,231,197,184,151,124,193,209,
+  149,152,55,211,12,206,218,134,10,202,119,87,128,50,36,221,
+  202,128,36,113,216,249,156,137,238,230,206,22,47,49,165,129,
+  2,202,194,24,176,81,22,70,109,140,48,192,183,135,95,167,
+  175,113,140,138,164,96,240,89,193,211,128,23,37,37,203,255,
+  28,161,44,127,187,66,43,43,239,25,193,150,253,39,102,161,
+  119,226,160,183,227,65,70,58,197,109,184,59,166,41,147,207,
+  248,103,99,196,216,101,132,112,93,24,22,106,13,43,134,168,
+  225,156,225,144,65,230,147,124,140,191,202,135,248,126,254,107,
+  188,157,91,229,150,184,159,115,63,225,46,113,47,113,65,174,
+  143,83,184,10,110,7,151,133,53,44,227,46,230,241,75,220,
+  192,123,120,27,17,252,0,223,197,89,140,227,36,94,252,87,
+  63,89,126,41,242,72,226,17,37,243,114,38,50,6,197,132,
+  24,52,47,155,67,230,92,123,180,80,201,143,229,133,30,245,
+  228,194,182,100,141,89,98,57,75,57,200,150,255,231,121,110,
+  217,150,109,217,150,109,217,255,175,89,30,20,7,67,10,67,
+  126,134,66,12,69,24,138,50,180,180,137,56,166,199,49,61,
+  142,233,113,76,143,99,122,28,211,227,152,30,199,244,120,166,
+  199,51,61,158,233,241,76,143,103,122,60,211,227,153,30,207,
+  244,12,76,207,192,244,12,76,207,192,244,12,76,207,192,244,
+  12,76,207,192,244,4,250,175,21,90,17,44,12,57,24,242,
+  48,164,48,228,99,200,207,208,32,67,44,174,16,97,125,83,
+  172,47,198,208,242,38,107,100,25,24,45,244,215,50,180,178,
+  101,255,21,139,70,99,11,75,137,229,21,172,44,39,150,22,
+  98,55,247,214,85,238,218,153,159,99,94,55,231,228,239,220,
+  85,89,151,206,71,245,248,235,122,252,148,30,63,169,199,71,
+  244,248,203,122,252,132,30,255,138,30,31,210,227,95,209,227,
+  39,244,248,203,122,124,68,143,159,212,227,167,234,194,105,54,
+  158,102,233,124,250,128,127,226,195,122,124,88,143,15,235,241,
+  97,61,62,172,199,135,245,248,176,30,31,214,227,195,122,124,
+  88,143,15,235,241,169,1,161,175,52,61,62,196,248,205,245,
+  166,53,199,211,154,227,105,205,241,180,230,120,90,115,60,173,
+  249,37,109,237,30,94,143,222,124,112,79,69,75,129,67,246,
+  212,43,237,190,67,254,224,32,241,145,169,104,108,105,25,22,
+  135,71,241,249,7,91,91,191,245,210,232,55,7,213,35,135,
+  250,186,203,28,5,54,225,179,91,191,154,253,240,253,119,38,
+  127,252,195,55,94,191,240,234,185,77,254,233,125,205,117,26,
+  191,146,248,236,55,179,55,166,38,223,250,209,149,239,93,122,
+  237,12,253,234,247,143,251,21,7,150,162,145,80,36,186,148,
+  222,254,119,243,249,27,113,32,208,109,146,23,0,0,
+};
+/* fireice data */
+static const unsigned char dat_fireice = {
+  31,139,8,0,0,0,0,0,0,3,237,87,15,108,27,229,
+  21,127,119,118,108,199,117,147,75,128,172,180,144,94,76,154,
+  149,144,58,103,147,150,107,231,166,103,231,98,187,38,57,218,
+  38,116,107,65,200,110,19,59,164,173,107,220,184,152,146,149,
+  164,64,135,24,84,29,170,58,166,33,13,117,19,234,160,139,
+  50,168,80,196,74,149,116,21,74,217,212,57,129,133,174,48,
+  82,216,70,11,170,58,132,170,18,220,164,222,239,59,59,80,
+  138,246,7,109,210,180,169,159,245,251,222,187,119,239,123,223,
+  247,222,247,190,247,157,67,100,44,215,146,90,210,177,132,180,
+  232,133,26,191,54,70,87,219,213,118,181,93,109,122,107,206,
+  208,112,99,230,98,38,28,138,172,110,206,92,28,125,117,56,
+  34,56,150,76,150,133,137,158,96,52,68,244,72,77,160,42,
+  216,152,153,26,11,187,35,46,71,53,213,224,93,220,113,139,
+  78,59,196,78,90,1,89,29,248,152,99,201,197,195,81,83,
+  141,127,65,128,140,120,207,100,1,45,9,171,111,122,247,106,
+  201,106,205,81,126,248,208,154,230,150,214,40,175,37,235,203,
+  15,119,247,80,164,180,190,220,232,95,211,252,151,59,106,202,
+  223,121,114,222,206,56,133,62,232,87,88,181,186,184,7,163,
+  173,140,98,5,124,240,123,81,91,224,116,246,18,234,215,222,
+  166,241,135,178,90,50,47,217,158,147,108,135,132,89,238,161,
+  53,205,112,138,3,213,136,35,2,93,137,103,43,104,11,232,
+  51,160,173,160,253,160,119,130,30,7,253,54,232,159,64,87,
+  128,238,6,253,14,134,243,160,107,48,237,86,208,181,160,31,
+  129,222,69,100,96,118,238,6,157,5,138,229,25,14,128,174,
+  35,178,137,160,235,49,126,15,104,27,232,211,87,70,217,119,
+  111,162,93,244,196,218,196,229,235,219,197,68,123,124,99,248,
+  1,10,134,183,108,142,137,43,194,209,118,177,86,244,39,194,
+  145,46,255,230,141,109,226,124,231,226,197,174,155,169,57,225,
+  104,233,122,96,253,134,148,56,255,86,169,86,146,107,23,203,
+  55,211,42,125,164,152,220,210,222,38,110,233,216,156,232,18,
+  195,109,109,9,135,120,111,108,75,87,194,65,158,12,191,191,
+  33,83,116,180,49,67,199,165,217,174,217,81,71,255,138,200,
+  5,91,7,63,139,248,232,57,91,71,230,122,208,15,64,231,
+  146,49,250,174,254,108,140,142,217,58,30,131,139,209,227,82,
+  111,107,224,151,199,54,29,129,149,117,176,178,189,210,2,59,
+  59,196,210,131,61,209,166,202,29,118,50,245,50,79,171,132,
+  151,123,54,217,94,238,141,89,246,246,140,237,16,31,110,13,
+  176,81,155,207,96,84,77,67,230,117,171,88,56,178,223,88,
+  7,200,192,30,96,31,208,15,28,30,217,111,86,70,246,23,
+  62,11,77,94,116,107,247,105,247,85,40,124,41,176,13,176,
+  3,199,43,20,26,5,198,156,10,157,116,118,107,73,58,11,
+  24,10,46,241,50,239,16,100,193,81,50,120,163,82,50,81,
+  114,174,100,242,198,110,81,22,29,98,74,140,137,3,98,95,
+  197,224,2,165,98,104,129,167,98,120,65,160,226,216,130,229,
+  118,217,238,176,167,236,49,231,224,82,197,57,180,212,227,124,
+  123,233,93,206,143,151,198,157,19,75,99,206,201,165,221,46,
+  217,229,240,202,94,135,55,229,141,5,83,193,88,75,170,37,
+  214,43,247,58,134,228,33,71,58,149,142,165,7,210,125,35,
+  169,145,216,200,192,72,95,201,208,141,158,82,185,212,81,46,
+  151,59,36,89,114,120,38,60,231,252,19,254,115,193,129,96,
+  31,219,89,79,134,171,203,121,195,86,204,55,53,100,232,2,
+  226,230,66,122,8,224,39,193,7,193,27,181,164,125,246,134,
+  89,198,94,248,51,57,250,88,101,225,158,222,42,207,109,221,
+  97,202,94,90,180,35,244,103,230,231,76,13,184,27,232,0,
+  186,200,80,180,15,232,3,206,0,231,179,104,100,40,190,155,
+  209,230,204,240,190,22,101,25,217,183,77,61,27,38,238,57,
+  201,77,31,135,201,240,136,52,55,68,188,149,157,233,225,29,
+  158,12,253,104,69,58,68,92,135,184,109,106,43,86,178,189,
+  228,94,118,50,208,227,92,160,231,169,0,189,129,140,232,141,
+  84,136,190,128,44,232,77,52,19,189,153,138,209,91,200,128,
+  190,144,204,232,173,52,3,253,12,186,6,189,141,74,133,155,
+  105,230,6,139,119,62,9,37,10,149,104,201,101,230,122,58,
+  117,7,102,45,43,233,137,83,253,92,45,9,222,90,18,243,
+  157,39,51,188,187,162,21,157,43,250,198,204,102,219,174,25,
+  127,152,81,107,221,85,248,105,97,212,114,202,18,54,159,49,
+  223,111,158,97,122,206,228,47,56,91,240,195,2,191,241,162,
+  241,37,99,220,40,25,206,27,126,101,120,212,208,98,184,137,
+  191,192,255,134,255,41,255,93,126,45,114,98,22,151,225,254,
+  200,253,154,251,57,247,3,238,65,174,157,91,201,213,115,11,
+  184,27,56,27,77,209,57,122,143,222,164,97,122,149,94,162,
+  253,244,19,218,75,187,104,39,109,167,251,41,78,157,212,70,
+  247,208,26,106,165,59,232,118,242,83,3,45,163,111,145,76,
+  11,201,69,181,84,67,213,244,77,154,71,55,81,5,205,69,
+  116,247,121,229,204,245,21,147,100,48,165,185,58,203,4,21,
+  100,204,122,127,77,201,36,93,200,204,69,111,206,92,143,157,
+  239,158,202,90,6,32,47,14,156,30,26,196,110,72,97,42,
+  112,53,141,27,30,214,182,224,151,20,151,7,78,147,84,49,
+  172,214,219,3,149,203,91,3,163,39,42,142,169,62,123,80,
+  167,193,60,213,242,116,85,158,174,246,79,168,235,92,110,50,
+  179,231,170,99,43,143,101,39,32,217,241,101,73,94,119,109,
+  158,222,211,52,110,35,246,197,87,75,137,172,115,72,77,3,
+  71,128,163,105,69,76,169,171,92,18,14,187,135,216,155,147,
+  222,148,122,2,178,117,76,6,186,35,61,116,211,48,25,108,
+  38,240,145,188,108,103,94,102,5,223,153,151,61,158,151,21,
+  129,143,229,101,187,242,178,210,68,54,110,240,100,10,45,13,
+  25,203,133,138,229,196,123,59,72,65,150,120,129,6,240,42,
+  168,15,240,131,175,115,122,72,242,156,33,109,229,112,118,84,
+  243,107,141,225,58,68,115,153,250,124,152,204,53,154,207,55,
+  46,206,117,14,170,105,45,153,86,18,176,105,57,136,186,48,
+  109,203,167,143,59,150,61,135,60,155,120,140,196,67,51,144,
+  85,226,33,155,222,207,212,123,139,222,23,234,61,14,5,98,
+  18,56,45,136,108,30,248,61,6,140,122,101,245,133,120,22,
+  115,28,97,243,0,195,192,235,192,111,129,227,193,1,181,62,
+  90,217,152,177,184,183,34,105,112,134,207,195,39,251,60,230,
+  83,39,169,141,31,145,182,170,193,214,64,198,77,239,179,181,
+  54,141,27,45,200,2,133,152,189,81,96,76,75,150,12,169,
+  99,37,131,234,91,90,18,207,39,35,101,44,254,146,172,166,
+  211,138,196,118,33,167,171,239,2,91,155,68,149,84,197,37,
+  216,76,149,1,175,196,39,56,112,179,37,67,130,7,45,13,
+  52,128,51,128,179,52,141,147,77,75,194,211,108,212,107,243,
+  144,33,230,222,196,39,248,35,147,164,121,50,230,221,233,33,
+  123,74,93,157,160,82,26,245,184,156,130,190,215,47,34,214,
+  237,101,136,118,157,75,159,245,212,114,240,46,68,83,210,146,
+  113,220,156,82,53,185,162,150,22,101,161,66,46,253,73,98,
+  214,35,184,165,93,213,212,228,153,64,92,122,4,130,215,38,
+  111,53,213,130,86,2,243,129,42,160,6,176,0,86,32,152,
+  200,46,196,158,2,139,0,25,88,2,184,113,157,194,158,158,
+  127,65,41,151,47,90,122,112,94,128,224,89,65,41,59,39,
+  204,255,250,250,96,74,77,111,32,174,175,5,17,233,68,93,
+  115,78,168,39,213,19,141,25,211,43,91,233,214,207,136,212,
+  163,192,107,45,213,228,195,219,109,215,117,226,236,250,36,67,
+  90,73,43,168,194,47,139,113,34,172,93,143,237,117,10,53,
+  156,10,232,94,88,157,147,217,172,202,42,225,106,60,95,138,
+  8,66,53,53,176,40,164,153,191,74,232,48,164,147,145,50,
+  105,49,179,109,83,178,217,232,187,183,98,4,155,45,116,2,
+  239,166,34,55,92,246,206,250,249,187,67,173,157,24,221,163,
+  123,181,54,239,213,61,233,65,88,247,50,235,2,36,24,253,
+  89,123,110,21,54,68,206,171,143,160,172,198,228,17,203,42,
+  72,240,109,243,162,190,42,251,244,184,85,74,41,70,190,231,
+  201,81,68,175,102,117,78,239,241,32,117,218,160,241,80,93,
+  143,62,114,47,242,219,20,189,22,146,101,240,214,15,248,114,
+  22,179,219,153,29,151,161,142,164,82,155,66,169,168,53,76,
+  83,163,122,190,40,18,159,134,247,224,91,55,241,241,86,248,
+  175,166,21,228,176,33,82,102,84,104,22,42,118,128,121,18,
+  38,163,128,204,28,12,9,158,76,102,53,179,198,164,208,174,
+  102,51,92,150,249,116,169,171,105,188,27,247,222,165,169,139,
+  244,233,95,199,241,229,100,36,139,32,230,171,60,119,129,251,
+  144,123,135,251,29,119,148,123,133,235,227,126,198,61,195,237,
+  225,158,224,30,225,186,185,46,46,198,69,89,130,127,185,177,
+  44,136,83,2,133,90,144,213,55,202,101,245,173,82,89,29,
+  139,206,234,247,111,42,218,237,233,247,199,138,36,51,78,237,
+  88,200,148,198,211,198,79,112,186,222,0,126,191,149,26,51,
+  70,124,49,78,45,10,34,75,163,166,22,244,145,242,170,78,
+  226,187,72,154,147,219,109,236,212,131,200,248,221,65,111,244,
+  236,188,219,241,77,217,73,117,81,27,42,252,70,44,227,44,
+  240,244,101,158,29,204,249,69,6,161,10,183,110,26,88,7,
+  108,3,118,2,123,128,215,128,215,129,55,129,119,128,12,116,
+  69,192,7,224,38,23,214,2,17,160,31,56,140,27,188,7,
+  120,2,56,8,156,0,160,95,140,251,181,120,54,80,3,212,
+  231,231,193,103,101,209,17,64,1,48,190,104,39,219,159,40,
+  66,195,234,28,214,28,140,148,149,178,124,124,227,76,33,178,
+  221,209,207,109,230,5,142,195,39,28,59,9,239,41,200,163,
+  91,216,147,73,225,8,124,181,254,198,109,98,241,236,99,188,
+  126,166,235,49,114,145,158,17,179,112,154,110,227,149,44,141,
+  42,109,171,92,238,143,105,97,55,242,123,81,200,7,13,89,
+  215,40,131,198,98,166,241,148,210,38,37,114,239,229,80,21,
+  222,47,209,79,4,139,245,146,80,25,158,221,250,243,108,232,
+  89,242,122,110,228,111,253,135,107,80,131,138,175,243,80,173,
+  94,91,230,235,254,152,70,58,169,58,52,219,37,163,246,178,
+  243,121,36,157,82,113,107,114,79,179,188,99,55,22,86,89,
+  21,53,182,120,66,22,112,149,42,234,13,108,177,89,107,216,
+  72,88,154,195,178,183,147,207,213,92,86,1,62,61,48,157,
+  165,108,175,97,167,143,105,165,81,171,63,215,120,124,90,67,
+  75,46,188,43,223,7,153,22,52,138,145,71,47,176,24,179,
+  168,10,110,18,114,145,155,201,34,247,66,46,114,130,174,135,
+  147,86,43,204,209,199,46,2,100,96,9,224,70,253,171,71,
+  165,127,91,61,160,91,113,207,96,35,127,145,179,98,99,252,
+  129,156,21,104,232,43,27,73,49,234,201,76,30,21,36,201,
+  56,36,179,123,143,234,116,201,43,76,210,155,147,216,117,201,
+  179,144,80,94,71,208,37,123,153,132,233,176,217,96,253,121,
+  94,166,65,223,249,94,217,119,94,28,240,125,162,251,174,232,
+  213,105,159,8,175,43,6,213,131,64,63,190,68,230,164,7,
+  116,126,128,241,118,89,29,120,170,167,98,72,61,196,70,176,
+  253,200,87,184,35,97,235,244,94,224,182,81,184,120,155,73,
+  114,115,241,144,213,166,24,104,189,81,114,27,136,141,200,239,
+  132,169,139,99,214,70,6,216,12,216,49,11,118,203,186,240,
+  199,130,109,212,51,239,251,194,181,168,124,22,30,103,146,44,
+  250,91,171,228,18,108,200,156,4,122,203,168,167,42,33,92,
+  139,127,116,158,168,229,78,232,1,86,61,74,152,215,159,161,
+  126,196,181,78,207,25,212,177,172,37,76,151,78,225,173,158,
+  51,249,25,15,230,125,26,152,246,9,252,33,240,186,71,250,
+  200,34,100,65,53,175,20,103,115,123,127,101,214,145,237,171,
+  158,26,232,11,79,185,248,116,142,140,84,231,246,30,247,235,
+  53,185,186,2,63,231,195,106,229,251,1,244,85,168,24,236,
+  131,99,14,89,245,158,53,131,112,226,159,255,11,207,53,11,
+  177,200,227,208,229,219,180,156,227,62,87,249,26,214,10,255,
+  177,53,254,235,89,179,126,213,154,241,138,213,253,123,214,46,
+  183,101,250,87,237,252,39,218,178,191,35,255,242,202,190,224,
+  254,151,27,243,162,241,201,255,246,42,254,63,155,25,11,248,
+  27,131,171,241,136,110,23,0,0,
+};
+/* fred data */
+static const unsigned char dat_fred = {
+  31,139,8,0,0,0,0,0,0,3,75,96,96,224,74,128,
+  96,190,2,134,4,150,34,134,4,14,0,122,91,71,10,20,
+  0,0,0,
+};
+/* gemx data */
+static const unsigned char dat_gemx = {
+  31,139,8,0,0,0,0,0,0,3,237,88,125,112,83,215,
+  149,63,239,233,73,150,100,217,150,133,48,194,31,226,249,35,
+  206,195,177,100,217,53,20,252,21,73,38,32,75,182,162,216,
+  110,22,88,134,60,17,89,50,254,170,161,104,75,88,23,4,
+  195,16,79,134,146,44,203,176,153,76,167,155,105,51,41,155,
+  73,88,79,154,118,18,74,137,195,102,24,38,19,24,133,205,
+  48,217,54,27,220,44,11,73,215,184,108,38,77,182,15,91,
+  218,223,125,18,14,31,205,132,236,118,242,23,111,230,156,115,
+  207,61,247,222,115,238,185,231,158,123,239,147,73,176,7,227,
+  193,184,179,137,130,177,207,106,215,4,207,211,221,239,238,119,
+  247,187,251,169,95,151,66,167,31,80,174,41,97,57,250,112,
+  151,114,237,220,175,79,71,205,206,166,217,162,48,209,126,70,
+  101,162,189,181,190,106,255,3,202,220,249,112,75,180,193,89,
+  67,181,144,141,58,239,83,105,191,56,64,33,212,53,162,60,
+  226,108,186,118,34,166,171,93,227,240,145,0,57,171,243,5,
+  227,24,245,93,239,225,96,188,38,232,180,159,56,190,174,171,
+  167,55,198,7,227,109,246,19,99,9,138,90,218,236,194,154,
+  117,93,255,249,96,173,253,253,31,222,179,111,148,228,75,19,
+  110,150,173,174,29,66,111,35,163,176,128,247,63,30,51,249,
+  46,167,83,200,95,135,59,47,236,74,7,227,217,154,157,153,
+  154,157,168,97,35,39,104,93,23,38,197,129,6,137,35,2,
+  125,8,60,15,218,3,122,8,180,23,244,159,65,191,3,122,
+  22,52,4,58,14,186,22,244,34,232,58,208,75,160,235,49,
+  12,163,127,13,170,128,110,192,48,2,40,204,210,4,65,55,
+  17,21,143,130,62,138,246,251,65,35,160,79,221,234,221,53,
+  125,195,226,90,177,119,117,215,90,177,111,251,182,190,173,35,
+  225,33,113,107,223,232,80,248,49,106,239,223,186,249,123,162,
+  47,222,55,244,189,77,125,143,14,138,117,98,32,188,121,240,
+  187,162,84,191,114,101,253,82,234,218,234,236,217,246,216,163,
+  131,219,69,201,245,173,58,215,178,186,149,43,150,18,5,227,
+  30,133,143,138,45,193,45,193,45,245,99,178,189,208,222,174,
+  112,135,234,199,130,175,233,221,229,29,122,47,234,172,250,213,
+  140,207,181,148,119,228,90,25,159,107,83,249,167,192,31,84,
+  249,195,140,55,157,40,239,48,77,50,222,244,38,227,243,156,
+  229,29,121,46,198,231,53,170,252,105,240,111,169,252,89,232,
+  240,161,238,79,198,159,148,119,24,159,43,119,27,118,0,118,
+  150,187,141,99,128,4,164,171,203,199,96,209,107,6,232,48,
+  28,202,150,209,214,240,124,182,252,42,202,199,179,229,183,81,
+  78,162,79,3,27,209,240,30,184,223,128,179,50,157,198,67,
+  24,255,48,184,70,85,91,39,184,32,184,22,198,229,123,203,
+  59,242,87,5,227,226,142,212,115,117,36,234,195,196,109,21,
+  151,244,36,100,226,54,121,20,238,193,80,18,165,16,164,123,
+  88,255,194,205,44,10,128,17,3,192,60,105,129,53,36,0,
+  11,100,0,214,146,30,88,71,121,192,57,84,0,172,39,13,
+  176,129,114,128,141,148,11,156,75,11,128,77,100,241,47,165,
+  188,65,163,87,34,51,248,60,42,12,198,3,202,130,179,210,
+  153,206,233,33,74,95,245,49,60,165,226,164,138,39,131,113,
+  95,111,135,66,71,121,47,21,44,78,136,52,229,3,230,164,
+  71,178,245,135,121,55,234,143,210,34,34,224,34,130,68,166,
+  220,144,42,219,177,120,132,154,40,103,190,237,192,98,55,227,
+  32,23,84,126,61,228,139,40,23,184,136,76,192,11,41,143,
+  73,141,235,85,105,11,90,231,66,155,155,76,106,237,243,190,
+  222,251,121,212,87,89,29,212,199,172,185,232,211,19,9,49,
+  192,104,65,194,129,209,97,93,227,18,166,237,214,200,149,105,
+  193,223,96,231,109,148,201,60,45,83,97,139,76,249,35,50,
+  89,236,0,5,178,10,153,10,94,64,125,21,232,41,180,49,
+  3,222,4,76,2,142,3,138,33,43,5,157,0,188,8,56,
+  2,120,14,240,44,224,71,128,167,1,135,216,142,238,82,22,
+  108,171,115,146,213,239,164,226,168,0,141,230,48,9,59,193,
+  153,6,5,108,53,147,227,17,178,102,118,124,64,89,84,45,
+  141,16,245,140,144,109,224,106,235,48,86,207,38,118,121,157,
+  100,8,123,209,222,16,253,36,188,66,165,191,15,187,84,250,
+  97,88,82,233,111,194,162,74,207,133,109,42,125,43,108,86,
+  233,201,176,94,165,199,130,241,181,227,38,9,187,215,215,103,
+  5,77,145,47,106,15,125,68,62,179,68,29,152,247,201,118,
+  197,214,24,250,152,22,250,37,26,136,233,122,128,131,113,151,
+  68,253,73,119,210,93,209,79,146,99,11,28,102,53,99,22,
+  19,45,116,53,178,202,78,160,147,17,51,240,174,62,99,33,
+  91,177,1,216,185,200,130,241,146,220,9,38,19,120,162,251,
+  203,220,100,21,209,43,76,121,22,181,182,251,4,235,209,9,
+  47,156,101,49,194,198,15,94,35,30,188,23,176,9,176,31,
+  0,127,210,43,128,95,2,94,6,28,205,150,63,4,204,96,
+  23,180,129,62,3,208,177,246,221,253,212,47,83,186,155,205,
+  199,229,32,97,98,152,248,168,190,121,24,22,11,178,208,61,
+  76,240,50,231,11,205,144,1,57,85,34,127,44,31,30,72,
+  131,154,48,79,191,108,70,63,191,124,12,115,91,216,67,133,
+  110,242,215,179,200,99,35,18,171,67,141,79,245,194,8,57,
+  197,122,162,228,254,114,55,73,215,219,164,222,47,100,17,58,
+  192,108,8,198,153,5,216,191,234,124,77,136,159,116,180,28,
+  190,163,241,122,72,233,200,29,140,118,224,190,97,26,39,9,
+  182,31,81,45,168,110,87,138,126,228,199,78,143,82,186,248,
+  91,99,108,175,151,49,95,87,150,49,173,85,42,190,39,86,
+  90,198,36,121,24,191,98,194,73,149,49,75,31,165,166,87,
+  57,41,15,35,94,68,155,74,170,192,218,228,121,55,179,152,
+  79,157,179,56,169,136,247,80,206,57,207,57,15,179,169,36,
+  97,246,149,96,175,154,59,176,34,187,110,182,238,190,132,89,
+  242,254,194,220,31,250,163,217,143,190,135,125,151,105,146,249,
+  248,99,159,56,66,53,201,73,214,210,101,155,24,251,67,42,
+  106,119,217,110,88,205,89,172,18,40,87,11,88,1,104,108,
+  198,204,7,139,188,52,237,203,142,140,121,123,95,162,254,208,
+  21,242,119,62,77,187,32,239,188,69,94,11,249,16,228,193,
+  102,15,133,32,227,166,59,196,122,115,70,230,130,108,20,178,
+  238,102,47,245,66,198,79,251,197,122,49,35,107,132,108,27,
+  100,15,55,183,211,90,200,52,211,1,177,222,149,145,173,128,
+  108,59,100,235,155,87,209,6,200,132,233,78,177,222,157,145,
+  181,64,54,6,217,198,230,7,72,134,76,59,221,37,214,135,
+  50,50,55,100,9,200,54,53,175,166,8,100,186,233,160,88,
+  47,103,100,171,32,219,11,89,180,243,130,6,231,23,124,93,
+  156,41,249,71,72,138,233,7,173,216,207,146,108,107,29,75,
+  167,73,98,241,8,79,30,199,238,226,123,220,173,240,66,115,
+  72,173,121,1,84,215,26,34,91,182,197,51,140,182,43,214,
+  236,250,167,158,200,174,127,63,178,124,37,48,135,245,103,248,
+  207,175,255,134,236,250,247,102,214,31,45,104,62,2,220,1,
+  165,96,99,184,22,248,205,112,117,64,49,215,132,69,224,167,
+  194,197,192,159,133,173,1,165,112,67,56,31,24,217,35,160,
+  88,164,48,238,50,210,48,173,245,15,83,219,160,174,7,88,
+  214,123,29,240,150,131,90,69,7,201,49,11,230,47,179,154,
+  48,25,106,75,134,169,149,90,252,14,162,24,105,251,209,199,
+  18,211,163,143,69,38,237,122,113,152,76,136,30,51,139,19,
+  199,40,203,40,163,108,143,89,225,49,235,23,177,195,173,6,
+  120,51,187,156,107,202,82,100,87,205,1,80,100,0,30,153,
+  154,119,129,151,64,145,25,248,183,81,127,14,240,17,202,159,
+  130,78,100,98,143,82,0,100,114,141,13,128,49,53,59,192,
+  255,30,112,41,155,73,62,64,187,154,76,59,46,31,128,113,
+  185,179,224,145,237,57,100,126,58,1,56,118,75,22,98,245,
+  207,3,126,2,248,113,54,11,29,6,28,4,192,62,122,2,
+  176,15,176,7,176,19,192,116,178,83,102,43,0,167,11,13,
+  0,162,217,76,135,147,135,214,3,30,6,116,3,130,0,236,
+  50,190,23,0,219,52,216,55,26,244,209,192,30,205,39,144,
+  57,65,79,131,86,3,144,93,8,39,21,225,20,34,118,131,
+  133,127,9,115,32,35,162,6,39,149,102,38,67,83,7,244,
+  78,248,121,97,204,140,21,233,65,20,237,40,97,177,210,35,
+  79,53,179,156,99,145,147,44,3,76,56,72,27,57,171,214,
+  176,62,235,179,117,182,200,177,249,186,213,37,44,215,116,171,
+  188,175,121,140,227,200,143,83,44,153,29,237,160,42,253,182,
+  252,4,180,20,35,191,58,144,60,139,99,150,30,112,114,17,
+  118,70,113,214,26,202,100,217,18,55,21,95,31,121,110,26,
+  125,150,71,79,101,90,204,125,128,56,66,140,106,156,136,19,
+  61,98,98,24,24,45,209,195,150,109,113,188,132,101,192,235,
+  220,209,178,97,220,116,172,102,7,25,62,214,239,70,102,203,
+  100,95,29,78,226,84,10,119,2,236,160,212,140,108,222,70,
+  160,151,100,61,106,180,40,189,207,236,72,242,236,132,242,37,
+  146,110,143,82,120,17,86,68,6,112,162,160,188,214,229,34,
+  106,112,144,241,28,52,199,244,58,15,71,147,111,76,141,35,
+  67,73,136,103,87,148,221,53,34,131,246,5,39,41,61,78,
+  11,38,129,249,41,95,55,127,35,31,124,39,248,142,58,195,
+  76,15,74,97,253,83,35,170,151,42,84,159,85,170,245,58,
+  100,122,137,26,212,150,136,232,84,167,154,143,221,84,253,161,
+  30,248,94,117,166,162,218,190,60,59,78,13,179,51,184,197,
+  59,76,85,25,15,204,190,88,194,122,151,170,99,47,81,203,
+  101,106,63,123,86,190,31,30,13,0,74,1,213,232,231,2,
+  69,20,206,77,49,191,199,104,238,189,155,214,44,95,93,51,
+  11,91,51,230,107,216,179,40,179,94,216,19,207,224,116,50,
+  209,10,216,108,38,55,179,20,143,14,162,93,56,9,26,216,
+  238,77,78,138,230,228,81,34,100,68,83,102,117,51,163,204,
+  26,209,111,5,234,134,201,173,174,89,116,193,44,110,164,240,
+  21,27,35,102,193,218,69,223,112,82,211,130,25,220,11,225,
+  59,217,140,154,216,238,27,106,152,21,49,182,198,253,55,181,
+  163,185,82,212,109,222,125,115,157,30,163,231,170,43,49,3,
+  47,160,14,188,41,203,23,101,249,188,44,191,144,241,240,175,
+  153,121,100,246,108,38,58,102,79,221,26,29,5,167,190,34,
+  34,196,121,157,217,104,152,215,57,31,13,30,197,244,129,122,
+  87,64,54,154,141,220,224,129,166,73,104,75,96,134,184,43,
+  53,101,218,163,133,23,51,139,168,220,252,60,186,105,158,87,
+  231,145,137,47,180,45,194,10,114,131,250,168,81,141,20,14,
+  187,199,142,154,234,88,4,99,136,190,196,59,136,21,236,38,
+  9,246,87,197,204,108,205,210,105,157,71,143,25,252,215,184,
+  207,125,199,17,189,5,145,113,111,212,140,252,94,77,247,26,
+  89,180,136,221,24,159,245,143,109,135,172,50,186,21,178,10,
+  170,132,30,105,148,160,177,97,194,19,179,246,249,26,91,56,
+  58,132,86,147,39,167,198,81,195,71,244,44,10,153,69,188,
+  59,39,13,31,54,124,181,118,185,72,182,54,58,200,165,243,
+  194,243,153,113,142,69,94,149,79,96,158,165,49,31,112,25,
+  110,173,192,114,11,108,40,165,50,204,220,206,50,216,136,221,
+  226,160,37,127,143,210,160,158,241,67,188,92,140,22,118,178,
+  177,29,33,231,51,233,191,162,158,201,190,123,9,227,4,98,
+  196,77,13,46,71,255,238,47,141,238,78,216,31,130,175,211,
+  20,208,35,91,81,7,94,27,58,220,49,139,97,129,63,138,
+  199,14,52,248,200,143,211,174,19,179,12,153,17,59,236,30,
+  28,205,135,175,66,24,63,193,250,203,23,147,136,54,220,184,
+  238,71,239,41,22,101,166,169,235,81,246,69,132,101,198,143,
+  174,154,143,52,156,140,119,178,86,200,250,57,100,141,9,152,
+  101,79,55,211,70,156,17,22,110,195,120,60,198,179,66,75,
+  8,119,64,141,223,19,213,111,53,191,236,164,130,72,203,141,
+  125,190,208,71,213,76,95,236,43,244,49,29,232,175,67,127,
+  162,103,161,201,216,208,66,58,140,155,31,33,122,10,175,28,
+  101,43,225,222,89,112,210,65,223,102,183,57,118,50,194,22,
+  14,190,27,197,29,192,65,190,201,89,210,92,242,77,48,15,
+  110,100,177,129,246,88,147,147,179,164,189,212,81,151,247,219,
+  43,212,203,238,32,37,30,172,21,114,102,140,221,39,165,59,
+  177,236,198,89,213,60,162,222,99,112,51,138,213,244,56,169,
+  42,202,110,208,247,80,21,118,97,222,59,184,61,129,86,226,
+  6,85,17,53,177,251,178,71,201,21,189,253,56,186,153,229,
+  21,170,149,54,61,71,186,40,59,151,220,88,29,223,130,43,
+  212,199,116,13,218,178,175,78,193,220,66,234,171,243,186,246,
+  96,188,109,37,93,184,170,123,125,132,242,219,224,13,221,227,
+  127,181,180,125,89,235,26,202,199,235,247,114,34,191,75,209,
+  174,101,111,195,128,162,221,239,112,171,47,172,162,235,239,162,
+  26,188,88,179,47,174,217,168,69,205,239,45,44,19,98,230,
+  236,253,115,26,209,218,130,245,153,244,19,206,173,8,90,125,
+  30,21,51,167,0,27,229,35,125,55,203,219,101,128,210,204,
+  121,128,62,135,208,234,179,104,149,154,187,113,239,249,243,39,
+  13,59,91,228,126,180,252,99,84,7,175,45,151,55,160,252,
+  122,68,102,186,125,9,104,55,102,198,103,118,162,175,65,61,
+  179,216,41,44,96,20,43,105,165,236,142,121,111,82,234,253,
+  183,25,236,152,78,50,97,76,51,192,130,241,56,118,42,0,
+  72,213,182,60,243,250,29,229,130,241,47,59,29,89,182,80,
+  237,171,103,222,96,59,6,90,181,73,119,135,98,56,218,188,
+  13,251,67,146,143,213,229,5,20,193,127,163,231,84,239,176,
+  123,42,177,243,175,134,253,109,184,76,186,46,69,243,81,64,
+  49,224,6,163,222,165,221,84,233,115,3,87,1,238,137,217,
+  216,13,58,115,151,86,239,209,249,125,86,245,22,157,127,195,
+  27,10,175,202,206,11,178,250,151,202,192,215,25,218,21,205,
+  211,229,29,236,150,145,51,4,106,170,80,245,140,98,93,53,
+  137,14,69,243,106,35,213,224,61,239,127,137,75,70,141,53,
+  195,218,217,223,194,31,178,128,186,229,151,253,69,203,68,158,
+  253,5,24,16,80,18,248,118,42,56,223,126,190,93,218,230,
+  162,43,1,203,50,81,171,223,77,57,47,215,82,107,68,231,
+  31,162,182,129,134,87,106,201,139,28,130,242,160,94,191,140,
+  114,68,109,212,46,46,19,137,79,164,211,87,211,137,246,165,
+  110,146,23,123,168,117,101,92,212,81,219,98,47,121,225,215,
+  124,245,61,66,222,163,184,175,59,41,16,140,215,193,54,254,
+  34,123,163,148,177,12,214,4,75,187,195,239,3,191,26,62,
+  223,165,8,246,112,18,120,111,248,173,235,39,20,104,250,166,
+  83,115,22,30,7,223,165,232,121,140,178,176,86,157,241,174,
+  20,70,61,0,47,150,135,237,157,23,118,165,230,235,118,144,
+  155,35,188,114,196,176,46,83,31,166,244,78,166,157,253,231,
+  128,191,203,177,102,75,88,172,4,20,93,141,133,253,19,33,
+  178,33,51,45,57,231,241,40,186,169,228,27,174,151,72,40,
+  28,134,45,158,230,33,44,153,160,98,2,118,19,223,88,203,
+  37,212,251,173,24,51,163,245,203,201,73,246,150,218,70,86,
+  137,60,200,63,165,29,74,206,222,251,246,155,165,230,227,120,
+  203,251,216,59,118,157,103,96,6,47,70,29,252,94,62,168,
+  103,54,132,233,191,107,217,31,22,239,8,217,66,51,36,97,
+  173,203,137,237,127,17,189,69,239,16,124,87,75,11,213,168,
+  40,86,99,168,173,75,225,158,115,140,185,221,208,171,198,4,
+  246,45,57,60,36,72,110,255,139,92,50,86,83,81,203,37,
+  207,37,80,195,74,239,170,37,39,74,239,169,165,6,29,78,
+  21,158,208,103,185,92,85,209,66,164,167,108,91,148,5,202,
+  182,70,89,151,41,55,32,51,88,16,173,90,22,187,218,164,
+  171,133,150,180,50,206,13,123,19,222,141,15,157,78,127,2,
+  123,172,29,10,215,25,80,184,113,233,12,240,12,195,124,175,
+  138,143,73,103,70,115,165,233,244,85,180,84,208,234,225,128,
+  162,177,48,137,102,187,138,63,96,88,88,37,157,233,188,48,
+  134,168,102,251,136,204,117,121,247,183,80,117,48,184,225,73,
+  182,111,186,20,122,197,241,24,102,59,74,165,144,214,86,158,
+  97,229,47,109,59,94,57,131,19,88,109,193,254,126,33,247,
+  123,195,52,253,63,236,15,87,93,19,237,203,244,155,78,52,
+  29,79,167,209,223,242,69,255,240,158,204,46,77,167,176,150,
+  239,178,255,159,169,131,153,255,98,174,166,233,208,4,94,207,
+  49,17,56,21,51,79,140,209,146,97,179,192,162,138,102,15,
+  202,56,217,230,106,100,1,120,187,71,153,174,118,97,228,219,
+  255,246,221,254,169,43,136,187,208,173,245,183,85,252,69,190,
+  61,28,203,56,119,254,37,18,148,184,165,106,8,39,201,179,
+  215,153,52,12,255,50,75,247,240,8,177,175,241,237,190,221,
+  52,166,107,226,142,116,9,8,219,175,241,237,185,221,52,166,
+  107,242,142,116,233,177,93,190,198,183,247,22,211,210,233,212,
+  113,232,74,222,137,174,191,248,167,79,113,159,127,45,235,255,
+  239,31,111,152,227,255,96,254,102,116,9,198,107,194,5,241,
+  155,209,149,171,187,105,189,116,223,140,214,187,223,255,239,251,
+  20,112,21,160,59,170,11,106,63,213,254,88,219,165,229,132,
+  215,132,184,176,76,243,39,205,164,102,191,102,173,166,134,159,
+  229,147,252,17,126,15,191,145,111,230,75,184,57,110,138,59,
+  197,189,200,29,226,126,192,245,115,189,156,155,171,227,236,92,
+  62,165,48,208,127,208,121,122,139,94,167,87,232,5,122,150,
+  254,129,158,164,199,105,23,109,167,45,95,85,111,124,210,240,
+  185,33,166,255,157,62,156,243,113,206,247,115,76,186,159,233,
+  214,104,175,104,159,214,174,17,174,9,63,23,70,5,151,230,
+  83,205,175,52,251,52,61,154,74,254,51,254,109,254,167,252,
+  15,248,117,252,10,222,198,41,220,191,115,255,194,253,19,247,
+  119,220,223,114,81,238,33,174,141,171,229,74,57,19,205,209,
+  12,253,142,222,165,211,244,107,250,57,29,161,127,164,195,116,
+  128,246,209,78,250,62,78,203,1,138,208,70,90,71,189,244,
+  32,5,104,13,209,255,2,164,9,39,58,170,34,0,0,
+};
+/* hpn-jam data */
+static const unsigned char dat_hpn_jam = {
+  31,139,8,0,0,0,0,0,0,3,237,154,123,116,91,87,
+  157,239,127,71,146,101,89,145,109,217,242,67,150,101,91,126,
+  196,81,28,191,226,200,177,93,43,138,30,118,228,168,182,155,
+  23,161,101,10,147,132,230,209,66,105,8,132,182,220,14,184,
+  161,131,91,214,194,97,202,12,3,119,46,119,58,12,171,183,
+  151,25,214,154,41,48,151,114,203,29,215,233,19,10,36,212,
+  109,83,40,77,164,19,245,56,113,18,231,225,230,161,216,57,
+  247,187,183,100,199,105,11,133,181,166,157,249,227,247,113,191,
+  251,241,219,175,223,222,231,156,125,182,78,186,133,200,179,133,
+  168,48,148,202,186,175,245,201,193,189,125,154,126,117,11,101,
+  173,219,77,131,123,27,251,8,12,164,244,84,227,131,161,20,
+  125,103,107,205,110,218,99,216,74,244,205,61,70,132,15,123,
+  62,175,31,221,173,236,49,33,253,229,61,102,132,67,131,123,
+  109,235,182,184,118,26,210,253,244,79,80,62,25,188,116,248,
+  254,195,95,138,76,144,187,247,76,159,219,187,246,181,209,215,
+  158,170,95,235,93,212,224,218,89,178,197,28,157,164,217,45,
+  214,87,159,249,137,159,148,157,231,94,251,186,203,181,227,92,
+  108,223,78,115,216,189,113,223,142,84,255,145,47,234,233,62,
+  119,120,250,180,25,66,143,13,100,216,237,62,248,96,29,141,
+  223,239,53,28,254,82,223,113,90,77,150,254,35,180,122,112,
+  239,22,23,81,213,6,162,18,15,93,143,66,84,231,23,137,
+  122,25,122,101,216,32,195,70,25,54,203,240,241,251,72,217,
+  65,100,11,93,70,147,216,22,82,138,96,49,192,82,137,217,
+  219,15,6,87,156,17,181,76,173,88,175,148,236,213,0,25,
+  81,199,136,58,121,43,102,228,88,223,67,233,235,176,153,96,
+  235,180,222,43,198,166,239,237,36,122,190,246,121,180,245,238,
+  161,54,47,153,14,61,85,251,20,114,158,209,39,81,250,197,
+  175,137,80,217,74,206,175,160,237,35,210,143,44,180,182,110,
+  37,227,23,96,25,65,222,140,188,123,43,149,143,72,223,138,
+  106,15,162,245,35,30,180,51,237,66,141,79,162,70,54,106,
+  52,167,75,61,79,136,210,173,228,110,168,158,177,160,235,7,
+  169,122,38,39,19,91,101,140,54,157,104,99,65,27,51,210,
+  141,72,231,100,210,30,164,173,98,21,164,191,141,176,228,193,
+  178,40,83,138,43,171,96,74,173,29,205,173,190,230,182,214,
+  214,229,24,180,111,221,32,154,201,201,255,49,225,192,214,219,
+  60,3,91,239,241,132,111,223,233,233,217,126,231,93,158,141,
+  119,125,106,231,103,232,3,35,180,237,222,207,124,166,209,179,
+  105,235,93,158,22,79,100,207,246,173,119,126,112,99,11,238,
+  220,122,251,39,131,31,23,227,238,250,116,243,109,219,63,216,
+  193,193,221,119,223,221,252,159,56,252,127,250,248,160,42,19,
+  43,153,191,119,195,72,84,243,121,253,220,242,219,201,102,54,
+  33,204,51,27,94,18,79,120,81,239,4,130,215,98,5,59,
+  82,97,87,228,56,41,189,19,202,124,62,189,239,153,229,83,
+  111,250,174,237,94,50,137,120,135,59,189,55,152,190,139,24,
+  37,85,235,130,218,154,153,197,180,149,172,99,107,142,200,61,
+  238,114,161,111,243,61,112,168,69,105,49,182,232,136,188,138,
+  7,18,73,131,252,51,102,254,116,209,207,17,232,24,116,124,
+  78,138,205,70,186,50,61,61,173,43,182,105,18,117,178,178,
+  33,27,84,0,149,64,229,144,71,105,109,109,213,21,135,195,
+  161,43,205,205,205,186,82,82,82,162,43,69,69,69,58,253,
+  96,230,7,51,111,95,130,188,211,255,101,254,74,115,7,108,
+  35,139,94,91,212,98,29,201,185,152,179,211,114,212,178,53,
+  123,34,251,238,236,69,230,71,205,209,172,147,89,127,155,21,
+  53,93,49,253,192,180,219,212,106,156,54,254,95,227,95,26,
+  55,26,107,13,23,12,63,55,252,163,225,47,12,183,24,58,
+  13,78,37,165,252,78,25,83,254,183,242,87,202,127,83,182,
+  43,235,149,128,210,168,184,21,27,205,210,105,138,211,56,61,
+  79,63,165,199,233,49,250,123,250,6,141,208,151,233,11,116,
+  55,237,166,59,232,54,250,24,221,66,155,232,38,186,145,162,
+  20,193,251,166,155,58,169,157,218,168,133,26,241,62,90,66,
+  139,169,150,170,113,87,85,144,155,92,84,70,165,84,66,197,
+  228,160,66,42,32,59,222,129,31,52,74,205,87,161,175,67,
+  127,7,253,3,244,191,160,239,67,63,128,158,128,254,29,122,
+  6,122,1,250,5,116,8,122,25,202,134,114,73,169,45,64,
+  156,132,112,127,215,156,130,206,66,111,65,151,161,89,148,227,
+  169,169,205,130,138,161,28,72,180,41,131,42,160,234,116,251,
+  218,197,208,82,168,9,90,14,181,67,93,208,42,40,4,245,
+  66,31,130,214,66,3,208,45,208,71,161,173,208,118,8,126,
+  214,97,140,58,216,235,254,15,198,253,52,180,23,194,211,85,
+  243,23,208,253,208,95,66,15,145,178,24,227,46,198,219,187,
+  6,99,212,116,67,232,191,38,10,161,223,154,141,16,250,168,
+  249,115,8,253,214,124,2,42,133,208,166,166,22,130,143,53,
+  45,104,191,15,18,125,157,70,30,111,246,234,159,65,7,161,
+  87,160,215,161,4,52,1,161,188,250,60,116,9,194,90,120,
+  190,0,221,149,94,120,253,234,236,204,149,212,229,75,35,244,
+  242,203,241,248,43,175,36,18,175,190,170,170,135,15,31,59,
+  246,218,107,201,228,111,126,243,230,155,191,253,173,166,189,254,
+  250,196,196,239,126,119,252,248,27,111,156,56,113,228,200,228,
+  228,209,163,39,79,198,227,167,78,37,18,167,79,171,234,212,
+  212,177,99,103,206,36,147,103,207,190,249,230,185,115,154,118,
+  254,252,196,196,244,244,241,227,111,189,117,226,196,133,11,147,
+  147,23,47,158,60,121,233,210,169,83,151,47,159,62,157,74,
+  77,77,93,185,114,230,204,204,204,217,179,179,179,231,206,93,
+  189,122,254,188,174,79,79,19,189,245,150,162,92,184,96,48,
+  92,188,104,52,94,186,100,50,93,190,156,149,149,74,153,205,
+  87,174,100,103,207,204,88,44,179,179,57,57,87,175,90,173,
+  186,190,104,17,94,246,54,69,201,205,53,24,242,242,140,198,
+  252,124,147,201,110,207,202,42,40,48,155,11,11,179,179,29,
+  14,139,165,168,40,39,167,184,216,106,45,41,89,180,168,180,
+  212,102,115,58,115,115,203,202,242,242,92,174,252,252,242,114,
+  187,221,237,46,40,168,168,40,44,172,172,116,56,170,170,138,
+  138,60,158,226,226,234,234,146,146,154,154,210,210,218,90,167,
+  179,174,174,172,108,241,98,151,171,190,190,188,124,201,18,183,
+  219,235,173,168,88,186,180,178,178,161,161,170,106,217,50,143,
+  167,177,177,186,186,169,169,166,166,185,185,182,182,165,165,174,
+  174,181,117,241,226,229,203,235,235,219,218,150,44,217,79,51,
+  116,153,246,211,21,186,136,112,150,46,201,48,109,17,233,25,
+  105,167,153,139,8,102,47,207,165,108,211,251,233,170,142,231,
+  88,92,19,132,51,151,166,207,156,156,56,134,148,49,219,134,
+  242,172,28,17,206,24,45,243,233,108,91,246,220,80,233,112,
+  54,19,94,146,67,93,27,48,37,7,76,15,123,37,227,78,
+  138,246,43,228,204,40,123,191,98,51,237,87,114,178,246,43,
+  22,136,132,123,96,68,33,211,126,155,174,139,67,227,126,17,
+  102,35,167,80,22,66,148,166,93,176,239,159,115,208,38,45,
+  50,48,9,99,90,211,231,78,158,62,169,29,59,58,162,200,
+  50,60,134,144,97,191,232,81,244,46,122,83,200,156,246,129,
+  44,80,14,180,8,178,73,63,20,178,66,185,80,30,148,15,
+  233,208,85,104,22,154,129,174,64,41,232,50,116,9,186,8,
+  93,128,222,130,166,161,243,208,57,232,44,116,70,244,75,185,
+  148,135,45,206,142,173,174,16,91,94,17,54,190,18,108,128,
+  78,108,131,46,42,199,134,88,65,149,216,26,61,216,32,107,
+  176,77,214,97,179,172,199,150,233,165,165,216,58,151,205,199,
+  141,212,68,205,216,80,91,49,179,105,58,79,231,232,44,157,
+  161,41,108,205,167,232,36,77,210,9,58,78,19,164,209,155,
+  148,164,99,164,82,2,91,246,81,58,66,111,208,239,232,117,
+  250,45,253,134,94,163,195,244,42,189,66,47,99,43,127,137,
+  126,77,135,232,224,136,240,15,127,250,162,171,214,217,156,25,
+  203,149,236,148,249,114,214,37,211,69,227,5,195,91,10,134,
+  209,207,93,61,59,123,102,102,234,202,233,212,169,203,39,47,
+  77,94,60,113,225,248,91,19,211,218,249,55,207,37,207,30,
+  59,163,78,37,78,199,79,29,61,121,100,242,141,19,191,59,
+  254,250,196,111,181,223,188,57,242,142,227,194,251,219,251,251,
+  63,202,251,113,9,211,55,46,57,157,226,158,251,0,38,68,
+  138,193,104,202,50,103,91,114,172,139,108,185,121,249,246,130,
+  66,71,81,113,73,169,179,204,85,238,174,168,172,242,84,215,
+  212,214,45,174,95,226,93,218,176,172,177,169,185,165,117,121,
+  219,10,95,251,202,142,206,174,27,186,253,171,2,251,175,63,
+  4,26,230,79,136,164,40,249,38,79,51,89,201,96,93,47,
+  242,121,138,34,170,230,100,138,91,149,223,123,193,196,9,242,
+  26,213,215,247,111,185,214,63,25,12,193,188,249,34,244,79,
+  65,5,215,33,237,81,107,218,106,34,165,236,79,232,95,89,
+  232,127,149,199,227,206,171,156,239,223,168,24,130,248,57,156,
+  69,230,5,253,131,247,232,223,104,108,41,59,145,149,53,159,
+  183,219,141,0,63,29,63,111,115,110,232,34,202,223,28,67,
+  88,18,195,47,221,23,29,248,21,154,31,134,34,27,69,73,
+  16,191,29,27,60,247,97,108,15,126,209,246,203,212,16,82,
+  97,153,58,138,84,167,108,17,18,117,231,234,153,31,93,49,
+  138,254,250,29,8,179,234,68,121,73,63,82,139,29,248,221,
+  156,213,248,84,104,43,229,30,157,235,201,252,249,5,117,235,
+  231,235,46,145,117,155,68,221,188,143,204,141,101,30,92,80,
+  215,59,95,119,169,172,219,44,253,136,32,213,32,91,125,39,
+  61,39,241,219,187,213,79,86,209,71,86,157,29,231,228,245,
+  207,235,41,199,140,56,104,103,45,67,156,77,250,131,100,239,
+  18,161,129,104,212,208,133,51,34,74,238,239,18,97,236,94,
+  113,226,223,105,198,105,255,220,224,94,248,189,27,61,227,183,
+  124,222,195,178,191,229,232,217,6,111,208,214,113,20,161,1,
+  125,163,30,81,33,126,221,23,126,30,122,0,250,6,228,135,
+  62,5,221,129,213,191,138,248,86,104,3,81,193,5,232,127,
+  34,237,134,30,65,25,222,254,5,79,35,253,88,1,78,68,
+  212,188,133,148,211,30,47,89,235,118,145,249,229,209,13,67,
+  182,66,26,194,140,138,10,238,64,233,106,243,99,242,126,180,
+  110,33,253,117,148,92,21,191,252,195,114,214,176,28,131,101,
+  86,124,219,112,156,16,183,99,254,122,216,14,194,166,139,43,
+  42,250,203,244,229,244,136,239,39,198,116,143,47,139,223,17,
+  134,45,68,22,105,85,170,131,100,221,77,246,194,100,16,39,
+  55,42,25,172,249,180,133,190,62,35,110,191,151,126,41,252,
+  130,127,131,118,47,181,20,138,181,203,46,18,119,76,207,143,
+  104,84,249,17,137,107,148,223,35,103,209,132,90,222,247,174,
+  101,193,249,140,86,34,29,164,14,248,250,189,249,22,157,239,
+  218,130,68,191,116,80,212,178,98,67,74,215,25,53,60,213,
+  181,112,92,250,151,229,162,102,158,229,32,25,10,110,33,39,
+  84,6,235,127,119,188,134,217,244,33,245,53,123,153,189,32,
+  45,228,246,161,94,54,100,68,189,21,200,239,145,227,136,239,
+  40,187,164,95,141,184,95,202,196,243,1,203,102,88,70,101,
+  89,63,90,40,136,123,48,3,3,102,112,11,117,21,236,162,
+  46,234,132,109,52,230,165,102,113,21,100,79,149,150,199,68,
+  13,216,31,219,232,165,242,29,164,124,74,218,155,237,184,95,
+  106,118,145,1,247,19,217,203,112,200,189,39,93,179,32,72,
+  21,5,247,202,39,50,132,158,154,240,132,90,228,10,132,231,
+  172,239,189,74,142,9,18,79,103,24,215,220,147,241,198,137,
+  116,93,245,46,186,149,110,134,167,31,166,205,117,214,234,24,
+  121,10,54,144,23,170,132,205,69,85,152,85,22,82,110,42,
+  71,216,70,173,153,182,22,217,235,114,139,23,97,0,254,56,
+  23,172,240,125,212,135,53,22,107,95,134,114,69,150,219,196,
+  234,192,102,167,10,216,12,210,86,130,149,34,10,86,163,165,
+  233,81,90,3,79,214,80,24,165,198,119,148,126,127,65,169,
+  233,29,165,63,158,43,133,135,62,106,79,175,122,245,90,233,
+  73,43,117,204,121,140,58,118,42,26,220,107,177,203,175,125,
+  166,193,189,46,47,173,64,46,91,172,231,111,189,84,49,184,
+  247,239,100,136,31,221,63,198,207,140,49,220,224,158,237,68,
+  63,67,108,71,252,162,136,111,35,250,103,92,185,167,13,67,
+  24,95,71,205,161,109,120,146,208,67,125,178,175,14,222,152,
+  79,190,60,90,189,129,138,32,59,214,215,94,112,7,142,139,
+  190,180,103,178,231,175,161,126,39,234,251,112,109,21,90,39,
+  251,201,79,90,68,91,211,207,100,219,155,161,91,235,54,200,
+  150,155,209,114,51,125,120,55,225,89,24,145,207,198,245,45,
+  78,255,193,22,183,194,227,28,121,23,132,182,208,236,247,54,
+  16,238,36,55,82,143,152,131,100,135,191,226,105,238,169,219,
+  67,244,55,242,105,126,249,151,184,254,117,232,229,42,181,202,
+  176,13,225,44,45,67,152,162,128,76,47,69,56,67,13,114,
+  36,151,189,65,191,178,149,174,94,248,163,239,130,66,113,23,
+  108,120,40,125,31,192,143,240,251,119,47,108,161,153,159,224,
+  53,249,197,244,85,177,255,139,152,229,224,175,197,123,111,26,
+  206,100,157,156,123,11,74,223,215,161,151,34,60,139,27,196,
+  157,138,245,219,72,27,144,171,144,101,65,216,126,184,233,49,
+  18,79,78,56,179,115,218,44,98,207,13,138,61,4,22,241,
+  197,185,245,189,119,182,204,14,44,118,141,219,208,74,124,149,
+  110,248,67,251,214,130,250,62,212,23,247,108,227,31,255,156,
+  7,176,135,84,218,45,217,148,5,255,155,49,155,42,220,185,
+  158,244,51,45,246,0,91,3,222,125,138,152,239,134,199,96,
+  23,251,190,23,165,94,52,194,204,15,138,247,71,31,90,181,
+  163,85,91,250,238,197,206,84,84,88,96,83,104,191,120,154,
+  144,179,203,220,136,200,69,142,235,122,97,193,134,135,240,212,
+  21,29,84,14,122,105,245,224,19,68,174,123,106,196,251,241,
+  201,131,56,12,25,238,23,207,203,75,79,181,22,184,189,212,
+  104,49,147,25,99,127,197,38,238,140,229,72,89,49,86,43,
+  198,186,71,206,125,185,75,113,226,76,170,218,10,189,180,12,
+  117,197,19,106,197,92,8,99,173,68,94,124,91,119,62,236,
+  165,6,180,168,193,213,207,162,198,54,204,23,43,85,244,107,
+  88,31,55,109,23,245,31,19,246,66,83,65,136,150,37,108,
+  15,155,80,215,108,10,225,183,85,22,61,130,114,155,186,22,
+  41,231,109,164,95,58,24,178,102,147,98,31,198,8,6,177,
+  90,24,187,108,163,248,250,239,241,163,87,248,235,196,11,219,
+  108,94,163,211,235,187,40,111,249,26,202,59,184,6,99,153,
+  11,122,168,12,45,245,18,121,45,12,217,242,26,149,200,92,
+  216,106,196,30,125,64,156,69,74,252,120,155,136,121,174,68,
+  223,149,155,188,212,129,89,227,237,246,9,172,155,220,3,86,
+  226,154,117,136,54,69,242,180,241,35,227,179,184,202,63,50,
+  138,214,89,203,228,19,34,90,54,96,133,58,197,124,211,251,
+  91,9,174,148,13,167,183,109,233,187,49,253,62,49,163,78,
+  37,214,172,114,112,175,248,246,95,190,103,224,160,252,247,9,
+  125,43,41,103,162,169,233,55,150,220,39,191,55,222,156,137,
+  111,141,166,222,106,120,23,219,231,222,110,115,200,175,158,37,
+  177,70,74,246,213,127,138,156,127,43,247,139,87,127,89,251,
+  115,88,55,188,58,90,191,113,206,82,35,79,127,158,27,113,
+  255,25,28,226,90,150,139,83,144,67,190,65,195,75,105,117,
+  221,205,115,123,77,109,140,204,181,194,174,164,79,23,98,47,
+  21,167,26,135,60,131,200,18,35,89,237,13,100,72,6,49,
+  102,209,117,99,14,214,127,198,66,243,150,27,229,88,70,218,
+  40,191,239,110,89,255,43,253,203,105,143,243,131,115,158,59,
+  228,183,209,146,62,207,167,200,254,87,178,221,161,95,138,53,
+  42,233,9,189,114,8,101,198,51,135,158,117,28,20,59,37,
+  106,78,139,154,97,121,38,30,220,43,175,231,102,92,7,179,
+  220,109,242,12,70,121,151,152,205,98,229,197,117,93,183,67,
+  236,230,94,156,33,3,153,235,180,217,38,118,142,205,226,212,
+  153,121,179,238,162,155,231,159,56,203,65,23,246,217,155,133,
+  45,221,30,182,214,249,246,245,215,181,47,188,214,202,238,194,
+  21,54,217,11,69,91,212,206,74,239,184,184,87,43,108,166,
+  244,147,108,18,189,85,152,176,162,233,175,216,161,212,249,17,
+  249,47,76,143,102,246,85,83,40,53,249,168,237,107,226,235,
+  226,14,55,158,152,91,35,169,83,139,60,246,175,61,73,138,
+  231,174,131,15,121,134,66,19,100,90,255,130,126,58,253,175,
+  118,98,197,196,119,238,37,52,127,138,110,8,93,22,231,92,
+  207,147,226,231,143,231,201,28,25,138,127,145,218,74,134,66,
+  232,135,248,45,208,188,230,200,224,222,80,234,248,103,35,151,
+  30,148,103,96,199,205,40,196,24,153,216,144,137,141,153,216,
+  148,137,179,50,177,57,19,103,219,157,67,126,26,117,4,145,
+  115,22,57,75,156,24,211,184,163,8,37,150,135,253,164,220,
+  97,216,67,142,16,25,112,111,31,69,137,73,150,228,252,181,
+  44,249,44,57,194,162,196,240,57,148,100,201,18,235,55,100,
+  201,231,200,17,145,37,175,8,47,131,90,159,70,15,174,77,
+  233,174,216,39,13,118,204,239,241,46,220,179,6,187,152,115,
+  40,165,148,120,46,41,62,200,3,217,237,151,82,217,80,14,
+  228,128,138,161,82,168,12,42,135,42,44,63,38,37,149,109,
+  232,164,51,169,178,112,103,170,92,166,42,80,82,5,85,67,
+  139,171,113,159,85,250,20,159,140,31,87,60,34,174,106,84,
+  236,5,51,100,73,149,201,176,90,134,139,45,151,40,43,149,
+  45,67,7,66,146,105,146,105,83,42,71,134,197,24,207,152,
+  42,237,63,82,64,115,51,25,194,76,174,174,19,51,217,185,
+  46,252,201,185,89,208,186,234,195,24,243,48,198,59,140,177,
+  14,167,178,161,28,200,1,21,67,165,80,25,84,110,119,142,
+  250,41,63,237,247,253,157,169,10,216,170,160,106,104,49,198,
+  81,196,56,239,248,141,249,7,24,195,181,207,215,31,199,219,
+  254,46,191,120,71,85,118,246,166,200,31,222,247,248,134,59,
+  205,189,39,200,188,229,130,15,79,55,126,99,24,62,187,114,
+  104,108,244,169,131,79,138,127,97,76,62,216,23,108,107,32,
+  83,193,40,70,127,42,85,54,184,55,189,166,24,123,151,248,
+  25,173,100,137,223,242,202,119,112,134,48,102,185,112,38,53,
+  153,31,196,126,154,101,109,167,219,200,156,55,69,207,83,118,
+  190,46,66,93,191,246,175,167,24,125,141,226,27,252,204,117,
+  22,159,176,44,240,114,141,244,242,223,122,83,250,55,254,88,
+  47,139,196,149,54,208,153,7,20,248,91,93,48,150,42,207,
+  248,139,248,218,191,217,162,215,167,21,143,24,125,129,229,113,
+  97,89,48,122,88,140,94,213,138,209,157,127,194,26,45,78,
+  95,175,47,225,122,101,70,174,16,35,91,231,199,169,10,40,
+  118,49,242,2,75,163,176,144,50,48,48,112,19,78,200,242,
+  51,130,248,152,41,162,232,246,61,123,238,245,108,218,181,221,
+  131,212,157,180,225,174,109,158,190,189,219,182,109,221,131,87,
+  15,153,117,253,186,11,108,134,43,102,236,55,102,195,35,153,
+  252,163,208,191,65,207,66,175,64,111,66,23,200,172,224,125,
+  175,148,64,245,208,74,104,13,180,25,218,1,125,14,250,50,
+  244,13,8,237,21,180,87,208,94,65,123,5,237,21,180,55,
+  160,189,1,237,13,104,111,64,123,3,218,27,208,30,135,40,
+  51,30,105,179,1,237,13,248,133,173,24,20,37,63,47,119,
+  222,203,119,228,21,145,159,203,26,196,197,16,229,182,69,214,
+  28,11,230,38,243,200,90,69,62,91,191,214,126,46,143,172,
+  40,215,211,80,171,66,226,171,123,238,92,158,12,6,195,59,
+  234,231,207,55,72,247,39,178,115,254,204,213,207,120,71,215,
+  252,177,152,13,250,156,191,11,250,87,210,245,211,13,12,178,
+  191,180,247,217,70,61,253,45,72,201,213,23,248,47,219,99,
+  198,233,246,22,225,239,194,249,97,120,163,232,207,150,155,246,
+  10,121,18,227,231,202,53,10,10,143,20,210,51,35,232,233,
+  15,101,115,235,37,242,162,127,194,108,51,121,185,126,52,63,
+  254,123,230,233,79,172,255,30,121,50,227,64,100,54,218,32,
+  39,84,7,225,238,54,250,161,190,63,101,223,250,189,152,29,
+  183,67,247,65,95,128,190,11,125,31,122,153,204,69,121,80,
+  16,90,12,61,4,253,3,244,143,208,4,116,25,186,72,230,
+  226,14,168,11,106,134,62,6,237,129,254,233,63,196,175,247,
+  9,163,209,96,92,8,142,206,120,59,103,253,59,52,14,29,
+  135,174,226,28,84,14,225,153,52,127,8,218,14,225,89,52,
+  255,53,244,247,208,63,145,57,187,10,242,65,107,33,204,59,
+  27,107,152,253,69,232,127,64,143,147,217,82,9,125,5,194,
+  154,225,157,102,182,252,10,194,115,111,153,37,115,78,17,180,
+  12,194,115,158,131,242,28,172,119,206,19,208,51,208,33,232,
+  28,153,173,14,104,19,244,55,208,15,161,159,67,9,8,235,
+  190,232,6,104,8,58,70,102,27,206,155,182,111,66,42,116,
+  9,194,253,146,139,125,37,23,254,229,98,95,201,109,128,66,
+  80,31,116,19,180,11,186,11,186,31,26,134,208,54,23,123,
+  83,238,115,208,97,8,243,207,195,125,150,87,13,53,66,81,
+  8,243,203,251,52,4,95,242,190,3,193,223,188,159,64,104,
+  147,15,63,243,113,138,204,239,133,214,67,168,155,255,9,232,
+  30,8,235,149,143,61,47,31,253,230,191,1,157,33,179,221,
+  0,97,254,246,143,64,88,47,251,183,160,95,64,71,160,179,
+  248,245,129,251,188,96,9,20,134,176,214,5,24,167,0,247,
+  98,1,218,22,98,95,46,132,189,240,110,8,125,23,254,171,
+  62,52,156,220,55,86,28,47,83,15,180,142,185,147,246,116,
+  162,84,24,221,241,34,153,190,206,232,138,87,138,116,117,178,
+  56,157,112,15,199,247,141,174,90,165,118,119,197,59,213,174,
+  120,151,218,185,210,183,50,190,210,167,182,197,151,159,109,27,
+  142,119,119,171,93,157,241,149,106,39,138,81,146,92,169,250,
+  226,62,117,197,148,239,237,69,109,113,31,26,45,143,183,28,
+  111,210,246,189,216,136,110,199,236,110,213,14,39,142,23,107,
+  7,124,24,251,41,239,18,213,155,236,236,80,59,147,77,141,
+  106,83,114,149,95,93,149,108,91,174,182,37,131,171,213,224,
+  240,92,215,154,79,52,79,118,249,212,229,90,147,76,238,123,
+  166,75,125,186,55,222,175,174,31,86,247,61,219,27,239,81,
+  165,146,3,107,213,232,181,220,224,90,181,119,109,188,79,149,
+  74,174,27,80,215,206,229,162,90,239,139,141,234,130,134,131,
+  55,46,108,216,31,85,123,162,241,53,170,84,114,253,160,122,
+  99,58,183,86,189,81,235,151,227,143,149,197,43,196,98,121,
+  146,153,68,185,48,22,198,139,69,186,44,57,151,16,198,210,
+  120,185,72,87,38,51,137,178,97,125,223,115,67,35,23,135,
+  180,23,155,69,121,245,98,181,54,233,174,85,61,73,145,210,
+  220,7,218,175,183,186,85,111,220,173,86,38,171,212,101,241,
+  42,181,72,182,78,190,216,134,203,209,162,182,36,91,212,198,
+  120,163,218,136,101,120,190,58,18,137,135,213,72,60,162,134,
+  67,193,234,96,48,142,53,140,7,213,80,56,178,56,154,246,
+  63,170,174,233,237,89,220,211,131,42,61,98,162,107,162,245,
+  125,125,176,246,137,37,89,211,91,223,155,94,130,94,117,77,
+  180,207,27,139,97,190,177,120,76,93,219,23,245,162,3,177,
+  114,48,220,216,47,198,42,158,239,126,117,96,85,241,170,85,
+  113,92,185,248,42,53,176,58,88,54,223,125,36,28,42,11,
+  133,132,7,241,144,26,142,244,184,230,187,239,137,132,93,225,
+  176,176,10,135,123,122,221,11,253,115,163,3,120,32,12,125,
+  107,49,22,110,229,23,250,215,171,7,218,180,177,98,181,248,
+  64,155,200,9,179,29,137,141,210,108,87,237,210,188,81,152,
+  29,241,23,98,55,73,179,67,117,8,115,236,38,97,118,33,
+  145,238,196,165,186,164,89,118,82,16,127,161,111,64,154,11,
+  212,2,97,238,27,16,102,39,18,233,78,156,170,83,154,101,
+  39,165,241,23,162,131,210,92,170,150,10,115,116,16,230,159,
+  173,90,21,208,240,188,104,93,106,247,249,160,214,173,118,119,
+  251,17,118,105,29,250,74,181,171,235,6,216,59,180,118,181,
+  227,188,95,235,80,59,58,96,87,87,162,204,39,154,118,117,
+  137,102,157,26,158,153,243,157,90,231,124,177,79,111,83,219,
+  219,69,51,159,214,166,250,206,251,52,159,218,210,210,170,181,
+  168,77,90,139,46,46,247,207,189,25,68,186,62,131,72,215,
+  101,16,233,218,12,98,168,110,140,212,1,175,186,165,167,29,
+  218,74,221,167,13,169,62,95,91,71,199,74,233,75,7,108,
+  62,225,154,40,84,91,180,38,189,17,21,26,27,27,90,90,
+  154,196,136,191,136,106,81,60,57,177,7,116,107,116,106,173,
+  214,63,242,128,146,221,63,25,211,98,106,191,54,168,247,171,
+  131,218,32,180,254,1,61,127,112,106,157,182,17,197,249,27,
+  39,215,107,235,213,141,218,135,116,113,109,126,17,209,34,106,
+  68,139,162,131,200,84,175,182,86,116,176,118,82,244,186,86,
+  139,233,184,183,208,85,76,27,68,7,177,169,126,109,157,232,
+  96,221,164,232,117,157,182,94,95,55,60,137,39,189,95,235,
+  213,123,38,35,49,45,162,135,39,67,125,90,72,15,78,134,
+  163,90,88,15,138,135,198,153,168,75,30,104,77,140,121,147,
+  85,137,101,50,213,36,119,184,68,189,204,52,36,171,19,77,
+  50,213,34,204,142,68,149,204,212,38,231,42,120,135,39,246,
+  253,50,8,146,193,137,200,116,36,25,154,8,37,160,208,209,
+  158,99,189,19,145,163,225,243,145,9,20,37,58,210,97,166,
+  82,111,2,101,161,100,32,225,63,59,52,36,58,240,131,164,
+  255,232,106,45,120,116,245,249,224,209,85,199,2,19,129,68,
+  224,232,42,77,42,25,154,43,153,184,190,98,82,140,21,12,
+  36,219,19,190,225,137,104,50,154,8,204,135,80,2,33,212,
+  151,8,36,99,144,136,81,118,17,131,207,219,163,137,190,223,
+  155,142,37,98,201,254,185,182,211,209,145,179,210,211,72,50,
+  146,232,158,152,11,161,4,194,132,152,82,23,90,117,201,56,
+  146,232,186,24,78,132,147,93,137,30,153,239,193,136,191,47,
+  29,149,35,118,35,238,78,246,78,71,228,40,209,168,244,95,
+  76,37,26,129,79,171,177,108,125,137,232,4,124,58,219,63,
+  50,148,8,37,195,240,45,132,17,250,223,61,61,17,235,139,
+  98,132,136,92,221,72,68,250,41,92,142,4,146,55,96,28,
+  255,68,16,107,132,213,59,27,65,111,157,240,39,156,236,148,
+  126,191,107,122,34,140,37,246,39,186,209,85,84,252,157,142,
+  97,164,216,68,44,209,55,17,237,29,62,27,61,141,181,24,
+  190,24,153,136,92,171,50,25,75,244,15,36,7,39,6,19,
+  253,19,49,204,47,58,124,54,118,26,83,28,206,92,239,238,
+  128,248,131,37,144,12,79,132,19,193,137,128,127,248,108,224,
+  116,119,162,99,248,98,247,132,136,38,210,85,38,113,37,214,
+  206,13,38,166,148,30,175,99,56,177,239,87,190,149,157,201,
+  250,68,107,38,26,62,187,239,96,127,191,220,183,92,218,129,
+  54,21,209,129,182,49,151,120,217,109,30,109,106,123,118,179,
+  54,218,166,62,187,113,125,108,20,233,180,90,154,228,238,231,
+  144,213,29,216,249,198,28,194,224,118,75,131,219,13,131,91,
+  238,166,197,210,80,140,157,116,172,24,207,212,161,176,26,152,
+  26,154,148,161,54,132,45,44,16,12,232,153,252,156,21,155,
+  25,94,231,56,88,168,251,94,108,153,108,153,154,75,168,141,
+  147,242,205,19,212,194,83,97,53,140,104,50,172,5,208,133,
+  62,116,126,72,13,12,171,1,45,56,21,84,131,136,38,131,
+  234,170,110,189,235,202,156,121,50,168,5,123,123,213,80,80,
+  11,232,1,209,223,83,129,128,216,52,177,31,6,194,97,216,
+  3,215,242,221,93,106,187,175,109,88,195,118,173,22,59,53,
+  17,8,7,150,254,218,127,160,237,215,126,97,47,81,93,21,
+  154,8,68,198,169,186,171,52,17,224,85,249,82,211,228,115,
+  125,241,151,90,143,182,249,208,71,188,77,109,213,219,226,67,
+  147,207,181,171,47,181,117,180,227,112,209,166,55,139,252,46,
+  245,165,86,28,88,90,213,102,189,73,228,55,93,215,38,222,
+  52,130,149,122,110,232,29,70,117,223,33,191,31,155,100,40,
+  164,13,5,85,255,13,83,67,170,204,7,131,67,161,97,172,
+  132,127,50,36,86,170,81,184,85,172,150,185,53,17,136,140,
+  91,245,224,85,143,64,100,28,106,169,75,19,193,240,197,125,
+  63,11,170,225,94,173,119,170,71,13,246,104,61,88,213,64,
+  88,11,62,183,107,215,46,81,22,81,123,251,180,190,169,168,
+  26,193,166,57,133,213,235,213,34,162,236,226,181,146,216,128,
+  54,128,205,115,64,127,110,147,124,145,57,15,52,143,57,203,
+  221,7,154,227,99,142,98,88,94,142,69,132,189,162,2,246,
+  10,79,181,176,59,197,125,53,86,85,5,75,85,77,173,176,
+  184,220,233,91,15,22,87,69,165,176,20,151,14,171,67,251,
+  198,35,33,60,104,65,53,144,12,248,213,174,169,14,117,104,
+  220,223,221,149,196,107,165,221,119,197,143,92,48,224,151,69,
+  210,52,213,186,208,226,239,22,45,68,47,135,218,53,63,238,
+  9,255,100,23,98,92,232,73,31,94,57,1,127,215,100,135,
+  180,107,126,172,245,104,115,135,186,162,117,178,177,93,109,107,
+  158,92,182,66,109,109,156,92,218,166,53,163,228,121,191,184,
+  71,39,195,88,220,224,100,36,168,249,245,128,218,213,209,46,
+  238,149,142,46,120,35,86,189,219,143,238,181,144,26,12,245,
+  234,114,186,229,229,152,74,121,101,149,152,74,137,184,121,198,
+  74,74,96,41,41,115,9,75,69,85,250,224,80,85,133,119,
+  123,28,43,161,46,72,167,15,15,245,245,50,139,104,65,58,
+  125,82,168,171,147,89,68,11,210,120,191,28,10,168,129,56,
+  148,12,226,137,72,6,130,106,100,42,156,244,171,126,28,149,
+  50,75,18,8,171,193,100,247,139,120,140,146,111,171,140,83,
+  145,214,171,70,176,163,70,80,5,149,3,114,253,180,14,28,
+  252,226,45,210,255,120,77,141,28,11,209,130,116,250,76,83,
+  81,33,179,136,22,164,229,110,16,247,122,101,22,209,130,52,
+  110,194,3,237,234,243,237,237,201,14,44,120,178,29,23,79,
+  107,85,113,223,106,11,205,109,43,16,52,11,119,197,62,36,
+  220,13,198,177,229,33,14,7,87,207,101,35,136,35,193,213,
+  195,242,108,24,142,7,147,61,136,163,189,61,201,190,168,218,
+  171,5,247,137,99,247,117,77,3,171,50,83,123,81,116,251,
+  202,178,167,99,113,17,168,11,83,241,167,99,1,89,248,170,
+  48,189,42,76,215,82,241,87,81,120,230,219,151,246,141,95,
+  61,62,254,252,217,7,20,229,219,111,141,91,39,16,143,157,
+  255,234,236,248,19,234,208,249,127,78,142,127,43,62,62,251,
+  128,174,20,157,130,189,232,242,40,50,136,79,14,93,41,56,
+  61,116,101,28,229,63,189,52,62,114,117,220,122,194,10,251,
+  169,233,175,234,227,63,61,53,52,221,116,101,252,91,199,210,
+  85,47,143,141,79,12,201,30,46,31,152,79,61,147,41,123,
+  118,252,180,200,31,31,253,246,200,201,241,111,143,28,31,223,
+  53,34,43,136,122,40,63,61,63,176,180,94,29,58,62,254,
+  228,248,191,206,14,29,31,26,182,219,237,14,83,150,201,108,
+  201,177,88,109,34,81,172,47,210,11,10,10,10,21,163,65,
+  129,178,197,119,32,252,101,231,230,229,230,229,27,242,13,115,
+  246,34,125,201,146,138,138,218,218,138,197,122,85,149,199,83,
+  93,93,83,245,246,184,18,65,77,221,92,174,94,207,252,31,
+  86,165,191,47,46,47,41,149,154,203,59,65,89,89,105,169,
+  190,82,176,106,229,170,101,77,45,77,45,203,150,183,45,95,
+  225,107,247,173,212,253,25,26,253,205,173,226,191,70,127,71,
+  103,71,215,13,221,55,248,117,239,60,13,82,13,13,75,65,
+  3,240,122,211,137,235,243,11,234,53,44,148,222,3,122,65,
+  100,77,116,77,95,36,34,50,107,129,190,90,126,23,11,72,
+  130,193,80,40,60,23,135,101,28,126,135,61,83,51,16,16,
+  117,230,98,209,201,77,131,131,235,214,175,187,105,240,67,31,
+  218,172,223,168,199,36,253,253,3,3,11,98,17,200,68,58,
+  191,97,227,198,13,66,3,155,54,13,12,108,26,136,233,118,
+  251,173,31,253,232,199,62,246,231,250,205,250,135,51,220,114,
+  203,159,125,228,150,91,68,252,225,15,111,217,178,101,171,208,
+  159,129,143,0,125,251,246,219,111,191,227,142,79,244,244,138,
+  63,187,76,235,159,252,35,185,243,109,232,219,62,254,241,109,
+  219,110,131,50,241,142,157,59,119,8,125,124,219,199,183,237,
+  18,246,12,111,183,235,111,251,4,212,236,170,44,178,230,5,
+  204,206,53,138,162,132,45,86,75,208,4,138,68,96,82,230,
+  217,109,182,154,204,86,128,208,108,54,153,109,11,66,179,201,
+  150,103,119,153,205,46,151,233,109,4,138,122,234,108,46,91,
+  189,205,105,169,191,97,143,221,92,104,203,251,102,101,229,136,
+  191,205,235,122,184,178,210,185,219,150,231,178,228,185,109,121,
+  61,97,243,155,121,214,6,115,94,160,196,98,195,159,181,164,
+  112,155,215,98,41,180,91,204,150,255,103,14,42,125,22,203,
+  201,47,20,150,108,46,44,217,80,248,129,127,35,99,24,134,
+  97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,
+  24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,
+  134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,
+  97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,
+  24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,
+  134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,
+  97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,
+  24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,
+  134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,
+  97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,
+  24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,
+  134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,
+  97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,
+  24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,
+  134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,
+  97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,
+  24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,
+  134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,
+  97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,
+  24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,
+  134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,
+  97,24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,
+  24,134,97,24,134,97,24,134,97,24,134,97,24,134,97,24,
+  134,97,24,134,97,24,134,97,24,230,191,46,255,31,84,27,
+  246,112,14,55,2,0,
+};
+/* huntforredoct data */
+static const unsigned char dat_huntforredoct = {
+  31,139,8,0,0,0,0,0,0,3,237,86,111,108,83,215,
+  21,63,239,249,197,126,118,28,255,139,9,14,49,225,145,100,
+  145,9,33,177,147,192,66,102,133,231,4,136,49,137,75,73,
+  134,72,87,109,118,129,247,28,8,193,11,152,46,91,4,129,
+  85,25,77,41,67,19,138,166,125,217,62,76,90,215,79,153,
+  138,16,157,178,40,221,250,33,108,8,185,148,134,8,33,10,
+  108,101,80,109,165,31,42,58,76,32,251,221,107,3,105,43,
+  166,178,237,35,87,122,191,223,189,231,220,115,238,189,231,156,
+  119,223,139,145,84,26,77,69,83,53,77,20,213,239,84,183,
+  69,167,233,89,123,214,158,181,103,141,183,142,12,77,173,203,
+  220,203,196,99,218,150,142,204,189,243,127,152,210,28,53,77,
+  179,69,113,162,163,140,99,68,175,84,135,43,35,235,50,247,
+  167,227,65,173,174,166,138,170,161,75,214,44,231,156,80,118,
+  210,38,200,26,208,239,171,105,186,55,161,27,171,219,86,132,
+  73,130,158,201,194,209,20,188,94,104,25,141,166,170,162,53,
+  165,19,227,221,29,157,93,186,24,77,53,151,78,12,14,145,
+  230,106,46,149,218,186,59,62,122,174,186,244,242,235,223,24,
+  78,82,236,198,152,202,110,171,123,39,96,109,97,140,29,136,
+  145,159,232,214,240,223,231,30,224,254,26,109,255,240,224,92,
+  52,149,147,28,200,74,14,64,194,60,15,81,119,7,14,37,
+  128,163,36,16,129,159,199,88,6,119,130,79,128,187,192,99,
+  224,111,131,111,128,55,129,143,128,183,130,103,193,221,48,15,
+  131,95,0,39,192,223,1,39,193,47,130,247,129,177,45,225,
+  44,248,37,34,107,21,120,27,236,142,130,183,131,143,127,57,
+  186,225,84,223,62,101,253,158,126,101,243,142,237,202,115,219,
+  246,237,121,105,71,191,210,191,35,217,27,31,160,232,142,158,
+  94,165,181,127,207,222,189,189,59,6,148,90,37,148,218,222,
+  179,71,217,210,179,55,21,239,85,58,226,122,207,54,101,133,
+  210,214,31,239,219,222,217,27,223,173,248,2,171,87,251,151,
+  81,71,127,77,231,190,129,109,187,126,160,248,252,43,107,253,
+  223,172,93,221,184,140,40,148,161,115,173,25,235,103,21,242,
+  186,12,5,21,215,201,33,189,174,226,112,25,25,15,177,93,
+  86,58,78,13,237,246,158,58,212,231,57,53,78,130,72,186,
+  131,49,153,116,121,116,104,250,176,242,227,174,112,87,248,119,
+  103,246,204,68,83,144,26,225,235,112,96,48,230,21,70,24,
+  74,111,182,102,72,11,12,70,239,26,86,45,221,96,104,140,
+  166,148,31,206,149,33,39,223,197,19,67,223,213,154,177,52,
+  57,123,88,212,129,136,57,80,164,60,160,129,36,160,68,102,
+  96,30,201,64,35,21,0,77,100,7,202,100,0,154,201,4,
+  180,80,62,50,234,113,205,60,63,53,151,137,145,33,18,189,
+  11,79,30,134,194,239,57,30,97,217,79,82,253,36,9,242,
+  12,199,105,142,87,56,158,229,120,174,126,118,110,14,124,181,
+  126,22,43,9,114,26,44,128,207,151,133,91,111,145,84,126,
+  6,253,119,223,75,151,79,129,167,148,1,54,74,82,146,28,
+  62,202,250,189,132,158,192,123,151,91,111,146,145,207,63,141,
+  222,48,239,141,251,125,36,93,219,90,22,126,127,146,143,39,
+  203,152,135,211,176,119,166,85,222,31,247,7,136,178,51,42,
+  54,108,29,41,255,51,100,215,43,35,152,177,140,132,107,97,
+  32,125,48,201,164,230,6,46,51,112,153,120,113,178,252,47,
+  144,13,231,78,247,49,67,115,144,227,177,66,38,185,193,208,
+  220,200,113,132,75,110,114,188,197,37,77,28,191,197,241,40,
+  199,215,185,159,59,220,67,152,227,47,56,214,113,124,133,227,
+  116,40,35,247,37,45,253,100,117,144,73,19,251,231,156,33,
+  18,186,194,136,255,39,217,247,43,23,187,179,229,179,50,43,
+  228,185,35,84,62,107,126,212,179,228,122,209,20,203,75,214,
+  130,245,54,32,87,230,153,141,64,203,68,7,235,63,136,176,
+  200,156,213,109,156,207,105,36,4,99,36,236,148,6,178,153,
+  225,210,243,144,218,114,235,93,168,191,203,50,199,164,33,214,
+  187,126,128,226,36,168,172,111,110,224,253,6,222,31,110,94,
+  205,252,97,92,145,36,238,229,138,174,180,112,230,163,171,187,
+  42,147,228,95,157,173,134,108,85,196,130,198,236,170,211,214,
+  1,82,25,107,68,163,124,206,204,102,117,140,89,93,210,140,
+  124,124,57,91,103,188,70,78,191,55,137,108,57,250,137,143,
+  198,211,106,157,31,89,238,230,25,127,247,253,119,254,155,76,
+  227,172,196,214,151,223,230,124,35,203,230,198,28,143,60,62,
+  185,225,87,143,79,110,56,145,61,249,129,57,244,143,228,124,
+  92,240,7,201,162,180,183,50,205,39,133,51,44,39,174,52,
+  103,17,185,252,52,155,25,212,181,196,178,136,56,95,42,75,
+  16,42,22,35,19,70,255,136,180,1,39,68,31,29,194,187,
+  58,72,118,90,27,24,196,68,191,11,231,184,105,22,85,82,
+  255,38,15,9,17,85,119,141,37,200,173,227,50,9,168,228,
+  238,84,227,36,214,100,79,43,18,217,251,9,243,197,136,170,
+  21,69,66,154,132,252,218,80,77,126,25,239,16,177,17,141,
+  193,179,102,169,127,135,101,22,183,198,167,24,11,90,131,27,
+  81,18,91,104,205,201,65,90,163,73,13,62,178,92,72,80,
+  81,27,78,146,95,229,174,87,152,206,254,81,79,32,68,117,
+  240,36,48,79,116,10,150,162,214,244,180,150,64,145,219,239,
+  135,189,85,115,39,137,207,253,216,81,239,32,167,74,107,161,
+  121,17,154,2,205,154,171,194,43,144,68,32,201,215,92,15,
+  37,124,247,87,33,175,131,92,214,170,190,222,251,193,238,72,
+  30,39,66,44,215,140,241,253,66,214,142,143,200,241,165,9,
+  242,80,5,208,75,62,160,66,213,129,4,53,147,10,108,162,
+  160,51,129,232,153,208,95,79,225,36,33,234,45,120,54,201,
+  62,220,158,146,110,65,5,244,22,39,40,66,5,91,94,93,
+  186,129,240,30,226,118,146,121,92,109,60,131,178,252,6,80,
+  138,25,59,135,96,39,71,83,88,255,32,211,35,135,182,172,
+  12,81,193,140,205,57,251,52,34,8,169,5,79,123,51,165,
+  213,192,126,104,173,206,253,73,40,35,62,50,234,77,88,161,
+  129,199,109,196,85,143,119,46,164,43,13,130,24,34,187,44,
+  162,150,108,64,163,38,253,53,17,179,92,79,196,140,99,161,
+  221,162,95,128,175,85,120,240,205,168,100,111,203,84,90,77,
+  171,149,123,137,46,178,250,158,66,13,141,226,57,133,157,154,
+  120,245,17,25,57,154,2,187,128,69,202,114,50,46,85,201,
+  131,234,179,165,223,102,22,108,4,139,40,52,22,244,189,208,
+  56,30,105,188,208,108,141,149,34,218,203,89,45,234,110,172,
+  188,30,79,216,185,11,95,162,8,78,139,85,96,105,195,92,
+  37,50,164,91,30,89,42,220,70,130,13,81,77,29,221,220,
+  128,88,217,81,61,13,176,110,198,163,66,155,7,110,194,19,
+  228,81,51,114,52,69,83,200,7,88,247,34,54,65,212,191,
+  141,71,221,196,171,206,132,216,171,220,34,155,51,55,230,132,
+  49,199,136,59,235,143,57,93,56,242,6,121,244,230,202,4,
+  85,56,10,199,130,132,175,54,240,144,230,224,59,18,32,247,
+  92,156,92,186,145,112,199,57,74,194,67,200,17,203,143,37,
+  173,250,87,17,171,9,43,211,193,135,87,15,98,174,47,231,
+  195,255,37,31,94,238,195,247,200,71,59,203,177,99,37,177,
+  218,143,50,13,118,200,254,6,124,216,161,138,29,46,202,214,
+  97,157,143,86,65,210,248,22,219,105,35,171,190,220,174,85,
+  172,168,232,237,208,181,96,54,219,125,53,95,121,78,179,69,
+  218,244,134,220,205,116,46,86,197,86,100,149,235,40,113,249,
+  104,237,152,208,39,186,8,235,85,243,111,174,189,24,255,38,
+  57,143,45,124,7,146,94,193,239,238,11,200,3,139,168,21,
+  59,168,131,6,239,174,38,29,15,197,196,116,136,157,25,18,
+  220,43,152,163,112,63,254,91,30,156,195,207,114,198,226,243,
+  56,54,57,15,155,142,135,112,63,249,200,86,60,228,160,174,
+  67,87,195,140,97,23,45,86,169,32,154,170,37,71,53,217,
+  39,125,228,192,216,174,44,121,40,25,242,145,243,139,18,204,
+  113,125,101,78,225,67,201,19,127,176,141,248,247,153,215,240,
+  45,250,66,19,156,15,132,207,229,39,90,63,161,217,255,131,
+  46,175,240,190,120,219,241,255,244,104,94,112,79,250,80,249,
+  95,61,10,72,36,126,9,17,14,92,108,255,146,241,235,103,
+  249,138,141,237,182,205,83,208,97,61,150,127,41,191,214,242,
+  83,243,231,230,132,124,77,142,155,110,153,94,54,89,141,191,
+  49,182,229,253,51,239,231,121,109,210,172,116,82,74,74,1,
+  195,103,134,113,195,176,161,211,80,33,222,17,207,138,191,22,
+  15,136,47,136,141,162,71,200,8,87,132,63,9,111,10,63,
+  19,126,36,104,194,102,97,141,176,66,240,10,86,186,79,183,
+  233,26,125,64,103,104,130,222,162,223,210,47,105,148,142,209,
+  48,29,164,151,233,251,180,147,182,211,247,168,155,186,104,19,
+  109,164,54,106,165,53,20,164,70,90,73,117,84,75,43,168,
+  138,124,84,73,21,84,134,187,186,20,183,118,9,21,227,6,
+  47,162,5,228,166,66,114,145,147,28,75,150,44,41,45,45,
+  93,188,120,177,215,235,45,41,41,89,180,104,81,113,113,177,
+  199,227,89,184,112,97,81,81,209,130,5,11,220,110,119,97,
+  97,161,203,229,114,58,157,14,135,195,110,183,219,108,182,130,
+  130,2,171,213,154,159,159,111,177,88,204,102,179,44,203,38,
+  147,201,104,52,230,229,229,73,146,100,48,24,68,81,20,4,
+  252,90,147,52,175,25,230,53,113,94,19,230,181,167,205,217,
+  252,246,180,254,143,29,59,122,244,181,215,70,70,94,13,133,
+  66,45,95,163,61,170,139,92,123,232,255,225,249,140,185,102,
+  202,53,57,215,204,150,124,107,129,13,145,203,149,236,191,1,
+  205,3,254,171,226,18,0,0,
+};
+/* JamCrackerPro data */
+static const unsigned char dat_jamcrackerpro = {
+  31,139,8,0,0,0,0,0,0,3,229,84,223,107,91,101,
+  24,126,206,57,201,215,67,8,89,150,198,16,106,214,157,38,
+  135,154,132,36,166,205,40,40,173,158,164,117,100,93,87,102,
+  187,139,9,50,78,110,146,158,50,183,50,172,96,136,210,13,
+  182,121,49,240,102,76,24,94,12,241,162,45,67,138,12,217,
+  38,204,80,165,150,225,69,54,198,240,202,31,83,100,3,145,
+  32,187,89,90,141,207,119,54,7,187,241,31,176,229,125,191,
+  247,199,243,62,231,251,222,247,251,98,3,62,27,138,73,41,
+  31,46,231,163,195,56,208,233,254,158,45,139,104,115,27,201,
+  86,51,31,221,3,122,49,122,66,122,99,150,8,209,15,183,
+  172,86,51,94,247,254,144,87,103,173,68,25,234,200,206,141,
+  109,24,173,175,223,220,247,250,102,183,205,76,51,175,184,25,
+  211,76,193,184,181,126,155,108,50,147,173,123,63,17,201,177,
+  186,247,162,200,24,117,239,106,62,232,50,95,247,158,55,44,
+  242,230,118,205,65,17,241,236,28,84,97,238,106,64,8,131,
+  90,17,3,165,99,226,97,97,27,59,240,99,251,66,177,227,
+  125,127,252,17,173,75,39,148,61,163,88,90,208,10,13,0,
+  122,254,212,80,17,234,192,62,120,6,232,159,190,140,192,80,
+  67,219,66,168,52,135,48,37,82,90,70,148,107,140,107,63,
+  37,62,212,128,133,65,90,73,70,51,165,36,114,173,109,228,
+  185,211,224,237,162,40,193,226,126,151,245,71,80,240,213,79,
+  202,244,226,2,138,242,155,24,178,176,76,185,74,217,164,124,
+  79,150,29,184,160,95,251,23,119,192,69,237,239,120,190,157,
+  125,174,234,175,64,153,26,239,120,190,12,93,247,124,193,117,
+  163,18,164,110,87,124,227,29,111,95,197,67,61,97,56,240,
+  228,83,8,85,5,177,62,251,97,203,65,116,146,82,11,207,
+  235,107,14,98,71,253,182,144,235,113,137,138,49,219,191,214,
+  192,217,163,34,63,138,179,182,111,141,39,100,102,84,219,226,
+  94,200,128,77,162,250,110,177,222,239,108,123,17,61,170,23,
+  26,114,181,3,126,135,189,136,30,23,5,217,147,232,100,10,
+  153,90,52,47,103,67,198,89,122,85,223,132,3,163,215,65,
+  22,25,198,213,33,7,113,246,52,5,147,136,56,119,20,159,
+  23,37,106,201,196,190,197,37,147,92,245,20,79,158,171,77,
+  17,145,174,237,157,247,16,147,230,153,124,249,157,19,214,107,
+  109,96,112,146,28,201,95,203,119,155,11,175,134,250,202,39,
+  195,207,151,79,221,41,222,43,5,215,229,125,96,46,77,254,
+  164,223,81,128,228,91,194,227,174,211,139,178,35,5,7,97,
+  87,71,16,46,88,136,76,47,26,117,237,109,113,141,179,54,
+  128,51,230,236,75,212,241,234,43,135,24,57,147,156,125,151,
+  58,83,13,38,58,154,37,253,66,71,27,145,145,120,93,155,
+  200,239,124,124,203,180,92,220,234,125,192,253,178,46,241,0,
+  170,100,41,201,186,225,241,142,150,102,247,190,59,88,166,117,
+  144,214,186,107,189,67,235,170,107,125,76,235,179,177,186,166,
+  226,66,48,7,49,131,53,234,106,103,188,163,254,89,57,194,
+  124,172,114,152,122,111,101,134,122,161,50,197,123,211,35,121,
+  199,234,106,235,217,138,108,93,189,137,75,140,175,227,83,218,
+  127,96,141,246,111,184,146,173,107,33,52,249,5,31,190,161,
+  61,130,22,237,28,238,176,23,47,171,231,154,14,212,154,236,
+  171,199,88,129,143,179,209,225,161,14,65,176,255,64,174,26,
+  72,240,206,159,121,8,31,167,162,64,159,94,12,5,107,192,
+  69,245,36,179,93,222,103,174,167,87,205,162,158,132,32,147,
+  40,204,32,102,215,229,156,79,186,231,79,76,34,192,88,136,
+  18,166,68,56,197,104,48,201,31,133,37,247,119,224,186,210,
+  54,173,201,85,152,213,240,179,223,41,165,144,179,135,7,231,
+  97,234,105,250,187,171,126,35,13,227,222,7,156,151,110,243,
+  14,220,109,18,103,64,79,236,135,175,119,30,187,145,227,60,
+  7,17,39,183,202,246,239,168,137,222,38,249,12,211,65,128,
+  49,173,54,178,54,138,110,245,153,189,216,113,137,108,161,188,
+  84,56,193,211,68,36,238,190,254,212,151,152,16,99,158,90,
+  206,173,245,149,86,248,190,121,163,237,126,158,162,95,214,18,
+  105,193,144,152,251,122,175,133,236,61,169,51,244,189,53,195,
+  173,241,19,153,44,52,186,93,164,237,192,211,138,180,140,18,
+  37,170,62,246,173,135,125,27,182,195,46,94,190,4,211,54,
+  159,68,3,100,75,80,94,112,163,1,125,9,61,53,117,2,
+  46,135,201,250,158,90,233,73,213,10,95,226,136,236,237,147,
+  57,4,134,249,166,63,231,28,143,245,77,192,142,200,74,190,
+  67,176,103,103,57,159,199,111,53,230,242,244,77,47,106,91,
+  218,186,118,78,123,67,75,169,91,106,75,93,86,79,169,71,
+  212,81,53,166,252,165,252,172,108,40,151,149,243,202,123,202,
+  156,114,72,41,42,47,42,253,74,0,127,163,141,95,112,23,
+  55,113,3,87,176,138,75,248,8,31,146,249,191,255,255,7,
+  127,255,0,148,206,213,167,246,6,0,0,
+};
+/* LastNinja3 data */
+static const unsigned char dat_lastninja3 = {
+  31,139,8,0,0,0,0,0,0,3,133,86,111,104,91,215,
+  21,255,189,39,201,126,150,101,249,89,81,133,226,120,174,234,
+  122,193,36,146,42,212,204,152,88,78,159,20,207,83,148,69,
+  113,20,207,245,66,214,201,157,103,135,118,22,97,160,117,97,
+  166,49,25,3,127,216,70,86,198,216,135,177,110,101,31,210,
+  49,130,241,151,149,66,169,90,198,48,37,20,213,11,101,132,
+  64,67,58,186,193,154,98,88,234,58,138,44,237,119,238,123,
+  50,254,48,50,137,115,207,57,247,156,119,254,223,251,94,17,
+  240,230,203,249,114,17,238,205,34,244,53,0,26,236,159,151,
+  255,110,226,54,232,218,107,132,79,9,127,36,172,226,154,118,
+  201,243,47,239,166,199,235,19,61,221,117,142,144,131,238,185,
+  69,168,170,231,135,249,164,135,216,32,248,149,21,52,183,148,
+  213,78,145,55,155,208,249,87,219,252,183,124,234,250,119,16,
+  82,126,77,197,251,105,247,199,132,151,160,183,125,137,224,81,
+  122,67,112,81,67,71,7,113,151,99,187,225,68,236,134,139,
+  180,251,127,218,126,93,86,180,126,93,180,251,39,194,239,104,
+  247,10,225,194,174,109,31,159,247,42,13,219,118,83,233,251,
+  84,220,13,174,218,174,21,161,197,151,238,10,236,169,155,60,
+  137,238,183,253,183,253,237,93,99,190,203,157,55,58,7,188,
+  87,58,254,221,241,45,227,67,227,217,246,143,218,75,237,174,
+  182,87,219,44,207,39,158,95,120,210,238,45,247,117,247,139,
+  238,168,107,211,245,103,215,21,215,105,87,68,255,143,190,174,
+  255,94,255,145,254,172,62,172,135,180,109,237,182,246,142,118,
+  77,187,170,93,210,230,180,73,109,76,139,106,7,180,78,212,
+  241,25,238,224,38,214,241,22,214,112,13,175,226,87,248,25,
+  126,130,151,241,18,46,226,5,204,225,57,124,19,83,56,141,
+  147,248,26,142,227,25,140,98,4,95,65,18,79,33,134,67,
+  204,244,203,120,18,79,224,113,244,163,15,189,216,143,48,107,
+  255,24,130,216,135,0,122,216,129,110,214,191,139,121,251,216,
+  179,78,86,164,131,127,3,255,239,103,123,62,167,60,231,30,
+  233,57,162,60,31,120,132,231,78,213,135,71,254,78,214,118,
+  242,167,106,59,75,153,18,122,199,150,24,95,31,185,247,72,
+  233,138,239,16,190,17,34,229,86,188,23,125,135,179,8,38,
+  204,227,155,192,225,19,8,39,134,160,59,116,31,105,183,67,
+  71,70,47,112,238,3,163,75,18,75,102,17,6,161,109,22,
+  88,75,196,224,94,93,66,115,158,179,93,176,70,45,184,79,
+  213,234,13,90,214,16,82,235,247,213,250,62,245,77,209,173,
+  212,209,54,184,136,190,155,149,200,34,130,213,91,212,174,210,
+  78,178,197,237,244,147,27,220,229,190,71,46,52,42,22,244,
+  100,10,237,71,82,216,230,206,122,190,28,93,137,101,225,38,
+  24,179,104,255,169,237,143,57,247,19,194,132,8,97,138,144,
+  34,204,228,203,124,70,34,214,243,229,244,61,12,58,150,154,
+  220,125,57,145,66,71,38,157,201,244,92,49,65,190,84,72,
+  159,89,111,222,111,249,146,221,34,48,227,60,165,5,195,212,
+  201,145,130,162,44,82,46,69,13,147,210,21,21,37,229,81,
+  212,0,41,183,162,194,178,151,80,92,33,45,177,208,199,86,
+  190,188,239,29,52,87,176,239,93,174,140,44,25,131,145,75,
+  47,64,75,250,22,177,12,223,2,45,156,93,132,119,30,90,
+  100,116,145,221,247,178,126,254,106,58,103,81,210,207,74,251,
+  243,101,218,236,94,99,238,220,113,103,164,250,126,70,171,75,
+  127,114,236,207,60,154,70,190,76,206,79,61,141,82,163,144,
+  205,88,102,152,148,143,192,123,206,238,103,34,213,108,22,239,
+  156,172,61,12,38,30,83,214,173,204,55,164,167,11,104,172,
+  19,55,216,91,201,222,171,250,32,93,111,163,151,190,209,37,
+  222,4,198,104,154,182,210,98,235,172,234,126,17,59,183,103,
+  209,60,66,255,58,45,205,159,170,213,54,249,68,241,84,237,
+  225,56,241,12,241,175,137,39,37,151,9,75,183,208,157,4,
+  163,51,169,111,210,143,223,140,33,122,85,123,65,242,193,1,
+  11,81,242,177,61,124,140,124,124,15,31,159,69,99,142,190,
+  75,8,177,114,183,18,113,244,211,166,139,158,63,89,181,235,
+  18,34,150,72,206,19,203,254,245,34,147,200,149,112,144,180,
+  151,207,29,100,46,155,124,46,92,45,97,96,204,66,120,149,
+  211,83,2,76,202,3,99,37,12,42,141,247,73,69,16,214,
+  75,188,103,250,81,226,105,234,231,206,33,68,41,91,163,181,
+  168,99,77,248,215,104,109,232,3,206,225,139,172,146,25,199,
+  254,213,56,158,146,158,45,114,108,118,159,146,19,26,38,54,
+  184,19,223,99,217,165,44,39,144,148,185,163,229,164,99,89,
+  248,172,173,69,249,48,70,200,143,80,62,226,200,133,31,162,
+  231,35,142,103,223,174,86,64,60,237,181,47,217,202,68,87,
+  63,99,124,203,76,54,199,157,124,181,242,76,28,65,211,204,
+  46,211,66,112,22,90,102,236,219,8,22,74,200,139,148,85,
+  153,156,183,163,45,32,239,43,241,77,34,147,146,101,4,150,
+  19,129,69,249,8,113,86,250,72,189,9,100,189,37,22,123,
+  156,207,103,146,113,28,53,226,188,160,190,74,109,99,195,98,
+  92,238,87,172,177,52,142,202,9,167,52,37,179,175,166,203,
+  160,126,200,62,169,140,176,247,111,147,249,50,99,52,76,115,
+  53,133,34,117,174,17,207,178,219,127,39,126,158,248,58,241,
+  28,247,107,196,223,37,255,115,226,26,113,150,184,78,124,144,
+  120,199,145,55,200,175,16,115,182,181,243,140,241,28,34,187,
+  149,209,212,237,145,151,106,93,45,177,247,150,234,214,49,88,
+  140,103,226,174,69,62,75,217,81,251,12,85,238,33,192,137,
+  153,230,206,52,37,33,123,82,236,251,8,6,79,193,15,138,
+  31,178,54,83,78,78,82,195,224,148,85,181,210,181,237,251,
+  213,74,194,108,101,151,88,150,201,95,192,78,138,53,229,109,
+  61,143,157,100,186,246,224,186,232,87,173,106,133,231,206,39,
+  119,200,195,155,103,211,65,147,248,6,79,61,101,227,114,118,
+  30,231,9,56,148,47,219,17,9,205,170,190,89,200,6,194,
+  173,147,90,63,207,111,152,139,140,35,34,211,76,28,119,122,
+  21,33,196,149,15,102,90,68,163,78,239,221,212,250,84,225,
+  248,194,63,216,247,8,33,94,188,85,200,170,219,117,92,124,
+  48,211,99,130,115,124,173,193,24,7,179,31,231,94,134,26,
+  77,76,168,53,203,24,134,11,89,103,186,163,133,108,80,110,
+  191,46,70,30,144,91,67,246,11,162,19,96,4,114,226,121,
+  151,104,111,176,191,62,169,29,35,233,181,179,225,139,181,93,
+  164,140,111,134,153,94,22,233,192,34,194,124,127,60,185,81,
+  161,198,126,250,29,84,107,132,112,206,220,159,93,38,30,112,
+  36,135,4,171,157,33,103,39,238,224,132,131,135,119,53,142,
+  56,59,199,212,154,81,235,132,90,11,106,157,140,157,64,78,
+  38,99,163,14,83,189,87,44,179,71,221,147,5,70,22,240,
+  18,146,224,219,226,158,221,65,238,7,73,117,40,202,255,177,
+  246,113,47,179,109,187,219,113,87,231,221,117,184,34,223,74,
+  149,101,141,221,58,108,246,72,150,210,17,218,25,161,167,169,
+  194,137,214,20,160,247,192,25,251,86,20,43,83,39,130,61,
+  118,21,31,220,40,162,190,181,123,143,75,77,175,218,156,202,
+  101,134,252,242,30,126,154,252,69,155,39,151,34,247,124,75,
+  122,188,246,249,244,211,180,64,40,17,222,163,108,162,37,251,
+  64,77,5,134,85,71,229,84,4,237,190,229,24,77,237,55,
+  179,216,94,45,162,246,75,206,53,181,234,115,51,167,139,216,
+  254,173,172,95,220,137,76,211,130,201,187,246,139,5,52,47,
+  16,111,19,95,36,126,64,252,67,226,45,206,250,115,196,181,
+  133,87,184,62,116,164,60,167,205,40,241,206,194,27,242,198,
+  97,206,81,245,6,250,3,123,30,169,90,27,149,129,24,130,
+  27,103,98,105,24,4,223,110,70,102,116,69,221,14,238,226,
+  74,246,159,205,70,250,129,124,155,207,226,254,196,211,117,249,
+  26,253,252,47,95,255,232,114,51,95,38,215,16,46,119,137,
+  235,95,231,183,229,11,95,254,255,5,10,162,194,123,238,11,
+  0,0,
+};
+/* lastninjaiii data */
+static const unsigned char dat_lastninjaiii = {
+  31,139,8,0,0,0,0,0,0,3,237,88,253,111,83,215,
+  25,126,238,181,147,56,142,73,156,224,70,38,100,238,109,74,
+  81,10,142,99,76,154,133,124,208,107,19,130,99,154,75,112,
+  210,52,48,214,218,16,108,62,26,47,2,220,18,22,209,136,
+  117,91,52,209,137,85,21,218,15,211,186,85,251,129,85,19,
+  138,248,101,213,180,178,116,154,166,168,98,149,155,33,52,33,
+  164,34,186,177,73,43,85,164,209,52,56,78,188,231,28,223,
+  68,17,155,248,11,184,214,123,158,243,158,143,247,243,156,247,
+  222,36,6,171,199,72,27,105,95,43,140,228,156,119,151,113,
+  3,143,159,199,207,227,231,241,35,159,158,44,166,119,102,23,
+  178,241,88,98,160,39,187,48,243,225,116,194,233,107,205,85,
+  199,129,243,2,99,192,155,222,240,198,200,206,236,226,141,120,
+  123,34,224,219,4,47,231,70,124,155,37,30,209,142,161,151,
+  99,77,236,167,124,173,11,87,147,197,222,93,13,97,88,57,
+  47,198,194,70,154,82,175,135,46,26,233,77,134,207,115,245,
+  247,251,122,250,250,147,170,145,222,238,185,58,54,142,68,213,
+  118,143,117,215,190,158,127,236,241,122,110,189,245,204,15,70,
+  16,187,59,169,139,106,181,240,14,119,219,5,210,2,53,242,
+  195,164,35,252,207,252,18,235,215,197,23,62,123,35,111,164,
+  205,145,179,133,145,179,28,17,146,199,177,175,135,78,41,68,
+  3,10,64,220,43,188,36,246,17,222,33,246,19,223,39,190,
+  72,252,11,177,151,56,65,28,36,102,137,251,136,57,226,126,
+  138,113,18,191,69,116,19,15,16,107,137,52,75,249,17,241,
+  32,80,118,151,120,136,235,207,19,135,136,23,30,142,238,11,
+  241,147,167,52,227,104,234,88,92,235,238,238,214,78,28,30,
+  121,53,62,138,72,250,228,169,163,41,173,239,208,145,248,137,
+  215,190,147,138,107,141,90,223,232,201,83,135,135,181,173,90,
+  253,150,109,219,182,60,139,93,39,226,103,14,143,54,246,134,
+  187,180,122,255,115,141,254,150,198,109,223,124,214,171,245,156,
+  240,245,157,26,61,116,252,180,86,31,104,50,71,1,35,29,
+  204,226,252,142,44,18,91,198,140,7,214,161,167,186,173,9,
+  35,173,157,201,159,97,236,78,147,70,216,63,198,249,193,202,
+  163,34,58,108,25,27,182,42,138,216,90,96,101,107,69,41,
+  219,34,216,216,22,99,13,219,18,84,176,181,193,194,182,20,
+  37,108,237,40,51,210,225,94,53,136,10,106,180,87,158,115,
+  66,123,197,72,63,236,117,12,214,217,24,212,43,66,151,57,
+  100,231,175,130,88,12,85,121,143,244,5,233,125,210,36,46,
+  41,163,69,255,178,207,22,217,29,98,157,106,217,79,138,64,
+  45,186,73,202,200,253,205,220,89,68,180,145,202,165,20,228,
+  231,164,212,50,49,159,207,211,15,85,242,121,254,150,117,170,
+  234,33,84,75,189,78,201,151,83,238,247,72,175,67,45,254,
+  6,169,72,174,171,167,247,118,238,46,37,174,49,101,47,153,
+  22,91,97,97,223,250,127,101,255,90,180,43,14,175,161,220,
+  223,144,126,65,185,231,72,71,86,100,59,184,223,46,87,20,
+  100,231,229,122,135,180,123,137,173,178,34,69,244,133,46,213,
+  82,181,42,110,98,39,42,254,80,126,171,188,100,77,135,227,
+  141,178,107,101,117,246,115,165,255,46,253,182,237,134,237,165,
+  146,207,74,82,37,150,226,119,139,245,162,187,69,63,41,10,
+  90,231,172,151,173,199,173,94,203,172,229,183,150,115,150,61,
+  22,77,253,143,58,173,254,82,253,174,250,146,218,172,86,43,
+  243,202,45,229,35,229,146,114,65,25,85,134,148,94,165,67,
+  241,42,235,149,50,228,240,37,110,227,58,166,241,33,174,224,
+  18,222,197,69,188,133,239,227,44,94,199,8,142,97,8,47,
+  99,31,250,177,7,187,177,11,59,240,60,218,208,130,231,16,
+  64,35,26,176,137,158,62,131,167,241,20,158,132,7,181,168,
+  193,58,184,25,251,39,224,194,90,84,161,146,25,168,96,252,
+  215,208,111,7,115,86,198,136,148,242,103,251,223,106,244,208,
+  83,208,188,95,106,142,60,82,179,38,53,175,127,132,230,50,
+  153,135,71,62,187,179,139,70,79,118,113,44,148,66,77,199,
+  24,237,171,37,247,49,123,170,228,75,5,191,84,205,158,85,
+  242,118,212,110,14,195,229,119,238,152,5,54,119,195,237,175,
+  135,106,246,107,217,183,154,125,173,237,8,207,125,85,219,152,
+  176,37,52,12,27,169,152,101,228,138,191,1,214,201,49,228,
+  19,60,219,81,189,77,135,181,39,155,91,162,100,5,213,178,
+  61,33,219,79,184,222,41,214,78,229,80,188,97,24,181,215,
+  167,180,97,184,50,55,185,58,67,57,129,101,110,209,67,110,
+  195,10,247,42,185,234,54,33,65,13,180,163,164,169,29,243,
+  28,153,54,210,222,9,81,161,73,182,56,74,206,23,244,209,
+  103,15,201,77,210,72,253,164,118,210,160,145,230,30,97,49,
+  107,118,240,30,54,152,146,242,28,61,235,111,71,105,40,24,
+  10,137,58,32,234,127,52,184,119,58,127,127,89,151,24,141,
+  1,131,230,46,197,229,230,154,8,123,144,61,157,61,139,236,
+  53,179,167,202,158,151,189,34,217,171,99,207,42,123,110,49,
+  230,151,92,52,40,108,161,142,57,35,189,246,35,228,39,176,
+  246,143,108,105,89,160,1,182,72,48,9,37,224,24,102,177,
+  119,36,41,161,111,24,246,4,20,173,109,152,217,183,51,126,
+  229,153,96,68,231,140,135,145,46,55,210,148,89,113,133,190,
+  115,196,26,18,209,47,167,181,170,200,79,132,249,73,32,111,
+  51,210,228,202,185,78,225,172,45,26,14,233,78,55,123,14,
+  146,221,72,23,242,233,111,207,231,99,183,119,103,23,92,254,
+  39,164,116,61,244,162,200,105,18,75,211,196,37,230,86,120,
+  111,151,121,16,89,47,166,150,218,182,49,86,2,91,91,144,
+  178,130,66,86,159,204,126,12,139,183,226,200,55,81,191,74,
+  73,137,158,108,118,150,59,98,124,131,118,18,7,137,63,37,
+  246,10,95,186,116,85,71,69,0,180,206,201,245,78,234,41,
+  119,54,192,123,65,57,38,252,193,122,29,94,242,13,171,248,
+  6,242,190,85,188,47,142,165,33,234,78,161,154,145,187,233,
+  247,193,67,153,22,106,190,59,89,136,75,53,81,88,114,128,
+  40,198,47,199,232,68,36,133,141,236,219,185,111,35,125,153,
+  229,62,119,38,133,186,14,29,238,73,158,158,20,224,228,124,
+  85,71,10,27,228,138,79,216,211,224,86,83,172,51,30,164,
+  120,155,60,28,225,119,4,231,174,80,154,215,148,38,248,247,
+  40,173,254,83,158,195,227,140,146,211,135,117,147,62,52,138,
+  156,13,243,216,172,236,18,55,212,77,180,113,196,183,74,178,
+  69,74,246,35,32,206,29,37,7,76,201,130,15,23,86,113,
+  190,25,45,228,91,56,223,98,206,11,190,158,154,155,76,205,
+  142,149,85,85,66,211,106,249,194,91,113,162,51,95,210,190,
+  113,58,27,225,136,145,153,122,222,7,151,211,25,30,167,4,
+  87,28,74,168,227,21,184,162,41,24,98,150,81,233,77,20,
+  172,141,194,112,164,248,38,17,39,37,76,11,116,211,2,157,
+  243,45,196,176,200,35,215,117,33,108,79,49,216,157,220,31,
+  10,248,208,106,243,177,64,237,228,106,219,140,78,187,172,111,
+  235,29,65,180,138,27,206,217,118,113,246,229,233,178,113,125,
+  117,225,166,210,194,154,191,246,242,59,32,5,155,211,57,217,
+  142,24,215,92,34,198,153,237,191,17,15,18,47,19,135,56,
+  158,37,30,38,255,99,98,150,24,38,230,136,27,137,139,230,
+  252,18,249,9,34,207,182,114,128,54,238,135,182,18,25,69,
+  86,15,67,68,235,66,138,185,215,101,182,182,67,167,61,93,
+  119,116,242,97,206,181,22,238,208,212,61,84,241,196,12,112,
+  100,128,51,213,133,147,82,168,71,176,241,22,188,22,187,193,
+  216,244,155,62,137,24,186,250,245,140,30,204,206,223,207,76,
+  249,157,203,222,249,199,197,201,79,98,177,157,49,101,181,78,
+  96,49,16,204,62,184,44,214,103,244,204,20,239,157,67,212,
+  144,133,235,125,65,151,147,120,141,183,158,115,157,226,238,60,
+  201,27,176,201,72,23,44,18,125,70,245,119,209,112,149,123,
+  249,166,230,14,240,27,102,132,118,104,226,52,19,125,102,174,
+  52,146,79,234,160,167,49,44,229,168,189,130,171,190,144,232,
+  75,254,157,121,215,72,190,216,205,104,88,86,215,78,161,131,
+  158,110,23,24,225,107,13,182,78,208,251,78,142,133,184,34,
+  143,46,217,134,105,67,115,52,108,158,110,111,52,236,18,213,
+  111,13,45,175,18,85,67,140,71,197,154,42,90,32,110,60,
+  107,137,242,1,243,235,16,177,163,37,53,5,111,248,98,45,
+  17,179,180,111,144,158,190,33,102,235,134,225,230,251,227,233,
+  153,41,174,88,71,189,27,100,171,145,246,59,215,133,199,137,
+  117,230,204,38,129,114,164,222,28,241,153,232,55,177,121,101,
+  69,147,57,178,93,182,33,217,118,201,54,42,219,222,134,110,
+  68,196,201,152,201,193,41,223,43,186,179,82,214,201,40,45,
+  171,178,147,2,224,219,226,94,33,131,28,119,177,87,42,123,
+  229,159,43,159,215,208,219,226,59,165,119,84,214,174,205,83,
+  226,91,105,106,92,97,182,54,59,43,133,151,34,35,148,211,
+  66,77,253,209,238,229,83,128,154,245,123,11,85,81,72,233,
+  239,118,85,22,162,248,224,90,12,185,185,149,58,46,98,122,
+  161,192,73,95,6,201,143,175,226,7,200,143,20,120,114,237,
+  228,14,46,207,238,200,126,53,176,149,18,72,41,210,199,156,
+  235,90,158,251,84,158,10,52,203,140,138,91,225,42,228,45,
+  66,107,178,63,139,99,126,50,134,172,248,235,134,171,114,67,
+  131,123,98,152,255,185,104,191,190,173,13,80,130,147,181,246,
+  235,36,242,71,136,243,196,17,226,3,226,105,226,28,207,250,
+  203,196,108,242,109,182,11,230,44,239,105,222,75,92,76,126,
+  32,222,56,244,217,43,223,64,191,98,206,181,140,62,51,85,
+  215,0,215,204,222,134,32,108,36,199,138,71,78,239,132,172,
+  14,214,216,132,248,219,42,248,64,124,155,199,113,191,107,107,
+  78,124,141,126,245,167,194,95,90,228,150,4,23,25,101,251,
+  231,196,188,248,111,146,248,253,23,3,19,106,181,90,18,0,
+  0,
+};
+/* mcoder data */
+static const unsigned char dat_mcoder = {
+  31,139,8,0,0,0,0,0,0,3,205,85,255,79,19,103,
+  24,255,220,245,122,61,142,90,175,21,42,69,90,218,66,225,
+  64,190,84,18,140,139,76,123,135,20,168,210,57,32,168,113,
+  49,71,70,91,44,139,65,132,184,48,230,212,184,173,44,11,
+  113,100,113,201,126,216,150,44,89,92,226,15,142,253,180,45,
+  91,138,51,27,251,242,67,83,201,28,102,95,212,44,11,89,
+  128,184,197,236,75,69,187,231,14,157,254,9,187,228,243,190,
+  207,251,233,115,207,125,222,231,121,222,183,26,184,11,209,163,
+  209,163,93,57,222,230,158,64,26,158,158,6,44,197,75,221,
+  71,176,140,165,113,40,57,254,151,254,113,37,103,145,250,71,
+  105,108,233,63,66,76,182,31,204,171,143,135,192,187,67,96,
+  221,10,252,196,221,34,238,89,226,108,196,137,196,85,145,183,
+  141,184,1,226,156,196,57,136,171,141,52,48,147,113,235,158,
+  239,44,249,142,191,45,249,20,162,99,104,64,37,60,196,220,
+  11,165,195,171,213,32,254,94,10,246,85,136,41,132,211,209,
+  177,30,25,53,201,239,237,131,168,69,141,127,175,228,186,216,
+  130,187,49,224,76,199,201,76,40,122,7,130,150,212,158,106,
+  146,33,206,12,66,120,90,138,200,144,227,162,170,108,105,67,
+  11,225,136,127,16,92,118,150,87,96,221,162,64,28,129,195,
+  101,63,128,6,130,103,88,202,184,6,120,123,8,155,53,145,
+  7,164,1,142,52,46,103,21,255,56,255,74,246,48,108,217,
+  223,37,120,39,181,41,201,69,62,181,132,26,237,244,67,219,
+  59,25,29,163,185,140,226,41,112,179,10,174,39,56,138,90,
+  237,157,244,181,161,36,130,161,164,36,195,253,1,147,149,225,
+  49,98,110,165,152,162,30,147,84,73,198,91,229,4,239,125,
+  69,21,170,140,96,145,203,174,162,146,16,32,166,202,215,9,
+  107,6,73,206,33,163,90,143,96,190,77,17,120,61,2,253,
+  226,160,40,78,123,27,252,4,95,116,236,4,90,100,56,105,
+  239,254,132,64,249,242,107,96,60,180,115,71,246,11,35,95,
+  215,99,96,132,142,147,124,8,94,105,59,120,202,154,196,65,
+  124,107,252,165,233,93,195,37,218,133,143,161,1,43,19,59,
+  191,181,107,95,171,131,144,236,19,96,80,222,29,214,46,173,
+  85,132,106,81,72,21,89,72,177,190,85,171,21,72,193,183,
+  186,110,157,40,62,172,82,111,88,59,55,76,47,102,66,164,
+  115,79,198,208,9,67,167,26,214,144,159,160,136,94,184,245,
+  252,244,234,235,103,200,242,27,86,148,246,93,231,113,25,118,
+  159,241,221,186,110,221,142,144,205,222,183,119,244,133,245,12,
+  17,42,105,21,84,169,131,212,109,57,151,241,155,127,239,10,
+  51,73,95,118,101,66,149,227,92,54,147,132,103,254,15,160,
+  62,146,255,65,247,177,47,228,202,73,35,147,115,245,133,183,
+  132,225,52,106,86,223,109,216,148,49,189,91,124,9,158,50,
+  230,211,84,26,203,227,45,212,103,94,148,83,238,172,15,114,
+  23,183,233,153,57,24,126,132,91,140,11,189,186,38,159,246,
+  25,173,110,36,244,46,106,52,162,74,106,91,169,140,250,33,
+  225,154,140,50,66,195,53,115,112,235,222,58,170,97,93,194,
+  83,68,189,217,167,246,48,113,105,159,234,33,47,225,101,88,
+  226,220,79,228,105,94,129,39,98,73,136,97,11,107,65,185,
+  187,29,165,116,78,82,113,224,77,82,88,101,40,172,210,246,
+  171,42,69,168,84,21,138,22,32,62,56,100,155,150,81,49,
+  80,22,89,68,112,4,90,17,245,90,197,60,59,195,198,4,
+  86,198,11,8,58,216,155,34,245,88,96,90,229,205,120,39,
+  230,28,45,201,42,215,216,152,205,24,5,99,100,179,74,70,
+  17,100,152,225,78,20,81,47,82,175,117,156,234,80,22,79,
+  93,57,143,146,179,131,40,33,166,113,244,214,101,102,154,165,
+  111,109,30,226,78,179,209,177,38,194,35,186,194,170,162,170,
+  106,171,174,74,215,231,36,21,186,186,164,109,186,53,89,166,
+  42,194,32,44,8,106,142,121,53,219,58,163,198,132,38,118,
+  141,185,25,89,211,246,121,122,153,190,248,159,138,82,99,127,
+  186,138,217,44,105,240,41,40,89,243,56,171,80,189,71,186,
+  114,204,96,79,72,191,69,18,194,131,78,176,158,221,213,217,
+  222,25,87,67,179,122,183,182,230,24,127,125,103,254,215,214,
+  28,251,37,205,43,216,6,111,206,98,140,27,168,23,126,206,
+  173,55,198,66,253,205,214,28,110,251,190,194,232,253,62,158,
+  181,158,239,234,234,106,131,119,223,10,147,170,239,96,206,84,
+  209,105,184,58,71,149,47,186,50,151,94,165,174,78,15,91,
+  211,11,163,214,203,11,175,135,174,166,221,135,169,95,151,135,
+  209,150,99,46,81,164,185,0,157,88,130,99,132,41,166,211,
+  77,240,22,135,32,7,118,131,107,86,33,20,27,29,61,130,
+  230,9,88,33,54,43,144,200,163,145,80,70,112,211,218,73,
+  179,143,224,39,84,16,42,9,1,66,21,161,58,64,121,160,
+  185,134,80,75,168,119,108,162,59,161,227,193,61,85,57,89,
+  124,16,13,4,207,136,148,221,20,99,71,64,62,155,219,126,
+  67,211,126,181,59,116,113,2,166,24,242,135,220,250,249,90,
+  162,51,240,15,232,73,177,67,66,247,71,186,21,61,166,62,
+  166,207,122,70,162,199,24,24,207,13,125,96,104,193,178,128,
+  201,4,112,28,96,54,3,60,93,150,22,75,62,47,8,64,
+  65,1,32,138,128,109,197,182,113,93,151,117,170,112,161,176,
+  81,156,42,248,171,32,33,92,23,250,45,139,150,227,150,66,
+  254,61,190,221,188,100,126,195,220,206,221,225,62,228,134,185,
+  160,233,182,233,19,211,139,166,30,83,5,251,39,251,13,251,
+  46,251,60,123,128,221,198,150,48,57,230,71,230,18,243,62,
+  243,26,243,28,19,99,158,100,118,48,117,76,25,99,197,93,
+  172,144,158,121,204,225,83,204,224,60,222,198,57,76,225,37,
+  156,192,113,12,35,137,1,28,194,1,244,226,9,236,70,59,
+  90,177,19,219,169,222,205,104,66,35,234,232,127,163,26,1,
+  84,192,135,114,184,81,134,82,184,176,17,78,20,99,3,28,
+  176,67,194,122,125,111,255,223,231,95,11,43,45,107,162,7,
+  0,0,
+};
+/* midi data */
+static const unsigned char dat_midi = {
+  31,139,8,0,0,0,0,0,0,3,237,92,15,112,20,215,
+  121,255,237,222,222,222,222,234,36,78,199,33,159,100,9,173,
+  37,161,8,7,194,249,80,168,160,50,190,59,33,88,41,226,
+  34,33,57,17,148,76,79,13,62,17,96,28,85,246,121,98,
+  134,152,67,36,32,39,238,228,236,50,174,167,241,100,108,58,
+  237,80,66,28,162,218,41,245,48,68,98,28,34,48,245,0,
+  33,50,147,50,198,33,252,175,199,81,237,134,226,179,208,245,
+  123,187,239,14,161,82,167,105,146,166,211,190,159,244,222,111,
+  191,239,125,239,219,239,253,219,219,211,60,189,56,160,197,1,
+  51,150,244,164,87,182,44,107,233,149,99,201,26,179,234,94,
+  40,157,169,212,136,25,190,108,54,189,7,205,88,93,213,113,
+  242,216,143,143,61,208,8,105,129,182,192,221,3,52,208,117,
+  101,15,92,103,187,190,65,82,232,211,191,128,30,75,210,213,
+  188,88,50,94,6,184,62,129,59,34,14,37,77,105,15,165,
+  191,161,52,70,233,109,74,215,40,253,107,245,40,224,60,232,
+  13,252,204,244,6,204,176,205,251,15,174,236,90,191,46,1,
+  188,48,93,79,206,84,210,15,114,121,11,228,77,155,237,235,
+  214,112,111,159,47,240,179,22,95,64,147,48,35,225,57,60,
+  241,49,111,245,8,249,222,27,151,99,127,186,112,152,174,134,
+  87,126,64,249,225,206,176,109,103,70,108,30,162,187,245,111,
+  76,132,110,215,206,55,33,83,82,79,142,80,174,183,143,205,
+  223,146,205,166,128,162,149,239,194,223,49,154,61,212,135,88,
+  178,47,27,75,82,20,141,24,127,168,188,137,249,158,231,233,
+  200,102,123,27,106,190,0,121,255,92,72,9,57,118,106,237,
+  147,241,107,62,244,207,56,140,180,116,127,4,62,203,110,137,
+  101,231,157,110,215,53,72,62,49,243,12,32,153,218,63,192,
+  197,184,215,147,90,204,248,23,131,241,75,128,125,125,114,152,
+  221,215,242,20,179,60,249,166,123,202,251,73,115,63,105,238,
+  39,61,197,79,154,249,89,53,24,45,233,124,156,245,14,187,
+  238,195,173,222,166,113,221,197,116,164,73,221,31,134,47,150,
+  108,173,131,212,91,190,100,2,88,242,46,124,101,103,202,206,
+  124,138,98,112,149,87,81,125,151,18,123,58,150,164,50,233,
+  35,202,100,187,108,122,73,15,100,35,150,174,62,195,100,43,
+  215,172,220,99,229,94,43,247,91,121,32,150,140,82,228,206,
+  3,169,9,172,171,98,87,123,7,134,131,210,5,147,98,77,
+  83,218,23,75,90,94,61,177,167,141,70,184,94,52,122,144,
+  61,65,113,91,237,235,245,145,197,222,168,117,109,48,43,111,
+  44,109,123,139,37,219,89,95,30,224,118,229,100,55,176,144,
+  105,216,172,121,117,74,13,127,44,77,222,172,58,189,229,150,
+  197,171,172,204,246,194,214,129,101,21,96,86,114,3,110,100,
+  42,72,215,118,15,245,151,227,49,201,59,147,102,163,203,49,
+  243,48,229,180,222,180,27,80,50,110,43,159,85,204,250,67,
+  206,204,241,46,102,22,219,26,50,21,185,250,218,1,203,138,
+  229,179,98,201,218,70,204,73,97,199,176,188,29,200,102,251,
+  37,107,6,212,212,56,104,212,74,191,50,252,242,22,9,159,
+  215,86,69,134,182,64,75,208,12,48,47,223,184,100,207,248,
+  134,197,86,187,128,29,157,203,90,75,136,247,26,15,67,245,
+  188,100,207,232,94,125,245,75,148,7,55,126,34,110,70,233,
+  202,158,57,142,99,246,204,113,28,179,103,142,227,216,173,153,
+  227,56,214,154,74,120,237,81,236,193,196,36,249,44,138,143,
+  158,160,186,243,195,148,104,213,88,171,228,120,118,151,213,31,
+  90,44,221,118,174,183,210,106,69,113,236,17,107,182,125,63,
+  81,68,99,83,158,27,135,248,24,187,114,30,236,193,135,227,
+  214,213,80,15,38,23,197,135,153,159,56,178,109,145,204,135,
+  7,155,174,100,47,212,152,39,175,66,166,164,26,115,161,247,
+  170,209,64,103,42,145,33,185,200,208,127,114,166,202,119,42,
+  85,179,205,23,232,245,15,209,51,43,161,54,95,195,100,124,
+  92,142,32,123,122,36,126,222,208,86,165,52,106,176,17,102,
+  125,243,192,34,239,18,121,87,43,18,122,15,110,166,216,248,
+  187,230,181,157,219,52,17,75,210,79,23,61,28,201,98,225,
+  59,240,178,88,123,203,140,77,208,40,182,174,214,112,162,136,
+  174,61,214,83,139,98,188,249,140,85,103,173,237,145,228,103,
+  109,31,92,218,123,155,52,122,75,10,90,35,114,194,234,9,
+  91,171,232,222,80,120,29,185,29,167,149,57,15,89,202,187,
+  178,89,164,137,71,65,81,75,215,64,179,81,86,73,71,144,
+  30,133,100,229,178,149,59,172,92,177,114,167,149,171,86,238,
+  178,114,131,242,131,88,64,249,243,232,160,124,15,186,44,125,
+  183,149,175,182,242,173,44,183,125,11,252,94,65,35,142,217,
+  107,117,117,109,93,149,166,121,60,6,101,69,75,212,18,213,
+  175,122,85,6,77,47,241,123,84,77,83,61,138,170,234,154,
+  162,234,126,77,245,107,193,42,53,72,166,122,141,223,163,235,
+  143,6,2,97,170,160,169,236,119,42,232,179,152,62,167,227,
+  123,238,124,235,56,186,230,81,10,173,204,96,125,176,81,197,
+  121,179,233,58,80,125,148,138,30,142,140,53,101,92,190,230,
+  140,235,141,165,141,55,17,116,201,225,236,248,133,176,113,31,
+  189,6,184,104,133,205,232,173,58,21,9,133,188,147,53,184,
+  23,175,209,59,196,240,136,58,64,79,11,68,163,102,244,196,
+  64,123,234,202,224,137,175,94,25,52,134,187,87,28,218,226,
+  64,226,80,44,249,63,217,169,2,2,2,2,2,255,203,32,
+  177,52,99,49,164,202,53,144,130,125,144,162,95,131,244,224,
+  1,72,27,116,72,91,159,134,244,108,28,210,75,164,27,173,
+  129,244,243,38,246,190,3,121,118,63,228,165,127,7,57,254,
+  54,228,175,250,33,127,187,15,242,105,226,108,21,28,243,134,
+  225,248,156,31,142,180,9,199,145,157,236,157,8,74,227,5,
+  40,95,238,133,50,50,12,167,62,23,206,207,188,13,231,158,
+  58,56,39,151,65,93,157,130,250,106,29,92,70,26,174,63,
+  43,130,70,246,218,227,163,208,50,255,8,247,246,173,208,253,
+  29,208,191,51,130,130,246,79,163,96,98,16,158,161,44,10,
+  31,109,71,81,164,18,51,202,202,217,251,33,188,239,167,81,
+  252,203,111,98,166,58,9,127,221,95,97,214,31,109,67,201,
+  11,223,194,93,31,20,163,244,161,44,202,174,188,128,242,129,
+  165,152,93,223,192,222,197,112,207,229,74,84,255,243,34,212,
+  22,78,160,174,99,57,238,253,123,25,243,35,247,99,193,123,
+  85,8,189,126,19,159,60,249,0,22,43,91,208,184,190,15,
+  97,178,111,122,99,41,86,140,109,68,219,221,55,208,190,251,
+  41,60,248,176,130,53,3,155,241,199,23,154,240,208,95,124,
+  136,141,187,159,64,63,125,147,248,210,137,183,217,155,34,118,
+  62,255,101,124,99,223,24,158,251,131,113,188,216,28,192,222,
+  179,26,94,81,222,199,15,70,119,226,245,5,191,196,155,203,
+  110,226,66,241,56,254,229,197,31,20,157,168,120,105,222,95,
+  254,225,174,214,111,174,254,222,250,211,95,82,119,54,63,251,
+  231,127,253,238,43,221,175,157,60,253,217,159,191,211,131,127,
+  187,222,3,109,29,125,139,161,183,223,185,244,61,41,146,65,
+  140,189,251,122,251,155,174,40,214,155,129,247,177,190,173,253,
+  169,250,70,100,107,27,179,147,244,205,176,81,66,157,227,201,
+  31,110,208,14,68,214,233,13,82,92,61,16,254,60,125,153,
+  25,141,94,110,11,190,166,110,103,67,254,253,131,144,110,34,
+  113,70,188,3,8,8,8,8,8,8,252,127,70,228,3,32,
+  56,198,254,158,233,29,51,142,6,233,109,194,55,1,116,140,
+  102,51,125,82,115,198,56,100,28,189,183,172,202,105,70,158,
+  64,163,203,220,113,118,249,6,121,217,242,122,233,181,35,199,
+  127,104,70,207,14,180,186,72,222,161,238,96,127,111,48,151,
+  251,142,172,114,37,206,172,10,239,223,2,35,113,68,188,99,
+  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,252,
+  86,240,10,165,55,249,102,215,32,165,13,148,190,11,123,51,
+  107,15,165,211,128,227,115,176,55,171,30,6,156,123,0,245,
+  85,88,155,81,221,219,129,130,118,160,240,81,88,155,77,103,
+  186,128,146,23,129,178,171,176,54,147,214,22,1,243,35,192,
+  39,79,194,218,44,218,86,14,172,25,0,54,238,134,181,25,
+  244,185,134,150,15,128,238,116,83,198,8,55,91,187,44,170,
+  39,128,80,25,176,170,44,186,54,84,218,48,18,42,189,216,
+  82,247,158,23,193,70,210,195,12,7,37,246,31,88,171,202,
+  66,141,174,172,49,220,113,52,59,33,246,80,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,252,95,66,15,28,135,
+  122,128,65,74,111,177,115,123,29,151,90,195,9,207,156,199,
+  217,190,2,120,162,123,161,196,146,193,138,166,140,252,204,101,
+  243,212,176,177,25,107,218,7,125,21,230,182,139,45,213,125,
+  108,247,66,44,201,78,143,90,181,175,206,244,60,215,18,107,
+  233,234,93,100,4,58,195,85,237,63,62,110,28,13,149,118,
+  70,106,139,55,248,151,109,175,105,250,201,241,170,175,213,250,
+  54,104,203,182,215,54,189,121,188,230,235,237,79,118,28,205,
+  94,232,24,205,142,213,29,100,245,236,29,9,222,10,51,85,
+  143,171,173,181,95,0,66,119,119,70,246,127,28,234,23,213,
+  246,79,145,237,245,126,248,62,14,197,220,118,181,165,182,115,
+  87,164,142,34,196,195,70,189,1,138,17,115,194,80,230,116,
+  66,187,56,88,133,203,131,167,82,39,82,39,182,153,225,16,
+  213,126,38,124,95,132,181,97,69,6,33,22,247,249,22,223,
+  66,47,204,109,167,168,126,151,185,65,233,71,92,27,106,132,
+  241,144,220,95,121,177,101,133,181,159,98,206,35,212,50,15,
+  69,36,201,14,197,169,186,52,183,94,224,41,44,154,225,245,
+  22,23,251,124,51,103,250,253,179,102,149,148,220,117,87,128,
+  80,74,40,35,220,77,40,39,84,16,102,19,42,9,230,229,
+  236,100,83,6,223,10,86,92,52,99,223,3,218,206,109,205,
+  178,211,98,135,235,154,51,242,80,75,70,25,234,119,4,231,
+  1,251,55,64,249,162,55,186,15,152,155,235,247,125,80,154,
+  175,65,111,121,7,94,106,251,217,182,115,126,7,171,153,157,
+  236,193,100,186,7,47,55,244,64,74,209,152,157,239,129,188,
+  155,210,245,156,111,102,33,95,167,210,63,177,53,36,93,33,
+  169,139,93,189,44,211,85,43,59,85,153,180,155,40,13,199,
+  146,113,220,156,140,99,82,163,84,70,37,44,109,162,17,95,
+  0,69,9,163,146,157,178,221,101,198,146,217,9,239,18,172,
+  109,69,162,45,146,249,246,190,223,244,220,222,153,19,236,52,
+  220,174,61,177,164,177,133,120,175,61,246,157,79,80,218,69,
+  233,13,74,227,164,151,41,121,168,255,2,125,51,140,205,55,
+  207,183,15,86,165,163,127,11,133,102,206,104,246,250,239,127,
+  7,203,242,137,143,33,184,101,16,77,25,169,40,88,26,42,
+  117,12,90,231,155,220,96,103,158,116,239,97,123,111,216,138,
+  169,41,117,210,250,88,84,234,162,82,107,223,78,123,159,131,
+  218,244,78,141,53,210,209,231,163,207,215,29,173,59,198,90,
+  196,78,76,233,14,245,201,198,145,224,143,172,115,82,28,145,
+  12,158,178,188,181,7,15,102,179,247,180,64,109,186,10,111,
+  228,10,116,42,127,119,249,68,53,173,190,250,10,178,74,84,
+  153,125,142,144,119,163,119,40,154,144,171,76,110,49,110,180,
+  4,7,138,31,132,220,148,153,60,125,185,245,212,225,106,19,
+  74,205,122,168,177,100,168,34,40,93,54,73,127,144,214,244,
+  92,40,189,179,141,240,80,123,34,224,173,131,188,127,86,194,
+  203,238,199,250,154,89,231,206,69,255,47,119,12,59,169,24,
+  50,28,80,224,132,139,70,58,218,144,41,213,110,192,153,153,
+  105,229,46,182,95,233,51,239,145,85,189,65,189,228,27,254,
+  15,167,96,103,164,43,119,62,3,155,157,184,221,29,100,39,
+  110,119,223,23,75,22,103,164,142,76,37,229,173,153,210,88,
+  146,221,133,173,128,71,26,154,51,82,247,99,120,2,109,63,
+  13,168,167,6,78,111,155,19,205,142,155,17,51,90,66,43,
+  127,246,66,3,229,245,65,44,162,145,171,106,212,224,70,125,
+  163,14,199,235,128,243,235,192,236,250,62,152,59,204,157,119,
+  170,233,163,90,37,84,219,79,108,110,51,7,206,70,222,138,
+  254,182,237,234,54,103,214,55,103,240,211,144,207,95,79,79,
+  169,129,179,81,98,201,28,120,43,218,21,145,35,149,19,245,
+  35,181,155,15,236,62,187,188,113,97,28,111,173,88,186,176,
+  15,167,214,48,125,237,154,51,35,33,245,82,203,34,169,222,
+  117,169,53,240,126,16,129,247,13,208,51,111,79,3,107,39,
+  89,215,47,140,43,99,63,114,28,167,118,62,5,84,255,19,
+  240,89,99,33,203,107,181,3,52,38,51,218,206,149,191,17,
+  123,228,119,184,92,238,136,220,25,217,154,199,93,160,187,113,
+  139,11,221,154,174,17,23,144,92,96,201,110,221,201,203,53,
+  46,203,220,78,229,122,151,37,187,44,102,178,173,215,45,127,
+  204,143,206,245,50,103,240,114,219,159,170,43,22,59,173,251,
+  48,86,172,114,55,143,71,209,29,220,143,155,215,115,90,178,
+  206,253,186,243,241,106,188,28,183,177,219,138,171,128,199,201,
+  100,149,203,42,247,147,139,147,249,213,185,223,2,30,111,1,
+  143,211,147,111,159,198,227,115,241,250,110,30,151,106,201,58,
+  247,199,202,29,188,190,147,219,105,92,118,112,187,156,12,94,
+  110,199,105,247,63,43,119,89,156,243,47,233,18,215,171,220,
+  206,197,101,39,183,203,213,147,57,231,236,153,127,55,247,163,
+  231,199,87,227,229,185,254,112,89,237,210,249,120,187,243,254,
+  220,60,94,141,183,207,157,247,231,178,56,23,175,221,47,110,
+  238,79,231,254,221,121,127,118,188,26,183,119,243,121,228,230,
+  126,221,121,191,174,188,157,139,203,42,183,147,185,222,150,237,
+  254,214,166,216,43,92,86,185,204,236,93,249,242,91,246,10,
+  215,171,92,239,228,108,235,109,59,23,183,211,248,124,84,243,
+  250,156,157,61,95,85,94,95,229,122,117,138,94,230,50,211,
+  59,243,122,167,165,119,230,245,74,190,156,233,21,46,43,124,
+  222,51,182,245,14,75,118,76,97,217,98,217,98,121,10,179,
+  126,151,248,124,145,137,193,101,155,97,49,56,23,185,11,117,
+  15,241,12,242,135,95,131,89,189,130,255,38,235,31,201,30,
+  43,30,38,195,90,255,133,122,225,175,193,172,126,193,111,200,
+  250,71,112,33,239,175,28,51,189,123,26,59,57,227,54,46,
+  224,254,255,115,214,239,192,133,188,223,166,115,17,127,30,78,
+  231,66,222,127,133,249,254,180,159,123,69,252,185,155,99,86,
+  238,158,194,69,252,185,197,100,141,179,139,179,194,25,220,78,
+  177,216,205,235,185,243,247,45,224,178,54,141,237,251,107,121,
+  153,205,75,79,62,206,92,255,218,235,186,136,175,87,38,131,
+  203,118,127,218,235,175,48,223,207,78,174,87,120,124,30,30,
+  119,174,63,193,219,233,201,215,115,114,150,249,253,11,166,112,
+  97,190,191,239,204,30,30,231,116,46,204,247,123,142,117,174,
+  191,157,61,60,238,233,92,152,255,188,44,200,199,147,107,7,
+  166,48,211,187,56,171,156,157,156,29,156,37,238,39,119,95,
+  39,103,133,179,253,185,237,206,127,142,107,214,171,64,64,226,
+  48,244,220,213,26,85,250,85,120,78,87,149,217,191,202,168,
+  111,222,99,225,146,84,186,91,211,20,134,3,101,30,95,201,
+  233,37,170,180,76,197,191,3,33,225,196,58,57,105,0,0,
+};
+/* mmmesid data */
+static const unsigned char dat_mmmesid = {
+  31,139,8,0,0,0,0,0,0,3,221,88,127,108,83,87,
+  150,254,238,243,243,243,139,243,156,60,27,99,226,36,16,59,
+  184,193,184,105,226,164,38,147,53,17,248,7,249,65,18,220,
+  0,21,106,153,89,112,70,212,238,66,219,137,82,194,140,188,
+  89,72,104,75,13,173,186,45,170,186,51,18,154,169,102,70,
+  35,22,85,85,135,65,85,167,155,93,5,202,208,76,7,85,
+  217,20,232,82,109,27,166,234,78,163,21,219,101,87,213,76,
+  230,53,141,247,123,118,160,160,153,74,243,247,90,250,238,61,
+  239,254,56,231,222,115,206,61,247,92,167,1,123,26,208,76,
+  12,203,44,155,136,68,26,210,183,89,123,8,133,8,246,12,
+  196,13,103,68,31,243,237,78,141,152,180,174,132,39,139,244,
+  167,133,133,136,24,108,239,159,221,88,72,141,232,81,49,221,
+  51,214,51,89,106,143,27,46,101,112,83,125,78,191,62,29,
+  155,142,205,76,246,25,250,92,244,7,67,8,123,7,161,198,
+  74,51,200,245,227,65,95,111,44,11,241,253,237,49,142,157,
+  152,92,128,50,51,25,246,182,122,251,140,202,87,162,47,164,
+  161,252,111,210,208,127,185,245,95,181,147,91,182,108,233,4,
+  50,178,107,2,130,220,78,132,242,245,15,67,126,111,138,244,
+  129,208,81,210,106,145,126,172,72,107,69,122,103,145,214,111,
+  163,221,69,250,254,208,175,73,87,189,55,85,172,107,139,109,
+  3,161,95,83,102,104,224,50,233,142,232,4,144,26,49,87,
+  168,111,208,199,122,145,5,114,73,3,255,222,251,66,6,24,
+  138,125,218,181,176,6,245,243,66,39,34,174,121,195,70,148,
+  17,229,132,131,88,70,44,39,86,16,94,98,37,81,39,181,
+  227,134,177,178,88,122,213,121,88,13,91,177,92,166,190,193,
+  178,156,180,108,148,145,150,13,71,145,94,78,218,98,172,232,
+  154,245,229,42,207,112,247,241,109,73,204,103,80,120,68,59,
+  217,179,217,231,195,231,89,20,210,254,209,18,157,156,19,8,
+  60,140,133,203,83,7,161,59,237,192,216,92,143,20,67,165,
+  235,11,168,191,120,231,209,235,169,17,8,201,34,91,21,155,
+  90,102,47,215,28,21,149,176,153,132,230,112,56,42,42,42,
+  42,43,43,241,103,127,73,163,48,215,251,66,182,191,180,99,
+  255,85,161,19,17,231,85,195,70,148,17,229,132,131,88,70,
+  44,39,86,16,94,98,37,113,199,142,7,230,141,187,136,186,
+  174,217,184,225,184,52,48,221,103,56,14,111,54,28,23,122,
+  27,33,83,187,135,89,91,51,169,129,235,176,14,161,38,6,
+  23,225,33,234,137,6,34,84,21,173,56,157,105,42,173,163,
+  255,191,112,8,186,127,50,15,255,89,226,28,241,22,113,158,
+  248,21,113,33,143,65,104,11,93,179,220,53,61,4,66,88,
+  97,135,36,126,12,29,22,107,53,90,33,43,121,196,96,181,
+  175,195,30,40,21,255,141,41,216,184,150,86,174,172,99,16,
+  182,31,110,68,205,110,40,148,42,213,196,81,79,111,94,236,
+  13,162,61,147,168,14,162,141,107,109,107,19,113,67,249,56,
+  105,40,23,59,13,229,122,56,234,8,180,70,29,59,247,195,
+  29,117,220,219,205,125,110,166,197,251,232,17,7,229,45,134,
+  45,60,8,241,65,90,41,233,162,127,246,80,129,82,116,74,
+  105,47,74,169,160,20,59,165,52,124,141,148,115,148,242,10,
+  165,92,12,71,181,249,214,168,246,102,81,138,141,82,234,40,
+  197,75,41,182,131,214,45,134,242,1,165,236,95,146,226,45,
+  73,209,62,25,228,97,42,74,241,20,53,26,71,40,108,106,
+  123,195,70,112,13,212,145,114,198,60,65,51,115,240,104,78,
+  252,54,35,39,30,129,188,161,46,105,104,238,143,186,63,234,
+  158,121,123,20,181,94,206,31,75,179,174,249,81,177,28,79,
+  163,100,3,231,2,108,121,212,182,231,33,117,97,114,16,229,
+  207,118,205,174,170,125,78,169,233,198,170,154,111,161,90,143,
+  58,36,158,149,215,245,168,182,144,209,212,118,224,168,200,184,
+  25,77,118,189,214,193,53,236,208,219,233,25,244,208,108,127,
+  255,135,150,66,98,83,162,83,125,26,118,245,109,56,74,252,
+  59,231,243,8,228,3,71,3,99,129,241,192,225,192,19,129,
+  39,3,79,5,142,4,158,30,178,187,162,218,169,211,29,144,
+  50,246,196,163,144,252,31,230,177,51,230,164,47,116,205,166,
+  187,250,47,87,46,110,230,76,61,90,126,42,171,36,226,137,
+  68,218,78,250,196,62,41,35,5,143,146,122,151,173,201,196,
+  166,98,235,100,177,245,88,48,31,124,38,56,30,60,28,124,
+  34,248,100,240,169,224,145,224,211,125,70,121,211,246,191,206,
+  248,214,47,207,225,123,212,85,121,3,181,235,26,56,79,106,
+  7,41,149,117,158,53,35,68,173,149,187,63,212,171,208,94,
+  215,39,58,138,158,252,47,172,69,214,61,97,174,80,14,139,
+  180,157,148,133,84,180,124,248,181,81,232,223,1,206,245,124,
+  250,63,99,170,21,182,172,238,62,220,236,8,61,6,53,244,
+  42,228,208,238,116,107,233,171,113,249,196,171,208,178,10,75,
+  57,35,133,94,10,237,110,181,232,227,210,56,15,100,229,153,
+  14,140,103,228,97,61,45,159,59,247,217,102,215,248,168,18,
+  55,190,172,126,237,129,71,181,7,242,91,223,45,204,247,207,
+  138,191,79,239,26,198,1,236,167,163,71,170,218,170,124,29,
+  226,121,224,252,2,126,50,118,110,242,172,50,6,248,240,31,
+  249,158,152,103,76,119,75,192,141,35,168,122,162,242,114,113,
+  94,168,184,42,217,125,56,237,251,122,137,105,89,114,227,70,
+  106,100,123,16,213,123,177,184,224,124,24,53,168,54,99,174,
+  238,165,109,11,180,122,158,177,8,151,230,224,238,149,51,245,
+  219,25,97,247,214,118,27,95,156,30,120,175,37,103,63,143,
+  218,150,78,184,137,20,81,28,57,12,151,203,185,151,10,93,
+  205,82,66,189,30,130,197,13,41,129,27,103,70,113,35,163,
+  145,150,80,233,76,160,53,173,115,53,215,50,246,98,111,229,
+  250,4,164,153,120,67,206,62,220,246,184,142,247,13,123,222,
+  223,7,77,225,74,64,79,43,60,198,213,44,102,52,231,86,
+  212,56,31,68,53,91,210,108,249,50,83,113,179,197,191,25,
+  90,106,196,25,131,207,229,117,198,225,151,226,184,150,149,217,
+  211,100,246,248,59,161,247,98,223,99,174,32,252,186,96,95,
+  221,76,16,245,129,156,93,155,137,71,134,117,92,54,236,85,
+  220,129,199,185,13,119,57,119,34,192,93,84,179,94,235,28,
+  101,108,185,135,173,33,126,221,77,52,250,123,33,83,211,177,
+  172,76,94,77,129,92,217,133,155,28,202,174,176,79,37,151,
+  42,103,39,214,16,13,230,237,57,137,176,52,136,63,62,217,
+  63,11,75,41,110,52,161,81,28,31,219,118,228,221,5,104,
+  23,137,184,81,54,26,30,31,146,226,134,122,44,105,168,141,
+  157,134,26,230,154,213,4,111,53,214,50,107,207,214,57,248,
+  8,63,17,36,90,184,46,193,149,154,101,128,223,109,196,55,
+  136,6,98,13,209,78,172,37,66,196,221,68,35,209,68,52,
+  123,92,82,18,149,87,146,87,146,220,75,184,33,87,166,191,
+  255,246,149,183,168,105,180,140,154,154,110,201,169,55,80,203,
+  221,215,204,196,131,57,245,119,237,251,117,92,53,212,5,127,
+  63,52,174,163,154,18,37,68,156,223,196,106,114,91,199,186,
+  158,245,189,68,171,171,198,109,234,245,198,105,211,202,202,139,
+  194,180,112,226,36,244,248,28,162,91,167,10,225,184,241,199,
+  131,91,167,227,134,237,229,48,239,124,242,146,7,129,159,166,
+  70,34,81,245,68,107,84,125,169,55,193,243,118,156,58,136,
+  244,25,182,253,156,237,163,21,195,228,188,58,7,198,150,66,
+  32,167,166,167,99,145,97,80,211,234,35,183,219,74,175,54,
+  251,191,222,90,156,89,127,107,102,235,77,27,45,105,107,221,
+  77,141,153,107,53,247,177,164,205,166,109,241,245,113,200,169,
+  145,78,67,68,227,6,78,49,99,120,131,214,176,175,238,129,
+  221,63,37,244,192,20,91,223,8,76,5,22,0,161,147,126,
+  189,216,194,24,143,87,125,71,235,243,37,91,163,29,194,88,
+  153,104,55,238,186,149,7,48,51,232,52,240,123,142,61,193,
+  177,167,110,242,12,76,145,107,196,148,180,196,211,164,79,22,
+  121,158,225,184,151,111,241,244,22,121,122,201,179,174,148,85,
+  220,150,121,216,82,35,254,5,85,229,161,133,127,33,222,212,
+  223,36,244,212,227,95,181,116,221,106,113,56,204,150,212,227,
+  117,127,229,138,236,248,30,227,191,154,135,115,54,47,109,251,
+  101,238,15,109,31,153,35,202,202,110,227,18,185,189,165,235,
+  86,203,159,112,41,187,147,203,87,185,135,208,239,204,69,68,
+  196,44,15,194,217,141,102,222,148,107,178,42,35,208,26,230,
+  170,59,205,220,143,183,88,149,238,165,23,66,230,41,222,7,
+  169,99,38,222,186,94,87,82,95,232,146,216,37,134,68,78,
+  60,43,78,136,87,196,155,98,74,204,137,207,165,85,98,27,
+  124,2,162,75,196,134,160,123,171,189,82,39,108,181,222,158,
+  79,15,45,6,114,74,66,59,117,51,227,194,235,102,6,59,
+  29,107,163,55,188,255,206,102,195,90,245,243,139,153,232,1,
+  153,247,111,153,175,131,235,66,167,177,120,189,103,123,67,174,
+  208,223,112,172,97,119,159,153,239,45,55,253,186,122,220,246,
+  10,228,99,98,11,115,2,142,121,103,24,251,45,233,118,114,
+  208,201,97,215,1,43,57,216,124,29,18,44,24,22,251,229,
+  91,92,60,75,92,188,156,87,183,245,138,201,131,125,51,129,
+  103,34,163,121,136,99,64,79,204,44,221,19,176,233,46,235,
+  164,101,108,57,51,149,210,41,171,126,170,246,136,237,210,0,
+  125,147,57,192,226,3,140,6,105,44,254,103,167,33,239,249,
+  249,59,25,237,128,204,188,97,101,39,215,157,118,177,237,24,
+  219,106,15,88,249,109,230,19,94,51,251,200,106,166,95,75,
+  203,112,195,118,10,242,182,210,252,83,140,136,223,72,155,113,
+  177,237,254,82,203,247,73,175,91,162,159,53,181,215,18,67,
+  85,49,3,159,100,75,206,249,55,133,69,4,121,215,79,182,
+  116,243,204,21,35,206,18,175,93,156,185,150,8,237,40,125,
+  167,104,205,8,191,155,151,184,109,40,142,142,44,141,14,151,
+  118,181,244,85,239,162,182,93,222,250,156,124,140,182,101,252,
+  124,207,144,95,50,163,30,165,152,253,18,249,172,41,241,249,
+  242,90,27,117,85,202,36,194,29,229,92,161,120,6,164,52,
+  152,245,32,164,143,186,102,151,70,94,164,12,31,252,102,212,
+  95,106,121,147,55,66,208,148,73,141,52,100,21,122,89,67,
+  250,97,150,129,204,183,121,215,221,133,192,205,172,105,152,124,
+  151,252,45,118,203,219,220,116,82,215,29,142,91,77,175,244,
+  126,51,222,18,135,167,56,243,108,250,66,81,67,45,105,23,
+  37,122,120,27,53,164,95,164,204,22,202,244,232,65,4,247,
+  169,211,65,248,136,213,140,82,135,146,134,101,98,58,214,138,
+  112,11,159,100,65,132,221,65,68,50,170,237,197,29,73,219,
+  139,233,38,222,135,34,83,111,187,100,126,113,117,62,52,87,
+  145,195,94,187,36,227,144,115,19,154,211,218,213,32,75,165,
+  56,254,18,119,212,156,173,32,151,230,46,139,100,65,157,55,
+  9,225,142,90,30,228,11,108,21,251,26,139,187,109,76,247,
+  211,83,153,65,240,182,186,155,210,66,81,233,131,78,206,89,
+  75,206,247,168,50,172,89,237,120,114,175,123,24,234,38,88,
+  211,218,76,242,116,231,119,148,86,171,249,197,248,123,55,165,
+  222,115,60,209,115,246,173,201,107,227,159,140,79,199,213,32,
+  172,240,103,205,27,130,183,95,207,120,207,217,64,16,250,165,
+  113,127,2,250,175,38,175,29,254,36,241,124,130,254,179,138,
+  189,45,199,131,104,61,158,19,63,99,125,239,94,105,24,171,
+  130,88,199,24,63,102,90,51,2,213,198,236,164,157,121,162,
+  141,94,179,174,100,221,32,109,234,176,179,71,201,202,85,29,
+  80,75,148,122,30,82,25,45,221,179,169,172,104,111,124,214,
+  53,203,30,145,149,158,143,177,182,100,149,13,210,239,238,75,
+  107,164,153,3,126,124,223,6,105,238,190,18,63,207,4,202,
+  87,116,67,242,68,165,77,89,243,190,57,99,190,35,110,211,
+  77,166,90,212,82,15,212,69,104,159,252,111,50,179,33,106,
+  218,212,84,175,178,87,174,84,50,13,170,194,151,76,5,119,
+  176,118,143,71,189,0,235,48,210,21,204,28,214,158,150,31,
+  82,212,35,176,186,100,83,75,31,107,199,229,61,178,28,23,
+  80,172,120,249,33,117,38,206,186,106,207,252,116,188,178,203,
+  217,69,61,151,180,86,125,75,107,241,185,241,175,244,214,243,
+  39,58,195,240,77,157,165,70,54,162,89,12,51,195,21,135,
+  95,51,179,80,105,103,220,201,119,82,125,93,184,46,53,34,
+  74,62,249,91,190,7,75,81,149,48,41,11,33,19,86,66,
+  33,108,40,128,87,0,24,192,249,120,42,253,36,165,30,246,
+  138,6,184,60,161,59,67,179,12,185,240,231,31,144,255,31,
+  127,177,191,124,104,1,21,159,85,172,112,108,209,158,43,191,
+  90,222,108,127,174,236,15,101,89,245,154,58,104,155,179,125,
+  215,86,174,252,76,233,182,94,183,254,131,181,91,254,66,254,
+  133,60,36,135,45,159,91,254,201,242,148,101,187,101,181,244,
+  123,233,55,210,79,164,191,147,30,148,218,165,42,97,136,15,
+  197,57,241,143,226,5,241,183,226,33,177,85,108,16,141,162,
+  86,104,248,18,159,209,150,151,248,130,253,103,156,198,73,252,
+  8,47,225,57,28,225,53,249,93,12,97,47,223,183,187,240,
+  32,238,199,125,232,67,55,146,216,136,245,204,5,214,241,105,
+  208,140,70,132,176,134,241,108,53,252,168,195,74,212,162,26,
+  94,172,128,7,203,177,140,49,204,201,247,242,215,252,47,240,
+  151,255,254,15,91,224,96,171,98,18,0,0,
+};
+/* MON data */
+static const unsigned char dat_mon = {
+  31,139,8,0,0,0,0,0,0,3,75,96,96,16,75,96,
+  96,208,210,179,98,224,74,55,83,112,247,123,193,192,194,0,
+  4,158,191,254,255,210,232,240,120,222,208,80,192,88,196,224,
+  55,193,231,62,35,35,80,142,3,40,254,72,79,36,157,199,
+  105,138,130,123,1,3,80,6,40,230,87,10,0,148,236,81,
+  105,70,0,0,0,
+};
+/* musmon1 data */
+static const unsigned char dat_musmon1 = {
+  31,139,8,0,0,0,0,0,0,3,189,85,91,108,20,101,
+  20,254,230,178,51,211,101,88,234,206,238,116,217,174,176,208,
+  139,237,116,129,69,187,166,172,13,109,103,119,41,46,101,133,
+  45,193,104,76,220,18,82,160,16,129,198,173,77,109,74,162,
+  132,24,47,168,152,16,222,228,129,4,241,146,152,168,132,24,
+  67,188,197,120,139,38,70,107,83,19,111,49,10,68,196,7,
+  53,100,69,199,239,159,22,37,62,249,228,38,51,115,230,92,
+  190,115,206,119,206,63,91,1,236,10,144,223,88,51,42,235,
+  39,96,164,158,174,64,74,148,170,67,161,158,110,72,235,55,
+  13,1,217,187,110,43,85,187,187,75,251,215,118,163,126,99,
+  13,43,187,223,217,252,177,119,133,111,33,190,125,56,247,86,
+  170,186,59,220,147,244,54,133,183,231,121,0,214,255,224,253,
+  185,170,155,130,68,172,100,169,239,174,199,167,80,236,29,6,
+  66,238,201,171,154,149,200,213,244,215,139,123,145,167,62,98,
+  182,195,67,195,14,224,224,16,116,135,117,77,54,239,69,239,
+  242,135,173,189,40,64,237,167,167,251,20,239,223,137,187,97,
+  248,242,189,238,115,48,250,107,222,225,134,73,72,8,52,140,
+  192,132,234,238,66,120,121,240,147,35,77,125,208,248,124,22,
+  42,165,160,47,25,148,66,99,24,130,182,115,46,27,243,218,
+  150,136,109,104,26,199,62,180,246,215,144,88,246,1,246,21,
+  251,89,135,185,74,191,90,233,192,87,7,188,82,117,253,15,
+  147,83,225,172,215,82,148,104,61,199,218,213,66,77,119,140,
+  53,140,247,30,168,80,23,25,108,71,243,118,192,33,166,140,
+  102,246,240,230,188,53,56,252,143,213,164,53,224,91,79,80,
+  99,81,51,105,77,252,249,17,172,81,12,174,174,143,140,0,
+  149,78,233,83,247,83,183,117,127,50,54,6,187,209,84,112,
+  128,241,198,16,2,199,43,23,12,5,58,115,133,100,106,173,
+  7,235,35,196,73,81,167,81,103,83,215,51,157,107,219,133,
+  224,205,157,105,76,63,217,252,96,229,172,75,76,206,198,53,
+  44,232,195,47,54,61,146,140,21,46,192,41,247,153,125,80,
+  134,15,23,106,218,206,92,77,115,198,48,74,94,100,243,26,
+  219,207,204,119,118,224,171,169,181,171,178,90,111,169,186,161,
+  166,169,109,101,151,124,242,10,119,73,91,243,202,69,232,117,
+  188,162,147,228,210,54,34,0,107,208,148,23,160,83,22,28,
+  157,168,163,28,221,131,8,26,204,20,125,132,238,9,218,100,
+  193,46,245,146,191,127,169,152,162,170,88,155,87,191,53,103,
+  82,144,40,47,34,7,134,171,210,102,154,42,150,238,5,212,
+  241,165,209,60,108,198,196,209,234,58,104,161,20,195,13,188,
+  219,104,143,138,9,182,197,82,208,207,9,127,133,92,213,199,
+  83,176,103,3,209,2,218,136,146,40,166,252,89,27,244,84,
+  208,70,31,137,111,90,222,241,163,204,115,38,177,69,157,65,
+  44,22,40,50,49,230,113,130,196,169,35,66,104,66,34,134,
+  65,141,58,33,19,53,158,23,216,177,107,144,226,140,95,136,
+  198,9,48,98,65,166,128,132,64,250,206,188,6,203,152,45,
+  16,41,76,187,92,46,204,71,170,249,2,125,151,48,246,58,
+  52,251,177,245,229,130,59,130,36,89,210,68,126,218,247,32,
+  132,36,189,150,111,168,5,178,212,7,68,70,77,129,57,157,
+  203,84,211,162,171,61,176,16,73,13,108,252,9,202,56,136,
+  178,196,12,192,163,87,56,243,26,188,222,96,49,79,190,211,
+  204,189,100,182,48,155,51,11,120,70,48,154,85,50,175,108,
+  66,111,112,75,158,181,104,195,239,19,89,236,149,224,72,70,
+  184,84,45,30,217,1,121,93,107,89,236,226,160,131,197,219,
+  152,149,27,242,54,101,149,59,59,21,221,141,40,84,219,129,
+  102,223,148,22,59,42,50,86,104,213,119,3,69,187,3,38,
+  183,113,209,231,14,162,156,151,198,237,19,211,175,223,218,167,
+  156,130,126,123,31,163,185,21,126,167,150,223,169,145,217,45,
+  250,244,103,187,91,244,67,201,170,28,231,125,126,191,88,127,
+  48,154,67,160,44,50,58,8,20,29,196,152,73,59,202,231,
+  209,236,239,143,241,25,229,222,168,99,224,169,48,88,71,227,
+  118,191,98,233,121,202,226,148,185,196,213,96,49,54,156,25,
+  77,27,168,47,118,192,18,167,182,168,136,189,165,87,132,152,
+  17,202,225,45,10,107,215,205,81,120,105,127,230,99,96,230,
+  112,151,195,24,7,205,247,240,164,177,106,127,63,142,177,3,
+  86,166,205,240,201,43,193,190,23,28,203,137,253,29,135,216,
+  27,51,191,200,35,219,90,87,247,34,239,166,60,66,214,193,
+  36,172,83,8,37,37,230,107,158,171,16,223,178,18,145,55,
+  78,93,3,117,97,118,221,176,85,82,206,147,41,137,40,175,
+  155,142,96,128,30,167,233,113,3,39,81,102,47,220,127,246,
+  210,30,235,128,61,163,78,115,151,153,53,17,239,224,41,88,
+  200,249,203,172,206,28,131,216,113,34,168,182,122,90,101,29,
+  246,85,139,173,94,181,248,189,181,19,73,244,164,50,71,144,
+  88,45,149,57,102,91,40,183,31,101,134,57,102,57,101,113,
+  26,53,187,27,75,173,156,207,89,43,235,21,83,107,141,209,
+  123,166,3,139,203,234,153,14,132,133,23,43,11,243,100,181,
+  240,255,129,189,146,61,193,208,242,127,184,201,118,32,116,166,
+  32,118,177,43,144,201,243,75,43,252,26,25,245,175,115,195,
+  94,101,52,102,29,36,102,71,176,68,48,60,157,123,53,231,
+  119,163,206,117,147,167,62,171,136,13,159,64,177,48,242,47,
+  203,132,200,38,246,157,167,114,12,165,42,241,12,44,102,199,
+  49,118,23,167,119,82,228,156,207,56,23,69,125,94,224,105,
+  204,86,119,154,23,179,37,230,173,97,97,157,158,191,254,102,
+  48,38,144,249,181,110,71,128,95,245,48,253,58,203,10,191,
+  196,33,179,147,91,4,190,199,249,159,35,249,12,135,110,187,
+  4,149,115,207,87,80,59,206,125,189,151,167,56,76,62,3,
+  211,185,233,28,255,191,34,110,59,236,182,205,206,46,238,213,
+  175,105,140,163,105,0,177,88,38,45,207,188,77,41,65,73,
+  241,37,50,102,137,179,209,176,236,60,90,177,47,87,187,124,
+  144,145,129,92,13,119,186,167,96,88,87,160,195,123,8,177,
+  53,226,206,202,244,184,18,201,94,222,38,203,232,121,71,94,
+  39,191,43,31,82,153,85,239,204,94,30,200,157,71,104,116,
+  161,34,250,51,6,111,21,211,177,222,16,81,214,55,188,203,
+  155,223,243,190,183,10,208,75,85,252,183,159,247,31,253,254,
+  183,95,232,199,80,124,97,201,124,120,193,23,11,86,7,31,
+  173,187,92,55,98,124,109,108,211,207,233,247,233,166,118,82,
+  235,15,92,12,28,11,244,171,87,212,151,213,125,234,106,229,
+  23,229,53,229,144,50,168,52,203,191,201,31,202,39,228,41,
+  249,78,185,75,142,73,53,233,75,233,45,233,89,233,136,116,
+  191,52,44,149,165,30,105,133,148,144,76,252,129,75,248,6,
+  159,225,61,156,197,75,56,133,167,113,20,135,113,8,7,112,
+  31,246,99,4,219,113,55,238,192,22,108,194,6,244,35,135,
+  30,220,130,53,200,224,70,164,177,2,60,137,156,95,19,150,
+  33,137,235,255,2,245,170,219,229,150,9,0,0,
+};
+/* musmon2 data */
+static const unsigned char dat_musmon2 = {
+  31,139,8,0,0,0,0,0,0,3,197,87,127,108,148,229,
+  29,255,60,239,251,222,123,239,93,95,142,210,187,190,28,215,
+  107,61,202,81,219,107,97,71,165,228,44,21,202,221,21,74,
+  91,47,181,16,230,54,167,111,89,189,147,43,179,208,89,172,
+  93,131,71,112,88,55,103,132,45,132,153,197,25,179,100,162,
+  155,113,14,9,33,100,97,195,56,52,254,65,28,118,21,227,
+  64,178,4,230,112,99,70,13,185,116,222,62,239,123,167,178,
+  138,130,217,146,125,147,247,251,60,239,247,249,62,223,159,207,
+  247,251,188,175,9,220,102,2,129,80,43,220,25,133,179,71,
+  83,35,40,65,129,112,115,190,240,222,226,214,194,135,171,31,
+  204,168,171,31,156,255,7,225,139,63,30,127,188,105,218,90,
+  155,63,237,68,1,19,152,63,173,145,219,26,93,165,209,109,
+  143,169,17,238,62,80,219,249,199,105,72,64,120,84,248,58,
+  39,157,232,15,254,218,222,157,241,244,228,101,20,126,220,239,
+  11,141,21,246,152,110,226,9,211,178,32,106,66,220,205,113,
+  187,9,105,49,231,47,114,174,164,182,126,69,91,149,151,30,
+  233,66,70,141,30,185,109,167,169,68,143,164,182,134,238,72,
+  141,116,158,59,99,134,59,67,227,150,204,218,8,60,137,247,
+  252,208,34,112,66,207,44,213,119,219,154,154,182,184,79,140,
+  11,135,214,64,170,51,163,156,24,199,63,245,253,214,10,180,
+  140,210,251,144,121,246,196,238,97,52,55,64,57,177,35,212,
+  222,115,90,117,90,82,11,31,105,245,182,20,224,165,240,93,
+  240,188,126,92,223,99,75,3,14,214,86,172,219,17,238,172,
+  91,107,156,186,229,229,194,116,120,19,87,95,94,155,119,159,
+  108,232,66,164,196,53,90,223,247,198,241,218,50,77,0,25,
+  165,175,187,182,108,207,67,225,29,221,121,228,150,143,247,221,
+  7,221,182,208,153,81,151,143,175,231,91,109,89,239,142,198,
+  85,240,12,187,150,189,101,73,236,206,235,151,134,81,17,129,
+  250,246,218,55,127,215,28,129,178,110,213,61,240,5,141,15,
+  66,224,250,165,230,54,92,44,73,80,154,219,196,219,198,187,
+  200,145,158,239,237,50,115,82,12,23,243,213,218,37,40,121,
+  151,141,43,181,67,144,243,115,123,78,223,95,72,141,204,153,
+  134,54,129,57,121,229,181,9,137,118,64,122,44,245,29,203,
+  215,68,222,109,212,78,132,59,189,89,232,8,75,13,88,137,
+  240,154,188,187,57,254,35,226,219,108,188,203,194,174,51,241,
+  70,56,227,207,64,139,111,66,69,173,251,181,61,11,86,65,
+  229,248,52,20,206,220,246,76,227,204,179,13,253,208,222,47,
+  106,237,60,55,190,61,145,119,29,88,215,128,197,119,182,118,
+  228,93,167,248,182,119,27,134,49,134,117,17,44,26,208,43,
+  179,88,140,69,253,80,14,141,137,142,119,16,237,91,245,252,
+  56,228,244,217,174,142,140,66,57,239,245,156,222,190,34,53,
+  226,37,13,139,185,255,177,34,63,241,237,248,38,241,35,248,
+  161,169,151,180,164,184,62,70,77,222,1,224,89,239,38,132,
+  225,29,198,186,37,229,190,44,79,247,82,113,50,126,50,94,
+  183,53,228,223,6,163,234,96,27,238,79,171,148,191,194,188,
+  160,201,140,166,251,37,82,188,59,203,125,166,201,119,53,147,
+  226,251,74,114,53,223,25,222,75,124,174,187,126,19,34,83,
+  199,234,130,147,187,195,59,83,91,231,31,19,229,45,235,161,
+  84,142,67,160,201,252,101,87,4,77,25,119,156,184,152,133,
+  201,4,249,221,203,150,70,97,241,155,15,199,105,69,255,10,
+  205,11,103,58,183,224,7,33,255,101,158,162,112,123,71,94,
+  251,125,34,175,109,183,226,210,15,249,217,203,86,47,246,195,
+  249,247,98,12,108,29,171,43,237,72,20,181,116,231,181,46,
+  44,130,11,78,102,215,57,1,127,108,2,19,109,112,205,121,
+  113,66,234,206,187,199,39,19,115,62,136,22,242,11,235,251,
+  110,28,135,27,154,209,18,253,232,193,88,190,58,53,82,223,
+  199,245,91,71,225,111,66,197,5,189,114,164,29,88,220,157,
+  119,78,199,153,77,62,21,212,82,128,161,53,241,164,205,75,
+  215,87,110,134,15,115,99,98,67,82,126,23,78,23,31,205,
+  103,157,110,249,87,246,76,176,50,30,113,113,174,55,113,151,
+  245,150,35,85,202,104,220,39,96,152,97,191,188,175,13,43,
+  146,202,89,125,170,9,130,243,217,89,37,174,152,218,161,54,
+  92,55,36,141,94,87,153,132,65,222,0,234,24,193,133,156,
+  25,104,200,180,114,244,227,122,90,232,60,175,147,83,78,235,
+  129,38,24,167,28,149,29,168,55,131,118,228,235,187,154,48,
+  55,173,218,49,169,39,143,72,43,201,8,234,105,71,14,85,
+  153,20,247,234,231,117,74,119,218,254,248,201,237,202,196,40,
+  215,141,121,150,220,227,148,106,75,86,41,217,101,186,199,4,
+  57,180,180,52,38,81,71,32,105,105,242,127,34,53,48,6,
+  114,149,181,116,32,152,105,162,140,89,168,178,100,252,69,255,
+  68,138,114,170,195,244,144,71,234,235,176,119,73,201,14,114,
+  215,116,109,134,39,173,209,130,111,33,108,134,185,115,14,194,
+  182,172,242,190,142,120,22,33,198,74,77,107,228,37,31,66,
+  220,81,91,180,63,125,55,227,239,160,54,43,142,215,33,98,
+  54,199,100,198,175,38,171,77,181,65,31,204,155,86,84,22,
+  222,169,50,158,186,249,62,207,194,70,127,75,59,184,71,32,
+  152,150,166,20,250,29,97,78,159,164,124,71,90,153,36,151,
+  173,181,58,19,142,181,105,216,215,49,153,56,254,65,20,157,
+  201,191,253,180,37,9,205,52,186,243,234,171,159,242,78,38,
+  90,70,162,128,118,243,5,200,186,129,66,90,107,177,98,232,
+  54,173,248,121,225,27,101,5,7,106,6,3,167,58,78,37,
+  14,143,227,169,33,169,85,110,121,161,23,237,238,245,73,218,
+  165,166,207,182,124,175,221,77,121,236,117,244,93,66,69,201,
+  43,224,184,193,104,87,38,224,191,98,46,180,73,153,107,129,
+  82,134,3,118,70,138,18,2,159,230,162,59,239,232,173,58,
+  130,242,114,43,54,33,52,82,98,240,37,158,2,99,121,116,
+  243,205,151,38,208,126,14,227,78,216,231,55,152,246,115,84,
+  57,182,7,143,96,214,65,35,29,227,168,173,62,157,26,137,
+  137,169,36,231,101,213,223,70,25,164,224,3,241,197,204,93,
+  178,56,174,227,88,157,101,109,217,20,206,52,114,112,127,117,
+  194,30,237,253,154,238,246,116,237,201,64,58,107,215,102,176,
+  174,111,41,59,246,73,214,218,129,65,104,3,144,94,41,214,
+  41,239,179,163,92,99,7,210,27,237,147,9,92,232,106,228,
+  89,116,179,7,206,219,200,62,39,223,197,153,194,190,117,184,
+  114,16,149,80,12,222,0,198,13,209,170,172,69,119,14,110,
+  48,26,161,179,35,205,254,83,4,149,172,17,85,107,180,43,
+  179,134,220,172,76,246,21,145,209,54,172,146,247,195,249,213,
+  85,124,179,106,147,115,251,116,121,153,11,181,101,208,58,91,
+  118,117,13,90,217,227,204,107,62,70,92,172,12,195,108,47,
+  74,204,52,177,231,149,15,168,214,110,211,207,78,168,100,60,
+  214,156,178,255,106,201,54,117,107,252,88,147,101,17,115,229,
+  232,179,172,141,192,193,40,248,7,149,189,196,124,42,179,210,
+  54,176,163,106,244,180,204,246,180,106,128,158,74,117,156,121,
+  7,98,180,67,133,151,187,42,90,134,163,26,202,201,229,205,
+  120,186,228,140,194,117,31,37,249,50,158,245,50,53,56,245,
+  97,20,162,172,202,109,160,174,138,88,132,188,17,132,239,46,
+  167,103,172,220,125,244,209,84,166,136,249,4,25,167,178,125,
+  137,172,50,10,211,125,104,124,118,97,72,137,181,205,46,220,
+  144,132,199,251,64,8,222,253,240,132,68,23,99,97,219,19,
+  182,236,17,247,148,98,25,161,5,190,76,152,244,185,3,53,
+  164,169,140,134,106,121,107,150,51,78,115,55,8,59,2,130,
+  223,36,71,244,136,21,51,102,241,121,238,49,50,189,220,115,
+  253,198,46,122,52,23,215,211,163,6,63,169,83,202,36,59,
+  81,214,8,80,250,249,89,135,219,32,165,181,109,176,186,147,
+  25,52,148,131,202,208,127,172,24,118,223,50,139,62,54,80,
+  134,65,239,148,140,74,25,11,77,43,162,11,57,107,216,75,
+  185,86,84,15,90,125,83,49,136,189,9,70,190,17,21,214,
+  109,149,169,165,29,117,3,65,90,91,71,11,230,177,162,86,
+  78,113,103,159,114,72,30,146,252,50,251,193,66,125,137,85,
+  51,233,40,237,14,101,116,242,55,14,168,188,155,52,222,46,
+  214,121,212,236,243,40,245,87,208,130,200,164,149,71,82,169,
+  163,44,53,66,239,52,204,35,221,79,122,128,242,93,83,150,
+  23,1,203,139,87,88,183,186,195,242,195,170,77,67,49,121,
+  199,154,190,46,57,91,94,244,206,162,146,34,25,138,85,245,
+  169,17,90,24,102,30,173,140,213,22,115,213,218,8,207,161,
+  142,33,41,230,96,47,10,217,28,85,212,113,121,119,85,105,
+  129,132,170,214,8,130,167,178,168,177,50,61,153,56,156,24,
+  42,63,84,212,65,90,171,108,26,99,232,234,200,94,70,27,
+  163,94,118,38,118,237,109,152,233,69,214,242,227,227,206,83,
+  178,51,41,155,10,101,187,14,242,25,50,108,186,199,162,79,
+  150,158,82,142,252,150,52,126,73,52,192,193,47,142,138,116,
+  160,207,186,241,61,250,82,158,85,88,103,213,123,15,187,103,
+  5,99,231,152,76,76,38,248,205,228,139,55,192,168,191,37,
+  178,9,234,155,199,166,222,26,197,130,30,248,253,213,111,188,
+  200,49,88,26,233,121,7,187,215,154,119,32,173,205,227,217,
+  98,23,139,87,24,63,241,29,129,176,177,100,99,217,198,138,
+  141,29,54,86,109,236,52,172,147,112,116,215,60,99,39,251,
+  102,19,191,63,31,50,85,210,53,123,213,101,99,183,141,203,
+  108,172,27,187,125,165,94,134,107,131,194,53,242,253,223,193,
+  115,193,19,152,149,210,191,95,246,102,217,18,247,195,174,75,
+  174,172,118,70,219,232,60,239,188,215,169,171,191,80,215,56,
+  222,117,236,115,172,81,166,149,3,202,22,101,137,252,190,124,
+  68,222,37,175,147,195,210,135,210,171,210,207,165,237,210,215,
+  165,152,228,23,121,241,103,113,76,60,45,246,136,239,138,180,
+  232,19,43,197,34,17,20,58,254,133,127,224,109,188,142,151,
+  241,91,252,6,251,241,51,236,229,183,232,46,220,143,123,177,
+  21,89,12,224,14,124,13,235,209,139,110,172,65,130,95,213,
+  203,113,35,90,208,140,40,191,216,88,235,168,195,2,204,231,
+  221,85,61,155,173,121,86,78,207,233,188,132,220,57,55,92,
+  57,23,180,156,6,103,206,9,245,168,218,174,194,145,115,180,
+  59,160,28,85,114,74,187,2,249,168,156,147,77,57,36,243,
+  86,145,158,144,114,146,41,181,75,33,9,226,140,56,42,158,
+  19,143,138,156,48,69,175,104,23,81,17,18,229,252,13,185,
+  136,51,152,194,113,28,197,115,120,10,79,96,31,30,229,79,
+  90,14,163,216,130,205,180,212,196,173,182,165,61,232,68,18,
+  237,104,67,12,203,108,75,155,74,150,134,81,75,75,107,70,
+  183,108,30,48,111,93,223,219,211,153,108,111,139,45,107,142,
+  54,69,234,235,194,181,161,154,96,213,60,191,81,233,243,86,
+  204,41,159,13,153,42,197,171,180,229,5,241,140,120,82,186,
+  137,22,77,208,166,251,196,176,216,204,24,154,226,27,98,131,
+  184,69,244,136,78,145,164,149,55,137,27,197,50,113,3,132,
+  16,146,36,201,69,80,108,112,92,6,234,12,112,206,0,109,
+  6,184,190,8,220,159,133,178,207,5,253,138,48,235,42,224,
+  153,1,179,175,2,244,95,146,109,151,63,245,238,10,190,92,
+  155,217,87,54,249,218,141,255,66,79,190,44,92,205,243,146,
+  255,51,64,204,0,105,6,200,51,64,153,1,142,25,240,223,
+  158,159,171,5,254,106,33,190,90,84,62,235,248,103,93,189,
+  130,115,87,116,232,115,253,184,218,225,249,146,135,229,127,148,
+  122,27,172,191,213,127,3,50,193,182,9,148,18,0,0,
+};
+/* ninjatfmx data */
+static const unsigned char dat_ninjatfmx = {
+  31,139,8,0,0,0,0,0,0,3,229,87,107,112,27,213,
+  21,254,118,181,146,86,107,89,214,42,142,108,43,126,172,100,
+  85,44,142,227,120,60,134,186,137,234,232,17,199,178,99,11,
+  249,145,20,135,82,228,54,145,92,135,130,107,98,160,110,32,
+  14,45,137,97,218,212,100,134,71,25,134,71,219,233,164,244,
+  49,153,16,166,76,74,193,237,15,112,26,134,49,121,51,83,
+  146,240,40,49,52,205,164,148,82,179,132,184,223,174,200,0,
+  63,250,179,127,90,121,206,189,103,191,123,239,185,231,158,215,
+  189,206,2,13,89,96,203,32,48,20,55,144,237,212,149,233,
+  188,71,139,58,17,198,196,144,251,214,224,244,36,210,99,209,
+  23,27,148,71,119,69,119,166,199,90,163,218,120,155,129,230,
+  110,195,213,50,56,215,26,13,141,119,27,66,195,224,169,79,
+  240,242,110,3,143,12,206,134,82,71,78,134,103,194,7,41,
+  213,67,233,190,157,155,146,65,95,243,250,219,201,111,204,66,
+  40,207,66,254,126,22,174,214,254,53,221,215,106,221,235,250,
+  58,146,90,166,43,62,208,214,171,125,165,183,163,191,191,45,
+  173,37,6,180,206,107,146,41,114,169,142,76,166,173,75,11,
+  214,213,213,105,253,169,54,45,221,145,238,140,47,235,109,235,
+  238,40,44,189,86,51,71,214,165,87,107,253,125,201,212,195,
+  125,125,72,157,93,184,52,88,218,117,122,219,66,122,76,211,
+  186,227,171,73,215,106,171,52,32,110,120,220,131,13,157,177,
+  188,214,23,11,141,23,135,103,99,77,152,141,205,198,15,79,
+  55,86,52,85,116,27,69,31,68,127,60,8,71,111,122,44,
+  110,20,157,203,204,82,223,27,91,87,20,75,185,175,119,27,
+  197,168,159,12,13,65,58,50,211,109,184,231,235,239,33,47,
+  91,252,5,139,119,91,252,180,197,123,45,126,175,197,151,90,
+  252,129,250,131,228,203,143,204,212,31,76,26,53,126,34,207,
+  213,223,195,246,201,204,113,182,15,68,159,133,104,238,233,222,
+  213,233,205,71,251,116,8,195,87,171,25,8,189,67,16,27,
+  117,136,123,183,66,201,41,137,41,106,181,158,90,5,216,103,
+  188,141,230,121,138,238,74,26,69,7,218,140,162,247,188,19,
+  190,137,210,137,110,67,121,127,173,81,84,223,185,12,82,62,
+  194,214,158,171,206,252,13,246,17,84,197,16,34,69,72,117,
+  93,231,81,130,202,212,60,74,76,239,246,93,159,171,92,185,
+  120,220,148,230,166,199,206,179,143,177,127,155,189,25,23,167,
+  40,239,92,220,80,46,12,66,244,175,66,213,13,112,80,134,
+  88,21,71,136,51,252,68,97,161,30,162,10,209,8,209,232,
+  32,132,119,45,212,79,212,71,180,174,209,212,40,182,202,220,
+  101,3,71,95,162,61,148,35,115,240,184,175,196,235,16,114,
+  82,226,91,144,90,107,146,134,146,61,213,126,170,253,240,139,
+  91,81,89,65,9,19,89,246,85,143,89,237,246,44,170,171,
+  224,196,116,135,33,223,218,89,154,247,146,215,68,39,62,234,
+  57,15,31,201,95,213,206,9,215,35,208,117,220,185,208,110,
+  200,189,157,139,114,114,106,222,185,48,25,75,143,197,206,174,
+  185,120,5,82,243,54,126,169,23,161,76,198,214,156,230,217,
+  117,68,134,223,80,135,112,5,34,212,40,228,173,216,27,197,
+  66,110,36,50,132,230,112,230,216,28,164,167,15,229,28,193,
+  54,72,225,204,40,124,62,117,24,2,234,217,138,240,123,235,
+  96,43,133,152,192,133,253,91,113,33,231,38,47,162,68,77,
+  64,207,122,247,71,113,38,167,88,163,37,43,19,16,15,199,
+  15,199,35,227,202,227,145,91,188,56,97,40,251,131,107,17,
+  114,236,1,224,134,148,197,194,14,238,122,41,231,86,123,112,
+  133,58,128,8,145,219,137,124,156,243,92,70,130,29,8,165,
+  199,212,24,100,95,133,26,135,75,140,227,76,94,226,72,141,
+  57,66,253,90,58,177,121,139,79,135,203,43,112,172,230,176,
+  14,127,120,92,233,55,247,13,143,122,113,204,80,98,156,229,
+  81,123,81,166,110,64,57,207,18,96,191,68,221,138,24,26,
+  74,3,212,186,146,84,69,172,58,216,9,69,4,98,121,137,
+  242,106,40,69,249,84,138,203,224,168,143,146,26,213,54,4,
+  72,21,233,177,59,161,182,67,235,212,17,200,203,180,103,128,
+  25,190,155,182,244,209,187,141,110,21,175,231,33,220,197,254,
+  76,14,180,217,149,16,196,9,158,123,85,48,134,70,107,214,
+  52,199,222,224,88,105,98,15,245,219,74,251,150,245,238,65,
+  35,109,240,44,71,222,225,72,212,244,93,4,244,90,209,36,
+  212,119,32,76,138,228,221,147,38,2,139,47,182,120,101,82,
+  236,231,74,139,195,154,211,148,48,78,9,103,115,165,29,134,
+  99,77,207,81,177,5,37,70,213,39,178,179,28,153,163,125,
+  191,201,253,2,253,5,172,149,216,91,57,31,79,83,103,225,
+  90,1,199,126,226,127,201,21,116,171,251,100,189,143,216,219,
+  22,38,94,198,240,3,98,111,230,188,235,77,29,204,245,75,
+  216,138,168,36,250,110,238,166,17,152,103,103,181,49,255,14,
+  200,207,133,99,87,15,67,62,49,221,88,7,121,170,55,53,
+  189,122,162,195,144,190,90,208,81,159,72,127,163,195,176,239,
+  206,28,109,51,236,15,113,157,184,89,158,213,97,82,189,24,
+  195,54,83,134,214,4,164,98,156,181,70,159,40,156,24,45,
+  240,26,85,230,238,233,177,203,246,103,252,44,53,181,163,119,
+  42,242,14,122,167,34,155,102,91,150,75,49,230,203,81,118,
+  57,11,189,42,227,109,46,231,238,55,125,96,234,94,145,125,
+  137,200,235,121,109,175,25,201,190,79,253,118,221,4,61,231,
+  201,190,64,201,203,40,217,227,213,177,244,243,218,37,13,231,
+  219,102,101,101,85,85,253,58,130,165,58,234,196,187,184,182,
+  36,39,59,239,95,159,116,222,159,109,96,126,8,185,144,243,
+  152,249,69,77,100,104,229,148,51,172,136,18,182,169,171,161,
+  101,221,175,234,108,29,214,252,99,212,94,203,123,41,75,19,
+  109,168,81,72,75,146,16,170,117,52,112,164,218,58,87,117,
+  118,125,64,160,140,202,147,102,212,86,117,58,135,29,178,19,
+  200,69,216,218,115,158,221,58,150,108,244,203,47,194,62,138,
+  172,135,217,177,100,159,180,201,33,239,132,221,39,49,159,170,
+  222,112,239,150,54,74,82,92,128,195,142,199,55,201,135,227,
+  236,203,55,206,207,198,21,39,4,70,68,131,172,195,14,87,
+  30,168,190,19,77,78,51,51,82,219,195,58,90,110,117,159,
+  125,226,232,246,96,2,45,169,196,84,130,248,50,238,165,239,
+  139,194,75,189,132,97,113,20,102,101,119,236,79,76,53,224,
+  101,70,109,189,208,187,227,37,246,35,98,220,176,63,146,52,
+  236,45,244,113,148,89,172,152,241,159,224,122,146,76,114,17,
+  243,37,204,88,178,114,194,106,203,137,87,16,11,36,134,80,
+  77,94,243,251,196,239,153,150,61,158,60,158,100,238,6,181,
+  3,142,150,224,184,163,25,205,175,237,65,243,9,210,233,169,
+  19,83,193,173,133,74,19,201,248,22,137,219,201,47,152,25,
+  173,143,59,188,250,22,47,94,53,28,225,96,23,66,148,27,
+  41,196,179,186,217,172,114,148,191,148,28,43,29,57,221,183,
+  20,54,86,150,11,251,172,90,103,125,9,172,118,113,232,150,
+  206,123,208,242,10,179,17,209,158,153,133,230,184,33,61,217,
+  248,44,4,106,41,165,199,154,87,216,247,53,173,176,239,237,
+  76,208,122,247,242,212,27,214,26,246,135,89,109,100,174,14,
+  114,181,127,28,140,155,133,240,184,253,103,102,100,135,71,193,
+  74,99,159,250,108,189,242,6,204,25,102,197,218,130,255,84,
+  179,184,62,251,153,245,153,203,149,202,178,25,235,146,169,35,
+  251,154,222,248,202,184,169,23,223,59,231,146,134,232,13,77,
+  198,13,49,66,206,23,154,44,220,18,252,46,215,230,133,82,
+  239,188,225,34,21,147,84,210,98,82,25,169,138,153,166,25,
+  46,171,45,102,198,158,54,84,139,95,156,52,132,71,131,7,
+  133,82,249,25,216,140,178,66,46,51,55,191,108,212,6,47,
+  58,157,11,11,230,157,19,55,202,252,201,57,1,225,14,77,
+  199,69,137,57,37,224,216,180,149,127,11,57,105,68,206,42,
+  10,48,49,39,243,188,37,222,149,80,124,211,79,253,233,230,
+  51,233,49,56,93,74,145,219,93,92,92,236,241,120,74,74,
+  74,46,107,42,220,20,60,41,148,170,39,13,23,169,152,164,
+  146,22,147,202,72,230,238,211,70,173,121,211,209,233,248,127,
+  255,165,206,78,79,104,43,46,125,144,30,42,84,76,245,130,
+  121,127,140,194,49,97,142,190,18,191,209,93,59,109,190,83,
+  187,78,11,182,244,45,61,31,154,124,193,139,5,228,243,210,
+  36,147,162,164,59,72,127,0,236,116,156,125,61,137,247,186,
+  253,18,224,24,32,29,0,156,26,233,135,96,145,35,125,135,
+  100,0,46,102,45,159,7,80,126,13,20,101,72,204,29,247,
+  62,160,120,11,159,204,113,38,116,0,240,114,190,247,31,128,
+  250,79,96,145,131,23,164,14,44,190,142,151,232,227,64,217,
+  135,64,197,38,32,48,7,84,178,182,86,55,3,220,6,193,
+  179,64,237,95,129,72,49,160,247,0,117,191,5,150,81,222,
+  242,247,128,166,67,192,85,175,0,95,162,226,209,33,94,240,
+  156,159,124,25,104,63,14,116,45,1,50,63,1,214,221,4,
+  108,160,188,27,222,2,54,61,8,108,38,54,74,197,111,159,
+  101,80,114,254,206,71,128,31,253,10,120,232,139,192,19,109,
+  192,147,127,6,158,166,188,231,103,128,67,203,129,19,171,129,
+  183,84,224,239,79,48,172,25,218,37,45,16,106,6,32,52,
+  222,204,106,112,47,132,117,207,240,109,235,130,176,237,62,8,
+  15,220,0,225,55,247,64,152,169,133,240,102,146,117,6,16,
+  171,191,13,177,245,41,136,217,211,16,239,230,243,233,151,35,
+  16,143,46,130,184,16,130,173,254,121,216,174,95,4,219,84,
+  59,108,47,236,16,10,78,224,219,81,180,24,129,0,223,95,
+  176,217,232,13,106,100,183,211,250,180,154,153,119,50,79,224,
+  114,209,218,74,97,145,232,8,65,241,68,224,243,215,153,110,
+  148,152,25,130,104,147,236,14,167,204,36,43,177,126,255,197,
+  48,252,31,249,121,206,123,202,138,187,221,187,138,94,45,90,
+  174,236,114,253,203,149,151,207,200,131,206,57,231,109,206,34,
+  199,207,29,237,246,115,246,7,237,237,210,71,210,83,210,136,
+  212,104,123,223,246,59,219,221,182,62,91,173,248,129,120,72,
+  252,169,120,135,56,32,182,136,229,130,33,188,38,252,81,248,
+  133,112,159,240,93,97,147,208,35,180,10,245,66,165,224,198,
+  199,56,79,239,30,197,12,126,143,125,216,131,199,240,0,118,
+  97,7,238,196,109,24,193,48,54,226,107,24,64,63,174,193,
+  90,180,35,201,127,66,86,178,10,95,133,38,44,71,61,234,
+  248,162,255,2,106,17,68,13,170,80,137,0,42,80,6,63,
+  22,99,17,124,80,153,92,37,255,6,85,99,205,105,252,14,
+  0,0,
+};
+/* note data */
+static const unsigned char dat_note = {
+  31,139,8,0,0,0,0,0,0,3,75,96,96,72,242,43,
+  245,43,117,254,197,16,164,16,168,32,161,36,161,194,208,210,
+  152,198,166,80,197,224,150,240,65,169,195,241,71,7,131,243,
+  143,14,166,18,198,68,9,15,135,18,134,68,33,129,61,12,
+  108,70,141,64,146,93,168,81,129,17,40,198,116,197,73,160,
+  73,168,33,8,72,26,53,60,242,10,112,122,225,1,98,249,
+  149,50,64,129,243,175,255,223,148,78,40,157,240,43,5,0,
+  3,158,21,210,110,0,0,0,
+};
+/* page data */
+static const unsigned char dat_page = {
+  31,139,8,0,0,0,0,0,0,3,237,87,125,108,91,213,
+  21,63,126,118,253,94,28,183,184,38,245,226,36,56,78,26,
+  130,99,63,167,47,193,48,167,88,233,179,243,245,226,38,143,
+  144,100,93,147,21,120,110,27,27,18,167,249,104,30,159,94,
+  73,10,203,88,233,32,32,20,33,134,216,23,98,211,4,90,
+  232,34,4,168,84,29,99,168,76,19,74,187,170,127,32,88,
+  75,199,104,145,160,240,199,214,5,55,196,251,221,23,71,176,
+  253,181,73,27,251,99,189,210,61,191,115,239,61,247,124,220,
+  123,206,125,182,70,22,143,170,171,122,237,102,82,83,23,197,
+  54,245,20,93,110,151,219,229,118,185,25,173,51,75,199,90,
+  178,151,178,9,45,185,173,51,123,233,196,171,199,146,142,218,
+  205,75,174,4,209,65,134,26,209,3,162,82,29,111,201,126,
+  126,42,17,73,214,215,250,73,196,218,104,109,192,192,219,188,
+  131,212,133,185,16,248,61,181,155,47,29,73,89,197,182,160,
+  66,22,172,179,57,69,213,161,245,100,108,86,213,253,106,173,
+  231,200,225,190,206,158,222,20,167,234,141,158,35,153,73,74,
+  58,27,61,150,182,190,206,63,223,40,122,222,249,254,213,211,
+  163,164,125,48,39,179,215,234,210,227,216,109,99,8,15,184,
+  248,119,83,118,229,92,110,25,239,215,108,199,233,251,114,170,
+  158,159,217,183,50,179,15,51,76,243,36,245,117,34,40,19,
+  80,37,19,17,240,38,140,109,192,30,224,83,192,94,224,111,
+  129,223,0,254,9,248,77,224,34,176,11,56,3,220,142,237,
+  235,128,125,192,151,128,253,48,223,5,252,22,240,1,224,14,
+  224,44,16,238,153,35,192,157,68,5,22,224,46,236,127,28,
+  184,27,248,196,63,159,114,60,177,119,100,143,183,43,145,26,
+  240,142,15,140,166,19,119,123,125,201,241,145,97,111,119,226,
+  246,61,59,71,238,244,182,239,77,39,246,236,222,91,243,101,
+  193,77,222,182,241,68,114,162,109,36,189,219,235,171,107,8,
+  55,212,80,231,120,109,207,196,221,187,134,238,242,250,234,67,
+  155,164,240,166,134,112,13,117,175,40,28,215,247,236,245,38,
+  38,188,117,146,228,85,238,161,104,150,19,155,178,133,98,149,
+  208,146,165,39,189,206,249,201,212,245,85,251,43,201,58,197,
+  252,173,118,188,56,57,92,244,226,212,30,199,139,135,137,106,
+  50,41,97,118,242,212,126,239,253,189,74,175,242,194,155,35,
+  103,162,89,211,133,173,217,66,123,69,167,233,105,240,103,189,
+  17,117,76,29,171,203,104,141,52,95,33,155,150,43,100,142,
+  67,183,214,201,156,13,56,139,254,36,250,211,24,255,4,248,
+  28,250,28,120,200,114,135,129,71,235,100,211,102,224,43,192,
+  120,157,108,150,235,50,170,110,110,85,117,162,170,179,208,191,
+  127,85,191,170,155,158,105,202,154,234,225,115,35,14,184,12,
+  124,24,124,63,120,7,248,70,240,219,192,91,84,189,178,100,
+  168,216,130,88,170,206,156,120,176,170,224,241,169,234,232,215,
+  51,9,202,45,95,191,95,123,159,233,245,23,161,191,131,126,
+  30,253,47,68,1,220,66,160,145,72,60,129,254,71,162,224,
+  104,14,13,115,179,43,88,141,239,162,223,143,113,28,107,103,
+  216,220,214,44,247,198,22,170,188,103,57,114,109,134,151,200,
+  10,234,163,117,160,34,185,90,178,92,215,198,56,121,213,71,
+  19,100,74,75,229,9,226,66,26,113,243,216,243,88,52,75,
+  191,236,90,72,144,121,187,70,230,94,239,61,159,47,54,101,
+  105,102,253,237,44,47,65,145,149,160,28,173,1,53,147,5,
+  212,66,5,160,107,72,0,181,210,90,80,158,174,0,21,200,
+  12,90,64,60,168,141,10,65,11,233,74,80,59,57,29,53,
+  180,118,72,136,249,200,177,94,166,245,170,190,133,111,164,51,
+  55,226,116,124,27,38,71,169,177,220,152,49,25,51,174,13,
+  83,43,51,224,109,27,134,109,54,226,217,249,252,99,187,240,
+  254,123,247,158,60,121,236,189,87,159,58,116,241,231,31,253,
+  112,108,246,219,15,23,78,59,247,29,188,115,124,244,200,224,
+  224,238,177,91,222,234,187,183,247,142,27,95,222,186,165,205,
+  218,84,176,165,245,134,151,195,183,94,119,93,125,195,166,148,
+  120,196,127,195,53,239,94,253,163,141,247,87,124,167,252,167,
+  87,189,91,38,149,252,192,125,213,215,230,93,183,110,240,92,
+  249,137,115,97,253,107,142,223,92,113,98,221,39,235,138,215,
+  170,246,71,10,223,46,148,108,143,20,44,22,220,38,188,39,
+  236,228,63,228,239,226,237,214,159,89,149,53,31,175,121,98,
+  141,98,89,178,204,91,198,44,117,230,191,154,15,155,167,205,
+  189,230,42,238,111,220,239,185,103,184,125,92,63,215,192,185,
+  77,151,148,115,228,107,89,124,144,144,3,111,199,194,89,119,
+  197,18,209,53,15,155,66,194,34,173,201,242,6,189,114,253,
+  18,93,204,150,131,90,179,110,228,150,119,244,34,118,217,196,
+  97,219,132,111,91,163,72,173,234,252,40,117,156,238,66,47,
+  34,85,63,148,33,243,78,241,181,37,26,140,126,204,183,30,
+  255,181,147,82,30,101,170,39,138,25,169,114,152,151,28,117,
+  14,207,156,143,74,7,4,69,150,76,21,50,149,168,186,114,
+  78,34,47,214,154,176,67,109,9,81,194,169,200,160,246,144,
+  41,33,168,173,29,167,201,174,234,46,46,85,162,220,223,211,
+  244,6,244,20,73,146,103,190,198,208,17,11,153,55,198,168,
+  164,233,67,26,84,245,27,100,190,81,213,75,101,190,9,124,
+  148,143,96,188,89,213,219,161,117,156,75,248,219,63,162,193,
+  155,222,204,45,6,50,68,124,171,48,45,69,4,50,29,32,
+  146,34,5,121,180,25,168,234,222,8,81,46,87,3,223,208,
+  61,232,149,136,251,142,26,133,58,208,171,209,195,232,17,244,
+  80,76,164,29,146,72,218,84,208,102,171,122,222,38,176,88,
+  194,97,249,28,101,120,18,94,98,167,215,122,154,157,175,20,
+  228,55,207,12,243,225,148,95,26,230,35,131,37,205,242,156,
+  50,34,72,194,163,152,211,92,140,38,29,168,182,109,154,13,
+  243,156,36,28,199,12,246,52,166,108,184,153,229,216,48,223,
+  168,197,88,28,19,28,172,149,13,213,178,211,114,74,228,137,
+  139,84,146,180,31,18,105,227,128,19,53,163,105,140,47,31,
+  176,214,164,169,4,158,103,88,28,84,98,68,254,187,220,27,
+  121,191,22,87,252,234,56,93,86,54,138,104,185,204,231,57,
+  195,215,43,148,115,139,75,106,203,214,207,88,6,51,175,123,
+  130,124,203,138,213,30,145,60,201,50,216,246,14,185,156,176,
+  96,88,180,160,86,47,228,109,120,170,211,36,133,69,146,175,
+  23,41,230,77,83,135,58,3,90,109,208,176,65,35,234,76,
+  222,143,121,223,176,48,205,228,49,27,82,103,226,176,146,92,
+  87,58,204,55,1,173,192,102,190,133,221,250,150,114,117,175,
+  170,143,223,247,26,25,217,99,63,241,60,239,171,140,58,221,
+  135,130,124,116,160,30,183,44,151,70,249,168,195,13,174,25,
+  189,165,180,143,143,117,127,47,127,74,238,148,128,51,242,45,
+  28,77,216,242,86,47,168,58,110,172,43,65,203,149,204,103,
+  223,1,248,168,195,131,174,152,236,40,102,43,115,17,90,30,
+  136,128,230,82,54,67,194,207,36,162,217,92,38,160,240,143,
+  161,47,5,20,33,25,131,117,236,8,242,242,144,21,52,150,
+  178,176,172,195,44,190,178,176,40,46,200,11,159,18,105,22,
+  104,238,101,154,7,239,128,198,185,129,50,208,133,129,56,232,
+  167,3,85,160,159,13,20,49,123,169,122,141,114,25,11,209,
+  125,110,153,182,107,111,129,251,20,220,14,237,117,112,11,202,
+  228,81,100,123,131,76,183,176,202,113,143,145,135,110,214,126,
+  1,95,123,181,56,163,144,153,59,154,175,43,103,29,121,140,
+  91,145,144,49,219,53,63,91,199,77,221,108,204,149,109,33,
+  220,221,45,88,105,148,202,163,217,75,59,23,100,73,34,84,
+  189,185,95,29,115,167,105,59,245,177,136,107,158,102,17,27,
+  247,97,195,141,247,165,40,135,250,137,175,112,146,170,195,147,
+  42,119,148,54,142,83,61,237,135,221,238,40,70,149,213,176,
+  126,234,104,205,86,146,152,14,191,131,170,163,217,101,133,85,
+  199,106,165,56,2,84,222,74,71,211,164,33,102,126,23,242,
+  198,92,207,161,8,83,44,131,102,84,29,190,237,100,149,199,
+  228,156,168,164,95,25,178,47,228,107,202,61,68,94,42,142,
+  165,169,22,221,143,81,5,5,64,43,73,52,236,117,35,203,
+  116,232,41,235,193,42,251,37,132,181,141,134,68,85,94,98,
+  98,69,130,178,171,18,13,67,84,77,254,120,128,174,78,42,
+  144,243,229,229,158,165,106,140,106,40,216,44,146,104,236,56,
+  102,236,16,112,22,193,212,251,134,102,127,94,246,88,94,231,
+  179,113,248,149,106,94,137,193,17,33,199,202,75,82,200,98,
+  241,173,240,118,198,215,172,240,107,25,239,103,60,211,18,88,
+  199,180,172,122,5,43,197,73,202,21,67,98,83,202,165,76,
+  246,200,95,190,91,228,237,126,45,180,122,82,95,126,115,242,
+  185,90,157,199,112,30,35,249,202,172,84,117,7,226,81,38,
+  23,224,233,160,37,38,227,141,193,235,50,98,193,251,18,198,
+  141,214,158,87,234,161,213,73,102,227,237,67,140,34,41,120,
+  215,226,238,12,190,173,205,177,230,88,19,206,93,70,143,69,
+  79,54,253,1,57,29,160,128,86,86,191,94,154,170,139,18,
+  87,199,190,189,22,227,123,107,141,158,39,1,47,177,237,166,
+  99,185,179,70,124,23,80,251,186,123,175,100,161,86,247,132,
+  108,165,22,240,86,106,99,107,162,64,97,156,223,52,162,110,
+  99,209,27,115,30,38,47,133,100,203,241,9,153,28,215,74,
+  188,50,9,206,2,153,150,228,235,206,107,37,225,108,193,110,
+  107,195,188,204,201,4,206,210,140,53,160,221,30,34,65,182,
+  238,178,244,132,100,43,100,91,147,143,33,226,230,57,248,153,
+  180,127,17,133,102,239,198,172,181,153,4,107,19,217,26,154,
+  73,110,104,162,24,234,79,115,6,112,191,18,242,92,73,177,
+  253,138,86,133,253,113,195,54,97,220,158,44,66,158,183,55,
+  211,144,0,157,181,105,174,155,80,163,241,250,144,76,231,219,
+  113,19,187,29,38,118,39,86,217,68,103,218,87,120,163,106,
+  118,164,92,225,231,168,31,103,220,207,162,11,22,81,4,60,
+  103,212,81,127,120,146,241,171,119,101,228,79,255,12,171,216,
+  29,103,181,148,229,120,175,170,179,189,95,172,7,58,132,105,
+  67,75,12,111,38,203,224,34,114,128,186,168,8,55,230,38,
+  87,233,16,21,11,7,75,211,228,18,30,2,95,34,28,144,
+  34,86,66,28,142,15,132,213,124,11,102,40,212,19,20,14,
+  172,158,119,240,97,166,11,150,139,142,167,201,129,123,45,69,
+  204,105,42,130,204,67,201,87,112,42,101,198,121,27,182,140,
+  243,198,154,113,222,34,126,75,185,118,177,123,113,65,246,96,
+  242,193,188,159,33,10,82,120,245,75,248,159,255,111,245,111,
+  181,2,225,171,178,228,44,64,9,124,37,173,202,134,31,183,
+  255,122,99,191,195,133,31,255,215,188,249,63,111,252,255,192,
+  129,191,3,87,138,180,73,126,20,0,0,
+};
+/* protracker data */
+static const unsigned char dat_protracker = {
+  31,139,8,0,0,0,0,0,0,3,189,87,11,80,148,215,
+  21,254,206,253,127,215,63,235,194,254,93,25,68,228,21,100,
+  18,170,136,40,54,73,55,152,172,139,73,182,91,165,138,166,
+  67,218,76,186,168,240,103,20,9,62,72,140,33,10,198,88,
+  170,49,81,107,77,106,155,196,68,107,30,117,204,74,137,53,
+  141,109,87,139,4,31,53,168,232,216,180,245,81,95,235,163,
+  202,56,198,202,138,208,115,255,101,1,45,51,25,102,156,238,
+  204,127,239,61,231,158,115,238,119,239,249,238,185,224,3,226,
+  124,128,133,191,119,178,91,3,192,241,230,181,223,11,181,95,
+  240,149,112,123,58,187,213,101,106,190,237,209,3,169,158,220,
+  243,202,182,178,133,179,145,70,147,92,142,129,53,162,244,250,
+  196,134,246,27,249,34,55,100,111,59,185,232,204,162,166,237,
+  128,154,211,84,157,230,46,75,114,175,74,221,51,27,35,211,
+  49,228,84,213,225,29,99,130,72,98,219,75,200,128,208,15,
+  13,172,128,69,175,115,103,232,187,248,171,119,151,232,251,221,
+  47,242,42,31,154,237,54,179,109,48,219,163,217,173,176,115,
+  191,38,175,220,115,238,70,27,35,202,207,103,47,221,169,219,
+  253,78,221,90,164,203,24,222,12,125,159,49,182,208,234,131,
+  152,82,168,114,219,244,253,22,246,89,55,62,20,189,173,16,
+  226,160,41,249,89,58,194,82,157,41,5,88,186,198,210,86,
+  83,106,28,31,178,59,216,239,195,148,249,246,154,39,130,176,
+  61,22,84,182,141,9,170,57,101,152,13,221,105,223,224,24,
+  9,156,172,58,83,117,112,190,125,29,163,109,236,140,95,80,
+  152,222,25,125,94,97,66,103,236,183,10,245,72,100,198,192,
+  152,104,174,119,77,177,202,43,110,202,240,199,161,160,106,46,
+  98,50,25,76,14,154,131,86,61,54,192,253,98,120,133,1,
+  44,126,30,185,161,104,255,67,98,18,159,103,67,43,146,134,
+  205,74,231,67,29,61,199,3,104,102,155,158,56,199,35,224,
+  224,86,65,255,7,178,61,170,55,215,200,76,203,132,122,42,
+  183,233,149,97,110,88,249,75,203,98,125,227,28,143,101,180,
+  203,244,178,32,186,12,122,38,250,63,204,178,47,73,90,119,
+  217,222,57,159,21,27,168,176,183,27,176,56,178,24,35,143,
+  155,253,21,209,19,140,20,93,74,57,176,251,115,160,24,113,
+  220,246,49,28,220,222,83,28,83,136,62,103,125,209,133,176,
+  236,247,105,188,199,122,31,250,28,241,156,11,4,70,198,238,
+  228,72,185,33,205,95,134,5,105,53,179,128,105,150,201,149,
+  19,191,108,191,62,27,142,76,56,118,182,194,115,104,199,104,
+  214,67,31,119,92,81,186,173,215,104,160,207,170,236,203,136,
+  145,217,215,88,143,164,98,213,157,137,65,60,182,116,140,19,
+  135,108,134,250,112,41,52,168,236,169,51,118,11,247,49,85,
+  156,33,70,48,57,203,25,117,173,178,162,18,217,1,25,195,
+  204,7,198,135,162,210,135,150,194,138,70,246,139,70,211,248,
+  144,237,146,41,7,76,185,142,101,191,41,251,77,185,150,229,
+  185,166,188,206,148,55,88,74,160,235,251,245,12,125,175,161,
+  13,116,233,251,152,127,123,77,254,217,38,201,214,162,154,243,
+  172,217,109,196,76,188,164,239,230,83,117,70,21,177,213,23,
+  231,61,223,117,233,251,109,37,42,244,253,69,89,166,126,124,
+  88,39,103,249,107,96,102,215,139,12,44,212,235,29,206,168,
+  172,148,249,81,247,213,164,43,91,139,84,121,71,56,98,67,
+  241,158,113,199,23,38,231,149,243,57,31,235,56,169,118,227,
+  71,145,172,24,5,156,11,98,6,237,228,158,153,68,170,153,
+  39,208,90,238,85,3,34,197,204,24,132,159,123,75,71,31,
+  109,64,157,194,59,211,97,97,169,47,107,215,113,111,53,160,
+  148,230,149,135,245,121,229,18,171,237,221,170,86,40,30,151,
+  191,2,48,18,184,21,134,213,100,140,18,212,124,142,240,72,
+  162,240,89,70,113,38,124,67,78,185,186,50,60,38,100,241,
+  31,216,193,181,128,103,22,164,141,202,2,106,38,76,211,38,
+  87,51,15,174,241,42,110,185,6,239,111,87,241,107,92,23,
+  236,250,158,142,104,78,91,22,203,237,250,158,149,140,67,230,
+  87,238,151,87,158,53,221,38,74,155,153,49,40,197,172,174,
+  25,153,253,142,56,104,31,27,142,228,118,133,35,245,59,27,
+  142,116,224,182,72,74,193,140,206,72,74,193,157,145,134,107,
+  163,98,235,88,50,209,56,2,230,62,250,4,15,4,202,80,
+  91,198,60,182,78,150,103,225,41,186,90,246,56,223,100,7,
+  223,100,205,176,120,93,134,120,210,37,119,152,242,147,209,110,
+  196,201,136,204,211,216,90,151,97,43,65,219,230,196,10,16,
+  98,243,202,221,165,136,203,43,151,216,12,45,209,133,1,108,
+  163,120,89,103,160,109,169,185,222,0,47,123,21,199,119,224,
+  141,243,115,95,154,54,154,45,56,30,183,190,184,149,221,102,
+  102,90,187,102,228,233,179,127,178,201,136,251,110,195,158,209,
+  216,3,118,137,53,156,1,19,77,26,239,37,222,244,181,212,
+  153,53,169,35,175,205,166,108,95,140,68,55,226,89,55,232,
+  137,144,186,253,180,39,80,129,100,179,146,37,213,73,174,165,
+  156,211,106,37,7,45,49,57,104,247,197,242,30,6,77,215,
+  228,120,53,124,90,12,124,106,76,54,100,196,120,246,179,215,
+  5,46,123,229,249,72,171,25,106,163,219,39,86,184,229,201,
+  203,121,51,114,206,1,158,145,108,111,59,203,111,211,177,194,
+  106,110,143,118,162,76,248,6,148,9,172,75,100,148,177,221,
+  81,6,173,189,194,153,16,198,121,201,27,174,141,108,151,24,
+  65,58,93,184,229,25,186,166,170,89,57,112,201,170,41,237,
+  59,113,39,154,183,70,98,85,57,191,178,114,166,92,241,112,
+  174,180,18,27,103,78,59,229,57,192,149,43,175,124,180,228,
+  131,22,177,13,106,94,190,91,236,221,223,150,9,23,250,207,
+  176,48,95,184,143,212,229,136,157,220,249,74,214,77,151,53,
+  176,219,172,156,155,4,174,74,245,178,162,76,184,164,55,68,
+  60,248,78,187,166,138,50,23,99,185,45,82,26,130,26,179,
+  67,158,138,189,81,176,213,163,83,234,216,191,195,215,196,143,
+  155,55,228,27,203,218,58,153,11,49,173,219,43,112,143,129,
+  246,120,238,251,25,139,185,141,50,62,54,43,138,238,151,153,
+  145,85,200,102,84,250,112,243,15,145,236,4,53,163,52,92,
+  163,90,29,225,26,213,154,111,214,168,82,179,66,85,132,235,
+  19,150,134,235,19,86,132,43,18,234,195,43,161,41,92,153,
+  232,1,115,69,208,88,115,5,80,190,185,54,232,217,112,61,
+  163,5,230,250,160,183,194,59,224,149,233,20,184,174,222,210,
+  15,85,101,232,135,58,181,118,145,137,102,36,87,241,109,185,
+  67,151,196,186,164,46,29,159,154,35,82,89,66,23,34,90,
+  35,133,249,144,106,196,76,146,45,66,7,7,150,226,94,243,
+  228,118,231,149,179,71,170,239,114,150,179,239,236,160,135,199,
+  247,118,197,58,175,241,10,246,200,10,195,169,43,163,70,1,
+  87,76,103,223,7,139,163,195,175,102,177,199,148,239,95,20,
+  240,140,241,142,41,118,70,222,194,110,111,94,14,101,240,223,
+  84,109,242,205,211,2,176,135,223,185,136,150,237,172,67,229,
+  155,165,166,38,119,162,207,232,86,169,113,107,77,135,54,246,
+  54,237,198,46,201,239,180,124,80,140,150,235,146,103,15,115,
+  229,191,157,131,126,211,187,229,104,86,172,129,150,131,195,201,
+  135,246,167,195,17,91,234,186,172,228,235,200,154,154,124,201,
+  204,189,17,36,45,239,223,113,34,102,30,152,255,104,169,246,
+  156,115,85,154,254,201,204,152,71,198,132,224,214,185,74,241,
+  189,24,204,111,127,95,12,54,134,48,158,193,41,153,176,154,
+  111,74,116,99,85,99,85,74,41,210,242,171,183,4,138,84,
+  30,89,135,121,144,86,214,190,66,215,43,199,29,39,145,87,
+  142,62,150,190,154,181,95,148,222,63,54,62,101,168,171,18,
+  113,35,188,133,243,150,191,87,187,171,233,196,197,107,161,91,
+  237,183,66,215,46,158,104,218,85,251,222,242,121,133,222,17,
+  113,74,129,146,46,66,162,81,108,20,149,226,105,225,20,241,
+  212,74,39,104,23,109,162,213,244,50,61,75,147,200,69,153,
+  148,72,81,104,99,190,252,11,71,176,7,127,66,45,62,198,
+  58,188,137,55,240,83,44,196,60,204,82,242,149,84,241,181,
+  216,43,222,23,47,139,167,196,131,98,0,181,208,63,105,39,
+  125,68,43,233,37,42,162,137,244,8,101,80,2,217,112,11,
+  87,112,18,135,177,27,127,196,239,240,17,222,197,26,188,142,
+  37,88,128,23,56,206,56,37,65,52,139,93,226,29,49,79,
+  60,41,178,69,12,93,167,175,232,207,180,145,94,167,121,52,
+  149,126,64,57,52,132,226,201,138,155,248,55,78,224,16,190,
+  192,118,108,193,7,120,7,191,192,114,188,138,151,241,60,202,
+  148,199,149,1,226,130,8,136,95,138,185,98,130,24,46,116,
+  186,74,71,104,59,173,167,101,84,78,62,26,71,78,74,167,
+  56,210,208,130,139,56,134,3,168,199,231,240,99,35,222,198,
+  106,188,134,197,102,156,231,20,151,242,45,113,70,124,46,86,
+  139,231,196,56,49,84,216,232,10,29,162,207,104,29,85,211,
+  108,122,134,188,244,16,221,71,177,100,193,127,112,30,255,64,
+  35,234,240,25,62,193,111,240,107,252,28,203,240,10,42,80,
+  206,175,174,83,233,39,78,136,173,226,13,49,67,120,196,253,
+  66,163,139,244,37,125,74,111,211,18,42,163,31,147,135,190,
+  67,105,20,67,42,190,70,16,127,199,126,252,5,219,176,25,
+  27,240,43,172,194,82,44,194,75,152,139,153,202,40,197,34,
+  190,18,91,196,50,81,44,198,138,193,66,165,115,180,143,106,
+  104,45,189,66,51,233,41,122,140,178,41,149,28,36,112,13,
+  103,241,55,252,21,59,240,123,108,194,122,172,197,74,252,12,
+  85,152,143,57,28,39,83,129,56,44,54,137,37,98,138,120,
+  84,36,11,162,211,180,155,62,161,55,169,146,102,208,15,41,
+  151,70,80,10,233,4,92,197,105,28,197,62,4,240,41,126,
+  139,247,240,22,86,160,26,149,120,145,255,101,40,81,150,221,
+  29,6,41,139,59,25,180,94,84,124,35,131,46,51,131,154,
+  208,240,191,12,82,22,244,146,65,199,123,102,144,242,194,221,
+  97,144,50,171,7,6,93,238,37,131,94,66,185,50,227,238,
+  48,72,153,118,119,24,164,60,211,107,6,237,237,145,65,61,
+  253,168,71,109,207,63,209,11,91,181,23,182,90,47,108,255,
+  143,63,203,237,34,253,23,85,236,224,56,212,16,0,0,
+};
+/* psgtrackerv2 data */
+static const unsigned char dat_psgtrackerv2 = {
+  31,139,8,0,0,0,0,0,0,3,157,88,123,112,84,213,
+  25,63,123,239,221,247,35,155,231,196,109,76,215,200,48,219,
+  53,68,76,177,147,185,147,65,67,128,221,16,178,166,155,16,
+  2,218,184,164,9,193,24,34,68,158,41,141,148,1,26,73,
+  138,52,198,104,91,71,29,64,139,182,101,152,232,104,38,166,
+  25,170,192,216,200,100,132,34,162,131,47,124,161,82,76,52,
+  196,112,133,108,127,231,177,155,155,24,31,211,251,199,249,206,
+  247,157,223,57,231,247,251,190,115,239,222,187,17,66,44,161,
+  245,161,245,145,250,18,141,148,103,247,133,214,134,214,102,7,
+  35,132,204,71,116,45,108,121,89,104,126,176,240,182,146,146,
+  194,166,21,27,107,86,212,212,108,38,229,69,229,139,11,87,
+  221,213,88,123,111,173,55,88,219,116,79,237,189,36,92,84,
+  90,90,146,83,152,67,10,111,11,85,204,155,95,72,174,191,
+  126,246,77,193,79,162,227,37,90,218,202,21,132,100,21,104,
+  196,227,221,189,248,221,251,162,161,245,52,238,109,38,182,208,
+  30,238,167,101,70,60,17,15,33,105,153,100,218,203,219,72,
+  148,172,70,98,153,209,72,28,51,43,78,12,254,103,240,245,
+  193,55,6,115,242,233,88,70,114,216,20,220,25,60,246,209,
+  78,207,13,196,16,54,6,119,4,143,126,180,35,253,6,34,
+  149,41,119,180,97,103,133,239,151,120,133,152,91,9,218,177,
+  86,169,88,75,205,245,255,30,173,207,223,135,37,186,208,203,
+  103,61,130,94,146,167,143,24,97,115,252,59,209,102,251,119,
+  160,245,123,182,23,107,41,231,253,173,104,63,246,223,143,246,
+  67,255,46,180,231,252,109,84,1,50,151,19,90,95,90,22,
+  152,85,30,46,40,44,94,16,246,54,213,174,105,88,177,217,
+  219,116,207,58,239,134,220,156,217,222,234,205,222,138,156,210,
+  218,134,6,36,173,145,80,62,243,204,25,106,202,73,143,154,
+  178,55,108,236,53,85,19,183,31,235,117,133,83,221,106,202,
+  83,73,80,150,146,79,12,105,249,196,18,44,76,83,83,30,
+  14,22,2,249,71,32,254,224,72,37,164,142,72,23,14,229,
+  83,155,176,29,214,80,71,228,69,176,146,176,178,176,138,176,
+  70,106,245,250,17,51,33,214,13,107,174,35,166,147,176,150,
+  58,98,126,12,214,90,71,44,3,176,182,58,98,109,129,181,
+  3,167,193,58,234,136,114,10,214,89,71,236,4,214,5,59,
+  3,54,161,142,56,71,34,68,106,247,168,201,95,186,213,228,
+  207,179,155,147,223,10,22,36,169,201,31,7,11,138,181,228,
+  247,60,189,201,111,195,30,243,247,38,31,131,46,9,186,100,
+  232,178,34,246,146,208,50,155,107,145,14,114,45,166,121,92,
+  139,217,197,181,88,84,174,197,114,145,107,177,62,194,249,219,
+  50,57,127,219,26,206,223,214,201,249,59,107,56,127,251,49,
+  206,95,201,16,252,7,57,95,169,55,66,12,103,131,129,76,
+  53,185,42,136,83,144,92,250,248,146,96,0,39,253,8,139,
+  45,98,177,252,119,121,236,80,63,227,70,154,251,25,39,162,
+  98,108,6,52,93,15,123,45,172,39,24,152,171,38,187,224,
+  185,232,12,228,87,70,150,181,100,210,42,161,47,209,126,210,
+  165,86,41,180,190,88,75,186,224,233,77,250,28,246,35,216,
+  115,116,94,210,25,120,167,197,60,35,195,190,194,230,41,172,
+  255,79,58,15,30,97,222,33,54,98,96,253,39,197,138,15,
+  34,131,200,88,116,14,44,216,69,111,245,168,73,171,17,191,
+  27,59,172,116,171,73,85,232,87,161,127,7,236,124,127,111,
+  82,16,21,80,80,1,35,42,96,67,172,128,87,128,244,243,
+  10,24,178,121,5,148,195,188,2,198,118,94,1,83,15,175,
+  128,185,129,87,192,146,198,43,96,121,148,87,128,85,6,21,
+  176,38,241,10,216,207,241,10,216,230,243,10,24,122,120,5,
+  228,197,200,104,117,177,150,120,150,243,38,13,156,55,217,132,
+  88,143,167,55,177,155,158,153,196,191,123,126,135,182,211,47,
+  158,22,80,109,97,39,23,57,197,252,44,244,172,58,63,9,
+  61,155,206,151,194,230,126,166,226,106,35,175,217,248,153,8,
+  137,182,211,218,38,222,67,107,155,88,205,235,45,98,183,179,
+  88,136,215,59,186,169,64,75,120,33,66,28,179,11,52,247,
+  79,97,125,176,253,176,94,196,223,134,77,135,191,8,214,141,
+  57,10,205,222,74,18,221,131,39,134,193,167,186,207,5,52,
+  87,176,72,115,61,9,172,233,141,35,111,30,57,113,164,88,
+  115,143,97,20,207,21,247,48,181,43,200,213,67,96,234,136,
+  241,69,235,100,125,7,250,47,183,18,71,30,113,183,210,138,
+  88,16,115,179,113,59,198,95,163,202,162,62,172,178,71,236,
+  153,33,246,108,12,104,206,83,216,243,166,2,205,213,17,223,
+  115,187,231,65,180,247,121,58,177,223,173,211,238,231,250,225,
+  253,198,123,176,190,11,235,175,43,210,156,39,232,218,88,211,
+  29,78,21,181,203,17,181,155,7,139,51,66,194,176,56,35,
+  164,6,22,103,132,212,195,226,140,144,45,88,169,145,238,149,
+  120,148,62,121,19,206,83,110,9,31,80,110,87,246,99,44,
+  28,27,123,3,12,137,227,77,214,66,237,105,26,103,177,116,
+  22,75,47,51,82,20,70,250,232,200,146,152,119,48,142,19,
+  115,227,35,157,83,87,224,35,216,125,17,178,39,3,209,228,
+  83,19,178,3,154,163,163,72,115,124,193,21,38,228,124,75,
+  225,92,161,48,36,20,150,11,133,203,133,194,72,132,92,109,
+  215,239,19,83,132,29,220,211,171,27,31,163,241,152,162,241,
+  207,244,138,198,207,78,242,6,169,183,84,48,119,209,179,102,
+  228,181,113,53,5,52,251,25,48,191,153,51,119,173,139,51,
+  95,41,152,55,11,230,187,4,243,61,130,121,151,96,222,9,
+  139,251,151,116,192,90,196,56,238,95,178,27,22,247,47,121,
+  4,214,46,240,14,129,119,82,124,132,92,249,243,68,77,93,
+  41,180,166,174,4,90,83,237,53,140,181,232,213,234,178,113,
+  90,175,58,250,202,36,175,183,12,186,162,23,89,123,126,9,
+  109,207,177,246,236,82,227,148,147,49,176,148,198,143,44,163,
+  109,63,107,123,138,53,231,6,100,198,113,59,245,158,241,169,
+  206,138,128,102,235,43,210,236,215,240,220,56,43,227,185,153,
+  43,114,83,41,114,179,74,228,166,65,228,166,73,228,102,141,
+  200,77,163,200,77,67,132,124,243,84,76,75,121,91,121,251,
+  18,188,37,56,61,84,185,51,149,42,191,124,26,136,237,83,
+  79,163,94,185,232,15,76,210,221,199,117,51,173,231,153,178,
+  161,98,205,113,0,106,204,20,55,47,143,161,186,124,170,99,
+  91,64,179,158,47,210,108,11,184,38,199,246,184,166,133,66,
+  211,114,161,169,90,104,106,18,154,182,9,77,29,66,211,94,
+  161,169,91,212,251,165,8,209,6,38,234,233,152,79,85,57,
+  110,97,170,8,198,14,150,181,149,181,235,20,188,243,48,213,
+  38,253,137,181,186,248,49,22,151,89,92,214,197,15,178,184,
+  194,226,138,46,222,197,226,70,22,55,234,226,45,44,110,98,
+  113,147,46,190,146,197,205,44,110,214,197,67,172,207,158,112,
+  197,154,189,1,185,179,32,154,231,83,237,161,128,102,121,174,
+  72,179,38,242,156,217,75,227,57,203,20,57,203,21,57,83,
+  99,119,119,132,92,238,159,200,133,61,143,230,194,254,115,154,
+  139,175,241,166,115,121,111,69,91,197,164,92,84,181,85,49,
+  191,151,191,41,204,45,19,247,170,237,67,250,196,167,21,158,
+  122,55,8,100,74,28,217,43,144,29,177,95,177,104,171,79,
+  181,117,4,52,243,88,145,102,89,194,185,219,58,127,20,119,
+  105,130,187,109,11,229,110,219,200,184,231,69,200,216,199,149,
+  109,149,223,195,61,186,45,206,200,247,253,220,163,149,49,164,
+  117,156,35,199,79,251,84,235,123,96,188,176,72,51,239,227,
+  140,173,231,226,140,171,167,156,208,121,130,177,42,78,168,75,
+  156,80,19,88,222,58,161,192,250,4,255,245,180,118,83,37,
+  214,127,80,37,163,141,192,100,124,87,21,132,63,8,54,225,
+  128,102,234,1,155,84,193,166,60,198,38,122,74,188,47,29,
+  23,108,50,5,155,52,206,38,186,149,179,137,110,138,144,175,
+  187,167,228,108,157,79,181,140,97,229,170,34,205,244,34,93,
+  89,199,214,193,88,154,41,203,75,175,96,238,6,96,143,3,
+  155,11,236,3,156,133,101,48,158,147,103,166,228,36,246,11,
+  218,33,114,50,83,228,228,41,113,215,14,136,187,182,75,220,
+  181,11,177,67,202,196,238,150,221,116,119,203,253,108,119,188,
+  163,140,142,197,198,60,201,203,140,119,33,71,24,173,247,224,
+  123,198,82,203,48,51,129,57,5,47,159,230,88,183,206,66,
+  182,78,1,195,64,241,232,161,137,117,150,208,117,240,189,100,
+  201,98,235,92,75,49,35,239,0,211,62,129,145,22,144,104,
+  185,177,119,11,137,86,147,104,125,177,102,30,165,88,243,48,
+  195,118,3,27,153,140,173,92,32,176,115,129,26,96,216,163,
+  12,187,19,216,57,62,213,188,43,160,41,67,69,154,177,132,
+  103,208,220,254,173,103,121,72,100,176,94,100,112,167,200,224,
+  94,145,193,99,34,131,159,241,12,26,92,17,114,233,173,239,
+  248,101,238,153,172,118,252,0,118,156,195,88,221,72,89,125,
+  53,132,185,143,77,96,150,82,12,190,14,205,110,134,177,51,
+  204,113,96,154,39,48,101,20,19,41,214,76,23,40,198,244,
+  9,195,28,0,166,98,114,38,194,34,107,227,115,128,58,204,
+  176,47,50,44,222,161,46,249,167,100,88,100,109,220,2,84,
+  39,195,62,192,176,165,17,50,50,62,125,134,175,158,5,106,
+  21,195,254,154,97,103,0,123,18,158,74,223,38,167,95,255,
+  42,244,155,152,126,19,211,255,37,244,143,60,230,83,141,35,
+  1,77,94,94,164,201,47,240,170,24,71,227,85,89,36,170,
+  82,37,170,82,35,170,82,47,170,178,70,84,101,131,168,202,
+  22,113,174,183,137,115,221,90,205,222,48,70,242,38,206,164,
+  145,221,255,70,118,255,127,137,251,127,36,99,210,111,232,123,
+  147,222,8,79,78,188,49,209,247,4,234,45,139,121,207,83,
+  239,246,152,119,128,122,191,138,121,236,141,230,206,152,199,78,
+  244,47,99,94,139,254,23,198,104,67,190,172,136,174,138,144,
+  175,58,10,52,5,167,92,25,5,251,89,213,228,171,109,30,
+  85,249,140,254,11,113,226,232,242,84,204,48,97,222,25,246,
+  102,77,226,61,67,188,103,142,247,240,141,67,191,245,149,191,
+  117,165,63,143,103,236,106,254,188,149,130,133,216,35,135,239,
+  204,250,89,216,235,47,252,169,168,116,10,91,37,108,165,227,
+  33,156,226,150,106,98,216,230,85,149,85,89,170,178,240,228,
+  86,111,179,146,115,226,95,110,55,255,198,35,89,193,173,193,
+  195,192,206,241,111,117,251,136,65,34,36,1,94,174,103,43,
+  107,177,14,141,158,199,169,82,174,243,96,174,60,170,155,155,
+  31,155,193,255,9,32,251,249,63,1,164,23,104,155,202,56,
+  200,159,210,149,208,210,149,220,124,47,249,56,223,139,174,42,
+  31,103,171,238,215,173,26,156,178,234,46,177,234,19,64,63,
+  47,86,237,100,171,10,189,50,189,191,241,37,79,30,141,239,
+  208,168,219,225,110,134,93,92,254,80,132,92,236,70,111,53,
+  61,221,37,154,220,196,209,111,83,124,141,167,11,245,107,64,
+  239,54,140,74,24,45,215,141,46,100,163,33,244,114,197,220,
+  95,232,70,127,198,70,59,208,75,17,115,211,117,163,118,54,
+  186,174,88,147,6,43,31,66,123,132,255,179,148,173,74,253,
+  126,85,58,211,183,3,167,59,205,171,74,135,188,205,210,222,
+  19,152,33,29,246,239,193,115,199,143,222,163,254,94,250,239,
+  68,116,128,92,76,47,217,253,214,141,15,124,189,234,253,21,
+  159,110,116,252,53,240,223,71,2,87,158,91,115,211,72,223,
+  206,178,25,163,199,247,183,44,207,75,215,206,190,252,76,199,
+  111,86,134,111,153,149,225,184,250,197,251,175,255,187,255,217,
+  167,31,239,218,189,243,190,141,107,235,107,238,92,86,94,90,
+  28,40,188,37,63,239,230,220,27,103,249,125,51,103,100,121,
+  51,51,126,114,77,122,90,106,74,114,82,162,155,184,92,78,
+  135,221,110,179,90,45,22,179,217,108,50,25,141,70,5,151,
+  76,47,137,95,6,221,53,253,31,115,63,116,13,125,112,230,
+  213,195,207,61,253,4,88,181,108,154,150,213,117,147,88,37,
+  184,28,118,155,205,198,56,153,226,156,126,220,229,248,70,25,
+  54,56,246,73,99,196,241,91,52,246,50,121,216,96,127,85,
+  26,51,216,71,165,49,9,46,154,103,149,49,217,254,162,60,
+  156,64,71,105,99,191,76,91,50,150,128,161,97,201,62,34,
+  99,226,55,10,26,217,136,216,102,218,16,242,29,13,155,241,
+  42,221,138,237,7,215,144,112,193,56,44,89,103,43,195,50,
+  117,21,231,228,25,63,184,196,62,105,136,192,29,162,148,209,
+  148,201,67,210,212,25,171,9,32,77,4,163,27,9,4,109,
+  33,16,244,189,52,141,251,200,48,81,210,228,97,34,183,145,
+  97,3,145,201,176,68,54,147,97,153,208,81,50,205,140,255,
+  175,212,211,93,250,3,100,144,116,151,172,187,244,53,52,234,
+  46,147,238,50,235,46,139,238,162,155,236,161,77,196,243,63,
+  57,126,159,94,200,22,0,0,
+};
+/* puma data */
+static const unsigned char dat_puma = {
+  31,139,8,0,0,0,0,0,0,3,237,87,127,108,19,247,
+  21,255,220,249,236,28,135,99,95,141,19,156,128,131,21,66,
+  48,86,98,140,9,33,139,204,118,118,8,53,208,68,134,148,
+  202,211,90,100,42,102,83,130,152,203,146,141,33,138,109,214,
+  174,17,235,182,140,209,150,161,150,157,180,170,138,170,9,89,
+  136,73,252,81,161,163,106,25,107,7,187,134,46,66,48,9,
+  175,127,172,17,235,80,84,161,41,58,165,100,239,235,132,31,
+  51,211,142,181,155,186,73,125,214,123,239,251,222,231,189,247,
+  125,239,238,123,167,115,10,144,83,176,13,164,128,32,136,108,
+  216,6,132,87,78,229,166,113,109,226,216,172,126,105,229,148,
+  230,155,177,15,130,217,189,131,219,192,97,229,20,152,247,149,
+  222,193,245,198,244,219,254,161,186,253,148,46,248,227,221,134,
+  45,20,37,222,195,13,240,214,17,52,62,20,133,139,244,86,
+  210,189,164,143,145,62,68,122,140,244,185,166,23,66,45,176,
+  111,86,86,41,92,91,226,58,23,174,217,15,142,11,145,244,
+  113,43,178,115,162,31,35,210,101,72,163,61,31,195,253,176,
+  49,199,8,95,14,108,189,106,88,71,155,47,108,58,63,125,
+  51,187,108,163,49,55,220,124,97,227,95,225,35,123,146,42,
+  57,40,35,17,102,21,163,111,77,193,241,245,168,126,182,203,
+  16,15,54,69,178,219,6,6,146,241,83,71,211,83,141,231,
+  89,108,151,81,181,189,41,242,212,238,111,15,52,50,153,166,
+  92,185,79,217,18,127,52,126,106,56,109,36,227,141,231,217,
+  250,228,236,154,50,198,123,12,91,175,119,63,20,212,196,118,
+  163,163,119,176,219,176,110,8,5,184,72,90,236,140,228,145,
+  2,55,102,15,176,174,211,192,159,55,7,184,48,97,109,69,
+  210,105,97,19,205,69,188,34,11,185,211,22,215,149,48,62,
+  138,15,71,3,251,172,18,117,158,184,162,173,55,170,74,61,
+  134,149,221,1,14,238,61,112,121,71,163,163,209,214,1,25,
+  52,193,9,56,188,79,192,67,92,71,187,115,112,81,164,235,
+  129,35,155,30,56,178,253,193,34,93,53,25,91,151,241,233,
+  21,87,161,203,176,14,245,5,184,80,122,15,77,187,162,102,
+  223,167,231,184,80,143,33,116,246,5,225,74,203,73,202,228,
+  131,184,70,21,57,58,43,199,9,121,252,62,132,39,228,89,
+  66,14,220,135,8,132,236,36,68,189,15,17,9,73,176,43,
+  222,99,88,46,54,4,209,40,86,129,207,72,155,173,228,215,
+  188,15,163,145,252,159,220,245,63,202,252,35,51,126,161,246,
+  174,63,201,252,195,204,31,9,112,237,105,15,161,109,119,209,
+  4,67,247,48,148,238,98,103,166,151,100,123,102,43,197,60,
+  18,14,112,29,153,182,216,78,174,131,221,71,93,161,95,52,
+  174,69,141,234,235,239,107,33,143,87,65,103,107,18,245,173,
+  9,52,180,238,175,98,15,84,35,61,37,34,123,102,110,87,
+  79,219,40,187,61,37,119,25,66,156,118,177,179,93,208,13,
+  177,231,186,245,201,84,109,198,222,119,188,241,49,95,93,203,
+  111,127,250,82,74,244,5,33,190,255,134,117,171,252,21,170,
+  96,219,140,98,89,167,39,179,78,173,91,82,224,220,176,147,
+  139,100,92,43,181,242,51,250,14,147,177,192,244,173,222,193,
+  13,36,211,174,196,245,233,91,247,98,189,131,188,2,145,239,
+  206,139,255,232,141,41,190,221,112,200,158,76,203,202,179,204,
+  163,7,233,110,211,36,178,76,43,207,71,226,70,67,8,93,
+  209,90,159,160,185,182,220,157,203,187,3,60,92,217,146,230,
+  73,219,239,125,46,138,17,164,210,46,58,235,242,90,101,141,
+  130,142,25,172,236,87,210,46,89,166,30,166,239,245,123,19,
+  183,51,99,235,22,6,209,68,189,212,235,231,92,158,147,17,
+  168,153,199,72,106,153,90,146,197,140,157,162,236,226,243,224,
+  233,93,245,250,66,57,53,22,139,186,60,27,111,160,173,94,
+  175,191,92,175,143,70,233,157,51,210,22,146,177,38,6,241,
+  212,126,36,250,5,241,55,176,48,191,85,107,205,210,121,22,
+  146,54,242,32,245,10,85,65,166,205,229,113,123,104,247,230,
+  205,65,52,123,163,168,222,116,3,75,203,167,60,112,132,219,
+  110,91,203,39,110,32,224,141,193,159,106,159,205,195,244,118,
+  58,143,205,153,9,143,31,188,43,136,165,163,65,248,15,11,
+  253,114,44,86,27,68,224,3,203,97,97,167,241,135,32,170,
+  71,5,170,183,212,187,14,77,52,209,18,154,168,225,206,68,
+  95,37,169,103,236,108,34,122,83,188,70,115,148,168,27,46,
+  45,83,229,101,228,57,76,59,113,73,91,234,93,154,78,46,
+  95,227,101,180,75,231,154,167,169,127,41,181,135,197,102,146,
+  49,101,182,247,101,50,97,161,21,64,188,16,63,56,170,124,
+  160,172,137,66,34,110,161,107,21,60,18,165,26,84,53,254,
+  214,159,14,62,119,246,41,137,233,214,24,66,169,150,18,217,
+  241,88,44,86,182,26,102,119,196,116,146,245,144,153,104,12,
+  34,116,233,4,90,214,236,70,11,36,154,98,73,56,136,142,
+  75,187,33,69,199,2,201,230,36,237,217,150,105,160,202,171,
+  190,101,59,25,68,123,191,109,45,232,188,180,141,130,166,94,
+  21,47,252,101,253,216,217,192,123,1,157,122,181,100,132,208,
+  155,84,125,40,34,255,49,136,26,193,6,101,39,31,91,215,
+  249,131,222,65,122,46,156,51,231,15,51,116,109,66,197,103,
+  165,107,19,197,207,145,171,125,142,92,253,51,231,254,167,136,
+  3,234,181,58,101,190,94,155,175,9,185,225,42,61,164,203,
+  186,179,228,132,195,95,157,178,171,115,199,231,42,210,81,9,
+  115,178,226,184,184,163,106,162,42,95,229,182,21,109,9,235,
+  77,171,106,125,196,10,225,180,48,32,180,89,38,45,154,229,
+  144,37,105,241,243,6,175,243,175,243,121,254,113,190,147,175,
+  231,166,184,18,247,14,247,43,238,8,247,12,183,131,235,227,
+  20,46,200,121,185,106,220,194,4,62,196,24,222,197,25,156,
+  194,27,80,241,50,126,130,231,145,195,94,60,253,69,95,146,
+  47,233,75,250,191,35,249,191,240,187,67,125,175,130,255,69,
+  248,195,247,208,167,105,250,229,210,248,196,36,38,39,198,75,
+  151,245,243,95,91,189,124,233,162,249,206,170,233,42,231,252,
+  69,75,151,175,174,196,53,51,252,180,25,94,52,195,71,204,
+  112,213,12,63,106,134,15,155,225,67,102,120,222,12,31,50,
+  195,135,205,240,163,102,184,106,134,143,152,225,197,213,133,10,
+  202,85,80,37,94,25,112,31,94,48,195,11,102,120,193,12,
+  47,152,225,5,51,188,96,134,23,204,240,130,25,94,48,195,
+  11,102,120,193,12,103,1,249,127,73,102,120,254,14,126,123,
+  222,10,51,87,97,230,42,204,92,133,153,171,48,115,21,230,
+  63,177,203,231,240,180,118,126,246,156,138,178,199,231,15,117,
+  40,241,68,50,181,35,75,184,90,212,244,210,4,100,95,72,
+  73,164,178,221,221,223,123,102,223,119,179,233,109,201,190,158,
+  22,159,199,37,92,189,116,225,220,155,191,62,49,242,203,87,
+  127,254,179,31,255,240,208,109,252,27,27,187,86,151,241,201,
+  241,171,191,63,119,166,56,242,218,241,99,47,30,249,209,247,
+  1,37,149,75,41,62,148,52,53,175,106,165,74,251,223,237,
+  135,94,166,124,127,150,120,31,246,221,89,29,32,153,39,62,
+  132,239,144,60,66,124,28,244,237,222,63,66,124,6,33,146,
+  191,35,30,195,33,146,37,226,79,232,43,137,239,159,2,191,
+  75,98,171,93,30,226,70,108,37,73,255,44,118,181,35,73,
+  114,45,241,147,101,116,128,248,0,226,36,159,37,62,134,23,
+  72,190,77,60,170,213,67,80,253,144,75,80,115,76,106,139,
+  0,117,49,196,18,244,73,112,234,223,114,18,249,234,57,167,
+  218,0,90,169,219,47,242,234,197,189,34,243,193,169,250,173,
+  22,117,49,111,85,221,16,85,9,54,194,11,97,65,69,206,
+  66,181,44,69,65,91,78,126,69,113,151,4,138,112,171,216,
+  235,46,66,91,72,121,139,221,130,218,32,9,148,195,246,25,
+  7,71,159,192,92,105,6,243,187,69,22,77,126,17,22,242,
+  91,116,233,94,108,198,207,108,214,83,216,162,214,177,26,234,
+  16,4,170,195,179,58,180,47,195,252,17,11,245,44,168,97,
+  176,221,249,242,90,98,153,186,157,172,92,193,166,223,164,120,
+  15,197,139,247,213,46,207,70,61,186,253,54,234,211,77,121,
+  254,50,198,81,158,68,154,167,158,120,86,71,119,16,187,202,
+  117,120,221,71,220,92,238,245,118,254,204,124,212,147,206,51,
+  63,184,60,106,93,118,43,184,4,230,217,107,73,203,168,115,
+  212,240,236,251,187,78,170,230,129,97,44,240,200,164,159,131,
+  84,227,36,111,30,174,69,18,233,65,56,22,212,146,206,98,
+  161,215,65,250,155,144,27,92,28,251,63,233,149,22,144,222,
+  130,185,158,6,210,84,215,193,226,187,225,148,230,146,86,224,
+  117,120,72,175,130,84,206,15,145,102,121,75,48,79,178,147,
+  246,209,190,94,210,53,152,215,80,195,125,65,95,45,255,51,
+  244,119,154,169,115,175,202,20,0,0,
+};
+/* quartet data */
+static const unsigned char dat_quartet = {
+  31,139,8,0,0,0,0,0,0,3,237,91,127,108,84,85,
+  22,254,206,116,230,205,235,155,215,153,217,130,88,187,21,199,
+  82,235,8,211,90,126,72,10,29,176,20,58,12,165,78,74,
+  113,9,49,196,180,198,180,44,11,77,87,168,65,210,224,128,
+  44,54,27,195,18,151,24,98,136,33,198,184,134,8,97,89,
+  66,128,37,164,26,4,214,24,131,44,235,34,32,160,97,129,
+  117,141,49,132,16,232,206,50,123,238,157,51,51,109,145,160,
+  255,24,35,239,78,222,253,190,115,238,185,231,158,123,238,235,
+  155,59,233,125,109,64,107,27,80,217,180,151,70,118,150,69,
+  86,225,208,253,189,168,195,234,88,234,33,68,86,210,200,248,
+  42,152,143,71,31,66,226,211,68,79,104,42,222,238,12,69,
+  234,159,248,6,101,77,59,96,119,142,76,236,128,201,125,54,
+  42,77,3,107,248,10,38,122,98,169,49,152,62,21,43,58,
+  74,226,151,210,55,103,12,96,105,121,252,147,79,198,196,225,
+  110,7,22,55,159,123,49,205,125,22,13,238,211,124,12,231,
+  247,31,152,247,171,25,173,29,83,231,39,147,71,226,245,255,
+  138,87,215,192,62,211,119,182,175,106,54,236,170,24,251,221,
+  1,247,234,192,199,181,3,247,255,226,200,192,253,230,94,120,
+  6,10,117,125,207,131,41,175,55,157,238,67,162,7,92,220,
+  235,84,109,183,180,149,118,186,18,61,42,130,230,203,8,192,
+  21,198,201,53,39,95,154,121,25,101,141,223,198,203,194,115,
+  62,235,255,236,189,202,57,97,223,216,210,206,81,109,198,236,
+  255,224,127,109,214,63,63,216,31,5,117,94,249,236,143,165,
+  165,29,87,154,214,118,26,13,101,243,215,118,12,168,152,19,
+  61,202,103,71,40,126,41,5,246,56,22,174,238,178,99,125,
+  21,56,177,38,236,58,249,82,252,223,120,28,102,243,57,60,
+  158,137,194,41,78,113,202,221,89,218,74,129,105,39,110,211,
+  134,186,55,249,58,192,215,197,172,78,61,163,26,166,48,121,
+  166,29,164,174,107,13,127,122,60,138,80,98,198,162,63,140,
+  233,7,198,159,108,71,65,196,158,2,109,211,129,244,181,118,
+  184,79,61,58,69,181,100,237,218,225,114,101,158,82,0,63,
+  21,141,129,194,248,165,2,119,89,109,202,109,26,240,118,0,
+  163,70,92,79,185,84,255,230,115,161,126,243,186,178,72,44,
+  231,118,195,21,67,250,64,47,190,237,66,250,226,220,27,0,
+  97,52,123,166,100,252,229,95,174,239,70,235,108,215,108,188,
+  56,226,136,210,180,33,125,40,126,137,220,186,125,205,65,109,
+  213,9,84,196,95,206,244,43,123,140,237,189,57,251,53,202,
+  51,143,150,76,244,168,58,26,77,167,127,10,207,198,57,28,
+  235,132,171,252,77,84,174,217,117,102,37,154,165,152,249,21,
+  155,8,102,238,68,207,148,94,180,162,158,107,66,119,104,41,
+  182,118,243,234,33,104,183,160,133,243,233,110,173,231,149,90,
+  207,82,140,87,228,235,166,122,206,132,245,8,91,129,231,251,
+  72,47,207,255,58,182,10,178,6,173,15,7,115,33,196,190,
+  43,174,153,60,178,107,103,232,5,30,127,19,143,191,81,203,
+  187,180,188,153,229,164,150,119,107,121,11,203,221,90,222,163,
+  229,173,44,183,37,122,186,81,51,69,249,224,72,236,242,172,
+  159,45,90,183,43,167,83,190,250,180,110,119,78,167,252,173,
+  208,186,61,57,157,248,204,70,215,48,175,27,145,184,154,45,
+  91,196,24,151,102,114,192,172,153,89,100,126,253,18,222,69,
+  196,47,37,251,203,19,161,40,119,176,185,127,67,244,0,150,
+  54,159,43,160,79,82,74,99,204,131,173,178,134,22,190,147,
+  246,240,126,98,14,231,211,96,185,94,178,120,237,201,190,138,
+  57,127,239,159,244,217,95,142,178,52,48,200,98,116,214,66,
+  123,114,85,196,255,209,255,88,40,107,37,81,153,153,81,18,
+  61,51,244,10,135,82,105,22,111,173,27,54,103,62,99,82,
+  164,103,54,177,34,199,214,229,88,56,199,250,114,44,146,99,
+  175,228,88,77,142,109,28,195,163,79,190,192,236,45,197,106,
+  87,50,123,71,177,169,54,179,119,21,171,219,202,108,231,136,
+  20,244,110,37,24,69,127,255,20,197,184,212,142,232,103,230,
+  226,54,40,77,195,20,145,104,136,228,26,34,21,12,145,220,
+  67,36,79,94,138,165,30,198,24,245,247,57,18,240,140,84,
+  113,84,159,84,146,214,149,176,46,168,116,120,86,73,74,231,
+  97,29,77,50,247,41,255,3,247,182,35,210,205,87,106,132,
+  106,9,113,186,31,80,81,49,222,23,138,170,108,150,235,186,
+  66,215,149,186,206,100,127,166,174,27,117,61,91,215,43,177,
+  10,97,190,179,60,101,13,251,248,201,117,66,237,48,7,63,
+  15,138,78,169,152,35,24,148,31,111,82,231,39,147,27,53,
+  15,110,243,107,77,10,134,210,233,57,76,82,49,143,249,72,
+  121,214,241,7,115,51,25,169,230,217,142,113,215,204,27,153,
+  217,168,157,169,26,51,94,31,159,17,111,136,207,92,137,210,
+  26,254,243,31,31,196,169,89,37,19,66,170,158,88,195,117,
+  182,253,84,99,109,93,75,184,116,82,61,199,126,108,127,85,
+  252,116,227,241,253,85,177,211,141,39,246,87,205,58,221,248,
+  233,254,170,134,211,141,77,141,29,8,183,37,150,255,208,231,
+  144,83,156,242,51,43,46,184,97,192,132,5,27,126,4,81,
+  140,145,24,133,18,148,162,12,163,17,66,57,42,80,137,48,
+  255,118,138,160,26,53,152,128,73,152,140,90,76,69,20,211,
+  81,143,6,204,226,239,198,56,154,208,140,4,90,248,219,247,
+  73,44,192,66,60,133,69,120,154,191,124,159,225,167,84,7,
+  22,99,9,150,162,11,221,120,14,43,240,60,212,131,165,23,
+  171,145,196,90,172,195,122,244,225,247,120,5,27,176,17,175,
+  98,19,94,195,102,188,142,45,120,131,191,153,223,196,91,120,
+  27,239,96,27,222,197,14,236,196,46,236,198,30,236,197,126,
+  28,192,65,244,227,125,28,194,97,28,197,135,248,8,31,227,
+  24,142,227,4,62,197,73,156,194,25,156,197,121,124,137,11,
+  184,136,203,248,10,95,227,27,124,139,43,184,138,107,184,142,
+  1,164,112,147,64,46,114,147,65,38,89,100,147,159,130,84,
+  76,35,105,20,149,80,41,149,209,104,10,81,57,85,80,37,
+  133,105,44,69,168,154,106,104,2,77,162,201,84,75,83,41,
+  74,211,169,158,26,104,22,197,40,78,77,212,76,9,106,161,
+  86,122,146,22,208,66,122,138,22,209,211,212,70,207,208,179,
+  212,65,139,105,9,45,165,46,234,166,231,104,5,61,79,43,
+  105,21,245,210,106,74,210,90,90,71,235,169,143,126,79,175,
+  208,6,218,72,175,210,38,122,141,54,211,235,180,133,222,160,
+  173,244,38,189,69,111,211,59,180,141,222,165,29,180,147,118,
+  209,110,218,67,123,105,63,29,160,131,212,79,239,211,33,58,
+  76,71,233,67,250,136,62,166,99,116,156,78,208,167,116,146,
+  78,209,25,58,75,231,233,75,186,64,23,233,50,125,69,95,
+  211,55,244,45,93,161,171,116,141,174,211,0,165,232,166,243,
+  113,62,119,243,231,251,238,41,46,61,17,174,107,169,41,228,
+  253,10,239,45,34,133,175,64,239,45,42,190,86,123,139,138,
+  175,212,222,162,226,178,218,91,84,92,204,236,45,66,238,196,
+  114,19,133,252,80,229,45,174,131,14,58,232,160,131,14,58,
+  232,160,131,14,58,120,247,161,75,176,64,208,45,232,201,33,
+  105,52,68,206,163,75,163,87,100,111,78,46,208,104,138,62,
+  143,46,193,76,123,161,232,11,197,127,161,180,23,230,218,221,
+  130,158,28,18,163,37,253,44,177,183,196,222,18,123,75,236,
+  7,163,75,163,33,178,33,178,87,100,175,246,235,19,191,62,
+  137,199,39,126,125,226,55,143,158,28,186,52,26,34,27,226,
+  199,43,178,55,39,187,4,11,52,154,210,110,74,187,153,211,
+  187,53,22,234,118,91,226,177,101,158,182,196,99,75,28,182,
+  196,97,75,94,108,137,199,150,120,108,153,167,45,241,216,18,
+  135,45,113,216,18,199,96,116,9,102,218,179,113,228,209,37,
+  152,109,119,11,122,134,160,165,237,139,36,254,34,137,191,72,
+  226,47,146,248,139,36,254,193,232,210,104,136,108,136,236,21,
+  57,147,207,34,137,95,161,91,163,41,237,166,216,155,210,94,
+  40,250,60,186,4,179,237,110,65,207,16,204,198,111,201,120,
+  150,216,91,98,159,71,207,48,52,134,161,119,8,250,196,175,
+  79,252,250,36,30,159,248,247,137,95,159,248,203,163,242,231,
+  151,124,250,229,254,244,75,62,253,146,79,133,164,209,35,114,
+  38,159,126,201,167,95,238,79,191,228,211,47,249,244,75,62,
+  253,146,79,191,228,211,47,247,167,95,242,233,151,251,211,47,
+  249,244,75,62,253,146,79,191,228,211,47,121,204,163,37,246,
+  150,248,179,196,222,18,251,60,122,134,161,49,12,189,223,137,
+  62,241,239,147,120,124,226,223,39,126,125,226,239,86,52,134,
+  161,247,54,104,222,1,11,53,218,18,135,45,243,180,37,14,
+  91,226,200,163,26,63,32,235,25,144,245,12,200,122,6,100,
+  61,3,178,158,1,89,207,128,172,103,64,214,51,32,235,25,
+  144,245,12,200,122,6,100,61,3,178,158,1,89,207,128,252,
+  125,4,100,61,3,178,158,1,89,207,128,172,103,64,214,51,
+  32,235,25,144,117,204,163,37,246,150,140,103,137,189,37,246,
+  121,244,12,67,99,24,122,135,160,79,252,230,209,37,88,32,
+  232,22,244,12,67,227,54,232,189,13,154,119,192,66,141,182,
+  196,97,203,60,109,137,195,150,56,242,232,25,134,198,48,244,
+  222,1,205,59,96,225,15,68,75,99,145,196,95,36,241,23,
+  73,252,14,58,232,160,131,14,58,232,160,131,14,58,232,224,
+  221,130,191,67,65,39,80,222,164,78,230,86,50,43,206,156,
+  178,204,159,97,221,184,79,213,108,231,202,217,141,85,118,51,
+  135,218,133,95,85,118,97,182,163,156,93,181,178,107,28,106,
+  23,217,164,236,34,108,135,156,221,4,101,55,123,168,93,205,
+  107,202,174,38,177,188,85,206,116,62,12,123,10,234,160,207,
+  169,163,56,220,171,78,107,170,243,165,69,167,212,73,77,110,
+  139,14,106,27,128,110,243,172,87,109,234,60,104,252,82,129,
+  49,55,123,62,59,49,55,123,62,123,214,220,236,249,236,169,
+  115,179,231,179,107,114,118,221,57,187,142,156,221,162,156,93,
+  107,243,185,182,254,196,114,123,25,230,163,158,199,173,143,84,
+  161,229,204,118,4,199,197,16,108,218,142,150,223,0,37,7,
+  182,163,109,25,80,81,215,139,22,212,143,91,134,54,245,30,
+  147,210,118,1,254,161,218,249,203,208,205,126,18,145,101,72,
+  26,219,121,54,54,146,209,81,117,49,212,31,96,59,206,209,
+  100,198,86,198,22,70,117,46,185,131,113,1,227,98,198,165,
+  140,235,24,155,25,55,48,206,103,220,155,232,73,244,112,84,
+  168,174,66,136,35,62,200,35,109,68,205,184,46,184,17,172,
+  235,130,11,221,109,72,159,137,232,211,181,213,81,153,245,230,
+  134,237,131,90,85,159,173,72,50,91,18,233,130,57,174,43,
+  205,121,157,197,209,49,187,142,141,171,49,189,58,157,250,252,
+  200,184,4,66,108,19,227,216,119,86,85,33,217,208,193,154,
+  157,172,153,52,189,26,166,210,70,71,55,197,120,118,70,212,
+  219,26,155,175,162,15,142,91,128,228,52,67,236,236,133,27,
+  132,185,116,124,109,153,8,152,155,250,84,247,228,191,166,84,
+  124,234,158,209,236,58,179,209,154,165,152,149,42,54,81,221,
+  81,163,18,61,33,35,52,59,209,83,110,148,115,93,97,84,
+  112,93,105,84,114,61,226,6,210,3,252,27,123,252,25,205,
+  248,215,241,248,207,53,27,193,236,172,102,247,48,59,167,217,
+  3,204,206,107,118,31,179,47,52,187,151,217,151,218,15,163,
+  146,53,251,66,217,104,118,94,159,98,86,236,156,242,165,217,
+  89,229,95,179,207,213,152,154,157,81,113,176,159,20,66,186,
+  53,197,235,175,236,51,178,87,228,194,219,191,211,64,114,37,
+  239,242,114,187,252,228,203,132,171,67,175,91,74,235,176,235,
+  78,133,134,93,63,176,168,115,252,234,4,191,58,187,175,78,
+  237,59,197,41,78,113,138,83,156,226,148,159,123,225,221,245,
+  133,230,27,8,0,211,86,196,53,170,55,41,15,61,213,14,
+  234,78,244,112,235,225,91,91,63,216,214,142,195,211,179,111,
+  241,30,89,253,196,13,197,148,245,223,106,184,165,131,251,78,
+  202,189,169,88,203,184,128,119,217,161,80,24,102,195,26,245,
+  27,109,218,186,157,127,46,81,59,99,115,225,26,222,86,94,
+  125,112,6,76,177,54,142,165,96,171,119,111,115,253,103,73,
+  255,136,234,159,233,253,224,111,213,191,157,66,106,252,160,145,
+  228,218,220,249,14,76,182,49,31,252,181,146,134,249,226,223,
+  28,99,95,80,182,167,82,216,48,71,123,232,30,81,126,255,
+  241,125,186,255,26,213,35,252,222,188,163,233,111,212,251,165,
+  176,107,130,60,235,55,184,111,112,204,81,53,111,150,98,154,
+  173,100,22,213,172,151,217,4,205,146,170,143,178,73,183,106,
+  198,54,233,184,102,108,147,158,174,89,146,89,62,31,197,195,
+  162,251,42,251,38,103,214,211,205,163,89,79,55,15,102,61,
+  221,220,157,245,116,115,27,239,210,255,203,191,70,224,9,37,
+  122,54,175,234,88,216,60,107,90,237,196,71,35,143,84,86,
+  148,135,70,255,24,183,76,105,137,237,159,80,110,20,251,13,
+  59,184,197,178,172,152,25,49,44,253,241,91,153,210,63,86,
+  136,225,206,124,86,27,126,195,42,29,107,24,108,84,28,229,
+  154,190,111,9,91,218,109,238,50,237,160,29,44,22,247,39,
+  183,114,21,206,112,51,3,212,229,118,187,215,241,149,117,96,
+  155,163,76,191,21,153,110,71,44,171,56,168,98,226,139,185,
+  229,255,49,114,229,20,167,56,229,39,90,254,15,43,59,102,
+  181,16,72,0,0,
+};
+/* realms data */
+static const unsigned char dat_realms = {
+  31,139,8,0,0,0,0,0,0,3,237,88,15,108,147,199,
+  21,127,247,217,177,29,99,224,75,160,25,255,10,95,220,144,
+  209,52,118,62,155,64,77,102,194,103,135,36,38,77,190,6,
+  146,118,133,86,155,77,131,13,1,140,107,98,154,210,44,77,
+  24,99,168,99,168,67,136,117,192,90,86,104,149,77,17,74,
+  41,66,81,71,81,128,141,5,134,58,39,235,16,83,59,18,
+  170,174,165,85,197,16,170,40,53,73,188,223,125,118,248,211,
+  169,234,164,85,147,166,113,210,239,189,187,119,239,222,221,123,
+  247,238,238,179,253,164,159,174,198,212,152,189,132,212,208,181,
+  194,74,245,28,221,45,119,203,221,114,183,104,165,38,65,189,
+  229,137,27,137,128,63,248,104,77,226,70,255,91,189,65,209,
+  94,50,148,19,32,218,198,185,159,104,115,161,47,191,170,60,
+  49,124,46,224,14,58,237,5,84,136,190,136,253,1,141,175,
+  148,26,169,22,178,98,212,195,246,146,27,199,66,134,194,74,
+  155,143,244,232,231,50,159,26,131,213,119,188,187,212,88,129,
+  106,159,126,236,232,210,154,186,250,144,160,198,74,167,31,107,
+  105,163,96,118,233,116,125,229,210,154,191,63,92,56,253,189,
+  159,206,220,18,33,255,135,93,10,191,173,110,236,196,104,51,
+  231,88,129,80,245,227,144,197,247,81,114,4,247,215,174,234,
+  129,231,146,106,44,45,105,77,73,90,33,225,150,219,104,105,
+  13,156,98,224,42,49,34,240,197,104,155,193,235,192,247,130,
+  215,131,255,6,252,17,240,62,240,239,130,127,8,94,11,254,
+  2,248,99,24,110,0,95,138,105,183,129,47,35,210,113,59,
+  143,131,219,193,159,0,247,130,99,121,186,115,224,203,137,44,
+  157,224,79,98,252,78,240,6,240,23,191,28,229,37,43,2,
+  107,214,174,151,162,43,34,107,2,207,80,85,96,253,186,176,
+  84,27,8,173,144,138,164,202,104,32,216,84,185,110,77,131,
+  100,147,30,93,21,13,173,10,75,179,28,243,230,57,238,167,
+  154,168,189,174,233,153,39,87,55,75,179,102,203,69,178,171,
+  104,158,235,126,88,226,38,164,216,250,21,13,210,250,149,235,
+  162,77,82,160,161,33,106,151,86,133,215,55,69,237,68,158,
+  132,240,118,89,98,252,134,242,4,13,201,83,156,83,66,211,
+  187,106,131,215,44,43,19,147,73,8,93,6,159,65,250,208,
+  135,90,91,31,186,32,183,215,251,94,63,189,182,31,163,94,
+  196,40,37,207,132,113,61,82,246,225,182,80,83,222,38,43,
+  25,218,185,119,249,226,145,182,181,150,35,237,97,211,174,182,
+  115,155,164,31,214,251,248,168,117,151,48,106,121,89,226,98,
+  151,148,217,215,33,248,128,101,125,29,186,122,224,211,190,14,
+  253,81,160,167,175,35,99,26,80,0,184,128,138,190,14,227,
+  70,160,13,216,2,236,6,94,3,58,129,238,190,14,115,49,
+  44,138,146,91,125,74,125,202,161,208,145,92,133,89,114,21,
+  157,41,87,49,70,114,149,204,137,192,114,224,188,67,97,122,
+  244,21,163,15,48,94,133,12,60,115,19,112,85,141,17,251,
+  197,85,193,37,216,69,151,104,207,234,185,87,201,186,158,117,
+  57,107,232,222,22,201,37,217,165,102,41,44,117,75,7,115,
+  123,108,74,238,113,155,39,183,215,230,203,61,109,91,100,117,
+  89,237,214,102,107,216,209,51,95,113,28,159,239,113,188,59,
+  255,113,199,149,249,17,199,245,249,97,199,208,252,22,167,203,
+  105,247,186,188,118,111,179,55,92,213,92,21,174,107,174,11,
+  183,187,218,237,199,93,199,237,241,230,120,56,222,29,63,216,
+  215,220,23,238,235,238,59,200,247,219,147,96,190,180,31,45,
+  106,76,103,42,75,48,51,34,235,68,210,136,168,139,168,87,
+  161,174,87,99,214,41,171,39,233,219,177,230,43,253,91,243,
+  50,119,182,231,123,30,108,9,80,114,100,238,38,255,7,220,
+  151,95,189,9,244,2,239,0,131,196,246,231,0,86,160,1,
+  136,36,81,192,7,57,175,73,12,230,215,41,11,200,186,113,
+  248,121,219,34,219,50,79,130,166,84,213,6,13,181,241,0,
+  177,207,34,201,104,50,64,122,69,158,225,39,225,42,63,247,
+  3,215,161,241,50,239,205,152,27,32,163,93,141,73,27,135,
+  171,203,18,212,154,181,138,159,33,80,156,32,80,129,50,64,
+  117,164,7,213,83,38,104,6,153,64,13,52,22,212,72,227,
+  65,77,164,3,205,36,35,168,153,198,128,142,161,9,160,22,
+  202,22,239,167,177,171,77,222,89,36,102,41,148,165,198,22,
+  24,75,105,240,97,204,157,147,213,22,161,210,25,106,12,117,
+  115,86,88,46,33,35,60,254,82,25,119,121,220,183,198,214,
+  88,182,143,249,235,152,34,243,246,204,207,51,67,166,65,83,
+  192,120,201,248,180,113,140,225,53,67,101,198,167,25,63,207,
+  168,212,223,208,191,161,143,232,101,221,103,186,223,234,126,164,
+  171,211,221,39,92,19,254,40,236,23,126,32,44,67,46,76,
+  98,9,246,55,118,146,253,154,253,140,61,203,86,176,197,172,
+  148,217,216,52,102,161,97,186,76,23,233,29,234,165,183,232,
+  13,234,160,151,105,23,109,167,45,212,74,79,83,132,26,169,
+  129,190,71,75,169,158,30,166,135,168,146,202,104,1,125,135,
+  92,52,135,156,84,68,133,84,64,223,166,153,116,31,229,210,
+  12,161,101,56,105,234,166,140,196,120,223,71,61,61,106,121,
+  85,179,237,208,234,10,107,179,109,159,212,108,235,144,92,182,
+  206,55,122,215,230,116,109,13,138,168,31,64,254,237,115,12,
+  37,147,182,67,126,171,21,25,106,235,74,76,6,125,61,49,
+  67,118,155,73,156,236,185,190,149,216,86,36,203,100,100,231,
+  62,181,162,122,64,167,83,215,171,149,106,185,215,149,152,156,
+  59,68,108,247,110,86,108,186,142,249,140,26,157,144,53,68,
+  61,137,25,160,44,49,89,173,168,24,80,99,69,102,204,188,
+  44,207,103,173,253,243,25,88,217,142,92,95,238,185,68,155,
+  211,237,77,104,183,122,46,233,134,192,131,144,43,224,59,60,
+  151,216,72,186,255,121,180,27,33,111,3,15,167,121,52,205,
+  55,112,158,214,219,130,246,70,204,212,40,187,233,57,46,147,
+  78,47,238,77,94,135,164,85,114,99,3,71,238,144,109,212,
+  100,195,183,100,136,208,114,105,81,100,198,40,207,91,108,61,
+  3,121,34,239,251,200,71,172,127,116,213,95,181,218,175,91,
+  37,95,157,26,155,221,67,100,235,137,38,227,56,221,182,179,
+  192,161,217,199,33,57,140,25,130,142,43,168,157,241,54,219,
+  122,227,10,247,67,138,16,221,135,19,183,175,25,173,240,205,
+  86,11,90,209,155,173,54,180,54,220,108,109,142,232,60,9,
+  83,127,89,194,212,147,187,136,4,239,74,82,144,239,94,160,
+  12,245,133,224,21,64,37,234,197,14,15,201,88,87,53,124,
+  236,15,20,96,191,22,216,118,99,238,179,106,44,174,68,185,
+  149,109,184,249,70,71,87,104,154,167,147,151,241,5,143,189,
+  231,89,33,29,29,131,0,74,71,45,26,29,171,81,147,70,
+  51,53,106,6,77,237,191,239,35,81,130,229,83,192,9,175,
+  203,182,39,149,111,179,65,225,239,217,242,132,201,186,129,112,
+  7,13,98,213,230,153,124,213,141,180,176,252,19,170,94,82,
+  102,41,35,253,218,15,170,7,244,38,53,38,40,148,116,244,
+  216,78,0,167,212,216,69,79,54,33,122,168,161,125,38,104,
+  209,34,118,91,4,249,172,50,21,211,92,22,229,182,243,124,
+  94,89,136,50,212,166,200,186,168,0,158,237,43,67,77,135,
+  154,169,122,128,44,106,12,126,36,67,238,82,118,161,210,243,
+  5,172,116,59,112,39,156,24,162,106,79,194,184,41,126,28,
+  89,177,195,73,253,30,167,67,164,67,136,222,138,108,196,175,
+  216,73,131,139,192,157,136,148,172,198,34,120,251,229,2,114,
+  134,76,117,202,28,133,156,90,75,230,118,131,248,206,128,87,
+  6,111,1,21,129,231,1,179,128,124,160,16,48,1,102,160,
+  42,154,156,131,93,1,230,2,46,160,4,112,11,109,48,129,
+  140,209,124,108,149,100,162,153,10,193,135,140,28,126,99,114,
+  79,75,75,113,202,207,174,38,118,160,14,190,55,18,219,235,
+  184,110,59,99,195,247,148,225,212,6,154,205,253,57,12,28,
+  169,43,160,10,244,70,238,105,196,29,82,33,235,184,77,188,
+  16,157,60,127,176,86,69,134,237,123,20,42,27,244,105,171,
+  54,107,59,117,214,79,172,26,237,145,160,40,22,80,25,223,
+  135,56,247,79,241,31,131,116,40,152,35,207,227,182,45,74,
+  50,25,186,144,222,213,195,254,243,232,27,14,78,187,173,207,
+  124,179,239,104,125,35,70,183,165,61,218,200,103,135,101,47,
+  183,44,98,5,24,249,197,138,212,10,44,136,152,87,211,166,
+  228,18,46,15,154,150,64,130,47,177,78,109,69,214,209,113,
+  75,148,108,140,188,232,73,113,68,173,240,209,148,222,230,42,
+  106,180,64,227,185,226,54,109,228,46,228,168,33,52,17,146,
+  5,240,180,18,168,72,89,76,182,114,59,78,93,49,201,217,
+  1,26,190,170,229,131,34,11,113,248,140,122,253,90,33,82,
+  15,175,23,198,21,100,165,46,152,163,87,104,18,222,11,31,
+  143,25,222,179,124,228,97,151,95,244,36,190,56,207,237,112,
+  41,180,11,184,237,219,114,153,70,90,171,7,90,240,18,143,
+  12,223,160,207,255,49,64,76,208,147,73,148,210,111,12,187,
+  198,62,102,239,177,63,177,223,177,55,217,65,118,128,237,101,
+  59,217,54,182,153,181,176,38,22,102,33,158,192,119,22,190,
+  247,27,168,60,161,191,128,53,111,174,66,142,133,12,117,160,
+  193,156,252,70,18,228,169,210,179,84,216,68,234,11,85,222,
+  208,213,153,15,241,172,97,157,0,255,98,126,241,182,117,157,
+  72,173,10,9,116,16,120,12,47,249,39,224,2,48,14,152,
+  6,224,43,246,192,18,224,9,0,47,254,129,77,64,7,240,
+  54,112,14,120,31,184,76,236,85,23,80,65,236,149,43,0,
+  222,128,253,133,64,45,176,17,192,83,178,127,55,208,9,28,
+  75,207,211,6,148,64,183,11,128,157,87,174,241,232,134,136,
+  182,142,222,51,34,207,160,147,217,156,158,154,206,233,31,226,
+  172,138,53,138,93,198,229,162,104,156,48,196,163,96,59,229,
+  215,119,25,27,174,76,224,183,235,73,141,254,30,177,168,10,
+  230,104,227,78,94,202,68,118,219,187,216,58,65,100,252,53,
+  227,153,127,81,65,238,60,192,91,6,133,241,252,43,208,122,
+  220,6,18,93,182,151,120,61,117,123,57,11,168,20,163,231,
+  106,249,48,9,39,232,65,65,73,82,191,210,176,196,233,190,
+  66,115,90,144,211,115,253,21,208,112,105,26,57,208,152,199,
+  53,118,40,13,114,52,213,239,242,231,163,191,68,59,5,124,
+  119,74,252,57,104,187,181,246,20,232,153,210,122,110,228,109,
+  233,199,75,5,15,141,191,199,67,69,218,253,49,75,139,135,
+  161,175,145,10,252,83,156,46,219,161,212,237,25,111,182,117,
+  97,31,187,120,214,241,87,4,171,204,15,233,235,60,126,19,
+  106,121,11,113,191,192,22,159,181,144,143,132,165,169,60,119,
+  27,133,212,61,202,79,253,231,242,104,142,242,115,8,59,47,
+  113,173,56,238,222,155,26,227,70,53,212,216,156,199,211,180,
+  138,107,65,99,124,86,143,109,207,232,30,241,232,138,110,18,
+  83,17,28,203,35,184,231,86,4,69,77,31,39,173,72,156,
+  170,217,152,11,184,128,18,192,141,123,175,20,183,248,187,182,
+  189,55,173,185,199,112,11,191,76,89,179,240,250,222,91,214,
+  160,169,173,180,175,153,115,79,98,232,136,40,203,250,227,46,
+  219,110,228,116,177,38,233,228,146,246,148,196,170,73,118,64,
+  66,105,29,81,147,108,229,18,174,115,51,207,80,23,92,212,
+  35,151,180,187,228,18,169,91,118,165,230,67,76,82,247,212,
+  114,126,243,226,123,73,251,102,194,55,193,212,120,183,86,239,
+  224,117,171,203,214,177,163,13,95,242,157,124,4,223,167,244,
+  109,119,40,96,30,221,35,188,49,10,139,52,24,100,55,139,
+  248,205,22,69,71,79,234,101,183,142,248,136,244,14,25,154,
+  24,183,214,215,205,103,192,78,154,176,139,230,57,123,68,75,
+  191,103,230,79,196,137,184,9,77,2,78,55,153,180,94,179,
+  236,20,45,200,168,40,168,169,223,147,31,21,39,226,247,168,
+  39,100,122,4,122,128,89,139,22,230,173,76,80,23,226,92,
+  172,229,146,25,95,245,184,177,70,206,163,87,203,165,244,140,
+  7,210,62,117,140,250,132,122,39,234,154,71,218,200,113,200,
+  142,2,65,25,159,76,229,196,151,179,145,44,255,234,169,142,
+  110,121,202,34,163,185,211,87,144,202,133,40,101,79,208,36,
+  252,221,155,5,171,121,239,251,64,243,113,19,229,225,88,175,
+  161,89,26,213,174,198,87,253,95,247,15,194,104,49,17,143,
+  60,127,51,83,101,84,206,216,104,229,223,183,149,249,13,218,
+  50,255,55,109,253,71,101,193,87,200,239,156,235,206,158,111,
+  98,222,255,157,162,249,91,255,117,26,246,191,252,151,150,243,
+  127,85,140,88,192,63,1,67,181,200,8,78,24,0,0,
+};
+/* shadowdancer data */
+static const unsigned char dat_shadowdancer = {
+  31,139,8,0,0,0,0,0,0,3,237,88,125,116,19,215,
+  149,191,163,145,52,178,144,53,178,108,136,0,69,35,62,202,
+  26,135,128,108,8,149,169,42,201,64,130,113,192,56,134,164,
+  144,77,27,121,67,100,55,159,10,196,65,206,42,214,40,98,
+  17,109,104,160,93,54,39,221,147,77,104,147,180,129,221,211,
+  229,156,102,247,180,103,105,34,29,181,152,182,156,64,219,180,
+  229,244,176,101,20,211,144,182,105,25,39,105,24,204,160,217,
+  223,27,137,132,54,217,211,102,211,191,246,228,89,239,222,251,
+  238,187,239,190,251,238,189,239,99,156,32,107,160,119,184,119,
+  120,225,50,234,29,124,123,193,170,222,159,209,71,229,163,242,
+  81,249,168,152,101,237,36,29,185,118,242,194,228,64,34,121,
+  211,218,201,11,63,254,206,145,164,103,225,50,125,218,0,209,
+  46,134,19,68,219,23,116,207,235,185,118,242,226,207,6,34,
+  201,142,133,109,180,0,125,169,133,87,153,120,40,120,7,245,
+  129,183,4,244,61,11,151,93,120,97,208,190,96,213,213,221,
+  100,69,63,227,117,247,14,67,235,203,203,31,235,29,110,235,
+  93,24,120,225,208,166,181,235,55,12,90,122,135,163,129,23,
+  50,50,37,189,209,128,117,213,166,181,191,90,183,32,112,242,
+  11,31,219,145,162,196,171,7,227,236,180,186,176,23,163,157,
+  12,195,2,75,79,97,208,213,125,198,168,226,252,122,108,205,
+  169,172,209,59,92,231,140,214,56,163,224,48,205,50,109,90,
+  139,69,113,192,189,196,17,1,223,128,182,3,120,61,240,94,
+  224,13,192,251,129,111,4,254,111,224,62,224,157,192,27,129,
+  223,0,222,132,225,78,224,155,129,219,128,255,22,184,3,248,
+  22,224,165,192,48,139,59,2,252,119,68,1,47,240,109,24,
+  183,11,120,51,240,158,63,245,238,250,161,129,205,247,110,11,
+  174,28,184,231,182,219,183,4,183,220,158,186,107,96,132,214,
+  14,220,127,255,208,237,219,130,235,63,123,247,221,247,222,179,
+  121,107,112,81,112,245,221,3,131,183,111,13,174,191,55,121,
+  255,182,129,45,183,7,175,14,222,184,62,184,234,222,187,54,
+  7,91,219,59,59,219,231,211,218,45,11,215,223,63,114,219,
+  157,105,48,62,190,40,116,205,162,206,240,124,186,118,146,188,
+  61,95,74,58,187,38,233,232,220,157,44,98,189,195,108,86,
+  180,79,180,103,122,135,57,117,197,36,221,5,234,60,255,240,
+  172,213,252,246,246,76,194,111,115,244,14,7,31,52,18,240,
+  234,243,168,255,9,186,111,197,228,20,119,211,103,153,223,0,
+  225,53,64,11,217,0,121,178,2,90,169,1,208,70,14,64,
+  59,53,2,10,36,2,58,136,7,108,32,1,208,73,83,16,
+  19,159,247,196,13,71,140,201,4,241,175,207,110,37,203,143,
+  159,35,251,10,213,231,7,118,95,11,220,245,26,249,131,142,
+  45,52,119,198,143,14,182,146,119,198,160,215,197,17,151,116,
+  216,31,198,220,213,196,239,95,206,37,94,237,29,78,204,32,
+  186,210,249,254,217,218,123,30,96,46,131,150,25,38,244,48,
+  200,189,198,160,184,196,132,135,89,158,164,104,113,145,168,33,
+  98,194,149,38,236,48,225,146,197,186,97,0,95,183,88,199,
+  90,168,97,41,48,86,220,16,158,115,4,112,97,138,82,228,
+  105,165,218,232,56,40,206,164,150,175,120,141,236,115,190,15,
+  106,54,168,29,38,53,47,212,74,214,202,198,217,221,63,41,
+  154,237,182,217,35,172,127,11,45,46,1,71,161,167,221,67,
+  199,227,38,119,94,168,157,168,38,59,119,245,198,207,207,249,
+  1,120,216,83,144,153,79,92,165,27,144,126,90,52,185,251,
+  76,30,111,242,44,63,47,206,249,33,120,90,125,53,125,38,
+  124,142,65,39,53,51,122,141,9,159,49,161,110,194,94,19,
+  174,51,225,215,76,248,117,19,86,77,104,152,26,110,49,225,
+  243,166,30,151,73,63,105,194,183,77,78,175,73,239,50,225,
+  105,147,83,243,226,30,19,190,102,114,226,115,24,157,48,225,
+  183,24,116,122,76,122,179,9,15,153,156,22,147,30,50,97,
+  209,228,248,186,16,31,103,95,40,130,13,21,33,231,253,116,
+  48,67,98,210,218,18,33,173,9,25,176,33,126,195,247,141,
+  215,107,187,187,30,149,142,57,186,131,133,221,216,73,115,244,
+  134,119,40,103,157,50,229,136,201,245,14,179,168,175,54,245,
+  95,15,56,101,233,90,70,63,208,195,188,223,49,104,77,16,
+  119,179,117,164,22,105,147,23,78,18,103,173,207,178,108,241,
+  121,150,9,140,203,44,108,232,30,128,129,38,181,15,84,171,
+  73,105,160,2,41,50,199,174,28,12,46,55,177,217,186,238,
+  206,121,41,10,117,214,114,170,150,91,137,54,123,109,174,136,
+  107,132,226,12,39,137,30,51,101,162,253,241,131,108,84,60,
+  105,55,219,203,77,175,70,131,102,238,252,168,136,232,123,182,
+  144,217,154,119,60,222,17,66,214,108,50,51,104,225,79,74,
+  255,151,204,169,251,39,226,248,182,137,215,212,241,51,117,172,
+  95,90,47,191,231,210,122,249,29,151,214,203,103,234,163,151,
+  33,98,206,224,154,21,204,163,201,230,19,204,243,222,227,38,
+  182,96,183,171,181,136,97,175,88,89,172,224,87,117,246,16,
+  145,167,9,45,33,73,22,139,165,149,114,100,93,62,68,43,
+  219,51,16,8,141,242,94,216,254,90,131,37,78,241,211,14,
+  153,235,137,15,122,15,14,81,203,32,145,171,61,78,45,235,
+  227,3,56,240,107,43,180,96,67,111,33,200,91,144,43,208,
+  70,142,81,11,98,57,183,39,158,156,214,211,149,100,113,245,
+  53,117,81,200,129,253,73,172,229,52,115,202,105,238,193,165,
+  56,223,38,209,230,146,75,91,224,39,203,114,138,61,159,161,
+  88,210,190,164,149,156,9,235,203,67,52,109,21,203,149,199,
+  90,22,7,89,175,248,171,207,182,119,81,7,116,113,76,23,
+  189,128,177,150,100,228,131,143,5,180,152,26,50,208,224,74,
+  206,72,17,147,117,221,227,89,236,161,166,56,93,215,158,65,
+  158,172,68,255,45,232,111,76,186,234,121,200,56,61,224,76,
+  73,122,47,113,204,117,92,7,126,7,248,142,100,219,95,182,
+  47,32,191,217,244,31,193,199,177,131,204,110,102,77,31,110,
+  136,189,136,67,247,172,33,242,209,92,64,63,181,2,6,105,
+  65,251,16,69,41,14,184,140,34,77,67,240,165,0,122,13,
+  245,166,8,17,89,142,122,147,163,21,167,190,117,208,137,188,
+  120,112,250,16,245,81,227,79,198,102,173,198,137,60,140,115,
+  208,97,122,217,109,198,215,225,120,14,208,154,176,175,151,49,
+  14,183,13,108,200,178,126,196,215,93,227,193,63,144,232,255,
+  92,109,252,113,248,18,92,39,106,127,7,78,204,246,7,208,
+  235,106,122,192,131,35,161,167,149,236,131,203,48,195,18,211,
+  131,110,47,60,216,211,53,24,92,194,89,186,72,116,88,144,
+  19,110,64,123,210,58,62,148,112,190,50,148,176,31,236,186,
+  219,18,226,160,107,41,106,24,218,227,199,227,230,216,111,204,
+  219,74,132,204,58,128,250,3,216,136,213,52,49,123,237,38,
+  20,218,239,4,156,22,188,138,236,179,226,228,235,145,7,173,
+  144,187,11,109,39,218,126,180,237,104,203,9,236,117,207,85,
+  72,207,248,160,31,250,215,160,246,154,28,222,115,13,177,216,
+  246,97,109,208,60,235,78,114,83,208,236,177,66,150,104,97,
+  7,189,182,26,158,16,145,37,75,48,42,138,26,71,175,13,
+  120,25,106,196,244,137,221,132,2,110,210,86,234,193,40,13,
+  94,71,123,208,15,15,68,144,243,110,211,183,130,153,101,2,
+  60,28,55,71,214,34,211,2,153,94,200,192,78,238,55,245,
+  190,222,158,231,200,55,24,157,55,68,115,61,205,7,35,36,
+  15,118,0,230,146,30,211,50,14,124,223,207,139,179,174,167,
+  185,104,207,236,150,17,9,22,5,231,241,120,8,167,33,40,
+  23,235,131,14,255,96,4,178,173,117,29,161,63,209,225,55,
+  117,180,190,163,163,159,69,178,238,143,13,172,7,22,194,222,
+  193,86,88,24,135,133,51,106,217,214,209,74,75,193,9,127,
+  147,89,26,102,57,86,183,58,142,25,131,131,67,61,200,212,
+  100,24,18,203,49,166,13,243,44,48,231,55,6,77,107,89,
+  94,122,103,66,251,2,243,198,22,167,231,48,95,23,245,212,
+  117,44,199,232,149,131,115,77,63,6,182,16,188,222,237,109,
+  165,235,222,149,237,225,146,118,115,31,118,155,214,89,33,203,
+  206,217,101,240,58,243,182,11,214,117,160,7,251,56,105,221,
+  211,149,176,28,239,98,254,0,7,231,12,100,130,166,166,208,
+  175,125,88,99,136,197,149,249,238,93,191,213,53,220,180,167,
+  11,167,87,43,185,167,203,30,218,144,83,186,25,198,184,13,
+  245,152,89,65,247,77,143,83,99,239,240,34,242,44,32,177,
+  216,74,30,180,197,160,116,137,35,183,82,211,31,115,32,227,
+  125,143,76,243,37,206,251,62,155,236,120,189,93,86,216,45,
+  117,121,225,154,170,220,57,199,251,142,252,80,197,214,124,209,
+  114,214,243,215,215,219,48,245,130,245,84,240,175,163,139,67,
+  136,241,204,133,131,112,232,105,14,60,103,223,251,244,116,159,
+  117,251,26,215,186,30,157,242,139,41,139,156,187,27,206,53,
+  12,57,42,142,1,225,215,194,54,193,101,255,186,125,149,237,
+  119,182,199,109,171,172,186,245,121,107,202,218,206,191,197,31,
+  226,119,240,235,249,185,150,183,45,71,45,207,88,70,45,55,
+  91,194,22,31,55,201,253,146,43,115,7,184,47,113,127,207,
+  37,185,126,46,198,93,205,249,57,23,93,164,179,84,161,159,
+  210,247,233,5,250,38,237,167,167,232,49,122,148,118,80,150,
+  182,209,125,116,7,109,166,91,105,19,109,192,153,123,61,173,
+  162,21,20,163,8,133,233,26,234,160,69,116,53,181,81,43,
+  205,163,185,52,27,231,120,0,39,250,76,154,142,211,125,26,
+  77,165,22,106,38,47,53,145,71,146,164,64,32,112,229,149,
+  87,250,253,254,153,51,103,206,152,49,99,250,244,233,62,159,
+  239,138,43,174,152,54,109,218,212,169,83,91,90,90,154,155,
+  155,189,94,111,83,83,147,199,227,17,69,209,237,118,55,54,
+  54,186,92,174,41,83,166,56,157,206,134,134,6,135,195,33,
+  8,130,221,110,183,217,108,86,171,149,231,121,92,237,28,135,
+  235,136,108,151,21,235,101,133,191,172,88,46,43,220,101,229,
+  195,196,238,131,234,127,244,209,93,187,30,121,228,243,159,255,
+  92,87,87,215,242,191,160,32,59,56,139,133,231,173,86,155,
+  205,110,23,4,184,192,1,79,52,192,33,78,248,101,138,171,
+  94,26,235,197,93,47,98,189,16,53,158,64,253,13,42,94,
+  82,141,135,107,213,189,18,213,141,122,19,106,7,234,206,203,
+  250,130,181,122,169,253,255,181,190,167,184,240,89,135,88,185,
+  191,86,223,113,147,200,225,26,117,160,134,69,251,59,156,231,
+  235,28,15,27,53,7,231,139,251,91,117,206,12,198,89,236,
+  184,156,99,188,69,52,155,105,62,84,231,4,201,197,109,48,
+  245,252,115,93,223,209,119,56,79,214,57,63,174,227,175,162,
+  126,23,245,196,123,218,174,119,77,119,227,203,81,92,112,1,
+  119,10,171,85,84,215,91,50,42,91,213,91,148,179,212,90,
+  50,217,39,101,154,68,111,171,158,227,66,106,142,179,53,114,
+  100,144,213,132,22,209,226,182,52,90,92,150,41,156,147,107,
+  224,28,156,192,217,57,27,103,229,120,206,220,99,6,113,141,
+  156,187,38,85,163,81,93,160,192,9,153,26,192,17,1,93,
+  12,119,186,77,157,110,180,128,23,57,230,232,86,102,168,249,
+  70,180,189,67,93,122,45,82,39,78,14,99,82,168,227,230,
+  229,157,128,211,155,117,156,38,198,164,4,108,97,109,124,49,
+  216,128,197,57,200,100,241,56,118,198,18,246,157,224,89,98,
+  145,153,22,246,202,194,149,72,33,207,43,221,236,139,198,211,
+  177,152,189,129,113,59,109,220,201,190,172,61,11,241,114,69,
+  164,60,109,193,91,123,135,155,217,119,5,116,246,14,191,107,
+  197,25,166,109,193,102,7,250,68,246,101,177,126,132,73,39,
+  23,46,114,188,51,146,113,22,110,248,182,169,237,56,147,14,
+  222,106,74,117,36,29,151,52,94,178,178,119,235,229,201,229,
+  217,136,122,146,200,139,204,104,142,16,181,224,187,170,5,237,
+  105,126,162,233,200,175,153,85,122,216,17,127,245,244,93,71,
+  23,211,241,208,167,191,56,20,143,158,254,228,174,236,154,204,
+  227,255,245,69,79,136,11,6,109,13,220,213,238,213,115,230,
+  223,154,202,61,127,203,85,175,191,250,229,39,238,125,112,207,
+  62,199,172,134,235,227,109,142,27,102,124,245,95,242,233,187,
+  111,182,77,200,239,147,216,127,121,225,218,232,19,190,192,232,
+  96,50,177,147,79,36,190,221,52,148,144,238,19,103,137,191,
+  59,246,189,239,157,92,25,15,146,239,48,30,246,165,93,220,
+  163,116,184,113,156,222,246,13,28,230,148,65,62,162,143,188,
+  202,169,180,56,154,182,103,41,114,56,91,200,27,157,19,187,
+  180,49,57,171,68,69,67,170,182,43,197,210,238,60,94,190,
+  57,217,69,106,101,7,62,98,105,252,113,242,243,71,249,233,
+  229,205,246,118,253,4,247,250,121,126,119,103,116,51,247,82,
+  166,64,211,175,112,15,72,179,202,87,159,61,118,242,211,199,
+  87,90,18,179,158,254,242,201,141,179,174,185,33,124,66,143,
+  94,249,210,248,150,147,202,199,31,249,97,201,249,198,67,113,
+  188,129,240,125,33,6,159,150,240,85,177,45,236,248,69,124,
+  83,161,249,211,253,223,176,123,103,28,164,46,219,210,167,101,
+  175,53,56,226,95,255,242,131,43,189,59,91,183,69,122,194,
+  235,230,38,142,94,145,242,77,17,167,167,59,62,148,167,216,
+  127,228,44,207,121,41,17,140,8,127,88,117,106,82,252,250,
+  168,119,92,253,148,97,236,123,90,207,26,143,79,252,77,149,
+  223,199,141,23,113,65,144,92,252,110,68,133,169,69,15,5,
+  19,148,213,35,122,74,210,185,39,136,63,83,50,114,37,195,
+  168,54,234,179,255,241,141,23,47,158,241,187,105,207,167,254,
+  48,250,157,117,43,183,75,51,213,62,87,42,183,226,161,115,
+  198,235,202,62,142,2,199,78,101,251,210,244,197,32,127,254,
+  220,39,222,8,227,60,225,141,115,15,221,42,40,48,164,249,
+  188,97,24,183,245,17,237,88,241,228,49,195,80,154,144,3,
+  113,50,98,198,69,214,75,123,63,134,110,67,99,164,101,207,
+  139,32,179,38,59,39,199,140,236,217,236,107,230,82,238,158,
+  2,254,55,39,20,236,250,149,220,197,43,140,139,70,53,198,
+  164,28,84,208,182,161,117,34,243,140,41,103,137,85,31,122,
+  243,183,103,199,30,143,237,193,36,54,171,219,118,241,194,197,
+  201,243,90,58,61,155,169,231,87,148,111,251,119,195,56,245,
+  98,89,153,72,79,197,150,9,123,92,246,114,229,23,47,214,
+  166,71,81,200,208,73,50,202,121,195,144,131,146,161,68,68,
+  67,23,119,25,6,167,102,181,132,195,39,66,43,94,151,248,
+  190,48,12,33,119,6,64,6,21,63,240,156,104,42,200,150,
+  216,171,177,182,152,172,81,43,197,0,235,137,49,150,237,86,
+  180,153,217,181,83,58,171,139,104,235,66,93,208,212,16,51,
+  212,63,9,163,104,42,249,95,66,124,227,29,55,182,29,56,
+  176,127,245,234,13,7,88,249,210,254,149,251,227,182,248,236,
+  175,126,160,68,57,96,125,118,232,217,59,250,247,238,179,238,
+  239,233,151,189,207,206,239,241,88,90,158,157,31,119,244,239,
+  125,214,193,57,251,247,18,205,66,7,253,195,252,158,62,214,
+  177,156,208,193,220,185,29,22,244,244,111,55,59,100,116,244,
+  239,65,71,91,28,35,246,119,207,239,233,255,143,86,219,252,
+  158,155,246,253,153,217,63,208,155,154,139,186,214,149,163,62,
+  101,92,208,121,149,111,56,61,179,226,27,171,114,23,228,172,
+  239,112,132,175,114,234,192,23,52,81,19,101,241,41,29,2,
+  101,174,202,77,200,105,210,148,152,42,21,37,25,143,69,73,
+  6,81,20,21,65,229,53,78,231,13,122,211,224,21,69,209,
+  36,53,230,246,139,178,81,60,86,188,82,145,16,197,42,85,
+  57,77,120,69,248,167,98,76,142,41,230,16,67,150,100,32,
+  77,80,184,138,146,161,81,94,119,72,114,92,42,94,44,142,
+  20,37,78,35,93,84,34,84,229,53,50,20,78,21,20,54,
+  85,182,88,120,220,195,44,42,242,23,53,94,17,139,5,57,
+  120,38,191,67,40,149,149,209,112,40,42,169,233,112,56,234,
+  18,4,94,225,85,14,127,176,48,74,193,76,58,134,247,171,
+  68,2,204,132,30,21,189,70,81,220,46,150,242,165,156,6,
+  253,49,89,40,222,167,164,67,124,169,162,164,211,81,107,32,
+  224,230,21,45,168,249,34,92,70,82,67,9,78,149,84,140,
+  214,152,214,144,74,151,39,20,191,75,212,201,40,144,84,69,
+  158,187,41,171,241,213,56,83,110,80,76,162,108,6,75,46,
+  138,85,150,172,6,230,204,29,171,90,98,154,104,20,57,67,
+  227,207,41,226,83,20,213,185,51,138,24,83,98,24,126,76,
+  102,74,52,140,6,206,78,112,198,81,222,224,139,157,6,241,
+  122,80,84,41,198,20,49,45,200,243,211,188,33,99,222,79,
+  48,181,130,17,12,140,62,28,59,91,20,36,217,61,74,97,
+  157,182,170,80,218,124,118,231,224,139,218,195,35,19,142,51,
+  223,229,79,237,92,21,163,39,51,43,194,231,11,227,198,206,
+  7,36,238,100,70,80,53,113,142,226,23,138,105,105,167,26,
+  211,220,252,196,19,177,177,80,117,23,175,135,197,162,26,227,
+  139,25,65,7,33,241,197,81,145,211,162,76,142,83,34,187,
+  73,0,111,133,60,34,114,167,211,98,78,137,10,242,100,64,
+  128,153,15,137,156,154,17,43,74,76,144,171,1,94,77,75,
+  101,131,211,34,162,162,198,10,242,164,91,208,210,226,87,148,
+  108,65,6,17,43,41,153,66,110,50,32,30,73,199,190,162,
+  84,133,188,1,34,167,84,11,252,121,183,168,135,99,199,85,
+  163,92,50,116,127,76,77,61,52,80,62,85,16,126,235,14,
+  28,10,143,164,239,155,80,68,241,51,126,127,38,148,86,43,
+  227,149,177,177,178,40,185,253,81,169,50,86,41,23,106,180,
+  47,173,133,84,181,50,166,20,3,146,63,146,241,157,215,218,
+  199,213,31,149,43,133,221,165,151,196,188,158,210,195,178,54,
+  146,87,223,224,43,170,88,86,196,124,81,18,116,88,201,105,
+  105,65,85,217,15,252,10,203,77,71,85,162,106,0,63,14,
+  63,29,191,200,10,67,85,69,85,89,87,81,32,33,42,175,
+  60,82,81,214,41,74,21,171,203,230,119,196,242,15,131,96,
+  176,124,24,97,10,27,66,36,86,216,37,229,183,139,229,195,
+  66,233,48,175,140,147,84,126,73,40,143,9,149,113,65,121,
+  51,175,110,45,105,157,69,61,54,193,171,35,57,45,18,215,
+  3,137,81,177,47,38,236,145,242,71,41,43,132,99,249,151,
+  197,18,114,245,65,30,198,233,200,35,61,74,176,8,254,131,
+  243,68,53,45,232,17,206,16,117,30,38,26,224,85,176,135,
+  210,220,41,183,103,107,89,14,157,43,239,240,195,5,81,127,
+  234,76,249,81,151,122,91,254,73,23,95,126,202,158,218,170,
+  156,117,71,36,229,76,41,227,214,98,165,99,121,67,57,83,
+  212,93,163,98,209,40,233,226,40,118,86,165,42,100,213,24,
+  103,228,181,128,46,201,231,148,170,24,227,213,140,38,145,40,
+  229,149,180,46,229,198,212,12,73,165,223,147,193,107,130,129,
+  51,193,208,98,252,25,101,84,120,74,209,68,169,168,186,99,
+  85,65,238,196,238,143,24,121,37,32,85,84,55,179,84,142,
+  169,106,89,124,193,159,154,85,86,162,124,49,203,43,25,105,
+  140,68,117,98,247,209,0,167,188,57,86,120,34,192,157,125,
+  34,16,78,148,13,210,162,92,81,80,178,202,155,194,118,201,
+  151,70,26,42,162,30,204,136,130,39,148,18,202,197,128,40,
+  167,211,162,64,170,194,159,136,136,165,138,63,34,97,174,63,
+  62,205,44,253,2,220,202,171,163,98,78,141,10,112,173,79,
+  85,35,17,190,92,62,20,73,167,35,233,12,96,56,157,74,
+  167,82,41,149,47,143,149,217,239,242,82,148,68,73,114,75,
+  98,32,192,190,93,145,82,146,59,16,32,77,77,171,170,170,
+  165,43,170,166,178,50,161,168,170,81,184,84,132,66,97,183,
+  32,138,172,106,97,193,30,144,184,202,75,162,80,62,18,142,
+  9,165,74,85,164,128,132,52,145,242,99,187,34,18,118,67,
+  38,32,236,136,68,72,157,16,119,104,90,36,92,46,169,131,
+  133,221,57,37,179,184,92,54,10,216,4,34,19,218,45,10,
+  133,146,250,203,128,132,115,183,144,86,51,163,249,60,78,181,
+  40,95,214,34,72,247,138,81,81,34,247,149,75,21,53,34,
+  9,37,37,29,21,243,138,26,177,104,1,161,160,104,81,145,
+  47,153,124,53,35,241,101,163,168,166,35,227,37,245,190,177,
+  66,56,45,186,67,106,230,147,200,31,229,45,191,111,66,213,
+  70,42,21,45,92,169,28,138,164,180,81,74,171,90,0,225,
+  26,13,132,211,89,65,81,199,220,126,117,92,238,68,42,109,
+  21,93,41,45,210,137,201,154,97,236,168,160,75,5,37,21,
+  198,206,79,137,240,113,154,77,151,17,117,63,38,76,75,56,
+  26,0,114,108,145,37,37,91,76,132,68,92,5,105,137,9,
+  103,176,217,96,18,5,76,99,69,8,153,118,107,136,97,17,
+  233,2,187,107,131,77,18,34,49,164,137,80,86,96,84,142,
+  201,243,69,19,8,104,4,68,1,195,196,2,212,137,92,69,
+  13,16,114,130,137,96,18,44,94,169,25,64,97,102,76,196,
+  188,233,141,223,221,216,253,65,110,196,247,220,144,78,36,158,
+  129,28,82,165,108,14,193,175,24,240,225,33,132,53,149,205,
+  87,116,76,158,70,242,103,112,140,229,21,93,194,137,57,138,
+  69,164,163,130,96,2,3,22,251,177,127,24,40,169,225,24,
+  159,67,116,116,183,40,171,25,55,100,117,81,84,210,1,193,
+  100,50,227,99,200,217,0,59,52,5,89,11,224,133,164,72,
+  121,108,25,246,131,14,169,168,9,56,15,12,108,19,35,95,
+  12,68,69,194,238,132,16,58,13,205,110,153,80,16,141,127,
+  229,139,158,169,56,168,61,100,251,12,185,44,178,141,242,241,
+  22,58,72,36,199,45,236,233,252,225,139,197,206,138,11,213,
+  225,112,216,221,78,167,211,99,119,184,91,166,181,56,236,127,
+  174,44,104,101,195,220,24,108,181,59,157,46,135,221,233,96,
+  127,24,232,118,187,160,128,41,4,223,245,111,173,145,5,65,
+  175,221,139,197,114,109,236,223,41,27,173,127,141,226,119,56,
+  255,232,207,97,181,226,231,182,254,222,233,195,204,1,143,185,
+  166,217,151,164,225,171,255,1,57,156,189,107,198,36,0,0,
+};
+/* sidmon1 data */
+static const unsigned char dat_sidmon1 = {
+  31,139,8,0,0,0,0,0,0,3,75,96,96,224,74,96,
+  96,56,3,196,175,28,127,49,106,56,5,0,73,149,130,122,
+  35,27,199,95,155,2,210,185,66,60,2,79,252,255,1,148,
+  93,225,252,139,225,149,82,135,130,77,253,127,191,159,74,32,
+  178,180,132,113,211,10,38,189,116,6,134,150,13,64,58,141,
+  205,208,145,201,32,161,172,132,9,40,106,147,158,7,20,179,
+  1,139,217,37,36,149,48,3,197,250,210,163,128,98,125,96,
+  177,9,9,126,37,44,64,177,73,233,110,64,177,73,96,177,
+  41,9,86,37,172,64,177,89,233,70,64,177,89,96,177,57,
+  9,106,37,108,64,177,69,233,114,64,177,69,96,177,37,9,
+  66,37,236,64,177,61,233,92,64,177,61,105,60,64,177,125,
+  64,215,229,24,53,249,93,240,43,117,252,197,144,100,32,144,
+  46,161,80,197,96,5,20,245,8,118,184,224,96,96,200,192,
+  224,229,144,206,114,225,0,84,133,3,84,133,4,80,133,4,
+  166,10,6,32,96,180,99,148,96,204,2,195,20,32,84,0,
+  138,184,128,161,29,163,29,3,195,127,32,0,0,159,146,119,
+  237,60,1,0,0,
+};
+/* sidmon2 data */
+static const unsigned char dat_sidmon2 = {
+  31,139,8,0,0,0,0,0,0,3,173,85,109,104,91,215,
+  25,126,238,149,116,45,223,40,182,172,202,33,22,153,171,42,
+  86,34,43,138,39,123,146,151,26,37,187,186,177,101,89,115,
+  213,196,110,198,210,5,102,149,78,215,40,177,81,51,43,20,
+  161,181,74,71,179,252,91,126,148,108,133,193,194,24,197,152,
+  49,76,201,143,16,74,215,180,164,152,108,80,85,118,187,53,
+  203,18,83,2,77,188,180,120,101,140,68,36,209,158,115,229,
+  180,46,235,24,29,189,226,156,231,61,239,247,121,207,123,142,
+  38,0,53,93,72,23,38,32,181,36,63,170,223,183,223,129,
+  132,63,44,75,143,221,193,181,85,236,46,1,152,53,231,115,
+  230,188,96,206,127,225,220,138,211,37,196,107,152,29,170,169,
+  225,252,64,101,174,94,243,150,125,185,122,45,242,193,150,14,
+  247,137,246,131,144,194,29,183,146,227,90,84,171,223,205,107,
+  126,13,178,30,132,146,87,125,155,171,47,123,143,239,95,168,
+  223,246,166,134,106,246,174,231,44,99,137,34,244,28,146,93,
+  47,94,62,145,129,156,31,90,65,106,255,59,245,79,242,240,
+  22,49,19,246,86,206,99,218,167,13,213,154,110,31,251,14,
+  229,103,247,255,177,94,163,254,160,183,121,172,108,47,3,94,
+  205,87,196,96,120,160,249,21,223,201,163,232,235,134,181,122,
+  252,221,11,123,111,66,99,148,79,70,175,61,95,79,23,240,
+  21,63,81,139,70,13,226,181,230,177,177,0,20,71,0,22,
+  40,89,171,78,154,107,171,147,99,62,0,105,10,120,159,60,
+  147,255,221,90,211,152,126,128,153,166,51,144,110,17,79,17,
+  175,19,171,196,43,220,173,155,184,180,251,0,78,43,7,202,
+  32,127,27,247,51,74,156,36,14,18,231,136,49,226,45,98,
+  36,3,204,57,123,160,204,115,24,53,97,245,249,106,168,166,
+  172,228,45,187,130,112,238,156,131,71,195,238,57,116,106,86,
+  179,114,11,245,21,230,103,97,126,54,230,103,201,246,235,98,
+  229,36,45,103,149,182,82,189,14,153,114,153,30,102,153,141,
+  192,21,70,162,199,166,16,241,83,226,52,113,133,252,147,204,
+  98,134,120,137,120,132,124,7,241,233,198,238,228,67,41,238,
+  217,144,51,74,163,190,201,143,110,175,14,215,236,206,189,53,
+  101,44,111,225,25,36,63,30,241,22,239,255,62,190,234,196,
+  182,133,212,36,60,217,103,19,156,73,109,54,28,227,156,229,
+  73,60,140,205,19,79,245,78,162,5,155,119,5,224,52,190,
+  215,181,239,40,102,208,23,128,26,9,192,81,61,190,244,194,
+  248,11,239,93,120,239,6,220,9,215,49,244,7,224,74,190,
+  245,231,89,184,83,28,135,93,103,57,63,237,59,87,130,148,
+  117,233,164,39,54,145,230,30,31,209,73,171,131,63,21,154,
+  131,147,112,177,19,68,85,142,156,190,11,103,222,226,253,129,
+  206,60,68,255,141,94,107,125,56,93,200,67,196,100,181,100,
+  95,241,222,135,139,85,119,47,176,164,147,254,87,164,215,139,
+  165,243,247,62,245,235,96,135,221,187,180,88,109,127,134,173,
+  49,76,250,205,53,250,81,246,244,80,186,224,203,65,203,120,
+  252,35,208,194,65,244,24,45,125,65,180,44,30,168,4,49,
+  28,213,208,147,46,28,133,63,142,30,142,190,20,245,13,101,
+  220,180,114,117,24,131,57,123,66,106,143,139,213,171,49,228,
+  167,84,210,223,226,221,137,166,11,164,190,233,234,56,188,252,
+  37,252,94,242,23,214,113,14,62,160,120,43,6,204,12,128,
+  243,164,29,250,28,124,196,109,196,0,49,196,209,207,177,39,
+  90,130,21,46,82,110,222,151,32,194,70,106,92,170,6,241,
+  232,223,71,124,197,187,43,139,23,184,147,77,69,120,218,110,
+  62,198,245,213,197,139,130,110,31,194,200,199,98,125,121,241,
+  162,255,32,172,209,131,176,251,115,244,227,41,98,160,227,242,
+  139,127,101,31,70,247,163,147,181,16,182,188,133,166,245,111,
+  143,194,213,187,15,201,227,149,56,107,225,29,174,217,158,172,
+  104,162,111,163,63,102,253,84,118,175,213,236,94,187,102,229,
+  172,106,74,186,32,164,25,88,158,100,151,93,229,56,150,121,
+  138,179,39,179,139,93,57,203,221,13,188,155,131,234,200,225,
+  135,80,167,91,184,19,226,3,75,71,110,83,25,234,148,18,
+  45,9,124,192,13,48,163,60,156,33,56,12,167,43,132,141,
+  175,6,241,237,172,61,89,166,159,129,116,97,140,171,116,129,
+  126,251,230,75,172,180,79,214,208,42,122,59,171,204,199,96,
+  155,114,85,180,189,53,56,195,236,10,226,75,233,127,0,230,
+  107,210,15,29,163,56,129,243,248,19,206,125,246,91,50,231,
+  85,225,205,8,10,127,71,186,88,223,136,209,41,188,88,39,
+  162,162,103,98,148,198,78,113,15,134,158,147,7,227,209,56,
+  246,80,103,143,17,57,236,89,36,151,82,117,62,135,216,84,
+  151,121,82,164,196,11,189,94,50,173,174,151,48,171,48,37,
+  145,135,248,194,202,221,124,151,229,27,73,87,153,253,172,56,
+  153,115,37,7,175,136,109,185,46,118,192,19,80,27,111,161,
+  176,24,228,219,44,42,32,232,6,149,202,193,149,205,154,187,
+  119,146,14,27,170,168,93,251,17,180,97,163,216,71,53,94,
+  141,83,219,81,137,207,151,36,76,89,243,72,8,159,142,53,
+  203,208,255,182,60,21,207,201,186,214,176,17,26,34,118,135,
+  6,39,71,91,186,208,150,67,20,182,70,70,187,203,154,189,
+  162,85,52,86,177,62,101,13,199,80,111,88,57,131,136,202,
+  64,171,241,122,155,6,169,225,37,21,66,179,209,178,37,132,
+  13,175,5,177,195,80,120,166,59,210,133,206,16,212,95,53,
+  181,39,176,131,146,102,74,118,102,149,118,241,254,237,164,124,
+  167,62,28,11,34,68,29,251,205,199,175,38,2,197,59,247,
+  183,68,242,72,158,248,91,78,212,104,205,171,205,244,218,68,
+  219,237,166,215,237,166,87,197,244,186,93,79,80,102,163,172,
+  123,205,111,55,53,186,233,53,160,15,83,203,186,230,247,55,
+  13,191,87,120,18,35,53,249,208,149,68,116,102,2,235,98,
+  72,102,12,11,253,108,53,99,108,53,99,200,102,140,173,148,
+  72,148,248,215,34,248,41,247,51,66,23,35,184,133,255,18,
+  24,33,38,34,228,196,171,226,231,107,144,224,61,77,147,219,
+  247,193,219,254,67,188,147,79,160,115,253,127,68,186,144,113,
+  136,147,184,158,20,21,110,100,49,114,11,226,212,92,70,151,
+  158,208,135,29,226,86,187,12,15,209,66,12,17,101,162,78,
+  148,136,169,116,97,139,155,25,74,215,248,194,188,198,49,253,
+  68,52,1,199,56,237,41,97,230,148,89,140,150,95,175,73,
+  167,250,191,32,181,146,231,206,118,125,182,182,137,122,174,211,
+  182,127,174,61,70,205,47,249,231,150,112,230,171,254,155,255,
+  151,79,198,252,215,228,201,138,55,190,38,79,118,84,254,127,
+  227,77,229,246,176,27,174,229,182,138,179,210,186,220,138,22,
+  239,198,9,199,153,13,55,54,104,234,47,85,52,231,237,55,
+  236,147,77,171,77,229,38,167,50,175,236,179,253,211,118,198,
+  54,106,131,245,156,117,198,26,177,220,182,188,97,57,105,249,
+  190,37,32,215,228,138,252,138,92,150,15,201,3,178,71,186,
+  43,45,75,23,165,223,73,47,73,63,145,38,165,113,73,147,
+  122,164,111,72,27,113,31,171,248,16,239,227,18,94,199,89,
+  204,241,84,126,129,159,227,103,120,30,207,226,25,28,198,143,
+  248,50,255,199,167,62,247,197,229,116,157,223,191,1,167,65,
+  145,61,133,10,0,0,
+};
+/* sndh_ice data */
+static const unsigned char dat_sndh_ice = {
+  31,139,8,0,0,0,0,0,0,3,75,96,96,144,171,97,
+  73,96,170,225,208,179,98,16,72,231,210,113,119,120,238,183,
+  45,129,193,237,190,95,41,3,16,40,121,240,76,240,116,118,
+  85,76,99,96,16,210,103,40,248,119,96,5,3,139,243,7,
+  14,1,5,249,68,14,223,95,255,239,233,116,250,93,244,120,
+  254,255,95,98,26,79,3,84,93,68,98,148,247,7,142,31,
+  137,33,26,158,58,158,119,15,168,249,201,169,38,50,48,132,
+  232,120,3,201,170,20,11,59,27,254,249,64,86,65,10,71,
+  1,63,144,46,178,99,172,97,182,80,174,98,190,225,114,209,
+  225,134,203,101,199,27,46,87,157,110,184,92,119,14,60,251,
+  255,93,224,185,255,207,60,38,51,240,7,158,255,127,199,231,
+  126,253,127,191,210,34,230,135,29,2,18,129,39,255,255,242,
+  43,77,212,74,81,42,98,72,84,73,17,115,254,197,176,163,
+  140,69,65,49,81,201,195,97,147,67,216,233,255,223,46,173,
+  100,16,145,85,5,170,251,179,247,76,158,156,95,233,61,246,
+  52,22,57,213,251,236,64,19,24,96,236,203,142,129,39,254,
+  127,241,43,5,234,238,43,97,78,188,19,114,234,255,159,10,
+  134,34,6,1,67,5,70,143,134,108,166,196,43,18,134,10,
+  108,55,28,211,149,128,42,202,74,24,19,119,129,84,192,228,
+  19,183,93,113,186,84,168,192,150,37,54,201,37,65,168,136,
+  161,128,181,228,127,226,140,20,150,2,142,18,251,196,89,151,
+  156,156,191,57,48,93,58,40,171,40,171,24,120,230,255,159,
+  4,134,255,65,245,255,25,248,24,254,51,176,3,33,19,3,
+  51,3,35,24,51,48,242,2,131,153,15,136,217,129,152,5,
+  136,25,57,25,25,254,255,231,96,97,98,100,224,102,97,103,
+  96,148,255,255,159,65,30,0,107,142,57,225,168,1,0,0,
+};
+/* soundfx data */
+static const unsigned char dat_soundfx = {
+  31,139,8,0,0,0,0,0,0,3,141,148,127,72,91,87,
+  20,199,191,247,230,153,62,196,105,112,65,36,56,23,156,108,
+  226,210,236,45,6,153,49,150,151,23,25,175,111,109,168,26,
+  130,127,140,18,251,135,79,182,234,172,93,70,43,46,254,232,
+  31,235,31,131,253,96,56,16,25,253,107,116,82,134,132,50,
+  42,140,78,198,6,82,10,141,34,34,93,87,75,75,167,140,
+  209,201,40,99,62,222,242,118,110,146,178,141,89,186,247,248,
+  156,115,57,239,158,123,207,61,247,155,164,129,202,52,48,79,
+  124,29,179,42,230,158,91,1,42,90,243,54,162,79,239,176,
+  13,26,191,160,111,79,22,252,103,69,52,182,195,189,225,136,
+  244,176,79,27,195,40,60,245,57,156,224,181,232,185,230,252,
+  238,103,189,234,178,45,225,200,214,100,97,117,57,111,243,254,
+  230,113,41,31,183,164,169,108,117,211,202,234,205,158,27,142,
+  21,179,164,177,108,117,108,15,91,187,104,179,29,135,86,108,
+  209,134,112,145,184,66,172,16,155,154,216,167,73,91,34,219,
+  88,180,190,68,166,148,81,252,242,159,249,47,79,160,6,179,
+  137,140,190,237,20,122,139,185,85,103,225,22,126,208,83,90,
+  107,0,236,34,85,229,36,50,89,215,225,61,128,253,118,212,
+  114,125,252,154,88,243,130,190,205,164,1,223,145,45,255,212,
+  166,13,249,166,13,207,45,27,117,84,235,78,41,67,241,154,
+  161,55,27,86,79,130,43,1,240,80,0,82,78,61,193,21,
+  214,169,194,221,161,130,39,50,255,254,54,252,147,194,210,119,
+  61,65,112,14,212,44,70,193,76,32,71,158,147,255,131,188,
+  139,124,61,121,137,188,143,252,1,179,129,172,108,14,37,50,
+  242,30,24,190,185,195,104,180,244,104,116,6,90,178,35,5,
+  254,54,188,65,184,184,134,26,163,219,228,221,218,43,51,165,
+  200,142,161,212,81,119,80,241,106,200,147,155,112,28,211,183,
+  24,51,165,164,158,222,189,103,24,221,131,52,83,81,252,160,
+  74,165,68,166,100,143,125,151,190,132,39,60,49,139,31,31,
+  133,210,33,186,215,167,222,215,253,163,50,18,249,123,231,181,
+  233,80,16,158,152,229,242,134,21,25,185,99,102,99,242,124,
+  250,161,54,229,17,149,200,233,219,165,145,56,121,122,45,76,
+  51,59,53,184,19,153,71,223,13,152,242,106,170,51,245,119,
+  76,204,164,168,251,163,114,212,63,206,63,19,186,123,94,111,
+  214,73,105,253,235,54,219,220,176,81,229,143,240,113,109,186,
+  54,36,35,91,249,235,23,107,69,85,20,239,182,249,176,229,
+  132,75,55,121,212,98,87,179,174,1,224,125,113,147,63,216,
+  116,12,207,143,194,138,219,252,89,137,240,67,242,50,106,218,
+  150,105,238,172,18,101,129,158,21,167,64,57,215,139,217,249,
+  172,171,245,75,84,118,142,160,26,210,60,41,96,142,148,64,
+  121,191,24,69,205,153,97,247,146,88,79,236,91,69,35,9,
+  98,52,92,214,103,111,81,171,74,132,221,110,138,176,181,156,
+  58,232,46,169,151,78,57,91,206,151,2,139,245,232,159,214,
+  102,170,82,206,159,116,243,11,94,161,16,142,221,157,74,67,
+  40,99,78,59,23,183,88,170,133,247,105,247,141,21,27,141,
+  7,79,249,105,155,174,211,58,32,147,229,168,109,111,211,37,
+  35,110,214,53,7,33,173,159,59,168,161,178,235,180,234,70,
+  117,123,16,181,105,239,63,163,122,57,90,220,131,20,115,57,
+  138,10,179,129,172,123,16,8,148,116,51,171,25,241,55,128,
+  70,45,78,191,250,250,82,108,131,98,95,77,64,125,11,112,
+  183,71,161,118,198,33,139,122,233,60,35,224,105,221,72,153,
+  221,90,178,43,5,79,219,3,120,69,31,95,58,112,72,116,
+  242,134,83,8,62,75,51,11,131,178,54,12,153,86,244,190,
+  56,34,154,68,253,148,33,145,165,21,149,32,188,211,197,59,
+  75,100,0,174,18,6,145,42,123,117,95,33,178,125,163,124,
+  223,168,180,111,84,126,146,214,255,247,83,174,197,213,255,216,
+  183,133,91,60,207,63,231,83,252,117,30,225,62,102,179,59,
+  236,123,118,137,125,194,222,101,67,172,143,169,44,200,158,97,
+  79,161,128,93,220,197,6,174,225,42,46,99,1,23,240,41,
+  62,192,123,152,196,25,156,122,220,43,254,45,81,75,52,18,
+  45,196,56,241,33,49,75,204,19,11,196,117,98,157,184,69,
+  60,160,146,191,165,102,249,136,28,113,133,106,167,92,87,43,
+  17,38,162,132,70,36,137,227,212,190,147,196,24,241,14,65,
+  107,75,89,98,198,161,231,47,255,254,134,57,32,6,0,0,
+};
+/* spacegun data */
+static const unsigned char dat_spacegun = {
+  31,139,8,0,0,0,0,0,0,3,237,88,127,108,91,213,
+  189,255,222,235,235,95,55,142,227,56,105,72,83,19,220,54,
+  47,50,37,164,137,211,86,165,202,90,59,45,52,53,196,11,
+  77,86,181,12,189,218,137,125,237,180,142,227,57,182,251,99,
+  81,72,251,186,190,14,74,215,135,80,53,77,136,77,136,237,
+  241,38,244,20,109,104,218,38,86,5,54,177,194,208,83,6,
+  93,65,60,198,96,15,88,65,60,64,19,98,37,45,228,125,
+  206,185,215,247,58,215,121,123,219,222,254,228,84,247,251,61,
+  223,243,57,223,115,206,253,124,206,57,215,105,140,164,214,104,
+  49,90,236,220,66,209,212,199,29,59,163,151,232,243,242,121,
+  249,188,124,94,120,25,88,160,11,183,46,92,93,136,199,148,
+  61,3,11,87,95,248,217,5,197,211,185,229,90,83,156,232,
+  52,243,49,162,19,29,253,237,145,91,23,62,189,20,239,85,
+  130,157,235,168,3,88,174,243,38,238,211,254,3,52,136,182,
+  13,168,103,59,183,92,61,159,178,117,236,188,185,159,36,224,
+  172,173,63,90,196,168,23,251,206,69,139,235,162,157,173,231,
+  159,220,55,48,52,156,18,163,197,173,173,231,167,102,72,241,
+  110,109,149,118,238,27,120,235,139,29,173,175,222,255,15,39,
+  115,20,123,123,54,196,110,171,171,15,34,91,102,30,43,16,
+  35,255,156,114,245,255,97,241,51,220,95,231,238,248,221,61,
+  139,209,162,214,50,173,182,76,163,133,141,60,67,251,6,240,
+  82,2,124,148,4,34,248,59,17,59,224,135,224,31,132,31,
+  134,255,46,252,151,224,95,130,31,132,63,5,191,23,254,61,
+  248,125,72,151,224,239,130,111,131,255,50,124,7,252,221,240,
+  93,240,88,150,240,52,252,8,209,170,40,252,40,242,78,195,
+  39,224,207,154,217,29,202,197,71,147,254,157,197,172,63,159,
+  204,101,226,71,104,32,94,40,164,147,135,252,67,99,227,227,
+  19,217,196,164,127,189,127,215,120,60,149,156,244,15,77,40,
+  133,67,241,124,210,127,179,255,139,163,201,120,214,31,232,190,
+  229,150,224,141,52,144,239,28,42,28,25,61,120,24,13,93,
+  235,187,54,174,191,101,243,141,116,235,2,121,35,15,40,114,
+  120,129,158,111,59,197,180,138,22,217,124,136,95,238,158,138,
+  22,133,107,219,23,40,131,218,39,150,51,171,119,89,206,118,
+  79,197,124,214,198,104,209,127,116,81,1,159,79,224,249,17,
+  234,123,182,47,212,236,168,31,99,140,193,130,47,88,145,172,
+  176,22,146,96,37,114,194,90,201,1,107,163,90,88,59,213,
+  193,58,200,2,235,36,59,172,76,53,80,163,217,251,242,157,
+  23,22,23,98,100,185,178,38,64,226,11,143,145,109,251,135,
+  205,62,120,247,173,240,225,203,228,243,59,242,212,214,242,235,
+  217,0,121,91,82,94,151,64,130,226,176,29,199,220,159,197,
+  222,191,120,44,246,118,180,24,107,33,114,189,105,176,87,91,
+  241,173,138,126,2,211,204,172,216,206,173,143,89,225,35,182,
+  43,114,212,51,71,228,204,115,123,148,219,52,183,7,122,174,
+  45,46,194,79,245,92,195,250,201,153,129,199,91,58,179,108,
+  61,107,47,160,182,215,239,153,63,181,150,245,29,70,155,196,
+  219,6,115,228,9,144,58,102,9,53,129,215,14,111,191,76,
+  182,181,207,162,118,55,106,39,121,45,214,21,32,233,141,189,
+  107,250,95,156,227,113,98,205,17,134,7,123,145,253,20,106,
+  5,140,212,237,161,249,16,111,143,117,117,19,169,189,219,118,
+  237,189,119,237,115,104,155,110,143,160,207,141,36,188,209,15,
+  75,191,153,227,173,151,120,155,133,183,137,47,205,173,253,21,
+  59,10,218,91,158,228,246,53,102,229,77,13,172,126,156,219,
+  87,152,149,131,188,126,130,219,175,113,251,42,183,191,229,232,
+  6,110,55,242,17,30,224,246,93,62,78,31,175,95,228,245,
+  14,110,79,240,150,167,121,189,133,91,149,221,103,120,189,149,
+  219,18,231,237,28,183,239,51,43,223,198,235,223,226,246,143,
+  188,37,194,235,15,115,251,49,111,137,134,161,155,124,178,171,
+  151,4,240,36,23,104,118,138,234,20,169,177,151,174,212,99,
+  55,12,135,238,124,118,241,61,245,140,107,106,165,215,94,115,
+  176,45,176,120,138,214,94,115,234,53,89,171,241,126,196,250,
+  69,139,108,55,236,226,227,223,14,91,147,25,96,245,199,35,
+  140,253,116,74,138,145,112,151,116,68,221,1,188,45,171,224,
+  172,107,179,228,122,62,97,59,132,239,14,86,155,142,99,129,
+  188,118,9,181,0,95,117,39,106,173,57,226,185,71,83,254,
+  62,238,121,52,117,176,61,71,93,183,168,123,77,221,115,177,
+  117,54,117,174,188,235,8,133,152,87,136,206,241,62,133,221,
+  161,89,150,85,82,108,60,62,204,185,45,248,249,238,249,245,
+  28,212,247,228,137,71,177,249,80,176,11,187,102,31,223,65,
+  131,47,62,245,183,236,28,141,159,188,227,39,220,31,215,252,
+  43,170,151,131,229,247,181,252,160,252,190,150,199,202,239,107,
+  121,88,203,206,65,49,217,127,199,118,214,254,80,195,203,140,
+  121,239,60,247,34,78,254,135,170,98,56,45,18,211,10,188,
+  126,184,38,77,228,169,71,100,87,72,20,197,0,29,35,169,
+  47,77,59,186,167,208,161,107,218,226,197,218,47,59,197,16,
+  133,222,116,204,8,145,80,202,59,155,166,198,20,174,128,238,
+  16,53,14,133,226,184,246,213,55,20,137,234,242,132,254,34,
+  246,10,70,35,199,180,8,45,219,34,33,165,41,18,86,152,
+  174,205,245,97,234,114,224,132,18,139,100,190,167,100,126,6,
+  51,184,235,22,16,11,202,166,70,240,36,246,209,182,39,166,
+  104,155,98,219,16,32,57,38,93,76,83,211,78,182,87,158,
+  111,236,241,51,180,238,173,177,238,48,5,49,150,192,198,162,
+  243,200,21,149,222,191,62,23,86,228,35,76,97,4,151,210,
+  146,35,214,215,245,168,167,199,67,245,33,186,173,123,10,251,
+  100,7,240,187,129,215,42,46,109,31,30,69,75,4,45,53,
+  138,183,220,194,223,99,10,237,65,180,59,148,117,127,217,185,
+  64,255,4,231,143,192,241,182,89,182,110,182,154,65,124,45,
+  30,132,14,253,171,211,212,76,109,176,62,10,192,250,169,163,
+  59,77,91,41,4,187,133,122,235,211,224,210,142,250,29,20,
+  205,17,20,233,195,179,199,17,192,23,64,74,201,216,23,15,
+  173,76,211,32,213,190,248,203,213,187,112,59,23,113,19,58,
+  56,203,110,174,175,195,241,24,172,20,179,13,205,32,207,17,
+  45,98,13,247,48,28,250,186,213,54,240,131,30,187,191,174,
+  230,207,131,75,180,202,120,118,7,113,99,118,151,128,186,234,
+  75,30,92,9,145,0,217,82,91,48,195,6,206,224,14,47,
+  24,140,132,83,254,13,130,24,166,58,135,136,61,225,134,181,
+  41,210,127,165,99,242,239,211,49,219,108,120,92,236,18,48,
+  214,38,60,155,49,122,104,62,212,206,78,208,112,251,36,62,
+  251,108,151,239,197,254,122,6,207,219,88,41,222,169,158,173,
+  218,198,173,189,251,32,108,147,255,38,178,173,14,81,115,100,
+  38,229,158,255,9,203,96,17,50,166,129,200,168,251,128,120,
+  116,196,7,228,84,12,183,128,231,38,108,220,80,202,135,153,
+  239,192,19,229,45,22,207,70,98,170,15,226,173,49,27,70,
+  48,198,244,243,30,18,114,136,58,131,116,121,23,184,170,195,
+  62,218,128,236,173,120,66,64,173,240,91,240,244,114,214,108,
+  220,218,241,221,13,80,4,89,87,160,11,226,148,15,28,245,
+  226,84,184,57,251,118,190,15,237,208,32,196,51,85,237,26,
+  209,39,138,62,54,220,101,239,106,88,52,242,24,53,167,182,
+  182,167,169,205,211,48,219,75,51,169,32,236,49,197,195,87,
+  38,160,189,249,165,185,213,183,83,27,226,85,253,51,208,138,
+  233,36,207,135,186,54,17,219,27,46,134,97,12,95,170,23,
+  125,3,218,24,93,166,49,124,124,140,128,62,198,110,166,181,
+  198,203,48,67,176,66,172,55,21,192,10,67,88,97,139,186,
+  31,131,1,218,132,150,205,63,100,43,221,204,118,161,182,234,
+  16,102,244,167,210,17,236,101,101,51,122,244,33,103,29,230,
+  233,224,243,47,166,248,106,217,206,245,174,194,232,29,252,171,
+  94,183,242,24,230,11,83,68,27,163,15,217,59,82,109,156,
+  199,214,60,129,245,126,111,128,110,51,250,70,4,197,198,79,
+  106,63,95,157,132,190,108,31,229,192,58,99,219,133,213,5,
+  129,224,164,43,210,217,112,76,156,15,51,62,208,130,155,8,
+  125,252,124,164,174,119,154,241,142,93,76,87,198,157,193,155,
+  54,194,158,179,97,220,111,1,114,175,156,241,208,240,177,215,
+  251,153,71,222,176,166,153,132,250,224,202,16,213,70,139,235,
+  201,211,65,117,115,1,242,32,174,243,223,80,110,153,9,80,
+  253,210,22,244,241,86,245,105,40,183,208,159,43,54,252,230,
+  171,40,236,123,86,89,132,250,207,132,63,57,254,236,8,127,
+  83,177,54,124,42,126,224,249,251,143,235,92,113,85,250,157,
+  255,239,51,150,0,169,241,227,24,4,225,122,188,226,192,143,
+  96,185,170,143,251,3,119,115,237,128,235,76,205,43,53,235,
+  229,111,56,255,228,76,59,222,112,196,237,239,216,15,217,93,
+  182,127,181,237,180,254,183,245,155,214,157,210,53,233,9,41,
+  39,117,91,62,178,60,105,57,105,25,178,180,137,31,139,207,
+  139,143,138,211,226,93,226,102,177,89,88,16,94,19,126,46,
+  124,95,120,64,248,170,160,8,187,133,109,194,205,130,79,112,
+  209,167,244,1,189,65,191,161,103,233,60,253,144,254,141,190,
+  77,231,232,12,157,164,123,232,16,125,133,14,80,130,246,211,
+  62,26,198,237,124,59,237,164,237,180,141,122,105,51,109,164,
+  32,173,167,155,105,29,5,168,157,218,104,13,110,252,86,220,
+  253,171,104,37,190,3,77,180,130,26,169,129,188,84,79,158,
+  27,110,184,161,181,181,245,250,235,175,247,249,124,171,86,173,
+  106,105,105,89,185,114,101,115,115,243,117,215,93,215,212,212,
+  180,98,197,138,198,198,198,134,134,6,175,215,91,95,95,239,
+  241,120,234,234,234,220,110,119,109,109,173,203,229,170,169,169,
+  145,101,217,233,116,58,28,14,187,221,110,179,217,172,86,171,
+  36,73,22,139,5,63,2,4,1,31,46,178,86,20,169,162,
+  88,42,138,88,81,132,138,242,255,209,238,175,29,255,204,153,
+  211,167,239,187,239,222,123,191,30,14,135,251,254,130,130,221,
+  33,136,162,197,34,73,86,171,205,102,183,131,2,7,152,112,
+  130,16,25,188,212,184,180,82,171,21,183,86,234,180,162,28,
+  222,63,145,197,188,143,16,251,219,165,144,28,207,77,148,163,
+  204,104,247,254,44,3,121,116,22,81,65,143,206,140,6,43,
+  176,203,136,12,236,237,209,30,3,147,67,136,116,76,222,58,
+  54,57,18,159,76,106,61,19,227,241,195,185,137,73,45,42,
+  229,226,5,35,202,231,50,21,61,239,206,77,84,68,177,194,
+  232,68,49,91,208,162,44,134,79,234,179,59,138,185,68,188,
+  160,245,180,55,197,143,236,31,77,143,229,212,217,79,242,55,
+  82,20,181,231,191,176,40,87,200,171,209,247,16,229,242,201,
+  148,26,157,230,111,91,238,249,13,22,233,61,31,65,84,210,
+  123,222,143,232,144,142,125,159,243,82,206,123,135,69,58,246,
+  25,34,99,134,55,57,103,229,158,127,96,145,222,115,1,145,
+  49,195,91,136,244,25,100,145,179,171,229,201,97,22,233,216,
+  30,68,250,12,114,47,103,190,220,115,27,139,244,158,187,17,
+  233,51,200,95,64,100,204,112,215,104,186,123,63,56,84,103,
+  159,30,77,7,141,232,210,104,186,71,143,228,206,196,68,34,
+  201,254,139,129,69,214,239,140,79,36,184,72,188,231,222,236,
+  196,216,36,147,133,71,29,208,246,64,113,92,213,193,57,149,
+  79,78,22,226,121,109,204,195,147,201,194,161,120,73,205,179,
+  109,229,106,150,121,105,41,20,179,201,253,229,81,210,154,154,
+  65,62,251,67,96,158,79,207,49,166,173,146,137,167,38,121,
+  116,28,209,88,246,80,118,148,71,207,51,165,217,210,120,244,
+  45,166,166,30,157,99,81,62,158,85,243,30,100,106,234,216,
+  195,96,222,152,225,53,68,198,12,175,32,210,103,144,219,152,
+  210,122,222,31,153,154,122,244,62,139,244,25,222,99,106,234,
+  216,199,96,94,159,65,222,132,72,159,65,14,34,50,102,152,
+  98,74,151,243,228,8,83,83,143,110,99,81,121,6,121,7,
+  83,83,199,162,80,133,147,205,231,27,84,85,81,20,30,109,
+  69,116,116,127,33,62,194,162,154,76,118,162,144,44,71,242,
+  227,80,108,36,159,140,31,228,61,143,226,96,142,21,198,38,
+  178,60,42,64,49,125,213,214,57,174,81,105,36,195,34,177,
+  189,52,54,50,90,30,197,181,163,52,145,49,162,71,71,146,
+  217,4,11,31,233,103,127,193,140,44,185,41,193,124,247,166,
+  145,177,2,195,156,23,75,102,44,158,207,197,19,28,251,247,
+  132,25,83,57,99,216,63,5,205,152,202,32,195,158,171,154,
+  15,215,79,105,130,99,191,200,152,49,188,134,54,223,19,85,
+  243,1,75,36,57,246,211,229,242,38,115,28,59,191,92,94,
+  137,191,187,243,7,203,229,29,86,215,242,163,188,25,99,167,
+  67,197,158,201,46,197,130,6,103,114,71,201,140,233,156,201,
+  182,132,25,51,56,251,207,160,25,211,57,147,215,140,152,49,
+  157,51,217,151,49,99,58,103,178,171,106,62,157,51,217,187,
+  92,158,202,153,220,180,92,158,202,153,44,47,151,167,114,38,
+  187,243,102,76,231,76,110,53,113,214,83,193,217,137,146,25,
+  51,56,251,199,132,25,211,57,147,123,130,102,204,224,236,232,
+  136,25,51,56,43,100,204,152,193,89,162,106,62,131,179,3,
+  203,229,105,156,101,151,203,211,56,27,89,46,79,227,76,201,
+  155,49,131,179,210,82,206,216,255,35,227,171,195,57,179,190,
+  158,92,130,241,223,12,96,134,239,37,246,55,74,37,198,110,
+  134,177,236,24,195,168,185,80,141,29,28,203,48,76,248,104,
+  233,58,217,66,216,165,197,199,28,94,154,135,243,192,174,17,
+  117,190,217,165,164,141,242,15,151,118,110,167,19,121,19,198,
+  52,82,56,246,31,249,175,152,176,76,124,178,80,226,216,133,
+  137,140,9,51,238,137,167,51,138,9,99,87,168,58,230,11,
+  85,99,50,44,203,177,249,226,120,21,86,72,170,121,247,46,
+  147,87,72,170,121,167,170,242,140,187,231,199,153,145,106,76,
+  225,124,58,191,22,79,253,175,216,137,212,50,121,218,157,245,
+  100,194,140,49,41,84,62,231,146,102,94,24,166,174,243,1,
+  211,58,131,134,70,178,195,164,81,176,66,163,75,38,141,130,
+  134,70,114,187,137,151,160,161,145,236,55,105,84,121,47,181,
+  152,52,10,26,26,201,235,170,198,212,53,146,3,85,239,96,
+  104,244,251,101,242,202,26,189,94,149,103,156,91,143,73,163,
+  96,133,14,191,53,105,84,137,189,154,90,38,79,59,239,141,
+  9,51,166,107,36,55,39,205,188,24,26,189,107,90,103,79,
+  133,70,49,147,70,61,134,70,248,149,151,55,97,134,70,211,
+  38,94,122,42,52,58,108,210,168,242,30,204,155,52,234,169,
+  208,232,120,213,152,134,70,51,85,239,160,107,36,111,89,38,
+  79,211,72,222,92,149,103,104,148,54,105,212,99,232,32,111,
+  52,105,84,137,109,72,45,147,167,105,148,73,152,49,67,163,
+  92,210,204,139,174,145,220,183,116,157,137,9,252,222,141,103,
+  57,102,249,222,210,60,126,127,78,170,191,165,68,95,126,233,
+  37,137,38,252,25,236,194,131,191,7,241,167,160,11,143,199,
+  38,187,27,155,26,29,182,255,171,116,4,88,162,27,233,146,
+  13,169,14,155,236,96,255,144,232,118,187,48,0,10,107,119,
+  61,30,232,237,240,123,109,222,43,189,114,176,101,139,240,83,
+  162,255,1,190,41,160,201,250,33,0,0,
+};
+/* ssd1 data */
+static const unsigned char dat_ssd1 = {
+  31,139,8,0,0,0,0,0,0,3,237,88,15,112,28,213,
+  121,255,246,207,237,237,173,246,238,246,78,39,89,255,44,175,
+  100,3,135,144,245,207,66,35,219,87,233,78,18,214,89,182,
+  15,217,210,120,12,147,113,238,108,235,78,150,177,172,200,150,
+  49,142,170,40,76,48,98,38,241,56,77,134,33,204,132,82,
+  50,67,104,235,82,215,5,74,18,151,177,129,82,197,201,36,
+  194,48,196,33,19,32,174,137,21,226,56,138,3,174,56,212,
+  221,254,222,238,74,150,169,0,211,204,180,51,45,123,247,123,
+  239,125,239,125,239,251,190,125,127,190,247,189,77,18,233,73,
+  162,94,32,185,119,239,142,90,125,176,103,224,174,212,61,122,
+  122,207,160,190,119,123,67,35,101,90,179,230,249,186,19,137,
+  161,170,130,231,78,116,117,181,213,102,194,44,223,81,155,225,
+  19,67,117,39,146,212,84,208,21,29,253,215,120,244,66,124,
+  89,124,253,101,129,136,94,62,253,202,105,200,83,89,235,250,
+  179,18,189,50,158,164,220,131,168,121,62,73,92,16,249,37,
+  224,74,146,120,112,241,107,146,36,62,213,181,115,135,222,181,
+  103,168,127,135,222,214,179,119,103,166,191,103,80,223,118,143,
+  190,161,85,223,147,214,99,253,59,119,167,238,210,55,236,236,
+  239,209,87,174,88,190,242,86,125,127,207,96,149,94,91,85,
+  179,66,143,181,180,233,233,157,7,122,118,48,246,170,29,61,
+  233,190,212,238,170,234,170,237,189,61,219,119,13,236,217,217,
+  191,175,74,95,147,186,107,251,158,126,198,197,120,214,12,238,
+  233,234,214,59,83,251,246,245,12,246,235,45,131,61,169,93,
+  179,77,45,61,253,213,183,111,222,164,119,238,25,220,151,218,
+  221,211,191,111,207,108,75,251,96,234,96,207,61,213,157,241,
+  53,29,43,137,184,226,76,69,252,130,105,164,72,204,183,232,
+  162,76,254,154,153,155,40,69,194,195,41,162,236,198,247,25,
+  207,154,153,165,180,254,205,47,153,137,33,212,223,219,201,234,
+  138,88,153,219,108,181,23,89,53,197,137,33,66,63,122,41,
+  69,124,196,145,177,153,245,76,12,49,42,150,165,97,109,58,
+  235,6,60,64,46,144,7,44,2,10,129,98,96,177,252,44,
+  185,178,110,164,100,165,98,214,99,213,228,90,53,185,86,77,
+  30,228,180,233,211,156,14,104,64,189,62,77,73,180,8,217,
+  69,104,41,40,27,167,100,217,56,167,1,58,80,111,235,79,
+  236,165,79,249,48,139,175,207,26,243,241,192,217,172,27,240,
+  0,185,64,30,176,8,40,4,138,171,73,43,224,27,105,42,
+  187,248,100,132,220,95,110,204,46,214,151,4,102,232,100,182,
+  12,61,135,203,206,194,202,179,176,246,44,87,95,118,150,146,
+  87,71,171,108,6,35,122,156,146,24,99,131,149,249,40,167,
+  217,114,168,145,184,236,98,200,48,179,55,200,211,204,6,219,
+  54,139,139,56,29,45,66,182,216,106,47,67,59,57,246,186,
+  173,118,157,171,111,105,132,101,172,117,9,90,237,183,177,223,
+  18,35,56,127,182,140,31,207,142,165,173,215,209,248,236,60,
+  141,24,99,72,155,213,53,59,78,208,200,70,126,158,158,103,
+  175,234,153,167,97,154,167,214,44,233,53,17,106,46,63,187,
+  113,220,156,185,218,214,138,54,204,166,152,60,247,105,231,237,
+  255,218,19,203,202,119,178,209,192,40,125,62,104,141,82,98,
+  8,163,170,140,81,75,227,24,143,146,103,174,36,207,149,220,
+  99,164,217,165,147,99,252,128,20,56,105,183,160,247,21,228,
+  243,184,216,252,140,193,243,45,61,73,36,190,206,246,47,213,
+  93,171,191,124,149,121,241,120,132,234,50,91,142,127,223,188,
+  148,209,151,158,2,231,175,245,8,209,11,157,163,167,78,158,
+  32,50,77,171,247,27,45,223,67,122,78,95,101,190,56,241,
+  125,243,196,177,19,140,99,183,116,196,202,45,142,115,163,51,
+  194,100,221,42,243,232,10,70,189,115,36,214,17,77,67,247,
+  1,90,55,61,70,93,247,64,215,161,116,122,5,60,137,235,
+  115,172,92,126,112,177,82,179,106,177,82,71,23,226,111,175,
+  157,136,157,57,185,244,135,168,63,192,188,84,201,241,62,109,
+  197,12,69,65,239,103,30,168,228,120,82,218,196,36,236,87,
+  239,177,107,211,98,138,52,95,44,91,248,77,120,161,39,99,
+  217,130,73,228,143,131,174,67,254,8,232,179,41,146,227,41,
+  114,111,5,142,161,190,8,116,35,202,9,224,81,208,159,3,
+  29,70,185,9,56,98,239,136,194,120,71,152,86,165,251,59,
+  160,41,95,234,75,171,97,114,81,115,255,86,228,2,53,239,
+  222,188,33,235,191,92,23,38,234,216,188,171,227,248,214,221,
+  226,150,195,201,119,235,75,27,74,245,8,119,132,232,197,25,
+  250,206,232,243,39,79,89,189,41,45,73,163,56,172,200,78,
+  39,70,39,70,227,209,192,36,249,248,80,0,190,33,240,66,
+  182,216,218,231,238,100,137,189,175,28,93,62,71,151,36,63,
+  129,201,169,196,123,104,243,108,146,23,176,9,163,147,175,58,
+  86,197,63,193,42,254,90,171,222,30,115,108,170,135,77,75,
+  96,83,161,229,49,108,155,92,31,109,211,162,159,88,54,13,
+  90,50,149,190,62,135,111,155,195,119,231,134,172,239,180,99,
+  81,226,19,44,18,63,194,162,110,219,39,221,15,127,10,219,
+  108,63,232,177,236,66,190,176,93,204,187,104,17,50,97,95,
+  213,48,63,226,74,145,235,215,177,108,254,196,48,55,130,181,
+  226,122,29,245,189,114,152,56,88,46,15,211,136,128,186,151,
+  154,34,110,42,37,255,215,216,62,92,212,225,180,14,212,192,
+  246,32,48,226,180,53,69,56,42,229,88,201,122,239,10,164,
+  157,153,101,224,230,169,50,83,34,51,43,42,51,161,201,120,
+  83,36,103,174,135,106,229,206,74,10,58,150,42,142,229,124,
+  82,109,138,200,84,26,38,159,173,59,191,98,86,103,83,132,
+  159,147,33,252,41,90,229,133,181,122,230,107,149,174,106,21,
+  231,100,184,254,20,173,202,194,90,149,57,173,137,161,142,64,
+  134,184,254,93,196,63,27,188,153,120,149,163,230,109,196,221,
+  24,136,209,202,218,54,90,31,104,163,198,13,217,124,109,128,
+  180,48,173,156,136,78,68,245,6,162,178,40,69,222,26,235,
+  160,76,8,123,240,240,32,5,169,139,59,19,59,19,43,219,
+  175,17,197,103,91,124,23,63,212,210,246,86,220,105,201,183,
+  90,98,115,45,81,188,245,74,62,70,205,183,97,255,120,46,
+  254,42,246,234,169,154,10,162,218,40,85,4,250,216,187,214,
+  246,145,72,85,40,11,180,188,172,143,36,82,144,206,80,13,
+  108,12,161,164,80,62,56,124,84,212,254,14,105,101,235,72,
+  67,189,142,250,41,42,71,253,187,116,35,234,71,241,14,129,
+  58,154,92,123,91,54,183,151,143,146,31,124,37,157,147,20,
+  102,229,122,122,181,165,190,78,167,115,125,181,45,196,55,208,
+  107,189,84,243,90,107,67,93,13,157,219,245,96,75,109,43,
+  213,79,244,82,221,68,180,6,254,250,92,239,145,22,88,214,
+  128,241,226,50,37,223,236,37,49,254,60,255,101,172,121,243,
+  5,88,175,252,205,125,167,50,18,164,72,73,165,182,23,182,
+  139,176,69,210,110,38,1,122,150,4,160,107,243,3,193,194,
+  139,158,14,46,147,180,231,49,125,39,70,157,203,52,32,229,
+  51,5,232,83,64,33,164,203,72,183,118,210,42,102,99,98,
+  8,53,249,86,125,249,135,234,219,72,102,163,192,222,248,106,
+  61,74,216,59,137,161,145,156,97,245,160,23,186,238,178,164,
+  247,34,21,50,216,244,86,188,101,173,158,180,86,116,127,113,
+  47,85,19,95,116,8,121,21,242,251,208,66,180,60,45,107,
+  121,199,194,180,60,35,161,126,57,241,142,38,221,145,15,77,
+  182,150,140,58,63,114,187,26,85,252,183,228,91,239,119,61,
+  26,228,73,214,142,156,141,225,170,116,185,122,51,230,159,79,
+  43,43,102,76,211,58,161,52,212,248,81,35,59,53,79,97,
+  14,120,54,215,111,71,217,222,40,121,106,87,62,86,4,230,
+  37,62,202,214,117,229,23,73,79,60,184,229,129,196,144,93,
+  87,9,30,229,104,100,116,203,3,43,94,100,220,236,180,206,
+  197,89,23,124,28,120,18,120,6,120,14,184,4,252,4,48,
+  128,55,192,227,3,74,1,172,223,92,236,149,220,22,187,95,
+  110,180,108,70,150,137,198,168,118,134,215,184,242,196,222,121,
+  52,217,180,199,227,208,53,92,195,53,180,110,211,138,226,208,
+  157,92,240,26,58,202,232,196,222,202,8,199,113,204,83,252,
+  89,38,92,217,75,109,216,101,165,136,38,140,30,177,43,145,
+  12,150,37,168,141,237,184,170,213,90,176,172,157,18,137,33,
+  86,83,182,134,149,88,236,193,57,9,231,20,172,159,45,175,
+  41,115,35,228,197,131,165,88,63,102,38,132,212,72,75,93,
+  137,96,149,105,66,70,188,131,75,51,175,143,181,108,205,7,
+  188,127,198,199,172,72,75,72,111,207,240,222,81,203,151,87,
+  102,90,64,71,210,190,85,17,137,138,194,116,75,14,60,80,
+  178,18,146,163,142,228,114,71,242,97,71,114,212,226,228,114,
+  108,255,151,200,240,254,81,120,44,230,9,73,24,117,188,224,
+  38,120,54,47,53,167,155,70,184,200,240,24,89,158,138,38,
+  194,212,117,91,86,216,134,249,110,46,57,65,57,139,7,97,
+  21,143,146,186,120,152,149,54,161,29,253,154,169,107,143,8,
+  31,215,149,236,96,105,96,152,52,242,37,155,224,135,67,203,
+  122,73,11,98,183,135,194,228,255,13,255,42,199,183,144,121,
+  91,214,87,25,24,212,137,124,155,162,199,176,79,211,34,56,
+  243,81,42,234,145,236,245,8,191,16,66,157,148,169,217,85,
+  0,143,33,162,141,223,205,118,13,243,237,60,90,197,100,254,
+  108,125,255,53,245,56,161,229,51,189,164,168,49,90,189,157,
+  31,164,218,24,232,216,109,89,111,67,93,157,70,245,97,82,
+  207,167,208,46,170,108,36,155,211,229,173,89,254,69,120,241,
+  245,241,251,3,95,24,32,106,196,27,173,183,218,214,239,150,
+  240,30,156,69,137,14,231,195,159,200,233,114,56,191,5,206,
+  13,179,156,221,40,163,77,165,13,187,137,123,12,35,196,40,
+  201,225,92,187,128,204,232,53,50,221,14,103,197,2,50,117,
+  200,100,156,188,69,201,224,212,193,89,190,128,204,26,200,100,
+  115,196,202,30,135,47,48,95,226,166,171,18,69,199,70,5,
+  124,209,214,44,247,155,143,227,67,251,223,46,160,79,156,167,
+  47,199,150,195,75,11,240,105,179,124,144,19,95,64,79,112,
+  158,61,42,228,52,90,235,182,206,89,181,21,232,117,8,189,
+  54,197,239,215,106,7,8,231,66,35,91,171,47,247,146,142,
+  254,108,77,87,208,38,171,63,43,243,246,123,211,7,31,49,
+  59,150,30,172,251,70,236,77,108,221,140,130,149,210,192,206,
+  238,36,91,83,245,144,200,180,135,51,13,88,109,58,86,118,
+  73,8,43,59,126,47,219,141,25,233,76,139,253,179,214,244,
+  50,107,77,151,163,116,99,15,147,26,198,218,212,177,22,201,
+  217,101,226,198,159,206,60,60,2,255,139,54,95,98,104,234,
+  220,171,227,207,29,127,226,145,7,15,31,26,57,240,133,190,
+  29,159,191,163,251,246,117,237,173,205,145,198,91,235,170,151,
+  175,14,223,184,172,92,47,45,41,46,44,200,207,11,229,6,
+  3,154,223,231,85,115,20,143,236,150,92,162,192,51,15,99,
+  178,132,199,79,32,147,249,30,158,23,4,81,116,185,36,201,
+  229,18,69,65,224,121,230,143,156,38,211,227,113,185,4,1,
+  69,155,145,113,18,199,155,88,64,110,44,76,23,38,79,96,
+  183,114,230,195,152,68,17,85,18,84,88,46,141,231,121,164,
+  232,132,84,20,69,164,46,151,203,212,252,154,79,243,106,170,
+  150,163,41,154,71,147,53,183,38,105,46,77,212,4,13,110,
+  90,195,227,145,37,17,6,154,88,125,255,69,13,47,136,46,
+  201,45,123,76,90,99,221,51,112,242,89,145,189,147,139,240,
+  177,206,119,2,246,205,38,95,114,104,157,171,183,104,217,161,
+  163,156,102,209,138,77,123,195,156,190,113,30,63,232,250,141,
+  243,248,65,107,27,29,254,165,51,236,198,65,36,61,233,148,
+  27,231,149,255,98,94,217,226,89,145,245,244,226,52,59,102,
+  105,35,43,229,173,84,180,237,179,173,154,181,5,107,228,2,
+  157,108,207,154,211,29,93,105,95,231,43,41,242,35,118,255,
+  221,99,41,250,253,147,235,223,20,224,107,217,221,178,228,73,
+  118,218,47,29,199,61,240,171,214,157,113,76,63,232,59,27,
+  155,228,69,86,231,185,4,234,165,45,99,43,38,192,249,12,
+  171,113,109,101,169,114,180,123,140,229,121,63,118,242,23,157,
+  188,197,201,33,129,14,88,165,14,43,29,180,210,225,214,108,
+  206,189,144,120,32,54,217,34,170,15,173,77,172,185,61,35,
+  198,178,252,248,192,146,242,179,214,119,141,108,138,104,198,254,
+  190,146,162,169,154,133,190,230,180,52,126,220,183,28,180,126,
+  220,151,28,206,73,175,249,158,147,10,218,223,228,236,239,115,
+  118,132,18,203,122,206,205,197,45,236,107,22,59,33,222,178,
+  34,154,183,172,114,196,74,15,35,218,121,19,88,13,124,45,
+  134,187,57,246,121,249,160,90,83,200,141,17,109,252,161,57,
+  173,157,32,183,166,97,237,98,172,169,25,158,130,103,51,51,
+  127,129,203,88,154,10,156,149,138,45,154,242,181,88,55,243,
+  150,70,190,62,73,244,48,238,237,88,252,121,77,3,75,98,
+  176,45,47,94,21,65,71,23,70,49,82,62,30,155,20,8,
+  35,54,109,243,148,31,98,61,245,195,108,181,228,13,176,187,
+  191,85,58,136,210,96,107,86,189,130,247,9,14,122,246,241,
+  45,97,170,42,91,139,56,187,157,10,224,25,74,80,46,69,
+  121,25,202,97,204,217,166,141,167,205,55,18,67,44,106,42,
+  223,95,179,74,153,128,95,129,220,188,231,183,75,53,43,145,
+  159,102,107,70,63,108,89,243,26,218,143,105,53,108,134,232,
+  75,86,253,145,88,86,121,140,197,99,75,167,172,239,33,131,
+  120,87,43,16,49,173,135,112,2,98,115,187,240,186,60,247,
+  24,124,176,224,42,162,58,18,165,49,156,61,46,229,86,218,
+  65,146,239,247,52,78,238,121,188,33,240,62,106,241,22,162,
+  93,20,162,22,111,29,184,36,223,163,120,113,183,127,221,167,
+  225,157,39,185,116,30,247,131,87,185,185,202,5,36,95,7,
+  175,105,50,71,101,185,41,59,26,19,28,135,197,57,21,252,
+  135,192,57,60,215,243,92,47,223,255,226,83,248,85,224,48,
+  240,32,240,16,240,48,240,109,224,175,0,196,221,133,127,15,
+  252,3,240,143,192,211,0,246,103,225,15,128,83,192,105,224,
+  117,224,60,112,1,120,7,184,8,92,1,176,155,139,32,191,
+  72,2,16,159,23,5,128,2,160,4,88,6,220,4,84,3,
+  181,192,42,0,231,93,81,27,176,6,72,0,157,64,23,176,
+  5,216,10,36,129,30,160,31,64,100,89,116,55,240,21,224,
+  126,0,246,23,125,29,128,253,69,176,185,8,246,22,225,158,
+  80,4,239,85,244,83,224,103,192,219,192,111,129,203,0,179,
+  13,119,135,98,204,103,177,11,200,3,96,91,49,108,42,198,
+  29,162,24,123,166,56,2,180,2,107,1,216,82,12,59,138,
+  239,2,70,128,111,0,143,1,223,5,254,14,56,6,60,5,
+  252,19,240,61,0,186,139,255,5,248,17,112,6,192,24,21,
+  255,27,128,177,41,126,15,128,238,18,55,160,93,15,52,83,
+  9,248,3,94,85,54,69,83,48,117,221,244,0,186,71,69,
+  34,202,190,96,126,81,169,161,227,23,48,116,217,240,122,140,
+  92,159,154,35,26,186,94,168,184,112,218,27,179,199,165,115,
+  250,27,94,193,235,242,6,164,128,100,248,242,12,127,129,81,
+  96,74,121,106,158,59,79,204,147,77,221,244,231,135,242,131,
+  1,47,180,20,104,178,25,42,46,44,94,148,31,52,107,100,
+  179,218,85,45,172,230,76,89,235,52,67,65,205,167,42,178,
+  25,148,205,252,96,248,150,213,55,135,97,24,31,172,229,110,
+  112,53,72,166,146,163,122,125,126,243,102,206,204,49,113,85,
+  34,159,40,154,183,152,121,188,169,34,128,48,189,94,47,39,
+  152,156,25,18,21,86,35,250,68,77,12,34,208,240,48,168,
+  72,172,219,15,11,37,56,147,227,13,68,34,136,58,144,25,
+  110,68,15,136,69,236,77,233,243,251,125,170,76,6,11,47,
+  120,129,16,223,24,72,201,155,227,113,187,4,220,102,120,159,
+  181,163,57,205,80,17,114,168,94,131,103,1,8,114,123,63,
+  251,89,68,164,146,33,177,245,111,20,134,252,138,11,178,56,
+  114,171,152,151,2,52,132,20,50,4,209,144,93,214,35,58,
+  33,145,33,187,13,107,12,103,3,16,197,144,21,195,35,219,
+  143,219,237,70,248,100,120,36,195,30,1,195,78,185,28,78,
+  229,188,70,88,180,126,198,213,190,115,241,152,49,87,154,109,
+  51,148,5,194,30,195,25,246,217,94,58,142,87,67,9,81,
+  72,49,20,151,129,81,51,217,159,133,93,220,172,5,156,69,
+  112,118,22,182,31,135,100,245,188,253,51,156,28,53,130,253,
+  51,156,28,53,162,253,67,47,187,244,113,5,204,204,81,161,
+  91,188,44,221,139,179,177,87,121,58,231,188,122,217,251,11,
+  223,35,254,70,255,227,254,119,52,242,191,131,188,209,247,136,
+  247,23,234,229,156,243,202,211,158,94,153,164,123,197,203,66,
+  55,119,20,243,208,61,115,244,3,223,251,35,211,116,229,161,
+  247,214,189,91,242,71,223,229,27,254,176,109,106,124,234,206,
+  169,252,41,2,238,156,26,255,195,182,203,55,252,209,247,110,
+  201,123,235,174,60,52,77,239,143,124,224,155,57,106,116,95,
+  143,151,155,125,235,249,101,222,14,78,231,202,188,21,166,206,
+  82,130,21,233,90,52,239,132,189,136,144,237,144,152,119,40,
+  73,186,54,122,118,187,63,68,202,54,109,145,160,100,15,163,
+  209,60,75,42,22,45,138,22,233,81,148,28,178,216,89,95,
+  139,84,201,102,159,37,189,179,209,47,163,217,36,95,141,134,
+  157,125,71,254,151,125,151,124,139,188,27,212,231,114,126,158,
+  83,173,28,246,252,187,39,35,191,37,167,220,147,238,187,221,
+  170,244,93,169,221,245,59,215,67,174,118,113,70,124,74,28,
+  16,107,133,119,133,31,8,247,9,93,194,82,254,10,255,35,
+  254,59,252,159,243,119,240,141,124,1,151,229,126,201,61,207,
+  253,53,247,117,238,139,92,15,183,145,107,226,42,185,18,78,
+  165,255,160,75,244,43,122,21,167,243,63,211,113,122,130,254,
+  18,39,235,97,58,68,35,116,55,130,211,62,156,224,91,233,
+  14,234,166,219,105,29,181,83,43,238,251,171,17,1,222,138,
+  136,161,154,42,81,190,137,110,160,165,84,70,75,104,49,149,
+  224,136,40,164,69,8,139,243,40,23,183,183,0,206,106,63,
+  219,201,8,171,114,104,161,109,240,217,243,217,243,217,243,255,
+  238,137,95,56,57,213,158,165,70,220,137,43,59,95,105,207,
+  254,50,169,231,224,206,86,241,202,12,107,253,217,207,7,233,
+  229,111,4,11,51,218,241,97,226,123,196,215,78,37,167,218,
+  127,75,70,242,226,250,55,253,130,253,165,149,78,107,161,144,
+  42,113,221,28,55,88,17,146,74,124,33,89,44,144,20,73,
+  150,183,53,109,46,8,119,55,157,223,191,255,153,231,184,177,
+  160,182,76,145,196,107,31,235,136,184,36,203,154,166,57,167,
+  189,232,252,36,235,169,80,36,159,42,73,172,65,145,164,71,
+  164,175,104,114,137,36,137,146,216,168,130,35,168,113,83,226,
+  255,208,67,84,187,99,239,222,255,4,79,102,3,70,36,36,
+  0,0,
+};
+/* stos data */
+static const unsigned char dat_stos = {
+  31,139,8,0,0,0,0,0,0,3,237,86,111,108,20,199,
+  21,127,187,183,183,183,28,107,123,57,224,124,54,150,57,131,
+  139,92,176,205,250,236,84,224,24,124,187,182,241,249,224,182,
+  198,38,8,83,164,174,49,236,242,167,152,195,248,154,226,90,
+  96,163,136,242,129,82,130,40,66,81,212,70,40,106,83,212,
+  15,40,69,109,19,81,203,56,85,227,70,81,5,136,70,8,
+  33,53,132,63,161,81,112,173,40,162,176,248,238,250,155,61,
+  219,84,85,191,245,75,63,48,210,188,223,204,123,111,222,188,
+  153,247,230,237,154,36,148,26,41,35,85,93,79,134,253,184,
+  178,213,248,132,94,180,23,237,69,123,209,220,150,112,104,188,
+  197,121,230,116,155,214,230,132,243,236,250,31,198,45,165,186,
+  126,42,216,77,116,130,161,73,244,90,101,108,89,188,197,73,
+  127,210,221,96,69,170,151,83,37,100,201,234,21,46,238,10,
+  239,161,118,240,234,48,238,173,174,127,54,98,139,149,173,85,
+  49,18,32,103,188,152,145,130,213,27,250,89,35,181,220,168,
+  46,29,185,220,149,232,220,100,243,70,106,109,233,200,224,16,
+  89,129,181,165,66,107,87,226,254,183,43,75,111,255,248,27,
+  199,146,100,62,184,24,101,213,234,217,25,172,246,51,132,7,
+  124,252,71,182,28,251,60,155,65,253,58,187,225,111,71,178,
+  70,106,154,115,56,199,57,12,14,179,60,68,93,9,28,138,
+  3,26,196,17,1,55,98,46,1,59,129,103,128,155,128,111,
+  1,95,1,254,14,216,14,60,14,220,2,252,24,216,5,156,
+  0,110,133,153,243,192,239,0,47,2,183,1,47,1,225,22,
+  63,2,220,14,179,140,223,3,253,19,192,29,192,83,255,121,
+  187,157,253,251,15,134,251,118,38,191,215,125,136,214,245,117,
+  247,246,236,223,125,48,188,97,247,254,222,157,253,225,138,154,
+  213,171,86,127,147,18,125,213,157,253,135,122,246,254,32,92,
+  17,169,89,169,70,86,174,6,179,197,161,146,248,105,203,175,
+  57,220,195,242,227,221,196,189,131,145,83,51,104,164,188,71,
+  141,20,179,140,249,23,225,6,227,128,113,160,201,225,68,72,
+  222,243,109,40,107,243,25,53,81,95,71,147,67,25,112,158,
+  242,231,203,218,248,183,33,15,49,185,39,86,214,230,137,151,
+  69,61,6,58,116,56,133,113,189,151,202,218,188,191,45,139,
+  122,223,71,31,169,137,122,199,32,145,93,201,4,36,147,152,
+  5,152,45,223,86,88,223,6,203,142,187,215,27,152,189,153,
+  219,121,254,168,71,134,229,252,154,168,39,192,102,194,189,178,
+  54,225,65,77,84,248,2,179,43,98,160,172,77,92,80,19,
+  21,67,70,42,60,144,121,120,63,118,109,146,200,36,223,91,
+  38,121,58,192,185,14,155,239,207,219,205,162,6,138,152,129,
+  242,228,5,245,144,0,42,208,28,80,47,73,160,34,229,129,
+  250,168,0,84,34,15,232,28,242,129,250,105,174,145,106,117,
+  168,79,175,13,147,145,106,36,140,45,165,78,161,194,33,133,
+  34,252,117,109,102,12,228,128,156,186,24,187,239,129,86,180,
+  112,40,76,133,195,97,14,171,120,204,213,5,117,68,133,71,
+  209,135,137,171,91,236,90,45,193,24,86,53,135,2,186,170,
+  144,203,43,8,254,154,124,185,72,252,123,91,82,65,252,245,
+  119,72,108,154,12,149,0,243,91,128,218,67,42,9,75,125,
+  84,94,124,237,98,5,5,138,237,128,204,17,103,73,34,118,
+  161,140,57,113,99,216,124,96,164,204,98,228,211,182,255,254,
+  70,77,226,110,228,70,226,61,244,126,34,31,235,231,209,199,
+  208,159,96,101,24,215,7,25,151,193,88,69,95,149,72,29,
+  220,221,115,240,127,42,13,255,39,45,127,34,63,148,151,144,
+  79,206,189,53,119,165,255,39,115,254,57,103,151,116,71,234,
+  246,253,221,247,170,79,22,127,41,182,122,31,121,207,121,91,
+  133,41,225,146,144,20,106,60,95,123,46,123,142,121,58,61,
+  229,252,99,254,99,254,109,254,48,191,149,95,197,135,56,135,
+  187,205,125,192,93,224,78,115,63,228,44,174,131,107,228,170,
+  184,18,78,166,52,253,131,238,208,95,233,207,52,66,191,161,
+  95,209,207,233,44,157,164,99,116,132,94,165,3,180,135,118,
+  208,119,169,139,54,81,59,173,167,86,106,162,70,106,160,85,
+  244,18,69,104,37,85,209,114,170,160,101,84,78,75,40,76,
+  165,84,66,139,168,136,66,20,164,133,180,128,230,83,128,230,
+  145,130,156,230,145,197,34,50,86,198,44,4,77,149,157,107,
+  233,20,42,73,0,131,55,147,200,169,110,18,50,75,159,18,
+  20,209,4,87,182,156,205,92,201,189,240,106,198,181,197,165,
+  163,57,94,236,243,35,135,239,199,154,160,79,210,146,3,200,
+  206,215,81,3,51,198,65,181,62,147,111,227,93,233,135,32,
+  169,95,91,159,145,53,39,123,38,201,199,177,163,45,117,130,
+  90,60,247,225,198,241,236,100,237,135,208,88,215,250,148,178,
+  199,169,205,73,79,212,213,167,111,219,196,127,245,83,182,178,
+  121,7,241,15,197,67,196,106,90,243,200,64,122,220,214,27,
+  234,211,99,253,188,215,103,201,27,63,202,58,238,234,152,89,
+  233,21,173,201,8,223,174,5,135,11,251,21,184,28,225,239,
+  182,205,140,59,102,185,56,193,57,115,60,193,188,125,56,200,
+  151,15,164,7,226,155,109,81,216,76,156,45,39,38,178,19,
+  27,255,146,157,52,137,255,254,122,39,125,236,91,213,36,212,
+  71,84,218,75,244,81,188,151,252,118,72,241,242,68,139,139,
+  162,36,230,249,236,120,240,50,137,133,81,226,205,168,222,28,
+  242,218,249,55,7,210,170,220,76,230,78,94,111,190,187,65,
+  115,210,87,3,106,148,20,53,202,213,137,119,227,69,120,221,
+  69,120,221,88,73,164,4,143,178,149,29,58,80,35,94,245,
+  78,196,52,39,179,189,225,34,209,154,38,82,54,53,129,10,
+  170,56,58,69,161,91,163,216,91,178,43,152,7,214,18,88,
+  29,80,213,104,230,84,50,74,182,120,47,102,241,73,238,229,
+  40,9,225,125,36,233,209,110,226,223,133,158,104,83,182,110,
+  253,35,146,93,110,157,153,147,156,51,41,91,250,105,130,247,
+  210,17,43,12,45,217,246,11,189,200,8,25,254,200,107,122,
+  41,159,4,104,72,250,102,147,50,143,37,47,179,66,71,249,
+  22,106,172,139,168,124,108,44,28,191,54,182,197,245,43,238,
+  181,2,176,30,123,121,16,171,5,88,94,133,21,87,103,188,
+  149,189,168,40,161,53,76,38,50,31,102,181,2,208,186,0,
+  41,111,225,252,174,92,194,215,100,10,220,51,224,122,44,202,
+  156,208,181,64,68,77,175,209,224,143,78,249,144,12,192,15,
+  175,77,153,62,21,113,200,221,10,60,90,44,183,144,128,132,
+  232,141,136,155,53,120,147,175,227,110,242,80,5,61,95,146,
+  207,140,185,30,228,118,240,231,129,227,129,196,140,76,239,236,
+  119,117,136,202,167,247,12,49,41,31,165,198,233,168,82,70,
+  156,137,43,155,165,159,192,115,203,164,244,36,244,5,43,16,
+  17,199,216,41,175,176,243,235,175,128,127,19,124,175,181,96,
+  134,15,79,68,125,31,201,144,140,64,34,62,95,1,137,228,
+  174,248,5,248,62,139,210,63,195,174,5,154,227,124,57,111,
+  200,68,93,77,159,92,207,178,242,247,45,142,115,107,80,84,
+  22,218,226,235,85,196,237,12,174,127,148,253,154,101,101,237,
+  20,251,34,81,125,120,192,25,50,174,138,85,120,17,156,42,
+  74,96,89,170,12,223,237,173,17,124,47,238,116,157,222,71,
+  252,167,93,171,241,157,248,44,198,249,236,93,119,99,193,161,
+  66,212,104,100,91,20,35,100,155,185,233,179,24,110,186,142,
+  164,235,208,221,35,232,154,233,127,55,66,212,35,4,64,139,
+  134,73,226,88,142,170,237,51,250,229,208,174,36,113,86,91,
+  146,53,90,220,195,247,45,46,210,40,119,91,208,18,170,88,
+  196,45,202,182,179,172,83,170,200,23,192,27,223,43,118,151,
+  34,171,26,120,142,142,216,44,15,21,204,170,245,133,160,21,
+  43,98,44,103,139,145,243,139,146,108,45,66,204,127,240,136,
+  132,151,97,109,11,45,138,146,79,135,77,86,117,168,87,62,
+  85,212,83,180,27,241,219,190,116,28,103,137,111,57,94,123,
+  19,168,187,213,165,89,215,220,23,253,71,53,4,191,195,107,
+  16,59,116,1,61,223,205,2,185,225,50,113,110,100,16,131,
+  196,4,5,58,52,156,0,209,207,94,93,58,85,80,80,192,
+  234,220,218,153,251,53,82,185,138,229,82,3,92,31,171,78,
+  211,24,211,223,195,151,13,255,9,79,47,39,95,210,139,80,
+  189,166,48,222,150,236,204,141,147,121,152,85,231,198,109,206,
+  211,242,162,65,212,103,95,174,178,245,231,201,58,139,59,249,
+  113,158,5,200,64,63,222,126,127,24,113,65,21,195,87,23,
+  247,232,83,42,145,139,68,141,129,249,184,175,209,33,142,101,
+  161,145,226,225,43,206,181,172,83,83,235,159,252,201,51,84,
+  59,202,60,66,230,172,155,119,84,33,205,181,222,174,41,195,
+  122,197,115,237,236,19,87,251,156,103,116,86,59,148,251,99,
+  112,207,213,16,119,207,200,172,230,78,59,125,250,134,156,175,
+  73,41,56,164,175,96,25,131,204,154,107,125,133,127,92,119,
+  21,236,62,158,169,211,79,214,117,83,182,50,103,237,249,221,
+  225,94,119,176,223,209,218,43,44,58,70,202,69,99,246,12,
+  37,157,26,94,67,64,115,163,149,164,120,82,33,112,69,85,
+  85,20,247,15,70,18,102,27,119,33,40,42,193,226,37,33,
+  185,184,142,227,222,8,115,146,36,74,13,140,72,226,107,213,
+  138,232,151,74,67,146,34,5,241,29,164,127,1,169,87,122,
+  3,90,16,0,0,
+};
+/* synthiv data */
+static const unsigned char dat_synthiv = {
+  31,139,8,0,0,0,0,0,0,3,237,148,203,79,19,81,
+  20,198,79,135,2,5,81,167,96,72,55,212,43,32,81,172,
+  125,32,34,52,6,74,42,161,18,123,173,182,42,85,23,51,
+  60,166,45,143,182,148,14,90,66,176,32,81,98,98,34,137,
+  49,198,176,50,198,133,43,77,140,209,68,9,11,18,113,99,
+  162,139,234,130,196,149,143,133,107,19,7,69,191,41,172,248,
+  27,122,146,126,191,57,231,220,115,239,153,158,153,145,200,104,
+  229,42,87,237,110,226,145,95,182,110,158,163,130,21,172,96,
+  5,203,155,95,163,229,46,109,93,147,123,149,144,95,91,255,
+  248,102,85,17,237,238,63,213,50,209,156,78,137,104,202,230,
+  107,232,233,210,254,230,228,102,197,105,111,36,27,114,81,251,
+  161,60,37,54,68,1,196,154,113,173,216,221,235,75,145,18,
+  91,247,97,31,25,145,215,99,30,174,54,114,187,117,233,117,
+  216,31,12,69,4,174,182,91,151,166,178,164,84,182,91,141,
+  221,97,255,215,211,54,235,218,237,253,55,146,36,125,123,234,
+  209,191,82,235,139,168,42,215,137,147,133,158,155,145,10,223,
+  247,127,27,248,110,221,59,245,229,218,63,174,110,69,166,55,
+  35,211,136,232,59,103,41,236,199,205,24,64,78,6,34,240,
+  12,124,19,24,4,23,193,16,248,28,60,7,126,2,47,128,
+  27,96,0,188,3,246,162,188,29,12,131,147,224,69,240,33,
+  120,9,212,235,46,131,47,65,180,39,120,192,62,212,61,1,
+  251,193,187,224,0,120,127,251,191,27,204,196,211,81,22,148,
+  71,147,35,131,227,236,228,121,150,26,76,142,200,25,234,96,
+  14,22,72,140,38,7,51,44,16,75,201,105,36,189,41,57,
+  153,204,48,47,162,177,17,230,34,127,202,30,76,103,250,135,
+  175,178,3,174,163,14,103,171,163,237,152,173,233,136,195,229,
+  210,47,92,78,135,179,197,209,214,122,144,66,209,216,248,214,
+  174,44,42,199,7,244,115,6,228,180,204,148,68,138,165,163,
+  131,44,116,58,200,122,251,98,137,113,86,223,228,100,39,18,
+  193,132,26,31,96,138,26,239,79,199,18,113,234,212,12,228,
+  213,12,143,235,77,93,26,217,88,229,243,108,164,182,126,182,
+  150,74,102,244,251,107,16,95,100,71,43,94,204,196,77,247,
+  178,185,89,118,61,228,11,249,158,189,75,252,224,42,145,247,
+  125,167,70,43,236,56,31,227,99,94,141,166,93,83,252,55,
+  181,236,59,73,173,240,178,121,47,13,111,130,171,88,183,88,
+  59,185,241,19,222,46,252,30,113,21,179,189,197,38,55,114,
+  88,153,50,199,244,201,65,49,55,168,64,197,208,34,50,66,
+  141,84,6,45,38,19,180,132,118,66,75,105,55,212,68,69,
+  208,50,42,133,150,211,14,174,10,30,218,141,39,185,161,6,
+  19,192,222,82,165,69,232,204,71,246,136,22,156,241,246,131,
+  185,102,65,36,209,130,220,131,237,51,146,171,123,94,17,157,
+  72,233,79,103,221,31,180,50,165,123,92,101,110,186,21,193,
+  91,192,60,162,155,230,34,229,65,170,90,70,102,66,74,138,
+  150,225,6,243,242,60,85,16,149,42,213,56,203,64,29,98,
+  235,60,90,167,229,172,1,25,65,90,51,127,134,230,206,210,
+  80,19,86,205,40,166,170,207,168,189,34,173,192,155,85,172,
+  200,162,155,15,109,122,76,180,152,53,218,63,47,60,117,211,
+  222,200,174,176,79,42,207,175,157,80,132,133,213,186,213,205,
+  94,54,187,34,250,15,13,237,34,192,206,7,0,0,
+};
+/* tao_digi data */
+static const unsigned char dat_tao_digi = {
+  31,139,8,0,0,0,0,0,0,3,221,87,109,108,83,231,
+  21,126,174,237,216,247,26,219,177,29,3,118,148,128,99,59,
+  196,179,82,8,129,68,1,34,26,227,124,56,78,230,124,144,
+  82,165,66,232,166,234,236,52,77,83,96,10,173,186,116,13,
+  136,77,233,132,16,80,196,62,180,105,213,38,33,134,248,193,
+  88,133,86,200,32,227,71,4,93,85,65,88,40,171,54,194,
+  248,17,104,134,88,197,38,10,23,147,187,231,94,155,44,149,
+  130,180,254,221,13,231,156,247,158,231,125,159,115,222,143,243,
+  94,35,3,86,25,88,73,89,209,160,160,48,84,155,220,145,
+  220,81,186,9,39,74,55,137,191,106,154,177,31,42,109,177,
+  255,44,20,39,158,148,33,28,166,28,144,97,57,9,68,22,
+  120,234,219,146,13,254,77,221,254,231,186,162,109,207,249,219,
+  26,253,209,88,227,66,253,34,136,223,86,103,155,21,245,120,
+  98,56,181,49,152,17,193,71,29,65,48,35,205,181,172,185,
+  214,186,33,8,210,120,162,95,26,75,67,112,244,64,220,71,
+  15,164,177,30,216,246,49,171,140,134,164,172,61,176,100,244,
+  158,99,155,135,27,20,219,253,38,69,74,174,248,81,57,62,
+  201,192,230,211,252,231,124,125,200,151,206,235,99,199,163,138,
+  180,214,127,28,166,21,157,159,177,109,29,10,188,6,248,223,
+  115,189,138,60,228,151,116,192,185,245,64,14,25,37,98,90,
+  16,201,16,17,191,142,208,91,185,221,224,98,4,84,234,186,
+  94,215,101,186,14,151,104,26,88,166,191,181,235,186,99,245,
+  144,32,32,209,164,44,18,75,90,32,210,250,105,61,20,47,
+  219,94,218,8,101,229,149,12,251,190,212,113,81,61,26,85,
+  108,214,152,98,115,4,70,122,96,157,109,157,122,87,77,14,
+  54,43,179,175,180,60,28,1,215,97,60,5,67,205,230,114,
+  233,92,106,153,175,95,58,47,157,227,60,63,232,161,143,246,
+  62,109,5,51,172,167,13,163,28,207,75,211,244,238,233,129,
+  113,38,17,70,56,237,240,105,43,243,177,174,63,149,109,190,
+  94,20,243,173,23,69,210,167,212,14,105,198,25,198,154,215,
+  204,134,114,204,74,211,99,181,88,158,214,218,95,73,211,190,
+  58,233,12,153,14,145,233,131,121,76,19,186,190,150,99,154,
+  208,153,174,233,76,247,168,215,72,103,231,248,158,204,227,251,
+  167,206,119,150,124,63,39,95,251,60,190,207,117,125,35,199,
+  247,185,206,119,67,231,187,175,243,141,206,241,61,158,199,55,
+  165,243,141,138,229,48,74,211,169,36,173,137,54,76,155,71,
+  107,144,95,202,33,59,115,200,203,206,114,105,198,93,46,221,
+  59,133,129,109,114,87,14,221,154,235,95,159,67,239,19,141,
+  203,213,185,49,27,115,232,74,162,247,114,104,68,246,63,101,
+  242,208,115,82,24,48,157,50,12,216,78,26,94,119,114,103,
+  206,72,183,100,7,237,89,90,51,237,168,116,43,170,88,30,
+  136,97,152,224,224,124,123,177,94,122,64,189,65,154,149,43,
+  163,138,88,189,32,226,37,178,43,135,216,230,35,228,58,206,
+  149,107,76,3,14,241,46,87,109,154,154,243,104,85,150,171,
+  102,196,39,151,171,133,163,176,59,215,155,35,39,23,167,77,
+  145,51,102,127,114,48,50,170,213,96,100,84,210,181,86,123,
+  201,193,205,97,36,82,16,198,92,189,104,65,66,63,177,85,
+  129,94,56,171,93,110,159,211,87,210,12,167,92,19,106,47,
+  233,132,179,223,109,235,85,85,184,211,30,218,89,90,8,251,
+  92,125,90,101,108,61,32,127,162,85,90,182,223,156,239,247,
+  167,135,84,53,125,33,33,244,247,93,24,37,175,101,34,58,
+  17,77,62,246,26,178,247,12,106,41,17,74,33,197,224,226,
+  249,87,138,93,99,74,16,53,112,42,197,50,212,183,185,171,
+  231,40,231,217,30,112,213,161,154,217,9,168,226,155,236,169,
+  69,254,97,184,54,161,140,111,157,196,18,148,22,182,27,19,
+  49,174,200,77,79,24,249,19,6,87,20,118,74,235,78,140,
+  105,241,151,19,25,39,98,95,66,244,176,49,97,72,217,26,
+  20,203,206,146,4,68,102,112,226,31,241,208,219,121,134,201,
+  49,142,40,165,4,56,15,27,130,212,118,132,168,29,120,129,
+  58,31,91,168,157,120,145,218,133,13,212,110,116,179,247,10,
+  74,23,103,47,150,244,113,175,60,37,189,240,192,203,182,200,
+  234,238,69,4,43,217,179,0,113,246,106,228,174,117,164,120,
+  123,196,148,188,59,191,189,164,181,18,17,20,48,55,191,62,
+  191,198,64,31,188,13,138,104,14,189,23,83,44,15,131,151,
+  0,193,195,252,108,124,155,205,190,145,161,42,101,91,29,69,
+  13,249,170,41,85,201,193,236,13,154,28,204,222,67,33,198,
+  175,40,236,95,102,171,83,103,83,230,134,25,53,35,59,217,
+  86,83,78,102,227,133,39,139,115,230,30,158,8,49,109,77,
+  32,101,213,163,135,47,115,125,244,213,122,55,128,137,48,186,
+  99,138,233,75,215,14,47,176,94,175,83,235,106,141,191,104,
+  59,100,222,81,198,217,203,195,21,171,69,236,2,177,174,212,
+  50,158,165,23,250,188,60,73,91,184,110,189,120,145,235,166,
+  245,14,232,204,93,238,48,130,183,36,174,127,136,235,95,202,
+  17,129,148,251,154,112,218,240,134,87,199,3,244,134,100,219,
+  17,161,95,204,142,218,5,87,12,165,28,21,186,37,29,16,
+  222,15,99,253,229,152,150,67,202,188,186,14,69,178,57,155,
+  201,116,203,103,68,120,98,69,87,7,28,253,102,87,15,28,
+  178,169,243,24,68,222,21,101,7,195,186,79,235,233,32,83,
+  117,124,247,251,189,168,169,12,163,70,103,2,204,87,121,199,
+  220,105,190,26,214,231,215,193,93,232,227,44,146,3,181,204,
+  191,13,73,114,116,92,9,163,221,198,19,131,246,215,157,217,
+  85,214,52,235,2,40,167,159,247,252,0,217,231,223,248,185,
+  122,229,158,101,35,179,167,135,76,237,122,54,92,239,172,151,
+  57,71,220,190,83,181,80,83,54,238,202,74,68,52,143,108,
+  165,135,123,22,251,66,157,117,251,184,183,107,88,131,145,92,
+  165,23,153,194,140,28,39,135,91,231,104,228,25,154,201,158,
+  137,228,96,252,246,216,112,84,121,216,90,193,221,171,196,205,
+  230,4,250,19,81,197,184,151,28,73,74,219,92,134,2,58,
+  232,31,95,216,111,18,23,242,203,113,142,88,63,15,201,215,
+  17,85,103,26,122,134,255,220,66,254,214,41,193,168,229,122,
+  243,102,131,146,87,225,103,181,4,172,87,254,152,168,75,27,
+  234,119,175,141,192,121,245,24,64,49,81,196,232,29,248,59,
+  62,70,87,235,148,197,242,116,140,41,19,178,78,30,154,228,
+  109,67,17,253,157,129,248,228,79,181,191,64,123,15,48,198,
+  17,38,189,117,122,174,117,130,49,196,237,249,147,63,225,183,
+  53,163,197,171,100,148,73,70,161,152,40,162,63,12,207,229,
+  225,203,195,172,59,177,100,7,235,193,171,199,189,164,254,117,
+  46,238,151,140,187,55,100,173,223,163,197,91,209,76,222,174,
+  28,127,107,206,214,47,196,76,121,202,53,51,63,139,64,75,
+  54,231,255,206,163,117,42,159,145,2,174,83,163,42,159,180,
+  83,183,179,233,37,147,7,99,95,192,44,79,7,118,7,190,
+  5,211,196,158,96,20,38,217,26,216,29,28,210,250,193,148,
+  28,196,51,30,129,98,160,24,41,38,74,30,197,172,93,194,
+  220,4,237,43,160,125,3,180,47,192,34,138,141,98,127,6,
+  143,170,138,34,35,125,131,199,113,207,177,212,254,109,219,254,
+  69,127,89,180,202,186,95,250,74,74,139,55,197,30,203,29,
+  203,155,150,69,230,163,230,166,188,187,121,63,206,107,50,61,
+  54,253,206,180,221,84,97,252,183,241,172,241,7,198,205,198,
+  160,225,129,225,79,134,95,27,222,49,116,27,106,12,94,65,
+  17,254,38,92,16,126,35,28,20,190,39,124,71,232,16,54,
+  10,229,66,145,96,195,19,220,195,223,241,103,92,196,31,112,
+  10,199,240,75,28,193,126,252,16,223,199,155,216,142,62,188,
+  130,109,232,70,23,171,183,5,77,136,225,121,108,224,23,165,
+  138,37,177,138,191,136,34,40,67,41,130,40,193,114,20,163,
+  8,133,240,97,41,150,96,49,111,103,55,111,116,39,79,234,
+  188,231,238,141,137,241,179,39,143,254,226,240,190,189,239,236,
+  122,227,213,151,183,117,119,181,37,154,98,207,215,174,171,170,
+  92,85,30,41,43,13,150,44,95,86,84,232,243,46,89,236,
+  41,112,187,242,243,237,118,155,36,90,204,121,38,163,65,248,
+  223,151,236,27,173,239,255,255,163,157,55,237,95,221,237,248,
+  109,140,52,43,255,234,229,239,222,15,121,91,191,165,223,191,
+  31,54,102,202,16,85,158,244,251,31,105,55,159,243,17,84,
+  69,210,181,93,215,46,93,47,214,117,49,214,193,175,225,57,
+  187,184,64,251,157,77,191,142,6,163,10,78,20,220,225,183,
+  157,109,246,112,106,8,125,71,130,23,53,102,241,35,150,143,
+  170,44,109,157,114,161,113,42,57,248,52,159,251,215,181,124,
+  210,157,250,255,51,114,217,100,110,4,175,107,99,10,174,107,
+  209,116,109,215,181,75,215,115,113,105,199,180,104,180,122,52,
+  29,45,22,31,125,61,18,127,13,137,35,112,61,114,175,221,
+  242,214,136,161,243,35,205,38,191,171,29,147,255,0,35,134,
+  191,41,204,13,0,0,
+};
+/* tao_hubbard data */
+static const unsigned char dat_tao_hubbard = {
+  31,139,8,0,0,0,0,0,0,3,229,86,95,108,83,215,
+  25,255,221,235,107,251,198,247,250,111,76,234,100,134,38,142,
+  67,140,101,129,201,63,133,18,173,118,96,137,227,100,38,73,
+  3,77,120,96,9,131,36,67,217,10,213,210,78,25,45,164,
+  234,166,40,154,208,202,186,238,105,218,164,86,40,155,120,64,
+  236,101,82,187,42,202,67,85,181,213,196,2,17,91,213,109,
+  25,72,27,66,136,7,132,24,243,32,119,191,115,174,49,105,
+  97,104,47,125,154,165,243,157,115,190,239,247,157,243,187,223,
+  249,206,119,60,10,120,70,129,56,91,244,107,69,4,26,114,
+  222,229,134,227,133,99,133,99,136,60,151,161,214,55,10,229,
+  35,182,15,70,225,125,43,247,15,107,173,167,104,93,207,22,
+  189,191,221,146,51,6,99,29,224,47,62,99,36,59,103,155,
+  146,8,44,207,247,22,141,88,114,214,214,83,19,146,154,240,
+  58,77,114,121,222,53,203,161,78,189,182,78,159,16,72,207,
+  205,228,108,245,17,132,141,208,142,227,128,17,89,188,7,87,
+  44,191,188,152,45,26,87,210,29,80,147,185,142,14,236,168,
+  185,7,12,252,222,42,214,17,3,21,90,80,244,77,82,238,
+  150,178,81,90,44,108,146,179,126,41,7,182,31,87,20,228,
+  131,83,70,8,205,193,73,52,163,165,180,119,112,121,190,118,
+  182,109,228,242,71,113,57,111,249,74,147,186,58,98,42,184,
+  63,206,137,153,128,130,129,137,235,234,107,98,197,96,39,10,
+  108,123,184,162,95,174,75,155,92,221,116,45,216,92,70,23,
+  75,222,107,235,188,207,62,226,109,179,82,31,241,126,141,118,
+  255,234,126,27,191,121,166,226,211,171,243,151,151,90,42,197,
+  220,18,243,165,203,75,117,189,8,116,23,141,85,246,58,251,
+  187,236,195,236,111,179,79,178,109,253,3,163,131,253,3,31,
+  174,93,146,49,244,72,105,246,253,245,132,85,152,238,41,174,
+  109,237,253,23,172,57,228,167,140,200,56,148,239,177,55,39,
+  152,3,99,80,63,227,105,187,198,160,188,174,167,224,48,218,
+  201,127,156,35,77,142,218,56,114,202,145,139,168,239,150,17,
+  167,203,136,87,3,41,163,35,148,50,50,231,241,29,96,134,
+  168,169,50,234,165,178,247,112,9,181,91,162,14,16,213,85,
+  94,161,191,140,234,32,42,83,70,181,19,149,124,176,122,152,
+  218,115,10,181,250,121,149,50,116,78,253,54,80,85,61,101,
+  248,140,22,226,66,28,249,229,72,231,40,96,180,100,139,21,
+  11,129,4,124,58,160,77,8,251,36,158,49,114,148,59,141,
+  126,162,58,105,191,242,4,123,44,91,244,68,159,96,87,179,
+  69,247,157,190,11,62,43,183,226,179,106,222,131,65,158,185,
+  115,27,136,140,38,207,26,93,108,121,106,189,212,246,75,173,
+  139,154,66,97,186,254,158,46,82,141,231,80,127,175,162,60,
+  242,148,70,133,233,108,81,191,197,147,184,61,6,103,130,123,
+  109,52,162,148,81,163,150,210,103,116,200,60,85,98,147,72,
+  134,130,154,200,176,220,20,16,97,78,247,32,39,181,213,117,
+  61,72,74,148,202,76,180,24,81,79,221,36,182,34,57,186,
+  90,202,76,253,167,11,156,45,235,10,220,100,101,234,55,152,
+  35,34,206,186,126,86,140,244,89,184,171,179,134,143,104,208,
+  30,166,150,39,25,74,160,233,98,202,240,73,220,13,161,33,
+  207,119,200,179,111,12,218,73,201,51,46,121,38,36,207,204,
+  151,194,83,41,243,84,202,60,253,235,120,106,101,158,254,18,
+  79,77,242,220,55,6,144,171,227,143,146,103,74,242,76,75,
+  158,187,191,20,158,106,153,167,90,230,25,88,199,211,89,230,
+  25,40,241,164,166,48,45,247,111,30,135,154,226,254,45,104,
+  150,243,60,231,85,156,247,34,79,62,129,180,224,67,47,69,
+  139,247,175,92,131,54,180,0,45,29,106,66,185,238,164,88,
+  119,88,91,38,86,213,147,178,238,100,88,119,50,159,175,59,
+  106,2,1,214,246,247,75,94,247,75,94,162,90,253,250,17,
+  175,114,173,43,121,205,153,25,203,154,128,50,95,242,22,17,
+  41,216,94,87,231,234,50,208,106,237,119,65,178,123,80,219,
+  210,33,174,230,95,29,150,184,19,241,25,109,237,234,220,202,
+  98,58,36,230,150,197,249,223,87,22,235,242,226,187,172,232,
+  23,144,151,190,128,124,239,1,114,237,150,205,100,237,110,140,
+  76,74,209,127,63,6,149,47,140,31,102,150,37,140,47,24,
+  87,203,179,245,18,191,244,208,230,124,96,107,102,99,197,88,
+  59,243,208,230,17,182,148,154,129,101,146,9,235,140,43,208,
+  1,127,165,168,172,86,113,99,229,34,101,61,103,1,49,163,
+  231,84,233,229,128,168,211,244,239,116,136,186,21,49,59,85,
+  176,58,5,184,126,219,234,126,86,246,86,98,51,15,81,138,
+  216,37,16,230,202,111,130,214,70,90,99,59,50,70,56,38,
+  153,243,75,98,124,173,194,240,74,217,199,108,241,95,76,160,
+  143,77,212,147,13,204,231,144,126,13,46,196,10,211,172,241,
+  138,17,25,189,99,71,204,132,244,254,148,175,231,201,248,140,
+  227,244,202,98,240,8,42,48,40,229,22,74,15,186,164,236,
+  166,52,144,147,178,135,114,20,113,202,49,212,75,217,64,121,
+  16,123,41,191,137,125,148,135,240,60,229,97,236,164,28,199,
+  8,229,4,134,243,9,12,139,140,118,137,220,25,174,22,60,
+  60,124,193,39,13,35,159,196,65,113,23,100,214,13,137,28,
+  151,57,52,196,147,211,101,78,4,168,57,34,242,137,154,176,
+  212,164,17,230,189,10,35,66,77,82,106,250,249,166,241,6,
+  98,171,93,151,228,90,155,183,11,105,143,91,165,108,43,76,
+  199,233,39,239,74,23,239,238,38,222,149,110,116,9,29,239,
+  70,216,28,180,196,173,168,26,225,120,244,122,105,166,239,21,
+  179,207,56,19,217,235,227,46,17,206,63,17,62,226,46,137,
+  179,95,29,201,43,19,246,139,231,186,192,168,107,25,152,71,
+  232,105,103,119,12,203,9,140,236,42,58,84,145,53,56,17,
+  60,22,0,158,217,85,84,155,236,83,184,58,119,113,49,29,
+  180,115,150,81,26,226,46,155,36,195,189,92,35,76,134,251,
+  24,237,73,60,207,104,203,184,188,136,104,2,49,221,5,23,
+  247,60,90,163,68,18,168,231,153,55,80,227,22,21,135,189,
+  56,213,22,246,78,241,53,167,19,136,31,2,106,153,3,78,
+  196,94,228,225,33,76,70,241,243,218,97,129,94,16,218,144,
+  22,204,162,225,138,121,90,35,210,165,101,21,184,156,248,37,
+  199,158,229,44,71,145,67,119,47,100,183,103,16,213,39,197,
+  7,73,118,91,24,191,131,228,53,200,76,17,177,245,177,226,
+  232,172,12,79,99,51,119,79,6,7,224,227,123,216,248,70,
+  66,246,190,41,251,92,137,147,25,176,121,112,1,58,153,212,
+  10,175,255,142,45,69,80,74,90,90,153,177,170,56,5,126,
+  111,219,197,73,249,226,71,168,115,136,251,97,163,132,229,39,
+  180,148,254,179,37,208,78,92,84,50,46,240,174,117,145,241,
+  30,20,236,10,38,162,35,45,253,220,49,101,87,61,241,150,
+  219,85,145,214,136,228,218,207,57,43,219,11,54,43,142,4,
+  199,31,39,164,151,157,181,226,165,115,241,246,250,10,211,120,
+  204,79,145,133,141,52,217,52,54,39,27,15,9,110,254,245,
+  20,239,187,120,217,197,155,110,136,191,120,108,94,148,0,206,
+  204,231,154,239,166,239,41,239,215,205,83,198,159,140,109,158,
+  83,21,255,172,152,208,87,245,49,247,53,247,203,110,195,117,
+  198,213,237,188,225,252,153,179,91,251,183,246,27,237,168,150,
+  118,220,118,188,235,248,129,227,57,71,189,122,71,253,88,125,
+  91,125,69,29,81,219,213,136,82,84,254,172,44,41,191,82,
+  222,80,190,175,28,86,6,148,175,42,41,37,170,152,184,143,
+  155,248,27,46,225,67,252,14,231,177,128,95,224,45,156,194,
+  15,241,42,94,198,81,136,123,125,0,35,24,98,252,122,121,
+  107,118,225,89,236,68,59,90,209,132,109,72,241,238,53,162,
+  1,245,168,99,6,108,68,20,53,168,198,83,168,194,6,84,
+  34,132,32,239,175,255,198,95,150,63,120,247,220,153,159,191,
+  249,163,215,95,121,233,133,111,29,60,48,50,180,39,223,189,
+  235,217,142,29,173,77,219,82,201,198,134,250,186,167,55,69,
+  107,170,35,85,27,194,149,161,160,223,239,245,154,21,186,219,
+  229,212,28,170,242,184,192,62,254,103,253,239,208,255,135,159,
+  101,201,144,88,219,204,158,226,173,97,251,5,120,242,255,202,
+  196,55,10,211,34,136,255,1,37,20,5,40,244,13,0,0,
+};
+/* tao_ms211 data */
+static const unsigned char dat_tao_ms211 = {
+  31,139,8,0,0,0,0,0,0,3,237,151,127,88,84,101,
+  218,199,239,51,191,207,48,12,51,236,104,208,130,205,12,160,
+  179,92,188,42,164,94,172,177,5,161,129,232,78,128,102,90,
+  214,14,109,205,16,225,239,72,215,40,209,210,200,53,86,77,
+  9,109,43,42,215,208,220,34,36,99,205,140,204,20,205,76,
+  73,118,169,205,48,215,2,203,200,202,148,142,200,236,247,62,
+  231,196,193,235,210,189,246,159,247,253,235,253,232,253,220,231,
+  60,207,57,247,253,156,239,153,251,121,14,1,34,107,128,40,
+  25,230,29,47,209,224,209,229,35,194,250,51,163,203,61,31,
+  24,198,172,62,144,148,27,51,101,142,128,177,204,0,9,77,
+  176,198,0,153,183,224,242,100,247,111,39,187,211,134,167,166,
+  186,147,25,183,219,61,165,104,182,123,102,217,252,123,23,226,
+  88,233,28,64,110,103,184,111,130,20,110,250,117,57,17,57,
+  242,42,130,233,69,100,107,244,244,90,112,90,73,158,94,81,
+  245,86,217,227,42,65,172,205,43,21,55,132,72,200,40,162,
+  136,76,190,79,220,128,252,195,185,55,104,45,34,107,179,124,
+  213,134,201,21,227,165,171,26,191,168,76,156,103,161,182,131,
+  57,146,56,124,232,138,88,30,169,137,45,161,40,113,189,124,
+  103,109,150,36,94,237,222,66,134,161,133,56,242,123,239,35,
+  114,63,238,188,151,140,20,229,41,32,199,140,85,114,255,42,
+  244,27,46,211,223,138,126,203,165,253,232,181,204,209,57,249,
+  105,210,228,118,156,220,14,147,91,159,135,91,162,33,242,89,
+  190,220,22,164,150,11,2,229,97,126,159,121,38,146,5,254,
+  28,188,11,22,131,227,110,248,100,216,240,35,189,184,246,182,
+  130,150,240,166,44,41,114,207,175,114,163,210,224,15,193,143,
+  131,111,135,159,10,127,2,190,24,254,52,252,34,248,115,240,
+  43,179,36,59,193,63,139,243,69,240,245,80,104,203,164,142,
+  197,97,127,217,4,169,47,19,170,213,6,73,183,112,114,138,
+  88,19,28,18,91,42,174,23,107,178,36,203,184,34,210,61,
+  10,95,13,95,14,223,5,127,63,165,208,13,98,243,195,132,
+  243,196,34,50,80,158,143,124,33,107,108,142,184,17,86,23,
+  176,197,22,83,60,142,139,41,78,172,67,107,23,247,56,124,
+  116,237,125,38,93,10,245,137,205,205,25,116,77,136,143,207,
+  139,205,177,153,226,90,68,193,187,214,239,192,91,188,179,63,
+  210,86,88,189,26,105,171,28,169,94,142,212,130,246,90,113,
+  93,127,188,139,3,226,125,43,199,91,135,120,55,34,94,9,
+  226,85,246,199,107,132,53,169,241,26,229,120,77,114,188,131,
+  114,188,106,155,143,244,228,14,154,200,71,21,116,109,127,244,
+  11,3,162,119,200,209,171,45,41,164,23,155,131,121,240,6,
+  248,161,240,70,177,57,68,52,85,29,41,85,71,102,68,167,
+  136,45,13,41,226,158,217,68,133,234,216,52,229,234,96,38,
+  198,14,170,99,99,212,235,51,212,177,20,117,172,5,99,94,
+  7,174,225,56,46,244,213,11,179,12,13,186,89,182,122,221,
+  76,7,222,207,90,113,103,192,14,191,14,222,4,95,45,238,
+  204,146,76,107,45,62,188,16,123,200,142,231,26,43,30,70,
+  123,157,216,30,192,111,196,116,244,178,35,49,89,146,217,165,
+  142,216,6,142,100,118,222,212,59,140,156,189,20,89,73,142,
+  177,198,158,250,244,74,10,153,60,146,241,116,37,77,146,70,
+  132,141,245,177,139,76,181,134,235,131,6,207,254,74,194,113,
+  55,142,137,76,158,3,168,210,102,216,59,176,221,176,119,97,
+  123,96,239,193,246,194,246,193,90,96,239,195,62,168,164,155,
+  58,252,101,68,255,169,206,201,225,47,155,236,163,188,32,9,
+  43,157,197,52,145,242,228,122,25,237,45,38,199,24,103,116,
+  172,35,214,51,129,28,129,244,196,124,79,33,57,74,163,109,
+  197,225,48,69,135,92,240,125,240,36,76,115,150,112,93,206,
+  88,21,56,200,21,174,92,215,223,215,180,189,60,28,14,237,
+  206,19,74,243,119,239,68,92,115,107,86,107,150,255,66,140,
+  14,107,218,40,94,243,96,14,152,14,111,191,6,182,62,176,
+  220,153,73,99,156,60,179,209,1,10,47,114,101,80,212,90,
+  114,222,72,195,112,86,138,177,60,216,68,28,7,242,178,241,
+  187,216,235,242,81,84,171,206,153,69,145,176,73,243,168,153,
+  179,92,3,173,6,171,191,58,162,23,76,62,138,161,72,100,
+  169,193,213,145,131,113,199,90,125,208,54,94,50,182,122,242,
+  200,130,254,138,175,115,19,23,25,22,182,53,35,70,18,204,
+  139,249,219,40,17,109,36,37,160,181,211,45,104,163,104,42,
+  90,7,221,138,214,73,215,161,141,166,233,104,175,33,55,238,
+  25,10,155,130,103,183,120,74,240,190,93,158,98,114,81,12,
+  142,45,88,89,138,41,153,134,227,202,95,80,46,174,186,169,
+  127,102,22,101,102,168,163,209,65,91,106,22,165,99,116,12,
+  108,180,191,76,89,131,253,101,206,28,242,37,34,214,200,171,
+  75,135,216,50,195,125,65,211,248,175,194,189,1,7,142,195,
+  65,7,34,199,144,75,25,199,179,184,240,158,45,33,107,30,
+  5,173,178,130,190,195,120,94,89,145,197,80,45,195,75,173,
+  62,154,158,45,233,78,59,231,198,16,141,197,145,245,112,197,
+  200,84,11,25,124,184,250,150,18,162,24,252,6,166,226,201,
+  139,233,86,60,121,14,158,155,227,76,241,154,161,92,66,180,
+  143,146,48,87,47,116,119,173,241,81,226,221,188,198,230,144,
+  215,107,134,134,46,196,78,108,208,221,131,253,76,190,199,27,
+  205,111,37,233,132,117,141,14,215,153,214,148,11,116,56,139,
+  87,12,60,183,29,207,58,36,53,147,226,112,159,41,53,135,
+  226,78,78,248,200,71,99,241,155,179,56,11,200,94,106,114,
+  22,145,61,96,40,172,35,11,86,139,97,171,125,232,51,32,
+  147,29,51,24,147,187,228,201,98,74,79,243,81,122,191,142,
+  6,220,143,85,167,75,142,130,28,5,161,169,248,77,251,103,
+  141,194,115,220,76,126,196,40,56,226,163,124,92,31,69,249,
+  51,237,138,182,202,175,63,48,4,189,216,37,102,89,16,63,
+  31,86,160,214,171,137,243,5,236,184,55,95,203,143,25,38,
+  71,199,54,100,80,56,104,131,246,195,41,153,123,2,86,244,
+  224,205,100,159,10,247,69,199,226,169,175,69,205,36,251,203,
+  114,59,155,43,178,164,158,194,145,120,3,105,116,124,66,30,
+  149,230,101,73,58,63,174,96,187,185,127,127,18,168,0,253,
+  171,174,208,223,122,185,254,64,46,70,12,3,70,162,228,145,
+  176,124,199,77,87,232,175,188,92,255,164,14,65,207,171,196,
+  229,177,119,219,175,138,252,173,173,42,226,227,136,17,214,42,
+  241,188,24,178,28,183,20,153,187,204,11,204,17,166,77,166,
+  28,227,105,227,83,198,28,195,5,195,54,195,28,195,72,253,
+  89,253,155,250,101,250,201,250,4,221,57,221,251,186,23,117,
+  15,233,166,235,210,117,49,130,36,28,19,118,11,155,133,213,
+  194,131,194,61,66,129,112,189,144,34,196,9,54,186,72,221,
+  244,57,29,165,22,122,139,26,168,142,158,163,106,170,162,229,
+  244,48,45,160,57,84,66,119,211,157,52,157,166,224,45,78,
+  164,28,202,166,27,232,58,74,167,209,144,115,4,246,201,100,
+  26,70,73,148,64,30,212,96,60,197,209,213,20,75,87,209,
+  96,26,132,74,139,70,141,58,240,148,3,232,62,209,214,178,
+  107,219,230,218,234,39,150,47,94,48,183,228,238,223,77,159,
+  146,63,49,39,251,134,140,244,209,105,35,254,39,217,55,52,
+  209,235,30,18,247,203,216,152,193,131,92,191,136,118,58,162,
+  236,145,145,182,8,171,85,180,88,204,102,147,209,160,215,9,
+  87,146,9,240,152,14,166,135,25,96,70,152,137,151,60,136,
+  204,235,47,175,189,188,238,70,192,108,176,200,43,196,9,135,
+  45,22,172,177,255,207,255,10,172,44,255,207,237,60,222,51,
+  65,58,187,41,71,178,157,75,188,253,245,222,48,192,186,150,
+  223,118,48,209,218,182,166,13,59,153,187,208,155,219,182,158,
+  255,121,243,139,136,234,178,186,200,32,31,61,219,127,180,214,
+  141,181,62,45,153,28,109,117,68,48,3,204,130,81,119,193,
+  254,112,55,246,168,186,73,29,215,152,121,29,56,222,139,92,
+  99,39,74,182,21,137,119,92,154,107,220,82,206,51,116,2,
+  226,141,83,227,102,168,126,212,127,138,238,157,168,204,77,153,
+  171,146,235,6,228,242,58,27,118,202,241,29,178,239,11,13,
+  110,91,157,125,138,76,129,47,189,75,188,191,34,67,235,210,
+  132,44,92,111,245,46,73,40,231,235,200,224,47,203,236,204,
+  237,164,202,9,210,15,53,248,78,173,194,122,186,70,94,33,
+  171,178,36,58,155,45,81,151,183,18,71,237,56,58,195,71,
+  130,1,71,61,114,95,87,182,132,133,190,146,191,101,178,164,
+  139,126,119,143,224,130,57,28,61,146,25,38,194,6,193,226,
+  45,77,36,72,102,212,237,72,73,148,219,65,248,242,33,41,
+  30,99,9,176,36,249,44,65,110,147,16,117,150,167,69,112,
+  193,175,128,119,224,94,189,116,213,164,14,167,252,45,243,243,
+  76,191,239,230,153,134,198,202,127,93,84,41,249,123,15,121,
+  218,5,23,204,225,108,151,204,48,17,54,8,22,15,227,232,
+  205,104,219,165,36,75,207,192,136,63,127,11,121,122,163,71,
+  77,93,40,184,252,243,47,215,35,14,236,113,92,174,7,249,
+  15,99,231,113,227,189,22,99,111,138,195,174,162,195,222,20,
+  135,29,43,82,254,242,89,220,186,36,91,146,54,164,165,198,
+  80,107,49,13,129,165,115,191,57,220,80,78,142,217,105,217,
+  82,184,62,186,142,236,227,37,93,94,67,225,108,236,242,120,
+  75,231,176,67,79,115,126,23,3,93,28,201,164,211,165,211,
+  25,41,190,203,178,36,93,138,247,151,41,103,254,50,100,174,
+  87,51,159,195,95,144,146,178,43,134,134,218,162,73,64,95,
+  6,188,14,126,148,171,142,220,227,165,176,3,153,124,222,21,
+  120,115,183,121,87,4,226,48,170,199,232,96,101,148,118,97,
+  212,42,143,102,120,87,92,249,57,126,106,189,194,115,204,83,
+  179,99,169,203,150,250,118,240,19,245,239,210,35,177,151,218,
+  229,175,145,168,206,92,228,58,209,214,28,123,91,84,10,236,
+  122,88,62,236,46,216,253,176,229,176,154,241,146,144,57,80,
+  9,193,47,43,145,160,42,17,37,197,247,235,16,197,158,232,
+  191,123,151,255,119,61,3,150,29,65,217,57,4,157,178,133,
+  232,244,122,222,42,4,189,193,160,71,135,206,96,52,26,116,
+  56,53,154,76,70,61,78,77,216,111,12,164,55,154,177,243,
+  24,201,96,178,136,162,197,68,70,179,136,205,200,76,38,139,
+  53,34,194,106,33,179,24,97,179,69,136,100,177,218,176,81,
+  89,73,140,136,180,219,35,35,200,106,179,71,69,217,177,199,
+  132,28,36,24,220,36,60,63,146,140,177,153,100,122,44,159,
+  172,248,234,182,119,207,65,78,163,217,106,139,114,186,6,199,
+  254,50,222,237,77,26,150,156,50,34,117,212,152,244,235,126,
+  147,121,227,248,156,188,73,55,23,76,158,58,237,246,59,2,
+  119,221,19,42,41,157,53,119,254,3,11,31,124,168,98,233,
+  178,199,30,95,89,181,250,201,234,154,167,159,169,125,97,227,
+  75,155,183,190,242,218,182,237,77,111,190,245,246,238,61,251,
+  246,31,60,116,228,163,182,246,79,142,117,156,56,217,121,234,
+  116,247,153,31,126,236,145,46,6,67,197,247,150,220,87,58,
+  115,214,236,57,115,231,205,191,191,236,129,5,11,255,176,232,
+  193,242,135,30,94,92,177,100,233,35,143,46,91,182,252,177,
+  202,199,87,252,113,229,19,85,127,90,181,122,205,147,107,215,
+  85,63,85,179,126,195,211,127,126,230,217,231,106,159,127,225,
+  197,141,127,217,244,82,221,230,45,47,111,253,235,43,175,214,
+  191,214,176,173,241,245,237,111,52,253,109,199,142,55,119,190,
+  181,235,237,230,119,118,191,187,231,189,189,251,90,246,31,120,
+  255,224,7,135,62,60,124,164,245,163,163,109,127,255,71,251,
+  199,159,252,243,211,99,159,117,28,255,252,196,191,78,126,241,
+  101,103,215,169,175,190,62,253,77,247,183,103,206,124,247,253,
+  15,103,127,60,119,190,231,39,233,66,239,197,190,112,237,243,
+  72,241,226,70,36,217,244,18,210,32,207,203,91,145,233,149,
+  87,145,11,201,182,53,34,221,246,55,144,80,206,136,148,187,
+  222,70,210,119,118,35,45,242,238,221,135,204,251,15,32,55,
+  146,31,250,16,233,143,180,98,2,71,219,48,5,204,225,227,
+  79,48,139,79,143,97,30,152,200,231,39,48,149,147,95,96,
+  50,152,205,169,175,48,159,211,223,96,70,242,148,48,167,179,
+  63,98,86,231,123,48,47,76,172,247,34,166,22,14,23,22,
+  22,78,102,166,48,183,48,83,153,91,153,105,204,116,230,54,
+  153,219,153,25,204,29,204,157,204,239,152,0,83,196,220,197,
+  252,158,185,155,185,71,38,200,132,152,98,230,94,166,132,185,
+  143,41,101,102,50,179,152,217,50,115,152,185,204,60,102,62,
+  115,63,83,198,60,192,44,96,22,50,127,96,22,201,60,200,
+  148,51,15,49,15,51,139,153,10,102,9,179,148,121,132,121,
+  84,102,25,179,156,121,140,169,100,30,103,86,48,127,100,86,
+  50,79,48,85,204,159,100,86,49,171,153,53,204,147,204,90,
+  102,29,83,205,60,197,212,48,235,101,54,48,79,51,127,102,
+  158,97,158,101,158,99,106,153,231,153,23,152,23,153,141,50,
+  127,97,54,49,47,49,117,204,102,102,11,243,50,179,149,249,
+  43,243,10,243,170,76,61,243,26,211,192,108,99,26,153,215,
+  153,237,204,27,76,19,243,55,153,29,204,155,204,78,230,45,
+  102,23,243,54,211,204,188,195,236,102,222,101,246,200,188,199,
+  236,101,246,49,45,204,126,230,0,243,62,115,144,249,128,57,
+  36,243,33,115,152,57,194,180,50,31,49,71,153,54,230,239,
+  204,63,152,118,230,99,153,79,152,127,50,159,50,199,152,207,
+  152,14,230,56,243,57,115,130,249,151,204,73,230,11,230,75,
+  166,147,233,98,78,49,95,49,95,51,167,153,111,152,110,153,
+  111,153,51,204,119,204,247,204,15,204,89,230,71,230,28,115,
+  158,233,97,126,146,145,152,11,76,47,115,145,233,99,194,63,
+  163,170,163,234,163,8,164,74,164,104,116,137,74,170,78,138,
+  80,170,84,138,86,170,90,138,92,170,96,170,100,138,102,151,
+  168,166,234,166,8,167,74,167,104,167,170,167,200,167,10,168,
+  40,120,137,134,170,138,138,140,170,144,138,146,170,150,138,152,
+  170,156,138,158,170,162,151,104,170,170,170,200,170,10,171,40,
+  171,106,171,136,171,202,171,232,171,42,172,74,172,104,172,136,
+  172,202,172,232,172,42,173,73,13,180,42,210,74,73,171,39,
+  173,168,180,202,218,172,213,151,86,100,90,165,105,229,166,213,
+  220,128,194,211,170,79,43,65,173,14,181,98,212,42,178,81,
+  171,75,173,56,181,10,213,202,116,64,173,106,5,171,85,173,
+  86,186,90,253,106,69,188,75,43,101,173,158,181,162,214,42,
+  91,43,239,1,53,174,21,186,86,237,90,201,107,117,175,21,
+  63,81,204,12,249,5,224,143,174,127,3,20,199,150,136,132,
+  24,0,0,
+};
+/* tao_ms25 data */
+static const unsigned char dat_tao_ms25 = {
+  31,139,8,0,0,0,0,0,0,3,237,214,123,88,19,87,
+  218,0,240,119,38,33,25,66,8,1,81,137,15,104,64,172,
+  145,157,109,193,15,125,176,107,17,176,106,160,154,90,109,119,
+  173,159,237,142,174,37,168,20,81,75,235,182,180,85,188,161,
+  182,86,168,85,171,182,106,171,22,47,181,136,151,122,65,69,
+  180,94,170,181,128,215,170,21,181,86,188,213,170,245,58,2,
+  217,247,157,132,19,235,158,221,103,159,253,227,251,235,251,229,
+  121,231,204,156,51,153,115,206,155,204,204,81,0,194,20,128,
+  152,148,186,193,17,61,107,93,121,69,123,93,163,250,168,166,
+  201,242,102,207,29,172,31,170,128,160,96,12,82,192,208,19,
+  30,17,247,8,251,243,131,71,218,251,228,141,25,246,183,49,
+  246,246,93,146,236,143,182,167,212,245,172,143,5,103,157,167,
+  113,48,8,166,222,181,239,122,176,199,49,116,156,174,122,102,
+  165,101,131,53,99,92,166,99,48,152,210,162,235,37,188,126,
+  33,68,215,7,250,74,147,86,118,201,7,65,18,233,155,174,
+  188,193,16,216,147,190,35,59,93,163,6,131,116,162,75,14,
+  152,141,141,169,170,177,208,190,26,244,88,174,203,21,211,10,
+  30,115,118,236,10,205,211,230,63,183,207,83,159,144,47,8,
+  32,247,82,165,146,232,103,64,194,242,51,44,195,49,34,226,
+  92,39,43,31,123,21,236,209,253,193,26,58,2,2,32,100,
+  208,116,251,244,1,5,213,245,216,237,192,231,246,122,54,167,
+  170,230,184,14,206,224,120,44,19,177,76,195,50,25,203,231,
+  177,116,98,153,137,101,63,44,199,98,57,8,203,105,88,102,
+  98,185,32,85,13,58,131,229,234,180,36,213,22,122,13,66,
+  212,54,184,181,168,182,180,236,166,121,164,171,141,115,51,240,
+  40,19,132,25,253,101,99,99,102,107,91,182,209,67,51,49,
+  220,196,60,205,195,153,60,141,101,49,150,179,177,156,246,140,
+  26,160,96,219,209,193,32,102,102,56,32,206,109,177,229,3,
+  72,146,182,53,43,102,91,22,68,225,81,22,68,74,180,111,
+  145,28,25,221,71,60,110,118,128,14,28,153,82,90,247,22,
+  14,248,131,210,250,168,3,30,59,218,189,115,167,120,165,163,
+  3,58,215,100,65,235,139,169,71,133,48,108,115,142,159,157,
+  138,223,107,103,62,110,235,46,37,26,223,147,146,176,183,74,
+  236,249,30,102,220,170,93,221,170,93,61,92,187,186,140,173,
+  244,123,158,192,214,82,173,53,66,107,141,212,90,227,173,114,
+  224,179,63,69,84,200,210,109,109,59,223,150,34,197,246,76,
+  185,224,172,200,7,163,187,111,85,138,235,1,136,138,83,137,
+  87,58,43,146,242,164,98,85,90,185,70,133,201,146,92,38,
+  75,142,145,173,20,59,238,199,107,251,22,37,210,183,47,143,
+  52,41,86,91,182,180,68,178,43,22,44,27,177,52,216,178,
+  3,7,72,246,158,245,237,161,207,189,66,232,173,62,225,9,
+  112,102,200,210,173,76,81,158,154,33,7,186,176,156,38,143,
+  147,199,203,5,242,4,121,162,60,73,158,44,79,145,11,229,
+  233,242,251,86,89,154,19,89,14,193,165,45,220,166,168,20,
+  16,69,25,66,164,57,174,188,127,247,31,4,171,43,175,191,
+  3,228,76,128,227,161,89,240,71,144,67,49,251,208,41,38,
+  11,172,97,54,171,45,58,29,172,157,59,120,26,221,0,27,
+  135,15,169,196,185,214,164,186,30,88,69,165,183,146,162,116,
+  84,30,83,12,161,41,248,43,84,197,244,141,126,14,172,217,
+  82,204,48,208,211,94,232,48,250,239,117,191,4,6,251,84,
+  165,204,150,98,108,196,240,40,37,120,118,98,40,245,219,73,
+  89,240,90,200,44,8,77,131,96,165,24,107,101,140,63,42,
+  133,209,249,218,13,153,152,33,100,154,122,168,1,123,163,51,
+  64,114,229,225,200,66,192,124,200,1,230,4,252,69,32,165,
+  162,28,207,233,230,142,189,226,140,125,83,63,228,72,133,239,
+  91,73,209,3,65,138,238,135,119,194,64,136,192,176,99,196,
+  186,242,188,247,154,43,47,23,94,7,109,118,113,56,59,252,
+  233,135,235,95,152,106,13,197,25,74,51,29,16,156,45,230,
+  2,142,193,18,155,5,225,97,173,172,173,112,174,33,53,169,
+  190,217,2,36,99,56,49,6,122,159,37,144,131,49,22,163,
+  0,99,1,198,34,140,18,140,13,24,219,48,14,96,28,198,
+  56,133,113,33,33,31,26,193,81,133,227,199,163,211,120,116,
+  23,28,216,87,199,206,93,61,30,156,97,56,62,151,250,225,
+  61,237,63,103,115,66,190,232,63,90,149,144,175,243,176,163,
+  79,241,200,223,54,51,129,102,20,169,221,51,137,218,54,201,
+  127,85,168,247,246,172,100,97,217,116,133,65,222,58,237,87,
+  136,211,106,50,30,186,126,178,247,234,15,181,202,9,249,250,
+  166,254,236,9,249,1,77,251,225,152,169,136,170,148,30,55,
+  1,20,104,60,248,226,52,220,210,239,21,222,25,170,82,226,
+  59,1,224,255,42,102,120,4,254,118,109,193,142,219,88,136,
+  214,178,31,163,93,251,201,209,16,238,128,104,188,79,147,240,
+  222,239,226,182,22,59,192,62,180,149,118,70,151,209,160,88,
+  107,240,184,76,124,69,210,206,238,18,38,134,166,66,210,57,
+  83,177,56,84,95,156,47,192,185,244,170,212,132,84,104,141,
+  223,79,116,91,19,241,206,119,142,159,149,154,144,6,157,207,
+  103,84,165,37,164,64,36,94,181,91,166,168,253,187,187,230,
+  196,99,255,79,65,87,43,214,85,59,32,25,159,33,33,144,
+  252,170,197,251,207,240,222,7,10,125,35,57,199,160,141,32,
+  89,114,128,30,44,110,73,59,178,184,242,240,155,201,69,14,
+  176,100,27,154,106,156,117,21,227,82,213,251,27,210,250,118,
+  132,51,233,25,144,253,116,170,42,154,112,148,93,49,158,74,
+  195,243,181,145,119,195,90,23,183,182,248,159,107,21,103,170,
+  42,236,110,170,199,186,16,173,197,163,157,47,253,139,250,12,
+  94,125,239,90,65,231,202,11,241,112,63,85,150,107,150,150,
+  193,125,204,51,130,126,8,122,194,52,35,240,110,160,91,58,
+  35,13,54,94,52,190,97,12,50,44,51,244,10,184,26,48,
+  39,160,151,254,129,126,173,62,87,31,175,187,165,219,162,155,
+  164,235,175,107,43,222,17,247,139,159,139,111,139,47,138,73,
+  98,132,160,10,63,10,149,194,114,161,72,120,75,120,69,120,
+  78,72,22,100,33,82,48,67,3,92,131,179,112,24,246,194,
+  86,40,131,18,88,8,179,97,6,76,134,119,224,13,200,133,
+  225,48,20,94,134,23,225,121,120,22,158,129,94,208,29,186,
+  193,159,32,9,58,65,71,120,2,100,136,131,246,208,14,255,
+  51,209,208,6,162,240,110,111,5,54,104,9,45,160,57,52,
+  131,48,8,5,43,206,210,2,193,248,49,67,16,152,240,19,
+  8,18,126,140,248,49,224,83,71,143,239,7,17,179,201,8,
+  180,239,59,166,66,196,208,97,232,49,2,48,12,24,70,76,
+  26,61,37,233,9,73,79,199,32,12,51,70,240,163,75,133,
+  255,247,223,240,0,61,192,103,247,233,223,177,147,27,239,73,
+  185,252,233,103,93,61,236,150,106,92,223,96,216,49,98,49,
+  28,49,57,96,199,85,142,104,46,242,32,183,161,186,104,208,
+  84,229,230,128,169,213,31,227,170,231,42,182,234,15,209,58,
+  198,30,243,56,72,213,69,213,203,155,142,177,245,166,43,47,
+  165,206,89,7,133,233,234,157,48,92,133,0,190,209,202,181,
+  251,27,232,93,154,170,54,38,219,239,9,225,24,86,235,61,
+  213,136,17,136,209,28,35,74,218,8,130,106,196,117,77,20,
+  30,181,197,104,135,209,18,239,172,205,29,156,230,139,88,46,
+  194,82,141,222,43,132,227,254,183,184,6,50,99,89,138,101,
+  107,172,179,134,214,227,183,219,106,219,118,29,198,10,137,210,
+  112,219,88,181,153,52,18,183,54,41,23,183,109,164,81,169,
+  234,237,131,120,110,98,90,23,143,71,181,185,70,209,71,186,
+  7,1,170,81,219,54,195,127,127,188,26,168,109,155,227,104,
+  116,106,203,222,181,161,64,171,216,166,57,221,78,166,57,185,
+  93,184,218,242,205,167,33,39,250,184,16,142,97,13,61,174,
+  26,49,2,49,154,99,68,217,6,4,217,113,60,21,56,170,
+  227,106,59,140,150,209,106,67,150,144,24,170,54,184,213,102,
+  184,29,130,43,56,181,225,37,181,77,83,47,248,95,151,65,
+  39,205,195,183,124,50,174,170,28,88,46,195,167,97,123,183,
+  9,159,158,237,113,93,149,162,68,110,232,10,250,76,67,199,
+  39,27,210,20,43,238,7,104,251,151,21,61,182,70,154,241,
+  142,203,20,107,82,187,171,194,92,239,149,50,91,224,254,203,
+  107,49,219,110,125,244,62,193,138,231,154,106,82,21,75,15,
+  85,112,174,199,218,76,173,182,67,122,112,107,90,93,5,71,
+  84,230,135,120,202,242,193,58,82,238,161,138,133,101,253,70,
+  26,122,92,6,189,114,167,187,42,206,179,198,129,46,28,127,
+  29,81,132,235,19,33,180,82,141,10,189,97,5,181,157,43,
+  79,76,130,235,106,148,43,207,55,230,243,255,106,204,245,23,
+  253,99,174,47,240,142,185,135,10,229,56,110,157,59,134,70,
+  96,190,101,14,3,193,61,4,183,162,123,80,248,4,108,93,
+  209,33,195,172,118,200,8,94,173,244,142,119,64,235,159,157,
+  53,41,231,211,177,93,231,182,104,237,53,77,237,248,110,176,
+  104,43,146,144,58,39,206,47,227,72,133,109,96,112,28,70,
+  87,12,23,134,130,49,26,99,34,198,236,166,92,61,60,99,
+  97,246,195,51,22,74,112,198,162,111,198,33,56,99,154,109,
+  91,154,183,54,227,16,42,1,87,113,244,108,42,4,215,152,
+  166,245,92,116,125,88,226,159,199,10,225,252,154,192,135,107,
+  172,252,154,255,228,58,255,119,53,15,61,63,4,239,227,91,
+  16,69,109,71,212,233,232,33,46,232,244,122,29,86,136,250,
+  128,0,61,62,242,117,1,6,67,0,166,87,111,48,26,13,
+  248,26,8,48,74,146,17,95,8,6,41,48,80,194,87,131,
+  49,208,100,10,196,151,132,100,10,10,50,225,11,35,48,200,
+  108,14,194,151,135,201,28,28,108,198,215,72,80,176,197,18,
+  140,175,20,179,37,36,196,130,79,127,183,85,16,244,118,81,
+  88,28,175,11,176,165,232,13,83,250,6,152,18,21,131,229,
+  90,174,49,196,147,107,196,142,140,129,102,75,104,179,22,17,
+  173,162,218,196,196,182,239,32,63,158,240,63,157,146,158,124,
+  170,91,218,211,189,210,123,187,250,246,127,97,192,192,151,254,
+  58,100,168,123,216,136,156,220,49,121,99,223,124,251,221,130,
+  137,147,167,78,159,49,243,195,143,230,206,251,100,225,226,37,
+  203,150,175,92,93,186,118,253,198,205,229,219,119,236,218,189,
+  111,255,193,170,67,71,142,157,56,85,123,246,252,133,75,87,
+  174,93,191,121,251,174,90,159,233,206,26,54,124,248,136,236,
+  87,115,70,230,142,26,61,230,181,188,215,223,24,251,247,55,
+  223,202,127,251,157,119,199,141,47,152,48,113,210,228,41,133,
+  83,167,77,127,239,253,25,31,204,44,42,254,112,214,71,179,
+  231,204,253,120,222,252,5,159,124,186,112,225,162,197,159,125,
+  190,100,233,178,47,74,150,175,88,185,234,203,213,95,149,174,
+  41,91,187,110,253,134,175,55,110,218,188,165,124,235,182,237,
+  21,59,42,119,238,250,102,247,158,189,251,190,221,127,224,187,
+  131,223,87,85,215,28,58,124,228,200,209,99,199,127,56,113,
+  242,212,143,167,107,207,156,61,247,211,249,159,47,212,93,188,
+  116,249,202,213,95,174,253,122,253,198,205,223,110,221,190,115,
+  247,222,125,245,65,125,67,163,103,209,162,197,216,5,246,177,
+  116,25,246,82,178,28,251,89,185,10,123,194,174,74,215,96,
+  103,107,215,97,119,216,223,198,77,216,227,150,114,236,19,59,
+  173,216,129,221,238,220,133,29,239,222,131,93,99,223,251,15,
+  96,239,7,191,199,254,113,0,135,14,31,62,114,244,232,49,
+  28,3,14,226,228,41,28,198,233,90,28,200,217,115,56,20,
+  28,203,133,58,28,205,165,203,56,30,28,208,181,95,113,72,
+  55,110,226,160,110,221,198,97,225,184,238,171,56,178,250,6,
+  28,155,167,31,233,79,158,215,188,64,254,76,254,66,6,144,
+  23,201,64,242,191,100,16,121,137,188,76,254,170,81,200,96,
+  50,132,252,141,12,37,175,144,76,226,38,89,100,152,102,56,
+  25,65,178,201,171,36,135,140,36,185,100,20,25,77,198,144,
+  215,52,121,228,117,242,6,25,75,254,78,222,36,111,145,124,
+  242,54,121,71,243,46,25,71,198,147,2,50,129,76,36,147,
+  200,100,50,133,20,146,169,154,105,100,58,121,143,188,79,102,
+  144,15,200,76,82,68,138,201,135,100,150,230,35,50,155,204,
+  33,115,201,199,100,30,153,79,22,144,79,200,167,154,133,100,
+  17,89,76,62,35,159,147,37,100,41,89,70,190,32,37,100,
+  185,102,5,89,73,86,145,47,201,106,242,21,41,37,107,72,
+  25,89,171,89,71,214,147,13,228,107,178,145,108,34,155,201,
+  22,82,78,182,146,109,154,237,164,130,236,32,149,100,39,217,
+  69,190,33,187,201,30,178,151,236,211,124,75,246,147,3,228,
+  59,114,144,124,79,170,72,53,169,33,135,52,135,201,17,114,
+  148,28,35,199,201,15,228,4,57,73,78,145,31,201,105,77,
+  45,57,67,206,146,115,228,39,114,158,252,76,46,144,58,114,
+  81,115,137,92,38,87,200,85,242,11,185,70,126,37,215,201,
+  13,114,147,252,166,185,69,110,147,59,228,46,185,71,238,19,
+  149,60,32,245,164,65,211,72,60,154,135,210,227,205,143,47,
+  67,222,20,249,146,228,205,146,47,79,222,68,249,82,229,205,
+  213,239,178,229,203,151,55,97,190,148,121,115,230,203,154,55,
+  109,190,196,121,51,231,203,157,47,121,222,236,121,211,231,75,
+  160,47,133,222,28,250,178,232,77,163,47,145,222,76,254,46,
+  151,190,108,122,211,233,75,168,55,163,190,156,122,147,234,75,
+  171,55,175,190,204,250,82,235,205,173,55,185,190,244,250,18,
+  236,205,176,47,199,222,36,251,210,236,205,243,239,50,221,148,
+  107,143,103,9,179,148,89,198,124,193,148,48,203,253,86,48,
+  43,153,85,204,151,204,106,191,175,152,82,102,13,83,198,172,
+  245,91,199,172,103,54,48,95,51,27,153,77,126,155,153,45,
+  76,57,179,149,217,230,183,157,169,96,118,48,149,204,78,191,
+  93,204,55,204,110,102,15,179,151,217,231,247,45,179,159,57,
+  192,124,199,28,244,251,158,169,98,170,153,26,230,144,223,97,
+  230,8,115,148,57,198,28,247,251,129,57,193,156,100,78,49,
+  63,50,167,253,106,153,51,204,89,230,28,243,147,223,121,230,
+  103,230,2,83,199,92,244,187,196,92,102,174,48,87,153,95,
+  152,107,126,191,50,215,153,27,204,77,230,55,191,91,204,109,
+  230,14,115,151,185,231,119,159,81,153,7,76,61,211,224,215,
+  200,120,126,103,220,35,198,243,20,112,76,224,152,200,51,137,
+  99,50,207,20,142,66,142,169,60,211,56,166,115,188,199,243,
+  62,199,12,158,15,56,102,114,20,241,20,115,124,200,49,139,
+  231,35,142,217,60,115,56,230,114,124,204,51,143,99,62,199,
+  2,158,79,56,62,229,89,200,177,136,99,49,207,103,28,159,
+  243,44,225,88,202,177,140,231,11,142,18,142,229,60,43,56,
+  86,242,172,226,248,146,99,53,207,87,28,165,28,107,120,202,
+  56,214,242,172,227,88,207,177,129,231,107,142,141,28,155,120,
+  54,115,108,225,41,231,216,202,177,141,103,59,71,5,199,14,
+  158,74,142,157,60,187,56,190,225,216,205,179,135,99,239,63,
+  131,127,0,100,203,168,13,114,30,0,0,
+};
+/* tao_ms27 data */
+static const unsigned char dat_tao_ms27 = {
+  31,139,8,0,0,0,0,0,0,3,237,151,125,88,84,213,
+  190,199,127,123,207,11,27,28,135,129,240,5,46,234,12,33,
+  77,220,93,9,15,114,209,8,135,65,116,36,157,124,233,156,
+  107,158,78,119,211,49,6,9,21,83,204,67,84,228,43,168,
+  17,144,145,153,149,169,41,154,153,111,153,41,42,162,229,75,
+  29,5,36,35,211,163,153,229,75,102,102,168,180,69,230,252,
+  126,123,182,179,71,91,61,157,63,206,243,220,251,220,231,124,
+  246,243,219,107,237,181,103,175,151,239,94,223,181,215,72,0,
+  22,9,32,4,35,66,116,185,39,21,192,48,25,22,137,91,
+  189,173,88,226,150,128,139,199,0,9,140,99,225,54,226,111,
+  195,106,181,62,156,61,209,58,172,112,242,184,191,76,198,139,
+  219,239,187,206,120,59,134,200,222,213,206,124,176,100,149,228,
+  216,251,21,3,39,56,179,33,164,197,214,46,96,125,165,96,
+  107,15,86,211,16,37,29,122,226,121,175,187,48,27,130,23,
+  210,51,24,17,195,100,155,128,215,177,253,38,128,73,72,75,
+  151,131,142,90,215,130,30,211,185,152,70,99,122,181,128,159,
+  2,113,174,196,84,232,18,87,63,98,191,183,61,161,152,227,
+  64,28,44,11,231,109,15,130,128,233,105,76,35,48,186,199,
+  187,191,170,143,27,15,86,219,40,176,132,61,9,6,8,125,
+  116,158,117,222,232,233,233,103,97,204,136,125,222,90,103,190,
+  224,244,245,96,136,220,209,138,117,47,170,175,197,110,233,234,
+  219,97,76,195,174,36,56,153,181,167,24,158,15,115,130,41,
+  27,248,249,202,175,14,102,225,51,57,192,45,31,37,10,105,
+  57,125,44,162,48,32,75,180,173,243,132,132,136,192,217,214,
+  123,248,81,16,233,80,250,237,206,6,238,77,76,151,96,90,
+  141,233,101,76,203,31,148,13,75,49,159,136,245,149,100,217,
+  33,222,99,142,44,6,16,92,202,121,168,100,138,204,133,30,
+  120,149,11,209,194,80,60,155,133,220,100,221,147,247,154,236,
+  160,3,123,142,80,157,209,213,14,255,41,245,60,98,135,184,
+  35,25,201,125,251,72,73,118,232,249,241,238,130,144,147,143,
+  31,113,98,62,249,148,243,136,19,159,235,221,249,108,100,134,
+  48,37,104,190,48,13,91,235,137,173,133,163,166,107,149,218,
+  135,43,181,63,172,212,158,143,119,199,96,191,90,241,29,205,
+  87,238,142,86,238,62,170,220,45,176,136,193,115,190,233,94,
+  39,6,223,67,103,225,48,142,108,236,32,199,119,174,186,98,
+  8,242,12,111,112,184,175,3,47,185,164,62,82,178,36,72,
+  253,37,139,20,229,158,20,46,10,249,27,68,33,119,98,148,
+  100,197,124,129,146,55,75,209,106,62,127,98,136,100,137,204,
+  23,142,9,146,100,142,204,15,78,198,212,136,105,133,32,57,
+  206,12,106,191,11,134,181,225,172,144,239,243,26,86,103,137,
+  193,98,14,47,150,97,58,27,211,185,98,137,248,130,56,93,
+  156,33,206,20,103,137,179,197,57,98,169,56,79,124,17,223,
+  192,161,232,90,232,188,174,171,39,164,135,3,120,94,132,80,
+  225,208,160,19,238,194,223,154,115,52,43,193,226,46,28,101,
+  7,49,7,224,98,88,46,220,3,162,211,14,125,99,114,193,
+  18,30,105,137,180,13,1,75,242,221,222,14,15,64,67,222,
+  212,122,28,109,83,186,251,186,133,151,30,147,70,74,3,165,
+  20,201,24,230,192,247,208,16,51,220,54,2,44,249,166,152,
+  113,160,167,28,205,223,176,113,52,207,50,206,129,209,90,150,
+  41,27,92,235,15,228,24,141,249,216,98,132,180,132,102,6,
+  198,0,169,26,159,79,10,163,126,244,149,230,78,9,93,0,
+  56,199,58,75,37,88,42,98,220,35,129,119,170,179,6,146,
+  178,184,156,144,76,217,24,110,203,2,193,93,136,253,12,5,
+  211,97,59,152,80,255,1,158,164,239,93,177,69,250,218,230,
+  186,2,176,57,32,197,54,6,132,184,49,120,182,98,196,90,
+  236,112,151,71,176,218,33,162,162,6,186,147,23,190,168,35,
+  87,184,11,125,158,116,23,22,192,84,192,182,226,113,204,130,
+  37,50,79,255,135,50,75,24,142,91,136,128,186,84,232,85,
+  97,135,206,249,124,133,3,127,97,142,205,133,136,240,40,75,
+  20,234,208,171,41,93,85,2,160,2,163,26,163,6,163,8,
+  99,19,198,22,140,90,140,6,140,22,140,99,24,223,97,156,
+  199,160,213,166,13,163,29,87,27,35,166,247,98,36,98,36,
+  99,68,73,190,53,138,71,117,250,71,102,116,62,37,149,99,
+  46,85,42,197,246,241,55,222,233,152,90,49,45,194,244,126,
+  76,159,82,244,7,111,94,66,49,92,5,59,62,185,21,115,
+  29,74,110,29,230,174,129,157,158,76,78,245,122,81,187,8,
+  108,49,14,87,9,223,253,138,132,98,222,151,155,157,80,172,
+  243,98,174,24,83,42,153,146,144,1,209,228,27,140,105,218,
+  179,112,222,87,119,68,42,246,97,56,230,233,25,151,175,76,
+  121,135,241,82,127,181,166,68,95,77,106,105,108,66,177,158,
+  234,141,78,40,54,80,26,129,74,118,111,112,100,94,6,92,
+  109,59,214,62,50,23,207,53,212,134,192,131,33,71,223,128,
+  111,54,25,26,28,125,250,2,84,165,227,236,140,201,27,132,
+  179,50,70,169,173,127,132,29,98,195,237,144,130,171,70,63,
+  143,165,202,14,119,142,141,194,59,0,253,170,210,37,75,19,
+  94,111,224,159,16,148,223,246,11,231,195,210,33,229,84,72,
+  21,63,86,95,85,204,65,66,58,244,92,224,236,110,135,36,
+  143,137,86,9,215,204,5,3,19,156,144,188,187,110,90,200,
+  217,236,134,244,83,206,6,103,130,3,162,221,133,88,251,128,
+  28,94,241,70,234,132,62,56,227,30,128,84,156,75,3,26,
+  237,144,134,171,80,40,164,141,55,251,102,144,207,69,82,52,
+  62,145,54,193,168,244,36,77,176,131,30,204,30,65,185,50,
+  187,11,241,201,180,74,59,152,243,141,55,75,92,103,234,74,
+  210,229,95,22,58,135,39,194,201,33,89,144,63,48,93,230,
+  99,177,183,169,24,15,224,104,211,148,17,12,192,210,92,102,
+  233,154,95,151,74,174,116,153,59,121,179,28,203,66,149,59,
+  94,229,247,49,191,81,62,150,85,62,244,4,167,115,23,222,
+  254,21,188,137,249,162,185,91,231,97,166,242,78,95,118,186,
+  47,164,60,248,90,176,71,56,41,100,7,157,13,122,58,168,
+  147,113,133,113,176,225,130,225,85,195,96,253,117,253,70,125,
+  129,190,143,174,85,183,77,55,75,55,74,119,39,127,149,255,
+  148,95,198,63,203,63,194,167,240,221,57,153,59,206,213,115,
+  171,184,74,238,25,238,9,110,4,151,198,137,92,52,103,130,
+  27,112,17,190,134,102,216,7,219,97,3,212,192,91,80,13,
+  229,48,27,158,131,167,161,0,242,96,44,60,6,143,192,195,
+  240,16,60,8,131,33,3,6,192,253,144,2,125,33,17,238,
+  3,17,226,225,46,232,13,119,130,13,122,65,15,136,134,40,
+  136,132,110,208,21,186,192,29,16,14,97,96,193,81,154,241,
+  232,12,38,232,132,71,8,4,227,33,224,17,164,28,70,60,
+  12,202,161,87,15,157,122,240,202,193,5,28,42,28,229,212,
+  43,74,120,250,116,98,232,49,12,24,70,140,32,148,149,86,
+  97,90,129,105,245,237,132,97,194,232,252,91,34,255,155,127,
+  6,47,208,167,160,122,216,168,196,255,242,160,91,197,218,129,
+  15,185,51,173,230,70,220,41,97,68,99,88,49,98,49,236,
+  49,19,192,138,123,37,222,84,233,69,60,198,198,202,71,203,
+  164,203,163,203,26,95,195,189,211,5,188,171,63,220,142,53,
+  90,99,238,5,161,177,178,113,213,205,107,188,123,217,93,232,
+  56,227,58,3,165,67,228,43,71,112,223,227,192,175,229,76,
+  197,253,14,250,82,167,203,29,78,107,27,151,132,97,177,180,
+  201,65,24,193,24,119,96,116,193,232,134,17,137,209,67,216,
+  2,156,28,228,76,145,35,249,20,184,36,247,192,178,94,24,
+  189,211,229,110,61,77,21,212,115,15,159,157,104,147,97,5,
+  151,132,231,229,156,69,104,3,131,28,164,156,239,192,179,94,
+  14,86,206,93,176,38,157,220,109,232,137,48,160,239,123,186,
+  108,184,55,198,101,13,174,171,245,122,59,32,198,113,183,163,
+  83,82,76,42,206,69,71,21,246,49,188,133,246,134,86,71,
+  140,35,97,8,68,225,247,216,130,105,8,165,184,251,179,222,
+  237,234,148,18,88,174,150,165,198,184,98,93,84,134,138,153,
+  213,114,11,93,147,26,9,89,16,114,235,234,64,234,148,160,
+  58,173,91,72,29,207,64,220,79,170,202,220,176,219,90,112,
+  52,45,156,37,172,69,14,194,8,198,184,3,163,11,70,55,
+  140,72,75,119,252,206,134,250,20,121,33,69,238,129,101,189,
+  48,122,227,232,56,26,221,48,217,176,110,232,17,115,171,235,
+  162,185,21,248,212,26,136,142,43,242,150,78,129,36,157,73,
+  4,157,208,228,25,141,123,65,59,238,80,62,171,112,224,58,
+  107,243,8,13,142,196,100,252,178,56,54,167,130,62,199,152,
+  216,191,253,172,148,132,121,3,229,111,84,72,246,68,59,208,
+  106,125,191,167,103,51,158,155,157,137,125,173,160,236,31,119,
+  209,254,177,73,221,63,54,167,199,20,121,173,190,54,114,186,
+  102,200,92,221,70,124,191,30,189,109,63,103,193,58,23,52,
+  165,75,230,76,153,91,253,1,150,230,40,165,216,186,185,155,
+  3,244,184,103,176,230,225,158,1,243,17,245,197,161,222,13,
+  197,96,153,40,102,202,250,125,27,70,142,55,102,158,7,189,
+  116,53,67,54,196,91,226,65,23,129,35,230,121,184,52,19,
+  194,234,113,236,63,89,64,238,237,46,244,169,65,99,215,31,
+  187,125,236,29,202,216,125,99,230,98,110,27,115,180,127,204,
+  110,201,114,115,204,215,207,74,122,26,115,166,12,178,9,87,
+  50,143,168,246,52,34,160,167,122,83,56,112,158,169,120,230,
+  61,5,17,51,98,139,58,172,182,3,92,146,52,246,244,16,
+  44,211,121,162,149,178,8,42,139,203,26,252,61,20,101,137,
+  66,127,143,30,71,83,146,60,55,182,72,110,181,244,151,175,
+  226,126,44,244,156,171,185,142,234,167,124,42,190,217,197,144,
+  199,47,30,20,87,116,163,5,159,210,167,97,137,37,170,194,
+  72,173,118,45,193,18,203,136,67,222,75,191,255,54,154,156,
+  129,74,234,158,11,84,82,119,82,85,50,82,85,146,84,236,
+  133,122,70,170,74,70,210,108,181,181,211,90,91,10,238,201,
+  255,43,43,213,191,249,63,195,205,255,63,9,184,190,115,201,
+  238,201,191,190,14,214,174,195,89,215,191,247,252,255,239,107,
+  200,181,112,156,193,202,115,75,251,232,12,81,14,189,177,116,
+  184,33,164,175,100,52,255,88,16,20,234,45,8,250,151,191,
+  48,222,16,20,98,10,13,139,232,26,249,31,61,172,49,189,
+  239,138,23,239,75,72,74,78,185,255,1,135,51,115,112,214,
+  208,135,70,140,250,227,232,63,253,89,122,252,9,79,94,254,
+  132,73,147,167,78,123,230,217,146,233,179,230,148,205,47,175,
+  124,185,122,225,235,111,44,89,186,124,229,170,53,107,215,111,
+  220,188,101,219,246,157,245,123,246,238,255,236,96,227,225,207,
+  91,142,30,63,113,234,244,153,115,23,46,94,250,249,74,155,
+  124,35,199,147,59,46,239,201,252,241,19,38,22,76,122,106,
+  242,148,194,169,79,79,251,107,209,51,197,207,62,247,124,201,
+  11,211,103,204,156,53,107,246,156,210,178,185,243,230,191,88,
+  254,82,69,101,213,203,11,94,169,126,117,225,107,139,94,95,
+  252,198,155,111,45,121,123,233,178,229,239,172,88,89,179,106,
+  245,187,107,222,91,251,254,186,245,27,54,110,250,96,243,135,
+  91,62,218,186,117,91,237,246,29,59,235,118,213,239,222,243,
+  241,39,123,247,237,63,240,233,103,127,59,120,168,161,177,233,
+  112,243,231,71,190,104,249,242,232,87,199,142,255,253,196,201,
+  175,79,125,115,250,219,239,206,156,61,119,254,251,11,63,92,
+  252,241,210,165,159,46,255,220,122,229,234,181,182,95,228,235,
+  237,55,58,188,75,222,198,38,150,45,199,70,86,172,196,102,
+  176,157,119,215,96,75,107,223,199,182,176,177,141,155,176,185,
+  205,31,98,131,74,139,216,228,142,157,216,232,174,122,108,22,
+  219,253,100,47,182,188,255,0,182,141,141,31,60,132,205,55,
+  54,97,7,154,63,199,46,96,31,190,60,138,189,56,118,28,
+  251,129,29,249,250,20,118,229,244,183,216,25,236,205,185,243,
+  216,159,11,63,96,143,148,46,97,159,90,175,96,175,174,181,
+  97,191,176,99,237,55,176,107,94,239,200,145,35,71,17,15,
+  19,127,32,254,72,252,55,49,154,120,132,24,163,240,39,226,
+  81,226,207,196,99,196,255,16,18,145,77,60,78,252,133,24,
+  75,60,161,144,67,120,136,92,98,28,145,71,60,73,228,19,
+  227,137,9,196,68,133,2,98,18,241,20,49,153,152,66,20,
+  18,83,137,167,137,105,196,95,137,34,133,103,136,98,226,89,
+  226,57,226,121,162,132,120,129,152,78,204,32,102,42,204,34,
+  102,19,115,136,82,162,140,152,75,204,35,230,19,47,18,229,
+  196,75,10,21,68,37,81,69,188,76,44,32,94,33,170,137,
+  87,137,133,196,107,10,139,136,215,137,197,196,27,196,155,196,
+  91,196,18,226,109,98,41,177,140,88,174,240,14,177,130,88,
+  73,212,16,171,136,213,196,187,196,26,226,61,98,45,241,190,
+  194,58,98,61,177,129,216,72,108,34,62,32,54,19,31,18,
+  91,136,143,20,182,18,219,136,90,98,59,177,131,216,73,212,
+  17,187,136,122,98,55,177,71,225,99,226,19,98,47,177,143,
+  216,79,28,32,62,37,62,35,254,70,28,84,56,68,52,16,
+  141,68,19,113,152,104,38,62,39,142,16,95,16,45,196,151,
+  10,71,137,175,136,99,196,113,226,239,196,9,226,36,241,53,
+  113,138,248,70,225,52,241,45,241,29,113,134,56,75,156,35,
+  206,19,223,19,23,136,31,136,139,10,63,18,151,136,159,136,
+  203,196,207,68,43,113,133,184,74,92,35,218,136,95,20,100,
+  226,58,209,78,220,32,58,8,239,77,84,117,84,125,124,2,
+  169,18,249,52,186,69,37,85,39,159,80,170,84,62,173,84,
+  181,124,114,169,130,169,146,249,52,187,69,53,85,55,159,112,
+  170,116,62,237,84,245,124,242,169,2,250,20,188,69,67,85,
+  69,159,140,170,144,62,37,85,45,125,98,170,114,250,244,84,
+  21,189,69,83,85,85,159,172,170,176,62,101,85,109,125,226,
+  170,242,250,244,85,21,86,37,246,105,236,19,89,149,217,167,
+  179,170,180,38,53,162,185,72,179,146,230,39,205,84,154,179,
+  86,105,254,210,76,166,57,77,179,155,230,185,0,227,105,238,
+  211,44,168,249,80,51,163,230,200,77,154,47,53,115,106,14,
+  213,108,26,224,85,205,176,154,107,53,235,106,254,213,76,188,
+  67,179,178,230,103,205,212,154,179,53,123,7,120,92,51,186,
+  230,118,205,242,154,239,53,243,7,78,241,128,105,238,159,233,
+  1,179,221,63,225,3,103,189,127,226,7,76,126,255,252,15,
+  240,128,223,6,129,94,208,236,224,119,68,128,43,252,198,8,
+  116,135,223,32,1,38,241,251,36,192,43,154,95,2,60,227,
+  183,77,128,117,252,238,9,180,144,223,69,1,78,242,155,41,
+  192,80,126,79,5,26,203,239,173,0,127,105,22,243,187,44,
+  208,106,126,183,5,56,206,111,186,0,227,105,230,11,48,160,
+  223,131,1,62,244,91,49,192,142,154,37,3,108,233,119,102,
+  128,59,253,6,253,149,75,85,74,180,111,245,109,76,103,49,
+  131,193,76,22,179,24,204,102,48,135,69,41,131,50,6,115,
+  89,204,99,48,159,197,139,12,202,25,188,196,162,130,65,37,
+  139,42,6,47,51,88,192,226,21,6,213,12,94,101,177,144,
+  193,107,44,22,49,120,157,193,98,22,111,48,120,147,193,91,
+  44,150,48,120,155,197,82,6,203,24,44,103,241,14,131,21,
+  12,86,178,168,97,176,138,197,106,6,239,50,88,195,226,61,
+  6,107,25,188,207,98,29,131,245,44,54,48,216,200,96,19,
+  139,15,24,108,102,241,33,131,45,12,62,98,177,149,193,54,
+  6,181,44,182,51,216,193,98,39,131,58,6,187,88,212,51,
+  216,205,96,15,139,143,25,124,194,98,47,131,125,12,252,31,
+  254,131,255,0,225,233,28,134,184,33,0,0,
+};
+/* tao_tsd data */
+static const unsigned char dat_tao_tsd = {
+  31,139,8,0,0,0,0,0,0,3,236,215,121,88,19,87,
+  187,0,240,119,38,11,59,132,136,10,136,154,68,132,136,8,
+  33,138,34,165,154,4,144,132,37,138,184,160,181,54,32,16,
+  68,196,53,130,136,138,27,34,46,85,90,181,46,159,107,107,
+  69,173,11,106,181,238,117,223,170,108,46,173,214,21,45,168,
+  69,196,22,109,12,228,123,19,108,175,189,207,211,239,185,127,
+  124,247,246,185,247,190,191,121,206,204,153,247,204,156,45,147,
+  147,140,14,152,137,90,131,214,160,3,96,69,185,66,93,159,
+  80,161,46,173,77,18,56,94,214,24,133,137,73,224,84,173,
+  52,10,7,172,58,31,224,88,221,63,9,160,95,116,148,30,
+  204,15,194,141,194,80,249,252,78,106,179,73,107,80,190,94,
+  0,225,70,79,153,200,142,57,15,76,184,209,203,199,154,115,
+  10,202,51,223,3,239,160,188,124,5,72,92,243,96,14,136,
+  113,207,1,70,107,192,58,250,96,93,125,66,120,55,251,29,
+  140,26,43,63,20,53,142,13,181,89,23,41,227,73,226,48,
+  158,124,4,207,195,108,214,245,147,241,245,124,137,22,35,3,
+  98,140,237,202,246,126,55,150,27,110,244,56,223,85,211,132,
+  173,98,116,83,140,209,227,80,233,226,20,174,196,73,103,31,
+  103,108,183,179,116,73,42,43,113,242,203,245,216,144,7,126,
+  204,234,197,25,110,97,97,44,220,142,196,178,98,63,231,213,
+  139,215,98,206,163,80,107,152,104,115,82,17,175,140,80,158,
+  50,129,253,99,181,246,141,128,117,115,175,194,109,160,90,120,
+  242,223,147,139,63,111,222,169,53,196,225,204,140,55,75,112,
+  200,96,195,230,131,217,108,46,205,79,171,215,26,194,141,16,
+  42,41,148,135,1,131,163,232,129,71,86,22,6,128,121,41,
+  230,57,120,20,225,145,139,49,70,148,11,2,60,23,224,57,
+  31,143,182,90,3,160,201,48,5,114,32,23,242,96,6,148,
+  230,129,67,22,255,145,198,50,138,183,159,163,31,38,127,76,
+  33,152,180,152,134,99,42,198,244,233,219,180,20,211,34,76,
+  133,74,35,20,88,102,146,51,196,90,47,3,44,38,142,210,
+  232,158,18,94,195,128,88,99,54,97,31,204,19,65,246,45,
+  142,199,100,233,183,121,182,164,16,175,47,78,130,102,123,173,
+  33,40,15,24,62,107,221,115,35,107,0,36,185,230,100,188,
+  163,163,219,247,150,235,85,158,145,88,11,198,180,149,38,172,
+  93,244,110,137,165,85,123,173,181,109,208,26,24,108,86,30,
+  20,32,235,17,32,151,201,100,0,1,131,18,34,240,6,203,
+  80,255,75,251,184,4,81,247,0,153,72,138,183,117,129,191,
+  193,160,164,113,127,71,179,127,24,155,52,58,83,49,106,98,
+  106,210,216,244,9,1,41,169,255,227,237,103,103,103,7,252,
+  141,205,191,125,10,254,86,29,222,201,91,30,103,176,124,183,
+  249,89,98,147,13,152,161,16,196,38,200,135,150,227,210,183,
+  199,13,150,163,214,160,10,89,192,88,191,181,125,48,153,48,
+  189,182,84,225,231,39,106,121,168,101,34,63,11,17,62,98,
+  190,147,68,162,136,56,165,40,65,19,209,18,124,135,250,39,
+  115,179,198,104,62,20,157,159,230,222,27,191,143,188,225,42,
+  127,94,22,166,131,42,127,62,27,123,119,166,89,107,240,207,
+  125,115,250,71,203,55,81,33,194,53,149,163,237,157,5,142,
+  188,196,46,89,192,229,141,80,26,185,119,198,179,170,217,62,
+  106,92,105,92,85,107,226,47,152,77,65,121,12,3,254,174,
+  89,224,2,114,235,190,123,148,145,183,66,28,3,182,120,92,
+  138,71,55,76,238,126,218,91,39,125,198,130,72,156,0,2,
+  215,49,192,3,151,17,11,69,11,19,103,151,91,90,138,182,
+  172,131,242,0,16,136,112,125,115,217,144,255,45,174,130,184,
+  12,62,42,172,41,76,200,239,162,112,172,86,101,242,134,183,
+  244,78,99,108,54,69,227,89,90,159,4,127,94,98,154,187,
+  71,38,111,24,47,17,251,213,47,169,7,238,139,146,2,112,
+  127,37,73,26,99,100,127,153,1,152,15,72,2,134,197,227,
+  120,92,23,141,120,44,197,99,131,214,96,25,61,8,180,134,
+  4,41,248,167,1,92,119,77,135,110,56,138,40,8,150,164,
+  131,64,232,33,240,16,107,64,208,179,139,185,89,15,112,48,
+  35,153,85,130,77,133,210,178,122,234,98,117,10,157,92,231,
+  163,227,187,42,160,171,174,76,50,64,28,15,130,76,91,201,
+  104,224,90,114,174,163,45,163,11,175,5,190,104,129,174,212,
+  67,193,75,196,52,76,183,21,175,238,225,106,105,53,88,183,
+  118,178,203,167,56,125,224,164,43,198,168,63,166,110,186,66,
+  113,20,244,136,102,210,236,35,141,220,68,113,180,101,13,199,
+  62,185,128,99,165,20,28,131,210,193,11,20,150,89,129,190,
+  122,233,83,181,119,46,103,224,181,19,120,71,136,120,56,216,
+  138,7,226,28,15,7,119,76,34,76,222,152,2,130,134,67,
+  68,203,40,121,195,241,233,81,168,194,113,92,182,2,143,12,
+  238,224,5,2,87,28,155,173,16,88,5,184,224,184,234,107,
+  52,174,74,144,46,149,130,83,6,187,84,129,189,113,246,78,
+  7,55,161,167,192,179,52,12,156,211,4,120,230,94,166,104,
+  249,76,174,157,208,61,198,168,75,26,119,88,145,238,54,246,
+  211,173,86,99,169,99,182,20,164,150,90,92,152,52,110,25,
+  246,24,235,158,217,19,202,20,178,96,0,156,99,185,94,216,
+  67,10,61,171,163,203,84,101,233,224,23,164,0,47,235,248,
+  186,131,28,75,37,25,109,48,223,9,68,184,247,6,177,74,
+  106,253,39,192,64,104,177,210,77,10,98,161,20,66,162,165,
+  208,91,239,92,44,5,81,138,59,150,247,46,86,234,4,21,
+  120,86,202,166,218,90,175,237,45,100,177,253,144,7,246,197,
+  108,10,151,171,100,224,129,38,72,9,126,101,74,188,187,135,
+  94,96,105,93,61,235,83,101,144,170,165,23,150,30,96,157,
+  157,199,184,233,249,216,131,206,214,222,68,130,15,214,101,134,
+  206,197,202,79,85,120,159,12,91,15,218,167,212,247,147,73,
+  33,0,175,142,208,119,88,150,14,62,109,164,224,195,134,131,
+  249,107,101,166,63,246,37,2,219,245,193,39,199,87,215,161,
+  252,221,82,213,56,103,107,207,34,240,147,246,193,235,124,181,
+  6,199,21,113,9,221,101,122,252,5,246,63,18,209,95,27,
+  41,114,46,223,9,92,76,34,76,222,152,164,146,44,235,175,
+  58,235,184,12,255,6,152,245,252,242,101,35,22,232,26,18,
+  23,148,175,194,239,218,51,44,229,182,252,74,74,2,192,182,
+  124,89,121,201,239,231,88,138,79,117,251,219,94,1,158,171,
+  61,188,218,150,182,25,217,218,171,85,157,240,138,235,9,193,
+  73,151,50,231,58,231,182,78,113,142,75,28,190,119,8,180,
+  95,98,247,202,78,111,123,207,54,201,166,198,38,219,198,129,
+  191,133,31,197,123,198,91,201,139,226,190,225,238,229,142,231,
+  202,56,191,112,14,115,230,113,18,56,157,216,70,246,18,187,
+  153,157,206,14,99,67,88,119,198,200,252,200,156,100,74,152,
+  101,204,52,38,149,137,103,250,48,254,140,23,227,8,77,80,
+  7,247,161,10,206,195,81,40,133,173,176,30,86,192,18,40,
+  192,191,29,217,48,30,50,32,5,70,194,48,24,4,253,33,
+  6,162,32,28,250,194,123,16,2,193,32,135,64,240,7,63,
+  240,133,206,248,233,139,161,35,180,199,231,220,19,60,160,45,
+  180,129,214,208,10,132,224,10,2,252,22,56,227,230,4,142,
+  224,128,155,61,216,225,102,139,155,141,117,227,227,198,179,110,
+  220,183,27,231,143,141,253,211,198,252,197,214,178,26,255,223,
+  103,198,213,21,255,131,11,246,85,150,43,107,93,160,39,254,
+  107,195,213,240,50,70,182,253,41,114,8,35,27,44,145,14,
+  24,97,44,145,173,24,153,82,89,46,210,88,214,235,122,140,
+  186,88,162,197,74,163,32,167,188,12,203,50,42,203,35,141,
+  130,201,215,42,146,84,24,75,177,198,180,214,88,10,198,112,
+  77,22,40,172,49,149,53,54,8,99,248,29,192,214,92,122,
+  96,139,2,247,124,15,183,19,241,23,205,175,227,47,153,235,
+  223,137,11,242,93,221,242,5,82,6,242,93,91,43,24,80,
+  214,224,123,67,45,48,145,79,128,193,171,31,88,250,194,192,
+  53,235,30,239,188,162,53,140,7,188,207,197,91,29,194,17,
+  122,170,103,157,58,49,199,4,50,225,183,241,151,205,13,3,
+  21,120,71,13,190,133,24,185,27,194,141,220,25,146,66,220,
+  231,91,247,179,45,123,94,177,42,62,9,126,219,164,52,54,
+  153,4,82,112,150,131,6,127,51,108,165,248,12,73,245,172,
+  74,153,164,18,107,248,105,74,99,179,244,143,210,65,239,148,
+  122,99,169,55,150,14,250,163,52,228,157,82,190,88,195,123,
+  160,53,132,28,193,49,225,58,105,139,239,80,122,9,238,185,
+  105,182,182,91,241,185,148,234,220,194,141,46,62,149,229,50,
+  198,186,198,187,220,47,172,60,161,53,84,171,89,5,132,225,
+  91,128,186,242,5,254,72,42,244,97,88,39,31,235,116,20,
+  88,214,24,203,149,230,202,19,255,113,207,219,82,126,89,190,
+  229,110,60,179,177,156,213,22,134,28,113,49,91,34,0,156,
+  45,192,116,184,7,140,51,166,37,152,2,48,105,49,101,181,
+  228,193,249,95,166,56,227,171,124,81,46,71,37,201,229,244,
+  195,95,160,232,241,32,11,53,61,193,231,32,203,31,44,249,
+  38,169,229,173,76,218,146,79,195,252,16,63,176,13,0,27,
+  94,161,158,173,94,98,205,85,96,110,145,37,199,247,194,220,
+  98,117,132,58,82,221,175,15,63,140,23,202,13,177,17,133,
+  178,79,36,161,108,157,119,40,219,16,16,202,121,141,53,236,
+  83,205,73,138,238,166,112,184,216,77,233,80,209,77,229,240,
+  131,214,160,254,41,7,38,2,171,232,104,214,11,37,97,76,
+  141,26,146,132,150,255,13,112,42,201,254,254,2,17,19,123,
+  23,58,104,13,62,204,138,112,117,120,193,137,16,78,79,166,
+  224,132,58,34,132,35,225,182,188,21,253,119,195,255,88,175,
+  163,140,141,67,240,45,168,216,182,43,176,56,122,103,124,131,
+  58,45,185,105,217,228,55,117,124,137,201,189,30,95,210,44,
+  101,21,214,178,175,255,84,246,66,96,45,195,25,178,148,109,
+  253,83,89,131,8,228,38,149,151,196,116,189,160,124,174,196,
+  84,57,239,90,63,188,150,193,54,28,37,166,125,248,219,37,
+  49,141,99,85,10,107,172,194,18,219,253,123,76,105,137,97,
+  157,24,43,253,61,166,146,155,88,133,220,200,20,226,81,137,
+  199,217,120,84,225,49,79,110,138,191,26,105,108,174,88,126,
+  65,126,81,142,111,116,177,119,59,226,127,175,54,248,206,21,
+  45,19,65,6,27,193,113,63,213,38,72,0,209,65,240,251,
+  153,92,4,209,114,193,219,51,203,28,132,27,155,139,163,140,
+  191,106,223,206,65,27,28,203,157,150,177,188,29,185,23,142,
+  201,189,37,159,102,47,49,89,106,215,225,180,224,40,119,255,
+  197,236,224,85,215,177,85,185,201,253,212,59,51,244,249,127,
+  158,161,127,239,236,64,70,203,236,64,74,203,236,192,200,150,
+  217,105,218,247,47,102,103,206,187,179,115,195,235,207,179,243,
+  151,143,142,217,186,17,66,8,33,132,16,242,255,153,63,64,
+  189,20,95,241,189,129,113,17,1,35,240,2,166,163,59,48,
+  34,55,96,250,8,128,81,56,2,163,179,5,38,159,251,119,
+  119,148,16,66,8,33,132,16,66,8,33,132,16,66,8,33,
+  132,16,66,8,33,132,16,66,8,33,132,16,66,8,33,132,
+  16,66,8,33,132,16,66,8,33,132,16,66,8,33,132,16,
+  66,8,33,132,16,66,8,33,132,16,66,8,33,132,16,66,
+  8,33,132,16,66,8,33,132,16,66,8,33,132,16,66,8,
+  33,132,16,66,8,33,132,16,66,8,33,132,16,66,8,33,
+  132,16,66,8,33,132,16,66,8,33,132,16,66,8,33,132,
+  16,66,8,33,132,16,66,8,33,132,16,66,8,33,132,16,
+  66,8,33,132,16,66,8,33,132,16,66,8,33,132,16,66,
+  8,33,132,16,66,200,255,14,123,214,92,203,98,19,239,174,
+  214,164,229,94,191,26,24,156,146,188,104,221,211,229,95,191,
+  126,42,62,53,42,125,135,243,138,141,182,235,68,125,183,205,
+  184,217,203,52,235,97,202,145,167,133,203,243,157,182,77,11,
+  222,89,122,89,80,31,50,35,182,118,227,179,99,33,187,6,
+  216,69,21,85,190,110,170,234,147,236,125,247,113,238,138,198,
+  156,162,94,201,71,39,123,175,201,26,187,246,218,241,251,155,
+  207,251,125,148,48,102,167,227,135,118,139,26,131,110,123,71,
+  150,139,230,183,239,27,252,234,140,75,74,88,92,81,212,198,
+  11,57,63,8,140,201,63,206,168,104,170,43,13,181,95,212,
+  202,235,116,173,211,172,42,165,60,252,125,183,46,187,14,229,
+  182,109,183,109,22,167,215,128,128,236,189,237,86,107,167,42,
+  210,114,22,150,169,59,15,17,47,92,251,166,237,181,210,218,
+  139,35,54,158,45,44,56,158,227,182,92,125,255,98,121,216,
+  98,182,191,96,244,222,196,237,234,116,238,227,115,247,230,22,
+  127,255,74,115,204,246,232,173,163,65,199,194,218,143,104,102,
+  138,111,185,127,182,242,70,65,74,79,23,135,57,189,99,15,
+  127,126,164,214,131,255,72,159,176,89,126,103,150,108,221,243,
+  249,145,159,15,170,109,58,21,121,236,126,219,172,249,85,161,
+  111,54,235,71,9,55,159,89,120,112,91,23,7,199,47,38,
+  62,239,238,148,202,153,60,117,107,84,102,183,201,31,246,52,
+  148,56,184,141,223,218,80,249,165,175,184,195,220,135,141,218,
+  226,218,93,11,218,86,102,71,140,242,175,24,200,212,148,133,
+  23,109,210,172,185,249,178,77,223,43,61,221,216,55,57,31,
+  246,187,156,101,20,219,237,182,27,246,160,200,57,230,100,232,
+  111,211,62,139,118,25,147,145,183,187,110,148,254,82,135,194,
+  3,201,155,235,143,143,110,236,120,198,84,245,93,224,166,151,
+  67,23,123,86,22,121,52,72,62,241,126,104,167,249,199,142,
+  41,166,53,213,29,15,47,114,46,55,20,93,77,94,254,82,
+  222,11,130,101,177,25,19,184,1,107,179,157,21,205,93,60,
+  62,40,210,206,153,201,25,155,19,201,74,250,134,169,189,134,
+  199,140,216,245,203,243,145,159,87,156,43,217,117,174,106,195,
+  201,204,244,67,222,203,151,127,83,179,127,247,202,17,10,159,
+  143,135,29,216,59,234,203,187,215,191,120,150,254,235,161,61,
+  143,150,254,84,204,20,76,89,29,208,247,249,248,152,62,15,
+  247,218,78,40,61,119,231,253,204,23,157,124,254,49,73,179,
+  224,43,65,238,69,223,46,93,106,25,93,199,180,171,201,125,
+  31,79,236,207,253,173,184,46,133,227,187,116,135,227,49,77,
+  182,168,55,191,60,85,59,191,87,171,215,177,47,217,13,124,
+  65,230,86,246,158,223,142,51,215,199,108,42,245,57,189,126,
+  252,4,73,195,116,67,217,147,54,217,87,134,143,122,217,234,
+  76,241,33,221,133,152,121,141,237,183,29,151,170,247,52,174,
+  122,94,25,116,58,198,161,43,191,211,142,238,193,121,85,157,
+  183,28,241,219,215,238,229,16,183,187,43,198,108,9,185,213,
+  90,113,43,47,186,171,195,226,250,134,197,135,23,239,44,105,
+  101,234,119,67,114,179,225,172,248,183,103,47,178,20,206,143,
+  242,23,221,123,38,91,57,240,196,195,118,14,57,173,245,126,
+  183,187,165,84,93,222,190,234,209,224,46,223,108,59,187,244,
+  138,225,236,222,87,147,122,59,101,182,154,25,239,253,76,239,
+  55,248,193,229,158,71,109,247,119,27,144,51,239,200,169,206,
+  179,231,119,30,114,44,78,23,219,171,231,168,196,29,7,180,
+  113,115,63,185,237,122,188,241,73,85,249,242,50,225,195,204,
+  151,227,174,229,124,235,251,219,92,211,204,49,63,113,231,231,
+  86,44,110,95,48,175,254,73,204,178,198,218,140,186,235,43,
+  206,109,40,187,217,236,187,120,196,47,79,2,127,72,157,118,
+  114,118,117,232,140,5,187,175,214,175,239,63,207,115,127,149,
+  206,41,109,208,134,37,79,207,60,191,53,106,114,230,220,154,
+  19,169,77,91,246,167,164,155,202,126,220,242,65,227,206,111,
+  70,78,10,176,27,145,243,177,195,184,25,223,101,125,185,104,
+  224,193,58,223,158,236,229,57,235,85,237,84,7,213,154,163,
+  17,163,46,236,251,58,166,188,110,76,121,186,195,224,9,31,
+  175,138,216,85,167,89,107,19,251,149,231,246,51,207,56,83,
+  23,166,124,95,181,82,56,57,252,51,133,179,103,235,27,135,
+  242,166,71,169,166,111,173,253,40,240,215,81,63,52,120,170,
+  154,52,17,77,31,253,218,201,181,89,13,199,3,207,61,191,
+  125,97,121,89,81,201,71,203,43,83,139,220,215,158,115,157,
+  168,156,43,91,90,45,250,161,32,220,118,227,181,69,58,253,
+  158,13,63,251,63,252,50,248,248,147,59,95,181,153,214,113,
+  195,182,100,131,75,155,194,83,39,79,125,18,245,81,126,210,
+  50,65,175,216,238,254,29,156,252,95,247,88,251,243,208,3,
+  250,60,214,245,240,175,123,226,20,139,98,218,223,62,83,207,
+  166,22,20,122,61,15,242,41,93,255,34,109,198,208,23,171,
+  35,214,8,83,148,11,83,188,150,159,207,247,156,190,99,202,
+  73,153,164,174,190,196,230,180,215,250,218,142,177,75,10,30,
+  95,154,58,212,206,171,218,235,249,234,182,129,254,53,37,78,
+  30,141,204,64,207,216,142,189,55,60,226,245,242,173,200,27,
+  80,249,1,47,97,200,176,1,245,131,90,103,228,233,203,138,
+  143,79,191,50,56,80,146,157,62,154,255,122,220,229,115,51,
+  151,172,248,238,198,244,51,135,187,204,189,124,195,165,120,223,
+  208,240,65,81,121,155,140,153,207,187,181,59,112,106,244,141,
+  231,14,193,33,141,13,181,105,186,179,147,2,183,199,109,125,
+  115,51,83,24,124,247,205,147,109,33,61,121,211,102,200,30,
+  110,188,173,150,181,189,52,126,176,44,190,204,180,245,92,171,
+  117,179,31,37,235,183,207,124,246,158,99,95,195,132,156,65,
+  242,189,235,174,138,237,94,250,79,55,5,43,155,211,26,151,
+  187,169,199,86,41,47,14,185,221,95,177,171,164,241,248,118,
+  231,222,71,28,154,231,28,56,91,59,242,214,209,33,42,255,
+  139,103,207,175,26,251,217,135,34,38,173,235,185,86,237,42,
+  60,71,126,163,154,245,241,218,146,133,187,139,71,57,54,117,
+  79,220,146,175,150,75,54,123,39,110,249,92,179,98,255,186,
+  210,103,11,102,111,190,33,86,222,104,215,29,38,60,62,233,
+  246,242,162,189,36,252,142,203,103,201,237,127,75,205,218,43,
+  216,230,248,203,207,7,6,58,14,94,127,171,228,64,192,162,
+  248,254,78,221,127,214,167,182,127,234,27,254,254,67,215,79,
+  178,119,191,156,210,55,149,175,46,156,61,113,229,213,73,51,
+  238,127,209,86,124,199,166,186,164,36,187,233,10,127,85,247,
+  190,37,231,206,173,149,221,157,151,229,31,153,154,57,171,242,
+  129,250,231,247,14,28,31,199,172,89,99,10,212,240,119,15,
+  189,25,28,63,245,253,164,23,166,244,213,252,51,227,202,58,
+  217,239,236,161,45,56,118,117,97,192,165,123,30,31,46,28,
+  61,61,161,193,52,50,53,101,255,9,239,186,187,157,103,84,
+  159,223,81,116,243,80,224,204,211,194,122,15,227,235,164,33,
+  130,64,97,90,77,115,89,199,85,190,75,70,156,204,152,211,
+  121,165,231,55,99,119,237,121,116,99,108,106,212,153,169,202,
+  154,175,118,118,155,157,154,213,92,245,74,253,207,118,236,251,
+  159,10,190,1,227,184,157,144,10,33,59,123,239,93,28,89,
+  135,131,184,237,221,177,37,123,207,204,99,37,100,59,8,199,
+  222,219,177,9,217,217,155,172,144,157,149,138,147,231,121,254,
+  136,231,117,223,63,220,223,247,159,240,121,93,63,93,22,82,
+  156,166,202,195,37,155,156,58,253,99,176,75,140,93,15,83,
+  139,237,233,107,254,161,105,181,39,8,218,143,55,59,188,49,
+  81,183,134,48,161,234,239,39,185,212,15,239,62,118,145,198,
+  28,149,51,106,111,105,240,24,217,248,77,210,157,159,219,139,
+  253,108,181,193,231,114,39,113,36,236,61,251,67,254,2,87,
+  245,203,239,214,186,7,232,117,108,204,214,101,138,197,45,213,
+  154,139,221,221,2,17,254,58,106,2,117,193,197,119,243,182,
+  38,161,11,241,26,226,247,69,238,148,21,119,220,137,44,208,
+  33,183,172,233,14,226,119,174,175,200,10,114,26,221,249,54,
+  225,11,77,84,74,160,216,33,200,16,184,64,251,195,17,218,
+  106,221,4,235,105,98,106,65,176,65,231,82,113,113,151,143,
+  227,140,50,150,73,40,147,25,45,21,232,36,107,145,161,253,
+  201,69,121,86,78,238,107,122,68,68,176,84,158,158,213,154,
+  191,123,47,148,142,242,113,147,120,181,131,166,245,200,2,174,
+  198,110,9,246,49,54,70,204,104,8,62,223,51,55,244,53,
+  140,125,70,48,123,221,192,188,141,210,101,97,0,123,188,166,
+  240,102,230,250,29,103,55,17,127,20,241,123,127,252,154,210,
+  149,236,99,49,161,234,5,134,78,129,22,123,92,81,10,114,
+  70,242,89,77,33,166,107,223,165,154,79,243,203,71,34,44,
+  54,245,134,48,148,195,193,70,108,233,153,217,31,226,168,211,
+  169,40,234,124,113,193,240,223,217,60,44,174,116,186,1,214,
+  251,189,60,207,109,37,95,9,204,113,81,56,13,28,82,115,
+  117,9,45,186,148,174,180,21,49,111,226,68,20,116,182,103,
+  50,23,40,245,231,248,181,243,246,233,91,84,34,127,244,52,
+  206,88,49,81,200,109,198,241,134,55,189,77,198,183,19,37,
+  174,43,212,123,249,104,116,54,99,115,210,49,118,3,31,81,
+  185,127,210,221,111,46,235,177,170,140,16,15,192,192,132,232,
+  57,82,103,61,148,9,133,39,120,197,30,76,243,213,249,202,
+  127,98,52,72,37,231,116,207,51,226,253,228,229,205,64,164,
+  125,219,69,168,160,175,176,62,76,72,231,85,249,92,11,253,
+  137,182,93,219,131,134,140,238,15,77,136,50,85,148,46,139,
+  114,222,14,246,62,229,184,7,45,148,230,33,146,240,204,57,
+  63,242,206,30,215,82,249,91,42,45,61,10,109,119,218,195,
+  134,151,47,114,44,112,164,30,158,243,116,163,130,50,45,38,
+  77,19,123,233,205,109,214,94,151,9,251,206,122,20,152,173,
+  59,5,52,34,2,21,85,237,24,76,144,18,137,210,28,76,
+  153,181,220,221,41,1,115,39,247,225,77,254,108,232,158,40,
+  27,38,109,193,163,58,130,90,188,83,17,118,7,227,168,74,
+  106,232,133,3,119,244,233,130,236,206,180,162,163,123,177,119,
+  169,245,151,47,178,163,53,141,101,142,164,143,110,83,195,63,
+  215,163,116,17,70,168,73,247,161,167,73,237,229,131,2,234,
+  112,245,168,172,165,206,254,254,202,206,138,243,156,134,249,3,
+  248,245,141,162,84,156,86,250,42,180,17,157,51,43,210,52,
+  53,120,171,128,107,133,233,81,131,196,96,206,203,126,121,137,
+  250,60,42,234,104,138,172,84,52,188,48,54,255,170,250,202,
+  180,206,209,111,25,242,130,220,20,205,216,142,159,198,120,104,
+  198,165,234,85,39,53,136,178,230,33,32,179,116,232,227,121,
+  51,229,93,107,30,177,223,160,107,184,137,43,57,40,53,199,
+  113,175,85,237,227,90,254,15,185,253,156,140,0,146,218,209,
+  201,85,8,155,237,125,25,86,133,143,242,231,176,198,139,209,
+  43,82,194,24,79,234,245,26,79,206,87,151,243,169,75,28,
+  132,174,150,155,69,246,167,30,51,152,170,159,70,216,205,206,
+  127,97,107,193,121,9,98,172,159,237,82,250,221,98,15,176,
+  94,210,220,180,86,246,239,203,104,133,190,29,89,126,83,244,
+  122,182,152,115,148,195,125,75,212,233,61,180,111,222,171,5,
+  141,208,202,213,218,191,3,43,65,10,203,187,162,216,243,3,
+  159,85,23,38,134,204,58,124,246,195,65,117,163,20,171,214,
+  63,250,88,144,21,182,185,216,136,154,10,73,110,176,40,219,
+  155,215,234,43,242,105,173,216,59,7,246,163,110,15,225,229,
+  227,95,198,36,176,31,159,53,75,180,53,117,62,25,60,194,
+  226,23,134,42,227,52,240,13,95,213,169,30,127,165,132,10,
+  28,119,31,13,98,17,150,88,155,121,113,30,168,166,150,60,
+  105,47,198,234,41,247,79,146,55,232,26,112,47,205,76,78,
+  12,80,130,38,5,81,231,13,252,102,88,189,248,32,161,218,
+  44,232,16,94,209,48,234,95,237,193,61,9,253,227,35,138,
+  117,26,186,42,46,18,197,211,141,169,103,55,236,70,152,54,
+  207,12,232,12,135,249,189,247,29,58,184,152,59,91,155,65,
+  111,121,242,209,54,202,76,116,157,127,208,220,46,13,231,122,
+  66,116,254,170,194,24,191,51,217,21,222,49,126,196,185,128,
+  133,119,87,192,215,125,66,183,11,167,37,191,174,198,170,17,
+  95,147,84,166,194,48,157,57,244,137,65,157,80,211,138,37,
+  63,3,149,177,70,75,112,171,242,169,130,5,107,76,112,87,
+  192,115,206,254,51,63,66,70,77,62,66,61,101,199,114,237,
+  92,122,203,60,251,90,105,25,123,250,195,137,3,69,120,95,
+  69,154,148,147,235,251,101,205,212,80,106,182,162,120,119,249,
+  94,60,164,139,149,89,134,65,95,248,56,23,174,70,235,245,
+  0,19,7,235,55,93,217,24,223,210,244,28,161,43,217,200,
+  123,151,38,53,168,252,141,174,176,14,183,226,70,7,71,35,
+  162,137,62,173,45,45,210,205,178,33,92,49,170,101,69,17,
+  60,62,222,65,3,73,28,43,179,155,129,192,212,238,136,132,
+  158,170,177,217,150,147,201,98,27,148,188,249,212,240,54,165,
+  4,94,112,102,112,43,210,35,229,33,255,74,196,103,105,34,
+  200,214,33,249,59,223,86,43,175,180,242,40,206,134,154,86,
+  249,239,205,225,95,145,231,6,191,95,185,158,86,57,157,126,
+  255,86,215,188,163,117,175,100,157,47,27,67,203,179,97,110,
+  57,26,66,111,70,203,139,221,184,67,252,105,59,118,81,138,
+  141,203,183,170,176,189,138,157,193,5,102,27,242,244,106,254,
+  81,172,245,94,16,34,211,198,81,14,57,185,186,150,63,174,
+  22,80,15,97,49,20,121,253,178,100,38,136,6,235,138,231,
+  221,83,43,72,179,214,145,83,86,128,225,135,159,237,232,204,
+  78,219,159,159,234,124,116,77,233,198,241,85,161,238,178,153,
+  42,21,86,2,250,94,119,201,178,211,153,202,245,2,236,170,
+  83,252,127,35,232,158,22,34,72,95,169,74,90,204,68,197,
+  249,213,91,55,176,181,214,252,196,99,112,88,33,30,50,208,
+  40,210,143,169,45,139,75,100,101,143,41,230,236,169,219,69,
+  82,136,133,55,190,170,14,116,67,177,195,34,4,210,222,110,
+  190,41,72,176,161,103,181,102,76,29,233,180,104,222,29,143,
+  24,96,254,125,103,187,246,155,31,66,199,213,106,154,221,18,
+  207,137,138,188,18,29,161,68,56,160,63,150,158,148,117,79,
+  242,198,155,222,126,238,16,218,246,99,134,19,133,139,155,225,
+  231,231,41,21,32,246,71,156,209,98,179,250,56,23,50,60,
+  181,40,105,134,184,212,30,142,245,183,52,90,26,32,80,18,
+  180,139,134,52,142,85,80,106,170,84,45,29,179,190,143,77,
+  149,11,132,94,250,149,4,237,79,43,197,16,177,104,175,40,
+  161,249,66,88,133,60,114,5,51,17,230,73,150,57,194,63,
+  38,44,17,207,200,125,85,35,48,127,205,163,104,140,121,176,
+  138,160,30,136,100,98,59,188,250,190,3,217,12,52,38,113,
+  139,106,121,248,148,254,188,81,120,235,207,155,210,69,248,28,
+  247,72,69,80,238,247,205,86,46,141,145,62,220,136,8,161,
+  248,73,238,159,237,29,52,193,187,187,250,219,253,243,216,182,
+  191,27,23,115,2,156,205,142,38,222,111,154,47,156,118,141,
+  21,205,58,63,68,170,60,77,29,155,153,141,180,45,61,13,
+  138,32,237,179,26,203,198,221,70,199,55,52,195,36,49,136,
+  38,183,94,101,254,128,106,221,169,242,187,97,129,199,174,228,
+  63,142,245,37,235,95,46,165,240,140,154,109,70,173,29,149,
+  17,225,153,160,83,54,202,251,233,49,140,54,23,201,52,234,
+  226,94,137,238,131,54,253,89,117,240,76,120,91,107,122,125,
+  233,69,180,187,221,184,76,22,213,215,53,150,166,233,93,159,
+  131,169,100,109,54,238,48,5,210,195,78,70,146,29,75,168,
+  78,3,218,177,195,90,71,218,140,160,146,169,152,159,147,204,
+  67,54,243,142,249,101,101,4,4,217,238,149,61,118,95,58,
+  250,147,91,12,91,98,115,245,68,122,36,87,177,79,66,223,
+  1,214,175,178,176,197,86,156,80,118,102,174,183,28,109,81,
+  161,13,38,200,154,123,196,181,81,250,196,1,201,195,236,112,
+  30,123,54,8,67,19,134,8,54,77,227,112,113,185,102,34,
+  78,41,110,180,99,54,89,180,240,206,173,77,41,94,111,111,
+  104,174,170,85,66,162,48,67,211,205,97,238,8,161,77,108,
+  240,126,205,101,116,198,58,87,135,34,238,38,209,127,35,154,
+  172,94,230,74,103,186,77,39,8,238,233,25,229,161,248,88,
+  103,246,133,243,78,252,173,241,160,250,88,7,52,110,39,157,
+  194,3,217,237,254,153,61,1,59,82,162,117,182,80,81,88,
+  47,43,115,94,208,171,1,34,195,6,217,21,123,184,153,153,
+  142,44,29,33,149,40,85,123,110,164,22,181,170,38,45,172,
+  80,125,70,193,10,241,180,250,69,19,59,205,156,95,33,199,
+  212,108,211,194,180,183,41,180,177,180,203,85,186,235,200,208,
+  181,89,240,6,237,120,47,38,80,248,226,249,44,179,143,237,
+  49,252,152,154,54,78,45,179,59,117,213,80,90,46,144,147,
+  131,130,218,208,12,198,70,135,184,53,178,36,233,157,166,248,
+  3,241,181,56,73,126,134,248,85,128,148,74,112,254,223,222,
+  133,103,167,113,207,228,197,73,242,164,38,34,111,43,222,16,
+  226,26,92,223,145,221,41,254,90,206,109,90,48,19,249,108,
+  93,196,143,240,33,172,63,11,218,83,150,112,157,7,197,11,
+  113,248,37,174,158,110,168,71,190,36,212,229,196,152,128,200,
+  164,235,195,114,198,221,235,42,78,127,73,201,216,14,19,78,
+  131,236,107,49,123,7,34,245,190,159,13,109,168,166,56,61,
+  184,126,87,29,144,57,216,182,176,83,46,87,80,211,208,45,
+  105,48,233,97,27,76,195,133,22,133,189,216,71,226,224,106,
+  28,13,95,80,25,234,154,244,97,124,140,196,184,215,147,72,
+  82,93,26,125,158,76,195,131,3,27,18,189,11,81,193,143,
+  105,98,145,72,93,56,121,98,179,250,227,64,22,68,171,247,
+  78,17,21,79,58,27,76,136,75,89,198,65,17,169,114,209,
+  132,49,94,113,206,192,207,245,211,204,101,252,130,118,203,80,
+  116,70,204,239,57,126,120,203,94,235,80,86,244,250,59,221,
+  173,195,2,159,78,56,38,78,82,54,168,253,96,247,201,139,
+  198,141,85,149,189,47,61,49,199,138,31,200,33,231,98,239,
+  20,36,242,140,223,68,123,10,185,249,84,158,114,126,49,23,
+  84,21,92,31,147,136,235,178,138,216,27,14,157,122,141,115,
+  179,248,85,184,90,100,59,177,64,232,52,73,255,159,254,31,
+  0,0,0,0,0,0,0,0,0,0,224,111,129,141,131,139,
+  135,79,112,135,240,46,17,49,201,61,210,251,15,30,146,145,
+  83,60,162,164,162,126,76,67,75,71,207,192,200,244,132,153,
+  133,149,141,157,131,147,139,155,135,151,143,95,64,80,72,88,
+  68,84,76,92,66,82,74,250,233,51,25,89,136,220,115,121,
+  5,69,37,101,168,138,42,76,77,93,227,133,166,214,95,218,
+  58,186,122,250,6,134,70,198,38,166,102,230,47,225,22,150,
+  86,214,54,182,118,246,175,28,94,59,58,57,187,184,186,185,
+  123,120,122,121,251,248,250,249,7,4,6,189,9,14,9,13,
+  11,143,64,68,70,69,199,196,190,141,123,23,159,144,248,62,
+  41,57,37,53,45,61,35,19,153,149,157,243,33,55,47,31,
+  85,80,88,84,92,82,90,86,94,81,89,85,93,83,91,87,
+  223,208,216,212,140,110,105,109,107,239,232,236,234,238,249,216,
+  219,215,255,105,96,112,104,120,100,116,236,243,248,196,228,212,
+  244,204,236,220,252,194,226,210,242,202,234,151,181,245,141,205,
+  173,175,219,59,187,223,246,246,15,14,143,142,79,190,159,158,
+  157,95,92,254,184,250,249,235,247,245,13,230,207,237,127,254,
+  233,252,0,0,0,0,0,0,0,0,0,0,240,183,192,193,
+  35,32,36,34,185,255,128,140,130,146,154,134,142,145,137,153,
+  149,157,147,155,87,64,80,88,84,92,82,250,25,68,78,94,
+  81,89,5,166,174,169,165,173,171,111,104,108,250,18,110,105,
+  109,107,239,224,232,226,234,238,233,237,235,31,24,28,28,232,
+  239,235,237,233,238,234,236,232,96,111,107,109,9,55,55,53,
+  54,212,215,213,214,122,161,14,83,81,86,148,151,147,125,38,
+  45,41,46,42,44,200,207,203,205,201,206,202,204,196,64,71,
+  67,77,73,65,246,128,148,132,136,144,0,15,7,235,22,115,
+  253,235,234,242,252,244,228,232,96,111,119,123,107,99,109,117,
+  121,113,126,118,122,114,124,108,100,104,160,191,183,167,171,163,
+  173,165,185,161,190,182,186,178,188,180,184,16,149,247,33,27,
+  153,145,150,146,148,24,31,23,27,29,25,17,22,18,18,22,
+  17,25,29,27,23,159,152,148,146,150,129,204,254,144,135,42,
+  44,46,45,175,172,174,173,111,108,110,105,235,232,234,233,237,
+  31,24,26,25,27,159,156,158,157,95,92,94,93,219,216,218,
+  222,221,59,56,58,57,61,191,188,250,117,141,185,253,167,243,
+  3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  0,0,0,0,0,0,255,31,129,255,114,225,255,114,255,244,
+  254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+  0,0,0,0,0,0,0,0,0,0,0,224,223,224,191,253,
+  117,227,158,164,172,1,0,
+};
+/* TCBtracker data */
+static const unsigned char dat_tcbtracker = {
+  31,139,8,0,0,0,0,0,0,3,237,157,109,112,20,199,
+  153,199,159,233,121,217,153,217,23,86,43,80,4,81,196,178,
+  171,146,101,21,7,139,208,113,120,79,7,122,51,111,198,83,
+  182,227,184,200,21,87,94,95,97,75,113,56,178,200,172,43,
+  86,249,128,80,156,79,216,9,198,132,114,156,196,73,37,41,
+  151,139,16,23,69,8,33,32,147,88,162,82,46,112,56,78,
+  196,148,45,59,74,172,56,36,16,226,162,100,87,138,195,237,
+  69,123,79,207,244,140,118,27,112,226,187,124,114,245,95,204,
+  252,166,123,186,251,249,207,211,211,189,203,167,205,1,60,155,
+  3,120,25,143,253,243,205,14,10,219,227,87,104,8,15,11,
+  143,106,60,102,224,49,19,143,217,201,123,157,194,138,243,165,
+  201,206,197,212,194,99,70,166,9,118,85,125,0,25,58,187,
+  170,8,132,206,196,115,146,134,220,115,181,121,4,84,250,137,
+  46,10,155,94,45,2,236,168,157,115,82,105,93,253,214,150,
+  146,83,168,253,20,198,72,86,141,98,203,81,106,225,81,141,
+  199,12,60,102,226,49,187,243,136,210,234,20,32,208,237,180,
+  68,231,14,228,75,247,1,56,247,65,41,151,236,47,93,68,
+  246,51,39,197,161,100,182,52,214,163,225,189,69,171,223,82,
+  151,58,5,188,243,156,83,200,205,2,248,126,43,124,168,114,
+  160,108,202,129,222,205,158,103,197,35,172,102,105,27,36,157,
+  142,181,79,166,135,176,240,140,211,155,62,129,220,131,241,78,
+  99,148,211,206,160,210,237,12,66,14,143,239,116,178,246,207,
+  70,30,1,133,241,1,40,93,246,106,156,65,237,207,145,91,
+  224,40,148,138,4,107,199,177,237,207,146,236,206,30,39,55,
+  63,11,245,126,4,47,15,11,139,94,127,231,161,41,87,213,
+  152,121,0,37,143,180,144,27,145,213,200,62,228,12,228,67,
+  200,153,200,77,200,217,200,66,250,125,60,227,147,42,15,167,
+  175,64,30,137,121,241,103,199,141,12,108,142,58,88,171,230,
+  170,9,128,27,207,212,28,156,165,129,162,210,202,8,143,67,
+  158,205,83,21,235,151,199,118,140,27,113,174,24,251,112,190,
+  24,31,194,57,99,220,132,163,49,22,232,108,215,205,195,204,
+  209,28,118,213,207,70,169,204,250,124,115,62,116,209,201,71,
+  147,214,242,63,150,206,37,63,15,228,204,159,192,192,35,118,
+  230,100,170,182,167,230,213,225,51,79,245,65,162,182,39,114,
+  176,13,148,7,38,186,254,8,147,185,75,73,124,243,86,109,
+  237,1,168,189,21,199,157,177,182,11,207,59,90,51,109,161,
+  82,226,205,59,79,148,138,121,72,54,129,57,84,36,96,108,
+  197,184,45,35,3,108,14,245,150,53,91,93,102,89,45,180,
+  187,215,139,170,47,64,12,217,205,102,87,119,156,163,0,100,
+  167,123,254,3,59,107,167,217,89,189,203,189,222,95,93,132,
+  127,194,86,237,157,183,224,121,137,55,95,241,245,156,27,56,
+  243,156,125,13,143,50,111,203,105,108,115,250,23,88,30,89,
+  73,99,155,210,167,240,234,236,109,52,246,96,250,191,240,106,
+  244,118,26,203,165,79,227,213,152,51,168,110,117,10,155,166,
+  53,146,243,79,164,30,97,206,146,27,51,112,230,125,230,187,
+  201,28,253,97,70,115,107,179,141,228,247,79,228,33,190,32,
+  3,169,110,215,231,137,59,95,41,157,114,10,15,67,13,44,
+  83,137,10,91,48,95,241,227,67,151,58,126,169,198,135,127,
+  120,18,223,187,9,167,176,121,26,190,123,230,157,255,93,162,
+  78,1,239,135,206,175,76,186,49,82,249,56,188,58,17,215,
+  190,138,179,76,142,253,168,88,66,125,97,222,171,110,212,228,
+  202,60,244,65,60,244,251,1,47,114,203,2,32,7,241,153,
+  122,226,169,21,95,29,206,180,145,23,227,111,176,108,59,5,
+  247,186,8,91,176,68,89,9,26,112,69,239,238,162,9,184,
+  149,86,245,166,106,27,78,110,130,135,225,139,176,164,77,121,
+  242,236,151,26,201,248,19,227,79,60,211,213,221,221,242,243,
+  197,42,122,186,132,253,198,216,155,145,196,105,153,115,30,32,
+  253,39,128,198,40,64,211,157,0,205,63,1,248,187,14,124,
+  83,222,3,104,193,60,254,253,25,128,91,52,128,182,94,156,
+  66,108,223,133,217,91,254,26,192,234,79,2,220,241,61,128,
+  207,108,0,248,231,109,0,247,158,3,184,255,107,0,159,199,
+  186,62,19,224,139,35,0,108,218,255,243,89,128,39,95,192,
+  5,253,15,0,223,189,21,96,223,24,192,143,113,188,151,112,
+  254,127,49,31,224,245,110,128,115,85,0,239,126,215,93,141,
+  202,180,197,160,204,254,44,40,153,47,128,210,249,56,40,159,
+  57,2,202,131,22,40,91,158,2,229,233,123,65,217,191,3,
+  148,19,105,80,126,215,5,4,219,147,250,141,64,150,252,8,
+  72,238,45,32,255,49,29,200,15,242,64,206,86,3,41,165,
+  64,157,251,18,168,255,82,13,234,174,229,160,190,252,24,96,
+  84,208,218,126,7,218,191,63,0,218,240,75,160,219,77,160,
+  223,51,14,250,222,155,64,159,236,6,227,179,91,192,24,188,
+  9,66,201,39,33,244,149,40,224,83,228,237,170,161,1,232,
+  92,60,64,48,103,151,241,125,12,149,74,3,128,196,121,27,
+  32,78,97,73,27,148,216,234,222,177,56,30,79,52,129,18,
+  31,194,191,225,248,112,199,5,208,48,211,239,184,247,90,187,
+  46,68,0,103,169,148,26,77,141,178,57,235,224,235,71,217,
+  146,138,55,52,129,150,28,78,30,103,245,110,205,205,165,43,
+  13,55,151,138,169,225,212,113,111,126,63,124,31,197,109,25,
+  223,202,105,219,239,114,215,8,238,150,151,226,77,16,249,52,
+  75,206,52,27,143,3,217,210,169,7,26,189,21,228,182,105,
+  143,103,75,199,240,238,210,106,182,30,219,239,97,45,151,246,
+  24,248,190,226,110,129,231,231,240,254,183,113,156,231,15,52,
+  193,206,251,239,254,75,171,110,57,13,199,252,245,22,214,252,
+  245,102,83,127,189,217,19,222,122,99,57,195,120,157,24,129,
+  29,154,83,96,111,123,77,182,148,185,135,173,162,165,238,250,
+  112,58,46,40,45,24,63,249,219,21,35,91,19,234,249,149,
+  35,95,58,51,212,69,75,137,150,81,239,15,123,102,156,66,
+  34,59,89,188,75,33,10,108,169,30,102,99,226,250,204,78,
+  94,244,71,192,189,108,40,17,119,239,116,59,133,101,197,155,
+  160,131,78,142,184,107,171,54,81,187,10,112,31,219,211,69,
+  173,119,226,11,0,70,218,71,218,187,104,172,53,253,46,203,
+  100,252,80,171,66,58,75,19,111,175,74,245,79,238,108,220,
+  152,132,215,233,228,182,244,187,73,141,61,95,50,124,230,40,
+  163,198,118,129,99,236,42,15,216,238,193,183,87,101,22,36,
+  201,1,182,82,235,211,212,194,93,62,190,26,121,1,185,246,
+  41,214,99,53,251,116,138,175,207,213,249,185,76,227,234,143,
+  143,187,237,252,171,181,164,3,166,45,68,207,241,19,215,56,
+  237,156,114,26,125,156,59,61,50,229,244,234,185,38,116,250,
+  6,189,58,202,157,158,77,70,92,167,103,3,167,103,153,211,
+  171,67,130,211,85,120,231,14,100,39,50,231,58,189,195,117,
+  186,33,112,186,33,240,119,71,112,149,11,156,190,34,58,53,
+  159,153,114,26,25,231,78,143,149,57,205,54,163,211,95,209,
+  171,243,184,211,209,100,212,117,58,26,56,29,117,157,214,84,
+  58,53,159,195,59,119,35,113,47,137,175,115,157,222,237,58,
+  205,7,78,243,129,191,187,131,171,117,129,211,83,162,211,208,
+  165,50,167,139,184,211,161,41,167,197,93,115,209,233,175,105,
+  113,59,119,58,150,140,185,78,199,2,167,99,204,105,113,125,
+  165,211,208,36,222,89,131,188,140,236,117,157,174,113,157,246,
+  5,78,251,2,127,107,130,171,222,192,41,126,215,9,61,189,
+  107,48,180,51,149,13,237,222,61,24,122,172,33,27,218,185,
+  103,48,180,57,217,31,50,22,180,3,65,146,5,29,140,198,
+  228,130,78,32,13,253,161,127,93,86,76,131,83,104,189,89,
+  153,238,140,224,185,198,61,215,186,231,89,238,185,206,61,215,
+  187,231,164,123,78,185,231,6,247,220,232,140,172,56,142,241,
+  102,237,222,118,240,24,251,12,189,191,150,49,146,89,143,159,
+  248,105,230,234,16,174,187,35,57,208,86,167,218,216,253,220,
+  69,198,72,38,247,54,235,103,252,33,232,87,195,251,213,184,
+  189,142,96,175,109,216,107,207,117,123,29,186,65,175,99,216,
+  107,53,246,26,187,110,175,109,55,232,53,132,189,106,240,251,
+  100,131,216,43,153,53,150,237,26,52,150,96,223,206,221,131,
+  198,162,134,172,177,100,207,160,49,47,217,175,31,246,242,169,
+  31,244,242,169,239,103,249,116,10,108,55,139,188,151,166,70,
+  35,242,114,154,234,223,64,82,36,126,178,69,38,23,82,125,
+  31,64,20,219,211,237,145,94,32,74,83,15,168,173,203,169,
+  97,6,179,57,226,175,115,119,230,79,228,64,157,30,57,234,
+  237,213,145,247,176,181,209,216,175,188,147,166,202,59,172,45,
+  242,130,183,99,40,231,216,62,176,144,42,227,83,125,157,193,
+  82,123,14,63,208,216,190,26,53,208,195,211,72,27,137,91,
+  123,52,134,76,32,19,232,169,22,89,147,236,127,127,34,240,
+  84,191,146,234,155,2,79,103,253,21,237,142,251,10,142,57,
+  233,123,138,26,61,64,38,154,250,149,245,232,97,61,107,139,
+  236,245,246,6,101,29,91,241,232,41,55,213,215,25,156,124,
+  1,251,255,140,237,240,209,89,232,193,64,226,187,175,245,35,
+  83,72,252,54,16,109,92,72,181,199,144,205,232,105,109,224,
+  201,188,141,106,227,129,167,81,127,237,186,227,158,194,49,47,
+  4,158,102,161,167,55,155,251,1,243,4,44,79,163,200,11,
+  222,46,0,44,79,235,22,82,24,159,234,139,158,106,177,255,
+  94,246,89,19,157,135,30,240,91,112,180,37,77,213,139,200,
+  69,72,252,54,19,205,46,164,234,159,145,248,41,121,229,132,
+  239,137,188,119,59,213,166,246,225,49,127,149,186,227,158,198,
+  49,127,25,120,154,135,173,127,62,183,31,48,79,192,242,52,
+  134,236,245,214,59,176,60,245,162,167,220,84,95,103,240,234,
+  118,236,191,251,47,125,126,127,84,225,39,105,155,251,173,152,
+  191,93,112,184,162,6,231,86,73,85,212,96,102,149,157,21,
+  53,248,92,10,77,245,255,207,241,85,238,24,184,39,246,117,
+  208,15,138,153,172,218,140,59,153,210,3,31,28,66,18,228,
+  65,164,138,60,128,212,144,251,145,58,242,5,36,190,55,31,
+  236,67,134,144,123,145,38,242,121,164,133,124,14,105,35,191,
+  135,12,247,64,145,181,143,32,175,32,163,61,80,106,195,232,
+  221,110,244,87,120,244,195,153,44,217,207,163,47,226,209,91,
+  121,244,22,30,61,195,163,207,227,209,231,242,232,205,60,122,
+  19,143,222,200,163,55,240,232,199,189,232,87,99,94,244,201,
+  145,84,255,229,151,221,232,167,120,244,13,24,189,197,139,78,
+  143,120,209,233,97,47,58,61,228,69,167,7,189,232,244,128,
+  23,157,238,247,162,211,23,188,232,116,159,23,157,238,245,162,
+  211,231,121,244,81,30,189,129,71,95,135,209,87,184,209,79,
+  243,232,141,153,172,114,152,71,207,242,232,139,121,244,69,60,
+  122,43,143,222,194,163,103,120,244,121,60,250,92,30,189,153,
+  71,111,226,209,47,241,232,89,47,250,213,43,248,45,15,223,
+  232,232,227,13,253,74,211,79,168,210,254,111,141,222,255,164,
+  227,235,123,18,95,163,74,230,117,10,123,241,141,62,196,118,
+  167,156,189,156,42,243,188,239,119,71,169,82,27,180,221,208,
+  147,248,58,85,204,55,40,108,197,182,95,102,187,70,206,94,
+  73,21,226,125,3,124,145,194,68,208,54,223,147,248,38,174,
+  214,95,81,240,87,202,104,206,190,141,194,107,222,119,196,159,
+  82,56,17,180,237,235,73,124,139,194,145,95,83,200,96,219,
+  54,182,202,114,246,237,20,246,241,255,181,225,183,225,29,41,
+  60,112,111,222,209,204,215,236,141,15,133,255,137,82,136,170,
+  233,70,200,180,236,176,187,43,71,99,211,226,85,137,234,233,
+  51,106,62,193,202,181,51,103,125,178,238,83,245,179,147,115,
+  82,105,175,195,140,181,215,30,190,42,99,110,149,146,146,250,
+  216,235,111,253,169,254,183,144,169,88,96,87,82,185,134,138,
+  64,82,65,82,65,34,80,177,84,91,45,35,17,168,10,100,
+  245,90,25,85,129,196,210,42,168,10,100,245,122,25,85,129,
+  196,210,43,168,10,84,144,70,25,137,64,85,160,98,25,21,
+  36,2,85,129,172,93,168,140,68,160,42,16,172,80,5,21,
+  129,68,160,42,144,197,49,203,72,4,170,2,89,156,114,42,
+  2,137,64,85,32,224,56,86,25,21,129,68,160,42,144,197,
+  41,39,17,168,10,212,4,130,101,86,80,17,72,4,170,2,
+  53,129,44,15,118,25,21,129,68,160,42,80,19,200,124,149,
+  83,17,72,4,170,2,53,129,44,207,225,50,42,2,137,64,
+  85,160,38,144,61,71,57,85,129,154,64,246,28,229,84,4,
+  18,129,170,64,77,160,98,217,60,31,54,207,67,37,85,129,
+  154,64,93,160,102,89,124,124,143,186,64,192,125,33,82,70,
+  69,32,17,168,10,212,174,161,94,65,93,32,123,111,202,73,
+  4,170,2,53,129,186,64,150,231,114,18,129,170,64,77,160,
+  46,16,48,47,229,84,4,18,129,170,64,77,160,46,208,176,
+  194,110,222,125,134,4,2,206,91,164,140,138,64,34,80,21,
+  168,9,212,131,254,186,29,5,111,31,143,130,183,127,71,249,
+  58,41,39,17,168,10,212,4,234,2,217,60,149,83,23,200,
+  230,169,156,68,160,42,80,19,168,11,100,243,84,78,69,32,
+  17,168,86,82,74,74,74,74,74,74,74,74,74,74,74,74,
+  74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
+  74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
+  74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
+  74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
+  74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
+  74,74,74,74,74,74,74,74,74,74,74,74,74,234,227,36,
+  231,190,205,240,40,212,215,212,205,248,205,178,186,233,120,84,
+  255,102,217,249,229,93,87,6,96,238,63,230,235,162,39,1,
+  82,47,230,107,71,47,2,188,137,199,24,30,175,189,233,124,
+  206,121,200,140,89,81,247,119,207,166,89,170,251,59,158,127,
+  45,89,191,240,255,145,246,135,50,226,250,97,101,22,39,138,
+  140,126,4,178,254,225,255,39,237,15,97,148,231,203,39,171,
+  183,4,234,156,80,193,48,31,255,198,180,175,195,40,207,155,
+  72,118,223,186,14,163,60,127,209,32,159,97,247,247,61,25,
+  161,140,236,190,85,198,152,101,7,101,147,51,196,169,113,2,
+  111,167,185,180,120,63,43,136,27,230,101,83,160,23,223,12,
+  202,236,247,97,35,129,79,63,191,166,251,187,167,49,254,123,
+  164,172,12,188,236,229,211,251,93,212,104,144,103,157,215,107,
+  220,95,132,251,246,243,9,252,57,35,65,63,157,147,240,248,
+  225,50,70,131,124,95,159,17,238,83,100,52,200,187,79,155,
+  215,87,50,194,125,139,100,253,12,183,28,14,252,248,207,1,
+  101,100,245,33,78,131,83,231,84,57,21,62,142,31,87,231,
+  212,56,137,75,139,143,239,49,194,125,71,2,255,222,60,133,
+  185,31,214,78,231,247,253,126,132,183,243,125,123,239,73,136,
+  251,243,159,199,123,159,194,65,254,194,60,239,254,243,216,124,
+  60,131,251,211,185,95,221,45,71,130,247,74,115,159,47,28,
+  248,244,158,43,28,228,213,10,252,154,252,62,84,208,123,255,
+  194,220,39,43,27,188,108,240,113,124,159,108,92,155,143,27,
+  230,126,195,220,103,36,120,62,147,251,11,241,254,22,247,229,
+  189,159,54,31,143,221,87,121,127,157,183,51,121,89,229,237,
+  252,50,240,251,158,79,47,255,236,126,200,165,63,190,247,187,
+  202,172,222,224,237,66,188,172,243,118,126,63,194,233,183,103,
+  227,91,124,28,59,152,95,147,223,247,243,17,114,159,203,230,
+  243,109,5,227,89,220,175,201,159,207,10,198,11,185,244,253,
+  122,121,177,248,120,54,31,223,10,198,243,252,154,188,189,197,
+  223,35,139,143,107,5,227,134,130,118,33,94,54,120,59,194,
+  235,189,178,151,111,179,172,189,198,203,6,47,179,246,161,224,
+  254,84,123,141,215,27,188,94,231,244,234,189,118,33,222,206,
+  228,239,163,17,212,251,237,188,247,213,224,253,13,94,111,148,
+  213,19,94,102,245,122,80,175,187,245,122,80,175,5,247,89,
+  189,198,203,26,127,239,25,189,250,107,127,7,155,184,188,246,
+  247,180,203,127,135,155,92,243,59,221,222,190,8,30,165,164,
+  164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,
+  164,164,164,164,164,62,150,106,48,103,153,246,172,186,233,38,
+  147,109,198,237,6,51,98,122,133,53,70,10,175,13,87,166,
+  193,170,12,27,149,176,35,137,182,186,184,114,160,174,198,49,
+  234,141,88,19,107,139,50,235,23,69,98,153,58,28,13,251,
+  216,134,102,104,118,227,95,93,218,110,218,49,51,110,154,229,
+  167,44,11,89,171,153,70,44,206,98,199,62,74,49,103,68,
+  220,191,216,230,205,155,31,77,36,34,49,255,159,161,5,90,
+  205,78,17,60,224,127,1,213,25,251,137,42,171,0,0,
+};
+/* tfmx data */
+static const unsigned char dat_tfmx = {
+  31,139,8,0,0,0,0,0,0,3,237,86,255,111,91,87,
+  21,255,220,235,231,247,94,156,55,199,207,203,156,216,137,19,
+  219,43,198,75,211,212,138,2,138,82,43,245,23,138,51,167,
+  245,82,183,138,216,208,152,51,181,207,89,42,164,46,90,216,
+  100,66,154,14,24,25,66,81,54,105,3,36,196,152,134,38,
+  195,79,211,208,166,9,10,74,43,180,108,90,53,133,172,77,
+  87,137,109,233,128,53,67,164,218,15,85,169,76,169,249,188,
+  151,110,240,11,252,5,188,232,222,115,238,231,158,115,238,231,
+  221,119,206,113,202,64,164,12,36,202,16,202,110,93,2,221,
+  153,186,254,87,223,50,255,110,112,235,129,226,204,200,229,198,
+  205,137,254,253,31,156,104,108,235,153,122,211,143,38,198,99,
+  85,253,236,106,122,53,189,182,124,160,174,191,154,250,113,50,
+  40,231,1,52,38,160,190,180,109,91,124,184,248,240,68,95,
+  33,93,137,208,246,39,135,104,219,15,122,100,214,150,147,193,
+  254,224,129,186,118,95,234,169,9,184,23,138,51,153,186,54,
+  54,182,74,22,143,15,15,233,85,235,177,57,112,183,148,170,
+  193,200,109,34,194,248,233,222,39,135,19,80,74,249,173,252,
+  59,43,92,15,56,107,245,179,117,194,89,235,165,124,42,1,
+  227,237,215,29,172,189,247,201,57,16,245,148,242,111,223,128,
+  225,96,129,222,55,137,248,28,68,93,91,233,125,147,152,103,
+  108,157,167,93,75,157,130,116,152,92,41,248,42,169,67,9,
+  136,169,47,154,99,16,165,73,200,100,2,210,72,195,99,121,
+  178,75,153,186,250,115,114,13,81,254,212,151,4,40,63,202,
+  213,181,200,62,190,143,111,222,63,223,58,127,160,174,102,71,
+  235,106,181,176,11,74,37,206,217,109,117,141,109,193,125,28,
+  225,52,98,28,113,142,158,253,87,208,130,206,145,235,104,89,
+  64,113,230,208,253,86,108,207,29,85,204,170,195,67,234,87,
+  24,115,124,2,120,141,242,7,148,47,81,158,161,172,141,214,
+  181,47,83,31,154,128,56,181,23,225,7,160,50,146,12,103,
+  16,35,250,32,209,23,29,212,75,212,67,52,78,244,251,68,
+  151,28,52,64,212,79,180,39,105,243,74,239,181,153,255,146,
+  187,211,177,73,120,222,217,132,215,184,11,151,32,44,37,251,
+  117,40,195,221,185,186,187,246,126,254,253,252,218,202,44,58,
+  131,140,48,95,166,12,63,231,204,39,203,232,10,67,195,114,
+  56,79,229,126,132,246,175,107,141,145,235,90,99,33,93,156,
+  97,188,24,227,197,125,166,76,227,4,239,77,84,244,223,77,
+  34,97,1,211,241,73,12,236,24,59,191,9,229,149,183,44,
+  53,186,15,202,142,177,105,248,253,230,20,4,122,57,75,4,
+  124,61,112,181,66,102,241,137,193,97,25,212,37,90,204,44,
+  82,101,159,33,177,97,121,156,221,150,61,89,72,70,136,159,
+  89,137,87,213,248,133,211,209,81,196,212,26,115,208,128,242,
+  25,135,160,31,50,131,19,21,224,59,180,29,52,51,208,227,
+  119,23,106,136,91,114,125,197,60,214,184,137,110,243,32,154,
+  10,56,246,160,223,244,9,218,118,175,37,16,216,81,117,175,
+  110,61,116,238,52,125,188,102,9,109,230,125,104,39,207,16,
+  101,135,57,139,52,250,90,67,100,212,201,17,38,214,21,45,
+  192,195,218,73,87,20,127,2,221,244,94,116,188,11,240,51,
+  66,210,220,135,16,71,240,48,207,45,206,204,193,204,35,82,
+  72,32,84,209,153,103,33,86,158,151,124,253,228,155,52,76,
+  92,34,215,155,148,27,86,171,239,46,8,167,170,246,70,211,
+  72,58,54,203,220,249,208,242,101,107,228,53,203,59,107,43,
+  213,144,44,219,232,199,188,223,62,243,6,154,23,96,126,12,
+  177,32,169,27,212,89,197,142,126,155,163,123,22,228,97,219,
+  3,141,69,250,92,182,58,157,51,210,104,108,165,99,85,229,
+  221,181,229,232,221,228,156,119,44,30,161,197,166,229,53,31,
+  226,57,161,91,94,5,98,127,182,124,124,131,30,7,143,56,
+  120,138,232,95,172,109,70,61,165,109,203,8,177,143,44,131,
+  152,188,133,5,136,252,201,242,141,83,119,124,59,56,75,116,
+  126,250,238,252,14,59,109,59,222,76,176,162,242,102,130,229,
+  34,231,54,107,196,156,68,59,218,62,205,83,159,105,128,188,
+  140,195,246,29,216,113,130,229,179,68,46,85,34,156,55,44,
+  255,191,111,237,171,243,188,55,111,249,117,70,222,197,200,94,
+  95,2,59,143,233,171,236,20,28,189,118,118,230,234,138,97,
+  247,37,246,36,51,144,64,180,53,129,30,249,56,125,91,44,
+  93,123,102,60,167,61,83,238,99,206,9,43,166,157,183,87,
+  100,162,35,210,206,56,83,30,169,224,132,249,37,118,79,227,
+  98,130,179,234,216,159,39,251,72,197,199,88,17,233,66,183,
+  135,163,35,7,209,149,64,31,119,186,156,247,234,42,143,135,
+  4,99,116,190,107,103,75,184,160,77,169,186,6,88,113,206,
+  110,203,251,116,2,29,71,2,250,10,220,211,40,123,153,141,
+  29,47,43,71,85,253,123,112,251,21,230,111,248,67,227,105,
+  229,136,162,100,4,84,55,126,118,84,95,203,80,182,31,185,
+  190,154,241,104,16,252,50,125,122,2,110,52,49,143,186,230,
+  208,175,217,25,57,114,114,71,2,131,223,48,46,63,127,238,
+  100,52,139,193,145,236,82,150,248,46,158,149,154,146,211,176,
+  59,159,188,154,93,234,131,221,43,123,69,233,137,179,148,199,
+  101,166,46,206,230,234,194,218,87,23,83,204,12,143,157,119,
+  89,250,113,232,28,77,118,182,100,237,239,233,228,162,51,183,
+  19,15,18,11,101,39,209,69,61,18,240,203,111,219,55,186,
+  158,91,207,177,86,162,145,95,203,217,104,85,62,134,129,247,
+  106,24,184,192,241,193,210,133,165,232,236,118,229,198,199,252,
+  183,203,147,246,47,201,192,144,40,254,254,116,162,42,11,23,
+  207,68,247,35,198,152,241,237,108,50,143,217,221,130,177,119,
+  82,99,199,160,150,242,239,132,139,213,251,137,145,177,123,134,
+  179,18,236,26,25,164,28,190,53,12,254,129,149,128,225,131,
+  111,52,6,51,117,252,49,121,10,130,12,149,226,12,207,185,
+  214,63,36,174,22,178,149,42,223,247,217,209,186,216,96,93,
+  235,244,141,210,55,48,171,86,193,92,97,85,139,83,91,229,
+  115,203,255,217,19,124,33,187,118,236,174,240,8,254,91,95,
+  160,223,188,227,119,171,27,56,247,195,186,47,101,246,100,160,
+  216,204,184,234,46,206,8,56,15,123,176,116,20,65,128,157,
+  15,46,23,160,40,128,219,13,168,42,160,105,141,134,174,3,
+  77,77,128,199,179,237,36,213,24,60,222,56,252,129,30,26,
+  67,105,208,93,186,20,183,170,233,77,158,230,22,231,33,187,
+  255,63,255,243,241,94,241,182,221,118,192,88,108,190,216,188,
+  219,179,216,244,247,166,138,190,161,79,104,155,218,163,90,179,
+  250,162,154,119,255,205,253,67,119,94,249,135,242,43,229,184,
+  146,116,93,117,253,198,245,93,215,33,215,157,242,154,124,75,
+  190,32,191,37,239,149,131,178,93,212,197,123,226,140,248,133,
+  120,74,124,83,28,21,7,197,176,232,21,157,194,192,63,113,
+  133,95,247,28,222,192,111,241,50,106,120,14,207,98,17,79,
+  96,14,143,226,56,166,112,4,95,195,189,56,140,123,48,138,
+  60,114,216,139,61,24,196,23,208,143,221,232,69,15,62,143,
+  207,225,78,68,209,141,48,58,17,66,16,109,8,224,14,220,
+  14,63,76,248,248,255,4,248,221,241,47,9,158,85,235,210,
+  9,0,0,
+};
+/* tfmx_st data */
+static const unsigned char dat_tfmx_st = {
+  31,139,8,0,0,0,0,0,0,3,237,88,127,108,91,215,
+  117,254,222,227,227,211,147,76,201,207,52,37,51,250,101,90,
+  82,28,86,17,37,74,179,93,215,250,97,146,242,28,138,146,
+  88,85,50,186,36,8,156,199,130,38,85,201,82,21,215,106,
+  211,84,181,105,163,72,133,192,72,210,54,200,138,96,232,130,
+  174,232,188,192,49,132,52,27,54,47,75,20,15,48,130,32,
+  49,24,173,48,188,53,171,221,204,115,226,78,86,189,52,109,
+  176,23,137,220,119,223,163,21,217,73,96,181,43,242,215,30,
+  241,221,95,231,222,123,206,61,231,220,115,239,165,1,148,24,
+  192,46,162,99,40,35,103,0,228,91,224,211,18,172,251,54,
+  178,181,25,112,252,6,246,39,97,249,83,231,216,126,69,228,
+  6,214,169,236,183,215,128,158,99,57,110,160,236,139,6,220,
+  65,3,235,93,68,196,192,218,239,177,125,27,243,243,236,83,
+  71,156,35,56,78,63,75,52,145,214,204,252,52,241,34,113,
+  138,248,59,226,57,226,36,241,12,241,147,232,219,249,92,191,
+  233,137,181,52,195,19,107,70,101,74,33,71,61,1,229,16,
+  107,174,81,133,210,186,2,247,195,211,119,225,112,62,62,217,
+  107,110,88,244,143,3,67,227,240,142,92,235,28,131,10,175,
+  175,63,210,140,226,68,132,253,139,83,239,38,182,91,249,175,
+  18,65,43,127,43,225,183,242,127,75,248,172,124,46,225,181,
+  242,87,19,186,149,159,78,104,86,126,42,62,121,247,180,203,
+  143,199,17,221,231,97,158,67,52,85,59,240,14,162,186,31,
+  61,92,247,51,221,230,109,37,3,87,80,30,243,99,36,173,
+  14,49,141,79,6,253,24,206,134,178,161,186,97,248,3,15,
+  80,117,30,157,171,152,233,192,181,228,174,90,48,159,77,234,
+  76,15,239,43,89,55,142,13,24,161,156,27,220,156,47,43,
+  189,40,104,138,12,236,172,9,193,227,227,168,4,92,166,213,
+  58,248,162,24,209,71,45,156,149,67,88,43,230,143,127,0,
+  153,117,234,27,95,34,142,17,39,136,231,9,234,19,212,39,
+  78,22,202,111,17,11,6,164,46,230,79,17,194,126,199,6,
+  135,49,108,32,63,40,214,19,12,64,153,25,131,156,210,218,
+  199,40,177,98,40,131,99,160,150,165,232,192,2,138,227,147,
+  92,95,44,93,70,13,228,153,187,184,206,152,161,115,92,204,
+  56,197,181,149,15,97,93,8,177,214,113,84,88,51,66,180,
+  177,37,106,105,97,28,205,190,86,32,123,108,83,8,254,235,
+  125,114,111,114,237,229,24,17,50,196,39,133,4,241,201,194,
+  122,233,157,249,212,38,234,14,211,173,164,226,248,42,102,123,
+  244,206,49,76,195,79,217,143,91,18,108,238,54,55,28,136,
+  125,25,72,33,95,249,39,83,194,143,107,132,174,235,107,4,
+  215,6,43,189,61,93,93,35,40,165,156,191,110,166,25,245,
+  105,247,62,228,230,119,53,163,148,51,94,98,159,122,212,209,
+  54,165,17,206,195,150,57,119,51,42,228,48,138,230,194,115,
+  97,33,83,85,70,143,86,157,196,6,189,135,22,57,124,163,
+  116,119,102,116,127,228,111,245,225,129,223,234,49,142,125,50,
+  250,54,102,133,142,175,68,125,227,104,204,206,138,158,65,239,
+  204,212,175,115,169,218,160,119,133,53,23,105,37,230,18,119,
+  137,180,157,216,210,206,149,143,86,68,48,31,45,204,204,117,
+  71,158,197,240,192,85,196,250,126,128,195,164,247,221,68,111,
+  34,125,63,233,241,246,48,6,72,147,230,123,124,173,186,77,
+  11,146,54,65,218,96,123,4,123,72,147,231,99,190,86,159,
+  77,219,66,218,65,210,190,216,222,141,187,73,115,204,247,250,
+  90,131,54,109,59,105,15,146,118,111,251,46,220,71,154,50,
+  223,231,107,13,217,180,14,210,166,72,219,219,254,167,48,72,
+  115,206,247,251,90,7,108,90,136,180,12,105,95,106,223,141,
+  36,105,234,124,220,215,106,216,180,93,164,125,155,180,84,223,
+  5,7,226,147,212,117,165,93,138,141,195,159,214,70,61,220,
+  207,126,195,219,57,149,207,195,47,252,145,154,124,129,187,75,
+  30,10,117,82,11,237,3,86,203,51,204,213,206,1,120,11,
+  61,158,18,121,183,89,94,176,127,238,145,130,253,135,225,160,
+  253,135,89,110,176,210,143,183,255,125,5,251,239,177,237,207,
+  30,88,246,128,80,175,185,238,82,194,211,107,186,99,137,50,
+  166,51,9,173,215,92,95,145,144,227,147,254,49,220,29,27,
+  67,215,168,58,196,212,208,34,1,106,37,128,78,95,0,70,
+  218,205,117,26,162,37,129,226,166,170,49,116,162,35,22,0,
+  210,112,14,115,140,59,173,113,140,219,128,243,94,223,24,92,
+  244,18,93,248,67,96,66,68,142,9,177,151,60,212,140,231,
+  67,31,145,118,19,17,123,55,75,59,10,249,113,3,142,71,
+  153,115,167,203,29,4,163,177,195,207,156,17,64,126,141,237,
+  140,190,210,59,44,191,199,124,198,246,49,48,122,195,100,63,
+  47,193,57,29,15,177,254,43,226,114,33,98,252,130,253,26,
+  237,126,82,25,193,121,37,70,112,156,97,206,40,13,70,111,
+  156,186,41,218,136,246,159,16,63,34,126,88,136,54,79,18,
+  60,17,64,249,240,8,241,48,113,148,56,68,8,158,95,35,
+  14,16,227,196,8,145,42,68,52,158,48,184,151,224,233,130,
+  65,130,39,13,35,14,228,61,4,101,115,112,127,56,56,198,
+  65,121,28,239,138,147,139,249,43,204,55,19,60,117,80,75,
+  84,18,21,4,245,11,174,1,37,244,14,157,253,22,236,60,
+  247,168,198,243,14,229,105,157,22,25,162,183,60,84,37,124,
+  98,200,184,216,46,98,139,219,200,138,157,62,19,128,51,121,
+  214,106,17,99,238,45,180,121,147,167,150,219,118,87,137,152,
+  50,104,213,163,237,83,146,132,24,79,171,108,97,182,239,89,
+  212,207,26,143,144,75,37,227,104,128,65,178,50,237,30,98,
+  205,168,224,14,168,44,72,3,59,154,86,133,80,121,125,230,
+  165,121,142,217,150,58,99,247,88,250,5,253,136,190,232,104,
+  166,159,104,244,137,49,166,236,201,17,222,66,143,23,170,68,
+  164,187,94,59,89,51,6,39,79,160,0,138,175,104,71,24,
+  193,236,40,171,254,152,220,114,158,128,216,41,185,5,67,63,
+  8,230,151,13,141,45,78,150,222,20,114,100,101,113,18,69,
+  51,217,80,216,116,207,81,138,228,8,79,14,150,119,7,131,
+  64,91,0,37,115,228,156,214,212,176,132,217,151,47,78,51,
+  18,249,233,207,193,84,3,103,73,142,214,174,63,141,252,52,
+  214,207,50,149,47,70,7,229,149,245,248,27,241,55,172,21,
+  218,35,144,163,253,115,227,150,150,234,44,157,213,91,237,42,
+  35,186,31,109,86,79,122,116,174,207,138,187,33,108,126,75,
+  99,122,135,181,82,159,213,127,83,97,158,70,33,103,252,129,
+  200,24,26,108,13,44,158,168,18,163,171,173,185,55,90,229,
+  26,107,92,109,129,126,140,26,237,37,170,137,205,28,23,100,
+  78,47,92,186,40,244,158,198,210,249,27,108,86,102,217,204,
+  45,108,38,116,77,121,54,216,246,226,158,120,138,167,144,11,
+  219,41,179,142,144,144,212,186,93,29,102,196,111,19,187,55,
+  59,235,211,179,39,1,70,62,151,109,93,123,150,197,18,142,
+  219,206,182,49,132,44,155,165,214,47,162,72,232,74,204,145,
+  118,211,118,169,151,155,177,99,253,2,118,8,221,25,58,91,
+  210,71,86,180,8,41,210,194,198,195,55,244,195,82,53,219,
+  190,124,228,198,54,141,179,175,177,44,177,64,45,176,141,117,
+  87,161,94,81,168,151,22,234,229,162,78,253,234,66,35,139,
+  103,109,239,88,60,115,179,119,232,207,223,194,35,124,203,60,
+  11,222,176,204,115,217,27,194,102,233,107,214,157,128,209,104,
+  49,185,66,3,59,102,201,45,195,21,242,78,180,195,238,207,
+  30,17,174,44,105,213,150,215,49,136,229,186,181,14,219,191,
+  216,183,130,22,148,70,181,84,137,229,41,18,119,79,45,91,
+  54,167,147,156,195,23,205,188,65,95,225,110,242,83,254,134,
+  180,46,108,150,207,171,97,141,43,248,175,233,104,104,213,30,
+  253,0,61,227,142,148,206,248,190,25,119,148,8,111,241,13,
+  114,126,49,62,253,32,105,245,169,3,164,213,161,158,124,252,
+  19,32,199,182,153,112,218,179,47,186,165,67,194,19,236,53,
+  123,250,226,52,91,228,164,38,188,80,72,36,135,138,242,212,
+  97,219,173,185,27,21,134,103,75,0,65,53,66,205,219,243,
+  156,74,254,189,241,34,215,89,157,142,50,173,225,237,148,169,
+  209,65,25,170,81,195,149,215,138,8,54,94,235,14,96,227,
+  247,89,26,213,68,125,191,108,84,178,71,45,188,98,71,24,
+  101,130,250,47,108,23,180,175,92,230,60,189,105,72,23,71,
+  183,113,252,224,39,122,119,31,229,31,160,174,243,232,213,24,
+  173,208,147,102,220,224,93,178,146,18,196,82,144,252,228,16,
+  69,140,167,93,31,87,57,160,211,119,196,125,55,85,70,93,
+  13,112,254,140,24,111,92,202,210,219,120,179,218,201,209,23,
+  133,151,149,158,189,238,101,31,122,152,61,127,106,215,178,167,
+  241,100,92,141,173,24,245,139,224,73,43,92,229,208,160,224,
+  6,169,132,18,30,228,124,50,231,243,144,203,0,239,122,142,
+  88,56,165,29,208,159,107,198,218,100,199,202,49,31,242,195,
+  102,193,47,125,11,126,130,7,199,171,28,15,60,77,78,37,
+  109,29,80,57,111,89,18,120,156,175,25,243,0,120,191,92,
+  123,58,128,207,138,91,155,56,25,41,139,68,221,77,240,14,
+  16,64,116,118,17,142,203,209,25,161,193,189,194,55,216,159,
+  54,57,189,8,231,229,158,150,210,159,95,197,30,113,7,169,
+  10,211,86,140,153,105,113,111,244,175,70,178,149,171,106,188,
+  223,186,199,240,6,148,110,28,106,70,67,74,220,148,111,71,
+  3,119,97,233,27,188,37,49,175,231,77,169,46,229,18,247,
+  226,176,233,42,139,12,243,232,22,146,215,89,82,122,53,9,
+  106,74,156,75,33,90,39,186,254,42,246,9,94,163,222,75,
+  81,141,175,138,180,162,119,96,109,134,241,245,58,247,248,100,
+  215,231,112,225,154,250,210,56,202,186,168,13,245,59,127,246,
+  153,238,173,157,119,161,44,62,25,125,59,83,214,111,170,187,
+  197,27,176,215,84,31,10,132,172,151,84,197,245,247,79,227,
+  36,80,120,89,45,166,220,86,124,239,16,145,144,43,23,239,
+  156,87,232,173,29,180,207,108,12,60,183,146,236,245,126,202,
+  103,159,2,98,150,119,180,65,17,183,107,136,106,251,60,224,
+  152,39,216,235,119,169,6,43,118,243,222,243,241,39,141,56,
+  91,140,97,246,252,109,74,165,214,182,25,247,177,252,82,210,
+  16,188,163,25,114,47,177,231,23,114,114,108,177,117,102,137,
+  83,88,225,44,30,56,253,133,29,115,126,214,191,231,95,23,
+  184,99,250,224,226,156,58,225,230,124,146,56,21,8,88,220,
+  182,217,175,220,9,41,62,249,73,167,163,136,22,150,124,173,
+  66,27,98,199,144,171,51,27,234,49,75,254,162,253,32,247,
+  135,223,56,213,82,218,107,58,183,175,212,156,165,157,182,153,
+  41,120,199,26,62,114,158,220,116,106,136,19,81,220,59,196,
+  73,217,120,191,176,12,212,126,83,57,209,107,150,184,218,237,
+  219,117,8,245,209,16,211,6,226,246,180,87,220,169,237,219,
+  181,117,179,46,219,231,177,238,213,101,43,94,85,124,103,246,
+  93,48,120,219,15,155,197,103,90,138,187,77,229,190,77,61,
+  226,62,162,5,153,187,234,44,62,19,244,0,101,87,143,169,
+  76,109,65,35,95,248,177,103,165,108,170,164,113,204,185,248,
+  115,106,206,80,216,182,237,237,88,197,86,159,44,254,23,24,
+  81,88,82,228,110,172,61,215,125,174,219,127,48,136,171,189,
+  238,173,62,167,118,4,69,207,53,161,51,169,198,246,163,107,
+  164,237,249,38,68,24,109,88,30,213,180,173,40,242,57,83,
+  181,190,173,62,200,153,124,254,90,62,211,253,153,16,140,219,
+  194,232,252,220,164,79,69,215,109,17,68,104,129,50,235,133,
+  130,200,73,222,236,155,209,27,159,108,161,108,142,227,226,213,
+  82,35,98,221,14,74,90,145,120,147,233,84,226,28,211,183,
+  18,217,126,211,25,77,188,122,253,44,99,158,191,225,124,93,
+  20,255,189,76,203,253,166,118,134,179,148,55,89,43,62,156,
+  227,172,131,212,226,166,68,109,223,133,195,185,229,182,46,132,
+  36,240,221,227,75,168,118,123,2,249,67,130,187,248,231,131,
+  250,222,68,235,110,20,94,197,189,178,224,22,255,146,0,94,
+  198,176,141,115,225,176,89,244,227,236,203,193,103,161,172,27,
+  163,44,225,246,253,52,153,98,165,96,26,130,188,165,73,202,
+  88,55,97,95,90,103,239,175,101,103,197,235,234,32,60,126,
+  132,25,169,170,123,76,45,122,231,49,221,223,254,2,95,247,
+  81,241,178,189,39,60,178,192,55,164,74,189,111,26,213,132,
+  12,9,252,119,165,248,207,37,50,14,239,192,2,252,180,245,
+  38,136,72,225,235,49,139,46,69,246,83,119,77,40,183,188,
+  162,210,242,161,174,126,83,30,14,76,133,66,228,107,249,4,
+  119,56,2,97,40,254,80,236,132,148,77,55,214,53,73,217,
+  185,12,91,68,233,103,86,169,153,165,243,86,169,77,229,249,
+  35,131,99,182,25,13,117,29,128,134,66,95,150,21,20,122,
+  179,172,218,229,54,238,128,115,244,86,167,240,93,245,137,96,
+  7,54,118,138,90,136,242,102,34,123,191,240,74,254,221,126,
+  83,58,223,99,202,122,175,41,247,249,95,103,250,156,72,29,
+  94,43,61,228,127,125,98,141,127,62,127,141,61,77,246,170,
+  100,219,57,65,81,58,172,244,71,34,117,106,254,215,251,46,
+  76,209,171,197,142,131,183,165,116,103,7,90,8,103,188,127,
+  224,177,248,231,233,241,14,177,246,89,202,32,237,15,124,131,
+  43,159,64,53,123,118,212,191,46,202,220,93,95,181,70,86,
+  220,60,210,222,119,214,184,45,245,11,60,195,217,219,154,237,
+  171,162,53,129,249,179,162,214,178,67,106,19,253,196,191,103,
+  146,203,58,161,119,254,231,116,29,194,38,218,130,65,29,177,
+  9,93,78,87,91,255,168,185,118,130,58,240,38,176,116,44,
+  184,145,242,159,74,96,241,113,67,97,125,202,254,87,205,250,
+  255,79,252,100,194,65,40,132,147,80,137,34,66,35,138,137,
+  18,98,13,225,18,251,157,112,115,228,58,66,103,121,157,85,
+  151,176,158,240,16,229,68,5,177,129,240,18,183,9,111,32,
+  170,136,106,162,134,168,37,54,18,62,66,23,190,81,248,31,
+  82,164,12,203,148,5,228,47,12,206,247,28,177,70,252,99,
+  69,56,137,50,98,45,225,18,127,89,138,183,59,81,140,85,
+  124,150,23,242,230,119,115,251,71,26,254,40,223,81,105,229,
+  127,171,183,254,50,25,100,110,106,218,207,115,243,233,235,149,
+  60,5,255,36,73,143,202,150,214,86,253,29,249,168,104,130,
+  215,204,170,120,41,150,37,86,253,29,253,168,104,130,215,236,
+  170,120,105,150,7,172,250,251,246,77,162,229,243,185,23,200,
+  43,187,26,94,127,244,79,203,73,239,255,94,210,255,225,159,
+  92,188,36,255,90,255,116,120,41,37,31,40,23,124,159,14,
+  175,53,234,13,246,82,63,29,174,255,255,253,223,190,247,136,
+  107,132,122,82,141,59,223,115,254,208,217,239,148,148,127,80,
+  38,149,173,142,255,113,204,58,142,57,238,118,52,202,139,114,
+  86,62,46,31,149,247,202,237,114,149,180,36,93,148,206,72,
+  39,164,39,164,111,73,195,210,30,41,36,181,72,181,82,25,
+  114,156,232,63,112,14,175,226,37,60,143,103,240,52,254,28,
+  143,225,59,56,140,7,241,192,173,218,75,30,43,126,191,56,
+  173,253,82,75,20,93,41,250,122,145,75,253,107,245,46,231,
+  85,231,15,156,119,41,31,40,63,85,38,148,160,227,61,199,
+  63,58,30,118,12,57,234,229,223,201,175,201,127,37,127,75,
+  190,71,222,46,123,37,83,250,119,233,159,165,191,145,190,43,
+  125,83,74,73,95,144,186,164,38,169,90,114,97,9,11,248,
+  37,126,134,87,240,79,248,41,142,227,47,241,36,30,197,195,
+  56,132,175,243,148,31,65,18,123,113,15,246,224,243,232,197,
+  93,66,23,142,119,43,63,230,251,95,239,174,88,222,162,27,
+  0,0,
+};
+/* timerc data */
+static const unsigned char dat_timerc = {
+  31,139,8,0,0,0,0,0,0,3,75,96,96,208,73,0,
+  98,142,29,12,172,191,56,193,164,168,158,5,163,72,186,128,
+  71,21,3,143,195,115,29,119,183,63,106,12,126,215,252,74,
+  129,170,184,0,249,100,50,57,46,0,0,0,
+};
+/* xbiossound data */
+static const unsigned char dat_xbiossound = {
+  31,139,8,0,0,0,0,0,0,3,237,148,75,79,19,81,
+  20,199,79,199,2,21,17,166,96,72,55,212,43,143,70,177,
+  182,20,95,208,16,94,149,80,137,189,84,91,31,85,23,51,
+  2,83,170,216,150,210,65,75,8,22,36,74,140,38,146,16,
+  98,140,75,227,194,21,38,74,162,81,194,130,68,220,152,96,
+  76,195,194,196,149,143,248,1,76,156,34,248,159,226,74,191,
+  2,39,153,255,111,206,57,247,158,57,51,103,102,36,50,90,
+  185,202,85,135,155,120,248,167,189,147,103,104,203,182,108,203,
+  182,44,103,62,141,150,59,180,172,38,75,202,25,159,150,253,
+  240,102,89,17,29,238,181,114,153,232,174,78,137,104,210,238,
+  181,117,117,104,191,51,114,147,82,239,168,37,59,114,113,199,
+  254,28,251,217,101,242,35,118,8,231,81,135,59,187,16,206,
+  183,119,30,240,146,17,121,61,230,229,42,170,126,108,159,229,
+  106,45,119,88,23,94,135,124,129,96,88,224,106,179,117,97,
+  52,77,74,105,179,213,216,25,242,125,233,182,91,63,221,171,
+  185,21,39,233,235,92,171,254,183,202,206,96,119,161,78,116,
+  32,116,221,14,23,121,191,109,172,227,255,53,123,226,243,141,
+  13,174,254,141,140,109,70,198,16,209,43,167,41,228,195,77,
+  25,64,78,134,28,79,194,55,129,1,240,17,24,4,95,128,
+  167,193,85,240,44,184,1,250,193,251,224,57,108,111,5,67,
+  32,58,12,157,7,31,131,23,192,121,240,34,248,10,68,123,
+  66,59,120,9,251,158,130,61,224,12,216,11,62,248,247,41,
+  159,187,20,137,13,177,234,250,58,118,44,22,136,169,209,94,
+  150,232,139,15,200,41,106,97,78,230,143,93,141,247,165,152,
+  63,146,144,147,125,67,204,147,144,227,241,20,243,32,26,25,
+  96,46,242,37,28,129,100,170,231,202,117,182,215,117,216,89,
+  215,224,108,60,106,175,63,232,116,185,244,19,87,157,179,238,
+  136,179,177,97,31,5,251,35,67,127,171,178,126,57,218,59,
+  128,82,189,114,82,102,74,44,193,146,253,125,44,216,29,96,
+  255,247,161,168,209,158,100,36,22,37,106,211,12,228,209,12,
+  79,170,77,29,26,217,89,233,243,116,184,178,122,162,146,242,
+  199,245,59,180,137,243,233,171,69,243,227,81,211,108,58,51,
+  193,110,6,189,65,239,179,119,177,239,92,37,242,188,111,211,
+  104,137,53,241,65,62,232,209,104,204,53,202,127,209,145,61,
+  199,169,1,94,58,231,37,225,13,115,21,235,30,85,142,172,
+  255,128,87,140,227,49,87,49,221,59,108,100,253,35,86,38,
+  204,17,125,118,80,3,17,84,160,60,232,54,50,66,141,180,
+  29,154,71,38,104,62,237,132,22,80,9,212,68,219,160,219,
+  169,0,90,72,59,184,42,180,82,9,222,105,91,5,102,128,
+  218,82,169,69,104,203,69,118,137,22,92,227,237,138,185,98,
+  90,36,209,130,220,195,127,167,36,151,119,189,36,58,150,208,
+  223,207,170,53,125,254,186,199,85,230,166,59,97,124,7,172,
+  85,116,211,100,184,48,64,101,139,200,12,75,113,209,114,197,
+  102,94,156,162,34,162,2,165,28,215,50,80,139,216,48,133,
+  214,105,49,109,64,70,144,62,153,87,161,153,83,116,185,30,
+  171,198,21,83,217,42,246,94,147,150,224,77,40,86,100,209,
+  205,74,163,30,19,45,102,141,106,166,132,57,55,237,14,23,
+  135,188,82,97,110,237,176,34,76,47,87,45,111,246,178,217,
+  213,31,121,18,131,234,214,7,0,0,
+};
+static const struct replay {
+  const char    * name;
+  const unsigned char * data;
+  int   csize;
+  int   dsize;
+} replays57 = {
+  {   "aenigmatica",   dat_aenigmatica,   sizeof(dat_aenigmatica),   3742 },
+  {  "alteredbeast",  dat_alteredbeast,  sizeof(dat_alteredbeast),   9130 },
+  {      "armalyte",      dat_armalyte,      sizeof(dat_armalyte),   2934 },
+  {     "asidifier",     dat_asidifier,     sizeof(dat_asidifier),   2164 },
+  {     "azidifier",     dat_azidifier,     sizeof(dat_azidifier),  14938 },
+  {      "blipblop",      dat_blipblop,      sizeof(dat_blipblop),   4002 },
+  {      "blipp079",      dat_blipp079,      sizeof(dat_blipp079),   2192 },
+  {      "chipmon2",      dat_chipmon2,      sizeof(dat_chipmon2),  12109 },
+  {      "cosotfmx",      dat_cosotfmx,      sizeof(dat_cosotfmx),   2628 },
+  {   "deltamusic1",   dat_deltamusic1,   sizeof(dat_deltamusic1),   2474 },
+  {   "deltamusic2",   dat_deltamusic2,   sizeof(dat_deltamusic2),     20 },
+  {           "dmu",           dat_dmu,           sizeof(dat_dmu),   5936 },
+  {         "dwaga",         dat_dwaga,         sizeof(dat_dwaga),     90 },
+  {       "dyter07",       dat_dyter07,       sizeof(dat_dyter07),  21066 },
+  {       "fc13_14",       dat_fc13_14,       sizeof(dat_fc13_14),   6034 },
+  {       "fireice",       dat_fireice,       sizeof(dat_fireice),   5998 },
+  {          "fred",          dat_fred,          sizeof(dat_fred),     20 },
+  {          "gemx",          dat_gemx,          sizeof(dat_gemx),   8874 },
+  {       "hpn-jam",       dat_hpn_jam,       sizeof(dat_hpn_jam), 145166 },
+  { "huntforredoct", dat_huntforredoct, sizeof(dat_huntforredoct),   4834 },
+  { "jamcrackerpro", dat_jamcrackerpro, sizeof(dat_jamcrackerpro),   1782 },
+  {    "lastninja3",    dat_lastninja3,    sizeof(dat_lastninja3),   3054 },
+  {  "lastninjaiii",  dat_lastninjaiii,  sizeof(dat_lastninjaiii),   4698 },
+  {        "mcoder",        dat_mcoder,        sizeof(dat_mcoder),   1954 },
+  {          "midi",          dat_midi,          sizeof(dat_midi),  26937 },
+  {       "mmmesid",       dat_mmmesid,       sizeof(dat_mmmesid),   4706 },
+  {           "mon",           dat_mon,           sizeof(dat_mon),     70 },
+  {       "musmon1",       dat_musmon1,       sizeof(dat_musmon1),   2454 },
+  {       "musmon2",       dat_musmon2,       sizeof(dat_musmon2),   4756 },
+  {     "ninjatfmx",     dat_ninjatfmx,     sizeof(dat_ninjatfmx),   3836 },
+  {          "note",          dat_note,          sizeof(dat_note),    110 },
+  {          "page",          dat_page,          sizeof(dat_page),   5246 },
+  {    "protracker",    dat_protracker,    sizeof(dat_protracker),   4308 },
+  {  "psgtrackerv2",  dat_psgtrackerv2,  sizeof(dat_psgtrackerv2),   5832 },
+  {          "puma",          dat_puma,          sizeof(dat_puma),   5322 },
+  {       "quartet",       dat_quartet,       sizeof(dat_quartet),  18448 },
+  {        "realms",        dat_realms,        sizeof(dat_realms),   6222 },
+  {  "shadowdancer",  dat_shadowdancer,  sizeof(dat_shadowdancer),   9414 },
+  {       "sidmon1",       dat_sidmon1,       sizeof(dat_sidmon1),    316 },
+  {       "sidmon2",       dat_sidmon2,       sizeof(dat_sidmon2),   2693 },
+  {      "sndh_ice",      dat_sndh_ice,      sizeof(dat_sndh_ice),    424 },
+  {       "soundfx",       dat_soundfx,       sizeof(dat_soundfx),   1568 },
+  {      "spacegun",      dat_spacegun,      sizeof(dat_spacegun),   8698 },
+  {          "ssd1",          dat_ssd1,          sizeof(dat_ssd1),   9252 },
+  {          "stos",          dat_stos,          sizeof(dat_stos),   4186 },
+  {       "synthiv",       dat_synthiv,       sizeof(dat_synthiv),   1998 },
+  {      "tao_digi",      dat_tao_digi,      sizeof(dat_tao_digi),   3532 },
+  {   "tao_hubbard",   dat_tao_hubbard,   sizeof(dat_tao_hubbard),   3572 },
+  {     "tao_ms211",     dat_tao_ms211,     sizeof(dat_tao_ms211),   6276 },
+  {      "tao_ms25",      dat_tao_ms25,      sizeof(dat_tao_ms25),   7794 },
+  {      "tao_ms27",      dat_tao_ms27,      sizeof(dat_tao_ms27),   8632 },
+  {       "tao_tsd",       dat_tao_tsd,       sizeof(dat_tao_tsd), 109732 },
+  {    "tcbtracker",    dat_tcbtracker,    sizeof(dat_tcbtracker),  43818 },
+  {          "tfmx",          dat_tfmx,          sizeof(dat_tfmx),   2514 },
+  {       "tfmx_st",       dat_tfmx_st,       sizeof(dat_tfmx_st),   7074 },
+  {        "timerc",        dat_timerc,        sizeof(dat_timerc),     46 },
+  {    "xbiossound",    dat_xbiossound,    sizeof(dat_xbiossound),   2006 },
+};

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/replay68.c Added

@@ -0,0 +1,88 @@
+/*
+ * @file replay68.c
+ * @brief built-in external replay rom
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_str.h"
+#include "file68_msg.h"
+FILE68_API
+int replay68_get(const char * name, const void ** data,
+ int * csize, int * dsize);
+
+#include "replay.inc.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+static int cmp(const void * pa, const void * pb)
+{
+ const char
+ * a = ( (const struct replay *) pa ) -> name,
+ * b = ( (const struct replay *) pb ) -> name;
+ return strcmp68(a, b);
+}
+
+int replay68_get(const char * name, const void ** data,
+ int * csize, int * dsize)
+{
+ const int max = sizeof(replays)/sizeof(*replays);
+ struct replay s;
+ const struct replay *r;
+ s.name = name;
+
+ r = bsearch(&s, replays, max, sizeof(*replays), cmp);
+ if (!r) {
+ int i;
+ /* This should not happen unless the replay-rom is not sorted
+ * properly. Anyway it does not cost too much work.
+ */
+#ifdef DEBUG
+ const char * prev = "";
+ for (i=0; i<max; ++i) {
+ assert ( strcmp68(prev, replaysi.name) < 0);
+ prev = replaysi.name;
+ }
+#endif
+ for (i=0; i<max; ++i)
+ if (!strcmp68(name, replaysi.name)) {
+ r = replays+i;
+ break;
+ }
+ }
+
+ if (r) {
+ if (data)
+ *data = r->data;
+ if (csize)
+ *csize = r->csize;
+ if (dsize)
+ *dsize = r->dsize;
+ } else
+ msg68_warning("rsc68: can't find built-in replay -- *%s*\n",
+ name);
+ return -!r;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/rsc68.c Added

@@ -0,0 +1,794 @@
+/*
+ * @file rsc68.c
+ * @brief resource functions
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_rsc.h"
+#include "file68_err.h"
+#include "file68_uri.h"
+#include "file68_str.h"
+#include "file68_msg.h"
+#include "file68_zip.h"
+#include "file68_vfs_def.h"
+#include "file68_vfs_file.h"
+#include "file68_vfs_fd.h"
+#include "file68_vfs_curl.h"
+#include "file68_vfs_mem.h"
+#include "file68_vfs_z.h"
+
+#include <assert.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+
+#ifndef DEBUG_RSC68_O
+#define DEBUG_RSC68_O 0
+#endif
+int rsc68_cat = msg68_DEFAULT;
+
+static volatile int init = 0;
+
+/* in replay68.c */
+int replay68_get(const char * name, const void ** data, int * csize, int * dsize);
+
+/* The resource pathes are context independant consequently
+ * each context use the same pathes.
+ */
+static const char * share_path = 0; /* Shared resource path. */
+static const char * user_path = 0; /* User resource path. */
+static const char * lmusic_path = 0; /* Local music path. */
+static const char * rmusic_path = 0; /* Remote music path. */
+
+static vfs68_t * default_open(rsc68_t type, const char *name, int mode,
+ rsc68_info_t * info);
+
+static rsc68_handler_t rsc68 = default_open;
+static int rsc68_ismine(const char *);
+static vfs68_t * rsc68_create(const char *, int, int, va_list);
+static scheme68_t rsc68_scheme = {
+ 0, "vfs-sc68", rsc68_ismine, rsc68_create
+};
+
+#ifndef FILE68_SHARED_PATH
+# define FILE68_SHARED_PATH 0
+#endif
+#ifndef PACKAGE_URL
+# define FILE68_RMUSIC_PATH 0
+#else
+# define FILE68_RMUSIC_PATH PACKAGE_URL "/Download/Music"
+#endif
+#ifndef FILE68_USER_PATH
+# define FILE68_USER_PATH 0
+#endif
+#ifndef FILE68_MUSIC_PATH
+# define FILE68_MUSIC_PATH 0
+#endif
+
+static struct {
+ rsc68_t type;
+ const char * name;
+ const char * path;
+ const char * ext;
+} rsc68_tablersc68_last;
+
+static int rsc68_ismine(const char * uri)
+{
+ if (!strncmp68(uri, "sc68://", 7))
+ return SCHEME68_ISMINE | SCHEME68_READ | SCHEME68_WRITE;
+ return 0;
+}
+
+static void rsc68_init_table(void)
+{
+ memset(rsc68_table, 0, sizeof(rsc68_table));
+
+ rsc68_tablersc68_replay.type = rsc68_replay;
+ rsc68_tablersc68_replay.name = "replay";
+ rsc68_tablersc68_replay.path = "/Replay/";
+ rsc68_tablersc68_replay.ext = ".bin";
+
+ rsc68_tablersc68_config.type = rsc68_config;
+ rsc68_tablersc68_config.name = "config";
+ rsc68_tablersc68_config.path = "/";
+ rsc68_tablersc68_config.ext = ".cfg";
+
+ /* rsc68_tablersc68_sample.type = rsc68_sample; */
+ /* rsc68_tablersc68_sample.name = "sample"; */
+ /* rsc68_tablersc68_sample.path = "/Sample/"; */
+ /* rsc68_tablersc68_sample.ext = ".sc68"; */
+
+ /* rsc68_tablersc68_dll.type = rsc68_dll; */
+ /* rsc68_tablersc68_dll.name = "dll"; */
+ /* rsc68_tablersc68_dll.path = "/Dll/"; */
+ /* rsc68_tablersc68_dll.ext = 0; */
+
+ rsc68_tablersc68_music.type = rsc68_music;
+ rsc68_tablersc68_music.name = "music";
+ rsc68_tablersc68_music.path = "/Music/";
+ rsc68_tablersc68_music.ext = ".sc68";
+}
+
+static const char *default_share_path(void)
+{
+ return share_path
+ ? share_path
+ : FILE68_SHARED_PATH;
+}
+
+static const char *default_rmusic_path(void)
+{
+ return rmusic_path
+ ? rmusic_path
+ : FILE68_RMUSIC_PATH;
+}
+
+static const char * rsc_set_any(const char ** any, const char * path)
+{
+ free((void *)*any);
+ return *any = strdup68(path) ;
+}
+
+const char * rsc68_set_share(const char *path)
+{
+ return rsc_set_any(&share_path, path);
+}
+
+const char * rsc68_set_user(const char *path)
+{
+ return rsc_set_any(&user_path, path);
+}
+
+const char * rsc68_set_music(const char *path)
+{
+ return rsc_set_any(&lmusic_path, path);
+}
+
+const char * rsc68_set_remote_music(const char *path)
+{
+ return rsc_set_any(&rmusic_path, path);
+}
+
+void rsc68_get_path(const char **share,
+ const char **user,
+ const char **local_music,
+ const char **remote_music)
+{
+ if (share) *share = share_path;
+ if (user) *user = user_path;
+ if (local_music) *local_music = lmusic_path;
+ if (remote_music) *remote_music = rmusic_path;
+}
+
+/* Returns char or -1 to skip it */
+typedef int (*char_cv_t)(int);
+
+/* Runs the convert chain */
+static int convert_chain(int c, ...)
+{
+ va_list list;
+ char_cv_t cv;
+
+ va_start(list,c);
+ while (cv = va_arg(list,char_cv_t), cv) {
+ c = cv(c);
+ }
+ va_end(list);
+ return c;
+}
+
+/* No conversion */
+#if 0
+static int cv_none(int c) {
+ return c;
+}
+#endif
+
+/* Convert upper to lower */
+static int cv_lower(int c) {
+ return (c>='A' && c <= 'Z')
+ ? c - 'A' + 'a'
+ : c;
+}
+
+static int cv_from_tables(int c, const char * acc, const char * con)
+{
+ const char * s;
+ if (s=strchr(acc,c), s) {
+ c = cons-acc;
+ }
+ return c;
+}
+
+/* Convert accented */
+/* $$$ TODO ... Proper encoding */
+static int cv_accent(int c)
+{
+ return cv_from_tables(c,
+ "áâàãäëéêèïíîìöõóôòüúûùüç",
+ "aaaaaeeeeiiiiooooouuuuuc");
+}
+
+/* Convert to minus */
+static int cv_minus(int c)
+{
+ if (strchr("\\/&$",c)) c = '-';
+ return c;
+}
+
+/* Convert to "skip" */
+#if 0
+static int cv_skip(int c)
+{
+ if (strchr(":?<>",c)) c = -1;
+ return c;
+}
+#endif
+
+/* Convert to "skip" */
+static int cv_skip2(int c)
+{
+ if (strchr("<>",c)) c = -1;
+ return c;
+}
+
+/* Convert for filename in local filesystem */
+static int cv_name_local(int c)
+{
+ c = cv_accent(cv_minus(cv_skip2(c)));
+ return c;
+}
+
+static int cv_path_local(int c)
+{
+ if (c == '\\') c = '/';
+ if (c != '/') {
+ c = cv_name_local(c);
+ }
+ return c;
+}
+
+static int cv_name_remote(int c)
+{
+ c = cv_accent(cv_minus(cv_skip2(c)));
+ if (c == ' ') c = '_';
+ else if (c == '#') c = '0';
+ return c;
+}
+
+static int cv_path_remote(int c)
+{
+ if (c == '\\') c = '/';
+ if (c != '/') {
+ c = cv_name_remote(c);
+ }
+ return c;
+}
+
+
+static int copy_path(char *d, int max,
+ const char * s,
+ char_cv_t cv1,
+ char_cv_t cv2,
+ int brk)
+{
+ int i;
+
+ for (i=0; i<max; ) {
+ int c = (*s++) & 255, c2;
+ if (!c) break;
+ c2 = convert_chain(c, cv1, cv2, 0);
+ if (c2 != -1) {
+ di++ = c2;
+ }
+ if (c == brk) break;
+ }
+ if (i < max) {
+ di = 0;
+ } else {
+ i = -1;
+ }
+ return i;
+}
+
+/* formay is /:track:loop:time/ */
+const char * rsc68_get_music_params(rsc68_info_t *info, const char *name)
+{
+ int c = 1; /* anything but 0 or ':' */
+ if (info) {
+ info->type = rsc68_last;
+ }
+
+ if (name) c = *name;
+ if (!c || c == ':') {
+ int i, tinfo3 = { 0, 0, 0 };
+
+ for (i=0; i<3 && c == ':'; ++i) {
+ c = *++name;
+ if (c >= '0' && c <= '9') {
+ int v = 0;
+ do {
+ v = v*10 + c-'0';
+ c = *++name;
+ } while (c >= '0' && c <= '9');
+ tinfoi = v;
+ }
+ }
+ /* skip to eos or next '/' */
+ while (c && c != '/') {
+ c = *++name;
+ }
+
+ if (info) {
+ info->type = rsc68_music;
+ info->data.music.track = tinfo0;
+ info->data.music.loops = tinfo1;
+ info->data.music.time_ms = tinfo2 * 1000;
+ }
+ }
+
+ return name;
+}
+
+
+
+/* author/hw/title/:track:loop:time */
+static char * convert_music_path(char * newname, int max,
+ const char *name,
+ rsc68_info_t * info)
+{
+ int len, c;
+ char * nname = newname;
+ char * ename = nname+max;
+
+ /* Author */
+ len = copy_path(nname, ename - nname, name, 0, 0, '/');
+ if (len <= 0) goto error;
+ nname += len;
+ name += len;
+
+ /* Hardware */
+ c = (*name++) & 255;
+
+ if (c == '0') {
+ len = copy_path(nname, ename - nname, "Atari ST/", 0, 0, 0);
+ } else if (c == '1') {
+ len = copy_path(nname, ename - nname, "Amiga/", 0, 0, 0);
+ } else {
+ len = -1;
+ }
+ if (len <= 0) goto error;
+ nname += len;
+ c = (*name++) & 255;
+ if (c != '/') goto error;
+
+ /* Title */
+ len = copy_path(nname, ename - nname, name, 0, 0, '/');
+ if (len <= 0) goto error;
+ nname += len;
+ name += len;
+
+ if (nname-1 == '/') {
+ --nname;
+ }
+ *nname = 0;
+
+ /* Optional track # */
+ name = rsc68_get_music_params(info, name);
+
+ return newname;
+
+error:
+ *newname = 0;
+ return 0;
+}
+
+static vfs68_t * default_open(rsc68_t type, const char *name,
+ int mode, rsc68_info_t * info)
+{
+ vfs68_t * is = 0;
+ int err = -1;
+ const char *subdir = 0, *ext = 0;
+ char tmp1024, * apath = 0;
+ char tmpname512;
+ int alen = 0;
+ char_cv_t cv_path=0, cv_extra=0;
+ struct {
+ const char * path, * sdir, * ext;
+ int curl;
+ } pathes4;
+ int ipath, npath = 0;
+ const char * share_path = default_share_path();
+ const char * rmusic_path = default_rmusic_path();
+
+ /* default to invalid type. */
+ if (info) {
+ info->type = rsc68_last;
+ }
+
+ if ( (int) type < 0 || (int)type >= rsc68_last) {
+ return 0;
+ }
+
+ memset(pathes,0,sizeof(pathes));
+
+ if (type == rsc68_music && lmusic_path) {
+ /* local music path is prior to user share */
+ pathesnpath.path = lmusic_path;
+ pathesnpath.sdir = "/";
+ ++npath;
+ }
+
+ /* Build default pathes list */
+ if (user_path) {
+ pathesnpath++.path = user_path;
+ }
+
+ switch (mode &= 3) {
+ case 1: case 2:
+ break;
+ default:
+ assert(!"invalid mode");
+ return 0;
+ }
+
+ if (mode == 1 && share_path) {
+ pathesnpath++.path = share_path;
+ }
+
+ subdir = rsc68_tabletype.path;
+ ext = rsc68_tabletype.ext;
+
+ /* Set a default name for config file if none is given. */
+ if (type == rsc68_config && (!name || !name0)) {
+ name = "sc68";
+ }
+
+ TRACE68(rsc68_cat,"rsc68: open %c 'sc68://%s/%s%s'\n",
+ (mode==1)?'R':'W',rsc68_tabletype.name, name, ext?ext:"");
+
+ /* Any specific stuff. */
+ switch (type) {
+ case rsc68_replay:
+
+#if defined (USE_REPLAY68) && 0
+
+ /* Method using vfs to inflate data. Notice that unfortunatly
+ * we can't use a proper Z stream because the replay loader needs
+ * to know the length and vfs68_z::length() method does not
+ * have this information before it has inflated the all data. This
+ * is a limitation that could probably be dealt with, at least
+ * with gziped stream as the information is available at the end
+ * of the stream. Also in this particular case the inflate size is
+ * available via the replay68_get() function.
+ */
+ if (mode == 1) {
+ const void * cdata;
+ int csize, dsize;
+ vfs68_t * is_in;
+
+ TRACE68(rsc68_cat,"rsc68: trying built-in replay -- %s\n", name);
+ if (!replay68_get(name, &cdata, &csize, &dsize)) {
+ TRACE68(rsc68_cat,"rsc68: found built-in replay -- %s %d %d\n",
+ name, csize, dsize);
+ is_in =
+ vfs68_z_create(
+ vfs68_mem_create(cdata, csize, mode),
+ mode|VFS68_SLAVE,
+ vfs68_z_default_option);
+ if (is_in) {
+ is = vfs68_mem_create(0, dsize, 3);
+ if (!vfs68_open(is_in) && !vfs68_open(is)) {
+ int n;
+ while (n = vfs68_read(is_in, tmpname, sizeof(tmpname)), n > 0)
+ if (vfs68_write(is, tmpname, n) != n) {
+ n = -1;
+ break;
+ }
+ err = -!!n;
+ }
+ vfs68_destroy(is_in);
+ vfs68_seek_to(is,0);
+ }
+ }
+ }
+
+#elif defined (USE_REPLAY68)
+
+ /* Method using gzip68_buffer() is probably faster (less memory
+ * copy) than the previous Z stream one. It still need to allocate
+ * a temporary buffer to store deflated data whereas a proper
+ * vfs could have deflated on the fly into the 68k memory
+ * buffer. See previous method comment on that matter.
+ */
+ if (mode == 1) {
+ const void * cdata;
+ void * ddata;
+ int csize, dsize;
+
+ TRACE68(rsc68_cat,"rsc68: trying built-in replay -- %s\n", name);
+ if (!replay68_get(name, &cdata, &csize, &dsize)) {
+ TRACE68(rsc68_cat,"rsc68: found built-in replay -- %s %d %d\n",
+ name, csize, dsize);
+ ddata = malloc(dsize);
+ if (ddata) {
+ int inflate = gzip68_buffer(ddata, dsize, cdata, csize);
+ if (inflate != dsize) {
+ msg68_error("rsc68: inflated size of built-in replay differs"
+ " -- %s %d %d\n",name, inflate, dsize);
+ err = -1;
+ } else {
+ is = vfs68_mem_create(ddata, dsize, mode|VFS68_SLAVE);
+ if ( (err = -!is) != 0) {
+ free(ddata);
+ }
+ }
+ }
+ }
+ }
+
+#endif
+
+ cv_extra = cv_lower; /* $$$ transform replay name to lower case. */
+ break;
+
+ case rsc68_music:
+ if (mode == 1 && rmusic_path) {
+ pathesnpath.path = rmusic_path;
+ pathesnpath.sdir = "/";
+ pathesnpath.curl = 1;
+ ++npath;
+ }
+ name = convert_music_path(tmpname, sizeof(tmpname), name, info);
+ break;
+
+ default:
+ break;
+ }
+
+ for (ipath=0; !is && name && ipath < npath; ++ipath) {
+ const char *cpath, * cdir, * cext;
+ char *p, *pe, *path;
+ int len, l;
+
+ cpath = pathesipath.path;
+ cdir = pathesipath.sdir ? pathesipath.sdir : subdir;
+ cext = pathesipath.ext ? pathesipath.ext : ext;
+
+ len = 1
+ + strlen(cpath)
+ + strlen(cdir)
+ + strlen(name)
+ + (cext ? strlen(cext) : 0);
+
+ if (len <= alen) {
+ path = apath;
+ } else if (len <= sizeof(tmp)) {
+ path = tmp;
+ } else {
+ free(apath);
+ apath = malloc(len);
+ alen = apath ? len : 0;
+ path = apath;
+ }
+
+ if (!path) {
+ continue;
+ }
+
+ p = path;
+ pe = path + len;
+
+ cv_path = pathesipath.curl
+ ? cv_path_remote
+ : cv_path_local;
+
+ /* Build path. */
+ l = copy_path(p, pe-p, cpath, cv_path, 0 , 0);
+ p += l;
+ l = copy_path(p, pe-p, cdir, cv_path, 0, 0);
+ p += l;
+ l = copy_path(p, pe-p, name, cv_path, cv_extra, 0);
+ p += l;
+ if (cext) {
+ l = copy_path(p, pe-p, cext, 0, 0 ,0);
+ p += l;
+ }
+
+ is = uri68_vfs(path, mode, 0);
+ err = vfs68_open(is);
+ TRACE68(rsc68_cat, "rsc68: try %s\n", strok68(err));
+ if (!err)
+ break;
+
+ vfs68_destroy(is);
+ is = 0;
+ }
+
+ if (apath != tmp)
+ free(apath);
+ if (err) {
+ vfs68_destroy(is);
+ is = 0;
+ }
+
+ if (is && info)
+ info->type = type;
+
+ TRACE68(rsc68_cat, "rsc68: open '%s' -- *%s*\n",
+ vfs68_filename(is),
+ strok68(!is));
+ return is;
+}
+
+
+rsc68_handler_t rsc68_set_handler(rsc68_handler_t fct)
+{
+ rsc68_handler_t old;
+
+ old = rsc68;
+ if (fct) {
+ rsc68 = fct;
+ }
+ return old;
+}
+
+static vfs68_t * rsc68_create(const char *uri, int mode, int argc, va_list list)
+{
+ rsc68_info_t * info = argc > 0 ? va_arg(list, rsc68_info_t *) : 0;
+ return rsc68_create_uri(uri, mode, info);
+}
+
+vfs68_t * rsc68_create_uri(const char *uri, int mode, rsc68_info_t * info)
+{
+ vfs68_t * vfs;
+ /* $$$ Ugly haXXX we need to close since created stream are not
+ supposed to be open but that's the only function we have
+ for now. */
+ vfs = rsc68_open_uri(uri, mode, info);
+ vfs68_close(vfs);
+ return vfs;
+}
+
+vfs68_t * rsc68_open_uri(const char *uri, int mode, rsc68_info_t * info)
+{
+ int i;
+ vfs68_t * is = 0;
+ char scheme32;
+
+ TRACE68(rsc68_cat,"rsc68: open uri='%s' mode=%c%c%s\n",
+ strnevernull68(uri),
+ (mode&1) ? 'R' : '.',
+ (mode&2) ? 'W' : '.',
+ info ? " with info" : "");
+
+ if (info) {
+ info->type = rsc68_last;
+ }
+
+ assert(rsc68);
+ if (!rsc68) {
+ msg68_critical("rsc68: no handler defined\n");
+ goto error;
+ }
+
+ mode &= 3;
+
+ if (strncmp68(uri, "sc68://", 7)) {
+ msg68_error("rsc68: invalid scheme -- %s\n", uri);
+ goto error;
+ }
+ uri += 7; /* skip sc68:// */
+
+ /* Get resource type. */
+ for (i=0; 1; ++i) {
+ int c = urii & 255;
+ if (!c || c == '/') {
+ schemei=0;
+ uri += i + (c=='/');
+ break;
+ }
+ schemei = c;
+ if (i >= sizeof(scheme)-1) {
+ msg68_error("rsc68: invalid sc68 uri -- %s\n", uri);
+ goto error;
+ }
+ }
+
+ /* Table should be initialized by proper library initialization. */
+ /* rsc68_init_table(); */
+
+ for (i=0; i<rsc68_last && strcmp68(rsc68_tablei.name, scheme); ++i)
+ ;
+ if (i >= rsc68_last) {
+ msg68_error("rsc68: invalid sc68 uri -- %s\n", uri);
+ goto error;
+ }
+ TRACE68(rsc68_cat,"rsc68: resource type #%d '%s'\n", i, scheme);
+ is = rsc68(i, uri, mode, info);
+
+error:
+ TRACE68(rsc68_cat,"rsc68: open => %s,'%s'\n",
+ strok68(!is),vfs68_filename(is));
+ return is;
+}
+
+vfs68_t * rsc68_open(rsc68_t type, const char *name, int mode,
+ rsc68_info_t * info)
+{
+ if (info) {
+ info->type = rsc68_last;
+ }
+ if (!rsc68 || mode < 1 || mode > 2) {
+ return 0;
+ }
+ return rsc68(type, name, mode, info);
+}
+
+int rsc68_init(void)
+{
+ int err = -1;
+
+ if (init) {
+ msg68_critical("rsc68: already initialized\n");
+ } else {
+ rsc68_cat =
+ msg68_cat("rsc","resource access protocol",DEBUG_RSC68_O);
+
+ rsc68 = default_open;
+ rsc68_init_table();
+ rsc68_set_share(FILE68_SHARED_PATH);
+ rsc68_set_user(FILE68_USER_PATH);
+ rsc68_set_music(FILE68_MUSIC_PATH);
+ rsc68_set_remote_music(FILE68_RMUSIC_PATH);
+
+ uri68_register(&rsc68_scheme);
+
+ TRACE68(rsc68_cat,"rsc68: shared-data = '%s'\n",strnevernull68(share_path));
+ TRACE68(rsc68_cat,"rsc68: user_path = '%s'\n",strnevernull68(user_path));
+ TRACE68(rsc68_cat,"rsc68: lmusic_path = '%s'\n",strnevernull68(lmusic_path));
+ TRACE68(rsc68_cat,"rsc68: rmusic_path = '%s'\n",strnevernull68(rmusic_path));
+
+ init = 1;
+ err = 0;
+ }
+ return err;
+}
+
+void rsc68_shutdown(void)
+{
+ if (init) {
+ /* destroy paths. */
+ rsc68_set_share(0);
+ rsc68_set_user(0);
+ rsc68_set_music(0);
+ rsc68_set_remote_music(0);
+ rsc68 = default_open;
+ init = 0;
+ }
+ TRACE68(rsc68_cat,"rsc68: *%s*\n","shutdown");
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/string68.c Added

@@ -0,0 +1,234 @@
+/*
+ * @file string68.c
+ * @brief string manipulation
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_str.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* Convert letter to uppercase. */
+static int toupper68(int c)
+{
+ return (c < 'a' || c > 'z') ? c : (c-'a'+'A');
+}
+
+/* Convert letter to uppercase. */
+#if 0
+static int tolower68(int c)
+{
+ return (c < 'A' || c > 'Z') ? c : (c-'A'+'a');
+}
+#endif
+
+/* Compare two string without case.
+ */
+int strcmp68(const char *a, const char *b)
+{
+ int av, bv;
+ if (a == b)
+ return 0;
+ if (!a)
+ return -1;
+ if (!b)
+ return 1;
+ for (av = toupper68(*a), bv = toupper68(*b); av && av == bv; a++, b++) {
+ av = toupper68(*a);
+ bv = toupper68(*b);
+ }
+ return av - bv;
+}
+
+/* Compare two string without case (compare at most max chars) .
+ */
+int strncmp68(const char *a, const char *b, int max)
+{
+ int av, bv;
+ if (a == b || max <= 0)
+ return 0;
+ if (!a)
+ return -1;
+ if (!b)
+ return 1;
+ for (av = toupper68(*a), bv = toupper68(*b); --max && av && av == bv; a++, b++) {
+ av = toupper68(*a);
+ bv = toupper68(*b);
+ }
+ return av - bv;
+}
+
+
+/* "a+b" with sizeof("a+b") <= l
+ */
+char * strcat68(char * a, const char * b, int l)
+{
+ int n;
+ if (!a || l < 0)
+ return 0;
+ if (!b)
+ return a;
+ for (n = strlen(a); n < l && *b; n++, b++)
+ an = *b;
+ if (n < l)
+ an = 0;
+ return a;
+}
+
+/* Duplicate s */
+char * strdup68(const char * s)
+{
+ char * d = 0;
+
+ if (s) {
+ int len = strlen(s) + 1;
+
+ d = malloc(len);
+ if (d) {
+ int i;
+ for (i=0; i<len; ++i) {
+ di = si;
+ }
+ }
+ }
+ return d;
+}
+
+/* Duplicate a+b */
+char * strcatdup68(const char * a, const char * b)
+{
+ if (!a) {
+ return strdup68(b);
+ } else if (!b) {
+ return strdup68(a);
+ } else {
+ int lena = strlen(a), lenb = strlen(b);
+ char * d = malloc(lena+lenb+1);
+ if (d) {
+ int i = 0;
+ while (lena--) {
+ di++ = *a++;
+ }
+ while (lenb--) {
+ di++ = *b++;
+ }
+ di = 0;
+ }
+ return d;
+ }
+}
+
+/* Construct a track-time info string
+ * Format "TK MN:SS"
+ * track_num : 01 to 99 or <=0 to deactivate
+ * seconds : 00 to 5999 99'59" or <0 to deactivate
+ */
+char * strtime68(char * buffer, int track_num, int seconds)
+{
+ static char tmp12 = "-- --:--";
+
+ if (!buffer) {
+ buffer = tmp;
+ }
+
+ if (track_num < 0) {
+ track_num = 0;
+ } else if (track_num > 99) {
+ track_num = 99;
+ }
+
+ if (!track_num) {
+ buffer0 = buffer1 = '-';
+ } else {
+ buffer0 = '0' + track_num / 10;
+ buffer1 = '0' + track_num % 10;
+ }
+ buffer2 = ' ';
+
+ if (seconds < 0) {
+ seconds = -1;
+ } else if (seconds > 99 * 60 + 59) {
+ seconds = 99 * 60 + 59;
+ }
+
+ if (seconds < 0) {
+ strcpy(buffer + 3, "--:--");
+ } else {
+ sprintf(buffer + 3, "%02u:%02u", seconds / 60, seconds % 60);
+ }
+
+ buffer8 = 0;
+ return buffer;
+}
+
+/* Construct a playing-time info string from a tine in seconds
+ * Format D days, H h, MN' SS"
+ * 0 => none
+ */
+char * strlongtime68(char * buffer, int time)
+{
+ int sec, min, hr, day;
+ static char tmp32, *s;
+
+ s = buffer ? buffer : tmp;
+
+ if (time <= 0) {
+ return strcpy(s, "none");
+ }
+
+ sec = time % 60;
+ time /= 60;
+ min = time % 60;
+ time /= 60;
+ hr = time % 24;
+ time /= 24;
+ day = time;
+
+ if (day) {
+ sprintf(s, "%d day%s, %2dh, %02d' %02d\"", day, day > 1 ? "s" : "", hr,
+ min, sec);
+ } else if (hr) {
+ sprintf(s, "%2dh, %02d' %02d\"", hr, min, sec);
+ } else {
+ sprintf(s, "%02d' %02d\"", min, sec);
+ }
+ return s;
+}
+
+#ifndef strnevernull68
+const char * strnevernull68(const char *s)
+{
+ return s ? s : "<nul>";
+}
+#endif
+
+#ifndef strok68
+const char * strok68(const int v)
+{
+ return !v ? "success" : "failure";
+}
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/timedb.inc.h Added

@@ -0,0 +1,9378 @@
+TIMEDB_ENTRY( 000f819c, 0, 73089, YM+TA), /* 03713 - Chris of TGE - Combo Racer Cracktro.sndh */
+TIMEDB_ENTRY( 00411850, 0, 8277, YM), /* 02509 - Crazy Q - Crators-DHS-YMR - Monolouge(1ch Minimalism).sndh */
+TIMEDB_ENTRY( 005a16ee, 0, 8705, YM), /* 01049 - Dr Beat - NTM - Menu.sndh */
+TIMEDB_ENTRY( 00661cb2, 0, 9600, YM), /* 01537 - Ralph - Ralph 1.sndh */
+TIMEDB_ENTRY( 007288df, 0, 170122, YM+TA), /* 03940 - Unknown - Bangkok Knights.sndh */
+TIMEDB_ENTRY( 00768743, 0, 9849, YM+TA+TB), /* 01138 - Tyan - Julia 2.sndh */
+TIMEDB_ENTRY( 007b01fb, 0, 5374, YM), /* 03197 - Allister Brimble - Arcade Classix - Missile Command.sndh */
+TIMEDB_ENTRY( 008734d8, 0, 19968, YM), /* 02166 - Mad Max - Cybernoid.sndh */
+TIMEDB_ENTRY( 0096ba8c, 0, 154881, YM+TA), /* 03789 - Roggie - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 0096ba8c, 1, 51757, YM+TA), /* 03789 - Roggie - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 0096ba8c, 2, 27873, YM+TA), /* 03789 - Roggie - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 0096ba8c, 3, 93513, YM+TA), /* 03789 - Roggie - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 0096ba8c, 4, 20065, YM+TA), /* 03789 - Roggie - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 0096ba8c, 5, 80060, YM+TA), /* 03789 - Roggie - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 0096ba8c, 6, 165812, YM+TA), /* 03789 - Roggie - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 00be4e4f, 0, 2555, YM+TA+TB+TD), /* 01122 - Toodeloo - Test 3.sndh */
+TIMEDB_ENTRY( 00c16593, 0, 3054, YM), /* 00742 - Sean Conran - Duckula.sndh */
+TIMEDB_ENTRY( 00c5a987, 0, 50526, YM+TA), /* 04823 - Twitch - Straight Up.sndh */
+TIMEDB_ENTRY( 00d3d382, 0, 2688, YM), /* 01170 - Sally - Mindbend.sndh */
+TIMEDB_ENTRY( 00db87ff, 0, 8058, YM), /* 02420 - 505 - Checkpoint - 8x8 Hero.sndh */
+TIMEDB_ENTRY( 00e0b4f8, 0, 24580, YM+TD), /* 03991 - XyNo - Hip STfucck Hop !.sndh */
+TIMEDB_ENTRY( 00e2f6c3, 0, 3842, YM), /* 02950 - Justin Scharvona - Robozone.sndh */
+TIMEDB_ENTRY( 00e2f6c3, 1, 5764, YM), /* 02950 - Justin Scharvona - Robozone.sndh */
+TIMEDB_ENTRY( 00e2f6c3, 2, 7301, YM), /* 02950 - Justin Scharvona - Robozone.sndh */
+TIMEDB_ENTRY( 00e2f6c3, 3, 6533, YM), /* 02950 - Justin Scharvona - Robozone.sndh */
+TIMEDB_ENTRY( 00f4ae42, 0, 2877, YM), /* 02967 - Unknown - Sleeping Gods Lie.sndh */
+TIMEDB_ENTRY( 00f64fd1, 0, 2877, YM+TD), /* 04228 - 505 - Checkpoint - Siebenschlaefer (unreleased).sndh */
+TIMEDB_ENTRY( 011166dd, 0, 35840, YM+TB+TD), /* 03378 - STU - STEREOID REMIX.sndh */
+TIMEDB_ENTRY( 0124a56a, 0, 3069, YM+TA+TD), /* 01858 - Lotek Style - Loadatune.sndh */
+TIMEDB_ENTRY( 0145aae3, 0, 8225, YM), /* 03892 - Unknown - Rumores.sndh */
+TIMEDB_ENTRY( 014e6bf0, 0, 4608, YM+TD), /* 03311 - Tomchi - 1st Intro.sndh */
+TIMEDB_ENTRY( 01610ab4, 0, 8057, YM+TA+TB+TD), /* 01943 - MSG - Chu Chu Rocket - Challenge.sndh */
+TIMEDB_ENTRY( 016f4cd6, 0, 6144, YM+TA+TD), /* 02266 - Tao - Cream - Stay away (Steps).sndh */
+TIMEDB_ENTRY( 018a6862, 0, 35038, YM+TA), /* 03007 - Mad Max - Great Giana Sisters Title Music.sndh */
+TIMEDB_ENTRY( 0192b02e, 0, 10240, YM+TA), /* 04116 - Tao - The Arrival - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 01972878, 0, 8192, YM), /* 01221 - ENS Music - ENS 4.sndh */
+TIMEDB_ENTRY( 01b879d6, 0, 315, YM+TA), /* 02642 - Miggy - Roar(Unfinished).sndh */
+TIMEDB_ENTRY( 01d08df0, 0, 4176, YM), /* 00174 - Martin Walker - Atomic Robokid.sndh */
+TIMEDB_ENTRY( 01d08df0, 1, 8160, YM), /* 00174 - Martin Walker - Atomic Robokid.sndh */
+TIMEDB_ENTRY( 01d08df0, 2, 4407, YM), /* 00174 - Martin Walker - Atomic Robokid.sndh */
+TIMEDB_ENTRY( 01d08df0, 3, 4320, YM), /* 00174 - Martin Walker - Atomic Robokid.sndh */
+TIMEDB_ENTRY( 01d08df0, 4, 3276, YM), /* 00174 - Martin Walker - Atomic Robokid.sndh */
+TIMEDB_ENTRY( 01d08df0, 5, 673, YM), /* 00174 - Martin Walker - Atomic Robokid.sndh */
+TIMEDB_ENTRY( 01d08df0, 6, 1638, YM), /* 00174 - Martin Walker - Atomic Robokid.sndh */
+TIMEDB_ENTRY( 01d08df0, 7, 6720, YM), /* 00174 - Martin Walker - Atomic Robokid.sndh */
+TIMEDB_ENTRY( 01d08df0, 8, 4704, YM), /* 00174 - Martin Walker - Atomic Robokid.sndh */
+TIMEDB_ENTRY( 01d08df0, 9, 2880, YM), /* 00174 - Martin Walker - Atomic Robokid.sndh */
+TIMEDB_ENTRY( 01f8f345, 0, 4000, YM), /* 01548 - Rhino - Torment Christmas 2000 Intro.sndh */
+TIMEDB_ENTRY( 01fa9141, 0, 37959, YM), /* 00328 - Gary Wheaton - Solar Gammon.sndh */
+TIMEDB_ENTRY( 01fbd6e2, 0, 4221, YM+TA), /* 02436 - Beast - Oldie.sndh */
+TIMEDB_ENTRY( 01fd87a5, 0, 6144, YM), /* 00598 - Chris Mad - Overdrive Fullscreen.sndh */
+TIMEDB_ENTRY( 02025205, 0, 10086, YM), /* 02725 - Jeremy Das - Burger Man.sndh */
+TIMEDB_ENTRY( 02025205, 1, 101, YM), /* 02725 - Jeremy Das - Burger Man.sndh */
+TIMEDB_ENTRY( 02025205, 2, 101, YM), /* 02725 - Jeremy Das - Burger Man.sndh */
+TIMEDB_ENTRY( 02025205, 3, 7, YM), /* 02725 - Jeremy Das - Burger Man.sndh */
+TIMEDB_ENTRY( 02025205, 4, 6, YM), /* 02725 - Jeremy Das - Burger Man.sndh */
+TIMEDB_ENTRY( 02025205, 5, 16, YM), /* 02725 - Jeremy Das - Burger Man.sndh */
+TIMEDB_ENTRY( 02025205, 6, 26, YM), /* 02725 - Jeremy Das - Burger Man.sndh */
+TIMEDB_ENTRY( 02025205, 7, 13, YM), /* 02725 - Jeremy Das - Burger Man.sndh */
+TIMEDB_ENTRY( 020b6a9e, 0, 13727, YM+TA+TB+TD), /* 03016 - Dubmood - RaZoR 1911 - Purple Motions 2nd Reality.sndh */
+TIMEDB_ENTRY( 022cea81, 0, 9849, YM+TA+TB+TD), /* 01941 - MSG - Chu Chu Rocket - Battle.sndh */
+TIMEDB_ENTRY( 022de5dc, 0, 9986, YM), /* 01776 - Lap - Lap 16.sndh */
+TIMEDB_ENTRY( 024cf349, 0, 3199, YM), /* 04580 - blind io - apologies all around.sndh */
+TIMEDB_ENTRY( 024f7804, 0, 16270, YM), /* 00735 - Sean Connolly - Guy Spy.sndh */
+TIMEDB_ENTRY( 024f7804, 1, 12528, YM), /* 00735 - Sean Connolly - Guy Spy.sndh */
+TIMEDB_ENTRY( 024f7804, 2, 13056, YM), /* 00735 - Sean Connolly - Guy Spy.sndh */
+TIMEDB_ENTRY( 024f7804, 3, 13538, YM), /* 00735 - Sean Connolly - Guy Spy.sndh */
+TIMEDB_ENTRY( 024f7804, 4, 10608, YM), /* 00735 - Sean Connolly - Guy Spy.sndh */
+TIMEDB_ENTRY( 024ff46a, 0, 9978, YM+TA+TB+TD), /* 01835 - Lotek Style - Burning Chrome.sndh */
+TIMEDB_ENTRY( 027447f2, 0, 11983, YM+TA+TB+TD), /* 01856 - Lotek Style - Lotusflower.sndh */
+TIMEDB_ENTRY( 02b1f999, 0, 6876, YM), /* 00302 - Gary Wheaton - Colours.sndh */
+TIMEDB_ENTRY( 02efdd55, 0, 18048, YM), /* 01650 - Jedi - Megatizer Intro.sndh */
+TIMEDB_ENTRY( 030ad120, 0, 8448, YM+TD), /* 03222 - Tomchi - Sinus Screen.sndh */
+TIMEDB_ENTRY( 0310839a, 0, 5376, YM), /* 04639 - Crawdaddy - Dropzone.sndh */
+TIMEDB_ENTRY( 032b08a1, 0, 4378, YM), /* 03157 - n-a - SAILORS' BOOGIE.sndh */
+TIMEDB_ENTRY( 0343ebe8, 0, 9971, YM+TA+TB+TD), /* 03618 - gwEm - Ex in my Bed.sndh */
+TIMEDB_ENTRY( 03527bd9, 0, 4095, YM), /* 00029 - 505 - Rectangular Waves.sndh */
+TIMEDB_ENTRY( 037aecb0, 0, 14976, YM+TA+TD), /* 03314 - SH3-RG - Saboteur 2.sndh */
+TIMEDB_ENTRY( 03834eef, 0, 11524, YM+TA+TD), /* 02298 - Tao - Cream - Pop 2149 (Alive 6).sndh */
+TIMEDB_ENTRY( 03840236, 0, 4031, YM+TA+TD), /* 03339 - marcer - jambala 8 mix.sndh */
+TIMEDB_ENTRY( 038c2a30, 0, 16030, YM), /* 02044 - Mad Max - Masters Of Magic.sndh */
+TIMEDB_ENTRY( 038c2a30, 1, 574, YM), /* 02044 - Mad Max - Masters Of Magic.sndh */
+TIMEDB_ENTRY( 038c2a30, 2, 1153, YM), /* 02044 - Mad Max - Masters Of Magic.sndh */
+TIMEDB_ENTRY( 03b2ad1f, 0, 1530, YM+TA+TB+TD), /* 01945 - MSG - Chu Chu Rocket - Hurry Up.sndh */
+TIMEDB_ENTRY( 03b4dc3b, 0, 28160, YM), /* 01419 - Sonic - Aura.sndh */
+TIMEDB_ENTRY( 03c1b536, 0, 3200, YM+TA), /* 04589 - Illusion - Pure Energy 5.sndh */
+TIMEDB_ENTRY( 03d0fbe6, 0, 1293, YM), /* 02966 - Unknown - Quiz Construction Kit.sndh */
+TIMEDB_ENTRY( 03d0fbe6, 1, 4042, YM), /* 02966 - Unknown - Quiz Construction Kit.sndh */
+TIMEDB_ENTRY( 03d0fbe6, 2, 2730, YM), /* 02966 - Unknown - Quiz Construction Kit.sndh */
+TIMEDB_ENTRY( 03e4f84a, 0, 2319, YM), /* 03065 - Chris French - Deck the Halls.sndh */
+TIMEDB_ENTRY( 0431a07d, 0, 2239, YM), /* 02447 - Tony Williams - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 0431a07d, 1, 767, YM), /* 02447 - Tony Williams - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 0431a07d, 2, 1455, YM), /* 02447 - Tony Williams - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 0431a07d, 3, 181, YM), /* 02447 - Tony Williams - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 0431a07d, 4, 191, YM), /* 02447 - Tony Williams - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 0431a07d, 5, 950, YM), /* 02447 - Tony Williams - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 043a3a3f, 0, 4231, YM), /* 02408 - Epic - Through The Never.sndh */
+TIMEDB_ENTRY( 04481e41, 0, 1788, YM+TA), /* 04237 - 505 - 21st.sndh */
+TIMEDB_ENTRY( 04497496, 0, 1785, YM+TA+TB+TD), /* 01955 - MSG - Godpey - Awards.sndh */
+TIMEDB_ENTRY( 04563641, 0, 13312, YM), /* 03216 - Tomchi - Endck.sndh */
+TIMEDB_ENTRY( 0467f523, 0, 69588, YM+TA), /* 03944 - Unknown - Dyer Maker.sndh */
+TIMEDB_ENTRY( 0473cf3e, 0, 11904, YM), /* 03258 - T1000 - The Beast Club - TS 6.sndh */
+TIMEDB_ENTRY( 047b4e0f, 0, 5632, YM+TA+TD), /* 02261 - Tao - Cream - Prelude (Steps).sndh */
+TIMEDB_ENTRY( 047bfb94, 0, 7040, YM), /* 00130 - David Whittaker - Renegade.sndh */
+TIMEDB_ENTRY( 048e952e, 0, 7120, YM+TD), /* 02373 - Nexus 6 - Disharmonica.sndh */
+TIMEDB_ENTRY( 04ab02cc, 0, 6143, YM+TD), /* 03361 - marcer - heroes intro.sndh */
+TIMEDB_ENTRY( 04b12049, 0, 13881, YM+TA+TB+TD), /* 04327 - 505-cpt^pdx - Z.sndh */
+TIMEDB_ENTRY( 04bc31b2, 0, 12096, YM+TA), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 1, 20931, YM+TA), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 2, 12096, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 3, 11904, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 4, 4480, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 5, 6400, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 6, 5396, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 7, 5963, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 8, 6784, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 9, 5888, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 10, 3360, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 11, 2886, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 12, 2256, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 13, 3077, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04bc31b2, 14, 6664, YM), /* 02201 - Mad Max (Jochen Hippel) - The Seven Gates of Jambala.sndh */
+TIMEDB_ENTRY( 04c86201, 0, 7876, YM), /* 02514 - Crazy Q - DHS^Creators - Zipp Zapp Space Attack.sndh */
+TIMEDB_ENTRY( 04c9de9e, 0, 1789, YM+TA), /* 04106 - 505-cpt^dox - arping.sndh */
+TIMEDB_ENTRY( 04cf71da, 0, 445, YM), /* 02461 - Iso - Art, I presume?.sndh */
+TIMEDB_ENTRY( 04d2a4e4, 0, 6047, YM), /* 04753 - 505 - Sommarhack 2015 invite.sndh */
+TIMEDB_ENTRY( 04f8965b, 0, 3072, YM), /* 02053 - Mad Max - Small Title.sndh */
+TIMEDB_ENTRY( 04f9af8d, 0, 5840, YM+TD), /* 02393 - Nexus 6 - Praximate Digi.sndh */
+TIMEDB_ENTRY( 05259830, 0, 9830, YM), /* 00579 - Jas C Brooke - Vixen.sndh */
+TIMEDB_ENTRY( 05259830, 1, 2048, YM), /* 00579 - Jas C Brooke - Vixen.sndh */
+TIMEDB_ENTRY( 05259830, 2, 81, YM), /* 00579 - Jas C Brooke - Vixen.sndh */
+TIMEDB_ENTRY( 053b080a, 0, 17921, YM+TA+TD), /* 02195 - Tao - Cream - ..do things (intro).sndh */
+TIMEDB_ENTRY( 05462254, 0, 7584, YM+TB+TD), /* 04765 - 505 - Pulse (compo edit).sndh */
+TIMEDB_ENTRY( 05532f21, 0, 6655, YM), /* 03875 - Gary Wheaton - Juandeho.sndh */
+TIMEDB_ENTRY( 055f5d72, 0, 36096, YM+TA+TB+TD), /* 02541 - SCHMX & STU - Q DEDICATION.sndh */
+TIMEDB_ENTRY( 056a61e5, 0, 17664, YM), /* 02903 - Techno - Puppet Show Intro.sndh */
+TIMEDB_ENTRY( 056f21c8, 0, 5378, YM), /* 00368 - Steve Barrett - Treasure Island Dizzy.sndh */
+TIMEDB_ENTRY( 056f21c8, 1, 3366, YM), /* 00368 - Steve Barrett - Treasure Island Dizzy.sndh */
+TIMEDB_ENTRY( 056f21c8, 2, 242, YM), /* 00368 - Steve Barrett - Treasure Island Dizzy.sndh */
+TIMEDB_ENTRY( 056f21c8, 3, 242, YM), /* 00368 - Steve Barrett - Treasure Island Dizzy.sndh */
+TIMEDB_ENTRY( 0574488b, 0, 18434, YM), /* 03489 - Donald Campbell - Rolling Thunder.sndh */
+TIMEDB_ENTRY( 0574488b, 1, 2114, YM), /* 03489 - Donald Campbell - Rolling Thunder.sndh */
+TIMEDB_ENTRY( 057595ad, 0, 6142, YM), /* 01307 - Matt Furniss - Manchester United Europe.sndh */
+TIMEDB_ENTRY( 0589d640, 0, 5760, YM+TA), /* 00918 - Dark Angel - Blood Title.sndh */
+TIMEDB_ENTRY( 0597da5f, 0, 8, YM), /* 04494 - Daniel Decourdemanche - Avalon.sndh */
+TIMEDB_ENTRY( 0597da5f, 1, 14, YM), /* 04494 - Daniel Decourdemanche - Avalon.sndh */
+TIMEDB_ENTRY( 0597da5f, 2, 507, YM), /* 04494 - Daniel Decourdemanche - Avalon.sndh */
+TIMEDB_ENTRY( 0597da5f, 3, 14, YM), /* 04494 - Daniel Decourdemanche - Avalon.sndh */
+TIMEDB_ENTRY( 0597da5f, 4, 30, YM), /* 04494 - Daniel Decourdemanche - Avalon.sndh */
+TIMEDB_ENTRY( 0597da5f, 5, 36, YM), /* 04494 - Daniel Decourdemanche - Avalon.sndh */
+TIMEDB_ENTRY( 0597da5f, 6, 35, YM), /* 04494 - Daniel Decourdemanche - Avalon.sndh */
+TIMEDB_ENTRY( 0597da5f, 8, 26, YM), /* 04494 - Daniel Decourdemanche - Avalon.sndh */
+TIMEDB_ENTRY( 05a9b513, 0, 453, YM), /* 04537 - Darren Ithell - Fun School 4 (Under 5).sndh */
+TIMEDB_ENTRY( 05a9b513, 1, 91, YM), /* 04537 - Darren Ithell - Fun School 4 (Under 5).sndh */
+TIMEDB_ENTRY( 05a9b513, 2, 213, YM), /* 04537 - Darren Ithell - Fun School 4 (Under 5).sndh */
+TIMEDB_ENTRY( 05a9b513, 3, 112, YM), /* 04537 - Darren Ithell - Fun School 4 (Under 5).sndh */
+TIMEDB_ENTRY( 05a9b513, 4, 400, YM), /* 04537 - Darren Ithell - Fun School 4 (Under 5).sndh */
+TIMEDB_ENTRY( 05a9b513, 5, 684, YM), /* 04537 - Darren Ithell - Fun School 4 (Under 5).sndh */
+TIMEDB_ENTRY( 05a9b513, 6, 438, YM), /* 04537 - Darren Ithell - Fun School 4 (Under 5).sndh */
+TIMEDB_ENTRY( 05cc2736, 0, 6145, YM), /* 03307 - Orall Cornelius - Pyramax.sndh */
+TIMEDB_ENTRY( 05cc2736, 1, 2305, YM), /* 03307 - Orall Cornelius - Pyramax.sndh */
+TIMEDB_ENTRY( 05cc2736, 2, 769, YM), /* 03307 - Orall Cornelius - Pyramax.sndh */
+TIMEDB_ENTRY( 05cc2736, 3, 897, YM), /* 03307 - Orall Cornelius - Pyramax.sndh */
+TIMEDB_ENTRY( 05d290a5, 0, 16696, YM+TA+TB+TD), /* 02095 - Mad Max - Sanxion Loader - Sid.sndh */
+TIMEDB_ENTRY( 05d9ec36, 0, 8928, YM+TA), /* 01752 - Kanewood - Phantom Demo - End.sndh */
+TIMEDB_ENTRY( 05e13969, 0, 638, YM), /* 04528 - Bobby Kirchoff - Fang Die Ratte.sndh */
+TIMEDB_ENTRY( 05e18cd3, 0, 13740, YM), /* 00737 - Sean Connolly - No Mercy.sndh */
+TIMEDB_ENTRY( 05efff3f, 0, 80585, YM+TA), /* 04024 - Roggie - Variations.sndh */
+TIMEDB_ENTRY( 05f8cadb, 0, 44513, YM+TA+TD), /* 02227 - Tao - Cream - Credits (Nostalgic-O-Demo).sndh */
+TIMEDB_ENTRY( 061beb1a, 0, 8651, YM+TA+TB+TD), /* 03625 - 505-checkpoint - Slowslip.sndh */
+TIMEDB_ENTRY( 062aa125, 0, 3068, YM+TA+TD), /* 04259 - 505-cpt^pdx - foolish.sndh */
+TIMEDB_ENTRY( 062aa850, 0, 2688, YM), /* 03498 - Shamen - Certified Dope - Menu.sndh */
+TIMEDB_ENTRY( 0660bff2, 0, 6155, YM+TD), /* 02687 - Donald Fakk - Syntax Terror - Loader (Chip).sndh */
+TIMEDB_ENTRY( 066db576, 0, 105, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 1, 93, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 2, 139, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 3, 130, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 4, 79, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 5, 133, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 6, 133, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 7, 176, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 8, 177, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 9, 170, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 10, 12, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 11, 145, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 12, 93, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 13, 131, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 14, 91, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 15, 467, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 16, 2303, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 17, 124, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 18, 145, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 19, 181, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 20, 58, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 21, 4030, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 066db576, 22, 105, YM), /* 00018 - 4-Mat - Spot.sndh */
+TIMEDB_ENTRY( 0680ba94, 0, 11839, YM), /* 03444 - Per Almered (XiA) 2009 - (S)ave (T)he (E)arth.sndh */
+TIMEDB_ENTRY( 0683027e, 0, 77491, YM+TA), /* 04665 - Robert Wolf - Bilinski.sndh */
+TIMEDB_ENTRY( 06846733, 0, 2685, YM), /* 01523 - Iso - Faster and Faster.sndh */
+TIMEDB_ENTRY( 068751ac, 0, 3626, YM), /* 03127 - n-a - Joy to the World.sndh */
+TIMEDB_ENTRY( 06899b0e, 0, 13824, YM), /* 01815 - Loony - Loony.sndh */
+TIMEDB_ENTRY( 068c5209, 0, 4032, YM), /* 00605 - Chris Mad - Phalanx Crazy.sndh */
+TIMEDB_ENTRY( 0695fcf3, 0, 4607, YM+TA+TB+TD), /* 04305 - 505-Checkpoint - sherlock.sndh */
+TIMEDB_ENTRY( 069b3159, 0, 3840, YM+TA+TB+TD), /* 00187 - 505 - Posh - Part 4.sndh */
+TIMEDB_ENTRY( 06a00646, 0, 2076, YM), /* 04721 - Richard Jacques - Tron.sndh */
+TIMEDB_ENTRY( 06a6d743, 0, 3996, YM), /* 01104 - Thomas - Flu 4kb Intro.sndh */
+TIMEDB_ENTRY( 06a74be7, 0, 13824, YM), /* 02026 - Mad Max - Crazy Comets.sndh */
+TIMEDB_ENTRY( 06a74be7, 1, 3264, YM), /* 02026 - Mad Max - Crazy Comets.sndh */
+TIMEDB_ENTRY( 06a95d81, 0, 42851, YM+TA+TD), /* 02337 - Tao - Cream - One On One (UCM 11).sndh */
+TIMEDB_ENTRY( 06b06a33, 0, 3072, YM+TB+TD), /* 04317 - 505 - Checkpoint - Tambumbi (Unrel.).sndh */
+TIMEDB_ENTRY( 06b5c941, 0, 18944, YM+TA), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 1, 4032, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 2, 4992, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 3, 400, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 4, 215, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 5, 1920, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 6, 7872, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 7, 219, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 8, 129, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 9, 181, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 10, 87, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 11, 8450, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 12, 5888, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 13, 7732, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06b5c941, 14, 3888, YM), /* 02174 - Mad Max - A Prehistoric Tale.sndh */
+TIMEDB_ENTRY( 06d77e3e, 0, 20730, YM+TA), /* 01719 - Jess - The Twin Paradox.sndh */
+TIMEDB_ENTRY( 06ea5b50, 0, 8561, YM), /* 03130 - n-a - Life in a Northern Town.sndh */
+TIMEDB_ENTRY( 06edd58b, 0, 1343, YM), /* 04776 - V!X - Remote Entry #2.sndh */
+TIMEDB_ENTRY( 06f25069, 0, 11264, YM+TA), /* 03557 - Tomchi - No Extra.sndh */
+TIMEDB_ENTRY( 06fbc75f, 0, 1937, YM), /* 02231 - Tao - Ikari (Nostalgic-O-Demo).sndh */
+TIMEDB_ENTRY( 06fc4b30, 0, 8703, YM), /* 01274 - Frazer - TSC 28.sndh */
+TIMEDB_ENTRY( 06fcc8e1, 0, 5520, YM), /* 03539 - David Whittaker - European Champions.sndh */
+TIMEDB_ENTRY( 06fcc8e1, 1, 769, YM), /* 03539 - David Whittaker - European Champions.sndh */
+TIMEDB_ENTRY( 06fcc8e1, 2, 491, YM), /* 03539 - David Whittaker - European Champions.sndh */
+TIMEDB_ENTRY( 06fcc8e1, 3, 242, YM), /* 03539 - David Whittaker - European Champions.sndh */
+TIMEDB_ENTRY( 070471b8, 0, 5266, YM), /* 00108 - David Whittaker - Hunter Killer.sndh */
+TIMEDB_ENTRY( 070e4547, 0, 190, YM), /* 04501 - Paul Dowers - Boxing champ.sndh */
+TIMEDB_ENTRY( 070e4547, 1, 292, YM), /* 04501 - Paul Dowers - Boxing champ.sndh */
+TIMEDB_ENTRY( 070e4547, 2, 261, YM), /* 04501 - Paul Dowers - Boxing champ.sndh */
+TIMEDB_ENTRY( 070e4547, 3, 450, YM), /* 04501 - Paul Dowers - Boxing champ.sndh */
+TIMEDB_ENTRY( 070e4547, 4, 16, YM), /* 04501 - Paul Dowers - Boxing champ.sndh */
+TIMEDB_ENTRY( 070e4547, 5, 14, YM), /* 04501 - Paul Dowers - Boxing champ.sndh */
+TIMEDB_ENTRY( 070e4547, 6, 608, YM), /* 04501 - Paul Dowers - Boxing champ.sndh */
+TIMEDB_ENTRY( 07150380, 0, 3328, YM), /* 01191 - Excellence In Art - Musolini.sndh */
+TIMEDB_ENTRY( 075c8520, 0, 127496, YM+TA), /* 04058 - Roggie - Powerbass.sndh */
+TIMEDB_ENTRY( 077fce28, 0, 15753, YM), /* 02241 - Tao - Cream (orig. Rob Hubbard) - Master Of Magic (Stmygm).sndh */
+TIMEDB_ENTRY( 0789a8fa, 0, 5840, YM), /* 02394 - Nexus 6 - The Surgery.sndh */
+TIMEDB_ENTRY( 0791da6b, 0, 6912, YM), /* 01114 - Keith Tinman - Red Heat.sndh */
+TIMEDB_ENTRY( 0791da6b, 1, 193, YM), /* 01114 - Keith Tinman - Red Heat.sndh */
+TIMEDB_ENTRY( 0791da6b, 2, 399, YM), /* 01114 - Keith Tinman - Red Heat.sndh */
+TIMEDB_ENTRY( 079eb096, 0, 4224, YM), /* 01158 - Tyan - Revolution - Snmpfh.sndh */
+TIMEDB_ENTRY( 079f22cc, 0, 2257, YM), /* 03038 - Ed Bogas - Bebop.sndh */
+TIMEDB_ENTRY( 07b5f83c, 0, 55030, YM+TA), /* 03768 - Warren Cann - Wreckers.sndh */
+TIMEDB_ENTRY( 07dc77b6, 0, 20886, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 1, 3083, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 2, 4032, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 3, 4010, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 4, 15552, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 5, 2952, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 6, 4608, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 7, 4608, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 8, 3489, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 9, 3840, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 10, 2688, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 11, 12288, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 12, 7168, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 13, 8961, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 14, 8338, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 15, 8256, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 16, 10770, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 17, 7168, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 18, 7168, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 19, 4726, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 20, 4634, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 21, 3840, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07dc77b6, 22, 4472, YM), /* 02189 - Mad Max - Dragon Flight.sndh */
+TIMEDB_ENTRY( 07f97429, 0, 4682, YM), /* 00878 - Ben Daglish - Ultimate Darts.sndh */
+TIMEDB_ENTRY( 07f97429, 1, 330, YM), /* 00878 - Ben Daglish - Ultimate Darts.sndh */
+TIMEDB_ENTRY( 0803a8f3, 0, 10752, YM+TA+TB+TD), /* 02844 - Marcer - POKER.sndh */
+TIMEDB_ENTRY( 08054e98, 0, 2303, YM), /* 03438 - Proteque - Ratu.sndh */
+TIMEDB_ENTRY( 0809146d, 0, 3350, YM), /* 03107 - n-a - Eastenders - May-Osborne.sndh */
+TIMEDB_ENTRY( 08104278, 0, 5039, YM), /* 02376 - Nexus 6 - Happy Muff.sndh */
+TIMEDB_ENTRY( 0812636d, 0, 26894, YM+TA), /* 03880 - Mad Max - Labello.sndh */
+TIMEDB_ENTRY( 081efa6f, 0, 3072, YM+TD), /* 02635 - Miggy - Hyper dog poo ( Unfinished ).sndh */
+TIMEDB_ENTRY( 0827bf66, 0, 23802, YM), /* 01674 - Jess - The Battle of Arpeggios.sndh */
+TIMEDB_ENTRY( 0857c9e8, 0, 5710, STE), /* 03450 - 505 - Paradox - Megademo Intro.sndh */
+TIMEDB_ENTRY( 0858e24f, 0, 5772, YM+TA), /* 00821 - !Cube - Admirable's Mod Compil #31.sndh */
+TIMEDB_ENTRY( 0865e3bb, 0, 20736, YM), /* 01447 - Stax - Revotus - Chip.sndh */
+TIMEDB_ENTRY( 08687258, 0, 4473, YM+TA+TB), /* 01597 - Nemo - Loading - Warm Up.sndh */
+TIMEDB_ENTRY( 087c4b4d, 0, 156946, YM+TA), /* 03821 - Tufty - Roger Rabbit.sndh */
+TIMEDB_ENTRY( 088687c4, 0, 7296, YM+TA+TD), /* 04577 - Crazy Q - DHS - From Da Ghetto With Love.sndh */
+TIMEDB_ENTRY( 0886969b, 0, 2685, YM), /* 01530 - Iso - Panache Theme.sndh */
+TIMEDB_ENTRY( 0889f290, 0, 39936, YM), /* 01437 - Stax - Happy.sndh */
+TIMEDB_ENTRY( 08ec970f, 0, 25080, YM+TA), /* 01216 - Energizer - Floating - Digi.sndh */
+TIMEDB_ENTRY( 08f09c66, 0, 2370, YM), /* 04697 - Unknown - MGD2.sndh */
+TIMEDB_ENTRY( 09052c4b, 0, 4229, YM), /* 00081 - David Whittaker - Buffalo Bill.sndh */
+TIMEDB_ENTRY( 09052c4b, 1, 9654, YM), /* 00081 - David Whittaker - Buffalo Bill.sndh */
+TIMEDB_ENTRY( 09052c4b, 2, 9654, YM), /* 00081 - David Whittaker - Buffalo Bill.sndh */
+TIMEDB_ENTRY( 09052c4b, 3, 9362, YM), /* 00081 - David Whittaker - Buffalo Bill.sndh */
+TIMEDB_ENTRY( 09052c4b, 4, 11702, YM), /* 00081 - David Whittaker - Buffalo Bill.sndh */
+TIMEDB_ENTRY( 09052c4b, 5, 8936, YM), /* 00081 - David Whittaker - Buffalo Bill.sndh */
+TIMEDB_ENTRY( 09052c4b, 6, 10240, YM), /* 00081 - David Whittaker - Buffalo Bill.sndh */
+TIMEDB_ENTRY( 09052c4b, 7, 8192, YM), /* 00081 - David Whittaker - Buffalo Bill.sndh */
+TIMEDB_ENTRY( 09052c4b, 8, 3606, YM), /* 00081 - David Whittaker - Buffalo Bill.sndh */
+TIMEDB_ENTRY( 09183d32, 0, 2701, YM+TA), /* 02236 - Tao - Cream (orig. Rob Hubbard) - Commando (Stmygm).sndh */
+TIMEDB_ENTRY( 0942df90, 0, 13568, YM+TA), /* 00928 - Dark Angel - Kaskades - Digi.sndh */
+TIMEDB_ENTRY( 0947c528, 0, 1600, YM), /* 02146 - Mad Max - Mad Max Tune 1 - LSD.sndh */
+TIMEDB_ENTRY( 094adf24, 0, 29328, YM), /* 01457 - Stax - X Large 2.sndh */
+TIMEDB_ENTRY( 094d244a, 0, 4992, YM), /* 02933 - Chris Denman - Cyber Cop.sndh */
+TIMEDB_ENTRY( 096862bb, 0, 35328, YM+TA+TB+TD), /* 02603 - STU - MACHINE.sndh */
+TIMEDB_ENTRY( 096ae5c5, 0, 8640, YM), /* 01115 - Keith Tinman - Robocop 2.sndh */
+TIMEDB_ENTRY( 096ae5c5, 1, 8704, YM), /* 01115 - Keith Tinman - Robocop 2.sndh */
+TIMEDB_ENTRY( 096ae5c5, 2, 4224, YM), /* 01115 - Keith Tinman - Robocop 2.sndh */
+TIMEDB_ENTRY( 096ae5c5, 3, 3840, YM), /* 01115 - Keith Tinman - Robocop 2.sndh */
+TIMEDB_ENTRY( 096ae5c5, 4, 3061, YM), /* 01115 - Keith Tinman - Robocop 2.sndh */
+TIMEDB_ENTRY( 096ae5c5, 5, 4608, YM), /* 01115 - Keith Tinman - Robocop 2.sndh */
+TIMEDB_ENTRY( 09770bbd, 0, 6522, YM+TA), /* 03301 - 505-checkpoint - GLENZ.sndh */
+TIMEDB_ENTRY( 099d239f, 0, 775, YM), /* 03936 - Unknown - Ungarn.sndh */
+TIMEDB_ENTRY( 09b30324, 0, 762, YM+TB), /* 03607 - DMA-SC - Kolmik.sndh */
+TIMEDB_ENTRY( 09b30324, 1, 4921, YM+TB+TD), /* 03607 - DMA-SC - Kolmik.sndh */
+TIMEDB_ENTRY( 09b30324, 2, 441, YM+TB+TD), /* 03607 - DMA-SC - Kolmik.sndh */
+TIMEDB_ENTRY( 09b30324, 3, 8058, YM+TA+TB+TD), /* 03607 - DMA-SC - Kolmik.sndh */
+TIMEDB_ENTRY( 09b30324, 4, 5754, YM+TA+TB+TD), /* 03607 - DMA-SC - Kolmik.sndh */
+TIMEDB_ENTRY( 09b30324, 5, 8253, YM+TA+TB+TD), /* 03607 - DMA-SC - Kolmik.sndh */
+TIMEDB_ENTRY( 09b30324, 6, 1926, YM), /* 03607 - DMA-SC - Kolmik.sndh */
+TIMEDB_ENTRY( 09cc4ad7, 0, 10068, YM+TA+TB+TD), /* 00044 - 505 - Clouds.sndh */
+TIMEDB_ENTRY( 09d2f42e, 0, 9855, YM+TB+TD), /* 02694 - Dubmood - Alla man borde ringt.sndh */
+TIMEDB_ENTRY( 09e4040c, 0, 4480, YM), /* 02196 - Mad Max - Grand Monster Slam.sndh */
+TIMEDB_ENTRY( 09e4040c, 1, 256, YM), /* 02196 - Mad Max - Grand Monster Slam.sndh */
+TIMEDB_ENTRY( 09e4040c, 2, 303, YM), /* 02196 - Mad Max - Grand Monster Slam.sndh */
+TIMEDB_ENTRY( 09e4040c, 3, 241, YM), /* 02196 - Mad Max - Grand Monster Slam.sndh */
+TIMEDB_ENTRY( 09efef6f, 0, 2004, YM), /* 04610 - Richard Joseph - Moonshine Racers.sndh */
+TIMEDB_ENTRY( 09efef6f, 1, 175, YM), /* 04610 - Richard Joseph - Moonshine Racers.sndh */
+TIMEDB_ENTRY( 09efef6f, 2, 624, YM), /* 04610 - Richard Joseph - Moonshine Racers.sndh */
+TIMEDB_ENTRY( 09efef6f, 3, 1344, YM), /* 04610 - Richard Joseph - Moonshine Racers.sndh */
+TIMEDB_ENTRY( 09efef6f, 4, 9600, YM), /* 04610 - Richard Joseph - Moonshine Racers.sndh */
+TIMEDB_ENTRY( 09efef6f, 5, 2592, YM), /* 04610 - Richard Joseph - Moonshine Racers.sndh */
+TIMEDB_ENTRY( 09f8ce12, 0, 4600, YM), /* 03679 - Dma-Sc - Antiques - Hidden.sndh */
+TIMEDB_ENTRY( 09fcded8, 0, 19793, YM+TA), /* 03734 - David Whittaker - Gazza 2.sndh */
+TIMEDB_ENTRY( 0a1a5a71, 0, 2707, YM), /* 01754 - Dave Kelly - Dragon Spirit.sndh */
+TIMEDB_ENTRY( 0a1b1734, 0, 7236, YM), /* 03162 - n-a - Sidestep by Davidow.sndh */
+TIMEDB_ENTRY( 0a28707f, 0, 11142, YM), /* 04098 - Gary Wheaton - Out on the Weekend.sndh */
+TIMEDB_ENTRY( 0a2c13b6, 0, 11448, YM+TA+TB+TD), /* 03471 - gwEm (Jester conversion) - Stardust Memories.sndh */
+TIMEDB_ENTRY( 0a62127c, 0, 16513, YM), /* 00615 - Chrispy Noodle - Sapiens 1.sndh */
+TIMEDB_ENTRY( 0a66d43f, 0, 1177, YM), /* 00565 - Jas C Brooke - Flying Shark.sndh */
+TIMEDB_ENTRY( 0a66d43f, 1, 4096, YM), /* 00565 - Jas C Brooke - Flying Shark.sndh */
+TIMEDB_ENTRY( 0a66d43f, 2, 1224, YM), /* 00565 - Jas C Brooke - Flying Shark.sndh */
+TIMEDB_ENTRY( 0a66d43f, 3, 4320, YM), /* 00565 - Jas C Brooke - Flying Shark.sndh */
+TIMEDB_ENTRY( 0a66d43f, 4, 1141, YM), /* 00565 - Jas C Brooke - Flying Shark.sndh */
+TIMEDB_ENTRY( 0a79bcc4, 0, 8657, YM), /* 00225 - ACC - Ala Turk.sndh */
+TIMEDB_ENTRY( 0a8138e8, 0, 7162, YM), /* 00457 - Augustin Vidovic - Punch.sndh */
+TIMEDB_ENTRY( 0a8acf9e, 0, 5120, YM), /* 00805 - Crawdaddy - Party Muz.sndh */
+TIMEDB_ENTRY( 0a8de2f4, 0, 3648, YM), /* 01100 - Techno - Techno 5.sndh */
+TIMEDB_ENTRY( 0a9036d3, 0, 17280, YM+TA+TB+TD), /* 02101 - Mad Max - Thrust - Sid.sndh */
+TIMEDB_ENTRY( 0aa9116a, 0, 6272, YM+TA+TB+TD), /* 00188 - 505 - Posh - Part 5.sndh */
+TIMEDB_ENTRY( 0ac1c32b, 0, 9654, YM), /* 00155 - David Whittaker - Crossbow - William Tell.sndh */
+TIMEDB_ENTRY( 0ac1c32b, 1, 1365, YM), /* 00155 - David Whittaker - Crossbow - William Tell.sndh */
+TIMEDB_ENTRY( 0ac1c32b, 2, 88, YM), /* 00155 - David Whittaker - Crossbow - William Tell.sndh */
+TIMEDB_ENTRY( 0ad1a60e, 0, 64, YM), /* 04515 - J.P. Peach - Color Quest.sndh */
+TIMEDB_ENTRY( 0ad73d30, 0, 8000, YM), /* 03244 - T1000 - The Beast Club - TBC 16.sndh */
+TIMEDB_ENTRY( 0ad9b6c2, 0, 2024, YM), /* 04431 - Lotus - Synth Dream 2 - Max intro.sndh */
+TIMEDB_ENTRY( 0af49608, 0, 1926, YM), /* 03920 - Unknown - Klassik1.sndh */
+TIMEDB_ENTRY( 0af93806, 0, 17408, YM), /* 02139 - Mad Max - One Man And His Droid - LCD.sndh */
+TIMEDB_ENTRY( 0b06d0dd, 0, 43995, YM+TA+TB+TD), /* 02442 - cerror - Kicking it oldskool.sndh */
+TIMEDB_ENTRY( 0b19f70f, 0, 2240, YM), /* 03189 - n-a - Xeron Overture.sndh */
+TIMEDB_ENTRY( 0b1d5135, 0, 59618, YM+TA), /* 03751 - Tufty - Killer - Adamski.sndh */
+TIMEDB_ENTRY( 0b1e485c, 0, 6914, YM), /* 02117 - Mad Max - Starball.sndh */
+TIMEDB_ENTRY( 0b1e485c, 1, 770, YM), /* 02117 - Mad Max - Starball.sndh */
+TIMEDB_ENTRY( 0b2b30f2, 0, 8953, YM), /* 03565 - DMA SC - Coast II Coast.sndh */
+TIMEDB_ENTRY( 0b33f385, 0, 10301, YM+TA+TB+TD), /* 02521 - ZABUTOM UNT DUBMOOD - DRUMNBICE.sndh */
+TIMEDB_ENTRY( 0b4b79f3, 0, 15231, YM+TA+TB+TD), /* 02707 - DUBMOOD <DEAD KENNEDYS> - TOO DRUNK TO FUCK!.sndh */
+TIMEDB_ENTRY( 0b587f22, 0, 3232, YM), /* 03185 - Unknown - The Windmills of Your Mind.sndh */
+TIMEDB_ENTRY( 0b5cd2b1, 0, 2309, YM), /* 02291 - Tao - Cream (orig. Karsten Obarski) - End Theme.sndh */
+TIMEDB_ENTRY( 0b5d1a03, 0, 7040, YM), /* 01501 - Dave Hasler - Drivin Force.sndh */
+TIMEDB_ENTRY( 0b5d1a03, 1, 180, YM), /* 01501 - Dave Hasler - Drivin Force.sndh */
+TIMEDB_ENTRY( 0b5fdd60, 0, 5661, YM), /* 03501 - Christian Wirsig - Blaxx.sndh */
+TIMEDB_ENTRY( 0b5fdd60, 1, 4804, YM), /* 03501 - Christian Wirsig - Blaxx.sndh */
+TIMEDB_ENTRY( 0b5fdd60, 2, 9888, YM), /* 03501 - Christian Wirsig - Blaxx.sndh */
+TIMEDB_ENTRY( 0b5fdd60, 3, 9024, YM), /* 03501 - Christian Wirsig - Blaxx.sndh */
+TIMEDB_ENTRY( 0b5fdd60, 4, 4608, YM), /* 03501 - Christian Wirsig - Blaxx.sndh */
+TIMEDB_ENTRY( 0b5fdd60, 5, 5396, YM), /* 03501 - Christian Wirsig - Blaxx.sndh */
+TIMEDB_ENTRY( 0b5fdd60, 6, 6912, YM), /* 03501 - Christian Wirsig - Blaxx.sndh */
+TIMEDB_ENTRY( 0b6287d6, 0, 7616, YM), /* 02010 - Mad Max - LM.sndh */
+TIMEDB_ENTRY( 0b6287d6, 1, 206, YM), /* 02010 - Mad Max - LM.sndh */
+TIMEDB_ENTRY( 0b6d77af, 0, 6590, YM), /* 00512 - Tangens - Synthetic Visions - Parallax.sndh */
+TIMEDB_ENTRY( 0b753dff, 0, 16896, YM+TB+TD), /* 02911 - helene - temptrance.sndh */
+TIMEDB_ENTRY( 0b7c380e, 0, 6140, YM), /* 00061 - 505 - I Want Sid.sndh */
+TIMEDB_ENTRY( 0b8092e4, 0, 1921, YM), /* 00392 - Wally Beben - Roadwars.sndh */
+TIMEDB_ENTRY( 0b8cc2cd, 0, 3839, YM), /* 03685 - Dma-Sc - Saboteur 3 - Ending.sndh */
+TIMEDB_ENTRY( 0b934018, 0, 268756, YM+TA), /* 04795 - Unknown - Acid.sndh */
+TIMEDB_ENTRY( 0ba741ba, 0, 38785, YM+TA), /* 03760 - Tufty - Robo 16.sndh */
+TIMEDB_ENTRY( 0bb8ecc4, 0, 11904, YM+TA+TD), /* 02287 - Tao - Cream - Seagulls (Steps).sndh */
+TIMEDB_ENTRY( 0bbcdf93, 0, 8791, YM), /* 03976 - Christopher Barker - The Third Courier.sndh */
+TIMEDB_ENTRY( 0bbcdf93, 1, 387, YM), /* 03976 - Christopher Barker - The Third Courier.sndh */
+TIMEDB_ENTRY( 0bbcdf93, 2, 2108, YM), /* 03976 - Christopher Barker - The Third Courier.sndh */
+TIMEDB_ENTRY( 0bbcdf93, 3, 1888, YM), /* 03976 - Christopher Barker - The Third Courier.sndh */
+TIMEDB_ENTRY( 0bbcdf93, 4, 458, YM), /* 03976 - Christopher Barker - The Third Courier.sndh */
+TIMEDB_ENTRY( 0bbcdf93, 5, 291, YM), /* 03976 - Christopher Barker - The Third Courier.sndh */
+TIMEDB_ENTRY( 0bc313eb, 0, 5376, YM), /* 00494 - Ultimatum - Kidney Bean 10.sndh */
+TIMEDB_ENTRY( 0bd1e4bb, 0, 12096, YM), /* 03235 - T1000 - The Beast Club - TBC 5.sndh */
+TIMEDB_ENTRY( 0bddfee5, 0, 4267, YM+TA), /* 03481 - Peter Jorgensen - Russer.sndh */
+TIMEDB_ENTRY( 0be6ee8f, 0, 7179, YM), /* 00141 - David Whittaker - Starray.sndh */
+TIMEDB_ENTRY( 0be6ee8f, 1, 124, YM), /* 00141 - David Whittaker - Starray.sndh */
+TIMEDB_ENTRY( 0be6ee8f, 2, 5671, YM), /* 00141 - David Whittaker - Starray.sndh */
+TIMEDB_ENTRY( 0be6ee8f, 3, 4468, YM), /* 00141 - David Whittaker - Starray.sndh */
+TIMEDB_ENTRY( 0bf6b1df, 0, 4160, YM), /* 01516 - Illusion - Legal Tools 5.sndh */
+TIMEDB_ENTRY( 0bf736e9, 0, 1506, YM), /* 03918 - Unknown - Finnland.sndh */
+TIMEDB_ENTRY( 0c0ab5c8, 0, 4146, YM), /* 04067 - Gary Wheaton - Dear Boy.sndh */
+TIMEDB_ENTRY( 0c2005e9, 0, 9232, YM), /* 03466 - Marcer - Stax.sndh */
+TIMEDB_ENTRY( 0c2905ad, 0, 2055, YM), /* 04651 - Unknown - Japs the Sequence.sndh */
+TIMEDB_ENTRY( 0c2b5778, 0, 8448, YM), /* 04847 - t1000 - Bits 56.sndh */
+TIMEDB_ENTRY( 0c31c5a5, 0, 7296, YM), /* 00236 - AJT - Colorz.sndh */
+TIMEDB_ENTRY( 0c3fde19, 0, 448, YM), /* 01084 - Techno - Dentro.sndh */
+TIMEDB_ENTRY( 0c4006c4, 0, 4605, YM), /* 01226 - Epic - Doc Dots.sndh */
+TIMEDB_ENTRY( 0c59f3e8, 0, 18152, YM), /* 02457 - Starbuck^Creative Mind - Hurry-Scurry.sndh */
+TIMEDB_ENTRY( 0c6133b1, 0, 8880, YM), /* 02957 - Rudi Stember - The Patrician.sndh */
+TIMEDB_ENTRY( 0c6133b1, 1, 4800, YM), /* 02957 - Rudi Stember - The Patrician.sndh */
+TIMEDB_ENTRY( 0c6133b1, 2, 3856, YM), /* 02957 - Rudi Stember - The Patrician.sndh */
+TIMEDB_ENTRY( 0c63ff61, 0, 5088, YM), /* 01181 - Excellence In Art - Gritty.sndh */
+TIMEDB_ENTRY( 0c734b9b, 0, 9711, YM), /* 03011 - Paul Summers - S.D.I. (Activision).sndh */
+TIMEDB_ENTRY( 0c734b9b, 1, 3868, YM), /* 03011 - Paul Summers - S.D.I. (Activision).sndh */
+TIMEDB_ENTRY( 0c734b9b, 2, 23052, YM), /* 03011 - Paul Summers - S.D.I. (Activision).sndh */
+TIMEDB_ENTRY( 0c734b9b, 3, 15582, YM), /* 03011 - Paul Summers - S.D.I. (Activision).sndh */
+TIMEDB_ENTRY( 0c734b9b, 4, 12683, YM), /* 03011 - Paul Summers - S.D.I. (Activision).sndh */
+TIMEDB_ENTRY( 0c734b9b, 5, 13210, YM), /* 03011 - Paul Summers - S.D.I. (Activision).sndh */
+TIMEDB_ENTRY( 0c734b9b, 6, 8317, YM), /* 03011 - Paul Summers - S.D.I. (Activision).sndh */
+TIMEDB_ENTRY( 0c734b9b, 7, 1262, YM), /* 03011 - Paul Summers - S.D.I. (Activision).sndh */
+TIMEDB_ENTRY( 0c734b9b, 8, 10447, YM), /* 03011 - Paul Summers - S.D.I. (Activision).sndh */
+TIMEDB_ENTRY( 0c8ae262, 0, 9983, YM), /* 04572 - Tomchi Noextra - ltc 01 extra volume 2.sndh */
+TIMEDB_ENTRY( 0c9094a7, 0, 8064, YM), /* 02369 - Nexus 6 - Cried Out Eyes.sndh */
+TIMEDB_ENTRY( 0c90f9d3, 0, 4992, YM+TA+TB+TD), /* 01827 - Lotek Style - 28 Style.sndh */
+TIMEDB_ENTRY( 0c951326, 0, 62725, YM+TA), /* 03951 - Scott Lemmon - Geosong.sndh */
+TIMEDB_ENTRY( 0ca0ebd7, 0, 11441, YM), /* 01389 - Andy Severn - Twin Turbos.sndh */
+TIMEDB_ENTRY( 0ca0ebd7, 1, 109, YM), /* 01389 - Andy Severn - Twin Turbos.sndh */
+TIMEDB_ENTRY( 0ca0ebd7, 2, 865, YM), /* 01389 - Andy Severn - Twin Turbos.sndh */
+TIMEDB_ENTRY( 0caa6961, 0, 1024, YM+TD), /* 02763 - Bobby Prince ST by Dma-Sc - Ending.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 0, 2144, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 1, 1066, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 2, 842, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 3, 550, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 4, 1969, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 5, 880, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 6, 609, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 7, 1066, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 8, 1505, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 9, 1138, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 10, 1066, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 11, 345, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 12, 64, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 13, 1066, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 14, 1600, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 15, 4474, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 16, 5490, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 17, 2260, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 18, 4224, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cbf3abc, 19, 1706, YM), /* 04190 - Jim Cuomo - Astate.sndh */
+TIMEDB_ENTRY( 0cc1715e, 0, 8442, YM+TA), /* 01370 - Scavenger - Working Man.sndh */
+TIMEDB_ENTRY( 0cc657cd, 0, 32768, YM+TA+TB+TD), /* 02553 - Marcer - BONITA - MARCER.sndh */
+TIMEDB_ENTRY( 0cc9cee8, 0, 8256, YM), /* 04186 - Dave Hasler - Elvira - Mistress of the Dark.sndh */
+TIMEDB_ENTRY( 0cc9cee8, 1, 320, YM), /* 04186 - Dave Hasler - Elvira - Mistress of the Dark.sndh */
+TIMEDB_ENTRY( 0cc9cee8, 2, 367, YM), /* 04186 - Dave Hasler - Elvira - Mistress of the Dark.sndh */
+TIMEDB_ENTRY( 0cc9cee8, 3, 2240, YM), /* 04186 - Dave Hasler - Elvira - Mistress of the Dark.sndh */
+TIMEDB_ENTRY( 0cc9cee8, 4, 2240, YM), /* 04186 - Dave Hasler - Elvira - Mistress of the Dark.sndh */
+TIMEDB_ENTRY( 0cc9cee8, 5, 8064, YM), /* 04186 - Dave Hasler - Elvira - Mistress of the Dark.sndh */
+TIMEDB_ENTRY( 0cc9cee8, 6, 4480, YM), /* 04186 - Dave Hasler - Elvira - Mistress of the Dark.sndh */
+TIMEDB_ENTRY( 0ccef3de, 0, 2048, YM+TA+TB+TD), /* 01025 - Doclands - Doclands Sid.sndh */
+TIMEDB_ENTRY( 0cd1d6a2, 0, 124133, YM+TA), /* 04678 - Unknown - CH 11.sndh */
+TIMEDB_ENTRY( 0ce6d43f, 0, 5907, YM), /* 03083 - Tom Walden - The Battle of New Orleans.sndh */
+TIMEDB_ENTRY( 0cf0f911, 0, 52821, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf0f911, 1, 84510, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf0f911, 2, 65692, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf0f911, 3, 78390, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf0f911, 4, 63146, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf0f911, 5, 56812, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf0f911, 6, 94554, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf0f911, 7, 96567, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf0f911, 8, 36811, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf0f911, 9, 68523, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf0f911, 10, 128134, YM+TA), /* 03774 - Exarch - Son Et Lumiere.sndh */
+TIMEDB_ENTRY( 0cf4ed4b, 0, 9984, YM+TA), /* 04435 - Lotus - Synth Dream 2 - Running Status.sndh */
+TIMEDB_ENTRY( 0cfbd1c3, 0, 8587, YM+TA+TB+TD), /* 03391 - Ultrasyd - Cats love ST.sndh */
+TIMEDB_ENTRY( 0d07145f, 0, 7193, YM), /* 01579 - Donovan Prince - Hellbent.sndh */
+TIMEDB_ENTRY( 0d13205e, 0, 7295, YM+TA+TB+TD), /* 02807 - Starbuck^Creative Mind - One Step foreward (SNDH Version).sndh */
+TIMEDB_ENTRY( 0d1f0879, 0, 8192, YM), /* 01168 - Tyan - Scoopex.sndh */
+TIMEDB_ENTRY( 0d2c38b9, 0, 86, YM), /* 04490 - Mikael Lundberg - Amazeing.sndh */
+TIMEDB_ENTRY( 0d2c38b9, 1, 1861, YM), /* 04490 - Mikael Lundberg - Amazeing.sndh */
+TIMEDB_ENTRY( 0d2c38b9, 2, 209, YM), /* 04490 - Mikael Lundberg - Amazeing.sndh */
+TIMEDB_ENTRY( 0d2c38b9, 3, 66, YM), /* 04490 - Mikael Lundberg - Amazeing.sndh */
+TIMEDB_ENTRY( 0d2c38b9, 4, 57, YM), /* 04490 - Mikael Lundberg - Amazeing.sndh */
+TIMEDB_ENTRY( 0d2c38b9, 5, 365, YM), /* 04490 - Mikael Lundberg - Amazeing.sndh */
+TIMEDB_ENTRY( 0d2f26a5, 0, 4160, YM), /* 00573 - Jas C Brooke - Rockford.sndh */
+TIMEDB_ENTRY( 0d2f26a5, 1, 321, YM), /* 00573 - Jas C Brooke - Rockford.sndh */
+TIMEDB_ENTRY( 0d2f26a5, 2, 13, YM), /* 00573 - Jas C Brooke - Rockford.sndh */
+TIMEDB_ENTRY( 0d2f26a5, 3, 51, YM), /* 00573 - Jas C Brooke - Rockford.sndh */
+TIMEDB_ENTRY( 0d3f87e8, 0, 200022, YM+TA), /* 03731 - Martin Walker - Shadow Sorcerer.sndh */
+TIMEDB_ENTRY( 0d4dbf05, 0, 11271, YM+TA+TD), /* 02272 - Tao - Cream - The Delegate (Steps).sndh */
+TIMEDB_ENTRY( 0d58eb4b, 0, 5003, YM+TA), /* 04416 - EVE - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 0d5cce44, 0, 2506, YM), /* 03044 - Ed Bogas - Country Too.sndh */
+TIMEDB_ENTRY( 0d61dd75, 0, 5039, YM+TA+TB+TD), /* 02980 - 505-paradox - coffee break.sndh */
+TIMEDB_ENTRY( 0d63d768, 0, 6720, YM), /* 01257 - Tim & Geoff Follin - Gauntlet 3.sndh */
+TIMEDB_ENTRY( 0d63d768, 1, 354, YM), /* 01257 - Tim & Geoff Follin - Gauntlet 3.sndh */
+TIMEDB_ENTRY( 0d63d768, 2, 343, YM), /* 01257 - Tim & Geoff Follin - Gauntlet 3.sndh */
+TIMEDB_ENTRY( 0d63d768, 3, 3073, YM), /* 01257 - Tim & Geoff Follin - Gauntlet 3.sndh */
+TIMEDB_ENTRY( 0d684b94, 0, 6754, YM), /* 00416 - Big Alec - No Second Prize.sndh */
+TIMEDB_ENTRY( 0d684b94, 1, 7125, YM), /* 00416 - Big Alec - No Second Prize.sndh */
+TIMEDB_ENTRY( 0d684b94, 2, 342, YM), /* 00416 - Big Alec - No Second Prize.sndh */
+TIMEDB_ENTRY( 0d684b94, 3, 365, YM), /* 00416 - Big Alec - No Second Prize.sndh */
+TIMEDB_ENTRY( 0d684b94, 4, 497, YM), /* 00416 - Big Alec - No Second Prize.sndh */
+TIMEDB_ENTRY( 0d684b94, 5, 371, YM), /* 00416 - Big Alec - No Second Prize.sndh */
+TIMEDB_ENTRY( 0d684b94, 6, 160, YM), /* 00416 - Big Alec - No Second Prize.sndh */
+TIMEDB_ENTRY( 0d684b94, 7, 224, YM), /* 00416 - Big Alec - No Second Prize.sndh */
+TIMEDB_ENTRY( 0d71ea78, 0, 6151, YM), /* 00959 - Jeremy Das - Radio Controlled Racer.sndh */
+TIMEDB_ENTRY( 0d762eb1, 0, 3013, YM), /* 00727 - Tebirod - No Cooper Rasters.sndh */
+TIMEDB_ENTRY( 0d762eb1, 1, 3013, YM), /* 00727 - Tebirod - No Cooper Rasters.sndh */
+TIMEDB_ENTRY( 0d762eb1, 2, 4997, YM), /* 00727 - Tebirod - No Cooper Rasters.sndh */
+TIMEDB_ENTRY( 0d762eb1, 3, 3013, YM), /* 00727 - Tebirod - No Cooper Rasters.sndh */
+TIMEDB_ENTRY( 0d762eb1, 4, 3587, YM), /* 00727 - Tebirod - No Cooper Rasters.sndh */
+TIMEDB_ENTRY( 0d7c187d, 0, 3072, YM), /* 01883 - Dave Lowe - F-15 Strike Eagle 2.sndh */
+TIMEDB_ENTRY( 0d7c187d, 1, 2240, YM), /* 01883 - Dave Lowe - F-15 Strike Eagle 2.sndh */
+TIMEDB_ENTRY( 0d7c187d, 2, 8192, YM), /* 01883 - Dave Lowe - F-15 Strike Eagle 2.sndh */
+TIMEDB_ENTRY( 0d7c187d, 3, 1152, YM), /* 01883 - Dave Lowe - F-15 Strike Eagle 2.sndh */
+TIMEDB_ENTRY( 0d7c187d, 4, 1920, YM), /* 01883 - Dave Lowe - F-15 Strike Eagle 2.sndh */
+TIMEDB_ENTRY( 0dc79d68, 0, 4845, YM), /* 03183 - n-a - WhatChildIsThis.sndh */
+TIMEDB_ENTRY( 0dc7e44f, 0, 1595, YM+TA), /* 02638 - Miggy - Meow (Unfinished).sndh */
+TIMEDB_ENTRY( 0dd0f1e9, 0, 2925, YM+TA+TB+TD), /* 04308 - 505-checkpoint - ST_M.sndh */
+TIMEDB_ENTRY( 0ded0765, 0, 4218, YM+TA+TB+TD), /* 04255 - 505-checkpoint - eighties.sndh */
+TIMEDB_ENTRY( 0df05e40, 0, 8448, YM+TA+TB+TD), /* 02067 - Mad Max - Bump Set Spike - Sid.sndh */
+TIMEDB_ENTRY( 0df05e40, 1, 9504, YM+TA+TB+TD), /* 02067 - Mad Max - Bump Set Spike - Sid.sndh */
+TIMEDB_ENTRY( 0df45c86, 0, 575, YM), /* 04525 - Philip Rankin - Easy Learning Maths.sndh */
+TIMEDB_ENTRY( 0df45c86, 1, 2944, YM), /* 04525 - Philip Rankin - Easy Learning Maths.sndh */
+TIMEDB_ENTRY( 0df45c86, 2, 280, YM), /* 04525 - Philip Rankin - Easy Learning Maths.sndh */
+TIMEDB_ENTRY( 0e01f55f, 0, 17792, YM), /* 02187 - Mad Max - Crimetime.sndh */
+TIMEDB_ENTRY( 0e106f8d, 0, 4473, YM+TA), /* 04234 - 505 - 12th.sndh */
+TIMEDB_ENTRY( 0e128fd6, 0, 23264, YM+TA+TB+TD), /* 04241 - 505-cpt^pdx - Arcarde.sndh */
+TIMEDB_ENTRY( 0e15e766, 0, 10800, YM+TA+TB+TD), /* 02066 - Mad Max - Battle of Britain - Sid.sndh */
+TIMEDB_ENTRY( 0e16a0fa, 0, 18442, YM), /* 00463 - Augustin Vidovic - So Watt - TCB (SOS).sndh */
+TIMEDB_ENTRY( 0e1a0d56, 0, 179792, YM+TA), /* 04794 - Unknown - 808 State.sndh */
+TIMEDB_ENTRY( 0e2b2de0, 0, 9663, YM+TA+TB+TD), /* 03159 - Frequent-Ephidrena - Steinras DMA.sndh */
+TIMEDB_ENTRY( 0e38278e, 0, 11136, YM), /* 04011 - Danny Oneway - The Year After - Risk #2.sndh */
+TIMEDB_ENTRY( 0e45e998, 0, 5183, YM), /* 04095 - Gary Wheaton - Strawberry Fields.sndh */
+TIMEDB_ENTRY( 0e636894, 0, 7681, YM), /* 00363 - Steve Barrett - Italy 1990.sndh */
+TIMEDB_ENTRY( 0e68ab31, 0, 1536, YM), /* 04844 - t1000 - Bits 40.sndh */
+TIMEDB_ENTRY( 0e9487aa, 0, 8112, YM), /* 01259 - Tim Follin - Led Storm.sndh */
+TIMEDB_ENTRY( 0e9487aa, 1, 1561, YM), /* 01259 - Tim Follin - Led Storm.sndh */
+TIMEDB_ENTRY( 0e9487aa, 2, 4032, YM), /* 01259 - Tim Follin - Led Storm.sndh */
+TIMEDB_ENTRY( 0e9487aa, 3, 3852, YM), /* 01259 - Tim Follin - Led Storm.sndh */
+TIMEDB_ENTRY( 0e9487aa, 4, 6240, YM), /* 01259 - Tim Follin - Led Storm.sndh */
+TIMEDB_ENTRY( 0e9487aa, 5, 5664, YM), /* 01259 - Tim Follin - Led Storm.sndh */
+TIMEDB_ENTRY( 0e9487aa, 6, 241, YM), /* 01259 - Tim Follin - Led Storm.sndh */
+TIMEDB_ENTRY( 0ea0d826, 0, 5088, YM), /* 02414 - Nexus 6 - The Vulcan.sndh */
+TIMEDB_ENTRY( 0ea105d8, 0, 32060, YM), /* 00001 - gwEm - Full On! (re-version).sndh */
+TIMEDB_ENTRY( 0ea4f751, 0, 7290, YM), /* 02888 - Epic - World of Wonder - Legend.sndh */
+TIMEDB_ENTRY( 0eb0298d, 0, 6969, YM+TA), /* 01899 - Luebke - Compo.sndh */
+TIMEDB_ENTRY( 0ec74db4, 0, 6166, YM), /* 00409 - Big Alec - Killer.sndh */
+TIMEDB_ENTRY( 0eeb8343, 0, 15360, YM+TA), /* 04114 - Tao - 150 MPH - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 0eec7c72, 0, 10355, YM), /* 00839 - Ben Daglish - Artura.sndh */
+TIMEDB_ENTRY( 0eec7c72, 1, 7160, YM), /* 00839 - Ben Daglish - Artura.sndh */
+TIMEDB_ENTRY( 0ef563a2, 0, 11641, YM+TA+TB+TD), /* 03319 - Msg - Meikever.sndh */
+TIMEDB_ENTRY( 0efeb974, 0, 15676, YM+TA+TB+TD), /* 00205 - 505 - UCM 12 1.sndh */
+TIMEDB_ENTRY( 0f191d4d, 0, 3583, YM+TA+TB+TD), /* 02838 - maktone-fairlight - nelson.sndh */
+TIMEDB_ENTRY( 0f259465, 0, 1920, YM), /* 04605 - White Ninja - Love Desaster.sndh */
+TIMEDB_ENTRY( 0f2e0c09, 0, 11945, YM), /* 04379 - 505 - RoboST (STE).sndh */
+TIMEDB_ENTRY( 0f540c0c, 0, 4992, YM), /* 00497 - Ultimatum - Kidney Bean - Reset.sndh */
+TIMEDB_ENTRY( 0f546b2b, 0, 5361, YM), /* 02506 - Crazy Q - Crushed Insect (RG mix).sndh */
+TIMEDB_ENTRY( 0f55518f, 0, 2690, YM+TA), /* 00930 - Dark Angel - Logic Force.sndh */
+TIMEDB_ENTRY( 0f6c0b66, 0, 6528, YM+TD), /* 01385 - Scy - TSCC Mod Compil 13.sndh */
+TIMEDB_ENTRY( 0f797ef0, 0, 7680, YM+TD), /* 00586 - Celtic - Lethal Suck.sndh */
+TIMEDB_ENTRY( 0f7ac162, 0, 90, YM), /* 04710 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - screen 5.sndh */
+TIMEDB_ENTRY( 0f7cd0f4, 0, 28561, YM+TA), /* 03850 - Mr Saigon - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( 0f7cd0f4, 1, 27272, YM+TA), /* 03850 - Mr Saigon - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( 0f7cd0f4, 2, 43265, YM+TA), /* 03850 - Mr Saigon - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( 0f7cd0f4, 3, 10001, YM+TA), /* 03850 - Mr Saigon - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( 0f8ea27d, 0, 12042, YM+TA), /* 02673 - Donald Fakk - Jag Springer Fort.sndh */
+TIMEDB_ENTRY( 0f9490b8, 0, 6724, YM), /* 01374 - Justin Scharvona - Armalyte.sndh */
+TIMEDB_ENTRY( 0f9490b8, 1, 5124, YM), /* 01374 - Justin Scharvona - Armalyte.sndh */
+TIMEDB_ENTRY( 0f9490b8, 2, 964, YM), /* 01374 - Justin Scharvona - Armalyte.sndh */
+TIMEDB_ENTRY( 0f9490b8, 3, 1924, YM), /* 01374 - Justin Scharvona - Armalyte.sndh */
+TIMEDB_ENTRY( 0f9490b8, 4, 644, YM), /* 01374 - Justin Scharvona - Armalyte.sndh */
+TIMEDB_ENTRY( 0f9490b8, 5, 5764, YM), /* 01374 - Justin Scharvona - Armalyte.sndh */
+TIMEDB_ENTRY( 0f9490b8, 6, 5764, YM), /* 01374 - Justin Scharvona - Armalyte.sndh */
+TIMEDB_ENTRY( 0f9803b3, 0, 13760, YM+TA+TB+TD), /* 00826 - Crazy Q - TiMeBoMb - Evil Chip Of Dr.Zool.sndh */
+TIMEDB_ENTRY( 0fdf6f5e, 0, 1536, YM+TA), /* 02885 - Deneb - The Puppy Show - Loader.sndh */
+TIMEDB_ENTRY( 1001b206, 0, 7488, YM), /* 00137 - David Whittaker - Speedball.sndh */
+TIMEDB_ENTRY( 1001b206, 1, 1717, YM), /* 00137 - David Whittaker - Speedball.sndh */
+TIMEDB_ENTRY( 1001b206, 2, 1703, YM), /* 00137 - David Whittaker - Speedball.sndh */
+TIMEDB_ENTRY( 1001b206, 3, 1550, YM), /* 00137 - David Whittaker - Speedball.sndh */
+TIMEDB_ENTRY( 1001b206, 4, 1594, YM), /* 00137 - David Whittaker - Speedball.sndh */
+TIMEDB_ENTRY( 1001b206, 5, 282, YM), /* 00137 - David Whittaker - Speedball.sndh */
+TIMEDB_ENTRY( 1001b206, 6, 275, YM), /* 00137 - David Whittaker - Speedball.sndh */
+TIMEDB_ENTRY( 1001b206, 7, 102, YM), /* 00137 - David Whittaker - Speedball.sndh */
+TIMEDB_ENTRY( 10101bfe, 0, 8273, YM+TA+TB+TD), /* 02984 - 505-paradox - everything.sndh */
+TIMEDB_ENTRY( 10154b5a, 0, 14777, YM+TA+TB+TD), /* 00065 - 505-Checkpoint - UCM #20 music.sndh */
+TIMEDB_ENTRY( 1020c8c4, 0, 6532, YM), /* 01773 - Lap - Lap 13.sndh */
+TIMEDB_ENTRY( 10250c70, 0, 8727, YM), /* 04075 - Gary Wheaton - Fell in the horse shit in his new suit.sndh */
+TIMEDB_ENTRY( 1042340d, 0, 10368, YM), /* 01991 - Mad Max - Last Ninja.sndh */
+TIMEDB_ENTRY( 10443af2, 0, 8384, YM), /* 02052 - Mad Max - Harvey Smiths Show Jumping.sndh */
+TIMEDB_ENTRY( 10477923, 0, 10861, YM), /* 00170 - Martin Walker - Indiana Jones and the Fate of Atlantis.sndh */
+TIMEDB_ENTRY( 106bb9c8, 0, 49675, YM+TA), /* 04667 - Zbyhoo & Kijop - Bob Dylan.sndh */
+TIMEDB_ENTRY( 1075f97c, 0, 15354, YM), /* 01693 - Jess - Jochen Spirit.sndh */
+TIMEDB_ENTRY( 107f3197, 0, 1680, YM+TA), /* 02886 - Deneb - The Puppy Show - Menu.sndh */
+TIMEDB_ENTRY( 1099deae, 0, 10171, YM), /* 03145 - n-a - Orange Blossom Special.sndh */
+TIMEDB_ENTRY( 10a1171f, 0, 4600, YM+TA), /* 04227 - 505 - 6th.sndh */
+TIMEDB_ENTRY( 10a18d1f, 0, 9412, YM), /* 02234 - Tao - Main menu (Nostalgic-O-Demo).sndh */
+TIMEDB_ENTRY( 10a51096, 0, 33792, YM+TA+TB+TD), /* 02540 - SCHMX & STU - HIGHWAY UP NORTH.sndh */
+TIMEDB_ENTRY( 10ab8c09, 0, 3328, YM), /* 01222 - ENS Music - ENS 5.sndh */
+TIMEDB_ENTRY( 10c356e4, 0, 13483, YM+TA), /* 01328 - Scavenger - Cuddly This Year.sndh */
+TIMEDB_ENTRY( 10cbaa59, 0, 3200, YM), /* 01428 - Starbuck - Living on Video remix.sndh */
+TIMEDB_ENTRY( 10d28bc3, 0, 6528, YM), /* 01767 - Lap - Lap 7 - Ghosts and Goblins.sndh */
+TIMEDB_ENTRY( 10eb444e, 0, 9409, YM+TA+TB+TD), /* 02069 - Mad Max - Clumsy Colin Action Biker - Sid.sndh */
+TIMEDB_ENTRY( 10eb444e, 1, 3073, YM+TA+TB+TD), /* 02069 - Mad Max - Clumsy Colin Action Biker - Sid.sndh */
+TIMEDB_ENTRY( 10eb444e, 2, 541, YM+TA+TB+TD), /* 02069 - Mad Max - Clumsy Colin Action Biker - Sid.sndh */
+TIMEDB_ENTRY( 10ff790b, 0, 8955, YM+TA+TB+TD), /* 01586 - Nemo - Alive Intro.sndh */
+TIMEDB_ENTRY( 112e3abc, 0, 4367, YM+TB+TD), /* 04321 - 505 - Checkpoint - Terror (Unrel.).sndh */
+TIMEDB_ENTRY( 114ba133, 0, 7207, YM+TA), /* 03844 - Dave Lowe - Starglider - Title.sndh */
+TIMEDB_ENTRY( 114ef6a5, 0, 16751, YM+TA+TB+TD), /* 02986 - 505-paradox - faster.sndh */
+TIMEDB_ENTRY( 115e0a13, 0, 1920, YM), /* 00940 - Dark Angel - Oh Je Mi Neeeh!.sndh */
+TIMEDB_ENTRY( 1165187b, 0, 8898, YM), /* 00388 - Wally Beben - Lancaster.sndh */
+TIMEDB_ENTRY( 116ae9d7, 0, 9216, YM), /* 02451 - TPM - Journey to the Centre of the Earth.sndh */
+TIMEDB_ENTRY( 116e17b0, 0, 2560, YM), /* 00608 - Chris Mad - So Watt - Ghost Reset.sndh */
+TIMEDB_ENTRY( 117282eb, 0, 7680, YM), /* 00240 - Alx 33 - Wow.sndh */
+TIMEDB_ENTRY( 11786b23, 0, 23808, YM+TB+TD), /* 04751 - Xrwwr - SOS (2015 Remix).sndh */
+TIMEDB_ENTRY( 11906bd8, 0, 11641, YM+TA), /* 01936 - Miq - Rolling.sndh */
+TIMEDB_ENTRY( 11ae621c, 0, 1339, YM), /* 03488 - Kevin Toms - Football Manager.sndh */
+TIMEDB_ENTRY( 11dc782e, 0, 5193, YM+TA), /* 01610 - No More - Blast.sndh */
+TIMEDB_ENTRY( 11e19312, 0, 5005, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 1, 385, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 2, 768, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 3, 3584, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 4, 1808, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 5, 768, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 6, 2688, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 7, 3462, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 8, 1536, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 9, 672, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 10, 2640, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 11, 576, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 12, 1278, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 13, 1632, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 14, 3072, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 15, 324, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e19312, 16, 2064, YM), /* 01119 - Paul Tonge - Civilisation.sndh */
+TIMEDB_ENTRY( 11e76d9f, 0, 3840, YM+TA), /* 04427 - Lotus - Synth Dream 2 - Eternal Intro Tune.sndh */
+TIMEDB_ENTRY( 1202b75e, 0, 4480, YM), /* 01209 - Excellence In Art - Top Gun.sndh */
+TIMEDB_ENTRY( 1206cc06, 0, 511, YM), /* 03869 - Gary Wheaton - Cyberstorm Loader.sndh */
+TIMEDB_ENTRY( 12121edb, 0, 2400, YM), /* 04481 - Mad Max - Return of Medusa (unused).sndh */
+TIMEDB_ENTRY( 1215648d, 0, 3840, YM), /* 00786 - Crawdaddy - Detonation.sndh */
+TIMEDB_ENTRY( 1219e345, 0, 5712, YM+TA), /* 04439 - Lotus - Synth Dream 2 - Wishful Thinking.sndh */
+TIMEDB_ENTRY( 122d5a9a, 0, 4608, YM+TA+TD), /* 02570 - !Cube-Aggression - Earth.sndh */
+TIMEDB_ENTRY( 122fe23f, 0, 17019, YM+TA), /* 03749 - Tufty - Kaos 1 Hyp.sndh */
+TIMEDB_ENTRY( 123b4b2f, 0, 26592, YM), /* 03477 - gwEm (Manou conversion) - RetroModern.sndh */
+TIMEDB_ENTRY( 1281c6f4, 0, 6138, YM+TA+TB+TD), /* 00831 - Crazy Q - Timebomb ( 2003 ) - Phat & Phunky Part 1 (YM Rockerz).sndh */
+TIMEDB_ENTRY( 129247c8, 0, 8832, YM), /* 04848 - t1000 - Bits 42.sndh */
+TIMEDB_ENTRY( 12c1b460, 0, 3645, YM+TA+TB+TD), /* 00073 - 505 - Lame Lups.sndh */
+TIMEDB_ENTRY( 12ebad4e, 0, 53, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 1, 167, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 2, 25, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 3, 153, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 4, 133, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 6, 32, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 7, 122, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 8, 122, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 9, 60, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 10, 16, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 11, 711, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 12, 213, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 12ebad4e, 13, 9, YM), /* 04694 - Ewald Greiml - Marble Islands.sndh */
+TIMEDB_ENTRY( 13030213, 0, 2681, YM+TB+TD), /* 02427 - 505-cpt^dox - sweet.sndh */
+TIMEDB_ENTRY( 132348e5, 0, 6144, YM), /* 00474 - Ultimatum - Choux C.sndh */
+TIMEDB_ENTRY( 134d9229, 0, 5376, YM), /* 03629 - Jari Nikula - Musixx.sndh */
+TIMEDB_ENTRY( 13521ee8, 0, 450, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 1, 525, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 2, 626, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 3, 499, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 4, 652, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 5, 500, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 6, 615, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 7, 650, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 8, 710, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 9, 533, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 10, 823, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 11, 520, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 12, 795, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 13521ee8, 13, 476, YM), /* 04538 - Darren Ithell - Fun School 2 - Over 8 yrs.sndh */
+TIMEDB_ENTRY( 135f9504, 0, 42241, YM+TA), /* 03727 - Spector - Manic Demo Intro.sndh */
+TIMEDB_ENTRY( 1369cc10, 0, 5737, YM), /* 04152 - Unknown - Kampf.sndh */
+TIMEDB_ENTRY( 1369cc10, 1, 6481, YM), /* 04152 - Unknown - Kampf.sndh */
+TIMEDB_ENTRY( 1369cc10, 2, 2672, YM), /* 04152 - Unknown - Kampf.sndh */
+TIMEDB_ENTRY( 1369cc10, 3, 91, YM), /* 04152 - Unknown - Kampf.sndh */
+TIMEDB_ENTRY( 1369cc10, 4, 241, YM), /* 04152 - Unknown - Kampf.sndh */
+TIMEDB_ENTRY( 1369cc10, 5, 97, YM), /* 04152 - Unknown - Kampf.sndh */
+TIMEDB_ENTRY( 1369cc10, 6, 123, YM), /* 04152 - Unknown - Kampf.sndh */
+TIMEDB_ENTRY( 1369cc10, 7, 293, YM), /* 04152 - Unknown - Kampf.sndh */
+TIMEDB_ENTRY( 1369cc10, 8, 2471, YM), /* 04152 - Unknown - Kampf.sndh */
+TIMEDB_ENTRY( 1369cc10, 9, 169, YM), /* 04152 - Unknown - Kampf.sndh */
+TIMEDB_ENTRY( 136d361d, 0, 6911, YM), /* 00505 - Tangens - Mindbomb - Foxx.sndh */
+TIMEDB_ENTRY( 1374aa11, 0, 71, YM), /* 04688 - V. Peschardt - Le jeu des sons no 1.sndh */
+TIMEDB_ENTRY( 138e7dbf, 0, 6000, YM+TA+TD), /* 00023 - Wahoo - Yahoo.sndh */
+TIMEDB_ENTRY( 13cebc3b, 0, 26112, YM+TA+TB+TD), /* 02614 - STU - SAD DAY.sndh */
+TIMEDB_ENTRY( 13d19fbf, 0, 1275, YM+TA+TB), /* 04275 - 505-cpt^pdx - Lamer.sndh */
+TIMEDB_ENTRY( 13e8f608, 0, 1510, YM), /* 01303 - Matt Furniss - Mad Professor Mariarti.sndh */
+TIMEDB_ENTRY( 13e8f608, 1, 2110, YM), /* 01303 - Matt Furniss - Mad Professor Mariarti.sndh */
+TIMEDB_ENTRY( 13e8f608, 2, 1726, YM), /* 01303 - Matt Furniss - Mad Professor Mariarti.sndh */
+TIMEDB_ENTRY( 13e8f608, 3, 2110, YM), /* 01303 - Matt Furniss - Mad Professor Mariarti.sndh */
+TIMEDB_ENTRY( 13e8f608, 4, 1697, YM), /* 01303 - Matt Furniss - Mad Professor Mariarti.sndh */
+TIMEDB_ENTRY( 13e8f608, 5, 2211, YM), /* 01303 - Matt Furniss - Mad Professor Mariarti.sndh */
+TIMEDB_ENTRY( 13e8f608, 6, 2403, YM), /* 01303 - Matt Furniss - Mad Professor Mariarti.sndh */
+TIMEDB_ENTRY( 13e8f608, 7, 2014, YM), /* 01303 - Matt Furniss - Mad Professor Mariarti.sndh */
+TIMEDB_ENTRY( 13e8f608, 8, 2014, YM), /* 01303 - Matt Furniss - Mad Professor Mariarti.sndh */
+TIMEDB_ENTRY( 13e8f608, 9, 279, YM), /* 01303 - Matt Furniss - Mad Professor Mariarti.sndh */
+TIMEDB_ENTRY( 13edb6b6, 0, 3232, YM), /* 01766 - Lap - Lap 6 - Jarre.sndh */
+TIMEDB_ENTRY( 13f77939, 0, 6912, YM), /* 00239 - Alx 33 - Sam.sndh */
+TIMEDB_ENTRY( 14019d82, 0, 369, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 14019d82, 1, 4608, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 14019d82, 2, 7848, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 14019d82, 3, 8064, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 14019d82, 4, 9984, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 14019d82, 5, 384, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 14019d82, 6, 5120, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 14019d82, 7, 8192, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 14019d82, 8, 11552, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 14019d82, 9, 9989, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 14019d82, 10, 6735, YM), /* 02218 - Mad Max - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 1401bf68, 0, 39936, YM+TB+TD), /* 04853 - xFalcon - MOVE TO TRANCE.sndh */
+TIMEDB_ENTRY( 141fa33b, 0, 10032, YM), /* 01268 - Frazer - Jigsaw.sndh */
+TIMEDB_ENTRY( 1440ad99, 0, 316, YM), /* 02491 - gwEm - Oxygene Loader.sndh */
+TIMEDB_ENTRY( 1445980b, 0, 4992, YM), /* 00942 - Dark Angel - Pan Tau Kotzt!.sndh */
+TIMEDB_ENTRY( 145cbd3b, 0, 10365, YM+TA+TB+TD), /* 01017 - DMA-SC - Dosk Opus - UCM 18.sndh */
+TIMEDB_ENTRY( 14651f2d, 0, 791, YM), /* 04508 - Unknown - Bullys Sporting Darts.sndh */
+TIMEDB_ENTRY( 14651f2d, 1, 864, YM), /* 04508 - Unknown - Bullys Sporting Darts.sndh */
+TIMEDB_ENTRY( 14651f2d, 2, 1246, YM), /* 04508 - Unknown - Bullys Sporting Darts.sndh */
+TIMEDB_ENTRY( 1472c9e2, 0, 14977, YM), /* 03622 - TOMCHI NOEXTRA - No Monkey.sndh */
+TIMEDB_ENTRY( 14752934, 0, 7296, YM), /* 00238 - Alx 33 - Bulbing.sndh */
+TIMEDB_ENTRY( 1478093a, 0, 3975, YM+TA), /* 00052 - 505 - Glas.sndh */
+TIMEDB_ENTRY( 1495071d, 0, 9616, YM), /* 01023 - Doclands - Blastiny Bobs.sndh */
+TIMEDB_ENTRY( 149a5ad1, 0, 5760, YM+TA+TD), /* 02255 - Tao - Cream - Flow (Steps).sndh */
+TIMEDB_ENTRY( 149fff39, 0, 9849, YM), /* 01272 - Frazer - TSC 21.sndh */
+TIMEDB_ENTRY( 14c5d927, 0, 120448, YM+TA), /* 04037 - Roggie - Roggie 19.sndh */
+TIMEDB_ENTRY( 14cfe380, 0, 3583, YM+TA+TB+TD), /* 00284 - Baggio - Evolution - Ode to inspiration.sndh */
+TIMEDB_ENTRY( 14d0fae4, 0, 18090, YM+STE), /* 04208 - Jess - Throw It in a Trash Can (STe).sndh */
+TIMEDB_ENTRY( 14e8c428, 0, 10239, YM), /* 00315 - Gary Wheaton - Liane.sndh */
+TIMEDB_ENTRY( 14f413e3, 0, 3584, YM+TA), /* 04584 - Crawdaddy - Pure Energy 1.sndh */
+TIMEDB_ENTRY( 151710e3, 0, 4032, YM), /* 02971 - Gary Wheaton - The Cocoons of Jusse.sndh */
+TIMEDB_ENTRY( 152668f3, 0, 5817, YM+TA), /* 01330 - Scavenger - Enchanted Land The Sequel.sndh */
+TIMEDB_ENTRY( 1527d7e4, 0, 4992, YM), /* 01207 - Excellence In Art - Talkload.sndh */
+TIMEDB_ENTRY( 1549cf77, 0, 8024, YM), /* 04723 - Benny Johansen - Yatzy.sndh */
+TIMEDB_ENTRY( 1549cf77, 1, 153, YM), /* 04723 - Benny Johansen - Yatzy.sndh */
+TIMEDB_ENTRY( 1549cf77, 2, 84, YM), /* 04723 - Benny Johansen - Yatzy.sndh */
+TIMEDB_ENTRY( 1549cf77, 3, 3360, YM), /* 04723 - Benny Johansen - Yatzy.sndh */
+TIMEDB_ENTRY( 15581aa9, 0, 5565, YM+TA), /* 04242 - 505-checkpoint - BALIBULU.sndh */
+TIMEDB_ENTRY( 157390be, 0, 9309, YM), /* 04193 - David Whittaker - Outrun - USA Version.sndh */
+TIMEDB_ENTRY( 157390be, 1, 5665, YM), /* 04193 - David Whittaker - Outrun - USA Version.sndh */
+TIMEDB_ENTRY( 157390be, 2, 1464, YM), /* 04193 - David Whittaker - Outrun - USA Version.sndh */
+TIMEDB_ENTRY( 15912b80, 0, 11136, YM+TA+TD), /* 02274 - Tao - Cream - Walk On Ice (Steps).sndh */
+TIMEDB_ENTRY( 159bc317, 0, 2578, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 1, 1761, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 2, 2305, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 3, 1153, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 4, 961, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 5, 2049, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 6, 2521, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 7, 225, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 8, 980, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 9, 2082, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 10, 2113, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159bc317, 11, 386, YM), /* 00393 - Wally Beben - R-Type.sndh */
+TIMEDB_ENTRY( 159c7186, 0, 3647, YM), /* 03472 - gwEm - ze japanim.sndh */
+TIMEDB_ENTRY( 15b445e9, 0, 79899, YM+TA), /* 01372 - Scavenger - Having a Period in 3D Space.sndh */
+TIMEDB_ENTRY( 15c672dc, 0, 15360, YM+TA+TB+TD), /* 03428 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( 15d4bdc9, 0, 14592, YM+TA+TD), /* 02503 - Crazy Q - Creators^DHS - Chameleon.sndh */
+TIMEDB_ENTRY( 15e0eb75, 0, 4810, YM), /* 03131 - Unknown - O Little Town of Bethlehem.sndh */
+TIMEDB_ENTRY( 15ecb8cc, 0, 9600, YM), /* 04838 - t1000 - Bits 33.sndh */
+TIMEDB_ENTRY( 160fbf10, 0, 7704, YM), /* 00617 - Chrispy Noodle - Tristar.sndh */
+TIMEDB_ENTRY( 161a542a, 0, 6079, YM+TA+TB+TD), /* 01152 - Tyan - Platz 1.sndh */
+TIMEDB_ENTRY( 16228d20, 0, 3079, YM), /* 02735 - Jeremy Das - Jungle Boy.sndh */
+TIMEDB_ENTRY( 1650dd24, 0, 16144, YM), /* 00089 - David Whittaker - Cosmic Pirates.sndh */
+TIMEDB_ENTRY( 1650dd24, 1, 15360, YM), /* 00089 - David Whittaker - Cosmic Pirates.sndh */
+TIMEDB_ENTRY( 1650dd24, 2, 26, YM), /* 00089 - David Whittaker - Cosmic Pirates.sndh */
+TIMEDB_ENTRY( 1650dd24, 3, 607, YM), /* 00089 - David Whittaker - Cosmic Pirates.sndh */
+TIMEDB_ENTRY( 167e07f3, 0, 6527, YM+TA+TB+TD), /* 02981 - 505-paradox - disco slide.sndh */
+TIMEDB_ENTRY( 1692a08e, 0, 5565, YM+TA+TB+TD), /* 00203 - 505 - Checkpoint - tripping.sndh */
+TIMEDB_ENTRY( 16bfa1c0, 0, 3840, YM), /* 01074 - Excellence In Art - Bellis Boot.sndh */
+TIMEDB_ENTRY( 16d4bf68, 0, 2687, YM+TA+TB+TD), /* 02872 - 505 <nils feske> - sequences, 2005.sndh */
+TIMEDB_ENTRY( 16daeec1, 0, 4984, YM), /* 00571 - Jas C Brooke - Resolution 101.sndh */
+TIMEDB_ENTRY( 16daeec1, 1, 201, YM), /* 00571 - Jas C Brooke - Resolution 101.sndh */
+TIMEDB_ENTRY( 16e1874a, 0, 6316, YM), /* 00079 - David Whittaker - Back To The Future 2.sndh */
+TIMEDB_ENTRY( 16e1874a, 1, 3254, YM), /* 00079 - David Whittaker - Back To The Future 2.sndh */
+TIMEDB_ENTRY( 16e1874a, 2, 2984, YM), /* 00079 - David Whittaker - Back To The Future 2.sndh */
+TIMEDB_ENTRY( 16e1874a, 3, 5017, YM), /* 00079 - David Whittaker - Back To The Future 2.sndh */
+TIMEDB_ENTRY( 16e1874a, 4, 6342, YM), /* 00079 - David Whittaker - Back To The Future 2.sndh */
+TIMEDB_ENTRY( 16e4d0e2, 0, 8568, YM), /* 00147 - David Whittaker - Tetris.sndh */
+TIMEDB_ENTRY( 16e4d0e2, 1, 1120, YM), /* 00147 - David Whittaker - Tetris.sndh */
+TIMEDB_ENTRY( 16e4d0e2, 2, 61, YM), /* 00147 - David Whittaker - Tetris.sndh */
+TIMEDB_ENTRY( 16e61312, 0, 4611, YM+TA), /* 04409 - Dr Beat - Maziac Unused.sndh */
+TIMEDB_ENTRY( 16fedf6d, 0, 8233, YM), /* 00117 - David Whittaker - Millennium 2.2.sndh */
+TIMEDB_ENTRY( 170813e0, 0, 28032, YM), /* 02180 - Mad Max - Atomix (Cybermind).sndh */
+TIMEDB_ENTRY( 171600c0, 0, 29536, YM+TA+TB+TD), /* 03358 - Marcer - MIGHT 382.sndh */
+TIMEDB_ENTRY( 173021f6, 0, 3455, YM+TA+TB+TD), /* 02988 - 505-paradox - Jumper.sndh */
+TIMEDB_ENTRY( 1734fa62, 0, 1152, YM), /* 04616 - Timo Weggen - Plantonix.sndh */
+TIMEDB_ENTRY( 1734fa62, 1, 2304, YM), /* 04616 - Timo Weggen - Plantonix.sndh */
+TIMEDB_ENTRY( 1734fa62, 2, 2688, YM), /* 04616 - Timo Weggen - Plantonix.sndh */
+TIMEDB_ENTRY( 177a0f9d, 0, 5413, YM+TA+TB+TD), /* 00055 - 505 - Heaven Sux.sndh */
+TIMEDB_ENTRY( 177d17ab, 0, 16231, YM), /* 03548 - Unknown - Knucklebusters.sndh */
+TIMEDB_ENTRY( 177e6d27, 0, 9409, YM+TA+TB+TD), /* 03583 - Divag - Electropsychiatrique.sndh */
+TIMEDB_ENTRY( 17836e5d, 0, 11168, YM+TA+TB+TD), /* 03852 - !Cube - Decisive Factor.sndh */
+TIMEDB_ENTRY( 1793d65d, 0, 95719, YM+TA), /* 04799 - Unknown - Confuzion.sndh */
+TIMEDB_ENTRY( 179d1c88, 0, 8556, YM+TA+TB+TD), /* 04660 - Frequent-Ephidrena - Revers.sndh */
+TIMEDB_ENTRY( 17a8e5a3, 0, 29283, YM+TA), /* 04404 - Ninja One - Monkey (Hoby One Demo).sndh */
+TIMEDB_ENTRY( 17c24cd9, 0, 1536, YM+TA), /* 00920 - Dark Angel - C94cop.sndh */
+TIMEDB_ENTRY( 17c7fb3e, 0, 5375, YM+TA+TB+TD), /* 03274 - Dubmood - Galax (orig. Ben Daglish).sndh */
+TIMEDB_ENTRY( 17cfdfc7, 0, 7968, YM+TA), /* 00807 - Crawdaddy - Poing.sndh */
+TIMEDB_ENTRY( 17e037c4, 0, 9594, YM+TA+TD), /* 01007 - DMA-SC - Pie Bill Gates - Game.sndh */
+TIMEDB_ENTRY( 17e09dc9, 0, 6265, YM+TA+TD), /* 01964 - MSG - Godpey - Stage.sndh */
+TIMEDB_ENTRY( 17e0ec66, 0, 4415, YM+TA+TB+TD), /* 02996 - 505-paradox - phazer (STE only).sndh */
+TIMEDB_ENTRY( 17e34c6a, 0, 12548, YM+TA+TB), /* 01833 - Lotek Style - Artefakt.sndh */
+TIMEDB_ENTRY( 17f47817, 0, 4608, YM), /* 00496 - Ultimatum - Kidney Bean 12.sndh */
+TIMEDB_ENTRY( 17f8abde, 0, 8058, YM+TA+TB+TD), /* 01371 - Scavenger - Chaos.sndh */
+TIMEDB_ENTRY( 183e8fe0, 0, 8585, YM+TA), /* 04432 - Lotus - Synth Dream 2 - Micro Kit.sndh */
+TIMEDB_ENTRY( 1842c149, 0, 13440, YM), /* 01178 - Sally - Stax 57.sndh */
+TIMEDB_ENTRY( 184a5220, 0, 5754, YM+TA+TD), /* 00063 - 505 - Joe Cool.sndh */
+TIMEDB_ENTRY( 186c4ab7, 0, 29736, YM+TD), /* 01463 - STU - DROP DA BOMB.sndh */
+TIMEDB_ENTRY( 18707f17, 0, 3466, YM), /* 03078 - Mark Quinn - Valse Venezolano, by A. Lauro.sndh */
+TIMEDB_ENTRY( 1878be4e, 0, 11136, YM), /* 00897 - Danny Oneway - Danny.sndh */
+TIMEDB_ENTRY( 18a9400b, 0, 12670, YM+TA), /* 04864 - Jovis - Baf.sndh */
+TIMEDB_ENTRY( 18aadb4d, 0, 6050, YM), /* 00366 - Steve Barrett - SAS Combat Simulator.sndh */
+TIMEDB_ENTRY( 18c1972e, 0, 15232, YM), /* 01663 - Jedi - Virtual Escape Hidden.sndh */
+TIMEDB_ENTRY( 18c378fe, 0, 5376, YM), /* 02659 - Stefan Jerowski - Blue Angel 69.sndh */
+TIMEDB_ENTRY( 18c378fe, 1, 11420, YM), /* 02659 - Stefan Jerowski - Blue Angel 69.sndh */
+TIMEDB_ENTRY( 18c378fe, 2, 435, YM), /* 02659 - Stefan Jerowski - Blue Angel 69.sndh */
+TIMEDB_ENTRY( 18c378fe, 3, 414, YM), /* 02659 - Stefan Jerowski - Blue Angel 69.sndh */
+TIMEDB_ENTRY( 18e73b47, 0, 11807, YM+TA+TB+TD), /* 02702 - Dubmood - Publicea i Media beat.sndh */
+TIMEDB_ENTRY( 18fd5ccc, 0, 8712, YM), /* 00880 - Ben Daglish - The Running Man.sndh */
+TIMEDB_ENTRY( 190849c1, 0, 2239, YM), /* 01295 - Matt Furniss - Euro Football Champs.sndh */
+TIMEDB_ENTRY( 1908add3, 0, 40320, YM), /* 01470 - STU - MUGICHA.sndh */
+TIMEDB_ENTRY( 190ea54c, 0, 6144, YM), /* 02811 - Starbuck - Urban Shuffle.sndh */
+TIMEDB_ENTRY( 19377722, 0, 12840, YM), /* 00971 - Deneb - Kidney Bean - Data.sndh */
+TIMEDB_ENTRY( 193886d5, 0, 3072, YM), /* 00338 - Tony Williams - Chuckie Egg.sndh */
+TIMEDB_ENTRY( 193886d5, 1, 7680, YM), /* 00338 - Tony Williams - Chuckie Egg.sndh */
+TIMEDB_ENTRY( 193886d5, 2, 171, YM), /* 00338 - Tony Williams - Chuckie Egg.sndh */
+TIMEDB_ENTRY( 193cfddc, 0, 6257, YM+TA+TB+TD), /* 04278 - 505 - Lousy.sndh */
+TIMEDB_ENTRY( 19654ee5, 0, 2303, YM), /* 02823 - COOPER, ORIGINAL BY CLAWZ - ZNAX HIGHSCORES.sndh */
+TIMEDB_ENTRY( 196ad751, 0, 6938, YM), /* 03124 - Unknown - I Am A Rock P.Simon.sndh */
+TIMEDB_ENTRY( 196c6bbd, 0, 10253, YM), /* 01296 - Matt Furniss - E.F.T.P.O.T.R.M..sndh */
+TIMEDB_ENTRY( 196c6bbd, 1, 1150, YM), /* 01296 - Matt Furniss - E.F.T.P.O.T.R.M..sndh */
+TIMEDB_ENTRY( 196c6bbd, 2, 3070, YM), /* 01296 - Matt Furniss - E.F.T.P.O.T.R.M..sndh */
+TIMEDB_ENTRY( 196c6bbd, 3, 144, YM), /* 01296 - Matt Furniss - E.F.T.P.O.T.R.M..sndh */
+TIMEDB_ENTRY( 196c6bbd, 4, 119, YM), /* 01296 - Matt Furniss - E.F.T.P.O.T.R.M..sndh */
+TIMEDB_ENTRY( 196c6bbd, 5, 766, YM), /* 01296 - Matt Furniss - E.F.T.P.O.T.R.M..sndh */
+TIMEDB_ENTRY( 199176ae, 0, 5794, YM+TA), /* 00000 - Dhor - Uncomplicated.sndh */
+TIMEDB_ENTRY( 19954286, 0, 1280, YM), /* 01076 - Excellence In Art - Circles.sndh */
+TIMEDB_ENTRY( 19a473a7, 0, 6912, YM+TA+TD), /* 02326 - Tao - Cream - MV Jeu - Highscore (Steps).sndh */
+TIMEDB_ENTRY( 19ae899a, 0, 3261, YM+TA+TB+TD), /* 00275 - Baggio - Compo.sndh */
+TIMEDB_ENTRY( 19cb007c, 0, 768, YM+TA), /* 01751 - Kanewood - Phantom Demo - Bonus B.sndh */
+TIMEDB_ENTRY( 19ce95d7, 0, 1333, YM+TA), /* 04424 - Lotus - Synth Dream 2 - Braindrops.sndh */
+TIMEDB_ENTRY( 19e62de8, 0, 5631, YM+TA+TB+TD), /* 02979 - 505-paradox - chippy.sndh */
+TIMEDB_ENTRY( 19f2d59e, 0, 10746, YM), /* 01235 - Epic - Phototro.sndh */
+TIMEDB_ENTRY( 19f4d71f, 0, 4864, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 1, 5760, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 2, 6144, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 3, 6144, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 4, 5632, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 5, 4608, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 6, 6400, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 7, 6765, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 8, 11904, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 9, 5889, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 10, 8160, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 11, 9184, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 12, 9984, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 13, 15192, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 14, 9912, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 15, 7800, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 16, 3520, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 17, 3840, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 18, 6144, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f4d71f, 19, 10944, YM+STE), /* 02177 - Mad Max - Amberstar.sndh */
+TIMEDB_ENTRY( 19f5d22e, 0, 7290, YM), /* 00890 - Adrian Dalecki - Turtle Table Tennis.sndh */
+TIMEDB_ENTRY( 19f5d22e, 1, 196, YM), /* 00890 - Adrian Dalecki - Turtle Table Tennis.sndh */
+TIMEDB_ENTRY( 1a16010c, 0, 6396, YM), /* 01242 - Epic - Wizz.sndh */
+TIMEDB_ENTRY( 1a1ce50e, 0, 3456, YM), /* 02127 - Mad Max - Robocop Tune 2.sndh */
+TIMEDB_ENTRY( 1a2334b7, 0, 963, YM), /* 03510 - Nick Scarim - Spy Vs Spy.sndh */
+TIMEDB_ENTRY( 1a25b77a, 0, 6144, YM+TA+TD), /* 03317 - SH3-RG - Ingame.sndh */
+TIMEDB_ENTRY( 1a2f66c9, 0, 448, YM+TA+TD), /* 02504 - Crazy Q - DHS Disk Change 1 (Test).sndh */
+TIMEDB_ENTRY( 1a3c29db, 0, 7161, YM+TA+TB+TD), /* 01381 - Schemantix - Zombie Apocalypse.sndh */
+TIMEDB_ENTRY( 1a3c29db, 1, 4473, YM+TA+TB+TD), /* 01381 - Schemantix - Zombie Apocalypse.sndh */
+TIMEDB_ENTRY( 1a3c29db, 2, 3576, YM+TA+TB+TD), /* 01381 - Schemantix - Zombie Apocalypse.sndh */
+TIMEDB_ENTRY( 1a3c29db, 3, 6136, YM+TA+TB+TD), /* 01381 - Schemantix - Zombie Apocalypse.sndh */
+TIMEDB_ENTRY( 1a3f6f91, 0, 4608, YM), /* 03192 - n-a - Sports Day.sndh */
+TIMEDB_ENTRY( 1a41cde6, 0, 15360, YM), /* 01507 - Rob Hubbard - Thrust.sndh */
+TIMEDB_ENTRY( 1a43fdf6, 0, 10232, YM+TA+TB+TD), /* 01829 - Lotek Style - Age.sndh */
+TIMEDB_ENTRY( 1a4c351f, 0, 14268, YM+TB+TD), /* 02848 - Helene - Carsong1 micromusic 4 the road.sndh */
+TIMEDB_ENTRY( 1a5f9b1f, 0, 6656, YM), /* 01655 - Jedi - Shadow.sndh */
+TIMEDB_ENTRY( 1a621f36, 0, 5802, YM), /* 00260 - Antichrist - Sad Tune.sndh */
+TIMEDB_ENTRY( 1a6e73aa, 0, 13824, YM), /* 02211 - Mad Max - Quizmaster.sndh */
+TIMEDB_ENTRY( 1a7e4769, 0, 3023, YM+TA+TD), /* 01939 - Modmate - Xmas.sndh */
+TIMEDB_ENTRY( 1a93b511, 0, 7679, YM), /* 04849 - !Cube - Glittering Waves.sndh */
+TIMEDB_ENTRY( 1aa645f9, 0, 2367, YM), /* 03208 - Unknown - International Soccer Challenge.sndh */
+TIMEDB_ENTRY( 1ae0d0e0, 0, 10043, YM), /* 00882 - Ben Daglish - Wizard Warz.sndh */
+TIMEDB_ENTRY( 1ae0d0e0, 1, 236, YM), /* 00882 - Ben Daglish - Wizard Warz.sndh */
+TIMEDB_ENTRY( 1ae0d0e0, 2, 693, YM), /* 00882 - Ben Daglish - Wizard Warz.sndh */
+TIMEDB_ENTRY( 1ae0d0e0, 3, 192, YM), /* 00882 - Ben Daglish - Wizard Warz.sndh */
+TIMEDB_ENTRY( 1ae0d0e0, 4, 420, YM), /* 00882 - Ben Daglish - Wizard Warz.sndh */
+TIMEDB_ENTRY( 1ae10543, 0, 12672, YM+TA), /* 00401 - Big Alec - Bangkok Knights Loader.sndh */
+TIMEDB_ENTRY( 1ae6ad10, 0, 9595, YM+TA+TB+TD), /* 01865 - Lotek Style - tSCc^Vinyl Kartell - Rise Of The RI-Machines (YM Rockerz).sndh */
+TIMEDB_ENTRY( 1af0890d, 0, 6197, YM), /* 00354 - David Whittaker - Trantor.sndh */
+TIMEDB_ENTRY( 1af0890d, 1, 1285, YM), /* 00354 - David Whittaker - Trantor.sndh */
+TIMEDB_ENTRY( 1af0890d, 2, 581, YM), /* 00354 - David Whittaker - Trantor.sndh */
+TIMEDB_ENTRY( 1af0890d, 3, 630, YM), /* 00354 - David Whittaker - Trantor.sndh */
+TIMEDB_ENTRY( 1b00ee68, 0, 10752, YM+TB+TD), /* 02850 - Helene - eurotrance versjon.sndh */
+TIMEDB_ENTRY( 1b042874, 0, 1280, YM), /* 04726 - Beyonder - MIX number ONE demo - Intro.sndh */
+TIMEDB_ENTRY( 1b042874, 1, 2080, YM), /* 04726 - Beyonder - MIX number ONE demo - Intro.sndh */
+TIMEDB_ENTRY( 1b042874, 2, 93, YM), /* 04726 - Beyonder - MIX number ONE demo - Intro.sndh */
+TIMEDB_ENTRY( 1b042874, 3, 2224, YM), /* 04726 - Beyonder - MIX number ONE demo - Intro.sndh */
+TIMEDB_ENTRY( 1b042874, 4, 2662, YM), /* 04726 - Beyonder - MIX number ONE demo - Intro.sndh */
+TIMEDB_ENTRY( 1b04a226, 0, 1152, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04a226, 1, 1920, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04a226, 2, 2016, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04a226, 3, 2212, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04a226, 4, 2320, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04a226, 5, 1449, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04a226, 6, 2324, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04a226, 7, 612, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04a226, 8, 22423, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04a226, 9, 2304, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04a226, 10, 3072, YM), /* 04389 - Nigel Pritchard - Times of Lore.sndh */
+TIMEDB_ENTRY( 1b04cc71, 0, 22848, YM), /* 02039 - Mad Max - International Karate.sndh */
+TIMEDB_ENTRY( 1b071dd3, 0, 41632, YM+TA+TD), /* 02330 - Tao - Cream - Sillyshuffle (SV2K Compo).sndh */
+TIMEDB_ENTRY( 1b199a9a, 0, 5098, YM+TA+TB+TD), /* 04201 - Paul Summers - Predator.sndh */
+TIMEDB_ENTRY( 1b233e4c, 0, 4992, YM), /* 01645 - Jedi - Thats The Way I Like It.sndh */
+TIMEDB_ENTRY( 1b30ffba, 0, 3264, YM), /* 01765 - Lap - Lap 5.sndh */
+TIMEDB_ENTRY( 1b367860, 0, 1785, YM+TA), /* 00223 - 7AN - Blip 4.sndh */
+TIMEDB_ENTRY( 1b36c809, 0, 1346, YM), /* 03286 - Philip Bishop - Dogfight.sndh */
+TIMEDB_ENTRY( 1b4950a0, 0, 3336, YM), /* 02719 - Chris Denman - Feudal Lords.sndh */
+TIMEDB_ENTRY( 1b4d1ba1, 0, 1530, YM+TA+TB+TD), /* 02827 - Msg - Superfly tune 4.sndh */
+TIMEDB_ENTRY( 1b739836, 0, 5518, YM+TA), /* 03567 - 505-Paradox - Pozdrowienia do Gdanska.sndh */
+TIMEDB_ENTRY( 1b7f470a, 0, 7680, YM), /* 01094 - Techno - Omed.sndh */
+TIMEDB_ENTRY( 1b86d25d, 0, 3584, YM), /* 01555 - Rhino - Xmas 2003 Intro - Song 3.sndh */
+TIMEDB_ENTRY( 1b893559, 0, 1488, YM), /* 01382 - Chris Scudds - Chase HQ 2 Special Criminal Investigation.sndh */
+TIMEDB_ENTRY( 1b893559, 1, 3936, YM), /* 01382 - Chris Scudds - Chase HQ 2 Special Criminal Investigation.sndh */
+TIMEDB_ENTRY( 1b893559, 2, 3080, YM), /* 01382 - Chris Scudds - Chase HQ 2 Special Criminal Investigation.sndh */
+TIMEDB_ENTRY( 1b893559, 3, 3430, YM), /* 01382 - Chris Scudds - Chase HQ 2 Special Criminal Investigation.sndh */
+TIMEDB_ENTRY( 1b92ca5a, 0, 3664, YM), /* 03194 - n-a - Witches.sndh */
+TIMEDB_ENTRY( 1b92d24d, 0, 209, YM), /* 04509 - Unknown - Bumber Jacky.sndh */
+TIMEDB_ENTRY( 1b92d24d, 1, 465, YM), /* 04509 - Unknown - Bumber Jacky.sndh */
+TIMEDB_ENTRY( 1ba3b22f, 0, 7968, YM+TA), /* 02869 - Crawdaddy - Lame-Brain.sndh */
+TIMEDB_ENTRY( 1bb19ba2, 0, 8952, YM+TA+TB+TD), /* 02860 - Helene - Version L.sndh */
+TIMEDB_ENTRY( 1bb6db89, 0, 2026, YM), /* 03886 - Unknown - Dobru Noc.sndh */
+TIMEDB_ENTRY( 1bd0d72a, 0, 3920, YM+TD), /* 02366 - Nexus 6 - Chinese Mead.sndh */
+TIMEDB_ENTRY( 1bebdb7c, 0, 4359, YM+TA+TB+TD), /* 02523 - DUBMOOD - RaZoR 1911 - MONKEY ISLAND.sndh */
+TIMEDB_ENTRY( 1c0016df, 0, 6255, YM), /* 00115 - David Whittaker - Licence to Kill.sndh */
+TIMEDB_ENTRY( 1c0016df, 1, 8192, YM), /* 00115 - David Whittaker - Licence to Kill.sndh */
+TIMEDB_ENTRY( 1c0016df, 2, 9216, YM), /* 00115 - David Whittaker - Licence to Kill.sndh */
+TIMEDB_ENTRY( 1c0016df, 3, 147, YM), /* 00115 - David Whittaker - Licence to Kill.sndh */
+TIMEDB_ENTRY( 1c0016df, 4, 668, YM), /* 00115 - David Whittaker - Licence to Kill.sndh */
+TIMEDB_ENTRY( 1c24767c, 0, 13056, YM), /* 01649 - Jedi - Loader.sndh */
+TIMEDB_ENTRY( 1c2f24ac, 0, 9560, YM), /* 03126 - Unknown - I Just Called to Say I Love U.sndh */
+TIMEDB_ENTRY( 1c3714a1, 0, 35506, YM), /* 01473 - stu - punkey.sndh */
+TIMEDB_ENTRY( 1c432308, 0, 3840, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c432308, 1, 6353, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c432308, 2, 432, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c432308, 3, 1768, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c432308, 4, 1920, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c432308, 5, 673, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c432308, 6, 673, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c432308, 7, 1344, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c432308, 8, 193, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c432308, 9, 1184, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c432308, 10, 129, YM), /* 01055 - Jonathan Dunn - The Addams Family.sndh */
+TIMEDB_ENTRY( 1c976fba, 0, 17594, YM+TA+TD), /* 02626 - sh3-rg - teh won.sndh */
+TIMEDB_ENTRY( 1ca333b3, 0, 3224, YM+TA), /* 04304 - 505-checkpoint - Scheme.sndh */
+TIMEDB_ENTRY( 1cbe11b8, 0, 18059, YM+TB+TD), /* 04574 - Nemo - Undercover Action Agents.sndh */
+TIMEDB_ENTRY( 1ccbc756, 0, 1736, YM), /* 03089 - Unknown - Don't Stop Believing,"Journey".sndh */
+TIMEDB_ENTRY( 1cf75009, 0, 3095, YM+TA+TB+TD), /* 03421 - Dubmood - Tempest - Acidjazzed Evenings (Dubmood).sndh */
+TIMEDB_ENTRY( 1d005ee4, 0, 4771, YM), /* 02033 - Mad Max - Gerry The Germ.sndh */
+TIMEDB_ENTRY( 1d005ee4, 1, 5376, YM), /* 02033 - Mad Max - Gerry The Germ.sndh */
+TIMEDB_ENTRY( 1d005ee4, 2, 5184, YM), /* 02033 - Mad Max - Gerry The Germ.sndh */
+TIMEDB_ENTRY( 1d005ee4, 3, 6528, YM), /* 02033 - Mad Max - Gerry The Germ.sndh */
+TIMEDB_ENTRY( 1d005ee4, 4, 4992, YM), /* 02033 - Mad Max - Gerry The Germ.sndh */
+TIMEDB_ENTRY( 1d005ee4, 5, 3619, YM), /* 02033 - Mad Max - Gerry The Germ.sndh */
+TIMEDB_ENTRY( 1d005ee4, 6, 5376, YM), /* 02033 - Mad Max - Gerry The Germ.sndh */
+TIMEDB_ENTRY( 1d022c80, 0, 11568, YM+TA+TB+TD), /* 02793 - Frequent-Ephidrena (2006) - Dronning.sndh */
+TIMEDB_ENTRY( 1d0c3960, 0, 135, YM), /* 02307 - Tao - Cream - F6 v2 (EIL joke).sndh */
+TIMEDB_ENTRY( 1d0c4127, 0, 12544, YM+TD), /* 02016 - Jochen Hippel - Virtual Escape.sndh */
+TIMEDB_ENTRY( 1d103200, 0, 1, STE), /* 04646 - 505 - Saboteaser.sndh */
+TIMEDB_ENTRY( 1d197f64, 0, 9759, YM), /* 03540 - Allister Brimble - Goal.sndh */
+TIMEDB_ENTRY( 1d23e0db, 0, 41471, YM+TA+TB+TD), /* 02795 - Frequent-Ephidrena - Vrien DMA.sndh */
+TIMEDB_ENTRY( 1d30a779, 0, 7946, YM), /* 00746 - Sean Conran - Videokid.sndh */
+TIMEDB_ENTRY( 1d30a779, 1, 2331, YM), /* 00746 - Sean Conran - Videokid.sndh */
+TIMEDB_ENTRY( 1d30a779, 2, 298, YM), /* 00746 - Sean Conran - Videokid.sndh */
+TIMEDB_ENTRY( 1d410b20, 0, 8320, YM), /* 00448 - Augustin Vidovic - Human Race 4.sndh */
+TIMEDB_ENTRY( 1d4f7ec7, 0, 45116, YM+TA), /* 03765 - Waldemar Belwon - Big Bang (Music Show 1).sndh */
+TIMEDB_ENTRY( 1d6617bb, 0, 5375, YM), /* 02968 - Unknown - Super Space Invaders.sndh */
+TIMEDB_ENTRY( 1d6617bb, 1, 640, YM), /* 02968 - Unknown - Super Space Invaders.sndh */
+TIMEDB_ENTRY( 1d6617bb, 2, 1280, YM), /* 02968 - Unknown - Super Space Invaders.sndh */
+TIMEDB_ENTRY( 1d6617bb, 3, 767, YM), /* 02968 - Unknown - Super Space Invaders.sndh */
+TIMEDB_ENTRY( 1d6c637b, 0, 6906, YM+TA+TB+TD), /* 00904 - Danny Oneway - In Door.sndh */
+TIMEDB_ENTRY( 1d6ca6e5, 0, 6914, YM), /* 00244 - AN Cool - M-Demo 4.sndh */
+TIMEDB_ENTRY( 1d804ac2, 0, 131669, YM+TA), /* 04025 - Roggie - Dreams.sndh */
+TIMEDB_ENTRY( 1d82271c, 0, 9174, YM+TA), /* 01843 - Lotek Style - tSCc^ Vinyl Kartell ( 2003 ) - Dancing T-Girl (YM Rockerz).sndh */
+TIMEDB_ENTRY( 1d8e7887, 0, 14209, YM+TA+TD), /* 02339 - Tao - Cream - 13 (UCM 13).sndh */
+TIMEDB_ENTRY( 1d8e7bfb, 0, 3168, YM), /* 02371 - Nexus 6 - Daniela's Arsch.sndh */
+TIMEDB_ENTRY( 1d93ed13, 0, 5376, YM+TA), /* 04593 - Crawdaddy - The Joker.sndh */
+TIMEDB_ENTRY( 1d9e9891, 0, 6528, YM), /* 04399 - Anthony Lees - Fireball.sndh */
+TIMEDB_ENTRY( 1d9e9891, 1, 288, YM), /* 04399 - Anthony Lees - Fireball.sndh */
+TIMEDB_ENTRY( 1d9e9891, 2, 768, YM), /* 04399 - Anthony Lees - Fireball.sndh */
+TIMEDB_ENTRY( 1d9e9891, 3, 160, YM), /* 04399 - Anthony Lees - Fireball.sndh */
+TIMEDB_ENTRY( 1da2a5d8, 0, 5760, YM), /* 01160 - Tyan - Spin On This Megademo.sndh */
+TIMEDB_ENTRY( 1dc4a1ea, 0, 26112, YM+TA+TB+TD), /* 02530 - Nexus 6 - Tuxtrip.sndh */
+TIMEDB_ENTRY( 1ded33f5, 0, 22393, YM+TA), /* 00582 - Buster - Impact - digi.sndh */
+TIMEDB_ENTRY( 1df411ca, 0, 8640, YM), /* 02742 - Unknown Composer - International Karate.sndh */
+TIMEDB_ENTRY( 1e1016d5, 0, 3839, YM+TA+TB+TD), /* 03390 - Dubmood - Dbug^Razor1911 - Daddy Freddy - Bring Your Own Bottle.sndh */
+TIMEDB_ENTRY( 1e1d7a1c, 0, 13033, YM), /* 03041 - Ed Bogas - Brandenburg Concerto 2 by Bach.sndh */
+TIMEDB_ENTRY( 1e1f129e, 0, 4863, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e1f129e, 1, 1593, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e1f129e, 2, 1610, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e1f129e, 3, 2788, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e1f129e, 4, 1689, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e1f129e, 5, 1474, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e1f129e, 6, 778, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e1f129e, 7, 803, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e1f129e, 8, 779, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e1f129e, 9, 559, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e1f129e, 10, 2635, YM), /* 01804 - Barry Leitch - The Shoe People.sndh */
+TIMEDB_ENTRY( 1e30fa3f, 0, 6136, YM), /* 02936 - Matt Furniss - Ultima VI.sndh */
+TIMEDB_ENTRY( 1e30fa3f, 1, 3064, YM), /* 02936 - Matt Furniss - Ultima VI.sndh */
+TIMEDB_ENTRY( 1e30fa3f, 2, 1565, YM), /* 02936 - Matt Furniss - Ultima VI.sndh */
+TIMEDB_ENTRY( 1e30fa3f, 3, 3064, YM), /* 02936 - Matt Furniss - Ultima VI.sndh */
+TIMEDB_ENTRY( 1e30fa3f, 4, 2044, YM), /* 02936 - Matt Furniss - Ultima VI.sndh */
+TIMEDB_ENTRY( 1e30fa3f, 5, 1528, YM), /* 02936 - Matt Furniss - Ultima VI.sndh */
+TIMEDB_ENTRY( 1e30fa3f, 6, 2302, YM), /* 02936 - Matt Furniss - Ultima VI.sndh */
+TIMEDB_ENTRY( 1e30fa3f, 7, 1434, YM), /* 02936 - Matt Furniss - Ultima VI.sndh */
+TIMEDB_ENTRY( 1e3a28ce, 0, 4607, YM+TA+TB+TD), /* 02727 - maktone-fairlight - hero.sndh */
+TIMEDB_ENTRY( 1e545f59, 0, 6915, YM), /* 02228 - Tao - Dots Revenge (Nostalgic-O-Demo).sndh */
+TIMEDB_ENTRY( 1e5bd747, 0, 9726, YM), /* 02737 - Gary Wheaton - Trotsky Crazy.sndh */
+TIMEDB_ENTRY( 1e5c095b, 0, 1036, YM), /* 00465 - Augustin Vidovic - Troudbal.sndh */
+TIMEDB_ENTRY( 1e626998, 0, 1942, YM), /* 02124 - Mad Max - Cuddly Demos - No Name.sndh */
+TIMEDB_ENTRY( 1e62974f, 0, 3065, YM), /* 04615 - Al Lowe - Leisure Suit Larry - Lounge Lizards.sndh */
+TIMEDB_ENTRY( 1e62974f, 1, 683, YM), /* 04615 - Al Lowe - Leisure Suit Larry - Lounge Lizards.sndh */
+TIMEDB_ENTRY( 1e62974f, 2, 381, YM), /* 04615 - Al Lowe - Leisure Suit Larry - Lounge Lizards.sndh */
+TIMEDB_ENTRY( 1e62974f, 3, 2665, YM), /* 04615 - Al Lowe - Leisure Suit Larry - Lounge Lizards.sndh */
+TIMEDB_ENTRY( 1e62974f, 4, 1943, YM), /* 04615 - Al Lowe - Leisure Suit Larry - Lounge Lizards.sndh */
+TIMEDB_ENTRY( 1e62974f, 5, 457, YM), /* 04615 - Al Lowe - Leisure Suit Larry - Lounge Lizards.sndh */
+TIMEDB_ENTRY( 1e62974f, 6, 3059, YM), /* 04615 - Al Lowe - Leisure Suit Larry - Lounge Lizards.sndh */
+TIMEDB_ENTRY( 1e62974f, 7, 1420, YM), /* 04615 - Al Lowe - Leisure Suit Larry - Lounge Lizards.sndh */
+TIMEDB_ENTRY( 1e6a3f09, 0, 4027, YM), /* 03108 - Unknown - ST. ELSEWHERE by Dave Grusin.sndh */
+TIMEDB_ENTRY( 1e736ec8, 0, 7424, YM), /* 04350 - YERZMYEY-AY-RIDERS - OUT OF THE MIST.sndh */
+TIMEDB_ENTRY( 1e841691, 0, 39807, YM+TA+TB+TD), /* 03332 - Marcer - cpu slider preview.sndh */
+TIMEDB_ENTRY( 1e8d2599, 0, 61750, YM+TA), /* 04356 - X The Beermat - Drag.sndh */
+TIMEDB_ENTRY( 1ea83810, 0, 21504, YM+TA), /* 00772 - Count Zero - Decade Demo - Wheres My Willy.sndh */
+TIMEDB_ENTRY( 1ee3509a, 0, 12537, YM+TA), /* 01684 - Jess - Let ze Djoard Bells Ring.sndh */
+TIMEDB_ENTRY( 1ef00b04, 0, 7679, YM), /* 04649 - ActoDi - Friday.sndh */
+TIMEDB_ENTRY( 1efb7a03, 0, 5530, YM), /* 01237 - Epic - Shoot All Coders.sndh */
+TIMEDB_ENTRY( 1efba80a, 0, 2304, YM), /* 00750 - Mark Cooksey - Crack Down.sndh */
+TIMEDB_ENTRY( 1efba80a, 1, 512, YM), /* 00750 - Mark Cooksey - Crack Down.sndh */
+TIMEDB_ENTRY( 1efba80a, 2, 2208, YM), /* 00750 - Mark Cooksey - Crack Down.sndh */
+TIMEDB_ENTRY( 1efba80a, 3, 2816, YM), /* 00750 - Mark Cooksey - Crack Down.sndh */
+TIMEDB_ENTRY( 1efba80a, 4, 3584, YM), /* 00750 - Mark Cooksey - Crack Down.sndh */
+TIMEDB_ENTRY( 1efba80a, 5, 2015, YM), /* 00750 - Mark Cooksey - Crack Down.sndh */
+TIMEDB_ENTRY( 1efba80a, 6, 1536, YM), /* 00750 - Mark Cooksey - Crack Down.sndh */
+TIMEDB_ENTRY( 1efba80a, 7, 223, YM), /* 00750 - Mark Cooksey - Crack Down.sndh */
+TIMEDB_ENTRY( 1efba80a, 8, 192, YM), /* 00750 - Mark Cooksey - Crack Down.sndh */
+TIMEDB_ENTRY( 1efc3b9f, 0, 8453, YM+TA+TB), /* 03416 - gwEm - PHF - Good Old Fashioned Blipp Blopper!.sndh */
+TIMEDB_ENTRY( 1f08883c, 0, 5376, YM), /* 02186 - Mad Max - Pro Tennis Tour 2.sndh */
+TIMEDB_ENTRY( 1f11f49d, 0, 3840, YM), /* 00747 - Sean Conran - Wacky Races.sndh */
+TIMEDB_ENTRY( 1f221540, 0, 9600, YM), /* 00785 - Crawdaddy - Heroes.sndh */
+TIMEDB_ENTRY( 1f27f7d4, 0, 2304, YM+TA+TB), /* 03412 - Dma-Sc - mazemenu.sndh */
+TIMEDB_ENTRY( 1f2fa7c6, 0, 1789, YM), /* 02475 - Iso - People Let Go.sndh */
+TIMEDB_ENTRY( 1f36681d, 0, 43520, YM+TD), /* 04860 - xFalcon - Christian Bunge - HAPPY CHIP.sndh */
+TIMEDB_ENTRY( 1f3bf399, 0, 4415, YM+TA+TB+TD), /* 03667 - Starbuck - exercise wheel.sndh */
+TIMEDB_ENTRY( 1f674ed8, 0, 7868, YM), /* 00159 - David Whittaker - Xenon 2.sndh */
+TIMEDB_ENTRY( 1f739f4e, 0, 7874, YM), /* 00369 - Steve Barrett - Violator.sndh */
+TIMEDB_ENTRY( 1f739f4e, 1, 218, YM), /* 00369 - Steve Barrett - Violator.sndh */
+TIMEDB_ENTRY( 1f739f4e, 2, 290, YM), /* 00369 - Steve Barrett - Violator.sndh */
+TIMEDB_ENTRY( 1f7a187f, 0, 13536, YM), /* 00775 - Count Zero - Lost Boys Disk Maggie 2.sndh */
+TIMEDB_ENTRY( 1f82847a, 0, 4368, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1f82847a, 1, 7393, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1f82847a, 2, 1296, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1f82847a, 3, 1536, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1f82847a, 4, 2784, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1f82847a, 5, 1152, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1f82847a, 6, 1120, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1f82847a, 7, 6924, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1f82847a, 8, 10368, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1f82847a, 9, 864, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1f82847a, 10, 5623, YM), /* 01513 - Chris Huelsbeck - Jim Power in Mutant Planet.sndh */
+TIMEDB_ENTRY( 1fa548f5, 0, 5370, YM+TB+TD), /* 02426 - 505-cpt^dox - smiley.sndh */
+TIMEDB_ENTRY( 1fbe7d94, 0, 11829, YM), /* 02245 - Tao - Cream (orig. Rob Hubbard) - Spellbound (Stmygm).sndh */
+TIMEDB_ENTRY( 1fcdf58d, 0, 9656, YM), /* 00422 - Big Alec - PYM - Change Disks.sndh */
+TIMEDB_ENTRY( 1ffc4cc1, 0, 4096, YM), /* 01300 - Matt Furniss - Jahanghir Khan's Squash.sndh */
+TIMEDB_ENTRY( 1ffc4cc1, 1, 5632, YM), /* 01300 - Matt Furniss - Jahanghir Khan's Squash.sndh */
+TIMEDB_ENTRY( 1ffc4cc1, 2, 197, YM), /* 01300 - Matt Furniss - Jahanghir Khan's Squash.sndh */
+TIMEDB_ENTRY( 1ffc4cc1, 3, 197, YM), /* 01300 - Matt Furniss - Jahanghir Khan's Squash.sndh */
+TIMEDB_ENTRY( 1fff055f, 0, 1919, YM), /* 01917 - Jon Medek - Hard Nova.sndh */
+TIMEDB_ENTRY( 202606bd, 0, 2930, YM), /* 00741 - Sean Conran - Defenders of the Earth.sndh */
+TIMEDB_ENTRY( 202606bd, 1, 541, YM), /* 00741 - Sean Conran - Defenders of the Earth.sndh */
+TIMEDB_ENTRY( 202606bd, 2, 543, YM), /* 00741 - Sean Conran - Defenders of the Earth.sndh */
+TIMEDB_ENTRY( 202606bd, 3, 3540, YM), /* 00741 - Sean Conran - Defenders of the Earth.sndh */
+TIMEDB_ENTRY( 20407076, 0, 9109, YM+TA+TB+TD), /* 03585 - Divag - Mental Fury.sndh */
+TIMEDB_ENTRY( 204dfdd6, 0, 3918, YM), /* 01288 - Matt Furniss - AV8B Harrier.sndh */
+TIMEDB_ENTRY( 2057279c, 0, 9863, YM+TA), /* 02329 - Tao - Cream - Ride The Sky (Digidrum-version).sndh */
+TIMEDB_ENTRY( 205a2964, 0, 2834, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 1, 2633, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 2, 1755, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 3, 1536, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 4, 5266, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 5, 877, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 6, 1462, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 7, 877, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 8, 1462, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 9, 1616, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 10, 728, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 205a2964, 11, 1389, YM), /* 00083 - David Whittaker - Chips Challenge.sndh */
+TIMEDB_ENTRY( 20663a2a, 0, 1538, YM), /* 00417 - Big Alec - Offbeat.sndh */
+TIMEDB_ENTRY( 206a8bf9, 0, 12931, YM), /* 00333 - Gary Wheaton - Boom.sndh */
+TIMEDB_ENTRY( 20a6777b, 0, 5621, YM), /* 01733 - Jookie - Xmas Intro.sndh */
+TIMEDB_ENTRY( 20b4380c, 0, 4521, YM), /* 03059 - Ed Bogas - Kyrie eleison-Mozart's REQUIEM.sndh */
+TIMEDB_ENTRY( 20be5296, 0, 5151, YM+TA+TB+TD), /* 04243 - 505-Checkpoint (2000) - banga.sndh */
+TIMEDB_ENTRY( 20d12ca5, 0, 42411, YM), /* 01686 - Jess - See ya Again on Falcon.sndh */
+TIMEDB_ENTRY( 20e00d95, 0, 4613, YM), /* 02449 - David Whittaker - Solomons Key.sndh */
+TIMEDB_ENTRY( 20e00d95, 1, 3749, YM), /* 02449 - David Whittaker - Solomons Key.sndh */
+TIMEDB_ENTRY( 20f1e35b, 0, 12662, YM), /* 03409 - Allister Brimble - Sword and the Rose.sndh */
+TIMEDB_ENTRY( 20f1e35b, 1, 272, YM), /* 03409 - Allister Brimble - Sword and the Rose.sndh */
+TIMEDB_ENTRY( 20f1e35b, 2, 342, YM), /* 03409 - Allister Brimble - Sword and the Rose.sndh */
+TIMEDB_ENTRY( 20f1e35b, 3, 1350, YM), /* 03409 - Allister Brimble - Sword and the Rose.sndh */
+TIMEDB_ENTRY( 211433b8, 0, 45604, YM+TA), /* 04355 - X The Beermat - Deal.sndh */
+TIMEDB_ENTRY( 2116eca1, 0, 26400, YM), /* 01479 - STU - TOURIYANSE.sndh */
+TIMEDB_ENTRY( 21333683, 0, 7536, YM+TA), /* 00814 - Crawdaddy - Gods Theme.sndh */
+TIMEDB_ENTRY( 213d81b7, 0, 4935, YM+TA), /* 01933 - Miq - Hotliner v2.sndh */
+TIMEDB_ENTRY( 214604ea, 0, 8648, YM+TA+TB+TD), /* 03474 - gwEm - Different World (dub mix).sndh */
+TIMEDB_ENTRY( 2146cdf1, 0, 4218, YM), /* 02880 - Beast - Snabblat.sndh */
+TIMEDB_ENTRY( 21498355, 0, 6399, YM), /* 02445 - Tony Williams - Edd the Duck!.sndh */
+TIMEDB_ENTRY( 21498355, 1, 359, YM), /* 02445 - Tony Williams - Edd the Duck!.sndh */
+TIMEDB_ENTRY( 21498355, 2, 72, YM), /* 02445 - Tony Williams - Edd the Duck!.sndh */
+TIMEDB_ENTRY( 21498355, 3, 192, YM), /* 02445 - Tony Williams - Edd the Duck!.sndh */
+TIMEDB_ENTRY( 21498355, 4, 128, YM), /* 02445 - Tony Williams - Edd the Duck!.sndh */
+TIMEDB_ENTRY( 21498355, 5, 576, YM), /* 02445 - Tony Williams - Edd the Duck!.sndh */
+TIMEDB_ENTRY( 21498355, 6, 448, YM), /* 02445 - Tony Williams - Edd the Duck!.sndh */
+TIMEDB_ENTRY( 21498355, 7, 5245, YM), /* 02445 - Tony Williams - Edd the Duck!.sndh */
+TIMEDB_ENTRY( 21498355, 8, 4405, YM), /* 02445 - Tony Williams - Edd the Duck!.sndh */
+TIMEDB_ENTRY( 2154f975, 0, 3839, YM), /* 03532 - Jean Baudlot - Castle Warrior.sndh */
+TIMEDB_ENTRY( 21588958, 0, 8256, YM), /* 01083 - Techno - X-Show 1 - Intro.sndh */
+TIMEDB_ENTRY( 216b8a9a, 0, 4992, YM), /* 01175 - Sally - Sally 1.sndh */
+TIMEDB_ENTRY( 216ba57f, 0, 20352, YM), /* 02876 - Agrajag - 3.5k Megademo Menu.sndh */
+TIMEDB_ENTRY( 218084c3, 0, 6339, YM+TA), /* 04586 - Technoblip - Pure Energy 3.sndh */
+TIMEDB_ENTRY( 21c43e70, 0, 3072, YM), /* 01496 - Alex Herbert - Delta.sndh */
+TIMEDB_ENTRY( 21d10358, 0, 55934, YM+TA), /* 04808 - Unknown - Oh Yeah.sndh */
+TIMEDB_ENTRY( 21d994de, 0, 6850, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 1, 480, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 2, 28, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 3, 961, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 4, 801, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 5, 1240, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 6, 777, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 7, 612, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 8, 763, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 9, 632, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 10, 961, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 11, 960, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21d994de, 12, 480, YM), /* 00107 - David Whittaker - Grimblood.sndh */
+TIMEDB_ENTRY( 21f4ea3f, 0, 3066, YM+TA), /* 02410 - Miq - Exited.sndh */
+TIMEDB_ENTRY( 21fb3379, 0, 8945, YM), /* 03509 - Unknown - Indiana Jones & Temple of Doom.sndh */
+TIMEDB_ENTRY( 2205b629, 0, 5688, YM), /* 01406 - Skyline - Snork Intro - Main Theme.sndh */
+TIMEDB_ENTRY( 22269ec8, 0, 6656, YM+TA), /* 00266 - Antichrist - The Mystery.sndh */
+TIMEDB_ENTRY( 2247e8b8, 0, 84033, YM+TA), /* 03814 - David Whittaker - Loopz.sndh */
+TIMEDB_ENTRY( 2247e8b8, 1, 71458, YM+TA), /* 03814 - David Whittaker - Loopz.sndh */
+TIMEDB_ENTRY( 2247e8b8, 2, 320, YM+TA), /* 03814 - David Whittaker - Loopz.sndh */
+TIMEDB_ENTRY( 2247e8b8, 3, 325, YM+TA), /* 03814 - David Whittaker - Loopz.sndh */
+TIMEDB_ENTRY( 2247e8b8, 4, 280, YM+TA), /* 03814 - David Whittaker - Loopz.sndh */
+TIMEDB_ENTRY( 2247e8b8, 5, 355, YM+TA), /* 03814 - David Whittaker - Loopz.sndh */
+TIMEDB_ENTRY( 2247e8b8, 6, 1457, YM+TA), /* 03814 - David Whittaker - Loopz.sndh */
+TIMEDB_ENTRY( 2247e8b8, 7, 211995, YM+TA), /* 03814 - David Whittaker - Loopz.sndh */
+TIMEDB_ENTRY( 2247e8b8, 8, 31305, YM+TA), /* 03814 - David Whittaker - Loopz.sndh */
+TIMEDB_ENTRY( 2250063a, 0, 5435, YM+TA+TB+TD), /* 03224 - 505-checkpoint - Warmup (Black Sheep PHF).sndh */
+TIMEDB_ENTRY( 2251acfe, 0, 13818, YM+TA+TB+TD), /* 01005 - DMA-SC - Odd Stuff end music.sndh */
+TIMEDB_ENTRY( 225519c5, 0, 5760, YM+TA+TD), /* 02327 - Tao - Cream - MV Jeu - Title (Steps).sndh */
+TIMEDB_ENTRY( 22564cc6, 0, 5374, YM), /* 03199 - Martin Iveson - Arcade Classix - Centipede.sndh */
+TIMEDB_ENTRY( 2271789a, 1, 6144, YM), /* 03273 - Haiko Ruttman - Twinworld.sndh */
+TIMEDB_ENTRY( 2271789a, 2, 3840, YM), /* 03273 - Haiko Ruttman - Twinworld.sndh */
+TIMEDB_ENTRY( 2271789a, 3, 3072, YM), /* 03273 - Haiko Ruttman - Twinworld.sndh */
+TIMEDB_ENTRY( 2271789a, 4, 3507, YM), /* 03273 - Haiko Ruttman - Twinworld.sndh */
+TIMEDB_ENTRY( 227a9880, 0, 14202, YM+TA), /* 01707 - Jess - Run for your Life.sndh */
+TIMEDB_ENTRY( 2289e38c, 0, 177228, YM+TA), /* 04805 - Unknown - House.sndh */
+TIMEDB_ENTRY( 22a66a81, 0, 5233, YM), /* 03174 - n-a - Studio Music by Davidow.sndh */
+TIMEDB_ENTRY( 22bd0555, 0, 2194, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 1, 3680, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 2, 6582, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 3, 4608, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 4, 1600, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 5, 2560, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 6, 2590, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 7, 337, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 8, 150, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 9, 39, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 10, 36, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 11, 52, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 12, 41, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 13, 6, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 14, 153, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 15, 12, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 16, 4, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 17, 62, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 18, 27, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 19, 78, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22bd0555, 20, 12045, YM), /* 01922 - The Mind - Dizzy Panic.sndh */
+TIMEDB_ENTRY( 22d51000, 0, 36, YM), /* 04539 - Darren Ithell - Fun school 3 - over 7 years - Word search.sndh */
+TIMEDB_ENTRY( 22d51000, 1, 33, YM), /* 04539 - Darren Ithell - Fun school 3 - over 7 years - Word search.sndh */
+TIMEDB_ENTRY( 22d51000, 2, 51, YM), /* 04539 - Darren Ithell - Fun school 3 - over 7 years - Word search.sndh */
+TIMEDB_ENTRY( 22d51000, 3, 134, YM), /* 04539 - Darren Ithell - Fun school 3 - over 7 years - Word search.sndh */
+TIMEDB_ENTRY( 22e34b5d, 0, 2879, YM+TA+TB), /* 02701 - dubmood - Pampinterlude.sndh */
+TIMEDB_ENTRY( 22f07182, 0, 20112, YM), /* 01923 - The Mind - Freddy's Revenge ST News 7.1.sndh */
+TIMEDB_ENTRY( 22f2739a, 0, 3337, YM+TA+TD), /* 00194 - 505 - Sure Trip 3.sndh */
+TIMEDB_ENTRY( 22ff41b3, 0, 5681, YM), /* 00133 - David Whittaker - Skateball.sndh */
+TIMEDB_ENTRY( 22ff41b3, 1, 6144, YM), /* 00133 - David Whittaker - Skateball.sndh */
+TIMEDB_ENTRY( 22ff41b3, 2, 96, YM), /* 00133 - David Whittaker - Skateball.sndh */
+TIMEDB_ENTRY( 22ff41b3, 3, 63, YM), /* 00133 - David Whittaker - Skateball.sndh */
+TIMEDB_ENTRY( 22ff41b3, 4, 96, YM), /* 00133 - David Whittaker - Skateball.sndh */
+TIMEDB_ENTRY( 22ff41b3, 5, 6144, YM), /* 00133 - David Whittaker - Skateball.sndh */
+TIMEDB_ENTRY( 22ff41b3, 6, 283, YM), /* 00133 - David Whittaker - Skateball.sndh */
+TIMEDB_ENTRY( 22ff41b3, 7, 276, YM), /* 00133 - David Whittaker - Skateball.sndh */
+TIMEDB_ENTRY( 22ff41b3, 8, 102, YM), /* 00133 - David Whittaker - Skateball.sndh */
+TIMEDB_ENTRY( 230fae5c, 0, 101399, YM+TA), /* 03719 - Spaz - Ooh Crikey - Chainsaw Massacre.sndh */
+TIMEDB_ENTRY( 23160599, 0, 5745, YM+TA+TD), /* 04325 - 505-checkpoint - 15kb one.sndh */
+TIMEDB_ENTRY( 231b829d, 0, 7168, YM), /* 03694 - Rhino - Sundown 2012.sndh */
+TIMEDB_ENTRY( 23227fc4, 0, 3064, YM+TA), /* 01354 - Scavenger - Only the Lonely.sndh */
+TIMEDB_ENTRY( 23391902, 0, 6920, YM+TA), /* 04012 - Mad Max - Jinks.sndh */
+TIMEDB_ENTRY( 23498535, 0, 5839, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 1, 3459, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 2, 2307, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 3, 148, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 4, 118, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 5, 87, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 6, 456, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 7, 388, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 8, 164, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 9, 329, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 10, 181, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 11, 248, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 12, 390, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 13, 283, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 14, 217, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 15, 332, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 23498535, 16, 1767, YM), /* 01799 - Barry Leitch - Microprose Soccer.sndh */
+TIMEDB_ENTRY( 235a66f4, 0, 19134, YM), /* 04081 - Gary Wheaton - Medley.sndh */
+TIMEDB_ENTRY( 235a81ec, 0, 2720, YM), /* 01890 - Dave Lowe - Railroad Tycoon.sndh */
+TIMEDB_ENTRY( 235a81ec, 1, 2048, YM), /* 01890 - Dave Lowe - Railroad Tycoon.sndh */
+TIMEDB_ENTRY( 235a81ec, 2, 1536, YM), /* 01890 - Dave Lowe - Railroad Tycoon.sndh */
+TIMEDB_ENTRY( 235a81ec, 3, 640, YM), /* 01890 - Dave Lowe - Railroad Tycoon.sndh */
+TIMEDB_ENTRY( 235a81ec, 4, 960, YM), /* 01890 - Dave Lowe - Railroad Tycoon.sndh */
+TIMEDB_ENTRY( 235a81ec, 5, 1280, YM), /* 01890 - Dave Lowe - Railroad Tycoon.sndh */
+TIMEDB_ENTRY( 236072d7, 0, 6144, YM+TA+TB), /* 00043 - 505 - Checkpoint - MMJ Xmas 03 - 1.sndh */
+TIMEDB_ENTRY( 23642d41, 0, 1505, YM), /* 04139 - Thomas Huth - Fantastic World 2.sndh */
+TIMEDB_ENTRY( 23642d41, 1, 737, YM), /* 04139 - Thomas Huth - Fantastic World 2.sndh */
+TIMEDB_ENTRY( 23642d41, 2, 1288, YM), /* 04139 - Thomas Huth - Fantastic World 2.sndh */
+TIMEDB_ENTRY( 236c66f9, 0, 25761, YM+TA), /* 04756 - Gilles Soulet - Sapiens.sndh */
+TIMEDB_ENTRY( 236c66f9, 1, 17281, YM+TA), /* 04756 - Gilles Soulet - Sapiens.sndh */
+TIMEDB_ENTRY( 236de9cc, 0, 11904, YM), /* 03662 - Jedi - So Lame.sndh */
+TIMEDB_ENTRY( 23ab1ad4, 0, 2559, YM+TA+TB+TD), /* 02798 - Starbuck^Creative Mind - Every beginning is hard.sndh */
+TIMEDB_ENTRY( 23ce900b, 0, 1040, YM), /* 02416 - Nexus 6 - X-X-X-X-X.sndh */
+TIMEDB_ENTRY( 23dca986, 0, 208901, YM+TA), /* 03742 - Tufty - Don't Break My Heart (UB40).sndh */
+TIMEDB_ENTRY( 23ec9f6a, 0, 6144, YM), /* 03401 - Wally Beben - Time Machine.sndh */
+TIMEDB_ENTRY( 23ec9f6a, 1, 10240, YM), /* 03401 - Wally Beben - Time Machine.sndh */
+TIMEDB_ENTRY( 23f0d816, 0, 2304, YM+TA), /* 04294 - 505 - noix000f.sndh */
+TIMEDB_ENTRY( 23f2706b, 0, 39767, YM+TA), /* 03945 - Unknown - LT Fuge 2.sndh */
+TIMEDB_ENTRY( 23f2a11c, 0, 5178, YM), /* 01236 - Epic - Sauvage.sndh */
+TIMEDB_ENTRY( 23fd2a3d, 0, 4986, YM+TA+TB+TD), /* 02453 - Timbral - DHS - Sanna suck my nectar.sndh */
+TIMEDB_ENTRY( 240fa524, 0, 6144, YM), /* 01134 - Tyan - Revolution - In Game.sndh */
+TIMEDB_ENTRY( 241ff404, 0, 5188, YM+TA+TD), /* 02322 - Tao - Cream (orig. Klaus Ude) - Magic Marble ingame 1.sndh */
+TIMEDB_ENTRY( 24231b4c, 0, 7676, YM), /* 00551 - Allister Brimble - The Final Day.sndh */
+TIMEDB_ENTRY( 24231b4c, 1, 7996, YM), /* 00551 - Allister Brimble - The Final Day.sndh */
+TIMEDB_ENTRY( 24231b4c, 2, 763, YM), /* 00551 - Allister Brimble - The Final Day.sndh */
+TIMEDB_ENTRY( 2432f6ea, 0, 44351, YM+TA+TB), /* 01355 - Scavenger - Pajaro - Synergy Megademo.sndh */
+TIMEDB_ENTRY( 243525cc, 0, 16000, YM), /* 00614 - Chrispy Noodle - Jet Set Willy.sndh */
+TIMEDB_ENTRY( 24393c14, 0, 19200, YM), /* 01652 - Jedi - NMM.sndh */
+TIMEDB_ENTRY( 24447c00, 0, 10362, YM+TD), /* 04786 - Intruder - Intruder 2.sndh */
+TIMEDB_ENTRY( 2451ae16, 0, 13061, YM), /* 02278 - Tao - Cream - Ice Age (Just Buggin).sndh */
+TIMEDB_ENTRY( 245a43c9, 0, 10800, YM+TA+TB+TD), /* 02081 - Mad Max - Hunyer Patrol - Sid.sndh */
+TIMEDB_ENTRY( 246f817c, 0, 2527, YM), /* 03178 - Unknown - Two Part Invention #13 by Bach.sndh */
+TIMEDB_ENTRY( 2471027f, 0, 1070, YM), /* 04720 - Peter Hickman - Treasure Search.sndh */
+TIMEDB_ENTRY( 24c48017, 0, 21755, YM), /* 02240 - Tao - Cream (orig. Rob Hubbard) - Lightforce (Stmygm).sndh */
+TIMEDB_ENTRY( 24d7f769, 0, 2957, YM), /* 03160 - Unknown - Santa Claus is comin' to town!.sndh */
+TIMEDB_ENTRY( 24dce34b, 0, 2690, YM), /* 00436 - Big Alec - What Time is It? (Scrolly).sndh */
+TIMEDB_ENTRY( 24de3165, 0, 1016, YM+TA), /* 02619 - STU - SPOOKY.sndh */
+TIMEDB_ENTRY( 24eaf9b6, 0, 2324, YM+TA), /* 01332 - Scavenger - Gangstar.sndh */
+TIMEDB_ENTRY( 24eb3117, 0, 9367, YM+TA+TB+TD), /* 03584 - Divag - Technorobotic.sndh */
+TIMEDB_ENTRY( 24eb9818, 0, 1543, YM), /* 03919 - Unknown - Holland.sndh */
+TIMEDB_ENTRY( 24f4ec97, 0, 752, YM), /* 02960 - Unknown - Countout.sndh */
+TIMEDB_ENTRY( 24f4ec97, 1, 872, YM), /* 02960 - Unknown - Countout.sndh */
+TIMEDB_ENTRY( 24f4ec97, 2, 864, YM), /* 02960 - Unknown - Countout.sndh */
+TIMEDB_ENTRY( 24f4ec97, 3, 940, YM), /* 02960 - Unknown - Countout.sndh */
+TIMEDB_ENTRY( 24f4ec97, 4, 512, YM), /* 02960 - Unknown - Countout.sndh */
+TIMEDB_ENTRY( 24f4ec97, 5, 366, YM), /* 02960 - Unknown - Countout.sndh */
+TIMEDB_ENTRY( 24f4ec97, 6, 64, YM), /* 02960 - Unknown - Countout.sndh */
+TIMEDB_ENTRY( 24f4ec97, 7, 149, YM), /* 02960 - Unknown - Countout.sndh */
+TIMEDB_ENTRY( 24f4ec97, 8, 1600, YM), /* 02960 - Unknown - Countout.sndh */
+TIMEDB_ENTRY( 25191609, 0, 23456, YM), /* 01510 - Rob Hubbard - Warhawk.sndh */
+TIMEDB_ENTRY( 2521bedd, 0, 3580, YM+TA), /* 04296 - 505 - Painsid.sndh */
+TIMEDB_ENTRY( 25304018, 0, 37120, YM), /* 02689 - Philip Linde - breakbeat.sndh */
+TIMEDB_ENTRY( 2531e907, 0, 6652, YM+TA+TB+TD), /* 00280 - Baggio & Aio - Spritze.sndh */
+TIMEDB_ENTRY( 2544e432, 0, 9096, YM+TA+TB+TD), /* 02973 - 505-paradox - shredder (STE only).sndh */
+TIMEDB_ENTRY( 255ae2f1, 0, 1792, YM), /* 01402 - Skyline - Snork Intro - Cuddly.sndh */
+TIMEDB_ENTRY( 257ad548, 0, 10993, YM), /* 03148 - Unknown - He Played Real Good For Free.sndh */
+TIMEDB_ENTRY( 258b6b9f, 0, 7678, YM), /* 01323 - Matt Furniss - Torvak The Warrior.sndh */
+TIMEDB_ENTRY( 258b6b9f, 1, 4699, YM), /* 01323 - Matt Furniss - Torvak The Warrior.sndh */
+TIMEDB_ENTRY( 258b6b9f, 2, 5566, YM), /* 01323 - Matt Furniss - Torvak The Warrior.sndh */
+TIMEDB_ENTRY( 258b6b9f, 3, 3886, YM), /* 01323 - Matt Furniss - Torvak The Warrior.sndh */
+TIMEDB_ENTRY( 258b6b9f, 4, 2880, YM), /* 01323 - Matt Furniss - Torvak The Warrior.sndh */
+TIMEDB_ENTRY( 258b6b9f, 5, 2302, YM), /* 01323 - Matt Furniss - Torvak The Warrior.sndh */
+TIMEDB_ENTRY( 258b6b9f, 6, 304, YM), /* 01323 - Matt Furniss - Torvak The Warrior.sndh */
+TIMEDB_ENTRY( 258b6b9f, 7, 319, YM), /* 01323 - Matt Furniss - Torvak The Warrior.sndh */
+TIMEDB_ENTRY( 258b6b9f, 8, 2864, YM), /* 01323 - Matt Furniss - Torvak The Warrior.sndh */
+TIMEDB_ENTRY( 258c9925, 0, 1536, YM), /* 03251 - T1000 - The Bits Club 27.sndh */
+TIMEDB_ENTRY( 25b4b8f3, 0, 620, YM), /* 03971 - Geoff Camp - Maths X.sndh */
+TIMEDB_ENTRY( 25b4b8f3, 1, 553, YM), /* 03971 - Geoff Camp - Maths X.sndh */
+TIMEDB_ENTRY( 25b4b8f3, 2, 207, YM), /* 03971 - Geoff Camp - Maths X.sndh */
+TIMEDB_ENTRY( 25b4b8f3, 3, 2708, YM), /* 03971 - Geoff Camp - Maths X.sndh */
+TIMEDB_ENTRY( 25b4b8f3, 4, 1560, YM), /* 03971 - Geoff Camp - Maths X.sndh */
+TIMEDB_ENTRY( 25b95675, 0, 5376, YM), /* 00806 - Crawdaddy - Plazma.sndh */
+TIMEDB_ENTRY( 25d9e06e, 0, 144, YM), /* 00164 - Martin Walker - Devious Designs.sndh */
+TIMEDB_ENTRY( 25d9e06e, 1, 385, YM), /* 00164 - Martin Walker - Devious Designs.sndh */
+TIMEDB_ENTRY( 25d9e06e, 2, 1312, YM), /* 00164 - Martin Walker - Devious Designs.sndh */
+TIMEDB_ENTRY( 25d9e06e, 3, 127, YM), /* 00164 - Martin Walker - Devious Designs.sndh */
+TIMEDB_ENTRY( 25d9e06e, 4, 159, YM), /* 00164 - Martin Walker - Devious Designs.sndh */
+TIMEDB_ENTRY( 25df222e, 0, 4662, YM+TD), /* 03422 - Dubmood - Tempest - Acidjazzed Evenings (D-Bug).sndh */
+TIMEDB_ENTRY( 25f635b6, 0, 1536, YM), /* 02896 - Remalon - Unlimited Cho.sndh */
+TIMEDB_ENTRY( 25ff6850, 0, 3648, YM+TA), /* 00252 - Antichrist - Concours CSC2.sndh */
+TIMEDB_ENTRY( 26020c80, 0, 4864, YM+TA), /* 00796 - Crawdaddy - The Last Cow.sndh */
+TIMEDB_ENTRY( 2611cb55, 0, 3456, YM+TA), /* 00818 - Crawdaddy - in the Woods.sndh */
+TIMEDB_ENTRY( 265194e3, 0, 8450, YM), /* 01051 - Dr Beat - NTM - Zuul.sndh */
+TIMEDB_ENTRY( 2678e222, 0, 14446, YM+TA+TD), /* 02788 - Crazy Q - Phunky Shapeshifter 2149.sndh */
+TIMEDB_ENTRY( 267c058d, 0, 6720, YM), /* 00466 - Augustin Vidovic - What Name.sndh */
+TIMEDB_ENTRY( 26ad342c, 0, 8448, YM), /* 02031 - Mad Max - Formula 1.sndh */
+TIMEDB_ENTRY( 26b9b1ed, 0, 41856, YM), /* 01434 - Stax - DM.sndh */
+TIMEDB_ENTRY( 26bdb013, 0, 8003, YM), /* 01802 - Barry Leitch - Raiden.sndh */
+TIMEDB_ENTRY( 26c406f4, 0, 1896, YM), /* 04733 - Al Lowe - Donald Ducks Playground.sndh */
+TIMEDB_ENTRY( 26c406f4, 1, 1143, YM), /* 04733 - Al Lowe - Donald Ducks Playground.sndh */
+TIMEDB_ENTRY( 26c406f4, 2, 699, YM), /* 04733 - Al Lowe - Donald Ducks Playground.sndh */
+TIMEDB_ENTRY( 26c406f4, 3, 255, YM), /* 04733 - Al Lowe - Donald Ducks Playground.sndh */
+TIMEDB_ENTRY( 270ddc54, 0, 7576, YM+TA+TB+TD), /* 00086 - 505 - Moesrave (Birthtro).sndh */
+TIMEDB_ENTRY( 27199b05, 0, 8449, YM), /* 01037 - Donald Fakk - Hooker.sndh */
+TIMEDB_ENTRY( 271d689b, 0, 10027, YM), /* 01538 - Ralph - Ralph 2.sndh */
+TIMEDB_ENTRY( 272758d6, 0, 2400, YM), /* 01880 - Dave Lowe - Darius.sndh */
+TIMEDB_ENTRY( 272758d6, 1, 1152, YM), /* 01880 - Dave Lowe - Darius.sndh */
+TIMEDB_ENTRY( 272758d6, 2, 1536, YM), /* 01880 - Dave Lowe - Darius.sndh */
+TIMEDB_ENTRY( 2730c06f, 0, 5958, YM), /* 04340 - Nexus 6 - Discover.sndh */
+TIMEDB_ENTRY( 2732cc8e, 0, 11536, YM+TA+TB+TD), /* 02487 - gwEm - Coding on E.sndh */
+TIMEDB_ENTRY( 273e1934, 0, 16352, YM), /* 04452 - Wally Beben - Winter Olympiad 88.sndh */
+TIMEDB_ENTRY( 273e1934, 1, 10240, YM), /* 04452 - Wally Beben - Winter Olympiad 88.sndh */
+TIMEDB_ENTRY( 273e1934, 2, 16384, YM), /* 04452 - Wally Beben - Winter Olympiad 88.sndh */
+TIMEDB_ENTRY( 273e1934, 3, 10752, YM), /* 04452 - Wally Beben - Winter Olympiad 88.sndh */
+TIMEDB_ENTRY( 273e1934, 4, 13824, YM), /* 04452 - Wally Beben - Winter Olympiad 88.sndh */
+TIMEDB_ENTRY( 273e1934, 5, 16384, YM), /* 04452 - Wally Beben - Winter Olympiad 88.sndh */
+TIMEDB_ENTRY( 2740541d, 0, 7680, YM+TA), /* 03902 - Mad Max - Arkanoid (Digidrum Version).sndh */
+TIMEDB_ENTRY( 275088e0, 0, 12672, YM+TA+TB+TD), /* 02104 - Mad Max - Wiz - Sid.sndh */
+TIMEDB_ENTRY( 275088e0, 1, 321, YM+TA+TB+TD), /* 02104 - Mad Max - Wiz - Sid.sndh */
+TIMEDB_ENTRY( 27511953, 0, 5380, YM+TA), /* 01339 - Scavenger - Knuckle Joe.sndh */
+TIMEDB_ENTRY( 275f64e1, 0, 8799, YM), /* 01553 - Rhino - Xmas 2003 Intro - Song 1.sndh */
+TIMEDB_ENTRY( 2769474f, 0, 8844, YM+TA), /* 01755 - Eric Ksouri - Manciola - Melia.sndh */
+TIMEDB_ENTRY( 2774ddce, 0, 1760, YM), /* 01739 - Richard Joseph - Sensible Soccer.sndh */
+TIMEDB_ENTRY( 277aa649, 0, 13887, YM), /* 02385 - Nexus 6 - Nasty Song.sndh */
+TIMEDB_ENTRY( 277aa649, 1, 9295, YM), /* 02385 - Nexus 6 - Nasty Song.sndh */
+TIMEDB_ENTRY( 277bad2e, 0, 3264, YM), /* 02132 - Mad Max - Crazy Comets Game Over - LCD.sndh */
+TIMEDB_ENTRY( 27893784, 0, 28160, YM+TA), /* 03490 - Mad Max - Street Gang.sndh */
+TIMEDB_ENTRY( 279a4e42, 0, 15360, YM+TA), /* 04126 - Tao - The Cave - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 27a2881c, 0, 8450, YM+TA), /* 04420 - EVE - Axel F.sndh */
+TIMEDB_ENTRY( 27a3465f, 0, 2431, YM+TA+TD), /* 04650 - Per Almered-XiA-Checkpoint - Prof E Gadd (NGC cover).sndh */
+TIMEDB_ENTRY( 27a576b2, 0, 12284, YM+TA+TB+TD), /* 01006 - DMA-SC - Odd Stuff Main.sndh */
+TIMEDB_ENTRY( 27b65471, 0, 9982, YM), /* 01269 - Frazer - Reanimators Demo.sndh */
+TIMEDB_ENTRY( 27d180ac, 0, 6240, YM), /* 03478 - gwEm - 4gEtful.sndh */
+TIMEDB_ENTRY( 27e00753, 0, 23289, YM+TA), /* 01711 - Jess - SOS means 'Save Our ST'.sndh */
+TIMEDB_ENTRY( 27e894ec, 0, 8960, YM), /* 03193 - n-a - Stop Start.sndh */
+TIMEDB_ENTRY( 27e9c494, 0, 4608, YM), /* 00265 - Antichrist - Take Off.sndh */
+TIMEDB_ENTRY( 27e9c53f, 0, 3584, YM), /* 02935 - Chris Denman - Seige Master.sndh */
+TIMEDB_ENTRY( 27fb194e, 0, 11712, YM), /* 01433 - Stax - Aciidvsh.sndh */
+TIMEDB_ENTRY( 2805c4a0, 0, 48386, YM+TB+TD), /* 03333 - Marcer - ST KILLS RAMBO.sndh */
+TIMEDB_ENTRY( 28125c34, 0, 7390, YM), /* 03102 - n-a - Children's Corner # 4.sndh */
+TIMEDB_ENTRY( 281bd3c9, 0, 62902, YM+TA), /* 04557 - Simon O - Predator.sndh */
+TIMEDB_ENTRY( 283bce5d, 0, 11648, YM+TA), /* 04122 - Tao - Rise - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 284073f5, 0, 42496, YM+TD), /* 04851 - xFalcon - DEEP THOUGHT.sndh */
+TIMEDB_ENTRY( 28484b7f, 0, 9629, YM+TA+TB+TD), /* 02864 - Marcer - 2149 Final.sndh */
+TIMEDB_ENTRY( 284af8bb, 0, 4207, YM), /* 04083 - Gary Wheaton - Moondance.sndh */
+TIMEDB_ENTRY( 285f472d, 0, 7355, YM+TA+TB+TD), /* 04248 - 505-checkpoint - Brotchen.sndh */
+TIMEDB_ENTRY( 2869cc2e, 0, 3385, YM), /* 04547 - Geoff Camp - Home Worker.sndh */
+TIMEDB_ENTRY( 2869cc2e, 1, 3644, YM), /* 04547 - Geoff Camp - Home Worker.sndh */
+TIMEDB_ENTRY( 28736104, 0, 2708, YM+TA+TB+TD), /* 00233 - AIO - EIL 3 Invite.sndh */
+TIMEDB_ENTRY( 287a3e7b, 0, 4928, YM), /* 02289 - Tao - Cream - 128tros (DHS 128byte megademo).sndh */
+TIMEDB_ENTRY( 288347ca, 0, 7168, YM), /* 00122 - David Whittaker - Pandora.sndh */
+TIMEDB_ENTRY( 288347ca, 1, 3072, YM), /* 00122 - David Whittaker - Pandora.sndh */
+TIMEDB_ENTRY( 288347ca, 2, 1792, YM), /* 00122 - David Whittaker - Pandora.sndh */
+TIMEDB_ENTRY( 288d8df0, 0, 6912, YM+TA), /* 00472 - Viking - Viking - Sugar Fet 2 BBS.sndh */
+TIMEDB_ENTRY( 289c2b6d, 0, 9215, YM+TA), /* 03576 - 505-paradox - Finja.sndh */
+TIMEDB_ENTRY( 28aa3438, 0, 143492, YM+TA), /* 04022 - Roggie - Sonixx.sndh */
+TIMEDB_ENTRY( 28b5acbc, 0, 10003, YM+TA+TB+TD), /* 01836 - Lotek Style - Beams are gonna blind me.sndh */
+TIMEDB_ENTRY( 28d6c601, 0, 9407, YM+TA+TD), /* 03445 - 505-checkpoint^paradox - visual unity (2009).sndh */
+TIMEDB_ENTRY( 28e0642f, 0, 6906, YM), /* 02881 - Beast - Suuuuuvk.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 0, 1633, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 1, 306, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 2, 564, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 3, 1969, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 4, 1335, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 5, 309, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 6, 753, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 7, 475, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 8, 250, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 9, 528, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28e3c7ab, 10, 968, YM), /* 04734 - Al Lowe - Gold Rush.sndh */
+TIMEDB_ENTRY( 28f3887b, 0, 16175, YM+TA), /* 04793 - Mad Max - Bittner Rap.sndh */
+TIMEDB_ENTRY( 28f5a73b, 0, 12415, YM+TA+TD), /* 03455 - ULTRASYD - MERGING PRESENT AND PAST.sndh */
+TIMEDB_ENTRY( 29009716, 0, 16319, YM+TA+TB+TD), /* 04656 - 505 - STNICCC 2015.sndh */
+TIMEDB_ENTRY( 2931e3e3, 0, 9208, YM+TA+TD), /* 01595 - Nemo - Harmless.sndh */
+TIMEDB_ENTRY( 2934ae58, 0, 30788, YM), /* 01800 - Barry Leitch - Pegasus.sndh */
+TIMEDB_ENTRY( 2934ae58, 1, 24443, YM), /* 01800 - Barry Leitch - Pegasus.sndh */
+TIMEDB_ENTRY( 29544553, 0, 20928, YM), /* 04473 - Charles Callet - Turlogh Le Rodeur.sndh */
+TIMEDB_ENTRY( 296cb067, 0, 2301, YM+TA), /* 00199 - 505 - Test.sndh */
+TIMEDB_ENTRY( 2971aaca, 0, 13871, YM+TA+TD), /* 02273 - Tao - Cream - The Powerman (Steps).sndh */
+TIMEDB_ENTRY( 29740494, 0, 5116, YM+TB+TD), /* 01014 - DMA-SC - Samtamagochi - Two In One.sndh */
+TIMEDB_ENTRY( 29773ed0, 0, 15620, YM), /* 00504 - Tangens - Lettrix.sndh */
+TIMEDB_ENTRY( 29880d1b, 0, 3450, YM+TA), /* 04449 - Scavenger - Sambase.sndh */
+TIMEDB_ENTRY( 299daefc, 0, 1947, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 1, 1875, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 2, 1002, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 3, 1425, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 4, 579, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 5, 171, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 6, 1920, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 7, 369, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 8, 735, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 9, 486, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 10, 543, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 11, 591, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 12, 546, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 299daefc, 13, 651, YM), /* 04737 - Al Lowe - Kings Quest 2 - Romancing the Throne.sndh */
+TIMEDB_ENTRY( 29a3c8c7, 0, 1528, YM), /* 00445 - Augustin Vidovic - Extensor.sndh */
+TIMEDB_ENTRY( 29aa3524, 0, 5139, YM+TA), /* 01039 - Donald Fakk - ICS Scum Of The Earth Intro.sndh */
+TIMEDB_ENTRY( 29aae4da, 3, 2518, YM), /* 03531 - Jean Baudlot - Operation Wolf.sndh */
+TIMEDB_ENTRY( 29ae2ac9, 0, 10362, YM+TA), /* 01280 - Frazer - TSC 82.sndh */
+TIMEDB_ENTRY( 29c4c064, 0, 17469, YM), /* 04871 - Jovis - Trash Buzz.sndh */
+TIMEDB_ENTRY( 29d60b02, 0, 8639, YM), /* 04390 - Dma Sc - It's A Girl 2.sndh */
+TIMEDB_ENTRY( 29e93284, 0, 555, YM), /* 02150 - Mad Max - Monty On The Run High - LSD.sndh */
+TIMEDB_ENTRY( 2a00b4a1, 0, 12780, YM+TA), /* 03898 - Skidz - Stone Age Menu.sndh */
+TIMEDB_ENTRY( 2a04bc63, 0, 1505, YM), /* 04512 - Jean-Claude Schopfer - Aventura I The Witch Curse.sndh */
+TIMEDB_ENTRY( 2a13275d, 0, 9215, YM), /* 00310 - Gary Wheaton - Honey Pie.sndh */
+TIMEDB_ENTRY( 2a21698c, 0, 31872, YM+TA+TB+TD), /* 03593 - datavase - n-a.sndh */
+TIMEDB_ENTRY( 2a2ec60d, 0, 12089, YM+TA), /* 04369 - Jess - Zara (Bagpipes Buzz mix by Ben+Jess).sndh */
+TIMEDB_ENTRY( 2a353411, 0, 7103, YM+TA+TB+TD), /* 03268 - Dubmood - Minipitt vs wotw intro 96(goto80 v wotw).sndh */
+TIMEDB_ENTRY( 2a3f66f2, 0, 8505, YM), /* 00848 - Ben Daglish - Deflektor.sndh */
+TIMEDB_ENTRY( 2a405f9e, 0, 2304, YM), /* 04003 - Blue Nun - Misspell.sndh */
+TIMEDB_ENTRY( 2a4be55f, 0, 3072, YM), /* 04594 - T1000 - Bits 59.sndh */
+TIMEDB_ENTRY( 2a6eee16, 0, 6908, YM+TA+TB+TD), /* 01154 - Tyan - Platz 3.sndh */
+TIMEDB_ENTRY( 2a6ffb4f, 0, 42704, YM+TA+TB+TD), /* 02789 - Marcer - The 5th Experiment.sndh */
+TIMEDB_ENTRY( 2a7f3095, 0, 10745, YM+TA+TB+TD), /* 01951 - MSG - Chu Chu Rocket - Team Battle.sndh */
+TIMEDB_ENTRY( 2a914b69, 0, 7681, YM), /* 00387 - Wally Beben - I-Ball 2.sndh */
+TIMEDB_ENTRY( 2ab97245, 0, 1024, YM), /* 04692 - Arnauld Chevallier - Magenta.sndh */
+TIMEDB_ENTRY( 2ab97245, 1, 1024, YM), /* 04692 - Arnauld Chevallier - Magenta.sndh */
+TIMEDB_ENTRY( 2ab97245, 8, 2816, YM), /* 04692 - Arnauld Chevallier - Magenta.sndh */
+TIMEDB_ENTRY( 2ab97245, 9, 223, YM), /* 04692 - Arnauld Chevallier - Magenta.sndh */
+TIMEDB_ENTRY( 2ab97245, 10, 2304, YM), /* 04692 - Arnauld Chevallier - Magenta.sndh */
+TIMEDB_ENTRY( 2ac1d816, 0, 34081, YM+TB+TD), /* 03984 - XyNo - CYBORGS N' CLUBS.sndh */
+TIMEDB_ENTRY( 2ac56364, 0, 11520, YM), /* 00600 - Chris Mad - Overdrive Mainmenu.sndh */
+TIMEDB_ENTRY( 2ad61ed6, 0, 17536, YM), /* 02045 - Mad Max - Monty On The Run.sndh */
+TIMEDB_ENTRY( 2ad61ed6, 1, 8192, YM), /* 02045 - Mad Max - Monty On The Run.sndh */
+TIMEDB_ENTRY( 2ad61ed6, 2, 901, YM), /* 02045 - Mad Max - Monty On The Run.sndh */
+TIMEDB_ENTRY( 2aeb113f, 0, 16130, YM), /* 01896 - LTK - Env Try.sndh */
+TIMEDB_ENTRY( 2af6c119, 0, 117537, YM+TA), /* 04553 - Spaz - Killing Spree.sndh */
+TIMEDB_ENTRY( 2b046516, 0, 12545, YM+TA+TD), /* 02297 - Tao - Cream - Counted Out (Alive 5).sndh */
+TIMEDB_ENTRY( 2b059920, 0, 15403, YM), /* 01541 - Ralph - Ralph 4.sndh */
+TIMEDB_ENTRY( 2b05da62, 0, 4352, YM), /* 01535 - Iso - Stawpaws.sndh */
+TIMEDB_ENTRY( 2b216eb9, 0, 12368, YM), /* 01417 - Skyline - Snork Intro - Unused music!.sndh */
+TIMEDB_ENTRY( 2b257e44, 0, 35136, YM+TA+TB+TD), /* 04331 - mOdmate-CheckPoint (orig. Adam Gilmore) - DRACONUST.sndh */
+TIMEDB_ENTRY( 2b29df62, 0, 11520, YM+TA), /* 02206 - Mad Max - Ninja Remix.sndh */
+TIMEDB_ENTRY( 2b29df62, 1, 15072, YM+TA), /* 02206 - Mad Max - Ninja Remix.sndh */
+TIMEDB_ENTRY( 2b29df62, 2, 12960, YM+TA), /* 02206 - Mad Max - Ninja Remix.sndh */
+TIMEDB_ENTRY( 2b29df62, 3, 12960, YM+TA), /* 02206 - Mad Max - Ninja Remix.sndh */
+TIMEDB_ENTRY( 2b29df62, 4, 13061, YM+TA), /* 02206 - Mad Max - Ninja Remix.sndh */
+TIMEDB_ENTRY( 2b29df62, 5, 9984, YM+TA), /* 02206 - Mad Max - Ninja Remix.sndh */
+TIMEDB_ENTRY( 2b2b878b, 0, 6272, YM), /* 03635 - Rhino - Torment - Shorty.sndh */
+TIMEDB_ENTRY( 2b3a27be, 0, 3199, YM+TA+TB+TD), /* 02833 - maktone-fairlight - 1st.sndh */
+TIMEDB_ENTRY( 2b3b4b3f, 0, 3075, YM), /* 03063 - Ed Bogas - Waltz.sndh */
+TIMEDB_ENTRY( 2b4dfe23, 0, 18432, YM), /* 02577 - STU - BLIP TERROR.sndh */
+TIMEDB_ENTRY( 2b59cb79, 0, 52204, YM+TA), /* 03797 - Tony Williams - Stampede 1.sndh */
+TIMEDB_ENTRY( 2b5a715f, 0, 8826, YM+TA+TD), /* 01848 - Lotek Style - Flainian.sndh */
+TIMEDB_ENTRY( 2b642c52, 0, 68111, YM+TA), /* 03813 - David Whittaker - Dan Dare III.sndh */
+TIMEDB_ENTRY( 2b642c52, 1, 29749, YM+TA), /* 03813 - David Whittaker - Dan Dare III.sndh */
+TIMEDB_ENTRY( 2b96bb6f, 0, 457, STE), /* 03453 - Per Almered (XiA) - $14.sndh */
+TIMEDB_ENTRY( 2b97f341, 0, 8505, YM), /* 04570 - Yerzmyey - SNDH v4.4 Update.sndh */
+TIMEDB_ENTRY( 2b98362c, 0, 12288, YM+TA), /* 04125 - Tao - Sunriders - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 2b9c2f51, 0, 2885, YM+TA), /* 04238 - 505 - 22nd.sndh */
+TIMEDB_ENTRY( 2b9dbfd5, 0, 3073, YM), /* 02220 - Mad Max - Tom & Jerry.sndh */
+TIMEDB_ENTRY( 2b9dbfd5, 1, 4994, YM), /* 02220 - Mad Max - Tom & Jerry.sndh */
+TIMEDB_ENTRY( 2b9dbfd5, 2, 962, YM), /* 02220 - Mad Max - Tom & Jerry.sndh */
+TIMEDB_ENTRY( 2ba03a26, 0, 6916, YM+TA+TD), /* 02210 - Tao - Cream (orig. Jochen Hippel) - Madness (Thalion intro).sndh */
+TIMEDB_ENTRY( 2ba4f988, 0, 8400, YM), /* 01061 - Jonathan Dunn - Lost Patrol.sndh */
+TIMEDB_ENTRY( 2ba4f988, 1, 142, YM), /* 01061 - Jonathan Dunn - Lost Patrol.sndh */
+TIMEDB_ENTRY( 2bb5e166, 0, 9280, YM+TA+TD), /* 01391 - SH3-reservoir gods - PEA.sndh */
+TIMEDB_ENTRY( 2bb80549, 0, 4497, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 1, 1645, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 2, 1828, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 3, 2048, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 4, 4294, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 5, 3809, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 6, 960, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 7, 752, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 8, 2666, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 9, 1672, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 10, 1360, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 11, 1852, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 12, 3840, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 13, 853, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 14, 4693, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 15, 1204, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 16, 1208, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 17, 1462, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 18, 1920, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 19, 1252, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 20, 3072, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 21, 1024, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 22, 914, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 23, 3572, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 24, 2964, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 25, 768, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 26, 3136, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 27, 1260, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 28, 1097, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 29, 3490, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bb80549, 30, 2304, YM), /* 04711 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - The Corps.sndh */
+TIMEDB_ENTRY( 2bca8dcb, 0, 1954, YM), /* 03318 - MSG - Chariots of Fire.sndh */
+TIMEDB_ENTRY( 2bd62c88, 0, 7487, YM), /* 04302 - 505 - Relix (2013).sndh */
+TIMEDB_ENTRY( 2c00be0f, 0, 12985, YM+TA+TB+TD), /* 01947 - MSG - Chu Chu Rocket - Puzzle.sndh */
+TIMEDB_ENTRY( 2c07453b, 0, 12287, YM+TA+TB+TD), /* 03856 - dEViLOCk+!Cube - Outpost (Atari ST remix).sndh */
+TIMEDB_ENTRY( 2c168cb0, 0, 5120, YM), /* 02162 - Mad Max - Syntax Terror - Reset.sndh */
+TIMEDB_ENTRY( 2c21aa4d, 0, 3071, YM+TA+TB), /* 02994 - 505-paradox - paracon8.sndh */
+TIMEDB_ENTRY( 2c29a738, 0, 3288, YM), /* 00087 - David Whittaker - Cloud Kingdoms.sndh */
+TIMEDB_ENTRY( 2c29a738, 1, 69, YM), /* 00087 - David Whittaker - Cloud Kingdoms.sndh */
+TIMEDB_ENTRY( 2c29a738, 2, 455, YM), /* 00087 - David Whittaker - Cloud Kingdoms.sndh */
+TIMEDB_ENTRY( 2c29a738, 3, 72, YM), /* 00087 - David Whittaker - Cloud Kingdoms.sndh */
+TIMEDB_ENTRY( 2c29a738, 4, 455, YM), /* 00087 - David Whittaker - Cloud Kingdoms.sndh */
+TIMEDB_ENTRY( 2c29a738, 5, 322, YM), /* 00087 - David Whittaker - Cloud Kingdoms.sndh */
+TIMEDB_ENTRY( 2c29a738, 6, 3120, YM), /* 00087 - David Whittaker - Cloud Kingdoms.sndh */
+TIMEDB_ENTRY( 2c29a738, 7, 48, YM), /* 00087 - David Whittaker - Cloud Kingdoms.sndh */
+TIMEDB_ENTRY( 2c29a738, 8, 1365, YM), /* 00087 - David Whittaker - Cloud Kingdoms.sndh */
+TIMEDB_ENTRY( 2c29a738, 9, 512, YM), /* 00087 - David Whittaker - Cloud Kingdoms.sndh */
+TIMEDB_ENTRY( 2c5d1243, 0, 10367, YM+TA), /* 01781 - Lap - Bird Girl Mad Demo Menu Digi.sndh */
+TIMEDB_ENTRY( 2c5e55b7, 0, 2235, YM+TA+TB+TD), /* 04310 - 505-checkpoint - ST_P.sndh */
+TIMEDB_ENTRY( 2c5f33d7, 0, 4608, YM), /* 01091 - Techno - Mathematiques Squizophrenes End.sndh */
+TIMEDB_ENTRY( 2c61bcb6, 0, 1337, YM+TA+TB+TD), /* 01949 - MSG - Chu Chu Rocket - Slow Down.sndh */
+TIMEDB_ENTRY( 2c681bcc, 0, 1536, YM), /* 02636 - Miggy - In To Action (Unfinished).sndh */
+TIMEDB_ENTRY( 2c753baf, 0, 88516, YM+TA), /* 04558 - Simon O - Goldrunner.sndh */
+TIMEDB_ENTRY( 2c7e574a, 0, 1530, YM+TA+TB+TD), /* 01946 - MSG - Chu Chu Rocket - Mousemania.sndh */
+TIMEDB_ENTRY( 2c92323e, 0, 8448, YM), /* 01572 - Patrick Phelan - Lotus Turbo Challenge 3 The Ultimate Challenge.sndh */
+TIMEDB_ENTRY( 2c92323e, 1, 9984, YM), /* 01572 - Patrick Phelan - Lotus Turbo Challenge 3 The Ultimate Challenge.sndh */
+TIMEDB_ENTRY( 2c92323e, 2, 7520, YM), /* 01572 - Patrick Phelan - Lotus Turbo Challenge 3 The Ultimate Challenge.sndh */
+TIMEDB_ENTRY( 2c92323e, 3, 7944, YM), /* 01572 - Patrick Phelan - Lotus Turbo Challenge 3 The Ultimate Challenge.sndh */
+TIMEDB_ENTRY( 2c92323e, 4, 8574, YM), /* 01572 - Patrick Phelan - Lotus Turbo Challenge 3 The Ultimate Challenge.sndh */
+TIMEDB_ENTRY( 2c92323e, 5, 7495, YM), /* 01572 - Patrick Phelan - Lotus Turbo Challenge 3 The Ultimate Challenge.sndh */
+TIMEDB_ENTRY( 2c969341, 0, 4362, YM+TA), /* 02674 - Donald Fakk - Ko And Kossa.sndh */
+TIMEDB_ENTRY( 2ca4fa1a, 0, 85112, YM+TA), /* 03815 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 2ca4fa1a, 1, 45496, YM+TA), /* 03815 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 2ca4fa1a, 2, 62176, YM+TA), /* 03815 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 2ca4fa1a, 3, 42592, YM+TA), /* 03815 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 2ca4fa1a, 4, 99883, YM+TA), /* 03815 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 2ca4fa1a, 5, 35666, YM+TA), /* 03815 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 2ca4fa1a, 6, 39640, YM+TA), /* 03815 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 2ca4fa1a, 7, 137678, YM+TA), /* 03815 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 2ca4fa1a, 8, 49985, YM+TA), /* 03815 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 2cb9700c, 0, 811, YM), /* 00871 - Ben Daglish - Rick Dangerous.sndh */
+TIMEDB_ENTRY( 2cb9700c, 1, 1156, YM), /* 00871 - Ben Daglish - Rick Dangerous.sndh */
+TIMEDB_ENTRY( 2cb9700c, 2, 587, YM), /* 00871 - Ben Daglish - Rick Dangerous.sndh */
+TIMEDB_ENTRY( 2cb9700c, 3, 1223, YM), /* 00871 - Ben Daglish - Rick Dangerous.sndh */
+TIMEDB_ENTRY( 2cb9700c, 4, 2937, YM), /* 00871 - Ben Daglish - Rick Dangerous.sndh */
+TIMEDB_ENTRY( 2cb9700c, 5, 258, YM), /* 00871 - Ben Daglish - Rick Dangerous.sndh */
+TIMEDB_ENTRY( 2cb9700c, 6, 75, YM), /* 00871 - Ben Daglish - Rick Dangerous.sndh */
+TIMEDB_ENTRY( 2cb9700c, 7, 753, YM), /* 00871 - Ben Daglish - Rick Dangerous.sndh */
+TIMEDB_ENTRY( 2cbfff0f, 0, 1824, YM), /* 00451 - Augustin Vidovic - Music Mon Intro.sndh */
+TIMEDB_ENTRY( 2cd6123b, 0, 6624, YM), /* 03407 - Mark Cooksey - World Championship Soccer.sndh */
+TIMEDB_ENTRY( 2cd6123b, 1, 4704, YM), /* 03407 - Mark Cooksey - World Championship Soccer.sndh */
+TIMEDB_ENTRY( 2cd6123b, 2, 1361, YM), /* 03407 - Mark Cooksey - World Championship Soccer.sndh */
+TIMEDB_ENTRY( 2cd6123b, 3, 192, YM), /* 03407 - Mark Cooksey - World Championship Soccer.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 0, 4608, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 1, 4608, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 2, 171, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 3, 268, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 4, 396, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 5, 396, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 6, 299, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 7, 267, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 8, 394, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 9, 524, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 10, 428, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cd8b73d, 11, 492, YM+TA+TB+TD), /* 02074 - Mad Max - Delta - Sid.sndh */
+TIMEDB_ENTRY( 2cdc85da, 0, 6717, YM+TA+TB+TD), /* 00078 - 505 - Louder1.sndh */
+TIMEDB_ENTRY( 2cdcd0b2, 0, 17988, YM+TA+TB+TD), /* 03995 - XyNo - WAITING UPDATES.sndh */
+TIMEDB_ENTRY( 2cdf9e25, 0, 1284, YM), /* 04504 - Geoff Camp - Brain food - Pipeline.sndh */
+TIMEDB_ENTRY( 2cdf9e25, 1, 24, YM), /* 04504 - Geoff Camp - Brain food - Pipeline.sndh */
+TIMEDB_ENTRY( 2cdf9e25, 2, 3144, YM), /* 04504 - Geoff Camp - Brain food - Pipeline.sndh */
+TIMEDB_ENTRY( 2cdf9e25, 3, 130, YM), /* 04504 - Geoff Camp - Brain food - Pipeline.sndh */
+TIMEDB_ENTRY( 2cdf9e25, 4, 288, YM), /* 04504 - Geoff Camp - Brain food - Pipeline.sndh */
+TIMEDB_ENTRY( 2ce651f2, 0, 18432, YM+TD), /* 02574 - STU - ATARI FORCE.sndh */
+TIMEDB_ENTRY( 2cec5651, 0, 196, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 1, 221, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 2, 180, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 3, 593, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 4, 526, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 5, 404, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 6, 240, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 7, 331, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 8, 912, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 9, 38, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 10, 996, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 12, 1205, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 14, 468, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 15, 347, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 16, 212, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 17, 536, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 18, 647, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 19, 1088, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 20, 848, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 21, 1853, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 22, 1862, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 24, 912, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 25, 68, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 26, 134, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 27, 1227, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 28, 1044, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 29, 887, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cec5651, 30, 1044, YM), /* 04683 - Unknown - Kids' Academy - Alvin's puzzles.sndh */
+TIMEDB_ENTRY( 2cedde16, 0, 6656, YM), /* 02015 - Mad Max - Supersonic.sndh */
+TIMEDB_ENTRY( 2cfd99f3, 0, 7540, YM), /* 03070 - Chris French - Twelve Days of Christmas.sndh */
+TIMEDB_ENTRY( 2d0618b9, 0, 3840, YM), /* 02113 - Mad Max - Pro BMX Simulator A.sndh */
+TIMEDB_ENTRY( 2d08da7c, 0, 1800, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 1, 3554, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 2, 3385, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 3, 3494, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 4, 4057, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 5, 4509, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 6, 2264, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 7, 3480, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 8, 3444, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 9, 5049, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 10, 3895, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 11, 3958, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 12, 3972, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 13, 3080, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 14, 3005, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d08da7c, 15, 3252, YM), /* 02928 - Geoff Camp - Spider Spell.sndh */
+TIMEDB_ENTRY( 2d0aad21, 0, 4992, YM), /* 01133 - Tyan - Revolution - IchBin JaSo Cool.sndh */
+TIMEDB_ENTRY( 2d1cb4e0, 0, 4986, YM+TA), /* 01126 - Tyan - Bits 4.sndh */
+TIMEDB_ENTRY( 2d330fa8, 0, 8576, YM), /* 00811 - Crawdaddy - Streetkids.sndh */
+TIMEDB_ENTRY( 2d3c9c67, 0, 5802, YM), /* 00365 - Steve Barrett - Chronicles of Omega.sndh */
+TIMEDB_ENTRY( 2d3c9c67, 1, 4994, YM), /* 00365 - Steve Barrett - Chronicles of Omega.sndh */
+TIMEDB_ENTRY( 2d3c9c67, 2, 1031, YM), /* 00365 - Steve Barrett - Chronicles of Omega.sndh */
+TIMEDB_ENTRY( 2d3c9c67, 3, 387, YM), /* 00365 - Steve Barrett - Chronicles of Omega.sndh */
+TIMEDB_ENTRY( 2d3c9c67, 4, 197, YM), /* 00365 - Steve Barrett - Chronicles of Omega.sndh */
+TIMEDB_ENTRY( 2d4a42cf, 0, 8449, YM+TA), /* 04813 - Unknown - Outside.sndh */
+TIMEDB_ENTRY( 2d5814e3, 0, 16511, YM), /* 03688 - Dma-Sc - Saboteur 3 - In Game 1.sndh */
+TIMEDB_ENTRY( 2d6596a3, 0, 17004, YM+TA), /* 01545 - Ralph - Ralph Digi 2.sndh */
+TIMEDB_ENTRY( 2d7f8cc2, 0, 43453, YM+TA), /* 03956 - Scott Lemmon - Paranoid.sndh */
+TIMEDB_ENTRY( 2d80a54d, 0, 4605, YM+TB+TD), /* 00183 - 505 - Pilz (D-Bug 174).sndh */
+TIMEDB_ENTRY( 2d97a73f, 0, 12800, YM), /* 03234 - T1000 - The Beast Club - TBC 4.sndh */
+TIMEDB_ENTRY( 2dc08e48, 0, 17424, YM), /* 00318 - Gary Wheaton - So Watt.sndh */
+TIMEDB_ENTRY( 2dc0e19e, 0, 23168, YM+TB+TD), /* 04641 - EIZ-GRG - EIZ@WORK.sndh */
+TIMEDB_ENTRY( 2dcb19ef, 0, 7182, YM+TA+TD), /* 00195 - 505 - Checkpoint^Creators (2003) - Stage Completed (YM Rockerz).sndh */
+TIMEDB_ENTRY( 2dcc758f, 0, 8400, YM), /* 01293 - Matt Furniss - Championship Manager 93.sndh */
+TIMEDB_ENTRY( 2de65596, 0, 2035, YM+TA+TB+TD), /* 04263 - 505 - Hack.sndh */
+TIMEDB_ENTRY( 2e0fa0f3, 0, 8064, YM), /* 01098 - Techno - PP NOEL 2.sndh */
+TIMEDB_ENTRY( 2e1efe28, 0, 6522, YM), /* 02882 - Beast - Xemispoy.sndh */
+TIMEDB_ENTRY( 2e28fd1e, 0, 9409, YM), /* 02018 - Mad Max - Clumsy Colin Action Biker.sndh */
+TIMEDB_ENTRY( 2e28fd1e, 1, 3073, YM), /* 02018 - Mad Max - Clumsy Colin Action Biker.sndh */
+TIMEDB_ENTRY( 2e28fd1e, 2, 541, YM), /* 02018 - Mad Max - Clumsy Colin Action Biker.sndh */
+TIMEDB_ENTRY( 2e453b54, 0, 4599, YM+TA+TD), /* 04295 - 505-checkpoint^paradox - Once.sndh */
+TIMEDB_ENTRY( 2e4b8df5, 0, 6713, YM+TD), /* 04108 - 505-checkpoint (2000) - december.sndh */
+TIMEDB_ENTRY( 2e4eb8b7, 0, 215543, YM+TA), /* 03824 - TEC - TEC Demo.sndh */
+TIMEDB_ENTRY( 2e4eb8b7, 1, 135248, YM+TA), /* 03824 - TEC - TEC Demo.sndh */
+TIMEDB_ENTRY( 2e4eb8b7, 2, 67201, YM+TA), /* 03824 - TEC - TEC Demo.sndh */
+TIMEDB_ENTRY( 2e4eb8b7, 3, 34817, YM+TA), /* 03824 - TEC - TEC Demo.sndh */
+TIMEDB_ENTRY( 2e4eb8b7, 4, 366823, YM+TA), /* 03824 - TEC - TEC Demo.sndh */
+TIMEDB_ENTRY( 2e4eb8b7, 5, 5575, YM+TA), /* 03824 - TEC - TEC Demo.sndh */
+TIMEDB_ENTRY( 2e5ac845, 0, 3039, YM+TA), /* 03842 - Janette R. Armstrong - TimeRunner - Title.sndh */
+TIMEDB_ENTRY( 2e837e42, 0, 11519, YM), /* 04462 - Charles Callet - Hostages.sndh */
+TIMEDB_ENTRY( 2e9179de, 0, 5120, YM+TA), /* 00793 - Crawdaddy - Intro (cross the deserts).sndh */
+TIMEDB_ENTRY( 2e9421ad, 0, 8448, YM), /* 00216 - Markus Weichselbaum - The Apprentice.sndh */
+TIMEDB_ENTRY( 2e9421ad, 1, 6400, YM), /* 00216 - Markus Weichselbaum - The Apprentice.sndh */
+TIMEDB_ENTRY( 2e9421ad, 2, 5376, YM), /* 00216 - Markus Weichselbaum - The Apprentice.sndh */
+TIMEDB_ENTRY( 2e9421ad, 3, 6080, YM), /* 00216 - Markus Weichselbaum - The Apprentice.sndh */
+TIMEDB_ENTRY( 2e99a92d, 0, 9856, YM), /* 00910 - Danny Oneway - Scoopex.sndh */
+TIMEDB_ENTRY( 2ea4d2f7, 0, 180559, YM+TA), /* 04031 - Roggie - Interludes 1-4.sndh */
+TIMEDB_ENTRY( 2eac31f3, 0, 3835, YM+TA), /* 02637 - Miggy - Jeepers(Unfinished).sndh */
+TIMEDB_ENTRY( 2eb03281, 0, 6824, YM), /* 03166 - n-a - Soon It's Gonna Rain.sndh */
+TIMEDB_ENTRY( 2ecfed70, 0, 1922, YM), /* 00412 - Big Alec - What Time Is It - Main Menu.sndh */
+TIMEDB_ENTRY( 2eec1b8f, 0, 6155, YM+TA+TD), /* 02686 - Donald Fakk - Syntax Terror - Loader.sndh */
+TIMEDB_ENTRY( 2f0c977c, 0, 1184, YM), /* 04722 - Robert Groves - Yahtzee.sndh */
+TIMEDB_ENTRY( 2f3c94b5, 0, 4096, YM), /* 01727 - John Michael Phillips - Eliminator.sndh */
+TIMEDB_ENTRY( 2f3c94b5, 1, 3072, YM), /* 01727 - John Michael Phillips - Eliminator.sndh */
+TIMEDB_ENTRY( 2f3c94b5, 2, 130, YM), /* 01727 - John Michael Phillips - Eliminator.sndh */
+TIMEDB_ENTRY( 2f3c94b5, 3, 117, YM), /* 01727 - John Michael Phillips - Eliminator.sndh */
+TIMEDB_ENTRY( 2f3c94b5, 4, 276, YM), /* 01727 - John Michael Phillips - Eliminator.sndh */
+TIMEDB_ENTRY( 2f468325, 0, 4610, YM), /* 00425 - Big Alec - PYM - Intro (Prime Time).sndh */
+TIMEDB_ENTRY( 2f49781f, 0, 36867, YM+TA+TB+TD), /* 04754 - xyce & 505 - SPACEDISKO.sndh */
+TIMEDB_ENTRY( 2f59bcd4, 0, 6528, YM), /* 03221 - Tomchi - 24 Tekbah.sndh */
+TIMEDB_ENTRY( 2f5a69ae, 0, 16896, YM), /* 01659 - Jedi - Telephone.sndh */
+TIMEDB_ENTRY( 2f5ea4ee, 0, 6138, YM+TA+TD), /* 04113 - 505-checkpoint - Sidarta.sndh */
+TIMEDB_ENTRY( 2f8c3a8c, 0, 8064, YM), /* 01097 - Techno - PP NOEL.sndh */
+TIMEDB_ENTRY( 2f909756, 0, 5184, YM), /* 00895 - Danny Oneway - Lamebrain 2 - Bubu.sndh */
+TIMEDB_ENTRY( 2f949b8a, 0, 2698, YM+TA), /* 02679 - Donald Fakk - Praeludium (unfinished).sndh */
+TIMEDB_ENTRY( 2fa66e99, 0, 3649, YM), /* 02049 - Mad Max - Sam Fox Strip Poker.sndh */
+TIMEDB_ENTRY( 2fa66e99, 1, 418, YM), /* 02049 - Mad Max - Sam Fox Strip Poker.sndh */
+TIMEDB_ENTRY( 2fa66e99, 2, 193, YM), /* 02049 - Mad Max - Sam Fox Strip Poker.sndh */
+TIMEDB_ENTRY( 2fa66e99, 3, 193, YM), /* 02049 - Mad Max - Sam Fox Strip Poker.sndh */
+TIMEDB_ENTRY( 2fa66e99, 4, 1750, YM), /* 02049 - Mad Max - Sam Fox Strip Poker.sndh */
+TIMEDB_ENTRY( 2fa66e99, 5, 97, YM), /* 02049 - Mad Max - Sam Fox Strip Poker.sndh */
+TIMEDB_ENTRY( 30076276, 0, 3195, YM), /* 02602 - STU - LITTLE NINJA.sndh */
+TIMEDB_ENTRY( 30151375, 0, 6505, YM+TA+TD), /* 00204 - 505 - UCM 11.sndh */
+TIMEDB_ENTRY( 3017e289, 0, 2486, YM), /* 03085 - Harry Wootan - Fairest Lord Jesus.sndh */
+TIMEDB_ENTRY( 3018c182, 0, 3456, YM), /* 02171 - Mad Max - Pro BMX Simulator B.sndh */
+TIMEDB_ENTRY( 30300443, 0, 14720, YM), /* 01395 - Paul Shields - Jug.sndh */
+TIMEDB_ENTRY( 30300443, 1, 8208, YM), /* 01395 - Paul Shields - Jug.sndh */
+TIMEDB_ENTRY( 30300443, 2, 18176, YM), /* 01395 - Paul Shields - Jug.sndh */
+TIMEDB_ENTRY( 30300443, 3, 1747, YM), /* 01395 - Paul Shields - Jug.sndh */
+TIMEDB_ENTRY( 3039f6ce, 0, 9425, YM), /* 00158 - David Whittaker - Xenon.sndh */
+TIMEDB_ENTRY( 3039f6ce, 1, 2560, YM), /* 00158 - David Whittaker - Xenon.sndh */
+TIMEDB_ENTRY( 3039f6ce, 2, 4803, YM), /* 00158 - David Whittaker - Xenon.sndh */
+TIMEDB_ENTRY( 303b3ca2, 0, 33280, YM+TD), /* 01476 - STU - SHAMPOO CATTLE.sndh */
+TIMEDB_ENTRY( 304a9ab5, 0, 8448, YM), /* 02114 - Mad Max - JT In Space.sndh */
+TIMEDB_ENTRY( 30622ebf, 0, 3450, YM+TA+TD), /* 00991 - DMA-SC - Sidsound de Chocobo.sndh */
+TIMEDB_ENTRY( 30688f23, 0, 3548, YM), /* 02550 - Ben Daglish - Xybots.sndh */
+TIMEDB_ENTRY( 30688f23, 1, 105, YM), /* 02550 - Ben Daglish - Xybots.sndh */
+TIMEDB_ENTRY( 306d7273, 0, 5759, YM+TA+TB), /* 03294 - Dma-Sc - ATIPYK Developments - Manical Drop - Introduction.sndh */
+TIMEDB_ENTRY( 30b5e9ba, 0, 4061, YM+STE), /* 01638 - Jason - Jason Mix - STE only.sndh */
+TIMEDB_ENTRY( 30c9d495, 0, 1536, YM), /* 02482 - ENS Music - ENS 8.sndh */
+TIMEDB_ENTRY( 30cf6273, 0, 13824, YM), /* 01072 - Excellence In Art - Battle Tris.sndh */
+TIMEDB_ENTRY( 30d39028, 0, 97586, YM+TA), /* 03779 - Richard Joseph - International 3D Tennis Intro.sndh */
+TIMEDB_ENTRY( 30fdfa0e, 0, 8253, YM+TA+TB+TD), /* 01009 - DMA-SC - Pocket Groove.sndh */
+TIMEDB_ENTRY( 3117fc7b, 0, 9598, YM+TA+TB+TD), /* 03271 - Dubmood - Tempest fjortisfacials vs Zabutom.sndh */
+TIMEDB_ENTRY( 3121658e, 0, 1151, YM+TA+TD), /* 02825 - Msg - Superfly tune 2.sndh */
+TIMEDB_ENTRY( 31241af4, 0, 7800, YM), /* 00572 - Jas C Brooke - Revenge of the Mutant Camels.sndh */
+TIMEDB_ENTRY( 3127ae07, 0, 16895, YM+TA+TB+TD), /* 00994 - Dma-Sc-Sector1^YM-Rockerz - Fantasia Tune 1 (ST Medley).sndh */
+TIMEDB_ENTRY( 3141548d, 0, 19422, YM), /* 01806 - Barry Leitch - Space Crusade.sndh */
+TIMEDB_ENTRY( 3141548d, 1, 854, YM), /* 01806 - Barry Leitch - Space Crusade.sndh */
+TIMEDB_ENTRY( 3141548d, 2, 1501, YM), /* 01806 - Barry Leitch - Space Crusade.sndh */
+TIMEDB_ENTRY( 3141548d, 3, 9589, YM), /* 01806 - Barry Leitch - Space Crusade.sndh */
+TIMEDB_ENTRY( 3168eef8, 0, 8835, YM), /* 01813 - Barry Leitch - Xenophobe.sndh */
+TIMEDB_ENTRY( 316c52b9, 0, 8639, YM+TA+TD), /* 03213 - marcer 2007 - we remember.sndh */
+TIMEDB_ENTRY( 316e1a68, 0, 3834, YM+TA), /* 01673 - Jess - Unfinished, Sorry AN Cool.sndh */
+TIMEDB_ENTRY( 3176b0f3, 0, 6816, YM), /* 00217 - Markus Weichselbaum & D Pleiss - Logical.sndh */
+TIMEDB_ENTRY( 3176b0f3, 1, 5120, YM), /* 00217 - Markus Weichselbaum & D Pleiss - Logical.sndh */
+TIMEDB_ENTRY( 3176b0f3, 2, 3840, YM), /* 00217 - Markus Weichselbaum & D Pleiss - Logical.sndh */
+TIMEDB_ENTRY( 3176b0f3, 3, 6529, YM), /* 00217 - Markus Weichselbaum & D Pleiss - Logical.sndh */
+TIMEDB_ENTRY( 3176b0f3, 4, 3264, YM), /* 00217 - Markus Weichselbaum & D Pleiss - Logical.sndh */
+TIMEDB_ENTRY( 318448b0, 0, 13316, YM+TA+TD), /* 02295 - Tao - Cream - Pulverize (Alive 3).sndh */
+TIMEDB_ENTRY( 319185e0, 0, 7680, YM), /* 00613 - Chrispy Noodle - Hybris.sndh */
+TIMEDB_ENTRY( 31995c1b, 0, 112420, YM+TA), /* 04822 - Twitch - Modelmix 91.sndh */
+TIMEDB_ENTRY( 319daf8a, 0, 133, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 1, 157, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 2, 2816, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 3, 768, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 4, 141, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 5, 173, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 6, 39, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 7, 39, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 8, 254, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 9, 75, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 10, 9, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 11, 39, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 12, 44, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 13, 127, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 14, 768, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 319daf8a, 15, 768, YM), /* 01904 - Mikael Lundberg - Rush.sndh */
+TIMEDB_ENTRY( 31a35d34, 0, 17088, YM), /* 02439 - Bodenstandig 2000 - HRVAT.sndh */
+TIMEDB_ENTRY( 31a4d5b3, 0, 19016, YM), /* 02283 - Tao - Cream - Cultivation (Just Buggin Main Menu).sndh */
+TIMEDB_ENTRY( 31b317dd, 0, 8320, YM), /* 01062 - Jonathan Dunn - Navy Seals.sndh */
+TIMEDB_ENTRY( 31b317dd, 1, 1792, YM), /* 01062 - Jonathan Dunn - Navy Seals.sndh */
+TIMEDB_ENTRY( 31b317dd, 2, 381, YM), /* 01062 - Jonathan Dunn - Navy Seals.sndh */
+TIMEDB_ENTRY( 31b317dd, 3, 646, YM), /* 01062 - Jonathan Dunn - Navy Seals.sndh */
+TIMEDB_ENTRY( 31b317dd, 4, 239, YM), /* 01062 - Jonathan Dunn - Navy Seals.sndh */
+TIMEDB_ENTRY( 31b317dd, 5, 201, YM), /* 01062 - Jonathan Dunn - Navy Seals.sndh */
+TIMEDB_ENTRY( 31b317dd, 6, 976, YM), /* 01062 - Jonathan Dunn - Navy Seals.sndh */
+TIMEDB_ENTRY( 31b72ca2, 0, 15460, YM+TA+TB+TD), /* 02816 - Marcer - Paradize - Nuclear Waste Dump - Ingame tune 3.sndh */
+TIMEDB_ENTRY( 31bcee5a, 0, 36, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 1, 207, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 2, 120, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 3, 15, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 4, 69, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 5, 84, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 6, 15, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 7, 30, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 8, 9, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 9, 18, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 10, 18, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 11, 3370, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 12, 741, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 13, 496, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 14, 216, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 15, 150, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 17, 75, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 18, 18, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 19, 105, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 20, 81, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 21, 24, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 22, 123, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 23, 75, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 24, 165, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 25, 114, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 26, 78, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 27, 602, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 28, 1092, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 29, 45, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 30, 99, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 31, 63, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 33, 69, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 34, 42, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 35, 45, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 36, 15, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 37, 36, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 38, 42, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 39, 42, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 40, 78, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 41, 42, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 42, 63, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 43, 144, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 44, 123, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 45, 234, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 46, 216, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 47, 144, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31bcee5a, 48, 45, YM), /* 04741 - Mark Crowe-Al Lowe - Space Quest Chapter 2 - Vohauls Revenge.sndh */
+TIMEDB_ENTRY( 31ec5338, 0, 1215, YM), /* 01704 - Jess - Please, no.sndh */
+TIMEDB_ENTRY( 31f1d335, 0, 6336, YM), /* 00301 - Gary Wheaton - Clementine.sndh */
+TIMEDB_ENTRY( 3211a066, 0, 3072, YM), /* 00981 - Chris Denman - Tornado Ground Attack.sndh */
+TIMEDB_ENTRY( 3211a066, 1, 8192, YM), /* 00981 - Chris Denman - Tornado Ground Attack.sndh */
+TIMEDB_ENTRY( 3213e05d, 0, 23930, YM), /* 01702 - Jess - The Legacy Nightmare.sndh */
+TIMEDB_ENTRY( 321ef846, 0, 96982, YM+TA), /* 04817 - Powapixel - Gyroscope.sndh */
+TIMEDB_ENTRY( 323d8987, 0, 7454, YM), /* 00093 - David Whittaker - Days of Thunder.sndh */
+TIMEDB_ENTRY( 323d8987, 1, 1513, YM), /* 00093 - David Whittaker - Days of Thunder.sndh */
+TIMEDB_ENTRY( 323d8987, 2, 1755, YM), /* 00093 - David Whittaker - Days of Thunder.sndh */
+TIMEDB_ENTRY( 324b9b0f, 0, 36656, YM+TA+TB+TD), /* 03616 - Marcer - ITS MY PARADIZE.sndh */
+TIMEDB_ENTRY( 3254498b, 0, 8640, YM), /* 01975 - MSG - MSG 05.sndh */
+TIMEDB_ENTRY( 3258fbe7, 0, 32008, YM+TA+TD), /* 02354 - Tao - Cream - Groupie (YM Rockerz 3).sndh */
+TIMEDB_ENTRY( 3262aef0, 0, 174671, YM+TA), /* 04359 - X The Beermat - Next.sndh */
+TIMEDB_ENTRY( 3265e0fb, 0, 17640, YM+TA+TB+TD), /* 02064 - Mad Max - Ace 2 - Sid.sndh */
+TIMEDB_ENTRY( 3275a326, 0, 1845, YM), /* 02154 - Mad Max - Ooh Crikey - Loader.sndh */
+TIMEDB_ENTRY( 328a9d41, 0, 12641, YM+TA), /* 03845 - Ingo Massalski - Tolteka - Title.sndh */
+TIMEDB_ENTRY( 328d0d86, 0, 2304, YM+TA), /* 00420 - Big Alec - Pursuit 2.sndh */
+TIMEDB_ENTRY( 329b3c96, 0, 44924, YM+TA+TD), /* 02786 - Tao-Cream - M143R1.sndh */
+TIMEDB_ENTRY( 32a31884, 0, 4204, YM+TD), /* 01988 - Mad Max - New Music.sndh */
+TIMEDB_ENTRY( 32a5303c, 0, 10750, YM), /* 01532 - Iso - Sheeeeep.sndh */
+TIMEDB_ENTRY( 32a7f031, 0, 3200, YM), /* 04002 - Blue Nun - Gnurk Demo Bobo.sndh */
+TIMEDB_ENTRY( 32b60f4b, 0, 12481, YM+TA+TD), /* 02319 - Tao - Cream - Lost.sndh */
+TIMEDB_ENTRY( 32c4f870, 0, 6528, YM), /* 00933 - Dark Angel - Masters Of Shit.sndh */
+TIMEDB_ENTRY( 32e8616d, 0, 8442, YM+TA+TB+TD), /* 02648 - Dma-Sc - ExoCooper.sndh */
+TIMEDB_ENTRY( 32e87446, 0, 2304, YM), /* 01110 - Keith Tinman - Head Over Heels.sndh */
+TIMEDB_ENTRY( 32e87446, 1, 118, YM), /* 01110 - Keith Tinman - Head Over Heels.sndh */
+TIMEDB_ENTRY( 32f3082d, 0, 7272, YM+TA+TB+TD), /* 00054 - 505 - Headaxe.sndh */
+TIMEDB_ENTRY( 332b6163, 0, 5676, YM+TA), /* 01918 - Mephistow - Ventura - Evil.sndh */
+TIMEDB_ENTRY( 333b47b3, 0, 6526, YM), /* 03198 - Martin Iveson - Arcade Classix - Breakout.sndh */
+TIMEDB_ENTRY( 33526cb7, 0, 10370, YM+TA+TD), /* 02311 - Tao - Cream - Intensity.sndh */
+TIMEDB_ENTRY( 3355a037, 0, 8192, YM+TA+TB+TD), /* 03336 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( 3356789d, 0, 6541, YM+TA), /* 02155 - Mad Max - Ooh Crikey Wot a Scorcher Hidden.sndh */
+TIMEDB_ENTRY( 335b93b1, 0, 8556, YM+TA+TB+TD), /* 04456 - Frequent-Ephidrena - Revers.sndh */
+TIMEDB_ENTRY( 335f6906, 0, 8532, YM+TA+TB+TD), /* 01481 - Gary - UCM 4 Intro.sndh */
+TIMEDB_ENTRY( 33625fef, 0, 26106, YM), /* 03874 - Gary Wheaton - Sidelong.sndh */
+TIMEDB_ENTRY( 3364a361, 0, 8064, YM), /* 01131 - Tyan - Goldrunner.sndh */
+TIMEDB_ENTRY( 337a575a, 0, 12171, YM+TA), /* 02247 - Tao - Cream (orig. Rob Hubbard) - Zoolook (Stmygm).sndh */
+TIMEDB_ENTRY( 337a9ba2, 0, 4984, YM), /* 03114 - Unknown - Where Have All th Flowers Gone.sndh */
+TIMEDB_ENTRY( 337fe6b7, 0, 8324, YM), /* 02924 - Allister Brimble - Pro Boxing Simulator.sndh */
+TIMEDB_ENTRY( 337fe6b7, 1, 244, YM), /* 02924 - Allister Brimble - Pro Boxing Simulator.sndh */
+TIMEDB_ENTRY( 3387177e, 0, 1285, YM), /* 03980 - Claude Abromont - Killer Ball.sndh */
+TIMEDB_ENTRY( 339a471b, 0, 8447, YM+TA+TB+TD), /* 03452 - Per Almered (XiA) 2009 - Handy-man (The Knife) 1.01.sndh */
+TIMEDB_ENTRY( 339bc133, 0, 91, YM), /* 00228 - ACC - Copy Star 1.8.sndh */
+TIMEDB_ENTRY( 33cd3499, 0, 375414, YM+TA), /* 03732 - Waxup - Humuskus (Ventura Reset).sndh */
+TIMEDB_ENTRY( 33e21d35, 0, 3834, YM+TA), /* 01128 - Tyan - Cruelana.sndh */
+TIMEDB_ENTRY( 33e2f4a5, 0, 5759, YM+TA+TB+TD), /* 02729 - maktone-fairlight - jewel.sndh */
+TIMEDB_ENTRY( 33e891ad, 0, 3520, YM), /* 01071 - Excellence In Art - Barf.sndh */
+TIMEDB_ENTRY( 3400c3dd, 0, 4991, YM+TA+TB+TD), /* 02630 - rubbish - ANOTHER TIME.sndh */
+TIMEDB_ENTRY( 340925b9, 0, 20480, YM), /* 00407 - Big Alec - Judgement Day (ST News 7.2).sndh */
+TIMEDB_ENTRY( 341f26d6, 0, 6162, YM), /* 04198 - Big Alec - Audio Artisic Demo.sndh */
+TIMEDB_ENTRY( 341f26d6, 1, 14018, YM), /* 04198 - Big Alec - Audio Artisic Demo.sndh */
+TIMEDB_ENTRY( 341f26d6, 2, 8642, YM), /* 04198 - Big Alec - Audio Artisic Demo.sndh */
+TIMEDB_ENTRY( 341f26d6, 3, 2881, YM), /* 04198 - Big Alec - Audio Artisic Demo.sndh */
+TIMEDB_ENTRY( 341f26d6, 4, 4626, YM), /* 04198 - Big Alec - Audio Artisic Demo.sndh */
+TIMEDB_ENTRY( 341f26d6, 5, 1538, YM), /* 04198 - Big Alec - Audio Artisic Demo.sndh */
+TIMEDB_ENTRY( 34216cde, 0, 2298, YM), /* 01931 - Miq - Dream Work.sndh */
+TIMEDB_ENTRY( 3421c628, 0, 4348, YM), /* 04581 - Andrew Taylor - Big Run.sndh */
+TIMEDB_ENTRY( 3421c628, 1, 3068, YM), /* 04581 - Andrew Taylor - Big Run.sndh */
+TIMEDB_ENTRY( 3421c628, 2, 207, YM), /* 04581 - Andrew Taylor - Big Run.sndh */
+TIMEDB_ENTRY( 3425043a, 0, 2466, YM), /* 03932 - Unknown - Tango 001.sndh */
+TIMEDB_ENTRY( 344b88ed, 0, 15937, YM), /* 02137 - Mad Max - Masters Of Magic - LCD.sndh */
+TIMEDB_ENTRY( 34613b0c, 0, 7847, YM+TA+TB), /* 03200 - monk - disturbance bilocated.sndh */
+TIMEDB_ENTRY( 347b809f, 0, 2304, YM), /* 01762 - Lap - Lap 2.sndh */
+TIMEDB_ENTRY( 348a8522, 0, 3328, YM+TA), /* 04433 - Lotus - Synth Dream 2 - Pace.sndh */
+TIMEDB_ENTRY( 34affc14, 0, 1024, YM), /* 03405 - Wally Beben - Ultimate Ride.sndh */
+TIMEDB_ENTRY( 34affc14, 1, 4160, YM), /* 03405 - Wally Beben - Ultimate Ride.sndh */
+TIMEDB_ENTRY( 34affc14, 2, 1280, YM), /* 03405 - Wally Beben - Ultimate Ride.sndh */
+TIMEDB_ENTRY( 34affc14, 3, 4224, YM), /* 03405 - Wally Beben - Ultimate Ride.sndh */
+TIMEDB_ENTRY( 34affc14, 4, 1536, YM), /* 03405 - Wally Beben - Ultimate Ride.sndh */
+TIMEDB_ENTRY( 34affc14, 5, 2688, YM), /* 03405 - Wally Beben - Ultimate Ride.sndh */
+TIMEDB_ENTRY( 34affc14, 6, 1152, YM), /* 03405 - Wally Beben - Ultimate Ride.sndh */
+TIMEDB_ENTRY( 34affc14, 7, 9310, YM), /* 03405 - Wally Beben - Ultimate Ride.sndh */
+TIMEDB_ENTRY( 34ba9d61, 0, 2688, YM+TA), /* 01692 - Jess - The name's Bond, Jess Bond.sndh */
+TIMEDB_ENTRY( 34c46ff5, 0, 393, YM), /* 02944 - Dave Munsie - Frogger.sndh */
+TIMEDB_ENTRY( 34c46ff5, 1, 323, YM), /* 02944 - Dave Munsie - Frogger.sndh */
+TIMEDB_ENTRY( 34c46ff5, 2, 185, YM), /* 02944 - Dave Munsie - Frogger.sndh */
+TIMEDB_ENTRY( 34ca54fa, 0, 16128, YM), /* 00898 - Danny Oneway - Lamebrain 1 - Danny die.sndh */
+TIMEDB_ENTRY( 34cafd52, 0, 4639, YM+TA+TD), /* 02688 - Donald Fakk - Young.sndh */
+TIMEDB_ENTRY( 34ecd6e9, 0, 3761, YM), /* 03573 - Paul Tonge - Ancient Art of War in the Skies.sndh */
+TIMEDB_ENTRY( 34ecd6e9, 1, 1600, YM), /* 03573 - Paul Tonge - Ancient Art of War in the Skies.sndh */
+TIMEDB_ENTRY( 34ecd6e9, 2, 1280, YM), /* 03573 - Paul Tonge - Ancient Art of War in the Skies.sndh */
+TIMEDB_ENTRY( 34ecd6e9, 3, 960, YM), /* 03573 - Paul Tonge - Ancient Art of War in the Skies.sndh */
+TIMEDB_ENTRY( 34ecd6e9, 4, 1384, YM), /* 03573 - Paul Tonge - Ancient Art of War in the Skies.sndh */
+TIMEDB_ENTRY( 34ecd6e9, 5, 1536, YM), /* 03573 - Paul Tonge - Ancient Art of War in the Skies.sndh */
+TIMEDB_ENTRY( 34ecd6e9, 6, 2316, YM), /* 03573 - Paul Tonge - Ancient Art of War in the Skies.sndh */
+TIMEDB_ENTRY( 34ecd6e9, 7, 3503, YM), /* 03573 - Paul Tonge - Ancient Art of War in the Skies.sndh */
+TIMEDB_ENTRY( 34ecd6e9, 8, 1149, YM), /* 03573 - Paul Tonge - Ancient Art of War in the Skies.sndh */
+TIMEDB_ENTRY( 34f7b6a2, 0, 1248, YM), /* 01879 - Dave Lowe - Count Duckula 2.sndh */
+TIMEDB_ENTRY( 35073069, 0, 1170, YM), /* 00132 - David Whittaker - Road Blasters.sndh */
+TIMEDB_ENTRY( 35073069, 1, 630, YM), /* 00132 - David Whittaker - Road Blasters.sndh */
+TIMEDB_ENTRY( 35073069, 2, 1145, YM), /* 00132 - David Whittaker - Road Blasters.sndh */
+TIMEDB_ENTRY( 35073069, 3, 2184, YM), /* 00132 - David Whittaker - Road Blasters.sndh */
+TIMEDB_ENTRY( 35073069, 4, 54, YM), /* 00132 - David Whittaker - Road Blasters.sndh */
+TIMEDB_ENTRY( 3510042a, 0, 3498, YM), /* 02406 - ACC - Badine.sndh */
+TIMEDB_ENTRY( 3524e07c, 0, 10744, YM+TA), /* 02418 - Scavenger - Unlimited Bobs.sndh */
+TIMEDB_ENTRY( 35344e06, 0, 4558, YM), /* 03111 - n-a - .sndh */
+TIMEDB_ENTRY( 353d7660, 0, 5119, YM), /* 01784 - Lap - Phaleon - Intro.sndh */
+TIMEDB_ENTRY( 35470845, 0, 6542, YM), /* 03136 - Unknown - Michelle-Lennon-McCartney.sndh */
+TIMEDB_ENTRY( 354fbef4, 0, 329, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 1, 158, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 2, 271, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 3, 4096, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 4, 15136, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 5, 15136, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 6, 15408, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 7, 15136, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 8, 15136, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 9, 15136, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 10, 15136, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 11, 15136, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 354fbef4, 12, 15136, YM), /* 00069 - David Whittaker - Archipelagos.sndh */
+TIMEDB_ENTRY( 3558592a, 0, 288, YM), /* 03512 - Unknown - Dragon Lord.sndh */
+TIMEDB_ENTRY( 3558592a, 1, 256, YM), /* 03512 - Unknown - Dragon Lord.sndh */
+TIMEDB_ENTRY( 3558592a, 2, 144, YM), /* 03512 - Unknown - Dragon Lord.sndh */
+TIMEDB_ENTRY( 355cca36, 0, 3577, YM+TA+TB+TD), /* 02592 - STU - FOR REAL.sndh */
+TIMEDB_ENTRY( 3574919f, 0, 4559, YM+TA+TD), /* 00827 - Crazy Q - TiMeBoMb - Timebomb Loader II.sndh */
+TIMEDB_ENTRY( 35bbea7a, 0, 12835, YM+TA+TD), /* 04576 - Crazy Q - Corrupted Data File.sndh */
+TIMEDB_ENTRY( 35c38980, 0, 54342, YM+TA), /* 03761 - Tufty - Tuft2.sndh */
+TIMEDB_ENTRY( 35dbbb7f, 0, 10499, YM+TA), /* 03433 - Per Almered (XiA) 2009 - They pull me back in.sndh */
+TIMEDB_ENTRY( 35e91fb5, 0, 130388, YM+TA), /* 04820 - Twitch - Funkymix.sndh */
+TIMEDB_ENTRY( 35f2c927, 0, 25257, YM+TA+TB+TD), /* 03201 - cerror (original by Pasta!) - River city open.sndh */
+TIMEDB_ENTRY( 360831c5, 0, 3199, YM), /* 02446 - Tony Williams - Judge Dredd.sndh */
+TIMEDB_ENTRY( 360831c5, 1, 1599, YM), /* 02446 - Tony Williams - Judge Dredd.sndh */
+TIMEDB_ENTRY( 361939ff, 0, 8192, YM+TB+TD), /* 03981 - XyNo - XYNO A LA PLAGE!.sndh */
+TIMEDB_ENTRY( 361be82a, 0, 338641, YM+TA), /* 04555 - Flix - What Time Is It?.sndh */
+TIMEDB_ENTRY( 361be82a, 1, 52926, YM+TA), /* 04555 - Flix - What Time Is It?.sndh */
+TIMEDB_ENTRY( 362726aa, 0, 6654, YM), /* 03553 - Jovis - Spider Ship.sndh */
+TIMEDB_ENTRY( 362aaf32, 0, 8687, YM+TB), /* 02875 - 505-Paradox nils feske - fullscreen digin' 2005.sndh */
+TIMEDB_ENTRY( 363afdb3, 0, 75264, YM), /* 02430 - Atom - TBC Intro 22.sndh */
+TIMEDB_ENTRY( 363edd1a, 0, 4497, YM), /* 03172 - n-a - Star Wars -- Main Theme.sndh */
+TIMEDB_ENTRY( 363ede8b, 0, 11173, YM+TA), /* 04218 - Karsten Obarksi - Window Wizard Digi.sndh */
+TIMEDB_ENTRY( 36401902, 0, 3074, YM+TD), /* 00237 - Alx 33 - BJ.sndh */
+TIMEDB_ENTRY( 36822b7f, 0, 3834, YM+TA), /* 04244 - 505 - Checkpoint (1999) - Beenden (unreleased).sndh */
+TIMEDB_ENTRY( 3693d8b4, 0, 103005, YM+TA), /* 04045 - Roggie - Pocket Warmer.sndh */
+TIMEDB_ENTRY( 369a938e, 0, 14311, YM), /* 03158 - Unknown - Goodnight Saigon by B. Joel.sndh */
+TIMEDB_ENTRY( 369ab556, 0, 5755, YM+TA+TB), /* 01327 - Scavenger - Crapman Sid.sndh */
+TIMEDB_ENTRY( 36b91fbb, 0, 2298, YM+TA+TB+TD), /* 01130 - Tyan - Dont Know.sndh */
+TIMEDB_ENTRY( 36c0b47c, 0, 1580, YM+TA), /* 03847 - Unknown - Victory - Title.sndh */
+TIMEDB_ENTRY( 36c15f4c, 0, 2555, YM+TA+TD), /* 02771 - Morgan - Garcimore2 Rire reset.sndh */
+TIMEDB_ENTRY( 36c1ce10, 0, 7680, YM+TA+TB+TD), /* 02075 - Mad Max - Final Synth - Sid.sndh */
+TIMEDB_ENTRY( 36c1ce10, 1, 4416, YM+TA+TB+TD), /* 02075 - Mad Max - Final Synth - Sid.sndh */
+TIMEDB_ENTRY( 36c1ce10, 2, 5184, YM+TA+TB+TD), /* 02075 - Mad Max - Final Synth - Sid.sndh */
+TIMEDB_ENTRY( 36c1ce10, 3, 7488, YM+TA+TB+TD), /* 02075 - Mad Max - Final Synth - Sid.sndh */
+TIMEDB_ENTRY( 36c1ce10, 4, 5760, YM+TA+TB+TD), /* 02075 - Mad Max - Final Synth - Sid.sndh */
+TIMEDB_ENTRY( 36c1ce10, 5, 3840, YM+TA+TB+TD), /* 02075 - Mad Max - Final Synth - Sid.sndh */
+TIMEDB_ENTRY( 36c1ce10, 6, 5760, YM+TA+TB+TD), /* 02075 - Mad Max - Final Synth - Sid.sndh */
+TIMEDB_ENTRY( 36e173f7, 0, 233, YM), /* 01729 - Peter Johnson - Arkanoid.sndh */
+TIMEDB_ENTRY( 36e173f7, 1, 129, YM), /* 01729 - Peter Johnson - Arkanoid.sndh */
+TIMEDB_ENTRY( 36e173f7, 2, 170, YM), /* 01729 - Peter Johnson - Arkanoid.sndh */
+TIMEDB_ENTRY( 36e173f7, 3, 769, YM), /* 01729 - Peter Johnson - Arkanoid.sndh */
+TIMEDB_ENTRY( 36e173f7, 4, 96, YM), /* 01729 - Peter Johnson - Arkanoid.sndh */
+TIMEDB_ENTRY( 37100241, 0, 1359, YM), /* 00136 - David Whittaker - Snowstrike.sndh */
+TIMEDB_ENTRY( 37100241, 1, 1225, YM), /* 00136 - David Whittaker - Snowstrike.sndh */
+TIMEDB_ENTRY( 37100241, 2, 1043, YM), /* 00136 - David Whittaker - Snowstrike.sndh */
+TIMEDB_ENTRY( 37100241, 3, 1474, YM), /* 00136 - David Whittaker - Snowstrike.sndh */
+TIMEDB_ENTRY( 3738c1fa, 0, 4473, YM+TA), /* 01144 - Tyan - Loader.sndh */
+TIMEDB_ENTRY( 375738fb, 0, 3589, YM), /* 00293 - Gary Wheaton - Abhonk (aboriginal version).sndh */
+TIMEDB_ENTRY( 376031f2, 0, 198325, YM+TA), /* 03745 - Tufty - Hot Guitarin.sndh */
+TIMEDB_ENTRY( 376335a6, 0, 40, YM), /* 04496 - Charles E. Cullinan II - Batman - The Batwing.sndh */
+TIMEDB_ENTRY( 376335a6, 1, 204, YM), /* 04496 - Charles E. Cullinan II - Batman - The Batwing.sndh */
+TIMEDB_ENTRY( 376335a6, 2, 353, YM), /* 04496 - Charles E. Cullinan II - Batman - The Batwing.sndh */
+TIMEDB_ENTRY( 376335a6, 3, 359, YM), /* 04496 - Charles E. Cullinan II - Batman - The Batwing.sndh */
+TIMEDB_ENTRY( 376335a6, 4, 366, YM), /* 04496 - Charles E. Cullinan II - Batman - The Batwing.sndh */
+TIMEDB_ENTRY( 376335a6, 5, 288, YM), /* 04496 - Charles E. Cullinan II - Batman - The Batwing.sndh */
+TIMEDB_ENTRY( 376335a6, 6, 287, YM), /* 04496 - Charles E. Cullinan II - Batman - The Batwing.sndh */
+TIMEDB_ENTRY( 3765fccc, 0, 6553, YM), /* 00075 - David Whittaker - Beverly Hills Cop.sndh */
+TIMEDB_ENTRY( 3786df73, 0, 9722, YM), /* 00498 - Tangens - The 2nd Try - Dister.sndh */
+TIMEDB_ENTRY( 37901b71, 0, 31098, YM+TA), /* 04235 - 505 - 14th.sndh */
+TIMEDB_ENTRY( 379f051d, 0, 36096, YM+TA+TB+TD), /* 04196 - Serpent - Compo Breaker.sndh */
+TIMEDB_ENTRY( 37b04015, 0, 8832, YM), /* 01915 - Max - Whatta Big Rat.sndh */
+TIMEDB_ENTRY( 37b4bacb, 0, 200618, YM+TA), /* 03718 - Spaz - Ooh Crikey - Intro.sndh */
+TIMEDB_ENTRY( 37f988bd, 0, 2640, YM), /* 01884 - Dave Lowe - Final Fight.sndh */
+TIMEDB_ENTRY( 37f988bd, 1, 1632, YM), /* 01884 - Dave Lowe - Final Fight.sndh */
+TIMEDB_ENTRY( 380b3cec, 0, 12288, YM), /* 02115 - Mad Max - Scout Remix.sndh */
+TIMEDB_ENTRY( 382bc9dd, 0, 6144, YM), /* 04825 - T1000 - Bits 53.sndh */
+TIMEDB_ENTRY( 3838f30a, 0, 179792, YM+TA), /* 04582 - Gary Wheaton - Shapeshifters.sndh */
+TIMEDB_ENTRY( 3839299f, 0, 4986, YM+TA), /* 04233 - 505 - 11th.sndh */
+TIMEDB_ENTRY( 384551a3, 0, 4088, YM+TA), /* 04761 - Ferox - State of Mind - Victory.sndh */
+TIMEDB_ENTRY( 38565ed1, 0, 7829, YM), /* 03186 - n-a - YANKEE DOODLE BOY.sndh */
+TIMEDB_ENTRY( 38623bdd, 0, 11135, YM+TA), /* 02493 - gwEm - Golden Years Over (used).sndh */
+TIMEDB_ENTRY( 38678353, 0, 52096, YM+TA), /* 04396 - Golden Otter - Hibernation Carol Demo 2.sndh */
+TIMEDB_ENTRY( 38678353, 1, 22471, YM+TA), /* 04396 - Golden Otter - Hibernation Carol Demo 2.sndh */
+TIMEDB_ENTRY( 38678353, 2, 23247, YM+TA), /* 04396 - Golden Otter - Hibernation Carol Demo 2.sndh */
+TIMEDB_ENTRY( 38678353, 3, 18145, YM+TA), /* 04396 - Golden Otter - Hibernation Carol Demo 2.sndh */
+TIMEDB_ENTRY( 38678353, 4, 14581, YM+TA), /* 04396 - Golden Otter - Hibernation Carol Demo 2.sndh */
+TIMEDB_ENTRY( 38678353, 5, 10001, YM+TA), /* 04396 - Golden Otter - Hibernation Carol Demo 2.sndh */
+TIMEDB_ENTRY( 38691dc2, 0, 30720, YM+TA+TB+TD), /* 02586 - STU - DATADANCE.sndh */
+TIMEDB_ENTRY( 38834d4a, 0, 4989, YM+TA+TB+TD), /* 00283 - Baggio - Teddy - UCM 20 Intro.sndh */
+TIMEDB_ENTRY( 3885b70a, 0, 19135, YM), /* 00308 - Gary Wheaton - Goil.sndh */
+TIMEDB_ENTRY( 388b52b5, 0, 8509, YM), /* 03088 - n-a - She's Always A Woman.sndh */
+TIMEDB_ENTRY( 389cb649, 0, 4921, YM+TA+TB+TD), /* 01956 - MSG - Godpey - Frontend.sndh */
+TIMEDB_ENTRY( 38a97c4c, 0, 4798, YM), /* 00969 - Demon X - Awesome.sndh */
+TIMEDB_ENTRY( 38b24d90, 0, 224, YM+TA+TB+TD), /* 03624 - Excellence In Art - Sommarhack Report 2011 Pt 3.sndh */
+TIMEDB_ENTRY( 38b9bdb1, 0, 28672, YM), /* 02458 - Starbuck^Creative Mind - Memories.sndh */
+TIMEDB_ENTRY( 38d851a2, 0, 6160, YM), /* 02368 - Nexus 6 - Count One.sndh */
+TIMEDB_ENTRY( 38eeac82, 0, 23897, YM+TA+TB+TD), /* 03300 - 505-checkpoint - morphonic.sndh */
+TIMEDB_ENTRY( 3903ca97, 0, 13440, YM+TA+TB), /* 01331 - Scavenger - Enchanted Jambala.sndh */
+TIMEDB_ENTRY( 390fff1b, 0, 15648, YM), /* 00267 - Antichrist - The Union.sndh */
+TIMEDB_ENTRY( 39196440, 0, 1024, YM), /* 01567 - Jason Page - Realms.sndh */
+TIMEDB_ENTRY( 39196440, 2, 1536, YM), /* 01567 - Jason Page - Realms.sndh */
+TIMEDB_ENTRY( 39196440, 3, 249, YM), /* 01567 - Jason Page - Realms.sndh */
+TIMEDB_ENTRY( 39196440, 4, 11009, YM), /* 01567 - Jason Page - Realms.sndh */
+TIMEDB_ENTRY( 39196440, 5, 7482, YM), /* 01567 - Jason Page - Realms.sndh */
+TIMEDB_ENTRY( 39196440, 6, 1536, YM), /* 01567 - Jason Page - Realms.sndh */
+TIMEDB_ENTRY( 39196440, 7, 862, YM), /* 01567 - Jason Page - Realms.sndh */
+TIMEDB_ENTRY( 393e5990, 0, 1914, YM), /* 00444 - Augustin Vidovic - Ace 2.sndh */
+TIMEDB_ENTRY( 397d0167, 0, 7709, YM), /* 01036 - Donald Fakk - ITC Digi.sndh */
+TIMEDB_ENTRY( 39cfda35, 0, 5832, YM), /* 01972 - MSG - MSG 02.sndh */
+TIMEDB_ENTRY( 39ddf67a, 0, 15092, YM+TD), /* 01989 - Jochen Hippel - Solidify (tSCc's Modcomp 15).sndh */
+TIMEDB_ENTRY( 39de27ad, 0, 10745, YM+TA+TB+TD), /* 00829 - Crazy Q - TiMeBoMb - Live vers. Monster Phunk.sndh */
+TIMEDB_ENTRY( 39e50cee, 0, 10181, YM), /* 01665 - Stefan Jerowski - Mindbender.sndh */
+TIMEDB_ENTRY( 3a18d56b, 0, 1480, YM), /* 03895 - Unknown - Tango.sndh */
+TIMEDB_ENTRY( 3a1b5564, 0, 4645, YM), /* 01318 - Matt Furniss - Skull and Crossbones.sndh */
+TIMEDB_ENTRY( 3a1b5564, 1, 3839, YM), /* 01318 - Matt Furniss - Skull and Crossbones.sndh */
+TIMEDB_ENTRY( 3a1b5564, 2, 3839, YM), /* 01318 - Matt Furniss - Skull and Crossbones.sndh */
+TIMEDB_ENTRY( 3a1b5564, 3, 2879, YM), /* 01318 - Matt Furniss - Skull and Crossbones.sndh */
+TIMEDB_ENTRY( 3a1b5564, 4, 5119, YM), /* 01318 - Matt Furniss - Skull and Crossbones.sndh */
+TIMEDB_ENTRY( 3a1b5564, 5, 2639, YM), /* 01318 - Matt Furniss - Skull and Crossbones.sndh */
+TIMEDB_ENTRY( 3a34fc47, 0, 8965, YM+TA+TD), /* 01864 - Lotek Style - Rays of neon.sndh */
+TIMEDB_ENTRY( 3a35dedc, 0, 246380, YM+TA), /* 04818 - Powapixel - Prelude.sndh */
+TIMEDB_ENTRY( 3a3b135b, 0, 3519, YM+TB), /* 02868 - Monk - Smalltrip.sndh */
+TIMEDB_ENTRY( 3a4bd0b6, 0, 11284, YM+TA+TB+TD), /* 01613 - No More - Face.sndh */
+TIMEDB_ENTRY( 3a4e6052, 0, 9470, YM+TA), /* 04671 - Unknown (orig Mike Alsop) - Wizardry.sndh */
+TIMEDB_ENTRY( 3a4ea60b, 0, 5378, YM+TD), /* 01898 - LTK - PS Harm.sndh */
+TIMEDB_ENTRY( 3a5ca48e, 0, 2300, YM), /* 02433 - Beast - TSC - Boring.sndh */
+TIMEDB_ENTRY( 3a6042e4, 0, 1536, YM), /* 01405 - Skyline - Snork Intro - Lightning.sndh */
+TIMEDB_ENTRY( 3aa242af, 0, 8953, YM+TA+TD), /* 01870 - Lotek Style - Silence.sndh */
+TIMEDB_ENTRY( 3aac495c, 0, 29185, YM), /* 00397 - Wally Beben - Total Eclipse.sndh */
+TIMEDB_ENTRY( 3acbd283, 0, 7983, YM+TB), /* 04104 - Per Almered-XiA-Checkpoint - SledgeBusters.sndh */
+TIMEDB_ENTRY( 3aceb5d2, 0, 25450, YM+TA), /* 04816 - Unknown - Elenor.sndh */
+TIMEDB_ENTRY( 3ae209b5, 0, 11904, YM), /* 03218 - Tomchi - Oldckool - Intro.sndh */
+TIMEDB_ENTRY( 3ae5b6bb, 0, 33248, YM), /* 01669 - Stefan Jerowski - Spherical.sndh */
+TIMEDB_ENTRY( 3ae5b6bb, 1, 4736, YM), /* 01669 - Stefan Jerowski - Spherical.sndh */
+TIMEDB_ENTRY( 3ae5b6bb, 2, 5136, YM), /* 01669 - Stefan Jerowski - Spherical.sndh */
+TIMEDB_ENTRY( 3ae5b6bb, 3, 5120, YM), /* 01669 - Stefan Jerowski - Spherical.sndh */
+TIMEDB_ENTRY( 3ae5b6bb, 4, 5088, YM), /* 01669 - Stefan Jerowski - Spherical.sndh */
+TIMEDB_ENTRY( 3ae5b6bb, 5, 8128, YM), /* 01669 - Stefan Jerowski - Spherical.sndh */
+TIMEDB_ENTRY( 3af52968, 0, 8190, YM), /* 04073 - Gary Wheaton - Home Drunk.sndh */
+TIMEDB_ENTRY( 3b01656b, 0, 2240, YM), /* 02632 - Miggy - Credits(unfinished).sndh */
+TIMEDB_ENTRY( 3b04eeac, 0, 20480, YM+TA+TB+TD), /* 02556 - Marcer - BYE BYE FRIEND.sndh */
+TIMEDB_ENTRY( 3b216790, 0, 45312, YM+TA+TB+TD), /* 02528 - 505 - CPU Eater.sndh */
+TIMEDB_ENTRY( 3b33b9f3, 0, 5760, YM+TA+TC+TD), /* 03664 - 505 - Outline 2010 Invite.sndh */
+TIMEDB_ENTRY( 3b380ed1, 0, 50053, YM+TA), /* 03964 - Scott Lemmon - I am the Walrus.sndh */
+TIMEDB_ENTRY( 3b38fa87, 0, 3090, YM), /* 03451 - Per Almered (XiA) 2009 - 1812 Overture(Tchaikovsky).sndh */
+TIMEDB_ENTRY( 3b49a639, 0, 7680, YM), /* 04764 - YERZMYEY-AY-RIDERS - EVELYNN.sndh */
+TIMEDB_ENTRY( 3b5517d0, 0, 36992, YM), /* 03861 - xyce - Cpp is Forbidden - Part 1.sndh */
+TIMEDB_ENTRY( 3b62cb45, 0, 4332, YM), /* 00863 - Ben Daglish - Motorhead.sndh */
+TIMEDB_ENTRY( 3b62cb45, 1, 5168, YM), /* 00863 - Ben Daglish - Motorhead.sndh */
+TIMEDB_ENTRY( 3b62cb45, 2, 3286, YM), /* 00863 - Ben Daglish - Motorhead.sndh */
+TIMEDB_ENTRY( 3b62cb45, 3, 7326, YM), /* 00863 - Ben Daglish - Motorhead.sndh */
+TIMEDB_ENTRY( 3b62cb45, 4, 6084, YM), /* 00863 - Ben Daglish - Motorhead.sndh */
+TIMEDB_ENTRY( 3b62cb45, 5, 11568, YM), /* 00863 - Ben Daglish - Motorhead.sndh */
+TIMEDB_ENTRY( 3b62cb45, 6, 6746, YM), /* 00863 - Ben Daglish - Motorhead.sndh */
+TIMEDB_ENTRY( 3b62cb45, 7, 7315, YM), /* 00863 - Ben Daglish - Motorhead.sndh */
+TIMEDB_ENTRY( 3b62cb45, 8, 9155, YM), /* 00863 - Ben Daglish - Motorhead.sndh */
+TIMEDB_ENTRY( 3b6be469, 0, 32656, YM+TA+TB+TD), /* 03868 - Tao - Cream (2012) - Sillyride (SillyVenture 2k12).sndh */
+TIMEDB_ENTRY( 3b76bf13, 0, 6913, YM), /* 03970 - Eric Thoner - Super Senori.sndh */
+TIMEDB_ENTRY( 3b93406c, 0, 3840, YM), /* 02168 - Mad Max - Union Demo - Level 16.sndh */
+TIMEDB_ENTRY( 3ba26fab, 0, 7680, YM), /* 03191 - n-a - Organic Robots.sndh */
+TIMEDB_ENTRY( 3baf6d79, 0, 2281, YM), /* 03922 - Unknown - Marseill.sndh */
+TIMEDB_ENTRY( 3bd36ec3, 0, 383, YM), /* 00358 - Mark Wilson - Cloud Kingdom Dizzy.sndh */
+TIMEDB_ENTRY( 3bd36ec3, 1, 6911, YM), /* 00358 - Mark Wilson - Cloud Kingdom Dizzy.sndh */
+TIMEDB_ENTRY( 3bd36ec3, 2, 4991, YM), /* 00358 - Mark Wilson - Cloud Kingdom Dizzy.sndh */
+TIMEDB_ENTRY( 3bd36ec3, 3, 4799, YM), /* 00358 - Mark Wilson - Cloud Kingdom Dizzy.sndh */
+TIMEDB_ENTRY( 3bd36ec3, 4, 4799, YM), /* 00358 - Mark Wilson - Cloud Kingdom Dizzy.sndh */
+TIMEDB_ENTRY( 3bd3bd4e, 0, 39767, YM+TA), /* 04804 - Unknown - Fugue.sndh */
+TIMEDB_ENTRY( 3bd95ceb, 0, 3839, YM+TA+TB+TD), /* 02990 - 505-paradox - long ago.sndh */
+TIMEDB_ENTRY( 3bf50ca8, 0, 15344, YM+TA+TD), /* 02275 - Tao - Cream - Wide Awake (Steps).sndh */
+TIMEDB_ENTRY( 3bfe1a32, 0, 1920, YM), /* 04608 - White Ninja - Farewell.sndh */
+TIMEDB_ENTRY( 3c0e9f47, 0, 8448, YM), /* 02022 - Mad Max - Bump Set And Spike.sndh */
+TIMEDB_ENTRY( 3c0e9f47, 1, 9504, YM), /* 02022 - Mad Max - Bump Set And Spike.sndh */
+TIMEDB_ENTRY( 3c21902f, 0, 10177, YM), /* 02109 - Mad Max - Esbe.sndh */
+TIMEDB_ENTRY( 3c35d9fd, 0, 4356, YM), /* 00319 - Gary Wheaton - The Monkey Man.sndh */
+TIMEDB_ENTRY( 3c381868, 0, 6406, YM), /* 04148 - Unknown - City Roads.sndh */
+TIMEDB_ENTRY( 3c4609cc, 0, 58904, YM), /* 01441 - Stax - Es Geht! Oder.sndh */
+TIMEDB_ENTRY( 3c4c8046, 0, 9789, YM+TA+TB+TD), /* 03503 - 505 - Suretrip 2 - Main.sndh */
+TIMEDB_ENTRY( 3c4d57d5, 0, 2080, YM), /* 03170 - Unknown - Star-Spangled Banner - F.S.Key.sndh */
+TIMEDB_ENTRY( 3c6d4ca1, 0, 2682, YM+TA), /* 01337 - Scavenger - In Full Effect.sndh */
+TIMEDB_ENTRY( 3c6fc76f, 0, 9216, YM), /* 01576 - Powa Pixel - GBISTCP - Mega 4 A.sndh */
+TIMEDB_ENTRY( 3c78197c, 0, 9262, YM+TA), /* 01712 - Jess - Dyscomelodus.sndh */
+TIMEDB_ENTRY( 3c833d4d, 0, 12075, YM+TA+TB+TD), /* 03437 - Dma-Sc - Happy Dancefloor.sndh */
+TIMEDB_ENTRY( 3c96ac85, 0, 5904, YM), /* 00356 - Tony Williams - Viz.sndh */
+TIMEDB_ENTRY( 3c96ac85, 1, 1535, YM), /* 00356 - Tony Williams - Viz.sndh */
+TIMEDB_ENTRY( 3c96ac85, 2, 2063, YM), /* 00356 - Tony Williams - Viz.sndh */
+TIMEDB_ENTRY( 3c96ac85, 3, 2303, YM), /* 00356 - Tony Williams - Viz.sndh */
+TIMEDB_ENTRY( 3c96ac85, 4, 2303, YM), /* 00356 - Tony Williams - Viz.sndh */
+TIMEDB_ENTRY( 3c96ac85, 5, 1535, YM), /* 00356 - Tony Williams - Viz.sndh */
+TIMEDB_ENTRY( 3c96ac85, 6, 90, YM), /* 00356 - Tony Williams - Viz.sndh */
+TIMEDB_ENTRY( 3c96ac85, 7, 141, YM), /* 00356 - Tony Williams - Viz.sndh */
+TIMEDB_ENTRY( 3c96ac85, 8, 1535, YM), /* 00356 - Tony Williams - Viz.sndh */
+TIMEDB_ENTRY( 3c9e7164, 0, 383, YM), /* 00359 - Mark Wilson - Round The Bend.sndh */
+TIMEDB_ENTRY( 3c9e7164, 1, 95, YM), /* 00359 - Mark Wilson - Round The Bend.sndh */
+TIMEDB_ENTRY( 3c9e7164, 2, 96, YM), /* 00359 - Mark Wilson - Round The Bend.sndh */
+TIMEDB_ENTRY( 3c9e7164, 3, 132, YM), /* 00359 - Mark Wilson - Round The Bend.sndh */
+TIMEDB_ENTRY( 3c9e7164, 4, 1535, YM), /* 00359 - Mark Wilson - Round The Bend.sndh */
+TIMEDB_ENTRY( 3cad8c4c, 0, 2112, YM), /* 04477 - Full FX - Sooty & Sweep.sndh */
+TIMEDB_ENTRY( 3cb4ea89, 0, 20730, YM), /* 01708 - Jess - Do you speak Russian.sndh */
+TIMEDB_ENTRY( 3cba31e7, 0, 8640, YM), /* 01179 - Excellence In Art - Frosty's Music.sndh */
+TIMEDB_ENTRY( 3cd8c70a, 0, 5570, YM), /* 01052 - Dr Beat - Imagination - Rollercoaster.sndh */
+TIMEDB_ENTRY( 3cff211e, 0, 160, YM), /* 04728 - Beyonder - MIX number ONE demo - Slide TSK.sndh */
+TIMEDB_ENTRY( 3cff211e, 1, 1828, YM), /* 04728 - Beyonder - MIX number ONE demo - Slide TSK.sndh */
+TIMEDB_ENTRY( 3cff211e, 2, 1828, YM), /* 04728 - Beyonder - MIX number ONE demo - Slide TSK.sndh */
+TIMEDB_ENTRY( 3d061dce, 0, 2784, YM+TA+TB+TD), /* 03830 - Rhino - Torment (D Newman) - Airwolf (Sylvester Levay).sndh */
+TIMEDB_ENTRY( 3d0d2149, 0, 12960, YM), /* 01994 - Mad Max - Arpy Remix.sndh */
+TIMEDB_ENTRY( 3d0f7efd, 0, 12703, YM), /* 01760 - Lap - Expose Software Intro.sndh */
+TIMEDB_ENTRY( 3d12a99a, 0, 17206, STE), /* 03366 - 505 - Paradox - More Or Less Zero.sndh */
+TIMEDB_ENTRY( 3d156e5f, 0, 4607, YM), /* 04569 - Per Almered-XiA-Checkpoint - LOUDER! LOUDER!.sndh */
+TIMEDB_ENTRY( 3d17e34a, 0, 6144, YM), /* 01431 - Starbuck - Sleep Well.sndh */
+TIMEDB_ENTRY( 3d1d30fc, 0, 3253, YM), /* 03081 - Tim Shockley - Dance of the Candy Fairy.sndh */
+TIMEDB_ENTRY( 3d1fc0d1, 0, 36096, YM+TD), /* 01477 - STU - SPACE GUZZI.sndh */
+TIMEDB_ENTRY( 3d2a9513, 0, 44544, YM+TA+TB+TD), /* 03393 - cerror - SALVATOR.sndh */
+TIMEDB_ENTRY( 3d3164c3, 0, 9594, YM+TA+TB), /* 00988 - DMA-SC - First Sid.sndh */
+TIMEDB_ENTRY( 3d3ba81e, 0, 35937, YM+TA), /* 03729 - Martin Walker - Defender 2.sndh */
+TIMEDB_ENTRY( 3d3ccb16, 0, 11520, YM+TA), /* 04119 - Tao - For Abyss - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 3d3da197, 0, 2314, YM+TA), /* 02470 - Iso - Knuckle Joe.sndh */
+TIMEDB_ENTRY( 3d43c43e, 0, 307273, YM+TA), /* 03941 - Unknown - Acid1.sndh */
+TIMEDB_ENTRY( 3d4e2b53, 0, 13440, YM), /* 04748 - Mad Max - Warp Preview.sndh */
+TIMEDB_ENTRY( 3d4e2b53, 1, 9216, YM), /* 04748 - Mad Max - Warp Preview.sndh */
+TIMEDB_ENTRY( 3d55bcc0, 0, 7753, YM+TA+TB+TD), /* 02713 - lotek style - tscc (2006) - farewell lil ssd.sndh */
+TIMEDB_ENTRY( 3d61c948, 0, 6272, YM), /* 00948 - Dark Angel - Slow Motion.sndh */
+TIMEDB_ENTRY( 3d65e51b, 0, 6218, YM), /* 03142 - Unknown - NIGHT MOVES by Marilyn Martin.sndh */
+TIMEDB_ENTRY( 3d68b7ad, 0, 192, YM), /* 01210 - Excellence In Art - Tra La La.sndh */
+TIMEDB_ENTRY( 3d6ad039, 0, 4612, YM), /* 03112 - n-a - .sndh */
+TIMEDB_ENTRY( 3d7de33c, 0, 1536, YM), /* 00145 - David Whittaker - Supremacy.sndh */
+TIMEDB_ENTRY( 3d7de33c, 1, 373, YM), /* 00145 - David Whittaker - Supremacy.sndh */
+TIMEDB_ENTRY( 3d7de33c, 2, 342, YM), /* 00145 - David Whittaker - Supremacy.sndh */
+TIMEDB_ENTRY( 3d7de33c, 3, 403, YM), /* 00145 - David Whittaker - Supremacy.sndh */
+TIMEDB_ENTRY( 3d7de33c, 4, 57, YM), /* 00145 - David Whittaker - Supremacy.sndh */
+TIMEDB_ENTRY( 3d7de33c, 5, 80, YM), /* 00145 - David Whittaker - Supremacy.sndh */
+TIMEDB_ENTRY( 3d7de33c, 6, 216, YM), /* 00145 - David Whittaker - Supremacy.sndh */
+TIMEDB_ENTRY( 3d7de33c, 7, 204, YM), /* 00145 - David Whittaker - Supremacy.sndh */
+TIMEDB_ENTRY( 3d7de33c, 8, 65, YM), /* 00145 - David Whittaker - Supremacy.sndh */
+TIMEDB_ENTRY( 3d7ea149, 0, 27, YM), /* 04687 - Gary Cook, Robert Forsey - Kubes.sndh */
+TIMEDB_ENTRY( 3d7ea149, 1, 940, YM), /* 04687 - Gary Cook, Robert Forsey - Kubes.sndh */
+TIMEDB_ENTRY( 3d7ea149, 2, 33, YM), /* 04687 - Gary Cook, Robert Forsey - Kubes.sndh */
+TIMEDB_ENTRY( 3d7ea149, 3, 127, YM), /* 04687 - Gary Cook, Robert Forsey - Kubes.sndh */
+TIMEDB_ENTRY( 3d990103, 0, 5375, YM+TA), /* 04859 - Michel Winogradoff - Bumpy.sndh */
+TIMEDB_ENTRY( 3da7acb5, 0, 9942, YM+TA), /* 04429 - Lotus - Synth Dream 2 - Intro.sndh */
+TIMEDB_ENTRY( 3db4ae01, 0, 3515, YM+TA+TB+TD), /* 01121 - Toodeloo - Test 2.sndh */
+TIMEDB_ENTRY( 3dcae6b6, 0, 12864, YM), /* 02450 - David Whittaker - Stormbringer.sndh */
+TIMEDB_ENTRY( 3dcc854a, 0, 5115, YM+TA+TB+TD), /* 01252 - Floopy - Speeder.sndh */
+TIMEDB_ENTRY( 3dd3a07e, 0, 7506, YM), /* 01780 - Lap - Lap 33.sndh */
+TIMEDB_ENTRY( 3dd6f8cd, 0, 27269, YM+TA), /* 03763 - Tufty - Vangelis 2.sndh */
+TIMEDB_ENTRY( 3dd94e9c, 0, 4810, YM), /* 00754 - Mark Cooksey - Live and Let Die.sndh */
+TIMEDB_ENTRY( 3dd94e9c, 1, 7296, YM), /* 00754 - Mark Cooksey - Live and Let Die.sndh */
+TIMEDB_ENTRY( 3de043eb, 0, 6720, YM+TA+TB+TD), /* 01606 - Nemo - Summer.sndh */
+TIMEDB_ENTRY( 3df7689f, 0, 23680, YM+TB+TD), /* 03992 - XyNo - That Fuckr.sndh */
+TIMEDB_ENTRY( 3e0c5f1b, 0, 3200, YM), /* 04599 - Rude Kid - Match of the Day.sndh */
+TIMEDB_ENTRY( 3e13d051, 0, 3499, YM), /* 04655 - Eric Kinkead - Nervana Quest.sndh */
+TIMEDB_ENTRY( 3e165308, 0, 4927, YM), /* 04096 - Gary Wheaton - Don't Let the Sun go down on me.sndh */
+TIMEDB_ENTRY( 3e27512d, 0, 5166, YM+TA+TB+TD), /* 02752 - MSG - reservoir gods - omtrek-uit-lijn.sndh */
+TIMEDB_ENTRY( 3e2a318d, 0, 4282, YM), /* 00096 - David Whittaker - Emlyn Hughes Football.sndh */
+TIMEDB_ENTRY( 3e2a47e1, 0, 2559, YM), /* 02845 - Marcer - poker intro.sndh */
+TIMEDB_ENTRY( 3e2ae99a, 0, 2808, YM), /* 00475 - Ultimatum - Choux FL.sndh */
+TIMEDB_ENTRY( 3e36efbe, 0, 8447, YM+TA+TB+TD), /* 02692 - DUBMOOD (JOGEIR & JUGI) - LOVEDEMO AND DOPE.sndh */
+TIMEDB_ENTRY( 3e392c78, 0, 3960, YM), /* 00488 - Ultimatum - Kidney Bean 4.sndh */
+TIMEDB_ENTRY( 3e405883, 0, 2328, YM), /* 02202 - Mad Max - Jinks.sndh */
+TIMEDB_ENTRY( 3e405883, 1, 192, YM), /* 02202 - Mad Max - Jinks.sndh */
+TIMEDB_ENTRY( 3e45d068, 0, 20045, YM+TA+TB+TD), /* 02444 - Dubmood & Zabutom ! ! ! - SpaceJourney.sndh */
+TIMEDB_ENTRY( 3e5ea92c, 0, 5313, YM), /* 00329 - Gary Wheaton - Steel.sndh */
+TIMEDB_ENTRY( 3e62c353, 0, 30013, YM+TA), /* 03948 - Scott Lemmon - Axel F.sndh */
+TIMEDB_ENTRY( 3e81befd, 0, 1535, YM+TA), /* 03475 - gwEm (Follin conversion) - Gabba Bobble.sndh */
+TIMEDB_ENTRY( 3eae2b14, 0, 4600, YM+TA), /* 00028 - 505 - 6th.sndh */
+TIMEDB_ENTRY( 3ecb3852, 0, 18286, YM+TA), /* 03737 - David Whittaker - Fire & Brimstone.sndh */
+TIMEDB_ENTRY( 3ecdf406, 0, 5824, YM+TD), /* 01600 - Nemo - Nex.sndh */
+TIMEDB_ENTRY( 3ed11e5c, 0, 2233, YM), /* 04372 - Jess - Squeeze 11 (draft).sndh */
+TIMEDB_ENTRY( 3ed3140e, 0, 8832, YM+TA), /* 04115 - Tao - Androids - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 3ed78f3e, 0, 9520, YM), /* 02975 - Dma-Sc - Bubble Days.sndh */
+TIMEDB_ENTRY( 3ef913de, 0, 2298, YM), /* 04785 - Intruder - Intruder 1.sndh */
+TIMEDB_ENTRY( 3f2963c7, 0, 3264, YM), /* 04131 - Andi McGinty - The Simpsons - Bart vs The World.sndh */
+TIMEDB_ENTRY( 3f2963c7, 1, 1536, YM), /* 04131 - Andi McGinty - The Simpsons - Bart vs The World.sndh */
+TIMEDB_ENTRY( 3f2963c7, 2, 2688, YM), /* 04131 - Andi McGinty - The Simpsons - Bart vs The World.sndh */
+TIMEDB_ENTRY( 3f2963c7, 3, 3456, YM), /* 04131 - Andi McGinty - The Simpsons - Bart vs The World.sndh */
+TIMEDB_ENTRY( 3f2963c7, 4, 256, YM), /* 04131 - Andi McGinty - The Simpsons - Bart vs The World.sndh */
+TIMEDB_ENTRY( 3f2963c7, 5, 3072, YM), /* 04131 - Andi McGinty - The Simpsons - Bart vs The World.sndh */
+TIMEDB_ENTRY( 3f2963c7, 6, 3072, YM), /* 04131 - Andi McGinty - The Simpsons - Bart vs The World.sndh */
+TIMEDB_ENTRY( 3f2963c7, 7, 1792, YM), /* 04131 - Andi McGinty - The Simpsons - Bart vs The World.sndh */
+TIMEDB_ENTRY( 3f386dc7, 0, 1536, YM), /* 01197 - Excellence In Art - Prince Ig.sndh */
+TIMEDB_ENTRY( 3f425b8f, 0, 4992, YM), /* 01143 - Tyan - Revolution - Kiffer Song.sndh */
+TIMEDB_ENTRY( 3f4b1e79, 0, 1287, YM+TA+TB+TD), /* 02797 - Starbuck^Creative Mind - Sonic - Bridge Zone.sndh */
+TIMEDB_ENTRY( 3f614d44, 0, 17280, YM+TA+TB+TD), /* 03373 - STU - NIGHT JAM.sndh */
+TIMEDB_ENTRY( 3f699102, 0, 600, YM), /* 04153 - Unknown - Lauderbilder.sndh */
+TIMEDB_ENTRY( 3f699102, 1, 1080, YM), /* 04153 - Unknown - Lauderbilder.sndh */
+TIMEDB_ENTRY( 3f699102, 2, 1164, YM), /* 04153 - Unknown - Lauderbilder.sndh */
+TIMEDB_ENTRY( 3f699102, 3, 1251, YM), /* 04153 - Unknown - Lauderbilder.sndh */
+TIMEDB_ENTRY( 3f699102, 4, 1060, YM), /* 04153 - Unknown - Lauderbilder.sndh */
+TIMEDB_ENTRY( 3f699102, 5, 1140, YM), /* 04153 - Unknown - Lauderbilder.sndh */
+TIMEDB_ENTRY( 3f6c599b, 0, 8832, YM), /* 00154 - David Whittaker - Weird Dreams.sndh */
+TIMEDB_ENTRY( 3f6c599b, 1, 4336, YM), /* 00154 - David Whittaker - Weird Dreams.sndh */
+TIMEDB_ENTRY( 3f6c599b, 2, 2849, YM), /* 00154 - David Whittaker - Weird Dreams.sndh */
+TIMEDB_ENTRY( 3f6c599b, 3, 1820, YM), /* 00154 - David Whittaker - Weird Dreams.sndh */
+TIMEDB_ENTRY( 3f6c599b, 4, 5120, YM), /* 00154 - David Whittaker - Weird Dreams.sndh */
+TIMEDB_ENTRY( 3f6c599b, 5, 3840, YM), /* 00154 - David Whittaker - Weird Dreams.sndh */
+TIMEDB_ENTRY( 3f6c599b, 6, 3233, YM), /* 00154 - David Whittaker - Weird Dreams.sndh */
+TIMEDB_ENTRY( 3f6c599b, 7, 2671, YM), /* 00154 - David Whittaker - Weird Dreams.sndh */
+TIMEDB_ENTRY( 3f82ce3a, 0, 9154, YM), /* 04746 - Unknown - Beyond the Titanic 2.sndh */
+TIMEDB_ENTRY( 3f870be2, 0, 3456, YM), /* 00454 - Augustin Vidovic - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 3fb6c852, 0, 6590, YM), /* 00506 - Tangens - Phaleon - Arsch.sndh */
+TIMEDB_ENTRY( 3fe1891d, 0, 5456, YM+TA+TB+TD), /* 03599 - 505-checkpoint & paradox - Grado Groove.sndh */
+TIMEDB_ENTRY( 3ffd8004, 0, 3291, YM), /* 03155 - n-a - .sndh */
+TIMEDB_ENTRY( 4005e38e, 0, 48384, YM), /* 01440 - Stax - Match.sndh */
+TIMEDB_ENTRY( 400d8c94, 0, 3840, YM+TA), /* 04590 - Illusion - Pure Energy 6.sndh */
+TIMEDB_ENTRY( 400dd2fb, 0, 5183, YM+TA+TB+TD), /* 00059 - 505 - Checkpoint (2002) - hysteria.sndh */
+TIMEDB_ENTRY( 40132169, 0, 7680, YM+TA), /* 01359 - Scavenger - Powercode.sndh */
+TIMEDB_ENTRY( 4015556f, 0, 32732, YM), /* 01472 - STU - PLAYER.sndh */
+TIMEDB_ENTRY( 4021e89b, 0, 5370, YM+TA+TB+TD), /* 04276 - 505-cpt^pdx - laughter.sndh */
+TIMEDB_ENTRY( 402d0e07, 0, 14652, YM+TA+TD), /* 04575 - Crazy Q - Alive Team - Lunar Bounce.sndh */
+TIMEDB_ENTRY( 40311d45, 0, 3453, YM+TA+TD), /* 00213 - 505 - YM Pop (D-Bug 173).sndh */
+TIMEDB_ENTRY( 40525f4c, 0, 20736, YM+TA+TD), /* 02259 - Tao - Cream - Mine Sweeper ST (Steps).sndh */
+TIMEDB_ENTRY( 406772da, 0, 7615, YM+TA+TD), /* 04783 - gwEm - Trans-Debug Express (release edit).sndh */
+TIMEDB_ENTRY( 40845105, 0, 2064, YM), /* 01411 - Skyline - Snork Intro - PYM.sndh */
+TIMEDB_ENTRY( 40912b3d, 0, 862, YM), /* 04140 - Claudio Kronmuller - Kaiser.sndh */
+TIMEDB_ENTRY( 40912b3d, 1, 364, YM), /* 04140 - Claudio Kronmuller - Kaiser.sndh */
+TIMEDB_ENTRY( 40b08c8f, 0, 1599, YM), /* 04134 - Andreas Maier - Dizzy Wizard.sndh */
+TIMEDB_ENTRY( 40b08c8f, 1, 858, YM), /* 04134 - Andreas Maier - Dizzy Wizard.sndh */
+TIMEDB_ENTRY( 40b0a6da, 0, 18048, YM), /* 01542 - Ralph - Ralph 5.sndh */
+TIMEDB_ENTRY( 40c0a003, 0, 9336, YM+TA+TB+TD), /* 03153 - gwEm - Garage Days Revisited.sndh */
+TIMEDB_ENTRY( 40cbc1ce, 0, 2693, YM), /* 02276 - Tao - Cream (orig. ??,C64) - Back Off Bitch (Just Buggin).sndh */
+TIMEDB_ENTRY( 40e6dff2, 0, 3068, YM+TA+TB+TD), /* 01019 - DMA-SC - Wings of Death Remix.sndh */
+TIMEDB_ENTRY( 40e6eb78, 0, 10057, YM+TA+TB+TD), /* 04636 - !Cube - Bullet Sequence.sndh */
+TIMEDB_ENTRY( 40f113c5, 0, 7100, YM+TA+TD), /* 03479 - Dma-Sc - Sector One - Hail to Sunny Days.sndh */
+TIMEDB_ENTRY( 4114fb5d, 0, 10880, YM), /* 01393 - Shaft - Xtream Dentro.sndh */
+TIMEDB_ENTRY( 4117f3aa, 0, 5181, YM+TA), /* 04224 - 505 - 4MC.sndh */
+TIMEDB_ENTRY( 41641b13, 0, 5247, YM+TB), /* 03620 - DMA-SC - Superstar.sndh */
+TIMEDB_ENTRY( 416b9770, 0, 4096, YM), /* 03660 - Jedi - Nothing Is More - Song 2.sndh */
+TIMEDB_ENTRY( 416f7801, 0, 8442, YM+TA), /* 01837 - Lotek Style - Blinded.sndh */
+TIMEDB_ENTRY( 4186f72f, 0, 12160, YM), /* 03417 - Dave Hasler - Steigar.sndh */
+TIMEDB_ENTRY( 4186f72f, 1, 5120, YM), /* 03417 - Dave Hasler - Steigar.sndh */
+TIMEDB_ENTRY( 4197ebcf, 0, 3520, YM), /* 02364 - Nexus 6 - Bin Doof.sndh */
+TIMEDB_ENTRY( 419cdbc4, 0, 14784, YM), /* 02037 - Mad Max - I-Ball.sndh */
+TIMEDB_ENTRY( 41a0f845, 0, 14329, YM+TA+TB+TD), /* 01960 - MSG - Godpey - Normal.sndh */
+TIMEDB_ENTRY( 41abaeae, 0, 11464, YM), /* 02740 - Unknown Composer - The Karate Kid - Part II.sndh */
+TIMEDB_ENTRY( 41b7ed8b, 0, 2044, YM), /* 03551 - Jovis - Lame Bip.sndh */
+TIMEDB_ENTRY( 41c77720, 0, 4200, YM), /* 03245 - T1000 - The Beast Club - TBC 17.sndh */
+TIMEDB_ENTRY( 41d2e0e9, 0, 1664, YM), /* 04500 - Jon Wheatman - Bootiful Babe.sndh */
+TIMEDB_ENTRY( 41f03310, 0, 4602, YM+TA), /* 03556 - Stuart Trigg - Around The World.sndh */
+TIMEDB_ENTRY( 41fbfde9, 0, 18816, YM), /* 00945 - Dark Angel - Mathematica - Seasons.sndh */
+TIMEDB_ENTRY( 42030931, 0, 61674, YM+TA), /* 03717 - LTK - LTK Music Disk.sndh */
+TIMEDB_ENTRY( 420af484, 0, 4229, YM+TA+TB+TD), /* 00908 - Danny Oneway - No Sheep In Mongolia (DIGI).sndh */
+TIMEDB_ENTRY( 421b40a5, 0, 1146, YM+TA), /* 01324 - Scavenger - Another Kind of Heaven.sndh */
+TIMEDB_ENTRY( 422fc19d, 0, 5520, YM), /* 01069 - Jonathan Dunn - Terminator 2.sndh */
+TIMEDB_ENTRY( 422fc19d, 1, 1920, YM), /* 01069 - Jonathan Dunn - Terminator 2.sndh */
+TIMEDB_ENTRY( 422fc19d, 2, 2704, YM), /* 01069 - Jonathan Dunn - Terminator 2.sndh */
+TIMEDB_ENTRY( 4237532f, 0, 4992, YM), /* 00800 - Crawdaddy - My Master.sndh */
+TIMEDB_ENTRY( 425d6b8b, 0, 6399, YM+TA+TB+TD), /* 02997 - 505-paradox - psycho.sndh */
+TIMEDB_ENTRY( 428d7eda, 0, 5425, YM+TA+TB+TD), /* 04250 - 505-checkpoint - Crapsong.sndh */
+TIMEDB_ENTRY( 42a1a7d3, 0, 2106, YM+TA+TD), /* 01938 - Modmate - Popcorn.sndh */
+TIMEDB_ENTRY( 42a6e7d7, 0, 4992, YM), /* 00097 - David Whittaker - Empire Strikes Back.sndh */
+TIMEDB_ENTRY( 42a6e7d7, 1, 33, YM), /* 00097 - David Whittaker - Empire Strikes Back.sndh */
+TIMEDB_ENTRY( 42a6e7d7, 2, 1707, YM), /* 00097 - David Whittaker - Empire Strikes Back.sndh */
+TIMEDB_ENTRY( 42a6e7d7, 3, 315, YM), /* 00097 - David Whittaker - Empire Strikes Back.sndh */
+TIMEDB_ENTRY( 42a6e7d7, 4, 853, YM), /* 00097 - David Whittaker - Empire Strikes Back.sndh */
+TIMEDB_ENTRY( 42a6e7d7, 5, 763, YM), /* 00097 - David Whittaker - Empire Strikes Back.sndh */
+TIMEDB_ENTRY( 42a6e7d7, 6, 113, YM), /* 00097 - David Whittaker - Empire Strikes Back.sndh */
+TIMEDB_ENTRY( 42a6e7d7, 7, 611, YM), /* 00097 - David Whittaker - Empire Strikes Back.sndh */
+TIMEDB_ENTRY( 42a6e7d7, 8, 93, YM), /* 00097 - David Whittaker - Empire Strikes Back.sndh */
+TIMEDB_ENTRY( 42b355e4, 0, 9594, YM+TA), /* 01756 - Eric Ksouri - Manciola - Etnos.sndh */
+TIMEDB_ENTRY( 42cb41ab, 0, 13441, YM+TA+TD), /* 02346 - Tao - Cream - Caught A Ray (UCM 22).sndh */
+TIMEDB_ENTRY( 42d744dd, 0, 6140, YM+TA+TB+TD), /* 02755 - Dma-Sc - Sector One - Alive! 7 Intro.sndh */
+TIMEDB_ENTRY( 42e2b05e, 0, 1920, YM), /* 02310 - Tao - Cream - Ikari Union (1k-version).sndh */
+TIMEDB_ENTRY( 42f07c44, 0, 8463, YM), /* 01396 - Paul Shields - ST Soccer.sndh */
+TIMEDB_ENTRY( 42f07c44, 1, 5485, YM), /* 01396 - Paul Shields - ST Soccer.sndh */
+TIMEDB_ENTRY( 42f07c44, 2, 5315, YM), /* 01396 - Paul Shields - ST Soccer.sndh */
+TIMEDB_ENTRY( 42f07c44, 3, 5642, YM), /* 01396 - Paul Shields - ST Soccer.sndh */
+TIMEDB_ENTRY( 42f33e2e, 0, 34560, YM+TA+TB+TD), /* 03598 - xyce - SES SEINS.sndh */
+TIMEDB_ENTRY( 42f54684, 0, 9024, YM), /* 00804 - Crawdaddy - No Way Out.sndh */
+TIMEDB_ENTRY( 431cd63b, 0, 11768, YM+TA+TB+TD), /* 01142 - Tyan - Kanabis.sndh */
+TIMEDB_ENTRY( 434ecd34, 0, 8016, YM+TA+TD), /* 03577 - 505-checkpoint - Zyncyventure.sndh */
+TIMEDB_ENTRY( 4351da35, 0, 5760, YM), /* 02921 - 4-Mat - Heimdall.sndh */
+TIMEDB_ENTRY( 43527b57, 0, 1161, YM), /* 02549 - Ben Daglish - Dynamite Dux.sndh */
+TIMEDB_ENTRY( 43527b57, 1, 1739, YM), /* 02549 - Ben Daglish - Dynamite Dux.sndh */
+TIMEDB_ENTRY( 43527b57, 2, 6047, YM), /* 02549 - Ben Daglish - Dynamite Dux.sndh */
+TIMEDB_ENTRY( 43527b57, 3, 2027, YM), /* 02549 - Ben Daglish - Dynamite Dux.sndh */
+TIMEDB_ENTRY( 43527b57, 4, 4229, YM), /* 02549 - Ben Daglish - Dynamite Dux.sndh */
+TIMEDB_ENTRY( 43527b57, 5, 1733, YM), /* 02549 - Ben Daglish - Dynamite Dux.sndh */
+TIMEDB_ENTRY( 43527b57, 6, 2404, YM), /* 02549 - Ben Daglish - Dynamite Dux.sndh */
+TIMEDB_ENTRY( 43527b57, 7, 2891, YM), /* 02549 - Ben Daglish - Dynamite Dux.sndh */
+TIMEDB_ENTRY( 43527b57, 8, 1733, YM), /* 02549 - Ben Daglish - Dynamite Dux.sndh */
+TIMEDB_ENTRY( 4365fca2, 0, 1858, YM), /* 00501 - Tangens - The 2nd Try - Loader.sndh */
+TIMEDB_ENTRY( 436ce977, 0, 2044, YM+TB), /* 04303 - 505 - Checkpoint - retelling.sndh */
+TIMEDB_ENTRY( 4376cf27, 0, 19135, YM), /* 03867 - Gary Wheaton - Ace Invaders.sndh */
+TIMEDB_ENTRY( 4376cf27, 1, 13668, YM), /* 03867 - Gary Wheaton - Ace Invaders.sndh */
+TIMEDB_ENTRY( 4376cf27, 2, 4005, YM), /* 03867 - Gary Wheaton - Ace Invaders.sndh */
+TIMEDB_ENTRY( 4376cf27, 3, 2384, YM), /* 03867 - Gary Wheaton - Ace Invaders.sndh */
+TIMEDB_ENTRY( 4376cf27, 4, 2032, YM), /* 03867 - Gary Wheaton - Ace Invaders.sndh */
+TIMEDB_ENTRY( 4376cf27, 5, 4670, YM), /* 03867 - Gary Wheaton - Ace Invaders.sndh */
+TIMEDB_ENTRY( 4376cf27, 6, 5313, YM), /* 03867 - Gary Wheaton - Ace Invaders.sndh */
+TIMEDB_ENTRY( 4376cf27, 7, 2565, YM), /* 03867 - Gary Wheaton - Ace Invaders.sndh */
+TIMEDB_ENTRY( 4389dc3b, 0, 37888, YM+TB+TD), /* 02843 - Marcer - XMASMAN SID.sndh */
+TIMEDB_ENTRY( 43981f38, 0, 8704, YM), /* 01740 - Jovis - Lametrop - Beast.sndh */
+TIMEDB_ENTRY( 439d0a4d, 0, 12291, YM+TA+TD), /* 02341 - Tao - Cream - Monkey Cage (UCM 15).sndh */
+TIMEDB_ENTRY( 439f139b, 0, 9984, YM), /* 01770 - Lap - Lap 10.sndh */
+TIMEDB_ENTRY( 43aeb26e, 0, 18048, YM+TA+TD), /* 02345 - Tao - Cream - Eclipse (UCM 20).sndh */
+TIMEDB_ENTRY( 43b169f3, 0, 7864, YM), /* 00307 - Gary Wheaton - Beware of my Love.sndh */
+TIMEDB_ENTRY( 43b78b1c, 0, 13056, YM+TA), /* 02309 - Tao - Cream (orig. Jeroen Tel) - Ice Age (Digidrum-version).sndh */
+TIMEDB_ENTRY( 43b9d655, 0, 29573, YM+TA), /* 03755 - Tufty - Numan.sndh */
+TIMEDB_ENTRY( 43c519f7, 0, 105, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 1, 12, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 2, 201, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 3, 673, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 4, 673, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 5, 2559, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 6, 177, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 7, 96, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 8, 12, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 9, 39, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 10, 147, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 11, 150, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 12, 114, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 14, 162, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 15, 201, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 16, 2566, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 17, 12, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 18, 240, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 19, 240, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 20, 111, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 21, 6, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c519f7, 22, 691, YM), /* 04742 - Barry Murray - Manhunter II - San Francisco - B.sndh */
+TIMEDB_ENTRY( 43c79c0e, 0, 3881, YM), /* 03056 - Ed Bogas - Lead Vocal.sndh */
+TIMEDB_ENTRY( 43cd6912, 0, 6020, YM+TA+TB+TD), /* 02991 - 505-paradox - nuance (STE only).sndh */
+TIMEDB_ENTRY( 43e98c51, 0, 2017, YM), /* 03894 - Unknown - Studie 9.sndh */
+TIMEDB_ENTRY( 4408eb86, 0, 3456, YM), /* 01202 - Excellence In Art - Stolen.sndh */
+TIMEDB_ENTRY( 441d5b0b, 0, 1076, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 1, 559, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 2, 15, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 3, 174, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 4, 178, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 5, 275, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 6, 204, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 7, 153, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 8, 144, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 9, 144, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 10, 592, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 11, 144, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 12, 163, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 13, 3907, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 14, 3323, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d5b0b, 15, 2694, YM), /* 02947 - Chris Parrish - Attack of Alien Gun Turrets.sndh */
+TIMEDB_ENTRY( 441d9f8b, 0, 96, YM), /* 03926 - Unknown - Richtig1.sndh */
+TIMEDB_ENTRY( 442a4206, 0, 4992, YM), /* 01184 - Excellence In Art - Hidden.sndh */
+TIMEDB_ENTRY( 4438f589, 0, 38400, YM+TA+TB+TD), /* 02627 - schmx-awp - Bonebreaker.sndh */
+TIMEDB_ENTRY( 4472aef8, 0, 4372, YM), /* 04510 - Edwyn Thomas - Byte-man.sndh */
+TIMEDB_ENTRY( 4472aef8, 1, 447, YM), /* 04510 - Edwyn Thomas - Byte-man.sndh */
+TIMEDB_ENTRY( 4472aef8, 2, 441, YM), /* 04510 - Edwyn Thomas - Byte-man.sndh */
+TIMEDB_ENTRY( 4477eb41, 0, 14070, YM), /* 01746 - Jovis - Lametrop - Jet Set Willy.sndh */
+TIMEDB_ENTRY( 44808679, 0, 6912, YM), /* 00479 - Ultimatum - Choux K.sndh */
+TIMEDB_ENTRY( 448093ee, 0, 4590, YM+TB+TD), /* 04268 - 505 - Jelling.sndh */
+TIMEDB_ENTRY( 4483c9f0, 0, 157385, YM+TA), /* 03722 - Spaz - Ooh Crikey - What A Bummer.sndh */
+TIMEDB_ENTRY( 4486eb53, 0, 5633, YM), /* 00389 - Wally Beben - Liberator.sndh */
+TIMEDB_ENTRY( 4486eb53, 1, 272, YM), /* 00389 - Wally Beben - Liberator.sndh */
+TIMEDB_ENTRY( 448a0597, 0, 3329, YM), /* 02925 - Allister Brimble - Mean Machine.sndh */
+TIMEDB_ENTRY( 448a0597, 1, 2881, YM), /* 02925 - Allister Brimble - Mean Machine.sndh */
+TIMEDB_ENTRY( 448a0597, 2, 2881, YM), /* 02925 - Allister Brimble - Mean Machine.sndh */
+TIMEDB_ENTRY( 448a0597, 3, 3841, YM), /* 02925 - Allister Brimble - Mean Machine.sndh */
+TIMEDB_ENTRY( 448a0597, 4, 645, YM), /* 02925 - Allister Brimble - Mean Machine.sndh */
+TIMEDB_ENTRY( 448a0597, 5, 321, YM), /* 02925 - Allister Brimble - Mean Machine.sndh */
+TIMEDB_ENTRY( 448a0597, 6, 321, YM), /* 02925 - Allister Brimble - Mean Machine.sndh */
+TIMEDB_ENTRY( 448ef395, 0, 1536, YM), /* 00101 - David Whittaker - Future Sports.sndh */
+TIMEDB_ENTRY( 448ef395, 1, 3961, YM), /* 00101 - David Whittaker - Future Sports.sndh */
+TIMEDB_ENTRY( 448ef395, 2, 47, YM), /* 00101 - David Whittaker - Future Sports.sndh */
+TIMEDB_ENTRY( 448ef395, 3, 81, YM), /* 00101 - David Whittaker - Future Sports.sndh */
+TIMEDB_ENTRY( 448ef395, 4, 122, YM), /* 00101 - David Whittaker - Future Sports.sndh */
+TIMEDB_ENTRY( 449a8f2a, 0, 7783, YM), /* 03064 - Chris French - Axel F by Harold Faltermeyer.sndh */
+TIMEDB_ENTRY( 449ce984, 0, 5006, YM), /* 04444 - ISO - Non-Digified.sndh */
+TIMEDB_ENTRY( 44bf284b, 0, 7199, YM+TA+TB+TD), /* 02974 - 505-paradox - cyborg clubbing.sndh */
+TIMEDB_ENTRY( 44f3f5ec, 0, 39936, YM), /* 02606 - STU - MY MELODY.sndh */
+TIMEDB_ENTRY( 4510f9f1, 0, 8064, YM+TB), /* 01844 - Lotek Style - Echoland.sndh */
+TIMEDB_ENTRY( 451130c6, 0, 3449, YM), /* 03134 - n-a - Away in a Manger.sndh */
+TIMEDB_ENTRY( 45225afa, 0, 4555, YM), /* 00459 - Augustin Vidovic - Pyramid.sndh */
+TIMEDB_ENTRY( 453eb90b, 0, 6912, YM), /* 01064 - Jonathan Dunn - Operation Thunderbolt.sndh */
+TIMEDB_ENTRY( 453eb90b, 1, 761, YM), /* 01064 - Jonathan Dunn - Operation Thunderbolt.sndh */
+TIMEDB_ENTRY( 453fd01f, 0, 3623, YM), /* 02969 - Unknown - Wolf Pack.sndh */
+TIMEDB_ENTRY( 4540aaf8, 0, 4312, YM+TA), /* 01279 - Frazer - TSC 79.sndh */
+TIMEDB_ENTRY( 4545c9ea, 0, 8640, YM+TB+TD), /* 02851 - Helene - FUCKTHEUNIVERSE.sndh */
+TIMEDB_ENTRY( 455b626d, 0, 8091, YM), /* 03671 - Dma-Sc - CYG Japan.sndh */
+TIMEDB_ENTRY( 456297c7, 0, 10464, YM), /* 02217 - Mad Max - Tangram.sndh */
+TIMEDB_ENTRY( 456297c7, 1, 19776, YM), /* 02217 - Mad Max - Tangram.sndh */
+TIMEDB_ENTRY( 45657a96, 0, 16890, YM+TA+TD), /* 01834 - Lotek Style - Ask me about chips.sndh */
+TIMEDB_ENTRY( 4568c87a, 0, 768, YM+TA+TD), /* 00405 - Big Alec - High Gear.sndh */
+TIMEDB_ENTRY( 45698dbb, 0, 3840, YM), /* 01045 - Dr Beat - Galtan 6 - Elite Intro 2.sndh */
+TIMEDB_ENTRY( 457c457a, 0, 3528, YM), /* 04220 - Holger Ghermann - Graffiti Man.sndh */
+TIMEDB_ENTRY( 457c457a, 1, 2688, YM), /* 04220 - Holger Ghermann - Graffiti Man.sndh */
+TIMEDB_ENTRY( 457c457a, 2, 3528, YM), /* 04220 - Holger Ghermann - Graffiti Man.sndh */
+TIMEDB_ENTRY( 457c457a, 3, 3696, YM), /* 04220 - Holger Ghermann - Graffiti Man.sndh */
+TIMEDB_ENTRY( 457c457a, 4, 1638, YM), /* 04220 - Holger Ghermann - Graffiti Man.sndh */
+TIMEDB_ENTRY( 457c457a, 5, 2184, YM), /* 04220 - Holger Ghermann - Graffiti Man.sndh */
+TIMEDB_ENTRY( 457c457a, 6, 813, YM), /* 04220 - Holger Ghermann - Graffiti Man.sndh */
+TIMEDB_ENTRY( 457c457a, 7, 840, YM), /* 04220 - Holger Ghermann - Graffiti Man.sndh */
+TIMEDB_ENTRY( 45a4f0f1, 0, 14777, YM+TA+TB+TD), /* 04518 - 505 - Alive!.sndh */
+TIMEDB_ENTRY( 45a5b063, 0, 8448, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 1, 9600, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 2, 6272, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 3, 9552, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 4, 5632, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 5, 7808, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 6, 6336, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 7, 6528, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 8, 8320, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 9, 8320, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 10, 6120, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45a5b063, 11, 6960, YM), /* 02743 - Unknown Composer - Lemmings 2 - The Tribes.sndh */
+TIMEDB_ENTRY( 45abad6d, 0, 5375, YM+TA+TB+TD), /* 00201 - 505 - Too Hard.sndh */
+TIMEDB_ENTRY( 45b4b0d5, 0, 5120, YM+TA), /* 04434 - Lotus - Synth Dream 2 - Of All Places.sndh */
+TIMEDB_ENTRY( 45b5ef21, 0, 182661, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 1, 183263, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 2, 44359, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 3, 105778, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 4, 85803, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 5, 43723, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 6, 49924, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 7, 160563, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 8, 7850, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 9, 64494, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 10, 40043, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45b5ef21, 11, 6014, YM+TA), /* 04562 - Marcer - Marcer Tunes.sndh */
+TIMEDB_ENTRY( 45e4090f, 0, 3064, YM), /* 01284 - Frequent - Ephidrena - Deep blue.sndh */
+TIMEDB_ENTRY( 45e95c53, 0, 54944, YM+TB+TD), /* 03440 - TomChi NoExtra - KID IS VIP.sndh */
+TIMEDB_ENTRY( 46238a3c, 0, 4800, YM), /* 04601 - Rude Kid - Samba 2.sndh */
+TIMEDB_ENTRY( 46447c65, 0, 20165, YM), /* 02964 - Unknown - Maze.sndh */
+TIMEDB_ENTRY( 464ab741, 0, 896, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 1, 23, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 2, 263, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 3, 23, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 4, 43, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 5, 177, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 6, 33, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 7, 45, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 8, 39, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 9, 110, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 10, 41, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 11, 153, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 12, 134, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 13, 177, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 14, 177, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 15, 45, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 16, 34, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 464ab741, 17, 56, YM), /* 04534 - Ewald Greiml - Fox Brothers.sndh */
+TIMEDB_ENTRY( 46528a63, 0, 13433, YM+STE), /* 04365 - Jess - The singing Green Frog (STe).sndh */
+TIMEDB_ENTRY( 4652cd27, 0, 2575, YM+TA), /* 03839 - I. Waugh - Frost Byte - Title.sndh */
+TIMEDB_ENTRY( 465a6bdc, 0, 37633, YM), /* 03529 - Wally Beben - Dark Side.sndh */
+TIMEDB_ENTRY( 4681d442, 0, 42240, YM), /* 01439 - Stax - Madness.sndh */
+TIMEDB_ENTRY( 469137d5, 0, 1920, YM), /* 00235 - AJT - Beachtro.sndh */
+TIMEDB_ENTRY( 46a3d7b1, 0, 3199, YM), /* 03513 - Dave Kelly - Return of the Jedi.sndh */
+TIMEDB_ENTRY( 46a3d7b1, 1, 151, YM), /* 03513 - Dave Kelly - Return of the Jedi.sndh */
+TIMEDB_ENTRY( 46a3d7b1, 2, 865, YM), /* 03513 - Dave Kelly - Return of the Jedi.sndh */
+TIMEDB_ENTRY( 46a3d7b1, 3, 1153, YM), /* 03513 - Dave Kelly - Return of the Jedi.sndh */
+TIMEDB_ENTRY( 46a6ab5e, 0, 5762, YM), /* 00432 - Big Alec - Poppycock - Stars.sndh */
+TIMEDB_ENTRY( 46b04ed3, 0, 28736, YM+TA+TB+TD), /* 03389 - Tomchi - YM out.sndh */
+TIMEDB_ENTRY( 46b8222c, 0, 2304, YM+TA), /* 00951 - Dark Angel - Straight Shooter.sndh */
+TIMEDB_ENTRY( 46ba2db5, 0, 1152, YM), /* 01410 - Skyline - Snork Intro - Overdrive.sndh */
+TIMEDB_ENTRY( 46d54b18, 0, 7631, YM+TA+TB), /* 04659 - Frequent-Ephidrena - Lykkerus.sndh */
+TIMEDB_ENTRY( 46df70e6, 0, 3353, YM), /* 02716 - Chrispy Noodle - Tiger 2.sndh */
+TIMEDB_ENTRY( 4711a6b6, 0, 8448, YM), /* 00247 - AN Cool - So Watt - Techatron.sndh */
+TIMEDB_ENTRY( 4722c6d4, 0, 935, YM), /* 04549 - Simon Brown - Inferno.sndh */
+TIMEDB_ENTRY( 4722c6d4, 1, 1870, YM), /* 04549 - Simon Brown - Inferno.sndh */
+TIMEDB_ENTRY( 4722c6d4, 2, 1008, YM), /* 04549 - Simon Brown - Inferno.sndh */
+TIMEDB_ENTRY( 4726dc9b, 0, 3834, YM+TA), /* 04451 - Scavenger - SYM II.sndh */
+TIMEDB_ENTRY( 472e2b73, 0, 10747, YM+TA+TB+TD), /* 01000 - DMA-SC - its live - alive 4.sndh */
+TIMEDB_ENTRY( 472fd6cf, 0, 9216, YM), /* 01095 - Techno - Omed 1.sndh */
+TIMEDB_ENTRY( 47430808, 0, 10880, YM+TD), /* 02006 - Mad Max ( ?-2002 ) - Faith (YM Rockerz).sndh */
+TIMEDB_ENTRY( 4746395c, 0, 29184, YM+TD), /* 02573 - STU - 8 BIT STYLE.sndh */
+TIMEDB_ENTRY( 477203a1, 0, 9282, YM), /* 03113 - Unknown - Flashdance...What A Feeling.sndh */
+TIMEDB_ENTRY( 47828d84, 0, 9280, YM+TA), /* 00264 - Antichrist - Stephanie.sndh */
+TIMEDB_ENTRY( 47a7ec6e, 0, 2153, YM), /* 00085 - David Whittaker - Chronoquest.sndh */
+TIMEDB_ENTRY( 47a7ec6e, 1, 2395, YM), /* 00085 - David Whittaker - Chronoquest.sndh */
+TIMEDB_ENTRY( 47a7ec6e, 2, 1921, YM), /* 00085 - David Whittaker - Chronoquest.sndh */
+TIMEDB_ENTRY( 47a7ec6e, 3, 1388, YM), /* 00085 - David Whittaker - Chronoquest.sndh */
+TIMEDB_ENTRY( 47a7ec6e, 4, 1523, YM), /* 00085 - David Whittaker - Chronoquest.sndh */
+TIMEDB_ENTRY( 47a7ec6e, 5, 2036, YM), /* 00085 - David Whittaker - Chronoquest.sndh */
+TIMEDB_ENTRY( 47a7ec6e, 6, 437, YM), /* 00085 - David Whittaker - Chronoquest.sndh */
+TIMEDB_ENTRY( 47be14ac, 0, 10759, YM+TA), /* 02492 - gwEm - Golden Years Over (orig).sndh */
+TIMEDB_ENTRY( 47d552ec, 0, 16896, YM+TB+TD), /* 02904 - Helene - n-a.sndh */
+TIMEDB_ENTRY( 47d9555b, 0, 9210, YM+TA+TB+TD), /* 01831 - Lotek Style - Alpha Proxima.sndh */
+TIMEDB_ENTRY( 47ec864a, 0, 910, YM+TA), /* 01145 - Tyan - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 47f306f4, 0, 960, YM+TA+TD), /* 02766 - Bobby Prince ST by Dma-Sc - Interlude.sndh */
+TIMEDB_ENTRY( 47f3f9ea, 0, 2857, YM), /* 00156 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 47f3f9ea, 1, 7295, YM), /* 00156 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 47f3f9ea, 2, 2847, YM), /* 00156 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 47f3f9ea, 3, 5715, YM), /* 00156 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 47f3f9ea, 4, 2875, YM), /* 00156 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 47f3f9ea, 5, 3573, YM), /* 00156 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 47f3f9ea, 6, 2712, YM), /* 00156 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 47f3f9ea, 7, 1524, YM), /* 00156 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 47f3f9ea, 8, 1686, YM), /* 00156 - David Whittaker - Wrath of the Demon.sndh */
+TIMEDB_ENTRY( 480b7552, 0, 14336, YM), /* 02810 - Starbuck - Sunrise.sndh */
+TIMEDB_ENTRY( 48318dc0, 0, 2331, YM), /* 04531 - Andrew R. Oakley - Flipped.sndh */
+TIMEDB_ENTRY( 4842a105, 0, 9600, YM), /* 00763 - Count Zero - Decade Flexiscroll.sndh */
+TIMEDB_ENTRY( 4864e718, 0, 47200, YM+TA+TB+TD), /* 02597 - STU - INSECTZ.sndh */
+TIMEDB_ENTRY( 48651fff, 0, 10752, YM), /* 00589 - Celtic - Starworx.sndh */
+TIMEDB_ENTRY( 48887d4f, 0, 37120, YM+TA+TB+TD), /* 03343 - Marcer - I WISH ST VERS.sndh */
+TIMEDB_ENTRY( 48ab9818, 0, 3836, YM), /* 01286 - Full FX - The Jetsons.sndh */
+TIMEDB_ENTRY( 48ad0e6f, 0, 1556, YM+STE), /* 01211 - Elof - Elof Mix - STE only.sndh */
+TIMEDB_ENTRY( 48b294b1, 0, 18444, YM+TA), /* 01630 - No More - World of Wonders.sndh */
+TIMEDB_ENTRY( 48dbdd9f, 0, 26624, YM+TB+TD), /* 04852 - xFalcon - HURRY UP.sndh */
+TIMEDB_ENTRY( 48f34eb8, 0, 7296, YM), /* 01664 - Jedi - Vision.sndh */
+TIMEDB_ENTRY( 48f850f0, 0, 7903, YM+TA+TB+TD), /* 03424 - Dubmood - Old Unreleased Jam.sndh */
+TIMEDB_ENTRY( 49116698, 0, 179792, YM+TA), /* 03806 - Sparky - Wave.sndh */
+TIMEDB_ENTRY( 49176ce2, 0, 14666, YM), /* 00076 - David Whittaker - Beyond The Ice Palace.sndh */
+TIMEDB_ENTRY( 49176ce2, 1, 2688, YM), /* 00076 - David Whittaker - Beyond The Ice Palace.sndh */
+TIMEDB_ENTRY( 491f4cbb, 0, 11497, YM+TA+TB+TD), /* 04770 - V0yager - Takeover.sndh */
+TIMEDB_ENTRY( 4925240e, 0, 16576, YM+TD), /* 02359 - Nexus 6 - Ancient Files V2.sndh */
+TIMEDB_ENTRY( 492c0d99, 0, 2664, YM), /* 03934 - Unknown - Titel.sndh */
+TIMEDB_ENTRY( 49416146, 0, 71629, YM+TA), /* 03009 - Mad Max - Warp Title Music.sndh */
+TIMEDB_ENTRY( 4965b274, 0, 7199, YM), /* 03683 - Dma-Sc - STreet Art.sndh */
+TIMEDB_ENTRY( 49790e75, 0, 1896, YM), /* 01651 - Jedi - Melody Debut.sndh */
+TIMEDB_ENTRY( 49c76abc, 0, 8442, YM+TA+TD), /* 02829 - Msg - Superfly tune 6.sndh */
+TIMEDB_ENTRY( 49ccd65a, 0, 8879, YM), /* 02372 - Nexus 6 - Deep Hall.sndh */
+TIMEDB_ENTRY( 49d37360, 0, 24960, YM), /* 02806 - Starbuck - Oldschool Chip #1.sndh */
+TIMEDB_ENTRY( 49d3bbe7, 0, 6522, YM+TA+TD), /* 01855 - Lotek Style - Industrial Safe Disk 31.sndh */
+TIMEDB_ENTRY( 49df71dd, 0, 2616, YM), /* 01112 - Keith Tinman - Parasol Stars.sndh */
+TIMEDB_ENTRY( 49df71dd, 1, 864, YM), /* 01112 - Keith Tinman - Parasol Stars.sndh */
+TIMEDB_ENTRY( 49df71dd, 2, 385, YM), /* 01112 - Keith Tinman - Parasol Stars.sndh */
+TIMEDB_ENTRY( 49df71dd, 3, 3360, YM), /* 01112 - Keith Tinman - Parasol Stars.sndh */
+TIMEDB_ENTRY( 49df71dd, 4, 1536, YM), /* 01112 - Keith Tinman - Parasol Stars.sndh */
+TIMEDB_ENTRY( 49e00f76, 0, 5754, YM), /* 04101 - 505 - Blazing (YM-version).sndh */
+TIMEDB_ENTRY( 49ea8fbd, 0, 22934, YM), /* 01885 - Dave Lowe - IK+.sndh */
+TIMEDB_ENTRY( 49eaeecf, 0, 10239, YM), /* 00340 - Tony Williams - Future Basketball.sndh */
+TIMEDB_ENTRY( 49eaeecf, 1, 650, YM), /* 00340 - Tony Williams - Future Basketball.sndh */
+TIMEDB_ENTRY( 49eaeecf, 2, 3039, YM), /* 00340 - Tony Williams - Future Basketball.sndh */
+TIMEDB_ENTRY( 49eaeecf, 3, 791, YM), /* 00340 - Tony Williams - Future Basketball.sndh */
+TIMEDB_ENTRY( 49f00d2d, 0, 975, YM+TA+TD), /* 02476 - No More - Intro.sndh */
+TIMEDB_ENTRY( 4a0c614b, 0, 7116, YM), /* 03697 - Chris Mad - Overdrive Demo - Pharadist.sndh */
+TIMEDB_ENTRY( 4a0d1fd9, 0, 3134, YM), /* 01432 - Starbuck - YM Reggae.sndh */
+TIMEDB_ENTRY( 4a21f916, 0, 288, YM), /* 02961 - Unknown - Dick Tracy.sndh */
+TIMEDB_ENTRY( 4a21f916, 1, 5688, YM), /* 02961 - Unknown - Dick Tracy.sndh */
+TIMEDB_ENTRY( 4a21f916, 2, 7140, YM), /* 02961 - Unknown - Dick Tracy.sndh */
+TIMEDB_ENTRY( 4a21f916, 3, 5280, YM), /* 02961 - Unknown - Dick Tracy.sndh */
+TIMEDB_ENTRY( 4a21f916, 4, 10944, YM), /* 02961 - Unknown - Dick Tracy.sndh */
+TIMEDB_ENTRY( 4a21f916, 5, 5616, YM), /* 02961 - Unknown - Dick Tracy.sndh */
+TIMEDB_ENTRY( 4a21f916, 6, 768, YM), /* 02961 - Unknown - Dick Tracy.sndh */
+TIMEDB_ENTRY( 4a21f916, 7, 3136, YM), /* 02961 - Unknown - Dick Tracy.sndh */
+TIMEDB_ENTRY( 4a21f916, 8, 1344, YM), /* 02961 - Unknown - Dick Tracy.sndh */
+TIMEDB_ENTRY( 4a239905, 0, 7953, YM+TA), /* 00196 - 505 - ST Tri Sound.sndh */
+TIMEDB_ENTRY( 4a33c893, 0, 4771, YM+TA+TB+TD), /* 02078 - Mad Max - Gerry The Germ - Sid.sndh */
+TIMEDB_ENTRY( 4a33c893, 1, 5376, YM+TA+TB+TD), /* 02078 - Mad Max - Gerry The Germ - Sid.sndh */
+TIMEDB_ENTRY( 4a33c893, 2, 5184, YM+TA+TB+TD), /* 02078 - Mad Max - Gerry The Germ - Sid.sndh */
+TIMEDB_ENTRY( 4a33c893, 3, 6528, YM+TA+TB+TD), /* 02078 - Mad Max - Gerry The Germ - Sid.sndh */
+TIMEDB_ENTRY( 4a33c893, 4, 4992, YM+TA+TB+TD), /* 02078 - Mad Max - Gerry The Germ - Sid.sndh */
+TIMEDB_ENTRY( 4a33c893, 5, 3619, YM+TA+TB+TD), /* 02078 - Mad Max - Gerry The Germ - Sid.sndh */
+TIMEDB_ENTRY( 4a33c893, 6, 5376, YM+TA+TB+TD), /* 02078 - Mad Max - Gerry The Germ - Sid.sndh */
+TIMEDB_ENTRY( 4a3c5e50, 0, 7168, YM+STE), /* 02203 - Mad Max - Lethal Xcess (STe).sndh */
+TIMEDB_ENTRY( 4a3c5e50, 1, 15168, YM+STE), /* 02203 - Mad Max - Lethal Xcess (STe).sndh */
+TIMEDB_ENTRY( 4a3c5e50, 2, 2688, YM+STE), /* 02203 - Mad Max - Lethal Xcess (STe).sndh */
+TIMEDB_ENTRY( 4a3c5e50, 3, 18483, YM+STE), /* 02203 - Mad Max - Lethal Xcess (STe).sndh */
+TIMEDB_ENTRY( 4a3c5e50, 4, 16384, YM+STE), /* 02203 - Mad Max - Lethal Xcess (STe).sndh */
+TIMEDB_ENTRY( 4a3c5e50, 5, 10908, YM+STE), /* 02203 - Mad Max - Lethal Xcess (STe).sndh */
+TIMEDB_ENTRY( 4a3c5e50, 6, 12160, YM+STE), /* 02203 - Mad Max - Lethal Xcess (STe).sndh */
+TIMEDB_ENTRY( 4a4d0981, 0, 6715, YM+TA+TB+TD), /* 01863 - Lotek Style - Photograph (Depech Mode).sndh */
+TIMEDB_ENTRY( 4a6eaac1, 0, 7609, YM+TA+TB+TD), /* 01624 - No More - No More 2.sndh */
+TIMEDB_ENTRY( 4a6f5ee3, 0, 27648, YM), /* 01462 - STU - DEEP.sndh */
+TIMEDB_ENTRY( 4a79bd65, 0, 241, YM), /* 00134 - David Whittaker - Slapfight.sndh */
+TIMEDB_ENTRY( 4a79bd65, 1, 8448, YM), /* 00134 - David Whittaker - Slapfight.sndh */
+TIMEDB_ENTRY( 4a79bd65, 2, 2260, YM), /* 00134 - David Whittaker - Slapfight.sndh */
+TIMEDB_ENTRY( 4a79bd65, 3, 1280, YM), /* 00134 - David Whittaker - Slapfight.sndh */
+TIMEDB_ENTRY( 4a79bd65, 4, 2184, YM), /* 00134 - David Whittaker - Slapfight.sndh */
+TIMEDB_ENTRY( 4a79bd65, 5, 3840, YM), /* 00134 - David Whittaker - Slapfight.sndh */
+TIMEDB_ENTRY( 4a79bd65, 6, 120, YM), /* 00134 - David Whittaker - Slapfight.sndh */
+TIMEDB_ENTRY( 4a79bd65, 7, 2641, YM), /* 00134 - David Whittaker - Slapfight.sndh */
+TIMEDB_ENTRY( 4a79bd65, 8, 1280, YM), /* 00134 - David Whittaker - Slapfight.sndh */
+TIMEDB_ENTRY( 4a82eb53, 0, 6913, YM+TD), /* 01983 - MSG - Outline.sndh */
+TIMEDB_ENTRY( 4a844c81, 0, 4224, YM), /* 01164 - Tyan - Tyan 3.sndh */
+TIMEDB_ENTRY( 4a941b05, 0, 6181, YM), /* 03677 - Dma-Sc - Antiques - Physics Part.sndh */
+TIMEDB_ENTRY( 4ab7ff41, 0, 1152, YM+TA), /* 00913 - Dark Angel - All Is Lost!.sndh */
+TIMEDB_ENTRY( 4ad3ea2a, 0, 10751, YM+TA+TB+TD), /* 04222 - lotek style-tscc - fujiology archivist.sndh */
+TIMEDB_ENTRY( 4addffb9, 0, 24192, YM), /* 01469 - STU - MOSQUITO.sndh */
+TIMEDB_ENTRY( 4adf2953, 0, 1535, YM), /* 02959 - Andrew Taylor - Rodland.sndh */
+TIMEDB_ENTRY( 4adf2953, 1, 1535, YM), /* 02959 - Andrew Taylor - Rodland.sndh */
+TIMEDB_ENTRY( 4adf2953, 2, 306, YM), /* 02959 - Andrew Taylor - Rodland.sndh */
+TIMEDB_ENTRY( 4adf2953, 3, 1156, YM), /* 02959 - Andrew Taylor - Rodland.sndh */
+TIMEDB_ENTRY( 4adf2953, 4, 757, YM), /* 02959 - Andrew Taylor - Rodland.sndh */
+TIMEDB_ENTRY( 4adf2953, 5, 1156, YM), /* 02959 - Andrew Taylor - Rodland.sndh */
+TIMEDB_ENTRY( 4adf2953, 6, 574, YM), /* 02959 - Andrew Taylor - Rodland.sndh */
+TIMEDB_ENTRY( 4adf2953, 7, 1727, YM), /* 02959 - Andrew Taylor - Rodland.sndh */
+TIMEDB_ENTRY( 4adf2953, 8, 1012, YM), /* 02959 - Andrew Taylor - Rodland.sndh */
+TIMEDB_ENTRY( 4ae357f9, 0, 6138, YM+TA), /* 01937 - Modmate - Impact.sndh */
+TIMEDB_ENTRY( 4b0767c5, 0, 4997, YM+TA+TB+TD), /* 02865 - 505-cpt^pdx - xmas.sndh */
+TIMEDB_ENTRY( 4b07caff, 0, 6400, YM+TA), /* 01632 - Nexus - Dreamzone - Circle twist.sndh */
+TIMEDB_ENTRY( 4b0bb5c9, 0, 4034, YM+TA+TB+TD), /* 02697 - Dubmood - Razor 1911 - Haschkaka LiveInterlude.sndh */
+TIMEDB_ENTRY( 4b10e039, 0, 10745, YM+TA), /* 02726 - Acid - Blue Boys Mod Compil 32.sndh */
+TIMEDB_ENTRY( 4b1404c5, 0, 6528, YM), /* 00794 - Crawdaddy - Japan.sndh */
+TIMEDB_ENTRY( 4b1998d1, 0, 5435, YM+TA+TB), /* 04750 - Bagarn - Spice Boys - XXX-Mas.sndh */
+TIMEDB_ENTRY( 4b354c95, 0, 52224, YM), /* 01435 - Stax - Living in a Dream.sndh */
+TIMEDB_ENTRY( 4b448ccd, 0, 5115, YM+TA+TB), /* 00064 - 505 - Jumps.sndh */
+TIMEDB_ENTRY( 4b448eac, 0, 5760, YM), /* 01195 - Excellence In Art - Offbeat.sndh */
+TIMEDB_ENTRY( 4b497fd4, 0, 3095, YM+TA+TD), /* 01106 - Timbral - DHS (2003) - Discoman.sndh */
+TIMEDB_ENTRY( 4b4ee88e, 0, 9213, YM+TA+TB), /* 01004 - DMA-SC - O-Style.sndh */
+TIMEDB_ENTRY( 4b72e92b, 0, 17044, YM+TA+TD), /* 02301 - Tao - Cream - Birth (.tSCc. Modcomp14).sndh */
+TIMEDB_ENTRY( 4b9293ff, 0, 6144, YM), /* 03214 - Tomchi - DCKolors.sndh */
+TIMEDB_ENTRY( 4b9dd6fc, 0, 4228, YM), /* 00576 - Jas C Brooke - Starquake.sndh */
+TIMEDB_ENTRY( 4b9dd6fc, 1, 2410, YM), /* 00576 - Jas C Brooke - Starquake.sndh */
+TIMEDB_ENTRY( 4b9dd6fc, 2, 2446, YM), /* 00576 - Jas C Brooke - Starquake.sndh */
+TIMEDB_ENTRY( 4b9dd6fc, 3, 1184, YM), /* 00576 - Jas C Brooke - Starquake.sndh */
+TIMEDB_ENTRY( 4b9dd6fc, 4, 3178, YM), /* 00576 - Jas C Brooke - Starquake.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 0, 893, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 1, 959, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 2, 1199, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 3, 1150, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 4, 1534, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 5, 1020, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 6, 1005, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 7, 640, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 8, 1565, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 9, 168, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 10, 308, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 11, 1588, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4b9e68c8, 12, 4606, YM), /* 01304 - Matt Furniss - Manix 90.sndh */
+TIMEDB_ENTRY( 4ba30d8f, 0, 3891, YM), /* 04348 - David Whittaker - Emlyn Hughes Arcade Quiz.sndh */
+TIMEDB_ENTRY( 4ba30d8f, 1, 68, YM), /* 04348 - David Whittaker - Emlyn Hughes Arcade Quiz.sndh */
+TIMEDB_ENTRY( 4ba30d8f, 2, 41, YM), /* 04348 - David Whittaker - Emlyn Hughes Arcade Quiz.sndh */
+TIMEDB_ENTRY( 4ba30d8f, 3, 28, YM), /* 04348 - David Whittaker - Emlyn Hughes Arcade Quiz.sndh */
+TIMEDB_ENTRY( 4ba30d8f, 4, 62, YM), /* 04348 - David Whittaker - Emlyn Hughes Arcade Quiz.sndh */
+TIMEDB_ENTRY( 4ba30d8f, 5, 77, YM), /* 04348 - David Whittaker - Emlyn Hughes Arcade Quiz.sndh */
+TIMEDB_ENTRY( 4ba30d8f, 6, 79, YM), /* 04348 - David Whittaker - Emlyn Hughes Arcade Quiz.sndh */
+TIMEDB_ENTRY( 4ba3b734, 0, 8836, YM+TA), /* 01348 - Scavenger - Myth.sndh */
+TIMEDB_ENTRY( 4bac0176, 0, 3456, YM), /* 01254 - Floopy - Xmas 03 Tune 3.sndh */
+TIMEDB_ENTRY( 4bb4cf79, 0, 2688, YM+TA), /* 00819 - Crawdaddy - XXX-XXX.sndh */
+TIMEDB_ENTRY( 4bb692c8, 0, 2560, YM), /* 01660 - Jedi - Unfinished.sndh */
+TIMEDB_ENTRY( 4bc6183a, 0, 4800, YM), /* 03493 - Ben Daglish - Chubby Gristle.sndh */
+TIMEDB_ENTRY( 4bc6183a, 1, 122400, YM), /* 03493 - Ben Daglish - Chubby Gristle.sndh */
+TIMEDB_ENTRY( 4bc6183a, 2, 122400, YM), /* 03493 - Ben Daglish - Chubby Gristle.sndh */
+TIMEDB_ENTRY( 4be36326, 0, 3361, YM), /* 01735 - Richard Joseph - Chaos Engine.sndh */
+TIMEDB_ENTRY( 4be36326, 1, 1921, YM), /* 01735 - Richard Joseph - Chaos Engine.sndh */
+TIMEDB_ENTRY( 4bea4113, 0, 2828, YM+TA+TB+TD), /* 00285 - Baggio - Evolution - Speed E is spooky.sndh */
+TIMEDB_ENTRY( 4bf2f8a5, 0, 8467, YM+TA+TD), /* 03829 - Frequent - Jernanger.sndh */
+TIMEDB_ENTRY( 4bf639b9, 0, 137, YM), /* 04505 - Chris Dukiet - Brain Jogging.sndh */
+TIMEDB_ENTRY( 4bf639b9, 1, 268, YM), /* 04505 - Chris Dukiet - Brain Jogging.sndh */
+TIMEDB_ENTRY( 4bf639b9, 2, 175, YM), /* 04505 - Chris Dukiet - Brain Jogging.sndh */
+TIMEDB_ENTRY( 4bf639b9, 3, 1005, YM), /* 04505 - Chris Dukiet - Brain Jogging.sndh */
+TIMEDB_ENTRY( 4c014df9, 0, 33793, YM+TA), /* 03764 - Tufty - Vangelis.sndh */
+TIMEDB_ENTRY( 4c195cc7, 0, 23041, YM+TA), /* 03837 - TPM - Lorna.sndh */
+TIMEDB_ENTRY( 4c3c06bd, 0, 2306, YM), /* 02172 - Mad Max - Scoop - That's The Way It Is.sndh */
+TIMEDB_ENTRY( 4c3c06bd, 1, 21698, YM), /* 02172 - Mad Max - Scoop - That's The Way It Is.sndh */
+TIMEDB_ENTRY( 4c66ad56, 0, 27648, YM+TA+TB+TD), /* 02611 - STU - PSYCHOTIC.sndh */
+TIMEDB_ENTRY( 4c7d722f, 0, 1608, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c7d722f, 1, 2937, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c7d722f, 5, 57, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c7d722f, 6, 96, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c7d722f, 7, 86, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c7d722f, 8, 75, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c7d722f, 9, 63, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c7d722f, 10, 36, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c7d722f, 11, 73, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c7d722f, 12, 105, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c7d722f, 13, 67, YM), /* 01298 - Matt Furniss - Hard Drivin.sndh */
+TIMEDB_ENTRY( 4c861a0e, 0, 6144, YM), /* 02159 - Mad Max - So Watt - TCB.sndh */
+TIMEDB_ENTRY( 4c99e00a, 0, 2047, YM), /* 04090 - Gary Wheaton - Real Programmer.sndh */
+TIMEDB_ENTRY( 4ca2f120, 0, 14941, YM+TA+TB), /* 00418 - Big Alec - Prophecy (ST News 11.1).sndh */
+TIMEDB_ENTRY( 4cb39ae7, 0, 9408, YM), /* 01505 - Rob Hubbard - Goldrunner.sndh */
+TIMEDB_ENTRY( 4cb89c38, 0, 18228, YM), /* 04468 - Charles Callet - Passengers in the Wind 2.sndh */
+TIMEDB_ENTRY( 4cb89c38, 1, 16512, YM), /* 04468 - Charles Callet - Passengers in the Wind 2.sndh */
+TIMEDB_ENTRY( 4cb89c38, 2, 9216, YM), /* 04468 - Charles Callet - Passengers in the Wind 2.sndh */
+TIMEDB_ENTRY( 4cb89c38, 3, 6416, YM), /* 04468 - Charles Callet - Passengers in the Wind 2.sndh */
+TIMEDB_ENTRY( 4cb89c38, 4, 12032, YM), /* 04468 - Charles Callet - Passengers in the Wind 2.sndh */
+TIMEDB_ENTRY( 4cb89c38, 5, 25392, YM), /* 04468 - Charles Callet - Passengers in the Wind 2.sndh */
+TIMEDB_ENTRY( 4cb89c38, 6, 19776, YM), /* 04468 - Charles Callet - Passengers in the Wind 2.sndh */
+TIMEDB_ENTRY( 4cb89c38, 7, 15872, YM), /* 04468 - Charles Callet - Passengers in the Wind 2.sndh */
+TIMEDB_ENTRY( 4cbebadc, 0, 195, YM), /* 03316 - SH3-RG - Fanfare.sndh */
+TIMEDB_ENTRY( 4cc72c6e, 0, 2091, YM), /* 00110 - David Whittaker - Jaws.sndh */
+TIMEDB_ENTRY( 4cc72c6e, 1, 57, YM), /* 00110 - David Whittaker - Jaws.sndh */
+TIMEDB_ENTRY( 4cc72c6e, 2, 80, YM), /* 00110 - David Whittaker - Jaws.sndh */
+TIMEDB_ENTRY( 4cc72c6e, 3, 76, YM), /* 00110 - David Whittaker - Jaws.sndh */
+TIMEDB_ENTRY( 4cc72c6e, 4, 94, YM), /* 00110 - David Whittaker - Jaws.sndh */
+TIMEDB_ENTRY( 4cc72c6e, 5, 3780, YM), /* 00110 - David Whittaker - Jaws.sndh */
+TIMEDB_ENTRY( 4cd34442, 0, 5120, YM), /* 01577 - Powa Pixel - GBISTCP - Mega 4 B.sndh */
+TIMEDB_ENTRY( 4ce32d80, 0, 8084, YM+TA+TB+TD), /* 02999 - 505-paradox - Sinesinger.sndh */
+TIMEDB_ENTRY( 4ce5b155, 0, 1920, YM), /* 03285 - Chris Denman - Rorkes Drift.sndh */
+TIMEDB_ENTRY( 4ce8caa8, 0, 11835, YM+TA+TB+TD), /* 01608 - Nemo - Tempest 2000 Mix.sndh */
+TIMEDB_ENTRY( 4cf10c3a, 0, 64298, YM+TA), /* 04036 - Roggie - Roggie 18.sndh */
+TIMEDB_ENTRY( 4d0139e8, 0, 3840, YM), /* 04443 - Iso - Easter Uncky.sndh */
+TIMEDB_ENTRY( 4d017b7d, 0, 3584, YM), /* 00604 - Chris Mad - Phalanx 3D.sndh */
+TIMEDB_ENTRY( 4d192683, 0, 4502, YM+TA+TB+TD), /* 00066 - 505 - Kill Bill.sndh */
+TIMEDB_ENTRY( 4d1f2f40, 0, 4607, YM), /* 00353 - Tony Williams - Super Monaco Grand Prix.sndh */
+TIMEDB_ENTRY( 4d1f2f40, 1, 3309, YM), /* 00353 - Tony Williams - Super Monaco Grand Prix.sndh */
+TIMEDB_ENTRY( 4d1f2f40, 2, 3095, YM), /* 00353 - Tony Williams - Super Monaco Grand Prix.sndh */
+TIMEDB_ENTRY( 4d1f2f40, 3, 416, YM), /* 00353 - Tony Williams - Super Monaco Grand Prix.sndh */
+TIMEDB_ENTRY( 4d1f2f40, 4, 200, YM), /* 00353 - Tony Williams - Super Monaco Grand Prix.sndh */
+TIMEDB_ENTRY( 4d1f2f40, 5, 559, YM), /* 00353 - Tony Williams - Super Monaco Grand Prix.sndh */
+TIMEDB_ENTRY( 4d23d41e, 0, 6818, YM), /* 01047 - Dr Beat - NTM - Crusaders.sndh */
+TIMEDB_ENTRY( 4d23fd12, 0, 3072, YM), /* 00612 - Chrispy Noodle - Commando Hi-Score.sndh */
+TIMEDB_ENTRY( 4d32f6ab, 0, 23104, YM+TA+TB+TD), /* 03372 - STU - KYOU WA KOKO MADE.sndh */
+TIMEDB_ENTRY( 4d41504d, 0, 2213, YM), /* 03937 - Mr Coke - Dasda.sndh */
+TIMEDB_ENTRY( 4d4208c3, 0, 9840, YM), /* 04480 - Dave Lowe - Raffles.sndh */
+TIMEDB_ENTRY( 4d63d8b4, 0, 35640, YM+TA), /* 03482 - Peter Jorgensen - Out For You.sndh */
+TIMEDB_ENTRY( 4d68ce12, 0, 31488, YM), /* 01458 - STU - AHARMAN.sndh */
+TIMEDB_ENTRY( 4d6b8e91, 0, 5369, YM+TA+TB+TD), /* 04103 - lotek style-tscc - noisy again 2013.sndh */
+TIMEDB_ENTRY( 4d75dfa2, 0, 11200, YM+TD), /* 00360 - Wolfgang - ICS Intro.sndh */
+TIMEDB_ENTRY( 4d8ebcb0, 0, 3088, YM), /* 04394 - Ben Daglish - Saint & Greavsie.sndh */
+TIMEDB_ENTRY( 4dae1219, 0, 5817, YM), /* 03566 - DMA SC - Coast II Coast Edit.sndh */
+TIMEDB_ENTRY( 4db771b0, 0, 6912, YM+TD), /* 02413 - Nexus 6 - Tired Guitars.sndh */
+TIMEDB_ENTRY( 4dbed7d0, 0, 13824, YM+TB+TD), /* 02609 - STU - OLDSKOOL.sndh */
+TIMEDB_ENTRY( 4dbf1a4b, 0, 3787, YM), /* 03928 - Unknown - Sound 2.sndh */
+TIMEDB_ENTRY( 4dc1767c, 0, 252, YM), /* 01912 - Marcer - Trumorre.sndh */
+TIMEDB_ENTRY( 4dc92979, 0, 5016, YM), /* 03885 - Unknown - Blueberry Hill.sndh */
+TIMEDB_ENTRY( 4dca576f, 0, 3072, YM), /* 04828 - T1000 - Bits 55a.sndh */
+TIMEDB_ENTRY( 4dcd8678, 0, 4029, YM), /* 01533 - Iso - Broodje Shoarma.sndh */
+TIMEDB_ENTRY( 4de0a2ec, 0, 105900, YM+TA), /* 03725 - Spaz - Starball.sndh */
+TIMEDB_ENTRY( 4e014863, 0, 11520, YM+TB+TD), /* 03459 - Marcer - Blues.sndh */
+TIMEDB_ENTRY( 4e068890, 0, 82938, YM+TA), /* 04039 - Roggie - Roggie the baked bean on toast.sndh */
+TIMEDB_ENTRY( 4e167adc, 0, 18432, YM), /* 03249 - T1000 - The Bits Club 24.sndh */
+TIMEDB_ENTRY( 4e209a72, 0, 9600, YM), /* 03247 - T1000 - The Beast Club - TBC 19.sndh */
+TIMEDB_ENTRY( 4e397598, 0, 6912, YM), /* 03250 - T1000 - The Bits Club 25.sndh */
+TIMEDB_ENTRY( 4e3fefd5, 0, 4219, YM), /* 04653 - Beast - TSC - Unknown Blipblopper.sndh */
+TIMEDB_ENTRY( 4e4db648, 0, 262, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 1, 2, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 2, 106, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 3, 220, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 4, 147, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 5, 160, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 6, 200, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 7, 226, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 8, 164, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 9, 26, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 10, 26, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 11, 26, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 12, 26, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 13, 26, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 14, 31, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 15, 31, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 16, 31, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 17, 26, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 18, 54, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 19, 1344, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 20, 1280, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e4db648, 21, 826, YM), /* 04682 - Ronan - Kass Kong.sndh */
+TIMEDB_ENTRY( 4e58d311, 0, 11088, YM), /* 01059 - Jonathan Dunn - Hook.sndh */
+TIMEDB_ENTRY( 4e5947e5, 0, 831, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 1, 253, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 2, 247, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 3, 151, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 4, 152, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 5, 151, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 6, 333, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 7, 781, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 8, 239, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 9, 240, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 10, 310, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 11, 314, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 12, 273, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 13, 293, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 14, 1049, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 17, 195, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 18, 206, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 19, 195, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 20, 197, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 28, 330, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 29, 314, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 30, 545, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 31, 270, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 32, 450, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 33, 282, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 34, 273, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 35, 561, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 36, 678, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 37, 186, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 38, 186, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 39, 177, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 40, 167, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 41, 275, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 42, 278, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 43, 907, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 44, 176, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 45, 186, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 46, 1120, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 47, 323, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 48, 499, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 49, 200, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 50, 598, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 51, 266, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 52, 327, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 53, 691, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 54, 268, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 55, 171, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 56, 267, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 57, 171, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 58, 216, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 59, 199, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 60, 216, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 61, 200, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5947e5, 62, 270, YM), /* 04725 - Unknown - Play and Read - Learn to Read with Prof.sndh */
+TIMEDB_ENTRY( 4e5a4612, 0, 1152, YM+TD), /* 02643 - Miggy - Sisco Sun (Unfinished).sndh */
+TIMEDB_ENTRY( 4e946cbe, 0, 41855, YM+TA+TB+TD), /* 03651 - Rebb - French realtime.sndh */
+TIMEDB_ENTRY( 4e982fc8, 0, 533, YM), /* 04691 - Roderick Martin - Lunacy.sndh */
+TIMEDB_ENTRY( 4e982fc8, 1, 533, YM), /* 04691 - Roderick Martin - Lunacy.sndh */
+TIMEDB_ENTRY( 4e982fc8, 2, 149, YM), /* 04691 - Roderick Martin - Lunacy.sndh */
+TIMEDB_ENTRY( 4e982fc8, 3, 1492, YM), /* 04691 - Roderick Martin - Lunacy.sndh */
+TIMEDB_ENTRY( 4eaae9f6, 0, 2817, YM), /* 03896 - Unknown - Volkslied.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 0, 4147, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 1, 1015, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 2, 60, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 3, 1506, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 4, 1543, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 5, 2281, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 6, 813, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 7, 96, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 8, 4147, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 9, 775, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecaf12f, 10, 1686, YM), /* 04137 - Arthur F Vosseler - Euroquiz.sndh */
+TIMEDB_ENTRY( 4ecd1790, 0, 7167, YM+TA+TB), /* 03435 - 4mat & malodix - Despair.sndh */
+TIMEDB_ENTRY( 4ed01492, 0, 17408, YM+TA+TB+TD), /* 02091 - Mad Max - One Man and his Droid - Sid.sndh */
+TIMEDB_ENTRY( 4eefb3ae, 0, 8448, YM), /* 02179 - Mad Max - Atomino.sndh */
+TIMEDB_ENTRY( 4eefb3ae, 1, 11904, YM), /* 02179 - Mad Max - Atomino.sndh */
+TIMEDB_ENTRY( 4eefb3ae, 2, 5376, YM), /* 02179 - Mad Max - Atomino.sndh */
+TIMEDB_ENTRY( 4eefb3ae, 3, 4608, YM), /* 02179 - Mad Max - Atomino.sndh */
+TIMEDB_ENTRY( 4f21bcd9, 0, 13376, YM), /* 00150 - David Whittaker - Verminator.sndh */
+TIMEDB_ENTRY( 4f21bcd9, 1, 2304, YM), /* 00150 - David Whittaker - Verminator.sndh */
+TIMEDB_ENTRY( 4f21bcd9, 2, 2304, YM), /* 00150 - David Whittaker - Verminator.sndh */
+TIMEDB_ENTRY( 4f21bcd9, 3, 5376, YM), /* 00150 - David Whittaker - Verminator.sndh */
+TIMEDB_ENTRY( 4f21bcd9, 4, 2688, YM), /* 00150 - David Whittaker - Verminator.sndh */
+TIMEDB_ENTRY( 4f21bcd9, 5, 247, YM), /* 00150 - David Whittaker - Verminator.sndh */
+TIMEDB_ENTRY( 4f34e37d, 0, 3300, YM), /* 01290 - Matt Furniss - Hill Street Blues.sndh */
+TIMEDB_ENTRY( 4f4086e1, 0, 7708, YM), /* 00439 - Big Alec - Structure.sndh */
+TIMEDB_ENTRY( 4f440b64, 0, 10800, YM), /* 02036 - Mad Max - Hunter Patrol.sndh */
+TIMEDB_ENTRY( 4f4fae18, 0, 556, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 1, 514, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 2, 202, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 3, 3183, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 4, 1152, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 5, 768, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 6, 498, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 7, 97, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 8, 103, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 9, 398, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 10, 275, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 11, 371, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 12, 159, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f4fae18, 13, 559, YM), /* 04718 - William Anderson - The Galactic Miner.sndh */
+TIMEDB_ENTRY( 4f68fcdf, 0, 3146, YM), /* 01566 - Jason Page - Rainbow Islands.sndh */
+TIMEDB_ENTRY( 4f68fcdf, 1, 1169, YM), /* 01566 - Jason Page - Rainbow Islands.sndh */
+TIMEDB_ENTRY( 4f68fcdf, 2, 270, YM), /* 01566 - Jason Page - Rainbow Islands.sndh */
+TIMEDB_ENTRY( 4f68fcdf, 3, 334, YM), /* 01566 - Jason Page - Rainbow Islands.sndh */
+TIMEDB_ENTRY( 4f68fcdf, 4, 196, YM), /* 01566 - Jason Page - Rainbow Islands.sndh */
+TIMEDB_ENTRY( 4f68fcdf, 5, 981, YM), /* 01566 - Jason Page - Rainbow Islands.sndh */
+TIMEDB_ENTRY( 4f68fcdf, 6, 1626, YM), /* 01566 - Jason Page - Rainbow Islands.sndh */
+TIMEDB_ENTRY( 4f68fcdf, 7, 344, YM), /* 01566 - Jason Page - Rainbow Islands.sndh */
+TIMEDB_ENTRY( 4f68fcdf, 8, 248, YM), /* 01566 - Jason Page - Rainbow Islands.sndh */
+TIMEDB_ENTRY( 4f68fcdf, 9, 154, YM), /* 01566 - Jason Page - Rainbow Islands.sndh */
+TIMEDB_ENTRY( 4f6da7eb, 0, 1919, YM+TA+TB), /* 03431 - Per Almered (XiA) 2009 - Hit the Road Jack-tutorial.sndh */
+TIMEDB_ENTRY( 4f73e7bf, 0, 96207, YM+TA), /* 03705 - Sparky - Fistfull of Dollars (Ennio Morricone).sndh */
+TIMEDB_ENTRY( 4f7a867c, 0, 12288, YM), /* 01028 - Doclands - Lightning Demo - Plasma.sndh */
+TIMEDB_ENTRY( 4fa9f8d4, 0, 5196, YM), /* 04388 - Paul Summers - Matrix Marauders.sndh */
+TIMEDB_ENTRY( 4fa9f8d4, 1, 6140, YM), /* 04388 - Paul Summers - Matrix Marauders.sndh */
+TIMEDB_ENTRY( 4fa9f8d4, 2, 4800, YM), /* 04388 - Paul Summers - Matrix Marauders.sndh */
+TIMEDB_ENTRY( 4fad817d, 0, 5120, YM+TA), /* 04592 - Crawdaddy - Jammers.sndh */
+TIMEDB_ENTRY( 4fc24836, 0, 6138, YM+TA+TB+TD), /* 00989 - Dma-Sc-Sector1^YM-Rockerz - The First Blip-Blop Noel.sndh */
+TIMEDB_ENTRY( 4fc33b4e, 0, 383, YM+TA+TB), /* 03295 - Dma-Sc - ATIPYK Developments - Manical Drop - Menu.sndh */
+TIMEDB_ENTRY( 4fc8ab31, 0, 39199, YM), /* 03999 - Christophe Fevre - Blues Brothers.sndh */
+TIMEDB_ENTRY( 4fc8ab31, 1, 27215, YM), /* 03999 - Christophe Fevre - Blues Brothers.sndh */
+TIMEDB_ENTRY( 4fc8ab31, 2, 19507, YM), /* 03999 - Christophe Fevre - Blues Brothers.sndh */
+TIMEDB_ENTRY( 4fc8ab31, 3, 34285, YM), /* 03999 - Christophe Fevre - Blues Brothers.sndh */
+TIMEDB_ENTRY( 4fd604b3, 0, 24870, YM+TA), /* 04677 - Unknown - Demo 2.sndh */
+TIMEDB_ENTRY( 4fdae614, 0, 12290, YM), /* 01897 - LTK - Mage Mix - Phaleon - Mystic.sndh */
+TIMEDB_ENTRY( 4ff09498, 0, 29184, YM), /* 01465 - STU - FLOWER.sndh */
+TIMEDB_ENTRY( 4ff0e760, 0, 1728, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 1, 1536, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 2, 2560, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 3, 1152, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 4, 2304, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 5, 512, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 6, 575, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 7, 384, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 8, 238, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 9, 2304, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 10, 192, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 11, 1920, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 12, 1728, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 13, 768, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 14, 1536, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 15, 2304, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff0e760, 16, 960, YM), /* 00348 - Tony Williams - Pang.sndh */
+TIMEDB_ENTRY( 4ff685cc, 0, 2048, YM), /* 00799 - Crawdaddy - Looking For Peace.sndh */
+TIMEDB_ENTRY( 4ff6dc2c, 0, 8442, YM+TA+TB+TD), /* 02831 - Msg - Superfly tune 8.sndh */
+TIMEDB_ENTRY( 5000908c, 0, 5795, YM+TA+TB+TD), /* 03634 - Timbaland - Kisse Katten.sndh */
+TIMEDB_ENTRY( 503196f8, 0, 85, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503196f8, 1, 133, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503196f8, 2, 517, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503196f8, 3, 63, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503196f8, 4, 27, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503196f8, 5, 56, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503196f8, 6, 42, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503196f8, 7, 42, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503196f8, 8, 79, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503196f8, 9, 67, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503196f8, 10, 4952, YM), /* 00851 - Ben Daglish - Footballer of the Year 2.sndh */
+TIMEDB_ENTRY( 503d6010, 0, 10944, YM), /* 02023 - Mad Max - Chimera.sndh */
+TIMEDB_ENTRY( 503d6010, 1, 6144, YM), /* 02023 - Mad Max - Chimera.sndh */
+TIMEDB_ENTRY( 504c6e55, 0, 54981, YM), /* 02111 - Mad Max - Knucklebusters.sndh */
+TIMEDB_ENTRY( 5052dac8, 0, 22652, YM+TA+TB+TD), /* 02596 - STU - INEXISTENT.sndh */
+TIMEDB_ENTRY( 50601a0e, 0, 15360, YM), /* 01818 - Paul Loraine - Scooby Doo and Scrappy Doo.sndh */
+TIMEDB_ENTRY( 50601a0e, 1, 897, YM), /* 01818 - Paul Loraine - Scooby Doo and Scrappy Doo.sndh */
+TIMEDB_ENTRY( 50601a0e, 2, 4475, YM), /* 01818 - Paul Loraine - Scooby Doo and Scrappy Doo.sndh */
+TIMEDB_ENTRY( 50601a0e, 3, 2047, YM), /* 01818 - Paul Loraine - Scooby Doo and Scrappy Doo.sndh */
+TIMEDB_ENTRY( 50654693, 0, 26240, YM+TA+TB+TD), /* 02909 - Helene - tecnotrance.sndh */
+TIMEDB_ENTRY( 506e5380, 0, 4475, YM+TA+TB+TD), /* 01244 - Evil - Arpa.sndh */
+TIMEDB_ENTRY( 50725811, 0, 6563, YM+TA+TB+TD), /* 02866 - 505-checkpoint^paradox - YM2006 (STE only).sndh */
+TIMEDB_ENTRY( 507729d8, 0, 4032, YM), /* 04004 - Celtic - Gnurk Snor Bobs.sndh */
+TIMEDB_ENTRY( 50981e0d, 0, 7680, YM), /* 01455 - Stax - Wutz.sndh */
+TIMEDB_ENTRY( 5099c5e2, 0, 8188, YM+TA+TB+TD), /* 00008 - gwEm - Tubular Crusade.sndh */
+TIMEDB_ENTRY( 50f9db32, 0, 13887, YM), /* 02362 - Nexus 6 - Axmnpfnmumpf.sndh */
+TIMEDB_ENTRY( 50fc9eb4, 0, 4566, YM+TA+TD), /* 00034 - 505 - Bla.sndh */
+TIMEDB_ENTRY( 5105bc1e, 0, 9520, YM+TA+TD), /* 02438 - bob monkhouze - phoneomenon.sndh */
+TIMEDB_ENTRY( 5109cc6d, 0, 14783, YM+TA+TB+TD), /* 02693 - Dubmood - Razor 1911 - 4Mats AnarchyMenu #3.sndh */
+TIMEDB_ENTRY( 511553f6, 0, 6336, YM), /* 00768 - Count Zero - Decade Demo - Parascroll.sndh */
+TIMEDB_ENTRY( 511e2226, 0, 9600, YM), /* 01508 - The Fate - 3615 Gen4 Demo (Thrust Remix).sndh */
+TIMEDB_ENTRY( 513500c1, 0, 8666, YM+TA+TB+TD), /* 00234 - AIO - Revive Me.sndh */
+TIMEDB_ENTRY( 513618ca, 0, 20730, YM+TA), /* 01446 - Stax - Revotus - Digi.sndh */
+TIMEDB_ENTRY( 5140d30f, 0, 5184, YM), /* 03656 - Rhino - Xmas 2011.sndh */
+TIMEDB_ENTRY( 5158f097, 0, 20065, YM+TA), /* 04019 - Roggie - Phobia.sndh */
+TIMEDB_ENTRY( 515e600b, 0, 28801, YM), /* 02038 - Mad Max - International Karate.sndh */
+TIMEDB_ENTRY( 516d61de, 0, 690, YM), /* 04526 - Ewald Greiml - Eierkopf.sndh */
+TIMEDB_ENTRY( 516d61de, 1, 133, YM), /* 04526 - Ewald Greiml - Eierkopf.sndh */
+TIMEDB_ENTRY( 516d61de, 2, 2364, YM), /* 04526 - Ewald Greiml - Eierkopf.sndh */
+TIMEDB_ENTRY( 51704069, 0, 17088, YM), /* 02901 - Techno - Graaal Demo.sndh */
+TIMEDB_ENTRY( 5177133b, 0, 4096, YM+TA), /* 04591 - Technoblip - Bom Tsh Bap Bap.sndh */
+TIMEDB_ENTRY( 5180476a, 0, 16705, YM+TA), /* 03878 - Mad Max - Sanxion Loader.sndh */
+TIMEDB_ENTRY( 51841b4d, 0, 3855, YM), /* 04453 - Kafka - Beginning of the Ending Demo.sndh */
+TIMEDB_ENTRY( 519ca005, 0, 6189, YM), /* 00843 - Ben Daglish - California Games.sndh */
+TIMEDB_ENTRY( 519ca005, 1, 1781, YM), /* 00843 - Ben Daglish - California Games.sndh */
+TIMEDB_ENTRY( 519ca005, 2, 230, YM), /* 00843 - Ben Daglish - California Games.sndh */
+TIMEDB_ENTRY( 519ca005, 3, 3491, YM), /* 00843 - Ben Daglish - California Games.sndh */
+TIMEDB_ENTRY( 519ca005, 4, 2509, YM), /* 00843 - Ben Daglish - California Games.sndh */
+TIMEDB_ENTRY( 519ca005, 5, 2337, YM), /* 00843 - Ben Daglish - California Games.sndh */
+TIMEDB_ENTRY( 519ca005, 6, 4660, YM), /* 00843 - Ben Daglish - California Games.sndh */
+TIMEDB_ENTRY( 519ca005, 7, 988, YM), /* 00843 - Ben Daglish - California Games.sndh */
+TIMEDB_ENTRY( 519ca005, 8, 1572, YM), /* 00843 - Ben Daglish - California Games.sndh */
+TIMEDB_ENTRY( 51aee08e, 0, 18816, YM), /* 03248 - T1000 - The Bits Club 22.sndh */
+TIMEDB_ENTRY( 51b18088, 0, 4559, YM), /* 03119 - Unknown - Han Solo and the Princess.sndh */
+TIMEDB_ENTRY( 51b339b1, 0, 3256, YM), /* 02879 - Beast - Shitt.sndh */
+TIMEDB_ENTRY( 51bc0c87, 0, 73137, YM+TA), /* 04856 - Michel Winogradoff - Turbo Cup.sndh */
+TIMEDB_ENTRY( 51bdedb7, 0, 3834, YM), /* 04253 - 505 - Checkpoint - duckwalk.sndh */
+TIMEDB_ENTRY( 51cc20a7, 0, 17080, YM), /* 02030 - Mad Max - Flash Gordon.sndh */
+TIMEDB_ENTRY( 51cd3d99, 0, 2212, YM), /* 04194 - Unknown - Postman Pat 3.sndh */
+TIMEDB_ENTRY( 51d0e0ed, 0, 4991, YM), /* 00311 - Gary Wheaton - Jimi.sndh */
+TIMEDB_ENTRY( 51e0d07b, 0, 4608, YM), /* 02448 - David Whittaker - First Person Pinball.sndh */
+TIMEDB_ENTRY( 51e0d07b, 1, 6144, YM), /* 02448 - David Whittaker - First Person Pinball.sndh */
+TIMEDB_ENTRY( 51e0d07b, 2, 10053, YM), /* 02448 - David Whittaker - First Person Pinball.sndh */
+TIMEDB_ENTRY( 51e0d07b, 3, 2389, YM), /* 02448 - David Whittaker - First Person Pinball.sndh */
+TIMEDB_ENTRY( 51eaa7ba, 0, 9853, YM), /* 01902 - Luebke - Paracon 3 invitro.sndh */
+TIMEDB_ENTRY( 51ef485a, 0, 8209, YM), /* 01041 - Donald Fakk - Zzzlajm.sndh */
+TIMEDB_ENTRY( 51fb2e63, 0, 23044, YM+TA), /* 01741 - Jovis - Lametrop - 3D Bobs.sndh */
+TIMEDB_ENTRY( 520064ac, 0, 4992, YM), /* 04846 - t1000 - Bits 49.sndh */
+TIMEDB_ENTRY( 5216af14, 0, 7165, YM), /* 01118 - Paul Tonge - B17 Flying Fotress.sndh */
+TIMEDB_ENTRY( 5220974f, 0, 6719, YM+TA), /* 04663 - Dave Lowe - Starglider 2.sndh */
+TIMEDB_ENTRY( 522156f8, 0, 9472, YM), /* 02736 - Tony Williams - Chuckie Egg 2.sndh */
+TIMEDB_ENTRY( 522156f8, 1, 97, YM), /* 02736 - Tony Williams - Chuckie Egg 2.sndh */
+TIMEDB_ENTRY( 52631c92, 0, 6656, YM), /* 00255 - Antichrist - Low Tune.sndh */
+TIMEDB_ENTRY( 5281ae1a, 0, 5085, YM), /* 00246 - AN Cool - A.N. Bass.sndh */
+TIMEDB_ENTRY( 5284ae81, 0, 5120, YM), /* 03196 - 4-Mat - Arcade Classix - Hiscore.sndh */
+TIMEDB_ENTRY( 52a8e499, 0, 10752, YM+TA+TD), /* 02271 - Tao - Cream - The Dancer (Steps).sndh */
+TIMEDB_ENTRY( 52b0c50f, 0, 8639, YM), /* 00507 - Tangens - Synthetic Visions - Pulsing Balls.sndh */
+TIMEDB_ENTRY( 52ca7216, 0, 7420, YM+TA+TB+TD), /* 03650 - 505-Checkpoint - Revision 2012.sndh */
+TIMEDB_ENTRY( 52dc9635, 0, 32320, YM+TA+TB+TD), /* 02527 - Salkin-047 - Ko ko Kossan.sndh */
+TIMEDB_ENTRY( 52dd204c, 0, 5861, YM+TA), /* 04415 - EVE - Makelot.sndh */
+TIMEDB_ENTRY( 52defff8, 0, 535, YM), /* 04156 - Unknown - Pompom.sndh */
+TIMEDB_ENTRY( 52e68367, 0, 1944, YM+TA), /* 02633 - Miggy - DevilVer1(Unfinished).sndh */
+TIMEDB_ENTRY( 52ee21bc, 0, 4842, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 1, 403, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 2, 1382, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 3, 495, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 4, 1355, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 5, 604, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 6, 453, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 7, 1322, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 8, 1489, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 9, 1923, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 10, 1388, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 11, 857, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 12, 816, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 13, 446, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 14, 1360, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 15, 402, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 16, 583, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 17, 944, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 18, 2034, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 52ee21bc, 19, 1796, YM), /* 03977 - David Schroeder - War in Middle Earth.sndh */
+TIMEDB_ENTRY( 53268dac, 0, 5369, YM+TA), /* 02599 - STU - INTRO.sndh */
+TIMEDB_ENTRY( 5330a665, 0, 576, YM), /* 03411 - Phil Bak - Yolanda.sndh */
+TIMEDB_ENTRY( 5330a665, 2, 7296, YM), /* 03411 - Phil Bak - Yolanda.sndh */
+TIMEDB_ENTRY( 5330a665, 3, 3131, YM), /* 03411 - Phil Bak - Yolanda.sndh */
+TIMEDB_ENTRY( 5330a665, 4, 1920, YM), /* 03411 - Phil Bak - Yolanda.sndh */
+TIMEDB_ENTRY( 5354a14f, 0, 11265, YM+TA), /* 01035 - Donald Fakk - Digi Dick.sndh */
+TIMEDB_ENTRY( 535d8acd, 0, 4701, YM), /* 00249 - AN Cool - Zuzzexx!.sndh */
+TIMEDB_ENTRY( 5389443c, 0, 4986, YM+TA), /* 04232 - 505 - 10th.sndh */
+TIMEDB_ENTRY( 538cf8c3, 0, 4416, YM), /* 01032 - Dolby - Piece Of Shit.sndh */
+TIMEDB_ENTRY( 53935695, 0, 768, YM), /* 00978 - Chris Denman - International Championship Athletics.sndh */
+TIMEDB_ENTRY( 53b03213, 0, 12898, YM+TA+TB+TD), /* 01854 - Lotek Style - Eiswelt.sndh */
+TIMEDB_ENTRY( 53b505bc, 0, 20064, YM+TA), /* 02184 - Mad Max (Jochen Hippel) - Chambers of Shaolin.sndh */
+TIMEDB_ENTRY( 53b505bc, 1, 9213, YM+TA), /* 02184 - Mad Max (Jochen Hippel) - Chambers of Shaolin.sndh */
+TIMEDB_ENTRY( 53b505bc, 2, 8658, YM+TA), /* 02184 - Mad Max (Jochen Hippel) - Chambers of Shaolin.sndh */
+TIMEDB_ENTRY( 53b505bc, 3, 47324, YM+TA), /* 02184 - Mad Max (Jochen Hippel) - Chambers of Shaolin.sndh */
+TIMEDB_ENTRY( 53b505bc, 4, 7296, YM), /* 02184 - Mad Max (Jochen Hippel) - Chambers of Shaolin.sndh */
+TIMEDB_ENTRY( 53b505bc, 5, 24589, YM), /* 02184 - Mad Max (Jochen Hippel) - Chambers of Shaolin.sndh */
+TIMEDB_ENTRY( 53b505bc, 6, 8544, YM), /* 02184 - Mad Max (Jochen Hippel) - Chambers of Shaolin.sndh */
+TIMEDB_ENTRY( 53b505bc, 7, 3456, YM), /* 02184 - Mad Max (Jochen Hippel) - Chambers of Shaolin.sndh */
+TIMEDB_ENTRY( 53b505bc, 8, 240, YM), /* 02184 - Mad Max (Jochen Hippel) - Chambers of Shaolin.sndh */
+TIMEDB_ENTRY( 53b505bc, 9, 11392, YM), /* 02184 - Mad Max (Jochen Hippel) - Chambers of Shaolin.sndh */
+TIMEDB_ENTRY( 53be0a5b, 0, 43392, YM+TD), /* 02582 - STU - CHIPRAPE.sndh */
+TIMEDB_ENTRY( 53cea771, 0, 6272, YM), /* 03700 - Chris Mad - Overdrive Demo - Music Box.sndh */
+TIMEDB_ENTRY( 53cea771, 2, 7168, YM), /* 03700 - Chris Mad - Overdrive Demo - Music Box.sndh */
+TIMEDB_ENTRY( 53cea771, 3, 11520, YM), /* 03700 - Chris Mad - Overdrive Demo - Music Box.sndh */
+TIMEDB_ENTRY( 53cea771, 4, 12096, YM), /* 03700 - Chris Mad - Overdrive Demo - Music Box.sndh */
+TIMEDB_ENTRY( 53cea771, 5, 3840, YM), /* 03700 - Chris Mad - Overdrive Demo - Music Box.sndh */
+TIMEDB_ENTRY( 53cea771, 6, 15744, YM), /* 03700 - Chris Mad - Overdrive Demo - Music Box.sndh */
+TIMEDB_ENTRY( 53e01684, 0, 4025, YM+TB+TD), /* 04286 - 505-cpt^pdx - Melting.sndh */
+TIMEDB_ENTRY( 53e105e5, 0, 3286, YM), /* 03925 - Unknown - Musik 002.sndh */
+TIMEDB_ENTRY( 53ee72fb, 0, 5772, YM), /* 04339 - Nexus 6 - Moskito Attack.sndh */
+TIMEDB_ENTRY( 53f1f6e8, 0, 6144, YM), /* 04406 - Dr Beat - Galtan 6 - Elite Intro 3.sndh */
+TIMEDB_ENTRY( 540cb5f2, 0, 11520, YM+TA+TD), /* 02256 - Tao - Cream - For Abyss (Steps).sndh */
+TIMEDB_ENTRY( 540da2c3, 0, 9216, YM), /* 01079 - Excellence In Art - DHS Intro.sndh */
+TIMEDB_ENTRY( 5417b380, 0, 4037, YM), /* 00045 - 505 - Clowns.sndh */
+TIMEDB_ENTRY( 5421b25b, 0, 5760, YM), /* 02485 - gwEm - Acidic Tears.sndh */
+TIMEDB_ENTRY( 543e59ec, 0, 2386, YM), /* 03866 - 505 - Chasey Intro.sndh */
+TIMEDB_ENTRY( 544250d8, 0, 1275, YM), /* 00467 - Augustin Vidovic - X-Out.sndh */
+TIMEDB_ENTRY( 54425228, 0, 1565, YM), /* 02465 - Iso - It's Happening.sndh */
+TIMEDB_ENTRY( 544381a1, 0, 9783, YM), /* 02140 - Mad Max - Commando - LSD.sndh */
+TIMEDB_ENTRY( 5444fa7d, 0, 4025, YM+TA+TD), /* 01157 - Tyan - Serious 2.sndh */
+TIMEDB_ENTRY( 544ba2ae, 0, 3764, YM), /* 04507 - Francois Lionet - Bullet Train.sndh */
+TIMEDB_ENTRY( 5453fbd2, 0, 4929, YM), /* 00888 - Adrian Dalecki - Rollin Ronny B.sndh */
+TIMEDB_ENTRY( 545e3d52, 0, 6715, YM), /* 00547 - Allister Brimble - Bignose The Caveman.sndh */
+TIMEDB_ENTRY( 545e3d52, 1, 379, YM), /* 00547 - Allister Brimble - Bignose The Caveman.sndh */
+TIMEDB_ENTRY( 545e3d52, 2, 1531, YM), /* 00547 - Allister Brimble - Bignose The Caveman.sndh */
+TIMEDB_ENTRY( 545e3d52, 3, 119, YM), /* 00547 - Allister Brimble - Bignose The Caveman.sndh */
+TIMEDB_ENTRY( 546447a2, 0, 6559, YM), /* 02417 - Nexus 6 - Zuck-Lohn.sndh */
+TIMEDB_ENTRY( 546447a2, 1, 7008, YM), /* 02417 - Nexus 6 - Zuck-Lohn.sndh */
+TIMEDB_ENTRY( 546447a2, 2, 7839, YM), /* 02417 - Nexus 6 - Zuck-Lohn.sndh */
+TIMEDB_ENTRY( 546447a2, 3, 270, YM), /* 02417 - Nexus 6 - Zuck-Lohn.sndh */
+TIMEDB_ENTRY( 546447a2, 4, 7616, YM), /* 02417 - Nexus 6 - Zuck-Lohn.sndh */
+TIMEDB_ENTRY( 546844bc, 0, 980, YM), /* 02765 - Bobby Prince ST by Dma-Sc - High Score.sndh */
+TIMEDB_ENTRY( 546d4c97, 0, 166262, YM+TA), /* 04051 - Roggie - Ameobas rule ok.sndh */
+TIMEDB_ENTRY( 546e3caa, 0, 4752, YM), /* 02920 - Richard Joseph - Wizkid.sndh */
+TIMEDB_ENTRY( 546e3caa, 1, 4416, YM), /* 02920 - Richard Joseph - Wizkid.sndh */
+TIMEDB_ENTRY( 546e3caa, 2, 3456, YM), /* 02920 - Richard Joseph - Wizkid.sndh */
+TIMEDB_ENTRY( 546e3caa, 3, 6240, YM), /* 02920 - Richard Joseph - Wizkid.sndh */
+TIMEDB_ENTRY( 546e3caa, 4, 3258, YM), /* 02920 - Richard Joseph - Wizkid.sndh */
+TIMEDB_ENTRY( 546e3caa, 6, 1920, YM), /* 02920 - Richard Joseph - Wizkid.sndh */
+TIMEDB_ENTRY( 546e3caa, 7, 2688, YM), /* 02920 - Richard Joseph - Wizkid.sndh */
+TIMEDB_ENTRY( 546f51a2, 0, 10752, YM+TA), /* 04118 - Tao - The Dancer - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 5473065c, 0, 1152, YM+TA), /* 01367 - Scavenger - What the Fuck?.sndh */
+TIMEDB_ENTRY( 54750c2b, 0, 3264, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 1, 4946, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 2, 7360, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 3, 10752, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 4, 14400, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 5, 3552, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 6, 4160, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 7, 2304, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 8, 3920, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 9, 3312, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 10, 3168, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 11, 672, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 12, 408, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 13, 480, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 14, 768, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 15, 768, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 16, 1176, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 17, 792, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 18, 384, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 19, 414, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 20, 768, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 21, 576, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 22, 1008, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 23, 336, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 24, 576, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 25, 384, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 26, 888, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 27, 1056, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 28, 1440, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 29, 540, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 30, 792, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 31, 768, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 32, 588, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 33, 600, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 54750c2b, 34, 1560, YM), /* 04613 - Dave Lowe - The Games - Summer Edition.sndh */
+TIMEDB_ENTRY( 5477020a, 0, 14602, YM), /* 02063 - Mad Max - Zoolook.sndh */
+TIMEDB_ENTRY( 54865e57, 0, 12078, YM+TA), /* 02970 - WE Music - Captain Planet.sndh */
+TIMEDB_ENTRY( 54865e57, 1, 10032, YM+TA), /* 02970 - WE Music - Captain Planet.sndh */
+TIMEDB_ENTRY( 54865e57, 2, 7922, YM+TA), /* 02970 - WE Music - Captain Planet.sndh */
+TIMEDB_ENTRY( 54865e57, 3, 8616, YM+TA), /* 02970 - WE Music - Captain Planet.sndh */
+TIMEDB_ENTRY( 54865e57, 4, 8906, YM+TA), /* 02970 - WE Music - Captain Planet.sndh */
+TIMEDB_ENTRY( 54865e57, 5, 9868, YM+TA), /* 02970 - WE Music - Captain Planet.sndh */
+TIMEDB_ENTRY( 54865e57, 6, 13183, YM+TA), /* 02970 - WE Music - Captain Planet.sndh */
+TIMEDB_ENTRY( 548cd2c7, 0, 12285, YM+TA), /* 04870 - Jovis - Subir.sndh */
+TIMEDB_ENTRY( 54a98c05, 0, 6396, YM+TA), /* 04236 - 505 - 20th.sndh */
+TIMEDB_ENTRY( 54c2c110, 0, 4218, YM+TA), /* 01333 - Scavenger - HAL Ninethousand.sndh */
+TIMEDB_ENTRY( 54c8a2f3, 0, 3450, YM+TD), /* 01617 - No More - GSC 43 Sid.sndh */
+TIMEDB_ENTRY( 54d91ce6, 0, 3450, YM), /* 04371 - Jess - Routine 3.sndh */
+TIMEDB_ENTRY( 54d99d64, 0, 3457, YM), /* 03284 - Unknown - Pub Trivia Simulator.sndh */
+TIMEDB_ENTRY( 54d99d64, 1, 161, YM), /* 03284 - Unknown - Pub Trivia Simulator.sndh */
+TIMEDB_ENTRY( 54d99d64, 2, 185, YM), /* 03284 - Unknown - Pub Trivia Simulator.sndh */
+TIMEDB_ENTRY( 54d99d64, 3, 185, YM), /* 03284 - Unknown - Pub Trivia Simulator.sndh */
+TIMEDB_ENTRY( 54d99d64, 4, 249, YM), /* 03284 - Unknown - Pub Trivia Simulator.sndh */
+TIMEDB_ENTRY( 54d99d64, 5, 225, YM), /* 03284 - Unknown - Pub Trivia Simulator.sndh */
+TIMEDB_ENTRY( 54d99d64, 6, 217, YM), /* 03284 - Unknown - Pub Trivia Simulator.sndh */
+TIMEDB_ENTRY( 54d99d64, 7, 27, YM), /* 03284 - Unknown - Pub Trivia Simulator.sndh */
+TIMEDB_ENTRY( 54e12509, 0, 6912, YM), /* 00478 - Ultimatum - Choux J.sndh */
+TIMEDB_ENTRY( 55025745, 0, 10368, YM), /* 00413 - Big Alec - Crystal Clear (Mega Leif).sndh */
+TIMEDB_ENTRY( 55080727, 0, 13440, YM+TA+TD), /* 02267 - Tao - Cream - Steps (Steps).sndh */
+TIMEDB_ENTRY( 5511a9fd, 0, 33792, YM+TA+TB+TD), /* 02559 - Marcer - DISKO SID.sndh */
+TIMEDB_ENTRY( 552e100a, 0, 55296, YM+TA+TB+TD), /* 04614 - Marcer - BOOBS.sndh */
+TIMEDB_ENTRY( 5532f99e, 0, 26062, YM), /* 03633 - T1000 - Bits 54.sndh */
+TIMEDB_ENTRY( 5536f3cf, 0, 2881, YM), /* 00430 - Big Alec - Poppycock - Intro.sndh */
+TIMEDB_ENTRY( 5539a3ec, 0, 14069, YM+TA), /* 04230 - 505 - 8th.sndh */
+TIMEDB_ENTRY( 553acdb6, 0, 23884, YM), /* 03870 - Gary Wheaton - Cyberstorm Title.sndh */
+TIMEDB_ENTRY( 555306f5, 0, 1530, YM+TA+TB), /* 04298 - 505-checkpoint - Pestwurz.sndh */
+TIMEDB_ENTRY( 55593e48, 0, 9216, YM+TA+TD), /* 02325 - Tao - Cream - MV Jeu - Game (Steps).sndh */
+TIMEDB_ENTRY( 557a9fc7, 0, 21945, YM+TA), /* 01690 - Jess - Hardrock Ballad.sndh */
+TIMEDB_ENTRY( 558740e6, 0, 4864, YM+TA), /* 00779 - Crawdaddy - Bombsquad.sndh */
+TIMEDB_ENTRY( 558a84e1, 0, 2755, YM), /* 03061 - Ed Bogas - Tango.sndh */
+TIMEDB_ENTRY( 5598ea22, 0, 2684, YM), /* 04632 - Epic - Zik 11.sndh */
+TIMEDB_ENTRY( 559c530e, 0, 5509, YM+TA+TB+TD), /* 04318 - 505-checkpoint (KB) - tammo (KBcover).sndh */
+TIMEDB_ENTRY( 559f3f27, 0, 8987, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 1, 18773, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 2, 21458, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 3, 10666, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 4, 13241, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 5, 21333, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 6, 16340, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 7, 23184, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 8, 18285, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 9, 17808, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 10, 18561, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 559f3f27, 11, 24633, YM), /* 03535 - Jean Baudlot - Operation Stealth.sndh */
+TIMEDB_ENTRY( 55a354e5, 0, 3836, YM), /* 01239 - Epic - TMS Dreams.sndh */
+TIMEDB_ENTRY( 55a71ffe, 0, 18230, YM+TA), /* 03791 - Roggie - Minuet 1.sndh */
+TIMEDB_ENTRY( 55b124a8, 0, 7161, YM+TA+TB+TD), /* 01953 - MSG - Double Juggle Vegatabobble.sndh */
+TIMEDB_ENTRY( 55b422c0, 0, 30720, YM+TA+TB+TD), /* 03637 - Starbuck - Dawn.sndh */
+TIMEDB_ENTRY( 55d70968, 0, 18940, YM+TA+TB+TD), /* 03504 - 505 - Suretrip 2 - Main 2.sndh */
+TIMEDB_ENTRY( 55df043e, 0, 3199, YM), /* 01552 - Rhino - Twitching Flannels.sndh */
+TIMEDB_ENTRY( 55f2952a, 0, 6948, YM+TA), /* 01609 - No More - Amazine 4.sndh */
+TIMEDB_ENTRY( 5623d508, 0, 9240, YM), /* 03182 - n-a - WE ARE THE WORLD.sndh */
+TIMEDB_ENTRY( 5628a985, 0, 9994, YM+TA), /* 01859 - Lotek Style - Mourning.sndh */
+TIMEDB_ENTRY( 564e0f84, 0, 14819, YM+TA), /* 01167 - Tyan - Xtc.sndh */
+TIMEDB_ENTRY( 566094fa, 0, 6577, YM), /* 00163 - Matt Bates - Deuteros.sndh */
+TIMEDB_ENTRY( 566094fa, 1, 1885, YM), /* 00163 - Matt Bates - Deuteros.sndh */
+TIMEDB_ENTRY( 566094fa, 2, 4315, YM), /* 00163 - Matt Bates - Deuteros.sndh */
+TIMEDB_ENTRY( 566094fa, 3, 2491, YM), /* 00163 - Matt Bates - Deuteros.sndh */
+TIMEDB_ENTRY( 567399c8, 0, 5042, YM), /* 03074 - Peter Inzerillo - Piano Man.sndh */
+TIMEDB_ENTRY( 5678b9e4, 0, 4609, YM), /* 04145 - Unknown - Andante 6.sndh */
+TIMEDB_ENTRY( 56844f54, 0, 4795, YM), /* 03046 - Ed Bogas - Fifties.sndh */
+TIMEDB_ENTRY( 56933435, 0, 23040, YM), /* 02887 - Dr Kaya - No Limit Coding.sndh */
+TIMEDB_ENTRY( 569634ec, 0, 432, YM), /* 00173 - Martin Walker - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 569634ec, 1, 504, YM), /* 00173 - Martin Walker - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 569634ec, 2, 103, YM), /* 00173 - Martin Walker - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 569634ec, 3, 180, YM), /* 00173 - Martin Walker - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 569634ec, 4, 524, YM), /* 00173 - Martin Walker - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 569634ec, 5, 2304, YM), /* 00173 - Martin Walker - Teenage Mutant Hero Turtles.sndh */
+TIMEDB_ENTRY( 569b83dd, 0, 1914, YM), /* 01697 - Jess - For your Loader #3.sndh */
+TIMEDB_ENTRY( 56a669f1, 0, 6835, YM), /* 03097 - n-a - .sndh */
+TIMEDB_ENTRY( 56c31160, 0, 5138, YM+TA), /* 04630 - Mephistow - Sound.sndh */
+TIMEDB_ENTRY( 56e307f1, 0, 9786, YM), /* 01033 - Dolby - A New Great Sound.sndh */
+TIMEDB_ENTRY( 56eb9f9b, 0, 5079, YM), /* 03093 - n-a - .sndh */
+TIMEDB_ENTRY( 56ec7baa, 0, 21492, YM+TA), /* 04364 - Jess - Middle-Earth Theme (digit).sndh */
+TIMEDB_ENTRY( 56f627a5, 0, 5984, YM), /* 03693 - Yerzmyey - Get Mad.sndh */
+TIMEDB_ENTRY( 56f878ff, 0, 6860, YM), /* 00231 - ACC - Popcorn.sndh */
+TIMEDB_ENTRY( 56fc33b0, 0, 7142, YM), /* 01500 - Ashley Hogg - CJ In The USA.sndh */
+TIMEDB_ENTRY( 56fc33b0, 1, 1002, YM), /* 01500 - Ashley Hogg - CJ In The USA.sndh */
+TIMEDB_ENTRY( 56fc33b0, 2, 374, YM), /* 01500 - Ashley Hogg - CJ In The USA.sndh */
+TIMEDB_ENTRY( 56fc33b0, 3, 1725, YM), /* 01500 - Ashley Hogg - CJ In The USA.sndh */
+TIMEDB_ENTRY( 570e1419, 0, 105032, YM+TA), /* 03816 - Tufty - Dear Boy.sndh */
+TIMEDB_ENTRY( 5727be83, 0, 6528, YM), /* 00932 - Dark Angel - Magic Force.sndh */
+TIMEDB_ENTRY( 57385c2c, 0, 2175, YM), /* 02391 - Nexus 6 - Please Wait While Loading 2.sndh */
+TIMEDB_ENTRY( 573c531c, 0, 8192, YM), /* 04221 - Paul Shields - Crossland.sndh */
+TIMEDB_ENTRY( 573c531c, 1, 23680, YM), /* 04221 - Paul Shields - Crossland.sndh */
+TIMEDB_ENTRY( 57570403, 0, 9216, YM), /* 01176 - Sally - Sally 2.sndh */
+TIMEDB_ENTRY( 576960b3, 0, 117647, YM+TA+TB+TD), /* 04217 - xyce - n-a.sndh */
+TIMEDB_ENTRY( 5775383b, 0, 6169, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 1, 3841, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 2, 2329, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 3, 3097, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 4, 7640, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 5, 2941, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 6, 2713, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 7, 2301, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 8, 1897, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 9, 4641, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 10, 5153, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 11, 5153, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 12, 4521, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 13, 661, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 14, 2281, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 15, 194, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 16, 218, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 17, 306, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 18, 429, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 19, 266, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5775383b, 20, 354, YM), /* 02884 - Wally Beben - Ultima V - Warriors of Destiny.sndh */
+TIMEDB_ENTRY( 5778b48b, 0, 4845, YM), /* 03508 - Unknown - Mousetrap.sndh */
+TIMEDB_ENTRY( 579315cd, 0, 8448, YM), /* 03212 - Crazy Q - DHS - Little sexy square.sndh */
+TIMEDB_ENTRY( 57bde7bc, 0, 13440, YM), /* 00484 - Ultimatum - Count Zero 6.sndh */
+TIMEDB_ENTRY( 57c18f04, 0, 889, YM), /* 01319 - Matt Furniss - Space Harrier II.sndh */
+TIMEDB_ENTRY( 57c18f04, 1, 4479, YM), /* 01319 - Matt Furniss - Space Harrier II.sndh */
+TIMEDB_ENTRY( 57c18f04, 2, 3070, YM), /* 01319 - Matt Furniss - Space Harrier II.sndh */
+TIMEDB_ENTRY( 57c18f04, 3, 1024, YM), /* 01319 - Matt Furniss - Space Harrier II.sndh */
+TIMEDB_ENTRY( 57c18f04, 4, 25, YM), /* 01319 - Matt Furniss - Space Harrier II.sndh */
+TIMEDB_ENTRY( 57c18f04, 5, 299, YM), /* 01319 - Matt Furniss - Space Harrier II.sndh */
+TIMEDB_ENTRY( 57c18f04, 6, 1599, YM), /* 01319 - Matt Furniss - Space Harrier II.sndh */
+TIMEDB_ENTRY( 57c18f04, 7, 1280, YM), /* 01319 - Matt Furniss - Space Harrier II.sndh */
+TIMEDB_ENTRY( 57c18f04, 8, 319, YM), /* 01319 - Matt Furniss - Space Harrier II.sndh */
+TIMEDB_ENTRY( 57cd8977, 0, 3839, YM), /* 00342 - Tony Williams - Narc.sndh */
+TIMEDB_ENTRY( 57cf2288, 0, 2048, YM), /* 01519 - Iso - Barst Allen.sndh */
+TIMEDB_ENTRY( 5820dc63, 0, 4473, YM+TB+TD), /* 00182 - 505 - Paradox Xmas 2003 #2.sndh */
+TIMEDB_ENTRY( 5829be49, 0, 2331, YM+TA+TD), /* 04284 - 505 - Loop09.sndh */
+TIMEDB_ENTRY( 582af626, 0, 14592, YM+TA), /* 03579 - Mad Max - Skate or Die!.sndh */
+TIMEDB_ENTRY( 584046c7, 0, 6592, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 1, 960, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 2, 400, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 3, 640, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 4, 1280, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 5, 336, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 6, 1024, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 7, 832, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 8, 960, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 9, 1536, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 10, 462, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 11, 1152, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 12, 400, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 13, 1152, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 14, 3264, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 15, 1280, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 584046c7, 16, 3040, YM), /* 01887 - Dave Lowe - Midwinter 2.sndh */
+TIMEDB_ENTRY( 5844547d, 0, 13900, YM), /* 00373 - Beast - TSC - If Pigs Could Fly Main Theme.sndh */
+TIMEDB_ENTRY( 584c6418, 0, 3315, YM+TD), /* 01108 - Timbral - DHS - Rudolphe (miniremix).sndh */
+TIMEDB_ENTRY( 5863bafb, 0, 5629, YM), /* 00557 - Allister Brimble - Robin Hood - Legend Quest.sndh */
+TIMEDB_ENTRY( 5863bafb, 1, 253, YM), /* 00557 - Allister Brimble - Robin Hood - Legend Quest.sndh */
+TIMEDB_ENTRY( 58641f7d, 0, 10176, YM+TA), /* 00788 - Crawdaddy - Escape From Space.sndh */
+TIMEDB_ENTRY( 586670cc, 0, 12432, YM), /* 01979 - MSG - MSG 10.sndh */
+TIMEDB_ENTRY( 5873bea8, 0, 11638, YM), /* 00248 - AN Cool - TCB Tracker.sndh */
+TIMEDB_ENTRY( 58901c2c, 0, 76272, YM+TA+TB+TD), /* 03439 - Tomchi - Noextra - Wake up kid !.sndh */
+TIMEDB_ENTRY( 589e514e, 0, 48576, YM), /* 01557 - Robert Demming - Nostagic-O Demo.sndh */
+TIMEDB_ENTRY( 58ad61b3, 0, 6911, YM), /* 03646 - 505 - Shazz YM6channel 456.sndh */
+TIMEDB_ENTRY( 58c89598, 0, 1337, YM), /* 01679 - Jess - That's Illogical Captain.sndh */
+TIMEDB_ENTRY( 58cf67dd, 0, 177988, YM+TA), /* 03728 - Spector - Manic Demo LED Screen.sndh */
+TIMEDB_ENTRY( 58d1dbee, 0, 532, YM), /* 04698 - Dave Cobbledick - Mindlock.sndh */
+TIMEDB_ENTRY( 58d1dbee, 1, 1346, YM), /* 04698 - Dave Cobbledick - Mindlock.sndh */
+TIMEDB_ENTRY( 58d1dbee, 2, 629, YM), /* 04698 - Dave Cobbledick - Mindlock.sndh */
+TIMEDB_ENTRY( 58de88c1, 0, 13, YM), /* 04689 - A. G. Smith - Lettris.sndh */
+TIMEDB_ENTRY( 58de88c1, 1, 51, YM), /* 04689 - A. G. Smith - Lettris.sndh */
+TIMEDB_ENTRY( 58de88c1, 2, 12, YM), /* 04689 - A. G. Smith - Lettris.sndh */
+TIMEDB_ENTRY( 58de88c1, 3, 4105, YM), /* 04689 - A. G. Smith - Lettris.sndh */
+TIMEDB_ENTRY( 58de88c1, 4, 4552, YM), /* 04689 - A. G. Smith - Lettris.sndh */
+TIMEDB_ENTRY( 58e58f33, 0, 46272, YM), /* 01450 - Stax - Soba.sndh */
+TIMEDB_ENTRY( 58e6767d, 0, 1614, YM), /* 01255 - Tim Follin - Bionic Commando.sndh */
+TIMEDB_ENTRY( 58e6767d, 1, 4703, YM), /* 01255 - Tim Follin - Bionic Commando.sndh */
+TIMEDB_ENTRY( 58e6767d, 2, 3647, YM), /* 01255 - Tim Follin - Bionic Commando.sndh */
+TIMEDB_ENTRY( 58e6767d, 3, 3456, YM), /* 01255 - Tim Follin - Bionic Commando.sndh */
+TIMEDB_ENTRY( 58e6767d, 4, 2880, YM), /* 01255 - Tim Follin - Bionic Commando.sndh */
+TIMEDB_ENTRY( 58e6767d, 5, 359, YM), /* 01255 - Tim Follin - Bionic Commando.sndh */
+TIMEDB_ENTRY( 58e6767d, 6, 144, YM), /* 01255 - Tim Follin - Bionic Commando.sndh */
+TIMEDB_ENTRY( 59197d6a, 0, 1280, YM), /* 00949 - Dark Angel - X-Out.sndh */
+TIMEDB_ENTRY( 592acdc0, 0, 7062, YM), /* 03043 - Ed Bogas - Pachelbel's Canon in D.sndh */
+TIMEDB_ENTRY( 5942c097, 0, 8065, YM), /* 00384 - Wally Beben - Hammerfist.sndh */
+TIMEDB_ENTRY( 5942c097, 1, 2561, YM), /* 00384 - Wally Beben - Hammerfist.sndh */
+TIMEDB_ENTRY( 5942c097, 2, 2561, YM), /* 00384 - Wally Beben - Hammerfist.sndh */
+TIMEDB_ENTRY( 5942c097, 3, 561, YM), /* 00384 - Wally Beben - Hammerfist.sndh */
+TIMEDB_ENTRY( 5942c097, 4, 2561, YM), /* 00384 - Wally Beben - Hammerfist.sndh */
+TIMEDB_ENTRY( 5942c097, 5, 322, YM), /* 00384 - Wally Beben - Hammerfist.sndh */
+TIMEDB_ENTRY( 5942c097, 6, 5121, YM), /* 00384 - Wally Beben - Hammerfist.sndh */
+TIMEDB_ENTRY( 59446b8a, 0, 6533, YM), /* 04159 - Unknown - I-Ball.sndh */
+TIMEDB_ENTRY( 5950513d, 0, 23040, YM+TA+TB+TD), /* 02615 - STU - SANTA STU.sndh */
+TIMEDB_ENTRY( 59574b1d, 0, 9071, YM), /* 02655 - Dma-Sc - POOZ - In-Game.sndh */
+TIMEDB_ENTRY( 5958b03d, 0, 484, YM), /* 01258 - Tim Follin - Ghouls N Ghosts.sndh */
+TIMEDB_ENTRY( 5958b03d, 1, 5114, YM), /* 01258 - Tim Follin - Ghouls N Ghosts.sndh */
+TIMEDB_ENTRY( 5958b03d, 2, 246, YM), /* 01258 - Tim Follin - Ghouls N Ghosts.sndh */
+TIMEDB_ENTRY( 5958b03d, 3, 120, YM), /* 01258 - Tim Follin - Ghouls N Ghosts.sndh */
+TIMEDB_ENTRY( 5958b03d, 4, 8574, YM), /* 01258 - Tim Follin - Ghouls N Ghosts.sndh */
+TIMEDB_ENTRY( 5958b03d, 5, 7392, YM), /* 01258 - Tim Follin - Ghouls N Ghosts.sndh */
+TIMEDB_ENTRY( 5958b03d, 6, 6930, YM), /* 01258 - Tim Follin - Ghouls N Ghosts.sndh */
+TIMEDB_ENTRY( 5958b03d, 7, 5664, YM), /* 01258 - Tim Follin - Ghouls N Ghosts.sndh */
+TIMEDB_ENTRY( 5958b03d, 8, 9679, YM), /* 01258 - Tim Follin - Ghouls N Ghosts.sndh */
+TIMEDB_ENTRY( 595c4446, 0, 13785, YM), /* 03253 - T1000 - The Bits Club 34.sndh */
+TIMEDB_ENTRY( 595cc1b1, 0, 593, YM), /* 02148 - Mad Max - Mad Max Tune 3 - LSD.sndh */
+TIMEDB_ENTRY( 597fad6b, 0, 4224, YM), /* 01218 - ENS Music - ENS 1.sndh */
+TIMEDB_ENTRY( 598024f0, 0, 20128, YM+TA+TB+TD), /* 03853 - 505 & Mch - Mutative.sndh */
+TIMEDB_ENTRY( 598b5167, 0, 953, YM), /* 04513 - Paul Dowers - Classroom maths.sndh */
+TIMEDB_ENTRY( 598b5167, 1, 148, YM), /* 04513 - Paul Dowers - Classroom maths.sndh */
+TIMEDB_ENTRY( 598b5167, 2, 177, YM), /* 04513 - Paul Dowers - Classroom maths.sndh */
+TIMEDB_ENTRY( 598b5167, 3, 2, YM), /* 04513 - Paul Dowers - Classroom maths.sndh */
+TIMEDB_ENTRY( 598b5167, 4, 935, YM), /* 04513 - Paul Dowers - Classroom maths.sndh */
+TIMEDB_ENTRY( 598b5167, 5, 35, YM), /* 04513 - Paul Dowers - Classroom maths.sndh */
+TIMEDB_ENTRY( 598b5167, 6, 803, YM), /* 04513 - Paul Dowers - Classroom maths.sndh */
+TIMEDB_ENTRY( 598b5167, 7, 450, YM), /* 04513 - Paul Dowers - Classroom maths.sndh */
+TIMEDB_ENTRY( 59c38d29, 0, 9213, YM+TA+TB+TD), /* 01054 - Dubmood - Razor 1911 ( 2003 ) - Haschkaka (YM Rockerz).sndh */
+TIMEDB_ENTRY( 59c7d1e4, 0, 9555, YM), /* 00869 - Ben Daglish - Prison.sndh */
+TIMEDB_ENTRY( 59cb6454, 0, 9177, YM), /* 03173 - n-a - Stealing the Enterprise.sndh */
+TIMEDB_ENTRY( 59f55101, 0, 58554, YM+TA), /* 03714 - Steve Wetherill - Tusker.sndh */
+TIMEDB_ENTRY( 59f78bfa, 0, 3561, YM), /* 00104 - David Whittaker - Golden Axe.sndh */
+TIMEDB_ENTRY( 59f78bfa, 1, 3252, YM), /* 00104 - David Whittaker - Golden Axe.sndh */
+TIMEDB_ENTRY( 59f78bfa, 2, 5266, YM), /* 00104 - David Whittaker - Golden Axe.sndh */
+TIMEDB_ENTRY( 59f78bfa, 3, 1755, YM), /* 00104 - David Whittaker - Golden Axe.sndh */
+TIMEDB_ENTRY( 59f78bfa, 4, 952, YM), /* 00104 - David Whittaker - Golden Axe.sndh */
+TIMEDB_ENTRY( 59f78bfa, 5, 2048, YM), /* 00104 - David Whittaker - Golden Axe.sndh */
+TIMEDB_ENTRY( 5a1b0007, 0, 19200, YM+TA+TB+TD), /* 02565 - Marcer - NEW TIME MARCER.sndh */
+TIMEDB_ENTRY( 5a1b7e1d, 0, 98215, YM+TA), /* 04626 - Michael Opel - Trinomic.sndh */
+TIMEDB_ENTRY( 5a2fc291, 0, 762, YM+TA+TB+TD), /* 01942 - MSG - Chu Chu Rocket - Cat Mania.sndh */
+TIMEDB_ENTRY( 5a33a74f, 0, 46080, YM+TA+TB+TD), /* 02560 - Marcer - DRAGONF MIX.sndh */
+TIMEDB_ENTRY( 5a3b1f47, 0, 11036, YM+TA+TB+TD), /* 03005 - 505 - Antique.sndh */
+TIMEDB_ENTRY( 5a3b27f6, 0, 7637, YM+TA+TB+TD), /* 00830 - Crazy Q - Timebomb - Outlaw (YM Rockerz).sndh */
+TIMEDB_ENTRY( 5a4908be, 0, 6657, YM+TA), /* 03820 - Tufty - Wunder.sndh */
+TIMEDB_ENTRY( 5a4c8b67, 0, 2334, YM+TA+TD), /* 02308 - Tao - Cream - Force (Amiga conversion).sndh */
+TIMEDB_ENTRY( 5a4f1da6, 0, 2560, YM), /* 02003 - Mad Max - Demo Music 9.sndh */
+TIMEDB_ENTRY( 5a561c67, 0, 816, YM), /* 04524 - Unknown - Early Learning Maths 2.sndh */
+TIMEDB_ENTRY( 5a561c67, 1, 2944, YM), /* 04524 - Unknown - Early Learning Maths 2.sndh */
+TIMEDB_ENTRY( 5a561c67, 2, 489, YM), /* 04524 - Unknown - Early Learning Maths 2.sndh */
+TIMEDB_ENTRY( 5a614e63, 0, 1193, YM+TA), /* 03843 - Unknown - Asterix im Morgenland - Title.sndh */
+TIMEDB_ENTRY( 5a6fa9fc, 0, 6912, YM), /* 04832 - T1000 - Bits 61.sndh */
+TIMEDB_ENTRY( 5a9b3487, 0, 13434, YM+TA+TB+TD), /* 02480 - Floopy 2004 - Quasar.sndh */
+TIMEDB_ENTRY( 5acc5761, 0, 3776, YM), /* 00495 - Ultimatum - Kidney Bean 11.sndh */
+TIMEDB_ENTRY( 5ad3d150, 0, 11808, YM+TA+TB+TD), /* 02070 - Mad Max - Commando - Sid.sndh */
+TIMEDB_ENTRY( 5ad3d150, 1, 3072, YM+TA+TB+TD), /* 02070 - Mad Max - Commando - Sid.sndh */
+TIMEDB_ENTRY( 5ad3d150, 2, 289, YM+TA+TB+TD), /* 02070 - Mad Max - Commando - Sid.sndh */
+TIMEDB_ENTRY( 5af05644, 0, 8832, YM), /* 02919 - Richard Joseph - Steel Empire.sndh */
+TIMEDB_ENTRY( 5af1eb78, 0, 22393, YM), /* 00581 - Buster - Impact - Chip.sndh */
+TIMEDB_ENTRY( 5afa0232, 0, 40461, YM), /* 04712 - Bob Bath - Real-stat Hockey.sndh */
+TIMEDB_ENTRY( 5b04d0b6, 0, 3645, YM+TA+TB+TD), /* 04266 - 505-cpt^pdx - Impulse.sndh */
+TIMEDB_ENTRY( 5b06affa, 0, 8508, YM), /* 03167 - n-a - Spanish Eyes.sndh */
+TIMEDB_ENTRY( 5b1eb16e, 0, 4986, YM+TA+TD), /* 01177 - Sally - Sally Tri-Digi music.sndh */
+TIMEDB_ENTRY( 5b38008d, 0, 59076, YM+TA), /* 03796 - F Smadja - Back To The Golden Age.sndh */
+TIMEDB_ENTRY( 5b5116e7, 0, 121893, YM+TA), /* 04824 - Twitch - Altogether Now.sndh */
+TIMEDB_ENTRY( 5b6c3f7c, 0, 5198, YM), /* 01558 - Dave Rogers - Exolon.sndh */
+TIMEDB_ENTRY( 5b6c3f7c, 1, 158, YM), /* 01558 - Dave Rogers - Exolon.sndh */
+TIMEDB_ENTRY( 5b6e2759, 0, 5120, YM+TA), /* 01364 - Scavenger - Sait Evil.sndh */
+TIMEDB_ENTRY( 5b845e71, 0, 7679, YM), /* 01306 - Matt Furniss - Mig 29 Super Fulcrum.sndh */
+TIMEDB_ENTRY( 5b8821ec, 0, 9504, YM), /* 03873 - Gary Wheaton - JS Bach.sndh */
+TIMEDB_ENTRY( 5b88bb81, 0, 94756, YM+TA), /* 03967 - Unknown - Delta.sndh */
+TIMEDB_ENTRY( 5b8ceb3a, 0, 6912, YM+TA), /* 01749 - Kanewood - Faith.sndh */
+TIMEDB_ENTRY( 5b8f84ed, 0, 1024, YM+TA), /* 04762 - Ferox - State of Mind - Energy.sndh */
+TIMEDB_ENTRY( 5baee0e2, 0, 1024, YM), /* 01403 - Skyline - Snork Intro - European.sndh */
+TIMEDB_ENTRY( 5bb7dda3, 0, 1337, YM+TD), /* 04790 - Intruder - Intruder 6.sndh */
+TIMEDB_ENTRY( 5bb94bdb, 0, 21725, YM+TA), /* 03958 - Scott Lemmon - Piggies.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 0, 2879, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 1, 2879, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 2, 2879, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 3, 2879, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 4, 2879, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 5, 2685, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 6, 2429, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 7, 2301, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 8, 1919, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 9, 1919, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 10, 3454, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bbd5f2b, 11, 2750, YM), /* 01308 - Matt Furniss - Outrun Europa.sndh */
+TIMEDB_ENTRY( 5bc728b3, 0, 5440, YM), /* 02440 - Jas C Brooke - Strike.sndh */
+TIMEDB_ENTRY( 5bc76e91, 0, 2568, YM+TA), /* 00923 - Dark Angel - Hop Jo Digi.sndh */
+TIMEDB_ENTRY( 5bce1b51, 0, 4991, YM+TA+TB+TD), /* 02983 - 505-paradox - Erde.sndh */
+TIMEDB_ENTRY( 5bd89943, 0, 11775, YM+TD), /* 03605 - Per Almered (XiA) - TalkTalk2 Loader.sndh */
+TIMEDB_ENTRY( 5bde0d87, 0, 15550, YM+TA), /* 01399 - Skyline - Snork - Loader 2.sndh */
+TIMEDB_ENTRY( 5be32494, 0, 4864, YM), /* 00797 - Crawdaddy - Leavin Teramis.sndh */
+TIMEDB_ENTRY( 5beb61e9, 0, 5755, YM+TA+TB+TD), /* 01839 - Lotek Style - Chips on Fire.sndh */
+TIMEDB_ENTRY( 5bf3126c, 0, 3171, YM), /* 00116 - David Whittaker - Menace.sndh */
+TIMEDB_ENTRY( 5bf3126c, 1, 2312, YM), /* 00116 - David Whittaker - Menace.sndh */
+TIMEDB_ENTRY( 5bf3126c, 2, 7184, YM), /* 00116 - David Whittaker - Menace.sndh */
+TIMEDB_ENTRY( 5c041c45, 0, 11904, YM+TD), /* 03220 - Tomchi - PTSPTR.sndh */
+TIMEDB_ENTRY( 5c0bf856, 0, 2880, YM), /* 00751 - Mark Cooksey - Forgotten Worlds.sndh */
+TIMEDB_ENTRY( 5c0bf856, 1, 6016, YM), /* 00751 - Mark Cooksey - Forgotten Worlds.sndh */
+TIMEDB_ENTRY( 5c0bf856, 2, 4480, YM), /* 00751 - Mark Cooksey - Forgotten Worlds.sndh */
+TIMEDB_ENTRY( 5c0bf856, 3, 5700, YM), /* 00751 - Mark Cooksey - Forgotten Worlds.sndh */
+TIMEDB_ENTRY( 5c0bf856, 4, 5796, YM), /* 00751 - Mark Cooksey - Forgotten Worlds.sndh */
+TIMEDB_ENTRY( 5c0bf856, 5, 255, YM), /* 00751 - Mark Cooksey - Forgotten Worlds.sndh */
+TIMEDB_ENTRY( 5c0bf856, 6, 3168, YM), /* 00751 - Mark Cooksey - Forgotten Worlds.sndh */
+TIMEDB_ENTRY( 5c2d5f54, 0, 4583, YM), /* 01311 - Matt Furniss - Revelation.sndh */
+TIMEDB_ENTRY( 5c2d5f54, 1, 191, YM), /* 01311 - Matt Furniss - Revelation.sndh */
+TIMEDB_ENTRY( 5c2d5f54, 2, 204, YM), /* 01311 - Matt Furniss - Revelation.sndh */
+TIMEDB_ENTRY( 5c2d5f54, 3, 239, YM), /* 01311 - Matt Furniss - Revelation.sndh */
+TIMEDB_ENTRY( 5c385640, 0, 6048, YM), /* 03024 - Alchemist - Rare (Main part).sndh */
+TIMEDB_ENTRY( 5c471758, 0, 6265, YM+TA+TB+TD), /* 01962 - MSG - Godpey - Puzzle.sndh */
+TIMEDB_ENTRY( 5c5abf0b, 0, 12096, YM+TA+TD), /* 03050 - Crazy Q - Collage with a Moustache.sndh */
+TIMEDB_ENTRY( 5c5ae98d, 0, 5127, YM+TA+TD), /* 02324 - Tao - Cream (orig. Rob Hubbard) - Monty On The Run Highscore.sndh */
+TIMEDB_ENTRY( 5c69cf28, 0, 6525, YM), /* 00374 - Beast - TSC - TSC 22.sndh */
+TIMEDB_ENTRY( 5c6d53d2, 0, 307, YM), /* 04522 - Ian Chapman - Dizzy Fun Time.sndh */
+TIMEDB_ENTRY( 5c6ec096, 0, 11516, YM+TA+TD), /* 02511 - Crazy Q - DHS - Sex Droid.sndh */
+TIMEDB_ENTRY( 5c6fdf77, 0, 4607, YM+TA+TB+TD), /* 04854 - Dubmood & Zabutom ! ! ! - Zabutoms Space Journey (D-Bug remix).sndh */
+TIMEDB_ENTRY( 5c7fa268, 0, 8857, YM+TA+TB+TD), /* 04637 - MCH-GenesisProject^Dream - starlight.sndh */
+TIMEDB_ENTRY( 5c8150d3, 0, 8098, YM), /* 01277 - Frazer - TSC 52.sndh */
+TIMEDB_ENTRY( 5c9f6920, 0, 504, YM+TA+TB), /* 00834 - Crazy Q - TiMeBoMb - Toxid Tears pattern test.sndh */
+TIMEDB_ENTRY( 5cab7ad6, 0, 10400, YM), /* 01081 - Excellence In Art - Elftec.sndh */
+TIMEDB_ENTRY( 5cb26475, 0, 7102, YM), /* 01312 - Matt Furniss - Rogue Trooper.sndh */
+TIMEDB_ENTRY( 5cb26475, 1, 7102, YM), /* 01312 - Matt Furniss - Rogue Trooper.sndh */
+TIMEDB_ENTRY( 5cb26475, 2, 6590, YM), /* 01312 - Matt Furniss - Rogue Trooper.sndh */
+TIMEDB_ENTRY( 5cb26475, 3, 6846, YM), /* 01312 - Matt Furniss - Rogue Trooper.sndh */
+TIMEDB_ENTRY( 5cb26475, 4, 7102, YM), /* 01312 - Matt Furniss - Rogue Trooper.sndh */
+TIMEDB_ENTRY( 5cb26475, 5, 4990, YM), /* 01312 - Matt Furniss - Rogue Trooper.sndh */
+TIMEDB_ENTRY( 5cb3cbd0, 0, 213967, YM+TA), /* 03965 - Scott Lemmon - Work.sndh */
+TIMEDB_ENTRY( 5cb75581, 0, 16, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 1, 14, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 2, 51, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 3, 36, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 4, 22, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 5, 483, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 6, 18, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 7, 35, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 8, 88, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 9, 39, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 10, 36, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cb75581, 11, 35, YM), /* 04703 - M Franks - Pixie & Dixie.sndh */
+TIMEDB_ENTRY( 5cc8ca9b, 0, 13103, YM), /* 00090 - David Whittaker - Custodian.sndh */
+TIMEDB_ENTRY( 5cc8ca9b, 1, 2730, YM), /* 00090 - David Whittaker - Custodian.sndh */
+TIMEDB_ENTRY( 5cc8ca9b, 2, 1045, YM), /* 00090 - David Whittaker - Custodian.sndh */
+TIMEDB_ENTRY( 5cc8ca9b, 3, 4681, YM), /* 00090 - David Whittaker - Custodian.sndh */
+TIMEDB_ENTRY( 5cc8ca9b, 4, 97, YM), /* 00090 - David Whittaker - Custodian.sndh */
+TIMEDB_ENTRY( 5cc8ca9b, 5, 151, YM), /* 00090 - David Whittaker - Custodian.sndh */
+TIMEDB_ENTRY( 5cd611c2, 0, 864, YM+TA), /* 04430 - Lotus - Synth Dream 2 - Loader.sndh */
+TIMEDB_ENTRY( 5ce03029, 0, 8320, YM), /* 01497 - Alex Herbert - Guardian.sndh */
+TIMEDB_ENTRY( 5ce03029, 1, 9344, YM), /* 01497 - Alex Herbert - Guardian.sndh */
+TIMEDB_ENTRY( 5ce03029, 2, 16896, YM), /* 01497 - Alex Herbert - Guardian.sndh */
+TIMEDB_ENTRY( 5ce03029, 3, 1536, YM), /* 01497 - Alex Herbert - Guardian.sndh */
+TIMEDB_ENTRY( 5ce45268, 0, 8644, YM), /* 00272 - Atomic - Last Hero (Phaleon - Albedo).sndh */
+TIMEDB_ENTRY( 5ce57cce, 0, 4486, YM+TA), /* 02242 - Tao - Cream (orig. Rob Hubbard) - Monty On The Run Highscore (Stmygm).sndh */
+TIMEDB_ENTRY( 5ce7c5f2, 0, 2289, YM), /* 03891 - Unknown - Risvegli.sndh */
+TIMEDB_ENTRY( 5ce8e2e7, 0, 1785, YM+TA+TB+TD), /* 01957 - MSG - Godpey - Hiscore.sndh */
+TIMEDB_ENTRY( 5ced344b, 0, 6528, YM), /* 02902 - Techno - Plucked Goose Dune 2.sndh */
+TIMEDB_ENTRY( 5ced4178, 0, 5892, YM), /* 00447 - Augustin Vidovic - Heidi.sndh */
+TIMEDB_ENTRY( 5cf67318, 0, 3604, YM), /* 00157 - David Whittaker - Wreckers.sndh */
+TIMEDB_ENTRY( 5cf67318, 1, 2520, YM), /* 00157 - David Whittaker - Wreckers.sndh */
+TIMEDB_ENTRY( 5cf67318, 2, 176, YM), /* 00157 - David Whittaker - Wreckers.sndh */
+TIMEDB_ENTRY( 5cf67318, 3, 314, YM), /* 00157 - David Whittaker - Wreckers.sndh */
+TIMEDB_ENTRY( 5cff4909, 0, 59459, YM+TA), /* 03827 - JO - TEC Demo.sndh */
+TIMEDB_ENTRY( 5cff4909, 1, 103284, YM+TA), /* 03827 - JO - TEC Demo.sndh */
+TIMEDB_ENTRY( 5cff4909, 2, 52998, YM+TA), /* 03827 - JO - TEC Demo.sndh */
+TIMEDB_ENTRY( 5cff4909, 3, 76033, YM+TA), /* 03827 - JO - TEC Demo.sndh */
+TIMEDB_ENTRY( 5d1ede86, 0, 6927, YM+TA+TB+TD), /* 01156 - Tyan - Serious 1.sndh */
+TIMEDB_ENTRY( 5d207e67, 0, 44438, YM+TA+TB+TD), /* 02613 - STU - RETINA.sndh */
+TIMEDB_ENTRY( 5d2b73cc, 0, 3888, YM), /* 03399 - Sean Conran - Ruff and Ready.sndh */
+TIMEDB_ENTRY( 5d2b73cc, 1, 183, YM), /* 03399 - Sean Conran - Ruff and Ready.sndh */
+TIMEDB_ENTRY( 5d2d3b46, 0, 14365, YM), /* 04752 - MSG - Hallucinations.sndh */
+TIMEDB_ENTRY( 5d30e01b, 0, 6639, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 1, 1510, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 2, 766, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 3, 669, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 4, 1341, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 5, 639, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 6, 639, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 7, 639, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 8, 639, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 9, 639, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 10, 639, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 11, 639, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d30e01b, 12, 639, YM), /* 01313 - Matt Furniss - Rugby - The World Cup.sndh */
+TIMEDB_ENTRY( 5d3bbc34, 0, 4552, YM), /* 04088 - Gary Wheaton - Peewee's Big Adventure.sndh */
+TIMEDB_ENTRY( 5d4599d2, 0, 767, YM), /* 04097 - Gary Wheaton - Tri Heli.sndh */
+TIMEDB_ENTRY( 5d562a89, 0, 553, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 1, 596, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 2, 385, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 3, 222, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 4, 320, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 5, 248, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 6, 128, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 7, 321, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 8, 121, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 9, 27, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 10, 28, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 11, 53, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 12, 382, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 13, 104, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d562a89, 14, 27, YM), /* 01816 - Paul Loraine - Arcade Trivia Quiz.sndh */
+TIMEDB_ENTRY( 5d6d8726, 0, 4429, YM+TA+TD), /* 04252 - 505-cpt^pdx - Destruct.sndh */
+TIMEDB_ENTRY( 5d784c68, 0, 8320, YM), /* 02817 - Crazy Q - DHS - . Mindwarp ..sndh */
+TIMEDB_ENTRY( 5d8e0999, 0, 7433, YM), /* 03031 - Ric Clayton - Witchy Woman - Eagles (1972).sndh */
+TIMEDB_ENTRY( 5dbf134d, 0, 5471, YM), /* 00015 - 4-Mat - Magic Dizzy.sndh */
+TIMEDB_ENTRY( 5dbf134d, 1, 113, YM), /* 00015 - 4-Mat - Magic Dizzy.sndh */
+TIMEDB_ENTRY( 5dbf134d, 2, 135, YM), /* 00015 - 4-Mat - Magic Dizzy.sndh */
+TIMEDB_ENTRY( 5dbf134d, 3, 2305, YM), /* 00015 - 4-Mat - Magic Dizzy.sndh */
+TIMEDB_ENTRY( 5dbf134d, 4, 3074, YM), /* 00015 - 4-Mat - Magic Dizzy.sndh */
+TIMEDB_ENTRY( 5dc28293, 0, 48458, YM+TA), /* 03743 - Tufty - C64.sndh */
+TIMEDB_ENTRY( 5dcb165f, 0, 76128, YM+TA), /* 04020 - Roggie - Prelude.sndh */
+TIMEDB_ENTRY( 5de01097, 0, 352, YM), /* 04487 - Andrei Ellman - 3D Ski.sndh */
+TIMEDB_ENTRY( 5de01097, 1, 288, YM), /* 04487 - Andrei Ellman - 3D Ski.sndh */
+TIMEDB_ENTRY( 5de5027f, 0, 2816, YM), /* 04530 - Andrew Gower - Fleas.sndh */
+TIMEDB_ENTRY( 5de5027f, 1, 2816, YM), /* 04530 - Andrew Gower - Fleas.sndh */
+TIMEDB_ENTRY( 5dfb9bff, 0, 4104, YM), /* 01117 - Titan - GSC 62.sndh */
+TIMEDB_ENTRY( 5e1ab844, 0, 37888, YM+TD), /* 02616 - STU - SHIN.sndh */
+TIMEDB_ENTRY( 5e292a9d, 0, 17450, YM+TA+TC+TD), /* 04368 - Skaven (ST adaption by Dma-Sc) - Second Reality 2013 end.sndh */
+TIMEDB_ENTRY( 5e3529e2, 0, 16416, YM), /* 02001 - Mad Max - Demo Music 6.sndh */
+TIMEDB_ENTRY( 5e531be3, 0, 3136, YM), /* 02191 - Tao - Cream - ...do things (loader).sndh */
+TIMEDB_ENTRY( 5e553c9f, 0, 10941, YM+TA), /* 04867 - Jovis - No Dash.sndh */
+TIMEDB_ENTRY( 5e58f156, 0, 6522, YM), /* 00025 - 505 - 17th.sndh */
+TIMEDB_ENTRY( 5e7de824, 0, 5500, YM), /* 04729 - Jason Sheppard - BSS Jane Seymour.sndh */
+TIMEDB_ENTRY( 5e9ead81, 0, 1442, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 1, 974, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 2, 1058, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 3, 1330, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 4, 1410, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 5, 1442, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 7, 1380, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 8, 899, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 9, 1152, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 10, 1748, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 11, 861, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 12, 778, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 13, 1417, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 14, 1116, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 15, 1472, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 16, 1281, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 17, 693, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 20, 813, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 21, 1574, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 22, 837, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 24, 355, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 25, 487, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 26, 473, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 27, 581, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 28, 744, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 29, 708, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 30, 349, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 31, 360, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 32, 180, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 33, 429, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 34, 309, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 35, 408, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 36, 392, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 37, 416, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 38, 558, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 39, 212, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5e9ead81, 40, 86, YM), /* 04735 - Amenda Lombardo - Mixed Up Mother Goose.sndh */
+TIMEDB_ENTRY( 5ebfa147, 0, 5116, YM), /* 00865 - Ben Daglish - Munsters.sndh */
+TIMEDB_ENTRY( 5ed476e3, 0, 37116, YM+TD), /* 02620 - STU - STEREOID DIGI.sndh */
+TIMEDB_ENTRY( 5ee39ada, 0, 33699, YM+TA), /* 04675 - Unknown - BIO C.sndh */
+TIMEDB_ENTRY( 5eec5619, 0, 3199, YM), /* 02151 - Mad Max - Monty On The Run High - LSD.sndh */
+TIMEDB_ENTRY( 5eed22bd, 0, 4608, YM), /* 03494 - Shamen - Certified Dope - Attitude Problem.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 0, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 1, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 2, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 4, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 5, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 6, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 7, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 8, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 9, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 10, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 11, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 12, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 13, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 14, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 15, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 16, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 17, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f0e8e84, 18, 12543, YM), /* 01491 - Fred Gray - Where Time Stood Still.sndh */
+TIMEDB_ENTRY( 5f1170cd, 0, 10452, YM+TA+TB+TD), /* 02757 - Dma-Sc - Sector One - CRAUFunk.sndh */
+TIMEDB_ENTRY( 5f168890, 0, 15216, YM+TA), /* 01753 - Kanewood - Phantom Demo - Main.sndh */
+TIMEDB_ENTRY( 5f2cbdd9, 0, 11852, YM), /* 00102 - David Whittaker - Garfield.sndh */
+TIMEDB_ENTRY( 5f2cbdd9, 1, 182, YM), /* 00102 - David Whittaker - Garfield.sndh */
+TIMEDB_ENTRY( 5f2cbdd9, 2, 274, YM), /* 00102 - David Whittaker - Garfield.sndh */
+TIMEDB_ENTRY( 5f307aaf, 0, 29184, YM), /* 02534 - Remo - Bouncy.sndh */
+TIMEDB_ENTRY( 5f361be2, 0, 3464, YM), /* 01336 - Scavenger - Hotliner.sndh */
+TIMEDB_ENTRY( 5f51c888, 0, 4224, YM+TA), /* 01089 - Techno - Puppet Show Intro digi.sndh */
+TIMEDB_ENTRY( 5f671ce9, 0, 5657, YM), /* 02134 - Mad Max - Flash Gordon - LCD.sndh */
+TIMEDB_ENTRY( 5f6cdfc1, 0, 5369, YM+TD), /* 04792 - Intruder - Intruder 5.sndh */
+TIMEDB_ENTRY( 5f6d3827, 0, 8505, YM+TA+TB+TD), /* 01847 - Lotek Style - Fading Twilight Intro Edit.sndh */
+TIMEDB_ENTRY( 5f83c750, 0, 4480, YM+TA+TD), /* 00041 - 505 - Checkpoint - MMJ Xmas 03 - 1.sndh */
+TIMEDB_ENTRY( 5f8eacef, 0, 35712, YM), /* 01478 - STU - STEREOID.sndh */
+TIMEDB_ENTRY( 5f93d42c, 0, 12672, YM), /* 03276 - Unknown - ESD G-Loc Intro.sndh */
+TIMEDB_ENTRY( 5f95cad7, 0, 13377, YM+TA+TD), /* 02357 - Tao - Cream (orig. Hubbard-Jarre) - Zoolook.sndh */
+TIMEDB_ENTRY( 5fb25bb2, 0, 7680, YM), /* 01654 - Jedi - Sernsima.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 0, 1164, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 1, 518, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 2, 731, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 3, 341, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 4, 112, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 5, 160, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 6, 1280, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 7, 1828, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 8, 1828, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 9, 1219, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 11, 194, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 12, 335, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 14, 103, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fb26a8a, 15, 278, YM), /* 04495 - Darren Ithell - Balls up.sndh */
+TIMEDB_ENTRY( 5fcdea08, 0, 7679, YM+TA+TB+TD), /* 02708 - dubmood & Zabutom - ym2149 oh sexy thing edit.sndh */
+TIMEDB_ENTRY( 5fd4be5a, 0, 8955, YM+TB), /* 00057 - 505 - Nostalgia - Toys.sndh */
+TIMEDB_ENTRY( 5fd8dde9, 0, 21492, YM), /* 01701 - Jess - Middle-Earth Theme (chip).sndh */
+TIMEDB_ENTRY( 5fe3d3ca, 0, 2848, YM), /* 00591 - Cerror - Outline.sndh */
+TIMEDB_ENTRY( 5fe4bfb4, 0, 5760, YM), /* 00245 - AN Cool - So Watt - 2 Life Crew.sndh */
+TIMEDB_ENTRY( 5fe5097b, 0, 43521, YM+TA+TB+TD), /* 03367 - STU - BOMBABAZOOKA.sndh */
+TIMEDB_ENTRY( 5ff1f0b5, 0, 19584, YM+TA+TB+TD), /* 02531 - Bodenst ndig 2000 - Die Wahrheit.sndh */
+TIMEDB_ENTRY( 5ff35036, 0, 12801, YM+TA), /* 03955 - Scott Lemmon - Ivan 3.sndh */
+TIMEDB_ENTRY( 6002d68c, 0, 3834, YM+TA), /* 04448 - Scavenger - Loaders.sndh */
+TIMEDB_ENTRY( 6011f87f, 0, 13824, YM), /* 01002 - DMA-SC - Mr Boomer Intro.sndh */
+TIMEDB_ENTRY( 601bcaa3, 0, 8413, YM), /* 02050 - Mad Max - Sanxion Title.sndh */
+TIMEDB_ENTRY( 602ad458, 0, 11009, YM+TA), /* 04768 - Unknown - Gore 2.sndh */
+TIMEDB_ENTRY( 6041e614, 0, 1785, YM+TD), /* 04788 - Intruder - Intruder 4.sndh */
+TIMEDB_ENTRY( 607b46c5, 0, 5663, YM), /* 02656 - Dma-Sc (Rockman style ) - ST 20th Ann. Megademo Menu.sndh */
+TIMEDB_ENTRY( 6081f79b, 0, 3092, YM), /* 03048 - Ed Bogas - Folk Song.sndh */
+TIMEDB_ENTRY( 60944764, 0, 3584, YM), /* 02225 - Tao - Cream - 4rce (DHS 4k-demo).sndh */
+TIMEDB_ENTRY( 60c727ff, 0, 8442, YM), /* 01919 - Mephistow - Ventura - Hystanders.sndh */
+TIMEDB_ENTRY( 60c8284f, 0, 5952, YM), /* 00936 - Dark Angel - Mix.sndh */
+TIMEDB_ENTRY( 60c93af9, 0, 967, YM), /* 04684 - Unknown - Kids' Academy - Alvin's puzzles - titles.sndh */
+TIMEDB_ENTRY( 60c93af9, 16, 967, YM), /* 04684 - Unknown - Kids' Academy - Alvin's puzzles - titles.sndh */
+TIMEDB_ENTRY( 60e83f4d, 0, 15360, YM+TA+TD), /* 02248 - Tao - Cream - 150 Mph.sndh */
+TIMEDB_ENTRY( 60eda8b4, 0, 4656, YM), /* 03655 - Jedi - Nothing Is More - Song 4.sndh */
+TIMEDB_ENTRY( 60f60dd8, 0, 4033, YM+TA+TB+TD), /* 02995 - 505-paradox - parkbank (STE only).sndh */
+TIMEDB_ENTRY( 611973ab, 0, 24576, YM+TA+TB+TD), /* 02566 - Marcer - NOISY 05 MARCER.sndh */
+TIMEDB_ENTRY( 6119bafd, 0, 13445, YM+TA+TB+TD), /* 01270 - Frazer - The Syndicate ( 2003 ) - Return Of The Lapplander (YM Rockerz).sndh */
+TIMEDB_ENTRY( 612de492, 0, 10752, YM), /* 01974 - MSG - MSG 04.sndh */
+TIMEDB_ENTRY( 616a92b9, 0, 3578, YM), /* 00561 - Allister Brimble - Super Seymour.sndh */
+TIMEDB_ENTRY( 616a92b9, 1, 8506, YM), /* 00561 - Allister Brimble - Super Seymour.sndh */
+TIMEDB_ENTRY( 616e8445, 0, 23040, YM+TA+TB+TD), /* 02568 - Marcer - TRUST - MARCER.sndh */
+TIMEDB_ENTRY( 617b96f0, 0, 8959, YM+TA+TB+TD), /* 04363 - V0yager-Lamers - One Day Wonder.sndh */
+TIMEDB_ENTRY( 6180066f, 0, 25600, YM+TA+TB+TD), /* 02815 - Marcer - Paradize - Nuclear Waste Dump - Ingame tune 2.sndh */
+TIMEDB_ENTRY( 6183ea9f, 0, 5200, YM+TA+TB+TD), /* 00033 - 505 - Bambi.sndh */
+TIMEDB_ENTRY( 618a1a6d, 0, 18424, YM+TD), /* 01029 - Doclands - Ventura Demo - Main Menu.sndh */
+TIMEDB_ENTRY( 619efd39, 0, 635, YM), /* 04274 - 505 - lame02.sndh */
+TIMEDB_ENTRY( 61a592b4, 0, 6906, YM), /* 01231 - Epic - Japanese Sunlight.sndh */
+TIMEDB_ENTRY( 61ab308e, 0, 288, YM+TA), /* 00406 - Big Alec - Jazz.sndh */
+TIMEDB_ENTRY( 61c69dc2, 0, 4960, YM), /* 01387 - Andy Severn - Electraglide.sndh */
+TIMEDB_ENTRY( 61c69dc2, 1, 4960, YM), /* 01387 - Andy Severn - Electraglide.sndh */
+TIMEDB_ENTRY( 61c69dc2, 2, 4960, YM), /* 01387 - Andy Severn - Electraglide.sndh */
+TIMEDB_ENTRY( 61c69dc2, 3, 6720, YM), /* 01387 - Andy Severn - Electraglide.sndh */
+TIMEDB_ENTRY( 61c69dc2, 4, 5440, YM), /* 01387 - Andy Severn - Electraglide.sndh */
+TIMEDB_ENTRY( 61d360ea, 0, 16640, YM+TD), /* 02584 - STU - CRIME TIME.sndh */
+TIMEDB_ENTRY( 61e85111, 0, 10753, YM+TA+TB+TD), /* 03586 - Divag - medievol.sndh */
+TIMEDB_ENTRY( 62020414, 0, 8058, YM+TA+TB+TD), /* 01358 - Scavenger - Please Wait.sndh */
+TIMEDB_ENTRY( 6207fb61, 0, 3129, YM+TA+TD), /* 04287 - 505-cpt^pdx - messing.sndh */
+TIMEDB_ENTRY( 622d4c6c, 0, 4599, YM+TA+TD), /* 02481 - Floopy - Teletubb.sndh */
+TIMEDB_ENTRY( 6235abd7, 0, 1040, YM+STE), /* 01999 - Mad Max - Bomber (STe).sndh */
+TIMEDB_ENTRY( 6242f4be, 0, 15797, YM), /* 02720 - Christian Haupt - Wizmo.sndh */
+TIMEDB_ENTRY( 6242f4be, 1, 3949, YM), /* 02720 - Christian Haupt - Wizmo.sndh */
+TIMEDB_ENTRY( 6242f4be, 2, 5920, YM), /* 02720 - Christian Haupt - Wizmo.sndh */
+TIMEDB_ENTRY( 62760220, 0, 1914, YM+TA), /* 02639 - Miggy - DevilVer3(Unfinished).sndh */
+TIMEDB_ENTRY( 6289981e, 0, 2304, YM), /* 04609 - White Ninja - How forget....sndh */
+TIMEDB_ENTRY( 628f08ca, 0, 5951, YM+TA+TB+TD), /* 03857 - Yerzmyey+!Cube - Dizzzruptor part 3 (Atari ST remix).sndh */
+TIMEDB_ENTRY( 629aae6c, 0, 17408, YM), /* 02047 - Mad Max - One Man and His Droid.sndh */
+TIMEDB_ENTRY( 62a84672, 0, 767, YM), /* 04772 - Dma-Sc - Lovetro intro.sndh */
+TIMEDB_ENTRY( 62acc74a, 0, 8831, YM+TB+TD), /* 02657 - DIVAG - La potato.sndh */
+TIMEDB_ENTRY( 62afbe50, 0, 4026, YM), /* 01243 - Epic - Wonderful Scroll.sndh */
+TIMEDB_ENTRY( 62f59ad0, 0, 46080, YM+TA+TB+TD), /* 02535 - Remo - Fluffy Bunny.sndh */
+TIMEDB_ENTRY( 62fc134d, 0, 13096, YM+TA+TD), /* 01851 - Lotek Style - Hard Sid.sndh */
+TIMEDB_ENTRY( 62fe5f12, 0, 178183, YM+TA), /* 03953 - Scott Lemmon - Instod5.sndh */
+TIMEDB_ENTRY( 63152838, 0, 12288, YM), /* 03262 - Remalon - Requiem 2.sndh */
+TIMEDB_ENTRY( 63166e49, 0, 5412, YM), /* 01253 - Floopy - Vivevent.sndh */
+TIMEDB_ENTRY( 632cda62, 0, 3071, YM+TA+TD), /* 02802 - Starbuck^Creative Mind - Insomnia (Cracktro styled).sndh */
+TIMEDB_ENTRY( 6335a459, 0, 2463, YM), /* 01245 - FFT - Phaleon - Beast 1.sndh */
+TIMEDB_ENTRY( 634d837a, 0, 3200, YM), /* 04206 - Steve Bak - Lands of Havoc.sndh */
+TIMEDB_ENTRY( 6357527a, 0, 10257, YM), /* 02136 - Mad Max - Human Race Level 4 - LCD.sndh */
+TIMEDB_ENTRY( 6361d67f, 0, 64, YM), /* 04546 - Peter M. Caddock, Gary P. Tinsley - Hedge Hogger.sndh */
+TIMEDB_ENTRY( 6361d67f, 1, 232, YM), /* 04546 - Peter M. Caddock, Gary P. Tinsley - Hedge Hogger.sndh */
+TIMEDB_ENTRY( 6361d67f, 2, 307, YM), /* 04546 - Peter M. Caddock, Gary P. Tinsley - Hedge Hogger.sndh */
+TIMEDB_ENTRY( 6361d67f, 3, 3643, YM), /* 04546 - Peter M. Caddock, Gary P. Tinsley - Hedge Hogger.sndh */
+TIMEDB_ENTRY( 6361d67f, 4, 59, YM), /* 04546 - Peter M. Caddock, Gary P. Tinsley - Hedge Hogger.sndh */
+TIMEDB_ENTRY( 63875879, 0, 37242, YM), /* 00889 - Adrian Dalecki - Soccer Manager Plus.sndh */
+TIMEDB_ENTRY( 63875879, 1, 106746, YM), /* 00889 - Adrian Dalecki - Soccer Manager Plus.sndh */
+TIMEDB_ENTRY( 638e66d5, 0, 24976, YM+TA+TB+TD), /* 03299 - STU - DARK ANGEL.sndh */
+TIMEDB_ENTRY( 639137c6, 0, 17465, YM+TA), /* 03550 - Jovis - Fun Sad.sndh */
+TIMEDB_ENTRY( 6396d176, 0, 2770, YM), /* 00226 - ACC - Beguine.sndh */
+TIMEDB_ENTRY( 63a3a65c, 0, 11808, YM), /* 02024 - Mad Max - Commando.sndh */
+TIMEDB_ENTRY( 63a3a65c, 1, 3072, YM), /* 02024 - Mad Max - Commando.sndh */
+TIMEDB_ENTRY( 63a3a65c, 2, 289, YM), /* 02024 - Mad Max - Commando.sndh */
+TIMEDB_ENTRY( 63a4f145, 0, 6822, YM), /* 04341 - Nexus 6 - Beyond Eden (Nino...).sndh */
+TIMEDB_ENTRY( 63a9a3bc, 0, 6048, YM), /* 00929 - Dark Angel - Snork - Logic Force.sndh */
+TIMEDB_ENTRY( 63ac3769, 0, 12244, YM+TA+TB+TD), /* 03581 - Divag - Atari Evil Circus.sndh */
+TIMEDB_ENTRY( 63b7828a, 0, 32768, YM+TD), /* 02532 - Remo - Bass Bass Bass.sndh */
+TIMEDB_ENTRY( 63b80bfb, 0, 11684, YM), /* 03246 - T1000 - The Beast Club - TBC 18.sndh */
+TIMEDB_ENTRY( 63b80bfb, 1, 6927, YM), /* 03246 - T1000 - The Beast Club - TBC 18.sndh */
+TIMEDB_ENTRY( 63b80bfb, 2, 5568, YM), /* 03246 - T1000 - The Beast Club - TBC 18.sndh */
+TIMEDB_ENTRY( 63b80bfb, 3, 9600, YM), /* 03246 - T1000 - The Beast Club - TBC 18.sndh */
+TIMEDB_ENTRY( 63b80bfb, 4, 12096, YM), /* 03246 - T1000 - The Beast Club - TBC 18.sndh */
+TIMEDB_ENTRY( 63b80bfb, 5, 11896, YM), /* 03246 - T1000 - The Beast Club - TBC 18.sndh */
+TIMEDB_ENTRY( 63b80bfb, 6, 12545, YM), /* 03246 - T1000 - The Beast Club - TBC 18.sndh */
+TIMEDB_ENTRY( 63b80bfb, 7, 9600, YM), /* 03246 - T1000 - The Beast Club - TBC 18.sndh */
+TIMEDB_ENTRY( 63b80bfb, 8, 18816, YM), /* 03246 - T1000 - The Beast Club - TBC 18.sndh */
+TIMEDB_ENTRY( 63b80bfb, 9, 11904, YM), /* 03246 - T1000 - The Beast Club - TBC 18.sndh */
+TIMEDB_ENTRY( 63bac55c, 0, 4105, YM+TA), /* 03484 - Peter Jorgensen - Klatmix.sndh */
+TIMEDB_ENTRY( 63c04c7e, 0, 53788, YM+TA+TB+TD), /* 02781 - Stu - Audiosphere.sndh */
+TIMEDB_ENTRY( 63cdc140, 0, 3584, YM), /* 00609 - Chris Mad - Whattaheck - Ghost.sndh */
+TIMEDB_ENTRY( 63d6a88f, 0, 141872, YM+TA), /* 03721 - Spaz - Ooh Crikey - Homische.sndh */
+TIMEDB_ENTRY( 63e3acd9, 0, 22080, YM), /* 02169 - Mad Max - Mega Apocalpyse.sndh */
+TIMEDB_ENTRY( 63ec18b6, 0, 2681, YM+TA), /* 01930 - Miq - Axel Foley.sndh */
+TIMEDB_ENTRY( 63f7b876, 0, 11522, YM), /* 04189 - Tao - For Abyss.sndh */
+TIMEDB_ENTRY( 6420fd5d, 0, 6912, YM+TD), /* 00433 - Big Alec - Reality.sndh */
+TIMEDB_ENTRY( 6420ff6f, 0, 8959, YM+TA+TD), /* 03434 - Per Almered (XiA) 2009 - Trans-Y VideoLife.sndh */
+TIMEDB_ENTRY( 642e0540, 0, 2674, YM), /* 02744 - Unknown Composer - Vampire's Empire.sndh */
+TIMEDB_ENTRY( 64409956, 0, 5568, YM), /* 00128 - David Whittaker - Renaissance.sndh */
+TIMEDB_ENTRY( 64549b22, 0, 1536, YM), /* 00979 - Chris Denman - ProSoccer 2190.sndh */
+TIMEDB_ENTRY( 645fd0d2, 0, 8832, YM), /* 02510 - Crazy Q - Creators - Parallax Lover.sndh */
+TIMEDB_ENTRY( 646e645a, 0, 5919, YM), /* 00129 - David Whittaker - Renegade - Andrew Tather 88 Remix.sndh */
+TIMEDB_ENTRY( 6472e23e, 0, 1516, YM+TA+TB+TD), /* 04640 - mOdmate-CheckPoint - Yanartas SV Thank You.sndh */
+TIMEDB_ENTRY( 64804aff, 0, 4993, YM+TA), /* 01363 - Scavenger - Row, Row, Row Your Boat.sndh */
+TIMEDB_ENTRY( 64872fc0, 0, 1788, YM+TA), /* 01351 - Scavenger - Now Loading (And Packing).sndh */
+TIMEDB_ENTRY( 648af9ef, 0, 5817, YM+TB+TD), /* 01838 - Lotek Style - Centauri.sndh */
+TIMEDB_ENTRY( 6496bb3d, 0, 5184, YM), /* 03901 - Frantisek Fuka - Belegost.sndh */
+TIMEDB_ENTRY( 649e2a02, 0, 18624, YM), /* 02216 - Mad Max - Stormlord.sndh */
+TIMEDB_ENTRY( 649e2a02, 1, 494, YM), /* 02216 - Mad Max - Stormlord.sndh */
+TIMEDB_ENTRY( 649e2a02, 2, 206, YM), /* 02216 - Mad Max - Stormlord.sndh */
+TIMEDB_ENTRY( 649e2a02, 3, 24576, YM), /* 02216 - Mad Max - Stormlord.sndh */
+TIMEDB_ENTRY( 649f7c4b, 0, 21381, YM+TA), /* 04560 - Rob Povey - Quartet v1.5.sndh */
+TIMEDB_ENTRY( 649f7c4b, 1, 39530, YM+TA), /* 04560 - Rob Povey - Quartet v1.5.sndh */
+TIMEDB_ENTRY( 649f7c4b, 2, 14884, YM+TA), /* 04560 - Rob Povey - Quartet v1.5.sndh */
+TIMEDB_ENTRY( 64a27951, 0, 3456, YM), /* 00490 - Ultimatum - Kidney Bean 6.sndh */
+TIMEDB_ENTRY( 64ab1c59, 0, 4096, YM), /* 03217 - Tomchi - 4 Screen.sndh */
+TIMEDB_ENTRY( 64becfa4, 0, 4608, YM), /* 01514 - Chris Huelsbeck - The Adventures of Quik & Silva.sndh */
+TIMEDB_ENTRY( 64becfa4, 1, 4352, YM), /* 01514 - Chris Huelsbeck - The Adventures of Quik & Silva.sndh */
+TIMEDB_ENTRY( 64becfa4, 2, 2816, YM), /* 01514 - Chris Huelsbeck - The Adventures of Quik & Silva.sndh */
+TIMEDB_ENTRY( 64c634bc, 0, 10047, YM), /* 01646 - Jedi - Sprite Ball record.sndh */
+TIMEDB_ENTRY( 64ee1ded, 0, 12089, YM), /* 02494 - gwEm - Love Washed Away With The Tide.sndh */
+TIMEDB_ENTRY( 650104a6, 0, 13665, YM+TA+TD), /* 02209 - Tao - Cream - Stella Polaris (Madness reset).sndh */
+TIMEDB_ENTRY( 650176bc, 0, 960, YM), /* 04479 - Thomas the Tank Engine 2 - Paul Tankard.sndh */
+TIMEDB_ENTRY( 650176bc, 1, 193, YM), /* 04479 - Thomas the Tank Engine 2 - Paul Tankard.sndh */
+TIMEDB_ENTRY( 650176bc, 2, 192, YM), /* 04479 - Thomas the Tank Engine 2 - Paul Tankard.sndh */
+TIMEDB_ENTRY( 650176bc, 3, 307, YM), /* 04479 - Thomas the Tank Engine 2 - Paul Tankard.sndh */
+TIMEDB_ENTRY( 6502f195, 0, 3150, YM), /* 00062 - David Whittaker - Advanced Rugby Simulator.sndh */
+TIMEDB_ENTRY( 6502f195, 1, 120, YM), /* 00062 - David Whittaker - Advanced Rugby Simulator.sndh */
+TIMEDB_ENTRY( 6502f195, 2, 375, YM), /* 00062 - David Whittaker - Advanced Rugby Simulator.sndh */
+TIMEDB_ENTRY( 6502f195, 3, 138, YM), /* 00062 - David Whittaker - Advanced Rugby Simulator.sndh */
+TIMEDB_ENTRY( 6502f195, 4, 129, YM), /* 00062 - David Whittaker - Advanced Rugby Simulator.sndh */
+TIMEDB_ENTRY( 6502f195, 5, 128, YM), /* 00062 - David Whittaker - Advanced Rugby Simulator.sndh */
+TIMEDB_ENTRY( 6502f195, 6, 102, YM), /* 00062 - David Whittaker - Advanced Rugby Simulator.sndh */
+TIMEDB_ENTRY( 65067faf, 0, 6166, YM+TA), /* 00408 - Big Alec - Killer Digi.sndh */
+TIMEDB_ENTRY( 65094efa, 0, 2664, YM), /* 03912 - Unknown - Dampf.sndh */
+TIMEDB_ENTRY( 6512cfbb, 0, 8596, YM), /* 01612 - No More - AM Dentro.sndh */
+TIMEDB_ENTRY( 6522b5e3, 0, 16512, YM+TA), /* 00259 - Antichrist - Oh No!!...sndh */
+TIMEDB_ENTRY( 652af93c, 0, 20176, YM), /* 03661 - Jedi - Shoot Preview.sndh */
+TIMEDB_ENTRY( 652cbfee, 0, 3196, YM), /* 00554 - Allister Brimble - Kwik Snax.sndh */
+TIMEDB_ENTRY( 652cbfee, 1, 3196, YM), /* 00554 - Allister Brimble - Kwik Snax.sndh */
+TIMEDB_ENTRY( 652cbfee, 2, 1916, YM), /* 00554 - Allister Brimble - Kwik Snax.sndh */
+TIMEDB_ENTRY( 652cbfee, 3, 2956, YM), /* 00554 - Allister Brimble - Kwik Snax.sndh */
+TIMEDB_ENTRY( 652cbfee, 4, 3596, YM), /* 00554 - Allister Brimble - Kwik Snax.sndh */
+TIMEDB_ENTRY( 652cbfee, 5, 1531, YM), /* 00554 - Allister Brimble - Kwik Snax.sndh */
+TIMEDB_ENTRY( 652e2cbb, 0, 58416, YM+TA+TB+TD), /* 04334 - mOdmate-CheckPoint (orig. Djamm-eKO) - almoST real (ENtRACte cHiP).sndh */
+TIMEDB_ENTRY( 65362b13, 0, 3072, YM), /* 03308 - Tomchi - Hap.sndh */
+TIMEDB_ENTRY( 65543089, 0, 2939, YM+TA), /* 04292 - 505 - newu.sndh */
+TIMEDB_ENTRY( 656490af, 0, 2685, YM), /* 02473 - Iso - Lefthanded.sndh */
+TIMEDB_ENTRY( 657e825f, 0, 9024, YM+TA), /* 00803 - Crawdaddy - No Way Out Digi.sndh */
+TIMEDB_ENTRY( 658107b4, 0, 21488, YM), /* 03515 - Richard Joseph - Barbarian.sndh */
+TIMEDB_ENTRY( 658107b4, 1, 704, YM), /* 03515 - Richard Joseph - Barbarian.sndh */
+TIMEDB_ENTRY( 658107b4, 2, 4785, YM), /* 03515 - Richard Joseph - Barbarian.sndh */
+TIMEDB_ENTRY( 65b25ff0, 0, 1536, YM+TA+TD), /* 02819 - Soulmate #1 - Znax ingame tune 2.sndh */
+TIMEDB_ENTRY( 65c65b22, 0, 18432, YM), /* 01449 - Stax - Simple.sndh */
+TIMEDB_ENTRY( 65c6be3b, 0, 12993, YM+TA), /* 03738 - David Whittaker - International Soccer Challenge.sndh */
+TIMEDB_ENTRY( 65d3843c, 0, 13304, YM+TA+TB+TD), /* 01015 - DMA-SC - Spiral Zone - UCM 16.sndh */
+TIMEDB_ENTRY( 65d849af, 0, 8956, YM), /* 01273 - Frazer - TSC 27.sndh */
+TIMEDB_ENTRY( 65e9574a, 0, 1222, YM), /* 03180 - n-a - Up on the House Top.sndh */
+TIMEDB_ENTRY( 65f86d4d, 0, 39936, YM+TA+TB+TD), /* 02585 - STU - DANGER.sndh */
+TIMEDB_ENTRY( 65fd957b, 0, 15275, YM), /* 02025 - Mad Max - Confuzion.sndh */
+TIMEDB_ENTRY( 661d9cf4, 0, 4602, YM), /* 00887 - Adrian Dalecki - Rollin Ronny A.sndh */
+TIMEDB_ENTRY( 6642e0c3, 0, 29952, YM+TA+TB+TD), /* 02598 - STU - INSTREAMINTRO.sndh */
+TIMEDB_ENTRY( 6660ae1a, 0, 6154, YM+TA+TB+TD), /* 00180 - 505 - old crap - UCM 22.sndh */
+TIMEDB_ENTRY( 66662f74, 0, 64695, YM+TA), /* 03962 - Scott Lemmon - Thrash 1.sndh */
+TIMEDB_ENTRY( 668a6c70, 0, 4169, YM), /* 04089 - Gary Wheaton - Permanent Waves.sndh */
+TIMEDB_ENTRY( 6695e64c, 0, 2206, YM), /* 00866 - Ben Daglish - Northstar.sndh */
+TIMEDB_ENTRY( 6695e64c, 1, 830, YM), /* 00866 - Ben Daglish - Northstar.sndh */
+TIMEDB_ENTRY( 6695e64c, 2, 10387, YM), /* 00866 - Ben Daglish - Northstar.sndh */
+TIMEDB_ENTRY( 6697b220, 0, 3835, YM+TB+TD), /* 00222 - 7AN - Blip 3.sndh */
+TIMEDB_ENTRY( 669c22a9, 0, 6222, YM), /* 03673 - Dma-Sc - Antiques - 3D Part.sndh */
+TIMEDB_ENTRY( 66a16c32, 0, 59977, YM+TA), /* 04812 - Unknown - Vincent.sndh */
+TIMEDB_ENTRY( 66bd7052, 0, 6927, YM), /* 03238 - T1000 - The Beast Club - TBC 10.sndh */
+TIMEDB_ENTRY( 66d1653f, 0, 1715, YM), /* 04541 - JAWX - Funfares.sndh */
+TIMEDB_ENTRY( 66f95843, 0, 288, YM), /* 01080 - Excellence In Art - Drumz.sndh */
+TIMEDB_ENTRY( 66fd72bf, 0, 11362, YM), /* 03282 - Sparky - Evil Force 121.sndh */
+TIMEDB_ENTRY( 6704938d, 0, 14208, YM), /* 00761 - Count Zero - Decade Demo - 3D Mania.sndh */
+TIMEDB_ENTRY( 6725d6fa, 0, 2309, YM), /* 03871 - Gary Wheaton - Clod Hopper.sndh */
+TIMEDB_ENTRY( 67300f54, 0, 11901, YM+TA+TB+TD), /* 01020 - DMA-SC - Wonderland Speedway.sndh */
+TIMEDB_ENTRY( 673d587d, 0, 11699, YM), /* 02246 - Tao - Cream (orig. Rob Hubbard) - Thundercats (Stmygm).sndh */
+TIMEDB_ENTRY( 67591bed, 0, 9595, YM+TB+TD), /* 04661 - Nemo - YM Rocker.sndh */
+TIMEDB_ENTRY( 67678c83, 0, 8064, YM+TA+TD), /* 04210 - Tao - Cream - Just Feel It (Steps).sndh */
+TIMEDB_ENTRY( 676f2107, 0, 53052, YM+TA), /* 04819 - Ace - Demo Tune.sndh */
+TIMEDB_ENTRY( 6778bf2e, 0, 1536, YM), /* 01412 - Skyline - Snork Intro - So Watt.sndh */
+TIMEDB_ENTRY( 679131f6, 0, 4608, YM+TA), /* 00820 - !Cube - Japanese (Sinful Sinuses).sndh */
+TIMEDB_ENTRY( 67a3f3db, 0, 5461, YM+TA+TD), /* 01575 - Jurgen Piscol - X-Out.sndh */
+TIMEDB_ENTRY( 67a3f3db, 1, 1306, YM+TA+TD), /* 01575 - Jurgen Piscol - X-Out.sndh */
+TIMEDB_ENTRY( 67a3f3db, 2, 5915, YM+TA+TD), /* 01575 - Jurgen Piscol - X-Out.sndh */
+TIMEDB_ENTRY( 67a3f3db, 3, 767, YM+TA+TD), /* 01575 - Jurgen Piscol - X-Out.sndh */
+TIMEDB_ENTRY( 67a3f3db, 4, 308, YM+TA), /* 01575 - Jurgen Piscol - X-Out.sndh */
+TIMEDB_ENTRY( 67a3f3db, 5, 9943, YM+TA), /* 01575 - Jurgen Piscol - X-Out.sndh */
+TIMEDB_ENTRY( 67a3f3db, 6, 10736, YM+TA+TD), /* 01575 - Jurgen Piscol - X-Out.sndh */
+TIMEDB_ENTRY( 67a3f3db, 7, 5075, YM+TA), /* 01575 - Jurgen Piscol - X-Out.sndh */
+TIMEDB_ENTRY( 67a3f3db, 8, 14972, YM+TA+TD), /* 01575 - Jurgen Piscol - X-Out.sndh */
+TIMEDB_ENTRY( 67a3f3db, 9, 7438, YM+TA+TD), /* 01575 - Jurgen Piscol - X-Out.sndh */
+TIMEDB_ENTRY( 67aec997, 0, 9360, YM+TD), /* 02381 - Nexus 6 - Lethal Xcess Level 3.sndh */
+TIMEDB_ENTRY( 67aec997, 1, 800, YM+TD), /* 02381 - Nexus 6 - Lethal Xcess Level 3.sndh */
+TIMEDB_ENTRY( 67aec997, 2, 2087, YM+TD), /* 02381 - Nexus 6 - Lethal Xcess Level 3.sndh */
+TIMEDB_ENTRY( 67b3ebf9, 0, 11777, YM+TA), /* 00258 - Antichrist - Oceans.sndh */
+TIMEDB_ENTRY( 67c3acd0, 0, 8315, YM+TA+TB+TD), /* 00999 - DMA-SC - Heaven Is A Place On Earth.sndh */
+TIMEDB_ENTRY( 67cb3b1e, 0, 635, YM+TA+TD), /* 04281 - 505 - Loop04.sndh */
+TIMEDB_ENTRY( 67d46062, 0, 7680, YM), /* 01423 - Sonic - Rough.sndh */
+TIMEDB_ENTRY( 67d7a40b, 0, 5025, YM), /* 00230 - ACC - Michella.sndh */
+TIMEDB_ENTRY( 67dc492e, 0, 2233, YM+TA), /* 04277 - 505 - Loading.sndh */
+TIMEDB_ENTRY( 67e7f2a8, 0, 5632, YM), /* 04482 - Mad Max - Axel F - TEX Cracktro.sndh */
+TIMEDB_ENTRY( 68112d77, 0, 86044, YM+TA), /* 04796 - Unknown - Axel F.sndh */
+TIMEDB_ENTRY( 6814db57, 0, 66817, YM+TA), /* 03818 - TUFTY - PYRO.sndh */
+TIMEDB_ENTRY( 6827389a, 0, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 1, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 2, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 3, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 4, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 5, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 6, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 7, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 8, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 9, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 10, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 11, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 12, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 13, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 6827389a, 14, 4992, YM), /* 01443 - Stax - Noisy Pillars.sndh */
+TIMEDB_ENTRY( 683f9a14, 0, 20594, YM), /* 01895 - LTK - Complete.sndh */
+TIMEDB_ENTRY( 685ffc0f, 0, 18816, YM+TA), /* 00946 - Dark Angel - Mathematica - Seasons Digi.sndh */
+TIMEDB_ENTRY( 688eb0c2, 0, 5833, YM+TA+TB+TD), /* 00058 - 505 - Huzt.sndh */
+TIMEDB_ENTRY( 689208de, 0, 17664, YM), /* 01093 - Techno - Mathematiques Squizophrenes Main.sndh */
+TIMEDB_ENTRY( 68abea93, 0, 1553, YM), /* 00862 - Ben Daglish - Monty Python's Flying Circus.sndh */
+TIMEDB_ENTRY( 68ad370f, 0, 3835, YM+TA+TD), /* 00996 - Dma-Sc-Sector1^YM-Rockerz - Fantasia Tune 3 (End Part).sndh */
+TIMEDB_ENTRY( 68b06314, 0, 3517, YM+TA), /* 02776 - 505-paradox (2006) - 96shades.sndh */
+TIMEDB_ENTRY( 68b92abf, 0, 10758, YM), /* 04426 - Lotus - Synth Dream 2 - End.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 0, 147, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 1, 147, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 2, 147, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 3, 147, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 4, 147, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 5, 147, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 6, 147, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 7, 147, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 8, 147, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 9, 147, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 10, 388, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 11, 973, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 12, 512, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68cc4dd8, 13, 44429, YM), /* 04488 - Flipside - Alphabet mix.sndh */
+TIMEDB_ENTRY( 68e43d5d, 0, 3129, YM+TA+TB+TD), /* 03644 - 505-checkpoint - No Stress.sndh */
+TIMEDB_ENTRY( 69079f07, 0, 18495, YM+TA), /* 01747 - Jovis - Lametrop - Minitext.sndh */
+TIMEDB_ENTRY( 69244f58, 0, 4992, YM), /* 00901 - Danny Oneway - Eat This.sndh */
+TIMEDB_ENTRY( 69296b00, 0, 36897, YM), /* 00009 - gwEm - Tune 4 My Broken Atari (re-version).sndh */
+TIMEDB_ENTRY( 692c239e, 0, 9602, YM+TA), /* 02677 - Donald Fakk - Leif (Chip).sndh */
+TIMEDB_ENTRY( 693a839e, 0, 9983, YM+TA), /* 02496 - gwEm - Outlined.sndh */
+TIMEDB_ENTRY( 6950e7cf, 0, 22016, YM), /* 03359 - Marcer - TECHNO ORION.sndh */
+TIMEDB_ENTRY( 69557458, 0, 9023, YM+TA+TB+TD), /* 03525 - Timbral 2005-2010 - So alone... (Live ver.).sndh */
+TIMEDB_ENTRY( 69656cbe, 0, 3072, YM), /* 00977 - Chris Denman - Fort Apache.sndh */
+TIMEDB_ENTRY( 6985b24d, 0, 7035, YM+TA+TB+TD), /* 04324 - 505-Checkpoint - Weird.sndh */
+TIMEDB_ENTRY( 69aa5838, 0, 14560, YM), /* 02198 - Mad Max - Insects In Space.sndh */
+TIMEDB_ENTRY( 69ad3e79, 0, 14689, YM+TA), /* 04809 - Unknown - Mission Impossible.sndh */
+TIMEDB_ENTRY( 69da012c, 0, 622, YM), /* 03905 - Unknown - Atahym.sndh */
+TIMEDB_ENTRY( 6a022c8c, 0, 8452, YM+TA+TD), /* 02328 - Tao - Cream - Quarterback (C64 conv.).sndh */
+TIMEDB_ENTRY( 6a16fb10, 0, 21528, YM+TB+TD), /* 03986 - XyNo - n-a.sndh */
+TIMEDB_ENTRY( 6a286f56, 0, 1181, YM), /* 03325 - Darren Ithell - Mouth Trap.sndh */
+TIMEDB_ENTRY( 6a286f56, 1, 518, YM), /* 03325 - Darren Ithell - Mouth Trap.sndh */
+TIMEDB_ENTRY( 6a286f56, 2, 731, YM), /* 03325 - Darren Ithell - Mouth Trap.sndh */
+TIMEDB_ENTRY( 6a286f56, 3, 341, YM), /* 03325 - Darren Ithell - Mouth Trap.sndh */
+TIMEDB_ENTRY( 6a286f56, 4, 112, YM), /* 03325 - Darren Ithell - Mouth Trap.sndh */
+TIMEDB_ENTRY( 6a286f56, 5, 160, YM), /* 03325 - Darren Ithell - Mouth Trap.sndh */
+TIMEDB_ENTRY( 6a286f56, 6, 1280, YM), /* 03325 - Darren Ithell - Mouth Trap.sndh */
+TIMEDB_ENTRY( 6a286f56, 7, 1828, YM), /* 03325 - Darren Ithell - Mouth Trap.sndh */
+TIMEDB_ENTRY( 6a286f56, 8, 1828, YM), /* 03325 - Darren Ithell - Mouth Trap.sndh */
+TIMEDB_ENTRY( 6a286f56, 9, 1219, YM), /* 03325 - Darren Ithell - Mouth Trap.sndh */
+TIMEDB_ENTRY( 6a2c6a9f, 0, 7680, YM), /* 01127 - Tyan - Revolution - Car Racing.sndh */
+TIMEDB_ENTRY( 6a334ab5, 0, 2167, YM), /* 03054 - Ed Bogas - Harmony.sndh */
+TIMEDB_ENTRY( 6a5e21bb, 0, 4096, YM), /* 00731 - Kevin Collier - Harley Davison.sndh */
+TIMEDB_ENTRY( 6a5e21bb, 1, 182, YM), /* 00731 - Kevin Collier - Harley Davison.sndh */
+TIMEDB_ENTRY( 6a5e21bb, 2, 153, YM), /* 00731 - Kevin Collier - Harley Davison.sndh */
+TIMEDB_ENTRY( 6a5e21bb, 3, 307, YM), /* 00731 - Kevin Collier - Harley Davison.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 0, 16415, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 1, 122, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 2, 5475, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 3, 35983, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 4, 8842, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 5, 3015, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 6, 2667, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 7, 18124, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 8, 61739, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 9, 9062, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 10, 8622, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 11, 924, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 12, 53642, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a6bd1ab, 13, 2870, YM), /* 04393 - Unknown - Space Harrier.sndh */
+TIMEDB_ENTRY( 6a73db9c, 0, 8703, YM+TA+TB+TD), /* 03831 - Rhino - Torment (D Newman) - Bumble Beezer.sndh */
+TIMEDB_ENTRY( 6a77e267, 0, 16801, YM+TA), /* 04029 - Roggie - Spellbound.sndh */
+TIMEDB_ENTRY( 6a79cf52, 0, 1360, YM), /* 04548 - Iain Young - Hop.sndh */
+TIMEDB_ENTRY( 6abe41d0, 0, 6534, YM+TA), /* 04563 - Scavenger - Knuckle Joe - Extended.sndh */
+TIMEDB_ENTRY( 6ac1f37c, 0, 8960, YM+TB+TD), /* 02905 - heleenh - juuujuu.sndh */
+TIMEDB_ENTRY( 6ad0abf2, 0, 119726, YM+TA), /* 04021 - Roggie - Quasar.sndh */
+TIMEDB_ENTRY( 6aeffc55, 0, 79648, YM+TA), /* 03825 - TEC - TEC Demo - Intro.sndh */
+TIMEDB_ENTRY( 6af6a6ae, 0, 7680, YM), /* 01377 - Justin Scharvona - Last Ninja 3.sndh */
+TIMEDB_ENTRY( 6af6a6ae, 1, 7974, YM), /* 01377 - Justin Scharvona - Last Ninja 3.sndh */
+TIMEDB_ENTRY( 6af6a6ae, 2, 7440, YM), /* 01377 - Justin Scharvona - Last Ninja 3.sndh */
+TIMEDB_ENTRY( 6af6a6ae, 3, 9545, YM), /* 01377 - Justin Scharvona - Last Ninja 3.sndh */
+TIMEDB_ENTRY( 6af6a6ae, 4, 8832, YM), /* 01377 - Justin Scharvona - Last Ninja 3.sndh */
+TIMEDB_ENTRY( 6af6a6ae, 5, 10304, YM), /* 01377 - Justin Scharvona - Last Ninja 3.sndh */
+TIMEDB_ENTRY( 6af6a6ae, 6, 8611, YM), /* 01377 - Justin Scharvona - Last Ninja 3.sndh */
+TIMEDB_ENTRY( 6afddd06, 0, 5975, YM), /* 00330 - Gary Wheaton - Tangerine Dream 1.sndh */
+TIMEDB_ENTRY( 6b0ab29b, 0, 3072, YM), /* 01183 - Excellence In Art - Heathers.sndh */
+TIMEDB_ENTRY( 6b0e6a79, 0, 127, YM), /* 04520 - Vivian Peschardt - Denver Je Decouvre Les Animaux.sndh */
+TIMEDB_ENTRY( 6b12fd37, 0, 12288, YM+TA+TD), /* 02268 - Tao - Cream - Sunriders (Steps).sndh */
+TIMEDB_ENTRY( 6b26103c, 0, 2240, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b26103c, 1, 6496, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b26103c, 2, 321, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b26103c, 3, 320, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b26103c, 4, 4960, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b26103c, 5, 448, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b26103c, 6, 2670, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b26103c, 7, 4000, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b26103c, 8, 1280, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b26103c, 9, 2688, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b26103c, 10, 2400, YM), /* 01502 - Dave Hasler - Ninja Spirit.sndh */
+TIMEDB_ENTRY( 6b3041dd, 0, 13818, YM), /* 01027 - Doclands - Frenetic.sndh */
+TIMEDB_ENTRY( 6b46576e, 0, 2105, YM+TA+TB+TD), /* 01165 - Tyan - Ulk.sndh */
+TIMEDB_ENTRY( 6b60c6cd, 0, 229, YM), /* 04523 - Richard Brough - Drip.sndh */
+TIMEDB_ENTRY( 6b60c6cd, 1, 1745, YM), /* 04523 - Richard Brough - Drip.sndh */
+TIMEDB_ENTRY( 6b60c6cd, 2, 903, YM), /* 04523 - Richard Brough - Drip.sndh */
+TIMEDB_ENTRY( 6b62e9cc, 0, 54286, YM+TA), /* 04027 - Roggie - Inferno.sndh */
+TIMEDB_ENTRY( 6b780fd1, 0, 32348, YM+TA), /* 03783 - Miggy - Mig.sndh */
+TIMEDB_ENTRY( 6b81bbea, 0, 319, YM), /* 02471 - Iso - Kop Houwe!.sndh */
+TIMEDB_ENTRY( 6b85ea13, 0, 5567, YM+TA+TB+TD), /* 03002 - 505-paradox - thrust.sndh */
+TIMEDB_ENTRY( 6b94f3db, 0, 36864, YM+TA+TB+TD), /* 03425 - cerror - DATASS.sndh */
+TIMEDB_ENTRY( 6babbb1e, 0, 55634, YM+TA), /* 04810 - Unknown - Tear Drop.sndh */
+TIMEDB_ENTRY( 6bb5a80b, 0, 3240, YM), /* 00562 - Allister Brimble - Terry's Big Adventure.sndh */
+TIMEDB_ENTRY( 6bb5a80b, 1, 384, YM), /* 00562 - Allister Brimble - Terry's Big Adventure.sndh */
+TIMEDB_ENTRY( 6bb5a80b, 2, 128, YM), /* 00562 - Allister Brimble - Terry's Big Adventure.sndh */
+TIMEDB_ENTRY( 6bb5a80b, 3, 240, YM), /* 00562 - Allister Brimble - Terry's Big Adventure.sndh */
+TIMEDB_ENTRY( 6bb8e642, 0, 10752, YM+TA+TD), /* 00832 - Crazy Q - - TiMeBoMb - - Swingers Club.sndh */
+TIMEDB_ENTRY( 6bb98b4e, 0, 11521, YM), /* 00765 - Count Zero - Decade Demo - Intro.sndh */
+TIMEDB_ENTRY( 6bc7cbc1, 0, 9220, YM+TA+TD), /* 02302 - Tao - Cream - Breath (MSB EIL99 demo).sndh */
+TIMEDB_ENTRY( 6bce9bb7, 0, 1792, YM), /* 01504 - Rob Hubbard - Battleships.sndh */
+TIMEDB_ENTRY( 6bce9bb7, 1, 289, YM), /* 01504 - Rob Hubbard - Battleships.sndh */
+TIMEDB_ENTRY( 6c287539, 0, 7296, YM), /* 01205 - Excellence In Art - Sweep.sndh */
+TIMEDB_ENTRY( 6c287f4e, 0, 6526, YM), /* 01321 - Matt Furniss - Subbuteo.sndh */
+TIMEDB_ENTRY( 6c2c0a56, 0, 3847, YM), /* 02721 - Jeremy Das & Nik Sen - Locomotion.sndh */
+TIMEDB_ENTRY( 6c3c6768, 0, 1634, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 1, 2178, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 2, 339, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 3, 228, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 4, 181, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 5, 2497, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 6, 176, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 7, 135, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 8, 126, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 9, 3183, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 10, 3138, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 11, 2560, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 12, 482, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 13, 229, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 14, 369, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 15, 264, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 17, 2688, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 18, 205, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 19, 419, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 21, 512, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c3c6768, 22, 2285, YM), /* 01492 - Christopher Guard - Skate Tribe.sndh */
+TIMEDB_ENTRY( 6c4168b0, 0, 360, YM), /* 01715 - Jess - The Music Bootsector.sndh */
+TIMEDB_ENTRY( 6c442139, 0, 3839, YM+TA+TB+TD), /* 03518 - D-Force - Shure Of One Thing.sndh */
+TIMEDB_ENTRY( 6c51974e, 0, 775, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 1, 288, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 2, 2872, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 3, 605, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 4, 1542, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 5, 11, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 6, 235, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 7, 31, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 8, 34, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 9, 34, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 10, 68, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 11, 31, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c51974e, 12, 30, YM), /* 00845 - Ben Daglish - Chase H.Q..sndh */
+TIMEDB_ENTRY( 6c5fd6de, 0, 12800, YM+TA+TB+TD), /* 02092 - Mad Max - Phantoms of the Asteroid - Sid.sndh */
+TIMEDB_ENTRY( 6c5fd6de, 1, 6912, YM+TA+TB+TD), /* 02092 - Mad Max - Phantoms of the Asteroid - Sid.sndh */
+TIMEDB_ENTRY( 6c614484, 0, 23679, YM+TA+TB+TD), /* 02978 - 505-paradox - certain rage (STE only).sndh */
+TIMEDB_ENTRY( 6c85ad49, 0, 72549, YM+TA), /* 03803 - Sparky - Pompey Pirates Menu 84.sndh */
+TIMEDB_ENTRY( 6ca221af, 0, 11545, YM), /* 01775 - Lap - Lap 15.sndh */
+TIMEDB_ENTRY( 6cab176f, 0, 3848, YM+TA), /* 00906 - Danny Oneway - Lamebrain 2 - Loader.sndh */
+TIMEDB_ENTRY( 6cb9071a, 0, 105727, YM+TA), /* 03708 - Sparky - Magnetic Fields 2 (Jean-Michel Jarre).sndh */
+TIMEDB_ENTRY( 6cd391e6, 0, 24320, YM), /* 01452 - Stax - Stax 12.sndh */
+TIMEDB_ENTRY( 6cda38e9, 0, 6912, YM), /* 03663 - Jedi - The Ultimate Boothunt.sndh */
+TIMEDB_ENTRY( 6ce115b5, 0, 2304, YM), /* 01136 - Tyan - Revolution -John Player Theme.sndh */
+TIMEDB_ENTRY( 6cf1bfac, 0, 16896, YM+TB+TD), /* 02854 - Helene - Noname (auf h's tagebuch).sndh */
+TIMEDB_ENTRY( 6cffdc1b, 0, 4605, YM+TA+TB+TD), /* 00030 - 505 - Tribal.sndh */
+TIMEDB_ENTRY( 6d060e40, 0, 8902, YM+TA+TB+TD), /* 03004 - 505 - Nowhere.sndh */
+TIMEDB_ENTRY( 6d189261, 0, 9360, YM), /* 02365 - Nexus 6 - Bubbling Overall.sndh */
+TIMEDB_ENTRY( 6d323657, 0, 14388, YM+TA), /* 02681 - Donald Fakk - Earth is Rotten (Chip).sndh */
+TIMEDB_ENTRY( 6d5eb2eb, 0, 31320, YM+TA+TB+TD), /* 03630 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( 6d5f8793, 0, 74161, YM+TA), /* 04802 - Unknown - Killer.sndh */
+TIMEDB_ENTRY( 6d63857c, 0, 4991, YM+TA+TB), /* 03364 - forestcreature - bois de la biere.sndh */
+TIMEDB_ENTRY( 6d66fa57, 0, 14822, YM+TA), /* 02667 - Donald Fakk - Echoing (Chip).sndh */
+TIMEDB_ENTRY( 6d68490c, 0, 1730, YM), /* 00383 - Wally Beben aka Hagar - Foundation Waste.sndh */
+TIMEDB_ENTRY( 6d68490c, 1, 9217, YM), /* 00383 - Wally Beben aka Hagar - Foundation Waste.sndh */
+TIMEDB_ENTRY( 6d6889f0, 0, 12722, YM+TA+TB+TD), /* 03640 - tomchi NoeXtra - ltc 08 sheep n chip.sndh */
+TIMEDB_ENTRY( 6d6b1568, 0, 7484, YM), /* 02649 - Dma-Sc - Sector One - Ninja Action Fighter.sndh */
+TIMEDB_ENTRY( 6d781d57, 0, 5026, YM), /* 04154 - Unknown - Michelle.sndh */
+TIMEDB_ENTRY( 6d7df9cb, 0, 5628, YM), /* 00857 - Ben Daglish - Gary Lineker's Hot Shots.sndh */
+TIMEDB_ENTRY( 6d7df9cb, 1, 266, YM), /* 00857 - Ben Daglish - Gary Lineker's Hot Shots.sndh */
+TIMEDB_ENTRY( 6d7df9cb, 2, 2935, YM), /* 00857 - Ben Daglish - Gary Lineker's Hot Shots.sndh */
+TIMEDB_ENTRY( 6d87e6e4, 0, 7392, YM+TA+TB+TD), /* 02080 - Mad Max - Human Race - Sid.sndh */
+TIMEDB_ENTRY( 6d87e6e4, 1, 3456, YM+TA+TB+TD), /* 02080 - Mad Max - Human Race - Sid.sndh */
+TIMEDB_ENTRY( 6d87e6e4, 2, 3840, YM+TA+TB+TD), /* 02080 - Mad Max - Human Race - Sid.sndh */
+TIMEDB_ENTRY( 6d87e6e4, 3, 8064, YM+TA+TB+TD), /* 02080 - Mad Max - Human Race - Sid.sndh */
+TIMEDB_ENTRY( 6d87e6e4, 4, 5184, YM+TA+TB+TD), /* 02080 - Mad Max - Human Race - Sid.sndh */
+TIMEDB_ENTRY( 6d99a2d5, 0, 3180, YM), /* 01073 - Excellence In Art - Bebop.sndh */
+TIMEDB_ENTRY( 6da4b105, 0, 1570, YM), /* 00854 - Ben Daglish - Hotrod.sndh */
+TIMEDB_ENTRY( 6da4b105, 1, 1172, YM), /* 00854 - Ben Daglish - Hotrod.sndh */
+TIMEDB_ENTRY( 6da4b105, 2, 789, YM), /* 00854 - Ben Daglish - Hotrod.sndh */
+TIMEDB_ENTRY( 6da4b105, 3, 78, YM), /* 00854 - Ben Daglish - Hotrod.sndh */
+TIMEDB_ENTRY( 6da4b105, 4, 668, YM), /* 00854 - Ben Daglish - Hotrod.sndh */
+TIMEDB_ENTRY( 6da4b105, 5, 603, YM), /* 00854 - Ben Daglish - Hotrod.sndh */
+TIMEDB_ENTRY( 6dc56de0, 0, 5370, YM+TA+TB+TD), /* 00983 - D-Force - Plink.sndh */
+TIMEDB_ENTRY( 6de426b0, 0, 3996, YM), /* 03324 - Unknown - Medway Boys 11.sndh */
+TIMEDB_ENTRY( 6e0f68c6, 0, 3468, YM), /* 03082 - Jim Thomson - Four Leaf Clover.sndh */
+TIMEDB_ENTRY( 6e2d7de0, 0, 17653, YM), /* 02290 - Tao - Cream (orig. Rob Hubbard) - Ace II.sndh */
+TIMEDB_ENTRY( 6e34397e, 0, 9600, YM), /* 00972 - Deneb - Plucked Goose - Fantasy.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 0, 18240, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 1, 470, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 2, 599, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 3, 226, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 4, 370, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 5, 406, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 6, 447, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 7, 396, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 8, 299, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 9, 466, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 10, 442, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 11, 310, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e63bcd2, 12, 875, YM), /* 02019 - Mad Max - Aufweidersehen Monty.sndh */
+TIMEDB_ENTRY( 6e92fc60, 0, 1820, YM), /* 00142 - David Whittaker - Startrek.sndh */
+TIMEDB_ENTRY( 6e967386, 0, 14208, YM), /* 01875 - Dave Lowe - Afterburner.sndh */
+TIMEDB_ENTRY( 6e967386, 1, 12416, YM), /* 01875 - Dave Lowe - Afterburner.sndh */
+TIMEDB_ENTRY( 6e967386, 2, 7400, YM), /* 01875 - Dave Lowe - Afterburner.sndh */
+TIMEDB_ENTRY( 6e967386, 3, 4480, YM), /* 01875 - Dave Lowe - Afterburner.sndh */
+TIMEDB_ENTRY( 6e967386, 4, 3840, YM), /* 01875 - Dave Lowe - Afterburner.sndh */
+TIMEDB_ENTRY( 6ebc3157, 0, 13050, YM+TA), /* 01453 - Stax - Tauris - Digi.sndh */
+TIMEDB_ENTRY( 6ebd51f9, 0, 7879, YM), /* 03161 - n-a - .sndh */
+TIMEDB_ENTRY( 6edf2455, 0, 5697, YM), /* 00382 - Wally Beben - Elite.sndh */
+TIMEDB_ENTRY( 6ee1a637, 0, 12096, YM), /* 00596 - Chris Mad - Overdrive Dots.sndh */
+TIMEDB_ENTRY( 6ee9c6f1, 0, 3072, YM), /* 04005 - Riff Raff - Protector.sndh */
+TIMEDB_ENTRY( 6ef4d709, 0, 2044, YM+TA+TB), /* 04280 - 505 - Loop03.sndh */
+TIMEDB_ENTRY( 6f0dbf68, 0, 6144, YM), /* 04830 - T1000 - Bits 55c.sndh */
+TIMEDB_ENTRY( 6f19a42b, 0, 15361, YM+TA), /* 04807 - Unknown - Oh No.sndh */
+TIMEDB_ENTRY( 6f19d560, 0, 70627, YM), /* 01797 - Barry Leitch - Impossamole.sndh */
+TIMEDB_ENTRY( 6f19d560, 1, 75267, YM), /* 01797 - Barry Leitch - Impossamole.sndh */
+TIMEDB_ENTRY( 6f19d560, 2, 24579, YM), /* 01797 - Barry Leitch - Impossamole.sndh */
+TIMEDB_ENTRY( 6f1bf9fb, 0, 1535, YM+TA+TB+TD), /* 02710 - WOTW . Remake by Dubmood - intro 101.sndh */
+TIMEDB_ENTRY( 6f2274c6, 0, 5766, YM), /* 02000 - Mad Max - Car Race.sndh */
+TIMEDB_ENTRY( 6f2ceb7a, 0, 38912, YM), /* 02805 - Starbuck - A new Beginning.sndh */
+TIMEDB_ENTRY( 6f3f1de7, 0, 9984, YM+TD), /* 00585 - Celtic - I'm The Deiffel! - TFU End.sndh */
+TIMEDB_ENTRY( 6f68a236, 0, 5958, YM+TA), /* 01349 - Scavenger - Nadaaaaaaaaaahhh!.sndh */
+TIMEDB_ENTRY( 6f74f173, 0, 6207, YM+TA+TB+TD), /* 02561 - marcer - hybris remix.sndh */
+TIMEDB_ENTRY( 6f941621, 0, 9409, YM), /* 00424 - Big Alec - PYM - Copperkaahbaahnaah.sndh */
+TIMEDB_ENTRY( 6f9c6fe4, 0, 762, YM+TA+TB+TD), /* 04110 - 505-cpt^dox - jingle01.sndh */
+TIMEDB_ENTRY( 6fa98978, 0, 3360, YM), /* 04695 - Dean Sharples - Mario's Quest.sndh */
+TIMEDB_ENTRY( 6fa98978, 1, 335, YM), /* 04695 - Dean Sharples - Mario's Quest.sndh */
+TIMEDB_ENTRY( 6fa98978, 2, 1828, YM), /* 04695 - Dean Sharples - Mario's Quest.sndh */
+TIMEDB_ENTRY( 6fa98978, 3, 630, YM), /* 04695 - Dean Sharples - Mario's Quest.sndh */
+TIMEDB_ENTRY( 6fb7b5be, 0, 2977, YM+TA+TB), /* 00210 - 505 - UCM 11 Intro Greets.sndh */
+TIMEDB_ENTRY( 6fc13ab4, 0, 1152, YM), /* 00964 - Mike Davies - Italia 90.sndh */
+TIMEDB_ENTRY( 6fc13ab4, 1, 473, YM), /* 00964 - Mike Davies - Italia 90.sndh */
+TIMEDB_ENTRY( 6fc13ab4, 2, 768, YM), /* 00964 - Mike Davies - Italia 90.sndh */
+TIMEDB_ENTRY( 6fc13ab4, 3, 5376, YM), /* 00964 - Mike Davies - Italia 90.sndh */
+TIMEDB_ENTRY( 6fcaeefd, 0, 6912, YM+TA+TB+TD), /* 02085 - Mad Max - The Last V8 - Sid.sndh */
+TIMEDB_ENTRY( 6fde453e, 0, 241, YM), /* 04714 - Terry Mancey and Kevin Hearson - Reels of Fortune.sndh */
+TIMEDB_ENTRY( 6fde453e, 1, 473, YM), /* 04714 - Terry Mancey and Kevin Hearson - Reels of Fortune.sndh */
+TIMEDB_ENTRY( 6fde453e, 2, 390, YM), /* 04714 - Terry Mancey and Kevin Hearson - Reels of Fortune.sndh */
+TIMEDB_ENTRY( 6fde453e, 3, 310, YM), /* 04714 - Terry Mancey and Kevin Hearson - Reels of Fortune.sndh */
+TIMEDB_ENTRY( 6fde453e, 4, 248, YM), /* 04714 - Terry Mancey and Kevin Hearson - Reels of Fortune.sndh */
+TIMEDB_ENTRY( 6fde453e, 29, 75, YM), /* 04714 - Terry Mancey and Kevin Hearson - Reels of Fortune.sndh */
+TIMEDB_ENTRY( 6fde453e, 30, 75, YM), /* 04714 - Terry Mancey and Kevin Hearson - Reels of Fortune.sndh */
+TIMEDB_ENTRY( 700163c3, 0, 2240, YM), /* 01109 - Keith Tinman - Batman - The Caped Crusader.sndh */
+TIMEDB_ENTRY( 7027d331, 0, 5376, YM), /* 01204 - Excellence In Art - Sweat.sndh */
+TIMEDB_ENTRY( 702e32b4, 0, 15899, YM+TA+TB+TD), /* 02794 - Frequent-Ephidrena (2006) - Lambo.sndh */
+TIMEDB_ENTRY( 703de794, 0, 7040, YM), /* 00126 - David Whittaker - Rampage.sndh */
+TIMEDB_ENTRY( 703de794, 1, 570, YM), /* 00126 - David Whittaker - Rampage.sndh */
+TIMEDB_ENTRY( 70605074, 0, 82397, YM+TA), /* 04043 - Roggie - Haggies Man.sndh */
+TIMEDB_ENTRY( 7060eecb, 0, 7035, YM+TA+TB+TD), /* 00084 - 505 - Modulation 2.sndh */
+TIMEDB_ENTRY( 706b10c4, 0, 6342, YM), /* 00853 - Ben Daglish - Hate.sndh */
+TIMEDB_ENTRY( 706b10c4, 1, 9228, YM), /* 00853 - Ben Daglish - Hate.sndh */
+TIMEDB_ENTRY( 706b10c4, 2, 5772, YM), /* 00853 - Ben Daglish - Hate.sndh */
+TIMEDB_ENTRY( 706b10c4, 3, 6413, YM), /* 00853 - Ben Daglish - Hate.sndh */
+TIMEDB_ENTRY( 706b10c4, 4, 3213, YM), /* 00853 - Ben Daglish - Hate.sndh */
+TIMEDB_ENTRY( 706b10c4, 5, 12179, YM), /* 00853 - Ben Daglish - Hate.sndh */
+TIMEDB_ENTRY( 706b10c4, 6, 559, YM), /* 00853 - Ben Daglish - Hate.sndh */
+TIMEDB_ENTRY( 706ccaaa, 0, 5448, YM+TD), /* 04315 - 505 - Switch.sndh */
+TIMEDB_ENTRY( 7075ae3d, 0, 10405, YM+TA+TB+TD), /* 01590 - Nemo - Milliways - Online Compo.sndh */
+TIMEDB_ENTRY( 707ad6e5, 0, 1728, YM), /* 02208 - Tao - Cream - Madness (loader).sndh */
+TIMEDB_ENTRY( 7081fb45, 0, 4147, YM), /* 03935 - Unknown - Udssr.sndh */
+TIMEDB_ENTRY( 708b613b, 0, 1792, YM), /* 04836 - t1000 - Bits 30.sndh */
+TIMEDB_ENTRY( 708bf8fa, 0, 9984, YM), /* 00415 - Big Alec - Musical Wonder.sndh */
+TIMEDB_ENTRY( 70ac75cf, 0, 9985, YM+TA+TD), /* 02349 - Tao-Cream - Cutie (UCM 25).sndh */
+TIMEDB_ENTRY( 70af9e1c, 0, 4575, YM), /* 03151 - n-a - .sndh */
+TIMEDB_ENTRY( 70b8e905, 0, 18241, YM+TA), /* 04055 - Roggie - Rissoto supreme & custard.sndh */
+TIMEDB_ENTRY( 70be9cba, 0, 17671, YM), /* 00437 - Big Alec - Stand By.sndh */
+TIMEDB_ENTRY( 70e87410, 0, 9394, YM), /* 03099 - n-a - Children's Corner # 1.sndh */
+TIMEDB_ENTRY( 7109672b, 0, 3623, YM), /* 00165 - Martin Walker - D-Generation.sndh */
+TIMEDB_ENTRY( 71144213, 0, 4106, YM), /* 03110 - Unknown - The Entertainer-Scott Joplin.sndh */
+TIMEDB_ENTRY( 711628dd, 0, 6335, YM), /* 04082 - Gary Wheaton - Miner 2049er.sndh */
+TIMEDB_ENTRY( 711f39f2, 0, 4995, YM), /* 03543 - David Whittaker - Graham Gooch World Class Cricket.sndh */
+TIMEDB_ENTRY( 713a75a3, 0, 3535, YM), /* 01559 - Dave Rogers - Ranarama.sndh */
+TIMEDB_ENTRY( 713a75a3, 1, 235, YM), /* 01559 - Dave Rogers - Ranarama.sndh */
+TIMEDB_ENTRY( 713a75a3, 2, 157, YM), /* 01559 - Dave Rogers - Ranarama.sndh */
+TIMEDB_ENTRY( 713a75a3, 3, 190, YM), /* 01559 - Dave Rogers - Ranarama.sndh */
+TIMEDB_ENTRY( 713dd020, 0, 3949, YM), /* 01487 - Holger Gehrmann - Space Port.sndh */
+TIMEDB_ENTRY( 713dd020, 1, 2880, YM), /* 01487 - Holger Gehrmann - Space Port.sndh */
+TIMEDB_ENTRY( 713dd020, 2, 504, YM), /* 01487 - Holger Gehrmann - Space Port.sndh */
+TIMEDB_ENTRY( 7166323c, 0, 8450, YM), /* 04628 - tomchi noextra - ltc03 0ompa main.sndh */
+TIMEDB_ENTRY( 716939e6, 0, 3839, YM+TA+TB+TD), /* 02704 - DUBMOOD - SPEEDLOADER II.sndh */
+TIMEDB_ENTRY( 717aa801, 0, 8386, YM), /* 00875 - Ben Daglish - Switchblade.sndh */
+TIMEDB_ENTRY( 717aa801, 1, 10111, YM), /* 00875 - Ben Daglish - Switchblade.sndh */
+TIMEDB_ENTRY( 717aa801, 2, 137, YM), /* 00875 - Ben Daglish - Switchblade.sndh */
+TIMEDB_ENTRY( 719aad6e, 0, 1337, YM+TA), /* 01352 - Scavenger - Ode to Stash.sndh */
+TIMEDB_ENTRY( 719ba61d, 0, 17899, YM+TA), /* 03739 - David Whittaker - Snow Strike.sndh */
+TIMEDB_ENTRY( 71aacc37, 0, 1620, YM), /* 03071 - Chris French - We Wish You A Merry Christmas.sndh */
+TIMEDB_ENTRY( 71b214ce, 0, 57025, YM+TB+TD), /* 02714 - naPO - AC 2006.sndh */
+TIMEDB_ENTRY( 71c1575b, 0, 9984, YM), /* 01562 - Rude Kid - Knuff - Golden Dawn 52.sndh */
+TIMEDB_ENTRY( 71ca34bd, 0, 9381, YM+TA+TB+TD), /* 00032 - 505 - Aragorn - UCM 22.sndh */
+TIMEDB_ENTRY( 71e67240, 0, 3200, YM), /* 02437 - Gari Biasillo - Slayer.sndh */
+TIMEDB_ENTRY( 71e67240, 1, 443, YM), /* 02437 - Gari Biasillo - Slayer.sndh */
+TIMEDB_ENTRY( 71e67240, 2, 4224, YM), /* 02437 - Gari Biasillo - Slayer.sndh */
+TIMEDB_ENTRY( 7201cbb3, 0, 12544, YM), /* 01498 - Alex Herbert - Turbo.sndh */
+TIMEDB_ENTRY( 7201cbb3, 1, 3968, YM), /* 01498 - Alex Herbert - Turbo.sndh */
+TIMEDB_ENTRY( 7201cbb3, 2, 6144, YM), /* 01498 - Alex Herbert - Turbo.sndh */
+TIMEDB_ENTRY( 7201cbb3, 3, 17676, YM), /* 01498 - Alex Herbert - Turbo.sndh */
+TIMEDB_ENTRY( 720c8d9b, 0, 9594, YM+TA+TB+TD), /* 01010 - DMA-SC - Pre Midnight Pizza.sndh */
+TIMEDB_ENTRY( 7211ab87, 0, 17080, YM+TA+TB+TD), /* 02076 - Mad Max - Flash Gordon - Sid.sndh */
+TIMEDB_ENTRY( 721728d7, 0, 896, YM), /* 00958 - Dark Angel - Your Turn.sndh */
+TIMEDB_ENTRY( 723e22d3, 0, 8057, YM+TD), /* 01622 - No More - Night Walk.sndh */
+TIMEDB_ENTRY( 724620eb, 0, 7336, YM), /* 03121 - n-a - Homage to ANDRES SEGOVIA.sndh */
+TIMEDB_ENTRY( 725e3a5a, 0, 20544, YM+TA+TB+TD), /* 02526 - Salkin-047 - Hero.sndh */
+TIMEDB_ENTRY( 7269fca9, 0, 94672, YM+TA), /* 03726 - Spaz - Dark Side of the Spoon - TLB.sndh */
+TIMEDB_ENTRY( 7271e4a4, 0, 8446, YM), /* 04395 - Barry Leitch - Back to the Future Part III.sndh */
+TIMEDB_ENTRY( 7271e4a4, 1, 16131, YM), /* 04395 - Barry Leitch - Back to the Future Part III.sndh */
+TIMEDB_ENTRY( 7271e4a4, 2, 1824, YM), /* 04395 - Barry Leitch - Back to the Future Part III.sndh */
+TIMEDB_ENTRY( 7271e4a4, 3, 94983, YM), /* 04395 - Barry Leitch - Back to the Future Part III.sndh */
+TIMEDB_ENTRY( 7271e4a4, 4, 901, YM), /* 04395 - Barry Leitch - Back to the Future Part III.sndh */
+TIMEDB_ENTRY( 7271e4a4, 5, 7559, YM), /* 04395 - Barry Leitch - Back to the Future Part III.sndh */
+TIMEDB_ENTRY( 7271e4a4, 6, 29187, YM), /* 04395 - Barry Leitch - Back to the Future Part III.sndh */
+TIMEDB_ENTRY( 7271e4a4, 7, 4611, YM), /* 04395 - Barry Leitch - Back to the Future Part III.sndh */
+TIMEDB_ENTRY( 727b0b84, 0, 2304, YM), /* 00485 - Ultimatum - Kidney Bean 1.sndh */
+TIMEDB_ENTRY( 727f9716, 0, 87916, YM+TA), /* 04670 - Kijop - Raaap.sndh */
+TIMEDB_ENTRY( 729567dc, 0, 7648, YM), /* 03128 - n-a - Jump.sndh */
+TIMEDB_ENTRY( 72994953, 0, 6858, YM), /* 00123 - David Whittaker - Panther.sndh */
+TIMEDB_ENTRY( 72b9137c, 0, 9217, YM), /* 00431 - Big Alec - Poppycock - Sprites.sndh */
+TIMEDB_ENTRY( 72c1d405, 0, 11332, YM), /* 03608 - Tomchi Noextra - AC 2010 invit.sndh */
+TIMEDB_ENTRY( 72e1cb0a, 0, 6136, YM+TA+TB+TD), /* 00274 - Baggio - BAJS2.sndh */
+TIMEDB_ENTRY( 72e28105, 0, 4991, YM+TA+TB+TD), /* 03021 - dubmood - RaZoR 1911 - Vains we are da indians.sndh */
+TIMEDB_ENTRY( 731b4358, 0, 10752, YM), /* 04391 - Tomchi - Treasue Island intro.sndh */
+TIMEDB_ENTRY( 731c0738, 0, 4608, YM), /* 00801 - Crawdaddy - Whatta Nerd!.sndh */
+TIMEDB_ENTRY( 733a2c97, 0, 47081, YM+TA+TB+TD), /* 03993 - XyNo - WALEBRKS!.sndh */
+TIMEDB_ENTRY( 73515f35, 0, 4352, YM), /* 00289 - Steve Wheterill - Flimbo's Quest.sndh */
+TIMEDB_ENTRY( 73515f35, 1, 6032, YM), /* 00289 - Steve Wheterill - Flimbo's Quest.sndh */
+TIMEDB_ENTRY( 73515f35, 2, 2688, YM), /* 00289 - Steve Wheterill - Flimbo's Quest.sndh */
+TIMEDB_ENTRY( 736af191, 0, 1120, YM), /* 04679 - Andy Kauling - Ininity One.sndh */
+TIMEDB_ENTRY( 736af191, 1, 2419, YM), /* 04679 - Andy Kauling - Ininity One.sndh */
+TIMEDB_ENTRY( 736af191, 2, 2315, YM), /* 04679 - Andy Kauling - Ininity One.sndh */
+TIMEDB_ENTRY( 7380fc26, 0, 10362, YM+TA), /* 01932 - Miq - First Song.sndh */
+TIMEDB_ENTRY( 7383fbd6, 0, 7840, YM), /* 00106 - David Whittaker - Goldrunner 2.sndh */
+TIMEDB_ENTRY( 7383fbd6, 1, 2352, YM), /* 00106 - David Whittaker - Goldrunner 2.sndh */
+TIMEDB_ENTRY( 7383fbd6, 2, 1280, YM), /* 00106 - David Whittaker - Goldrunner 2.sndh */
+TIMEDB_ENTRY( 73857d7b, 0, 11641, YM+TD), /* 04791 - Intruder - Intruder 7.sndh */
+TIMEDB_ENTRY( 7387cfd9, 0, 41491, YM+TA+TD), /* 02312 - Tao - Cream - Intensity (200Hz).sndh */
+TIMEDB_ENTRY( 73a7adbe, 0, 5436, YM), /* 00555 - Allister Brimble - Mig 29.sndh */
+TIMEDB_ENTRY( 73a7adbe, 1, 3067, YM), /* 00555 - Allister Brimble - Mig 29.sndh */
+TIMEDB_ENTRY( 73a7adbe, 2, 75, YM), /* 00555 - Allister Brimble - Mig 29.sndh */
+TIMEDB_ENTRY( 73a7adbe, 3, 71, YM), /* 00555 - Allister Brimble - Mig 29.sndh */
+TIMEDB_ENTRY( 73a7adbe, 4, 91, YM), /* 00555 - Allister Brimble - Mig 29.sndh */
+TIMEDB_ENTRY( 73a7adbe, 5, 154, YM), /* 00555 - Allister Brimble - Mig 29.sndh */
+TIMEDB_ENTRY( 73b5d83c, 0, 3584, YM), /* 01886 - Dave Lowe - Microprose Formula One Grand Prix.sndh */
+TIMEDB_ENTRY( 73bd8ff6, 0, 2107, YM), /* 04727 - Beyonder - MIX number ONE demo - Sicmu.sndh */
+TIMEDB_ENTRY( 73bd8ff6, 1, 2604, YM), /* 04727 - Beyonder - MIX number ONE demo - Sicmu.sndh */
+TIMEDB_ENTRY( 73bd8ff6, 2, 1174, YM), /* 04727 - Beyonder - MIX number ONE demo - Sicmu.sndh */
+TIMEDB_ENTRY( 73bd8ff6, 3, 5124, YM), /* 04727 - Beyonder - MIX number ONE demo - Sicmu.sndh */
+TIMEDB_ENTRY( 73bd8ff6, 4, 2074, YM), /* 04727 - Beyonder - MIX number ONE demo - Sicmu.sndh */
+TIMEDB_ENTRY( 73bd8ff6, 5, 2254, YM), /* 04727 - Beyonder - MIX number ONE demo - Sicmu.sndh */
+TIMEDB_ENTRY( 73bd8ff6, 6, 1174, YM), /* 04727 - Beyonder - MIX number ONE demo - Sicmu.sndh */
+TIMEDB_ENTRY( 73bd8ff6, 7, 59098, YM), /* 04727 - Beyonder - MIX number ONE demo - Sicmu.sndh */
+TIMEDB_ENTRY( 73c42f88, 0, 5370, YM+TA+TB+TD), /* 00909 - Danny Oneway - No Sheep In Mongolia (SID).sndh */
+TIMEDB_ENTRY( 73c98d09, 0, 5762, YM), /* 00508 - Tangens - Synthetic Visions - Dister.sndh */
+TIMEDB_ENTRY( 73d9805c, 0, 4754, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 1, 2217, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 2, 1828, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 3, 2048, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 4, 1536, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 5, 3072, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 6, 960, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 7, 752, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 8, 3040, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 9, 1664, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 10, 1360, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 11, 1852, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 12, 3840, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 13, 853, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 14, 4848, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73d9805c, 15, 387, YM), /* 04709 - Vesa, Emphii, Bad Boy - Razor's Mega Demo - Screen 4.sndh */
+TIMEDB_ENTRY( 73ee82dc, 0, 25536, YM+TA+TB+TD), /* 02102 - Mad Max - War - Sid.sndh */
+TIMEDB_ENTRY( 73f88dc8, 0, 512, YM+TA+TD), /* 02812 - Crazy Q - DHS - GAME OVER TEST.sndh */
+TIMEDB_ENTRY( 74190da8, 0, 23034, YM+TA), /* 01706 - Jess - Protect your Environment.sndh */
+TIMEDB_ENTRY( 741c5eb1, 0, 6139, YM), /* 04373 - Jess - Tears On My Keyboard (alpha).sndh */
+TIMEDB_ENTRY( 7423d024, 0, 767, YM+TA+TB+TD), /* 02705 - DUBBIE - STILL D.U.B.sndh */
+TIMEDB_ENTRY( 742963cd, 0, 3066, YM+TA), /* 02623 - STU - ULTIMATE.sndh */
+TIMEDB_ENTRY( 744b14ae, 0, 4992, YM+TA+TD), /* 04245 - 505-checkpoint^paradox - Blark.sndh */
+TIMEDB_ENTRY( 7451cebe, 0, 1785, YM+TA+TB+TD), /* 01963 - MSG - Godpey - Results.sndh */
+TIMEDB_ENTRY( 7458dea7, 0, 4281, YM+TA+TB+TD), /* 04326 - 505 - Checkpoint - Yaa Taaru (unreleased).sndh */
+TIMEDB_ENTRY( 7462b4a6, 0, 21375, YM+TA+TB+TD), /* 03023 - Dubmood - RZR^Dbug^YMR - Detta ar DDR!.sndh */
+TIMEDB_ENTRY( 74754556, 0, 5952, YM), /* 00816 - Crawdaddy - The Village.sndh */
+TIMEDB_ENTRY( 747eae7e, 0, 9472, YM+TA), /* 00810 - Crawdaddy - Seekers (Cross The Deserts).sndh */
+TIMEDB_ENTRY( 7485c843, 0, 7674, YM), /* 01238 - Epic - Stunt Priest.sndh */
+TIMEDB_ENTRY( 7494a084, 0, 6672, YM), /* 00905 - Danny Oneway - Lamebrain 2 - Song.sndh */
+TIMEDB_ENTRY( 74ae2b50, 0, 12288, YM), /* 03256 - T1000 - The Beast Club - TS 4.sndh */
+TIMEDB_ENTRY( 74b82316, 0, 1926, YM), /* 03382 - Unknown - Bach.sndh */
+TIMEDB_ENTRY( 74bc3732, 0, 7296, YM), /* 01641 - JB 007 - Climax - Plastro.sndh */
+TIMEDB_ENTRY( 74e07e3c, 0, 2304, YM), /* 01256 - Tim Follin - Bubble Bobble.sndh */
+TIMEDB_ENTRY( 74e07e3c, 1, 191, YM), /* 01256 - Tim Follin - Bubble Bobble.sndh */
+TIMEDB_ENTRY( 74e07e3c, 2, 81, YM), /* 01256 - Tim Follin - Bubble Bobble.sndh */
+TIMEDB_ENTRY( 74e07e3c, 3, 255, YM), /* 01256 - Tim Follin - Bubble Bobble.sndh */
+TIMEDB_ENTRY( 74e07e3c, 4, 512, YM), /* 01256 - Tim Follin - Bubble Bobble.sndh */
+TIMEDB_ENTRY( 74e07e3c, 5, 648, YM), /* 01256 - Tim Follin - Bubble Bobble.sndh */
+TIMEDB_ENTRY( 74e07e3c, 6, 288, YM), /* 01256 - Tim Follin - Bubble Bobble.sndh */
+TIMEDB_ENTRY( 74e07e3c, 7, 86, YM), /* 01256 - Tim Follin - Bubble Bobble.sndh */
+TIMEDB_ENTRY( 74e07e3c, 8, 576, YM), /* 01256 - Tim Follin - Bubble Bobble.sndh */
+TIMEDB_ENTRY( 74ecaa22, 0, 14680, YM), /* 02110 - Mad Max - Galway Mix.sndh */
+TIMEDB_ENTRY( 74f2ab37, 0, 9216, YM+TA+TD), /* 01360 - Scavenger - Primus.sndh */
+TIMEDB_ENTRY( 750cba32, 0, 7680, YM), /* 01550 - Rhino - GBISTCP - Torment.sndh */
+TIMEDB_ENTRY( 750f2a72, 0, 8280, YM), /* 00740 - Connor - UCM 2 Intro.sndh */
+TIMEDB_ENTRY( 75176418, 0, 12287, YM+TA+TB+TD), /* 02486 - gwEm (M. Gray conversion) - Bangin' Nights.sndh */
+TIMEDB_ENTRY( 75478a17, 0, 41216, YM+TA+TB+TD), /* 03426 - cerror - A BEGINNING.sndh */
+TIMEDB_ENTRY( 7549d578, 0, 5095, YM), /* 03141 - Unknown - Music Box Dancer - Frank Mills.sndh */
+TIMEDB_ENTRY( 7562aff4, 0, 14665, YM+TB), /* 01031 - Doclands - Zoomer Preview - FOF.sndh */
+TIMEDB_ENTRY( 7563ab89, 0, 5120, YM), /* 02118 - Mad Max - Warhawk Remix.sndh */
+TIMEDB_ENTRY( 756f8880, 0, 4602, YM+TA), /* 01350 - Scavenger - No Muls, Rapido?.sndh */
+TIMEDB_ENTRY( 7577cc92, 0, 47528, YM+TA+TB+TD), /* 03427 - cerror - VERMOUTH.sndh */
+TIMEDB_ENTRY( 757c0a86, 0, 6336, YM), /* 03204 - Steve Wetherill - Tusker.sndh */
+TIMEDB_ENTRY( 757c0a86, 1, 3840, YM), /* 03204 - Steve Wetherill - Tusker.sndh */
+TIMEDB_ENTRY( 757c4fb6, 0, 6527, YM+TA+TD), /* 02821 - marcer - first tYMe (Znax credits-scores).sndh */
+TIMEDB_ENTRY( 757e009b, 0, 2239, YM), /* 01783 - Lap - Phaleon - Change Disks.sndh */
+TIMEDB_ENTRY( 759f714f, 0, 43344, YM+TA+TB+TD), /* 03369 - STU - DISCO VER ATARI.sndh */
+TIMEDB_ENTRY( 75a2df71, 0, 706, YM), /* 01511 - Chris Huelsbeck - Carl Lewis Challenge.sndh */
+TIMEDB_ENTRY( 75a2df71, 1, 110, YM), /* 01511 - Chris Huelsbeck - Carl Lewis Challenge.sndh */
+TIMEDB_ENTRY( 75a2df71, 2, 180, YM), /* 01511 - Chris Huelsbeck - Carl Lewis Challenge.sndh */
+TIMEDB_ENTRY( 75a2df71, 3, 187, YM), /* 01511 - Chris Huelsbeck - Carl Lewis Challenge.sndh */
+TIMEDB_ENTRY( 75a2df71, 4, 120, YM), /* 01511 - Chris Huelsbeck - Carl Lewis Challenge.sndh */
+TIMEDB_ENTRY( 75a2df71, 5, 69, YM), /* 01511 - Chris Huelsbeck - Carl Lewis Challenge.sndh */
+TIMEDB_ENTRY( 75a2df71, 6, 1632, YM), /* 01511 - Chris Huelsbeck - Carl Lewis Challenge.sndh */
+TIMEDB_ENTRY( 75a2df71, 7, 384, YM), /* 01511 - Chris Huelsbeck - Carl Lewis Challenge.sndh */
+TIMEDB_ENTRY( 75a2df71, 8, 206, YM), /* 01511 - Chris Huelsbeck - Carl Lewis Challenge.sndh */
+TIMEDB_ENTRY( 75a2df71, 9, 6, YM), /* 01511 - Chris Huelsbeck - Carl Lewis Challenge.sndh */
+TIMEDB_ENTRY( 75c72475, 0, 9408, YM), /* 04475 - Charles Callet - Championship Water Skiing.sndh */
+TIMEDB_ENTRY( 75d17603, 0, 8642, YM), /* 01772 - Lap - Lap 12.sndh */
+TIMEDB_ENTRY( 75e3431c, 0, 383, YM+TA+TB), /* 03380 - crazy Pissed off Q - fucking untight shit !.sndh */
+TIMEDB_ENTRY( 75eaa993, 0, 75293, YM+TA), /* 04030 - Roggie - Spooked.sndh */
+TIMEDB_ENTRY( 75f4089b, 0, 12540, YM+TA+TB+TD), /* 02452 - Timbral (2003) - Mandarine Street.sndh */
+TIMEDB_ENTRY( 75f4293e, 0, 447, YM+TA+TD), /* 04774 - dhor-mec - Bore.sndh */
+TIMEDB_ENTRY( 76188b95, 0, 8192, YM), /* 03657 - Jedi - DNT Paper 4 intro - Song 1.sndh */
+TIMEDB_ENTRY( 76226833, 0, 5825, YM), /* 01503 - Dave Hasler - The Punisher.sndh */
+TIMEDB_ENTRY( 76226833, 1, 1251, YM), /* 01503 - Dave Hasler - The Punisher.sndh */
+TIMEDB_ENTRY( 7624935e, 0, 5376, YM), /* 00595 - Chris Mad - Delirious Mainmenu.sndh */
+TIMEDB_ENTRY( 76411619, 0, 8064, YM), /* 01976 - MSG - MSG 06.sndh */
+TIMEDB_ENTRY( 764c58b6, 0, 7609, YM), /* 02429 - 505-cpt^dox - x2004.sndh */
+TIMEDB_ENTRY( 764cf3c5, 0, 9210, YM+TA+TB+TD), /* 02759 - Dma-Sc - Sector One - Forgotten Figures.sndh */
+TIMEDB_ENTRY( 764dd191, 0, 6254, YM), /* 01206 - Excellence In Art - Sweep 2.sndh */
+TIMEDB_ENTRY( 765ee6e5, 0, 15360, YM+TA+TD), /* 02270 - Tao - Cream - The Cave (Steps).sndh */
+TIMEDB_ENTRY( 765fada5, 0, 3584, YM+TA), /* 00784 - Crawdaddy - The Desert.sndh */
+TIMEDB_ENTRY( 766c708a, 0, 11904, YM), /* 04837 - t1000 - Bits 31.sndh */
+TIMEDB_ENTRY( 7677b922, 0, 80581, YM+TA), /* 03724 - Spaz - Punish Your Machine - Reset.sndh */
+TIMEDB_ENTRY( 76916ffc, 0, 5760, YM), /* 04603 - Rude Kid - TV Themes.sndh */
+TIMEDB_ENTRY( 76928172, 0, 8704, YM+TA+TB+TD), /* 04192 - Doclands - Transbeauce Demo 2 Hidden.sndh */
+TIMEDB_ENTRY( 76b3d6b8, 0, 1792, YM+TA), /* 00947 - Dark Angel - Shadows Of Death.sndh */
+TIMEDB_ENTRY( 76b80b74, 0, 6525, YM+TA+TB+TD), /* 04335 - 505 - Chase.sndh */
+TIMEDB_ENTRY( 76c7c9d2, 0, 15360, YM+TA+TB+TD), /* 02552 - Marcer - AT HOUSE SID.sndh */
+TIMEDB_ENTRY( 76ce5c69, 0, 1694, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 1, 1907, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 2, 538, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 3, 555, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 4, 283, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 5, 397, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 6, 582, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 7, 617, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 8, 281, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 9, 120, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 10, 846, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 11, 873, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 12, 632, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 13, 917, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 14, 515, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 15, 699, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 16, 861, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 17, 610, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 18, 580, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 19, 473, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 20, 405, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 21, 384, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 22, 815, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 23, 408, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 24, 2024, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 25, 675, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 26, 300, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 27, 434, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 28, 493, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 29, 487, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 30, 831, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 31, 28, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 32, 161, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 33, 550, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 34, 461, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 35, 155, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 36, 952, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 37, 243, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 38, 1294, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 39, 82, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 40, 404, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 41, 768, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 42, 1801, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 43, 2722, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 44, 617, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 45, 109, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 46, 284, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 47, 540, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 48, 123, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 49, 301, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 50, 906, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 51, 1483, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 52, 18, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 53, 285, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 54, 1857, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 55, 1805, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 56, 976, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 57, 1036, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 58, 897, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 59, 995, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 60, 1110, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 61, 1864, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76ce5c69, 62, 1840, YM), /* 04739 - William Goldstein - Kings Quest IV - The Perils of Rosella.sndh */
+TIMEDB_ENTRY( 76d16088, 0, 13056, YM), /* 02158 - Mad Max - So Watt - Nordik Coders.sndh */
+TIMEDB_ENTRY( 76f03168, 0, 28416, YM+TA+TB+TD), /* 02912 - Helene - n-a.sndh */
+TIMEDB_ENTRY( 77205c6a, 0, 11532, YM), /* 03939 - Andreas Maier - Puzzlepuzzle.sndh */
+TIMEDB_ENTRY( 7733372f, 0, 2304, YM), /* 01429 - Starbuck - Praying Hands remix.sndh */
+TIMEDB_ENTRY( 7745ec71, 0, 2048, YM), /* 02931 - Chris Denman - Charge of the Light Brigade.sndh */
+TIMEDB_ENTRY( 774f4078, 0, 13312, YM+TD), /* 01984 - Jochen Hippel - "1".sndh */
+TIMEDB_ENTRY( 7759b9fe, 0, 37898, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7759b9fe, 1, 89397, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7759b9fe, 2, 14351, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7759b9fe, 3, 39361, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7759b9fe, 4, 1665, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7759b9fe, 5, 59777, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7759b9fe, 6, 32769, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7759b9fe, 7, 35845, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7759b9fe, 8, 27460, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7759b9fe, 9, 18574, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7759b9fe, 10, 55297, YM+TA), /* 04352 - Edd the Duck - Sonixx Music demo.sndh */
+TIMEDB_ENTRY( 7772a662, 0, 7168, YM+TA), /* 00823 - !Cube - Chrome.sndh */
+TIMEDB_ENTRY( 778a20d7, 0, 23856, YM+TA+TB+TD), /* 02587 - STU - DROP DA BOMB LIVE INTRO.sndh */
+TIMEDB_ENTRY( 779bc20f, 0, 4880, YM), /* 02367 - Nexus 6 - Colorclash.sndh */
+TIMEDB_ENTRY( 779eef82, 0, 8320, YM+TA), /* 01636 - Nexus - Maniax.sndh */
+TIMEDB_ENTRY( 77b3ba68, 0, 10193, YM), /* 00395 - Wally Beben - Summer Olympiad.sndh */
+TIMEDB_ENTRY( 77b3ba68, 1, 2049, YM), /* 00395 - Wally Beben - Summer Olympiad.sndh */
+TIMEDB_ENTRY( 77b3ba68, 2, 3073, YM), /* 00395 - Wally Beben - Summer Olympiad.sndh */
+TIMEDB_ENTRY( 77b3ba68, 3, 3073, YM), /* 00395 - Wally Beben - Summer Olympiad.sndh */
+TIMEDB_ENTRY( 77b3ba68, 4, 2561, YM), /* 00395 - Wally Beben - Summer Olympiad.sndh */
+TIMEDB_ENTRY( 77b3ba68, 5, 2049, YM), /* 00395 - Wally Beben - Summer Olympiad.sndh */
+TIMEDB_ENTRY( 77b3ba68, 6, 4097, YM), /* 00395 - Wally Beben - Summer Olympiad.sndh */
+TIMEDB_ENTRY( 77b6a8f6, 0, 133057, YM+TA), /* 03793 - Roggie - Ripped Off.sndh */
+TIMEDB_ENTRY( 77be6a62, 0, 6401, YM), /* 01779 - Lap - Lap 29.sndh */
+TIMEDB_ENTRY( 77e0afdf, 0, 3584, YM), /* 02938 - Insomnia - Plax Atax.sndh */
+TIMEDB_ENTRY( 780319fe, 0, 10490, STE), /* 03526 - 505 - Appendix.sndh */
+TIMEDB_ENTRY( 781943c1, 0, 5375, YM+TB+TD), /* 03696 - gwEm (Nick Scarim conversion) - Spy vs Spy.sndh */
+TIMEDB_ENTRY( 781c78d4, 0, 43509, YM+TA+TB+TD), /* 02783 - Dubmood - Destroy the Template.sndh */
+TIMEDB_ENTRY( 78204309, 0, 10656, YM), /* 00736 - Sean Connolly - Moving On.sndh */
+TIMEDB_ENTRY( 78258491, 0, 7103, YM+TA+TB+TD), /* 03641 - Timbral-DHS-YMR - Polish waitress.sndh */
+TIMEDB_ENTRY( 7831c996, 0, 10392, YM+TA+TB+TD), /* 00193 - 505 - Sure Trip 2.sndh */
+TIMEDB_ENTRY( 784a6f4e, 0, 43744, YM+TA), /* 00002 - gwEm - Hardcore Will Never Die.sndh */
+TIMEDB_ENTRY( 785b5c73, 0, 9220, YM+TA+TD), /* 02332 - Tao - Cream (orig. Karsten Obarski) - Sleepwalk.sndh */
+TIMEDB_ENTRY( 788dfc4e, 0, 18529, YM), /* 04843 - t1000 - Bits 38.sndh */
+TIMEDB_ENTRY( 78a8fed2, 0, 3583, YM), /* 00219 - Tony Williams - Smash TV.sndh */
+TIMEDB_ENTRY( 78a8fed2, 1, 575, YM), /* 00219 - Tony Williams - Smash TV.sndh */
+TIMEDB_ENTRY( 78ae279e, 0, 4210, STE), /* 03454 - Per Almered (XiA) - Save The Earth Intro.sndh */
+TIMEDB_ENTRY( 78b86c80, 0, 11840, YM+TA+TB+TD), /* 03395 - ULTRASYD - SCENE SPIRIT.sndh */
+TIMEDB_ENTRY( 78c38480, 0, 1785, YM+TA), /* 01934 - Miq - Hotliner.sndh */
+TIMEDB_ENTRY( 78d65c71, 0, 9210, YM+TB+TD), /* 01585 - Nemo - 2 lives left.sndh */
+TIMEDB_ENTRY( 78f74af9, 0, 10753, YM+TA+TD), /* 04204 - Tao - Cream - Nostalgic-O-Demo Fractal Blast (2 Sid Voice).sndh */
+TIMEDB_ENTRY( 790768e3, 0, 17228, YM+TD), /* 01986 - Jochen Hippel - "Ajh99".sndh */
+TIMEDB_ENTRY( 790e4d93, 0, 16128, YM), /* 00739 - Connor - TFC Spaceballs Demo.sndh */
+TIMEDB_ENTRY( 790f5fb6, 0, 141313, YM+TA), /* 03752 - Tufty - Knucklebusters.sndh */
+TIMEDB_ENTRY( 7913a832, 0, 2682, YM), /* 04213 - Jess - The name's Bond, Jess Bond (chip).sndh */
+TIMEDB_ENTRY( 7913db4d, 0, 2737, YM), /* 03137 - Unknown - It Came Upon a Midnight Clear.sndh */
+TIMEDB_ENTRY( 7926f696, 0, 18240, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 1, 470, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 2, 600, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 3, 227, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 4, 370, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 5, 406, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 6, 448, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 7, 395, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 8, 299, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 9, 466, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 10, 443, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 11, 310, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 7926f696, 12, 876, YM+TA+TB+TD), /* 02065 - Mad Max - Auf Wiedersehen Monty - Sid.sndh */
+TIMEDB_ENTRY( 79355a03, 0, 17640, YM), /* 02017 - Mad Max - Ace 2.sndh */
+TIMEDB_ENTRY( 793968aa, 0, 13824, YM), /* 02133 - Mad Max - Crazy Comets - LCD.sndh */
+TIMEDB_ENTRY( 79400daf, 0, 2273, YM), /* 03154 - n-a - THE ROCK ISLAND LINE.sndh */
+TIMEDB_ENTRY( 7946ba85, 0, 1536, YM), /* 04347 - Chris Denman - Cohort - Fight for Rome.sndh */
+TIMEDB_ENTRY( 7953aa0e, 0, 243, YM), /* 02141 - Mad Max - Commando Levels - LSD.sndh */
+TIMEDB_ENTRY( 795a029e, 0, 2304, YM+STE), /* 02952 - Chris Scudds - Cisco Heat (STe).sndh */
+TIMEDB_ENTRY( 795a029e, 1, 2688, YM+STE), /* 02952 - Chris Scudds - Cisco Heat (STe).sndh */
+TIMEDB_ENTRY( 795eaaae, 0, 8916, YM), /* 03032 - Debbie Davis - I Was a Fool (To Let You Go).sndh */
+TIMEDB_ENTRY( 79683b0b, 0, 3505, YM), /* 01731 - Peter Johnson - Wizball.sndh */
+TIMEDB_ENTRY( 79683b0b, 1, 2697, YM), /* 01731 - Peter Johnson - Wizball.sndh */
+TIMEDB_ENTRY( 79683b0b, 2, 1153, YM), /* 01731 - Peter Johnson - Wizball.sndh */
+TIMEDB_ENTRY( 79683b0b, 3, 1778, YM), /* 01731 - Peter Johnson - Wizball.sndh */
+TIMEDB_ENTRY( 79683b0b, 4, 138, YM), /* 01731 - Peter Johnson - Wizball.sndh */
+TIMEDB_ENTRY( 7970cb7a, 0, 3734, YM), /* 03080 - Paul Schuh - Cagney & Lacey Theme - B.Conti.sndh */
+TIMEDB_ENTRY( 798a20b2, 0, 8970, YM), /* 03090 - Unknown - Ben Hur Chariot Race March.sndh */
+TIMEDB_ENTRY( 798bc04e, 0, 6110, YM), /* 04346 - Nexus 6 - Nexus of Sominus (Theme).sndh */
+TIMEDB_ENTRY( 799757ee, 0, 4602, YM+TA), /* 02478 - No More - Unexpected.sndh */
+TIMEDB_ENTRY( 79a266bf, 0, 4480, YM), /* 02890 - Illusion - Betty (Golden Dawn 40a).sndh */
+TIMEDB_ENTRY( 79a7ca4d, 0, 9840, YM+TA+TD), /* 02508 - Crazy Q - DHS - Mad Monkey Funk-Fu.sndh */
+TIMEDB_ENTRY( 79d46eb6, 0, 48049, YM+TA), /* 03943 - Unknown - Under The Bridge.sndh */
+TIMEDB_ENTRY( 79e39f24, 0, 15167, YM+TA+TB+TD), /* 04779 - Ultrasyd - Thunderdome.sndh */
+TIMEDB_ENTRY( 79eeee20, 0, 8058, YM), /* 00886 - Adrian Dalecki - Leonardo 2.sndh */
+TIMEDB_ENTRY( 79eeee20, 1, 769, YM), /* 00886 - Adrian Dalecki - Leonardo 2.sndh */
+TIMEDB_ENTRY( 79ef500d, 0, 4260, YM), /* 02661 - Dave Lowe - Galaxy Force II.sndh */
+TIMEDB_ENTRY( 79ef500d, 1, 3700, YM), /* 02661 - Dave Lowe - Galaxy Force II.sndh */
+TIMEDB_ENTRY( 79ef500d, 2, 3936, YM), /* 02661 - Dave Lowe - Galaxy Force II.sndh */
+TIMEDB_ENTRY( 79ef500d, 3, 2640, YM), /* 02661 - Dave Lowe - Galaxy Force II.sndh */
+TIMEDB_ENTRY( 79ef500d, 4, 1536, YM), /* 02661 - Dave Lowe - Galaxy Force II.sndh */
+TIMEDB_ENTRY( 79ef500d, 5, 4032, YM), /* 02661 - Dave Lowe - Galaxy Force II.sndh */
+TIMEDB_ENTRY( 79ef500d, 6, 265, YM), /* 02661 - Dave Lowe - Galaxy Force II.sndh */
+TIMEDB_ENTRY( 79f3a147, 0, 18529, YM), /* 03257 - T1000 - The Beast Club - TS 5.sndh */
+TIMEDB_ENTRY( 79fa5755, 0, 9594, YM+TA), /* 01627 - No More - Too Hot.sndh */
+TIMEDB_ENTRY( 7a0ff461, 0, 19718, YM+TA+TD), /* 02342 - Tao - Cream - Body Language (UCM 16).sndh */
+TIMEDB_ENTRY( 7a13364e, 0, 1664, YM), /* 00294 - Gary Wheaton - Alb.sndh */
+TIMEDB_ENTRY( 7a2c43f5, 0, 8006, YM+TA+TB+TD), /* 02421 - 505-cpt+pdx nils feske - dosk 2005.sndh */
+TIMEDB_ENTRY( 7a481c5d, 0, 47051, YM+TD), /* 00006 - Gwem - Song 4 Hanah (YM Rockerz).sndh */
+TIMEDB_ENTRY( 7a4be950, 0, 6464, YM), /* 02389 - Nexus 6 - Once Again.sndh */
+TIMEDB_ENTRY( 7a56b89c, 0, 49440, YM+TA+TB+TD), /* 03377 - STU - ST-GOD BACK FROM HELL.sndh */
+TIMEDB_ENTRY( 7a722bf8, 0, 4607, YM+TA+TB+TD), /* 02982 - 505-paradox - easy.sndh */
+TIMEDB_ENTRY( 7a725569, 0, 4880, YM), /* 02374 - Nexus 6 - Dum Dum Zak.sndh */
+TIMEDB_ENTRY( 7a79da45, 0, 15360, YM+TD), /* 02610 - STU - PANIC INTRO.sndh */
+TIMEDB_ENTRY( 7a8e4251, 0, 28160, YM+TA+TB+TD), /* 02621 - STU - TEKNOID BIGBEAT.sndh */
+TIMEDB_ENTRY( 7a95db3e, 0, 6143, YM+TB+TD), /* 03292 - Dma-Sc - ATIPYK Developments - Manical Drop - 1 Player music #1.sndh */
+TIMEDB_ENTRY( 7a99cc64, 0, 1850, YM), /* 00594 - Paul Summers - P47 The Freedom Fighter.sndh */
+TIMEDB_ENTRY( 7a99cc64, 1, 3976, YM), /* 00594 - Paul Summers - P47 The Freedom Fighter.sndh */
+TIMEDB_ENTRY( 7a99cc64, 2, 2765, YM), /* 00594 - Paul Summers - P47 The Freedom Fighter.sndh */
+TIMEDB_ENTRY( 7a99cc64, 3, 2305, YM), /* 00594 - Paul Summers - P47 The Freedom Fighter.sndh */
+TIMEDB_ENTRY( 7a99cc64, 4, 3328, YM), /* 00594 - Paul Summers - P47 The Freedom Fighter.sndh */
+TIMEDB_ENTRY( 7aa07393, 0, 2317, YM), /* 01734 - Richard Joseph - Cannon Fodder.sndh */
+TIMEDB_ENTRY( 7aa07393, 1, 3763, YM), /* 01734 - Richard Joseph - Cannon Fodder.sndh */
+TIMEDB_ENTRY( 7aa07393, 2, 1345, YM), /* 01734 - Richard Joseph - Cannon Fodder.sndh */
+TIMEDB_ENTRY( 7aa07393, 3, 5041, YM), /* 01734 - Richard Joseph - Cannon Fodder.sndh */
+TIMEDB_ENTRY( 7aa07393, 4, 1025, YM), /* 01734 - Richard Joseph - Cannon Fodder.sndh */
+TIMEDB_ENTRY( 7aa1c085, 0, 7134, YM), /* 03045 - Ed Bogas - Echo Rock.sndh */
+TIMEDB_ENTRY( 7aa1f6bf, 0, 63588, YM+TA), /* 04358 - X The Beermat - Mud.sndh */
+TIMEDB_ENTRY( 7aa72754, 0, 4219, YM), /* 00377 - 7AN - Nibbel Is Small Kermit Is Fat.sndh */
+TIMEDB_ENTRY( 7aacfcc2, 0, 16128, YM+TA+TD), /* 02257 - Tao - Cream (orig. Jeroen Tel) - Ice Age (Steps).sndh */
+TIMEDB_ENTRY( 7ac51aff, 0, 6652, YM+TA+TB+TD), /* 00189 - 505 - Sid Rave 3.sndh */
+TIMEDB_ENTRY( 7aca079b, 0, 3839, YM+TA+TB+TD), /* 00060 - 505 - Ice Storm.sndh */
+TIMEDB_ENTRY( 7ad13084, 0, 7164, YM+TA+TB+TD), /* 03321 - Kenet - Oldiez.sndh */
+TIMEDB_ENTRY( 7ad4ffeb, 0, 13818, YM), /* 01683 - Jess - Psychosonorous Disorder.sndh */
+TIMEDB_ENTRY( 7ad8a222, 0, 1986, YM), /* 04135 - Michael Haar - Defend The Earth 2.sndh */
+TIMEDB_ENTRY( 7ad8a222, 1, 1766, YM), /* 04135 - Michael Haar - Defend The Earth 2.sndh */
+TIMEDB_ENTRY( 7ad8a222, 2, 9, YM), /* 04135 - Michael Haar - Defend The Earth 2.sndh */
+TIMEDB_ENTRY( 7ad8a222, 3, 13, YM), /* 04135 - Michael Haar - Defend The Earth 2.sndh */
+TIMEDB_ENTRY( 7ad8a222, 4, 17, YM), /* 04135 - Michael Haar - Defend The Earth 2.sndh */
+TIMEDB_ENTRY( 7ad8a222, 5, 39, YM), /* 04135 - Michael Haar - Defend The Earth 2.sndh */
+TIMEDB_ENTRY( 7ad8a222, 6, 9, YM), /* 04135 - Michael Haar - Defend The Earth 2.sndh */
+TIMEDB_ENTRY( 7aed45b4, 0, 20616, YM+TA+TB+TD), /* 02711 - Marcer - SORN DESTINY (DIGI).sndh */
+TIMEDB_ENTRY( 7b065ea8, 0, 8704, YM), /* 00462 - Augustin Vidovic - Starpaws.sndh */
+TIMEDB_ENTRY( 7b08f9ed, 0, 141401, YM+TA), /* 03949 - Scott Lemmon - Elenor.sndh */
+TIMEDB_ENTRY( 7b0c8115, 0, 7952, YM), /* 04567 - Excellence in Art - The Chicken Song 4K.sndh */
+TIMEDB_ENTRY( 7b1de588, 0, 240, YM), /* 02190 - Mad Max - Dugger.sndh */
+TIMEDB_ENTRY( 7b1de588, 1, 2304, YM), /* 02190 - Mad Max - Dugger.sndh */
+TIMEDB_ENTRY( 7b1de588, 2, 3072, YM), /* 02190 - Mad Max - Dugger.sndh */
+TIMEDB_ENTRY( 7b1de588, 3, 768, YM), /* 02190 - Mad Max - Dugger.sndh */
+TIMEDB_ENTRY( 7b300939, 0, 11136, YM), /* 01146 - Tyan - Revolution - Main Menu.sndh */
+TIMEDB_ENTRY( 7b33d44e, 0, 37, YM), /* 02946 - Andrew Oakley - Square Off.sndh */
+TIMEDB_ENTRY( 7b33d44e, 1, 39, YM), /* 02946 - Andrew Oakley - Square Off.sndh */
+TIMEDB_ENTRY( 7b33d44e, 2, 44, YM), /* 02946 - Andrew Oakley - Square Off.sndh */
+TIMEDB_ENTRY( 7b33d44e, 3, 73, YM), /* 02946 - Andrew Oakley - Square Off.sndh */
+TIMEDB_ENTRY( 7b33d44e, 4, 27, YM), /* 02946 - Andrew Oakley - Square Off.sndh */
+TIMEDB_ENTRY( 7b33d44e, 5, 36, YM), /* 02946 - Andrew Oakley - Square Off.sndh */
+TIMEDB_ENTRY( 7b33d44e, 6, 38, YM), /* 02946 - Andrew Oakley - Square Off.sndh */
+TIMEDB_ENTRY( 7b33d44e, 7, 41, YM), /* 02946 - Andrew Oakley - Square Off.sndh */
+TIMEDB_ENTRY( 7b33d44e, 8, 345, YM), /* 02946 - Andrew Oakley - Square Off.sndh */
+TIMEDB_ENTRY( 7b33d44e, 9, 6135, YM), /* 02946 - Andrew Oakley - Square Off.sndh */
+TIMEDB_ENTRY( 7b35b2e2, 0, 6720, YM), /* 01980 - MSG - MSG 11.sndh */
+TIMEDB_ENTRY( 7b3b1fb9, 0, 5378, YM), /* 02157 - Mad Max - So Watt - Main Menu.sndh */
+TIMEDB_ENTRY( 7b3dc813, 0, 45820, YM+TA+TB+TD), /* 02575 - STU - ATARI UNDERGROUND CHIPTUNE RESISTANCE.sndh */
+TIMEDB_ENTRY( 7b568abe, 0, 3072, YM+TA), /* 00922 - Dark Angel - Party In Hell!.sndh */
+TIMEDB_ENTRY( 7b5f880f, 0, 11519, YM), /* 01521 - Iso - Enchanted Lands.sndh */
+TIMEDB_ENTRY( 7b62d825, 0, 23552, YM+TA+TB+TD), /* 02542 - SCHMX & STU - TAKE THIS.sndh */
+TIMEDB_ENTRY( 7b7834ab, 0, 3450, YM), /* 04374 - Jess - Vulx (draft).sndh */
+TIMEDB_ENTRY( 7b8256b0, 0, 39168, YM+TA+TB+TD), /* 03672 - xyce - n-a.sndh */
+TIMEDB_ENTRY( 7b8853a3, 0, 2304, YM), /* 01427 - Starbuck - Atari Party.sndh */
+TIMEDB_ENTRY( 7b9c5d58, 0, 4535, YM), /* 01788 - Barry Leitch - Airborne Ranger.sndh */
+TIMEDB_ENTRY( 7b9c5d58, 1, 503, YM), /* 01788 - Barry Leitch - Airborne Ranger.sndh */
+TIMEDB_ENTRY( 7ba6257e, 0, 319, YM+TB+TD), /* 04185 - Dubmood - Lost Refound Unfinished Dub Session.sndh */
+TIMEDB_ENTRY( 7bb1d48b, 0, 38525, YM+TA+TB+TD), /* 04552 - Factor 6 - Give Me Time.sndh */
+TIMEDB_ENTRY( 7bd0c66a, 0, 2560, YM), /* 01882 - Dave Lowe - E-Swat.sndh */
+TIMEDB_ENTRY( 7bd0c66a, 1, 640, YM), /* 01882 - Dave Lowe - E-Swat.sndh */
+TIMEDB_ENTRY( 7bd0c66a, 2, 73, YM), /* 01882 - Dave Lowe - E-Swat.sndh */
+TIMEDB_ENTRY( 7bd54594, 0, 1015, YM), /* 03916 - Unknown - England.sndh */
+TIMEDB_ENTRY( 7bdf8712, 0, 2349, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 1, 235, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 2, 216, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 3, 199, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 4, 217, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 5, 184, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 6, 162, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 7, 241, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 8, 222, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 9, 258, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 10, 1580, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 11, 1178, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 12, 2335, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 13, 1585, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 14, 1582, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 15, 1197, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 16, 1576, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 17, 1098, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bdf8712, 18, 59, YM), /* 01564 - Jason Page - Ivan Ironman Stewarts Super Off Road.sndh */
+TIMEDB_ENTRY( 7bf5c286, 0, 34560, YM+TA+TB+TD), /* 02555 - Marcer - BUBBLE2005.sndh */
+TIMEDB_ENTRY( 7c04319f, 0, 6400, YM+TD), /* 03223 - Tomchi - Vertical Scroller.sndh */
+TIMEDB_ENTRY( 7c0f7cb8, 0, 6080, YM), /* 00091 - David Whittaker - Army Moves.sndh */
+TIMEDB_ENTRY( 7c0f7cb8, 1, 5184, YM), /* 00091 - David Whittaker - Army Moves.sndh */
+TIMEDB_ENTRY( 7c0f7cb8, 2, 46, YM), /* 00091 - David Whittaker - Army Moves.sndh */
+TIMEDB_ENTRY( 7c0f7cb8, 3, 161, YM), /* 00091 - David Whittaker - Army Moves.sndh */
+TIMEDB_ENTRY( 7c174ffc, 0, 40311, YM+TA+TB+TD), /* 03524 - STU - BOMBABAZOOKA.sndh */
+TIMEDB_ENTRY( 7c2f1ead, 0, 4608, YM), /* 04607 - White Ninja - Grounded.sndh */
+TIMEDB_ENTRY( 7c2f33ee, 0, 5663, YM+TA+TD), /* 02762 - Dma-Sc (Rockman style ) - ST 20th Ann. Megademo Menu.sndh */
+TIMEDB_ENTRY( 7c3e07d1, 0, 6015, YM), /* 04074 - Gary Wheaton - Honk.sndh */
+TIMEDB_ENTRY( 7c5342a5, 0, 1910, YM), /* 03938 - Mr Coke - Yet Another 4K Intro.sndh */
+TIMEDB_ENTRY( 7c5342a5, 1, 767, YM), /* 03938 - Mr Coke - Yet Another 4K Intro.sndh */
+TIMEDB_ENTRY( 7c5986cb, 0, 43020, YM+TA+TD), /* 02353 - Tao - Cream - Da Chipshit (YM Rockerz 2).sndh */
+TIMEDB_ENTRY( 7c5fd02b, 0, 2261, YM), /* 04686 - Robert Groves - Kingdom.sndh */
+TIMEDB_ENTRY( 7c5fd02b, 1, 314, YM), /* 04686 - Robert Groves - Kingdom.sndh */
+TIMEDB_ENTRY( 7c5fd02b, 2, 391, YM), /* 04686 - Robert Groves - Kingdom.sndh */
+TIMEDB_ENTRY( 7c5fd02b, 3, 311, YM), /* 04686 - Robert Groves - Kingdom.sndh */
+TIMEDB_ENTRY( 7c73c7ce, 0, 24384, YM+TA+TB+TD), /* 04333 - mOdmate-CheckPoint (orig. Adam Gilmore) - ZYBEX ENSHRINED.sndh */
+TIMEDB_ENTRY( 7ca60e91, 0, 30928, YM+TA), /* 04797 - Unknown - Axel F.sndh */
+TIMEDB_ENTRY( 7cb0fb7b, 0, 16387, YM+TA+TB+TD), /* 03632 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( 7cb0fef2, 0, 9511, YM), /* 00872 - Ben Daglish - Super Scramble Simulator.sndh */
+TIMEDB_ENTRY( 7cb0fef2, 1, 377, YM), /* 00872 - Ben Daglish - Super Scramble Simulator.sndh */
+TIMEDB_ENTRY( 7cb0fef2, 2, 129, YM), /* 00872 - Ben Daglish - Super Scramble Simulator.sndh */
+TIMEDB_ENTRY( 7cb0fef2, 3, 117, YM), /* 00872 - Ben Daglish - Super Scramble Simulator.sndh */
+TIMEDB_ENTRY( 7cb0fef2, 4, 76, YM), /* 00872 - Ben Daglish - Super Scramble Simulator.sndh */
+TIMEDB_ENTRY( 7cb0fef2, 5, 97, YM), /* 00872 - Ben Daglish - Super Scramble Simulator.sndh */
+TIMEDB_ENTRY( 7cbe3fa9, 0, 9595, YM+TA+TB+TD), /* 01830 - Lotek Style - Altair 4 - Stone Tower.sndh */
+TIMEDB_ENTRY( 7cbed450, 0, 16960, YM+TD), /* 01475 - STU - SCOOTER.sndh */
+TIMEDB_ENTRY( 7cde2999, 0, 6912, YM), /* 03309 - Tomchi - PI Bass.sndh */
+TIMEDB_ENTRY( 7ce087f3, 0, 12051, YM+TA), /* 03899 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( 7ce087f3, 1, 5121, YM+TA), /* 03899 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( 7ce087f3, 2, 16898, YM+TA), /* 03899 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( 7ced1e01, 0, 184, YM), /* 03974 - Ian Blair - Detonate.sndh */
+TIMEDB_ENTRY( 7ced1e01, 1, 160, YM), /* 03974 - Ian Blair - Detonate.sndh */
+TIMEDB_ENTRY( 7ced1e01, 2, 261, YM), /* 03974 - Ian Blair - Detonate.sndh */
+TIMEDB_ENTRY( 7d05ee31, 0, 6144, YM), /* 04840 - t1000 - Bits 35.sndh */
+TIMEDB_ENTRY( 7d0ad5a2, 0, 22859, YM), /* 02239 - Tao - Cream (orig. Rob Hubbard) - IK+ (Stmygm).sndh */
+TIMEDB_ENTRY( 7d0c5fa4, 0, 3613, YM), /* 04455 - Ian Maxwell - Dragon Scape.sndh */
+TIMEDB_ENTRY( 7d0c5fa4, 1, 7169, YM), /* 04455 - Ian Maxwell - Dragon Scape.sndh */
+TIMEDB_ENTRY( 7d17868c, 0, 38400, YM), /* 04105 - Elrinth - n-a.sndh */
+TIMEDB_ENTRY( 7d25d2f0, 0, 8287, YM), /* 01777 - LAP - Tune 27.sndh */
+TIMEDB_ENTRY( 7d2e02af, 0, 11647, YM+TA+TD), /* 02563 - marcer - i wish v2.sndh */
+TIMEDB_ENTRY( 7d694af5, 0, 6138, YM+TA), /* 01344 - Scavenger - Synergy Love Theme.sndh */
+TIMEDB_ENTRY( 7d7c95a0, 0, 29700, YM+TA), /* 03817 - Tufty - Red New 3.sndh */
+TIMEDB_ENTRY( 7d86db7b, 0, 3070, YM), /* 02474 - Iso - Patat met Kroket.sndh */
+TIMEDB_ENTRY( 7da088cb, 0, 16896, YM+TD), /* 04861 - xFalcon - Christian Bunge - In'a country style.sndh */
+TIMEDB_ENTRY( 7dc2f713, 0, 2771, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 1, 8658, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 2, 3499, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 3, 92, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 4, 4822, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 5, 2664, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 6, 3022, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 7, 8719, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 8, 5026, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 9, 6861, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 10, 2488, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 11, 8484, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 12, 3787, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 13, 3286, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 14, 2676, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7dc2f713, 15, 2386, YM), /* 04143 - Unknown - Title Designer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 0, 6624, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 1, 2688, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 2, 193, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 3, 2240, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 4, 448, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 5, 44, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 6, 135, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 7, 106, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 8, 2304, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 9, 3264, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7ddaeeae, 10, 3072, YM), /* 02205 - Mad Max - Master Blazer.sndh */
+TIMEDB_ENTRY( 7de5eee1, 0, 3839, YM), /* 04638 - dhor - Happy2.sndh */
+TIMEDB_ENTRY( 7e0c09a7, 0, 59509, YM+TA), /* 03877 - Mad Max - Ace 2.sndh */
+TIMEDB_ENTRY( 7e4c2abc, 0, 9216, YM), /* 02055 - Mad Max - Starpaws.sndh */
+TIMEDB_ENTRY( 7e4c2abc, 1, 2688, YM), /* 02055 - Mad Max - Starpaws.sndh */
+TIMEDB_ENTRY( 7e4c2abc, 2, 384, YM), /* 02055 - Mad Max - Starpaws.sndh */
+TIMEDB_ENTRY( 7e4c2abc, 3, 11, YM), /* 02055 - Mad Max - Starpaws.sndh */
+TIMEDB_ENTRY( 7e705d5d, 0, 20480, YM), /* 02046 - Mad Max - Nemesis The Warlock.sndh */
+TIMEDB_ENTRY( 7e87073c, 0, 6912, YM), /* 02108 - Mad Max - Arkanoid.sndh */
+TIMEDB_ENTRY( 7e9147b9, 0, 6903, YM+TA+TB+TD), /* 00178 - 505 - Mystic Bytes 2.sndh */
+TIMEDB_ENTRY( 7ec89c40, 0, 6656, YM+TA), /* 04408 - Dr Beat - Maziac.sndh */
+TIMEDB_ENTRY( 7ec89c40, 1, 6656, YM+TA), /* 04408 - Dr Beat - Maziac.sndh */
+TIMEDB_ENTRY( 7ec89c40, 2, 3241, YM+TA), /* 04408 - Dr Beat - Maziac.sndh */
+TIMEDB_ENTRY( 7ec89c40, 3, 6528, YM+TA), /* 04408 - Dr Beat - Maziac.sndh */
+TIMEDB_ENTRY( 7ec89c40, 4, 4096, YM+TA), /* 04408 - Dr Beat - Maziac.sndh */
+TIMEDB_ENTRY( 7ecc8753, 0, 8718, YM), /* 00224 - ACC - ACC Song.sndh */
+TIMEDB_ENTRY( 7ed223e3, 0, 11520, YM), /* 01981 - MSG - MSG 13.sndh */
+TIMEDB_ENTRY( 7ed6be79, 0, 4992, YM), /* 03255 - T1000 - The Beast Club - TS 1.sndh */
+TIMEDB_ENTRY( 7ef2d75c, 0, 31992, YM), /* 03211 - Michel Winogradoff - Builder Land.sndh */
+TIMEDB_ENTRY( 7ef2d75c, 1, 11352, YM), /* 03211 - Michel Winogradoff - Builder Land.sndh */
+TIMEDB_ENTRY( 7ef2d75c, 2, 571, YM), /* 03211 - Michel Winogradoff - Builder Land.sndh */
+TIMEDB_ENTRY( 7ef2d75c, 3, 497, YM), /* 03211 - Michel Winogradoff - Builder Land.sndh */
+TIMEDB_ENTRY( 7ef2d75c, 4, 1074, YM), /* 03211 - Michel Winogradoff - Builder Land.sndh */
+TIMEDB_ENTRY( 7f01cbd8, 0, 36864, YM+TD), /* 03329 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( 7f1c7ce7, 0, 4175, YM), /* 00011 - 4-Mat - Bubble Dizzy.sndh */
+TIMEDB_ENTRY( 7f1c7ce7, 1, 767, YM), /* 00011 - 4-Mat - Bubble Dizzy.sndh */
+TIMEDB_ENTRY( 7f1c7ce7, 2, 2207, YM), /* 00011 - 4-Mat - Bubble Dizzy.sndh */
+TIMEDB_ENTRY( 7f1c7ce7, 3, 5567, YM), /* 00011 - 4-Mat - Bubble Dizzy.sndh */
+TIMEDB_ENTRY( 7f1d73ee, 0, 8519, YM), /* 04086 - Gary Wheaton - Old Man.sndh */
+TIMEDB_ENTRY( 7f215061, 0, 1152, YM), /* 01086 - Techno - Dentro 1a.sndh */
+TIMEDB_ENTRY( 7f2e1bf1, 0, 10494, YM+TA+TD), /* 00892 - damo - resgodz - ym rucka.sndh */
+TIMEDB_ENTRY( 7f2e346b, 0, 3072, YM), /* 04411 - Dr Beat - Niet AF 1.sndh */
+TIMEDB_ENTRY( 7f3281eb, 0, 2880, YM), /* 00745 - Sean Conran - Top Cat.sndh */
+TIMEDB_ENTRY( 7f3281eb, 1, 361, YM), /* 00745 - Sean Conran - Top Cat.sndh */
+TIMEDB_ENTRY( 7f3a98de, 0, 6144, YM), /* 01163 - Tyan - Tyan 2.sndh */
+TIMEDB_ENTRY( 7f3d3bad, 0, 33280, YM+TA+TB+TD), /* 04573 - schmx-awp - SCHM-X-CALIBUR.sndh */
+TIMEDB_ENTRY( 7f53b518, 0, 35328, YM), /* 01451 - Stax - Stax 1.sndh */
+TIMEDB_ENTRY( 7f84242c, 0, 7657, YM), /* 01822 - Lord - Ambition Menu 2.sndh */
+TIMEDB_ENTRY( 7f8516c9, 0, 3524, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 1, 3524, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 2, 3331, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 3, 3204, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 4, 2051, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 5, 2306, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 6, 4804, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 7, 3524, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 8, 3843, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 9, 2896, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 10, 3597, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 11, 4484, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 12, 3077, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 13, 3845, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 14, 4613, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 15, 4229, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 16, 3461, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 17, 3077, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 18, 3077, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 19, 2693, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8516c9, 20, 3845, YM), /* 01376 - Justin Scharvona - Lemmings.sndh */
+TIMEDB_ENTRY( 7f8c1d77, 0, 6475, YM), /* 00323 - Gary Wheaton - New Religion.sndh */
+TIMEDB_ENTRY( 7f92b81d, 0, 2240, YM+TA), /* 00955 - Dark Angel - To be continued 2.sndh */
+TIMEDB_ENTRY( 7fa94136, 0, 768, YM), /* 04000 - Blue Nun - Gnurk Loader.sndh */
+TIMEDB_ENTRY( 7fb2afe4, 0, 16517, YM+TA+TD), /* 02340 - Tao - Cream - Building A Ruin (UCM 14).sndh */
+TIMEDB_ENTRY( 7fb938bc, 0, 1785, YM+TA+TB+TD), /* 01966 - MSG - Godpey - Story 1.sndh */
+TIMEDB_ENTRY( 7fc62b9e, 0, 8676, YM), /* 02183 - Mad Max - Circus Attractions.sndh */
+TIMEDB_ENTRY( 7fc62b9e, 1, 64, YM), /* 02183 - Mad Max - Circus Attractions.sndh */
+TIMEDB_ENTRY( 7fc62b9e, 2, 29, YM), /* 02183 - Mad Max - Circus Attractions.sndh */
+TIMEDB_ENTRY( 7fc62b9e, 3, 160, YM), /* 02183 - Mad Max - Circus Attractions.sndh */
+TIMEDB_ENTRY( 7fc62b9e, 4, 3384, YM), /* 02183 - Mad Max - Circus Attractions.sndh */
+TIMEDB_ENTRY( 7fc62b9e, 5, 257, YM), /* 02183 - Mad Max - Circus Attractions.sndh */
+TIMEDB_ENTRY( 7fc62b9e, 6, 97, YM), /* 02183 - Mad Max - Circus Attractions.sndh */
+TIMEDB_ENTRY( 7fc62b9e, 7, 96, YM), /* 02183 - Mad Max - Circus Attractions.sndh */
+TIMEDB_ENTRY( 7fc62b9e, 8, 161, YM), /* 02183 - Mad Max - Circus Attractions.sndh */
+TIMEDB_ENTRY( 7fc62b9e, 9, 29, YM), /* 02183 - Mad Max - Circus Attractions.sndh */
+TIMEDB_ENTRY( 7fd7219b, 0, 1920, YM+TA), /* 00921 - Dark Angel - Golem Fever.sndh */
+TIMEDB_ENTRY( 7feb1b63, 0, 7165, YM+TA+TB), /* 03574 - 505-checkpoint^paradox - moodswinger.sndh */
+TIMEDB_ENTRY( 7ff6d22e, 0, 1040, YM+TA), /* 01998 - Mad Max - Bomber (ST-Falc).sndh */
+TIMEDB_ENTRY( 7ff74252, 0, 10525, YM), /* 01527 - Iso - Horrorscope.sndh */
+TIMEDB_ENTRY( 8016e2b8, 0, 199, YM), /* 01050 - Dr Beat - NTM - New.sndh */
+TIMEDB_ENTRY( 802725bf, 0, 4620, YM+TA), /* 01149 - Tyan - No Name.sndh */
+TIMEDB_ENTRY( 8027fa17, 0, 3584, YM+TA), /* 00808 - Crawdaddy - Rezonati.sndh */
+TIMEDB_ENTRY( 802c9128, 0, 25094, YM+TA), /* 04050 - Roggie - Three pints of milk please.sndh */
+TIMEDB_ENTRY( 803eb91c, 0, 4609, YM), /* 03404 - Allister Brimble - Pro Powerboat Simulator.sndh */
+TIMEDB_ENTRY( 803f0458, 0, 1408, YM+TA+TB+TD), /* 02497 - gwEm (Ian Howe conversion) - Ravin'.sndh */
+TIMEDB_ENTRY( 804d9fc1, 0, 11898, YM+TA+TB+TD), /* 02758 - Dma-Sc - Sector One - Fighting His Fears.sndh */
+TIMEDB_ENTRY( 804ee466, 0, 5767, YM+TA), /* 02773 - Skidz - Hydroxid Dentro.sndh */
+TIMEDB_ENTRY( 8054e3b8, 0, 6255, YM+TA), /* 02664 - Donald Fakk - Beat Nick mix.sndh */
+TIMEDB_ENTRY( 807e9415, 0, 1068, YM), /* 00138 - David Whittaker - Spitting Image.sndh */
+TIMEDB_ENTRY( 807e9415, 1, 1069, YM), /* 00138 - David Whittaker - Spitting Image.sndh */
+TIMEDB_ENTRY( 807e9415, 2, 211, YM), /* 00138 - David Whittaker - Spitting Image.sndh */
+TIMEDB_ENTRY( 807e9415, 3, 934, YM), /* 00138 - David Whittaker - Spitting Image.sndh */
+TIMEDB_ENTRY( 807e9415, 4, 210, YM), /* 00138 - David Whittaker - Spitting Image.sndh */
+TIMEDB_ENTRY( 807e9415, 5, 2399, YM), /* 00138 - David Whittaker - Spitting Image.sndh */
+TIMEDB_ENTRY( 8086197d, 0, 14765, YM+TA), /* 03756 - Tufty - Numero.sndh */
+TIMEDB_ENTRY( 809533e6, 0, 14596, YM+TA+TD), /* 02791 - SH3 - Reservoir Gods - Jobil.sndh */
+TIMEDB_ENTRY( 80977f6f, 0, 48481, YM+TA), /* 03805 - Sparky - Twitch.sndh */
+TIMEDB_ENTRY( 80a8b3eb, 0, 6149, YM+TD), /* 04407 - Dr Beat - Galtan 6 - Elite Intro 3 digi.sndh */
+TIMEDB_ENTRY( 80aaad6b, 0, 2239, YM), /* 02846 - Marcer - Poker Menu.sndh */
+TIMEDB_ENTRY( 80adb17b, 0, 44544, YM), /* 02691 - Philip Linde - Spraymaali.sndh */
+TIMEDB_ENTRY( 80b2cf54, 0, 44160, YM+TA+TB+TD), /* 04007 - mOdmate-CheckPoint (orig. Uwe Loos-TGC) - TRIBUTE TO MY CHILDHOOD HEROES.sndh */
+TIMEDB_ENTRY( 80bf9c60, 0, 11228, YM), /* 04551 - Yerzmyey - Sommarhack 2014 Invite.sndh */
+TIMEDB_ENTRY( 80cd4c07, 0, 10908, YM+TA+TD), /* 04299 - 505-checkpoint^paradox - Pieces.sndh */
+TIMEDB_ENTRY( 80d049d0, 0, 6239, YM), /* 01534 - Iso - Sinking.sndh */
+TIMEDB_ENTRY( 80dc0ddd, 0, 1693, YM), /* 04502 - Geoff Camp - Brain food - Deuce.sndh */
+TIMEDB_ENTRY( 80de0b59, 0, 4184, YM), /* 00867 - Ben Daglish - Pacmania.sndh */
+TIMEDB_ENTRY( 80de0b59, 1, 199, YM), /* 00867 - Ben Daglish - Pacmania.sndh */
+TIMEDB_ENTRY( 80de0b59, 2, 3346, YM), /* 00867 - Ben Daglish - Pacmania.sndh */
+TIMEDB_ENTRY( 80de0b59, 3, 2677, YM), /* 00867 - Ben Daglish - Pacmania.sndh */
+TIMEDB_ENTRY( 80eedbdd, 0, 9599, YM+TA+TB+TD), /* 02785 - Timbral-dhs^ymr - Junkie2149.sndh */
+TIMEDB_ENTRY( 80ef941c, 0, 1152, YM+TA+TD), /* 00400 - Big Alec - Action.sndh */
+TIMEDB_ENTRY( 80f81d19, 0, 30037, YM+TA), /* 03881 - Mad Max - Phantom of the Asteroid.sndh */
+TIMEDB_ENTRY( 80f81d19, 1, 20704, YM+TA), /* 03881 - Mad Max - Phantom of the Asteroid.sndh */
+TIMEDB_ENTRY( 810de267, 0, 8640, YM), /* 01786 - Anthony Lees - Brat.sndh */
+TIMEDB_ENTRY( 810de267, 1, 128, YM), /* 01786 - Anthony Lees - Brat.sndh */
+TIMEDB_ENTRY( 810de267, 2, 257, YM), /* 01786 - Anthony Lees - Brat.sndh */
+TIMEDB_ENTRY( 810de267, 3, 640, YM), /* 01786 - Anthony Lees - Brat.sndh */
+TIMEDB_ENTRY( 810de267, 4, 288, YM), /* 01786 - Anthony Lees - Brat.sndh */
+TIMEDB_ENTRY( 810de267, 5, 1024, YM), /* 01786 - Anthony Lees - Brat.sndh */
+TIMEDB_ENTRY( 810de267, 6, 257, YM), /* 01786 - Anthony Lees - Brat.sndh */
+TIMEDB_ENTRY( 81317f3f, 0, 8063, YM+TA+TD), /* 02557 - marcer - comic baker maxer.sndh */
+TIMEDB_ENTRY( 8136a17c, 0, 9983, YM+TA+TB+TD), /* 03611 - Timbral-DHS-YMR - Fresh Bitches.sndh */
+TIMEDB_ENTRY( 814b39bc, 0, 12288, YM), /* 04834 - T1000 - Bits 28.sndh */
+TIMEDB_ENTRY( 814f3f2e, 0, 7171, YM+TA), /* 01150 - Tyan - Old.sndh */
+TIMEDB_ENTRY( 817b29ae, 0, 21504, YM), /* 01467 - STU - FUNKEY.sndh */
+TIMEDB_ENTRY( 81852f5e, 0, 4848, YM), /* 03406 - Dave Lowe - Line of Fire.sndh */
+TIMEDB_ENTRY( 81852f5e, 1, 2304, YM), /* 03406 - Dave Lowe - Line of Fire.sndh */
+TIMEDB_ENTRY( 8194b266, 0, 488, YM), /* 04542 - Albert Baggetta - Ghost Mine.sndh */
+TIMEDB_ENTRY( 81eb526a, 0, 4512, YM+TD), /* 02380 - Nexus 6 - Lethal Xcess Level 2.sndh */
+TIMEDB_ENTRY( 81eb526a, 1, 768, YM+TD), /* 02380 - Nexus 6 - Lethal Xcess Level 2.sndh */
+TIMEDB_ENTRY( 81eb526a, 2, 560, YM+TD), /* 02380 - Nexus 6 - Lethal Xcess Level 2.sndh */
+TIMEDB_ENTRY( 8206808c, 0, 3967, YM+TA+TB+TD), /* 00088 - 505 - More Sun.sndh */
+TIMEDB_ENTRY( 820ffe29, 0, 7840, YM+TA+TD), /* 02181 - Tao - Cream - ..do things (install).sndh */
+TIMEDB_ENTRY( 821c23b4, 0, 170068, YM+TA), /* 03968 - Unknown - Son of God.sndh */
+TIMEDB_ENTRY( 82884d6e, 0, 4080, YM+TA+TD), /* 02745 - Crazy Q - DHS - . G-SpOt ..sndh */
+TIMEDB_ENTRY( 828877c1, 0, 6527, YM), /* 02396 - Nexus 6 - Silly But Happy.sndh */
+TIMEDB_ENTRY( 8289f87a, 0, 6132, YM+TA), /* 00914 - Dark Angel - Angel In Hell.sndh */
+TIMEDB_ENTRY( 828f12cb, 0, 51827, YM+TA+TB), /* 01353 - Scavenger - Symbiosis - Synergy Megademo.sndh */
+TIMEDB_ENTRY( 82925534, 0, 2497, YM), /* 04543 - William Anderson - Gopher Hunt.sndh */
+TIMEDB_ENTRY( 82925534, 1, 365, YM), /* 04543 - William Anderson - Gopher Hunt.sndh */
+TIMEDB_ENTRY( 82925534, 2, 2285, YM), /* 04543 - William Anderson - Gopher Hunt.sndh */
+TIMEDB_ENTRY( 82925534, 3, 752, YM), /* 04543 - William Anderson - Gopher Hunt.sndh */
+TIMEDB_ENTRY( 82925534, 4, 233, YM), /* 04543 - William Anderson - Gopher Hunt.sndh */
+TIMEDB_ENTRY( 82925534, 5, 218, YM), /* 04543 - William Anderson - Gopher Hunt.sndh */
+TIMEDB_ENTRY( 82925534, 6, 914, YM), /* 04543 - William Anderson - Gopher Hunt.sndh */
+TIMEDB_ENTRY( 82a10bd4, 0, 12576, YM+TD), /* 00410 - Big Alec - Locomotion.sndh */
+TIMEDB_ENTRY( 82a1a072, 0, 15275, YM+TA+TB+TD), /* 02071 - Mad Max - Confuzion - Sid.sndh */
+TIMEDB_ENTRY( 82ab9458, 0, 12288, YM), /* 02116 - Mad Max - Scout.sndh */
+TIMEDB_ENTRY( 82ab9458, 1, 1536, YM), /* 02116 - Mad Max - Scout.sndh */
+TIMEDB_ENTRY( 82aee9e4, 0, 7062, YM), /* 03096 - n-a - Pachelbel's Canon in D.sndh */
+TIMEDB_ENTRY( 82b08ab6, 0, 17663, YM), /* 02962 - Unknown - Final Command.sndh */
+TIMEDB_ENTRY( 82bb663c, 0, 5954, YM), /* 01046 - Dr Beat - Imagination - Many Minis.sndh */
+TIMEDB_ENTRY( 82cdfc07, 0, 8256, YM), /* 03177 - n-a - 76 Trombones.sndh */
+TIMEDB_ENTRY( 82df2d73, 0, 13785, YM), /* 04839 - t1000 - Bits 34.sndh */
+TIMEDB_ENTRY( 82e4b442, 0, 1536, YM+TA), /* 00950 - Dark Angel - It's Spring Time.sndh */
+TIMEDB_ENTRY( 82ebfe04, 0, 5120, YM), /* 00980 - Chris Denman - Warriors Of Releyne.sndh */
+TIMEDB_ENTRY( 82ebfe04, 1, 883, YM), /* 00980 - Chris Denman - Warriors Of Releyne.sndh */
+TIMEDB_ENTRY( 82ebfe04, 2, 1536, YM), /* 00980 - Chris Denman - Warriors Of Releyne.sndh */
+TIMEDB_ENTRY( 82ebfe04, 3, 395, YM), /* 00980 - Chris Denman - Warriors Of Releyne.sndh */
+TIMEDB_ENTRY( 82ebfe04, 4, 371, YM), /* 00980 - Chris Denman - Warriors Of Releyne.sndh */
+TIMEDB_ENTRY( 82ebfe04, 5, 307, YM), /* 00980 - Chris Denman - Warriors Of Releyne.sndh */
+TIMEDB_ENTRY( 82fbb472, 0, 6144, YM), /* 01219 - ENS Music - ENS 2.sndh */
+TIMEDB_ENTRY( 830a7e7e, 0, 5184, YM), /* 02718 - Chris Denman - Legend of the Lost.sndh */
+TIMEDB_ENTRY( 830a7e7e, 1, 2400, YM), /* 02718 - Chris Denman - Legend of the Lost.sndh */
+TIMEDB_ENTRY( 830a7e7e, 2, 4032, YM), /* 02718 - Chris Denman - Legend of the Lost.sndh */
+TIMEDB_ENTRY( 8310eb1b, 0, 32, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 1, 9, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 2, 16, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 3, 7, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 4, 27, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 5, 39, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 6, 57, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 7, 35, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 8, 32, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 9, 43, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 10, 74, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 11, 914, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 12, 144, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 13, 7, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 14, 88, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 15, 33, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 16, 5, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 17, 217, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 18, 179, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 19, 4000, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 8310eb1b, 20, 147, YM), /* 04706 - Unknown - Prehistorik.sndh */
+TIMEDB_ENTRY( 83230484, 0, 671, YM+TA+TB), /* 03623 - Excellence In Art - Sommarkhack Report Pt 1.sndh */
+TIMEDB_ENTRY( 83300f99, 0, 24639, YM+TA+TB+TD), /* 02695 - dubmood (breakmekanix) - Alla vill till himmelen.sndh */
+TIMEDB_ENTRY( 833f75a0, 0, 8303, YM+TA), /* 03669 - Per Almered-XiA-Checkpoint - Sunshine.sndh */
+TIMEDB_ENTRY( 835c49fc, 0, 4602, YM+TA), /* 00825 - Crazy Q - DHS - Nightmare at Beatstreet.sndh */
+TIMEDB_ENTRY( 83652ab4, 0, 6226, YM), /* 01927 - The Mind - Genesys Remix - Zeppelin.sndh */
+TIMEDB_ENTRY( 839e8649, 0, 7895, YM), /* 02460 - Ross Goodley - Bombuzal.sndh */
+TIMEDB_ENTRY( 83b8a41f, 0, 4795, YM+TA+TB+TD), /* 00049 - 505 - Focky2.sndh */
+TIMEDB_ENTRY( 83b9ee01, 0, 31299, YM+TA), /* 03762 - Tufty - Tuft2a.sndh */
+TIMEDB_ENTRY( 83c6f446, 0, 2612, YM), /* 03039 - Ed Bogas - Boogie.sndh */
+TIMEDB_ENTRY( 83e8d142, 0, 1280, YM), /* 04478 - Thomas the Tank Engine - Paul Tankard.sndh */
+TIMEDB_ENTRY( 83ebd9c3, 0, 4353, YM), /* 00379 - Wally Beben - CDS Chess.sndh */
+TIMEDB_ENTRY( 83ebd9c3, 1, 5365, YM), /* 00379 - Wally Beben - CDS Chess.sndh */
+TIMEDB_ENTRY( 83ebd9c3, 3, 9473, YM), /* 00379 - Wally Beben - CDS Chess.sndh */
+TIMEDB_ENTRY( 83f4c7f6, 0, 4608, YM+TA), /* 00253 - Antichrist - Coolbass.sndh */
+TIMEDB_ENTRY( 840a28cc, 0, 1152, YM), /* 00777 - Crawdaddy - Bedtime.sndh */
+TIMEDB_ENTRY( 840b9a90, 0, 8520, YM+TA), /* 04015 - Mad Max - Axel F.sndh */
+TIMEDB_ENTRY( 84303fe0, 0, 11432, YM), /* 01022 - Doclands - Lightning Demo - Beast.sndh */
+TIMEDB_ENTRY( 843e061f, 0, 26213, YM+TB+TD), /* 04618 - Laserball 2014 - xFalcon.sndh */
+TIMEDB_ENTRY( 843e061f, 1, 33026, YM+TB+TD), /* 04618 - Laserball 2014 - xFalcon.sndh */
+TIMEDB_ENTRY( 843e061f, 2, 26626, YM+TB+TD), /* 04618 - Laserball 2014 - xFalcon.sndh */
+TIMEDB_ENTRY( 843e061f, 3, 1077, YM+TD), /* 04618 - Laserball 2014 - xFalcon.sndh */
+TIMEDB_ENTRY( 843e061f, 4, 436, YM), /* 04618 - Laserball 2014 - xFalcon.sndh */
+TIMEDB_ENTRY( 8446cdb5, 0, 6911, YM+TD), /* 04353 - gwEm - Fuji Sunset.sndh */
+TIMEDB_ENTRY( 846ab268, 0, 4604, YM+TA+TB+TD), /* 00035 - 505 - Blue Snow (D-Bug 184a).sndh */
+TIMEDB_ENTRY( 846e1b3b, 0, 2688, YM), /* 03495 - Shamen - Certified Dope - Filled 3D.sndh */
+TIMEDB_ENTRY( 846f92cb, 0, 1543, YM), /* 00960 - Mike Davies - Alien Storm.sndh */
+TIMEDB_ENTRY( 846f92cb, 1, 621, YM), /* 00960 - Mike Davies - Alien Storm.sndh */
+TIMEDB_ENTRY( 846f92cb, 2, 1371, YM), /* 00960 - Mike Davies - Alien Storm.sndh */
+TIMEDB_ENTRY( 846f92cb, 3, 68, YM), /* 00960 - Mike Davies - Alien Storm.sndh */
+TIMEDB_ENTRY( 846f92cb, 4, 187, YM), /* 00960 - Mike Davies - Alien Storm.sndh */
+TIMEDB_ENTRY( 846f92cb, 5, 193, YM), /* 00960 - Mike Davies - Alien Storm.sndh */
+TIMEDB_ENTRY( 846f92cb, 6, 1518, YM), /* 00960 - Mike Davies - Alien Storm.sndh */
+TIMEDB_ENTRY( 848f1879, 0, 9600, YM), /* 00569 - David Whittaker - Outrun.sndh */
+TIMEDB_ENTRY( 848f1879, 1, 5832, YM), /* 00569 - David Whittaker - Outrun.sndh */
+TIMEDB_ENTRY( 84969b36, 0, 12288, YM), /* 01648 - Jedi - Kidney 8 Remix.sndh */
+TIMEDB_ENTRY( 84be4f62, 0, 1535, YM+TD), /* 03288 - Dma-Sc - ATIPYK Developments - Manical Drop - 2 Players music #1.sndh */
+TIMEDB_ENTRY( 8502b722, 0, 8363, YM), /* 00169 - Martin Walker - Frenetic.sndh */
+TIMEDB_ENTRY( 851a3afa, 0, 2670, YM), /* 03058 - Ed Bogas - Prelude.sndh */
+TIMEDB_ENTRY( 851d7ab9, 0, 9146, YM), /* 03528 - Matt Furniss - Laser Squad.sndh */
+TIMEDB_ENTRY( 85272569, 0, 5545, YM), /* 03429 - Per Almered (XiA) 2009 - Cheap (in terms of CPU).sndh */
+TIMEDB_ENTRY( 853a01d8, 0, 2559, YM), /* 04380 - Britelite - One Trick Pony.sndh */
+TIMEDB_ENTRY( 855c682b, 0, 2174, YM+TA+TB+TD), /* 00068 - 505 - Lajbkalg.sndh */
+TIMEDB_ENTRY( 856484b0, 0, 2608, YM), /* 00072 - David Whittaker - Bad Company.sndh */
+TIMEDB_ENTRY( 856484b0, 1, 3072, YM), /* 00072 - David Whittaker - Bad Company.sndh */
+TIMEDB_ENTRY( 856484b0, 2, 145, YM), /* 00072 - David Whittaker - Bad Company.sndh */
+TIMEDB_ENTRY( 856484b0, 3, 145, YM), /* 00072 - David Whittaker - Bad Company.sndh */
+TIMEDB_ENTRY( 856484b0, 4, 128, YM), /* 00072 - David Whittaker - Bad Company.sndh */
+TIMEDB_ENTRY( 856484b0, 5, 128, YM), /* 00072 - David Whittaker - Bad Company.sndh */
+TIMEDB_ENTRY( 856484b0, 6, 193, YM), /* 00072 - David Whittaker - Bad Company.sndh */
+TIMEDB_ENTRY( 856484b0, 7, 193, YM), /* 00072 - David Whittaker - Bad Company.sndh */
+TIMEDB_ENTRY( 856484b0, 8, 97, YM), /* 00072 - David Whittaker - Bad Company.sndh */
+TIMEDB_ENTRY( 856484b0, 9, 97, YM), /* 00072 - David Whittaker - Bad Company.sndh */
+TIMEDB_ENTRY( 85755c2d, 0, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 1, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 2, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 3, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 4, 9, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 5, 15, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 6, 135, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 7, 30, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 8, 240, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 9, 102, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 10, 120, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 11, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 12, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 14, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 15, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 16, 36, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 17, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 18, 313, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 19, 406, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 20, 802, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 21, 360, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 22, 2054, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 23, 303, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 24, 310, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 25, 285, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 26, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 27, 388, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 28, 6, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 29, 9, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 30, 18, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 31, 6, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 32, 310, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 33, 1933, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 34, 730, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85755c2d, 35, 1917, YM), /* 04745 - Margaret Lowe - Police Quest - In the Pursuit of Death Angel.sndh */
+TIMEDB_ENTRY( 85793842, 0, 7674, YM+TA), /* 03506 - 505 - Suretrip 2 - Digi.sndh */
+TIMEDB_ENTRY( 8580c999, 0, 8858, YM+TA+TB+TD), /* 03638 - Dma-Sc - ATARI subarashii.sndh */
+TIMEDB_ENTRY( 85830820, 0, 33023, YM+TA+TB+TD), /* 02985 - 505-paradox - Factored.sndh */
+TIMEDB_ENTRY( 858d453e, 0, 6336, YM), /* 04827 - T1000 - Bits 58.sndh */
+TIMEDB_ENTRY( 8591da8c, 0, 4043, YM+TA+TB+TD), /* 04297 - 505-Checkpoint (2000) - PaniC.sndh */
+TIMEDB_ENTRY( 8594f198, 0, 46512, YM+TA), /* 03819 - Tufty - Wierd.sndh */
+TIMEDB_ENTRY( 85a86719, 0, 8064, YM+TA+TD), /* 02265 - Tao - Cream - State Of Confusion (Steps).sndh */
+TIMEDB_ENTRY( 85c0e6c8, 0, 16128, YM), /* 03310 - Tomchi - 1st Extra.sndh */
+TIMEDB_ENTRY( 85c8d991, 0, 5142, YM), /* 01438 - Stax - Lazer.sndh */
+TIMEDB_ENTRY( 85d5f3b8, 0, 5567, YM+TA+TB+TD), /* 03418 - dubmood - RaZoR 1911 - D-Bug - Heatbeat vs WoTW.sndh */
+TIMEDB_ENTRY( 85dd5c95, 0, 4608, YM), /* 00966 - Mike Davies - Mercs.sndh */
+TIMEDB_ENTRY( 85dd5c95, 1, 560, YM), /* 00966 - Mike Davies - Mercs.sndh */
+TIMEDB_ENTRY( 85dd5c95, 2, 218, YM), /* 00966 - Mike Davies - Mercs.sndh */
+TIMEDB_ENTRY( 85dd5c95, 3, 145, YM), /* 00966 - Mike Davies - Mercs.sndh */
+TIMEDB_ENTRY( 85dd5c95, 4, 512, YM), /* 00966 - Mike Davies - Mercs.sndh */
+TIMEDB_ENTRY( 85dd5c95, 5, 21, YM), /* 00966 - Mike Davies - Mercs.sndh */
+TIMEDB_ENTRY( 85dd5c95, 6, 29, YM), /* 00966 - Mike Davies - Mercs.sndh */
+TIMEDB_ENTRY( 85dd5c95, 7, 768, YM), /* 00966 - Mike Davies - Mercs.sndh */
+TIMEDB_ENTRY( 85de9990, 0, 6336, YM), /* 02384 - Nexus 6 - My Delight.sndh */
+TIMEDB_ENTRY( 85e9d93c, 0, 12288, YM), /* 01540 - Ralph - Ralph 3.sndh */
+TIMEDB_ENTRY( 85f9dbbf, 0, 9401, YM+TA+TB+TD), /* 01961 - MSG - Godpey - Practice.sndh */
+TIMEDB_ENTRY( 85fb312e, 0, 50330, YM+TA+TB+TD), /* 04336 - !Cube - Blipblop Memories.sndh */
+TIMEDB_ENTRY( 86011a1a, 0, 8188, YM+TA+TB+TD), /* 00036 - 505 - Another Brick In The Wall.sndh */
+TIMEDB_ENTRY( 8628401b, 0, 38153, YM), /* 00849 - Ben Daglish - Flintstones.sndh */
+TIMEDB_ENTRY( 8628401b, 1, 33302, YM), /* 00849 - Ben Daglish - Flintstones.sndh */
+TIMEDB_ENTRY( 862e79b4, 0, 14266, YM+TA), /* 01742 - Jovis - Lametrop - End.sndh */
+TIMEDB_ENTRY( 862f0c04, 0, 8512, YM), /* 02352 - Tao - Cream - Crazy Train (YM Rockerz 5).sndh */
+TIMEDB_ENTRY( 8647ab46, 0, 89852, YM+TA), /* 04057 - Roggie - Spleen music.sndh */
+TIMEDB_ENTRY( 865c215f, 0, 4608, YM), /* 02028 - Mad Max - Delta.sndh */
+TIMEDB_ENTRY( 865c215f, 1, 4608, YM), /* 02028 - Mad Max - Delta.sndh */
+TIMEDB_ENTRY( 865c215f, 2, 171, YM), /* 02028 - Mad Max - Delta.sndh */
+TIMEDB_ENTRY( 865c215f, 3, 268, YM), /* 02028 - Mad Max - Delta.sndh */
+TIMEDB_ENTRY( 865c215f, 4, 395, YM), /* 02028 - Mad Max - Delta.sndh */
+TIMEDB_ENTRY( 865c215f, 5, 395, YM), /* 02028 - Mad Max - Delta.sndh */
+TIMEDB_ENTRY( 865c215f, 6, 299, YM), /* 02028 - Mad Max - Delta.sndh */
+TIMEDB_ENTRY( 865c215f, 7, 267, YM), /* 02028 - Mad Max - Delta.sndh */
+TIMEDB_ENTRY( 865c215f, 8, 395, YM), /* 02028 - Mad Max - Delta.sndh */
+TIMEDB_ENTRY( 865c215f, 9, 524, YM), /* 02028 - Mad Max - Delta.sndh */
+TIMEDB_ENTRY( 8670176a, 0, 9216, YM+TA), /* 04858 - Michel Winogradoff - Disc.sndh */
+TIMEDB_ENTRY( 86712ac2, 0, 8355, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 1, 5888, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 2, 6720, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 3, 8160, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 4, 6656, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 5, 10880, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 6, 5280, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 7, 6048, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 8, 9856, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 9, 81, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 10, 201, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86712ac2, 11, 8632, YM), /* 01803 - Barry Leitch - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86877312, 0, 4992, YM), /* 01147 - Tyan - Revolution - Melody.sndh */
+TIMEDB_ENTRY( 868f4905, 0, 7168, YM), /* 00607 - Chris Mad - Phalanx Main Menu.sndh */
+TIMEDB_ENTRY( 86a16e5f, 0, 1534, YM), /* 02466 - Iso - Holland is OK.sndh */
+TIMEDB_ENTRY( 86a590d4, 0, 2112, YM), /* 00449 - Augustin Vidovic - Incommunicardo.sndh */
+TIMEDB_ENTRY( 86a9b159, 0, 959, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86a9b159, 1, 528, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86a9b159, 2, 170, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86a9b159, 3, 118, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86a9b159, 4, 96, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86a9b159, 5, 168, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86a9b159, 6, 3071, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86a9b159, 7, 3071, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86a9b159, 8, 4479, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86a9b159, 9, 3071, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86a9b159, 10, 4608, YM), /* 00357 - Mark Wilson - Bonaza Brothers.sndh */
+TIMEDB_ENTRY( 86be6826, 0, 6528, YM), /* 00113 - David Whittaker - Knightmare.sndh */
+TIMEDB_ENTRY( 86c4eac7, 0, 11630, YM+TA+TB), /* 00074 - 505 - leave it - alive 4.sndh */
+TIMEDB_ENTRY( 86c60eb4, 0, 514, YM+TA+TD), /* 02233 - Tao - Cream - Loader (Nostalgic-O-Demo).sndh */
+TIMEDB_ENTRY( 86e3fc9b, 0, 14603, YM+TA+TB+TD), /* 02106 - Mad Max - Zoolook - Sid.sndh */
+TIMEDB_ENTRY( 86ed0e65, 0, 256, YM), /* 04544 - Grant Magnuson - Granshot.sndh */
+TIMEDB_ENTRY( 86ed0e65, 1, 640, YM), /* 04544 - Grant Magnuson - Granshot.sndh */
+TIMEDB_ENTRY( 86f8c6b0, 0, 6465, YM+TA), /* 04417 - EVE - Rock & Roll.sndh */
+TIMEDB_ENTRY( 86fbb490, 0, 3924, YM), /* 03924 - Unknown - Musik 001.sndh */
+TIMEDB_ENTRY( 8716d8eb, 0, 6725, YM), /* 00020 - Martin Iveson - Wolfchild.sndh */
+TIMEDB_ENTRY( 872fca5b, 0, 109257, YM+TA), /* 04060 - Hybrid - Swirl.sndh */
+TIMEDB_ENTRY( 876c3fe0, 0, 195903, YM+TA), /* 04040 - Roggie - Who stood on the caterpillar?.sndh */
+TIMEDB_ENTRY( 8777606c, 0, 3823, YM), /* 04070 - Gary Wheaton - Fractal.sndh */
+TIMEDB_ENTRY( 8779fed0, 0, 5584, YM), /* 01230 - Epic - Another Illusion.sndh */
+TIMEDB_ENTRY( 87a3e62f, 0, 14208, YM), /* 00762 - Count Zero - Decade Demo - Boot.sndh */
+TIMEDB_ENTRY( 87a70bcb, 0, 10456, YM), /* 03091 - n-a - Both Sides Now.sndh */
+TIMEDB_ENTRY( 87a8a5b0, 0, 81189, YM+TA), /* 03702 - Sparky - Bachola - From a Bach 3-part inv..sndh */
+TIMEDB_ENTRY( 87aa164b, 0, 3241, YM), /* 03281 - Thothy - Stille.sndh */
+TIMEDB_ENTRY( 87b13082, 0, 1799, YM), /* 02723 - Jeremy Das & Nik Sen - Orbit 2000.sndh */
+TIMEDB_ENTRY( 87b13082, 1, 128, YM), /* 02723 - Jeremy Das & Nik Sen - Orbit 2000.sndh */
+TIMEDB_ENTRY( 87ba7407, 0, 7267, YM+TA+TD), /* 03432 - Per Almered (XiA) 2009 - The Last Song.sndh */
+TIMEDB_ENTRY( 87c9aef3, 0, 9756, YM), /* 04565 - Stan Mercury - Innuendo.sndh */
+TIMEDB_ENTRY( 87d9730c, 0, 10766, YM), /* 00510 - Tangens - Synthetic Visions - Magic Devil.sndh */
+TIMEDB_ENTRY( 87e8abf0, 0, 49, YM), /* 04707 - P.F. Rees - Pushover.sndh */
+TIMEDB_ENTRY( 87e8abf0, 1, 42, YM), /* 04707 - P.F. Rees - Pushover.sndh */
+TIMEDB_ENTRY( 87e8abf0, 2, 775, YM), /* 04707 - P.F. Rees - Pushover.sndh */
+TIMEDB_ENTRY( 87e8abf0, 3, 1822, YM), /* 04707 - P.F. Rees - Pushover.sndh */
+TIMEDB_ENTRY( 87e8abf0, 4, 2280, YM), /* 04707 - P.F. Rees - Pushover.sndh */
+TIMEDB_ENTRY( 87e8abf0, 5, 149, YM), /* 04707 - P.F. Rees - Pushover.sndh */
+TIMEDB_ENTRY( 87e8abf0, 6, 1492, YM), /* 04707 - P.F. Rees - Pushover.sndh */
+TIMEDB_ENTRY( 87e8abf0, 7, 629, YM), /* 04707 - P.F. Rees - Pushover.sndh */
+TIMEDB_ENTRY( 87ee8140, 0, 8075, YM), /* 02431 - Beast - Blaackel.sndh */
+TIMEDB_ENTRY( 87f1a3c3, 0, 1025, YM), /* 02939 - Ken Legace - Knights of the Sky.sndh */
+TIMEDB_ENTRY( 87f1a3c3, 1, 1021, YM), /* 02939 - Ken Legace - Knights of the Sky.sndh */
+TIMEDB_ENTRY( 87f1a3c3, 2, 1027, YM), /* 02939 - Ken Legace - Knights of the Sky.sndh */
+TIMEDB_ENTRY( 8809a088, 0, 6713, YM+TA), /* 04102 - 505-cpt^pdx - Blazing.sndh */
+TIMEDB_ENTRY( 8816f97e, 0, 8428, YM), /* 01571 - Patrick Phelan - Zool.sndh */
+TIMEDB_ENTRY( 8816f97e, 1, 6000, YM), /* 01571 - Patrick Phelan - Zool.sndh */
+TIMEDB_ENTRY( 8816f97e, 2, 5060, YM), /* 01571 - Patrick Phelan - Zool.sndh */
+TIMEDB_ENTRY( 8816f97e, 3, 4356, YM), /* 01571 - Patrick Phelan - Zool.sndh */
+TIMEDB_ENTRY( 8816f97e, 4, 10560, YM), /* 01571 - Patrick Phelan - Zool.sndh */
+TIMEDB_ENTRY( 882b5a87, 0, 3824, YM), /* 01490 - Fred Gray - Eco.sndh */
+TIMEDB_ENTRY( 882b5a87, 1, 3824, YM), /* 01490 - Fred Gray - Eco.sndh */
+TIMEDB_ENTRY( 882b5a87, 2, 3464, YM), /* 01490 - Fred Gray - Eco.sndh */
+TIMEDB_ENTRY( 882b5a87, 3, 3824, YM), /* 01490 - Fred Gray - Eco.sndh */
+TIMEDB_ENTRY( 882b5a87, 4, 3824, YM), /* 01490 - Fred Gray - Eco.sndh */
+TIMEDB_ENTRY( 882b5a87, 5, 7553, YM), /* 01490 - Fred Gray - Eco.sndh */
+TIMEDB_ENTRY( 883c5219, 0, 2533, YM), /* 02889 - Captain Headcrash - Total Vision Inc 3.5k.sndh */
+TIMEDB_ENTRY( 8842bf29, 0, 5120, YM), /* 02631 - Nemo - DHS - Bobby.sndh */
+TIMEDB_ENTRY( 885918eb, 0, 7169, YM), /* 00391 - Wally Beben - Quartz.sndh */
+TIMEDB_ENTRY( 885a67aa, 0, 1536, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 1, 883, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 2, 505, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 3, 417, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 4, 358, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 5, 437, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 6, 221, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 7, 28, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 8, 23, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 9, 63, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 10, 892, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 11, 7, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 12, 17, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 885a67aa, 13, 295, YM), /* 04536 - Darren Ithell - Fun School 4 (5-7 years).sndh */
+TIMEDB_ENTRY( 8862706d, 0, 11819, YM+TA+TB+TD), /* 01283 - Frequent - Ephidrena ( 2003 ) - Asfalt (YM Rockerz).sndh */
+TIMEDB_ENTRY( 88706463, 0, 7872, YM), /* 02942 - Andi Mcginty - WWF European Rampage.sndh */
+TIMEDB_ENTRY( 88706463, 1, 1901, YM), /* 02942 - Andi Mcginty - WWF European Rampage.sndh */
+TIMEDB_ENTRY( 88706463, 2, 642, YM), /* 02942 - Andi Mcginty - WWF European Rampage.sndh */
+TIMEDB_ENTRY( 88706463, 3, 403, YM), /* 02942 - Andi Mcginty - WWF European Rampage.sndh */
+TIMEDB_ENTRY( 887b01d2, 0, 2954, YM), /* 03066 - Chris French - The Little Drummer Boy.sndh */
+TIMEDB_ENTRY( 888f17ae, 0, 9640, YM+TA+TB+TD), /* 01846 - Lotek Style - Elfworld.sndh */
+TIMEDB_ENTRY( 8894f6cd, 0, 9210, YM+TB), /* 01845 - Lotek Style - Eilig.sndh */
+TIMEDB_ENTRY( 889e8ff3, 0, 268, YM), /* 00105 - David Whittaker - Gold of the Aztecs.sndh */
+TIMEDB_ENTRY( 889e8ff3, 1, 4437, YM), /* 00105 - David Whittaker - Gold of the Aztecs.sndh */
+TIMEDB_ENTRY( 889e8ff3, 2, 5916, YM), /* 00105 - David Whittaker - Gold of the Aztecs.sndh */
+TIMEDB_ENTRY( 889e8ff3, 3, 4681, YM), /* 00105 - David Whittaker - Gold of the Aztecs.sndh */
+TIMEDB_ENTRY( 889e8ff3, 4, 6096, YM), /* 00105 - David Whittaker - Gold of the Aztecs.sndh */
+TIMEDB_ENTRY( 889e8ff3, 5, 4096, YM), /* 00105 - David Whittaker - Gold of the Aztecs.sndh */
+TIMEDB_ENTRY( 889e8ff3, 6, 1812, YM), /* 00105 - David Whittaker - Gold of the Aztecs.sndh */
+TIMEDB_ENTRY( 889e8ff3, 7, 5140, YM), /* 00105 - David Whittaker - Gold of the Aztecs.sndh */
+TIMEDB_ENTRY( 889e8ff3, 8, 1524, YM), /* 00105 - David Whittaker - Gold of the Aztecs.sndh */
+TIMEDB_ENTRY( 88a522f4, 0, 13440, YM), /* 01726 - Jet Power - AGITRS - MAIN MENU.sndh */
+TIMEDB_ENTRY( 88b71630, 0, 7290, YM), /* 01720 - Jess - The Undead Horror Show.sndh */
+TIMEDB_ENTRY( 88cf05aa, 0, 5119, YM+TA+TB+TD), /* 02834 - maktone-fairlight - goldfish.sndh */
+TIMEDB_ENTRY( 88e1a889, 0, 5120, YM+TA), /* 04588 - Illusion - Pure Energy 4.sndh */
+TIMEDB_ENTRY( 890722c7, 0, 4032, YM+TA+TD), /* 00442 - Big Alec - Vortex.sndh */
+TIMEDB_ENTRY( 8907a108, 0, 7678, YM), /* 01265 - Frazer - Bertram.sndh */
+TIMEDB_ENTRY( 8927bb05, 0, 281597, YM+TA), /* 03785 - Nexus 6 - Rising 1.sndh */
+TIMEDB_ENTRY( 89340a3e, 0, 13056, YM), /* 00473 - Ultimatum - Big Kid.sndh */
+TIMEDB_ENTRY( 89370a2b, 0, 21504, YM), /* 00753 - Mark Cooksey - Gremlins 2.sndh */
+TIMEDB_ENTRY( 89370a2b, 1, 1665, YM), /* 00753 - Mark Cooksey - Gremlins 2.sndh */
+TIMEDB_ENTRY( 89370a2b, 2, 14400, YM), /* 00753 - Mark Cooksey - Gremlins 2.sndh */
+TIMEDB_ENTRY( 89370a2b, 3, 1961, YM), /* 00753 - Mark Cooksey - Gremlins 2.sndh */
+TIMEDB_ENTRY( 89370a2b, 4, 769, YM), /* 00753 - Mark Cooksey - Gremlins 2.sndh */
+TIMEDB_ENTRY( 89370a2b, 5, 2580, YM), /* 00753 - Mark Cooksey - Gremlins 2.sndh */
+TIMEDB_ENTRY( 89370a2b, 6, 7200, YM), /* 00753 - Mark Cooksey - Gremlins 2.sndh */
+TIMEDB_ENTRY( 89419650, 0, 6255, YM), /* 02941 - Archer Maclean - Jimmy Whites Whirlwind Snooker.sndh */
+TIMEDB_ENTRY( 8952507b, 0, 37632, YM), /* 03862 - xyce - Cpp is Forbidden - Part 2.sndh */
+TIMEDB_ENTRY( 895907a8, 0, 8179, YM), /* 00288 - Andrew Barnabas - SWIV (SILKWORM IV).sndh */
+TIMEDB_ENTRY( 895907a8, 1, 8640, YM), /* 00288 - Andrew Barnabas - SWIV (SILKWORM IV).sndh */
+TIMEDB_ENTRY( 8964eb98, 0, 25338, YM), /* 01698 - Jess - Not Soporific Lullaby.sndh */
+TIMEDB_ENTRY( 896fbc6d, 0, 2079, YM), /* 03692 - Dma-Sc - Saboteur 3 - Title Screen.sndh */
+TIMEDB_ENTRY( 898a612a, 0, 18136, YM+TA), /* 04017 - Roggie - Bach.sndh */
+TIMEDB_ENTRY( 898af7b9, 0, 4096, YM), /* 03499 - Shamen - Certified Dope - Shape it Up.sndh */
+TIMEDB_ENTRY( 899af032, 0, 5375, YM), /* 04094 - Gary Wheaton - So Watt remix.sndh */
+TIMEDB_ENTRY( 89b4327d, 0, 5633, YM), /* 01506 - Rob Hubbard - Jupiter Probe.sndh */
+TIMEDB_ENTRY( 89c22e74, 0, 24576, YM), /* 01400 - Skyline - Snork - Rave YM.sndh */
+TIMEDB_ENTRY( 89c7d192, 0, 30432, YM+TA+TB+TD), /* 03375 - STU - READY TO SCORE.sndh */
+TIMEDB_ENTRY( 89ee07ec, 0, 3066, YM), /* 01696 - Jess - For your Loader #2.sndh */
+TIMEDB_ENTRY( 89f069cd, 0, 5520, YM), /* 00153 - David Whittaker - World Class Rugby.sndh */
+TIMEDB_ENTRY( 89f069cd, 1, 769, YM), /* 00153 - David Whittaker - World Class Rugby.sndh */
+TIMEDB_ENTRY( 89f069cd, 2, 491, YM), /* 00153 - David Whittaker - World Class Rugby.sndh */
+TIMEDB_ENTRY( 89f069cd, 3, 242, YM), /* 00153 - David Whittaker - World Class Rugby.sndh */
+TIMEDB_ENTRY( 89f069cd, 4, 71, YM), /* 00153 - David Whittaker - World Class Rugby.sndh */
+TIMEDB_ENTRY( 89fad116, 0, 4032, YM), /* 02235 - Tao - Cream - Reset (Nostalgic-O-Demo).sndh */
+TIMEDB_ENTRY( 8a05829a, 0, 6399, YM+TA+TB+TD), /* 02993 - 505-paradox - p7action (STE only).sndh */
+TIMEDB_ENTRY( 8a177b0d, 0, 10752, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a177b0d, 1, 3072, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a177b0d, 2, 8000, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a177b0d, 3, 4160, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a177b0d, 4, 8960, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a177b0d, 5, 1536, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a177b0d, 6, 12288, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a177b0d, 7, 10368, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a177b0d, 8, 793, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a177b0d, 9, 10496, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a177b0d, 10, 9792, YM+TA), /* 02224 - Mad Max - Wings of Death.sndh */
+TIMEDB_ENTRY( 8a209682, 0, 3216, YM+TA+TD), /* 04251 - 505-checkpoint - Dark.sndh */
+TIMEDB_ENTRY( 8a424ece, 0, 12838, YM+TA), /* 01042 - Bodenst ndig 2000 - Landflucht.sndh */
+TIMEDB_ENTRY( 8a6360ab, 0, 8663, YM), /* 00873 - Ben Daglish - Skidz.sndh */
+TIMEDB_ENTRY( 8a855118, 0, 1920, YM), /* 01103 - Techno - Techno 8.sndh */
+TIMEDB_ENTRY( 8abf584e, 0, 9517, YM+TA+TB+TD), /* 02753 - Dma-Sc - Street Robots.sndh */
+TIMEDB_ENTRY( 8acc81b1, 0, 32270, YM), /* 04685 - John Wangler - Killing Time.sndh */
+TIMEDB_ENTRY( 8af0536e, 0, 804, YM), /* 02032 - Mad Max - Geoff Capes Strongman.sndh */
+TIMEDB_ENTRY( 8af0536e, 1, 522, YM), /* 02032 - Mad Max - Geoff Capes Strongman.sndh */
+TIMEDB_ENTRY( 8af0536e, 2, 777, YM), /* 02032 - Mad Max - Geoff Capes Strongman.sndh */
+TIMEDB_ENTRY( 8af0536e, 3, 492, YM), /* 02032 - Mad Max - Geoff Capes Strongman.sndh */
+TIMEDB_ENTRY( 8af0536e, 4, 566, YM), /* 02032 - Mad Max - Geoff Capes Strongman.sndh */
+TIMEDB_ENTRY( 8af0536e, 5, 513, YM), /* 02032 - Mad Max - Geoff Capes Strongman.sndh */
+TIMEDB_ENTRY( 8af193c9, 0, 17536, YM+TA+TB+TD), /* 02089 - Mad Max - Monty on the Run - Sid.sndh */
+TIMEDB_ENTRY( 8af193c9, 1, 8192, YM+TA+TB+TD), /* 02089 - Mad Max - Monty on the Run - Sid.sndh */
+TIMEDB_ENTRY( 8af193c9, 2, 901, YM+TA+TB+TD), /* 02089 - Mad Max - Monty on the Run - Sid.sndh */
+TIMEDB_ENTRY( 8b055b20, 0, 5632, YM), /* 00758 - Count Zero - Awesome.sndh */
+TIMEDB_ENTRY( 8b055b20, 1, 7296, YM), /* 00758 - Count Zero - Awesome.sndh */
+TIMEDB_ENTRY( 8b055b20, 2, 1536, YM), /* 00758 - Count Zero - Awesome.sndh */
+TIMEDB_ENTRY( 8b055b20, 3, 7680, YM), /* 00758 - Count Zero - Awesome.sndh */
+TIMEDB_ENTRY( 8b055b20, 4, 9400, YM), /* 00758 - Count Zero - Awesome.sndh */
+TIMEDB_ENTRY( 8b055b20, 5, 9040, YM), /* 00758 - Count Zero - Awesome.sndh */
+TIMEDB_ENTRY( 8b055b20, 6, 6272, YM), /* 00758 - Count Zero - Awesome.sndh */
+TIMEDB_ENTRY( 8b0fed98, 0, 4428, YM), /* 00858 - Ben Daglish - Lotus Turbo Espirit.sndh */
+TIMEDB_ENTRY( 8b0fed98, 1, 5444, YM), /* 00858 - Ben Daglish - Lotus Turbo Espirit.sndh */
+TIMEDB_ENTRY( 8b0fed98, 2, 4167, YM), /* 00858 - Ben Daglish - Lotus Turbo Espirit.sndh */
+TIMEDB_ENTRY( 8b0fed98, 3, 6212, YM), /* 00858 - Ben Daglish - Lotus Turbo Espirit.sndh */
+TIMEDB_ENTRY( 8b0fed98, 4, 5831, YM), /* 00858 - Ben Daglish - Lotus Turbo Espirit.sndh */
+TIMEDB_ENTRY( 8b1281b1, 0, 4992, YM), /* 01173 - Sally - Groovy.sndh */
+TIMEDB_ENTRY( 8b25b76f, 0, 9603, YM+TA), /* 04216 - Big Alec - Best Part of Creation.sndh */
+TIMEDB_ENTRY( 8b2795f7, 0, 7680, YM+TA), /* 04413 - EVE - F Nightmare.sndh */
+TIMEDB_ENTRY( 8b53314e, 0, 8863, YM), /* 03116 - n-a - Entry of the Gladiators.sndh */
+TIMEDB_ENTRY( 8b7693b4, 0, 15583, YM), /* 04149 - Unknown - Danza.sndh */
+TIMEDB_ENTRY( 8b87fb58, 0, 16128, YM+TA+TD), /* 02351 - Tao - Cream - Shifter (YM Rockerz 1).sndh */
+TIMEDB_ENTRY( 8bac11ad, 0, 6331, YM), /* 00550 - Alistair Brimble - Fast Food.sndh */
+TIMEDB_ENTRY( 8bac11ad, 1, 3196, YM), /* 00550 - Alistair Brimble - Fast Food.sndh */
+TIMEDB_ENTRY( 8bac11ad, 2, 3835, YM), /* 00550 - Alistair Brimble - Fast Food.sndh */
+TIMEDB_ENTRY( 8bac11ad, 3, 4603, YM), /* 00550 - Alistair Brimble - Fast Food.sndh */
+TIMEDB_ENTRY( 8bac11ad, 4, 2556, YM), /* 00550 - Alistair Brimble - Fast Food.sndh */
+TIMEDB_ENTRY( 8bac11ad, 5, 91, YM), /* 00550 - Alistair Brimble - Fast Food.sndh */
+TIMEDB_ENTRY( 8bac11ad, 6, 379, YM), /* 00550 - Alistair Brimble - Fast Food.sndh */
+TIMEDB_ENTRY( 8bba7351, 0, 7200, YM+TD), /* 02387 - Nexus 6 - Never Say Die!.sndh */
+TIMEDB_ENTRY( 8bc623bf, 0, 119050, YM+TA), /* 03735 - David Whittaker - The Killing Cloud.sndh */
+TIMEDB_ENTRY( 8bc623bf, 1, 85936, YM+TA), /* 03735 - David Whittaker - The Killing Cloud.sndh */
+TIMEDB_ENTRY( 8bc623bf, 2, 35785, YM+TA), /* 03735 - David Whittaker - The Killing Cloud.sndh */
+TIMEDB_ENTRY( 8bcea812, 0, 16608, YM), /* 00733 - Sean Connolly - Euro Soccer.sndh */
+TIMEDB_ENTRY( 8bcea812, 1, 486, YM), /* 00733 - Sean Connolly - Euro Soccer.sndh */
+TIMEDB_ENTRY( 8bcea812, 2, 257, YM), /* 00733 - Sean Connolly - Euro Soccer.sndh */
+TIMEDB_ENTRY( 8bcea812, 3, 377, YM), /* 00733 - Sean Connolly - Euro Soccer.sndh */
+TIMEDB_ENTRY( 8be0ecd1, 0, 768, YM+TA), /* 00941 - Dark Angel - On The Road.sndh */
+TIMEDB_ENTRY( 8be8f290, 0, 9026, YM+TA), /* 00434 - Big Alec - Sanxion Loader Digi.sndh */
+TIMEDB_ENTRY( 8c29a260, 0, 7141, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 1, 12153, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 2, 71534, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 3, 16645, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 4, 11525, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 5, 145145, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 6, 36386, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 7, 25345, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 8, 42889, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 9, 73340, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 10, 48487, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 11, 10361, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 12, 29649, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 13, 31385, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c29a260, 14, 29377, YM+TA), /* 04554 - Flix - Mega Musix Demo.sndh */
+TIMEDB_ENTRY( 8c2fb4ec, 0, 11808, YM+TD), /* 02370 - Nexus 6 - Cyclone's Memory Theme.sndh */
+TIMEDB_ENTRY( 8c37b1ae, 0, 3330, YM), /* 03181 - n-a - .sndh */
+TIMEDB_ENTRY( 8c4525aa, 0, 5632, YM), /* 00124 - David Whittaker - Platoon.sndh */
+TIMEDB_ENTRY( 8c4525aa, 1, 4480, YM), /* 00124 - David Whittaker - Platoon.sndh */
+TIMEDB_ENTRY( 8c4525aa, 2, 13824, YM), /* 00124 - David Whittaker - Platoon.sndh */
+TIMEDB_ENTRY( 8c4525aa, 3, 7168, YM), /* 00124 - David Whittaker - Platoon.sndh */
+TIMEDB_ENTRY( 8c4525aa, 4, 7680, YM), /* 00124 - David Whittaker - Platoon.sndh */
+TIMEDB_ENTRY( 8c4525aa, 5, 3072, YM), /* 00124 - David Whittaker - Platoon.sndh */
+TIMEDB_ENTRY( 8c4525aa, 6, 5568, YM), /* 00124 - David Whittaker - Platoon.sndh */
+TIMEDB_ENTRY( 8c48beb4, 0, 6937, YM+TA+TB+TD), /* 01954 - MSG - EIL entry.sndh */
+TIMEDB_ENTRY( 8c50cdbf, 0, 18432, YM), /* 04644 - Xrwwr - Dentro.sndh */
+TIMEDB_ENTRY( 8c5607ee, 0, 68141, YM), /* 01810 - Barry Leitch - Treasure Trap.sndh */
+TIMEDB_ENTRY( 8c77c4d5, 0, 3515, YM+TA+TB+TD), /* 01120 - Toodeloo - Test 1.sndh */
+TIMEDB_ENTRY( 8c7baee8, 0, 4479, YM+TA+TB+TD), /* 00278 - Baggio - PMP Sug.sndh */
+TIMEDB_ENTRY( 8c8d30f4, 0, 4604, YM+TA+TB+TD), /* 04288 - 505 - Checkpoint - Midfinger (Unrel.).sndh */
+TIMEDB_ENTRY( 8c8dcdc0, 0, 7680, YM), /* 03485 - Nigel Pritchard - Solider 2000.sndh */
+TIMEDB_ENTRY( 8cb0143e, 0, 672, YM), /* 00168 - Martin Walker - Final Blow.sndh */
+TIMEDB_ENTRY( 8cb0143e, 1, 281, YM), /* 00168 - Martin Walker - Final Blow.sndh */
+TIMEDB_ENTRY( 8cb0143e, 2, 361, YM), /* 00168 - Martin Walker - Final Blow.sndh */
+TIMEDB_ENTRY( 8cb0143e, 3, 378, YM), /* 00168 - Martin Walker - Final Blow.sndh */
+TIMEDB_ENTRY( 8cb0143e, 4, 445, YM), /* 00168 - Martin Walker - Final Blow.sndh */
+TIMEDB_ENTRY( 8cb0143e, 5, 3366, YM), /* 00168 - Martin Walker - Final Blow.sndh */
+TIMEDB_ENTRY( 8cb0d7a4, 0, 5632, YM+TA), /* 04121 - Tao - Prelude - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 8cbc3d18, 0, 6724, YM), /* 00464 - Augustin Vidovic - Thalion Intro.sndh */
+TIMEDB_ENTRY( 8cbedd59, 0, 39443, YM+TA), /* 03775 - Stewart Gardner - Stampede 4.sndh */
+TIMEDB_ENTRY( 8ce171f3, 0, 5567, YM+TA+TB+TD), /* 03269 - Dubmood - Mr Deaths Omega Illusion.sndh */
+TIMEDB_ENTRY( 8ce23e7b, 0, 38912, YM+TD), /* 02624 - STU - THE UNEXPECTED.sndh */
+TIMEDB_ENTRY( 8ce2eab8, 0, 205169, YM+TA), /* 03712 - Charles Callet - Metal Masters.sndh */
+TIMEDB_ENTRY( 8cf7cc14, 0, 320, YM), /* 03687 - Dma-Sc - Saboteur 3 - Game Over.sndh */
+TIMEDB_ENTRY( 8d1af88d, 0, 1150, YM), /* 02472 - Iso - Last Yell.sndh */
+TIMEDB_ENTRY( 8d1c0533, 0, 23040, YM+TD), /* 01461 - STU - DARK SEASON.sndh */
+TIMEDB_ENTRY( 8d210821, 0, 3807, YM+TA+TB+TD), /* 03328 - Dubmood & Zabutom - 2006 Concrt Intro - Zabutom - Kenny Star.sndh */
+TIMEDB_ENTRY( 8d2c0721, 0, 9212, YM+TB+TD), /* 01594 - Nemo - Game Over.sndh */
+TIMEDB_ENTRY( 8d2eb1f2, 0, 17920, YM), /* 01631 - Carsten Neubauer - Beam.sndh */
+TIMEDB_ENTRY( 8d3d8d54, 0, 2687, YM+TA+TB+TD), /* 03591 - Dma-Sc - Frankiki.sndh */
+TIMEDB_ENTRY( 8d45cf8a, 0, 7883, YM+TA), /* 02672 - Donald Fakk - Jag Rullar.sndh */
+TIMEDB_ENTRY( 8d48f5b2, 0, 7807, YM+TA), /* 01757 - Lap - Bird Girl Mad Demo Apart.sndh */
+TIMEDB_ENTRY( 8d4d32dd, 0, 3456, YM), /* 00919 - Dark Angel - Thalion Intro.sndh */
+TIMEDB_ENTRY( 8d63c0db, 0, 3712, YM), /* 03037 - Ed Bogas - Aisle Dance.sndh */
+TIMEDB_ENTRY( 8d6663f1, 0, 1008, YM), /* 00351 - Tony Williams - Soldier of Light.sndh */
+TIMEDB_ENTRY( 8d6663f1, 1, 401, YM), /* 00351 - Tony Williams - Soldier of Light.sndh */
+TIMEDB_ENTRY( 8d6663f1, 2, 4223, YM), /* 00351 - Tony Williams - Soldier of Light.sndh */
+TIMEDB_ENTRY( 8d6663f1, 3, 1440, YM), /* 00351 - Tony Williams - Soldier of Light.sndh */
+TIMEDB_ENTRY( 8d6663f1, 4, 325, YM), /* 00351 - Tony Williams - Soldier of Light.sndh */
+TIMEDB_ENTRY( 8d6663f1, 5, 1920, YM), /* 00351 - Tony Williams - Soldier of Light.sndh */
+TIMEDB_ENTRY( 8d6949f9, 0, 4224, YM), /* 04833 - T1000 - Bits 60.sndh */
+TIMEDB_ENTRY( 8d7895af, 0, 1193, YM+TA+TD), /* 02678 - Donald Fakk - Porkchop (Logical mix).sndh */
+TIMEDB_ENTRY( 8d939c23, 0, 99220, YM+TA), /* 04035 - Roggie - Roggie 17.sndh */
+TIMEDB_ENTRY( 8dbd7740, 0, 2568, YM), /* 00924 - Dark Angel - Hop Jo.sndh */
+TIMEDB_ENTRY( 8dbe6511, 0, 137540, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 1, 26113, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 3, 61987, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 4, 46081, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 5, 66886, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 6, 148483, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 7, 174029, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 8, 254294, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 9, 20737, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 10, 49281, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 12, 62977, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 13, 289262, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 14, 84291, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 15, 85581, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 16, 98850, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dbe6511, 17, 46081, YM+TA), /* 03769 - Count Zero - Decade Demo - Quartet.sndh */
+TIMEDB_ENTRY( 8dd544db, 0, 8925, YM), /* 03101 - n-a - .sndh */
+TIMEDB_ENTRY( 8ddc7e6d, 0, 7680, YM), /* 02917 - Richard Joseph - Megalomania.sndh */
+TIMEDB_ENTRY( 8decf627, 0, 6048, YM), /* 02395 - Nexus 6 - Rainy Days.sndh */
+TIMEDB_ENTRY( 8decf627, 1, 419, YM), /* 02395 - Nexus 6 - Rainy Days.sndh */
+TIMEDB_ENTRY( 8dedec82, 0, 11136, YM), /* 02164 - Mad Max - Syntax Terror - TLB.sndh */
+TIMEDB_ENTRY( 8df3ff4b, 0, 5370, YM+TA+TB), /* 01589 - Nemo - DHS - Clocks (miniremix).sndh */
+TIMEDB_ENTRY( 8e063c55, 0, 10080, YM), /* 02122 - Mad Max - Cuddly Demos - Big Sprite.sndh */
+TIMEDB_ENTRY( 8e0efde2, 0, 227, YM), /* 04492 - Christof Dukiet - Arc.sndh */
+TIMEDB_ENTRY( 8e0efde2, 1, 84, YM), /* 04492 - Christof Dukiet - Arc.sndh */
+TIMEDB_ENTRY( 8e0efde2, 2, 33, YM), /* 04492 - Christof Dukiet - Arc.sndh */
+TIMEDB_ENTRY( 8e0efde2, 3, 207, YM), /* 04492 - Christof Dukiet - Arc.sndh */
+TIMEDB_ENTRY( 8e0efde2, 4, 183, YM), /* 04492 - Christof Dukiet - Arc.sndh */
+TIMEDB_ENTRY( 8e2e2598, 0, 84708, YM+TA), /* 04042 - Roggie - F.O.A.D. ya bam.sndh */
+TIMEDB_ENTRY( 8e349d20, 0, 7424, YM), /* 02170 - Mad Max - Pandora.sndh */
+TIMEDB_ENTRY( 8e36011b, 0, 12672, YM+TA+TD), /* 02294 - Tao - Cream - Sense (Alive 2).sndh */
+TIMEDB_ENTRY( 8e378611, 0, 1933, YM+TA+TD), /* 04205 - Tao - Cream (orig. Jeroen Tel) - Nostalgic-O-Demo Ikari Union (2 Sid Voice).sndh */
+TIMEDB_ENTRY( 8e4e7df4, 0, 7348, YM), /* 01817 - Paul Loraine - Huckleberry Hound in Hollywood Capers.sndh */
+TIMEDB_ENTRY( 8e4e7df4, 1, 6671, YM), /* 01817 - Paul Loraine - Huckleberry Hound in Hollywood Capers.sndh */
+TIMEDB_ENTRY( 8e4e7df4, 2, 8523, YM), /* 01817 - Paul Loraine - Huckleberry Hound in Hollywood Capers.sndh */
+TIMEDB_ENTRY( 8e4e7df4, 3, 4600, YM), /* 01817 - Paul Loraine - Huckleberry Hound in Hollywood Capers.sndh */
+TIMEDB_ENTRY( 8e4f2328, 0, 8543, YM+TA+TD), /* 02647 - Dma-Sc - Disco Fizz.sndh */
+TIMEDB_ENTRY( 8e5379b3, 0, 19968, YM+TA+TB+TD), /* 02591 - STU - FIRST SID.sndh */
+TIMEDB_ENTRY( 8e7fd9cc, 0, 13439, YM+TA+TB+TD), /* 02490 - gwEm (Jeff Wayne remix) - Forever 'Ardcore.sndh */
+TIMEDB_ENTRY( 8e95a515, 0, 5175, YM+TA), /* 01123 - Tooseb - Bob Morane (Indochine).sndh */
+TIMEDB_ENTRY( 8eac0fea, 0, 9214, YM), /* 01024 - Doclands - Delirious Demo 2 - Reset.sndh */
+TIMEDB_ENTRY( 8ebe66b0, 0, 4979, YM+TB+TD), /* 00181 - 505 - Paradox Xmas 2003 #1.sndh */
+TIMEDB_ENTRY( 8eca3208, 0, 8386, YM), /* 01267 - Frazer - If Pigs Could Fly End.sndh */
+TIMEDB_ENTRY( 8ef3c08c, 0, 5375, YM), /* 04062 - Gary Wheaton - Backlash.sndh */
+TIMEDB_ENTRY( 8ef8b91d, 0, 2488, YM), /* 03385 - Unknown - Prelude.sndh */
+TIMEDB_ENTRY( 8f05f777, 0, 9604, YM+TA+TD), /* 02676 - Donald Fakk - Leif.sndh */
+TIMEDB_ENTRY( 8f074b95, 0, 9594, YM+TA+TB+TD), /* 04249 - 505 - Byeing.sndh */
+TIMEDB_ENTRY( 8f12df12, 0, 3264, YM), /* 01113 - Keith Tinman - Recoil.sndh */
+TIMEDB_ENTRY( 8f12df12, 1, 3072, YM), /* 01113 - Keith Tinman - Recoil.sndh */
+TIMEDB_ENTRY( 8f171ada, 0, 5688, YM), /* 03202 - Nick Scarim - Spy vs Spy - The Island Caper.sndh */
+TIMEDB_ENTRY( 8f2cd337, 0, 13815, YM+TA+TB+TD), /* 01832 - Lotek Style - Arche - UCM 13 part 3.sndh */
+TIMEDB_ENTRY( 8f2ce871, 0, 106739, YM+TA), /* 04033 - Roggie - Roggie 15.sndh */
+TIMEDB_ENTRY( 8f59b130, 0, 17280, YM), /* 02057 - Mad Max - Thrust.sndh */
+TIMEDB_ENTRY( 8f6772c4, 0, 11026, YM), /* 00385 - Wally Beben - Hawkeye.sndh */
+TIMEDB_ENTRY( 8f6772c4, 1, 256, YM), /* 00385 - Wally Beben - Hawkeye.sndh */
+TIMEDB_ENTRY( 8f6772c4, 2, 826, YM), /* 00385 - Wally Beben - Hawkeye.sndh */
+TIMEDB_ENTRY( 8f6772c4, 3, 296, YM), /* 00385 - Wally Beben - Hawkeye.sndh */
+TIMEDB_ENTRY( 8f6772c4, 4, 1921, YM), /* 00385 - Wally Beben - Hawkeye.sndh */
+TIMEDB_ENTRY( 8f6772c4, 5, 1537, YM), /* 00385 - Wally Beben - Hawkeye.sndh */
+TIMEDB_ENTRY( 8f8babad, 0, 6960, YM+TA+TD), /* 00891 - damo - resgodz - funktion.sndh */
+TIMEDB_ENTRY( 8f9064ce, 0, 2233, YM), /* 02915 - Richard Joseph - Lure of the Temptress.sndh */
+TIMEDB_ENTRY( 8f9064ce, 1, 2380, YM), /* 02915 - Richard Joseph - Lure of the Temptress.sndh */
+TIMEDB_ENTRY( 8f9064ce, 2, 2100, YM), /* 02915 - Richard Joseph - Lure of the Temptress.sndh */
+TIMEDB_ENTRY( 8f9064ce, 3, 5068, YM), /* 02915 - Richard Joseph - Lure of the Temptress.sndh */
+TIMEDB_ENTRY( 8f9064ce, 4, 4846, YM), /* 02915 - Richard Joseph - Lure of the Temptress.sndh */
+TIMEDB_ENTRY( 8f9064ce, 5, 396, YM), /* 02915 - Richard Joseph - Lure of the Temptress.sndh */
+TIMEDB_ENTRY( 8f9064ce, 6, 1481, YM), /* 02915 - Richard Joseph - Lure of the Temptress.sndh */
+TIMEDB_ENTRY( 8f90a02d, 0, 9986, YM), /* 04780 - tomchi noextra - ltc16 smoke town.sndh */
+TIMEDB_ENTRY( 8f959e76, 0, 9728, YM), /* 00570 - Jas C Brooke - Overlander.sndh */
+TIMEDB_ENTRY( 8f959e76, 1, 1536, YM), /* 00570 - Jas C Brooke - Overlander.sndh */
+TIMEDB_ENTRY( 8f959e76, 2, 164, YM), /* 00570 - Jas C Brooke - Overlander.sndh */
+TIMEDB_ENTRY( 8f959e76, 3, 274, YM), /* 00570 - Jas C Brooke - Overlander.sndh */
+TIMEDB_ENTRY( 8f959e76, 4, 2832, YM), /* 00570 - Jas C Brooke - Overlander.sndh */
+TIMEDB_ENTRY( 8fb5ca0b, 0, 6146, YM), /* 00403 - Big Alec - Feardrop.sndh */
+TIMEDB_ENTRY( 8fc80c16, 0, 3083, YM), /* 01761 - Lap - Lap 1 - Batman.sndh */
+TIMEDB_ENTRY( 8fd390e1, 0, 69605, YM+TA), /* 03879 - Mad Max - Starpaws.sndh */
+TIMEDB_ENTRY( 8fe9358b, 0, 10875, YM+TA+TB+TD), /* 04290 - 505-checkpoint^paradox - Myth.sndh */
+TIMEDB_ENTRY( 9000c3ab, 0, 7874, YM), /* 00362 - Steve Barrett - Adv Skiing Simulator.sndh */
+TIMEDB_ENTRY( 9000c3ab, 1, 290, YM), /* 00362 - Steve Barrett - Adv Skiing Simulator.sndh */
+TIMEDB_ENTRY( 9000c3ab, 2, 218, YM), /* 00362 - Steve Barrett - Adv Skiing Simulator.sndh */
+TIMEDB_ENTRY( 9002cb90, 0, 3200, YM+TA+TD), /* 02253 - Tao - Cream (orig. Rob Hubbard) - Delta (Steps).sndh */
+TIMEDB_ENTRY( 900306d7, 0, 9288, YM+TA+TD), /* 02652 - Dma-Sc - POOZ - Intro & Menu.sndh */
+TIMEDB_ENTRY( 900cca7a, 0, 13667, YM), /* 00313 - Gary Wheaton - Cuddly Demos Main Menu.sndh */
+TIMEDB_ENTRY( 90181e30, 0, 14008, YM), /* 00738 - Sean Connolly - Rainy Day.sndh */
+TIMEDB_ENTRY( 901b8ed0, 0, 14338, YM+TA+TD), /* 02344 - Tao - Cream - Double Fat (UCM 18).sndh */
+TIMEDB_ENTRY( 903338c6, 0, 9258, YM+TA), /* 04226 - 505 - 5th.sndh */
+TIMEDB_ENTRY( 904819f7, 0, 6144, YM), /* 01186 - Excellence In Art - I Wonder.sndh */
+TIMEDB_ENTRY( 9052a143, 0, 17282, YM), /* 02188 - Mad Max - Cybernoid 2.sndh */
+TIMEDB_ENTRY( 9052a143, 1, 292, YM), /* 02188 - Mad Max - Cybernoid 2.sndh */
+TIMEDB_ENTRY( 905b4e7c, 0, 3520, YM+TA+TD), /* 00042 - 505 - Checkpoint - MMJ Xmas 03 - 1.sndh */
+TIMEDB_ENTRY( 90638a9d, 0, 3936, YM), /* 01819 - Lord - Ambition Intro 1.sndh */
+TIMEDB_ENTRY( 9070f526, 0, 12206, YM+TD), /* 02684 - Donald Fakk - Spanking (Chip).sndh */
+TIMEDB_ENTRY( 90950882, 0, 1440, YM), /* 03507 - Unknown - Veteran.sndh */
+TIMEDB_ENTRY( 909d7c6a, 0, 3070, YM), /* 02432 - Beast - TSC - Bla Bla Bla.sndh */
+TIMEDB_ENTRY( 90a07127, 0, 4992, YM), /* 01174 - Sally - Oh Yeah.sndh */
+TIMEDB_ENTRY( 90c5579c, 0, 10848, YM), /* 01978 - MSG - MSG 08.sndh */
+TIMEDB_ENTRY( 90d3e897, 0, 5952, YM), /* 00566 - Jas C Brooke - Heavy Metal.sndh */
+TIMEDB_ENTRY( 90d748b8, 0, 6344, YM), /* 01789 - Barry Leitch - Championship Manager.sndh */
+TIMEDB_ENTRY( 90d7fb7a, 0, 11008, YM+TA), /* 02895 - Remalon - Bitume.sndh */
+TIMEDB_ENTRY( 90de30f7, 0, 13792, YM), /* 04784 - Barry Leitch - Postman Pat.sndh */
+TIMEDB_ENTRY( 90de30f7, 1, 721, YM), /* 04784 - Barry Leitch - Postman Pat.sndh */
+TIMEDB_ENTRY( 90e8ecd2, 0, 217, YM), /* 01070 - Jonathan Dunn - Wildwheels.sndh */
+TIMEDB_ENTRY( 90e8ecd2, 1, 217, YM), /* 01070 - Jonathan Dunn - Wildwheels.sndh */
+TIMEDB_ENTRY( 90e8ecd2, 2, 98, YM), /* 01070 - Jonathan Dunn - Wildwheels.sndh */
+TIMEDB_ENTRY( 90e8ecd2, 3, 133, YM), /* 01070 - Jonathan Dunn - Wildwheels.sndh */
+TIMEDB_ENTRY( 90e8ecd2, 4, 157, YM), /* 01070 - Jonathan Dunn - Wildwheels.sndh */
+TIMEDB_ENTRY( 90eca942, 0, 11044, YM+TA), /* 04423 - Lotus - Synth Dream 2 - Blow Jam.sndh */
+TIMEDB_ENTRY( 90f254be, 0, 7107, YM+TA), /* 04585 - Crawdaddy - Pure Energy 2.sndh */
+TIMEDB_ENTRY( 90f2e8d8, 0, 3584, YM+TB+TD), /* 00048 - 505 - Fabo.sndh */
+TIMEDB_ENTRY( 9124ef78, 0, 6480, YM+TA+TD), /* 02775 - Crazy Q - DHS - . G-SpOt . (final version).sndh */
+TIMEDB_ENTRY( 91283c69, 0, 1075, YM), /* 02922 - CS Adams - Head Coach.sndh */
+TIMEDB_ENTRY( 912dcccc, 0, 5120, YM+TA+TB+TD), /* 04311 - 505-checkpoint - Stream.sndh */
+TIMEDB_ENTRY( 912fa995, 0, 1536, YM), /* 01401 - Skyline - Snork Intro - BIG.sndh */
+TIMEDB_ENTRY( 91310c49, 0, 12540, YM), /* 00773 - Count Zero - Go For It - Maggie 8.sndh */
+TIMEDB_ENTRY( 91363e06, 0, 4475, YM+TA+TB), /* 01605 - Nemo - Short Cuts.sndh */
+TIMEDB_ENTRY( 9136adf9, 0, 4935, YM+TD), /* 04787 - Intruder - Intruder 3.sndh */
+TIMEDB_ENTRY( 91399987, 0, 4922, YM), /* 02926 - Allister Brimble - Seymour goes to Hollywood.sndh */
+TIMEDB_ENTRY( 91399987, 1, 8506, YM), /* 02926 - Allister Brimble - Seymour goes to Hollywood.sndh */
+TIMEDB_ENTRY( 91521990, 0, 9221, YM+TA+TD), /* 02197 - Ultra & Tao - Cream - ..do things (reset).sndh */
+TIMEDB_ENTRY( 91718563, 0, 8442, YM+TA+TB+TD), /* 03415 - lotek style (orig. timbral) - electronica re-shox.sndh */
+TIMEDB_ENTRY( 91792432, 0, 19776, YM), /* 02178 - Mad Max - Astaroth.sndh */
+TIMEDB_ENTRY( 91792432, 1, 6912, YM), /* 02178 - Mad Max - Astaroth.sndh */
+TIMEDB_ENTRY( 91792432, 2, 6144, YM), /* 02178 - Mad Max - Astaroth.sndh */
+TIMEDB_ENTRY( 91792432, 3, 15616, YM), /* 02178 - Mad Max - Astaroth.sndh */
+TIMEDB_ENTRY( 91857058, 0, 3221, YM), /* 03517 - Fred Gray - Victory Road.sndh */
+TIMEDB_ENTRY( 91857058, 1, 1933, YM), /* 03517 - Fred Gray - Victory Road.sndh */
+TIMEDB_ENTRY( 91857058, 2, 181, YM), /* 03517 - Fred Gray - Victory Road.sndh */
+TIMEDB_ENTRY( 91857058, 3, 3039, YM), /* 03517 - Fred Gray - Victory Road.sndh */
+TIMEDB_ENTRY( 91857058, 4, 81, YM), /* 03517 - Fred Gray - Victory Road.sndh */
+TIMEDB_ENTRY( 91857058, 5, 31, YM), /* 03517 - Fred Gray - Victory Road.sndh */
+TIMEDB_ENTRY( 91935cc7, 0, 9986, YM+TA+TD), /* 02303 - Tao - Cream - Breath 2000.sndh */
+TIMEDB_ENTRY( 91a0b1c5, 0, 1152, YM+TA), /* 04447 - Scavenger - Bomb.sndh */
+TIMEDB_ENTRY( 91c5ee9a, 0, 4686, YM), /* 01299 - Matt Furniss - John Barnes Euro Football.sndh */
+TIMEDB_ENTRY( 91c5ee9a, 1, 4702, YM), /* 01299 - Matt Furniss - John Barnes Euro Football.sndh */
+TIMEDB_ENTRY( 91c5ee9a, 2, 4638, YM), /* 01299 - Matt Furniss - John Barnes Euro Football.sndh */
+TIMEDB_ENTRY( 91c5ee9a, 3, 637, YM), /* 01299 - Matt Furniss - John Barnes Euro Football.sndh */
+TIMEDB_ENTRY( 91c5ee9a, 4, 17, YM), /* 01299 - Matt Furniss - John Barnes Euro Football.sndh */
+TIMEDB_ENTRY( 91c7d7e4, 0, 260108, YM+TA), /* 04669 - Piotr Szerszen - Last Man.sndh */
+TIMEDB_ENTRY( 91d09de8, 0, 12672, YM), /* 03263 - Jedi - Zoomer.sndh */
+TIMEDB_ENTRY( 91db48fb, 0, 6787, YM+TA), /* 04437 - Lotus - Synth Dream 2 - State of the World.sndh */
+TIMEDB_ENTRY( 91dccdd3, 0, 2688, YM), /* 02760 - Dma-Sc - Sector One - Oric Demo.sndh */
+TIMEDB_ENTRY( 91f7e381, 0, 1048, YM), /* 01909 - Marcer - Nnooo.sndh */
+TIMEDB_ENTRY( 91fe5aa6, 0, 8826, YM+TA+TB+TD), /* 02830 - Msg - Superfly tune 7.sndh */
+TIMEDB_ENTRY( 91ff9259, 0, 8442, YM+TA), /* 04231 - 505 - 9th.sndh */
+TIMEDB_ENTRY( 9218c31e, 0, 2547, YM+TA+TD), /* 01825 - Pierre-Eric Loriaux - Ivanhoe.sndh */
+TIMEDB_ENTRY( 9218c31e, 1, 2747, YM+TA+TD), /* 01825 - Pierre-Eric Loriaux - Ivanhoe.sndh */
+TIMEDB_ENTRY( 9218c31e, 2, 1929, YM+TA+TD), /* 01825 - Pierre-Eric Loriaux - Ivanhoe.sndh */
+TIMEDB_ENTRY( 9218c31e, 3, 2810, YM+TA+TD), /* 01825 - Pierre-Eric Loriaux - Ivanhoe.sndh */
+TIMEDB_ENTRY( 9218c31e, 4, 2976, YM+TA+TD), /* 01825 - Pierre-Eric Loriaux - Ivanhoe.sndh */
+TIMEDB_ENTRY( 9218c31e, 5, 2295, YM+TA+TD), /* 01825 - Pierre-Eric Loriaux - Ivanhoe.sndh */
+TIMEDB_ENTRY( 9218c31e, 6, 3981, YM+TA+TD), /* 01825 - Pierre-Eric Loriaux - Ivanhoe.sndh */
+TIMEDB_ENTRY( 9218c31e, 7, 1967, YM+TA+TD), /* 01825 - Pierre-Eric Loriaux - Ivanhoe.sndh */
+TIMEDB_ENTRY( 92220034, 0, 4992, YM), /* 01570 - Patrick Phelan - Premier Manager.sndh */
+TIMEDB_ENTRY( 923228e7, 0, 39516, YM+STE+TA+TD), /* 03610 - damo-resgods - deep blue.sndh */
+TIMEDB_ENTRY( 92359c63, 0, 4944, YM), /* 01482 - Holger Gehrmann - Domination.sndh */
+TIMEDB_ENTRY( 92359c63, 1, 2880, YM), /* 01482 - Holger Gehrmann - Domination.sndh */
+TIMEDB_ENTRY( 924044dd, 0, 184, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 1, 244, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 2, 266, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 3, 670, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 4, 1534, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 5, 1341, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 6, 6592, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 7, 1921, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 8, 6144, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 9, 6784, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 10, 6144, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 11, 5086, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 12, 7678, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 924044dd, 13, 12990, YM), /* 01582 - Karsten Obarski - Dyter 7.sndh */
+TIMEDB_ENTRY( 92507639, 0, 14672, YM+TA), /* 01573 - Jurgen Piscol - Hard 'n' Heavy.sndh */
+TIMEDB_ENTRY( 92507639, 1, 13701, YM+TA+TD), /* 01573 - Jurgen Piscol - Hard 'n' Heavy.sndh */
+TIMEDB_ENTRY( 92507639, 2, 22495, YM+TA+TD), /* 01573 - Jurgen Piscol - Hard 'n' Heavy.sndh */
+TIMEDB_ENTRY( 92507639, 3, 9187, YM+TA), /* 01573 - Jurgen Piscol - Hard 'n' Heavy.sndh */
+TIMEDB_ENTRY( 92544fb7, 0, 30903, YM), /* 00511 - Tangens - Synthetic Visions - Menu.sndh */
+TIMEDB_ENTRY( 925c0055, 0, 44752, YM+TA+TB+TD), /* 03612 - STU - INSANE LEVEL.sndh */
+TIMEDB_ENTRY( 925da54f, 0, 5568, YM+TD), /* 02379 - Nexus 6 - Lethal Xcess Level 1.sndh */
+TIMEDB_ENTRY( 925da54f, 1, 880, YM+TD), /* 02379 - Nexus 6 - Lethal Xcess Level 1.sndh */
+TIMEDB_ENTRY( 925da54f, 2, 1120, YM+TD), /* 02379 - Nexus 6 - Lethal Xcess Level 1.sndh */
+TIMEDB_ENTRY( 925da54f, 3, 800, YM+TD), /* 02379 - Nexus 6 - Lethal Xcess Level 1.sndh */
+TIMEDB_ENTRY( 9267624e, 0, 315218, YM+TA), /* 04634 - TFC - Disco I.sndh */
+TIMEDB_ENTRY( 926e5f9c, 0, 44544, YM), /* 01445 - Stax - Old.sndh */
+TIMEDB_ENTRY( 927aaaf0, 0, 768, YM), /* 01891 - Dave Lowe - Street Fighter II - The World Warrior.sndh */
+TIMEDB_ENTRY( 927aaaf0, 1, 3520, YM), /* 01891 - Dave Lowe - Street Fighter II - The World Warrior.sndh */
+TIMEDB_ENTRY( 927aaaf0, 2, 2128, YM), /* 01891 - Dave Lowe - Street Fighter II - The World Warrior.sndh */
+TIMEDB_ENTRY( 927aaaf0, 3, 3136, YM), /* 01891 - Dave Lowe - Street Fighter II - The World Warrior.sndh */
+TIMEDB_ENTRY( 927aaaf0, 4, 2320, YM), /* 01891 - Dave Lowe - Street Fighter II - The World Warrior.sndh */
+TIMEDB_ENTRY( 92918c4f, 0, 10280, YM), /* 04472 - Charles Callet - TNT.sndh */
+TIMEDB_ENTRY( 92918c4f, 1, 11776, YM), /* 04472 - Charles Callet - TNT.sndh */
+TIMEDB_ENTRY( 92918c4f, 2, 14376, YM), /* 04472 - Charles Callet - TNT.sndh */
+TIMEDB_ENTRY( 92918c4f, 3, 14016, YM), /* 04472 - Charles Callet - TNT.sndh */
+TIMEDB_ENTRY( 92af0dc4, 0, 4794, YM+TA+TB+TD), /* 01611 - No More - Cool Days.sndh */
+TIMEDB_ENTRY( 92b271a9, 0, 13056, YM), /* 01101 - Techno - Techno 6.sndh */
+TIMEDB_ENTRY( 92b4df1f, 0, 33260, YM), /* 01444 - Stax - Nully.sndh */
+TIMEDB_ENTRY( 92c04749, 0, 5127, YM+TA+TB+TD), /* 00214 - 505 - You Bore (D-Bug 180).sndh */
+TIMEDB_ENTRY( 92c48488, 0, 9226, YM+TA), /* 02670 - Donald Fakk - Human Race - tune 4 (Chip).sndh */
+TIMEDB_ENTRY( 9302f392, 0, 4032, YM), /* 01056 - Jonathan Dunn - Batman The Movie.sndh */
+TIMEDB_ENTRY( 9302f392, 1, 6528, YM), /* 01056 - Jonathan Dunn - Batman The Movie.sndh */
+TIMEDB_ENTRY( 9302f392, 2, 3019, YM), /* 01056 - Jonathan Dunn - Batman The Movie.sndh */
+TIMEDB_ENTRY( 9302f392, 3, 6657, YM), /* 01056 - Jonathan Dunn - Batman The Movie.sndh */
+TIMEDB_ENTRY( 9302f392, 4, 2400, YM), /* 01056 - Jonathan Dunn - Batman The Movie.sndh */
+TIMEDB_ENTRY( 9302f392, 5, 5378, YM), /* 01056 - Jonathan Dunn - Batman The Movie.sndh */
+TIMEDB_ENTRY( 9302f392, 6, 49, YM), /* 01056 - Jonathan Dunn - Batman The Movie.sndh */
+TIMEDB_ENTRY( 9302f392, 7, 181, YM), /* 01056 - Jonathan Dunn - Batman The Movie.sndh */
+TIMEDB_ENTRY( 9302f392, 8, 192, YM), /* 01056 - Jonathan Dunn - Batman The Movie.sndh */
+TIMEDB_ENTRY( 9302f392, 9, 49, YM), /* 01056 - Jonathan Dunn - Batman The Movie.sndh */
+TIMEDB_ENTRY( 9313ee1f, 0, 7168, YM), /* 03408 - Unknown - European Soccer Challenge.sndh */
+TIMEDB_ENTRY( 931da92a, 0, 6533, YM), /* 01378 - Justin Scharvona - Predator 2.sndh */
+TIMEDB_ENTRY( 931da92a, 1, 8069, YM), /* 01378 - Justin Scharvona - Predator 2.sndh */
+TIMEDB_ENTRY( 931da92a, 2, 6149, YM), /* 01378 - Justin Scharvona - Predator 2.sndh */
+TIMEDB_ENTRY( 931da92a, 3, 10757, YM), /* 01378 - Justin Scharvona - Predator 2.sndh */
+TIMEDB_ENTRY( 93249f24, 0, 1296, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 1, 1393, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 2, 299, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 3, 217, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 4, 1092, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 5, 2880, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 6, 4376, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 7, 4632, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 8, 1034, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 9, 384, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 10, 201, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 93249f24, 11, 257, YM), /* 02956 - Rudi Stember - Dynablaster.sndh */
+TIMEDB_ENTRY( 9326708f, 0, 8064, YM), /* 03410 - Riff Raff - T Bird.sndh */
+TIMEDB_ENTRY( 9326708f, 1, 9408, YM), /* 03410 - Riff Raff - T Bird.sndh */
+TIMEDB_ENTRY( 9375f2d8, 0, 18432, YM), /* 01485 - Holger Gehrmann - Hollywood Poker Pro.sndh */
+TIMEDB_ENTRY( 9375f2d8, 1, 3840, YM), /* 01485 - Holger Gehrmann - Hollywood Poker Pro.sndh */
+TIMEDB_ENTRY( 938d8ca8, 0, 15432, YM+TA+TB+TD), /* 03320 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( 9393b118, 0, 11136, YM+TA), /* 04127 - Tao - Walk on Ice - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 93a5ed13, 0, 12803, YM), /* 00764 - Count Zero - Decade Demo - Gigadist.sndh */
+TIMEDB_ENTRY( 93a68ee3, 0, 24576, YM+TA+TB+TD), /* 03990 - XyNo - POCAILLE BURGER!.sndh */
+TIMEDB_ENTRY( 93a934e0, 0, 4608, YM), /* 01172 - Sally - Great.sndh */
+TIMEDB_ENTRY( 93b4af45, 0, 8191, YM), /* 00306 - Gary Wheaton - Fresh.sndh */
+TIMEDB_ENTRY( 93db17a9, 0, 6672, YM), /* 03872 - Gary Wheaton - Flying.sndh */
+TIMEDB_ENTRY( 93db49a4, 0, 4866, YM), /* 01778 - Lap - Lap 28.sndh */
+TIMEDB_ENTRY( 93eabe05, 0, 1541, YM), /* 02280 - Tao - Cream ( orig. ??, C64) - Just Feel It 2 (Just Buggin).sndh */
+TIMEDB_ENTRY( 93f41167, 0, 15360, YM+TA+TB+TD), /* 02814 - Marcer - Paradize - Nuclear Waste Dump - Ingame tune 1.sndh */
+TIMEDB_ENTRY( 93fcbb92, 0, 9696, YM), /* 00877 - Ben Daglish - Terramex.sndh */
+TIMEDB_ENTRY( 940a5311, 0, 9690, YM), /* 00121 - David Whittaker - Obliterator.sndh */
+TIMEDB_ENTRY( 940a5311, 1, 6912, YM), /* 00121 - David Whittaker - Obliterator.sndh */
+TIMEDB_ENTRY( 940a5311, 2, 1153, YM), /* 00121 - David Whittaker - Obliterator.sndh */
+TIMEDB_ENTRY( 940a5311, 3, 3840, YM), /* 00121 - David Whittaker - Obliterator.sndh */
+TIMEDB_ENTRY( 941290a2, 0, 3281, YM), /* 02958 - Paul Tankard - Dr Who.sndh */
+TIMEDB_ENTRY( 941290a2, 1, 4608, YM), /* 02958 - Paul Tankard - Dr Who.sndh */
+TIMEDB_ENTRY( 941290a2, 2, 768, YM), /* 02958 - Paul Tankard - Dr Who.sndh */
+TIMEDB_ENTRY( 941290a2, 3, 3840, YM), /* 02958 - Paul Tankard - Dr Who.sndh */
+TIMEDB_ENTRY( 941290a2, 4, 3456, YM), /* 02958 - Paul Tankard - Dr Who.sndh */
+TIMEDB_ENTRY( 941290a2, 5, 768, YM), /* 02958 - Paul Tankard - Dr Who.sndh */
+TIMEDB_ENTRY( 941290a2, 6, 2304, YM), /* 02958 - Paul Tankard - Dr Who.sndh */
+TIMEDB_ENTRY( 941e7120, 0, 3576, YM+TA), /* 01125 - Tyan - Bits 2.sndh */
+TIMEDB_ENTRY( 94335b15, 0, 11774, YM), /* 04071 - Gary Wheaton - Galaxia.sndh */
+TIMEDB_ENTRY( 9441b4a6, 0, 8826, YM+TB+TD), /* 01012 - DMA-SC - Sun Burns - SV2k Intro.sndh */
+TIMEDB_ENTRY( 94447618, 0, 3071, YM), /* 02009 - Mad Max - Jazzy.sndh */
+TIMEDB_ENTRY( 9449913a, 0, 3841, YM), /* 00399 - Big Alec - A Case For Two.sndh */
+TIMEDB_ENTRY( 94594d5f, 0, 384, YM), /* 02130 - Mad Max - Life's A Bitch - Loader.sndh */
+TIMEDB_ENTRY( 9471e78e, 0, 13685, YM+TA), /* 04863 - Jovis - 5 Tunes.sndh */
+TIMEDB_ENTRY( 9476a9f7, 0, 10747, YM), /* 00559 - Allister Brimble - Spellbound Dizzy.sndh */
+TIMEDB_ENTRY( 9476a9f7, 1, 144, YM), /* 00559 - Allister Brimble - Spellbound Dizzy.sndh */
+TIMEDB_ENTRY( 9476a9f7, 2, 143, YM), /* 00559 - Allister Brimble - Spellbound Dizzy.sndh */
+TIMEDB_ENTRY( 94855d20, 0, 5568, YM), /* 02014 - Mad Max - ST News 6.1.sndh */
+TIMEDB_ENTRY( 94975963, 0, 12384, YM), /* 01425 - Spector - Manic Demo - Greets.sndh */
+TIMEDB_ENTRY( 949bc29d, 0, 8832, YM+TA), /* 00789 - Crawdaddy - Freedom.sndh */
+TIMEDB_ENTRY( 949e8058, 0, 1069, YM+TA), /* 03846 - Unknown - Mewilo - Title.sndh */
+TIMEDB_ENTRY( 94ae535a, 0, 12031, YM), /* 03456 - 505-checkpoint^paradox - Sommarhack invite 2010.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 0, 15743, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 1, 10045, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 2, 959, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 3, 4639, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 4, 4799, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 5, 215, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 6, 1919, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 7, 9215, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 8, 19151, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 9, 9215, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 10, 11679, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94c6dcd9, 11, 215, YM), /* 04461 - Charles Callet - Bobo.sndh */
+TIMEDB_ENTRY( 94d7ca31, 0, 246018, YM+TA+TD), /* 02350 - Tao - Cream - YM-Jam ( UMD 8730 ).sndh */
+TIMEDB_ENTRY( 94eca603, 0, 2720, YM), /* 01732 - Nick Jones - First Samurai.sndh */
+TIMEDB_ENTRY( 94eca603, 1, 1280, YM), /* 01732 - Nick Jones - First Samurai.sndh */
+TIMEDB_ENTRY( 94eca603, 2, 319, YM), /* 01732 - Nick Jones - First Samurai.sndh */
+TIMEDB_ENTRY( 94eca603, 3, 499, YM), /* 01732 - Nick Jones - First Samurai.sndh */
+TIMEDB_ENTRY( 95081672, 0, 3286, YM), /* 03386 - Unknown - Sailor.sndh */
+TIMEDB_ENTRY( 950bdefd, 0, 6720, YM), /* 04068 - Gary Wheaton - Douglas Rockmoor 1.sndh */
+TIMEDB_ENTRY( 95388ec7, 0, 7913, YM), /* 03882 - Arnauld Chevallier - RGB.sndh */
+TIMEDB_ENTRY( 95388ec7, 1, 3440, YM), /* 03882 - Arnauld Chevallier - RGB.sndh */
+TIMEDB_ENTRY( 95388ec7, 2, 1304, YM), /* 03882 - Arnauld Chevallier - RGB.sndh */
+TIMEDB_ENTRY( 95388ec7, 3, 617, YM), /* 03882 - Arnauld Chevallier - RGB.sndh */
+TIMEDB_ENTRY( 95388ec7, 4, 32, YM), /* 03882 - Arnauld Chevallier - RGB.sndh */
+TIMEDB_ENTRY( 95388ec7, 5, 80, YM), /* 03882 - Arnauld Chevallier - RGB.sndh */
+TIMEDB_ENTRY( 95388ec7, 6, 11710, YM), /* 03882 - Arnauld Chevallier - RGB.sndh */
+TIMEDB_ENTRY( 95415f16, 0, 58063, YM+TA), /* 04023 - Roggie - The Realm.sndh */
+TIMEDB_ENTRY( 9552015e, 0, 2566, YM), /* 04465 - Charles Callet - La Marque Jaune.sndh */
+TIMEDB_ENTRY( 9552015e, 1, 4608, YM), /* 04465 - Charles Callet - La Marque Jaune.sndh */
+TIMEDB_ENTRY( 9552015e, 2, 5444, YM), /* 04465 - Charles Callet - La Marque Jaune.sndh */
+TIMEDB_ENTRY( 955241c3, 0, 55, YM), /* 02407 - Augustin Vidovic - Ploing.sndh */
+TIMEDB_ENTRY( 9563057b, 0, 30457, YM), /* 01717 - Jess - Tralali and Tralala.sndh */
+TIMEDB_ENTRY( 95ab22e0, 0, 10944, YM), /* 04471 - Charles Callet - Sidewalk.sndh */
+TIMEDB_ENTRY( 95c01bf7, 0, 10846, YM+TA), /* 04781 - LSL - NPRDKT.sndh */
+TIMEDB_ENTRY( 95c8b74d, 0, 37202, YM+TA), /* 03596 - 505-paradox - hushrush (STE).sndh */
+TIMEDB_ENTRY( 95db7840, 0, 1595, YM+TA), /* 02644 - miggy - Stackers(Unfinished).sndh */
+TIMEDB_ENTRY( 961366b6, 0, 3577, YM+TA+TB+TD), /* 01940 - MSG - Chu Chu Rocket - Awards.sndh */
+TIMEDB_ENTRY( 961a7e6f, 0, 11519, YM+TA+TB+TD), /* 03017 - dubmood - Jeron tels Alloyrun.sndh */
+TIMEDB_ENTRY( 96415d60, 0, 16000, YM+TA), /* 02193 - Mad Max - Ghostbattle.sndh */
+TIMEDB_ENTRY( 96415d60, 1, 6144, YM+TA), /* 02193 - Mad Max - Ghostbattle.sndh */
+TIMEDB_ENTRY( 96415d60, 2, 12480, YM+TA), /* 02193 - Mad Max - Ghostbattle.sndh */
+TIMEDB_ENTRY( 96415d60, 3, 17280, YM+TA), /* 02193 - Mad Max - Ghostbattle.sndh */
+TIMEDB_ENTRY( 96415d60, 4, 11732, YM+TA), /* 02193 - Mad Max - Ghostbattle.sndh */
+TIMEDB_ENTRY( 96415d60, 5, 8383, YM+TA), /* 02193 - Mad Max - Ghostbattle.sndh */
+TIMEDB_ENTRY( 96415d60, 6, 8192, YM+TA), /* 02193 - Mad Max - Ghostbattle.sndh */
+TIMEDB_ENTRY( 96568789, 0, 29952, YM), /* 00852 - Ben Daglish - 3d Galax.sndh */
+TIMEDB_ENTRY( 9676dae3, 0, 29121, YM+TA+TD), /* 02338 - Tao - Cream - Magnetic (UCM 12).sndh */
+TIMEDB_ENTRY( 9688321a, 0, 12000, YM+TD), /* 02360 - Nexus 6 - Arie EXX.sndh */
+TIMEDB_ENTRY( 968efd32, 0, 7180, YM+TB+TD), /* 04384 - Christophe Zurfluh - Baby Jo in Going Home.sndh */
+TIMEDB_ENTRY( 968efd32, 1, 4208, YM+TB+TD), /* 04384 - Christophe Zurfluh - Baby Jo in Going Home.sndh */
+TIMEDB_ENTRY( 968efd32, 2, 6211, YM+TB+TD), /* 04384 - Christophe Zurfluh - Baby Jo in Going Home.sndh */
+TIMEDB_ENTRY( 968efd32, 3, 4015, YM+TB+TD), /* 04384 - Christophe Zurfluh - Baby Jo in Going Home.sndh */
+TIMEDB_ENTRY( 968efd32, 4, 1899, YM+TB+TD), /* 04384 - Christophe Zurfluh - Baby Jo in Going Home.sndh */
+TIMEDB_ENTRY( 969aa546, 0, 16129, YM), /* 00378 - Wally Beben - The Ballgame.sndh */
+TIMEDB_ENTRY( 969f3663, 0, 2785, YM), /* 03978 - Paul Summers - Sonic Boom.sndh */
+TIMEDB_ENTRY( 969f3663, 1, 1921, YM), /* 03978 - Paul Summers - Sonic Boom.sndh */
+TIMEDB_ENTRY( 969f3663, 2, 2941, YM), /* 03978 - Paul Summers - Sonic Boom.sndh */
+TIMEDB_ENTRY( 969f3663, 3, 2689, YM), /* 03978 - Paul Summers - Sonic Boom.sndh */
+TIMEDB_ENTRY( 969f3663, 4, 2304, YM), /* 03978 - Paul Summers - Sonic Boom.sndh */
+TIMEDB_ENTRY( 96a2d403, 0, 33280, YM+TA+TB+TD), /* 04642 - Jakub Husak - n-a.sndh */
+TIMEDB_ENTRY( 96bf9825, 0, 2879, YM), /* 01310 - Matt Furniss - Race Drivin.sndh */
+TIMEDB_ENTRY( 96e7cd5d, 0, 12672, YM), /* 02020 - Mad Max - Balloon Challenge.sndh */
+TIMEDB_ENTRY( 96e7cd5d, 1, 321, YM), /* 02020 - Mad Max - Balloon Challenge.sndh */
+TIMEDB_ENTRY( 96e80ca2, 0, 6144, YM), /* 00491 - Ultimatum - Kidney Bean 7.sndh */
+TIMEDB_ENTRY( 97182e59, 0, 3840, YM+TA), /* 04428 - Lotus - Synth Dream 2 - Inna Groovy Mood.sndh */
+TIMEDB_ENTRY( 971a913a, 0, 6079, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 1, 250, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 2, 4222, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 3, 2367, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 4, 155, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 5, 2686, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 6, 3166, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 7, 1739, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 8, 1919, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 9, 2239, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 10, 2879, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 11, 766, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 12, 138, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 13, 1147, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971a913a, 14, 716, YM), /* 04130 - Matt Furniss - Shadow Warriors.sndh */
+TIMEDB_ENTRY( 971fb4d9, 0, 33280, YM+TA+TB+TD), /* 03335 - Marcer - LATINA - NWD Ingame - Extended V..sndh */
+TIMEDB_ENTRY( 97285509, 0, 10368, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 1, 8194, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 2, 8327, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 3, 9600, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 4, 12480, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 5, 10874, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 6, 6912, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 7, 9984, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 8, 9104, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 9, 5376, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 11, 5376, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 97285509, 12, 5506, YM+TA), /* 02660 - Lotus-Hotline - No Buddies Land.sndh */
+TIMEDB_ENTRY( 9728a920, 0, 1440, YM), /* 01878 - Dave Lowe - California Games 2.sndh */
+TIMEDB_ENTRY( 9728a920, 1, 891, YM), /* 01878 - Dave Lowe - California Games 2.sndh */
+TIMEDB_ENTRY( 9728a920, 2, 1920, YM), /* 01878 - Dave Lowe - California Games 2.sndh */
+TIMEDB_ENTRY( 9728a920, 3, 320, YM), /* 01878 - Dave Lowe - California Games 2.sndh */
+TIMEDB_ENTRY( 9728a920, 4, 960, YM), /* 01878 - Dave Lowe - California Games 2.sndh */
+TIMEDB_ENTRY( 9728a920, 5, 972, YM), /* 01878 - Dave Lowe - California Games 2.sndh */
+TIMEDB_ENTRY( 97431cba, 0, 2304, YM+TD), /* 00587 - Celtic - The! Loader Track.sndh */
+TIMEDB_ENTRY( 97510d6f, 0, 8460, YM+TA), /* 01278 - Frazer - TSC 60.sndh */
+TIMEDB_ENTRY( 97702443, 0, 5880, YM), /* 01260 - Tim Follin - Renegade.sndh */
+TIMEDB_ENTRY( 97872dee, 0, 16896, YM+TB+TD), /* 03458 - Marcer - Axel F.sndh */
+TIMEDB_ENTRY( 978a8d03, 0, 6720, YM+TA), /* 00938 - Dark Angel - Mr X Must Die.sndh */
+TIMEDB_ENTRY( 97ae217f, 0, 1536, YM), /* 03240 - T1000 - The Beast Club - TBC 12.sndh */
+TIMEDB_ENTRY( 97c8362b, 0, 7700, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97c8362b, 1, 9276, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97c8362b, 2, 5756, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97c8362b, 3, 7516, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97c8362b, 4, 7996, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97c8362b, 5, 1276, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97c8362b, 6, 278, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97c8362b, 8, 1276, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97c8362b, 9, 2075, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97c8362b, 10, 156, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97c8362b, 11, 156, YM), /* 00558 - Allister Brimble - Slightly Magic.sndh */
+TIMEDB_ENTRY( 97cc1c60, 0, 9216, YM+TA+TB+TD), /* 02098 - Mad Max - Starpaws - Sid.sndh */
+TIMEDB_ENTRY( 97cc1c60, 1, 2688, YM+TA+TB+TD), /* 02098 - Mad Max - Starpaws - Sid.sndh */
+TIMEDB_ENTRY( 97cc1c60, 2, 384, YM+TA+TB+TD), /* 02098 - Mad Max - Starpaws - Sid.sndh */
+TIMEDB_ENTRY( 97eb9731, 0, 2928, YM), /* 00453 - Augustin Vidovic - Motogoto.sndh */
+TIMEDB_ENTRY( 97f3ab2e, 0, 3840, YM+TA), /* 00952 - Dark Angel - The Devil In You.sndh */
+TIMEDB_ENTRY( 9805afa1, 0, 5376, YM+TA), /* 04440 - Lotus - Synth Dream 2 - You Know Lotus.sndh */
+TIMEDB_ENTRY( 981baf1f, 0, 1117, YM), /* 01536 - Iso - Waking Up.sndh */
+TIMEDB_ENTRY( 9828011a, 0, 4986, YM), /* 00899 - Danny Oneway - Danny O Sidsong.sndh */
+TIMEDB_ENTRY( 98294817, 0, 6528, YM), /* 04845 - t1000 - Bits 57.sndh */
+TIMEDB_ENTRY( 98376a21, 0, 5376, YM+TD), /* 02011 - Jochen Hippel - Loading.sndh */
+TIMEDB_ENTRY( 984089bf, 0, 1536, YM), /* 02213 - Mad Max - Rollout.sndh */
+TIMEDB_ENTRY( 984089bf, 1, 10677, YM), /* 02213 - Mad Max - Rollout.sndh */
+TIMEDB_ENTRY( 984266e9, 0, 3881, YM+TA), /* 03787 - Sean O'Connor - Guy Fawkes.sndh */
+TIMEDB_ENTRY( 9867eb14, 0, 240, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 1, 372, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 2, 336, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 3, 336, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 4, 372, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 5, 336, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 6, 264, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 7, 336, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 8, 1119, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 9, 512, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 10, 503, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 11, 768, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 12, 570, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 13, 1200, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9867eb14, 14, 40, YM), /* 00341 - Tony Williams - International Ice Hockey.sndh */
+TIMEDB_ENTRY( 9874059f, 0, 9226, YM), /* 00426 - Big Alec - PYM - Isido Way Of The Stones.sndh */
+TIMEDB_ENTRY( 9880a1dd, 0, 14495, YM), /* 02375 - Nexus 6 - Hans A. aus Dortmund.sndh */
+TIMEDB_ENTRY( 988903d2, 0, 3838, YM), /* 04219 - Karsten Obarksi - Window Wizard.sndh */
+TIMEDB_ENTRY( 988903d2, 1, 6079, YM), /* 04219 - Karsten Obarksi - Window Wizard.sndh */
+TIMEDB_ENTRY( 988903d2, 2, 8319, YM), /* 04219 - Karsten Obarksi - Window Wizard.sndh */
+TIMEDB_ENTRY( 988903d2, 3, 5759, YM), /* 04219 - Karsten Obarksi - Window Wizard.sndh */
+TIMEDB_ENTRY( 988903d2, 4, 8319, YM), /* 04219 - Karsten Obarksi - Window Wizard.sndh */
+TIMEDB_ENTRY( 988903d2, 5, 8062, YM), /* 04219 - Karsten Obarksi - Window Wizard.sndh */
+TIMEDB_ENTRY( 988903d2, 6, 5439, YM), /* 04219 - Karsten Obarksi - Window Wizard.sndh */
+TIMEDB_ENTRY( 988903d2, 7, 6079, YM), /* 04219 - Karsten Obarksi - Window Wizard.sndh */
+TIMEDB_ENTRY( 9898be70, 0, 24832, YM), /* 02042 - Mad Max - Lightforce.sndh */
+TIMEDB_ENTRY( 98d188fc, 0, 10240, YM), /* 02589 - STU - DRUMBASE.sndh */
+TIMEDB_ENTRY( 98d78363, 0, 17913, YM+TA), /* 04223 - 505 - 3rd.sndh */
+TIMEDB_ENTRY( 98da9c76, 0, 7168, YM), /* 01264 - Frazer - Apex.sndh */
+TIMEDB_ENTRY( 98ee413e, 0, 13871, YM+TA), /* 04120 - Tao - Powerman - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( 98f2466f, 0, 5796, YM+TA+TB+TD), /* 03430 - Per Almered (XiA) 2009 - Brit.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 0, 2497, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 1, 1542, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 2, 1634, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 3, 2178, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 4, 339, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 5, 228, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 6, 181, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 7, 2497, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 8, 176, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 9, 135, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 10, 126, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 11, 3183, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 12, 3138, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 13, 2560, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 14, 482, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 15, 229, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 16, 369, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 17, 264, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 19, 2688, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 20, 205, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 21, 419, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 23, 512, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 98fd4dbd, 24, 2285, YM), /* 04506 - Unknown - Bubblefield screen.sndh */
+TIMEDB_ENTRY( 990a94c4, 0, 2309, YM+TA+TD), /* 02230 - Tao - Cream - Chased-3D Cube (Nostalgic-O-Demo).sndh */
+TIMEDB_ENTRY( 9911c535, 0, 226959, YM+TA), /* 04672 - Unknown - Sweet Dreams.sndh */
+TIMEDB_ENTRY( 99327bfa, 0, 1152, YM), /* 01087 - Techno - Dentro 2.sndh */
+TIMEDB_ENTRY( 99671248, 0, 3450, YM), /* 01342 - Scavenger - Leif Rular.sndh */
+TIMEDB_ENTRY( 997d6e29, 0, 27648, YM+TA+TB+TD), /* 03376 - STU - SINGING ROBOT.sndh */
+TIMEDB_ENTRY( 999d9ffe, 0, 7296, YM+TA), /* 04422 - Lotus - Synth Dream 2 - Bionic Fields.sndh */
+TIMEDB_ENTRY( 99b0b0a8, 0, 7168, YM+TA), /* 02204 - Mad Max - Lethal Xcess (ST-Falc).sndh */
+TIMEDB_ENTRY( 99b0b0a8, 1, 15168, YM+TA), /* 02204 - Mad Max - Lethal Xcess (ST-Falc).sndh */
+TIMEDB_ENTRY( 99b0b0a8, 2, 4180, YM+TA), /* 02204 - Mad Max - Lethal Xcess (ST-Falc).sndh */
+TIMEDB_ENTRY( 99b0b0a8, 3, 18483, YM+TA), /* 02204 - Mad Max - Lethal Xcess (ST-Falc).sndh */
+TIMEDB_ENTRY( 99b0b0a8, 5, 10908, YM+TA), /* 02204 - Mad Max - Lethal Xcess (ST-Falc).sndh */
+TIMEDB_ENTRY( 99b0b0a8, 6, 12160, YM+TA), /* 02204 - Mad Max - Lethal Xcess (ST-Falc).sndh */
+TIMEDB_ENTRY( 99b17b4f, 0, 112, YM), /* 04715 - Simon Wilsher - Spaced Weller.sndh */
+TIMEDB_ENTRY( 99b17b4f, 1, 103, YM), /* 04715 - Simon Wilsher - Spaced Weller.sndh */
+TIMEDB_ENTRY( 99b17b4f, 2, 3113, YM), /* 04715 - Simon Wilsher - Spaced Weller.sndh */
+TIMEDB_ENTRY( 99b17b4f, 3, 2497, YM), /* 04715 - Simon Wilsher - Spaced Weller.sndh */
+TIMEDB_ENTRY( 99b17b4f, 4, 181, YM), /* 04715 - Simon Wilsher - Spaced Weller.sndh */
+TIMEDB_ENTRY( 99b17b4f, 5, 160, YM), /* 04715 - Simon Wilsher - Spaced Weller.sndh */
+TIMEDB_ENTRY( 99b17b4f, 6, 2285, YM), /* 04715 - Simon Wilsher - Spaced Weller.sndh */
+TIMEDB_ENTRY( 99b17b4f, 7, 1146, YM), /* 04715 - Simon Wilsher - Spaced Weller.sndh */
+TIMEDB_ENTRY( 99b3dad9, 0, 8853, YM), /* 01971 - MSG - MSG 01.sndh */
+TIMEDB_ENTRY( 99b563c1, 0, 494, YM), /* 04493 - Ralph Effemey - Arthur of the Britons.sndh */
+TIMEDB_ENTRY( 99b563c1, 1, 142, YM), /* 04493 - Ralph Effemey - Arthur of the Britons.sndh */
+TIMEDB_ENTRY( 99b563c1, 2, 180, YM), /* 04493 - Ralph Effemey - Arthur of the Britons.sndh */
+TIMEDB_ENTRY( 99b563c1, 3, 198, YM), /* 04493 - Ralph Effemey - Arthur of the Britons.sndh */
+TIMEDB_ENTRY( 99b563c1, 4, 355, YM), /* 04493 - Ralph Effemey - Arthur of the Britons.sndh */
+TIMEDB_ENTRY( 99b563c1, 5, 169, YM), /* 04493 - Ralph Effemey - Arthur of the Britons.sndh */
+TIMEDB_ENTRY( 99b563c1, 6, 199, YM), /* 04493 - Ralph Effemey - Arthur of the Britons.sndh */
+TIMEDB_ENTRY( 99cea52d, 0, 871, YM), /* 00098 - David Whittaker - Enduro Racer.sndh */
+TIMEDB_ENTRY( 99cea52d, 1, 8533, YM), /* 00098 - David Whittaker - Enduro Racer.sndh */
+TIMEDB_ENTRY( 99cea52d, 2, 853, YM), /* 00098 - David Whittaker - Enduro Racer.sndh */
+TIMEDB_ENTRY( 99d0693a, 0, 13405, YM), /* 03893 - Unknown - Sevilla.sndh */
+TIMEDB_ENTRY( 99f889ef, 0, 5435, YM+TA+TB+TD), /* 04568 - Bagarn - Spice Boys - Jag fyller Assn till bredden.sndh */
+TIMEDB_ENTRY( 99ff9925, 0, 7680, YM), /* 03215 - Tomchi - Checkboard.sndh */
+TIMEDB_ENTRY( 9a025a97, 0, 18080, YM+TB+TD), /* 02604 - STU - MAD CREATURE.sndh */
+TIMEDB_ENTRY( 9a04d1ff, 0, 7913, YM), /* 00876 - Ben Daglish - Thunderbirds.sndh */
+TIMEDB_ENTRY( 9a1dc958, 0, 9689, YM), /* 03033 - Debbie Davis - Lay Me Down.sndh */
+TIMEDB_ENTRY( 9a315c32, 0, 32256, YM+TA+TB+TD), /* 02536 - Remo - Mia Mia.sndh */
+TIMEDB_ENTRY( 9a321c58, 0, 10368, YM), /* 01067 - Jonathan Dunn - Rambo III.sndh */
+TIMEDB_ENTRY( 9a321c58, 1, 6144, YM), /* 01067 - Jonathan Dunn - Rambo III.sndh */
+TIMEDB_ENTRY( 9a321c58, 2, 161, YM), /* 01067 - Jonathan Dunn - Rambo III.sndh */
+TIMEDB_ENTRY( 9a321c58, 3, 121, YM), /* 01067 - Jonathan Dunn - Rambo III.sndh */
+TIMEDB_ENTRY( 9a321c58, 4, 8320, YM), /* 01067 - Jonathan Dunn - Rambo III.sndh */
+TIMEDB_ENTRY( 9a321c58, 5, 3840, YM), /* 01067 - Jonathan Dunn - Rambo III.sndh */
+TIMEDB_ENTRY( 9a35c9be, 0, 18705, YM), /* 00094 - David Whittaker - Dogs of War.sndh */
+TIMEDB_ENTRY( 9a35c9be, 1, 6826, YM), /* 00094 - David Whittaker - Dogs of War.sndh */
+TIMEDB_ENTRY( 9a35c9be, 2, 93, YM), /* 00094 - David Whittaker - Dogs of War.sndh */
+TIMEDB_ENTRY( 9a35c9be, 3, 135, YM), /* 00094 - David Whittaker - Dogs of War.sndh */
+TIMEDB_ENTRY( 9a35c9be, 4, 79, YM), /* 00094 - David Whittaker - Dogs of War.sndh */
+TIMEDB_ENTRY( 9a35c9be, 5, 8577, YM), /* 00094 - David Whittaker - Dogs of War.sndh */
+TIMEDB_ENTRY( 9a35c9be, 6, 332, YM), /* 00094 - David Whittaker - Dogs of War.sndh */
+TIMEDB_ENTRY( 9a35c9be, 7, 380, YM), /* 00094 - David Whittaker - Dogs of War.sndh */
+TIMEDB_ENTRY( 9ad9d815, 0, 413, YM), /* 03203 - Unknown - World Trophy Soccer.sndh */
+TIMEDB_ENTRY( 9ad9d815, 1, 459, YM), /* 03203 - Unknown - World Trophy Soccer.sndh */
+TIMEDB_ENTRY( 9ad9d815, 2, 312, YM), /* 03203 - Unknown - World Trophy Soccer.sndh */
+TIMEDB_ENTRY( 9ae3a822, 0, 32256, YM+TA+TB+TD), /* 03996 - XyNo - XC3N BDAY 48H.sndh */
+TIMEDB_ENTRY( 9b14e618, 0, 13058, YM+TA+TB+TD), /* 00206 - 505 - UCM 12 2.sndh */
+TIMEDB_ENTRY( 9b1fc0cc, 0, 2559, YM), /* 04209 - Dave Lowe - Ghostbusters II.sndh */
+TIMEDB_ENTRY( 9b2b2f8a, 0, 4224, YM+TA), /* 04419 - EVE - Sewer 8.sndh */
+TIMEDB_ENTRY( 9b391918, 0, 4092, YM+TA+TB+TD), /* 04328 - 505-Checkpoint - zuuuuuuu.sndh */
+TIMEDB_ENTRY( 9b3cda13, 0, 268756, YM+TA), /* 03757 - Tufty - Pandemonium - Acid Demo.sndh */
+TIMEDB_ENTRY( 9b427428, 0, 9967, YM+TA+TB+TD), /* 04351 - HYLST - H CHIP EWPERIMENT 4 SV2K13.sndh */
+TIMEDB_ENTRY( 9b4f3100, 0, 41554, YM+TA), /* 04059 - Roggie - The Works.sndh */
+TIMEDB_ENTRY( 9b57347c, 0, 153412, YM+TA), /* 03711 - Wally Beben - Time Machine.sndh */
+TIMEDB_ENTRY( 9b66fd97, 0, 25552, YM+TA+TB+TD), /* 02861 - Helene - whatever.sndh */
+TIMEDB_ENTRY( 9b7a9b87, 0, 1934, YM), /* 00926 - Dark Angel - Invaders.sndh */
+TIMEDB_ENTRY( 9b82e7ae, 0, 18816, YM), /* 03259 - T1000 - The Beast Club - TS 8.sndh */
+TIMEDB_ENTRY( 9b855101, 0, 10752, YM), /* 01026 - Doclands - European Demos Main Menu.sndh */
+TIMEDB_ENTRY( 9b8e4792, 0, 4638, YM), /* 00838 - Ben Daglish - Action Fighter.sndh */
+TIMEDB_ENTRY( 9b8e4792, 1, 709, YM), /* 00838 - Ben Daglish - Action Fighter.sndh */
+TIMEDB_ENTRY( 9ba23b31, 0, 114186, YM+TA), /* 04056 - Roggie - Shoo and away ye go.sndh */
+TIMEDB_ENTRY( 9ba720f0, 0, 1600, YM), /* 04497 - A.C. Porritt - Battle Zone.sndh */
+TIMEDB_ENTRY( 9ba720f0, 1, 57, YM), /* 04497 - A.C. Porritt - Battle Zone.sndh */
+TIMEDB_ENTRY( 9ba720f0, 2, 52, YM), /* 04497 - A.C. Porritt - Battle Zone.sndh */
+TIMEDB_ENTRY( 9ba720f0, 3, 49, YM), /* 04497 - A.C. Porritt - Battle Zone.sndh */
+TIMEDB_ENTRY( 9ba720f0, 4, 51, YM), /* 04497 - A.C. Porritt - Battle Zone.sndh */
+TIMEDB_ENTRY( 9ba720f0, 5, 50, YM), /* 04497 - A.C. Porritt - Battle Zone.sndh */
+TIMEDB_ENTRY( 9ba720f0, 6, 1021, YM), /* 04497 - A.C. Porritt - Battle Zone.sndh */
+TIMEDB_ENTRY( 9bc97355, 0, 67569, YM+TA), /* 03834 - Charles Callet - Pick N Pile.sndh */
+TIMEDB_ENTRY( 9bc97355, 1, 64431, YM+TA), /* 03834 - Charles Callet - Pick N Pile.sndh */
+TIMEDB_ENTRY( 9bd0d1e4, 0, 4048, YM+TA+TB+TD), /* 02813 - Marcer - NWD INTRO.sndh */
+TIMEDB_ENTRY( 9bda4dde, 0, 4095, YM), /* 01785 - Lap - Phaleon - Krom.sndh */
+TIMEDB_ENTRY( 9bf79fd9, 0, 6912, YM), /* 01189 - Excellence In Art - Lynx Tune.sndh */
+TIMEDB_ENTRY( 9bfc2d55, 0, 49728, YM+TA+TB), /* 01675 - Jess - Best Part Ze 16 Mins Hit.sndh */
+TIMEDB_ENTRY( 9c00376c, 0, 8832, YM+TA+TD), /* 02249 - Tao - Cream - Androids.sndh */
+TIMEDB_ENTRY( 9c1a5c7a, 0, 4498, YM), /* 03143 - Unknown - The First Noel the Angel ....sndh */
+TIMEDB_ENTRY( 9c1ab919, 0, 11787, YM+TA+TD), /* 02251 - Tao - Cream - Chicago (Steps).sndh */
+TIMEDB_ENTRY( 9c66c9d0, 0, 4352, YM+TA), /* 00813 - Crawdaddy - The Cave.sndh */
+TIMEDB_ENTRY( 9c72511a, 0, 1536, YM), /* 02004 - Mad Max - Demo Shorty.sndh */
+TIMEDB_ENTRY( 9c8bb406, 0, 8442, YM+TA+TD), /* 01140 - Tyan - Julia 4.sndh */
+TIMEDB_ENTRY( 9c92d01b, 0, 1365, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 1, 420, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 2, 1072, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 3, 2048, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 4, 193, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 5, 2389, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 6, 1150, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 7, 3360, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 8, 2507, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 9, 1337, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 10, 3510, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 11, 1671, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 12, 1310, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 13, 4555, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 14, 7105, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 15, 87, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9c92d01b, 16, 335, YM), /* 00146 - David Whittaker - Super Wonder Boy.sndh */
+TIMEDB_ENTRY( 9cb76943, 0, 5120, YM), /* 00344 - Tony Williams - Nitro.sndh */
+TIMEDB_ENTRY( 9cb76943, 1, 1216, YM), /* 00344 - Tony Williams - Nitro.sndh */
+TIMEDB_ENTRY( 9cb76943, 2, 319, YM), /* 00344 - Tony Williams - Nitro.sndh */
+TIMEDB_ENTRY( 9cb76943, 3, 214, YM), /* 00344 - Tony Williams - Nitro.sndh */
+TIMEDB_ENTRY( 9cb76943, 4, 608, YM), /* 00344 - Tony Williams - Nitro.sndh */
+TIMEDB_ENTRY( 9cb76943, 5, 512, YM), /* 00344 - Tony Williams - Nitro.sndh */
+TIMEDB_ENTRY( 9cc37862, 0, 8042, YM), /* 02145 - Mad Max - International Karate 1 - LSD.sndh */
+TIMEDB_ENTRY( 9cc737cc, 0, 27136, YM), /* 04643 - xrwwr - WINGS OF LIFE.sndh */
+TIMEDB_ENTRY( 9cc8b789, 0, 1920, YM), /* 01111 - Keith Tinman - Midnight Resistance.sndh */
+TIMEDB_ENTRY( 9cc8b789, 1, 1152, YM), /* 01111 - Keith Tinman - Midnight Resistance.sndh */
+TIMEDB_ENTRY( 9cc8b789, 2, 1152, YM), /* 01111 - Keith Tinman - Midnight Resistance.sndh */
+TIMEDB_ENTRY( 9cc8b789, 3, 2976, YM), /* 01111 - Keith Tinman - Midnight Resistance.sndh */
+TIMEDB_ENTRY( 9cc8b789, 4, 1198, YM), /* 01111 - Keith Tinman - Midnight Resistance.sndh */
+TIMEDB_ENTRY( 9cc8b789, 5, 5902, YM), /* 01111 - Keith Tinman - Midnight Resistance.sndh */
+TIMEDB_ENTRY( 9cc8b789, 6, 2300, YM), /* 01111 - Keith Tinman - Midnight Resistance.sndh */
+TIMEDB_ENTRY( 9cc8b789, 7, 1536, YM), /* 01111 - Keith Tinman - Midnight Resistance.sndh */
+TIMEDB_ENTRY( 9cc8b789, 8, 3264, YM), /* 01111 - Keith Tinman - Midnight Resistance.sndh */
+TIMEDB_ENTRY( 9ccc87fe, 0, 496, YM), /* 04133 - Unknown - Carry All.sndh */
+TIMEDB_ENTRY( 9ccc87fe, 1, 483, YM), /* 04133 - Unknown - Carry All.sndh */
+TIMEDB_ENTRY( 9cd87c01, 0, 6412, YM), /* 00855 - Ben Daglish - Kingmaker.sndh */
+TIMEDB_ENTRY( 9cd87c01, 1, 3790, YM), /* 00855 - Ben Daglish - Kingmaker.sndh */
+TIMEDB_ENTRY( 9cd87c01, 2, 402, YM), /* 00855 - Ben Daglish - Kingmaker.sndh */
+TIMEDB_ENTRY( 9cd87c01, 3, 324, YM), /* 00855 - Ben Daglish - Kingmaker.sndh */
+TIMEDB_ENTRY( 9cd87c01, 4, 447, YM), /* 00855 - Ben Daglish - Kingmaker.sndh */
+TIMEDB_ENTRY( 9cf60b4b, 0, 550, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cf60b4b, 1, 629, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cf60b4b, 2, 568, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cf60b4b, 3, 532, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cf60b4b, 4, 592, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cf60b4b, 5, 1492, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cf60b4b, 6, 1866, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cf60b4b, 7, 1346, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cf60b4b, 8, 309, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cf60b4b, 9, 272, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cf60b4b, 10, 255, YM), /* 04540 - JAWX - Funfares (STOS accessories disk).sndh */
+TIMEDB_ENTRY( 9cfdf4ac, 0, 9983, YM+TA), /* 03619 - 505-paradox - Blue.sndh */
+TIMEDB_ENTRY( 9d0dc76f, 0, 8704, YM), /* 00580 - Ladislav John Brovosky - Hades Nebula.sndh */
+TIMEDB_ENTRY( 9d0dc76f, 1, 236, YM), /* 00580 - Ladislav John Brovosky - Hades Nebula.sndh */
+TIMEDB_ENTRY( 9d0dc76f, 2, 831, YM), /* 00580 - Ladislav John Brovosky - Hades Nebula.sndh */
+TIMEDB_ENTRY( 9d2a8769, 0, 1536, YM), /* 04717 - Unknown - The Big STOS demo.sndh */
+TIMEDB_ENTRY( 9d2eaeb3, 0, 7680, YM), /* 02034 - Mad Max - Gremlin Music Demo.sndh */
+TIMEDB_ENTRY( 9d2eaeb3, 1, 4416, YM), /* 02034 - Mad Max - Gremlin Music Demo.sndh */
+TIMEDB_ENTRY( 9d2eaeb3, 2, 5184, YM), /* 02034 - Mad Max - Gremlin Music Demo.sndh */
+TIMEDB_ENTRY( 9d2eaeb3, 3, 7488, YM), /* 02034 - Mad Max - Gremlin Music Demo.sndh */
+TIMEDB_ENTRY( 9d2eaeb3, 4, 5760, YM), /* 02034 - Mad Max - Gremlin Music Demo.sndh */
+TIMEDB_ENTRY( 9d2eaeb3, 5, 3840, YM), /* 02034 - Mad Max - Gremlin Music Demo.sndh */
+TIMEDB_ENTRY( 9d2eaeb3, 6, 5760, YM), /* 02034 - Mad Max - Gremlin Music Demo.sndh */
+TIMEDB_ENTRY( 9d3bad89, 0, 403, YM), /* 04077 - Gary Wheaton - Jingle.sndh */
+TIMEDB_ENTRY( 9d448bf8, 0, 8328, YM+TB+TD), /* 03589 - Divag - Boomjasz.sndh */
+TIMEDB_ENTRY( 9d50b1cc, 0, 13248, YM), /* 02007 - Mad Max - Gambol.sndh */
+TIMEDB_ENTRY( 9d50b1cc, 1, 3082, YM), /* 02007 - Mad Max - Gambol.sndh */
+TIMEDB_ENTRY( 9d50b1cc, 2, 7680, YM), /* 02007 - Mad Max - Gambol.sndh */
+TIMEDB_ENTRY( 9d5ee854, 0, 22848, YM+TA+TB+TD), /* 02084 - Mad Max - IK+ - Sid.sndh */
+TIMEDB_ENTRY( 9d6a644a, 0, 3648, YM), /* 03514 - Gominolas - Pepsi - Mad Mix Game.sndh */
+TIMEDB_ENTRY( 9d6c1090, 0, 20730, YM+TA), /* 01722 - Jess - Another Western Legend.sndh */
+TIMEDB_ENTRY( 9d70cdba, 0, 3072, YM), /* 02131 - Mad Max - Axel F - LCD.sndh */
+TIMEDB_ENTRY( 9d8449ea, 0, 12202, YM+TA+TB+TD), /* 03642 - e^pi-Tristesse - silly cone.sndh */
+TIMEDB_ENTRY( 9d96a836, 0, 15546, YM+TA+TB+TD), /* 00990 - DMA-SC - Chipster.sndh */
+TIMEDB_ENTRY( 9da43427, 0, 1759, YM), /* 03115 - Unknown - FUR ELISE by L. V. Beethoven.sndh */
+TIMEDB_ENTRY( 9df47e85, 0, 4226, YM), /* 01228 - Epic - Feed My Frankenstein.sndh */
+TIMEDB_ENTRY( 9e23b2be, 0, 6976, YM), /* 01375 - Justin Scharvona & Andy Severn - Kid Gloves 2.sndh */
+TIMEDB_ENTRY( 9e23b2be, 1, 7680, YM), /* 01375 - Justin Scharvona & Andy Severn - Kid Gloves 2.sndh */
+TIMEDB_ENTRY( 9e23b2be, 2, 7680, YM), /* 01375 - Justin Scharvona & Andy Severn - Kid Gloves 2.sndh */
+TIMEDB_ENTRY( 9e23b2be, 3, 506, YM), /* 01375 - Justin Scharvona & Andy Severn - Kid Gloves 2.sndh */
+TIMEDB_ENTRY( 9e23b2be, 4, 9216, YM), /* 01375 - Justin Scharvona & Andy Severn - Kid Gloves 2.sndh */
+TIMEDB_ENTRY( 9e23b2be, 5, 8704, YM), /* 01375 - Justin Scharvona & Andy Severn - Kid Gloves 2.sndh */
+TIMEDB_ENTRY( 9e23b2be, 6, 7936, YM), /* 01375 - Justin Scharvona & Andy Severn - Kid Gloves 2.sndh */
+TIMEDB_ENTRY( 9e23b2be, 7, 7680, YM), /* 01375 - Justin Scharvona & Andy Severn - Kid Gloves 2.sndh */
+TIMEDB_ENTRY( 9e2769bd, 0, 3456, YM), /* 03659 - Jedi - Nothing Is More - Song 1.sndh */
+TIMEDB_ENTRY( 9e32e31d, 0, 6136, YM+TA), /* 01335 - Scavenger - Heaven.sndh */
+TIMEDB_ENTRY( 9e42a039, 0, 4511, YM), /* 00332 - Gary Wheaton - Greetings.sndh */
+TIMEDB_ENTRY( 9e53db7d, 0, 10610, YM+TA+TD), /* 02750 - sh3 - house of the rising sun.sndh */
+TIMEDB_ENTRY( 9e5a0592, 0, 2402, YM), /* 01791 - Barry Leitch - Ferrari Formula One.sndh */
+TIMEDB_ENTRY( 9e5fedcd, 0, 38400, YM), /* 01448 - Stax - Scandal.sndh */
+TIMEDB_ENTRY( 9e69482f, 0, 13433, YM), /* 01687 - Jess - The singing Green Frog.sndh */
+TIMEDB_ENTRY( 9e776126, 0, 26800, YM), /* 01723 - Jess - If It Works Good !.sndh */
+TIMEDB_ENTRY( 9e8a8d67, 0, 2569, YM), /* 04187 - Jezz Woodroffe - Philip Nixon - Elvira II - The Jaws of Cerberus.sndh */
+TIMEDB_ENTRY( 9e8a8d67, 1, 3853, YM), /* 04187 - Jezz Woodroffe - Philip Nixon - Elvira II - The Jaws of Cerberus.sndh */
+TIMEDB_ENTRY( 9e8a8d67, 2, 3849, YM), /* 04187 - Jezz Woodroffe - Philip Nixon - Elvira II - The Jaws of Cerberus.sndh */
+TIMEDB_ENTRY( 9e8a8d67, 3, 4621, YM), /* 04187 - Jezz Woodroffe - Philip Nixon - Elvira II - The Jaws of Cerberus.sndh */
+TIMEDB_ENTRY( 9e8a8d67, 4, 4047, YM), /* 04187 - Jezz Woodroffe - Philip Nixon - Elvira II - The Jaws of Cerberus.sndh */
+TIMEDB_ENTRY( 9e8a8d67, 5, 3085, YM), /* 04187 - Jezz Woodroffe - Philip Nixon - Elvira II - The Jaws of Cerberus.sndh */
+TIMEDB_ENTRY( 9e8a8d67, 6, 2569, YM), /* 04187 - Jezz Woodroffe - Philip Nixon - Elvira II - The Jaws of Cerberus.sndh */
+TIMEDB_ENTRY( 9e8a8d67, 7, 3175, YM), /* 04187 - Jezz Woodroffe - Philip Nixon - Elvira II - The Jaws of Cerberus.sndh */
+TIMEDB_ENTRY( 9e8a8d67, 8, 5393, YM), /* 04187 - Jezz Woodroffe - Philip Nixon - Elvira II - The Jaws of Cerberus.sndh */
+TIMEDB_ENTRY( 9e8a8d67, 9, 4915, YM), /* 04187 - Jezz Woodroffe - Philip Nixon - Elvira II - The Jaws of Cerberus.sndh */
+TIMEDB_ENTRY( 9ea21686, 0, 6048, YM+TA), /* 00915 - Dark Angel - Mathematica 1.sndh */
+TIMEDB_ENTRY( 9ea94a32, 0, 18433, YM+TA), /* 04800 - Unknown - Delta.sndh */
+TIMEDB_ENTRY( 9ebbca94, 0, 4322, YM), /* 00243 - AN Cool - Atari-Baby.sndh */
+TIMEDB_ENTRY( 9ec32bc8, 0, 7680, YM+TB), /* 00040 - 505 - Checkpoint - MMJ Xmas 03 - 1.sndh */
+TIMEDB_ENTRY( 9ec94363, 0, 3456, YM+TA), /* 00414 - Big Alec - Melancho.sndh */
+TIMEDB_ENTRY( 9edc4972, 0, 106299, YM+TA), /* 03753 - Tufty - Mirage.sndh */
+TIMEDB_ENTRY( 9ee36e8a, 0, 1736, YM), /* 04696 - P Blay - Mars Maze.sndh */
+TIMEDB_ENTRY( 9ee36e8a, 1, 800, YM), /* 04696 - P Blay - Mars Maze.sndh */
+TIMEDB_ENTRY( 9ee36e8a, 2, 1306, YM), /* 04696 - P Blay - Mars Maze.sndh */
+TIMEDB_ENTRY( 9ee36e8a, 3, 879, YM), /* 04696 - P Blay - Mars Maze.sndh */
+TIMEDB_ENTRY( 9eeab97a, 0, 17701, YM), /* 00916 - Dark Angel - Aura Mix.sndh */
+TIMEDB_ENTRY( 9ef29429, 0, 3328, YM), /* 00003 - gwEm - micromusic radio jingle.sndh */
+TIMEDB_ENTRY( 9efd158b, 0, 8058, YM+TA), /* 04450 - Scavenger - Sambase Digi.sndh */
+TIMEDB_ENTRY( 9f094e8e, 0, 1275, YM), /* 00026 - 505 - 18th.sndh */
+TIMEDB_ENTRY( 9f144684, 0, 5787, YM), /* 01232 - Epic - Lost in Universe.sndh */
+TIMEDB_ENTRY( 9f148304, 0, 35840, YM), /* 01468 - STU - HEDGEHOG.sndh */
+TIMEDB_ENTRY( 9f1d23bd, 0, 4120, YM+TA+TD), /* 02260 - Tao - Cream (orig. Rob Hubbard) - Ninja (Steps).sndh */
+TIMEDB_ENTRY( 9f265e3d, 0, 7674, YM), /* 02455 - Timbral - Y'M still here.sndh */
+TIMEDB_ENTRY( 9f2aeb7c, 0, 11065, YM+TA+TB+TD), /* 02100 - Mad Max - Thing on a Spring - Sid.sndh */
+TIMEDB_ENTRY( 9f373ded, 0, 20601, YM), /* 01672 - Jess - Akira VS Sangoku.sndh */
+TIMEDB_ENTRY( 9f633da5, 0, 16512, YM), /* 04457 - Charles Callet - Final Assault.sndh */
+TIMEDB_ENTRY( 9f783efb, 0, 4223, YM+TA), /* 00200 - 505 - TK Machine.sndh */
+TIMEDB_ENTRY( 9f92ee0c, 0, 8448, YM), /* 01556 - Riff - Bomb Fusion.sndh */
+TIMEDB_ENTRY( 9f94483d, 0, 12288, YM+TD), /* 03997 - XyNo - n-a.sndh */
+TIMEDB_ENTRY( 9f9606fe, 0, 5376, YM), /* 00967 - Mike Davies - Strider.sndh */
+TIMEDB_ENTRY( 9f9606fe, 1, 912, YM), /* 00967 - Mike Davies - Strider.sndh */
+TIMEDB_ENTRY( 9f9606fe, 2, 265, YM), /* 00967 - Mike Davies - Strider.sndh */
+TIMEDB_ENTRY( 9f9606fe, 3, 289, YM), /* 00967 - Mike Davies - Strider.sndh */
+TIMEDB_ENTRY( 9f9606fe, 4, 2944, YM), /* 00967 - Mike Davies - Strider.sndh */
+TIMEDB_ENTRY( 9fa83622, 0, 24570, YM+TA), /* 01691 - Jess - Pentatonik Illusion.sndh */
+TIMEDB_ENTRY( 9fa890e4, 0, 12672, YM+TA+TB), /* 01325 - Scavenger - Avenger.sndh */
+TIMEDB_ENTRY( 9faed090, 0, 13568, YM+TA), /* 02717 - Lee Lee - Automation 391.sndh */
+TIMEDB_ENTRY( 9fb5b4eb, 0, 2688, YM+TA+TB+TD), /* 01721 - Jess - Wave Mania is my Passion.sndh */
+TIMEDB_ENTRY( 9fbc887d, 0, 5763, YM), /* 01758 - Lap - Bird Girl Mad Demo Menu.sndh */
+TIMEDB_ENTRY( 9fc7da3a, 0, 4607, YM+TA+TB+TD), /* 02840 - maktone-fairlight - varberga.sndh */
+TIMEDB_ENTRY( 9fd943e9, 0, 2458, YM), /* 03123 - n-a - .sndh */
+TIMEDB_ENTRY( 9fe1c921, 0, 6401, YM), /* 00361 - Steve Barrett - Adv Fruit Machine Sim.sndh */
+TIMEDB_ENTRY( 9fe1c921, 1, 105, YM), /* 00361 - Steve Barrett - Adv Fruit Machine Sim.sndh */
+TIMEDB_ENTRY( 9fe1c921, 2, 163, YM), /* 00361 - Steve Barrett - Adv Fruit Machine Sim.sndh */
+TIMEDB_ENTRY( 9fe1c921, 3, 643, YM), /* 00361 - Steve Barrett - Adv Fruit Machine Sim.sndh */
+TIMEDB_ENTRY( 9fe1c921, 4, 163, YM), /* 00361 - Steve Barrett - Adv Fruit Machine Sim.sndh */
+TIMEDB_ENTRY( 9fe1c921, 5, 145, YM), /* 00361 - Steve Barrett - Adv Fruit Machine Sim.sndh */
+TIMEDB_ENTRY( 9fe1c921, 6, 135, YM), /* 00361 - Steve Barrett - Adv Fruit Machine Sim.sndh */
+TIMEDB_ENTRY( 9fe1c921, 7, 145, YM), /* 00361 - Steve Barrett - Adv Fruit Machine Sim.sndh */
+TIMEDB_ENTRY( 9fe1c921, 8, 265, YM), /* 00361 - Steve Barrett - Adv Fruit Machine Sim.sndh */
+TIMEDB_ENTRY( 9fe29d4d, 0, 12031, YM), /* 03022 - DUBMOOD ET GOTO80 - DBUG MENU 197.sndh */
+TIMEDB_ENTRY( 9ffd1026, 0, 8057, YM+TA+TB+TD), /* 00191 - 505 - Space.sndh */
+TIMEDB_ENTRY( a008ebcd, 0, 5799, YM+TA+TB+TD), /* 03519 - D-Force - Time Ticking By.sndh */
+TIMEDB_ENTRY( a00a62ab, 0, 8636, YM), /* 00546 - Allister Brimble - 1st Division Manager.sndh */
+TIMEDB_ENTRY( a00a62ab, 1, 76, YM), /* 00546 - Allister Brimble - 1st Division Manager.sndh */
+TIMEDB_ENTRY( a00a62ab, 2, 291, YM), /* 00546 - Allister Brimble - 1st Division Manager.sndh */
+TIMEDB_ENTRY( a00a62ab, 3, 128, YM), /* 00546 - Allister Brimble - 1st Division Manager.sndh */
+TIMEDB_ENTRY( a00a62ab, 4, 371, YM), /* 00546 - Allister Brimble - 1st Division Manager.sndh */
+TIMEDB_ENTRY( a00a62ab, 5, 636, YM), /* 00546 - Allister Brimble - 1st Division Manager.sndh */
+TIMEDB_ENTRY( a00a62ab, 6, 283, YM), /* 00546 - Allister Brimble - 1st Division Manager.sndh */
+TIMEDB_ENTRY( a00a62ab, 7, 283, YM), /* 00546 - Allister Brimble - 1st Division Manager.sndh */
+TIMEDB_ENTRY( a014ee7d, 0, 7447, YM), /* 00127 - David Whittaker - The Real Ghostbusters.sndh */
+TIMEDB_ENTRY( a014ee7d, 1, 38, YM), /* 00127 - David Whittaker - The Real Ghostbusters.sndh */
+TIMEDB_ENTRY( a014ee7d, 2, 123, YM), /* 00127 - David Whittaker - The Real Ghostbusters.sndh */
+TIMEDB_ENTRY( a014ee7d, 3, 303, YM), /* 00127 - David Whittaker - The Real Ghostbusters.sndh */
+TIMEDB_ENTRY( a02678df, 0, 60994, YM+TA), /* 04556 - Simon O - Bangkok Knights Loader.sndh */
+TIMEDB_ENTRY( a0308e31, 0, 8930, YM), /* 00109 - David Whittaker - Ironlord.sndh */
+TIMEDB_ENTRY( a0308e31, 1, 5071, YM), /* 00109 - David Whittaker - Ironlord.sndh */
+TIMEDB_ENTRY( a0308e31, 2, 7606, YM), /* 00109 - David Whittaker - Ironlord.sndh */
+TIMEDB_ENTRY( a0390153, 0, 5372, YM+TA+TB+TD), /* 03521 - D-Force - FUN - STNICCC.sndh */
+TIMEDB_ENTRY( a03c807c, 0, 4608, YM), /* 01159 - Tyan - Some Sleep.sndh */
+TIMEDB_ENTRY( a0583f2f, 0, 16896, YM+TA+TB+TD), /* 02594 - STU - GRAVE DISCO.sndh */
+TIMEDB_ENTRY( a0689dfd, 0, 889, YM+TD), /* 01958 - MSG - Godpey - Intro.sndh */
+TIMEDB_ENTRY( a07ef087, 0, 95684, YM+TA), /* 03703 - Sparky - Badd Boy - Lode Runner Forever.sndh */
+TIMEDB_ENTRY( a09bee55, 0, 27508, YM+TA), /* 03744 - Tufty - C64 Caz.sndh */
+TIMEDB_ENTRY( a0a62086, 0, 26624, YM), /* 04458 - Charles Callet - Bob Morane - Jungle.sndh */
+TIMEDB_ENTRY( a0a62086, 1, 3537, YM), /* 04458 - Charles Callet - Bob Morane - Jungle.sndh */
+TIMEDB_ENTRY( a0ab174b, 0, 54502, YM+TA), /* 03833 - Charles Callet - Advantage Tennis.sndh */
+TIMEDB_ENTRY( a0ab174b, 1, 191166, YM+TA), /* 03833 - Charles Callet - Advantage Tennis.sndh */
+TIMEDB_ENTRY( a0ab174b, 2, 85210, YM+TA), /* 03833 - Charles Callet - Advantage Tennis.sndh */
+TIMEDB_ENTRY( a0ae25f0, 0, 9409, YM+TA+TD), /* 04202 - Tao - Cream - Nostalgic-O-Demo Main Menu (2 Sid Voice).sndh */
+TIMEDB_ENTRY( a0afd16f, 0, 11279, YM), /* 02284 - Tao - Cream - Ride The Sky (Just Buggin).sndh */
+TIMEDB_ENTRY( a0c219dd, 0, 312206, YM+TA), /* 03794 - Jim Smelley & Steve Schrade - Disciples of Steel.sndh */
+TIMEDB_ENTRY( a0c8ef8f, 0, 10464, YM), /* 02152 - Mad Max - Ooh Crikey - Ashtray.sndh */
+TIMEDB_ENTRY( a0df0320, 0, 6306, YM), /* 03027 - Alice Amore - AULD LANG SYNE, arr.by A.Amore.sndh */
+TIMEDB_ENTRY( a0e5eff7, 0, 4254, YM), /* 04343 - Nexus 6 - Ga!.sndh */
+TIMEDB_ENTRY( a0e9f82d, 0, 46810, YM+TA), /* 04360 - X The Beermat - Night.sndh */
+TIMEDB_ENTRY( a0f1e6ed, 0, 103897, YM+TA), /* 03790 - Roggie - Disk Mag.sndh */
+TIMEDB_ENTRY( a1159697, 0, 5584, YM), /* 01929 - The Mind - Repatriated Nucleus.sndh */
+TIMEDB_ENTRY( a129df5f, 0, 29532, YM+TB+TD), /* 03855 - YERZMYEY-AY-RIDERS - *WAKE UP!* YERZ.sndh */
+TIMEDB_ENTRY( a136bb47, 0, 5119, YM+TA+TB), /* 02703 - Dubmood - Speedloader I.sndh */
+TIMEDB_ENTRY( a17c886e, 0, 5375, YM+TA+TB+TD), /* 01016 - DMA-SC - UCM 16 Intro.sndh */
+TIMEDB_ENTRY( a184cbea, 0, 2125, YM+TA+TB+TD), /* 03695 - Per Almered (XiA) 2009 - Injector.sndh */
+TIMEDB_ENTRY( a1a6ba29, 0, 2560, YM), /* 00968 - Mike Davies - UN Squadron.sndh */
+TIMEDB_ENTRY( a1a6ba29, 1, 864, YM), /* 00968 - Mike Davies - UN Squadron.sndh */
+TIMEDB_ENTRY( a1a6ba29, 2, 3456, YM), /* 00968 - Mike Davies - UN Squadron.sndh */
+TIMEDB_ENTRY( a1af75f3, 0, 12, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 1, 57, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 2, 60, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 3, 138, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 4, 48, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 5, 876, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 6, 66, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 7, 165, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 8, 240, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 9, 81, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 10, 18, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 11, 6, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 12, 180, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 13, 117, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 14, 240, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 15, 21, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 16, 36, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 17, 39, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 18, 30, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 19, 240, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 20, 12, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 21, 6, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 22, 12, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 23, 150, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 24, 519, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 25, 72, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 26, 33, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 27, 12, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 28, 18, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 29, 39, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 30, 234, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 31, 48, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 32, 180, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 33, 45, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 34, 33, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 35, 18, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 36, 60, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 37, 39, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 38, 21, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 39, 9, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 40, 799, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 41, 12, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 42, 359, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 43, 39, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 44, 27, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 45, 436, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 46, 18, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 47, 9, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 49, 18, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 50, 39, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 51, 208, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 52, 405, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 53, 117, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 54, 172, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 55, 36, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 56, 222, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 57, 387, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 58, 972, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 59, 30, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 60, 354, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 61, 156, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1af75f3, 62, 376, YM), /* 04740 - Barry Murray - Manhunter - New York.sndh */
+TIMEDB_ENTRY( a1c3c7cd, 0, 639, YM), /* 04087 - Gary Wheaton - Pacman.sndh */
+TIMEDB_ENTRY( a1cd2fe3, 0, 3072, YM), /* 03252 - T1000 - The Bits Club 32.sndh */
+TIMEDB_ENTRY( a1d04ddb, 0, 3590, YM), /* 04503 - Geoff Camp - Brain food - Letters.sndh */
+TIMEDB_ENTRY( a1d04ddb, 1, 3400, YM), /* 04503 - Geoff Camp - Brain food - Letters.sndh */
+TIMEDB_ENTRY( a1d04ddb, 2, 3316, YM), /* 04503 - Geoff Camp - Brain food - Letters.sndh */
+TIMEDB_ENTRY( a1d04ddb, 3, 4228, YM), /* 04503 - Geoff Camp - Brain food - Letters.sndh */
+TIMEDB_ENTRY( a1d04ddb, 4, 2800, YM), /* 04503 - Geoff Camp - Brain food - Letters.sndh */
+TIMEDB_ENTRY( a1d04ddb, 5, 3345, YM), /* 04503 - Geoff Camp - Brain food - Letters.sndh */
+TIMEDB_ENTRY( a1d04ddb, 6, 3480, YM), /* 04503 - Geoff Camp - Brain food - Letters.sndh */
+TIMEDB_ENTRY( a1d04ddb, 7, 3893, YM), /* 04503 - Geoff Camp - Brain food - Letters.sndh */
+TIMEDB_ENTRY( a1d04ddb, 8, 576, YM), /* 04503 - Geoff Camp - Brain food - Letters.sndh */
+TIMEDB_ENTRY( a1d04ddb, 9, 1141, YM), /* 04503 - Geoff Camp - Brain food - Letters.sndh */
+TIMEDB_ENTRY( a1e592e4, 0, 17684, YM+TA+TB+TD), /* 02625 - STU - YMETAL.sndh */
+TIMEDB_ENTRY( a1e8f58b, 0, 6144, YM), /* 00268 - Antichrist - Verity.sndh */
+TIMEDB_ENTRY( a205e610, 0, 92, YM), /* 03929 - Unknown - Sound 3.sndh */
+TIMEDB_ENTRY( a20ed582, 0, 8658, YM), /* 04144 - Unknown - Alture.sndh */
+TIMEDB_ENTRY( a21825a8, 0, 71723, YM+TA), /* 04048 - Roggie - STC End.sndh */
+TIMEDB_ENTRY( a21c1160, 0, 6647, YM), /* 01924 - The Mind - Genesys Remix - Dynamika.sndh */
+TIMEDB_ENTRY( a2408d27, 0, 1600, YM), /* 00610 - Chrispy Noodle - Chrispy Noodle 1.sndh */
+TIMEDB_ENTRY( a24ee054, 0, 14480, YM+TA+TB+TD), /* 03883 - LSL - Morphonic Lab XI.sndh */
+TIMEDB_ENTRY( a259b297, 0, 2560, YM), /* 01921 - The Mind - Phaleon - Aenigmatica.sndh */
+TIMEDB_ENTRY( a2658ad7, 0, 4608, YM+TA+TB+TD), /* 02583 - STU - CRAPTRO.sndh */
+TIMEDB_ENTRY( a27fabe6, 0, 9215, YM+TA+TB+TD), /* 02489 - gwEm (Hubbard conversion) - Disco Snax.sndh */
+TIMEDB_ENTRY( a295d8c3, 0, 14976, YM+TA+TB+TD), /* 01604 - Nemo - Real Arcade.sndh */
+TIMEDB_ENTRY( a2b87858, 0, 205, YM), /* 02916 - Richard Joseph - Magic Pockets.sndh */
+TIMEDB_ENTRY( a2bc8307, 0, 21520, YM+TA+TD), /* 03051 - STU - DROPDABOMB - Chillout.sndh */
+TIMEDB_ENTRY( a2d97155, 0, 35840, YM+TA), /* 02588 - STU - DEAD HACKER.sndh */
+TIMEDB_ENTRY( a2e23f33, 0, 6200, YM+TA+TD), /* 04775 - dhor-mec - hurry harry, hurry.sndh */
+TIMEDB_ENTRY( a2f94f3d, 0, 1440, YM), /* 01250 - Janko Mrsic Flogel - Warzone.sndh */
+TIMEDB_ENTRY( a31ddc78, 0, 15559, YM+TA+TD), /* 03859 - tomchi noextra - MUDA.sndh */
+TIMEDB_ENTRY( a32f7822, 0, 5632, YM+TA), /* 00262 - Antichrist - Slow.sndh */
+TIMEDB_ENTRY( a34a0911, 0, 14469, YM), /* 03030 - Ric Clayton - That's The Way (Led Zepplin).sndh */
+TIMEDB_ENTRY( a363e0cc, 0, 4320, YM+TA+TB+TD), /* 03001 - 505-paradox - Thing.sndh */
+TIMEDB_ENTRY( a3739bfc, 0, 7104, YM), /* 00781 - Crawdaddy - Chinese heroes.sndh */
+TIMEDB_ENTRY( a39fc801, 0, 1921, YM), /* 02292 - Tao - Cream - A-t-'s Rendermachine.sndh */
+TIMEDB_ENTRY( a3c4adf4, 0, 7202, YM), /* 01048 - Dr Beat - NTM - Dynamic Duo.sndh */
+TIMEDB_ENTRY( a3c69210, 0, 7035, YM+TA+TB+TD), /* 00281 - Baggio - Rape Me.sndh */
+TIMEDB_ENTRY( a3dac9cf, 0, 13442, YM), /* 01044 - Dr Beat - Galtan 6 - Elite Intro.sndh */
+TIMEDB_ENTRY( a3f7a518, 0, 2304, YM+TA), /* 00261 - Antichrist - Sandra's Land.sndh */
+TIMEDB_ENTRY( a4027d15, 0, 4100, YM+TA+TB+TD), /* 03156 - Starbuck-Code Monkz - maxYMum Time Pressure.sndh */
+TIMEDB_ENTRY( a404d61f, 0, 5142, YM), /* 01217 - Energizer - Lazer.sndh */
+TIMEDB_ENTRY( a41968fa, 0, 1919, YM), /* 01289 - Matt Furniss - Badlands.sndh */
+TIMEDB_ENTRY( a41968fa, 1, 1920, YM), /* 01289 - Matt Furniss - Badlands.sndh */
+TIMEDB_ENTRY( a41968fa, 2, 5760, YM), /* 01289 - Matt Furniss - Badlands.sndh */
+TIMEDB_ENTRY( a425d896, 0, 768, YM), /* 01151 - Tyan - Revolution - Piep Piep Piep.sndh */
+TIMEDB_ENTRY( a428f37f, 0, 17920, YM+TA+TB+TD), /* 03362 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( a42a477d, 0, 12288, YM), /* 01459 - STU - BOMBERMAN.sndh */
+TIMEDB_ENTRY( a434d439, 0, 21504, YM+TD), /* 02612 - STU - RACE PART TWO.sndh */
+TIMEDB_ENTRY( a4497ccf, 0, 12, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 1, 99, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 2, 57, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 3, 60, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 4, 36, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 5, 12, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 6, 84, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 7, 297, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 8, 36, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 9, 6, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 10, 6, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 11, 129, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 12, 135, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 13, 15, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 14, 48, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 15, 57, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 16, 201, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 17, 12, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 18, 117, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 19, 6, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 20, 117, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 21, 240, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 22, 33, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 23, 81, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 24, 30, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 25, 180, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 26, 45, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 27, 27, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 28, 186, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 29, 9, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 30, 9, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 31, 9, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 32, 21, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 33, 180, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 34, 18, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 35, 27, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 36, 138, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 37, 360, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 38, 21, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 39, 42, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 40, 42, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 41, 18, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 42, 114, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 43, 108, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 44, 144, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 45, 240, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 46, 234, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 47, 54, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 48, 105, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 49, 30, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 50, 84, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 51, 357, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 52, 18, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 53, 129, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 54, 117, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 55, 66, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 56, 27, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 57, 12, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 58, 45, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 59, 15, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 60, 663, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 61, 180, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a4497ccf, 62, 15, YM), /* 04743 - Barry Murray - Manhunter II - San Francisco - A.sndh */
+TIMEDB_ENTRY( a44cae7f, 0, 12985, YM+TA+TB+TD), /* 01601 - Nemo - Pirate Sunset.sndh */
+TIMEDB_ENTRY( a4672f98, 0, 2304, YM+TA), /* 00471 - Viking - North.sndh */
+TIMEDB_ENTRY( a46c1730, 0, 2816, YM), /* 01397 - Paul Shields - Tetraquest.sndh */
+TIMEDB_ENTRY( a46c1730, 1, 25088, YM), /* 01397 - Paul Shields - Tetraquest.sndh */
+TIMEDB_ENTRY( a46c1730, 2, 6272, YM), /* 01397 - Paul Shields - Tetraquest.sndh */
+TIMEDB_ENTRY( a46c1730, 3, 150, YM), /* 01397 - Paul Shields - Tetraquest.sndh */
+TIMEDB_ENTRY( a46c1730, 4, 149, YM), /* 01397 - Paul Shields - Tetraquest.sndh */
+TIMEDB_ENTRY( a484459b, 0, 12110, YM+TA+TD), /* 02685 - Donald Fakk - Spanking.sndh */
+TIMEDB_ENTRY( a484c828, 0, 12289, YM), /* 00386 - Wally Beben aka Hagar - Hyperdrome.sndh */
+TIMEDB_ENTRY( a484c828, 1, 622, YM), /* 00386 - Wally Beben aka Hagar - Hyperdrome.sndh */
+TIMEDB_ENTRY( a4880e66, 0, 5435, YM+TA+TB+TD), /* 00984 - D-Force - Some How.sndh */
+TIMEDB_ENTRY( a498b5bd, 0, 6906, YM+TA+TB+TD), /* 02756 - Dma-Sc - Sector One - Burton Tribute Project.sndh */
+TIMEDB_ENTRY( a49eb8c8, 0, 90046, YM+TA), /* 04038 - Roggie - Roggie 20.sndh */
+TIMEDB_ENTRY( a4a0c69d, 0, 2969, YM), /* 03055 - Ed Bogas - Latin.sndh */
+TIMEDB_ENTRY( a4be8bf8, 0, 2630, YM), /* 03171 - n-a - Theme From "Star Trek".sndh */
+TIMEDB_ENTRY( a4c88cba, 0, 6144, YM), /* 01543 - Ralph - Ralph 6.sndh */
+TIMEDB_ENTRY( a4cfbfa7, 0, 2041, YM), /* 03691 - Dma-Sc - Saboteur 3 - The Mummy Rises.sndh */
+TIMEDB_ENTRY( a4d22f03, 0, 14592, YM+TA+TB+TD), /* 01105 - Timbral - Before The Raw.sndh */
+TIMEDB_ENTRY( a4e339a3, 0, 2970, YM), /* 04597 - Rude Kid - Fergus.sndh */
+TIMEDB_ENTRY( a4f1a7f7, 0, 4986, YM+TA+TB+TD), /* 04254 - 505-Checkpoint - dudelich.sndh */
+TIMEDB_ENTRY( a509c3dc, 0, 512, YM), /* 04545 - Magnus Adolphzon - Groggy balldric.sndh */
+TIMEDB_ENTRY( a509c3dc, 1, 320, YM), /* 04545 - Magnus Adolphzon - Groggy balldric.sndh */
+TIMEDB_ENTRY( a50f1db7, 0, 3269, YM+TA+TB+TD), /* 04300 - 505-checkpoint - Reaching.sndh */
+TIMEDB_ENTRY( a512f2d6, 0, 3450, YM), /* 03077 - Tom Marvin - THUNDERER J.P.Sousa.sndh */
+TIMEDB_ENTRY( a51df7b2, 0, 11520, YM), /* 00337 - Paul Tonge - Bloody Money.sndh */
+TIMEDB_ENTRY( a529bfa1, 0, 6844, YM), /* 03104 - n-a - Children's Corner # 6.sndh */
+TIMEDB_ENTRY( a5407018, 0, 7691, YM), /* 02125 - Mad Max - Cuddly Demos - Reset.sndh */
+TIMEDB_ENTRY( a5596fe4, 0, 10746, YM+TA+TD), /* 01369 - Scavenger - Wicked Polygons.sndh */
+TIMEDB_ENTRY( a55d69b8, 0, 25977, YM), /* 01681 - Jess - Cubase VS Notator.sndh */
+TIMEDB_ENTRY( a55fe2d6, 0, 5236, YM), /* 03109 - n-a - The Imperial Death March.sndh */
+TIMEDB_ENTRY( a562de36, 0, 15344, YM+TA), /* 04128 - Tao - Wide Awake - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( a573e77b, 0, 23809, YM+TA+TD), /* 02293 - Tao - Cream - Alive (Birth, part 2 - Alive 1).sndh */
+TIMEDB_ENTRY( a5762364, 0, 1152, YM), /* 02390 - Nexus 6 - Please Wait While Loading 1.sndh */
+TIMEDB_ENTRY( a57c8c98, 0, 2664, YM), /* 04147 - Unknown - Bumerang.sndh */
+TIMEDB_ENTRY( a57c8c98, 1, 109, YM), /* 04147 - Unknown - Bumerang.sndh */
+TIMEDB_ENTRY( a583dc63, 0, 37155, YM), /* 01317 - Matt Furniss - Shadow Worlds.sndh */
+TIMEDB_ENTRY( a59030f9, 0, 640, YM), /* 02147 - Mad Max - Mad Max Tune 2 - LSD.sndh */
+TIMEDB_ENTRY( a5914f29, 0, 25600, YM+TA+TB+TD), /* 03985 - XyNo - DARKROOMS.sndh */
+TIMEDB_ENTRY( a5a557ae, 0, 1247, YM+TA+TD), /* 02761 - H.Tanaka ST by Dma-Sc - Super Mario Land.sndh */
+TIMEDB_ENTRY( a5c011df, 0, 620, YM), /* 03973 - Geoff Camp - Maths X 2.sndh */
+TIMEDB_ENTRY( a5c011df, 1, 553, YM), /* 03973 - Geoff Camp - Maths X 2.sndh */
+TIMEDB_ENTRY( a5c011df, 2, 207, YM), /* 03973 - Geoff Camp - Maths X 2.sndh */
+TIMEDB_ENTRY( a5c011df, 3, 2708, YM), /* 03973 - Geoff Camp - Maths X 2.sndh */
+TIMEDB_ENTRY( a5c011df, 4, 1560, YM), /* 03973 - Geoff Camp - Maths X 2.sndh */
+TIMEDB_ENTRY( a5cb8483, 0, 6048, YM+TA+TB+TD), /* 02087 - Mad Max - Locomotion - Sid.sndh */
+TIMEDB_ENTRY( a5e54bdd, 0, 959, YM), /* 01525 - Iso - Gekkuhwerruk.sndh */
+TIMEDB_ENTRY( a5ea5ae4, 0, 21492, YM+TA), /* 01700 - Jess - Middle-Earth Theme.sndh */
+TIMEDB_ENTRY( a612e913, 0, 9246, YM), /* 03062 - J Green & Ed Bogas - Walker.sndh */
+TIMEDB_ENTRY( a63e3855, 0, 1920, YM), /* 02898 - Remalon - Requiem.sndh */
+TIMEDB_ENTRY( a64425df, 0, 1275, YM+STE), /* 01908 - Marcer - New Marcer - STE only.sndh */
+TIMEDB_ENTRY( a65395a6, 0, 10038, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 1, 8062, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 2, 8475, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 3, 10670, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 4, 2710, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 5, 1617, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 6, 3049, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 7, 10716, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 8, 4071, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 9, 6954, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 10, 5711, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 11, 7571, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 12, 2574, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 13, 2758, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 14, 8363, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 15, 3324, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 16, 2898, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 17, 4443, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a65395a6, 18, 6083, YM), /* 00850 - Ben Daglish - Federation of Free Traders.sndh */
+TIMEDB_ENTRY( a657eca3, 0, 635, YM+TA+TB), /* 04269 - 505-cpt^pdx - Jingle02.sndh */
+TIMEDB_ENTRY( a65934b0, 0, 9216, YM+TA), /* 01634 - Nexus - Dreamzone - Filled 3D.sndh */
+TIMEDB_ENTRY( a65d7cfa, 0, 3284, YM), /* 04069 - Gary Wheaton - Dream 10.sndh */
+TIMEDB_ENTRY( a66242ca, 0, 2905, YM), /* 03205 - Darren Ithell - Flipit & Magnose.sndh */
+TIMEDB_ENTRY( a66242ca, 1, 5120, YM), /* 03205 - Darren Ithell - Flipit & Magnose.sndh */
+TIMEDB_ENTRY( a66242ca, 2, 4000, YM), /* 03205 - Darren Ithell - Flipit & Magnose.sndh */
+TIMEDB_ENTRY( a66242ca, 3, 2327, YM), /* 03205 - Darren Ithell - Flipit & Magnose.sndh */
+TIMEDB_ENTRY( a66242ca, 4, 2176, YM), /* 03205 - Darren Ithell - Flipit & Magnose.sndh */
+TIMEDB_ENTRY( a66242ca, 5, 2953, YM), /* 03205 - Darren Ithell - Flipit & Magnose.sndh */
+TIMEDB_ENTRY( a66242ca, 6, 3741, YM), /* 03205 - Darren Ithell - Flipit & Magnose.sndh */
+TIMEDB_ENTRY( a66242ca, 7, 1505, YM), /* 03205 - Darren Ithell - Flipit & Magnose.sndh */
+TIMEDB_ENTRY( a66242ca, 8, 406, YM), /* 03205 - Darren Ithell - Flipit & Magnose.sndh */
+TIMEDB_ENTRY( a66fecfd, 0, 2594, YM), /* 04705 - Daryl Kiley - Poker Dice.sndh */
+TIMEDB_ENTRY( a66fecfd, 1, 296, YM), /* 04705 - Daryl Kiley - Poker Dice.sndh */
+TIMEDB_ENTRY( a66fecfd, 2, 2561, YM), /* 04705 - Daryl Kiley - Poker Dice.sndh */
+TIMEDB_ENTRY( a671058b, 0, 2685, YM+TA+TB+TD), /* 04314 - 505-checkpoint - Supadupa.sndh */
+TIMEDB_ENTRY( a6aa9d05, 0, 12778, YM), /* 00860 - Ben Daglish - Masters of the Universe.sndh */
+TIMEDB_ENTRY( a6aa9d05, 1, 2244, YM), /* 00860 - Ben Daglish - Masters of the Universe.sndh */
+TIMEDB_ENTRY( a6aa9d05, 2, 369, YM), /* 00860 - Ben Daglish - Masters of the Universe.sndh */
+TIMEDB_ENTRY( a6be89ed, 0, 8064, YM), /* 04195 - Rhino - Compofiller 2013.sndh */
+TIMEDB_ENTRY( a6dbffc0, 0, 1942, YM), /* 02215 - Mad Max - Spaceball.sndh */
+TIMEDB_ENTRY( a6dbffc0, 1, 1537, YM), /* 02215 - Mad Max - Spaceball.sndh */
+TIMEDB_ENTRY( a6dbffc0, 2, 769, YM), /* 02215 - Mad Max - Spaceball.sndh */
+TIMEDB_ENTRY( a6dbffc0, 3, 140, YM), /* 02215 - Mad Max - Spaceball.sndh */
+TIMEDB_ENTRY( a6dbffc0, 4, 5690, YM), /* 02215 - Mad Max - Spaceball.sndh */
+TIMEDB_ENTRY( a6e104c4, 0, 4632, YM+TB+TD), /* 02858 - Helene - STRAYKITTENS1.sndh */
+TIMEDB_ENTRY( a6ee5e2e, 0, 5447, YM), /* 02715 - Chrispy Noodle - Tiger 1.sndh */
+TIMEDB_ENTRY( a6f1c155, 0, 10752, YM+TA+TB+TD), /* 03304 - Marcer - COCO-COOOPER.sndh */
+TIMEDB_ENTRY( a6f824c6, 0, 5284, YM), /* 03129 - n-a - La Virgen de la Macarena.sndh */
+TIMEDB_ENTRY( a7151188, 0, 25080, YM), /* 01215 - Energizer - Floating - Chip.sndh */
+TIMEDB_ENTRY( a7188afa, 0, 9984, YM), /* 01821 - Lord - Ambition Menu.sndh */
+TIMEDB_ENTRY( a735aab7, 0, 2304, YM), /* 00837 - Crawdaddy - Ninja.sndh */
+TIMEDB_ENTRY( a7621359, 0, 1792, YM), /* 01196 - Excellence In Art - Oxygene 4.sndh */
+TIMEDB_ENTRY( a78239d5, 0, 5280, YM), /* 00590 - Celtic - Unknown Trial.sndh */
+TIMEDB_ENTRY( a7986dac, 0, 6144, YM+TA+TD), /* 03595 - 505-cpt^pdx - Triplex.sndh */
+TIMEDB_ENTRY( a7c6aad7, 0, 37888, YM), /* 02842 - Marcer - XMASSNOWMAN.sndh */
+TIMEDB_ENTRY( a7e7b254, 0, 2560, YM), /* 00334 - Gary Wheaton - Wilbu.sndh */
+TIMEDB_ENTRY( a8029a43, 0, 7812, YM+TA), /* 04438 - Lotus - Synth Dream 2 - Tidal Waves.sndh */
+TIMEDB_ENTRY( a807f6bd, 0, 12800, YM), /* 00144 - David Whittaker - Stormtrooper.sndh */
+TIMEDB_ENTRY( a807f6bd, 1, 5376, YM), /* 00144 - David Whittaker - Stormtrooper.sndh */
+TIMEDB_ENTRY( a807f6bd, 2, 66, YM), /* 00144 - David Whittaker - Stormtrooper.sndh */
+TIMEDB_ENTRY( a818b3bd, 0, 4384, YM), /* 03139 - n-a - Minuet in G by J.S. Bach.sndh */
+TIMEDB_ENTRY( a819a501, 0, 4606, YM+TA+TB+TD), /* 04285 - 505 - Checkpoint - Lovesong (Unrel.).sndh */
+TIMEDB_ENTRY( a81da630, 0, 2730, YM), /* 00118 - David Whittaker - Mr Heli.sndh */
+TIMEDB_ENTRY( a81da630, 1, 560, YM), /* 00118 - David Whittaker - Mr Heli.sndh */
+TIMEDB_ENTRY( a81da630, 2, 247, YM), /* 00118 - David Whittaker - Mr Heli.sndh */
+TIMEDB_ENTRY( a81da630, 3, 114, YM), /* 00118 - David Whittaker - Mr Heli.sndh */
+TIMEDB_ENTRY( a81da630, 4, 350, YM), /* 00118 - David Whittaker - Mr Heli.sndh */
+TIMEDB_ENTRY( a8226058, 0, 8448, YM), /* 01973 - MSG - MSG 03.sndh */
+TIMEDB_ENTRY( a82290ab, 0, 3583, YM+TB), /* 01857 - Lotek Style - Lip Gloss.sndh */
+TIMEDB_ENTRY( a84fdaaa, 0, 3456, YM), /* 00976 - Chris Denman - Cool World.sndh */
+TIMEDB_ENTRY( a84fdaaa, 1, 5758, YM), /* 00976 - Chris Denman - Cool World.sndh */
+TIMEDB_ENTRY( a850f552, 0, 7035, YM+TB+TD), /* 01587 - Nemo - Bambooka.sndh */
+TIMEDB_ENTRY( a852fdee, 0, 1535, YM), /* 04730 - Ralph - Coming Back After 15 Years.sndh */
+TIMEDB_ENTRY( a85b48d4, 0, 27884, YM), /* 01471 - STU - NERVOUS.sndh */
+TIMEDB_ENTRY( a85da635, 0, 3336, YM+TB+TD), /* 02712 - Marcer - SIMPLY LARRY.sndh */
+TIMEDB_ENTRY( a89eb139, 0, 12282, YM+TA+TB+TD), /* 02828 - Msg - Superfly tune 5.sndh */
+TIMEDB_ENTRY( a8a808e3, 0, 9984, YM), /* 03219 - Tomchi - Parallax.sndh */
+TIMEDB_ENTRY( a8e71704, 0, 3092, YM), /* 00870 - Ben Daglish - Rick Dangerous 2.sndh */
+TIMEDB_ENTRY( a8e71704, 1, 47, YM), /* 00870 - Ben Daglish - Rick Dangerous 2.sndh */
+TIMEDB_ENTRY( a8e71704, 2, 187, YM), /* 00870 - Ben Daglish - Rick Dangerous 2.sndh */
+TIMEDB_ENTRY( a8e71704, 3, 227, YM), /* 00870 - Ben Daglish - Rick Dangerous 2.sndh */
+TIMEDB_ENTRY( a8e71704, 5, 1593, YM), /* 00870 - Ben Daglish - Rick Dangerous 2.sndh */
+TIMEDB_ENTRY( a8e71704, 6, 1541, YM), /* 00870 - Ben Daglish - Rick Dangerous 2.sndh */
+TIMEDB_ENTRY( a8e71704, 7, 921, YM), /* 00870 - Ben Daglish - Rick Dangerous 2.sndh */
+TIMEDB_ENTRY( a8e71704, 8, 521, YM), /* 00870 - Ben Daglish - Rick Dangerous 2.sndh */
+TIMEDB_ENTRY( a8e71704, 9, 1082, YM), /* 00870 - Ben Daglish - Rick Dangerous 2.sndh */
+TIMEDB_ENTRY( a8e71704, 10, 1602, YM), /* 00870 - Ben Daglish - Rick Dangerous 2.sndh */
+TIMEDB_ENTRY( a8e800cb, 0, 7680, YM), /* 01124 - Tyan - Bad Boys.sndh */
+TIMEDB_ENTRY( a8ed8659, 0, 9862, YM), /* 00726 - Tebirod - No Cooper Plasma.sndh */
+TIMEDB_ENTRY( a9059a8e, 0, 39936, YM+TA+TB+TD), /* 03337 - Marcer - OXYGEN8 YM.sndh */
+TIMEDB_ENTRY( a90b38fe, 0, 106994, YM+TA), /* 03759 - Tufty - Rev1.sndh */
+TIMEDB_ENTRY( a93fb805, 0, 1600, YM), /* 04532 - Mike Davis - Forest Fire.sndh */
+TIMEDB_ENTRY( a9558038, 0, 41320, YM+TA+TB+TD), /* 02580 - STU - BOMBTRO.sndh */
+TIMEDB_ENTRY( a96cf208, 0, 7290, YM), /* 00970 - Demon X - Dreamzone - vectorball.sndh */
+TIMEDB_ENTRY( a981ef77, 0, 106431, YM+TA), /* 03733 - David Whittaker - Shadow of the Beast.sndh */
+TIMEDB_ENTRY( a9840451, 0, 17828, STE), /* 03448 - 505 - Paradox - Cernit Trandafir.sndh */
+TIMEDB_ENTRY( a98f4a8a, 0, 1047, YM+TD), /* 02665 - Donald Fakk - Countdown.sndh */
+TIMEDB_ENTRY( a9a4e1e2, 0, 2560, YM), /* 04604 - White Ninja - Unchanged.sndh */
+TIMEDB_ENTRY( a9a63e99, 0, 10486, YM), /* 03241 - T1000 - The Beast Club - TBC 13.sndh */
+TIMEDB_ENTRY( a9a79d0b, 0, 7199, YM+TA+TB+TD), /* 03832 - Rhino - Torment (D Newman) - Three out of Four.sndh */
+TIMEDB_ENTRY( a9bf9dca, 0, 6144, YM), /* 03254 - T1000 - The Bits Club 35.sndh */
+TIMEDB_ENTRY( a9df42c6, 0, 8736, YM), /* 01392 - Shaft - Ninja Spirit.sndh */
+TIMEDB_ENTRY( aa09bd9d, 0, 3680, YM), /* 03261 - Justin Ward - Deadland.sndh */
+TIMEDB_ENTRY( aa0c2a3a, 0, 904, YM), /* 03383 - Unknown - Ballade.sndh */
+TIMEDB_ENTRY( aa1bc80a, 0, 4096, YM), /* 02934 - Chris Denman - Discovery.sndh */
+TIMEDB_ENTRY( aa390706, 0, 10944, YM+TA+TB+TD), /* 02068 - Mad Max - Chimera - Sid.sndh */
+TIMEDB_ENTRY( aa390706, 1, 6144, YM+TA+TB+TD), /* 02068 - Mad Max - Chimera - Sid.sndh */
+TIMEDB_ENTRY( aa417285, 0, 2891, YM), /* 00095 - David Whittaker - Defender of the Crown.sndh */
+TIMEDB_ENTRY( aa417285, 1, 828, YM), /* 00095 - David Whittaker - Defender of the Crown.sndh */
+TIMEDB_ENTRY( aa417285, 2, 3840, YM), /* 00095 - David Whittaker - Defender of the Crown.sndh */
+TIMEDB_ENTRY( aa417285, 3, 3648, YM), /* 00095 - David Whittaker - Defender of the Crown.sndh */
+TIMEDB_ENTRY( aa417285, 4, 648, YM), /* 00095 - David Whittaker - Defender of the Crown.sndh */
+TIMEDB_ENTRY( aa417285, 5, 3840, YM), /* 00095 - David Whittaker - Defender of the Crown.sndh */
+TIMEDB_ENTRY( aa417285, 6, 832, YM), /* 00095 - David Whittaker - Defender of the Crown.sndh */
+TIMEDB_ENTRY( aa417285, 7, 5387, YM), /* 00095 - David Whittaker - Defender of the Crown.sndh */
+TIMEDB_ENTRY( aa45734b, 0, 4992, YM), /* 02415 - Nexus 6 - fta ma wat neues.sndh */
+TIMEDB_ENTRY( aa592647, 0, 2681, YM), /* 04092 - Gary Wheaton - The Earth dies Screaming.sndh */
+TIMEDB_ENTRY( aa6340a9, 0, 11712, YM), /* 01969 - MSG - MSG 12 - Maggie 24 Intro.sndh */
+TIMEDB_ENTRY( aa703432, 0, 4029, YM+TA+TB+TD), /* 00276 - Baggio - Demo Test.sndh */
+TIMEDB_ENTRY( aa79026a, 0, 1280, YM), /* 03544 - Dean Evans - One Step Beyond.sndh */
+TIMEDB_ENTRY( aa90541a, 0, 4351, YM+TA+TD), /* 02564 - marcer - lotus 1 title remix.sndh */
+TIMEDB_ENTRY( aa9b1cb0, 0, 3839, YM+TA+TB+TD), /* 03998 - XyNo - YS1 MINEA TOWN ST COVER.sndh */
+TIMEDB_ENTRY( aaa45375, 0, 6162, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 1, 245, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 2, 297, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 3, 331, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 4, 264, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 5, 265, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 6, 223, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 7, 200, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 8, 235, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 9, 500, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 10, 122, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 11, 56, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 12, 164, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 13, 195, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 14, 206, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 15, 203, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 16, 253, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 17, 1502, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaa45375, 18, 293, YM), /* 01291 - Matt Furniss - Botics.sndh */
+TIMEDB_ENTRY( aaacd8b9, 0, 50887, YM+TA), /* 04361 - X The Beermat - Now.sndh */
+TIMEDB_ENTRY( aab58399, 0, 6912, YM), /* 02734 - Acid - The Blue Boys - Font Menu 3.sndh */
+TIMEDB_ENTRY( aabb428f, 0, 3839, YM+TA+TB+TD), /* 03420 - Dubmood - Jesters Chipmunks.sndh */
+TIMEDB_ENTRY( aabcb0a8, 0, 1728, YM+TA+TD), /* 04267 - 505-checkpoint^paradox - idiot.sndh */
+TIMEDB_ENTRY( aaeb85e3, 0, 33024, YM+TA+TD), /* 03049 - Marcer - Elite - Traxxer 2.sndh */
+TIMEDB_ENTRY( aaf096c2, 0, 99, YM+STE), /* 03231 - Mad Max - Chambers of Shaolin - STe.sndh */
+TIMEDB_ENTRY( ab084016, 0, 398, YM), /* 03013 - Unknown - Heroes of the Lance.sndh */
+TIMEDB_ENTRY( ab1c924b, 0, 1558, YM), /* 03117 - n-a - .sndh */
+TIMEDB_ENTRY( ab25346b, 0, 23348, YM+TB+TD), /* 03340 - Marcer - TURRICANA.sndh */
+TIMEDB_ENTRY( ab2725b6, 0, 4607, YM), /* 01305 - Matt Furniss - Manchester United.sndh */
+TIMEDB_ENTRY( ab3cf2f3, 0, 9449, YM), /* 03133 - n-a - Maggie May.sndh */
+TIMEDB_ENTRY( ab412ce5, 0, 1600, YM), /* 04769 - blind io - borderline bacon.sndh */
+TIMEDB_ENTRY( ab452992, 0, 5765, YM+TA+TB+TD), /* 01153 - Tyan - Platz 2.sndh */
+TIMEDB_ENTRY( ab471e96, 0, 1792, YM), /* 01893 - Dave Lowe - Time Scanner.sndh */
+TIMEDB_ENTRY( ab471e96, 1, 1632, YM), /* 01893 - Dave Lowe - Time Scanner.sndh */
+TIMEDB_ENTRY( ab471e96, 2, 3072, YM), /* 01893 - Dave Lowe - Time Scanner.sndh */
+TIMEDB_ENTRY( ab471e96, 3, 4320, YM), /* 01893 - Dave Lowe - Time Scanner.sndh */
+TIMEDB_ENTRY( ab471e96, 4, 240, YM), /* 01893 - Dave Lowe - Time Scanner.sndh */
+TIMEDB_ENTRY( ab471e96, 5, 73, YM), /* 01893 - Dave Lowe - Time Scanner.sndh */
+TIMEDB_ENTRY( ab47a128, 0, 10481, YM+TA+TB+TD), /* 02495 - gwEm - maxYMise.sndh */
+TIMEDB_ENTRY( ab4b55ca, 0, 24073, YM+TA), /* 04674 - Unknown (orig Karsten Obarksi) - End Theme.sndh */
+TIMEDB_ENTRY( ab4fde3b, 0, 3068, YM+TA), /* 01531 - Iso - Particoloured.sndh */
+TIMEDB_ENTRY( ab59c75b, 0, 7680, YM+TB+TD), /* 03460 - Marcer - Gamet.sndh */
+TIMEDB_ENTRY( ab9f613f, 0, 9216, YM+TA+TD), /* 02348 - Tao - Cream - High Times (UCM 24).sndh */
+TIMEDB_ENTRY( abaca928, 0, 7744, YM+TA+TB+TD), /* 02873 - gwEm and Dma Sc - Chipping for Ca$h.sndh */
+TIMEDB_ENTRY( abb5b4e0, 0, 89681, YM+TA), /* 03747 - Tufty - I Feel Love - Donna Summer.sndh */
+TIMEDB_ENTRY( abb78bc7, 0, 412, YM), /* 01116 - Keith Tinman - The Untouchables.sndh */
+TIMEDB_ENTRY( abb78bc7, 1, 640, YM), /* 01116 - Keith Tinman - The Untouchables.sndh */
+TIMEDB_ENTRY( abb78bc7, 2, 189, YM), /* 01116 - Keith Tinman - The Untouchables.sndh */
+TIMEDB_ENTRY( abb78bc7, 3, 3264, YM), /* 01116 - Keith Tinman - The Untouchables.sndh */
+TIMEDB_ENTRY( abb78bc7, 4, 3264, YM), /* 01116 - Keith Tinman - The Untouchables.sndh */
+TIMEDB_ENTRY( abb78bc7, 5, 991, YM), /* 01116 - Keith Tinman - The Untouchables.sndh */
+TIMEDB_ENTRY( abb78bc7, 6, 3264, YM), /* 01116 - Keith Tinman - The Untouchables.sndh */
+TIMEDB_ENTRY( abb78bc7, 7, 978, YM), /* 01116 - Keith Tinman - The Untouchables.sndh */
+TIMEDB_ENTRY( abc94b3f, 0, 33024, YM+TA+TB+TD), /* 02906 - helene - NEWEDITT.sndh */
+TIMEDB_ENTRY( abceba69, 0, 19039, YM+TA), /* 04869 - Jovis - Speedrit.sndh */
+TIMEDB_ENTRY( abd81942, 0, 5382, YM+TA+TB), /* 00822 - !Cube - Admirable's Mod Compil #32.sndh */
+TIMEDB_ENTRY( abf5cf75, 0, 15396, YM+TB+TD), /* 03983 - XyNo - Cheeselame.sndh */
+TIMEDB_ENTRY( ac0bf2f8, 0, 378, YM), /* 01905 - Marcer - Ho Ho Ho.sndh */
+TIMEDB_ENTRY( ac3ab56c, 0, 6390, YM), /* 00364 - Steve Barrett - Kelly X.sndh */
+TIMEDB_ENTRY( ac51d303, 0, 9599, YM+TA+TB+TD), /* 02862 - Evil - Enola Gay.sndh */
+TIMEDB_ENTRY( ac542b66, 0, 3136, YM), /* 01251 - Floopy - Rapide 01.sndh */
+TIMEDB_ENTRY( ac5f527d, 0, 9915, YM), /* 00322 - Gary Wheaton - Not quite a new car.sndh */
+TIMEDB_ENTRY( ac60b1f1, 0, 5762, YM), /* 01774 - Lap - Lap 14.sndh */
+TIMEDB_ENTRY( ac68d080, 0, 12000, YM), /* 01426 - Spector - Manic Demo - Main Menu.sndh */
+TIMEDB_ENTRY( ac8da535, 0, 3433, YM), /* 03047 - Ed Bogas - Five Four.sndh */
+TIMEDB_ENTRY( ac9c9eda, 0, 1380, YM), /* 03388 - Al Lowe - Kings Quest 2.sndh */
+TIMEDB_ENTRY( acac9885, 0, 9494, YM), /* 03094 - n-a - They Call It The Blues.sndh */
+TIMEDB_ENTRY( acb77857, 0, 5934, YM), /* 00567 - Jas C Brooke - Hellfire.sndh */
+TIMEDB_ENTRY( acb77857, 1, 512, YM), /* 00567 - Jas C Brooke - Hellfire.sndh */
+TIMEDB_ENTRY( acb77857, 2, 310, YM), /* 00567 - Jas C Brooke - Hellfire.sndh */
+TIMEDB_ENTRY( acbaca50, 0, 18636, YM), /* 01928 - The Mind - Malleus Mallificorum - ST News 6.1.sndh */
+TIMEDB_ENTRY( acc170ef, 0, 9471, YM+TA+TB+TD), /* 04378 - dhor-mec - Crash test.sndh */
+TIMEDB_ENTRY( acd8a58e, 0, 7098, YM), /* 01241 - Epic - 'Vixit' In His Bath.sndh */
+TIMEDB_ENTRY( ace1a20f, 0, 21882, YM), /* 01705 - Jess - The Popple's Revenge.sndh */
+TIMEDB_ENTRY( acebab64, 0, 5120, YM), /* 02138 - Mad Max - Monty On The Run - LCD.sndh */
+TIMEDB_ENTRY( acf02a6f, 0, 7118, YM), /* 01805 - Barry Leitch - Silkworm.sndh */
+TIMEDB_ENTRY( ad149c96, 0, 4992, YM+TA), /* 02314 - Tao - Cream (orig. Klaus Ude) - Lin Wu's Challenge 1.sndh */
+TIMEDB_ENTRY( ad31113e, 0, 360, YM+TA), /* 01716 - Jess - The Music Bootsector (remix).sndh */
+TIMEDB_ENTRY( ad55b3f3, 0, 14512, YM+TA+TD), /* 02680 - Donald Fakk - Earth is Rotten.sndh */
+TIMEDB_ENTRY( ad56e774, 0, 25296, YM+TA+TB+TD), /* 02908 - Helene - sndh4Christian.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 0, 15359, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 1, 14669, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 2, 18506, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 3, 16516, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 4, 16225, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 5, 10355, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 6, 12799, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 7, 13395, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 8, 27613, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 9, 10127, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 10, 18567, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad5bbfb5, 11, 18019, YM), /* 03536 - Jean Baudlot - Cruise For A Corpse.sndh */
+TIMEDB_ENTRY( ad6f982d, 0, 5120, YM+TA+TD), /* 03447 - 505 - Checkpoint - Humming.sndh */
+TIMEDB_ENTRY( ada9d399, 0, 6395, YM+TA+TD), /* 02422 - 505-cpt^dox - gloomy.sndh */
+TIMEDB_ENTRY( adc8f88c, 0, 2304, YM), /* 00120 - David Whittaker - Nitro Boost Challenge.sndh */
+TIMEDB_ENTRY( adc8f88c, 1, 129, YM), /* 00120 - David Whittaker - Nitro Boost Challenge.sndh */
+TIMEDB_ENTRY( adc8f88c, 2, 129, YM), /* 00120 - David Whittaker - Nitro Boost Challenge.sndh */
+TIMEDB_ENTRY( adccd12a, 0, 13446, YM+TA+TD), /* 02343 - Tao - Cream - Spontex (UCM 17).sndh */
+TIMEDB_ENTRY( add5b0f9, 0, 6912, YM), /* 00161 - Martin Walker - 9 Lives.sndh */
+TIMEDB_ENTRY( ade32b57, 0, 2237, YM), /* 01529 - Iso - Instinctively.sndh */
+TIMEDB_ENTRY( adfc67fe, 0, 38400, YM+TA+TB+TD), /* 03897 - Pinokio - Bzdet.sndh */
+TIMEDB_ENTRY( ae0cc76a, 0, 9920, YM), /* 01185 - Excellence In Art - Hit Me.sndh */
+TIMEDB_ENTRY( ae3726d1, 0, 103425, YM+TA), /* 03963 - Scott Lemmon - Thrash 5.sndh */
+TIMEDB_ENTRY( ae3bdef7, 0, 9471, YM), /* 01759 - Lap - Phaleon - Dungeon.sndh */
+TIMEDB_ENTRY( ae505cee, 0, 3840, YM), /* 02112 - Mad Max - Noisy Pillars.sndh */
+TIMEDB_ENTRY( ae668413, 0, 3072, YM), /* 01085 - Techno - Dentro 1.sndh */
+TIMEDB_ENTRY( ae732abc, 0, 19008, YM), /* 02212 - Mad Max - Rings Of Medusa.sndh */
+TIMEDB_ENTRY( ae732abc, 1, 4800, YM), /* 02212 - Mad Max - Rings Of Medusa.sndh */
+TIMEDB_ENTRY( ae7b8d79, 0, 2688, YM), /* 01169 - Sally - Stax 53 - Tune 1.sndh */
+TIMEDB_ENTRY( ae8e4d6b, 0, 3584, YM), /* 00563 - Jas C Brooke - 1943.sndh */
+TIMEDB_ENTRY( aef26aa2, 0, 4609, YM+TA+TB+TD), /* 03643 - 505-checkpoint - Stress.sndh */
+TIMEDB_ENTRY( af5dfc0d, 0, 12192, YM+TA+TB+TD), /* 02073 - Mad Max - Deep Strike - Sid.sndh */
+TIMEDB_ENTRY( af682d9c, 0, 431, YM), /* 00067 - David Whittaker - APB.sndh */
+TIMEDB_ENTRY( af682d9c, 1, 2155, YM), /* 00067 - David Whittaker - APB.sndh */
+TIMEDB_ENTRY( af682d9c, 2, 516, YM), /* 00067 - David Whittaker - APB.sndh */
+TIMEDB_ENTRY( af682d9c, 3, 1325, YM), /* 00067 - David Whittaker - APB.sndh */
+TIMEDB_ENTRY( af682d9c, 4, 481, YM), /* 00067 - David Whittaker - APB.sndh */
+TIMEDB_ENTRY( af682d9c, 5, 342, YM), /* 00067 - David Whittaker - APB.sndh */
+TIMEDB_ENTRY( af682d9c, 6, 248, YM), /* 00067 - David Whittaker - APB.sndh */
+TIMEDB_ENTRY( af682d9c, 7, 92, YM), /* 00067 - David Whittaker - APB.sndh */
+TIMEDB_ENTRY( af74630c, 0, 3584, YM+TA+TD), /* 02764 - Bobby Prince ST by Dma-Sc - Get Them....sndh */
+TIMEDB_ENTRY( afa96128, 0, 14472, YM+TA+TB+TD), /* 02500 - gwEm - YM303 Ruffneck.sndh */
+TIMEDB_ENTRY( afad8ead, 0, 9600, YM+TA), /* 02409 - Kanewood - Phantom Demo - Bonus A.sndh */
+TIMEDB_ENTRY( afb4a50b, 0, 13440, YM+TA), /* 04124 - Tao - Steps - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( afb80fb7, 0, 9299, YM), /* 04645 - V0yager-Lamers - Cartridge Generation.sndh */
+TIMEDB_ENTRY( afcf21dc, 0, 8315, YM+TA+TB+TD), /* 01841 - Lotek Style - Destroya.sndh */
+TIMEDB_ENTRY( afd23fc7, 0, 5754, YM+TA+TB+TD), /* 02622 - STU - TWENTY-FIVE.sndh */
+TIMEDB_ENTRY( afd55952, 0, 4214, YM), /* 03069 - Chris French - Silent Night.sndh */
+TIMEDB_ENTRY( aff68460, 0, 16384, YM+TA), /* 04412 - Lotus - Wall PD.sndh */
+TIMEDB_ENTRY( affb8647, 0, 11648, YM+TA+TD), /* 02263 - Tao - Cream - Rise (Steps).sndh */
+TIMEDB_ENTRY( b002fd49, 0, 236193, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b002fd49, 1, 90818, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b002fd49, 2, 132258, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b002fd49, 3, 459791, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b002fd49, 4, 174754, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b002fd49, 5, 321223, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b002fd49, 6, 22748, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b002fd49, 7, 31778, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b002fd49, 8, 47300, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b002fd49, 9, 11525, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b002fd49, 10, 163326, YM+TA), /* 03788 - The Phantom - Insignificant Demo - Quartet.sndh */
+TIMEDB_ENTRY( b014305f, 0, 58354, YM+TA), /* 04559 - Simon O - Gremlin Music Demo.sndh */
+TIMEDB_ENTRY( b01a35e5, 0, 6405, YM), /* 00227 - ACC - City Road.sndh */
+TIMEDB_ENTRY( b0461eba, 0, 10799, YM), /* 03858 - !Cube - Renaissance.sndh */
+TIMEDB_ENTRY( b04f5361, 0, 64727, YM), /* 01811 - Barry Leitch - Utopia.sndh */
+TIMEDB_ENTRY( b04f5361, 1, 63748, YM), /* 01811 - Barry Leitch - Utopia.sndh */
+TIMEDB_ENTRY( b04f5361, 2, 76035, YM), /* 01811 - Barry Leitch - Utopia.sndh */
+TIMEDB_ENTRY( b04f5361, 3, 50691, YM), /* 01811 - Barry Leitch - Utopia.sndh */
+TIMEDB_ENTRY( b052d02c, 0, 6144, YM+TD), /* 00583 - Celtic - Audial Overdrive.sndh */
+TIMEDB_ENTRY( b054596f, 0, 15103, YM), /* 03969 - DMA-SC - Circus Backstage.sndh */
+TIMEDB_ENTRY( b056712f, 0, 3456, YM+TA), /* 02892 - Kanewood - Memorial Demo.sndh */
+TIMEDB_ENTRY( b0610733, 0, 27648, YM+TD), /* 02600 - STU - THE INVASION.sndh */
+TIMEDB_ENTRY( b06a78e6, 0, 5376, YM), /* 00795 - Crawdaddy - Kruz Theme.sndh */
+TIMEDB_ENTRY( b086370c, 0, 9812, YM+TA), /* 03232 - Mad Max - Chambers of Shaolin - FM.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 0, 1344, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 1, 1536, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 2, 512, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 3, 384, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 4, 384, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 5, 384, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 6, 256, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 7, 1152, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 8, 2304, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 9, 2400, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 10, 193, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0ac4fe4, 12, 81, YM), /* 00748 - Mark Cooksey - Mighty Bombjack.sndh */
+TIMEDB_ENTRY( b0c2fb90, 0, 6736, YM+TA+TB+TD), /* 03371 - STU - ICE CREAM DREAM.sndh */
+TIMEDB_ENTRY( b0df1620, 0, 4600, YM+TA), /* 04763 - Ferox - State of Mind - Tuesday.sndh */
+TIMEDB_ENTRY( b10c4711, 0, 1729, YM+TB), /* 03473 - gwEm - Real Friends.sndh */
+TIMEDB_ENTRY( b10c7de8, 0, 1342, YM), /* 02462 - Iso - Buzzzzzzzing.sndh */
+TIMEDB_ENTRY( b14cd84f, 0, 3840, YM+TA+TD), /* 02323 - Tao - Cream (orig. Klaus Ude) - Magic Marble ingame 2.sndh */
+TIMEDB_ENTRY( b14f0777, 0, 9216, YM), /* 02163 - Mad Max - Syntax Terror - TEX.sndh */
+TIMEDB_ENTRY( b158b1e4, 0, 11454, YM+TA), /* 01524 - Iso - Fun!!!.sndh */
+TIMEDB_ENTRY( b159c8f7, 0, 13439, STE), /* 03381 - Gargamel - DHS - Tyranny.sndh */
+TIMEDB_ENTRY( b15ea782, 0, 87922, YM+TA), /* 03758 - Tufty - Paradise - Sade.sndh */
+TIMEDB_ENTRY( b16a8bc3, 0, 39936, YM), /* 01454 - Stax - Wild.sndh */
+TIMEDB_ENTRY( b17f1c81, 0, 10560, YM+TD), /* 01985 - Jochen Hippel - "2".sndh */
+TIMEDB_ENTRY( b1819cf9, 0, 1292, YM), /* 00010 - 4-Mat - Beastbusters.sndh */
+TIMEDB_ENTRY( b1819cf9, 1, 378, YM), /* 00010 - 4-Mat - Beastbusters.sndh */
+TIMEDB_ENTRY( b1819cf9, 2, 481, YM), /* 00010 - 4-Mat - Beastbusters.sndh */
+TIMEDB_ENTRY( b1819cf9, 3, 1292, YM), /* 00010 - 4-Mat - Beastbusters.sndh */
+TIMEDB_ENTRY( b188dadd, 0, 71343, YM+TA), /* 03823 - Spaz - Mindbomb - Digi Synth.sndh */
+TIMEDB_ENTRY( b188dadd, 1, 33810, YM+TA), /* 03823 - Spaz - Mindbomb - Digi Synth.sndh */
+TIMEDB_ENTRY( b188dadd, 2, 95175, YM+TA), /* 03823 - Spaz - Mindbomb - Digi Synth.sndh */
+TIMEDB_ENTRY( b188dadd, 3, 33281, YM+TA), /* 03823 - Spaz - Mindbomb - Digi Synth.sndh */
+TIMEDB_ENTRY( b188dadd, 4, 153482, YM+TA), /* 03823 - Spaz - Mindbomb - Digi Synth.sndh */
+TIMEDB_ENTRY( b188dadd, 5, 31630, YM+TA), /* 03823 - Spaz - Mindbomb - Digi Synth.sndh */
+TIMEDB_ENTRY( b192764f, 0, 5672, YM), /* 02238 - Tao - Cream (orig. Rob Hubbard) - Flash Gordon (Stmygm).sndh */
+TIMEDB_ENTRY( b198ba4a, 0, 184885, YM+TA), /* 03786 - Nexus 6 - Rising 2.sndh */
+TIMEDB_ENTRY( b1acc0eb, 0, 13056, YM), /* 01643 - Jedi - Digital.sndh */
+TIMEDB_ENTRY( b1b25226, 0, 1824, YM+STE), /* 01212 - Elof - Farvalse - STE only.sndh */
+TIMEDB_ENTRY( b1b755b4, 0, 16320, YM+TA), /* 04199 - Furax - Equinox & Hemoroids - Virtual Escape Theme (enhanced version).sndh */
+TIMEDB_ENTRY( b1c1bfaf, 0, 7675, YM+TB+TD), /* 01871 - Lotek Style - Space Pirate.sndh */
+TIMEDB_ENTRY( b1f6ff32, 0, 48603, YM+TA), /* 03741 - Tufty - Aces High (orig Romeo Knight).sndh */
+TIMEDB_ENTRY( b202b6c6, 0, 2881, YM), /* 02142 - Mad Max - Commando High - LSD.sndh */
+TIMEDB_ENTRY( b22e35a0, 0, 83269, YM+TA), /* 04053 - Roggie - Ooooer my digits fell off.sndh */
+TIMEDB_ENTRY( b24bc173, 0, 20352, YM), /* 02107 - Mad Max - Alloy Run.sndh */
+TIMEDB_ENTRY( b24bc173, 1, 2304, YM), /* 02107 - Mad Max - Alloy Run.sndh */
+TIMEDB_ENTRY( b2810651, 0, 504, YM), /* 03680 - Dma-Sc - Antiques - Loader 1.sndh */
+TIMEDB_ENTRY( b282048d, 0, 9856, YM), /* 01161 - Tyan - STAX Hat keinen Plan.sndh */
+TIMEDB_ENTRY( b28d3b2f, 0, 3465, YM), /* 00321 - Gary Wheaton - Mystic.sndh */
+TIMEDB_ENTRY( b29116e1, 0, 8832, YM), /* 01220 - ENS Music - ENS 3.sndh */
+TIMEDB_ENTRY( b2a8d219, 0, 99085, YM+TA), /* 04054 - Roggie - Give me the rice pudding.sndh */
+TIMEDB_ENTRY( b2ac6c99, 0, 6656, YM), /* 00730 - Kevin Collier - Advanced Tactical Fighter 2.sndh */
+TIMEDB_ENTRY( b2b75a57, 0, 12096, YM), /* 00119 - David Whittaker - Ninja Mission.sndh */
+TIMEDB_ENTRY( b2c0ab4c, 0, 14777, YM+TA+TD), /* 00232 - Acid - Blue Boys Stuff 11.sndh */
+TIMEDB_ENTRY( b2c91b33, 0, 9216, YM), /* 01488 - Holger Gehrmann - Terra Nova.sndh */
+TIMEDB_ENTRY( b2cf58e8, 0, 2065, YM+TA), /* 04662 - Dave Lowe - Carrier Command.sndh */
+TIMEDB_ENTRY( b2d356bc, 0, 105073, YM), /* 04527 - Jim Cuomo - Expressing.sndh */
+TIMEDB_ENTRY( b2fd791e, 0, 39914, YM+TA+TD), /* 02356 - Tao - Cream - Warryorz (YM Rockerz 4).sndh */
+TIMEDB_ENTRY( b3355200, 0, 14976, YM), /* 04476 - Popeye 2 - Paul Loraine.sndh */
+TIMEDB_ENTRY( b3355200, 1, 11247, YM), /* 04476 - Popeye 2 - Paul Loraine.sndh */
+TIMEDB_ENTRY( b3355200, 2, 10464, YM), /* 04476 - Popeye 2 - Paul Loraine.sndh */
+TIMEDB_ENTRY( b3355200, 3, 6480, YM), /* 04476 - Popeye 2 - Paul Loraine.sndh */
+TIMEDB_ENTRY( b33cf165, 0, 6096, YM), /* 00577 - Jas C Brooke - Thunderstrike.sndh */
+TIMEDB_ENTRY( b33cf165, 1, 175, YM), /* 00577 - Jas C Brooke - Thunderstrike.sndh */
+TIMEDB_ENTRY( b33cf165, 2, 86, YM), /* 00577 - Jas C Brooke - Thunderstrike.sndh */
+TIMEDB_ENTRY( b33cf165, 3, 59, YM), /* 00577 - Jas C Brooke - Thunderstrike.sndh */
+TIMEDB_ENTRY( b33cf165, 4, 152, YM), /* 00577 - Jas C Brooke - Thunderstrike.sndh */
+TIMEDB_ENTRY( b34bb126, 0, 3456, YM+TA+TD), /* 04270 - 505 - Kickdown.sndh */
+TIMEDB_ENTRY( b34f88d5, 0, 139347, YM+TA), /* 04625 - Michael Opel - ACIA.sndh */
+TIMEDB_ENTRY( b35c0808, 0, 10793, YM), /* 00840 - Ben Daglish - Axel's Magic Hammer.sndh */
+TIMEDB_ENTRY( b35c0808, 1, 204, YM), /* 00840 - Ben Daglish - Axel's Magic Hammer.sndh */
+TIMEDB_ENTRY( b35c0808, 2, 190, YM), /* 00840 - Ben Daglish - Axel's Magic Hammer.sndh */
+TIMEDB_ENTRY( b35c0808, 3, 255, YM), /* 00840 - Ben Daglish - Axel's Magic Hammer.sndh */
+TIMEDB_ENTRY( b35c0808, 4, 143, YM), /* 00840 - Ben Daglish - Axel's Magic Hammer.sndh */
+TIMEDB_ENTRY( b35c0808, 5, 409, YM), /* 00840 - Ben Daglish - Axel's Magic Hammer.sndh */
+TIMEDB_ENTRY( b35c0808, 6, 140, YM), /* 00840 - Ben Daglish - Axel's Magic Hammer.sndh */
+TIMEDB_ENTRY( b35c0808, 7, 228, YM), /* 00840 - Ben Daglish - Axel's Magic Hammer.sndh */
+TIMEDB_ENTRY( b35c0808, 8, 256, YM), /* 00840 - Ben Daglish - Axel's Magic Hammer.sndh */
+TIMEDB_ENTRY( b35f679a, 0, 6880, YM), /* 02388 - Nexus 6 - Oh wie sch n.sndh */
+TIMEDB_ENTRY( b3637b32, 0, 8508, YM), /* 04344 - Nexus 6 - Johnny B. (The Hooters).sndh */
+TIMEDB_ENTRY( b36ff00f, 0, 8512, YM), /* 03699 - Chris Mad - Overdrive Demo - Times.sndh */
+TIMEDB_ENTRY( b38062b5, 0, 5503, YM), /* 04079 - Gary Wheaton - A8 Menu.sndh */
+TIMEDB_ENTRY( b381de0c, 0, 6720, YM+TA), /* 00254 - Antichrist - Enigma.sndh */
+TIMEDB_ENTRY( b389ea27, 0, 4608, YM), /* 00489 - Ultimatum - Kidney Bean 5.sndh */
+TIMEDB_ENTRY( b39fb491, 0, 2304, YM+TA), /* 00419 - Big Alec - Pursuit.sndh */
+TIMEDB_ENTRY( b3a13281, 0, 3456, YM+TA), /* 02288 - Tao - Cream - Just Loadin' (Steps).sndh */
+TIMEDB_ENTRY( b3a80925, 0, 169102, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 1, 128798, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 2, 39899, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 3, 109194, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 4, 67271, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 5, 77764, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 6, 33016, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 7, 14337, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 8, 50512, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 9, 61060, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 10, 71457, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a80925, 11, 27649, YM+TA), /* 03826 - BB - TEC Demo.sndh */
+TIMEDB_ENTRY( b3a8b83c, 0, 60, YM), /* 03917 - Unknown - Falsch1.sndh */
+TIMEDB_ENTRY( b3b7342a, 0, 78546, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 1, 57411, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 2, 97083, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 3, 134953, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 4, 58272, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 5, 91705, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 6, 106551, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 7, 60886, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 8, 95858, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 9, 86124, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 10, 11332, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3b7342a, 11, 59454, YM+TA), /* 03812 - Martin Walker - Thunderhawk AH73-M Levels.sndh */
+TIMEDB_ENTRY( b3c5a7a9, 0, 15995, YM+TA+TB+TD), /* 01598 - Nemo - Matrix - UCM 19.sndh */
+TIMEDB_ENTRY( b3cf4287, 0, 28, YM), /* 04700 - Robin Edwards - Mr. Dig.sndh */
+TIMEDB_ENTRY( b3cf4287, 1, 32, YM), /* 04700 - Robin Edwards - Mr. Dig.sndh */
+TIMEDB_ENTRY( b3cf4287, 2, 39, YM), /* 04700 - Robin Edwards - Mr. Dig.sndh */
+TIMEDB_ENTRY( b3cf4287, 3, 77, YM), /* 04700 - Robin Edwards - Mr. Dig.sndh */
+TIMEDB_ENTRY( b3cf4287, 4, 36, YM), /* 04700 - Robin Edwards - Mr. Dig.sndh */
+TIMEDB_ENTRY( b3fce5fa, 0, 5376, YM+TA+TB+TD), /* 03505 - 505 - Suretrip 2 - End.sndh */
+TIMEDB_ENTRY( b405094f, 0, 5376, YM), /* 00480 - Ultimatum - Choux M.sndh */
+TIMEDB_ENTRY( b4273de8, 0, 37248, YM+TA+TB+TD), /* 02548 - cerror - Make some sense.sndh */
+TIMEDB_ENTRY( b42bb328, 0, 8064, YM+TA+TD), /* 01867 - Lotek Style - Sense.net.sndh */
+TIMEDB_ENTRY( b42f4e44, 0, 5368, YM+TA), /* 03483 - Peter Jorgensen - Boesseti.sndh */
+TIMEDB_ENTRY( b4625ffd, 0, 29185, YM+TA), /* 04357 - X The Beermat - Dunno.sndh */
+TIMEDB_ENTRY( b467d863, 0, 3097, YM), /* 03280 - Thothy - Jingle.sndh */
+TIMEDB_ENTRY( b4685082, 0, 15675, YM+TB+TD), /* 01107 - Timbral - DHS - RI Rebellion (YM Rockerz).sndh */
+TIMEDB_ENTRY( b46b9acd, 0, 4928, YM), /* 04215 - Jess - My ST suntans in Brazil (chip).sndh */
+TIMEDB_ENTRY( b46f56a9, 0, 6720, YM), /* 00957 - Dark Angel - What's Your Name.sndh */
+TIMEDB_ENTRY( b4758e21, 0, 6727, YM+TA), /* 03554 - Juri - Juriman.sndh */
+TIMEDB_ENTRY( b4987a9a, 0, 12577, YM+TA+TB+TD), /* 01828 - Lotek Style - 80 years.sndh */
+TIMEDB_ENTRY( b4ba3887, 0, 1536, YM), /* 04704 - Kay Downes - Platform Capers.sndh */
+TIMEDB_ENTRY( b4ba3887, 1, 267, YM), /* 04704 - Kay Downes - Platform Capers.sndh */
+TIMEDB_ENTRY( b4ba3887, 2, 215, YM), /* 04704 - Kay Downes - Platform Capers.sndh */
+TIMEDB_ENTRY( b4ba3887, 3, 174, YM), /* 04704 - Kay Downes - Platform Capers.sndh */
+TIMEDB_ENTRY( b4ba3887, 4, 80, YM), /* 04704 - Kay Downes - Platform Capers.sndh */
+TIMEDB_ENTRY( b4ba3887, 5, 150, YM), /* 04704 - Kay Downes - Platform Capers.sndh */
+TIMEDB_ENTRY( b4ba3887, 6, 270, YM), /* 04704 - Kay Downes - Platform Capers.sndh */
+TIMEDB_ENTRY( b4ba3887, 7, 394, YM), /* 04704 - Kay Downes - Platform Capers.sndh */
+TIMEDB_ENTRY( b4c17f79, 0, 4602, YM+TA+TB+TD), /* 02826 - Msg - Superfly tune 3.sndh */
+TIMEDB_ENTRY( b4d2b8ca, 0, 4607, YM), /* 00346 - Tony Williams - Oh No! More Lemmings.sndh */
+TIMEDB_ENTRY( b4d2b8ca, 1, 2303, YM), /* 00346 - Tony Williams - Oh No! More Lemmings.sndh */
+TIMEDB_ENTRY( b4d2b8ca, 2, 3071, YM), /* 00346 - Tony Williams - Oh No! More Lemmings.sndh */
+TIMEDB_ENTRY( b4d2b8ca, 3, 4607, YM), /* 00346 - Tony Williams - Oh No! More Lemmings.sndh */
+TIMEDB_ENTRY( b4d2b8ca, 4, 6559, YM), /* 00346 - Tony Williams - Oh No! More Lemmings.sndh */
+TIMEDB_ENTRY( b4d2b8ca, 5, 3839, YM), /* 00346 - Tony Williams - Oh No! More Lemmings.sndh */
+TIMEDB_ENTRY( b4ebda37, 0, 6239, YM), /* 02363 - Nexus 6 - Big Jelly Fish V1.sndh */
+TIMEDB_ENTRY( b4ee1085, 0, 2878, YM+TA), /* 01522 - Iso - Family Dog.sndh */
+TIMEDB_ENTRY( b506f527, 0, 8194, YM+TA), /* 04441 - Joard - Synth Dream 2 - Joardy Blitter.sndh */
+TIMEDB_ENTRY( b52e4463, 0, 83316, YM+TA), /* 03961 - Scott Lemmon - The Song.sndh */
+TIMEDB_ENTRY( b52f08db, 0, 53760, YM+TA+TB+TD), /* 02593 - STU - GHOSTRIDER.sndh */
+TIMEDB_ENTRY( b537451e, 0, 9216, YM), /* 02459 - Starbuck^Creative Mind - DHS Compo Shorty.sndh */
+TIMEDB_ENTRY( b5519818, 0, 11755, YM), /* 01583 - Outlander - Awesome 22.sndh */
+TIMEDB_ENTRY( b552a01d, 0, 262, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 1, 2, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 2, 106, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 3, 220, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 4, 147, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 5, 160, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 6, 200, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 7, 226, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 8, 164, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 9, 26, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 10, 26, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 11, 26, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 12, 26, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 13, 26, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 14, 31, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 15, 31, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 16, 31, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 17, 26, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 18, 54, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 19, 1113, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 20, 1520, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b552a01d, 21, 826, YM), /* 04680 - Ronan - Iraky.sndh */
+TIMEDB_ENTRY( b56213b1, 0, 8337, YM+TA+TB+TD), /* 00192 - 505 - Sure Trip 1.sndh */
+TIMEDB_ENTRY( b575051a, 0, 100046, YM+TA), /* 04032 - Roggie - Interludes 5-7.sndh */
+TIMEDB_ENTRY( b5928e97, 0, 5759, YM), /* 00303 - Gary Wheaton - Batman.sndh */
+TIMEDB_ENTRY( b5a3e4a1, 0, 3837, YM+TA+TB), /* 00286 - Baggio - Evolution - Xmas sux.sndh */
+TIMEDB_ENTRY( b5bc0d6d, 0, 20480, YM+TA+TB+TD), /* 02618 - STU - SPACE INTRO.sndh */
+TIMEDB_ENTRY( b5c59aa2, 0, 13434, YM+TA+TB+TD), /* 01001 - DMA-SC - Magnetic Mind.sndh */
+TIMEDB_ENTRY( b5c9b447, 0, 4096, YM+TA), /* 00798 - Crawdaddy - Legality.sndh */
+TIMEDB_ENTRY( b5f57c60, 0, 2057, YM), /* 02954 - Yann Sevin - Cool Croc Twins.sndh */
+TIMEDB_ENTRY( b5f57c60, 1, 382, YM), /* 02954 - Yann Sevin - Cool Croc Twins.sndh */
+TIMEDB_ENTRY( b5f57c60, 2, 274, YM), /* 02954 - Yann Sevin - Cool Croc Twins.sndh */
+TIMEDB_ENTRY( b5f57c60, 3, 3751, YM), /* 02954 - Yann Sevin - Cool Croc Twins.sndh */
+TIMEDB_ENTRY( b5f57c60, 4, 3751, YM), /* 02954 - Yann Sevin - Cool Croc Twins.sndh */
+TIMEDB_ENTRY( b5f57c60, 5, 3885, YM), /* 02954 - Yann Sevin - Cool Croc Twins.sndh */
+TIMEDB_ENTRY( b5f57c60, 6, 256, YM), /* 02954 - Yann Sevin - Cool Croc Twins.sndh */
+TIMEDB_ENTRY( b5f57c60, 7, 1015, YM), /* 02954 - Yann Sevin - Cool Croc Twins.sndh */
+TIMEDB_ENTRY( b6020665, 0, 4319, YM+TA+TD), /* 02976 - Forestcreature - Sorry Sorry Sorry.sndh */
+TIMEDB_ENTRY( b60b3e3d, 0, 17390, YM+TA), /* 03900 - Mad Max - MUDS.sndh */
+TIMEDB_ENTRY( b60b3e3d, 1, 2082, YM+TA), /* 03900 - Mad Max - MUDS.sndh */
+TIMEDB_ENTRY( b60b3e3d, 2, 2882, YM+TA), /* 03900 - Mad Max - MUDS.sndh */
+TIMEDB_ENTRY( b611e966, 0, 4181, YM), /* 01484 - Holger Gehrmann - Hollywood Poker.sndh */
+TIMEDB_ENTRY( b611e966, 1, 1493, YM), /* 01484 - Holger Gehrmann - Hollywood Poker.sndh */
+TIMEDB_ENTRY( b611e966, 2, 129, YM), /* 01484 - Holger Gehrmann - Hollywood Poker.sndh */
+TIMEDB_ENTRY( b611e966, 3, 89, YM), /* 01484 - Holger Gehrmann - Hollywood Poker.sndh */
+TIMEDB_ENTRY( b611e966, 4, 115, YM), /* 01484 - Holger Gehrmann - Hollywood Poker.sndh */
+TIMEDB_ENTRY( b612927e, 0, 3839, YM), /* 04647 - ActoDi - No Timer SV'14.sndh */
+TIMEDB_ENTRY( b648c266, 0, 4927, YM), /* 03621 - Dma-Sc - SV2011INTRO.sndh */
+TIMEDB_ENTRY( b64a9732, 0, 15356, YM), /* 01748 - Jovis - Lametrop - Starfield.sndh */
+TIMEDB_ENTRY( b665d7fe, 0, 16524, YM), /* 02061 - Mad Max - Wiz.sndh */
+TIMEDB_ENTRY( b665d7fe, 1, 9384, YM), /* 02061 - Mad Max - Wiz.sndh */
+TIMEDB_ENTRY( b665d7fe, 2, 302, YM), /* 02061 - Mad Max - Wiz.sndh */
+TIMEDB_ENTRY( b6780cd4, 0, 12545, YM+TA+TB+TD), /* 04109 - 505-checkpoint - hopping.sndh */
+TIMEDB_ENTRY( b6796f2e, 0, 5952, YM), /* 02662 - Dave Lowe - Turbo Outrun.sndh */
+TIMEDB_ENTRY( b6796f2e, 1, 4480, YM), /* 02662 - Dave Lowe - Turbo Outrun.sndh */
+TIMEDB_ENTRY( b6796f2e, 2, 576, YM), /* 02662 - Dave Lowe - Turbo Outrun.sndh */
+TIMEDB_ENTRY( b6796f2e, 3, 1600, YM), /* 02662 - Dave Lowe - Turbo Outrun.sndh */
+TIMEDB_ENTRY( b67fb95a, 0, 9849, YM+TA), /* 02741 - Unknown Composer - Jigsaw.sndh */
+TIMEDB_ENTRY( b69262a3, 0, 1786, YM+TA+TB), /* 04279 - 505 - Loop00.sndh */
+TIMEDB_ENTRY( b6b816bd, 0, 41601, YM+TA), /* 03754 - Tufty - NSynth.sndh */
+TIMEDB_ENTRY( b6c1f2ed, 0, 17280, YM), /* 00602 - Chris Mad - Overdrive Snurkle.sndh */
+TIMEDB_ENTRY( b6e84eda, 0, 2067, YM), /* 03042 - n-a - Calypso by Ed Bogas.sndh */
+TIMEDB_ENTRY( b6f3f526, 0, 13760, YM), /* 01790 - Barry Leitch - Combo Racer.sndh */
+TIMEDB_ENTRY( b6f4299a, 0, 53356, YM+TA), /* 03807 - Spaz - Dead Orgy 2.sndh */
+TIMEDB_ENTRY( b72736bd, 0, 38725, YM+TA+TB+TD), /* 03394 - cerror - Calculon.sndh */
+TIMEDB_ENTRY( b72839f4, 0, 13055, YM), /* 00347 - Tony Williams - Onslaught.sndh */
+TIMEDB_ENTRY( b72839f4, 1, 2559, YM), /* 00347 - Tony Williams - Onslaught.sndh */
+TIMEDB_ENTRY( b72839f4, 2, 2559, YM), /* 00347 - Tony Williams - Onslaught.sndh */
+TIMEDB_ENTRY( b72d8c60, 0, 3840, YM), /* 01224 - ENS Music - ENS 7.sndh */
+TIMEDB_ENTRY( b72d9e98, 0, 2592, YM), /* 02194 - Mad Max - Great Giana Sisters.sndh */
+TIMEDB_ENTRY( b72d9e98, 1, 192, YM), /* 02194 - Mad Max - Great Giana Sisters.sndh */
+TIMEDB_ENTRY( b72d9e98, 2, 2304, YM), /* 02194 - Mad Max - Great Giana Sisters.sndh */
+TIMEDB_ENTRY( b72d9e98, 3, 4800, YM), /* 02194 - Mad Max - Great Giana Sisters.sndh */
+TIMEDB_ENTRY( b72d9e98, 4, 3264, YM), /* 02194 - Mad Max - Great Giana Sisters.sndh */
+TIMEDB_ENTRY( b72d9e98, 5, 1152, YM), /* 02194 - Mad Max - Great Giana Sisters.sndh */
+TIMEDB_ENTRY( b72d9e98, 6, 1152, YM), /* 02194 - Mad Max - Great Giana Sisters.sndh */
+TIMEDB_ENTRY( b7465bbe, 0, 9215, YM+TA), /* 03575 - 505-paradox - Finja (STE native mode).sndh */
+TIMEDB_ENTRY( b7519b13, 0, 9216, YM), /* 01407 - Skyline - Snork - Main Menu.sndh */
+TIMEDB_ENTRY( b754c2bf, 0, 5017, YM), /* 03547 - Allister Brimble - Sky High Stuntman.sndh */
+TIMEDB_ENTRY( b7595386, 0, 1914, YM+TA), /* 01368 - Scavenger - Who cares ? (Elite Intro).sndh */
+TIMEDB_ENTRY( b75f06c7, 0, 24346, YM), /* 01699 - Jess - Super Mario Bros Family.sndh */
+TIMEDB_ENTRY( b75f8ae7, 0, 28800, YM+TA+TB+TD), /* 02083 - Mad Max - International Karate - Sid.sndh */
+TIMEDB_ENTRY( b762df58, 0, 6719, YM+TA+TB+TD), /* 04760 - Shinobi - Outgoing.sndh */
+TIMEDB_ENTRY( b76f5fb4, 0, 9849, YM+TA), /* 01694 - Jess - Lemon Squeezer's Dream.sndh */
+TIMEDB_ENTRY( b7b182ac, 0, 5160, YM+TA+TB+TD), /* 03876 - Hylst - Murdered.sndh */
+TIMEDB_ENTRY( b7b64257, 0, 8914, YM+TA), /* 04425 - Lotus - Synth Dream 2 - Big Bubble.sndh */
+TIMEDB_ENTRY( b7bb39fc, 0, 2688, YM+TA+TD), /* 02315 - Tao - Cream (orig. Klaus Ude) - Lin Wu's Challenge 2.sndh */
+TIMEDB_ENTRY( b7d0f956, 0, 6335, YM+TA+TB+TD), /* 04100 - Per Almered-XiA-Checkpoint - Smakrik (medley).sndh */
+TIMEDB_ENTRY( b7d663ab, 0, 1536, YM), /* 03272 - Chris Denman - Samurai - The Way of the Warrior.sndh */
+TIMEDB_ENTRY( b7d663ab, 1, 3072, YM), /* 03272 - Chris Denman - Samurai - The Way of the Warrior.sndh */
+TIMEDB_ENTRY( b7da1000, 0, 2616, YM), /* 00143 - David Whittaker - Starwars.sndh */
+TIMEDB_ENTRY( b7dddacd, 0, 2240, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 1, 2048, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 2, 3584, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 3, 1728, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 4, 2560, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 5, 256, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 6, 3072, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 7, 2048, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 8, 1536, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 9, 145, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 10, 3520, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 11, 218, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7dddacd, 12, 256, YM), /* 01916 - Andi McGinty - McDonald Land.sndh */
+TIMEDB_ENTRY( b7edf654, 0, 9984, YM+TA+TD), /* 02512 - Crazy Q - DHS - Snake Funk.sndh */
+TIMEDB_ENTRY( b7ef0a5a, 0, 15360, YM+TA+TB+TD), /* 02841 - Marcer - TESTING3 - unfinished.sndh */
+TIMEDB_ENTRY( b7fb8030, 0, 5628, YM+TA+TD), /* 00220 - 7AN - Blip 1.sndh */
+TIMEDB_ENTRY( b7fd73b1, 0, 43008, YM+TA+TB+TD), /* 04766 - Garvalf - n-a.sndh */
+TIMEDB_ENTRY( b7fd89a5, 0, 5891, YM+TA+TD), /* 02313 - Tao - Cream (orig. Rob Hubbard) - Jupiter Probe.sndh */
+TIMEDB_ENTRY( b80b6df6, 0, 1637, YM+TA+TB), /* 03606 - Per Almered (XiA) - Jim Parker Midsomer Theme.sndh */
+TIMEDB_ENTRY( b81434a6, 0, 128910, YM+TA), /* 03811 - Martin Walker - Thunderhawk AH-73M Title.sndh */
+TIMEDB_ENTRY( b81564c7, 0, 4558, YM), /* 01040 - Donald Fakk - Who Cares.sndh */
+TIMEDB_ENTRY( b8196d28, 0, 2855, YM), /* 01200 - Excellence In Art - Sonik.sndh */
+TIMEDB_ENTRY( b83c54a0, 0, 11808, YM), /* 00611 - Chrispy Noodle - Commando.sndh */
+TIMEDB_ENTRY( b8498af6, 0, 28608, YM+TA), /* 03636 - Mad Max - International Karate Digi.sndh */
+TIMEDB_ENTRY( b8500cbe, 0, 1599, YM+TA+TB), /* 02653 - Dma-Sc - POOZ - Mini-Games.sndh */
+TIMEDB_ENTRY( b891b124, 0, 3676, YM+TA+TB+TD), /* 04272 - 505 - Checkpoint - Kurts.sndh */
+TIMEDB_ENTRY( b894d191, 0, 2653, YM), /* 01315 - Matt Furniss - Scramble Spirits.sndh */
+TIMEDB_ENTRY( b894d191, 1, 2703, YM), /* 01315 - Matt Furniss - Scramble Spirits.sndh */
+TIMEDB_ENTRY( b894d191, 2, 602, YM), /* 01315 - Matt Furniss - Scramble Spirits.sndh */
+TIMEDB_ENTRY( b894d191, 3, 537, YM), /* 01315 - Matt Furniss - Scramble Spirits.sndh */
+TIMEDB_ENTRY( b894d191, 4, 1656, YM), /* 01315 - Matt Furniss - Scramble Spirits.sndh */
+TIMEDB_ENTRY( b8ab5f28, 0, 18436, YM), /* 00456 - Augustin Vidovic - Prime Time.sndh */
+TIMEDB_ENTRY( b8b72dd6, 0, 1337, YM+TA), /* 01935 - Miq - Miq's Acid - Na Na Ni Ni.sndh */
+TIMEDB_ENTRY( b8b8236e, 0, 8833, YM), /* 00390 - Wally Beben - Phantasm.sndh */
+TIMEDB_ENTRY( b8b8236e, 1, 2050, YM), /* 00390 - Wally Beben - Phantasm.sndh */
+TIMEDB_ENTRY( b8b8236e, 2, 1537, YM), /* 00390 - Wally Beben - Phantasm.sndh */
+TIMEDB_ENTRY( b8b8236e, 3, 13153, YM), /* 00390 - Wally Beben - Phantasm.sndh */
+TIMEDB_ENTRY( b8d715dc, 0, 2509, YM+TA), /* 02683 - Donald Fakk - Skit (Delta Remix).sndh */
+TIMEDB_ENTRY( b8dd9ce0, 0, 1536, YM), /* 01418 - Skyline - Snork Intro - Vodka.sndh */
+TIMEDB_ENTRY( b8e70c7e, 0, 14208, YM), /* 02120 - Mad Max - Bangkok Nights - Loader.sndh */
+TIMEDB_ENTRY( b8fc4054, 0, 8069, YM+TA+TD), /* 02320 - Tao - Cream - Mad Vision (never used).sndh */
+TIMEDB_ENTRY( b90c66ef, 0, 6095, YM), /* 03087 - n-a - 12 Bar Blues-IRK.sndh */
+TIMEDB_ENTRY( b91f61fe, 0, 8352, YM), /* 01996 - Mad Max - Axel F.sndh */
+TIMEDB_ENTRY( b9267165, 0, 10752, YM), /* 01623 - No More - No More.sndh */
+TIMEDB_ENTRY( b9589a0f, 0, 8058, YM+TA), /* 00896 - Danny Oneway - C64.sndh */
+TIMEDB_ENTRY( b97102f1, 0, 5115, YM+TA+TB+TD), /* 02595 - STU - HOTCOM.sndh */
+TIMEDB_ENTRY( b9796766, 0, 119703, YM+TA), /* 03835 - P Webb - Hoversprint.sndh */
+TIMEDB_ENTRY( b98f03fb, 0, 15842, YM+TA), /* 04767 - Dave Lowe - After Burner digi.sndh */
+TIMEDB_ENTRY( b9b50cb1, 0, 7947, YM), /* 01038 - Donald Fakk - Pressure.sndh */
+TIMEDB_ENTRY( b9c04132, 0, 2688, YM+TA), /* 00250 - Antichrist - Chelou No!!.sndh */
+TIMEDB_ENTRY( b9f1d758, 0, 5046, YM), /* 03106 - n-a - Daybreaker-ELO.sndh */
+TIMEDB_ENTRY( b9fde005, 0, 3072, YM), /* 03654 - Jedi - Nothing Is More - Song 3.sndh */
+TIMEDB_ENTRY( ba2c50f8, 0, 6138, YM), /* 03287 - Adrian Dalecki - Logo.sndh */
+TIMEDB_ENTRY( ba2c50f8, 1, 8826, YM), /* 03287 - Adrian Dalecki - Logo.sndh */
+TIMEDB_ENTRY( ba2c50f8, 2, 2682, YM), /* 03287 - Adrian Dalecki - Logo.sndh */
+TIMEDB_ENTRY( ba2f914f, 0, 7279, YM+TA+TB+TD), /* 03392 - Ultrasyd - Bouncing Banana.sndh */
+TIMEDB_ENTRY( ba4c288d, 0, 5754, YM), /* 04260 - 505 - Gamesong 1.sndh */
+TIMEDB_ENTRY( ba574393, 0, 3200, YM), /* 04466 - Charles Callet - Meurt En Serie.sndh */
+TIMEDB_ENTRY( ba5bf3fb, 0, 4860, YM+TA), /* 01629 - No More - Vectronix.sndh */
+TIMEDB_ENTRY( ba6a8ef8, 0, 379, YM), /* 02945 - Dave Munsie - Kid Kong.sndh */
+TIMEDB_ENTRY( ba6a8ef8, 1, 435, YM), /* 02945 - Dave Munsie - Kid Kong.sndh */
+TIMEDB_ENTRY( ba6a8ef8, 2, 73, YM), /* 02945 - Dave Munsie - Kid Kong.sndh */
+TIMEDB_ENTRY( ba6f3e4b, 0, 5340, YM), /* 03631 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( ba708458, 0, 1920, YM), /* 01057 - Jonathan Dunn - Darkman.sndh */
+TIMEDB_ENTRY( ba708458, 1, 2304, YM), /* 01057 - Jonathan Dunn - Darkman.sndh */
+TIMEDB_ENTRY( ba708458, 2, 385, YM), /* 01057 - Jonathan Dunn - Darkman.sndh */
+TIMEDB_ENTRY( ba708458, 3, 5376, YM), /* 01057 - Jonathan Dunn - Darkman.sndh */
+TIMEDB_ENTRY( ba71e92e, 0, 5809, YM), /* 03163 - Unknown - SOUND OF SILENCE By Paul Simon.sndh */
+TIMEDB_ENTRY( ba886f7d, 0, 40729, YM), /* 00007 - gwEm - Space Trip (dub mix).sndh */
+TIMEDB_ENTRY( baa002c0, 0, 9724, YM+TA+TB), /* 00212 - 505 - Vagrant.sndh */
+TIMEDB_ENTRY( bab4b43b, 0, 20992, YM), /* 04459 - Charles Callet - Bob Morane - Chevalerie.sndh */
+TIMEDB_ENTRY( bab4b43b, 1, 3392, YM), /* 04459 - Charles Callet - Bob Morane - Chevalerie.sndh */
+TIMEDB_ENTRY( bac8350c, 0, 7919, YM), /* 01316 - Matt Furniss - Shadowlands.sndh */
+TIMEDB_ENTRY( bad7e342, 0, 1676, YM), /* 03487 - Unknown - Trailblazer.sndh */
+TIMEDB_ENTRY( bb183018, 0, 6410, YM), /* 03028 - Alice Amore - ETUDE (Opus25,No.1)by F.Chopin.sndh */
+TIMEDB_ENTRY( bb188322, 0, 15177, YM+TA+TB+TD), /* 02105 - Mad Max - Zoids - Sid.sndh */
+TIMEDB_ENTRY( bb1c8a06, 0, 521, YM), /* 04654 - Peter Johnson - Arkanoid - Revenge of Doh.sndh */
+TIMEDB_ENTRY( bb1c8a06, 1, 290, YM), /* 04654 - Peter Johnson - Arkanoid - Revenge of Doh.sndh */
+TIMEDB_ENTRY( bb1c8a06, 2, 146, YM), /* 04654 - Peter Johnson - Arkanoid - Revenge of Doh.sndh */
+TIMEDB_ENTRY( bb1c8a06, 3, 130, YM), /* 04654 - Peter Johnson - Arkanoid - Revenge of Doh.sndh */
+TIMEDB_ENTRY( bb1c8a06, 4, 1585, YM), /* 04654 - Peter Johnson - Arkanoid - Revenge of Doh.sndh */
+TIMEDB_ENTRY( bb1c8a06, 5, 96, YM), /* 04654 - Peter Johnson - Arkanoid - Revenge of Doh.sndh */
+TIMEDB_ENTRY( bb317266, 0, 10752, YM+TA), /* 02156 - Mad Max - Ooh Crikey Wot a Scorcher Main Menu.sndh */
+TIMEDB_ENTRY( bb425ad7, 0, 3455, YM+TA+TB+TD), /* 03052 - Orbiter and Timbral - Dubmoods MILF (in da park).sndh */
+TIMEDB_ENTRY( bb470a6d, 0, 14506, YM), /* 02040 - Mad Max - Saboteur 2.sndh */
+TIMEDB_ENTRY( bb65fe65, 0, 11059, YM+TA+TD), /* 01852 - Lotek Style - Her Face.sndh */
+TIMEDB_ENTRY( bb765c7e, 0, 8442, YM+TA), /* 02634 - Miggy - EELectric Game Music(90%).sndh */
+TIMEDB_ENTRY( bb7fffa1, 0, 29184, YM+TA+TB+TD), /* 03469 - cerror - Loader tune.sndh */
+TIMEDB_ENTRY( bb8432f7, 0, 2964, YM), /* 03144 - n-a - OLD JOE CLARK'S BOOGIE.sndh */
+TIMEDB_ENTRY( bb8625e1, 0, 19578, YM+TA), /* 01678 - Jess - Sharpness Buzztone.sndh */
+TIMEDB_ENTRY( bb875700, 0, 9600, YM), /* 03260 - T1000 - The Beast Club - TS 11.sndh */
+TIMEDB_ENTRY( bb96bca5, 0, 3480, YM+TA), /* 03601 - Excellence in Art - Sommarhack 2011 Invite.sndh */
+TIMEDB_ENTRY( bbac27d1, 0, 8058, YM+TA+TB), /* 02774 - Gary - UCM 5 Intro.sndh */
+TIMEDB_ENTRY( bbb25894, 0, 1280, YM+TA), /* 00925 - Dark Angel - I Hate Techo.sndh */
+TIMEDB_ENTRY( bbb47b36, 0, 5370, YM), /* 00874 - Ben Daglish - Supercars.sndh */
+TIMEDB_ENTRY( bbb47b36, 1, 5112, YM), /* 00874 - Ben Daglish - Supercars.sndh */
+TIMEDB_ENTRY( bbb47b36, 2, 5387, YM), /* 00874 - Ben Daglish - Supercars.sndh */
+TIMEDB_ENTRY( bbb47b36, 3, 6204, YM), /* 00874 - Ben Daglish - Supercars.sndh */
+TIMEDB_ENTRY( bbb47b36, 4, 6361, YM), /* 00874 - Ben Daglish - Supercars.sndh */
+TIMEDB_ENTRY( bbb47b36, 5, 6905, YM), /* 00874 - Ben Daglish - Supercars.sndh */
+TIMEDB_ENTRY( bbb47b36, 6, 180, YM), /* 00874 - Ben Daglish - Supercars.sndh */
+TIMEDB_ENTRY( bbbbd013, 0, 2469, YM), /* 04731 - Juha Terho - AGI Quest 1.sndh */
+TIMEDB_ENTRY( bbbbd013, 1, 693, YM), /* 04731 - Juha Terho - AGI Quest 1.sndh */
+TIMEDB_ENTRY( bbbbd013, 2, 588, YM), /* 04731 - Juha Terho - AGI Quest 1.sndh */
+TIMEDB_ENTRY( bbbbd013, 3, 742, YM), /* 04731 - Juha Terho - AGI Quest 1.sndh */
+TIMEDB_ENTRY( bbbbd013, 4, 672, YM), /* 04731 - Juha Terho - AGI Quest 1.sndh */
+TIMEDB_ENTRY( bbcb5276, 0, 1248, YM), /* 02955 - Skinnybone - Special Forces.sndh */
+TIMEDB_ENTRY( bbe35e3b, 0, 1179, YM), /* 04499 - C.R.G. Johnson - Boing.sndh */
+TIMEDB_ENTRY( bbe35e3b, 1, 1280, YM), /* 04499 - C.R.G. Johnson - Boing.sndh */
+TIMEDB_ENTRY( bbed6592, 0, 6537, YM), /* 03165 - n-a - Somewhere, My Love.sndh */
+TIMEDB_ENTRY( bbf23b4e, 0, 4112, YM), /* 01668 - Stefan Jerowski - Sarakon.sndh */
+TIMEDB_ENTRY( bbf23b4e, 1, 5376, YM), /* 01668 - Stefan Jerowski - Sarakon.sndh */
+TIMEDB_ENTRY( bbf23b4e, 2, 2560, YM), /* 01668 - Stefan Jerowski - Sarakon.sndh */
+TIMEDB_ENTRY( bc031a4c, 0, 25216, YM+TD), /* 03994 - XyNo - Why Emm?.sndh */
+TIMEDB_ENTRY( bc0e28fe, 0, 24768, YM), /* 02578 - STU - BOMBERMEN.sndh */
+TIMEDB_ENTRY( bc0ea2f0, 0, 19578, YM), /* 04366 - Jess - Sharpness Buzztone (chip).sndh */
+TIMEDB_ENTRY( bc161558, 0, 29440, YM), /* 01474 - STU - RUN.sndh */
+TIMEDB_ENTRY( bc18a985, 0, 4992, YM), /* 01135 - Tyan - Revolution - James Brown.sndh */
+TIMEDB_ENTRY( bc1b9871, 0, 2518, YM+TA+TD), /* 02669 - Donald Fakk - Flum Hum.sndh */
+TIMEDB_ENTRY( bc46b8cd, 0, 68544, YM), /* 01442 - Stax - New Happy Wave.sndh */
+TIMEDB_ENTRY( bc57dc94, 0, 1920, YM+TA), /* 00469 - Viking - Ending.sndh */
+TIMEDB_ENTRY( bc58e7d0, 0, 8928, YM), /* 00962 - Mike Davies - Dynasty Wars.sndh */
+TIMEDB_ENTRY( bc58e7d0, 1, 3072, YM), /* 00962 - Mike Davies - Dynasty Wars.sndh */
+TIMEDB_ENTRY( bc58e7d0, 2, 1584, YM), /* 00962 - Mike Davies - Dynasty Wars.sndh */
+TIMEDB_ENTRY( bc58e7d0, 3, 105, YM), /* 00962 - Mike Davies - Dynasty Wars.sndh */
+TIMEDB_ENTRY( bc58e7d0, 4, 153, YM), /* 00962 - Mike Davies - Dynasty Wars.sndh */
+TIMEDB_ENTRY( bc6ef6f9, 0, 10943, YM+TA+TD), /* 02696 - Dubmood - RazoR 1911 - Botkyrka VS ST-STYLE.sndh */
+TIMEDB_ENTRY( bc857fb3, 0, 3503, YM+TA+TB+TD), /* 02731 - maktone-fairlight - reason.sndh */
+TIMEDB_ENTRY( bc874908, 0, 15354, YM+TA+TB+TD), /* 01018 - DMA-SC - vistors from dreams.sndh */
+TIMEDB_ENTRY( bc8ba5b8, 0, 31864, YM+TA), /* 03008 - Mad Max - Stormlord Title Music.sndh */
+TIMEDB_ENTRY( bc9380cc, 0, 11684, YM), /* 03233 - T1000 - The Beast Club - TBC 3.sndh */
+TIMEDB_ENTRY( bc9c82ce, 0, 6265, YM+TA+TB+TD), /* 00051 - 505 - Gauloise - Posh Demo original.sndh */
+TIMEDB_ENTRY( bcb0814b, 0, 23230, YM+TA+TD), /* 03413 - Tao - Cream (orig. Jochen Hippel) - Lethal Xcess Intro (Edit).sndh */
+TIMEDB_ENTRY( bcbcb5fb, 0, 9849, YM+TA+TB+TD), /* 01952 - MSG - Chu Chu Rocket - Title.sndh */
+TIMEDB_ENTRY( bcbda481, 0, 576, YM+TA), /* 00937 - Dark Angel - Mixpart Remix.sndh */
+TIMEDB_ENTRY( bcc07af1, 0, 5518, YM+TA), /* 00056 - 505 - Hmmm One - EIL 3 invite.sndh */
+TIMEDB_ENTRY( bcc24215, 0, 31559, YM), /* 00545 - Bodenst ndig 2000 - Highscore (YM Rockerz).sndh */
+TIMEDB_ENTRY( bcd3fb1c, 0, 9215, YM+TA+TB+TD), /* 02524 - DUBMOOD (quasar) - HYBRID FUNKY STARS.sndh */
+TIMEDB_ENTRY( bcd9b2e1, 0, 1541, YM), /* 02282 - Tao - Cream - Just Loadin' (Just Buggin).sndh */
+TIMEDB_ENTRY( bcd9b2e1, 1, 389, YM), /* 02282 - Tao - Cream - Just Loadin' (Just Buggin).sndh */
+TIMEDB_ENTRY( bce196c9, 0, 54981, YM+TA), /* 02126 - Mad Max - Knucklebusters.sndh */
+TIMEDB_ENTRY( bd03e011, 0, 3117, YM), /* 03279 - Thothy - Heuthier.sndh */
+TIMEDB_ENTRY( bd21f512, 0, 36380, YM+TA), /* 03716 - Richard Joseph - Speedball 2.sndh */
+TIMEDB_ENTRY( bd24a414, 0, 2048, YM), /* 01414 - Skyline - Snork Intro - Transbeauce.sndh */
+TIMEDB_ENTRY( bd3181a0, 0, 123322, YM+TA), /* 03772 - Exarch - Psychedika.sndh */
+TIMEDB_ENTRY( bd3181a0, 1, 158045, YM+TA), /* 03772 - Exarch - Psychedika.sndh */
+TIMEDB_ENTRY( bd3181a0, 2, 104074, YM+TA), /* 03772 - Exarch - Psychedika.sndh */
+TIMEDB_ENTRY( bd3181a0, 3, 42113, YM+TA), /* 03772 - Exarch - Psychedika.sndh */
+TIMEDB_ENTRY( bd3181a0, 4, 71252, YM+TA), /* 03772 - Exarch - Psychedika.sndh */
+TIMEDB_ENTRY( bd3ba2ea, 0, 17982, YM+TA+TB+TD), /* 02567 - marcer - outrun 2005 remix.sndh */
+TIMEDB_ENTRY( bd485b20, 0, 120, YM), /* 04529 - Andreaz - Fia.sndh */
+TIMEDB_ENTRY( bd485b20, 1, 282, YM), /* 04529 - Andreaz - Fia.sndh */
+TIMEDB_ENTRY( bd485b20, 2, 183, YM), /* 04529 - Andreaz - Fia.sndh */
+TIMEDB_ENTRY( bd485b20, 3, 1280, YM), /* 04529 - Andreaz - Fia.sndh */
+TIMEDB_ENTRY( bd4dad7d, 0, 5120, YM), /* 04596 - Rude Kid - In Air.sndh */
+TIMEDB_ENTRY( bd530e2b, 0, 1922, YM), /* 01262 - Aaron Fothergill - Sky Strike.sndh */
+TIMEDB_ENTRY( bd530e2b, 1, 1038, YM), /* 01262 - Aaron Fothergill - Sky Strike.sndh */
+TIMEDB_ENTRY( bd530e2b, 2, 4456, YM), /* 01262 - Aaron Fothergill - Sky Strike.sndh */
+TIMEDB_ENTRY( bd5738da, 0, 3022, YM), /* 03887 - Unknown - Hommage.sndh */
+TIMEDB_ENTRY( bd5b476a, 0, 3072, YM+TA+TB+TD), /* 02099 - Mad Max - Thanatos - Sid.sndh */
+TIMEDB_ENTRY( bd619255, 0, 1280, YM), /* 04516 - Ross McNaughton - Confusion.sndh */
+TIMEDB_ENTRY( bd619255, 1, 126, YM), /* 04516 - Ross McNaughton - Confusion.sndh */
+TIMEDB_ENTRY( bd619255, 2, 44, YM), /* 04516 - Ross McNaughton - Confusion.sndh */
+TIMEDB_ENTRY( bd619255, 3, 18, YM), /* 04516 - Ross McNaughton - Confusion.sndh */
+TIMEDB_ENTRY( bd619255, 4, 30, YM), /* 04516 - Ross McNaughton - Confusion.sndh */
+TIMEDB_ENTRY( bd619255, 5, 41, YM), /* 04516 - Ross McNaughton - Confusion.sndh */
+TIMEDB_ENTRY( bd619255, 6, 39, YM), /* 04516 - Ross McNaughton - Confusion.sndh */
+TIMEDB_ENTRY( bd619255, 7, 104, YM), /* 04516 - Ross McNaughton - Confusion.sndh */
+TIMEDB_ENTRY( bd640e59, 0, 22272, YM+TA+TB+TD), /* 02441 - cerror (or.by.4mat.c64) - VERY BLAND.sndh */
+TIMEDB_ENTRY( bd75fdd2, 0, 8384, YM+TA+TB+TD), /* 02079 - Mad Max - Harvey Smiths Show Jumping - Sid.sndh */
+TIMEDB_ENTRY( bdac181f, 0, 10399, YM), /* 03122 - n-a - I Honestly Love You.sndh */
+TIMEDB_ENTRY( bdad5be6, 0, 11904, YM), /* 01633 - Nexus - Dreamzone - Cool J.sndh */
+TIMEDB_ENTRY( bdb1ca4d, 0, 3775, YM), /* 01246 - FFT - Phaleon - Beast 2.sndh */
+TIMEDB_ENTRY( bdc295cc, 0, 11089, YM), /* 01182 - Excellence In Art - Get into The Groove.sndh */
+TIMEDB_ENTRY( bdcb7563, 0, 13942, YM), /* 00125 - David Whittaker - Quadrilian.sndh */
+TIMEDB_ENTRY( bdcb7563, 1, 11106, YM), /* 00125 - David Whittaker - Quadrilian.sndh */
+TIMEDB_ENTRY( bdeb5cd0, 0, 27845, YM+TA), /* 04354 - X The Beermat - Carrot.sndh */
+TIMEDB_ENTRY( be03a1d8, 0, 11193, YM+TA+TB+TD), /* 01013 - DMA-SC - Sweety End.sndh */
+TIMEDB_ENTRY( be12afd4, 0, 10240, YM+TA+TD), /* 02269 - Tao - Cream - The Arrival (Steps).sndh */
+TIMEDB_ENTRY( be23c6ad, 0, 107030, YM+TA), /* 03766 - Waldemar Belwon - Hey (Music Show 1).sndh */
+TIMEDB_ENTRY( be24fa83, 0, 174530, YM+TA), /* 03849 - Chris of TGE - NTM - TGE.sndh */
+TIMEDB_ENTRY( be34d10d, 0, 11721, YM), /* 00019 - 4-Mat - Warzone.sndh */
+TIMEDB_ENTRY( be43c9fb, 0, 8452, YM+TA+TB+TD), /* 00993 - Dma Sc - Sector One ( 2003 ) - Cybernetic Dancer (YM Rockerz).sndh */
+TIMEDB_ENTRY( be534838, 0, 46337, YM+TA), /* 03773 - Exarch - Scientia.sndh */
+TIMEDB_ENTRY( be534838, 1, 217109, YM+TA), /* 03773 - Exarch - Scientia.sndh */
+TIMEDB_ENTRY( be534838, 2, 201444, YM+TA), /* 03773 - Exarch - Scientia.sndh */
+TIMEDB_ENTRY( be534838, 3, 109257, YM+TA), /* 03773 - Exarch - Scientia.sndh */
+TIMEDB_ENTRY( be534838, 4, 70255, YM+TA), /* 03773 - Exarch - Scientia.sndh */
+TIMEDB_ENTRY( be564c23, 0, 5742, YM), /* 01913 - Jose A. Martin - Risky Woods.sndh */
+TIMEDB_ENTRY( be564c23, 1, 5742, YM), /* 01913 - Jose A. Martin - Risky Woods.sndh */
+TIMEDB_ENTRY( be564c23, 2, 6080, YM), /* 01913 - Jose A. Martin - Risky Woods.sndh */
+TIMEDB_ENTRY( be564c23, 3, 4130, YM), /* 01913 - Jose A. Martin - Risky Woods.sndh */
+TIMEDB_ENTRY( be564c23, 4, 5600, YM), /* 01913 - Jose A. Martin - Risky Woods.sndh */
+TIMEDB_ENTRY( be564c23, 5, 9530, YM), /* 01913 - Jose A. Martin - Risky Woods.sndh */
+TIMEDB_ENTRY( be564c23, 6, 2076, YM), /* 01913 - Jose A. Martin - Risky Woods.sndh */
+TIMEDB_ENTRY( be564c23, 7, 5355, YM), /* 01913 - Jose A. Martin - Risky Woods.sndh */
+TIMEDB_ENTRY( be564c23, 9, 922, YM), /* 01913 - Jose A. Martin - Risky Woods.sndh */
+TIMEDB_ENTRY( be564c23, 10, 4764, YM), /* 01913 - Jose A. Martin - Risky Woods.sndh */
+TIMEDB_ENTRY( be71d4b7, 0, 6568, YM), /* 00375 - Beast - TSC - TSC 31.sndh */
+TIMEDB_ENTRY( be75a4a1, 0, 8718, YM), /* 01271 - Frazer - Tjosan.sndh */
+TIMEDB_ENTRY( be7893e1, 0, 10088, YM), /* 03516 - Peter Johnson - Daley Thompson Olympic Challenge.sndh */
+TIMEDB_ENTRY( be7893e1, 1, 245, YM), /* 03516 - Peter Johnson - Daley Thompson Olympic Challenge.sndh */
+TIMEDB_ENTRY( be7893e1, 2, 170, YM), /* 03516 - Peter Johnson - Daley Thompson Olympic Challenge.sndh */
+TIMEDB_ENTRY( be7893e1, 3, 195, YM), /* 03516 - Peter Johnson - Daley Thompson Olympic Challenge.sndh */
+TIMEDB_ENTRY( be7893e1, 4, 201, YM), /* 03516 - Peter Johnson - Daley Thompson Olympic Challenge.sndh */
+TIMEDB_ENTRY( be7893e1, 5, 113, YM), /* 03516 - Peter Johnson - Daley Thompson Olympic Challenge.sndh */
+TIMEDB_ENTRY( be80306e, 0, 38281, YM+TA), /* 04028 - Roggie - Odyssey.sndh */
+TIMEDB_ENTRY( be8284f9, 0, 9594, YM+TA), /* 02893 - Kenet - Gameboy.sndh */
+TIMEDB_ENTRY( be93edb9, 0, 8273, YM), /* 02505 - Crazy Q - Crushed Insect.sndh */
+TIMEDB_ENTRY( be9e7cd2, 0, 381, YM+TA+TD), /* 04283 - 505 - Loop07.sndh */
+TIMEDB_ENTRY( bea40b51, 0, 12282, YM), /* 01688 - Jess - Generation 2.0.sndh */
+TIMEDB_ENTRY( beb1517f, 0, 25, YM), /* 01357 - Scavenger - Password.sndh */
+TIMEDB_ENTRY( beb89041, 0, 2303, YM+TA), /* 03423 - Dubmood - D-Bug 197 Jam Version.sndh */
+TIMEDB_ENTRY( bec0d438, 0, 24372, YM), /* 01092 - Techno - Mathematiques Squizophrenes Intro.sndh */
+TIMEDB_ENTRY( bec625b1, 0, 11315, YM), /* 00879 - Ben Daglish - Ultimate Golf.sndh */
+TIMEDB_ENTRY( bedc45d2, 0, 7488, YM), /* 03209 - Jonathan Dunn - Battle Command.sndh */
+TIMEDB_ENTRY( bef28cde, 0, 13443, YM), /* 02243 - Tao - Cream (orig. Rob Hubbard) - Rasputin (Stmygm).sndh */
+TIMEDB_ENTRY( bef28cde, 1, 2179, YM), /* 02243 - Tao - Cream (orig. Rob Hubbard) - Rasputin (Stmygm).sndh */
+TIMEDB_ENTRY( befa3934, 0, 11066, YM), /* 02058 - Mad Max - Thing On A Spring.sndh */
+TIMEDB_ENTRY( bf0e1fae, 0, 26463, YM+TA), /* 03808 - Spherical - Quartet Music Demo II.sndh */
+TIMEDB_ENTRY( bf0e1fae, 1, 39429, YM+TA), /* 03808 - Spherical - Quartet Music Demo II.sndh */
+TIMEDB_ENTRY( bf0e1fae, 2, 34309, YM+TA), /* 03808 - Spherical - Quartet Music Demo II.sndh */
+TIMEDB_ENTRY( bf0e1fae, 3, 26625, YM+TA), /* 03808 - Spherical - Quartet Music Demo II.sndh */
+TIMEDB_ENTRY( bf0e1fae, 4, 55297, YM+TA), /* 03808 - Spherical - Quartet Music Demo II.sndh */
+TIMEDB_ENTRY( bf0e1fae, 5, 33797, YM+TA), /* 03808 - Spherical - Quartet Music Demo II.sndh */
+TIMEDB_ENTRY( bf0e1fae, 6, 106497, YM+TA), /* 03808 - Spherical - Quartet Music Demo II.sndh */
+TIMEDB_ENTRY( bf0e1fae, 7, 131443, YM+TA), /* 03808 - Spherical - Quartet Music Demo II.sndh */
+TIMEDB_ENTRY( bf3fce4e, 0, 9208, YM+TA+TB+TD), /* 01874 - Lotek Style - Zeitloch.sndh */
+TIMEDB_ENTRY( bf4dd448, 0, 9600, YM), /* 02121 - Mad Max - Comic Bakery.sndh */
+TIMEDB_ENTRY( bf4de37d, 0, 9059, YM+TA+TD), /* 03480 - Dma-Sc - Sector One - Spring Party.sndh */
+TIMEDB_ENTRY( bf6004d3, 0, 1536, YM), /* 01415 - Skyline - Snork Intro - ULM DSOTS.sndh */
+TIMEDB_ENTRY( bf721338, 0, 337, YM), /* 01792 - Barry Leitch - Frankenstein.sndh */
+TIMEDB_ENTRY( bf721338, 1, 1573, YM), /* 01792 - Barry Leitch - Frankenstein.sndh */
+TIMEDB_ENTRY( bf721338, 2, 229, YM), /* 01792 - Barry Leitch - Frankenstein.sndh */
+TIMEDB_ENTRY( bf721338, 3, 1921, YM), /* 01792 - Barry Leitch - Frankenstein.sndh */
+TIMEDB_ENTRY( bf9c5998, 0, 2880, YM), /* 00778 - Crawdaddy - Blazer.sndh */
+TIMEDB_ENTRY( bfb64ee2, 0, 768, YM), /* 00934 - Dark Angel - Mathematica Intro.sndh */
+TIMEDB_ENTRY( bfb698ca, 0, 3000, YM), /* 03147 - n-a - Peter Gunn by JFS.sndh */
+TIMEDB_ENTRY( bfd90bda, 0, 5772, YM+TA), /* 01619 - No More - GSC 56.sndh */
+TIMEDB_ENTRY( bfdcbcb2, 0, 6940, YM+TA+TB+TD), /* 01869 - Lotek Style - Seraphim.sndh */
+TIMEDB_ENTRY( bffa5268, 0, 4369, YM), /* 00099 - David Whittaker - Eye of Horus.sndh */
+TIMEDB_ENTRY( bffa5268, 1, 24575, YM), /* 00099 - David Whittaker - Eye of Horus.sndh */
+TIMEDB_ENTRY( bffa5268, 2, 149, YM), /* 00099 - David Whittaker - Eye of Horus.sndh */
+TIMEDB_ENTRY( bffa5268, 3, 231, YM), /* 00099 - David Whittaker - Eye of Horus.sndh */
+TIMEDB_ENTRY( bffa5268, 4, 630, YM), /* 00099 - David Whittaker - Eye of Horus.sndh */
+TIMEDB_ENTRY( bffa5268, 5, 372, YM), /* 00099 - David Whittaker - Eye of Horus.sndh */
+TIMEDB_ENTRY( bffa5268, 6, 987, YM), /* 00099 - David Whittaker - Eye of Horus.sndh */
+TIMEDB_ENTRY( bffa5268, 7, 987, YM), /* 00099 - David Whittaker - Eye of Horus.sndh */
+TIMEDB_ENTRY( bffa5268, 8, 1228, YM), /* 00099 - David Whittaker - Eye of Horus.sndh */
+TIMEDB_ENTRY( bffeb734, 0, 1535, YM+TD), /* 03290 - Dma-Sc - ATIPYK Developments - Manical Drop - 2 Players music #3.sndh */
+TIMEDB_ENTRY( c01bb09d, 0, 41600, YM+TA+TB+TD), /* 02629 - schmx-awp - Schmx It.sndh */
+TIMEDB_ENTRY( c03b9a4e, 0, 1408, YM), /* 04381 - Chris Denman - Caesar.sndh */
+TIMEDB_ENTRY( c045e331, 0, 3835, YM+TD), /* 01380 - Schemantix - Enola Gay.sndh */
+TIMEDB_ENTRY( c0495c5a, 0, 30860, YM+TA+TB+TD), /* 04271 - 505 - Kitchentable.sndh */
+TIMEDB_ENTRY( c04cb940, 0, 8064, YM), /* 01724 - Jet Power - AGITRS - RABUBA SAHNE TEE.sndh */
+TIMEDB_ENTRY( c059ec25, 0, 4989, YM+TB+TD), /* 01282 - Frequent - Asbest.sndh */
+TIMEDB_ENTRY( c05e2f85, 0, 16512, YM+TA+TD), /* 02258 - Tao - Cream - Line Of Fire (Steps).sndh */
+TIMEDB_ENTRY( c097612e, 0, 7728, YM), /* 01977 - MSG - MSG 07.sndh */
+TIMEDB_ENTRY( c09b74ed, 0, 3759, YM), /* 02943 - Dave Munsie - Evader.sndh */
+TIMEDB_ENTRY( c0a4682e, 0, 3072, YM+TA), /* 00256 - Antichrist - Melody.sndh */
+TIMEDB_ENTRY( c0ba0415, 0, 9210, YM+TA), /* 04225 - 505 - 4th.sndh */
+TIMEDB_ENTRY( c0bfa7c8, 0, 33061, YM+TA), /* 04814 - Unknown - Tin.sndh */
+TIMEDB_ENTRY( c0c5ae91, 0, 1926, YM), /* 03179 - Unknown - Two Part Invention by J. Bach.sndh */
+TIMEDB_ENTRY( c0c689b3, 0, 6630, YM), /* 00574 - Jas C Brooke - Savage.sndh */
+TIMEDB_ENTRY( c0c689b3, 1, 7416, YM), /* 00574 - Jas C Brooke - Savage.sndh */
+TIMEDB_ENTRY( c0c689b3, 2, 141, YM), /* 00574 - Jas C Brooke - Savage.sndh */
+TIMEDB_ENTRY( c0c689b3, 3, 128, YM), /* 00574 - Jas C Brooke - Savage.sndh */
+TIMEDB_ENTRY( c0c689b3, 4, 10496, YM), /* 00574 - Jas C Brooke - Savage.sndh */
+TIMEDB_ENTRY( c0c689b3, 5, 140, YM), /* 00574 - Jas C Brooke - Savage.sndh */
+TIMEDB_ENTRY( c0c689b3, 6, 140, YM), /* 00574 - Jas C Brooke - Savage.sndh */
+TIMEDB_ENTRY( c0c689b3, 7, 598, YM), /* 00574 - Jas C Brooke - Savage.sndh */
+TIMEDB_ENTRY( c0c689b3, 8, 14254, YM), /* 00574 - Jas C Brooke - Savage.sndh */
+TIMEDB_ENTRY( c0d0d761, 0, 2303, YM+TA+TB+TD), /* 02989 - 505-paradox - krabbencocktail.sndh */
+TIMEDB_ENTRY( c0d9d308, 0, 5260, YM+TA), /* 04631 - David Whittaker - Xenon 2 Title.sndh */
+TIMEDB_ENTRY( c10e2b29, 0, 6144, YM+TA), /* 04410 - Dr Beat - ENS 1 - SD player.sndh */
+TIMEDB_ENTRY( c11d69b3, 0, 7680, YM), /* 01554 - Rhino - Xmas 2003 Intro - Song 2.sndh */
+TIMEDB_ENTRY( c125f0b1, 0, 26490, YM), /* 01680 - Jess - Throw The Confettis.sndh */
+TIMEDB_ENTRY( c12837c7, 0, 1536, YM), /* 01388 - Andy Severn - Joe Blade.sndh */
+TIMEDB_ENTRY( c133576c, 0, 6424, YM), /* 03176 - Unknown - Today Randy Sparks.sndh */
+TIMEDB_ENTRY( c14407ec, 0, 2486, YM+TA+TB), /* 00202 - 505 - Trace.sndh */
+TIMEDB_ENTRY( c162d957, 0, 9216, YM), /* 01099 - Techno - Rigolo.sndh */
+TIMEDB_ENTRY( c1ae24ca, 0, 1920, YM), /* 02167 - Mad Max - Ikari Union.sndh */
+TIMEDB_ENTRY( c1b840c6, 0, 2688, YM), /* 01398 - Skyline - Snork - Loader 1.sndh */
+TIMEDB_ENTRY( c1ba284b, 0, 6176, YM), /* 01066 - Jonathan Dunn - Puzznic.sndh */
+TIMEDB_ENTRY( c1bd8522, 0, 2681, YM+TA+TB+TD), /* 01965 - MSG - Godpey - Story 0.sndh */
+TIMEDB_ENTRY( c1bdf638, 0, 13568, YM), /* 00927 - Dark Angel - Kaskades.sndh */
+TIMEDB_ENTRY( c1d303aa, 0, 1857, YM), /* 00339 - Tony Williams - Espana 92.sndh */
+TIMEDB_ENTRY( c1d303aa, 1, 2689, YM), /* 00339 - Tony Williams - Espana 92.sndh */
+TIMEDB_ENTRY( c1d303aa, 2, 196, YM), /* 00339 - Tony Williams - Espana 92.sndh */
+TIMEDB_ENTRY( c1d303aa, 3, 226, YM), /* 00339 - Tony Williams - Espana 92.sndh */
+TIMEDB_ENTRY( c1d303aa, 4, 130, YM), /* 00339 - Tony Williams - Espana 92.sndh */
+TIMEDB_ENTRY( c1d60aca, 0, 7388, YM+TA+TD), /* 02746 - Marcer - Bellanotte Chip - O-2006-Invit Demo.sndh */
+TIMEDB_ENTRY( c1dce608, 0, 3072, YM+TA), /* 00953 - Dark Angel - Techno Stormer.sndh */
+TIMEDB_ENTRY( c1e48f02, 0, 4608, YM), /* 01647 - Jedi - Jedi Fun.sndh */
+TIMEDB_ENTRY( c1f006f2, 0, 13249, YM+TA+TD), /* 02226 - Tao - Cream - Toxygen - Intro (Nostalgic-O-Demo).sndh */
+TIMEDB_ENTRY( c1f3233f, 0, 8057, YM+TA+TD), /* 01840 - Lotek Style - Crystal.sndh */
+TIMEDB_ENTRY( c1f36a07, 0, 6144, YM), /* 02176 - Mad Max - In 80 Days Around the World.sndh */
+TIMEDB_ENTRY( c1f36a07, 1, 4704, YM), /* 02176 - Mad Max - In 80 Days Around the World.sndh */
+TIMEDB_ENTRY( c1f36a07, 2, 6336, YM), /* 02176 - Mad Max - In 80 Days Around the World.sndh */
+TIMEDB_ENTRY( c1f36a07, 3, 6528, YM), /* 02176 - Mad Max - In 80 Days Around the World.sndh */
+TIMEDB_ENTRY( c1f36a07, 4, 6336, YM), /* 02176 - Mad Max - In 80 Days Around the World.sndh */
+TIMEDB_ENTRY( c1fec1c6, 0, 6144, YM), /* 02161 - Mad Max - Syntax Terror - Loader.sndh */
+TIMEDB_ENTRY( c2221d2d, 0, 1920, YM), /* 02144 - Mad Max - International Karate - LSD.sndh */
+TIMEDB_ENTRY( c28d0598, 0, 4096, YM), /* 01997 - Mad Max - Bach The Future.sndh */
+TIMEDB_ENTRY( c2972abe, 0, 2879, YM+TA+TB+TD), /* 02780 - 505-cpt^pdx - 052.sndh */
+TIMEDB_ENTRY( c2a12b71, 0, 5472, YM), /* 00114 - David Whittaker - Leathernecks.sndh */
+TIMEDB_ENTRY( c2a12b71, 1, 5376, YM), /* 00114 - David Whittaker - Leathernecks.sndh */
+TIMEDB_ENTRY( c2a12b71, 2, 270, YM), /* 00114 - David Whittaker - Leathernecks.sndh */
+TIMEDB_ENTRY( c2a979fb, 0, 6940, YM), /* 01868 - Lotek Style - Seraphim (Chip).sndh */
+TIMEDB_ENTRY( c2bb978b, 0, 5413, YM), /* 00380 - Wally Beben - Circus Games.sndh */
+TIMEDB_ENTRY( c2bb978b, 2, 1537, YM), /* 00380 - Wally Beben - Circus Games.sndh */
+TIMEDB_ENTRY( c2bb978b, 3, 3073, YM), /* 00380 - Wally Beben - Circus Games.sndh */
+TIMEDB_ENTRY( c2bb978b, 4, 9553, YM), /* 00380 - Wally Beben - Circus Games.sndh */
+TIMEDB_ENTRY( c2c9c987, 0, 896, YM), /* 01194 - Excellence In Art - No.sndh */
+TIMEDB_ENTRY( c2ccc6ff, 0, 16517, YM), /* 02281 - Tao - Cream - Line Of Fire (Just Buggin).sndh */
+TIMEDB_ENTRY( c2d49b76, 0, 5568, YM), /* 00452 - Augustin Vidovic - Music Mon Mix.sndh */
+TIMEDB_ENTRY( c2d7c987, 0, 3072, YM), /* 01198 - Excellence In Art - Runner.sndh */
+TIMEDB_ENTRY( c2df6c6b, 0, 14225, YM+TD), /* 01384 - Scy - TSCC Mod Compil 5.sndh */
+TIMEDB_ENTRY( c2ecaab7, 0, 3842, YM), /* 00427 - Big Alec - PYM - Loader.sndh */
+TIMEDB_ENTRY( c2ef6ee4, 0, 3455, YM+TA+TB+TD), /* 04778 - DMA-SC - Lovetro Main Theme.sndh */
+TIMEDB_ENTRY( c2fa1a91, 0, 1544, YM), /* 04010 - Danny Oneway - The Year After - Risk #1.sndh */
+TIMEDB_ENTRY( c2fe8b3d, 0, 1149, YM), /* 00724 - Andrew Taylor - Double Dragon 3 - The Rosetta Stone.sndh */
+TIMEDB_ENTRY( c2fe8b3d, 1, 3645, YM), /* 00724 - Andrew Taylor - Double Dragon 3 - The Rosetta Stone.sndh */
+TIMEDB_ENTRY( c2fe8b3d, 2, 1533, YM), /* 00724 - Andrew Taylor - Double Dragon 3 - The Rosetta Stone.sndh */
+TIMEDB_ENTRY( c312cf0f, 0, 2040, YM+TD), /* 00470 - Viking - Fairy.sndh */
+TIMEDB_ENTRY( c3310a79, 0, 9600, YM), /* 01661 - Jedi - Unfinished 3.sndh */
+TIMEDB_ENTRY( c33f9df3, 0, 2912, YM+TA), /* 00438 - Big Alec - Sticks.sndh */
+TIMEDB_ENTRY( c35a93d7, 0, 8069, YM), /* 02279 - Tao - Cream - Just Feel It 1 (Just Buggin).sndh */
+TIMEDB_ENTRY( c35ba437, 0, 7160, YM+TA+TB+TD), /* 04301 - 505-checkpoint - Render.sndh */
+TIMEDB_ENTRY( c36a424a, 0, 8976, YM), /* 01549 - Rhino - GBISTCP - Electronic Images.sndh */
+TIMEDB_ENTRY( c36c51b1, 0, 8192, YM), /* 01656 - Jedi - Sonar.sndh */
+TIMEDB_ENTRY( c38b053f, 0, 8448, YM), /* 01578 - Powa Pixel - Mega 4 Disk Mag.sndh */
+TIMEDB_ENTRY( c38dfe7f, 0, 10239, YM), /* 02207 - Mad Max - Pablo Gold Of Montezuma.sndh */
+TIMEDB_ENTRY( c38dfe7f, 1, 491, YM), /* 02207 - Mad Max - Pablo Gold Of Montezuma.sndh */
+TIMEDB_ENTRY( c38dfe7f, 2, 256, YM), /* 02207 - Mad Max - Pablo Gold Of Montezuma.sndh */
+TIMEDB_ENTRY( c38dfe7f, 3, 7168, YM), /* 02207 - Mad Max - Pablo Gold Of Montezuma.sndh */
+TIMEDB_ENTRY( c38dfe7f, 4, 4096, YM), /* 02207 - Mad Max - Pablo Gold Of Montezuma.sndh */
+TIMEDB_ENTRY( c38dfe7f, 5, 3584, YM), /* 02207 - Mad Max - Pablo Gold Of Montezuma.sndh */
+TIMEDB_ENTRY( c39436dd, 0, 53704, YM+TA), /* 04013 - Mad Max - Thalion Fever.sndh */
+TIMEDB_ENTRY( c3af3bf5, 0, 7209, YM), /* 03511 - Unknown - Cybernoid.sndh */
+TIMEDB_ENTRY( c3af3bf5, 1, 2693, YM), /* 03511 - Unknown - Cybernoid.sndh */
+TIMEDB_ENTRY( c3c98efc, 0, 3600, YM), /* 02377 - Nexus 6 - Headbomb.sndh */
+TIMEDB_ENTRY( c3d0833a, 0, 11867, YM), /* 02054 - Mad Max - Spellbound.sndh */
+TIMEDB_ENTRY( c3fa1d2f, 0, 2880, YM), /* 01515 - Illusion - Blutack.sndh */
+TIMEDB_ENTRY( c3fd98f9, 0, 5802, YM), /* 04386 - Paul Summers - Stryx.sndh */
+TIMEDB_ENTRY( c404f606, 0, 8448, YM), /* 00584 - Celtic - Collision - TFU Intro.sndh */
+TIMEDB_ENTRY( c4267165, 0, 1785, YM+TA+TB+TD), /* 01959 - MSG - Godpey - Losing.sndh */
+TIMEDB_ENTRY( c42df652, 0, 1080, YM), /* 00752 - Mark Cooksey - Ghost N Goblins.sndh */
+TIMEDB_ENTRY( c42df652, 1, 204, YM), /* 00752 - Mark Cooksey - Ghost N Goblins.sndh */
+TIMEDB_ENTRY( c42df652, 2, 40, YM), /* 00752 - Mark Cooksey - Ghost N Goblins.sndh */
+TIMEDB_ENTRY( c42df652, 3, 1536, YM), /* 00752 - Mark Cooksey - Ghost N Goblins.sndh */
+TIMEDB_ENTRY( c42df652, 4, 175, YM), /* 00752 - Mark Cooksey - Ghost N Goblins.sndh */
+TIMEDB_ENTRY( c42df652, 5, 268, YM), /* 00752 - Mark Cooksey - Ghost N Goblins.sndh */
+TIMEDB_ENTRY( c42df652, 6, 1408, YM), /* 00752 - Mark Cooksey - Ghost N Goblins.sndh */
+TIMEDB_ENTRY( c42df652, 7, 85, YM), /* 00752 - Mark Cooksey - Ghost N Goblins.sndh */
+TIMEDB_ENTRY( c42df652, 8, 166, YM), /* 00752 - Mark Cooksey - Ghost N Goblins.sndh */
+TIMEDB_ENTRY( c42df652, 9, 1108, YM), /* 00752 - Mark Cooksey - Ghost N Goblins.sndh */
+TIMEDB_ENTRY( c42e22ed, 0, 4224, YM), /* 01888 - Dave Lowe - Night Shift.sndh */
+TIMEDB_ENTRY( c42e22ed, 1, 8000, YM), /* 01888 - Dave Lowe - Night Shift.sndh */
+TIMEDB_ENTRY( c42e22ed, 2, 256, YM), /* 01888 - Dave Lowe - Night Shift.sndh */
+TIMEDB_ENTRY( c45c2d02, 0, 1920, YM), /* 00815 - Crawdaddy - Tough Guys in Sweden.sndh */
+TIMEDB_ENTRY( c49a99bb, 0, 3204, YM), /* 03152 - Unknown - Believe It or Not! Mancini.sndh */
+TIMEDB_ENTRY( c49c7137, 0, 15755, YM), /* 02012 - Mad Max - Nearly Spherical.sndh */
+TIMEDB_ENTRY( c4a74563, 0, 11867, YM+TA+TB+TD), /* 02097 - Mad Max - Spellbound - Sid.sndh */
+TIMEDB_ENTRY( c4b42ef2, 0, 25984, YM+TA+TD), /* 02264 - Tao - Cream - Stars (Steps).sndh */
+TIMEDB_ENTRY( c4c24475, 0, 4236, YM+TA), /* 01628 - No More - TRSI.sndh */
+TIMEDB_ENTRY( c4c5a4f7, 0, 1873, YM+TA+TD), /* 01823 - Pierre-Eric Loriaux - Cabal.sndh */
+TIMEDB_ENTRY( c4c5a4f7, 1, 749, YM+TA+TD), /* 01823 - Pierre-Eric Loriaux - Cabal.sndh */
+TIMEDB_ENTRY( c4c5a4f7, 2, 946, YM+TA+TD), /* 01823 - Pierre-Eric Loriaux - Cabal.sndh */
+TIMEDB_ENTRY( c4c5a4f7, 3, 889, YM+TA+TD), /* 01823 - Pierre-Eric Loriaux - Cabal.sndh */
+TIMEDB_ENTRY( c4c5a4f7, 4, 2373, YM+TA+TD), /* 01823 - Pierre-Eric Loriaux - Cabal.sndh */
+TIMEDB_ENTRY( c4c5a4f7, 5, 608, YM+TA+TD), /* 01823 - Pierre-Eric Loriaux - Cabal.sndh */
+TIMEDB_ENTRY( c4c5a4f7, 6, 1873, YM+TA+TD), /* 01823 - Pierre-Eric Loriaux - Cabal.sndh */
+TIMEDB_ENTRY( c4c5a4f7, 7, 312, YM+TA+TD), /* 01823 - Pierre-Eric Loriaux - Cabal.sndh */
+TIMEDB_ENTRY( c4c5a4f7, 8, 405, YM+TA+TD), /* 01823 - Pierre-Eric Loriaux - Cabal.sndh */
+TIMEDB_ENTRY( c4d14c90, 0, 9216, YM+TA), /* 02331 - Tao - Cream (orig. Karsten Obarski) - Sleepwalk.sndh */
+TIMEDB_ENTRY( c4d76130, 0, 26544, YM+TA+TB+TD), /* 03370 - STU - FUCK MACHINE.sndh */
+TIMEDB_ENTRY( c4da11c2, 0, 2303, YM+TD), /* 03291 - Dma-Sc - ATIPYK Developments - Manical Drop - 2 Players music #4.sndh */
+TIMEDB_ENTRY( c50bb9dd, 0, 2109, YM+TA), /* 04306 - 505-cpt^pdx - something.sndh */
+TIMEDB_ENTRY( c51dee77, 0, 28032, YM+TA+TB+TD), /* 03982 - XyNo - BLIPSKILL.sndh */
+TIMEDB_ENTRY( c51e0093, 0, 2293, YM+TA+TB), /* 04289 - 505-cpt^pdx - Muell.sndh */
+TIMEDB_ENTRY( c53fc73e, 0, 15744, YM), /* 00597 - Chris Mad - Overdrive Dragon.sndh */
+TIMEDB_ENTRY( c543754d, 0, 6945, YM), /* 00140 - David Whittaker - Starblaze.sndh */
+TIMEDB_ENTRY( c543754d, 1, 17604, YM), /* 00140 - David Whittaker - Starblaze.sndh */
+TIMEDB_ENTRY( c543754d, 2, 97, YM), /* 00140 - David Whittaker - Starblaze.sndh */
+TIMEDB_ENTRY( c543754d, 3, 97, YM), /* 00140 - David Whittaker - Starblaze.sndh */
+TIMEDB_ENTRY( c543754d, 4, 129, YM), /* 00140 - David Whittaker - Starblaze.sndh */
+TIMEDB_ENTRY( c552efdf, 0, 385, YM), /* 00965 - Mike Davies - Last Duel.sndh */
+TIMEDB_ENTRY( c552efdf, 1, 24577, YM), /* 00965 - Mike Davies - Last Duel.sndh */
+TIMEDB_ENTRY( c552efdf, 2, 481, YM), /* 00965 - Mike Davies - Last Duel.sndh */
+TIMEDB_ENTRY( c552efdf, 3, 10560, YM), /* 00965 - Mike Davies - Last Duel.sndh */
+TIMEDB_ENTRY( c56a1afe, 0, 4223, YM+TA+TB+TD), /* 02706 - Dubmood - Toffelskater Interlude.sndh */
+TIMEDB_ENTRY( c56d9fa5, 0, 13600, YM+TA), /* 04652 - Brain - Supremacy.sndh */
+TIMEDB_ENTRY( c56de18c, 0, 1920, YM), /* 02411 - Nexus 6 - Theme 1993.sndh */
+TIMEDB_ENTRY( c587bd0e, 0, 4973, YM), /* 01738 - Richard Joseph - Knightmare.sndh */
+TIMEDB_ENTRY( c587bd0e, 1, 101, YM), /* 01738 - Richard Joseph - Knightmare.sndh */
+TIMEDB_ENTRY( c587bd0e, 2, 389, YM), /* 01738 - Richard Joseph - Knightmare.sndh */
+TIMEDB_ENTRY( c587bd0e, 3, 208, YM), /* 01738 - Richard Joseph - Knightmare.sndh */
+TIMEDB_ENTRY( c587bd0e, 4, 324, YM), /* 01738 - Richard Joseph - Knightmare.sndh */
+TIMEDB_ENTRY( c587bd0e, 5, 2884, YM), /* 01738 - Richard Joseph - Knightmare.sndh */
+TIMEDB_ENTRY( c587bd0e, 6, 2051, YM), /* 01738 - Richard Joseph - Knightmare.sndh */
+TIMEDB_ENTRY( c594a311, 0, 19968, YM), /* 01658 - Jedi - Stephanie.sndh */
+TIMEDB_ENTRY( c5af9dd8, 0, 4389, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 1, 4399, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 2, 3003, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 3, 2934, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 4, 2568, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 5, 2184, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 6, 4368, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 7, 2688, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 8, 6048, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 9, 180, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 10, 2880, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 11, 453, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 12, 270, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 13, 192, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 14, 504, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 15, 972, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5af9dd8, 16, 2509, YM), /* 00167 - Martin Walker - Dragon Breed.sndh */
+TIMEDB_ENTRY( c5b5dc5e, 0, 12869, YM), /* 02949 - Paul Robotham - Space 1889.sndh */
+TIMEDB_ENTRY( c5c398c4, 0, 2688, YM), /* 01725 - Jet Power - AGITRS - LOADER.sndh */
+TIMEDB_ENTRY( c5c9741d, 0, 39169, YM+TA), /* 03851 - The Archmage - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( c5c9741d, 1, 39711, YM+TA), /* 03851 - The Archmage - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( c5c9741d, 2, 18412, YM+TA), /* 03851 - The Archmage - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( c5c9741d, 3, 48482, YM+TA), /* 03851 - The Archmage - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( c5c9741d, 4, 43265, YM+TA), /* 03851 - The Archmage - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( c5c9741d, 5, 43265, YM+TA), /* 03851 - The Archmage - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( c5c9741d, 6, 51005, YM+TA), /* 03851 - The Archmage - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( c5c9741d, 7, 24549, YM+TA), /* 03851 - The Archmage - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( c5c9741d, 8, 24129, YM+TA), /* 03851 - The Archmage - MSI Sound Demo.sndh */
+TIMEDB_ENTRY( c5d8d8b6, 0, 4098, YM), /* 00295 - Gary Wheaton - British Anthem - West Indian Version.sndh */
+TIMEDB_ENTRY( c5daac93, 0, 5903, YM), /* 00345 - Tony Williams - Obitus.sndh */
+TIMEDB_ENTRY( c5ef82c7, 0, 3453, YM+TA+TB+TD), /* 02871 - 505 - Zymplix.sndh */
+TIMEDB_ENTRY( c630704d, 0, 5370, YM+TA), /* 03555 - Stax - Shark.sndh */
+TIMEDB_ENTRY( c66ec609, 0, 5785, YM), /* 03015 - Skinnybone - Trex Warrior.sndh */
+TIMEDB_ENTRY( c66ec609, 1, 1584, YM), /* 03015 - Skinnybone - Trex Warrior.sndh */
+TIMEDB_ENTRY( c66ec609, 2, 10752, YM), /* 03015 - Skinnybone - Trex Warrior.sndh */
+TIMEDB_ENTRY( c67289c8, 0, 5376, YM), /* 01078 - Excellence In Art - Deserted.sndh */
+TIMEDB_ENTRY( c6a2be86, 0, 12384, YM+TA+TD), /* 01987 - Jochen Hippel aka Mad Max - Buzzer.sndh */
+TIMEDB_ENTRY( c6aa274c, 0, 3450, YM), /* 00884 - Adrian Dalecki - Clownomania.sndh */
+TIMEDB_ENTRY( c6aa274c, 1, 6522, YM), /* 00884 - Adrian Dalecki - Clownomania.sndh */
+TIMEDB_ENTRY( c6b7c2bb, 0, 9218, YM), /* 02165 - Mad Max - Children's Song.sndh */
+TIMEDB_ENTRY( c6d142da, 0, 13433, YM+TA+TD), /* 01329 - Scavenger - DBA 6 Intro.sndh */
+TIMEDB_ENTRY( c6dbb53f, 0, 8321, YM), /* 04158 - Unknown - Rumores.sndh */
+TIMEDB_ENTRY( c6ea90a6, 0, 640, YM), /* 01248 - Janko Mrsic Flogel - Fireblaster.sndh */
+TIMEDB_ENTRY( c6ea90a6, 1, 640, YM), /* 01248 - Janko Mrsic Flogel - Fireblaster.sndh */
+TIMEDB_ENTRY( c6fc56df, 0, 860, YM+STE), /* 01907 - Marcer - Marcer 79 - STE only.sndh */
+TIMEDB_ENTRY( c6fd617f, 0, 9218, YM), /* 02419 - Tangens - The 2nd Try - Multi Colour.sndh */
+TIMEDB_ENTRY( c711e291, 0, 13275, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 1, 17, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 2, 49, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 3, 49, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 4, 38, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 5, 25, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 6, 126, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 7, 75, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 8, 37, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 9, 14, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 10, 129, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 11, 385, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 12, 161, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 13, 124, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c711e291, 14, 681, YM), /* 02738 - Tony Williams & The Spoon - Nevermind.sndh */
+TIMEDB_ENTRY( c7147a34, 0, 1685, YM), /* 03169 - n-a - Stand by Me.sndh */
+TIMEDB_ENTRY( c71a18ad, 0, 8735, YM+TA+TB+TD), /* 03396 - Ultrasyd - CORSAIR (mB cover).sndh */
+TIMEDB_ENTRY( c71ef6ab, 0, 8703, YM), /* 00309 - Gary Wheaton - Hey Hey, My My.sndh */
+TIMEDB_ENTRY( c722956b, 0, 4782, YM), /* 00013 - 4-Mat - Captain Dynamo.sndh */
+TIMEDB_ENTRY( c722956b, 1, 2300, YM), /* 00013 - 4-Mat - Captain Dynamo.sndh */
+TIMEDB_ENTRY( c722956b, 2, 6080, YM), /* 00013 - 4-Mat - Captain Dynamo.sndh */
+TIMEDB_ENTRY( c7279020, 0, 4223, YM+TA+TB+TD), /* 02977 - 505-paradox - Attack.sndh */
+TIMEDB_ENTRY( c73ad30c, 0, 6400, YM), /* 04001 - Blue Nun - Gnurk Intro.sndh */
+TIMEDB_ENTRY( c74e296a, 0, 10746, YM+TD), /* 01620 - No More - GSC 57.sndh */
+TIMEDB_ENTRY( c74f7013, 0, 13824, YM+TA+TB+TD), /* 02072 - Mad Max - Crazy Comets - Sid.sndh */
+TIMEDB_ENTRY( c74f7013, 1, 3264, YM+TA+TB+TD), /* 02072 - Mad Max - Crazy Comets - Sid.sndh */
+TIMEDB_ENTRY( c757f90e, 0, 53760, YM+TA+TB+TD), /* 04099 - mOdmate-CheckPoint (orig. Rob says Wow!) - SILLY JET WILLY.sndh */
+TIMEDB_ENTRY( c7670d6d, 0, 8359, YM), /* 03562 - YERZMYEY-AY-RIDERS - STandard Crap.sndh */
+TIMEDB_ENTRY( c78b1435, 0, 1923, YM+TA+TB+TD), /* 01166 - Tyan - Unten.sndh */
+TIMEDB_ENTRY( c799aa1e, 0, 9600, YM), /* 02804 - Starbuck - Mislead.sndh */
+TIMEDB_ENTRY( c7a3bc19, 0, 23302, YM+TA+TD), /* 02304 - Tao - Cream - Bumpsong (DHS-compo).sndh */
+TIMEDB_ENTRY( c7a3fc91, 0, 6126, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 1, 3584, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 2, 610, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 3, 427, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 4, 512, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 5, 104, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 6, 105, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 7, 104, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 8, 107, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 9, 282, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 10, 282, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7a3fc91, 11, 512, YM), /* 00111 - David Whittaker - Jupiter Master Drive.sndh */
+TIMEDB_ENTRY( c7aa5a55, 0, 13816, YM+TA+TB+TD), /* 01602 - Nemo - Polarnoid.sndh */
+TIMEDB_ENTRY( c7c162f8, 0, 3515, YM), /* 04533 - Greg George - Four-F.sndh */
+TIMEDB_ENTRY( c7c162f8, 1, 149, YM), /* 04533 - Greg George - Four-F.sndh */
+TIMEDB_ENTRY( c7c162f8, 2, 210, YM), /* 04533 - Greg George - Four-F.sndh */
+TIMEDB_ENTRY( c7c162f8, 3, 960, YM), /* 04533 - Greg George - Four-F.sndh */
+TIMEDB_ENTRY( c7c162f8, 4, 1660, YM), /* 04533 - Greg George - Four-F.sndh */
+TIMEDB_ENTRY( c7ca5444, 0, 6265, YM), /* 04370 - Jess - Rock (draft).sndh */
+TIMEDB_ENTRY( c7eb6d07, 0, 4320, YM), /* 03302 - CRAZY Q - TWISTED LIFE SYLE.sndh */
+TIMEDB_ENTRY( c7ec04eb, 0, 7679, YM+TA+TB), /* 02698 - Dubmood (The Herbalizer) - Herbalizer Live Interlude.sndh */
+TIMEDB_ENTRY( c7fc24fe, 0, 6138, YM+TB+TD), /* 01021 - Dma Sc - Sector One - YM Racing (YM Rockerz).sndh */
+TIMEDB_ENTRY( c80edc08, 0, 5281, YM), /* 02135 - Mad Max - Human Race Level 1 - LCD.sndh */
+TIMEDB_ENTRY( c81b26e2, 0, 8848, YM), /* 01223 - ENS - ENS 6.sndh */
+TIMEDB_ENTRY( c820c8a4, 0, 11022, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 1, 333, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 2, 289, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 3, 4216, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 4, 2688, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 5, 3696, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 6, 2688, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 7, 1536, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 8, 2048, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 9, 3584, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 10, 3072, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 11, 4608, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 12, 7296, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 13, 3200, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 14, 1578, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 15, 601, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 16, 501, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 17, 1152, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 18, 3840, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 19, 197, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c820c8a4, 20, 1920, YM), /* 01563 - Jason Page - Fire and Ice.sndh */
+TIMEDB_ENTRY( c834bd87, 0, 5372, YM), /* 01240 - Epic - Toxic O Mania.sndh */
+TIMEDB_ENTRY( c83fb5d0, 0, 6432, YM), /* 00450 - Augustin Vidovic - Magic Force.sndh */
+TIMEDB_ENTRY( c863fd43, 0, 2160, YM), /* 01730 - Peter Johnson - Robocop.sndh */
+TIMEDB_ENTRY( c863fd43, 1, 48, YM), /* 01730 - Peter Johnson - Robocop.sndh */
+TIMEDB_ENTRY( c863fd43, 2, 481, YM), /* 01730 - Peter Johnson - Robocop.sndh */
+TIMEDB_ENTRY( c863fd43, 3, 1669, YM), /* 01730 - Peter Johnson - Robocop.sndh */
+TIMEDB_ENTRY( c863fd43, 4, 4609, YM), /* 01730 - Peter Johnson - Robocop.sndh */
+TIMEDB_ENTRY( c863fd43, 5, 2304, YM), /* 01730 - Peter Johnson - Robocop.sndh */
+TIMEDB_ENTRY( c863fd43, 6, 361, YM), /* 01730 - Peter Johnson - Robocop.sndh */
+TIMEDB_ENTRY( c863fd43, 7, 120, YM), /* 01730 - Peter Johnson - Robocop.sndh */
+TIMEDB_ENTRY( c863fd43, 8, 109, YM), /* 01730 - Peter Johnson - Robocop.sndh */
+TIMEDB_ENTRY( c86f9022, 0, 9905, YM+TA+TB+TD), /* 04657 - Dma-Sc - Return of the Fighters.sndh */
+TIMEDB_ENTRY( c87748f4, 0, 11195, YM+TA+TB+TD), /* 00997 - DMA-SC - Flying Over The Earth.sndh */
+TIMEDB_ENTRY( c87dfa1f, 0, 4821, YM), /* 00229 - ACC - King of the Road.sndh */
+TIMEDB_ENTRY( c8859a00, 0, 59887, YM+TA), /* 03771 - Exarch - Excited.sndh */
+TIMEDB_ENTRY( c887513e, 0, 15360, YM), /* 02800 - Starbuck - Her 7.sndh */
+TIMEDB_ENTRY( c896a887, 0, 17271, YM+TA+TD), /* 02562 - marcer - impossamol mix.sndh */
+TIMEDB_ENTRY( c8a17152, 0, 3456, YM+TA+TD), /* 02818 - Soulmate #1 - Znax ingame tune 1.sndh */
+TIMEDB_ENTRY( c8ba0fce, 0, 14030, YM), /* 03533 - Jean Baudlot - Dragon Ninja.sndh */
+TIMEDB_ENTRY( c8ba0fce, 1, 11815, YM), /* 03533 - Jean Baudlot - Dragon Ninja.sndh */
+TIMEDB_ENTRY( c8ba0fce, 2, 2953, YM), /* 03533 - Jean Baudlot - Dragon Ninja.sndh */
+TIMEDB_ENTRY( c8ba0fce, 3, 738, YM), /* 03533 - Jean Baudlot - Dragon Ninja.sndh */
+TIMEDB_ENTRY( c8ba3168, 0, 4243, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 1, 3661, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 2, 4694, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 3, 1796, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 4, 821, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 5, 4685, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 6, 2077, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 7, 5245, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 8, 3233, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 9, 4243, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 10, 2117, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 11, 4458, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 12, 418, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 13, 581, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 14, 461, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 15, 389, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 16, 1134, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 17, 1015, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 18, 371, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 19, 773, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 20, 773, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 21, 789, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 22, 1067, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 23, 389, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 24, 659, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 25, 726, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 26, 541, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 27, 773, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8ba3168, 28, 420, YM), /* 00881 - Ben Daglish - The Games - Winter Edition.sndh */
+TIMEDB_ENTRY( c8c2490b, 0, 6911, YM), /* 02754 - Dma-Sc - Stars of the Night.sndh */
+TIMEDB_ENTRY( c8caeb3d, 0, 6522, YM), /* 04246 - 505-checkpoint - Bounce.sndh */
+TIMEDB_ENTRY( c901f2fb, 0, 5375, YM), /* 00021 - 4-Mat - Dizzy Prince Of Yolkfolk.sndh */
+TIMEDB_ENTRY( c901f2fb, 1, 1596, YM), /* 00021 - 4-Mat - Dizzy Prince Of Yolkfolk.sndh */
+TIMEDB_ENTRY( c901f2fb, 2, 1151, YM), /* 00021 - 4-Mat - Dizzy Prince Of Yolkfolk.sndh */
+TIMEDB_ENTRY( c90809a1, 0, 4224, YM), /* 00241 - Alx 33 - Yng.sndh */
+TIMEDB_ENTRY( c9118963, 0, 1729, YM), /* 00749 - Mark Cooksey - Commando.sndh */
+TIMEDB_ENTRY( c9118963, 1, 2112, YM), /* 00749 - Mark Cooksey - Commando.sndh */
+TIMEDB_ENTRY( c9118963, 2, 1536, YM), /* 00749 - Mark Cooksey - Commando.sndh */
+TIMEDB_ENTRY( c9118963, 3, 320, YM), /* 00749 - Mark Cooksey - Commando.sndh */
+TIMEDB_ENTRY( c9118963, 4, 780, YM), /* 00749 - Mark Cooksey - Commando.sndh */
+TIMEDB_ENTRY( c9118963, 5, 481, YM), /* 00749 - Mark Cooksey - Commando.sndh */
+TIMEDB_ENTRY( c9118963, 6, 889, YM), /* 00749 - Mark Cooksey - Commando.sndh */
+TIMEDB_ENTRY( c9118963, 7, 307, YM), /* 00749 - Mark Cooksey - Commando.sndh */
+TIMEDB_ENTRY( c9118963, 8, 1920, YM), /* 00749 - Mark Cooksey - Commando.sndh */
+TIMEDB_ENTRY( c9118963, 9, 78, YM), /* 00749 - Mark Cooksey - Commando.sndh */
+TIMEDB_ENTRY( c91600e6, 0, 5392, YM+TA+TB+TD), /* 00197 - 505 - Sunny.sndh */
+TIMEDB_ENTRY( c927db85, 0, 39370, YM+TA), /* 04046 - Roggie - R.F.C. Ok.sndh */
+TIMEDB_ENTRY( c92fb6cf, 0, 5567, YM), /* 00335 - Gary Wheaton - Womble Song.sndh */
+TIMEDB_ENTRY( c9376313, 0, 10092, YM+TA+TD), /* 02513 - Crazy Q - Bouncing TITS.sndh */
+TIMEDB_ENTRY( c940fc5b, 0, 5921, YM), /* 03305 - O Cornelius & G Kennett - Enterprise.sndh */
+TIMEDB_ENTRY( c940fc5b, 1, 1791, YM), /* 03305 - O Cornelius & G Kennett - Enterprise.sndh */
+TIMEDB_ENTRY( c94ae0a1, 0, 3836, YM+TA), /* 00221 - 7AN - Blip 2.sndh */
+TIMEDB_ENTRY( c96243ab, 0, 7167, YM+TA+TB), /* 02837 - maktone-fairlight - husselhof.sndh */
+TIMEDB_ENTRY( c9666046, 0, 7008, YM), /* 04345 - Nexus 6 - Red Movement.sndh */
+TIMEDB_ENTRY( c979c886, 0, 3064, YM), /* 04320 - 505-cpt^pdx - Tell me.sndh */
+TIMEDB_ENTRY( c98600ce, 0, 5668, YM+TA+TD), /* 02658 - ear_dis - peagasm.sndh */
+TIMEDB_ENTRY( c996d5e0, 0, 19201, YM), /* 00398 - Wally Beben - Wicked.sndh */
+TIMEDB_ENTRY( c996d5e0, 1, 6145, YM), /* 00398 - Wally Beben - Wicked.sndh */
+TIMEDB_ENTRY( c996d5e0, 2, 4097, YM), /* 00398 - Wally Beben - Wicked.sndh */
+TIMEDB_ENTRY( c996d5e0, 3, 408, YM), /* 00398 - Wally Beben - Wicked.sndh */
+TIMEDB_ENTRY( c996d5e0, 4, 3073, YM), /* 00398 - Wally Beben - Wicked.sndh */
+TIMEDB_ENTRY( c9ad41c0, 0, 18, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 1, 18, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 2, 30, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 4, 36, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 5, 108, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 6, 150, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 7, 63, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 8, 45, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 9, 9, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 10, 2880, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 11, 45, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 12, 66, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 13, 240, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 14, 63, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 15, 30, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 16, 39, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 17, 117, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 18, 99, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 19, 72, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 20, 12, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 21, 150, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 24, 240, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 25, 18, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 26, 9, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 27, 156, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 28, 57, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 29, 240, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 30, 99, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 31, 90, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 33, 18, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 34, 18, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 35, 15, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 36, 180, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 37, 60, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 38, 12, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 39, 99, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 40, 12, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 41, 9, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 42, 18, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 43, 45, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 44, 240, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 45, 60, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 46, 117, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 47, 850, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9ad41c0, 49, 788, YM), /* 04744 - Mark Crowe - Space Quest Chapter 1- The Sarien Encounter.sndh */
+TIMEDB_ENTRY( c9bdaa9b, 0, 58395, YM+TA), /* 04633 - TFC - Sunbeat.sndh */
+TIMEDB_ENTRY( c9ccf33e, 0, 5568, YM), /* 03236 - T1000 - The Beast Club - TBC 7.sndh */
+TIMEDB_ENTRY( c9f17485, 0, 3836, YM), /* 01862 - Lotek Style - Perfect Chipperman.sndh */
+TIMEDB_ENTRY( c9f924b5, 0, 72963, YM), /* 01808 - Barry Leitch - Super Cars 2.sndh */
+TIMEDB_ENTRY( c9f924b5, 1, 112643, YM), /* 01808 - Barry Leitch - Super Cars 2.sndh */
+TIMEDB_ENTRY( ca048487, 0, 11916, YM+TA), /* 01618 - No More - GSC 50.sndh */
+TIMEDB_ENTRY( ca2ddb75, 0, 1536, YM), /* 03239 - T1000 - The Beast Club - TBC 11.sndh */
+TIMEDB_ENTRY( ca33de93, 0, 11662, YM), /* 00502 - Tangens - The 2nd Try - Menu.sndh */
+TIMEDB_ENTRY( ca3ec858, 0, 23936, YM+TB+TD), /* 03989 - XyNo - NOT A 0110100101.sndh */
+TIMEDB_ENTRY( ca525c6a, 0, 6325, YM), /* 00446 - Augustin Vidovic - Facile.sndh */
+TIMEDB_ENTRY( ca5a32ae, 0, 3456, YM), /* 02646 - Miggy - Target (Unfinished).sndh */
+TIMEDB_ENTRY( ca5e4691, 0, 1935, YM), /* 04773 - BriteLite - Hammarsock.sndh */
+TIMEDB_ENTRY( ca6a8733, 0, 16859, YM+TA+TB+TD), /* 04247 - 505 - BRN 2010.sndh */
+TIMEDB_ENTRY( ca6c1df0, 0, 6528, YM), /* 01769 - Lap - Lap 9.sndh */
+TIMEDB_ENTRY( ca7a4bed, 0, 2131, YM), /* 01301 - Matt Furniss - Klax.sndh */
+TIMEDB_ENTRY( ca7a4bed, 1, 787, YM), /* 01301 - Matt Furniss - Klax.sndh */
+TIMEDB_ENTRY( ca7a4bed, 2, 7390, YM), /* 01301 - Matt Furniss - Klax.sndh */
+TIMEDB_ENTRY( ca7a4bed, 3, 7390, YM), /* 01301 - Matt Furniss - Klax.sndh */
+TIMEDB_ENTRY( ca7a4bed, 4, 6942, YM), /* 01301 - Matt Furniss - Klax.sndh */
+TIMEDB_ENTRY( ca7a4bed, 5, 7198, YM), /* 01301 - Matt Furniss - Klax.sndh */
+TIMEDB_ENTRY( ca7a4bed, 6, 7390, YM), /* 01301 - Matt Furniss - Klax.sndh */
+TIMEDB_ENTRY( ca7a4bed, 7, 66, YM), /* 01301 - Matt Furniss - Klax.sndh */
+TIMEDB_ENTRY( ca7a4bed, 9, 247, YM), /* 01301 - Matt Furniss - Klax.sndh */
+TIMEDB_ENTRY( ca7f6569, 0, 3057, YM), /* 04136 - Michael Haar - Der Wurm 2.sndh */
+TIMEDB_ENTRY( ca7f6569, 1, 19, YM), /* 04136 - Michael Haar - Der Wurm 2.sndh */
+TIMEDB_ENTRY( ca7f6569, 2, 9, YM), /* 04136 - Michael Haar - Der Wurm 2.sndh */
+TIMEDB_ENTRY( ca7f6569, 3, 3560, YM), /* 04136 - Michael Haar - Der Wurm 2.sndh */
+TIMEDB_ENTRY( ca7f6569, 4, 15, YM), /* 04136 - Michael Haar - Der Wurm 2.sndh */
+TIMEDB_ENTRY( ca7f6569, 5, 103, YM), /* 04136 - Michael Haar - Der Wurm 2.sndh */
+TIMEDB_ENTRY( ca7f6569, 6, 40, YM), /* 04136 - Michael Haar - Der Wurm 2.sndh */
+TIMEDB_ENTRY( ca847b86, 0, 27462, YM), /* 01914 - Mate - Just Buggin - Xenex.sndh */
+TIMEDB_ENTRY( ca87983a, 0, 144625, YM+TA), /* 03810 - Martin Walker - Spindizzy Worlds.sndh */
+TIMEDB_ENTRY( ca87983a, 1, 121746, YM+TA), /* 03810 - Martin Walker - Spindizzy Worlds.sndh */
+TIMEDB_ENTRY( ca87983a, 2, 44817, YM+TA), /* 03810 - Martin Walker - Spindizzy Worlds.sndh */
+TIMEDB_ENTRY( ca87983a, 3, 70042, YM+TA), /* 03810 - Martin Walker - Spindizzy Worlds.sndh */
+TIMEDB_ENTRY( caa63e4b, 0, 37632, YM+TA+TB+TD), /* 02543 - SCHMX & STU - TEMPLE OF SHID.sndh */
+TIMEDB_ENTRY( cabca9c7, 0, 3840, YM), /* 01132 - Tyan - Harm.sndh */
+TIMEDB_ENTRY( cac3b1bb, 0, 2383, YM), /* 03149 - n-a - Rainbows by Davidow.sndh */
+TIMEDB_ENTRY( cac60fdd, 0, 2233, YM+TA), /* 01547 - Redzone - TSC 65.sndh */
+TIMEDB_ENTRY( cacb2888, 0, 4992, YM), /* 01192 - Excellence In Art - New.sndh */
+TIMEDB_ENTRY( cacd3efd, 0, 6528, YM+TA+TD), /* 03188 - Crazy Q and dIRTY 120o - SEXGAMES.sndh */
+TIMEDB_ENTRY( cad3c9c5, 0, 448, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 1, 1335, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 2, 2448, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 3, 400, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 4, 480, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 5, 139, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 6, 148, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 7, 256, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 8, 43, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 9, 112, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 10, 132, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cad3c9c5, 11, 58, YM), /* 01063 - Jonathan Dunn - New Zealand Story.sndh */
+TIMEDB_ENTRY( cade30a5, 0, 9215, YM+TA+TB+TD), /* 03848 - lotek style-.tscc.^ymr - approaching the endzeit.sndh */
+TIMEDB_ENTRY( cae010b8, 0, 8719, YM), /* 04150 - Unknown - GGGra125.sndh */
+TIMEDB_ENTRY( caebabb8, 0, 5887, YM+TD), /* 03226 - Peace <-> Oxyron - Oxyron Party v2.sndh */
+TIMEDB_ENTRY( caf45579, 0, 9665, YM), /* 03538 - Dave Lowe - Black Hornet.sndh */
+TIMEDB_ENTRY( caf45579, 1, 3328, YM), /* 03538 - Dave Lowe - Black Hornet.sndh */
+TIMEDB_ENTRY( caf45579, 2, 3680, YM), /* 03538 - Dave Lowe - Black Hornet.sndh */
+TIMEDB_ENTRY( caf45579, 3, 2560, YM), /* 03538 - Dave Lowe - Black Hornet.sndh */
+TIMEDB_ENTRY( caf45579, 4, 113, YM), /* 03538 - Dave Lowe - Black Hornet.sndh */
+TIMEDB_ENTRY( cb0f5d99, 0, 8410, YM+TA+TD), /* 03326 - CRAZY Q - PUNK ASS MF.sndh */
+TIMEDB_ENTRY( cb1abe75, 0, 6144, YM), /* 00893 - Tomas Danko - Danko.sndh */
+TIMEDB_ENTRY( cb21aad7, 0, 9594, YM), /* 00468 - Augustin Vidovic - Zvo.sndh */
+TIMEDB_ENTRY( cb230ceb, 0, 4610, YM), /* 02927 - Allister Brimble - Wacky Darts.sndh */
+TIMEDB_ENTRY( cb230ceb, 1, 386, YM), /* 02927 - Allister Brimble - Wacky Darts.sndh */
+TIMEDB_ENTRY( cb277471, 0, 6912, YM), /* 04831 - T1000 - Bits 55e.sndh */
+TIMEDB_ENTRY( cb27c767, 0, 11292, YM+TA+TB+TD), /* 03665 - The Estate - Blackbird.sndh */
+TIMEDB_ENTRY( cb45266b, 0, 14016, YM), /* 02173 - Mad Max - Thundercats.sndh */
+TIMEDB_ENTRY( cb484820, 0, 5376, YM+TA), /* 00824 - !Cube - Shazam (Cross The Deserts).sndh */
+TIMEDB_ENTRY( cb4da967, 0, 5759, YM+TA+TB+TD), /* 02839 - maktone-fairight - shotgun.sndh */
+TIMEDB_ENTRY( cb67c425, 0, 8912, YM), /* 00297 - Gary Wheaton - Belgium.sndh */
+TIMEDB_ENTRY( cb72e4a4, 0, 19007, YM+TA+TB+TD), /* 03443 - ULTRASYD - LONESOME ROBOT.sndh */
+TIMEDB_ENTRY( cb75192c, 0, 10848, YM+TB+TD), /* 02855 - Helene - NONONO.sndh */
+TIMEDB_ENTRY( cb75a000, 0, 11264, YM), /* 00776 - Count Zero - Willy Preview.sndh */
+TIMEDB_ENTRY( cb7fd9fa, 0, 7355, YM+TB+TD), /* 01593 - Nemo - Excess.sndh */
+TIMEDB_ENTRY( cb92ad8e, 0, 2685, YM), /* 02468 - Iso - Juicy Alcohol.sndh */
+TIMEDB_ENTRY( cb99d602, 0, 8239, YM), /* 00376 - Beast - TSC - TSC 99.sndh */
+TIMEDB_ENTRY( cb9d3083, 0, 17520, YM), /* 04460 - Charles Callet - Bob Morane - Science Fiction.sndh */
+TIMEDB_ENTRY( cba8b8b4, 0, 16507, YM+TA+TB+TD), /* 03275 - Dubmood - Kompis tog fram en fet skiva och korde.sndh */
+TIMEDB_ENTRY( cbbfe050, 0, 2308, YM+TA), /* 04377 - Dhor - Jumping squares.sndh */
+TIMEDB_ENTRY( cbeedfb2, 0, 6144, YM), /* 03497 - Shamen - Certified Dope - Intro.sndh */
+TIMEDB_ENTRY( cc012723, 0, 5376, YM), /* 00809 - Crawdaddy - Rings Of Medusa Mix.sndh */
+TIMEDB_ENTRY( cc0267b2, 0, 12480, YM), /* 00131 - David Whittaker - Return to Genesis.sndh */
+TIMEDB_ENTRY( cc0267b2, 1, 81, YM), /* 00131 - David Whittaker - Return to Genesis.sndh */
+TIMEDB_ENTRY( cc0267b2, 2, 960, YM), /* 00131 - David Whittaker - Return to Genesis.sndh */
+TIMEDB_ENTRY( cc0267b2, 3, 256, YM), /* 00131 - David Whittaker - Return to Genesis.sndh */
+TIMEDB_ENTRY( cc1020eb, 0, 1199, YM), /* 01670 - Jess - 970 Bytes.sndh */
+TIMEDB_ENTRY( cc2b24cc, 0, 7429, YM), /* 04257 - 505 - Checkpoint (2002) - Etudial.sndh */
+TIMEDB_ENTRY( cc34ca47, 0, 7392, YM), /* 02035 - Mad Max - Human Race.sndh */
+TIMEDB_ENTRY( cc34ca47, 1, 3456, YM), /* 02035 - Mad Max - Human Race.sndh */
+TIMEDB_ENTRY( cc34ca47, 2, 3840, YM), /* 02035 - Mad Max - Human Race.sndh */
+TIMEDB_ENTRY( cc34ca47, 3, 8064, YM), /* 02035 - Mad Max - Human Race.sndh */
+TIMEDB_ENTRY( cc34ca47, 4, 5184, YM), /* 02035 - Mad Max - Human Race.sndh */
+TIMEDB_ENTRY( cc3d7ed0, 0, 867, YM), /* 04732 - Al Lowe - The Black Cauldron.sndh */
+TIMEDB_ENTRY( cc3d7ed0, 1, 975, YM), /* 04732 - Al Lowe - The Black Cauldron.sndh */
+TIMEDB_ENTRY( cc3d7ed0, 2, 741, YM), /* 04732 - Al Lowe - The Black Cauldron.sndh */
+TIMEDB_ENTRY( cc3d7ed0, 3, 1155, YM), /* 04732 - Al Lowe - The Black Cauldron.sndh */
+TIMEDB_ENTRY( cc3d7ed0, 4, 240, YM), /* 04732 - Al Lowe - The Black Cauldron.sndh */
+TIMEDB_ENTRY( cc3d7ed0, 5, 153, YM), /* 04732 - Al Lowe - The Black Cauldron.sndh */
+TIMEDB_ENTRY( cc3d7ed0, 6, 1407, YM), /* 04732 - Al Lowe - The Black Cauldron.sndh */
+TIMEDB_ENTRY( cc3d7ed0, 7, 318, YM), /* 04732 - Al Lowe - The Black Cauldron.sndh */
+TIMEDB_ENTRY( cc3d7ed0, 8, 195, YM), /* 04732 - Al Lowe - The Black Cauldron.sndh */
+TIMEDB_ENTRY( cc6dee92, 0, 5568, YM+TA+TB+TD), /* 00184 - 505 - Posh - Part 1.sndh */
+TIMEDB_ENTRY( cc8053db, 0, 4392, YM), /* 01801 - Barry Leitch - President Is Missing.sndh */
+TIMEDB_ENTRY( cc8610c2, 0, 36864, YM+TD), /* 01460 - STU - BOOMBAYA.sndh */
+TIMEDB_ENTRY( ccbc07a9, 0, 8069, YM), /* 02286 - Tao - Cream - State Of Confusion (Just Buggin).sndh */
+TIMEDB_ENTRY( ccceb6ca, 0, 84102, YM+TA), /* 03748 - Tufty - Kaos 1.sndh */
+TIMEDB_ENTRY( ccdabfaf, 0, 1531, YM), /* 04724 - Kevin J. Grantham - Zedoinoid.sndh */
+TIMEDB_ENTRY( ccdabfaf, 1, 244, YM), /* 04724 - Kevin J. Grantham - Zedoinoid.sndh */
+TIMEDB_ENTRY( ccff96c0, 0, 30578, YM+TA), /* 04798 - Unknown - Big in Japan.sndh */
+TIMEDB_ENTRY( cd1ff097, 0, 280, YM), /* 03075 - Nick Jones - Xevious.sndh */
+TIMEDB_ENTRY( cd1ff097, 1, 312, YM), /* 03075 - Nick Jones - Xevious.sndh */
+TIMEDB_ENTRY( cd1ff097, 2, 254, YM), /* 03075 - Nick Jones - Xevious.sndh */
+TIMEDB_ENTRY( cd23e9ac, 0, 5100, YM), /* 04611 - Richard Joseph - Demoniak.sndh */
+TIMEDB_ENTRY( cd23e9ac, 1, 95, YM), /* 04611 - Richard Joseph - Demoniak.sndh */
+TIMEDB_ENTRY( cd5e2909, 0, 388, YM), /* 02965 - Unknown - Noddy's Playtime.sndh */
+TIMEDB_ENTRY( cd5e2909, 1, 377, YM), /* 02965 - Unknown - Noddy's Playtime.sndh */
+TIMEDB_ENTRY( cd5e2909, 2, 1300, YM), /* 02965 - Unknown - Noddy's Playtime.sndh */
+TIMEDB_ENTRY( cd5e2909, 3, 199, YM), /* 02965 - Unknown - Noddy's Playtime.sndh */
+TIMEDB_ENTRY( cd5e2909, 4, 480, YM), /* 02965 - Unknown - Noddy's Playtime.sndh */
+TIMEDB_ENTRY( cd5e2909, 5, 213, YM), /* 02965 - Unknown - Noddy's Playtime.sndh */
+TIMEDB_ENTRY( cd5e2909, 6, 193, YM), /* 02965 - Unknown - Noddy's Playtime.sndh */
+TIMEDB_ENTRY( cd5e2909, 7, 1024, YM), /* 02965 - Unknown - Noddy's Playtime.sndh */
+TIMEDB_ENTRY( cd5fceb7, 0, 8696, YM+TA+TB+TD), /* 04262 - 505-cpt^pdx - Ground.sndh */
+TIMEDB_ENTRY( cd6c584d, 0, 2951, YM+TA), /* 03841 - Unknown - Into The Eagles Nest - Title.sndh */
+TIMEDB_ENTRY( cd794ce5, 0, 8640, YM+TA), /* 00787 - Crawdaddy - Electric Experience.sndh */
+TIMEDB_ENTRY( cd7db35c, 0, 6910, YM), /* 00371 - Beast - TSC - Beast New.sndh */
+TIMEDB_ENTRY( cd832f48, 0, 1562, YM), /* 03888 - Unknown - Kobyly.sndh */
+TIMEDB_ENTRY( cd8ea7fd, 0, 23296, YM+TA+TB+TD), /* 03597 - NebulaH - Crontab.sndh */
+TIMEDB_ENTRY( cd9fe1ea, 0, 135637, YM+TA), /* 04049 - Roggie - Bag of tomato crisps.sndh */
+TIMEDB_ENTRY( cda19cc4, 0, 5376, YM+TA+TB), /* 01362 - Scavenger - Credits - Synergy Megademo.sndh */
+TIMEDB_ENTRY( cda645e6, 0, 13248, YM), /* 01782 - Lap - Yo Demo Main Menu.sndh */
+TIMEDB_ENTRY( cdac174e, 0, 1686, YM), /* 03931 - Unknown - Sterrei.sndh */
+TIMEDB_ENTRY( cdb73ec6, 0, 2688, YM), /* 01483 - Holger Gehrmann - Extensor.sndh */
+TIMEDB_ENTRY( cdb73ec6, 1, 1792, YM), /* 01483 - Holger Gehrmann - Extensor.sndh */
+TIMEDB_ENTRY( cdb73ec6, 2, 308, YM), /* 01483 - Holger Gehrmann - Extensor.sndh */
+TIMEDB_ENTRY( cdb73ec6, 3, 224, YM), /* 01483 - Holger Gehrmann - Extensor.sndh */
+TIMEDB_ENTRY( cdb73ec6, 4, 2464, YM), /* 01483 - Holger Gehrmann - Extensor.sndh */
+TIMEDB_ENTRY( cdba023f, 0, 241, YM), /* 00381 - Wally Beben - Do Run Run.sndh */
+TIMEDB_ENTRY( cdba023f, 1, 98, YM), /* 00381 - Wally Beben - Do Run Run.sndh */
+TIMEDB_ENTRY( cdba023f, 2, 3201, YM), /* 00381 - Wally Beben - Do Run Run.sndh */
+TIMEDB_ENTRY( cdba023f, 3, 1281, YM), /* 00381 - Wally Beben - Do Run Run.sndh */
+TIMEDB_ENTRY( cdba023f, 4, 3073, YM), /* 00381 - Wally Beben - Do Run Run.sndh */
+TIMEDB_ENTRY( cdba023f, 5, 147, YM), /* 00381 - Wally Beben - Do Run Run.sndh */
+TIMEDB_ENTRY( cdcf4d29, 0, 8064, YM+TA), /* 00790 - Crawdaddy - Hardwired.sndh */
+TIMEDB_ENTRY( cdd32584, 0, 18809, YM), /* 01714 - Jess - Tears on my Keyboard.sndh */
+TIMEDB_ENTRY( cddd5893, 0, 583, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 1, 217, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 2, 1159, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 3, 773, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 4, 389, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 5, 261, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 6, 391, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 7, 775, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 8, 517, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 9, 3081, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 10, 2053, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 11, 775, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 12, 1159, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 13, 1029, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cddd5893, 14, 901, YM), /* 04006 - Timo Bauer - StarTrash.sndh */
+TIMEDB_ENTRY( cdeb73dc, 0, 16228, YM+TA+TD), /* 01574 - Jurgen Piscol - Oxxonian.sndh */
+TIMEDB_ENTRY( cdeb73dc, 1, 15860, YM+TA+TD), /* 01574 - Jurgen Piscol - Oxxonian.sndh */
+TIMEDB_ENTRY( cdeb73dc, 2, 15807, YM+TA+TD), /* 01574 - Jurgen Piscol - Oxxonian.sndh */
+TIMEDB_ENTRY( cdeb73dc, 3, 15808, YM+TA+TD), /* 01574 - Jurgen Piscol - Oxxonian.sndh */
+TIMEDB_ENTRY( ce081658, 0, 1321, YM), /* 03014 - Unknown - Wanderer 3D.sndh */
+TIMEDB_ENTRY( ce081658, 1, 4603, YM), /* 03014 - Unknown - Wanderer 3D.sndh */
+TIMEDB_ENTRY( ce081658, 2, 263, YM), /* 03014 - Unknown - Wanderer 3D.sndh */
+TIMEDB_ENTRY( ce081658, 3, 894, YM), /* 03014 - Unknown - Wanderer 3D.sndh */
+TIMEDB_ENTRY( ce081658, 4, 1988, YM), /* 03014 - Unknown - Wanderer 3D.sndh */
+TIMEDB_ENTRY( ce10e412, 0, 1536, YM), /* 01416 - Skyline - Snork Intro - Union.sndh */
+TIMEDB_ENTRY( ce1d88e7, 0, 10362, YM+TA), /* 01341 - Scavenger - Leif Rular - PYM.sndh */
+TIMEDB_ENTRY( ce2943e0, 0, 7676, YM), /* 01281 - Frazer - TSC 98.sndh */
+TIMEDB_ENTRY( ce513a50, 0, 12864, YM), /* 04463 - Charles Callet - Iznogoud.sndh */
+TIMEDB_ENTRY( ce513a50, 1, 3392, YM), /* 04463 - Charles Callet - Iznogoud.sndh */
+TIMEDB_ENTRY( ce7065c1, 0, 8184, YM+TA+TB+TD), /* 01860 - Lotek Style - In my Heart.sndh */
+TIMEDB_ENTRY( ce761369, 0, 37120, YM), /* 01466 - STU - FLEX FLICKER.sndh */
+TIMEDB_ENTRY( ce7b0f53, 0, 95553, YM+TA), /* 03723 - Spaz - Ooh Crikey - Reset.sndh */
+TIMEDB_ENTRY( ce7cf8c8, 0, 106349, YM+TA), /* 03730 - Martin Walker - Hunter.sndh */
+TIMEDB_ENTRY( ce91991c, 0, 38460, YM), /* 04612 - Richard Joseph - Dragons Breath.sndh */
+TIMEDB_ENTRY( ce91991c, 1, 45108, YM), /* 04612 - Richard Joseph - Dragons Breath.sndh */
+TIMEDB_ENTRY( ce91991c, 2, 12480, YM), /* 04612 - Richard Joseph - Dragons Breath.sndh */
+TIMEDB_ENTRY( cea96759, 0, 12112, YM), /* 04442 - Iso - Checkmate.sndh */
+TIMEDB_ENTRY( cec3ab5d, 0, 14601, YM), /* 04138 - Unknown - Fantastic World.sndh */
+TIMEDB_ENTRY( cec3ab5d, 1, 3724, YM), /* 04138 - Unknown - Fantastic World.sndh */
+TIMEDB_ENTRY( cec3ab5d, 2, 5026, YM), /* 04138 - Unknown - Fantastic World.sndh */
+TIMEDB_ENTRY( ced67746, 0, 4992, YM+TA+TB), /* 00186 - 505 - Posh - Part 3.sndh */
+TIMEDB_ENTRY( cee8f2ab, 0, 16849, YM+TA+TD), /* 02300 - Tao - Cream - Quest (Alive 8).sndh */
+TIMEDB_ENTRY( cef367b7, 0, 8320, YM), /* 04602 - Rude Kid - Weirdo 2.sndh */
+TIMEDB_ENTRY( cef628ae, 0, 1920, YM), /* 00912 - Dark Angel - Ace 2.sndh */
+TIMEDB_ENTRY( cef7431e, 0, 7870, YM), /* 01314 - Matt Furniss - Sabre Team.sndh */
+TIMEDB_ENTRY( cef7431e, 1, 2239, YM), /* 01314 - Matt Furniss - Sabre Team.sndh */
+TIMEDB_ENTRY( cef7431e, 2, 3070, YM), /* 01314 - Matt Furniss - Sabre Team.sndh */
+TIMEDB_ENTRY( cef7431e, 3, 320, YM), /* 01314 - Matt Furniss - Sabre Team.sndh */
+TIMEDB_ENTRY( cef7431e, 4, 269, YM), /* 01314 - Matt Furniss - Sabre Team.sndh */
+TIMEDB_ENTRY( cef7431e, 5, 3583, YM), /* 01314 - Matt Furniss - Sabre Team.sndh */
+TIMEDB_ENTRY( cef7431e, 6, 2302, YM), /* 01314 - Matt Furniss - Sabre Team.sndh */
+TIMEDB_ENTRY( cef7431e, 7, 3135, YM), /* 01314 - Matt Furniss - Sabre Team.sndh */
+TIMEDB_ENTRY( cef7431e, 8, 2522, YM), /* 01314 - Matt Furniss - Sabre Team.sndh */
+TIMEDB_ENTRY( cefd9efc, 0, 9720, YM+TA+TB), /* 01366 - Scavenger - Synical.sndh */
+TIMEDB_ENTRY( cf05d18a, 0, 5592, YM), /* 00847 - Ben Daglish - Dark Fusion.sndh */
+TIMEDB_ENTRY( cf1f811e, 0, 6155, YM), /* 02005 - Mad Max - Dark Side Of The Spoon - TLB.sndh */
+TIMEDB_ENTRY( cf1f811e, 1, 768, YM), /* 02005 - Mad Max - Dark Side Of The Spoon - TLB.sndh */
+TIMEDB_ENTRY( cf353947, 0, 8063, YM), /* 01894 - Jason Sheppard - Venus the Flytrap.sndh */
+TIMEDB_ENTRY( cf353947, 1, 6911, YM), /* 01894 - Jason Sheppard - Venus the Flytrap.sndh */
+TIMEDB_ENTRY( cf353947, 2, 2680, YM), /* 01894 - Jason Sheppard - Venus the Flytrap.sndh */
+TIMEDB_ENTRY( cf353947, 3, 1535, YM), /* 01894 - Jason Sheppard - Venus the Flytrap.sndh */
+TIMEDB_ENTRY( cf353947, 4, 1151, YM), /* 01894 - Jason Sheppard - Venus the Flytrap.sndh */
+TIMEDB_ENTRY( cf353947, 5, 761, YM), /* 01894 - Jason Sheppard - Venus the Flytrap.sndh */
+TIMEDB_ENTRY( cf353947, 6, 2687, YM), /* 01894 - Jason Sheppard - Venus the Flytrap.sndh */
+TIMEDB_ENTRY( cf353947, 7, 377, YM), /* 01894 - Jason Sheppard - Venus the Flytrap.sndh */
+TIMEDB_ENTRY( cf55417a, 0, 9722, YM), /* 01275 - Frazer - TSC 36.sndh */
+TIMEDB_ENTRY( cf56db36, 0, 10955, YM+TA+TB+TD), /* 03283 - 505-checkpoint (2003) - ahead.sndh */
+TIMEDB_ENTRY( cf823424, 0, 1182, YM), /* 03690 - Dma-Sc - Saboteur 3 - Introduction.sndh */
+TIMEDB_ENTRY( cf9c3df9, 0, 3840, YM+TA), /* 01750 - Kanewood - Paradise.sndh */
+TIMEDB_ENTRY( cfb71ab0, 0, 2333, YM), /* 03120 - Unknown - Hey Hey,My My - Neil Young.sndh */
+TIMEDB_ENTRY( cfb75681, 0, 11134, YM+TA), /* 02464 - Iso - Crazy Thing - DBA 9.sndh */
+TIMEDB_ENTRY( cfcd90d1, 0, 20448, YM+TA+TB+TD), /* 02859 - Helene - tull.sndh */
+TIMEDB_ENTRY( cfec4101, 0, 110212, YM+TA), /* 03960 - Scott Lemmon - SRL4.sndh */
+TIMEDB_ENTRY( cff247aa, 0, 762, YM+TA+TB+TD), /* 02424 - 505-cpt^dox - jingle01.sndh */
+TIMEDB_ENTRY( d0094c23, 0, 23124, YM+TB+TD), /* 03987 - XyNo - INSECURE.sndh */
+TIMEDB_ENTRY( d05d8524, 0, 11904, YM), /* 04598 - Rude Kid - Funeral.sndh */
+TIMEDB_ENTRY( d064049d, 0, 14592, YM), /* 00509 - Tangens - Sythetic Visions - Hidden Screen.sndh */
+TIMEDB_ENTRY( d064049d, 1, 10272, YM), /* 00509 - Tangens - Sythetic Visions - Hidden Screen.sndh */
+TIMEDB_ENTRY( d064049d, 2, 6144, YM), /* 00509 - Tangens - Sythetic Visions - Hidden Screen.sndh */
+TIMEDB_ENTRY( d064049d, 3, 17472, YM), /* 00509 - Tangens - Sythetic Visions - Hidden Screen.sndh */
+TIMEDB_ENTRY( d064049d, 4, 8640, YM), /* 00509 - Tangens - Sythetic Visions - Hidden Screen.sndh */
+TIMEDB_ENTRY( d064049d, 5, 11520, YM), /* 00509 - Tangens - Sythetic Visions - Hidden Screen.sndh */
+TIMEDB_ENTRY( d064049d, 6, 10080, YM), /* 00509 - Tangens - Sythetic Visions - Hidden Screen.sndh */
+TIMEDB_ENTRY( d0721025, 0, 3577, YM+TA), /* 04229 - 505 - 7th.sndh */
+TIMEDB_ENTRY( d08a23ab, 0, 3888, YM), /* 00744 - Sean Conran - Megatwins.sndh */
+TIMEDB_ENTRY( d08a23ab, 1, 384, YM), /* 00744 - Sean Conran - Megatwins.sndh */
+TIMEDB_ENTRY( d08a23ab, 2, 264, YM), /* 00744 - Sean Conran - Megatwins.sndh */
+TIMEDB_ENTRY( d08b8000, 0, 12288, YM), /* 00483 - Ultimatum - Count Zero 3.sndh */
+TIMEDB_ENTRY( d09368cb, 0, 9987, YM), /* 00771 - Count Zero - Decade Demo - Reset.sndh */
+TIMEDB_ENTRY( d09cce18, 0, 5120, YM+TA), /* 02539 - Lotus-Hotline - Monster Business.sndh */
+TIMEDB_ENTRY( d09cce18, 1, 8914, YM+TA), /* 02539 - Lotus-Hotline - Monster Business.sndh */
+TIMEDB_ENTRY( d09cce18, 2, 7812, YM+TA), /* 02539 - Lotus-Hotline - Monster Business.sndh */
+TIMEDB_ENTRY( d09cce18, 3, 9995, YM+TA), /* 02539 - Lotus-Hotline - Monster Business.sndh */
+TIMEDB_ENTRY( d09cce18, 4, 8643, YM+TA), /* 02539 - Lotus-Hotline - Monster Business.sndh */
+TIMEDB_ENTRY( d09cce18, 5, 11911, YM+TA), /* 02539 - Lotus-Hotline - Monster Business.sndh */
+TIMEDB_ENTRY( d09cce18, 6, 3712, YM+TA), /* 02539 - Lotus-Hotline - Monster Business.sndh */
+TIMEDB_ENTRY( d09cce18, 7, 7296, YM+TA), /* 02539 - Lotus-Hotline - Monster Business.sndh */
+TIMEDB_ENTRY( d0a0478f, 0, 18431, YM+TA+TB+TD), /* 03441 - ULTRASYD - THE DAY YM KILLED FAKEBIT.sndh */
+TIMEDB_ENTRY( d0a543c5, 0, 9985, YM+TA+TD), /* 02299 - Tao - Cream - Still Alive (Alive 7).sndh */
+TIMEDB_ENTRY( d0a77676, 0, 2564, YM), /* 00291 - Gary Wheaton - Bandit.sndh */
+TIMEDB_ENTRY( d0c202f0, 0, 7153, YM), /* 04385 - Paul Summers - Everton FC Intelligensia.sndh */
+TIMEDB_ENTRY( d0c202f0, 1, 205, YM), /* 04385 - Paul Summers - Everton FC Intelligensia.sndh */
+TIMEDB_ENTRY( d0c202f0, 2, 185, YM), /* 04385 - Paul Summers - Everton FC Intelligensia.sndh */
+TIMEDB_ENTRY( d0c202f0, 3, 348, YM), /* 04385 - Paul Summers - Everton FC Intelligensia.sndh */
+TIMEDB_ENTRY( d0c202f0, 4, 206, YM), /* 04385 - Paul Summers - Everton FC Intelligensia.sndh */
+TIMEDB_ENTRY( d0c202f0, 5, 374, YM), /* 04385 - Paul Summers - Everton FC Intelligensia.sndh */
+TIMEDB_ENTRY( d0c202f0, 6, 2821, YM), /* 04385 - Paul Summers - Everton FC Intelligensia.sndh */
+TIMEDB_ENTRY( d0c202f0, 7, 2188, YM), /* 04385 - Paul Summers - Everton FC Intelligensia.sndh */
+TIMEDB_ENTRY( d0d741c8, 0, 3840, YM), /* 00931 - Dark Angel - Noisy Pillars.sndh */
+TIMEDB_ENTRY( d0e4aa01, 0, 16032, YM+TA+TB+TD), /* 02088 - Mad Max - Master of Magic - Sid.sndh */
+TIMEDB_ENTRY( d0e4aa01, 1, 575, YM+TA+TB+TD), /* 02088 - Mad Max - Master of Magic - Sid.sndh */
+TIMEDB_ENTRY( d0e4aa01, 2, 1152, YM+TA+TB+TD), /* 02088 - Mad Max - Master of Magic - Sid.sndh */
+TIMEDB_ENTRY( d0f55f18, 0, 42985, YM+TA+TB+TD), /* 03563 - TomChi Noextra - CHIPVENTURE.sndh */
+TIMEDB_ENTRY( d1054f32, 0, 107072, YM+TA), /* 03767 - Waldemar Belwon - Power (Music Show 1).sndh */
+TIMEDB_ENTRY( d1126a02, 0, 4416, YM), /* 01768 - Lap - Lap 8.sndh */
+TIMEDB_ENTRY( d119ec19, 0, 8250, YM), /* 01234 - Epic - Epilsons' Nightmare.sndh */
+TIMEDB_ENTRY( d12b6cdd, 0, 1440, YM), /* 03227 - sh3 - loader rewind.sndh */
+TIMEDB_ENTRY( d12bdbdb, 0, 3086, YM+TA+TD), /* 02305 - Tao - Cream (orig. Rob Hubbard) - Commando.sndh */
+TIMEDB_ENTRY( d130e95d, 0, 2731, YM+TA+TB+TD), /* 04265 - 505-cpt^pdx - hectic.sndh */
+TIMEDB_ENTRY( d13fd641, 0, 278553, YM+TA), /* 04673 - Unknown - I Just Cant Get Enough.sndh */
+TIMEDB_ENTRY( d1460223, 0, 7723, YM+TA), /* 01544 - Ralph - Ralph Digi 1.sndh */
+TIMEDB_ENTRY( d158574e, 0, 2112, YM), /* 00077 - David Whittaker - BMX Simulator.sndh */
+TIMEDB_ENTRY( d158574e, 1, 225, YM), /* 00077 - David Whittaker - BMX Simulator.sndh */
+TIMEDB_ENTRY( d158574e, 2, 193, YM), /* 00077 - David Whittaker - BMX Simulator.sndh */
+TIMEDB_ENTRY( d15fed50, 0, 6176, YM), /* 00327 - Gary Wheaton - Ram on.sndh */
+TIMEDB_ENTRY( d192467c, 0, 63799, YM+TA), /* 04624 - Andre Hollweg - Explorer.sndh */
+TIMEDB_ENTRY( d1a32da4, 0, 6080, YM+TA+TD), /* 02863 - marcer - souns of 1985-2006.sndh */
+TIMEDB_ENTRY( d1a7dd4b, 0, 3119, YM), /* 01292 - Matt Furniss - Carvup.sndh */
+TIMEDB_ENTRY( d1a7dd4b, 1, 3199, YM), /* 01292 - Matt Furniss - Carvup.sndh */
+TIMEDB_ENTRY( d1a7dd4b, 2, 3199, YM), /* 01292 - Matt Furniss - Carvup.sndh */
+TIMEDB_ENTRY( d1a7dd4b, 3, 3359, YM), /* 01292 - Matt Furniss - Carvup.sndh */
+TIMEDB_ENTRY( d1b00941, 0, 691, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 1, 863, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 2, 623, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 3, 687, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 4, 887, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 5, 623, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 6, 431, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 7, 496, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 8, 604, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 9, 728, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 10, 1001, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 11, 614, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 12, 863, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 13, 623, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 14, 687, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 15, 887, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 16, 623, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 17, 431, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 18, 496, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 19, 614, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 20, 622, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1b00941, 21, 216, YM), /* 04521 - Vivian Peschardt - Denver - Je decouvre les chiffres.sndh */
+TIMEDB_ENTRY( d1c7fc9f, 0, 3855, YM), /* 01322 - Matt Furniss - Toobin.sndh */
+TIMEDB_ENTRY( d1c7fc9f, 1, 1928, YM), /* 01322 - Matt Furniss - Toobin.sndh */
+TIMEDB_ENTRY( d1c7fc9f, 2, 2460, YM), /* 01322 - Matt Furniss - Toobin.sndh */
+TIMEDB_ENTRY( d1c7fc9f, 3, 3087, YM), /* 01322 - Matt Furniss - Toobin.sndh */
+TIMEDB_ENTRY( d1c7fc9f, 4, 2247, YM), /* 01322 - Matt Furniss - Toobin.sndh */
+TIMEDB_ENTRY( d1cc615d, 0, 2563, YM+TA), /* 01662 - Jedi - Virtual Escape Intro.sndh */
+TIMEDB_ENTRY( d1dbd514, 0, 3920, YM), /* 01201 - Excellence In Art - Spunge.sndh */
+TIMEDB_ENTRY( d1e364b8, 0, 2688, YM), /* 03653 - Tomchi - Pakakaka.sndh */
+TIMEDB_ENTRY( d1e644cf, 0, 42311, YM+TA), /* 03740 - Tufty - Acappella Choir.sndh */
+TIMEDB_ENTRY( d1e68c94, 0, 13945, YM+TA+TD), /* 01591 - Nemo ( 2003 ) - Double Danger Action Agents (YM Rockerz).sndh */
+TIMEDB_ENTRY( d1e87fdb, 0, 7693, YM), /* 01129 - Tyan - Revolution - Distomatic.sndh */
+TIMEDB_ENTRY( d1ed13d1, 0, 5370, YM), /* 01695 - Jess - For your Loader #1.sndh */
+TIMEDB_ENTRY( d1ffb61d, 0, 7094, YM+TA+TB+TD), /* 00211 - 505 - Useless.sndh */
+TIMEDB_ENTRY( d200eaae, 0, 31047, YM+TA+TB+TD), /* 03558 - Marcer - No Ecuador.sndh */
+TIMEDB_ENTRY( d212a72f, 0, 7387, YM), /* 00560 - Allister Brimble - Spellfire The Sorceror.sndh */
+TIMEDB_ENTRY( d212a72f, 1, 379, YM), /* 00560 - Allister Brimble - Spellfire The Sorceror.sndh */
+TIMEDB_ENTRY( d212a72f, 2, 91, YM), /* 00560 - Allister Brimble - Spellfire The Sorceror.sndh */
+TIMEDB_ENTRY( d2224e7c, 0, 43201, YM+TA), /* 04664 - Przybyszewski - Anthrax.sndh */
+TIMEDB_ENTRY( d2473448, 0, 8057, YM+TA), /* 01713 - Jess - My ST suntans in Brazil.sndh */
+TIMEDB_ENTRY( d24de703, 0, 5957, YM+TA+TB+TD), /* 04483 - corpsicle - olympian.sndh */
+TIMEDB_ENTRY( d25aaebf, 0, 9952, YM), /* 04470 - Charles Callet - Les Ripoux.sndh */
+TIMEDB_ENTRY( d268a213, 0, 11321, YM), /* 04132 - Wally Beben - Superman - The Man of Steel.sndh */
+TIMEDB_ENTRY( d268a213, 1, 1920, YM), /* 04132 - Wally Beben - Superman - The Man of Steel.sndh */
+TIMEDB_ENTRY( d268a213, 2, 5360, YM), /* 04132 - Wally Beben - Superman - The Man of Steel.sndh */
+TIMEDB_ENTRY( d26ab283, 0, 2095, YM), /* 00312 - Gary Wheaton - Junk.sndh */
+TIMEDB_ENTRY( d27f555c, 0, 8733, YM+TA), /* 01526 - Iso - Hiya Placez.sndh */
+TIMEDB_ENTRY( d2932e8e, 0, 6912, YM), /* 01003 - DMA-SC - Mr Boomer.sndh */
+TIMEDB_ENTRY( d29f8d1e, 0, 416, YM), /* 01247 - Janko Mrsic Flogel - Bombjack.sndh */
+TIMEDB_ENTRY( d29f8d1e, 1, 256, YM), /* 01247 - Janko Mrsic Flogel - Bombjack.sndh */
+TIMEDB_ENTRY( d29f8d1e, 2, 488, YM), /* 01247 - Janko Mrsic Flogel - Bombjack.sndh */
+TIMEDB_ENTRY( d29f8d1e, 3, 512, YM), /* 01247 - Janko Mrsic Flogel - Bombjack.sndh */
+TIMEDB_ENTRY( d29f8d1e, 4, 512, YM), /* 01247 - Janko Mrsic Flogel - Bombjack.sndh */
+TIMEDB_ENTRY( d29f8d1e, 5, 248, YM), /* 01247 - Janko Mrsic Flogel - Bombjack.sndh */
+TIMEDB_ENTRY( d29f8d1e, 6, 512, YM), /* 01247 - Janko Mrsic Flogel - Bombjack.sndh */
+TIMEDB_ENTRY( d2b42ac8, 0, 12201, YM), /* 03530 - Jean Baudlot - Beach Volley.sndh */
+TIMEDB_ENTRY( d2b42ac8, 1, 24575, YM), /* 03530 - Jean Baudlot - Beach Volley.sndh */
+TIMEDB_ENTRY( d2b42ac8, 2, 5119, YM), /* 03530 - Jean Baudlot - Beach Volley.sndh */
+TIMEDB_ENTRY( d2b42ac8, 3, 4607, YM), /* 03530 - Jean Baudlot - Beach Volley.sndh */
+TIMEDB_ENTRY( d2b42ac8, 4, 3692, YM), /* 03530 - Jean Baudlot - Beach Volley.sndh */
+TIMEDB_ENTRY( d2b42ac8, 5, 3459, YM), /* 03530 - Jean Baudlot - Beach Volley.sndh */
+TIMEDB_ENTRY( d2b46a8c, 0, 6713, YM+TA+TB+TD), /* 00277 - Baggio - Magmakt.sndh */
+TIMEDB_ENTRY( d2c50ea8, 0, 8320, YM+TA+TB+TD), /* 03331 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( d2c9a559, 0, 6272, YM), /* 00603 - Chris Mad - Overdrive Vector.sndh */
+TIMEDB_ENTRY( d2caa33f, 0, 1275, YM+TA+TB+TD), /* 01950 - MSG - Chu Chu Rocket - Speed Up.sndh */
+TIMEDB_ENTRY( d2cae2b6, 0, 8370, YM), /* 03140 - n-a - Money for Nothing.sndh */
+TIMEDB_ENTRY( d2df67b7, 0, 4992, YM+TA+TB+TD), /* 00185 - 505 - Posh - Part 2.sndh */
+TIMEDB_ENTRY( d2e36b56, 0, 123011, YM+TA), /* 03776 - Stewart Gardner - Stampede 5.sndh */
+TIMEDB_ENTRY( d2edab52, 0, 9212, YM+TA+TB+TD), /* 04112 - 505 - Checkpoint - mysery.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 0, 10080, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 1, 1536, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 2, 10624, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 3, 2048, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 4, 1152, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 5, 154, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 6, 150, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 7, 9728, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 8, 2496, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 9, 9216, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 10, 1152, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 11, 2688, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 12, 171, YM), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 13, 512, YM), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 14, 6456, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 15, 1536, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 16, 5568, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 17, 1440, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 18, 1920, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 19, 1885, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 20, 10496, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 21, 2402, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 22, 6144, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 23, 15600, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 24, 2816, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 25, 1080, YM), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 26, 2816, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 27, 5472, YM), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2f3c6bb, 28, 2560, YM+TA), /* 02221 - Mad Max - Turrican 2.sndh */
+TIMEDB_ENTRY( d2fc8516, 0, 26731, YM+TB+TD), /* 02443 - cerror - Taoism.sndh */
+TIMEDB_ENTRY( d3098d04, 0, 4708, YM), /* 00316 - Gary Wheaton - Lisa.sndh */
+TIMEDB_ENTRY( d31c66cf, 0, 6403, YM+TA), /* 02675 - Donald Fakk - Kvant Krull Kompott.sndh */
+TIMEDB_ENTRY( d31de3bf, 0, 7530, YM), /* 00012 - 4-Mat - Chuck Rock.sndh */
+TIMEDB_ENTRY( d33eddd9, 0, 177228, YM+TA), /* 03942 - Unknown - Adamski 7.sndh */
+TIMEDB_ENTRY( d3473ca6, 0, 3937, YM), /* 04151 - Unknown - Infanzia.sndh */
+TIMEDB_ENTRY( d362e9ae, 0, 8448, YM), /* 01077 - Excellence In Art - Concert.sndh */
+TIMEDB_ENTRY( d366b673, 0, 9216, YM+TA+TD), /* 02671 - Donald Fakk - Human Race - tune 4.sndh */
+TIMEDB_ENTRY( d3802740, 0, 889, YM+TA+TD), /* 04282 - 505 - Loop06.sndh */
+TIMEDB_ENTRY( d384127f, 0, 752, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 1, 872, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 2, 864, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 3, 940, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 4, 512, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 5, 366, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 6, 64, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 7, 149, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 8, 1600, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 9, 845, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 10, 845, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 11, 845, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d384127f, 12, 533, YM), /* 04702 - Unknown - Nova Cam.sndh */
+TIMEDB_ENTRY( d38512c2, 0, 775, YM), /* 03911 - Unknown - D1 MLike.sndh */
+TIMEDB_ENTRY( d3a1a667, 0, 22528, YM+TD), /* 02605 - STU - MUSHROOM.sndh */
+TIMEDB_ENTRY( d3a23289, 0, 2592, YM), /* 00575 - Jas C Brooke - Sidearms.sndh */
+TIMEDB_ENTRY( d3a23289, 1, 512, YM), /* 00575 - Jas C Brooke - Sidearms.sndh */
+TIMEDB_ENTRY( d3a23289, 2, 288, YM), /* 00575 - Jas C Brooke - Sidearms.sndh */
+TIMEDB_ENTRY( d3ab72da, 0, 6144, YM), /* 04829 - T1000 - Bits 55b.sndh */
+TIMEDB_ENTRY( d3b0e310, 0, 28736, YM+TA+TB+TD), /* 03468 - Marcer - YM Out.sndh */
+TIMEDB_ENTRY( d3b4c932, 0, 46416, YM+TA), /* 03792 - Roggie - Minuet 2.sndh */
+TIMEDB_ENTRY( d3b9562f, 0, 6272, YM+TA), /* 01710 - Jess - A 60's Slow.sndh */
+TIMEDB_ENTRY( d3c2d60e, 0, 649, YM), /* 01906 - Marcer - Hu.sndh */
+TIMEDB_ENTRY( d3d07c52, 0, 3073, YM), /* 03890 - Unknown - Menuett.sndh */
+TIMEDB_ENTRY( d3e32337, 0, 4602, YM+TA+TB+TD), /* 02824 - Msg - Superfly tune 1.sndh */
+TIMEDB_ENTRY( d3ec14f9, 0, 2752, YM), /* 01249 - Janko Mrsic Flogel - Metropolis.sndh */
+TIMEDB_ENTRY( d3ec14f9, 1, 1024, YM), /* 01249 - Janko Mrsic Flogel - Metropolis.sndh */
+TIMEDB_ENTRY( d3f3b079, 0, 3584, YM), /* 03628 - Unknown - Sommarhack 2011 Unknown.sndh */
+TIMEDB_ENTRY( d3fccfc6, 0, 3936, YM), /* 01876 - Dave Lowe - Altered Beast.sndh */
+TIMEDB_ENTRY( d3fccfc6, 1, 4416, YM), /* 01876 - Dave Lowe - Altered Beast.sndh */
+TIMEDB_ENTRY( d3fccfc6, 2, 4416, YM), /* 01876 - Dave Lowe - Altered Beast.sndh */
+TIMEDB_ENTRY( d3fccfc6, 3, 3520, YM), /* 01876 - Dave Lowe - Altered Beast.sndh */
+TIMEDB_ENTRY( d3fccfc6, 4, 3072, YM), /* 01876 - Dave Lowe - Altered Beast.sndh */
+TIMEDB_ENTRY( d3fccfc6, 5, 2048, YM), /* 01876 - Dave Lowe - Altered Beast.sndh */
+TIMEDB_ENTRY( d3fccfc6, 6, 7093, YM), /* 01876 - Dave Lowe - Altered Beast.sndh */
+TIMEDB_ENTRY( d3fccfc6, 7, 660, YM), /* 01876 - Dave Lowe - Altered Beast.sndh */
+TIMEDB_ENTRY( d3fee8a0, 0, 813, YM), /* 03923 - Unknown - Musik.sndh */
+TIMEDB_ENTRY( d406f0ef, 0, 7120, YM), /* 01266 - Frazer - Frantic.sndh */
+TIMEDB_ENTRY( d40bc48a, 0, 11898, YM+TB+TD), /* 03520 - Nemo - DHS - Aqua Polka.sndh */
+TIMEDB_ENTRY( d4211ea2, 0, 6912, YM+TA+TB+TD), /* 00070 - 505 - Lala.sndh */
+TIMEDB_ENTRY( d437770c, 0, 11272, YM+TA+TD), /* 02262 - Tao - Cream - Ride The Sky (Steps).sndh */
+TIMEDB_ENTRY( d437eec6, 0, 1914, YM+TA), /* 01343 - Scavenger - Let's Talk About Max.sndh */
+TIMEDB_ENTRY( d4401668, 0, 19074, YM+TA+TC+TD), /* 04367 - Purple Motion (ST adaption by Dma-Sc) - Second Reality 2013 main.sndh */
+TIMEDB_ENTRY( d4404f79, 0, 13228, YM), /* 04398 - Paul Summers - Rainbow Warriors.sndh */
+TIMEDB_ENTRY( d4404f79, 1, 8839, YM), /* 04398 - Paul Summers - Rainbow Warriors.sndh */
+TIMEDB_ENTRY( d4404f79, 2, 17144, YM), /* 04398 - Paul Summers - Rainbow Warriors.sndh */
+TIMEDB_ENTRY( d4404f79, 3, 11769, YM), /* 04398 - Paul Summers - Rainbow Warriors.sndh */
+TIMEDB_ENTRY( d4404f79, 4, 12976, YM), /* 04398 - Paul Summers - Rainbow Warriors.sndh */
+TIMEDB_ENTRY( d4404f79, 5, 14890, YM), /* 04398 - Paul Summers - Rainbow Warriors.sndh */
+TIMEDB_ENTRY( d4404f79, 6, 12948, YM), /* 04398 - Paul Summers - Rainbow Warriors.sndh */
+TIMEDB_ENTRY( d4591664, 0, 4608, YM), /* 00974 - Chris Denman - Airbucks.sndh */
+TIMEDB_ENTRY( d4591664, 1, 512, YM), /* 00974 - Chris Denman - Airbucks.sndh */
+TIMEDB_ENTRY( d4591664, 2, 512, YM), /* 00974 - Chris Denman - Airbucks.sndh */
+TIMEDB_ENTRY( d4591664, 3, 2304, YM), /* 00974 - Chris Denman - Airbucks.sndh */
+TIMEDB_ENTRY( d4591664, 4, 1280, YM), /* 00974 - Chris Denman - Airbucks.sndh */
+TIMEDB_ENTRY( d4591664, 5, 512, YM), /* 00974 - Chris Denman - Airbucks.sndh */
+TIMEDB_ENTRY( d45eefd3, 0, 25984, YM+TA+TD), /* 02333 - Tao - Cream - Stars (Stmygm2).sndh */
+TIMEDB_ENTRY( d479e1e3, 0, 38755, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 1, 4612, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 2, 6147, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 3, 5123, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 4, 6147, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 5, 7683, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 6, 4611, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 7, 4611, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 8, 4611, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 9, 6147, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 10, 6147, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 11, 29284, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 12, 28675, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 13, 35475, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 14, 40323, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 15, 35331, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 16, 30820, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 17, 28803, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 18, 33027, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 19, 27651, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 20, 61443, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d479e1e3, 21, 4612, YM), /* 01812 - Barry Leitch & Sean Connolly - Prophecy I - Viking Child.sndh */
+TIMEDB_ENTRY( d4842722, 0, 12800, YM), /* 02048 - Mad Max - Phantom Of The Asteroid.sndh */
+TIMEDB_ENTRY( d4842722, 1, 6912, YM), /* 02048 - Mad Max - Phantom Of The Asteroid.sndh */
+TIMEDB_ENTRY( d48c913d, 0, 8704, YM), /* 00014 - 4-Mat - G-Loc.sndh */
+TIMEDB_ENTRY( d4985978, 0, 4992, YM), /* 01199 - Excellence In Art - Smile.sndh */
+TIMEDB_ENTRY( d4a595ef, 0, 7700, YM+TA+TD), /* 04782 - gwEm - Trans-Debug Express (orig edit).sndh */
+TIMEDB_ENTRY( d4c06138, 0, 6265, YM+TA+TB+TD), /* 00282 - Baggio - Finale.sndh */
+TIMEDB_ENTRY( d4c07d72, 0, 10158, YM), /* 00759 - Count Zero - Count Zero Again - Maggie 8.sndh */
+TIMEDB_ENTRY( d4d70b62, 0, 3084, YM), /* 03860 - Dma-Sc - Skit 4kb.sndh */
+TIMEDB_ENTRY( d4f18263, 0, 10027, YM), /* 01539 - Ralph - Ralph 7.sndh */
+TIMEDB_ENTRY( d50127c9, 0, 6153, YM), /* 01495 - Alex Herbert - Bombz.sndh */
+TIMEDB_ENTRY( d50127c9, 1, 8320, YM), /* 01495 - Alex Herbert - Bombz.sndh */
+TIMEDB_ENTRY( d50127c9, 2, 9344, YM), /* 01495 - Alex Herbert - Bombz.sndh */
+TIMEDB_ENTRY( d50127c9, 3, 16896, YM), /* 01495 - Alex Herbert - Bombz.sndh */
+TIMEDB_ENTRY( d50127c9, 4, 1536, YM), /* 01495 - Alex Herbert - Bombz.sndh */
+TIMEDB_ENTRY( d50127c9, 5, 12544, YM), /* 01495 - Alex Herbert - Bombz.sndh */
+TIMEDB_ENTRY( d50127c9, 6, 3968, YM), /* 01495 - Alex Herbert - Bombz.sndh */
+TIMEDB_ENTRY( d50127c9, 7, 6144, YM), /* 01495 - Alex Herbert - Bombz.sndh */
+TIMEDB_ENTRY( d50127c9, 8, 17676, YM), /* 01495 - Alex Herbert - Bombz.sndh */
+TIMEDB_ENTRY( d50127c9, 9, 2096, YM), /* 01495 - Alex Herbert - Bombz.sndh */
+TIMEDB_ENTRY( d5060e28, 0, 6857, YM), /* 01302 - Matt Furniss - Lords Of Chaos.sndh */
+TIMEDB_ENTRY( d514da56, 0, 378, YM), /* 01911 - Marcer - Ojoj.sndh */
+TIMEDB_ENTRY( d52ed309, 0, 13056, YM), /* 01653 - Jedi - Nuisance.sndh */
+TIMEDB_ENTRY( d5309031, 0, 3072, YM+TA), /* 00792 - Crawdaddy - Indian.sndh */
+TIMEDB_ENTRY( d530f65e, 0, 1532, YM+TA), /* 04240 - 505 - Anfang.sndh */
+TIMEDB_ENTRY( d535ed42, 0, 7290, YM), /* 00458 - Augustin Vidovic - Punish Your Machine Loader.sndh */
+TIMEDB_ENTRY( d536d94e, 0, 261, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 1, 279, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 2, 262, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 3, 265, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 4, 179, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 5, 191, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 6, 215, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 7, 229, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 8, 234, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 9, 239, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 10, 285, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 11, 230, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 12, 411, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 13, 265, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 14, 239, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d536d94e, 15, 1076, YM), /* 04693 - Dan Sharpe - Makers match.sndh */
+TIMEDB_ENTRY( d5830c35, 0, 22527, YM+TA+TB+TD), /* 03003 - 505-paradox - upbuzzer.sndh */
+TIMEDB_ENTRY( d5840c66, 0, 2328, YM+TA+TB+TD), /* 04264 - 505-cpt^pdx - Hall of Fame.sndh */
+TIMEDB_ENTRY( d5885164, 0, 7035, YM+TB+TD), /* 01599 - Nemo - Mischief.sndh */
+TIMEDB_ENTRY( d5975740, 0, 10944, YM), /* 02223 - Mad Max - Warp.sndh */
+TIMEDB_ENTRY( d5975740, 1, 3971, YM), /* 02223 - Mad Max - Warp.sndh */
+TIMEDB_ENTRY( d5975740, 2, 3456, YM), /* 02223 - Mad Max - Warp.sndh */
+TIMEDB_ENTRY( d5975740, 3, 4736, YM), /* 02223 - Mad Max - Warp.sndh */
+TIMEDB_ENTRY( d5975740, 4, 7392, YM), /* 02223 - Mad Max - Warp.sndh */
+TIMEDB_ENTRY( d5975740, 5, 982, YM), /* 02223 - Mad Max - Warp.sndh */
+TIMEDB_ENTRY( d5975740, 6, 288, YM), /* 02223 - Mad Max - Warp.sndh */
+TIMEDB_ENTRY( d5975740, 7, 4608, YM), /* 02223 - Mad Max - Warp.sndh */
+TIMEDB_ENTRY( d5a9e389, 0, 1920, YM), /* 02149 - Mad Max - Mad Max Tune 4 - LSD.sndh */
+TIMEDB_ENTRY( d5e45f05, 0, 38418, YM+TA+TB+TD), /* 02748 - Marcer - BREATH OUTLINE.sndh */
+TIMEDB_ENTRY( d603c7a0, 0, 441, YM+TA), /* 00828 - Crazy Q -- TiMeBoMb - - Mono minded shit!.sndh */
+TIMEDB_ENTRY( d60fdf9d, 0, 5760, YM), /* 01162 - Tyan - Tyan 1.sndh */
+TIMEDB_ENTRY( d6246ebb, 0, 6522, YM+TA+TB), /* 00903 - Danny Oneway - Hidden 2.sndh */
+TIMEDB_ENTRY( d626f1cf, 0, 20480, YM+TB+TD), /* 03463 - Marcer - Paradize.sndh */
+TIMEDB_ENTRY( d62c56ca, 0, 1294, YM), /* 04606 - White Ninja - Zoolookologic.sndh */
+TIMEDB_ENTRY( d6571e3c, 0, 2978, YM), /* 03036 - Ed Bogas - Ballad.sndh */
+TIMEDB_ENTRY( d661fadf, 0, 47056, YM+TA+TD), /* 03414 - Tao - Cream (orig. Lotek Style-tSCc) - Sweety (Main Tune).sndh */
+TIMEDB_ENTRY( d668a0b5, 0, 60930, YM+TA), /* 03736 - David Whittaker - Supremacy.sndh */
+TIMEDB_ENTRY( d66b346f, 0, 11138, YM), /* 00429 - Big Alec - PYM - Sickest So Far.sndh */
+TIMEDB_ENTRY( d68e33ce, 0, 15375, YM+TA+TB+TD), /* 03270 - Dubmood - Still DRE Alla Man borde ringt live vers.sndh */
+TIMEDB_ENTRY( d69b35bd, 0, 69520, YM+TA), /* 03704 - Sparky - Dogs Life - For PP Sledgehammer.sndh */
+TIMEDB_ENTRY( d6a5a6d7, 0, 12545, YM+TA), /* 04392 - Golden Otter - Hibernation Carol Demo.sndh */
+TIMEDB_ENTRY( d6a5a6d7, 1, 22802, YM+TA), /* 04392 - Golden Otter - Hibernation Carol Demo.sndh */
+TIMEDB_ENTRY( d6a5a6d7, 2, 36183, YM+TA), /* 04392 - Golden Otter - Hibernation Carol Demo.sndh */
+TIMEDB_ENTRY( d6a5a6d7, 3, 6145, YM+TA), /* 04392 - Golden Otter - Hibernation Carol Demo.sndh */
+TIMEDB_ENTRY( d6a5a6d7, 4, 9271, YM+TA), /* 04392 - Golden Otter - Hibernation Carol Demo.sndh */
+TIMEDB_ENTRY( d6a5a6d7, 5, 84099, YM+TA), /* 04392 - Golden Otter - Hibernation Carol Demo.sndh */
+TIMEDB_ENTRY( d6a5a6d7, 6, 40925, YM+TA), /* 04392 - Golden Otter - Hibernation Carol Demo.sndh */
+TIMEDB_ENTRY( d6a5a6d7, 7, 36902, YM+TA), /* 04392 - Golden Otter - Hibernation Carol Demo.sndh */
+TIMEDB_ENTRY( d6a5a6d7, 8, 8577, YM+TA), /* 04392 - Golden Otter - Hibernation Carol Demo.sndh */
+TIMEDB_ENTRY( d6a5a6d7, 9, 7237, YM+TA), /* 04392 - Golden Otter - Hibernation Carol Demo.sndh */
+TIMEDB_ENTRY( d6af7069, 0, 6272, YM), /* 01188 - Excellence In Art - Kitten.sndh */
+TIMEDB_ENTRY( d6d5d0d5, 0, 3649, YM+TA+TB+TD), /* 02094 - Mad Max - Sam Fox Strip Poker - Sid.sndh */
+TIMEDB_ENTRY( d6d5d0d5, 1, 418, YM+TA+TB+TD), /* 02094 - Mad Max - Sam Fox Strip Poker - Sid.sndh */
+TIMEDB_ENTRY( d6d5d0d5, 2, 193, YM+TA+TB+TD), /* 02094 - Mad Max - Sam Fox Strip Poker - Sid.sndh */
+TIMEDB_ENTRY( d6d5d0d5, 3, 193, YM+TA+TB+TD), /* 02094 - Mad Max - Sam Fox Strip Poker - Sid.sndh */
+TIMEDB_ENTRY( d6d5d0d5, 4, 1750, YM+TA+TB+TD), /* 02094 - Mad Max - Sam Fox Strip Poker - Sid.sndh */
+TIMEDB_ENTRY( d6d5d0d5, 5, 96, YM+TA+TB+TD), /* 02094 - Mad Max - Sam Fox Strip Poker - Sid.sndh */
+TIMEDB_ENTRY( d6e2e254, 0, 142913, YM+TA), /* 03836 - Martin Walker - Devious Designs Digi.sndh */
+TIMEDB_ENTRY( d6e2e254, 1, 58788, YM+TA), /* 03836 - Martin Walker - Devious Designs Digi.sndh */
+TIMEDB_ENTRY( d6e994aa, 0, 2503, YM+TA), /* 04421 - EVE - Stack Row.sndh */
+TIMEDB_ENTRY( d6fc04a8, 0, 12993, YM+TA+TD), /* 02296 - Tao - Cream - Thing (Alive 4).sndh */
+TIMEDB_ENTRY( d71de918, 0, 20616, YM+TA+TB+TD), /* 03345 - Marcer - SORN DESTINY.sndh */
+TIMEDB_ENTRY( d72ee71f, 0, 3410, YM), /* 02143 - Mad Max - Flash Gordon - LSD.sndh */
+TIMEDB_ENTRY( d730c8db, 0, 13254, YM), /* 01424 - Spector - Manic Demo - 3D Balls.sndh */
+TIMEDB_ENTRY( d745b1fa, 0, 1100, YM), /* 03684 - Dma-Sc - Saboteur 3 - Crew Logo.sndh */
+TIMEDB_ENTRY( d762ac76, 0, 11744, YM), /* 01877 - Dave Lowe - Bangkok Knights.sndh */
+TIMEDB_ENTRY( d762ac76, 1, 1024, YM), /* 01877 - Dave Lowe - Bangkok Knights.sndh */
+TIMEDB_ENTRY( d762ac76, 2, 10624, YM), /* 01877 - Dave Lowe - Bangkok Knights.sndh */
+TIMEDB_ENTRY( d7760970, 0, 10745, YM+TA+TB+TD), /* 01944 - MSG - Chu Chu Rocket - Credits.sndh */
+TIMEDB_ENTRY( d78b99f6, 0, 6175, YM+TA+TB+TD), /* 02732 - maktone-fairlight - shaman.sndh */
+TIMEDB_ENTRY( d7a32db1, 0, 2448, YM), /* 04387 - Paul Summers - Fighting Soccer.sndh */
+TIMEDB_ENTRY( d7a32db1, 1, 2688, YM), /* 04387 - Paul Summers - Fighting Soccer.sndh */
+TIMEDB_ENTRY( d7a32db1, 2, 235, YM), /* 04387 - Paul Summers - Fighting Soccer.sndh */
+TIMEDB_ENTRY( d7a32db1, 3, 208, YM), /* 04387 - Paul Summers - Fighting Soccer.sndh */
+TIMEDB_ENTRY( d7a32db1, 4, 1056, YM), /* 04387 - Paul Summers - Fighting Soccer.sndh */
+TIMEDB_ENTRY( d7a32db1, 5, 2688, YM), /* 04387 - Paul Summers - Fighting Soccer.sndh */
+TIMEDB_ENTRY( d7a32db1, 6, 378, YM), /* 04387 - Paul Summers - Fighting Soccer.sndh */
+TIMEDB_ENTRY( d7a32db1, 7, 144, YM), /* 04387 - Paul Summers - Fighting Soccer.sndh */
+TIMEDB_ENTRY( d7a32db1, 8, 1843, YM), /* 04387 - Paul Summers - Fighting Soccer.sndh */
+TIMEDB_ENTRY( d7a88c17, 0, 121743, YM+TA), /* 04362 - X The Beermat - Yours.sndh */
+TIMEDB_ENTRY( d7cb3159, 0, 4032, YM+TA), /* 00817 - Crawdaddy - Walkman.sndh */
+TIMEDB_ENTRY( d7ce8025, 0, 768, YM+TA), /* 03864 - Mr Coke - Chasey Loader.sndh */
+TIMEDB_ENTRY( d7d8b1ba, 0, 81053, YM+TA), /* 03782 - Max Headroom - Aquanaut.sndh */
+TIMEDB_ENTRY( d7dc1900, 0, 2687, YM+TA+TB+TD), /* 02730 - maktone-fairlight - new start.sndh */
+TIMEDB_ENTRY( d7e95dae, 0, 5568, YM+TA+TB+TD), /* 02853 - Helene - hmmmm.sndh */
+TIMEDB_ENTRY( d7f5df4f, 0, 8413, YM+TA+TB+TD), /* 02096 - Mad Max - Sanxion Title - Sid.sndh */
+TIMEDB_ENTRY( d7fbc1cf, 0, 7161, YM+TA+TB+TD), /* 01967 - MSG - Godpey - Story 2.sndh */
+TIMEDB_ENTRY( d7fc2a5e, 0, 123873, YM+TA), /* 04026 - Roggie - Echoes.sndh */
+TIMEDB_ENTRY( d7fc628c, 0, 28896, YM+TA+TB+TD), /* 02910 - Helene - Temp.sndh */
+TIMEDB_ENTRY( d815cdbe, 0, 2684, YM), /* 02434 - Beast - TSC - Evert.sndh */
+TIMEDB_ENTRY( d816e5e6, 0, 1920, YM), /* 01088 - Techno - Dentro 3.sndh */
+TIMEDB_ENTRY( d81df61c, 0, 24024, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 1, 21976, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 2, 24534, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 3, 24021, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 4, 28120, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 5, 24664, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 6, 10972, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 7, 9812, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 8, 2692, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 9, 11095, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 10, 16937, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 11, 17186, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 12, 3138, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 13, 5678, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 14, 7613, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 15, 2597, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81df61c, 16, 7578, YM), /* 01326 - Scavenger - Crapman.sndh */
+TIMEDB_ENTRY( d81efd02, 0, 5698, YM), /* 00503 - Tangens - The 2nd Try - Star Demo.sndh */
+TIMEDB_ENTRY( d8240c6e, 0, 5187, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 1, 4352, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 2, 960, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 3, 103, YM), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 4, 6480, YM), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 5, 6656, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 6, 6740, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 7, 1409, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 8, 85, YM), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 9, 2592, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 10, 5376, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 11, 7520, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 12, 7488, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 13, 4176, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 14, 1760, YM+TA), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 15, 91, YM), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d8240c6e, 16, 7424, YM), /* 02222 - Mad Max - Turrican.sndh */
+TIMEDB_ENTRY( d84e4888, 0, 7576, YM+TA+TB+TD), /* 00198 - 505 - Surprise.sndh */
+TIMEDB_ENTRY( d85d8e21, 0, 3200, YM+TA+TD), /* 02767 - Bobby Prince ST by Dma-Sc - Wondering About My Loved....sndh */
+TIMEDB_ENTRY( d86e3d04, 0, 8255, YM), /* 03446 - 505-paradox - Cubes.sndh */
+TIMEDB_ENTRY( d8867f29, 0, 3640, YM), /* 00961 - Mike Davies - Die Hard 2.sndh */
+TIMEDB_ENTRY( d8867f29, 1, 2160, YM), /* 00961 - Mike Davies - Die Hard 2.sndh */
+TIMEDB_ENTRY( d8867f29, 2, 1922, YM), /* 00961 - Mike Davies - Die Hard 2.sndh */
+TIMEDB_ENTRY( d8867f29, 3, 125, YM), /* 00961 - Mike Davies - Die Hard 2.sndh */
+TIMEDB_ENTRY( d8867f29, 4, 68, YM), /* 00961 - Mike Davies - Die Hard 2.sndh */
+TIMEDB_ENTRY( d8867f29, 5, 68, YM), /* 00961 - Mike Davies - Die Hard 2.sndh */
+TIMEDB_ENTRY( d8867f29, 6, 125, YM), /* 00961 - Mike Davies - Die Hard 2.sndh */
+TIMEDB_ENTRY( d888616e, 0, 5795, YM), /* 00939 - Dark Angel - Music Mon Tunes.sndh */
+TIMEDB_ENTRY( d888616e, 1, 2112, YM), /* 00939 - Dark Angel - Music Mon Tunes.sndh */
+TIMEDB_ENTRY( d888616e, 2, 3840, YM), /* 00939 - Dark Angel - Music Mon Tunes.sndh */
+TIMEDB_ENTRY( d888616e, 3, 6528, YM), /* 00939 - Dark Angel - Music Mon Tunes.sndh */
+TIMEDB_ENTRY( d888616e, 4, 5952, YM), /* 00939 - Dark Angel - Music Mon Tunes.sndh */
+TIMEDB_ENTRY( d888616e, 5, 3072, YM), /* 00939 - Dark Angel - Music Mon Tunes.sndh */
+TIMEDB_ENTRY( d888616e, 6, 4560, YM), /* 00939 - Dark Angel - Music Mon Tunes.sndh */
+TIMEDB_ENTRY( d888616e, 7, 6720, YM), /* 00939 - Dark Angel - Music Mon Tunes.sndh */
+TIMEDB_ENTRY( d88d14fc, 0, 12282, YM+TA+TB+TD), /* 01588 - Nemo - Beaucoup Sun.sndh */
+TIMEDB_ENTRY( d89721cc, 0, 65, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 1, 51, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 2, 51, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 3, 32, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 4, 35, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 5, 38, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 6, 9, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 7, 36, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 8, 26, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 9, 26, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 10, 575, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 11, 21, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 12, 36, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 13, 53, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 14, 46, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 15, 62, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 16, 23, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 17, 23, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 18, 23, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 19, 22, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 20, 9, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 21, 4224, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 22, 12160, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d89721cc, 23, 6144, YM), /* 00774 - Count Zero - Killing Game Show.sndh */
+TIMEDB_ENTRY( d8b66be0, 0, 137838, YM+TA), /* 04338 - Rob Povey - Quartet 1.0 demo tunes.sndh */
+TIMEDB_ENTRY( d8b66be0, 1, 39858, YM+TA), /* 04338 - Rob Povey - Quartet 1.0 demo tunes.sndh */
+TIMEDB_ENTRY( d8b66be0, 2, 59664, YM+TA), /* 04338 - Rob Povey - Quartet 1.0 demo tunes.sndh */
+TIMEDB_ENTRY( d8b66be0, 3, 48072, YM+TA), /* 04338 - Rob Povey - Quartet 1.0 demo tunes.sndh */
+TIMEDB_ENTRY( d8b66be0, 4, 44029, YM+TA), /* 04338 - Rob Povey - Quartet 1.0 demo tunes.sndh */
+TIMEDB_ENTRY( d8c67ef6, 0, 19008, YM), /* 02119 - Mad Max - Bangkok Nights.sndh */
+TIMEDB_ENTRY( d8cc7658, 0, 6912, YM), /* 04826 - T1000 - Bits 45.sndh */
+TIMEDB_ENTRY( d8d3be34, 0, 1363, YM), /* 01900 - Luebke - IRC Simulator.sndh */
+TIMEDB_ENTRY( d8ee76ed, 0, 4223, YM+TA+TD), /* 02498 - gwEm - U.L.S. Loader.sndh */
+TIMEDB_ENTRY( d8fd86e3, 0, 6914, YM), /* 01043 - Dr Beat - Imagination - Enola Gay.sndh */
+TIMEDB_ENTRY( d90609e2, 0, 58112, YM+TA+TB+TD), /* 02663 - STU - MEGABLAST.sndh */
+TIMEDB_ENTRY( d920221b, 0, 2189, YM), /* 00963 - Mike Davies - England Championship Special.sndh */
+TIMEDB_ENTRY( d9255810, 0, 2177, YM), /* 00499 - Tangens - The 2nd Try - Doc Screen.sndh */
+TIMEDB_ENTRY( d92d0991, 0, 1341, YM), /* 02467 - Iso - Introtune.sndh */
+TIMEDB_ENTRY( d9409c35, 0, 7487, YM+TA+TB+TD), /* 03018 - Dubmood - Zabutoms Bice4.sndh */
+TIMEDB_ENTRY( d966d13d, 0, 13951, YM+TA+TB+TD), /* 02525 - dubmood Marcer & Nightbeat - Muslichip.sndh */
+TIMEDB_ENTRY( d976aeb0, 0, 17017, YM+TA+TD), /* 01137 - Tyan - Julia 1.sndh */
+TIMEDB_ENTRY( d97cf52b, 0, 19008, YM+TA+TD), /* 02252 - Tao - Cream - Cultivation (Steps).sndh */
+TIMEDB_ENTRY( d98d6e29, 0, 85811, YM+TA), /* 03709 - Sparky - Sledge - For PP Sledgehammer.sndh */
+TIMEDB_ENTRY( d9989e36, 0, 6720, YM+TA+TB+TD), /* 00985 - D-Force - Summer.sndh */
+TIMEDB_ENTRY( d9b6a11b, 0, 3645, YM+TA+TB+TD), /* 04293 - 505 - Checkpoint - noir.sndh */
+TIMEDB_ENTRY( d9d16c83, 0, 6138, YM+TA+TD), /* 01141 - Tyan - Julia 5.sndh */
+TIMEDB_ENTRY( d9e3f9db, 0, 7110, YM), /* 03010 - Fred Gray - Star Goose.sndh */
+TIMEDB_ENTRY( d9e3f9db, 2, 447, YM), /* 03010 - Fred Gray - Star Goose.sndh */
+TIMEDB_ENTRY( d9e49cb5, 0, 2307, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 1, 3145, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 2, 4403, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 3, 579, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 4, 643, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 5, 4035, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 6, 291, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 7, 7858, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 8, 1200, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 9, 4395, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 10, 579, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 11, 3843, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 12, 2115, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 13, 3459, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 14, 835, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 15, 451, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 16, 1155, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 17, 1155, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 18, 3201, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9e49cb5, 19, 1539, YM), /* 01793 - Barry Leitch - Gemini Wing.sndh */
+TIMEDB_ENTRY( d9f1537f, 0, 10656, YM), /* 02153 - Mad Max - Ooh Crikey - No Sheep.sndh */
+TIMEDB_ENTRY( d9f719cd, 0, 14604, YM+TA), /* 02682 - Donald Fakk - Steam Dream.sndh */
+TIMEDB_ENTRY( da11e462, 0, 21928, YM+TA+TB+TD), /* 03464 - Marcer - Popcorn.sndh */
+TIMEDB_ENTRY( da202c20, 0, 1631, YM+TD), /* 03470 - gwEm (Mad Max conversion) - Wings of Death #6.sndh */
+TIMEDB_ENTRY( da21a346, 0, 10362, YM+TA+TD), /* 02479 - Floopy - Cassiop e.sndh */
+TIMEDB_ENTRY( da22a0bb, 0, 6656, YM), /* 03658 - Jedi - DNT Paper 4 intro - Song 2.sndh */
+TIMEDB_ENTRY( da303bc9, 0, 4991, YM), /* 01309 - Matt Furniss - Pitfighter.sndh */
+TIMEDB_ENTRY( da382412, 0, 8000, YM), /* 04842 - t1000 - Bits 37.sndh */
+TIMEDB_ENTRY( da390a6f, 0, 9309, YM+TA+TB+TD), /* 03580 - Divag - Drum n Buzz.sndh */
+TIMEDB_ENTRY( da512160, 0, 2420, YM), /* 03086 - Unknown - Metro Cross.sndh */
+TIMEDB_ENTRY( da512160, 1, 15367, YM), /* 03086 - Unknown - Metro Cross.sndh */
+TIMEDB_ENTRY( da512160, 2, 619, YM), /* 03086 - Unknown - Metro Cross.sndh */
+TIMEDB_ENTRY( da512160, 3, 299, YM), /* 03086 - Unknown - Metro Cross.sndh */
+TIMEDB_ENTRY( da59c334, 0, 1260, YM), /* 01990 - Mad Max - Hexer.sndh */
+TIMEDB_ENTRY( da5b1349, 0, 2880, YM), /* 00975 - Chris Denman - Cohort 2 - Fighting For Rome.sndh */
+TIMEDB_ENTRY( da688877, 0, 9603, YM+TA+TD), /* 02355 - Tao - Cream - Sidchimes (YM Rockerz 1).sndh */
+TIMEDB_ENTRY( da6ab68c, 0, 2559, YM+TA+TB+TD), /* 03267 - Dubmood - KOLOBKI VODKA DANCE.sndh */
+TIMEDB_ENTRY( da7841b3, 0, 1792, YM), /* 03207 - Chris Denman - Striker.sndh */
+TIMEDB_ENTRY( da85a916, 0, 35328, YM+TA+TB+TD), /* 03330 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( da8b4f1d, 0, 7771, YM), /* 00864 - Ben Daglish - Motor Massacre.sndh */
+TIMEDB_ENTRY( da8b4f1d, 1, 936, YM), /* 00864 - Ben Daglish - Motor Massacre.sndh */
+TIMEDB_ENTRY( da8b4f1d, 2, 359, YM), /* 00864 - Ben Daglish - Motor Massacre.sndh */
+TIMEDB_ENTRY( da8b4f1d, 3, 257, YM), /* 00864 - Ben Daglish - Motor Massacre.sndh */
+TIMEDB_ENTRY( da8b4f1d, 4, 658, YM), /* 00864 - Ben Daglish - Motor Massacre.sndh */
+TIMEDB_ENTRY( da986208, 0, 7148, YM+TA+TB+TD), /* 02779 - Alchemist - TUC Compo Entry (BFP 06).sndh */
+TIMEDB_ENTRY( daa08cbd, 0, 3456, YM), /* 01764 - Lap - Lap 4.sndh */
+TIMEDB_ENTRY( dabd0f6d, 0, 14018, YM), /* 00440 - Big Alec - Traffic.sndh */
+TIMEDB_ENTRY( dac05279, 0, 384, YM), /* 03496 - Shamen - Certified Dope - In Space.sndh */
+TIMEDB_ENTRY( dac31e15, 0, 12666, YM), /* 00500 - Tangens - The 2nd Try - Landscape.sndh */
+TIMEDB_ENTRY( dad1894d, 0, 11904, YM+TA), /* 02129 - Mad Max - Life's A Bitch - GigaTex.sndh */
+TIMEDB_ENTRY( dadac5e6, 0, 8112, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dadac5e6, 1, 315, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dadac5e6, 2, 6528, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dadac5e6, 3, 12672, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dadac5e6, 4, 1120, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dadac5e6, 5, 2048, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dadac5e6, 6, 1152, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dadac5e6, 7, 864, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dadac5e6, 8, 1280, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dadac5e6, 9, 1008, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dadac5e6, 10, 960, YM), /* 01798 - Barry Leitch - Lotus Turbo Challenge 2.sndh */
+TIMEDB_ENTRY( dae63ffc, 0, 3066, YM+TA), /* 02640 - Miggy - DevilVer2(Unfinished).sndh */
+TIMEDB_ENTRY( daf97772, 0, 70614, YM+TA), /* 04635 - TFC - Disco II.sndh */
+TIMEDB_ENTRY( db0412b8, 0, 25088, YM), /* 01420 - Sonic - Hype.sndh */
+TIMEDB_ENTRY( db09e17e, 0, 16896, YM), /* 00487 - Ultimatum - Kidney Bean 3.sndh */
+TIMEDB_ENTRY( db1fd431, 0, 2262, YM), /* 03067 - Chris French - Good King Wenceslas.sndh */
+TIMEDB_ENTRY( db20f6e5, 0, 15680, YM+TA+TB), /* 01866 - Lotek Style - Sad.sndh */
+TIMEDB_ENTRY( db35c13a, 0, 10362, YM+TA+TB+TD), /* 01008 - DMA-SC - Pie Bill Gates - Menu.sndh */
+TIMEDB_ENTRY( db376cf4, 0, 23041, YM+TA), /* 04803 - Unknown - Flying Shark.sndh */
+TIMEDB_ENTRY( db561d60, 0, 8327, YM), /* 03118 - Unknown - Goodbye Yellow Brick Road.sndh */
+TIMEDB_ENTRY( db572f78, 0, 8826, YM+TA+TB+TD), /* 03195 - Carbon - UCM 18.sndh */
+TIMEDB_ENTRY( db595e25, 0, 23552, YM+TA+TB+TD), /* 03523 - BIOSCILLATOR - ROTTERDAM ATARI ACID.sndh */
+TIMEDB_ENTRY( db59b2e8, 0, 20736, YM), /* 00441 - Big Alec - Twilight Beyond.sndh */
+TIMEDB_ENTRY( db5d3c5a, 0, 6222, YM+TA+TB+TD), /* 04578 - MSG - RG (2003) - EIL 3.sndh */
+TIMEDB_ENTRY( db5dc23c, 0, 8829, YM+TA+TD), /* 02335 - Tao - Cream - Torture (DHS online ssd compo).sndh */
+TIMEDB_ENTRY( db62b2b3, 0, 8953, YM+TA+TB+TD), /* 00080 - 505 - Checkpoint^Creators ( 2003 ) - Manic (YM Rockerz).sndh */
+TIMEDB_ENTRY( db6679ae, 0, 3262, YM), /* 01824 - Pierre-Eric Loriaux - Elf.sndh */
+TIMEDB_ENTRY( db6679ae, 1, 4219, YM), /* 01824 - Pierre-Eric Loriaux - Elf.sndh */
+TIMEDB_ENTRY( db6679ae, 2, 4349, YM), /* 01824 - Pierre-Eric Loriaux - Elf.sndh */
+TIMEDB_ENTRY( db6679ae, 3, 3036, YM), /* 01824 - Pierre-Eric Loriaux - Elf.sndh */
+TIMEDB_ENTRY( db6679ae, 4, 4316, YM), /* 01824 - Pierre-Eric Loriaux - Elf.sndh */
+TIMEDB_ENTRY( db6679ae, 5, 5725, YM), /* 01824 - Pierre-Eric Loriaux - Elf.sndh */
+TIMEDB_ENTRY( db6679ae, 6, 5725, YM), /* 01824 - Pierre-Eric Loriaux - Elf.sndh */
+TIMEDB_ENTRY( db686050, 0, 3449, YM), /* 04072 - Gary Wheaton - Handle With Care.sndh */
+TIMEDB_ENTRY( db71cda5, 0, 3839, YM), /* 03592 - Dma-Sc - Happy 2011!!!!!!!!!!!!!!!!.sndh */
+TIMEDB_ENTRY( db86a92b, 0, 7872, YM), /* 00783 - Crawdaddy - Enigma Force.sndh */
+TIMEDB_ENTRY( db8cdec5, 0, 117126, YM+TA+TB+TD), /* 04256 - 505 - Checkpoint - EIL99 testsong.sndh */
+TIMEDB_ENTRY( db8dadca, 0, 12673, YM), /* 02021 - Mad Max - Battle Of Britain.sndh */
+TIMEDB_ENTRY( db98a346, 0, 4218, YM+TA), /* 01155 - Tyan - Senseless.sndh */
+TIMEDB_ENTRY( db993294, 0, 4896, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 1, 289, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 2, 97, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 3, 73, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 4, 256, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 5, 1601, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 6, 1536, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 7, 129, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 8, 512, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 9, 768, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 10, 1872, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 11, 593, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 12, 359, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 13, 976, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 14, 713, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 15, 541, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 16, 1044, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 17, 1044, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 18, 761, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 19, 760, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 20, 736, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 21, 553, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 22, 761, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 23, 377, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 24, 400, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 25, 449, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 26, 760, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 27, 304, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 28, 256, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( db993294, 29, 1120, YM), /* 01892 - Dave Lowe - Summer Games.sndh */
+TIMEDB_ENTRY( dbb04250, 0, 11137, YM+TA+TD), /* 01872 - Lotek Style - Sweety.sndh */
+TIMEDB_ENTRY( dbb6421c, 0, 43008, YM+TD), /* 02537 - Remo - Tough Mothafucka.sndh */
+TIMEDB_ENTRY( dbc40773, 0, 2112, YM), /* 02219 - Mad Max - Thalion.sndh */
+TIMEDB_ENTRY( dbc40773, 1, 7872, YM), /* 02219 - Mad Max - Thalion.sndh */
+TIMEDB_ENTRY( dbc40773, 2, 5047, YM), /* 02219 - Mad Max - Thalion.sndh */
+TIMEDB_ENTRY( dbc40773, 3, 192, YM), /* 02219 - Mad Max - Thalion.sndh */
+TIMEDB_ENTRY( dbc40773, 4, 480, YM), /* 02219 - Mad Max - Thalion.sndh */
+TIMEDB_ENTRY( dbd2e70f, 0, 6144, YM), /* 01430 - Starbuck - Rocket.sndh */
+TIMEDB_ENTRY( dbd3c7e1, 0, 235825, YM+TA), /* 03701 - Sparky - Absentia.sndh */
+TIMEDB_ENTRY( dbd90140, 0, 10068, YM), /* 01486 - Holger Gehrmann - Oil Imperium.sndh */
+TIMEDB_ENTRY( dbd90140, 1, 5076, YM), /* 01486 - Holger Gehrmann - Oil Imperium.sndh */
+TIMEDB_ENTRY( dc20e456, 0, 5214, YM), /* 03105 - n-a - I Can See Clearly Now.sndh */
+TIMEDB_ENTRY( dc24995a, 0, 2682, YM+TA), /* 04323 - 505-cpt^pdx - Tsrups.sndh */
+TIMEDB_ENTRY( dc2a5e38, 0, 9726, YM), /* 04065 - Gary Wheaton - Chuckie Egg 2.sndh */
+TIMEDB_ENTRY( dc2fea6d, 0, 959, YM+TA+TD), /* 02654 - Dma-Sc - POOZ - The Lab.sndh */
+TIMEDB_ENTRY( dc331f15, 0, 7428, YM+TA+TB), /* 00207 - 505 - UCM 14.sndh */
+TIMEDB_ENTRY( dc40a8d8, 0, 15840, YM+TA), /* 01644 - Jedi - For Jeff.sndh */
+TIMEDB_ENTRY( dc828d00, 0, 13439, YM+TA+TB+TD), /* 04758 - Shinobi - Drop Zoner.sndh */
+TIMEDB_ENTRY( dc8654c8, 0, 11519, YM+TA+TB+TD), /* 02784 - gwEm - Future Gone Wrong.sndh */
+TIMEDB_ENTRY( dc902a39, 0, 18624, YM+TA), /* 02128 - Mad Max - Beat Nick.sndh */
+TIMEDB_ENTRY( dc95372a, 0, 8827, YM), /* 00553 - Allister Brimble - Kamikaze.sndh */
+TIMEDB_ENTRY( dc95372a, 1, 1915, YM), /* 00553 - Allister Brimble - Kamikaze.sndh */
+TIMEDB_ENTRY( dca12676, 0, 18240, YM+TD), /* 01995 - Mad Max - Auf Weidersehen Monty - digidrums.sndh */
+TIMEDB_ENTRY( dca399f9, 0, 2875, YM), /* 01639 - Jason - Silly - STE only.sndh */
+TIMEDB_ENTRY( dca4cc63, 0, 5115, YM+TA+TB+TD), /* 00190 - 505 - Smurfy.sndh */
+TIMEDB_ENTRY( dca92951, 0, 47631, YM+TA+TD), /* 03564 - Tao - Cream (2010) - Heftig (Sillyventure 2010).sndh */
+TIMEDB_ENTRY( dcb3ba9b, 0, 4298, YM), /* 03164 - Unknown - Silent Night - Franz Gruber.sndh */
+TIMEDB_ENTRY( dcc31ecc, 0, 227495, YM+TA), /* 04806 - Unknown - Magnetic Fields.sndh */
+TIMEDB_ENTRY( dcc68a4d, 0, 12160, YM), /* 03649 - Chris Mad - David Whittaker Demo.sndh */
+TIMEDB_ENTRY( dcd09be2, 0, 7493, YM+TA), /* 04414 - EVE - Loading & Decrunching.sndh */
+TIMEDB_ENTRY( dcd0e02d, 0, 52036, YM+TA), /* 04676 - Unknown - Idea.sndh */
+TIMEDB_ENTRY( dcd274f9, 0, 23034, YM), /* 01677 - Jess - My First Resonant Burp (STf).sndh */
+TIMEDB_ENTRY( dcd4953e, 0, 83072, YM+TA), /* 03770 - Steve Wetherill - Projectyle.sndh */
+TIMEDB_ENTRY( dcd4953e, 1, 62140, YM+TA), /* 03770 - Steve Wetherill - Projectyle.sndh */
+TIMEDB_ENTRY( dcd4953e, 2, 89961, YM+TA), /* 03770 - Steve Wetherill - Projectyle.sndh */
+TIMEDB_ENTRY( dcd4953e, 3, 40970, YM+TA), /* 03770 - Steve Wetherill - Projectyle.sndh */
+TIMEDB_ENTRY( dcd4953e, 4, 234749, YM+TA), /* 03770 - Steve Wetherill - Projectyle.sndh */
+TIMEDB_ENTRY( dcd4953e, 5, 311586, YM+TA), /* 03770 - Steve Wetherill - Projectyle.sndh */
+TIMEDB_ENTRY( dcd4953e, 6, 74669, YM+TA), /* 03770 - Steve Wetherill - Projectyle.sndh */
+TIMEDB_ENTRY( dcd4953e, 7, 10001, YM+TA), /* 03770 - Steve Wetherill - Projectyle.sndh */
+TIMEDB_ENTRY( dcd9b691, 0, 3840, YM), /* 00907 - Danny Oneway - Logan.sndh */
+TIMEDB_ENTRY( dcd9ee5b, 0, 6400, YM), /* 00606 - Chris Mad - Phalanx Mega Dister.sndh */
+TIMEDB_ENTRY( dce50e74, 0, 1917, YM), /* 00556 - Allister Brimble - Rampart.sndh */
+TIMEDB_ENTRY( dce50e74, 1, 956, YM), /* 00556 - Allister Brimble - Rampart.sndh */
+TIMEDB_ENTRY( dce50e74, 2, 139, YM), /* 00556 - Allister Brimble - Rampart.sndh */
+TIMEDB_ENTRY( dce50e74, 3, 139, YM), /* 00556 - Allister Brimble - Rampart.sndh */
+TIMEDB_ENTRY( dce50e74, 4, 129, YM), /* 00556 - Allister Brimble - Rampart.sndh */
+TIMEDB_ENTRY( dce50e74, 5, 272, YM), /* 00556 - Allister Brimble - Rampart.sndh */
+TIMEDB_ENTRY( dce50e74, 6, 76, YM), /* 00556 - Allister Brimble - Rampart.sndh */
+TIMEDB_ENTRY( dce50e74, 7, 187, YM), /* 00556 - Allister Brimble - Rampart.sndh */
+TIMEDB_ENTRY( dce50e74, 8, 378, YM), /* 00556 - Allister Brimble - Rampart.sndh */
+TIMEDB_ENTRY( dce72ffd, 0, 74161, YM+TA), /* 03840 - Tufty - Killer.sndh */
+TIMEDB_ENTRY( dcf9b333, 0, 11040, YM), /* 00588 - Celtic - Space Invaders - TFU Reset.sndh */
+TIMEDB_ENTRY( dcfb13ca, 0, 8256, YM+TA), /* 00263 - Antichrist - Speedzak.sndh */
+TIMEDB_ENTRY( dd1d07f0, 0, 3744, YM), /* 01383 - Chris Scudds - Hydra.sndh */
+TIMEDB_ENTRY( dd1d07f0, 1, 3456, YM), /* 01383 - Chris Scudds - Hydra.sndh */
+TIMEDB_ENTRY( dd1d07f0, 2, 3072, YM), /* 01383 - Chris Scudds - Hydra.sndh */
+TIMEDB_ENTRY( dd1d07f0, 3, 1152, YM), /* 01383 - Chris Scudds - Hydra.sndh */
+TIMEDB_ENTRY( dd1d5f5f, 0, 22020, YM), /* 00767 - Count Zero - Decade Demo - Mainmenu.sndh */
+TIMEDB_ENTRY( dd27750b, 0, 7708, YM), /* 01565 - Jason Page - Paradroid 90.sndh */
+TIMEDB_ENTRY( dd27750b, 1, 2716, YM), /* 01565 - Jason Page - Paradroid 90.sndh */
+TIMEDB_ENTRY( dd27750b, 2, 337, YM), /* 01565 - Jason Page - Paradroid 90.sndh */
+TIMEDB_ENTRY( dd27750b, 3, 412, YM), /* 01565 - Jason Page - Paradroid 90.sndh */
+TIMEDB_ENTRY( dd27750b, 4, 406, YM), /* 01565 - Jason Page - Paradroid 90.sndh */
+TIMEDB_ENTRY( dd2c8fe2, 0, 8058, YM+TA), /* 01365 - Scavenger - Sample Animal is Alive!.sndh */
+TIMEDB_ENTRY( dd396e4e, 0, 11560, YM), /* 03402 - Unknown - Tiger Road.sndh */
+TIMEDB_ENTRY( dd411d05, 0, 10745, YM+TA+TB+TD), /* 00982 - D-Force - Bytes.sndh */
+TIMEDB_ENTRY( dd4b0659, 0, 15177, YM), /* 02062 - Mad Max - Zoids.sndh */
+TIMEDB_ENTRY( dd4c0fea, 0, 12800, YM), /* 01637 - Nexus - PETE - Wild Boys.sndh */
+TIMEDB_ENTRY( dd4ddf9f, 0, 1920, YM), /* 00486 - Ultimatum - Kidney Bean 2.sndh */
+TIMEDB_ENTRY( dd603d4c, 0, 5619, YM), /* 01320 - Matt Furniss - The Spy Who Loved Me.sndh */
+TIMEDB_ENTRY( dd603d4c, 1, 7494, YM), /* 01320 - Matt Furniss - The Spy Who Loved Me.sndh */
+TIMEDB_ENTRY( dd6922cc, 0, 889, YM+TA+TB+TD), /* 01948 - MSG - Chu Chu Rocket - Results.sndh */
+TIMEDB_ENTRY( dd6a5647, 0, 3396, YM), /* 01925 - The Mind - Genesys Remix - Main Menu.sndh */
+TIMEDB_ENTRY( dd71184e, 0, 19744, YM), /* 00343 - Tony Williams - Ninja Warriors.sndh */
+TIMEDB_ENTRY( dd7ee208, 0, 41371, YM+TA), /* 04044 - Roggie - Is he a mule?.sndh */
+TIMEDB_ENTRY( dd9df0b2, 0, 9120, YM), /* 01787 - Anthony Lees - Incredible Shrinking Sphere.sndh */
+TIMEDB_ENTRY( dd9df0b2, 1, 145, YM), /* 01787 - Anthony Lees - Incredible Shrinking Sphere.sndh */
+TIMEDB_ENTRY( dd9df0b2, 2, 66, YM), /* 01787 - Anthony Lees - Incredible Shrinking Sphere.sndh */
+TIMEDB_ENTRY( dd9df0b2, 3, 31, YM), /* 01787 - Anthony Lees - Incredible Shrinking Sphere.sndh */
+TIMEDB_ENTRY( dd9df0b2, 4, 31, YM), /* 01787 - Anthony Lees - Incredible Shrinking Sphere.sndh */
+TIMEDB_ENTRY( dd9df0b2, 5, 81, YM), /* 01787 - Anthony Lees - Incredible Shrinking Sphere.sndh */
+TIMEDB_ENTRY( dd9df0b2, 6, 11, YM), /* 01787 - Anthony Lees - Incredible Shrinking Sphere.sndh */
+TIMEDB_ENTRY( ddc18eeb, 0, 10746, YM+TA+TB+TD), /* 00998 - DMA-SC - Gr00vix.sndh */
+TIMEDB_ENTRY( ddc3e416, 0, 3840, YM), /* 01096 - Techno - Plucked Goose.sndh */
+TIMEDB_ENTRY( ddc4b469, 0, 7200, YM), /* 04469 - Charles Callet - Prohibition.sndh */
+TIMEDB_ENTRY( ddc62fc9, 0, 3834, YM), /* 01229 - Epic - Got No Respect For The Law.sndh */
+TIMEDB_ENTRY( dddca2cb, 0, 3750, YM), /* 03492 - Simon Berry - Backlash.sndh */
+TIMEDB_ENTRY( de0f51a4, 0, 4218, YM+TA), /* 01340 - Scavenger - Knuckle Joe 2.sndh */
+TIMEDB_ENTRY( de20d9ef, 0, 4352, YM), /* 01075 - Excellence In Art - Blommor.sndh */
+TIMEDB_ENTRY( de2c8be5, 0, 6911, YM), /* 03645 - 505 - Shazz YM6channel 123.sndh */
+TIMEDB_ENTRY( de2c9fb9, 0, 9249, YM), /* 00842 - Ben Daglish - Butcher Hill.sndh */
+TIMEDB_ENTRY( de2c9fb9, 1, 8783, YM), /* 00842 - Ben Daglish - Butcher Hill.sndh */
+TIMEDB_ENTRY( de2c9fb9, 2, 9252, YM), /* 00842 - Ben Daglish - Butcher Hill.sndh */
+TIMEDB_ENTRY( de2c9fb9, 3, 8319, YM), /* 00842 - Ben Daglish - Butcher Hill.sndh */
+TIMEDB_ENTRY( de2c9fb9, 6, 10561, YM), /* 00842 - Ben Daglish - Butcher Hill.sndh */
+TIMEDB_ENTRY( de2e1e47, 0, 5760, YM), /* 01489 - Fred Gray - Black Lamp.sndh */
+TIMEDB_ENTRY( de2e1e47, 1, 2880, YM), /* 01489 - Fred Gray - Black Lamp.sndh */
+TIMEDB_ENTRY( de2e1e47, 2, 437, YM), /* 01489 - Fred Gray - Black Lamp.sndh */
+TIMEDB_ENTRY( de341604, 0, 14352, YM+TA), /* 04403 - Scavenger - Anarchy.sndh */
+TIMEDB_ENTRY( de361082, 0, 3360, YM), /* 04485 - Ralph Effemey - 3D aSTeroids.sndh */
+TIMEDB_ENTRY( de361082, 1, 335, YM), /* 04485 - Ralph Effemey - 3D aSTeroids.sndh */
+TIMEDB_ENTRY( de361082, 2, 1828, YM), /* 04485 - Ralph Effemey - 3D aSTeroids.sndh */
+TIMEDB_ENTRY( de361082, 3, 1828, YM), /* 04485 - Ralph Effemey - 3D aSTeroids.sndh */
+TIMEDB_ENTRY( de361082, 4, 1280, YM), /* 04485 - Ralph Effemey - 3D aSTeroids.sndh */
+TIMEDB_ENTRY( de361082, 5, 518, YM), /* 04485 - Ralph Effemey - 3D aSTeroids.sndh */
+TIMEDB_ENTRY( de50676e, 0, 13824, YM+TA+TB+TD), /* 03457 - Marcer - Thalion Intro.sndh */
+TIMEDB_ENTRY( de57adb7, 0, 9603, YM), /* 00421 - Big Alec - PYM - Best Part Of Creation.sndh */
+TIMEDB_ENTRY( de5f08a6, 0, 50703, YM+TA+TD), /* 03617 - Tao-Cream (2011) - Ultraflow.sndh */
+TIMEDB_ENTRY( de729049, 0, 984, YM+TA+TD), /* 02507 - Q - intro v2.sndh */
+TIMEDB_ENTRY( de78d317, 0, 7710, YM+TA+TB+TD), /* 02998 - 505-paradox - reasonless.sndh */
+TIMEDB_ENTRY( de9041a5, 0, 8447, YM+TA+TB+TD), /* 03000 - 505-paradox - sphere.sndh */
+TIMEDB_ENTRY( de9dfebf, 0, 9026, YM), /* 00435 - Big Alec - Sanxion Loader.sndh */
+TIMEDB_ENTRY( de9fed79, 0, 1018, YM), /* 00973 - Deneb - Kidney Bean - Present.sndh */
+TIMEDB_ENTRY( dec1c446, 0, 6265, YM+TA), /* 00024 - 505 - 13th.sndh */
+TIMEDB_ENTRY( ded32f1c, 0, 14827, YM+TA+TD), /* 02668 - Donald Fakk - Echoing.sndh */
+TIMEDB_ENTRY( ded49b0f, 0, 35548, YM+TA+TB+TD), /* 03298 - STU - ELECTROX.sndh */
+TIMEDB_ENTRY( dee9caa6, 0, 93993, YM+TA), /* 03784 - Mr Micro - Magic Fly.sndh */
+TIMEDB_ENTRY( deebacbe, 0, 508, YM+TA), /* 02645 - Miggy - stinky(Unfinished).sndh */
+TIMEDB_ENTRY( def1319f, 0, 51783, YM+TA), /* 04052 - Roggie - Beef Barbeque.sndh */
+TIMEDB_ENTRY( def9a728, 0, 3819, YM), /* 03103 - n-a - Children's Corner # 5.sndh */
+TIMEDB_ENTRY( df0f0e71, 0, 3577, YM+TA+TB+TD), /* 00279 - Baggio - Softly.sndh */
+TIMEDB_ENTRY( df112436, 0, 15335, YM+TA+TD), /* 02772 - Chromex - Hydroxid Dentro.sndh */
+TIMEDB_ENTRY( df183024, 0, 1535, YM), /* 04085 - Gary Wheaton - Necro.sndh */
+TIMEDB_ENTRY( df1d8073, 0, 6344, YM), /* 01569 - Patrick Phelan - Nigel Mansell's World Championship.sndh */
+TIMEDB_ENTRY( df44b4e9, 0, 15087, YM+TA+TB+TD), /* 02867 - Dubmood - POSTapoclyphse.sndh */
+TIMEDB_ENTRY( df47a02c, 0, 14660, YM+TA+TB+TD), /* 03442 - ULTRASYD - BRAIN DAMAGING ARPS.sndh */
+TIMEDB_ENTRY( df636b47, 0, 3072, YM), /* 03500 - Shamen - Certified Dope - Sources.sndh */
+TIMEDB_ENTRY( df72b5f0, 0, 14784, YM+TA+TB+TD), /* 02082 - Mad Max - I Ball - Sid.sndh */
+TIMEDB_ENTRY( df7310fa, 0, 7720, YM+TA+TB+TD), /* 00031 - 505 - Phlegm Bleepz.sndh */
+TIMEDB_ENTRY( df850308, 0, 3428, YM), /* 00103 - David Whittaker - Gazza 2.sndh */
+TIMEDB_ENTRY( df850308, 1, 1117, YM), /* 00103 - David Whittaker - Gazza 2.sndh */
+TIMEDB_ENTRY( df850308, 2, 509, YM), /* 00103 - David Whittaker - Gazza 2.sndh */
+TIMEDB_ENTRY( df850308, 3, 481, YM), /* 00103 - David Whittaker - Gazza 2.sndh */
+TIMEDB_ENTRY( df971bda, 0, 5400, YM), /* 00242 - AN Cool - 45-King.sndh */
+TIMEDB_ENTRY( df9c0855, 0, 23418, YM), /* 01671 - Jess - Concerto for Acid Band.sndh */
+TIMEDB_ENTRY( dfb00c35, 0, 25536, YM), /* 02059 - Mad Max - Make Love Not W.A.R..sndh */
+TIMEDB_ENTRY( dfb138ee, 0, 6166, YM), /* 00443 - Big Alec - Wicked.sndh */
+TIMEDB_ENTRY( dfedc994, 0, 3916, YM), /* 04066 - Gary Wheaton - Circus.sndh */
+TIMEDB_ENTRY( e013b117, 0, 53120, YM+TD), /* 01464 - STU - DYMANITE.sndh */
+TIMEDB_ENTRY( e014c8cd, 0, 11486, YM+TA), /* 03954 - Scott Lemmon - Ivan 2.sndh */
+TIMEDB_ENTRY( e0196bcd, 0, 339, YM), /* 00868 - Ben Daglish - Passing Shot.sndh */
+TIMEDB_ENTRY( e0196bcd, 1, 375, YM), /* 00868 - Ben Daglish - Passing Shot.sndh */
+TIMEDB_ENTRY( e0196bcd, 2, 305, YM), /* 00868 - Ben Daglish - Passing Shot.sndh */
+TIMEDB_ENTRY( e0196bcd, 3, 394, YM), /* 00868 - Ben Daglish - Passing Shot.sndh */
+TIMEDB_ENTRY( e0196bcd, 4, 2260, YM), /* 00868 - Ben Daglish - Passing Shot.sndh */
+TIMEDB_ENTRY( e021b94c, 0, 5613, YM), /* 03029 - The Assasin - Fun Fun.sndh */
+TIMEDB_ENTRY( e037009e, 0, 17949, YM), /* 00770 - Count Zero - Decade Demo - Rasters.sndh */
+TIMEDB_ENTRY( e0457cb6, 0, 4909, YM), /* 03542 - Justin Scharvona - The Godfather.sndh */
+TIMEDB_ENTRY( e0457cb6, 2, 1926, YM), /* 03542 - Justin Scharvona - The Godfather.sndh */
+TIMEDB_ENTRY( e06a7958, 0, 8688, YM+TA+TD), /* 02782 - Lotek Style - Crushed The Majors.sndh */
+TIMEDB_ENTRY( e076a58f, 0, 181, YM), /* 03972 - Geoff Camp - 1st Maths.sndh */
+TIMEDB_ENTRY( e076a58f, 1, 194, YM), /* 03972 - Geoff Camp - 1st Maths.sndh */
+TIMEDB_ENTRY( e076a58f, 2, 1828, YM), /* 03972 - Geoff Camp - 1st Maths.sndh */
+TIMEDB_ENTRY( e076a58f, 3, 2288, YM), /* 03972 - Geoff Camp - 1st Maths.sndh */
+TIMEDB_ENTRY( e076a58f, 4, 1645, YM), /* 03972 - Geoff Camp - 1st Maths.sndh */
+TIMEDB_ENTRY( e076a58f, 5, 2080, YM), /* 03972 - Geoff Camp - 1st Maths.sndh */
+TIMEDB_ENTRY( e076a58f, 6, 1905, YM), /* 03972 - Geoff Camp - 1st Maths.sndh */
+TIMEDB_ENTRY( e079951f, 0, 3743, YM), /* 04142 - Michael Haar - Tetris X.sndh */
+TIMEDB_ENTRY( e079951f, 1, 3927, YM), /* 04142 - Michael Haar - Tetris X.sndh */
+TIMEDB_ENTRY( e079951f, 2, 117, YM), /* 04142 - Michael Haar - Tetris X.sndh */
+TIMEDB_ENTRY( e079951f, 3, 71, YM), /* 04142 - Michael Haar - Tetris X.sndh */
+TIMEDB_ENTRY( e079951f, 4, 43, YM), /* 04142 - Michael Haar - Tetris X.sndh */
+TIMEDB_ENTRY( e079951f, 5, 11, YM), /* 04142 - Michael Haar - Tetris X.sndh */
+TIMEDB_ENTRY( e079951f, 6, 83, YM), /* 04142 - Michael Haar - Tetris X.sndh */
+TIMEDB_ENTRY( e079951f, 7, 19, YM), /* 04142 - Michael Haar - Tetris X.sndh */
+TIMEDB_ENTRY( e08a92f7, 0, 389, YM), /* 00729 - Tebirod - No Cooper Vertical Rasters.sndh */
+TIMEDB_ENTRY( e09a157d, 0, 22581, YM), /* 00616 - Chrispy Noodle - Sapiens 2.sndh */
+TIMEDB_ENTRY( e0b125f6, 0, 1536, YM), /* 02378 - Nexus 6 - Hopscotch.sndh */
+TIMEDB_ENTRY( e0b46bce, 0, 4992, YM+TA), /* 00943 - Dark Angel - Hallo Pan Tau.sndh */
+TIMEDB_ENTRY( e0c51fef, 0, 2305, YM+TA+TB+TD), /* 03676 - Dma-Sc - Antiques - Intro.sndh */
+TIMEDB_ENTRY( e0e0e3e9, 0, 6248, YM), /* 03084 - Harry Wootan - Desafinado.sndh */
+TIMEDB_ENTRY( e0ecf617, 0, 9690, YM), /* 02214 - Mad Max - Return Of Medusa.sndh */
+TIMEDB_ENTRY( e0ecf617, 1, 768, YM), /* 02214 - Mad Max - Return Of Medusa.sndh */
+TIMEDB_ENTRY( e0ecf617, 2, 26631, YM), /* 02214 - Mad Max - Return Of Medusa.sndh */
+TIMEDB_ENTRY( e124bd14, 0, 18152, YM), /* 03534 - Jean Baudlot - Future Wars - Time Travellers.sndh */
+TIMEDB_ENTRY( e124bd14, 1, 7679, YM), /* 03534 - Jean Baudlot - Future Wars - Time Travellers.sndh */
+TIMEDB_ENTRY( e124bd14, 2, 3134, YM), /* 03534 - Jean Baudlot - Future Wars - Time Travellers.sndh */
+TIMEDB_ENTRY( e124bd14, 3, 5036, YM), /* 03534 - Jean Baudlot - Future Wars - Time Travellers.sndh */
+TIMEDB_ENTRY( e124bd14, 4, 8694, YM), /* 03534 - Jean Baudlot - Future Wars - Time Travellers.sndh */
+TIMEDB_ENTRY( e124bd14, 5, 7144, YM), /* 03534 - Jean Baudlot - Future Wars - Time Travellers.sndh */
+TIMEDB_ENTRY( e124bd14, 6, 5907, YM), /* 03534 - Jean Baudlot - Future Wars - Time Travellers.sndh */
+TIMEDB_ENTRY( e124bd14, 7, 5036, YM), /* 03534 - Jean Baudlot - Future Wars - Time Travellers.sndh */
+TIMEDB_ENTRY( e124bd14, 8, 8302, YM), /* 03534 - Jean Baudlot - Future Wars - Time Travellers.sndh */
+TIMEDB_ENTRY( e124bd14, 9, 17655, YM), /* 03534 - Jean Baudlot - Future Wars - Time Travellers.sndh */
+TIMEDB_ENTRY( e1276741, 0, 831, YM), /* 04627 - tomchi noextra - ltc03 0ompa intro.sndh */
+TIMEDB_ENTRY( e14f1aa3, 0, 33792, YM+TD), /* 01480 - STU - TYMPANUM.sndh */
+TIMEDB_ENTRY( e1564b76, 0, 18090, YM), /* 01718 - Jess - Throw It in a Trash Can (STf).sndh */
+TIMEDB_ENTRY( e161778f, 0, 731, YM), /* 04708 - Vesa, Emphii, Bad Boy - Razor Megademo Intro.sndh */
+TIMEDB_ENTRY( e161778f, 1, 370, YM), /* 04708 - Vesa, Emphii, Bad Boy - Razor Megademo Intro.sndh */
+TIMEDB_ENTRY( e161778f, 2, 416, YM), /* 04708 - Vesa, Emphii, Bad Boy - Razor Megademo Intro.sndh */
+TIMEDB_ENTRY( e161778f, 3, 256, YM), /* 04708 - Vesa, Emphii, Bad Boy - Razor Megademo Intro.sndh */
+TIMEDB_ENTRY( e17de217, 0, 7953, YM+TA), /* 04313 - 505 - ST Tri Sound.sndh */
+TIMEDB_ENTRY( e1a66b55, 0, 413, YM), /* 02963 - Unknown - Henriettas Book of Spells.sndh */
+TIMEDB_ENTRY( e1a66b55, 1, 256, YM), /* 02963 - Unknown - Henriettas Book of Spells.sndh */
+TIMEDB_ENTRY( e1a66b55, 2, 320, YM), /* 02963 - Unknown - Henriettas Book of Spells.sndh */
+TIMEDB_ENTRY( e1a66b55, 3, 643, YM), /* 02963 - Unknown - Henriettas Book of Spells.sndh */
+TIMEDB_ENTRY( e1cbb5fa, 0, 2654, YM), /* 03125 - n-a - I Heard the Bells.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 0, 2864, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 1, 3644, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 2, 1800, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 3, 3554, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 4, 3385, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 5, 3494, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 6, 4057, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 7, 4509, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 8, 2264, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 9, 3480, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 10, 3444, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 11, 5049, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 12, 3895, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 13, 3958, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 14, 3972, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 15, 3080, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 16, 3005, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 17, 3252, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 29, 9040, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1d5a4e3, 30, 288, YM), /* 04716 - Geoff Camp - Spider Spell 2.sndh */
+TIMEDB_ENTRY( e1f17eba, 0, 672, YM), /* 02361 - Nexus 6 - Audiopac.sndh */
+TIMEDB_ENTRY( e1feabd9, 0, 20480, YM+TA+TB+TD), /* 02090 - Mad Max - Nemesis - Sid.sndh */
+TIMEDB_ENTRY( e207c574, 0, 896, YM+TA), /* 00954 - Dark Angel - The Walk.sndh */
+TIMEDB_ENTRY( e20c2c4b, 0, 3447, YM+TA), /* 01745 - Jovis - Lametrop - Intro.sndh */
+TIMEDB_ENTRY( e2614bdc, 0, 10745, YM+TA+TB), /* 01592 - Nemo - Endpart M2V.sndh */
+TIMEDB_ENTRY( e26bf07b, 0, 14400, YM+TA), /* 01287 - Furax - Virtual Escape Theme.sndh */
+TIMEDB_ENTRY( e275ea20, 0, 59848, YM+TA), /* 03822 - Tufty - My Digi 2.sndh */
+TIMEDB_ENTRY( e275ea20, 1, 154618, YM+TA), /* 03822 - Tufty - My Digi 2.sndh */
+TIMEDB_ENTRY( e275ea20, 2, 30627, YM+TA), /* 03822 - Tufty - My Digi 2.sndh */
+TIMEDB_ENTRY( e275ea20, 3, 27269, YM+TA), /* 03822 - Tufty - My Digi 2.sndh */
+TIMEDB_ENTRY( e275ea20, 4, 66620, YM+TA), /* 03822 - Tufty - My Digi 2.sndh */
+TIMEDB_ENTRY( e275ea20, 5, 71019, YM+TA), /* 03822 - Tufty - My Digi 2.sndh */
+TIMEDB_ENTRY( e275ea20, 6, 74309, YM+TA), /* 03822 - Tufty - My Digi 2.sndh */
+TIMEDB_ENTRY( e275ea20, 7, 29569, YM+TA), /* 03822 - Tufty - My Digi 2.sndh */
+TIMEDB_ENTRY( e2811199, 0, 9060, YM), /* 00769 - Count Zero - Decade Demo - Pipeworx.sndh */
+TIMEDB_ENTRY( e28aa01f, 0, 4225, YM+TA+TB+TD), /* 04583 - mOdmate-Point de Controle (orig. David Whittaker) - COLONYST (PROOF OF POKEY CONCEPT).sndh */
+TIMEDB_ENTRY( e2a3859f, 0, 5759, YM+TA+TB+TD), /* 03150 - Rubbish - Almost Happy.sndh */
+TIMEDB_ENTRY( e2a56417, 0, 8326, YM), /* 01568 - Jason Page - Simulcra.sndh */
+TIMEDB_ENTRY( e2a56417, 1, 3209, YM), /* 01568 - Jason Page - Simulcra.sndh */
+TIMEDB_ENTRY( e2bbc9e5, 0, 2525, YM), /* 03135 - Unknown - Have Yourself-Merry Christmas.sndh */
+TIMEDB_ENTRY( e2db2940, 0, 8960, YM+TB+TD), /* 02849 - Helene - Carsong2.sndh */
+TIMEDB_ENTRY( e2dce743, 0, 4799, YM), /* 00352 - Tony Williams - Shadow of the Beast 2.sndh */
+TIMEDB_ENTRY( e2dce743, 1, 3519, YM), /* 00352 - Tony Williams - Shadow of the Beast 2.sndh */
+TIMEDB_ENTRY( e2dce743, 2, 3519, YM), /* 00352 - Tony Williams - Shadow of the Beast 2.sndh */
+TIMEDB_ENTRY( e2dce743, 3, 2369, YM), /* 00352 - Tony Williams - Shadow of the Beast 2.sndh */
+TIMEDB_ENTRY( e2dce743, 4, 2239, YM), /* 00352 - Tony Williams - Shadow of the Beast 2.sndh */
+TIMEDB_ENTRY( e2dce743, 5, 2879, YM), /* 00352 - Tony Williams - Shadow of the Beast 2.sndh */
+TIMEDB_ENTRY( e2dce743, 6, 3839, YM), /* 00352 - Tony Williams - Shadow of the Beast 2.sndh */
+TIMEDB_ENTRY( e2df9ac0, 0, 12880, YM+TA+TB+TD), /* 02768 - cerror (or.by.radix) - Imaginary friend (st-version).sndh */
+TIMEDB_ENTRY( e2e0bc3f, 0, 6750, YM+TA), /* 01920 - Mephistow - Librarie.sndh */
+TIMEDB_ENTRY( e2e8ac75, 0, 26490, YM+TA), /* 04579 - 505 - Hardsync 01I.sndh */
+TIMEDB_ENTRY( e2f1e8f5, 0, 2560, YM), /* 04382 - Chris Denman - Great Napoleonic Battles.sndh */
+TIMEDB_ENTRY( e3029117, 0, 18432, YM+TA+TB+TD), /* 02576 - STU - BEE.sndh */
+TIMEDB_ENTRY( e30425fe, 0, 10724, YM+TA+TB+TD), /* 03559 - Evil - noname (Amiga cover).sndh */
+TIMEDB_ENTRY( e30e58b8, 0, 12898, YM+TA+TD), /* 02347 - Tao - Cream - Starchild (UCM 23).sndh */
+TIMEDB_ENTRY( e3161b72, 0, 7297, YM+TA+TD), /* 02318 - Tao - Cream - Looniez.sndh */
+TIMEDB_ENTRY( e3162d86, 0, 13824, YM), /* 01263 - Frazer - Amazine 2.sndh */
+TIMEDB_ENTRY( e31838d4, 0, 59664, YM+TA), /* 04815 - Unknown - Bob P.sndh */
+TIMEDB_ENTRY( e32a0f5c, 0, 23040, YM), /* 01422 - Sonic - Ramp.sndh */
+TIMEDB_ENTRY( e3361e8b, 0, 11936, YM), /* 02940 - Archer Maclean - Archer Macleans Pool.sndh */
+TIMEDB_ENTRY( e33f0401, 0, 11641, YM+TA), /* 04617 - The Byte - BSW 88.sndh */
+TIMEDB_ENTRY( e3481e5a, 0, 6528, YM), /* 01060 - Jonathan Dunn - Lethal Weapon.sndh */
+TIMEDB_ENTRY( e3481e5a, 1, 2688, YM), /* 01060 - Jonathan Dunn - Lethal Weapon.sndh */
+TIMEDB_ENTRY( e3481e5a, 2, 384, YM), /* 01060 - Jonathan Dunn - Lethal Weapon.sndh */
+TIMEDB_ENTRY( e3481e5a, 3, 5376, YM), /* 01060 - Jonathan Dunn - Lethal Weapon.sndh */
+TIMEDB_ENTRY( e3481e5a, 4, 1968, YM), /* 01060 - Jonathan Dunn - Lethal Weapon.sndh */
+TIMEDB_ENTRY( e3481e5a, 5, 5760, YM), /* 01060 - Jonathan Dunn - Lethal Weapon.sndh */
+TIMEDB_ENTRY( e398ab48, 0, 17313, YM+TA), /* 03746 - Tufty - Hypnotic.sndh */
+TIMEDB_ENTRY( e3af26e5, 0, 2304, YM), /* 04084 - Gary Wheaton - Munsters.sndh */
+TIMEDB_ENTRY( e3b9c8d4, 0, 8658, YM), /* 03930 - Unknown - Sound1.sndh */
+TIMEDB_ENTRY( e3c81a39, 0, 4127, YM+TA+TB+TD), /* 02728 - maktone-fairlight - glory.sndh */
+TIMEDB_ENTRY( e3e0e278, 0, 2240, YM), /* 02914 - Richard Joseph - Legend.sndh */
+TIMEDB_ENTRY( e3e0e278, 1, 1440, YM), /* 02914 - Richard Joseph - Legend.sndh */
+TIMEDB_ENTRY( e3e0e278, 2, 1152, YM), /* 02914 - Richard Joseph - Legend.sndh */
+TIMEDB_ENTRY( e3e0e278, 3, 1440, YM), /* 02914 - Richard Joseph - Legend.sndh */
+TIMEDB_ENTRY( e3e0e278, 4, 1536, YM), /* 02914 - Richard Joseph - Legend.sndh */
+TIMEDB_ENTRY( e3e0e278, 5, 1728, YM), /* 02914 - Richard Joseph - Legend.sndh */
+TIMEDB_ENTRY( e3e0e278, 6, 864, YM), /* 02914 - Richard Joseph - Legend.sndh */
+TIMEDB_ENTRY( e3e0e278, 7, 1536, YM), /* 02914 - Richard Joseph - Legend.sndh */
+TIMEDB_ENTRY( e3e0e278, 8, 1836, YM), /* 02914 - Richard Joseph - Legend.sndh */
+TIMEDB_ENTRY( e3e82dbb, 0, 15512, YM+TB+TD), /* 03303 - Marcer - ROM TITLE MIX.sndh */
+TIMEDB_ENTRY( e3ea9120, 0, 14213, YM), /* 00269 - Archimede - Gen 4 3615 Demo.sndh */
+TIMEDB_ENTRY( e411e968, 0, 2873, YM), /* 02937 - Ash Hogg - Spikey in Transylvania.sndh */
+TIMEDB_ENTRY( e411e968, 1, 6642, YM), /* 02937 - Ash Hogg - Spikey in Transylvania.sndh */
+TIMEDB_ENTRY( e411e968, 2, 170, YM), /* 02937 - Ash Hogg - Spikey in Transylvania.sndh */
+TIMEDB_ENTRY( e4260543, 0, 1544, YM), /* 00935 - Dark Angel - Metropolitan.sndh */
+TIMEDB_ENTRY( e426ae9f, 0, 3238, YM+TA+TB+TD), /* 04309 - 505-checkpoint - ST_O.sndh */
+TIMEDB_ENTRY( e4298532, 0, 1096, YM), /* 04690 - Unknown - Life on the Ocean Waves.sndh */
+TIMEDB_ENTRY( e43f7d3c, 0, 1280, YM), /* 01404 - Skyline - Snork Intro - Hemosound.sndh */
+TIMEDB_ENTRY( e4604a81, 0, 2079, YM), /* 01297 - Matt Furniss - Face Off.sndh */
+TIMEDB_ENTRY( e4660401, 0, 7683, YM), /* 00428 - Big Alec - PYM - Main Menu.sndh */
+TIMEDB_ENTRY( e469ae57, 0, 8105, YM), /* 01276 - Frazer - TSC 42.sndh */
+TIMEDB_ENTRY( e4742717, 0, 5119, YM), /* 04063 - Gary Wheaton - Bass.sndh */
+TIMEDB_ENTRY( e47d718d, 0, 8424, YM), /* 02972 - Gary Wheaton - Escapade (Scarborough Fair).sndh */
+TIMEDB_ENTRY( e483468f, 0, 51840, YM), /* 03400 - Carsten Neubauer - Nightdawn.sndh */
+TIMEDB_ENTRY( e4985a0c, 0, 5773, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 1, 1272, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 2, 2677, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 3, 5229, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 4, 1955, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 5, 4059, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 6, 322, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 7, 145, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 8, 585, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 9, 472, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 10, 771, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 11, 613, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 12, 411, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 13, 490, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 14, 352, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 15, 375, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 16, 307, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 17, 754, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 18, 1570, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 19, 250, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 20, 930, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 21, 392, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 22, 920, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 23, 1164, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 24, 361, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4985a0c, 25, 540, YM), /* 03975 - Christopher Barker - Spirit of Excalibur.sndh */
+TIMEDB_ENTRY( e4a0a277, 0, 1536, YM), /* 01889 - Dave Lowe - Power Drift.sndh */
+TIMEDB_ENTRY( e4a0a277, 1, 1547, YM), /* 01889 - Dave Lowe - Power Drift.sndh */
+TIMEDB_ENTRY( e4b18b94, 0, 5057, YM), /* 01379 - Justin Scharvona - Slackskin & Flint.sndh */
+TIMEDB_ENTRY( e4b18b94, 1, 1281, YM), /* 01379 - Justin Scharvona - Slackskin & Flint.sndh */
+TIMEDB_ENTRY( e4b18b94, 2, 2241, YM), /* 01379 - Justin Scharvona - Slackskin & Flint.sndh */
+TIMEDB_ENTRY( e4b18b94, 3, 769, YM), /* 01379 - Justin Scharvona - Slackskin & Flint.sndh */
+TIMEDB_ENTRY( e4b88228, 0, 5116, YM), /* 00549 - Allister Brimble - Fantasy World Dizzy.sndh */
+TIMEDB_ENTRY( e4b88228, 1, 6043, YM), /* 00549 - Allister Brimble - Fantasy World Dizzy.sndh */
+TIMEDB_ENTRY( e4b88228, 2, 2876, YM), /* 00549 - Allister Brimble - Fantasy World Dizzy.sndh */
+TIMEDB_ENTRY( e4e000d3, 0, 11751, YM), /* 00755 - Mark Cooksey - Paperboy.sndh */
+TIMEDB_ENTRY( e4e000d3, 1, 1248, YM), /* 00755 - Mark Cooksey - Paperboy.sndh */
+TIMEDB_ENTRY( e4e2ed49, 0, 2239, YM+TA), /* 01520 - Iso - Eindhoven CS.sndh */
+TIMEDB_ENTRY( e5004bf0, 0, 10496, YM+TA+TB+TD), /* 02103 - Mad Max - Warhawk - Sid.sndh */
+TIMEDB_ENTRY( e50e1386, 0, 16296, YM+TB+TD), /* 02852 - Helene - hah.sndh */
+TIMEDB_ENTRY( e5112240, 0, 3933, YM), /* 00568 - Jas C Brooke - Ikari Warriors.sndh */
+TIMEDB_ENTRY( e5112240, 1, 3936, YM), /* 00568 - Jas C Brooke - Ikari Warriors.sndh */
+TIMEDB_ENTRY( e5112240, 2, 1152, YM), /* 00568 - Jas C Brooke - Ikari Warriors.sndh */
+TIMEDB_ENTRY( e5112240, 3, 150, YM), /* 00568 - Jas C Brooke - Ikari Warriors.sndh */
+TIMEDB_ENTRY( e54bd79f, 0, 2304, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 1, 3840, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 2, 192, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 3, 1728, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 4, 64, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 5, 215, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 6, 2187, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 7, 1920, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 8, 121, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 9, 25, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 10, 48, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 11, 16, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 12, 88, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e54bd79f, 13, 54, YM), /* 02918 - Richard Joseph - The Adventures of Robin Hood.sndh */
+TIMEDB_ENTRY( e553a69e, 0, 6909, YM+TA+TB+TD), /* 00047 - 505 - EIL2 Intro.sndh */
+TIMEDB_ENTRY( e56e957a, 0, 5597, YM), /* 01518 - Iso - Arf Arf - Miauw.sndh */
+TIMEDB_ENTRY( e579c04d, 0, 8460, YM), /* 02929 - Sean Conran - WWF - Wrestle Mania.sndh */
+TIMEDB_ENTRY( e579c04d, 1, 573, YM), /* 02929 - Sean Conran - WWF - Wrestle Mania.sndh */
+TIMEDB_ENTRY( e57bd95d, 0, 6304, YM+TA+TD), /* 02554 - Marcer - Broken.sndh */
+TIMEDB_ENTRY( e5834ea9, 0, 3680, YM), /* 04600 - Rude Kid - Playtime.sndh */
+TIMEDB_ENTRY( e598f127, 0, 4608, YM+TA+TD), /* 00833 - Crazy Q - DHS - TAC-2 Memories.sndh */
+TIMEDB_ENTRY( e5a3c2c6, 0, 39892, YM+TA+TB+TD), /* 03561 - !Cube - Blink.sndh */
+TIMEDB_ENTRY( e5ff165b, 0, 5120, YM), /* 02799 - Starbuck - Her 5.sndh */
+TIMEDB_ENTRY( e62c9af8, 0, 320, YM), /* 01208 - Excellence In Art - Tarzan.sndh */
+TIMEDB_ENTRY( e633cfd4, 0, 39936, YM+TB+TD), /* 02607 - STU - MY MELODY SID.sndh */
+TIMEDB_ENTRY( e65f1def, 0, 7672, YM+TA+TB+TD), /* 00544 - Blindio - Decadent.sndh */
+TIMEDB_ENTRY( e67eb69f, 0, 3066, YM+TA), /* 00902 - Danny Oneway - Frust.sndh */
+TIMEDB_ENTRY( e69c3ee3, 0, 37120, YM+TA+TB+TD), /* 03341 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( e6ab9b25, 0, 35154, YM+TA), /* 03781 - Jose A Martin - Narco Police.sndh */
+TIMEDB_ENTRY( e6b3f254, 0, 2299, YM), /* 01826 - Pierre-Eric Loriaux - Toki.sndh */
+TIMEDB_ENTRY( e6b3f254, 1, 16219, YM), /* 01826 - Pierre-Eric Loriaux - Toki.sndh */
+TIMEDB_ENTRY( e6b3f254, 2, 16219, YM), /* 01826 - Pierre-Eric Loriaux - Toki.sndh */
+TIMEDB_ENTRY( e6b3f254, 3, 16219, YM), /* 01826 - Pierre-Eric Loriaux - Toki.sndh */
+TIMEDB_ENTRY( e6b3f254, 4, 16219, YM), /* 01826 - Pierre-Eric Loriaux - Toki.sndh */
+TIMEDB_ENTRY( e6b3f254, 5, 16219, YM), /* 01826 - Pierre-Eric Loriaux - Toki.sndh */
+TIMEDB_ENTRY( e6b3f254, 6, 16219, YM), /* 01826 - Pierre-Eric Loriaux - Toki.sndh */
+TIMEDB_ENTRY( e6b3f254, 7, 16219, YM), /* 01826 - Pierre-Eric Loriaux - Toki.sndh */
+TIMEDB_ENTRY( e6b3f254, 8, 16219, YM), /* 01826 - Pierre-Eric Loriaux - Toki.sndh */
+TIMEDB_ENTRY( e6b3f254, 9, 16219, YM), /* 01826 - Pierre-Eric Loriaux - Toki.sndh */
+TIMEDB_ENTRY( e6bbb5a2, 0, 5760, YM), /* 00493 - Ultimatum - Kidney Bean 9.sndh */
+TIMEDB_ENTRY( e6c049a0, 0, 11904, YM+TA+TD), /* 02250 - Tao - Cream - Call Me (Steps).sndh */
+TIMEDB_ENTRY( e6c20336, 0, 6396, YM), /* 00835 - Neil Crossley - Hunt For Red October.sndh */
+TIMEDB_ENTRY( e6c20336, 1, 2298, YM), /* 00835 - Neil Crossley - Hunt For Red October.sndh */
+TIMEDB_ENTRY( e6c20336, 2, 762, YM), /* 00835 - Neil Crossley - Hunt For Red October.sndh */
+TIMEDB_ENTRY( e6c20336, 3, 2298, YM), /* 00835 - Neil Crossley - Hunt For Red October.sndh */
+TIMEDB_ENTRY( e6c20336, 4, 9772, YM), /* 00835 - Neil Crossley - Hunt For Red October.sndh */
+TIMEDB_ENTRY( e6c20336, 5, 6906, YM), /* 00835 - Neil Crossley - Hunt For Red October.sndh */
+TIMEDB_ENTRY( e6d22082, 0, 123322, YM+TA), /* 04061 - Hybrid - Hybrid.sndh */
+TIMEDB_ENTRY( e6e43013, 0, 6912, YM), /* 01065 - Jonathan Dunn - Dean Evans - Keith Tinman - Pushover.sndh */
+TIMEDB_ENTRY( e6e43013, 1, 8449, YM), /* 01065 - Jonathan Dunn - Dean Evans - Keith Tinman - Pushover.sndh */
+TIMEDB_ENTRY( e6e43013, 2, 10304, YM), /* 01065 - Jonathan Dunn - Dean Evans - Keith Tinman - Pushover.sndh */
+TIMEDB_ENTRY( e6e43013, 3, 7296, YM), /* 01065 - Jonathan Dunn - Dean Evans - Keith Tinman - Pushover.sndh */
+TIMEDB_ENTRY( e6e43013, 4, 7168, YM), /* 01065 - Jonathan Dunn - Dean Evans - Keith Tinman - Pushover.sndh */
+TIMEDB_ENTRY( e6e43013, 5, 8064, YM), /* 01065 - Jonathan Dunn - Dean Evans - Keith Tinman - Pushover.sndh */
+TIMEDB_ENTRY( e6e43013, 6, 1920, YM), /* 01065 - Jonathan Dunn - Dean Evans - Keith Tinman - Pushover.sndh */
+TIMEDB_ENTRY( e6e43013, 7, 1280, YM), /* 01065 - Jonathan Dunn - Dean Evans - Keith Tinman - Pushover.sndh */
+TIMEDB_ENTRY( e6e43013, 8, 768, YM), /* 01065 - Jonathan Dunn - Dean Evans - Keith Tinman - Pushover.sndh */
+TIMEDB_ENTRY( e6e43013, 9, 4928, YM), /* 01065 - Jonathan Dunn - Dean Evans - Keith Tinman - Pushover.sndh */
+TIMEDB_ENTRY( e70e705e, 0, 10048, YM), /* 01030 - Doclands - Zak.sndh */
+TIMEDB_ENTRY( e744958f, 0, 6331, YM+TB+TD), /* 00082 - 505 - Melodie.sndh */
+TIMEDB_ENTRY( e74a3255, 0, 76272, YM+TB+TD), /* 03461 - Marcer - Kid.sndh */
+TIMEDB_ENTRY( e76ad285, 0, 4853, YM+TA+TD), /* 02822 - Marcer - Greasy (Znax Menu).sndh */
+TIMEDB_ENTRY( e7754910, 0, 13096, YM), /* 01850 - Lotek Style - Hard Rock.sndh */
+TIMEDB_ENTRY( e775cf70, 0, 7242, YM+TA+TB+TD), /* 01873 - Lotek Style - Das Sidhaeuser Tor.sndh */
+TIMEDB_ENTRY( e77ec0a9, 0, 4800, YM), /* 03242 - T1000 - The Beast Club - TBC 14.sndh */
+TIMEDB_ENTRY( e781ebf3, 0, 5759, YM+TA), /* 04111 - 505-PARADOX NILS FESKE - MIST 2005.sndh */
+TIMEDB_ENTRY( e782759a, 0, 7491, YM), /* 01794 - Barry Leitch - Gilbert - Escape from Drill.sndh */
+TIMEDB_ENTRY( e782759a, 1, 1539, YM), /* 01794 - Barry Leitch - Gilbert - Escape from Drill.sndh */
+TIMEDB_ENTRY( e782759a, 2, 401, YM), /* 01794 - Barry Leitch - Gilbert - Escape from Drill.sndh */
+TIMEDB_ENTRY( e782759a, 3, 2211, YM), /* 01794 - Barry Leitch - Gilbert - Escape from Drill.sndh */
+TIMEDB_ENTRY( e782759a, 4, 282, YM), /* 01794 - Barry Leitch - Gilbert - Escape from Drill.sndh */
+TIMEDB_ENTRY( e782759a, 5, 802, YM), /* 01794 - Barry Leitch - Gilbert - Escape from Drill.sndh */
+TIMEDB_ENTRY( e782759a, 6, 452, YM), /* 01794 - Barry Leitch - Gilbert - Escape from Drill.sndh */
+TIMEDB_ENTRY( e782759a, 7, 1443, YM), /* 01794 - Barry Leitch - Gilbert - Escape from Drill.sndh */
+TIMEDB_ENTRY( e79dcd5c, 0, 663, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 1, 430, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 2, 369, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 3, 341, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 4, 417, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 5, 207, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 6, 489, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 7, 183, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 8, 509, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 9, 322, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 10, 315, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 11, 1777, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e79dcd5c, 12, 95, YM), /* 00846 - Ben Daglish - Continental Circus.sndh */
+TIMEDB_ENTRY( e7a7464a, 0, 8960, YM), /* 01421 - Sonic - It Goes On.sndh */
+TIMEDB_ENTRY( e7a79994, 0, 38501, YM+TB+TD), /* 02533 - Remo - Beatz.sndh */
+TIMEDB_ENTRY( e7ba3248, 0, 7488, YM), /* 00911 - Danny Oneway - Lamebrain 1 - Techmoc.sndh */
+TIMEDB_ENTRY( e7c6841e, 0, 11521, YM+TA+TB+TD), /* 02790 - Dma-Sc - Trials.sndh */
+TIMEDB_ENTRY( e7d19bb3, 0, 11, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 1, 14, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 2, 53, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 3, 53, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 4, 29, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 5, 101, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 6, 212, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 7, 44, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 8, 53, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 9, 44, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 10, 13, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 12, 2689, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 13, 238, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7d19bb3, 14, 6913, YM), /* 01581 - Nigel Pritchard - Thunderwing.sndh */
+TIMEDB_ENTRY( e7e0229c, 0, 55223, YM+TA), /* 03778 - Stewart Gardner - Stampede 7.sndh */
+TIMEDB_ENTRY( e7e2200f, 0, 4511, YM), /* 04080 - Gary Wheaton - Masters of Magic.sndh */
+TIMEDB_ENTRY( e7ef8c50, 0, 12799, YM+TA+TD), /* 03486 - gwEm - Fantasy.sndh */
+TIMEDB_ENTRY( e8061997, 0, 4986, YM+TA+TB), /* 01596 - Nemo - Loading - Space Invader.sndh */
+TIMEDB_ENTRY( e80744aa, 0, 18529, YM), /* 04841 - t1000 - Bits 36.sndh */
+TIMEDB_ENTRY( e81015af, 0, 8933, YM), /* 03034 - Barry Deutsch - The Next Time I Fall.sndh */
+TIMEDB_ENTRY( e8140729, 0, 11648, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8140729, 1, 14592, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8140729, 2, 18912, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8140729, 3, 12809, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8140729, 4, 13824, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8140729, 5, 15904, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8140729, 6, 2560, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8140729, 7, 3072, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8140729, 8, 2837, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8140729, 9, 289, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8140729, 10, 5376, YM), /* 02192 - Mad Max - Enchanted Land.sndh */
+TIMEDB_ENTRY( e8152538, 0, 11522, YM+TA+TD), /* 02334 - Tao - Cream - Torture (Magic Synth vers.).sndh */
+TIMEDB_ENTRY( e825e877, 0, 15743, YM), /* 04564 - Charles Callet - The Toyottes.sndh */
+TIMEDB_ENTRY( e8337ccb, 0, 10880, YM), /* 02801 - Starbuck - Inside.sndh */
+TIMEDB_ENTRY( e836372d, 0, 6914, YM+TA+TD), /* 04203 - Tao - Cream - Nostalgic-O-Demo Dots Revenge (2 Sid Voice).sndh */
+TIMEDB_ENTRY( e864f155, 0, 5385, YM), /* 02160 - Mad Max - Syntax Terror - Level 16.sndh */
+TIMEDB_ENTRY( e86a731e, 0, 16384, YM+TA+TB+TD), /* 02581 - STU - CHASER.sndh */
+TIMEDB_ENTRY( e876f525, 0, 10304, YM+TB+TD), /* 01607 - Nemo - tambumbi.sndh */
+TIMEDB_ENTRY( e87936c3, 0, 30080, YM+TA+TB+TD), /* 03652 - Xyce - Saucage 3D.sndh */
+TIMEDB_ENTRY( e87c457c, 0, 10763, YM), /* 01561 - Paul Rowbotham - Whirligig.sndh */
+TIMEDB_ENTRY( e8807874, 0, 7936, YM+TA), /* 02897 - Remalon - Don't Stop.sndh */
+TIMEDB_ENTRY( e882f484, 0, 6566, YM), /* 02883 - Beast - Yopsimex.sndh */
+TIMEDB_ENTRY( e88505be, 0, 1341, YM), /* 02469 - Iso - Kamagurka.sndh */
+TIMEDB_ENTRY( e8912ce9, 0, 2241, YM+TA+TD), /* 02317 - Tao - Cream (orig. Klaus Ude) - LinWu's Challenge 4.sndh */
+TIMEDB_ENTRY( e89ac254, 0, 9094, YM), /* 03243 - T1000 - The Beast Club - TBC 15.sndh */
+TIMEDB_ENTRY( e8af3fa1, 0, 16121, YM+TA), /* 01213 - Energizer - Avante.sndh */
+TIMEDB_ENTRY( e8bf2061, 0, 504, YM), /* 03681 - Dma-Sc - Antiques - Loader 2.sndh */
+TIMEDB_ENTRY( e8c3ba44, 0, 44137, YM), /* 00004 - gwEm - Raid The Tower (non-looping).sndh */
+TIMEDB_ENTRY( e8d26c77, 0, 2640, YM), /* 00743 - Sean Conran - Hong Kong Phooey.sndh */
+TIMEDB_ENTRY( e8d26c77, 1, 304, YM), /* 00743 - Sean Conran - Hong Kong Phooey.sndh */
+TIMEDB_ENTRY( e8e24519, 0, 6528, YM), /* 01736 - Richard Joseph - James Pond.sndh */
+TIMEDB_ENTRY( e8e24519, 1, 480, YM), /* 01736 - Richard Joseph - James Pond.sndh */
+TIMEDB_ENTRY( e8e24519, 2, 768, YM), /* 01736 - Richard Joseph - James Pond.sndh */
+TIMEDB_ENTRY( e8e24519, 3, 432, YM), /* 01736 - Richard Joseph - James Pond.sndh */
+TIMEDB_ENTRY( e8e24519, 4, 2048, YM), /* 01736 - Richard Joseph - James Pond.sndh */
+TIMEDB_ENTRY( e8e24519, 5, 192, YM), /* 01736 - Richard Joseph - James Pond.sndh */
+TIMEDB_ENTRY( e8e24519, 6, 7645, YM), /* 01736 - Richard Joseph - James Pond.sndh */
+TIMEDB_ENTRY( e8e24519, 7, 133, YM), /* 01736 - Richard Joseph - James Pond.sndh */
+TIMEDB_ENTRY( e8e98938, 0, 6880, YM), /* 02358 - Nexus 6 - 5-16-38.sndh */
+TIMEDB_ENTRY( e8e9b785, 0, 1491, YM), /* 03138 - n-a - Mini Dance.sndh */
+TIMEDB_ENTRY( e8f066f3, 0, 1624, YM), /* 00841 - Ben Daglish - Blasteroids.sndh */
+TIMEDB_ENTRY( e8f066f3, 1, 3448, YM), /* 00841 - Ben Daglish - Blasteroids.sndh */
+TIMEDB_ENTRY( e8f3e611, 0, 768, YM+TA), /* 04436 - Lotus - Synth Dream 2 - Shuffle Express.sndh */
+TIMEDB_ENTRY( e8fc8215, 0, 77071, YM+TA), /* 04016 - Mad Max - Defcon.sndh */
+TIMEDB_ENTRY( e911b901, 0, 374, YM), /* 00455 - Augustin Vidovic - Pinochio.sndh */
+TIMEDB_ENTRY( e927d75f, 0, 6912, YM+TA+TD), /* 02569 - !Cube-Aggression - Wind.sndh */
+TIMEDB_ENTRY( e9330639, 0, 10751, YM), /* 04064 - Gary Wheaton - Chuckie Egg II remix.sndh */
+TIMEDB_ENTRY( e9557f7d, 0, 4004, YM), /* 00331 - Gary Wheaton - Tang mus 2.sndh */
+TIMEDB_ENTRY( e95b5837, 0, 4027, YM), /* 00548 - Allister Brimble - CJ's Elephant Antics.sndh */
+TIMEDB_ENTRY( e95b5837, 1, 9209, YM), /* 00548 - Allister Brimble - CJ's Elephant Antics.sndh */
+TIMEDB_ENTRY( e95b5837, 2, 1531, YM), /* 00548 - Allister Brimble - CJ's Elephant Antics.sndh */
+TIMEDB_ENTRY( e95b5837, 3, 1531, YM), /* 00548 - Allister Brimble - CJ's Elephant Antics.sndh */
+TIMEDB_ENTRY( e95b5837, 4, 475, YM), /* 00548 - Allister Brimble - CJ's Elephant Antics.sndh */
+TIMEDB_ENTRY( e95e4156, 0, 17408, YM+TA+TB+TD), /* 02617 - STU - SID BUZZY.sndh */
+TIMEDB_ENTRY( e9622a3d, 0, 6720, YM), /* 02891 - Illusion - Fucker (Golden Dawn 38).sndh */
+TIMEDB_ENTRY( e978fba5, 0, 2740, YM+TA+TB+TD), /* 04307 - 505-checkpoint - ST_B.sndh */
+TIMEDB_ENTRY( e98225f9, 0, 384, YM), /* 00599 - Chris Mad - Overdrive Loader.sndh */
+TIMEDB_ENTRY( e98a7b23, 0, 6538, YM+TA), /* 02501 - Lotek Style - Datapirate.sndh */
+TIMEDB_ENTRY( e9a3a81f, 0, 8064, YM), /* 03277 - Crawdaddy - The Forest.sndh */
+TIMEDB_ENTRY( e9af2ea1, 0, 3072, YM), /* 02029 - Mad Max - Education.sndh */
+TIMEDB_ENTRY( e9bb98a1, 0, 1528, YM+TA), /* 01338 - Scavenger - Jungle.sndh */
+TIMEDB_ENTRY( e9c08462, 0, 2292, YM), /* 03979 - Claude Abromont - Iron Trackers.sndh */
+TIMEDB_ENTRY( e9c08462, 1, 77, YM), /* 03979 - Claude Abromont - Iron Trackers.sndh */
+TIMEDB_ENTRY( e9c08462, 2, 403, YM), /* 03979 - Claude Abromont - Iron Trackers.sndh */
+TIMEDB_ENTRY( e9c08462, 3, 185, YM), /* 03979 - Claude Abromont - Iron Trackers.sndh */
+TIMEDB_ENTRY( e9c08462, 4, 208, YM), /* 03979 - Claude Abromont - Iron Trackers.sndh */
+TIMEDB_ENTRY( e9c08462, 5, 183, YM), /* 03979 - Claude Abromont - Iron Trackers.sndh */
+TIMEDB_ENTRY( e9c5ceb5, 0, 7680, YM), /* 04629 - Tarzan Boy - Hier Sind Noch Zweu Greetings.sndh */
+TIMEDB_ENTRY( e9efb3f5, 0, 15216, YM+TA+TB+TD), /* 02857 - Helene - Rescued.sndh */
+TIMEDB_ENTRY( e9f6bccf, 0, 32256, YM), /* 03374 - STU - PIRATE SHOWDOWN.sndh */
+TIMEDB_ENTRY( e9fe50e9, 0, 105124, YM+TA), /* 03710 - Sparky - War and Pieces (Nuke Iraq?).sndh */
+TIMEDB_ENTRY( ea0387cf, 0, 384, YM+TA), /* 00956 - Dark Angel - To be continued.sndh */
+TIMEDB_ENTRY( ea0ae5a3, 0, 5130, YM+TB), /* 03527 - !Cube - Crystallized.sndh */
+TIMEDB_ENTRY( ea1d9a19, 0, 2304, YM), /* 01193 - Excellence In Art - Nice.sndh */
+TIMEDB_ENTRY( ea296a9d, 0, 9216, YM), /* 01187 - Excellence In Art - Jingle.sndh */
+TIMEDB_ENTRY( ea417dd3, 0, 5984, YM), /* 00861 - Ben Daglish - Mickey Mouse.sndh */
+TIMEDB_ENTRY( ea77c957, 0, 9849, YM), /* 04214 - Jess - Lemon Squeezer's Dream (chip).sndh */
+TIMEDB_ENTRY( ea7cf4b0, 0, 1536, YM), /* 01993 - Mad Max - Archon.sndh */
+TIMEDB_ENTRY( ea7cf4b0, 1, 1536, YM), /* 01993 - Mad Max - Archon.sndh */
+TIMEDB_ENTRY( ea7cf4b0, 2, 4608, YM), /* 01993 - Mad Max - Archon.sndh */
+TIMEDB_ENTRY( ea7cf4b0, 3, 480, YM), /* 01993 - Mad Max - Archon.sndh */
+TIMEDB_ENTRY( ea7cf4b0, 4, 96, YM), /* 01993 - Mad Max - Archon.sndh */
+TIMEDB_ENTRY( ea7cf4b0, 5, 2880, YM), /* 01993 - Mad Max - Archon.sndh */
+TIMEDB_ENTRY( ea7cf4b0, 6, 2720, YM), /* 01993 - Mad Max - Archon.sndh */
+TIMEDB_ENTRY( ea807e2f, 0, 7296, YM), /* 02877 - Arishem - Rigolo Demo (Abstract).sndh */
+TIMEDB_ENTRY( ea83d2c5, 0, 13154, YM+TA+TB+TD), /* 04517 - Ultrasyd - Staring at the Sea.sndh */
+TIMEDB_ENTRY( ea88b50c, 0, 2304, YM), /* 03206 - Chris Denman - Web of Terror.sndh */
+TIMEDB_ENTRY( ea90e2d0, 0, 9905, YM), /* 04200 - Paul Summers - Espionage.sndh */
+TIMEDB_ENTRY( ea9a97c5, 0, 5112, YM+TA), /* 01685 - Jess - Echelle.sndh */
+TIMEDB_ENTRY( ea9bd562, 0, 5850, YM), /* 00894 - Danny Oneway - Lamebrain 2 - Bomben.sndh */
+TIMEDB_ENTRY( eaa4afd7, 0, 96673, YM+TA), /* 03715 - Richard Joseph - Cadaver.sndh */
+TIMEDB_ENTRY( eaac2a5f, 0, 2009, YM), /* 02948 - Carlo Perconti - Titus the Fox.sndh */
+TIMEDB_ENTRY( eaac2a5f, 1, 319, YM), /* 02948 - Carlo Perconti - Titus the Fox.sndh */
+TIMEDB_ENTRY( eaac2a5f, 2, 5472, YM), /* 02948 - Carlo Perconti - Titus the Fox.sndh */
+TIMEDB_ENTRY( eaac2a5f, 3, 7062, YM), /* 02948 - Carlo Perconti - Titus the Fox.sndh */
+TIMEDB_ENTRY( eaac2a5f, 4, 5121, YM), /* 02948 - Carlo Perconti - Titus the Fox.sndh */
+TIMEDB_ENTRY( eaac2a5f, 5, 8962, YM), /* 02948 - Carlo Perconti - Titus the Fox.sndh */
+TIMEDB_ENTRY( eaac2a5f, 6, 7389, YM), /* 02948 - Carlo Perconti - Titus the Fox.sndh */
+TIMEDB_ENTRY( eaac2a5f, 7, 177, YM), /* 02948 - Carlo Perconti - Titus the Fox.sndh */
+TIMEDB_ENTRY( eaac2a5f, 8, 2160, YM), /* 02948 - Carlo Perconti - Titus the Fox.sndh */
+TIMEDB_ENTRY( eaac2a5f, 9, 2884, YM), /* 02948 - Carlo Perconti - Titus the Fox.sndh */
+TIMEDB_ENTRY( eab3cd98, 0, 662, YM), /* 00461 - Augustin Vidovic - Robotor.sndh */
+TIMEDB_ENTRY( eac5e0ed, 0, 8061, YM), /* 01903 - Luebke - Reverse Pong.sndh */
+TIMEDB_ENTRY( ead4a93a, 0, 8826, YM+TA+TD), /* 01139 - Tyan - Julia 3.sndh */
+TIMEDB_ENTRY( eaefed23, 0, 6680, YM), /* 02123 - Mad Max - Cuddly Demos - Main Menu.sndh */
+TIMEDB_ENTRY( eafa7d19, 0, 11039, YM+TA+TB+TD), /* 04757 - Shinobi - Biomechanoid Locomotion.sndh */
+TIMEDB_ENTRY( eb185808, 0, 8505, YM), /* 03076 - Tom Marvin - CLOSE ENCOUNT.OF THE 3rd KIND.sndh */
+TIMEDB_ENTRY( eb21c301, 0, 1761, YM), /* 04771 - V0yager - Boobswatch theme.sndh */
+TIMEDB_ENTRY( eb6719a5, 0, 10176, YM), /* 03006 - New Frequency - ZPC TLT Demo.sndh */
+TIMEDB_ENTRY( eb6719a5, 1, 2339, YM), /* 03006 - New Frequency - ZPC TLT Demo.sndh */
+TIMEDB_ENTRY( eb683fa4, 0, 8448, YM+TA+TB+TD), /* 02077 - Mad Max - Formula One - Sid.sndh */
+TIMEDB_ENTRY( eb6a3a4c, 0, 129, YM), /* 00100 - David Whittaker - Fire and Brimstone.sndh */
+TIMEDB_ENTRY( eb6a3a4c, 1, 91, YM), /* 00100 - David Whittaker - Fire and Brimstone.sndh */
+TIMEDB_ENTRY( eb6a3a4c, 2, 64, YM), /* 00100 - David Whittaker - Fire and Brimstone.sndh */
+TIMEDB_ENTRY( eb6a3a4c, 3, 147, YM), /* 00100 - David Whittaker - Fire and Brimstone.sndh */
+TIMEDB_ENTRY( eb6a3a4c, 4, 1289, YM), /* 00100 - David Whittaker - Fire and Brimstone.sndh */
+TIMEDB_ENTRY( eb6a3a4c, 5, 1127, YM), /* 00100 - David Whittaker - Fire and Brimstone.sndh */
+TIMEDB_ENTRY( eb6a3a4c, 6, 612, YM), /* 00100 - David Whittaker - Fire and Brimstone.sndh */
+TIMEDB_ENTRY( eb6a3a4c, 7, 345, YM), /* 00100 - David Whittaker - Fire and Brimstone.sndh */
+TIMEDB_ENTRY( eb6a3a4c, 8, 2048, YM), /* 00100 - David Whittaker - Fire and Brimstone.sndh */
+TIMEDB_ENTRY( eb89bc02, 0, 17305, YM), /* 02244 - Tao - Cream (orig. Rob Hubbard) - Sanxion Loader (Stmygm).sndh */
+TIMEDB_ENTRY( eb919aff, 0, 28895, YM+TA+TD), /* 02747 - Marcer - Bellanotte chippy 200hz.sndh */
+TIMEDB_ENTRY( eba9311a, 0, 2305, YM), /* 00394 - Wally Beben - Street Fighter.sndh */
+TIMEDB_ENTRY( eba9311a, 1, 3841, YM), /* 00394 - Wally Beben - Street Fighter.sndh */
+TIMEDB_ENTRY( eba9311a, 2, 236, YM), /* 00394 - Wally Beben - Street Fighter.sndh */
+TIMEDB_ENTRY( eba9311a, 3, 146, YM), /* 00394 - Wally Beben - Street Fighter.sndh */
+TIMEDB_ENTRY( eba9311a, 4, 322, YM), /* 00394 - Wally Beben - Street Fighter.sndh */
+TIMEDB_ENTRY( ebb24e39, 0, 70983, YM+TA), /* 03780 - Richard Joseph - International 3D Tennis Main.sndh */
+TIMEDB_ENTRY( ebc7a679, 0, 1205, YM+TA+TB+TD), /* 03025 - Alchemist - Rare (Endpart).sndh */
+TIMEDB_ENTRY( ebd6394d, 0, 30208, YM+TA+TB+TD), /* 03398 - cerror - CRANBERRY PT2.sndh */
+TIMEDB_ENTRY( ebe46c52, 0, 4602, YM), /* 00016 - 4-Mat - Shadow Dancer.sndh */
+TIMEDB_ENTRY( ebe46c52, 1, 2010, YM), /* 00016 - 4-Mat - Shadow Dancer.sndh */
+TIMEDB_ENTRY( ebe46c52, 2, 2298, YM), /* 00016 - 4-Mat - Shadow Dancer.sndh */
+TIMEDB_ENTRY( ebe46c52, 3, 5368, YM), /* 00016 - 4-Mat - Shadow Dancer.sndh */
+TIMEDB_ENTRY( ebe46c52, 4, 5370, YM), /* 00016 - 4-Mat - Shadow Dancer.sndh */
+TIMEDB_ENTRY( ebe46c52, 5, 4410, YM), /* 00016 - 4-Mat - Shadow Dancer.sndh */
+TIMEDB_ENTRY( ebe46c52, 6, 1530, YM), /* 00016 - 4-Mat - Shadow Dancer.sndh */
+TIMEDB_ENTRY( ebe46c52, 7, 2352, YM), /* 00016 - 4-Mat - Shadow Dancer.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 0, 6036, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 1, 31320, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 2, 10842, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 3, 9960, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 5, 23304, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 6, 18876, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 7, 9216, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 8, 9216, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 9, 24696, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 10, 11000, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 12, 16896, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 13, 17664, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 14, 42840, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ebe4ce3b, 15, 17664, YM), /* 00732 - Sean Connolly - Elvira - The Arcade Game.sndh */
+TIMEDB_ENTRY( ec047ff8, 0, 2564, YM), /* 00112 - Kid Gloves - David Whittaker.sndh */
+TIMEDB_ENTRY( ec047ff8, 1, 260, YM), /* 00112 - Kid Gloves - David Whittaker.sndh */
+TIMEDB_ENTRY( ec047ff8, 2, 97, YM), /* 00112 - Kid Gloves - David Whittaker.sndh */
+TIMEDB_ENTRY( ec047ff8, 3, 592, YM), /* 00112 - Kid Gloves - David Whittaker.sndh */
+TIMEDB_ENTRY( ec05b698, 0, 9696, YM), /* 00460 - Augustin Vidovic - Rainbow.sndh */
+TIMEDB_ENTRY( ec1f4791, 0, 3455, YM+TA+TB+TD), /* 02733 - maktone-fairlight - total.sndh */
+TIMEDB_ENTRY( ec1f8fe4, 0, 23520, YM+TB+TD), /* 02558 - Marcer - CONAN REMIX.sndh */
+TIMEDB_ENTRY( ec3216b6, 0, 71585, YM+TA), /* 04047 - Roggie - STC.sndh */
+TIMEDB_ENTRY( ec33206c, 0, 12640, YM), /* 01509 - Rob Hubbard - Thundercats.sndh */
+TIMEDB_ENTRY( ec4e9b57, 0, 4223, YM), /* 00370 - Beast - TSC - Basstep 2.sndh */
+TIMEDB_ENTRY( ec85260c, 0, 4100, YM), /* 01926 - The Mind - Genesys Remix - Monochrome.sndh */
+TIMEDB_ENTRY( ec9c9cd3, 0, 511, YM), /* 04093 - Gary Wheaton - Sea Fisherman.sndh */
+TIMEDB_ENTRY( ecae2cec, 0, 11520, YM+TA+TD), /* 03315 - SH3-RG - Blakkel.sndh */
+TIMEDB_ENTRY( ecb560f8, 0, 36864, YM), /* 01456 - Stax - X Large.sndh */
+TIMEDB_ENTRY( ecb7bebc, 0, 31744, YM), /* 02803 - Starbuck - Logical Lvl.3.sndh */
+TIMEDB_ENTRY( ecce9105, 0, 1437, YM+TD), /* 02382 - Nexus 6 - Lethal Xcess Level 4.sndh */
+TIMEDB_ENTRY( ecce9105, 1, 8480, YM+TD), /* 02382 - Nexus 6 - Lethal Xcess Level 4.sndh */
+TIMEDB_ENTRY( ecce9105, 2, 2176, YM+TD), /* 02382 - Nexus 6 - Lethal Xcess Level 4.sndh */
+TIMEDB_ENTRY( ecce9105, 3, 1152, YM+TD), /* 02382 - Nexus 6 - Lethal Xcess Level 4.sndh */
+TIMEDB_ENTRY( ecd449f5, 0, 3120, YM), /* 01068 - Jonathon Dunn - Simpsons - Bart vs Space Mutants.sndh */
+TIMEDB_ENTRY( ece92dba, 0, 14332, YM+TA), /* 01285 - Frequent - Evila.sndh */
+TIMEDB_ENTRY( ecf43517, 0, 9408, YM), /* 01970 - MSG - MSG 09 - Maggie 27 Intro.sndh */
+TIMEDB_ENTRY( ecf9567a, 0, 13818, YM+TA+TB+TD), /* 00986 - D-Force - Treat.sndh */
+TIMEDB_ENTRY( ed033f60, 0, 5168, YM+TA+TB+TD), /* 00179 - 505 - Mystic Bytes 3.sndh */
+TIMEDB_ENTRY( ed2f2895, 0, 2096, YM), /* 01499 - Alex Herbert - Xrun.sndh */
+TIMEDB_ENTRY( ed33fd77, 0, 3839, YM+TA+TB+TD), /* 03020 - dubmood - RaZoR 1911 - Nukes Chiptune.sndh */
+TIMEDB_ENTRY( ed35355e, 0, 8446, YM), /* 00372 - Beast - TSC - Beast 2.sndh */
+TIMEDB_ENTRY( ed440180, 0, 14397, YM+TA), /* 04868 - Jovis - Plucking.sndh */
+TIMEDB_ENTRY( ed4ac7a6, 0, 16696, YM), /* 02051 - Mad Max - Sanxion Loader.sndh */
+TIMEDB_ENTRY( ed5b98db, 0, 667, YM+TA), /* 03838 - Fabrice Decroix - Altair Title.sndh */
+TIMEDB_ENTRY( ed704505, 0, 19988, YM), /* 03237 - T1000 - The Beast Club - TBC 9.sndh */
+TIMEDB_ENTRY( ed76828a, 0, 14507, YM+TA+TB+TD), /* 02093 - Mad Max - Saboteur 2 - Sid.sndh */
+TIMEDB_ENTRY( eda03d6e, 0, 314, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 1, 587, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 2, 139, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 3, 156, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 4, 156, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 5, 795, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 6, 890, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 7, 826, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 8, 173, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 9, 201, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 10, 570, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( eda03d6e, 11, 186, YM), /* 01294 - Matt Furniss - Cyberball.sndh */
+TIMEDB_ENTRY( edc369e1, 0, 5119, YM+TA+TB+TD), /* 02835 - maktone-fairlight - granit.sndh */
+TIMEDB_ENTRY( edc4b3cb, 0, 1536, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 1, 1152, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 2, 422, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 3, 205, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 4, 2304, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 5, 1920, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 6, 2688, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 7, 91, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 8, 121, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 9, 125, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 10, 3072, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 11, 70, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 12, 1556, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 13, 1728, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edc4b3cb, 14, 1716, YM), /* 02792 - Keith Tinman - Hudson Hawk.sndh */
+TIMEDB_ENTRY( edccb89c, 0, 2280, YM+TB), /* 02499 - gwEm (Prodigy conversion) - Underground... Like the Wombles.sndh */
+TIMEDB_ENTRY( edf8769a, 0, 9216, YM), /* 01345 - Scavenger - Menu (Megaleif Memories) - Synergy Megademo.sndh */
+TIMEDB_ENTRY( ee1f4380, 0, 2120, YM), /* 01807 - Barry Leitch - Stratego.sndh */
+TIMEDB_ENTRY( ee31ab5f, 0, 3840, YM+TA), /* 00404 - Big Alec - Galaxy.sndh */
+TIMEDB_ENTRY( ee5b2513, 0, 1791, YM+TD), /* 03289 - Dma-Sc - ATIPYK Developments - Manical Drop - 2 Players music #2.sndh */
+TIMEDB_ENTRY( ee692bca, 0, 2304, YM+TA), /* 02951 - Chris Scudds - Cisco Heat (STfm).sndh */
+TIMEDB_ENTRY( ee692bca, 1, 2688, YM+TA), /* 02951 - Chris Scudds - Cisco Heat (STfm).sndh */
+TIMEDB_ENTRY( ee7330c7, 0, 27644, YM), /* 01709 - Jess - I Want U 2 Shoot'em UP.sndh */
+TIMEDB_ENTRY( ee7447f1, 0, 8320, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 1, 2496, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 2, 1600, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 3, 1293, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 4, 2730, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 5, 2497, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 6, 1542, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 7, 1634, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 8, 2178, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 9, 2497, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 10, 3138, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 11, 2560, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 12, 2688, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 13, 512, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 14, 2560, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 15, 752, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 16, 872, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 17, 940, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 18, 512, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 19, 1536, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 20, 1828, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 21, 1828, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 22, 1280, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 23, 1536, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 24, 590, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 25, 369, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 26, 335, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 27, 320, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 28, 149, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee7447f1, 29, 64, YM), /* 04699 - D. Haylett - Moneymania 2.sndh */
+TIMEDB_ENTRY( ee852a96, 0, 7161, YM+TA+TB+TD), /* 04239 - 505-checkpoint - AEH.sndh */
+TIMEDB_ENTRY( ee941dca, 0, 21520, YM+TA+TB+TD), /* 03988 - XyNo - n-a.sndh */
+TIMEDB_ENTRY( eebde3ab, 0, 15350, YM), /* 01744 - Jovis - Lametrop - Intro Part 2.sndh */
+TIMEDB_ENTRY( eec4e1ee, 0, 3834, YM+TA+TB), /* 01346 - Scavenger - Meltdis.sndh */
+TIMEDB_ENTRY( eec642e3, 0, 27216, YM+TA+TB+TD), /* 03578 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( eef0e1d0, 0, 2386, YM), /* 03387 - Unknown - Tango.sndh */
+TIMEDB_ENTRY( eef1808d, 0, 14081, YM+TA+TB+TD), /* 04332 - mOdmate-CheckPoint (orig. David Whittaker) - STORM REVISITED.sndh */
+TIMEDB_ENTRY( ef047ba0, 0, 51520, YM+TA+TB+TD), /* 03312 - TomChi - Noextra - PICROCCINELLE.sndh */
+TIMEDB_ENTRY( ef139890, 0, 3712, YM), /* 01512 - Chris Huelsbeck - Gem'X.sndh */
+TIMEDB_ENTRY( ef139890, 1, 4096, YM), /* 01512 - Chris Huelsbeck - Gem'X.sndh */
+TIMEDB_ENTRY( ef139890, 2, 4096, YM), /* 01512 - Chris Huelsbeck - Gem'X.sndh */
+TIMEDB_ENTRY( ef139890, 3, 267, YM), /* 01512 - Chris Huelsbeck - Gem'X.sndh */
+TIMEDB_ENTRY( ef1693ba, 0, 9213, YM+TA), /* 04865 - Jovis - Cannon F.sndh */
+TIMEDB_ENTRY( ef255e42, 0, 8257, YM), /* 03884 - Unknown - Andalusa.sndh */
+TIMEDB_ENTRY( ef4650fc, 0, 21332, YM+TA), /* 01743 - Jovis - Lametrop - End Part 2.sndh */
+TIMEDB_ENTRY( ef4de347, 0, 21792, YM+TA+TB+TD), /* 04400 - Skaven (ST adaption by mOdmate) - Second Reality 2013 intro.sndh */
+TIMEDB_ENTRY( ef63b160, 0, 5654, YM), /* 03035 - Barry Deutsch - SANTA CLAUS Arr. by B. Deutsch.sndh */
+TIMEDB_ENTRY( ef770201, 0, 5375, YM+TA+TB+TD), /* 02699 - Dubmood & Zabutom - Pampradion livebeat.sndh */
+TIMEDB_ENTRY( ef92d231, 0, 5760, YM), /* 01820 - Lord - Ambition Intro 2.sndh */
+TIMEDB_ENTRY( efaca7a4, 0, 2194, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 1, 3680, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 2, 6582, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 3, 4608, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 4, 1600, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 5, 2560, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 6, 2590, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 7, 337, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 8, 150, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 9, 39, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 10, 36, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 11, 52, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efaca7a4, 12, 41, YM), /* 01493 - Hard N Soft - Steg The Slug.sndh */
+TIMEDB_ENTRY( efcc5dd3, 0, 3840, YM), /* 00601 - Chris Mad - Overdrive Nybble.sndh */
+TIMEDB_ENTRY( effb0c76, 0, 13377, YM+TA+TB+TD), /* 04184 - Dubmood - Liberators - Kick De Bucket.sndh */
+TIMEDB_ENTRY( effc756e, 0, 5119, YM+TB+TD), /* 04759 - Shinobi - Gems in Montana.sndh */
+TIMEDB_ENTRY( f0101dd3, 0, 10236, YM+TA+TB+TD), /* 00992 - DMA-SC - Clean Closet - UCM 19.sndh */
+TIMEDB_ENTRY( f0127a5b, 0, 2306, YM), /* 00728 - Tebirod - No Cooper Reset.sndh */
+TIMEDB_ENTRY( f01a3949, 0, 6144, YM), /* 02796 - Starbuck - Alf.sndh */
+TIMEDB_ENTRY( f028a321, 0, 2598, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 1, 174, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 2, 375, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 3, 147, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 4, 39, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 5, 153, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 6, 54, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 7, 177, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 8, 123, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 9, 18, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 10, 135, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 11, 69, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 12, 96, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 13, 63, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 14, 48, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 15, 36, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f028a321, 16, 39, YM), /* 04736 - Al Lowe - Kings Quest - Quest for the Crown.sndh */
+TIMEDB_ENTRY( f0309cdb, 0, 37317, YM+TA), /* 04018 - Roggie - Legacy.sndh */
+TIMEDB_ENTRY( f04c02ac, 0, 768, YM), /* 01910 - Marcer - Not Ready.sndh */
+TIMEDB_ENTRY( f0529ea6, 0, 6912, YM), /* 02041 - Mad Max - The Last V8.sndh */
+TIMEDB_ENTRY( f05369a4, 0, 33205, YM+TA+TB+TD), /* 03379 - STU - SUCH A SQUARE.sndh */
+TIMEDB_ENTRY( f0665a0f, 0, 6133, YM), /* 04329 - MCH and Mermaid - Elefantastic.sndh */
+TIMEDB_ENTRY( f085566c, 0, 3835, YM), /* 00027 - 505 - 19th.sndh */
+TIMEDB_ENTRY( f093b98b, 0, 14586, YM+TA+TB+TD), /* 01011 - DMA-SC - Shining Dance.sndh */
+TIMEDB_ENTRY( f0a7c121, 0, 9986, YM), /* 00423 - Big Alec - PYM - Colours Go Bang.sndh */
+TIMEDB_ENTRY( f0b2c86e, 0, 14591, YM+TA+TB+TD), /* 02488 - gwEm (Spaz^TLB conversion) - Crikey Wot a Tune!.sndh */
+TIMEDB_ENTRY( f0ba9bde, 0, 7674, YM+TB+TD), /* 00995 - Dma-Sc-Sector1^YM-Rockerz - Fantasia Tune 2.sndh */
+TIMEDB_ENTRY( f0be2ab0, 0, 71891, YM+TA), /* 03966 - Unknown - Sanxion Loader.sndh */
+TIMEDB_ENTRY( f0e33ae4, 0, 7424, YM), /* 03190 - n-a - Improvisation.sndh */
+TIMEDB_ENTRY( f10cf937, 0, 1619, YM), /* 03168 - Unknown - The Spider Dance - Tarantelle.sndh */
+TIMEDB_ENTRY( f1211a3c, 0, 225, YM), /* 04454 - Mike Davies - Human Killing Machine.sndh */
+TIMEDB_ENTRY( f1211a3c, 1, 289, YM), /* 04454 - Mike Davies - Human Killing Machine.sndh */
+TIMEDB_ENTRY( f1211a3c, 2, 10080, YM), /* 04454 - Mike Davies - Human Killing Machine.sndh */
+TIMEDB_ENTRY( f1211a3c, 3, 6912, YM), /* 04454 - Mike Davies - Human Killing Machine.sndh */
+TIMEDB_ENTRY( f124c30b, 0, 5760, YM), /* 02397 - Nexus 6 - Speherical Harmonies.sndh */
+TIMEDB_ENTRY( f12ff40a, 0, 5427, YM), /* 00092 - David Whittaker - Dan Dare III - The Escape.sndh */
+TIMEDB_ENTRY( f12ff40a, 1, 1152, YM), /* 00092 - David Whittaker - Dan Dare III - The Escape.sndh */
+TIMEDB_ENTRY( f13a9be3, 0, 7298, YM), /* 01053 - Dr Beat - Imagination - Snake.sndh */
+TIMEDB_ENTRY( f141ce45, 0, 30720, YM+TA+TB+TD), /* 04571 - mOdmate-CheckPoint (orig. Mad Max-TEX) - Reassessing Teramis (Pokey Flavour).sndh */
+TIMEDB_ENTRY( f1441012, 0, 7999, YM), /* 03678 - Dma-Sc - Antiques - Ending.sndh */
+TIMEDB_ENTRY( f14a3936, 0, 4468, YM), /* 00160 - David Whittaker - Zombi.sndh */
+TIMEDB_ENTRY( f14a3936, 1, 11614, YM), /* 00160 - David Whittaker - Zombi.sndh */
+TIMEDB_ENTRY( f14a3936, 2, 96, YM), /* 00160 - David Whittaker - Zombi.sndh */
+TIMEDB_ENTRY( f154403e, 0, 13416, YM+TA), /* 04014 - Mad Max - Thalion Forever.sndh */
+TIMEDB_ENTRY( f1893d7b, 0, 16896, YM), /* 01090 - Techno - Fantasy - Hidden Screen.sndh */
+TIMEDB_ENTRY( f1a269e0, 0, 75652, YM+TA), /* 03959 - Scott Lemmon - RSMTST.sndh */
+TIMEDB_ENTRY( f1a27de5, 0, 33990, YM+TA), /* 02809 - Starbuck^Creative Mind - Ready to fight (Lightwarriorz 2).sndh */
+TIMEDB_ENTRY( f1a2c561, 0, 6396, YM+TA+TD), /* 00037 - 505 - Brutal Act.sndh */
+TIMEDB_ENTRY( f1a5e780, 0, 386, YM), /* 04498 - Reiner Glock - Biker.sndh */
+TIMEDB_ENTRY( f1a5e780, 1, 1631, YM), /* 04498 - Reiner Glock - Biker.sndh */
+TIMEDB_ENTRY( f1ac7701, 0, 6191, YM), /* 03689 - Dma-Sc - Saboteur 3 - In Game 2.sndh */
+TIMEDB_ENTRY( f1c60210, 0, 10367, YM+TA+TB+TD), /* 03278 - Frequent-Ephidrena - Gatelys.sndh */
+TIMEDB_ENTRY( f21858c3, 0, 41568, YM), /* 01436 - Stax - Dull.sndh */
+TIMEDB_ENTRY( f21e9f18, 0, 10304, YM), /* 01560 - Dave Rogers - Zynaps.sndh */
+TIMEDB_ENTRY( f21e9f18, 1, 640, YM), /* 01560 - Dave Rogers - Zynaps.sndh */
+TIMEDB_ENTRY( f2335193, 0, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 1, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 2, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 3, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 4, 34, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 5, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 6, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 7, 34, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 8, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 9, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 10, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 11, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 12, 31, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 13, 34, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 15, 563, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 16, 495, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 17, 563, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 18, 483, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 19, 772, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 20, 740, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 21, 502, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 22, 755, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 23, 467, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 24, 1262, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 25, 701, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2335193, 26, 1536, YM), /* 04701 - Mikael Lundberg - Mushy Music.sndh */
+TIMEDB_ENTRY( f2375bd6, 0, 1536, YM), /* 01409 - Skyline - Snork Intro - Ooh Crikey.sndh */
+TIMEDB_ENTRY( f2396e36, 0, 9022, YM+TA), /* 01517 - Iso - ...And..Action!!.sndh */
+TIMEDB_ENTRY( f23dcad2, 0, 13440, YM), /* 00482 - Ultimatum - Count Zero 2.sndh */
+TIMEDB_ENTRY( f23f63fc, 0, 23034, YM+STE), /* 01676 - Jess - My First Resonant Burp (STe).sndh */
+TIMEDB_ENTRY( f245e08a, 0, 3920, YM), /* 03297 - gwEm - 1K_ller.sndh */
+TIMEDB_ENTRY( f24e160d, 0, 36630, YM+TA+TD), /* 02306 - Tao - Cream - Competition (EIL99).sndh */
+TIMEDB_ENTRY( f2585808, 0, 13123, YM+TA+TB+TD), /* 03594 - Dma-Sc - YMetal.sndh */
+TIMEDB_ENTRY( f2721c4c, 0, 3332, STE), /* 03449 - 505 - Paradox - Direct Colour Zoomer.sndh */
+TIMEDB_ENTRY( f278424e, 0, 1093, YM), /* 04146 - Unknown - Baall2.sndh */
+TIMEDB_ENTRY( f278424e, 1, 76, YM), /* 04146 - Unknown - Baall2.sndh */
+TIMEDB_ENTRY( f2798b85, 0, 8552, YM), /* 04091 - Gary Wheaton - Scarborough Fair.sndh */
+TIMEDB_ENTRY( f2809078, 0, 12909, YM+TA+TB+TD), /* 01625 - No More - Risk.sndh */
+TIMEDB_ENTRY( f286a7c8, 0, 34054, YM+TA), /* 04666 - Kijop - Axel F.sndh */
+TIMEDB_ENTRY( f288c2be, 0, 7939, YM), /* 00270 - Archimede - Cosmic Pirate Empire Intro.sndh */
+TIMEDB_ENTRY( f28910f2, 0, 3168, YM+TA+TD), /* 02316 - Tao - Cream (orig. Klaus Ude) - Lin Wu's Challenge 3.sndh */
+TIMEDB_ENTRY( f28bd288, 0, 7561, YM), /* 00171 - Martin Walker - Reach for The Skies.sndh */
+TIMEDB_ENTRY( f28bd288, 1, 2640, YM), /* 00171 - Martin Walker - Reach for The Skies.sndh */
+TIMEDB_ENTRY( f28bd288, 2, 3116, YM), /* 00171 - Martin Walker - Reach for The Skies.sndh */
+TIMEDB_ENTRY( f28bd288, 3, 1854, YM), /* 00171 - Martin Walker - Reach for The Skies.sndh */
+TIMEDB_ENTRY( f292e42e, 0, 3269, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 1, 773, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 2, 2725, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 3, 389, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 4, 5765, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 5, 6077, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 6, 6445, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 7, 6149, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 8, 5680, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 9, 5669, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 10, 6053, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 11, 6245, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 12, 1365, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 13, 383, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f292e42e, 14, 2965, YM), /* 01261 - Tim Follin - Sly Spy.sndh */
+TIMEDB_ENTRY( f29318d3, 0, 59760, YM+TA), /* 03228 - 505 - Pacemaker.sndh */
+TIMEDB_ENTRY( f299bba7, 0, 1535, YM+TA), /* 04777 - Excellence in Art - Who Made You Judge Judy And Executioner?.sndh */
+TIMEDB_ENTRY( f29d28b0, 0, 29953, YM+TA), /* 04821 - Twitch - Only You.sndh */
+TIMEDB_ENTRY( f2af4cd0, 0, 9402, YM), /* 01551 - Rhino - PMP Competition Entry.sndh */
+TIMEDB_ENTRY( f2afe226, 0, 4984, YM+TA+TB+TD), /* 01849 - Lotek Style - Giana Sister Title Remix.sndh */
+TIMEDB_ENTRY( f2c7cdc6, 0, 13006, YM+TA), /* 02770 - !Cube - Stax Menu 78.sndh */
+TIMEDB_ENTRY( f2e06124, 0, 9792, YM+TA+TD), /* 02787 - Mad Max - 2006.sndh */
+TIMEDB_ENTRY( f2ed13f3, 0, 5376, YM+TA+TB+TD), /* 03668 - Baggio - Compofiller 3000.sndh */
+TIMEDB_ENTRY( f30f12fb, 0, 16384, YM), /* 04464 - Charles Callet - L'Affaire.sndh */
+TIMEDB_ENTRY( f30f12fb, 1, 16596, YM), /* 04464 - Charles Callet - L'Affaire.sndh */
+TIMEDB_ENTRY( f30f12fb, 2, 8192, YM), /* 04464 - Charles Callet - L'Affaire.sndh */
+TIMEDB_ENTRY( f30f12fb, 3, 17712, YM), /* 04464 - Charles Callet - L'Affaire.sndh */
+TIMEDB_ENTRY( f30f12fb, 4, 16128, YM), /* 04464 - Charles Callet - L'Affaire.sndh */
+TIMEDB_ENTRY( f30f12fb, 5, 17520, YM), /* 04464 - Charles Callet - L'Affaire.sndh */
+TIMEDB_ENTRY( f30f12fb, 6, 10368, YM), /* 04464 - Charles Callet - L'Affaire.sndh */
+TIMEDB_ENTRY( f30f12fb, 7, 10880, YM), /* 04464 - Charles Callet - L'Affaire.sndh */
+TIMEDB_ENTRY( f3193839, 0, 508, YM+TA+TD), /* 02425 - 505-cpt^dox - loop01.sndh */
+TIMEDB_ENTRY( f31b12f8, 0, 5534, YM), /* 04076 - Gary Wheaton - Like a Hurricane.sndh */
+TIMEDB_ENTRY( f3240c01, 0, 3552, YM), /* 01203 - Excellence In Art - Summer.sndh */
+TIMEDB_ENTRY( f32dd5b3, 0, 60930, YM+TA), /* 04811 - Unknown - Spr.sndh */
+TIMEDB_ENTRY( f35b9845, 0, 1686, YM), /* 03184 - n-a - William Tell Overture.sndh */
+TIMEDB_ENTRY( f363560d, 0, 28160, YM+TA+TB+TD), /* 02601 - STU - LAST MINUTE.sndh */
+TIMEDB_ENTRY( f3637837, 0, 4475, YM+TA+TB+TD), /* 04322 - 505 - Three.sndh */
+TIMEDB_ENTRY( f365698b, 0, 9600, YM+TA+TB+TD), /* 03026 - !Cube - Agent Hippel To The Rescue.sndh */
+TIMEDB_ENTRY( f36b02f9, 0, 5898, YM), /* 00578 - Jas C Brooke - Time Soldier.sndh */
+TIMEDB_ENTRY( f36b02f9, 1, 210, YM), /* 00578 - Jas C Brooke - Time Soldier.sndh */
+TIMEDB_ENTRY( f36b02f9, 2, 1780, YM), /* 00578 - Jas C Brooke - Time Soldier.sndh */
+TIMEDB_ENTRY( f36b02f9, 3, 7835, YM), /* 00578 - Jas C Brooke - Time Soldier.sndh */
+TIMEDB_ENTRY( f36b02f9, 4, 334, YM), /* 00578 - Jas C Brooke - Time Soldier.sndh */
+TIMEDB_ENTRY( f36b02f9, 5, 2730, YM), /* 00578 - Jas C Brooke - Time Soldier.sndh */
+TIMEDB_ENTRY( f36b02f9, 6, 687, YM), /* 00578 - Jas C Brooke - Time Soldier.sndh */
+TIMEDB_ENTRY( f36b02f9, 7, 1820, YM), /* 00578 - Jas C Brooke - Time Soldier.sndh */
+TIMEDB_ENTRY( f371e8a6, 0, 2069, YM), /* 03068 - Chris French - Jingle Bells.sndh */
+TIMEDB_ENTRY( f37a6157, 0, 6912, YM), /* 02002 - Mad Max - Demo Music 8.sndh */
+TIMEDB_ENTRY( f37a73b3, 0, 5327, YM+TA+TB), /* 00215 - 505 - Zirkuss.sndh */
+TIMEDB_ENTRY( f3992b60, 0, 8824, YM+TA), /* 02502 - lotekstyle - Spieler 1, Los!.sndh */
+TIMEDB_ENTRY( f3acc758, 0, 2400, YM+TA+TD), /* 00411 - Big Alec - Magick.sndh */
+TIMEDB_ENTRY( f3b3dc75, 0, 3120, YM), /* 00152 - David Whittaker - Warlock The Avenger.sndh */
+TIMEDB_ENTRY( f3b4254a, 0, 5771, YM+TD), /* 01614 - No More - Groovy.sndh */
+TIMEDB_ENTRY( f3be48d8, 0, 12192, YM), /* 02027 - Mad Max - Deep Strike.sndh */
+TIMEDB_ENTRY( f3c6e8aa, 0, 12767, YM+TA+TB+TD), /* 03019 - Dubmood - Loonies Biohazard.sndh */
+TIMEDB_ENTRY( f3fed517, 0, 4575, YM+TB+TD), /* 03293 - Dma-Sc - ATIPYK Developments - Manical Drop - 1 Player music #2.sndh */
+TIMEDB_ENTRY( f413fc38, 0, 1921, YM), /* 04155 - Unknown - Orfana.sndh */
+TIMEDB_ENTRY( f41645d7, 0, 1150, YM), /* 01528 - Iso - Houseman.sndh */
+TIMEDB_ENTRY( f4204a3f, 0, 11951, YM+TA), /* 00812 - Crawdaddy - Suffer In Hell.sndh */
+TIMEDB_ENTRY( f42539ef, 0, 71402, YM+TA), /* 03809 - Martin Walker - Gettysburg.sndh */
+TIMEDB_ENTRY( f4570dd1, 0, 5600, YM+TA+TD), /* 02571 - !Cube-Aggression - Water.sndh */
+TIMEDB_ENTRY( f45e0431, 0, 65185, YM+TA), /* 03950 - Scott Lemmon - Fish.sndh */
+TIMEDB_ENTRY( f4602101, 0, 18240, YM+TA), /* 02182 - Mad Max - Bad Cat.sndh */
+TIMEDB_ENTRY( f46d5b97, 0, 5396, YM+TA), /* 04008 - Per Almered-XiA-Checkpoint - Idas Sommarvisa (G Riedel).sndh */
+TIMEDB_ENTRY( f471ff46, 0, 2305, YM), /* 03889 - Unknown - Menuet.sndh */
+TIMEDB_ENTRY( f476f830, 0, 3264, YM), /* 04835 - t1000 - Bits 29.sndh */
+TIMEDB_ENTRY( f47ce127, 0, 12640, YM), /* 00760 - Count Zero - Hidden Easter Egg.sndh */
+TIMEDB_ENTRY( f490c357, 0, 10620, YM), /* 00349 - Tony Williams - Sharkeys Moll.sndh */
+TIMEDB_ENTRY( f490c357, 1, 193, YM), /* 00349 - Tony Williams - Sharkeys Moll.sndh */
+TIMEDB_ENTRY( f490c357, 2, 793, YM), /* 00349 - Tony Williams - Sharkeys Moll.sndh */
+TIMEDB_ENTRY( f493813b, 0, 518, YM), /* 01494 - Havoc - This Sux.sndh */
+TIMEDB_ENTRY( f49b7214, 0, 8448, YM+TA), /* 04418 - EVE - Serious.sndh */
+TIMEDB_ENTRY( f4a2cb20, 0, 2048, YM), /* 00135 - David Whittaker - Snoopy.sndh */
+TIMEDB_ENTRY( f4a2cb20, 1, 1877, YM), /* 00135 - David Whittaker - Snoopy.sndh */
+TIMEDB_ENTRY( f4a2cb20, 2, 145, YM), /* 00135 - David Whittaker - Snoopy.sndh */
+TIMEDB_ENTRY( f4a2cb20, 3, 145, YM), /* 00135 - David Whittaker - Snoopy.sndh */
+TIMEDB_ENTRY( f4b5c9f5, 0, 4096, YM), /* 02932 - Chris Denman - Crime City.sndh */
+TIMEDB_ENTRY( f4b5c9f5, 1, 2560, YM), /* 02932 - Chris Denman - Crime City.sndh */
+TIMEDB_ENTRY( f4b5c9f5, 2, 1024, YM), /* 02932 - Chris Denman - Crime City.sndh */
+TIMEDB_ENTRY( f4b5c9f5, 3, 1152, YM), /* 02932 - Chris Denman - Crime City.sndh */
+TIMEDB_ENTRY( f4b5c9f5, 4, 1024, YM), /* 02932 - Chris Denman - Crime City.sndh */
+TIMEDB_ENTRY( f4be8784, 0, 12840, YM), /* 01642 - Jedi - Beeforol.sndh */
+TIMEDB_ENTRY( f4d4c835, 0, 44456, YM), /* 00005 - Gwem - Raid The Tower (YM Rockerz).sndh */
+TIMEDB_ENTRY( f4f9c1ba, 0, 1919, YM+TD), /* 03626 - Gabriel Yared-XiA - Betty.sndh */
+TIMEDB_ENTRY( f4fc3f7c, 0, 9340, YM), /* 01233 - Epic - Magic Lame.sndh */
+TIMEDB_ENTRY( f4fe548e, 0, 15401, YM), /* 03079 - Ron Robinson - Bridge Over Troubled Water.sndh */
+TIMEDB_ENTRY( f4ff62c1, 0, 3072, YM), /* 01728 - John Michael Phillips - Nebulus.sndh */
+TIMEDB_ENTRY( f51be010, 0, 1275, YM+TA+TB), /* 03502 - 505 - Suretrip 2 - Stars.sndh */
+TIMEDB_ENTRY( f51f297f, 0, 33518, YM+TA), /* 04801 - Unknown - Flash.sndh */
+TIMEDB_ENTRY( f52bd8d5, 0, 12800, YM+TA), /* 01546 - Ralph - Ralph Digi 3.sndh */
+TIMEDB_ENTRY( f533be70, 0, 4928, YM), /* 00296 - Gary Wheaton - Aru.sndh */
+TIMEDB_ENTRY( f53f462b, 0, 4896, YM+TA), /* 04587 - Technoblip - Groovin' Nostrils.sndh */
+TIMEDB_ENTRY( f5482637, 0, 909, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 1, 1914, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 2, 322, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 3, 181, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 4, 306, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 5, 2885, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 6, 781, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 7, 538, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 8, 221, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 9, 661, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 10, 592, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 11, 99, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 12, 2682, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f5482637, 14, 1108, YM), /* 04738 - Margaret Lowe - Kings Quest 3 - The Heir is Human.sndh */
+TIMEDB_ENTRY( f548f91d, 0, 1536, YM), /* 01102 - Techno - Techno 7.sndh */
+TIMEDB_ENTRY( f54dd8a5, 0, 1536, YM), /* 01413 - Skyline - Snork Intro - Syntax Terror.sndh */
+TIMEDB_ENTRY( f550d110, 0, 8471, YM+TA+TB+TD), /* 02778 - !Cube - Back To Basics.sndh */
+TIMEDB_ENTRY( f55d8144, 0, 4968, YM), /* 03175 - Unknown - Talk To Me - by Stevie Nicks.sndh */
+TIMEDB_ENTRY( f55e7bae, 0, 4473, YM+TA), /* 01689 - Jess - Guile.sndh */
+TIMEDB_ENTRY( f58379d5, 0, 20928, YM), /* 01796 - Barry Leitch - Hero Quest.sndh */
+TIMEDB_ENTRY( f58379d5, 1, 10864, YM), /* 01796 - Barry Leitch - Hero Quest.sndh */
+TIMEDB_ENTRY( f58379d5, 2, 8448, YM), /* 01796 - Barry Leitch - Hero Quest.sndh */
+TIMEDB_ENTRY( f58c1b47, 0, 7680, YM+TA+TD), /* 02428 - 505 - Triplex 2.sndh */
+TIMEDB_ENTRY( f5abd6a1, 0, 13055, YM+TA+TB+TD), /* 02777 - timbral-dhs-ymr - 2006 - outrun highway E6.sndh */
+TIMEDB_ENTRY( f5b3a422, 0, 8960, YM), /* 03467 - Marcer - Treasure.sndh */
+TIMEDB_ENTRY( f5c0d269, 0, 7852, YM+TA+TB), /* 00209 - 505 - UCM 11 Intro Endpart.sndh */
+TIMEDB_ENTRY( f5de8f29, 0, 4992, YM), /* 04857 - Big Alec - Pro BMX Simulator (cover).sndh */
+TIMEDB_ENTRY( f5e39c6c, 0, 3840, YM), /* 01058 - Jonathan Dunn - Elf - Menu.sndh */
+TIMEDB_ENTRY( f5eb1ba7, 0, 3450, YM+TA), /* 02641 - Miggy - Poker(Unfinished).sndh */
+TIMEDB_ENTRY( f5f03f5d, 0, 9600, YM), /* 01580 - Nigel Pritchard - Netherworld.sndh */
+TIMEDB_ENTRY( f606699b, 0, 20020, YM+TA+TB+TD), /* 03600 - Marcer - RADIO Summerhack Version.sndh */
+TIMEDB_ENTRY( f61d2f66, 0, 3583, YM), /* 03686 - Dma-Sc - Saboteur 3 - Gains.sndh */
+TIMEDB_ENTRY( f6237591, 0, 6912, YM+TA), /* 00782 - Crawdaddy - Chinese story.sndh */
+TIMEDB_ENTRY( f62e8f62, 0, 3584, YM), /* 00791 - Crawdaddy - Hidden.sndh */
+TIMEDB_ENTRY( f647f698, 0, 8960, YM+TB+TD), /* 03462 - Marcer - Pandora.sndh */
+TIMEDB_ENTRY( f64f8919, 0, 39853, YM), /* 04383 - Roderic Mege - Unreal.sndh */
+TIMEDB_ENTRY( f65568b3, 0, 285, YM), /* 00859 - Ben Daglish - Legends of Valour.sndh */
+TIMEDB_ENTRY( f65568b3, 1, 160, YM), /* 00859 - Ben Daglish - Legends of Valour.sndh */
+TIMEDB_ENTRY( f65568b3, 2, 498, YM), /* 00859 - Ben Daglish - Legends of Valour.sndh */
+TIMEDB_ENTRY( f65568b3, 3, 267, YM), /* 00859 - Ben Daglish - Legends of Valour.sndh */
+TIMEDB_ENTRY( f65568b3, 4, 911, YM), /* 00859 - Ben Daglish - Legends of Valour.sndh */
+TIMEDB_ENTRY( f65568b3, 5, 2045, YM), /* 00859 - Ben Daglish - Legends of Valour.sndh */
+TIMEDB_ENTRY( f65568b3, 6, 1017, YM), /* 00859 - Ben Daglish - Legends of Valour.sndh */
+TIMEDB_ENTRY( f65c50e0, 0, 6583, YM+TA+TB+TD), /* 02992 - 505-paradox - on behalf of the queen (STE only).sndh */
+TIMEDB_ENTRY( f668e3f0, 0, 10471, YM+TA+TD), /* 03647 - 505 - Base Case.sndh */
+TIMEDB_ENTRY( f699428a, 0, 5412, YM+TA+TD), /* 04316 - 505-checkpoint - synthpop.sndh */
+TIMEDB_ENTRY( f6b1345a, 0, 3072, YM), /* 04519 - Antichrist - Robocop.sndh */
+TIMEDB_ENTRY( f6b1d5ee, 0, 6086, YM), /* 03098 - n-a - Good Time Charlie.sndh */
+TIMEDB_ENTRY( f6d73f8f, 0, 2562, YM), /* 04535 - Jan Holmgren - Frog Race.sndh */
+TIMEDB_ENTRY( f6d73f8f, 1, 155, YM), /* 04535 - Jan Holmgren - Frog Race.sndh */
+TIMEDB_ENTRY( f6d73f8f, 2, 116, YM), /* 04535 - Jan Holmgren - Frog Race.sndh */
+TIMEDB_ENTRY( f6d73f8f, 3, 2189, YM), /* 04535 - Jan Holmgren - Frog Race.sndh */
+TIMEDB_ENTRY( f6d73f8f, 4, 1120, YM), /* 04535 - Jan Holmgren - Frog Race.sndh */
+TIMEDB_ENTRY( f6d73f8f, 5, 2362, YM), /* 04535 - Jan Holmgren - Frog Race.sndh */
+TIMEDB_ENTRY( f6d73f8f, 6, 594, YM), /* 04535 - Jan Holmgren - Frog Race.sndh */
+TIMEDB_ENTRY( f6d73f8f, 7, 1920, YM), /* 04535 - Jan Holmgren - Frog Race.sndh */
+TIMEDB_ENTRY( f6d73f8f, 8, 2571, YM), /* 04535 - Jan Holmgren - Frog Race.sndh */
+TIMEDB_ENTRY( f6d73f8f, 9, 259, YM), /* 04535 - Jan Holmgren - Frog Race.sndh */
+TIMEDB_ENTRY( f6dbcd1a, 0, 3072, YM), /* 00734 - Sean Connolly - Goat Beard End.sndh */
+TIMEDB_ENTRY( f6e0e5fa, 0, 7161, YM+TA), /* 02769 - !Cube - Eye on Scene Maggie Dentro.sndh */
+TIMEDB_ENTRY( f6e2634e, 0, 9978, YM+TA+TB+TD), /* 02423 - 505 - Checkpoint - hybrid.sndh */
+TIMEDB_ENTRY( f6e83698, 0, 36992, YM+TA+TB+TD), /* 03863 - xyce - Cpp is Forbidden - Part 1 (sid).sndh */
+TIMEDB_ENTRY( f71a80a8, 0, 21760, YM+TD), /* 02608 - STU - NAUGHTY BRAT.sndh */
+TIMEDB_ENTRY( f72491f6, 0, 2700, YM), /* 03146 - n-a - Off To School Boogie.sndh */
+TIMEDB_ENTRY( f72e19e6, 0, 2298, YM), /* 04273 - 505 - lame01.sndh */
+TIMEDB_ENTRY( f7376718, 0, 16984, YM+TA), /* 00725 - Tebirod - No Cooper End Screen.sndh */
+TIMEDB_ENTRY( f7441a76, 0, 743, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 1, 1210, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 2, 640, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 3, 192, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 4, 448, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 5, 576, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 6, 768, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 7, 512, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 8, 1024, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 9, 704, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 10, 1645, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 11, 643, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 12, 576, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 13, 832, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 14, 256, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 15, 1554, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 16, 672, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 17, 377, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 18, 480, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f7441a76, 19, 896, YM), /* 04491 - Unknown - Anti matter.sndh */
+TIMEDB_ENTRY( f74f2e17, 0, 6144, YM), /* 04445 - Iso - Smooth Talking.sndh */
+TIMEDB_ENTRY( f791df96, 0, 31040, YM), /* 02690 - Philip Linde - RAS ATARI.sndh */
+TIMEDB_ENTRY( f7ce16da, 0, 33024, YM+TB+TD), /* 04850 - xFalcon - LASER CHIP TALK.sndh */
+TIMEDB_ENTRY( f7d382af, 0, 12288, YM), /* 01082 - Excellence In Art - Elftec 2.sndh */
+TIMEDB_ENTRY( f7ddc72f, 0, 7677, YM), /* 03549 - Jovis - Zwaqwam.sndh */
+TIMEDB_ENTRY( f7e262be, 0, 11901, YM+TA+TB+TD), /* 00050 - 505 - Fukk2.sndh */
+TIMEDB_ENTRY( f7e41fdd, 0, 4212, YM), /* 01394 - Paul Shields - Airball.sndh */
+TIMEDB_ENTRY( f7e41fdd, 1, 20767, YM), /* 01394 - Paul Shields - Airball.sndh */
+TIMEDB_ENTRY( f7e41fdd, 2, 5681, YM), /* 01394 - Paul Shields - Airball.sndh */
+TIMEDB_ENTRY( f7e41fdd, 3, 1152, YM), /* 01394 - Paul Shields - Airball.sndh */
+TIMEDB_ENTRY( f7e41fdd, 4, 2204, YM), /* 01394 - Paul Shields - Airball.sndh */
+TIMEDB_ENTRY( f7f9c7da, 0, 52263, YM+TA), /* 03777 - Stewart Gardner - Stampede 6.sndh */
+TIMEDB_ENTRY( f7fe995e, 0, 5373, YM+TA+TB+TD), /* 04258 - 505 - Checkpoint (2000) - Fettiger (Unrel.).sndh */
+TIMEDB_ENTRY( f8105359, 0, 40512, YM+TA+TB+TD), /* 04349 - YERZMYEY-AY-RIDERS - CELESTIAL SPHERE.sndh */
+TIMEDB_ENTRY( f81187b5, 0, 3916, YM), /* 03092 - Unknown - Every Breath You Take - Sting.sndh */
+TIMEDB_ENTRY( f8255e0a, 0, 19199, YM), /* 04474 - Charles Callet - Murders in Venice.sndh */
+TIMEDB_ENTRY( f839d7b9, 0, 5631, YM+TA+TB+TD), /* 02987 - 505-paradox - for the moon.sndh */
+TIMEDB_ENTRY( f83d8b09, 0, 2300, YM+TB+TD), /* 04261 - 505-checkpoint - Granit.sndh */
+TIMEDB_ENTRY( f840a4d5, 0, 40227, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 1, 16899, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 2, 41475, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 3, 14339, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 4, 51452, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 5, 71273, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 6, 28163, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 7, 1435, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 8, 1191, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 9, 1503, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 10, 700, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 11, 1574, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f840a4d5, 12, 1503, YM), /* 01795 - Harlequin - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 0, 27394, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 1, 49179, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 2, 10755, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 3, 28061, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 4, 28675, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 5, 27651, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 6, 63747, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 7, 12291, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 8, 16899, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 9, 56835, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 10, 11651, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 11, 23043, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 12, 68870, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 13, 15363, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 14, 50691, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 15, 62595, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 16, 11308, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 17, 26883, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 18, 62115, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 19, 12291, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f85661a4, 20, 21507, YM), /* 01814 - Zone Warrior - Barry Leitch.sndh */
+TIMEDB_ENTRY( f888195c, 0, 24832, YM+TA+TB+TD), /* 02086 - Mad Max - Lightforce - Sid.sndh */
+TIMEDB_ENTRY( f889233b, 0, 1289, YM), /* 03095 - n-a - .sndh */
+TIMEDB_ENTRY( f88ceda9, 0, 4032, YM), /* 00766 - Count Zero - Decade Demo - Loader.sndh */
+TIMEDB_ENTRY( f894547e, 0, 94600, YM+TA), /* 04009 - Manfred Becker - Robert in the Fire Factory.sndh */
+TIMEDB_ENTRY( f8a9b5d0, 0, 6527, YM+TA+TB+TD), /* 03365 - gwEm - The Ancient Art of Chiptune.sndh */
+TIMEDB_ENTRY( f8c6a251, 0, 17952, YM), /* 02008 - Mad Max - Shades - Giana Sisters Remix.sndh */
+TIMEDB_ENTRY( f8c7f8a6, 0, 7953, YM+TA+TB+TD), /* 04873 - 505 - Courage (compo version).sndh */
+TIMEDB_ENTRY( f8c9634f, 0, 8448, YM), /* 00492 - Ultimatum - Kidney Bean 8.sndh */
+TIMEDB_ENTRY( f8d74c10, 0, 11011, YM), /* 00271 - Archimede - Transbeauce Equinox.sndh */
+TIMEDB_ENTRY( f8dfa131, 0, 9594, YM+TA+TB+TD), /* 02832 - Msg - Superfly tune 9.sndh */
+TIMEDB_ENTRY( f8e3bf73, 0, 3840, YM), /* 00481 - Ultimatum - Curio.sndh */
+TIMEDB_ENTRY( f8e40be9, 0, 11904, YM+TA), /* 04117 - Tao - Call Me - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( f90150aa, 0, 41496, YM+TA+TB+TD), /* 03397 - cerror - CRANBERRY PT1.sndh */
+TIMEDB_ENTRY( f9026221, 0, 8058, YM), /* 00885 - Adrian Dalecki - Leonardo 1.sndh */
+TIMEDB_ENTRY( f9026221, 1, 1146, YM), /* 00885 - Adrian Dalecki - Leonardo 1.sndh */
+TIMEDB_ENTRY( f90bccb5, 0, 17045, YM+STE+TA+TB+TD), /* 03604 - Per Almered (XiA) 2010 - Talk Talk 2 - The Church of Excellence in Art main tune.sndh */
+TIMEDB_ENTRY( f920fd49, 0, 4697, YM), /* 03100 - n-a - Children's Corner # 2.sndh */
+TIMEDB_ENTRY( f92ebe35, 0, 768, YM+TA), /* 00944 - Dark Angel - Rantan Plan.sndh */
+TIMEDB_ENTRY( f936b5c6, 0, 14669, YM), /* 00917 - Dark Angel - Blood Theme.sndh */
+TIMEDB_ENTRY( f946b406, 0, 2699, YM+TA), /* 01703 - Jess - Once Again.sndh */
+TIMEDB_ENTRY( f96b72d0, 0, 4607, YM+TA+TB+TD), /* 02836 - maktone-fairlight - hex.sndh */
+TIMEDB_ENTRY( f989299b, 0, 2304, YM), /* 01763 - Lap - Lap 3.sndh */
+TIMEDB_ENTRY( f9975afa, 0, 2682, YM), /* 01347 - Scavenger - Miami Spice.sndh */
+TIMEDB_ENTRY( f9a3e049, 0, 5764, YM), /* 01771 - Lap - Lap 11.sndh */
+TIMEDB_ENTRY( f9a7e8fe, 0, 34048, YM+TA+TB+TD), /* 02628 - schmx-awp - Eat This.sndh */
+TIMEDB_ENTRY( f9b67dc6, 0, 8696, YM+TA+TD), /* 01861 - Lotek Style - Ode to DMA-SC.sndh */
+TIMEDB_ENTRY( f9bd3c1e, 0, 26548, YM), /* 03363 - Dave Kelly - Last Ninja 2.sndh */
+TIMEDB_ENTRY( f9bd3c1e, 1, 24651, YM), /* 03363 - Dave Kelly - Last Ninja 2.sndh */
+TIMEDB_ENTRY( f9bd3c1e, 2, 29582, YM), /* 03363 - Dave Kelly - Last Ninja 2.sndh */
+TIMEDB_ENTRY( f9bd3c1e, 3, 41265, YM), /* 03363 - Dave Kelly - Last Ninja 2.sndh */
+TIMEDB_ENTRY( f9bd3c1e, 4, 29392, YM), /* 03363 - Dave Kelly - Last Ninja 2.sndh */
+TIMEDB_ENTRY( f9bd3c1e, 5, 29866, YM), /* 03363 - Dave Kelly - Last Ninja 2.sndh */
+TIMEDB_ENTRY( f9bd3c1e, 6, 35650, YM), /* 03363 - Dave Kelly - Last Ninja 2.sndh */
+TIMEDB_ENTRY( f9c35150, 0, 5754, YM+TA+TB+TD), /* 04291 - 505-cpt^pdx - nervous.sndh */
+TIMEDB_ENTRY( f9cbd585, 0, 11904, YM+TA), /* 04123 - Tao - Seagulls - STMYGM 2 version.sndh */
+TIMEDB_ENTRY( f9cc8d5d, 0, 36885, YM), /* 03476 - gwEm - Lazy Jones remix.sndh */
+TIMEDB_ENTRY( f9d34064, 0, 51395, YM+TA), /* 04041 - Roggie - Florence loves Dougal.sndh */
+TIMEDB_ENTRY( f9d954dc, 0, 10745, YM+TA+TB+TD), /* 01968 - MSG - Godpey - Time.sndh */
+TIMEDB_ENTRY( f9dce660, 0, 1463, YM), /* 04484 - Nathan. Taylor - 180.sndh */
+TIMEDB_ENTRY( f9dce660, 1, 576, YM), /* 04484 - Nathan. Taylor - 180.sndh */
+TIMEDB_ENTRY( f9dce660, 2, 3584, YM), /* 04484 - Nathan. Taylor - 180.sndh */
+TIMEDB_ENTRY( f9dce660, 3, 1861, YM), /* 04484 - Nathan. Taylor - 180.sndh */
+TIMEDB_ENTRY( f9e43f4a, 0, 9888, YM), /* 02383 - Nexus 6 - Lost in Milky Way.sndh */
+TIMEDB_ENTRY( f9e4b826, 0, 1513, YM), /* 00139 - David Whittaker - Sporting Triangles.sndh */
+TIMEDB_ENTRY( f9e4b826, 1, 78, YM), /* 00139 - David Whittaker - Sporting Triangles.sndh */
+TIMEDB_ENTRY( f9e4b826, 2, 1514, YM), /* 00139 - David Whittaker - Sporting Triangles.sndh */
+TIMEDB_ENTRY( f9e4b826, 3, 179, YM), /* 00139 - David Whittaker - Sporting Triangles.sndh */
+TIMEDB_ENTRY( f9e4b826, 4, 179, YM), /* 00139 - David Whittaker - Sporting Triangles.sndh */
+TIMEDB_ENTRY( fa335012, 0, 2664, YM), /* 03927 - Unknown - Sound 1.sndh */
+TIMEDB_ENTRY( fa34dc4a, 0, 14339, YM), /* 01809 - Barry Leitch - Switchblade 2.sndh */
+TIMEDB_ENTRY( fa34dc4a, 1, 9219, YM), /* 01809 - Barry Leitch - Switchblade 2.sndh */
+TIMEDB_ENTRY( fa480c49, 0, 56581, YM+TA), /* 04129 - Mad Max - In 80 Days Around The World.sndh */
+TIMEDB_ENTRY( fa64f502, 0, 6048, YM), /* 02043 - Mad Max - Locomotion.sndh */
+TIMEDB_ENTRY( fa71d171, 0, 775, YM), /* 03913 - Unknown - E1.sndh */
+TIMEDB_ENTRY( fa7dbc55, 0, 4416, YM), /* 01992 - Mad Max - Airball Remix.sndh */
+TIMEDB_ENTRY( fa8edb08, 0, 2496, YM+TA+TB+TD), /* 03865 - Mr Coke - Chasey End.sndh */
+TIMEDB_ENTRY( fa9a5fac, 0, 8064, YM), /* 00257 - Antichrist - New History.sndh */
+TIMEDB_ENTRY( faad5275, 0, 99326, YM+TA), /* 03706 - Sparky - Just 4 Fun.sndh */
+TIMEDB_ENTRY( fabf8b04, 0, 195, YM), /* 00564 - Jas C Brooke - Buggy Boy.sndh */
+TIMEDB_ENTRY( fabf8b04, 1, 597, YM), /* 00564 - Jas C Brooke - Buggy Boy.sndh */
+TIMEDB_ENTRY( fabf8b04, 2, 322, YM), /* 00564 - Jas C Brooke - Buggy Boy.sndh */
+TIMEDB_ENTRY( fabf8b04, 3, 4239, YM), /* 00564 - Jas C Brooke - Buggy Boy.sndh */
+TIMEDB_ENTRY( fabf8b04, 4, 1963, YM), /* 00564 - Jas C Brooke - Buggy Boy.sndh */
+TIMEDB_ENTRY( fabf8b04, 5, 104, YM), /* 00564 - Jas C Brooke - Buggy Boy.sndh */
+TIMEDB_ENTRY( fae15a74, 0, 3840, YM), /* 00900 - Danny Oneway - Drumz.sndh */
+TIMEDB_ENTRY( fae747b9, 0, 8763, YM), /* 00149 - David Whittaker - Total Recall.sndh */
+TIMEDB_ENTRY( fae747b9, 1, 8304, YM), /* 00149 - David Whittaker - Total Recall.sndh */
+TIMEDB_ENTRY( fae747b9, 2, 1905, YM), /* 00149 - David Whittaker - Total Recall.sndh */
+TIMEDB_ENTRY( fae747b9, 3, 2048, YM), /* 00149 - David Whittaker - Total Recall.sndh */
+TIMEDB_ENTRY( fae747b9, 4, 1917, YM), /* 00149 - David Whittaker - Total Recall.sndh */
+TIMEDB_ENTRY( faf39c3b, 0, 2112, YM), /* 04681 - B Amundlien - Just Another Silly Sports sim.sndh */
+TIMEDB_ENTRY( faf39c3b, 1, 2352, YM), /* 04681 - B Amundlien - Just Another Silly Sports sim.sndh */
+TIMEDB_ENTRY( faf39c3b, 2, 8896, YM), /* 04681 - B Amundlien - Just Another Silly Sports sim.sndh */
+TIMEDB_ENTRY( faf39c3b, 3, 304, YM), /* 04681 - B Amundlien - Just Another Silly Sports sim.sndh */
+TIMEDB_ENTRY( fb020342, 0, 12733, YM+TA+TD), /* 02894 - Nemo - DHS - Bobbin Guru Deva.sndh */
+TIMEDB_ENTRY( fb1d5028, 0, 1920, YM), /* 04648 - ActoDi - Cute Animals.sndh */
+TIMEDB_ENTRY( fb23df7b, 0, 10326, YM+TA), /* 01621 - No More - Infinity.sndh */
+TIMEDB_ENTRY( fb3140a4, 0, 2764, YM), /* 00151 - David Whittaker - Voodoo Nightmare.sndh */
+TIMEDB_ENTRY( fb3140a4, 1, 7801, YM), /* 00151 - David Whittaker - Voodoo Nightmare.sndh */
+TIMEDB_ENTRY( fb3140a4, 2, 124, YM), /* 00151 - David Whittaker - Voodoo Nightmare.sndh */
+TIMEDB_ENTRY( fb3140a4, 3, 135, YM), /* 00151 - David Whittaker - Voodoo Nightmare.sndh */
+TIMEDB_ENTRY( fb5bb413, 0, 1727, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5bb413, 1, 136, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5bb413, 2, 2303, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5bb413, 3, 2303, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5bb413, 4, 2303, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5bb413, 5, 895, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5bb413, 6, 120, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5bb413, 7, 3966, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5bb413, 8, 3359, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5bb413, 9, 1140, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5bb413, 10, 511, YM), /* 00350 - Tony Williams - Shinobi.sndh */
+TIMEDB_ENTRY( fb5c1c6e, 0, 6144, YM), /* 01982 - MSG - MSG 14.sndh */
+TIMEDB_ENTRY( fb5d6332, 0, 10756, YM), /* 02229 - Tao - Fractal Blast (Nostalgic-O-Demo).sndh */
+TIMEDB_ENTRY( fb67d77b, 0, 5384, YM), /* 01034 - Donald Fakk - Bluespace.sndh */
+TIMEDB_ENTRY( fb7d564d, 0, 2080, YM), /* 03060 - Ed Bogas - Star-Spangled Banner - F.S.Key.sndh */
+TIMEDB_ENTRY( fb7ee1cc, 0, 57367, YM+TA), /* 03804 - Sparky - Pompey Pirates Menu 106.sndh */
+TIMEDB_ENTRY( fb8e2f01, 0, 8642, YM), /* 00402 - Big Alec - What Time Is It ? Bouncy.sndh */
+TIMEDB_ENTRY( fb96b36a, 0, 6833, YM+TA), /* 03648 - 505-paradox - Bagatelle.sndh */
+TIMEDB_ENTRY( fb9a23fc, 0, 6719, YM+TA+TB+TD), /* 03666 - Starbuck - Der Traum (YM Remix).sndh */
+TIMEDB_ENTRY( fbdde9a7, 0, 9472, YM+TA), /* 00780 - Crawdaddy - Bounty hunter.sndh */
+TIMEDB_ENTRY( fbe2f4a0, 0, 15231, YM), /* 00513 - Tangens - Synthetic Visions - Scroller.sndh */
+TIMEDB_ENTRY( fbfd09ab, 0, 18829, YM+TA+TB+TD), /* 03609 - Dma-Sc - The 2149 Gang.sndh */
+TIMEDB_ENTRY( fbfd4508, 0, 2727, YM+TB), /* 02650 - Dma-Sc - POOZ - Highscores.sndh */
+TIMEDB_ENTRY( fc0e9214, 0, 7681, YM+TA), /* 04337 - Big Alec - Punish Your Machine - Main Menu.sndh */
+TIMEDB_ENTRY( fc33afb1, 0, 6675, YM+TA), /* 04550 - gwEm - Sillyventure 2014 Invite.sndh */
+TIMEDB_ENTRY( fc39e0b9, 0, 9248, YM+TA+TB+TD), /* 01842 - Lotek Style - Diva.sndh */
+TIMEDB_ENTRY( fc4a54b6, 0, 8640, YM+TA), /* 01635 - Nexus - Dreamzone - Lame Screen.sndh */
+TIMEDB_ENTRY( fc693ef5, 0, 3842, YM), /* 00367 - Steve Barrett - Super Grand Prix.sndh */
+TIMEDB_ENTRY( fc693ef5, 1, 1538, YM), /* 00367 - Steve Barrett - Super Grand Prix.sndh */
+TIMEDB_ENTRY( fc693ef5, 2, 194, YM), /* 00367 - Steve Barrett - Super Grand Prix.sndh */
+TIMEDB_ENTRY( fc693ef5, 3, 194, YM), /* 00367 - Steve Barrett - Super Grand Prix.sndh */
+TIMEDB_ENTRY( fc72b34f, 0, 4218, YM+TA), /* 01356 - Scavenger - Pandora's Box.sndh */
+TIMEDB_ENTRY( fc7861f8, 0, 10016, YM), /* 03572 - YERZMYEY-AY-RIDERS - Yerzmix Part 4 - Silly Venture 2010.sndh */
+TIMEDB_ENTRY( fc83d25a, 0, 36180, YM+TA+TB+TD), /* 02529 - Dark Angel - The !Song.sndh */
+TIMEDB_ENTRY( fc8405c1, 0, 10496, YM), /* 02060 - Mad Max - Warhawk.sndh */
+TIMEDB_ENTRY( fc9f2ee6, 0, 4224, YM+TA), /* 02870 - Crawdaddy - Whatta Hell.sndh */
+TIMEDB_ENTRY( fcb4718d, 0, 1023, YM), /* 04078 - Gary Wheaton - I'm knitting with only one needle.sndh */
+TIMEDB_ENTRY( fcb6ec4f, 0, 4067, YM), /* 00844 - Ben Daglish - Captain America.sndh */
+TIMEDB_ENTRY( fcc0a5f6, 0, 4623, YM+TA+TD), /* 04319 - 505-Checkpoint (2013) - Taotic.sndh */
+TIMEDB_ENTRY( fccaffd2, 0, 6141, YM+TB+TD), /* 04107 - 505 - Checkpoint - Blink.sndh */
+TIMEDB_ENTRY( fcd8371f, 0, 17024, YM), /* 03403 - Dave Lowe - Garfield 2 - Winters Tale.sndh */
+TIMEDB_ENTRY( fcd8371f, 1, 4006, YM), /* 03403 - Dave Lowe - Garfield 2 - Winters Tale.sndh */
+TIMEDB_ENTRY( fcd8371f, 2, 4352, YM), /* 03403 - Dave Lowe - Garfield 2 - Winters Tale.sndh */
+TIMEDB_ENTRY( fcd906c1, 0, 22529, YM), /* 02953 - Andy Severn - Heavy Metal Heroes.sndh */
+TIMEDB_ENTRY( fcd906c1, 1, 8193, YM), /* 02953 - Andy Severn - Heavy Metal Heroes.sndh */
+TIMEDB_ENTRY( fcd906c1, 2, 162, YM), /* 02953 - Andy Severn - Heavy Metal Heroes.sndh */
+TIMEDB_ENTRY( fcd906c1, 3, 182, YM), /* 02953 - Andy Severn - Heavy Metal Heroes.sndh */
+TIMEDB_ENTRY( fcd941cf, 0, 1789, YM), /* 01901 - Luebke - Jingle Bells.sndh */
+TIMEDB_ENTRY( fcfcd5e5, 0, 9243, YM), /* 01881 - Dave Lowe - Elite 2 - Frontier.sndh */
+TIMEDB_ENTRY( fcfcd5e5, 1, 3836, YM), /* 01881 - Dave Lowe - Elite 2 - Frontier.sndh */
+TIMEDB_ENTRY( fcfcd5e5, 2, 4851, YM), /* 01881 - Dave Lowe - Elite 2 - Frontier.sndh */
+TIMEDB_ENTRY( fcfcd5e5, 3, 2587, YM), /* 01881 - Dave Lowe - Elite 2 - Frontier.sndh */
+TIMEDB_ENTRY( fcffaeb8, 0, 35105, YM+TA), /* 03952 - Scott Lemmon - House of the Rising Sun.sndh */
+TIMEDB_ENTRY( fd153c8e, 0, 19532, YM), /* 02175 - Mad Max - 5th Gear.sndh */
+TIMEDB_ENTRY( fd153c8e, 1, 3840, YM), /* 02175 - Mad Max - 5th Gear.sndh */
+TIMEDB_ENTRY( fd153c8e, 2, 769, YM), /* 02175 - Mad Max - 5th Gear.sndh */
+TIMEDB_ENTRY( fd153c8e, 3, 1152, YM), /* 02175 - Mad Max - 5th Gear.sndh */
+TIMEDB_ENTRY( fd153c8e, 4, 553, YM), /* 02175 - Mad Max - 5th Gear.sndh */
+TIMEDB_ENTRY( fd1e4db4, 0, 346369, YM+TA), /* 04034 - Roggie - Roggie 16.sndh */
+TIMEDB_ENTRY( fd40717c, 0, 1530, YM), /* 00017 - 4-Mat - Space Gun.sndh */
+TIMEDB_ENTRY( fd40717c, 1, 1336, YM), /* 00017 - 4-Mat - Space Gun.sndh */
+TIMEDB_ENTRY( fd40717c, 2, 6466, YM), /* 00017 - 4-Mat - Space Gun.sndh */
+TIMEDB_ENTRY( fd40717c, 3, 4979, YM), /* 00017 - 4-Mat - Space Gun.sndh */
+TIMEDB_ENTRY( fd40717c, 4, 2517, YM), /* 00017 - 4-Mat - Space Gun.sndh */
+TIMEDB_ENTRY( fd40717c, 5, 570, YM), /* 00017 - 4-Mat - Space Gun.sndh */
+TIMEDB_ENTRY( fd4e7906, 0, 8960, YM+STE), /* 04514 - Excellence in Art - Summer Deligths.sndh */
+TIMEDB_ENTRY( fd603263, 0, 3072, YM), /* 02056 - Mad Max - Thanatos.sndh */
+TIMEDB_ENTRY( fd8aad47, 0, 111966, YM+TA), /* 03707 - Sparky - MC DESer - For DES and Juggler.sndh */
+TIMEDB_ENTRY( fd8b4b10, 0, 7120, YM), /* 02412 - Nexus 6 - Third.sndh */
+TIMEDB_ENTRY( fdaed5e3, 0, 5628, YM), /* 01227 - Epic - That's About To Explode.sndh */
+TIMEDB_ENTRY( fdc9e72d, 0, 754, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 1, 409, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 2, 211, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 3, 1006, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 4, 1981, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 5, 1344, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 6, 3456, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 7, 768, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 8, 1944, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 9, 1238, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 10, 1620, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdc9e72d, 11, 816, YM), /* 00172 - Martin Walker - R-Type 2.sndh */
+TIMEDB_ENTRY( fdd0c43c, 0, 504, YM), /* 03682 - Dma-Sc - Antiques - Loader 3.sndh */
+TIMEDB_ENTRY( fdf9f5ee, 0, 8442, YM), /* 02878 - Beast - Dodi Dodi.sndh */
+TIMEDB_ENTRY( fe1de724, 0, 2048, YM), /* 02930 - Chris Denman - Ancient Games.sndh */
+TIMEDB_ENTRY( fe318f68, 0, 1907, YM), /* 03073 - Peter Inzerillo - Carol of the Bells.sndh */
+TIMEDB_ENTRY( fe4ad6a9, 0, 12288, YM+TB+TD), /* 02847 - Helene - 28 Sept 06.sndh */
+TIMEDB_ENTRY( fe7fb862, 0, 4000, YM+TB+TD), /* 03338 - Marcer - n-a.sndh */
+TIMEDB_ENTRY( fe81df89, 0, 1666, YM+TA+TD), /* 02254 - Tao - Cream - Entrance (Steps).sndh */
+TIMEDB_ENTRY( fe83dc25, 0, 2916, YM+TA+TB), /* 00053 - 505 - Greetings.sndh */
+TIMEDB_ENTRY( fe8462a0, 0, 11783, YM), /* 02277 - Tao - Cream - Chicago (Just Buggin Greetings).sndh */
+TIMEDB_ENTRY( fe8d78c4, 0, 12800, YM+TB+TD), /* 02913 - helln - WRONGGGGG.sndh */
+TIMEDB_ENTRY( fe92af3f, 0, 9677, YM+TA+TD), /* 02749 - kenny d - folk off 'round the fields.sndh */
+TIMEDB_ENTRY( fe97d66b, 0, 15354, YM+TA+TB+TD), /* 01853 - Lotek Style - Hopes - UCM 13 part 2.sndh */
+TIMEDB_ENTRY( fe9d78ee, 0, 5120, YM), /* 00251 - Antichrist - Christelle.sndh */
+TIMEDB_ENTRY( febe29b7, 0, 13920, YM), /* 02013 - Mad Max - Poker Music.sndh */
+TIMEDB_ENTRY( fed9b8b7, 0, 3680, YM), /* 04749 - Dave Lowe - Betrayal.sndh */
+TIMEDB_ENTRY( fed9b8b7, 1, 2851, YM), /* 04749 - Dave Lowe - Betrayal.sndh */
+TIMEDB_ENTRY( feda6e4e, 0, 858, YM), /* 04141 - Unknown - Karlchen.sndh */
+TIMEDB_ENTRY( feda6e4e, 1, 2457, YM), /* 04141 - Unknown - Karlchen.sndh */
+TIMEDB_ENTRY( fef86d0d, 0, 6975, YM+TA+TB+TD), /* 03614 - 505-YM-Rockerz - Liberation (STE).sndh */
+TIMEDB_ENTRY( ff018202, 0, 16896, YM), /* 02579 - STU - BOMB SQUAD.sndh */
+TIMEDB_ENTRY( ff0dc15d, 0, 2260, YM+TA+TD), /* 02232 - Tao - Cream - Ikari Union Edit (Nostalgic-O-Demo, not used).sndh */
+TIMEDB_ENTRY( ff106010, 0, 9317, YM+TA+TB+TD), /* 03588 - Divag - Crash to live.sndh */
+TIMEDB_ENTRY( ff1111f4, 0, 6143, YM), /* 03675 - Dma-Sc - Antiques - IFF Slideshow.sndh */
+TIMEDB_ENTRY( ff34688e, 0, 15360, YM+TB+TD), /* 02907 - helene - NONONYESYESYES.sndh */
+TIMEDB_ENTRY( ff468dd0, 0, 4004, YM), /* 01737 - Richard Joseph - James Pond 2 Codename Robocod.sndh */
+TIMEDB_ENTRY( ff468dd0, 1, 6151, YM), /* 01737 - Richard Joseph - James Pond 2 Codename Robocod.sndh */
+TIMEDB_ENTRY( ff468dd0, 2, 4613, YM), /* 01737 - Richard Joseph - James Pond 2 Codename Robocod.sndh */
+TIMEDB_ENTRY( ff468dd0, 3, 4613, YM), /* 01737 - Richard Joseph - James Pond 2 Codename Robocod.sndh */
+TIMEDB_ENTRY( ff468dd0, 4, 3506, YM), /* 01737 - Richard Joseph - James Pond 2 Codename Robocod.sndh */
+TIMEDB_ENTRY( ff468dd0, 5, 257, YM), /* 01737 - Richard Joseph - James Pond 2 Codename Robocod.sndh */
+TIMEDB_ENTRY( ff468dd0, 6, 259, YM), /* 01737 - Richard Joseph - James Pond 2 Codename Robocod.sndh */
+TIMEDB_ENTRY( ff468dd0, 7, 148, YM), /* 01737 - Richard Joseph - James Pond 2 Codename Robocod.sndh */
+TIMEDB_ENTRY( ff468dd0, 8, 1921, YM), /* 01737 - Richard Joseph - James Pond 2 Codename Robocod.sndh */
+TIMEDB_ENTRY( ff77da40, 0, 10369, YM+TA+TB+TD), /* 03670 - 505-paradox - Jacktro.sndh */
+TIMEDB_ENTRY( ff7fae4d, 0, 6912, YM+TA+TB), /* 01334 - Scavenger - Hate.sndh */
+TIMEDB_ENTRY( ff7fcdf3, 0, 21690, YM), /* 01682 - Jess - I Found The Dead Zone.sndh */
+TIMEDB_ENTRY( ffa6a088, 0, 8447, YM+TA+TB+TD), /* 03266 - Dubmood - Intro Tune (4-Mat).sndh */
+TIMEDB_ENTRY( ffacfd86, 0, 7104, YM+STE), /* 04212 - Griffon - STE Folies - O Demo.sndh */
+TIMEDB_ENTRY( ffb965d6, 0, 10368, YM), /* 01640 - JB 007 - Librarie Intro.sndh */
+TIMEDB_ENTRY( ffbaf782, 0, 4669, YM), /* 00298 - Gary Wheaton - Let it Be.sndh */
+TIMEDB_ENTRY( ffbfbad9, 0, 3072, YM), /* 01148 - Tyan - Last Ninja Remake.sndh */
+TIMEDB_ENTRY( ffc3f74c, 0, 3832, YM), /* 00592 - Damon Chaplin - Last Trooper.sndh */
+TIMEDB_ENTRY( ffc6a7e7, 0, 1320, YM), /* 04719 - Dean Sharples (Deano) - The Heavy Bunch.sndh */
+TIMEDB_ENTRY( ffc6a7e7, 1, 1480, YM), /* 04719 - Dean Sharples (Deano) - The Heavy Bunch.sndh */
+TIMEDB_ENTRY( ffc6a7e7, 2, 634, YM), /* 04719 - Dean Sharples (Deano) - The Heavy Bunch.sndh */
+TIMEDB_ENTRY( ffc6a7e7, 3, 255, YM), /* 04719 - Dean Sharples (Deano) - The Heavy Bunch.sndh */
+TIMEDB_ENTRY( ffc6a7e7, 4, 1492, YM), /* 04719 - Dean Sharples (Deano) - The Heavy Bunch.sndh */
+TIMEDB_ENTRY( ffc6a7e7, 5, 1828, YM), /* 04719 - Dean Sharples (Deano) - The Heavy Bunch.sndh */
+TIMEDB_ENTRY( ffc8af8b, 0, 17916, YM), /* 04467 - Charles Callet - Passengers in the Wind.sndh */
+TIMEDB_ENTRY( ffc8af8b, 1, 5760, YM), /* 04467 - Charles Callet - Passengers in the Wind.sndh */
+TIMEDB_ENTRY( ffc8af8b, 2, 9648, YM), /* 04467 - Charles Callet - Passengers in the Wind.sndh */
+TIMEDB_ENTRY( ffc8af8b, 3, 7984, YM), /* 04467 - Charles Callet - Passengers in the Wind.sndh */
+TIMEDB_ENTRY( ffc8af8b, 4, 17408, YM), /* 04467 - Charles Callet - Passengers in the Wind.sndh */
+TIMEDB_ENTRY( ffc8af8b, 5, 18408, YM), /* 04467 - Charles Callet - Passengers in the Wind.sndh */
+TIMEDB_ENTRY( ffe1c341, 0, 4063, YM), /* 03187 - n-a - Yoda's Theme.sndh */
+TIMEDB_ENTRY( fff98e01, 0, 9983, YM+TA+TB), /* 01361 - Scavenger - Readers Digest.sndh */
+TIMEDB_ENTRY( fffaeaae, 0, 10362, YM+TB+TD), /* 02477 - No More - leif Rullar conversion.sndh */

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/timedb68.c Added

@@ -0,0 +1,160 @@
+/*
+ * @file timedb68.c
+ * @brief music duration database
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_tdb.h"
+
+#include <stdlib.h>
+
+#define HBIT 32 /* # of bit for hash */
+#define TBIT 6 /* # of bit for track */
+#define WBIT 5 /* # of bit for hardware */
+#define FBIT (64-HBIT-TBIT-WBIT) /* # of bit for frames */
+#define HFIX (32-HBIT)
+
+#define TIMEDB_ENTRY(HASH,TRACK,FRAMES,FLAGS) \
+ { 0x##HASH>>HFIX, TRACK, FLAGS, FRAMES }
+#define E_EMPTY { 0,0,0,0 }
+
+
+typedef struct {
+ unsigned int hash : HBIT; /* hash code */
+ unsigned int track : TBIT; /* track number (0-based) */
+ unsigned int flags : WBIT; /* see enum */
+ unsigned int frames : FBIT; /* length in frames */
+} dbentry_t;
+
+#ifndef HAVE_TIMEDB_INC_H
+# define HAVE_TIMEDB_INC_H 1
+#endif
+
+#if HAVE_TIMEDB_INC_H
+
+#define STE TDB_STE
+#define YM ( TDB_TA + TDB_TB + TDB_TC + TDB_TD )
+#define TA -TDB_TA
+#define TB -TDB_TB
+#define TC -TDB_TC
+#define TD -TDB_TD
+#define NA -YM
+
+static dbentry_t db = {
+# include "timedb.inc.h"
+ /* Add a bit of Supplemental empty space */
+ E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,
+ E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,
+ E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,
+ E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,
+ E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,
+ E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,
+ E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,
+ E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,E_EMPTY,
+};
+# define DB_MAX (sizeof(db)/sizeof(*db))
+# define DB_COUNT DB_MAX-64
+# define DB_SORT 1
+#else
+# define DB_MAX 10000
+# define DB_COUNT 0
+# define DB_SORT 1
+static dbentry_t dbDB_MAX;
+#endif
+
+static int dbcount = DB_COUNT; /* entry count */
+static int dbmax = DB_MAX; /* max entry */
+static int dbsort = DB_SORT; /* set if db is sorted */
+static int dbchange = 0; /* set if db has been modified */
+
+/* static const char * db_uri="sc68://timedb"; */
+
+static int cmp(const void * ea, const void *eb)
+{
+ const dbentry_t * a = (const dbentry_t *) ea;
+ const dbentry_t * b = (const dbentry_t *) eb;
+ int v;
+
+ v = a->hash - b->hash;
+ if (!v)
+ v = a->track - b->track;
+ return v;
+}
+
+static dbentry_t * search_for(const dbentry_t * key)
+{
+ if (!dbsort) {
+ qsort(db,dbcount,sizeof(dbentry_t), cmp);
+ dbsort = 1;
+ }
+ return (dbentry_t *) bsearch(key, db, dbcount, sizeof(dbentry_t), cmp);
+}
+
+
+int timedb68_add(int hash, int track, unsigned int frames, int flags)
+{
+ dbentry_t e, *s;
+
+ if ((unsigned)track >= (1u << TBIT) || frames >= (1u << FBIT) )
+ return -1;
+
+ e.hash = hash >> HFIX;
+ e.track = track;
+ e.frames = frames;
+ e.flags = flags;
+
+ s = search_for(&e);
+ if (!s && dbcount < dbmax) {
+ s = db + dbcount++;
+ dbsort = 0;
+ }
+ if (s)
+ *s = e;
+ return s - db;
+}
+
+int timedb68_get(int hash, int track, unsigned int * frames, int * flags)
+{
+ dbentry_t e, *s;
+ e.hash = hash >> HFIX;
+ e.track = track;
+ s = search_for(&e);
+ if (s) {
+ if (frames) *frames = s->frames;
+ if (flags) *flags = s->flags;
+ return s - db;
+ }
+ return -1;
+}
+
+int timedb68_load(void) {
+ return -1;
+}
+
+int timedb68_save(void) {
+ if (dbchange) {
+ dbchange = 0;
+ }
+ return -1;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/uri68.c Added

@@ -0,0 +1,359 @@
+/*
+ * @file uri68.c
+ * @brief uri parser and dispatcher
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_uri.h"
+#include "file68_rsc.h"
+#include "file68_str.h"
+#include "file68_msg.h"
+#include "file68_vfs_null.h"
+#include "file68_vfs_file.h"
+#include "file68_vfs_fd.h"
+#include "file68_vfs_curl.h"
+#include "file68_vfs_ao.h"
+
+#include <string.h>
+#include <ctype.h>
+#include <assert.h>
+
+#define MYHD "uri68 : "
+
+static scheme68_t * schemes;
+static int uri_cat = msg68_DEFAULT;
+
+
+#define GEN_DELIM ":/?#@"
+#define SUB_DELIM "!$&'()*+,;="
+
+
+/* Related documentation:
+ *
+ * RFC 1630 - Universal Resource Identifiers in WWW
+ * RFC 3986 - Uniform Resource Identifier (URI): Generic Syntax
+ */
+
+/* URI chars:
+
+ reserved = gen-delims sub-delims
+ gen-delims = : / ? # @
+ sub-delims = ! $ & ' ( ) * + , ; =
+ unreserved = alpha-num - _ . ~
+
+
+ Syntax components (3936/section#3)
+
+ URI = scheme ":" hier-part "?" query "#" fragment 
+
+ hier-part = "//" authority path-abempty
+ / path-absolute
+ / path-rootless
+ / path-empty
+
+ scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+ Case: insensitive
+ Canonical: lowercase
+
+ authority = userinfo "@" host ":" port 
+ userinfo = *( unreserved / pct-encoded / sub-delims / ":" )
+ host = IP-literal / IPv4address / reg-name
+ query = *( pchar / "/" / "?" )
+ fragment = *( pchar / "/" / "?" )
+
+ Preceded by "//".
+ Terminated with "/" or "?" or "#" or <EOS>.
+
+ The percent sign
+
+ The percent sign ("%", ASCII 25 hex) is used as the escape
+ character in the encoding scheme and is never allowed for
+ anything else.
+
+ Percent-encoding
+
+ pct-encoded = "%" HEXDIG HEXDIG
+ Case: insensitive
+ Canonical: uppercase. Never pct-enc ALPHA,DIGIT,'-','.','_' or '~'
+
+
+
+ Hierarchical forms
+
+ The slash ("/", ASCII 2F hex) character reserved for the
+ delimiting of substrings whose relationship is hierarchical.
+
+ The significance of the slash between two segments is that the
+ segment of the path to the left is more significant than the
+ segment of the path to the right. ("Significance" in this case
+ refers solely to closeness to the root of the hierarchical
+ structure and makes no value judgement!)
+
+ Hash for fragment identifiers
+
+ The hash ("#", ASCII 23 hex) character is reserved as a
+ delimiter to separate the URI of an object from a fragment
+ identifier .
+
+ Query strings
+
+ The question mark ("?", ASCII 3F hex) is used to delimit the
+ boundary between the URI of a queryable object, and a set of
+ words used to express a query on that object.
+
+ Within the query string, the plus sign is reserved as shorthand
+ notation for a space.
+
+ Other reserved characters
+
+ The astersik ("*", ASCII 2A hex) and exclamation mark ("!" , ASCII
+ 21 hex) are reserved for use as having special signifiance within
+ specific schemes.
+
+*/
+
+static const char hex16 =
+{ '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' };
+
+static void check_ascii() {
+ /* stupid run-time ascii checks. */
+ assert( '%' == 0x25 );
+ assert( '/' == 0x2f );
+ assert( '#' == 0x23 );
+ assert( '?' == 0x3f );
+ assert( '*' == 0x2a );
+ assert( '!' == 0x21 );
+ assert( '0' == 0x30 );
+ assert( 'A' == 0x41 );
+ assert( 'F' == 0x46 );
+ assert( 'a' == 0x61 );
+ assert( 'f' == 0x66 );
+ assert( '_' == 0x5f );
+ assert( '-' == 0x2d );
+ assert( '.' == 0x2e );
+ assert( '~' == 0x7e );
+}
+
+/**
+ * @retval 0-16 or -1
+ */
+static int xdigit(int c) {
+ if (c >= '0' && c <= '9')
+ c -= '9';
+ else if (c >= 'A' && c <= 'F')
+ c -= 'A'-10;
+ else if (c >= 'a' && c <= 'f')
+ c -= 'a'-10;
+ else c = -1;
+ return c;
+}
+
+static int is_uri_reserved(int c)
+{
+ return strchr("!*'();:@&=+$,/?#",c) != 0;
+}
+
+static int is_uri_unreserved(int c)
+{
+ return isalnum(c) || c=='-' || c =='_' || c=='.' || c=='~';
+}
+
+static int is_uri_pctenc(int c, const int flags)
+{
+ return !is_uri_unreserved(c);
+}
+
+/**
+ * Encode a string with percent-encoding method
+ * @return the output string size (in bytes)
+ * @retval max on buffer overflow.
+ * @retval -1 on error
+ */
+static int pct_encode(char * dst, const int max,
+ const char * src, const int len,
+ const int flags)
+{
+ int i,j;
+
+ for (i=j=0; i<len && j<max; ++i) {
+ const int c = 255 & srci;
+ if (!c) break;
+ if (is_uri_pctenc(c,flags)) {
+ dstj++ = '%';
+ if (j >= max) break;
+ dstj++ = hexc>>4;
+ if (j >= max) break;
+ dstj++ = hexc&15;
+ } else
+ dstj++ = c;
+ }
+ if (j < max)
+ dstj = 0;
+ return j;
+}
+
+
+/**
+ * Decode a percent-encoded string.
+ * @return the output string size (in bytes)
+ * @retval max on buffer overflow.
+ * @retval -1 on error
+ */
+static int pct_decode(char * dst, const int max,
+ const char * src, const int len,
+ const int flags)
+{
+ int i,j,e;
+
+ for (i=j=e=0; i<len && j<max; ++i) {
+ int c = 255 & srci;
+ int h, l;
+ if (!c) break;
+ if (c == '%' && i+2 < len
+ && (h = xdigit(srci+1)) >= 0
+ && (l = xdigit(srci+2)) >= 0) {
+ c = (h << 4) + l;
+ i += 2;
+ }
+ dstj++ = c;
+ }
+ if (j < max)
+ dstj = 0;
+ return j;
+}
+
+
+/**
+ * @return length of the scheme (including trailing ':')
+ * @retval 0 No scheme
+ * @retval >0 length of scheme string
+ */
+static
+int parse_scheme(const char * uri)
+{
+ int i = 0;
+
+ /* First char must be alpha */
+ if ( ! isalpha((int)urii))
+ return 0;
+
+ /* Others must be alpha, digit, dot `.', plus `+' or hyphen `-' */
+ for (i=1;
+ isalnum((int)urii) || urii == '+' || urii == '.' || urii == '-';
+ ++i);
+
+ /* Must end by a colon `:' */
+ return (urii == ':') ? i+1 : 0;
+}
+
+int uri68_get_scheme(char * scheme, int max, const char *uri)
+{
+ int len = -1;
+
+ if (uri) {
+ len = parse_scheme(uri);
+ if (scheme) {
+ if (len == 0 )
+ scheme0 = 0;
+ else if (len > 0) {
+ if (len >= max)
+ return -1;
+ memcpy(scheme, uri, len);
+ schemelen = 0;
+ }
+ }
+ }
+ return len;
+}
+
+void uri68_unregister(scheme68_t * scheme)
+{
+ if (scheme) {
+ TRACE68(uri_cat, MYHD "unregister scheme -- %s\n", scheme->name);
+ if (scheme == schemes)
+ schemes = scheme->next;
+ else if (schemes) {
+ scheme68_t * sch;
+ for (sch = schemes; sch->next; sch = sch->next)
+ if (sch->next == scheme) {
+ sch->next = scheme->next;
+ break;
+ }
+ }
+ scheme->next = 0;
+ }
+}
+
+int uri68_register(scheme68_t * scheme)
+{
+ if (!scheme)
+ return -1;
+
+ assert(!scheme->next);
+ scheme->next = schemes;
+ schemes = scheme;
+ TRACE68(uri_cat, MYHD "registered scheme -- %s\n", scheme->name);
+
+ return 0;
+}
+
+vfs68_t * uri68_vfs_va(const char * uri, int mode, int argc, va_list list)
+{
+ vfs68_t * vfs = 0;
+ scheme68_t * scheme;
+
+ for (scheme = schemes; scheme; scheme = scheme->next) {
+ int res = scheme->ismine(uri);
+ if (!res)
+ continue;
+ if ( (mode & res & 3) == ( mode & 3 ) )
+ break;
+ }
+
+ if (scheme)
+ vfs = scheme->create(uri, mode, argc, list);
+
+ TRACE68(uri_cat, MYHD
+ "create url='%s' %c%c => %s,'%s'\n",
+ strnevernull68(uri),
+ (mode&1) ? 'R' : '.',
+ (mode&2) ? 'W' : '.',
+ strok68(!vfs),
+ vfs68_filename(vfs));
+
+ return vfs;
+}
+
+vfs68_t * uri68_vfs(const char * uri, int mode, int argc, ...)
+{
+ vfs68_t * vfs;
+ va_list list;
+
+ va_start(list, argc);
+ vfs = uri68_vfs_va(uri, mode, argc, list);
+ va_end(list);
+
+ return vfs;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/vfs68.c Added

@@ -0,0 +1,193 @@
+/*
+ * @file istream68.c
+ * @brief VFS functions
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_vfs.h"
+#include "file68_vfs_def.h"
+
+const char * vfs68_filename(vfs68_t * vfs)
+{
+ const char * name =
+ (!vfs || !vfs->name)
+ ? 0
+ : vfs->name(vfs)
+ ;
+ return name ? name : "<nul>";
+}
+
+int vfs68_open(vfs68_t *vfs)
+{
+ return (!vfs || !vfs->open)
+ ? -1
+ : vfs->open(vfs)
+ ;
+}
+
+int vfs68_close(vfs68_t *vfs)
+{
+ int err = -1;
+
+ if (vfs) {
+ if (vfs->flush)
+ vfs->flush(vfs);
+ if (vfs->close)
+ err = vfs->close(vfs);
+ }
+ return err;
+}
+
+int vfs68_read(vfs68_t *vfs, void * data, int len)
+{
+ return (!vfs || !vfs->read)
+ ? -1
+ : vfs->read(vfs, data, len);
+}
+
+int vfs68_write(vfs68_t *vfs, const void * data, int len)
+{
+ return (!vfs || !vfs->write)
+ ? -1
+ : vfs->write(vfs, data, len)
+ ;
+}
+
+int vfs68_length(vfs68_t *vfs)
+{
+ return (!vfs || !vfs->length)
+ ? -1
+ : vfs->length(vfs)
+ ;
+}
+
+int vfs68_tell(vfs68_t *vfs)
+{
+ return (!vfs || !vfs->tell)
+ ? -1
+ : vfs->tell(vfs)
+ ;
+}
+
+int vfs68_flush(vfs68_t *vfs)
+{
+ return (!vfs || !vfs->flush)
+ ? -1
+ : vfs->flush(vfs)
+ ;
+}
+
+static int isseek(vfs68_t *vfs, int pos, int offset)
+{
+ if (pos != -1) {
+ if (offset) {
+ vfs68_seek_t seek = (offset > 0) ? vfs->seekf : vfs->seekb;
+ if (seek && seek(vfs, offset) != -1) {
+ pos += offset;
+ } else {
+ pos = -1;
+ }
+ }
+ }
+ return pos;
+}
+
+int vfs68_seek(vfs68_t *vfs, int offset)
+{
+ return isseek(vfs, vfs68_tell(vfs), offset);
+}
+
+int vfs68_seek_to(vfs68_t *vfs, int pos)
+{
+ int cur = vfs68_tell(vfs);
+
+ return isseek(vfs, cur, pos-cur);
+}
+
+void vfs68_destroy(vfs68_t *vfs)
+{
+ if (vfs) {
+ if (vfs->close) {
+ vfs->close(vfs);
+ }
+ if (vfs->destroy) {
+ vfs->destroy(vfs);
+ }
+ }
+}
+
+int vfs68_gets(vfs68_t *vfs, char * buffer, int max)
+{
+ int i;
+
+ if (!vfs || !vfs->read || !buffer || max <= 0) {
+ return -1;
+ }
+
+ for (i=0, --max; i<max; ) {
+ char c;
+ int err;
+ err = vfs->read(vfs, &c, 1);
+ if (err == -1) {
+ return -1;
+ }
+ if (err != 1) {
+ break;
+ }
+ bufferi++ = c;
+ if (c == '\n') {
+ break;
+ }
+ }
+ bufferi = 0;
+ return i;
+}
+
+int vfs68_getc(vfs68_t *vfs)
+{
+ unsigned char c;
+
+ return vfs68_read(vfs,&c,1) != 1
+ ? -1
+ : c;
+}
+
+int vfs68_puts(vfs68_t *vfs, const char * s)
+{
+ int err = 0;
+ if (s) {
+ int c;
+ while (!err && (c = *s++)) {
+ err = vfs68_putc(vfs, c);
+ }
+ }
+ return err;
+}
+
+int vfs68_putc(vfs68_t *vfs, const int c)
+{
+ unsigned char byte = c;
+ return -(vfs68_write(vfs,&byte,1) != 1);
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/vfs68_ao.c Added

@@ -0,0 +1,624 @@
+/*
+ * @file istream68_ao.c
+ * @brief implements istream68 for libao
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_vfs_ao.h"
+#include "file68_msg.h"
+
+#define AOHD "libao68: "
+
+#ifndef DEBUG_AO68_O
+# define DEBUG_AO68_O 0
+#endif
+
+/* Define this if you want xiph libao support. */
+#ifdef USE_AO
+
+static int ao68_cat = msg68_DEFAULT;
+
+#include "file68_vfs_def.h"
+#include "file68_str.h"
+#include "file68_uri.h"
+#include "file68_features.h"
+
+#include <ao/ao.h>
+#include <string.h>
+#include <stdlib.h>
+
+struct ao68_info_s {
+ int default_id;
+ ao_device * default_device;
+ int driver_id;
+ ao_device * device;
+ ao_sample_format format;
+ ao_option * options;
+};
+
+typedef struct ao68_info_s ao68_info_t;
+
+/** vfs ao structure. */
+typedef struct {
+ vfs68_t vfs; /**< vfs function. */
+ unsigned int count; /**< current position. */
+ ao68_info_t ao; /**< ao specific struct. */
+ int no_overwrite; /**< overwriting file output. */
+ char *outname; /**< part of name for file driver. */
+ char defoutname16; /**< default outname for file driver. */
+ char name1; /**< filename. */
+} vfs68_ao_t;
+
+enum {
+ AO_SPR_MIN = FILE68_SPR_MIN,
+ AO_SPR_MAX = FILE68_SPR_MAX,
+ AO_SPR_DEF = FILE68_SPR_DEF
+};
+
+static volatile int init;
+static unsigned int vfs68_ao_defaut_rate = AO_SPR_DEF;
+static vfs68_ao_t * ao_unic_vfs;
+static int ao_ismine(const char *);
+static vfs68_t * ao_create(const char *, int, int, va_list);
+static scheme68_t ao_scheme = {
+ 0, "vfs-ao", ao_ismine, ao_create
+};
+
+static unsigned int spr_in_range(unsigned int rate)
+{
+ if (rate > (unsigned)AO_SPR_MAX) {
+ rate = AO_SPR_MAX;
+ } else if (rate < (unsigned)AO_SPR_MIN) {
+ rate = AO_SPR_MIN;
+ }
+ return rate;
+}
+
+int vfs68_ao_sampling(vfs68_t * vfs)
+{
+ vfs68_ao_t * is = (vfs68_ao_t *)vfs;
+ if (!is || !is->ao.format.rate)
+ return vfs68_ao_defaut_rate;
+ return is->ao.format.rate;
+}
+
+/* Init does not actually initialize aolib. That task will be
+ * performed on the fly only if needed.
+ */
+int vfs68_ao_init(void)
+{
+ if (ao68_cat == msg68_DEFAULT) {
+ ao68_cat =
+ msg68_cat("audio","Xiph libao audio VFS",DEBUG_AO68_O);
+ if (ao68_cat == -1)
+ ao68_cat = msg68_DEFAULT;
+ }
+ uri68_register(&ao_scheme);
+ return 0;
+}
+
+
+static int init_aolib(void)
+{
+ int err = -1;
+
+ if (init) {
+ msg68_critical(AOHD "*%s*\n","already done");
+ } else {
+ ao_initialize();
+ err = 0;
+ init = 1;
+ TRACE68(ao68_cat,AOHD "*%s*\n","initialized");
+ }
+ return err;
+}
+
+static void shutdown_aolib(void)
+{
+ if (init) {
+ init = 0;
+ ao_shutdown();
+ TRACE68(ao68_cat,
+ AOHD "*%s*\n","shutdowned");
+ }
+}
+
+void vfs68_ao_shutdown(void)
+{
+ shutdown_aolib();
+ if (ao68_cat != msg68_DEFAULT) {
+ msg68_cat_free(ao68_cat);
+ ao68_cat = msg68_DEFAULT;
+ }
+}
+
+static int ao_ismine(const char * uri)
+{
+ if (!strncmp68(uri, "audio:", 6))
+ return SCHEME68_ISMINE | SCHEME68_WRITE;
+ return 0;
+}
+
+static const char * isao_name(vfs68_t * vfs)
+{
+ vfs68_ao_t * ism = (vfs68_ao_t *)vfs;
+
+ return (!ism || !ism->name0)
+ ? 0
+ : ism->name
+ ;
+}
+
+static void dump_ao_info(const int id, const int cat,
+ const ao_info * info, const int full)
+{
+ if (info) {
+ msg68(
+ cat,
+ "\n"
+ AOHD "ao_driver #%02d\n"
+ " ,------------\n"
+ " | type : %s\n"
+ " | name : %s\n"
+ " | short : %s\n"
+ " | author : %s\n"
+ " | comment : %s\n"
+ " | prio : %d\n",
+ id, info->type==AO_TYPE_LIVE?"live":"file",
+ strnevernull68(info->name),
+ strnevernull68(info->short_name),
+ strnevernull68(info->author),
+ strnevernull68(info->comment),info->priority);
+ if (full) {
+ int i;
+ msg68(cat, " | options : %d --", info->option_count);
+ for (i=0; i<info->option_count; ++i)
+ msg68(cat, " %s",info->optionsi);
+ msg68(cat, "%c",'\n');
+ }
+ }
+}
+
+static void dump_ao_format(const ao_sample_format * fmt)
+{
+ TRACE68(ao68_cat,
+ AOHD "sample format -- %d-bits %d-hz %d-chan %c-endian %s\n",
+ fmt->bits, fmt->rate, fmt->channels,
+ fmt->byte_format == AO_FMT_LITTLE ? 'L' :
+ (fmt->byte_format == AO_FMT_BIG ? 'B' : 'N'),
+ fmt->matrix?fmt->matrix:"no-matrix");
+}
+
+static int isao_open(vfs68_t * vfs)
+{
+ vfs68_ao_t * is = (vfs68_ao_t *)vfs;
+ int err = -1;
+ ao_info * info = 0;
+ char * uri;
+
+ TRACE68(ao68_cat,AOHD "open -- '%s'\n", vfs68_filename(vfs));
+ if (!is || is->ao.device) {
+ goto error;
+ }
+
+ uri = is->name+6; /* skip "audio:" */
+ do {
+ char * s = strchr(uri,'/'), *s2, *key = uri, *val = 0;
+ if (s == uri) {
+ ++uri; continue; /* skip "//" instance */
+ }
+ if (s) *s = 0;
+ s2 = strchr(uri,'=');
+ if (s2) {
+ *s2 = 0;
+ val = s2+1;
+ }
+
+ TRACE68(ao68_cat,
+ AOHD "open -- KEY%s='%s'\n", key, val?val:"");
+ if (!*key) {
+ /* nothing to do */
+ } else if (!strcmp68(key,"driver")) {
+ /* key: driver=list|default|name */
+ if (!strcmp68(val,"list") ) {
+ /* List all drivers in debug */
+ int id,n;
+ ao_info ** infolist = ao_driver_info_list(&n);
+ if (infolist) {
+ for (id=0; id<n; ++id) {
+ dump_ao_info(id, msg68_INFO, infolistid, 1);
+ }
+ }
+ } else {
+ int id = !strcmp68(val,"default")
+ ? ao_default_driver_id()
+ : ao_driver_id(val);
+ info = ao_driver_info(id);
+ if (info) {
+ is->ao.driver_id = id;
+ TRACE68(ao68_cat,AOHD "open -- *DRIVER* #%d (%s) %s\n",
+ id, info->short_name, info->name);
+ }
+ }
+ } else if (!strcmp68(key,"rate")) {
+ /* key: rate=0-9+ */
+ int frq = 0;
+ while (*val>='0' && *val<='9') frq = frq*10 + *val++ - '0';
+ if (frq) {
+ frq = spr_in_range(frq);
+ TRACE68(ao68_cat,AOHD "open -- *SAMPLING-RATE* %d\n",frq);
+ is->ao.format.rate = frq;
+ }
+ } else if (!strcmp68(key,"format")) {
+ /* key: format=-+nlb12WBF */
+ while(*val) {
+ switch (*val++) {
+
+ /* ENDIANESS */
+ case 'n': /* native (same as cpu) */
+ is->ao.format.byte_format = AO_FMT_NATIVE;
+ break;
+ case 'l': /* little */
+ is->ao.format.byte_format = AO_FMT_LITTLE;
+ break;
+ case 'b': /* big */
+ is->ao.format.byte_format = AO_FMT_BIG;
+ break;
+
+ /* SIGN */
+ case '+': /* unsigned */
+ msg68_warning(AOHD "ignoring -- *%s* request\n", "UNSIGNED");
+ case '-': /* signed */
+ break;
+
+ /* CHANNELS */
+ case '1': /* mono, 1 channel */
+ is->ao.format.channels = 1;
+ break;
+ case '2': /* stereo, 2 channels */
+ is->ao.format.channels = 2;
+ break;
+
+ /* FORMAT */
+ case 'W': /* 16 bit */
+ is->ao.format.bits = 16;
+ break;
+ case 'B': /* 8 bit */
+ is->ao.format.bits = 8;
+ break;
+ case 'F': /* float */
+ msg68_warning(AOHD "open -- ignoring *%s* request\n","FLOAT");
+ break;
+ } /* switch */
+ } /* while */
+ } else if (!strcmp68(key,"output")) {
+ /* key: output=.* */
+ if (s) *s = '/'; /* restore removed '/' in the URI */
+ s = 0; /* trick to end the options parsing */
+ is->outname = val;
+ TRACE68(ao68_cat, AOHD "open -- OUT='%s'\n", is->outname);
+ } else {
+ /* int i = 0; */
+ /* anything else is sent to ao driver as option */
+ if (!val)
+ val = (*key == '!' || *key == '~') ? "0" : "1";
+ /* removed all test for options, juut add */
+ ao_append_option(&is->ao.options, key, val);
+
+ /* if (!info) */
+ /* msg68_warning(AOHD "choose driver before options -- %s='%s'\n", */
+ /* key, val); */
+ /* else */
+ /* for (; i<info->option_count && strcmp68(info->optionsi,key); ++i) */
+ /* ; */
+ /* if (!info || i<info->option_count) { */
+ /* int res = ao_append_option(&is->ao.options, key, val); */
+ /* res = res; */
+ /* TRACE68(ao68_cat, AOHD "add options %s='%s' -- *%s*\n", */
+ /* key, val, strok68(!res)); */
+ /* } else */
+ /* msg68_warning(AOHD "ignore option for driver '%s' -- %s='%s'\n", */
+ /* info->short_name, key, val); */
+ }
+ if (s2) *s2 = '='; /* restore '=' */
+ uri = 0;
+ if (s) {
+ *s = '/'; /* restore '/' */
+ uri = s+1; /* next */
+ }
+ } while (uri);
+
+ info = ao_driver_info(is->ao.driver_id);
+ if (!info) {
+ goto error;
+ }
+
+ dump_ao_info(is->ao.driver_id, ao68_cat, info, 1);
+
+ if (!is->outname) {
+#ifdef HAVE_AO_FILE_EXTENSION
+ char * ext = ao_file_extension(is->ao.driver_id);
+#else
+ const char * ext = ".out";
+ static const char * exts = {
+ ".wav", ".iff", ".raw", ".au", ".mp3", ".ogg"
+ };
+ int e;
+ for (e = 0; e < sizeof(exts)/sizeof(*exts); ++e)
+ if (!strcmp68(info->short_name,extse+1)) {
+ ext = extse;
+ break;
+ }
+
+#endif
+ strcpy(is->defoutname,"sc68");
+ strcat68(is->defoutname,ext,sizeof(is->defoutname)-1);
+ is->outname = is->defoutname;
+ TRACE68(ao68_cat,
+ AOHD "open -- default *FILENAME* '%s'\n", is->outname);
+ }
+
+ if (is->ao.options) {
+ int i;
+ ao_option * o;
+ TRACE68(ao68_cat,"%s\n", AOHD "options summary:");
+ for (i=1, o=is->ao.options; o; o=o->next, ++i) {
+ TRACE68(ao68_cat,
+ AOHD " - #%d %-12s = '%s'\n", i, o->key, o->value);
+ }
+ }
+
+ if (!is->ao.format.rate) {
+ is->ao.format.rate = vfs68_ao_defaut_rate;
+ TRACE68(ao68_cat,AOHD "%s\n", "using default sampling rate");
+ }
+ dump_ao_format(&is->ao.format);
+ is->ao.device =
+ (info->type==AO_TYPE_LIVE)
+ ? ao_open_live(is->ao.driver_id, &is->ao.format, is->ao.options)
+ : ao_open_file(is->ao.driver_id, is->outname, !is->no_overwrite,
+ &is->ao.format, is->ao.options);
+ if (!is->ao.device) {
+ goto error;
+ }
+
+ if (info->type == AO_TYPE_LIVE) {
+ msg68_notice(AOHD "live driver -- *%s*\n", info->short_name);
+ } else {
+ msg68_notice(AOHD "file driver -- *%s* -- '%s''\n",
+ info->short_name, is->outname);
+ }
+ dump_ao_format(&is->ao.format);
+
+ is->count = 0;
+ err = 0;
+error:
+ TRACE68(ao68_cat, AOHD "open -- *%s*\n", strok68(err));
+ return err;
+}
+
+static int isao_close(vfs68_t * vfs)
+{
+ vfs68_ao_t * is = (vfs68_ao_t *)vfs;
+ int err = -1;
+
+ if (is->ao.options) {
+ ao_free_options(is->ao.options);
+ is->ao.options = 0;
+ }
+ if (is->ao.device) {
+ ao_close(is->ao.device);
+ is->ao.device = 0;
+ err = 0;
+ }
+ TRACE68(ao68_cat, AOHD "close -- *%s*\n", strok68(err));
+ return err;
+}
+
+static int isao_read(vfs68_t * vfs, void * data, int n)
+{
+ return -1;
+}
+
+static int isao_write(vfs68_t * vfs, const void * data, int n)
+{
+ vfs68_ao_t * isao = (vfs68_ao_t *)vfs;
+
+ if (!isao || !isao->ao.device) {
+ return -1;
+ }
+ if (!n) {
+ return 0;
+ }
+ if (n<0) {
+ return 0;
+ }
+ if (ao_play(isao->ao.device, (void *)data, n)) {
+ isao->count += n;
+ return n;
+ } else {
+ return -1;
+ }
+}
+
+static int isao_flush(vfs68_t * vfs)
+{
+ vfs68_ao_t * isao = (vfs68_ao_t *)vfs;
+ return !isao->ao.device
+ ? -1
+ : 0
+ ;
+}
+
+static int isao_length(vfs68_t * vfs)
+{
+ vfs68_ao_t * isao = (vfs68_ao_t *)vfs;
+ return !isao->ao.device
+ ? -1
+ : isao->count
+ ;
+}
+
+static int isao_tell(vfs68_t * vfs)
+{
+ return isao_length(vfs);
+}
+
+static int isao_seek(vfs68_t * vfs, int offset)
+{
+ return -1;
+}
+
+static void isao_destroy(vfs68_t * vfs)
+{
+ TRACE68(ao68_cat, AOHD "destroy -- '%s'\n", vfs68_filename(vfs));
+ if (&ao_unic_vfs->vfs == vfs)
+ ao_unic_vfs = 0;
+ vfs68_ao_shutdown();
+ free(vfs);
+}
+
+static const vfs68_t vfs68_ao = {
+ isao_name,
+ isao_open, isao_close,
+ isao_read, isao_write, isao_flush,
+ isao_length, isao_tell, isao_seek, isao_seek,
+ isao_destroy
+};
+
+/* ao stream URI is composed by /key=value pairs.
+ *
+ * Specific keys are:
+ *
+ * - driver=list
+ * - driver=null|alsa|pulse|oss|esd|au|raw|wav ...
+ * - rate=hz
+ * - format=endianesssignchannelsformat
+ * with (first value is the default)
+ * - endian := n|l|b
+ * - sign := -|+
+ * - channels := 1|2
+ * - format := W|B|F
+ *
+ * Other keys will be used as ao driver options.
+ *
+ * First non-key component (without '=') is used as the output name
+ * (for file drivers).
+ *
+ */
+vfs68_t * vfs68_ao_create(const char * uri, int mode, int spr)
+{
+ vfs68_ao_t *isf=0;
+ int len;
+ ao68_info_t ao;
+
+ TRACE68(ao68_cat,
+ AOHD "create -- '%s' (%d) %dhz\n",
+ strnevernull68(uri), mode, spr);
+
+ if (!init) {
+ if (init_aolib() || !init) {
+ msg68_critical(AOHD "create error -- *libao*\n");
+ goto error;
+ }
+ }
+
+ if (!uri || !ao_ismine(uri)) {
+ msg68_error(AOHD "create error -- *parameter*\n");
+ goto error;
+ }
+
+ if (mode != VFS68_OPEN_WRITE) {
+ msg68_error(AOHD "create error -- *mode*\n");
+ goto error;
+ }
+
+ len = strlen(uri) + 8; /* Add a bit for file extension. */
+ isf = calloc(sizeof(vfs68_ao_t) + len, 1);
+ if (!isf) {
+ goto error;
+ }
+
+ /* Setup for default driver */
+ memset(&ao,0,sizeof(ao));
+ ao.default_id = ao_default_driver_id();
+ if (ao.default_id < 0) {
+ /* Could not find a default driver, that's probably bad not fatal
+ * yet.
+ *
+ * Following code tries to set libao null driver as the default
+ * driver but that's probably not such a good idea. We'd rather
+ * know if for some reason there is no working driver.
+ */
+#if 0
+ ao.default_id = ao_driver_id("null");
+ if (ao.default_id < 0)
+ msg68_warning(AOHD "could not find a default driver\n");
+ else
+ msg68_warning(AOHD "using *null* driver as default\n");
+#endif
+ }
+ ao.driver_id = ao.default_id;
+ ao.format.bits = 16;
+ ao.format.channels = 2;
+ ao.format.rate = spr ? spr_in_range(spr) : 0;
+ ao.format.byte_format = AO_FMT_NATIVE;
+
+ /* Copy vfs functions. */
+ memcpy(&isf->vfs, &vfs68_ao, sizeof(vfs68_ao));
+ isf->ao = ao;
+ strcpy(isf->name, uri);
+
+error:
+ if (!ao_unic_vfs)
+ ao_unic_vfs = isf;
+ uri = vfs68_filename(&isf->vfs);
+ TRACE68(ao68_cat,
+ AOHD "create -- *%s* -- '%s'\n",
+ strok68(!isf),strnevernull68(uri));
+ return isf ? &isf->vfs : 0;
+}
+
+static vfs68_t * ao_create(const char * uri, int mode, int argc, va_list list)
+{
+ unsigned int rate = 0;
+ if (argc == 1)
+ rate = va_arg(list,unsigned int);
+ return vfs68_ao_create(uri, mode, rate);
+}
+
+#else /* #ifdef USE_AO */
+
+/* vfs ao must not be include in this package. Anyway the creation
+ * still exist but it always returns error.
+ */
+
+#include "file68_vfs_ao.h"
+#include "file68_vfs_def.h"
+
+int vfs68_ao_init(void) { return 0; }
+void vfs68_ao_shutdown(void) { }
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/vfs68_curl.c Added

@@ -0,0 +1,802 @@
+/*
+ * @file istream68_curl.c
+ * @brief implements istream68 VFS for cURL
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_vfs_curl.h"
+#include "file68_msg.h"
+
+/* Define this if you want CURL support. */
+#ifdef USE_CURL
+
+#ifndef DEBUG_CURL_O
+# define DEBUG_CURL_O 0
+#endif
+static int curl_cat = msg68_DEFAULT;
+
+static const char curl_schemes = CURL_SCHEMES;
+
+#include "file68_vfs_def.h"
+#include "file68_uri.h"
+#include "file68_str.h"
+
+#include <curl/curl.h>
+#include <string.h>
+#include <stdlib.h>
+#if defined (HAVE_UNISTD_H) && (defined (HAVE_USLEEP) || defined (HAVE_SLEEP))
+/* Need this to have usleep prototype. */
+# if defined (HAVE_USLEEP) && !defined(__USE_BSD) && !defined(__USE_XOPEN)
+# define __USE_BSD
+# endif
+# include <unistd.h>
+#endif
+
+#ifndef ISF_VERBOSE
+# ifdef _DEBUG
+# define ISF_VERBOSE 1
+# else
+# define ISF_VERBOSE 0
+# endif
+#endif
+
+/* Timeout in ms */
+#define IS68_TIMEOUT 10000
+
+#define IS68_CACHE_FIX 8
+#define IS68_CACHE_SZ (1<<IS68_CACHE_FIX)
+#define IS68_CACHE_BLKS_FIX 7
+#define IS68_CACHE_BLKS (1<<IS68_CACHE_BLKS_FIX)
+
+typedef struct {
+ int top;
+ int bytes;
+ char bufferIS68_CACHE_SZ;
+} vfs68_cache_t;
+
+/** vfs curl structure. */
+typedef struct {
+ vfs68_t vfs; /**< vfs function. */
+
+ CURLM * curm; /**< CURL "multi" handle */
+ CURL * curl; /**< CURL "easy" handle. */
+
+ CURLcode code; /**< CURL last "easy" operation code. */
+ CURLMcode mcode; /**< CURL last "multi" operation code. */
+
+ /* struct { fd_set r,w,e; } sets; */
+
+ unsigned int mode : 2; /**< Open modes. */
+ unsigned int has_hd_read : 1; /**< 1: read header has started. */
+ unsigned int has_hd_write : 1; /**< 1: write header has started. */
+ unsigned int has_read : 1; /**< 1: read data has started. */
+ unsigned int has_write : 1; /**< 1: write data has started. */
+
+ int pos; /**< Current R/W position. */
+ int curl_pos; /**< CURL current R/W position. */
+ int length; /**< Known length (-1:unknown). */
+
+ /** Cached data. */
+ vfs68_cache_t cacheIS68_CACHE_BLKS;
+
+ /** Curl error message. */
+ char errorCURL_ERROR_SIZE;
+
+ /* MUST BE at the end of the structure because supplemental bytes will
+ * be allocated to store curlname.
+ */
+ char name1; /**< url. */
+
+} vfs68_curl_t;
+
+static int init = 0;
+
+static int curl_ismine(const char *);
+static vfs68_t * curl_create(const char *, int, int, va_list);
+static scheme68_t curl_scheme = {
+ 0, "vfs-curl", curl_ismine, curl_create
+};
+
+static int curl_ismine(const char * uri)
+{
+ const int ok = SCHEME68_ISMINE | SCHEME68_READ;
+ const char * dot = strchr(uri,':');
+
+ if (dot) {
+ const int len = dot - uri;
+ if (len < 16 && urilen+1 == '/' && urilen+2 == '/') {
+ int l;
+ const char * c;
+ for (c = curl_schemes; l = strlen(c), l; c += l+1)
+ if (l == len && !strncmp68(uri,c,l))
+ return ok;
+ }
+ }
+ return 0;
+}
+
+
+static int mysleep(unsigned long ms)
+{
+#ifdef HAVE_USLEEP
+ unsigned long us = ms * 1000u;
+ usleep(us);
+ return (int) ms;
+#elif defined(_MSC_VER) || defined(WIN32) || defined(_WIN32)
+ Sleep(ms);
+ return (int) ms;
+#elif defined(HAVE_SLEEP)
+ unsigned int sec = (ms + 999u) / 1000u;
+ sleep(sec);
+ return (int)(sec * 1000u);
+#else
+ /* $$$ Ooops very bad thing */
+#error "Undefined sleep function"
+ return ms;
+#endif
+}
+
+static void isf_reset_cache_blocks(vfs68_curl_t *isf)
+{
+ int i;
+
+ for (i=0; i<IS68_CACHE_BLKS; ++i) {
+ vfs68_cache_t * c = isf->cache+i;
+ c->top = -1;
+ c->bytes = 0;
+ }
+}
+
+static const char * isf_name(vfs68_t * vfs)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)vfs;
+
+ return (!isf->name0)
+ ? 0
+ : isf->name
+ ;
+}
+
+/* $$$ TODO */
+static size_t isf_read_cb(void *ptr, size_t size, size_t nmemb, void *stream)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)stream;
+ int bytes, org_bytes/* , pos */;
+
+ bytes = org_bytes = (int)(size * nmemb);
+ /* pos = isf->curl_pos; */
+
+ isf->has_read = 1;
+ if (!bytes) {
+ return 0; /* Avoid 0 divide at ending return */
+ }
+
+ return (org_bytes - bytes) / size;
+}
+
+static size_t isf_write_cb(void *ptr, size_t size, size_t nmemb, void *stream)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)stream;
+
+ int bytes, org_bytes, pos;
+ int off, top, blk;
+
+ bytes = org_bytes = (int)(size * nmemb);
+ pos = isf->curl_pos;
+
+ isf->has_write = 1;
+ if (!bytes) {
+ return 0; /* Avoid 0 divide at ending return */
+ }
+
+ off = pos & (IS68_CACHE_SZ-1);
+ top = pos - off;
+ blk = (pos>>IS68_CACHE_FIX) & (IS68_CACHE_BLKS-1);
+
+ while (bytes > 0) {
+ int n;
+
+ if (!off) {
+ /* Starting a new cache block */
+ isf->cacheblk.top = top;
+ } else if (isf->cacheblk.top != top) {
+ /* Oops, got a problem here */
+ break;
+ }
+
+ n = IS68_CACHE_SZ - off;
+ if (n > bytes) {
+ n = bytes;
+ }
+
+ memcpy(isf->cacheblk.buffer+off, ptr, n);
+ ptr = (char *)ptr + n;
+ isf->cacheblk.bytes = n+off;
+ bytes -= n;
+ off = 0;
+ blk = (blk+1) & (IS68_CACHE_BLKS-1);
+ top += IS68_CACHE_SZ;
+ }
+ org_bytes -= bytes;
+ isf->curl_pos = pos + org_bytes;
+
+ return org_bytes / size;
+}
+
+#if 0
+static int isf_passwd_cb(void *clientp,
+ const char *prompt, char *buffer, int buflen)
+{
+ /* Produce a CURLE_BAD_PASSWORD_ENTERED error. */
+ return -1;
+}
+#endif
+
+static int isf_prog_cb(void *clientp,
+ double dltotal,double dlnow,
+ double ultotal,double ulnow)
+{
+ return 0;
+}
+
+static int isf_debug_cb(CURL *handle, curl_infotype type,
+ char *data, size_t size,
+ void *userp)
+{
+#if 0
+
+ vfs68_curl_t * isf = (vfs68_curl_t *)userp;
+ const char * typestr;
+
+ switch (type) {
+ case CURLINFO_TEXT:
+ typestr = "TEXT";
+ break;
+ case CURLINFO_HEADER_IN:
+ typestr = "HEADER_IN";
+ break;
+ case CURLINFO_HEADER_OUT:
+ typestr = "HEADER_OUT";
+ break;
+ case CURLINFO_DATA_IN:
+ typestr = "DATA_IN";
+ data = 0;
+ break;
+ case CURLINFO_DATA_OUT:
+ typestr = "DATA_OUT";
+ data = 0;
+ break;
+ case CURLINFO_END:
+ typestr = "DATA_END";
+ data = 0;
+ break;
+ default:
+ typestr = "UNKNOWN";
+ data = 0;
+ break;
+ }
+
+ TRACE68(curl_cat,"%s:%p:%p >%s\n", isf->name, isf->curm, handle, typestr);
+ if (data) {
+ int i;
+ char tmp256;
+ int max = (size > sizeof(tmp)-1) ? sizeof(tmp)-1 : size;
+ for (i=0; i<max; ++i) {
+ int c = datai & 255;
+ if (c==9) c = ' ';
+ if (c < 32 || c > 127) break;
+ tmpi = c;
+ }
+ tmpi = 0;
+ if (i>0) {
+ TRACE68(curl_cat,"%s\n", tmp);
+ }
+ }
+#endif
+
+ return 0;
+}
+
+static int match_header(int *v,
+ char * ptr, const int bytes,
+ const char *header, const int hdsize)
+{
+ if (bytes > hdsize+1 &&
+ !memcmp(ptr,header,hdsize-1)) {
+ int i, c;
+
+ /* Find first digit */
+ for (i=hdsize-1, c=0; i<bytes && (c=ptri, (c<'0' || c>'9')); ++i)
+ ;
+ /* Convert base 10 number */
+ if (c>='0' || c<='9') {
+ int len = c - '0';
+ for (++i; i<bytes && (c=ptri, (c>='0' && c<='9')); ++i) {
+ len = len * 10 + c - '0';
+ }
+ *v = len;
+/* TRACE68(curl_cat,"Match header %s-> %d\n", header, len); */
+ return 1;
+ }
+ }
+ return 0;
+}
+
+static size_t isf_header_cb(void *ptr, size_t size,
+ size_t nmemb, void *stream)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)stream;
+
+ static const char ftp_size = "213";
+/* static const char ftp_complete = "226"; */
+
+ static const char content_length = "Content-Length:";
+/* static const char content_type = "Content-Type:"; */
+
+ int len;
+ int bytes = nmemb*size;
+
+ isf->has_hd_write = 1;
+
+/* TRACE68(curl_cat,"curl68::header_cb(%s:%p, %d)\n", */
+/* isf->name, isf->curm, size*nmemb); */
+
+ if (match_header(&len, ptr, bytes, content_length, sizeof(content_length))
+ || match_header(&len, ptr, bytes, ftp_size, sizeof(ftp_size))) {
+ isf->length = len;
+/* TRACE68(curl_cat,"%s::Set length to %d\n", isf->name, len); */
+ }
+
+ /* $$$ TODO : Add transfert complete checks */
+
+ return nmemb;
+}
+
+static int safe_curl_cleanup(vfs68_curl_t * isf)
+{
+ int err = 1;
+ if (isf) {
+ err = 0;
+ if (isf->curm) {
+ if (isf->curl) {
+ err |= ( CURLM_OK != curl_multi_remove_handle(isf->curm, isf->curl) );
+ curl_easy_cleanup(isf->curl);
+ isf->curl = 0;
+ }
+ err |= ( CURLM_OK != curl_multi_cleanup(isf->curm) );
+ isf->curm = 0;
+ } else if (isf->curl) {
+ curl_easy_cleanup(isf->curl);
+ isf->curl = 0;
+ }
+ }
+ return -err;
+}
+
+static int isf_open(vfs68_t * vfs)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)vfs;
+ const int verbose = ISF_VERBOSE;
+ CURLcode code = 0;
+ CURLMcode mcode = 0;
+ int err;
+
+ if (!isf->name0 || isf->curm || isf->curl) {
+ return -1;
+ }
+
+/* SC68os_pdebug("curl68::open(%s,%c%c)\n",isf->name, */
+/* (isf->mode & VFS68_OPEN_READ)?'R':'r', */
+/* (isf->mode & VFS68_OPEN_WRITE)?'W':'w'); */
+
+ /* Reset info. */
+ isf->has_read = isf->has_write = isf->has_hd_read = isf->has_hd_write = 0;
+ isf->curl_pos = isf->pos = 0;
+ isf->length = -1;
+ isf->error0 = 0;
+ isf->code = 0;
+ isf->mcode = 0;
+
+ /*
+ FD_ZERO(&isf->sets.r);
+ FD_ZERO(&isf->sets.w);
+ FD_ZERO(&isf->sets.e);
+ */
+
+ /* Currently accapts only read only open mode. */
+ if (isf->mode != VFS68_OPEN_READ) {
+ strcpy(isf->error, "Invalid open mode");
+ return -1;
+ }
+
+ /* Create curl handle */
+ isf->curl = curl_easy_init();
+ isf->curm = curl_multi_init();
+/* TRACE68(curl_cat,"%s:%p:%p:open()\n",isf->name, isf->curm, isf->curl); */
+ if (!isf->curl || !isf->curm) {
+ goto error;
+ }
+
+ /* URL, most important thing to setup. */
+ err = 0;
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_URL,isf->name)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_ERRORBUFFER,isf->error)));
+ /* Set curl internal buffer (just an hint) */
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_BUFFERSIZE,1024)));
+
+ /* Debug options. */
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_VERBOSE,verbose)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_DEBUGFUNCTION,isf_debug_cb)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_DEBUGDATA,isf)));
+ /* Our read/write/progress callback. */
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_WRITEFUNCTION,isf_write_cb)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_WRITEDATA,isf)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_READFUNCTION,isf_read_cb)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_READDATA,isf)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_PROGRESSFUNCTION,isf_prog_cb)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_PROGRESSDATA,isf)));
+
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_HEADERFUNCTION,isf_header_cb)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_HEADERDATA,isf)));
+
+ /* Password callback (currently raises an error) */
+ /* $$$ OBSOLETE */
+ /*
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_PASSWDFUNCTION,isf_passwd_cb)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_PASSWDDATA,isf)));
+ */
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_NETRC,CURL_NETRC_OPTIONAL)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_FOLLOWLOCATION,1)));
+/* MAC-OSX (7.10.2) version does not have it ?? */
+#ifdef CURLOPT_UNRESTRICTED_AUTH
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_UNRESTRICTED_AUTH,0)));
+#endif
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_TRANSFERTEXT,0)));
+
+ // $$$ FIXME
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_INFILESIZE,0)));
+ err = err || (CURLE_OK != (code=curl_easy_setopt(isf->curl,CURLOPT_UPLOAD,0)));
+
+ if (err) {
+ goto error;
+ }
+
+ isf_reset_cache_blocks(isf);
+ mcode = curl_multi_add_handle(isf->curm, isf->curl);
+ if (mcode != CURLM_OK && mcode != CURLM_CALL_MULTI_PERFORM) {
+ goto error;
+ } else {
+ const int re_timeout = IS68_TIMEOUT;
+ int timeout = re_timeout;
+
+ do {
+ int n;
+ mcode = curl_multi_perform(isf->curm, &n);
+/* TRACE68(curl_cat,"READ_HEADER: MCODE=%s\n", */
+/* mcode == CURLM_OK ? "OK" : */
+/* (mcode == CURLM_CALL_MULTI_PERFORM) ? "MULTI" : "OTHER"); */
+
+ if (mcode == CURLM_OK) {
+/* TRACE68(curl_cat,"OK, timeleft:%d\n",timeout); */
+ timeout -= mysleep(200);
+ if (timeout < 0) {
+ TRACE68(curl_cat,"vfs_curl: read-header -- *%s*\n","TIME-OUT");
+ break;
+ }
+ } else if (mcode != CURLM_CALL_MULTI_PERFORM) {
+ goto error;
+ } else {
+ timeout = re_timeout;
+ }
+ } while (!(isf->has_read | isf->has_write));
+ if ( ! (isf->has_hd_write | isf->has_read | isf->has_write) ) {
+ goto error;
+ }
+ }
+ isf->code = code;
+ isf->mcode = mcode;
+ return 0;
+
+error:
+ isf->code = code;
+ isf->mcode = mcode;
+ safe_curl_cleanup(isf);
+
+ return -1;
+}
+
+static int isf_close(vfs68_t * vfs)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)vfs;
+ return safe_curl_cleanup(isf);
+}
+
+static int isf_need_more(vfs68_curl_t * isf)
+{
+ int n=0, pos;
+
+ pos = isf->curl_pos;
+ isf->mcode = curl_multi_perform(isf->curm, &n);
+ n = isf->curl_pos - pos;
+ if (n) {
+/* TRACE68(curl_cat,"%s:%p:GETS MORE\n" */
+/* "-> %d (code=%d)\n", */
+/* isf->name, isf->curm, */
+/* n, isf->mcode); */
+ } else {
+ switch (isf->mcode) {
+ case CURLM_OK:
+ break;
+ case CURLM_CALL_MULTI_PERFORM:
+ default:
+/* TRACE68(curl_cat,"%s:%p:GETS MORE DETECTS EOF\n" */
+/* "-> pos:%d length:%d (code=%d)\n", */
+/* isf->name, isf->curm, */
+/* isf->curl_pos, isf->length, isf->mcode); */
+ n = -1;
+ break;
+ }
+ }
+ return n;
+}
+
+
+static int isf_read(vfs68_t * vfs, void * data, int n)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)vfs;
+ int pos, off, top, blk, bytes;
+ const int re_timeout = IS68_TIMEOUT;
+ int timeout = re_timeout;
+
+/* SC68os_pdebug("%s:%p::read: %d bytes -> %p\n", */
+/* isf->name, isf->curm, n, data); */
+
+ if (!isf->curl) {
+ return -1;
+ } else if (!n) {
+ return 0;
+ }
+
+ pos = isf->pos;
+ bytes = n;
+
+ while (bytes > 0) {
+ char * src = 0;
+ int n = -1;
+
+ if (isf->length != -1 && pos >= isf->length) {
+/* TRACE68(curl_cat,"%s:%p, EOF:\n" */
+/* "->pos:%p/%p\n", */
+/* isf->name, isf->curm, */
+/* pos, isf->length); */
+ break;
+ } else if (timeout < 0) {
+/* TRACE68(curl_cat,"%s:%p, TIME-OUT :\n" */
+/* "->pos:%d/%d (%d ms)\n", */
+/* isf->name, isf->curm, */
+/* pos, isf->length, re_timeout); */
+ break;
+ }
+
+ off = pos & (IS68_CACHE_SZ-1);
+ top = pos - off;
+ blk = (pos>>IS68_CACHE_FIX) & (IS68_CACHE_BLKS-1);
+
+ if (top == isf->cacheblk.top) {
+
+/* TRACE68(curl_cat,"%s:%p, read block:\n" */
+/* "->pos:%x top:%x blk:%x off:%x bytes:%d cache:%x:%d\n", */
+/* isf->name, isf->curm, */
+/* pos, top, blk, off, bytes, */
+/* isf->cacheblk.top, isf->cacheblk.bytes); */
+
+ src = isf->cacheblk.buffer + off;
+ n = isf->cacheblk.bytes - off;
+ if (n > bytes) {
+ n = bytes;
+ }
+ } else {
+/* TRACE68(curl_cat,"NOT MY TOP\n"); */
+ }
+
+ if (n <= 0) {
+ if (pos < isf->curl_pos) {
+ TRACE68(curl_cat,"%s:%p: Can not seek backward from %d to %d\n",
+ isf->name, isf->curm, isf->curl_pos, pos);
+ break;
+ }
+
+ n=isf_need_more(isf);
+ if (!n) {
+ /* $$$ FIXME : should use fd_set here ! */
+ timeout -= mysleep(100);
+ } else if (n == -1) {
+ break;
+ } else {
+ timeout = re_timeout;
+ }
+ } else {
+ memcpy(data, src, n);
+ data = (char *)data + n;
+ pos += n;
+ bytes -= n;
+ }
+ }
+ isf->pos = pos;
+
+ if (isf->mcode != CURLM_OK && isf->mcode != CURLM_CALL_MULTI_PERFORM) {
+ return -1;
+ }
+/* TRACE68(curl_cat,"%s:%p:read -> %d\n", isf->name, isf->curm, n-bytes); */
+ return n - bytes;
+}
+
+/* $$$ TODO */
+static int isf_write(vfs68_t * vfs, const void * data, int n)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)vfs;
+
+ return (!isf->curl)
+ ? -1
+ : 0
+ ;
+}
+
+/* $$$ TODO */
+static int isf_flush(vfs68_t * vfs)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)vfs;
+ return (!isf->curl)
+ ? -1
+ : 0
+ ;
+}
+
+/* We could have store the length value at opening, but this way it handles
+ * dynamic changes of curl size.
+ */
+static int isf_length(vfs68_t * vfs)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)vfs;
+
+ return (!isf->curl)
+ ? -1
+ : isf->length
+ ;
+}
+
+static int isf_tell(vfs68_t * vfs)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)vfs;
+ return (!isf->curl)
+ ? -1
+ : isf->pos
+ ;
+}
+
+static int isf_seek(vfs68_t * vfs, int offset)
+{
+ vfs68_curl_t * isf = (vfs68_curl_t *)vfs;
+ int pos;
+
+ if (!isf->curl) {
+ return -1;
+ }
+
+ pos = isf->pos + offset;
+ if (pos < 0 || (isf->length != -1 && pos > isf->length)) {
+ return -1;
+ }
+ isf->pos = pos;
+ return 0;
+}
+
+static void isf_destroy(vfs68_t * vfs)
+{
+ free(vfs);
+}
+
+static const vfs68_t vfs68_curl = {
+ isf_name,
+ isf_open, isf_close,
+ isf_read, isf_write, isf_flush,
+ isf_length, isf_tell, isf_seek, isf_seek,
+ isf_destroy
+};
+
+int vfs68_curl_init(void)
+{
+ if (curl_cat == msg68_DEFAULT) {
+ curl_cat = msg68_cat("curl","cURL VFS",DEBUG_CURL_O);
+ curl_cat = curl_cat != -1 ? curl_cat : msg68_DEFAULT;
+ }
+ if (!init) {
+ init = ( curl_global_init(CURL_GLOBAL_ALL) == CURLE_OK ) ? 1 : -1;
+ if (init == 1)
+ uri68_register(&curl_scheme);
+ }
+ return -(init != 1);
+}
+
+void vfs68_curl_shutdown(void)
+{
+ if (init == 1) {
+ uri68_unregister(&curl_scheme);
+ curl_global_cleanup();
+ init = 0;
+ }
+ if (curl_cat != msg68_DEFAULT) {
+ msg68_cat_free(curl_cat);
+ curl_cat = msg68_DEFAULT;
+ }
+}
+
+static vfs68_t * curl_create(const char *uri, int mode,
+ int argc, va_list list)
+{
+ vfs68_curl_t *isf;
+ int len;
+
+ if (vfs68_curl_init()) {
+ return 0;
+ }
+
+ if (!uri || !uri0) {
+ return 0;
+ }
+
+ /* Don't need +1 because 1 byte already allocated in the
+ * vfs68_curl_t::uri.
+ */
+ len = strlen(uri);
+ isf = calloc(sizeof(vfs68_curl_t) + len, 1);
+ if (!isf) {
+ return 0;
+ }
+
+ /* Copy vfs functions. */
+ memcpy(&isf->vfs, &vfs68_curl, sizeof(vfs68_curl));
+
+ /* Clean curl handle. */
+ isf->mode = mode & (VFS68_OPEN_READ|VFS68_OPEN_WRITE);
+
+ strcpy(isf->name, uri);
+ return &isf->vfs;
+}
+
+
+#else /* #ifdef USE_CURL */
+
+/* vfs curl must not be include in this package. Anyway the creation
+ * still exist but it always returns error.
+ */
+
+#include "file68_vfs_curl.h"
+#include "file68_vfs_def.h"
+
+int vfs68_curl_init(void) { return 0; }
+void vfs68_curl_shutdown(void) {}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/vfs68_fd.c Added

@@ -0,0 +1,350 @@
+/*
+ * @file istream68_fd.c
+ * @brief implements istream68 VFS for file descriptor
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_vfs_fd.h"
+
+/* define this if you don't want file descriptor support. */
+#ifndef ISTREAM68_NO_FD
+
+#include "file68_vfs_def.h"
+#include "file68_uri.h"
+#include "file68_str.h"
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#if defined(_MSC_VER)
+# include <stdio.h>
+# include <io.h>
+#else
+# include <unistd.h>
+#endif
+#include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+/** vfs file structure. */
+typedef struct {
+ vfs68_t vfs; /**< vfs function. */
+ int fd; /**< File descriptor (-1:closed). */
+ int org_fd; /**< Original file descriptor. */
+ int mode; /**< Open modes. */
+
+ /* MUST BE at the end of the structure because supplemental bytes will
+ * be allocated to store filename.
+ */
+ char name1; /**< filename. */
+
+} vfs68_fd_t;
+
+static int fd_ismine(const char *);
+static vfs68_t * fd_create(const char *, int, int, va_list);
+static scheme68_t fd_scheme = {
+ 0, "vfs-fd", fd_ismine, fd_create
+};
+
+static struct {
+ const char * name; int len; int mode;
+} myshemes =
+{
+ { "fd:", 3, SCHEME68_ISMINE|SCHEME68_READ|SCHEME68_WRITE },
+ { "file://", 7, SCHEME68_ISMINE|SCHEME68_READ|SCHEME68_WRITE },
+ { "local://", 8, SCHEME68_ISMINE|SCHEME68_READ|SCHEME68_WRITE },
+ { "stdout:", 7, SCHEME68_ISMINE| SCHEME68_WRITE },
+ { "stderr:", 7, SCHEME68_ISMINE| SCHEME68_WRITE },
+ { "stdin:", 7, SCHEME68_ISMINE|SCHEME68_READ },
+};
+
+static int fd_ismine(const char * uri)
+{
+ int i = uri68_get_scheme(0, 0, uri);
+ if (!i)
+ return SCHEME68_ISMINE|SCHEME68_READ|SCHEME68_WRITE;
+ else if (i > 0) {
+#ifdef NATIVE_WIN32
+ if (i == 2 && isalpha((int)uri0))
+ return SCHEME68_ISMINE|SCHEME68_READ|SCHEME68_WRITE;
+#endif
+ for (i = 0; i < sizeof(myshemes)/sizeof(*myshemes); ++i)
+ if (!strncmp68(uri, myshemesi.name, myshemesi.len))
+ return myshemesi.mode;
+ }
+ return 0;
+}
+
+static const char * ifdname(vfs68_t * vfs)
+{
+ vfs68_fd_t * isf = (vfs68_fd_t *)vfs;
+
+ return (!isf->name0)
+ ? 0
+ : isf->name;
+}
+
+static int ifdopen(vfs68_t * vfs)
+{
+ int imode;
+ vfs68_fd_t * isf = (vfs68_fd_t *)vfs;
+
+ if (isf->fd != -1) {
+ return -1;
+ }
+
+ if (isf->org_fd != -1) {
+ isf->fd = isf->org_fd;
+ return 0;
+ }
+
+ switch (isf->mode) {
+ case VFS68_OPEN_READ:
+ imode = O_RDONLY;
+ break;
+ case VFS68_OPEN_WRITE:
+ imode = O_WRONLY | O_CREAT | O_TRUNC;
+ break;
+ case VFS68_OPEN_READ|VFS68_OPEN_WRITE:
+ imode = O_RDWR | O_CREAT;
+ break;
+ default:
+ return -1;
+ }
+#ifdef _O_BINARY
+ imode |= _O_BINARY;
+#endif
+
+ isf->fd = open(isf->name, imode, 0644);
+ return -(isf->fd == -1);
+}
+
+static int ifdclose(vfs68_t * vfs)
+{
+ vfs68_fd_t * isf = (vfs68_fd_t *)vfs;
+ int fd;
+
+ if (isf->fd == -1) {
+ return -1;
+ }
+ fd = isf->fd;
+ isf->fd = -1;
+ /* $$$ Close even if org_fd was given. Is it a good thing ? */
+ return close(fd);
+}
+
+static int ifdread(vfs68_t * vfs, void * data, int n)
+{
+ vfs68_fd_t * isf = (vfs68_fd_t *)vfs;
+ return (isf->fd == -1)
+ ? -1
+ : read(isf->fd, data, n);
+}
+
+static int ifdwrite(vfs68_t * vfs, const void * data, int n)
+{
+ vfs68_fd_t * isf = (vfs68_fd_t *)vfs;
+ return isf->fd == -1
+ ? -1
+ : write(isf->fd, data, n)
+ ;
+}
+
+#if defined(HAVE_FDATASYNC)
+# define MY_FSYNC(fd) fdatasync(fd)
+#elif defined(HAVE_FSYNC)
+# define MY_FSYNC(fd) fsync(fd)
+#else
+# define MY_FSYNC(fd) 0
+#endif
+
+static int ifdflush(vfs68_t * vfs)
+{
+ vfs68_fd_t * isf = (vfs68_fd_t *)vfs;
+ return isf->fd == -1
+ ? -1
+ : MY_FSYNC(isf->fd)
+ ;
+}
+
+/* We could have store the length value at opening, but this way it handles
+ * dynamic changes of file size.
+ */
+static int ifdlength(vfs68_t * vfs)
+{
+ vfs68_fd_t * isf = (vfs68_fd_t *)vfs;
+ off_t pos,len = -1;
+
+ if (isf->fd == -1) {
+ return -1;
+ }
+
+ /* save current position. */
+ pos = lseek(isf->fd,0,SEEK_CUR);
+ if (pos != (off_t)-1) {
+ /* seek to end of file to get file position (AKA length) */
+ len = lseek(isf->fd, 0, SEEK_END);
+ /* restore saved position. */
+ lseek(isf->fd, pos, SEEK_SET);
+ }
+ return len;
+}
+
+static int ifdtell(vfs68_t * vfs)
+{
+ vfs68_fd_t * isf = (vfs68_fd_t *)vfs;
+
+ return isf->fd == -1
+ ? -1
+ : lseek(isf->fd,0,SEEK_CUR)
+ ;
+}
+
+static int ifdseek(vfs68_t * vfs, int offset)
+{
+ vfs68_fd_t * isf = (vfs68_fd_t *)vfs;
+
+ return isf->fd == -1
+ ? -1
+ : lseek(isf->fd, offset, SEEK_CUR)
+ ;
+}
+
+static void ifddestroy(vfs68_t * vfs)
+{
+ free(vfs);
+}
+
+static const vfs68_t vfs68_fd = {
+ ifdname,
+ ifdopen, ifdclose,
+ ifdread, ifdwrite, ifdflush,
+ ifdlength, ifdtell,
+ ifdseek, ifdseek,
+ ifddestroy
+};
+
+static vfs68_t * create(const char * fname, int fd, int mode)
+{
+ vfs68_fd_t *isf;
+ int len;
+
+ if (fname && !strncmp68(fname,"fd:",3) && isdigit((int)fname3)) {
+ fd = strtoul(fname+3, 0, 10);
+ fname = 0;
+ }
+
+ if (fname)
+ len = strlen(fname);
+ else if (fd >= 0)
+ len = 40;
+ else
+ return 0;
+
+ /* Don't need 0, because 1 byte already allocated in the
+ * vfs68_fd_t::fname.
+ */
+
+ isf = malloc(sizeof(vfs68_fd_t) + len);
+ if (!isf)
+ return 0;
+
+ /* Copy vfs functions. */
+ memcpy(&isf->vfs, &vfs68_fd, sizeof(vfs68_fd));
+ /* Clean init. */
+ isf->fd = -1;
+ isf->org_fd = fd;
+ isf->mode = mode & (VFS68_OPEN_READ|VFS68_OPEN_WRITE);
+
+ if (!fname)
+ sprintf(isf->name, "fd:%u", fd);
+ else
+ /* Copy filename. */
+ /* $$$ May be later, we should add a check for relative path and add
+ * CWD ... or make it URL compatible */
+ strcpy(isf->name, fname);
+
+ return &isf->vfs;
+}
+
+static vfs68_t * fd_create(const char * uri, int mode,
+ int argc , va_list list)
+{
+ int fd = -1;
+
+ if (!strncmp68(uri,"fd:", 3))
+ fd = strtoul(uri+3, 0, 10);
+ else if (!strncmp68(uri,"file://", 7))
+ uri += 7;
+ else if (!strncmp68(uri,"local://", 8))
+ uri += 8;
+ else if (!strncmp68(uri,"stdin:", 6))
+ return (mode & 3) == 1
+ ? create(0, 0, mode)
+ : 0
+ ;
+ else if (!strncmp68(uri,"stdout:", 7))
+ return (mode & 3) == 2
+ ? create(0, 1, mode)
+ : 0
+ ;
+ else if (!strncmp68(uri,"stderr:", 7))
+ return (mode & 3) == 2
+ ? create(0, 2, mode)
+ : 0
+ ;
+
+ if (fd == -1 && argc == 1) {
+ fd = va_arg(list,int);
+ uri = 0;
+ }
+
+ return create(uri, fd, mode);
+}
+
+int vfs68_fd_init(void)
+{
+ return uri68_register(&fd_scheme);
+}
+
+void vfs68_fd_shutdown(void)
+{
+ uri68_unregister(&fd_scheme);
+}
+
+#else /* #ifndef VFS68_NO_FILE */
+
+/* vfs fd must not be include in this package. Anyway the creation
+ * still exist but it always returns error.
+ */
+
+#include "file68_msg.h"
+
+int vfs68_fd_init(void) { return 0; }
+void vfs68_fd_shutdown(void) { }
+
+#endif
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/vfs68_file.c Added

@@ -0,0 +1,315 @@
+/*
+ * @file istream68_file.c
+ * @brief implements istream68 VFS for FILE
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_vfs_file.h"
+
+/* define this if you don't want FILE support. */
+#ifndef ISTREAM68_NO_FILE
+
+#include "file68_vfs_def.h"
+#include "file68_uri.h"
+#include "file68_str.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+static int file_ismine(const char *);
+static vfs68_t * file_create(const char *, int, int, va_list);
+static scheme68_t file_scheme = {
+ 0, "vfs-file", file_ismine, file_create
+};
+
+static struct {
+ const char * name; int len; int mode;
+} myshemes =
+{
+ { "file://", 7, SCHEME68_ISMINE|SCHEME68_READ|SCHEME68_WRITE },
+ { "local://", 8, SCHEME68_ISMINE|SCHEME68_READ|SCHEME68_WRITE },
+ { "stdout:", 7, SCHEME68_ISMINE| SCHEME68_WRITE },
+ { "stderr:", 7, SCHEME68_ISMINE| SCHEME68_WRITE },
+ { "stdin:", 7, SCHEME68_ISMINE|SCHEME68_READ },
+};
+
+static int file_ismine(const char * uri)
+{
+ int i = uri68_get_scheme(0, 0, uri);
+ if (!i)
+ return SCHEME68_ISMINE|SCHEME68_READ|SCHEME68_WRITE;
+ else if (i > 0) {
+#ifdef NATIVE_WIN32
+ if (i == 2 && isalpha((int)uri0))
+ return SCHEME68_ISMINE|SCHEME68_READ|SCHEME68_WRITE;
+#endif
+ for (i = 0; i < sizeof(myshemes)/sizeof(*myshemes); ++i)
+ if (!strncmp68(uri, myshemesi.name, myshemesi.len))
+ return myshemesi.mode;
+ }
+ return 0;
+}
+
+/** vfs file structure. */
+typedef struct {
+ vfs68_t vfs; /**< vfs function. */
+ FILE *f; /**< FILE handle. */
+ FILE *forg; /**< For stdin. stdout ... */
+
+ /** Open modes. */
+ int mode;
+
+ /* MUST BE at the end of the structure because supplemental bytes will
+ * be allocated to store filename.
+ */
+ char name1; /**< filename. */
+
+} vfs68_file_t;
+
+static const char * isf_name(vfs68_t * vfs)
+{
+ vfs68_file_t * isf = (vfs68_file_t *)vfs;
+
+ return !isf->name0
+ ? 0
+ : isf->name
+ ;
+}
+
+static int isf_open(vfs68_t * vfs)
+{
+ int imode;
+ char mode8;
+ vfs68_file_t * isf = (vfs68_file_t *)vfs;
+
+ if (!isf->name0 || isf->f)
+ return -1;
+
+ if (isf->forg)
+ isf->f = isf->forg;
+ else {
+ imode = 0;
+ if (VFS68_IS_OPEN_READ(isf->mode)) {
+ modeimode++ = 'r';
+ }
+ if (VFS68_IS_OPEN_WRITE(isf->mode)) {
+ modeimode = !imode ? 'w' : '+';
+ ++imode;
+ }
+ if (!imode) {
+ return -1;
+ }
+ modeimode++ = 'b';
+ modeimode = 0;
+
+ isf->f = fopen(isf->name, mode);
+#ifdef _O_BINARY
+ if (isf->f) {
+ _setmode(_fileno(isf->f), _O_BINARY);
+ }
+#endif
+ }
+ return isf->f ? 0 : -1;
+}
+
+static int isf_close(vfs68_t * vfs)
+{
+ vfs68_file_t * isf = (vfs68_file_t *)vfs;
+ FILE * f = isf->f;
+
+ isf->f = 0;
+ return !f
+ ? -1
+ : (isf->forg ? 0 : fclose(f))
+ ;
+}
+
+static int isf_read(vfs68_t * vfs, void * data, int n)
+{
+ vfs68_file_t * isf = (vfs68_file_t *)vfs;
+
+ return !isf->f
+ ? -1
+ : fread(data, 1, n, isf->f)
+ ;
+}
+
+static int isf_write(vfs68_t * vfs, const void * data, int n)
+{
+ vfs68_file_t * isf = (vfs68_file_t *)vfs;
+
+ return !isf->f
+ ? -1
+ : fwrite(data, 1, n, isf->f)
+ ;
+}
+
+static int isf_flush(vfs68_t * vfs)
+{
+ vfs68_file_t * isf = (vfs68_file_t *)vfs;
+
+ return !isf->f
+ ? -1
+ : fflush(isf->f)
+ ;
+}
+
+
+/* We could have store the length value at opening, but this way it handles
+ * dynamic changes of file size.
+ */
+static int isf_length(vfs68_t * vfs)
+{
+ vfs68_file_t * isf = (vfs68_file_t *)vfs;
+ int pos,len;
+
+ if (!isf->f) {
+ return -1;
+ }
+ /* save current position. */
+ len = ftell(isf->f);
+ if (len != -1) {
+ pos = len;
+ /* seek t end of file */
+ len = fseek(isf->f, 0, SEEK_END);
+ if (len != -1) {
+ /* get end of file position (AKA file length) */
+ len = ftell(isf->f);
+ /* restore saved position. ( $$$ no error check here ) */
+ fseek(isf->f, pos, SEEK_SET);
+ }
+ }
+ return len;
+}
+
+static int isf_tell(vfs68_t * vfs)
+{
+ vfs68_file_t * isf = (vfs68_file_t *)vfs;
+
+ return !isf->f
+ ? -1
+ : ftell(isf->f)
+ ;
+}
+
+static int isf_seek(vfs68_t * vfs, int offset)
+{
+ vfs68_file_t * isf = (vfs68_file_t *)vfs;
+
+ return !isf->f
+ ? -1
+ : fseek(isf->f, offset, SEEK_CUR)
+ ;
+}
+
+static void isf_destroy(vfs68_t * vfs)
+{
+ free(vfs);
+}
+
+static const vfs68_t vfs68_file = {
+ isf_name,
+ isf_open, isf_close,
+ isf_read, isf_write, isf_flush,
+ isf_length, isf_tell, isf_seek, isf_seek,
+ isf_destroy
+};
+
+static
+vfs68_t * create(const char * fname, int mode)
+{
+ vfs68_file_t * isf;
+ FILE * forg;
+ int len;
+
+ /* Special schemes */
+ if (!strncmp68(fname,"stdin:",6)) {
+ if ( (mode & 3) != 1 ) return 0; /* read-only */
+ forg = stdin;
+ } else if (!strncmp68(fname,"stdout:",7)) {
+ if ( (mode & 3) != 2 ) return 0; /* write-only */
+ forg = stdout;
+ } else if (!strncmp68(fname,"stderr:",7)) {
+ if ( (mode & 3) != 2 ) return 0; /* write-only */
+ forg = stderr;
+ } else
+ forg = 0;
+
+ /* Don't to add 1 for the trailing zero, it has already been coundted
+ * in the definition of vfs68_file_t::fname.
+ */
+ len = strlen(fname);
+ isf = malloc(sizeof(vfs68_file_t) + len);
+ if (!isf)
+ return 0;
+
+ /* Copy vfs functions. */
+ memcpy(&isf->vfs, &vfs68_file, sizeof(vfs68_file));
+
+ /* Clean file handle. */
+ isf->f = 0;
+ isf->forg = forg;
+ isf->mode = mode & (VFS68_OPEN_READ|VFS68_OPEN_WRITE);
+
+ /* Copy filename. */
+ strcpy(isf->name, fname);
+ return &isf->vfs;
+}
+
+static vfs68_t * file_create(const char * uri, int mode,
+ int argc , va_list list)
+{
+ /* $$$ Just skip but we should decode the uri (%XX codes and such) */
+ if (!strncmp68(uri,"file://",7))
+ uri += 7;
+ else if (!strncmp68(uri,"local://",8))
+ uri += 8;
+ return create(uri, mode);
+}
+
+int vfs68_file_init(void)
+{
+ return uri68_register(&file_scheme);
+}
+
+void vfs68_file_shutdown(void)
+{
+ uri68_unregister(&file_scheme);
+}
+
+#else /* #ifndef VFS68_NO_FILE */
+
+/* vfs file must not be include in this package. Anyway the creation
+ * still exist but it always returns error.
+ */
+
+#include "file68_msg.h"
+
+int vfs68_file_init(void) { return 0; }
+void vfs68_file_shutdown(void) { }
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/vfs68_mem.c Added

@@ -0,0 +1,267 @@
+/*
+ * @file istream68_mem.c
+ * @brief implements istream68 VFS for memory buffer
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_vfs_mem.h"
+
+/* define this if you don't want MEM support. */
+#ifndef ISTREAM68_NO_MEM
+
+#include "file68_vfs_def.h"
+#include "file68_uri.h"
+#include "file68_str.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/** vfs file structure. */
+typedef struct {
+ vfs68_t vfs; /**< vfs function. */
+ char * buffer; /**< memory buffer. */
+ int size; /**< memory buffer size. */
+ int pos; /**< current position. */
+
+ /** Open modes. */
+ int mode; /**< Allowed open mode bit-0:read bit-1:write. */
+ int open; /**< Currently open mode bit-0:read bit-1:write. */
+
+ /* MUST BE at the end of the structure because supplemental bytes will
+ * be allocated to store filename.
+ */
+ char name16 + 2 * 2 * sizeof(void*); /**< filename (mem://start:end). */
+ char internal4;
+} vfs68_mem_t;
+
+static int mem_ismine(const char *);
+static vfs68_t * mem_create(const char *, int, int, va_list);
+static scheme68_t mem_scheme = {
+ 0, "vfs-mem", mem_ismine, mem_create
+};
+
+static int mem_ismine(const char * uri)
+{
+ if (!strncmp68(uri,"mem:", 4))
+ return SCHEME68_ISMINE | SCHEME68_READ | SCHEME68_WRITE;
+ return 0;
+}
+
+static const char * ism_name(vfs68_t * vfs)
+{
+ vfs68_mem_t * ism = (vfs68_mem_t *)vfs;
+
+ return !ism->name0
+ ? 0
+ : ism->name
+ ;
+}
+
+static int ism_open(vfs68_t * vfs)
+{
+ vfs68_mem_t * ism = (vfs68_mem_t *)vfs;
+
+ if (!VFS68_IS_OPEN(ism->mode) || ism->open) {
+ return -1;
+ }
+ ism->open = ism->mode & VFS68_OPEN_MASK;
+ ism->pos = 0;
+ return 0;
+}
+
+static int ism_close(vfs68_t * vfs)
+{
+ vfs68_mem_t * ism = (vfs68_mem_t *)vfs;
+
+ if (!ism->open) {
+ return -1;
+ }
+ ism->open = 0;
+ return 0;
+}
+
+static int ism_read_or_write(vfs68_t * vfs, void * data, int n, int mode)
+{
+ vfs68_mem_t * ism = (vfs68_mem_t *)vfs;
+ int pos, endpos;
+
+ if (!(ism->open & mode) || n < 0) {
+ return -1;
+ }
+ if (!n) {
+ return 0;
+ }
+
+ pos = ism->pos;
+ endpos = pos + n;
+ if (endpos > ism->size) {
+ endpos = ism->size;
+ n = endpos - pos;
+ }
+ if (n > 0) {
+ void *src, *dst;
+ if (mode == VFS68_OPEN_READ) {
+ src = ism->buffer+pos;
+ dst = data;
+ } else {
+ src = data;
+ dst = ism->buffer+pos;
+ }
+ memcpy(dst, src, n);
+ }
+ ism->pos = endpos;
+ return n;
+}
+
+static int ism_read(vfs68_t * vfs, void * data, int n)
+{
+ return ism_read_or_write(vfs, data, n, VFS68_OPEN_READ);
+}
+
+static int ism_write(vfs68_t * vfs, const void * data, int n)
+{
+ void * rw = (void *)data;
+ return ism_read_or_write(vfs, rw, n, VFS68_OPEN_WRITE);
+}
+
+static int ism_flush(vfs68_t * vfs)
+{
+ vfs68_mem_t * ism = (vfs68_mem_t *)vfs;
+ return -!ism->open;
+}
+
+static int ism_length(vfs68_t * vfs)
+{
+ vfs68_mem_t * ism = (vfs68_mem_t *)vfs;
+
+ return !ism->open
+ ? -1
+ : ism->size
+ ;
+}
+
+static int ism_tell(vfs68_t * vfs)
+{
+ vfs68_mem_t * ism = (vfs68_mem_t *)vfs;
+
+ return !ism->open
+ ? -1
+ : ism->pos
+ ;
+}
+
+static int ism_seek(vfs68_t * vfs, int offset)
+{
+ vfs68_mem_t * ism = (vfs68_mem_t *)vfs;
+ int pos;
+
+ if (!ism->open) {
+ return -1;
+ }
+ pos = ism->pos + offset;
+ if (pos < 0 || pos > ism->size) {
+ return -1;
+ }
+ ism->pos = pos;
+ return 0;
+}
+
+static void ism_destroy(vfs68_t * vfs)
+{
+ vfs68_mem_t * ism = (vfs68_mem_t *)vfs;
+
+ if (ism && VFS68_IS_SLAVE(ism->mode) && ism->buffer != ism->internal)
+ free(ism->buffer);
+ free(ism);
+}
+
+static const vfs68_t vfs68_mem = {
+ ism_name,
+ ism_open, ism_close,
+ ism_read, ism_write, ism_flush,
+ ism_length, ism_tell, ism_seek, ism_seek,
+ ism_destroy
+};
+
+vfs68_t * vfs68_mem_create(const void * addr, int len, int mode)
+{
+ vfs68_mem_t *ism;
+ int size;
+
+ if (len < 0)
+ return 0;
+
+ size = sizeof(vfs68_mem_t) + (!addr ? len : 0);
+ ism = malloc(size);
+ if (!ism)
+ return 0;
+ if (!addr)
+ addr = ism->internal;
+ ism->vfs = vfs68_mem;
+ ism->buffer = (char *)addr;
+ ism->size = len;
+ ism->mode = mode;
+ ism->open = 0;
+ ism->pos = 0;
+ sprintf(ism->name,"mem://%p:%p", addr, (char *)addr+len);
+
+ return &ism->vfs;
+}
+
+static vfs68_t * mem_create(const char * uri, int mode,
+ int argc, va_list list)
+{
+ if (mem_ismine(uri) && argc == 2) {
+ void * addr = va_arg(list, void *);
+ int len = va_arg(list, int);
+ return vfs68_mem_create(addr, len, mode);
+ }
+ return 0;
+}
+
+int vfs68_mem_init(void)
+{
+ return uri68_register(&mem_scheme);
+}
+
+void vfs68_mem_shutdown(void)
+{
+ uri68_unregister(&mem_scheme);
+}
+
+#else /* #ifndef VFS68_NO_FILE */
+
+/* vfs mem must not be include in this package. Anyway the creation
+ * still exist but it always returns error.
+ */
+
+#include "file68_fvs_mem.h"
+#include "file68_msg.h"
+
+int vfs68_mem_init(void) { return 0; }
+void vfs68_mem_shutdown(void) { }
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/vfs68_null.c Added

@@ -0,0 +1,220 @@
+/*
+ * @file istream68_null.c
+ * @brief implements istream68 VFS for for null
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_vfs_null.h"
+
+/* define this if you don't want NULL support. */
+#ifndef VFS68_NO_NULL
+
+#include "file68_vfs_def.h"
+#include "file68_uri.h"
+#include "file68_str.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+/** vfs file structure. */
+typedef struct {
+ vfs68_t vfs; /**< vfs function. */
+ int size; /**< max pos R or W. */
+ int pos; /**< current position. */
+ int open; /**< has been opened. */
+ char name1; /**< filename (null://filename). */
+} vfs68_null_t;
+
+static int null_ismine(const char *);
+static vfs68_t * null_create(const char *, int, int, va_list);
+static scheme68_t null_scheme = {
+ 0, "vfs-null", null_ismine, null_create
+};
+
+static int null_ismine(const char * uri)
+{
+ if (!strncmp68(uri, "null:", 5))
+ return SCHEME68_ISMINE | SCHEME68_READ | SCHEME68_WRITE;
+ return 0;
+}
+
+static const char * isn_name(vfs68_t * vfs)
+{
+ vfs68_null_t * isn = (vfs68_null_t *)vfs;
+
+ return (!isn->name0)
+ ? 0
+ : isn->name
+ ;
+}
+
+static int isn_open(vfs68_t * vfs)
+{
+ vfs68_null_t * isn = (vfs68_null_t *)vfs;
+
+ if (isn->open) {
+ return -1;
+ }
+ isn->open = 1;
+ isn->pos = 0;
+ isn->size = 0;
+ return 0;
+}
+
+static int isn_close(vfs68_t * vfs)
+{
+ vfs68_null_t * isn = (vfs68_null_t *)vfs;
+
+ if (!isn->open) {
+ return -1;
+ }
+ isn->open = 0;
+ return 0;
+}
+
+static int isn_read_or_write(vfs68_t * vfs, int n)
+{
+ vfs68_null_t * isn = (vfs68_null_t *)vfs;
+
+ if (!isn->open || n < 0) {
+ return -1;
+ }
+ if (n) {
+ /* No op: do not update size */
+ isn->pos += n;
+ if (isn->pos > isn->size) {
+ isn->size = isn->pos;
+ }
+ }
+ return n;
+}
+
+static int isn_read(vfs68_t * vfs, void * data, int n)
+{
+ return isn_read_or_write(vfs, n);
+}
+
+static int isn_write(vfs68_t * vfs, const void * data, int n)
+{
+ return isn_read_or_write(vfs, n);
+}
+
+static int isn_flush(vfs68_t * vfs)
+{
+ vfs68_null_t * isn = (vfs68_null_t *)vfs;
+ return -!isn->open;
+}
+
+static int isn_length(vfs68_t * vfs)
+{
+ vfs68_null_t * isn = (vfs68_null_t *)vfs;
+
+ return isn->size;
+}
+
+static int isn_tell(vfs68_t * vfs)
+{
+ vfs68_null_t * isn = (vfs68_null_t *)vfs;
+
+ return !isn->open
+ ? -1
+ : isn->pos
+ ;
+}
+
+static int isn_seek(vfs68_t * vfs, int offset)
+{
+ vfs68_null_t * isn = (vfs68_null_t *)vfs;
+
+ if (isn) {
+ offset += isn->pos;
+ if (offset >= 0) {
+ isn->pos = offset;
+ return 0;
+ }
+ }
+ return -1;
+}
+
+static void isn_destroy(vfs68_t * vfs)
+{
+ free(vfs);
+}
+
+static const vfs68_t vfs68_null = {
+ isn_name,
+ isn_open, isn_close,
+ isn_read, isn_write, isn_flush,
+ isn_length, isn_tell, isn_seek, isn_seek,
+ isn_destroy
+};
+
+int vfs68_null_init(void)
+{
+ return uri68_register(&null_scheme);
+}
+
+void vfs68_null_shutdown(void)
+{
+ uri68_unregister(&null_scheme);
+}
+
+static vfs68_t * null_create(const char * uri, int mode, int argc, va_list list)
+{
+ vfs68_null_t * isn;
+ int size;
+
+ if (!null_ismine(uri))
+ return 0;
+
+ size = sizeof(vfs68_null_t) + strlen(uri);
+
+ isn = malloc(size);
+ if (!isn) {
+ return 0;
+ }
+
+ isn->vfs = vfs68_null;
+ isn->size = 0;
+ isn->pos = 0;
+ isn->open = 0;
+ strcpy(isn->name,uri);
+
+ return &isn->vfs;
+}
+
+#else /* #ifndef VFS68_NO_NULL */
+
+/* vfs mem must not be include in this package. Anyway the creation
+ * still exist but it always returns error.
+ */
+
+#include "file68_vfs_null.h"
+#include "file68_msg.h"
+
+int vfs68_null_init(void) { return 0; }
+void vfs68_null_shutdown(void) { }
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/file68/src/vfs68_z.c Added

@@ -0,0 +1,868 @@
+/*
+ * @file istream68_z.c
+ * @brief implements vfs68 VFS for gzip
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "file68_api.h"
+#include "file68_vfs_z.h"
+#include "file68_msg.h"
+
+/** Default gzip option. */
+const vfs68_z_option_t vfs68_z_default_option = {
+ 1, /* gzip */
+ 3, /* level */
+ 0, /* strategy */
+ 1 /* name */
+};
+
+#ifdef USE_Z
+
+#include "file68_vfs_def.h"
+#include "file68_str.h"
+
+#include <zlib.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifndef DEBUG_ZLIB_O
+# define DEBUG_ZLIB_O 0
+#endif
+static int zlib_cat = msg68_DEFAULT;
+
+/* defined in zutil.h */
+#ifndef DEF_MEM_LEVEL
+# define DEF_MEM_LEVEL 8
+#endif
+
+/* gzip flag byte (from gzio.c) */
+#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */
+#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */
+#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
+#define ORIG_NAME 0x08 /* bit 3 set: original file name present */
+#define COMMENT 0x10 /* bit 4 set: file comment present */
+#define RESERVED 0xE0 /* bits 5..7: reserved */
+
+/** vfs Z structure. */
+typedef struct {
+ vfs68_t vfs; /**< vfs function. */
+ vfs68_t * is; /**< Wrapped stream. */
+ unsigned int mode:2; /**< Available open modes. */
+ unsigned int is_slave:1; /**< slave mode. */
+ unsigned int is_err:1; /**< Last is op failed. */
+ unsigned int is_eof:1; /**< is EOF. */
+ unsigned int gzip:1; /**< Gzip stream. */
+ unsigned int gz_name:1; /**< Add filename. */
+ unsigned int level:4; /**< Compression level. */
+ unsigned int strategy:2; /**< Compression startegy. */
+ unsigned int inflate:1; /**< Inflate inited. */
+ unsigned int deflate:1; /**< Deflate inited. */
+ unsigned int hd_crc:17; /**< Header CRC16 value. */
+ unsigned int c_crc32; /**< Computed CRC32 value. */
+ unsigned int gz_crc32; /**< Read CRC32 value. */
+ unsigned int gz_len; /**< Read length value. */
+
+ int pos; /**< Current R/W position. */
+ int org_pos; /**< Z stream start pos. */
+ int length; /**< Known length. */
+ z_stream c_stream; /**< Z compression stream. */
+ Byte * write_in; /**< Write buffer_in pos. */
+ Byte * read_out; /**< Read buffer_out pos. */
+ Byte buffer_in512; /**< Input buffer. */
+ Byte buffer_out512; /**< Output buffer. */
+} vfs68_z_t;
+
+static voidpf isf_zcalloc(voidpf opaque, unsigned items, unsigned size)
+{
+ opaque = opaque;
+ return calloc(items*size,1);
+}
+
+static void isf_zcfree(voidpf opaque, voidpf ptr)
+{
+ opaque = opaque;
+ free(ptr);
+}
+
+static const char * isf_name(vfs68_t * vfs)
+{
+ vfs68_z_t * isf = (vfs68_z_t *)vfs;
+
+ return (!isf)
+ ? 0
+ : vfs68_filename(isf->is);
+}
+
+/* Fill input buffer.
+ *
+ * @return number of bytes read or -1
+ */
+static int isf_fill_input_buffer(vfs68_z_t * isf, const int max)
+{
+ int n;
+
+ /* Try to fill whole buffer */
+ n = vfs68_read(isf->is, isf->buffer_in, max);
+ isf->is_eof = (n != max);
+ isf->is_err = (n == -1);
+ isf->c_stream.next_in = isf->buffer_in;
+ isf->c_stream.avail_in = n; /* -1: generates error in isf_read_buffer() */
+ return n;
+}
+
+/* Flush output buffer.
+ *
+ * @return number of bytes written or -1
+ */
+static int isf_flush_output_buffer(vfs68_z_t * isf)
+{
+ int n, w;
+
+ w = n = isf->c_stream.next_out - isf->buffer_out;
+ /* TRACE68(zlib_cat," FLUSH:%d",n); */
+ if (n > 0) {
+ w = vfs68_write(isf->is, isf->buffer_out, n);
+ isf->is_eof = (w != n);
+ isf->is_err = (w == -1);
+ if (isf->is_err) {
+ /* TRACE68(zlib_cat," WRITE-ERROR"); */
+ w = 0;
+ n = -1;
+ } else {
+ int rem = n - w;
+
+ if (rem) {
+ /* Damned! ... Could be an error ... Trust vfs & Pray */
+ int i;
+ /* TRACE68(zlib_cat," FLUSH-MISS:%d", rem); */
+ for (i=0; i<rem; ++i) {
+ isf->buffer_outi = isf->buffer_outi+w;
+ }
+ }
+ n = w;
+ w = rem;
+ }
+ isf->c_stream.next_out = isf->buffer_out + w;
+ }
+ isf->c_stream.avail_out = sizeof(isf->buffer_out) - w;
+ /* TRACE68(zlib_cat,"->%d ", n); */
+
+ return n;
+}
+
+/* Read data buffer_in data */
+static int isf_read_buffer(vfs68_z_t * isf, void *buffer, int n)
+{
+ int bytes;
+
+ if (!n) {
+ return 0;
+ }
+
+ bytes = n;
+ while (bytes > 0) {
+ int n;
+
+ n = isf->c_stream.avail_in;
+ if (!n) {
+ n = isf_fill_input_buffer(isf,bytes);
+ }
+ if (n == -1) {
+ return -1;
+ }
+ if (!n) {
+ break;
+ }
+ if (n > bytes) {
+ n = bytes;
+ }
+ bytes -= n;
+ memcpy(buffer, isf->c_stream.next_in, n);
+ isf->c_stream.next_in += n;
+ isf->c_stream.avail_in -= n;
+ buffer = (char *)buffer + n;
+ }
+ return n - bytes;
+}
+
+static int isf_seek_buffer(vfs68_z_t * isf, int offset)
+{
+ Byte * next_in;
+ int avail_in, n;
+
+ if (!offset) {
+ return 0;
+ }
+
+ next_in = isf->c_stream.next_in;
+ avail_in = isf->c_stream.avail_in;
+ n = offset;
+
+ if (offset < 0) {
+ if (-offset <= next_in - isf->buffer_in) {
+ offset = 0;
+ }
+ } else if (offset <= avail_in) {
+ offset = 0;
+ }
+
+ if (!offset) {
+ isf->c_stream.next_in = next_in + n;
+ isf->c_stream.avail_in = avail_in - n;
+ } else {
+ if (vfs68_seek(isf->is, offset) == -1) {
+ isf->is_err = 1;
+ return -1;
+ }
+ isf->c_stream.next_in = isf->buffer_in;
+ isf->c_stream.avail_in = 0;
+ }
+
+ return 0;
+}
+
+static const Byte gz_magic2 = {0x1f, 0x8b};
+
+static int isf_write_gz_header(vfs68_z_t * isf)
+{
+ struct {
+ Byte magic2; /* gz header */
+ Byte method; /* method (Z_DEFLATED) */
+ Byte flags; /* Xtra,name,comment... */
+ Byte info6; /* time, xflags and OS code */
+ } header;
+ int i;
+ const char * name = isf->gz_name ? vfs68_filename(isf->is) : 0;
+
+ header.magic0 = gz_magic0;
+ header.magic1 = gz_magic1;
+ header.method = Z_DEFLATED;
+ header.flags = name ? ORIG_NAME : 0;
+ for (i=0; i<sizeof(header.info); ++i) {
+ header.infoi = 0;
+ }
+ if (vfs68_write(isf->is, &header, sizeof(header)) != sizeof(header)) {
+ return -1;
+ }
+ if (name) {
+ const char * s1, * s2;
+ int len;
+ s1 = strrchr(name,'/');
+ s2 = strrchr(name,'\\');
+ name = (s1 > name) ? s1+1 : name;
+ name = (s2 > name) ? s2+1 : name;
+ len = strlen(name) + 1;
+ if (vfs68_write(isf->is, name, len) != len) {
+ return -1;
+ }
+ }
+ return 0;
+}
+
+static int isf_read_gz_header(vfs68_z_t * isf)
+{
+ int len;
+ struct {
+ Byte magic2; /* gz header */
+ Byte method; /* method (Z_DEFLATED) */
+ Byte flags; /* Xtra,name,comment... */
+ Byte info6; /* time, xflags and OS code */
+ } header;
+
+ /* Read gzip header. */
+ len = isf_read_buffer(isf, &header, sizeof(header));
+ if (len != sizeof(header)) {
+ goto error;
+ }
+ /* Preliminary tests. */
+ if (0
+ || gz_magic0 != header.magic0
+ || gz_magic1 != header.magic1
+ || header.method != Z_DEFLATED
+ || (header.flags & RESERVED) != 0) {
+ goto error;
+ }
+ /* Skip the extra field. */
+ if ((header.flags & EXTRA_FIELD) != 0) {
+ unsigned char xtraLen2;
+ int xlen = isf_read_buffer(isf,&xtraLen,2);
+ if (xlen == -1) {
+ goto error;
+ }
+ len += xlen;
+ if (xlen != 2) {
+ goto error;
+ }
+ xlen = xtraLen0 + (xtraLen1<<8);
+ if (isf_seek_buffer(isf,xlen) == -1) {
+ goto error;
+ }
+ len += xlen;
+ }
+
+ /* Skip the original file name & .gz file comment. */
+ while (header.flags & (ORIG_NAME|COMMENT)) {
+ char c;
+ int e;
+ if (header.flags & ORIG_NAME) {
+ header.flags &= ~ORIG_NAME;
+ } else {
+ header.flags &= ~COMMENT;
+ }
+ while (e=isf_read_buffer(isf, &c, 1), e == 1) {
+ ++len;
+ if (!c) break;
+ }
+ if (e != 1) {
+ goto error;
+ }
+ }
+
+ /* Skip the header crc */
+ if (header.flags & HEAD_CRC) {
+ unsigned char crc2;
+ int e = isf_read_buffer(isf,crc,2);
+ if (e == -1) {
+ goto error;
+ }
+ len += e;
+ if (e != 2) {
+ goto error;
+ }
+ /* Add 0x10000 so that the value could not be 0. */
+ isf->hd_crc = crc0 | (crc1<<8) | (1<<16);
+ }
+ return 0;
+
+error:
+ /* Try to seek back to starting position. */
+ isf_seek_buffer(isf,-len);
+ return -1;
+}
+
+/* Inflate as much as possible.
+ * returns number of byte available in out buffer
+ */
+static int isf_inflate_buffer(vfs68_z_t * isf)
+{
+ int err, n;
+ err = 0;
+ isf->c_stream.avail_out = sizeof(isf->buffer_out);
+ isf->c_stream.next_out = isf->read_out = isf->buffer_out;
+
+ while (isf->c_stream.avail_out) {
+
+ /* TRACE68(zlib_cat,"INFLATE: (%d,%d)", */
+ /* isf->c_stream.avail_in, isf->c_stream.avail_out); */
+ if (!isf->c_stream.avail_in) {
+ err = isf_fill_input_buffer(isf,sizeof(isf->buffer_in));
+ /* TRACE68(zlib_cat," fill_in(%d) ",err); */
+ if (err <= 0) {
+ break;
+ }
+ }
+ /* TRACE68(zlib_cat," (%d,%d), inflate->", */
+ /* isf->c_stream.avail_in, isf->c_stream.avail_out); */
+ err = inflate(&isf->c_stream, Z_NO_FLUSH);
+ /* TRACE68(zlib_cat,"(%d,%d)", isf->c_stream.avail_in, isf->c_stream.avail_out); */
+
+ if (err == Z_STREAM_END) {
+ /* TRACE68(zlib_cat," Z_STREAM_END\n"); */
+ if (isf->gzip) {
+ unsigned char data8;
+
+ err = isf_read_buffer(isf, data, 8);
+ if (err >= 4) {
+ isf->gz_crc32 = data0
+ | (data1<<8)
+ | (data2<<16)
+ | (data3<<24);
+ }
+ if (err >= 8) {
+ isf->gz_len = data4
+ | (data5<<8)
+ | (data6<<16)
+ | (data7<<24);
+ }
+
+ /* TRACE68(zlib_cat,"Total In : %8d\n" */
+ /* "Total Out : %8d\n" */
+ /* "Crc32 : %08X\n" */
+ /* "Gzip-Size : %8d\n", */
+ /* isf->c_stream.total_in, */
+ /* isf->c_stream.total_out, */
+ /* isf->gz_crc32, */
+ /* isf->gz_len); */
+ }
+ err = 0;
+ break;
+ } else if (err == Z_OK) {
+ /* TRACE68(zlib_cat," Z_STREAM_OK\n"); */
+ err = 0;
+ } else {
+ /* TRACE68(zlib_cat,"Z_ERROR:%s\n", isf->c_stream.msg); */
+ break;
+ }
+
+ }
+
+ n = isf->c_stream.next_out - isf->buffer_out;
+ if (isf->gzip) {
+ isf->c_crc32 = crc32(isf->c_crc32, isf->buffer_out, n);
+ /* TRACE68(zlib_cat,"CRC32:%08X\n",isf->c_crc32); */
+ }
+
+ return err
+ ? -1
+ : n;
+}
+
+/* Deflate as much as possible.
+ * @return Number of byte
+ */
+static int isf_deflate_buffer(vfs68_z_t * isf, int finish)
+{
+ int err = 0, mia, zeof;
+ const int z_flush_mode = finish ? Z_FINISH : Z_NO_FLUSH;
+
+ /* fake zeof to avoid flushing */
+ zeof = (z_flush_mode != Z_FINISH);
+
+ isf->c_stream.next_in = isf->buffer_in;
+ isf->c_stream.avail_in = isf->write_in - isf->buffer_in;
+
+ /* Loop while there is data to compress ... */
+ while (!zeof || isf->c_stream.avail_in) {
+ /* TRACE68(zlib_cat,"%sDEFLATE: (%d:%d/%d:%d) ", */
+ /* finish ? "F-" : "", */
+ /* isf->c_stream.next_in - isf->buffer_in, */
+ /* isf->c_stream.avail_in, */
+ /* isf->c_stream.next_out - isf->buffer_out, */
+ /* isf->c_stream.avail_out); */
+
+ /* Flush output buffer and win a fresh one. */
+ err = isf_flush_output_buffer(isf);
+ if (err == -1) {
+ /* TRACE68(zlib_cat,"\n"); */
+ return -1;
+ }
+
+ /* Do the deflate thing */
+ /* TRACE68(zlib_cat,"(%d:%d/%d:%d), deflate->", */
+ /* isf->c_stream.next_in - isf->buffer_in, */
+ /* isf->c_stream.avail_in, */
+ /* isf->c_stream.next_out - isf->buffer_out, */
+ /* isf->c_stream.avail_out); */
+ {
+ Byte * start = isf->c_stream.next_in;
+ int len = isf->c_stream.avail_in;
+ err = deflate(&isf->c_stream, z_flush_mode);
+ if (isf->gzip) {
+ isf->c_crc32 = crc32(isf->c_crc32, start, len-isf->c_stream.avail_in);
+ }
+ }
+ /* TRACE68(zlib_cat,"(%d:%d/%d:%d) ", */
+ /* isf->c_stream.next_in - isf->buffer_in, */
+ /* isf->c_stream.avail_in, */
+ /* isf->c_stream.next_out - isf->buffer_out, */
+ /* isf->c_stream.avail_out); */
+
+ if (err == Z_STREAM_END) {
+ /* Zlib tell us this is the end my friend ?? */
+ /* TRACE68(zlib_cat,"Z_STREAM_END!! "); */
+ err = isf_flush_output_buffer(isf) == -1;
+ zeof = 1;
+ break;
+ }
+ if (err != Z_OK) {
+ /* TRACE68(zlib_cat,"Z_ERROR(%d:%s)\n", err, isf->c_stream.msg); */
+ err = -1;
+ break;
+ } else {
+ err = 0;
+ /* TRACE68(zlib_cat,"Z_OK "); */
+ }
+ }
+
+ /* Are there "Missing In Action" bytes in the input buffer ? */
+ mia = isf->c_stream.avail_in;
+ /* TRACE68(zlib_cat,"MIA:%d\n", mia); */
+
+ isf->write_in = isf->buffer_in + mia;
+ if (mia > 0) {
+ Byte * src = isf->c_stream.next_in;
+ int i;
+ for (i=0; i<mia; ++i) {
+ isf->buffer_ini = srci;
+ }
+ }
+
+ return err
+ ? -1
+ : sizeof(isf->buffer_in) - mia;
+}
+
+
+static int isf_close(vfs68_t * vfs)
+{
+ vfs68_z_t * isf = (vfs68_z_t *)vfs;
+ int err = -1;
+
+ /* TRACE68(zlib_cat,"vfs68_z: close(%s) {\n", */
+ /* vfs68_filename(vfs)); */
+
+ if (isf) {
+ err = isf->is_err;
+
+ if (isf->deflate) {
+ /* TRACE68(zlib_cat,"DEFLATED "); */
+ isf->deflate = 0;
+ if (!err) {
+ err = isf_deflate_buffer(isf, 1) == -1;
+ }
+ /* TRACE68(zlib_cat,"in:%d out:%d ", */
+ /* isf->c_stream.total_in,isf->c_stream.total_out); */
+ /* if (isf->gzip) { */
+ /* TRACE68(zlib_cat,"crc:%08X ",isf->c_crc32); */
+ /* } */
+ if (!err) {
+ int i, c, t;
+ unsigned char hd8;
+ for (i=0, c=isf->c_crc32, t=isf->c_stream.total_in;
+ i<4;
+ ++i, c>>=8, t>>=8) {
+ hd0+i = (unsigned char)c;
+ hd4+i = (unsigned char)t;
+ }
+ err = vfs68_write(isf->is, hd, 8) != 8;
+ }
+ deflateEnd(&isf->c_stream);
+ }
+
+ if (isf->inflate) {
+ /* TRACE68(zlib_cat,"INFLATED "); */
+ /* if (isf->gzip) { */
+ /* TRACE68(zlib_cat,"crc:%08X/%08X ", */
+ /* isf->c_crc32,isf->gz_crc32); */
+ /* } */
+ inflateEnd(&isf->c_stream);
+ isf->inflate = 0;
+ }
+
+ if (isf->is_slave)
+ err |= vfs68_close(isf->is);
+ }
+
+ /* TRACE68(zlib_cat, " => %s\n", strok68(err)); */
+ /* TRACE68(zlib_cat, "vfs_z: close '%s' => %s\n", */
+ /* vfs68_filename(vfs), strok68(err)); */
+ return err;
+}
+
+static int isf_open(vfs68_t * vfs)
+{
+ vfs68_z_t * isf = (vfs68_z_t *)vfs;
+ int err;
+
+ if (!isf->is || isf->inflate || isf->deflate) {
+ return -1;
+ }
+
+ memset(&isf->c_stream, 0 , sizeof(isf->c_stream));
+ isf->c_stream.zalloc = isf_zcalloc;
+ isf->c_stream.zfree = isf_zcfree;
+ isf->c_stream.opaque = 0;/* vfs->context; */
+
+ isf->c_crc32 = crc32(0, 0, 0);
+ isf->pos = 0;
+ isf->length = -1;
+ isf->write_in = isf->c_stream.next_in = isf->buffer_in;
+ isf->read_out = isf->c_stream.next_out = isf->buffer_out;
+
+ err = (isf->is_slave)
+ ? vfs68_open(isf->is)
+ : 0
+ ;
+
+ if (!err) {
+ switch (isf->mode) {
+
+ case VFS68_OPEN_READ:
+ if (isf->gzip) {
+ err = isf_read_gz_header(isf)
+ || inflateInit2(&isf->c_stream, -MAX_WBITS) != Z_OK;
+ } else {
+ err = inflateInit(&isf->c_stream) != Z_OK;
+ }
+ isf->inflate = !err;
+
+ break;
+
+ case VFS68_OPEN_WRITE: {
+ int level = isf->level;
+ if (level > Z_BEST_COMPRESSION) {
+ level = Z_DEFAULT_COMPRESSION;
+ }
+ if (isf->gzip) {
+ err = Z_OK != deflateInit2(&isf->c_stream, level, Z_DEFLATED,
+ -MAX_WBITS, DEF_MEM_LEVEL, isf->strategy)
+ || isf_write_gz_header(isf);
+ } else {
+ err = Z_OK != deflateInit2(&isf->c_stream, level, Z_DEFLATED,
+ MAX_WBITS, DEF_MEM_LEVEL, isf->strategy);
+ }
+ isf->deflate = !err;
+ isf->length = 0;
+ } break;
+ default:
+ err = -1;
+ }
+ }
+
+ if (err) {
+ isf_close(vfs);
+ err = -1;
+ }
+
+ /* msg68_info("vfs_z: open(%s) => %s\n", */
+ /* vfs68_filename(vfs), strok68(err)); */
+ return err;
+}
+
+
+static int isf_read(vfs68_t * vfs, void * data, int n)
+{
+ vfs68_z_t * isf = (vfs68_z_t *)vfs;
+ int bytes;
+
+ if (!isf->inflate) {
+ return -1;
+ } else if (!n) {
+ return 0;
+ }
+
+ for (bytes=n; bytes>0;) {
+ int n;
+
+ n = isf->c_stream.next_out - isf->read_out;
+
+ if (!n) {
+ n = isf_inflate_buffer(isf);
+ if (n == -1) {
+ return -1;
+ }
+ if (!n) {
+ break;
+ }
+ }
+ if (n > bytes) {
+ n = bytes;
+ }
+ memcpy (data, isf->read_out, n);
+ data = (char *) data + n;
+ isf->read_out += n;
+ isf->pos += n;
+ bytes -= n;
+ }
+ return n - bytes;
+}
+
+static int isf_write(vfs68_t * vfs, const void * data, int n)
+{
+ vfs68_z_t * isf = (vfs68_z_t *)vfs;
+ int bytes;
+
+ if (!isf->deflate) {
+ return -1;
+ } else if (!n) {
+ return 0;
+ }
+
+ for (bytes=n; bytes>0;) {
+ int n;
+
+ /* Get number of byte free in the input buffer. */
+ n = isf->buffer_in + sizeof(isf->buffer_in) - isf->write_in;
+ if (!n) {
+ /* No more bytes, it is time to compress and write some. */
+ n = isf_deflate_buffer(isf,0);
+ if (n == -1) {
+ return -1;
+ }
+ if (!n) {
+ break;
+ }
+ }
+ if (n > bytes) {
+ n = bytes;
+ }
+ memcpy (isf->write_in, data, n);
+ data = (char *) data + n;
+ isf->write_in += n;
+ isf->pos += n;
+ bytes -= n;
+ }
+
+ return n - bytes;
+}
+
+static int isf_flush(vfs68_t * vfs)
+{
+ /* vfs68_z_t * isf = (vfs68_z_t *)vfs; */
+ /* $$$ TODO */
+ return 0;
+}
+
+static int isf_length(vfs68_t * vfs)
+{
+ vfs68_z_t * isf = (vfs68_z_t *)vfs;
+
+ return (!isf)
+ ? -1
+ : isf->length;
+}
+
+static int isf_tell(vfs68_t * vfs)
+{
+ vfs68_z_t * isf = (vfs68_z_t *)vfs;
+ return (!isf)
+ ? -1
+ : isf->pos;
+}
+
+static int isf_seek(vfs68_t * vfs, int offset)
+{
+ vfs68_z_t * isf = (vfs68_z_t *)vfs;
+ int pos;
+
+ if (!isf ) {
+ return -1;
+ }
+ pos = isf->pos + offset;
+ if (pos < 0 || (isf->length != -1 && pos > isf->length)) {
+ return -1;
+ }
+ isf->pos = pos;
+ return 0;
+}
+
+static void isf_destroy(vfs68_t * vfs)
+{
+ vfs68_z_t * isf = (vfs68_z_t *)vfs;
+ if (isf->is_slave)
+ vfs68_destroy(isf->is);
+
+ /* call free handler even with NUL pointer since we
+ never know what free68() do. */
+ free(vfs);
+}
+
+static const vfs68_t vfs68_z = {
+ isf_name,
+ isf_open, isf_close,
+ isf_read, isf_write, isf_flush,
+ isf_length, isf_tell, isf_seek, isf_seek,
+ isf_destroy
+};
+
+
+vfs68_t * vfs68_z_create(vfs68_t * is, int mode,
+ const vfs68_z_option_t opt)
+{
+ vfs68_z_t * isf = 0;
+
+ if (!is) {
+ msg68_error("vfs68_z: create -- no slave stream\n");
+ goto out;
+ }
+
+ if (!(1&(mode^(mode>>1)))) {
+ msg68_error("vfs68_z: create -- invalid mode (%c%c)\n",
+ (mode&1)?'R':'.', (mode&2)?'W':'.');
+ goto out;
+ }
+
+ isf = calloc(sizeof(vfs68_z_t),1);
+ if (!isf) {
+ msg68_error("vfs68_z: create -- alloc error\n");
+ goto out;
+ }
+
+ /* Copy vfs functions. */
+ memcpy(&isf->vfs, &vfs68_z, sizeof(vfs68_z));
+ /* Setup */
+ isf->is = is;
+ isf->mode = mode & VFS68_OPEN_MASK;
+ isf->is_slave = mode >> VFS68_SLAVE_BIT;
+ isf->length = -1;
+ isf->org_pos = vfs68_tell(is);
+ /* Setup gzip option. */
+ isf->gzip = opt.gzip;
+ isf->level = opt.level;
+ isf->strategy = opt.strategy;
+ isf->gz_name = opt.name;
+
+ /* TRACE68(zlib_cat, */
+ /* "vfs68_z: create '%s' mode:%c gz:%c level:%d name:%c\n", */
+ /* vfs68_filename(isf->is), (mode&1)?'R':'W', */
+ /* isf->gzip?'Y':'N', isf->level, isf->gz_name?'Y':'N'); */
+
+out:
+ return (vfs68_t *) isf;
+}
+
+#else /* #ifndef USE_Z */
+
+# include "file68_vfs_z.h"
+
+/* vfs Z must not be include in this package. Anyway the creation
+ * function still exists but it always returns an error.
+ */
+
+vfs68_t * vfs68_z_create(vfs68_t * is, int mode,
+ const vfs68_z_option_t opt)
+{
+ msg68_error("zlib68: create -- *NOT SUPPORTED*\n");
+ return 0;
+}
+
+#endif /* #ifndef USE_Z */
+
+int vfs68_z_init(void)
+{
+#ifdef USE_Z
+ zlib_cat = msg68_cat("zlib","Zlib VFS",DEBUG_ZLIB_O);
+#endif
+ return 0;
+}
+
+void vfs68_z_shutdown(void)
+{
+#ifdef USE_Z
+ if (zlib_cat > 0) {
+ msg68_cat_free(zlib_cat);
+ zlib_cat = msg68_NEVER;
+ }
+#endif
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/in_sc68.c Added

@@ -0,0 +1,430 @@
+/*
+ in_sc68 (Atari ST SNDH YM2149) input plugin for deadbeef
+ Copyright (C) 2015 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
+#include "sc68/sc68.h"
+
+#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+
+#define min(x,y) ((x)<(y)?(x):(y))
+
+static DB_decoder_t plugin;
+static DB_functions_t *deadbeef;
+
+typedef struct {
+ DB_fileinfo_t info;
+ sc68_t *sc68;
+ int trk;
+ int loop;
+ uint64_t currentsample;
+ uint64_t totalsamples;
+} in_sc68_info_t;
+
+static const char * exts = { "sndh", "snd", "sc68", NULL };
+
+// allocate codec control structure
+static DB_fileinfo_t *
+in_sc68_open (uint32_t hints) {
+ in_sc68_info_t *info = calloc (1, sizeof (in_sc68_info_t));
+ return &info->info;
+}
+
+// prepare to decode the track, fill in mandatory plugin fields
+// return -1 on failure
+static int
+in_sc68_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ in_sc68_info_t *info = (in_sc68_info_t *)_info;
+
+ info->sc68 = sc68_create(0);
+ if (!info->sc68) {
+ return -1;
+ }
+
+ // Load an sc68 file.
+ deadbeef->pl_lock ();
+ const char *fname = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ int res = sc68_load_uri(info->sc68, fname);
+
+ if (res) {
+ return -1;
+ }
+
+ info->trk = deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0);
+ sc68_music_info_t ti;
+ res = sc68_music_info (info->sc68, &ti, info->trk+1, 0);
+ if (res < 0) {
+ return -1;
+ }
+ info->loop = ti.trk.time_ms == 0;
+
+ int samplerate = deadbeef->conf_get_int ("c68.samplerate", 44100);
+// sc68_cntl (info->sc68, SC68_SET_OPT_STR, "sampling_rate", samplerate);
+ if (ti.trk.time_ms > 0) {
+ info->totalsamples = (uint64_t)ti.trk.time_ms * samplerate / 1000;
+ }
+ else {
+ info->totalsamples = deadbeef->conf_get_float ("c68.songlength", 2) * 60 * samplerate;
+ }
+
+ ddb_playlist_t *plt = deadbeef->pl_get_playlist (it);
+ deadbeef->plt_set_item_duration (plt, it, (float)info->totalsamples/samplerate);
+ deadbeef->plt_unref (plt);
+
+ _info->plugin = &plugin;
+ _info->fmt.bps = 16;
+ _info->fmt.channels = 2;
+ _info->fmt.samplerate = samplerate;
+ _info->fmt.channelmask = DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT;
+ _info->readpos = 0;
+
+ sc68_play (info->sc68, info->trk+1, info->loop);
+ return 0;
+}
+
+// free everything allocated in _init
+static void
+in_sc68_free (DB_fileinfo_t *_info) {
+ in_sc68_info_t *info = (in_sc68_info_t *)_info;
+ if (info) {
+ if (info->sc68) {
+ sc68_destroy (info->sc68);
+ }
+ free (info);
+ }
+}
+
+
+// try decode `size' bytes
+// return number of decoded bytes
+// or 0 on EOF/error
+static int
+in_sc68_read (DB_fileinfo_t *_info, char *bytes, int size) {
+ in_sc68_info_t *info = (in_sc68_info_t *)_info;
+ if (info->currentsample >= info->totalsamples) {
+ return 0;
+ }
+ info->currentsample += size / (_info->fmt.channels * _info->fmt.bps/8);
+ int initsize = size;
+ while (size > 0) {
+ int n = size>>2;
+ int res = sc68_process(info->sc68, bytes, &n);
+ if (res & SC68_END) {
+ break;
+ }
+ size -= n<<2;
+ }
+ return initsize-size;
+}
+
+// seek to specified sample (frame)
+// return 0 on success
+// return -1 on failure
+static int
+in_sc68_seek_sample (DB_fileinfo_t *_info, int sample) {
+ in_sc68_info_t *info = (in_sc68_info_t *)_info;
+
+ if (sample < info->currentsample) {
+ sc68_stop (info->sc68);
+ sc68_play (info->sc68, info->trk+1, info->loop);
+ info->currentsample = 0;
+ }
+
+ char buffer512*4;
+ while (info->currentsample < sample) {
+ int sz = (int)(sample - info->currentsample);
+ sz = min (sz, sizeof (buffer)>>2);
+ int res = sc68_process(info->sc68, buffer, &sz);
+ if (res & SC68_END) {
+ break;
+ }
+ info->currentsample += sz;
+ }
+ _info->readpos = (float)info->currentsample / _info->fmt.samplerate;
+ return 0;
+}
+
+// seek to specified time in seconds
+// return 0 on success
+// return -1 on failure
+static int
+in_sc68_seek (DB_fileinfo_t *_info, float time) {
+ return in_sc68_seek_sample (_info, time * _info->fmt.samplerate);
+}
+
+static void
+in_c68_meta_from_music_info (DB_playItem_t *it, sc68_music_info_t *ti, int trk) {
+ deadbeef->pl_delete_all_meta (it);
+
+ const char *ft = "sc68";
+
+ deadbeef->pl_replace_meta (it, ":FILETYPE", ft);
+ // add metainfo
+ if (!ti->title || !ti->title0) {
+ // title is empty, this call will set track title to filename without extension
+ deadbeef->pl_add_meta (it, "title", NULL);
+ }
+ else {
+ deadbeef->pl_add_meta (it, "title", ti->title);
+ }
+
+ if (ti->artist && ti->artist0) {
+ deadbeef->pl_add_meta (it, "artist", ti->artist);
+ }
+
+ if (ti->album && ti->album0) {
+ deadbeef->pl_add_meta (it, "album", ti->album);
+ }
+
+ if (ti->genre && ti->genre0) {
+ deadbeef->pl_add_meta (it, "genre", ti->genre);
+ }
+
+ if (ti->year && ti->year0) {
+ deadbeef->pl_add_meta (it, "year", ti->year);
+ }
+
+ if (ti->format && ti->format0) {
+ deadbeef->pl_add_meta (it, "SC68_FORMAT", ti->format);
+ }
+
+ if (ti->ripper && ti->ripper0) {
+ deadbeef->pl_add_meta (it, "SC68_RIPPER", ti->ripper);
+ }
+
+ if (ti->converter && ti->converter0) {
+ deadbeef->pl_add_meta (it, "SC68_CONVERTER", ti->converter);
+ }
+
+ deadbeef->pl_set_meta_int (it, ":TRACKNUM", trk);
+}
+
+// read information from the track
+// load/process cuesheet if exists
+// insert track into playlist
+// return track pointer on success
+// return NULL on failure
+
+static DB_playItem_t *
+in_sc68_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+#if 0
+ // open file
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
+ trace ("in_sc68: failed to fopen %s\n", fname);
+ return NULL;
+ }
+#endif
+
+ sc68_t *sc68;
+ if (sc68 = sc68_create(0), !sc68) {
+ return NULL;
+ }
+
+ // Load an sc68 file.
+ if (sc68_load_uri(sc68, fname)) {
+ return NULL;
+ }
+
+ sc68_music_info_t di;
+ memset (&di, 0, sizeof (di));
+ int err = sc68_music_info (sc68, &di, 0, 0);
+ if (err < 0) {
+ sc68_destroy (sc68);
+ return NULL;
+ }
+
+ int samplerate = deadbeef->conf_get_int ("c68.samplerate", 44100);
+ for (int tr = 0; tr < di.tracks; tr++) {
+ sc68_music_info_t ti;
+ memset (&ti, 0, sizeof (ti));
+ int err = sc68_music_info (sc68, &ti, tr+1, 0);
+ if (err < 0) {
+ continue;
+ }
+
+ uint64_t totalsamples;
+ if (ti.trk.time_ms > 0) {
+ totalsamples = (uint64_t)ti.trk.time_ms * samplerate / 1000;
+ }
+ else {
+ totalsamples = deadbeef->conf_get_float ("c68.songlength", 2) * 60 * samplerate;
+ }
+
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+
+ deadbeef->plt_set_item_duration (plt, it, (float)totalsamples/samplerate);
+
+ in_c68_meta_from_music_info (it, &ti, tr);
+
+ // now the track is ready, insert into playlist
+ after = deadbeef->plt_insert_item (plt, after, it);
+ deadbeef->pl_item_unref (it);
+ }
+
+ sc68_destroy (sc68);
+ return after;
+}
+
+static int
+in_sc68_read_metadata (DB_playItem_t *it) {
+ sc68_t *sc68 = sc68_create(0);
+ if (!sc68) {
+ return -1;
+ }
+
+ // Load an sc68 file.
+ deadbeef->pl_lock ();
+ const char *fname = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ int res = sc68_load_uri (sc68, fname);
+
+ if (res) {
+ return -1;
+ }
+
+ int trk = deadbeef->pl_find_meta_int (it, ":TRACKNUM", 0);
+ sc68_music_info_t ti;
+ res = sc68_music_info (sc68, &ti, trk+1, 0);
+ if (res < 0) {
+ sc68_destroy (sc68);
+ return -1;
+ }
+
+ in_c68_meta_from_music_info (it, &ti, trk);
+
+ return 0;
+}
+
+static int
+in_sc68_start (void) {
+ // do one-time plugin initialization here
+ // e.g. starting threads for background processing, subscribing to events, etc
+ // return 0 on success
+ // return -1 on failure
+
+ if (sc68_init(0)) {
+ sc68_shutdown ();
+ return -1;
+ }
+
+ char datadirPATH_MAX;
+ snprintf (datadir, sizeof (datadir), "%s/data68", deadbeef->get_system_dir (DDB_SYS_DIR_PLUGIN_RESOURCES));
+ sc68_cntl (0, SC68_SET_OPT_STR, "share-path", datadir);
+
+ return 0;
+}
+
+static int
+in_sc68_stop (void) {
+ // undo everything done in _start here
+ // return 0 on success
+ // return -1 on failure
+ sc68_shutdown ();
+ return 0;
+}
+
+static const char settings_dlg =
+"property \"Default song length (in minutes)\" entry c68.songlength 2;\n" // 0..1440
+"property \"Samplerate\" entry c68.samplerate 44100;\n" // 6000-50000
+"property \"Skip when shorter than (sec)\" entry c68.skip_time 4;\n" // 4..86400
+;
+
+// define plugin interface
+static DB_decoder_t plugin = {
+ DB_PLUGIN_SET_API_VERSION
+ .plugin.version_major = 0,
+ .plugin.version_minor = 1,
+ .plugin.type = DB_PLUGIN_DECODER,
+ .plugin.name = "SC68 player (Atari ST SNDH YM2149)",
+ .plugin.id = "in_sc68",
+ .plugin.descr = "SC68 player (Atari ST SNDH YM2149)",
+ .plugin.copyright = 
+ "in_sc68 (Atari ST SNDH YM2149) input plugin for deadbeef\n"
+ "Copyright (C) 2015 Oleksiy Yakovenko\n"
+ "based on sc68 library, see below for more information\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\n"
+ "\n"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\n"
+ "\n"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\n"
+ "\n"
+ "3. This notice may not be removed or altered from any source distribution.\n"
+ "\n"
+ "\n"
+ "\n"
+ "sc68 - Atari ST and Amiga music player\n"
+ "Copyright (C) 1998-2015 Benjamin Gerard\n"
+ "<ben@sashipa.com>\n"
+ "<http://sashipa.ben.free.fr/sc68/>\n"
+ "<http://sourceforge.net/projects/sc68/>\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 as\n"
+ "published by the Free Software Foundation, either version 3 of the\n"
+ "License, or (at your option) any later version.\n"
+ "\n"
+ "This program is distributed in the hope that it will be useful, but\n"
+ "WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"
+ "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.\n"
+ "\n"
+ "If not, see <http://www.gnu.org/licenses/>.\n",
+ .plugin.start = in_sc68_start,
+ .plugin.stop = in_sc68_stop,
+ .plugin.configdialog = settings_dlg,
+ .open = in_sc68_open,
+ .init = in_sc68_init,
+ .free = in_sc68_free,
+ .read = in_sc68_read,
+ .seek = in_sc68_seek,
+ .seek_sample = in_sc68_seek_sample,
+ .read_metadata = in_sc68_read_metadata,
+ .insert = in_sc68_insert,
+ .exts = exts,
+};
+
+DB_plugin_t *
+in_sc68_load (DB_functions_t *api) {
+ deadbeef = api;
+ return DB_PLUGIN (&plugin);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/api68.c Added

@@ -0,0 +1,2717 @@
+/*
+ * @file api68.c
+ * @brief sc68 API
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "io68/default.h"
+#include <sc68/file68_vfs.h> /* Need vfs68.h before sc68.h */
+
+/* libsc68 includes */
+#include "sc68.h"
+#include "mixer68.h"
+#include "conf68.h"
+#include "dial68/dial68.h"
+
+#ifndef HAVE_BASENAME
+#include "libc68.h"
+#endif
+
+/* libsc68 emulators includes */
+#include "emu68/emu68.h"
+#include "emu68/excep68.h"
+#include "emu68/ioplug68.h"
+#include "io68/io68.h"
+
+/* file68 includes */
+#include <sc68/file68.h>
+#include <sc68/file68_err.h>
+#include <sc68/file68_str.h>
+#include <sc68/file68_uri.h>
+#include <sc68/file68_rsc.h>
+#include <sc68/file68_msg.h>
+#include <sc68/file68_opt.h>
+
+/* stardard includes */
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <errno.h>
+
+#ifdef HAVE_LIBGEN_H
+#include <libgen.h>
+#endif
+
+#define MK4CC(A,B,C,D) (((int)(A)<<24)|((int)(B)<<16)|((int)(C)<<8)|((int)(D)))
+
+
+/* Bunch of constant use by sc68
+ */
+enum {
+ /* Internal use for get_pos() and set_pos() */
+ SC68_POS_PLAY, SC68_POS_TRACK, SC68_POS_DISK,
+ /* Exception handler to catch badly initialized exceptions */
+ INTR_ADDR = 0x800,
+ /* TOS emulator */
+ TRAP_ADDR = 0x1000,
+ /* # of instructions for music play code */
+ TRAP_MAX_INST = 10000u,
+ /* Vector used for sc68 special function break */
+ BRKP_VECTOR = TRAP_VECTOR(0),
+ /* Special value for sc68 special functions */
+ BRKP_MAGIC = 0x5C68DB60,
+ /* # of instructions for music play code */
+ PLAY_MAX_INST = 1000000u,
+ /* # of instructions for music init code */
+ INIT_MAX_INST = 10000000u,
+ /* default music time in seconds */
+ TIME_DEF = 3 * 60,
+ /* sc68_t magic identifier value. */
+ SC68_MAGIC = MK4CC('s','c','6','8'),
+ /* disk68_t magic identifier value. */
+ DISK_MAGIC = SC68_DISK_ID,
+ /* Error message maximum length */
+ ERRMAX = 96,
+ /* Default amiga blend */
+ AGA_BLEND = 0x50,
+ /* Option "force-loop" off */
+ CFG_LOOP_OFF = 0,
+ /* Option "force-loop" infinite */
+ CFG_LOOP_INF = -1,
+};
+
+/* Hardware table */
+static const char * hwtable8 = {
+ "none",
+ "Yamaha-2149",
+ "MicroWire (STE)",
+ "Yamaha-2149 & MicroWire (STE)",
+ "Amiga/Paula",
+ "Yamaha-2149 & Amiga/Paula",
+ "MicroWire (STE) & Amiga/Paula",
+ "Yamaha-2149 & MicroWire (STE) & Amiga/Paula",
+};
+
+/* Atari-ST trap emulator (see trap.s)
+ */
+static u8 trap_func = {
+#include "sc68/trap68.h"
+};
+
+/* Atari-ST trap categories
+ */
+static const char * trap_name16 =
+{ "sc68","gemdos",0,0,0,0,0,0,0,0,0,0,0,"bios","xbios",0 };
+
+/** Init flags, */
+static struct init_flags initflags;
+/* struct { */
+/* unsigned int load_oninit : 1; */
+/* unsigned int save_onexit : 1; */
+/* } initflags; */
+
+/** sc68 config */
+static struct {
+ unsigned int loaded : 1;
+ unsigned int allow_remote: 1;
+#ifdef WITH_FORCE_HW
+ unsigned int force_hw : 1;
+#endif
+ int aga_blend;
+#ifdef WITH_FORCE
+ int force_track;
+ int force_loop;
+#endif
+ int asid;
+ int def_time_ms;
+ int spr;
+} config;
+
+/** sc68 instance. */
+struct _sc68_s {
+ int magic; /**< magic identifier. */
+ char name16; /**< short name. */
+ int version; /**< sc68 version. */
+ void * cookie; /**< User private data. */
+ emu68_parms_t emu68_parms; /**< 68k emulator parameters. */
+
+/* Keep the following in that order !!!!
+ * {
+ */
+ emu68_t * emu68; /**< 68k emulator instance. */
+ io68_t *ymio,*mwio,*shifterio,*paulaio,*mfpio;
+/* } */
+
+ ym_t * ym; /**< YM emulator. */
+ mw_t * mw; /**< MicroWire emulator. */
+ paula_t * paula; /**< Amiga emulator. */
+
+ int tobe3; /**< free disk memory be release on close. */
+ const disk68_t * disk; /**< Current loaded disk. */
+ const music68_t * mus; /**< Current playing music. */
+ int track; /**< Current playing track. */
+ int track_to; /**< Track to set (0:n/a, -1:end req). */
+ int loop_to; /**< Loop to set (0:default -1:infinite). */
+ int asid; /**< aSIDifier flags. */
+ int asid_timers; /**< timer assignment 4cc (0:not asid). */
+#ifdef WITH_FORCE
+ int cfg_track; /**< from config "force-track". */
+ int cfg_loop; /**< from config "force-loop". */
+#endif
+
+ unsigned int playaddr; /**< Current play address in 68 memory. */
+ int seek_to; /**< Seek to this time (-1:n/a) */
+ int remote; /**< Allow remote access. */
+
+ struct {
+ int org_ms;
+ int len_ms;
+ } tinfoSC68_MAX_TRACK+1;
+
+/** Playing time info. */
+ struct {
+ unsigned int def_ms; /**< default time in ms. */
+ unsigned int origin_ms; /**< elapsed ms at track origin. */
+ unsigned int elapsed_ms; /**< elapsed ms since track start. */
+ } time;
+
+/** IRQ handler. */
+ struct {
+ int pc; /**< value of PC for last IRQ. */
+ int sr; /**< value of sr for lasr IRQ. */
+ int vector; /**< what was the last IRQ type. */
+ int sysfct; /**< Last gemdos/bios/xbios function */
+ } irq;
+
+/** Mixer info struture. */
+ struct
+ {
+ unsigned int spr; /**< Sampling rate in hz. */
+ u32 * buffer; /**< Current PCM buffer. */
+ int bufpos; /**< Current PCM position. */
+ int bufmax; /**< buffer allocated size. */
+ int bufreq; /**< Required buffer size for track. */
+ int buflen; /**< PCM count in buffer. */
+ int stdlen; /**< Default number of PCM per pass. */
+ unsigned int cycleperpass; /**< Number of 68K cycles per pass. */
+ int aga_blend; /**< Amiga LR blend factor 0..65535. */
+
+ unsigned int pass_count; /**< Pass counter. */
+ unsigned int loop_count; /**< Loop counter. */
+ unsigned int pass_total; /**< Total number of pass. */
+ unsigned int loop_total; /**< Total number of loop (0:infinite). */
+ unsigned int pass_2loop; /**< Number of pass before next loop. */
+ unsigned int pass_3loop; /**< Reset pass_2loop after a loop. */
+
+ } mix;
+
+ sc68_minfo_t info; /**< Disk and track info struct. */
+
+/* Error message */
+ const char * errstr; /**< Last error message. */
+ char errbufERRMAX; /**< For non-static error message. */
+};
+
+#ifndef DEBUG_SC68_O
+# ifndef DEBUG
+# define DEBUG_SC68_O 0
+# else
+# define DEBUG_SC68_O 1
+# endif
+#endif
+
+int sc68_cat = msg68_NEVER;
+int dial_cat = msg68_NEVER;
+static int sc68_id; /* counter for auto generated name */
+static volatile int sc68_init_flag; /* Library init flag */
+static int sc68_spr_def = SPR_DEF;
+static int dbg68k;
+static const char not_available = SC68_NOFILENAME;
+static char appname16 = "sc68";
+static char sc68_errstrERRMAX;
+
+/***********************************************************************
+ * Forward declarations
+ **********************************************************************/
+
+static void sc68_debug(sc68_t * sc68, const char * fmt, ...) FMT23;
+static int error_addx(sc68_t * sc68, const char * fmt, ...) FMT23;
+static int error_add(sc68_t * sc68, const char * fmt, const char *);
+static int get_spr(const sc68_t * sc68);
+static int set_spr(sc68_t * sc68, int hz);
+static int get_asid(const sc68_t * sc68);
+static int set_asid(sc68_t * sc68, int asid);
+static int can_asid(const sc68_t * sc68, int track);
+static int get_pcm_fmt(sc68_t * sc68);
+static int set_pcm_fmt(sc68_t * sc68, int pcmfmt);
+static int get_pos(sc68_t * sc68, int origin);
+static sc68_disk_t get_dt(sc68_t * sc68, int * ptr_track, sc68_disk_t disk);
+static int calc_disk_len(const disk68_t * disk, const int loop);
+static unsigned int calc_track_len(const disk68_t * d, int track, int loop);
+static unsigned int calc_pos(sc68_t * const sc68);
+static void music_info(sc68_t * sc68, sc68_music_info_t * f,
+ const disk68_t * d, int track, int loops);
+
+/***********************************************************************
+ * Check functions
+ **********************************************************************/
+
+static inline const char * ok_int(const int err) {
+ return !err ? "success" : "failure";
+}
+
+static inline const char * never_null(const char * ptr) {
+ return ptr ? ptr : "(nil)";
+}
+
+static inline int overlap(unsigned a, unsigned na, unsigned b, unsigned nb)
+{
+ na += a; nb += b;
+ return a <= b ? na > b : nb > a;
+}
+
+static inline int is_magic(const sc68_t * const sc68) {
+ return sc68->magic == SC68_MAGIC;
+}
+
+static inline int is_sc68(const sc68_t * const sc68) {
+ return sc68 && is_magic(sc68);
+}
+
+static inline int null_or_sc68(const sc68_t * const sc68) {
+ return !sc68 || is_magic(sc68);
+}
+
+static inline int is_disk(const disk68_t * const disk) {
+ return disk && disk->magic == DISK_MAGIC;
+}
+
+static inline int null_or_disk(const disk68_t * const disk) {
+ return !disk || disk->magic == DISK_MAGIC;
+}
+
+static inline int has_disk(const sc68_t * const sc68) {
+ return is_sc68(sc68) && is_disk(sc68->disk);
+}
+
+static inline int in_range(const disk68_t * disk, const int track) {
+ return track > 0 && track <= disk->nb_mus;
+}
+
+static inline int has_track(const sc68_t * const sc68, const int track) {
+ return has_disk(sc68) && in_range(sc68->disk, track);
+}
+
+static inline int in_disk(const disk68_t * disk, const int track) {
+ return is_disk(disk) && in_range(disk, track);
+}
+
+static inline int trk_can_asid(const music68_t * const m)
+{
+ return 1
+ && (m->hwflags & SC68_PSG)
+ && (m->hwflags & SC68_XTD)
+ && !(m->hwflags & (SC68_MFP_TA|SC68_MFP_TB|SC68_MFP_TC|SC68_MFP_TD))
+ ;
+}
+
+/***********************************************************************
+ * Convenience functions
+ **********************************************************************/
+
+#ifndef EXTENSION_SEP
+# define EXTENSION_SEP '.'
+#endif
+static void appname_from_path(char *path, char * appname, int max)
+{
+ char * e, *s;
+ int len;
+
+ appname0 = 0;
+ if (!path || !*path) return;
+ s = basename(path);
+ e = strrchr(s,EXTENSION_SEP);
+ if (!e || e == s)
+ len = strlen(s);
+ else
+ len = e - s;
+ if (len >= max)
+ len = max-1;
+ strncpy(appname, s, len);
+ appnamelen = 0;
+}
+
+
+/***********************************************************************
+ * Emulators functions
+ **********************************************************************/
+
+static int stream_read_68k(sc68_t * sc68, unsigned int dest,
+ vfs68_t * is, unsigned int sz)
+{
+ u8 * mem68 = emu68_memptr(sc68->emu68, dest, sz);
+
+ if (!mem68)
+ return error_addx(sc68,
+ "libsc68: %s -- %s\n",
+ "vfs error", emu68_error_get(sc68->emu68));
+ return (vfs68_read(is, mem68, sz) == sz) ? 0 : -1;
+}
+
+static int init_emu68(int * argc, char ** argv)
+{
+ int err;
+
+ /* Initialize emu68 */
+ err = emu68_init(argc, argv);
+ if (err) {
+ error_add(0, "libsc68: %s\n","emu68 library *FAILED*");
+ goto error;
+ }
+
+ /* Initialize chipset */
+ err = io68_init(argc, argv);
+ if (err) {
+ error_add(0, "libsc68: %s\n","chipset library *FAILED*");
+ goto error;
+ }
+
+ TRACE68(sc68_cat,
+ "libsc68: %s\n",
+ "68k and chipset emulator initialized");
+
+error:
+ return err;
+}
+
+static void safe_io68_destroy(io68_t **pio)
+{
+ io68_destroy(*pio);
+ *pio = 0;
+}
+
+static void safe_emu68_destroy(emu68_t **pemu)
+{
+ emu68_destroy(*pemu);
+ *pemu = 0;
+}
+
+static void safe_destroy(sc68_t * sc68)
+{
+ assert(sc68);
+ emu68_ioplug_unplug_all(sc68->emu68);
+ safe_io68_destroy(&sc68->ymio);
+ safe_io68_destroy(&sc68->mwio);
+ safe_io68_destroy(&sc68->shifterio);
+ safe_io68_destroy(&sc68->paulaio);
+ safe_io68_destroy(&sc68->mfpio);
+ safe_emu68_destroy(&sc68->emu68);
+ TRACE68(sc68_cat,
+ "libsc68: %s\n",
+ "68k and chipset emulators destroyed");
+}
+
+#define Bpeek(EMU68,ADDR) emu68_peek((EMU68), (ADDR))
+
+static u16 Wpeek(emu68_t* const emu68, addr68_t addr)
+{
+ return (u16) ( ( (u16) Bpeek(emu68, addr+0) << 8 ) |
+ ( (u16) Bpeek(emu68, addr+1) ) );
+}
+
+static u32 Lpeek(emu68_t* const emu68, addr68_t addr)
+{
+ return (u32) ( ( (u32) Bpeek(emu68, addr+0) << 24 ) |
+ ( (u32) Bpeek(emu68, addr+1) << 16 ) |
+ ( (u32) Bpeek(emu68, addr+2) << 8 ) |
+ ( (u32) Bpeek(emu68, addr+3) ) );
+}
+
+/* Timer awareness */
+void except_name(const int vector, char * irqname)
+{
+ int c = 0;
+ switch (vector * 4) {
+ case 0x134: c = 'A'; break;
+ case 0X120: c = 'B'; break;
+ case 0X114: c = 'C'; break;
+ case 0X110: c = 'D'; break;
+ default: c = 0;
+ }
+ if (c)
+ sprintf(irqname,"timer-%c", c);
+ else
+ emu68_exception_name(vector,irqname);
+}
+
+
+/* Exception handler (runs when emu68 runs in debug mode (--sc68-dbg68k=1).
+ *
+ * It's default behaviour is to dump the exception and to break
+ * execution. That will generate an error later in the simulation loop.
+ *
+ * HW-trace and MFP timer interrupts are ignored.
+ *
+ * Know trace vectors (gemdos/xbios/bios) are dumped but not breaked.
+ *
+ */
+static void irqhandler(emu68_t* const emu68, int vector, void * cookie)
+{
+ static u8 thex16 = {
+ '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'
+ };
+
+ sc68_t* sc68 = cookie;
+ char irqname32;
+ const char * stname;
+ int dumpex, savest, subvec;
+ u32 sr, pc, text;
+
+ /* Store last interruption */
+ sc68->irq.pc = emu68->inst_pc; /* or real register values ? */
+ sc68->irq.sr = emu68->inst_sr; /* or real register values ? */
+ sc68->irq.vector = vector;
+
+ /* Exit those really fast as they happen quiet a lot, specially
+ * HWTRACE_VECTOR that happem every single instruction. */
+ if ( vector == HWTRACE_VECTOR ||
+ vector == 0x134/4 /* Timer-A */ ||
+ vector == 0X120/4 /* Timer-B */ ||
+ vector == 0X114/4 /* Timer-C */ ||
+ vector == 0X110/4 /* Timer-D */ )
+ return;
+
+ /* Get exception fancy name */
+ except_name(vector,irqname);
+
+ /* Init vars */
+ stname = emu68_status_name(emu68->status);
+ text = 0; /* Debug text */
+ subvec = 0; /* Trap number and whatnot */
+ dumpex = 1; /* Dump */
+ savest = emu68->status; /* Save emulator status */
+
+ switch (savest) {
+ case EMU68_NRM:
+ /* Assume break, set back to NRM only if the exception is known */
+ emu68->status = EMU68_BRK;
+ break;
+
+ case EMU68_STP:
+ case EMU68_BRK:
+ case EMU68_HLT:
+ case EMU68_ERR:
+ case EMU68_XCT:
+ default:
+ break;
+ }
+
+ /***********************************************************************
+ * Retrieve exception source (both pc and sr)
+ */
+ if ( vector < 0x100 ) {
+ /* normal vectors, get sr and pc from the stack */
+ sc68->irq.sr = sr = Wpeek(emu68, emu68->reg.a7);
+ sc68->irq.pc = pc = Lpeek(emu68, emu68->reg.a7+2);
+
+ if (vector >= TRAP_VECTOR(0) && vector <= TRAP_VECTOR(15)) {
+ subvec = vector - TRAP_VECTOR(0);
+ vector = TRAP_VECTOR(0);
+ if (!subvec) {
+ /* might be a breakpoint */
+ uint_t fct = Lpeek(emu68, emu68->reg.a7+6);
+ if ( (fct & ~0xF) == BRKP_MAGIC ) {
+ text = Lpeek(emu68, emu68->reg.a7+10);
+ TRACE68(sc68_cat,
+ "libsc68: !!! BREAKPOINT: $%08X/$%06X\n", fct, text);
+ /* It's magic !! */
+ switch (sc68->irq.sysfct = fct & 0xF) {
+ case 0: /* function 0: just print */
+ case 1: /* function 1: break on debug */
+ emu68->status = savest; /* no break */
+ break;
+ default:
+ break;
+ }
+ }
+ } else if (trap_namesubvec) {
+ sc68->irq.sysfct = Wpeek(emu68, emu68->reg.a7+6) & 0xFFFF;
+ emu68->status = savest; /* Known trap: no break */
+ }
+ }
+ } else {
+ /* Special emu68 vectors, just grab cpu's reg as-is */
+ sr = emu68->reg.sr;
+ pc = emu68->reg.pc;
+
+ if (vector >= HWBREAK_VECTOR && vector < HWTRACE_VECTOR) {
+ subvec = vector - HWBREAK_VECTOR;
+ vector = HWBREAK_VECTOR;
+ }
+
+ switch (vector) {
+ case HWSTOP_VECTOR:
+ if ( (sr & 0x3F00) == 0x2F00 ) {
+ /* SR bit#11 (always 0) is used by our special code to catch
+ * Unitialized exception. The exception vector issued a stop
+ * #$2FNN instruction with NN being the exception vector
+ * number.
+ */
+ const int num = sr & 0xFF;
+ addr68_t vaddr;
+ strcpy(irqname,"NC-");
+ vaddr = Lpeek(sc68->emu68, num * 4);
+ if (vaddr != INTR_ADDR + num * 8)
+ strcpy(irqname,"CH-");
+ except_name(num,irqname+3);
+ sr = Wpeek(emu68, emu68->reg.a7);
+ pc = Lpeek(emu68, emu68->reg.a7+2);
+ error_addx(sc68,
+ "libsc68: non-catch exception #%d (%s) from %06x",
+ num, irqname, pc);
+ emu68->status = EMU68_HLT;
+ } else {
+ emu68->status = EMU68_STP;
+ }
+
+ case HWBREAK_VECTOR: case HWINSTOV_VECTOR:
+ break;
+
+ case HWINIT_VECTOR:
+ dumpex = 0;
+ case HWHALT_VECTOR:
+ case HWRESET_VECTOR:
+ /* Recieve the reset vector when reset instruction has just been
+ * executed, in our case it happen in the uninitialized
+ * exception catcher code. */
+ emu68->status = EMU68_HLT;
+ break;
+
+ case HWTRACE_VECTOR:
+ default:
+ assert(!"Invalid hardware vector");
+ break;
+
+ }
+ }
+
+ /***********************************************************************
+ * Dump exception context
+ */
+ if (dumpex) {
+ u8 * memptr = emu68_memptr(sc68->emu68,0,0);
+ const addr68_t msk = emu68->memmsk;
+ const addr68_t adr = emu68->reg.a7 & emu68->memmsk;
+ const addr68_t bot = emu68->memmsk+1-16;
+ char line16 * 3;
+ int i, j, l = strlen(irqname);
+
+ if (vector == ILLEGAL_VECTOR)
+ sprintf(irqname+l, "#$%02x-%02x",
+ memptrpc&emu68->memmsk, memptr(pc+1)&emu68->memmsk);
+ else if (vector == TRAP_VECTOR(0) && trap_namesubvec)
+ sprintf(irqname, "%s(%d) ($%02x)",
+ trap_namesubvec, sc68->irq.sysfct, sc68->irq.sysfct);
+
+ /* dump cpu status */
+ msg68x(sc68_cat, sc68,
+ "libsc68: 68k interruption -- emu68<%s> sc68<%s>\n"
+ " status: in:%s out:%s\n"
+ " intr: #%02x+%02x %s\n"
+ " from: pc:%08x sr:%04x\n"
+ " regs: pc:%08x sr:%04x\n"
+ " d0:%08x d1:%08x d2:%08x d3:%08x\n"
+ " d4:%08x d5:%08x d6:%08x d7:%08x\n"
+ " a0:%08x a1:%08x a2:%08x a3:%08x\n"
+ " a4:%08x a5:%08x a6:%08x a7:%08x\n",
+ emu68->name, sc68->name,
+ stname, emu68_status_name(emu68->status),
+ vector, subvec, irqname,
+ pc, sr,
+ emu68->reg.pc, emu68->reg.sr,
+ emu68->reg.d0, emu68->reg.d1,
+ emu68->reg.d2, emu68->reg.d3,
+ emu68->reg.d4, emu68->reg.d5,
+ emu68->reg.d6, emu68->reg.d7,
+ emu68->reg.a0, emu68->reg.a1,
+ emu68->reg.a2, emu68->reg.a3,
+ emu68->reg.a4, emu68->reg.a5,
+ emu68->reg.a6, emu68->reg.a7);
+
+ /* dump stack */
+ line0 = 0;
+ for (i = 0, j = 0; adr+i < bot && i<0x80; ++i) {
+ int v = memptradr+i;
+
+ linej+0 = thexv >> 4;
+ linej+1 = thexv & 15;
+ if (j != 3*15) {
+ linej+2 = '-';
+ j += 3;
+ } else {
+ linej+2 = 0;
+ msg68x(sc68_cat,sc68,
+ " %-6x: %s\n", (unsigned) adr + (i & ~15), line);
+ j = 0;
+ }
+ }
+ if (j) {
+ linej-1 = 0;
+ msg68x(sc68_cat,sc68,
+ " %-6x: %s\n", (unsigned) adr + (i & ~15), line);
+ }
+
+ /* dump debug message */
+ if (text) {
+ char tmp256;
+ for (i = 0; i < sizeof(tmp)-1 && (tmpi = memptr(text+i)&msk); ++i)
+ ;
+ tmpi = 0;
+ msg68x(sc68_cat, sc68, "\nlibsc68: %s\n\n", tmp);
+ }
+ }
+}
+
+static int init68k(sc68_t * sc68, int log2mem, int emu68_debug)
+{
+ int err = -1;
+ emu68_parms_t * const parms = &sc68->emu68_parms;
+
+ if (sc68->emu68)
+ safe_destroy(sc68);
+
+ /* setup parameters. */
+ parms->name = "sc68/emu68";
+ parms->log2mem = log2mem;
+ parms->clock = EMU68_ATARIST_CLOCK;
+ parms->debug = emu68_debug & 1;
+
+ TRACE68(sc68_cat,
+ "libsc68: init 68k -- '%s' mem:%d-bit(%dkB) clock:%uhz debug:%s\n",
+ parms->name,
+ parms->log2mem,parms->log2mem>10?1<<(parms->log2mem-10):0,
+ parms->clock,parms->debug?"On":"Off");
+
+ /* Do initialization. */
+ sc68->emu68 = emu68_create(parms);
+ if (!sc68->emu68) {
+ error_add(sc68, "libsc68: %s\n", "68k emulator creation failed");
+ goto error;
+ }
+
+ TRACE68(sc68_cat,
+ "libsc68: init 68k -- %s\n",
+ "CPU emulator created");
+
+ /* Install cookie and interruption handler (debug mode only). */
+ emu68_set_handler(sc68->emu68, (emu68_debug & 1) ? irqhandler : 0);
+ emu68_set_cookie(sc68->emu68, sc68);
+
+ /* Some invalid values. */
+ sc68->irq.sysfct = -1;
+ sc68->irq.sr = -1;
+ sc68->irq.vector = -1;
+ sc68->irq.pc = 0xDEADDAD1;
+
+ /* Setup critical 68K registers (SR and SP) */
+ sc68->emu68->reg.sr = 0x2000;
+ sc68->emu68->reg.a7 = sc68->emu68->memmsk+1-4;
+
+ /* Initialize chipset */
+ sc68->ymio = ymio_create(sc68->emu68,0);
+ sc68->ym = ymio_emulator(sc68->ymio);
+ if (!sc68->ymio) {
+ error_add(sc68,"libsc68: %s","YM-2149 creation failed");
+ goto error;
+ }
+ TRACE68(sc68_cat,
+ "libsc68: %s\n",
+ "init 68k -- chipset -- YM-2149");
+
+ sc68->mwio = mwio_create(sc68->emu68,0);
+ sc68->mw = mwio_emulator(sc68->mwio);
+ if (!sc68->mwio) {
+ error_add(sc68,"libsc68: %s\n", "STE-MW creation failed");
+ goto error;
+ }
+
+ TRACE68(sc68_cat,
+ "libsc68: %s\n",
+ "init 68k -- chipset -- STE-MW");
+
+ sc68->shifterio = shifterio_create(sc68->emu68,0);
+ if (!sc68->shifterio) {
+ error_add(sc68,"libsc68: %s\n","Atari Shifter creation failed");
+ goto error;
+ }
+
+ TRACE68(sc68_cat,
+ "libsc68: %s\n",
+ "init 68k -- chipset -- ST shifter");
+
+ sc68->paulaio = paulaio_create(sc68->emu68,0);
+ sc68->paula = paulaio_emulator(sc68->paulaio);
+ if (!sc68->paulaio) {
+ error_add(sc68,"libsc68: %s\n","create Paula emulator failed");
+ goto error;
+ }
+
+ TRACE68(sc68_cat,
+ "libsc68: %s\n",
+ "init 68k -- chipset -- Amiga Paula");
+
+ sc68->mfpio = mfpio_create(sc68->emu68);
+ if (!sc68->mfpio) {
+ error_add(sc68,"libsc68: %s\n","MK-68901 creation failed");
+ goto error;
+ }
+
+ TRACE68(sc68_cat,
+ "libsc68: %s\n",
+ "init 68k -- chipset -- MFP");
+
+ err = 0;
+error:
+ if (err)
+ safe_destroy(sc68);
+
+ TRACE68(sc68_cat,
+ "libsc68: init 68k -- %s\n",
+ strok68(err));
+
+ return err;
+}
+
+/***********************************************************************
+ * Config functions
+ **********************************************************************/
+
+/* Get integer config vaue.
+ * - just command line if available
+ * - else get the value from the config file
+ * - fallback to default otherwise.
+ */
+static int optcfg_get_int(const char * name, int def)
+{
+ option68_t * opt = option68_get(name, opt68_ALWAYS);
+ if (opt && opt->type != opt68_STR) {
+ if (opt->org == opt68_UDF)
+ option68_iset(opt,def,opt68_ALWAYS,opt68_CFG);
+ if (opt->org != opt68_UDF)
+ return opt->val.num;
+ }
+ return def;
+}
+
+#if 0
+/* Get string config value
+ * @optcfg_get_int for details,
+ */
+static const char * optcfg_get_str(const char * name, const char * def)
+{
+ option68_t * opt = option68_get(name, opt68_ISSET);
+ const char * v = def;
+
+ if (opt) {
+ switch (opt->type) {
+ case opt68_STR:
+ v = opt->val.str;
+ break;
+ case opt68_ENU:
+ v = opt->val.num(const char **)opt->set;
+ break;
+ }
+ }
+ return v;
+}
+#endif
+
+#if 0
+static void optcfg_set_int(const char * name, int v)
+{
+ option68_t * opt = option68_get(name, opt68_ALWAYS);
+ option68_iset(opt, v, opt68_ALWAYS, opt68_APP);
+}
+
+static void optcfg_set_str(const char * name, const char * v)
+{
+ option68_t * opt = option68_get(name, opt68_ALWAYS);
+ option68_set(opt, v, opt68_ALWAYS);
+}
+#endif
+
+static void config_default(void)
+{
+ memset(&config,0,sizeof(config));
+ config.allow_remote = 1;
+ config.aga_blend = AGA_BLEND;
+#ifdef WITH_FORCE
+ config.force_loop = CFG_LOOP_DEF;
+#endif
+ config.def_time_ms = TIME_DEF * 1000;
+ config.spr = SPR_DEF;
+}
+
+#define set_CONFIG(KEY,NAME) config.KEY = optcfg_get_int(NAME,config.KEY)
+
+/* Load config for this application. */
+static int config_load(const char * appname)
+{
+ int err;
+
+ config_default();
+ err = config68_load(appname);
+ config.loaded = !err;
+
+ set_CONFIG(allow_remote,"allow-remote");
+ set_CONFIG(aga_blend,"amiga-blend");
+#ifdef WITH_FORCE
+ set_CONFIG(force_track,"force-track");
+ set_CONFIG(force_loop,"force-loop");
+#endif
+#ifdef WITH_FORCE_HW
+ set_CONFIG(force_hw,"force-hw");
+#endif
+ set_CONFIG(asid,"asid");
+ config.def_time_ms = optcfg_get_int("default-time", TIME_DEF) * 1000;
+ set_CONFIG(spr,"sampling-rate");
+
+ sc68_debug(0,"libsc68: load config -- %s\n", strok68(err));
+ return err;
+}
+
+/* Save config for this application. */
+static int config_save(const char * appname)
+{
+ int err
+ = config68_save(appname);
+ sc68_debug(0,"libsc68: save config -- %s\n", strok68(err));
+ return err;
+}
+
+#if 0
+/* Update config values with current sc68 ones. */
+static void config_update(const sc68_t * sc68)
+{
+ if (is_sc68(sc68)) {
+ config.allow_remote = sc68->remote;
+ config.aga_blend = sc68->mix.aga_blend >> 8;
+#ifdef WITH_FORCE
+ config.force_track = sc68->cfg_track < 0 ? 0 : sc68->cfg_track;
+ if (sc68->cfg_loop == SC68_INF_LOOP)
+ config.force_loop = CFG_LOOP_INF;
+ else if (sc68->cfg_loop == SC68_DEF_LOOP)
+ config.force_loop = CFG_LOOP_DEF;
+ else if (sc68->cfg_loop > 0)
+ config.force_loop = sc68->cfg_loop;
+#endif
+
+ /* config.asid = sc68->cfg_asid & (SC68_ASID_ON|SC68_ASID_FORCE); */
+ /* if (config.asid == (SC68_ASID_ON|SC68_ASID_FORCE)) */
+ /* config.asid = SC68_ASID_FORCE; */
+
+ config.def_time_ms = sc68->time.def_ms;
+ config.spr = sc68->mix.spr;
+ }
+
+ if (config.loaded) {
+ optcfg_set_int("allow-remote", !!config.allow_remote);
+ optcfg_set_int("amiga-blend", config.aga_blend);
+#ifdef WITH_FORCE
+ optcfg_set_int("force-track", config.force_track);
+ optcfg_set_int("force-loop", config.force_loop);
+#endif
+#ifdef WITH_FORCE_HW
+ optcfg_set_int("force-hw", config.force_hw);
+#endif
+ optcfg_set_int("asid", config.asid);
+ optcfg_set_int("default-time", (config.def_time_ms+999) / 1000u);
+ optcfg_set_int("sampling-rate", config.spr);
+ }
+
+ TRACE68(sc68_cat, "libsc68: %s\n", "config updated");
+}
+
+#endif
+
+static int aga_blend(int v)
+{
+ v -= 128;
+ return ((v << 8) | (-(v&1)&255)) + 0x8000;
+}
+
+/* Apply config to sc68 instance. */
+static void config_apply(sc68_t * sc68)
+{
+ if (is_sc68(sc68)) {
+ sc68->remote = config.allow_remote;
+
+ /* $$$ HAXX: reloading because it might have changed. */
+ config.aga_blend = optcfg_get_int("amiga-blend", AGA_BLEND);
+ sc68->mix.aga_blend = aga_blend(config.aga_blend);
+#ifdef WITH_FORCE
+ sc68->cfg_track = SC68_DEF_TRACK;
+ if (config.force_track > 0)
+ sc68->cfg_track = config.force_track;
+ sc68->cfg_loop = SC68_DEF_LOOP;
+ if (config.force_loop == CFG_LOOP_INF)
+ sc68->cfg_loop = SC68_INF_LOOP;
+ else if (config.force_loop > 0)
+ sc68->cfg_loop = config.force_loop;
+#endif
+ /* sc68->cfg_asid = config.asid; */
+ sc68->time.def_ms = config.def_time_ms;
+ sc68->mix.spr = config.spr;
+ TRACE68(sc68_cat,
+ "libsc68: sc68<%s> %s\n",
+ sc68->name, "config applied");
+ }
+}
+
+/* HAXXX: should be eval when a message category is added/removed */
+static void eval_debug(void)
+{
+ static option68_t * opt;
+ /* HaXXX: force a call "debug" callback. */
+ if (!opt)
+ opt = option68_get("debug", opt68_ALWAYS);
+ if (opt && opt->org != opt68_UDF) {
+ int org = opt->org;
+ char * s = strdup(opt->val.str);
+ if (s) {
+ option68_unset(opt);
+ option68_set(opt, s, opt68_ALWAYS, org);
+ free(s);
+ }
+ }
+}
+
+
+/***********************************************************************
+ * API functions
+ **********************************************************************/
+
+int sc68_init(sc68_init_t * init)
+{
+ int err = -1;
+ option68_t * opt;
+ sc68_init_t dummy_init;
+
+ static option68_t debug_options = {
+ OPT68_BOOL("sc68-","dbg68k","sc68","run m68K in debug mode",0,0)
+ };
+
+ /* Just a stupid test to check if this host arythmetic unit use 2's
+ * complement as signed representation of negative numbers.
+ *
+ * It should always be the case but we never know. So many things in
+ * sc68 rely on that specially in the 68k emulators there is not a
+ * chance it works properly otherwise.
+ */
+ assert( -1 == ~0 );
+ if ( -1 != ~0 ) {
+ err = error_add(0, "libsc68: %s\n",
+ "internal error (negative are not 2's complement)");
+ goto error_no_shutdown;
+ }
+
+ if (sc68_init_flag) {
+ err = error_add(0, "libsc68: %s\n","already initialized");
+ goto error_no_shutdown;
+ }
+ sc68_errstr0 = 0;
+
+ if (!init) {
+ memset(&dummy_init, 0, sizeof(dummy_init));
+ init = &dummy_init;
+ }
+ sc68_cat = msg68_cat("sc68", "sc68 library",DEBUG_SC68_O);
+ dial_cat = msg68_cat("dialog","sc68 dialogs",DEBUG_SC68_O);
+
+ /* Set debug handler and filters. */
+ msg68_set_handler((msg68_t)init->msg_handler);
+ msg68_set_cookie(0);
+ msg68_cat_filter(init->debug_clr_mask,init->debug_set_mask);
+
+ /* Get application name. */
+ appname0 = 0;
+ if (init->argc > 0 && init->argv)
+ appname_from_path(init->argv0, appname, sizeof(appname));
+ if (!appname0)
+ strcpy(appname,"sc68");
+ if (init->argc > 0 && init->argv)
+ init->argv0 = appname;
+
+ /* Intialize file68. */
+ init->argc = file68_init(init->argc, init->argv);
+ eval_debug();
+
+ /* Init config module. */
+ init->argc = config68_init(init->argc, init->argv);
+ eval_debug();
+ config_default();
+
+ /* Setup init flags. */
+ initflags = init->flags;
+
+ /* Add and parse local options. */
+ option68_append(debug_options,sizeof(debug_options)/sizeof(*debug_options));
+ init->argc = option68_parse(init->argc, init->argv);
+
+ /* Initialize emulators. */
+ err = init_emu68(&init->argc, init->argv);
+ eval_debug();
+
+ /* Load config */
+ if (!initflags.no_load_config)
+ config_load(appname);
+ else
+ sc68_debug(0,"libsc68: don't load config as requested\n");
+
+
+ /* Set default sampling rate. */
+ set_spr(0, SC68_SPR_DEFAULT);
+
+ opt = option68_get("dbg68k", opt68_ISSET);
+ dbg68k = opt ? opt->val.num : 0;
+
+ sc68_init_flag = !err;
+
+ if (err) {
+ sc68_shutdown();
+ }
+error_no_shutdown:
+ sc68_debug(0,"libsc68: initialized as '%s' -- %s\n", appname, ok_int(err));
+ return -!!err;
+}
+
+void sc68_shutdown(void)
+{
+ /* Save config unless it was not loaded or application requested
+ * otherwise. */
+ if (!config.loaded && !initflags.no_save_config)
+ config_save(appname);
+ else
+ sc68_debug(0,"libsc68: don't save config as requested\n");
+
+ if (sc68_init_flag) {
+ sc68_init_flag = 0;
+ file68_shutdown();
+ config68_shutdown(); /* always after file68_shutdown() */
+ }
+ sc68_debug(0,"libsc68: shutdowned -- %s\n",ok_int(0));
+
+ msg68_cat_free(sc68_cat); sc68_cat = msg68_NEVER;
+ msg68_cat_free(dial_cat); dial_cat = msg68_NEVER;
+}
+
+sc68_t * sc68_create(sc68_create_t * create)
+{
+ sc68_t * sc68 = 0;
+ sc68_create_t dummy_create;
+
+ if (!create) {
+ memset(&dummy_create, 0, sizeof(dummy_create));
+ create = &dummy_create;
+ }
+
+ /* Alloc SC68 struct. */
+ sc68 = calloc(sizeof(sc68_t),1);
+ if (!sc68)
+ goto error;
+
+ /* Set magic */
+ sc68->magic = SC68_MAGIC;
+
+ /* User private data. */
+ sc68->cookie = create->cookie;
+
+ /* Pick a short name */
+ if (create->name) {
+ strncpy(sc68->name, create->name, sizeof(sc68->name));
+ } else {
+ snprintf(sc68->name,sizeof(sc68->name),"sc68#%02d",++sc68_id);
+ }
+ sc68->namesizeof(sc68->name)-1 = 0;
+
+ /* Apply config */
+ config_apply(sc68);
+
+ /* Override config. */
+ if (create->sampling_rate) {
+ sc68->mix.spr = create->sampling_rate;
+ }
+ if (!sc68->mix.spr) {
+ sc68->mix.spr = sc68_spr_def;
+ }
+ if (!sc68->time.def_ms) {
+ sc68->time.def_ms = TIME_DEF * 1000;
+ }
+
+ /* aSIDifier. */
+ switch (config.asid) {
+ case SC68_ASID_ON:
+ sc68->asid = SC68_ASID_ON; break;
+ case SC68_ASID_FORCE: case SC68_ASID_ON | SC68_ASID_FORCE:
+ sc68->asid = SC68_ASID_ON | SC68_ASID_FORCE; break;
+ case SC68_ASID_OFF:
+ default:
+ sc68->asid = SC68_ASID_OFF; break;
+ }
+ TRACE68(sc68_cat,"libsc68: config-asid=%d asid-flags=%d\n",
+ config.asid,sc68->asid);
+
+ /* Create 68k emulator and pals. */
+ if (init68k(sc68, create->log2mem, create->emu68_debug | dbg68k)) {
+ goto error;
+ }
+
+ /* Set IO chipsets sampling rates */
+ sc68->mix.spr = set_spr(sc68, sc68->mix.spr);
+ if (sc68->mix.spr <= 0) {
+ error_addx(sc68, "libsc68: %s\n", "invalid sampling rate");
+ goto error;
+ }
+ create->sampling_rate = sc68->mix.spr;
+ sc68_debug(sc68,"libsc68: sampling rate -- *%dhz*\n", create->sampling_rate);
+
+ /* Finally gets all pathes. */
+ /* rsc68_get_path(&init->shared_path, */
+ /* &init->user_path, */
+ /* &init->lmusic_path, */
+ /* &init->rmusic_path); */
+
+ /* debugmsg68(-1,"sc68_create: shared-path=%s\n",init->shared_path); */
+ /* debugmsg68(-1,"sc68_create: user-path=%s\n",init->user_path); */
+ /* debugmsg68(-1,"sc68_create: music-path=%s\n",init->lmusic_path); */
+ /* debugmsg68(-1,"sc68_create: music-rpath=%s\n",init->rmusic_path); */
+
+ /* sc68_unic = sc68; */
+
+ sc68_debug(0,"libsc68: sc68<%s> create -- %s\n", sc68->name, ok_int(0));
+ return sc68;
+
+error:
+ sc68_destroy(sc68);
+ sc68 = 0;
+ sc68_debug(sc68,"libsc68: create -- %s\n", ok_int(-1));
+ return 0;
+}
+
+void sc68_destroy(sc68_t * sc68)
+{
+ if (is_sc68(sc68)) {
+ free(sc68->mix.buffer);
+ sc68_close(sc68);
+ safe_destroy(sc68);
+ sc68_debug(sc68,"libsc68: sc68<%s> destroyed\n", sc68->name);
+ free(sc68);
+ } else {
+ assert(!sc68); /* catch bad magic */
+ }
+}
+
+static int get_spr(const sc68_t * sc68)
+{
+ return sc68 ? sc68->mix.spr : sc68_spr_def;
+}
+
+static int set_spr(sc68_t * sc68, int hz)
+{
+ if (hz == SC68_SPR_QUERY)
+ hz = get_spr(sc68);
+ else {
+ const int min = SPR_MIN;
+ const int max = SPR_MAX;
+ const int def = SPR_DEF;
+ if (hz == SC68_SPR_DEFAULT)
+ hz = def;
+ if (hz < min) hz = min;
+ if (hz > max) hz = max;
+ if (sc68) {
+ hz = ymio_sampling_rate(sc68->ymio, hz);
+ hz = mwio_sampling_rate(sc68->mwio, hz);
+ hz = paulaio_sampling_rate(sc68->paulaio, hz);
+ sc68->mix.spr = hz;
+ } else {
+ sc68_spr_def = hz;
+ }
+ }
+ return hz;
+}
+
+static int get_pcm_fmt(sc68_t * sc68)
+{
+ return SC68_PCM_S16;
+}
+
+static int set_pcm_fmt(sc68_t * sc68, int pcmfmt)
+{
+ return -(pcmfmt != SC68_PCM_S16);
+}
+
+static int get_asid(const sc68_t * sc68)
+{
+ return sc68 ? sc68->asid : config.asid;
+}
+
+static int dsk_can_asid(const disk68_t * const d)
+{
+ int i, k;
+ for (k=i=0; i<d->nb_mus; ++i)
+ k += trk_can_asid(d->mus + i);
+ return k;
+}
+
+static int can_asid(const sc68_t * sc68, int track)
+{
+ assert(is_sc68(sc68));
+
+ if (!is_disk(sc68->disk))
+ return -1;
+ if (track == SC68_DSK_TRACK)
+ return dsk_can_asid(sc68->disk);
+ if (track == SC68_CUR_TRACK)
+ track = sc68->track;
+ if (in_range(sc68->disk,track))
+ return trk_can_asid(sc68->disk->mus + track - 1);
+ return -1;
+}
+
+static int set_asid(sc68_t * sc68, int asid)
+{
+ if (sc68) {
+ if (asid & SC68_ASID_FORCE)
+ asid |= SC68_ASID_ON;
+ sc68->asid = asid &= ~ (1 << (sizeof(int)*8-1));
+ } else {
+ if (asid & SC68_ASID_FORCE)
+ asid = SC68_ASID_FORCE;
+ else if (asid & SC68_ASID_ON)
+ asid = SC68_ASID_ON;
+ else
+ asid = SC68_ASID_OFF;
+ config.asid = asid;
+ }
+ return asid;
+}
+
+static inline unsigned int fr_to_ms(unsigned int frames, unsigned int hz) {
+ return (unsigned int) ( (u64)frames * 1000u / hz );
+}
+
+static inline unsigned int ms_to_fr(unsigned int ms, unsigned int hz) {
+ return (unsigned int) ( (u64)ms * hz / 1000u );
+}
+
+static void stop_track(sc68_t * sc68, const int real_stop)
+{
+ assert(sc68);
+ assert(sc68->disk);
+
+ if (sc68->mix.buflen) {
+ msg68_warning("libsc68: discard data -- *%d pcm*\n", sc68->mix.buflen);
+ }
+
+ sc68->mus = 0;
+ sc68->track = 0;
+ sc68->seek_to = -1;
+ sc68->track_to = 0;
+
+ if (real_stop) {
+ sc68->loop_to = 0; /* keep the loop_to for all tracks */
+ sc68->time.origin_ms = 0;
+ } else {
+ sc68->time.origin_ms += sc68->time.elapsed_ms;
+ TRACE68(sc68_cat,
+ "libsc68: %s -- *%d ms*\n",
+ "new track origin is", sc68->time.origin_ms);
+ }
+
+ sc68->time.elapsed_ms = 0;
+ sc68->mix.pass_count = 0;
+ sc68->mix.loop_count = 0;
+ sc68->mix.bufpos = 0;
+ sc68->mix.buflen = 0;
+}
+
+static int finish(sc68_t * sc68, addr68_t pc, int sr, uint68_t maxinst)
+{
+ int status;
+ emu68_t * const emu68 = sc68->emu68;
+
+ emu68->reg.pc = pc;
+ emu68->reg.sr = sr;
+ emu68->reg.a7 = emu68->memmsk+1-16;
+ emu68_pushl(emu68, 0);
+
+ status = emu68_finish(emu68, maxinst);
+ while (status == EMU68_STP) {
+ sc68_debug(sc68,
+ "libsc68: stop #$%04X ignored @$%X\n",
+ emu68->reg.sr, emu68->reg.pc);
+ status = emu68_finish(emu68, EMU68_CONT);
+ }
+
+ if (status != EMU68_NRM) {
+ char irqname32;
+ const char * s;
+
+ /* Might have some error stacked in emu68. */
+ while (s = emu68_error_get(emu68), s)
+ error_addx(sc68,"libsc68: %s\n", s);
+
+ if (status == EMU68_HLT && (emu68->reg.sr & 0X3F00) == 0X2F00) {
+ addr68_t vaddr;
+
+ sc68->irq.vector = emu68->reg.sr & 0xFF;
+ strcpy(irqname,"NC-"); /* Non-Catched Exception */
+ except_name(sc68->irq.vector,irqname+3);
+ vaddr = Lpeek(emu68, sc68->irq.vector * 4);
+ if (sc68->irq.sr == -1) {
+ sc68->irq.sr = Wpeek(emu68, emu68->reg.a7);
+ sc68->irq.pc = Lpeek(emu68, emu68->reg.a7+2);
+ }
+ if (vaddr != INTR_ADDR + sc68->irq.vector * 8)
+ strcpy(irqname,"CH-");
+ if (sc68->irq.vector >= TRAP_VECTOR(0) &&
+ sc68->irq.vector <= TRAP_VECTOR(15)) {
+ int n = sc68->irq.vector-TRAP_VECTOR(0);
+ if (trap_namen)
+ sprintf(irqname+3, "%s-$%X", trap_namen, sc68->irq.sysfct);
+ }
+ } else if (status == EMU68_BRK && !emu68->instructions) {
+ strcpy(irqname,"inst-overflow");
+ } else {
+ except_name(sc68->irq.vector,irqname);
+ }
+ error_addx(sc68,
+ "libsc68: pass#%d @$%X"
+ " %s (%02X)"
+ " $%X/$%04X irq#%d (%s) @$%X\n",
+ sc68->mix.pass_count, (unsigned) pc,
+ emu68_status_name(status), status,
+ (unsigned) emu68->reg.pc, (unsigned) emu68->reg.sr,
+ sc68->irq.vector, irqname, (unsigned) sc68->irq.pc);
+ }
+ return status;
+}
+
+static int reset_emulators(sc68_t * sc68, const hwflags68_t hw)
+{
+ u8 * memptr;
+ const int base = INTR_ADDR;
+ int i;
+
+ assert(sc68);
+ assert(sc68->emu68);
+ assert(hw);
+
+ emu68_ioplug_unplug_all(sc68->emu68);
+ emu68_mem_reset(sc68->emu68);
+
+ if (hw & SC68_AGA) {
+ TRACE68(sc68_cat," -> %s\n","add Paula hardware");
+ emu68_ioplug(sc68->emu68, sc68->paulaio);
+ TRACE68(sc68_cat," -> %s\n","set PAULA as interruptible");
+ emu68_set_interrupt_io(sc68->emu68, sc68->paulaio);
+ } else {
+ if (hw & SC68_PSG) {
+ TRACE68(sc68_cat," -> %s\n","add YM hardware");
+ emu68_ioplug(sc68->emu68, sc68->ymio);
+ }
+ if (hw & (SC68_DMA|SC68_LMC)) {
+ TRACE68(sc68_cat," -> %s\n","add MW (STE) hardware");
+ emu68_ioplug(sc68->emu68, sc68->mwio);
+ }
+ TRACE68(sc68_cat," -> %s\n","add SHIFTER hardware");
+ emu68_ioplug(sc68->emu68, sc68->shifterio);
+ TRACE68(sc68_cat," -> %s\n","add MFP hardware");
+ emu68_ioplug(sc68->emu68, sc68->mfpio);
+ TRACE68(sc68_cat," -> %s\n","set MFP as interruption");
+ emu68_set_interrupt_io(sc68->emu68, sc68->mfpio);
+ }
+ emu68_reset(sc68->emu68);
+
+ /* disable that we should not need it */
+ if (emu68_debugmode(sc68->emu68)) {
+ TRACE68(sc68_cat," -> %s\n","clear 68k memory");
+ emu68_memset(sc68->emu68,0,0,0);
+ /* This is done by emu68_reset() */
+ /* emu68_chkset(sc68->emu68,0,0,0); */
+ }
+ else
+ /* Clear system variables */
+ emu68_memset(sc68->emu68,0x400,0,INTR_ADDR-0x400);
+
+ memptr = emu68_memptr(sc68->emu68,0,0x1000);
+
+ TRACE68(sc68_cat," -> exception detection code @$%06x\n",
+ (unsigned)base);
+
+ /* Install non initialized exception detection code. */
+ for (i=0; i<256; ++i) {
+ int vector = base + i*8;
+
+ /* setup vector $000..$400 */
+ memptr (i<<2) + 0 = vector >> 24;
+ memptr (i<<2) + 1 = vector >> 16;
+ memptr (i<<2) + 2 = vector >> 8;
+ memptr (i<<2) + 3 = vector;
+
+ /* Timer-C vector (69) might be programmed without setting the
+ * vector. It is legitimate as the ST system uses this timer at
+ * 200hz. We could check this frequence instead of acknowledge
+ * this interruption.
+ */
+
+ /* install instruction stop #$2FNN */
+ memptr vector + 0 = 0x4e;
+ memptr vector + 1 = 0x72 /* + (i == 69) */;
+ memptr vector + 2 = 0x2F; /* magic SR value (see handler) */
+ memptr vector + 3 = i; /* vector number */
+ memptr vector + 4 = 0x4e; /* RESET or RTE */
+ memptr vector + 5 = 0x70; /* Always RESET */
+ memptr vector + 6 = 0x4e; /* RTE */
+ memptr vector + 7 = 0x73;
+ }
+
+ /* Install TOS trap emulator unless AMIGA */
+ if (!(hw & SC68_AGA)) {
+ int status;
+
+ TRACE68(sc68_cat," -> Load TOS trap emulator @$%06x-$%06x\n",
+ (unsigned) TRAP_ADDR, (unsigned) (TRAP_ADDR+sizeof(trap_func)-1));
+
+ /* Ensure trap emulator do not override exception handler */
+ assert(!overlap(INTR_ADDR, 256*8, TRAP_ADDR, sizeof(trap_func)));
+
+ /* Install trap emulator */
+ emu68_memput(sc68->emu68, TRAP_ADDR, trap_func, sizeof(trap_func));
+ sc68->emu68->cycle = 0;
+ TRACE68(sc68_cat," -> Running trap init code -- $%06x ...\n",
+ (unsigned) TRAP_ADDR);
+ status = finish(sc68, TRAP_ADDR, 0x2300, TRAP_MAX_INST);
+ if ( status != EMU68_NRM ) {
+ error_addx(sc68,
+ "libsc68: abnormal 68K status %d (%s) in trap code\n",
+ status, emu68_status_name(status));
+ return SC68_ERROR;
+ }
+ }
+ return SC68_OK;
+}
+
+static int load_replay(sc68_t * sc68, const char * replay, int a0)
+{
+ int err, size;
+ vfs68_t * is;
+ char rname256;
+ assert(sc68);
+ assert(replay);
+
+ TRACE68(sc68_cat, " -> external replay -- %s\n", replay);
+ strcpy(rname,"sc68://replay/");
+ strcat68(rname, replay, sizeof(rname)-1);
+ rnamesizeof(rname)-1 = 0;
+ is = uri68_vfs(rname, 1, 0);
+ err = vfs68_open(is);
+ err = err || (size = vfs68_length(is), size < 0);
+ err = err || stream_read_68k(sc68, a0, is, size);
+ vfs68_destroy(is);
+ if (err) {
+ error_add(sc68,
+ "libsc68: failed to load external replay -- %s",
+ rname);
+ return SC68_ERROR;
+ }
+ TRACE68(sc68_cat," -> external replay -- %06x-%06x\n", a0, a0+size-1);
+ return a0 + ((size + 1) & ~1);
+}
+
+
+static int aSIDifier(sc68_t * sc68, const music68_t * m)
+{
+ int res = 0;
+ assert(is_sc68(sc68));
+
+ /* No YM no aSID even if forced !*/
+ if ( ! ( m->hwflags & SC68_PSG ) )
+ goto done;
+
+ /* Config is OFF and instance is OFF */
+ if (config.asid == SC68_ASID_OFF && sc68->asid == SC68_ASID_OFF)
+ goto done;
+
+ /* Not forced and can't safely aSid */
+ if ( ! ( sc68->asid & SC68_ASID_FORCE ) &&
+ ! trk_can_asid(m) )
+ goto done;
+
+ /* Default timers assignment */
+ res = MK4CC('A','C','D','B');
+
+ /* In case of forced aSID try to assign free timer first. But
+ * usually it won't help much.
+ */
+ if (m->hwflags & SC68_XTD) {
+ if (m->hwflags & SC68_MFP_TA) /* A ? */
+ res = MK4CC('B','C','D','A');
+ if (m->hwflags & SC68_MFP_TC) /* C ? */
+ res = MK4CC('A','B','D','C');
+ if (m->hwflags & SC68_MFP_TD)
+ res = MK4CC('A','C','B','D'); /* D ? */
+ }
+
+done:
+ return res;
+}
+
+
+static int log2hz(int hz)
+{
+ if (hz < 75)
+ hz = 0;
+ else if (hz < 150)
+ hz = 1;
+ else
+ hz = 2;
+ return hz;
+}
+
+static int run_music_init(sc68_t * sc68, const music68_t * m, int a0, int a6)
+{
+ int status;
+
+ assert(is_sc68(sc68));
+ assert(m);
+
+ /* Set 68K registers. */
+ sc68->emu68->reg.d0 = m->d0;
+ /* unfortunatly the ste selection is kinda unsupported stuff... */
+ sc68->emu68->reg.d1 = !(m->hwflags & (SC68_DMA|SC68_LMC));
+ sc68->emu68->reg.d2 = m->datasz;
+ sc68->emu68->reg.d6 = log2hz(m->frq);
+
+ sc68->emu68->reg.a0 = a0;
+ sc68->emu68->reg.a6 = a6; /* original replay address */
+ sc68->emu68->reg.d7 = sc68->asid_timers;
+
+ /* Run music init code. */
+ sc68->emu68->cycle = 0;
+ TRACE68(sc68_cat," -> %s\n","running music init code ...");
+ status = finish(sc68, sc68->playaddr, 0x2300, INIT_MAX_INST);
+ if ( status != EMU68_NRM ) {
+ error_addx(sc68, "libsc68: abnormal 68K status %d (%s) in init code\n",
+ status, emu68_status_name(status));
+ return SC68_ERROR;
+ }
+ return SC68_OK;
+}
+
+static int change_track(sc68_t * sc68, int track)
+{
+ const disk68_t * d;
+ const music68_t * m;
+ int a0,a6;
+ int force_ms;
+ int loop;
+
+ assert(has_track(sc68, track));
+ stop_track(sc68, 0);
+
+ loop = sc68->loop_to;
+ assert(loop >= -1);
+
+ d = sc68->disk;
+ m = d->mus + track - 1;
+
+ /* Ugly hack needed by some tools. Usually not compiled */
+#ifdef WITH_FORCE_HW
+ if (config.force_hw && config.force_hw != m->hwflags) {
+ msg68_notice("Forcing hardware %03x(%s) -> %03x(%s)\n",
+ (unsigned)m->hwflags, hwtablem->hwflags&7,
+ (unsigned)config.force_hw, hwtableconfig.force_hw&7);
+ ((music68_t *)m)->hwflags = config.force_hw;
+ }
+#endif
+
+ /* Reset 68K & IO */
+ if (reset_emulators(sc68, m->hwflags) != SC68_OK)
+ return SC68_ERROR;
+
+ /* Set music replay address in 68K memory. */
+ sc68->playaddr = a0 = m->a0;
+ TRACE68(sc68_cat," -> play address -- $%06x\n", sc68->playaddr);
+
+ sc68->asid_timers = aSIDifier(sc68, m);
+ if (sc68->asid_timers) {
+ TRACE68(sc68_cat," -> aSID timers -- %c%c%c%c\n",
+ (int)(u8)(sc68->asid_timers >> 24),
+ (int)(u8)(sc68->asid_timers >> 16),
+ (int)(u8)(sc68->asid_timers >> 8),
+ (int)(u8)(sc68->asid_timers >> 0));
+ if (a0 = load_replay(sc68, "asidifier", a0), a0 == SC68_ERROR)
+ return SC68_ERROR;
+ }
+ a6 = a0;
+
+ /* Load external replay into 68K memory. */
+ if (m->replay && (a0 = load_replay(sc68, m->replay, a0), a0 == SC68_ERROR))
+ return SC68_ERROR;
+
+ /* Copy music data into 68K memory */
+ if (emu68_memput(sc68->emu68, a0, (u8 *)m->data, m->datasz)) {
+ error_add(sc68,"libsc68: %s\n", emu68_error_get(sc68->emu68));
+ return SC68_ERROR;
+ }
+ TRACE68(sc68_cat," -> music data -- %06x-%06x\n", a0, a0+m->datasz-1);
+
+ /* Run music init code */
+ if ( run_music_init(sc68, m, a0, a6) == SC68_ERROR )
+ return SC68_ERROR;
+
+ /* Ensure sampling rate */
+ if (sc68->mix.spr <= 0)
+ sc68->mix.spr = sc68_spr_def;
+ if (sc68->mix.spr < SPR_MIN ||
+ sc68->mix.spr > SPR_MAX) {
+ error_addx(sc68,
+ "libsc68: %s -- %dhz\n",
+ "invalid sampling rate",
+ sc68->mix.spr);
+ return SC68_ERROR;
+ }
+
+ /* force length if asked or if we don't have a length */
+ force_ms = d->force_ms;
+ if (!force_ms && !m->first_fr)
+ force_ms = sc68->time.def_ms;
+
+ assert(m->loops >= 0);
+ if (loop == SC68_DEF_LOOP)
+ loop = m->loops > 0 ? m->loops : SC68_INF_LOOP;
+
+ sc68->mix.loop_count = 0;
+ sc68->mix.loop_total = (loop == SC68_INF_LOOP) ? 0 : loop;
+ sc68->mix.pass_count = 0;
+
+ if (force_ms > 0) {
+ TRACE68(sc68_cat,"libsc68: disk force length -- *%d ms*\n", force_ms);
+ //sc68->time.track_ms = force_ms * sc68->mix.loop_total;
+ //sc68->time.disk_ms = sc68->time.track_ms * d->nb_mus;
+ sc68->mix.pass_2loop = ms_to_fr(force_ms, m->frq);
+ sc68->mix.pass_3loop = sc68->mix.pass_2loop;
+ sc68->mix.pass_total = sc68->mix.loop_total * sc68->mix.pass_2loop;
+ } else {
+ sc68->mix.pass_2loop = m->first_fr;
+ sc68->mix.pass_3loop = m->loops_fr;
+ sc68->mix.pass_total = sc68->mix.loop_total > 0
+ ? sc68->mix.pass_2loop + (sc68->mix.loop_total-1) * sc68->mix.pass_3loop
+ : 0
+ ;
+ //sc68->time.track_ms = fr_to_ms(sc68->mix.pass_total, m->frq);
+ //sc68->time.disk_ms = calc_disk_len(d, sc68->loop_to);
+ }
+
+ TRACE68(sc68_cat," -> loops : %u\n", sc68->mix.loop_total);
+ TRACE68(sc68_cat," -> first pass ms : %u\n",
+ fr_to_ms(sc68->mix.pass_2loop, m->frq));
+ TRACE68(sc68_cat," -> loops pass ms : %u\n",
+ fr_to_ms(sc68->mix.pass_3loop, m->frq));
+ TRACE68(sc68_cat," -> origin ms : %u\n", sc68->tinfotrack.len_ms);
+ TRACE68(sc68_cat," -> track ms : %u\n", sc68->tinfotrack.len_ms);
+ TRACE68(sc68_cat," -> disk ms : %u\n", sc68->tinfo0.len_ms);
+
+ /* $$$$ fix start time on the fly because it is broken ! */
+ // m->start_ms = sc68->time.save_ms;
+ // TRACE68(sc68_cat," -> start ms : %u\n", m->start_ms);
+
+ TRACE68(sc68_cat," -> first frames : %u\n", sc68->mix.pass_2loop);
+ TRACE68(sc68_cat," -> loops frames : %u\n", sc68->mix.pass_3loop);
+ TRACE68(sc68_cat," -> total frames : %u\n", sc68->mix.pass_total);
+
+
+ TRACE68(sc68_cat," -> replay rate : %u\n", m->frq);
+ sc68->mix.cycleperpass =
+ ( m->frq % 50u == 0 && sc68->emu68->clock == EMU68_ATARIST_CLOCK)
+ ? 160256u * 50u / m->frq /* exact value for genuine Atari ST */
+ : (sc68->emu68->clock / m->frq)
+ ;
+ TRACE68(sc68_cat," -> cycle (exact) : %u\n", sc68->mix.cycleperpass);
+
+ if (m->hwflags & SC68_PSG) {
+ cycle68_t cycles;
+ /* Make sure ym-cycle are mutiple of 32 as required by current
+ * emulator.
+ *
+ * $$$ I am not sure this works in all cases of frequency but it
+ * is should be ok as far as cpu and ym frequency are multiple.
+ *
+ * $$$ In fact I am now pretty sure it does not work if
+ * frequencies are not multiple.
+ */
+ cycles = ymio_cycle_cpu2ym(sc68->ymio,sc68->mix.cycleperpass);
+ cycles = (cycles+31) & ~31;
+ sc68->mix.cycleperpass = ymio_cycle_ym2cpu(sc68->ymio,cycles);
+
+ /* verify */
+ cycles = ymio_cycle_cpu2ym(sc68->ymio,sc68->mix.cycleperpass);
+ TRACE68(sc68_cat," -> ym cycles : %u %s\n",
+ (unsigned) cycles, strok68(cycles&31));
+ }
+ sc68->mix.cycleperpass = (sc68->mix.cycleperpass+31) & ~31;
+ TRACE68(sc68_cat," -> cycle (round) : %u\n", sc68->mix.cycleperpass);
+
+ if (m->frq == 60 && sc68->shifterio) {
+ TRACE68(sc68_cat," -> %s\n","Force shifter to 60Hz");
+ shifterio_reset(sc68->shifterio,60);
+ }
+
+ /* Compute size of buffer needed for cycleperpass length at current rate. */
+ if (1) {
+ u64 len;
+ len = sc68->mix.spr;
+ len *= sc68->mix.cycleperpass;
+ len /= sc68->emu68->clock;
+ sc68->mix.stdlen = (int) len;
+ TRACE68(sc68_cat," -> std buffer len : %u\n", sc68->mix.stdlen);
+ }
+
+ /* Compute *REAL* required size (in PCM) for buffer and realloc */
+ if (1) {
+ sc68->mix.bufreq = (m->hwflags & SC68_PSG)
+ ? ymio_buffersize(sc68->ymio, sc68->mix.cycleperpass)
+ : sc68->mix.stdlen
+ ;
+ TRACE68(sc68_cat," -> mix buffer len : %u\n", sc68->mix.bufreq);
+
+ /* Should not happen. Anyway it does not hurt. */
+ if ((m->hwflags & SC68_AGA) && sc68->mix.stdlen > sc68->mix.bufreq)
+ sc68->mix.bufreq = sc68->mix.stdlen;
+
+ TRACE68(sc68_cat," -> required PCM buffer size -- *%u pcm*\n",
+ sc68->mix.bufreq);
+ TRACE68(sc68_cat," -> current PCM buffer size -- *%u pcm*\n",
+ sc68->mix.bufmax);
+
+ if (sc68->mix.bufreq > sc68->mix.bufmax) {
+ free(sc68->mix.buffer);
+ sc68->mix.bufmax = 0;
+ TRACE68(sc68_cat," -> Alloc new PCM buffer -- *%u pcm*\n",
+ sc68->mix.bufreq);
+ sc68->mix.buffer = malloc(sc68->mix.bufreq << 2);
+ if (!sc68->mix.buffer) {
+ error_add(sc68,"libsc68: %s\n", strerror(errno));
+ return SC68_ERROR;
+ }
+ sc68->mix.bufmax = sc68->mix.bufreq;
+ }
+ }
+ TRACE68(sc68_cat," -> buffer length -- %u pcm\n", sc68->mix.bufreq);
+
+ sc68->mus = m;
+ sc68->track = track;
+
+ /* Setup internal info struct */
+ if (sc68_music_info(sc68, &sc68->info, track, 0))
+ return SC68_ERROR;
+
+ TRACE68(sc68_cat, "libsc68: track ready -- %s %s - %s - %s\n",
+ sc68->info.trk.time,
+ sc68->info.artist,
+ sc68->info.album,
+ sc68->info.title);
+
+ return SC68_OK;
+}
+
+static int check_track_range(sc68_t * const sc68,
+ const disk68_t * const disk,
+ const int track)
+{
+ if (track < 1 || track > disk->nb_mus) {
+ error_addx(sc68, "libsc68: %s -- *%d*\n","track out of range", track);
+ return -1;
+ }
+ return 0;
+}
+
+/** Start current music of current disk.
+ */
+static int apply_change_track(sc68_t * const sc68)
+{
+ int track/* , loop */;
+
+ assert(has_disk(sc68));
+
+ if (track = sc68->track_to, !track)
+ return SC68_OK;
+ /* loop = sc68->loop_to; */
+ /* Don't cleat loop_to, it's needed for next tracks */
+ sc68->track_to /* = sc68->loop_to */ = 0;
+
+ /* -1 : stop */
+ if (track == -1) {
+ TRACE68(sc68_cat,"libsc68: %s\n","stop requested");
+ sc68->mix.buflen = 0; /* warning removal in stop_track() */
+ stop_track(sc68, 1);
+ sc68->time.origin_ms = 0;
+ return SC68_END;
+ }
+ TRACE68(sc68_cat,
+ "libsc68: %s -- *%02d*\n",
+ "change track requested", track);
+
+ if (check_track_range(sc68, sc68->disk, track))
+ return SC68_ERROR;
+
+ if (change_track(sc68, track/* , loop */) != SC68_OK)
+ return SC68_ERROR;
+
+ return SC68_CHANGE;
+}
+
+int sc68_process(sc68_t * sc68, void * buf16st, int * _n)
+{
+ int ret;
+
+ if (!is_sc68(sc68)) {
+ ret = SC68_ERROR;
+ } else if (!_n) {
+ /* Flush internal PCM buffer and apply change track request. */
+ ret = SC68_IDLE | apply_change_track(sc68);
+ } else if (!buf16st) {
+ ret = SC68_ERROR;
+ } else {
+ int n = *_n;
+ ret = (n < 0) ? SC68_ERROR : SC68_IDLE;
+
+ while (n > 0) {
+ int len;
+
+ /* No more pcm in internal buffer ... */
+ if (!sc68->mix.buflen) {
+ int status;
+
+ /* Checking for loop */
+ if (sc68->mix.pass_2loop && !--sc68->mix.pass_2loop) {
+ sc68->mix.pass_2loop = sc68->mix.pass_3loop;
+ sc68->mix.loop_count++;
+ ret |= SC68_LOOP;
+ }
+
+ /* Checking for end */
+ if (sc68->mix.pass_total &&
+ sc68->mix.pass_count >= sc68->mix.pass_total) {
+ int next_track = sc68->track+1;
+ sc68->track_to =
+ (sc68->disk->force_track || next_track > sc68->disk->nb_mus)
+ ? -1 /* stop */
+ : next_track /* next track */
+ ;
+ sc68->seek_to = -1;
+ }
+
+ ret |= apply_change_track(sc68);
+ if (ret & (SC68_END|SC68_CHANGE)) /* exit on error|end|change */
+ break;
+ ret &= ~SC68_IDLE; /* No more idle */
+
+ /* setup aSID */
+ if (sc68->asid_timers)
+ sc68->emu68->memsc68->playaddr+17 = -!!(sc68->asid & SC68_ASID_ON);
+
+ /* Run 68K emulator */
+ status = finish(sc68, sc68->playaddr+8, 0x2300, PLAY_MAX_INST);
+ if (status == EMU68_NRM) {
+ /* $$$ Fix some replays (tao's intensity 200 for one) that
+ assumes the music driver is running under interruption
+ and do not restore the SR by themself. Need to be sure
+ this does not disrupt other musics. */
+ sc68->emu68->reg.sr = 0x2300;
+ status = emu68_interrupt(sc68->emu68, sc68->mix.cycleperpass);
+ }
+ if (status != EMU68_NRM) {
+ error_addx(sc68,
+ "libsc68: abnormal 68K status %d (%s) in play pass %u\n",
+ status, emu68_status_name(status),
+ sc68->mix.pass_count);
+ ret = SC68_ERROR;
+ break;
+ }
+
+ /* Reset pcm pointer. */
+ sc68->mix.bufpos = 0;
+ sc68->mix.buflen = sc68->mix.bufreq;
+
+ /* Fill pcm buufer depending on architecture */
+ if (sc68->mus->hwflags & SC68_AGA) {
+ /* Amiga - Paula */
+ paula_mix(sc68->paula,(s32*)sc68->mix.buffer,sc68->mix.buflen);
+ mixer68_blend_LR(sc68->mix.buffer, sc68->mix.buffer, sc68->mix.buflen,
+ sc68->mix.aga_blend, 0, 0);
+ } else {
+ if (sc68->mus->hwflags & SC68_PSG) {
+ int err =
+ ymio_run(sc68->ymio, (s32*)sc68->mix.buffer,
+ sc68->mix.cycleperpass);
+ if (err < 0) {
+ ret = SC68_ERROR;
+ sc68->mix.buflen = 0;
+ break;
+ }
+ sc68->mix.buflen = err;
+ } else {
+ mixer68_fill(sc68->mix.buffer, sc68->mix.buflen=sc68->mix.bufreq, 0);
+ }
+
+ if (sc68->mus->hwflags & (SC68_DMA|SC68_LMC))
+ /* STE / MicroWire */
+ mw_mix(sc68->mw, (s32 *)sc68->mix.buffer, sc68->mix.buflen);
+ else
+ /* Else simply process with left channel duplication. */
+ mixer68_dup_L_to_R(sc68->mix.buffer, sc68->mix.buffer,
+ sc68->mix.buflen, 0);
+ }
+
+ /* Advance time */
+ calc_pos(sc68);
+ sc68->mix.pass_count++;
+ }
+
+ assert(sc68->mix.buflen > 0);
+
+ /* Copy to destination buffer. */
+ len = sc68->mix.buflen <= n ? sc68->mix.buflen : n;
+ mixer68_copy((u32 *)buf16st,sc68->mix.buffer+sc68->mix.bufpos,len);
+ buf16st = (u32 *)buf16st + len;
+ sc68->mix.bufpos += len;
+ sc68->mix.buflen -= len;
+ n -= len;
+ }
+ *_n -= n;
+ }
+ return ret;
+}
+
+int sc68_is_our_uri(const char * uri, const char *exts, int * is_remote)
+{
+ assert(!"TO DO");
+ return 0;
+ /* return file68_is_our_uri(uri,exts,is_remote); */
+}
+
+static int load_disk(sc68_t * sc68, disk68_t * d, int free_on_close)
+{
+ if (!is_sc68(sc68) || !is_disk(d))
+ goto error;
+
+ if (sc68->disk) {
+ error_add(sc68,"libsc68: %s","disk already loaded");
+ goto error;
+ }
+
+ sc68->tobe3 = !!free_on_close;
+ sc68->disk = d;
+ sc68->track = 0;
+ sc68->mus = 0;
+
+ if (sc68_play(sc68, SC68_DEF_TRACK, SC68_DEF_LOOP) < 0)
+ goto error;
+
+ music_info(sc68, &sc68->info, d, sc68->track_to, sc68->loop_to);
+
+ return 0;
+
+error:
+ free(d);
+ return -1;
+}
+
+int sc68_load(sc68_t * sc68, vfs68_t * is)
+{
+ return load_disk(sc68, file68_load(is), 1);
+}
+
+int sc68_load_uri(sc68_t * sc68, const char * uri)
+{
+ return load_disk(sc68, file68_load_uri(uri), 1);
+}
+
+int sc68_load_mem(sc68_t * sc68, const void * buffer, int len)
+{
+ return load_disk(sc68, file68_load_mem(buffer, len), 1);
+}
+
+
+sc68_disk_t sc68_load_disk(vfs68_t * is)
+{
+ return (sc68_disk_t) file68_load(is);
+}
+
+sc68_disk_t sc68_load_disk_uri(const char * uri)
+{
+ return (sc68_disk_t) file68_load_uri(uri);
+}
+
+sc68_disk_t sc68_disk_load_mem(const void * buffer, int len)
+{
+ return (sc68_disk_t) file68_load_mem(buffer, len);
+}
+
+void sc68_disk_free(sc68_disk_t disk)
+{
+ if (is_disk(disk))
+ file68_free(disk); /* $$$ check this */
+}
+
+int sc68_open(sc68_t * sc68, sc68_disk_t disk)
+{
+ if (!disk) {
+ sc68_close(sc68);
+ return -1; /* Not an error but notifiy no disk has been loaded */
+ }
+ if (!sc68) {
+ return -1;
+ }
+ return load_disk(sc68, disk, 0);
+}
+
+void sc68_close(sc68_t * sc68)
+{
+ if (sc68 && sc68->disk) {
+ sc68->mix.buflen = 0; /* warning removal in stop_track() */
+ stop_track(sc68, 1);
+ if (sc68->tobe3)
+ file68_free((disk68_t *)sc68->disk);
+ sc68->tobe3 = 0;
+ sc68->disk = 0;
+ }
+}
+
+int sc68_play(sc68_t * sc68, int track, int loop)
+{
+ const disk68_t * d;
+
+ if (!has_disk(sc68))
+ return -1;
+ d = sc68->disk;
+
+ /* Legacy, better sc68_cntl() */
+ if (track == SC68_CUR_TRACK) {
+ msg68x_warning(sc68, "libsc68: %s\n",
+ "deprecated use sc68_play() to get track and loops");
+ return loop == SC68_CUR_LOOP
+ ? sc68->mix.loop_count
+ : sc68->track
+ ;
+ }
+
+ /* Choose track */
+ if (d->force_track > 0) {
+ /* Mean track has been forced while the disk was loaded (via
+ * URI) */
+ track = d->force_track;
+ TRACE68(sc68_cat,"libsc68: disk's forced track -- *%02d*\n",track);
+ } else if (track == SC68_DEF_TRACK) {
+ track = d->def_mus + 1;
+#ifdef WITH_FORCE
+ if (in_range(d, sc68->cfg_track)) {
+ /* track forced in config only applied if default track was
+ * asked and it is not out of range. */
+ track = sc68->cfg_track;
+ TRACE68(sc68_cat,"libsc68: config's forced track -- *%02d*\n", track);
+ }
+#endif
+ }
+
+ /* Unless disk has an overide. */
+ if (d->force_loops) {
+ loop = d->force_loops;
+ TRACE68(sc68_cat,"libsc68: disk has a forced loop -- %02d\n",loop);
+ }
+#ifdef WITH_FORCE
+ else if (loop == SC68_DEF_LOOP && sc68->cfg_loop != SC68_DEF_LOOP) {
+ loop = sc68->cfg_loop;
+ TRACE68(sc68_cat,"libsc68: config has a forced loop -- %02d\n", loop);
+ }
+#endif
+
+ /* Check track range. */
+ if (check_track_range(sc68, sc68->disk, track)) {
+ return -1;
+ } else {
+ int i;
+
+ sc68->tinfo0.org_ms = 0;
+ sc68->tinfo0.len_ms = 0;
+ for (i=1; i <= d->nb_mus; ++i) {
+ sc68->tinfoi.org_ms = sc68->tinfo0.len_ms;
+ sc68->tinfoi.len_ms = calc_track_len(d,i,loop);
+ sc68->tinfo0.len_ms += sc68->tinfoi.len_ms;
+ }
+ }
+
+ /* Set change track. Real track loading occurs during process thread to
+ avoid multi-threading problems. */
+ sc68->track_to = track;
+ sc68->seek_to = -1;
+ sc68->loop_to = loop;
+
+ return 0;
+}
+
+int sc68_stop(sc68_t * sc68)
+{
+ if (!sc68 || !sc68->disk) {
+ return -1;
+ }
+ sc68->track_to = -1;
+ sc68->seek_to = -1;
+ return 0;
+}
+
+static unsigned int calc_pos(sc68_t * const sc68)
+{
+ u64 ms;
+ ms = sc68->mix.pass_count;
+ ms *= sc68->mix.cycleperpass * 1000u;
+ ms /= sc68->emu68->clock;
+
+ assert(ms == (u64)(unsigned int)ms); /* check overflow */
+
+ return sc68->time.elapsed_ms = (unsigned int) ms;
+}
+
+static int get_pos(sc68_t * sc68, int origin)
+{
+ int pos = -1, track;
+ if ( (track = sc68->track) > 0 ) {
+ switch (origin) {
+
+ case SC68_POS_PLAY: /* Position since sc68_play() */
+ pos = sc68->time.origin_ms;
+ break;
+
+ case SC68_POS_DISK: /* Position in the entire disk */
+ pos = sc68->tinfotrack.org_ms;
+ break;
+
+ default:
+ assert(!"invalid origin");
+ case SC68_POS_TRACK: /* Position in current track */
+ pos = 0;
+ }
+ pos += sc68->time.elapsed_ms;
+ /* Add correction for PCMs already sent in the current buffer */
+ pos += (sc68->mix.bufpos * 1000u) / sc68->mix.spr;
+ }
+ return pos;
+}
+
+static unsigned int calc_track_len(const disk68_t * d, int track, int loop)
+{
+ const music68_t * m;
+ unsigned force_ms;
+
+ assert(in_disk(d,track));
+
+ m = d->mus + track - 1;
+
+ if (loop == SC68_DEF_LOOP)
+ loop = m->loops;
+ if (loop <= 0)
+ return 0; /* return 0 on infinite loop */
+
+ /* force length if asked or if we don't have a length */
+ force_ms = d->force_ms;
+ if (!force_ms && !m->first_fr)
+ force_ms = config.def_time_ms;
+ if (force_ms)
+ return loop * force_ms;
+
+ return fr_to_ms(m->first_fr + (loop-1) * m->loops_fr, m->frq);
+}
+
+static int calc_disk_len(const disk68_t * disk, const int loop)
+{
+ int i, len = 0;
+
+ assert(is_disk(disk));
+ for (i = 1; i <= disk->nb_mus; ++i)
+ len += calc_track_len(disk,i,loop);
+ return len;
+}
+
+static int get_len(sc68_t * sc68, int track)
+{
+ /* int len = -1; */
+
+ assert(track == SC68_DSK_TRACK || has_track(sc68,track));
+ assert(SC68_DSK_TRACK == 0);
+ return (unsigned) track <= (unsigned) sc68->disk->nb_mus
+ ? sc68->tinfotrack.len_ms
+ : -1;
+}
+
+
+/* Get a tag. Favor track tag over disk one */
+static
+char * tag_get_any(const disk68_t * d, int track, const char * key)
+{
+ const char * val = file68_tag_get(d,track,key);
+ if (!val)
+ val = file68_tag_get(d,0,key);
+ return (char *)val;
+}
+
+static void music_info(sc68_t * sc68, sc68_music_info_t * f, const disk68_t * d,
+ int track, int loops)
+{
+ const music68_t * m;
+ int i, maxtag = &f->_lasttag - &f->album;
+
+ assert(f);
+ assert(in_disk(d, track));
+ m = d->mus + track - 1;
+ f->tracks = d->nb_mus;
+ f->addr = m->a0;
+ f->rate = m->frq;
+ f->replay = m->replay ? m->replay : "built-in";
+ f->dsk.track = d->def_mus+1;
+ f->dsk.time_ms = sc68
+ ? sc68->tinfo0.len_ms : calc_disk_len(d, loops);
+ strtime68(f->dsk.time, f->tracks, (f->dsk.time_ms+999u)/1000u);
+ f->dsk.ym = !!(d->hwflags & SC68_PSG);
+ f->dsk.ste = !!(d->hwflags & (SC68_DMA|SC68_LMC));
+ f->dsk.amiga = !!(d->hwflags & SC68_AGA);
+ f->dsk.asid = dsk_can_asid(d) > 0;
+ f->dsk.hw = hwtablef->dsk.ym+(f->dsk.ste<<1)+(f->dsk.amiga<<2);
+ f->dsk.tags = file68_tag_count(d, 0);
+ f->dsk.tag = (sc68_tag_t *) d->tags.array;
+
+ f->trk.track = track;
+ f->trk.time_ms = sc68
+ ? sc68->tinfotrack.len_ms : calc_track_len(d, track, loops);
+ strtime68(f->trk.time, track,(f->trk.time_ms+999u)/1000u);
+
+ f->trk.ym = !! (m->hwflags & SC68_PSG);
+ f->trk.ste = !! (m->hwflags & (SC68_DMA|SC68_LMC));
+ f->trk.amiga = !! (m->hwflags & SC68_AGA);
+ f->trk.asid = trk_can_asid(m);
+ f->trk.hw = hwtablef->trk.ym+(f->trk.ste<<1)+(f->trk.amiga<<2);
+ f->trk.tags = file68_tag_count(d, track);
+ f->trk.tag = (sc68_tag_t *) m->tags.array;
+
+
+ /* Clear all tags. */
+ for (i=0; i < maxtag; ++i)
+ (&f->album)i = 0;
+
+ f->album = d->tags.tag.title.val;
+ f->title = m->tags.tag.title.val;
+ f->artist = m->tags.tag.artist.val;
+ f->format = d->tags.tag.genre.val;
+ f->genre = m->tags.tag.genre.val;
+ f->year = tag_get_any(d, track, TAG68_YEAR);
+ f->ripper = tag_get_any(d, track, TAG68_RIPPER);
+ f->converter = tag_get_any(d, track, TAG68_CONVERTER);
+
+ /* Replace null pointers by empty strings. */
+ for (i=0; i < maxtag; ++i)
+ if (!(&f->album)i)
+ (&f->album)i = "";
+
+}
+
+
+int sc68_music_info(sc68_t * sc68, sc68_music_info_t * info, int track,
+ sc68_disk_t disk)
+{
+ const disk68_t * d;
+ int loaded;
+
+ d = get_dt(sc68, &track, disk);
+ if (!d || !info)
+ return error_add(sc68, "libsc68: %s\n", "invalid parameter");
+
+ /* Asking for the track being played by sc68, simply copy internal
+ * info struct, unless off course it is the one being filled.
+ */
+ loaded = sc68 && d == sc68->disk;
+ if (loaded && track == sc68->track && info != &sc68->info) {
+ *info = sc68->info;
+ } else {
+ music_info(0, info, d, track, loaded ? sc68->loop_to : SC68_DEF_LOOP);
+ }
+
+ return 0;
+}
+
+/* resolve disk and track number */
+
+static sc68_disk_t get_dt(sc68_t * sc68, int * ptr_track, sc68_disk_t disk)
+{
+ disk68_t * d;
+ int track;
+
+ if (disk)
+ d = disk;
+ else if (is_sc68(sc68) && sc68->disk)
+ d = (sc68_disk_t)sc68->disk;
+ else
+ d = 0;
+ if (!is_disk(d))
+ return 0;
+
+ switch (track = *ptr_track) {
+ case SC68_DEF_TRACK:
+ track = d->def_mus + 1;
+ break;
+ case SC68_CUR_TRACK:
+ track = (sc68 && d == sc68->disk) ? sc68->track : -1;
+ case SC68_DSK_TRACK:
+ break;
+ }
+ if (track != SC68_DSK_TRACK && !in_range(d,track))
+ d = 0;
+ else
+ *ptr_track = track;
+ return d;
+}
+
+char * sc68_tag(sc68_t * sc68, const char * key, int track, sc68_disk_t disk)
+{
+ disk68_t * d;
+ if (!key || !(d = get_dt(sc68, &track, disk)))
+ return 0;
+ return file68_tag(d, track, key);
+}
+
+int sc68_tag_get(sc68_t * sc68, sc68_tag_t * tag, int track,
+ sc68_disk_t disk)
+{
+ disk68_t * d;
+ if (!tag || !(d = get_dt(sc68, &track, disk)))
+ return -1;
+ tag->val = (char *) file68_tag_get(d, track, tag->key);
+ return -!tag->val;
+}
+
+int sc68_tag_enum(sc68_t * sc68, sc68_tag_t * tag, int track, int idx,
+ sc68_disk_t disk)
+{
+ disk68_t * d;
+ if (!tag || !(d = get_dt(sc68, &track, disk)))
+ return -1;
+ return file68_tag_enum(d, track, idx,
+ (const char **)&tag->key,
+ (const char **)&tag->val);
+}
+
+vfs68_t * sc68_vfs(const char * uri, int mode, int argc, ...)
+{
+ vfs68_t * vfs;
+ va_list list;
+
+ va_start(list, argc);
+ vfs = uri68_vfs_va(uri, mode, argc, list);
+ va_end(list);
+
+ return vfs;
+}
+
+const char * sc68_error(sc68_t * sc68)
+{
+ return is_sc68(sc68)
+ ? sc68->errstr
+ : sc68_errstr
+ ;
+}
+
+static int error_addx(sc68_t * sc68, const char * fmt, ...)
+{
+ va_list list;
+ char * errstr;
+ int n;
+
+ n = strncmp(fmt,"libsc68: ",9) ? 0 : 9; /* skip "libsc68: " */
+ errstr = is_sc68(sc68) ? sc68->errbuf : sc68_errstr;
+ va_start(list, fmt);
+ n = vsnprintf(errstr, ERRMAX, fmt+n, list);
+ va_end(list);
+ if (n > 0 && errstrn-1 == '\n')
+ errstrn-1 = 0;
+ if (sc68)
+ sc68->errstr = sc68->errbuf;
+ va_start(list, fmt);
+ error68_va(fmt,list);
+ va_end(list);
+ return -1;
+}
+
+static int error_add(sc68_t * sc68, const char * fmt, const char * errstr)
+{
+ if (is_sc68(sc68)) {
+ sc68->errstr = errstr;
+ error68x(sc68,fmt,errstr);
+ } else
+ error68(fmt,errstr);
+ return -1;
+}
+
+static void sc68_debug(sc68_t * sc68, const char * fmt, ...)
+{
+ va_list list;
+
+ assert(null_or_sc68(sc68));
+ va_start(list,fmt);
+ if (!sc68)
+ msg68_va(sc68_cat, fmt, list);
+ else if (is_magic(sc68))
+ msg68x_va(sc68_cat, sc68, fmt, list);
+ va_end(list);
+}
+
+/* static int track_now_or_next(const sc68_t * sc68) { */
+/* if (!is_disk(sc68)) */
+/* return -1; */
+/* if (sc68->track_to) */
+/* return sc68->track_to; */
+/* return sc68->track; */
+/* } */
+
+int sc68_cntl(sc68_t * sc68, int fct, ...)
+{
+ int res;
+ va_list list;
+
+ assert(null_or_sc68(sc68));
+
+ if (!null_or_sc68(sc68))
+ return -1;
+
+ res = -1;
+ va_start(list, fct);
+ switch (fct) {
+ /* Functions accepting null */
+
+ case SC68_NOP:
+ break;
+
+ case SC68_GET_LAST:
+ res = SC68_CNTL_LAST;
+ break;
+
+ case SC68_GET_NAME:
+ *va_arg(list, char **) = sc68 ? sc68->name : appname;
+ res = 0;
+ break;
+
+ case SC68_CONFIG_LOAD:
+ if (!config_load(appname)) {
+ config_apply(sc68);
+ res = 0;
+ }
+ break;
+
+ case SC68_CONFIG_SAVE:
+ /* config_update(sc68); */
+ if (!config_save(appname))
+ res = 0;
+ break;
+
+ case SC68_ENUM_OPT: {
+ option68_t * opt = option68_enum(va_arg(list, int));
+ res = option68_type(opt);
+ if (res != -1)
+ *va_arg(list,const char **) = opt->name;
+ } break;
+
+ case SC68_GET_OPT: {
+ option68_t * opt = option68_get(va_arg(list, const char *), opt68_ISSET);
+ if (opt) {
+ if (opt->type == opt68_STR)
+ *va_arg(list,const char **) = opt->val.str;
+ else
+ *va_arg(list, int *) = opt->val.num;
+ res = 0;
+ }
+ } break;
+
+ case SC68_SET_OPT_STR: {
+ option68_t * opt = option68_get(va_arg(list, const char *), opt68_ALWAYS);
+ res =
+ option68_set(opt, va_arg(list, const char *), opt68_ALWAYS, opt68_APP);
+ } break;
+
+ case SC68_SET_OPT_INT: {
+ option68_t * opt = option68_get(va_arg(list, const char *), opt68_ALWAYS);
+ res =
+ option68_iset(opt, va_arg(list, int), opt68_ALWAYS, opt68_APP);
+ } break;
+
+ case SC68_GET_PCM:
+ res = get_pcm_fmt(sc68);
+ break;
+
+ case SC68_SET_PCM:
+ res = set_pcm_fmt(sc68, va_arg(list, int));
+ break;
+
+ case SC68_GET_SPR:
+ res = get_spr(sc68);
+ break;
+
+ case SC68_SET_SPR:
+ res = set_spr(sc68, va_arg(list, int));
+ break;
+
+ case SC68_GET_ASID:
+ res = get_asid(sc68);
+ break;
+
+ case SC68_SET_ASID:
+ res = set_asid(sc68, va_arg(list, int));
+ break;
+
+ case SC68_DIAL: {
+ void * data = va_arg(list, void *);
+ sc68_dial_f cntl = va_arg(list, sc68_dial_f);
+ res = dial68(data, cntl);
+ } break;
+
+ default:
+ if (!sc68)
+ break;
+
+ switch (fct) {
+ /* Functions not accepting null */
+
+ case SC68_CAN_ASID:
+ res = can_asid(sc68,va_arg(list,int));
+ break;
+
+ case SC68_GET_DISK:
+ *va_arg(list, const disk68_t **)
+ = is_disk(sc68->disk) ? sc68->disk : 0;
+ res = 0;
+ break;
+
+ case SC68_GET_TRACKS:
+ res = is_disk(sc68->disk) ? sc68->disk->nb_mus : -1;
+ break;
+
+ case SC68_GET_TRACK:
+ res = sc68->track;
+ break;
+
+ case SC68_GET_DEFTRK:
+ if (is_disk(sc68->disk))
+ res = sc68->disk->def_mus+1;
+ break;
+
+ case SC68_GET_LOOPS:
+ if (sc68->track > 0)
+ res = sc68->mix.loop_total;
+ break;
+
+ case SC68_GET_LOOP:
+ if (sc68->track > 0)
+ res = sc68->mix.loop_count;
+ break;
+
+ case SC68_GET_LEN:
+ if (sc68->track > 0)
+ res = get_len(sc68, sc68->track);
+ break;
+
+ case SC68_GET_TRKLEN:
+ if (is_disk(sc68->disk))
+ res = get_len(sc68, va_arg(list,int));
+ break;
+
+ case SC68_GET_DSKLEN:
+ if (is_disk(sc68->disk))
+ res = get_len(sc68, SC68_DSK_TRACK);
+ break;
+
+ case SC68_GET_POS:
+ res = get_pos(sc68, SC68_POS_TRACK);
+ break;
+
+ case SC68_GET_ORG:
+ if (sc68->track > 0)
+ res = sc68->tinfosc68->track.org_ms;
+ break;
+
+ case SC68_GET_TRKORG:
+ if (is_disk(sc68->disk)) {
+ int track = va_arg(list,int);
+ if (in_range(sc68->disk,track))
+ res = sc68->tinfotrack.org_ms;
+ } break;
+
+ case SC68_GET_DSKPOS:
+ res = get_pos(sc68, SC68_POS_DISK);
+ break;
+
+ case SC68_GET_PLAYPOS:
+ res = get_pos(sc68, SC68_POS_PLAY);
+ break;
+
+ case SC68_GET_COOKIE:
+ *va_arg(list, void **) = sc68->cookie;
+ res = 0;
+ break;
+
+ case SC68_SET_COOKIE:
+ sc68->cookie = va_arg(list, void *);
+ res = 0;
+ break;
+
+ case SC68_EMULATORS:
+ *va_arg(list, void **) = &sc68->emu68;
+ res = 0;
+ break;
+
+ case SC68_SET_POS:
+ default:
+ res = error_addx(sc68,
+ "libsc68: %s (%d)\n",
+ "invalid control function", fct);
+ break;
+ }
+ }
+ va_end(list);
+ return res;
+}
+
+const char * sc68_mimetype(void)
+{
+ return SC68_MIMETYPE;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/conf68.c Added

@@ -0,0 +1,407 @@
+/*
+ * @file conf68.c
+ * @brief sc68 config file
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "io68/default.h"
+#include "conf68.h"
+
+/* file68 headers */
+#include <sc68/file68.h>
+#include <sc68/file68_err.h>
+#include <sc68/file68_uri.h>
+#include <sc68/file68_str.h>
+#include <sc68/file68_msg.h>
+#include <sc68/file68_opt.h>
+#include <sc68/file68_reg.h>
+
+/* standard headers */
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#ifndef DEBUG_CONFIG68_O
+# define DEBUG_CONFIG68_O 0
+#endif
+
+static int config68_cat = msg68_DEFAULT;
+static int config68_use_registry = -1;
+static char config68_def_name = "sc68";
+
+static const char cuk_fmt = "CUK:Software/sashipa/sc68-%s/";
+static const char lmk_str = "LMK:Software/sashipa/sc68/config/";
+static const char prefix = "sc68-";
+static const char optcat = "option";
+
+struct _config68_s {
+ int n;
+};
+
+enum {
+ MAX_TIME = (24 * 60 * 60) - 1
+};
+
+/* exported */
+int config68_force_file = 0;
+
+static const char * f_asids = { "off","on","force" };
+
+static option68_t opts = {
+
+ OPT68_IRNG(prefix,"sampling-rate",optcat,
+ "sampling rate in Hz",
+ SPR_MIN,SPR_MAX,1,0),
+
+ OPT68_ENUM(prefix,"asid",optcat,
+ "aSIDfier settings",
+ f_asids,sizeof(f_asids)/sizeof(*f_asids),1,0),
+
+#ifdef WITH_FORCE_HW
+ OPT68_IRNG(prefix,"force-hw",optcat,"override track hardware {0:off}",
+ 0,511,0,0),
+#endif
+
+#ifdef WITH_FORCE
+ OPT68_IRNG(prefix,"force-track",optcat,"override default track {0:off}",
+ 0,SC68_MAX_TRACK,1,0),
+
+ OPT68_IRNG(prefix,"force-loop",optcat,
+ "override default loop {0:off -1:inf}",
+ -1,100,1,0),
+#endif
+
+ /* OPT68_IRNG(prefix,"skip-time",optcat, */
+ /* "prevent short track from being played (in sec) {0:off}", */
+ /* 0,MAX_TIME,1,0), */
+
+ OPT68_IRNG(prefix,"default-time",optcat,
+ "default track time (in second)",
+ 0,MAX_TIME,1,0),
+};
+
+static const char config_header =
+ "# -*- conf-mode -*-\n"
+ "#\n"
+ "# sc68 config file generated by " PACKAGE_STRING "\n"
+ "#\n"
+ "# " PACKAGE_URL "\n"
+ "#\n";
+
+static int is_symbol_char(int c)
+{
+ return isalnum(c) || c=='_' || c=='.';
+}
+
+static int save_config_entry(vfs68_t * os, const option68_t * opt)
+{
+ char tmp256;
+ int i, j, c;
+ const int max = sizeof(tmp)-1;
+
+ if (opt->org == opt68_UDF || !opt->save)
+ return 0;
+
+ /* Save comment on this entry (description and range) */
+ i = snprintf(tmp, max, "\n# %s", opt->desc);
+ switch (opt->type) {
+ case opt68_BOL:
+ i += snprintf(tmp+i, max-i, "%s"," on|off");
+ break;
+
+ case opt68_INT:
+ if (!opt->sets) {
+ if (opt->min < opt->max)
+ i += snprintf(tmp+i, max-i, " %d..%d", opt->min, opt->max);
+ } else {
+ const int * set = (const int *) opt->set;
+ i += snprintf(tmp+i, max-i, " %c", '');
+ for (j=0; j<(int)opt->sets; ++j)
+ i += snprintf(tmp+i, max-i, "%d%c", setj, j+1==opt->sets?'':',');
+ }
+ break;
+
+ case opt68_ENU:
+ case opt68_STR:
+ if (opt->sets) {
+ const char ** set = (const char **) opt->set;
+ i += snprintf(tmp+i, max-i, " %c", '');
+ for (j=0; j<(int)opt->sets; ++j)
+ i += snprintf(tmp+i, max-i, "%s%c", setj, j+1==opt->sets?'':',');
+ }
+ break;
+ }
+
+ if (i < max)
+ tmpi++ = '\n';
+
+ /* transform name */
+ for (j = 0; i < max && (c = opt->namej); ++j)
+ tmpi++ = (c == '-') ? '_' : c;
+ switch (opt->type) {
+ case opt68_BOL:
+ i += snprintf(tmp+i, max-i, "=%s\n", opt->val.num?"on":"off");
+ break;
+ case opt68_INT:
+ i += snprintf(tmp+i, max-i, "=%d\n", opt->val.num);
+ break;
+ case opt68_ENU:
+ i += snprintf(tmp+i, max-i, "=%s\n", opt->val.num(char**)opt->set);
+ break;
+ case opt68_STR:
+ i += snprintf(tmp+i, max-i, "=%s\n", opt->val.str);
+ break;
+ }
+ tmpi = 0;
+ return - vfs68_puts(os, tmp) < 0;
+}
+
+
+int config68_save(const char * confname)
+{
+ int err = 0;
+ char tmp128;
+ option68_t * opt;
+
+ confname = confname ? confname : config68_def_name;
+
+ if (!config68_use_registry) {
+ /* Save into file */
+ vfs68_t * os=0;
+ const int sizeof_config_hd = sizeof(config_header)-1;
+
+ int tmp_remaining = sizeof(tmp) - 1;
+ const char prefix = "sc68://config/";
+ strncpy(tmp, prefix, tmp_remaining);
+ tmp_remaining -= sizeof(prefix) - 1;
+ strncat(tmp, confname, tmp_remaining);
+ os = uri68_vfs(tmp, 2, 0);
+ err = vfs68_open(os);
+ if (!err) {
+ TRACE68(config68_cat,"conf68: save into \"%s\"\n",
+ vfs68_filename(os));
+ err =
+ - (vfs68_write(os, config_header, sizeof_config_hd)
+ != sizeof_config_hd);
+ for (opt = option68_enum(0); opt; opt=opt->next)
+ err |= save_config_entry(os, opt);
+ }
+ vfs68_close(os);
+ vfs68_destroy(os);
+ } else {
+ /* Save into registry */
+ int l = snprintf(tmp, sizeof(tmp), cuk_fmt, confname);
+ char * s = tmp + l;
+ l = sizeof(tmp) - l;
+
+ for (opt = option68_enum(0); opt; opt=opt->next) {
+ if (opt->org == opt68_UDF || !opt->save)
+ continue;
+ strncpy(s,opt->name,l);
+ switch (opt->type) {
+ case opt68_INT: case opt68_BOL:
+ err |= registry68_puti(0, tmp, opt->val.num);
+ break;
+ case opt68_ENU:
+ err |= registry68_puts(0, tmp, opt->val.num(char**)opt->set);
+ break;
+ case opt68_STR:
+ err |= registry68_puts(0, tmp, opt->val.str);
+ break;
+ }
+ }
+
+ }
+
+ return err;
+}
+
+/* Load config from registry */
+static int load_from_registry(const char * confname)
+{
+ option68_t * opt;
+ int err = 0;
+ char paths264;
+
+ snprintf(paths0, sizeof(paths0), cuk_fmt, confname);
+ strncpy(paths1, lmk_str, sizeof(paths1));
+
+ for (opt = option68_enum(0); opt; opt = opt->next) {
+ char path128, str512;
+ int k, val;
+ if (!opt->save)
+ continue;
+
+ for (k=0; k<2; ++k) {
+ int path_remaining = sizeof(path) - 1;
+ strncpy(path, pathsk, path_remaining);
+ path_remaining -= strlen(pathsk);
+ strncat(path, opt->name, path_remaining);
+
+ TRACE68(config68_cat, "conf68: trying -- '%s'\n", path);
+ switch (opt->type) {
+ case opt68_BOL: case opt68_INT:
+ err = registry68_geti(0, path, &val);
+ if (!err)
+ err = option68_iset(opt, val, opt68_PRIO, opt68_CFG);
+ if (!err)
+ TRACE68(config68_cat,
+ "conf68: load '%s' <- %d\n", path, val);
+ break;
+ case opt68_ENU: case opt68_STR:
+ err = registry68_gets(0, path, str, sizeof(str));
+ if (!err)
+ err = option68_set(opt, str, opt68_PRIO, opt68_CFG);
+ TRACE68(config68_cat,
+ "conf68: load '%s' <- '%s'\n", path, str);
+ break;
+ default:
+ assert(!"invalid option type");
+ err = -1;
+ break;
+ }
+ }
+ }
+
+ return 0;
+}
+
+/* Load config from file */
+static int load_from_file(const char * confname)
+{
+ vfs68_t * is = 0;
+ char s256, * word;
+ int err;
+ option68_t * opt;
+
+ strcpy(s, "sc68://config/");
+ strcat(s, confname);
+ is = uri68_vfs(s, 1, 0);
+ err = vfs68_open(is);
+ if (err)
+ goto error;
+
+ for(;;) {
+ char * name;
+ int i, len, c = 0;
+
+ len = vfs68_gets(is, s, sizeof(s));
+ if (len == -1) {
+ err = -1;
+ break;
+ }
+ if (len == 0) {
+ break;
+ }
+
+ i = 0;
+
+ /* Skip space */
+ while (i < len && (c=si++, isspace(c)))
+ ;
+
+ if (!is_symbol_char(c)) {
+ continue;
+ }
+
+ /* Get symbol name. */
+ name = s+i-1;
+ while (i < len && is_symbol_char(c = si++))
+ if (c == '_') si-1 = c = '-';
+ si-1 = 0;
+
+ /* TRACE68(config68_cat,"conf68: load get key name='%s\n", name); */
+
+ /* Skip space */
+ while (i < len && isspace(c))
+ c=si++;
+
+ /* Must have '=' */
+ if (c != '=') {
+ continue;
+ }
+ c=si++;
+
+ /* Skip space */
+ while (i < len && isspace(c))
+ c=si++;
+
+ word = s + i - 1;
+ while (i < len && (c = si++) && c != '\n');
+ si-1 = 0;
+
+ opt = option68_get(name, opt68_ALWAYS);
+ if (!opt) {
+ TRACE68(config68_cat, "conf68: unknown config key '%s'='%s'\n",
+ name, word);
+ continue;
+ }
+ if (!opt->save) {
+ TRACE68(config68_cat, "conf68: config key '%s'='%s' not for save\n",
+ name, word);
+ }
+
+ TRACE68(config68_cat, "conf68: set name='%s'='%s'\n",
+ name, word);
+ option68_set(opt, word, opt68_PRIO, opt68_CFG);
+ }
+
+error:
+ vfs68_destroy(is);
+ TRACE68(config68_cat, "conf68: loaded => %s\n",strok68(err));
+ return err;
+
+}
+
+
+/* Load config */
+int config68_load(const char * appname)
+{
+ appname = appname ? appname : config68_def_name;
+ return config68_use_registry
+ ? load_from_registry(appname)
+ : load_from_file(appname)
+ ;
+}
+
+int config68_init(int argc, char * argv)
+{
+ config68_cat = msg68_cat("conf","config file", DEBUG_CONFIG68_O);
+ option68_append(opts,sizeof(opts)/sizeof(*opts));
+ argc = option68_parse(argc,argv);
+ config68_use_registry = !config68_force_file && registry68_support();
+ TRACE68(config68_cat,
+ "conf68: will use %s\n",
+ config68_use_registry?"registry":"config file");
+ return argc;
+}
+
+void config68_shutdown(void)
+{
+ msg68_cat_free(config68_cat);
+ config68_cat = msg68_DEFAULT;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/dial68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/dial68/dial68.c Added

@@ -0,0 +1,89 @@
+/*
+ * @file dial68.c
+ * @brief sc68 config file
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* sc68 */
+#include "dial68.h"
+
+
+#ifndef USE_DIALOG
+
+int dial68(void * data, sc68_dial_f cntl)
+{
+ TRACE68(dial_cat,
+ P "%s", "not implemented\n");
+ return -1;
+}
+
+#else
+
+/* libc */
+#include <string.h>
+
+/* defined in dial_conf.c */
+SC68_EXTERN int dial68_new_conf(void ** pdata, sc68_dial_f * pcntl);
+/* defined in dial_finf.c */
+SC68_EXTERN int dial68_new_finf(void ** pdata, sc68_dial_f * pcntl);
+/* defined in dial_tsel.c */
+SC68_EXTERN int dial68_new_tsel(void ** pdata, sc68_dial_f * pcntl);
+
+int dial68(void * data, sc68_dial_f cntl)
+{
+ int res = -1;
+ sc68_dialval_t v;
+
+ if (!cntl) {
+ TRACE68(dial_cat,P "%s -- no callback function\n", __FUNCTION__);
+ goto exit;
+ }
+
+ if (!cntl(data,SC68_DIAL_HELLO,SC68_DIAL_CALL,&v) && v.s) {
+ if (!strcmp(v.s,"config"))
+ res = dial68_new_conf(&data,&cntl);
+ else if (!strcmp(v.s,"fileinfo"))
+ res = dial68_new_finf(&data,&cntl);
+ else if (!strcmp(v.s,"trackselect"))
+ res = dial68_new_tsel(&data,&cntl);
+ else
+ TRACE68(dial_cat, P "unknow dialog -- \"%s\"\n", v.s);
+ if (!res) {
+ switch (cntl(data,SC68_DIAL_NEW,SC68_DIAL_CALL,&v)) {
+ case 1: res = 0; break;
+ case 0: res = v.i; break;
+ default: res = -1; break;
+ }
+ if (!res)
+ res = dial68_frontend(data,cntl);
+ }
+ }
+
+exit:
+ TRACE68(dial_cat,P "%s -- *%d*\n",__FUNCTION__,res);
+ return res;
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/dial68/dial68.h Added

@@ -0,0 +1,75 @@
+/**
+ * @ingroup lib_sc68
+ * @file dial68.h
+ * @brief sc68 dialog helper file.
+ * @author Benjamin Gerard
+ * @date 2014/07/20
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef SC68_DIAL68_H
+#define SC68_DIAL68_H
+
+#include "sc68/sc68.h"
+#include "sc68/file68_msg.h"
+
+#define P "dial68 : " /**< @nodoc */
+SC68_EXTERN int dial_cat; /**< dialog message categorie. */
+
+/**
+ * @defgroup lib_dial68 dialog helper
+ * @ingroup lib_sc68
+ *
+ * This module prodives functions to handle sc68 dialogs.
+ *
+ * @{
+ */
+
+/**
+ * Type for dial68_s structure.
+ */
+typedef struct dial68_s dial68_t;
+
+/**
+ * Dialog base structure.
+ */
+struct dial68_s {
+ int dial; /**< magic number. */
+ int size; /**< sizeof() + extra. */
+ void * data; /**< user data. */
+ sc68_dial_f cntl; /**< user control function. */
+};
+
+SC68_EXTERN
+/**
+ * Create and run a new dialog.
+ *
+ * @param data user private data (cookie).
+ * @param cntl user control function.
+ *
+ * @return dialog return value
+ * @retval -1 the dialog failed
+ * @retval -2 user hit cancel or close
+ */
+int dial68(void * data, sc68_dial_f cntl);
+
+
+SC68_EXTERN
+/**
+ * The dialog frontend (called by dial68()) function.
+ *
+ * @param data user private data (cookie), normally a dial68_t child.
+ * @param cntl user control function.
+ *
+ * @return dialog return value
+ * @retval -1 the dialog failed
+ * @retval -2 user hit cancel or close
+ */
+int dial68_frontend(void * data, sc68_dial_f cntl);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/dial68/dial_conf.c Added

@@ -0,0 +1,290 @@
+/*
+ * @file config.c
+ * @brief sc68 configuration dialog
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/* generated config header */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* libc */
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* sc68 */
+#include "sc68/sc68.h"
+#include "sc68/file68_opt.h"
+#include "sc68/file68_msg.h"
+#include "dial68.h"
+
+static const int magic = ('C'<<24)|('N'<<16)|('F'<<8)|'G';
+
+struct dial_s {
+ dial68_t dial; /* base dialog */
+};
+typedef struct dial_s dial_t;
+
+static inline int ismagic(dial_t * dial)
+{
+ return
+ dial &&
+ dial->dial.dial == magic &&
+ dial->dial.size == sizeof(*dial) &&
+ dial->dial.cntl /* && dial->dial.data */
+ ;
+}
+
+static inline void del_dial(dial_t * dial)
+{
+ assert(dial);
+ assert(!dial->dial.data);
+ assert(!dial->dial.cntl);
+ assert(!dial->dial.size);
+ assert(dial->dial.dial == ~magic);
+ free(dial);
+}
+
+
+/* @retval 0 on success
+ * @retval 1 on unkown/unset key
+ * @retval -1 on error
+ */
+static int getopt(const char * key, int op, sc68_dialval_t * val)
+{
+ option68_t * opt = option68_get(key, opt68_ALWAYS);
+ const int org = opt68_CFG;
+ int ret = 1;
+
+ if (opt) {
+ const int isset = opt->org != opt68_UDF;
+
+ TRACE68(dial_cat,
+ P "Got an option \"%s\" %sset opcode:%d\n",
+ key, isset?"":"not ", op);
+
+ switch (op) {
+
+ case SC68_DIAL_GETI:
+ if (opt->type == opt68_BOL ||
+ opt->type == opt68_INT ||
+ opt->type == opt68_ENU) {
+ if (isset) {
+ val->i = opt->val.num;
+ ret = 0;
+ }
+ } else
+ ret = -1;
+ break;
+
+ case SC68_DIAL_GETS:
+ if (opt->type == opt68_STR) {
+ if (isset) {
+ val->s = opt->val.str;
+ ret = 0;
+ }
+ }
+ else if (opt->type != opt68_ENU) {
+ if (isset) {
+ val->s = opt->val.num(const char **)opt->set;
+ ret = 0;
+ }
+ }
+ else
+ ret = -1;
+ break;
+
+ case SC68_DIAL_ENUM:
+ if (opt->type != opt68_ENU)
+ ret = -1;
+ else {
+ int idx = -1;
+ if (val->i == -1) {
+ if (isset)
+ idx = opt->val.num;
+ } else if (val->i >= 0 && val->i < (int)opt->sets) {
+ idx = val->i;
+ } else
+ ret = -1; /* out of range */
+
+ if (idx >= 0) {
+ assert(idx < (int)opt->sets);
+ val->s = idx(const char **)opt->set;
+ ret = 0;
+ }
+ }
+ break;
+
+ case SC68_DIAL_SETI:
+ ret = option68_iset(opt, val->i, opt68_ALWAYS, org);
+ break;
+
+ case SC68_DIAL_SETS:
+ ret = option68_set(opt, val->s, opt68_ALWAYS, org);
+ break;
+
+ case SC68_DIAL_MIN:
+ val->i = opt->min; ret = 0; break;
+
+ case SC68_DIAL_MAX:
+ val->i = opt->max; ret = 0; break;
+
+ case SC68_DIAL_CNT:
+ val->i = opt->sets; ret = 0; break;
+
+ case SC68_DIAL_CAT:
+ val->s = opt->cat; ret = 0; break;
+
+ case SC68_DIAL_DESC:
+ val->s = opt->desc; ret = 0; break;
+ }
+ }
+
+ return ret;
+}
+
+#define keyis(N) !strcmp(key,N)
+
+static int conf(void * data, const char * key, int op, sc68_dialval_t *val)
+{
+ dial_t * dial = (dial_t *) data;
+ int res = -1;
+
+ static const char * l_spr = {
+ "< custom >",
+ "11 khz","22 khz", "44.1 khz","48 khz","96 khz"
+ };
+ static const int i_spr = {
+ 0,
+ 11025, 22050, 44100, 48000, 96000
+ };
+ const int sprmax = sizeof (l_spr) / sizeof (*l_spr);
+
+ /* Sanity check */
+ if (!key || !ismagic(dial))
+ goto exit;
+
+ /* Run user control function */
+ res = dial->dial.cntl(dial->dial.data, key, op, val);
+
+ /* Kill special case. */
+ if (op == SC68_DIAL_CALL && !strcmp(key,SC68_DIAL_KILL)) {
+ dial->dial.cntl = 0; dial->dial.data = 0; dial->dial.size = 0;
+ dial->dial.dial = ~dial->dial.dial;
+ del_dial(dial);
+ goto exit;
+ }
+
+ /* User dealt with that message. */
+ if (res <= 0)
+ goto exit;
+
+ /* Assume no error */
+ res = 0;
+
+ if (keyis("sampling")) {
+ /* This key is used for the predefined sampling rate */
+
+ switch (op) {
+
+ case SC68_DIAL_CNT:
+ val->i = sprmax;
+ break;
+
+ case SC68_DIAL_GETI: {
+ const option68_t * opt
+ = option68_get("sampling-rate", opt68_ISSET);
+ if (!opt)
+ val->i = 5; /* default to 48khz */
+ else {
+ for (val->i=1; val->i<sprmax; ++val->i)
+ if (i_sprval->i == opt->val.num)
+ break;
+ if (val->i >= sprmax)
+ val->i = 0;
+ }
+ } break;
+
+ case SC68_DIAL_ENUM:
+ if (val->i >= 0 && val->i < sprmax) {
+ val->s = l_sprval->i;
+ break;
+ }
+
+ default:
+ res = -1;
+ }
+
+ }
+ else if (op == SC68_DIAL_CALL) {
+ /* Other special calls like real-time access */
+ if (keyis(SC68_DIAL_NEW))
+ val->i = 0;
+ else if (keyis("save"))
+ val->i = sc68_cntl(0, SC68_CONFIG_SAVE);
+ else if (keyis("amiga-filter"))
+ /* $$$ TODO: realtime amiga-filter */
+ val->i = !!val->i;
+ else if (keyis("amiga-blend"))
+ /* $$$ TODO: realtime amiga-blend */
+ val->i = val->i;
+ else
+ res = 1;
+ }
+ else {
+ /* Finally try it as an option key.
+ *
+ * "sampling-rate" is converted if the value is in the index range
+ * instead of the frequency value range.
+ */
+ if (op == SC68_DIAL_SETI && keyis("sampling-rate")
+ && val->i > 0 && val->i < sprmax)
+ val->i = i_sprval->i;
+ res = getopt(key, op, val);
+ }
+
+exit:
+ TRACE68(dial_cat, P
+ "%s() #%02d \"%s\" -> %d\n", __FUNCTION__, op, key, res);
+ return res;
+}
+
+SC68_EXTERN
+int dial68_new_conf(void ** pdata, sc68_dial_f * pcntl)
+{
+ int res = -1;
+ const int size = sizeof(dial_t);
+ dial_t * dial = (dial_t *) malloc(size);
+
+ if (dial) {
+ dial->dial.dial = magic;
+ dial->dial.size = size;
+ dial->dial.data = *pdata;
+ dial->dial.cntl = *pcntl;
+ *pcntl = conf;
+ *pdata = dial;
+ res = 0;
+ }
+ TRACE68(dial_cat, P "%s -> %p %d\n", __FUNCTION__, (void*)dial, res);
+ return res;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/dial68/dial_finf.c Added

@@ -0,0 +1,271 @@
+/*
+ * @file fileinfo.c
+ * @brief sc68 file info dialog
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/* generated config header */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* libc */
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* sc68 */
+#include "sc68/sc68.h"
+#include "sc68/file68_opt.h"
+#include "sc68/file68_msg.h"
+#include "dial68.h"
+
+static const int magic = ('F'<<24)|('I'<<16)|('N'<<8)|'F';
+
+struct dial_s {
+ dial68_t dial; /* base dialog */
+ sc68_t *sc68; /* result of "sc68" call */
+ sc68_disk_t disk; /* result of "disk" call */
+ sc68_minfo_t info; /* current track info */
+ char tstr4; /* Temp storage for track # */
+};
+typedef struct dial_s dial_t;
+
+static inline int ismagic(dial_t * dial)
+{
+ return
+ dial &&
+ dial->dial.dial == magic &&
+ dial->dial.size == sizeof(*dial) &&
+ dial->dial.cntl /* && dial->dial.data */
+ ;
+}
+
+static inline void del_dial(dial_t * dial)
+{
+ assert(dial);
+ assert(!dial->dial.data);
+ assert(!dial->dial.cntl);
+ assert(!dial->dial.size);
+ assert(dial->dial.dial == ~magic);
+ free(dial);
+}
+
+#define keyis(N) !strcmp(key,N)
+
+static
+int finf(void * data, const char * key, int op, sc68_dialval_t *val)
+{
+ dial_t * const dial = data;
+ int res;
+
+ assert(ismagic(dial));
+ assert(key);
+ assert(val);
+
+ /* Sanity check */
+ if (!key || !val || !ismagic(dial))
+ return -1;
+
+ /* Run user control function */
+ res = dial->dial.cntl(dial->dial.data, key, op, val);
+ TRACE68(dial_cat,P "user-cntl #%02d \"%s\" -> %d\n", op, key, res);
+
+ /* Kill special case. */
+ if (op == SC68_DIAL_CALL && keyis(SC68_DIAL_KILL)) {
+ dial->dial.cntl = 0; dial->dial.data = 0; dial->dial.size = 0;
+ dial->dial.dial = ~dial->dial.dial;
+ del_dial(dial);
+ res = 0;
+ }
+
+ /* User dealt with that message. */
+ if (res <= 0)
+ goto exit;
+
+ /* Assume no error */
+ res = 0;
+
+ if (op == SC68_DIAL_CALL && keyis(SC68_DIAL_NEW)) {
+ if (!dial->dial.cntl(dial->dial.data, "sc68", op, val))
+ dial->sc68 = (sc68_disk_t) val->s;
+ if (!dial->dial.cntl(dial->dial.data, "disk", op, val))
+ dial->disk = (sc68_disk_t) val->s;
+ TRACE68(dial_cat, P "\"%s\" sc68:%p disk:%p\n",
+ key, (void*)dial->sc68, (void*)dial->disk);
+ val->i = sc68_music_info(dial->sc68,&dial->info,1,dial->disk);
+ if (!val->i) {
+ TRACE68(dial_cat, P "Got info: %02d - %s - %s\n",
+ dial->info.tracks, dial->info.artist, dial->info.album);
+ }
+ } else if (keyis("track")) {
+ int track;
+ switch (op) {
+
+ case SC68_DIAL_CNT:
+ val->i = dial->info.tracks; /* get count current */
+ return 0;
+
+ case SC68_DIAL_GETI:
+ val->i = dial->info.trk.track - 1; /* get current */
+ return 0;
+
+ case SC68_DIAL_SETI:
+ track = (int) val->i + 1;
+ if (track <= 0 || track > dial->info.tracks)
+ track = dial->info.dsk.track;
+ if (track != dial->info.trk.track)
+ sc68_music_info(dial->sc68, &dial->info, track, dial->disk);
+ val->i = dial->info.trk.track - 1;
+ return 0;
+
+ case SC68_DIAL_ENUM:
+ track = val->i;
+ if (track >= 0 && track < dial->info.tracks) {
+ ++track;
+ dial->tstr0 = '0' + (track/10u);
+ dial->tstr1 = '0' + (track%10u);
+ dial->tstr2 = 0;
+ val->s = dial->tstr;
+ } else {
+ TRACE68(dial_cat, P "invalid index \"%s%d\"", key,track);
+ val->s = "";
+ res = -1;
+ }
+ break;
+
+ default:
+ res = -1;
+ }
+ } else {
+
+ switch (op) {
+
+ case SC68_DIAL_GETS:
+ /* if (keyis("uri")) */
+ /* val->s = dial->uri; */
+ /* else */
+ if (keyis("format"))
+ val->s = dial->info.format;
+ else if (keyis("genre"))
+ val->s = dial->info.genre;
+ else if (keyis("title"))
+ val->s = dial->info.title;
+ else if (keyis("artist"))
+ val->s = dial->info.artist;
+ else if (keyis("album"))
+ val->s = dial->info.album;
+ else if (keyis("ripper"))
+ val->s = dial->info.ripper;
+ else if (keyis("converter"))
+ val->s = dial->info.converter;
+ else if (keyis("year"))
+ val->s = dial->info.year;
+ else
+ res = 1;
+ break;
+
+ case SC68_DIAL_GETI:
+ if (keyis("time"))
+ val->i = (dial->info.trk.time_ms+500u)/1000u;
+ else if (keyis("hw_ym"))
+ val->i = dial->info.trk.ym;
+ else if (keyis("hw_ste"))
+ val->i = dial->info.trk.ste;
+ else if (keyis("hw_asid"))
+ val->i = dial->info.trk.asid;
+ else if (keyis("tag-key"))
+ val->i = 0;
+ else
+ res = 1;
+ break;
+
+ case SC68_DIAL_ENUM:
+ if (keyis("tag-key") || keyis("tag-val")) {
+ const int a = dial->info.dsk.tags;
+ const int n = a + dial->info.trk.tags;
+ if (val->i >= 0 && val->i<n) {
+ val->s = val->i < a
+ ? ( key4 == 'k'
+ ? dial->info.dsk.tagval->i.key
+ : dial->info.dsk.tagval->i.val )
+ : ( key4 == 'k'
+ ? dial->info.trk.tagval->i-a.key
+ : dial->info.trk.tagval->i-a.val )
+ ;
+ } else
+ res = -1;
+ } else
+ res = 1;
+ break;
+
+ default:
+ res = 1;
+ }
+ }
+
+exit:
+ if (op == SC68_DIAL_CNT) {
+ TRACE68(dial_cat, P
+ "%s() \"%s\"# -> %d (%d)\n",
+ __FUNCTION__, key, val->i, res);
+ }
+
+ if (op == SC68_DIAL_GETI) {
+ TRACE68(dial_cat, P
+ "%s() \"%s\" -> %d (%d)\n",
+ __FUNCTION__, key, val->i, res);
+ }
+
+ if (op == SC68_DIAL_GETS || op == SC68_DIAL_ENUM) {
+ TRACE68(dial_cat, P
+ "%s() \"%s\" -> \"%s\" (%d)\n",
+ __FUNCTION__, key, !res?val->s:"<not-set>", res);
+ }
+
+ TRACE68(dial_cat, P
+ "%s() #%02d \"%s\" -> %d\n",
+ __FUNCTION__, op, key, res);
+ return res;
+}
+
+
+SC68_EXTERN
+int dial68_new_finf(void ** pdata, sc68_dial_f * pcntl)
+{
+ int res = -1;
+ const int size = sizeof(dial_t);
+ dial_t * dial = (dial_t *) malloc(size);
+
+ if (dial) {
+ memset(dial,0,size);
+ dial->dial.dial = magic;
+ dial->dial.size = size;
+ dial->dial.data = *pdata;
+ dial->dial.cntl = **pcntl;
+ *pcntl = finf;
+ *pdata = dial;
+ res = 0;
+ }
+ TRACE68(dial_cat, P "%s -> %p %d\n", __FUNCTION__, (void*)dial, res);
+ return res;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/dial68/dial_tsel.c Added

@@ -0,0 +1,261 @@
+/*
+ * @file tracksel.c
+ * @brief sc68 track selector dialog
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/* generated config header */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* libc */
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/* sc68 */
+#include "sc68/sc68.h"
+#include "sc68/file68_opt.h"
+#include "sc68/file68_msg.h"
+#include "dial68.h"
+
+static const int magic = ('T'<<24)|('S'<<16)|('E'<<8)|'L';
+
+struct dial_s {
+ dial68_t dial; /* base dialog */
+ sc68_t *sc68; /* result of "sc68" call */
+ sc68_disk_t disk; /* result of "disk" call */
+ int track; /* 0:all >0 track# */
+ int asid; /* 0:off 1:on 2:force */
+ sc68_minfo_t info; /* store current track info */
+ char tstr128; /* used as temporary string */
+};
+typedef struct dial_s dial_t;
+
+static inline int ismagic(dial_t * dial)
+{
+ return
+ dial &&
+ dial->dial.dial == magic &&
+ dial->dial.size == sizeof(*dial) &&
+ dial->dial.cntl /* && dial->dial.data */
+ ;
+}
+
+static inline void del_dial(dial_t * dial)
+{
+ assert(dial);
+ assert(!dial->dial.data);
+ assert(!dial->dial.cntl);
+ assert(!dial->dial.size);
+ assert(dial->dial.dial == ~magic);
+ free(dial);
+}
+
+#define keyis(N) !strcmp(key,N)
+
+static
+int tsel(void * data, const char * key, int op, sc68_dialval_t *val)
+{
+ dial_t * const dial = data;
+ int res;
+
+ /* Sanity check */
+ if (!key || !ismagic(dial))
+ return -1;
+
+ /* Run user control function */
+ res = dial->dial.cntl(dial->dial.data, key, op, val);
+ TRACE68(dial_cat,P "user-cntl #%02d \"%s\" -> %d\n", op, key, res);
+
+ /* Kill special case. */
+ if (op == SC68_DIAL_CALL && keyis(SC68_DIAL_KILL)) {
+ dial->dial.cntl = 0; dial->dial.data = 0; dial->dial.size = 0;
+ dial->dial.dial = ~dial->dial.dial;
+ del_dial(dial);
+ res = 0;
+ }
+
+ /* User dealt with that message. */
+ if (res <= 0)
+ goto exit;
+
+ /* Assume no error */
+ res = 0;
+
+ if (op == SC68_DIAL_CALL && keyis(SC68_DIAL_NEW)) {
+ if (!dial->dial.cntl(dial->dial.data, "sc68", op, val))
+ dial->sc68 = (sc68_t *)val->s;
+ if (!dial->dial.cntl(dial->dial.data, "disk", op, val))
+ dial->disk = (sc68_disk_t) val->s;
+ /* abort dialof on error */
+ val->i = sc68_music_info(dial->sc68,&dial->info,1,dial->disk);
+ if (!val->i) {
+ TRACE68(dial_cat, P "Got info: %02d - %s - %s\n",
+ dial->info.tracks, dial->info.album, dial->info.title);
+ }
+ assert(!res);
+ }
+
+ else if (keyis("track")) {
+ int track;
+
+ switch (op) {
+ case SC68_DIAL_CNT:
+ val->i = dial->info.tracks+1;
+ TRACE68(dial_cat, P "Got %s# = %d\n", key, val->i);
+ assert(!res);
+ break;
+ case SC68_DIAL_GETI:
+ val->i = dial->track;
+ TRACE68(dial_cat, P "Got %s@ = %d\n", key, val->i);
+ assert(!res);
+ break;
+ case SC68_DIAL_SETI:
+ track = (int) val->i;
+ if (track < 0 || track > dial->info.tracks)
+ track = 0;
+ if (track > 0 && track != dial->info.trk.track) {
+ sc68_music_info(dial->sc68, &dial->info, track, dial->disk);
+ track = dial->info.trk.track;
+ }
+ val->i = dial->track = track;
+ assert(!res);
+ break;
+
+ case SC68_DIAL_ENUM:
+ if (!val->i)
+ snprintf(dial->tstr,sizeof(dial->tstr),"ALL - %s",
+ dial->info.album);
+ else if (val->i <= dial->info.tracks) {
+ sc68_music_info_t info;
+ sc68_music_info(dial->sc68, &info, val->i, dial->disk);
+ snprintf(dial->tstr,sizeof(dial->tstr),"%02u - %s",
+ info.trk.track, info.title);
+ } else {
+ res = -1;
+ break;
+ }
+ dial->tstrsizeof(dial->tstr)-1 = 0;
+ val->s = dial->tstr;
+ assert(!res);
+ break;
+
+ default:
+ res = -1;
+ }
+ }
+
+ else if (keyis("asid")) {
+ static const char * asid3 = { "Off", "On", "Force" };
+ const int max = sizeof(asid) / sizeof(*asid);
+ switch (op) {
+ case SC68_DIAL_CNT:
+ val->i = max;
+ assert(!res);
+ break;
+ case SC68_DIAL_GETI:
+ assert (dial->asid >= 0 && dial->asid < max);
+ val->i = dial->asid;
+ assert(!res);
+ break;
+ case SC68_DIAL_SETI:
+ assert (val->i >= 0 && val->i < max);
+ if (val->i >= 0 && val->i < max) {
+ dial->asid = val->i;
+ assert(!res);
+ } else
+ res = -1;
+ break;
+
+ case SC68_DIAL_ENUM:
+ if (val->i == -1) {
+ assert (dial->asid >= 0 && dial->asid < max);
+ val->s = asiddial->asid;
+ assert(!res);
+ } else if (val->i >= 0 && val->i < max) {
+ val->s = asidval->i;
+ assert(!res);
+ } else
+ res = -1;
+ break;
+
+ default:
+ res = -1;
+ }
+ }
+ else if (op == SC68_DIAL_GETS && keyis("album")) {
+ val->s = dial->info.album;
+ }
+ else if (op == SC68_DIAL_GETI && keyis("hw_asid")) {
+ val->i = dial->info.trk.asid;
+ } else {
+ res = -1;
+ }
+
+exit:
+ if (op == SC68_DIAL_CNT) {
+ TRACE68(dial_cat, P
+ "%s() \"%s\"# -> %d (%d)\n",
+ __FUNCTION__, key, val->i, res);
+ }
+
+ if (op == SC68_DIAL_GETI) {
+ TRACE68(dial_cat, P
+ "%s() \"%s\" -> %d (%d)\n",
+ __FUNCTION__, key, val->i, res);
+ }
+
+ if (op == SC68_DIAL_GETS || op == SC68_DIAL_ENUM) {
+ TRACE68(dial_cat, P
+ "%s() \"%s\" -> \"%s\" (%d)\n",
+ __FUNCTION__, key, !res?val->s:"<not-set>", res);
+ }
+
+ TRACE68(dial_cat, P
+ "%s() #%02d \"%s\" -> %d\n",
+ __FUNCTION__, op, key, res);
+ return res;
+}
+
+
+SC68_EXTERN
+int dial68_new_tsel(void ** pdata, sc68_dial_f * pcntl)
+{
+ int res = -1;
+ const int size = sizeof(dial_t);
+ dial_t * dial = (dial_t *) malloc(size);
+
+ if (dial) {
+ memset(dial,0,size);
+ dial->dial.dial = magic;
+ dial->dial.size = size;
+ dial->dial.data = *pdata;
+ dial->dial.cntl = **pcntl;
+ *pcntl = tsel;
+ *pdata = dial;
+ res = 0;
+ }
+ TRACE68(dial_cat, P "%s -> %p %d\n", __FUNCTION__, (void*)dial, res);
+ return res;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/assert68.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/cc68.h Added

@@ -0,0 +1,247 @@
+/**
+ * @ingroup lib_emu68
+ * @file emu68/cc68.h
+ * @brief Condition code header.
+ * @author Benjamin Gerard
+ * @date 1999/03/13
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_CC68_H
+#define EMU68_CC68_H
+
+#include "emu68_api.h"
+#include "srdef68.h"
+
+/**
+ * @addtogroup lib_emu68_core
+ * @{
+ */
+
+/**
+ * Code Conditions.
+ */
+enum {
+ CC68_TR = 0x0, CC68_FA = 0x1, CC68_HI = 0x2, CC68_LS = 0x3,
+ CC68_CC = 0x4, CC68_CS = 0x5, CC68_NE = 0x6, CC68_EQ = 0x7,
+ CC68_VC = 0x8, CC68_VS = 0x9, CC68_PL = 0xA, CC68_MI = 0xB,
+ CC68_GE = 0xC, CC68_LT = 0xD, CC68_GT = 0xE, CC68_LE = 0xF
+};
+
+/**
+ * @name Condition tests.
+ *
+ * Theses macros perform conditionnal tests depending on CCR value.
+ *
+ * @return 1 condition true
+ * @return 0 condition false
+ * @{
+ */
+
+/**
+ * 0000 True.
+ * @param sr current SR value
+ * @retval always true
+ */
+static inline int inl_is_cc0(const int sr)
+{
+ return 1;
+}
+
+/**
+ * 0001 False.
+ * @param sr current SR value
+ * @return always false
+ */
+static inline int inl_is_cc1(const int sr)
+{
+ return 0;
+}
+
+/**
+ * 0010 High.
+ * @param sr current SR value
+ * @retval ¬(C|Z) <-> ¬C&¬Z
+ */
+static inline int inl_is_cc2(const int sr)
+{
+ return ~
+ ( ( sr >> SR_C_BIT )
+ |
+ ( sr >> SR_Z_BIT )
+ ) & 1;
+}
+
+/**
+ * 0011 Low or Same.
+ * @param sr current SR value
+ * @return (C|Z)
+ */
+static inline int inl_is_cc3(const int sr)
+{
+ return
+ ( ( sr >> SR_C_BIT )
+ |
+ ( sr >> SR_Z_BIT )
+ ) & 1;
+}
+/* #define IS_LS(SR) inl_is_cc3(SR) */
+
+/**
+ * 0100 Carry Clear.
+ * @param sr current SR value
+ * @return ¬C
+ */
+static inline int inl_is_cc4(const int sr)
+{
+ return ~
+ ( sr >> SR_C_BIT ) & 1;
+}
+
+/**
+ * 0101 Carry Set.
+ * @param sr current SR value
+ * @return C
+ */
+static inline int inl_is_cc5(const int sr)
+{
+ return
+ ( sr >> SR_C_BIT ) & 1;
+}
+
+/**
+ * 0110 Not Equal (not zero).
+ * @param sr current SR value
+ * @return ¬Z
+ */
+static inline int inl_is_cc6(const int sr)
+{
+ return ~
+ ( sr >> SR_Z_BIT ) & 1;
+}
+
+/**
+ * 0111 Equal (zero).
+ * @param sr current SR value
+ * @return Z
+ */
+static inline int inl_is_cc7(const int sr)
+{
+ return
+ ( sr >> SR_Z_BIT ) & 1;
+}
+
+/**
+ * 1000 Overflow Clear.
+ * @param sr current SR value
+ * @return ¬V
+ */
+static inline int inl_is_cc8(const int sr)
+{
+ return ~
+ ( sr >> SR_V_BIT ) & 1;
+}
+
+/**
+ * 1001 Overflow Set.
+ * @param sr current SR value
+ * @return V
+ */
+static inline int inl_is_cc9(const int sr)
+{
+ return
+ ( sr >> SR_V_BIT ) & 1;
+}
+
+/**
+ * 1010 Plus.
+ * @param sr current SR value
+ * @return ¬N
+ */
+static inline int inl_is_ccA(const int sr)
+{
+ return ~
+ ( sr >> SR_N_BIT ) & 1;
+}
+
+/**
+ * 1011 Minus.
+ * @param sr current SR value
+ * @return N
+ */
+static inline int inl_is_ccB(const int sr)
+{
+ return
+ ( sr >> SR_N_BIT ) & 1;
+}
+
+/**
+ * 1100 Greater or Equal.
+ * @param sr current SR value
+ * @return ¬(N^V)
+ */
+static inline int inl_is_ccC(const int sr)
+{
+ return ~
+ ( ( sr >> SR_N_BIT )
+ ^
+ ( sr >> SR_V_BIT )
+ ) & 1;
+}
+
+/**
+ * 1101 Less Than.
+ * @param sr current SR value
+ * @return N^V
+ */
+static inline int inl_is_ccD(const int sr)
+{
+ return
+ ( ( sr >> SR_N_BIT )
+ ^
+ ( sr >> SR_V_BIT )
+ ) & 1;
+}
+
+/**
+ * 1110 Greater Than.
+ * @param sr current SR value
+ * @return ¬(Z|(N^V))
+ */
+static inline int inl_is_ccE(const int sr)
+{
+ return ~
+ ( ( sr >> SR_Z_BIT )
+ |
+ ( ( sr >> SR_N_BIT )
+ ^
+ ( sr >> SR_V_BIT ) )
+ ) & 1;
+}
+
+/**
+ * 1111 Less or Equal.
+ * @param sr current SR value
+ * @return (Z|(N^V))
+ */
+static inline int inl_is_ccF(const int sr)
+{
+ return
+ ( ( sr >> SR_Z_BIT )
+ |
+ ( ( sr >> SR_N_BIT )
+ ^
+ ( sr >> SR_V_BIT ) )
+ ) & 1;
+}
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/crc32.c Added

@@ -0,0 +1,90 @@
+/*
+ * @file emu68/crc32.c
+ * @brief compute a crc32
+ * @author Original implementation by Gary S. Brown
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+static u32 crc32_tab = {
+ 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+ 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+ 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+ 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+ 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+ 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+ 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+ 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+ 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+ 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+ 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+ 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+ 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+ 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+ 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+ 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+ 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+ 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+ 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+ 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+ 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+ 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+ 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+ 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+ 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+ 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+ 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+ 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+ 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+ 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+ 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+ 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+ 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+ 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+ 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+ 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+ 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+ 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+ 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+ 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+ 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+ 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+ 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+ 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+ 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+ 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+ 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+ 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+ 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+ 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+ 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+ 0x2d02ef8dL
+ };
+
+static uint68_t crc32(uint68_t crc32val, const u8 * s, int68_t len)
+{
+ const u8 * e = s + len;
+
+ while ( s < e ) {
+ crc32val =
+ crc32_tab(crc32val ^ *s++) & 0xff ^
+ (crc32val >> 8);
+ }
+ return crc32val;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/emu68.c Added

@@ -0,0 +1,852 @@
+/*
+ * @file emu68/emu68.c
+ * @brief emu68 API
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/* generated config include */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "struct68.h"
+#include "srdef68.h"
+#include "excep68.h"
+#include "assert68.h"
+
+#include "emu68.h"
+#include "ioplug68.h"
+#include "io68/io68.h"
+
+#include "macro68.h"
+
+#include "inl68_exception.h"
+#include <string.h>
+#include <stdio.h>
+
+EMU68_EXTERN linefunc68_t *line_func1024;
+
+/* ,-----------------------------------------------------------------.
+ * | Internal struct access |
+ * `-----------------------------------------------------------------'
+ */
+
+/* Set new interrupt IO
+ * return previous pointer
+ */
+io68_t * emu68_set_interrupt_io(emu68_t * const emu68, io68_t * const io)
+{
+ io68_t * oldio = 0;
+ if (emu68) {
+ oldio = emu68->interrupt_io;
+ emu68->interrupt_io = io;
+ }
+ return oldio;
+}
+
+void emu68_set_registers(emu68_t * emu68, const reg68_t * r, int mask)
+{
+ if (emu68 && r) {
+ int i;
+ if ( mask & ( 1 << REG68_US_IDX ) ) REG68.usp = r->usp;
+ if ( mask & ( 1 << REG68_PC_IDX ) ) REG68.pc = r->pc;
+ if ( mask & (1 << REG68_SR_IDX ) ) REG68.sr = r->sr;
+ for ( i=0; i<8; i++ )
+ if ( mask & ( 1 << ( REG68_D0_IDX + i ) ) ) REG68.di = r->di;
+ for ( i=0; i<8; i++)
+ if ( mask & ( 1 << ( REG68_A0_IDX + i ) ) ) REG68.ai = r->ai;
+ }
+}
+
+void emu68_get_registers(const emu68_t * const emu68, reg68_t * r, int mask)
+{
+ if (emu68 && r) {
+ int i;
+ if ( mask & ( 1 << REG68_US_IDX ) ) r->usp = REG68.usp;
+ if ( mask & ( 1 << REG68_PC_IDX ) ) r->pc = REG68.pc;
+ if ( mask & ( 1 << REG68_SR_IDX ) ) r->sr = REG68.sr;
+ for ( i=0; i<8; i++ )
+ if ( mask & ( 1 << ( REG68_D0_IDX + i ) ) ) r->di = REG68.di;
+ for ( i=0; i<8; i++ )
+ if ( mask & ( 1 << ( REG68_A0_IDX + i ) ) ) r->ai = REG68.ai;
+ }
+}
+
+void emu68_set_cycle(emu68_t * const emu68, cycle68_t cycle)
+{
+ emu68->cycle = cycle;
+}
+
+cycle68_t emu68_get_cycle(emu68_t * const emu68)
+{
+ return emu68->cycle;
+}
+
+void * emu68_set_cookie(emu68_t * const emu68, void * cookie)
+{
+ void * old = 0;
+ if (emu68) {
+ old = emu68->cookie;
+ emu68->cookie = cookie;
+ }
+ return old;
+}
+
+void * emu68_get_cookie(emu68_t * const emu68)
+{
+ return emu68
+ ? emu68->cookie
+ : 0
+ ;
+}
+
+emu68_handler_t emu68_set_handler(emu68_t * const emu68, emu68_handler_t hdl)
+{
+ emu68_handler_t old = emu68->handler;
+ emu68->handler = hdl;
+ return old;
+}
+
+emu68_handler_t emu68_get_handler(emu68_t * const emu68)
+{
+ return emu68
+ ? emu68->handler
+ : 0
+ ;
+}
+
+const char * emu68_exception_name(unsigned int vector, char * buf)
+{
+ static const char * xtra_names = {
+ "hw-trace", "hw-halt", "hw-stop", "hw-reset", "hw-init", "hw-iovf"
+ };
+
+ static const char * xcpt_names = {
+ "reset-sp", "reset-pc", "bus-error", "addr-error",
+ "illegal", "0-divide", "chk", "trapv", "privv",
+ "trace", "linea", "linef"
+ };
+
+ static char tmp16;
+ if (!buf) buf = tmp;
+
+ switch ( vector & ~0xCFF ) {
+ case 0x000:
+ if (vector < sizeof(xcpt_names)/sizeof(*xcpt_names))
+ strcpy(buf,xcpt_namesvector);
+ else if (vector >= TRAP_VECTOR(0) && vector <= TRAP_VECTOR(15))
+ sprintf(buf,"trap#%02d",vector-TRAP_VECTOR_0);
+ else
+ sprintf(buf,"vector#%02x",vector);
+ break;
+
+ case 0x100:
+ vector -= 0x100;
+ if (vector < 0x20)
+ sprintf(buf,"hw-brkp#%02d",vector);
+ else if (vector-0x20 < sizeof(xtra_names)/sizeof(*xtra_names))
+ strcpy(buf,xtra_namesvector-0x20);
+ else
+ sprintf(buf,"special#%02x",vector);
+ break;
+
+ case 0x200:
+ sprintf(buf,"private#%02x", vector-0x200);
+ break;
+ default:
+ sprintf(buf,"invalid#%d", vector);
+ break;
+ }
+ return buf;
+}
+
+/* ,-----------------------------------------------------------------.
+ * | Onboard memory access |
+ * `-----------------------------------------------------------------'
+ */
+
+u8 * emu68_memptr(emu68_t * const emu68, addr68_t dst, uint68_t sz)
+{
+ u8 * ptr = 0;
+ if (emu68) {
+ const uint68_t adr = dst;
+ const uint68_t bot = MEMMSK68+1;
+ const uint68_t end = adr+sz;
+ if (adr >= bot || end > bot || adr > end) {
+ emu68_error_add(emu68,
+ "invalid memory range $%06x..$%06x > $%06x",
+ adr,end,bot);
+ } else {
+ ptr = emu68->mem + dst;
+ }
+ }
+ return ptr;
+}
+
+u8 * emu68_chkptr(emu68_t * const emu68, addr68_t dst, uint68_t sz)
+{
+ u8 * ptr = emu68_memptr(emu68,dst,sz);
+ if (ptr && emu68->chk) {
+ ptr = emu68->chk + (ptr - emu68->mem);
+ }
+ return ptr;
+}
+
+/* Peek & Poke */
+int emu68_peek(emu68_t * const emu68, addr68_t addr)
+{
+ return emu68
+ ? emu68->memaddr & MEMMSK68
+ : -1
+ ;
+}
+
+int emu68_chkpeek(emu68_t * const emu68, addr68_t addr)
+{
+ return (emu68 && emu68->chk)
+ ? emu68->chkaddr & MEMMSK68
+ : -1
+ ;
+}
+
+int emu68_poke(emu68_t * const emu68, addr68_t addr, int68_t v)
+{
+ return emu68
+ ? (emu68->memaddr & MEMMSK68 = v)
+ : -1
+ ;
+}
+
+int emu68_chkpoke(emu68_t * const emu68, addr68_t addr, int68_t v)
+{
+ return (emu68 && emu68->chk)
+ ? (emu68->chkaddr & MEMMSK68 = v)
+ : -1
+ ;
+}
+
+/* Write memory block to 68K on board memory
+ */
+int emu68_memput(emu68_t * const emu68, addr68_t dst, const u8 *src, uint68_t sz)
+{
+ u8 * ptr = emu68_memptr(emu68,dst,sz);
+ if (ptr) {
+ memcpy(ptr,src,sz);
+ return 0;
+ }
+ return -1;
+}
+
+/* Read memory block from 68K on board memory
+ */
+int emu68_memget(emu68_t * const emu68, u8 *dst, addr68_t src, uint68_t sz)
+{
+ u8 * ptr = emu68_memptr(emu68,src,sz);
+ if (ptr) {
+ memcpy(dst,ptr,sz);
+ }
+ return -!ptr;
+}
+
+int emu68_memset(emu68_t * const emu68, addr68_t dst, u8 val, uint68_t sz)
+{
+ u8 * ptr;
+
+ if (!emu68) {
+ ptr = 0;
+ } else {
+ if (!sz) {
+ sz = emu68->memmsk + 1 - dst;
+ }
+ ptr = emu68_memptr(emu68, dst, sz);
+ if (ptr)
+ memset(ptr,val,sz);
+ }
+ return -!ptr;
+}
+
+int emu68_chkset(emu68_t * const emu68, addr68_t dst, u8 val, uint68_t sz)
+{
+ u8 * ptr;
+
+ if (!emu68) {
+ ptr = 0;
+ } else {
+ if (!sz) {
+ sz = emu68->memmsk+1-dst;
+ }
+ ptr = emu68_chkptr(emu68, dst, sz);
+ if (ptr)
+ memset(ptr,val,sz);
+ }
+ return -!ptr;
+}
+
+static uint_t crc32b(uint_t crc, u8 * ptr, int len)
+{
+ u8 * end = ptr + len;
+ /* crc = (u32)~crc; */
+ while (ptr < end) {
+ int j;
+ crc ^= *ptr++;
+ for (j = 7; j >= 0; j--) {
+ const int mask = -(int)(crc & 1);
+ crc = (crc >> 1) ^ (0xEDB88320 & mask);
+ }
+ }
+ /* crc = (u32)~crc; */
+ return crc;
+}
+
+uint68_t emu68_crc32(emu68_t * const emu68)
+{
+ uint68_t crc = 0;
+ if ( emu68 ) {
+ int i;
+ u8 tmp 18 * 4 + 2 ; /* serialize registers */
+ s32 * reg32 = emu68->reg.d;
+ for ( i = 0; i < 18*4; i += 4 ) {
+ unsigned int v = reg32i>>2;
+ tmpi+0 = v >> 24;
+ tmpi+1 = v >> 16;
+ tmpi+2 = v >> 8;
+ tmpi+3 = v;
+ }
+ tmpi++ = emu68->reg.sr >> 8;
+ tmpi++ = emu68->reg.sr;
+ assert ( i == sizeof(tmp) );
+
+ crc = crc32b(0xFFFFFFFF, tmp, i);
+ crc = crc32b(crc, emu68->mem, emu68->memmsk+1);
+ }
+ return crc;
+}
+
+/* Process a single instruction emulation. */
+static inline void step68(emu68_t * const emu68)
+{
+ int line,opw,reg9;
+ u8 * mem;
+
+ assert( emu68->status == EMU68_NRM );
+ emu68->inst_pc = REG68.pc;
+ /* Save the sr and rise the trace exception if needed. */
+ if ( ((emu68->inst_sr = emu68->reg.sr) & SR_T) ) {
+ inl_exception68(emu68, TRACE_VECTOR, -1);
+ if (emu68->status != EMU68_NRM)
+ return;
+ }
+
+ /* TODO: check address valid */
+ mem = emu68->mem + (REG68.pc & (MEMMSK68 & ~1));
+ REG68.pc += 2;
+ opw = (mem0<<8) | mem1;
+
+ /* 68000 OP-WORD format :
+ * 1111 0000 0000 0000 ( LINE )
+ * 0000 0001 1111 1000 ( OP )
+ * 0000 0000 0000 0111 ( REG 0 )
+ * 0000 1110 0000 0000 ( REG 9 )
+ */
+
+ /* LINE RG9 OPCODE RG0 */
+ /* -------------------- */
+ line = opw & 0170000; /* 1111 000 000-000 000 */
+ opw -= line; /* 0000 111 111-111 111 */
+ reg9 = opw & 07000; /* 0000 111 000-000 000 */
+ opw -= reg9; /* 0000 000 111-111 111 */
+ reg9 >>= 9; /* reg9 */
+ line |= opw<<3;
+ line >>= 6;
+ opw &= 7; /* 0000 000 000-000 111 */
+ (line_funcline)(emu68, reg9, opw);
+}
+
+static inline int valid_bp(const unsigned int id) {
+ return id < 31u;
+}
+
+static inline int free_bp(const emu68_t * const emu68, const int id) {
+ return !emu68->breakpointsid.count;
+}
+
+/* Run a single step emulation with all program controls. */
+static inline int controlled_step68(emu68_t * const emu68)
+{
+ assert( emu68->status == EMU68_NRM );
+
+ /* running in debug mode. */
+ if (emu68->chk) {
+ int id;
+ addr68_t addr;
+ /* HardWare TRACE exception */
+ inl_exception68(emu68, HWTRACE_VECTOR, -1);
+ if (emu68->status != EMU68_NRM)
+ return emu68->status;
+ /* HardWare BREAKPOINT exception: the memory is flagged with a
+ * breakpoint number and that breakpoint is active.
+ */
+ addr = REG68.pc & MEMMSK68;
+ id = (emu68->chkaddr >> 3) - 1;
+ if (valid_bp(id) && emu68->breakpointsid.count) {
+ assert( addr == emu68->breakpointsid.addr );
+ if (! --emu68->breakpointsid.count ) {
+ /* breakpoint count reachs 0, it is an actual break:
+ * - run the appropriate exception
+ * - reset the breakpoint; delete it if neccessary
+ */
+ if (! (emu68->breakpointsid.count = emu68->breakpointsid.reset))
+ emu68->chkaddr &= EMU68_A;
+ inl_exception68(emu68, HWBREAK_VECTOR+id, -1);
+ if (emu68->status != EMU68_NRM)
+ return emu68->status;
+ }
+ }
+ chkframe(emu68, REG68.pc, EMU68_X);
+ }
+
+ /* Execute 68K instruction. */
+ step68(emu68);
+
+ /* Instruction countdown */
+ if ( emu68->instructions && !--emu68->instructions )
+ if (emu68->status == EMU68_NRM) {
+ emu68->status = EMU68_BRK;
+ inl_exception68(emu68, HWINSTOV_VECTOR, -1);
+ }
+
+ return emu68->status;
+}
+
+static void loop68(emu68_t * const emu68)
+{
+ assert( ! (emu68->finish_sp & 1 ) );
+ assert( emu68->status == EMU68_NRM );
+
+ while ( controlled_step68(emu68) == EMU68_NRM &&
+ emu68->finish_sp >= (addr68_t) REG68.a7 )
+ ;
+}
+
+const char * emu68_status_name(enum emu68_status_e status)
+{
+ switch (status) {
+ case EMU68_ERR: return "error";
+ case EMU68_NRM: return "ok";
+ case EMU68_STP: return "stop";
+ case EMU68_HLT: return "halt";
+ case EMU68_BRK: return "break";
+ case EMU68_XCT: return "exception";
+ }
+
+ assert(!"unknown emu68 status");
+
+ return "unknown";
+}
+
+/* Execute one instruction. */
+int emu68_step(emu68_t * const emu68, uint68_t inst)
+{
+ int rc = EMU68_ERR;
+
+ assert (emu68);
+ assert (inst == EMU68_STEP || inst == EMU68_CONT);
+
+ if (emu68) {
+ if (inst == EMU68_STEP) {
+ emu68->frm_chk_fl = 0;
+ emu68->status = EMU68_NRM;
+ }
+
+ switch (emu68->status) {
+ case EMU68_NRM:
+ controlled_step68(emu68);
+ case EMU68_BRK:
+ case EMU68_STP:
+ case EMU68_HLT:
+ rc = emu68->status;
+ break;
+
+ default:
+ assert(!"unexpected value for emu68_t::status");
+ break;
+ }
+ }
+ return rc;
+}
+
+int emu68_finish(emu68_t * const emu68, uint68_t instructions)
+{
+ io68_t *io;
+
+ assert (emu68);
+ if (!emu68)
+ return EMU68_ERR;
+
+
+ if (instructions != EMU68_CONT) {
+ emu68->finish_sp = REG68.a7;
+ emu68->frm_chk_fl = 0;
+ emu68->instructions = instructions;
+ }
+
+ if (emu68->cycle) {
+ for (io=emu68->iohead; io; io=io->next) {
+ io->adjust_cycle(io, emu68->cycle);
+ }
+ emu68->cycle = 0;
+ }
+
+ emu68->status = EMU68_NRM;
+ /* assert ( emu68->status == EMU68_NRM ); */
+ loop68(emu68);
+
+ return emu68->status;
+}
+
+/* Execute interruptions. */
+int emu68_interrupt(emu68_t * const emu68, cycle68_t cycleperpass)
+{
+ assert(emu68);
+ if (!emu68)
+ return EMU68_ERR;
+
+ assert ( emu68->status == EMU68_NRM || emu68->status == EMU68_STP );
+
+ /* Clear STOP mode. If interrupt is running it means execution is
+ * not stopped anymore.
+ */
+ emu68->status = EMU68_NRM;
+
+ /* Get interrupt IO (MFP) if any */
+ if (emu68->interrupt_io) {
+ for ( ;; ) {
+ const int ipl = ( REG68.sr >> SR_I_BIT ) & 7;
+ interrupt68_t * t =
+ emu68->interrupt_io->interrupt(emu68->interrupt_io, cycleperpass);
+ if (!t)
+ break;
+ emu68->cycle = t->cycle;
+ if (t->level > ipl) {
+ inl_exception68(emu68, t->vector, t->level);
+ if (emu68->status != EMU68_NRM)
+
+ /* $$$ ignore break in interrupt atm as we can't resume
+ * properly
+ */
+ if (emu68->status == EMU68_BRK)
+ emu68->status = EMU68_NRM;
+
+ emu68->finish_sp = (addr68_t) REG68.a7;
+ loop68(emu68);
+ }
+ }
+ }
+ emu68->cycle = cycleperpass;
+
+ return emu68->status;
+}
+
+
+/* Get debug mode. */
+int emu68_debugmode(emu68_t * const emu68)
+{
+ assert(emu68);
+ return emu68
+ ? !!emu68->chk
+ : -1
+ ;
+}
+
+/* ,-----------------------------------------------------------------.
+ * | Breakpoints |
+ * `-----------------------------------------------------------------'
+ */
+
+static void bp_reset(emu68_t * const emu68)
+{
+ int id;
+ assert(emu68);
+
+ for ( id=0; valid_bp(id); ++id ) {
+ emu68->breakpointsid.addr = 0;
+ emu68->breakpointsid.count = 0;
+ emu68->breakpointsid.reset = 0;
+ }
+}
+
+void emu68_bp_delall(emu68_t * const emu68)
+{
+ int id;
+ assert(emu68);
+
+ for ( id=0; valid_bp(id); ++id ) {
+ emu68_bp_del(emu68, id);
+ }
+}
+
+void emu68_bp_del(emu68_t * const emu68, int id)
+{
+ assert(emu68);
+
+ if (emu68 && valid_bp(id)) {
+ if (emu68->chk && !free_bp(emu68,id)) {
+ const addr68_t addr = emu68->breakpointsid.addr & MEMMSK68;
+ emu68->chkaddr &= EMU68_A;
+ }
+ emu68->breakpointsid.addr = 0;
+ emu68->breakpointsid.count = 0;
+ emu68->breakpointsid.reset = 0;
+ }
+}
+
+int emu68_bp_set(emu68_t * const emu68, int id,
+ addr68_t addr, uint68_t count, uint68_t reset)
+{
+ assert(emu68);
+
+ if (!emu68) {
+ id = -1;
+ } else {
+ if ( id == -1 )
+ for ( id=0; valid_bp(id) && !free_bp(emu68,id); ++id)
+ ;
+ if ( valid_bp(id) ) {
+ emu68->breakpointsid.addr = addr &= MEMMSK68;
+ emu68->breakpointsid.count = count;
+ emu68->breakpointsid.reset = reset;
+ if (emu68->chk)
+ emu68->chkaddr = (emu68->chkaddr & EMU68_A) | ((id+1)<<3);
+ } else {
+ id = -1;
+ }
+ }
+ return id;
+}
+
+int emu68_bp_find(emu68_t * const emu68, addr68_t addr)
+{
+ int id = -1;
+
+ assert(emu68);
+ if (emu68) {
+ int i;
+ for ( i=0; valid_bp(i); ++i ) {
+ if ( !free_bp(emu68, i) &&
+ !( (emu68->breakpointsi.addr ^ addr) & MEMMSK68 ) ) {
+ id = i;
+ break;
+ }
+ }
+ }
+ return id;
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Emulator init functions |
+ * `-----------------------------------------------------------------'
+ */
+
+extern io68_t * mem68_io(void);
+
+static emu68_parms_t def_parms;
+
+emu68_t * emu68_create(emu68_parms_t * const parms)
+{
+ emu68_t * emu68 = 0;
+ int memsize, membyte;
+ emu68_parms_t * const p = parms ? parms : &def_parms;
+
+ if (!p->log2mem) {
+ p->log2mem = def_parms.log2mem;
+ }
+ if (p->log2mem < 16 || p->log2mem > 24) {
+ emu68_error_add(emu68,
+ "invalid requested amount of memory -- 2^%d",
+ p->log2mem);
+ goto error;
+ }
+
+ if (!p->clock) {
+ p->clock = def_parms.clock;
+ }
+ if (p->clock<500000u || p->clock>60000000u) {
+ emu68_error_add(emu68,
+ "invalid clock frequency -- %u", p->clock);
+ goto error;
+ }
+
+ memsize = 1 << p->log2mem;
+ membyte = sizeof(emu68_t) + (memsize << !!p->debug);
+ emu68 = emu68_alloc(membyte);
+ if (!emu68)
+ goto error;
+
+ memset(emu68,0,sizeof(emu68_t));
+ /* memset(emu68,0,membyte); */ /* this is too heavy just don't */
+
+ strncpy(emu68->name,p->name?p->name:"emu68",sizeof(emu68->name)-1);
+ emu68->clock = p->clock;
+
+ emu68->log2mem = p->log2mem;
+ emu68->memmsk = memsize-1;
+ emu68->chk = p->debug ? emu68->mem + memsize + 8 : 0;
+ emu68_mem_init(emu68);
+ /* Notice that emu68_reset() triggers the HWVECTOR_INIT exception
+ * but it won't be catch by the user as as at this point it is null.
+ */
+ emu68_reset(emu68);
+
+error:
+ return emu68;
+}
+
+emu68_t * emu68_duplicate(emu68_t * emu68src, const char * dupname)
+{
+ emu68_parms_t parms;
+ emu68_t * emu68 = 0;
+
+ assert(!"This function needs rework");
+ return 0;
+
+ assert(emu68src);
+ if (!emu68src)
+ goto error;
+
+ /* Create an instance with the same parameters */
+ parms.name = dupname;
+ parms.log2mem = emu68->log2mem;
+ parms.clock = emu68->clock;
+ parms.debug = !!emu68->chk;
+ emu68 = emu68_create(&parms);
+ if (!emu68)
+ goto error;
+
+ /* Copy registers and status */
+ emu68->reg = emu68src->reg;
+ emu68->cycle = emu68src->cycle;
+
+ /* Copy memory access control stuff */
+ emu68->frm_chk_fl = emu68src->frm_chk_fl;
+ emu68->fst_chk = emu68src->fst_chk;
+ emu68->lst_chk = emu68src->lst_chk;
+
+ emu68->instructions = emu68src->instructions;
+ emu68->finish_sp = emu68src->finish_sp;
+ emu68->status = emu68src->status;
+
+ /* Copy memory */
+ memcpy(emu68->mem, emu68src->mem, 1<<emu68->log2mem);
+ if (emu68->chk)
+ memcpy(emu68->chk, emu68src->chk, 1<<emu68->log2mem);
+
+ /* Copy breakpoints */
+ memcpy(emu68->breakpoints, emu68src->breakpoints,
+ sizeof(emu68->breakpoints));
+
+ /* TODO: all related IO stuff */
+
+error:
+ return emu68;
+}
+
+/* Destroy emulator instance. */
+void emu68_destroy(emu68_t * const emu68)
+{
+ if (emu68) {
+ emu68_ioplug_destroy_all(emu68);
+ emu68_mem_destroy(emu68);
+ emu68_free(emu68);
+ }
+}
+
+/* 68000 Hardware Reset
+ * - PC = 0
+ * - SR = 2700
+ * - A7 = end of mem - 4
+ * - All registers cleared
+ * - All IO reseted
+ */
+void emu68_reset(emu68_t * const emu68)
+{
+ assert(emu68);
+ if (emu68) {
+ io68_t * io;
+
+ /* Reset IOs */
+ for (io=emu68->iohead; io; io=io->next)
+ io68_reset(io);
+ io68_reset(emu68->memio);
+ if (&emu68->ramio != emu68->memio)
+ io68_reset(&emu68->ramio);
+ if (&emu68->errio != emu68->memio)
+ io68_reset(&emu68->errio);
+
+ /* Reset breakpoints. */
+ bp_reset(emu68);
+
+ /* Reset registers. */
+ memset(REG68.d,0,sizeof(REG68.d)*2);
+ REG68.pc = 0;
+ REG68.sr = 0x2700;
+ REG68.a7 = MEMMSK68+1-4;
+ REG68.usp = REG68.a7;
+
+ /* Reset internals */
+ emu68->nerr = 0;
+ emu68->cycle = 0;
+ emu68->frm_chk_fl = 0;
+ emu68->instructions = 0;
+ emu68->finish_sp = -1;
+ emu68->status = EMU68_NRM;
+ emu68->inst_sr = emu68->inst_pc = -1;
+
+ /* Reset memory access control flags */
+ if (emu68->chk)
+ memset(emu68->chk, 0, emu68->memmsk+1);
+
+ /* Notify init is complete */
+ inl_exception68(emu68, HWINIT_VECTOR, -1);
+ }
+}
+
+/* ,-----------------------------------------------------------------.
+ * | Library init functions |
+ * `-----------------------------------------------------------------'
+ */
+
+/* Library initialize. */
+int emu68_init(int * argc, char ** argv)
+{
+ def_parms.name = 0;
+ def_parms.log2mem = 20; /* log2mem: 2^20 => 1 mB */
+ def_parms.clock = EMU68_ATARIST_CLOCK;
+ def_parms.debug = 0;
+
+ /* $$$ TODO: parse argument */
+ return 0;
+}
+
+/* Library shutdown. */
+void emu68_shutdown(void)
+{
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/emu68.h Added

@@ -0,0 +1,618 @@
+/**
+ * @ingroup lib_emu68
+ * @file emu68/emu68.h
+ * @brief 68K emulator header.
+ * @author Benjamin Gerard
+ * @date 1999/03/13
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_EMU68_H
+#define EMU68_EMU68_H
+
+#include "emu68_api.h"
+#include "struct68.h"
+#include "error68.h"
+#include "cc68.h"
+#include "srdef68.h"
+#include "mem68.h"
+
+/**
+ * @defgroup lib_emu68 68k emulator library
+ * @ingroup lib_sc68
+ * @brief The 68k emulator library.
+ */
+
+/**
+ * @defgroup lib_emu68_core 68k emulator core
+ * @ingroup lib_emu68
+ * @brief The core of the 68k emulator.
+ */
+
+/**
+ * @addtogroup lib_emu68
+ * @{
+ */
+
+/**
+ * @name Library init functions
+ * @{
+ */
+
+EMU68_API
+/**
+ * Init EMU68 library.
+ *
+ * The emu68_init() function initializes the EMU68 library. It
+ * should be call once before any other emu68 call. The function
+ * will perform internal setup. EMU68 behaviour can be adjust by
+ * passing arguments in the argv array. Parsed arguments are
+ * removed and the remaining number of argument is returned.
+ *
+ * @retval -1 on error
+ * @retval 0 on success
+ *
+ * @see emu68_shutdown()
+ */
+int emu68_init(int * argc, char ** argv);
+
+EMU68_API
+/**
+ * Shutdown 68K emulator.
+ *
+ * The emu68_shutdown() function shutdown the EMU68 library. It must
+ * be call at the end and further more calls are forbidden except
+ * for emu68_init(). All emulator instances created should have been
+ * killed before.
+ *
+ * @see emu68_init()
+ */
+void emu68_shutdown(void);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name EMU68 instance functions
+ * @{
+ */
+
+/**
+ * Atari ST clock (as written on cristal clock chip).
+ */
+enum {
+ EMU68_ATARIST_CLOCK = (8010613u&~3u)
+};
+
+/**
+ * 68k emulator instance creation parameters. This structure have to
+ * be filled before calling the emu68_create() function to customize
+ * the instance. Members set to zero are replaced by default values.
+ */
+typedef struct {
+ const char * name; /**< Identifier name. */
+ int log2mem; /**< Memory amount (value of the power of 2). */
+ int clock; /**< CPU clock frequency (in hz). */
+ int debug; /**< Run in debug mode (0:off). */
+} emu68_parms_t;
+
+EMU68_API
+/**
+ * Create a 68k emulator instance.
+ *
+ * The emu68_create() function creates an instance of the 68k
+ * emulator. The logmem parameter is the size of the 68K memory
+ * expressed in power of 2. Valid values are in the range 17 to 24
+ * (inclusive) respectively 128 Kb to 16 Mb. Members set to zero
+ * will be replaced by the default value; alternatively if null
+ * pointer is passed the whole default parameters is applied (512KB
+ * at 8Mhz).
+ *
+ * @param parms Creation parameters or null pointer.
+ * @return emu68 instance
+ * @retval 0 on error
+ */
+emu68_t * emu68_create(emu68_parms_t * const parms);
+
+EMU68_API
+/**
+ * Duplicate a 68k emulator instance.
+ *
+ * The emu68_dup() function creates an new instance of the 68k
+ * emulator which is a duplicate of the given emu68 instance.
+ *
+ * @param emu68 emulator instance to duplicate
+ * @param name duplicate emulator name 0:auto
+ *
+ * @return duplicated emu68 instance
+ * @retval 0 on error
+ *
+ * @todo Duplicate attached IO is currently not supported since IO
+ * modules do not have a dup() function.
+ */
+emu68_t * emu68_duplicate(emu68_t * emu68, const char * name);
+
+EMU68_API
+/**
+ * Destroy a 68k emulator instance.
+ * @param emu68 emulator instance
+ */
+void emu68_destroy(emu68_t * const emu68);
+
+EMU68_API
+/**
+ * Hardware Reset.
+ *
+ * Perform following operations:
+ * - PC = 0
+ * - SR = 2700
+ * - A7 = end of mem - 4
+ * - All registers cleared
+ * - All IO reseted
+ *
+ * @param emu68 emulator instance
+ */
+void emu68_reset(emu68_t * const emu68);
+
+/**
+ * @}
+ */
+
+
+/* /\ ============================================================ /\ */
+/* < > ============================================================ < > */
+/* \/ ============================================================ \/ */
+
+
+/**
+ * @name Exception and Interruption control functions.
+ *
+ * EMU68 has a very limited interrupt handler. In fact only one
+ * source of interruption is used which is enought for sc68
+ * needs. The emu68_set_interrupt_io() function selects the given
+ * IO chip as the candidate to interruption.
+ *
+ * Exception can be trapped and notified by calling specified
+ * handler function.
+ *
+ * @{
+ */
+
+EMU68_API
+/**
+ * Set new interrupt IO.
+ *
+ * @param emu68 emulator instance
+ * @param io pointer to the only io that could possibly interrupt
+ * @return pointer to previous interrupt IO
+ */
+io68_t * emu68_set_interrupt_io(emu68_t * const emu68, io68_t * const io);
+
+EMU68_API
+/**
+ * Set user-data pointer.
+ *
+ * @param emu68 emulator instance
+ * @param cookie user-data pointer
+ * @return previous user-data pointer
+ */
+void * emu68_set_cookie(emu68_t * const emu68, void * cookie);
+
+EMU68_API
+/**
+ * Get user-data pointer.
+ *
+ * @param emu68 emulator instance
+ * @return current user-data pointer
+ */
+void * emu68_get_cookie(emu68_t * const emu68);
+
+EMU68_API
+/**
+ * Set user handler.
+ *
+ * @param emu68 emulator instance
+ * @param hdl user handler (0:do not update)
+ * @return previous handler
+ */
+emu68_handler_t emu68_set_handler(emu68_t * const emu68, emu68_handler_t hdl);
+
+EMU68_API
+/**
+ * Get exception name.
+ *
+ * @param vector Exception vector number
+ * @param buffer Buffer to store name (0:use internal static buffer)
+ * @return exception name copied in buffer (never nul)
+ */
+const char * emu68_exception_name(unsigned int vector, char * buffer);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Cycle counter access functions.
+ * @{
+ */
+
+EMU68_API
+/**
+ * Set internal cycle counter.
+ *
+ * @param emu68 emulator instance
+ * @param cycle cycle number
+ */
+void emu68_set_cycle(emu68_t * const emu68, cycle68_t cycle);
+
+EMU68_API
+/**
+ * Get internal cycle counter.
+ *
+ * @param emu68 emulator instance
+ */
+cycle68_t emu68_get_cycle(emu68_t * const emu68);
+
+/**
+ * @}
+ */
+
+
+/* /\ ============================================================ /\ */
+/* < > ============================================================ < > */
+/* \/ ============================================================ \/ */
+
+
+/**
+ * @name EMU68 on-board memory access
+ * @{
+ */
+
+EMU68_API
+/**
+ * Check and get a valid 68k onboard memory block.
+ *
+ * @param emu68 emulator instance
+ * @param addr address of memory block to access
+ * @param size size in byte of the memory block
+ *
+ * @return Pointer to onboard memory block
+ * @retval 0 Failure
+ */
+u8 * emu68_memptr(emu68_t * const emu68, addr68_t addr, uint68_t size);
+
+EMU68_API
+/**
+ * Check and get a valid 68k onboard memory access control block.
+ *
+ * @param emu68 emulator instance
+ * @param addr address of memory block to access
+ * @param size size in byte of the memory block
+ *
+ * @return pointer to onboard memory block
+ * @retval 0 Failure
+ */
+u8 * emu68_chkptr(emu68_t * const emu68, addr68_t addr, uint68_t size);
+
+
+EMU68_API
+/**
+ * Read a byte from 68K onboard memory.
+ *
+ * @param emu68 emulator instance
+ * @param addr address of byte to access
+ *
+ * @see emu68_poke()
+ */
+int emu68_peek(emu68_t * const emu68, addr68_t addr);
+
+EMU68_API
+/**
+ * Read a byte from 68K access control memory.
+ *
+ * @param emu68 emulator instance
+ * @param addr address of byte to access
+ *
+ * @see emu68_chkpoke()
+ */
+int emu68_chkpeek(emu68_t * const emu68, addr68_t addr);
+
+
+EMU68_API
+/**
+ * Write a byte in 68K onboard memory.
+ *
+ * @param emu68 emulator instance
+ * @param addr address of byte to access
+ * @param byte byte value
+ *
+ * @see emu68_peek()
+ */
+int emu68_poke(emu68_t * const emu68, addr68_t addr, int68_t byte);
+
+EMU68_API
+/**
+ * Write a byte in 68K access control memory.
+ *
+ * @param emu68 emulator instance
+ * @param addr address of byte to access
+ * @param byte byte value
+ *
+ * @see emu68_peek()
+ */
+int emu68_chkpoke(emu68_t * const emu68, addr68_t addr, int68_t byte);
+
+EMU68_API
+/**
+ * Write a memory block in 68K on-board memory.
+ *
+ * The function copy a memory block in 68K on-board memory after verifying
+ * that the operation access valid 68K memory.
+ *
+ * @param emu68 emulator instance
+ * @param dst address of memory block to access in the 68k memory
+ * @param src pointer to the source buffer
+ * @param size size in byte of the memory block
+ *
+ * @see emu68_memget()
+ * @see emu68_memvalid()
+ */
+int emu68_memput(emu68_t * const emu68,
+ addr68_t dst, const u8 * src, uint68_t size);
+
+EMU68_API
+/**
+ * Read a 68K on-board memory block.
+ *
+ * The function copy a 68K on-board memory to a memory location after
+ * verifying that the operation access valid 68K memory.
+ *
+ * @param emu68 emulator instance
+ * @param dst pointer to the destination buffer
+ * @param src address of memory block to access in the 68k memory
+ * @param size size in byte of the memory block
+ *
+ * @see emu68_memput()
+ * @see emu68_memvalid()
+ */
+int emu68_memget(emu68_t * const emu68,
+ u8 * dst, addr68_t src, uint68_t size);
+
+EMU68_API
+/**
+ * Fill a 68k on board memory block with a value.
+ *
+ * @param emu68 emulator instance
+ * @param addr address of 68K memory block to access
+ * @param byte byte value to write
+ * @param size size in byte of the memory block
+ * @return error-code
+ * @retval 0 on success
+ * @retval -1 on error
+ */
+int emu68_memset(emu68_t * const emu68,
+ addr68_t addr, u8 byte, uint68_t size);
+
+EMU68_API
+/**
+ * Fill a 68k access control memory block with a value.
+ *
+ * @param emu68 emulator instance
+ * @param addr address of 68K memory block to access
+ * @param byte byte value to write
+ * @param size size in byte of the memory block
+ * @return error-code
+ * @retval 0 on success
+ * @retval -1 on error
+ */
+int emu68_chkset(emu68_t * const emu68,
+ addr68_t addr, u8 byte, uint68_t size);
+
+EMU68_API
+/**
+ * Push 32-bit long word.
+ * @param emu68 emulator instance
+ * @param val value to push.
+ */
+void emu68_pushl(emu68_t * const emu68, int68_t val);
+
+EMU68_API
+/**
+ * Push 16-bit word.
+ * @param emu68 emulator instance
+ * @param val value to push.
+ */
+void emu68_pushw(emu68_t * const emu68, int68_t val);
+
+EMU68_API
+/**
+ * Pop 32-bit long word.
+ * @param emu68 emulator instance
+ * @return poped 32-bit value
+ */
+int68_t emu68_popl(emu68_t * const emu68);
+
+EMU68_API
+/**
+ * Pop 16-bit word.
+ * @param emu68 emulator instance
+ * @return poped 16-bit value
+ */
+int68_t emu68_popw(emu68_t * const emu68);
+
+EMU68_API
+/**
+ * Compute CRC32 of emu68 object (registers + memory).
+ * @param emu68 emulator instance
+ * @return crc32
+ */
+uint68_t emu68_crc32(emu68_t * const emu68);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Execution functions
+ * @{
+ *
+ * @todo Describe execution loop here ...
+ *
+ */
+
+/**
+ * Execution status code.
+ *
+ * The emu68_status_e:: values
+ */
+enum emu68_status_e {
+ EMU68_ERR = -1, /**< Execution failed. */
+ EMU68_NRM = 0x00, /**< Execution running normally. */
+ EMU68_STP = 0x01, /**< Execution stopped by the stop instruction. */
+ EMU68_HLT = 0x12, /**< Execution halted (double fault or user). */
+ EMU68_BRK = 0x13, /**< Execution break by user. */
+ EMU68_XCT = 0x24 /**< Execution in exception. */
+};
+
+EMU68_API
+/**
+ * Get status name.
+ *
+ * @param status one of the emu68_status_e value.
+ * @return status name
+ */
+const char * emu68_status_name(enum emu68_status_e status);
+
+EMU68_API
+/**
+ * Execute one instruction. If the inst parameter is EMU68_STEP
+ * emu68_t::framechk is cleared and emu68_t::status is set to
+ * EMU68_NRM for a clean new run.
+ *
+ * @param emu68 emulator instance
+ * @param inst EMU68_STEP or EMU68_CONT
+ * @return @ref emu68_status_e "execution status"
+ */
+int emu68_step(emu68_t * const emu68, uint68_t inst);
+
+/**
+ * Various constant.
+ */
+enum emu68_const_e {
+ EMU68_STEP = 0, /**< Start a fresh run (emu68_step()) */
+ EMU68_INF = 0, /**< No instruction limit emu68_finish() */
+ EMU68_CONT = -1 /**< Continue a run (emu68_step() or emu68_finish() */
+};
+
+EMU68_API
+/**
+ * Execute until RTS (Return To Subroutine).
+ *
+ * The execution might be breaked by user or stop instruction or
+ * some kind of error. It might be continued by using EMU68_CONT as
+ * instruction counter.
+ *
+ * @param emu68 emulator instance
+ * @param instructions max instruction to execute 0: no limit,
+ * EMU68_CONT: continue a broken run
+
+ * @return @ref emu68_status_e "execution status"
+ */
+int emu68_finish(emu68_t * const emu68, uint68_t instructions);
+
+EMU68_API
+/**
+ * Execute interruptions with given cycle interval.
+ *
+ * @param emu68 emulator instance
+ * @param cycles interval within to excute interruptions
+ *
+ * @return @ref emu68_status_e "execution status"
+ */
+int emu68_interrupt(emu68_t * const emu68, cycle68_t cycles);
+
+/**
+ * @}
+ */
+
+/**
+ * @name Breakpoint functions.
+ * @{
+ */
+
+EMU68_API
+/**
+ * Kill all existing breakpoints.
+ */
+void emu68_bp_delall(emu68_t * const emu68);
+
+EMU68_API
+/**
+ * Delete a existing breakpoint.
+ *
+ * @param emu68 emulator instance
+ * @param id breakpoint identifier
+ */
+void emu68_bp_del(emu68_t * const emu68, int id);
+
+EMU68_API
+/**
+ * Set/Create a breakpoint.
+ *
+ * @param emu68 emulator instance
+ * @param id breakpoint identifier (-1:find free breakpooint)
+ * @param addr breakpoint address
+ * @param count breakpoint countdown
+ * @param reset breakpoint countdown reset (0:remove after break)
+ * @return breakpoint identifier
+ * @retval -1 on error
+ */
+int emu68_bp_set(emu68_t * const emu68, int id,
+ addr68_t addr, uint68_t count, uint68_t reset);
+
+EMU68_API
+/**
+ * Find breakpoint.
+ *
+ * @param emu68 emulator instance
+ * @param addr breakpoint address
+ * @return breakpoint identifier
+ * @retval -1 on error
+ */
+int emu68_bp_find(emu68_t * const emu68, addr68_t addr);
+
+/**
+ * @}
+ */
+
+/**
+ * @name Version checking functions
+ * @{
+ */
+
+EMU68_API
+/**
+ * Get debug mode.
+ *
+ * @param emu68 emulator instance
+ *
+ * @retval 0 normal mode
+ * @retval 1 debug mode
+ * @retval -1 error
+ */
+int emu68_debugmode(emu68_t * const emu68);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/emu68_api.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/error68.c Added

@@ -0,0 +1,77 @@
+/*
+ * @file emu68/error68.c
+ * @brief error message handler
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "error68.h"
+
+#ifdef MAXERROR
+#undef MAXERROR
+#endif
+#ifdef MAXERRORSTR
+#undef MAXERRORSTR
+#endif
+
+#define MAXERROR (sizeof(emu68->err)/sizeof(emu68->err0))
+#define MAXERRORSTR sizeof(emu68->err0)
+
+/* Push error message
+ */
+int emu68_error_add(emu68_t * const emu68, const char * format, ...)
+{
+ if (emu68 && format) {
+ va_list list;
+ int n = emu68->nerr;
+
+ if (n >= MAXERROR) {
+ memmove(emu68->err0,emu68->err1,MAXERRORSTR*(MAXERROR-1));
+ n = MAXERROR-1;
+ }
+
+ va_start(list,format);
+ vsnprintf(emu68->errn,MAXERRORSTR,format,list);
+ va_end(list);
+ emu68->errnMAXERRORSTR-1 = 0;
+ emu68->nerr = ++n;
+ }
+ return -1;
+}
+
+/* Pop error message
+ */
+const char * emu68_error_get(emu68_t * const emu68)
+{
+ const char * res = 0;
+ if (emu68 && emu68->nerr > 0) {
+ res = emu68->err--emu68->nerr;
+ }
+ return res;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/error68.h Added

@@ -0,0 +1,60 @@
+/**
+ * @ingroup   lib_emu68
+ * @file      emu68/error68.h
+ * @brief     Error message stack header.
+ * @author    Benjamin Gerard
+ * @date      1999/03/13
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_ERROR68_H
+#define EMU68_ERROR68_H
+
+#include "emu68_api.h"
+#include "struct68.h"
+
+/**
+ * @defgroup  lib_emu68_err  Error message stack
+ * @ingroup   lib_emu68
+ *
+ *   EMU68 error handling consists on a fixed size stack of
+ *   messages. When an EMU68 function fails, it stores a description
+ *   message for the error and returns -1. If error stack is full, the
+ *   oldest stacked message is removed.
+ *
+ * @{
+ */
+
+EMU68_API
+/**
+ * Push formatted error message.
+ *
+ *   The emu68_error_add() function formats error message and pushes
+ *   it in error stack.  On overflow the older message is lost.
+ *
+ * @param  emu68   emulator instance.
+ * @param  format  printf() like format string.
+ *
+ * @return error-code
+ */
+int emu68_error_add(emu68_t * const emu68, const char * format, ...);
+
+EMU68_API
+/**
+ * Pop last error message.
+ *
+ *   Retrieve and remove last error message from error stack.
+ *
+ * @param  emu68   emulator instance.
+ *
+ * @return  Last pushed error message.
+ * @retval  0  Empty message stack, no more message.
+ */
+const char * emu68_error_get(emu68_t * const emu68);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/excep68.h Added

@@ -0,0 +1,77 @@
+/**
+ * @ingroup lib_emu68
+ * @file emu68/excep68.h
+ * @brief 68k exception and interruption definition header.
+ * @author Benjamin Gerard
+ * @date 1999/13/03
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_EXCEP68_H
+#define EMU68_EXCEP68_H
+
+/**
+ * @addtogroup lib_emu68
+ *
+ * @{
+ */
+
+/**
+ * @name 68k exceptions and interruptions
+ *
+ * 68K interruptions are defined by a vector and a level. The
+ * interrupt vector is a long word stored in memory at vector
+ * address. This long word is the location of the interrupt routine
+ * which is loaded in the PC register. The interrupt level is the
+ * value transfered to the IPL field of SR so that no lower leveled
+ * interruption may be triggered.
+ *
+ * @{
+ */
+
+enum emu68_vector_e {
+ /* Virtual private vectors. */
+ HWBREAK_VECTOR = 0x100, /**< 1st hardware breakpoint, next follow. */
+ HWTRACE_VECTOR = 0x120, /**< Report hardware trace. */
+ HWHALT_VECTOR = 0x121, /**< Report processor halted. */
+ HWSTOP_VECTOR = 0x122, /**< Report processor suspended (stop). */
+ HWRESET_VECTOR = 0x123, /**< Report IO reset (reset). */
+ HWINIT_VECTOR = 0x124, /**< Report a hardware reset (emu68_reset). */
+ HWINSTOV_VECTOR = 0x125, /**< Report instruction count overflow. */
+
+ PRIVATE_VECTOR = 0x200, /**< First private vector for users. */
+
+ /* Real 68k vectors. */
+ RESET_VECTOR = 0x000, /**< External (hardware) reset. */
+ RESET_SP_VECTOR = 0x000, /**< Initial interrupt stack pointer. */
+ RESET_PC_VECTOR = 0x001, /**< Initial program counter. */
+ BUSERR_VECTOR = 0x002, /**< Access fault vector address. */
+ ADRERR_VECTOR = 0x003, /**< Access error vector address. */
+ ILLEGAL_VECTOR = 0x004, /**< Illegal instruction vector address. */
+ DIVIDE_VECTOR = 0x005, /**< Integer divide by zero. */
+ CHK_VECTOR = 0x006, /**< Chk/Chk2 instructions vector address. */
+ TRAPV_VECTOR = 0x007, /**< F/TRAP/V/cc istructions vector address. */
+ PRIVV_VECTOR = 0x008, /**< Privilege violation vector address. */
+ TRACE_VECTOR = 0x009, /**< Trace vector address. */
+ LINEA_VECTOR = 0x00A, /**< Linea vector address. */
+ LINEF_VECTOR = 0x00B, /**< Linef vector address. */
+ SPURIOUS_VECTOR = 0x018, /**< Spurious interrupt vector address. */
+ TRAP_VECTOR_0 = 0x020, /**< Trap \#n vector address. */
+};
+
+/** Nth TRAP vector address. */
+#define TRAP_VECTOR(N) ( ( (N) & 15 ) + TRAP_VECTOR_0 )
+
+/** Nth interrupt auto vector address. */
+#define AUTO_VECTOR(N) ( ( (N) & 07 ) + SPURIOUS_VECTOR )
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/getea68.c Added

@@ -0,0 +1,228 @@
+/*
+ * @file emu68/getea68.c
+ * @brief get 68000 addressing mode effective address
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "error68.h"
+#include "assert68.h"
+#include "excep68.h"
+#include "mem68.h"
+
+EMU68_EXTERN
+void exception68(emu68_t * const emu68, const int vector, const int level);
+
+static addr68_t ea_error(emu68_t * const emu68, const int reg)
+{
+ assert(EMU68_BREAK);
+ /* $$$ must trigger an exception just not sure which exactly */
+ exception68(emu68, ADRERR_VECTOR, -1);
+ return 0;
+}
+
+/* (AN) */
+static addr68_t ea_inAN(emu68_t * const emu68, const int reg)
+{
+ return (s32) REG68.areg;
+}
+
+/* (AN)+ */
+static addr68_t ea_inANpb(emu68_t * const emu68, const int reg)
+{
+ addr68_t addr = (s32) REG68.areg;
+ REG68.areg = (u32) ( REG68.areg + 1 + (reg==7) );
+ return addr;
+}
+
+static addr68_t ea_inANpw(emu68_t * const emu68, const int reg)
+{
+ addr68_t addr = (s32) REG68.areg;
+ REG68.areg = (u32) ( REG68.areg + 2 );
+ return addr;
+}
+
+static addr68_t ea_inANpl(emu68_t * const emu68, const int reg)
+{
+ addr68_t addr = (s32) REG68.areg;
+ REG68.areg = (u32) ( REG68.areg + 4 );
+ return addr;
+}
+
+/* -(AN) */
+static addr68_t ea_inmANb(emu68_t * const emu68, const int reg)
+{
+ return (s32) ( REG68.areg = (u32) ( REG68.areg - 1 - (reg==7) ) );
+}
+
+static addr68_t ea_inmANw(emu68_t * const emu68, const int reg)
+{
+ return (s32) ( REG68.areg = (u32) ( REG68.areg - 2 ) );
+}
+
+static addr68_t ea_inmANl(emu68_t * const emu68, const int reg)
+{
+ return (s32) ( REG68.areg = (u32) ( REG68.areg - 4 ) );
+}
+
+/* d(AN) */
+static addr68_t ea_indAN(emu68_t * const emu68, const int reg)
+{
+ return (s32) ( REG68.areg + get_nextw() );
+}
+
+/* d(AN,Xi) */
+static addr68_t ea_inANXI(emu68_t * const emu68, const int reg)
+{
+ int68_t w = get_nextw();
+ int68_t reg2;
+ reg2 = ( w >> 12 ) & 15;
+ reg2 = ( w & 04000 )
+ ? (int68_t) (s32) REG68.dreg2
+ : (int68_t) (s16) REG68.dreg2
+ ;
+ return (s32) ( REG68.areg + (s8) w + reg2 );
+}
+
+/* ABS.W */
+static addr68_t ea_inABSW(emu68_t * const emu68, const int reg)
+{
+ return get_nextw();
+}
+
+/* ABS.L */
+static addr68_t ea_inABSL(emu68_t * const emu68, const int reg)
+{
+ return get_nextl();
+}
+
+/* d(PC) */
+static addr68_t ea_inrelPC(emu68_t * const emu68, const int reg)
+{
+ addr68_t pc = (s32) REG68.pc;
+ return (s32) ( pc + get_nextw() );
+}
+
+/* d(PC,Xi) */
+static addr68_t ea_inPCXI(emu68_t * const emu68, const int reg)
+{
+ addr68_t pc = (s32) REG68.pc;
+ int68_t w = get_nextw();
+ int68_t reg2 = ( w >> 12 ) & 15;
+ pc += ( w & 04000 )
+ ? (int68_t) (s32) REG68.dreg2
+ : (int68_t) (s16) REG68.dreg2
+ ;
+ pc += (s8) w;
+ return (s32) pc;
+}
+
+/* # */
+static addr68_t ea_inIMMb(emu68_t * const emu68, const int reg)
+{
+ addr68_t pc = (s32) REG68.pc;
+ REG68.pc = (u32) ( pc + 2 );
+ return (s32) ( pc + 1 );
+}
+
+static addr68_t ea_inIMMw(emu68_t * const emu68, const int reg)
+{
+ s32 pc = REG68.pc;
+ REG68.pc = (u32) (pc + 2);
+ return pc;
+}
+
+static addr68_t ea_inIMMl(emu68_t * const emu68, const int reg)
+{
+ s32 pc = REG68.pc;
+ REG68.pc = (u32) ( pc + 4 );
+ return pc;
+}
+
+/***************************
+ * *
+ * Opmode tables for Get EA *
+ * *
+ ***************************/
+
+/* Mode 7 tables */
+
+static addr68_t (* const ea_b78)(emu68_t * const, const int) =
+{
+ ea_inABSW, ea_inABSL, ea_inrelPC, ea_inPCXI,
+ ea_inIMMb, ea_error, ea_error, ea_error
+};
+
+static addr68_t (* const ea_w78)(emu68_t * const, const int) =
+{
+ ea_inABSW, ea_inABSL, ea_inrelPC, ea_inPCXI,
+ ea_inIMMw, ea_error, ea_error, ea_error
+};
+
+static addr68_t (* const ea_l78)(emu68_t * const, const int) =
+{
+ ea_inABSW, ea_inABSL, ea_inrelPC, ea_inPCXI,
+ ea_inIMMl, ea_error, ea_error, ea_error
+};
+
+/* Mode 7 redirect functions */
+
+static addr68_t ea_mode7b(emu68_t * const emu68, const int reg)
+{
+ return (ea_b7reg)(emu68, reg);
+}
+
+static addr68_t ea_mode7w(emu68_t * const emu68, const int reg)
+{
+ return (ea_w7reg)(emu68, reg);
+}
+
+static addr68_t ea_mode7l(emu68_t * const emu68, const int reg)
+{
+ return (ea_l7reg)(emu68, reg);
+}
+
+/* Get EA tables */
+
+addr68_t (* const get_eab688)(emu68_t * const, const int) =
+{
+ ea_error, ea_error, ea_inAN, ea_inANpb,
+ ea_inmANb,ea_indAN,ea_inANXI,
+ ea_mode7b,
+};
+
+addr68_t (* const get_eaw688)(emu68_t * const, const int) =
+{
+ ea_error, ea_error, ea_inAN, ea_inANpw,
+ ea_inmANw,ea_indAN,ea_inANXI,
+ ea_mode7w,
+};
+
+addr68_t (* const get_eal688)(emu68_t * const, const int) =
+{
+ ea_error, ea_error, ea_inAN, ea_inANpl,
+ ea_inmANl,ea_indAN,ea_inANXI,
+ ea_mode7l,
+};
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inl68_arithmetic.h Added

@@ -0,0 +1,173 @@
+/*
+ * @ingroup lib_emu68
+ * @file emu68/inl68_arithmetic.h
+ * @brief 68k arithmetical instruction inlines.
+ * @author Benjamin Gerard
+ * @date 2009/05/18
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef INL68_ARITHMETIC_H
+#define INL68_ARITHMETIC_H
+
+static inline
+int68_t inl_add68(emu68_t * const emu68, int68_t s, int68_t d, int68_t c)
+{
+ /*
+ Official version from 68K RPM :
+ V = (s & d & ~r) | (~s & ~d & r); // MSBit only
+ C = (s & d) | (~r & d) | (s & ~r); // MSBit only
+ X = C;
+ Z = !r;
+ N = r; // MSBit only
+ */
+ const int68_t r = ( c += s + d );
+ c = ( ( r >> SIGN_BIT ) & ( SR_V | SR_C | SR_X | SR_N ) ) ^ SR_V;
+ s = ( ( s >> SIGN_BIT ) & ( SR_V | SR_C | SR_X ) ) ^ c;
+ d = ( ( d >> SIGN_BIT ) & ( SR_V | SR_C | SR_X ) ) ^ c;
+ c &= ~SR_N;
+ c |= SR_V | ( !r << SR_Z_BIT );
+ c ^= s | d;
+ REG68.sr = ( REG68.sr & 0xFF00 ) | c;
+ return r;
+}
+
+static inline
+int68_t inl_sub68(emu68_t * const emu68, int68_t s, int68_t d, int68_t c)
+{
+ /*
+ Official version from 68K RPM :
+ V = (~s & d & ~r) | (s & ~d & r); // MSBit only
+ C = (s & ~d) | (r & ~d) | (s & r); // MSBit only
+ X = C
+ Z = !r;
+ N = r; // MSBit only
+ */
+ const int68_t r = d - s - c;
+ REG68.sr = ( REG68.sr & 0xFF00 )
+ | (!r << SR_Z_BIT)
+ | (( r >> SIGN_BIT ) & SR_N)
+ | (((((d ^ ~r) & (s ^ r)) ^ r) >> SIGN_BIT) & (SR_C|SR_X))
+ | ((((d ^ r) & (~s ^ r)) >> SIGN_BIT) & SR_V)
+ ;
+ return r;
+}
+
+static inline
+void inl_cmp68(emu68_t * const emu68, int68_t s, int68_t d)
+{
+ /* Like SUB but X is not taken into account nor affected. */
+ const int68_t r = d - s;
+ REG68.sr = ( REG68.sr & ( 0xFF00 | SR_X ) )
+ | (!r << SR_Z_BIT)
+ | (( r >> SIGN_BIT ) & SR_N)
+ | (((((d ^ ~r) & (s ^ r)) ^ r) >> SIGN_BIT) & SR_C)
+ | ((((d ^ r) & (~s ^ r)) >> SIGN_BIT) & SR_V)
+ ;
+}
+
+static inline
+int68_t inl_neg68(emu68_t * const emu68, int68_t d, int68_t c)
+{
+ /*
+ Official version from 68K RPM :
+ V = (d & r) // MSBit only
+ C = (d | r) // MSBit only
+ X = C
+ Z = !r;
+ N = r; // MSBit only
+ */
+ int sr = REG68.sr & 0xFF00;
+ const int68_t r = ( c = -d - c );
+ sr |= !r << SR_Z_BIT;
+ d >>= SIGN_BIT;
+ c >>= SIGN_BIT;
+ sr |= c & SR_N;
+ sr |= ( d | c ) & (SR_C|SR_X);
+ sr |= ( d & c ) & SR_V;
+ REG68.sr = sr;
+ return r;
+}
+
+
+static inline
+int68_t inl_muls68(emu68_t * const emu68, int68_t s, int68_t d)
+{
+ d = ( d >> WORD_FIX ) * ( s >> WORD_FIX );
+ REG68.sr = ( REG68.sr & ( 0xFF00 | SR_X ) )
+ | ( !d << SR_Z_BIT )
+ | ( (d >> (31 - SR_N_BIT)) & SR_N );
+ return d << LONG_FIX;
+}
+
+static inline
+int68_t inl_mulu68(emu68_t * const emu68, uint68_t s, uint68_t d)
+{
+ d = ( d >> WORD_FIX ) * ( s >> WORD_FIX );
+ REG68.sr = ( REG68.sr & ( 0xFF00 | SR_X ) )
+ | ( !d << SR_Z_BIT )
+ | ( (d >> (31 - SR_N_BIT)) & SR_N );
+ return d << LONG_FIX;
+}
+
+static inline
+int68_t inl_divs68(emu68_t * const emu68, int68_t s, int68_t d)
+{
+ int sr = REG68.sr & (0xFF00 | SR_X); /* X unaffected; C cleared */
+ if ( s >>= WORD_FIX ) {
+ int68_t res, rem;
+ d >>= LONG_FIX;
+ res = d / s;
+ rem = d % s;
+
+ if ( (s16)res != res )
+ sr |= SR_V; /* V on overflow */
+ else
+ d = ( (int68_t) (u16) res ) | ( (int68_t) (u16) rem << 16 );
+ sr |= !res << SR_Z_BIT; /* Z */
+ sr |= ( res >> ( 15 - SR_N_BIT ) ) & SR_N; /* N */
+ REG68.sr = sr;
+ d <<= LONG_FIX;
+ } else {
+ /* Divide by zero */
+ REG68.sr = sr;
+ inl_exception68(emu68, DIVIDE_VECTOR, -1);
+ }
+ return d;
+}
+
+static inline
+int68_t inl_divu68(emu68_t * const emu68, uint68_t s, uint68_t d)
+{
+ int sr = REG68.sr & (0xFF00 | SR_X); /* X unaffected; C cleared */
+ if ( s >>= WORD_FIX ) {
+ uint68_t res, rem;
+ d >>= LONG_FIX;
+ res = d / s;
+ rem = d % s;
+
+ if ( (u16)res != res )
+ sr |= SR_V; /* V on overflow */
+ else
+ d = ( res ) | ( rem << 16 );
+ sr |= !res << SR_Z_BIT; /* Z */
+ sr |= ( res >> ( 15 - SR_N_BIT ) ) & SR_N; /* N */
+ REG68.sr = sr;
+ d <<= LONG_FIX;
+ } else {
+ /* Divide by zero */
+ REG68.sr = sr;
+ inl_exception68(emu68, DIVIDE_VECTOR, -1);
+ }
+ return d;
+}
+
+static inline
+int68_t inl_clr68(emu68_t * const emu68)
+{
+ REG68.sr = ( REG68.sr & ( 0xFF00 | SR_X ) ) | SR_Z;
+ return 0;
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inl68_bcd.h Added

@@ -0,0 +1,68 @@
+/*
+ * @ingroup   lib_emu68_inl
+ * @file      emu68/inl68_bcd.h
+ * @brief     68k binary coded decimal arithmetic inlines.
+ * @author    Benjamin Gerard
+ * @date      2009/05/18
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef INL68_BCD_H
+#define INL68_BCD_H
+
+static inline
+int inl_abcd68(emu68_t * const emu68, int a, int b)
+{
+  int x = ( emu68->reg.sr >> SR_X_BIT ) & 1;
+  a += b + x;                           /* unadjusted result */
+  b  = a;                               /* store unadjusted result */
+  x  = REG68.sr & (SR_Z);               /* use x as ccr */
+  if ( (a&15) > 9 )
+    a += 6;
+  if ( a > 0x90 ) {
+    a += 0x60;
+    x |= SR_C|SR_X;
+  }
+  a = (u8)a;
+  if (a) x &= ~SR_Z;
+  x |= (a&0x80) >> (7-SR_N_BIT);
+  x |= ((~b)&a&0x80) >> (7-SR_V_BIT);
+  SET_CCR(REG68.sr,x);
+
+  return a;
+}
+
+static inline
+int inl_sbcd68(emu68_t * const emu68, int a, int b)
+{
+  int x = ( emu68->reg.sr >> SR_X_BIT ) & 1;
+  int r = a - b - x;
+  if ( (b&0xF) + x > (a&15) )
+    r -= 6;
+
+  b  = a;                               /* store unadjusted result */
+  x  = REG68.sr & (SR_Z);               /* use x as ccr */
+
+  if ( r & 0x80 ) {
+    r -= 0x60;
+    x |= SR_C|SR_X;
+  }
+
+  a = (u8)r;
+  if (a) x &= ~SR_Z;
+  x |= (a&0x80) >> (7-SR_N_BIT);
+  x |= (b&(~a)&0x80) >> (7-SR_V_BIT);
+
+  SET_CCR(REG68.sr,x);
+
+  return a;
+}
+
+static inline
+int inl_nbcd68(emu68_t * const emu68, int a)
+{
+  return inl_sbcd68(emu68,0,a);
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inl68_bitmanip.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inl68_datamove.h Added

@@ -0,0 +1,51 @@
+/*
+ * @ingroup   lib_emu68_inl
+ * @file      emu68/inl68_datamove.h
+ * @brief     68k program control inlines.
+ * @author    Benjamin Gerard
+ * @date      2009/05/18
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef INL68_DATAMOVE_H
+#define INL68_DATAMOVE_H
+
+static inline
+void inl_link68(emu68_t * const emu68, const int reg)
+{
+  pushl(REG68.areg);
+  REG68.areg = REG68.a7;
+  REG68.a7   = (u32)(REG68.a7+get_nextw());
+}
+
+static inline
+void inl_unlk68(emu68_t * const emu68, const int reg)
+{
+  REG68.a7   = REG68.areg;
+  REG68.areg = (u32)popl();
+}
+
+static inline
+void inl_exg68(emu68_t * const emu68, const int reg0, const int reg9)
+{
+  s32 * const reg = REG68.d, tmp = regreg0;
+  regreg0 = regreg9;
+  regreg9 = tmp;
+}
+
+static inline
+addr68_t inl_lea68(emu68_t * const emu68, const  int mode, const int reg)
+{
+  return get_eal68mode(emu68,reg);
+}
+
+static inline
+addr68_t inl_pea68(emu68_t * const emu68, const  int mode, const int reg)
+{
+  const addr68_t ea = get_eal68mode(emu68,reg);
+  pushl(ea);
+  return ea;
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inl68_exception.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inl68_logic.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inl68_progctrl.h Added

@@ -0,0 +1,76 @@
+/*
+ * @ingroup lib_emu68_inl
+ * @file emu68/inl68_progctrl.h
+ * @brief 68k program control inlines.
+ * @author Benjamin Gerard
+ * @date 2009/05/18
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef INL68_PROGCTRL_H
+#define INL68_PROGCTRL_H
+
+static inline
+void inl_tst68(emu68_t * const emu68, const int68_t a)
+{
+ REG68.sr = ( REG68.sr & ( 0xFF00 | SR_X ) )
+ | ( !a << SR_Z_BIT )
+ | ( ( a >> ( SIGN_FIX - SR_N_BIT ) ) & SR_N )
+ ;
+}
+
+static inline
+int68_t inl_tas68(emu68_t * const emu68, const int68_t d)
+{
+ inl_tst68(emu68, d << BYTE_FIX);
+ return d | 0x80;
+}
+
+static inline
+void inl_rts68(emu68_t * const emu68)
+{
+ REG68.pc = popl();
+}
+
+static inline
+void inl_rte68(emu68_t * const emu68)
+{
+ REG68.sr = popw();
+ REG68.pc = popl();
+}
+
+static inline
+void inl_rtr68(emu68_t * const emu68)
+{
+ REG68.sr = ( REG68.sr & 0xFF00 ) | (u8)popw();
+ REG68.pc = popl();
+}
+
+static inline
+void inl_bsr68(emu68_t * const emu68, const addr68_t addr)
+{
+ pushl(REG68.pc);
+ REG68.pc = addr;
+ inl_addcycle68(emu68,12);
+}
+
+static inline
+void inl_jmp68(emu68_t * const emu68, const addr68_t addr)
+{
+ REG68.pc = addr;
+ inl_addcycle68(emu68,4);
+}
+
+static inline
+void inl_jsr68(emu68_t * const emu68, const addr68_t addr)
+{
+ pushl(REG68.pc);
+ REG68.pc = addr;
+ inl_addcycle68(emu68,4);
+}
+
+static inline
+void inl_nop68(emu68_t * const emu68) { }
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inl68_shifting.h Added

@@ -0,0 +1,220 @@
+/*
+ * @ingroup lib_emu68_inl
+ * @file emu68/inl68_shifting.h
+ * @brief 68k bit shifting inlines.
+ * @author Benjamin Gerard
+ * @date 2009/05/18
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef INL68_SHIFTING_H
+#define INL68_SHIFTING_H
+
+static inline
+void inl_swap68(emu68_t * const emu68, int dn)
+{
+ uint68_t v = (u32) REG68.ddn;
+ REG68.ddn = v = ( v >> 16 ) + ( (int68_t)(u16)v << 16 );
+ REG68.sr = ( REG68.sr & ( 0xFF00 | SR_X ) )
+ | ( !v << SR_Z_BIT )
+ | ( ( v >> (31 - SR_N_BIT) ) & SR_N )
+ ;
+}
+
+static inline
+int68_t inl_lsl68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ int ccr;
+
+ s &= 63;
+ inl_addcycle68(emu68, 2*s);
+ if (--s < 0) {
+ ccr = REG68.sr & SR_X; /* X unaffected on no shift */
+ } else if (s > SIGN_BIT) {
+ d = 0;
+ ccr = 0;
+ } else {
+ d <<= s;
+ ccr = ( d >> SIGN_BIT ) & ( SR_X | SR_C ); /* X & C */
+ d <<= 1;
+ }
+ ccr |= -!d & SR_Z; /* Z */
+ ccr |= ( d >> ( SIGN_BIT - SR_N_BIT ) ) & SR_N; /* N */
+ REG68.sr = (REG68.sr & 0xFF00) | ccr;
+ return d;
+}
+
+static inline
+int68_t inl_lsr68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ int ccr;
+
+ s &= 63;
+ inl_addcycle68(emu68, 2*s);
+ if (--s < 0) {
+ ccr = REG68.sr & SR_X; /* X unaffected on no shift */
+ } else if (s > SIGN_BIT) {
+ d = 0; /* shift > word width; X is 0 */
+ ccr = 0;
+ } else {
+ const uint68_t m = NRM_MSK(l);
+ d >>= s;
+ ccr = -(int)( ( d >> ( SIGN_BIT - l ) ) & 1 ) & ( SR_X | SR_C ); /* X & C */
+ d = ( d >> 1 ) & m;
+ }
+ ccr |= -!d & SR_Z; /* Z */
+ ccr |= ( d >> ( SIGN_BIT - SR_N_BIT ) ) & SR_N; /* N */
+ REG68.sr = (REG68.sr & 0xFF00) | ccr;
+ return d;
+}
+
+static inline
+int68_t inl_asl68(emu68_t * const emu68, int68_t d, int s, const int l)
+{
+ int ccr;
+
+ s &= 63;
+ inl_addcycle68(emu68, 2*s);
+ if (--s < 0) {
+ ccr = REG68.sr & SR_X; /* X unaffected on no shift */
+ } else if (s > l) {
+ ccr = -!!d & SR_V; /* V */
+ d = 0;
+ } else {
+ int68_t r = d;
+ d <<= s;
+ ccr = ( d >> SIGN_BIT ) & ( SR_X | SR_C ); /* X & C */
+ d <<= 1;
+ ccr |= -( r != ( (d >> s) >> 1 ) ) & SR_V; /* V on shift can't be revert */
+ }
+ ccr |= -!d & SR_Z; /* Z */
+ ccr |= ( d >> ( SIGN_BIT - SR_N_BIT ) ) & SR_N; /* N */
+ REG68.sr = ( REG68.sr & 0xFF00 ) | ccr;
+ return d;
+}
+
+static inline
+int68_t inl_asr68(emu68_t * const emu68, int68_t d, int s, const int l)
+{
+ int ccr;
+
+ s &= 63;
+ inl_addcycle68(emu68, 2*s);
+ if (--s < 0) {
+ ccr = REG68.sr & SR_X; /* X unaffected on no shift */
+ } else if (s > l) {
+ d >>= SIGN_BIT; /* shift > word width; X is MSB */
+ ccr = (int) d & ( SR_C | SR_X ); /* X & C is MSB */
+ } else {
+ const uint68_t m = NRM_MSK(l);
+ d >>= s;
+ ccr = -( ( d >> ( SIGN_BIT - l ) ) & 1 ) & ( SR_X | SR_C ); /* X & C */
+ d = ( d >> 1 ) & m;
+ }
+ ccr |= -!d & SR_Z; /* Z */
+ ccr |= ( d >> ( SIGN_BIT - SR_N_BIT ) ) & SR_N; /* N */
+ REG68.sr = (REG68.sr & 0xFF00) | ccr;
+ return d;
+}
+
+static inline
+int68_t inl_rol68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ int ccr = REG68.sr & (0xFF00 | SR_X); /* X unaffected */
+
+ if (s &= 63) {
+ const uint68_t m = NRM_MSK(l);
+ inl_addcycle68(emu68, 2*s);
+ d = ( ( d << ( s & l ) ) | ( d >> ( -s & l ) ) ) & m;
+ ccr |= -(int)( ( d >> (SIGN_FIX - l) ) & 1 ) & SR_C; /* C is LSB */
+ }
+ ccr |= -!d & SR_Z; /* Z */
+ ccr |= ( d >> ( SIGN_BIT - SR_N_BIT ) ) & SR_N; /* N */
+ REG68.sr = ccr;
+ return d;
+}
+
+static inline
+int68_t inl_ror68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ int ccr = REG68.sr & (0xFF00 | SR_X); /* X unaffected */
+
+ if (s &= 63) {
+ const uint68_t m = NRM_MSK(l);
+ inl_addcycle68(emu68, 2*s);
+ d = ( ( d >> ( s & l ) ) | ( d << ( -s & l ) ) ) & m;
+ ccr |= ( d >> ( SIGN_BIT - SR_C_BIT ) ) & SR_C; /* C is MSB */
+ }
+ ccr |= -!d & SR_Z; /* Z */
+ ccr |= ( d >> ( SIGN_BIT - SR_N_BIT ) ) & SR_N; /* N */
+ REG68.sr = ccr;
+ return d;
+}
+
+static inline
+int68_t inl_roxl68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ int ccr = REG68.sr & ( 0xFF00 | SR_X ); /* X is unaffected on no shift */
+
+ if (s &= 63) {
+ const uint68_t m = NRM_MSK(l);
+ inl_addcycle68(emu68, 2*s);
+ s %= (l+2); /* s := 0 .. l+1 */
+ if (--s >= 0) { /* s := 0 .. l */
+ uint68_t x, c, r = d;
+
+ r <<= s;
+ c = (ccr >> SR_X_BIT) & 1; /* old X */
+ x = r >> SIGN_BIT; /* new X */
+ ccr = -(int)x & SR_X;
+ r <<= 1;
+ r |= c << ( SIGN_BIT - l + s );
+ d >>= 1;
+ d >>= l - s;
+ d |= r;
+ d &= m;
+ }
+ }
+
+ ccr |= (ccr & SR_X) >> (SR_X_BIT - SR_C_BIT); /* C is X whatever shift */
+ ccr |= -!d & SR_Z;
+ ccr |= ( d >> ( SIGN_BIT - SR_N_BIT ) ) & SR_N;
+ REG68.sr = ccr;
+ return d;
+}
+
+static inline
+int68_t inl_roxr68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ int ccr = REG68.sr & ( 0xFF00 | SR_X ); /* X unaffected on no shift */
+
+ s &= 63;
+ inl_addcycle68(emu68, 2*s);
+ if (s) {
+ const uint68_t m = NRM_MSK(l);
+ s %= l + 2; /* s := 0 .. l+1 */
+ if (--s >= 0) { /* s := 0 .. l */
+ uint68_t r = d;
+ uint68_t x, c;
+
+ d >>= s;
+ c = (ccr >> SR_X_BIT) & 1; /* old X */
+ x = (d >> (SIGN_BIT-l)) & 1; /* new X */
+ ccr = -(int)x & SR_X;
+ d >>= 1;
+ d |= c << (SIGN_BIT-s);
+ r <<= 1;
+ r <<= l-s;
+ d |= r;
+ d &= m;
+ }
+ }
+ ccr |= (ccr & SR_X) >> (SR_X_BIT - SR_C_BIT); /* C is X */
+ ccr |= -!d & SR_Z; /* Z */
+ ccr |= ( d >> ( SIGN_BIT - SR_N_BIT ) ) & SR_N; /* N */
+ REG68.sr = ccr;
+ return d;
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inl68_systctrl.h Added

@@ -0,0 +1,106 @@
+/*
+ * @ingroup lib_emu68_inl
+ * @file emu68/inl68_systctrl.h
+ * @brief 68k system control operation inlines.
+ * @author Benjamin Gerard
+ * @date 2009/05/18
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef INL68_SYSTCTRL_H
+#define INL68_SYSTCTRL_H
+
+static inline
+void inl_andtosr68(emu68_t * const emu68, int68_t v)
+{
+ emu68->reg.sr &= v;
+}
+
+static inline
+void inl_orrtosr68(emu68_t * const emu68, int68_t v)
+{
+ emu68->reg.sr |= v;
+}
+
+static inline
+void inl_eortosr68(emu68_t * const emu68, int68_t v)
+{
+ emu68->reg.sr ^= v;
+}
+
+/**
+ * @TODO Implement reset instruction which is supposed to reset
+ * external chips.
+ */
+static inline
+void inl_reset68(emu68_t * const emu68)
+{
+ if ( emu68->reg.sr & SR_S ) {
+ /* $$$ Not it is suppose to do; it's a trick */
+ emu68->status = EMU68_HLT;
+ exception68(emu68, HWRESET_VECTOR, -1);
+ } else {
+ exception68(emu68, PRIVV_VECTOR, -1);
+ }
+}
+
+static inline
+void inl_stop68(emu68_t * const emu68)
+{
+ const u16 stop_sr = (u16) get_nextw();
+ if ( emu68->reg.sr & SR_S ) {
+ /* Superuser mode */
+
+ /* set the stop value and trigger status change exception */
+ emu68->reg.sr = stop_sr;
+ emu68->status = EMU68_STP;
+ exception68(emu68, HWSTOP_VECTOR, -1);
+
+ /* Entering the instruction in trace mode will disable the stop
+ * status.
+ */
+ if ( (emu68->inst_sr & SR_T) && emu68->status == EMU68_STP)
+ emu68->status = EMU68_NRM;
+ } else {
+ /* User mode triggers a privilege violation exception */
+ exception68(emu68, PRIVV_VECTOR, -1);
+ }
+}
+
+static inline
+void inl_trapv68(emu68_t * const emu68)
+{
+ if (REG68.sr & SR_V) {
+ inl_exception68(emu68, TRAPV_VECTOR, -1);
+ }
+}
+
+static inline
+void inl_trap68(emu68_t * const emu68, const int n)
+{
+ inl_exception68(emu68,TRAP_VECTOR(n), -1);
+}
+
+static inline
+void inl_chk68(emu68_t * const emu68, const int68_t a, const int68_t b)
+{
+ REG68.sr &= 0xFF00 | (SR_X|SR_N);
+ REG68.sr |= !b << SR_Z_BIT;
+ if ( b < 0 ) {
+ REG68.sr |= SR_N;
+ inl_exception68(emu68, CHK_VECTOR, -1);
+ } else if ( b > a ) {
+ REG68.sr &= ~SR_N;
+ inl_exception68(emu68, CHK_VECTOR, -1);
+ }
+}
+
+static inline
+void inl_illegal68(emu68_t * const emu68)
+{
+
+ inl_exception68(emu68, ILLEGAL_VECTOR, -1);
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inst68.c Added

@@ -0,0 +1,522 @@
+/*
+ * @file emu68/inst68.c
+ * @brief 68000 instructions emulation
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "inst68.h"
+#include "assert68.h"
+#include "srdef68.h"
+#include "struct68.h"
+#include "excep68.h"
+#include "cc68.h"
+#include "mem68.h"
+#include "emu68.h"
+
+/* ,-----------.
+ | Exception |
+ `-----------' */
+
+#include "inl68_exception.h"
+
+void exception68(emu68_t * const emu68, const int vector, const int level)
+{
+ if ( vector < 0x100 ) {
+ /* Standard 68k exceptions */
+
+ int savesr = REG68.sr; /* save sr as it was */
+ int savest = emu68->status; /* save emu68 runstate */
+
+ emu68->status = EMU68_XCT; /* enter exception stat */
+ REG68.sr &= ~SR_T; /* no TRACE */
+ REG68.sr |= SR_S; /* Supervisor */
+
+ if ( savest == EMU68_XCT &&
+ ( vector == BUSERR_VECTOR || vector == ADRERR_VECTOR ) ) {
+ /* That's a double fault (exception produced an exception) */
+ emu68->status = EMU68_HLT; /* Halt processor */
+ /* Let user know. */
+ if (emu68->handler)
+ emu68->handler(emu68, HWHALT_VECTOR, emu68->cookie);
+ /* If user did not override notify the error. */
+ if (emu68->status == EMU68_HLT)
+ emu68_error_add(emu68, "double-fault @$%06x vector:%$x",
+ emu68->inst_pc, vector);
+ return;
+ } else if ( vector == RESET_VECTOR ) {
+ /* Reset reload SP and PC */
+ REG68.sr |= SR_I;
+ REG68.a7 = read_L(RESET_SP_VECTOR << 2);
+ REG68.pc = read_L(RESET_PC_VECTOR << 2);
+ } else {
+ /* Standard exception, set IPL and trigger exception. */
+ if ( (unsigned int)level < 8u ) {
+ SET_IPL(REG68.sr,level);
+ }
+ pushl(REG68.pc);
+ pushw(savesr);
+ REG68.pc = read_L(vector << 2);
+
+ /* Back to saved runstate (not totally sure about that). */
+ emu68->status = savest;
+ }
+ }
+
+ /* Finally call the user handler for all kind of exceptions. */
+ if (emu68->handler)
+ emu68->handler(emu68, vector, emu68->cookie);
+
+}
+
+void buserror68(emu68_t * const emu68, const int addr, const int mode)
+{
+ inl_buserror68(emu68, addr, mode);
+}
+
+void linea68(emu68_t * const emu68)
+{
+ inl_linea68(emu68);
+}
+
+void linef68(emu68_t * const emu68)
+{
+ inl_linef68(emu68);
+}
+
+
+/* ,------------.
+ | Arithmetic |
+ `------------' */
+
+#include "inl68_arithmetic.h"
+
+int68_t add68(emu68_t * const emu68, const int68_t s, int68_t d, int68_t c)
+{
+ return inl_add68(emu68, s, d, c);
+}
+
+int68_t sub68(emu68_t * const emu68, const int68_t s, int68_t d, int68_t c)
+{
+ return inl_sub68(emu68, s, d, c);
+}
+
+void cmp68(emu68_t * const emu68, const int68_t s, int68_t d)
+{
+ inl_cmp68(emu68, s, d);
+}
+
+int68_t muls68(emu68_t * const emu68, const int68_t s, int68_t d)
+{
+ return inl_muls68(emu68, s, d);
+}
+
+int68_t mulu68(emu68_t * const emu68, const uint68_t s, uint68_t d)
+{
+ return inl_mulu68(emu68, s, d);
+}
+
+int68_t divs68(emu68_t * const emu68, const int68_t s, int68_t d)
+{
+ return inl_divs68(emu68, s, d);
+}
+
+int68_t divu68(emu68_t * const emu68, const uint68_t s, uint68_t d)
+{
+ return inl_divu68(emu68, s, d);
+}
+
+int68_t clr68(emu68_t * const emu68)
+{
+ return inl_clr68(emu68);
+}
+
+int68_t neg68(emu68_t * const emu68, int68_t d, int68_t c)
+{
+ return inl_neg68(emu68, d, c);
+}
+
+
+/* ,-------.
+ | Logic |
+ `-------' */
+
+#include "inl68_logic.h"
+
+int68_t and68(emu68_t * const emu68, const int68_t s, int68_t d)
+{
+ return inl_and68(emu68, s, d);
+}
+
+int68_t orr68(emu68_t * const emu68, const int68_t s, int68_t d)
+{
+ return inl_orr68(emu68, s, d);
+}
+
+int68_t eor68(emu68_t * const emu68, const int68_t s, int68_t d)
+{
+ return inl_eor68(emu68, s, d);
+}
+
+int68_t not68(emu68_t * const emu68, int68_t d)
+{
+ return inl_not68(emu68, d);
+}
+
+
+/* ,----------------.
+ | System Control |
+ `----------------' */
+
+#include "inl68_systctrl.h"
+
+void illegal68(emu68_t * const emu68)
+{
+ inl_illegal68(emu68);
+}
+
+void trapv68(emu68_t * const emu68)
+{
+ inl_trapv68(emu68);
+}
+
+void trap68(emu68_t * const emu68, const int trap_n)
+{
+ inl_trap68(emu68, trap_n);
+}
+
+void chk68(emu68_t * const emu68, const int68_t a, const int68_t b)
+{
+ inl_chk68(emu68, a, b);
+}
+
+void andtosr68(emu68_t * const emu68, int68_t v)
+{
+ inl_andtosr68(emu68, v);
+}
+
+void orrtosr68(emu68_t * const emu68, int68_t v)
+{
+ inl_orrtosr68(emu68, v);
+}
+
+void eortosr68(emu68_t * const emu68, int68_t v)
+{
+ inl_eortosr68(emu68, v);
+}
+
+void reset68(emu68_t * const emu68)
+{
+ inl_reset68(emu68);
+}
+
+void stop68(emu68_t * const emu68)
+{
+ inl_stop68(emu68);
+}
+
+
+/* ,------------------.
+ | Bit manipulation |
+ `------------------' */
+
+#include "inl68_bitmanip.h"
+
+void btst68(emu68_t * const emu68, const int68_t v, const int bit)
+{
+ inl_btst68(emu68, v, bit);
+}
+
+int68_t bset68(emu68_t * const emu68, const int68_t v, const int bit)
+{
+ return inl_bset68(emu68, v, bit);
+}
+
+int68_t bclr68(emu68_t * const emu68, const int68_t v, const int bit)
+{
+ return inl_bclr68(emu68, v, bit);
+}
+
+int68_t bchg68(emu68_t * const emu68, const int68_t v, const int bit)
+{
+ return inl_bchg68(emu68, v, bit);
+}
+
+
+/* ,----------------------.
+ | Binary Coded Decimal |
+ `----------------------' */
+
+#include "inl68_bcd.h"
+
+int68_t abcd68(emu68_t * const emu68, const int68_t a, int68_t b)
+{
+ return inl_abcd68(emu68, a, b);
+}
+
+int68_t sbcd68(emu68_t * const emu68, const int68_t a, int68_t b)
+{
+ return inl_sbcd68(emu68, a, b);
+}
+
+int68_t nbcd68(emu68_t * const emu68, int68_t a)
+{
+ return inl_nbcd68(emu68, a);
+}
+
+
+/* ,-----------------.
+ | Program Control |
+ `-----------------' */
+
+#include "inl68_progctrl.h"
+
+void rts68(emu68_t * const emu68)
+{
+ inl_rts68(emu68);
+}
+
+void rte68(emu68_t * const emu68)
+{
+ inl_rte68(emu68);
+}
+
+void rtr68(emu68_t * const emu68)
+{
+ inl_rtr68(emu68);
+}
+
+void bsr68(emu68_t * const emu68, const addr68_t addr)
+{
+ inl_bsr68(emu68, addr);
+}
+
+#define BCC_TEMPLATE(CC) \
+ static void bcc_##CC(emu68_t * const emu68, const addr68_t addr) { \
+ if (inl_is_cc##CC(REG68.sr)) \
+ REG68.pc = addr; \
+ }
+
+static void bcc_0(emu68_t * const emu68, const addr68_t addr)
+{
+ REG68.pc = addr;
+}
+
+static void bcc_1(emu68_t * const emu68, const addr68_t addr)
+{
+ inl_bsr68(emu68, addr);
+}
+
+BCC_TEMPLATE(2)
+BCC_TEMPLATE(3)
+BCC_TEMPLATE(4)
+BCC_TEMPLATE(5)
+BCC_TEMPLATE(6)
+BCC_TEMPLATE(7)
+BCC_TEMPLATE(8)
+BCC_TEMPLATE(9)
+BCC_TEMPLATE(A)
+BCC_TEMPLATE(B)
+BCC_TEMPLATE(C)
+BCC_TEMPLATE(D)
+BCC_TEMPLATE(E)
+BCC_TEMPLATE(F)
+
+void (* const bcc6816)(emu68_t * const, const addr68_t) = {
+ bcc_0, bcc_1, bcc_2, bcc_3, bcc_4, bcc_5, bcc_6, bcc_7,
+ bcc_8, bcc_9, bcc_A, bcc_B, bcc_C, bcc_D, bcc_E, bcc_F
+};
+
+void jmp68(emu68_t * const emu68, const addr68_t addr)
+{
+ inl_jmp68(emu68, addr);
+}
+
+void jsr68(emu68_t * const emu68, const addr68_t addr)
+{
+ inl_jsr68(emu68, addr);
+}
+
+void nop68(emu68_t * const emu68)
+{
+ inl_nop68(emu68);
+}
+
+void tst68(emu68_t * const emu68, const int68_t a)
+{
+ inl_tst68(emu68, a);
+}
+
+int68_t tas68(emu68_t * const emu68, const int68_t d)
+{
+ return inl_tas68(emu68, d);
+}
+
+#define DBCC_TEMPLATE(CC) \
+ static void dbcc_##CC(emu68_t * const emu68, const int dn) { \
+ const uint68_t pc = REG68.pc; \
+ if (!inl_is_cc##CC(REG68.sr)) { \
+ int68_t a = (u16)(REG68.ddn-1); \
+ REG68.ddn = (REG68.ddn & 0xFFFF0000) | a; \
+ if (a != 0xFFFF) { \
+ REG68.pc = pc + get_nextw(); \
+ } else { \
+ REG68.pc = pc + 2; \
+ } \
+ } else { \
+ REG68.pc = pc + 2; \
+ } \
+ }
+
+DBCC_TEMPLATE(0)
+DBCC_TEMPLATE(1)
+DBCC_TEMPLATE(2)
+DBCC_TEMPLATE(3)
+DBCC_TEMPLATE(4)
+DBCC_TEMPLATE(5)
+DBCC_TEMPLATE(6)
+DBCC_TEMPLATE(7)
+DBCC_TEMPLATE(8)
+DBCC_TEMPLATE(9)
+DBCC_TEMPLATE(A)
+DBCC_TEMPLATE(B)
+DBCC_TEMPLATE(C)
+DBCC_TEMPLATE(D)
+DBCC_TEMPLATE(E)
+DBCC_TEMPLATE(F)
+
+void (* const dbcc68)(emu68_t * const, const int) = {
+ dbcc_0, dbcc_1, dbcc_2, dbcc_3, dbcc_4, dbcc_5, dbcc_6, dbcc_7,
+ dbcc_8, dbcc_9, dbcc_A, dbcc_B, dbcc_C, dbcc_D, dbcc_E, dbcc_F
+};
+
+#define SCC_TEMPLATE(CC) \
+ static int scc_##CC(emu68_t * const emu68) \
+ { \
+ return (u8) -inl_is_cc##CC(REG68.sr); \
+ }
+
+SCC_TEMPLATE(0)
+SCC_TEMPLATE(1)
+SCC_TEMPLATE(2)
+SCC_TEMPLATE(3)
+SCC_TEMPLATE(4)
+SCC_TEMPLATE(5)
+SCC_TEMPLATE(6)
+SCC_TEMPLATE(7)
+SCC_TEMPLATE(8)
+SCC_TEMPLATE(9)
+SCC_TEMPLATE(A)
+SCC_TEMPLATE(B)
+SCC_TEMPLATE(C)
+SCC_TEMPLATE(D)
+SCC_TEMPLATE(E)
+SCC_TEMPLATE(F)
+
+int (* const scc68)(emu68_t * const) = {
+ scc_0, scc_1, scc_2, scc_3, scc_4, scc_5, scc_6, scc_7,
+ scc_8, scc_9, scc_A, scc_B, scc_C, scc_D, scc_E, scc_F
+};
+
+/* ,----------.
+ | Shifting |
+ `----------' */
+
+#include "inl68_shifting.h"
+
+void swap68(emu68_t * const emu68, const int dn)
+{
+ inl_swap68(emu68, dn);
+}
+
+int68_t lsl68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ return inl_lsl68(emu68, d, s, l);
+}
+
+int68_t lsr68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ return inl_lsr68(emu68, d, s, l);
+}
+
+int68_t asl68(emu68_t * const emu68, int68_t d, int s, const int l)
+{
+ return inl_asl68(emu68, d, s, l);
+}
+
+int68_t asr68(emu68_t * const emu68, int68_t d, int s, const int l)
+{
+ return inl_asr68(emu68, d, s, l);
+}
+
+int68_t rol68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ return inl_rol68(emu68, d, s, l);
+}
+
+int68_t ror68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ return inl_ror68(emu68, d, s, l);
+}
+
+int68_t roxl68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ return inl_roxl68(emu68, d, s, l);
+}
+
+int68_t roxr68(emu68_t * const emu68, uint68_t d, int s, const int l)
+{
+ return inl_roxr68(emu68, d, s, l);
+}
+
+/* ,-----------.
+ | Data Move |
+ `-----------' */
+
+#include "inl68_datamove.h"
+
+void exg68(emu68_t * const emu68, const int reg0, const int reg9)
+{
+ inl_exg68(emu68, reg0, reg9);
+}
+
+addr68_t lea68(emu68_t * const emu68, const int mode, const int reg)
+{
+ return inl_lea68(emu68, mode, reg);
+}
+
+addr68_t pea68(emu68_t * const emu68, const int mode, const int reg)
+{
+ return inl_pea68(emu68, mode, reg);
+}
+
+void link68(emu68_t * const emu68, const int reg)
+{
+ inl_link68(emu68, reg);
+}
+
+void unlk68(emu68_t * const emu68, const int reg)
+{
+ inl_unlk68(emu68, reg);
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/inst68.h Added

@@ -0,0 +1,748 @@
+/**
+ * @ingroup lib_emu68
+ * @file emu68/inst68.h
+ * @brief 68k instructions header.
+ * @author Benjamin Gerard
+ * @date 1999/03/13
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_INST68_H
+#define EMU68_INST68_H
+
+#include "emu68_api.h"
+#include "type68.h"
+
+/**
+ * @defgroup lib_emu68_inst 68k Instructions
+ * @ingroup lib_emu68_core
+ * @{
+ */
+
+/**
+ * @name Arithmetical instruction functions
+ *
+ * The integer arithmetic operations include four basic operations:
+ * ADD, SUB, MUL, and DIV. They also include CMP, CMPM, CMP2, CLR,
+ * and NEG. The instruction set includes ADD, CMP, and SUB
+ * instructions for both address and data operations with all
+ * operand sizes valid for data operations. Address operands consist
+ * of 16 or 32 bits. The CLR and NEG instructions apply to all sizes
+ * of data operands. Signed and unsigned MUL and DIV instructions
+ * include:
+ * - Word multiply to produce a long product.
+ * - Long divided by a word divisor (word quotient, word remainder).
+ *
+ * @{
+ */
+
+EMU68_EXTERN
+/**
+ * 68K ADD/X instruction.
+ *
+ * The add68() function performs addition and updates SR flags
+ * accordingly.
+ *
+ * @param emu68 68k emulator instance.
+ * @param s normalized source operand
+ * @param d normalized destination operand
+ * @param c normalized carry
+ * @return normalized result
+ * @retval d + s + c
+ */
+int68_t add68(emu68_t * const emu68, const int68_t s, int68_t d, int68_t c);
+
+EMU68_EXTERN
+/**
+ * 68K SUB/X instruction.
+ *
+ * The sub68() function performs substraction and updates SR flags
+ * accordingly.
+ *
+ * @param emu68 68k emulator instance.
+ * @param s normalized source operand
+ * @param d normalized destination operand
+ * @param c normalized carry
+ * @return normalized result
+ * @retval d - s - c
+ */
+int68_t sub68(emu68_t * const emu68, const int68_t s, int68_t d, int68_t c);
+
+EMU68_EXTERN
+/**
+ * 68K CMP instruction.
+ *
+ * The cmp68() function performs substraction d minus s and updates
+ * SR flags accordingly.
+ *
+ * @param emu68 68k emulator instance.
+ * @param s normalized source operand
+ * @param d normalized destination operand
+ */
+void cmp68(emu68_t * const emu68, const int68_t s, int68_t d);
+
+EMU68_EXTERN
+/**
+ * 68k NEG/X instruction.
+ *
+ * The neg68() function performs 2nd complement and updates SR flags
+ * accordingly.
+ *
+ * @param emu68 68k emulator instance.
+ * @param d normalized destination operand
+ * @param c normalized carry
+ * @return normalized result
+ * @retval -d - c
+ */
+int68_t neg68(emu68_t * const emu68, int68_t d, int68_t c);
+
+EMU68_EXTERN
+/**
+ * 68K MULS instruction.
+ *
+ * The muls68() function performs signed multiplication and updates
+ * SR flags accordingly.
+ *
+ * @param emu68 68k emulator instance.
+ * @param s normalized word source operand
+ * @param d normalized word destination operand
+ * @return normalized long result
+ * @retval d * s
+ */
+int68_t muls68(emu68_t * const emu68, const int68_t s, int68_t d);
+
+EMU68_EXTERN
+/**
+ * 68K MULU instruction.
+ *
+ * The mulu68() function performs unsigned multiplication and updates
+ * SR flags accordingly.
+ *
+ * @param emu68 68k emulator instance.
+ * @param s normalized word source operand
+ * @param d normalized word destination operand
+ * @return normalized long result
+ * @retval d * s
+ */
+int68_t mulu68(emu68_t * const emu68, const uint68_t s, uint68_t d);
+
+EMU68_EXTERN
+/**
+ * 68K DIVS instruction.
+ *
+ * The divs68() function performs signed division and updates SR
+ * flags accordingly. In case of divide by zero the corresponding
+ * exception is triggered. In case of overflow the result is the
+ * destination unchanged; additionnally V SR flag is set.
+ *
+ * @param emu68 68k emulator instance.
+ * @param s normalized word source operand
+ * @param d normalized long destination operand
+ * @return result
+ * @retval MSW:d%s LSW:d/s
+ * @retval unchanged d in case of overflow
+ */
+int68_t divs68(emu68_t * const emu68, const int68_t s, int68_t d);
+
+EMU68_EXTERN
+/**
+ * 68K DIVU instruction.
+ *
+ * The divu68() function performs unsigned division and updates SR
+ * flags accordingly. In case of divide by zero the corresponding
+ * exception is triggered. In case of overflow the result is the
+ * destination unchanged; additionnally V SR flag is set.
+ *
+ * @param emu68 68k emulator instance.
+ * @param s normalized word source operand
+ * @param d normalized long destination operand
+ * @return result
+ * @retval MSW:d%s LSW:d/s
+ * @retval unchanged d in case of overflow
+ */
+int68_t divu68(emu68_t * const emu68, const uint68_t s, uint68_t d);
+
+EMU68_EXTERN
+/**
+ * 68K CLR instruction.
+ *
+ * The clr68() function clears and updates SR flags accordingly.
+ *
+ * @param emu68 68k emulator instance.
+ * @retval 0
+ */
+int68_t clr68(emu68_t * const emu68);
+
+/**
+ * @}
+ */
+
+/**
+ * @name Logical instruction functions
+ *
+ * The logical operation instructions (AND, OR, EOR, and NOT) perform
+ * logical operations with all sizes of integer data operands.
+ *
+ * @{
+ */
+
+EMU68_EXTERN
+/**
+ * 68K AND instruction.
+ *
+ * The and68() function performs bitwise AND and updates SR flags
+ * accordingly.
+ *
+ * @param emu68 68k emulator instance.
+ * @param s normalized source operand
+ * @param d normalized destination operand
+ * @return normalized result
+ * @retval d & s
+*/
+int68_t and68(emu68_t * const emu68, const int68_t s, int68_t d);
+
+EMU68_EXTERN
+/**
+ * 68K OR instruction.
+ *
+ * The orr68() function performs bitwise OR and updates SR flags
+ * accordingly.
+ *
+ * @param emu68 68k emulator instance.
+ * @param s normalized source operand
+ * @param d normalized destination operand
+ * @return normalized result
+ * @retval d | s
+*/
+int68_t orr68(emu68_t * const emu68, const int68_t s, int68_t d);
+
+EMU68_EXTERN
+/**
+ * 68K EOR instruction.
+ *
+ * The eor68() function performs bitwise OR and updates SR flags
+ * accordingly.
+ *
+ * @param emu68 68k emulator instance.
+ * @param s normalized source operand
+ * @param d normalized destination operand
+ * @return normalized result
+ * @retval d ^ s
+*/
+int68_t eor68(emu68_t * const emu68, const int68_t s, int68_t d);
+
+EMU68_EXTERN
+/**
+ * 68K NOT instruction.
+ *
+ * The not68() function performs bitwise NOT (aka 1st complement) and
+ * updates SR flags accordingly.
+ *
+ * @param emu68 68k emulator instance
+ * @param d normalized destination operand
+ * @return normalized result
+ * @retval ~d
+ */
+int68_t not68(emu68_t * const emu68, int68_t d);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Bit manipulation functions
+ *
+ * BTST, BSET, BCLR, and BCHG are bit manipulation instructions. All
+ * bit manipulation operations can be performed on either registers
+ * or memory. The bit number is specified either as immediate data or
+ * in the contents of a data register. Register operands are 32 bits
+ * long, and memory operands are 8 bits long. Table 3-6 summarizes
+ * bit manipulation operations; Z refers to the zero bit of the CCR.
+ *
+ * @{
+ */
+
+EMU68_EXTERN
+/**
+ * 68K BTST instruction (Bit TeST).
+ *
+ * The btst68() function performs a bit test and updates SR flags
+ * accordingly.
+ *
+ * @param emu68 68k emulator instance
+ * @param val value to test
+ * @param bit bit number
+ */
+void btst68(emu68_t * const emu68, const int68_t val, const int bit);
+
+EMU68_EXTERN
+/**
+ * 68K BSET instruction (Bit SET).
+ *
+ * The bset68() function performs a bit test and set and updates SR
+ * flags accordingly.
+ *
+ * @param emu68 68k emulator instance
+ * @param val value to test
+ * @param bit bit number
+ * @return result
+ * @retval val | (1<<bit)
+ */
+int68_t bset68(emu68_t * const emu68, const int68_t val, const int bit);
+
+EMU68_EXTERN
+/**
+ * 68K BCLR instruction (Bit CLeaR).
+ *
+ * The bclr68() function performs a bit test and clear and updates SR
+ * flags accordingly.
+ *
+ * @param emu68 68k emulator instance
+ * @param val value to test
+ * @param bit bit number
+ * @return result
+ * @retval val & ~(1<<bit)
+ */
+int68_t bclr68(emu68_t * const emu68, const int68_t val, const int bit);
+
+EMU68_EXTERN
+/**
+ * 68K BCHG instruction (Bit CHanGe).
+ *
+ * The bchg68() function performs a bit test and change and updates SR
+ * flags accordingly.
+ *
+ * @param emu68 68k emulator instance
+ * @param val value to test
+ * @param bit bit number
+ * @return result
+ * @retval val ^ (1<<bit)
+ */
+int68_t bchg68(emu68_t * const emu68, const int68_t val, const int bit);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Program control instructions
+ *
+ * A set of subroutine call and return instructions and conditional
+ * and unconditional branch instructions perform program control
+ * operations. Also included are test operand instructions (TST and
+ * FTST), which set the integer or floating-point condition codes for
+ * use by other program and system control instructions. NOP forces
+ * synchronization of the internal pipelines. Table 3-9 summarizes
+ * these instructions.
+ *
+ * @{
+ */
+
+EMU68_EXTERN
+void rts68(emu68_t * const emu68);
+
+EMU68_EXTERN
+void rte68(emu68_t * const emu68);
+
+EMU68_EXTERN
+void rtr68(emu68_t * const emu68);
+
+EMU68_EXTERN
+void bsr68(emu68_t * const emu68, const addr68_t addr);
+
+EMU68_EXTERN
+void (* const bcc68)(emu68_t * const, const addr68_t);
+
+EMU68_EXTERN
+void jmp68(emu68_t * const emu68, const addr68_t addr);
+
+EMU68_EXTERN
+void jsr68(emu68_t * const emu68, const addr68_t addr);
+
+EMU68_EXTERN
+void nop68(emu68_t * const emu68);
+
+EMU68_EXTERN
+void tst68(emu68_t * const emu68, const int68_t a);
+
+EMU68_EXTERN
+int68_t tas68(emu68_t * const emu68, const int68_t a);
+
+EMU68_EXTERN
+void (* const dbcc68)(emu68_t * const emu68, const int dn);
+
+EMU68_EXTERN
+int (* const scc68)(emu68_t * const emu68);
+
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Data move instructions
+ *
+ * The MOVE instructions with their associated addressing modes are
+ * the basic means of transferring and storing addresses and
+ * data. MOVE instructions transfer byte, word, and long-word
+ * operands from memory to memory, memory to register, register to
+ * memory, and register to register. MOVE instructions transfer word
+ * and long-word operands and ensure that only valid address
+ * manipulations are executed.
+ *
+ * Data move and associated instructions are MOVEM, MOVEP, MOVEQ,
+ * EXG, LEA, PEA, LINK, and UNLK.
+ *
+ * @{
+ */
+
+EMU68_EXTERN
+/**
+ * 68K LEA instruction (load effective address).
+ *
+ * The lea68() function returns effective address.
+ *
+ * @param emu68 68k emulator instance
+ * @param mode addressing mode 0..7
+ * @param reg address register 0..7
+ * @return effective address
+ */
+addr68_t lea68(emu68_t * const emu68, const int mode, const int reg);
+
+EMU68_EXTERN
+/**
+ * 68K PEA instruction (push effective address).
+ *
+ * The pea68() function pushs effective address into the stack.
+ *
+ * @param emu68 68k emulator instance
+ * @param mode addressing mode 0..7
+ * @param reg address register 0..7
+ * @return effective address
+ */
+addr68_t pea68(emu68_t * const emu68, const int mode, const int reg);
+
+EMU68_EXTERN
+void exg68(emu68_t * const emu68, const int reg0, const int reg9);
+
+EMU68_EXTERN
+void link68(emu68_t * const emu68, const int reg);
+
+EMU68_EXTERN
+void unlk68(emu68_t * const emu68, const int reg);
+
+/* EMU68_EXTERN */
+/* void movem68(emu68_t * const emu68, const int reg0, const int reg9); */
+
+/* EMU68_EXTERN */
+/* void movep68(emu68_t * const emu68, const int reg0, const int reg9); */
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Shifting instructions
+ *
+ * The ASR, ASL, LSR, and LSL instructions provide shift operations
+ * in both directions. The ROR, ROL, ROXR, and ROXL instructions
+ * perform rotate (circular shift) operations, with and without the
+ * CCR extend bit (X-bit). All shift and rotate operations can be
+ * performed on either registers or memory. Register shift and
+ * rotate operations shift all operand sizes. The shift count can be
+ * specified in the instruction operation word (to shift from 1 – 8
+ * places) or in a register (modulo 64 shift count). Memory shift
+ * and rotate operations shift word operands one bit position
+ * only. The SWAP instruction exchanges the 16-bit halves of a
+ * register. Fast byte swapping is possible by using the ROR and ROL
+ * instructions with a shift count of eight, enhancing the
+ * performance of the shift/rotate instructions. Table 3-5 is a
+ * summary of the shift and rotate operations. In Table 3-5, C and X
+ * refer to the C-bit and X- bit in the CCR.
+ *
+ * @{
+ */
+
+EMU68_EXTERN
+/**
+ * SWAP high and low words.
+ *
+ * The swap68() function performs a MSW LSW swapping and updates SR
+ * flags accordingly.
+ *
+ * @param emu68 68k emulator instance
+ * @param d unnormalized destination operand
+ * @return result
+ */
+void swap68(emu68_t * const emu68, const int d);
+
+EMU68_EXTERN
+/**
+ * Logical Shift Left.
+ *
+ * The lsl68() function performs logical (unsigned) shift left and
+ * updates SR flags accordingly.
+ *
+ * @param emu68 68k emulator instance
+ * @param d normalized destination operand
+ * @param s source operand (shift count)
+ * @param l word length in bit minus one (7, 15 or 31)
+ * @return normalized result
+ * @retval d << s
+ */
+int68_t lsl68(emu68_t * const emu68, uint68_t d, int s, const int l);
+
+EMU68_EXTERN
+/**
+ * Logical Shift Right.
+ *
+ * The lsr68() function performs logical (unsigned) shift right and
+ * updates SR flags accordingly
+ *
+ * @param emu68 68k emulator instance
+ * @param d normalized destination operand
+ * @param s source operand (shift count)
+ * @param l word length in bit minus one (7, 15 or 31)
+ * @return normalized result
+ * @retval d >> s
+ */
+int68_t lsr68(emu68_t * const emu68, uint68_t d, int s, const int l);
+
+EMU68_EXTERN
+/**
+ * Arithmetic Shift Left.
+ *
+ * The asl68() function performs arithmetic (signed) shift left and
+ * updates SR flags accordingly
+ *
+ * @param emu68 68k emulator instance
+ * @param d normalized destination operand
+ * @param s source operand (shift count)
+ * @param l word length in bit minus one (7, 15 or 31)
+ * @return normalized result
+ * @retval d << s
+ */
+int68_t asl68(emu68_t * const emu68, int68_t d, int s, const int l);
+
+EMU68_EXTERN
+/**
+ * Arithmetic Shift Right.
+ *
+ * The asr68() function performs arithmetic (signed) shift right and
+ * updates SR flags accordingly
+ *
+ * @param emu68 68k emulator instance
+ * @param d normalized destination operand
+ * @param s source operand (shift count)
+ * @param l word length in bit minus one (7, 15 or 31)
+ * @return normalized result
+ * @retval d >> s
+ */
+int68_t asr68(emu68_t * const emu68, int68_t d, int s, const int l);
+
+EMU68_EXTERN
+/**
+ * ROtation Left.
+ *
+ * The rol68() function performs bit rotation to the left and updates
+ * SR flags accordingly
+ *
+ * @param emu68 68k emulator instance
+ * @param d normalized destination operand
+ * @param s source operand (shift count)
+ * @param l word length in bit minus one (7, 15 or 31)
+ * @return normalized result
+ */
+int68_t rol68(emu68_t * const emu68, uint68_t d, int s, const int l);
+
+EMU68_EXTERN
+/**
+ * ROtation Right.
+ *
+ * The ror68() function performs bit rotation to the right and
+ * updates SR flags accordingly
+ *
+ * @param emu68 68k emulator instance
+ * @param d normalized destination operand
+ * @param s source operand (shift count)
+ * @param l word length in bit minus one (7, 15 or 31)
+ * @return normalized result
+ */
+int68_t ror68(emu68_t * const emu68, uint68_t d, int s, const int l);
+
+EMU68_EXTERN
+/**
+ * ROtation eXtended Left.
+ *
+ * The roxl68() function performs extended bit rotation to the left
+ * and updates SR flags accordingly
+ *
+ * @param emu68 68k emulator instance
+ * @param d normalized destination operand
+ * @param s source operand (shift count)
+ * @param l word length in bit minus one (7, 15 or 31)
+ * @return normalized result
+ */
+int68_t roxl68(emu68_t * const emu68, uint68_t d, int s, const int l);
+
+EMU68_EXTERN
+/**
+ * ROtation eXtended Right.
+ *
+ * The roxr68() function performs extended bit rotation to the right
+ * and updates SR flags accordingly
+ *
+ * @param emu68 68k emulator instance
+ * @param d normalized destination operand
+ * @param s source operand (shift count)
+ * @param l word length in bit minus one (7, 15 or 31)
+ * @return normalized result
+ */
+int68_t roxr68(emu68_t * const emu68, uint68_t d, int s, const int l);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Binary Coded Decimal (BCD) instructions
+ *
+ * Three instructions support operations on binary-coded decimal
+ * (BCD) numbers. The arithmetic operations on packed BCD numbers are
+ * ABCD, SBCD, and NBCD.
+ *
+ * @{
+ */
+
+EMU68_EXTERN
+/**
+ * Negate Binary Coded Decimal with extend.
+ *
+ * The nbcd68() function performs BCD negating with extend and
+ * updates SR flags accordingly
+ *
+ * @param emu68 68k emulator instance.
+ * @param d destination operand
+ * @return result
+ * @retval 0 - d,10 - X
+ */
+int68_t nbcd68(emu68_t * const emu68, int68_t d);
+
+EMU68_EXTERN
+/**
+ * Addition Binary Coded Decimal with extend.
+ *
+ * The abcd68() function performs BCD addition with extend and
+ * updates SR flags accordingly
+ *
+ * @param emu68 68k emulator instance.
+ * @param d destination operand
+ * @return result
+ * @retval s,10 + d,10 + X
+ */
+int68_t abcd68(emu68_t * const emu68, const int68_t s, int68_t d);
+
+EMU68_EXTERN
+/**
+ * Substract Binary Coded Decimal with extend.
+ *
+ * The sbcd68() function performs BCD substraction with extend and
+ * updates SR flags accordingly
+ *
+ * @param emu68 68k emulator instance.
+ * @param d destination operand
+ * @param s source operand
+ * @return result
+ * @retval d,10 - s,10 - X
+ */
+int68_t sbcd68(emu68_t * const emu68, const int68_t s, int68_t d);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Exception functions
+ * @{
+ */
+
+EMU68_EXTERN
+void buserror68(emu68_t * const emu68, const int addr, const int mode);
+
+EMU68_EXTERN
+void exception68(emu68_t * const emu68, const int vector, const int level);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name System Control Instructions
+ *
+ * Privileged and trapping instructions as well as instructions that
+ * use or modify the CCR provide system control operations. FSAVE and
+ * FRESTORE save and restore the nonuser visible portion of the FPU
+ * during context switches in a virtual memory or multitasking
+ * system. The conditional trap instructions, which use the same
+ * conditional tests as their corresponding program control
+ * instructions, allow an optional 16- or 32-bit immediate operand to
+ * be included as part of the instruction for passing parameters to
+ * the operating system. These instructions cause the processor to
+ * flush the instruction pipe. Table 3-10 summarizes these
+ * instructions. See 3.2 Integer Unit Condition Code Computation for
+ * more details on condition codes.
+ *
+ * @{
+ */
+
+EMU68_EXTERN
+void chk68(emu68_t * const emu68, const int68_t a, const int68_t b);
+
+EMU68_EXTERN
+void illegal68(emu68_t * const emu68);
+
+EMU68_EXTERN
+void linea68(emu68_t * const emu68);
+
+EMU68_EXTERN
+void linef68(emu68_t * const emu68);
+
+EMU68_EXTERN
+void trap68(emu68_t * const emu68, const int n);
+
+EMU68_EXTERN
+void trapv68(emu68_t * const emu68);
+
+EMU68_EXTERN
+void andtosr68(emu68_t * const emu68, int68_t v);
+
+EMU68_EXTERN
+void orrtosr68(emu68_t * const emu68, int68_t v);
+
+EMU68_EXTERN
+void eortosr68(emu68_t * const emu68, int68_t v);
+
+EMU68_EXTERN
+void reset68(emu68_t * const emu68);
+
+EMU68_EXTERN
+void stop68(emu68_t * const emu68);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/ioplug68.c Added

@@ -0,0 +1,125 @@
+/*
+ * @file emu68/ioplugr68.c
+ * @brief 68000 Input/output (chipsets) manager
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "ioplug68.h"
+#include "mem68.h"
+#include "assert68.h"
+
+static void do_io_unplug(emu68_t * const emu68, io68_t * const io)
+{
+ /* Remove memory acces handler */
+ const int ioline = (io->addr_lo>>8) & 255;
+ assert( emu68->mapped_ioioline == io );
+ emu68_mem_reset_area(emu68, ioline);
+ io->next = 0;
+}
+
+/* Unplug all IO */
+static void _ioplug_unplug_all(emu68_t * const emu68, const int destroy)
+{
+ io68_t *next = emu68->iohead;
+
+ while (next) {
+ io68_t * io = next;
+ next = io->next;
+ do_io_unplug(emu68, io);
+ if (destroy) {
+ if (io->destroy)
+ io->destroy(io);
+ else
+ emu68_free(io);
+ }
+ }
+ emu68->iohead = 0;
+ emu68->nio = 0;
+}
+
+/* Unplug all IO */
+void emu68_ioplug_unplug_all(emu68_t * const emu68)
+{
+ if (emu68)
+ _ioplug_unplug_all(emu68, 0);
+}
+
+/* Unplug and destroy all IO */
+void emu68_ioplug_destroy_all(emu68_t * const emu68)
+{
+ if (emu68)
+ _ioplug_unplug_all(emu68, 1);
+}
+
+/* Unplug an IO :
+ * - remove from IO-list
+ * - remove memory access handler
+ *
+ * return 0 if IO successfully unplugged
+ */
+int emu68_ioplug_unplug(emu68_t * const emu68, io68_t * const this_io)
+{
+ io68_t *io,**pio;
+
+ if (emu68) {
+ if (!this_io)
+ return 0;
+
+ for (io = emu68->iohead, pio = &emu68->iohead;
+ io;
+ pio=&io->next, io=io->next) {
+ /* Find it ??? */
+ if (io==this_io) {
+ *pio = io->next;
+ --emu68->nio;
+ do_io_unplug(emu68, io);
+ return 0;
+ }
+ }
+ }
+ return -1;
+}
+
+/* Plug new IO :
+ * - add to io list
+ * - add new memory access handler
+ */
+void emu68_ioplug(emu68_t * const emu68, io68_t * const io)
+{
+ if (emu68 && io) {
+ int i;
+ assert(!io->next);
+ io->next = emu68->iohead;
+ emu68->iohead = io;
+ io->emu68 = emu68;
+ ++emu68->nio;
+ for (i=(u8)(io->addr_lo>>8); i<=(u8)(io->addr_hi>>8); ++i) {
+ /* To be sure we don't overlap IOs */
+ assert(emu68->mapped_ioi == &emu68->errio ||
+ emu68->mapped_ioi == &emu68->nopio );
+ emu68->mapped_ioi = io;
+ }
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/ioplug68.h Added

@@ -0,0 +1,84 @@
+/**
+ * @ingroup lib_emu68
+ * @file emu68/ioplug68.h
+ * @brief 68k IO plugger header.
+ * @author Benjamin Gerard
+ * @date 1999/03/13
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_IOPLUG68_H
+#define EMU68_IOPLUG68_H
+
+#include "emu68_api.h"
+#include "struct68.h"
+
+/**
+ * @defgroup lib_emu68_ioplug 68k IO plugger
+ * @ingroup lib_emu68
+ * @brief IO plugging and mapping facilities.
+ *
+ * Provide functions for warm plugging/unplugging of IO
+ * chipset. Limitations are explained in @ref lib_emu68_mem "68k
+ * memory and IO manager" detailed description.
+ *
+ * @{
+ */
+
+EMU68_API
+/**
+ * Unplug all IO.
+ *
+ * @param emu68 emu68 instance
+ *
+ * Process emu68_ioplug_unplug() function for all pluged IO.
+ *
+ */
+void emu68_ioplug_unplug_all(emu68_t * const emu68);
+
+EMU68_API
+/**
+ * Unplug and destroy all IO.
+ *
+ * @param emu68 emu68 instance
+ *
+ * Process emu68_ioplug_unplug() function for all pluged IO and
+ * destroy each io by calling its io68_t::destroy function.
+ *
+ */
+void emu68_ioplug_destroy_all(emu68_t * const emu68);
+
+EMU68_API
+/**
+ * Unplug an IO.
+ *
+ * The emu68_ioplug_unplug() function removes an IO from pluged IO
+ * list and reset memory access handler for its area.
+ *
+ * @param emu68 emu68 instance
+ * @param io IO instance to unplug.
+ *
+ * @return error-code
+ * @retval 0 Success
+ * @retval <0 Error (probably no matching IO)
+ */
+int emu68_ioplug_unplug(emu68_t * const emu68, io68_t * const io);
+
+EMU68_API
+/**
+ * Plug an IO.
+ *
+ * The emu68_ioplug() function add an IO to pluged IO list and add
+ * suitable memory access handlers.
+ *
+ * @param emu68 emu68 instance
+ * @param io IO instance to unplug.
+ */
+void emu68_ioplug(emu68_t * const emu68, io68_t * const io);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/line0_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/line1_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/line2_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/line3_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/line4_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/line5_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/line6_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/line7_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/line8_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/line9_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lineA_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lineB_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lineC_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lineD_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lineE_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lineF_68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/line0.c Added

@@ -0,0 +1,2085 @@
+/* line0.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: line0.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line 0: Bit Manipulation/MOVEP/Immediate */
+
+static inline
+void BTST_reg(emu68_t * const emu68, const int bit, int reg0)
+{
+ /* BTST.L #b,Dn */
+ int68_t a = REG68.dreg0;
+ BTSTL(a,a,bit);
+ ADDCYCLE(2);
+}
+
+static inline
+void BTST_mem(emu68_t * const emu68, const int bit, int mode, int reg0)
+{
+ /* BTST.B #b,<Ae> */
+ addr68_t addr = get_eab68mode(emu68,reg0);
+ int68_t a = read_B(addr);
+ BTSTB(a,a,bit);
+ ADDCYCLE(0);
+}
+
+static inline
+void BCHG_reg(emu68_t * const emu68, const int bit, int reg0)
+{
+ /* BCHG.L #b,Dn */
+ int68_t a = REG68.dreg0;
+ BCHGL(a,a,bit);
+ REG68.dreg0 = (u32) a;
+ ADDCYCLE(4);
+}
+
+static inline
+void BCHG_mem(emu68_t * const emu68, const int bit, int mode, int reg0)
+{
+ /* BCHG.B #b,<Ae> */
+ addr68_t addr = get_eab68mode(emu68,reg0);
+ int68_t a = read_B(addr);
+ BCHGB(a,a,bit);
+ write_B(addr,a);
+ ADDCYCLE(4);
+}
+
+static inline
+void BCLR_reg(emu68_t * const emu68, const int bit, int reg0)
+{
+ /* BCLR.L #b,Dn */
+ int68_t a = REG68.dreg0;
+ BCLRL(a,a,bit);
+ REG68.dreg0 = (u32) a;
+ ADDCYCLE(6);
+}
+
+static inline
+void BCLR_mem(emu68_t * const emu68, const int bit, int mode, int reg0)
+{
+ /* BCLR.B #b,<Ae> */
+ addr68_t addr = get_eab68mode(emu68,reg0);
+ int68_t a = read_B(addr);
+ BCLRB(a,a,bit);
+ write_B(addr,a);
+ ADDCYCLE(4);
+}
+
+static inline
+void BSET_reg(emu68_t * const emu68, const int bit, int reg0)
+{
+ /* BSET.L #b,Dn */
+ int68_t a = REG68.dreg0;
+ BSETL(a,a,bit);
+ REG68.dreg0 = (u32) a;
+ ADDCYCLE(4);
+}
+
+static inline
+void BSET_mem(emu68_t * const emu68, const int bit, int mode, int reg0)
+{
+ /* BSET.B #b,<Ae> */
+ addr68_t addr = get_eab68mode(emu68,reg0);
+ int68_t a = read_B(addr);
+ BSETB(a,a,bit);
+ write_B(addr,a);
+ ADDCYCLE(4);
+}
+
+static void l0_ill(emu68_t * const emu68, int reg0)
+{
+ reg0 = reg0;
+ ILLEGAL;
+}
+
+static void l0_ORRb0(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.B #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << BYTE_FIX;
+ ORRB(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+static void l0_ANDb0(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.B #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << BYTE_FIX;
+ ANDB(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+static void l0_EORb0(emu68_t * const emu68, int reg0)
+{
+ /* EORI.B #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << BYTE_FIX;
+ EORB(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+static void l0_ADDb0(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.B #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << BYTE_FIX;
+ ADDB(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+static void l0_SUBb0(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.B #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << BYTE_FIX;
+ SUBB(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+static void l0_CMPb0(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.B #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << BYTE_FIX;
+ CMPB(s,d);
+}
+
+static void l0_ORRw0(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.W #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << WORD_FIX;
+ ORRW(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+static void l0_ANDw0(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.W #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << WORD_FIX;
+ ANDW(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+static void l0_EORw0(emu68_t * const emu68, int reg0)
+{
+ /* EORI.W #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << WORD_FIX;
+ EORW(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+static void l0_ADDw0(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.W #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << WORD_FIX;
+ ADDW(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+static void l0_SUBw0(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.W #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << WORD_FIX;
+ SUBW(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+static void l0_CMPw0(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.W #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << WORD_FIX;
+ CMPW(s,d);
+}
+
+static void l0_ORRl0(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.L #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ ORRL(d,s,d);
+ REG68.dreg0 = ( d >> LONG_FIX );
+}
+
+static void l0_ANDl0(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.L #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ ANDL(d,s,d);
+ REG68.dreg0 = ( d >> LONG_FIX );
+}
+
+static void l0_EORl0(emu68_t * const emu68, int reg0)
+{
+ /* EORI.L #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ EORL(d,s,d);
+ REG68.dreg0 = ( d >> LONG_FIX );
+}
+
+static void l0_ADDl0(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.L #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ ADDL(d,s,d);
+ REG68.dreg0 = ( d >> LONG_FIX );
+}
+
+static void l0_SUBl0(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.L #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ SUBL(d,s,d);
+ REG68.dreg0 = ( d >> LONG_FIX );
+}
+
+static void l0_CMPl0(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.L #I,Dn */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ CMPL(s,d);
+}
+
+static void l0_ORRb2(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.B #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_ANDb2(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.B #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_EORb2(emu68_t * const emu68, int reg0)
+{
+ /* EORI.B #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_ADDb2(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.B #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_SUBb2(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.B #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_CMPb2(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.B #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ CMPB(s,d);
+}
+
+static void l0_ORRw2(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.W #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_ANDw2(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.W #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_EORw2(emu68_t * const emu68, int reg0)
+{
+ /* EORI.W #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_ADDw2(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.W #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_SUBw2(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.W #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_CMPw2(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.W #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ CMPW(s,d);
+}
+
+static void l0_ORRl2(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.L #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ANDl2(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.L #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_EORl2(emu68_t * const emu68, int reg0)
+{
+ /* EORI.L #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ADDl2(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.L #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_SUBl2(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.L #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_CMPl2(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.L #I,(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ CMPL(s,d);
+}
+
+static void l0_ORRb3(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.B #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_ANDb3(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.B #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_EORb3(emu68_t * const emu68, int reg0)
+{
+ /* EORI.B #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_ADDb3(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.B #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_SUBb3(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.B #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_CMPb3(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.B #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ CMPB(s,d);
+}
+
+static void l0_ORRw3(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.W #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_ANDw3(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.W #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_EORw3(emu68_t * const emu68, int reg0)
+{
+ /* EORI.W #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_ADDw3(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.W #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_SUBw3(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.W #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_CMPw3(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.W #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ CMPW(s,d);
+}
+
+static void l0_ORRl3(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.L #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ANDl3(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.L #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_EORl3(emu68_t * const emu68, int reg0)
+{
+ /* EORI.L #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ADDl3(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.L #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_SUBl3(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.L #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_CMPl3(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.L #I,(An)+ */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ CMPL(s,d);
+}
+
+static void l0_ORRb4(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.B #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_ANDb4(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.B #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_EORb4(emu68_t * const emu68, int reg0)
+{
+ /* EORI.B #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_ADDb4(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.B #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_SUBb4(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.B #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_CMPb4(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.B #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ CMPB(s,d);
+}
+
+static void l0_ORRw4(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.W #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_ANDw4(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.W #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_EORw4(emu68_t * const emu68, int reg0)
+{
+ /* EORI.W #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_ADDw4(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.W #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_SUBw4(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.W #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_CMPw4(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.W #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ CMPW(s,d);
+}
+
+static void l0_ORRl4(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.L #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ANDl4(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.L #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_EORl4(emu68_t * const emu68, int reg0)
+{
+ /* EORI.L #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ADDl4(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.L #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_SUBl4(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.L #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_CMPl4(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.L #I,-(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ CMPL(s,d);
+}
+
+static void l0_ORRb5(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.B #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_ANDb5(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.B #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_EORb5(emu68_t * const emu68, int reg0)
+{
+ /* EORI.B #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_ADDb5(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.B #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_SUBb5(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.B #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_CMPb5(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.B #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ CMPB(s,d);
+}
+
+static void l0_ORRw5(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.W #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_ANDw5(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.W #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_EORw5(emu68_t * const emu68, int reg0)
+{
+ /* EORI.W #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_ADDw5(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.W #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_SUBw5(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.W #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_CMPw5(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.W #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ CMPW(s,d);
+}
+
+static void l0_ORRl5(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.L #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ANDl5(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.L #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_EORl5(emu68_t * const emu68, int reg0)
+{
+ /* EORI.L #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ADDl5(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.L #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_SUBl5(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.L #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_CMPl5(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.L #I,d(An) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ CMPL(s,d);
+}
+
+static void l0_ORRb6(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.B #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_ANDb6(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.B #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_EORb6(emu68_t * const emu68, int reg0)
+{
+ /* EORI.B #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_ADDb6(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.B #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_SUBb6(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.B #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_CMPb6(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.B #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ CMPB(s,d);
+}
+
+static void l0_ORRw6(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.W #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_ANDw6(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.W #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_EORw6(emu68_t * const emu68, int reg0)
+{
+ /* EORI.W #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_ADDw6(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.W #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_SUBw6(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.W #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_CMPw6(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.W #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ CMPW(s,d);
+}
+
+static void l0_ORRl6(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.L #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ANDl6(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.L #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_EORl6(emu68_t * const emu68, int reg0)
+{
+ /* EORI.L #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ADDl6(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.L #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_SUBl6(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.L #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_CMPl6(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.L #I,d(An,Xi) */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ CMPL(s,d);
+}
+
+static void l0_ORRb7(emu68_t * const emu68, int reg0)
+{
+ if (reg0==4) { /* ORR TO CCR */
+ uint68_t a;
+ a = get_nextw()&255;
+ REG68.sr |= a;
+ } else {
+ /* ORRI.B #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+ }
+}
+
+static void l0_ANDb7(emu68_t * const emu68, int reg0)
+{
+ if (reg0==4) { /* AND TO CCR */
+ uint68_t a;
+ a = get_nextw()|0xFF00;
+ REG68.sr &= a;
+ } else {
+ /* ANDI.B #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+ }
+}
+
+static void l0_EORb7(emu68_t * const emu68, int reg0)
+{
+ if (reg0==4) { /* EOR TO CCR */
+ uint68_t a;
+ a = get_nextw()&255;
+ REG68.sr ^= a;
+ } else {
+ /* EORI.B #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+ }
+}
+
+static void l0_ADDb7(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.B #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_SUBb7(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.B #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+static void l0_CMPb7(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.B #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ CMPB(s,d);
+}
+
+static void l0_ORRw7(emu68_t * const emu68, int reg0)
+{
+ if (reg0==4) { /* ORR TO SR */
+ uint68_t a;
+ a = get_nextw();
+ REG68.sr |= a;
+ } else {
+ /* ORRI.W #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+ }
+}
+
+static void l0_ANDw7(emu68_t * const emu68, int reg0)
+{
+ if (reg0==4) { /* AND TO SR */
+ uint68_t a;
+ a = get_nextw();
+ REG68.sr &= a;
+ } else {
+ /* ANDI.W #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+ }
+}
+
+static void l0_EORw7(emu68_t * const emu68, int reg0)
+{
+ if (reg0==4) { /* EOR TO SR */
+ uint68_t a;
+ a = get_nextw();
+ REG68.sr ^= a;
+ } else {
+ /* EORI.W #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+ }
+}
+
+static void l0_ADDw7(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.W #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_SUBw7(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.W #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+static void l0_CMPw7(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.W #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextw() << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ CMPW(s,d);
+}
+
+static void l0_ORRl7(emu68_t * const emu68, int reg0)
+{
+ /* ORRI.L #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ANDl7(emu68_t * const emu68, int reg0)
+{
+ /* ANDI.L #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_EORl7(emu68_t * const emu68, int reg0)
+{
+ /* EORI.L #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_ADDl7(emu68_t * const emu68, int reg0)
+{
+ /* ADDI.L #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_SUBl7(emu68_t * const emu68, int reg0)
+{
+ /* SUBI.L #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+static void l0_CMPl7(emu68_t * const emu68, int reg0)
+{
+ /* CMPI.L #I,<Ae> */
+ const uint68_t s = ( (int68_t) get_nextl() << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ CMPL(s,d);
+}
+
+static void (*const line0_imm832)(emu68_t * const emu68, int) =
+{
+/* ORR */
+ {
+ l0_ORRb0,l0_ill,l0_ORRb2,l0_ORRb3,l0_ORRb4,l0_ORRb5,l0_ORRb6,l0_ORRb7,
+ l0_ORRw0,l0_ill,l0_ORRw2,l0_ORRw3,l0_ORRw4,l0_ORRw5,l0_ORRw6,l0_ORRw7,
+ l0_ORRl0,l0_ill,l0_ORRl2,l0_ORRl3,l0_ORRl4,l0_ORRl5,l0_ORRl6,l0_ORRl7,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+
+ },
+/* AND */
+ {
+ l0_ANDb0,l0_ill,l0_ANDb2,l0_ANDb3,l0_ANDb4,l0_ANDb5,l0_ANDb6,l0_ANDb7,
+ l0_ANDw0,l0_ill,l0_ANDw2,l0_ANDw3,l0_ANDw4,l0_ANDw5,l0_ANDw6,l0_ANDw7,
+ l0_ANDl0,l0_ill,l0_ANDl2,l0_ANDl3,l0_ANDl4,l0_ANDl5,l0_ANDl6,l0_ANDl7,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+
+ },
+/* SUB */
+ {
+ l0_SUBb0,l0_ill,l0_SUBb2,l0_SUBb3,l0_SUBb4,l0_SUBb5,l0_SUBb6,l0_SUBb7,
+ l0_SUBw0,l0_ill,l0_SUBw2,l0_SUBw3,l0_SUBw4,l0_SUBw5,l0_SUBw6,l0_SUBw7,
+ l0_SUBl0,l0_ill,l0_SUBl2,l0_SUBl3,l0_SUBl4,l0_SUBl5,l0_SUBl6,l0_SUBl7,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+
+ },
+/* ADD */
+ {
+ l0_ADDb0,l0_ill,l0_ADDb2,l0_ADDb3,l0_ADDb4,l0_ADDb5,l0_ADDb6,l0_ADDb7,
+ l0_ADDw0,l0_ill,l0_ADDw2,l0_ADDw3,l0_ADDw4,l0_ADDw5,l0_ADDw6,l0_ADDw7,
+ l0_ADDl0,l0_ill,l0_ADDl2,l0_ADDl3,l0_ADDl4,l0_ADDl5,l0_ADDl6,l0_ADDl7,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+
+ },
+/* ??? */
+ {
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+
+ },
+/* EOR */
+ {
+ l0_EORb0,l0_ill,l0_EORb2,l0_EORb3,l0_EORb4,l0_EORb5,l0_EORb6,l0_EORb7,
+ l0_EORw0,l0_ill,l0_EORw2,l0_EORw3,l0_EORw4,l0_EORw5,l0_EORw6,l0_EORw7,
+ l0_EORl0,l0_ill,l0_EORl2,l0_EORl3,l0_EORl4,l0_EORl5,l0_EORl6,l0_EORl7,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+
+ },
+/* CMP */
+ {
+ l0_CMPb0,l0_ill,l0_CMPb2,l0_CMPb3,l0_CMPb4,l0_CMPb5,l0_CMPb6,l0_CMPb7,
+ l0_CMPw0,l0_ill,l0_CMPw2,l0_CMPw3,l0_CMPw4,l0_CMPw5,l0_CMPw6,l0_CMPw7,
+ l0_CMPl0,l0_ill,l0_CMPl2,l0_CMPl3,l0_CMPl4,l0_CMPl5,l0_CMPl6,l0_CMPl7,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+
+ },
+/* ??? */
+ {
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+ l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,l0_ill,
+
+ },
+};
+
+DECL_LINE68(line000)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BTST_reg(emu68, bit, reg0);
+ } else {
+ line0_immreg90(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line001)
+{
+ if (reg9 == 4) {
+ ILLEGAL; /* BTST #xx,An (op:00000000000000000000000000000001) */
+ assert(EMU68_BREAK);
+ } else {
+ line0_immreg91(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line002)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BTST_mem(emu68, bit, 2, reg0);
+ } else {
+ line0_immreg92(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line003)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BTST_mem(emu68, bit, 3, reg0);
+ } else {
+ line0_immreg93(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line004)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BTST_mem(emu68, bit, 4, reg0);
+ } else {
+ line0_immreg94(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line005)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BTST_mem(emu68, bit, 5, reg0);
+ } else {
+ line0_immreg95(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line006)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BTST_mem(emu68, bit, 6, reg0);
+ } else {
+ line0_immreg96(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line007)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BTST_mem(emu68, bit, 7, reg0);
+ } else {
+ line0_immreg97(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line008)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCHG_reg(emu68, bit, reg0);
+ } else {
+ line0_immreg98(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line009)
+{
+ if (reg9 == 4) {
+ ILLEGAL; /* BCHG #xx,An (op:00000000000000000000000000000011) */
+ assert(EMU68_BREAK);
+ } else {
+ line0_immreg99(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line00A)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCHG_mem(emu68, bit, 2, reg0);
+ } else {
+ line0_immreg910(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line00B)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCHG_mem(emu68, bit, 3, reg0);
+ } else {
+ line0_immreg911(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line00C)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCHG_mem(emu68, bit, 4, reg0);
+ } else {
+ line0_immreg912(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line00D)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCHG_mem(emu68, bit, 5, reg0);
+ } else {
+ line0_immreg913(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line00E)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCHG_mem(emu68, bit, 6, reg0);
+ } else {
+ line0_immreg914(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line00F)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCHG_mem(emu68, bit, 7, reg0);
+ } else {
+ line0_immreg915(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line010)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCLR_reg(emu68, bit, reg0);
+ } else {
+ line0_immreg916(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line011)
+{
+ if (reg9 == 4) {
+ ILLEGAL; /* BCLR #xx,An (op:00000000000000000000000000000021) */
+ assert(EMU68_BREAK);
+ } else {
+ line0_immreg917(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line012)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCLR_mem(emu68, bit, 2, reg0);
+ } else {
+ line0_immreg918(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line013)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCLR_mem(emu68, bit, 3, reg0);
+ } else {
+ line0_immreg919(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line014)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCLR_mem(emu68, bit, 4, reg0);
+ } else {
+ line0_immreg920(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line015)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCLR_mem(emu68, bit, 5, reg0);
+ } else {
+ line0_immreg921(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line016)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCLR_mem(emu68, bit, 6, reg0);
+ } else {
+ line0_immreg922(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line017)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BCLR_mem(emu68, bit, 7, reg0);
+ } else {
+ line0_immreg923(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line018)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BSET_reg(emu68, bit, reg0);
+ } else {
+ line0_immreg924(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line019)
+{
+ if (reg9 == 4) {
+ ILLEGAL; /* BSET #xx,An (op:00000000000000000000000000000031) */
+ assert(EMU68_BREAK);
+ } else {
+ line0_immreg925(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line01A)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BSET_mem(emu68, bit, 2, reg0);
+ } else {
+ line0_immreg926(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line01B)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BSET_mem(emu68, bit, 3, reg0);
+ } else {
+ line0_immreg927(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line01C)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BSET_mem(emu68, bit, 4, reg0);
+ } else {
+ line0_immreg928(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line01D)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BSET_mem(emu68, bit, 5, reg0);
+ } else {
+ line0_immreg929(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line01E)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BSET_mem(emu68, bit, 6, reg0);
+ } else {
+ line0_immreg930(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line01F)
+{
+ if (reg9 == 4) {
+ const int bit = get_nextw();
+ BSET_mem(emu68, bit, 7, reg0);
+ } else {
+ line0_immreg931(emu68,reg0);
+ }
+}
+
+DECL_LINE68(line020)
+{
+ /* BTST.L Dx,Dy */
+ int68_t y = REG68.dreg0;
+ const int x = REG68.dreg9;
+ BTSTL(y,y,x);
+ ADDCYCLE(2);
+}
+
+DECL_LINE68(line021)
+{
+ /* MOVEP.W d(An),Dn */
+ const addr68_t l = REG68.areg0 + get_nextw();
+ uint68_t a;
+ a = read_B( l + 0 ) << 8;
+ a += read_B( l + 2 ) << 0;
+ REG68.dreg9 = ( REG68.dreg9 & ~0xFFFF ) + a;
+ ADDCYCLE(8);
+}
+
+DECL_LINE68(line022)
+{
+ /* BTST.B Dn,(An) */
+ const addr68_t l = get_EAB(2,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BTSTB(y,y,x);
+ ADDCYCLE(0);
+}
+
+DECL_LINE68(line023)
+{
+ /* BTST.B Dn,(An)+ */
+ const addr68_t l = get_EAB(3,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BTSTB(y,y,x);
+ ADDCYCLE(0);
+}
+
+DECL_LINE68(line024)
+{
+ /* BTST.B Dn,-(An) */
+ const addr68_t l = get_EAB(4,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BTSTB(y,y,x);
+ ADDCYCLE(0);
+}
+
+DECL_LINE68(line025)
+{
+ /* BTST.B Dn,d(An) */
+ const addr68_t l = get_EAB(5,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BTSTB(y,y,x);
+ ADDCYCLE(0);
+}
+
+DECL_LINE68(line026)
+{
+ /* BTST.B Dn,d(An,Xi) */
+ const addr68_t l = get_EAB(6,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BTSTB(y,y,x);
+ ADDCYCLE(0);
+}
+
+DECL_LINE68(line027)
+{
+ /* BTST.B Dn,<Ae> */
+ const addr68_t l = get_EAB(7,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BTSTB(y,y,x);
+ ADDCYCLE(0);
+}
+
+DECL_LINE68(line028)
+{
+ /* BCHG.L Dx,Dy */
+ int68_t y = REG68.dreg0;
+ const int x = REG68.dreg9;
+ BCHGL(y,y,x);
+ REG68.dreg0 = (u32) y;
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line029)
+{
+ /* MOVEP.L d(An),Dn */
+ const addr68_t l = REG68.areg0 + get_nextw();
+ uint68_t a;
+ a = read_B( l + 0 ) << 24;
+ a += read_B( l + 2 ) << 16;
+ a += read_B( l + 4 ) << 8;
+ a += read_B( l + 6 ) << 0;
+ REG68.dreg9 = a;
+ ADDCYCLE(16);
+}
+
+DECL_LINE68(line02A)
+{
+ /* BCHG.B Dn,(An) */
+ const addr68_t l = get_EAB(2,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCHGB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line02B)
+{
+ /* BCHG.B Dn,(An)+ */
+ const addr68_t l = get_EAB(3,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCHGB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line02C)
+{
+ /* BCHG.B Dn,-(An) */
+ const addr68_t l = get_EAB(4,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCHGB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line02D)
+{
+ /* BCHG.B Dn,d(An) */
+ const addr68_t l = get_EAB(5,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCHGB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line02E)
+{
+ /* BCHG.B Dn,d(An,Xi) */
+ const addr68_t l = get_EAB(6,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCHGB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line02F)
+{
+ /* BCHG.B Dn,<Ae> */
+ const addr68_t l = get_EAB(7,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCHGB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line030)
+{
+ /* BCLR.L Dx,Dy */
+ int68_t y = REG68.dreg0;
+ const int x = REG68.dreg9;
+ BCLRL(y,y,x);
+ REG68.dreg0 = (u32) y;
+ ADDCYCLE(6);
+}
+
+DECL_LINE68(line031)
+{
+ /* MOVEP.W Dn,d(An) */
+ const addr68_t l = REG68.areg0 + get_nextw();
+ const uint68_t a = REG68.dreg9;
+ write_B( l + 0, a >> 8);
+ write_B( l + 2, a >> 0);
+ ADDCYCLE(8);
+}
+
+DECL_LINE68(line032)
+{
+ /* BCLR.B Dn,(An) */
+ const addr68_t l = get_EAB(2,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCLRB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line033)
+{
+ /* BCLR.B Dn,(An)+ */
+ const addr68_t l = get_EAB(3,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCLRB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line034)
+{
+ /* BCLR.B Dn,-(An) */
+ const addr68_t l = get_EAB(4,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCLRB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line035)
+{
+ /* BCLR.B Dn,d(An) */
+ const addr68_t l = get_EAB(5,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCLRB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line036)
+{
+ /* BCLR.B Dn,d(An,Xi) */
+ const addr68_t l = get_EAB(6,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCLRB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line037)
+{
+ /* BCLR.B Dn,<Ae> */
+ const addr68_t l = get_EAB(7,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BCLRB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line038)
+{
+ /* BSET.L Dx,Dy */
+ int68_t y = REG68.dreg0;
+ const int x = REG68.dreg9;
+ BSETL(y,y,x);
+ REG68.dreg0 = (u32) y;
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line039)
+{
+ /* MOVEP.L Dn,d(An) */
+ const addr68_t l = REG68.areg0 + get_nextw();
+ const uint68_t a = REG68.dreg9;
+ write_B( l + 0, a >> 24);
+ write_B( l + 2, a >> 16);
+ write_B( l + 4, a >> 8);
+ write_B( l + 6, a >> 0);
+ ADDCYCLE(16);
+}
+
+DECL_LINE68(line03A)
+{
+ /* BSET.B Dn,(An) */
+ const addr68_t l = get_EAB(2,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BSETB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line03B)
+{
+ /* BSET.B Dn,(An)+ */
+ const addr68_t l = get_EAB(3,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BSETB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line03C)
+{
+ /* BSET.B Dn,-(An) */
+ const addr68_t l = get_EAB(4,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BSETB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line03D)
+{
+ /* BSET.B Dn,d(An) */
+ const addr68_t l = get_EAB(5,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BSETB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line03E)
+{
+ /* BSET.B Dn,d(An,Xi) */
+ const addr68_t l = get_EAB(6,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BSETB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+
+DECL_LINE68(line03F)
+{
+ /* BSET.B Dn,<Ae> */
+ const addr68_t l = get_EAB(7,reg0);
+ int68_t y = read_B(l);
+ const int x = REG68.dreg9;
+ BSETB(y,y,x);
+ write_B(l,y);
+ ADDCYCLE(4);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/line1.c Added

@@ -0,0 +1,505 @@
+/* line1.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: line1.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line 1: Move Byte */
+
+DECL_LINE68(line100)
+{
+ /* MOVE.B Dx,Dy */
+ const int68_t a = (int68_t) REG68.dreg0 << BYTE_FIX;
+ MOVEB(a);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( (uint68_t) a >> BYTE_FIX );
+}
+
+DECL_LINE68(line101)
+{
+ /* MOVE.B Ax,Dy */
+ const int68_t a = (int68_t) REG68.areg0 << BYTE_FIX;
+ MOVEB(a);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( (uint68_t) a >> BYTE_FIX );
+}
+
+DECL_LINE68(line102)
+{
+ /* MOVE.B (Ax),Dy */
+ const int68_t a = (int68_t) read_EAB(2,reg0) << BYTE_FIX;
+ MOVEB(a);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( (uint68_t) a >> BYTE_FIX );
+}
+
+DECL_LINE68(line103)
+{
+ /* MOVE.B (Ax)+,Dy */
+ const int68_t a = (int68_t) read_EAB(3,reg0) << BYTE_FIX;
+ MOVEB(a);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( (uint68_t) a >> BYTE_FIX );
+}
+
+DECL_LINE68(line104)
+{
+ /* MOVE.B -(Ax),Dy */
+ const int68_t a = (int68_t) read_EAB(4,reg0) << BYTE_FIX;
+ MOVEB(a);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( (uint68_t) a >> BYTE_FIX );
+}
+
+DECL_LINE68(line105)
+{
+ /* MOVE.B d(Ax),Dy */
+ const int68_t a = (int68_t) read_EAB(5,reg0) << BYTE_FIX;
+ MOVEB(a);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( (uint68_t) a >> BYTE_FIX );
+}
+
+DECL_LINE68(line106)
+{
+ /* MOVE.B d(Ax,Xi),Dy */
+ const int68_t a = (int68_t) read_EAB(6,reg0) << BYTE_FIX;
+ MOVEB(a);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( (uint68_t) a >> BYTE_FIX );
+}
+
+DECL_LINE68(line107)
+{
+ /* MOVE.B <Ae>,Dy */
+ const int68_t a = (int68_t) read_EAB(7,reg0) << BYTE_FIX;
+ MOVEB(a);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( (uint68_t) a >> BYTE_FIX );
+}
+
+DECL_LINE68(line108)
+{
+ ILLEGAL; /* MOVEA.B Dx,An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line109)
+{
+ ILLEGAL; /* MOVEA.B Ax,An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line10A)
+{
+ ILLEGAL; /* MOVEA.B (Ax),An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line10B)
+{
+ ILLEGAL; /* MOVEA.B (Ax)+,An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line10C)
+{
+ ILLEGAL; /* MOVEA.B -(Ax),An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line10D)
+{
+ ILLEGAL; /* MOVEA.B d(Ax),An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line10E)
+{
+ ILLEGAL; /* MOVEA.B d(Ax,Xi),An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line10F)
+{
+ ILLEGAL; /* MOVEA.B <Ae>,An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line110)
+{
+ /* MOVE.B Dx,(Ay) */
+ const int68_t a = (int68_t) REG68.dreg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(2, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line111)
+{
+ /* MOVE.B Ax,(Ay) */
+ const int68_t a = (int68_t) REG68.areg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(2, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line112)
+{
+ /* MOVE.B (Ax),(Ay) */
+ const int68_t a = (int68_t) read_EAB(2,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(2, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line113)
+{
+ /* MOVE.B (Ax)+,(Ay) */
+ const int68_t a = (int68_t) read_EAB(3,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(2, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line114)
+{
+ /* MOVE.B -(Ax),(Ay) */
+ const int68_t a = (int68_t) read_EAB(4,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(2, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line115)
+{
+ /* MOVE.B d(Ax),(Ay) */
+ const int68_t a = (int68_t) read_EAB(5,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(2, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line116)
+{
+ /* MOVE.B d(Ax,Xi),(Ay) */
+ const int68_t a = (int68_t) read_EAB(6,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(2, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line117)
+{
+ /* MOVE.B <Ae>,(Ay) */
+ const int68_t a = (int68_t) read_EAB(7,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(2, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line118)
+{
+ /* MOVE.B Dx,(Ay)+ */
+ const int68_t a = (int68_t) REG68.dreg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(3, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line119)
+{
+ /* MOVE.B Ax,(Ay)+ */
+ const int68_t a = (int68_t) REG68.areg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(3, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line11A)
+{
+ /* MOVE.B (Ax),(Ay)+ */
+ const int68_t a = (int68_t) read_EAB(2,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(3, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line11B)
+{
+ /* MOVE.B (Ax)+,(Ay)+ */
+ const int68_t a = (int68_t) read_EAB(3,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(3, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line11C)
+{
+ /* MOVE.B -(Ax),(Ay)+ */
+ const int68_t a = (int68_t) read_EAB(4,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(3, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line11D)
+{
+ /* MOVE.B d(Ax),(Ay)+ */
+ const int68_t a = (int68_t) read_EAB(5,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(3, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line11E)
+{
+ /* MOVE.B d(Ax,Xi),(Ay)+ */
+ const int68_t a = (int68_t) read_EAB(6,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(3, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line11F)
+{
+ /* MOVE.B <Ae>,(Ay)+ */
+ const int68_t a = (int68_t) read_EAB(7,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(3, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line120)
+{
+ /* MOVE.B Dx,-(Ay) */
+ const int68_t a = (int68_t) REG68.dreg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(4, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line121)
+{
+ /* MOVE.B Ax,-(Ay) */
+ const int68_t a = (int68_t) REG68.areg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(4, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line122)
+{
+ /* MOVE.B (Ax),-(Ay) */
+ const int68_t a = (int68_t) read_EAB(2,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(4, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line123)
+{
+ /* MOVE.B (Ax)+,-(Ay) */
+ const int68_t a = (int68_t) read_EAB(3,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(4, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line124)
+{
+ /* MOVE.B -(Ax),-(Ay) */
+ const int68_t a = (int68_t) read_EAB(4,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(4, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line125)
+{
+ /* MOVE.B d(Ax),-(Ay) */
+ const int68_t a = (int68_t) read_EAB(5,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(4, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line126)
+{
+ /* MOVE.B d(Ax,Xi),-(Ay) */
+ const int68_t a = (int68_t) read_EAB(6,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(4, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line127)
+{
+ /* MOVE.B <Ae>,-(Ay) */
+ const int68_t a = (int68_t) read_EAB(7,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(4, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line128)
+{
+ /* MOVE.B Dx,d(Ay) */
+ const int68_t a = (int68_t) REG68.dreg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(5, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line129)
+{
+ /* MOVE.B Ax,d(Ay) */
+ const int68_t a = (int68_t) REG68.areg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(5, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line12A)
+{
+ /* MOVE.B (Ax),d(Ay) */
+ const int68_t a = (int68_t) read_EAB(2,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(5, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line12B)
+{
+ /* MOVE.B (Ax)+,d(Ay) */
+ const int68_t a = (int68_t) read_EAB(3,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(5, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line12C)
+{
+ /* MOVE.B -(Ax),d(Ay) */
+ const int68_t a = (int68_t) read_EAB(4,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(5, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line12D)
+{
+ /* MOVE.B d(Ax),d(Ay) */
+ const int68_t a = (int68_t) read_EAB(5,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(5, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line12E)
+{
+ /* MOVE.B d(Ax,Xi),d(Ay) */
+ const int68_t a = (int68_t) read_EAB(6,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(5, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line12F)
+{
+ /* MOVE.B <Ae>,d(Ay) */
+ const int68_t a = (int68_t) read_EAB(7,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(5, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line130)
+{
+ /* MOVE.B Dx,d(Ay,Xi) */
+ const int68_t a = (int68_t) REG68.dreg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(6, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line131)
+{
+ /* MOVE.B Ax,d(Ay,Xi) */
+ const int68_t a = (int68_t) REG68.areg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(6, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line132)
+{
+ /* MOVE.B (Ax),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAB(2,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(6, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line133)
+{
+ /* MOVE.B (Ax)+,d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAB(3,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(6, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line134)
+{
+ /* MOVE.B -(Ax),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAB(4,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(6, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line135)
+{
+ /* MOVE.B d(Ax),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAB(5,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(6, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line136)
+{
+ /* MOVE.B d(Ax,Xi),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAB(6,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(6, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line137)
+{
+ /* MOVE.B <Ae>,d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAB(7,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(6, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line138)
+{
+ /* MOVE.B Dx,<Ae> */
+ const int68_t a = (int68_t) REG68.dreg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(7, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line139)
+{
+ /* MOVE.B Ax,<Ae> */
+ const int68_t a = (int68_t) REG68.areg0 << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(7, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line13A)
+{
+ /* MOVE.B (Ax),<Ae> */
+ const int68_t a = (int68_t) read_EAB(2,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(7, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line13B)
+{
+ /* MOVE.B (Ax)+,<Ae> */
+ const int68_t a = (int68_t) read_EAB(3,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(7, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line13C)
+{
+ /* MOVE.B -(Ax),<Ae> */
+ const int68_t a = (int68_t) read_EAB(4,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(7, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line13D)
+{
+ /* MOVE.B d(Ax),<Ae> */
+ const int68_t a = (int68_t) read_EAB(5,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(7, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line13E)
+{
+ /* MOVE.B d(Ax,Xi),<Ae> */
+ const int68_t a = (int68_t) read_EAB(6,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(7, reg9, a >> BYTE_FIX);
+}
+
+DECL_LINE68(line13F)
+{
+ /* MOVE.B <Ae>,<Ae> */
+ const int68_t a = (int68_t) read_EAB(7,reg0) << BYTE_FIX;
+ MOVEB(a);
+ write_EAB(7, reg9, a >> BYTE_FIX);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/line2.c Added

@@ -0,0 +1,505 @@
+/* line2.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: line2.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line 2: Move Long */
+
+DECL_LINE68(line200)
+{
+ /* MOVE.L Dx,Dy */
+ const int68_t a = (int68_t) REG68.dreg0 << LONG_FIX;
+ MOVEL(a);
+ REG68.dreg9 = ( (uint68_t) a >> LONG_FIX );
+}
+
+DECL_LINE68(line201)
+{
+ /* MOVE.L Ax,Dy */
+ const int68_t a = (int68_t) REG68.areg0 << LONG_FIX;
+ MOVEL(a);
+ REG68.dreg9 = ( (uint68_t) a >> LONG_FIX );
+}
+
+DECL_LINE68(line202)
+{
+ /* MOVE.L (Ax),Dy */
+ const int68_t a = (int68_t) read_EAL(2,reg0) << LONG_FIX;
+ MOVEL(a);
+ REG68.dreg9 = ( (uint68_t) a >> LONG_FIX );
+}
+
+DECL_LINE68(line203)
+{
+ /* MOVE.L (Ax)+,Dy */
+ const int68_t a = (int68_t) read_EAL(3,reg0) << LONG_FIX;
+ MOVEL(a);
+ REG68.dreg9 = ( (uint68_t) a >> LONG_FIX );
+}
+
+DECL_LINE68(line204)
+{
+ /* MOVE.L -(Ax),Dy */
+ const int68_t a = (int68_t) read_EAL(4,reg0) << LONG_FIX;
+ MOVEL(a);
+ REG68.dreg9 = ( (uint68_t) a >> LONG_FIX );
+}
+
+DECL_LINE68(line205)
+{
+ /* MOVE.L d(Ax),Dy */
+ const int68_t a = (int68_t) read_EAL(5,reg0) << LONG_FIX;
+ MOVEL(a);
+ REG68.dreg9 = ( (uint68_t) a >> LONG_FIX );
+}
+
+DECL_LINE68(line206)
+{
+ /* MOVE.L d(Ax,Xi),Dy */
+ const int68_t a = (int68_t) read_EAL(6,reg0) << LONG_FIX;
+ MOVEL(a);
+ REG68.dreg9 = ( (uint68_t) a >> LONG_FIX );
+}
+
+DECL_LINE68(line207)
+{
+ /* MOVE.L <Ae>,Dy */
+ const int68_t a = (int68_t) read_EAL(7,reg0) << LONG_FIX;
+ MOVEL(a);
+ REG68.dreg9 = ( (uint68_t) a >> LONG_FIX );
+}
+
+DECL_LINE68(line208)
+{
+ /* MOVEA.L Dx,An */
+ REG68.areg9 = REG68.dreg0;
+}
+
+DECL_LINE68(line209)
+{
+ /* MOVEA.L Ax,An */
+ REG68.areg9 = REG68.areg0;
+}
+
+DECL_LINE68(line20A)
+{
+ /* MOVEA.L (Ax),An */
+ REG68.areg9 = read_EAL(2,reg0);
+}
+
+DECL_LINE68(line20B)
+{
+ /* MOVEA.L (Ax)+,An */
+ REG68.areg9 = read_EAL(3,reg0);
+}
+
+DECL_LINE68(line20C)
+{
+ /* MOVEA.L -(Ax),An */
+ REG68.areg9 = read_EAL(4,reg0);
+}
+
+DECL_LINE68(line20D)
+{
+ /* MOVEA.L d(Ax),An */
+ REG68.areg9 = read_EAL(5,reg0);
+}
+
+DECL_LINE68(line20E)
+{
+ /* MOVEA.L d(Ax,Xi),An */
+ REG68.areg9 = read_EAL(6,reg0);
+}
+
+DECL_LINE68(line20F)
+{
+ /* MOVEA.L <Ae>,An */
+ REG68.areg9 = read_EAL(7,reg0);
+}
+
+DECL_LINE68(line210)
+{
+ /* MOVE.L Dx,(Ay) */
+ const int68_t a = (int68_t) REG68.dreg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(2, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line211)
+{
+ /* MOVE.L Ax,(Ay) */
+ const int68_t a = (int68_t) REG68.areg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(2, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line212)
+{
+ /* MOVE.L (Ax),(Ay) */
+ const int68_t a = (int68_t) read_EAL(2,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(2, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line213)
+{
+ /* MOVE.L (Ax)+,(Ay) */
+ const int68_t a = (int68_t) read_EAL(3,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(2, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line214)
+{
+ /* MOVE.L -(Ax),(Ay) */
+ const int68_t a = (int68_t) read_EAL(4,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(2, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line215)
+{
+ /* MOVE.L d(Ax),(Ay) */
+ const int68_t a = (int68_t) read_EAL(5,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(2, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line216)
+{
+ /* MOVE.L d(Ax,Xi),(Ay) */
+ const int68_t a = (int68_t) read_EAL(6,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(2, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line217)
+{
+ /* MOVE.L <Ae>,(Ay) */
+ const int68_t a = (int68_t) read_EAL(7,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(2, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line218)
+{
+ /* MOVE.L Dx,(Ay)+ */
+ const int68_t a = (int68_t) REG68.dreg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(3, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line219)
+{
+ /* MOVE.L Ax,(Ay)+ */
+ const int68_t a = (int68_t) REG68.areg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(3, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line21A)
+{
+ /* MOVE.L (Ax),(Ay)+ */
+ const int68_t a = (int68_t) read_EAL(2,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(3, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line21B)
+{
+ /* MOVE.L (Ax)+,(Ay)+ */
+ const int68_t a = (int68_t) read_EAL(3,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(3, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line21C)
+{
+ /* MOVE.L -(Ax),(Ay)+ */
+ const int68_t a = (int68_t) read_EAL(4,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(3, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line21D)
+{
+ /* MOVE.L d(Ax),(Ay)+ */
+ const int68_t a = (int68_t) read_EAL(5,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(3, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line21E)
+{
+ /* MOVE.L d(Ax,Xi),(Ay)+ */
+ const int68_t a = (int68_t) read_EAL(6,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(3, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line21F)
+{
+ /* MOVE.L <Ae>,(Ay)+ */
+ const int68_t a = (int68_t) read_EAL(7,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(3, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line220)
+{
+ /* MOVE.L Dx,-(Ay) */
+ const int68_t a = (int68_t) REG68.dreg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(4, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line221)
+{
+ /* MOVE.L Ax,-(Ay) */
+ const int68_t a = (int68_t) REG68.areg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(4, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line222)
+{
+ /* MOVE.L (Ax),-(Ay) */
+ const int68_t a = (int68_t) read_EAL(2,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(4, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line223)
+{
+ /* MOVE.L (Ax)+,-(Ay) */
+ const int68_t a = (int68_t) read_EAL(3,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(4, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line224)
+{
+ /* MOVE.L -(Ax),-(Ay) */
+ const int68_t a = (int68_t) read_EAL(4,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(4, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line225)
+{
+ /* MOVE.L d(Ax),-(Ay) */
+ const int68_t a = (int68_t) read_EAL(5,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(4, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line226)
+{
+ /* MOVE.L d(Ax,Xi),-(Ay) */
+ const int68_t a = (int68_t) read_EAL(6,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(4, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line227)
+{
+ /* MOVE.L <Ae>,-(Ay) */
+ const int68_t a = (int68_t) read_EAL(7,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(4, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line228)
+{
+ /* MOVE.L Dx,d(Ay) */
+ const int68_t a = (int68_t) REG68.dreg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(5, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line229)
+{
+ /* MOVE.L Ax,d(Ay) */
+ const int68_t a = (int68_t) REG68.areg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(5, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line22A)
+{
+ /* MOVE.L (Ax),d(Ay) */
+ const int68_t a = (int68_t) read_EAL(2,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(5, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line22B)
+{
+ /* MOVE.L (Ax)+,d(Ay) */
+ const int68_t a = (int68_t) read_EAL(3,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(5, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line22C)
+{
+ /* MOVE.L -(Ax),d(Ay) */
+ const int68_t a = (int68_t) read_EAL(4,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(5, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line22D)
+{
+ /* MOVE.L d(Ax),d(Ay) */
+ const int68_t a = (int68_t) read_EAL(5,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(5, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line22E)
+{
+ /* MOVE.L d(Ax,Xi),d(Ay) */
+ const int68_t a = (int68_t) read_EAL(6,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(5, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line22F)
+{
+ /* MOVE.L <Ae>,d(Ay) */
+ const int68_t a = (int68_t) read_EAL(7,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(5, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line230)
+{
+ /* MOVE.L Dx,d(Ay,Xi) */
+ const int68_t a = (int68_t) REG68.dreg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(6, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line231)
+{
+ /* MOVE.L Ax,d(Ay,Xi) */
+ const int68_t a = (int68_t) REG68.areg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(6, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line232)
+{
+ /* MOVE.L (Ax),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAL(2,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(6, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line233)
+{
+ /* MOVE.L (Ax)+,d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAL(3,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(6, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line234)
+{
+ /* MOVE.L -(Ax),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAL(4,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(6, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line235)
+{
+ /* MOVE.L d(Ax),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAL(5,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(6, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line236)
+{
+ /* MOVE.L d(Ax,Xi),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAL(6,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(6, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line237)
+{
+ /* MOVE.L <Ae>,d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAL(7,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(6, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line238)
+{
+ /* MOVE.L Dx,<Ae> */
+ const int68_t a = (int68_t) REG68.dreg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(7, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line239)
+{
+ /* MOVE.L Ax,<Ae> */
+ const int68_t a = (int68_t) REG68.areg0 << LONG_FIX;
+ MOVEL(a);
+ write_EAL(7, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line23A)
+{
+ /* MOVE.L (Ax),<Ae> */
+ const int68_t a = (int68_t) read_EAL(2,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(7, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line23B)
+{
+ /* MOVE.L (Ax)+,<Ae> */
+ const int68_t a = (int68_t) read_EAL(3,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(7, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line23C)
+{
+ /* MOVE.L -(Ax),<Ae> */
+ const int68_t a = (int68_t) read_EAL(4,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(7, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line23D)
+{
+ /* MOVE.L d(Ax),<Ae> */
+ const int68_t a = (int68_t) read_EAL(5,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(7, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line23E)
+{
+ /* MOVE.L d(Ax,Xi),<Ae> */
+ const int68_t a = (int68_t) read_EAL(6,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(7, reg9, a >> LONG_FIX);
+}
+
+DECL_LINE68(line23F)
+{
+ /* MOVE.L <Ae>,<Ae> */
+ const int68_t a = (int68_t) read_EAL(7,reg0) << LONG_FIX;
+ MOVEL(a);
+ write_EAL(7, reg9, a >> LONG_FIX);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/line3.c Added

@@ -0,0 +1,505 @@
+/* line3.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: line3.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line 3: Move Word */
+
+DECL_LINE68(line300)
+{
+ /* MOVE.W Dx,Dy */
+ const int68_t a = (int68_t) REG68.dreg0 << WORD_FIX;
+ MOVEW(a);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( (uint68_t) a >> WORD_FIX );
+}
+
+DECL_LINE68(line301)
+{
+ /* MOVE.W Ax,Dy */
+ const int68_t a = (int68_t) REG68.areg0 << WORD_FIX;
+ MOVEW(a);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( (uint68_t) a >> WORD_FIX );
+}
+
+DECL_LINE68(line302)
+{
+ /* MOVE.W (Ax),Dy */
+ const int68_t a = (int68_t) read_EAW(2,reg0) << WORD_FIX;
+ MOVEW(a);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( (uint68_t) a >> WORD_FIX );
+}
+
+DECL_LINE68(line303)
+{
+ /* MOVE.W (Ax)+,Dy */
+ const int68_t a = (int68_t) read_EAW(3,reg0) << WORD_FIX;
+ MOVEW(a);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( (uint68_t) a >> WORD_FIX );
+}
+
+DECL_LINE68(line304)
+{
+ /* MOVE.W -(Ax),Dy */
+ const int68_t a = (int68_t) read_EAW(4,reg0) << WORD_FIX;
+ MOVEW(a);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( (uint68_t) a >> WORD_FIX );
+}
+
+DECL_LINE68(line305)
+{
+ /* MOVE.W d(Ax),Dy */
+ const int68_t a = (int68_t) read_EAW(5,reg0) << WORD_FIX;
+ MOVEW(a);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( (uint68_t) a >> WORD_FIX );
+}
+
+DECL_LINE68(line306)
+{
+ /* MOVE.W d(Ax,Xi),Dy */
+ const int68_t a = (int68_t) read_EAW(6,reg0) << WORD_FIX;
+ MOVEW(a);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( (uint68_t) a >> WORD_FIX );
+}
+
+DECL_LINE68(line307)
+{
+ /* MOVE.W <Ae>,Dy */
+ const int68_t a = (int68_t) read_EAW(7,reg0) << WORD_FIX;
+ MOVEW(a);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( (uint68_t) a >> WORD_FIX );
+}
+
+DECL_LINE68(line308)
+{
+ /* MOVEA.W Dx,An */
+ REG68.areg9 = (u32)(s16) REG68.dreg0;
+}
+
+DECL_LINE68(line309)
+{
+ /* MOVEA.W Ax,An */
+ REG68.areg9 = (u32)(s16) REG68.areg0;
+}
+
+DECL_LINE68(line30A)
+{
+ /* MOVEA.W (Ax),An */
+ REG68.areg9 = (u32)(s16) read_EAW(2,reg0);
+}
+
+DECL_LINE68(line30B)
+{
+ /* MOVEA.W (Ax)+,An */
+ REG68.areg9 = (u32)(s16) read_EAW(3,reg0);
+}
+
+DECL_LINE68(line30C)
+{
+ /* MOVEA.W -(Ax),An */
+ REG68.areg9 = (u32)(s16) read_EAW(4,reg0);
+}
+
+DECL_LINE68(line30D)
+{
+ /* MOVEA.W d(Ax),An */
+ REG68.areg9 = (u32)(s16) read_EAW(5,reg0);
+}
+
+DECL_LINE68(line30E)
+{
+ /* MOVEA.W d(Ax,Xi),An */
+ REG68.areg9 = (u32)(s16) read_EAW(6,reg0);
+}
+
+DECL_LINE68(line30F)
+{
+ /* MOVEA.W <Ae>,An */
+ REG68.areg9 = (u32)(s16) read_EAW(7,reg0);
+}
+
+DECL_LINE68(line310)
+{
+ /* MOVE.W Dx,(Ay) */
+ const int68_t a = (int68_t) REG68.dreg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(2, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line311)
+{
+ /* MOVE.W Ax,(Ay) */
+ const int68_t a = (int68_t) REG68.areg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(2, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line312)
+{
+ /* MOVE.W (Ax),(Ay) */
+ const int68_t a = (int68_t) read_EAW(2,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(2, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line313)
+{
+ /* MOVE.W (Ax)+,(Ay) */
+ const int68_t a = (int68_t) read_EAW(3,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(2, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line314)
+{
+ /* MOVE.W -(Ax),(Ay) */
+ const int68_t a = (int68_t) read_EAW(4,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(2, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line315)
+{
+ /* MOVE.W d(Ax),(Ay) */
+ const int68_t a = (int68_t) read_EAW(5,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(2, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line316)
+{
+ /* MOVE.W d(Ax,Xi),(Ay) */
+ const int68_t a = (int68_t) read_EAW(6,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(2, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line317)
+{
+ /* MOVE.W <Ae>,(Ay) */
+ const int68_t a = (int68_t) read_EAW(7,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(2, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line318)
+{
+ /* MOVE.W Dx,(Ay)+ */
+ const int68_t a = (int68_t) REG68.dreg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(3, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line319)
+{
+ /* MOVE.W Ax,(Ay)+ */
+ const int68_t a = (int68_t) REG68.areg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(3, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line31A)
+{
+ /* MOVE.W (Ax),(Ay)+ */
+ const int68_t a = (int68_t) read_EAW(2,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(3, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line31B)
+{
+ /* MOVE.W (Ax)+,(Ay)+ */
+ const int68_t a = (int68_t) read_EAW(3,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(3, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line31C)
+{
+ /* MOVE.W -(Ax),(Ay)+ */
+ const int68_t a = (int68_t) read_EAW(4,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(3, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line31D)
+{
+ /* MOVE.W d(Ax),(Ay)+ */
+ const int68_t a = (int68_t) read_EAW(5,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(3, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line31E)
+{
+ /* MOVE.W d(Ax,Xi),(Ay)+ */
+ const int68_t a = (int68_t) read_EAW(6,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(3, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line31F)
+{
+ /* MOVE.W <Ae>,(Ay)+ */
+ const int68_t a = (int68_t) read_EAW(7,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(3, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line320)
+{
+ /* MOVE.W Dx,-(Ay) */
+ const int68_t a = (int68_t) REG68.dreg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(4, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line321)
+{
+ /* MOVE.W Ax,-(Ay) */
+ const int68_t a = (int68_t) REG68.areg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(4, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line322)
+{
+ /* MOVE.W (Ax),-(Ay) */
+ const int68_t a = (int68_t) read_EAW(2,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(4, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line323)
+{
+ /* MOVE.W (Ax)+,-(Ay) */
+ const int68_t a = (int68_t) read_EAW(3,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(4, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line324)
+{
+ /* MOVE.W -(Ax),-(Ay) */
+ const int68_t a = (int68_t) read_EAW(4,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(4, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line325)
+{
+ /* MOVE.W d(Ax),-(Ay) */
+ const int68_t a = (int68_t) read_EAW(5,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(4, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line326)
+{
+ /* MOVE.W d(Ax,Xi),-(Ay) */
+ const int68_t a = (int68_t) read_EAW(6,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(4, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line327)
+{
+ /* MOVE.W <Ae>,-(Ay) */
+ const int68_t a = (int68_t) read_EAW(7,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(4, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line328)
+{
+ /* MOVE.W Dx,d(Ay) */
+ const int68_t a = (int68_t) REG68.dreg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(5, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line329)
+{
+ /* MOVE.W Ax,d(Ay) */
+ const int68_t a = (int68_t) REG68.areg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(5, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line32A)
+{
+ /* MOVE.W (Ax),d(Ay) */
+ const int68_t a = (int68_t) read_EAW(2,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(5, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line32B)
+{
+ /* MOVE.W (Ax)+,d(Ay) */
+ const int68_t a = (int68_t) read_EAW(3,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(5, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line32C)
+{
+ /* MOVE.W -(Ax),d(Ay) */
+ const int68_t a = (int68_t) read_EAW(4,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(5, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line32D)
+{
+ /* MOVE.W d(Ax),d(Ay) */
+ const int68_t a = (int68_t) read_EAW(5,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(5, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line32E)
+{
+ /* MOVE.W d(Ax,Xi),d(Ay) */
+ const int68_t a = (int68_t) read_EAW(6,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(5, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line32F)
+{
+ /* MOVE.W <Ae>,d(Ay) */
+ const int68_t a = (int68_t) read_EAW(7,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(5, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line330)
+{
+ /* MOVE.W Dx,d(Ay,Xi) */
+ const int68_t a = (int68_t) REG68.dreg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(6, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line331)
+{
+ /* MOVE.W Ax,d(Ay,Xi) */
+ const int68_t a = (int68_t) REG68.areg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(6, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line332)
+{
+ /* MOVE.W (Ax),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAW(2,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(6, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line333)
+{
+ /* MOVE.W (Ax)+,d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAW(3,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(6, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line334)
+{
+ /* MOVE.W -(Ax),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAW(4,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(6, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line335)
+{
+ /* MOVE.W d(Ax),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAW(5,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(6, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line336)
+{
+ /* MOVE.W d(Ax,Xi),d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAW(6,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(6, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line337)
+{
+ /* MOVE.W <Ae>,d(Ay,Xi) */
+ const int68_t a = (int68_t) read_EAW(7,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(6, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line338)
+{
+ /* MOVE.W Dx,<Ae> */
+ const int68_t a = (int68_t) REG68.dreg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(7, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line339)
+{
+ /* MOVE.W Ax,<Ae> */
+ const int68_t a = (int68_t) REG68.areg0 << WORD_FIX;
+ MOVEW(a);
+ write_EAW(7, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line33A)
+{
+ /* MOVE.W (Ax),<Ae> */
+ const int68_t a = (int68_t) read_EAW(2,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(7, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line33B)
+{
+ /* MOVE.W (Ax)+,<Ae> */
+ const int68_t a = (int68_t) read_EAW(3,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(7, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line33C)
+{
+ /* MOVE.W -(Ax),<Ae> */
+ const int68_t a = (int68_t) read_EAW(4,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(7, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line33D)
+{
+ /* MOVE.W d(Ax),<Ae> */
+ const int68_t a = (int68_t) read_EAW(5,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(7, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line33E)
+{
+ /* MOVE.W d(Ax,Xi),<Ae> */
+ const int68_t a = (int68_t) read_EAW(6,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(7, reg9, a >> WORD_FIX);
+}
+
+DECL_LINE68(line33F)
+{
+ /* MOVE.W <Ae>,<Ae> */
+ const int68_t a = (int68_t) read_EAW(7,reg0) << WORD_FIX;
+ MOVEW(a);
+ write_EAW(7, reg9, a >> WORD_FIX);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/line4.c Added

@@ -0,0 +1,1022 @@
+/* line4.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: line4.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line 4: Miscellaneous */
+
+static void funky4_m6_0(emu68_t * const emu68)
+{
+ RESET;
+}
+
+static void funky4_m6_1(emu68_t * const emu68)
+{
+ NOP;
+}
+
+static void funky4_m6_2(emu68_t * const emu68)
+{
+ STOP;
+}
+
+static void funky4_m6_3(emu68_t * const emu68)
+{
+ RTE;
+}
+
+static void funky4_m6_4(emu68_t * const emu68)
+{
+ ILLEGAL;
+}
+
+static void funky4_m6_5(emu68_t * const emu68)
+{
+ RTS;
+}
+
+static void funky4_m6_6(emu68_t * const emu68)
+{
+ TRAPV;
+}
+
+static void funky4_m6_7(emu68_t * const emu68)
+{
+ RTR;
+}
+
+
+static void (*const funky4_m6_func8)(emu68_t * const) = {
+ funky4_m6_0,funky4_m6_1,funky4_m6_2,funky4_m6_3,
+ funky4_m6_4,funky4_m6_5,funky4_m6_6,funky4_m6_7,
+};
+
+static void funky4_m0(emu68_t * const emu68, int reg0)
+{
+ const int a = ( 0 << 3 ) + reg0;
+ TRAP(a);
+}
+
+static void funky4_m1(emu68_t * const emu68, int reg0)
+{
+ const int a = ( 1 << 3 ) + reg0;
+ TRAP(a);
+}
+
+static void funky4_m2(emu68_t * const emu68, int reg0)
+{
+ LINK(reg0);
+}
+
+static void funky4_m3(emu68_t * const emu68, int reg0)
+{
+ UNLK(reg0);
+}
+
+static void funky4_m4(emu68_t * const emu68, int reg0)
+{
+ REG68.usp = REG68.areg0;
+}
+
+static void funky4_m5(emu68_t * const emu68, int reg0)
+{
+ REG68.areg0 = REG68.usp;
+}
+
+static void funky4_m6(emu68_t * const emu68, int reg0)
+{
+ funky4_m6_funcreg0(emu68);
+}
+
+static void funky4_m7(emu68_t * const emu68, int reg0)
+{
+ ILLEGAL;
+}
+
+static void (* const funky4_func8)(emu68_t * const, int) = {
+ funky4_m0,funky4_m1,funky4_m2,funky4_m3,
+ funky4_m4,funky4_m5,funky4_m6,funky4_m7,
+};
+
+static void movemregw(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t m = (u16) get_nextw(), addr;
+ s32 * r = REG68.d;
+ addr = get_eaw68mode(emu68,reg0);
+ for(; m; r++, m>>=1)
+ if ( m & 1 ){ *r = read_W(addr); addr += 2; }
+ if ( mode == 3 ) REG68.areg0 = addr;
+}
+
+static void movemregl(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t m = (u16) get_nextw(), addr;
+ s32 * r = REG68.d;
+ addr = get_eal68mode(emu68,reg0);
+ for(; m; r++, m>>=1)
+ if ( m & 1 ){ *r = read_L(addr); addr += 4; }
+ if ( mode == 3 ) REG68.areg0 = addr;
+}
+
+static void movemmemw(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t m = (u16)get_nextw(), addr;
+ if (mode==4) {
+ s32 * r = REG68.a+7;
+ addr = get_eaw683(emu68,reg0);
+ for(; m; r--, m>>=1)
+ if (m&1) write_W(addr-=2,*r);
+ REG68.areg0 = addr;
+ } else {
+ s32 * r = REG68.d;
+ addr = get_eaw68mode(emu68,reg0);
+ for(; m; r++, m>>=1)
+ if (m&1) { write_W(addr,*r); addr+=2; }
+ }
+}
+
+static void movemmeml(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t m = (u16)get_nextw(), addr;
+ if (mode==4) {
+ s32 * r = REG68.a+7;
+ addr = get_eal683(emu68,reg0);
+ for(; m; r--, m>>=1)
+ if (m&1) write_L(addr-=4,*r);
+ REG68.areg0 = addr;
+ } else {
+ s32 * r = REG68.d;
+ addr = get_eal68mode(emu68,reg0);
+ for(; m; r++, m>>=1)
+ if (m&1) { write_L(addr,*r); addr+=4; }
+ }
+}
+
+static void line4_r0_s0(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* NEGX.B Dn */
+ b = (uint68_t) REG68.dreg0 << BYTE_FIX;
+ NEGXB(b,b);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( b >> BYTE_FIX );
+ } else {
+ /* NEGX.B <Ae> */
+ const addr68_t addr = get_eab68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_B(addr) << BYTE_FIX;
+ NEGXB(b,b);
+ write_B(addr, b >> BYTE_FIX);
+ }
+}
+
+static void line4_r0_s1(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* NEGX.W Dn */
+ b = (uint68_t) REG68.dreg0 << WORD_FIX;
+ NEGXW(b,b);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( b >> WORD_FIX );
+ } else {
+ /* NEGX.W <Ae> */
+ const addr68_t addr = get_eaw68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_W(addr) << WORD_FIX;
+ NEGXW(b,b);
+ write_W(addr, b >> WORD_FIX);
+ }
+}
+
+static void line4_r0_s2(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* NEGX.L Dn */
+ b = (uint68_t) REG68.dreg0 << LONG_FIX;
+ NEGXL(b,b);
+ REG68.dreg0 = ( b >> LONG_FIX );
+ } else {
+ /* NEGX.L <Ae> */
+ const addr68_t addr = get_eal68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_L(addr) << LONG_FIX;
+ NEGXL(b,b);
+ write_L(addr, b >> LONG_FIX);
+ }
+}
+
+static void line4_r0_s3(emu68_t * const emu68, int mode, int reg0)
+{
+ /* MOVE FROM SR */
+ if (mode)
+ write_W(get_eaw68mode(emu68,reg0),REG68.sr);
+ else
+ REG68.dreg0 = (REG68.dreg0&0xFFFF0000) + (u16)REG68.sr;
+}
+
+static void line4_r1_s0(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* CLR.B Dn */
+ CLRB(b,b);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( b >> BYTE_FIX );
+ } else {
+ /* CLR.B <Ae> */
+ const addr68_t addr = get_eab68mode(emu68,reg0);
+ assert(mode != 1);
+ CLRB(b,b);
+ write_B(addr, b >> BYTE_FIX);
+ }
+}
+
+static void line4_r1_s1(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* CLR.W Dn */
+ CLRW(b,b);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( b >> WORD_FIX );
+ } else {
+ /* CLR.W <Ae> */
+ const addr68_t addr = get_eaw68mode(emu68,reg0);
+ assert(mode != 1);
+ CLRW(b,b);
+ write_W(addr, b >> WORD_FIX);
+ }
+}
+
+static void line4_r1_s2(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* CLR.L Dn */
+ CLRL(b,b);
+ REG68.dreg0 = ( b >> LONG_FIX );
+ } else {
+ /* CLR.L <Ae> */
+ const addr68_t addr = get_eal68mode(emu68,reg0);
+ assert(mode != 1);
+ CLRL(b,b);
+ write_L(addr, b >> LONG_FIX);
+ }
+}
+
+static void line4_r1_s3(emu68_t * const emu68, int mode, int reg0)
+{
+ ILLEGAL;
+}
+
+static void line4_r2_s0(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* NEG.B Dn */
+ b = (uint68_t) REG68.dreg0 << BYTE_FIX;
+ NEGB(b,b);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( b >> BYTE_FIX );
+ } else {
+ /* NEG.B <Ae> */
+ const addr68_t addr = get_eab68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_B(addr) << BYTE_FIX;
+ NEGB(b,b);
+ write_B(addr, b >> BYTE_FIX);
+ }
+}
+
+static void line4_r2_s1(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* NEG.W Dn */
+ b = (uint68_t) REG68.dreg0 << WORD_FIX;
+ NEGW(b,b);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( b >> WORD_FIX );
+ } else {
+ /* NEG.W <Ae> */
+ const addr68_t addr = get_eaw68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_W(addr) << WORD_FIX;
+ NEGW(b,b);
+ write_W(addr, b >> WORD_FIX);
+ }
+}
+
+static void line4_r2_s2(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* NEG.L Dn */
+ b = (uint68_t) REG68.dreg0 << LONG_FIX;
+ NEGL(b,b);
+ REG68.dreg0 = ( b >> LONG_FIX );
+ } else {
+ /* NEG.L <Ae> */
+ const addr68_t addr = get_eal68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_L(addr) << LONG_FIX;
+ NEGL(b,b);
+ write_L(addr, b >> LONG_FIX);
+ }
+}
+
+static void line4_r2_s3(emu68_t * const emu68, int mode, int reg0)
+{
+ /* MOVE TO CCR */
+ if (mode)
+ SET_CCR(REG68.sr,read_W(get_eaw68mode(emu68,reg0)));
+ else
+ SET_CCR(REG68.sr,REG68.dreg0);
+}
+
+static void line4_r3_s0(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* NOT.B Dn */
+ b = (uint68_t) REG68.dreg0 << BYTE_FIX;
+ NOTB(b,b);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( b >> BYTE_FIX );
+ } else {
+ /* NOT.B <Ae> */
+ const addr68_t addr = get_eab68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_B(addr) << BYTE_FIX;
+ NOTB(b,b);
+ write_B(addr, b >> BYTE_FIX);
+ }
+}
+
+static void line4_r3_s1(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* NOT.W Dn */
+ b = (uint68_t) REG68.dreg0 << WORD_FIX;
+ NOTW(b,b);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( b >> WORD_FIX );
+ } else {
+ /* NOT.W <Ae> */
+ const addr68_t addr = get_eaw68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_W(addr) << WORD_FIX;
+ NOTW(b,b);
+ write_W(addr, b >> WORD_FIX);
+ }
+}
+
+static void line4_r3_s2(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* NOT.L Dn */
+ b = (uint68_t) REG68.dreg0 << LONG_FIX;
+ NOTL(b,b);
+ REG68.dreg0 = ( b >> LONG_FIX );
+ } else {
+ /* NOT.L <Ae> */
+ const addr68_t addr = get_eal68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_L(addr) << LONG_FIX;
+ NOTL(b,b);
+ write_L(addr, b >> LONG_FIX);
+ }
+}
+
+static void line4_r3_s3(emu68_t * const emu68, int mode, int reg0)
+{
+ /* MOVE TO SR */
+ if (mode)
+ REG68.sr = read_W(get_eaw68mode(emu68,reg0));
+ else
+ REG68.sr = (u16)REG68.dreg0;
+}
+
+static void line4_r4_s0(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* NBCD.B Dn */
+ b = (uint68_t) REG68.dreg0 << BYTE_FIX;
+ NBCDB(b,b);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( b >> BYTE_FIX );
+ } else {
+ /* NBCD.B <Ae> */
+ const addr68_t addr = get_eab68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_B(addr) << BYTE_FIX;
+ NBCDB(b,b);
+ write_B(addr, b >> BYTE_FIX);
+ }
+}
+
+static void line4_r4_s1(emu68_t * const emu68, int mode, int reg0)
+{
+ if (!mode) {
+ /* SWAP */
+ SWAP(reg0);
+ } else {
+ /* PEA */
+ pushl(get_eal68mode(emu68,reg0));
+ }
+}
+
+static void line4_r4_s2(emu68_t * const emu68, int mode, int reg0)
+{
+ if (!mode) {
+ /* EXT.W Dn */
+ const int68_t d = (int68_t) (s8) REG68.dreg0 << WORD_FIX;
+ EXTW(d);
+ REG68.dreg0 &= 0xFFFF0000;
+ REG68.dreg0 |= (uint68_t) d >> WORD_FIX;
+ } else {
+ /* MOVEM.W REGS,<AE> */
+ movemmemw(emu68, mode, reg0);
+ }
+}
+
+static void line4_r4_s3(emu68_t * const emu68, int mode, int reg0)
+{
+ if (!mode) {
+ /* EXT.L Dn */
+ const int68_t d = (int68_t) (s16) REG68.dreg0 << LONG_FIX;
+ EXTL(d);
+ REG68.dreg0 = d>>LONG_FIX;
+ } else {
+ /* MOVEM.L REGS,<AE> */
+ movemmeml(emu68, mode, reg0);
+ }
+}
+
+static void line4_r5_s0(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* TST.B Dn */
+ b = (uint68_t) REG68.dreg0 << BYTE_FIX;
+ TSTB(b,b);
+ } else {
+ /* TST.B <Ae> */
+ const addr68_t addr = get_eab68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_B(addr) << BYTE_FIX;
+ TSTB(b,b);
+ }
+}
+
+static void line4_r5_s1(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* TST.W Dn */
+ b = (uint68_t) REG68.dreg0 << WORD_FIX;
+ TSTW(b,b);
+ } else {
+ /* TST.W <Ae> */
+ const addr68_t addr = get_eaw68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_W(addr) << WORD_FIX;
+ TSTW(b,b);
+ }
+}
+
+static void line4_r5_s2(emu68_t * const emu68, int mode, int reg0)
+{
+ uint68_t b;
+
+ if ( !mode ) {
+ /* TST.L Dn */
+ b = (uint68_t) REG68.dreg0 << LONG_FIX;
+ TSTL(b,b);
+ } else {
+ /* TST.L <Ae> */
+ const addr68_t addr = get_eal68mode(emu68,reg0);
+ assert(mode != 1);
+ b = read_L(addr) << LONG_FIX;
+ TSTL(b,b);
+ }
+}
+
+static void line4_r5_s3(emu68_t * const emu68, int mode, int reg0)
+{
+ if (mode<2) {
+ /* TAS.B Dn */
+ int68_t a = (int68_t) REG68.dreg0;
+ TASB(a,a);
+ REG68.dreg0 = a;
+ } else {
+ if ( mode == 7 && reg0 > 1 ) {
+ ILLEGAL;
+ } else {
+ /* TAS.B <Ae> */
+ const addr68_t l = get_eab68mode(emu68,reg0);
+ int68_t a = read_B(l);
+ TASB(a,a);
+ write_B(l,a);
+ }
+ }
+}
+
+static void line4_r6_s0(emu68_t * const emu68, int mode, int reg0)
+{
+ ILLEGAL;
+}
+
+static void line4_r6_s1(emu68_t * const emu68, int mode, int reg0)
+{
+ ILLEGAL;
+}
+
+static void line4_r6_s2(emu68_t * const emu68, int mode, int reg0)
+{
+ /* MOVEM.W <AE>,REGS */
+ movemregw(emu68,mode,reg0);
+}
+
+static void line4_r6_s3(emu68_t * const emu68, int mode, int reg0)
+{
+ /* MOVEM.L <AE>,REGS */
+ movemregl(emu68,mode,reg0);
+}
+
+static void line4_r7_s0(emu68_t * const emu68, int mode, int reg0)
+{
+ ILLEGAL;
+}
+
+static void line4_r7_s1(emu68_t * const emu68, int mode, int reg0)
+{
+ funky4_funcmode(emu68,reg0);
+}
+
+static void line4_r7_s2(emu68_t * const emu68, int mode, int reg0)
+{
+ /* JSR <Ae> */
+ const addr68_t pc = get_eal68mode(emu68,reg0);
+ JSR(pc);
+}
+
+static void line4_r7_s3(emu68_t * const emu68, int mode, int reg0)
+{
+ /* JMP <Ae> */
+ const addr68_t pc = get_eal68mode(emu68,reg0);
+ JMP(pc);
+}
+
+DECL_STATIC_LINE68((* const line4_0_func8)) = {
+ line4_r0_s0,line4_r1_s0,line4_r2_s0,line4_r3_s0,
+ line4_r4_s0,line4_r5_s0,line4_r6_s0,line4_r7_s0,
+};
+
+DECL_STATIC_LINE68((* const line4_1_func8)) = {
+ line4_r0_s1,line4_r1_s1,line4_r2_s1,line4_r3_s1,
+ line4_r4_s1,line4_r5_s1,line4_r6_s1,line4_r7_s1,
+};
+
+DECL_STATIC_LINE68((* const line4_2_func8)) = {
+ line4_r0_s2,line4_r1_s2,line4_r2_s2,line4_r3_s2,
+ line4_r4_s2,line4_r5_s2,line4_r6_s2,line4_r7_s2,
+};
+
+DECL_STATIC_LINE68((* const line4_3_func8)) = {
+ line4_r0_s3,line4_r1_s3,line4_r2_s3,line4_r3_s3,
+ line4_r4_s3,line4_r5_s3,line4_r6_s3,line4_r7_s3,
+};
+
+DECL_LINE68(line400)
+{
+ line4_0_funcreg9(emu68,0,reg0);
+}
+
+DECL_LINE68(line401)
+{
+ line4_0_funcreg9(emu68,1,reg0);
+}
+
+DECL_LINE68(line402)
+{
+ line4_0_funcreg9(emu68,2,reg0);
+}
+
+DECL_LINE68(line403)
+{
+ line4_0_funcreg9(emu68,3,reg0);
+}
+
+DECL_LINE68(line404)
+{
+ line4_0_funcreg9(emu68,4,reg0);
+}
+
+DECL_LINE68(line405)
+{
+ line4_0_funcreg9(emu68,5,reg0);
+}
+
+DECL_LINE68(line406)
+{
+ line4_0_funcreg9(emu68,6,reg0);
+}
+
+DECL_LINE68(line407)
+{
+ line4_0_funcreg9(emu68,7,reg0);
+}
+
+DECL_LINE68(line408)
+{
+ line4_1_funcreg9(emu68,0,reg0);
+}
+
+DECL_LINE68(line409)
+{
+ line4_1_funcreg9(emu68,1,reg0);
+}
+
+DECL_LINE68(line40A)
+{
+ line4_1_funcreg9(emu68,2,reg0);
+}
+
+DECL_LINE68(line40B)
+{
+ line4_1_funcreg9(emu68,3,reg0);
+}
+
+DECL_LINE68(line40C)
+{
+ line4_1_funcreg9(emu68,4,reg0);
+}
+
+DECL_LINE68(line40D)
+{
+ line4_1_funcreg9(emu68,5,reg0);
+}
+
+DECL_LINE68(line40E)
+{
+ line4_1_funcreg9(emu68,6,reg0);
+}
+
+DECL_LINE68(line40F)
+{
+ line4_1_funcreg9(emu68,7,reg0);
+}
+
+DECL_LINE68(line410)
+{
+ line4_2_funcreg9(emu68,0,reg0);
+}
+
+DECL_LINE68(line411)
+{
+ line4_2_funcreg9(emu68,1,reg0);
+}
+
+DECL_LINE68(line412)
+{
+ line4_2_funcreg9(emu68,2,reg0);
+}
+
+DECL_LINE68(line413)
+{
+ line4_2_funcreg9(emu68,3,reg0);
+}
+
+DECL_LINE68(line414)
+{
+ line4_2_funcreg9(emu68,4,reg0);
+}
+
+DECL_LINE68(line415)
+{
+ line4_2_funcreg9(emu68,5,reg0);
+}
+
+DECL_LINE68(line416)
+{
+ line4_2_funcreg9(emu68,6,reg0);
+}
+
+DECL_LINE68(line417)
+{
+ line4_2_funcreg9(emu68,7,reg0);
+}
+
+DECL_LINE68(line418)
+{
+ line4_3_funcreg9(emu68,0,reg0);
+}
+
+DECL_LINE68(line419)
+{
+ line4_3_funcreg9(emu68,1,reg0);
+}
+
+DECL_LINE68(line41A)
+{
+ line4_3_funcreg9(emu68,2,reg0);
+}
+
+DECL_LINE68(line41B)
+{
+ line4_3_funcreg9(emu68,3,reg0);
+}
+
+DECL_LINE68(line41C)
+{
+ line4_3_funcreg9(emu68,4,reg0);
+}
+
+DECL_LINE68(line41D)
+{
+ line4_3_funcreg9(emu68,5,reg0);
+}
+
+DECL_LINE68(line41E)
+{
+ line4_3_funcreg9(emu68,6,reg0);
+}
+
+DECL_LINE68(line41F)
+{
+ line4_3_funcreg9(emu68,7,reg0);
+}
+
+DECL_LINE68(line420)
+{
+#ifndef EMU68_68020
+ ILLEGAL; /* CHK.L op:040 */
+#else
+ /* CHK.L Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CHKL(s,d);
+#endif
+}
+
+DECL_LINE68(line421)
+{
+#ifndef EMU68_68020
+ ILLEGAL; /* CHK.L op:041 */
+#else
+ /* CHK.L An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+#endif
+}
+
+DECL_LINE68(line422)
+{
+#ifndef EMU68_68020
+ ILLEGAL; /* CHK.L op:042 */
+#else
+ /* CHK.L (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(2,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CHKL(s,d);
+#endif
+}
+
+DECL_LINE68(line423)
+{
+#ifndef EMU68_68020
+ ILLEGAL; /* CHK.L op:043 */
+#else
+ /* CHK.L (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(3,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CHKL(s,d);
+#endif
+}
+
+DECL_LINE68(line424)
+{
+#ifndef EMU68_68020
+ ILLEGAL; /* CHK.L op:044 */
+#else
+ /* CHK.L -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(4,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CHKL(s,d);
+#endif
+}
+
+DECL_LINE68(line425)
+{
+#ifndef EMU68_68020
+ ILLEGAL; /* CHK.L op:045 */
+#else
+ /* CHK.L d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(5,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CHKL(s,d);
+#endif
+}
+
+DECL_LINE68(line426)
+{
+#ifndef EMU68_68020
+ ILLEGAL; /* CHK.L op:046 */
+#else
+ /* CHK.L d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(6,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CHKL(s,d);
+#endif
+}
+
+DECL_LINE68(line427)
+{
+#ifndef EMU68_68020
+ ILLEGAL; /* CHK.L op:047 */
+#else
+ /* CHK.L <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(7,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CHKL(s,d);
+#endif
+}
+
+DECL_LINE68(line428)
+{
+ ILLEGAL; /* line:4 op:050 */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line429)
+{
+ ILLEGAL; /* line:4 op:050 */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line42A)
+{
+ ILLEGAL; /* line:4 op:050 */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line42B)
+{
+ ILLEGAL; /* line:4 op:050 */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line42C)
+{
+ ILLEGAL; /* line:4 op:050 */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line42D)
+{
+ ILLEGAL; /* line:4 op:050 */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line42E)
+{
+ ILLEGAL; /* line:4 op:050 */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line42F)
+{
+ ILLEGAL; /* line:4 op:050 */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line430)
+{
+ /* CHK.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CHKW(s,d);
+}
+
+DECL_LINE68(line431)
+{
+ /* CHK.W An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line432)
+{
+ /* CHK.W (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CHKW(s,d);
+}
+
+DECL_LINE68(line433)
+{
+ /* CHK.W (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CHKW(s,d);
+}
+
+DECL_LINE68(line434)
+{
+ /* CHK.W -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CHKW(s,d);
+}
+
+DECL_LINE68(line435)
+{
+ /* CHK.W d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CHKW(s,d);
+}
+
+DECL_LINE68(line436)
+{
+ /* CHK.W d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CHKW(s,d);
+}
+
+DECL_LINE68(line437)
+{
+ /* CHK.W <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CHKW(s,d);
+}
+
+DECL_LINE68(line438)
+{
+ /* LEA Dn,An */
+ ILLEGAL; /* LEA Dn,An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line439)
+{
+ /* LEA An,An */
+ ILLEGAL; /* LEA An,An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line43A)
+{
+ /* LEA (An),An */
+ REG68.areg9 = (u32) REG68.areg0;
+}
+
+DECL_LINE68(line43B)
+{
+ /* LEA (An)+,An */
+ ILLEGAL; /* LEA (An)+,An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line43C)
+{
+ /* LEA -(An),An */
+ ILLEGAL; /* LEA -(An),An */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line43D)
+{
+ /* LEA d(An),An */
+ REG68.areg9 = (u32) ( REG68.areg0 + get_nextw() );
+}
+
+DECL_LINE68(line43E)
+{
+ /* LEA d(An,Xi),An */
+ REG68.areg9 = (u32) get_eal686(emu68,reg0);
+}
+
+DECL_LINE68(line43F)
+{
+ /* LEA <Ae>,An */
+ REG68.areg9 = (u32) get_eal687(emu68,reg0);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/line5.c Added

@@ -0,0 +1,583 @@
+/* line5.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: line5.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line 5: ADDQ/SUBQ/Scc/DBcc/TRAPcc */
+
+DECL_LINE68(line500)
+{
+ /* ADDQ.B #Q,Dn */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << BYTE_FIX;
+ ADDB(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line501)
+{
+ /* ADDQ.B #Q,An */
+ ILLEGAL; /* .B not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line502)
+{
+ /* ADDQ.B #Q,(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line503)
+{
+ /* ADDQ.B #Q,(An)+ */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line504)
+{
+ /* ADDQ.B #Q,-(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line505)
+{
+ /* ADDQ.B #Q,d(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line506)
+{
+ /* ADDQ.B #Q,d(An,Xi) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line507)
+{
+ /* ADDQ.B #Q,<Ae> */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line508)
+{
+ /* ADDQ.W #Q,Dn */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << WORD_FIX;
+ ADDW(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line509)
+{
+ /* ADDQ.W #Q,An */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg0 << LONG_FIX;
+ ADDAW(d,s,d);
+ REG68.areg0 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line50A)
+{
+ /* ADDQ.W #Q,(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line50B)
+{
+ /* ADDQ.W #Q,(An)+ */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line50C)
+{
+ /* ADDQ.W #Q,-(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line50D)
+{
+ /* ADDQ.W #Q,d(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line50E)
+{
+ /* ADDQ.W #Q,d(An,Xi) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line50F)
+{
+ /* ADDQ.W #Q,<Ae> */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line510)
+{
+ /* ADDQ.L #Q,Dn */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ ADDL(d,s,d);
+ REG68.dreg0 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line511)
+{
+ /* ADDQ.L #Q,An */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg0 << LONG_FIX;
+ ADDAL(d,s,d);
+ REG68.areg0 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line512)
+{
+ /* ADDQ.L #Q,(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line513)
+{
+ /* ADDQ.L #Q,(An)+ */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line514)
+{
+ /* ADDQ.L #Q,-(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line515)
+{
+ /* ADDQ.L #Q,d(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line516)
+{
+ /* ADDQ.L #Q,d(An,Xi) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line517)
+{
+ /* ADDQ.L #Q,<Ae> */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line518)
+{
+ /* Scc Dn */
+ const int r = SCC((reg9<<1)+0);
+ REG68.dreg0 = (REG68.dreg0&0xFFFFFF00)+r;
+}
+
+DECL_LINE68(line519)
+{
+ /* DBcc Dn,<addr> */
+ DBCC(reg0,(reg9<<1)+0);
+}
+
+DECL_LINE68(line51A)
+{
+ /* Scc (An) */
+ const int r = SCC((reg9<<1)+0);
+ write_EAB(2,reg0,r);
+}
+
+DECL_LINE68(line51B)
+{
+ /* Scc (An)+ */
+ const int r = SCC((reg9<<1)+0);
+ write_EAB(3,reg0,r);
+}
+
+DECL_LINE68(line51C)
+{
+ /* Scc -(An) */
+ const int r = SCC((reg9<<1)+0);
+ write_EAB(4,reg0,r);
+}
+
+DECL_LINE68(line51D)
+{
+ /* Scc d(An) */
+ const int r = SCC((reg9<<1)+0);
+ write_EAB(5,reg0,r);
+}
+
+DECL_LINE68(line51E)
+{
+ /* Scc d(An,Xi) */
+ const int r = SCC((reg9<<1)+0);
+ write_EAB(6,reg0,r);
+}
+
+DECL_LINE68(line51F)
+{
+ /* Scc <Ae> */
+ const int r = SCC((reg9<<1)+0);
+ write_EAB(7,reg0,r);
+}
+
+DECL_LINE68(line520)
+{
+ /* SUBQ.B #Q,Dn */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << BYTE_FIX;
+ SUBB(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line521)
+{
+ /* SUBQ.B #Q,An */
+ ILLEGAL; /* .B not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line522)
+{
+ /* SUBQ.B #Q,(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line523)
+{
+ /* SUBQ.B #Q,(An)+ */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line524)
+{
+ /* SUBQ.B #Q,-(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line525)
+{
+ /* SUBQ.B #Q,d(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line526)
+{
+ /* SUBQ.B #Q,d(An,Xi) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line527)
+{
+ /* SUBQ.B #Q,<Ae> */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line528)
+{
+ /* SUBQ.W #Q,Dn */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << WORD_FIX;
+ SUBW(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line529)
+{
+ /* SUBQ.W #Q,An */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg0 << LONG_FIX;
+ SUBAW(d,s,d);
+ REG68.areg0 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line52A)
+{
+ /* SUBQ.W #Q,(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line52B)
+{
+ /* SUBQ.W #Q,(An)+ */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line52C)
+{
+ /* SUBQ.W #Q,-(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line52D)
+{
+ /* SUBQ.W #Q,d(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line52E)
+{
+ /* SUBQ.W #Q,d(An,Xi) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line52F)
+{
+ /* SUBQ.W #Q,<Ae> */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line530)
+{
+ /* SUBQ.L #Q,Dn */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ SUBL(d,s,d);
+ REG68.dreg0 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line531)
+{
+ /* SUBQ.L #Q,An */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg0 << LONG_FIX;
+ SUBAL(d,s,d);
+ REG68.areg0 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line532)
+{
+ /* SUBQ.L #Q,(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line533)
+{
+ /* SUBQ.L #Q,(An)+ */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line534)
+{
+ /* SUBQ.L #Q,-(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line535)
+{
+ /* SUBQ.L #Q,d(An) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line536)
+{
+ /* SUBQ.L #Q,d(An,Xi) */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line537)
+{
+ /* SUBQ.L #Q,<Ae> */
+ const uint68_t s = ( (int68_t) ( ( ( reg9 - 1 ) & 7 ) + 1 ) << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line538)
+{
+ /* Scc Dn */
+ const int r = SCC((reg9<<1)+1);
+ REG68.dreg0 = (REG68.dreg0&0xFFFFFF00)+r;
+}
+
+DECL_LINE68(line539)
+{
+ /* DBcc Dn,<addr> */
+ DBCC(reg0,(reg9<<1)+1);
+}
+
+DECL_LINE68(line53A)
+{
+ /* Scc (An) */
+ const int r = SCC((reg9<<1)+1);
+ write_EAB(2,reg0,r);
+}
+
+DECL_LINE68(line53B)
+{
+ /* Scc (An)+ */
+ const int r = SCC((reg9<<1)+1);
+ write_EAB(3,reg0,r);
+}
+
+DECL_LINE68(line53C)
+{
+ /* Scc -(An) */
+ const int r = SCC((reg9<<1)+1);
+ write_EAB(4,reg0,r);
+}
+
+DECL_LINE68(line53D)
+{
+ /* Scc d(An) */
+ const int r = SCC((reg9<<1)+1);
+ write_EAB(5,reg0,r);
+}
+
+DECL_LINE68(line53E)
+{
+ /* Scc d(An,Xi) */
+ const int r = SCC((reg9<<1)+1);
+ write_EAB(6,reg0,r);
+}
+
+DECL_LINE68(line53F)
+{
+ /* Scc <Ae> */
+ const int r = SCC((reg9<<1)+1);
+ write_EAB(7,reg0,r);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/line6.c Added

@@ -0,0 +1,527 @@
+/* line6.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: line6.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line 6: Bcc/BSR/BRA */
+
+DECL_LINE68(line600)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ if (!reg0)
+ pc += get_nextw(); /* .W */
+ else
+ pc += reg0; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line601)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +8; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line602)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +16; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line603)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +24; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line604)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +32; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line605)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +40; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line606)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +48; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line607)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +56; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line608)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +64; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line609)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +72; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line60A)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +80; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line60B)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +88; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line60C)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +96; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line60D)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0+104; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line60E)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0+112; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line60F)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0+120; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line610)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0-128; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line611)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0-120; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line612)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0-112; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line613)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0-104; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line614)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -96; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line615)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -88; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line616)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -80; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line617)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -72; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line618)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -64; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line619)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -56; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line61A)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -48; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line61B)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -40; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line61C)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -32; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line61D)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -24; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line61E)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -16; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line61F)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -8; /* .B */
+ BCC(pc,(reg9<<1)+0);
+}
+
+DECL_LINE68(line620)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ if (!reg0)
+ pc += get_nextw(); /* .W */
+ else
+ pc += reg0; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line621)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +8; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line622)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +16; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line623)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +24; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line624)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +32; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line625)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +40; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line626)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +48; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line627)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +56; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line628)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +64; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line629)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +72; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line62A)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +80; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line62B)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +88; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line62C)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 +96; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line62D)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0+104; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line62E)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0+112; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line62F)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0+120; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line630)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0-128; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line631)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0-120; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line632)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0-112; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line633)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0-104; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line634)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -96; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line635)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -88; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line636)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -80; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line637)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -72; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line638)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -64; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line639)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -56; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line63A)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -48; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line63B)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -40; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line63C)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -32; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line63D)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -24; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line63E)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -16; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+
+DECL_LINE68(line63F)
+{
+ /* Bcc or BSR */
+ uint68_t pc = REG68.pc;
+ pc += reg0 -8; /* .B */
+ BCC(pc,(reg9<<1)+1);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/line7.c Added

@@ -0,0 +1,457 @@
+/* line7.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: line7.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line 7: MOVEQ */
+
+DECL_LINE68(line700)
+{
+  /* MOVEQ #N,Dn 0..7 */
+  int68_t a = reg0   +0;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line701)
+{
+  /* MOVEQ #N,Dn 8..15 */
+  int68_t a = reg0   +8;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line702)
+{
+  /* MOVEQ #N,Dn 16..23 */
+  int68_t a = reg0  +16;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line703)
+{
+  /* MOVEQ #N,Dn 24..31 */
+  int68_t a = reg0  +24;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line704)
+{
+  /* MOVEQ #N,Dn 32..39 */
+  int68_t a = reg0  +32;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line705)
+{
+  /* MOVEQ #N,Dn 40..47 */
+  int68_t a = reg0  +40;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line706)
+{
+  /* MOVEQ #N,Dn 48..55 */
+  int68_t a = reg0  +48;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line707)
+{
+  /* MOVEQ #N,Dn 56..63 */
+  int68_t a = reg0  +56;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line708)
+{
+  /* MOVEQ #N,Dn 64..71 */
+  int68_t a = reg0  +64;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line709)
+{
+  /* MOVEQ #N,Dn 72..79 */
+  int68_t a = reg0  +72;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line70A)
+{
+  /* MOVEQ #N,Dn 80..87 */
+  int68_t a = reg0  +80;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line70B)
+{
+  /* MOVEQ #N,Dn 88..95 */
+  int68_t a = reg0  +88;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line70C)
+{
+  /* MOVEQ #N,Dn 96..103 */
+  int68_t a = reg0  +96;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line70D)
+{
+  /* MOVEQ #N,Dn 104..111 */
+  int68_t a = reg0 +104;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line70E)
+{
+  /* MOVEQ #N,Dn 112..119 */
+  int68_t a = reg0 +112;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line70F)
+{
+  /* MOVEQ #N,Dn 120..127 */
+  int68_t a = reg0 +120;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line710)
+{
+  /* MOVEQ #N,Dn -128..-121 */
+  int68_t a = reg0 -128;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line711)
+{
+  /* MOVEQ #N,Dn -120..-113 */
+  int68_t a = reg0 -120;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line712)
+{
+  /* MOVEQ #N,Dn -112..-105 */
+  int68_t a = reg0 -112;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line713)
+{
+  /* MOVEQ #N,Dn -104..-97 */
+  int68_t a = reg0 -104;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line714)
+{
+  /* MOVEQ #N,Dn -96..-89 */
+  int68_t a = reg0  -96;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line715)
+{
+  /* MOVEQ #N,Dn -88..-81 */
+  int68_t a = reg0  -88;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line716)
+{
+  /* MOVEQ #N,Dn -80..-73 */
+  int68_t a = reg0  -80;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line717)
+{
+  /* MOVEQ #N,Dn -72..-65 */
+  int68_t a = reg0  -72;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line718)
+{
+  /* MOVEQ #N,Dn -64..-57 */
+  int68_t a = reg0  -64;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line719)
+{
+  /* MOVEQ #N,Dn -56..-49 */
+  int68_t a = reg0  -56;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line71A)
+{
+  /* MOVEQ #N,Dn -48..-41 */
+  int68_t a = reg0  -48;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line71B)
+{
+  /* MOVEQ #N,Dn -40..-33 */
+  int68_t a = reg0  -40;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line71C)
+{
+  /* MOVEQ #N,Dn -32..-25 */
+  int68_t a = reg0  -32;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line71D)
+{
+  /* MOVEQ #N,Dn -24..-17 */
+  int68_t a = reg0  -24;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line71E)
+{
+  /* MOVEQ #N,Dn -16..-9 */
+  int68_t a = reg0  -16;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line71F)
+{
+  /* MOVEQ #N,Dn -8..-1 */
+  int68_t a = reg0   -8;
+  REG68.dreg9 = (u32)a;
+  MOVEL(a);
+}
+
+DECL_LINE68(line720)
+{
+  ILLEGAL; /* op:040 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line721)
+{
+  ILLEGAL; /* op:041 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line722)
+{
+  ILLEGAL; /* op:042 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line723)
+{
+  ILLEGAL; /* op:043 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line724)
+{
+  ILLEGAL; /* op:044 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line725)
+{
+  ILLEGAL; /* op:045 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line726)
+{
+  ILLEGAL; /* op:046 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line727)
+{
+  ILLEGAL; /* op:047 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line728)
+{
+  ILLEGAL; /* op:050 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line729)
+{
+  ILLEGAL; /* op:051 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line72A)
+{
+  ILLEGAL; /* op:052 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line72B)
+{
+  ILLEGAL; /* op:053 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line72C)
+{
+  ILLEGAL; /* op:054 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line72D)
+{
+  ILLEGAL; /* op:055 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line72E)
+{
+  ILLEGAL; /* op:056 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line72F)
+{
+  ILLEGAL; /* op:057 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line730)
+{
+  ILLEGAL; /* op:060 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line731)
+{
+  ILLEGAL; /* op:061 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line732)
+{
+  ILLEGAL; /* op:062 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line733)
+{
+  ILLEGAL; /* op:063 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line734)
+{
+  ILLEGAL; /* op:064 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line735)
+{
+  ILLEGAL; /* op:065 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line736)
+{
+  ILLEGAL; /* op:066 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line737)
+{
+  ILLEGAL; /* op:067 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line738)
+{
+  ILLEGAL; /* op:070 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line739)
+{
+  ILLEGAL; /* op:071 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line73A)
+{
+  ILLEGAL; /* op:072 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line73B)
+{
+  ILLEGAL; /* op:073 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line73C)
+{
+  ILLEGAL; /* op:074 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line73D)
+{
+  ILLEGAL; /* op:075 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line73E)
+{
+  ILLEGAL; /* op:076 */
+  assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line73F)
+{
+  ILLEGAL; /* op:077 */
+  assert(EMU68_BREAK);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/line8.c Added

@@ -0,0 +1,583 @@
+/* line8.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: line8.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line 8: OR/DIV/SBCD */
+
+DECL_LINE68(line800)
+{
+ /* ORR.B Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ORRB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line801)
+{
+ /* ORR.B An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line802)
+{
+ /* ORR.B (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(2,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ORRB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line803)
+{
+ /* ORR.B (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAB(3,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ORRB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line804)
+{
+ /* ORR.B -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(4,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ORRB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line805)
+{
+ /* ORR.B d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(5,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ORRB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line806)
+{
+ /* ORR.B d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(6,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ORRB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line807)
+{
+ /* ORR.B <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAB(7,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ORRB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line808)
+{
+ /* ORR.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ORRW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line809)
+{
+ /* ORR.W An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line80A)
+{
+ /* ORR.W (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ORRW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line80B)
+{
+ /* ORR.W (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ORRW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line80C)
+{
+ /* ORR.W -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ORRW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line80D)
+{
+ /* ORR.W d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ORRW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line80E)
+{
+ /* ORR.W d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ORRW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line80F)
+{
+ /* ORR.W <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ORRW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line810)
+{
+ /* ORR.L Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ORRL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line811)
+{
+ /* ORR.L An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line812)
+{
+ /* ORR.L (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(2,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ORRL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line813)
+{
+ /* ORR.L (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(3,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ORRL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line814)
+{
+ /* ORR.L -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(4,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ORRL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line815)
+{
+ /* ORR.L d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(5,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ORRL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line816)
+{
+ /* ORR.L d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(6,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ORRL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line817)
+{
+ /* ORR.L <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(7,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ORRL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line818)
+{
+ /* DIVU.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line819)
+{
+ /* DIVU.W An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line81A)
+{
+ /* DIVU.W (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line81B)
+{
+ /* DIVU.W (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line81C)
+{
+ /* DIVU.W -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line81D)
+{
+ /* DIVU.W d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line81E)
+{
+ /* DIVU.W d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line81F)
+{
+ /* DIVU.W <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line820)
+{
+ /* SBCD Dy,Dx */
+ int s = (u8) REG68.dreg0;
+ int d = (u8) REG68.dreg9;
+ SBCDB(d,s,d);
+ REG68.dreg9 = (REG68.dreg9 & 0xFFFFFF00) | d;
+}
+
+DECL_LINE68(line821)
+{
+ /* SBCD -(Ay),-(Ax) */
+ const addr68_t l0 = REG68.areg0 = (u32) ( REG68.areg0 - 1 );
+ const addr68_t l9 = REG68.areg9 = (u32) ( REG68.areg9 - 1 );
+ int s = read_B(l0);
+ int d = read_B(l9);
+ SBCDB(d,s,d);
+ write_B(l9,d);
+}
+
+DECL_LINE68(line822)
+{
+ /* ORR.B Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line823)
+{
+ /* ORR.B Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line824)
+{
+ /* ORR.B Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line825)
+{
+ /* ORR.B Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line826)
+{
+ /* ORR.B Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line827)
+{
+ /* ORR.B Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ORRB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line828)
+{
+ ILLEGAL; /* EXG on other line (op:050) */
+}
+
+DECL_LINE68(line829)
+{
+ ILLEGAL; /* EXG on other line (op:051) */
+}
+
+DECL_LINE68(line82A)
+{
+ /* ORR.W Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line82B)
+{
+ /* ORR.W Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line82C)
+{
+ /* ORR.W Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line82D)
+{
+ /* ORR.W Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line82E)
+{
+ /* ORR.W Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line82F)
+{
+ /* ORR.W Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ORRW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line830)
+{
+ /* ORR.L Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ ORRL(d,s,d);
+ REG68.dreg0 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line831)
+{
+ ILLEGAL; /* EXG on other line (op:061) */
+}
+
+DECL_LINE68(line832)
+{
+ /* ORR.L Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line833)
+{
+ /* ORR.L Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line834)
+{
+ /* ORR.L Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line835)
+{
+ /* ORR.L Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line836)
+{
+ /* ORR.L Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line837)
+{
+ /* ORR.L Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ORRL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line838)
+{
+ /* DIVS.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line839)
+{
+ /* DIVS.W An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(line83A)
+{
+ /* DIVS.W (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line83B)
+{
+ /* DIVS.W (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line83C)
+{
+ /* DIVS.W -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line83D)
+{
+ /* DIVS.W d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line83E)
+{
+ /* DIVS.W d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line83F)
+{
+ /* DIVS.W <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ DIVSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/line9.c Added

@@ -0,0 +1,603 @@
+/* line9.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: line9.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line 9: SUB/SUBX */
+
+DECL_LINE68(line900)
+{
+ /* SUB.B Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ SUBB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line901)
+{
+ /* SUB.B An,Dn */
+ const uint68_t s = ( (int68_t) REG68.areg0 << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ SUBB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line902)
+{
+ /* SUB.B (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(2,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ SUBB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line903)
+{
+ /* SUB.B (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAB(3,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ SUBB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line904)
+{
+ /* SUB.B -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(4,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ SUBB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line905)
+{
+ /* SUB.B d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(5,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ SUBB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line906)
+{
+ /* SUB.B d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(6,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ SUBB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line907)
+{
+ /* SUB.B <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAB(7,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ SUBB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(line908)
+{
+ /* SUB.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ SUBW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line909)
+{
+ /* SUB.W An,Dn */
+ const uint68_t s = ( (int68_t) REG68.areg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ SUBW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line90A)
+{
+ /* SUB.W (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ SUBW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line90B)
+{
+ /* SUB.W (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ SUBW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line90C)
+{
+ /* SUB.W -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ SUBW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line90D)
+{
+ /* SUB.W d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ SUBW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line90E)
+{
+ /* SUB.W d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ SUBW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line90F)
+{
+ /* SUB.W <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ SUBW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(line910)
+{
+ /* SUB.L Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ SUBL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line911)
+{
+ /* SUB.L An,Dn */
+ const uint68_t s = ( (int68_t) REG68.areg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ SUBL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line912)
+{
+ /* SUB.L (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(2,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ SUBL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line913)
+{
+ /* SUB.L (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(3,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ SUBL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line914)
+{
+ /* SUB.L -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(4,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ SUBL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line915)
+{
+ /* SUB.L d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(5,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ SUBL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line916)
+{
+ /* SUB.L d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(6,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ SUBL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line917)
+{
+ /* SUB.L <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(7,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ SUBL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line918)
+{
+ /* SUBA.W Dn,An */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line919)
+{
+ /* SUBA.W An,An */
+ const uint68_t s = ( (int68_t) REG68.areg0 << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line91A)
+{
+ /* SUBA.W (An),An */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line91B)
+{
+ /* SUBA.W (An)+,An */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line91C)
+{
+ /* SUBA.W -(An),An */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line91D)
+{
+ /* SUBA.W d(An),An */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line91E)
+{
+ /* SUBA.W d(An,Xi),An */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line91F)
+{
+ /* SUBA.W <Ae>,An */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line920)
+{
+ int68_t a,b,s;
+ a = (int68_t)REG68.dreg0<<BYTE_FIX;
+ b = (int68_t)REG68.dreg9<<BYTE_FIX;
+ SUBXB(s,a,b);
+ REG68.dreg9 = (REG68.dreg9 & BYTE_MSK) + ((uint68_t)s>>BYTE_FIX);
+}
+
+DECL_LINE68(line921)
+{
+ int68_t a,b,s;
+ a = read_B(REG68.areg0-=1)<<BYTE_FIX;
+ b = read_B(REG68.areg9-=1)<<BYTE_FIX;
+ SUBXB(s,a,b);
+ write_B(REG68.areg9,(uint68_t)s>>BYTE_FIX);
+}
+
+DECL_LINE68(line922)
+{
+ /* SUB.B Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line923)
+{
+ /* SUB.B Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line924)
+{
+ /* SUB.B Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line925)
+{
+ /* SUB.B Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line926)
+{
+ /* SUB.B Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line927)
+{
+ /* SUB.B Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ SUBB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(line928)
+{
+ int68_t a,b,s;
+ a = (int68_t)REG68.dreg0<<WORD_FIX;
+ b = (int68_t)REG68.dreg9<<WORD_FIX;
+ SUBXW(s,a,b);
+ REG68.dreg9 = (REG68.dreg9 & WORD_MSK) + ((uint68_t)s>>WORD_FIX);
+}
+
+DECL_LINE68(line929)
+{
+ int68_t a,b,s;
+ a = read_W(REG68.areg0-=2)<<WORD_FIX;
+ b = read_W(REG68.areg9-=2)<<WORD_FIX;
+ SUBXW(s,a,b);
+ write_W(REG68.areg9,(uint68_t)s>>WORD_FIX);
+}
+
+DECL_LINE68(line92A)
+{
+ /* SUB.W Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line92B)
+{
+ /* SUB.W Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line92C)
+{
+ /* SUB.W Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line92D)
+{
+ /* SUB.W Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line92E)
+{
+ /* SUB.W Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line92F)
+{
+ /* SUB.W Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ SUBW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(line930)
+{
+ int68_t a,b,s;
+ a = (int68_t)REG68.dreg0<<LONG_FIX;
+ b = (int68_t)REG68.dreg9<<LONG_FIX;
+ SUBXL(s,a,b);
+ REG68.dreg9 = (REG68.dreg9 & LONG_MSK) + ((uint68_t)s>>LONG_FIX);
+}
+
+DECL_LINE68(line931)
+{
+ int68_t a,b,s;
+ a = read_L(REG68.areg0-=4)<<LONG_FIX;
+ b = read_L(REG68.areg9-=4)<<LONG_FIX;
+ SUBXL(s,a,b);
+ write_L(REG68.areg9,(uint68_t)s>>LONG_FIX);
+}
+
+DECL_LINE68(line932)
+{
+ /* SUB.L Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line933)
+{
+ /* SUB.L Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line934)
+{
+ /* SUB.L Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line935)
+{
+ /* SUB.L Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line936)
+{
+ /* SUB.L Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line937)
+{
+ /* SUB.L Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ SUBL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(line938)
+{
+ /* SUBA.L Dn,An */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line939)
+{
+ /* SUBA.L An,An */
+ const uint68_t s = ( (int68_t) REG68.areg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line93A)
+{
+ /* SUBA.L (An),An */
+ const uint68_t s = ( (int68_t) read_EAL(2,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line93B)
+{
+ /* SUBA.L (An)+,An */
+ const uint68_t s = ( (int68_t) read_EAL(3,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line93C)
+{
+ /* SUBA.L -(An),An */
+ const uint68_t s = ( (int68_t) read_EAL(4,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line93D)
+{
+ /* SUBA.L d(An),An */
+ const uint68_t s = ( (int68_t) read_EAL(5,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line93E)
+{
+ /* SUBA.L d(An,Xi),An */
+ const uint68_t s = ( (int68_t) read_EAL(6,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(line93F)
+{
+ /* SUBA.L <Ae>,An */
+ const uint68_t s = ( (int68_t) read_EAL(7,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ SUBAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/lineA.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/lineB.c Added

@@ -0,0 +1,575 @@
+/* lineB.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: lineB.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line B: CMP/EOR */
+
+DECL_LINE68(lineB00)
+{
+ /* CMP.B Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ CMPB(s,d);
+}
+
+DECL_LINE68(lineB01)
+{
+ /* CMP.B An,Dn */
+ const uint68_t s = ( (int68_t) REG68.areg0 << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ CMPB(s,d);
+}
+
+DECL_LINE68(lineB02)
+{
+ /* CMP.B (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(2,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ CMPB(s,d);
+}
+
+DECL_LINE68(lineB03)
+{
+ /* CMP.B (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAB(3,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ CMPB(s,d);
+}
+
+DECL_LINE68(lineB04)
+{
+ /* CMP.B -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(4,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ CMPB(s,d);
+}
+
+DECL_LINE68(lineB05)
+{
+ /* CMP.B d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(5,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ CMPB(s,d);
+}
+
+DECL_LINE68(lineB06)
+{
+ /* CMP.B d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(6,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ CMPB(s,d);
+}
+
+DECL_LINE68(lineB07)
+{
+ /* CMP.B <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAB(7,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ CMPB(s,d);
+}
+
+DECL_LINE68(lineB08)
+{
+ /* CMP.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CMPW(s,d);
+}
+
+DECL_LINE68(lineB09)
+{
+ /* CMP.W An,Dn */
+ const uint68_t s = ( (int68_t) REG68.areg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CMPW(s,d);
+}
+
+DECL_LINE68(lineB0A)
+{
+ /* CMP.W (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CMPW(s,d);
+}
+
+DECL_LINE68(lineB0B)
+{
+ /* CMP.W (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CMPW(s,d);
+}
+
+DECL_LINE68(lineB0C)
+{
+ /* CMP.W -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CMPW(s,d);
+}
+
+DECL_LINE68(lineB0D)
+{
+ /* CMP.W d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CMPW(s,d);
+}
+
+DECL_LINE68(lineB0E)
+{
+ /* CMP.W d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CMPW(s,d);
+}
+
+DECL_LINE68(lineB0F)
+{
+ /* CMP.W <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ CMPW(s,d);
+}
+
+DECL_LINE68(lineB10)
+{
+ /* CMP.L Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CMPL(s,d);
+}
+
+DECL_LINE68(lineB11)
+{
+ /* CMP.L An,Dn */
+ const uint68_t s = ( (int68_t) REG68.areg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CMPL(s,d);
+}
+
+DECL_LINE68(lineB12)
+{
+ /* CMP.L (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(2,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CMPL(s,d);
+}
+
+DECL_LINE68(lineB13)
+{
+ /* CMP.L (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(3,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CMPL(s,d);
+}
+
+DECL_LINE68(lineB14)
+{
+ /* CMP.L -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(4,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CMPL(s,d);
+}
+
+DECL_LINE68(lineB15)
+{
+ /* CMP.L d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(5,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CMPL(s,d);
+}
+
+DECL_LINE68(lineB16)
+{
+ /* CMP.L d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(6,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CMPL(s,d);
+}
+
+DECL_LINE68(lineB17)
+{
+ /* CMP.L <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(7,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ CMPL(s,d);
+}
+
+DECL_LINE68(lineB18)
+{
+ /* CMPA.W Dn,An */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAW(s,d);
+}
+
+DECL_LINE68(lineB19)
+{
+ /* CMPA.W An,An */
+ const uint68_t s = ( (int68_t) REG68.areg0 << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAW(s,d);
+}
+
+DECL_LINE68(lineB1A)
+{
+ /* CMPA.W (An),An */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAW(s,d);
+}
+
+DECL_LINE68(lineB1B)
+{
+ /* CMPA.W (An)+,An */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAW(s,d);
+}
+
+DECL_LINE68(lineB1C)
+{
+ /* CMPA.W -(An),An */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAW(s,d);
+}
+
+DECL_LINE68(lineB1D)
+{
+ /* CMPA.W d(An),An */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAW(s,d);
+}
+
+DECL_LINE68(lineB1E)
+{
+ /* CMPA.W d(An,Xi),An */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAW(s,d);
+}
+
+DECL_LINE68(lineB1F)
+{
+ /* CMPA.W <Ae>,An */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAW(s,d);
+}
+
+DECL_LINE68(lineB20)
+{
+ /* EOR.B Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << BYTE_FIX;
+ EORB(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineB21)
+{
+ /* CMPM.B (Ay)+,(Ax)+ */
+ int68_t y0, x9; addr68_t l;
+ l = (s32) REG68.areg0;
+ REG68.areg0 = (u32) ( REG68.areg0 + 1 );
+ y0 = read_B(l) << BYTE_FIX;
+ l = (s32) REG68.areg9;
+ REG68.areg9 = (u32) ( REG68.areg9 + 1 );
+ x9 = read_B(l) << BYTE_FIX;
+ CMPB(y0,x9);
+}
+
+DECL_LINE68(lineB22)
+{
+ /* EOR.B Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineB23)
+{
+ /* EOR.B Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineB24)
+{
+ /* EOR.B Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineB25)
+{
+ /* EOR.B Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineB26)
+{
+ /* EOR.B Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineB27)
+{
+ /* EOR.B Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ EORB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineB28)
+{
+ /* EOR.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << WORD_FIX;
+ EORW(d,s,d);
+ REG68.dreg0 = ( REG68.dreg0 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineB29)
+{
+ /* CMPM.W (Ay)+,(Ax)+ */
+ int68_t y0, x9; addr68_t l;
+ l = (s32) REG68.areg0;
+ REG68.areg0 = (u32) ( REG68.areg0 + 2 );
+ y0 = read_W(l) << WORD_FIX;
+ l = (s32) REG68.areg9;
+ REG68.areg9 = (u32) ( REG68.areg9 + 2 );
+ x9 = read_W(l) << WORD_FIX;
+ CMPW(y0,x9);
+}
+
+DECL_LINE68(lineB2A)
+{
+ /* EOR.W Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineB2B)
+{
+ /* EOR.W Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineB2C)
+{
+ /* EOR.W Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineB2D)
+{
+ /* EOR.W Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineB2E)
+{
+ /* EOR.W Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineB2F)
+{
+ /* EOR.W Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ EORW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineB30)
+{
+ /* EOR.L Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ EORL(d,s,d);
+ REG68.dreg0 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineB31)
+{
+ /* CMPM.L (Ay)+,(Ax)+ */
+ int68_t y0, x9; addr68_t l;
+ l = (s32) REG68.areg0;
+ REG68.areg0 = (u32) ( REG68.areg0 + 4 );
+ y0 = read_L(l) << LONG_FIX;
+ l = (s32) REG68.areg9;
+ REG68.areg9 = (u32) ( REG68.areg9 + 4 );
+ x9 = read_L(l) << LONG_FIX;
+ CMPL(y0,x9);
+}
+
+DECL_LINE68(lineB32)
+{
+ /* EOR.L Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineB33)
+{
+ /* EOR.L Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineB34)
+{
+ /* EOR.L Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineB35)
+{
+ /* EOR.L Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineB36)
+{
+ /* EOR.L Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineB37)
+{
+ /* EOR.L Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ EORL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineB38)
+{
+ /* CMPA.L Dn,An */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAL(s,d);
+}
+
+DECL_LINE68(lineB39)
+{
+ /* CMPA.L An,An */
+ const uint68_t s = ( (int68_t) REG68.areg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAL(s,d);
+}
+
+DECL_LINE68(lineB3A)
+{
+ /* CMPA.L (An),An */
+ const uint68_t s = ( (int68_t) read_EAL(2,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAL(s,d);
+}
+
+DECL_LINE68(lineB3B)
+{
+ /* CMPA.L (An)+,An */
+ const uint68_t s = ( (int68_t) read_EAL(3,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAL(s,d);
+}
+
+DECL_LINE68(lineB3C)
+{
+ /* CMPA.L -(An),An */
+ const uint68_t s = ( (int68_t) read_EAL(4,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAL(s,d);
+}
+
+DECL_LINE68(lineB3D)
+{
+ /* CMPA.L d(An),An */
+ const uint68_t s = ( (int68_t) read_EAL(5,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAL(s,d);
+}
+
+DECL_LINE68(lineB3E)
+{
+ /* CMPA.L d(An,Xi),An */
+ const uint68_t s = ( (int68_t) read_EAL(6,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAL(s,d);
+}
+
+DECL_LINE68(lineB3F)
+{
+ /* CMPA.L <Ae>,An */
+ const uint68_t s = ( (int68_t) read_EAL(7,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ CMPAL(s,d);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/lineC.c Added

@@ -0,0 +1,586 @@
+/* lineC.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: lineC.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line C: AND/MUL/ABCD/EXG */
+
+DECL_LINE68(lineC00)
+{
+ /* AND.B Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ANDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineC01)
+{
+ /* AND.B An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(lineC02)
+{
+ /* AND.B (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(2,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ANDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineC03)
+{
+ /* AND.B (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAB(3,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ANDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineC04)
+{
+ /* AND.B -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(4,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ANDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineC05)
+{
+ /* AND.B d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(5,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ANDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineC06)
+{
+ /* AND.B d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(6,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ANDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineC07)
+{
+ /* AND.B <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAB(7,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ANDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineC08)
+{
+ /* AND.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ANDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineC09)
+{
+ /* AND.W An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(lineC0A)
+{
+ /* AND.W (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ANDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineC0B)
+{
+ /* AND.W (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ANDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineC0C)
+{
+ /* AND.W -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ANDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineC0D)
+{
+ /* AND.W d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ANDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineC0E)
+{
+ /* AND.W d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ANDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineC0F)
+{
+ /* AND.W <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ANDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineC10)
+{
+ /* AND.L Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ANDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC11)
+{
+ /* AND.L An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(lineC12)
+{
+ /* AND.L (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(2,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ANDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC13)
+{
+ /* AND.L (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(3,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ANDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC14)
+{
+ /* AND.L -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(4,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ANDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC15)
+{
+ /* AND.L d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(5,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ANDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC16)
+{
+ /* AND.L d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(6,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ANDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC17)
+{
+ /* AND.L <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(7,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ANDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC18)
+{
+ /* MULU.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC19)
+{
+ /* MULU.W An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(lineC1A)
+{
+ /* MULU.W (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC1B)
+{
+ /* MULU.W (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC1C)
+{
+ /* MULU.W -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC1D)
+{
+ /* MULU.W d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC1E)
+{
+ /* MULU.W d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC1F)
+{
+ /* MULU.W <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULUW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC20)
+{
+ /* ABCD Dy,Dx */
+ int s = (u8) REG68.dreg0;
+ int d = (u8) REG68.dreg9;
+ ABCDB(d,s,d);
+ REG68.dreg9 = (REG68.dreg9 & 0xFFFFFF00) | d;
+}
+
+DECL_LINE68(lineC21)
+{
+ /* ABCD -(Ay),-(Ax) */
+ const addr68_t l0 = REG68.areg0 = (u32) ( REG68.areg0 - 1 );
+ const addr68_t l9 = REG68.areg9 = (u32) ( REG68.areg9 - 1 );
+ int s = read_B(l0);
+ int d = read_B(l9);
+ ABCDB(d,s,d);
+ write_B(l9,d);
+}
+
+DECL_LINE68(lineC22)
+{
+ /* AND.B Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineC23)
+{
+ /* AND.B Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineC24)
+{
+ /* AND.B Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineC25)
+{
+ /* AND.B Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineC26)
+{
+ /* AND.B Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineC27)
+{
+ /* AND.B Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ANDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineC28)
+{
+ /* EXG Dx,Dy */
+ EXG(reg9,reg0);
+}
+
+DECL_LINE68(lineC29)
+{
+ /* EXG Ax,Ay */
+ EXG(reg9+8,reg0+8);
+}
+
+DECL_LINE68(lineC2A)
+{
+ /* AND.W Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineC2B)
+{
+ /* AND.W Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineC2C)
+{
+ /* AND.W Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineC2D)
+{
+ /* AND.W Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineC2E)
+{
+ /* AND.W Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineC2F)
+{
+ /* AND.W Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ANDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineC30)
+{
+ /* AND.L Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg0 << LONG_FIX;
+ ANDL(d,s,d);
+ REG68.dreg0 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC31)
+{
+ /* EXG Dx,Ay */
+ EXG(reg9,reg0+8);
+}
+
+DECL_LINE68(lineC32)
+{
+ /* AND.L Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineC33)
+{
+ /* AND.L Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineC34)
+{
+ /* AND.L Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineC35)
+{
+ /* AND.L Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineC36)
+{
+ /* AND.L Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineC37)
+{
+ /* AND.L Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ANDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineC38)
+{
+ /* MULS.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC39)
+{
+ /* MULS.W An,Dn */
+ ILLEGAL; /* source An not allowed */
+ assert(EMU68_BREAK);
+}
+
+DECL_LINE68(lineC3A)
+{
+ /* MULS.W (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC3B)
+{
+ /* MULS.W (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC3C)
+{
+ /* MULS.W -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC3D)
+{
+ /* MULS.W d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC3E)
+{
+ /* MULS.W d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineC3F)
+{
+ /* MULS.W <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ MULSW(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/lineD.c Added

@@ -0,0 +1,603 @@
+/* lineD.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: lineD.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line D: ADD/ADDX */
+
+DECL_LINE68(lineD00)
+{
+ /* ADD.B Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ADDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineD01)
+{
+ /* ADD.B An,Dn */
+ const uint68_t s = ( (int68_t) REG68.areg0 << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ADDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineD02)
+{
+ /* ADD.B (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(2,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ADDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineD03)
+{
+ /* ADD.B (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAB(3,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ADDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineD04)
+{
+ /* ADD.B -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(4,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ADDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineD05)
+{
+ /* ADD.B d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(5,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ADDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineD06)
+{
+ /* ADD.B d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAB(6,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ADDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineD07)
+{
+ /* ADD.B <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAB(7,reg0) << BYTE_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << BYTE_FIX;
+ ADDB(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & BYTE_MSK ) + ( d >> BYTE_FIX );
+}
+
+DECL_LINE68(lineD08)
+{
+ /* ADD.W Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ADDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineD09)
+{
+ /* ADD.W An,Dn */
+ const uint68_t s = ( (int68_t) REG68.areg0 << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ADDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineD0A)
+{
+ /* ADD.W (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ADDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineD0B)
+{
+ /* ADD.W (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ADDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineD0C)
+{
+ /* ADD.W -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ADDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineD0D)
+{
+ /* ADD.W d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ADDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineD0E)
+{
+ /* ADD.W d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ADDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineD0F)
+{
+ /* ADD.W <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << WORD_FIX;
+ ADDW(d,s,d);
+ REG68.dreg9 = ( REG68.dreg9 & WORD_MSK ) + ( d >> WORD_FIX );
+}
+
+DECL_LINE68(lineD10)
+{
+ /* ADD.L Dn,Dn */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ADDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD11)
+{
+ /* ADD.L An,Dn */
+ const uint68_t s = ( (int68_t) REG68.areg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ADDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD12)
+{
+ /* ADD.L (An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(2,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ADDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD13)
+{
+ /* ADD.L (An)+,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(3,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ADDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD14)
+{
+ /* ADD.L -(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(4,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ADDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD15)
+{
+ /* ADD.L d(An),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(5,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ADDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD16)
+{
+ /* ADD.L d(An,Xi),Dn */
+ const uint68_t s = ( (int68_t) read_EAL(6,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ADDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD17)
+{
+ /* ADD.L <Ae>,Dn */
+ const uint68_t s = ( (int68_t) read_EAL(7,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.dreg9 << LONG_FIX;
+ ADDL(d,s,d);
+ REG68.dreg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD18)
+{
+ /* ADDA.W Dn,An */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD19)
+{
+ /* ADDA.W An,An */
+ const uint68_t s = ( (int68_t) REG68.areg0 << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD1A)
+{
+ /* ADDA.W (An),An */
+ const uint68_t s = ( (int68_t) read_EAW(2,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD1B)
+{
+ /* ADDA.W (An)+,An */
+ const uint68_t s = ( (int68_t) read_EAW(3,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD1C)
+{
+ /* ADDA.W -(An),An */
+ const uint68_t s = ( (int68_t) read_EAW(4,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD1D)
+{
+ /* ADDA.W d(An),An */
+ const uint68_t s = ( (int68_t) read_EAW(5,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD1E)
+{
+ /* ADDA.W d(An,Xi),An */
+ const uint68_t s = ( (int68_t) read_EAW(6,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD1F)
+{
+ /* ADDA.W <Ae>,An */
+ const uint68_t s = ( (int68_t) read_EAW(7,reg0) << WORD_FIX ) >> 16;
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAW(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD20)
+{
+ int68_t a,b,s;
+ a = (int68_t)REG68.dreg0<<BYTE_FIX;
+ b = (int68_t)REG68.dreg9<<BYTE_FIX;
+ ADDXB(s,a,b);
+ REG68.dreg9 = (REG68.dreg9 & BYTE_MSK) + ((uint68_t)s>>BYTE_FIX);
+}
+
+DECL_LINE68(lineD21)
+{
+ int68_t a,b,s;
+ a = read_B(REG68.areg0-=1)<<BYTE_FIX;
+ b = read_B(REG68.areg9-=1)<<BYTE_FIX;
+ ADDXB(s,a,b);
+ write_B(REG68.areg9,(uint68_t)s>>BYTE_FIX);
+}
+
+DECL_LINE68(lineD22)
+{
+ /* ADD.B Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(2,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineD23)
+{
+ /* ADD.B Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(3,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineD24)
+{
+ /* ADD.B Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(4,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineD25)
+{
+ /* ADD.B Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(5,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineD26)
+{
+ /* ADD.B Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(6,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineD27)
+{
+ /* ADD.B Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << BYTE_FIX );
+ const addr68_t l = get_EAB(7,reg0);
+ uint68_t d = read_B(l) << BYTE_FIX;
+ ADDB(d,s,d);
+ write_B(l, d >> BYTE_FIX);
+}
+
+DECL_LINE68(lineD28)
+{
+ int68_t a,b,s;
+ a = (int68_t)REG68.dreg0<<WORD_FIX;
+ b = (int68_t)REG68.dreg9<<WORD_FIX;
+ ADDXW(s,a,b);
+ REG68.dreg9 = (REG68.dreg9 & WORD_MSK) + ((uint68_t)s>>WORD_FIX);
+}
+
+DECL_LINE68(lineD29)
+{
+ int68_t a,b,s;
+ a = read_W(REG68.areg0-=2)<<WORD_FIX;
+ b = read_W(REG68.areg9-=2)<<WORD_FIX;
+ ADDXW(s,a,b);
+ write_W(REG68.areg9,(uint68_t)s>>WORD_FIX);
+}
+
+DECL_LINE68(lineD2A)
+{
+ /* ADD.W Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(2,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineD2B)
+{
+ /* ADD.W Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(3,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineD2C)
+{
+ /* ADD.W Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(4,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineD2D)
+{
+ /* ADD.W Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(5,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineD2E)
+{
+ /* ADD.W Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(6,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineD2F)
+{
+ /* ADD.W Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << WORD_FIX );
+ const addr68_t l = get_EAW(7,reg0);
+ uint68_t d = read_W(l) << WORD_FIX;
+ ADDW(d,s,d);
+ write_W(l, d >> WORD_FIX);
+}
+
+DECL_LINE68(lineD30)
+{
+ int68_t a,b,s;
+ a = (int68_t)REG68.dreg0<<LONG_FIX;
+ b = (int68_t)REG68.dreg9<<LONG_FIX;
+ ADDXL(s,a,b);
+ REG68.dreg9 = (REG68.dreg9 & LONG_MSK) + ((uint68_t)s>>LONG_FIX);
+}
+
+DECL_LINE68(lineD31)
+{
+ int68_t a,b,s;
+ a = read_L(REG68.areg0-=4)<<LONG_FIX;
+ b = read_L(REG68.areg9-=4)<<LONG_FIX;
+ ADDXL(s,a,b);
+ write_L(REG68.areg9,(uint68_t)s>>LONG_FIX);
+}
+
+DECL_LINE68(lineD32)
+{
+ /* ADD.L Dn,(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(2,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineD33)
+{
+ /* ADD.L Dn,(An)+ */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(3,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineD34)
+{
+ /* ADD.L Dn,-(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(4,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineD35)
+{
+ /* ADD.L Dn,d(An) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(5,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineD36)
+{
+ /* ADD.L Dn,d(An,Xi) */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(6,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineD37)
+{
+ /* ADD.L Dn,<Ae> */
+ const uint68_t s = ( (int68_t) REG68.dreg9 << LONG_FIX );
+ const addr68_t l = get_EAL(7,reg0);
+ uint68_t d = read_L(l) << LONG_FIX;
+ ADDL(d,s,d);
+ write_L(l, d >> LONG_FIX);
+}
+
+DECL_LINE68(lineD38)
+{
+ /* ADDA.L Dn,An */
+ const uint68_t s = ( (int68_t) REG68.dreg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD39)
+{
+ /* ADDA.L An,An */
+ const uint68_t s = ( (int68_t) REG68.areg0 << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD3A)
+{
+ /* ADDA.L (An),An */
+ const uint68_t s = ( (int68_t) read_EAL(2,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD3B)
+{
+ /* ADDA.L (An)+,An */
+ const uint68_t s = ( (int68_t) read_EAL(3,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD3C)
+{
+ /* ADDA.L -(An),An */
+ const uint68_t s = ( (int68_t) read_EAL(4,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD3D)
+{
+ /* ADDA.L d(An),An */
+ const uint68_t s = ( (int68_t) read_EAL(5,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD3E)
+{
+ /* ADDA.L d(An,Xi),An */
+ const uint68_t s = ( (int68_t) read_EAL(6,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+
+DECL_LINE68(lineD3F)
+{
+ /* ADDA.L <Ae>,An */
+ const uint68_t s = ( (int68_t) read_EAL(7,reg0) << LONG_FIX );
+ uint68_t d = (int68_t) REG68.areg9 << LONG_FIX;
+ ADDAL(d,s,d);
+ REG68.areg9 = ( d >> LONG_FIX );
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/lineE.c Added

@@ -0,0 +1,603 @@
+/* lineE.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: lineE.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+/* Line E: Shift/Rotate/Bit Field */
+
+static void ASR_mem(emu68_t * const emu68, int reg, int mode)
+{
+ /* ASR.W <Ae> */
+ const addr68_t l = get_EAW(mode,reg);
+ int68_t a = read_W(l)<<WORD_FIX;
+ ASRW(a,a,1);
+ write_W(l,a>>WORD_FIX);
+}
+
+static void LSR_mem(emu68_t * const emu68, int reg, int mode)
+{
+ /* LSR.W <Ae> */
+ const addr68_t l = get_EAW(mode,reg);
+ int68_t a = read_W(l)<<WORD_FIX;
+ LSRW(a,a,1);
+ write_W(l,a>>WORD_FIX);
+}
+
+static void ROXR_mem(emu68_t * const emu68, int reg, int mode)
+{
+ /* ROXR.W <Ae> */
+ const addr68_t l = get_EAW(mode,reg);
+ int68_t a = read_W(l)<<WORD_FIX;
+ ROXRW(a,a,1);
+ write_W(l,a>>WORD_FIX);
+}
+
+static void ROR_mem(emu68_t * const emu68, int reg, int mode)
+{
+ /* ROR.W <Ae> */
+ const addr68_t l = get_EAW(mode,reg);
+ int68_t a = read_W(l)<<WORD_FIX;
+ RORW(a,a,1);
+ write_W(l,a>>WORD_FIX);
+}
+
+static void ASL_mem(emu68_t * const emu68, int reg, int mode)
+{
+ /* ASL.W <Ae> */
+ const addr68_t l = get_EAW(mode,reg);
+ int68_t a = read_W(l)<<WORD_FIX;
+ ASLW(a,a,1);
+ write_W(l,a>>WORD_FIX);
+}
+
+static void LSL_mem(emu68_t * const emu68, int reg, int mode)
+{
+ /* LSL.W <Ae> */
+ const addr68_t l = get_EAW(mode,reg);
+ int68_t a = read_W(l)<<WORD_FIX;
+ LSLW(a,a,1);
+ write_W(l,a>>WORD_FIX);
+}
+
+static void ROXL_mem(emu68_t * const emu68, int reg, int mode)
+{
+ /* ROXL.W <Ae> */
+ const addr68_t l = get_EAW(mode,reg);
+ int68_t a = read_W(l)<<WORD_FIX;
+ ROXLW(a,a,1);
+ write_W(l,a>>WORD_FIX);
+}
+
+static void ROL_mem(emu68_t * const emu68, int reg, int mode)
+{
+ /* ROL.W <Ae> */
+ const addr68_t l = get_EAW(mode,reg);
+ int68_t a = read_W(l)<<WORD_FIX;
+ ROLW(a,a,1);
+ write_W(l,a>>WORD_FIX);
+}
+
+static void (*const lslmemR_fc4)(emu68_t *const,int,int)=
+{
+ ASR_mem, LSR_mem, ROXR_mem, ROR_mem,
+};
+
+static void (*const lslmemL_fc4)(emu68_t *const,int,int)=
+{
+ ASL_mem, LSL_mem, ROXL_mem, ROL_mem,
+};
+
+DECL_LINE68(lineE00)
+{
+ /* ASR.B #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ ASRB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE01)
+{
+ /* LSR.B #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ LSRB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE02)
+{
+ /* ROXR.B #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ ROXRB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE03)
+{
+ /* ROR.B #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ RORB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE04)
+{
+ /* ASR.B Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ ASRB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE05)
+{
+ /* LSR.B Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ LSRB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE06)
+{
+ /* ROXR.B Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ ROXRB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE07)
+{
+ /* ROR.B Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ RORB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE08)
+{
+ /* ASR.W #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ ASRW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE09)
+{
+ /* LSR.W #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ LSRW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE0A)
+{
+ /* ROXR.W #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ ROXRW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE0B)
+{
+ /* ROR.W #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ RORW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE0C)
+{
+ /* ASR.W Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ ASRW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE0D)
+{
+ /* LSR.W Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ LSRW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE0E)
+{
+ /* ROXR.W Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ ROXRW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE0F)
+{
+ /* ROR.W Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ RORW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE10)
+{
+ /* ASR.L #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ ASRL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE11)
+{
+ /* LSR.L #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ LSRL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE12)
+{
+ /* ROXR.L #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ ROXRL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE13)
+{
+ /* ROR.L #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ RORL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE14)
+{
+ /* ASR.L Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ ASRL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE15)
+{
+ /* LSR.L Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ LSRL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE16)
+{
+ /* ROXR.L Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ ROXRL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE17)
+{
+ /* ROR.L Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ RORL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE18)
+{
+ lslmemR_fcreg9&3(emu68,reg0,0);
+}
+
+DECL_LINE68(lineE19)
+{
+ lslmemR_fcreg9&3(emu68,reg0,1);
+}
+
+DECL_LINE68(lineE1A)
+{
+ lslmemR_fcreg9&3(emu68,reg0,2);
+}
+
+DECL_LINE68(lineE1B)
+{
+ lslmemR_fcreg9&3(emu68,reg0,3);
+}
+
+DECL_LINE68(lineE1C)
+{
+ lslmemR_fcreg9&3(emu68,reg0,4);
+}
+
+DECL_LINE68(lineE1D)
+{
+ lslmemR_fcreg9&3(emu68,reg0,5);
+}
+
+DECL_LINE68(lineE1E)
+{
+ lslmemR_fcreg9&3(emu68,reg0,6);
+}
+
+DECL_LINE68(lineE1F)
+{
+ lslmemR_fcreg9&3(emu68,reg0,7);
+}
+
+DECL_LINE68(lineE20)
+{
+ /* ASL.B #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ ASLB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE21)
+{
+ /* LSL.B #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ LSLB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE22)
+{
+ /* ROXL.B #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ ROXLB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE23)
+{
+ /* ROL.B #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ ROLB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE24)
+{
+ /* ASL.B Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ ASLB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE25)
+{
+ /* LSL.B Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ LSLB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE26)
+{
+ /* ROXL.B Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ ROXLB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE27)
+{
+ /* ROL.B Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<BYTE_FIX;
+ ROLB(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & BYTE_MSK) + (a>>BYTE_FIX);
+}
+
+DECL_LINE68(lineE28)
+{
+ /* ASL.W #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ ASLW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE29)
+{
+ /* LSL.W #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ LSLW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE2A)
+{
+ /* ROXL.W #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ ROXLW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE2B)
+{
+ /* ROL.W #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ ROLW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE2C)
+{
+ /* ASL.W Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ ASLW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE2D)
+{
+ /* LSL.W Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ LSLW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE2E)
+{
+ /* ROXL.W Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ ROXLW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE2F)
+{
+ /* ROL.W Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<WORD_FIX;
+ ROLW(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & WORD_MSK) + (a>>WORD_FIX);
+}
+
+DECL_LINE68(lineE30)
+{
+ /* ASL.L #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ ASLL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE31)
+{
+ /* LSL.L #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ LSLL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE32)
+{
+ /* ROXL.L #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ ROXLL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE33)
+{
+ /* ROL.L #d,Dn */
+ const int d = ((reg9-1)&7)+1;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ ROLL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE34)
+{
+ /* ASL.L Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ ASLL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE35)
+{
+ /* LSL.L Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ LSLL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE36)
+{
+ /* ROXL.L Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ ROXLL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE37)
+{
+ /* ROL.L Dn,Dn */
+ const int d = REG68.dreg9;
+ uint68_t a = (uint68_t)REG68.dreg0<<LONG_FIX;
+ ROLL(a,a,d);
+ REG68.dreg0 = (REG68.dreg0 & LONG_MSK) + (a>>LONG_FIX);
+}
+
+DECL_LINE68(lineE38)
+{
+ lslmemL_fcreg9&3(emu68,reg0,0);
+}
+
+DECL_LINE68(lineE39)
+{
+ lslmemL_fcreg9&3(emu68,reg0,1);
+}
+
+DECL_LINE68(lineE3A)
+{
+ lslmemL_fcreg9&3(emu68,reg0,2);
+}
+
+DECL_LINE68(lineE3B)
+{
+ lslmemL_fcreg9&3(emu68,reg0,3);
+}
+
+DECL_LINE68(lineE3C)
+{
+ lslmemL_fcreg9&3(emu68,reg0,4);
+}
+
+DECL_LINE68(lineE3D)
+{
+ lslmemL_fcreg9&3(emu68,reg0,5);
+}
+
+DECL_LINE68(lineE3E)
+{
+ lslmemL_fcreg9&3(emu68,reg0,6);
+}
+
+DECL_LINE68(lineE3F)
+{
+ lslmemL_fcreg9&3(emu68,reg0,7);
+}
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/lineF.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines/table.c Added

@@ -0,0 +1,274 @@
+/* table.c - EMU68 generated code by
+ * gen68 2013-05-25 00:26:49
+ * Copyright (c) 1998-2013 Benjamin Gerard
+ *
+ * $Id: table.c 458 2014-07-03 05:29:47Z benjihan $
+ */
+
+#include "struct68.h"
+
+#ifndef EMU68_MONOLITIC
+EMU68_EXTERN linefunc68_t
+  line000,line001,line002,line003,line004,line005,line006,line007,
+  line008,line009,line00A,line00B,line00C,line00D,line00E,line00F,
+  line010,line011,line012,line013,line014,line015,line016,line017,
+  line018,line019,line01A,line01B,line01C,line01D,line01E,line01F,
+  line020,line021,line022,line023,line024,line025,line026,line027,
+  line028,line029,line02A,line02B,line02C,line02D,line02E,line02F,
+  line030,line031,line032,line033,line034,line035,line036,line037,
+  line038,line039,line03A,line03B,line03C,line03D,line03E,line03F,
+  line100,line101,line102,line103,line104,line105,line106,line107,
+  line108,line109,line10A,line10B,line10C,line10D,line10E,line10F,
+  line110,line111,line112,line113,line114,line115,line116,line117,
+  line118,line119,line11A,line11B,line11C,line11D,line11E,line11F,
+  line120,line121,line122,line123,line124,line125,line126,line127,
+  line128,line129,line12A,line12B,line12C,line12D,line12E,line12F,
+  line130,line131,line132,line133,line134,line135,line136,line137,
+  line138,line139,line13A,line13B,line13C,line13D,line13E,line13F,
+  line200,line201,line202,line203,line204,line205,line206,line207,
+  line208,line209,line20A,line20B,line20C,line20D,line20E,line20F,
+  line210,line211,line212,line213,line214,line215,line216,line217,
+  line218,line219,line21A,line21B,line21C,line21D,line21E,line21F,
+  line220,line221,line222,line223,line224,line225,line226,line227,
+  line228,line229,line22A,line22B,line22C,line22D,line22E,line22F,
+  line230,line231,line232,line233,line234,line235,line236,line237,
+  line238,line239,line23A,line23B,line23C,line23D,line23E,line23F,
+  line300,line301,line302,line303,line304,line305,line306,line307,
+  line308,line309,line30A,line30B,line30C,line30D,line30E,line30F,
+  line310,line311,line312,line313,line314,line315,line316,line317,
+  line318,line319,line31A,line31B,line31C,line31D,line31E,line31F,
+  line320,line321,line322,line323,line324,line325,line326,line327,
+  line328,line329,line32A,line32B,line32C,line32D,line32E,line32F,
+  line330,line331,line332,line333,line334,line335,line336,line337,
+  line338,line339,line33A,line33B,line33C,line33D,line33E,line33F,
+  line400,line401,line402,line403,line404,line405,line406,line407,
+  line408,line409,line40A,line40B,line40C,line40D,line40E,line40F,
+  line410,line411,line412,line413,line414,line415,line416,line417,
+  line418,line419,line41A,line41B,line41C,line41D,line41E,line41F,
+  line420,line421,line422,line423,line424,line425,line426,line427,
+  line428,line429,line42A,line42B,line42C,line42D,line42E,line42F,
+  line430,line431,line432,line433,line434,line435,line436,line437,
+  line438,line439,line43A,line43B,line43C,line43D,line43E,line43F,
+  line500,line501,line502,line503,line504,line505,line506,line507,
+  line508,line509,line50A,line50B,line50C,line50D,line50E,line50F,
+  line510,line511,line512,line513,line514,line515,line516,line517,
+  line518,line519,line51A,line51B,line51C,line51D,line51E,line51F,
+  line520,line521,line522,line523,line524,line525,line526,line527,
+  line528,line529,line52A,line52B,line52C,line52D,line52E,line52F,
+  line530,line531,line532,line533,line534,line535,line536,line537,
+  line538,line539,line53A,line53B,line53C,line53D,line53E,line53F,
+  line600,line601,line602,line603,line604,line605,line606,line607,
+  line608,line609,line60A,line60B,line60C,line60D,line60E,line60F,
+  line610,line611,line612,line613,line614,line615,line616,line617,
+  line618,line619,line61A,line61B,line61C,line61D,line61E,line61F,
+  line620,line621,line622,line623,line624,line625,line626,line627,
+  line628,line629,line62A,line62B,line62C,line62D,line62E,line62F,
+  line630,line631,line632,line633,line634,line635,line636,line637,
+  line638,line639,line63A,line63B,line63C,line63D,line63E,line63F,
+  line700,line701,line702,line703,line704,line705,line706,line707,
+  line708,line709,line70A,line70B,line70C,line70D,line70E,line70F,
+  line710,line711,line712,line713,line714,line715,line716,line717,
+  line718,line719,line71A,line71B,line71C,line71D,line71E,line71F,
+  line720,line721,line722,line723,line724,line725,line726,line727,
+  line728,line729,line72A,line72B,line72C,line72D,line72E,line72F,
+  line730,line731,line732,line733,line734,line735,line736,line737,
+  line738,line739,line73A,line73B,line73C,line73D,line73E,line73F,
+  line800,line801,line802,line803,line804,line805,line806,line807,
+  line808,line809,line80A,line80B,line80C,line80D,line80E,line80F,
+  line810,line811,line812,line813,line814,line815,line816,line817,
+  line818,line819,line81A,line81B,line81C,line81D,line81E,line81F,
+  line820,line821,line822,line823,line824,line825,line826,line827,
+  line828,line829,line82A,line82B,line82C,line82D,line82E,line82F,
+  line830,line831,line832,line833,line834,line835,line836,line837,
+  line838,line839,line83A,line83B,line83C,line83D,line83E,line83F,
+  line900,line901,line902,line903,line904,line905,line906,line907,
+  line908,line909,line90A,line90B,line90C,line90D,line90E,line90F,
+  line910,line911,line912,line913,line914,line915,line916,line917,
+  line918,line919,line91A,line91B,line91C,line91D,line91E,line91F,
+  line920,line921,line922,line923,line924,line925,line926,line927,
+  line928,line929,line92A,line92B,line92C,line92D,line92E,line92F,
+  line930,line931,line932,line933,line934,line935,line936,line937,
+  line938,line939,line93A,line93B,line93C,line93D,line93E,line93F,
+  lineA00,lineA01,lineA02,lineA03,lineA04,lineA05,lineA06,lineA07,
+  lineA08,lineA09,lineA0A,lineA0B,lineA0C,lineA0D,lineA0E,lineA0F,
+  lineA10,lineA11,lineA12,lineA13,lineA14,lineA15,lineA16,lineA17,
+  lineA18,lineA19,lineA1A,lineA1B,lineA1C,lineA1D,lineA1E,lineA1F,
+  lineA20,lineA21,lineA22,lineA23,lineA24,lineA25,lineA26,lineA27,
+  lineA28,lineA29,lineA2A,lineA2B,lineA2C,lineA2D,lineA2E,lineA2F,
+  lineA30,lineA31,lineA32,lineA33,lineA34,lineA35,lineA36,lineA37,
+  lineA38,lineA39,lineA3A,lineA3B,lineA3C,lineA3D,lineA3E,lineA3F,
+  lineB00,lineB01,lineB02,lineB03,lineB04,lineB05,lineB06,lineB07,
+  lineB08,lineB09,lineB0A,lineB0B,lineB0C,lineB0D,lineB0E,lineB0F,
+  lineB10,lineB11,lineB12,lineB13,lineB14,lineB15,lineB16,lineB17,
+  lineB18,lineB19,lineB1A,lineB1B,lineB1C,lineB1D,lineB1E,lineB1F,
+  lineB20,lineB21,lineB22,lineB23,lineB24,lineB25,lineB26,lineB27,
+  lineB28,lineB29,lineB2A,lineB2B,lineB2C,lineB2D,lineB2E,lineB2F,
+  lineB30,lineB31,lineB32,lineB33,lineB34,lineB35,lineB36,lineB37,
+  lineB38,lineB39,lineB3A,lineB3B,lineB3C,lineB3D,lineB3E,lineB3F,
+  lineC00,lineC01,lineC02,lineC03,lineC04,lineC05,lineC06,lineC07,
+  lineC08,lineC09,lineC0A,lineC0B,lineC0C,lineC0D,lineC0E,lineC0F,
+  lineC10,lineC11,lineC12,lineC13,lineC14,lineC15,lineC16,lineC17,
+  lineC18,lineC19,lineC1A,lineC1B,lineC1C,lineC1D,lineC1E,lineC1F,
+  lineC20,lineC21,lineC22,lineC23,lineC24,lineC25,lineC26,lineC27,
+  lineC28,lineC29,lineC2A,lineC2B,lineC2C,lineC2D,lineC2E,lineC2F,
+  lineC30,lineC31,lineC32,lineC33,lineC34,lineC35,lineC36,lineC37,
+  lineC38,lineC39,lineC3A,lineC3B,lineC3C,lineC3D,lineC3E,lineC3F,
+  lineD00,lineD01,lineD02,lineD03,lineD04,lineD05,lineD06,lineD07,
+  lineD08,lineD09,lineD0A,lineD0B,lineD0C,lineD0D,lineD0E,lineD0F,
+  lineD10,lineD11,lineD12,lineD13,lineD14,lineD15,lineD16,lineD17,
+  lineD18,lineD19,lineD1A,lineD1B,lineD1C,lineD1D,lineD1E,lineD1F,
+  lineD20,lineD21,lineD22,lineD23,lineD24,lineD25,lineD26,lineD27,
+  lineD28,lineD29,lineD2A,lineD2B,lineD2C,lineD2D,lineD2E,lineD2F,
+  lineD30,lineD31,lineD32,lineD33,lineD34,lineD35,lineD36,lineD37,
+  lineD38,lineD39,lineD3A,lineD3B,lineD3C,lineD3D,lineD3E,lineD3F,
+  lineE00,lineE01,lineE02,lineE03,lineE04,lineE05,lineE06,lineE07,
+  lineE08,lineE09,lineE0A,lineE0B,lineE0C,lineE0D,lineE0E,lineE0F,
+  lineE10,lineE11,lineE12,lineE13,lineE14,lineE15,lineE16,lineE17,
+  lineE18,lineE19,lineE1A,lineE1B,lineE1C,lineE1D,lineE1E,lineE1F,
+  lineE20,lineE21,lineE22,lineE23,lineE24,lineE25,lineE26,lineE27,
+  lineE28,lineE29,lineE2A,lineE2B,lineE2C,lineE2D,lineE2E,lineE2F,
+  lineE30,lineE31,lineE32,lineE33,lineE34,lineE35,lineE36,lineE37,
+  lineE38,lineE39,lineE3A,lineE3B,lineE3C,lineE3D,lineE3E,lineE3F,
+  lineF00,lineF01,lineF02,lineF03,lineF04,lineF05,lineF06,lineF07,
+  lineF08,lineF09,lineF0A,lineF0B,lineF0C,lineF0D,lineF0E,lineF0F,
+  lineF10,lineF11,lineF12,lineF13,lineF14,lineF15,lineF16,lineF17,
+  lineF18,lineF19,lineF1A,lineF1B,lineF1C,lineF1D,lineF1E,lineF1F,
+  lineF20,lineF21,lineF22,lineF23,lineF24,lineF25,lineF26,lineF27,
+  lineF28,lineF29,lineF2A,lineF2B,lineF2C,lineF2D,lineF2E,lineF2F,
+  lineF30,lineF31,lineF32,lineF33,lineF34,lineF35,lineF36,lineF37,
+  lineF38,lineF39,lineF3A,lineF3B,lineF3C,lineF3D,lineF3E,lineF3F;
+#endif
+
+
+linefunc68_t *line_func1024 = 
+{
+  line000,line001,line002,line003,line004,line005,line006,line007,
+  line008,line009,line00A,line00B,line00C,line00D,line00E,line00F,
+  line010,line011,line012,line013,line014,line015,line016,line017,
+  line018,line019,line01A,line01B,line01C,line01D,line01E,line01F,
+  line020,line021,line022,line023,line024,line025,line026,line027,
+  line028,line029,line02A,line02B,line02C,line02D,line02E,line02F,
+  line030,line031,line032,line033,line034,line035,line036,line037,
+  line038,line039,line03A,line03B,line03C,line03D,line03E,line03F,
+  line100,line101,line102,line103,line104,line105,line106,line107,
+  line108,line109,line10A,line10B,line10C,line10D,line10E,line10F,
+  line110,line111,line112,line113,line114,line115,line116,line117,
+  line118,line119,line11A,line11B,line11C,line11D,line11E,line11F,
+  line120,line121,line122,line123,line124,line125,line126,line127,
+  line128,line129,line12A,line12B,line12C,line12D,line12E,line12F,
+  line130,line131,line132,line133,line134,line135,line136,line137,
+  line138,line139,line13A,line13B,line13C,line13D,line13E,line13F,
+  line200,line201,line202,line203,line204,line205,line206,line207,
+  line208,line209,line20A,line20B,line20C,line20D,line20E,line20F,
+  line210,line211,line212,line213,line214,line215,line216,line217,
+  line218,line219,line21A,line21B,line21C,line21D,line21E,line21F,
+  line220,line221,line222,line223,line224,line225,line226,line227,
+  line228,line229,line22A,line22B,line22C,line22D,line22E,line22F,
+  line230,line231,line232,line233,line234,line235,line236,line237,
+  line238,line239,line23A,line23B,line23C,line23D,line23E,line23F,
+  line300,line301,line302,line303,line304,line305,line306,line307,
+  line308,line309,line30A,line30B,line30C,line30D,line30E,line30F,
+  line310,line311,line312,line313,line314,line315,line316,line317,
+  line318,line319,line31A,line31B,line31C,line31D,line31E,line31F,
+  line320,line321,line322,line323,line324,line325,line326,line327,
+  line328,line329,line32A,line32B,line32C,line32D,line32E,line32F,
+  line330,line331,line332,line333,line334,line335,line336,line337,
+  line338,line339,line33A,line33B,line33C,line33D,line33E,line33F,
+  line400,line401,line402,line403,line404,line405,line406,line407,
+  line408,line409,line40A,line40B,line40C,line40D,line40E,line40F,
+  line410,line411,line412,line413,line414,line415,line416,line417,
+  line418,line419,line41A,line41B,line41C,line41D,line41E,line41F,
+  line420,line421,line422,line423,line424,line425,line426,line427,
+  line428,line429,line42A,line42B,line42C,line42D,line42E,line42F,
+  line430,line431,line432,line433,line434,line435,line436,line437,
+  line438,line439,line43A,line43B,line43C,line43D,line43E,line43F,
+  line500,line501,line502,line503,line504,line505,line506,line507,
+  line508,line509,line50A,line50B,line50C,line50D,line50E,line50F,
+  line510,line511,line512,line513,line514,line515,line516,line517,
+  line518,line519,line51A,line51B,line51C,line51D,line51E,line51F,
+  line520,line521,line522,line523,line524,line525,line526,line527,
+  line528,line529,line52A,line52B,line52C,line52D,line52E,line52F,
+  line530,line531,line532,line533,line534,line535,line536,line537,
+  line538,line539,line53A,line53B,line53C,line53D,line53E,line53F,
+  line600,line601,line602,line603,line604,line605,line606,line607,
+  line608,line609,line60A,line60B,line60C,line60D,line60E,line60F,
+  line610,line611,line612,line613,line614,line615,line616,line617,
+  line618,line619,line61A,line61B,line61C,line61D,line61E,line61F,
+  line620,line621,line622,line623,line624,line625,line626,line627,
+  line628,line629,line62A,line62B,line62C,line62D,line62E,line62F,
+  line630,line631,line632,line633,line634,line635,line636,line637,
+  line638,line639,line63A,line63B,line63C,line63D,line63E,line63F,
+  line700,line701,line702,line703,line704,line705,line706,line707,
+  line708,line709,line70A,line70B,line70C,line70D,line70E,line70F,
+  line710,line711,line712,line713,line714,line715,line716,line717,
+  line718,line719,line71A,line71B,line71C,line71D,line71E,line71F,
+  line720,line721,line722,line723,line724,line725,line726,line727,
+  line728,line729,line72A,line72B,line72C,line72D,line72E,line72F,
+  line730,line731,line732,line733,line734,line735,line736,line737,
+  line738,line739,line73A,line73B,line73C,line73D,line73E,line73F,
+  line800,line801,line802,line803,line804,line805,line806,line807,
+  line808,line809,line80A,line80B,line80C,line80D,line80E,line80F,
+  line810,line811,line812,line813,line814,line815,line816,line817,
+  line818,line819,line81A,line81B,line81C,line81D,line81E,line81F,
+  line820,line821,line822,line823,line824,line825,line826,line827,
+  line828,line829,line82A,line82B,line82C,line82D,line82E,line82F,
+  line830,line831,line832,line833,line834,line835,line836,line837,
+  line838,line839,line83A,line83B,line83C,line83D,line83E,line83F,
+  line900,line901,line902,line903,line904,line905,line906,line907,
+  line908,line909,line90A,line90B,line90C,line90D,line90E,line90F,
+  line910,line911,line912,line913,line914,line915,line916,line917,
+  line918,line919,line91A,line91B,line91C,line91D,line91E,line91F,
+  line920,line921,line922,line923,line924,line925,line926,line927,
+  line928,line929,line92A,line92B,line92C,line92D,line92E,line92F,
+  line930,line931,line932,line933,line934,line935,line936,line937,
+  line938,line939,line93A,line93B,line93C,line93D,line93E,line93F,
+  lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,
+  lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,
+  lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,
+  lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,
+  lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,
+  lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,
+  lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,
+  lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,lineA00,
+  lineB00,lineB01,lineB02,lineB03,lineB04,lineB05,lineB06,lineB07,
+  lineB08,lineB09,lineB0A,lineB0B,lineB0C,lineB0D,lineB0E,lineB0F,
+  lineB10,lineB11,lineB12,lineB13,lineB14,lineB15,lineB16,lineB17,
+  lineB18,lineB19,lineB1A,lineB1B,lineB1C,lineB1D,lineB1E,lineB1F,
+  lineB20,lineB21,lineB22,lineB23,lineB24,lineB25,lineB26,lineB27,
+  lineB28,lineB29,lineB2A,lineB2B,lineB2C,lineB2D,lineB2E,lineB2F,
+  lineB30,lineB31,lineB32,lineB33,lineB34,lineB35,lineB36,lineB37,
+  lineB38,lineB39,lineB3A,lineB3B,lineB3C,lineB3D,lineB3E,lineB3F,
+  lineC00,lineC01,lineC02,lineC03,lineC04,lineC05,lineC06,lineC07,
+  lineC08,lineC09,lineC0A,lineC0B,lineC0C,lineC0D,lineC0E,lineC0F,
+  lineC10,lineC11,lineC12,lineC13,lineC14,lineC15,lineC16,lineC17,
+  lineC18,lineC19,lineC1A,lineC1B,lineC1C,lineC1D,lineC1E,lineC1F,
+  lineC20,lineC21,lineC22,lineC23,lineC24,lineC25,lineC26,lineC27,
+  lineC28,lineC29,lineC2A,lineC2B,lineC2C,lineC2D,lineC2E,lineC2F,
+  lineC30,lineC31,lineC32,lineC33,lineC34,lineC35,lineC36,lineC37,
+  lineC38,lineC39,lineC3A,lineC3B,lineC3C,lineC3D,lineC3E,lineC3F,
+  lineD00,lineD01,lineD02,lineD03,lineD04,lineD05,lineD06,lineD07,
+  lineD08,lineD09,lineD0A,lineD0B,lineD0C,lineD0D,lineD0E,lineD0F,
+  lineD10,lineD11,lineD12,lineD13,lineD14,lineD15,lineD16,lineD17,
+  lineD18,lineD19,lineD1A,lineD1B,lineD1C,lineD1D,lineD1E,lineD1F,
+  lineD20,lineD21,lineD22,lineD23,lineD24,lineD25,lineD26,lineD27,
+  lineD28,lineD29,lineD2A,lineD2B,lineD2C,lineD2D,lineD2E,lineD2F,
+  lineD30,lineD31,lineD32,lineD33,lineD34,lineD35,lineD36,lineD37,
+  lineD38,lineD39,lineD3A,lineD3B,lineD3C,lineD3D,lineD3E,lineD3F,
+  lineE00,lineE01,lineE02,lineE03,lineE04,lineE05,lineE06,lineE07,
+  lineE08,lineE09,lineE0A,lineE0B,lineE0C,lineE0D,lineE0E,lineE0F,
+  lineE10,lineE11,lineE12,lineE13,lineE14,lineE15,lineE16,lineE17,
+  lineE18,lineE19,lineE1A,lineE1B,lineE1C,lineE1D,lineE1E,lineE1F,
+  lineE20,lineE21,lineE22,lineE23,lineE24,lineE25,lineE26,lineE27,
+  lineE28,lineE29,lineE2A,lineE2B,lineE2C,lineE2D,lineE2E,lineE2F,
+  lineE30,lineE31,lineE32,lineE33,lineE34,lineE35,lineE36,lineE37,
+  lineE38,lineE39,lineE3A,lineE3B,lineE3C,lineE3D,lineE3E,lineE3F,
+  lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,
+  lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,
+  lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,
+  lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,
+  lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,
+  lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,
+  lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,
+  lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,lineF00,
+};
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines68.c Added

@@ -0,0 +1,60 @@
+/*
+ * @file emu68/lines68.c
+ * @brief The whole 68k emulator in a single file.
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifndef EMU68_MONOLITIC
+# error "EMU68_MONOLITIC should be defined when compiling this file."
+#else
+# include "emu68_api.h"
+
+/* Monolitic build: remove all forced inlines */
+# undef inline
+# define inline
+
+#if defined(__GNUC__) && (__GNUC__*100+__GNUC_MINOR__ >= 402)
+ #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+# include "lines68.h"
+# include "lines/line0.c"
+# include "lines/line1.c"
+# include "lines/line2.c"
+# include "lines/line3.c"
+# include "lines/line4.c"
+# include "lines/line5.c"
+# include "lines/line6.c"
+# include "lines/line7.c"
+# include "lines/line8.c"
+# include "lines/line9.c"
+# include "lines/lineA.c"
+# include "lines/lineB.c"
+# include "lines/lineC.c"
+# include "lines/lineD.c"
+# include "lines/lineE.c"
+# include "lines/lineF.c"
+# include "lines/table.c"
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/lines68.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/macro68.h Added

@@ -0,0 +1,366 @@
+/**
+ * @ingroup lib_emu68
+ * @file emu68/macro68.h
+ * @brief 68K instruction emulation macro definitions.
+ * @author Benjamin Gerard
+ * @date 1999/13/03
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_MACRO68_H
+#define EMU68_MACRO68_H
+
+/**
+ * @cond emu68macros
+ */
+
+/* Determine what instruction to inline.
+ *
+ * EMU68_INLINE_LVL
+ */
+
+#define EMU68_INLINE_MAX 1000 /**< Inlines all, */
+#define EMU68_INLINE_RAR 999 /**< Inlines almost all */
+#define EMU68_INLINE_MID 50 /**< Inlines balanced */
+#define EMU68_INLINE_NON 0 /**< Inlines not forced */
+#define EMU68_INLINE_YES 1 /**< Inline almost all */
+
+#ifndef EMU68_INLINE_LVL
+# if defined(EMU68_INLINE_ALL)
+# define EMU68_INLINE_LVL EMU68_INLINE_MAX /* All would be inlined */
+# elif defined(EMU68_MONOLITIC)
+# define EMU68_INLINE_LVL EMU68_INLINE_MAX /* Monolitic; compiler rules */
+# elif defined(DEBUG)
+# define EMU68_INLINE_LVL EMU68_INLINE_NON /* Debug; do not force */
+# elif defined(LIBSC68_NDEBUG)
+# define EMU68_INLINE_LVL EMU68_INLINE_YES /* Release; almost all */
+# else
+# define EMU68_INLINE_LVL EMU68_INLINE_MID /* Standard; balanced */
+# endif
+#endif
+
+
+/* Instruction family (cnt)
+ ------------------ --- */
+#define EMU68_INLINE_ARI 278 /* Arithmetic (278) */
+#define EMU68_INLINE_BCD EMU68_INLINE_RAR /* Binary coded decimal ( 6) */
+#define EMU68_INLINE_BIT 36 /* Bit Operation ( 36) */
+#define EMU68_INLINE_LOG 171 /* Logic (171) */
+#define EMU68_INLINE_SHT 56 /* Shifting ( 56) */
+#define EMU68_INLINE_TST 240 /* Test and move (240) */
+#define EMU68_INLINE_BSR EMU68_INLINE_YES /* Branch ( ) */
+
+
+#define ADDCYCLE(N) inl_addcycle68(emu68,N)
+#define SETCYCLE(N) inl_setcycle68(emu68,N)
+#define EXCEPTION(VECTOR,LEVEL) inl_exception68(emu68,VECTOR,LEVEL)
+
+
+/* ,---------------------------------------------------------------------.
+ * | BRANCH |
+ * `---------------------------------------------------------------------'
+ */
+
+#if EMU68_INLINE_BSR < EMU68_INLINE_LVL
+# define JSR(PC) inl_jsr68(emu68,PC)
+# define JMP(PC) inl_jmp68(emu68,PC)
+#else
+# define JSR(PC) jsr68(emu68,PC)
+# define JMP(PC) jmp68(emu68,PC)
+#endif
+
+/* ,---------------------------------------------------------------------.
+ * | BIT MANIPULATION |
+ * `---------------------------------------------------------------------'
+ */
+
+#if EMU68_INLINE_LOG < EMU68_INLINE_LVL
+# define _BTST(V,BIT) inl_btst68(emu68, V, BIT)
+# define _BCHG(V,BIT) inl_bchg68(emu68, V, BIT)
+# define _BCLR(V,BIT) inl_bclr68(emu68, V, BIT)
+# define _BSET(V,BIT) inl_bset68(emu68, V, BIT)
+#else
+# define _BTST(V,BIT) btst68(emu68, V, BIT)
+# define _BCHG(V,BIT) bchg68(emu68, V, BIT)
+# define _BCLR(V,BIT) bclr68(emu68, V, BIT)
+# define _BSET(V,BIT) bset68(emu68, V, BIT)
+#endif
+#define BTSTB(R, V, BIT) _BTST(V, BIT & 7)
+#define BTSTL(R, V, BIT) _BTST(V, BIT & 31)
+#define BCHGB(R, V, BIT) R = _BCHG(V, BIT & 7)
+#define BCHGL(R, V, BIT) R = _BCHG(V, BIT & 31)
+#define BSETB(R, V, BIT) R = _BSET(V, BIT & 7)
+#define BSETL(R, V, BIT) R = _BSET(V, BIT & 31)
+#define BCLRB(R, V, BIT) R = _BCLR(V, BIT & 7)
+#define BCLRL(R, V, BIT) R = _BCLR(V, BIT & 31)
+
+/* ,---------------------------------------------------------------------.
+ * | MOVE AND TEST |
+ * `---------------------------------------------------------------------'
+ */
+
+#if EMU68_INLINE_TST < EMU68_INLINE_LVL
+# define _TST(A) inl_tst68(emu68, A)
+# define _TAS(A) inl_tas68(emu68, A)
+#else
+# define _TST(A) tst68(emu68, A)
+# define _TAS(A) tas68(emu68, A)
+#endif
+#define TSTB(R, A) _TST(A)
+#define TSTW(R, A) _TST(A)
+#define TSTL(R, A) _TST(A)
+#define TASB(R, A) R = _TAS(A)
+
+#define MOVEB(A) _TST(A)
+#define MOVEW(A) _TST(A)
+#define MOVEL(A) _TST(A)
+
+#define EXTW(A) _TST(A)
+#define EXTL(A) _TST(A)
+
+
+/* ,---------------------------------------------------------------------.
+ * | LOGIC |
+ * `---------------------------------------------------------------------'
+ */
+
+#if EMU68_INLINE_LOG < EMU68_INLINE_LVL
+# define _AND68(A,B) inl_and68(emu68, A, B)
+# define _ORR68(A,B) inl_orr68(emu68, A, B)
+# define _EOR68(A,B) inl_eor68(emu68, A, B)
+# define _NOT68(A) inl_not68(emu68, A)
+#else
+# define _AND68(A,B) and68(emu68, A, B)
+# define _ORR68(A,B) orr68(emu68, A, B)
+# define _EOR68(A,B) eor68(emu68, A, B)
+# define _NOT68(A) not68(emu68, A)
+#endif
+
+#define ANDB(S, A, B) S = _AND68(A, B)
+#define ANDW(S, A, B) S = _AND68(A, B)
+#define ANDL(S, A, B) S = _AND68(A, B)
+#define ORRB(S, A, B) S = _ORR68(A, B)
+#define ORRW(S, A, B) S = _ORR68(A, B)
+#define ORRL(S, A, B) S = _ORR68(A, B)
+#define EORB(S, A, B) S = _EOR68(A, B)
+#define EORW(S, A, B) S = _EOR68(A, B)
+#define EORL(S, A, B) S = _EOR68(A, B)
+#define NOTB(S, A) S = _NOT68(A|~NRM_BYTE_MSK)
+#define NOTW(S, A) S = _NOT68(A|~NRM_WORD_MSK)
+#define NOTL(S, A) S = _NOT68(A|~NRM_LONG_MSK)
+
+
+#define BYTE_SR_X ( (int68_t)(REG68.sr&SR_X) << (BYTE_FIX-SR_X_BIT) )
+#define WORD_SR_X ( (int68_t)(REG68.sr&SR_X) << (WORD_FIX-SR_X_BIT) )
+#define LONG_SR_X ( (int68_t)((REG68.sr>>SR_X_BIT) & 1) << LONG_FIX )
+
+
+/* ,---------------------------------------------------------------------.
+ * | ARITHMETIC |
+ * `---------------------------------------------------------------------'
+ */
+
+#if EMU68_INLINE_ARI < EMU68_INLINE_LVL
+# define _ADD68(A, B, X) inl_add68(emu68, A, B, X)
+# define _SUB68(A, B, X) inl_sub68(emu68, A, B, X)
+# define _CMP68(A, B) inl_cmp68(emu68, A, B )
+# define _NEG68(B, X) inl_neg68(emu68, B, X)
+# define _CLR68() inl_clr68(emu68)
+# define _MULS(A, B) inl_muls68(emu68, A, B)
+# define _MULU(A, B) inl_mulu68(emu68, A, B)
+# define _DIVS(A, B) inl_divs68(emu68, A, B)
+# define _DIVU(A, B) inl_divu68(emu68, A, B)
+#else
+# define _ADD68(A, B, X) add68(emu68, A, B, X)
+# define _SUB68(A, B, X) sub68(emu68, A, B, X)
+# define _CMP68(A, B) cmp68(emu68, A, B )
+# define _NEG68(B, X) neg68(emu68, B, X)
+# define _CLR68() clr68(emu68)
+# define _MULS(A, B) muls68(emu68, A, B)
+# define _MULU(A, B) mulu68(emu68, A, B)
+# define _DIVS(A, B) divs68(emu68, A, B)
+# define _DIVU(A, B) divu68(emu68, A, B)
+#endif
+#define _ADDA(A, B) (B) + (A)
+#define _SUBA(A, B) (B) - (A)
+#define _CMPA(A, B) _CMP68(A, B)
+
+#define ADDB(S, A, B) S = _ADD68(A, B, 0)
+#define ADDW(S, A, B) S = _ADD68(A, B, 0)
+#define ADDL(S, A, B) S = _ADD68(A, B, 0)
+#define SUBB(S, A, B) S = _SUB68(A, B, 0)
+#define SUBW(S, A, B) S = _SUB68(A, B, 0)
+#define SUBL(S, A, B) S = _SUB68(A, B, 0)
+#define CMPB(A, B) _CMP68(A, B )
+#define CMPW(A, B) _CMP68(A, B )
+#define CMPL(A, B) _CMP68(A, B )
+#define NEGB(S, B) S = _NEG68( B, 0)
+#define NEGW(S, B) S = _NEG68( B, 0)
+#define NEGL(S, B) S = _NEG68( B, 0)
+#define CLRB(S, B) S = _CLR68()
+#define CLRW(S, B) S = _CLR68()
+#define CLRL(S, B) S = _CLR68()
+
+#define ADDXB(S, A, B) S = _ADD68(A, B, BYTE_SR_X)
+#define ADDXW(S, A, B) S = _ADD68(A, B, WORD_SR_X)
+#define ADDXL(S, A, B) S = _ADD68(A, B, LONG_SR_X)
+#define SUBXB(S, A, B) S = _SUB68(A, B, BYTE_SR_X)
+#define SUBXW(S, A, B) S = _SUB68(A, B, WORD_SR_X)
+#define SUBXL(S, A, B) S = _SUB68(A, B, LONG_SR_X)
+#define NEGXB(S, B) S = _NEG68( B, BYTE_SR_X)
+#define NEGXW(S, B) S = _NEG68( B, WORD_SR_X)
+#define NEGXL(S, B) S = _NEG68( B, LONG_SR_X)
+
+#define ADDAW(S, A, B) S = _ADDA(A, B)
+#define ADDAL(S, A, B) S = _ADDA(A, B)
+#define SUBAW(S, A, B) S = _SUBA(A, B)
+#define SUBAL(S, A, B) S = _SUBA(A, B)
+#define CMPAW(A, B) _CMPA(A, B)
+#define CMPAL(A, B) _CMPA(A, B)
+
+#define MULSW(S, A, B) S = _MULS(A, B)
+#define MULUW(S, A, B) S = _MULU(A, B)
+#define DIVSW(S, A, B) S = _DIVS(A, B)
+#define DIVUW(S, A, B) S = _DIVU(A, B)
+
+
+/* ,---------------------------------------------------------------------.
+ * | SHIFTING |
+ * `---------------------------------------------------------------------'
+ */
+
+#if EMU68_INLINE_SHT < EMU68_INLINE_LVL
+# define _LSL(D,CNT,SZ) inl_lsl68(emu68,D,CNT,SZ)
+# define _LSR(D,CNT,SZ) inl_lsr68(emu68,D,CNT,SZ)
+# define _ASL(D,CNT,SZ) inl_asl68(emu68,D,CNT,SZ)
+# define _ASR(D,CNT,SZ) inl_asr68(emu68,D,CNT,SZ)
+# define _ROL(D,CNT,SZ) inl_rol68(emu68,D,CNT,SZ)
+# define _ROR(D,CNT,SZ) inl_ror68(emu68,D,CNT,SZ)
+# define _ROXL(D,CNT,SZ) inl_roxl68(emu68,D,CNT,SZ)
+# define _ROXR(D,CNT,SZ) inl_roxr68(emu68,D,CNT,SZ)
+#else
+# define _LSL(D,CNT,SZ) lsl68(emu68,D,CNT,SZ)
+# define _LSR(D,CNT,SZ) lsr68(emu68,D,CNT,SZ)
+# define _ASL(D,CNT,SZ) asl68(emu68,D,CNT,SZ)
+# define _ASR(D,CNT,SZ) asr68(emu68,D,CNT,SZ)
+# define _ROL(D,CNT,SZ) rol68(emu68,D,CNT,SZ)
+# define _ROR(D,CNT,SZ) ror68(emu68,D,CNT,SZ)
+# define _ROXL(D,CNT,SZ) roxl68(emu68,D,CNT,SZ)
+# define _ROXR(D,CNT,SZ) roxr68(emu68,D,CNT,SZ)
+#endif
+
+
+#define LSRB(R, A, B) R = _LSR(A, B, 8-1)
+#define LSRW(R, A, B) R = _LSR(A, B, 16-1)
+#define LSRL(R, A, B) R = _LSR(A, B, 32-1)
+#define LSLB(R, A, B) R = _LSL(A, B, 8-1)
+#define LSLW(R, A, B) R = _LSL(A, B, 16-1)
+#define LSLL(R, A, B) R = _LSL(A, B, 32-1)
+
+#define ASRB(R, A, B) R = _ASR(A, B, 8-1)
+#define ASRW(R, A, B) R = _ASR(A, B, 16-1)
+#define ASRL(R, A, B) R = _ASR(A, B, 32-1)
+#define ASLB(R, A, B) R = _ASL(A, B, 8-1)
+#define ASLW(R, A, B) R = _ASL(A, B, 16-1)
+#define ASLL(R, A, B) R = _ASL(A, B, 32-1)
+
+#define RORB(R, A, B) R = _ROR(A, B, 8-1)
+#define RORW(R, A, B) R = _ROR(A, B, 16-1)
+#define RORL(R, A, B) R = _ROR(A, B, 32-1)
+#define ROLB(R, A, B) R = _ROL(A, B, 8-1)
+#define ROLW(R, A, B) R = _ROL(A, B, 16-1)
+#define ROLL(R, A, B) R = _ROL(A, B, 32-1)
+
+#define ROXRB(R, A, B) R = _ROXR(A ,B, 8-1)
+#define ROXRW(R, A, B) R = _ROXR(A ,B, 16-1)
+#define ROXRL(R, A, B) R = _ROXR(A ,B, 32-1)
+#define ROXLB(R, A, B) R = _ROXL(A ,B, 8-1)
+#define ROXLW(R, A, B) R = _ROXL(A ,B, 16-1)
+#define ROXLL(R, A, B) R = _ROXL(A ,B, 32-1)
+
+
+
+/* ,---------------------------------------------------------------------.
+ * | BINARY CODED DECIMAL |
+ * `---------------------------------------------------------------------'
+ */
+
+#if EMU68_INLINE_BCD < EMU68_INLINE_LVL
+# define _ABCD(A,B) inl_abcd68(emu68, A, B)
+# define _SBCD(A,B) inl_sbcd68(emu68, A, B)
+# define _NBCD(A) inl_nbcd68(emu68, A)
+#else
+# define _ABCD(A,B) abcd68(emu68, A, B)
+# define _SBCD(A,B) sbcd68(emu68, A, B)
+# define _NBCD(A) nbcd68(emu68, A)
+#endif
+#define ABCDB(S, A, B) S = _ABCD(A, B)
+#define SBCDB(S, A, B) S = _SBCD(A, B)
+#define NBCDB(S, A) S = _NBCD(A)
+
+
+/* ,---------------------------------------------------------------------.
+ * | INSTRUCTIONS ALMOST NEVER INLINED |
+ * `---------------------------------------------------------------------'
+ */
+
+#if EMU68_INLINE_RAR < EMU68_INLINE_LVL
+# define CHKW(A,B) inl_chk68(emu68, A, B)
+#else
+# define CHKW(A,B) chk68(emu68, A, B)
+#endif
+
+/* ,---------------------------------------------------------------------.
+ * | INSTRUCTIONS ALMOST ALWAYS INLINED |
+ * `---------------------------------------------------------------------'
+ */
+
+#if EMU68_INLINE_ONE < EMU68_INLINE_LVL
+# define SWAP(R) inl_swap68(emu68,R)
+# define RTS inl_rts68(emu68)
+# define RTE inl_rte68(emu68)
+# define RTR inl_rtr68(emu68)
+# define ILLEGAL inl_illegal68(emu68)
+# define TRAP(N) inl_trap68(emu68,N)
+# define TRAPV inl_trapv68(emu68)
+# define NOP inl_nop68(emu68)
+# define RESET inl_reset68(emu68)
+# define STOP inl_stop68(emu68)
+# define LINK(R) inl_link68(emu68,R)
+# define UNLK(R) inl_unlk68(emu68,R)
+# define LINEA inl_linea68(emu68)
+# define LINEF inl_linef68(emu68)
+# define EXG(RX,RY) inl_exg68(emu68,RX,RY)
+#else
+# define SWAP(R) swap68(emu68,R)
+# define RTS rts68(emu68)
+# define RTE rte68(emu68)
+# define RTR rtr68(emu68)
+# define ILLEGAL illegal68(emu68)
+# define TRAP(N) trap68(emu68,N)
+# define TRAPV trapv68(emu68)
+# define NOP nop68(emu68)
+# define RESET reset68(emu68)
+# define STOP stop68(emu68)
+# define LINK(R) link68(emu68,R)
+# define UNLK(R) unlk68(emu68,R)
+# define LINEA linea68(emu68)
+# define LINEF linef68(emu68)
+# define EXG(RX,RY) exg68(emu68,RX,RY)
+#endif
+
+/* ,---------------------------------------------------------------------.
+ * | CODE CONDITIONS TABLE |
+ * `---------------------------------------------------------------------'
+ */
+
+#define SCC(CC) scc68CC(emu68)
+#define BCC(PC,CC) bcc68CC(emu68,PC)
+#define DBCC(DN,CC) dbcc68CC(emu68,DN)
+
+/**
+ * @endcond
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/mem68.c Added

@@ -0,0 +1,454 @@
+/*
+ * @file emu68/mem68.c
+ * @brief 68K memory and IO access
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/* generated config include */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "mem68.h"
+#include "error68.h"
+#include "emu68.h"
+#include "io68/io68.h"
+#include "assert68.h"
+
+/* ,--------------------------------------------------------.
+ * | |
+ * | 68000 memory access functions |
+ * | |
+ * | These functions don't check address/bus access nor |
+ * | and privilege access violation. |
+ * | |
+ * `--------------------------------------------------------'
+ */
+
+
+/* ,--------------------------------------------------------.
+ * | Debug IO |
+ * `--------------------------------------------------------'
+ */
+
+static void memchk_rb(io68_t * const io) {
+ emu68_t * const emu68 = io->emu68;
+ const addr68_t addr = emu68->bus_addr;
+ assert(emu68->chk);
+ emu68->bus_data = emu68->memaddr&MEMMSK68;
+ chkframe_b(emu68, EMU68_R);
+}
+
+static void memchk_rw(io68_t * const io) {
+ emu68_t * const emu68 = io->emu68;
+ const u8 * const mem = emu68->mem+(emu68->bus_addr&MEMMSK68);
+ assert(emu68->chk);
+ emu68->bus_data = (mem0<<8) + mem1;
+ chkframe_w(emu68, EMU68_R);
+}
+
+static void memchk_rl(io68_t * const io) {
+ emu68_t * const emu68 = io->emu68;
+ const u8 * const mem = emu68->mem+(emu68->bus_addr&MEMMSK68);
+ assert(emu68->chk);
+ emu68->bus_data = (mem0<<24) + (mem1<<16) + (mem2<<8) + mem3;
+ chkframe_l(emu68, EMU68_R);
+}
+
+static void memchk_wb(io68_t * const io) {
+ emu68_t * const emu68 = io->emu68;
+ const addr68_t addr = emu68->bus_addr;
+ assert(emu68->chk);
+ emu68->memaddr&MEMMSK68 = emu68->bus_data;
+ chkframe_b(emu68, EMU68_W);
+}
+
+static void memchk_ww(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ u8 * mem = emu68->mem + (emu68->bus_addr&MEMMSK68);
+ int68_t v = emu68->bus_data;
+ assert(emu68->chk);
+ mem1 = v; v>>=8; mem0 = v;
+ chkframe_w(emu68, EMU68_W);
+}
+
+static void memchk_wl(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ u8 * mem = emu68->mem + (emu68->bus_addr&MEMMSK68);
+ int68_t v = emu68->bus_data;
+ assert(emu68->chk);
+ mem3 = v; v>>=8; mem2 = v; v>>=8; mem1 = v; v>>=8; mem0 = v;
+ chkframe_l(emu68, EMU68_W);
+}
+
+/* ,--------------------------------------------------------.
+ * | Fault IO |
+ * `--------------------------------------------------------'
+ */
+
+static void fault_rab(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ assert(emu68);
+ emu68_error_add(emu68, "Invalid byte R access pc:$%06x $%08x",
+ (unsigned)(u32)emu68->inst_pc,
+ (unsigned)(u32)emu68->bus_addr);
+ emu68->bus_data = -1;
+ emu68->status = EMU68_HLT;
+}
+
+static void fault_raw(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ assert(emu68);
+ emu68_error_add(emu68, "Invalid word R access pc:$%06x $%08x",
+ (unsigned)(u32)emu68->inst_pc,
+ (unsigned)(u32)emu68->bus_addr);
+ emu68->bus_data = -1;
+ emu68->status = EMU68_HLT;
+}
+
+static void fault_ral(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ assert(emu68);
+ emu68_error_add(emu68, "Invalid long R access pc:$%06x $%08x",
+ (unsigned)(u32)emu68->inst_pc,
+ (unsigned)(u32)emu68->bus_addr);
+ emu68->bus_data = -1;
+ emu68->status = EMU68_HLT;
+}
+
+static void fault_wab(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ assert(emu68);
+ emu68_error_add(emu68, "Invalid byte W access pc:$%06x $%08x <- $%02x",
+ (unsigned)(u32)emu68->inst_pc,
+ (unsigned)(u32)emu68->bus_addr,
+ (unsigned)(u8)emu68->bus_data);
+ emu68->status = EMU68_HLT;
+}
+
+static void fault_waw(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ assert(emu68);
+ emu68_error_add(emu68, "Invalid word W access pc:$%06x $%08x <- $%02x",
+ (unsigned)(u32)emu68->inst_pc,
+ (unsigned)(u32)emu68->bus_addr,
+ (unsigned)(u16)emu68->bus_data);
+ emu68->status = EMU68_HLT;
+}
+
+static void fault_wal(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ assert(emu68);
+ emu68_error_add(emu68, "Invalid long W access pc:$%06x $%08x <- $%02x",
+ (unsigned)(u32)emu68->inst_pc,
+ (unsigned)(u32)emu68->bus_addr,
+ (unsigned)(u32)emu68->bus_data);
+ emu68->status = EMU68_HLT;
+}
+
+static void nop_rwa(io68_t * const io) {}
+
+static void no_destroy(io68_t * const io) {}
+
+static const io68_t fault_io = {
+ 0,"Fault",0,0,
+ fault_rab,fault_raw,fault_ral,
+ fault_wab,fault_waw,fault_wal,
+ 0,0,0,0,no_destroy
+};
+
+static const io68_t ram_io = {
+ 0,"RAM",0,0,
+ memchk_rb,memchk_rw,memchk_rl,
+ memchk_wb,memchk_ww,memchk_wl,
+ 0,0,0,0,no_destroy
+};
+
+static const io68_t nop_io = {
+ 0,"NOP",0,0,
+ nop_rwa,nop_rwa,nop_rwa,
+ nop_rwa,nop_rwa,nop_rwa,
+ 0,0,0,0,no_destroy
+};
+
+
+/* ,--------------------------------------------------------.
+ * | Read functions |
+ * `--------------------------------------------------------'
+ */
+
+void mem68_read_b(emu68_t * const emu68)
+{
+ const addr68_t addr = emu68->bus_addr;
+
+ if (mem68_is_io(addr)) {
+ io68_t * const io = emu68->mapped_io(u8)((addr)>>8);
+ io->r_byte(io);
+ } else if (!emu68->memio) {
+ emu68->bus_data = emu68->memaddr&MEMMSK68;
+ } else {
+ emu68->memio->r_byte(emu68->memio);
+ }
+}
+
+void mem68_read_w(emu68_t * const emu68)
+{
+ const addr68_t addr = emu68->bus_addr;
+ if (mem68_is_io(addr)) {
+ io68_t * const io = emu68->mapped_io(u8)((addr)>>8);
+ io->r_word(io);
+ } else if (!emu68->memio) {
+ const u8 * const mem = emu68->mem+(addr&MEMMSK68);
+ emu68->bus_data = (mem0<<8) + mem1;
+ } else {
+ emu68->memio->r_word(emu68->memio);
+ }
+}
+
+void mem68_read_l(emu68_t * const emu68)
+{
+ const addr68_t addr = emu68->bus_addr;
+ if (mem68_is_io(addr)) {
+ io68_t * const io = emu68->mapped_io(u8)((addr)>>8);
+ io->r_long(io);
+ } else if (!emu68->memio) {
+ const u8 * const mem = emu68->mem+(addr&MEMMSK68);
+ emu68->bus_data = (mem0<<24) + (mem1<<16) + (mem2<<8) + mem3;
+ } else {
+ emu68->memio->r_long(emu68->memio);
+ }
+}
+
+/* ,--------------------------------------------------------.
+ * | Write functions |
+ * `--------------------------------------------------------'
+ */
+
+void mem68_write_b(emu68_t * const emu68)
+{
+ const addr68_t addr = emu68->bus_addr;
+ if (mem68_is_io(addr)) {
+ io68_t * const io = emu68->mapped_io(u8)((addr)>>8);
+ io->w_byte(io);
+ } else if (!emu68->memio) {
+ emu68->memaddr&MEMMSK68 = emu68->bus_data;
+ } else {
+ emu68->memio->w_byte(emu68->memio);
+ }
+}
+
+void mem68_write_w(emu68_t * const emu68)
+{
+ const addr68_t addr = emu68->bus_addr;
+ if (mem68_is_io(addr)) {
+ io68_t * const io = emu68->mapped_io(u8)((addr)>>8);
+ io->w_word(io);
+ } else if (!emu68->memio) {
+ u8 * mem = emu68->mem + (addr&MEMMSK68);
+ int68_t v = emu68->bus_data;
+ mem1 = v; v>>=8; mem0 = v;
+ } else {
+ emu68->memio->w_word(emu68->memio);
+ }
+}
+
+void mem68_write_l(emu68_t * const emu68)
+{
+ const addr68_t addr = emu68->bus_addr;
+ if (mem68_is_io(addr)) {
+ io68_t * const io = emu68->mapped_io(u8)((addr)>>8);
+ io->w_long(io);
+ } else if (!emu68->memio) {
+ u8 * mem = emu68->mem + (addr&MEMMSK68);
+ int68_t v = emu68->bus_data;
+ mem3 = v; v>>=8; mem2 = v; v>>=8; mem1 = v; v>>=8; mem0 = v;
+ } else {
+ emu68->memio->w_long(emu68->memio);
+ }
+}
+
+
+/* Read 68000 (PC)+ word
+ * - This version assume PC is in 68000 memory
+ * as long I don't try to make 68000 execute
+ * @ IO address, I assume it is not possible !
+ */
+int68_t mem68_nextw(emu68_t * const emu68)
+{
+ const addr68_t addr = REG68.pc;
+ io68_t * const io =
+ mem68_is_io(addr)
+ ? emu68->mapped_io(u8)((addr)>>8)
+ : emu68->memio
+ ;
+ REG68.pc += 2;
+
+ if (!io) {
+ u8 * const mem = emu68->mem + ( addr & MEMMSK68 );
+ return ( (int68_t) (s8)mem0 << 8 ) | mem1;
+ } else {
+ emu68->bus_addr = addr;
+ io->r_word(io);
+ return (int68_t)(s16)emu68->bus_data;
+ }
+}
+
+int68_t mem68_nextl(emu68_t * const emu68)
+{
+ const addr68_t addr = REG68.pc;
+ io68_t * const io =
+ mem68_is_io(addr)
+ ? emu68->mapped_io(u8)((addr)>>8)
+ : emu68->memio
+ ;
+ REG68.pc += 4;
+
+ if (!io) {
+ u8 * const mem= emu68->mem + ( addr & MEMMSK68 );
+ return
+ ( (int68_t)(s8)mem0 << 24 ) |
+ ( (int68_t) mem1 << 16 ) |
+ ( (int68_t) mem2 << 8 ) |
+ ( mem3 ) ;
+ } else {
+ emu68->bus_addr = addr;
+ io->r_long(io);
+ return (int68_t)(s32)emu68->bus_data;
+ }
+}
+
+void mem68_pushw(emu68_t * const emu68, const int68_t v)
+{
+ REG68.a7 -= 2;
+ write_W(REG68.a7,v);
+}
+
+void mem68_pushl(emu68_t * const emu68, const int68_t v)
+{
+ REG68.a7 -= 4;
+ write_L(REG68.a7,v);
+}
+
+int68_t mem68_popl(emu68_t * const emu68)
+{
+ int68_t v = (s32)read_L(REG68.a7);
+ REG68.a7 += 4;
+ return v;
+}
+
+int68_t mem68_popw(emu68_t * const emu68)
+{
+ s32 v = read_W(REG68.a7);
+ REG68.a7 += 2;
+ return v;
+}
+
+void emu68_pushl(emu68_t * const emu68, int68_t val)
+{
+ if (emu68)
+ mem68_pushl(emu68, val);
+}
+
+void emu68_pushw(emu68_t * const emu68, int68_t val)
+{
+ if (emu68)
+ mem68_pushw(emu68, val);
+}
+
+
+int68_t emu68_popl(emu68_t * const emu68)
+{
+ return emu68
+ ? mem68_popl(emu68)
+ : -1
+ ;
+}
+
+int68_t emu68_popw(emu68_t * const emu68)
+{
+ return emu68
+ ? mem68_popw(emu68)
+ : -1
+ ;
+}
+
+/* Init memory quick acces table for SC68
+ */
+void emu68_mem_init(emu68_t * const emu68)
+{
+ if (emu68) {
+ /* Copy RAM and Fault IOs for private use. */
+ emu68->ramio = ram_io;
+ emu68->ramio.emu68 = emu68;
+ emu68->ramio.addr_lo = 0;
+ emu68->ramio.addr_hi = emu68->memmsk;
+
+ emu68->errio = fault_io;
+ emu68->errio.emu68 = emu68;
+ emu68->errio.addr_lo = mem68_is_io(0xFFFFFF);
+ emu68->errio.addr_hi = 0xFFFFFFFF;
+
+ emu68->nopio = nop_io;
+ emu68->nopio.emu68 = emu68;
+ emu68->nopio.addr_lo = mem68_is_io(0xFFFFFF);
+ emu68->nopio.addr_hi = 0xFFFFFFFF;
+
+ emu68->memio = (emu68->chk) ? &emu68->ramio : 0;
+ }
+ emu68_mem_reset(emu68);
+}
+
+void emu68_mem_destroy(emu68_t * const emu68)
+{
+ if (emu68) {
+ emu68->errio.emu68 = 0;
+ emu68->ramio.emu68 = 0;
+ io68_destroy(emu68->memio);
+ emu68->memio = 0;
+ }
+}
+
+/* Reset memory quick acces table
+ */
+void emu68_mem_reset(emu68_t * const emu68)
+{
+ if (emu68) {
+ int i;
+ for(i=0; i<256; i++)
+ emu68_mem_reset_area(emu68, i);
+ }
+}
+
+/* Reset memory acces control area to normal state :
+ */
+void emu68_mem_reset_area(emu68_t * const emu68, u8 area)
+{
+ emu68->mapped_ioarea =
+ emu68->chk ? &emu68->errio : &emu68->nopio;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/mem68.h Added

@@ -0,0 +1,519 @@
+/**
+ * @ingroup lib_emu68
+ * @file emu68/mem68.h
+ * @brief 68k memory and IO manager header.
+ * @author Benjamin Gerard
+ * @date 1999/03/13
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_MEM68_H
+#define EMU68_MEM68_H
+
+#include "emu68_api.h"
+#include "struct68.h"
+
+/**
+ * @defgroup lib_emu68_mem 68k memory and IO manager
+ * @ingroup lib_emu68
+ * @brief Handling memory and I/O access.
+ *
+ * EMU68 memory manager assumes that all addresses in the lowest
+ * half part of address space are memory access. A simple bit test
+ * over most signifiant bit (23) of address allow to choose beetween
+ * memory or eventual IO access. In case of memory access, address
+ * is masked to fit available 68K onboard memory. Overflow does NOT
+ * generate address error. IO access are performed towards quick
+ * access tables. There are 6 acccess tables: for each read and
+ * write access in 3 sizes (byte, word and long). Each of this 6
+ * tables has 256 entries filled with a pointer to suitable
+ * function. At init time, the entries of all tables are initialized
+ * to access 68K onboard memory. When an IO is plugged by user, it
+ * is mapped somewhere in 68K address space. EMU68 memory manager
+ * get bit 8 to 15 of address to make an index to be used in the
+ * suitable table (R/W for B/W/L).
+ *
+ * Featuring :
+ * - Onboard memory byte, word and long read/write access.
+ * - Optimized IO warm mapping/unmapping.
+ * - Optionnal (compile time) enhanced memory control with RWX access
+ * tag and hardware breakpoints.
+ *
+ * Limitations :
+ * - For optimization purposes IO must be mapped in high half memory
+ * (bit 23 of address setted).
+ * - Two IO can not shared the same memory location for bit 8 to 15.
+ * Conflicts could be resolved by creating an intermediate IO which
+ * dispatches to others. This mechanism has not been implemented yet,
+ * so users must do it themself if needed.
+ *
+ * Atari-ST & Amiga IO areas :
+ * - @p FF8800-FF88FF : YM2149 (ST)
+ * - @p FF8900-FF89FF : STE DMA and LMC1992
+ * - @p FF8200-FF82FF : Shifter (ST)
+ * - @p FFFA00-FFFAFF : MFP (ST)
+ * - @p DFF000-DFF0DF : Paula (AMIGA)
+ *
+ * @{
+ */
+
+/**
+ * Memory access flags for emu68_t::chk (debug mode only).
+ */
+enum {
+ EMU68_R = 0x01, /**< Memory location has been read. */
+ EMU68_W = 0x02, /**< Memory location has been written. */
+ EMU68_X = 0x04, /**< Memory location has been executed. */
+ EMU68_A = EMU68_R|EMU68_W|EMU68_X, /**< All memory access bits. */
+};
+
+/**
+ * @name Memory/IO quick access tables.
+ * @{
+ */
+
+
+/**
+ * @}
+ */
+
+/**
+ * @name Effective address calculation tables.
+ *
+ * The get_abbwl tables are used by EMU68 to calculate operand
+ * effective address. Each of them is indexed by operand addressing
+ * mode. Each entry is a pointer to a function which do everything
+ * neccessary to update processor state (e.g. address register
+ * increment or decrement). reg parameter is register number coded
+ * in the three first bit (0 to 2) of 68k opcode. When the mode is
+ * 7, register parameter is used as an index in a second level
+ * function table for extended addressing mode.
+ *
+ * @{
+ */
+
+EMU68_EXTERN
+/**
+ * Byte operand effective address calculation function table.
+ */
+addr68_t (*const get_eab688)(emu68_t * const,int reg);
+
+EMU68_EXTERN
+/**
+ * Word operand effective address calculation function table.
+ */
+addr68_t (*const get_eaw688)(emu68_t * const,int reg);
+
+EMU68_EXTERN
+/**
+ * Long operand effective address calculation function table.
+ */
+addr68_t (*const get_eal688)(emu68_t * const,int reg);
+
+
+#define get_EAB(MODE,REG) get_eab68MODE(emu68,REG)
+#define get_EAW(MODE,REG) get_eaw68MODE(emu68,REG)
+#define get_EAL(MODE,REG) get_eal68MODE(emu68,REG)
+
+
+/**
+ * @name 68K onboard memory access.
+ * @{
+ */
+
+EMU68_EXTERN
+/**
+ * Read memory byte.
+ */
+void mem68_read_b(emu68_t * const emu68);
+
+EMU68_EXTERN
+/**
+ * Read memory word.
+ */
+void mem68_read_w(emu68_t * const emu68);
+
+EMU68_EXTERN
+/**
+ * Read memory long.
+ */
+void mem68_read_l(emu68_t * const emu68);
+
+EMU68_EXTERN
+/**
+ * Write memory byte.
+ */
+void mem68_write_b(emu68_t * const emu68);
+
+EMU68_EXTERN
+/**
+ * Write memory word.
+ */
+void mem68_write_w(emu68_t * const emu68);
+
+EMU68_EXTERN
+/**
+ * Write memory long.
+ */
+void mem68_write_l(emu68_t * const emu68);
+
+static inline uint68_t _read_B(emu68_t * const emu68,
+ const addr68_t addr)
+{
+ emu68->bus_addr = addr;
+ mem68_read_b(emu68);
+ return (u8) emu68->bus_data;
+}
+
+static inline uint68_t _read_EAB(emu68_t * const emu68,
+ const int mode, const int reg)
+{
+ emu68->bus_addr = get_eab68mode(emu68,reg);
+ mem68_read_b(emu68);
+ return (u8) emu68->bus_data;
+}
+
+
+static inline uint68_t _read_W(emu68_t * const emu68,
+ const addr68_t addr)
+{
+ emu68->bus_addr = addr;
+ mem68_read_w(emu68);
+ return (u16) emu68->bus_data;
+}
+
+static inline uint68_t _read_EAW(emu68_t * const emu68,
+ const int mode, const int reg)
+{
+ emu68->bus_addr = get_eaw68mode(emu68,reg);
+ mem68_read_w(emu68);
+ return (u16) emu68->bus_data;
+}
+
+
+static inline uint68_t _read_L(emu68_t * const emu68,
+ const addr68_t addr)
+{
+ emu68->bus_addr = addr;
+ mem68_read_l(emu68);
+ return (u32) emu68->bus_data;
+}
+
+static inline uint68_t _read_EAL(emu68_t * const emu68,
+ const int mode, const int reg)
+{
+ emu68->bus_addr = get_eal68mode(emu68,reg);
+ mem68_read_l(emu68);
+ return (u32) emu68->bus_data;
+}
+
+/**
+ * Read memory byte.
+ */
+#define read_B(ADDR) _read_B(emu68,(ADDR))
+
+/**
+ * Read memory word.
+ */
+#define read_W(ADDR) _read_W(emu68,(ADDR))
+
+/**
+ * Read memory long.
+ */
+#define read_L(ADDR) _read_L(emu68,(ADDR))
+
+/**
+ * Read memory byte from AE mode.
+ */
+#define read_EAB(MODE,PARM) _read_EAB(emu68,(MODE),(PARM))
+
+/**
+ * Read memory word from AE mode.
+ */
+#define read_EAW(MODE,PARM) _read_EAW(emu68,(MODE),(PARM))
+
+/**
+ * Read memory long from AE mode.
+ */
+#define read_EAL(MODE,PARM) _read_EAL(emu68,(MODE),(PARM))
+
+static inline void _write_B(emu68_t * const emu68,
+ const addr68_t addr, const int68_t v)
+{
+ emu68->bus_addr = addr;
+ emu68->bus_data = v;
+ mem68_write_b(emu68);
+}
+
+static inline void _write_EAB(emu68_t * const emu68,
+ const int mode, const int reg, const int68_t v)
+{
+ emu68->bus_addr = get_eab68mode(emu68,reg);
+ emu68->bus_data = v;
+ mem68_write_b(emu68);
+}
+
+
+static inline void _write_W(emu68_t * const emu68, addr68_t addr, int68_t v)
+{
+ emu68->bus_addr = addr;
+ emu68->bus_data = v;
+ mem68_write_w(emu68);
+}
+
+static inline void _write_EAW(emu68_t * const emu68,
+ const int mode, const int reg, const int68_t v)
+{
+ emu68->bus_addr = get_eaw68mode(emu68,reg);
+ emu68->bus_data = v;
+ mem68_write_w(emu68);
+}
+
+
+static inline void _write_L(emu68_t * const emu68, addr68_t addr, int68_t v)
+{
+ emu68->bus_addr = addr;
+ emu68->bus_data = v;
+ mem68_write_l(emu68);
+}
+
+static inline void _write_EAL(emu68_t * const emu68,
+ const int mode, const int reg, const int68_t v)
+{
+ emu68->bus_addr = get_eal68mode(emu68,reg);
+ emu68->bus_data = v;
+ mem68_write_l(emu68);
+}
+
+
+/**
+ * Write memory byte.
+ */
+#define write_B(ADDR,V) _write_B(emu68,(ADDR),(V))
+
+/**
+ * Write memory word.
+ */
+#define write_W(ADDR,V) _write_W(emu68,(ADDR),(V))
+
+/**
+ * Write memory long.
+ */
+#define write_L(ADDR,V) _write_L(emu68,(ADDR),(V))
+
+/**
+ * Write memory byte at EA mode.
+ */
+#define write_EAB(MODE,PARM,V) _write_EAB(emu68,(MODE),(PARM),(V))
+
+/**
+ * Write memory word at EA mode.
+ */
+#define write_EAW(MODE,PARM,V) _write_EAW(emu68,(MODE),(PARM),(V))
+
+/**
+ * Write memory long at EA mode.
+ */
+#define write_EAL(MODE,PARM,V) _write_EAL(emu68,(MODE),(PARM),(V))
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Instruction read.
+ * @{
+ */
+EMU68_EXTERN
+int68_t mem68_nextw(emu68_t * const emu68); /**< Decode word and update PC */
+EMU68_EXTERN
+int68_t mem68_nextl(emu68_t * const emu68); /**< Decode long and update PC */
+
+/**
+ * mem68_nextw() convenience macro.
+ */
+#define get_nextw() mem68_nextw(emu68)
+
+/**
+ * mem68_nextl() convenience macro.
+ */
+#define get_nextl() mem68_nextl(emu68)
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Stack access.
+ * @{
+ */
+
+EMU68_EXTERN
+/**
+ * Push long.
+ */
+void mem68_pushl(emu68_t * const emu68, const int68_t v);
+
+/**
+ * Push word.
+ */
+EMU68_EXTERN
+void mem68_pushw(emu68_t * const emu68, const int68_t v);
+
+EMU68_EXTERN
+/**
+ * Pop long.
+ */
+int68_t mem68_popl(emu68_t * const emu68);
+
+EMU68_EXTERN
+/**
+ * Pop word.
+ */
+int68_t mem68_popw(emu68_t * const emu68);
+
+/**
+ * mem68_pushl() convenience macro.
+ */
+#define pushl(V) mem68_pushl(emu68,(V));
+
+/**
+ * mem68_pushw() convenience macro.
+ */
+#define pushw(V) mem68_pushw(emu68,(V));
+
+/**
+ * mem68_popl() convenience macro.
+ */
+#define popl() mem68_popl(emu68);
+
+/**
+ * mem68_popw() convenience macro.
+ */
+#define popw() mem68_popw(emu68);
+
+/**
+ * @}
+ */
+
+
+/**
+ * Test for direct memory access or IO quick table access
+ */
+static inline int mem68_is_io(const addr68_t addr) {
+ return addr & 0x800000;
+}
+
+/**
+ * Set memory access check flags.
+ */
+static inline void chkframe(emu68_t * const emu68,
+ addr68_t addr, const int flags)
+{
+ int chgchk, newchk;
+ /* assert( ! mem68_is_io(addr) ); */
+ addr &= MEMMSK68;
+ chgchk = emu68->chkaddr; /* current value */
+ newchk = chgchk | flags; /* new value */
+ chgchk ^= newchk; /* what's changed ? */
+ if (chgchk) {
+ emu68->lst_chk.pc = emu68->inst_pc;
+ emu68->lst_chk.ad = addr;
+ emu68->lst_chk.fl = chgchk;
+ if (!emu68->frm_chk_fl)
+ emu68->fst_chk = emu68->lst_chk;
+ emu68->frm_chk_fl |= chgchk;
+ emu68->chkaddr = newchk;
+ }
+}
+
+static inline void chk_buseven(emu68_t * const emu68)
+{
+ if (emu68->bus_addr & 1)
+ ;
+}
+
+static inline void chkframe_b(emu68_t * const emu68, const int flags)
+{
+ chkframe(emu68, emu68->bus_addr, flags);
+}
+
+static inline void chkframe_w(emu68_t * const emu68, const int flags)
+{
+ chk_buseven(emu68);
+ chkframe(emu68, emu68->bus_addr+0, flags);
+ chkframe(emu68, emu68->bus_addr+1, flags);
+}
+
+static inline void chkframe_l(emu68_t * const emu68, const int flags)
+{
+ chk_buseven(emu68);
+ chkframe(emu68, emu68->bus_addr+0, flags);
+ chkframe(emu68, emu68->bus_addr+1, flags);
+ chkframe(emu68, emu68->bus_addr+2, flags);
+ chkframe(emu68, emu68->bus_addr+3, flags);
+}
+
+
+EMU68_EXTERN
+/**
+ * Init memory quick access table.
+ *
+ * The emu68_mem_init() function must be call at init time.
+ * Currently this function only call the emu68_mem_reset()
+ * function.
+ *
+ * @see emu68_mem_reset()
+ */
+void emu68_mem_init(emu68_t * const emu68);
+
+EMU68_EXTERN
+/**
+ * Destroy memory quick access table.
+ */
+void emu68_mem_destroy(emu68_t * const emu68);
+
+EMU68_EXTERN
+/**
+ * Reset memory quick access table.
+ *
+ * The emu68_mem_reset() function restores all memory access to
+ * default. All mapped IO will be discard and replace by onboard
+ * memory access.
+ */
+void emu68_mem_reset(emu68_t * const emu68);
+
+EMU68_EXTERN
+/**
+ * Add a new memory access control area (for new IO).
+ *
+ * @param emu68 emu68 instance
+ * @param area which area (bit 16 to 23 of address) to change
+ * @param read_bwl read function table (byte, word and long in this order)
+ * @param write_bwl idem read_bwl for write access.
+ *
+ * @see emu68_mem_reset_area()
+ */
+void emu68_mem_new_area(emu68_t * const emu68, u8 area,
+ memfunc68_t *read_bwl,
+ memfunc68_t *write_bwl);
+
+EMU68_EXTERN
+/**
+ * Reset memory access control area to default state.
+ *
+ * @param emu68 emu68 instance
+ * @param area which area (bit 16 to 23 of address) to reset
+ *
+ * @see emu68_mem_new_area()
+ */
+void emu68_mem_reset_area(emu68_t * const emu68, u8 area);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/srdef68.h Added

@@ -0,0 +1,135 @@
+/**
+ * @ingroup lib_emu68
+ * @file emu68/srdef68.h
+ * @brief Status Register (SR) definition header.
+ * @date 1999/13/03
+ * @author Benjamin Gerard
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_SRDEF68_H
+#define EMU68_SRDEF68_H
+
+/**
+ * @defgroup lib_emu68_srdef Status Register (SR) definitions
+ * @ingroup lib_emu68
+ *
+ * 68K status register definitions.
+ * The SR is composed of condition code register (CCR) located in
+ * the LSB and privileged processor status in MSB. EMU68 does not
+ * currently handle supervisor and trace mode. Internal processor level is
+ * partially managed. Each SR bit is defined by its bit number (SR_x_BIT)
+ * and the corresponding value (SR_x) where x is one of C,V,Z,N,X,S or T.
+ * SR_IPL_BIT is used to locate the less significant bit position of the 3
+ * IPL bits. Macros are available to help with SR bit manipulations.
+ *
+ * SR := T.S. .IPL ...X NZVC
+ *
+ * @{
+ */
+
+/**
+ * @name SR bit definitions.
+ * @{
+ */
+
+enum {
+ SR_C_BIT = 0 /**< Carry bit number. */,
+ SR_V_BIT = 1 /**< Overflow bit number. */,
+ SR_Z_BIT = 2 /**< Zero bit number. */,
+ SR_N_BIT = 3 /**< Negative bit number. */,
+ SR_X_BIT = 4 /**< eXtended carry bit number. */,
+ SR_5_BIT = 5 /**< Bit#5. */,
+ SR_6_BIT = 6 /**< Bit#6. */,
+ SR_7_BIT = 7 /**< Bit#7. */,
+
+ SR_I_BIT = 8 /**< Internal Processor Level bit number. */,
+ SR_I0_BIT = 8 /**< Internal Processor Level bit#0. */,
+ SR_I1_BIT = 9 /**< Internal Processor Level bit#1. */,
+ SR_I2_BIT = 10 /**< Internal Processor Level bit#2. */,
+
+ SR_B_BIT = 11 /**< Bit#11. */,
+ SR_M_BIT = 12 /**< Master Interrupt State (68020). */,
+ SR_S_BIT = 13 /**< Superuser bit number. */,
+ SR_T0_BIT = 14 /**< Trace enable bit#0 (68020). */,
+ SR_T1_BIT = 15 /**< Trace enable bit#1 (68020). */,
+ SR_T_BIT = 15 /**< Trace bit number. */,
+};
+
+enum {
+ SR_C = (1<<SR_C_BIT) /**< Carry value. */,
+ SR_V = (1<<SR_V_BIT) /**< Overflow value. */,
+ SR_Z = (1<<SR_Z_BIT) /**< Zero value. */,
+ SR_N = (1<<SR_N_BIT) /**< Negative value. */,
+ SR_X = (1<<SR_X_BIT) /**< eXtended carry value. */,
+ SR_5 = (1<<SR_5_BIT) /**< bit#5 always 0. */,
+ SR_6 = (1<<SR_6_BIT) /**< bit#6 always 0. */,
+ SR_7 = (1<<SR_7_BIT) /**< bit#7 always 0. */,
+
+ SR_I = (7<<SR_I_BIT) /**< IPL mask. */,
+ SR_I0 = (1<<SR_I0_BIT) /**< IPL mask #0. */,
+ SR_I1 = (1<<SR_I1_BIT) /**< IPL mask #1. */,
+ SR_I2 = (1<<SR_I2_BIT) /**< IPL mask #2. */,
+
+ SR_B = (1<<SR_B_BIT) /**< bit#11 always 0. */,
+ SR_M = (1<<SR_M_BIT) /**< Master Interrupt State (68020). */,
+ SR_S = (1<<SR_S_BIT) /**< Superuser value. */,
+ SR_T = (1<<SR_T_BIT) /**< Trace value. */,
+ SR_T0 = (1<<SR_T0_BIT) /**< Trace 0 (68020). */,
+ SR_T1 = (1<<SR_T1_BIT) /**< Trace 1 (68020). */,
+};
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name SR manipulations.
+ * @{
+ */
+
+/**
+ * Get CCR value.
+ * @param SR current SR value
+ * @return CCR value
+ * @retval SR&255
+ */
+#define GET_CCR(SR) ( (u8) (SR) )
+
+/**
+ * Set CCR in SR value.
+ * @param SR current SR value
+ * @param CCR ccr value 0..255
+ * @return new SR value
+ * @retval ( SR & ~255 ) | CCR
+ */
+#define SET_CCR(SR,CCR) (SR) = ( ( (SR) & ~255 ) | (CCR) )
+
+/**
+ * Get IPL in SR value.
+ * @param SR current SR value
+ * @return IPL value
+ * @retval ( SR >> SR_I_BIT ) & 7
+ */
+#define GET_IPL(SR) ( ( (SR) >> SR_I_BIT ) & 7 )
+
+/**
+ * Change IPL value of SR.
+ * @param SR current SR value
+ * @param IPL new IPL value 0..7
+ * @return new SR value
+ * @retval ( SR & ~SR_I ) | ( IPL << SR_IPL_BIT )
+ */
+#define SET_IPL(SR,IPL) (SR) = ( ( (SR) & ~SR_I ) | ( (IPL) << SR_I_BIT ) )
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/struct68.h Added

@@ -0,0 +1,264 @@
+/**
+ * @ingroup lib_emu68
+ * @file emu68/struct68.h
+ * @brief Struture definitions header.
+ * @author Benjamin Gerard
+ * @date 1999-03-13
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_STRUCT68_H
+#define EMU68_STRUCT68_H
+
+#include "type68.h"
+
+/**
+ * @addtogroup lib_emu68_types
+ * @{
+ */
+
+/**
+ * IO no pending interruption return value.
+ *
+ * The next_int function of IO plugin must return IO68_NO_INT when
+ * no interruption has been triggered.
+ */
+#define IO68_NO_INT (0x80000000)
+
+/** Convenience macro to access reg68 in the current emu68 instance. */
+#define REG68 (emu68->reg)
+
+/** Mask for memory overflow. */
+#define MEMMSK68 (emu68->memmsk)
+
+
+/**
+ * @name Memory access caller type
+ * @{
+ */
+
+/** Write memory function. */
+typedef void (*memwfunc68_t)(emu68_t * const);
+
+/** Write IO chip function. */
+typedef void (*iomemfunc68_t)(io68_t * const);
+
+/**
+ * @}
+ */
+
+/** First level (16 lines) decoder function. */
+typedef void (linefunc68_t)(emu68_t * const, int, int);
+
+#ifndef EMU68_MONOLITIC
+/** @nodoc */
+# define DECL_LINE68(N) \
+ void N(emu68_t * const emu68, int reg9, int reg0)
+/** @nodoc */
+# define DECL_STATIC_LINE68(N) static DECL_LINE68(N)
+#else
+/** @nodoc */
+# define DECL_LINE68(N) \
+ static void N(emu68_t * const emu68, int reg9, int reg0)
+/** @nodoc */
+# define DECL_STATIC_LINE68(N) DECL_LINE68(N)
+#endif
+
+
+/**
+ * 68K interruption exception structure.
+ */
+typedef struct
+{
+ int vector; /**< Interrupt vector number */
+ int level; /**< Interrupt level 0..7. */
+ cycle68_t cycle; /**< Cycle the interruption falls. */
+} interrupt68_t;
+
+
+/**
+ * IO emulator plugin structure.
+ *
+ * All 68K IO must have a filled io68_t structure to be warm plug or
+ * unplug with ioplug interface.
+ *
+ */
+struct io68_s
+{
+ struct io68_s * next; /**< IO list; pointer to next. */
+ char name32; /**< IO identifier name. */
+ addr68_t addr_lo; /**< IO mapping area start address. */
+ addr68_t addr_hi; /**< IO mapping area end address. */
+
+ iomemfunc68_t r_byte; /**< IO read byte function. */
+ iomemfunc68_t r_word; /**< IO read word function. */
+ iomemfunc68_t r_long; /**< IO read long function. */
+
+ iomemfunc68_t w_byte; /**< IO write byte function. */
+ iomemfunc68_t w_word; /**< IO write word function. */
+ iomemfunc68_t w_long; /**< IO write long function. */
+
+ /** IO interruption function claim. */
+ interrupt68_t* (*interrupt)(io68_t * const, const cycle68_t);
+ /** IO get next interruption cycle. */
+ cycle68_t (*next_interrupt)(io68_t * const, const cycle68_t);
+ /** IO adjust cycle function. */
+ void (*adjust_cycle)(io68_t * const, const cycle68_t);
+ /** IO reset function. */
+ int (*reset)(io68_t * const);
+ /** Destructor. */
+ void (*destroy)(io68_t * const);
+
+ /** Emulator this IO is attached to. */
+ emu68_t * emu68;
+};
+
+
+/**
+ * 68K internal registers.
+ */
+typedef struct
+{
+ s32 d8; /**< 68K data registers. */
+ s32 a8; /**< 68K address registers. */
+ s32 usp; /**< 68K User Stack Pointers. */
+ s32 pc; /**< 68K Program Counter. */
+ int sr; /**< 68K Status Register. */
+} reg68_t;
+
+/**
+ * 68k register index.
+ * @{
+ */
+enum emu68_regidx_e {
+ REG68_D0_IDX, /**< D0 register index. */
+ REG68_D1_IDX, /**< D1 register index. */
+ REG68_D2_IDX, /**< D2 register index. */
+ REG68_D3_IDX, /**< D3 register index. */
+ REG68_D4_IDX, /**< D4 register index. */
+ REG68_D5_IDX, /**< D5 register index. */
+ REG68_D6_IDX, /**< D6 register index. */
+ REG68_D7_IDX, /**< D7 register index. */
+ REG68_A0_IDX, /**< A0 register index. */
+ REG68_A1_IDX, /**< A1 register index. */
+ REG68_A2_IDX, /**< A2 register index. */
+ REG68_A3_IDX, /**< A3 register index. */
+ REG68_A4_IDX, /**< A4 register index. */
+ REG68_A5_IDX, /**< A5 register index. */
+ REG68_A6_IDX, /**< A6 register index. */
+ REG68_A7_IDX, /**< A7 register index. */
+ REG68_US_IDX, /**< USP register index. */
+ REG68_PC_IDX, /**< PC register index. */
+ REG68_SR_IDX, /**< SR register index. */
+};
+
+#define REG68_DN_IDX(N) (REG68_D0_IDX+(N&7)) /**< Dn register index. */
+#define REG68_AN_IDX(N) (REG68_A0_IDX+(N&7)) /**< An register index. */
+/**
+ * @}
+ */
+
+/**
+ * Exception trapping handler.
+ *
+ * The emu68_handler_t handler is called by EMU68 when an exception
+ * occurs. It does include interruption triggered by IO chip as well
+ * as software exception like TRACE, ILLEGAL, ZERO DIVIDE, CHK,
+ * TRAP, RESET ... and special emulator interrupts.
+ *
+ * @param emu68 emulator instance
+ * @param vector exception vector number
+ * @param cookie user-data pointer
+*/
+typedef void (*emu68_handler_t)(emu68_t* const emu68, int vector, void * cookie);
+
+/** Breakpoint definition. */
+typedef struct {
+ addr68_t addr; /**< Breakpoint address. */
+ uint68_t count; /**< Break countdown; 0:disable */
+ uint68_t reset; /**< Reset countdown after break. */
+} emu68_bp_t;
+
+/** 68K Emulator struct. */
+struct emu68_s {
+ char name32; /**< Identifier. */
+
+ /* Error. */
+ char err4128; /**< Error message stack. */
+ int nerr; /**< Error counter. */
+
+ reg68_t reg; /**< 68000 internal registers. */
+
+ int inst_pc; /**< PC of executed instruction. */
+ int inst_sr; /**< SR of executed instruction. */
+
+ cycle68_t cycle; /**< Internal cycle counter. */
+ uint68_t clock; /**< Master clock frequency. */
+
+ /* Exception trapping. */
+ emu68_handler_t handler; /**< Exception trap handler. */
+ void * cookie; /**< User data. */
+
+ int status; /**< Execution status. */
+ uint68_t instructions; /**< Instruction countdown. */
+ addr68_t finish_sp; /**< Finish Stack Pointer. */
+
+ /* IO chips. */
+ int nio; /**< # IO plug in IO-list. */
+ io68_t * iohead; /**< Head of IO-list. */
+ io68_t * interrupt_io; /**< Current interuptible IO. */
+ io68_t * mapped_io256; /**< IO areas. */
+ io68_t * memio; /**< IO to access memory. */
+ io68_t ramio; /**< IO used only in debug mode (access control). */
+ io68_t errio; /**< IO used for invalid address in debug mode. */
+ io68_t nopio; /**< IO used for invalid address in normal mode. */
+
+ /* Memory access. */
+ addr68_t bus_addr; /**< bus address for memory access. */
+ int68_t bus_data; /**< bus data for memory access. */
+
+ int frm_chk_fl; /**< ORed chk change for current frame. */
+ struct {
+ unsigned pc; /**< Pc register value */
+ unsigned ad; /**< Addr */
+ int fl; /**< Flags. */
+ } fst_chk /**< first check. */, lst_chk /**< last check. */;
+ u8 * chk; /**< Access-Control-Memory buffer. */
+
+ emu68_bp_t breakpoints31; /**< Hardware breakpoints. */
+
+ /* Onboard memory. */
+ addr68_t memmsk; /**< Onboard memory mask (2^log2mem-1). */
+ int log2mem; /**< Onboard memory buffer size (2^log2mem). */
+ u8 mem32; /**< Onboard memory buffer.
+ @note Must be last in struct. */
+};
+
+static inline
+void inl_setcycle68(emu68_t * const emu68, const cycle68_t n)
+{
+#ifdef EMU68CYCLE
+ emu68->cycle = n;
+#endif
+}
+
+static inline
+void inl_addcycle68(emu68_t * const emu68, const cycle68_t n)
+{
+#ifdef EMU68CYCLE
+ emu68->cycle += n;
+#endif
+}
+
+#ifndef emu68_alloc
+# include <stdlib.h>
+# define emu68_alloc(size) malloc(size) /**< used instead of malloc(). */
+# define emu68_free(size) free(size) /**< used instead of free(). */
+#endif
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/table68.c Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/emu68/type68.h Added

@@ -0,0 +1,118 @@
+/**
+ * @ingroup lib_emu68
+ * @file emu68/type68.h
+ * @brief Type definitions header.
+ * @date 1999/03/13
+ * @author Benjamin Gerard
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef EMU68_TYPE68_H
+#define EMU68_TYPE68_H
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#else
+typedef int32_t int_fast32_t; /**< @nodoc */
+typedef uint32_t uint_fast32_t; /**< @nodoc */
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+/**
+ * @defgroup lib_emu68_types Type definitions
+ * @ingroup lib_emu68
+ *
+ * Definition of types used by EMU68 and SC68 related projects.
+ *
+ * @{
+ */
+
+/**
+ * @name Fixed size integer types.
+ * @{
+ */
+
+typedef uint8_t u8; /**< Must be an unsigned 8 bit integer. */
+typedef int8_t s8; /**< Must be a signed 8 bit integer. */
+
+typedef uint16_t u16; /**< Must be an unsigned 16 bit integer. */
+typedef int16_t s16; /**< Must be a signed 16 bit integer. */
+
+typedef uint32_t u32; /**< Must be an unsigned 32 bit integer. */
+typedef int32_t s32; /**< Must be a signed 32 bit integer. */
+
+typedef uint64_t u64; /**< Must be an unsigned 64 bit integer. */
+typedef int64_t s64; /**< Must be a signed 64 bit integer. */
+
+/**
+ * @}
+ */
+
+#ifndef INT68_BITS
+
+/* Commonly used int (should be fastest at least 32 bit type). */
+typedef int_fast32_t int68_t; /**< fast signed integer type. */
+typedef int68_t sint68_t; /**< fast signed integer type. */
+typedef uint_fast32_t uint68_t; /**< fast unsigned integer type. */
+
+#elif INT68_BITS == 32
+
+typedef s32 int68_t; /**< 32bit signed integer type. */
+typedef s32 sint68_t; /**< 32bit signed integer type. */
+typedef u32 uint68_t; /**< 32bit unsigned integer type. */
+
+#elif INT68_BITS == 64
+
+typedef s64 int68_t; /**< 64bit signed integer type. */
+typedef s64 sint68_t; /**< 64bit signed integer type. */
+typedef u64 uint68_t; /**< 64bit unsigned integer type. */
+
+#else
+# error "invalid define INT68_BITS"
+#endif
+
+typedef unsigned int uint_t; /**< natural unsigned int. */
+typedef uint68_t cycle68_t; /**< Type for cycle counters. */
+typedef int68_t addr68_t; /**< Type for 68k memory addressing. */
+typedef struct io68_s io68_t; /**< IO chip instance type. */
+typedef struct emu68_s emu68_t; /**< 68k emulator instance type. */
+
+/** 68k memory access function. */
+typedef void (*memfunc68_t)(emu68_t * const);
+
+/**
+ * @}
+ */
+
+#ifdef EMU68_EXPORT
+/* Should be only needed when compiling emu68 */
+
+#define BASE_FIX (sizeof(int68_t)<<3) /* number of bit of int68_t type. */
+#define BYTE_FIX (BASE_FIX-8) /* shift to normalize byte operands. */
+#define WORD_FIX (BASE_FIX-16) /* shift to normalize word operands. */
+#define LONG_FIX (BASE_FIX-32) /* shift to normalize long operands. */
+#define SIGN_FIX (BASE_FIX-1) /* sign bit raw. */
+#define SIGN_BIT SIGN_FIX /* sign bit raw. */
+#define SIGN_MSK ( (int68_t) ( (int68_t) 1 << SIGN_FIX ) ) /* sign mask. */
+
+#define BYTE_MSK ( (int68_t) 0xFFFFFF00 )
+#define WORD_MSK ( (int68_t) 0xFFFF0000 )
+#define LONG_MSK ( (int68_t) 0x00000000 )
+
+#define NRM_BYTE_MSK ( (int68_t) ( (int68_t) (0x000000FFU << BYTE_FIX) ) )
+#define NRM_WORD_MSK ( (int68_t) ( (int68_t) (0x0000FFFFU << WORD_FIX) ) )
+#define NRM_LONG_MSK ( (int68_t) ( (int68_t) (0xFFFFFFFFU << LONG_FIX) ) )
+/* L={7,15,31} */
+#define NRM_MSK(L) ( (int68_t) ( (int68_t) ((int68_t) 1 << SIGN_BIT) >> (L)))
+
+#define NRM_BYTE_ONE ( (int68_t) ( (int68_t) (0x00000001U << BYTE_FIX) ) )
+#define NRM_WORD_ONE ( (int68_t) ( (int68_t) (0x00000001U << WORD_FIX) ) )
+#define NRM_LONG_ONE ( (int68_t) ( (int68_t) (0x00000001U << LONG_FIX) ) )
+
+#endif
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/default.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/io68.c Added

@@ -0,0 +1,91 @@
+/*
+ * @file io68.c
+ * @brief IO chips library
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <assert.h>
+
+#include "io68.h"
+#include "sc68/file68_msg.h"
+
+static const struct {
+ const char * name;
+ int (* init) (int *, char **);
+ void (* shutdown)(void);
+} func = {
+ { "paula", paulaio_init, paulaio_shutdown },
+ { "ym-2149", ymio_init, ymio_shutdown },
+ { "microwire", mwio_init, mwio_shutdown },
+ { "mfp-68901", mfpio_init, mfpio_shutdown },
+ { "shifter", shifterio_init, shifterio_shutdown },
+};
+
+const int max = sizeof(func) / sizeof(*func);
+
+int io68_init(int * argc, char ** argv)
+{
+ int i,err;
+ for ( err = i = 0; i < max; ++i ) {
+ if (funci.init) {
+ err = funci.init(argc, argv);
+ if (err) {
+ msg68_error("io68: failed to initialize *%s* IO plugin\n",funci.name);
+ break;
+ }
+ }
+ }
+ return err;
+}
+
+void io68_shutdown(void)
+{
+ int i;
+ for ( i=0; i < max; ++i ) {
+ if (funci.shutdown)
+ funci.shutdown();
+ }
+}
+
+void io68_destroy(io68_t * const io)
+{
+ if (io) {
+ assert(!io->next);
+ if (io->next)
+ msg68_critical("io68: destroying an attached IO <%s>\n",io->name);
+ if (io->destroy)
+ io->destroy(io);
+ else
+ emu68_free(io);
+ }
+}
+
+int io68_reset(io68_t * const io)
+{
+ return !io
+ ? -1
+ : io->reset ? io->reset(io) : 0
+ ;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/io68.h Added

@@ -0,0 +1,81 @@
+/**
+ * @ingroup   lib_io68
+ * @file      io68/io68.h
+ * @author    Benjamin Gerard
+ * @date      1999/03/20
+ * @brief     all io68 headers.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef IO68_IO68_H
+#define IO68_IO68_H
+
+#include "io68_api.h"
+
+#include "ym_io.h"
+#include "mw_io.h"
+#include "shifter_io.h"
+#include "mfp_io.h"
+#include "paula_io.h"
+
+/**
+ * @defgroup  lib_io68  Chipset emulators.
+ * @ingroup   lib_sc68
+ *
+ * @{
+ */
+
+IO68_API
+/**
+ * Initialize the io68 library.
+ *
+ *   The io68_init() function setup chipset emulator engines.
+ *
+ * @param   argc  pointer to argument count.
+ * @param   argv  argument array.
+ * @retval  0 on success
+ * @retval -1 on error
+ */
+int io68_init(int * argc, char ** argv);
+
+IO68_API
+/**
+ * Shutdown the io68 library.
+ *
+ *   The io68_shutdown() function cleanup emulator engines. It should
+ *   call the corresponding shutdown function for each existing
+ *   chipset emulators. It should be call only after all chipset
+ *   instances have been released.
+ */
+void io68_shutdown(void);
+
+IO68_API
+/**
+ * Destroy an chipset instance.
+ *
+ *   The io68_destroy() function calls the io68_t::destroy() callback
+ *   function or if it is null just free the memory.
+ *
+ *  @param  io  chipset instance
+ */
+void io68_destroy(io68_t * const io);
+
+IO68_API
+/**
+ * Reset chipset.
+ *
+ *   The io68_reset() function calls the io68_t::reset() callback
+ *   function.
+ *
+ *  @param  io  chipset instance
+ *  @retval  0  on success
+ *  @retval -1  on failure
+ */
+int io68_reset(io68_t * const io);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/io68_api.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/mfp_io.c Added

@@ -0,0 +1,579 @@
+/*
+ * @file mfp_io.c
+ * @brief MFP-68901 I/O plugin
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "mfp_io.h"
+#include "mfpemul.h"
+#include <assert.h>
+
+#ifdef DEBUG
+# include <sc68/file68_msg.h>
+
+static const char * const regnames = {
+ "GPIP", /* 01 - General Purpose I/O Interrupt port */
+ "AER", /* 03 - Active Edge Register */
+ "DDR", /* 05 - Data Direction Register */
+ "IERA", /* 07 - IERA (Interrupt Enable Register A) */
+ "IERB", /* 09 - IERB (Interrupt Enable Register B) */
+ "IPRA", /* 0B - IPRA (Interrupt Pending Register A) */
+ "IPRB", /* 0D - IPRB (Interrupt Pending Register B) */
+ "ISRA", /* 0F - ISRA (Interrupt In Service Register A) */
+ "ISRB", /* 11 - ISRB (Interrupt In Service Register B) */
+ "IMRA", /* 13 - IMRA (Interrupt Mask Register A) */
+ "IMRB", /* 15 - IMRB (Interrupt Mask Register B) */
+ "VR", /* 17 - VR (Vector Register) */
+ "TACR", /* 19 - TACR (Timer A Control Register) */
+ "TBCR", /* 1B - TBCR (Timer B Control Register) */
+ "TCDCR",/* 1D - TCDCR (Timer C/D Control Register) */
+ "TADR", /* 1F - TADR (Timer A Data Register) */
+ "TBDR", /* 21 - TBDR (Timer B Data Register) */
+ "TCDR", /* 23 - TCDR (Timer C Data Register) */
+ "TDDR", /* 25 - TDDR (Timer D Data Register) */
+ "SCR", /* 27 - SCR (Synchronous Character Register) */
+ "UCR", /* 29 - UCR,USART (Control Register) */
+ "RSR", /* 2B - RSR (Receiver Status Register) */
+ "TSR", /* 2D - TSR (Tranmitter Status Register) */
+ "UDR", /* 2F - UDR,USART (DataRegister) */
+};
+
+static const char * chnnames16 = {
+ "GPIP#0", "GPIP#1", "GPIP#2", "GPIP#3",
+ "TIMER-D", "TIMER-C", "GPIP#6", "GPIP#5",
+ "TIMER-B", "XMIT-ERR", "XMIT-EMPTY","RCV-ERR",
+ "RCV-FULL", "TIMER-A", "GPIP#6", "GPIP#7"
+};
+
+#define MYHD "mfp : "
+
+static const char * regname(int reg)
+{
+ if (! (reg & 1) )
+ return "!ODD"; /* not even (odd) */
+ reg >>= 1;
+ if (reg < 0 || reg >= sizeof(regnames)/sizeof(*regnames))
+ return "!OOR"; /* out-of-rand */
+ return regnamesreg;
+}
+
+extern int mfp_cat;
+
+# define REPORTR(N) REPORTA(N,mfp->mapN)
+# define REPORTA(N,V) \
+ TRACE68(mfp_cat, MYHD "R %02x > $%02x (%s)\n", \
+ N, (unsigned) (V), regname(N))
+# define REPORTW(N,V) \
+ TRACE68(mfp_cat, MYHD "W %02x < $%02x (%s)\n", \
+ N, (unsigned)(V), regname(N))
+# define MAYREPORT(N,V) if (mfp->mapN != (V)) REPORTW(N,V)
+
+#else
+# define REPORTR(N) for(;0;)
+# define REPORTA(N,V) for(;0;)
+# define REPORTW(N,V) for(;0;)
+# define MAYREPORT(N,V) for(;0;)
+#endif
+
+typedef struct {
+ io68_t io;
+ mfp_t mfp;
+} mfp_io68_t;
+
+/* $$$ Currently hardcoded for 8Mhz cpu */
+#define cpu2bogo(mfpio,cycle) ((bogoc68_t)((cycle) * MFP_BOGO_MUL))
+#define bogo2cpu(mfpio,bogoc) ((cycle68_t)((bogoc) / MFP_BOGO_MUL))
+
+/* 00/01 GPIP General Purpose I/O */
+static int68_t mfpr_01(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(GPIP);
+ return mfp->mapGPIP;
+}
+static void mfpw_01(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ REPORTW(GPIP,v);
+ mfp->mapGPIP = v;
+}
+
+/* 01/03 AER Active Edge Register */
+static int68_t mfpr_03(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(AER);
+ return mfp->mapAER;
+}
+static void mfpw_03(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ /* $$$ Writing AER might trigger an interrupt */
+ REPORTW(AER,v);
+ mfp->mapAER=v;
+}
+
+/* 02/05 DDR Data Direction Register */
+static int68_t mfpr_05(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(DDR);
+ return mfp->mapDDR;
+}
+static void mfpw_05(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ REPORTW(DDR,v);
+ mfp->mapDDR = v;
+}
+
+/* 03/07 IERA Interrupt Enable Register A */
+static int68_t mfpr_07(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(IERA);
+ return mfp->mapIERA;
+}
+static void mfpw_07(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ /* Disabling a line clears pending interrupt on that line */
+ REPORTW(IERA,v);
+ mfp->mapIPRA &= v;
+ mfp->mapIERA = v;
+ REPORTW(IPRA,mfp->mapIPRA);
+}
+
+/* 04/09 IERB Interrupt Enable Register B */
+static int68_t mfpr_09(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(IERB);
+ return mfp->mapIERB;
+}
+static void mfpw_09(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ /* Disabling a line clears pending interrupt on that line */
+ REPORTW(IERB,v);
+ mfp->mapIPRB &= v;
+ mfp->mapIERB = v;
+ REPORTW(IPRB,mfp->mapIPRB);
+}
+
+/* 05/0B IPRA Interrupt Pending Register A */
+static int68_t mfpr_0B(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(IPRA);
+ return mfp->mapIPRA;
+}
+static void mfpw_0B(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ /* Writing IP register only clears pending interrupts. */
+ mfp->mapIPRA &= v;
+ REPORTW(IPRA,mfp->mapIPRA);
+}
+
+/* 06/0D IPRB Interrupt Pending Register B */
+static int68_t mfpr_0D(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(IPRB);
+ return mfp->mapIPRB;
+}
+static void mfpw_0D(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ /* Writing IP register only clears pending interrupts. */
+ mfp->mapIPRB &= v;
+ REPORTW(IPRA,mfp->mapIPRB);
+}
+
+/* 07/0F ISRA Interrupt In-Service Register A */
+static int68_t mfpr_0F(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(ISRA);
+ return mfp->mapISRA;
+}
+static void mfpw_0F(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ REPORTW(ISRA,v);
+ mfp->mapISRA = v;
+}
+
+/* 08/11 ISRB Interrupt In-Service Register B */
+static int68_t mfpr_11(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(ISRB);
+ return mfp->mapISRB;
+}
+static void mfpw_11(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ REPORTW(ISRB,v);
+ mfp->mapISRB = v;
+}
+
+/* 09/13 IMRA Interrupt Mask Register A */
+static int68_t mfpr_13(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(IMRA);
+ return mfp->mapIMRA;
+}
+static void mfpw_13(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ REPORTW(IMRA,v);
+ mfp->mapIMRA = v;
+}
+
+/* 0A/15 IMRB InterrupT Mask Register B */
+static int68_t mfpr_15(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(IMRB);
+ return mfp->mapIMRB;
+}
+static void mfpw_15(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ REPORTW(IMRB,v);
+ mfp->mapIMRB = v;
+}
+
+/* 0B/17 VR Vector Register */
+static int68_t mfpr_17(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(VR);
+ return mfp->mapVR;
+}
+static void mfpw_17(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ REPORTW(VR,v);
+ mfp->mapVR = v;
+}
+
+/* 0C/19 TACR Timer A Control Register */
+static int68_t mfpr_19(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(TACR);
+ return mfp->mapTACR;
+}
+static void mfpw_19(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{
+ REPORTW(TACR,v);
+ mfp_put_tcr(mfp, TIMER_A, v, bogoc);
+}
+
+/* 0D/1B TBCR Timer B Control Register */
+static int68_t mfpr_1B(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(TBCR);
+ return mfp->mapTBCR;
+}
+static void mfpw_1B(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{
+ REPORTW(TBCR,v);
+ mfp_put_tcr(mfp, TIMER_B, v, bogoc);
+}
+
+/* 0E/1D TCDCR Timers C and D Control Register */
+static int68_t mfpr_1D(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(TCDCR);
+ return mfp->mapTCDCR;
+}
+static void mfpw_1D(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{
+ REPORTW(TCDCR,v);
+ mfp_put_tcr(mfp, TIMER_C, v, bogoc);
+}
+
+/* 0F/1F TADR Timer A Data Register */
+static int68_t mfpr_1F(mfp_t * const mfp, const bogoc68_t bogoc) {
+ const int68_t ret = mfp_get_tdr(mfp, TIMER_A, bogoc);
+ REPORTA(TADR,ret);
+ return ret;
+}
+static void mfpw_1F(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{
+ REPORTW(TADR,v);
+ mfp_put_tdr(mfp, TIMER_A, v, bogoc);
+}
+
+/* 10/21 TBDR Timer B Data Register */
+static int68_t mfpr_21(mfp_t * const mfp, const bogoc68_t bogoc) {
+ const int68_t ret = mfp_get_tdr(mfp, TIMER_B, bogoc);
+ REPORTA(TBDR,ret);
+ return ret;
+}
+static void mfpw_21(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{
+ REPORTW(TBDR,v);
+ mfp_put_tdr(mfp, TIMER_B, v, bogoc);
+}
+
+/* 11/23 TCDR Timer C Data Register */
+static int68_t mfpr_23(mfp_t * const mfp, const bogoc68_t bogoc) {
+ const int68_t ret = mfp_get_tdr(mfp, TIMER_C, bogoc);
+ REPORTA(TCDR,ret);
+ return ret;
+}
+static void mfpw_23(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{
+ REPORTW(TCDR,v);
+ mfp_put_tdr(mfp, TIMER_C, v, bogoc);
+}
+
+/* 12/25 TDDR Timer D Data Register */
+static int68_t mfpr_25(mfp_t * const mfp, const bogoc68_t bogoc) {
+ const int68_t ret = mfp_get_tdr(mfp, TIMER_D, bogoc);
+ REPORTA(TDDR,ret);
+ return ret;
+}
+static void mfpw_25(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{
+ REPORTW(TDDR,v);
+ mfp_put_tdr(mfp, TIMER_D, v, bogoc);
+}
+
+/* 13/27 SCR Sync Character Register */
+static int68_t mfpr_27(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(SCR);
+ return mfp->mapSCR;
+}
+static void mfpw_27(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc) {
+ mfp->mapSCR = v;
+}
+
+/* 14/29 UCR USART Control Register */
+static int68_t mfpr_29(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(UCR);
+ return mfp->mapUCR;
+}
+static void mfpw_29(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->mapUCR=v; }
+
+/* 15/2B RSR Receiver Status Register */
+static int68_t mfpr_2B(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(RSR);
+ return mfp->mapRSR;
+}
+static void mfpw_2B(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->mapRSR=v; }
+
+
+/* 16/2D TSR Transmitter Status Register */
+static int68_t mfpr_2D(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(TSR);
+ return mfp->mapTSR;
+}
+static void mfpw_2D(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->mapTSR=v; }
+
+/* 17/2F UDR USART Data Register */
+static int68_t mfpr_2F(mfp_t * const mfp, const bogoc68_t bogoc) {
+ REPORTR(UDR);
+ return mfp->mapUDR;
+}
+static void mfpw_2F(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->mapUDR=v; }
+
+
+/* Following access are not real MFP port. Not sure what happen. */
+static int68_t mfpr_31(mfp_t * const mfp, const bogoc68_t bogoc) {
+ return mfp->map0x31;
+}
+static int68_t mfpr_33(mfp_t * const mfp, const bogoc68_t bogoc) {
+ return mfp->map0x33;
+}
+static int68_t mfpr_35(mfp_t * const mfp, const bogoc68_t bogoc) {
+ return mfp->map0x35;
+}
+static int68_t mfpr_37(mfp_t * const mfp, const bogoc68_t bogoc) {
+ return mfp->map0x37;
+}
+static int68_t mfpr_39(mfp_t * const mfp, const bogoc68_t bogoc) {
+ return mfp->map0x39;
+}
+static int68_t mfpr_3B(mfp_t * const mfp, const bogoc68_t bogoc) {
+ return mfp->map0x3B;
+}
+static int68_t mfpr_3D(mfp_t * const mfp, const bogoc68_t bogoc) {
+ return mfp->map0x3D;
+}
+static int68_t mfpr_3F(mfp_t * const mfp, const bogoc68_t bogoc) {
+ return mfp->map0x3F;
+}
+static void mfpw_31(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->map0x31=v; }
+static void mfpw_33(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->map0x33=v; }
+static void mfpw_35(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->map0x35=v; }
+static void mfpw_37(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->map0x37=v; }
+static void mfpw_39(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->map0x39=v; }
+static void mfpw_3B(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->map0x3B=v; }
+static void mfpw_3D(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->map0x3D=v; }
+static void mfpw_3F(mfp_t * const mfp, const int68_t v, const bogoc68_t bogoc)
+{ mfp->map0x3F=v; }
+
+/* MFP read jump table */
+static int68_t (* const mfpr_func32)
+(mfp_t * const, const bogoc68_t) =
+{
+ mfpr_01,mfpr_03,mfpr_05,mfpr_07,
+ mfpr_09,mfpr_0B,mfpr_0D,mfpr_0F,
+ mfpr_11,mfpr_13,mfpr_15,mfpr_17,
+ mfpr_19,mfpr_1B,mfpr_1D,mfpr_1F,
+ mfpr_21,mfpr_23,mfpr_25,mfpr_27,
+ mfpr_29,mfpr_2B,mfpr_2D,mfpr_2F,
+ mfpr_31,mfpr_33,mfpr_35,mfpr_37,
+ mfpr_39,mfpr_3B,mfpr_3D,mfpr_3F,
+};
+
+/* MFP write jump table */
+static void (* const mfpw_func32)
+(mfp_t * const, const int68_t, const bogoc68_t) =
+{
+ mfpw_01,mfpw_03,mfpw_05,mfpw_07,
+ mfpw_09,mfpw_0B,mfpw_0D,mfpw_0F,
+ mfpw_11,mfpw_13,mfpw_15,mfpw_17,
+ mfpw_19,mfpw_1B,mfpw_1D,mfpw_1F,
+ mfpw_21,mfpw_23,mfpw_25,mfpw_27,
+ mfpw_29,mfpw_2B,mfpw_2D,mfpw_2F,
+ mfpw_31,mfpw_33,mfpw_35,mfpw_37,
+ mfpw_39,mfpw_3B,mfpw_3D,mfpw_3F,
+};
+
+static int68_t _mfp_readB(mfp_io68_t * const mfpio, const int addr,
+ const bogoc68_t bogoc)
+{
+ return !(addr&1)
+ ? 0
+ : mfpr_func(addr>>1)&0x1f(&mfpio->mfp, bogoc)
+ ;
+}
+
+static void mfpio_readB(io68_t * const io)
+{
+ const bogoc68_t bogoc = cpu2bogo(io,io->emu68->cycle);
+ io->emu68->bus_data =
+ _mfp_readB((mfp_io68_t *)io,
+ io->emu68->bus_addr, bogoc);
+}
+
+static void mfpio_readW(io68_t * const io)
+{
+ const bogoc68_t bogoc = cpu2bogo(io,io->emu68->cycle);
+ /* Expected EVEN addr for 16 bit access */
+ io->emu68->bus_data =
+ _mfp_readB((mfp_io68_t *)io,
+ io->emu68->bus_addr+1, bogoc);
+}
+
+static void mfpio_readL(io68_t * const io)
+{
+ /* Expected EVEN addr for 16 bit access */
+ const bogoc68_t bogoc = cpu2bogo(io,io->emu68->cycle);
+ const int addr = io->emu68->bus_addr;
+
+ io->emu68->bus_data =
+ (_mfp_readB((mfp_io68_t *)io, addr+1, bogoc)<<16)
+ |_mfp_readB((mfp_io68_t *)io, addr+3, bogoc);
+}
+
+static inline void _mfp_writeB(mfp_io68_t * const mfpio, const int addr,
+ const int68_t v, const bogoc68_t bogoc)
+{
+ if (!(addr&1)) return;
+ mfpw_func(addr>>1)&0x1f(&mfpio->mfp, (u8)v, bogoc);
+}
+
+static void mfpio_writeB(io68_t * const io)
+{
+ mfp_io68_t * const mfpio = (mfp_io68_t * const)io;
+ const bogoc68_t bogoc = cpu2bogo(io,io->emu68->cycle);
+ _mfp_writeB(mfpio, io->emu68->bus_addr, io->emu68->bus_data, bogoc);
+}
+
+/* Expected EVEN addr for 16 bit access */
+static void mfpio_writeW(io68_t * const io)
+{
+ mfp_io68_t * const mfpio = (mfp_io68_t * const)io;
+ const bogoc68_t bogoc = cpu2bogo(io,io->emu68->cycle);
+ _mfp_writeB(mfpio, io->emu68->bus_addr+1, io->emu68->bus_data, bogoc);
+}
+
+/* Expected EVEN addr for 32 bit access */
+static void mfpio_writeL(io68_t * const io)
+{
+ mfp_io68_t * const mfpio = (mfp_io68_t * const)io;
+ const bogoc68_t bogoc = cpu2bogo(io,io->emu68->cycle);
+ _mfp_writeB(mfpio,
+ io->emu68->bus_addr+1, io->emu68->bus_data>>16, bogoc);
+ _mfp_writeB((mfp_io68_t *)io,
+ io->emu68->bus_addr+3, io->emu68->bus_data ,bogoc);
+}
+
+static int mfpio_reset(io68_t * const io)
+{
+ mfp_io68_t * const mfpio = (mfp_io68_t * const)io;
+ const bogoc68_t bogoc = cpu2bogo(io,io->emu68->cycle);
+ mfp_reset(&mfpio->mfp,bogoc);
+ return 0;
+}
+
+static interrupt68_t * mfpio_interrupt(io68_t * const io,
+ const cycle68_t cycle)
+{
+ mfp_io68_t * const mfpio = (mfp_io68_t * const)io;
+ const bogoc68_t bogoc = cpu2bogo(io,cycle);
+ interrupt68_t * const inter =
+ mfp_interrupt(&mfpio->mfp, bogoc);
+ if (inter) {
+ assert(inter->cycle < bogoc);
+ inter->cycle = bogo2cpu(io,inter->cycle);
+ assert(inter->cycle < cycle);
+ }
+ return inter;
+}
+
+static void mfpio_adjust_cycle(io68_t * const io,
+ const cycle68_t cycle)
+{
+ mfp_io68_t * const mfpio = (mfp_io68_t * const)io;
+ const bogoc68_t bogoc = cpu2bogo(io, cycle);
+ mfp_adjust_bogoc(&mfpio->mfp, bogoc);
+}
+
+void mfpio_destroy(io68_t * const io)
+{
+ mfp_io68_t * const mfpio = (mfp_io68_t * const)io;
+ if (io) {
+ mfp_cleanup(&mfpio->mfp);
+ emu68_free(io);
+ }
+}
+
+static io68_t mfp_io =
+{
+ 0,
+ "MK-68901",
+ 0xFFFFFA00, 0xFFFFFA2F,
+ mfpio_readB,mfpio_readW,mfpio_readL,
+ mfpio_writeB,mfpio_writeW,mfpio_writeL,
+ mfpio_interrupt,/* mfpio_nextinterrupt */0,
+ mfpio_adjust_cycle,
+ mfpio_reset,
+ mfpio_destroy
+};
+
+int mfpio_init(int * argc, char ** argv)
+{
+ argc = argc;
+ argv = argv;
+ return mfp_init();
+}
+
+void mfpio_shutdown(void)
+{
+ mfp_shutdown();
+}
+
+io68_t * mfpio_create(emu68_t * const emu68)
+{
+ mfp_io68_t * mfpio = 0;
+
+ if (emu68) {
+ mfpio = emu68_alloc(sizeof(*mfpio));
+ if (mfpio) {
+ mfpio->io = mfp_io;
+ mfp_setup(&mfpio->mfp);
+ }
+ }
+ return &mfpio->io;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/mfp_io.h Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/mfpemul.c Added

@@ -0,0 +1,571 @@
+/*
+ * @file mfpemul.c
+ * @brief MFP 68901 emulator (Atari ST timers)
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "mfpemul.h"
+#include <sc68/file68_msg.h>
+#include <assert.h>
+
+#define CPU 8010612u /* or 8000000u or 80006400u ? */
+#define BGM MFP_BOGO_MUL
+#define BGD MFP_BOGO_DIV
+
+#define cpp(V) ((V)*prediv_width(int)ptimer->tcr)
+#define bogotohz(V) ( ( (CPU)*BGM ) / (uint68_t)(V) )
+#define timerfrq(V) bogotohz(cpp(V))
+
+#define MYHD "mfp : "
+
+#define MFP_VECTOR_BASE (mfp->map0x17 & 0xF0)
+#define SEI (mfp->map0x17 & 0x08)
+#define AEI (!SEI)
+
+#ifndef DEBUG_MFP_O
+# define DEBUG_MFP_O 0
+#endif
+int mfp_cat = msg68_DEFAULT;
+
+/* Define for more accurate emulation (about pending bit...)
+ $$$ May be broken $$$
+*/
+#undef _MFPIO68_SUPER_EMUL_
+
+/* About cycles.
+ *
+ * The MFP timers use a different clock. Its frequency is not a
+ * multiple of the 68K one (~8Mhz).
+ * In order to convert 68K cycles to MFP ones the emulator use an
+ * internal cycle unit : a "BOGO" cycle.
+ * - 1 "BOGO" cycle => BGM (256) "8mhz 68K" cycles
+ * - 1 "BOGO" cycle => BGD (834) "mfp" cycle
+ */
+
+static const mfp_timer_def_t timer_def4 =
+{
+/* Vector level bit chan letter */
+ /* Timer A */ { 0x34>>2, 6, 1<<5, 0, 'A' },
+ /* Timer B */ { 0x20>>2, 6, 1<<0, 0, 'B' },
+ /* Timer C */ { 0x14>>2, 6, 1<<5, 2, 'C' },
+ /* Timer D */ { 0x10>>2, 6, 1<<4, 2, 'D' },
+};
+
+/* MFP prediviser value in ``bogo-cycle''. */
+static const bogoc68_t prediv_width8 = {
+ 0*BGD, 4*BGD, 10*BGD, 16*BGD,
+ 50*BGD, 64*BGD, 100*BGD, 200*BGD
+};
+
+/* Which timer will first interrupt ?
+ * It's the running timer (tcr!=0) with the lowest Cycle To Interrupt.
+ */
+static mfp_timer_t * find_next_int(const mfp_t * const mfp)
+{
+ const mfp_timer_t *ptimer, *itimer;
+
+ /* find first running timer */
+ for(itimer=0, ptimer=mfp->timers;
+ ptimer<mfp->timers+4 && !ptimer->tcr;
+ ++ptimer)
+ ;
+ if (ptimer < mfp->timers+4) {
+ /* Got one. */
+ bogoc68_t cti = ptimer->cti;
+ itimer = ptimer;
+ /* Now testing remaining timers for a lower CTI */
+ while (++ptimer < mfp->timers+4) {
+ if (ptimer->tcr && ptimer->cti<cti) {
+ cti = ptimer->cti;
+ itimer = ptimer;
+ }
+ }
+ }
+ return (mfp_timer_t *)itimer;
+}
+
+/* Number of bogo-cycle before this timer interruption. */
+/* static inline bogoc68_t timer_ncti(const mfp_timer_t * const ptimer) */
+/* { */
+/* return ptimer->tdr_cur * ptimer->psc_width - ptimer->psc_cnt; */
+/* } */
+
+/* Get number of tdr_cur decrements after nbogoc cycle. */
+/* static inline uint68_t timer_ntdr(const mfp_timer_t * const ptimer, */
+/* const bogoc68_t nbogoc) */
+/* { */
+/* ncti = tdr_cur * psc_width - psc_cnt */
+/* ncti + psc_cnt = tdr_cur * psc_width */
+/* tdr_cur = (ncti + psc_cnt) / psc_width */
+/* return (nbogoc+ptimer->psc_cnt) / ptimer->psc_width; */
+/* } */
+
+
+/* ,-----------------------------------------------------------------.
+ * | MFP timer register access |
+ * `-----------------------------------------------------------------'
+ */
+
+/*
+ <psw>
+ I 4 | 3 | 2 | 1 I 4 | 3 | 2 | 1 I 4 | 3 | 2 | 1 I
+ 444444333333222222111111444444333333222222111111444444333333222222111111
+ BBBBBBAAAAAA999999888888777777666666555555444444333333222222111111000000
+*/
+
+static inline
+int timer_get_tdr(const mfp_timer_t * const ptimer, const bogoc68_t bogoc)
+{
+ assert(ptimer->cti >= bogoc);
+ assert(ptimer->tcr > 0 && ptimer->tcr < 8);
+ if (1) {
+ const bogoc68_t cti = ptimer->cti - bogoc; /* cycles to interrupt */
+ const uint68_t psw = prediv_widthptimer->tcr; /* cycles count-down */
+ const uint68_t cnt = cti/psw; /* count-down */
+ const uint68_t tdr = cnt%ptimer->tdr_res+1;
+ return tdr;
+ }
+}
+
+/* Control register changes, adjust ``cti'' (cycle to next interrupt)
+ *
+ * This case is a bit tricky : Changing timer prescale on the fly
+ * may have unpredictable result mostly because we dunno how
+ * prescaler works exactly. Here I assume the prescaler is
+ * resetted.
+ *
+ * !!! chipmon of synergy does !!!
+ *
+ */
+static inline
+void reconf_timer(mfp_timer_t * const ptimer, int tcr, const bogoc68_t bogoc)
+{
+#if !defined(NDEBUG) || !defined(CPP_SUPPORTS_VA_MACROS)
+ uint_t frq = timerfrq(ptimer->tdr_res); /* old frequency */
+#endif
+ const bogoc68_t cti = ptimer->cti - bogoc; /* cycles to interrupt */
+ const uint_t psw = prediv_widthptimer->tcr; /* cycles count-down */
+ const uint_t cnt = cti/psw; /* count-down */
+ const uint_t psr = cti % psw;
+ /* const uint68_t psc = psw-psr; */
+
+ /* cnt%ptimer->tdr_res+1; no MODULO since TDR may have change and anyway
+ cti was calculated with 1 timer cycle !!! */
+ const uint_t tdr = cnt+1;
+ const cycle68_t new_psw = prediv_width(int)tcr;
+
+ if (bogoc > ptimer->cti) {
+ TRACE68(mfp_cat,
+ MYHD "timer-%c -- reconf out of range -- @%u > cti:%u\n",
+ ptimer->def.letter, (unsigned) bogoc, (unsigned) ptimer->cti);
+ ptimer->cti = bogoc + psw * ptimer->tdr_res;
+ } else {
+ ptimer->cti = bogoc + psr + (tdr-1) * new_psw;
+ ptimer->cti = bogoc + /* psr + */ (tdr/* -1 */) * new_psw;
+ }
+
+ ptimer->tcr = tcr;
+
+ TRACE68(mfp_cat,
+ MYHD "timer-%c -- reconf @%u cti:%u cpp:%u -- %u:%uhz\n",
+ ptimer->def.letter, (unsigned) bogoc,
+ (unsigned) ptimer->cti, (unsigned) cpp(ptimer->tdr_res),
+ (unsigned) frq, (unsigned) timerfrq(ptimer->tdr_res));
+}
+
+/* Stop a running timer: tcr !0->0
+
+ $$$ Must check whether:
+ - 1) tdr is reset when timer stop.
+ - 2) tdr keeps its current value and can be resume later.
+
+ $$$ Testing with Scavenger Leif Sid Version tend to prove the 2)
+ case is good. However the version of emulator used does not
+ work properly with Scavenger DBA tune so this deduction may be
+ a side effect of the bug.
+
+ $$$ After verification on a real ST the previous assumption is
+ true. Definitively mfp timers can resume. We just need to know
+ more about the predivisor. Currently assuming the predivisor
+ count is reset when the timer resumes which seems much more
+ likely.
+
+ $$$ Motorola Datasheet: The content of the timer's main counter are
+ not affected although any residual count in prescaler is lost.
+
+*/
+static inline
+void stop_timer(mfp_timer_t * const ptimer, const bogoc68_t bogoc)
+{
+ if (ptimer->tcr)
+ ptimer->tdr_cur = timer_get_tdr(ptimer, bogoc);
+ ptimer->tcr = 0;
+ ptimer->psc = 0;
+}
+
+/* Resume a stopped timer: tcr 0->!0
+ */
+static inline
+void resume_timer(mfp_timer_t * const ptimer, int tcr, bogoc68_t bogoc)
+{
+ ptimer->tcr = tcr;
+ ptimer->cti = bogoc + ptimer->tdr_cur * prediv_widthtcr - ptimer->psc;
+
+ TRACE68(mfp_cat,
+ MYHD "timer-%c -- resume @%u cti:%u cpp:%u "
+ "tdr:%u/%u psw:%u(%u) -- %uhz\n",
+ ptimer->def.letter, (unsigned) bogoc, (unsigned) ptimer->cti,
+ (unsigned) cpp(ptimer->tdr_res),
+ (unsigned) ptimer->tdr_cur, (unsigned) ptimer->tdr_res,
+ (unsigned) prediv_widthptimer->tcr, (unsigned) ptimer->tcr,
+ (unsigned) timerfrq(ptimer->tdr_res));
+}
+
+/* Read timer data register:
+
+ $$$ TO VERIFY: May be reset value is reload when timer is stopped!
+ Anyway the stop timer take care of that so returning tdr_cur
+ here sohould be safe.
+
+ $$$ VERIFIED: Both experience and Motorola Datasheet verify that
+ the timer counter value is not affected unless TDR is written.
+
+*/
+
+int68_t mfp_get_tdr(mfp_t * const mfp, const int timer, const bogoc68_t bogoc)
+{
+ mfp_timer_t * const ptimer = &mfp->timerstimer&3;
+
+ if (ptimer->tcr) {
+ ptimer->tdr_cur = timer_get_tdr(ptimer, bogoc);
+ }
+ return(u8)ptimer->tdr_cur;
+}
+
+/* Write Timer Data Register:
+
+ Changing the value of the TDR change the value of the internal
+ reset latch. However when the timer is stopped the reset value is
+ reload into TDR in the next MFP cycle (so it seems to be the case
+ according to my test on a real ST). The tricky point is that as MFP
+ and CPU clock are separate (for Atari-ST) reading the value just
+ after a write can occur before the next MFP cycle in which case the
+ current TDR (not the one written) is returned! Fortunatly we don't
+ really need to emulate this since it is more a glitch than anything
+ and no one should have used it!
+
+ Motorola Datasheet: the TDRs contain the value of their respective
+ main counter. This value was captured on the last low-to-high
+ transistion of the data strobe pin. The main counter is initialized
+ by writting the to the TDR. If the timer is stopped the data is
+ loaded simultaneously into both TDR and maincounter. If the TDR is
+ written to while the timer is enabled, the value is not loaded into
+ the timer until the timer counts through 01. If a write is
+ performed while the timer is counting through 01 then an
+ INDETERMINATE value is loaded into the main counter.
+
+*/
+void mfp_put_tdr(mfp_t * const mfp, int timer, int68_t v, const bogoc68_t bogoc)
+{
+ mfp_timer_t * const ptimer = &mfp->timerstimer&3;
+#ifndef NDEBUG
+ const uint_t old_tdr = ptimer->tdr_res;
+#endif
+
+ /* Interrupt when count down to 0 so 0 is 256 */
+ v = (u8)v; v += (!v)<<8;
+ ptimer->tdr_res = v;
+
+ if (!ptimer->tcr) {
+ ptimer->tdr_cur = v;
+ TRACE68(mfp_cat,
+ MYHD "timer-%c -- reload TDR @%u -- %u\n",
+ ptimer->def.letter, (unsigned) bogoc, (unsigned) ptimer->tdr_res);
+ }
+#ifndef NDEBUG
+ else if (ptimer->tcr && v != old_tdr) {
+ uint_t old_frq = timerfrq(old_tdr);
+ TRACE68(mfp_cat,
+ MYHD "timer-%c -- change @%u cti:%u psw:%u(%u) cpp:%u"
+ " -- %u(%u) -> %u(%u)hz\n",
+ ptimer->def.letter, (unsigned) bogoc, (unsigned) ptimer->cti,
+ (unsigned) prediv_widthptimer->tcr, (unsigned) ptimer->tcr,
+ (unsigned) cpp(ptimer->tdr_res),
+ (unsigned) old_frq, (unsigned) old_tdr,
+ (unsigned) timerfrq(ptimer->tdr_res), (unsigned) ptimer->tdr_res);
+ }
+#endif
+}
+
+/* Write Timer Control Register
+
+ $$$ From Motorola Datasheet: when resetting ta0/tb0 (set bit 4) of
+ TDCRA/B the other bits in TCR must be written with their previous
+ value to avoid altering the operating mode; this verify the fact
+ than writting 2 times the same value in the predivisor does not
+ affect its count.
+
+*/
+static void mfp_put_tcr_bogo(mfp_timer_t * const ptimer,
+ int v, const bogoc68_t bogoc)
+{
+ assert(v >= 0 && v < 8);
+ if (v != ptimer->tcr) {
+ if (!v) {
+ stop_timer(ptimer,bogoc);
+ } else if (!ptimer->tcr) {
+ resume_timer(ptimer, v, bogoc);
+ } else {
+ reconf_timer(ptimer, v, bogoc);
+ }
+ }
+}
+
+void mfp_put_tcr(mfp_t * const mfp,
+ int timer, int68_t v, const bogoc68_t bogoc)
+{
+ assert( (timer & 3) == timer);
+ if (timer < TIMER_C) {
+ /* Timer A or B */
+ mfp->map0x19+(timer<<1) = v &= 15;
+
+ if (v >= 8) {
+ /* PWM or ECM */
+ TRACE68(mfp_cat,
+ MYHD "timer-%c -- %s-mode not supported -- %02x\n",
+ timer_deftimer.letter,
+ v == 8 ? "event-count" : "pulse-width", v);
+ assert(!"mfp mode not supported");
+ v = 0; /* stop timer disable */
+ }
+ mfp_put_tcr_bogo(mfp->timers+timer, v, bogoc);
+ } else {
+ /* Timer C and D do not have ECM nor PWM */
+ mfp->map0x1D = v &= 0x77;
+ mfp_put_tcr_bogo(mfp->timers+TIMER_C, v>>4, bogoc);
+ mfp_put_tcr_bogo(mfp->timers+TIMER_D, v&07, bogoc);
+ }
+}
+
+/* ,-----------------------------------------------------------------.
+ * | MFP next interuption |
+ * `-----------------------------------------------------------------'
+ */
+
+bogoc68_t mfp_nextinterrupt(const mfp_t * const mfp)
+{
+ const mfp_timer_t * itimer = find_next_int(mfp);
+ const bogoc68_t bogoc =
+ (!itimer) ? IO68_NO_INT : itimer->cti;
+ return bogoc;
+}
+
+static inline
+void timer_interrupt(mfp_t * const mfp, mfp_timer_t * const ptimer)
+{
+ /* Fill interrupt info struct. */
+ ptimer->interrupt.vector = MFP_VECTOR_BASE + ptimer->def.vector;
+ ptimer->interrupt.level = ptimer->def.level;
+ ptimer->interrupt.cycle = ptimer->cti;
+ ptimer->cti += prediv_widthptimer->tcr * ptimer->tdr_res;
+ ptimer->tdr_cur = ptimer->tdr_res;
+}
+
+interrupt68_t * mfp_interrupt(mfp_t * const mfp, const bogoc68_t bogoc)
+{
+ mfp_timer_t * itimer;
+
+ /* Better recheck which timer interrupts because previous interrupt
+ code may have modified timer.
+ */
+ while ((itimer = find_next_int(mfp)) && itimer->cti < bogoc) {
+ /* Have a candidate */
+ mfp_timer_t * const ptimer = itimer;
+
+ /* Process interruption. */
+ timer_interrupt(mfp,ptimer);
+
+#ifndef _MFPIO68_SUPER_EMUL_
+ /* ======================== */
+ /* Simple Emulation Version */
+ /* ======================== */
+ if (mfp->map0x07+ptimer->def.channel &
+ mfp->map0x13+ptimer->def.channel &
+ ptimer->def.bit )
+ {
+ ++ptimer->int_fall;
+ return &ptimer->interrupt;
+ }
+#else
+ /* ========================== */
+ /* Accurate Emulation Version */
+ /* ========================== */
+
+ /* Test Interrupt Enable */
+ if ( mfp->map0x07+ptimer->channel & ptimer->bit ) {
+ /* Set Interrupt Pending Bit */
+ mfp->map0x0B+ptimer->channel |= ptimer->bit;
+
+ /* Test Interrupt In Service */
+ if (!(mfp->map0x0F+ptimer->channel&ptimer->bit)) {
+ /* SEI : Set Interrupt In Service */
+ if (SEI) mfp->map0x0B+ptimer->channel |= ptimer->bit;
+ /* Test Interrupt Mask */
+ if (mfp->map0x13+ptimer->channel & ptimer->bit) {
+ ++ptimer->int_fall;
+ return &ptimer->interrupt;
+ }
+ }
+ }
+#endif
+ /* For some reason interruption was cancelled. */
+ ++ptimer->int_mask;
+ }
+ return 0;
+}
+
+/* ,-----------------------------------------------------------------.
+ * | MFP adjust cycle base |
+ * `-----------------------------------------------------------------'
+ */
+
+void mfp_adjust_bogoc(mfp_t * const mfp, const bogoc68_t bogoc)
+{
+ mfp_timer_t *ptimer;
+
+ if (!bogoc) return;
+ for (ptimer = mfp->timers; ptimer != mfp->timers+4; ++ptimer) {
+ if (ptimer->tcr) {
+ if (ptimer->cti < bogoc) {
+ TRACE68(mfp_cat,
+ MYHD "timer-%c -- adjust -- cti:%u cycle:%u\n",
+ ptimer->def.letter, (unsigned) ptimer->cti, (unsigned) bogoc);
+ }
+ assert(ptimer->cti >= bogoc);
+ while (ptimer->cti < bogoc) {
+ /* $$$ !!! SHOULD NOT HAPPEN !!! */
+ ++ptimer->int_lost;
+ ptimer->cti += cpp(ptimer->tdr_res);
+ }
+ if (ptimer->int_lost) {
+ msg68_critical(MYHD "timer-%c -- adjust has lost interrupt -- %d\n",
+ ptimer->def.letter, ptimer->int_lost);
+ ptimer->int_lost = 0;
+ }
+ ptimer->cti -= bogoc;
+ }
+ }
+}
+
+/* ,-----------------------------------------------------------------.
+ * | MFP reset |
+ * `-----------------------------------------------------------------'
+ */
+
+static void reset_timer(mfp_timer_t * const ptimer, bogoc68_t bogoc)
+{
+ ptimer->cti = bogoc;
+ ptimer->tcr = 0;
+ ptimer->psc = 0;
+
+ /* $$$ Motorola Datasheet: timer counters should not be cleared
+ but we don't really care
+ */
+ ptimer->tdr_res = 256;
+ ptimer->tdr_cur = ptimer->tdr_res;
+ ptimer->int_lost = 0;
+ ptimer->int_mask = 0;
+ ptimer->int_fall = 0;
+}
+
+static int mfp_reset_bogo(mfp_t * const mfp, const bogoc68_t bogoc)
+{
+ int i;
+
+ for (i=0; i<(int)sizeof(mfp->map); i++) {
+ mfp->mapi=0;
+ }
+ mfp->map0x17 = 0x40;
+ mfp->map0x01 = 0x80;
+ for (i=0; i<4;i++) {
+ reset_timer(mfp->timers+i, bogoc);
+ }
+ return 0;
+}
+
+int mfp_reset(mfp_t * const mfp, const bogoc68_t bogoc)
+{
+ return mfp_reset_bogo(mfp, bogoc);
+}
+
+/* ,-----------------------------------------------------------------.
+ * | MFP setup |
+ * `-----------------------------------------------------------------'
+ */
+
+static void setup_timer(mfp_timer_t * const ptimer, int idx, bogoc68_t bogoc)
+{
+ ptimer->def = timer_defidx&3;
+ ptimer->tdr_res = 256;
+ ptimer->tdr_cur = ptimer->tdr_res;
+ reset_timer(ptimer, bogoc);
+}
+
+int mfp_setup(mfp_t * const mfp)
+{
+ int ret = -1;
+
+ if (mfp) {
+ setup_timer(&mfp->timers0, 0, 0);
+ setup_timer(&mfp->timers1, 1, 0);
+ setup_timer(&mfp->timers2, 2, 0);
+ setup_timer(&mfp->timers3, 3, 0);
+ ret = mfp_reset_bogo(mfp, 0);
+ }
+ return ret;
+}
+
+void mfp_cleanup(mfp_t * const mfp)
+{
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | MFP init |
+ * `-----------------------------------------------------------------'
+ */
+
+int mfp_init(void)
+{
+ if (mfp_cat == msg68_DEFAULT)
+ mfp_cat = msg68_cat("mfp","MFP-68901 emulator", DEBUG_MFP_O);
+ return 0;
+}
+
+void mfp_shutdown(void)
+{
+ msg68_cat_free(mfp_cat);
+ mfp_cat = msg68_DEFAULT;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/mfpemul.h Added

@@ -0,0 +1,1353 @@
+/**
+ * @ingroup lib_io68
+ * @file io68/mfpemul.h
+ * @brief MFP-68901 emulator header.
+ * @author Benjamin Gerard
+ * @date 1999/03/20
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef IO68_MFPEMUL_H
+#define IO68_MFPEMUL_H
+
+#include "io68_api.h"
+#include "emu68/struct68.h"
+
+/**
+ * @defgroup lib_io68_mfp MFP-68901 emulator
+ * @ingroup lib_io68
+ * @brief MFP-68901 (Atari-ST timers) emulator.
+ *
+ * Motorola Multi Function Peripheral is a multi purpose IO chip:
+ * - 8 bit parallele port.
+ * - Each bit has indepedant direction
+ * - Each bit can be a interruption source
+ * - 16 interruption sources
+ * - 4 universal timers (most part of this emulator)
+ * - Integrated serial interface.
+ * - 24 registers
+ *
+ * @p Registers
+ *
+ * - 00 @b GPIP (General Purpose I/O Interrupt port):
+ *
+ * Data Register for the 8 bit port for reading or writing.
+ * - bit#0 : Centronics (parrallele port)
+ * - bit#1 : Rs232 carrier detection
+ * - bit#1 : Rs232 CTS (clear to send)
+ * - bit#3 : Blitter
+ * - bit#4 : MIDI/Keyboard irq
+ * - bit#5 : FDC/DMA interrupt
+ * - bit#6 : Rs232 ring
+ * - bit#7 : Monochorm monitor detect
+ *
+ * - 01 @b AER (Active Edge Register):
+ *
+ * If port's bit are an interruption source this register selects
+ * interruption direction (0:descending 1:ascending).
+ *
+ * The AER allows each GPIP line to produce an interrupt on either a
+ * one-to-zero or a zero-to-one transition. Writing a zero to the
+ * appropriate edge bit of the AER causes the associated input to
+ * generate an interrupt on the one-to-zero transition. Writing a
+ * one to the edge bit produces an interrupt on the zero-to-one
+ * transition of the corresponding line. When the processor sets a
+ * bit, inter-rupts will be generated on the rising edge of the
+ * associated input signal. When the processor clears a bit,
+ * interrupts will be generated on the falling edge of the
+ * associated input signal.
+ *
+ * GPIP7 | GPIP6 | GPIP5 | GPIP4 | GPIP3 | GPIP2 | GPIP1 | GPIPO 
+ * RESET: 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 
+ *
+ * @note The inputs to the exclusive-OR of the transition detector
+ * are the edge bit and the input buffer. As a result, writing
+ * the AER may cause an interrupt-producing transition,
+ * depending upon the state of the input. So, the AER should
+ * be configured before enabling interrupts via IERA and
+ * IERB. Also, changing the edge bit while interrupts are
+ * enabled may cause an interrupt on the corresponding
+ * channel.
+ *
+ * - 02 @b DDR (Data Direction Register):
+ *
+ * Port's bit direction select. 0 => input / 1 => output.
+ *
+ * The DDR allows the programmer to define I0-I7 as inputs or
+ * outputs by writing the corresponding bit. Writing a zero to any
+ * bit of the DDR causes the corresponding interrupt I/O pin to be a
+ * high-impedance input. Writing a one to any bit of the DDR causes
+ * the corresponding pin to be configured as a push-pull output.
+ *
+ * GPIP7 | GPIP6 | GPIP5 | GPIP4 | GPIP3 | GPIP2 | GPIP1 | GPIPO 
+ * RESET: 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 
+ *
+ *
+ * - 03 @b IERA (Interrupt Enable Register A)
+ * - 04 @b IERB (Interrupt Enable Register B)
+ *
+ * Control the 16 interrupt source. 0 => Disable / 1 => Enable.
+ *
+ * The interrupt channels are individually enabled or disabled by
+ * writing a one or a zero, respectively, to the appropriate bit of
+ * IERA or IERB. The processor may read these registers at any time.
+ *
+ * When a channel is enabled, interrupts received on the channel are
+ * recognized by the MFP, and IRQ is asserted to the processor,
+ * indicating that interrupt service is required. On the other hand,
+ * a disabled channel is completely inactive; interrupts received on
+ * the channel are ignored by the MFP.
+ *
+ * Writing a zero to a bit of IERA or IERB causes the corresponding
+ * bit of the IPR to be cleared, which terminates all interrupt
+ * service requests for the channel and also negates IRQ unless
+ * interrupts are pending from other sources. Dis-abling a channel,
+ * however, does not affect the corresponding bit in ISRA or
+ * ISRB. Therefore, if the MFP is in the software end-of-interrupt
+ * mode and an interrupt is in service when a channel is disabled,
+ * the in-service bit of that channel will remain set until cleared
+ * by software.
+ *
+ * - iera bit#7 : bit 7 of I/O port (highest priority)
+ * - iera bit#6 : bit 6 of I/O port
+ * - iera bit#5 : Timer A
+ * - iera bit#4 : Receive Buffer Full
+ * - iera bit#3 : Receive Error
+ * - iera bit#2 : Send Buffer Empty
+ * - iera bit#1 : Send Error
+ * - iera bit#0 : Timer B
+ * - ierb bit#7 : bit 5 of I/O port
+ * - ierb bit#6 : bit 4 of I/O port
+ * - ierb bit#5 : Timer C
+ * - ierb bit#4 : Timer D
+ * - ierb bit#3 : bit 3 of I/O port
+ * - ierb bit#2 : bit 2 of I/O port
+ * - ierb bit#1 : bit 1 of I/O port
+ * - ierb bit#0 : bit 0 of I/O port (lowest priority)
+ *
+ * - 05 @b IPRA (Interrupt Pending Register A)
+ * - 06 @b IPRB (Interrupt Pending Register B)
+ *
+ * Bit is set if an interruption occurs. Interruption have to be
+ * enable (see IER). If the MFP can produce an interruption vector
+ * the bit is cleared automatically at this moment. In the contrary
+ * the bit should be clear by writing this register (~1<<bit).
+ *
+ * When an interrupt is received on an enabled channel, the
+ * corresponding interrupt pending bit is set in IPRA or IPRB. In a
+ * vectored interrupt scheme, this bit will be cleared when the
+ * processor acknowledges the interrupting channel and the MFP
+ * responds with a vector number. In a polled interrupt scheme, the
+ * IPRs must be read to determine the interrupting channel, and then
+ * the interrupt pending bit is cleared by the interrupt handling
+ * routine without performing an interrupt acknowledge sequence.
+ *
+ * - 07 @b ISRA (Interrupt In Service Register A)
+ * - 08 @b ISRB (Interrupt In Service Register B)
+ *
+ * In AEI mode the bit is cleared after the MFP has produced the
+ * interruption vector and a new event can trigger a new
+ * interruption while another is been proced by the CPU. In SEI mode
+ * the bit is set and the interrupt routine have to clear it by
+ * writing this register (~1<<bit). While ISR bit is 1 all less
+ * prioritary bit are unmasked (?). When IPR is cleared (vector has
+ * been produced) a similar interrupt may occur. Anyway this
+ * interruption and the one less prioritary can be process only if
+ * ISR is disabled.
+ *
+ * These registers indicate whether interrupt processing is in
+ * progress for a certain channel. A bit is set whenever an
+ * interrupt vector number is passed for a interrupt channel and the
+ * S-bit of the vector register is a one. The bit is cleared
+ * whenever interrupt service is complete for an associated
+ * interrupt channel, the S-bit of the vector register is cleared,
+ * or the processor writes a zero to the bit.
+ *
+ * - 09 @b IMRA (Interrupt Mask Register A)
+ * - 0A @b IMRB (Interrupt Mask Register B)
+ *
+ * If register allow ennable interrupt event to occur but not to
+ * produce an interrupt if corresponding bit in IMR is clear.
+ *
+ * Interrupts are masked for a channel by clearing the appropriate
+ * bit in IMRA or IMRB. Even though an enabled channel is masked,
+ * the channel will recognize subsequent interrupts and set its
+ * interrupt pending bit. However, the channel is prevented from
+ * requesting interrupt service (!IRQ to the processor) as long as
+ * the mask bit for that channel is cleared. If a channel is
+ * requesting interrupt service at the time that its corresponding
+ * bit in IMRA or IMRB is cleared, the request will cease, and !IRQ
+ * will be negated unless another channel is requesting interrupt
+ * service. Later, when the mask bit is set, any pending interrupt
+ * on the channel will be processed according to the channel's
+ * assigned priority. IMRA and IMRB may be read at any time. Figure
+ * 4 shows a conceptual circuit of an MFP interrupt channel.
+ *
+ * - 0B @b VR (Vector Register)
+ *
+ * Vector Register (VR) This 8-bit register determines the four most
+ * significant bits in the interrupt vector format and which
+ * end-of-interrupt mode is used in a vectored interrupt scheme. The
+ * vector register should be written to before writing to the
+ * interrupt mask or enable registers to ensure that the MC68901
+ * responds to an interrupt acknowledge cycle with a vector number
+ * that is not in the range of allowable user vectors.
+ *
+ * V7 | V6 | V5 | V4 | S | - | - | - 
+ * Reset: 0 | 0 | 0 | 0 | 0 | U | U | U 
+ *
+ * - V7–V4 Written by user to set the most significant four bits of
+ * interrupt vector number.
+ * - S In-Service Register Enable
+ * - 1= Software end-of-interrupt mode and in-service register bits enabled.
+ * - 0= Automatic end-of-interrupt mode and in-service register bits forced low.
+ * - U Not used
+ *
+ * - 0C @b TACR (Timer A Control Register) 0|0|0|R|E|A|A|A
+ * - 0D @b TBCR (Timer B Control Register) 0|0|0|R|E|B|B|B
+ * - 0E @b TCDCR (Timer C/D Control Register) 0|C|C|C|0|D|D|D
+ * - 0F @b TADR (Timer A Data Register) $00=$100
+ * - 10 @b TBDR (Timer B Data Register) $00=$100
+ * - 11 @b TCDR (Timer C Data Register) $00=$100
+ * - 12 @b TDDR (Timer D Data Register) $00=$100
+ *
+ * @see Programming MFP Timers
+ *
+ * - 13 @b SCR (Synchronous Character Register)
+ *
+ * Within a syncronous data transfer writing a specific value in
+ * this register use to start transfer as soon has it is recieved.
+ *
+ * - 14 UCR,USART (Control Register)
+ *
+ * USART is Universal Synchronous/Asynchronous Receiver/Transmitter.
+ * - bit#0 : unused
+ * - bit#1 : 0:odd 1:even
+ * - bit#2 : 0:parity-off 1:parity-on
+ * - bit#3-4 : Transfert mode
+ * -00 Start 0, Stop 0, Synchronous
+ * -01 Start 1, Stop 1, Asynchronous
+ * -10 Start 1, Stop 1.5, Asynchronous
+ * -11 Start 1, Stop 2, Asynchronous
+ * - bit#5-6 : Data Length (8-value)
+ * - bit#7 : 0 use Timer-C frequency directly (synchornous only),
+ * 1 use predivisor by 16
+ *
+ * - 15 RSR (Receiver Status Register)
+ *
+ * - bit#0 : Receiver Enable Bit
+ * - bit#1 : Synchronous Strip Enable (sync)
+ * - bit#2 : Match (sync)/Character in progress (async)
+ * - bit#3 : Found-Search(sync)/Break Detect(async)
+ * - bit#4 : Frame Error
+ * - bit#5 : Parity Error
+ * - bit#6 : Overrun Error
+ * - bit#7 : Buffer Full
+ *
+ * - 16 TSR (Tranmitter Status Register)
+ *
+ * - bit#0 : Transmitter Enable
+ * - bit#1 : High bit
+ * - bit#2 : Low bit
+ * - bit#3 : Break
+ * - bit#4 : End of transmission
+ * - bit#5 : Auto Turnaround
+ * - bit#6 : Underrun Error
+ * - bit#7 : Buffer Empty
+ *
+ * - 17 UDR,USART (DataRegister)
+ *
+ * Data to send (write access) or recieve (read access)
+ *
+ * @p MFP interrupt vector table
+ *
+ * MSB of the vector number (the x value below) is stored in the MFP
+ * vector register (register #11) bit#4 to bit#7.
+ *
+ * - x0 (initially disabled)-Parallel port interrupt handler
+ * - x1 (initially disabled)-RS-232 carrier detect pin handler
+ * - x2 (initially disabled)-RS-232 clear to send pin handler
+ * - x3 (initially disabled)-Graphics blitter chip done interrupt
+ * handler (see below!)
+ * - x4 (initially disabled) MFP Timer D done handler
+ * - x5 200Hz System Clock (MFP Timer C) Handler
+ * - x6 Keyboard or MIDI interrupt handler
+ * - x7 (initially disabled) Floppy/hard disk data request handler
+ * - x8 (initially disabled) Horizontal blank counter/MFP Timer B
+ * - x9 RS-232 transmit error handler
+ * - xA RS-232 transmit buffer empty handler
+ * - xB RS-232 receive error handler
+ * - xC RS-232 receive buffer full handler
+ * - xD (initially disabled) MFP timer A
+ * - xE (initially disabled) RS-232 ring detect pin
+ * - xF (initially disabled) Monochrome/color monitor change detecter
+ *
+ *
+ * Technical Summary
+ *
+ * Multifunction Peripheral
+ *
+ * The MC68901 multifunction peripheral (MFP) is a member of the
+ * M68000 Family of peripherals. The MFP directly interfaces with
+ * the MC68000 microprocessor via the asynchronous bus
+ * structure. Both vectored and polled interrupt schemes are
+ * supported with the MFP, providing unique vector number generation
+ * for each of its 16 interrupt sources. Additionally, handshake
+ * lines are provided to facilitate direct memory access controller
+ * (DMAC) interfacing.
+ *
+ * The MC68901 performs many of the functions common to most
+ * micro-processor-based systems. The following resources are
+ * available to the user:
+ *
+ * * Eight Individually Programmable I/O Pins with Interrupt
+ * Capability
+ * * 16-Source Interrupt Controller with Individual Source Enable
+ * and Masking
+ * * Four Timers, Two of which Are Multimode Timers
+ * * Single-Channel, Full-Duplex Universal Synchronous/Asynchronous
+ * Receiver-Transmitter (USART) That Supports Asynchronous and,
+ * with the Addition of a Polynomial Generator Checker, Byte
+ * Synchronous Formats
+ *
+ * INTERRUPT PROCESSING
+ *
+ * Each MFP provides individual interrupt capability for its various
+ * functions. When an interrupt is received on one of the external
+ * interrupt channels or from one of the internal interrupt
+ * channels, the MFP will request interrupt service. The 16
+ * interrupt channels are assigned a fixed priority so that multiple
+ * pending interrupts are serviced according to their relative
+ * importance. Since the MFP can generate 16 vector numbers, the
+ * unique vector number that corresponds to the highest priority
+ * channel having a pending interrupt is presented to the processor
+ * during an interrupt acknowledge cycle. This unique vector number
+ * allows the processor to immediately begin execution of the
+ * interrupt handler for the interrupting source, decreasing
+ * interrupt latency.
+ *
+ * Interrupt Channel Prioritization
+ *
+ * The 16 interrupt channels are prioritized from highest (I7) to
+ * lowest (I0). The priority of the interrupt is determined by the
+ * least significant four bits in the interrupt vector number, which
+ * is internally generated by the MFP. Pending interrupts are
+ * presented to the processor in order of priority unless they have
+ * been masked. By selectively masking interrupts, the channels are,
+ * in effect, reprioritized.
+ *
+ * Interrupt Vector Number
+ *
+ * During an interrupt acknowledge cycle, a unique 8-bit interrupt
+ * vector number, which corresponds to the specific interrupt source
+ * requesting service, is pre-sented to the system.
+ *
+ * V7 | V6 | V5 |V4 | !V3 | !V2 | !V1 | !V0 
+ *
+ * - V7-V4 — Copied from the vector register
+ * - !V3-!V0 — Determine highest priority channel requesting interrupt
+
+ *
+ * @p Nesting MFP Interrupts
+ *
+ * In an M68000 vectored interrupt system, the MFP is assigned to
+ * one of seven possible interrupt levels. When an interrupt is
+ * received from the MFP, an interrupt acknowledge for that level is
+ * initiated. Once an interrupt is recognized at a particular level,
+ * interrupts at the same level or below are masked by the
+ * processor. As long as the processor's interrupt mask is
+ * unchanged, the M68000 interrupt structure prohibits nesting the
+ * interrupts at the same interrupt level. However, additional
+ * interrupt requests from the MFP can be recognized before a
+ * previous channel's interrupt service routine is finished by
+ * lowering the processor's interrupt mask to the next lower
+ * interrupt level within the interrupt handler.
+ *
+ * When nesting MFP interrupts, it may be desirable to permit
+ * interrupts on any MFP channel, regardless of its priority, to
+ * preempt or delay interrupt processing of an earlier channel's
+ * interrupt service request. It may be desirable to only allow
+ * subsequent higher priority channel interrupt requests to
+ * supercede previously recognized lower priority interrupt
+ * requests. The MFP interrupt structure provides the flexibility by
+ * offering two end-of-interrupt options for vectored interrupt
+ * schemes. Note that the end-of-interrupt modes are not active in a
+ * polled interrupt scheme.
+ *
+ * @p GPIP general-Purpose IO Port
+ *
+ * GENERAL-PURPOSE I/O PORT
+ *
+ * The general-purpose I/O port (GPIP) provides eight I/O lines
+ * (I0-I7) that may be operated as either inputs or outputs under
+ * software control. In addition, these lines may optionally
+ * generate an interrupt on either a positive transition or a
+ * negative transition of the input signal. The flexibility of the
+ * GPIP allows it to be configured as an 8-bit I/O port or for bit
+ * I/O. Since interrupts are enabled on a bit-by-bit basis, a subset
+ * of the GPIP can be programmed as handshake lines, or the port can
+ * be connected to as many as eight external interrupt sources,
+ * which would be prioritized by the MFP interrupt controller for
+ * the interrupt service.
+ *
+ * M6800 INTERRUPT CONTROLLER
+ *
+ * The MFP interrupt controller is particularly useful in a system
+ * having many M6800-type devices. Typically, in a vectored M68000
+ * system, M6800 peripherals use the autovector corresponding to
+ * their assigned interrupt level since they cannot provide a vector
+ * number in response to an interrupt acknowledge cycle. The
+ * autovector interrupt handler must then poll all M6800 devices at
+ * that interrupt level to determine which device is requesting
+ * service. However, by tying the IRQ output from an M6800
+ * peripheral to the GPIP of an MFP, a unique vector number is
+ * provided to the processor during an interrupt acknowledge
+ * cycle. This interrupt structure significantly reduces interrupt
+ * latency for M6800 devices and other peripherals that do not
+ * support vectored interrupts.
+ *
+ * GPIP CONTROL REGISTERS
+ *
+ * The GPIP is programmed via three control registers. These
+ * registers control the data direction, provide user access to the
+ * port, and specify the active edge for each bit of the GPIP
+ * producing an interrupt. These registers are described in the
+ * following paragraphs.
+ *
+ * The GPIP registers and their usages are described above.
+ *
+ * General-Purpose I/O Data Register (GPDR) The GPDR is used to
+ * input data from or output data to the port. When data is written
+ * to the GPDR, pins defined as inputs remain in the high-impedance
+ * state. Pins defined as outputs assume the state (high or low) of
+ * their corresponding bit in the data register. When the GPDR is
+ * read, data is passed directly from the bits of the data register
+ * for pins defined as outputs. Data from pins defined as inputs
+ * comes from the input buffers.
+ *
+ * Active Edge Register (AER) The AER allows each GPIP line to
+ * produce an interrupt on either a one-to-zero or a zero-to-one
+ * transition. Writing a zero to the appropriate edge bit of the AER
+ * causes the associated input to generate an interrupt on the
+ * one-to-zero transition. Writing a one to the edge bit produces an
+ * interrupt on the zero-to-one transition of the corresponding
+ * line. When the processor sets a bit, interrupts will be generated
+ * on the rising edge of the associated input signal. When the
+ * processor clears a bit, interrupts will be generated on the
+ * falling edge of the associated input signal.
+ *
+ * @note The inputs to the exclusive-OR of the transition detector
+ * are the edge bit and the input buffer. As a result, writing
+ * the AER may cause an interrupt-producing transition,
+ * depending upon the state of the input. So, the AER should
+ * be configured before enabling interrupts via IERA and
+ * IERB. Also, changing the edge bit while interrupts are
+ * enabled may cause an interrupt on the corresponding
+ * channel. Data Direction Register (DDR) The DDR allows the
+ * programmer to define 10-17 as inputs or outputs by writing
+ * the corresponding bit. Writing a zero to any bit of the DDR
+ * causes the corresponding interrupt I/O pin to be a
+ * high-impedance input. Writing a one to any bit of the DDR
+ * causes the corresponding pin to be configured as a
+ * push-pull output.
+ *
+ * TIMERS
+ *
+ * The MFP contains four 8-bit timers that provide many functions
+ * typically required in microprocessor systems. The timers can
+ * supply the baud rate clocks for the on-chip serial I/O channel,
+ * generate periodic interrupts, measure elapsed time, and count
+ * signal transitions. In addition, two timers have waveform
+ * generation capability.
+ *
+ * All timers are prescalericounter timers with a common independent
+ * clock input (XTAL1 and XTAL2) and are not required to be operated
+ * from the system clock. Each timer's output signal toggles when
+ * the timer's main counter times out. Additionally, timers A and B
+ * have auxiliary control signals used in two of the operating
+ * modes. An interrupt channel is assigned to each timer; when the
+ * auxiliary control signals are used in the pulse-width measurement
+ * mode, a separate interrupt channel responds to transitions on
+ * these inputs.
+ *
+ * OPERATING MODES
+ *
+ * Timers A and B are full-function timers which, in addition to the
+ * delay mode, operate in the pulse-width measurements mode and the
+ * event count mode. Timers C and D are delay timers only. A brief
+ * discussion of each of the timer modes follows.
+ *
+ * Delay Mode
+ *
+ * All timers can operate in the delay mode. In this mode, the
+ * prescaler is always active. The prescaler specifies the number of
+ * timer clock cycles that must elapse before a count pulse is
+ * applied to the main counter. A count pulse causes the main
+ * counter to decrement by one. When the timer has decremented down
+ * to $01, the next count pulse causes the main counter to be
+ * reloaded from the timer data register, and a timeout pulse is
+ * produced. This timeout pulse is coupled to the timer's interrupt
+ * channel and, if the channel is enabled, an interrupt occurs. The
+ * timeout pulse also causes the timer output pin to toggle. The
+ * output will remain in this new state until the next timeout pulse
+ * occurs.
+ *
+ * Pulse-Width Measurement Mode
+ *
+ * In addition to the delay mode, timers A and B can be programmed
+ * to operate in the pulse-width measurement mode. In this mode, an
+ * auxiliary control input is required; timers A and B auxiliary
+ * input lines are TAI and TBI. Also, interrupt channels normally
+ * associated with 14 and 13 respond instead to transitions on TAI
+ * and TBI, respectively. General-purpose lines 13 and 14 can still
+ * be used for I/O, but cannot be used as interrupt-generating
+ * inputs. A conceptual circuit of the interrupt source selection is
+ * shown in Figure 5.
+ *
+ * The pulse-width measurement mode functions similarly to the delay
+ * mode, with the auxiliary control signal acting as an enable to
+ * the timer. When the control signal is active, the prescaler and
+ * main counter are allowed to operate. When the control signal is
+ * negated, the timer is stopped. Thus, the width of the active
+ * pulse on TAI or TBI is measured by the number of timer counts
+ * occurring while the timer is allowed to operate.
+ *
+ * The active state of the auxiliary input line is defined by the
+ * associated interrupt channel's edge bit in the AER. The AER GPIP4
+ * edge bit is associated with TAI, and GPIP3 is associated with
+ * TB!. When the edge bit is a one, the auxiliary input will be
+ * active high, enabling the timer while the input signal is at a
+ * high level. If the edge bit is zero, the auxiliary input will be
+ * active low, and the timer will operate while the input signal is
+ * at a low level.
+ *
+ * The active state of the auxiliary input line is defined by the
+ * associated interrupt channel's edge bit in the AER. The AER GPIP4
+ * edge bit is associated with TAI, and GPIP3 is associated with
+ * TBI. When the edge bit is a one, the auxiliary input will be
+ * active high, enabling the timer while the input signal is at a
+ * high level. If the edge bit is zero, the auxiliary input will be
+ * active low, and the timer will operate while the input signal is
+ * at a low level.
+ *
+ * The state of the active edge bit also specifies whether a
+ * zero-to-one transition or a one-to-zero transition of the
+ * auxiliary input pin will produce an interrupt when the interrupt
+ * channel is enabled. In normal operation, programming the active
+ * edge bit to a one produces an interrupt on the zero-to-one
+ * transition of the associated input signal. Alternately,
+ * programming the edge bit to a zero produces an interrupt on the
+ * one-to-zero transition of the input signal. However, in the
+ * pulse-width measurement mode, the interrupt generated by a
+ * transition on TAI or TBI occurs on the opposite transition from
+ * that normally defined by the edge bit.
+ *
+ * Event Count Mode
+ *
+ * In addition to the delay mode and the pulse-width measurement
+ * mode, timers A and B can be programmed to operate in the event
+ * count mode. Like the pulse-width measurement mode, the event
+ * count mode requires an auxiliary input signal, TAI or
+ * TBI. General-purpose lines 13 and 14 can be used for I/O or as
+ * interrupt-producing inputs.
+ *
+ * In the event count mode, the prescaler is disabled, allowing each
+ * active transition on TAI and TBI to produce a count pulse. The
+ * count pulse causes the main counter to decrement by one. When the
+ * timer counts through $01, a timeout pulse is generated that
+ * causes the output signal to toggle and optionally produces an
+ * interrupt via the associated timer interrupt channel. The timer's
+ * main counter is also reloaded from the timer data register. To
+ * count transitions reliably, the input signal can only transition
+ * once every four timer clock periods. For this reason, the input
+ * signal must have a maximum frequency of one-fourth that of the
+ * timer clock.
+ *
+ * TIMER REGISTERS
+ *
+ * The four timers are programmed via three control registers and
+ * four data registers. The following paragraphs describe the
+ * different registers.
+ *
+ * Timer Data Registers (TDRs)
+ *
+ * The four TDRs are designed as timer A (TADR), timer B (TBDR),
+ * timer C (TCDR), and timer D (TDDR). Each timer's main counter is
+ * an 8-bit binary downcounter. The TDRs contain the value of their
+ * respective main counter. This value was captured on the last
+ * low-to-high transition of the data strobe pin.
+ *
+ * The main counter is initialized by writing to the TDR. If the
+ * timer is stopped, data is loaded simultaneously into both the TDR
+ * and main counter. If the TDR is written to while the timer is
+ * enabled, the value is not loaded into the timer until the timer
+ * counts through $01. If a write is performed while the timer is
+ * counting through $01, then an indeterminate value is loaded into
+ * the main counter.
+ *
+ * Timer Control Registers (TCRs)
+ *
+ * Timer control register A (TACR) and timer control register B
+ * (TBCR) are associated with timers A and B, respectively. Timers C
+ * and D are programmed using one control register—the timer C and D
+ * control register (TCDCR). The bits in the TCR select the
+ * operation mode, prescaler value, and disable the timers. Both
+ * TCRs have bits that allow the programmer to reset output lines
+ * TAO and TBO.
+ *
+ * Reset TAO/TBO — Reset Timer A/Timer B Output Lines
+ *
+ * TAO and TBO can be forced low at any time by writing a one to the
+ * reset location in TACR and TBCR. Output is held low during the
+ * write operation, and at the end of the bus cycle, the output is
+ * allowed to toggle in response to a timeout pulse. When resetting
+ * TAO and TBO, the other bits in the TCR must be written with their
+ * previous value to avoid altering the operating mode.
+ *
+ * AC3-ACO/BC3-BCO — Select Timer A/Timer B Operation Mode
+ *
+ * When the timer is stopped, counting is inhibited. The contents of
+ * the timer's main counter are not affected although any residual
+ * count in the prescaler is lost.
+ *
+ * CC3-CCO/DC3-DCO — Select Timer C/Timer D Operation Mode
+ *
+ * When the timer is stopped, counting is inhibited. The contents of
+ * the timer's main counter are not affected although any residual
+ * count in the prescaler is lost.
+ *
+ * USART
+ *
+ * The single-channel full-duplex USART has a double-buffered
+ * receiver and trans-mitter. There are separate receive and
+ * transmit clocks and separate receive and transmit status and data
+ * bytes. The receive and transmit sections are also assigned
+ * separate interrupt channels. Each section has two interrupt
+ * channels: one for normal conditions and one for error
+ * conditions. All interrupt channels are edge-triggered. Generally,
+ * it is the output of a flag bit or bits that is coupled to the
+ * interrupt channel. Thus, if an interrupt-producing event occurs
+ * while the associated interrupt channel is disabled, no interrupt
+ * is produced, even if the channel is subsequently enabled. That
+ * particular event would have to occur again, generating another
+ * edge, before an interrupt would be generated. The interrupt
+ * channels can be disabled, and a DMA device can be used to
+ * transfer the data via the control signals, receiver ready (RR)
+ * and transmitter ready (TR).
+ *
+ * CHARACTER PROTOCOLS
+ *
+ * The MFP USART supports asynchronous and, with the help of a
+ * polynomial generator checker, byte synchronous character
+ * formats. These formats are selected independently of the
+ * divide-by-1 and divide-by-16 clock modes. It is possible to clock
+ * data synchronously into the MC68901 but still use start and stop
+ * bits. After a start bit is detected, data is shifted in and a
+ * stop bit is checked to determine proper framing. In this mode,
+ * all normal asynchronous format features apply.
+ *
+ * When the divide-by-1 clock mode is selected, synchronization must
+ * be accom-plished externally. The receiver will sample serial data
+ * on the rising edge of the receiver clock. In the divide-by-16
+ * clock mode, the data is sampled at mid-bit time to increase
+ * transient noise rejection. Also, when the divide-by-16 clock mode
+ * is selected, the USART resynchronization logic is enabled,
+ * increasing the channel clock skew tolerance.
+ *
+ * Asynchronous Format
+ *
+ * Variable character length and start/stop bit configurations are
+ * available under software control for asynchronous operation. The
+ * user can choose a character length from five to eight bits and a
+ * stop-bit length of one, one and one-half, or two bits. The user
+ * can also select odd, even, or no parity.
+ *
+ * In the asynchronous format, start-bit detection is always
+ * enabled. New data is not shifted into the receiver shift register
+ * until a zero bit is received. When the divide-by-18 clock mode is
+ * selected, the false-start-bit logic is also active. Any
+ * transition must be stable for three positive receiver clock edges
+ * to be considered valid. For a start bit to be good, a valid
+ * zero-to-one transition must not occur for eight positive receiver
+ * clock transitions after the initial one-to-zero transition. After
+ * a valid start bit has been detected, the data is checked
+ * continuously for valid transitions. When a valid transition is
+ * detected, an internal counter is forced to state zero, and no
+ * further transition checking is initiated until state four. At
+ * state eight, the previous state of the transition checking logic
+ * is clocked into the receiver. As a result of this
+ * resynchronization logic, it is possible to run with asynchronous
+ * clocks without start and stop bits if there are sufficient valid
+ * transitions in the data streams.
+ *
+ * Synchronous Format
+ *
+ * When the synchronous character format is selected, the 8-bit
+ * synchronous character loaded into the synchronous character
+ * register (SCR) is compared to received serial data until a match
+ * is found. Once synchronization is established, incoming data is
+ * clocked into the receiver. The synchronous word is continuously
+ * transmitted during an underrun condition. All synchronous
+ * characters can be optionally stripped from the receiver buffer
+ * (i.e., taken out of the data stream and thrown away) by clearing
+ * the appropriate bit in the receiver status register (RSR).
+ *
+ * The synchronous character should be written after the character
+ * length is selected, since unused bits in the (SCR) are zeroed
+ * out. When parity is enabled, synchronous word length is the
+ * character length plus one. The MFP will compute and append the
+ * parity bit for the synchronous character when a character length
+ * of eight is selected. However, if the character length is less
+ * than eight, the user must determine the synchronous word parity
+ * and write it into the SCR along with the synchronous
+ * character. The parity bit must be the most significant bit. The
+ * MFP will then transmit the extra bit in the synchronous word as a
+ * parity bit.
+ *
+ * USART Control Register (UCR)
+ *
+ * This register selects the clock mode and the character format for
+ * the receive and transmit sections.
+ *
+ * CLK | I | CL1 | I | CLO | I | STI | I | STO | I | PE | I | E10 | I 
+ *
+ * CLK - Clock Mode
+ *
+ * - 1= Data clocked into and out of receiver and transmitter at
+ * one-sixteenth the frequency of their respective clocks.
+ * - 0= Data clocked into and out of receiver and transmitter at the
+ * frequency of their respective clocks.
+ *
+ * CL1,CLO — Character Length
+ *
+ * These bits specify the length of the character exclusive of start
+ * bits and parity.
+ *
+ * - 0,0 -> 8-bits
+ * - 0,1 -> 7 Bits
+ * - 1,0 -> 6 Bits
+ * - 1,1 -> 5 Bits
+ *
+ * STO,ST1 — Start/Stop Bit and Format Control
+ *
+ * These bits select the number of start and stop bits and specify
+ * the character format.
+ *
+ * - 0,0,0,0 Synchronous
+ * - 0,1,1,1 Asynchronous
+ * - 1,0,1,1-1/2 Asynchronous (used with divide-by-16 mode only).
+ * - 1,1,1,2 Asynchronous
+ *
+ * PE — Parity Enable
+ *
+ * Parity is not automatically appended to the synchronous character
+ * for char-acter lengths of less than eight bits. Therefore, parity
+ * should be written into the SCR along with the synchronous
+ * character.
+ *
+ * - 1= Parity checked by receiver and parity calculated and
+ * inserted during data transmission.
+ * - 0= No parity check and no parity bit computed for
+ * transmission.
+ *
+ * E/O — Even/Odd Parity
+ *
+ * - 1= Even parity is selected.
+ * - 0= Odd parity is selected.
+ *
+ * Bit 0 — Not used; read as zero
+ *
+ * RECEIVER
+ *
+ * As data is received on the serial input line (SI), it is clocked
+ * into an internal 8-bit shift register until the specified number
+ * of data bits have been assembled. The character is then
+ * transferred to the receiver buffer, assuming that the last word
+ * in the receiver buffer has been read. This transfer sets the
+ * buffer full bit in the RSR and produces a buffer full interrupt
+ * to the processor, assuming this interrupt has been enabled.
+ *
+ * Reading the receiver buffer satisfies the buffer full condition
+ * and allows a new data word to be transferred to the receiver
+ * buffer when it is assembled. The receiver buffer is accessed by
+ * reading the USART data register (UDR). The UDR is simply an 8-bit
+ * data register used for transferring data between the MFP and the
+ * CPU.
+ *
+ * Each time a word is transferred to the receiver buffer, its
+ * status information is latched into the RSR. The RSR is not
+ * updated again until the data word in the receiver buffer has been
+ * read. When a buffer full condition exists, the RSR should always
+ * be read before the UDR to maintain the correct correspondence
+ * between data and flags. Otherwise, it is possible that, after
+ * reading the UDR and prior to reading the RSR, a new word could be
+ * received and transferred to the receiver buffer. Its associated
+ * flags would be latched into the RSR, writing over the flags for
+ * the previous data word. Thus, when the RSR is read to access the
+ * status information for the first data word, the flags for the new
+ * word would be retrieved.
+ *
+ * Receiver Interrupt Channels
+ *
+ * The USART receiver section is assigned two interrupt
+ * channels. One channel indicates the buffer full condition; the
+ * other channel indicates an error condition. Error conditions
+ * include overrun error, parity error, frame error, synchronous
+ * found, and break. These interrupting conditions correspond to
+ * the OE, PE, FE, and F/S or B bits of the RSR. These flags will
+ * function whether the receiver interrupt channels are enabled or
+ * disabled.
+ *
+ * While only one interrupt is generated per character received,
+ * two dedicated interrupt channels allow separate vector numbers
+ * to be assigned for normal and abnormal receiver
+ * conditions. When a received word has an error asso-ciated with
+ * it and the error interrupt channel is enabled, an interrupt
+ * will be generated on the error channel only. However, if the
+ * error channel is disabled, an interrupt for an error condition
+ * will be generated on the buffer full interrupt channel along
+ * with interrupts produced by the buffer full condition. The RSR
+ * must always be read to determine which error condition produced
+ * the interrupt.
+ *
+ * Receiver Status Register (RSR)
+ *
+ * The RSR contains the receiver buffer full flag, the synchronous
+ * strip enable, the various status information associated with
+ * the data word in the receiver buffer. The RSR is latched each
+ * time a data word is transferred to the receiver buffer. RSR
+ * flags cannot change again until the new data word has been
+ * read. However, the M/CIP bit is allowed to change.
+ *
+ * BF | OE | PE | FE | OF/S | ORB | WCIP | SS | RE 
+ * Reset: 00000000
+ *
+ * - BF - Buffer Full
+ * - 1= Receiver word is transferred to the receiver buffer.
+ * - 0= Receiver buffer is read by accessing the UDR.
+ *
+ * - OE - Overrun Error Overrun error occurs when a received word
+ * is to be transferred to the receiver buffer but the buffer is
+ * full. Neither the receiver buffer nor the RSR is overwritten.
+ * - 1= Receiver buffer full
+ * - 0= Read by RSR or MFP reset
+ *
+ * - PE — Parity Error
+ * - 1= Parity error detected on character transfer to receiver
+ * buffer
+ * - 0= No parity error detected on character transfer to receiver
+ * buffer
+ *
+ * - FE — Frame Error
+ * A frame error exists when a nonzero data character is not
+ * followed by a stop bit in the asynchronous character format.
+ * - 1= Frame error detected on character transfer to receiver
+ * buffer
+ * - 0= No frame error detected on character transfer to
+ * receiver buffer
+ *
+ * - F/S or B — Found/Search or Break Detect
+ *
+ * The F/S bit is used in the synchronous character format. When
+ * set to zero, the USART receiver is placed in the search
+ * mode. PS is cleared when the incoming character does not
+ * match the synchronous character.
+ *
+ * - 1= Match found; character length counter enabled.
+ * - 0= Incoming data compared to SCR; character length counter
+ * disabled.
+ *
+ * The B bit is used in the asynchronous character format. This
+ * flag indicates a break condition that continues until a
+ * nonzero data bit is received.
+ * - 1= Character transferred to the receiver buffer is a break
+ * condition.
+ * - 0= Nonzero data bit received and break condition acknowledged
+ * by reading the RSR at least once.
+ *
+ * - MICIP — Match/Character in Progress
+ *
+ * The M bit is used in the synchronous character format and
+ * indicates a syn-chronous character has been received.
+ * - 1= Character transferred to the receiver buffer matches the
+ * synchronous character.
+ * - 0= Character transferred to the receiver buffer does not match
+ * the syn-chronous character.
+ *
+ * The CIP bit is used in the asynchronous character format and
+ * indicates that a character is being assembled.
+ * - 1= Start bit is detected.
+ * - 0= Final stop bit has been received.
+ *
+ * - SS — Synchronous Strip Enable
+ *
+ * - 1= Characters that match the synchronous character are not
+ * loaded into the receiver buffer, and no buffer full condition
+ * is produced.
+ * - 0= Characters that match the synchronous character are
+ * transferred to the receiver buffer, and a buffer full
+ * condition is produced.
+ *
+ * - RE — Receiver Enable
+ *
+ * This bit should not be set until the receiver clock is
+ * active. When the trans-mitter is disabled in auto-turnaround
+ * mode, this bit is set.
+ * - 1= Receiver is enabled.
+ * - 0= Receiver is disabled.
+ *
+ * Special Receiver Conditions
+ *
+ * Certain receiver conditions relating to the overrun error flag
+ * and the break detect flag require further explanation. Consider
+ * the following examples:
+ *
+ * -# A break is received while the receiver buffer is full, which
+ * does not produce an overrun condition. Only the B flag will
+ * be set after the re-ceiver buffer is read.
+ *
+ * -# A new word is received, and the receiver buffer is full. A break
+ * is received before the receiver buffer is read.
+ *
+ * Both the B and OE flags will be set when the buffer full
+ * condition is satisfied.
+ *
+ * TRANSMITTER
+ *
+ * The transmitter buffer is loaded by writing to the UDR. The data
+ * character will be transferred to an internal 8-bit shift register
+ * when the last character in the shift register has been
+ * transmitted. This transfer will produce a buffer empty
+ * condition. If the transmitter completes the transmission of the
+ * character in the shift register before a new character is written
+ * to the transmitter buffer, an underrun error will occur. In the
+ * asynchronous character format, the transmitter will send a mark
+ * until the transmitter buffer is written. In the synchronous
+ * character format, the transmitter will continuously send the
+ * synchronous character until the transmitter buffer is written.
+ *
+ * The transmitter buffer can be loaded prior to enabling the
+ * transmitter. After the transmitter is enabled, a delay occurs
+ * before the first bit is output. The serial output line (SO)
+ * should be programmed to be high, low, or high impedance (by
+ * setting the appropriate bits in the transmitter status register
+ * (TSR)) before the transmitter is enabled, forcing the output line
+ * to the desired state until the first bit of the first character
+ * is shifted out. The state of the H and L bits in the TSR
+ * determine the state of the first transmitted bit after the
+ * transmitter is enabled. If the high-impedance mode is selected
+ * prior to the transmitter being enabled, the first bit transmitted
+ * is indeterminate. Note that the SO line will always be driven
+ * high for one bit time prior to the character in the trans-mitter
+ * shift register being transmitted when the transmitter is first
+ * enabled.
+ *
+ * When the transmitter is disabled, any character currently being
+ * transmitted will continue to completion. However, any character
+ * in the transmitter buffer will not be transmitted and will remain
+ * in the buffer. Thus, no buffer empty condition will occur. If the
+ * buffer is empty when the transmitter is disabled, the buffer
+ * empty condition will remain, but no underrun condition will be
+ * generated when the character in transmission is completed. If no
+ * character is being transmitted when the transmitter is disabled,
+ * the transmitter will stop at the next rising edge of the internal
+ * shift clock.
+ *
+ * In the asynchronous character format, the transmitter can be
+ * programmed to send a break. The break will be transmitted once
+ * the word currently in the shift register has been sent. If the
+ * shift register is empty, the break command will be effective
+ * immediately. A transmit error interrupt will be generated at
+ * every normal character boundary to aid in timing the break
+ * transmission. The contents of the TSR are not affected,
+ * however. The break will continue until the break bit is
+ * cleared. The underrun error bit must be cleared in the TSR. Also,
+ * the IPR must be cleared of pending transmitter errors at the
+ * beginning of the break transmission, or no interrupts will be
+ * generated at the character boundary time. The break bit cannot be
+ * set until the transmitter has been enabled and has had sufficient
+ * time (one transmitter clock cycle) to perform internal reset and
+ * initialization functions.
+ *
+ * Any character in the transmitter buffer at the start of a break
+ * will be transmitted when the break is terminated, assuming the
+ * transmitter is still enabled. If the transmitter buffer is empty
+ * at the start of a break, it may be written at any time during the
+ * break. If the buffer is still empty at the end of the break, an
+ * underrun condition will exist.
+ *
+ * Disabling the transmitter during a break condition causes the
+ * transmitter to cease transmission of the break character at the
+ * end of the current character. No end-of-break stop bit will be
+ * transmitted. Even if the transmitter buffer is empty, neither a
+ * buffer empty condition nor an underrun condition will
+ * occur. Also, any word in the transmitter buffer will remain.
+ *
+ * Transmitter Interrupt Channels
+ *
+ * The USART transmitter section is assigned two interrupt
+ * channels. The normal channel indicates a buffer empty condition,
+ * and the error channel indicates an underrun or end
+ * condition. These interrupting conditions correspond to the BE,
+ * UE, and END flags in the TSR. The flag bits will function
+ * regardless of whether their associated interrupt channel is
+ * enabled or disabled.
+ *
+ * Transmitter Status Register (TSR)
+ *
+ * The TSR contains various transmitter error flags and transmitter
+ * control bits for selecting auto-turnaround and loopback mode.
+ *
+ * BE | UE | AT | I | ENO | B | I | H | L | TE 
+ * Reset: 00000000
+ *
+ * - BE Buffer Empty
+ * - 1= Character in the transmitter buffer transferred to transmit
+ * shift register.
+ * - 0= Transmitter buffer reloaded by writing to the UDR.
+ *
+ * - UE Underrun Error
+ *
+ * One full transmitter clock cycle is required after UE is set
+ * before it can be cleared. This bit does not require clearing
+ * before writing to the UDR.
+ * - 1= Character in the TSR was transmitted before a new word was
+ * loaded into the transmitter buffer.
+ * - 0= Transmitter disabled or a read performed on TSR.
+ *
+ * - AT Auto-Turnaround
+ *
+ * When set, the receiver will be enabled automatically after the
+ * transmitter has been disabled and the last character has been
+ * transmitted.
+ *
+ * - END End of Transmission
+ *
+ * If the transmitter is disabled while a character is being
+ * transmitted, this bit is set after transmission has
+ * completed. If no character is being transmitted, then this bit
+ * is set immediately. Reenabling the transmitter clears this bit.
+ *
+ * - B Break
+ *
+ * This bit only functions in the asynchronous format. When B is
+ * set, BE cannot be set. A break consists of all zeros with no
+ * stop bit. This bit cannot be set until the transmitter is
+ * enabled and internal reset and initialization is com-plete.
+ * - 1= Break is transmitted and transmission stops.
+ * - 0= Break ceases and transmission resumes.
+ *
+ * - H,L High and Low
+ *
+ * These bits configure SO when the transmitter is
+ * disabled. Changing these bits after the transmitter is enabled
+ * will alter the output state until END is cleared.
+ *
+ * - 0,0 High Impedance
+ * - 0,1 Low
+ * - 1,0 High
+ * - 1,1 Loopback Mode
+ *
+ * Loopback mode internally connects the transmitter output to the
+ * receiver input and the transmitter clock to the receiver clock
+ * internally. The receiver clock (RC) and the serial input (SI) are
+ * not used. When the transmitter is disabled, SO is forced high.
+ * - 1= MPU writes a one.
+ * - 0= MPU writes a zero.
+ *
+ * TE Transmitter Enable
+ *
+ * The serial output will be driven according to H and L bits
+ * until transmission begins. A one bit is transmitted before
+ * character transmission begins in the TSR.
+ * - 1= Transmitter enabled.
+ * - 0= Transmitter disabled. UE bit cleared and END bit set.
+ *
+ * DMA OPERATION
+ *
+ * USART error conditions are valid only for each character
+ * boundary. When the USART performs block data transfers by using
+ * the DMA handshake lines, RR and TR, errors must be saved and
+ * checked at the end of a block. Checking is accomplished by
+ * enabling the error channel for the receiver or transmitter and by
+ * masking interrupts for this channel. Once the transfer is
+ * complete, IPRA is read. Any pending receiver or transmitter error
+ * indicates an error in the data transfer.
+ *
+ * !RR is asserted when the RSR buffer full bit is set unless a
+ * parity error or frame error is detected by the receiver. !TR is
+ * asserted when the RSR buffer-empty bit is set unless a break is
+ * being transmitted.
+ *
+ * @{
+ */
+
+/**
+ * @name MFP-68901 timers
+ * @{
+ */
+
+/**
+ * MFP-68901 timer identifers.
+ */
+enum mfp_timer_e {
+ TIMER_A=0, /**< MFP timer 'A' */
+ TIMER_B, /**< MFP timer 'B' */
+ TIMER_C, /**< MFP timer 'C' */
+ TIMER_D /**< MFP timer 'D' */
+};
+
+
+/**
+ * CPU clock of the Atari ST is 8010613Hz. sc68 rounds it to 8010612Hz
+ * (a mutliple of 4 because the YM clock is 1/4 of the CPU clock)
+ * However usually the Atari ST clock and the YM clock are rounded to
+ * respectively 8Mhz/2Mhz. Here in order to fasten the caculation the
+ * CPU clock is approxinate to 8006400Hz. As the MFP timer clocks runs
+ * at 2457600hz we got a power of 2 in the ratio (256:834).
+ *
+ * @{
+ */
+
+/**
+ * bogo cycles (common denominator between CPU/MFP-timers clocks).
+ */
+typedef cycle68_t bogoc68_t;
+
+#define MFP_BOGO_MUL 256u /**< BOGO cycles/cpu clock */
+#define MFP_BOGO_DIV 834u /**< BOGO cycle/mfp clock */
+/**
+ * @}
+ */
+
+/**
+ * Timer definition struct.
+ */
+typedef struct {
+ addr68_t vector; /**< Interrupt vector. */
+ u8 level; /**< Interrupt level. */
+ u8 bit; /**< Bit mask for Interrupt stuffes registers. */
+ u8 channel; /**< Channel A=0 or B=2. */
+ u8 letter; /**< 'A','B','C' or 'D'. */
+} mfp_timer_def_t;
+
+/**
+ * MFP-68901 timer struct.
+ */
+typedef struct
+{
+ mfp_timer_def_t def; /**< Timer definition. */
+
+ bogoc68_t cti; /**< bogo-cycle to next timer interrupt. */
+ uint_t tdr_cur; /**< Timer Data register current value. */
+ uint_t tdr_res; /**< Timer Data register reset value. */
+ uint_t tcr; /**< Timer control register (prescaler) 0..7. */
+
+ bogoc68_t psc; /**< prescale counter. */
+
+ /* On Interrupt */
+ uint_t int_lost; /**< Interrupts missed (should be 0). */
+ uint_t int_mask; /**< Interrupts ignored (masked or whatever) */
+ uint_t int_fall; /**< Interrupts counter. */
+
+ interrupt68_t interrupt; /**< Interruption info. */
+} mfp_timer_t;
+
+/**
+ * @}
+ */
+
+/**
+ * MFP register name.
+ */
+enum {
+ GPIP = 0x01,
+ AER = 0x03,
+ DDR = 0x05,
+ IERA = 0x07,
+ IERB = 0x09,
+ IPRA = 0x0B,
+ IPRB = 0x0D,
+ ISRA = 0x0F,
+ ISRB = 0x11,
+ IMRA = 0x13,
+ IMRB = 0x15,
+ VR = 0x17,
+ TACR = 0x19,
+ TBCR = 0x1B,
+ TCDCR = 0x1D,
+ TADR = 0x1F,
+ TBDR = 0x21,
+ TCDR = 0x23,
+ TDDR = 0x25,
+ SCR = 0x27,
+ UCR = 0x29,
+ RSR = 0x2B,
+ TSR = 0x2D,
+ UDR = 0x2F,
+};
+
+/**
+ * MFP-68901 emulator. */
+typedef struct {
+ u8 map0x40; /**< Registers map. */
+ mfp_timer_t timers4; /**< Timers. */
+} mfp_t;
+
+/**
+ * @name MFP-68901 emulator library.
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * MFP-68901 emulator library initialization.
+ *
+ * The mfp_init() function intialize MFP emulator library. It
+ * must be call prior to any other mfp_ function.
+ *
+ * @return error-code
+ * @retval 0 Success
+ * @retval -1 Failure
+ */
+int mfp_init(void);
+
+IO68_EXTERN
+/**
+ * MFP-68901 emulator library shutdown.
+ */
+void mfp_shutdown(void);
+
+/**
+ * @} */
+
+/**
+ * @name MFP-68901 emulator functions.
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Setup mfp instance.
+ *
+ * @param mfp mfp emulator instance.
+ *
+ * @return Error-code
+ * @retval 0 Success
+ * @retval -1 Failure
+ */
+int mfp_setup(mfp_t * const mfp);
+
+IO68_EXTERN
+/**
+ * Cleanup mfp instance.
+ *
+ * @param mfp mfp emulator instance.
+ *
+ */
+void mfp_cleanup(mfp_t * const mfp);
+
+
+IO68_EXTERN
+/**
+ * Reset mfp instance.
+ *
+ * @param mfp mfp emulator instance.
+ * @param bogoc bogo cycles
+ *
+ * @return Error-code
+ * @retval 0 Success
+ * @retval -1 Failure
+ */
+int mfp_reset(mfp_t * const mfp, const bogoc68_t bogoc);
+
+IO68_EXTERN
+/**
+ * Destroy mfp instance.
+ *
+ * @param mfp mfp emulator instance.
+ */
+void mfp_destroy(mfp_t * const mfp);
+
+/**
+ * @}
+ */
+
+IO68_EXTERN
+/**
+ * MFP get Timer Data register.
+ *
+ * @param mfp mfp emulator instance.
+ * @param timer Timer-id (see mfp_timer_e).
+ * @param bogoc Current bogo-cycle.
+ *
+ * @return timer data register (TDR) value
+ */
+int68_t mfp_get_tdr(mfp_t * const mfp,
+ const int timer, const bogoc68_t bogoc);
+
+IO68_EXTERN
+/**
+ * MFP write Timer data register.
+ *
+ * @param mfp mfp emulator instance.
+ * @param timer Timer-id (see mfp_timer_e).
+ * @param v New timer data register (TDR) value.
+ * @param bogoc Current bogo-cycle.
+ *
+ */
+void mfp_put_tdr(mfp_t * const mfp,
+ int timer, int68_t v, const bogoc68_t bogoc);
+
+IO68_EXTERN
+/**
+ * MFP write Timer control register.
+ *
+ * @param mfp mfp emulator instance.
+ * @param timer Timer-id (see mfp_timer_e).
+ * @param v New timer control register (TCR) value.
+ * @param bogoc Current bogo-cycle.
+ *
+ */
+void mfp_put_tcr(mfp_t * const mfp,
+ int timer, int68_t v, const bogoc68_t bogoc);
+
+IO68_EXTERN
+/**
+ * Get MFP pending interruption.
+ *
+ * @param mfp mfp emulator instance.
+ * @param bogoc Current bogo-cycle.
+ *
+ * @return interruption info structure.
+ * @retval 0 no pending interruption.
+ *
+ */
+interrupt68_t * mfp_interrupt(mfp_t * const mfp, const bogoc68_t bogoc);
+
+IO68_EXTERN
+/**
+ * Get cycle for the next MFP interruption.
+ *
+ * @param mfp mfp emulator instance.
+ *
+ * @return CPU-cycle when MFP will interrupt
+ * @retval IO68_NO_INT no interrupt will occur.
+ */
+bogoc68_t mfp_nextinterrupt(const mfp_t * const mfp);
+
+IO68_EXTERN
+/**
+ * Change cycle count base.
+ *
+ * @param mfp mfp emulator instance.
+ * @param bogoc New base for internal cycle counter.
+ */
+void mfp_adjust_bogoc(mfp_t * const mfp, const bogoc68_t bogoc);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/mw_io.c Added

@@ -0,0 +1,285 @@
+/*
+ * @file mw_io.c
+ * @brief MicroWire I/O plugin (STE soundchip)
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "mw_io.h"
+#include "mwemul.h"
+#include "emu68/struct68.h"
+#include "emu68/assert68.h"
+
+#include <sc68/file68_msg.h>
+extern int mw_cat;
+#define MWHD "ste-mw : "
+
+typedef struct {
+ io68_t io;
+ mw_t mw;
+} mw_io68_t;
+
+static int68_t _mw_readB(mw_io68_t * const mwio, const u8 addr)
+{
+ const uint_t ct = mwio->mw.ct >> mwio->mw.ct_fix;
+
+ /* Just need to be sure no one reads these word registers in byte */
+ assert(addr != MW_DATA);
+ assert(addr != MW_CTRL);
+
+ switch (addr) {
+ case MW_CTH:
+ return (u8) ( ct >> 16 );
+ case MW_CTM:
+ return (u8) ( ct >> 8 );
+ case MW_CTL:
+ /* whatever mono/stereo the counter always return even address */
+ return ct & 0xFE;
+ }
+ return (addr >= 0 && addr < 64)
+ ? mwio->mw.mapaddr
+ : 0
+ ;
+}
+
+static int68_t _mw_readW(mw_io68_t * const mwio, const u8 addr)
+{
+ switch (addr) {
+ case MW_DATA: case MW_CTRL:
+ return ( mwio->mw.mapaddr+0 << 8 ) + mwio->mw.mapaddr+1;
+ break;
+ }
+ return _mw_readB(mwio, mwio->io.emu68->bus_addr+1);
+}
+
+static void mwio_readB(io68_t * const io)
+{
+ io->emu68->bus_data =
+ _mw_readB((mw_io68_t *)io, io->emu68->bus_addr);
+ TRACE68(mw_cat, MWHD "read BYTE %06x => %02x\n",
+ (unsigned)io->emu68->bus_addr & 0xFFFFFF,
+ (unsigned)io->emu68->bus_data & 0xFF);
+}
+
+static void mwio_readW(io68_t * const io)
+{
+ io->emu68->bus_data =
+ _mw_readW((mw_io68_t *)io, io->emu68->bus_addr);
+ TRACE68(mw_cat, MWHD "read WORD %06x => %04x\n",
+ (unsigned)io->emu68->bus_addr & 0xFFFFFF,
+ (unsigned)io->emu68->bus_data & 0xFFFF);
+}
+
+static void mwio_readL(io68_t * const io)
+{
+ io->emu68->bus_data =
+ ( _mw_readW((mw_io68_t *)io, io->emu68->bus_addr+0) << 16 )
+ |
+ ( _mw_readW((mw_io68_t *)io, io->emu68->bus_addr+2) )
+ ;
+ TRACE68(mw_cat, MWHD "read LONG %06x => %08x\n",
+ (unsigned)io->emu68->bus_addr & 0xFFFFFF,
+ (unsigned)io->emu68->bus_data & 0xFFFFFFFF);
+}
+
+static void _mw_writeB(mw_io68_t * const mwio, const u8 addr, int68_t v)
+{
+ /* Just need to be sure no one writes these word registers in byte */
+ assert(addr != MW_DATA);
+ assert(addr != MW_CTRL);
+
+ /* Skip even line in any case. */
+ if ( ! ( addr & 1 ) ) {
+ return;
+ }
+
+ switch (addr) {
+
+ case MW_ACTI:
+ v &= 3; /* ??? should we ? */
+
+ /* Reload internal counters
+ *
+ * $$$ Should we do this whatever the value or only if dma is
+ * started ? This is probably not a great deal !
+ */
+ mwio->mw.ct = mw_counter_read(&mwio->mw,MW_BASH);
+ mwio->mw.end = mw_counter_read(&mwio->mw,MW_ENDH);
+ break;
+
+ case MW_CTH: case MW_CTM: case MW_CTL:
+ /* write to counter register does nothing */
+ return;
+
+ }
+
+ if (addr >= 0 && addr < 64)
+ mwio->mw.mapaddr = v;
+}
+
+static void _mw_writeW(mw_io68_t * const mwio, const u8 addr, int68_t v)
+{
+ if (addr == MW_CTRL) {
+ mwio->mw.mapMW_CTRL+0 = v >> 8;
+ mwio->mw.mapMW_CTRL+1 = v;
+ } else if (addr == MW_DATA) {
+ mwio->mw.mapMW_DATA+0 = v >> 8;
+ mwio->mw.mapMW_DATA+1 = v;
+ mw_command(&mwio->mw);
+ } else if ( !(addr & 1) ) {
+ _mw_writeB(mwio, addr+1, v);
+ }
+}
+
+static void _mw_writeL(mw_io68_t * const mwio, const u8 addr, int68_t v)
+{
+ if (addr == MW_DATA) {
+ /* Write both Ctrl and Data registers .... My guess is that
+ * someone tries to run a command this way, which is not the
+ * proper way to do it in the real world. Anyway we'll do as if it
+ * works.
+ */
+ mwio->mw.mapMW_DATA+0 = v >> 24;
+ mwio->mw.mapMW_DATA+1 = v >> 16;
+ mwio->mw.mapMW_CTRL+2 = v >> 8;
+ mwio->mw.mapMW_CTRL+3 = v;
+ mw_command(&mwio->mw);
+ } else if ( !(addr & 1) ) {
+ /* Any other (even) long access are translate to word access */
+ _mw_writeW(mwio, addr+0, v >> 16);
+ _mw_writeW(mwio, addr+2, v);
+ }
+}
+
+static void mwio_writeB(io68_t * const io)
+{
+ TRACE68(mw_cat, MWHD "write BYTE %06x <= %02x\n",
+ (unsigned)io->emu68->bus_addr & 0xFFFFFF,
+ (unsigned)io->emu68->bus_data & 0xFF);
+ _mw_writeB((mw_io68_t *)io,
+ io->emu68->bus_addr, io->emu68->bus_data);
+}
+
+static void mwio_writeW(io68_t * const io)
+{
+ TRACE68(mw_cat, MWHD "write WORD %06x <= %04x\n",
+ (unsigned)io->emu68->bus_addr & 0xFFFFFF,
+ (unsigned)io->emu68->bus_data & 0xFFFF);
+ _mw_writeW((mw_io68_t *)io,
+ io->emu68->bus_addr, io->emu68->bus_data);
+}
+
+static void mwio_writeL(io68_t * const io)
+{
+ TRACE68(mw_cat, MWHD "write LONG %06x <= %08x\n",
+ (unsigned)io->emu68->bus_addr & 0xFFFFFF,
+ (unsigned)io->emu68->bus_data & 0xFFFFFFFF);
+ _mw_writeL((mw_io68_t *)io,
+ io->emu68->bus_addr, io->emu68->bus_data);
+}
+
+static interrupt68_t * mwio_interrupt(io68_t * const io, cycle68_t cycle)
+{
+ return 0;
+}
+
+static cycle68_t mwio_next_interrupt(io68_t * const io, cycle68_t cycle)
+{
+ return IO68_NO_INT;
+}
+
+static void mwio_adjust_cycle(io68_t * const io, cycle68_t cycle)
+{
+}
+
+static int mwio_reset(io68_t * const io)
+{
+ return mw_reset(&((mw_io68_t *)io)->mw);
+}
+
+static void mwio_destroy(io68_t * const io)
+{
+ if (io) {
+ mw_cleanup(&((mw_io68_t *)io)->mw);
+ emu68_free(io);
+ }
+}
+
+static io68_t mw_io = {
+ 0,
+ "STE-Sound",
+ 0xFFFF8900, 0xFFFF8925,
+ mwio_readB, mwio_readW, mwio_readL,
+ mwio_writeB, mwio_writeW, mwio_writeL,
+ mwio_interrupt, mwio_next_interrupt,
+ mwio_adjust_cycle,
+ mwio_reset,
+ mwio_destroy,
+};
+
+int mwio_init(int * argc, char ** argv)
+{
+ return mw_init(argc, argv);
+}
+
+void mwio_shutdown(void)
+{
+ mw_shutdown();
+}
+
+io68_t * mwio_create(emu68_t * const emu68, mw_parms_t * const parms)
+{
+ mw_io68_t * mwio = 0;
+
+ if (emu68) {
+ mwio = emu68_alloc(sizeof(*mwio));
+ if (mwio) {
+ mw_setup_t setup;
+ if (parms) {
+ setup.parms = *parms;
+ } else {
+ setup.parms.engine = MW_ENGINE_DEFAULT;
+ setup.parms.hz = 0;
+ }
+ setup.mem = emu68->mem;
+ setup.log2mem = emu68->log2mem;
+ mwio->io = mw_io;
+ mw_setup(&mwio->mw, &setup);
+ }
+ }
+ return &mwio->io;
+}
+
+mw_t * mwio_emulator(io68_t * const io)
+{
+ return io
+ ? &((mw_io68_t*)io)->mw
+ : 0
+ ;
+}
+
+int mwio_sampling_rate(io68_t * const io, int sampling_rate)
+{
+ return mw_sampling_rate(mwio_emulator(io), sampling_rate);
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/mw_io.h Added

@@ -0,0 +1,91 @@
+/**
+ * @ingroup   lib_io68
+ * @file      io68/mw_io.h
+ * @brief     STE sound IO plugin header.
+ * @author    Benjamin Gerard
+ * @date      1999/03/20
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef IO68_MW_IO_H
+#define IO68_MW_IO_H
+
+#include "io68_api.h"
+#include "mwemul.h"
+
+/**
+ * @addtogroup  lib_io68_mw
+ * @{
+ */
+
+/**
+ * @name Microwire/LMC (STE sound) IO plugin.
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Init the mwio library.
+ *
+ *   The mwio_init() function setup the microwire IO plugin and the
+ *   microwire emulator library by calling the mw_init() function.
+ *
+ * @param argc  pointer to argument count
+ * @param argv  arguemnt array
+ * @return      error status
+ * @retval   0  on success
+ * @retval  -1  on success
+ */
+int mwio_init(int * argc, char ** argv);
+
+IO68_EXTERN
+/**
+ * Shutdown mwio library.
+ */
+void mwio_shutdown(void);
+
+IO68_EXTERN
+/**
+ * Create a microwire plugin instance.
+ */
+io68_t * mwio_create(emu68_t * const emu68, mw_parms_t * const parms);
+
+IO68_EXTERN
+/**
+ * Get/Set sampling rate.
+ *
+ * @param  io  MW IO instance
+ * @param  hz  @ref mw_hz_e "sampling rate"
+ *
+ * @return current @ref mw_hz_e "sampling rate"
+ *
+ */
+int mwio_sampling_rate(io68_t * const io, int hz);
+
+IO68_EXTERN
+/**
+ * Get/Set emulator engine.
+ *
+ * @param  io      MW IO instance
+ * @param  engine  @ref mw_engine_e "MW engine descriptor"
+ *
+ * @return @ref mw_engine_e "MW engine descriptor"
+ */
+uint68_t mwio_engine(io68_t * const io, int engine);
+
+IO68_EXTERN
+/**
+ * Get microwire emulator instance attached to the mwio plugin.
+ */
+mw_t * mwio_emulator(io68_t * const io);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/mwemul.c Added

@@ -0,0 +1,654 @@
+/*
+ * @file mwemul.c
+ * @brief MicroWire/LMC emulator (STE sound)
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * @todo
+ *
+ * - Check overflow in mix routine.
+ * - Verify STE / YM volume ratio
+ * - Special case for not mixing in Db_alone.
+ * - And in the YM emul, skip emulation !!!
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "default.h"
+#include "mwemul.h"
+
+#include "emu68/assert68.h"
+#include <sc68/file68_msg.h>
+
+#ifndef DEBUG_MW_O
+# define DEBUG_MW_O 0
+#endif
+
+/* static */
+int mw_cat = msg68_DEFAULT;
+
+#define MWHD "ste-mw : "
+
+/* #define MW_CALCUL_TABLE 1 */
+
+enum {
+ MW_N_DECIBEL = 121,
+ MW_MIX_FIX = 10,
+ MW_STE_MULT = ((1<<MW_MIX_FIX)/4),
+ MW_YM_MULT = ((1<<MW_MIX_FIX)-MW_STE_MULT)
+};
+
+/* $$$/XXX THIS IS WRONG AND NEEDS TO BE FIXED */
+
+static const int Db_aloneMW_N_DECIBEL = {
+ 0x40000,0x32d64,0x28619,0x20137,0x197a9,0x143d1,0x10137,0xcc50,
+ 0xa24b,0x80e9,0x6666,0x5156,0x409c,0x3352,0x28c4,0x2061,
+ 0x19b8,0x146e,0x103a,0xce4,0xa3d,0x822,0x676,0x521,
+ 0x413,0x33c,0x292,0x20b,0x19f,0x14a,0x106,0xd0,
+ 0xa5,0x83,0x68,0x52,0x41,0x34,0x29,0x21,
+ 0x1a,0x14,0x10,0xd,0xa,0x8,0x6,0x5, 0x4,0x3,0x2,0x2,0x1,0x1,0x1,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0
+};
+
+static const int Db_mixMW_N_DECIBEL = {
+ 0x10000,0xcb59,0xa186,0x804d,0x65ea,0x50f4,0x404d,0x3314,
+ 0x2892,0x203a,0x1999,0x1455,0x1027,0xcd4,0xa31,0x818,
+ 0x66e,0x51b,0x40e,0x339,0x28f,0x208,0x19d,0x148,
+ 0x104,0xcf,0xa4,0x82,0x67,0x52,0x41,0x34,
+ 0x29,0x20,0x1a,0x14,0x10,0xd,0xa,0x8,
+ 0x6,0x5,0x4,0x3,0x2,0x2,0x1,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,
+};
+
+static const int Db_mix12MW_N_DECIBEL = {
+ 0x1027,0xcd4,0xa31,0x818,0x66e,0x51b,0x40e,0x339,
+ 0x28f,0x208,0x19d,0x148,0x104,0xcf,0xa4,0x82,
+ 0x67,0x52,0x41,0x34,0x29,0x20,0x1a,0x14,
+ 0x10,0xd,0xa,0x8,0x6,0x5,0x4,0x3,0x2,0x2,0x1,0x1,0x1,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+ 0x0
+};
+
+static void init_volume(void) { }
+
+
+static mw_parms_t default_parms;
+
+/* ,-----------------------------------------------------------------.
+ * | Set/Get emulator engine |
+ * `-----------------------------------------------------------------'
+ */
+
+static
+const char * mw_engine_name(const int engine)
+{
+ switch (engine) {
+ case MW_ENGINE_SIMPLE: return "SIMPLE";
+ case MW_ENGINE_LINEAR: return "LINEAR";
+ }
+ return 0;
+}
+
+int mw_engine(mw_t * const mw, int engine)
+{
+ switch (engine) {
+
+ case MW_ENGINE_QUERY:
+ engine = mw ? mw->engine : default_parms.engine;
+ break;
+
+ default:
+ msg68_warning(MWHD "invalid engine -- %d\n", engine);
+
+ case MW_ENGINE_DEFAULT:
+ engine = default_parms.engine;
+
+ case MW_ENGINE_SIMPLE:
+ case MW_ENGINE_LINEAR:
+ *(mw ? &mw->engine : &default_parms.engine) = engine;
+ msg68(mw_cat, MWHD "%s engine -- *%s*\n",
+ mw ? "select" : "default",
+ mw_engine_name(engine));
+ break;
+ }
+ return engine;
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Set/Get replay frequency |
+ * `-----------------------------------------------------------------'
+ */
+int mw_sampling_rate(mw_t * const mw, int hz)
+{
+ switch (hz) {
+
+ case MW_HZ_QUERY:
+ hz = mw ? mw->hz : default_parms.hz;
+ break;
+
+ case MW_HZ_DEFAULT:
+ hz = default_parms.hz;
+
+ default:
+ if (hz < SPR_MIN)
+ hz = SPR_MIN;
+ else if (hz > SPR_MAX)
+ hz = SPR_MAX;
+ *(mw ? &mw->hz : &default_parms.hz) = hz;
+ TRACE68(mw_cat, MWHD "%s sampling rate -- *%dhz*\n",
+ mw ? "select" : "default", hz);
+ break;
+ }
+ return hz;
+}
+
+/* ,-----------------------------------------------------------------.
+ * | Set master volume 0=-80 Db, 40=0 Db |
+ * | Set left volume 0=-40 Db, 20=0 Db |
+ * | Set right volume 0=-40 Db, 20=0 Db |
+ * | Set trebble 0=-12 Db, 6=0 Db, 12=12 Db |
+ * | Set bass 0=-12 Db, 40=12 Db |
+ * | Set mixer type : 0=-12 Db 1=YM+STE 2=STE-only 3=reserved |
+ * `-----------------------------------------------------------------'
+ */
+
+static
+const char * const mixermode4 = {
+ "-12-Db", "YM+STE", "STE-ONLY", "RESERVED"
+};
+
+int mw_lmc_mixer(mw_t * const mw, int n)
+{
+ static const int * const table3 = { Db_mix12, Db_mix, Db_alone };
+
+ if (n == MW_LMC_QUERY) {
+ n = mw->lmc.mixer;
+ } else {
+ n &= 3;
+ mw->lmc.mixer = n;
+ if (n != 3) {
+ mw->db_conv = tablen;
+ } else {
+ msg68_warning(MWHD "invalid LMC mixer mode -- %d\n", n);
+ }
+ }
+ TRACE68(mw_cat, MWHD "LMC mixer mode -- *%s*\n",
+ mixermodemw->lmc.mixer);
+ return n;
+}
+
+/* range 0..40 -> 80..0 (-dB) */
+int mw_lmc_master(mw_t * const mw, int n)
+{
+ if (n == MW_LMC_QUERY) {
+ n = ( 80 - mw->lmc.master ) >> 1;
+ } else {
+ if (n < 0) n = 0;
+ if (n > 40) n = 40;
+ mw->lmc.master = 80 - (n << 1);
+ TRACE68(mw_cat, MWHD "LMC -- master -- *-%02ddB*\n", mw->lmc.master);
+ }
+ return n;
+}
+
+/* range 0..20 -> 40..0 (-dB) */
+static int lmc_lr(mw_t * const mw, const int lr, int n)
+{
+ u8 * pval = lr ? &mw->lmc.left : &mw->lmc.right;
+
+ if (n == MW_LMC_QUERY) {
+ n = ( 40 - *pval ) >> 1;
+ } else {
+ if (n < 0) n = 0;
+ if (n > 20) n = 20;
+ *pval = 40 - (n << 1);
+ mw->lmc.lr = ( mw->lmc.left + mw->lmc.right ) >> 1;
+ TRACE68(mw_cat, MWHD "LMC -- %s channel -- *-%02ddB*\n",
+ lr ? "left" : "right", *pval);
+ }
+ return n;
+}
+
+int mw_lmc_left(mw_t * const mw, int n)
+{
+ return lmc_lr(mw,0,n);
+}
+
+int mw_lmc_right(mw_t * const mw, int n)
+{
+ return lmc_lr(mw,1,n);
+}
+
+/* range 0..12 -> 12..0 (-dB) */
+static int lmc_hl(mw_t * const mw, const int hl, int n)
+{
+ u8 * pval = hl ? &mw->lmc.high : &mw->lmc.low;
+
+ if (n == MW_LMC_QUERY) {
+ n = 12 - *pval;
+ } else {
+ if (n < 0) n = 0;
+ if (n > 12) n = 12;
+ *pval = 12 - n;
+ TRACE68(mw_cat, MWHD "LMC -- %s pass filter -- *-%02ddB*\n",
+ hl ? "high" : "low", *pval);
+ }
+ return n;
+}
+
+int mw_lmc_high(mw_t * const mw, int n)
+{
+ return lmc_hl(mw,0,n);
+}
+
+int mw_lmc_low(mw_t * const mw, int n)
+{
+ return lmc_hl(mw,1,n);
+}
+
+static int command_dispatcher(mw_t * const mw, int n)
+{
+ const int c = n & 0700;
+ n &= 077;
+
+ TRACE68(mw_cat, MWHD "dispatch -- %o:%02x\n", c>>6, (unsigned)n);
+ switch(c) {
+ case 0000:
+ mw_lmc_mixer(mw, n&3);
+ break;
+ case 0100:
+ mw_lmc_low(mw, n&15);
+ break;
+ case 0200:
+ mw_lmc_high(mw, n&15);
+ break;
+ case 0300:
+ mw_lmc_master(mw, n&63);
+ break;
+ case 0400:
+ mw_lmc_right(mw, n&31);
+ break;
+ case 0500:
+ mw_lmc_left(mw, n&31);
+ break;
+ default:
+ TRACE68(mw_cat, MWHD "unknown command -- %o:%02x\n", c>>6, (unsigned)n);
+ return -1;
+ }
+ return 0;
+}
+
+int mw_command(mw_t * const mw)
+{
+ uint_t ctrl, data, comm, bits, mask;
+
+ if (!mw)
+ return -1;
+
+ ctrl = ( mw->mapMW_CTRL << 8 ) + mw->mapMW_CTRL+1;
+ data = ( mw->mapMW_DATA << 8 ) + mw->mapMW_DATA+1;
+
+ /* Clear data, keep control.
+ * Normally data is shifted left until it clears whereas control
+ * rotated left until it's back to its orginal value.
+ */
+ mw->mapMW_DATA = mw->mapMW_DATA+1 = 0;
+
+ TRACE68(mw_cat, MWHD "shifting -- %04x/%04x\n", data, ctrl);
+
+ for (bits=comm=0, mask=0x8000; bits != 11 && mask; mask >>= 1)
+ if (ctrl & mask) {
+ comm = (comm << 1) | !!(data & mask);
+ ++bits;
+ }
+ if (bits != 11) {
+ msg68_warning(MWHD "missing bits -- %04x/%04x\n", data, ctrl);
+ assert(bits == 11);
+ return -1;
+ }
+ if (mask && (ctrl & (mask-1))) {
+ msg68_warning(MWHD "too many bits -- %04x/%04x\n", data, ctrl);
+ assert(0);
+ }
+
+ if ( (comm & 03000) != 02000 ) {
+ msg68_warning(MWHD "wrong address (%d) -- %04x/%04x\n",
+ comm>>9, data,ctrl);
+ assert(0);
+ return -1;
+ }
+
+ return
+ command_dispatcher(mw, comm & 0777);
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Microwire reset |
+ * `-----------------------------------------------------------------'
+ */
+
+static void lmc_reset(mw_t * const mw)
+{
+ mw_lmc_mixer(mw,MW_MIXER_BOTH);
+ mw_lmc_master(mw,40); /* 0db */
+ mw_lmc_left(mw,20); /* 0db */
+ mw_lmc_right(mw,20); /* 0db */
+ mw_lmc_high(mw,6); /* 0db */
+ mw_lmc_low(mw,6); /* 0db */
+}
+
+int mw_reset(mw_t * const mw)
+{
+ int i;
+
+ for ( i=0; i<sizeof(mw->map); i++ ) {
+ mw->mapi = 0;
+ }
+ mw->ct = mw->end = 0;
+ lmc_reset(mw);
+
+ TRACE68(mw_cat, MWHD "%s\n", "chip reset");
+ return 0;
+}
+
+void mw_cleanup(mw_t * const mw) {}
+
+int mw_setup(mw_t * const mw,
+ mw_setup_t * const setup)
+{
+ if (!mw || !setup || !setup->mem) {
+ msg68_error(MWHD "invalid parameter\n");
+ return -1;
+ }
+
+ /* setup emulation mode */
+ setup->parms.engine = mw_engine(mw, setup->parms.engine);
+
+ /* setup sampling rate */
+ setup->parms.hz = mw_sampling_rate(mw, setup->parms.hz);
+
+ /* setup memory access */
+ mw->mem = setup->mem;
+ mw->log2mem = setup->log2mem;
+ mw->ct_fix = ( sizeof(mwct_t) << 3 ) - mw->log2mem;
+
+ TRACE68(mw_cat, MWHD "%d-bit memory, %d-bit precision\n",
+ setup->log2mem, mw->ct_fix);
+ mw_reset(mw);
+
+ return 0;
+}
+
+/* ,-----------------------------------------------------------------.
+ * | Microwire initialization |
+ * `-----------------------------------------------------------------'
+ */
+
+int mw_init(int * argc, char ** argv)
+{
+ if (mw_cat == msg68_DEFAULT)
+ mw_cat = msg68_cat("ste","STE sound (DMA/Microwire/LMC1992)", DEBUG_MW_O);
+
+ /* Setup defaults */
+ default_parms.engine = MW_ENGINE_LINEAR;
+ default_parms.hz = SPR_DEF;
+
+ /* Init volume table */
+ init_volume();
+
+ return 0;
+}
+
+void mw_shutdown(void)
+{
+ msg68_cat_free(mw_cat);
+ mw_cat = msg68_DEFAULT;
+}
+
+/* Rescale n sample of b with f ( << MW_MIX_FIX ) */
+static void rescale(s32 * b, int f, int n)
+{
+ if (!f) {
+ do { *b++ = 0; } while (--n);
+ } else if (f != (1<<MW_MIX_FIX)) {
+ do {
+ int v;
+ v = ((*b)*f) >> MW_MIX_FIX;
+ *b++ = ( v << 16 ) | ( v & 0xFFFF );
+ } while (--n);
+ }
+}
+
+/* --- Rescale n sample of b with r ( << mw_MIX_FIX ) --- */
+static void no_mix_ste(mw_t * const mw, s32 * b, int n)
+{
+ rescale(b, (mw->db_conv == Db_alone) ? 0 : MW_YM_MULT, n);
+}
+
+static void skip_ste(mw_t * const mw, int n)
+{
+ mwct_t base, end2, ct, end, stp;
+
+ const int loop = mw->mapMW_ACTI & 2;
+ const int mono = (mw->mapMW_MODE>>7) & 1;
+ const uint_t frq = 50066u >> ((mw->mapMW_MODE&3)^3);
+ const int ct_fix = mw->ct_fix;
+
+ /* Get internal register for sample base and sample end
+ * $$$ ??? what if base > end2 ???
+ */
+ base = mw_counter_read(mw, MW_BASH);
+ end2 = mw_counter_read(mw, MW_ENDH);
+
+ /* Get counters */
+ ct = mw->ct;
+ end = mw->end;
+ stp = ( (mwct_t) ( frq * n ) << ( ct_fix + 1 - mono ) ) / mw->hz;
+
+ if ( stp >= end - ct ) {
+ if ( ! loop ) goto out;
+ stp -= end - ct;
+ ct = base;
+ end = end2;
+ if ( ct == end ) {
+ stp = 0;
+ } else {
+ stp %= end - ct;
+ }
+ ct += stp;
+ }
+
+out:
+ if ( !loop && ct >= end ) {
+ mw->mapMW_ACTI = 0;
+ ct = base;
+ end = end2;
+ }
+ mw->ct = ct;
+ mw->end = end;
+}
+
+/* $$$ TODO: STe volume balance correction. */
+#define _VOL(LR) \
+ (mw->db_convmw->lmc.master+mw->lmc.LR >> 1)
+
+static void mix_ste(mw_t * const mw, s32 *b, int n)
+{
+ mwct_t base, end2, ct, end, stp;
+ const int vl = _VOL(left);
+ const int vr = _VOL(right);
+ const int loop = mw->mapMW_ACTI & 2;
+ const int mono = (mw->mapMW_MODE>>7) & 1;
+ const uint_t frq = 50066u >> ((mw->mapMW_MODE&3)^3);
+ const int68_t ym_mult = (mw->db_conv == Db_alone) ? 0 : MW_YM_MULT;
+ const int ct_fix = mw->ct_fix;
+ const s8 * spl = (const s8 *)mw->mem;
+
+ /* Get internal register for sample base and sample end
+ * $$$ ??? what if base > end2 ???
+ */
+ base = mw_counter_read(mw, MW_BASH);
+ end2 = mw_counter_read(mw, MW_ENDH);
+
+ /* Get current sample counter and end */
+ ct = mw->ct;
+ end = mw->end;
+
+ if (ct >= end) {
+ if (!loop) {
+ goto out;
+ } else {
+ mwct_t overflow = ct - end;
+ mwct_t length = end - base;
+ ct = base;
+ if (length) {
+ ct += overflow > length ? overflow % length : overflow;
+ }
+ end = end2;
+ }
+ }
+ /* Calculate sample step.
+ * Stereo trick : Advance 2 times faster, take care of word alignment later.
+ */
+ stp = ( (mwct_t) frq << ( ct_fix + 1 - mono ) ) / mw->hz;
+
+ if (mono) {
+ /* mix mono */
+ do {
+ int68_t v, ym;
+
+ ym = (*b) * ym_mult;
+ v = spl (int)( ct >> ct_fix ) ;
+ *b++ =
+ (
+ (u16)((v*vl + ym) >> MW_MIX_FIX)
+ +
+ (((v*vr + ym)>>MW_MIX_FIX)<<16)
+ );
+
+ ct += stp;
+ if (ct >= end) {
+ if (!loop) {
+ --n;
+ break;
+ } else {
+ mwct_t overflow = ct-end;
+ mwct_t length = end-base;
+ ct = base;
+ if (length) {
+ ct += overflow>length ? overflow%length : overflow;
+ }
+ end = end2;
+ }
+ }
+ } while (--n);
+
+ } else {
+ /* mix stereo */
+ do {
+ int68_t l,r,ym;
+ int addr;
+
+ ym = (*b) * ym_mult;
+ addr = ( ct >> ct_fix ) & ~1;
+ l = spladdr+0;
+ r = spladdr+1;
+ *b++ =
+ (
+ (u16)((l*vl + ym)>>MW_MIX_FIX)
+ +
+ (((r*vr + ym)>>MW_MIX_FIX)<<16)
+ );
+
+ ct += stp;
+ if (ct >= end) {
+ if (!loop) {
+ --n;
+ break;
+ } else {
+ mwct_t overflow = ct-end;
+ mwct_t length = end-base;
+ ct = base;
+ if (length) {
+ ct += overflow>length ? overflow%length : overflow;
+ }
+ end = end2;
+ }
+ }
+ } while (--n);
+ }
+
+ out:
+ if (!loop && ct >= end) {
+ mw->mapMW_ACTI = 0;
+ ct = base;
+ end = end2;
+ }
+ mw->ct = ct;
+ mw->end = end;
+
+ /* Finish the buffer */
+ if (n>0) {
+ no_mix_ste(mw,b,n);
+ }
+}
+
+/* ,-----------------------------------------------------------------.
+ * | STE sound process |
+ * `-----------------------------------------------------------------'
+ */
+
+void mw_mix(mw_t * const mw, s32 * b, int n)
+{
+ if ( n <= 0 ) {
+ return;
+ }
+ if ( !b ) {
+ if ( mw->mapMW_ACTI & 1 ) {
+ /* no buffer and active : advance counters only */
+ skip_ste(mw,n);
+ }
+ } else if ( ! (mw->mapMW_ACTI & 1 ) ) {
+ /* Microwire desactivated */
+ no_mix_ste(mw,b,n);
+ } else {
+ /* Microwire activated */
+ mix_ste(mw,b,n);
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/mwemul.h Added

@@ -0,0 +1,430 @@
+/**
+ * @ingroup lib_io68
+ * @file io68/mwemul.h
+ * @author Benjamin Gerard
+ * @date 1999/03/20
+ * @brief STE sound emulator header.
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef IO68_MWEMUL_H
+#define IO68_MWEMUL_H
+
+#include "io68_api.h"
+#include "emu68/type68.h"
+
+/**
+ * @defgroup lib_io68_mw STE sound emulator
+ * @ingroup lib_io68
+ * @brief STE (MicroWire/LMC/DMA) emulator.
+ *
+ * Hardware I/O registers
+ *
+ * - $FF8900 (W) : DMA sound control register
+ * - $FF8903 (B) : Frame Start Hi
+ * - $FF8905 (B) : Frame Start Mi
+ * - $FF8907 (B) : Frame Start Lo
+ * - $FF8909 (B) : Frame Count Hi
+ * - $FF890B (B) : Frame Count Mi
+ * - $FF890D (B) : Frame Count Lo
+ * - $FF890F (B) : Frame End Hi
+ * - $FF8911 (B) : Frame End Mi
+ * - $FF8913 (B) : Frame End Lo
+ * - $FF8920 (W) : Sound Mode Control (frequency, mono/stereo)
+ * - $FF8922 (B) : Microwire Data Register
+ * - $FF8924 (B) : Microwire Mask Register
+ *
+ *
+ * Microwire and LMC 1992 commands
+ *
+ * Commands format is XX YYY ZZZZZZ.
+ *
+ * - XX is the chipset address (only 10 is the only one valid).
+ * - YYY is the command number/identifier.
+ * - ZZZZZZ is the command data/parameter.
+ *
+ * Commands are
+ *
+ * - 000 ....DD Mixer
+ * - 00 : DMA sound only
+ * - 01 : DMA sound + input 1 YM (FR) + DMA (-12dB)
+ * - 10 : DMA sound + input 2 DMA sound only (LPF)
+ * - 11 : DMA sound + input 3 (N/C) -> DMA sound only
+ *
+ * - 001 XXD DDD Bass (2dB step)
+ * - 0 000 : -12 dB
+ * - 0 110 : 0 dB
+ * - 1 100 : +12 dB
+ *
+ * - 010 XXD DDD Treble (2dB step)
+ * - 0 000 : -12 dB
+ * - 0 110 : 0 dB
+ * - 1 100 : +12 dB
+ *
+ * - 011 DDD DDD Master volume (2dB step)
+ * - 000 000 : -80 dB
+ * - 010 100 : -40 dB
+ * - 101 XXX : 0 dB
+ *
+ * - 100 XDD DDD Right channel volume (2dB step)
+ * - 00 000 : -40 dB
+ * - 01 010 : -20 dB
+ * - 10 1XX : 0 dB
+ *
+ * - 101 XDD DDD Left channel volume (2dB step)
+ * - 00 000 : -40 dB
+ * - 01 010 : -20 dB
+ * - 10 1XX : 0 dB
+ *
+ * @{
+ */
+
+/**
+ * DMA/Micro-Wire registers.
+ */
+enum mw_reg_e {
+ MW_ACTI = 0x01, /**< Microwire enabled */
+ MW_BASH = 0x03, /**< Microwire sample start address, bit 16-23 */
+ MW_BASM = (MW_BASH+2), /**< Microwire sample start address, bit 8-15 */
+ MW_BASL = (MW_BASH+4), /**< Microwire sample start address, bit 0-7 */
+ MW_CTH = 0x09, /**< Microwire sample counter, bit 16-23 */
+ MW_CTM = (MW_CTH+2), /**< Microwire sample counter, bit 8-15 */
+ MW_CTL = (MW_CTH+4), /**< Microwire sample counter, bit 0-7 */
+ MW_ENDH = 0x0f, /**< Microwire sample end address, bit 16-23 */
+ MW_ENDM = (MW_ENDH+2), /**< Microwire sample end address, bit 8-15 */
+ MW_ENDL = (MW_ENDH+4), /**< Microwire sample end address, bit 0-7 */
+ MW_MODE = 0x21, /**< Microwire playing mode */
+ MW_DATA = 0x22, /**< Microwire data register */
+ MW_CTRL = 0x24 /**< Microwire control register */
+};
+
+/**
+ * Microwire/LMC mixer modes.
+ */
+enum mw_mixer_e {
+ MW_MIXER_DB12 = 0, /**< -12dB atttenuation. */
+ MW_MIXER_BOTH = 1, /**< normal blend. */
+ MW_MIXER_STE = 2, /**< STE only. */
+ MW_MIXER_RESERVED = 3, /**< Reserved. */
+};
+
+/**
+ * Microwire emulator engines.
+ */
+enum mw_engine_e {
+ MW_ENGINE_QUERY = -1, /**< Query default or current engine. */
+ MW_ENGINE_DEFAULT = 0, /**< Use default engine. */
+ MW_ENGINE_SIMPLE, /**< Simple engine without interpolation. */
+ MW_ENGINE_LINEAR /**< Simple engine with linear interpolation. */
+};
+
+/**
+ * Microwire sampling rate is given in hertz (hz).
+ */
+enum mw_hz_e {
+ MW_HZ_QUERY = -1, /**< Query current value. */
+ MW_HZ_DEFAULT = 0 /**< Default sampling rate. */
+};
+
+/**
+ * LMC register values are mostly unsigned bytes.
+ */
+enum mw_lmc_e {
+ MW_LMC_QUERY = -1, /**< Query current value. */
+};
+
+/**
+ * Microwire configuration parameters.
+ */
+typedef struct {
+ int engine; /**< @ref mw_engine_e "Microwire emulator engine". */
+ int hz; /**< @ref mw_hz_e "Microwire sampling rate". */
+} mw_parms_t;
+
+/**
+ *Microwire setup structure.
+ */
+typedef struct {
+ mw_parms_t parms; /**< configuration parameters. */
+ u8 * mem; /**< 68K memory buffer. */
+ int log2mem; /**< 68K memory buffer size (2^log2mem). */
+} mw_setup_t;
+
+/**
+ * Type used by internal counters.
+ *
+ * This type must be an unsigned of at least 32-bit. Values are
+ * always fixed point. The amount of shifting is calculated so that
+ * the most useful bit is the most signifiant bit. Therefore these
+ * counters get an automatic natural modulo.
+ */
+typedef uint68_t mwct_t;
+
+/**
+ * Microwire emulator instance.
+ */
+typedef struct {
+ u8 map0x40; /**< STE register array. */
+ mwct_t ct; /**< DMA current location (ct_fix fixed point). */
+ mwct_t end; /**< DMA end point location (ct_fix fixed point). */
+
+ /** LMC chip. */
+ struct
+ {
+ u8 master; /**< Master volume. */
+ u8 left; /**< Left volume. */
+ u8 right; /**< Right volume. */
+ u8 lr; /**< Left/Right average volume. */
+ u8 high; /**< High pass filter. */
+ u8 low; /**< Low pass filter. */
+ u8 mixer; /**< Mixer mode. */
+ u8 align; /**< reserved for struct align. */
+ } lmc;
+ const int * db_conv; /**< Current decibel conversion table. */
+
+ int engine; /**< @ref mw_engine_e "Emulator engine". */
+ int hz; /**< @ref mw_hz_e "Sampling rate" (in hz). */
+ int ct_fix; /**< fixed point for automatic memory modulo. */
+ const u8 * mem; /**< 68000 memory buffer. */
+ int log2mem; /**< Size of 68K memory (2^log2mem). */
+
+} mw_t;
+
+
+static inline
+mwct_t mw_counter_read(const mw_t * const mw, const int n)
+{
+ return
+ (mwct_t) (
+ ( mw->mapn << 16 ) + ( mw->mapn+2 << 8 ) + mw->mapn+4 )
+ << mw->ct_fix;
+}
+
+static inline
+void mw_counter_write(mw_t * const mw, const int n, const mwct_t v)
+{
+ uint_t vnorm = v >> mw->ct_fix;
+ mw->mapn+0 = vnorm >> 16;
+ mw->mapn+2 = vnorm >> 8;
+ mw->mapn+4 = vnorm;
+}
+
+/**
+ * @name Microwire emulator functions
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Microwire emulator setup.
+ *
+ * The mw_init() function must be call before any other function. It
+ * mainly setups internal tables.
+ *
+ * @return error-code
+ * @retval 0 on success
+ * @retval -1 on error (should never happen)
+ *
+ * @see mw_shutdown()
+ */
+int mw_init(int * argc,char ** argv);
+
+IO68_EXTERN
+/**
+ * Microwire emulator shutdown.
+ *
+ * @see mw_init()
+ */
+void mw_shutdown(void);
+
+IO68_EXTERN
+/**
+ * Setup microwire instance.
+ *
+ * @param mw microwire instance
+ * @param setup setup configuration
+ * @return error status
+ * @retval 0 on success
+ * @retval -1 on error
+ */
+int mw_setup(mw_t * const mw, mw_setup_t * const setup);
+
+IO68_EXTERN
+/**
+ * Cleanup microwire instance.
+ */
+void mw_cleanup(mw_t * const mw);
+
+IO68_EXTERN
+/**
+ * Set/Get microwire sampling rate.
+ *
+ * The mw_sampling_rate() function set microwire emulator sampling
+ * rate.
+ *
+ * @param mw microwire instance (0 for set or get library default)
+ * @param hz @ref mw_hz_e "sampling rate"
+ * @return @ref mw_hz_e "sampling rate"
+ */
+int mw_sampling_rate(mw_t * const mw, int hz);
+
+IO68_EXTERN
+/**
+ * Set/Get microwire emulator engine.
+ *
+ * @param mw microwire instance (0 for set or get library default)
+ * @param engine @ref mw_engine_e "engine descriptor"
+ * @return @ref mw_engine_e "engine descriptor"
+ */
+int mw_engine(mw_t * const mw, int engine);
+
+IO68_EXTERN
+/**
+ * Microwire reset.
+ *
+ * The mw_reset() reset function restore the chip on to its default
+ * configuation or what it is believed to be.
+ *
+ * @param mw microwire instance
+ * @return error status (always success)
+ * @retval 0 on success
+ * @retval -1 on error
+ */
+int mw_reset(mw_t * const mw);
+
+IO68_EXTERN
+/**
+ * Execute microwire emulation.
+ *
+ * The mw_mix() function processes sample mixing with current
+ * internal parameters for n samples. Mixed samples are stored in a
+ * large enough (at least n) 32 bit buffer pointed by b. This buffer
+ * have to be previously filled with the YM-2149 samples. Typically
+ * it is the YM-2149 emulator output buffer. This allows Microwire
+ * emulator to honnor the LMC mixer mode.iven LMC mode. This
+ * porocess include the mono to stereo expansion. The mem68 starting
+ * pointer locates the 68K memory buffer where samples are stored to
+ * allow DMA fetch emulation.
+ *
+ * @param mw microwire instance
+ * @param out pointer to YM-2149 source sample directly used for
+ * microwire output mixing.
+ * @param n number of sample to mix in out buffer
+ *
+ * @see YM_mix() @see YM_get_buffer()
+ */
+void mw_mix(mw_t * const mw, s32 * out, int n);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Microwire LMC functions
+ * @{
+ */
+
+
+IO68_EXTERN
+/**
+ * Set/Get LMC mixer mode.
+ *
+ * The mw_lmc_mixer() function selects or retrieves the function
+ * used by the chip to blend the YM-2149 signal and the digital
+ * signal produce by microwire chip.
+ *
+ * @param mw microwire instance
+ * @param mode @ref mw_mixer_e "mixer mode"
+ * @return @ref mw_mixer_e "mixer mode"
+ */
+int mw_lmc_mixer(mw_t * const mw, int mode);
+
+IO68_EXTERN
+/**
+ * Set/Get LMC master volume.
+ *
+ * @param mw microwire instance
+ * @param n @ref mw_lmc_e "volume" in range 0..40 for -80..0 dB
+ * @return master @ref mw_lmc_e "volume"
+ *
+ * @see mw_lmc_left()
+ * @see mw_lmc_right()
+ */
+int mw_lmc_master(mw_t * const mw, int n);
+
+IO68_EXTERN
+/**
+ * Set/Get LMC left channel volume.
+ *
+ * @param mw microwire instance
+ * @param n @ref mw_lmc_e "volume" in range 0..20 for -40..0 dB
+ * @return left @ref mw_lmc_e "volume"
+ *
+ * @see mw_lmc_master()
+ * @see mw_lmc_right()
+ */
+int mw_lmc_left(mw_t * const mw, int n);
+
+IO68_EXTERN
+/**
+ * Set/Get LMC right channel volume.
+ *
+ * @param mw microwire instance
+ * @param n @ref mw_lmc_e "volume" in range 0..20 for -40..0 dB
+ * @return right @ref mw_lmc_e "volume"
+ *
+ * @see mw_lmc_master()
+ * @see mw_lmc_left()
+ */
+int mw_lmc_right(mw_t * const mw, int n);
+
+IO68_EXTERN
+/**
+ * Set/Get high pass filter.
+ *
+ * @param mw microwire instance
+
+ * @param n @ref mw_lmc_e "high pass filter" in range 0..12 for
+ * -12..0 dB
+ * @return @ref mw_lmc_e "high pass filter"
+ *
+ * @see mw_lmc_low()
+ * @warning Filters are not supported by this microwire emulator.
+ */
+int mw_lmc_high(mw_t * const mw, int n);
+
+IO68_EXTERN
+/**
+ * Set/Get low pass filter.
+ *
+ * @param mw microwire instance
+ * @param n @ref mw_lmc_e "low pass filter" in range 0..12
+ * for -12..0 dB
+ * @return @ref mw_lmc_e "low pass filter"
+ *
+ * @see mw_lmc_high()
+ * @warning Filters are not supported by this microwire emulator.
+ */
+int mw_lmc_low(mw_t * const mw,int n);
+
+IO68_EXTERN
+/**
+ * Parse and execute a microwire command.
+ *
+ * @param mw microwire instance
+ * @retval 0 on success (a command was found)
+ * @retval -1 on error
+ */
+int mw_command(mw_t * const mw);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/paula_io.c Added

@@ -0,0 +1,420 @@
+/*
+ * @file paula_io.c
+ * @brief Paula I/O plugin (Amiga soundchip)
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "paula_io.h"
+
+typedef struct {
+ io68_t io;
+ paula_t paula;
+} paula_io68_t;
+
+static void reload(paulav_t * const v, const u8 * const p, const int fix);
+
+static inline int clearset(const int v, const int clrset)
+{
+ if (clrset & 0x8000) {
+ return (v | clrset) & 0x7FFF;
+ } else {
+ return v & ~clrset;
+ }
+}
+
+static inline int DMACON(const int dmacon) {
+ return (-!!(dmacon&(1<<9))) & dmacon & 0xF;
+}
+
+static inline int INTREQ(const int intreq) {
+ return intreq & (0xF<<7);
+}
+
+static inline int INTENA(const int intena) {
+ return (-!!(intena&(1<<14))) & intena & (0xF<<7);
+}
+
+/* $$$ I am not sure what really happen in case of byte access on the
+ Amiga hardware Word registers. Currently I assume a ``normal''
+ behavior.
+*/
+
+static int68_t _paula_readB(paula_io68_t * const paulaio,
+ addr68_t const addr)
+{
+ const int i = (u8)addr;
+ paula_t * const paula = &paulaio->paula;
+ u8 v;
+
+ switch(i) {
+ case PAULA_VHPOSR:
+ /* This is an ugly HAXXX: some players use this register in order
+ * to wait for an actual DMA access to occur. Here the register is
+ * just incremented each time it is read so that these players do
+ * not loop forever.
+ */
+ v = paula->vhpos++;
+ break;
+
+ case PAULA_DMACONRH:
+ v = /* paula->mapPAULA_DMACONRH = */ (paula->dmacon>>8)&0x7f;
+ break;
+ case PAULA_DMACONRL:
+ v = /* paula->mapPAULA_DMACONRL = */ (u8)paula->dmacon;
+ break;
+
+ case PAULA_INTENARH:
+ v = /* paula->mapPAULA_INTENARH = */(paula->intena>>8)&0x7f;
+ break;
+ case PAULA_INTENARL:
+ v = /* paula->mapPAULA_INTENARL = */(u8)paula->intena;
+ break;
+
+ case PAULA_INTREQRH:
+ v = /* paula->mapPAULA_INTREQRH = */(paula->intreq>>8)&0x7f;
+ break;
+ case PAULA_INTREQRL:
+ v = /* paula->mapPAULA_INTREQRL = */(u8)paula->intreq;
+ break;
+
+ case PAULA_ADKCONRH:
+ v = /* paula->mapPAULA_ADKCONRH = */(paula->adkcon>>8)&0x7f;
+ break;
+ case PAULA_ADKCONRL:
+ v = /* paula->mapPAULA_ADKCONRL = */(u8)paula->adkcon;
+ break;
+
+ default:
+ v = paula->mapi;
+ break;
+ }
+ return v;
+}
+
+static int68_t _paula_readW(paula_io68_t * const paulaio,
+ addr68_t const addr)
+{
+ const int i = (u8)addr;
+ paula_t * const paula = &paulaio->paula;
+ u16 v;
+
+ switch (i) {
+ case PAULA_DMACONR:
+ v = paula->dmacon & 0x7fff;
+ break;
+ case PAULA_INTENAR:
+ v = paula->intena & 0x7fff;
+ break;
+ case PAULA_INTREQR:
+ v = paula->intreq & 0x7fff;
+ break;
+ case PAULA_ADKCON:
+ v = paula->adkcon & 0x7fff;
+ break;
+ default:
+ v = (paula->mapi<<8) | paula->mapi+1;
+ break;
+ }
+ return v;
+}
+
+static void paulaio_readB(io68_t * const io)
+{
+ io->emu68->bus_data =
+ _paula_readB((paula_io68_t *)io, io->emu68->bus_addr);
+}
+
+static void paulaio_readW(io68_t * const io)
+{
+ io->emu68->bus_data =
+ _paula_readW((paula_io68_t *)io, io->emu68->bus_addr);
+}
+
+static void paulaio_readL(io68_t * const io)
+{
+ io->emu68->bus_data = 0
+ |(_paula_readW((paula_io68_t *)io, io->emu68->bus_addr+0)<<16)
+ |(_paula_readW((paula_io68_t *)io, io->emu68->bus_addr+2) )
+ ;
+}
+
+#if 0
+/* start DMA on voice n ( DMA disable -> enable ) */
+static void start_DMA(paula_t * const paula, const int bit)
+{
+ int old,chg,cur;
+
+ old = DMACON(paula->dmacon);
+ paula->dmacon |= bit;
+ cur = DMACON(paula->dmacon);
+ chg = cur & ~old;
+
+ if (chg&1) reload(paula->voice+0, paula->map+PAULA_VOICEA, paula->ct_fix);
+ if (chg&2) reload(paula->voice+1, paula->map+PAULA_VOICEB, paula->ct_fix);
+ if (chg&4) reload(paula->voice+2, paula->map+PAULA_VOICEC, paula->ct_fix);
+ if (chg&8) reload(paula->voice+3, paula->map+PAULA_VOICED, paula->ct_fix);
+}
+#endif
+
+/* stop DMA bit to be stopped */
+static inline void stop_DMA(paula_t * const paula, const int bit)
+{
+ paula->dmacon &= ~bit;
+}
+
+/* Reload paula internal register with current value */
+static void reload(paulav_t * const v, const u8 * const p, const int fix)
+{
+ plct_t len;
+
+ v->start = v->adr = (plct_t) ( (p1<<16) | (p2<<8) | p3 ) << fix;
+ len = (p4<<8) | p5;
+ len |= (!len) << 16;
+ len <<= 1+fix;
+ v->end = v->start + len;
+}
+
+/* Write INTREQ :
+ *
+ * - If clearing bits just release the interrupt. Nothing more to do.
+ * - If setting bit checks whether the interrupt is denied or not.
+ * When denied it seems that the internal pointer and length register
+ * are reloaded however its is not an official practice.
+ */
+static void write_intreq(paula_t * const paula, const int intreq)
+{
+ if ( !(intreq & 0x8000) ) {
+ /* Clearing ... */
+ paula->intreq &= ~intreq;
+ return;
+ } else {
+ int intdenied;
+
+ /* Master interrupt not set : DENIED */
+ intdenied = ~INTENA(paula->intena);
+ /* Already requested : DENIED */
+ intdenied |= paula->intreq;
+ /* Only interrested by requested bits */
+ intdenied &= intreq;
+ /* Reload for each denied channel */
+
+ /* $$$ May be should not reload if DMA is OFF $$$ */
+
+ if(intdenied & (1<< 7))
+ reload(paula->voice+0, paula->map+PAULA_VOICEA, paula->ct_fix);
+ if(intdenied & (1<< 8))
+ reload(paula->voice+1, paula->map+PAULA_VOICEB, paula->ct_fix);
+ if(intdenied & (1<< 9))
+ reload(paula->voice+2, paula->map+PAULA_VOICEC, paula->ct_fix);
+ if(intdenied & (1<<10))
+ reload(paula->voice+3, paula->map+PAULA_VOICED, paula->ct_fix);
+
+ paula->intreq |= intreq;
+ }
+}
+
+static void _paula_writeB(paula_io68_t * const paulaio,
+ addr68_t const addr, const int68_t data)
+{
+ const int i = (u8)addr;
+ paula_t * const paula = &paulaio->paula;
+
+ paula->mapi = data;
+ switch (i) {
+
+ case PAULA_INTREQL:
+ write_intreq(paula,
+ ( paula->mapPAULA_INTREQH << 8 )
+ |
+ paula->mapPAULA_INTREQL );
+ break;
+
+ }
+}
+
+static void _paula_writeW(paula_io68_t * const paulaio,
+ addr68_t const addr, const int68_t data)
+{
+ const int i = (u8) addr;
+ paula_t * const paula = &paulaio->paula;
+ const int v = (u16) data;
+
+ /* Copy into hw-reg */
+ paula->mapi = v >> 8;
+ paula->map(u8)(i+1) = v;
+
+ switch (i) {
+ case PAULA_ADKCON: {
+ int old_adkcon = paula->adkcon;
+ paula->adkcon = clearset(old_adkcon, v);
+ if (paula->adkcon & ~old_adkcon & 0xFF) {
+ /* Modulation is active !!! */
+ }
+ } break;
+
+ case PAULA_DMACON: {
+ int old_dmacon = paula->dmacon;
+ int old_dmaena = DMACON(old_dmacon);
+ int new_dmaena;
+ int start;
+
+ paula->dmacon = clearset(old_dmacon, v);
+ new_dmaena = DMACON(paula->dmacon);
+
+ start = new_dmaena & ~old_dmaena;
+
+ if (start&1) reload(paula->voice+0,paula->map+PAULA_VOICEA,paula->ct_fix);
+ if (start&2) reload(paula->voice+1,paula->map+PAULA_VOICEB,paula->ct_fix);
+ if (start&4) reload(paula->voice+2,paula->map+PAULA_VOICEC,paula->ct_fix);
+ if (start&8) reload(paula->voice+3,paula->map+PAULA_VOICED,paula->ct_fix);
+
+ } break;
+
+ case PAULA_INTENA: {
+ int old_intena = INTENA(paula->intena), new_intena;
+ old_intena=old_intena;
+ paula->intena = clearset(paula->intena, v);
+ new_intena = INTENA(paula->intena);
+
+ if ( new_intena & ~old_intena ) {
+ /*Amiga Audio IRQ enabled */
+ }
+ } break;
+
+ case PAULA_INTREQ:
+ write_intreq(paula, v);
+ break;
+
+ default:
+ break;
+ }
+}
+
+static void paulaio_writeB(io68_t * const io)
+{
+ _paula_writeB((paula_io68_t *)io,
+ io->emu68->bus_addr, io->emu68->bus_data);
+}
+
+static void paulaio_writeW(io68_t * const io)
+{
+ _paula_writeW((paula_io68_t *)io,
+ io->emu68->bus_addr, io->emu68->bus_data);
+}
+
+static void paulaio_writeL(io68_t * const io)
+{
+ _paula_writeW((paula_io68_t *)io,
+ io->emu68->bus_addr+0, io->emu68->bus_data>>16);
+ _paula_writeW((paula_io68_t *)io,
+ io->emu68->bus_addr+2, io->emu68->bus_data);
+}
+
+static interrupt68_t * paulaio_interrupt(io68_t * const io, cycle68_t cycle)
+{
+ return 0;
+}
+
+static cycle68_t paulaio_next_interrupt(io68_t * const io, cycle68_t cycle)
+{
+ return IO68_NO_INT;
+}
+
+static void paulaio_adjust_cycle(io68_t * const io, cycle68_t cycle)
+{
+}
+
+static int paulaio_reset(io68_t * const io)
+{
+ return paula_reset(&((paula_io68_t *)io)->paula);
+}
+
+static void paulaio_destroy(io68_t * const io)
+{
+ if (io) {
+ paula_cleanup(&((paula_io68_t *)io)->paula);
+ emu68_free(io);
+ }
+}
+
+static io68_t paula_io = {
+ 0,
+ "AMIGA Paula",
+ 0xFFDFF000, 0xFFDFF0DF,
+ paulaio_readB, paulaio_readW, paulaio_readL,
+ paulaio_writeB, paulaio_writeW, paulaio_writeL,
+ paulaio_interrupt, paulaio_next_interrupt,
+ paulaio_adjust_cycle,
+ paulaio_reset,
+ paulaio_destroy
+};
+
+
+io68_t * paulaio_create(emu68_t * const emu68, paula_parms_t * const parms)
+{
+ paula_io68_t * paulaio = 0;
+
+ if (emu68) {
+ paulaio = emu68_alloc(sizeof(*paulaio));
+ if (paulaio) {
+ paula_setup_t setup;
+ if (parms) {
+ setup.parms = *parms;
+ } else {
+ setup.parms.engine = PAULA_ENGINE_DEFAULT;
+ setup.parms.hz = 0;
+ setup.parms.clock = PAULA_CLOCK_DEFAULT;
+ }
+ setup.mem = emu68->mem;
+ setup.log2mem = emu68->log2mem;
+ paulaio->io = paula_io;
+ paula_setup(&paulaio->paula, &setup);
+ }
+ }
+ return &paulaio->io;
+}
+
+int paulaio_init(int * argc, char ** argv)
+{
+ return paula_init(argc, argv);
+}
+
+void paulaio_shutdown(void)
+{
+ paula_shutdown();
+}
+
+paula_t * paulaio_emulator(io68_t * const io)
+{
+ return io
+ ? &((paula_io68_t*)io)->paula
+ : 0
+ ;
+}
+
+int paulaio_sampling_rate(io68_t * const io, int hz)
+{
+ return paula_sampling_rate(paulaio_emulator(io),hz);
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/paula_io.h Added

@@ -0,0 +1,75 @@
+/**
+ * @ingroup   lib_io68
+ * @file      io68/paula_io.h
+ * @brief     Paula IO plugin header.
+ * @author    Benjamin Gerard
+ * @date      1998/06/18
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef IO68_PAULA_IO_H
+#define IO68_PAULA_IO_H
+
+#include "emu68/struct68.h"
+#include "paulaemul.h"
+
+/**
+ * @addtogroup  lib_io68_aga
+ * @{
+ */
+
+/**
+ * @name Paula (Amiga soundchip) IO plugin
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Initialize paula library.
+ */
+int paulaio_init(int * argc, char ** argv);
+
+IO68_EXTERN
+/**
+ * Shutdown paula library.
+ */
+void paulaio_shutdown(void);
+
+IO68_EXTERN
+/**
+ * Create paula io instance.
+ *
+ * @param   emu68  68000 emulator instance
+ * @param   parms  Paula parameters
+ *
+ * @return  Created shifter instance
+ * @retval  0
+ */
+io68_t * paulaio_create(emu68_t * const emu68, paula_parms_t * const parms);
+
+IO68_EXTERN
+/**
+ * Get/Set sampling rate.
+ *
+ * @param  io  Paula IO instance
+ * @param  hz  @ref paula_hz_e "sampling rate" in hz
+ * @return     Actual @ref paula_hz_e "sampling rate".
+ */
+int paulaio_sampling_rate(io68_t * const io, int hz);
+
+IO68_EXTERN
+/**
+ * Get paula emulator instance.
+ */
+paula_t * paulaio_emulator(io68_t * const io);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/paulaemul.c Added

@@ -0,0 +1,555 @@
+/*
+ * @file paulaemul.c
+ * @brief Paula emulator (Amiga soundchip)
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "default.h"
+#include "paulaemul.h"
+#include "emu68/assert68.h"
+
+#include <sc68/file68_msg.h>
+#include <sc68/file68_opt.h>
+#include <sc68/file68_str.h>
+
+#ifndef DEBUG_PL_O
+# define DEBUG_PL_O 0
+#endif
+int pl_cat = msg68_DEFAULT;
+
+#define PLHD "paula : "
+
+/* Filled by paula_init() to avoid field order dependencies */
+static paula_parms_t default_parms;
+
+
+static int msw_first = 0; /* big/little endian compliance */
+static int pl_chans = 15; /* active channels */
+
+static int onchange_filter(const option68_t * opt, value68_t * val)
+{
+ paula_engine(0,!val->num?PAULA_ENGINE_SIMPLE:PAULA_ENGINE_LINEAR);
+ return 0;
+}
+
+static int onchange_clock(const option68_t * opt, value68_t * val)
+{
+ paula_clock(0,!val->num?PAULA_CLOCK_PAL:PAULA_CLOCK_NTSC);
+ return 0;
+}
+
+static int onchange_chans(const option68_t * opt, value68_t * val)
+{
+ val->num = pl_chans = 15 & val->num;
+ return 0;
+}
+
+static const char * f_clock = { "pal","ntsc" };
+
+/* Command line options */
+/* static const char prefix = "sc68-"; */
+#define prefix NULL
+static const char engcat = "paula";
+static option68_t opts = {
+ OPT68_BOOL(prefix,"amiga-filter",engcat,
+ "active paula resample filter",1,onchange_filter),
+ OPT68_IRNG(prefix,"amiga-blend",engcat,
+ "left/right voices blending factor {128:mono}",
+ 0,0xFF,1,0),
+ OPT68_ENUM(prefix,"amiga-clock",engcat,"paula clock",
+ f_clock,sizeof(f_clock)/sizeof(*f_clock),1,onchange_clock),
+ OPT68_IRNG(prefix,"amiga-chans",engcat,
+ "set active paula channels {bit#0-3 = chan#A-C}",
+ 0,15,0,onchange_chans),
+};
+#undef prefix
+
+/* ,-----------------------------------------------------------------.
+ * | Paula init |
+ * `-----------------------------------------------------------------'
+ */
+
+
+int paula_init(int * argc, char ** argv)
+{
+ static const u32 msw = 0x1234;
+
+ if (pl_cat == msg68_DEFAULT)
+ pl_cat = msg68_cat("paula","amiga sound emulator", DEBUG_PL_O);
+
+ /* Setup little/big endian swap */
+ msw_first = !(*(const u8 *)&msw);
+
+ /* Set default default */
+ default_parms.engine = PAULA_ENGINE_SIMPLE;
+ default_parms.clock = PAULA_CLOCK_PAL;
+ default_parms.hz = SPR_DEF;
+
+ /* Register amiga options */
+ option68_append(opts,sizeof(opts)/sizeof(*opts));
+
+ /* Default option values */
+ option68_iset(opts+0, default_parms.engine!=PAULA_ENGINE_SIMPLE,
+ opt68_NOTSET,opt68_CFG);
+ option68_iset(opts+1, 0x50, opt68_NOTSET, opt68_CFG);
+ option68_iset(opts+2, default_parms.clock!=PAULA_CLOCK_PAL,
+ opt68_NOTSET,opt68_CFG);
+
+ /* Parse options */
+ *argc = option68_parse(*argc,argv);
+
+ return 0;
+}
+
+void paula_shutdown()
+{
+ msg68_cat_free(pl_cat);
+ pl_cat = msg68_DEFAULT;
+}
+
+/* ,-----------------------------------------------------------------.
+ * | Paula Sampling Rate |
+ * `-----------------------------------------------------------------'
+ */
+
+static int set_clock(paula_t * const paula, int clock_type, uint68_t f)
+{
+ u64 tmp;
+ const int ct_fix = paula->ct_fix;
+ const int fix = 40;
+
+ paula->hz = f;
+ paula->clock = clock_type;
+ tmp = (clock_type == PAULA_CLOCK_PAL)
+ ? PAULA_PAL_FRQ
+ : PAULA_NTSC_FRQ
+ ;
+ tmp <<= fix;
+ tmp /= f;
+
+ if ( ct_fix < fix )
+ tmp >>= fix - ct_fix;
+ else
+ tmp <<= ct_fix - fix;
+ TRACE68(pl_cat,
+ PLHD "clock -- *%s*\n",
+ clock_type == PAULA_CLOCK_PAL ? "PAL" : "NTSC");
+ paula->clkperspl = (plct_t) tmp;
+ return f;
+}
+
+int paula_sampling_rate(paula_t * const paula, int hz)
+{
+ switch (hz) {
+ case PAULA_HZ_QUERY:
+ hz = paula ? paula->hz : default_parms.hz;
+ break;
+
+ case PAULA_HZ_DEFAULT:
+ hz = default_parms.hz;
+
+ default:
+ if (hz < SPR_MIN)
+ hz = SPR_MIN;
+ else if (hz > SPR_MAX)
+ hz = SPR_MAX;
+ if (!paula)
+ default_parms.hz = hz;
+ else
+ set_clock(paula, paula->clock, hz);
+ TRACE68(pl_cat,
+ PLHD "%s sampling rate -- *%dhz*\n",
+ paula ? "select" : "default", hz);
+ break;
+ }
+ return hz;
+}
+
+/* ,-----------------------------------------------------------------.
+ * | Set/Get emulator engine |
+ * `-----------------------------------------------------------------'
+ */
+
+static
+const char * pl_engine_name(const int engine)
+{
+ switch (engine) {
+ case PAULA_ENGINE_SIMPLE: return "SIMPLE";
+ case PAULA_ENGINE_LINEAR: return "LINEAR";
+ }
+ return "INVALID";
+}
+
+static
+const char * pl_clock_name(const int clock)
+{
+ switch (clock) {
+ case PAULA_CLOCK_PAL: return "PAL";
+ case PAULA_CLOCK_NTSC: return "NTSC";
+ }
+ return "INVALID";
+}
+
+int paula_engine(paula_t * const paula, int engine)
+{
+ switch (engine) {
+ case PAULA_ENGINE_QUERY:
+ engine = paula ? paula->engine : default_parms.engine;
+ break;
+
+ default:
+ msg68_warning(PLHD "invalid engine -- %d\n", engine);
+ case PAULA_ENGINE_DEFAULT:
+ engine = default_parms.engine;
+ case PAULA_ENGINE_SIMPLE:
+ case PAULA_ENGINE_LINEAR:
+ *(paula ? &paula->engine : &default_parms.engine) = engine;
+ TRACE68(pl_cat,
+ PLHD "%s engine -- *%s*\n",
+ paula ? "select" : "default",
+ pl_engine_name(engine));
+ break;
+ }
+ return engine;
+}
+
+int paula_clock(paula_t * const paula, int clock)
+{
+ switch (clock) {
+ case PAULA_CLOCK_QUERY:
+ clock = paula ? paula->clock : default_parms.clock;
+ break;
+
+ default:
+ clock = default_parms.clock;
+ case PAULA_CLOCK_PAL:
+ case PAULA_CLOCK_NTSC:
+ if (paula) {
+ set_clock(paula, clock, paula->hz);
+ } else {
+ default_parms.clock = clock;
+ }
+ break;
+ }
+ return clock;
+}
+
+/* ,-----------------------------------------------------------------.
+ * | paula reset |
+ * `-----------------------------------------------------------------'
+ */
+
+int paula_reset(paula_t * const paula)
+{
+ int i;
+
+ /* reset shadow registers */
+ for (i=0; i<sizeof(paula->map); i++) {
+ paula->mapi = 0;
+ }
+
+ /* Some musics does not initialize volume (see support-request #4) */
+ for (i=0; i<4; i++) {
+ paula->mapPAULA_VOICE(i)+9 = 64; /* default volume to 64 */
+ paula->mapPAULA_VOICE(i)+6 = 0x10; /* default period to 0x1000 */
+ }
+
+ /* reset voices */
+ for (i=0; i<4; i++) {
+ paula->voicei.adr = 2;
+ paula->voicei.start = 0;
+ paula->voicei.end = 0; /* end < adr should prevent mixing */
+ }
+
+ /* Reset DMACON and INTENA/REQ to something that
+ * seems acceptable to me.
+ */
+ paula->dmacon = 1 << 9; /* DMA general activate, DMA audio desactivate. */
+ paula->intreq = 0; /* No interrupt request. */
+ paula->intena = 1 << 14; /* Master interrupt enable, audio int disable. */
+ paula->adkcon = 0; /* No modulation. */
+
+ return 0;
+}
+
+void paula_cleanup(paula_t * const paula) {}
+
+int paula_setup(paula_t * const paula,
+ paula_setup_t * const setup)
+{
+ if (!paula || !setup || !setup->mem) {
+ return -1;
+ }
+
+ /* Default sampling rate */
+ if (!setup->parms.hz) {
+ setup->parms.hz = default_parms.hz;
+ }
+
+ /* Default clock mode */
+ if (setup->parms.clock == PAULA_CLOCK_DEFAULT) {
+ setup->parms.clock = default_parms.clock;
+ }
+
+ paula->chansptr = &pl_chans;
+ paula->mem = setup->mem;
+ paula->log2mem = setup->log2mem;
+ paula->ct_fix = ( sizeof(plct_t) << 3 ) - paula->log2mem;
+
+ setup->parms.engine = paula_engine(paula, setup->parms.engine);
+ paula_reset(paula);
+ set_clock(paula, setup->parms.clock, setup->parms.hz);
+
+ /* Debug trace */
+ TRACE68(pl_cat, PLHD "engine -- *%s*\n", pl_engine_name(paula->engine));
+ TRACE68(pl_cat, PLHD "clock -- *%s*\n", pl_clock_name(paula->clock));
+ TRACE68(pl_cat, PLHD "sampling rate -- *%dhz*\n", (int)paula->hz);
+
+ return 0;
+}
+
+#if 0
+static void poll_irq(paula_t * const paula, unsigned int N)
+{
+ u8 *p = paula->map + PAULA_VOICE(N);
+ paulav_t * w = paula->voice+N;
+
+ /* Reload internal when interrupt is DENIED */
+ if (
+ (paula->intreq
+ |
+ ~((paula->intena << (8*sizeof(int)-1-14) >> (8*sizeof(int)-1))
+ & paula->intena)) & (1 << (N + 7))) {
+ uint68_t a,l;
+
+ /* Get sample pointer. */
+ a = (uint68_t) ( ((p1 << 16) | (p2 << 8) | p3) & 0x7FFFE )
+ << PAULA_ct_fix;
+ w->adr = w->start = a;
+ /* Get length */
+ l = (p4 << 8) | p5;
+ l |= (!l) << 16;
+ l <<= (1 + PAULA_ct_fix);
+ w->end = a + l;
+ }
+ paula->intreq |= 1 << (N + 7);
+}
+#endif
+
+/* Mix with laudio channel data (1 char instead of 2) */
+
+static void mix_one(paula_t * const paula,
+ int N, const int shift,
+ s32 * b, int n)
+{
+ const u8 * const mem = paula->mem;
+ paulav_t * const w = paula->voice+N;
+ u8 * const p = paula->map+PAULA_VOICE(N);
+ s16 * b2 = (s16 *)b + shift;
+ const int ct_fix = paula->ct_fix;
+ plct_t adr, stp, readr, reend, end, vol, per;
+ u8 last, hasloop;
+
+ /* Mask to get the fractionnal part of the sample counter. Therefore
+ * forcing it to 0 will disable linear interpolation by forcing
+ * exact sample point.
+ */
+ const plct_t imask = paula->engine == PAULA_ENGINE_LINEAR
+ ? ( ( (plct_t) 1 << ct_fix ) - 1 )
+ : 0
+ ;
+ const signed_plct_t one = (signed_plct_t) 1 << ct_fix;
+
+ hasloop = 0;
+
+ /* $$$ FIXME
+ * Dunno exactly what if volume is not in proper range 0..64
+ */
+ vol = p9 & 127;
+ if (vol >= 64)
+ vol = 64;
+ vol <<= 1;
+
+
+ per = ( p6 << 8 ) + p7;
+ if (!per) per = 1; /* or is it +1 for all ?? */
+ stp = paula->clkperspl / per;
+
+ /* Audio irq disable for this voice :
+ * Internal will be reload at end of block
+ */
+ readr = ( p1 << 16 ) | ( p2 << 8 ) | p3;
+ readr <<= ct_fix;
+ reend = ((p4 << 8) | p5);
+ reend |= (!reend) << 16; /* 0 is 0x10000 */
+ reend <<= (1 + ct_fix); /* +1 as unit is 16-bit word */
+ reend += readr;
+ assert( reend > readr );
+ if (reend <= readr) {
+ /* $$$ ??? dunno why I did this !!! May be could happen on a
+ * modulo. */
+ return;
+ }
+
+ adr = w->adr;
+ end = w->end;
+ if (end <= adr)
+ return;
+
+ /* mix stereo */
+ do {
+ int idx;
+ signed_plct_t low, v0, v1;
+
+ low = adr & imask;
+ idx = adr >> ct_fix; /* current index */
+ last = memidx++; /* save last sample read */
+
+ if ( ( (plct_t) idx << ct_fix ) >= end )
+ idx = readr >> ct_fix; /* loop index */
+ v1 = (s8) memidx; /* next sample */
+ v0 = (s8) last; /* current sample */
+
+ /* linear interpolation (or not if imask is zero) */
+ v0 = ( v1 * low + v0 * ( one - low ) ) >> ct_fix;
+
+ /* apply volume */
+ v0 *= vol;
+
+ assert(v0 >= -16384);
+ assert(v0 < 16384);
+
+ /* Store and advance output buffer */
+ *b2 += v0;
+ b2 += 2;
+
+ /* Advance */
+ adr += stp;
+ if (adr >= end) {
+ plct_t relen = reend - readr;
+ hasloop = 1;
+ adr = readr + adr - end;
+ end = reend;
+ while (adr >= end) {
+ adr -= relen;
+ }
+ }
+ } while (--n);
+
+ last &= 0xFF;
+ p0xA = last + (last << 8);
+ w->adr = adr;
+ if (hasloop) {
+ w->start = readr;
+ w->end = end;
+ }
+}
+
+/* ,-----------------------------------------------------------------.
+ * | Paula process |
+ * `-----------------------------------------------------------------'
+ */
+
+static void clear_buffer(s32 * b, int n)
+{
+ const s32 v = 0;
+ if (n & 1) { *b++ = v; }
+ if (n & 2) { *b++ = v; *b++ = v; }
+ if (n >>= 2, n) do {
+ *b++ = v; *b++ = v; *b++ = v; *b++ = v;
+ } while (--n);
+}
+
+
+#if DEBUG_PL_O == 1
+
+typedef struct {
+ int on;
+ unsigned int adr; /**< current sample counter (<<paula_t::ct_fix). */
+ unsigned int start; /**< loop address. */
+ unsigned int end; /**< end address (<<paula_t::ct_fix). */
+ int len;
+ int vol;
+ int per;
+} paulav_dbg_t;
+
+static
+void paula_dbg(paulav_dbg_t * d, paula_t * const paula, int i)
+{
+ paulav_t * const w = paula->voice+i;
+ u8 * const p = paula->map+PAULA_VOICE(i);
+ const int ct_fix = paula->ct_fix;
+
+ d->on = ((paula->dmacon >> 9) & (paula->dmacon >> i) & 1);
+ d->adr = w->adr >> ct_fix;
+ d->end = w->end >> ct_fix;
+ d->start = w->start >> ct_fix;
+ d->len = d->end-w->start;
+ d->vol = p9 & 127;
+ /* if (d->vol >= 64) d->vol = 64; */
+ d->per = ( p6 << 8 ) + p7;
+ /* if (!d->per) d->per = 1; */
+}
+
+#endif
+
+void paula_mix(paula_t * const paula, s32 * splbuf, int n)
+{
+
+ if ( n > 0 ) {
+ const int pl_mask = paula->chansptr ? *paula->chansptr : 15;
+ int i, b=0;
+#if DEBUG_PL_O == 1
+ paulav_dbg_t d4;
+#endif
+ clear_buffer(splbuf, n);
+ for (i=0; i<4; i++) {
+ /* $$$ VERIFY: channel mapping ABCD => LRRL ? */
+ const int right = (i^(i>>1)^msw_first)&1;
+#if DEBUG_PL_O == 1
+ paula_dbg(d+i, paula, i);
+#endif
+ if ((paula->dmacon >> 9) & ( (pl_mask & paula->dmacon) >> i) & 1) {
+ mix_one(paula, i, right, splbuf, n);
+ b += 1 << i;
+ }
+ }
+
+#if DEBUG_PL_O == 1
+ if (1) {
+# define ONE "%c:%06x-%06x->%06x,%04x,%02d"
+ TRACE68(pl_cat,
+ PLHD "%d " ONE " " ONE " " ONE " " ONE "\n",
+ n,
+ d0.on?'A':'.', d0.adr, d0.end, d0.start, d0.per,d0.vol,
+ d1.on?'B':'.', d1.adr, d1.end, d1.start, d1.per,d1.vol,
+ d2.on?'C':'.', d2.adr, d2.end, d2.start, d2.per,d2.vol,
+ d3.on?'D':'.', d3.adr, d3.end, d3.start, d3.per,d3.vol);
+ }
+#endif
+ }
+ /* HaxXx: assuming next mix is next frame reset beam V/H position. */
+ paula->vhpos = 0;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/paulaemul.h Added

@@ -0,0 +1,413 @@
+/**
+ * @ingroup lib_io68
+ * @file io68/paulaemul.h
+ * @brief Paula emulator header.
+ * @author Benjamin Gerard
+ * @date 1998/07/18
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef IO68_PAULAEMUL_H
+#define IO68_PAULAEMUL_H
+
+#include "io68_api.h"
+
+#include "emu68/struct68.h"
+
+/**
+ * @defgroup lib_io68_aga Amiga Paula emulator.
+ * @ingroup lib_io68
+ * @brief Paula emulator (Amiga soundchip).
+ *
+ * @todo Write something about paula and about this emulator right here !
+ *
+ *
+ * @par About Amiga hardware registers
+ *
+ * Amiga hardware registers could have a different address for read
+ * and write access. It is the case for DMA control register
+ * (DMACON).
+ *
+ * Registers could be (B)yte or (W)ord wide.
+ *
+ *
+ * @par SET/CLR bit
+ *
+ * Some hardware registers work with a SET/CLR bit. When writing
+ * these registers the value is not copied as is. The operation
+ * depends on the value of S the most signifiant bit (#15).
+ *
+ * - If S is 1 set-bit have to be set (bitwise OR).
+ * - If S is 0 set-bit have to be clear (bitwise NAND).
+ *
+ *
+ * @par Register map
+ *
+ * @code
+ * // NAME SZ ADDR
+ *
+ * VHPOSR (B) DFF006 xxxxxxxx Vertical/Horizontal electron bean position.
+ *
+ * INTREQR (W) DFF01E -x---DCBA-------- Interrupt request read.
+ * INTREQW (W) DFF09C -x---DCBA-------- Interrupt request write.
+ *
+ * INTENAR (W) DFF01C -M---DCBA-------- Interrupt enable read (M=Master).
+ * INTENAW (W) DFF09A SM---DCBA-------- Interrupt enable write (M=Master).
+ *
+ * DMACONW (W) DFF096 S00000E00000DBCA DMA control register write (E=Enable).
+ * DMACONR (W) DFF002 000000E00000DBCA DMA control register read (E=Enable).
+ *
+ * VOICEA DFF0A0
+ * VOICEB DFF0B0
+ * VOICEC DFF0C0
+ * VOICED DFF0D0
+ *
+ * VOICEX
+ * +0 (L) START 00000000 00000xxx xxxxxxxx xxxxxxx0 start address (even).
+ * +4 (W) LENGTH xxxxxxxx xxxxxxxx Length in word (0=010000).
+ * +6 (W) PERIOD 0000xxxx xxxxxxxx Period (in paula cycle).
+ * +8 (W) VOLUME 0xxxxxxx Volume 0-64 (presume value > 64 => 64).
+ * @endcode
+ *
+ *
+ * @{
+ */
+
+/**
+ * Amiga hardware regiosters.
+ */
+enum amiga_regs_e {
+
+ /** Amiga Vertical/Horizontal electron bean position */
+ PAULA_VHPOSR = 0x06,
+
+ /**
+ * @name Amiga interrupt registers.
+ *
+ * All hardware registers involved with interruption handling use the
+ * same bit organisation :
+ * - bit 7 Audio channel A
+ * - bit 8 Audio channel B
+ * - bit 9 Audio channel C
+ * - bit 10 Audio channel D
+ * - bit 14 Master interrupt
+ * @{
+ */
+ PAULA_INTREQR = 0x1E, /**< Interruption request read */
+ PAULA_INTREQRH = 0x1E, /**< Interruption request read MSB */
+ PAULA_INTREQRL = 0x1F, /**< Interruption request read LSB */
+
+ PAULA_INTREQ = 0x9C, /**< Interruption request write */
+ PAULA_INTREQH = 0x9C, /**< Interruption request write MSB */
+ PAULA_INTREQL = 0x9D, /**< Interruption request write LSB */
+
+ PAULA_INTENAR = 0x1C, /**< Interruption enable read */
+ PAULA_INTENARH = 0x1C, /**< Interruption enable read MSB */
+ PAULA_INTENARL = 0x1D, /**< Interruption enable read LSB */
+
+ PAULA_INTENA = 0x9A, /**< Interruption enable write */
+ PAULA_INTENAH = 0x9A, /**< Interruption enable write MSB */
+ PAULA_INTENAL = 0x9B, /**< Interruption enable write LSB */
+ /**
+ * @}
+ */
+
+ /**
+ * @name Amiga DMA registers.
+ *
+ * Amiga DMA control register bits :
+ * - bit 0 Audio DMA channel A
+ * - bit 1 Audio DMA channel B
+ * - bit 2 Audio DMA channel C
+ * - bit 3 Audio DMA channel D
+ * - bit 9 General DMA
+ *
+ * @{
+ */
+ PAULA_DMACONR = 0x02, /**< DMA control read */
+ PAULA_DMACONRH = 0x02, /**< DMA control read MSB */
+ PAULA_DMACONRL = 0x03, /**< DMA control read LSB */
+ PAULA_DMACON = 0x96, /**< DMA control write */
+ PAULA_DMACONH = 0x96, /**< DMA control write MSB */
+ PAULA_DMACONL = 0x97, /**< DMA control write LSB */
+ /**
+ * @}
+ */
+
+ /**
+ * @name The Audio & Disk Control Registers.
+ *
+ * Bits:
+ * - 07 USE3PN Use audio channel 3 to modulate nothing.
+ * - 06 USE2P3 Use audio channel 2 to modulate period of channel 3.
+ * - 05 USE1P2 Use audio channel 1 to modulate period of channel 2.
+ * - 04 USE0P1 Use audio channel 0 to modulate period of channel 1.
+ * - 03 USE3VN Use audio channel 3 to modulate nothing.
+ * - 02 USE2V3 Use audio channel 2 to modulate volume of channel 3.
+ * - 01 USE1V2 Use audio channel 1 to modulate volume of channel 2.
+ * - 00 USE0V1 Use audio channel 0 to modulate volume of channel 1.
+ *
+ * @note If both period/volume are modulated on the same channel, the
+ * period and volume will be alternated. First word xxxxxxxx V6-V0,
+ * Second word P15-P0 (etc).
+ *
+ * @{
+ */
+ PAULA_ADKCON = 0x9E, /**< Audio, disk, control write. */
+ PAULA_ADKCONR = 0x10, /**< Audio, disk, control read. */
+ PAULA_ADKCONRH = PAULA_ADKCONR+0,
+ PAULA_ADKCONRL = PAULA_ADKCONR+1,
+ /**
+ * @}
+ */
+
+ /**
+ * @name Amiga Paula registers.
+ * @{
+ */
+ PAULA_VOICEA = 0xA0, /**< Paula channel A register base. */
+ PAULA_VOICEB = 0xB0, /**< Paula channel B register base. */
+ PAULA_VOICEC = 0xC0, /**< Paula channel C register base. */
+ PAULA_VOICED = 0xD0, /**< Paula channel D register base. */
+ /**
+ * @}
+ */
+};
+
+#define PAULA_VOICE(I) ((0xA+(I))<<4) /**< Paula channel I register base. */
+
+/**
+ * Amiga Paula Clock frequencies.
+ */
+enum {
+ PAULA_PAL_FRQ = 3546897u, /**< Paula PAL clock frequency. */
+ PAULA_NTSC_FRQ = 3579545u, /**< Paula NTSC clock frequency. */
+};
+
+/**
+ * Type used by internal counters.
+ *
+ * This type must be an unsigned of at least 32-bit. Values are
+ * always fixed point. The amount of shifting is calculated so that
+ * the most useful bit is the most signifiant bit. Therefore these
+ * counters have a automatic natural modulo.
+ */
+typedef uint68_t plct_t;
+
+/** Must be same size than plct_t but signed. */
+typedef int68_t signed_plct_t;
+
+/** Paula voice data structure. */
+typedef struct {
+ plct_t adr; /**< current sample counter (<<paula_t::ct_fix). */
+ plct_t start; /**< loop address. */
+ plct_t end; /**< end address (<<paula_t::ct_fix). */
+} paulav_t;
+
+/** Paula emulator data structure. */
+typedef struct {
+ u8 map256; /**< Paula regiters mapping. */
+ paulav_t voice4; /**< Paula voices (4 channels). */
+ int engine; /**< @ref paula_engine_e "Engine id". */
+ int ct_fix; /**< Fixed precision used by counters in
+ order to have a natural memory access
+ modulo. */
+ int clock; /**< Clock type. @see paula_clock_e. */
+ plct_t clkperspl; /**< (clock<<paula_t::ct_fix)/hz. */
+ uint_t hz; /**< Sampling rate in hz, */
+ int * chansptr; /**< Pointer to enabled channels mask. */
+
+ const u8 * mem; /**< 68K memory buffer. */
+ int log2mem; /**< 68K memory buffer size (2^log2mem). */
+
+ int dmacon; /**< Shadow DMACON. */
+ int intena; /**< Shadow INTENA. */
+ int intreq; /**< Shadow INTREQ. */
+ int adkcon; /**< Shadow ADKCON. */
+ int vhpos; /**< Shadow VHPOSR. */
+} paula_t;
+
+/**
+ * @name Initialization functions.
+ * @{
+ */
+
+/** available emulation modes. */
+enum paula_engine_e {
+ PAULA_ENGINE_QUERY = -1, /**< Query current or default paula engine. */
+ PAULA_ENGINE_DEFAULT = 0, /**< Default engine. */
+ PAULA_ENGINE_SIMPLE, /**< Without interpolation. */
+ PAULA_ENGINE_LINEAR /**< With linear interpolation. */
+};
+
+/** clock type. */
+enum paula_clock_e {
+ PAULA_CLOCK_QUERY = -1, /**< Query current or default clock */
+ PAULA_CLOCK_DEFAULT = 0,
+ PAULA_CLOCK_PAL,
+ PAULA_CLOCK_NTSC
+};
+
+/** sampling rate value in hertz. */
+enum paula_hz_e {
+ PAULA_HZ_QUERY = -1, /**< Query current or default sampling rate */
+ PAULA_HZ_DEFAULT = 0 /**< Default sampling rate */
+};
+
+/** Paula instance creaation parameters. */
+typedef struct {
+ int engine; /**< Default @ref paula_engine_e "emulation mode". */
+ int clock; /**< Default @ref paula_clock_e "clock type". */
+ int hz; /**< Default @ref paula_hz_e "sampling rate" in Hz. */
+} paula_parms_t;
+
+/** setup data. */
+typedef struct {
+ paula_parms_t parms; /**< Paula params. */
+ const u8 * mem; /**< 68K memory buffer. */
+ int log2mem; /**< 68K memory buffer size (2^log2mem). */
+} paula_setup_t;
+
+IO68_EXTERN
+/**
+ * Init paula library.
+ *
+ * The paula_init() must be call prior to all other paula functions.
+ *
+ * @return error-code (always success)
+ * @return 0 Success
+ * @return -1 Failure
+ *
+ * @see paula_shutdown()
+ */
+int paula_init(int * argc, char ** argv);
+
+IO68_EXTERN
+/**
+ * Shutdown paula library.
+ *
+ * @see paula_init()
+ */
+void paula_shutdown(void);
+
+IO68_EXTERN
+/**
+ * Paula hardware reset.
+ *
+ * The paula_reset() reset function perform a Paula reset.
+ * It performs following operations :
+ * - all registers zeroed
+ * - all internal voices set to dummy 2 samples len address.
+ * - general DMA enabled
+ * - all audio DMA disabled
+ * - interrupt master enabled
+ * - all audio interrupt disbled
+ *
+ * @return error-code (always success)
+ * @return 0 Success
+ */
+int paula_reset(paula_t * const paula);
+
+IO68_EXTERN
+/**
+ * Paula emulator instance setup.
+ *
+ * @return error-code (always success)
+ * @return 0 Success
+ *
+ * @see paula_reset()
+ */
+int paula_setup(paula_t * const paula, paula_setup_t * const setup);
+
+IO68_EXTERN
+/**
+ * Paula emulator instance cleanup.
+ */
+void paula_cleanup(paula_t * const paula);
+
+IO68_EXTERN
+/**
+ * Set/Get paula emulator type.
+ *
+ * The paula_emulation() function set and get the paula emulator
+ * type.
+ *
+ * If engine is paula_engine_e::PAULA_ENGINE_QUERY the function
+ * returns the current value without modifying anything. Else the
+ * function set the current paula engine according to the value of
+ * engine. If paula parameter is NULL pointer the function works
+ * with the default parameters rather than a actual paula instance
+ * meaning it will read or write the default setting (addressed by
+ * paula_engine_e::PAULA_ENGINE_DEFAULT).
+ *
+ * @param paula Paula emulator instance.
+ * @param engine @ref paula_engine_e "emulator type".
+ * @return an @ref paula_engine_e "emulator type".
+ */
+int paula_engine(paula_t * const paula, int engine);
+
+IO68_EXTERN
+/**
+ * Set/Get paula clock type.
+ *
+ * The paula_clock() function is similar to the paula_engine()
+ * function except it concerns clock rate.
+ *
+ * @param paula Paula emulator instance.
+ * @param clock @ref paula_clock_e "clock type".
+ * @return a @ref paula_clock_e "clock type".
+ */
+int paula_clock(paula_t * const paula, int clock);
+
+IO68_EXTERN
+/**
+ * Set/Get paula emulator sampling rate.
+ *
+ * The paula_sampling_rate() function is similar to the
+ * paula_engine() function except it concerns sampling rate.
+ *
+ * @param paula Paula emulator instance.
+ * @param hz @ref paula_hz_e "sampling rate" in Hz.
+ * @return actual @ref paula_hz_e "sampling rate" in Hz.
+ */
+int paula_sampling_rate(paula_t * const paula, int hz);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Emulation functions
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Execute Paula emulation.
+ *
+ * The paula_mix() function processes sample mixing with current
+ * internal parameters for n samples. Mixed samples are stored in a
+ * large enough (at least n) 32 bit pcm buffer pointed by b. mem68
+ * is a pointer to the 68K memory buffer. The Paula emulator assume
+ * that this buffer is at least the size of the Amiga "chip"
+ * RAM. This implies at leat 512Kb and PCM data must be in the first
+ * 512Kb.
+ *
+ * @param paula Paula emulator instance
+ * @param splbuf Destination 32-bit sample buffer
+ * @param n Number of sample to mix in splbuf buffer
+ *
+ */
+void paula_mix(paula_t * const paula, s32 * splbuf, int n);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/shifter_io.c Added

@@ -0,0 +1,215 @@
+/*
+ * @file shifter_io.c
+ * @brief Atari ST shifter I/O plugin (50/60hz and resolution)
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "emu68/struct68.h"
+
+typedef struct {
+ io68_t io;
+ u8 data_0a;
+ u8 data_60;
+} shifter_io68_t;
+
+static int68_t _shifter_readB(shifter_io68_t * const shifterio,
+ addr68_t addr)
+{
+ switch ((u8)addr) {
+ case 0x0A:
+ return shifterio->data_0a;
+ case 0x60:
+ return shifterio->data_60;
+ }
+ return 0;
+}
+
+static void _shifter_writeB(shifter_io68_t * const shifterio,
+ addr68_t addr, int68_t v)
+{
+ switch ((u8)addr) {
+ case 0x0A:
+ shifterio->data_0a = v;
+ break;
+ case 0x60:
+ shifterio->data_60 = v;
+ break;
+ }
+}
+
+
+static void shifter_readB(io68_t * const io68)
+{
+ emu68_t * const emu68 = io68->emu68;
+ emu68->bus_data =
+ _shifter_readB((shifter_io68_t*)io68, emu68->bus_addr);
+}
+
+
+static void shifter_readW(io68_t * const io68)
+{
+ emu68_t * const emu68 = io68->emu68;
+ io68->emu68->bus_data =
+ 0
+ | (_shifter_readB((shifter_io68_t*)io68, emu68->bus_addr+0)<<8)
+ | (_shifter_readB((shifter_io68_t*)io68, emu68->bus_addr+1) );
+}
+
+static void shifter_readL(io68_t * const io68)
+{
+ emu68_t * const emu68 = io68->emu68;
+ emu68->bus_data =
+ 0
+ | (_shifter_readB((shifter_io68_t*)io68, emu68->bus_addr+0)<<24)
+ | (_shifter_readB((shifter_io68_t*)io68, emu68->bus_addr+1)<<16)
+ | (_shifter_readB((shifter_io68_t*)io68, emu68->bus_addr+2)<<8 )
+ | (_shifter_readB((shifter_io68_t*)io68, emu68->bus_addr+3) );
+}
+
+static void shifter_writeB(io68_t * const io68)
+{
+ emu68_t * const emu68 = io68->emu68;
+ _shifter_writeB((shifter_io68_t*)io68,
+ emu68->bus_addr, emu68->bus_data);
+}
+
+static void shifter_writeW(io68_t * const io68)
+{
+ emu68_t * const emu68 = io68->emu68;
+ _shifter_writeB((shifter_io68_t*)io68,
+ emu68->bus_addr+0, emu68->bus_data>>8);
+ _shifter_writeB((shifter_io68_t*)io68,
+ emu68->bus_addr+1, emu68->bus_data );
+}
+
+static void shifter_writeL(io68_t * const io68)
+{
+ emu68_t * const emu68 = io68->emu68;
+ _shifter_writeB((shifter_io68_t*)io68,
+ emu68->bus_addr+0, emu68->bus_data>>24);
+ _shifter_writeB((shifter_io68_t*)io68,
+ emu68->bus_addr+1, emu68->bus_data>>16);
+ _shifter_writeB((shifter_io68_t*)io68,
+ emu68->bus_addr+2, emu68->bus_data>> 8);
+ _shifter_writeB((shifter_io68_t*)io68,
+ emu68->bus_addr+3, emu68->bus_data );
+}
+
+static interrupt68_t *shifter_interrupt(io68_t * const io,
+ const cycle68_t cycle)
+{
+ return 0;
+}
+
+static cycle68_t shifter_next_interrupt(io68_t * const io,
+ const cycle68_t cycle)
+{
+ return IO68_NO_INT;
+}
+
+static void _shifter_reset(shifter_io68_t * const shifter, const int hz)
+{
+ switch (hz) {
+ case 60:
+ shifter->data_0a = 0xfc;
+ shifter->data_60 = 0x00;
+ break;
+ case 70:
+ shifter->data_0a = 0xfe;
+ shifter->data_60 = 0x02;
+ break;
+ case 50:
+ default:
+ shifter->data_0a = 0xfe;
+ shifter->data_60 = 0x00;
+ }
+}
+
+static int shifter_reset(io68_t * const io)
+{
+ if (io) {
+ _shifter_reset((shifter_io68_t *)io, 50);
+ return 0;
+ } else {
+ return -1;
+ }
+}
+
+static void shifter_adjust_cycle(io68_t * const io, const cycle68_t cycle)
+{
+}
+
+static void shifter_destroy(io68_t * const io)
+{
+ emu68_free(io);
+}
+
+static io68_t const shifter_io =
+{
+ 0,
+ "Shifter",
+ 0xFFFF8200, 0xFFFF82FF,
+ shifter_readB, shifter_readW, shifter_readL,
+ shifter_writeB, shifter_writeW, shifter_writeL,
+ shifter_interrupt, shifter_next_interrupt,
+ shifter_adjust_cycle,
+ shifter_reset,
+ shifter_destroy
+};
+
+int shifterio_init(int * argc, char ** argv)
+{
+ argc = argc; argv = argv;
+ return 0;
+}
+
+void shifterio_shutdown(void)
+{
+}
+
+io68_t * shifterio_create(emu68_t * const emu68, int hz)
+{
+ shifter_io68_t * const io =
+ emu68
+ ? emu68_alloc(sizeof(*io))
+ : 0
+ ;
+
+ if (io) {
+ io->io = shifter_io;
+ _shifter_reset(io, hz);
+ }
+ return &io->io;
+}
+
+int shifterio_reset(io68_t * const io, int hz)
+{
+ if (io) {
+ _shifter_reset((shifter_io68_t *)io, hz);
+ return 0;
+ } else {
+ return -1;
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/shifter_io.h Added

@@ -0,0 +1,95 @@
+/**
+ * @ingroup   lib_io68
+ * @file      io68/shifter_io.h
+ * @author    Benjamin Gerard
+ * @date      1999/06/10
+ * @brief     shifter IO plugin header.
+ *
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef IO68_SHIFTER_IO_H
+#define IO68_SHIFTER_IO_H
+
+#include "io68_api.h"
+
+/**
+ *  @defgroup  lib_io68_shifter  Atari-ST shifter (video chip)
+ *  @ingroup   lib_io68
+ *
+ *    Atari-ST shifter emulator is limited to 50/60Hz detection.
+ *    It is used by some player to adapt the replay speed.
+ *    By default this shifter always claims to be in 50hz.
+ *
+ *
+ *    Video address (Low byte always 0 on STF)
+ *
+ *    - 8201 : Hi  byte of video address
+ *    - 8203 : Mid byte of video address
+ *
+ *    Video counter (read only)
+ *
+ *    - 8205 : Hi  byte of video counter
+ *    - 8207 : Mid byte of video counter
+ *    - 8209 : Low byte of video counter
+ *
+ *    Syncro mode
+ *
+ *    - 820A :
+ *      - bit-0  0:interne(*) 1:externe
+ *      - bit-1  0:60hz 1:50hz
+ *
+ *    Color table (16 word entries)
+ *
+ *    - 8240-825E :
+ *      - STF 3 bit per componant 0x777
+ *      - STE 4 bit per componant 0xFFF but msb is lsb
+ *             (for backward compatibility)
+ *
+ *    Resolution
+ *
+ *    - 8260 (bit-1 bit-0)
+ *      -  0 0 : 320x200x16
+ *      -  0 1 : 640x200x2
+ *      -  1 0 : 640x400x1 (70hz)
+ *      -  1 1 : reserved
+ *  @{
+ */
+
+IO68_EXTERN
+/** Init shifter io library.
+ *  @return error-code
+ */
+int shifterio_init(int * argc, char ** argv);
+
+IO68_EXTERN
+/** Shutdown shifter io library.
+ */
+void shifterio_shutdown(void);
+
+IO68_EXTERN
+/**
+ *  Create shifter io instance.
+ *
+ *   @param   emu68  68000 emulator instance
+ *   @param   hz     Initial frequency (50,60 or 70), default 50
+ *
+ *   @return  Created shifter instance
+ *   @retval  0
+ */
+io68_t * shifterio_create(emu68_t * const emu68, int hz);
+
+IO68_EXTERN
+/** Reset shifter and set new vertical refresh rate. */
+int shifterio_reset(io68_t * const io, int hz);
+
+/**
+ *  @}
+ */
+
+/**
+ *  @}
+ */
+
+#endif /* #ifndef _IO68_SHIFTER_IO_H_ */

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_atarist_table.c Added

@@ -0,0 +1,65 @@
+/*
+ * @file ym_atarist_table.c
+ * @brief YM-2149 emulator - Atari ST Volume Table
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/* 2k9 volume table. */
+static const u16 vol2k932 * 32 * 32 =
+# include "ymout2k9.h"
+ ;
+
+/* Create a non-linear 3 channels 5 bit per channels DAC table.
+ */
+static void
+create_table(s16 * out, const u16 * inp, uint_t level, const char * name)
+{
+ const int min = inp0x0000;
+ const int max = inp0x7fff;
+ const int div = max-min ? max-min : 1;
+ const int mid = ( level + 1 ) >> 1;
+ int h;
+
+ TRACE68(ym_cat,
+ "ym-2149: creating %s -- min:%d max:%d div:%d mid:%d\n",
+ name, min, max, div, mid);
+
+ assert(level > 254 && level < 65536u);
+ assert(max > min);
+
+ for (h=0; h<32*32*32; ++h) {
+ int tmp = inph, res;
+ assert(tmp >= min);
+ assert(tmp <= max);
+ res = (tmp-min) * level / div - mid;
+ outh = res;
+ }
+ TRACE68(ym_cat,
+ "ym-2149: volume model -- *%s* -- %d..%d\n",
+ name, out0, out0x7FFF);
+}
+
+/* Create a non-linear 3 channels 5 bit per channels DAC table.
+ */
+void ym_create_5bit_atarist_table(s16 * out, unsigned int level)
+{
+ create_table(out, vol2k9, level, "atarist-5bit-2k9");
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_blep.c Added

@@ -0,0 +1,471 @@
+/*
+ * @file ym_blep.c
+ * @brief YM-2149 emulator - YM-2149 Band-Limited stEP synthesis engine
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 200?-2015 Antti Lankila
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "ymemul.h"
+#include "emu68/assert68.h"
+#include <sc68/file68_msg.h>
+#include <string.h>
+
+extern int ym_cat; /* defined in ymemul.c */
+extern const u16 * ym_envelops16; /* defined in ym_envelop.c */
+
+enum {
+ TONE_HI_MASK = 0x0f,
+ NOISE_MASK = 0x1f,
+ CTL_ENV_MASK = 0x0f,
+ BLEP_SIZE = 1280,
+ MAX_MIXBUF = 2048,
+};
+
+const static s32 sine_integralBLEP_SIZE = {
+ 65536, 65536, 65536, 65536, 65536, 65536, 65535, 65536, 65536, 65535,
+ 65536, 65535, 65536, 65535, 65535, 65534, 65535, 65534, 65534, 65533,
+ 65533, 65532, 65531, 65530, 65530, 65528, 65527, 65526, 65524, 65522,
+ 65520, 65517, 65515, 65512, 65508, 65504, 65500, 65495, 65490, 65483,
+ 65478, 65469, 65462, 65453, 65443, 65432, 65420, 65408, 65393, 65378,
+ 65361, 65343, 65323, 65301, 65278, 65252, 65226, 65195, 65164, 65129,
+ 65092, 65052, 65010, 64963, 64915, 64862, 64805, 64746, 64681, 64613,
+ 64540, 64463, 64380, 64293, 64200, 64102, 63998, 63887, 63770, 63648,
+ 63518, 63380, 63236, 63084, 62924, 62756, 62580, 62394, 62199, 61996,
+ 61783, 61560, 61327, 61083, 60829, 60563, 60287, 60000, 59699, 59388,
+ 59064, 58727, 58378, 58016, 57641, 57252, 56850, 56434, 56004, 55560,
+ 55101, 54629, 54141, 53640, 53123, 52591, 52046, 51485, 50908, 50318,
+ 49713, 49092, 48456, 47807, 47143, 46464, 45771, 45064, 44342, 43609,
+ 42860, 42099, 41325, 40539, 39740, 38930, 38109, 37276, 36433, 35579,
+ 34718, 33846, 32966, 32078, 31183, 30282, 29374, 28461, 27544, 26622,
+ 25697, 24769, 23841, 22911, 21980, 21050, 20122, 19196, 18272, 17354,
+ 16438, 15529, 14626, 13731, 12843, 11964, 11095, 10236, 9390, 8554,
+ 7733, 6924, 6131, 5353, 4590, 3846, 3118, 2409, 1718, 1048, 397, -232,
+ -841, -1426, -1991, -2532, -3050, -3543, -4013, -4459, -4879, -5275,
+ -5646, -5990, -6310, -6605, -6873, -7115, -7333, -7525, -7692, -7832,
+ -7950, -8041, -8108, -8152, -8171, -8168, -8142, -8093, -8023, -7932,
+ -7820, -7689, -7538, -7369, -7182, -6979, -6759, -6525, -6275, -6013,
+ -5737, -5451, -5154, -4846, -4530, -4206, -3876, -3539, -3198, -2853,
+ -2504, -2155, -1803, -1453, -1103, -755, -410, -69, 268, 598, 924,
+ 1241, 1550, 1851, 2142, 2423, 2693, 2952, 3198, 3432, 3653, 3860,
+ 4054, 4232, 4396, 4545, 4678, 4797, 4899, 4986, 5057, 5112, 5150,
+ 5174, 5182, 5174, 5150, 5112, 5059, 4992, 4910, 4814, 4706, 4584,
+ 4450, 4305, 4148, 3981, 3803, 3617, 3421, 3218, 3007, 2790, 2566,
+ 2339, 2106, 1870, 1631, 1390, 1147, 905, 662, 421, 180, -57, -291,
+ -522, -747, -969, -1183, -1392, -1593, -1788, -1973, -2150, -2319,
+ -2477, -2625, -2764, -2892, -3008, -3114, -3208, -3291, -3362, -3420,
+ -3468, -3503, -3526, -3538, -3537, -3525, -3501, -3467, -3420, -3364,
+ -3297, -3219, -3132, -3035, -2929, -2815, -2693, -2562, -2425, -2282,
+ -2132, -1976, -1817, -1652, -1483, -1313, -1138, -963, -786, -608,
+ -430, -253, -76, 98, 270, 440, 605, 768, 926, 1078, 1226, 1368, 1503,
+ 1632, 1753, 1868, 1975, 2073, 2164, 2245, 2319, 2384, 2439, 2486,
+ 2523, 2551, 2571, 2580, 2581, 2573, 2556, 2530, 2496, 2453, 2402,
+ 2344, 2277, 2204, 2123, 2037, 1943, 1844, 1740, 1630, 1516, 1398,
+ 1276, 1151, 1024, 893, 762, 629, 495, 361, 227, 94, -38, -169, -298,
+ -423, -547, -667, -783, -895, -1003, -1106, -1204, -1297, -1383,
+ -1465, -1539, -1608, -1670, -1725, -1774, -1815, -1850, -1878, -1898,
+ -1911, -1918, -1917, -1910, -1895, -1875, -1846, -1813, -1772, -1726,
+ -1674, -1617, -1553, -1487, -1413, -1338, -1256, -1172, -1084, -994,
+ -900, -804, -707, -608, -508, -407, -306, -205, -103, -4, 95, 193,
+ 289, 382, 473, 562, 647, 729, 808, 881, 953, 1018, 1080, 1137, 1189,
+ 1236, 1277, 1315, 1346, 1372, 1393, 1408, 1418, 1423, 1422, 1416,
+ 1404, 1388, 1367, 1341, 1309, 1275, 1235, 1190, 1143, 1092, 1036, 978,
+ 917, 854, 786, 719, 648, 575, 503, 428, 353, 278, 202, 127, 51, -23,
+ -96, -168, -239, -308, -375, -440, -502, -561, -618, -672, -723, -770,
+ -814, -853, -891, -922, -952, -976, -997, -1014, -1027, -1035, -1039,
+ -1041, -1037, -1029, -1019, -1004, -985, -964, -938, -909, -878, -843,
+ -806, -766, -723, -678, -632, -584, -533, -482, -429, -375, -321,
+ -266, -211, -156, -100, -45, 9, 62, 115, 167, 217, 266, 312, 359, 401,
+ 442, 482, 518, 552, 583, 612, 639, 661, 682, 700, 714, 726, 734, 740,
+ 743, 742, 740, 733, 725, 714, 700, 683, 665, 643, 620, 594, 567, 538,
+ 507, 474, 441, 405, 369, 332, 294, 256, 216, 178, 138, 98, 60, 20,
+ -18, -55, -93, -129, -164, -197, -231, -262, -291, -320, -347, -371,
+ -395, -415, -435, -452, -467, -480, -491, -500, -507, -512, -515,
+ -515, -513, -510, -505, -497, -489, -477, -464, -451, -434, -417,
+ -398, -379, -357, -335, -311, -287, -263, -237, -210, -184, -158,
+ -130, -103, -76, -49, -22, 4, 31, 56, 80, 105, 128, 151, 172, 192,
+ 212, 230, 247, 263, 277, 291, 302, 312, 321, 329, 334, 339, 343, 344,
+ 344, 343, 341, 337, 332, 325, 318, 310, 299, 289, 277, 264, 251, 236,
+ 221, 206, 189, 172, 156, 138, 120, 102, 84, 66, 48, 30, 12, -5, -22,
+ -39, -55, -71, -86, -101, -114, -128, -141, -152, -162, -173, -182,
+ -190, -197, -204, -209, -213, -217, -220, -221, -221, -222, -220,
+ -218, -215, -212, -206, -202, -195, -189, -182, -173, -165, -156,
+ -146, -136, -126, -115, -104, -93, -82, -71, -58, -47, -36, -24, -13,
+ -2, 9, 20, 31, 40, 51, 59, 69, 77, 85, 92, 99, 106, 111, 117, 121,
+ 125, 129, 131, 134, 135, 137, 137, 136, 136, 134, 133, 130, 128, 124,
+ 120, 117, 111, 107, 101, 95, 90, 83, 77, 71, 63, 57, 49, 43, 35, 29,
+ 21, 14, 8, 0, -6, -13, -19, -25, -30, -37, -42, -47, -51, -56, -60,
+ -64, -67, -70, -73, -75, -77, -78, -79, -81, -81, -80, -81, -80, -79,
+ -77, -76, -74, -72, -70, -67, -64, -61, -57, -54, -51, -46, -43, -38,
+ -35, -30, -27, -22, -18, -13, -10, -5, -1, 2, 7, 10, 14, 17, 20, 24,
+ 27, 29, 32, 34, 37, 38, 41, 41, 43, 45, 45, 45, 47, 46, 46, 46, 46,
+ 45, 45, 43, 43, 41, 39, 38, 36, 35, 32, 31, 28, 26, 24, 22, 19, 17,
+ 14, 12, 10, 7, 5, 2, 1, -2, -5, -6, -8, -10, -12, -14, -16, -17, -18,
+ -20, -20, -22, -23, -24, -24, -25, -25, -25, -26, -26, -25, -26, -25,
+ -24, -25, -23, -23, -22, -22, -20, -19, -19, -17, -16, -14, -14, -12,
+ -11, -10, -8, -7, -5, -5, -3, -1, -1, 1, 2, 3, 4, 6, 6, 7, 8, 9, 10,
+ 11, 11, 11, 12, 13, 13, 13, 13, 14, 13, 14, 14, 13, 13, 14, 12, 13,
+ 12, 11, 12, 10, 10, 10, 9, 8, 8, 7, 6, 5, 5, 4, 4, 3, 2, 1, 1, 0, -1,
+ -1, -2, -2, -3, -4, -3, -5, -5, -5, -5, -6, -6, -6, -7, -6, -7, -7,
+ -7, -7, -7, -6, -7, -7, -6, -6, -7, -5, -6, -6, -5, -4, -5, -4, -4,
+ -4, -3, -3, -2, -2, -2, -1, -1, -1, 0, 0, 0, 0, 1, 1, 2, 1, 2, 2, 3,
+ 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 3, 3, 4, 3, 3, 3, 2, 3, 3, 2, 3, 2,
+ 2, 2, 1, 2, 1, 2, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, -1, 0, -1, -1, -1, -1,
+ -1, -1, -1, -2, -1, -1, -2, -1, -2, -1, -2, -1, -2, -1, -1, -2, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 0, -1, 0, 0, -1, 0, 0, 0,
+ 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1,
+ 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0,
+ -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 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 ym2149_new_output_level(ym_t * const ym)
+{
+ ym_blep_t *blep = &ym->emu.blep;
+
+ u32 i;
+ s16 output;
+
+ u16 dacstate = 0;
+ for (i = 0; i < 3; i ++) {
+ u16 mask = blep->tonegeni.tonemix | blep->tonegeni.flip_flop;
+ mask &= blep->tonegeni.noisemix | blep->noise_output;
+ dacstate |= mask &
+ ((blep->env_output & blep->tonegeni.envmask)
+ | blep->tonegeni.volmask);
+ }
+
+ assert( (dacstate & 0x7fff) == dacstate );
+ output = (ym->ymout5dacstate + 1) >> 1;
+
+ if (output != blep->global_output_level) {
+ /* Add a new blep before the others */
+ blep->blep_idx -= 1;
+ blep->blep_idx &= MAX_BLEPS - 1;
+ blep->blepstateblep->blep_idx.stamp = blep->time;
+ blep->blepstateblep->blep_idx.level = blep->global_output_level - output;
+ blep->global_output_level = output;
+ }
+}
+
+static void ym2149_clock(ym_t * const ym, cycle68_t cycles)
+{
+ ym_blep_t *blep = &ym->emu.blep;
+ const u16 * const waveform =
+ ym_envelopsym->reg.name.env_shape & CTL_ENV_MASK;
+
+ while (cycles) {
+ int iter = cycles;
+ int i;
+ int change = 0;
+
+ for (i = 0; i < 3; i ++) {
+ if (iter > blep->tonegeni.count)
+ iter = blep->tonegeni.count;
+ }
+
+ if (iter > blep->noise_count)
+ iter = blep->noise_count;
+
+ if (iter > blep->env_count)
+ iter = blep->env_count;
+
+ cycles -= iter;
+ blep->time += iter;
+
+ /* Clock subsystems forward */
+ for (i = 0; i < 3; i++) {
+ blep->tonegeni.count -= iter;
+ assert(blep->tonegeni.count >= 0);
+ if (blep->tonegeni.count == 0) {
+ blep->tonegeni.flip_flop = ~blep->tonegeni.flip_flop;
+ blep->tonegeni.count = blep->tonegeni.event;
+ change = 1;
+ }
+ }
+
+ blep->noise_count -= iter;
+ assert(blep->noise_count >= 0);
+ if (blep->noise_count == 0) {
+ u16 new_noise;
+ blep->noise_state =
+ (blep->noise_state >> 1) |
+ (((blep->noise_state ^ (blep->noise_state >> 2)) & 1) << 16);
+ blep->noise_count = blep->noise_event;
+
+ new_noise = blep->noise_state & 1 ? 0xffff : 0x0000;
+ change = change || blep->noise_output != new_noise;
+ blep->noise_output = new_noise;
+ }
+
+ blep->env_count -= iter;
+ assert(blep->env_count >= 0);
+ if (blep->env_count == 0) {
+ u16 new_env = waveformblep->env_state;
+ if (++ blep->env_state == 96)
+ blep->env_state = 32;
+ blep->env_count = blep->env_event;
+
+ change = change || new_env != blep->env_output;
+ blep->env_output = new_env;
+ }
+
+ if (change)
+ ym2149_new_output_level(ym);
+ }
+}
+
+static s32 ym2149_output(ym_t * const ym, const u8 subsample)
+{
+ ym_blep_t *blep = &ym->emu.blep;
+ u32 i = blep->blep_idx;
+ s32 output = 0;
+
+ /* Workaround bug #30: 
+ * https://sourceforge.net/p/sc68/bugs/30/
+ */
+ blep->blepstate(i-1)&(MAX_BLEPS-1).stamp = blep->time - BLEP_SIZE;
+ 
+ while (1) {
+ u16 age = blep->time - blep->blepstatei.stamp;
+ if (age >= BLEP_SIZE-1)
+ break;
+ /* JOS says that we should have several subphases of SINC for
+ * this, and we should then interpolate between them linearly.
+ * What I got here is better than nothing, though. */
+ output += ((sine_integralage * (256 - subsample)
+ + sine_integralage+1 * subsample
+ + 128) >> 8) * blep->blepstatei.level;
+ i = (i + 1) & (MAX_BLEPS - 1);
+ }
+ /* Terminate the blep train by keeping the last stamp invalid. */
+ blep->blepstatei.stamp = blep->time - BLEP_SIZE;
+
+ return ((output + (1 << 15)) >> 16) + blep->global_output_level;
+}
+
+static s32 highpass(ym_t * const ym, s32 output)
+{
+ ym_blep_t *blep = &ym->emu.blep;
+
+ blep->hp = (blep->hp * 511 + (output << 6) + (1 << 8)) >> 9;
+ output -= (blep->hp + (1 << 5)) >> 6;
+
+ if (output > 32767)
+ output = 32767;
+ if (output < -32768)
+ output = -32768;
+
+ return output;
+}
+
+/* Run output synthesis for some clocks */
+static int mix_to_buffer(ym_t * const ym, cycle68_t cycles, s32 *output)
+{
+ ym_blep_t *blep = &ym->emu.blep;
+
+ u32 len = 0;
+ while (cycles) {
+ cycle68_t iter = cycles;
+ u8 makesample = 0;
+ if (iter > blep->cycles_to_next_sample >> 8) {
+ iter = blep->cycles_to_next_sample >> 8;
+ makesample = 1;
+ }
+
+ /* Simulate ym2149 for iter clocks */
+ ym2149_clock(ym, iter);
+ cycles -= iter;
+ blep->cycles_to_next_sample -= iter << 8;
+
+ /* Generate output.
+ * To improve accuracy, we interpolate the sinc table. */
+ if (makesample) {
+ assert(blep->cycles_to_next_sample <= 0xff);
+ outputlen++ =
+ highpass(ym, ym2149_output(ym, blep->cycles_to_next_sample));
+ assert(len < MAX_MIXBUF);
+ blep->cycles_to_next_sample += blep->cycles_per_sample;
+ }
+ }
+ return len;
+}
+
+/* Mix for ymcycles cycles. */
+static int run(ym_t * const ym, s32 * output, const cycle68_t ymcycles)
+{
+ ym_blep_t *blep = &ym->emu.blep;
+
+ u32 len = 0, voice;
+ s32 newevent;
+
+ /* Walk the static list of allocated events */
+ cycle68_t currcycle = 0;
+ ym_event_t *event;
+ for (event = ym->event_buf; event < ym->event_ptr; event++) {
+ assert( event->ymcycle <= ymcycles );
+
+ /* Mix up to this cycle, update state */
+ len += mix_to_buffer(ym, event->ymcycle - currcycle, output + len);
+ ym->reg.indexevent->reg = event->val;
+
+ /* Update various internal variables in response to writes.
+ * unfortunately pointers don't work for this, so... */
+ switch (event->reg) {
+ case 0: /* per_x_lo, per_x_hi */
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ voice = event->reg >> 1;
+ newevent = ym->reg.indexvoice << 1
+ | ((ym->reg.index(voice << 1) + 1 & TONE_HI_MASK) << 8);
+ if (newevent == 0)
+ newevent = 1;
+ newevent <<= 3;
+
+ /* The chip performs count >= event. If the condition is
+ * true, event triggers immediately. However, I have inverted
+ * the count to occur towards zero. Changes in event must
+ * therefore affect the prevailing count. If new event time
+ * is greater than current, the count must increase as the
+ * current state will be delayed. */
+ blep->tonegenvoice.count += newevent - blep->tonegenvoice.event;
+ blep->tonegenvoice.event = newevent;
+ /* I do not deal with negative counts in the hot path. */
+ if (blep->tonegenvoice.count < 0)
+ blep->tonegenvoice.count = 0;
+ break;
+
+ case 6: /* per_noise */
+ newevent = ym->reg.name.per_noise & NOISE_MASK;
+ if (newevent == 0)
+ newevent = 1;
+ newevent <<= 4;
+
+ blep->noise_count += newevent - blep->noise_event;
+ blep->noise_event = newevent;
+ if (blep->noise_count < 0)
+ blep->noise_count = 0;
+ break;
+
+ case 7: /* mixer */
+ blep->tonegen0.tonemix = event->val & 1 ? 0xffff : 0;
+ blep->tonegen1.tonemix = event->val & 2 ? 0xffff : 0;
+ blep->tonegen2.tonemix = event->val & 4 ? 0xffff : 0;
+ blep->tonegen0.noisemix = event->val & 8 ? 0xffff : 0;
+ blep->tonegen1.noisemix = event->val & 16 ? 0xffff : 0;
+ blep->tonegen2.noisemix = event->val & 32 ? 0xffff : 0;
+ break;
+
+ case 8: /* volume */
+ case 9:
+ case 10:
+ voice = event->reg - 8;
+ blep->tonegenvoice.envmask = (event->val & 0x10)
+ ? 0x1f << (voice*5) : 0;
+ blep->tonegenvoice.volmask = (event->val & 0x10)
+ ? 0 : (((event->val & 0xf) << 1) | 1) << (voice*5);
+ break;
+
+ case 11: /* per_env_lo, per_env_hi */
+ case 12:
+ newevent = ym->reg.name.per_env_lo | (ym->reg.name.per_env_hi << 8);
+ if (newevent == 0)
+ newevent = 1;
+ newevent <<= 3;
+
+ blep->env_count += newevent - blep->env_event;
+ blep->env_event = newevent;
+ if (blep->env_count < 0)
+ blep->env_count = 0;
+ break;
+
+ case 13: /* env_shape */
+ blep->env_state = 0;
+ break;
+ }
+
+ ym2149_new_output_level(ym);
+
+ currcycle = event->ymcycle;
+ }
+
+ /* Reset event list. */
+ ym->event_ptr = ym->event_buf;
+
+ /* Mix stuff outside writes */
+ len += mix_to_buffer(ym, ymcycles - currcycle, output + len);
+
+ return len;
+}
+
+static int reset(ym_t * const ym, const cycle68_t ymcycle)
+{
+ ym_blep_t *blep = &ym->emu.blep;
+
+ u32 tmp = blep->cycles_per_sample;
+ memset(blep, 0, sizeof(ym_blep_t));
+
+ blep->cycles_per_sample = tmp;
+ blep->noise_state = 1;
+ blep->time = BLEP_SIZE;
+ blep->tonegen0.event = 8;
+ blep->tonegen1.event = 8;
+ blep->tonegen2.event = 8;
+ blep->noise_event = 16;
+ blep->env_event = 8;
+
+ return 0;
+}
+
+/* Get required length of buffer at run(s32 *output) (number of frames). */
+static int buffersize(const ym_t * const ym, const cycle68_t ymcycles)
+{
+ return MAX_MIXBUF;
+}
+
+static int sampling_rate(ym_t * const ym, const int hz)
+{
+ ym_blep_t *blep = &ym->emu.blep;
+ blep->cycles_per_sample = (ym->clock << 8) / hz;
+ return hz;
+}
+
+int ym_blep_setup(ym_t * const ym)
+{
+ ym->cb_cleanup = 0;
+ ym->cb_reset = reset;
+ ym->cb_run = run;
+ ym->cb_buffersize = buffersize;
+ ym->cb_sampling_rate = sampling_rate;
+ return 0;
+}
+
+void ym_blep_add_options(void)
+{
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_blep.h Added

@@ -0,0 +1,92 @@
+/**
+ * @ingroup lib_io68
+ * @file io68/ym_blep.h
+ * @brief YM-2149 BLEP synthesis engine
+ * @author Antti Lankila
+ * @date 2009-01-30
+ */
+
+/* Copyright (c) 200?-2015 Antti Lankila */
+
+/**
+ * @defgroup lib_io68_ym_blep BLEP YM engine
+ * @ingroup lib_io68_ym
+ * @brief Band Limited Step YM engine.
+ *
+ * The dump engine is a phony engine that will online dump to stdout
+ * all write access to the YM registers.
+ *
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Setup function for ym blep synthesis engine.
+ *
+ * The ym_blep_setup() function sets ym blep synthesis engine for
+ * this ym emulator instance.
+ *
+ * @param ym ym emulator instance to setup
+ * @retval 0 on success
+ * @retval -1 on failure
+ */
+int ym_blep_setup(ym_t * const ym);
+
+IO68_EXTERN
+/**
+ * Creates ym blep engine options.
+ */
+void ym_blep_add_options(void);
+
+enum {
+ MAX_BLEPS = 256 /**< @nodoc */
+};
+
+/** @nodoc */
+typedef struct {
+ s32 count; /**< @nodoc */
+ u32 event; /**< @nodoc */
+ u16 flip_flop; /**< @nodoc */
+ u16 tonemix; /**< @nodoc */
+ u16 noisemix; /**< @nodoc */
+ u16 envmask; /**< @nodoc */
+ u16 volmask; /**< @nodoc */
+} ym_blep_tone_t;
+
+/** @nodoc */
+typedef struct {
+ u16 stamp; /**< @nodoc */
+ s16 level; /**< @nodoc */
+} ym_blep_blep_state_t;
+
+/** @nodoc */
+typedef struct {
+ /* sampling parameters */
+ u32 cycles_per_sample; /**< 8 bit fixed point ym clocks */
+ u32 cycles_to_next_sample; /**< @nodoc */
+
+ /* subsystem states */
+ ym_blep_tone_t tonegen3; /**< @nodoc */
+ u32 noise_event; /**< @nodoc */
+ s32 noise_count; /**< @nodoc */
+ u32 noise_state; /**< @nodoc */
+ u16 noise_output; /**< @nodoc */
+
+ u32 env_event; /**< @nodoc */
+ s32 env_count; /**< @nodoc */
+ u8 env_state; /**< @nodoc */
+ u16 env_output; /**< @nodoc */
+
+ /* blep stuff */
+ s16 global_output_level; /**< @nodoc */
+ u32 blep_idx; /**< @nodoc */
+ u16 time; /**< @nodoc */
+ s32 hp; /**< @nodoc */
+
+ /** @nodoc */
+ ym_blep_blep_state_t blepstateMAX_BLEPS;
+} ym_blep_t;
+
+/**
+ * @}
+ */

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_dump.c Added

@@ -0,0 +1,245 @@
+/*
+ * @file ym_dump.c
+ * @brief YM-2149 emulator - YM-2149 dump engine
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+
+#if 0
+#ifdef HAVE_CONFIG_OPTION68_H
+# include "config_option68.h"
+#else
+# include "default_option68.h"
+#endif
+#endif
+
+#include "ymemul.h"
+#include "emu68/assert68.h"
+#include <sc68/file68_msg.h>
+#include <sc68/file68_str.h>
+#include <sc68/file68_opt.h>
+
+/* command line options option */
+/* static const char prefix = "sc68-"; */
+#define prefix 0
+static const char engcat = "ym-dump";
+static option68_t opts = {
+ OPT68_BOOL(prefix,"ym-clean-dump",engcat,
+ "dump only effective bits", 0, 0)
+};
+#undef prefix
+
+void ym_dump_add_options(void)
+{
+ const int n_opts = sizeof(opts) / sizeof(*opts);
+
+ opts0.hide = 1; /* hide -clean-dump */
+
+ /* Register ym-dump options */
+ option68_append(opts, n_opts);
+
+ /* Default option values */
+ option68_iset(opts+0, 1, opt68_NOTSET, opt68_CFG);
+}
+
+static int reset(ym_t * const ym, const cycle68_t ymcycle)
+{
+ ym_dump_t * const dump = &ym->emu.dump;
+ dump->base_cycle = 0;
+ dump->pass = 0;
+ return 0;
+}
+
+static
+int buffersize(const ym_t * const ym, const cycle68_t ymcycles)
+{
+ return (int) (ymcycles * ym->hz / ym->clock);
+}
+
+#define CYCLE_DIGITS 10
+#define PASS_DIGITS 6
+
+static
+int run(ym_t * const ym, s32 * output, const cycle68_t ymcycles)
+{
+ static const char hex16 = {
+ '0','1','2','3','4','5','6','7',
+ '8','9','A','B','C','D','E','F'
+ };
+
+ static const u8 allbits14 = {
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
+ };
+
+ static const u8 effbits14 = {
+ 0xFF,0x0F, 0xFF,0x0F, 0xFF,0x0F, /* pulse periods */
+ 0x1F, /* Noise */
+ 0x3F, /* Mixer (ignoring io port direction bit */
+ 0x1F,0x1F,0x1F, /* Volume */
+ 0xFF,0xFF, /* env period */
+ 0xF /* env shape */
+ };
+
+ ym_dump_t * const dump = &ym->emu.dump;
+ cycle68_t curcycle;
+ u64 longcycle;
+ int i, len, ymreg16, reg_mute, mix_mute;
+ const u8 *bits = opts->val.num ? effbits : allbits;
+
+
+ char tmp 128, * buf;
+ ym_event_t * ptr = ym->event_buf;
+
+ /* voice mute bit#0=A / bit#1=B / bit#2=C */
+ mix_mute
+ = ( ( ym->voice_mute >> 0 ) & 1 )
+ | ( ( ym->voice_mute >> 5 ) & 2 )
+ | ( ( ym->voice_mute >> 10 ) & 4 )
+ ;
+
+ /* mixer (reg#7) tone and noise mute */
+ mix_mute = ( mix_mute | ( mix_mute << 3 ) ) ^ 077;
+
+ /* register to ignore (1 bit per registers). Ignoring volume and
+ * tone registers of muted voices. */
+ reg_mute
+ = ( -( ( mix_mute >> 0 ) & 1 ) & 0x103)
+ | ( -( ( mix_mute >> 1 ) & 1 ) & 0x20c)
+ | ( -( ( mix_mute >> 2 ) & 1 ) & 0x430)
+ ;
+
+ /* mark registers as not accessed yet. */
+ for ( i = 0; i < 16; ++i ) ymregi = -1;
+
+ if (ptr == ym->event_ptr) {
+ /* $$$ DIRTY TRICK: nothing happen but we style need to print at
+ * least one line, so let just pretend a false access to register
+ * 15. */
+ ptr->ymcycle = 0;
+ ptr->reg = 15;
+ ptr->val = 00;
+ ++ym->event_ptr;
+ }
+
+ /* Walk the events */
+ while (ptr < ym->event_ptr) {
+ curcycle = ptr->ymcycle;
+ longcycle = dump->base_cycle + (u64) curcycle;
+
+ /* Walk all events at this cycle */
+ do {
+ assert( (unsigned int) ptr->reg < 16 );
+ ymregptr->reg & 15 = ptr->val & 255;
+ } while (++ptr < ym->event_ptr && ptr->ymcycle == curcycle);
+
+ buf = tmp;
+
+ /* dump pass number */
+ for ( i = (PASS_DIGITS-1)*4; i >= 0; i -= 4)
+ *buf++ = hex 15 & (int)(dump->pass >> i) ;
+ *buf++ = ' ';
+
+ /* dump cycle number */
+ for ( i = (CYCLE_DIGITS-1)*4; i >= 0; i -= 4)
+ *buf++ = hex 15 & (int)(longcycle >> i) ;
+
+ /* dump register list */
+ for ( i = 0; i < 14; ++i ) {
+
+ /* deal with muted voices */
+ if ( reg_mute & (1<<i) )
+ ymregi = -1; /* Act as if never accessed */
+ else if (i == YM_MIXER && ymregi >= 0)
+ ymregi |= mix_mute; /* Mask tone and noise. */
+
+ *buf++ = "- "!i;
+ if (ymregi < 0){
+ *buf++ = '.';
+ *buf++ = '.';
+ } else {
+ int v = ymregi & bitsi;
+ *buf++ = hex v >> 4 ;
+ *buf++ = hex v & 15 ;
+ }
+ ymregi = -1;
+ }
+ *buf++ = 0;
+
+ /* Dump only if actually active */
+ if (dump->active) puts(tmp);
+ }
+
+ /* Reset event list */
+ ym->event_ptr = ym->event_buf;
+
+ /* null terminated string and align to 32-bit */
+ dump->base_cycle += (uint64_t) ymcycles;
+ dump->pass++;
+
+ /* clear output PCMs */
+ len = buffersize(ym, ymcycles);
+ for (i=0; i<len; ++i) {
+ outputi = 0;
+ }
+ return len;
+}
+
+
+static
+void cleanup(ym_t * const ym)
+{
+}
+
+int ym_dump_active(ym_t * const ym, int val)
+{
+ int code = -1;
+ if (ym) {
+ ym_dump_t * const dump = &ym->emu.dump;
+ code = dump->active;
+ if (val != -1) {
+ dump->active = !!val;
+ }
+ }
+ return code;
+}
+
+int ym_dump_setup(ym_t * const ym)
+{
+ ym_dump_t * const dump = &ym->emu.dump;
+ int err = 0;
+
+ /* fill callback functions */
+ ym->cb_cleanup = cleanup;
+ ym->cb_reset = reset;
+ ym->cb_run = run;
+ ym->cb_buffersize = buffersize;
+ ym->cb_sampling_rate = (void*)0;
+ dump->base_cycle = 0;
+ dump->active = 1;
+ dump->pass = 0;
+
+ return err;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_dump.h Added

@@ -0,0 +1,66 @@
+/**
+ * @ingroup lib_io68
+ * @file io68/ym_dump.h
+ * @brief sc68 register dump YM-2149 emulator header.
+ * @author Benjamin Gerard
+ * @date 2009/02/10
+ */
+
+/**
+ * @defgroup lib_io68_ym_dump Dump YM engine
+ * @ingroup lib_io68_ym
+ * @brief Dump YM access to stdout.
+ *
+ * The dump engine is a phony engine that will online dump to stdout
+ * all write access to the YM registers.
+ *
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Setup function for sc68 dump ym engine.
+ *
+ * The ym_dump_setup() function sets ym dump engine for this ym
+ * emulator instance.
+ *
+ * @param ym ym emulator instance to setup
+ * @retval 0 on success
+ * @retval -1 on failure
+ */
+int ym_dump_setup(ym_t * const ym);
+
+IO68_EXTERN
+/**
+ * Get/Set sc68 dump ym engine active state.
+ *
+ * @param ym ym emulator instance to setup
+ * @param val 0:disable 1:enable -1:current
+ * @return previous status
+ */
+int ym_dump_active(ym_t * const ym, int val);
+
+IO68_EXTERN
+/**
+ * Creates ym dump engine options.
+ */
+void ym_dump_add_options(void);
+
+/**
+ * YM-2149 internal data structure for original emulator.
+ */
+struct ym2149_dump_s
+{
+ uint64_t base_cycle; /**< cycle counter */
+ uint68_t pass; /**< current pass number */
+ int active; /**< set if active */
+};
+
+/**
+ * YM-2149 emulator instance type.
+ */
+typedef struct ym2149_dump_s ym_dump_t;
+
+/**
+ * @}
+ */

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_envel.c Added

@@ -0,0 +1,84 @@
+/*
+ * @file ym_envel.c
+ * @brief YM-2149 emulator - YM-2149 envelop shapes table
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "emu68/type68.h"
+
+#define _V(X) ( (X<<10) | (X<<5) | X )
+
+#define UP \
+ _V(000),_V(001),_V(002),_V(003),_V(004),_V(005),_V(006),_V(007), \
+ _V(010),_V(011),_V(012),_V(013),_V(014),_V(015),_V(016),_V(017), \
+ _V(020),_V(021),_V(022),_V(023),_V(024),_V(025),_V(026),_V(027), \
+ _V(030),_V(031),_V(032),_V(033),_V(034),_V(035),_V(036),_V(037)
+
+#define DW \
+ _V(037),_V(036),_V(035),_V(034),_V(033),_V(032),_V(031),_V(030), \
+ _V(027),_V(026),_V(025),_V(024),_V(023),_V(022),_V(021),_V(020), \
+ _V(017),_V(016),_V(015),_V(014),_V(013),_V(012),_V(011),_V(010), \
+ _V(007),_V(006),_V(005),_V(004),_V(003),_V(002),_V(001),_V(000)
+
+#define LO \
+ _V(000),_V(000),_V(000),_V(000),_V(000),_V(000),_V(000),_V(000), \
+ _V(000),_V(000),_V(000),_V(000),_V(000),_V(000),_V(000),_V(000), \
+ _V(000),_V(000),_V(000),_V(000),_V(000),_V(000),_V(000),_V(000), \
+ _V(000),_V(000),_V(000),_V(000),_V(000),_V(000),_V(000),_V(000)
+
+#define HI \
+ _V(037),_V(037),_V(037),_V(037),_V(037),_V(037),_V(037),_V(037), \
+ _V(037),_V(037),_V(037),_V(037),_V(037),_V(037),_V(037),_V(037), \
+ _V(037),_V(037),_V(037),_V(037),_V(037),_V(037),_V(037),_V(037), \
+ _V(037),_V(037),_V(037),_V(037),_V(037),_V(037),_V(037),_V(037)
+
+static const u16 dwdw96 = { DW,DW,DW };
+static const u16 dwhi96 = { DW,HI,HI };
+static const u16 dwlo96 = { DW,LO,LO };
+static const u16 dwup96 = { DW,UP,DW };
+static const u16 updw96 = { UP,DW,UP };
+static const u16 uphi96 = { UP,HI,HI };
+static const u16 uplo96 = { UP,LO,LO };
+static const u16 upup96 = { UP,UP,UP };
+
+const u16 * ym_envelops16 =
+{
+ /* 0 \_ */ dwlo,
+ /* 1 \_ */ dwlo,
+ /* 2 \_ */ dwlo,
+ /* 3 \_ */ dwlo,
+ /* 4 /_ */ uplo,
+ /* 5 /_ */ uplo,
+ /* 6 /_ */ uplo,
+ /* 7 /_ */ uplo,
+ /* 8 \\ */ dwdw,
+ /* 9 \_ */ dwlo,
+ /* A \/ */ dwup,
+ /* B \- */ dwhi,
+ /* C // */ upup,
+ /* D /- */ uphi,
+ /* E /\ */ updw,
+ /* F /_ */ uplo
+};

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_fixed_vol.h Added

@@ -0,0 +1,306 @@
+{
+
+/* 000 */
+
+/*000*/     0,  110,  230,  355,  582,  801, 1227, 1701, 2471, 3403, 5071, 6940,10426,14762,23799,36754,
+/*010*/   110,  258,  400,  536,  752,  980, 1397, 1843, 2645, 3574, 5207, 7082,10560,14873,23862,36757,
+/*020*/   230,  400,  528,  667,  880, 1108, 1531, 1977, 2770, 3690, 5327, 7199,10671,14972,23916,36760,
+/*030*/   355,  536,  667,  806, 1002, 1244, 1664, 2105, 2897, 3812, 5446, 7318,10776,15051,23970,36777,
+/*040*/   582,  752,  880, 1002, 1221, 1457, 1866, 2304, 3099, 4011, 5639, 7497,10935,15202,24061,36780,
+/*050*/   801,  980, 1108, 1244, 1457, 1684, 2093, 2539, 3324, 4224, 5849, 7707,11119,15378,24160,36797,
+/*060*/  1227, 1397, 1531, 1664, 1866, 2093, 2505, 2943, 3707, 4616, 6230, 8062,11458,15668,24342,36803,
+/*070*/  1701, 1843, 1977, 2105, 2304, 2539, 2943, 3369, 4133, 5037, 6628, 8452,11824,15992,24589,36828,
+/*080*/  2471, 2645, 2770, 2897, 3099, 3324, 3707, 4133, 4903, 5775, 7344, 9153,12489,16606,25032,36891,
+/*090*/  3403, 3574, 3690, 3812, 4011, 4224, 4616, 5037, 5775, 6639, 8193, 9972,13256,17330,25603,37047,
+/*0A0*/  5071, 5207, 5327, 5446, 5639, 5849, 6230, 6628, 7344, 8193, 9705,11446,14659,18648,26743,37567,
+/*0B0*/  6940, 7082, 7199, 7318, 7497, 7707, 8062, 8452, 9153, 9972,11446,13142,16293,20231,28118,38445,
+/*0C0*/ 10426,10560,10671,10776,10935,11119,11458,11824,12489,13256,14659,16293,19381,23208,30893,40473,
+/*0D0*/ 14762,14873,14972,15051,15202,15378,15668,15992,16606,17330,18648,20231,23208,26964,34385,43346,
+/*0E0*/ 23799,23862,23916,23970,24061,24160,24342,24589,25032,25603,26743,28118,30893,34385,41133,49230,
+/*0F0*/ 36754,36757,36760,36777,36780,36797,36803,36828,36891,37047,37567,38445,40473,43346,49230,56457,
+
+/* 100 */
+
+/*100*/   110,  258,  400,  536,  752,  980, 1397, 1843, 2645, 3574, 5207, 7082,10560,14873,23862,36757,
+/*110*/   258,  414,  551,  681,  894, 1127, 1545, 1991, 2787, 3704, 5341, 7213,10679,14975,23918,36760,
+/*120*/   400,  551,  684,  821, 1034, 1264, 1681, 2125, 2914, 3835, 5466, 7335,10787,15071,23975,36766,
+/*130*/   536,  681,  821,  957, 1161, 1397, 1812, 2255, 3042, 3960, 5588, 7449,10889,15159,24021,36786,
+/*140*/   752,  894, 1034, 1161, 1372, 1608, 2017, 2457, 3244, 4153, 5773, 7628,11057,15307,24109,36789,
+/*150*/   980, 1127, 1264, 1397, 1608, 1838, 2244, 2684, 3466, 4369, 5986, 7835,11244,15475,24214,36800,
+/*160*/  1397, 1545, 1681, 1812, 2017, 2244, 2650, 3085, 3855, 4755, 6361, 8193,11574,15770,24401,36806,
+/*170*/  1843, 1991, 2125, 2255, 2457, 2684, 3085, 3517, 4281, 5173, 6761, 8577,11941,16097,24634,36831,
+/*180*/  2645, 2787, 2914, 3042, 3244, 3466, 3855, 4281, 5037, 5912, 7477, 9276,12594,16696,25080,36896,
+/*190*/  3574, 3704, 3835, 3960, 4153, 4369, 4755, 5173, 5912, 6773, 8318,10088,13361,17415,25637,37056,
+/*1A0*/  5207, 5341, 5466, 5588, 5773, 5986, 6361, 6761, 7477, 8318, 9824,11554,14759,18731,26768,37570,
+/*1B0*/  7082, 7213, 7335, 7449, 7628, 7835, 8193, 8577, 9276,10088,11554,13245,16384,20290,28157,38448,
+/*1C0*/ 10560,10679,10787,10889,11057,11244,11574,11941,12594,13361,14759,16384,19447,23254,30899,40476,
+/*1D0*/ 14873,14975,15071,15159,15307,15475,15770,16097,16696,17415,18731,20290,23254,26995,34385,43346,
+/*1E0*/ 23862,23918,23975,24021,24109,24214,24401,24634,25080,25637,26768,28157,30899,34385,41135,49232,
+/*1F0*/ 36757,36760,36766,36786,36789,36800,36806,36831,36896,37056,37570,38448,40476,43346,49232,56460,
+
+/* 200 */
+
+/*200*/   230,  400,  528,  667,  880, 1108, 1531, 1977, 2770, 3690, 5327, 7199,10671,14972,23916,36760,
+/*210*/   400,  551,  684,  821, 1034, 1264, 1681, 2125, 2914, 3835, 5466, 7335,10787,15071,23975,36766,
+/*220*/   528,  684,  832,  965, 1179, 1412, 1823, 2267, 3054, 3971, 5596, 7463,10901,15171,24026,36780,
+/*230*/   667,  821,  965, 1105, 1312, 1548, 1960, 2403, 3184, 4099, 5721, 7579,11006,15265,24075,36791,
+/*240*/   880, 1034, 1179, 1312, 1519, 1755, 2164, 2602, 3383, 4290, 5906, 7756,11173,15407,24160,36794,
+/*250*/  1108, 1264, 1412, 1548, 1755, 1983, 2392, 2829, 3608, 4508, 6119, 7960,11361,15571,24265,36803,
+/*260*/  1531, 1681, 1823, 1960, 2164, 2392, 2792, 3227, 4000, 4892, 6489, 8318,11688,15870,24455,36808,
+/*270*/  1977, 2125, 2267, 2403, 2602, 2829, 3227, 3659, 4420, 5307, 6892, 8702,12051,16196,24683,36837,
+/*280*/  2770, 2914, 3054, 3184, 3383, 3608, 4000, 4420, 5170, 6045, 7605, 9395,12699,16787,25123,36908,
+/*290*/  3690, 3835, 3971, 4099, 4290, 4508, 4892, 5307, 6045, 6900, 8440,10205,13463,17501,25683,37064,
+/*2A0*/  5327, 5466, 5596, 5721, 5906, 6119, 6489, 6892, 7605, 8440, 9940,11662,14855,18810,26799,37576,
+/*2B0*/  7199, 7335, 7463, 7579, 7756, 7960, 8318, 8702, 9395,10205,11662,13344,16475,20359,28183,38451,
+/*2C0*/ 10671,10787,10901,11006,11173,11361,11688,12051,12699,13463,14855,16475,19512,23305,30913,40479,
+/*2D0*/ 14972,15071,15171,15265,15407,15571,15870,16196,16787,17501,18810,20359,23305,27018,34391,43349,
+/*2E0*/ 23916,23975,24026,24075,24160,24265,24455,24683,25123,25683,26799,28183,30913,34391,41138,49235,
+/*2F0*/ 36760,36766,36780,36791,36794,36803,36808,36837,36908,37064,37576,38451,40479,43349,49235,56463,
+
+/* 300 */
+
+/*300*/   355,  536,  667,  806, 1002, 1244, 1664, 2105, 2897, 3812, 5446, 7318,10776,15051,23970,36777,
+/*310*/   536,  681,  821,  957, 1161, 1397, 1812, 2255, 3042, 3960, 5588, 7449,10889,15159,24021,36786,
+/*320*/   667,  821,  965, 1105, 1312, 1548, 1960, 2403, 3184, 4099, 5721, 7579,11006,15265,24075,36791,
+/*330*/   806,  957, 1105, 1261, 1468, 1701, 2110, 2554, 3332, 4241, 5861, 7713,11128,15373,24137,36794,
+/*340*/  1002, 1161, 1312, 1468, 1670, 1906, 2312, 2750, 3528, 4432, 6042, 7889,11290,15512,24220,36797,
+/*350*/  1244, 1397, 1548, 1701, 1906, 2136, 2542, 2980, 3755, 4653, 6258, 8094,11480,15679,24322,36806,
+/*360*/  1664, 1812, 1960, 2110, 2312, 2542, 2940, 3378, 4145, 5034, 6622, 8446,11807,15972,24509,36814,
+/*370*/  2105, 2255, 2403, 2554, 2750, 2980, 3378, 3804, 4565, 5449, 7025, 8832,12168,16293,24737,36840,
+/*380*/  2897, 3042, 3184, 3332, 3528, 3755, 4145, 4565, 5312, 6182, 7736, 9517,12810,16884,25174,36916,
+/*390*/  3812, 3960, 4099, 4241, 4432, 4653, 5034, 5449, 6182, 7034, 8565,10324,13571,17589,25737,37067,
+/*3A0*/  5446, 5588, 5721, 5861, 6042, 6258, 6622, 7025, 7736, 8565,10060,11776,14955,18890,26839,37587,
+/*3B0*/  7318, 7449, 7579, 7713, 7889, 8094, 8446, 8832, 9517,10324,11776,13452,16566,20435,28206,38453,
+/*3C0*/ 10776,10889,11006,11128,11290,11480,11807,12168,12810,13571,14955,16566,19583,23362,30927,40482,
+/*3D0*/ 15051,15159,15265,15373,15512,15679,15972,16293,16884,17589,18890,20435,23362,27047,34399,43349,
+/*3E0*/ 23970,24021,24075,24137,24220,24322,24509,24737,25174,25737,26839,28206,30927,34399,41141,49238,
+/*3F0*/ 36777,36786,36791,36794,36797,36806,36814,36840,36916,37067,37587,38453,40482,43349,49238,56471,
+
+/* 400 */
+
+/*400*/   582,  752,  880, 1002, 1221, 1457, 1866, 2304, 3099, 4011, 5639, 7497,10935,15202,24061,36780,
+/*410*/   752,  894, 1034, 1161, 1372, 1608, 2017, 2457, 3244, 4153, 5773, 7628,11057,15307,24109,36789,
+/*420*/   880, 1034, 1179, 1312, 1519, 1755, 2164, 2602, 3383, 4290, 5906, 7756,11173,15407,24160,36794,
+/*430*/  1002, 1161, 1312, 1468, 1670, 1906, 2312, 2750, 3528, 4432, 6042, 7889,11290,15512,24220,36797,
+/*440*/  1221, 1372, 1519, 1670, 1860, 2096, 2500, 2940, 3713, 4613, 6216, 8060,11443,15648,24299,36806,
+/*450*/  1457, 1608, 1755, 1906, 2096, 2341, 2741, 3176, 3949, 4844, 6440, 8270,11639,15821,24407,36811,
+/*460*/  1866, 2017, 2164, 2312, 2500, 2741, 3133, 3571, 4332, 5216, 6801, 8616,11963,16103,24589,36823,
+/*470*/  2304, 2457, 2602, 2750, 2940, 3176, 3571, 3997, 4753, 5633, 7202, 9003,12321,16427,24813,36845,
+/*480*/  3099, 3244, 3383, 3528, 3713, 3949, 4332, 4753, 5497, 6361, 7909, 9685,12960,17012,25248,36925,
+/*490*/  4011, 4153, 4290, 4432, 4613, 4844, 5216, 5633, 6361, 7213, 8733,10483,13716,17711,25799,37075,
+/*4A0*/  5639, 5773, 5906, 6042, 6216, 6440, 6801, 7202, 7909, 8733,10219,11926,15088,19001,26885,37598,
+/*4B0*/  7497, 7628, 7756, 7889, 8060, 8270, 8616, 9003, 9685,10483,11926,13597,16688,20532,28254,38459,
+/*4C0*/ 10935,11057,11173,11290,11443,11639,11963,12321,12960,13716,15088,16688,19688,23438,30944,40490,
+/*4D0*/ 15202,15307,15407,15512,15648,15821,16103,16427,17012,17711,19001,20532,23438,27100,34413,43351,
+/*4E0*/ 24061,24109,24160,24220,24299,24407,24589,24813,25248,25799,26885,28254,30944,34413,41147,49241,
+/*4F0*/ 36780,36789,36794,36797,36806,36811,36823,36845,36925,37075,37598,38459,40490,43351,49241,56477,
+
+/* 500 */
+
+/*500*/   801,  980, 1108, 1244, 1457, 1684, 2093, 2539, 3324, 4224, 5849, 7707,11119,15378,24160,36797,
+/*510*/   980, 1127, 1264, 1397, 1608, 1838, 2244, 2684, 3466, 4369, 5986, 7835,11244,15475,24214,36800,
+/*520*/  1108, 1264, 1412, 1548, 1755, 1983, 2392, 2829, 3608, 4508, 6119, 7960,11361,15571,24265,36803,
+/*530*/  1244, 1397, 1548, 1701, 1906, 2136, 2542, 2980, 3755, 4653, 6258, 8094,11480,15679,24322,36806,
+/*540*/  1457, 1608, 1755, 1906, 2096, 2341, 2741, 3176, 3949, 4844, 6440, 8270,11639,15821,24407,36811,
+/*550*/  1684, 1838, 1983, 2136, 2341, 2616, 3008, 3446, 4210, 5099, 6687, 8506,11858,16009,24529,36820,
+/*560*/  2093, 2244, 2392, 2542, 2741, 3008, 3389, 3826, 4582, 5463, 7040, 8844,12171,16285,24700,36831,
+/*570*/  2539, 2684, 2829, 2980, 3176, 3446, 3826, 4258, 5011, 5883, 7443, 9233,12531,16611,24924,36854,
+/*580*/  3324, 3466, 3608, 3755, 3949, 4210, 4582, 5011, 5744, 6608, 8145, 9909,13162,17185,25353,36936,
+/*590*/  4224, 4369, 4508, 4653, 4844, 5099, 5463, 5883, 6608, 7449, 8963,10705,13915,17878,25890,37087,
+/*5A0*/  5849, 5986, 6119, 6258, 6440, 6687, 7040, 7443, 8145, 8963,10438,12134,15273,19157,26961,37607,
+/*5B0*/  7707, 7835, 7960, 8094, 8270, 8506, 8844, 9233, 9909,10705,12134,13787,16861,20671,28319,38468,
+/*5C0*/ 11119,11244,11361,11480,11639,11858,12171,12531,13162,13915,15273,16861,19830,23543,30984,40499,
+/*5D0*/ 15378,15475,15571,15679,15821,16009,16285,16611,17185,17878,19157,20671,23543,27172,34430,43360,
+/*5E0*/ 24160,24214,24265,24322,24407,24529,24700,24924,25353,25890,26961,28319,30984,34430,41155,49244,
+/*5F0*/ 36797,36800,36803,36806,36811,36820,36831,36854,36936,37087,37607,38468,40499,43360,49244,56480,
+
+/* 600 */
+
+/*600*/  1227, 1397, 1531, 1664, 1866, 2093, 2505, 2943, 3707, 4616, 6230, 8062,11458,15668,24342,36803,
+/*610*/  1397, 1545, 1681, 1812, 2017, 2244, 2650, 3085, 3855, 4755, 6361, 8193,11574,15770,24401,36806,
+/*620*/  1531, 1681, 1823, 1960, 2164, 2392, 2792, 3227, 4000, 4892, 6489, 8318,11688,15870,24455,36808,
+/*630*/  1664, 1812, 1960, 2110, 2312, 2542, 2940, 3378, 4145, 5034, 6622, 8446,11807,15972,24509,36814,
+/*640*/  1866, 2017, 2164, 2312, 2500, 2741, 3133, 3571, 4332, 5216, 6801, 8616,11963,16103,24589,36823,
+/*650*/  2093, 2244, 2392, 2542, 2741, 3008, 3389, 3826, 4582, 5463, 7040, 8844,12171,16285,24700,36831,
+/*660*/  2505, 2650, 2792, 2940, 3133, 3389, 3741, 4179, 4929, 5804, 7366, 9159,12460,16543,24865,36848,
+/*670*/  2943, 3085, 3227, 3378, 3571, 3826, 4179, 4628, 5372, 6238, 7784, 9560,12833,16878,25098,36874,
+/*680*/  3707, 3855, 4000, 4145, 4332, 4582, 4929, 5372, 6096, 6952, 8477,10225,13449,17441,25515,36953,
+/*690*/  4616, 4755, 4892, 5034, 5216, 5463, 5804, 6238, 6952, 7793, 9290,11014,14196,18128,26038,37110,
+/*6A0*/  6230, 6361, 6489, 6622, 6801, 7040, 7366, 7784, 8477, 9290,10747,12429,15540,19384,27095,37621,
+/*6B0*/  8062, 8193, 8318, 8446, 8616, 8844, 9159, 9560,10225,11014,12429,14066,17108,20881,28422,38482,
+/*6C0*/ 11458,11574,11688,11807,11963,12171,12460,12833,13449,14196,15540,17108,20046,23711,31050,40507,
+/*6D0*/ 15668,15770,15870,15972,16103,16285,16543,16878,17441,18128,19384,20881,23711,27285,34453,43374,
+/*6E0*/ 24342,24401,24455,24509,24589,24700,24865,25098,25515,26038,27095,28422,31050,34453,41167,49247,
+/*6F0*/ 36803,36806,36808,36814,36823,36831,36848,36874,36953,37110,37621,38482,40507,43374,49247,56486,
+
+/* 700 */
+
+/*700*/  1701, 1843, 1977, 2105, 2304, 2539, 2943, 3369, 4133, 5037, 6628, 8452,11824,15992,24589,36828,
+/*710*/  1843, 1991, 2125, 2255, 2457, 2684, 3085, 3517, 4281, 5173, 6761, 8577,11941,16097,24634,36831,
+/*720*/  1977, 2125, 2267, 2403, 2602, 2829, 3227, 3659, 4420, 5307, 6892, 8702,12051,16196,24683,36837,
+/*730*/  2105, 2255, 2403, 2554, 2750, 2980, 3378, 3804, 4565, 5449, 7025, 8832,12168,16293,24737,36840,
+/*740*/  2304, 2457, 2602, 2750, 2940, 3176, 3571, 3997, 4753, 5633, 7202, 9003,12321,16427,24813,36845,
+/*750*/  2539, 2684, 2829, 2980, 3176, 3446, 3826, 4258, 5011, 5883, 7443, 9233,12531,16611,24924,36854,
+/*760*/  2943, 3085, 3227, 3378, 3571, 3826, 4179, 4628, 5372, 6238, 7784, 9560,12833,16878,25098,36874,
+/*770*/  3369, 3517, 3659, 3804, 3997, 4258, 4628, 5139, 5866, 6727, 8256,10009,13253,17253,25356,36911,
+/*780*/  4133, 4281, 4420, 4565, 4753, 5011, 5372, 5866, 6571, 7420, 8926,10659,13850,17799,25751,36990,
+/*790*/  5037, 5173, 5307, 5449, 5633, 5883, 6238, 6727, 7420, 8264, 9742,11446,14594,18478,26274,37155,
+/*7A0*/  6628, 6761, 6892, 7025, 7202, 7443, 7784, 8256, 8926, 9742,11179,12838,15912,19711,27299,37658,
+/*7B0*/  8452, 8577, 8702, 8832, 9003, 9233, 9560,10009,10659,11446,12838,14461,17461,21180,28598,38513,
+/*7C0*/ 11824,11941,12051,12168,12321,12531,12833,13253,13850,14594,15912,17461,20350,23961,31172,40527,
+/*7D0*/ 15992,16097,16196,16293,16427,16611,16878,17253,17799,18478,19711,21180,23961,27470,34507,43391,
+/*7E0*/ 24589,24634,24683,24737,24813,24924,25098,25356,25751,26274,27299,28598,31172,34507,41187,49255,
+/*7F0*/ 36828,36831,36837,36840,36845,36854,36874,36911,36990,37155,37658,38513,40527,43391,49255,56497,
+
+/* 800 */
+
+/*800*/  2471, 2645, 2770, 2897, 3099, 3324, 3707, 4133, 4903, 5775, 7344, 9153,12489,16606,25032,36891,
+/*810*/  2645, 2787, 2914, 3042, 3244, 3466, 3855, 4281, 5037, 5912, 7477, 9276,12594,16696,25080,36896,
+/*820*/  2770, 2914, 3054, 3184, 3383, 3608, 4000, 4420, 5170, 6045, 7605, 9395,12699,16787,25123,36908,
+/*830*/  2897, 3042, 3184, 3332, 3528, 3755, 4145, 4565, 5312, 6182, 7736, 9517,12810,16884,25174,36916,
+/*840*/  3099, 3244, 3383, 3528, 3713, 3949, 4332, 4753, 5497, 6361, 7909, 9685,12960,17012,25248,36925,
+/*850*/  3324, 3466, 3608, 3755, 3949, 4210, 4582, 5011, 5744, 6608, 8145, 9909,13162,17185,25353,36936,
+/*860*/  3707, 3855, 4000, 4145, 4332, 4582, 4929, 5372, 6096, 6952, 8477,10225,13449,17441,25515,36953,
+/*870*/  4133, 4281, 4420, 4565, 4753, 5011, 5372, 5866, 6571, 7420, 8926,10659,13850,17799,25751,36990,
+/*880*/  4903, 5037, 5170, 5312, 5497, 5744, 6096, 6571, 7224, 8074, 9554,11264,14415,18305,26115,37081,
+/*890*/  5775, 5912, 6045, 6182, 6361, 6608, 6952, 7420, 8074, 8940,10392,12074,15174,18995,26649,37257,
+/*8A0*/  7344, 7477, 7605, 7736, 7909, 8145, 8477, 8926, 9554,10392,11798,13432,16455,20194,27629,37749,
+/*8B0*/  9153, 9276, 9395, 9517, 9685, 9909,10225,10659,11264,12074,13432,15032,17983,21634,28893,38590,
+/*8C0*/ 12489,12594,12699,12810,12960,13162,13449,13850,14415,15174,16455,17983,20813,24345,31396,40581,
+/*8D0*/ 16606,16696,16787,16884,17012,17185,17441,17799,18305,18995,20194,21634,24345,27768,34649,43422,
+/*8E0*/ 25032,25080,25123,25174,25248,25353,25515,25751,26115,26649,27629,28893,31396,34649,41226,49272,
+/*8F0*/ 36891,36896,36908,36916,36925,36936,36953,36990,37081,37257,37749,38590,40581,43422,49272,56511,
+
+/* 900 */
+
+/*900*/  3403, 3574, 3690, 3812, 4011, 4224, 4616, 5037, 5775, 6639, 8193, 9972,13256,17330,25603,37047,
+/*910*/  3574, 3704, 3835, 3960, 4153, 4369, 4755, 5173, 5912, 6773, 8318,10088,13361,17415,25637,37056,
+/*920*/  3690, 3835, 3971, 4099, 4290, 4508, 4892, 5307, 6045, 6900, 8440,10205,13463,17501,25683,37064,
+/*930*/  3812, 3960, 4099, 4241, 4432, 4653, 5034, 5449, 6182, 7034, 8565,10324,13571,17589,25737,37067,
+/*940*/  4011, 4153, 4290, 4432, 4613, 4844, 5216, 5633, 6361, 7213, 8733,10483,13716,17711,25799,37075,
+/*950*/  4224, 4369, 4508, 4653, 4844, 5099, 5463, 5883, 6608, 7449, 8963,10705,13915,17878,25890,37087,
+/*960*/  4616, 4755, 4892, 5034, 5216, 5463, 5804, 6238, 6952, 7793, 9290,11014,14196,18128,26038,37110,
+/*970*/  5037, 5173, 5307, 5449, 5633, 5883, 6238, 6727, 7420, 8264, 9742,11446,14594,18478,26274,37155,
+/*980*/  5775, 5912, 6045, 6182, 6361, 6608, 6952, 7420, 8074, 8940,10392,12074,15174,18995,26649,37257,
+/*990*/  6639, 6773, 6900, 7034, 7213, 7449, 7793, 8264, 8940, 9906,11318,12966,16006,19756,27234,37479,
+/*9A0*/  8193, 8318, 8440, 8565, 8733, 8963, 9290, 9742,10392,11318,12665,14276,17233,20898,28155,37959,
+/*9B0*/  9972,10088,10205,10324,10483,10705,11014,11446,12074,12966,14276,15861,18745,22313,29385,38777,
+/*9C0*/ 13256,13361,13463,13571,13716,13915,14196,14594,15174,16006,17233,18745,21501,24944,31780,40712,
+/*9D0*/ 17330,17415,17501,17589,17711,17878,18128,18478,18995,19756,20898,22313,24944,28268,34936,43508,
+/*9E0*/ 25603,25637,25683,25737,25799,25890,26038,26274,26649,27234,28155,29385,31780,34936,41340,49315,
+/*9F0*/ 37047,37056,37064,37067,37075,37087,37110,37155,37257,37479,37959,38777,40712,43508,49315,56534,
+
+/* A00 */
+
+/*A00*/  5071, 5207, 5327, 5446, 5639, 5849, 6230, 6628, 7344, 8193, 9705,11446,14659,18648,26743,37567,
+/*A10*/  5207, 5341, 5466, 5588, 5773, 5986, 6361, 6761, 7477, 8318, 9824,11554,14759,18731,26768,37570,
+/*A20*/  5327, 5466, 5596, 5721, 5906, 6119, 6489, 6892, 7605, 8440, 9940,11662,14855,18810,26799,37576,
+/*A30*/  5446, 5588, 5721, 5861, 6042, 6258, 6622, 7025, 7736, 8565,10060,11776,14955,18890,26839,37587,
+/*A40*/  5639, 5773, 5906, 6042, 6216, 6440, 6801, 7202, 7909, 8733,10219,11926,15088,19001,26885,37598,
+/*A50*/  5849, 5986, 6119, 6258, 6440, 6687, 7040, 7443, 8145, 8963,10438,12134,15273,19157,26961,37607,
+/*A60*/  6230, 6361, 6489, 6622, 6801, 7040, 7366, 7784, 8477, 9290,10747,12429,15540,19384,27095,37621,
+/*A70*/  6628, 6761, 6892, 7025, 7202, 7443, 7784, 8256, 8926, 9742,11179,12838,15912,19711,27299,37658,
+/*A80*/  7344, 7477, 7605, 7736, 7909, 8145, 8477, 8926, 9554,10392,11798,13432,16455,20194,27629,37749,
+/*A90*/  8193, 8318, 8440, 8565, 8733, 8963, 9290, 9742,10392,11318,12665,14276,17233,20898,28155,37959,
+/*AA0*/  9705, 9824, 9940,10060,10219,10438,10747,11179,11798,12665,13892,15483,18370,21938,28993,38408,
+/*AB0*/ 11446,11554,11662,11776,11926,12134,12429,12838,13432,14276,15483,17106,19896,23362,30214,39218,
+/*AC0*/ 14659,14759,14855,14955,15088,15273,15540,15912,16455,17233,18370,19896,22543,25887,32476,41042,
+/*AD0*/ 18648,18731,18810,18890,19001,19157,19384,19711,20194,20898,21938,23362,25887,29112,35490,43738,
+/*AE0*/ 26743,26768,26799,26839,26885,26961,27095,27299,27629,28155,28993,30214,32476,35490,41630,49428,
+/*AF0*/ 37567,37570,37576,37587,37598,37607,37621,37658,37749,37959,38408,39218,41042,43738,49428,56594,
+
+/* B00 */
+
+/*B00*/  6940, 7082, 7199, 7318, 7497, 7707, 8062, 8452, 9153, 9972,11446,13142,16293,20231,28118,38445,
+/*B10*/  7082, 7213, 7335, 7449, 7628, 7835, 8193, 8577, 9276,10088,11554,13245,16384,20290,28157,38448,
+/*B20*/  7199, 7335, 7463, 7579, 7756, 7960, 8318, 8702, 9395,10205,11662,13344,16475,20359,28183,38451,
+/*B30*/  7318, 7449, 7579, 7713, 7889, 8094, 8446, 8832, 9517,10324,11776,13452,16566,20435,28206,38453,
+/*B40*/  7497, 7628, 7756, 7889, 8060, 8270, 8616, 9003, 9685,10483,11926,13597,16688,20532,28254,38459,
+/*B50*/  7707, 7835, 7960, 8094, 8270, 8506, 8844, 9233, 9909,10705,12134,13787,16861,20671,28319,38468,
+/*B60*/  8062, 8193, 8318, 8446, 8616, 8844, 9159, 9560,10225,11014,12429,14066,17108,20881,28422,38482,
+/*B70*/  8452, 8577, 8702, 8832, 9003, 9233, 9560,10009,10659,11446,12838,14461,17461,21180,28598,38513,
+/*B80*/  9153, 9276, 9395, 9517, 9685, 9909,10225,10659,11264,12074,13432,15032,17983,21634,28893,38590,
+/*B90*/  9972,10088,10205,10324,10483,10705,11014,11446,12074,12966,14276,15861,18745,22313,29385,38777,
+/*BA0*/ 11446,11554,11662,11776,11926,12134,12429,12838,13432,14276,15483,17106,19896,23362,30214,39218,
+/*BB0*/ 13142,13245,13344,13452,13597,13787,14066,14461,15032,15861,17106,18898,21572,24924,31521,40110,
+/*BC0*/ 16293,16384,16475,16566,16688,16861,17108,17461,17983,18745,19896,21572,24078,27305,33635,41772,
+/*BD0*/ 20231,20290,20359,20435,20532,20671,20881,21180,21634,22313,23362,24924,27305,30436,36510,44329,
+/*BE0*/ 28118,28157,28183,28206,28254,28319,28422,28598,28893,29385,30214,31521,33635,36510,42289,49752,
+/*BF0*/ 38445,38448,38451,38453,38459,38468,38482,38513,38590,38777,39218,40110,41772,44329,49752,56767,
+
+/* C00 */
+
+/*C00*/ 10426,10560,10671,10776,10935,11119,11458,11824,12489,13256,14659,16293,19381,23208,30893,40473,
+/*C10*/ 10560,10679,10787,10889,11057,11244,11574,11941,12594,13361,14759,16384,19447,23254,30899,40476,
+/*C20*/ 10671,10787,10901,11006,11173,11361,11688,12051,12699,13463,14855,16475,19512,23305,30913,40479,
+/*C30*/ 10776,10889,11006,11128,11290,11480,11807,12168,12810,13571,14955,16566,19583,23362,30927,40482,
+/*C40*/ 10935,11057,11173,11290,11443,11639,11963,12321,12960,13716,15088,16688,19688,23438,30944,40490,
+/*C50*/ 11119,11244,11361,11480,11639,11858,12171,12531,13162,13915,15273,16861,19830,23543,30984,40499,
+/*C60*/ 11458,11574,11688,11807,11963,12171,12460,12833,13449,14196,15540,17108,20046,23711,31050,40507,
+/*C70*/ 11824,11941,12051,12168,12321,12531,12833,13253,13850,14594,15912,17461,20350,23961,31172,40527,
+/*C80*/ 12489,12594,12699,12810,12960,13162,13449,13850,14415,15174,16455,17983,20813,24345,31396,40581,
+/*C90*/ 13256,13361,13463,13571,13716,13915,14196,14594,15174,16006,17233,18745,21501,24944,31780,40712,
+/*CA0*/ 14659,14759,14855,14955,15088,15273,15540,15912,16455,17233,18370,19896,22543,25887,32476,41042,
+/*CB0*/ 16293,16384,16475,16566,16688,16861,17108,17461,17983,18745,19896,21572,24078,27305,33635,41772,
+/*CC0*/ 19381,19447,19512,19583,19688,19830,20046,20350,20813,21501,22543,24078,26359,29484,35516,43235,
+/*CD0*/ 23208,23254,23305,23362,23438,23543,23711,23961,24345,24944,25887,27305,29484,32595,38334,45664,
+/*CE0*/ 30893,30899,30913,30927,30944,30984,31050,31172,31396,31780,32476,33635,35516,38334,43675,50622,
+/*CF0*/ 40473,40476,40479,40482,40490,40499,40507,40527,40581,40712,41042,41772,43235,45664,50622,57247,
+
+/* D00 */
+
+/*D00*/ 14762,14873,14972,15051,15202,15378,15668,15992,16606,17330,18648,20231,23208,26964,34385,43346,
+/*D10*/ 14873,14975,15071,15159,15307,15475,15770,16097,16696,17415,18731,20290,23254,26995,34385,43346,
+/*D20*/ 14972,15071,15171,15265,15407,15571,15870,16196,16787,17501,18810,20359,23305,27018,34391,43349,
+/*D30*/ 15051,15159,15265,15373,15512,15679,15972,16293,16884,17589,18890,20435,23362,27047,34399,43349,
+/*D40*/ 15202,15307,15407,15512,15648,15821,16103,16427,17012,17711,19001,20532,23438,27100,34413,43351,
+/*D50*/ 15378,15475,15571,15679,15821,16009,16285,16611,17185,17878,19157,20671,23543,27172,34430,43360,
+/*D60*/ 15668,15770,15870,15972,16103,16285,16543,16878,17441,18128,19384,20881,23711,27285,34453,43374,
+/*D70*/ 15992,16097,16196,16293,16427,16611,16878,17253,17799,18478,19711,21180,23961,27470,34507,43391,
+/*D80*/ 16606,16696,16787,16884,17012,17185,17441,17799,18305,18995,20194,21634,24345,27768,34649,43422,
+/*D90*/ 17330,17415,17501,17589,17711,17878,18128,18478,18995,19756,20898,22313,24944,28268,34936,43508,
+/*DA0*/ 18648,18731,18810,18890,19001,19157,19384,19711,20194,20898,21938,23362,25887,29112,35490,43738,
+/*DB0*/ 20231,20290,20359,20435,20532,20671,20881,21180,21634,22313,23362,24924,27305,30436,36510,44329,
+/*DC0*/ 23208,23254,23305,23362,23438,23543,23711,23961,24345,24944,25887,27305,29484,32595,38334,45664,
+/*DD0*/ 26964,26995,27018,27047,27100,27172,27285,27470,27768,28268,29112,30436,32595,35979,41312,48159,
+/*DE0*/ 34385,34385,34391,34399,34413,34430,34453,34507,34649,34936,35490,36510,38334,41312,46139,52514,
+/*DF0*/ 43346,43346,43349,43349,43351,43360,43374,43391,43422,43508,43738,44329,45664,48159,52514,58506,
+
+/* E00 */
+
+/*E00*/ 23799,23862,23916,23970,24061,24160,24342,24589,25032,25603,26743,28118,30893,34385,41133,49230,
+/*E10*/ 23862,23918,23975,24021,24109,24214,24401,24634,25080,25637,26768,28157,30899,34385,41135,49232,
+/*E20*/ 23916,23975,24026,24075,24160,24265,24455,24683,25123,25683,26799,28183,30913,34391,41138,49235,
+/*E30*/ 23970,24021,24075,24137,24220,24322,24509,24737,25174,25737,26839,28206,30927,34399,41141,49238,
+/*E40*/ 24061,24109,24160,24220,24299,24407,24589,24813,25248,25799,26885,28254,30944,34413,41147,49241,
+/*E50*/ 24160,24214,24265,24322,24407,24529,24700,24924,25353,25890,26961,28319,30984,34430,41155,49244,
+/*E60*/ 24342,24401,24455,24509,24589,24700,24865,25098,25515,26038,27095,28422,31050,34453,41167,49247,
+/*E70*/ 24589,24634,24683,24737,24813,24924,25098,25356,25751,26274,27299,28598,31172,34507,41187,49255,
+/*E80*/ 25032,25080,25123,25174,25248,25353,25515,25751,26115,26649,27629,28893,31396,34649,41226,49272,
+/*E90*/ 25603,25637,25683,25737,25799,25890,26038,26274,26649,27234,28155,29385,31780,34936,41340,49315,
+/*EA0*/ 26743,26768,26799,26839,26885,26961,27095,27299,27629,28155,28993,30214,32476,35490,41630,49428,
+/*EB0*/ 28118,28157,28183,28206,28254,28319,28422,28598,28893,29385,30214,31521,33635,36510,42289,49752,
+/*EC0*/ 30893,30899,30913,30927,30944,30984,31050,31172,31396,31780,32476,33635,35516,38334,43675,50622,
+/*ED0*/ 34385,34385,34391,34399,34413,34430,34453,34507,34649,34936,35490,36510,38334,41312,46139,52514,
+/*EE0*/ 41133,41135,41138,41141,41147,41155,41167,41187,41226,41340,41630,42289,43675,46139,50235,56054,
+/*EF0*/ 49230,49232,49235,49238,49241,49244,49247,49255,49272,49315,49428,49752,50622,52514,56054,61273,
+
+/* F00 */
+
+/*F00*/ 36754,36757,36760,36777,36780,36797,36803,36828,36891,37047,37567,38445,40473,43346,49230,56457,
+/*F10*/ 36757,36760,36766,36786,36789,36800,36806,36831,36896,37056,37570,38448,40476,43346,49232,56460,
+/*F20*/ 36760,36766,36780,36791,36794,36803,36808,36837,36908,37064,37576,38451,40479,43349,49235,56463,
+/*F30*/ 36777,36786,36791,36794,36797,36806,36814,36840,36916,37067,37587,38453,40482,43349,49238,56471,
+/*F40*/ 36780,36789,36794,36797,36806,36811,36823,36845,36925,37075,37598,38459,40490,43351,49241,56477,
+/*F50*/ 36797,36800,36803,36806,36811,36820,36831,36854,36936,37087,37607,38468,40499,43360,49244,56480,
+/*F60*/ 36803,36806,36808,36814,36823,36831,36848,36874,36953,37110,37621,38482,40507,43374,49247,56486,
+/*F70*/ 36828,36831,36837,36840,36845,36854,36874,36911,36990,37155,37658,38513,40527,43391,49255,56497,
+/*F80*/ 36891,36896,36908,36916,36925,36936,36953,36990,37081,37257,37749,38590,40581,43422,49272,56511,
+/*F90*/ 37047,37056,37064,37067,37075,37087,37110,37155,37257,37479,37959,38777,40712,43508,49315,56534,
+/*FA0*/ 37567,37570,37576,37587,37598,37607,37621,37658,37749,37959,38408,39218,41042,43738,49428,56594,
+/*FB0*/ 38445,38448,38451,38453,38459,38468,38482,38513,38590,38777,39218,40110,41772,44329,49752,56767,
+/*FC0*/ 40473,40476,40479,40482,40490,40499,40507,40527,40581,40712,41042,41772,43235,45664,50622,57247,
+/*FD0*/ 43346,43346,43349,43349,43351,43360,43374,43391,43422,43508,43738,44329,45664,48159,52514,58506,
+/*FE0*/ 49230,49232,49235,49238,49241,49244,49247,49255,49272,49315,49428,49752,50622,52514,56054,61273,
+/*FF0*/ 56457,56460,56463,56471,56477,56480,56486,56497,56511,56534,56594,56767,57247,58506,61273,65535,
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_io.c Added

@@ -0,0 +1,344 @@
+/*
+ * @file ym_io.c
+ * @brief YM-2149 I/O plugin
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "ym_io.h"
+#include "ymemul.h"
+
+typedef struct
+{
+ io68_t io;
+ struct {
+ int68_t mul;
+ uint68_t div;
+ } clock;
+
+ ym_t ym;
+} ym_io68_t;
+
+/* Convert cpu-cycle to ym-cycle. */
+static inline
+cycle68_t cycle_cputoym(const ym_io68_t * const ymio, const cycle68_t cycle)
+{
+ if (!ymio->clock.div) {
+ return ymio->clock.mul < 0
+ ? (cycle >> -ymio->clock.mul)
+ : (cycle << ymio->clock.mul)
+ ;
+ } else {
+ u64 cycle64 = cycle;
+ cycle64 *= ymio->clock.mul;
+ cycle64 /= ymio->clock.div;
+ return (cycle68_t) cycle64;
+ }
+}
+
+/* Convert ym-cycle to cpu-cycle. */
+static inline
+cycle68_t cycle_ymtocpu(const ym_io68_t * const ymio, const cycle68_t cycle)
+{
+ if (!ymio->clock.div) {
+ return ymio->clock.mul < 0
+ ? (cycle << -ymio->clock.mul)
+ : (cycle >> ymio->clock.mul)
+ ;
+ } else {
+ u64 cycle64 = cycle;
+ cycle64 *= ymio->clock.div;
+ cycle64 /= ymio->clock.mul;
+ return (cycle68_t) cycle64;
+ }
+}
+
+
+static inline
+int _readB(ym_io68_t * const ymio,
+ const addr68_t addr, const cycle68_t ymcycle)
+{
+ return (addr&3)
+ ? 0
+ : ym_readreg(&ymio->ym, ymcycle)
+ ;
+}
+
+
+static void ymio_readB(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ cycle68_t ymcycle = cycle_cputoym(ymio,emu68->cycle);
+ emu68->bus_data =
+ _readB(ymio,emu68->bus_addr,ymcycle);
+}
+
+static inline
+int _readW(ym_io68_t * const ymio,
+ const addr68_t addr, const cycle68_t ymcycle)
+{
+ return (addr&3)
+ ? 0
+ : (ym_readreg(&ymio->ym, ymcycle)<<8)
+ ;
+}
+
+static void ymio_readW(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ const cycle68_t ymcycle = cycle_cputoym(ymio,emu68->cycle);
+ emu68->bus_data =
+ _readW(ymio,emu68->bus_addr,ymcycle);
+}
+
+static inline
+int68_t _readL(ym_io68_t * const ymio,
+ const addr68_t addr, const cycle68_t ymcycle)
+{
+ return (_readW(ymio,addr,ymcycle) << 16) | _readW(ymio,addr+2,ymcycle);
+}
+
+static void ymio_readL(io68_t * const io)
+{
+ emu68_t * const emu68 = io->emu68;
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ cycle68_t ymcycle = cycle_cputoym(ymio,emu68->cycle);
+ emu68->bus_data =
+ _readL(ymio, emu68->bus_addr, ymcycle);
+}
+
+static inline
+void _writeB(ym_io68_t * const ymio,
+ const addr68_t addr, const int68_t v, const cycle68_t ymcycle)
+{
+ if (!(addr&2)) {
+ /* CTRL register */
+ ymio->ym.ctrl = (u8)v;
+ } else {
+ /* DATA register */
+ ym_writereg(&ymio->ym, (u8)v, ymcycle);
+ }
+}
+
+static void ymio_writeB(io68_t * const io)
+{
+ const emu68_t * const emu68 = io->emu68;
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ const cycle68_t ymcycle = cycle_cputoym(ymio,emu68->cycle);
+ _writeB(ymio,emu68->bus_addr,emu68->bus_data,ymcycle);
+}
+
+static inline
+void _writeW(ym_io68_t * const ymio,
+ const addr68_t addr, const int68_t v, const cycle68_t ymcycle)
+{
+ _writeB(ymio,addr,v>>8,ymcycle);
+ /* that's the way it is ! */
+ /* _writeB(ymio, addr+1, v, cycle); */
+}
+
+static void ymio_writeW(io68_t * const io)
+{
+ const emu68_t * const emu68 = io->emu68;
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ const cycle68_t ymcycle = cycle_cputoym(ymio,emu68->cycle);
+ _writeW(ymio,emu68->bus_addr,emu68->bus_data,ymcycle);
+}
+
+static void ymio_writeL(io68_t * const io)
+{
+ const emu68_t * const emu68 = io->emu68;
+ const addr68_t addr = emu68->bus_addr;
+ const int68_t data = emu68->bus_data;
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ const cycle68_t ymcycle = cycle_cputoym(ymio,emu68->cycle);
+ _writeW(ymio, addr , data>>16, ymcycle);
+ _writeW(ymio, addr+2, data, ymcycle);
+}
+
+static interrupt68_t *
+ymio_interrupt(io68_t * const io, const cycle68_t cycle)
+{
+ return 0;
+}
+
+static cycle68_t
+ymio_nextinterrupt(io68_t * const io, const cycle68_t cycle)
+{
+ return IO68_NO_INT;
+}
+
+static int ymio_reset(io68_t * const io)
+{
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ const cycle68_t ymcycle = cycle_cputoym(ymio,io->emu68->cycle);
+ ym_reset(&ymio->ym,ymcycle);
+ return 0;
+}
+
+static void ymio_adjust_cycle(io68_t * const io, const cycle68_t cycle)
+{
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ const cycle68_t ymcycle = cycle_cputoym(ymio,io->emu68->cycle);
+ ym_adjust_cycle(&ymio->ym, ymcycle);
+}
+
+
+static void ymio_destroy(io68_t * const io)
+{
+ if (io) {
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ ym_cleanup(&ymio->ym);
+ emu68_free(io);
+ }
+}
+
+static io68_t ym_io =
+{
+ 0,
+ "YM-2149",
+ 0xFFFF8800, 0xFFFF88FF,
+ ymio_readB, ymio_readW, ymio_readL,
+ ymio_writeB, ymio_writeW, ymio_writeL,
+ ymio_interrupt, ymio_nextinterrupt,
+ ymio_adjust_cycle,
+ ymio_reset,
+ ymio_destroy
+};
+
+int ymio_init(int * argc, char ** argv)
+{
+ return ym_init(argc,argv);
+}
+
+void ymio_shutdown(void)
+{
+ ym_shutdown();
+}
+
+static int get_power_of_2(int v)
+{
+ int p,r;
+ for ( p=0,r=1; r; ++p, r<<=1 ) {
+ if (r == v) return p;
+ }
+ return -1;
+}
+
+
+io68_t * ymio_create(emu68_t * const emu68, ym_parms_t * const parms)
+{
+ ym_io68_t * ymio = 0;
+
+ if (emu68) {
+ ymio = emu68_alloc(sizeof(*ymio));
+ if (ymio) {
+ int s,p;
+ uint68_t quotient,numerator,denominator;
+ ymio->io = ym_io;
+ ym_setup(&ymio->ym, parms);
+
+ if (emu68->clock > ymio->ym.clock) {
+ numerator = emu68->clock;
+ denominator = ymio->ym.clock;
+ s = -1;
+ } else {
+ numerator = ymio->ym.clock;
+ denominator = emu68->clock;
+ s = 1;
+ }
+ quotient = numerator / denominator;
+
+ if (quotient * denominator == numerator &&
+ (p = get_power_of_2(quotient), p >= 0)) {
+ ymio->clock.div = 0;
+ ymio->clock.mul = s*p;
+ } else {
+ ymio->clock.div = emu68->clock;
+ ymio->clock.mul = ymio->ym.clock;
+ }
+ }
+ }
+ return &ymio->io;
+}
+
+int ymio_sampling_rate(io68_t * const io, int sampling_rate)
+{
+ return io
+ ? ym_sampling_rate(&((ym_io68_t*)io)->ym,sampling_rate)
+ : sampling_rate
+ ;
+}
+
+ym_t * ymio_emulator(io68_t * const io)
+{
+ return io
+ ? &((ym_io68_t*)io)->ym
+ : 0
+ ;
+}
+
+uint68_t ymio_buffersize(const io68_t * const io, const cycle68_t cycles)
+{
+ if (io) {
+ const ym_io68_t * const ymio = (const ym_io68_t *)io;
+ return ym_buffersize(&ymio->ym,cycle_cputoym(ymio,cycles));
+ }
+ return 0;
+}
+
+int ymio_run(const io68_t * const io, s32 * output, const cycle68_t cycles)
+{
+ if (io) {
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ return ym_run(&ymio->ym,output,cycle_cputoym(ymio,cycles));
+ }
+ return 0;
+}
+
+/** Convert a cpu-cycle to ym-cycle. */
+cycle68_t ymio_cycle_cpu2ym(const io68_t * const io, const cycle68_t cycles)
+{
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ return cycle_cputoym(ymio,cycles);
+}
+
+/** Convert a ym-cycle to cpu-cycle. */
+cycle68_t ymio_cycle_ym2cpu(const io68_t * const io, const cycle68_t cycles)
+{
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ return cycle_ymtocpu(ymio,cycles);
+}
+
+/** Set/Get active channels */
+int ymio_active_channels(const io68_t * const io, const int clr, const int set)
+{
+ ym_io68_t * const ymio = (ym_io68_t *)io;
+ return ymio
+ ? ym_active_channels( &ymio->ym, clr, set)
+ : -1
+ ;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_io.h Added

@@ -0,0 +1,106 @@
+/**
+ * @ingroup   lib_io68
+ * @file      io68/ym_io.h
+ * @brief     YM-2149 emulator plugin header.
+ * @author    Benjamin Gerard
+ * @date      1999/03/20
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef IO68_YM_IO_H
+#define IO68_YM_IO_H
+
+#include "io68_api.h"
+#include "emu68/struct68.h"
+#include "ymemul.h"
+
+/**
+ * @addtogroup  lib_io68
+ * @{
+ */
+
+/**
+ * @name Yamaha-2149 IO plugin
+ * @{
+ */
+
+IO68_EXTERN
+/** Initialize YM-2149 library. */
+int ymio_init(int * argc, char ** argv);
+
+IO68_EXTERN
+/** Shutdown YM-2149 library. */
+void ymio_shutdown(void);
+
+IO68_EXTERN
+/**
+ *  Create Yamaha-2149 IO plugin instance.
+ *
+ * @param  emu68  68K emulator instance
+ * @param  parms  YM-2149 creation parameters
+ *
+ * @return created io instance
+ * @retval 0  Failure
+ */
+io68_t * ymio_create(emu68_t * const emu68, ym_parms_t * const parms);
+
+IO68_EXTERN
+/**
+ *  Get/Set sampling rate.
+ *
+ * @param  io  YM IO instance
+ * @param  hz  0:read current sampling rate, >0:new requested sampling rate
+ *
+ * @return actual sampling rate
+ *
+ */
+int ymio_sampling_rate(io68_t * const io, int hz);
+
+IO68_EXTERN
+/** Get ym-2149 emulator instance. */
+ym_t * ymio_emulator(io68_t * const io);
+
+IO68_EXTERN
+/**
+ *  Run ym emulator.
+ *
+ *  @see ym_run()
+ */
+int ymio_run(const io68_t * const io, s32 * output, const cycle68_t cycles);
+
+IO68_EXTERN
+/**
+ *  Get required sample buffer size.
+ *  @see ym_buffersize()
+ */
+uint68_t ymio_buffersize(const io68_t * const io, const cycle68_t cycles);
+
+IO68_EXTERN
+/**
+ *  Convert a cpu-cycle to ym-cycle.
+ */
+cycle68_t ymio_cycle_cpu2ym(const io68_t * const io, const cycle68_t cycles);
+
+IO68_EXTERN
+/**
+ * Convert a ym-cycle to cpu-cycle.
+ */
+cycle68_t ymio_cycle_ym2cpu(const io68_t * const io, const cycle68_t cycles);
+
+IO68_EXTERN
+/**
+ * Convert a ym-cycle to cpu-cycle.
+ */
+int ymio_active_channels(const io68_t * const io, const int clr, const int set);
+
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_linear_table.c Added

@@ -0,0 +1,88 @@
+/*
+ * @file ym_linear_table.c
+ * @brief YM-2149 emulator - Linear Volume Table
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/* Table of 5 bit D/A output level for 1 channel.
+ *
+ * Correct formula is: 2^-((31-vol)/4.0). Is is almost the same as
+ * -1.5dB by step.
+ */
+static const u16 ymout1c5bit32 =
+
+#if 0
+/* -1.5dB by step */
+{
+ 310, 369, 438, 521, 619, 735, 874, 1039,
+ 1234, 1467, 1744, 2072, 2463, 2927, 3479, 4135,
+ 4914, 5841, 6942, 8250, 9806, 11654, 13851, 16462,
+ 19565, 23253, 27636, 32845, 39037, 46395, 55141, 65535
+}
+#elif 0
+/* -1.5dB by step, rescale in range 0..65535 */
+{
+ 0, 59, 128, 212, 310, 427, 566, 732,
+ 928, 1162, 1440, 1770, 2163, 2629, 3184, 3843,
+ 4625, 5557, 6663, 7977, 9541, 11398, 13605, 16229,
+ 19346, 23052, 27456, 32690, 38911, 46304, 55092, 65535
+}
+#elif 0
+/* divide by 2 every 4 steps. */
+{
+ 304, 362, 431, 512, 609, 724, 861, 1024,
+ 1218, 1448, 1722, 2048, 2435, 2896, 3444, 4096,
+ 4871, 5793, 6889, 8192, 9742, 11585, 13777, 16384,
+ 19484, 23170, 27554, 32768, 38967, 46340, 55108, 65535
+}
+#else
+/* divide by 2 every 4 steps, rescale in range 0..65535 */
+{
+ 0, 58, 127, 209, 306, 422, 559, 723,
+ 918, 1149, 1424, 1752, 2141, 2604, 3154, 3809,
+ 4588, 5514, 6615, 7924, 9481, 11333, 13535, 16154,
+ 19269, 22972, 27377, 32615, 38843, 46251, 55059, 65535
+}
+#endif
+;
+
+
+/* Create a linear 3 channels 5 bit per channels DAC table.
+ */
+void ym_create_5bit_linear_table(s16 * out, unsigned int level)
+{
+ int i;
+ const unsigned int min = ymout1c5bit00;
+ const unsigned int max = ymout1c5bit31;
+ const unsigned int div = max-min ? max-min : 1;
+ const int center = ( level + 1 ) >> 1;
+ for (i=0; i<32*32*32; ++i) {
+ int tmp =
+ ( (unsigned int) ymout1c5bit0x1F & (i>>10) +
+ (unsigned int) ymout1c5bit0x1F & (i>> 5) +
+ (unsigned int) ymout1c5bit0x1F & (i>> 0) -
+ 3u * min ) / 3u * level / div;
+ outi = tmp - center;
+ }
+ TRACE68(ym_cat,
+ "ym-2149: volume model -- *linear* -- %d..%d\n",
+ out0,out0x7FFF);
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_puls.c Added

@@ -0,0 +1,766 @@
+/*
+ * @file ym_puls.c
+ * @brief YM-2149 emulator - YM-2149 pulse engine
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#if 0
+#ifdef HAVE_CONFIG_OPTION68_H
+# include "config_option68.h"
+#else
+# include "default_option68.h"
+#endif
+#endif
+
+
+#include "ymemul.h"
+#include "emu68/assert68.h"
+
+#include <sc68/file68_msg.h>
+#include <sc68/file68_str.h>
+#include <sc68/file68_opt.h>
+
+extern int ym_cat; /* defined in ymemul.c */
+extern int ym_dac_out; /* defined in ymemul.c */
+extern const u16 * ym_envelops16; /* defined in ym_envel.c */
+
+#ifndef INTMSB
+# define INTMSB (sizeof(int)*8-1)
+#endif
+
+#define YM_OUT_MSK(C,B,A) \
+ (((((C)&0x1F)<<10)) \
+ |((((B)&0x1F)<< 5)) \
+ |((((A)&0x1F) )))
+
+const int ym_smsk_table8 = {
+ /* 000 */ YM_OUT_MSK(00,00,00),
+ /* 001 */ YM_OUT_MSK(00,00,-1),
+ /* 010 */ YM_OUT_MSK(00,-1,00),
+ /* 011 */ YM_OUT_MSK(00,-1,-1),
+ /* 100 */ YM_OUT_MSK(-1,00,00),
+ /* 101 */ YM_OUT_MSK(-1,00,-1),
+ /* 110 */ YM_OUT_MSK(-1,-1,00),
+ /* 111 */ YM_OUT_MSK(-1,-1,-1)
+};
+
+/*********************/
+/* Filters functions */
+/*********************/
+
+static void filter_none(ym_t * const);
+static void filter_1pole(ym_t * const);
+static void filter_2pole(ym_t * const);
+static void filter_mixed(ym_t * const);
+static void filter_boxcar(ym_t * const);
+static void filter_dacout(ym_t * const);
+
+static const char f_2poles = "2-poles";
+static const char f_mixed = "mixed";
+static const char f_1pole = "1-pole";
+static const char f_boxcar = "boxcar";
+static const char f_none = "none";
+static const char f_dacout = "dacout";
+
+static struct {
+ const char * name;
+ ym_puls_filter_t filter;
+} filters = {
+ { f_2poles, filter_2pole }, /* first is default */
+ { f_mixed, filter_mixed },
+ { f_1pole, filter_1pole },
+ { f_boxcar, filter_boxcar },
+ { f_none, filter_none },
+ { f_dacout, filter_dacout },
+};
+
+static const char * f_names = {
+ f_2poles,f_mixed,f_1pole,f_boxcar,f_none,f_dacout
+};
+static const int n_filters = sizeof(filters)/sizeof(*filters);
+static int default_filter = 0;
+
+#define PULS ym->emu.puls
+
+static int reset(ym_t * const ym, const cycle68_t ymcycle)
+{
+
+ /* Reset envelop generator */
+ PULS.envel_idx = -1; /* ct==1 triggers +1 instantly */
+ PULS.envel_ct = 1;
+
+ /* Reset noise generator */
+ PULS.noise_bit = 1;
+ PULS.noise_ct = 1;
+
+ /* Reset tone generator (add bias to avoid cancel-out sync effect). */
+#if 1
+ PULS.voice_ctA = 1;
+ PULS.voice_ctB = 1;
+ PULS.voice_ctC = 1;
+ PULS.levels = 0x7fff;
+#else
+ PULS.voice_ctA = 53;
+ PULS.voice_ctB = 109;
+ PULS.voice_ctC = 157;
+ PULS.levels = 0;
+#endif
+
+ /* Reset filters */
+ PULS.hipass_inp1 = 0;
+ PULS.hipass_out1 = 0;
+ PULS.lopass_out1 = 0;
+
+ /* Reset butterworth */
+ PULS.btw.x0 = PULS.btw.x1 = 0;
+ PULS.btw.y0 = PULS.btw.y1 = 0;
+
+ /* Butterworth low-pass cutoff=15.625khz sampling=250khz */
+ PULS.btw.a0 = 0x01eac69f; /* fix 30 */
+ PULS.btw.a1 = 0x03d58d3f;
+ PULS.btw.a2 = 0x01eac69f;
+ PULS.btw.b0 = -0x5d1253b0;
+ PULS.btw.b1 = 0x24bd6e2f;
+
+ return 0;
+}
+
+/* ,-----------------------------------------------------------------.
+ * | All in one |
+ * `-----------------------------------------------------------------'
+ */
+
+
+static int generator(ym_t * const ym, int ymcycles)
+{
+ const u16 * waveform = ym_envelops15 & ym->reg.name.env_shape;
+
+ /* int ctA, ctB, ctC, ctN, ctE; */
+ int perA, perB, perC, perN, perE;
+ int smsk, emsk, vols, nmsk;
+ int rem_cycles, v;
+
+ rem_cycles = ymcycles & 7;
+ ymcycles >>= 3;
+ if(!ymcycles) goto finish;
+
+ smsk = ym_smsk_table7 & ym->reg.name.ctl_mixer ;
+ nmsk = ym_smsk_table7 & (ym->reg.name.ctl_mixer >> 3);
+
+ /* 3 voices buzz or lvl mask */
+ emsk = vols = 0;
+
+ v = ym->reg.name.vol_a & 0x1F;
+ if(v&0x10) emsk |= YM_OUT_MSK_A;
+ else vols |= (v<<1)+1;
+
+ v = ym->reg.name.vol_b & 0x1F;
+ if(v&0x10) emsk |= YM_OUT_MSK_B;
+ else vols |= (v<<6)+(1<<5);
+
+ v = ym->reg.name.vol_c & 0x1F;
+ if(v&0x10) emsk |= YM_OUT_MSK_C;
+ else vols |= (v<<11)+(1<<10);
+
+ perA = ym->reg.name.per_a_lo | ((ym->reg.name.per_a_hi&0xF)<<8);
+ perB = ym->reg.name.per_b_lo | ((ym->reg.name.per_b_hi&0xF)<<8);
+ perC = ym->reg.name.per_c_lo | ((ym->reg.name.per_c_hi&0xF)<<8);
+ perE = ym->reg.name.per_env_lo | (ym->reg.name.per_env_hi<<8);
+ perN = (ym->reg.name.per_noise & 0x1F) << 1;
+
+ /* $$$ X/ME << 1 because the noise generator base frequency is
+ master/16 but we have to match the envelop generator frequency
+ which is master/8. */
+
+ /* $$$ x/ME DELME XXX TEST */
+ if (!perA) perA = 1;
+ if (PULS.voice_ctA > perA) PULS.voice_ctA %= perA;
+ if (!perB) perB = 1;
+ if (PULS.voice_ctB > perB) PULS.voice_ctB %= perB;
+ if (!perC) perC = 1;
+ if (PULS.voice_ctC > perC) PULS.voice_ctC %= perC;
+ if (!perE) perE = 1;
+ if (PULS.envel_ct > perE) PULS.envel_ct %= perE;
+ if (!perN) perN = 1;
+ if (PULS.noise_ct > perN) PULS.noise_ct %= perN;
+
+ do {
+ int sq;
+
+ if (--PULS.noise_ct <= 0) {
+ PULS.noise_ct = perN;
+ /* *** Based on MAME. Bit have been reversed for optimzation :) ***
+ *
+ * The Random Number Generator of the 8910 is a 17-bit shift
+ * register. The input to the shift register is bit0 XOR bit2.
+ * bit0 is the output.
+ */
+
+ /* bit 17 := bit 0 ^ bit 2 */
+ PULS.noise_bit |= ((PULS.noise_bit^(PULS.noise_bit>>2)) & 1)<<17;
+ PULS.noise_bit >>= 1;
+ }
+
+ if (--PULS.envel_ct <= 0) {
+ PULS.envel_ct = perE;
+ if (++PULS.envel_idx == 96) PULS.envel_idx = 32;
+ }
+
+ if (--PULS.voice_ctA <= 0) {
+ PULS.levels ^= YM_OUT_MSK_A;
+ PULS.voice_ctA = perA;
+ }
+
+ if (--PULS.voice_ctB <= 0) {
+ PULS.levels ^= YM_OUT_MSK_B;
+ PULS.voice_ctB = perB;
+ }
+
+ if (--PULS.voice_ctC <= 0) {
+ PULS.levels ^= YM_OUT_MSK_C;
+ PULS.voice_ctC = perC;
+ }
+
+ sq = PULS.levels | smsk; /* Apply tone. */
+ sq &= (-(PULS.noise_bit&1) | nmsk); /* Apply noise. */
+ sq &= (waveformPULS.envel_idx&emsk) | vols; /* Apply volume. */
+ sq &= ym->voice_mute; /* Apply mute. */
+ *ym->outptr++ = sq;
+
+ } while (--ymcycles);
+
+finish:
+ return rem_cycles;
+}
+
+
+static void simulation(ym_t * const ym, cycle68_t ymcycle)
+{
+ ym_event_t * event;
+ cycle68_t lastcycle;
+
+ if (!ymcycle)
+ return;
+
+ for (event = ym->event_buf, lastcycle = 0; event < ym->event_ptr; ++event) {
+ const int ymcycles = event->ymcycle - lastcycle;
+ assert(event->ymcycle <= ymcycle);
+ if (ymcycles)
+ lastcycle = event->ymcycle - generator(ym, ymcycles);
+ ym->reg.indexevent->reg = event->val;
+ if(event->reg == YM_ENVTYPE) {
+ /* $$$ X/ME Should env_ct be initialized to the period value ? */
+ PULS.envel_idx = -1; /* ct==1 triggers +1 instantly */
+ PULS.envel_ct = 1;
+ }
+ }
+ generator(ym, ymcycle-lastcycle);
+}
+
+/* ,-----------------------------------------------------------------.
+ * | Run emulation |
+ * `-----------------------------------------------------------------'
+ */
+
+/******************************************************/
+/* */
+/* Recursive single pole low-pass filter */
+/* ------------------------------------- */
+/* */
+/* oN = iN * A + oN-1 * B */
+/* */
+/* X = exp(-2.0 * pi * Fc) */
+/* A = 1 - X = 1 - B */
+/* B = X */
+/* Fc = cutoff / rate */
+/* */
+/* */
+/* Recursive single pole high-pass filter */
+/* -------------------------------------- */
+/* */
+/* oN = A0 * iN + A1 * iN-1 + B1 * oN-1 */
+/* = A0 * iN - A0 * iN-1 + B1 * oN-1 */
+/* = A0 * ( iN - iN-1 ) + B1 * oN-1 */
+/* */
+/* X = exp(-2.0 * pi * Fc) */
+/* A0 = (1 + X) / 2 */
+/* A1 = -A0 */
+/* B1 = X */
+/* Fc = cutoff / rate */
+/* */
+/* */
+/* Butterworth */
+/* ----------- */
+/* oN = A0 * iN-0 + A1 * iN-1 + A2 * iN-2 */
+/* - B0 * oN-1 - B1 * oN-2 */
+/* */
+/* */
+/* Butterworth low-pass */
+/* -------------------- */
+/* */
+/* c = 1 / tan(pi * cutoff / rate) */
+/* a0 = 1 / (1 + sqrt(2) * c + c^2) */
+/* a1 = 2 * a0 */
+/* a2 = a0 */
+/* b0 = 2 * (1 - c^2) * a0 */
+/* b1 = (1 - sqrt(2.0) * c + c^2) * a0 */
+/* */
+/* */
+/* Butterworth high-pass */
+/* --------------------- */
+/* */
+/* c = tan(pi * cutoff / rate) */
+/* a0 = 1 / (1 + sqrt(2) * c + c^2) */
+/* a1 = -2 * a0 */
+/* a2 = a0 */
+/* b0 = 2 * (c^2 - 1) * a0 */
+/* b1 = (1 - sqrt(2) * c + c^2) * a0 */
+/* */
+/******************************************************/
+
+
+#define REVOL(V) ((V) >> 1)
+#define CLIP3(V,A,B) ( V < A ? A : ( V > B ? B : V ) )
+#define CLIP(V) CLIP3(V,-32768,32767)
+#define YMOUT(X) ymout(ym,X)
+
+static inline s16 ymout(const ym_t * const ym, const int v)
+{
+ assert (v >= 0 && v < (1<<15) );
+ return ym->ymout5v;
+}
+
+static inline int clip(int o)
+{
+#ifdef DEBUG
+ static int max, min;
+ if ( o < min ) {
+ min = o;
+ msg68(ym_cat,"ym-2149: pulse -- pcm min -- %d\n", o);
+ }
+ if ( o > max ) {
+ max = o;
+ msg68(ym_cat,"ym-2149: pulse -- pcm max -- %d\n", o);
+ }
+ if (o < -32768) {
+ msg68(ym_cat,"ym-2149: pulse -- pcm clip -- %d < -32768\n", o);
+ o = -32768;
+ } else if (o > 32767) {
+ msg68(ym_cat,"ym-2149: pulse -- pcm clip -- %d > 32767\n", o);
+ o = 32767;
+ }
+ return o;
+#elif defined(CLIP)
+ return CLIP(o);
+#else
+ return o;
+#endif
+}
+
+/* Resample ``n'' input samples from ``irate'' to ``orate''
+ * @warning irate <= 262143 or 32bit overflow
+ */
+static s32 * resampling(s32 * dst, const int n,
+ const uint68_t irate, const uint68_t orate)
+{
+ s32 * const src = dst;
+ const int68_t stp = (irate << 14) / orate; /* step into source */
+
+ if ( 0 == (stp & ((1<<14)-1)) ) {
+ /* integer step: fast down-sampling/ */
+ const int istp = stp >> 14;
+ const int iend = n;
+ int idx = 0;
+ /* forward */
+ do {
+ int o = REVOL(srcidx);
+ *dst++ = clip(o);
+ } while ((idx += istp) < iend);
+ } else {
+ const int68_t end = n << 14;
+ int68_t idx = 0;
+
+ if (stp >= 1<<14) {
+ /* step > 1: down-sampling, do it forward */
+ do {
+ int o = REVOL(src(int)(idx>>14));
+ *dst++ = clip(o);
+ } while ((idx += stp) < end);
+ } else {
+ /* step < 0: up-sampling, do backward */
+ const int m = (n * orate + irate - 1) / irate; /* output samples */
+ dst = src + m - 1;
+ idx = end;
+ do {
+ int o = REVOL(src(int)((idx -= stp)>>14));
+ *dst = clip(o);
+ } while (--dst != src);
+ dst = src+m;
+ }
+ }
+ return dst;
+}
+
+
+
+static void filter_dacout(ym_t * const ym)
+{
+ /* nothing to do ! */
+}
+
+static void filter_none(ym_t * const ym)
+{
+ const int n = (ym->outptr - ym->outbuf);
+ if (n > 0) {
+ int i;
+ /* DAC in -> out */
+ for (i=0; i<n; ++i)
+ ym->outbufi = YMOUT(ym->outbufi);
+ ym->outptr =
+ resampling(ym->outbuf, n, ym->clock>>3, ym->hz);
+ }
+}
+
+static void filter_boxcar2(ym_t * const ym)
+{
+ const int n = (ym->outptr - ym->outbuf) >> 1;
+
+ if (n > 0) {
+ /* DAC out 2 by 2 */
+ int m = n;
+ s32 * src = ym->outbuf, * dst = ym->outbuf;
+
+ do {
+ *dst++ = ( YMOUT(src0) + YMOUT(src1) ) >> 1;
+ src += 2;
+ } while (--m);
+
+ ym->outptr =
+ resampling(ym->outbuf, n, ym->clock>>(3+1), ym->hz);
+ }
+}
+
+static void filter_boxcar4(ym_t * const ym)
+{
+ const int n = (ym->outptr - ym->outbuf) >> 2;
+
+ if (n > 0) {
+ int m = n;
+ s32 * src = ym->outbuf, * dst = ym->outbuf;
+
+ do {
+ *dst++ = ( YMOUT(src0) + YMOUT(src1) +
+ YMOUT(src2) + YMOUT(src3) ) >> 2;
+ src += 4;
+ } while (--m);
+
+ ym->outptr =
+ resampling(ym->outbuf, n, ym->clock>>(3+2), ym->hz);
+ }
+}
+
+/** Use 2-boxcar or 4-boxcar filter so that boxcar output rate not
+ less than output sampling rate. */
+static void filter_boxcar(ym_t * const ym) {
+ /* Select boxcar width */
+ if (ym->hz > (ym->clock >> (3+2)))
+ filter_boxcar2(ym);
+ else
+ filter_boxcar4(ym);
+}
+
+
+/* - 4-boxcar filter resamples to 62500hz
+ * - Empirical lowpass filter (+adjust output level)
+ * - 1-pole 25hz hipass filter.
+ */
+static void filter_mixed(ym_t * const ym)
+{
+ const int n = (ym->outptr - ym->outbuf) >> 2; /* Number of block */
+
+ if (n > 0) {
+ s32 * src = ym->outbuf, * dst = src;
+ int68_t h_i1 = PULS.hipass_inp1;
+ int68_t h_o1 = PULS.hipass_out1;
+ int68_t l_o1 = PULS.lopass_out1;
+ int m = n;
+
+ do {
+ int68_t i0,o0;
+
+ /***********************************************************/
+ /* 4-tap boxcar filter; lower sampling rate from 250Khz to */
+ /* 62.5Khz; emulates half level buzz sounds. */
+ /***********************************************************/
+ i0 = ( YMOUT(src0) + YMOUT(src1)
+ + YMOUT(src2) + YMOUT(src3) ) >> 2;
+ src += 4;
+
+ /*****************************************/
+ /* Recursive single pole low-pass filter */
+ /* - cutoff : 15.625 Khz */
+ /* - sampling : 62.5 Khz */
+ /*****************************************/
+ if (1) {
+ const int68_t B = 0x1a9c; /* 15 bit */
+ const int68_t A = (1<<15)-B;
+ l_o1 = ( (i0 * A) + l_o1 * B ) >> 15;
+ } else {
+ l_o1 = i0;
+ }
+
+ /******************************************/
+ /* Recursive single pole high-pass filter */
+ /* - cutoff : 25 hz */
+ /* - sampling : 62.5 Khz */
+ /******************************************/
+ if (1) {
+ const int A0 = 0x7FD7; /* 15 bit */
+ const int B1 = 0x7FAE; /* 15 bit */
+ o0 = h_o1 = ( (l_o1 - h_i1) * A0 + (h_o1 * B1) ) >> 15;
+ h_i1 = l_o1;
+ } else {
+ o0 = i0;
+ }
+
+ /* store */
+ *dst++ = o0;
+
+ } while (--m);
+
+ PULS.hipass_inp1 = h_i1;
+ PULS.hipass_out1 = h_o1;
+ PULS.lopass_out1 = l_o1;
+
+ ym->outptr =
+ resampling(ym->outbuf, n, ym->clock>>(3+2), ym->hz);
+ }
+}
+
+static void filter_1pole(ym_t * const ym)
+{
+ const int n = ym->outptr - ym->outbuf;
+
+ if (n > 0) {
+ s32 * src = ym->outbuf, * dst = src;
+
+ int68_t h_i1 = PULS.hipass_inp1;
+ int68_t h_o1 = PULS.hipass_out1;
+ int68_t l_o1 = PULS.lopass_out1;
+ int m = n;
+
+ do {
+ int68_t i0,o0;
+
+ i0 = YMOUT(*src++);
+
+ /*****************************************/
+ /* Recursive single pole low-pass filter */
+ /* - cutoff : 15.625 Khz */
+ /* - sampling : 250 Khz */
+ /*****************************************/
+ {
+ const int68_t B = 0x7408; /* 15 bit */
+ const int68_t A = (1<<15)-B;
+ l_o1 = ( (i0 * A) + l_o1 * B ) >> 15;
+ }
+
+ /******************************************/
+ /* Recursive single pole high-pass filter */
+ /* - cutoff : 25 hz */
+ /* - sampling : 250 Khz */
+ /******************************************/
+ {
+ const int68_t A0 = 0x7FF6; /* 15 bit */
+ const int68_t B1 = 0x7FEB; /* 15 bit */
+ o0 = h_o1 = ( (l_o1 - h_i1) * A0 + (h_o1 * B1) ) >> 15;
+ h_i1 = l_o1;
+ }
+
+ /* store */
+ *dst++ = o0;
+
+ } while (--m);
+
+ PULS.hipass_inp1 = h_i1;
+ PULS.hipass_out1 = h_o1;
+ PULS.lopass_out1 = l_o1;
+
+ ym->outptr =
+ resampling(ym->outbuf, n, ym->clock>>(3+0), ym->hz);
+ }
+}
+
+
+/* Transform 250000Hz buffer to current sampling rate.
+ *
+ * Using a butterworth passband filter
+ *
+ */
+static void filter_2pole(ym_t * const ym)
+{
+ const int n = ym->outptr - ym->outbuf;
+
+ if (n > 0) {
+ s32 * src = ym->outbuf, * dst = src;
+ int m = n;
+
+ int68_t h_i1 = PULS.hipass_inp1;
+ int68_t h_o1 = PULS.hipass_out1;
+
+ const int68_t a0 = PULS.btw.a0 >> 15;
+ const int68_t a1 = PULS.btw.a1 >> 15;
+ const int68_t a2 = PULS.btw.a2 >> 15;
+ const int68_t b0 = PULS.btw.b0 >> 15;
+ const int68_t b1 = PULS.btw.b1 >> 15;
+
+ int68_t x0 = PULS.btw.x0;
+ int68_t x1 = PULS.btw.x1;
+ int68_t y0 = PULS.btw.y0;
+ int68_t y1 = PULS.btw.y1;
+
+ do {
+ int68_t i0,o0;
+
+ i0 = YMOUT(*src++);
+
+ /******************************************/
+ /* Recursive single pole high-pass filter */
+ /* - cutoff : 25 hz */
+ /* - sampling : 250 Khz */
+ /******************************************/
+ {
+ const int68_t A0 = 0x7FF6; /* 15 bit */
+ const int68_t B1 = 0x7FEB; /* 15 bit */
+ h_o1 = (((i0 - h_i1) * A0) + (h_o1 * B1)) >> 15;
+ h_i1 = i0;
+ i0 = h_o1;
+ }
+
+ /* Butterworth low-pass */
+ {
+ o0 = (
+ a0 * i0 + a1 * x0 + a2 * x1 -
+ b0 * y0 - b1 * y1 ) >> 15;
+ x1 = x0; x0 = i0;
+ y1 = y0; y0 = o0;
+ }
+
+ *dst++ = o0;
+
+ } while (--m);
+
+ PULS.btw.x0 = x0;
+ PULS.btw.x1 = x1;
+ PULS.btw.y0 = y0;
+ PULS.btw.y1 = y1;
+
+ PULS.hipass_inp1 = h_i1;
+ PULS.hipass_out1 = h_o1;
+
+ ym->outptr =
+ resampling(ym->outbuf, n, ym->clock>>3, ym->hz);
+ }
+}
+
+static
+int run(ym_t * const ym, s32 * output, const cycle68_t ymcycles)
+{
+ /* set pointers */
+ ym->outbuf = ym->outptr = output;
+
+ /* run the simulation */
+ simulation(ym,ymcycles);
+
+ /* post processing (filters, resample ...) */
+ filtersym->emu.puls.ifilter.filter(ym);
+
+ /* reset event list. */
+ ym->event_ptr = ym->event_buf;
+
+ return ym->outptr - ym->outbuf;
+}
+
+static
+int buffersize(const ym_t * const ym, const cycle68_t ymcycles)
+{
+ return ((ymcycles+7u) >> 3);
+}
+
+static
+void cleanup(ym_t * const ym)
+{
+}
+
+int ym_puls_setup(ym_t * const ym)
+{
+ int err = 0;
+
+ /* fill callback functions */
+ ym->cb_cleanup = cleanup;
+ ym->cb_reset = reset;
+ ym->cb_run = run;
+ ym->cb_buffersize = buffersize;
+ ym->cb_sampling_rate = 0;
+
+ /* use default filter */
+ PULS.ifilter = default_filter;
+
+ TRACE68(ym_cat,"ym-2149: filter -- *%s*\n", filtersPULS.ifilter.name);
+
+ return err;
+}
+
+static int onchange_filter(const option68_t * opt, value68_t * val)
+{
+ if (val->num >= 0 && val->num < n_filters) {
+ default_filter = val->num;
+ return 0;
+ }
+ return -1;
+}
+
+/* command line options option */
+/* static const char prefix = "sc68-"; */
+#define prefix 0
+static const char engcat = "ym-puls";
+static option68_t opts = {
+ OPT68_ENUM(prefix,"ym-filter",engcat,
+ "set ym-2149 filter (pulse only)",
+ f_names,sizeof(f_names)/sizeof(*f_names),1,onchange_filter)
+};
+
+#undef prefix
+
+void ym_puls_add_options(void)
+{
+ const int n_opts = sizeof(opts) / sizeof(*opts);
+
+ /* Register ym-puls options */
+ option68_append(opts, n_opts);
+
+ /* Default option values */
+ option68_iset(opts+0, default_filter, opt68_NOTSET, opt68_CFG);
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ym_puls.h Added

@@ -0,0 +1,109 @@
+/**
+ * @ingroup lib_io68
+ * @file io68/ym_puls.h
+ * @brief sc68 pulse YM-2149 emulator header.
+ * @author Benjamin Gerard
+ * @date 2009/02/10
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+/**
+ * @defgroup lib_io68_ym_puls Pulse (sc68 legacy) YM engine.
+ * @ingroup lib_io68_ym
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Setup function for sc68 pulse ym engine.
+ *
+ * The ym_puls_setup() function sets ym pulsinal engine for this ym
+ * emulator instance.
+ *
+ * @param ym ym emulator instance to setup
+ * @retval 0 on success
+ * @retval -1 on failure
+ */
+int ym_puls_setup(ym_t * const ym);
+
+IO68_EXTERN
+/**
+ * Creates ym pulse engine options.
+ *
+ */
+void ym_puls_add_options(void);
+
+/**
+ * Type definition for the pulse engine filter function.
+ */
+typedef void (*ym_puls_filter_t)(ym_t * const);
+
+/**
+ * YM-2149 internal data structure for pulse emulator.
+ */
+struct ym2149_puls_s
+{
+ /**
+ * @name Envelop generator
+ * @{
+ */
+ int envel_ct; /**< Envelop period counter. */
+ int envel_idx; /**< Envelop index 0..96. */
+ /**
+ * @}
+ */
+
+ /**
+ * @name Noise generator
+ * @{
+ */
+ int noise_bit; /**< Noise generator 17-bit shift register. */
+ int noise_ct; /**< Noise generator period counter. */
+ /**
+ * @}
+ */
+
+ /**
+ * @name Tone generator
+ * @{
+ */
+ int voice_ctA; /**< Canal A sound period counter. */
+ int voice_ctB; /**< Canal B sound period counter. */
+ int voice_ctC; /**< Canal C sound period counter. */
+ int levels; /**< Square level C<<10|B<<5|A. */
+ /**
+ * @}
+ */
+
+ /**
+ * @name Filter
+ * @{
+ */
+ int68_t hipass_inp1; /**< high pass filter input. */
+ int68_t hipass_out1; /**< high pass filter output. */
+ int68_t lopass_out1; /**< low pass filter output. */
+
+ /** 2-poles butterworth filter. */
+ struct {
+ int68_t x2; /**< @nodoc */
+ int68_t y2; /**< @nodoc */
+ int68_t a3; /**< @nodoc */
+ int68_t b2; /**< @nodoc */
+ } btw;
+ /**
+ * @}
+ */
+
+ int ifilter; /**< filter function to use. */
+
+};
+
+/**
+ * YM-2149 emulator instance type.
+ */
+typedef struct ym2149_puls_s ym_puls_t;
+
+/**
+ * @}
+ */

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ymemul.c Added

@@ -0,0 +1,612 @@
+/*
+ * @file ym_emul.c
+ * @brief YM-2149 emulator
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "default.h"
+#include "ymemul.h"
+#include "emu68/assert68.h"
+#include <sc68/file68_msg.h>
+#include <sc68/file68_opt.h>
+#include <string.h>
+
+#ifndef BREAKPOINT68
+# define BREAKPOINT68 assert(!"breakpoint")
+#endif
+
+#ifndef DEBUG_YM_O
+# define DEBUG_YM_O 0
+#endif
+#define YMHD "ym-2149: "
+int ym_cat = msg68_DEFAULT; /* For debug message */
+int ym_default_chans = 7; /* Active channels */
+int ym_output_level = 0xCAFE; /* PCM scaling */
+int ym_cur_volmodel = YM_VOL_QUERY; /* Invalid value */
+
+#include "ym_linear_table.c"
+#include "ym_atarist_table.c"
+
+/** 3 channels output table.
+ * Using a table for non linear mixing.
+ */
+static s16 ymout532*32*32;
+
+/* ,-----------------------------------------------------------------.
+ * | Yamaha reset |
+ * `-----------------------------------------------------------------'
+ */
+
+int ym_reset(ym_t * const ym, const cycle68_t ymcycle)
+{
+ int ret = -1;
+
+ static const struct ym2149_reg_s init_regs = {
+ 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, /* tone period A,B,C */
+ 0x1f, 0xff, /* noise period & mixer */
+ 0x00, 0x00, 0x00, /* Volume A,B,C */
+ 0xFF, 0xFF, /* envelop period */
+ 0x0A, /* envelop shape */
+ 0,0 /* I/O port a,b */
+ };
+
+ if (ym) {
+ /* Reset registers */
+ ym->shadow.name = ym->reg.name = init_regs;
+ ym->ctrl = 0;
+
+ /* Run emulator specific reset callback. */
+ if (ym->cb_reset) {
+ ym->cb_reset(ym,ymcycle);
+ }
+
+ /* Reset event lists */
+ ym->event_ptr = ym->event_buf;
+ ym->event_ovf = 0;
+
+ ret = 0;
+ }
+
+ return ret;
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Yamaha init |
+ * `-----------------------------------------------------------------'
+ */
+
+/* Select default engine */
+#ifndef YM_ENGINE
+# define YM_ENGINE YM_ENGINE_BLEP
+#endif
+
+/* Select default volume table */
+#ifndef YM_VOLMODEL
+# define YM_VOLMODEL YM_VOL_ATARIST
+#endif
+
+/* Default parameters */
+static ym_parms_t default_parms;
+
+/* Max output level for volume tables. */
+
+
+static const char f_pulse = "pulse";
+static const char f_blep = "blep";
+static const char f_dump = "dump";
+static const char * f_engines = { f_blep, f_pulse, f_dump };
+
+static const char f_atari = "atari";
+static const char f_linear = "linear";
+static const char * f_volumes = { f_atari, f_linear };
+
+static int onchange_engine(const option68_t *opt, value68_t * val)
+{
+ static int engs3 = { YM_ENGINE_BLEP, YM_ENGINE_PULS, YM_ENGINE_DUMP };
+ assert(val->num >= 0 && val->num < 3);
+ if (val->num >= 0 && val->num < 3) {
+ ym_engine(0, engsval->num);
+ return 0;
+ }
+ return -1;
+}
+
+static int onchange_volume(const option68_t *opt, value68_t * val)
+{
+ static int vols2 = { YM_VOL_ATARIST, YM_VOL_LINEAR };
+ assert(val->num >= 0 && val->num < 2);
+ if (val->num >= 0 && val->num < 2) {
+ default_parms.volmodel = volsval->num;
+ return 0;
+ }
+ return -1;
+}
+
+static int onchange_ymchans(const option68_t *opt, value68_t * val)
+{
+ val->num = ym_default_chans = val->num & 7;
+ return 0;
+}
+
+/* Command line options */
+/* static const char prefix = "sc68-"; */
+#define prefix 0
+
+static const char engcat = "ym-2149";
+static option68_t opts = {
+ OPT68_ENUM(prefix,"ym-engine",engcat,"set ym-2149 engine",
+ f_engines,sizeof(f_engines)/sizeof(*f_engines),
+ 1,onchange_engine),
+ OPT68_ENUM(prefix,"ym-volmodel",engcat,
+ "set ym-2149 volume model",
+ f_volumes,sizeof(f_volumes)/sizeof(*f_volumes),
+ 1,onchange_volume),
+ OPT68_IRNG(prefix,"ym-chans",engcat,
+ "set ym-2149 active channel {bit#0:A,bit#1:B,bit#2:C}",
+ 0,7,1,onchange_ymchans)
+};
+#undef prefix
+
+static const char * ym_engine_name(int emul);
+static const char * ym_volmodel_name(int model);
+
+/* Force output level in valid range */
+static void check_output_level(void)
+{
+ if (ym_output_level < 0)
+ ym_output_level = 0;
+ else if (ym_output_level >= 0x10000)
+ ym_output_level = 0xFFFF;
+}
+
+
+int ym_init(int * argc, char ** argv)
+{
+ /* Debug */
+ ym_cat = msg68_cat("ym","ym-2149 emulator",DEBUG_YM_O);
+
+ /* Setup default */
+ default_parms.engine = YM_ENGINE;
+ default_parms.volmodel = YM_VOLMODEL;
+ default_parms.clock = YM_CLOCK_ATARIST;
+ default_parms.hz = SPR_DEF;
+
+ /* Register ym options */
+ option68_append(opts,sizeof(opts)/sizeof(*opts));
+
+ /* Default option values */
+ option68_set (opts+0, ym_engine_name(default_parms.engine),
+ opt68_NOTSET, opt68_CFG);
+ option68_set (opts+1, ym_volmodel_name(default_parms.volmodel),
+ opt68_NOTSET, opt68_CFG);
+ option68_iset(opts+2, ym_default_chans, opt68_NOTSET, opt68_CFG);
+
+ /* Add ym-puls options */
+ ym_puls_add_options();
+
+ /* Add ym-dump options */
+ ym_dump_add_options();
+
+ /* Add ym-blep options */
+ ym_blep_add_options();
+
+ /* Parse options. */
+ *argc = option68_parse(*argc,argv);
+
+ check_output_level();
+
+ /* Set volume table (unique for all instance) */
+ switch (default_parms.volmodel) {
+ case YM_VOL_LINEAR:
+ ym_create_5bit_linear_table(ymout5, ym_output_level);
+ ym_cur_volmodel = YM_VOL_LINEAR;
+ break;
+ case YM_VOL_DEFAULT:
+ case YM_VOL_ATARIST:
+ default:
+ ym_create_5bit_atarist_table(ymout5, ym_output_level);
+ ym_cur_volmodel = YM_VOL_ATARIST;
+ }
+
+ return 0;
+}
+
+void ym_shutdown(void)
+{
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Run emulation |
+ * `-----------------------------------------------------------------'
+ */
+int ym_run(ym_t * const ym, s32 * output, const cycle68_t ymcycles)
+{
+ if (!ymcycles) {
+ return 0;
+ }
+
+ /*
+ * Currently ymcycles must be multiple of 32.
+ * 32 cycles will generate 4 samples @ 250000hz. It helps to
+ * simplify the first filter code (half-level buzz trick).
+ */
+ if ( (ymcycles&31) || !output) {
+ return -1;
+ }
+
+ return ym->cb_run(ym,output,ymcycles);
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Write YM register |
+ * `-----------------------------------------------------------------'
+ */
+
+#define ELTOF(A) ( sizeof(A) / sizeof(*A) )
+
+void ym_writereg(ym_t * const ym,
+ const int val, const cycle68_t ymcycle)
+{
+ const int reg = ym->ctrl;
+ const ym_event_t * const event_end = ym->event_buf+ELTOF(ym->event_buf);
+
+ if ( (unsigned int)reg < 16 ) {
+ assert( reg >= 0 && reg < 16 );
+ ym->shadow.indexreg = val;
+ if (ym->event_ptr >= event_end)
+ ++ym->event_ovf;
+ else {
+ ym->event_ptr->ymcycle = ymcycle;
+ ym->event_ptr->reg = reg;
+ ym->event_ptr->val = val;
+ ++ym->event_ptr;
+ }
+ }
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Adjust YM-2149 cycle counters |
+ * `-----------------------------------------------------------------'
+ */
+void ym_adjust_cycle(ym_t * const ym, const cycle68_t ymcycles)
+{
+ if (ym && ymcycles) {
+ ym_event_t * event;
+
+ /* Should not be run before events have been flushed or
+ * processed. It's not really an error, but with the current
+ * implementation it should not be happening. */
+ assert(ym->event_ptr == ym->event_buf);
+
+ /* Do the job anyway */
+ for (event = ym->event_buf; event < ym->event_ptr; ++event) {
+ assert(event->ymcycle >= ymcycles);
+ event->ymcycle -= ymcycles;
+ }
+ }
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Yamaha get activated voices |
+ * `-----------------------------------------------------------------'
+ */
+
+extern const int ym_smsk_table; /* declared in ym_puls.c */
+int ym_active_channels(ym_t * const ym, const int clr, const int set)
+{
+ int v = 0;
+ if (ym) {
+ const int voice_mute = ym->voice_mute;
+ v = ( voice_mute & 1 ) | ( (voice_mute>>5) & 2 ) | ( (voice_mute>>10) & 4);
+ v = ( (v & ~clr ) | set ) & 7;
+ ym->voice_mute = ym_smsk_tablev;
+ TRACE68(ym_cat, YMHD "active channels -- *%c%c%c*\n",
+ (v&1)?'A':'.', (v&2)?'B':'.', (v&4)?'C':'.');
+ }
+ return v;
+}
+
+/* ,-----------------------------------------------------------------.
+ * | Engine selection |
+ * `-----------------------------------------------------------------'
+ */
+
+static
+const char * ym_engine_name(int emul)
+{
+ switch (emul) {
+ case YM_ENGINE_PULS: return f_pulse;
+ case YM_ENGINE_BLEP: return f_blep;
+ case YM_ENGINE_DUMP: return f_dump;
+ }
+ return 0;
+}
+
+int ym_engine(ym_t * const ym, int engine)
+{
+ switch (engine) {
+
+ case YM_ENGINE_QUERY:
+ /* Get current value. */
+ engine = ym ? ym->engine : default_parms.engine;
+ break;
+
+ default:
+ /* Invalid values */
+ case YM_ENGINE_DEFAULT:
+ /* Default values */
+ engine = default_parms.engine;
+ case YM_ENGINE_PULS:
+ case YM_ENGINE_BLEP:
+ case YM_ENGINE_DUMP:
+ /* Valid values */
+ if (!ym) {
+ default_parms.engine = engine;
+ TRACE68(ym_cat,
+ YMHD "default engine -- *%s*\n",
+ ym_engine_name(engine));
+ } else {
+ ym->engine = engine;
+ }
+ break;
+ }
+ return engine;
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Master clock |
+ * `-----------------------------------------------------------------'
+ */
+
+int ym_clock(ym_t * const ym, int clock)
+{
+ switch (clock) {
+
+ case YM_CLOCK_QUERY:
+ clock = ym ? ym->clock : default_parms.clock;
+ break;
+
+ case YM_CLOCK_DEFAULT:
+ clock = default_parms.clock;
+
+ default:
+ clock = YM_CLOCK_ATARIST;
+ if (!ym) {
+ default_parms.clock = clock;
+ TRACE68(ym_cat,
+ YMHD "default clock -- *%u*\n",
+ (unsigned int) clock);
+ } else {
+ clock = ym->clock;
+ }
+ break;
+ }
+ return clock;
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Volume model |
+ * `-----------------------------------------------------------------'
+ */
+
+static
+const char * ym_volmodel_name(int model)
+{
+ switch (model) {
+ case YM_VOL_LINEAR: return f_linear;
+ case YM_VOL_ATARIST: return f_atari;
+ }
+ return 0;
+}
+
+int ym_volume_model(ym_t * const ym, int model)
+{
+ /* Set volume table (currently unique for all instances) */
+
+ switch (model) {
+
+ case YM_VOL_QUERY:
+ model = default_parms.volmodel;
+ break;
+
+ default:
+ case YM_VOL_DEFAULT:
+ model = default_parms.volmodel;
+ case YM_VOL_LINEAR:
+ case YM_VOL_ATARIST:
+ assert(model == YM_VOL_LINEAR || model == YM_VOL_ATARIST);
+ if (ym)
+ ym->volmodel = model; /* does nothing ATM */
+ if (model != ym_cur_volmodel) {
+ ym_cur_volmodel = model;
+ check_output_level();
+ if ( model == YM_VOL_LINEAR )
+ ym_create_5bit_linear_table(ymout5, ym_output_level);
+ else
+ ym_create_5bit_atarist_table(ymout5, ym_output_level);
+ TRACE68(ym_cat,
+ YMHD "set volume table -- *%s $%04x*\n",
+ ym_volmodel_name(model), ym_output_level);
+ }
+ break;
+ }
+ return model;
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Output sampling rate |
+ * `-----------------------------------------------------------------'
+ */
+
+int ym_sampling_rate(ym_t * const ym, const int chz)
+{
+ int hz = chz;
+ switch (hz) {
+
+ case YM_VOL_QUERY:
+ hz = ym ? ym->hz : default_parms.hz;
+ break;
+
+ case YM_VOL_DEFAULT:
+ hz = default_parms.hz;
+
+ default:
+ if (hz < SPR_MIN) hz = SPR_MIN;
+ if (hz > SPR_MAX) hz = SPR_MAX;
+ if (ym->cb_sampling_rate)
+ hz = ym->cb_sampling_rate(ym,hz);
+ if (ym)
+ ym->hz = hz;
+ else
+ default_parms.hz = hz;
+ TRACE68(ym_cat,
+ YMHD "%s sampling rate -- *%dhz*\n",
+ ym ? "select" : "default", hz);
+ }
+ return hz;
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Configure default or emulator instance |
+ * `-----------------------------------------------------------------'
+ */
+
+int ym_configure(ym_t * const ym, ym_parms_t * const parms)
+{
+ assert(ym);
+ assert(parms);
+ parms->engine = ym_engine(ym, parms->engine);
+ parms->volmodel = ym_volume_model(ym, parms->volmodel);
+ parms->clock = ym_clock(ym, parms->clock);
+ parms->hz = ym_sampling_rate(ym, parms->hz);
+ return 0;
+}
+
+
+/* ,-----------------------------------------------------------------.
+ * | Setup / Cleanup emulator instance |
+ * `-----------------------------------------------------------------'
+ */
+
+int ym_setup(ym_t * const ym, ym_parms_t * const parms)
+{
+ ym_parms_t * const p = parms ? parms : &default_parms;
+ int err = -1;
+
+ /* engine */
+ if (p->engine == YM_ENGINE_DEFAULT) {
+ p->engine = default_parms.engine;
+ }
+
+ /* sampling rate */
+ if (p->hz == 0) {
+ p->hz = default_parms.hz;
+ }
+
+ /* clock */
+ switch (p->clock) {
+ case YM_CLOCK_ATARIST:
+ break;
+ case YM_CLOCK_DEFAULT:
+ default:
+ p->clock = default_parms.clock;
+ }
+
+ TRACE68(ym_cat,
+ YMHD "setup -- engine:%d rate:%d clock:%d level:%d\n",
+ p->engine,p->hz,p->clock,256);
+
+ if (ym) {
+ ym->ymout5 = ymout5;
+ ym->clock = p->clock;
+ ym->voice_mute = ym_smsk_table7 & ym_default_chans;
+ /* clearing sampling rate callback ensure requested rate to be in
+ valid range. */
+ ym->cb_sampling_rate = 0;
+ ym_sampling_rate(ym, p->hz);
+ ym->engine = p->engine;
+
+ switch (p->engine) {
+ case YM_ENGINE_PULS:
+ err = ym_puls_setup(ym);
+ break;
+
+ case YM_ENGINE_BLEP:
+ err = ym_blep_setup(ym);
+ break;
+
+ case YM_ENGINE_DUMP:
+ err = ym_dump_setup(ym);
+ break;
+
+ default:
+ assert(!"invalid ym-engine");
+ err = -1;
+ }
+ if (!err)
+ TRACE68(ym_cat,
+ YMHD "engine -- *%s*\n", ym_engine_name(ym->engine));
+
+ /* at this point specific sampling rate callback can be call */
+ ym_sampling_rate(ym, ym->hz);
+ }
+
+ /* Just for info print */
+ ym_active_channels(ym,0,0);
+
+ return err ? err : ym_reset(ym, 0);
+}
+
+
+/** Destroy an Yamaha-2149 emulator instance.
+ */
+void ym_cleanup(ym_t * const ym)
+{
+ TRACE68(ym_cat,YMHD "%s\n", "cleanup");
+ if (ym) {
+ if (ym->event_ovf) {
+ msg68_critical(YMHD "write access buffer has overflow -- *%u*\n",
+ ym->event_ovf);
+ assert(!"YM event list overflow");
+ }
+ if (ym->cb_cleanup)
+ ym->cb_cleanup(ym);
+ }
+}
+
+/** Get required output buffer size.
+ */
+uint68_t ym_buffersize(const ym_t * const ym, const cycle68_t ymcycles)
+{
+ return ym->cb_buffersize(ym,ymcycles);
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ymemul.h Added

@@ -0,0 +1,539 @@
+/**
+ * @ingroup lib_io68
+ * @file io68/ymemul.h
+ * @brief YM-2149 emulator header.
+ * @author Benjamin Gerard
+ * @date 1998/06/24
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef IO68_YM_EMUL_H
+#define IO68_YM_EMUL_H
+
+#include "io68_api.h"
+#include "emu68/emu68.h"
+
+/* Need these values in ymemul.c and ym_puls.c */
+enum {
+ YM_OUT_MSK_A = 0x001F,
+ YM_OUT_MSK_B = 0x03E0,
+ YM_OUT_MSK_C = 0x7C00,
+ YM_OUT_MSK_ALL = 0x7FFF
+};
+
+/**
+ * @defgroup lib_io68_ym YM-2149 emulator
+ * @ingroup lib_io68
+ *
+ * The YM-2149 (Atari-ST soundchip) emulator.
+ *
+ * @{
+ */
+
+
+/**
+ * @name YM-2149 registers.
+ * @{
+ */
+enum {
+ YM_BASEPERL = 0, /**< YM-2149 LSB period base (chan A). */
+ YM_BASEPERH = 1, /**< YM-2149 MSB period base (chan A). */
+ YM_BASEVOL = 8, /**< YM-2149 volume base register (chan A). */
+ YM_NOISE = 6, /**< Noise period. */
+ YM_MIXER = 7, /**< Mixer control. */
+ YM_ENVL = 11, /**< Volume envelop LSB period. */
+ YM_ENVH = 12, /**< Volume envelop MSB period. */
+ YM_ENVTYPE = 13, /**< Volume envelop wave form. */
+ YM_ENVSHAPE = 13, /**< Alias for YM_ENVTYPE. */
+};
+#define YM_PERL(N) (YM_BASEPERL+(N)*2) /**< Canal N LSB period. */
+#define YM_PERH(N) (YM_BASEPERH+(N)*2) /**< Canal N MSB period. */
+#define YM_VOL(N) (YM_BASEVOL+(N)) /**< Canal N volume. */
+/**
+ * @}
+ */
+
+
+/**
+ * @name YM-2149 internal register access.
+ * @{
+ */
+
+/**
+ * YM event (write access) struture.
+ */
+struct ym_event_s
+{
+ cycle68_t ymcycle; /**< CPU cycle this access occurs. */
+ u8 reg; /**< YM register to write into. */
+ u8 val; /**< Value to write. */
+};
+
+/**
+ * YM write access type.
+ */
+typedef struct ym_event_s ym_event_t;
+
+/**
+ * @}
+ */
+
+/**
+ * YM-2149 internal register mapping.
+ */
+struct ym2149_reg_s {
+ u8 per_a_lo; /**< (0) LSB tone period channel A */
+ u8 per_a_hi; /**< (1) MSB tone period channel A */
+ u8 per_b_lo; /**< (2) LSB tone period channel B */
+ u8 per_b_hi; /**< (3) MSB tone period channel B */
+ u8 per_c_lo; /**< (4) LSB tone period channel C */
+ u8 per_c_hi; /**< (5) MSB tone period channel C */
+ u8 per_noise; /**< (6) Noise period */
+ u8 ctl_mixer; /**< (7) Mixer control */
+ u8 vol_a; /**< (8) Volume/envelop channel A */
+ u8 vol_b; /**< (9) Volume/envelop channel B */
+ u8 vol_c; /**< (A) Volume/envelop channel C */
+ u8 per_env_lo; /**< (B) LSB envelop period */
+ u8 per_env_hi; /**< (C) MSB envelop period */
+ u8 env_shape; /**< (D) Envelop shape */
+ u8 io_a; /**< (E) IO port A */
+ u8 io_b; /**< (F) IO port B */
+};
+
+/**
+ * Access YM-2149 internal register by name or by index.
+ */
+typedef union ym_reg_u {
+ struct ym2149_reg_s name; /**< ym registers by name. */
+ u8 index16; /**< ym registers by index. */
+} ym_reg_t;
+
+/**
+ * YM-2149 emulation engine identifiers.
+ */
+enum ym_engine_e {
+ YM_ENGINE_QUERY = -1, /**< Query current or default engine. */
+ YM_ENGINE_DEFAULT = 0, /**< Use default mode. */
+ YM_ENGINE_PULS, /**< sc68 original (pulse) emulation. */
+ YM_ENGINE_BLEP, /**< Antti Lankila's Band Limited Step synthesis. */
+ YM_ENGINE_DUMP /**< Dummy register dump. */
+};
+
+/**
+ * YM-2149 volume model identifiers.
+ */
+enum ym_vol_e {
+ YM_VOL_QUERY = -1, /**< Query current or default volume model. */
+ YM_VOL_DEFAULT = 0, /**< Use default volume model. */
+ YM_VOL_ATARIST, /**< Atari-ST volume table. */
+ YM_VOL_LINEAR /**< Linear mixing volume table. */
+};
+
+/**
+ * Sampling rate special values.
+ */
+enum ym_hz_e {
+ YM_HZ_QUERY = -1, /**< Query current or default sampling rate. */
+ YM_HZ_DEFAULT = 0 /**< Default sampling rate. */
+};
+
+/**
+ * YM master clock frequency special values.
+ */
+enum ym_clock_e {
+ /** Query current or default master clock frequency. */
+ YM_CLOCK_QUERY = 1,
+ /** Default master clock frequency. */
+ YM_CLOCK_DEFAULT = 0,
+ /** Atari-ST YM-2149 master clock is about 2Mz. */
+ YM_CLOCK_ATARIST = EMU68_ATARIST_CLOCK/4u,
+};
+
+/**
+ * Type definition for struct ym_s.
+ */
+typedef struct ym_s ym_t;
+
+#include "ym_puls.h" /* data structure for puls ym emulator. */
+#include "ym_blep.h" /* data structure for blep ym emulator. */
+#include "ym_dump.h" /* data structure for dump ym emulator. */
+
+/**
+ * Base struct for all YM emulators.
+ */
+struct ym_s {
+
+ /**
+ * @name Interface
+ * @{
+ */
+ void (*cb_cleanup) (ym_t * const);
+ int (*cb_reset) (ym_t * const, const cycle68_t);
+ int (*cb_run) (ym_t * const, s32 *, const cycle68_t);
+ int (*cb_buffersize) (const ym_t *, const cycle68_t);
+ int (*cb_sampling_rate) (ym_t * const, const int);
+ /**
+ * @}
+ */
+
+ /**
+ * @name Internal YM registers
+ * @{
+ */
+ u8 ctrl; /**< Control (working) register. */
+ ym_reg_t reg; /**< YM registers. */
+ ym_reg_t shadow; /**< Shadow YM registers (for reading). */
+ /**
+ * @}
+ */
+
+ s16 * ymout5; /**< DAC lookup table */
+ uint_t voice_mute; /**< Mask muted voices. */
+ uint_t hz; /**< Sampling rate. */
+ uint68_t clock; /**< Master clock frequency in Hz. */
+
+ /**
+ * @name Events (Write access) storage.
+ * @{
+ */
+ ym_event_t *event_ptr; /**< Current number of entry in event. */
+ unsigned int event_ovf; /**< count overflows. */
+ ym_event_t event_buf1600; /**< Pre-allocated YM memory access. */
+ /**
+ * @}
+ */
+
+ /**
+ * @name Output
+ * @{
+ */
+ s32 * outbuf; /**< output buffer given to ym_run() */
+ s32 * outptr; /**< generated sample pointer (into outbuf) */
+ /**
+ * @}
+ */
+
+ int engine; /**< @ref ym_engine_e "engine type". */
+ int volmodel; /**< @ref ym_vol_e "volume model". */
+
+ /**
+ * union of all YM emulators private data.
+ */
+ union emu_u {
+ ym_puls_t puls; /**< PULS YM emulator data. */
+ ym_blep_t blep; /**< BLEP YM emulator data. */
+ ym_dump_t dump; /**< DUMP YM emulator data. */
+ } emu; /**< Engine private data. */
+};
+
+/**
+ * YM-2149 setup structure.
+ *
+ * This structure is passed to the ym_init() and ym_setup()
+ * functions. The caller have to fill it with desired values before
+ * calling these functions. Each field can be set to a nul value in
+ * order to use the default value. The function will set the actual
+ * values before returning.
+ *
+ */
+typedef struct
+{
+ int engine; /**< @ref ym_engine_e "emulator engine". */
+ int volmodel; /**< @ref ym_vol_e "volume model". */
+ int clock; /**< @see ym_clock_e "master clock frequency". */
+ int hz; /**< Sampling rate in Hz. */
+} ym_parms_t;
+
+/**
+ * @name Initialization functions
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Create an Yamaha-2149 emulator instance.
+ *
+ * @param ym
+ * @param parms
+ *
+ * @return error-code
+ * @retval 0 Success
+ * @retval -1 Failure
+ *
+ * @see ym_destroy()
+ */
+int ym_setup(ym_t * const ym, ym_parms_t * const parms);
+
+IO68_EXTERN
+/**
+ * Destroy an Yamaha-2149 emulator instance.
+ *
+ * @param ym ym emulator instance to destroy
+ */
+void ym_cleanup(ym_t * const ym);
+
+IO68_EXTERN
+/**
+ * Perform an Yamaha-2149 hardware reset.
+ *
+ * The ym_reset() reset function perform a YM-2149 reset. It
+ * performs following operations :
+ * - all register zeroed
+ * - mixer is set to 077 (no sound and no noise)
+ * - envelop shape is set to 0xA (/\)
+ * - control register is set to 0
+ * - internal periods counter are zeroed
+ *
+ * @param ym YM-2149 emulator instance.
+ * @param ymcycle ym cycle the reset has occured.
+ *
+ * @return error-code (always success)
+ * @retval 0 Success
+ * @retval -1 Failure
+ */
+int ym_reset(ym_t * const ym, const cycle68_t ymcycle);
+
+IO68_EXTERN
+/**
+ * Yamaha-2149 first one first initialization.
+ *
+ * The ym_init() function must be call before any other ym_
+ * function. If params is non nul then all non nul fields will be
+ * used as the new default value for this field at ym_setup()
+ * function call.
+ *
+ * @param argc pointer to argument count (updated)
+ * @param argv array of arguments string (updated)
+ *
+ * @return error-code (always success)
+ * @retval 0 Success
+ *
+ * @see ym_reset()
+ */
+int ym_init(int * argc, char ** argv);
+
+IO68_EXTERN
+/**
+ * Shutdown the ym-2149 library.
+ *
+ * The ym_shutdown() function should be call after all created ym
+ * emulator instances have been clean up.
+ *
+ */
+void ym_shutdown(void);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Emulation functions
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Execute Yamaha-2149 emulation.
+ *
+ * The ym_run() function execute Yamaha-2149 emulation for a given
+ * number of cycle. The output buffer
+ *
+ * @warning The requested output buffer size may seem larger than
+ * neccessary but it is not. Internally the emulator may need some
+ * extra place (for oversampling...). Always call ym_buffersize() to
+ * allocate this buffer large enough.
+ *
+ * @param ym YM-2149 emulator instance.
+ * @param output Output sample buffer.
+ * @param ymcycles Number of cycle to mix.
+ *
+ * @return Number of sample in output mix-buffer
+ * @retval -1 Failure
+ *
+ * @see ym_buffersize()
+ */
+int ym_run(ym_t * const ym, s32 * output, const cycle68_t ymcycles);
+
+
+IO68_EXTERN
+/**
+ * Get required output buffer size.
+ *
+ * The ym_buffersize() function returns the minimum size in
+ * PCM(32bit) of the output buffer for generating ymcycles
+ * cycles. It should be use to ensure the buffer is large enough
+ * before calling ym_run() function.
+ *
+ * @param ym YM-2149 emulator instance.
+ * @param ymcycles Number of ym-cycles to generate
+ *
+ * @return Minimum size in PCM (32bit) of output buffer to generate
+ * ymcycles samples.
+ *
+ */
+uint68_t ym_buffersize(const ym_t * const ym, const cycle68_t ymcycles);
+
+IO68_EXTERN
+/**
+ * Change YM cycle counter base.
+ *
+ * The ym_adjest() function allow to corrige the internal cycle
+ * counter to prevent overflow. Because the number of cycle could
+ * grow very quickly, it is neccessary to get it down from time to
+ * time.
+ *
+ * @param ym YM-2149 emulator instance.
+ * @param ymcycles Number of cpu cycle to substract to current the
+ * cycle counter.
+ *
+ */
+void ym_adjust_cycle(ym_t * const ym, const cycle68_t ymcycles);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name YM-2149 register access functions
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Write in YM-2149 register.
+ *
+ * The ym_writereg() function performs a write access to an YM-2149
+ * internal register. The YM-2149 emulator does not really write
+ * register but store changes in separate list depending of the
+ * register nature and dependencies. There are 3 lists of update
+ * (sound, noise and envelop). This method allow to perform a very
+ * efficient cycle precise emulation. For this reason the YM-2149
+ * registers should be read by ym_readreg() function.
+ *
+ * @param ym YM-2149 emulator instance.
+ * @param val Value to write.
+ * @param ymcycle YM cycle this access has occurred.
+ *
+ * @see ym_readreg();
+ */
+void ym_writereg(ym_t * const ym, const int val, const cycle68_t ymcycle);
+
+
+static inline
+/**
+ * Read a YM-2119 register.
+ *
+ * The ym_readreg() function must be call to read an YM-2149
+ * register. For the reasons explained in YM_writereg(), register
+ * must not be read directly.
+ *
+ * @param ym YM-2149 emulator instance.
+ * @param ymcycle CPU cycle number this access has occurred.
+ *
+ * @return Register value at given cycle
+ *
+ * @see ym_writereg();
+ */
+int ym_readreg(ym_t * const ym, const cycle68_t ymcycle)
+{
+ const int reg = ym->ctrl;
+ return (reg>=0 && reg<16)
+ ? ym->shadow.indexreg
+ : 0;
+}
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name YM-2149 emulator configuration functions.
+ * @{
+ */
+
+IO68_EXTERN
+/**
+ * Get/Set active channels status.
+ *
+ * The ym_active_channels() function allows to activate/desactivate
+ * separarely channels (voices) of the YM-2149.
+ *
+ * For both on and off parameters:
+ * -bit#0: canal A (0:no change 1:change to on or off)
+ * -bit#1: canal B (0:no change 1:change to on or off)
+ * -bit#2: canal C (0:no change 1:change to on or off)
+ *
+ * How it works:
+ *
+ * The ym_active_channels() function performs off parameter before on
+ * parameter. The formula looks like ``result=(current&^off)|on''.
+ *
+ * How to use:
+ *
+ * -Get current value : ym_active_channels(ym,0,0);
+ * -Mute all channels : ym_active_channels(ym,7,0);
+ * -Active all channels : ym_active_channels(ym,0,7);
+ * -Active some channel channels : ym_active_channels(ym,0,x);
+ *
+ * @param ym YM-2149 emulator instance
+ * @param off Mute the channels for bit set to 1
+ * @param on Active the channels for bit set to 1
+ *
+ * @return new active-voices status
+ * @retval -1 Failure
+ * @retval 0 All voice muted
+ * @retval 1 Only channel A
+ * @retval 7 all channels active
+ *
+ */
+int ym_active_channels(ym_t * const ym, const int off, const int on);
+
+IO68_EXTERN
+/**
+ * Set/Get configuration.
+ */
+int ym_configure(ym_t * const ym, ym_parms_t * const parms);
+
+IO68_EXTERN
+/**
+ * Get/Set sampling rate.
+ *
+ * @param ym YM-2149 emulator instance
+ * @param hz frequency in hz or @ref ym_hz_e "special values".
+ *
+ * @return Actual sampling rate (may differs from requested).
+ * @retval -1 on error
+ */
+int ym_sampling_rate(ym_t * const ym, const int hz);
+
+IO68_EXTERN
+/**
+ * Set or get Yamaha-2149 emulator engine.
+ *
+ * @param ym YM-2149 emulator instance
+ * @param engine @ref ym_engine_e "engine identifier" value
+
+ * @return @ref ym_engine_e "engine identifier".
+ * @retval -1 on error
+ */
+int ym_engine(ym_t * const ym, int engine);
+
+IO68_EXTERN
+int ym_volume_model(ym_t * const ym, int model);
+
+IO68_EXTERN
+int ym_clock(ym_t * const ym, int clock);
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ymout2k9.h Added

@@ -0,0 +1,5154 @@
+{
+/* A: 968D89C0 */
+/* A:00 B:00 */
+0x0000,0x0021,0x0049,0x0079,0x00B1,0x00F4,0x0144,0x01A3,
+0x0214,0x029A,0x0339,0x03F6,0x04D7,0x05E2,0x0720,0x089A,
+0x0A5B,0x0C70,0x0EEA,0x11DB,0x155B,0x1983,0x1E74,0x2453,
+0x2B4E,0x3399,0x3D75,0x492C,0x5719,0x67A6,0x7B51,0x92B2,
+/* A:00 B:01 */
+0x0021,0x0043,0x006B,0x009A,0x00D3,0x0116,0x0166,0x01C4,
+0x0235,0x02BB,0x035A,0x0417,0x04F8,0x0603,0x0741,0x08BA,
+0x0A7B,0x0C90,0x0F0A,0x11FB,0x157A,0x19A2,0x1E92,0x2471,
+0x2B6A,0x33B5,0x3D8F,0x4946,0x5731,0x67BC,0x7B65,0x92C3,
+/* A:00 B:02 */
+0x0049,0x006B,0x0093,0x00C2,0x00FB,0x013E,0x018D,0x01EC,
+0x025D,0x02E3,0x0382,0x043F,0x0520,0x062B,0x0768,0x08E1,
+0x0AA2,0x0CB6,0x0F30,0x1220,0x159F,0x19C6,0x1EB6,0x2494,
+0x2B8D,0x33D6,0x3DAF,0x4964,0x574D,0x67D6,0x7B7C,0x92D7,
+/* A:00 B:03 */
+0x0079,0x009A,0x00C2,0x00F2,0x012A,0x016D,0x01BD,0x021C,
+0x028C,0x0312,0x03B1,0x046E,0x054E,0x0659,0x0796,0x090F,
+0x0ACF,0x0CE4,0x0F5D,0x124D,0x15CB,0x19F2,0x1EE0,0x24BD,
+0x2BB5,0x33FD,0x3DD5,0x4987,0x576E,0x67F4,0x7B98,0x92EF,
+/* A:00 B:04 */
+0x00B1,0x00D3,0x00FB,0x012A,0x0162,0x01A5,0x01F5,0x0254,
+0x02C4,0x034A,0x03E9,0x04A5,0x0586,0x0691,0x07CE,0x0946,
+0x0B06,0x0D1A,0x0F93,0x1282,0x15FF,0x1A25,0x1F13,0x24EF,
+0x2BE5,0x342C,0x3E01,0x49B2,0x5796,0x6819,0x7BB8,0x930B,
+/* A:00 B:05 */
+0x00F4,0x0116,0x013E,0x016D,0x01A5,0x01E8,0x0238,0x0296,
+0x0307,0x038C,0x042B,0x04E8,0x05C8,0x06D2,0x080F,0x0987,
+0x0B47,0x0D5A,0x0FD2,0x12C1,0x163E,0x1A63,0x1F4F,0x252A,
+0x2C1E,0x3463,0x3E37,0x49E4,0x57C5,0x6844,0x7BE0,0x932D,
+/* A:00 B:06 */
+0x0144,0x0166,0x018D,0x01BD,0x01F5,0x0238,0x0287,0x02E6,
+0x0356,0x03DB,0x047A,0x0536,0x0616,0x0721,0x085D,0x09D5,
+0x0B94,0x0DA7,0x101E,0x130C,0x1688,0x1AAB,0x1F97,0x2570,
+0x2C63,0x34A5,0x3E76,0x4A20,0x57FE,0x6878,0x7C0E,0x9355,
+/* A:00 B:07 */
+0x01A3,0x01C4,0x01EC,0x021C,0x0254,0x0296,0x02E6,0x0344,
+0x03B4,0x0439,0x04D8,0x0594,0x0674,0x077E,0x08B9,0x0A31,
+0x0BEF,0x0E02,0x1078,0x1365,0x16E0,0x1B02,0x1FEC,0x25C3,
+0x2CB3,0x34F3,0x3EC1,0x4A67,0x5840,0x68B6,0x7C45,0x9384,
+/* A:00 B:08 */
+0x0214,0x0235,0x025D,0x028C,0x02C4,0x0307,0x0356,0x03B4,
+0x0424,0x04A9,0x0547,0x0603,0x06E3,0x07EC,0x0927,0x0A9E,
+0x0C5C,0x0E6E,0x10E3,0x13CF,0x1748,0x1B69,0x2051,0x2626,
+0x2D14,0x3550,0x3F1A,0x4ABC,0x5890,0x68FF,0x7C86,0x93BD,
+/* A:00 B:09 */
+0x029A,0x02BB,0x02E3,0x0312,0x034A,0x038C,0x03DB,0x0439,
+0x04A9,0x052E,0x05CC,0x0687,0x0766,0x086F,0x09AA,0x0B20,
+0x0CDD,0x0EEE,0x1162,0x144D,0x17C5,0x1BE3,0x20C9,0x269B,
+0x2D86,0x35BF,0x3F84,0x4B21,0x58EE,0x6955,0x7CD4,0x9400,
+/* A:00 B:0a */
+0x0339,0x035A,0x0382,0x03B1,0x03E9,0x042B,0x047A,0x04D8,
+0x0547,0x05CC,0x0669,0x0725,0x0803,0x090B,0x0A46,0x0BBB,
+0x0D77,0x0F86,0x11F9,0x14E3,0x1858,0x1C75,0x2158,0x2727,
+0x2E0E,0x3642,0x4002,0x4B98,0x595E,0x69BD,0x7D31,0x9450,
+/* A:00 B:0b */
+0x03F6,0x0417,0x043F,0x046E,0x04A5,0x04E8,0x0536,0x0594,
+0x0603,0x0687,0x0725,0x07DF,0x08BD,0x09C5,0x0AFE,0x0C73,
+0x0E2E,0x103C,0x12AD,0x1594,0x1908,0x1D22,0x2201,0x27CC,
+0x2EAF,0x36DE,0x4098,0x4C27,0x59E3,0x6A37,0x7D9F,0x94AF,
+/* A:00 B:0c */
+0x04D7,0x04F8,0x0520,0x054E,0x0586,0x05C8,0x0616,0x0674,
+0x06E3,0x0766,0x0803,0x08BD,0x099A,0x0AA1,0x0BDA,0x0D4D,
+0x0F07,0x1113,0x1383,0x1668,0x19D8,0x1DEF,0x22CB,0x2892,
+0x2F6F,0x3797,0x414A,0x4CD0,0x5A82,0x6AC9,0x7E21,0x9520,
+/* A:00 B:0d */
+0x05E2,0x0603,0x062B,0x0659,0x0691,0x06D2,0x0721,0x077E,
+0x07EC,0x086F,0x090B,0x09C5,0x0AA1,0x0BA7,0x0CDF,0x0E51,
+0x1008,0x1213,0x1480,0x1763,0x1AD0,0x1EE3,0x23BB,0x297C,
+0x3053,0x3874,0x421D,0x4D99,0x5B3E,0x6B76,0x7EBD,0x95A6,
+/* A:00 B:0e */
+0x0720,0x0741,0x0768,0x0796,0x07CE,0x080F,0x085D,0x08B9,
+0x0927,0x09AA,0x0A46,0x0AFE,0x0BDA,0x0CDF,0x0E15,0x0F85,
+0x113B,0x1343,0x15AE,0x188D,0x1BF7,0x2005,0x24D8,0x2A92,
+0x3162,0x397A,0x4318,0x4E87,0x5C1E,0x6C44,0x7F75,0x9645,
+/* A:00 B:0f */
+0x089A,0x08BA,0x08E1,0x090F,0x0946,0x0987,0x09D5,0x0A31,
+0x0A9E,0x0B20,0x0BBB,0x0C73,0x0D4D,0x0E51,0x0F85,0x10F4,
+0x12A7,0x14AD,0x1714,0x19F0,0x1D55,0x215E,0x262A,0x2BDD,
+0x32A4,0x3AB1,0x4443,0x4FA3,0x5D28,0x6D39,0x8051,0x9703,
+/* A:00 B:10 */
+0x0A5B,0x0A7B,0x0AA2,0x0ACF,0x0B06,0x0B47,0x0B94,0x0BEF,
+0x0C5C,0x0CDD,0x0D77,0x0E2E,0x0F07,0x1008,0x113B,0x12A7,
+0x1458,0x165B,0x18BF,0x1B95,0x1EF5,0x22F8,0x27BD,0x2D67,
+0x3423,0x3C23,0x45A6,0x50F4,0x5E64,0x6E5B,0x8156,0x97E4,
+/* A:00 B:11 */
+0x0C70,0x0C90,0x0CB6,0x0CE4,0x0D1A,0x0D5A,0x0DA7,0x0E02,
+0x0E6E,0x0EEE,0x0F86,0x103C,0x1113,0x1213,0x1343,0x14AD,
+0x165B,0x185A,0x1AB9,0x1D8A,0x20E4,0x24DF,0x299B,0x2F3A,
+0x35EA,0x3DDB,0x474C,0x5285,0x5FDB,0x6FB5,0x828B,0x98EF,
+/* A:00 B:12 */
+0x0EEA,0x0F0A,0x0F30,0x0F5D,0x0F93,0x0FD2,0x101E,0x1078,
+0x10E3,0x1162,0x11F9,0x12AD,0x1383,0x1480,0x15AE,0x1714,
+0x18BF,0x1AB9,0x1D13,0x1FDE,0x2330,0x2722,0x2BD3,0x3166,
+0x3806,0x3FE6,0x4942,0x5461,0x6199,0x7150,0x83FC,0x9A2D,
+/* A:00 B:13 */
+0x11DB,0x11FB,0x1220,0x124D,0x1282,0x12C1,0x130C,0x1365,
+0x13CF,0x144D,0x14E3,0x1594,0x1668,0x1763,0x188D,0x19F0,
+0x1B95,0x1D8A,0x1FDE,0x22A2,0x25EB,0x29D2,0x2E76,0x33FB,
+0x3A89,0x4253,0x4B96,0x5697,0x63AC,0x7338,0x85B2,0x9BA7,
+/* A:00 B:14 */
+0x155B,0x157A,0x159F,0x15CB,0x15FF,0x163E,0x1688,0x16E0,
+0x1748,0x17C5,0x1858,0x1908,0x19D8,0x1AD0,0x1BF7,0x1D55,
+0x1EF5,0x20E4,0x2330,0x25EB,0x2929,0x2D04,0x3199,0x370B,
+0x3D84,0x4536,0x4E5A,0x5938,0x6622,0x757C,0x87BA,0x9D68,
+/* A:00 B:15 */
+0x1983,0x19A2,0x19C6,0x19F2,0x1A25,0x1A63,0x1AAB,0x1B02,
+0x1B69,0x1BE3,0x1C75,0x1D22,0x1DEF,0x1EE3,0x2005,0x215E,
+0x22F8,0x24DF,0x2722,0x29D2,0x2D04,0x30D0,0x3553,0x3AB0,
+0x4110,0x48A3,0x51A4,0x5C58,0x6910,0x782D,0x8A24,0x9F7E,
+/* A:00 B:16 */
+0x1E74,0x1E92,0x1EB6,0x1EE0,0x1F13,0x1F4F,0x1F97,0x1FEC,
+0x2051,0x20C9,0x2158,0x2201,0x22CB,0x23BB,0x24D8,0x262A,
+0x27BD,0x299B,0x2BD3,0x2E76,0x3199,0x3553,0x39C1,0x3F05,
+0x4547,0x4CB7,0x558D,0x600E,0x6C8A,0x7B61,0x8D03,0xA1F8,
+/* A:00 B:17 */
+0x2453,0x2471,0x2494,0x24BD,0x24EF,0x252A,0x2570,0x25C3,
+0x2626,0x269B,0x2727,0x27CC,0x2892,0x297C,0x2A92,0x2BDD,
+0x2D67,0x2F3A,0x3166,0x33FB,0x370B,0x3AB0,0x3F05,0x442B,
+0x4A49,0x518E,0x5A33,0x6478,0x70AD,0x7F2E,0x906C,0xA4EA,
+/* A:00 B:18 */
+0x2B4E,0x2B6A,0x2B8D,0x2BB5,0x2BE5,0x2C1E,0x2C63,0x2CB3,
+0x2D14,0x2D86,0x2E0E,0x2EAF,0x2F6F,0x3053,0x3162,0x32A4,
+0x3423,0x35EA,0x3806,0x3A89,0x3D84,0x4110,0x4547,0x4A49,
+0x503D,0x5750,0x5FB8,0x69B6,0x7597,0x83B4,0x947B,0xA86B,
+/* A:00 B:19 */
+0x3399,0x33B5,0x33D6,0x33FD,0x342C,0x3463,0x34A5,0x34F3,
+0x3550,0x35BF,0x3642,0x36DE,0x3797,0x3874,0x397A,0x3AB1,
+0x3C23,0x3DDB,0x3FE6,0x4253,0x4536,0x48A3,0x4CB7,0x518E,
+0x5750,0x5E27,0x6648,0x6FF2,0x7B6E,0x8914,0x994C,0xAC94,
+/* A:00 B:1a */
+0x3D75,0x3D8F,0x3DAF,0x3DD5,0x3E01,0x3E37,0x3E76,0x3EC1,
+0x3F1A,0x3F84,0x4002,0x4098,0x414A,0x421D,0x4318,0x4443,
+0x45A6,0x474C,0x4942,0x4B96,0x4E5A,0x51A4,0x558D,0x5A33,
+0x5FB8,0x6648,0x6E15,0x775A,0x825E,0x8F77,0x9F07,0xB186,
+/* A:00 B:1b */
+0x492C,0x4946,0x4964,0x4987,0x49B2,0x49E4,0x4A20,0x4A67,
+0x4ABC,0x4B21,0x4B98,0x4C27,0x4CD0,0x4D99,0x4E87,0x4FA3,
+0x50F4,0x5285,0x5461,0x5697,0x5938,0x5C58,0x600E,0x6478,
+0x69B6,0x6FF2,0x775A,0x8028,0x8A9E,0x970E,0xA5D5,0xB766,
+/* A:00 B:1c */
+0x5719,0x5731,0x574D,0x576E,0x5796,0x57C5,0x57FE,0x5840,
+0x5890,0x58EE,0x595E,0x59E3,0x5A82,0x5B3E,0x5C1E,0x5D28,
+0x5E64,0x5FDB,0x6199,0x63AC,0x6622,0x6910,0x6C8A,0x70AD,
+0x7597,0x7B6E,0x825E,0x8A9E,0x946C,0xA013,0xADEC,0xBE62,
+/* A:00 B:1d */
+0x67A6,0x67BC,0x67D6,0x67F4,0x6819,0x6844,0x6878,0x68B6,
+0x68FF,0x6955,0x69BD,0x6A37,0x6AC9,0x6B76,0x6C44,0x6D39,
+0x6E5B,0x6FB5,0x7150,0x7338,0x757C,0x782D,0x7B61,0x7F2E,
+0x83B4,0x8914,0x8F77,0x970E,0xA013,0xAACC,0xB78A,0xC6AF,
+/* A:00 B:1e */
+0x7B51,0x7B65,0x7B7C,0x7B98,0x7BB8,0x7BE0,0x7C0E,0x7C45,
+0x7C86,0x7CD4,0x7D31,0x7D9F,0x7E21,0x7EBD,0x7F75,0x8051,
+0x8156,0x828B,0x83FC,0x85B2,0x87BA,0x8A24,0x8D03,0x906C,
+0x947B,0x994C,0x9F07,0xA5D5,0xADEC,0xB78A,0xC2F8,0xD08D,
+/* A:00 B:1f */
+0x92B2,0x92C3,0x92D7,0x92EF,0x930B,0x932D,0x9355,0x9384,
+0x93BD,0x9400,0x9450,0x94AF,0x9520,0x95A6,0x9645,0x9703,
+0x97E4,0x98EF,0x9A2D,0x9BA7,0x9D68,0x9F7E,0xA1F8,0xA4EA,
+0xA86B,0xAC94,0xB186,0xB766,0xBE62,0xC6AF,0xD08D,0xDC47,
+/* A: 968D89C0 */
+/* A:01 B:00 */
+0x0021,0x0043,0x006B,0x009A,0x00D3,0x0116,0x0166,0x01C4,
+0x0235,0x02BB,0x035A,0x0417,0x04F8,0x0603,0x0741,0x08BA,
+0x0A7B,0x0C90,0x0F0A,0x11FB,0x157A,0x19A2,0x1E92,0x2471,
+0x2B6A,0x33B5,0x3D8F,0x4946,0x5731,0x67BC,0x7B65,0x92C3,
+/* A:01 B:01 */
+0x0043,0x0064,0x008C,0x00BC,0x00F4,0x0137,0x0187,0x01E6,
+0x0257,0x02DC,0x037B,0x0439,0x0519,0x0624,0x0762,0x08DB,
+0x0A9B,0x0CB0,0x0F2A,0x121A,0x1599,0x19C0,0x1EB0,0x248E,
+0x2B87,0x33D1,0x3DAA,0x495F,0x5748,0x67D1,0x7B78,0x92D4,
+/* A:01 B:02 */
+0x006B,0x008C,0x00B4,0x00E4,0x011C,0x015F,0x01AF,0x020E,
+0x027E,0x0304,0x03A3,0x0460,0x0541,0x064C,0x0789,0x0902,
+0x0AC2,0x0CD7,0x0F50,0x1240,0x15BE,0x19E5,0x1ED4,0x24B1,
+0x2BA9,0x33F2,0x3DCA,0x497D,0x5765,0x67EB,0x7B90,0x92E8,
+/* A:01 B:03 */
+0x009A,0x00BC,0x00E4,0x0113,0x014C,0x018F,0x01DE,0x023D,
+0x02AD,0x0333,0x03D2,0x048F,0x056F,0x067A,0x07B7,0x0930,
+0x0AF0,0x0D04,0x0F7D,0x126D,0x15EA,0x1A10,0x1EFF,0x24DB,
+0x2BD2,0x3419,0x3DEF,0x49A1,0x5786,0x680A,0x7BAB,0x9300,
+/* A:01 B:04 */
+0x00D3,0x00F4,0x011C,0x014C,0x0184,0x01C7,0x0216,0x0275,
+0x02E5,0x036B,0x040A,0x04C7,0x05A7,0x06B1,0x07EE,0x0967,
+0x0B26,0x0D3A,0x0FB2,0x12A2,0x161F,0x1A44,0x1F31,0x250C,
+0x2C02,0x3447,0x3E1C,0x49CB,0x57AE,0x682F,0x7BCC,0x931C,
+/* A:01 B:05 */
+0x0116,0x0137,0x015F,0x018F,0x01C7,0x020A,0x0259,0x02B8,
+0x0328,0x03AE,0x044C,0x0509,0x05E9,0x06F3,0x0830,0x09A8,
+0x0B67,0x0D7B,0x0FF2,0x12E1,0x165D,0x1A81,0x1F6D,0x2547,
+0x2C3B,0x347F,0x3E51,0x49FD,0x57DD,0x685A,0x7BF3,0x933E,
+/* A:01 B:06 */
+0x0166,0x0187,0x01AF,0x01DE,0x0216,0x0259,0x02A9,0x0307,
+0x0377,0x03FD,0x049B,0x0558,0x0637,0x0741,0x087E,0x09F5,
+0x0BB4,0x0DC7,0x103E,0x132C,0x16A7,0x1ACA,0x1FB5,0x258D,
+0x2C7F,0x34C0,0x3E90,0x4A39,0x5815,0x688E,0x7C21,0x9366,
+/* A:01 B:07 */
+0x01C4,0x01E6,0x020E,0x023D,0x0275,0x02B8,0x0307,0x0365,
+0x03D5,0x045B,0x04F9,0x05B5,0x0695,0x079E,0x08DA,0x0A51,
+0x0C10,0x0E22,0x1098,0x1385,0x16FF,0x1B21,0x200A,0x25E0,
+0x2CD0,0x350F,0x3EDB,0x4A81,0x5858,0x68CB,0x7C58,0x9395,
+/* A:01 B:08 */
+0x0235,0x0257,0x027E,0x02AD,0x02E5,0x0328,0x0377,0x03D5,
+0x0445,0x04CA,0x0568,0x0624,0x0703,0x080D,0x0948,0x0ABF,
+0x0C7C,0x0E8E,0x1103,0x13EF,0x1767,0x1B88,0x206F,0x2643,
+0x2D30,0x356C,0x3F34,0x4AD5,0x58A7,0x6914,0x7C9A,0x93CE,
+/* A:01 B:09 */
+0x02BB,0x02DC,0x0304,0x0333,0x036B,0x03AE,0x03FD,0x045B,
+0x04CA,0x054F,0x05ED,0x06A8,0x0787,0x0890,0x09CB,0x0B41,
+0x0CFD,0x0F0E,0x1182,0x146C,0x17E3,0x1C02,0x20E7,0x26B8,
+0x2DA2,0x35DA,0x3F9E,0x4B3A,0x5906,0x696B,0x7CE8,0x9411,
+/* A:01 B:0a */
+0x035A,0x037B,0x03A3,0x03D2,0x040A,0x044C,0x049B,0x04F9,
+0x0568,0x05ED,0x068A,0x0745,0x0824,0x092C,0x0A66,0x0BDB,
+0x0D97,0x0FA6,0x1219,0x1502,0x1877,0x1C93,0x2176,0x2744,
+0x2E2A,0x365D,0x401C,0x4BB1,0x5976,0x69D2,0x7D44,0x9461,
+/* A:01 B:0b */
+0x0417,0x0439,0x0460,0x048F,0x04C7,0x0509,0x0558,0x05B5,
+0x0624,0x06A8,0x0745,0x0800,0x08DE,0x09E5,0x0B1F,0x0C93,
+0x0E4E,0x105C,0x12CD,0x15B4,0x1927,0x1D40,0x221F,0x27EA,
+0x2ECB,0x36F9,0x40B2,0x4C40,0x59FB,0x6A4D,0x7DB2,0x94BF,
+/* A:01 B:0c */
+0x04F8,0x0519,0x0541,0x056F,0x05A7,0x05E9,0x0637,0x0695,
+0x0703,0x0787,0x0824,0x08DE,0x09BB,0x0AC2,0x0BFA,0x0D6D,
+0x0F26,0x1133,0x13A2,0x1687,0x19F7,0x1E0D,0x22E9,0x28AF,
+0x2F8B,0x37B3,0x4164,0x4CE9,0x5A99,0x6ADE,0x7E35,0x9530,
+/* A:01 B:0d */
+0x0603,0x0624,0x064C,0x067A,0x06B1,0x06F3,0x0741,0x079E,
+0x080D,0x0890,0x092C,0x09E5,0x0AC2,0x0BC8,0x0CFF,0x0E71,
+0x1028,0x1233,0x14A0,0x1782,0x1AEF,0x1F01,0x23D8,0x2999,
+0x306F,0x388F,0x4237,0x4DB1,0x5B55,0x6B8B,0x7ED0,0x95B6,
+/* A:01 B:0e */
+0x0741,0x0762,0x0789,0x07B7,0x07EE,0x0830,0x087E,0x08DA,
+0x0948,0x09CB,0x0A66,0x0B1F,0x0BFA,0x0CFF,0x0E35,0x0FA5,
+0x115B,0x1363,0x15CD,0x18AC,0x1C15,0x2023,0x24F5,0x2AAF,
+0x317E,0x3995,0x4332,0x4EA0,0x5C35,0x6C59,0x7F88,0x9656,
+/* A:01 B:0f */
+0x08BA,0x08DB,0x0902,0x0930,0x0967,0x09A8,0x09F5,0x0A51,
+0x0ABF,0x0B41,0x0BDB,0x0C93,0x0D6D,0x0E71,0x0FA5,0x1113,
+0x12C7,0x14CC,0x1734,0x1A0F,0x1D73,0x217C,0x2647,0x2BFA,
+0x32C0,0x3ACC,0x445D,0x4FBC,0x5D3F,0x6D4E,0x8064,0x9713,
+/* A:01 B:10 */
+0x0A7B,0x0A9B,0x0AC2,0x0AF0,0x0B26,0x0B67,0x0BB4,0x0C10,
+0x0C7C,0x0CFD,0x0D97,0x0E4E,0x0F26,0x1028,0x115B,0x12C7,
+0x1478,0x167A,0x18DD,0x1BB4,0x1F13,0x2316,0x27DA,0x2D83,
+0x343E,0x3C3E,0x45C0,0x510D,0x5E7A,0x6E70,0x8168,0x97F4,
+/* A:01 B:11 */
+0x0C90,0x0CB0,0x0CD7,0x0D04,0x0D3A,0x0D7B,0x0DC7,0x0E22,
+0x0E8E,0x0F0E,0x0FA6,0x105C,0x1133,0x1233,0x1363,0x14CC,
+0x167A,0x1879,0x1AD7,0x1DA9,0x2102,0x24FD,0x29B8,0x2F57,
+0x3605,0x3DF6,0x4766,0x529D,0x5FF2,0x6FCA,0x829E,0x98FF,
+/* A:01 B:12 */
+0x0F0A,0x0F2A,0x0F50,0x0F7D,0x0FB2,0x0FF2,0x103E,0x1098,
+0x1103,0x1182,0x1219,0x12CD,0x13A2,0x14A0,0x15CD,0x1734,
+0x18DD,0x1AD7,0x1D31,0x1FFC,0x234E,0x273F,0x2BF0,0x3182,
+0x3821,0x4000,0x495B,0x5479,0x61B0,0x7164,0x840E,0x9A3D,
+/* A:01 B:13 */
+0x11FB,0x121A,0x1240,0x126D,0x12A2,0x12E1,0x132C,0x1385,
+0x13EF,0x146C,0x1502,0x15B4,0x1687,0x1782,0x18AC,0x1A0F,
+0x1BB4,0x1DA9,0x1FFC,0x22BF,0x2608,0x29EF,0x2E93,0x3416,
+0x3AA4,0x426D,0x4BAF,0x56AF,0x63C2,0x734C,0x85C4,0x9BB7,
+/* A:01 B:14 */
+0x157A,0x1599,0x15BE,0x15EA,0x161F,0x165D,0x16A7,0x16FF,
+0x1767,0x17E3,0x1877,0x1927,0x19F7,0x1AEF,0x1C15,0x1D73,
+0x1F13,0x2102,0x234E,0x2608,0x2946,0x2D21,0x31B5,0x3727,
+0x3D9F,0x4550,0x4E73,0x5950,0x6638,0x7590,0x87CC,0x9D78,
+/* A:01 B:15 */
+0x19A2,0x19C0,0x19E5,0x1A10,0x1A44,0x1A81,0x1ACA,0x1B21,
+0x1B88,0x1C02,0x1C93,0x1D40,0x1E0D,0x1F01,0x2023,0x217C,
+0x2316,0x24FD,0x273F,0x29EF,0x2D21,0x30EC,0x356F,0x3ACB,
+0x412A,0x48BD,0x51BD,0x5C6F,0x6925,0x7841,0x8A36,0x9F8D,
+/* A:01 B:16 */
+0x1E92,0x1EB0,0x1ED4,0x1EFF,0x1F31,0x1F6D,0x1FB5,0x200A,
+0x206F,0x20E7,0x2176,0x221F,0x22E9,0x23D8,0x24F5,0x2647,
+0x27DA,0x29B8,0x2BF0,0x2E93,0x31B5,0x356F,0x39DC,0x3F20,
+0x4561,0x4CCF,0x55A5,0x6025,0x6C9F,0x7B74,0x8D15,0xA207,
+/* A:01 B:17 */
+0x2471,0x248E,0x24B1,0x24DB,0x250C,0x2547,0x258D,0x25E0,
+0x2643,0x26B8,0x2744,0x27EA,0x28AF,0x2999,0x2AAF,0x2BFA,
+0x2D83,0x2F57,0x3182,0x3416,0x3727,0x3ACB,0x3F20,0x4445,
+0x4A62,0x51A7,0x5A4A,0x648E,0x70C1,0x7F42,0x907E,0xA4F9,
+/* A:01 B:18 */
+0x2B6A,0x2B87,0x2BA9,0x2BD2,0x2C02,0x2C3B,0x2C7F,0x2CD0,
+0x2D30,0x2DA2,0x2E2A,0x2ECB,0x2F8B,0x306F,0x317E,0x32C0,
+0x343E,0x3605,0x3821,0x3AA4,0x3D9F,0x412A,0x4561,0x4A62,
+0x5055,0x5767,0x5FCF,0x69CC,0x75AB,0x83C6,0x948B,0xA879,
+/* A:01 B:19 */
+0x33B5,0x33D1,0x33F2,0x3419,0x3447,0x347F,0x34C0,0x350F,
+0x356C,0x35DA,0x365D,0x36F9,0x37B3,0x388F,0x3995,0x3ACC,
+0x3C3E,0x3DF6,0x4000,0x426D,0x4550,0x48BD,0x4CCF,0x51A7,
+0x5767,0x5E3E,0x665E,0x7007,0x7B81,0x8926,0x995C,0xACA2,
+/* A:01 B:1a */
+0x3D8F,0x3DAA,0x3DCA,0x3DEF,0x3E1C,0x3E51,0x3E90,0x3EDB,
+0x3F34,0x3F9E,0x401C,0x40B2,0x4164,0x4237,0x4332,0x445D,
+0x45C0,0x4766,0x495B,0x4BAF,0x4E73,0x51BD,0x55A5,0x5A4A,
+0x5FCF,0x665E,0x6E2A,0x776E,0x8271,0x8F88,0x9F16,0xB193,
+/* A:01 B:1b */
+0x4946,0x495F,0x497D,0x49A1,0x49CB,0x49FD,0x4A39,0x4A81,
+0x4AD5,0x4B3A,0x4BB1,0x4C40,0x4CE9,0x4DB1,0x4EA0,0x4FBC,
+0x510D,0x529D,0x5479,0x56AF,0x5950,0x5C6F,0x6025,0x648E,
+0x69CC,0x7007,0x776E,0x803B,0x8AB0,0x971E,0xA5E4,0xB773,
+/* A:01 B:1c */
+0x5731,0x5748,0x5765,0x5786,0x57AE,0x57DD,0x5815,0x5858,
+0x58A7,0x5906,0x5976,0x59FB,0x5A99,0x5B55,0x5C35,0x5D3F,
+0x5E7A,0x5FF2,0x61B0,0x63C2,0x6638,0x6925,0x6C9F,0x70C1,
+0x75AB,0x7B81,0x8271,0x8AB0,0x947D,0xA022,0xADFA,0xBE6E,
+/* A:01 B:1d */
+0x67BC,0x67D1,0x67EB,0x680A,0x682F,0x685A,0x688E,0x68CB,
+0x6914,0x696B,0x69D2,0x6A4D,0x6ADE,0x6B8B,0x6C59,0x6D4E,
+0x6E70,0x6FCA,0x7164,0x734C,0x7590,0x7841,0x7B74,0x7F42,
+0x83C6,0x8926,0x8F88,0x971E,0xA022,0xAADA,0xB797,0xC6BA,
+/* A:01 B:1e */
+0x7B65,0x7B78,0x7B90,0x7BAB,0x7BCC,0x7BF3,0x7C21,0x7C58,
+0x7C9A,0x7CE8,0x7D44,0x7DB2,0x7E35,0x7ED0,0x7F88,0x8064,
+0x8168,0x829E,0x840E,0x85C4,0x87CC,0x8A36,0x8D15,0x907E,
+0x948B,0x995C,0x9F16,0xA5E4,0xADFA,0xB797,0xC303,0xD097,
+/* A:01 B:1f */
+0x92C3,0x92D4,0x92E8,0x9300,0x931C,0x933E,0x9366,0x9395,
+0x93CE,0x9411,0x9461,0x94BF,0x9530,0x95B6,0x9656,0x9713,
+0x97F4,0x98FF,0x9A3D,0x9BB7,0x9D78,0x9F8D,0xA207,0xA4F9,
+0xA879,0xACA2,0xB193,0xB773,0xBE6E,0xC6BA,0xD097,0xDC4F,
+/* A: 968D89C0 */
+/* A:02 B:00 */
+0x0049,0x006B,0x0093,0x00C2,0x00FB,0x013E,0x018D,0x01EC,
+0x025D,0x02E3,0x0382,0x043F,0x0520,0x062B,0x0768,0x08E1,
+0x0AA2,0x0CB6,0x0F30,0x1220,0x159F,0x19C6,0x1EB6,0x2494,
+0x2B8D,0x33D6,0x3DAF,0x4964,0x574D,0x67D6,0x7B7C,0x92D7,
+/* A:02 B:01 */
+0x006B,0x008C,0x00B4,0x00E4,0x011C,0x015F,0x01AF,0x020E,
+0x027E,0x0304,0x03A3,0x0460,0x0541,0x064C,0x0789,0x0902,
+0x0AC2,0x0CD7,0x0F50,0x1240,0x15BE,0x19E5,0x1ED4,0x24B1,
+0x2BA9,0x33F2,0x3DCA,0x497D,0x5765,0x67EB,0x7B90,0x92E8,
+/* A:02 B:02 */
+0x0093,0x00B4,0x00DC,0x010C,0x0144,0x0187,0x01D7,0x0235,
+0x02A6,0x032C,0x03CB,0x0487,0x0568,0x0673,0x07B0,0x0929,
+0x0AE9,0x0CFD,0x0F76,0x1266,0x15E3,0x1A09,0x1EF8,0x24D4,
+0x2BCB,0x3413,0x3DE9,0x499B,0x5781,0x6805,0x7BA7,0x92FC,
+/* A:02 B:03 */
+0x00C2,0x00E4,0x010C,0x013B,0x0173,0x01B6,0x0206,0x0265,
+0x02D5,0x035B,0x03FA,0x04B6,0x0597,0x06A1,0x07DE,0x0957,
+0x0B16,0x0D2A,0x0FA3,0x1292,0x160F,0x1A35,0x1F22,0x24FE,
+0x2BF4,0x343A,0x3E0F,0x49BF,0x57A2,0x6824,0x7BC2,0x9314,
+/* A:02 B:04 */
+0x00FB,0x011C,0x0144,0x0173,0x01AC,0x01EF,0x023E,0x029D,
+0x030D,0x0393,0x0431,0x04EE,0x05CE,0x06D9,0x0815,0x098E,
+0x0B4D,0x0D60,0x0FD8,0x12C7,0x1644,0x1A68,0x1F55,0x252F,
+0x2C24,0x3468,0x3E3C,0x49E9,0x57CA,0x6849,0x7BE3,0x9330,
+/* A:02 B:05 */
+0x013E,0x015F,0x0187,0x01B6,0x01EF,0x0232,0x0281,0x02DF,
+0x0350,0x03D5,0x0474,0x0530,0x0610,0x071A,0x0857,0x09CF,
+0x0B8E,0x0DA1,0x1018,0x1306,0x1682,0x1AA6,0x1F91,0x256A,
+0x2C5D,0x34A0,0x3E71,0x4A1B,0x57F9,0x6874,0x7C0A,0x9352,
+/* A:02 B:06 */
+0x018D,0x01AF,0x01D7,0x0206,0x023E,0x0281,0x02D0,0x032F,
+0x039F,0x0424,0x04C3,0x057F,0x065F,0x0768,0x08A4,0x0A1C,
+0x0BDB,0x0DED,0x1064,0x1351,0x16CC,0x1AEE,0x1FD9,0x25B0,
+0x2CA1,0x34E1,0x3EB0,0x4A57,0x5831,0x68A8,0x7C38,0x937A,
+/* A:02 B:07 */
+0x01EC,0x020E,0x0235,0x0265,0x029D,0x02DF,0x032F,0x038D,
+0x03FD,0x0482,0x0520,0x05DC,0x06BC,0x07C5,0x0901,0x0A78,
+0x0C36,0x0E48,0x10BE,0x13AA,0x1724,0x1B45,0x202E,0x2603,
+0x2CF2,0x352F,0x3EFB,0x4A9E,0x5874,0x68E5,0x7C70,0x93A9,
+/* A:02 B:08 */
+0x025D,0x027E,0x02A6,0x02D5,0x030D,0x0350,0x039F,0x03FD,
+0x046D,0x04F2,0x0590,0x064B,0x072B,0x0834,0x096F,0x0AE5,
+0x0CA3,0x0EB4,0x1129,0x1414,0x178C,0x1BAC,0x2092,0x2666,
+0x2D52,0x358C,0x3F54,0x4AF3,0x58C3,0x692E,0x7CB1,0x93E2,
+/* A:02 B:09 */
+0x02E3,0x0304,0x032C,0x035B,0x0393,0x03D5,0x0424,0x0482,
+0x04F2,0x0576,0x0614,0x06CF,0x07AE,0x08B7,0x09F1,0x0B67,
+0x0D24,0x0F34,0x11A8,0x1492,0x1808,0x1C26,0x210A,0x26DB,
+0x2DC4,0x35FB,0x3FBE,0x4B58,0x5921,0x6985,0x7CFF,0x9425,
+/* A:02 B:0a */
+0x0382,0x03A3,0x03CB,0x03FA,0x0431,0x0474,0x04C3,0x0520,
+0x0590,0x0614,0x06B1,0x076C,0x084B,0x0953,0x0A8D,0x0C02,
+0x0DBD,0x0FCC,0x123F,0x1527,0x189C,0x1CB7,0x2199,0x2766,
+0x2E4C,0x367E,0x403C,0x4BCF,0x5991,0x69EC,0x7D5B,0x9474,
+/* A:02 B:0b */
+0x043F,0x0460,0x0487,0x04B6,0x04EE,0x0530,0x057F,0x05DC,
+0x064B,0x06CF,0x076C,0x0827,0x0905,0x0A0C,0x0B45,0x0CB9,
+0x0E74,0x1081,0x12F2,0x15D9,0x194B,0x1D64,0x2243,0x280C,
+0x2EED,0x371A,0x40D1,0x4C5D,0x5A17,0x6A66,0x7DC9,0x94D3,
+/* A:02 B:0c */
+0x0520,0x0541,0x0568,0x0597,0x05CE,0x0610,0x065F,0x06BC,
+0x072B,0x07AE,0x084B,0x0905,0x09E2,0x0AE8,0x0C20,0x0D93,
+0x0F4C,0x1159,0x13C7,0x16AC,0x1A1C,0x1E31,0x230C,0x28D1,
+0x2FAD,0x37D3,0x4183,0x4D06,0x5AB5,0x6AF8,0x7E4C,0x9544,
+/* A:02 B:0d */
+0x062B,0x064C,0x0673,0x06A1,0x06D9,0x071A,0x0768,0x07C5,
+0x0834,0x08B7,0x0953,0x0A0C,0x0AE8,0x0BEE,0x0D25,0x0E97,
+0x104E,0x1258,0x14C5,0x17A7,0x1B13,0x1F25,0x23FB,0x29BB,
+0x3090,0x38AF,0x4256,0x4DCF,0x5B71,0x6BA5,0x7EE7,0x95CA,
+/* A:02 B:0e */
+0x0768,0x0789,0x07B0,0x07DE,0x0815,0x0857,0x08A4,0x0901,
+0x096F,0x09F1,0x0A8D,0x0B45,0x0C20,0x0D25,0x0E5B,0x0FCB,
+0x1180,0x1388,0x15F2,0x18D1,0x1C3A,0x2047,0x2518,0x2AD1,
+0x319F,0x39B5,0x4351,0x4EBD,0x5C50,0x6C72,0x7F9F,0x9669,
+/* A:02 B:0f */
+0x08E1,0x0902,0x0929,0x0957,0x098E,0x09CF,0x0A1C,0x0A78,
+0x0AE5,0x0B67,0x0C02,0x0CB9,0x0D93,0x0E97,0x0FCB,0x1139,
+0x12EC,0x14F2,0x1758,0x1A33,0x1D97,0x21A0,0x266A,0x2C1C,
+0x32E1,0x3AEC,0x447C,0x4FD9,0x5D5A,0x6D67,0x807A,0x9726,
+/* A:02 B:10 */
+0x0AA2,0x0AC2,0x0AE9,0x0B16,0x0B4D,0x0B8E,0x0BDB,0x0C36,
+0x0CA3,0x0D24,0x0DBD,0x0E74,0x0F4C,0x104E,0x1180,0x12EC,
+0x149D,0x169F,0x1902,0x1BD8,0x1F37,0x2339,0x27FC,0x2DA5,
+0x345F,0x3C5E,0x45DE,0x512A,0x5E96,0x6E89,0x817F,0x9807,
+/* A:02 B:11 */
+0x0CB6,0x0CD7,0x0CFD,0x0D2A,0x0D60,0x0DA1,0x0DED,0x0E48,
+0x0EB4,0x0F34,0x0FCC,0x1081,0x1159,0x1258,0x1388,0x14F2,
+0x169F,0x189D,0x1AFC,0x1DCD,0x2125,0x2520,0x29DA,0x2F78,
+0x3626,0x3E15,0x4784,0x52BA,0x600D,0x6FE2,0x82B4,0x9912,
+/* A:02 B:12 */
+0x0F30,0x0F50,0x0F76,0x0FA3,0x0FD8,0x1018,0x1064,0x10BE,
+0x1129,0x11A8,0x123F,0x12F2,0x13C7,0x14C5,0x15F2,0x1758,
+0x1902,0x1AFC,0x1D55,0x2020,0x2371,0x2762,0x2C12,0x31A3,
+0x3842,0x4020,0x4979,0x5496,0x61CB,0x717D,0x8424,0x9A50,
+/* A:02 B:13 */
+0x1220,0x1240,0x1266,0x1292,0x12C7,0x1306,0x1351,0x13AA,
+0x1414,0x1492,0x1527,0x15D9,0x16AC,0x17A7,0x18D1,0x1A33,
+0x1BD8,0x1DCD,0x2020,0x22E3,0x262B,0x2A12,0x2EB5,0x3437,
+0x3AC4,0x428C,0x4BCD,0x56CB,0x63DD,0x7364,0x85DA,0x9BCA,
+/* A:02 B:14 */
+0x159F,0x15BE,0x15E3,0x160F,0x1644,0x1682,0x16CC,0x1724,
+0x178C,0x1808,0x189C,0x194B,0x1A1C,0x1B13,0x1C3A,0x1D97,
+0x1F37,0x2125,0x2371,0x262B,0x2969,0x2D43,0x31D7,0x3747,
+0x3DBF,0x456E,0x4E90,0x596B,0x6652,0x75A8,0x87E1,0x9D8A,
+/* A:02 B:15 */
+0x19C6,0x19E5,0x1A09,0x1A35,0x1A68,0x1AA6,0x1AEE,0x1B45,
+0x1BAC,0x1C26,0x1CB7,0x1D64,0x1E31,0x1F25,0x2047,0x21A0,
+0x2339,0x2520,0x2762,0x2A12,0x2D43,0x310E,0x3590,0x3AEB,
+0x4149,0x48DB,0x51DA,0x5C8A,0x693F,0x7859,0x8A4B,0x9FA0,
+/* A:02 B:16 */
+0x1EB6,0x1ED4,0x1EF8,0x1F22,0x1F55,0x1F91,0x1FD9,0x202E,
+0x2092,0x210A,0x2199,0x2243,0x230C,0x23FB,0x2518,0x266A,
+0x27FC,0x29DA,0x2C12,0x2EB5,0x31D7,0x3590,0x39FD,0x3F3F,
+0x457F,0x4CED,0x55C1,0x6040,0x6CB9,0x7B8B,0x8D29,0xA219,
+/* A:02 B:17 */
+0x2494,0x24B1,0x24D4,0x24FE,0x252F,0x256A,0x25B0,0x2603,
+0x2666,0x26DB,0x2766,0x280C,0x28D1,0x29BB,0x2AD1,0x2C1C,
+0x2DA5,0x2F78,0x31A3,0x3437,0x3747,0x3AEB,0x3F3F,0x4463,
+0x4A80,0x51C4,0x5A66,0x64A8,0x70DA,0x7F58,0x9092,0xA50B,
+/* A:02 B:18 */
+0x2B8D,0x2BA9,0x2BCB,0x2BF4,0x2C24,0x2C5D,0x2CA1,0x2CF2,
+0x2D52,0x2DC4,0x2E4C,0x2EED,0x2FAD,0x3090,0x319F,0x32E1,
+0x345F,0x3626,0x3842,0x3AC4,0x3DBF,0x4149,0x457F,0x4A80,
+0x5072,0x5783,0x5FEA,0x69E5,0x75C3,0x83DD,0x949F,0xA88A,
+/* A:02 B:19 */
+0x33D6,0x33F2,0x3413,0x343A,0x3468,0x34A0,0x34E1,0x352F,
+0x358C,0x35FB,0x367E,0x371A,0x37D3,0x38AF,0x39B5,0x3AEC,
+0x3C5E,0x3E15,0x4020,0x428C,0x456E,0x48DB,0x4CED,0x51C4,
+0x5783,0x5E59,0x6678,0x701F,0x7B98,0x893B,0x996F,0xACB2,
+/* A:02 B:1a */
+0x3DAF,0x3DCA,0x3DE9,0x3E0F,0x3E3C,0x3E71,0x3EB0,0x3EFB,
+0x3F54,0x3FBE,0x403C,0x40D1,0x4183,0x4256,0x4351,0x447C,
+0x45DE,0x4784,0x4979,0x4BCD,0x4E90,0x51DA,0x55C1,0x5A66,
+0x5FEA,0x6678,0x6E43,0x7786,0x8287,0x8F9C,0x9F28,0xB1A3,
+/* A:02 B:1b */
+0x4964,0x497D,0x499B,0x49BF,0x49E9,0x4A1B,0x4A57,0x4A9E,
+0x4AF3,0x4B58,0x4BCF,0x4C5D,0x4D06,0x4DCF,0x4EBD,0x4FD9,
+0x512A,0x52BA,0x5496,0x56CB,0x596B,0x5C8A,0x6040,0x64A8,
+0x69E5,0x701F,0x7786,0x8051,0x8AC5,0x9731,0xA5F5,0xB782,
+/* A:02 B:1c */
+0x574D,0x5765,0x5781,0x57A2,0x57CA,0x57F9,0x5831,0x5874,
+0x58C3,0x5921,0x5991,0x5A17,0x5AB5,0x5B71,0x5C50,0x5D5A,
+0x5E96,0x600D,0x61CB,0x63DD,0x6652,0x693F,0x6CB9,0x70DA,
+0x75C3,0x7B98,0x8287,0x8AC5,0x9490,0xA035,0xAE0A,0xBE7C,
+/* A:02 B:1d */
+0x67D6,0x67EB,0x6805,0x6824,0x6849,0x6874,0x68A8,0x68E5,
+0x692E,0x6985,0x69EC,0x6A66,0x6AF8,0x6BA5,0x6C72,0x6D67,
+0x6E89,0x6FE2,0x717D,0x7364,0x75A8,0x7859,0x7B8B,0x7F58,
+0x83DD,0x893B,0x8F9C,0x9731,0xA035,0xAAEB,0xB7A6,0xC6C7,
+/* A:02 B:1e */
+0x7B7C,0x7B90,0x7BA7,0x7BC2,0x7BE3,0x7C0A,0x7C38,0x7C70,
+0x7CB1,0x7CFF,0x7D5B,0x7DC9,0x7E4C,0x7EE7,0x7F9F,0x807A,
+0x817F,0x82B4,0x8424,0x85DA,0x87E1,0x8A4B,0x8D29,0x9092,
+0x949F,0x996F,0x9F28,0xA5F5,0xAE0A,0xB7A6,0xC310,0xD0A2,
+/* A:02 B:1f */
+0x92D7,0x92E8,0x92FC,0x9314,0x9330,0x9352,0x937A,0x93A9,
+0x93E2,0x9425,0x9474,0x94D3,0x9544,0x95CA,0x9669,0x9726,
+0x9807,0x9912,0x9A50,0x9BCA,0x9D8A,0x9FA0,0xA219,0xA50B,
+0xA88A,0xACB2,0xB1A3,0xB782,0xBE7C,0xC6C7,0xD0A2,0xDC59,
+/* A: 968D89C0 */
+/* A:03 B:00 */
+0x0079,0x009A,0x00C2,0x00F2,0x012A,0x016D,0x01BD,0x021C,
+0x028C,0x0312,0x03B1,0x046E,0x054E,0x0659,0x0796,0x090F,
+0x0ACF,0x0CE4,0x0F5D,0x124D,0x15CB,0x19F2,0x1EE0,0x24BD,
+0x2BB5,0x33FD,0x3DD5,0x4987,0x576E,0x67F4,0x7B98,0x92EF,
+/* A:03 B:01 */
+0x009A,0x00BC,0x00E4,0x0113,0x014C,0x018F,0x01DE,0x023D,
+0x02AD,0x0333,0x03D2,0x048F,0x056F,0x067A,0x07B7,0x0930,
+0x0AF0,0x0D04,0x0F7D,0x126D,0x15EA,0x1A10,0x1EFF,0x24DB,
+0x2BD2,0x3419,0x3DEF,0x49A1,0x5786,0x680A,0x7BAB,0x9300,
+/* A:03 B:02 */
+0x00C2,0x00E4,0x010C,0x013B,0x0173,0x01B6,0x0206,0x0265,
+0x02D5,0x035B,0x03FA,0x04B6,0x0597,0x06A1,0x07DE,0x0957,
+0x0B16,0x0D2A,0x0FA3,0x1292,0x160F,0x1A35,0x1F22,0x24FE,
+0x2BF4,0x343A,0x3E0F,0x49BF,0x57A2,0x6824,0x7BC2,0x9314,
+/* A:03 B:03 */
+0x00F2,0x0113,0x013B,0x016A,0x01A3,0x01E6,0x0235,0x0294,
+0x0304,0x038A,0x0428,0x04E5,0x05C5,0x06D0,0x080C,0x0985,
+0x0B44,0x0D58,0x0FD0,0x12BF,0x163B,0x1A60,0x1F4D,0x2527,
+0x2C1C,0x3461,0x3E34,0x49E2,0x57C4,0x6843,0x7BDE,0x932B,
+/* A:03 B:04 */
+0x012A,0x014C,0x0173,0x01A3,0x01DB,0x021E,0x026D,0x02CC,
+0x033C,0x03C2,0x0460,0x051D,0x05FD,0x0707,0x0844,0x09BC,
+0x0B7B,0x0D8E,0x1005,0x12F4,0x1670,0x1A94,0x1F7F,0x2559,
+0x2C4C,0x348F,0x3E61,0x4A0D,0x57EB,0x6867,0x7BFF,0x9348,
+/* A:03 B:05 */
+0x016D,0x018F,0x01B6,0x01E6,0x021E,0x0261,0x02B0,0x030F,
+0x037F,0x0404,0x04A3,0x055F,0x063F,0x0749,0x0885,0x09FD,
+0x0BBB,0x0DCE,0x1045,0x1333,0x16AE,0x1AD1,0x1FBC,0x2594,
+0x2C86,0x34C7,0x3E96,0x4A3F,0x581A,0x6893,0x7C26,0x9369,
+/* A:03 B:06 */
+0x01BD,0x01DE,0x0206,0x0235,0x026D,0x02B0,0x0300,0x035E,
+0x03CE,0x0453,0x04F1,0x05AD,0x068D,0x0797,0x08D3,0x0A4A,
+0x0C08,0x0E1A,0x1091,0x137E,0x16F8,0x1B1A,0x2003,0x25D9,
+0x2CC9,0x3508,0x3ED5,0x4A7B,0x5853,0x68C6,0x7C54,0x9391,
+/* A:03 B:07 */
+0x021C,0x023D,0x0265,0x0294,0x02CC,0x030F,0x035E,0x03BC,
+0x042C,0x04B1,0x054F,0x060B,0x06EA,0x07F4,0x092F,0x0AA6,
+0x0C64,0x0E75,0x10EA,0x13D7,0x1750,0x1B70,0x2058,0x262C,
+0x2D1A,0x3556,0x3F20,0x4AC2,0x5895,0x6904,0x7C8B,0x93C1,
+/* A:03 B:08 */
+0x028C,0x02AD,0x02D5,0x0304,0x033C,0x037F,0x03CE,0x042C,
+0x049C,0x0520,0x05BE,0x067A,0x0759,0x0862,0x099D,0x0B13,
+0x0CD0,0x0EE1,0x1155,0x1440,0x17B8,0x1BD7,0x20BD,0x268F,
+0x2D7A,0x35B3,0x3F79,0x4B17,0x58E4,0x694D,0x7CCC,0x93F9,
+/* A:03 B:09 */
+0x0312,0x0333,0x035B,0x038A,0x03C2,0x0404,0x0453,0x04B1,
+0x0520,0x05A5,0x0643,0x06FE,0x07DC,0x08E5,0x0A1F,0x0B95,
+0x0D51,0x0F61,0x11D4,0x14BE,0x1834,0x1C51,0x2135,0x2704,
+0x2DEC,0x3622,0x3FE3,0x4B7B,0x5943,0x69A3,0x7D1A,0x943C,
+/* A:03 B:0a */
+0x03B1,0x03D2,0x03FA,0x0428,0x0460,0x04A3,0x04F1,0x054F,
+0x05BE,0x0643,0x06E0,0x079B,0x0879,0x0981,0x0ABB,0x0C2F,
+0x0DEB,0x0FF9,0x126B,0x1553,0x18C7,0x1CE2,0x21C3,0x2790,
+0x2E74,0x36A5,0x4061,0x4BF2,0x59B3,0x6A0A,0x7D76,0x948C,
+/* A:03 B:0b */
+0x046E,0x048F,0x04B6,0x04E5,0x051D,0x055F,0x05AD,0x060B,
+0x067A,0x06FE,0x079B,0x0855,0x0933,0x0A3A,0x0B73,0x0CE7,
+0x0EA1,0x10AE,0x131F,0x1605,0x1977,0x1D8F,0x226D,0x2835,
+0x2F15,0x3740,0x40F6,0x4C80,0x5A38,0x6A85,0x7DE4,0x94EB,
+/* A:03 B:0c */
+0x054E,0x056F,0x0597,0x05C5,0x05FD,0x063F,0x068D,0x06EA,
+0x0759,0x07DC,0x0879,0x0933,0x0A10,0x0B16,0x0C4E,0x0DC1,
+0x0F7A,0x1185,0x13F4,0x16D8,0x1A47,0x1E5C,0x2336,0x28FA,
+0x2FD5,0x37FA,0x41A8,0x4D29,0x5AD6,0x6B16,0x7E67,0x955B,
+/* A:03 B:0d */
+0x0659,0x067A,0x06A1,0x06D0,0x0707,0x0749,0x0797,0x07F4,
+0x0862,0x08E5,0x0981,0x0A3A,0x0B16,0x0C1C,0x0D52,0x0EC4,
+0x107B,0x1285,0x14F1,0x17D2,0x1B3E,0x1F50,0x2425,0x29E4,
+0x30B8,0x38D6,0x427B,0x4DF2,0x5B92,0x6BC3,0x7F02,0x95E1,
+/* A:03 B:0e */
+0x0796,0x07B7,0x07DE,0x080C,0x0844,0x0885,0x08D3,0x092F,
+0x099D,0x0A1F,0x0ABB,0x0B73,0x0C4E,0x0D52,0x0E88,0x0FF8,
+0x11AD,0x13B5,0x161E,0x18FC,0x1C65,0x2071,0x2542,0x2AFA,
+0x31C7,0x39DB,0x4376,0x4EE0,0x5C71,0x6C90,0x7FBA,0x9680,
+/* A:03 B:0f */
+0x090F,0x0930,0x0957,0x0985,0x09BC,0x09FD,0x0A4A,0x0AA6,
+0x0B13,0x0B95,0x0C2F,0x0CE7,0x0DC1,0x0EC4,0x0FF8,0x1166,
+0x1319,0x151E,0x1784,0x1A5E,0x1DC2,0x21CA,0x2694,0x2C45,
+0x3308,0x3B12,0x44A0,0x4FFB,0x5D7A,0x6D85,0x8095,0x973D,
+/* A:03 B:10 */
+0x0ACF,0x0AF0,0x0B16,0x0B44,0x0B7B,0x0BBB,0x0C08,0x0C64,
+0x0CD0,0x0D51,0x0DEB,0x0EA1,0x0F7A,0x107B,0x11AD,0x1319,
+0x14C9,0x16CB,0x192E,0x1C03,0x1F62,0x2363,0x2825,0x2DCD,
+0x3486,0x3C84,0x4603,0x514C,0x5EB6,0x6EA7,0x8199,0x981E,
+/* A:03 B:11 */
+0x0CE4,0x0D04,0x0D2A,0x0D58,0x0D8E,0x0DCE,0x0E1A,0x0E75,
+0x0EE1,0x0F61,0x0FF9,0x10AE,0x1185,0x1285,0x13B5,0x151E,
+0x16CB,0x18C9,0x1B27,0x1DF7,0x2150,0x2549,0x2A03,0x2FA0,
+0x364D,0x3E3B,0x47A8,0x52DC,0x602D,0x7000,0x82CF,0x9929,
+/* A:03 B:12 */
+0x0F5D,0x0F7D,0x0FA3,0x0FD0,0x1005,0x1045,0x1091,0x10EA,
+0x1155,0x11D4,0x126B,0x131F,0x13F4,0x14F1,0x161E,0x1784,
+0x192E,0x1B27,0x1D80,0x204A,0x239B,0x278B,0x2C3A,0x31CB,
+0x3868,0x4045,0x499D,0x54B8,0x61EA,0x719A,0x843F,0x9A67,
+/* A:03 B:13 */
+0x124D,0x126D,0x1292,0x12BF,0x12F4,0x1333,0x137E,0x13D7,
+0x1440,0x14BE,0x1553,0x1605,0x16D8,0x17D2,0x18FC,0x1A5E,
+0x1C03,0x1DF7,0x204A,0x230D,0x2654,0x2A3A,0x2EDD,0x345E,
+0x3AEA,0x42B1,0x4BF0,0x56ED,0x63FC,0x7381,0x85F4,0x9BE0,
+/* A:03 B:14 */
+0x15CB,0x15EA,0x160F,0x163B,0x1670,0x16AE,0x16F8,0x1750,
+0x17B8,0x1834,0x18C7,0x1977,0x1A47,0x1B3E,0x1C65,0x1DC2,
+0x1F62,0x2150,0x239B,0x2654,0x2991,0x2D6B,0x31FE,0x376E,
+0x3DE4,0x4592,0x4EB3,0x598D,0x6671,0x75C4,0x87FB,0x9DA0,
+/* A:03 B:15 */
+0x19F2,0x1A10,0x1A35,0x1A60,0x1A94,0x1AD1,0x1B1A,0x1B70,
+0x1BD7,0x1C51,0x1CE2,0x1D8F,0x1E5C,0x1F50,0x2071,0x21CA,
+0x2363,0x2549,0x278B,0x2A3A,0x2D6B,0x3135,0x35B7,0x3B11,
+0x416E,0x48FF,0x51FC,0x5CAB,0x695D,0x7875,0x8A64,0x9FB5,
+/* A:03 B:16 */
+0x1EE0,0x1EFF,0x1F22,0x1F4D,0x1F7F,0x1FBC,0x2003,0x2058,
+0x20BD,0x2135,0x21C3,0x226D,0x2336,0x2425,0x2542,0x2694,
+0x2825,0x2A03,0x2C3A,0x2EDD,0x31FE,0x35B7,0x3A23,0x3F64,
+0x45A3,0x4D10,0x55E3,0x6060,0x6CD7,0x7BA7,0x8D42,0xA22F,
+/* A:03 B:17 */
+0x24BD,0x24DB,0x24FE,0x2527,0x2559,0x2594,0x25D9,0x262C,
+0x268F,0x2704,0x2790,0x2835,0x28FA,0x29E4,0x2AFA,0x2C45,
+0x2DCD,0x2FA0,0x31CB,0x345E,0x376E,0x3B11,0x3F64,0x4488,
+0x4AA3,0x51E6,0x5A86,0x64C7,0x70F7,0x7F73,0x90AA,0xA51F,
+/* A:03 B:18 */
+0x2BB5,0x2BD2,0x2BF4,0x2C1C,0x2C4C,0x2C86,0x2CC9,0x2D1A,
+0x2D7A,0x2DEC,0x2E74,0x2F15,0x2FD5,0x30B8,0x31C7,0x3308,
+0x3486,0x364D,0x3868,0x3AEA,0x3DE4,0x416E,0x45A3,0x4AA3,
+0x5095,0x57A5,0x600A,0x6A04,0x75DF,0x83F7,0x94B6,0xA89E,
+/* A:03 B:19 */
+0x33FD,0x3419,0x343A,0x3461,0x348F,0x34C7,0x3508,0x3556,
+0x35B3,0x3622,0x36A5,0x3740,0x37FA,0x38D6,0x39DB,0x3B12,
+0x3C84,0x3E3B,0x4045,0x42B1,0x4592,0x48FF,0x4D10,0x51E6,
+0x57A5,0x5E79,0x6697,0x703D,0x7BB4,0x8954,0x9986,0xACC5,
+/* A:03 B:1a */
+0x3DD5,0x3DEF,0x3E0F,0x3E34,0x3E61,0x3E96,0x3ED5,0x3F20,
+0x3F79,0x3FE3,0x4061,0x40F6,0x41A8,0x427B,0x4376,0x44A0,
+0x4603,0x47A8,0x499D,0x4BF0,0x4EB3,0x51FC,0x55E3,0x5A86,
+0x600A,0x6697,0x6E61,0x77A2,0x82A2,0x8FB4,0x9F3E,0xB1B5,
+/* A:03 B:1b */
+0x4987,0x49A1,0x49BF,0x49E2,0x4A0D,0x4A3F,0x4A7B,0x4AC2,
+0x4B17,0x4B7B,0x4BF2,0x4C80,0x4D29,0x4DF2,0x4EE0,0x4FFB,
+0x514C,0x52DC,0x54B8,0x56ED,0x598D,0x5CAB,0x6060,0x64C7,
+0x6A04,0x703D,0x77A2,0x806C,0x8ADE,0x9748,0xA60A,0xB793,
+/* A:03 B:1c */
+0x576E,0x5786,0x57A2,0x57C4,0x57EB,0x581A,0x5853,0x5895,
+0x58E4,0x5943,0x59B3,0x5A38,0x5AD6,0x5B92,0x5C71,0x5D7A,
+0x5EB6,0x602D,0x61EA,0x63FC,0x6671,0x695D,0x6CD7,0x70F7,
+0x75DF,0x7BB4,0x82A2,0x8ADE,0x94A8,0xA04A,0xAE1E,0xBE8C,
+/* A:03 B:1d */
+0x67F4,0x680A,0x6824,0x6843,0x6867,0x6893,0x68C6,0x6904,
+0x694D,0x69A3,0x6A0A,0x6A85,0x6B16,0x6BC3,0x6C90,0x6D85,
+0x6EA7,0x7000,0x719A,0x7381,0x75C4,0x7875,0x7BA7,0x7F73,
+0x83F7,0x8954,0x8FB4,0x9748,0xA04A,0xAAFE,0xB7B7,0xC6D6,
+/* A:03 B:1e */
+0x7B98,0x7BAB,0x7BC2,0x7BDE,0x7BFF,0x7C26,0x7C54,0x7C8B,
+0x7CCC,0x7D1A,0x7D76,0x7DE4,0x7E67,0x7F02,0x7FBA,0x8095,
+0x8199,0x82CF,0x843F,0x85F4,0x87FB,0x8A64,0x8D42,0x90AA,
+0x94B6,0x9986,0x9F3E,0xA60A,0xAE1E,0xB7B7,0xC320,0xD0AF,
+/* A:03 B:1f */
+0x92EF,0x9300,0x9314,0x932B,0x9348,0x9369,0x9391,0x93C1,
+0x93F9,0x943C,0x948C,0x94EB,0x955B,0x95E1,0x9680,0x973D,
+0x981E,0x9929,0x9A67,0x9BE0,0x9DA0,0x9FB5,0xA22F,0xA51F,
+0xA89E,0xACC5,0xB1B5,0xB793,0xBE8C,0xC6D6,0xD0AF,0xDC64,
+/* A: 968D89C0 */
+/* A:04 B:00 */
+0x00B1,0x00D3,0x00FB,0x012A,0x0162,0x01A5,0x01F5,0x0254,
+0x02C4,0x034A,0x03E9,0x04A5,0x0586,0x0691,0x07CE,0x0946,
+0x0B06,0x0D1A,0x0F93,0x1282,0x15FF,0x1A25,0x1F13,0x24EF,
+0x2BE5,0x342C,0x3E01,0x49B2,0x5796,0x6819,0x7BB8,0x930B,
+/* A:04 B:01 */
+0x00D3,0x00F4,0x011C,0x014C,0x0184,0x01C7,0x0216,0x0275,
+0x02E5,0x036B,0x040A,0x04C7,0x05A7,0x06B1,0x07EE,0x0967,
+0x0B26,0x0D3A,0x0FB2,0x12A2,0x161F,0x1A44,0x1F31,0x250C,
+0x2C02,0x3447,0x3E1C,0x49CB,0x57AE,0x682F,0x7BCC,0x931C,
+/* A:04 B:02 */
+0x00FB,0x011C,0x0144,0x0173,0x01AC,0x01EF,0x023E,0x029D,
+0x030D,0x0393,0x0431,0x04EE,0x05CE,0x06D9,0x0815,0x098E,
+0x0B4D,0x0D60,0x0FD8,0x12C7,0x1644,0x1A68,0x1F55,0x252F,
+0x2C24,0x3468,0x3E3C,0x49E9,0x57CA,0x6849,0x7BE3,0x9330,
+/* A:04 B:03 */
+0x012A,0x014C,0x0173,0x01A3,0x01DB,0x021E,0x026D,0x02CC,
+0x033C,0x03C2,0x0460,0x051D,0x05FD,0x0707,0x0844,0x09BC,
+0x0B7B,0x0D8E,0x1005,0x12F4,0x1670,0x1A94,0x1F7F,0x2559,
+0x2C4C,0x348F,0x3E61,0x4A0D,0x57EB,0x6867,0x7BFF,0x9348,
+/* A:04 B:04 */
+0x0162,0x0184,0x01AC,0x01DB,0x0213,0x0256,0x02A6,0x0304,
+0x0374,0x03FA,0x0498,0x0554,0x0634,0x073E,0x087B,0x09F2,
+0x0BB1,0x0DC4,0x103B,0x1329,0x16A4,0x1AC7,0x1FB2,0x258A,
+0x2C7C,0x34BE,0x3E8E,0x4A37,0x5813,0x688C,0x7C1F,0x9364,
+/* A:04 B:05 */
+0x01A5,0x01C7,0x01EF,0x021E,0x0256,0x0299,0x02E8,0x0347,
+0x03B7,0x043C,0x04DA,0x0596,0x0676,0x0780,0x08BC,0x0A33,
+0x0BF2,0x0E04,0x107A,0x1368,0x16E2,0x1B04,0x1FEE,0x25C5,
+0x2CB6,0x34F5,0x3EC3,0x4A69,0x5842,0x68B7,0x7C46,0x9386,
+/* A:04 B:06 */
+0x01F5,0x0216,0x023E,0x026D,0x02A6,0x02E8,0x0338,0x0396,
+0x0406,0x048B,0x0529,0x05E5,0x06C4,0x07CE,0x090A,0x0A81,
+0x0C3E,0x0E50,0x10C6,0x13B2,0x172C,0x1B4D,0x2035,0x260B,
+0x2CF9,0x3537,0x3F02,0x4AA5,0x587A,0x68EB,0x7C75,0x93AD,
+/* A:04 B:07 */
+0x0254,0x0275,0x029D,0x02CC,0x0304,0x0347,0x0396,0x03F4,
+0x0464,0x04E9,0x0587,0x0642,0x0721,0x082B,0x0966,0x0ADD,
+0x0C9A,0x0EAB,0x1120,0x140B,0x1784,0x1BA3,0x208A,0x265E,
+0x2D4A,0x3585,0x3F4D,0x4AEC,0x58BD,0x6928,0x7CAC,0x93DD,
+/* A:04 B:08 */
+0x02C4,0x02E5,0x030D,0x033C,0x0374,0x03B7,0x0406,0x0464,
+0x04D3,0x0558,0x05F6,0x06B1,0x0790,0x0899,0x09D4,0x0B4A,
+0x0D06,0x0F17,0x118B,0x1475,0x17EC,0x1C0A,0x20EF,0x26C0,
+0x2DAA,0x35E2,0x3FA5,0x4B41,0x590C,0x6971,0x7CED,0x9415,
+/* A:04 B:09 */
+0x034A,0x036B,0x0393,0x03C2,0x03FA,0x043C,0x048B,0x04E9,
+0x0558,0x05DD,0x067A,0x0735,0x0814,0x091C,0x0A56,0x0BCB,
+0x0D87,0x0F97,0x1209,0x14F2,0x1868,0x1C84,0x2167,0x2735,
+0x2E1C,0x3650,0x400F,0x4BA5,0x596A,0x69C7,0x7D3B,0x9458,
+/* A:04 B:0a */
+0x03E9,0x040A,0x0431,0x0460,0x0498,0x04DA,0x0529,0x0587,
+0x05F6,0x067A,0x0717,0x07D2,0x08B0,0x09B8,0x0AF1,0x0C66,
+0x0E20,0x102F,0x12A0,0x1588,0x18FB,0x1D15,0x21F5,0x27C1,
+0x2EA4,0x36D3,0x408D,0x4C1C,0x59DA,0x6A2E,0x7D97,0x94A8,
+/* A:04 B:0b */
+0x04A5,0x04C7,0x04EE,0x051D,0x0554,0x0596,0x05E5,0x0642,
+0x06B1,0x0735,0x07D2,0x088C,0x096A,0x0A71,0x0BA9,0x0D1D,
+0x0ED7,0x10E4,0x1354,0x1639,0x19AA,0x1DC2,0x229F,0x2866,
+0x2F45,0x376E,0x4122,0x4CAA,0x5A5F,0x6AA9,0x7E05,0x9507,
+/* A:04 B:0c */
+0x0586,0x05A7,0x05CE,0x05FD,0x0634,0x0676,0x06C4,0x0721,
+0x0790,0x0814,0x08B0,0x096A,0x0A46,0x0B4D,0x0C84,0x0DF7,
+0x0FAF,0x11BB,0x1429,0x170C,0x1A7A,0x1E8F,0x2368,0x292B,
+0x3004,0x3828,0x41D4,0x4D53,0x5AFD,0x6B3A,0x7E87,0x9577,
+/* A:04 B:0d */
+0x0691,0x06B1,0x06D9,0x0707,0x073E,0x0780,0x07CE,0x082B,
+0x0899,0x091C,0x09B8,0x0A71,0x0B4D,0x0C52,0x0D89,0x0EFA,
+0x10B0,0x12BA,0x1526,0x1806,0x1B72,0x1F82,0x2457,0x2A15,
+0x30E7,0x3903,0x42A7,0x4E1B,0x5BB9,0x6BE7,0x7F22,0x95FD,
+/* A:04 B:0e */
+0x07CE,0x07EE,0x0815,0x0844,0x087B,0x08BC,0x090A,0x0966,
+0x09D4,0x0A56,0x0AF1,0x0BA9,0x0C84,0x0D89,0x0EBE,0x102D,
+0x11E2,0x13EA,0x1653,0x1930,0x1C98,0x20A4,0x2573,0x2B2A,
+0x31F6,0x3A09,0x43A2,0x4F09,0x5C98,0x6CB4,0x7FDA,0x969C,
+/* A:04 B:0f */
+0x0946,0x0967,0x098E,0x09BC,0x09F2,0x0A33,0x0A81,0x0ADD,
+0x0B4A,0x0BCB,0x0C66,0x0D1D,0x0DF7,0x0EFA,0x102D,0x119B,
+0x134E,0x1552,0x17B8,0x1A92,0x1DF5,0x21FC,0x26C5,0x2C75,
+0x3337,0x3B40,0x44CC,0x5025,0x5DA1,0x6DA8,0x80B5,0x9759,
+/* A:04 B:10 */
+0x0B06,0x0B26,0x0B4D,0x0B7B,0x0BB1,0x0BF2,0x0C3E,0x0C9A,
+0x0D06,0x0D87,0x0E20,0x0ED7,0x0FAF,0x10B0,0x11E2,0x134E,
+0x14FE,0x16FF,0x1961,0x1C36,0x1F94,0x2395,0x2856,0x2DFD,
+0x34B5,0x3CB1,0x462E,0x5175,0x5EDC,0x6ECA,0x81B9,0x983A,
+/* A:04 B:11 */
+0x0D1A,0x0D3A,0x0D60,0x0D8E,0x0DC4,0x0E04,0x0E50,0x0EAB,
+0x0F17,0x0F97,0x102F,0x10E4,0x11BB,0x12BA,0x13EA,0x1552,
+0x16FF,0x18FD,0x1B5A,0x1E2A,0x2182,0x257B,0x2A33,0x2FD0,
+0x367B,0x3E68,0x47D3,0x5305,0x6053,0x7023,0x82EE,0x9944,
+/* A:04 B:12 */
+0x0F93,0x0FB2,0x0FD8,0x1005,0x103B,0x107A,0x10C6,0x1120,
+0x118B,0x1209,0x12A0,0x1354,0x1429,0x1526,0x1653,0x17B8,
+0x1961,0x1B5A,0x1DB3,0x207C,0x23CC,0x27BC,0x2C6A,0x31FA,
+0x3896,0x4071,0x49C7,0x54E0,0x6210,0x71BD,0x845E,0x9A82,
+/* A:04 B:13 */
+0x1282,0x12A2,0x12C7,0x12F4,0x1329,0x1368,0x13B2,0x140B,
+0x1475,0x14F2,0x1588,0x1639,0x170C,0x1806,0x1930,0x1A92,
+0x1C36,0x1E2A,0x207C,0x233E,0x2686,0x2A6B,0x2F0C,0x348D,
+0x3B17,0x42DD,0x4C1A,0x5715,0x6421,0x73A4,0x8612,0x9BFB,
+/* A:04 B:14 */
+0x15FF,0x161F,0x1644,0x1670,0x16A4,0x16E2,0x172C,0x1784,
+0x17EC,0x1868,0x18FB,0x19AA,0x1A7A,0x1B72,0x1C98,0x1DF5,
+0x1F94,0x2182,0x23CC,0x2686,0x29C2,0x2D9B,0x322D,0x379C,
+0x3E11,0x45BE,0x4EDD,0x59B4,0x6696,0x75E6,0x8819,0x9DBB,
+/* A:04 B:15 */
+0x1A25,0x1A44,0x1A68,0x1A94,0x1AC7,0x1B04,0x1B4D,0x1BA3,
+0x1C0A,0x1C84,0x1D15,0x1DC2,0x1E8F,0x1F82,0x20A4,0x21FC,
+0x2395,0x257B,0x27BC,0x2A6B,0x2D9B,0x3164,0x35E5,0x3B3F,
+0x419A,0x4929,0x5225,0x5CD2,0x6982,0x7896,0x8A82,0x9FCF,
+/* A:04 B:16 */
+0x1F13,0x1F31,0x1F55,0x1F7F,0x1FB2,0x1FEE,0x2035,0x208A,
+0x20EF,0x2167,0x21F5,0x229F,0x2368,0x2457,0x2573,0x26C5,
+0x2856,0x2A33,0x2C6A,0x2F0C,0x322D,0x35E5,0x3A50,0x3F91,
+0x45CF,0x4D3A,0x560B,0x6086,0x6CFA,0x7BC8,0x8D5F,0xA248,
+/* A:04 B:17 */
+0x24EF,0x250C,0x252F,0x2559,0x258A,0x25C5,0x260B,0x265E,
+0x26C0,0x2735,0x27C1,0x2866,0x292B,0x2A15,0x2B2A,0x2C75,
+0x2DFD,0x2FD0,0x31FA,0x348D,0x379C,0x3B3F,0x3F91,0x44B3,
+0x4ACE,0x520F,0x5AAE,0x64ED,0x711A,0x7F93,0x90C7,0xA538,
+/* A:04 B:18 */
+0x2BE5,0x2C02,0x2C24,0x2C4C,0x2C7C,0x2CB6,0x2CF9,0x2D4A,
+0x2DAA,0x2E1C,0x2EA4,0x2F45,0x3004,0x30E7,0x31F6,0x3337,
+0x34B5,0x367B,0x3896,0x3B17,0x3E11,0x419A,0x45CF,0x4ACE,
+0x50BE,0x57CD,0x6030,0x6A28,0x7601,0x8416,0x94D2,0xA8B6,
+/* A:04 B:19 */
+0x342C,0x3447,0x3468,0x348F,0x34BE,0x34F5,0x3537,0x3585,
+0x35E2,0x3650,0x36D3,0x376E,0x3828,0x3903,0x3A09,0x3B40,
+0x3CB1,0x3E68,0x4071,0x42DD,0x45BE,0x4929,0x4D3A,0x520F,
+0x57CD,0x5EA0,0x66BC,0x7060,0x7BD4,0x8972,0x99A1,0xACDD,
+/* A:04 B:1a */
+0x3E01,0x3E1C,0x3E3C,0x3E61,0x3E8E,0x3EC3,0x3F02,0x3F4D,
+0x3FA5,0x400F,0x408D,0x4122,0x41D4,0x42A7,0x43A2,0x44CC,
+0x462E,0x47D3,0x49C7,0x4C1A,0x4EDD,0x5225,0x560B,0x5AAE,
+0x6030,0x66BC,0x6E84,0x77C3,0x82C1,0x8FD1,0x9F58,0xB1CB,
+/* A:04 B:1b */
+0x49B2,0x49CB,0x49E9,0x4A0D,0x4A37,0x4A69,0x4AA5,0x4AEC,
+0x4B41,0x4BA5,0x4C1C,0x4CAA,0x4D53,0x4E1B,0x4F09,0x5025,
+0x5175,0x5305,0x54E0,0x5715,0x59B4,0x5CD2,0x6086,0x64ED,
+0x6A28,0x7060,0x77C3,0x808C,0x8AFC,0x9764,0xA622,0xB7A8,
+/* A:04 B:1c */
+0x5796,0x57AE,0x57CA,0x57EB,0x5813,0x5842,0x587A,0x58BD,
+0x590C,0x596A,0x59DA,0x5A5F,0x5AFD,0x5BB9,0x5C98,0x5DA1,
+0x5EDC,0x6053,0x6210,0x6421,0x6696,0x6982,0x6CFA,0x711A,
+0x7601,0x7BD4,0x82C1,0x8AFC,0x94C4,0xA064,0xAE34,0xBEA0,
+/* A:04 B:1d */
+0x6819,0x682F,0x6849,0x6867,0x688C,0x68B7,0x68EB,0x6928,
+0x6971,0x69C7,0x6A2E,0x6AA9,0x6B3A,0x6BE7,0x6CB4,0x6DA8,
+0x6ECA,0x7023,0x71BD,0x73A4,0x75E6,0x7896,0x7BC8,0x7F93,
+0x8416,0x8972,0x8FD1,0x9764,0xA064,0xAB16,0xB7CC,0xC6E8,
+/* A:04 B:1e */
+0x7BB8,0x7BCC,0x7BE3,0x7BFF,0x7C1F,0x7C46,0x7C75,0x7CAC,
+0x7CED,0x7D3B,0x7D97,0x7E05,0x7E87,0x7F22,0x7FDA,0x80B5,
+0x81B9,0x82EE,0x845E,0x8612,0x8819,0x8A82,0x8D5F,0x90C7,
+0x94D2,0x99A1,0x9F58,0xA622,0xAE34,0xB7CC,0xC333,0xD0C0,
+/* A:04 B:1f */
+0x930B,0x931C,0x9330,0x9348,0x9364,0x9386,0x93AD,0x93DD,
+0x9415,0x9458,0x94A8,0x9507,0x9577,0x95FD,0x969C,0x9759,
+0x983A,0x9944,0x9A82,0x9BFB,0x9DBB,0x9FCF,0xA248,0xA538,
+0xA8B6,0xACDD,0xB1CB,0xB7A8,0xBEA0,0xC6E8,0xD0C0,0xDC72,
+/* A: 968D89C0 */
+/* A:05 B:00 */
+0x00F4,0x0116,0x013E,0x016D,0x01A5,0x01E8,0x0238,0x0296,
+0x0307,0x038C,0x042B,0x04E8,0x05C8,0x06D2,0x080F,0x0987,
+0x0B47,0x0D5A,0x0FD2,0x12C1,0x163E,0x1A63,0x1F4F,0x252A,
+0x2C1E,0x3463,0x3E37,0x49E4,0x57C5,0x6844,0x7BE0,0x932D,
+/* A:05 B:01 */
+0x0116,0x0137,0x015F,0x018F,0x01C7,0x020A,0x0259,0x02B8,
+0x0328,0x03AE,0x044C,0x0509,0x05E9,0x06F3,0x0830,0x09A8,
+0x0B67,0x0D7B,0x0FF2,0x12E1,0x165D,0x1A81,0x1F6D,0x2547,
+0x2C3B,0x347F,0x3E51,0x49FD,0x57DD,0x685A,0x7BF3,0x933E,
+/* A:05 B:02 */
+0x013E,0x015F,0x0187,0x01B6,0x01EF,0x0232,0x0281,0x02DF,
+0x0350,0x03D5,0x0474,0x0530,0x0610,0x071A,0x0857,0x09CF,
+0x0B8E,0x0DA1,0x1018,0x1306,0x1682,0x1AA6,0x1F91,0x256A,
+0x2C5D,0x34A0,0x3E71,0x4A1B,0x57F9,0x6874,0x7C0A,0x9352,
+/* A:05 B:03 */
+0x016D,0x018F,0x01B6,0x01E6,0x021E,0x0261,0x02B0,0x030F,
+0x037F,0x0404,0x04A3,0x055F,0x063F,0x0749,0x0885,0x09FD,
+0x0BBB,0x0DCE,0x1045,0x1333,0x16AE,0x1AD1,0x1FBC,0x2594,
+0x2C86,0x34C7,0x3E96,0x4A3F,0x581A,0x6893,0x7C26,0x9369,
+/* A:05 B:04 */
+0x01A5,0x01C7,0x01EF,0x021E,0x0256,0x0299,0x02E8,0x0347,
+0x03B7,0x043C,0x04DA,0x0596,0x0676,0x0780,0x08BC,0x0A33,
+0x0BF2,0x0E04,0x107A,0x1368,0x16E2,0x1B04,0x1FEE,0x25C5,
+0x2CB6,0x34F5,0x3EC3,0x4A69,0x5842,0x68B7,0x7C46,0x9386,
+/* A:05 B:05 */
+0x01E8,0x020A,0x0232,0x0261,0x0299,0x02DC,0x032B,0x0389,
+0x03F9,0x047E,0x051C,0x05D8,0x06B8,0x07C2,0x08FD,0x0A74,
+0x0C32,0x0E44,0x10BA,0x13A6,0x1720,0x1B41,0x202A,0x2600,
+0x2CEF,0x352C,0x3EF8,0x4A9C,0x5871,0x68E3,0x7C6D,0x93A7,
+/* A:05 B:06 */
+0x0238,0x0259,0x0281,0x02B0,0x02E8,0x032B,0x037A,0x03D8,
+0x0448,0x04CD,0x056B,0x0627,0x0706,0x080F,0x094B,0x0AC2,
+0x0C7F,0x0E90,0x1105,0x13F1,0x176A,0x1B8A,0x2071,0x2645,
+0x2D32,0x356E,0x3F37,0x4AD7,0x58A9,0x6916,0x7C9C,0x93CF,
+/* A:05 B:07 */
+0x0296,0x02B8,0x02DF,0x030F,0x0347,0x0389,0x03D8,0x0436,
+0x04A6,0x052B,0x05C9,0x0684,0x0763,0x086C,0x09A7,0x0B1D,
+0x0CDA,0x0EEB,0x115F,0x144A,0x17C2,0x1BE0,0x20C6,0x2698,
+0x2D83,0x35BC,0x3F81,0x4B1E,0x58EC,0x6953,0x7CD2,0x93FE,
+/* A:05 B:08 */
+0x0307,0x0328,0x0350,0x037F,0x03B7,0x03F9,0x0448,0x04A6,
+0x0516,0x059A,0x0638,0x06F3,0x07D2,0x08DA,0x0A15,0x0B8A,
+0x0D47,0x0F56,0x11CA,0x14B4,0x182A,0x1C47,0x212B,0x26FB,
+0x2DE3,0x3619,0x3FDA,0x4B73,0x593B,0x699C,0x7D14,0x9437,
+/* A:05 B:09 */
+0x038C,0x03AE,0x03D5,0x0404,0x043C,0x047E,0x04CD,0x052B,
+0x059A,0x061F,0x06BC,0x0777,0x0855,0x095D,0x0A97,0x0C0C,
+0x0DC7,0x0FD6,0x1249,0x1531,0x18A6,0x1CC1,0x21A3,0x2770,
+0x2E55,0x3687,0x4044,0x4BD7,0x5999,0x69F3,0x7D61,0x947A,
+/* A:05 B:0a */
+0x042B,0x044C,0x0474,0x04A3,0x04DA,0x051C,0x056B,0x05C9,
+0x0638,0x06BC,0x0759,0x0813,0x08F1,0x09F9,0x0B32,0x0CA6,
+0x0E61,0x106E,0x12DF,0x15C6,0x1939,0x1D52,0x2231,0x27FB,
+0x2EDC,0x370A,0x40C1,0x4C4E,0x5A09,0x6A59,0x7DBE,0x94C9,
+/* A:05 B:0b */
+0x04E8,0x0509,0x0530,0x055F,0x0596,0x05D8,0x0627,0x0684,
+0x06F3,0x0777,0x0813,0x08CD,0x09AB,0x0AB2,0x0BEA,0x0D5D,
+0x0F17,0x1123,0x1392,0x1677,0x19E8,0x1DFE,0x22DA,0x28A0,
+0x2F7D,0x37A5,0x4157,0x4CDC,0x5A8D,0x6AD4,0x7E2B,0x9528,
+/* A:05 B:0c */
+0x05C8,0x05E9,0x0610,0x063F,0x0676,0x06B8,0x0706,0x0763,
+0x07D2,0x0855,0x08F1,0x09AB,0x0A87,0x0B8D,0x0CC5,0x0E37,
+0x0FEF,0x11FA,0x1467,0x174A,0x1AB8,0x1ECB,0x23A3,0x2965,
+0x303C,0x385E,0x4208,0x4D85,0x5B2B,0x6B65,0x7EAD,0x9598,
+/* A:05 B:0d */
+0x06D2,0x06F3,0x071A,0x0749,0x0780,0x07C2,0x080F,0x086C,
+0x08DA,0x095D,0x09F9,0x0AB2,0x0B8D,0x0C92,0x0DC9,0x0F3A,
+0x10F0,0x12F9,0x1564,0x1844,0x1BAF,0x1FBE,0x2492,0x2A4E,
+0x3120,0x393A,0x42DB,0x4E4D,0x5BE7,0x6C11,0x7F48,0x961E,
+/* A:05 B:0e */
+0x080F,0x0830,0x0857,0x0885,0x08BC,0x08FD,0x094B,0x09A7,
+0x0A15,0x0A97,0x0B32,0x0BEA,0x0CC5,0x0DC9,0x0EFE,0x106D,
+0x1221,0x1428,0x1691,0x196E,0x1CD5,0x20E0,0x25AE,0x2B64,
+0x322E,0x3A3F,0x43D5,0x4F3B,0x5CC6,0x6CDF,0x8000,0x96BD,
+/* A:05 B:0f */
+0x0987,0x09A8,0x09CF,0x09FD,0x0A33,0x0A74,0x0AC2,0x0B1D,
+0x0B8A,0x0C0C,0x0CA6,0x0D5D,0x0E37,0x0F3A,0x106D,0x11DA,
+0x138D,0x1591,0x17F6,0x1ACF,0x1E32,0x2237,0x26FF,0x2CAE,
+0x336F,0x3B75,0x44FF,0x5055,0x5DCF,0x6DD2,0x80DB,0x977A,
+/* A:05 B:10 */
+0x0B47,0x0B67,0x0B8E,0x0BBB,0x0BF2,0x0C32,0x0C7F,0x0CDA,
+0x0D47,0x0DC7,0x0E61,0x0F17,0x0FEF,0x10F0,0x1221,0x138D,
+0x153C,0x173D,0x199F,0x1C73,0x1FD0,0x23D0,0x2890,0x2E36,
+0x34EC,0x3CE6,0x4661,0x51A6,0x5F0A,0x6EF4,0x81DF,0x985A,
+/* A:05 B:11 */
+0x0D5A,0x0D7B,0x0DA1,0x0DCE,0x0E04,0x0E44,0x0E90,0x0EEB,
+0x0F56,0x0FD6,0x106E,0x1123,0x11FA,0x12F9,0x1428,0x1591,
+0x173D,0x193A,0x1B97,0x1E67,0x21BE,0x25B5,0x2A6D,0x3008,
+0x36B2,0x3E9D,0x4806,0x5335,0x6080,0x704D,0x8314,0x9965,
+/* A:05 B:12 */
+0x0FD2,0x0FF2,0x1018,0x1045,0x107A,0x10BA,0x1105,0x115F,
+0x11CA,0x1249,0x12DF,0x1392,0x1467,0x1564,0x1691,0x17F6,
+0x199F,0x1B97,0x1DEF,0x20B8,0x2408,0x27F7,0x2CA3,0x3232,
+0x38CC,0x40A6,0x49FA,0x5510,0x623D,0x71E6,0x8483,0x9AA2,
+/* A:05 B:13 */
+0x12C1,0x12E1,0x1306,0x1333,0x1368,0x13A6,0x13F1,0x144A,
+0x14B4,0x1531,0x15C6,0x1677,0x174A,0x1844,0x196E,0x1ACF,
+0x1C73,0x1E67,0x20B8,0x237A,0x26C0,0x2AA4,0x2F45,0x34C4,
+0x3B4D,0x4311,0x4C4C,0x5744,0x644E,0x73CC,0x8637,0x9C1A,
+/* A:05 B:14 */
+0x163E,0x165D,0x1682,0x16AE,0x16E2,0x1720,0x176A,0x17C2,
+0x182A,0x18A6,0x1939,0x19E8,0x1AB8,0x1BAF,0x1CD5,0x1E32,
+0x1FD0,0x21BE,0x2408,0x26C0,0x29FC,0x2DD4,0x3265,0x37D2,
+0x3E46,0x45F1,0x4F0E,0x59E3,0x66C2,0x760F,0x883D,0x9DDA,
+/* A:05 B:15 */
+0x1A63,0x1A81,0x1AA6,0x1AD1,0x1B04,0x1B41,0x1B8A,0x1BE0,
+0x1C47,0x1CC1,0x1D52,0x1DFE,0x1ECB,0x1FBE,0x20E0,0x2237,
+0x23D0,0x25B5,0x27F7,0x2AA4,0x2DD4,0x319C,0x361C,0x3B74,
+0x41CF,0x495C,0x5255,0x5D00,0x69AD,0x78BE,0x8AA6,0x9FEE,
+/* A:05 B:16 */
+0x1F4F,0x1F6D,0x1F91,0x1FBC,0x1FEE,0x202A,0x2071,0x20C6,
+0x212B,0x21A3,0x2231,0x22DA,0x23A3,0x2492,0x25AE,0x26FF,
+0x2890,0x2A6D,0x2CA3,0x2F45,0x3265,0x361C,0x3A86,0x3FC5,
+0x4602,0x4D6B,0x563B,0x60B3,0x6D24,0x7BEF,0x8D82,0xA266,
+/* A:05 B:17 */
+0x252A,0x2547,0x256A,0x2594,0x25C5,0x2600,0x2645,0x2698,
+0x26FB,0x2770,0x27FB,0x28A0,0x2965,0x2A4E,0x2B64,0x2CAE,
+0x2E36,0x3008,0x3232,0x34C4,0x37D2,0x3B74,0x3FC5,0x44E7,
+0x4B00,0x523F,0x5ADC,0x6519,0x7143,0x7FB9,0x90E9,0xA556,
+/* A:05 B:18 */
+0x2C1E,0x2C3B,0x2C5D,0x2C86,0x2CB6,0x2CEF,0x2D32,0x2D83,
+0x2DE3,0x2E55,0x2EDC,0x2F7D,0x303C,0x3120,0x322E,0x336F,
+0x34EC,0x36B2,0x38CC,0x3B4D,0x3E46,0x41CF,0x4602,0x4B00,
+0x50EF,0x57FC,0x605D,0x6A53,0x7629,0x843B,0x94F3,0xA8D3,
+/* A:05 B:19 */
+0x3463,0x347F,0x34A0,0x34C7,0x34F5,0x352C,0x356E,0x35BC,
+0x3619,0x3687,0x370A,0x37A5,0x385E,0x393A,0x3A3F,0x3B75,
+0x3CE6,0x3E9D,0x40A6,0x4311,0x45F1,0x495C,0x4D6B,0x523F,
+0x57FC,0x5ECD,0x66E8,0x7089,0x7BFB,0x8996,0x99C1,0xACF8,
+/* A:05 B:1a */
+0x3E37,0x3E51,0x3E71,0x3E96,0x3EC3,0x3EF8,0x3F37,0x3F81,
+0x3FDA,0x4044,0x40C1,0x4157,0x4208,0x42DB,0x43D5,0x44FF,
+0x4661,0x4806,0x49FA,0x4C4C,0x4F0E,0x5255,0x563B,0x5ADC,
+0x605D,0x66E8,0x6EAE,0x77EB,0x82E6,0x8FF3,0x9F76,0xB1E6,
+/* A:05 B:1b */
+0x49E4,0x49FD,0x4A1B,0x4A3F,0x4A69,0x4A9C,0x4AD7,0x4B1E,
+0x4B73,0x4BD7,0x4C4E,0x4CDC,0x4D85,0x4E4D,0x4F3B,0x5055,
+0x51A6,0x5335,0x5510,0x5744,0x59E3,0x5D00,0x60B3,0x6519,
+0x6A53,0x7089,0x77EB,0x80B1,0x8B1F,0x9784,0xA63F,0xB7C1,
+/* A:05 B:1c */
+0x57C5,0x57DD,0x57F9,0x581A,0x5842,0x5871,0x58A9,0x58EC,
+0x593B,0x5999,0x5A09,0x5A8D,0x5B2B,0x5BE7,0x5CC6,0x5DCF,
+0x5F0A,0x6080,0x623D,0x644E,0x66C2,0x69AD,0x6D24,0x7143,
+0x7629,0x7BFB,0x82E6,0x8B1F,0x94E5,0xA082,0xAE50,0xBEB7,
+/* A:05 B:1d */
+0x6844,0x685A,0x6874,0x6893,0x68B7,0x68E3,0x6916,0x6953,
+0x699C,0x69F3,0x6A59,0x6AD4,0x6B65,0x6C11,0x6CDF,0x6DD2,
+0x6EF4,0x704D,0x71E6,0x73CC,0x760F,0x78BE,0x7BEF,0x7FB9,
+0x843B,0x8996,0x8FF3,0x9784,0xA082,0xAB32,0xB7E5,0xC6FD,
+/* A:05 B:1e */
+0x7BE0,0x7BF3,0x7C0A,0x7C26,0x7C46,0x7C6D,0x7C9C,0x7CD2,
+0x7D14,0x7D61,0x7DBE,0x7E2B,0x7EAD,0x7F48,0x8000,0x80DB,
+0x81DF,0x8314,0x8483,0x8637,0x883D,0x8AA6,0x8D82,0x90E9,
+0x94F3,0x99C1,0x9F76,0xA63F,0xAE50,0xB7E5,0xC349,0xD0D3,
+/* A:05 B:1f */
+0x932D,0x933E,0x9352,0x9369,0x9386,0x93A7,0x93CF,0x93FE,
+0x9437,0x947A,0x94C9,0x9528,0x9598,0x961E,0x96BD,0x977A,
+0x985A,0x9965,0x9AA2,0x9C1A,0x9DDA,0x9FEE,0xA266,0xA556,
+0xA8D3,0xACF8,0xB1E6,0xB7C1,0xBEB7,0xC6FD,0xD0D3,0xDC82,
+/* A: 968D89C0 */
+/* A:06 B:00 */
+0x0144,0x0166,0x018D,0x01BD,0x01F5,0x0238,0x0287,0x02E6,
+0x0356,0x03DB,0x047A,0x0536,0x0616,0x0721,0x085D,0x09D5,
+0x0B94,0x0DA7,0x101E,0x130C,0x1688,0x1AAB,0x1F97,0x2570,
+0x2C63,0x34A5,0x3E76,0x4A20,0x57FE,0x6878,0x7C0E,0x9355,
+/* A:06 B:01 */
+0x0166,0x0187,0x01AF,0x01DE,0x0216,0x0259,0x02A9,0x0307,
+0x0377,0x03FD,0x049B,0x0558,0x0637,0x0741,0x087E,0x09F5,
+0x0BB4,0x0DC7,0x103E,0x132C,0x16A7,0x1ACA,0x1FB5,0x258D,
+0x2C7F,0x34C0,0x3E90,0x4A39,0x5815,0x688E,0x7C21,0x9366,
+/* A:06 B:02 */
+0x018D,0x01AF,0x01D7,0x0206,0x023E,0x0281,0x02D0,0x032F,
+0x039F,0x0424,0x04C3,0x057F,0x065F,0x0768,0x08A4,0x0A1C,
+0x0BDB,0x0DED,0x1064,0x1351,0x16CC,0x1AEE,0x1FD9,0x25B0,
+0x2CA1,0x34E1,0x3EB0,0x4A57,0x5831,0x68A8,0x7C38,0x937A,
+/* A:06 B:03 */
+0x01BD,0x01DE,0x0206,0x0235,0x026D,0x02B0,0x0300,0x035E,
+0x03CE,0x0453,0x04F1,0x05AD,0x068D,0x0797,0x08D3,0x0A4A,
+0x0C08,0x0E1A,0x1091,0x137E,0x16F8,0x1B1A,0x2003,0x25D9,
+0x2CC9,0x3508,0x3ED5,0x4A7B,0x5853,0x68C6,0x7C54,0x9391,
+/* A:06 B:04 */
+0x01F5,0x0216,0x023E,0x026D,0x02A6,0x02E8,0x0338,0x0396,
+0x0406,0x048B,0x0529,0x05E5,0x06C4,0x07CE,0x090A,0x0A81,
+0x0C3E,0x0E50,0x10C6,0x13B2,0x172C,0x1B4D,0x2035,0x260B,
+0x2CF9,0x3537,0x3F02,0x4AA5,0x587A,0x68EB,0x7C75,0x93AD,
+/* A:06 B:05 */
+0x0238,0x0259,0x0281,0x02B0,0x02E8,0x032B,0x037A,0x03D8,
+0x0448,0x04CD,0x056B,0x0627,0x0706,0x080F,0x094B,0x0AC2,
+0x0C7F,0x0E90,0x1105,0x13F1,0x176A,0x1B8A,0x2071,0x2645,
+0x2D32,0x356E,0x3F37,0x4AD7,0x58A9,0x6916,0x7C9C,0x93CF,
+/* A:06 B:06 */
+0x0287,0x02A9,0x02D0,0x0300,0x0338,0x037A,0x03C9,0x0427,
+0x0497,0x051C,0x05BA,0x0675,0x0754,0x085D,0x0998,0x0B0F,
+0x0CCC,0x0EDC,0x1151,0x143C,0x17B4,0x1BD3,0x20B9,0x268B,
+0x2D76,0x35AF,0x3F75,0x4B13,0x58E1,0x694A,0x7CCA,0x93F7,
+/* A:06 B:07 */
+0x02E6,0x0307,0x032F,0x035E,0x0396,0x03D8,0x0427,0x0485,
+0x04F5,0x0579,0x0617,0x06D3,0x07B1,0x08BA,0x09F4,0x0B6A,
+0x0D27,0x0F37,0x11AB,0x1495,0x180B,0x1C29,0x210D,0x26DE,
+0x2DC7,0x35FD,0x3FC0,0x4B5A,0x5924,0x6987,0x7D01,0x9426,
+/* A:06 B:08 */
+0x0356,0x0377,0x039F,0x03CE,0x0406,0x0448,0x0497,0x04F5,
+0x0564,0x05E9,0x0686,0x0741,0x0820,0x0928,0x0A62,0x0BD7,
+0x0D93,0x0FA2,0x1215,0x14FE,0x1873,0x1C8F,0x2172,0x2740,
+0x2E27,0x365A,0x4019,0x4BAE,0x5973,0x69CF,0x7D42,0x945E,
+/* A:06 B:09 */
+0x03DB,0x03FD,0x0424,0x0453,0x048B,0x04CD,0x051C,0x0579,
+0x05E9,0x066D,0x070A,0x07C5,0x08A3,0x09AB,0x0AE4,0x0C59,
+0x0E14,0x1022,0x1294,0x157B,0x18EF,0x1D09,0x21EA,0x27B5,
+0x2E98,0x36C8,0x4082,0x4C13,0x59D1,0x6A26,0x7D8F,0x94A1,
+/* A:06 B:0a */
+0x047A,0x049B,0x04C3,0x04F1,0x0529,0x056B,0x05BA,0x0617,
+0x0686,0x070A,0x07A7,0x0861,0x093F,0x0A46,0x0B7F,0x0CF3,
+0x0EAD,0x10BA,0x132A,0x1610,0x1982,0x1D9A,0x2278,0x2840,
+0x2F20,0x374B,0x4100,0x4C8A,0x5A40,0x6A8D,0x7DEB,0x94F1,
+/* A:06 B:0b */
+0x0536,0x0558,0x057F,0x05AD,0x05E5,0x0627,0x0675,0x06D3,
+0x0741,0x07C5,0x0861,0x091B,0x09F8,0x0AFF,0x0C37,0x0DAA,
+0x0F63,0x116E,0x13DD,0x16C1,0x1A31,0x1E46,0x2321,0x28E5,
+0x2FC0,0x37E6,0x4195,0x4D17,0x5AC5,0x6B07,0x7E59,0x954F,
+/* A:06 B:0c */
+0x0616,0x0637,0x065F,0x068D,0x06C4,0x0706,0x0754,0x07B1,
+0x0820,0x08A3,0x093F,0x09F8,0x0AD4,0x0BDA,0x0D11,0x0E83,
+0x103B,0x1245,0x14B2,0x1794,0x1B00,0x1F13,0x23E9,0x29AA,
+0x307F,0x389F,0x4246,0x4DC0,0x5B63,0x6B98,0x7EDB,0x95C0,
+/* A:06 B:0d */
+0x0721,0x0741,0x0768,0x0797,0x07CE,0x080F,0x085D,0x08BA,
+0x0928,0x09AB,0x0A46,0x0AFF,0x0BDA,0x0CDF,0x0E15,0x0F85,
+0x113B,0x1344,0x15AE,0x188E,0x1BF7,0x2006,0x24D8,0x2A93,
+0x3162,0x397A,0x4319,0x4E88,0x5C1E,0x6C44,0x7F76,0x9645,
+/* A:06 B:0e */
+0x085D,0x087E,0x08A4,0x08D3,0x090A,0x094B,0x0998,0x09F4,
+0x0A62,0x0AE4,0x0B7F,0x0C37,0x0D11,0x0E15,0x0F4A,0x10B9,
+0x126D,0x1473,0x16DB,0x19B7,0x1D1D,0x2127,0x25F4,0x2BA8,
+0x3270,0x3A7F,0x4413,0x4F75,0x5CFD,0x6D11,0x802D,0x96E4,
+/* A:06 B:0f */
+0x09D5,0x09F5,0x0A1C,0x0A4A,0x0A81,0x0AC2,0x0B0F,0x0B6A,
+0x0BD7,0x0C59,0x0CF3,0x0DAA,0x0E83,0x0F85,0x10B9,0x1226,
+0x13D7,0x15DB,0x1840,0x1B18,0x1E79,0x227E,0x2745,0x2CF2,
+0x33B1,0x3BB5,0x453C,0x5090,0x5E05,0x6E05,0x8108,0x97A0,
+/* A:06 B:10 */
+0x0B94,0x0BB4,0x0BDB,0x0C08,0x0C3E,0x0C7F,0x0CCC,0x0D27,
+0x0D93,0x0E14,0x0EAD,0x0F63,0x103B,0x113B,0x126D,0x13D7,
+0x1586,0x1787,0x19E8,0x1CBC,0x2018,0x2416,0x28D5,0x2E79,
+0x352E,0x3D26,0x469E,0x51DF,0x5F40,0x6F26,0x820B,0x9881,
+/* A:06 B:11 */
+0x0DA7,0x0DC7,0x0DED,0x0E1A,0x0E50,0x0E90,0x0EDC,0x0F37,
+0x0FA2,0x1022,0x10BA,0x116E,0x1245,0x1344,0x1473,0x15DB,
+0x1787,0x1984,0x1BE0,0x1EAE,0x2204,0x25FB,0x2AB1,0x304B,
+0x36F3,0x3EDC,0x4842,0x536E,0x60B6,0x707E,0x8340,0x998B,
+/* A:06 B:12 */
+0x101E,0x103E,0x1064,0x1091,0x10C6,0x1105,0x1151,0x11AB,
+0x1215,0x1294,0x132A,0x13DD,0x14B2,0x15AE,0x16DB,0x1840,
+0x19E8,0x1BE0,0x1E37,0x20FF,0x244E,0x283C,0x2CE7,0x3274,
+0x390D,0x40E4,0x4A36,0x5549,0x6272,0x7217,0x84AF,0x9AC7,
+/* A:06 B:13 */
+0x130C,0x132C,0x1351,0x137E,0x13B2,0x13F1,0x143C,0x1495,
+0x14FE,0x157B,0x1610,0x16C1,0x1794,0x188E,0x19B7,0x1B18,
+0x1CBC,0x1EAE,0x20FF,0x23C0,0x2706,0x2AE9,0x2F88,0x3506,
+0x3B8D,0x434F,0x4C87,0x577C,0x6482,0x73FD,0x8662,0x9C40,
+/* A:06 B:14 */
+0x1688,0x16A7,0x16CC,0x16F8,0x172C,0x176A,0x17B4,0x180B,
+0x1873,0x18EF,0x1982,0x1A31,0x1B00,0x1BF7,0x1D1D,0x1E79,
+0x2018,0x2204,0x244E,0x2706,0x2A40,0x2E17,0x32A7,0x3813,
+0x3E85,0x462E,0x4F48,0x5A1A,0x66F6,0x763F,0x8868,0x9DFF,
+/* A:06 B:15 */
+0x1AAB,0x1ACA,0x1AEE,0x1B1A,0x1B4D,0x1B8A,0x1BD3,0x1C29,
+0x1C8F,0x1D09,0x1D9A,0x1E46,0x1F13,0x2006,0x2127,0x227E,
+0x2416,0x25FB,0x283C,0x2AE9,0x2E17,0x31DF,0x365D,0x3BB4,
+0x420D,0x4998,0x528F,0x5D36,0x69E0,0x78ED,0x8AD0,0xA012,
+/* A:06 B:16 */
+0x1F97,0x1FB5,0x1FD9,0x2003,0x2035,0x2071,0x20B9,0x210D,
+0x2172,0x21EA,0x2278,0x2321,0x23E9,0x24D8,0x25F4,0x2745,
+0x28D5,0x2AB1,0x2CE7,0x2F88,0x32A7,0x365D,0x3AC6,0x4004,
+0x463F,0x4DA6,0x5673,0x60E9,0x6D57,0x7C1D,0x8DAC,0xA28A,
+/* A:06 B:17 */
+0x2570,0x258D,0x25B0,0x25D9,0x260B,0x2645,0x268B,0x26DE,
+0x2740,0x27B5,0x2840,0x28E5,0x29AA,0x2A93,0x2BA8,0x2CF2,
+0x2E79,0x304B,0x3274,0x3506,0x3813,0x3BB4,0x4004,0x4524,
+0x4B3B,0x5279,0x5B13,0x654D,0x7175,0x7FE6,0x9111,0xA579,
+/* A:06 B:18 */
+0x2C63,0x2C7F,0x2CA1,0x2CC9,0x2CF9,0x2D32,0x2D76,0x2DC7,
+0x2E27,0x2E98,0x2F20,0x2FC0,0x307F,0x3162,0x3270,0x33B1,
+0x352E,0x36F3,0x390D,0x3B8D,0x3E85,0x420D,0x463F,0x4B3B,
+0x5129,0x5834,0x6093,0x6A86,0x7659,0x8467,0x951B,0xA8F5,
+/* A:06 B:19 */
+0x34A5,0x34C0,0x34E1,0x3508,0x3537,0x356E,0x35AF,0x35FD,
+0x365A,0x36C8,0x374B,0x37E6,0x389F,0x397A,0x3A7F,0x3BB5,
+0x3D26,0x3EDC,0x40E4,0x434F,0x462E,0x4998,0x4DA6,0x5279,
+0x5834,0x5F03,0x671C,0x70BA,0x7C2A,0x89C0,0x99E7,0xAD19,
+/* A:06 B:1a */
+0x3E76,0x3E90,0x3EB0,0x3ED5,0x3F02,0x3F37,0x3F75,0x3FC0,
+0x4019,0x4082,0x4100,0x4195,0x4246,0x4319,0x4413,0x453C,
+0x469E,0x4842,0x4A36,0x4C87,0x4F48,0x528F,0x5673,0x5B13,
+0x6093,0x671C,0x6EE0,0x781A,0x8313,0x901C,0x9F9B,0xB205,
+/* A:06 B:1b */
+0x4A20,0x4A39,0x4A57,0x4A7B,0x4AA5,0x4AD7,0x4B13,0x4B5A,
+0x4BAE,0x4C13,0x4C8A,0x4D17,0x4DC0,0x4E88,0x4F75,0x5090,
+0x51DF,0x536E,0x5549,0x577C,0x5A1A,0x5D36,0x60E9,0x654D,
+0x6A86,0x70BA,0x781A,0x80DE,0x8B49,0x97AB,0xA662,0xB7DF,
+/* A:06 B:1c */
+0x57FE,0x5815,0x5831,0x5853,0x587A,0x58A9,0x58E1,0x5924,
+0x5973,0x59D1,0x5A40,0x5AC5,0x5B63,0x5C1E,0x5CFD,0x5E05,
+0x5F40,0x60B6,0x6272,0x6482,0x66F6,0x69E0,0x6D57,0x7175,
+0x7659,0x7C2A,0x8313,0x8B49,0x950C,0xA0A6,0xAE70,0xBED3,
+/* A:06 B:1d */
+0x6878,0x688E,0x68A8,0x68C6,0x68EB,0x6916,0x694A,0x6987,
+0x69CF,0x6A26,0x6A8D,0x6B07,0x6B98,0x6C44,0x6D11,0x6E05,
+0x6F26,0x707E,0x7217,0x73FD,0x763F,0x78ED,0x7C1D,0x7FE6,
+0x8467,0x89C0,0x901C,0x97AB,0xA0A6,0xAB53,0xB803,0xC717,
+/* A:06 B:1e */
+0x7C0E,0x7C21,0x7C38,0x7C54,0x7C75,0x7C9C,0x7CCA,0x7D01,
+0x7D42,0x7D8F,0x7DEB,0x7E59,0x7EDB,0x7F76,0x802D,0x8108,
+0x820B,0x8340,0x84AF,0x8662,0x8868,0x8AD0,0x8DAC,0x9111,
+0x951B,0x99E7,0x9F9B,0xA662,0xAE70,0xB803,0xC364,0xD0E9,
+/* A:06 B:1f */
+0x9355,0x9366,0x937A,0x9391,0x93AD,0x93CF,0x93F7,0x9426,
+0x945E,0x94A1,0x94F1,0x954F,0x95C0,0x9645,0x96E4,0x97A0,
+0x9881,0x998B,0x9AC7,0x9C40,0x9DFF,0xA012,0xA28A,0xA579,
+0xA8F5,0xAD19,0xB205,0xB7DF,0xBED3,0xC717,0xD0E9,0xDC96,
+/* A: 968D89C0 */
+/* A:07 B:00 */
+0x01A3,0x01C4,0x01EC,0x021C,0x0254,0x0296,0x02E6,0x0344,
+0x03B4,0x0439,0x04D8,0x0594,0x0674,0x077E,0x08B9,0x0A31,
+0x0BEF,0x0E02,0x1078,0x1365,0x16E0,0x1B02,0x1FEC,0x25C3,
+0x2CB3,0x34F3,0x3EC1,0x4A67,0x5840,0x68B6,0x7C45,0x9384,
+/* A:07 B:01 */
+0x01C4,0x01E6,0x020E,0x023D,0x0275,0x02B8,0x0307,0x0365,
+0x03D5,0x045B,0x04F9,0x05B5,0x0695,0x079E,0x08DA,0x0A51,
+0x0C10,0x0E22,0x1098,0x1385,0x16FF,0x1B21,0x200A,0x25E0,
+0x2CD0,0x350F,0x3EDB,0x4A81,0x5858,0x68CB,0x7C58,0x9395,
+/* A:07 B:02 */
+0x01EC,0x020E,0x0235,0x0265,0x029D,0x02DF,0x032F,0x038D,
+0x03FD,0x0482,0x0520,0x05DC,0x06BC,0x07C5,0x0901,0x0A78,
+0x0C36,0x0E48,0x10BE,0x13AA,0x1724,0x1B45,0x202E,0x2603,
+0x2CF2,0x352F,0x3EFB,0x4A9E,0x5874,0x68E5,0x7C70,0x93A9,
+/* A:07 B:03 */
+0x021C,0x023D,0x0265,0x0294,0x02CC,0x030F,0x035E,0x03BC,
+0x042C,0x04B1,0x054F,0x060B,0x06EA,0x07F4,0x092F,0x0AA6,
+0x0C64,0x0E75,0x10EA,0x13D7,0x1750,0x1B70,0x2058,0x262C,
+0x2D1A,0x3556,0x3F20,0x4AC2,0x5895,0x6904,0x7C8B,0x93C1,
+/* A:07 B:04 */
+0x0254,0x0275,0x029D,0x02CC,0x0304,0x0347,0x0396,0x03F4,
+0x0464,0x04E9,0x0587,0x0642,0x0721,0x082B,0x0966,0x0ADD,
+0x0C9A,0x0EAB,0x1120,0x140B,0x1784,0x1BA3,0x208A,0x265E,
+0x2D4A,0x3585,0x3F4D,0x4AEC,0x58BD,0x6928,0x7CAC,0x93DD,
+/* A:07 B:05 */
+0x0296,0x02B8,0x02DF,0x030F,0x0347,0x0389,0x03D8,0x0436,
+0x04A6,0x052B,0x05C9,0x0684,0x0763,0x086C,0x09A7,0x0B1D,
+0x0CDA,0x0EEB,0x115F,0x144A,0x17C2,0x1BE0,0x20C6,0x2698,
+0x2D83,0x35BC,0x3F81,0x4B1E,0x58EC,0x6953,0x7CD2,0x93FE,
+/* A:07 B:06 */
+0x02E6,0x0307,0x032F,0x035E,0x0396,0x03D8,0x0427,0x0485,
+0x04F5,0x0579,0x0617,0x06D3,0x07B1,0x08BA,0x09F4,0x0B6A,
+0x0D27,0x0F37,0x11AB,0x1495,0x180B,0x1C29,0x210D,0x26DE,
+0x2DC7,0x35FD,0x3FC0,0x4B5A,0x5924,0x6987,0x7D01,0x9426,
+/* A:07 B:07 */
+0x0344,0x0365,0x038D,0x03BC,0x03F4,0x0436,0x0485,0x04E3,
+0x0552,0x05D7,0x0674,0x0730,0x080E,0x0916,0x0A51,0x0BC6,
+0x0D82,0x0F91,0x1204,0x14ED,0x1863,0x1C7F,0x2162,0x2730,
+0x2E17,0x364B,0x400B,0x4BA1,0x5966,0x69C4,0x7D37,0x9456,
+/* A:07 B:08 */
+0x03B4,0x03D5,0x03FD,0x042C,0x0464,0x04A6,0x04F5,0x0552,
+0x05C2,0x0646,0x06E3,0x079E,0x087C,0x0984,0x0ABE,0x0C33,
+0x0DEE,0x0FFD,0x126F,0x1556,0x18CB,0x1CE5,0x21C6,0x2793,
+0x2E77,0x36A8,0x4063,0x4BF5,0x59B5,0x6A0C,0x7D78,0x948E,
+/* A:07 B:09 */
+0x0439,0x045B,0x0482,0x04B1,0x04E9,0x052B,0x0579,0x05D7,
+0x0646,0x06CA,0x0767,0x0822,0x08FF,0x0A07,0x0B40,0x0CB4,
+0x0E6E,0x107C,0x12ED,0x15D4,0x1946,0x1D5F,0x223E,0x2807,
+0x2EE8,0x3715,0x40CD,0x4C59,0x5A13,0x6A63,0x7DC6,0x94D1,
+/* A:07 B:0a */
+0x04D8,0x04F9,0x0520,0x054F,0x0587,0x05C9,0x0617,0x0674,
+0x06E3,0x0767,0x0804,0x08BE,0x099B,0x0AA2,0x0BDA,0x0D4E,
+0x0F07,0x1114,0x1383,0x1668,0x19D9,0x1DF0,0x22CC,0x2892,
+0x2F70,0x3798,0x414A,0x4CD0,0x5A82,0x6AC9,0x7E22,0x9520,
+/* A:07 B:0b */
+0x0594,0x05B5,0x05DC,0x060B,0x0642,0x0684,0x06D3,0x0730,
+0x079E,0x0822,0x08BE,0x0977,0x0A54,0x0B5A,0x0C92,0x0E05,
+0x0FBD,0x11C8,0x1436,0x1719,0x1A88,0x1E9C,0x2374,0x2937,
+0x3010,0x3833,0x41DF,0x4D5E,0x5B07,0x6B43,0x7E8F,0x957E,
+/* A:07 B:0c */
+0x0674,0x0695,0x06BC,0x06EA,0x0721,0x0763,0x07B1,0x080E,
+0x087C,0x08FF,0x099B,0x0A54,0x0B30,0x0C36,0x0D6C,0x0EDE,
+0x1095,0x129E,0x150A,0x17EB,0x1B57,0x1F68,0x243D,0x29FB,
+0x30CF,0x38EC,0x4290,0x4E06,0x5BA4,0x6BD4,0x7F11,0x95EE,
+/* A:07 B:0d */
+0x077E,0x079E,0x07C5,0x07F4,0x082B,0x086C,0x08BA,0x0916,
+0x0984,0x0A07,0x0AA2,0x0B5A,0x0C36,0x0D3A,0x0E70,0x0FE0,
+0x1195,0x139D,0x1607,0x18E5,0x1C4E,0x205B,0x252B,0x2AE4,
+0x31B1,0x39C7,0x4362,0x4ECD,0x5C5F,0x6C80,0x7FAC,0x9674,
+/* A:07 B:0e */
+0x08B9,0x08DA,0x0901,0x092F,0x0966,0x09A7,0x09F4,0x0A51,
+0x0ABE,0x0B40,0x0BDA,0x0C92,0x0D6C,0x0E70,0x0FA4,0x1112,
+0x12C6,0x14CB,0x1733,0x1A0E,0x1D73,0x217B,0x2647,0x2BF9,
+0x32BF,0x3ACB,0x445C,0x4FBB,0x5D3E,0x6D4D,0x8063,0x9712,
+/* A:07 B:0f */
+0x0A31,0x0A51,0x0A78,0x0AA6,0x0ADD,0x0B1D,0x0B6A,0x0BC6,
+0x0C33,0x0CB4,0x0D4E,0x0E05,0x0EDE,0x0FE0,0x1112,0x127F,
+0x1430,0x1633,0x1897,0x1B6E,0x1ECF,0x22D2,0x2797,0x2D42,
+0x33FF,0x3C01,0x4585,0x50D5,0x5E46,0x6E40,0x813D,0x97CF,
+/* A:07 B:10 */
+0x0BEF,0x0C10,0x0C36,0x0C64,0x0C9A,0x0CDA,0x0D27,0x0D82,
+0x0DEE,0x0E6E,0x0F07,0x0FBD,0x1095,0x1195,0x12C6,0x1430,
+0x15DF,0x17DF,0x1A3F,0x1D12,0x206D,0x246A,0x2927,0x2ECA,
+0x357C,0x3D71,0x46E6,0x5224,0x5F80,0x6F61,0x8241,0x98AE,
+/* A:07 B:11 */
+0x0E02,0x0E22,0x0E48,0x0E75,0x0EAB,0x0EEB,0x0F37,0x0F91,
+0x0FFD,0x107C,0x1114,0x11C8,0x129E,0x139D,0x14CB,0x1633,
+0x17DF,0x19DB,0x1C36,0x1F04,0x2259,0x264E,0x2B03,0x309B,
+0x3740,0x3F26,0x488A,0x53B3,0x60F6,0x70B9,0x8375,0x99B8,
+/* A:07 B:12 */
+0x1078,0x1098,0x10BE,0x10EA,0x1120,0x115F,0x11AB,0x1204,
+0x126F,0x12ED,0x1383,0x1436,0x150A,0x1607,0x1733,0x1897,
+0x1A3F,0x1C36,0x1E8D,0x2154,0x24A1,0x288E,0x2D38,0x32C3,
+0x395A,0x412E,0x4A7D,0x558C,0x62B2,0x7251,0x84E3,0x9AF5,
+/* A:07 B:13 */
+0x1365,0x1385,0x13AA,0x13D7,0x140B,0x144A,0x1495,0x14ED,
+0x1556,0x15D4,0x1668,0x1719,0x17EB,0x18E5,0x1A0E,0x1B6E,
+0x1D12,0x1F04,0x2154,0x2414,0x2758,0x2B3A,0x2FD8,0x3554,
+0x3BD9,0x4398,0x4CCE,0x57BF,0x64C1,0x7437,0x8696,0x9C6C,
+/* A:07 B:14 */
+0x16E0,0x16FF,0x1724,0x1750,0x1784,0x17C2,0x180B,0x1863,
+0x18CB,0x1946,0x19D9,0x1A88,0x1B57,0x1C4E,0x1D73,0x1ECF,
+0x206D,0x2259,0x24A1,0x2758,0x2A92,0x2E67,0x32F6,0x3860,
+0x3ED0,0x4677,0x4F8E,0x5A5C,0x6734,0x7677,0x889B,0x9E2B,
+/* A:07 B:15 */
+0x1B02,0x1B21,0x1B45,0x1B70,0x1BA3,0x1BE0,0x1C29,0x1C7F,
+0x1CE5,0x1D5F,0x1DF0,0x1E9C,0x1F68,0x205B,0x217B,0x22D2,
+0x246A,0x264E,0x288E,0x2B3A,0x2E67,0x322E,0x36AB,0x3C00,
+0x4257,0x49DF,0x52D3,0x5D77,0x6A1D,0x7925,0x8B02,0xA03E,
+/* A:07 B:16 */
+0x1FEC,0x200A,0x202E,0x2058,0x208A,0x20C6,0x210D,0x2162,
+0x21C6,0x223E,0x22CC,0x2374,0x243D,0x252B,0x2647,0x2797,
+0x2927,0x2B03,0x2D38,0x2FD8,0x32F6,0x36AB,0x3B12,0x404F,
+0x4687,0x4DED,0x56B6,0x6128,0x6D93,0x7C54,0x8DDD,0xA2B4,
+/* A:07 B:17 */
+0x25C3,0x25E0,0x2603,0x262C,0x265E,0x2698,0x26DE,0x2730,
+0x2793,0x2807,0x2892,0x2937,0x29FB,0x2AE4,0x2BF9,0x2D42,
+0x2ECA,0x309B,0x32C3,0x3554,0x3860,0x3C00,0x404F,0x456D,
+0x4B82,0x52BD,0x5B55,0x658C,0x71AF,0x801C,0x9141,0xA5A2,
+/* A:07 B:18 */
+0x2CB3,0x2CD0,0x2CF2,0x2D1A,0x2D4A,0x2D83,0x2DC7,0x2E17,
+0x2E77,0x2EE8,0x2F70,0x3010,0x30CF,0x31B1,0x32BF,0x33FF,
+0x357C,0x3740,0x395A,0x3BD9,0x3ED0,0x4257,0x4687,0x4B82,
+0x516E,0x5876,0x60D3,0x6AC3,0x7692,0x849B,0x954A,0xA91D,
+/* A:07 B:19 */
+0x34F3,0x350F,0x352F,0x3556,0x3585,0x35BC,0x35FD,0x364B,
+0x36A8,0x3715,0x3798,0x3833,0x38EC,0x39C7,0x3ACB,0x3C01,
+0x3D71,0x3F26,0x412E,0x4398,0x4677,0x49DF,0x4DED,0x52BD,
+0x5876,0x5F44,0x6759,0x70F5,0x7C60,0x89F3,0x9A14,0xAD40,
+/* A:07 B:1a */
+0x3EC1,0x3EDB,0x3EFB,0x3F20,0x3F4D,0x3F81,0x3FC0,0x400B,
+0x4063,0x40CD,0x414A,0x41DF,0x4290,0x4362,0x445C,0x4585,
+0x46E6,0x488A,0x4A7D,0x4CCE,0x4F8E,0x52D3,0x56B6,0x5B55,
+0x60D3,0x6759,0x6F1B,0x7853,0x8347,0x904D,0x9FC6,0xB22B,
+/* A:07 B:1b */
+0x4A67,0x4A81,0x4A9E,0x4AC2,0x4AEC,0x4B1E,0x4B5A,0x4BA1,
+0x4BF5,0x4C59,0x4CD0,0x4D5E,0x4E06,0x4ECD,0x4FBB,0x50D5,
+0x5224,0x53B3,0x558C,0x57BF,0x5A5C,0x5D77,0x6128,0x658C,
+0x6AC3,0x70F5,0x7853,0x8114,0x8B7B,0x97D9,0xA68B,0xB802,
+/* A:07 B:1c */
+0x5840,0x5858,0x5874,0x5895,0x58BD,0x58EC,0x5924,0x5966,
+0x59B5,0x5A13,0x5A82,0x5B07,0x5BA4,0x5C5F,0x5D3E,0x5E46,
+0x5F80,0x60F6,0x62B2,0x64C1,0x6734,0x6A1D,0x6D93,0x71AF,
+0x7692,0x7C60,0x8347,0x8B7B,0x953B,0xA0D1,0xAE96,0xBEF4,
+/* A:07 B:1d */
+0x68B6,0x68CB,0x68E5,0x6904,0x6928,0x6953,0x6987,0x69C4,
+0x6A0C,0x6A63,0x6AC9,0x6B43,0x6BD4,0x6C80,0x6D4D,0x6E40,
+0x6F61,0x70B9,0x7251,0x7437,0x7677,0x7925,0x7C54,0x801C,
+0x849B,0x89F3,0x904D,0x97D9,0xA0D1,0xAB7A,0xB826,0xC735,
+/* A:07 B:1e */
+0x7C45,0x7C58,0x7C70,0x7C8B,0x7CAC,0x7CD2,0x7D01,0x7D37,
+0x7D78,0x7DC6,0x7E22,0x7E8F,0x7F11,0x7FAC,0x8063,0x813D,
+0x8241,0x8375,0x84E3,0x8696,0x889B,0x8B02,0x8DDD,0x9141,
+0x954A,0x9A14,0x9FC6,0xA68B,0xAE96,0xB826,0xC383,0xD104,
+/* A:07 B:1f */
+0x9384,0x9395,0x93A9,0x93C1,0x93DD,0x93FE,0x9426,0x9456,
+0x948E,0x94D1,0x9520,0x957E,0x95EE,0x9674,0x9712,0x97CF,
+0x98AE,0x99B8,0x9AF5,0x9C6C,0x9E2B,0xA03E,0xA2B4,0xA5A2,
+0xA91D,0xAD40,0xB22B,0xB802,0xBEF4,0xC735,0xD104,0xDCAD,
+/* A: 968D89C0 */
+/* A:08 B:00 */
+0x0214,0x0235,0x025D,0x028C,0x02C4,0x0307,0x0356,0x03B4,
+0x0424,0x04A9,0x0547,0x0603,0x06E3,0x07EC,0x0927,0x0A9E,
+0x0C5C,0x0E6E,0x10E3,0x13CF,0x1748,0x1B69,0x2051,0x2626,
+0x2D14,0x3550,0x3F1A,0x4ABC,0x5890,0x68FF,0x7C86,0x93BD,
+/* A:08 B:01 */
+0x0235,0x0257,0x027E,0x02AD,0x02E5,0x0328,0x0377,0x03D5,
+0x0445,0x04CA,0x0568,0x0624,0x0703,0x080D,0x0948,0x0ABF,
+0x0C7C,0x0E8E,0x1103,0x13EF,0x1767,0x1B88,0x206F,0x2643,
+0x2D30,0x356C,0x3F34,0x4AD5,0x58A7,0x6914,0x7C9A,0x93CE,
+/* A:08 B:02 */
+0x025D,0x027E,0x02A6,0x02D5,0x030D,0x0350,0x039F,0x03FD,
+0x046D,0x04F2,0x0590,0x064B,0x072B,0x0834,0x096F,0x0AE5,
+0x0CA3,0x0EB4,0x1129,0x1414,0x178C,0x1BAC,0x2092,0x2666,
+0x2D52,0x358C,0x3F54,0x4AF3,0x58C3,0x692E,0x7CB1,0x93E2,
+/* A:08 B:03 */
+0x028C,0x02AD,0x02D5,0x0304,0x033C,0x037F,0x03CE,0x042C,
+0x049C,0x0520,0x05BE,0x067A,0x0759,0x0862,0x099D,0x0B13,
+0x0CD0,0x0EE1,0x1155,0x1440,0x17B8,0x1BD7,0x20BD,0x268F,
+0x2D7A,0x35B3,0x3F79,0x4B17,0x58E4,0x694D,0x7CCC,0x93F9,
+/* A:08 B:04 */
+0x02C4,0x02E5,0x030D,0x033C,0x0374,0x03B7,0x0406,0x0464,
+0x04D3,0x0558,0x05F6,0x06B1,0x0790,0x0899,0x09D4,0x0B4A,
+0x0D06,0x0F17,0x118B,0x1475,0x17EC,0x1C0A,0x20EF,0x26C0,
+0x2DAA,0x35E2,0x3FA5,0x4B41,0x590C,0x6971,0x7CED,0x9415,
+/* A:08 B:05 */
+0x0307,0x0328,0x0350,0x037F,0x03B7,0x03F9,0x0448,0x04A6,
+0x0516,0x059A,0x0638,0x06F3,0x07D2,0x08DA,0x0A15,0x0B8A,
+0x0D47,0x0F56,0x11CA,0x14B4,0x182A,0x1C47,0x212B,0x26FB,
+0x2DE3,0x3619,0x3FDA,0x4B73,0x593B,0x699C,0x7D14,0x9437,
+/* A:08 B:06 */
+0x0356,0x0377,0x039F,0x03CE,0x0406,0x0448,0x0497,0x04F5,
+0x0564,0x05E9,0x0686,0x0741,0x0820,0x0928,0x0A62,0x0BD7,
+0x0D93,0x0FA2,0x1215,0x14FE,0x1873,0x1C8F,0x2172,0x2740,
+0x2E27,0x365A,0x4019,0x4BAE,0x5973,0x69CF,0x7D42,0x945E,
+/* A:08 B:07 */
+0x03B4,0x03D5,0x03FD,0x042C,0x0464,0x04A6,0x04F5,0x0552,
+0x05C2,0x0646,0x06E3,0x079E,0x087C,0x0984,0x0ABE,0x0C33,
+0x0DEE,0x0FFD,0x126F,0x1556,0x18CB,0x1CE5,0x21C6,0x2793,
+0x2E77,0x36A8,0x4063,0x4BF5,0x59B5,0x6A0C,0x7D78,0x948E,
+/* A:08 B:08 */
+0x0424,0x0445,0x046D,0x049C,0x04D3,0x0516,0x0564,0x05C2,
+0x0631,0x06B5,0x0752,0x080D,0x08EA,0x09F2,0x0B2B,0x0C9F,
+0x0E5A,0x1068,0x12D9,0x15C0,0x1932,0x1D4C,0x222B,0x27F5,
+0x2ED6,0x3704,0x40BC,0x4C49,0x5A04,0x6A55,0x7DB9,0x94C6,
+/* A:08 B:09 */
+0x04A9,0x04CA,0x04F2,0x0520,0x0558,0x059A,0x05E9,0x0646,
+0x06B5,0x0739,0x07D6,0x0890,0x096D,0x0A74,0x0BAD,0x0D21,
+0x0EDA,0x10E7,0x1357,0x163D,0x19AE,0x1DC5,0x22A2,0x2869,
+0x2F48,0x3772,0x4125,0x4CAD,0x5A61,0x6AAB,0x7E07,0x9509,
+/* A:08 B:0a */
+0x0547,0x0568,0x0590,0x05BE,0x05F6,0x0638,0x0686,0x06E3,
+0x0752,0x07D6,0x0872,0x092C,0x0A09,0x0B0F,0x0C47,0x0DBA,
+0x0F73,0x117F,0x13ED,0x16D1,0x1A40,0x1E56,0x2330,0x28F4,
+0x2FCF,0x37F4,0x41A2,0x4D24,0x5AD1,0x6B12,0x7E63,0x9558,
+/* A:08 B:0b */
+0x0603,0x0624,0x064B,0x067A,0x06B1,0x06F3,0x0741,0x079E,
+0x080D,0x0890,0x092C,0x09E5,0x0AC2,0x0BC7,0x0CFF,0x0E70,
+0x1028,0x1233,0x14A0,0x1782,0x1AEF,0x1F01,0x23D8,0x2999,
+0x306F,0x388F,0x4237,0x4DB1,0x5B55,0x6B8B,0x7ED0,0x95B6,
+/* A:08 B:0c */
+0x06E3,0x0703,0x072B,0x0759,0x0790,0x07D2,0x0820,0x087C,
+0x08EA,0x096D,0x0A09,0x0AC2,0x0B9D,0x0CA2,0x0DD9,0x0F49,
+0x1100,0x1308,0x1574,0x1853,0x1BBE,0x1FCD,0x24A0,0x2A5C,
+0x312D,0x3947,0x42E8,0x4E59,0x5BF2,0x6C1C,0x7F52,0x9626,
+/* A:08 B:0d */
+0x07EC,0x080D,0x0834,0x0862,0x0899,0x08DA,0x0928,0x0984,
+0x09F2,0x0A74,0x0B0F,0x0BC7,0x0CA2,0x0DA6,0x0EDC,0x104B,
+0x1200,0x1407,0x1670,0x194D,0x1CB4,0x20C0,0x258E,0x2B45,
+0x3210,0x3A22,0x43BA,0x4F20,0x5CAD,0x6CC8,0x7FEC,0x96AB,
+/* A:08 B:0e */
+0x0927,0x0948,0x096F,0x099D,0x09D4,0x0A15,0x0A62,0x0ABE,
+0x0B2B,0x0BAD,0x0C47,0x0CFF,0x0DD9,0x0EDC,0x100F,0x117D,
+0x1330,0x1535,0x179B,0x1A75,0x1DD9,0x21E0,0x26A9,0x2C5A,
+0x331D,0x3B26,0x44B3,0x500D,0x5D8B,0x6D94,0x80A3,0x9749,
+/* A:08 B:0f */
+0x0A9E,0x0ABF,0x0AE5,0x0B13,0x0B4A,0x0B8A,0x0BD7,0x0C33,
+0x0C9F,0x0D21,0x0DBA,0x0E70,0x0F49,0x104B,0x117D,0x12E9,
+0x149A,0x169C,0x18FF,0x1BD5,0x1F34,0x2336,0x27F9,0x2DA2,
+0x345C,0x3C5B,0x45DC,0x5127,0x5E93,0x6E87,0x817D,0x9805,
+/* A:08 B:10 */
+0x0C5C,0x0C7C,0x0CA3,0x0CD0,0x0D06,0x0D47,0x0D93,0x0DEE,
+0x0E5A,0x0EDA,0x0F73,0x1028,0x1100,0x1200,0x1330,0x149A,
+0x1648,0x1847,0x1AA6,0x1D78,0x20D2,0x24CD,0x2989,0x2F29,
+0x35D9,0x3DCB,0x473C,0x5276,0x5FCD,0x6FA8,0x8280,0x98E5,
+/* A:08 B:11 */
+0x0E6E,0x0E8E,0x0EB4,0x0EE1,0x0F17,0x0F56,0x0FA2,0x0FFD,
+0x1068,0x10E7,0x117F,0x1233,0x1308,0x1407,0x1535,0x169C,
+0x1847,0x1A42,0x1C9D,0x1F69,0x22BD,0x26B1,0x2B64,0x30F9,
+0x379C,0x3F7F,0x48DF,0x5404,0x6142,0x70FF,0x83B3,0x99EE,
+/* A:08 B:12 */
+0x10E3,0x1103,0x1129,0x1155,0x118B,0x11CA,0x1215,0x126F,
+0x12D9,0x1357,0x13ED,0x14A0,0x1574,0x1670,0x179B,0x18FF,
+0x1AA6,0x1C9D,0x1EF2,0x21B8,0x2505,0x28F0,0x2D98,0x3321,
+0x39B5,0x4187,0x4AD1,0x55DD,0x62FD,0x7297,0x8521,0x9B2A,
+/* A:08 B:13 */
+0x13CF,0x13EF,0x1414,0x1440,0x1475,0x14B4,0x14FE,0x1556,
+0x15C0,0x163D,0x16D1,0x1782,0x1853,0x194D,0x1A75,0x1BD5,
+0x1D78,0x1F69,0x21B8,0x2477,0x27BA,0x2B9B,0x3037,0x35B1,
+0x3C33,0x43EF,0x4D21,0x580F,0x650C,0x747B,0x86D4,0x9CA1,
+/* A:08 B:14 */
+0x1748,0x1767,0x178C,0x17B8,0x17EC,0x182A,0x1873,0x18CB,
+0x1932,0x19AE,0x1A40,0x1AEF,0x1BBE,0x1CB4,0x1DD9,0x1F34,
+0x20D2,0x22BD,0x2505,0x27BA,0x2AF3,0x2EC7,0x3354,0x38BC,
+0x3F29,0x46CD,0x4FE1,0x5AAB,0x677E,0x76BB,0x88D8,0x9E5F,
+/* A:08 B:15 */
+0x1B69,0x1B88,0x1BAC,0x1BD7,0x1C0A,0x1C47,0x1C8F,0x1CE5,
+0x1D4C,0x1DC5,0x1E56,0x1F01,0x1FCD,0x20C0,0x21E0,0x2336,
+0x24CD,0x26B1,0x28F0,0x2B9B,0x2EC7,0x328C,0x3707,0x3C5A,
+0x42AE,0x4A34,0x5325,0x5DC5,0x6A65,0x7968,0x8B3E,0xA071,
+/* A:08 B:16 */
+0x2051,0x206F,0x2092,0x20BD,0x20EF,0x212B,0x2172,0x21C6,
+0x222B,0x22A2,0x2330,0x23D8,0x24A0,0x258E,0x26A9,0x27F9,
+0x2989,0x2B64,0x2D98,0x3037,0x3354,0x3707,0x3B6D,0x40A7,
+0x46DE,0x4E40,0x5706,0x6174,0x6DDA,0x7C95,0x8E18,0xA2E7,
+/* A:08 B:17 */
+0x2626,0x2643,0x2666,0x268F,0x26C0,0x26FB,0x2740,0x2793,
+0x27F5,0x2869,0x28F4,0x2999,0x2A5C,0x2B45,0x2C5A,0x2DA2,
+0x2F29,0x30F9,0x3321,0x35B1,0x38BC,0x3C5A,0x40A7,0x45C4,
+0x4BD7,0x530F,0x5BA3,0x65D6,0x71F4,0x805C,0x917B,0xA5D3,
+/* A:08 B:18 */
+0x2D14,0x2D30,0x2D52,0x2D7A,0x2DAA,0x2DE3,0x2E27,0x2E77,
+0x2ED6,0x2F48,0x2FCF,0x306F,0x312D,0x3210,0x331D,0x345C,
+0x35D9,0x379C,0x39B5,0x3C33,0x3F29,0x42AE,0x46DE,0x4BD7,
+0x51BF,0x58C6,0x611F,0x6B0B,0x76D5,0x84D9,0x9581,0xA94D,
+/* A:08 B:19 */
+0x3550,0x356C,0x358C,0x35B3,0x35E2,0x3619,0x365A,0x36A8,
+0x3704,0x3772,0x37F4,0x388F,0x3947,0x3A22,0x3B26,0x3C5B,
+0x3DCB,0x3F7F,0x4187,0x43EF,0x46CD,0x4A34,0x4E40,0x530F,
+0x58C6,0x5F90,0x67A3,0x713B,0x7CA2,0x8A2F,0x9A4A,0xAD6E,
+/* A:08 B:1a */
+0x3F1A,0x3F34,0x3F54,0x3F79,0x3FA5,0x3FDA,0x4019,0x4063,
+0x40BC,0x4125,0x41A2,0x4237,0x42E8,0x43BA,0x44B3,0x45DC,
+0x473C,0x48DF,0x4AD1,0x4D21,0x4FE1,0x5325,0x5706,0x5BA3,
+0x611F,0x67A3,0x6F61,0x7895,0x8386,0x9086,0x9FFA,0xB257,
+/* A:08 B:1b */
+0x4ABC,0x4AD5,0x4AF3,0x4B17,0x4B41,0x4B73,0x4BAE,0x4BF5,
+0x4C49,0x4CAD,0x4D24,0x4DB1,0x4E59,0x4F20,0x500D,0x5127,
+0x5276,0x5404,0x55DD,0x580F,0x5AAB,0x5DC5,0x6174,0x65D6,
+0x6B0B,0x713B,0x7895,0x8153,0x8BB7,0x980F,0xA6BC,0xB82C,
+/* A:08 B:1c */
+0x5890,0x58A7,0x58C3,0x58E4,0x590C,0x593B,0x5973,0x59B5,
+0x5A04,0x5A61,0x5AD1,0x5B55,0x5BF2,0x5CAD,0x5D8B,0x5E93,
+0x5FCD,0x6142,0x62FD,0x650C,0x677E,0x6A65,0x6DDA,0x71F4,
+0x76D5,0x7CA2,0x8386,0x8BB7,0x9572,0xA104,0xAEC4,0xBF1C,
+/* A:08 B:1d */
+0x68FF,0x6914,0x692E,0x694D,0x6971,0x699C,0x69CF,0x6A0C,
+0x6A55,0x6AAB,0x6B12,0x6B8B,0x6C1C,0x6CC8,0x6D94,0x6E87,
+0x6FA8,0x70FF,0x7297,0x747B,0x76BB,0x7968,0x7C95,0x805C,
+0x84D9,0x8A2F,0x9086,0x980F,0xA104,0xABA9,0xB850,0xC759,
+/* A:08 B:1e */
+0x7C86,0x7C9A,0x7CB1,0x7CCC,0x7CED,0x7D14,0x7D42,0x7D78,
+0x7DB9,0x7E07,0x7E63,0x7ED0,0x7F52,0x7FEC,0x80A3,0x817D,
+0x8280,0x83B3,0x8521,0x86D4,0x88D8,0x8B3E,0x8E18,0x917B,
+0x9581,0x9A4A,0x9FFA,0xA6BC,0xAEC4,0xB850,0xC3A8,0xD124,
+/* A:08 B:1f */
+0x93BD,0x93CE,0x93E2,0x93F9,0x9415,0x9437,0x945E,0x948E,
+0x94C6,0x9509,0x9558,0x95B6,0x9626,0x96AB,0x9749,0x9805,
+0x98E5,0x99EE,0x9B2A,0x9CA1,0x9E5F,0xA071,0xA2E7,0xA5D3,
+0xA94D,0xAD6E,0xB257,0xB82C,0xBF1C,0xC759,0xD124,0xDCC8,
+/* A: 968D89C0 */
+/* A:09 B:00 */
+0x029A,0x02BB,0x02E3,0x0312,0x034A,0x038C,0x03DB,0x0439,
+0x04A9,0x052E,0x05CC,0x0687,0x0766,0x086F,0x09AA,0x0B20,
+0x0CDD,0x0EEE,0x1162,0x144D,0x17C5,0x1BE3,0x20C9,0x269B,
+0x2D86,0x35BF,0x3F84,0x4B21,0x58EE,0x6955,0x7CD4,0x9400,
+/* A:09 B:01 */
+0x02BB,0x02DC,0x0304,0x0333,0x036B,0x03AE,0x03FD,0x045B,
+0x04CA,0x054F,0x05ED,0x06A8,0x0787,0x0890,0x09CB,0x0B41,
+0x0CFD,0x0F0E,0x1182,0x146C,0x17E3,0x1C02,0x20E7,0x26B8,
+0x2DA2,0x35DA,0x3F9E,0x4B3A,0x5906,0x696B,0x7CE8,0x9411,
+/* A:09 B:02 */
+0x02E3,0x0304,0x032C,0x035B,0x0393,0x03D5,0x0424,0x0482,
+0x04F2,0x0576,0x0614,0x06CF,0x07AE,0x08B7,0x09F1,0x0B67,
+0x0D24,0x0F34,0x11A8,0x1492,0x1808,0x1C26,0x210A,0x26DB,
+0x2DC4,0x35FB,0x3FBE,0x4B58,0x5921,0x6985,0x7CFF,0x9425,
+/* A:09 B:03 */
+0x0312,0x0333,0x035B,0x038A,0x03C2,0x0404,0x0453,0x04B1,
+0x0520,0x05A5,0x0643,0x06FE,0x07DC,0x08E5,0x0A1F,0x0B95,
+0x0D51,0x0F61,0x11D4,0x14BE,0x1834,0x1C51,0x2135,0x2704,
+0x2DEC,0x3622,0x3FE3,0x4B7B,0x5943,0x69A3,0x7D1A,0x943C,
+/* A:09 B:04 */
+0x034A,0x036B,0x0393,0x03C2,0x03FA,0x043C,0x048B,0x04E9,
+0x0558,0x05DD,0x067A,0x0735,0x0814,0x091C,0x0A56,0x0BCB,
+0x0D87,0x0F97,0x1209,0x14F2,0x1868,0x1C84,0x2167,0x2735,
+0x2E1C,0x3650,0x400F,0x4BA5,0x596A,0x69C7,0x7D3B,0x9458,
+/* A:09 B:05 */
+0x038C,0x03AE,0x03D5,0x0404,0x043C,0x047E,0x04CD,0x052B,
+0x059A,0x061F,0x06BC,0x0777,0x0855,0x095D,0x0A97,0x0C0C,
+0x0DC7,0x0FD6,0x1249,0x1531,0x18A6,0x1CC1,0x21A3,0x2770,
+0x2E55,0x3687,0x4044,0x4BD7,0x5999,0x69F3,0x7D61,0x947A,
+/* A:09 B:06 */
+0x03DB,0x03FD,0x0424,0x0453,0x048B,0x04CD,0x051C,0x0579,
+0x05E9,0x066D,0x070A,0x07C5,0x08A3,0x09AB,0x0AE4,0x0C59,
+0x0E14,0x1022,0x1294,0x157B,0x18EF,0x1D09,0x21EA,0x27B5,
+0x2E98,0x36C8,0x4082,0x4C13,0x59D1,0x6A26,0x7D8F,0x94A1,
+/* A:09 B:07 */
+0x0439,0x045B,0x0482,0x04B1,0x04E9,0x052B,0x0579,0x05D7,
+0x0646,0x06CA,0x0767,0x0822,0x08FF,0x0A07,0x0B40,0x0CB4,
+0x0E6E,0x107C,0x12ED,0x15D4,0x1946,0x1D5F,0x223E,0x2807,
+0x2EE8,0x3715,0x40CD,0x4C59,0x5A13,0x6A63,0x7DC6,0x94D1,
+/* A:09 B:08 */
+0x04A9,0x04CA,0x04F2,0x0520,0x0558,0x059A,0x05E9,0x0646,
+0x06B5,0x0739,0x07D6,0x0890,0x096D,0x0A74,0x0BAD,0x0D21,
+0x0EDA,0x10E7,0x1357,0x163D,0x19AE,0x1DC5,0x22A2,0x2869,
+0x2F48,0x3772,0x4125,0x4CAD,0x5A61,0x6AAB,0x7E07,0x9509,
+/* A:09 B:09 */
+0x052E,0x054F,0x0576,0x05A5,0x05DD,0x061F,0x066D,0x06CA,
+0x0739,0x07BC,0x0859,0x0913,0x09F0,0x0AF6,0x0C2F,0x0DA1,
+0x0F5A,0x1166,0x13D5,0x16B9,0x1A29,0x1E3E,0x2319,0x28DE,
+0x2FB9,0x37DF,0x418E,0x4D11,0x5ABF,0x6B01,0x7E54,0x954B,
+/* A:09 B:0a */
+0x05CC,0x05ED,0x0614,0x0643,0x067A,0x06BC,0x070A,0x0767,
+0x07D6,0x0859,0x08F5,0x09AF,0x0A8B,0x0B91,0x0CC9,0x0E3B,
+0x0FF3,0x11FE,0x146B,0x174E,0x1ABB,0x1ECF,0x23A7,0x2968,
+0x3040,0x3861,0x420B,0x4D87,0x5B2E,0x6B67,0x7EB0,0x959A,
+/* A:09 B:0b */
+0x0687,0x06A8,0x06CF,0x06FE,0x0735,0x0777,0x07C5,0x0822,
+0x0890,0x0913,0x09AF,0x0A68,0x0B44,0x0C49,0x0D80,0x0EF1,
+0x10A8,0x12B1,0x151D,0x17FE,0x1B69,0x1F7A,0x244F,0x2A0D,
+0x30E0,0x38FC,0x42A0,0x4E14,0x5BB2,0x6BE1,0x7F1D,0x95F8,
+/* A:09 B:0c */
+0x0766,0x0787,0x07AE,0x07DC,0x0814,0x0855,0x08A3,0x08FF,
+0x096D,0x09F0,0x0A8B,0x0B44,0x0C1F,0x0D23,0x0E59,0x0FC9,
+0x117F,0x1387,0x15F1,0x18CF,0x1C38,0x2046,0x2517,0x2AD0,
+0x319E,0x39B4,0x4350,0x4EBC,0x5C4F,0x6C71,0x7F9E,0x9668,
+/* A:09 B:0d */
+0x086F,0x0890,0x08B7,0x08E5,0x091C,0x095D,0x09AB,0x0A07,
+0x0A74,0x0AF6,0x0B91,0x0C49,0x0D23,0x0E27,0x0F5C,0x10CA,
+0x127E,0x1484,0x16EC,0x19C8,0x1D2E,0x2137,0x2604,0x2BB8,
+0x3280,0x3A8E,0x4422,0x4F83,0x5D0A,0x6D1D,0x8038,0x96ED,
+/* A:09 B:0e */
+0x09AA,0x09CB,0x09F1,0x0A1F,0x0A56,0x0A97,0x0AE4,0x0B40,
+0x0BAD,0x0C2F,0x0CC9,0x0D80,0x0E59,0x0F5C,0x108F,0x11FC,
+0x13AE,0x15B2,0x1817,0x1AF0,0x1E52,0x2257,0x271E,0x2CCC,
+0x338C,0x3B92,0x451B,0x5070,0x5DE7,0x6DE9,0x80EF,0x978B,
+/* A:09 B:0f */
+0x0B20,0x0B41,0x0B67,0x0B95,0x0BCB,0x0C0C,0x0C59,0x0CB4,
+0x0D21,0x0DA1,0x0E3B,0x0EF1,0x0FC9,0x10CA,0x11FC,0x1367,
+0x1517,0x1718,0x197A,0x1C4F,0x1FAD,0x23AD,0x286E,0x2E14,
+0x34CB,0x3CC7,0x4643,0x5189,0x5EEF,0x6EDB,0x81C8,0x9847,
+/* A:09 B:10 */
+0x0CDD,0x0CFD,0x0D24,0x0D51,0x0D87,0x0DC7,0x0E14,0x0E6E,
+0x0EDA,0x0F5A,0x0FF3,0x10A8,0x117F,0x127E,0x13AE,0x1517,
+0x16C4,0x18C2,0x1B21,0x1DF1,0x2149,0x2543,0x29FD,0x2F9A,
+0x3647,0x3E35,0x47A3,0x52D7,0x6028,0x6FFB,0x82CB,0x9926,
+/* A:09 B:11 */
+0x0EEE,0x0F0E,0x0F34,0x0F61,0x0F97,0x0FD6,0x1022,0x107C,
+0x10E7,0x1166,0x11FE,0x12B1,0x1387,0x1484,0x15B2,0x1718,
+0x18C2,0x1ABD,0x1D17,0x1FE2,0x2334,0x2726,0x2BD7,0x316A,
+0x380A,0x3FE9,0x4945,0x5464,0x619C,0x7152,0x83FE,0x9A2F,
+/* A:09 B:12 */
+0x1162,0x1182,0x11A8,0x11D4,0x1209,0x1249,0x1294,0x12ED,
+0x1357,0x13D5,0x146B,0x151D,0x15F1,0x16EC,0x1817,0x197A,
+0x1B21,0x1D17,0x1F6B,0x2230,0x257A,0x2964,0x2E0A,0x3390,
+0x3A21,0x41EF,0x4B36,0x563C,0x6356,0x72E9,0x856B,0x9B6A,
+/* A:09 B:13 */
+0x144D,0x146C,0x1492,0x14BE,0x14F2,0x1531,0x157B,0x15D4,
+0x163D,0x16B9,0x174E,0x17FE,0x18CF,0x19C8,0x1AF0,0x1C4F,
+0x1DF1,0x1FE2,0x2230,0x24ED,0x282F,0x2C0E,0x30A7,0x361F,
+0x3C9E,0x4457,0x4D85,0x586D,0x6564,0x74CD,0x871D,0x9CE0,
+/* A:09 B:14 */
+0x17C5,0x17E3,0x1808,0x1834,0x1868,0x18A6,0x18EF,0x1946,
+0x19AE,0x1A29,0x1ABB,0x1B69,0x1C38,0x1D2E,0x1E52,0x1FAD,
+0x2149,0x2334,0x257A,0x282F,0x2B66,0x2F38,0x33C3,0x3929,
+0x3F93,0x4733,0x5043,0x5B08,0x67D5,0x770B,0x8920,0x9E9D,
+/* A:09 B:15 */
+0x1BE3,0x1C02,0x1C26,0x1C51,0x1C84,0x1CC1,0x1D09,0x1D5F,
+0x1DC5,0x1E3E,0x1ECF,0x1F7A,0x2046,0x2137,0x2257,0x23AD,
+0x2543,0x2726,0x2964,0x2C0E,0x2F38,0x32FC,0x3775,0x3CC5,
+0x4317,0x4A99,0x5385,0x5E21,0x6ABB,0x79B7,0x8B85,0xA0AE,
+/* A:09 B:16 */
+0x20C9,0x20E7,0x210A,0x2135,0x2167,0x21A3,0x21EA,0x223E,
+0x22A2,0x2319,0x23A7,0x244F,0x2517,0x2604,0x271E,0x286E,
+0x29FD,0x2BD7,0x2E0A,0x30A7,0x33C3,0x3775,0x3BD9,0x4110,
+0x4744,0x4EA3,0x5765,0x61CE,0x6E2E,0x7CE3,0x8E5D,0xA323,
+/* A:09 B:17 */
+0x269B,0x26B8,0x26DB,0x2704,0x2735,0x2770,0x27B5,0x2807,
+0x2869,0x28DE,0x2968,0x2A0D,0x2AD0,0x2BB8,0x2CCC,0x2E14,
+0x2F9A,0x316A,0x3390,0x361F,0x3929,0x3CC5,0x4110,0x462A,
+0x4C3B,0x536F,0x5C00,0x662E,0x7247,0x80A8,0x91BF,0xA60E,
+/* A:09 B:18 */
+0x2D86,0x2DA2,0x2DC4,0x2DEC,0x2E1C,0x2E55,0x2E98,0x2EE8,
+0x2F48,0x2FB9,0x3040,0x30E0,0x319E,0x3280,0x338C,0x34CB,
+0x3647,0x380A,0x3A21,0x3C9E,0x3F93,0x4317,0x4744,0x4C3B,
+0x5221,0x5924,0x6179,0x6B60,0x7726,0x8523,0x95C3,0xA986,
+/* A:09 B:19 */
+0x35BF,0x35DA,0x35FB,0x3622,0x3650,0x3687,0x36C8,0x3715,
+0x3772,0x37DF,0x3861,0x38FC,0x39B4,0x3A8E,0x3B92,0x3CC7,
+0x3E35,0x3FE9,0x41EF,0x4457,0x4733,0x4A99,0x4EA3,0x536F,
+0x5924,0x5FEB,0x67FA,0x718E,0x7CEF,0x8A76,0x9A8A,0xADA5,
+/* A:09 B:1a */
+0x3F84,0x3F9E,0x3FBE,0x3FE3,0x400F,0x4044,0x4082,0x40CD,
+0x4125,0x418E,0x420B,0x42A0,0x4350,0x4422,0x451B,0x4643,
+0x47A3,0x4945,0x4B36,0x4D85,0x5043,0x5385,0x5765,0x5C00,
+0x6179,0x67FA,0x6FB5,0x78E5,0x83D0,0x90CA,0xA037,0xB28C,
+/* A:09 B:1b */
+0x4B21,0x4B3A,0x4B58,0x4B7B,0x4BA5,0x4BD7,0x4C13,0x4C59,
+0x4CAD,0x4D11,0x4D87,0x4E14,0x4EBC,0x4F83,0x5070,0x5189,
+0x52D7,0x5464,0x563C,0x586D,0x5B08,0x5E21,0x61CE,0x662E,
+0x6B60,0x718E,0x78E5,0x819E,0x8BFD,0x9850,0xA6F6,0xB85E,
+/* A:09 B:1c */
+0x58EE,0x5906,0x5921,0x5943,0x596A,0x5999,0x59D1,0x5A13,
+0x5A61,0x5ABF,0x5B2E,0x5BB2,0x5C4F,0x5D0A,0x5DE7,0x5EEF,
+0x6028,0x619C,0x6356,0x6564,0x67D5,0x6ABB,0x6E2E,0x7247,
+0x7726,0x7CEF,0x83D0,0x8BFD,0x95B5,0xA141,0xAEFA,0xBF4A,
+/* A:09 B:1d */
+0x6955,0x696B,0x6985,0x69A3,0x69C7,0x69F3,0x6A26,0x6A63,
+0x6AAB,0x6B01,0x6B67,0x6BE1,0x6C71,0x6D1D,0x6DE9,0x6EDB,
+0x6FFB,0x7152,0x72E9,0x74CD,0x770B,0x79B7,0x7CE3,0x80A8,
+0x8523,0x8A76,0x90CA,0x9850,0xA141,0xABE1,0xB882,0xC784,
+/* A:09 B:1e */
+0x7CD4,0x7CE8,0x7CFF,0x7D1A,0x7D3B,0x7D61,0x7D8F,0x7DC6,
+0x7E07,0x7E54,0x7EB0,0x7F1D,0x7F9E,0x8038,0x80EF,0x81C8,
+0x82CB,0x83FE,0x856B,0x871D,0x8920,0x8B85,0x8E5D,0x91BF,
+0x95C3,0x9A8A,0xA037,0xA6F6,0xAEFA,0xB882,0xC3D5,0xD14B,
+/* A:09 B:1f */
+0x9400,0x9411,0x9425,0x943C,0x9458,0x947A,0x94A1,0x94D1,
+0x9509,0x954B,0x959A,0x95F8,0x9668,0x96ED,0x978B,0x9847,
+0x9926,0x9A2F,0x9B6A,0x9CE0,0x9E9D,0xA0AE,0xA323,0xA60E,
+0xA986,0xADA5,0xB28C,0xB85E,0xBF4A,0xC784,0xD14B,0xDCE9,
+/* A: 968D89C0 */
+/* A:0a B:00 */
+0x0339,0x035A,0x0382,0x03B1,0x03E9,0x042B,0x047A,0x04D8,
+0x0547,0x05CC,0x0669,0x0725,0x0803,0x090B,0x0A46,0x0BBB,
+0x0D77,0x0F86,0x11F9,0x14E3,0x1858,0x1C75,0x2158,0x2727,
+0x2E0E,0x3642,0x4002,0x4B98,0x595E,0x69BD,0x7D31,0x9450,
+/* A:0a B:01 */
+0x035A,0x037B,0x03A3,0x03D2,0x040A,0x044C,0x049B,0x04F9,
+0x0568,0x05ED,0x068A,0x0745,0x0824,0x092C,0x0A66,0x0BDB,
+0x0D97,0x0FA6,0x1219,0x1502,0x1877,0x1C93,0x2176,0x2744,
+0x2E2A,0x365D,0x401C,0x4BB1,0x5976,0x69D2,0x7D44,0x9461,
+/* A:0a B:02 */
+0x0382,0x03A3,0x03CB,0x03FA,0x0431,0x0474,0x04C3,0x0520,
+0x0590,0x0614,0x06B1,0x076C,0x084B,0x0953,0x0A8D,0x0C02,
+0x0DBD,0x0FCC,0x123F,0x1527,0x189C,0x1CB7,0x2199,0x2766,
+0x2E4C,0x367E,0x403C,0x4BCF,0x5991,0x69EC,0x7D5B,0x9474,
+/* A:0a B:03 */
+0x03B1,0x03D2,0x03FA,0x0428,0x0460,0x04A3,0x04F1,0x054F,
+0x05BE,0x0643,0x06E0,0x079B,0x0879,0x0981,0x0ABB,0x0C2F,
+0x0DEB,0x0FF9,0x126B,0x1553,0x18C7,0x1CE2,0x21C3,0x2790,
+0x2E74,0x36A5,0x4061,0x4BF2,0x59B3,0x6A0A,0x7D76,0x948C,
+/* A:0a B:04 */
+0x03E9,0x040A,0x0431,0x0460,0x0498,0x04DA,0x0529,0x0587,
+0x05F6,0x067A,0x0717,0x07D2,0x08B0,0x09B8,0x0AF1,0x0C66,
+0x0E20,0x102F,0x12A0,0x1588,0x18FB,0x1D15,0x21F5,0x27C1,
+0x2EA4,0x36D3,0x408D,0x4C1C,0x59DA,0x6A2E,0x7D97,0x94A8,
+/* A:0a B:05 */
+0x042B,0x044C,0x0474,0x04A3,0x04DA,0x051C,0x056B,0x05C9,
+0x0638,0x06BC,0x0759,0x0813,0x08F1,0x09F9,0x0B32,0x0CA6,
+0x0E61,0x106E,0x12DF,0x15C6,0x1939,0x1D52,0x2231,0x27FB,
+0x2EDC,0x370A,0x40C1,0x4C4E,0x5A09,0x6A59,0x7DBE,0x94C9,
+/* A:0a B:06 */
+0x047A,0x049B,0x04C3,0x04F1,0x0529,0x056B,0x05BA,0x0617,
+0x0686,0x070A,0x07A7,0x0861,0x093F,0x0A46,0x0B7F,0x0CF3,
+0x0EAD,0x10BA,0x132A,0x1610,0x1982,0x1D9A,0x2278,0x2840,
+0x2F20,0x374B,0x4100,0x4C8A,0x5A40,0x6A8D,0x7DEB,0x94F1,
+/* A:0a B:07 */
+0x04D8,0x04F9,0x0520,0x054F,0x0587,0x05C9,0x0617,0x0674,
+0x06E3,0x0767,0x0804,0x08BE,0x099B,0x0AA2,0x0BDA,0x0D4E,
+0x0F07,0x1114,0x1383,0x1668,0x19D9,0x1DF0,0x22CC,0x2892,
+0x2F70,0x3798,0x414A,0x4CD0,0x5A82,0x6AC9,0x7E22,0x9520,
+/* A:0a B:08 */
+0x0547,0x0568,0x0590,0x05BE,0x05F6,0x0638,0x0686,0x06E3,
+0x0752,0x07D6,0x0872,0x092C,0x0A09,0x0B0F,0x0C47,0x0DBA,
+0x0F73,0x117F,0x13ED,0x16D1,0x1A40,0x1E56,0x2330,0x28F4,
+0x2FCF,0x37F4,0x41A2,0x4D24,0x5AD1,0x6B12,0x7E63,0x9558,
+/* A:0a B:09 */
+0x05CC,0x05ED,0x0614,0x0643,0x067A,0x06BC,0x070A,0x0767,
+0x07D6,0x0859,0x08F5,0x09AF,0x0A8B,0x0B91,0x0CC9,0x0E3B,
+0x0FF3,0x11FE,0x146B,0x174E,0x1ABB,0x1ECF,0x23A7,0x2968,
+0x3040,0x3861,0x420B,0x4D87,0x5B2E,0x6B67,0x7EB0,0x959A,
+/* A:0a B:0a */
+0x0669,0x068A,0x06B1,0x06E0,0x0717,0x0759,0x07A7,0x0804,
+0x0872,0x08F5,0x0991,0x0A4A,0x0B26,0x0C2B,0x0D62,0x0ED4,
+0x108B,0x1294,0x1500,0x17E1,0x1B4D,0x1F5E,0x2434,0x29F2,
+0x30C6,0x38E3,0x4288,0x4DFE,0x5B9D,0x6BCD,0x7F0B,0x95E9,
+/* A:0a B:0b */
+0x0725,0x0745,0x076C,0x079B,0x07D2,0x0813,0x0861,0x08BE,
+0x092C,0x09AF,0x0A4A,0x0B03,0x0BDE,0x0CE3,0x0E19,0x0F89,
+0x113F,0x1348,0x15B2,0x1891,0x1BFB,0x2009,0x24DB,0x2A96,
+0x3166,0x397D,0x431C,0x4E8A,0x5C21,0x6C47,0x7F78,0x9647,
+/* A:0a B:0c */
+0x0803,0x0824,0x084B,0x0879,0x08B0,0x08F1,0x093F,0x099B,
+0x0A09,0x0A8B,0x0B26,0x0BDE,0x0CB9,0x0DBD,0x0EF2,0x1061,
+0x1216,0x141D,0x1685,0x1962,0x1CC9,0x20D5,0x25A3,0x2B59,
+0x3223,0x3A35,0x43CC,0x4F32,0x5CBD,0x6CD7,0x7FF9,0x96B7,
+/* A:0a B:0d */
+0x090B,0x092C,0x0953,0x0981,0x09B8,0x09F9,0x0A46,0x0AA2,
+0x0B0F,0x0B91,0x0C2B,0x0CE3,0x0DBD,0x0EC0,0x0FF4,0x1162,
+0x1315,0x151A,0x1780,0x1A5B,0x1DBE,0x21C6,0x2690,0x2C41,
+0x3305,0x3B0F,0x449D,0x4FF8,0x5D77,0x6D82,0x8093,0x973B,
+/* A:0a B:0e */
+0x0A46,0x0A66,0x0A8D,0x0ABB,0x0AF1,0x0B32,0x0B7F,0x0BDA,
+0x0C47,0x0CC9,0x0D62,0x0E19,0x0EF2,0x0FF4,0x1127,0x1293,
+0x1444,0x1647,0x18AB,0x1B82,0x1EE2,0x22E5,0x27AA,0x2D54,
+0x3411,0x3C12,0x4596,0x50E4,0x5E55,0x6E4D,0x8149,0x97D9,
+/* A:0a B:0f */
+0x0BBB,0x0BDB,0x0C02,0x0C2F,0x0C66,0x0CA6,0x0CF3,0x0D4E,
+0x0DBA,0x0E3B,0x0ED4,0x0F89,0x1061,0x1162,0x1293,0x13FE,
+0x15AC,0x17AD,0x1A0D,0x1CE1,0x203C,0x243A,0x28F8,0x2E9C,
+0x354F,0x3D46,0x46BD,0x51FD,0x5F5C,0x6F3F,0x8222,0x9894,
+/* A:0a B:10 */
+0x0D77,0x0D97,0x0DBD,0x0DEB,0x0E20,0x0E61,0x0EAD,0x0F07,
+0x0F73,0x0FF3,0x108B,0x113F,0x1216,0x1315,0x1444,0x15AC,
+0x1759,0x1956,0x1BB3,0x1E81,0x21D8,0x25CF,0x2A86,0x3021,
+0x36CA,0x3EB4,0x481C,0x534A,0x6094,0x705F,0x8324,0x9973,
+/* A:0a B:11 */
+0x0F86,0x0FA6,0x0FCC,0x0FF9,0x102F,0x106E,0x10BA,0x1114,
+0x117F,0x11FE,0x1294,0x1348,0x141D,0x151A,0x1647,0x17AD,
+0x1956,0x1B4F,0x1DA7,0x2071,0x23C1,0x27B1,0x2C5F,0x31EF,
+0x388C,0x4067,0x49BE,0x54D7,0x6207,0x71B5,0x8456,0x9A7B,
+/* A:0a B:12 */
+0x11F9,0x1219,0x123F,0x126B,0x12A0,0x12DF,0x132A,0x1383,
+0x13ED,0x146B,0x1500,0x15B2,0x1685,0x1780,0x18AB,0x1A0D,
+0x1BB3,0x1DA7,0x1FFB,0x22BE,0x2607,0x29EE,0x2E91,0x3415,
+0x3AA2,0x426C,0x4BAE,0x56AE,0x63C1,0x734B,0x85C2,0x9BB5,
+/* A:0a B:13 */
+0x14E3,0x1502,0x1527,0x1553,0x1588,0x15C6,0x1610,0x1668,
+0x16D1,0x174E,0x17E1,0x1891,0x1962,0x1A5B,0x1B82,0x1CE1,
+0x1E81,0x2071,0x22BE,0x257A,0x28BA,0x2C96,0x312D,0x36A2,
+0x3D1E,0x44D3,0x4DFB,0x58DE,0x65CD,0x752D,0x8773,0x9D2B,
+/* A:0a B:14 */
+0x1858,0x1877,0x189C,0x18C7,0x18FB,0x1939,0x1982,0x19D9,
+0x1A40,0x1ABB,0x1B4D,0x1BFB,0x1CC9,0x1DBE,0x1EE2,0x203C,
+0x21D8,0x23C1,0x2607,0x28BA,0x2BEF,0x2FBF,0x3447,0x39AA,
+0x4011,0x47AD,0x50B8,0x5B77,0x683D,0x776B,0x8976,0x9EE7,
+/* A:0a B:15 */
+0x1C75,0x1C93,0x1CB7,0x1CE2,0x1D15,0x1D52,0x1D9A,0x1DF0,
+0x1E56,0x1ECF,0x1F5E,0x2009,0x20D5,0x21C6,0x22E5,0x243A,
+0x25CF,0x27B1,0x29EE,0x2C96,0x2FBF,0x3381,0x37F7,0x3D45,
+0x4393,0x4B11,0x53F8,0x5E8E,0x6B22,0x7A15,0x8BD9,0xA0F7,
+/* A:0a B:16 */
+0x2158,0x2176,0x2199,0x21C3,0x21F5,0x2231,0x2278,0x22CC,
+0x2330,0x23A7,0x2434,0x24DB,0x25A3,0x2690,0x27AA,0x28F8,
+0x2A86,0x2C5F,0x2E91,0x312D,0x3447,0x37F7,0x3C59,0x418D,
+0x47BE,0x4F18,0x57D6,0x623A,0x6E92,0x7D3F,0x8EB0,0xA36A,
+/* A:0a B:17 */
+0x2727,0x2744,0x2766,0x2790,0x27C1,0x27FB,0x2840,0x2892,
+0x28F4,0x2968,0x29F2,0x2A96,0x2B59,0x2C41,0x2D54,0x2E9C,
+0x3021,0x31EF,0x3415,0x36A2,0x39AA,0x3D45,0x418D,0x46A5,
+0x4CB2,0x53E2,0x5C6E,0x6697,0x72A9,0x8102,0x920F,0xA654,
+/* A:0a B:18 */
+0x2E0E,0x2E2A,0x2E4C,0x2E74,0x2EA4,0x2EDC,0x2F20,0x2F70,
+0x2FCF,0x3040,0x30C6,0x3166,0x3223,0x3305,0x3411,0x354F,
+0x36CA,0x388C,0x3AA2,0x3D1E,0x4011,0x4393,0x47BE,0x4CB2,
+0x5295,0x5994,0x61E4,0x6BC6,0x7785,0x857B,0x9612,0xA9CA,
+/* A:0a B:19 */
+0x3642,0x365D,0x367E,0x36A5,0x36D3,0x370A,0x374B,0x3798,
+0x37F4,0x3861,0x38E3,0x397D,0x3A35,0x3B0F,0x3C12,0x3D46,
+0x3EB4,0x4067,0x426C,0x44D3,0x47AD,0x4B11,0x4F18,0x53E2,
+0x5994,0x6057,0x6862,0x71F0,0x7D4B,0x8ACB,0x9AD6,0xADE7,
+/* A:0a B:1a */
+0x4002,0x401C,0x403C,0x4061,0x408D,0x40C1,0x4100,0x414A,
+0x41A2,0x420B,0x4288,0x431C,0x43CC,0x449D,0x4596,0x46BD,
+0x481C,0x49BE,0x4BAE,0x4DFB,0x50B8,0x53F8,0x57D6,0x5C6E,
+0x61E4,0x6862,0x7018,0x7943,0x8429,0x911C,0xA080,0xB2CA,
+/* A:0a B:1b */
+0x4B98,0x4BB1,0x4BCF,0x4BF2,0x4C1C,0x4C4E,0x4C8A,0x4CD0,
+0x4D24,0x4D87,0x4DFE,0x4E8A,0x4F32,0x4FF8,0x50E4,0x51FD,
+0x534A,0x54D7,0x56AE,0x58DE,0x5B77,0x5E8E,0x623A,0x6697,
+0x6BC6,0x71F0,0x7943,0x81F8,0x8C51,0x989D,0xA73B,0xB89A,
+/* A:0a B:1c */
+0x595E,0x5976,0x5991,0x59B3,0x59DA,0x5A09,0x5A40,0x5A82,
+0x5AD1,0x5B2E,0x5B9D,0x5C21,0x5CBD,0x5D77,0x5E55,0x5F5C,
+0x6094,0x6207,0x63C1,0x65CD,0x683D,0x6B22,0x6E92,0x72A9,
+0x7785,0x7D4B,0x8429,0x8C51,0x9603,0xA189,0xAF3B,0xBF82,
+/* A:0a B:1d */
+0x69BD,0x69D2,0x69EC,0x6A0A,0x6A2E,0x6A59,0x6A8D,0x6AC9,
+0x6B12,0x6B67,0x6BCD,0x6C47,0x6CD7,0x6D82,0x6E4D,0x6F3F,
+0x705F,0x71B5,0x734B,0x752D,0x776B,0x7A15,0x7D3F,0x8102,
+0x857B,0x8ACB,0x911C,0x989D,0xA189,0xAC23,0xB8BD,0xC7B7,
+/* A:0a B:1e */
+0x7D31,0x7D44,0x7D5B,0x7D76,0x7D97,0x7DBE,0x7DEB,0x7E22,
+0x7E63,0x7EB0,0x7F0B,0x7F78,0x7FF9,0x8093,0x8149,0x8222,
+0x8324,0x8456,0x85C2,0x8773,0x8976,0x8BD9,0x8EB0,0x920F,
+0x9612,0x9AD6,0xA080,0xA73B,0xAF3B,0xB8BD,0xC40A,0xD178,
+/* A:0a B:1f */
+0x9450,0x9461,0x9474,0x948C,0x94A8,0x94C9,0x94F1,0x9520,
+0x9558,0x959A,0x95E9,0x9647,0x96B7,0x973B,0x97D9,0x9894,
+0x9973,0x9A7B,0x9BB5,0x9D2B,0x9EE7,0xA0F7,0xA36A,0xA654,
+0xA9CA,0xADE7,0xB2CA,0xB89A,0xBF82,0xC7B7,0xD178,0xDD10,
+/* A: 968D89C0 */
+/* A:0b B:00 */
+0x03F6,0x0417,0x043F,0x046E,0x04A5,0x04E8,0x0536,0x0594,
+0x0603,0x0687,0x0725,0x07DF,0x08BD,0x09C5,0x0AFE,0x0C73,
+0x0E2E,0x103C,0x12AD,0x1594,0x1908,0x1D22,0x2201,0x27CC,
+0x2EAF,0x36DE,0x4098,0x4C27,0x59E3,0x6A37,0x7D9F,0x94AF,
+/* A:0b B:01 */
+0x0417,0x0439,0x0460,0x048F,0x04C7,0x0509,0x0558,0x05B5,
+0x0624,0x06A8,0x0745,0x0800,0x08DE,0x09E5,0x0B1F,0x0C93,
+0x0E4E,0x105C,0x12CD,0x15B4,0x1927,0x1D40,0x221F,0x27EA,
+0x2ECB,0x36F9,0x40B2,0x4C40,0x59FB,0x6A4D,0x7DB2,0x94BF,
+/* A:0b B:02 */
+0x043F,0x0460,0x0487,0x04B6,0x04EE,0x0530,0x057F,0x05DC,
+0x064B,0x06CF,0x076C,0x0827,0x0905,0x0A0C,0x0B45,0x0CB9,
+0x0E74,0x1081,0x12F2,0x15D9,0x194B,0x1D64,0x2243,0x280C,
+0x2EED,0x371A,0x40D1,0x4C5D,0x5A17,0x6A66,0x7DC9,0x94D3,
+/* A:0b B:03 */
+0x046E,0x048F,0x04B6,0x04E5,0x051D,0x055F,0x05AD,0x060B,
+0x067A,0x06FE,0x079B,0x0855,0x0933,0x0A3A,0x0B73,0x0CE7,
+0x0EA1,0x10AE,0x131F,0x1605,0x1977,0x1D8F,0x226D,0x2835,
+0x2F15,0x3740,0x40F6,0x4C80,0x5A38,0x6A85,0x7DE4,0x94EB,
+/* A:0b B:04 */
+0x04A5,0x04C7,0x04EE,0x051D,0x0554,0x0596,0x05E5,0x0642,
+0x06B1,0x0735,0x07D2,0x088C,0x096A,0x0A71,0x0BA9,0x0D1D,
+0x0ED7,0x10E4,0x1354,0x1639,0x19AA,0x1DC2,0x229F,0x2866,
+0x2F45,0x376E,0x4122,0x4CAA,0x5A5F,0x6AA9,0x7E05,0x9507,
+/* A:0b B:05 */
+0x04E8,0x0509,0x0530,0x055F,0x0596,0x05D8,0x0627,0x0684,
+0x06F3,0x0777,0x0813,0x08CD,0x09AB,0x0AB2,0x0BEA,0x0D5D,
+0x0F17,0x1123,0x1392,0x1677,0x19E8,0x1DFE,0x22DA,0x28A0,
+0x2F7D,0x37A5,0x4157,0x4CDC,0x5A8D,0x6AD4,0x7E2B,0x9528,
+/* A:0b B:06 */
+0x0536,0x0558,0x057F,0x05AD,0x05E5,0x0627,0x0675,0x06D3,
+0x0741,0x07C5,0x0861,0x091B,0x09F8,0x0AFF,0x0C37,0x0DAA,
+0x0F63,0x116E,0x13DD,0x16C1,0x1A31,0x1E46,0x2321,0x28E5,
+0x2FC0,0x37E6,0x4195,0x4D17,0x5AC5,0x6B07,0x7E59,0x954F,
+/* A:0b B:07 */
+0x0594,0x05B5,0x05DC,0x060B,0x0642,0x0684,0x06D3,0x0730,
+0x079E,0x0822,0x08BE,0x0977,0x0A54,0x0B5A,0x0C92,0x0E05,
+0x0FBD,0x11C8,0x1436,0x1719,0x1A88,0x1E9C,0x2374,0x2937,
+0x3010,0x3833,0x41DF,0x4D5E,0x5B07,0x6B43,0x7E8F,0x957E,
+/* A:0b B:08 */
+0x0603,0x0624,0x064B,0x067A,0x06B1,0x06F3,0x0741,0x079E,
+0x080D,0x0890,0x092C,0x09E5,0x0AC2,0x0BC7,0x0CFF,0x0E70,
+0x1028,0x1233,0x14A0,0x1782,0x1AEF,0x1F01,0x23D8,0x2999,
+0x306F,0x388F,0x4237,0x4DB1,0x5B55,0x6B8B,0x7ED0,0x95B6,
+/* A:0b B:09 */
+0x0687,0x06A8,0x06CF,0x06FE,0x0735,0x0777,0x07C5,0x0822,
+0x0890,0x0913,0x09AF,0x0A68,0x0B44,0x0C49,0x0D80,0x0EF1,
+0x10A8,0x12B1,0x151D,0x17FE,0x1B69,0x1F7A,0x244F,0x2A0D,
+0x30E0,0x38FC,0x42A0,0x4E14,0x5BB2,0x6BE1,0x7F1D,0x95F8,
+/* A:0b B:0a */
+0x0725,0x0745,0x076C,0x079B,0x07D2,0x0813,0x0861,0x08BE,
+0x092C,0x09AF,0x0A4A,0x0B03,0x0BDE,0x0CE3,0x0E19,0x0F89,
+0x113F,0x1348,0x15B2,0x1891,0x1BFB,0x2009,0x24DB,0x2A96,
+0x3166,0x397D,0x431C,0x4E8A,0x5C21,0x6C47,0x7F78,0x9647,
+/* A:0b B:0b */
+0x07DF,0x0800,0x0827,0x0855,0x088C,0x08CD,0x091B,0x0977,
+0x09E5,0x0A68,0x0B03,0x0BBB,0x0C96,0x0D9A,0x0ECF,0x103F,
+0x11F3,0x13FA,0x1663,0x1941,0x1CA8,0x20B4,0x2583,0x2B3A,
+0x3205,0x3A17,0x43B0,0x4F17,0x5CA4,0x6CC0,0x7FE4,0x96A5,
+/* A:0b B:0c */
+0x08BD,0x08DE,0x0905,0x0933,0x096A,0x09AB,0x09F8,0x0A54,
+0x0AC2,0x0B44,0x0BDE,0x0C96,0x0D70,0x0E73,0x0FA8,0x1116,
+0x12C9,0x14CF,0x1736,0x1A11,0x1D76,0x217F,0x264A,0x2BFC,
+0x32C2,0x3ACE,0x445F,0x4FBD,0x5D40,0x6D4F,0x8065,0x9714,
+/* A:0b B:0d */
+0x09C5,0x09E5,0x0A0C,0x0A3A,0x0A71,0x0AB2,0x0AFF,0x0B5A,
+0x0BC7,0x0C49,0x0CE3,0x0D9A,0x0E73,0x0F76,0x10A9,0x1216,
+0x13C8,0x15CC,0x1830,0x1B09,0x1E6A,0x226F,0x2736,0x2CE4,
+0x33A3,0x3BA8,0x4530,0x5084,0x5DFA,0x6DFA,0x80FE,0x9798,
+/* A:0b B:0e */
+0x0AFE,0x0B1F,0x0B45,0x0B73,0x0BA9,0x0BEA,0x0C37,0x0C92,
+0x0CFF,0x0D80,0x0E19,0x0ECF,0x0FA8,0x10A9,0x11DB,0x1346,
+0x14F6,0x16F8,0x195A,0x1C2F,0x1F8D,0x238E,0x284F,0x2DF6,
+0x34AE,0x3CAA,0x4628,0x516F,0x5ED7,0x6EC5,0x81B4,0x9835,
+/* A:0b B:0f */
+0x0C73,0x0C93,0x0CB9,0x0CE7,0x0D1D,0x0D5D,0x0DAA,0x0E05,
+0x0E70,0x0EF1,0x0F89,0x103F,0x1116,0x1216,0x1346,0x14B0,
+0x165E,0x185C,0x1ABC,0x1D8D,0x20E7,0x24E2,0x299D,0x2F3D,
+0x35EC,0x3DDD,0x474E,0x5287,0x5FDD,0x6FB6,0x828D,0x98F0,
+/* A:0b B:10 */
+0x0E2E,0x0E4E,0x0E74,0x0EA1,0x0ED7,0x0F17,0x0F63,0x0FBD,
+0x1028,0x10A8,0x113F,0x11F3,0x12C9,0x13C8,0x14F6,0x165E,
+0x1809,0x1A04,0x1C60,0x1F2D,0x2281,0x2676,0x2B2A,0x30C1,
+0x3765,0x3F4B,0x48AD,0x53D3,0x6114,0x70D5,0x838E,0x99CE,
+/* A:0b B:11 */
+0x103C,0x105C,0x1081,0x10AE,0x10E4,0x1123,0x116E,0x11C8,
+0x1233,0x12B1,0x1348,0x13FA,0x14CF,0x15CC,0x16F8,0x185C,
+0x1A04,0x1BFC,0x1E53,0x211B,0x2469,0x2857,0x2D02,0x328E,
+0x3926,0x40FC,0x4A4D,0x555F,0x6287,0x722A,0x84C0,0x9AD6,
+/* A:0b B:12 */
+0x12AD,0x12CD,0x12F2,0x131F,0x1354,0x1392,0x13DD,0x1436,
+0x14A0,0x151D,0x15B2,0x1663,0x1736,0x1830,0x195A,0x1ABC,
+0x1C60,0x1E53,0x20A5,0x2367,0x26AD,0x2A92,0x2F32,0x34B2,
+0x3B3C,0x4300,0x4C3C,0x5735,0x643F,0x73BF,0x862B,0x9C0F,
+/* A:0b B:13 */
+0x1594,0x15B4,0x15D9,0x1605,0x1639,0x1677,0x16C1,0x1719,
+0x1782,0x17FE,0x1891,0x1941,0x1A11,0x1B09,0x1C2F,0x1D8D,
+0x1F2D,0x211B,0x2367,0x2621,0x295F,0x2D39,0x31CD,0x373E,
+0x3DB5,0x4565,0x4E88,0x5963,0x664A,0x75A0,0x87DA,0x9D84,
+/* A:0b B:14 */
+0x1908,0x1927,0x194B,0x1977,0x19AA,0x19E8,0x1A31,0x1A88,
+0x1AEF,0x1B69,0x1BFB,0x1CA8,0x1D76,0x1E6A,0x1F8D,0x20E7,
+0x2281,0x2469,0x26AD,0x295F,0x2C92,0x305F,0x34E5,0x3A44,
+0x40A7,0x483D,0x5142,0x5BFB,0x68B8,0x77DD,0x89DC,0x9F3F,
+/* A:0b B:15 */
+0x1D22,0x1D40,0x1D64,0x1D8F,0x1DC2,0x1DFE,0x1E46,0x1E9C,
+0x1F01,0x1F7A,0x2009,0x20B4,0x217F,0x226F,0x238E,0x24E2,
+0x2676,0x2857,0x2A92,0x2D39,0x305F,0x341E,0x3892,0x3DDC,
+0x4426,0x4B9F,0x5481,0x5F0F,0x6B9B,0x7A85,0x8C3D,0xA14D,
+/* A:0b B:16 */
+0x2201,0x221F,0x2243,0x226D,0x229F,0x22DA,0x2321,0x2374,
+0x23D8,0x244F,0x24DB,0x2583,0x264A,0x2736,0x284F,0x299D,
+0x2B2A,0x2D02,0x2F32,0x31CD,0x34E5,0x3892,0x3CF1,0x4222,
+0x484E,0x4FA4,0x585C,0x62B9,0x6F0A,0x7DAD,0x8F12,0xA3BF,
+/* A:0b B:17 */
+0x27CC,0x27EA,0x280C,0x2835,0x2866,0x28A0,0x28E5,0x2937,
+0x2999,0x2A0D,0x2A96,0x2B3A,0x2BFC,0x2CE4,0x2DF6,0x2F3D,
+0x30C1,0x328E,0x34B2,0x373E,0x3A44,0x3DDC,0x4222,0x4736,
+0x4D3F,0x546B,0x5CF1,0x6713,0x731E,0x816D,0x9270,0xA6A7,
+/* A:0b B:18 */
+0x2EAF,0x2ECB,0x2EED,0x2F15,0x2F45,0x2F7D,0x2FC0,0x3010,
+0x306F,0x30E0,0x3166,0x3205,0x32C2,0x33A3,0x34AE,0x35EC,
+0x3765,0x3926,0x3B3C,0x3DB5,0x40A7,0x4426,0x484E,0x4D3F,
+0x531E,0x5A19,0x6264,0x6C3F,0x77F6,0x85E3,0x966F,0xAA1A,
+/* A:0b B:19 */
+0x36DE,0x36F9,0x371A,0x3740,0x376E,0x37A5,0x37E6,0x3833,
+0x388F,0x38FC,0x397D,0x3A17,0x3ACE,0x3BA8,0x3CAA,0x3DDD,
+0x3F4B,0x40FC,0x4300,0x4565,0x483D,0x4B9F,0x4FA4,0x546B,
+0x5A19,0x60D8,0x68DD,0x7265,0x7DB9,0x8B30,0x9B30,0xAE35,
+/* A:0b B:1a */
+0x4098,0x40B2,0x40D1,0x40F6,0x4122,0x4157,0x4195,0x41DF,
+0x4237,0x42A0,0x431C,0x43B0,0x445F,0x4530,0x4628,0x474E,
+0x48AD,0x4A4D,0x4C3C,0x4E88,0x5142,0x5481,0x585C,0x5CF1,
+0x6264,0x68DD,0x708F,0x79B4,0x8492,0x917C,0xA0D6,0xB315,
+/* A:0b B:1b */
+0x4C27,0x4C40,0x4C5D,0x4C80,0x4CAA,0x4CDC,0x4D17,0x4D5E,
+0x4DB1,0x4E14,0x4E8A,0x4F17,0x4FBD,0x5084,0x516F,0x5287,
+0x53D3,0x555F,0x5735,0x5963,0x5BFB,0x5F0F,0x62B9,0x6713,
+0x6C3F,0x7265,0x79B4,0x8263,0x8CB5,0x98F9,0xA78D,0xB8E0,
+/* A:0b B:1c */
+0x59E3,0x59FB,0x5A17,0x5A38,0x5A5F,0x5A8D,0x5AC5,0x5B07,
+0x5B55,0x5BB2,0x5C21,0x5CA4,0x5D40,0x5DFA,0x5ED7,0x5FDD,
+0x6114,0x6287,0x643F,0x664A,0x68B8,0x6B9B,0x6F0A,0x731E,
+0x77F6,0x7DB9,0x8492,0x8CB5,0x9660,0xA1DF,0xAF87,0xBFC4,
+/* A:0b B:1d */
+0x6A37,0x6A4D,0x6A66,0x6A85,0x6AA9,0x6AD4,0x6B07,0x6B43,
+0x6B8B,0x6BE1,0x6C47,0x6CC0,0x6D4F,0x6DFA,0x6EC5,0x6FB6,
+0x70D5,0x722A,0x73BF,0x75A0,0x77DD,0x7A85,0x7DAD,0x816D,
+0x85E3,0x8B30,0x917C,0x98F9,0xA1DF,0xAC72,0xB903,0xC7F3,
+/* A:0b B:1e */
+0x7D9F,0x7DB2,0x7DC9,0x7DE4,0x7E05,0x7E2B,0x7E59,0x7E8F,
+0x7ED0,0x7F1D,0x7F78,0x7FE4,0x8065,0x80FE,0x81B4,0x828D,
+0x838E,0x84C0,0x862B,0x87DA,0x89DC,0x8C3D,0x8F12,0x9270,
+0x966F,0x9B30,0xA0D6,0xA78D,0xAF87,0xB903,0xC449,0xD1AE,
+/* A:0b B:1f */
+0x94AF,0x94BF,0x94D3,0x94EB,0x9507,0x9528,0x954F,0x957E,
+0x95B6,0x95F8,0x9647,0x96A5,0x9714,0x9798,0x9835,0x98F0,
+0x99CE,0x9AD6,0x9C0F,0x9D84,0x9F3F,0xA14D,0xA3BF,0xA6A7,
+0xAA1A,0xAE35,0xB315,0xB8E0,0xBFC4,0xC7F3,0xD1AE,0xDD3E,
+/* A: 968D89C0 */
+/* A:0c B:00 */
+0x04D7,0x04F8,0x0520,0x054E,0x0586,0x05C8,0x0616,0x0674,
+0x06E3,0x0766,0x0803,0x08BD,0x099A,0x0AA1,0x0BDA,0x0D4D,
+0x0F07,0x1113,0x1383,0x1668,0x19D8,0x1DEF,0x22CB,0x2892,
+0x2F6F,0x3797,0x414A,0x4CD0,0x5A82,0x6AC9,0x7E21,0x9520,
+/* A:0c B:01 */
+0x04F8,0x0519,0x0541,0x056F,0x05A7,0x05E9,0x0637,0x0695,
+0x0703,0x0787,0x0824,0x08DE,0x09BB,0x0AC2,0x0BFA,0x0D6D,
+0x0F26,0x1133,0x13A2,0x1687,0x19F7,0x1E0D,0x22E9,0x28AF,
+0x2F8B,0x37B3,0x4164,0x4CE9,0x5A99,0x6ADE,0x7E35,0x9530,
+/* A:0c B:02 */
+0x0520,0x0541,0x0568,0x0597,0x05CE,0x0610,0x065F,0x06BC,
+0x072B,0x07AE,0x084B,0x0905,0x09E2,0x0AE8,0x0C20,0x0D93,
+0x0F4C,0x1159,0x13C7,0x16AC,0x1A1C,0x1E31,0x230C,0x28D1,
+0x2FAD,0x37D3,0x4183,0x4D06,0x5AB5,0x6AF8,0x7E4C,0x9544,
+/* A:0c B:03 */
+0x054E,0x056F,0x0597,0x05C5,0x05FD,0x063F,0x068D,0x06EA,
+0x0759,0x07DC,0x0879,0x0933,0x0A10,0x0B16,0x0C4E,0x0DC1,
+0x0F7A,0x1185,0x13F4,0x16D8,0x1A47,0x1E5C,0x2336,0x28FA,
+0x2FD5,0x37FA,0x41A8,0x4D29,0x5AD6,0x6B16,0x7E67,0x955B,
+/* A:0c B:04 */
+0x0586,0x05A7,0x05CE,0x05FD,0x0634,0x0676,0x06C4,0x0721,
+0x0790,0x0814,0x08B0,0x096A,0x0A46,0x0B4D,0x0C84,0x0DF7,
+0x0FAF,0x11BB,0x1429,0x170C,0x1A7A,0x1E8F,0x2368,0x292B,
+0x3004,0x3828,0x41D4,0x4D53,0x5AFD,0x6B3A,0x7E87,0x9577,
+/* A:0c B:05 */
+0x05C8,0x05E9,0x0610,0x063F,0x0676,0x06B8,0x0706,0x0763,
+0x07D2,0x0855,0x08F1,0x09AB,0x0A87,0x0B8D,0x0CC5,0x0E37,
+0x0FEF,0x11FA,0x1467,0x174A,0x1AB8,0x1ECB,0x23A3,0x2965,
+0x303C,0x385E,0x4208,0x4D85,0x5B2B,0x6B65,0x7EAD,0x9598,
+/* A:0c B:06 */
+0x0616,0x0637,0x065F,0x068D,0x06C4,0x0706,0x0754,0x07B1,
+0x0820,0x08A3,0x093F,0x09F8,0x0AD4,0x0BDA,0x0D11,0x0E83,
+0x103B,0x1245,0x14B2,0x1794,0x1B00,0x1F13,0x23E9,0x29AA,
+0x307F,0x389F,0x4246,0x4DC0,0x5B63,0x6B98,0x7EDB,0x95C0,
+/* A:0c B:07 */
+0x0674,0x0695,0x06BC,0x06EA,0x0721,0x0763,0x07B1,0x080E,
+0x087C,0x08FF,0x099B,0x0A54,0x0B30,0x0C36,0x0D6C,0x0EDE,
+0x1095,0x129E,0x150A,0x17EB,0x1B57,0x1F68,0x243D,0x29FB,
+0x30CF,0x38EC,0x4290,0x4E06,0x5BA4,0x6BD4,0x7F11,0x95EE,
+/* A:0c B:08 */
+0x06E3,0x0703,0x072B,0x0759,0x0790,0x07D2,0x0820,0x087C,
+0x08EA,0x096D,0x0A09,0x0AC2,0x0B9D,0x0CA2,0x0DD9,0x0F49,
+0x1100,0x1308,0x1574,0x1853,0x1BBE,0x1FCD,0x24A0,0x2A5C,
+0x312D,0x3947,0x42E8,0x4E59,0x5BF2,0x6C1C,0x7F52,0x9626,
+/* A:0c B:09 */
+0x0766,0x0787,0x07AE,0x07DC,0x0814,0x0855,0x08A3,0x08FF,
+0x096D,0x09F0,0x0A8B,0x0B44,0x0C1F,0x0D23,0x0E59,0x0FC9,
+0x117F,0x1387,0x15F1,0x18CF,0x1C38,0x2046,0x2517,0x2AD0,
+0x319E,0x39B4,0x4350,0x4EBC,0x5C4F,0x6C71,0x7F9E,0x9668,
+/* A:0c B:0a */
+0x0803,0x0824,0x084B,0x0879,0x08B0,0x08F1,0x093F,0x099B,
+0x0A09,0x0A8B,0x0B26,0x0BDE,0x0CB9,0x0DBD,0x0EF2,0x1061,
+0x1216,0x141D,0x1685,0x1962,0x1CC9,0x20D5,0x25A3,0x2B59,
+0x3223,0x3A35,0x43CC,0x4F32,0x5CBD,0x6CD7,0x7FF9,0x96B7,
+/* A:0c B:0b */
+0x08BD,0x08DE,0x0905,0x0933,0x096A,0x09AB,0x09F8,0x0A54,
+0x0AC2,0x0B44,0x0BDE,0x0C96,0x0D70,0x0E73,0x0FA8,0x1116,
+0x12C9,0x14CF,0x1736,0x1A11,0x1D76,0x217F,0x264A,0x2BFC,
+0x32C2,0x3ACE,0x445F,0x4FBD,0x5D40,0x6D4F,0x8065,0x9714,
+/* A:0c B:0c */
+0x099A,0x09BB,0x09E2,0x0A10,0x0A46,0x0A87,0x0AD4,0x0B30,
+0x0B9D,0x0C1F,0x0CB9,0x0D70,0x0E49,0x0F4C,0x107F,0x11ED,
+0x139F,0x15A3,0x1808,0x1AE1,0x1E43,0x2249,0x2710,0x2CBE,
+0x337F,0x3B85,0x450E,0x5064,0x5DDC,0x6DDF,0x80E6,0x9783,
+/* A:0c B:0d */
+0x0AA1,0x0AC2,0x0AE8,0x0B16,0x0B4D,0x0B8D,0x0BDA,0x0C36,
+0x0CA2,0x0D23,0x0DBD,0x0E73,0x0F4C,0x104E,0x1180,0x12EC,
+0x149C,0x169F,0x1902,0x1BD8,0x1F37,0x2339,0x27FC,0x2DA5,
+0x345F,0x3C5E,0x45DE,0x5129,0x5E95,0x6E89,0x817E,0x9807,
+/* A:0c B:0e */
+0x0BDA,0x0BFA,0x0C20,0x0C4E,0x0C84,0x0CC5,0x0D11,0x0D6C,
+0x0DD9,0x0E59,0x0EF2,0x0FA8,0x107F,0x1180,0x12B1,0x141B,
+0x15CA,0x17CA,0x1A2A,0x1CFD,0x2059,0x2456,0x2914,0x2EB7,
+0x3569,0x3D5F,0x46D5,0x5214,0x5F71,0x6F53,0x8234,0x98A3,
+/* A:0c B:0f */
+0x0D4D,0x0D6D,0x0D93,0x0DC1,0x0DF7,0x0E37,0x0E83,0x0EDE,
+0x0F49,0x0FC9,0x1061,0x1116,0x11ED,0x12EC,0x141B,0x1584,
+0x1730,0x192E,0x1B8B,0x1E5A,0x21B1,0x25A9,0x2A61,0x2FFC,
+0x36A6,0x3E91,0x47FB,0x532B,0x6077,0x7044,0x830B,0x995E,
+/* A:0c B:10 */
+0x0F07,0x0F26,0x0F4C,0x0F7A,0x0FAF,0x0FEF,0x103B,0x1095,
+0x1100,0x117F,0x1216,0x12C9,0x139F,0x149C,0x15CA,0x1730,
+0x18DA,0x1AD4,0x1D2E,0x1FF9,0x234A,0x273C,0x2BED,0x317F,
+0x381E,0x3FFD,0x4958,0x5476,0x61AD,0x7162,0x840C,0x9A3B,
+/* A:0c B:11 */
+0x1113,0x1133,0x1159,0x1185,0x11BB,0x11FA,0x1245,0x129E,
+0x1308,0x1387,0x141D,0x14CF,0x15A3,0x169F,0x17CA,0x192E,
+0x1AD4,0x1CCB,0x1F20,0x21E6,0x2531,0x291B,0x2DC3,0x334B,
+0x39DE,0x41AE,0x4AF7,0x5601,0x631E,0x72B5,0x853D,0x9B42,
+/* A:0c B:12 */
+0x1383,0x13A2,0x13C7,0x13F4,0x1429,0x1467,0x14B2,0x150A,
+0x1574,0x15F1,0x1685,0x1736,0x1808,0x1902,0x1A2A,0x1B8B,
+0x1D2E,0x1F20,0x2170,0x242F,0x2773,0x2B55,0x2FF2,0x356D,
+0x3BF2,0x43B0,0x4CE4,0x57D5,0x64D5,0x7449,0x86A7,0x9C7A,
+/* A:0c B:13 */
+0x1668,0x1687,0x16AC,0x16D8,0x170C,0x174A,0x1794,0x17EB,
+0x1853,0x18CF,0x1962,0x1A11,0x1AE1,0x1BD8,0x1CFD,0x1E5A,
+0x1FF9,0x21E6,0x242F,0x26E7,0x2A22,0x2DFA,0x328A,0x37F7,
+0x3E6A,0x4613,0x4F2F,0x5A02,0x66DF,0x7629,0x8855,0x9DEE,
+/* A:0c B:14 */
+0x19D8,0x19F7,0x1A1C,0x1A47,0x1A7A,0x1AB8,0x1B00,0x1B57,
+0x1BBE,0x1C38,0x1CC9,0x1D76,0x1E43,0x1F37,0x2059,0x21B1,
+0x234A,0x2531,0x2773,0x2A22,0x2D53,0x311E,0x35A0,0x3AFB,
+0x4159,0x48E9,0x51E7,0x5C97,0x694B,0x7863,0x8A55,0x9FA7,
+/* A:0c B:15 */
+0x1DEF,0x1E0D,0x1E31,0x1E5C,0x1E8F,0x1ECB,0x1F13,0x1F68,
+0x1FCD,0x2046,0x20D5,0x217F,0x2249,0x2339,0x2456,0x25A9,
+0x273C,0x291B,0x2B55,0x2DFA,0x311E,0x34DA,0x394A,0x3E90,
+0x44D5,0x4C49,0x5523,0x5FAA,0x6C2C,0x7B09,0x8CB4,0xA1B4,
+/* A:0c B:16 */
+0x22CB,0x22E9,0x230C,0x2336,0x2368,0x23A3,0x23E9,0x243D,
+0x24A0,0x2517,0x25A3,0x264A,0x2710,0x27FC,0x2914,0x2A61,
+0x2BED,0x2DC3,0x2FF2,0x328A,0x35A0,0x394A,0x3DA5,0x42D3,
+0x48FA,0x504A,0x58FC,0x6350,0x6F97,0x7E2F,0x8F87,0xA424,
+/* A:0c B:17 */
+0x2892,0x28AF,0x28D1,0x28FA,0x292B,0x2965,0x29AA,0x29FB,
+0x2A5C,0x2AD0,0x2B59,0x2BFC,0x2CBE,0x2DA5,0x2EB7,0x2FFC,
+0x317F,0x334B,0x356D,0x37F7,0x3AFB,0x3E90,0x42D3,0x47E3,
+0x4DE7,0x550E,0x5D8D,0x67A7,0x73A8,0x81ED,0x92E2,0xA709,
+/* A:0c B:18 */
+0x2F6F,0x2F8B,0x2FAD,0x2FD5,0x3004,0x303C,0x307F,0x30CF,
+0x312D,0x319E,0x3223,0x32C2,0x337F,0x345F,0x3569,0x36A6,
+0x381E,0x39DE,0x3BF2,0x3E6A,0x4159,0x44D5,0x48FA,0x4DE7,
+0x53C2,0x5AB7,0x62FB,0x6CCF,0x787D,0x865F,0x96DE,0xAA7A,
+/* A:0c B:19 */
+0x3797,0x37B3,0x37D3,0x37FA,0x3828,0x385E,0x389F,0x38EC,
+0x3947,0x39B4,0x3A35,0x3ACE,0x3B85,0x3C5E,0x3D5F,0x3E91,
+0x3FFD,0x41AE,0x43B0,0x4613,0x48E9,0x4C49,0x504A,0x550E,
+0x5AB7,0x6171,0x696F,0x72F0,0x7E3B,0x8BA7,0x9B9B,0xAE91,
+/* A:0c B:1a */
+0x414A,0x4164,0x4183,0x41A8,0x41D4,0x4208,0x4246,0x4290,
+0x42E8,0x4350,0x43CC,0x445F,0x450E,0x45DE,0x46D5,0x47FB,
+0x4958,0x4AF7,0x4CE4,0x4F2F,0x51E7,0x5523,0x58FC,0x5D8D,
+0x62FB,0x696F,0x711B,0x7A39,0x850E,0x91EF,0xA13D,0xB36D,
+/* A:0c B:1b */
+0x4CD0,0x4CE9,0x4D06,0x4D29,0x4D53,0x4D85,0x4DC0,0x4E06,
+0x4E59,0x4EBC,0x4F32,0x4FBD,0x5064,0x5129,0x5214,0x532B,
+0x5476,0x5601,0x57D5,0x5A02,0x5C97,0x5FAA,0x6350,0x67A7,
+0x6CCF,0x72F0,0x7A39,0x82E1,0x8D2B,0x9966,0xA7EE,0xB934,
+/* A:0c B:1c */
+0x5A82,0x5A99,0x5AB5,0x5AD6,0x5AFD,0x5B2B,0x5B63,0x5BA4,
+0x5BF2,0x5C4F,0x5CBD,0x5D40,0x5DDC,0x5E95,0x5F71,0x6077,
+0x61AD,0x631E,0x64D5,0x66DF,0x694B,0x6C2C,0x6F97,0x73A8,
+0x787D,0x7E3B,0x850E,0x8D2B,0x96CF,0xA244,0xAFE3,0xC012,
+/* A:0c B:1d */
+0x6AC9,0x6ADE,0x6AF8,0x6B16,0x6B3A,0x6B65,0x6B98,0x6BD4,
+0x6C1C,0x6C71,0x6CD7,0x6D4F,0x6DDF,0x6E89,0x6F53,0x7044,
+0x7162,0x72B5,0x7449,0x7629,0x7863,0x7B09,0x7E2F,0x81ED,
+0x865F,0x8BA7,0x91EF,0x9966,0xA244,0xACCF,0xB957,0xC83B,
+/* A:0c B:1e */
+0x7E21,0x7E35,0x7E4C,0x7E67,0x7E87,0x7EAD,0x7EDB,0x7F11,
+0x7F52,0x7F9E,0x7FF9,0x8065,0x80E6,0x817E,0x8234,0x830B,
+0x840C,0x853D,0x86A7,0x8855,0x8A55,0x8CB4,0x8F87,0x92E2,
+0x96DE,0x9B9B,0xA13D,0xA7EE,0xAFE3,0xB957,0xC493,0xD1EE,
+/* A:0c B:1f */
+0x9520,0x9530,0x9544,0x955B,0x9577,0x9598,0x95C0,0x95EE,
+0x9626,0x9668,0x96B7,0x9714,0x9783,0x9807,0x98A3,0x995E,
+0x9A3B,0x9B42,0x9C7A,0x9DEE,0x9FA7,0xA1B4,0xA424,0xA709,
+0xAA7A,0xAE91,0xB36D,0xB934,0xC012,0xC83B,0xD1EE,0xDD75,
+/* A: 968D89C0 */
+/* A:0d B:00 */
+0x05E2,0x0603,0x062B,0x0659,0x0691,0x06D2,0x0721,0x077E,
+0x07EC,0x086F,0x090B,0x09C5,0x0AA1,0x0BA7,0x0CDF,0x0E51,
+0x1008,0x1213,0x1480,0x1763,0x1AD0,0x1EE3,0x23BB,0x297C,
+0x3053,0x3874,0x421D,0x4D99,0x5B3E,0x6B76,0x7EBD,0x95A6,
+/* A:0d B:01 */
+0x0603,0x0624,0x064C,0x067A,0x06B1,0x06F3,0x0741,0x079E,
+0x080D,0x0890,0x092C,0x09E5,0x0AC2,0x0BC8,0x0CFF,0x0E71,
+0x1028,0x1233,0x14A0,0x1782,0x1AEF,0x1F01,0x23D8,0x2999,
+0x306F,0x388F,0x4237,0x4DB1,0x5B55,0x6B8B,0x7ED0,0x95B6,
+/* A:0d B:02 */
+0x062B,0x064C,0x0673,0x06A1,0x06D9,0x071A,0x0768,0x07C5,
+0x0834,0x08B7,0x0953,0x0A0C,0x0AE8,0x0BEE,0x0D25,0x0E97,
+0x104E,0x1258,0x14C5,0x17A7,0x1B13,0x1F25,0x23FB,0x29BB,
+0x3090,0x38AF,0x4256,0x4DCF,0x5B71,0x6BA5,0x7EE7,0x95CA,
+/* A:0d B:03 */
+0x0659,0x067A,0x06A1,0x06D0,0x0707,0x0749,0x0797,0x07F4,
+0x0862,0x08E5,0x0981,0x0A3A,0x0B16,0x0C1C,0x0D52,0x0EC4,
+0x107B,0x1285,0x14F1,0x17D2,0x1B3E,0x1F50,0x2425,0x29E4,
+0x30B8,0x38D6,0x427B,0x4DF2,0x5B92,0x6BC3,0x7F02,0x95E1,
+/* A:0d B:04 */
+0x0691,0x06B1,0x06D9,0x0707,0x073E,0x0780,0x07CE,0x082B,
+0x0899,0x091C,0x09B8,0x0A71,0x0B4D,0x0C52,0x0D89,0x0EFA,
+0x10B0,0x12BA,0x1526,0x1806,0x1B72,0x1F82,0x2457,0x2A15,
+0x30E7,0x3903,0x42A7,0x4E1B,0x5BB9,0x6BE7,0x7F22,0x95FD,
+/* A:0d B:05 */
+0x06D2,0x06F3,0x071A,0x0749,0x0780,0x07C2,0x080F,0x086C,
+0x08DA,0x095D,0x09F9,0x0AB2,0x0B8D,0x0C92,0x0DC9,0x0F3A,
+0x10F0,0x12F9,0x1564,0x1844,0x1BAF,0x1FBE,0x2492,0x2A4E,
+0x3120,0x393A,0x42DB,0x4E4D,0x5BE7,0x6C11,0x7F48,0x961E,
+/* A:0d B:06 */
+0x0721,0x0741,0x0768,0x0797,0x07CE,0x080F,0x085D,0x08BA,
+0x0928,0x09AB,0x0A46,0x0AFF,0x0BDA,0x0CDF,0x0E15,0x0F85,
+0x113B,0x1344,0x15AE,0x188E,0x1BF7,0x2006,0x24D8,0x2A93,
+0x3162,0x397A,0x4319,0x4E88,0x5C1E,0x6C44,0x7F76,0x9645,
+/* A:0d B:07 */
+0x077E,0x079E,0x07C5,0x07F4,0x082B,0x086C,0x08BA,0x0916,
+0x0984,0x0A07,0x0AA2,0x0B5A,0x0C36,0x0D3A,0x0E70,0x0FE0,
+0x1195,0x139D,0x1607,0x18E5,0x1C4E,0x205B,0x252B,0x2AE4,
+0x31B1,0x39C7,0x4362,0x4ECD,0x5C5F,0x6C80,0x7FAC,0x9674,
+/* A:0d B:08 */
+0x07EC,0x080D,0x0834,0x0862,0x0899,0x08DA,0x0928,0x0984,
+0x09F2,0x0A74,0x0B0F,0x0BC7,0x0CA2,0x0DA6,0x0EDC,0x104B,
+0x1200,0x1407,0x1670,0x194D,0x1CB4,0x20C0,0x258E,0x2B45,
+0x3210,0x3A22,0x43BA,0x4F20,0x5CAD,0x6CC8,0x7FEC,0x96AB,
+/* A:0d B:09 */
+0x086F,0x0890,0x08B7,0x08E5,0x091C,0x095D,0x09AB,0x0A07,
+0x0A74,0x0AF6,0x0B91,0x0C49,0x0D23,0x0E27,0x0F5C,0x10CA,
+0x127E,0x1484,0x16EC,0x19C8,0x1D2E,0x2137,0x2604,0x2BB8,
+0x3280,0x3A8E,0x4422,0x4F83,0x5D0A,0x6D1D,0x8038,0x96ED,
+/* A:0d B:0a */
+0x090B,0x092C,0x0953,0x0981,0x09B8,0x09F9,0x0A46,0x0AA2,
+0x0B0F,0x0B91,0x0C2B,0x0CE3,0x0DBD,0x0EC0,0x0FF4,0x1162,
+0x1315,0x151A,0x1780,0x1A5B,0x1DBE,0x21C6,0x2690,0x2C41,
+0x3305,0x3B0F,0x449D,0x4FF8,0x5D77,0x6D82,0x8093,0x973B,
+/* A:0d B:0b */
+0x09C5,0x09E5,0x0A0C,0x0A3A,0x0A71,0x0AB2,0x0AFF,0x0B5A,
+0x0BC7,0x0C49,0x0CE3,0x0D9A,0x0E73,0x0F76,0x10A9,0x1216,
+0x13C8,0x15CC,0x1830,0x1B09,0x1E6A,0x226F,0x2736,0x2CE4,
+0x33A3,0x3BA8,0x4530,0x5084,0x5DFA,0x6DFA,0x80FE,0x9798,
+/* A:0d B:0c */
+0x0AA1,0x0AC2,0x0AE8,0x0B16,0x0B4D,0x0B8D,0x0BDA,0x0C36,
+0x0CA2,0x0D23,0x0DBD,0x0E73,0x0F4C,0x104E,0x1180,0x12EC,
+0x149C,0x169F,0x1902,0x1BD8,0x1F37,0x2339,0x27FC,0x2DA5,
+0x345F,0x3C5E,0x45DE,0x5129,0x5E95,0x6E89,0x817E,0x9807,
+/* A:0d B:0d */
+0x0BA7,0x0BC8,0x0BEE,0x0C1C,0x0C52,0x0C92,0x0CDF,0x0D3A,
+0x0DA6,0x0E27,0x0EC0,0x0F76,0x104E,0x114E,0x1280,0x13EA,
+0x1599,0x179A,0x19FA,0x1CCE,0x202A,0x2428,0x28E7,0x2E8A,
+0x353E,0x3D36,0x46AD,0x51EE,0x5F4E,0x6F32,0x8216,0x988A,
+/* A:0d B:0e */
+0x0CDF,0x0CFF,0x0D25,0x0D52,0x0D89,0x0DC9,0x0E15,0x0E70,
+0x0EDC,0x0F5C,0x0FF4,0x10A9,0x1180,0x1280,0x13AF,0x1518,
+0x16C6,0x18C4,0x1B22,0x1DF2,0x214B,0x2544,0x29FE,0x2F9B,
+0x3648,0x3E36,0x47A4,0x52D8,0x6029,0x6FFC,0x82CB,0x9926,
+/* A:0d B:0f */
+0x0E51,0x0E71,0x0E97,0x0EC4,0x0EFA,0x0F3A,0x0F85,0x0FE0,
+0x104B,0x10CA,0x1162,0x1216,0x12EC,0x13EA,0x1518,0x1680,
+0x182B,0x1A26,0x1C81,0x1F4E,0x22A2,0x2696,0x2B4A,0x30E0,
+0x3783,0x3F67,0x48C8,0x53EE,0x612D,0x70EC,0x83A2,0x99E0,
+/* A:0d B:10 */
+0x1008,0x1028,0x104E,0x107B,0x10B0,0x10F0,0x113B,0x1195,
+0x1200,0x127E,0x1315,0x13C8,0x149C,0x1599,0x16C6,0x182B,
+0x19D3,0x1BCB,0x1E23,0x20EB,0x243A,0x2828,0x2CD4,0x3261,
+0x38FA,0x40D2,0x4A24,0x5538,0x6263,0x7209,0x84A2,0x9ABC,
+/* A:0d B:11 */
+0x1213,0x1233,0x1258,0x1285,0x12BA,0x12F9,0x1344,0x139D,
+0x1407,0x1484,0x151A,0x15CC,0x169F,0x179A,0x18C4,0x1A26,
+0x1BCB,0x1DC0,0x2013,0x22D6,0x261E,0x2A05,0x2EA8,0x342B,
+0x3AB8,0x4281,0x4BC2,0x56C1,0x63D3,0x735B,0x85D1,0x9BC2,
+/* A:0d B:12 */
+0x1480,0x14A0,0x14C5,0x14F1,0x1526,0x1564,0x15AE,0x1607,
+0x1670,0x16EC,0x1780,0x1830,0x1902,0x19FA,0x1B22,0x1C81,
+0x1E23,0x2013,0x2261,0x251E,0x285F,0x2C3D,0x30D5,0x364C,
+0x3CCA,0x4481,0x4DAD,0x5894,0x6588,0x74ED,0x873A,0x9CF9,
+/* A:0d B:13 */
+0x1763,0x1782,0x17A7,0x17D2,0x1806,0x1844,0x188E,0x18E5,
+0x194D,0x19C8,0x1A5B,0x1B09,0x1BD8,0x1CCE,0x1DF2,0x1F4E,
+0x20EB,0x22D6,0x251E,0x27D3,0x2B0B,0x2EDF,0x336B,0x38D3,
+0x3F40,0x46E2,0x4FF5,0x5ABE,0x6790,0x76CC,0x88E7,0x9E6C,
+/* A:0d B:14 */
+0x1AD0,0x1AEF,0x1B13,0x1B3E,0x1B72,0x1BAF,0x1BF7,0x1C4E,
+0x1CB4,0x1D2E,0x1DBE,0x1E6A,0x1F37,0x202A,0x214B,0x22A2,
+0x243A,0x261E,0x285F,0x2B0B,0x2E39,0x3200,0x367E,0x3BD4,
+0x422C,0x49B6,0x52AB,0x5D51,0x69F9,0x7904,0x8AE4,0xA023,
+/* A:0d B:15 */
+0x1EE3,0x1F01,0x1F25,0x1F50,0x1F82,0x1FBE,0x2006,0x205B,
+0x20C0,0x2137,0x21C6,0x226F,0x2339,0x2428,0x2544,0x2696,
+0x2828,0x2A05,0x2C3D,0x2EDF,0x3200,0x35B9,0x3A25,0x3F66,
+0x45A5,0x4D12,0x55E4,0x6061,0x6CD7,0x7BA7,0x8D42,0xA22E,
+/* A:0d B:16 */
+0x23BB,0x23D8,0x23FB,0x2425,0x2457,0x2492,0x24D8,0x252B,
+0x258E,0x2604,0x2690,0x2736,0x27FC,0x28E7,0x29FE,0x2B4A,
+0x2CD4,0x2EA8,0x30D5,0x336B,0x367E,0x3A25,0x3E7C,0x43A5,
+0x49C6,0x5110,0x59B9,0x6404,0x7040,0x7ECA,0x9012,0xA49C,
+/* A:0d B:17 */
+0x297C,0x2999,0x29BB,0x29E4,0x2A15,0x2A4E,0x2A93,0x2AE4,
+0x2B45,0x2BB8,0x2C41,0x2CE4,0x2DA5,0x2E8A,0x2F9B,0x30E0,
+0x3261,0x342B,0x364C,0x38D3,0x3BD4,0x3F66,0x43A5,0x48B0,
+0x4EAF,0x55CF,0x5E46,0x6857,0x744D,0x8284,0x9369,0xA77E,
+/* A:0d B:18 */
+0x3053,0x306F,0x3090,0x30B8,0x30E7,0x3120,0x3162,0x31B1,
+0x3210,0x3280,0x3305,0x33A3,0x345F,0x353E,0x3648,0x3783,
+0x38FA,0x3AB8,0x3CCA,0x3F40,0x422C,0x45A5,0x49C6,0x4EAF,
+0x5484,0x5B72,0x63AF,0x6D7A,0x791D,0x86F2,0x9762,0xAAEC,
+/* A:0d B:19 */
+0x3874,0x388F,0x38AF,0x38D6,0x3903,0x393A,0x397A,0x39C7,
+0x3A22,0x3A8E,0x3B0F,0x3BA8,0x3C5E,0x3D36,0x3E36,0x3F67,
+0x40D2,0x4281,0x4481,0x46E2,0x49B6,0x4D12,0x5110,0x55CF,
+0x5B72,0x6226,0x6A1E,0x7395,0x7ED6,0x8C36,0x9C1B,0xAEFF,
+/* A:0d B:1a */
+0x421D,0x4237,0x4256,0x427B,0x42A7,0x42DB,0x4319,0x4362,
+0x43BA,0x4422,0x449D,0x4530,0x45DE,0x46AD,0x47A4,0x48C8,
+0x4A24,0x4BC2,0x4DAD,0x4FF5,0x52AB,0x55E4,0x59B9,0x5E46,
+0x63AF,0x6A1E,0x71C2,0x7AD7,0x85A3,0x9277,0xA1B7,0xB3D6,
+/* A:0d B:1b */
+0x4D99,0x4DB1,0x4DCF,0x4DF2,0x4E1B,0x4E4D,0x4E88,0x4ECD,
+0x4F20,0x4F83,0x4FF8,0x5084,0x5129,0x51EE,0x52D8,0x53EE,
+0x5538,0x56C1,0x5894,0x5ABE,0x5D51,0x6061,0x6404,0x6857,
+0x6D7A,0x7395,0x7AD7,0x8377,0x8DB8,0x99E7,0xA862,0xB998,
+/* A:0d B:1c */
+0x5B3E,0x5B55,0x5B71,0x5B92,0x5BB9,0x5BE7,0x5C1E,0x5C5F,
+0x5CAD,0x5D0A,0x5D77,0x5DFA,0x5E95,0x5F4E,0x6029,0x612D,
+0x6263,0x63D3,0x6588,0x6790,0x69F9,0x6CD7,0x7040,0x744D,
+0x791D,0x7ED6,0x85A3,0x8DB8,0x9753,0xA2BD,0xB04F,0xC06F,
+/* A:0d B:1d */
+0x6B76,0x6B8B,0x6BA5,0x6BC3,0x6BE7,0x6C11,0x6C44,0x6C80,
+0x6CC8,0x6D1D,0x6D82,0x6DFA,0x6E89,0x6F32,0x6FFC,0x70EC,
+0x7209,0x735B,0x74ED,0x76CC,0x7904,0x7BA7,0x7ECA,0x8284,
+0x86F2,0x8C36,0x9277,0x99E7,0xA2BD,0xAD3E,0xB9BA,0xC890,
+/* A:0d B:1e */
+0x7EBD,0x7ED0,0x7EE7,0x7F02,0x7F22,0x7F48,0x7F76,0x7FAC,
+0x7FEC,0x8038,0x8093,0x80FE,0x817E,0x8216,0x82CB,0x83A2,
+0x84A2,0x85D1,0x873A,0x88E7,0x8AE4,0x8D42,0x9012,0x9369,
+0x9762,0x9C1B,0xA1B7,0xA862,0xB04F,0xB9BA,0xC4EC,0xD23A,
+/* A:0d B:1f */
+0x95A6,0x95B6,0x95CA,0x95E1,0x95FD,0x961E,0x9645,0x9674,
+0x96AB,0x96ED,0x973B,0x9798,0x9807,0x988A,0x9926,0x99E0,
+0x9ABC,0x9BC2,0x9CF9,0x9E6C,0xA023,0xA22E,0xA49C,0xA77E,
+0xAAEC,0xAEFF,0xB3D6,0xB998,0xC06F,0xC890,0xD23A,0xDDB6,
+/* A: 968D89C0 */
+/* A:0e B:00 */
+0x0720,0x0741,0x0768,0x0796,0x07CE,0x080F,0x085D,0x08B9,
+0x0927,0x09AA,0x0A46,0x0AFE,0x0BDA,0x0CDF,0x0E15,0x0F85,
+0x113B,0x1343,0x15AE,0x188D,0x1BF7,0x2005,0x24D8,0x2A92,
+0x3162,0x397A,0x4318,0x4E87,0x5C1E,0x6C44,0x7F75,0x9645,
+/* A:0e B:01 */
+0x0741,0x0762,0x0789,0x07B7,0x07EE,0x0830,0x087E,0x08DA,
+0x0948,0x09CB,0x0A66,0x0B1F,0x0BFA,0x0CFF,0x0E35,0x0FA5,
+0x115B,0x1363,0x15CD,0x18AC,0x1C15,0x2023,0x24F5,0x2AAF,
+0x317E,0x3995,0x4332,0x4EA0,0x5C35,0x6C59,0x7F88,0x9656,
+/* A:0e B:02 */
+0x0768,0x0789,0x07B0,0x07DE,0x0815,0x0857,0x08A4,0x0901,
+0x096F,0x09F1,0x0A8D,0x0B45,0x0C20,0x0D25,0x0E5B,0x0FCB,
+0x1180,0x1388,0x15F2,0x18D1,0x1C3A,0x2047,0x2518,0x2AD1,
+0x319F,0x39B5,0x4351,0x4EBD,0x5C50,0x6C72,0x7F9F,0x9669,
+/* A:0e B:03 */
+0x0796,0x07B7,0x07DE,0x080C,0x0844,0x0885,0x08D3,0x092F,
+0x099D,0x0A1F,0x0ABB,0x0B73,0x0C4E,0x0D52,0x0E88,0x0FF8,
+0x11AD,0x13B5,0x161E,0x18FC,0x1C65,0x2071,0x2542,0x2AFA,
+0x31C7,0x39DB,0x4376,0x4EE0,0x5C71,0x6C90,0x7FBA,0x9680,
+/* A:0e B:04 */
+0x07CE,0x07EE,0x0815,0x0844,0x087B,0x08BC,0x090A,0x0966,
+0x09D4,0x0A56,0x0AF1,0x0BA9,0x0C84,0x0D89,0x0EBE,0x102D,
+0x11E2,0x13EA,0x1653,0x1930,0x1C98,0x20A4,0x2573,0x2B2A,
+0x31F6,0x3A09,0x43A2,0x4F09,0x5C98,0x6CB4,0x7FDA,0x969C,
+/* A:0e B:05 */
+0x080F,0x0830,0x0857,0x0885,0x08BC,0x08FD,0x094B,0x09A7,
+0x0A15,0x0A97,0x0B32,0x0BEA,0x0CC5,0x0DC9,0x0EFE,0x106D,
+0x1221,0x1428,0x1691,0x196E,0x1CD5,0x20E0,0x25AE,0x2B64,
+0x322E,0x3A3F,0x43D5,0x4F3B,0x5CC6,0x6CDF,0x8000,0x96BD,
+/* A:0e B:06 */
+0x085D,0x087E,0x08A4,0x08D3,0x090A,0x094B,0x0998,0x09F4,
+0x0A62,0x0AE4,0x0B7F,0x0C37,0x0D11,0x0E15,0x0F4A,0x10B9,
+0x126D,0x1473,0x16DB,0x19B7,0x1D1D,0x2127,0x25F4,0x2BA8,
+0x3270,0x3A7F,0x4413,0x4F75,0x5CFD,0x6D11,0x802D,0x96E4,
+/* A:0e B:07 */
+0x08B9,0x08DA,0x0901,0x092F,0x0966,0x09A7,0x09F4,0x0A51,
+0x0ABE,0x0B40,0x0BDA,0x0C92,0x0D6C,0x0E70,0x0FA4,0x1112,
+0x12C6,0x14CB,0x1733,0x1A0E,0x1D73,0x217B,0x2647,0x2BF9,
+0x32BF,0x3ACB,0x445C,0x4FBB,0x5D3E,0x6D4D,0x8063,0x9712,
+/* A:0e B:08 */
+0x0927,0x0948,0x096F,0x099D,0x09D4,0x0A15,0x0A62,0x0ABE,
+0x0B2B,0x0BAD,0x0C47,0x0CFF,0x0DD9,0x0EDC,0x100F,0x117D,
+0x1330,0x1535,0x179B,0x1A75,0x1DD9,0x21E0,0x26A9,0x2C5A,
+0x331D,0x3B26,0x44B3,0x500D,0x5D8B,0x6D94,0x80A3,0x9749,
+/* A:0e B:09 */
+0x09AA,0x09CB,0x09F1,0x0A1F,0x0A56,0x0A97,0x0AE4,0x0B40,
+0x0BAD,0x0C2F,0x0CC9,0x0D80,0x0E59,0x0F5C,0x108F,0x11FC,
+0x13AE,0x15B2,0x1817,0x1AF0,0x1E52,0x2257,0x271E,0x2CCC,
+0x338C,0x3B92,0x451B,0x5070,0x5DE7,0x6DE9,0x80EF,0x978B,
+/* A:0e B:0a */
+0x0A46,0x0A66,0x0A8D,0x0ABB,0x0AF1,0x0B32,0x0B7F,0x0BDA,
+0x0C47,0x0CC9,0x0D62,0x0E19,0x0EF2,0x0FF4,0x1127,0x1293,
+0x1444,0x1647,0x18AB,0x1B82,0x1EE2,0x22E5,0x27AA,0x2D54,
+0x3411,0x3C12,0x4596,0x50E4,0x5E55,0x6E4D,0x8149,0x97D9,
+/* A:0e B:0b */
+0x0AFE,0x0B1F,0x0B45,0x0B73,0x0BA9,0x0BEA,0x0C37,0x0C92,
+0x0CFF,0x0D80,0x0E19,0x0ECF,0x0FA8,0x10A9,0x11DB,0x1346,
+0x14F6,0x16F8,0x195A,0x1C2F,0x1F8D,0x238E,0x284F,0x2DF6,
+0x34AE,0x3CAA,0x4628,0x516F,0x5ED7,0x6EC5,0x81B4,0x9835,
+/* A:0e B:0c */
+0x0BDA,0x0BFA,0x0C20,0x0C4E,0x0C84,0x0CC5,0x0D11,0x0D6C,
+0x0DD9,0x0E59,0x0EF2,0x0FA8,0x107F,0x1180,0x12B1,0x141B,
+0x15CA,0x17CA,0x1A2A,0x1CFD,0x2059,0x2456,0x2914,0x2EB7,
+0x3569,0x3D5F,0x46D5,0x5214,0x5F71,0x6F53,0x8234,0x98A3,
+/* A:0e B:0d */
+0x0CDF,0x0CFF,0x0D25,0x0D52,0x0D89,0x0DC9,0x0E15,0x0E70,
+0x0EDC,0x0F5C,0x0FF4,0x10A9,0x1180,0x1280,0x13AF,0x1518,
+0x16C6,0x18C4,0x1B22,0x1DF2,0x214B,0x2544,0x29FE,0x2F9B,
+0x3648,0x3E36,0x47A4,0x52D8,0x6029,0x6FFC,0x82CB,0x9926,
+/* A:0e B:0e */
+0x0E15,0x0E35,0x0E5B,0x0E88,0x0EBE,0x0EFE,0x0F4A,0x0FA4,
+0x100F,0x108F,0x1127,0x11DB,0x12B1,0x13AF,0x14DE,0x1645,
+0x17F1,0x19ED,0x1C48,0x1F16,0x226A,0x265F,0x2B14,0x30AB,
+0x3750,0x3F36,0x4899,0x53C1,0x6103,0x70C5,0x837F,0x99C1,
+/* A:0e B:0f */
+0x0F85,0x0FA5,0x0FCB,0x0FF8,0x102D,0x106D,0x10B9,0x1112,
+0x117D,0x11FC,0x1293,0x1346,0x141B,0x1518,0x1645,0x17AB,
+0x1954,0x1B4D,0x1DA6,0x2070,0x23C0,0x27B0,0x2C5E,0x31EE,
+0x388A,0x4066,0x49BC,0x54D5,0x6206,0x71B3,0x8455,0x9A7A,
+/* A:0e B:10 */
+0x113B,0x115B,0x1180,0x11AD,0x11E2,0x1221,0x126D,0x12C6,
+0x1330,0x13AE,0x1444,0x14F6,0x15CA,0x16C6,0x17F1,0x1954,
+0x1AFB,0x1CF1,0x1F46,0x220B,0x2556,0x2940,0x2DE7,0x336E,
+0x3A00,0x41CF,0x4B17,0x561E,0x633A,0x72CF,0x8554,0x9B56,
+/* A:0e B:11 */
+0x1343,0x1363,0x1388,0x13B5,0x13EA,0x1428,0x1473,0x14CB,
+0x1535,0x15B2,0x1647,0x16F8,0x17CA,0x18C4,0x19ED,0x1B4D,
+0x1CF1,0x1EE3,0x2134,0x23F4,0x2739,0x2B1B,0x2FB9,0x3536,
+0x3BBC,0x437C,0x4CB2,0x57A5,0x64A9,0x7420,0x8682,0x9C5A,
+/* A:0e B:12 */
+0x15AE,0x15CD,0x15F2,0x161E,0x1653,0x1691,0x16DB,0x1733,
+0x179B,0x1817,0x18AB,0x195A,0x1A2A,0x1B22,0x1C48,0x1DA6,
+0x1F46,0x2134,0x237F,0x2639,0x2976,0x2D50,0x31E4,0x3754,
+0x3DCB,0x457A,0x4E9C,0x5976,0x665C,0x75B1,0x87E9,0x9D90,
+/* A:0e B:13 */
+0x188D,0x18AC,0x18D1,0x18FC,0x1930,0x196E,0x19B7,0x1A0E,
+0x1A75,0x1AF0,0x1B82,0x1C2F,0x1CFD,0x1DF2,0x1F16,0x2070,
+0x220B,0x23F4,0x2639,0x28EB,0x2C20,0x2FEF,0x3477,0x39D9,
+0x403E,0x47D8,0x50E1,0x5B9E,0x6862,0x778D,0x8994,0x9F01,
+/* A:0e B:14 */
+0x1BF7,0x1C15,0x1C3A,0x1C65,0x1C98,0x1CD5,0x1D1D,0x1D73,
+0x1DD9,0x1E52,0x1EE2,0x1F8D,0x2059,0x214B,0x226A,0x23C0,
+0x2556,0x2739,0x2976,0x2C20,0x2F4A,0x330D,0x3786,0x3CD6,
+0x4327,0x4AA9,0x5394,0x5E2F,0x6AC9,0x79C3,0x8B8F,0xA0B7,
+/* A:0e B:15 */
+0x2005,0x2023,0x2047,0x2071,0x20A4,0x20E0,0x2127,0x217B,
+0x21E0,0x2257,0x22E5,0x238E,0x2456,0x2544,0x265F,0x27B0,
+0x2940,0x2B1B,0x2D50,0x2FEF,0x330D,0x36C2,0x3B29,0x4065,
+0x469D,0x4E01,0x56CA,0x613B,0x6DA3,0x7C63,0x8DEA,0xA2BF,
+/* A:0e B:16 */
+0x24D8,0x24F5,0x2518,0x2542,0x2573,0x25AE,0x25F4,0x2647,
+0x26A9,0x271E,0x27AA,0x284F,0x2914,0x29FE,0x2B14,0x2C5E,
+0x2DE7,0x2FB9,0x31E4,0x3477,0x3786,0x3B29,0x3F7B,0x449E,
+0x4AB9,0x51FB,0x5A9A,0x64DA,0x7108,0x7F82,0x90B7,0xA52A,
+/* A:0e B:17 */
+0x2A92,0x2AAF,0x2AD1,0x2AFA,0x2B2A,0x2B64,0x2BA8,0x2BF9,
+0x2C5A,0x2CCC,0x2D54,0x2DF6,0x2EB7,0x2F9B,0x30AB,0x31EE,
+0x336E,0x3536,0x3754,0x39D9,0x3CD6,0x4065,0x449E,0x49A4,
+0x4F9C,0x56B4,0x5F22,0x6928,0x7511,0x8338,0x940B,0xA809,
+/* A:0e B:18 */
+0x3162,0x317E,0x319F,0x31C7,0x31F6,0x322E,0x3270,0x32BF,
+0x331D,0x338C,0x3411,0x34AE,0x3569,0x3648,0x3750,0x388A,
+0x3A00,0x3BBC,0x3DCB,0x403E,0x4327,0x469D,0x4AB9,0x4F9C,
+0x556B,0x5C52,0x6486,0x6E45,0x79DC,0x87A1,0x97FF,0xAB73,
+/* A:0e B:19 */
+0x397A,0x3995,0x39B5,0x39DB,0x3A09,0x3A3F,0x3A7F,0x3ACB,
+0x3B26,0x3B92,0x3C12,0x3CAA,0x3D5F,0x3E36,0x3F36,0x4066,
+0x41CF,0x437C,0x457A,0x47D8,0x4AA9,0x4E01,0x51FB,0x56B4,
+0x5C52,0x62FE,0x6AED,0x745A,0x7F8E,0x8CDF,0x9CB2,0xAF81,
+/* A:0e B:1a */
+0x4318,0x4332,0x4351,0x4376,0x43A2,0x43D5,0x4413,0x445C,
+0x44B3,0x451B,0x4596,0x4628,0x46D5,0x47A4,0x4899,0x49BC,
+0x4B17,0x4CB2,0x4E9C,0x50E1,0x5394,0x56CA,0x5A9A,0x5F22,
+0x6486,0x6AED,0x7288,0x7B94,0x8653,0x9319,0xA248,0xB453,
+/* A:0e B:1b */
+0x4E87,0x4EA0,0x4EBD,0x4EE0,0x4F09,0x4F3B,0x4F75,0x4FBB,
+0x500D,0x5070,0x50E4,0x516F,0x5214,0x52D8,0x53C1,0x54D5,
+0x561E,0x57A5,0x5976,0x5B9E,0x5E2F,0x613B,0x64DA,0x6928,
+0x6E45,0x745A,0x7B94,0x842A,0x8E5F,0x9A81,0xA8EC,0xBA0E,
+/* A:0e B:1c */
+0x5C1E,0x5C35,0x5C50,0x5C71,0x5C98,0x5CC6,0x5CFD,0x5D3E,
+0x5D8B,0x5DE7,0x5E55,0x5ED7,0x5F71,0x6029,0x6103,0x6206,
+0x633A,0x64A9,0x665C,0x6862,0x6AC9,0x6DA3,0x7108,0x7511,
+0x79DC,0x7F8E,0x8653,0x8E5F,0x97EF,0xA34D,0xB0D0,0xC0DE,
+/* A:0e B:1d */
+0x6C44,0x6C59,0x6C72,0x6C90,0x6CB4,0x6CDF,0x6D11,0x6D4D,
+0x6D94,0x6DE9,0x6E4D,0x6EC5,0x6F53,0x6FFC,0x70C5,0x71B3,
+0x72CF,0x7420,0x75B1,0x778D,0x79C3,0x7C63,0x7F82,0x8338,
+0x87A1,0x8CDF,0x9319,0x9A81,0xA34D,0xADC2,0xBA30,0xC8F6,
+/* A:0e B:1e */
+0x7F75,0x7F88,0x7F9F,0x7FBA,0x7FDA,0x8000,0x802D,0x8063,
+0x80A3,0x80EF,0x8149,0x81B4,0x8234,0x82CB,0x837F,0x8455,
+0x8554,0x8682,0x87E9,0x8994,0x8B8F,0x8DEA,0x90B7,0x940B,
+0x97FF,0x9CB2,0xA248,0xA8EC,0xB0D0,0xBA30,0xC555,0xD294,
+/* A:0e B:1f */
+0x9645,0x9656,0x9669,0x9680,0x969C,0x96BD,0x96E4,0x9712,
+0x9749,0x978B,0x97D9,0x9835,0x98A3,0x9926,0x99C1,0x9A7A,
+0x9B56,0x9C5A,0x9D90,0x9F01,0xA0B7,0xA2BF,0xA52A,0xA809,
+0xAB73,0xAF81,0xB453,0xBA0E,0xC0DE,0xC8F6,0xD294,0xDE03,
+/* A: 968D89C0 */
+/* A:0f B:00 */
+0x089A,0x08BA,0x08E1,0x090F,0x0946,0x0987,0x09D5,0x0A31,
+0x0A9E,0x0B20,0x0BBB,0x0C73,0x0D4D,0x0E51,0x0F85,0x10F4,
+0x12A7,0x14AD,0x1714,0x19F0,0x1D55,0x215E,0x262A,0x2BDD,
+0x32A4,0x3AB1,0x4443,0x4FA3,0x5D28,0x6D39,0x8051,0x9703,
+/* A:0f B:01 */
+0x08BA,0x08DB,0x0902,0x0930,0x0967,0x09A8,0x09F5,0x0A51,
+0x0ABF,0x0B41,0x0BDB,0x0C93,0x0D6D,0x0E71,0x0FA5,0x1113,
+0x12C7,0x14CC,0x1734,0x1A0F,0x1D73,0x217C,0x2647,0x2BFA,
+0x32C0,0x3ACC,0x445D,0x4FBC,0x5D3F,0x6D4E,0x8064,0x9713,
+/* A:0f B:02 */
+0x08E1,0x0902,0x0929,0x0957,0x098E,0x09CF,0x0A1C,0x0A78,
+0x0AE5,0x0B67,0x0C02,0x0CB9,0x0D93,0x0E97,0x0FCB,0x1139,
+0x12EC,0x14F2,0x1758,0x1A33,0x1D97,0x21A0,0x266A,0x2C1C,
+0x32E1,0x3AEC,0x447C,0x4FD9,0x5D5A,0x6D67,0x807A,0x9726,
+/* A:0f B:03 */
+0x090F,0x0930,0x0957,0x0985,0x09BC,0x09FD,0x0A4A,0x0AA6,
+0x0B13,0x0B95,0x0C2F,0x0CE7,0x0DC1,0x0EC4,0x0FF8,0x1166,
+0x1319,0x151E,0x1784,0x1A5E,0x1DC2,0x21CA,0x2694,0x2C45,
+0x3308,0x3B12,0x44A0,0x4FFB,0x5D7A,0x6D85,0x8095,0x973D,
+/* A:0f B:04 */
+0x0946,0x0967,0x098E,0x09BC,0x09F2,0x0A33,0x0A81,0x0ADD,
+0x0B4A,0x0BCB,0x0C66,0x0D1D,0x0DF7,0x0EFA,0x102D,0x119B,
+0x134E,0x1552,0x17B8,0x1A92,0x1DF5,0x21FC,0x26C5,0x2C75,
+0x3337,0x3B40,0x44CC,0x5025,0x5DA1,0x6DA8,0x80B5,0x9759,
+/* A:0f B:05 */
+0x0987,0x09A8,0x09CF,0x09FD,0x0A33,0x0A74,0x0AC2,0x0B1D,
+0x0B8A,0x0C0C,0x0CA6,0x0D5D,0x0E37,0x0F3A,0x106D,0x11DA,
+0x138D,0x1591,0x17F6,0x1ACF,0x1E32,0x2237,0x26FF,0x2CAE,
+0x336F,0x3B75,0x44FF,0x5055,0x5DCF,0x6DD2,0x80DB,0x977A,
+/* A:0f B:06 */
+0x09D5,0x09F5,0x0A1C,0x0A4A,0x0A81,0x0AC2,0x0B0F,0x0B6A,
+0x0BD7,0x0C59,0x0CF3,0x0DAA,0x0E83,0x0F85,0x10B9,0x1226,
+0x13D7,0x15DB,0x1840,0x1B18,0x1E79,0x227E,0x2745,0x2CF2,
+0x33B1,0x3BB5,0x453C,0x5090,0x5E05,0x6E05,0x8108,0x97A0,
+/* A:0f B:07 */
+0x0A31,0x0A51,0x0A78,0x0AA6,0x0ADD,0x0B1D,0x0B6A,0x0BC6,
+0x0C33,0x0CB4,0x0D4E,0x0E05,0x0EDE,0x0FE0,0x1112,0x127F,
+0x1430,0x1633,0x1897,0x1B6E,0x1ECF,0x22D2,0x2797,0x2D42,
+0x33FF,0x3C01,0x4585,0x50D5,0x5E46,0x6E40,0x813D,0x97CF,
+/* A:0f B:08 */
+0x0A9E,0x0ABF,0x0AE5,0x0B13,0x0B4A,0x0B8A,0x0BD7,0x0C33,
+0x0C9F,0x0D21,0x0DBA,0x0E70,0x0F49,0x104B,0x117D,0x12E9,
+0x149A,0x169C,0x18FF,0x1BD5,0x1F34,0x2336,0x27F9,0x2DA2,
+0x345C,0x3C5B,0x45DC,0x5127,0x5E93,0x6E87,0x817D,0x9805,
+/* A:0f B:09 */
+0x0B20,0x0B41,0x0B67,0x0B95,0x0BCB,0x0C0C,0x0C59,0x0CB4,
+0x0D21,0x0DA1,0x0E3B,0x0EF1,0x0FC9,0x10CA,0x11FC,0x1367,
+0x1517,0x1718,0x197A,0x1C4F,0x1FAD,0x23AD,0x286E,0x2E14,
+0x34CB,0x3CC7,0x4643,0x5189,0x5EEF,0x6EDB,0x81C8,0x9847,
+/* A:0f B:0a */
+0x0BBB,0x0BDB,0x0C02,0x0C2F,0x0C66,0x0CA6,0x0CF3,0x0D4E,
+0x0DBA,0x0E3B,0x0ED4,0x0F89,0x1061,0x1162,0x1293,0x13FE,
+0x15AC,0x17AD,0x1A0D,0x1CE1,0x203C,0x243A,0x28F8,0x2E9C,
+0x354F,0x3D46,0x46BD,0x51FD,0x5F5C,0x6F3F,0x8222,0x9894,
+/* A:0f B:0b */
+0x0C73,0x0C93,0x0CB9,0x0CE7,0x0D1D,0x0D5D,0x0DAA,0x0E05,
+0x0E70,0x0EF1,0x0F89,0x103F,0x1116,0x1216,0x1346,0x14B0,
+0x165E,0x185C,0x1ABC,0x1D8D,0x20E7,0x24E2,0x299D,0x2F3D,
+0x35EC,0x3DDD,0x474E,0x5287,0x5FDD,0x6FB6,0x828D,0x98F0,
+/* A:0f B:0c */
+0x0D4D,0x0D6D,0x0D93,0x0DC1,0x0DF7,0x0E37,0x0E83,0x0EDE,
+0x0F49,0x0FC9,0x1061,0x1116,0x11ED,0x12EC,0x141B,0x1584,
+0x1730,0x192E,0x1B8B,0x1E5A,0x21B1,0x25A9,0x2A61,0x2FFC,
+0x36A6,0x3E91,0x47FB,0x532B,0x6077,0x7044,0x830B,0x995E,
+/* A:0f B:0d */
+0x0E51,0x0E71,0x0E97,0x0EC4,0x0EFA,0x0F3A,0x0F85,0x0FE0,
+0x104B,0x10CA,0x1162,0x1216,0x12EC,0x13EA,0x1518,0x1680,
+0x182B,0x1A26,0x1C81,0x1F4E,0x22A2,0x2696,0x2B4A,0x30E0,
+0x3783,0x3F67,0x48C8,0x53EE,0x612D,0x70EC,0x83A2,0x99E0,
+/* A:0f B:0e */
+0x0F85,0x0FA5,0x0FCB,0x0FF8,0x102D,0x106D,0x10B9,0x1112,
+0x117D,0x11FC,0x1293,0x1346,0x141B,0x1518,0x1645,0x17AB,
+0x1954,0x1B4D,0x1DA6,0x2070,0x23C0,0x27B0,0x2C5E,0x31EE,
+0x388A,0x4066,0x49BC,0x54D5,0x6206,0x71B3,0x8455,0x9A7A,
+/* A:0f B:0f */
+0x10F4,0x1113,0x1139,0x1166,0x119B,0x11DA,0x1226,0x127F,
+0x12E9,0x1367,0x13FE,0x14B0,0x1584,0x1680,0x17AB,0x190F,
+0x1AB6,0x1CAD,0x1F02,0x21C8,0x2514,0x28FF,0x2DA7,0x332F,
+0x39C3,0x4194,0x4ADE,0x55E9,0x6308,0x72A1,0x852A,0x9B32,
+/* A:0f B:10 */
+0x12A7,0x12C7,0x12EC,0x1319,0x134E,0x138D,0x13D7,0x1430,
+0x149A,0x1517,0x15AC,0x165E,0x1730,0x182B,0x1954,0x1AB6,
+0x1C5A,0x1E4E,0x209F,0x2361,0x26A8,0x2A8D,0x2F2D,0x34AD,
+0x3B36,0x42FB,0x4C37,0x5730,0x643B,0x73BB,0x8627,0x9C0C,
+/* A:0f B:11 */
+0x14AD,0x14CC,0x14F2,0x151E,0x1552,0x1591,0x15DB,0x1633,
+0x169C,0x1718,0x17AD,0x185C,0x192E,0x1A26,0x1B4D,0x1CAD,
+0x1E4E,0x203E,0x228B,0x2547,0x2888,0x2C65,0x30FD,0x3673,
+0x3CF0,0x44A6,0x4DD0,0x58B5,0x65A7,0x750A,0x8754,0x9D10,
+/* A:0f B:12 */
+0x1714,0x1734,0x1758,0x1784,0x17B8,0x17F6,0x1840,0x1897,
+0x18FF,0x197A,0x1A0D,0x1ABC,0x1B8B,0x1C81,0x1DA6,0x1F02,
+0x209F,0x228B,0x24D3,0x278A,0x2AC3,0x2E97,0x3325,0x388E,
+0x3EFD,0x46A2,0x4FB7,0x5A83,0x6758,0x7699,0x88B9,0x9E44,
+/* A:0f B:13 */
+0x19F0,0x1A0F,0x1A33,0x1A5E,0x1A92,0x1ACF,0x1B18,0x1B6E,
+0x1BD5,0x1C4F,0x1CE1,0x1D8D,0x1E5A,0x1F4E,0x2070,0x21C8,
+0x2361,0x2547,0x278A,0x2A38,0x2D69,0x3133,0x35B5,0x3B0F,
+0x416C,0x48FD,0x51FA,0x5CA9,0x695B,0x7872,0x8A62,0x9FB2,
+/* A:0f B:14 */
+0x1D55,0x1D73,0x1D97,0x1DC2,0x1DF5,0x1E32,0x1E79,0x1ECF,
+0x1F34,0x1FAD,0x203C,0x20E7,0x21B1,0x22A2,0x23C0,0x2514,
+0x26A8,0x2888,0x2AC3,0x2D69,0x308F,0x344D,0x38C0,0x3E09,
+0x4452,0x4BC9,0x54A9,0x5F36,0x6BBF,0x7AA5,0x8C5A,0xA166,
+/* A:0f B:15 */
+0x215E,0x217C,0x21A0,0x21CA,0x21FC,0x2237,0x227E,0x22D2,
+0x2336,0x23AD,0x243A,0x24E2,0x25A9,0x2696,0x27B0,0x28FF,
+0x2A8D,0x2C65,0x2E97,0x3133,0x344D,0x37FD,0x3C5E,0x4193,
+0x47C3,0x4F1D,0x57DA,0x623E,0x6E96,0x7D42,0x8EB2,0xA36C,
+/* A:0f B:16 */
+0x262A,0x2647,0x266A,0x2694,0x26C5,0x26FF,0x2745,0x2797,
+0x27F9,0x286E,0x28F8,0x299D,0x2A61,0x2B4A,0x2C5E,0x2DA7,
+0x2F2D,0x30FD,0x3325,0x35B5,0x38C0,0x3C5E,0x40AB,0x45C7,
+0x4BDA,0x5312,0x5BA6,0x65D8,0x71F6,0x805D,0x917B,0xA5D3,
+/* A:0f B:17 */
+0x2BDD,0x2BFA,0x2C1C,0x2C45,0x2C75,0x2CAE,0x2CF2,0x2D42,
+0x2DA2,0x2E14,0x2E9C,0x2F3D,0x2FFC,0x30E0,0x31EE,0x332F,
+0x34AD,0x3673,0x388E,0x3B0F,0x3E09,0x4193,0x45C7,0x4AC6,
+0x50B6,0x57C5,0x6028,0x6A20,0x75F9,0x840E,0x94CA,0xA8AE,
+/* A:0f B:18 */
+0x32A4,0x32C0,0x32E1,0x3308,0x3337,0x336F,0x33B1,0x33FF,
+0x345C,0x34CB,0x354F,0x35EC,0x36A6,0x3783,0x388A,0x39C3,
+0x3B36,0x3CF0,0x3EFD,0x416C,0x4452,0x47C3,0x4BDA,0x50B6,
+0x567D,0x5D5B,0x6584,0x6F37,0x7ABE,0x8871,0x98B9,0xAC13,
+/* A:0f B:19 */
+0x3AB1,0x3ACC,0x3AEC,0x3B12,0x3B40,0x3B75,0x3BB5,0x3C01,
+0x3C5B,0x3CC7,0x3D46,0x3DDD,0x3E91,0x3F67,0x4066,0x4194,
+0x42FB,0x44A6,0x46A2,0x48FD,0x4BC9,0x4F1D,0x5312,0x57C5,
+0x5D5B,0x63FE,0x6BE2,0x7543,0x8069,0x8DA8,0x9D66,0xB01C,
+/* A:0f B:1a */
+0x4443,0x445D,0x447C,0x44A0,0x44CC,0x44FF,0x453C,0x4585,
+0x45DC,0x4643,0x46BD,0x474E,0x47FB,0x48C8,0x49BC,0x4ADE,
+0x4C37,0x4DD0,0x4FB7,0x51FA,0x54A9,0x57DA,0x5BA6,0x6028,
+0x6584,0x6BE2,0x7374,0x7C73,0x8725,0x93DA,0xA2F5,0xB4E8,
+/* A:0f B:1b */
+0x4FA3,0x4FBC,0x4FD9,0x4FFB,0x5025,0x5055,0x5090,0x50D5,
+0x5127,0x5189,0x51FD,0x5287,0x532B,0x53EE,0x54D5,0x55E9,
+0x5730,0x58B5,0x5A83,0x5CA9,0x5F36,0x623E,0x65D8,0x6A20,
+0x6F37,0x7543,0x7C73,0x84FF,0x8F26,0x9B37,0xA98F,0xBA9B,
+/* A:0f B:1c */
+0x5D28,0x5D3F,0x5D5A,0x5D7A,0x5DA1,0x5DCF,0x5E05,0x5E46,
+0x5E93,0x5EEF,0x5F5C,0x5FDD,0x6077,0x612D,0x6206,0x6308,
+0x643B,0x65A7,0x6758,0x695B,0x6BBF,0x6E96,0x71F6,0x75F9,
+0x7ABE,0x8069,0x8725,0x8F26,0x98AA,0xA3F8,0xB168,0xC161,
+/* A:0f B:1d */
+0x6D39,0x6D4E,0x6D67,0x6D85,0x6DA8,0x6DD2,0x6E05,0x6E40,
+0x6E87,0x6EDB,0x6F3F,0x6FB6,0x7044,0x70EC,0x71B3,0x72A1,
+0x73BB,0x750A,0x7699,0x7872,0x7AA5,0x7D42,0x805D,0x840E,
+0x8871,0x8DA8,0x93DA,0x9B37,0xA3F8,0xAE5F,0xBABC,0xC96E,
+/* A:0f B:1e */
+0x8051,0x8064,0x807A,0x8095,0x80B5,0x80DB,0x8108,0x813D,
+0x817D,0x81C8,0x8222,0x828D,0x830B,0x83A2,0x8455,0x852A,
+0x8627,0x8754,0x88B9,0x8A62,0x8C5A,0x8EB2,0x917B,0x94CA,
+0x98B9,0x9D66,0xA2F5,0xA98F,0xB168,0xBABC,0xC5D3,0xD300,
+/* A:0f B:1f */
+0x9703,0x9713,0x9726,0x973D,0x9759,0x977A,0x97A0,0x97CF,
+0x9805,0x9847,0x9894,0x98F0,0x995E,0x99E0,0x9A7A,0x9B32,
+0x9C0C,0x9D10,0x9E44,0x9FB2,0xA166,0xA36C,0xA5D3,0xA8AE,
+0xAC13,0xB01C,0xB4E8,0xBA9B,0xC161,0xC96E,0xD300,0xDE5F,
+/* A: 968D89C0 */
+/* A:10 B:00 */
+0x0A5B,0x0A7B,0x0AA2,0x0ACF,0x0B06,0x0B47,0x0B94,0x0BEF,
+0x0C5C,0x0CDD,0x0D77,0x0E2E,0x0F07,0x1008,0x113B,0x12A7,
+0x1458,0x165B,0x18BF,0x1B95,0x1EF5,0x22F8,0x27BD,0x2D67,
+0x3423,0x3C23,0x45A6,0x50F4,0x5E64,0x6E5B,0x8156,0x97E4,
+/* A:10 B:01 */
+0x0A7B,0x0A9B,0x0AC2,0x0AF0,0x0B26,0x0B67,0x0BB4,0x0C10,
+0x0C7C,0x0CFD,0x0D97,0x0E4E,0x0F26,0x1028,0x115B,0x12C7,
+0x1478,0x167A,0x18DD,0x1BB4,0x1F13,0x2316,0x27DA,0x2D83,
+0x343E,0x3C3E,0x45C0,0x510D,0x5E7A,0x6E70,0x8168,0x97F4,
+/* A:10 B:02 */
+0x0AA2,0x0AC2,0x0AE9,0x0B16,0x0B4D,0x0B8E,0x0BDB,0x0C36,
+0x0CA3,0x0D24,0x0DBD,0x0E74,0x0F4C,0x104E,0x1180,0x12EC,
+0x149D,0x169F,0x1902,0x1BD8,0x1F37,0x2339,0x27FC,0x2DA5,
+0x345F,0x3C5E,0x45DE,0x512A,0x5E96,0x6E89,0x817F,0x9807,
+/* A:10 B:03 */
+0x0ACF,0x0AF0,0x0B16,0x0B44,0x0B7B,0x0BBB,0x0C08,0x0C64,
+0x0CD0,0x0D51,0x0DEB,0x0EA1,0x0F7A,0x107B,0x11AD,0x1319,
+0x14C9,0x16CB,0x192E,0x1C03,0x1F62,0x2363,0x2825,0x2DCD,
+0x3486,0x3C84,0x4603,0x514C,0x5EB6,0x6EA7,0x8199,0x981E,
+/* A:10 B:04 */
+0x0B06,0x0B26,0x0B4D,0x0B7B,0x0BB1,0x0BF2,0x0C3E,0x0C9A,
+0x0D06,0x0D87,0x0E20,0x0ED7,0x0FAF,0x10B0,0x11E2,0x134E,
+0x14FE,0x16FF,0x1961,0x1C36,0x1F94,0x2395,0x2856,0x2DFD,
+0x34B5,0x3CB1,0x462E,0x5175,0x5EDC,0x6ECA,0x81B9,0x983A,
+/* A:10 B:05 */
+0x0B47,0x0B67,0x0B8E,0x0BBB,0x0BF2,0x0C32,0x0C7F,0x0CDA,
+0x0D47,0x0DC7,0x0E61,0x0F17,0x0FEF,0x10F0,0x1221,0x138D,
+0x153C,0x173D,0x199F,0x1C73,0x1FD0,0x23D0,0x2890,0x2E36,
+0x34EC,0x3CE6,0x4661,0x51A6,0x5F0A,0x6EF4,0x81DF,0x985A,
+/* A:10 B:06 */
+0x0B94,0x0BB4,0x0BDB,0x0C08,0x0C3E,0x0C7F,0x0CCC,0x0D27,
+0x0D93,0x0E14,0x0EAD,0x0F63,0x103B,0x113B,0x126D,0x13D7,
+0x1586,0x1787,0x19E8,0x1CBC,0x2018,0x2416,0x28D5,0x2E79,
+0x352E,0x3D26,0x469E,0x51DF,0x5F40,0x6F26,0x820B,0x9881,
+/* A:10 B:07 */
+0x0BEF,0x0C10,0x0C36,0x0C64,0x0C9A,0x0CDA,0x0D27,0x0D82,
+0x0DEE,0x0E6E,0x0F07,0x0FBD,0x1095,0x1195,0x12C6,0x1430,
+0x15DF,0x17DF,0x1A3F,0x1D12,0x206D,0x246A,0x2927,0x2ECA,
+0x357C,0x3D71,0x46E6,0x5224,0x5F80,0x6F61,0x8241,0x98AE,
+/* A:10 B:08 */
+0x0C5C,0x0C7C,0x0CA3,0x0CD0,0x0D06,0x0D47,0x0D93,0x0DEE,
+0x0E5A,0x0EDA,0x0F73,0x1028,0x1100,0x1200,0x1330,0x149A,
+0x1648,0x1847,0x1AA6,0x1D78,0x20D2,0x24CD,0x2989,0x2F29,
+0x35D9,0x3DCB,0x473C,0x5276,0x5FCD,0x6FA8,0x8280,0x98E5,
+/* A:10 B:09 */
+0x0CDD,0x0CFD,0x0D24,0x0D51,0x0D87,0x0DC7,0x0E14,0x0E6E,
+0x0EDA,0x0F5A,0x0FF3,0x10A8,0x117F,0x127E,0x13AE,0x1517,
+0x16C4,0x18C2,0x1B21,0x1DF1,0x2149,0x2543,0x29FD,0x2F9A,
+0x3647,0x3E35,0x47A3,0x52D7,0x6028,0x6FFB,0x82CB,0x9926,
+/* A:10 B:0a */
+0x0D77,0x0D97,0x0DBD,0x0DEB,0x0E20,0x0E61,0x0EAD,0x0F07,
+0x0F73,0x0FF3,0x108B,0x113F,0x1216,0x1315,0x1444,0x15AC,
+0x1759,0x1956,0x1BB3,0x1E81,0x21D8,0x25CF,0x2A86,0x3021,
+0x36CA,0x3EB4,0x481C,0x534A,0x6094,0x705F,0x8324,0x9973,
+/* A:10 B:0b */
+0x0E2E,0x0E4E,0x0E74,0x0EA1,0x0ED7,0x0F17,0x0F63,0x0FBD,
+0x1028,0x10A8,0x113F,0x11F3,0x12C9,0x13C8,0x14F6,0x165E,
+0x1809,0x1A04,0x1C60,0x1F2D,0x2281,0x2676,0x2B2A,0x30C1,
+0x3765,0x3F4B,0x48AD,0x53D3,0x6114,0x70D5,0x838E,0x99CE,
+/* A:10 B:0c */
+0x0F07,0x0F26,0x0F4C,0x0F7A,0x0FAF,0x0FEF,0x103B,0x1095,
+0x1100,0x117F,0x1216,0x12C9,0x139F,0x149C,0x15CA,0x1730,
+0x18DA,0x1AD4,0x1D2E,0x1FF9,0x234A,0x273C,0x2BED,0x317F,
+0x381E,0x3FFD,0x4958,0x5476,0x61AD,0x7162,0x840C,0x9A3B,
+/* A:10 B:0d */
+0x1008,0x1028,0x104E,0x107B,0x10B0,0x10F0,0x113B,0x1195,
+0x1200,0x127E,0x1315,0x13C8,0x149C,0x1599,0x16C6,0x182B,
+0x19D3,0x1BCB,0x1E23,0x20EB,0x243A,0x2828,0x2CD4,0x3261,
+0x38FA,0x40D2,0x4A24,0x5538,0x6263,0x7209,0x84A2,0x9ABC,
+/* A:10 B:0e */
+0x113B,0x115B,0x1180,0x11AD,0x11E2,0x1221,0x126D,0x12C6,
+0x1330,0x13AE,0x1444,0x14F6,0x15CA,0x16C6,0x17F1,0x1954,
+0x1AFB,0x1CF1,0x1F46,0x220B,0x2556,0x2940,0x2DE7,0x336E,
+0x3A00,0x41CF,0x4B17,0x561E,0x633A,0x72CF,0x8554,0x9B56,
+/* A:10 B:0f */
+0x12A7,0x12C7,0x12EC,0x1319,0x134E,0x138D,0x13D7,0x1430,
+0x149A,0x1517,0x15AC,0x165E,0x1730,0x182B,0x1954,0x1AB6,
+0x1C5A,0x1E4E,0x209F,0x2361,0x26A8,0x2A8D,0x2F2D,0x34AD,
+0x3B36,0x42FB,0x4C37,0x5730,0x643B,0x73BB,0x8627,0x9C0C,
+/* A:10 B:10 */
+0x1458,0x1478,0x149D,0x14C9,0x14FE,0x153C,0x1586,0x15DF,
+0x1648,0x16C4,0x1759,0x1809,0x18DA,0x19D3,0x1AFB,0x1C5A,
+0x1DFC,0x1FEC,0x223B,0x24F8,0x2839,0x2C18,0x30B1,0x3629,
+0x3CA8,0x4460,0x4D8D,0x5875,0x656C,0x74D3,0x8722,0x9CE5,
+/* A:10 B:11 */
+0x165B,0x167A,0x169F,0x16CB,0x16FF,0x173D,0x1787,0x17DF,
+0x1847,0x18C2,0x1956,0x1A04,0x1AD4,0x1BCB,0x1CF1,0x1E4E,
+0x1FEC,0x21D9,0x2423,0x26DB,0x2A17,0x2DEE,0x327F,0x37EC,
+0x3E5E,0x4608,0x4F24,0x59F8,0x66D6,0x7620,0x884D,0x9DE7,
+/* A:10 B:12 */
+0x18BF,0x18DD,0x1902,0x192E,0x1961,0x199F,0x19E8,0x1A3F,
+0x1AA6,0x1B21,0x1BB3,0x1C60,0x1D2E,0x1E23,0x1F46,0x209F,
+0x223B,0x2423,0x2668,0x291A,0x2C4E,0x301C,0x34A3,0x3A04,
+0x4068,0x4801,0x5108,0x5BC3,0x6884,0x77AC,0x89B0,0x9F19,
+/* A:10 B:13 */
+0x1B95,0x1BB4,0x1BD8,0x1C03,0x1C36,0x1C73,0x1CBC,0x1D12,
+0x1D78,0x1DF1,0x1E81,0x1F2D,0x1FF9,0x20EB,0x220B,0x2361,
+0x24F8,0x26DB,0x291A,0x2BC4,0x2EF0,0x32B4,0x372E,0x3C81,
+0x42D4,0x4A58,0x5347,0x5DE5,0x6A84,0x7983,0x8B56,0xA085,
+/* A:10 B:14 */
+0x1EF5,0x1F13,0x1F37,0x1F62,0x1F94,0x1FD0,0x2018,0x206D,
+0x20D2,0x2149,0x21D8,0x2281,0x234A,0x243A,0x2556,0x26A8,
+0x2839,0x2A17,0x2C4E,0x2EF0,0x3211,0x35C9,0x3A35,0x3F76,
+0x45B4,0x4D20,0x55F2,0x606E,0x6CE4,0x7BB2,0x8D4C,0xA236,
+/* A:10 B:15 */
+0x22F8,0x2316,0x2339,0x2363,0x2395,0x23D0,0x2416,0x246A,
+0x24CD,0x2543,0x25CF,0x2676,0x273C,0x2828,0x2940,0x2A8D,
+0x2C18,0x2DEE,0x301C,0x32B4,0x35C9,0x3973,0x3DCD,0x42FA,
+0x4920,0x506F,0x591F,0x6371,0x6FB6,0x7E4B,0x8FA0,0xA439,
+/* A:10 B:16 */
+0x27BD,0x27DA,0x27FC,0x2825,0x2856,0x2890,0x28D5,0x2927,
+0x2989,0x29FD,0x2A86,0x2B2A,0x2BED,0x2CD4,0x2DE7,0x2F2D,
+0x30B1,0x327F,0x34A3,0x372E,0x3A35,0x3DCD,0x4213,0x4727,
+0x4D31,0x545D,0x5CE4,0x6706,0x7311,0x8161,0x9264,0xA69C,
+/* A:10 B:17 */
+0x2D67,0x2D83,0x2DA5,0x2DCD,0x2DFD,0x2E36,0x2E79,0x2ECA,
+0x2F29,0x2F9A,0x3021,0x30C1,0x317F,0x3261,0x336E,0x34AD,
+0x3629,0x37EC,0x3A04,0x3C81,0x3F76,0x42FA,0x4727,0x4C1F,
+0x5205,0x5909,0x615F,0x6B47,0x770E,0x850C,0x95AE,0xA973,
+/* A:10 B:18 */
+0x3423,0x343E,0x345F,0x3486,0x34B5,0x34EC,0x352E,0x357C,
+0x35D9,0x3647,0x36CA,0x3765,0x381E,0x38FA,0x3A00,0x3B36,
+0x3CA8,0x3E5E,0x4068,0x42D4,0x45B4,0x4920,0x4D31,0x5205,
+0x57C3,0x5E96,0x66B2,0x7056,0x7BCB,0x8968,0x9997,0xACD2,
+/* A:10 B:19 */
+0x3C23,0x3C3E,0x3C5E,0x3C84,0x3CB1,0x3CE6,0x3D26,0x3D71,
+0x3DCB,0x3E35,0x3EB4,0x3F4B,0x3FFD,0x40D2,0x41CF,0x42FB,
+0x4460,0x4608,0x4801,0x4A58,0x4D20,0x506F,0x545D,0x5909,
+0x5E96,0x652F,0x6D07,0x7659,0x816C,0x8E97,0x9E3C,0xB0D5,
+/* A:10 B:1a */
+0x45A6,0x45C0,0x45DE,0x4603,0x462E,0x4661,0x469E,0x46E6,
+0x473C,0x47A3,0x481C,0x48AD,0x4958,0x4A24,0x4B17,0x4C37,
+0x4D8D,0x4F24,0x5108,0x5347,0x55F2,0x591F,0x5CE4,0x615F,
+0x66B2,0x6D07,0x748D,0x7D7E,0x881E,0x94BF,0xA3C2,0xB599,
+/* A:10 B:1b */
+0x50F4,0x510D,0x512A,0x514C,0x5175,0x51A6,0x51DF,0x5224,
+0x5276,0x52D7,0x534A,0x53D3,0x5476,0x5538,0x561E,0x5730,
+0x5875,0x59F8,0x5BC3,0x5DE5,0x606E,0x6371,0x6706,0x6B47,
+0x7056,0x7659,0x7D7E,0x85FB,0x9012,0x9C11,0xAA52,0xBB42,
+/* A:10 B:1c */
+0x5E64,0x5E7A,0x5E96,0x5EB6,0x5EDC,0x5F0A,0x5F40,0x5F80,
+0x5FCD,0x6028,0x6094,0x6114,0x61AD,0x6263,0x633A,0x643B,
+0x656C,0x66D6,0x6884,0x6A84,0x6CE4,0x6FB6,0x7311,0x770E,
+0x7BCB,0x816C,0x881E,0x9012,0x9987,0xA4C3,0xB21E,0xC1FE,
+/* A:10 B:1d */
+0x6E5B,0x6E70,0x6E89,0x6EA7,0x6ECA,0x6EF4,0x6F26,0x6F61,
+0x6FA8,0x6FFB,0x705F,0x70D5,0x7162,0x7209,0x72CF,0x73BB,
+0x74D3,0x7620,0x77AC,0x7983,0x7BB2,0x7E4B,0x8161,0x850C,
+0x8968,0x8E97,0x94BF,0x9C11,0xA4C3,0xAF1A,0xBB63,0xC9FE,
+/* A:10 B:1e */
+0x8156,0x8168,0x817F,0x8199,0x81B9,0x81DF,0x820B,0x8241,
+0x8280,0x82CB,0x8324,0x838E,0x840C,0x84A2,0x8554,0x8627,
+0x8722,0x884D,0x89B0,0x8B56,0x8D4C,0x8FA0,0x9264,0x95AE,
+0x9997,0x9E3C,0xA3C2,0xAA52,0xB21E,0xBB63,0xC668,0xD37F,
+/* A:10 B:1f */
+0x97E4,0x97F4,0x9807,0x981E,0x983A,0x985A,0x9881,0x98AE,
+0x98E5,0x9926,0x9973,0x99CE,0x9A3B,0x9ABC,0x9B56,0x9C0C,
+0x9CE5,0x9DE7,0x9F19,0xA085,0xA236,0xA439,0xA69C,0xA973,
+0xACD2,0xB0D5,0xB599,0xBB42,0xC1FE,0xC9FE,0xD37F,0xDECC,
+/* A: 968D89C0 */
+/* A:11 B:00 */
+0x0C70,0x0C90,0x0CB6,0x0CE4,0x0D1A,0x0D5A,0x0DA7,0x0E02,
+0x0E6E,0x0EEE,0x0F86,0x103C,0x1113,0x1213,0x1343,0x14AD,
+0x165B,0x185A,0x1AB9,0x1D8A,0x20E4,0x24DF,0x299B,0x2F3A,
+0x35EA,0x3DDB,0x474C,0x5285,0x5FDB,0x6FB5,0x828B,0x98EF,
+/* A:11 B:01 */
+0x0C90,0x0CB0,0x0CD7,0x0D04,0x0D3A,0x0D7B,0x0DC7,0x0E22,
+0x0E8E,0x0F0E,0x0FA6,0x105C,0x1133,0x1233,0x1363,0x14CC,
+0x167A,0x1879,0x1AD7,0x1DA9,0x2102,0x24FD,0x29B8,0x2F57,
+0x3605,0x3DF6,0x4766,0x529D,0x5FF2,0x6FCA,0x829E,0x98FF,
+/* A:11 B:02 */
+0x0CB6,0x0CD7,0x0CFD,0x0D2A,0x0D60,0x0DA1,0x0DED,0x0E48,
+0x0EB4,0x0F34,0x0FCC,0x1081,0x1159,0x1258,0x1388,0x14F2,
+0x169F,0x189D,0x1AFC,0x1DCD,0x2125,0x2520,0x29DA,0x2F78,
+0x3626,0x3E15,0x4784,0x52BA,0x600D,0x6FE2,0x82B4,0x9912,
+/* A:11 B:03 */
+0x0CE4,0x0D04,0x0D2A,0x0D58,0x0D8E,0x0DCE,0x0E1A,0x0E75,
+0x0EE1,0x0F61,0x0FF9,0x10AE,0x1185,0x1285,0x13B5,0x151E,
+0x16CB,0x18C9,0x1B27,0x1DF7,0x2150,0x2549,0x2A03,0x2FA0,
+0x364D,0x3E3B,0x47A8,0x52DC,0x602D,0x7000,0x82CF,0x9929,
+/* A:11 B:04 */
+0x0D1A,0x0D3A,0x0D60,0x0D8E,0x0DC4,0x0E04,0x0E50,0x0EAB,
+0x0F17,0x0F97,0x102F,0x10E4,0x11BB,0x12BA,0x13EA,0x1552,
+0x16FF,0x18FD,0x1B5A,0x1E2A,0x2182,0x257B,0x2A33,0x2FD0,
+0x367B,0x3E68,0x47D3,0x5305,0x6053,0x7023,0x82EE,0x9944,
+/* A:11 B:05 */
+0x0D5A,0x0D7B,0x0DA1,0x0DCE,0x0E04,0x0E44,0x0E90,0x0EEB,
+0x0F56,0x0FD6,0x106E,0x1123,0x11FA,0x12F9,0x1428,0x1591,
+0x173D,0x193A,0x1B97,0x1E67,0x21BE,0x25B5,0x2A6D,0x3008,
+0x36B2,0x3E9D,0x4806,0x5335,0x6080,0x704D,0x8314,0x9965,
+/* A:11 B:06 */
+0x0DA7,0x0DC7,0x0DED,0x0E1A,0x0E50,0x0E90,0x0EDC,0x0F37,
+0x0FA2,0x1022,0x10BA,0x116E,0x1245,0x1344,0x1473,0x15DB,
+0x1787,0x1984,0x1BE0,0x1EAE,0x2204,0x25FB,0x2AB1,0x304B,
+0x36F3,0x3EDC,0x4842,0x536E,0x60B6,0x707E,0x8340,0x998B,
+/* A:11 B:07 */
+0x0E02,0x0E22,0x0E48,0x0E75,0x0EAB,0x0EEB,0x0F37,0x0F91,
+0x0FFD,0x107C,0x1114,0x11C8,0x129E,0x139D,0x14CB,0x1633,
+0x17DF,0x19DB,0x1C36,0x1F04,0x2259,0x264E,0x2B03,0x309B,
+0x3740,0x3F26,0x488A,0x53B3,0x60F6,0x70B9,0x8375,0x99B8,
+/* A:11 B:08 */
+0x0E6E,0x0E8E,0x0EB4,0x0EE1,0x0F17,0x0F56,0x0FA2,0x0FFD,
+0x1068,0x10E7,0x117F,0x1233,0x1308,0x1407,0x1535,0x169C,
+0x1847,0x1A42,0x1C9D,0x1F69,0x22BD,0x26B1,0x2B64,0x30F9,
+0x379C,0x3F7F,0x48DF,0x5404,0x6142,0x70FF,0x83B3,0x99EE,
+/* A:11 B:09 */
+0x0EEE,0x0F0E,0x0F34,0x0F61,0x0F97,0x0FD6,0x1022,0x107C,
+0x10E7,0x1166,0x11FE,0x12B1,0x1387,0x1484,0x15B2,0x1718,
+0x18C2,0x1ABD,0x1D17,0x1FE2,0x2334,0x2726,0x2BD7,0x316A,
+0x380A,0x3FE9,0x4945,0x5464,0x619C,0x7152,0x83FE,0x9A2F,
+/* A:11 B:0a */
+0x0F86,0x0FA6,0x0FCC,0x0FF9,0x102F,0x106E,0x10BA,0x1114,
+0x117F,0x11FE,0x1294,0x1348,0x141D,0x151A,0x1647,0x17AD,
+0x1956,0x1B4F,0x1DA7,0x2071,0x23C1,0x27B1,0x2C5F,0x31EF,
+0x388C,0x4067,0x49BE,0x54D7,0x6207,0x71B5,0x8456,0x9A7B,
+/* A:11 B:0b */
+0x103C,0x105C,0x1081,0x10AE,0x10E4,0x1123,0x116E,0x11C8,
+0x1233,0x12B1,0x1348,0x13FA,0x14CF,0x15CC,0x16F8,0x185C,
+0x1A04,0x1BFC,0x1E53,0x211B,0x2469,0x2857,0x2D02,0x328E,
+0x3926,0x40FC,0x4A4D,0x555F,0x6287,0x722A,0x84C0,0x9AD6,
+/* A:11 B:0c */
+0x1113,0x1133,0x1159,0x1185,0x11BB,0x11FA,0x1245,0x129E,
+0x1308,0x1387,0x141D,0x14CF,0x15A3,0x169F,0x17CA,0x192E,
+0x1AD4,0x1CCB,0x1F20,0x21E6,0x2531,0x291B,0x2DC3,0x334B,
+0x39DE,0x41AE,0x4AF7,0x5601,0x631E,0x72B5,0x853D,0x9B42,
+/* A:11 B:0d */
+0x1213,0x1233,0x1258,0x1285,0x12BA,0x12F9,0x1344,0x139D,
+0x1407,0x1484,0x151A,0x15CC,0x169F,0x179A,0x18C4,0x1A26,
+0x1BCB,0x1DC0,0x2013,0x22D6,0x261E,0x2A05,0x2EA8,0x342B,
+0x3AB8,0x4281,0x4BC2,0x56C1,0x63D3,0x735B,0x85D1,0x9BC2,
+/* A:11 B:0e */
+0x1343,0x1363,0x1388,0x13B5,0x13EA,0x1428,0x1473,0x14CB,
+0x1535,0x15B2,0x1647,0x16F8,0x17CA,0x18C4,0x19ED,0x1B4D,
+0x1CF1,0x1EE3,0x2134,0x23F4,0x2739,0x2B1B,0x2FB9,0x3536,
+0x3BBC,0x437C,0x4CB2,0x57A5,0x64A9,0x7420,0x8682,0x9C5A,
+/* A:11 B:0f */
+0x14AD,0x14CC,0x14F2,0x151E,0x1552,0x1591,0x15DB,0x1633,
+0x169C,0x1718,0x17AD,0x185C,0x192E,0x1A26,0x1B4D,0x1CAD,
+0x1E4E,0x203E,0x228B,0x2547,0x2888,0x2C65,0x30FD,0x3673,
+0x3CF0,0x44A6,0x4DD0,0x58B5,0x65A7,0x750A,0x8754,0x9D10,
+/* A:11 B:10 */
+0x165B,0x167A,0x169F,0x16CB,0x16FF,0x173D,0x1787,0x17DF,
+0x1847,0x18C2,0x1956,0x1A04,0x1AD4,0x1BCB,0x1CF1,0x1E4E,
+0x1FEC,0x21D9,0x2423,0x26DB,0x2A17,0x2DEE,0x327F,0x37EC,
+0x3E5E,0x4608,0x4F24,0x59F8,0x66D6,0x7620,0x884D,0x9DE7,
+/* A:11 B:11 */
+0x185A,0x1879,0x189D,0x18C9,0x18FD,0x193A,0x1984,0x19DB,
+0x1A42,0x1ABD,0x1B4F,0x1BFC,0x1CCB,0x1DC0,0x1EE3,0x203E,
+0x21D9,0x23C3,0x2608,0x28BB,0x2BF0,0x2FC0,0x3449,0x39AB,
+0x4012,0x47AE,0x50B8,0x5B77,0x683D,0x776B,0x8976,0x9EE7,
+/* A:11 B:12 */
+0x1AB9,0x1AD7,0x1AFC,0x1B27,0x1B5A,0x1B97,0x1BE0,0x1C36,
+0x1C9D,0x1D17,0x1DA7,0x1E53,0x1F20,0x2013,0x2134,0x228B,
+0x2423,0x2608,0x2848,0x2AF5,0x2E23,0x31EB,0x3669,0x3BBF,
+0x4218,0x49A2,0x5299,0x5D3F,0x69E8,0x78F4,0x8AD6,0xA017,
+/* A:11 B:13 */
+0x1D8A,0x1DA9,0x1DCD,0x1DF7,0x1E2A,0x1E67,0x1EAE,0x1F04,
+0x1F69,0x1FE2,0x2071,0x211B,0x21E6,0x22D6,0x23F4,0x2547,
+0x26DB,0x28BB,0x2AF5,0x2D9B,0x30C0,0x347E,0x38F0,0x3E38,
+0x447F,0x4BF5,0x54D3,0x5F5D,0x6BE4,0x7AC7,0x8C79,0xA180,
+/* A:11 B:14 */
+0x20E4,0x2102,0x2125,0x2150,0x2182,0x21BE,0x2204,0x2259,
+0x22BD,0x2334,0x23C1,0x2469,0x2531,0x261E,0x2739,0x2888,
+0x2A17,0x2BF0,0x2E23,0x30C0,0x33DC,0x378D,0x3BF0,0x4127,
+0x475A,0x4EB8,0x577A,0x61E1,0x6E40,0x7CF2,0x8E6B,0xA32E,
+/* A:11 B:15 */
+0x24DF,0x24FD,0x2520,0x2549,0x257B,0x25B5,0x25FB,0x264E,
+0x26B1,0x2726,0x27B1,0x2857,0x291B,0x2A05,0x2B1B,0x2C65,
+0x2DEE,0x2FC0,0x31EB,0x347E,0x378D,0x3B30,0x3F82,0x44A5,
+0x4ABF,0x5200,0x5AA0,0x64DF,0x710D,0x7F86,0x90BA,0xA52C,
+/* A:11 B:16 */
+0x299B,0x29B8,0x29DA,0x2A03,0x2A33,0x2A6D,0x2AB1,0x2B03,
+0x2B64,0x2BD7,0x2C5F,0x2D02,0x2DC3,0x2EA8,0x2FB9,0x30FD,
+0x327F,0x3449,0x3669,0x38F0,0x3BF0,0x3F82,0x43C0,0x48CA,
+0x4EC8,0x55E7,0x5E5E,0x686D,0x7461,0x8296,0x9379,0xA78B,
+/* A:11 B:17 */
+0x2F3A,0x2F57,0x2F78,0x2FA0,0x2FD0,0x3008,0x304B,0x309B,
+0x30F9,0x316A,0x31EF,0x328E,0x334B,0x342B,0x3536,0x3673,
+0x37EC,0x39AB,0x3BBF,0x3E38,0x4127,0x44A5,0x48CA,0x4DB8,
+0x5394,0x5A8A,0x62D0,0x6CA6,0x7856,0x863A,0x96BD,0xAA5C,
+/* A:11 B:18 */
+0x35EA,0x3605,0x3626,0x364D,0x367B,0x36B2,0x36F3,0x3740,
+0x379C,0x380A,0x388C,0x3926,0x39DE,0x3AB8,0x3BBC,0x3CF0,
+0x3E5E,0x4012,0x4218,0x447F,0x475A,0x4ABF,0x4EC8,0x5394,
+0x5947,0x600D,0x681A,0x71AB,0x7D0A,0x8A8E,0x9A9E,0xADB5,
+/* A:11 B:19 */
+0x3DDB,0x3DF6,0x3E15,0x3E3B,0x3E68,0x3E9D,0x3EDC,0x3F26,
+0x3F7F,0x3FE9,0x4067,0x40FC,0x41AE,0x4281,0x437C,0x44A6,
+0x4608,0x47AE,0x49A2,0x4BF5,0x4EB8,0x5200,0x55E7,0x5A8A,
+0x600D,0x6699,0x6E62,0x77A2,0x82A1,0x8FB3,0x9F3A,0xB1B0,
+/* A:11 B:1a */
+0x474C,0x4766,0x4784,0x47A8,0x47D3,0x4806,0x4842,0x488A,
+0x48DF,0x4945,0x49BE,0x4A4D,0x4AF7,0x4BC2,0x4CB2,0x4DD0,
+0x4F24,0x50B8,0x5299,0x54D3,0x577A,0x5AA0,0x5E5E,0x62D0,
+0x681A,0x6E62,0x75DA,0x7EBA,0x8946,0x95CF,0xA4B5,0xB66A,
+/* A:11 B:1b */
+0x5285,0x529D,0x52BA,0x52DC,0x5305,0x5335,0x536E,0x53B3,
+0x5404,0x5464,0x54D7,0x555F,0x5601,0x56C1,0x57A5,0x58B5,
+0x59F8,0x5B77,0x5D3F,0x5F5D,0x61E1,0x64DF,0x686D,0x6CA6,
+0x71AB,0x77A2,0x7EBA,0x8727,0x912B,0x9D13,0xAB39,0xBC09,
+/* A:11 B:1c */
+0x5FDB,0x5FF2,0x600D,0x602D,0x6053,0x6080,0x60B6,0x60F6,
+0x6142,0x619C,0x6207,0x6287,0x631E,0x63D3,0x64A9,0x65A7,
+0x66D6,0x683D,0x69E8,0x6BE4,0x6E40,0x710D,0x7461,0x7856,
+0x7D0A,0x82A1,0x8946,0x912B,0x9A8E,0xA5B5,0xB2F6,0xC2B7,
+/* A:11 B:1d */
+0x6FB5,0x6FCA,0x6FE2,0x7000,0x7023,0x704D,0x707E,0x70B9,
+0x70FF,0x7152,0x71B5,0x722A,0x72B5,0x735B,0x7420,0x750A,
+0x7620,0x776B,0x78F4,0x7AC7,0x7CF2,0x7F86,0x8296,0x863A,
+0x8A8E,0x8FB3,0x95CF,0x9D13,0xA5B5,0xAFF8,0xBC29,0xCAA8,
+/* A:11 B:1e */
+0x828B,0x829E,0x82B4,0x82CF,0x82EE,0x8314,0x8340,0x8375,
+0x83B3,0x83FE,0x8456,0x84C0,0x853D,0x85D1,0x8682,0x8754,
+0x884D,0x8976,0x8AD6,0x8C79,0x8E6B,0x90BA,0x9379,0x96BD,
+0x9A9E,0x9F3A,0xA4B5,0xAB39,0xB2F6,0xBC29,0xC719,0xD417,
+/* A:11 B:1f */
+0x98EF,0x98FF,0x9912,0x9929,0x9944,0x9965,0x998B,0x99B8,
+0x99EE,0x9A2F,0x9A7B,0x9AD6,0x9B42,0x9BC2,0x9C5A,0x9D10,
+0x9DE7,0x9EE7,0xA017,0xA180,0xA32E,0xA52C,0xA78B,0xAA5C,
+0xADB5,0xB1B0,0xB66A,0xBC09,0xC2B7,0xCAA8,0xD417,0xDF4E,
+/* A: 968D89C0 */
+/* A:12 B:00 */
+0x0EEA,0x0F0A,0x0F30,0x0F5D,0x0F93,0x0FD2,0x101E,0x1078,
+0x10E3,0x1162,0x11F9,0x12AD,0x1383,0x1480,0x15AE,0x1714,
+0x18BF,0x1AB9,0x1D13,0x1FDE,0x2330,0x2722,0x2BD3,0x3166,
+0x3806,0x3FE6,0x4942,0x5461,0x6199,0x7150,0x83FC,0x9A2D,
+/* A:12 B:01 */
+0x0F0A,0x0F2A,0x0F50,0x0F7D,0x0FB2,0x0FF2,0x103E,0x1098,
+0x1103,0x1182,0x1219,0x12CD,0x13A2,0x14A0,0x15CD,0x1734,
+0x18DD,0x1AD7,0x1D31,0x1FFC,0x234E,0x273F,0x2BF0,0x3182,
+0x3821,0x4000,0x495B,0x5479,0x61B0,0x7164,0x840E,0x9A3D,
+/* A:12 B:02 */
+0x0F30,0x0F50,0x0F76,0x0FA3,0x0FD8,0x1018,0x1064,0x10BE,
+0x1129,0x11A8,0x123F,0x12F2,0x13C7,0x14C5,0x15F2,0x1758,
+0x1902,0x1AFC,0x1D55,0x2020,0x2371,0x2762,0x2C12,0x31A3,
+0x3842,0x4020,0x4979,0x5496,0x61CB,0x717D,0x8424,0x9A50,
+/* A:12 B:03 */
+0x0F5D,0x0F7D,0x0FA3,0x0FD0,0x1005,0x1045,0x1091,0x10EA,
+0x1155,0x11D4,0x126B,0x131F,0x13F4,0x14F1,0x161E,0x1784,
+0x192E,0x1B27,0x1D80,0x204A,0x239B,0x278B,0x2C3A,0x31CB,
+0x3868,0x4045,0x499D,0x54B8,0x61EA,0x719A,0x843F,0x9A67,
+/* A:12 B:04 */
+0x0F93,0x0FB2,0x0FD8,0x1005,0x103B,0x107A,0x10C6,0x1120,
+0x118B,0x1209,0x12A0,0x1354,0x1429,0x1526,0x1653,0x17B8,
+0x1961,0x1B5A,0x1DB3,0x207C,0x23CC,0x27BC,0x2C6A,0x31FA,
+0x3896,0x4071,0x49C7,0x54E0,0x6210,0x71BD,0x845E,0x9A82,
+/* A:12 B:05 */
+0x0FD2,0x0FF2,0x1018,0x1045,0x107A,0x10BA,0x1105,0x115F,
+0x11CA,0x1249,0x12DF,0x1392,0x1467,0x1564,0x1691,0x17F6,
+0x199F,0x1B97,0x1DEF,0x20B8,0x2408,0x27F7,0x2CA3,0x3232,
+0x38CC,0x40A6,0x49FA,0x5510,0x623D,0x71E6,0x8483,0x9AA2,
+/* A:12 B:06 */
+0x101E,0x103E,0x1064,0x1091,0x10C6,0x1105,0x1151,0x11AB,
+0x1215,0x1294,0x132A,0x13DD,0x14B2,0x15AE,0x16DB,0x1840,
+0x19E8,0x1BE0,0x1E37,0x20FF,0x244E,0x283C,0x2CE7,0x3274,
+0x390D,0x40E4,0x4A36,0x5549,0x6272,0x7217,0x84AF,0x9AC7,
+/* A:12 B:07 */
+0x1078,0x1098,0x10BE,0x10EA,0x1120,0x115F,0x11AB,0x1204,
+0x126F,0x12ED,0x1383,0x1436,0x150A,0x1607,0x1733,0x1897,
+0x1A3F,0x1C36,0x1E8D,0x2154,0x24A1,0x288E,0x2D38,0x32C3,
+0x395A,0x412E,0x4A7D,0x558C,0x62B2,0x7251,0x84E3,0x9AF5,
+/* A:12 B:08 */
+0x10E3,0x1103,0x1129,0x1155,0x118B,0x11CA,0x1215,0x126F,
+0x12D9,0x1357,0x13ED,0x14A0,0x1574,0x1670,0x179B,0x18FF,
+0x1AA6,0x1C9D,0x1EF2,0x21B8,0x2505,0x28F0,0x2D98,0x3321,
+0x39B5,0x4187,0x4AD1,0x55DD,0x62FD,0x7297,0x8521,0x9B2A,
+/* A:12 B:09 */
+0x1162,0x1182,0x11A8,0x11D4,0x1209,0x1249,0x1294,0x12ED,
+0x1357,0x13D5,0x146B,0x151D,0x15F1,0x16EC,0x1817,0x197A,
+0x1B21,0x1D17,0x1F6B,0x2230,0x257A,0x2964,0x2E0A,0x3390,
+0x3A21,0x41EF,0x4B36,0x563C,0x6356,0x72E9,0x856B,0x9B6A,
+/* A:12 B:0a */
+0x11F9,0x1219,0x123F,0x126B,0x12A0,0x12DF,0x132A,0x1383,
+0x13ED,0x146B,0x1500,0x15B2,0x1685,0x1780,0x18AB,0x1A0D,
+0x1BB3,0x1DA7,0x1FFB,0x22BE,0x2607,0x29EE,0x2E91,0x3415,
+0x3AA2,0x426C,0x4BAE,0x56AE,0x63C1,0x734B,0x85C2,0x9BB5,
+/* A:12 B:0b */
+0x12AD,0x12CD,0x12F2,0x131F,0x1354,0x1392,0x13DD,0x1436,
+0x14A0,0x151D,0x15B2,0x1663,0x1736,0x1830,0x195A,0x1ABC,
+0x1C60,0x1E53,0x20A5,0x2367,0x26AD,0x2A92,0x2F32,0x34B2,
+0x3B3C,0x4300,0x4C3C,0x5735,0x643F,0x73BF,0x862B,0x9C0F,
+/* A:12 B:0c */
+0x1383,0x13A2,0x13C7,0x13F4,0x1429,0x1467,0x14B2,0x150A,
+0x1574,0x15F1,0x1685,0x1736,0x1808,0x1902,0x1A2A,0x1B8B,
+0x1D2E,0x1F20,0x2170,0x242F,0x2773,0x2B55,0x2FF2,0x356D,
+0x3BF2,0x43B0,0x4CE4,0x57D5,0x64D5,0x7449,0x86A7,0x9C7A,
+/* A:12 B:0d */
+0x1480,0x14A0,0x14C5,0x14F1,0x1526,0x1564,0x15AE,0x1607,
+0x1670,0x16EC,0x1780,0x1830,0x1902,0x19FA,0x1B22,0x1C81,
+0x1E23,0x2013,0x2261,0x251E,0x285F,0x2C3D,0x30D5,0x364C,
+0x3CCA,0x4481,0x4DAD,0x5894,0x6588,0x74ED,0x873A,0x9CF9,
+/* A:12 B:0e */
+0x15AE,0x15CD,0x15F2,0x161E,0x1653,0x1691,0x16DB,0x1733,
+0x179B,0x1817,0x18AB,0x195A,0x1A2A,0x1B22,0x1C48,0x1DA6,
+0x1F46,0x2134,0x237F,0x2639,0x2976,0x2D50,0x31E4,0x3754,
+0x3DCB,0x457A,0x4E9C,0x5976,0x665C,0x75B1,0x87E9,0x9D90,
+/* A:12 B:0f */
+0x1714,0x1734,0x1758,0x1784,0x17B8,0x17F6,0x1840,0x1897,
+0x18FF,0x197A,0x1A0D,0x1ABC,0x1B8B,0x1C81,0x1DA6,0x1F02,
+0x209F,0x228B,0x24D3,0x278A,0x2AC3,0x2E97,0x3325,0x388E,
+0x3EFD,0x46A2,0x4FB7,0x5A83,0x6758,0x7699,0x88B9,0x9E44,
+/* A:12 B:10 */
+0x18BF,0x18DD,0x1902,0x192E,0x1961,0x199F,0x19E8,0x1A3F,
+0x1AA6,0x1B21,0x1BB3,0x1C60,0x1D2E,0x1E23,0x1F46,0x209F,
+0x223B,0x2423,0x2668,0x291A,0x2C4E,0x301C,0x34A3,0x3A04,
+0x4068,0x4801,0x5108,0x5BC3,0x6884,0x77AC,0x89B0,0x9F19,
+/* A:12 B:11 */
+0x1AB9,0x1AD7,0x1AFC,0x1B27,0x1B5A,0x1B97,0x1BE0,0x1C36,
+0x1C9D,0x1D17,0x1DA7,0x1E53,0x1F20,0x2013,0x2134,0x228B,
+0x2423,0x2608,0x2848,0x2AF5,0x2E23,0x31EB,0x3669,0x3BBF,
+0x4218,0x49A2,0x5299,0x5D3F,0x69E8,0x78F4,0x8AD6,0xA017,
+/* A:12 B:12 */
+0x1D13,0x1D31,0x1D55,0x1D80,0x1DB3,0x1DEF,0x1E37,0x1E8D,
+0x1EF2,0x1F6B,0x1FFB,0x20A5,0x2170,0x2261,0x237F,0x24D3,
+0x2668,0x2848,0x2A84,0x2D2A,0x3051,0x3410,0x3884,0x3DCF,
+0x4419,0x4B92,0x5474,0x5F03,0x6B90,0x7A7A,0x8C33,0xA144,
+/* A:12 B:13 */
+0x1FDE,0x1FFC,0x2020,0x204A,0x207C,0x20B8,0x20FF,0x2154,
+0x21B8,0x2230,0x22BE,0x2367,0x242F,0x251E,0x2639,0x278A,
+0x291A,0x2AF5,0x2D2A,0x2FCA,0x32E9,0x369E,0x3B05,0x4042,
+0x467B,0x4DE0,0x56AA,0x611C,0x6D87,0x7C49,0x8DD2,0xA2AA,
+/* A:12 B:14 */
+0x2330,0x234E,0x2371,0x239B,0x23CC,0x2408,0x244E,0x24A1,
+0x2505,0x257A,0x2607,0x26AD,0x2773,0x285F,0x2976,0x2AC3,
+0x2C4E,0x2E23,0x3051,0x32E9,0x35FD,0x39A6,0x3DFF,0x432B,
+0x494F,0x509D,0x594A,0x639B,0x6FDD,0x7E6F,0x8FC0,0xA454,
+/* A:12 B:15 */
+0x2722,0x273F,0x2762,0x278B,0x27BC,0x27F7,0x283C,0x288E,
+0x28F0,0x2964,0x29EE,0x2A92,0x2B55,0x2C3D,0x2D50,0x2E97,
+0x301C,0x31EB,0x3410,0x369E,0x39A6,0x3D40,0x4189,0x46A0,
+0x4CAD,0x53DE,0x5C69,0x6692,0x72A4,0x80FD,0x920A,0xA64E,
+/* A:12 B:16 */
+0x2BD3,0x2BF0,0x2C12,0x2C3A,0x2C6A,0x2CA3,0x2CE7,0x2D38,
+0x2D98,0x2E0A,0x2E91,0x2F32,0x2FF2,0x30D5,0x31E4,0x3325,
+0x34A3,0x3669,0x3884,0x3B05,0x3DFF,0x4189,0x45BD,0x4ABC,
+0x50AD,0x57BB,0x601F,0x6A17,0x75F1,0x8406,0x94C3,0xA8A7,
+/* A:12 B:17 */
+0x3166,0x3182,0x31A3,0x31CB,0x31FA,0x3232,0x3274,0x32C3,
+0x3321,0x3390,0x3415,0x34B2,0x356D,0x364C,0x3754,0x388E,
+0x3A04,0x3BBF,0x3DCF,0x4042,0x432B,0x46A0,0x4ABC,0x4F9F,
+0x556D,0x5C54,0x6488,0x6E47,0x79DD,0x87A1,0x97FF,0xAB72,
+/* A:12 B:18 */
+0x3806,0x3821,0x3842,0x3868,0x3896,0x38CC,0x390D,0x395A,
+0x39B5,0x3A21,0x3AA2,0x3B3C,0x3BF2,0x3CCA,0x3DCB,0x3EFD,
+0x4068,0x4218,0x4419,0x467B,0x494F,0x4CAD,0x50AD,0x556D,
+0x5B13,0x61CA,0x69C5,0x7341,0x7E86,0x8BEB,0x9BD7,0xAEC3,
+/* A:12 B:19 */
+0x3FE6,0x4000,0x4020,0x4045,0x4071,0x40A6,0x40E4,0x412E,
+0x4187,0x41EF,0x426C,0x4300,0x43B0,0x4481,0x457A,0x46A2,
+0x4801,0x49A2,0x4B92,0x4DE0,0x509D,0x53DE,0x57BB,0x5C54,
+0x61CA,0x6848,0x6FFF,0x792A,0x8410,0x9104,0xA069,0xB2B4,
+/* A:12 B:1a */
+0x4942,0x495B,0x4979,0x499D,0x49C7,0x49FA,0x4A36,0x4A7D,
+0x4AD1,0x4B36,0x4BAE,0x4C3C,0x4CE4,0x4DAD,0x4E9C,0x4FB7,
+0x5108,0x5299,0x5474,0x56AA,0x594A,0x5C69,0x601F,0x6488,
+0x69C5,0x6FFF,0x7766,0x8031,0x8AA6,0x9713,0xA5D7,0xB764,
+/* A:12 B:1b */
+0x5461,0x5479,0x5496,0x54B8,0x54E0,0x5510,0x5549,0x558C,
+0x55DD,0x563C,0x56AE,0x5735,0x57D5,0x5894,0x5976,0x5A83,
+0x5BC3,0x5D3F,0x5F03,0x611C,0x639B,0x6692,0x6A17,0x6E47,
+0x7341,0x792A,0x8031,0x888C,0x9279,0x9E46,0xAC4B,0xBCF6,
+/* A:12 B:1c */
+0x6199,0x61B0,0x61CB,0x61EA,0x6210,0x623D,0x6272,0x62B2,
+0x62FD,0x6356,0x63C1,0x643F,0x64D5,0x6588,0x665C,0x6758,
+0x6884,0x69E8,0x6B90,0x6D87,0x6FDD,0x72A4,0x75F1,0x79DD,
+0x7E86,0x8410,0x8AA6,0x9279,0x9BC6,0xA6D4,0xB3F7,0xC394,
+/* A:12 B:1d */
+0x7150,0x7164,0x717D,0x719A,0x71BD,0x71E6,0x7217,0x7251,
+0x7297,0x72E9,0x734B,0x73BF,0x7449,0x74ED,0x75B1,0x7699,
+0x77AC,0x78F4,0x7A7A,0x7C49,0x7E6F,0x80FD,0x8406,0x87A1,
+0x8BEB,0x9104,0x9713,0x9E46,0xA6D4,0xB0FF,0xBD15,0xCB72,
+/* A:12 B:1e */
+0x83FC,0x840E,0x8424,0x843F,0x845E,0x8483,0x84AF,0x84E3,
+0x8521,0x856B,0x85C2,0x862B,0x86A7,0x873A,0x87E9,0x88B9,
+0x89B0,0x8AD6,0x8C33,0x8DD2,0x8FC0,0x920A,0x94C3,0x97FF,
+0x9BD7,0xA069,0xA5D7,0xAC4B,0xB3F7,0xBD15,0xC7EB,0xD4CC,
+/* A:12 B:1f */
+0x9A2D,0x9A3D,0x9A50,0x9A67,0x9A82,0x9AA2,0x9AC7,0x9AF5,
+0x9B2A,0x9B6A,0x9BB5,0x9C0F,0x9C7A,0x9CF9,0x9D90,0x9E44,
+0x9F19,0xA017,0xA144,0xA2AA,0xA454,0xA64E,0xA8A7,0xAB72,
+0xAEC3,0xB2B4,0xB764,0xBCF6,0xC394,0xCB72,0xD4CC,0xDFE8,
+/* A: 968D89C0 */
+/* A:13 B:00 */
+0x11DB,0x11FB,0x1220,0x124D,0x1282,0x12C1,0x130C,0x1365,
+0x13CF,0x144D,0x14E3,0x1594,0x1668,0x1763,0x188D,0x19F0,
+0x1B95,0x1D8A,0x1FDE,0x22A2,0x25EB,0x29D2,0x2E76,0x33FB,
+0x3A89,0x4253,0x4B96,0x5697,0x63AC,0x7338,0x85B2,0x9BA7,
+/* A:13 B:01 */
+0x11FB,0x121A,0x1240,0x126D,0x12A2,0x12E1,0x132C,0x1385,
+0x13EF,0x146C,0x1502,0x15B4,0x1687,0x1782,0x18AC,0x1A0F,
+0x1BB4,0x1DA9,0x1FFC,0x22BF,0x2608,0x29EF,0x2E93,0x3416,
+0x3AA4,0x426D,0x4BAF,0x56AF,0x63C2,0x734C,0x85C4,0x9BB7,
+/* A:13 B:02 */
+0x1220,0x1240,0x1266,0x1292,0x12C7,0x1306,0x1351,0x13AA,
+0x1414,0x1492,0x1527,0x15D9,0x16AC,0x17A7,0x18D1,0x1A33,
+0x1BD8,0x1DCD,0x2020,0x22E3,0x262B,0x2A12,0x2EB5,0x3437,
+0x3AC4,0x428C,0x4BCD,0x56CB,0x63DD,0x7364,0x85DA,0x9BCA,
+/* A:13 B:03 */
+0x124D,0x126D,0x1292,0x12BF,0x12F4,0x1333,0x137E,0x13D7,
+0x1440,0x14BE,0x1553,0x1605,0x16D8,0x17D2,0x18FC,0x1A5E,
+0x1C03,0x1DF7,0x204A,0x230D,0x2654,0x2A3A,0x2EDD,0x345E,
+0x3AEA,0x42B1,0x4BF0,0x56ED,0x63FC,0x7381,0x85F4,0x9BE0,
+/* A:13 B:04 */
+0x1282,0x12A2,0x12C7,0x12F4,0x1329,0x1368,0x13B2,0x140B,
+0x1475,0x14F2,0x1588,0x1639,0x170C,0x1806,0x1930,0x1A92,
+0x1C36,0x1E2A,0x207C,0x233E,0x2686,0x2A6B,0x2F0C,0x348D,
+0x3B17,0x42DD,0x4C1A,0x5715,0x6421,0x73A4,0x8612,0x9BFB,
+/* A:13 B:05 */
+0x12C1,0x12E1,0x1306,0x1333,0x1368,0x13A6,0x13F1,0x144A,
+0x14B4,0x1531,0x15C6,0x1677,0x174A,0x1844,0x196E,0x1ACF,
+0x1C73,0x1E67,0x20B8,0x237A,0x26C0,0x2AA4,0x2F45,0x34C4,
+0x3B4D,0x4311,0x4C4C,0x5744,0x644E,0x73CC,0x8637,0x9C1A,
+/* A:13 B:06 */
+0x130C,0x132C,0x1351,0x137E,0x13B2,0x13F1,0x143C,0x1495,
+0x14FE,0x157B,0x1610,0x16C1,0x1794,0x188E,0x19B7,0x1B18,
+0x1CBC,0x1EAE,0x20FF,0x23C0,0x2706,0x2AE9,0x2F88,0x3506,
+0x3B8D,0x434F,0x4C87,0x577C,0x6482,0x73FD,0x8662,0x9C40,
+/* A:13 B:07 */
+0x1365,0x1385,0x13AA,0x13D7,0x140B,0x144A,0x1495,0x14ED,
+0x1556,0x15D4,0x1668,0x1719,0x17EB,0x18E5,0x1A0E,0x1B6E,
+0x1D12,0x1F04,0x2154,0x2414,0x2758,0x2B3A,0x2FD8,0x3554,
+0x3BD9,0x4398,0x4CCE,0x57BF,0x64C1,0x7437,0x8696,0x9C6C,
+/* A:13 B:08 */
+0x13CF,0x13EF,0x1414,0x1440,0x1475,0x14B4,0x14FE,0x1556,
+0x15C0,0x163D,0x16D1,0x1782,0x1853,0x194D,0x1A75,0x1BD5,
+0x1D78,0x1F69,0x21B8,0x2477,0x27BA,0x2B9B,0x3037,0x35B1,
+0x3C33,0x43EF,0x4D21,0x580F,0x650C,0x747B,0x86D4,0x9CA1,
+/* A:13 B:09 */
+0x144D,0x146C,0x1492,0x14BE,0x14F2,0x1531,0x157B,0x15D4,
+0x163D,0x16B9,0x174E,0x17FE,0x18CF,0x19C8,0x1AF0,0x1C4F,
+0x1DF1,0x1FE2,0x2230,0x24ED,0x282F,0x2C0E,0x30A7,0x361F,
+0x3C9E,0x4457,0x4D85,0x586D,0x6564,0x74CD,0x871D,0x9CE0,
+/* A:13 B:0a */
+0x14E3,0x1502,0x1527,0x1553,0x1588,0x15C6,0x1610,0x1668,
+0x16D1,0x174E,0x17E1,0x1891,0x1962,0x1A5B,0x1B82,0x1CE1,
+0x1E81,0x2071,0x22BE,0x257A,0x28BA,0x2C96,0x312D,0x36A2,
+0x3D1E,0x44D3,0x4DFB,0x58DE,0x65CD,0x752D,0x8773,0x9D2B,
+/* A:13 B:0b */
+0x1594,0x15B4,0x15D9,0x1605,0x1639,0x1677,0x16C1,0x1719,
+0x1782,0x17FE,0x1891,0x1941,0x1A11,0x1B09,0x1C2F,0x1D8D,
+0x1F2D,0x211B,0x2367,0x2621,0x295F,0x2D39,0x31CD,0x373E,
+0x3DB5,0x4565,0x4E88,0x5963,0x664A,0x75A0,0x87DA,0x9D84,
+/* A:13 B:0c */
+0x1668,0x1687,0x16AC,0x16D8,0x170C,0x174A,0x1794,0x17EB,
+0x1853,0x18CF,0x1962,0x1A11,0x1AE1,0x1BD8,0x1CFD,0x1E5A,
+0x1FF9,0x21E6,0x242F,0x26E7,0x2A22,0x2DFA,0x328A,0x37F7,
+0x3E6A,0x4613,0x4F2F,0x5A02,0x66DF,0x7629,0x8855,0x9DEE,
+/* A:13 B:0d */
+0x1763,0x1782,0x17A7,0x17D2,0x1806,0x1844,0x188E,0x18E5,
+0x194D,0x19C8,0x1A5B,0x1B09,0x1BD8,0x1CCE,0x1DF2,0x1F4E,
+0x20EB,0x22D6,0x251E,0x27D3,0x2B0B,0x2EDF,0x336B,0x38D3,
+0x3F40,0x46E2,0x4FF5,0x5ABE,0x6790,0x76CC,0x88E7,0x9E6C,
+/* A:13 B:0e */
+0x188D,0x18AC,0x18D1,0x18FC,0x1930,0x196E,0x19B7,0x1A0E,
+0x1A75,0x1AF0,0x1B82,0x1C2F,0x1CFD,0x1DF2,0x1F16,0x2070,
+0x220B,0x23F4,0x2639,0x28EB,0x2C20,0x2FEF,0x3477,0x39D9,
+0x403E,0x47D8,0x50E1,0x5B9E,0x6862,0x778D,0x8994,0x9F01,
+/* A:13 B:0f */
+0x19F0,0x1A0F,0x1A33,0x1A5E,0x1A92,0x1ACF,0x1B18,0x1B6E,
+0x1BD5,0x1C4F,0x1CE1,0x1D8D,0x1E5A,0x1F4E,0x2070,0x21C8,
+0x2361,0x2547,0x278A,0x2A38,0x2D69,0x3133,0x35B5,0x3B0F,
+0x416C,0x48FD,0x51FA,0x5CA9,0x695B,0x7872,0x8A62,0x9FB2,
+/* A:13 B:10 */
+0x1B95,0x1BB4,0x1BD8,0x1C03,0x1C36,0x1C73,0x1CBC,0x1D12,
+0x1D78,0x1DF1,0x1E81,0x1F2D,0x1FF9,0x20EB,0x220B,0x2361,
+0x24F8,0x26DB,0x291A,0x2BC4,0x2EF0,0x32B4,0x372E,0x3C81,
+0x42D4,0x4A58,0x5347,0x5DE5,0x6A84,0x7983,0x8B56,0xA085,
+/* A:13 B:11 */
+0x1D8A,0x1DA9,0x1DCD,0x1DF7,0x1E2A,0x1E67,0x1EAE,0x1F04,
+0x1F69,0x1FE2,0x2071,0x211B,0x21E6,0x22D6,0x23F4,0x2547,
+0x26DB,0x28BB,0x2AF5,0x2D9B,0x30C0,0x347E,0x38F0,0x3E38,
+0x447F,0x4BF5,0x54D3,0x5F5D,0x6BE4,0x7AC7,0x8C79,0xA180,
+/* A:13 B:12 */
+0x1FDE,0x1FFC,0x2020,0x204A,0x207C,0x20B8,0x20FF,0x2154,
+0x21B8,0x2230,0x22BE,0x2367,0x242F,0x251E,0x2639,0x278A,
+0x291A,0x2AF5,0x2D2A,0x2FCA,0x32E9,0x369E,0x3B05,0x4042,
+0x467B,0x4DE0,0x56AA,0x611C,0x6D87,0x7C49,0x8DD2,0xA2AA,
+/* A:13 B:13 */
+0x22A2,0x22BF,0x22E3,0x230D,0x233E,0x237A,0x23C0,0x2414,
+0x2477,0x24ED,0x257A,0x2621,0x26E7,0x27D3,0x28EB,0x2A38,
+0x2BC4,0x2D9B,0x2FCA,0x3263,0x3579,0x3924,0x3D80,0x42AE,
+0x48D6,0x5027,0x58DA,0x6330,0x6F79,0x7E13,0x8F6D,0xA40D,
+/* A:13 B:14 */
+0x25EB,0x2608,0x262B,0x2654,0x2686,0x26C0,0x2706,0x2758,
+0x27BA,0x282F,0x28BA,0x295F,0x2A22,0x2B0B,0x2C20,0x2D69,
+0x2EF0,0x30C0,0x32E9,0x3579,0x3885,0x3C24,0x4071,0x458F,
+0x4BA3,0x52DD,0x5B73,0x65A7,0x71C8,0x8033,0x9155,0xA5B2,
+/* A:13 B:15 */
+0x29D2,0x29EF,0x2A12,0x2A3A,0x2A6B,0x2AA4,0x2AE9,0x2B3A,
+0x2B9B,0x2C0E,0x2C96,0x2D39,0x2DFA,0x2EDF,0x2FEF,0x3133,
+0x32B4,0x347E,0x369E,0x3924,0x3C24,0x3FB5,0x43F1,0x48FB,
+0x4EF7,0x5615,0x5E89,0x6896,0x7488,0x82BA,0x9399,0xA7A6,
+/* A:13 B:16 */
+0x2E76,0x2E93,0x2EB5,0x2EDD,0x2F0C,0x2F45,0x2F88,0x2FD8,
+0x3037,0x30A7,0x312D,0x31CD,0x328A,0x336B,0x3477,0x35B5,
+0x372E,0x38F0,0x3B05,0x3D80,0x4071,0x43F1,0x481A,0x4D0C,
+0x52EC,0x59E8,0x6235,0x6C12,0x77CB,0x85BB,0x964A,0xA9F9,
+/* A:13 B:17 */
+0x33FB,0x3416,0x3437,0x345E,0x348D,0x34C4,0x3506,0x3554,
+0x35B1,0x361F,0x36A2,0x373E,0x37F7,0x38D3,0x39D9,0x3B0F,
+0x3C81,0x3E38,0x4042,0x42AE,0x458F,0x48FB,0x4D0C,0x51E1,
+0x57A0,0x5E74,0x6691,0x7036,0x7BAD,0x894C,0x997D,0xACBB,
+/* A:13 B:18 */
+0x3A89,0x3AA4,0x3AC4,0x3AEA,0x3B17,0x3B4D,0x3B8D,0x3BD9,
+0x3C33,0x3C9E,0x3D1E,0x3DB5,0x3E6A,0x3F40,0x403E,0x416C,
+0x42D4,0x447F,0x467B,0x48D6,0x4BA3,0x4EF7,0x52EC,0x57A0,
+0x5D37,0x63DB,0x6BC0,0x7522,0x8049,0x8D8A,0x9D4B,0xB003,
+/* A:13 B:19 */
+0x4253,0x426D,0x428C,0x42B1,0x42DD,0x4311,0x434F,0x4398,
+0x43EF,0x4457,0x44D3,0x4565,0x4613,0x46E2,0x47D8,0x48FD,
+0x4A58,0x4BF5,0x4DE0,0x5027,0x52DD,0x5615,0x59E8,0x5E74,
+0x63DB,0x6A48,0x71EA,0x7AFC,0x85C4,0x9295,0xA1D0,0xB3EA,
+/* A:13 B:1a */
+0x4B96,0x4BAF,0x4BCD,0x4BF0,0x4C1A,0x4C4C,0x4C87,0x4CCE,
+0x4D21,0x4D85,0x4DFB,0x4E88,0x4F2F,0x4FF5,0x50E1,0x51FA,
+0x5347,0x54D3,0x56AA,0x58DA,0x5B73,0x5E89,0x6235,0x6691,
+0x6BC0,0x71EA,0x793C,0x81F0,0x8C48,0x9893,0xA72F,0xB88C,
+/* A:13 B:1b */
+0x5697,0x56AF,0x56CB,0x56ED,0x5715,0x5744,0x577C,0x57BF,
+0x580F,0x586D,0x58DE,0x5963,0x5A02,0x5ABE,0x5B9E,0x5CA9,
+0x5DE5,0x5F5D,0x611C,0x6330,0x65A7,0x6896,0x6C12,0x7036,
+0x7522,0x7AFC,0x81F0,0x8A34,0x9406,0x9FB2,0xAD92,0xBE0F,
+/* A:13 B:1c */
+0x63AC,0x63C2,0x63DD,0x63FC,0x6421,0x644E,0x6482,0x64C1,
+0x650C,0x6564,0x65CD,0x664A,0x66DF,0x6790,0x6862,0x695B,
+0x6A84,0x6BE4,0x6D87,0x6F79,0x71C8,0x7488,0x77CB,0x7BAD,
+0x8049,0x85C4,0x8C48,0x9406,0x9D39,0xA829,0xB528,0xC49B,
+/* A:13 B:1d */
+0x7338,0x734C,0x7364,0x7381,0x73A4,0x73CC,0x73FD,0x7437,
+0x747B,0x74CD,0x752D,0x75A0,0x7629,0x76CC,0x778D,0x7872,
+0x7983,0x7AC7,0x7C49,0x7E13,0x8033,0x82BA,0x85BB,0x894C,
+0x8D8A,0x9295,0x9893,0x9FB2,0xA829,0xB238,0xBE2D,0xCC63,
+/* A:13 B:1e */
+0x85B2,0x85C4,0x85DA,0x85F4,0x8612,0x8637,0x8662,0x8696,
+0x86D4,0x871D,0x8773,0x87DA,0x8855,0x88E7,0x8994,0x8A62,
+0x8B56,0x8C79,0x8DD2,0x8F6D,0x9155,0x9399,0x964A,0x997D,
+0x9D4B,0xA1D0,0xA72F,0xAD92,0xB528,0xBE2D,0xC8E5,0xD5A2,
+/* A:13 B:1f */
+0x9BA7,0x9BB7,0x9BCA,0x9BE0,0x9BFB,0x9C1A,0x9C40,0x9C6C,
+0x9CA1,0x9CE0,0x9D2B,0x9D84,0x9DEE,0x9E6C,0x9F01,0x9FB2,
+0xA085,0xA180,0xA2AA,0xA40D,0xA5B2,0xA7A6,0xA9F9,0xACBB,
+0xB003,0xB3EA,0xB88C,0xBE0F,0xC49B,0xCC63,0xD5A2,0xE0A0,
+/* A: 968D89C0 */
+/* A:14 B:00 */
+0x155B,0x157A,0x159F,0x15CB,0x15FF,0x163E,0x1688,0x16E0,
+0x1748,0x17C5,0x1858,0x1908,0x19D8,0x1AD0,0x1BF7,0x1D55,
+0x1EF5,0x20E4,0x2330,0x25EB,0x2929,0x2D04,0x3199,0x370B,
+0x3D84,0x4536,0x4E5A,0x5938,0x6622,0x757C,0x87BA,0x9D68,
+/* A:14 B:01 */
+0x157A,0x1599,0x15BE,0x15EA,0x161F,0x165D,0x16A7,0x16FF,
+0x1767,0x17E3,0x1877,0x1927,0x19F7,0x1AEF,0x1C15,0x1D73,
+0x1F13,0x2102,0x234E,0x2608,0x2946,0x2D21,0x31B5,0x3727,
+0x3D9F,0x4550,0x4E73,0x5950,0x6638,0x7590,0x87CC,0x9D78,
+/* A:14 B:02 */
+0x159F,0x15BE,0x15E3,0x160F,0x1644,0x1682,0x16CC,0x1724,
+0x178C,0x1808,0x189C,0x194B,0x1A1C,0x1B13,0x1C3A,0x1D97,
+0x1F37,0x2125,0x2371,0x262B,0x2969,0x2D43,0x31D7,0x3747,
+0x3DBF,0x456E,0x4E90,0x596B,0x6652,0x75A8,0x87E1,0x9D8A,
+/* A:14 B:03 */
+0x15CB,0x15EA,0x160F,0x163B,0x1670,0x16AE,0x16F8,0x1750,
+0x17B8,0x1834,0x18C7,0x1977,0x1A47,0x1B3E,0x1C65,0x1DC2,
+0x1F62,0x2150,0x239B,0x2654,0x2991,0x2D6B,0x31FE,0x376E,
+0x3DE4,0x4592,0x4EB3,0x598D,0x6671,0x75C4,0x87FB,0x9DA0,
+/* A:14 B:04 */
+0x15FF,0x161F,0x1644,0x1670,0x16A4,0x16E2,0x172C,0x1784,
+0x17EC,0x1868,0x18FB,0x19AA,0x1A7A,0x1B72,0x1C98,0x1DF5,
+0x1F94,0x2182,0x23CC,0x2686,0x29C2,0x2D9B,0x322D,0x379C,
+0x3E11,0x45BE,0x4EDD,0x59B4,0x6696,0x75E6,0x8819,0x9DBB,
+/* A:14 B:05 */
+0x163E,0x165D,0x1682,0x16AE,0x16E2,0x1720,0x176A,0x17C2,
+0x182A,0x18A6,0x1939,0x19E8,0x1AB8,0x1BAF,0x1CD5,0x1E32,
+0x1FD0,0x21BE,0x2408,0x26C0,0x29FC,0x2DD4,0x3265,0x37D2,
+0x3E46,0x45F1,0x4F0E,0x59E3,0x66C2,0x760F,0x883D,0x9DDA,
+/* A:14 B:06 */
+0x1688,0x16A7,0x16CC,0x16F8,0x172C,0x176A,0x17B4,0x180B,
+0x1873,0x18EF,0x1982,0x1A31,0x1B00,0x1BF7,0x1D1D,0x1E79,
+0x2018,0x2204,0x244E,0x2706,0x2A40,0x2E17,0x32A7,0x3813,
+0x3E85,0x462E,0x4F48,0x5A1A,0x66F6,0x763F,0x8868,0x9DFF,
+/* A:14 B:07 */
+0x16E0,0x16FF,0x1724,0x1750,0x1784,0x17C2,0x180B,0x1863,
+0x18CB,0x1946,0x19D9,0x1A88,0x1B57,0x1C4E,0x1D73,0x1ECF,
+0x206D,0x2259,0x24A1,0x2758,0x2A92,0x2E67,0x32F6,0x3860,
+0x3ED0,0x4677,0x4F8E,0x5A5C,0x6734,0x7677,0x889B,0x9E2B,
+/* A:14 B:08 */
+0x1748,0x1767,0x178C,0x17B8,0x17EC,0x182A,0x1873,0x18CB,
+0x1932,0x19AE,0x1A40,0x1AEF,0x1BBE,0x1CB4,0x1DD9,0x1F34,
+0x20D2,0x22BD,0x2505,0x27BA,0x2AF3,0x2EC7,0x3354,0x38BC,
+0x3F29,0x46CD,0x4FE1,0x5AAB,0x677E,0x76BB,0x88D8,0x9E5F,
+/* A:14 B:09 */
+0x17C5,0x17E3,0x1808,0x1834,0x1868,0x18A6,0x18EF,0x1946,
+0x19AE,0x1A29,0x1ABB,0x1B69,0x1C38,0x1D2E,0x1E52,0x1FAD,
+0x2149,0x2334,0x257A,0x282F,0x2B66,0x2F38,0x33C3,0x3929,
+0x3F93,0x4733,0x5043,0x5B08,0x67D5,0x770B,0x8920,0x9E9D,
+/* A:14 B:0a */
+0x1858,0x1877,0x189C,0x18C7,0x18FB,0x1939,0x1982,0x19D9,
+0x1A40,0x1ABB,0x1B4D,0x1BFB,0x1CC9,0x1DBE,0x1EE2,0x203C,
+0x21D8,0x23C1,0x2607,0x28BA,0x2BEF,0x2FBF,0x3447,0x39AA,
+0x4011,0x47AD,0x50B8,0x5B77,0x683D,0x776B,0x8976,0x9EE7,
+/* A:14 B:0b */
+0x1908,0x1927,0x194B,0x1977,0x19AA,0x19E8,0x1A31,0x1A88,
+0x1AEF,0x1B69,0x1BFB,0x1CA8,0x1D76,0x1E6A,0x1F8D,0x20E7,
+0x2281,0x2469,0x26AD,0x295F,0x2C92,0x305F,0x34E5,0x3A44,
+0x40A7,0x483D,0x5142,0x5BFB,0x68B8,0x77DD,0x89DC,0x9F3F,
+/* A:14 B:0c */
+0x19D8,0x19F7,0x1A1C,0x1A47,0x1A7A,0x1AB8,0x1B00,0x1B57,
+0x1BBE,0x1C38,0x1CC9,0x1D76,0x1E43,0x1F37,0x2059,0x21B1,
+0x234A,0x2531,0x2773,0x2A22,0x2D53,0x311E,0x35A0,0x3AFB,
+0x4159,0x48E9,0x51E7,0x5C97,0x694B,0x7863,0x8A55,0x9FA7,
+/* A:14 B:0d */
+0x1AD0,0x1AEF,0x1B13,0x1B3E,0x1B72,0x1BAF,0x1BF7,0x1C4E,
+0x1CB4,0x1D2E,0x1DBE,0x1E6A,0x1F37,0x202A,0x214B,0x22A2,
+0x243A,0x261E,0x285F,0x2B0B,0x2E39,0x3200,0x367E,0x3BD4,
+0x422C,0x49B6,0x52AB,0x5D51,0x69F9,0x7904,0x8AE4,0xA023,
+/* A:14 B:0e */
+0x1BF7,0x1C15,0x1C3A,0x1C65,0x1C98,0x1CD5,0x1D1D,0x1D73,
+0x1DD9,0x1E52,0x1EE2,0x1F8D,0x2059,0x214B,0x226A,0x23C0,
+0x2556,0x2739,0x2976,0x2C20,0x2F4A,0x330D,0x3786,0x3CD6,
+0x4327,0x4AA9,0x5394,0x5E2F,0x6AC9,0x79C3,0x8B8F,0xA0B7,
+/* A:14 B:0f */
+0x1D55,0x1D73,0x1D97,0x1DC2,0x1DF5,0x1E32,0x1E79,0x1ECF,
+0x1F34,0x1FAD,0x203C,0x20E7,0x21B1,0x22A2,0x23C0,0x2514,
+0x26A8,0x2888,0x2AC3,0x2D69,0x308F,0x344D,0x38C0,0x3E09,
+0x4452,0x4BC9,0x54A9,0x5F36,0x6BBF,0x7AA5,0x8C5A,0xA166,
+/* A:14 B:10 */
+0x1EF5,0x1F13,0x1F37,0x1F62,0x1F94,0x1FD0,0x2018,0x206D,
+0x20D2,0x2149,0x21D8,0x2281,0x234A,0x243A,0x2556,0x26A8,
+0x2839,0x2A17,0x2C4E,0x2EF0,0x3211,0x35C9,0x3A35,0x3F76,
+0x45B4,0x4D20,0x55F2,0x606E,0x6CE4,0x7BB2,0x8D4C,0xA236,
+/* A:14 B:11 */
+0x20E4,0x2102,0x2125,0x2150,0x2182,0x21BE,0x2204,0x2259,
+0x22BD,0x2334,0x23C1,0x2469,0x2531,0x261E,0x2739,0x2888,
+0x2A17,0x2BF0,0x2E23,0x30C0,0x33DC,0x378D,0x3BF0,0x4127,
+0x475A,0x4EB8,0x577A,0x61E1,0x6E40,0x7CF2,0x8E6B,0xA32E,
+/* A:14 B:12 */
+0x2330,0x234E,0x2371,0x239B,0x23CC,0x2408,0x244E,0x24A1,
+0x2505,0x257A,0x2607,0x26AD,0x2773,0x285F,0x2976,0x2AC3,
+0x2C4E,0x2E23,0x3051,0x32E9,0x35FD,0x39A6,0x3DFF,0x432B,
+0x494F,0x509D,0x594A,0x639B,0x6FDD,0x7E6F,0x8FC0,0xA454,
+/* A:14 B:13 */
+0x25EB,0x2608,0x262B,0x2654,0x2686,0x26C0,0x2706,0x2758,
+0x27BA,0x282F,0x28BA,0x295F,0x2A22,0x2B0B,0x2C20,0x2D69,
+0x2EF0,0x30C0,0x32E9,0x3579,0x3885,0x3C24,0x4071,0x458F,
+0x4BA3,0x52DD,0x5B73,0x65A7,0x71C8,0x8033,0x9155,0xA5B2,
+/* A:14 B:14 */
+0x2929,0x2946,0x2969,0x2991,0x29C2,0x29FC,0x2A40,0x2A92,
+0x2AF3,0x2B66,0x2BEF,0x2C92,0x2D53,0x2E39,0x2F4A,0x308F,
+0x3211,0x33DC,0x35FD,0x3885,0x3B87,0x3F1A,0x435A,0x4867,
+0x4E67,0x5589,0x5E03,0x6817,0x7411,0x824C,0x9336,0xA751,
+/* A:14 B:15 */
+0x2D04,0x2D21,0x2D43,0x2D6B,0x2D9B,0x2DD4,0x2E17,0x2E67,
+0x2EC7,0x2F38,0x2FBF,0x305F,0x311E,0x3200,0x330D,0x344D,
+0x35C9,0x378D,0x39A6,0x3C24,0x3F1A,0x429F,0x46CE,0x4BC7,
+0x51B0,0x58B7,0x6110,0x6AFC,0x76C7,0x84CB,0x9573,0xA93F,
+/* A:14 B:16 */
+0x3199,0x31B5,0x31D7,0x31FE,0x322D,0x3265,0x32A7,0x32F6,
+0x3354,0x33C3,0x3447,0x34E5,0x35A0,0x367E,0x3786,0x38C0,
+0x3A35,0x3BF0,0x3DFF,0x4071,0x435A,0x46CE,0x4AEA,0x4FCB,
+0x5599,0x5C7E,0x64AF,0x6E6D,0x7A00,0x87C2,0x981B,0xAB8A,
+/* A:14 B:17 */
+0x370B,0x3727,0x3747,0x376E,0x379C,0x37D2,0x3813,0x3860,
+0x38BC,0x3929,0x39AA,0x3A44,0x3AFB,0x3BD4,0x3CD6,0x3E09,
+0x3F76,0x4127,0x432B,0x458F,0x4867,0x4BC7,0x4FCB,0x5491,
+0x5A3D,0x60FB,0x68FE,0x7283,0x7DD4,0x8B47,0x9B44,0xAE43,
+/* A:14 B:18 */
+0x3D84,0x3D9F,0x3DBF,0x3DE4,0x3E11,0x3E46,0x3E85,0x3ED0,
+0x3F29,0x3F93,0x4011,0x40A7,0x4159,0x422C,0x4327,0x4452,
+0x45B4,0x475A,0x494F,0x4BA3,0x4E67,0x51B0,0x5599,0x5A3D,
+0x5FC2,0x6650,0x6E1C,0x775F,0x8262,0x8F77,0x9F05,0xB180,
+/* A:14 B:19 */
+0x4536,0x4550,0x456E,0x4592,0x45BE,0x45F1,0x462E,0x4677,
+0x46CD,0x4733,0x47AD,0x483D,0x48E9,0x49B6,0x4AA9,0x4BC9,
+0x4D20,0x4EB8,0x509D,0x52DD,0x5589,0x58B7,0x5C7E,0x60FB,
+0x6650,0x6CA8,0x7431,0x7D26,0x87CB,0x9472,0xA37B,0xB55A,
+/* A:14 B:1a */
+0x4E5A,0x4E73,0x4E90,0x4EB3,0x4EDD,0x4F0E,0x4F48,0x4F8E,
+0x4FE1,0x5043,0x50B8,0x5142,0x51E7,0x52AB,0x5394,0x54A9,
+0x55F2,0x577A,0x594A,0x5B73,0x5E03,0x6110,0x64AF,0x68FE,
+0x6E1C,0x7431,0x7B6B,0x8403,0x8E39,0x9A5C,0xA8C8,0xB9ED,
+/* A:14 B:1b */
+0x5938,0x5950,0x596B,0x598D,0x59B4,0x59E3,0x5A1A,0x5A5C,
+0x5AAB,0x5B08,0x5B77,0x5BFB,0x5C97,0x5D51,0x5E2F,0x5F36,
+0x606E,0x61E1,0x639B,0x65A7,0x6817,0x6AFC,0x6E6D,0x7283,
+0x775F,0x7D26,0x8403,0x8C2B,0x95DD,0xA163,0xAF15,0xBF5C,
+/* A:14 B:1c */
+0x6622,0x6638,0x6652,0x6671,0x6696,0x66C2,0x66F6,0x6734,
+0x677E,0x67D5,0x683D,0x68B8,0x694B,0x69F9,0x6AC9,0x6BBF,
+0x6CE4,0x6E40,0x6FDD,0x71C8,0x7411,0x76C7,0x7A00,0x7DD4,
+0x8262,0x87CB,0x8E39,0x95DD,0x9EF3,0xA9BE,0xB693,0xC5D3,
+/* A:14 B:1d */
+0x757C,0x7590,0x75A8,0x75C4,0x75E6,0x760F,0x763F,0x7677,
+0x76BB,0x770B,0x776B,0x77DD,0x7863,0x7904,0x79C3,0x7AA5,
+0x7BB2,0x7CF2,0x7E6F,0x8033,0x824C,0x84CB,0x87C2,0x8B47,
+0x8F77,0x9472,0x9A5C,0xA163,0xA9BE,0xB3AC,0xBF7A,0xCD80,
+/* A:14 B:1e */
+0x87BA,0x87CC,0x87E1,0x87FB,0x8819,0x883D,0x8868,0x889B,
+0x88D8,0x8920,0x8976,0x89DC,0x8A55,0x8AE4,0x8B8F,0x8C5A,
+0x8D4C,0x8E6B,0x8FC0,0x9155,0x9336,0x9573,0x981B,0x9B44,
+0x9F05,0xA37B,0xA8C8,0xAF15,0xB693,0xBF7A,0xCA0E,0xD6A1,
+/* A:14 B:1f */
+0x9D68,0x9D78,0x9D8A,0x9DA0,0x9DBB,0x9DDA,0x9DFF,0x9E2B,
+0x9E5F,0x9E9D,0x9EE7,0x9F3F,0x9FA7,0xA023,0xA0B7,0xA166,
+0xA236,0xA32E,0xA454,0xA5B2,0xA751,0xA93F,0xAB8A,0xAE43,
+0xB180,0xB55A,0xB9ED,0xBF5C,0xC5D3,0xCD80,0xD6A1,0xE17A,
+/* A: 968D89C0 */
+/* A:15 B:00 */
+0x1983,0x19A2,0x19C6,0x19F2,0x1A25,0x1A63,0x1AAB,0x1B02,
+0x1B69,0x1BE3,0x1C75,0x1D22,0x1DEF,0x1EE3,0x2005,0x215E,
+0x22F8,0x24DF,0x2722,0x29D2,0x2D04,0x30D0,0x3553,0x3AB0,
+0x4110,0x48A3,0x51A4,0x5C58,0x6910,0x782D,0x8A24,0x9F7E,
+/* A:15 B:01 */
+0x19A2,0x19C0,0x19E5,0x1A10,0x1A44,0x1A81,0x1ACA,0x1B21,
+0x1B88,0x1C02,0x1C93,0x1D40,0x1E0D,0x1F01,0x2023,0x217C,
+0x2316,0x24FD,0x273F,0x29EF,0x2D21,0x30EC,0x356F,0x3ACB,
+0x412A,0x48BD,0x51BD,0x5C6F,0x6925,0x7841,0x8A36,0x9F8D,
+/* A:15 B:02 */
+0x19C6,0x19E5,0x1A09,0x1A35,0x1A68,0x1AA6,0x1AEE,0x1B45,
+0x1BAC,0x1C26,0x1CB7,0x1D64,0x1E31,0x1F25,0x2047,0x21A0,
+0x2339,0x2520,0x2762,0x2A12,0x2D43,0x310E,0x3590,0x3AEB,
+0x4149,0x48DB,0x51DA,0x5C8A,0x693F,0x7859,0x8A4B,0x9FA0,
+/* A:15 B:03 */
+0x19F2,0x1A10,0x1A35,0x1A60,0x1A94,0x1AD1,0x1B1A,0x1B70,
+0x1BD7,0x1C51,0x1CE2,0x1D8F,0x1E5C,0x1F50,0x2071,0x21CA,
+0x2363,0x2549,0x278B,0x2A3A,0x2D6B,0x3135,0x35B7,0x3B11,
+0x416E,0x48FF,0x51FC,0x5CAB,0x695D,0x7875,0x8A64,0x9FB5,
+/* A:15 B:04 */
+0x1A25,0x1A44,0x1A68,0x1A94,0x1AC7,0x1B04,0x1B4D,0x1BA3,
+0x1C0A,0x1C84,0x1D15,0x1DC2,0x1E8F,0x1F82,0x20A4,0x21FC,
+0x2395,0x257B,0x27BC,0x2A6B,0x2D9B,0x3164,0x35E5,0x3B3F,
+0x419A,0x4929,0x5225,0x5CD2,0x6982,0x7896,0x8A82,0x9FCF,
+/* A:15 B:05 */
+0x1A63,0x1A81,0x1AA6,0x1AD1,0x1B04,0x1B41,0x1B8A,0x1BE0,
+0x1C47,0x1CC1,0x1D52,0x1DFE,0x1ECB,0x1FBE,0x20E0,0x2237,
+0x23D0,0x25B5,0x27F7,0x2AA4,0x2DD4,0x319C,0x361C,0x3B74,
+0x41CF,0x495C,0x5255,0x5D00,0x69AD,0x78BE,0x8AA6,0x9FEE,
+/* A:15 B:06 */
+0x1AAB,0x1ACA,0x1AEE,0x1B1A,0x1B4D,0x1B8A,0x1BD3,0x1C29,
+0x1C8F,0x1D09,0x1D9A,0x1E46,0x1F13,0x2006,0x2127,0x227E,
+0x2416,0x25FB,0x283C,0x2AE9,0x2E17,0x31DF,0x365D,0x3BB4,
+0x420D,0x4998,0x528F,0x5D36,0x69E0,0x78ED,0x8AD0,0xA012,
+/* A:15 B:07 */
+0x1B02,0x1B21,0x1B45,0x1B70,0x1BA3,0x1BE0,0x1C29,0x1C7F,
+0x1CE5,0x1D5F,0x1DF0,0x1E9C,0x1F68,0x205B,0x217B,0x22D2,
+0x246A,0x264E,0x288E,0x2B3A,0x2E67,0x322E,0x36AB,0x3C00,
+0x4257,0x49DF,0x52D3,0x5D77,0x6A1D,0x7925,0x8B02,0xA03E,
+/* A:15 B:08 */
+0x1B69,0x1B88,0x1BAC,0x1BD7,0x1C0A,0x1C47,0x1C8F,0x1CE5,
+0x1D4C,0x1DC5,0x1E56,0x1F01,0x1FCD,0x20C0,0x21E0,0x2336,
+0x24CD,0x26B1,0x28F0,0x2B9B,0x2EC7,0x328C,0x3707,0x3C5A,
+0x42AE,0x4A34,0x5325,0x5DC5,0x6A65,0x7968,0x8B3E,0xA071,
+/* A:15 B:09 */
+0x1BE3,0x1C02,0x1C26,0x1C51,0x1C84,0x1CC1,0x1D09,0x1D5F,
+0x1DC5,0x1E3E,0x1ECF,0x1F7A,0x2046,0x2137,0x2257,0x23AD,
+0x2543,0x2726,0x2964,0x2C0E,0x2F38,0x32FC,0x3775,0x3CC5,
+0x4317,0x4A99,0x5385,0x5E21,0x6ABB,0x79B7,0x8B85,0xA0AE,
+/* A:15 B:0a */
+0x1C75,0x1C93,0x1CB7,0x1CE2,0x1D15,0x1D52,0x1D9A,0x1DF0,
+0x1E56,0x1ECF,0x1F5E,0x2009,0x20D5,0x21C6,0x22E5,0x243A,
+0x25CF,0x27B1,0x29EE,0x2C96,0x2FBF,0x3381,0x37F7,0x3D45,
+0x4393,0x4B11,0x53F8,0x5E8E,0x6B22,0x7A15,0x8BD9,0xA0F7,
+/* A:15 B:0b */
+0x1D22,0x1D40,0x1D64,0x1D8F,0x1DC2,0x1DFE,0x1E46,0x1E9C,
+0x1F01,0x1F7A,0x2009,0x20B4,0x217F,0x226F,0x238E,0x24E2,
+0x2676,0x2857,0x2A92,0x2D39,0x305F,0x341E,0x3892,0x3DDC,
+0x4426,0x4B9F,0x5481,0x5F0F,0x6B9B,0x7A85,0x8C3D,0xA14D,
+/* A:15 B:0c */
+0x1DEF,0x1E0D,0x1E31,0x1E5C,0x1E8F,0x1ECB,0x1F13,0x1F68,
+0x1FCD,0x2046,0x20D5,0x217F,0x2249,0x2339,0x2456,0x25A9,
+0x273C,0x291B,0x2B55,0x2DFA,0x311E,0x34DA,0x394A,0x3E90,
+0x44D5,0x4C49,0x5523,0x5FAA,0x6C2C,0x7B09,0x8CB4,0xA1B4,
+/* A:15 B:0d */
+0x1EE3,0x1F01,0x1F25,0x1F50,0x1F82,0x1FBE,0x2006,0x205B,
+0x20C0,0x2137,0x21C6,0x226F,0x2339,0x2428,0x2544,0x2696,
+0x2828,0x2A05,0x2C3D,0x2EDF,0x3200,0x35B9,0x3A25,0x3F66,
+0x45A5,0x4D12,0x55E4,0x6061,0x6CD7,0x7BA7,0x8D42,0xA22E,
+/* A:15 B:0e */
+0x2005,0x2023,0x2047,0x2071,0x20A4,0x20E0,0x2127,0x217B,
+0x21E0,0x2257,0x22E5,0x238E,0x2456,0x2544,0x265F,0x27B0,
+0x2940,0x2B1B,0x2D50,0x2FEF,0x330D,0x36C2,0x3B29,0x4065,
+0x469D,0x4E01,0x56CA,0x613B,0x6DA3,0x7C63,0x8DEA,0xA2BF,
+/* A:15 B:0f */
+0x215E,0x217C,0x21A0,0x21CA,0x21FC,0x2237,0x227E,0x22D2,
+0x2336,0x23AD,0x243A,0x24E2,0x25A9,0x2696,0x27B0,0x28FF,
+0x2A8D,0x2C65,0x2E97,0x3133,0x344D,0x37FD,0x3C5E,0x4193,
+0x47C3,0x4F1D,0x57DA,0x623E,0x6E96,0x7D42,0x8EB2,0xA36C,
+/* A:15 B:10 */
+0x22F8,0x2316,0x2339,0x2363,0x2395,0x23D0,0x2416,0x246A,
+0x24CD,0x2543,0x25CF,0x2676,0x273C,0x2828,0x2940,0x2A8D,
+0x2C18,0x2DEE,0x301C,0x32B4,0x35C9,0x3973,0x3DCD,0x42FA,
+0x4920,0x506F,0x591F,0x6371,0x6FB6,0x7E4B,0x8FA0,0xA439,
+/* A:15 B:11 */
+0x24DF,0x24FD,0x2520,0x2549,0x257B,0x25B5,0x25FB,0x264E,
+0x26B1,0x2726,0x27B1,0x2857,0x291B,0x2A05,0x2B1B,0x2C65,
+0x2DEE,0x2FC0,0x31EB,0x347E,0x378D,0x3B30,0x3F82,0x44A5,
+0x4ABF,0x5200,0x5AA0,0x64DF,0x710D,0x7F86,0x90BA,0xA52C,
+/* A:15 B:12 */
+0x2722,0x273F,0x2762,0x278B,0x27BC,0x27F7,0x283C,0x288E,
+0x28F0,0x2964,0x29EE,0x2A92,0x2B55,0x2C3D,0x2D50,0x2E97,
+0x301C,0x31EB,0x3410,0x369E,0x39A6,0x3D40,0x4189,0x46A0,
+0x4CAD,0x53DE,0x5C69,0x6692,0x72A4,0x80FD,0x920A,0xA64E,
+/* A:15 B:13 */
+0x29D2,0x29EF,0x2A12,0x2A3A,0x2A6B,0x2AA4,0x2AE9,0x2B3A,
+0x2B9B,0x2C0E,0x2C96,0x2D39,0x2DFA,0x2EDF,0x2FEF,0x3133,
+0x32B4,0x347E,0x369E,0x3924,0x3C24,0x3FB5,0x43F1,0x48FB,
+0x4EF7,0x5615,0x5E89,0x6896,0x7488,0x82BA,0x9399,0xA7A6,
+/* A:15 B:14 */
+0x2D04,0x2D21,0x2D43,0x2D6B,0x2D9B,0x2DD4,0x2E17,0x2E67,
+0x2EC7,0x2F38,0x2FBF,0x305F,0x311E,0x3200,0x330D,0x344D,
+0x35C9,0x378D,0x39A6,0x3C24,0x3F1A,0x429F,0x46CE,0x4BC7,
+0x51B0,0x58B7,0x6110,0x6AFC,0x76C7,0x84CB,0x9573,0xA93F,
+/* A:15 B:15 */
+0x30D0,0x30EC,0x310E,0x3135,0x3164,0x319C,0x31DF,0x322E,
+0x328C,0x32FC,0x3381,0x341E,0x34DA,0x35B9,0x36C2,0x37FD,
+0x3973,0x3B30,0x3D40,0x3FB5,0x429F,0x4617,0x4A36,0x4F1B,
+0x54ED,0x5BD8,0x6410,0x6DD5,0x7972,0x873F,0x97A6,0xAB25,
+/* A:15 B:16 */
+0x3553,0x356F,0x3590,0x35B7,0x35E5,0x361C,0x365D,0x36AB,
+0x3707,0x3775,0x37F7,0x3892,0x394A,0x3A25,0x3B29,0x3C5E,
+0x3DCD,0x3F82,0x4189,0x43F1,0x46CE,0x4A36,0x4E41,0x530F,
+0x58C6,0x5F90,0x67A1,0x7139,0x7C9E,0x8A2A,0x9A44,0xAD67,
+/* A:15 B:17 */
+0x3AB0,0x3ACB,0x3AEB,0x3B11,0x3B3F,0x3B74,0x3BB4,0x3C00,
+0x3C5A,0x3CC5,0x3D45,0x3DDC,0x3E90,0x3F66,0x4065,0x4193,
+0x42FA,0x44A5,0x46A0,0x48FB,0x4BC7,0x4F1B,0x530F,0x57C2,
+0x5D58,0x63FB,0x6BDF,0x753F,0x8064,0x8DA2,0x9D60,0xB015,
+/* A:15 B:18 */
+0x4110,0x412A,0x4149,0x416E,0x419A,0x41CF,0x420D,0x4257,
+0x42AE,0x4317,0x4393,0x4426,0x44D5,0x45A5,0x469D,0x47C3,
+0x4920,0x4ABF,0x4CAD,0x4EF7,0x51B0,0x54ED,0x58C6,0x5D58,
+0x62C7,0x693C,0x70E9,0x7A08,0x84DF,0x91C2,0xA112,0xB345,
+/* A:15 B:19 */
+0x48A3,0x48BD,0x48DB,0x48FF,0x4929,0x495C,0x4998,0x49DF,
+0x4A34,0x4A99,0x4B11,0x4B9F,0x4C49,0x4D12,0x4E01,0x4F1D,
+0x506F,0x5200,0x53DE,0x5615,0x58B7,0x5BD8,0x5F90,0x63FB,
+0x693C,0x6F7A,0x76E6,0x7FB8,0x8A33,0x96A8,0xA576,0xB70F,
+/* A:15 B:1a */
+0x51A4,0x51BD,0x51DA,0x51FC,0x5225,0x5255,0x528F,0x52D3,
+0x5325,0x5385,0x53F8,0x5481,0x5523,0x55E4,0x56CA,0x57DA,
+0x591F,0x5AA0,0x5C69,0x5E89,0x6110,0x6410,0x67A1,0x6BDF,
+0x70E9,0x76E6,0x7E04,0x867A,0x9088,0x9C7B,0xAAAE,0xBB8F,
+/* A:15 B:1b */
+0x5C58,0x5C6F,0x5C8A,0x5CAB,0x5CD2,0x5D00,0x5D36,0x5D77,
+0x5DC5,0x5E21,0x5E8E,0x5F0F,0x5FAA,0x6061,0x613B,0x623E,
+0x6371,0x64DF,0x6692,0x6896,0x6AFC,0x6DD5,0x7139,0x753F,
+0x7A08,0x7FB8,0x867A,0x8E82,0x980E,0xA366,0xB0E2,0xC0E9,
+/* A:15 B:1c */
+0x6910,0x6925,0x693F,0x695D,0x6982,0x69AD,0x69E0,0x6A1D,
+0x6A65,0x6ABB,0x6B22,0x6B9B,0x6C2C,0x6CD7,0x6DA3,0x6E96,
+0x6FB6,0x710D,0x72A4,0x7488,0x76C7,0x7972,0x7C9E,0x8064,
+0x84DF,0x8A33,0x9088,0x980E,0xA0FF,0xABA0,0xB842,0xC745,
+/* A:15 B:1d */
+0x782D,0x7841,0x7859,0x7875,0x7896,0x78BE,0x78ED,0x7925,
+0x7968,0x79B7,0x7A15,0x7A85,0x7B09,0x7BA7,0x7C63,0x7D42,
+0x7E4B,0x7F86,0x80FD,0x82BA,0x84CB,0x873F,0x8A2A,0x8DA2,
+0x91C2,0x96A8,0x9C7B,0xA366,0xABA0,0xB567,0xC105,0xCED4,
+/* A:15 B:1e */
+0x8A24,0x8A36,0x8A4B,0x8A64,0x8A82,0x8AA6,0x8AD0,0x8B02,
+0x8B3E,0x8B85,0x8BD9,0x8C3D,0x8CB4,0x8D42,0x8DEA,0x8EB2,
+0x8FA0,0x90BA,0x920A,0x9399,0x9573,0x97A6,0x9A44,0x9D60,
+0xA112,0xA576,0xAAAE,0xB0E2,0xB842,0xC105,0xCB6F,0xD7D0,
+/* A:15 B:1f */
+0x9F7E,0x9F8D,0x9FA0,0x9FB5,0x9FCF,0x9FEE,0xA012,0xA03E,
+0xA071,0xA0AE,0xA0F7,0xA14D,0xA1B4,0xA22E,0xA2BF,0xA36C,
+0xA439,0xA52C,0xA64E,0xA7A6,0xA93F,0xAB25,0xAD67,0xB015,
+0xB345,0xB70F,0xBB8F,0xC0E9,0xC745,0xCED4,0xD7D0,0xE27D,
+/* A: 968D89C0 */
+/* A:16 B:00 */
+0x1E74,0x1E92,0x1EB6,0x1EE0,0x1F13,0x1F4F,0x1F97,0x1FEC,
+0x2051,0x20C9,0x2158,0x2201,0x22CB,0x23BB,0x24D8,0x262A,
+0x27BD,0x299B,0x2BD3,0x2E76,0x3199,0x3553,0x39C1,0x3F05,
+0x4547,0x4CB7,0x558D,0x600E,0x6C8A,0x7B61,0x8D03,0xA1F8,
+/* A:16 B:01 */
+0x1E92,0x1EB0,0x1ED4,0x1EFF,0x1F31,0x1F6D,0x1FB5,0x200A,
+0x206F,0x20E7,0x2176,0x221F,0x22E9,0x23D8,0x24F5,0x2647,
+0x27DA,0x29B8,0x2BF0,0x2E93,0x31B5,0x356F,0x39DC,0x3F20,
+0x4561,0x4CCF,0x55A5,0x6025,0x6C9F,0x7B74,0x8D15,0xA207,
+/* A:16 B:02 */
+0x1EB6,0x1ED4,0x1EF8,0x1F22,0x1F55,0x1F91,0x1FD9,0x202E,
+0x2092,0x210A,0x2199,0x2243,0x230C,0x23FB,0x2518,0x266A,
+0x27FC,0x29DA,0x2C12,0x2EB5,0x31D7,0x3590,0x39FD,0x3F3F,
+0x457F,0x4CED,0x55C1,0x6040,0x6CB9,0x7B8B,0x8D29,0xA219,
+/* A:16 B:03 */
+0x1EE0,0x1EFF,0x1F22,0x1F4D,0x1F7F,0x1FBC,0x2003,0x2058,
+0x20BD,0x2135,0x21C3,0x226D,0x2336,0x2425,0x2542,0x2694,
+0x2825,0x2A03,0x2C3A,0x2EDD,0x31FE,0x35B7,0x3A23,0x3F64,
+0x45A3,0x4D10,0x55E3,0x6060,0x6CD7,0x7BA7,0x8D42,0xA22F,
+/* A:16 B:04 */
+0x1F13,0x1F31,0x1F55,0x1F7F,0x1FB2,0x1FEE,0x2035,0x208A,
+0x20EF,0x2167,0x21F5,0x229F,0x2368,0x2457,0x2573,0x26C5,
+0x2856,0x2A33,0x2C6A,0x2F0C,0x322D,0x35E5,0x3A50,0x3F91,
+0x45CF,0x4D3A,0x560B,0x6086,0x6CFA,0x7BC8,0x8D5F,0xA248,
+/* A:16 B:05 */
+0x1F4F,0x1F6D,0x1F91,0x1FBC,0x1FEE,0x202A,0x2071,0x20C6,
+0x212B,0x21A3,0x2231,0x22DA,0x23A3,0x2492,0x25AE,0x26FF,
+0x2890,0x2A6D,0x2CA3,0x2F45,0x3265,0x361C,0x3A86,0x3FC5,
+0x4602,0x4D6B,0x563B,0x60B3,0x6D24,0x7BEF,0x8D82,0xA266,
+/* A:16 B:06 */
+0x1F97,0x1FB5,0x1FD9,0x2003,0x2035,0x2071,0x20B9,0x210D,
+0x2172,0x21EA,0x2278,0x2321,0x23E9,0x24D8,0x25F4,0x2745,
+0x28D5,0x2AB1,0x2CE7,0x2F88,0x32A7,0x365D,0x3AC6,0x4004,
+0x463F,0x4DA6,0x5673,0x60E9,0x6D57,0x7C1D,0x8DAC,0xA28A,
+/* A:16 B:07 */
+0x1FEC,0x200A,0x202E,0x2058,0x208A,0x20C6,0x210D,0x2162,
+0x21C6,0x223E,0x22CC,0x2374,0x243D,0x252B,0x2647,0x2797,
+0x2927,0x2B03,0x2D38,0x2FD8,0x32F6,0x36AB,0x3B12,0x404F,
+0x4687,0x4DED,0x56B6,0x6128,0x6D93,0x7C54,0x8DDD,0xA2B4,
+/* A:16 B:08 */
+0x2051,0x206F,0x2092,0x20BD,0x20EF,0x212B,0x2172,0x21C6,
+0x222B,0x22A2,0x2330,0x23D8,0x24A0,0x258E,0x26A9,0x27F9,
+0x2989,0x2B64,0x2D98,0x3037,0x3354,0x3707,0x3B6D,0x40A7,
+0x46DE,0x4E40,0x5706,0x6174,0x6DDA,0x7C95,0x8E18,0xA2E7,
+/* A:16 B:09 */
+0x20C9,0x20E7,0x210A,0x2135,0x2167,0x21A3,0x21EA,0x223E,
+0x22A2,0x2319,0x23A7,0x244F,0x2517,0x2604,0x271E,0x286E,
+0x29FD,0x2BD7,0x2E0A,0x30A7,0x33C3,0x3775,0x3BD9,0x4110,
+0x4744,0x4EA3,0x5765,0x61CE,0x6E2E,0x7CE3,0x8E5D,0xA323,
+/* A:16 B:0a */
+0x2158,0x2176,0x2199,0x21C3,0x21F5,0x2231,0x2278,0x22CC,
+0x2330,0x23A7,0x2434,0x24DB,0x25A3,0x2690,0x27AA,0x28F8,
+0x2A86,0x2C5F,0x2E91,0x312D,0x3447,0x37F7,0x3C59,0x418D,
+0x47BE,0x4F18,0x57D6,0x623A,0x6E92,0x7D3F,0x8EB0,0xA36A,
+/* A:16 B:0b */
+0x2201,0x221F,0x2243,0x226D,0x229F,0x22DA,0x2321,0x2374,
+0x23D8,0x244F,0x24DB,0x2583,0x264A,0x2736,0x284F,0x299D,
+0x2B2A,0x2D02,0x2F32,0x31CD,0x34E5,0x3892,0x3CF1,0x4222,
+0x484E,0x4FA4,0x585C,0x62B9,0x6F0A,0x7DAD,0x8F12,0xA3BF,
+/* A:16 B:0c */
+0x22CB,0x22E9,0x230C,0x2336,0x2368,0x23A3,0x23E9,0x243D,
+0x24A0,0x2517,0x25A3,0x264A,0x2710,0x27FC,0x2914,0x2A61,
+0x2BED,0x2DC3,0x2FF2,0x328A,0x35A0,0x394A,0x3DA5,0x42D3,
+0x48FA,0x504A,0x58FC,0x6350,0x6F97,0x7E2F,0x8F87,0xA424,
+/* A:16 B:0d */
+0x23BB,0x23D8,0x23FB,0x2425,0x2457,0x2492,0x24D8,0x252B,
+0x258E,0x2604,0x2690,0x2736,0x27FC,0x28E7,0x29FE,0x2B4A,
+0x2CD4,0x2EA8,0x30D5,0x336B,0x367E,0x3A25,0x3E7C,0x43A5,
+0x49C6,0x5110,0x59B9,0x6404,0x7040,0x7ECA,0x9012,0xA49C,
+/* A:16 B:0e */
+0x24D8,0x24F5,0x2518,0x2542,0x2573,0x25AE,0x25F4,0x2647,
+0x26A9,0x271E,0x27AA,0x284F,0x2914,0x29FE,0x2B14,0x2C5E,
+0x2DE7,0x2FB9,0x31E4,0x3477,0x3786,0x3B29,0x3F7B,0x449E,
+0x4AB9,0x51FB,0x5A9A,0x64DA,0x7108,0x7F82,0x90B7,0xA52A,
+/* A:16 B:0f */
+0x262A,0x2647,0x266A,0x2694,0x26C5,0x26FF,0x2745,0x2797,
+0x27F9,0x286E,0x28F8,0x299D,0x2A61,0x2B4A,0x2C5E,0x2DA7,
+0x2F2D,0x30FD,0x3325,0x35B5,0x38C0,0x3C5E,0x40AB,0x45C7,
+0x4BDA,0x5312,0x5BA6,0x65D8,0x71F6,0x805D,0x917B,0xA5D3,
+/* A:16 B:10 */
+0x27BD,0x27DA,0x27FC,0x2825,0x2856,0x2890,0x28D5,0x2927,
+0x2989,0x29FD,0x2A86,0x2B2A,0x2BED,0x2CD4,0x2DE7,0x2F2D,
+0x30B1,0x327F,0x34A3,0x372E,0x3A35,0x3DCD,0x4213,0x4727,
+0x4D31,0x545D,0x5CE4,0x6706,0x7311,0x8161,0x9264,0xA69C,
+/* A:16 B:11 */
+0x299B,0x29B8,0x29DA,0x2A03,0x2A33,0x2A6D,0x2AB1,0x2B03,
+0x2B64,0x2BD7,0x2C5F,0x2D02,0x2DC3,0x2EA8,0x2FB9,0x30FD,
+0x327F,0x3449,0x3669,0x38F0,0x3BF0,0x3F82,0x43C0,0x48CA,
+0x4EC8,0x55E7,0x5E5E,0x686D,0x7461,0x8296,0x9379,0xA78B,
+/* A:16 B:12 */
+0x2BD3,0x2BF0,0x2C12,0x2C3A,0x2C6A,0x2CA3,0x2CE7,0x2D38,
+0x2D98,0x2E0A,0x2E91,0x2F32,0x2FF2,0x30D5,0x31E4,0x3325,
+0x34A3,0x3669,0x3884,0x3B05,0x3DFF,0x4189,0x45BD,0x4ABC,
+0x50AD,0x57BB,0x601F,0x6A17,0x75F1,0x8406,0x94C3,0xA8A7,
+/* A:16 B:13 */
+0x2E76,0x2E93,0x2EB5,0x2EDD,0x2F0C,0x2F45,0x2F88,0x2FD8,
+0x3037,0x30A7,0x312D,0x31CD,0x328A,0x336B,0x3477,0x35B5,
+0x372E,0x38F0,0x3B05,0x3D80,0x4071,0x43F1,0x481A,0x4D0C,
+0x52EC,0x59E8,0x6235,0x6C12,0x77CB,0x85BB,0x964A,0xA9F9,
+/* A:16 B:14 */
+0x3199,0x31B5,0x31D7,0x31FE,0x322D,0x3265,0x32A7,0x32F6,
+0x3354,0x33C3,0x3447,0x34E5,0x35A0,0x367E,0x3786,0x38C0,
+0x3A35,0x3BF0,0x3DFF,0x4071,0x435A,0x46CE,0x4AEA,0x4FCB,
+0x5599,0x5C7E,0x64AF,0x6E6D,0x7A00,0x87C2,0x981B,0xAB8A,
+/* A:16 B:15 */
+0x3553,0x356F,0x3590,0x35B7,0x35E5,0x361C,0x365D,0x36AB,
+0x3707,0x3775,0x37F7,0x3892,0x394A,0x3A25,0x3B29,0x3C5E,
+0x3DCD,0x3F82,0x4189,0x43F1,0x46CE,0x4A36,0x4E41,0x530F,
+0x58C6,0x5F90,0x67A1,0x7139,0x7C9E,0x8A2A,0x9A44,0xAD67,
+/* A:16 B:16 */
+0x39C1,0x39DC,0x39FD,0x3A23,0x3A50,0x3A86,0x3AC6,0x3B12,
+0x3B6D,0x3BD9,0x3C59,0x3CF1,0x3DA5,0x3E7C,0x3F7B,0x40AB,
+0x4213,0x43C0,0x45BD,0x481A,0x4AEA,0x4E41,0x5239,0x56F1,
+0x5C8C,0x6336,0x6B22,0x748C,0x7FBC,0x8D08,0x9CD5,0xAF9D,
+/* A:16 B:17 */
+0x3F05,0x3F20,0x3F3F,0x3F64,0x3F91,0x3FC5,0x4004,0x404F,
+0x40A7,0x4110,0x418D,0x4222,0x42D3,0x43A5,0x449E,0x45C7,
+0x4727,0x48CA,0x4ABC,0x4D0C,0x4FCB,0x530F,0x56F1,0x5B8E,
+0x6109,0x678D,0x6F4B,0x787F,0x836F,0x906F,0x9FE2,0xB23F,
+/* A:16 B:18 */
+0x4547,0x4561,0x457F,0x45A3,0x45CF,0x4602,0x463F,0x4687,
+0x46DE,0x4744,0x47BE,0x484E,0x48FA,0x49C6,0x4AB9,0x4BDA,
+0x4D31,0x4EC8,0x50AD,0x52EC,0x5599,0x58C6,0x5C8C,0x6109,
+0x665E,0x6CB5,0x743D,0x7D31,0x87D5,0x947A,0xA382,0xB55F,
+/* A:16 B:19 */
+0x4CB7,0x4CCF,0x4CED,0x4D10,0x4D3A,0x4D6B,0x4DA6,0x4DED,
+0x4E40,0x4EA3,0x4F18,0x4FA4,0x504A,0x5110,0x51FB,0x5312,
+0x545D,0x55E7,0x57BB,0x59E8,0x5C7E,0x5F90,0x6336,0x678D,
+0x6CB5,0x72D5,0x7A1E,0x82C6,0x8D0F,0x9949,0xA7D1,0xB916,
+/* A:16 B:1a */
+0x558D,0x55A5,0x55C1,0x55E3,0x560B,0x563B,0x5673,0x56B6,
+0x5706,0x5765,0x57D6,0x585C,0x58FC,0x59B9,0x5A9A,0x5BA6,
+0x5CE4,0x5E5E,0x601F,0x6235,0x64AF,0x67A1,0x6B22,0x6F4B,
+0x743D,0x7A1E,0x811A,0x8968,0x9346,0x9F00,0xACF0,0xBD81,
+/* A:16 B:1b */
+0x600E,0x6025,0x6040,0x6060,0x6086,0x60B3,0x60E9,0x6128,
+0x6174,0x61CE,0x623A,0x62B9,0x6350,0x6404,0x64DA,0x65D8,
+0x6706,0x686D,0x6A17,0x6C12,0x6E6D,0x7139,0x748C,0x787F,
+0x7D31,0x82C6,0x8968,0x914A,0x9AA8,0xA5CB,0xB306,0xC2C1,
+/* A:16 B:1c */
+0x6C8A,0x6C9F,0x6CB9,0x6CD7,0x6CFA,0x6D24,0x6D57,0x6D93,
+0x6DDA,0x6E2E,0x6E92,0x6F0A,0x6F97,0x7040,0x7108,0x71F6,
+0x7311,0x7461,0x75F1,0x77CB,0x7A00,0x7C9E,0x7FBC,0x836F,
+0x87D5,0x8D0F,0x9346,0x9AA8,0xA36F,0xADDD,0xBA42,0xC8FE,
+/* A:16 B:1d */
+0x7B61,0x7B74,0x7B8B,0x7BA7,0x7BC8,0x7BEF,0x7C1D,0x7C54,
+0x7C95,0x7CE3,0x7D3F,0x7DAD,0x7E2F,0x7ECA,0x7F82,0x805D,
+0x8161,0x8296,0x8406,0x85BB,0x87C2,0x8A2A,0x8D08,0x906F,
+0x947A,0x9949,0x9F00,0xA5CB,0xADDD,0xB775,0xC2DB,0xD068,
+/* A:16 B:1e */
+0x8D03,0x8D15,0x8D29,0x8D42,0x8D5F,0x8D82,0x8DAC,0x8DDD,
+0x8E18,0x8E5D,0x8EB0,0x8F12,0x8F87,0x9012,0x90B7,0x917B,
+0x9264,0x9379,0x94C3,0x964A,0x981B,0x9A44,0x9CD5,0x9FE2,
+0xA382,0xA7D1,0xACF0,0xB306,0xBA42,0xC2DB,0xCD13,0xD938,
+/* A:16 B:1f */
+0xA1F8,0xA207,0xA219,0xA22F,0xA248,0xA266,0xA28A,0xA2B4,
+0xA2E7,0xA323,0xA36A,0xA3BF,0xA424,0xA49C,0xA52A,0xA5D3,
+0xA69C,0xA78B,0xA8A7,0xA9F9,0xAB8A,0xAD67,0xAF9D,0xB23F,
+0xB55F,0xB916,0xBD81,0xC2C1,0xC8FE,0xD068,0xD938,0xE3B1,
+/* A: 968D89C0 */
+/* A:17 B:00 */
+0x2453,0x2471,0x2494,0x24BD,0x24EF,0x252A,0x2570,0x25C3,
+0x2626,0x269B,0x2727,0x27CC,0x2892,0x297C,0x2A92,0x2BDD,
+0x2D67,0x2F3A,0x3166,0x33FB,0x370B,0x3AB0,0x3F05,0x442B,
+0x4A49,0x518E,0x5A33,0x6478,0x70AD,0x7F2E,0x906C,0xA4EA,
+/* A:17 B:01 */
+0x2471,0x248E,0x24B1,0x24DB,0x250C,0x2547,0x258D,0x25E0,
+0x2643,0x26B8,0x2744,0x27EA,0x28AF,0x2999,0x2AAF,0x2BFA,
+0x2D83,0x2F57,0x3182,0x3416,0x3727,0x3ACB,0x3F20,0x4445,
+0x4A62,0x51A7,0x5A4A,0x648E,0x70C1,0x7F42,0x907E,0xA4F9,
+/* A:17 B:02 */
+0x2494,0x24B1,0x24D4,0x24FE,0x252F,0x256A,0x25B0,0x2603,
+0x2666,0x26DB,0x2766,0x280C,0x28D1,0x29BB,0x2AD1,0x2C1C,
+0x2DA5,0x2F78,0x31A3,0x3437,0x3747,0x3AEB,0x3F3F,0x4463,
+0x4A80,0x51C4,0x5A66,0x64A8,0x70DA,0x7F58,0x9092,0xA50B,
+/* A:17 B:03 */
+0x24BD,0x24DB,0x24FE,0x2527,0x2559,0x2594,0x25D9,0x262C,
+0x268F,0x2704,0x2790,0x2835,0x28FA,0x29E4,0x2AFA,0x2C45,
+0x2DCD,0x2FA0,0x31CB,0x345E,0x376E,0x3B11,0x3F64,0x4488,
+0x4AA3,0x51E6,0x5A86,0x64C7,0x70F7,0x7F73,0x90AA,0xA51F,
+/* A:17 B:04 */
+0x24EF,0x250C,0x252F,0x2559,0x258A,0x25C5,0x260B,0x265E,
+0x26C0,0x2735,0x27C1,0x2866,0x292B,0x2A15,0x2B2A,0x2C75,
+0x2DFD,0x2FD0,0x31FA,0x348D,0x379C,0x3B3F,0x3F91,0x44B3,
+0x4ACE,0x520F,0x5AAE,0x64ED,0x711A,0x7F93,0x90C7,0xA538,
+/* A:17 B:05 */
+0x252A,0x2547,0x256A,0x2594,0x25C5,0x2600,0x2645,0x2698,
+0x26FB,0x2770,0x27FB,0x28A0,0x2965,0x2A4E,0x2B64,0x2CAE,
+0x2E36,0x3008,0x3232,0x34C4,0x37D2,0x3B74,0x3FC5,0x44E7,
+0x4B00,0x523F,0x5ADC,0x6519,0x7143,0x7FB9,0x90E9,0xA556,
+/* A:17 B:06 */
+0x2570,0x258D,0x25B0,0x25D9,0x260B,0x2645,0x268B,0x26DE,
+0x2740,0x27B5,0x2840,0x28E5,0x29AA,0x2A93,0x2BA8,0x2CF2,
+0x2E79,0x304B,0x3274,0x3506,0x3813,0x3BB4,0x4004,0x4524,
+0x4B3B,0x5279,0x5B13,0x654D,0x7175,0x7FE6,0x9111,0xA579,
+/* A:17 B:07 */
+0x25C3,0x25E0,0x2603,0x262C,0x265E,0x2698,0x26DE,0x2730,
+0x2793,0x2807,0x2892,0x2937,0x29FB,0x2AE4,0x2BF9,0x2D42,
+0x2ECA,0x309B,0x32C3,0x3554,0x3860,0x3C00,0x404F,0x456D,
+0x4B82,0x52BD,0x5B55,0x658C,0x71AF,0x801C,0x9141,0xA5A2,
+/* A:17 B:08 */
+0x2626,0x2643,0x2666,0x268F,0x26C0,0x26FB,0x2740,0x2793,
+0x27F5,0x2869,0x28F4,0x2999,0x2A5C,0x2B45,0x2C5A,0x2DA2,
+0x2F29,0x30F9,0x3321,0x35B1,0x38BC,0x3C5A,0x40A7,0x45C4,
+0x4BD7,0x530F,0x5BA3,0x65D6,0x71F4,0x805C,0x917B,0xA5D3,
+/* A:17 B:09 */
+0x269B,0x26B8,0x26DB,0x2704,0x2735,0x2770,0x27B5,0x2807,
+0x2869,0x28DE,0x2968,0x2A0D,0x2AD0,0x2BB8,0x2CCC,0x2E14,
+0x2F9A,0x316A,0x3390,0x361F,0x3929,0x3CC5,0x4110,0x462A,
+0x4C3B,0x536F,0x5C00,0x662E,0x7247,0x80A8,0x91BF,0xA60E,
+/* A:17 B:0a */
+0x2727,0x2744,0x2766,0x2790,0x27C1,0x27FB,0x2840,0x2892,
+0x28F4,0x2968,0x29F2,0x2A96,0x2B59,0x2C41,0x2D54,0x2E9C,
+0x3021,0x31EF,0x3415,0x36A2,0x39AA,0x3D45,0x418D,0x46A5,
+0x4CB2,0x53E2,0x5C6E,0x6697,0x72A9,0x8102,0x920F,0xA654,
+/* A:17 B:0b */
+0x27CC,0x27EA,0x280C,0x2835,0x2866,0x28A0,0x28E5,0x2937,
+0x2999,0x2A0D,0x2A96,0x2B3A,0x2BFC,0x2CE4,0x2DF6,0x2F3D,
+0x30C1,0x328E,0x34B2,0x373E,0x3A44,0x3DDC,0x4222,0x4736,
+0x4D3F,0x546B,0x5CF1,0x6713,0x731E,0x816D,0x9270,0xA6A7,
+/* A:17 B:0c */
+0x2892,0x28AF,0x28D1,0x28FA,0x292B,0x2965,0x29AA,0x29FB,
+0x2A5C,0x2AD0,0x2B59,0x2BFC,0x2CBE,0x2DA5,0x2EB7,0x2FFC,
+0x317F,0x334B,0x356D,0x37F7,0x3AFB,0x3E90,0x42D3,0x47E3,
+0x4DE7,0x550E,0x5D8D,0x67A7,0x73A8,0x81ED,0x92E2,0xA709,
+/* A:17 B:0d */
+0x297C,0x2999,0x29BB,0x29E4,0x2A15,0x2A4E,0x2A93,0x2AE4,
+0x2B45,0x2BB8,0x2C41,0x2CE4,0x2DA5,0x2E8A,0x2F9B,0x30E0,
+0x3261,0x342B,0x364C,0x38D3,0x3BD4,0x3F66,0x43A5,0x48B0,
+0x4EAF,0x55CF,0x5E46,0x6857,0x744D,0x8284,0x9369,0xA77E,
+/* A:17 B:0e */
+0x2A92,0x2AAF,0x2AD1,0x2AFA,0x2B2A,0x2B64,0x2BA8,0x2BF9,
+0x2C5A,0x2CCC,0x2D54,0x2DF6,0x2EB7,0x2F9B,0x30AB,0x31EE,
+0x336E,0x3536,0x3754,0x39D9,0x3CD6,0x4065,0x449E,0x49A4,
+0x4F9C,0x56B4,0x5F22,0x6928,0x7511,0x8338,0x940B,0xA809,
+/* A:17 B:0f */
+0x2BDD,0x2BFA,0x2C1C,0x2C45,0x2C75,0x2CAE,0x2CF2,0x2D42,
+0x2DA2,0x2E14,0x2E9C,0x2F3D,0x2FFC,0x30E0,0x31EE,0x332F,
+0x34AD,0x3673,0x388E,0x3B0F,0x3E09,0x4193,0x45C7,0x4AC6,
+0x50B6,0x57C5,0x6028,0x6A20,0x75F9,0x840E,0x94CA,0xA8AE,
+/* A:17 B:10 */
+0x2D67,0x2D83,0x2DA5,0x2DCD,0x2DFD,0x2E36,0x2E79,0x2ECA,
+0x2F29,0x2F9A,0x3021,0x30C1,0x317F,0x3261,0x336E,0x34AD,
+0x3629,0x37EC,0x3A04,0x3C81,0x3F76,0x42FA,0x4727,0x4C1F,
+0x5205,0x5909,0x615F,0x6B47,0x770E,0x850C,0x95AE,0xA973,
+/* A:17 B:11 */
+0x2F3A,0x2F57,0x2F78,0x2FA0,0x2FD0,0x3008,0x304B,0x309B,
+0x30F9,0x316A,0x31EF,0x328E,0x334B,0x342B,0x3536,0x3673,
+0x37EC,0x39AB,0x3BBF,0x3E38,0x4127,0x44A5,0x48CA,0x4DB8,
+0x5394,0x5A8A,0x62D0,0x6CA6,0x7856,0x863A,0x96BD,0xAA5C,
+/* A:17 B:12 */
+0x3166,0x3182,0x31A3,0x31CB,0x31FA,0x3232,0x3274,0x32C3,
+0x3321,0x3390,0x3415,0x34B2,0x356D,0x364C,0x3754,0x388E,
+0x3A04,0x3BBF,0x3DCF,0x4042,0x432B,0x46A0,0x4ABC,0x4F9F,
+0x556D,0x5C54,0x6488,0x6E47,0x79DD,0x87A1,0x97FF,0xAB72,
+/* A:17 B:13 */
+0x33FB,0x3416,0x3437,0x345E,0x348D,0x34C4,0x3506,0x3554,
+0x35B1,0x361F,0x36A2,0x373E,0x37F7,0x38D3,0x39D9,0x3B0F,
+0x3C81,0x3E38,0x4042,0x42AE,0x458F,0x48FB,0x4D0C,0x51E1,
+0x57A0,0x5E74,0x6691,0x7036,0x7BAD,0x894C,0x997D,0xACBB,
+/* A:17 B:14 */
+0x370B,0x3727,0x3747,0x376E,0x379C,0x37D2,0x3813,0x3860,
+0x38BC,0x3929,0x39AA,0x3A44,0x3AFB,0x3BD4,0x3CD6,0x3E09,
+0x3F76,0x4127,0x432B,0x458F,0x4867,0x4BC7,0x4FCB,0x5491,
+0x5A3D,0x60FB,0x68FE,0x7283,0x7DD4,0x8B47,0x9B44,0xAE43,
+/* A:17 B:15 */
+0x3AB0,0x3ACB,0x3AEB,0x3B11,0x3B3F,0x3B74,0x3BB4,0x3C00,
+0x3C5A,0x3CC5,0x3D45,0x3DDC,0x3E90,0x3F66,0x4065,0x4193,
+0x42FA,0x44A5,0x46A0,0x48FB,0x4BC7,0x4F1B,0x530F,0x57C2,
+0x5D58,0x63FB,0x6BDF,0x753F,0x8064,0x8DA2,0x9D60,0xB015,
+/* A:17 B:16 */
+0x3F05,0x3F20,0x3F3F,0x3F64,0x3F91,0x3FC5,0x4004,0x404F,
+0x40A7,0x4110,0x418D,0x4222,0x42D3,0x43A5,0x449E,0x45C7,
+0x4727,0x48CA,0x4ABC,0x4D0C,0x4FCB,0x530F,0x56F1,0x5B8E,
+0x6109,0x678D,0x6F4B,0x787F,0x836F,0x906F,0x9FE2,0xB23F,
+/* A:17 B:17 */
+0x442B,0x4445,0x4463,0x4488,0x44B3,0x44E7,0x4524,0x456D,
+0x45C4,0x462A,0x46A5,0x4736,0x47E3,0x48B0,0x49A4,0x4AC6,
+0x4C1F,0x4DB8,0x4F9F,0x51E1,0x5491,0x57C2,0x5B8E,0x6010,
+0x656C,0x6BCA,0x735C,0x7C5C,0x870D,0x93C2,0xA2DD,0xB4D1,
+/* A:17 B:18 */
+0x4A49,0x4A62,0x4A80,0x4AA3,0x4ACE,0x4B00,0x4B3B,0x4B82,
+0x4BD7,0x4C3B,0x4CB2,0x4D3F,0x4DE7,0x4EAF,0x4F9C,0x50B6,
+0x5205,0x5394,0x556D,0x57A0,0x5A3D,0x5D58,0x6109,0x656C,
+0x6AA2,0x70D5,0x7832,0x80F3,0x8B5A,0x97B6,0xA668,0xB7DF,
+/* A:17 B:19 */
+0x518E,0x51A7,0x51C4,0x51E6,0x520F,0x523F,0x5279,0x52BD,
+0x530F,0x536F,0x53E2,0x546B,0x550E,0x55CF,0x56B4,0x57C5,
+0x5909,0x5A8A,0x5C54,0x5E74,0x60FB,0x63FB,0x678D,0x6BCA,
+0x70D5,0x76D2,0x7DF1,0x8667,0x9076,0x9C69,0xAA9E,0xBB80,
+/* A:17 B:1a */
+0x5A33,0x5A4A,0x5A66,0x5A86,0x5AAE,0x5ADC,0x5B13,0x5B55,
+0x5BA3,0x5C00,0x5C6E,0x5CF1,0x5D8D,0x5E46,0x5F22,0x6028,
+0x615F,0x62D0,0x6488,0x6691,0x68FE,0x6BDF,0x6F4B,0x735C,
+0x7832,0x7DF1,0x84C5,0x8CE3,0x9688,0xA1FF,0xAF9F,0xBFD1,
+/* A:17 B:1b */
+0x6478,0x648E,0x64A8,0x64C7,0x64ED,0x6519,0x654D,0x658C,
+0x65D6,0x662E,0x6697,0x6713,0x67A7,0x6857,0x6928,0x6A20,
+0x6B47,0x6CA6,0x6E47,0x7036,0x7283,0x753F,0x787F,0x7C5C,
+0x80F3,0x8667,0x8CE3,0x9497,0x9DC0,0xA8A2,0xB592,0xC4F1,
+/* A:17 B:1c */
+0x70AD,0x70C1,0x70DA,0x70F7,0x711A,0x7143,0x7175,0x71AF,
+0x71F4,0x7247,0x72A9,0x731E,0x73A8,0x744D,0x7511,0x75F9,
+0x770E,0x7856,0x79DD,0x7BAD,0x7DD4,0x8064,0x836F,0x870D,
+0x8B5A,0x9076,0x9688,0x9DC0,0xA654,0xB085,0xBCA3,0xCB0A,
+/* A:17 B:1d */
+0x7F2E,0x7F42,0x7F58,0x7F73,0x7F93,0x7FB9,0x7FE6,0x801C,
+0x805C,0x80A8,0x8102,0x816D,0x81ED,0x8284,0x8338,0x840E,
+0x850C,0x863A,0x87A1,0x894C,0x8B47,0x8DA2,0x906F,0x93C2,
+0x97B6,0x9C69,0xA1FF,0xA8A2,0xB085,0xB9E5,0xC50A,0xD248,
+/* A:17 B:1e */
+0x906C,0x907E,0x9092,0x90AA,0x90C7,0x90E9,0x9111,0x9141,
+0x917B,0x91BF,0x920F,0x9270,0x92E2,0x9369,0x940B,0x94CA,
+0x95AE,0x96BD,0x97FF,0x997D,0x9B44,0x9D60,0x9FE2,0xA2DD,
+0xA668,0xAA9E,0xAF9F,0xB592,0xBCA3,0xC50A,0xCF06,0xDAE4,
+/* A:17 B:1f */
+0xA4EA,0xA4F9,0xA50B,0xA51F,0xA538,0xA556,0xA579,0xA5A2,
+0xA5D3,0xA60E,0xA654,0xA6A7,0xA709,0xA77E,0xA809,0xA8AE,
+0xA973,0xAA5C,0xAB72,0xACBB,0xAE43,0xB015,0xB23F,0xB4D1,
+0xB7DF,0xBB80,0xBFD1,0xC4F1,0xCB0A,0xD248,0xDAE4,0xE51F,
+/* A: 968D89C0 */
+/* A:18 B:00 */
+0x2B4E,0x2B6A,0x2B8D,0x2BB5,0x2BE5,0x2C1E,0x2C63,0x2CB3,
+0x2D14,0x2D86,0x2E0E,0x2EAF,0x2F6F,0x3053,0x3162,0x32A4,
+0x3423,0x35EA,0x3806,0x3A89,0x3D84,0x4110,0x4547,0x4A49,
+0x503D,0x5750,0x5FB8,0x69B6,0x7597,0x83B4,0x947B,0xA86B,
+/* A:18 B:01 */
+0x2B6A,0x2B87,0x2BA9,0x2BD2,0x2C02,0x2C3B,0x2C7F,0x2CD0,
+0x2D30,0x2DA2,0x2E2A,0x2ECB,0x2F8B,0x306F,0x317E,0x32C0,
+0x343E,0x3605,0x3821,0x3AA4,0x3D9F,0x412A,0x4561,0x4A62,
+0x5055,0x5767,0x5FCF,0x69CC,0x75AB,0x83C6,0x948B,0xA879,
+/* A:18 B:02 */
+0x2B8D,0x2BA9,0x2BCB,0x2BF4,0x2C24,0x2C5D,0x2CA1,0x2CF2,
+0x2D52,0x2DC4,0x2E4C,0x2EED,0x2FAD,0x3090,0x319F,0x32E1,
+0x345F,0x3626,0x3842,0x3AC4,0x3DBF,0x4149,0x457F,0x4A80,
+0x5072,0x5783,0x5FEA,0x69E5,0x75C3,0x83DD,0x949F,0xA88A,
+/* A:18 B:03 */
+0x2BB5,0x2BD2,0x2BF4,0x2C1C,0x2C4C,0x2C86,0x2CC9,0x2D1A,
+0x2D7A,0x2DEC,0x2E74,0x2F15,0x2FD5,0x30B8,0x31C7,0x3308,
+0x3486,0x364D,0x3868,0x3AEA,0x3DE4,0x416E,0x45A3,0x4AA3,
+0x5095,0x57A5,0x600A,0x6A04,0x75DF,0x83F7,0x94B6,0xA89E,
+/* A:18 B:04 */
+0x2BE5,0x2C02,0x2C24,0x2C4C,0x2C7C,0x2CB6,0x2CF9,0x2D4A,
+0x2DAA,0x2E1C,0x2EA4,0x2F45,0x3004,0x30E7,0x31F6,0x3337,
+0x34B5,0x367B,0x3896,0x3B17,0x3E11,0x419A,0x45CF,0x4ACE,
+0x50BE,0x57CD,0x6030,0x6A28,0x7601,0x8416,0x94D2,0xA8B6,
+/* A:18 B:05 */
+0x2C1E,0x2C3B,0x2C5D,0x2C86,0x2CB6,0x2CEF,0x2D32,0x2D83,
+0x2DE3,0x2E55,0x2EDC,0x2F7D,0x303C,0x3120,0x322E,0x336F,
+0x34EC,0x36B2,0x38CC,0x3B4D,0x3E46,0x41CF,0x4602,0x4B00,
+0x50EF,0x57FC,0x605D,0x6A53,0x7629,0x843B,0x94F3,0xA8D3,
+/* A:18 B:06 */
+0x2C63,0x2C7F,0x2CA1,0x2CC9,0x2CF9,0x2D32,0x2D76,0x2DC7,
+0x2E27,0x2E98,0x2F20,0x2FC0,0x307F,0x3162,0x3270,0x33B1,
+0x352E,0x36F3,0x390D,0x3B8D,0x3E85,0x420D,0x463F,0x4B3B,
+0x5129,0x5834,0x6093,0x6A86,0x7659,0x8467,0x951B,0xA8F5,
+/* A:18 B:07 */
+0x2CB3,0x2CD0,0x2CF2,0x2D1A,0x2D4A,0x2D83,0x2DC7,0x2E17,
+0x2E77,0x2EE8,0x2F70,0x3010,0x30CF,0x31B1,0x32BF,0x33FF,
+0x357C,0x3740,0x395A,0x3BD9,0x3ED0,0x4257,0x4687,0x4B82,
+0x516E,0x5876,0x60D3,0x6AC3,0x7692,0x849B,0x954A,0xA91D,
+/* A:18 B:08 */
+0x2D14,0x2D30,0x2D52,0x2D7A,0x2DAA,0x2DE3,0x2E27,0x2E77,
+0x2ED6,0x2F48,0x2FCF,0x306F,0x312D,0x3210,0x331D,0x345C,
+0x35D9,0x379C,0x39B5,0x3C33,0x3F29,0x42AE,0x46DE,0x4BD7,
+0x51BF,0x58C6,0x611F,0x6B0B,0x76D5,0x84D9,0x9581,0xA94D,
+/* A:18 B:09 */
+0x2D86,0x2DA2,0x2DC4,0x2DEC,0x2E1C,0x2E55,0x2E98,0x2EE8,
+0x2F48,0x2FB9,0x3040,0x30E0,0x319E,0x3280,0x338C,0x34CB,
+0x3647,0x380A,0x3A21,0x3C9E,0x3F93,0x4317,0x4744,0x4C3B,
+0x5221,0x5924,0x6179,0x6B60,0x7726,0x8523,0x95C3,0xA986,
+/* A:18 B:0a */
+0x2E0E,0x2E2A,0x2E4C,0x2E74,0x2EA4,0x2EDC,0x2F20,0x2F70,
+0x2FCF,0x3040,0x30C6,0x3166,0x3223,0x3305,0x3411,0x354F,
+0x36CA,0x388C,0x3AA2,0x3D1E,0x4011,0x4393,0x47BE,0x4CB2,
+0x5295,0x5994,0x61E4,0x6BC6,0x7785,0x857B,0x9612,0xA9CA,
+/* A:18 B:0b */
+0x2EAF,0x2ECB,0x2EED,0x2F15,0x2F45,0x2F7D,0x2FC0,0x3010,
+0x306F,0x30E0,0x3166,0x3205,0x32C2,0x33A3,0x34AE,0x35EC,
+0x3765,0x3926,0x3B3C,0x3DB5,0x40A7,0x4426,0x484E,0x4D3F,
+0x531E,0x5A19,0x6264,0x6C3F,0x77F6,0x85E3,0x966F,0xAA1A,
+/* A:18 B:0c */
+0x2F6F,0x2F8B,0x2FAD,0x2FD5,0x3004,0x303C,0x307F,0x30CF,
+0x312D,0x319E,0x3223,0x32C2,0x337F,0x345F,0x3569,0x36A6,
+0x381E,0x39DE,0x3BF2,0x3E6A,0x4159,0x44D5,0x48FA,0x4DE7,
+0x53C2,0x5AB7,0x62FB,0x6CCF,0x787D,0x865F,0x96DE,0xAA7A,
+/* A:18 B:0d */
+0x3053,0x306F,0x3090,0x30B8,0x30E7,0x3120,0x3162,0x31B1,
+0x3210,0x3280,0x3305,0x33A3,0x345F,0x353E,0x3648,0x3783,
+0x38FA,0x3AB8,0x3CCA,0x3F40,0x422C,0x45A5,0x49C6,0x4EAF,
+0x5484,0x5B72,0x63AF,0x6D7A,0x791D,0x86F2,0x9762,0xAAEC,
+/* A:18 B:0e */
+0x3162,0x317E,0x319F,0x31C7,0x31F6,0x322E,0x3270,0x32BF,
+0x331D,0x338C,0x3411,0x34AE,0x3569,0x3648,0x3750,0x388A,
+0x3A00,0x3BBC,0x3DCB,0x403E,0x4327,0x469D,0x4AB9,0x4F9C,
+0x556B,0x5C52,0x6486,0x6E45,0x79DC,0x87A1,0x97FF,0xAB73,
+/* A:18 B:0f */
+0x32A4,0x32C0,0x32E1,0x3308,0x3337,0x336F,0x33B1,0x33FF,
+0x345C,0x34CB,0x354F,0x35EC,0x36A6,0x3783,0x388A,0x39C3,
+0x3B36,0x3CF0,0x3EFD,0x416C,0x4452,0x47C3,0x4BDA,0x50B6,
+0x567D,0x5D5B,0x6584,0x6F37,0x7ABE,0x8871,0x98B9,0xAC13,
+/* A:18 B:10 */
+0x3423,0x343E,0x345F,0x3486,0x34B5,0x34EC,0x352E,0x357C,
+0x35D9,0x3647,0x36CA,0x3765,0x381E,0x38FA,0x3A00,0x3B36,
+0x3CA8,0x3E5E,0x4068,0x42D4,0x45B4,0x4920,0x4D31,0x5205,
+0x57C3,0x5E96,0x66B2,0x7056,0x7BCB,0x8968,0x9997,0xACD2,
+/* A:18 B:11 */
+0x35EA,0x3605,0x3626,0x364D,0x367B,0x36B2,0x36F3,0x3740,
+0x379C,0x380A,0x388C,0x3926,0x39DE,0x3AB8,0x3BBC,0x3CF0,
+0x3E5E,0x4012,0x4218,0x447F,0x475A,0x4ABF,0x4EC8,0x5394,
+0x5947,0x600D,0x681A,0x71AB,0x7D0A,0x8A8E,0x9A9E,0xADB5,
+/* A:18 B:12 */
+0x3806,0x3821,0x3842,0x3868,0x3896,0x38CC,0x390D,0x395A,
+0x39B5,0x3A21,0x3AA2,0x3B3C,0x3BF2,0x3CCA,0x3DCB,0x3EFD,
+0x4068,0x4218,0x4419,0x467B,0x494F,0x4CAD,0x50AD,0x556D,
+0x5B13,0x61CA,0x69C5,0x7341,0x7E86,0x8BEB,0x9BD7,0xAEC3,
+/* A:18 B:13 */
+0x3A89,0x3AA4,0x3AC4,0x3AEA,0x3B17,0x3B4D,0x3B8D,0x3BD9,
+0x3C33,0x3C9E,0x3D1E,0x3DB5,0x3E6A,0x3F40,0x403E,0x416C,
+0x42D4,0x447F,0x467B,0x48D6,0x4BA3,0x4EF7,0x52EC,0x57A0,
+0x5D37,0x63DB,0x6BC0,0x7522,0x8049,0x8D8A,0x9D4B,0xB003,
+/* A:18 B:14 */
+0x3D84,0x3D9F,0x3DBF,0x3DE4,0x3E11,0x3E46,0x3E85,0x3ED0,
+0x3F29,0x3F93,0x4011,0x40A7,0x4159,0x422C,0x4327,0x4452,
+0x45B4,0x475A,0x494F,0x4BA3,0x4E67,0x51B0,0x5599,0x5A3D,
+0x5FC2,0x6650,0x6E1C,0x775F,0x8262,0x8F77,0x9F05,0xB180,
+/* A:18 B:15 */
+0x4110,0x412A,0x4149,0x416E,0x419A,0x41CF,0x420D,0x4257,
+0x42AE,0x4317,0x4393,0x4426,0x44D5,0x45A5,0x469D,0x47C3,
+0x4920,0x4ABF,0x4CAD,0x4EF7,0x51B0,0x54ED,0x58C6,0x5D58,
+0x62C7,0x693C,0x70E9,0x7A08,0x84DF,0x91C2,0xA112,0xB345,
+/* A:18 B:16 */
+0x4547,0x4561,0x457F,0x45A3,0x45CF,0x4602,0x463F,0x4687,
+0x46DE,0x4744,0x47BE,0x484E,0x48FA,0x49C6,0x4AB9,0x4BDA,
+0x4D31,0x4EC8,0x50AD,0x52EC,0x5599,0x58C6,0x5C8C,0x6109,
+0x665E,0x6CB5,0x743D,0x7D31,0x87D5,0x947A,0xA382,0xB55F,
+/* A:18 B:17 */
+0x4A49,0x4A62,0x4A80,0x4AA3,0x4ACE,0x4B00,0x4B3B,0x4B82,
+0x4BD7,0x4C3B,0x4CB2,0x4D3F,0x4DE7,0x4EAF,0x4F9C,0x50B6,
+0x5205,0x5394,0x556D,0x57A0,0x5A3D,0x5D58,0x6109,0x656C,
+0x6AA2,0x70D5,0x7832,0x80F3,0x8B5A,0x97B6,0xA668,0xB7DF,
+/* A:18 B:18 */
+0x503D,0x5055,0x5072,0x5095,0x50BE,0x50EF,0x5129,0x516E,
+0x51BF,0x5221,0x5295,0x531E,0x53C2,0x5484,0x556B,0x567D,
+0x57C3,0x5947,0x5B13,0x5D37,0x5FC2,0x62C7,0x665E,0x6AA2,
+0x6FB5,0x75BC,0x7CE6,0x8569,0x8F88,0x9B8F,0xA9DA,0xBAD7,
+/* A:18 B:19 */
+0x5750,0x5767,0x5783,0x57A5,0x57CD,0x57FC,0x5834,0x5876,
+0x58C6,0x5924,0x5994,0x5A19,0x5AB7,0x5B72,0x5C52,0x5D5B,
+0x5E96,0x600D,0x61CA,0x63DB,0x6650,0x693C,0x6CB5,0x70D5,
+0x75BC,0x7B90,0x827C,0x8AB8,0x9480,0xA020,0xADF2,0xBE5E,
+/* A:18 B:1a */
+0x5FB8,0x5FCF,0x5FEA,0x600A,0x6030,0x605D,0x6093,0x60D3,
+0x611F,0x6179,0x61E4,0x6264,0x62FB,0x63AF,0x6486,0x6584,
+0x66B2,0x681A,0x69C5,0x6BC0,0x6E1C,0x70E9,0x743D,0x7832,
+0x7CE6,0x827C,0x8921,0x9106,0x9A68,0xA58E,0xB2CF,0xC28F,
+/* A:18 B:1b */
+0x69B6,0x69CC,0x69E5,0x6A04,0x6A28,0x6A53,0x6A86,0x6AC3,
+0x6B0B,0x6B60,0x6BC6,0x6C3F,0x6CCF,0x6D7A,0x6E45,0x6F37,
+0x7056,0x71AB,0x7341,0x7522,0x775F,0x7A08,0x7D31,0x80F3,
+0x8569,0x8AB8,0x9106,0x9884,0xA16D,0xAC03,0xB897,0xC78B,
+/* A:18 B:1c */
+0x7597,0x75AB,0x75C3,0x75DF,0x7601,0x7629,0x7659,0x7692,
+0x76D5,0x7726,0x7785,0x77F6,0x787D,0x791D,0x79DC,0x7ABE,
+0x7BCB,0x7D0A,0x7E86,0x8049,0x8262,0x84DF,0x87D5,0x8B5A,
+0x8F88,0x9480,0x9A68,0xA16D,0xA9C4,0xB3AE,0xBF77,0xCD78,
+/* A:18 B:1d */
+0x83B4,0x83C6,0x83DD,0x83F7,0x8416,0x843B,0x8467,0x849B,
+0x84D9,0x8523,0x857B,0x85E3,0x865F,0x86F2,0x87A1,0x8871,
+0x8968,0x8A8E,0x8BEB,0x8D8A,0x8F77,0x91C2,0x947A,0x97B6,
+0x9B8F,0xA020,0xA58E,0xAC03,0xB3AE,0xBCCC,0xC7A2,0xD482,
+/* A:18 B:1e */
+0x947B,0x948B,0x949F,0x94B6,0x94D2,0x94F3,0x951B,0x954A,
+0x9581,0x95C3,0x9612,0x966F,0x96DE,0x9762,0x97FF,0x98B9,
+0x9997,0x9A9E,0x9BD7,0x9D4B,0x9F05,0xA112,0xA382,0xA668,
+0xA9DA,0xADF2,0xB2CF,0xB897,0xBF77,0xC7A2,0xD157,0xDCE0,
+/* A:18 B:1f */
+0xA86B,0xA879,0xA88A,0xA89E,0xA8B6,0xA8D3,0xA8F5,0xA91D,
+0xA94D,0xA986,0xA9CA,0xAA1A,0xAA7A,0xAAEC,0xAB73,0xAC13,
+0xACD2,0xADB5,0xAEC3,0xB003,0xB180,0xB345,0xB55F,0xB7DF,
+0xBAD7,0xBE5E,0xC28F,0xC78B,0xCD78,0xD482,0xDCE0,0xE6D2,
+/* A: 968D89C0 */
+/* A:19 B:00 */
+0x3399,0x33B5,0x33D6,0x33FD,0x342C,0x3463,0x34A5,0x34F3,
+0x3550,0x35BF,0x3642,0x36DE,0x3797,0x3874,0x397A,0x3AB1,
+0x3C23,0x3DDB,0x3FE6,0x4253,0x4536,0x48A3,0x4CB7,0x518E,
+0x5750,0x5E27,0x6648,0x6FF2,0x7B6E,0x8914,0x994C,0xAC94,
+/* A:19 B:01 */
+0x33B5,0x33D1,0x33F2,0x3419,0x3447,0x347F,0x34C0,0x350F,
+0x356C,0x35DA,0x365D,0x36F9,0x37B3,0x388F,0x3995,0x3ACC,
+0x3C3E,0x3DF6,0x4000,0x426D,0x4550,0x48BD,0x4CCF,0x51A7,
+0x5767,0x5E3E,0x665E,0x7007,0x7B81,0x8926,0x995C,0xACA2,
+/* A:19 B:02 */
+0x33D6,0x33F2,0x3413,0x343A,0x3468,0x34A0,0x34E1,0x352F,
+0x358C,0x35FB,0x367E,0x371A,0x37D3,0x38AF,0x39B5,0x3AEC,
+0x3C5E,0x3E15,0x4020,0x428C,0x456E,0x48DB,0x4CED,0x51C4,
+0x5783,0x5E59,0x6678,0x701F,0x7B98,0x893B,0x996F,0xACB2,
+/* A:19 B:03 */
+0x33FD,0x3419,0x343A,0x3461,0x348F,0x34C7,0x3508,0x3556,
+0x35B3,0x3622,0x36A5,0x3740,0x37FA,0x38D6,0x39DB,0x3B12,
+0x3C84,0x3E3B,0x4045,0x42B1,0x4592,0x48FF,0x4D10,0x51E6,
+0x57A5,0x5E79,0x6697,0x703D,0x7BB4,0x8954,0x9986,0xACC5,
+/* A:19 B:04 */
+0x342C,0x3447,0x3468,0x348F,0x34BE,0x34F5,0x3537,0x3585,
+0x35E2,0x3650,0x36D3,0x376E,0x3828,0x3903,0x3A09,0x3B40,
+0x3CB1,0x3E68,0x4071,0x42DD,0x45BE,0x4929,0x4D3A,0x520F,
+0x57CD,0x5EA0,0x66BC,0x7060,0x7BD4,0x8972,0x99A1,0xACDD,
+/* A:19 B:05 */
+0x3463,0x347F,0x34A0,0x34C7,0x34F5,0x352C,0x356E,0x35BC,
+0x3619,0x3687,0x370A,0x37A5,0x385E,0x393A,0x3A3F,0x3B75,
+0x3CE6,0x3E9D,0x40A6,0x4311,0x45F1,0x495C,0x4D6B,0x523F,
+0x57FC,0x5ECD,0x66E8,0x7089,0x7BFB,0x8996,0x99C1,0xACF8,
+/* A:19 B:06 */
+0x34A5,0x34C0,0x34E1,0x3508,0x3537,0x356E,0x35AF,0x35FD,
+0x365A,0x36C8,0x374B,0x37E6,0x389F,0x397A,0x3A7F,0x3BB5,
+0x3D26,0x3EDC,0x40E4,0x434F,0x462E,0x4998,0x4DA6,0x5279,
+0x5834,0x5F03,0x671C,0x70BA,0x7C2A,0x89C0,0x99E7,0xAD19,
+/* A:19 B:07 */
+0x34F3,0x350F,0x352F,0x3556,0x3585,0x35BC,0x35FD,0x364B,
+0x36A8,0x3715,0x3798,0x3833,0x38EC,0x39C7,0x3ACB,0x3C01,
+0x3D71,0x3F26,0x412E,0x4398,0x4677,0x49DF,0x4DED,0x52BD,
+0x5876,0x5F44,0x6759,0x70F5,0x7C60,0x89F3,0x9A14,0xAD40,
+/* A:19 B:08 */
+0x3550,0x356C,0x358C,0x35B3,0x35E2,0x3619,0x365A,0x36A8,
+0x3704,0x3772,0x37F4,0x388F,0x3947,0x3A22,0x3B26,0x3C5B,
+0x3DCB,0x3F7F,0x4187,0x43EF,0x46CD,0x4A34,0x4E40,0x530F,
+0x58C6,0x5F90,0x67A3,0x713B,0x7CA2,0x8A2F,0x9A4A,0xAD6E,
+/* A:19 B:09 */
+0x35BF,0x35DA,0x35FB,0x3622,0x3650,0x3687,0x36C8,0x3715,
+0x3772,0x37DF,0x3861,0x38FC,0x39B4,0x3A8E,0x3B92,0x3CC7,
+0x3E35,0x3FE9,0x41EF,0x4457,0x4733,0x4A99,0x4EA3,0x536F,
+0x5924,0x5FEB,0x67FA,0x718E,0x7CEF,0x8A76,0x9A8A,0xADA5,
+/* A:19 B:0a */
+0x3642,0x365D,0x367E,0x36A5,0x36D3,0x370A,0x374B,0x3798,
+0x37F4,0x3861,0x38E3,0x397D,0x3A35,0x3B0F,0x3C12,0x3D46,
+0x3EB4,0x4067,0x426C,0x44D3,0x47AD,0x4B11,0x4F18,0x53E2,
+0x5994,0x6057,0x6862,0x71F0,0x7D4B,0x8ACB,0x9AD6,0xADE7,
+/* A:19 B:0b */
+0x36DE,0x36F9,0x371A,0x3740,0x376E,0x37A5,0x37E6,0x3833,
+0x388F,0x38FC,0x397D,0x3A17,0x3ACE,0x3BA8,0x3CAA,0x3DDD,
+0x3F4B,0x40FC,0x4300,0x4565,0x483D,0x4B9F,0x4FA4,0x546B,
+0x5A19,0x60D8,0x68DD,0x7265,0x7DB9,0x8B30,0x9B30,0xAE35,
+/* A:19 B:0c */
+0x3797,0x37B3,0x37D3,0x37FA,0x3828,0x385E,0x389F,0x38EC,
+0x3947,0x39B4,0x3A35,0x3ACE,0x3B85,0x3C5E,0x3D5F,0x3E91,
+0x3FFD,0x41AE,0x43B0,0x4613,0x48E9,0x4C49,0x504A,0x550E,
+0x5AB7,0x6171,0x696F,0x72F0,0x7E3B,0x8BA7,0x9B9B,0xAE91,
+/* A:19 B:0d */
+0x3874,0x388F,0x38AF,0x38D6,0x3903,0x393A,0x397A,0x39C7,
+0x3A22,0x3A8E,0x3B0F,0x3BA8,0x3C5E,0x3D36,0x3E36,0x3F67,
+0x40D2,0x4281,0x4481,0x46E2,0x49B6,0x4D12,0x5110,0x55CF,
+0x5B72,0x6226,0x6A1E,0x7395,0x7ED6,0x8C36,0x9C1B,0xAEFF,
+/* A:19 B:0e */
+0x397A,0x3995,0x39B5,0x39DB,0x3A09,0x3A3F,0x3A7F,0x3ACB,
+0x3B26,0x3B92,0x3C12,0x3CAA,0x3D5F,0x3E36,0x3F36,0x4066,
+0x41CF,0x437C,0x457A,0x47D8,0x4AA9,0x4E01,0x51FB,0x56B4,
+0x5C52,0x62FE,0x6AED,0x745A,0x7F8E,0x8CDF,0x9CB2,0xAF81,
+/* A:19 B:0f */
+0x3AB1,0x3ACC,0x3AEC,0x3B12,0x3B40,0x3B75,0x3BB5,0x3C01,
+0x3C5B,0x3CC7,0x3D46,0x3DDD,0x3E91,0x3F67,0x4066,0x4194,
+0x42FB,0x44A6,0x46A2,0x48FD,0x4BC9,0x4F1D,0x5312,0x57C5,
+0x5D5B,0x63FE,0x6BE2,0x7543,0x8069,0x8DA8,0x9D66,0xB01C,
+/* A:19 B:10 */
+0x3C23,0x3C3E,0x3C5E,0x3C84,0x3CB1,0x3CE6,0x3D26,0x3D71,
+0x3DCB,0x3E35,0x3EB4,0x3F4B,0x3FFD,0x40D2,0x41CF,0x42FB,
+0x4460,0x4608,0x4801,0x4A58,0x4D20,0x506F,0x545D,0x5909,
+0x5E96,0x652F,0x6D07,0x7659,0x816C,0x8E97,0x9E3C,0xB0D5,
+/* A:19 B:11 */
+0x3DDB,0x3DF6,0x3E15,0x3E3B,0x3E68,0x3E9D,0x3EDC,0x3F26,
+0x3F7F,0x3FE9,0x4067,0x40FC,0x41AE,0x4281,0x437C,0x44A6,
+0x4608,0x47AE,0x49A2,0x4BF5,0x4EB8,0x5200,0x55E7,0x5A8A,
+0x600D,0x6699,0x6E62,0x77A2,0x82A1,0x8FB3,0x9F3A,0xB1B0,
+/* A:19 B:12 */
+0x3FE6,0x4000,0x4020,0x4045,0x4071,0x40A6,0x40E4,0x412E,
+0x4187,0x41EF,0x426C,0x4300,0x43B0,0x4481,0x457A,0x46A2,
+0x4801,0x49A2,0x4B92,0x4DE0,0x509D,0x53DE,0x57BB,0x5C54,
+0x61CA,0x6848,0x6FFF,0x792A,0x8410,0x9104,0xA069,0xB2B4,
+/* A:19 B:13 */
+0x4253,0x426D,0x428C,0x42B1,0x42DD,0x4311,0x434F,0x4398,
+0x43EF,0x4457,0x44D3,0x4565,0x4613,0x46E2,0x47D8,0x48FD,
+0x4A58,0x4BF5,0x4DE0,0x5027,0x52DD,0x5615,0x59E8,0x5E74,
+0x63DB,0x6A48,0x71EA,0x7AFC,0x85C4,0x9295,0xA1D0,0xB3EA,
+/* A:19 B:14 */
+0x4536,0x4550,0x456E,0x4592,0x45BE,0x45F1,0x462E,0x4677,
+0x46CD,0x4733,0x47AD,0x483D,0x48E9,0x49B6,0x4AA9,0x4BC9,
+0x4D20,0x4EB8,0x509D,0x52DD,0x5589,0x58B7,0x5C7E,0x60FB,
+0x6650,0x6CA8,0x7431,0x7D26,0x87CB,0x9472,0xA37B,0xB55A,
+/* A:19 B:15 */
+0x48A3,0x48BD,0x48DB,0x48FF,0x4929,0x495C,0x4998,0x49DF,
+0x4A34,0x4A99,0x4B11,0x4B9F,0x4C49,0x4D12,0x4E01,0x4F1D,
+0x506F,0x5200,0x53DE,0x5615,0x58B7,0x5BD8,0x5F90,0x63FB,
+0x693C,0x6F7A,0x76E6,0x7FB8,0x8A33,0x96A8,0xA576,0xB70F,
+/* A:19 B:16 */
+0x4CB7,0x4CCF,0x4CED,0x4D10,0x4D3A,0x4D6B,0x4DA6,0x4DED,
+0x4E40,0x4EA3,0x4F18,0x4FA4,0x504A,0x5110,0x51FB,0x5312,
+0x545D,0x55E7,0x57BB,0x59E8,0x5C7E,0x5F90,0x6336,0x678D,
+0x6CB5,0x72D5,0x7A1E,0x82C6,0x8D0F,0x9949,0xA7D1,0xB916,
+/* A:19 B:17 */
+0x518E,0x51A7,0x51C4,0x51E6,0x520F,0x523F,0x5279,0x52BD,
+0x530F,0x536F,0x53E2,0x546B,0x550E,0x55CF,0x56B4,0x57C5,
+0x5909,0x5A8A,0x5C54,0x5E74,0x60FB,0x63FB,0x678D,0x6BCA,
+0x70D5,0x76D2,0x7DF1,0x8667,0x9076,0x9C69,0xAA9E,0xBB80,
+/* A:19 B:18 */
+0x5750,0x5767,0x5783,0x57A5,0x57CD,0x57FC,0x5834,0x5876,
+0x58C6,0x5924,0x5994,0x5A19,0x5AB7,0x5B72,0x5C52,0x5D5B,
+0x5E96,0x600D,0x61CA,0x63DB,0x6650,0x693C,0x6CB5,0x70D5,
+0x75BC,0x7B90,0x827C,0x8AB8,0x9480,0xA020,0xADF2,0xBE5E,
+/* A:19 B:19 */
+0x5E27,0x5E3E,0x5E59,0x5E79,0x5EA0,0x5ECD,0x5F03,0x5F44,
+0x5F90,0x5FEB,0x6057,0x60D8,0x6171,0x6226,0x62FE,0x63FE,
+0x652F,0x6699,0x6848,0x6A48,0x6CA8,0x6F7A,0x72D5,0x76D2,
+0x7B90,0x8132,0x87E3,0x8FD8,0x994D,0xA48A,0xB1E6,0xC1C6,
+/* A:19 B:1a */
+0x6648,0x665E,0x6678,0x6697,0x66BC,0x66E8,0x671C,0x6759,
+0x67A3,0x67FA,0x6862,0x68DD,0x696F,0x6A1E,0x6AED,0x6BE2,
+0x6D07,0x6E62,0x6FFF,0x71EA,0x7431,0x76E6,0x7A1E,0x7DF1,
+0x827C,0x87E3,0x8E4F,0x95F1,0x9F02,0xA9CA,0xB699,0xC5D3,
+/* A:19 B:1b */
+0x6FF2,0x7007,0x701F,0x703D,0x7060,0x7089,0x70BA,0x70F5,
+0x713B,0x718E,0x71F0,0x7265,0x72F0,0x7395,0x745A,0x7543,
+0x7659,0x77A2,0x792A,0x7AFC,0x7D26,0x7FB8,0x82C6,0x8667,
+0x8AB8,0x8FD8,0x95F1,0x9D2F,0xA5CB,0xB006,0xBC2F,0xCAA3,
+/* A:19 B:1c */
+0x7B6E,0x7B81,0x7B98,0x7BB4,0x7BD4,0x7BFB,0x7C2A,0x7C60,
+0x7CA2,0x7CEF,0x7D4B,0x7DB9,0x7E3B,0x7ED6,0x7F8E,0x8069,
+0x816C,0x82A1,0x8410,0x85C4,0x87CB,0x8A33,0x8D0F,0x9076,
+0x9480,0x994D,0x9F02,0xA5CB,0xADDB,0xB770,0xC2D3,0xD05C,
+/* A:19 B:1d */
+0x8914,0x8926,0x893B,0x8954,0x8972,0x8996,0x89C0,0x89F3,
+0x8A2F,0x8A76,0x8ACB,0x8B30,0x8BA7,0x8C36,0x8CDF,0x8DA8,
+0x8E97,0x8FB3,0x9104,0x9295,0x9472,0x96A8,0x9949,0x9C69,
+0xA020,0xA48A,0xA9CA,0xB006,0xB770,0xC03F,0xCAB7,0xD728,
+/* A:19 B:1e */
+0x994C,0x995C,0x996F,0x9986,0x99A1,0x99C1,0x99E7,0x9A14,
+0x9A4A,0x9A8A,0x9AD6,0x9B30,0x9B9B,0x9C1B,0x9CB2,0x9D66,
+0x9E3C,0x9F3A,0xA069,0xA1D0,0xA37B,0xA576,0xA7D1,0xAA9E,
+0xADF2,0xB1E6,0xB699,0xBC2F,0xC2D3,0xCAB7,0xD417,0xDF3D,
+/* A:19 B:1f */
+0xAC94,0xACA2,0xACB2,0xACC5,0xACDD,0xACF8,0xAD19,0xAD40,
+0xAD6E,0xADA5,0xADE7,0xAE35,0xAE91,0xAEFF,0xAF81,0xB01C,
+0xB0D5,0xB1B0,0xB2B4,0xB3EA,0xB55A,0xB70F,0xB916,0xBB80,
+0xBE5E,0xC1C6,0xC5D3,0xCAA3,0xD05C,0xD728,0xDF3D,0xE8D7,
+/* A: 968D89C0 */
+/* A:1a B:00 */
+0x3D75,0x3D8F,0x3DAF,0x3DD5,0x3E01,0x3E37,0x3E76,0x3EC1,
+0x3F1A,0x3F84,0x4002,0x4098,0x414A,0x421D,0x4318,0x4443,
+0x45A6,0x474C,0x4942,0x4B96,0x4E5A,0x51A4,0x558D,0x5A33,
+0x5FB8,0x6648,0x6E15,0x775A,0x825E,0x8F77,0x9F07,0xB186,
+/* A:1a B:01 */
+0x3D8F,0x3DAA,0x3DCA,0x3DEF,0x3E1C,0x3E51,0x3E90,0x3EDB,
+0x3F34,0x3F9E,0x401C,0x40B2,0x4164,0x4237,0x4332,0x445D,
+0x45C0,0x4766,0x495B,0x4BAF,0x4E73,0x51BD,0x55A5,0x5A4A,
+0x5FCF,0x665E,0x6E2A,0x776E,0x8271,0x8F88,0x9F16,0xB193,
+/* A:1a B:02 */
+0x3DAF,0x3DCA,0x3DE9,0x3E0F,0x3E3C,0x3E71,0x3EB0,0x3EFB,
+0x3F54,0x3FBE,0x403C,0x40D1,0x4183,0x4256,0x4351,0x447C,
+0x45DE,0x4784,0x4979,0x4BCD,0x4E90,0x51DA,0x55C1,0x5A66,
+0x5FEA,0x6678,0x6E43,0x7786,0x8287,0x8F9C,0x9F28,0xB1A3,
+/* A:1a B:03 */
+0x3DD5,0x3DEF,0x3E0F,0x3E34,0x3E61,0x3E96,0x3ED5,0x3F20,
+0x3F79,0x3FE3,0x4061,0x40F6,0x41A8,0x427B,0x4376,0x44A0,
+0x4603,0x47A8,0x499D,0x4BF0,0x4EB3,0x51FC,0x55E3,0x5A86,
+0x600A,0x6697,0x6E61,0x77A2,0x82A2,0x8FB4,0x9F3E,0xB1B5,
+/* A:1a B:04 */
+0x3E01,0x3E1C,0x3E3C,0x3E61,0x3E8E,0x3EC3,0x3F02,0x3F4D,
+0x3FA5,0x400F,0x408D,0x4122,0x41D4,0x42A7,0x43A2,0x44CC,
+0x462E,0x47D3,0x49C7,0x4C1A,0x4EDD,0x5225,0x560B,0x5AAE,
+0x6030,0x66BC,0x6E84,0x77C3,0x82C1,0x8FD1,0x9F58,0xB1CB,
+/* A:1a B:05 */
+0x3E37,0x3E51,0x3E71,0x3E96,0x3EC3,0x3EF8,0x3F37,0x3F81,
+0x3FDA,0x4044,0x40C1,0x4157,0x4208,0x42DB,0x43D5,0x44FF,
+0x4661,0x4806,0x49FA,0x4C4C,0x4F0E,0x5255,0x563B,0x5ADC,
+0x605D,0x66E8,0x6EAE,0x77EB,0x82E6,0x8FF3,0x9F76,0xB1E6,
+/* A:1a B:06 */
+0x3E76,0x3E90,0x3EB0,0x3ED5,0x3F02,0x3F37,0x3F75,0x3FC0,
+0x4019,0x4082,0x4100,0x4195,0x4246,0x4319,0x4413,0x453C,
+0x469E,0x4842,0x4A36,0x4C87,0x4F48,0x528F,0x5673,0x5B13,
+0x6093,0x671C,0x6EE0,0x781A,0x8313,0x901C,0x9F9B,0xB205,
+/* A:1a B:07 */
+0x3EC1,0x3EDB,0x3EFB,0x3F20,0x3F4D,0x3F81,0x3FC0,0x400B,
+0x4063,0x40CD,0x414A,0x41DF,0x4290,0x4362,0x445C,0x4585,
+0x46E6,0x488A,0x4A7D,0x4CCE,0x4F8E,0x52D3,0x56B6,0x5B55,
+0x60D3,0x6759,0x6F1B,0x7853,0x8347,0x904D,0x9FC6,0xB22B,
+/* A:1a B:08 */
+0x3F1A,0x3F34,0x3F54,0x3F79,0x3FA5,0x3FDA,0x4019,0x4063,
+0x40BC,0x4125,0x41A2,0x4237,0x42E8,0x43BA,0x44B3,0x45DC,
+0x473C,0x48DF,0x4AD1,0x4D21,0x4FE1,0x5325,0x5706,0x5BA3,
+0x611F,0x67A3,0x6F61,0x7895,0x8386,0x9086,0x9FFA,0xB257,
+/* A:1a B:09 */
+0x3F84,0x3F9E,0x3FBE,0x3FE3,0x400F,0x4044,0x4082,0x40CD,
+0x4125,0x418E,0x420B,0x42A0,0x4350,0x4422,0x451B,0x4643,
+0x47A3,0x4945,0x4B36,0x4D85,0x5043,0x5385,0x5765,0x5C00,
+0x6179,0x67FA,0x6FB5,0x78E5,0x83D0,0x90CA,0xA037,0xB28C,
+/* A:1a B:0a */
+0x4002,0x401C,0x403C,0x4061,0x408D,0x40C1,0x4100,0x414A,
+0x41A2,0x420B,0x4288,0x431C,0x43CC,0x449D,0x4596,0x46BD,
+0x481C,0x49BE,0x4BAE,0x4DFB,0x50B8,0x53F8,0x57D6,0x5C6E,
+0x61E4,0x6862,0x7018,0x7943,0x8429,0x911C,0xA080,0xB2CA,
+/* A:1a B:0b */
+0x4098,0x40B2,0x40D1,0x40F6,0x4122,0x4157,0x4195,0x41DF,
+0x4237,0x42A0,0x431C,0x43B0,0x445F,0x4530,0x4628,0x474E,
+0x48AD,0x4A4D,0x4C3C,0x4E88,0x5142,0x5481,0x585C,0x5CF1,
+0x6264,0x68DD,0x708F,0x79B4,0x8492,0x917C,0xA0D6,0xB315,
+/* A:1a B:0c */
+0x414A,0x4164,0x4183,0x41A8,0x41D4,0x4208,0x4246,0x4290,
+0x42E8,0x4350,0x43CC,0x445F,0x450E,0x45DE,0x46D5,0x47FB,
+0x4958,0x4AF7,0x4CE4,0x4F2F,0x51E7,0x5523,0x58FC,0x5D8D,
+0x62FB,0x696F,0x711B,0x7A39,0x850E,0x91EF,0xA13D,0xB36D,
+/* A:1a B:0d */
+0x421D,0x4237,0x4256,0x427B,0x42A7,0x42DB,0x4319,0x4362,
+0x43BA,0x4422,0x449D,0x4530,0x45DE,0x46AD,0x47A4,0x48C8,
+0x4A24,0x4BC2,0x4DAD,0x4FF5,0x52AB,0x55E4,0x59B9,0x5E46,
+0x63AF,0x6A1E,0x71C2,0x7AD7,0x85A3,0x9277,0xA1B7,0xB3D6,
+/* A:1a B:0e */
+0x4318,0x4332,0x4351,0x4376,0x43A2,0x43D5,0x4413,0x445C,
+0x44B3,0x451B,0x4596,0x4628,0x46D5,0x47A4,0x4899,0x49BC,
+0x4B17,0x4CB2,0x4E9C,0x50E1,0x5394,0x56CA,0x5A9A,0x5F22,
+0x6486,0x6AED,0x7288,0x7B94,0x8653,0x9319,0xA248,0xB453,
+/* A:1a B:0f */
+0x4443,0x445D,0x447C,0x44A0,0x44CC,0x44FF,0x453C,0x4585,
+0x45DC,0x4643,0x46BD,0x474E,0x47FB,0x48C8,0x49BC,0x4ADE,
+0x4C37,0x4DD0,0x4FB7,0x51FA,0x54A9,0x57DA,0x5BA6,0x6028,
+0x6584,0x6BE2,0x7374,0x7C73,0x8725,0x93DA,0xA2F5,0xB4E8,
+/* A:1a B:10 */
+0x45A6,0x45C0,0x45DE,0x4603,0x462E,0x4661,0x469E,0x46E6,
+0x473C,0x47A3,0x481C,0x48AD,0x4958,0x4A24,0x4B17,0x4C37,
+0x4D8D,0x4F24,0x5108,0x5347,0x55F2,0x591F,0x5CE4,0x615F,
+0x66B2,0x6D07,0x748D,0x7D7E,0x881E,0x94BF,0xA3C2,0xB599,
+/* A:1a B:11 */
+0x474C,0x4766,0x4784,0x47A8,0x47D3,0x4806,0x4842,0x488A,
+0x48DF,0x4945,0x49BE,0x4A4D,0x4AF7,0x4BC2,0x4CB2,0x4DD0,
+0x4F24,0x50B8,0x5299,0x54D3,0x577A,0x5AA0,0x5E5E,0x62D0,
+0x681A,0x6E62,0x75DA,0x7EBA,0x8946,0x95CF,0xA4B5,0xB66A,
+/* A:1a B:12 */
+0x4942,0x495B,0x4979,0x499D,0x49C7,0x49FA,0x4A36,0x4A7D,
+0x4AD1,0x4B36,0x4BAE,0x4C3C,0x4CE4,0x4DAD,0x4E9C,0x4FB7,
+0x5108,0x5299,0x5474,0x56AA,0x594A,0x5C69,0x601F,0x6488,
+0x69C5,0x6FFF,0x7766,0x8031,0x8AA6,0x9713,0xA5D7,0xB764,
+/* A:1a B:13 */
+0x4B96,0x4BAF,0x4BCD,0x4BF0,0x4C1A,0x4C4C,0x4C87,0x4CCE,
+0x4D21,0x4D85,0x4DFB,0x4E88,0x4F2F,0x4FF5,0x50E1,0x51FA,
+0x5347,0x54D3,0x56AA,0x58DA,0x5B73,0x5E89,0x6235,0x6691,
+0x6BC0,0x71EA,0x793C,0x81F0,0x8C48,0x9893,0xA72F,0xB88C,
+/* A:1a B:14 */
+0x4E5A,0x4E73,0x4E90,0x4EB3,0x4EDD,0x4F0E,0x4F48,0x4F8E,
+0x4FE1,0x5043,0x50B8,0x5142,0x51E7,0x52AB,0x5394,0x54A9,
+0x55F2,0x577A,0x594A,0x5B73,0x5E03,0x6110,0x64AF,0x68FE,
+0x6E1C,0x7431,0x7B6B,0x8403,0x8E39,0x9A5C,0xA8C8,0xB9ED,
+/* A:1a B:15 */
+0x51A4,0x51BD,0x51DA,0x51FC,0x5225,0x5255,0x528F,0x52D3,
+0x5325,0x5385,0x53F8,0x5481,0x5523,0x55E4,0x56CA,0x57DA,
+0x591F,0x5AA0,0x5C69,0x5E89,0x6110,0x6410,0x67A1,0x6BDF,
+0x70E9,0x76E6,0x7E04,0x867A,0x9088,0x9C7B,0xAAAE,0xBB8F,
+/* A:1a B:16 */
+0x558D,0x55A5,0x55C1,0x55E3,0x560B,0x563B,0x5673,0x56B6,
+0x5706,0x5765,0x57D6,0x585C,0x58FC,0x59B9,0x5A9A,0x5BA6,
+0x5CE4,0x5E5E,0x601F,0x6235,0x64AF,0x67A1,0x6B22,0x6F4B,
+0x743D,0x7A1E,0x811A,0x8968,0x9346,0x9F00,0xACF0,0xBD81,
+/* A:1a B:17 */
+0x5A33,0x5A4A,0x5A66,0x5A86,0x5AAE,0x5ADC,0x5B13,0x5B55,
+0x5BA3,0x5C00,0x5C6E,0x5CF1,0x5D8D,0x5E46,0x5F22,0x6028,
+0x615F,0x62D0,0x6488,0x6691,0x68FE,0x6BDF,0x6F4B,0x735C,
+0x7832,0x7DF1,0x84C5,0x8CE3,0x9688,0xA1FF,0xAF9F,0xBFD1,
+/* A:1a B:18 */
+0x5FB8,0x5FCF,0x5FEA,0x600A,0x6030,0x605D,0x6093,0x60D3,
+0x611F,0x6179,0x61E4,0x6264,0x62FB,0x63AF,0x6486,0x6584,
+0x66B2,0x681A,0x69C5,0x6BC0,0x6E1C,0x70E9,0x743D,0x7832,
+0x7CE6,0x827C,0x8921,0x9106,0x9A68,0xA58E,0xB2CF,0xC28F,
+/* A:1a B:19 */
+0x6648,0x665E,0x6678,0x6697,0x66BC,0x66E8,0x671C,0x6759,
+0x67A3,0x67FA,0x6862,0x68DD,0x696F,0x6A1E,0x6AED,0x6BE2,
+0x6D07,0x6E62,0x6FFF,0x71EA,0x7431,0x76E6,0x7A1E,0x7DF1,
+0x827C,0x87E3,0x8E4F,0x95F1,0x9F02,0xA9CA,0xB699,0xC5D3,
+/* A:1a B:1a */
+0x6E15,0x6E2A,0x6E43,0x6E61,0x6E84,0x6EAE,0x6EE0,0x6F1B,
+0x6F61,0x6FB5,0x7018,0x708F,0x711B,0x71C2,0x7288,0x7374,
+0x748D,0x75DA,0x7766,0x793C,0x7B6B,0x7E04,0x811A,0x84C5,
+0x8921,0x8E4F,0x9477,0x9BC9,0xA47B,0xAED1,0xBB1A,0xC9B4,
+/* A:1a B:1b */
+0x775A,0x776E,0x7786,0x77A2,0x77C3,0x77EB,0x781A,0x7853,
+0x7895,0x78E5,0x7943,0x79B4,0x7A39,0x7AD7,0x7B94,0x7C73,
+0x7D7E,0x7EBA,0x8031,0x81F0,0x8403,0x867A,0x8968,0x8CE3,
+0x9106,0x95F1,0x9BC9,0xA2BB,0xAAFC,0xB4CB,0xC074,0xCE50,
+/* A:1a B:1c */
+0x825E,0x8271,0x8287,0x82A2,0x82C1,0x82E6,0x8313,0x8347,
+0x8386,0x83D0,0x8429,0x8492,0x850E,0x85A3,0x8653,0x8725,
+0x881E,0x8946,0x8AA6,0x8C48,0x8E39,0x9088,0x9346,0x9688,
+0x9A68,0x9F02,0xA47B,0xAAFC,0xB2B6,0xBBE6,0xC6D1,0xD3CB,
+/* A:1a B:1d */
+0x8F77,0x8F88,0x8F9C,0x8FB4,0x8FD1,0x8FF3,0x901C,0x904D,
+0x9086,0x90CA,0x911C,0x917C,0x91EF,0x9277,0x9319,0x93DA,
+0x94BF,0x95CF,0x9713,0x9893,0x9A5C,0x9C7B,0x9F00,0xA1FF,
+0xA58E,0xA9CA,0xAED1,0xB4CB,0xBBE6,0xC458,0xCE60,0xDA4E,
+/* A:1a B:1e */
+0x9F07,0x9F16,0x9F28,0x9F3E,0x9F58,0x9F76,0x9F9B,0x9FC6,
+0x9FFA,0xA037,0xA080,0xA0D6,0xA13D,0xA1B7,0xA248,0xA2F5,
+0xA3C2,0xA4B5,0xA5D7,0xA72F,0xA8C8,0xAAAE,0xACF0,0xAF9F,
+0xB2CF,0xB699,0xBB1A,0xC074,0xC6D1,0xCE60,0xD75D,0xE20B,
+/* A:1a B:1f */
+0xB186,0xB193,0xB1A3,0xB1B5,0xB1CB,0xB1E6,0xB205,0xB22B,
+0xB257,0xB28C,0xB2CA,0xB315,0xB36D,0xB3D6,0xB453,0xB4E8,
+0xB599,0xB66A,0xB764,0xB88C,0xB9ED,0xBB8F,0xBD81,0xBFD1,
+0xC28F,0xC5D3,0xC9B4,0xCE50,0xD3CB,0xDA4E,0xE20B,0xEB3E,
+/* A: 968D89C0 */
+/* A:1b B:00 */
+0x492C,0x4946,0x4964,0x4987,0x49B2,0x49E4,0x4A20,0x4A67,
+0x4ABC,0x4B21,0x4B98,0x4C27,0x4CD0,0x4D99,0x4E87,0x4FA3,
+0x50F4,0x5285,0x5461,0x5697,0x5938,0x5C58,0x600E,0x6478,
+0x69B6,0x6FF2,0x775A,0x8028,0x8A9E,0x970E,0xA5D5,0xB766,
+/* A:1b B:01 */
+0x4946,0x495F,0x497D,0x49A1,0x49CB,0x49FD,0x4A39,0x4A81,
+0x4AD5,0x4B3A,0x4BB1,0x4C40,0x4CE9,0x4DB1,0x4EA0,0x4FBC,
+0x510D,0x529D,0x5479,0x56AF,0x5950,0x5C6F,0x6025,0x648E,
+0x69CC,0x7007,0x776E,0x803B,0x8AB0,0x971E,0xA5E4,0xB773,
+/* A:1b B:02 */
+0x4964,0x497D,0x499B,0x49BF,0x49E9,0x4A1B,0x4A57,0x4A9E,
+0x4AF3,0x4B58,0x4BCF,0x4C5D,0x4D06,0x4DCF,0x4EBD,0x4FD9,
+0x512A,0x52BA,0x5496,0x56CB,0x596B,0x5C8A,0x6040,0x64A8,
+0x69E5,0x701F,0x7786,0x8051,0x8AC5,0x9731,0xA5F5,0xB782,
+/* A:1b B:03 */
+0x4987,0x49A1,0x49BF,0x49E2,0x4A0D,0x4A3F,0x4A7B,0x4AC2,
+0x4B17,0x4B7B,0x4BF2,0x4C80,0x4D29,0x4DF2,0x4EE0,0x4FFB,
+0x514C,0x52DC,0x54B8,0x56ED,0x598D,0x5CAB,0x6060,0x64C7,
+0x6A04,0x703D,0x77A2,0x806C,0x8ADE,0x9748,0xA60A,0xB793,
+/* A:1b B:04 */
+0x49B2,0x49CB,0x49E9,0x4A0D,0x4A37,0x4A69,0x4AA5,0x4AEC,
+0x4B41,0x4BA5,0x4C1C,0x4CAA,0x4D53,0x4E1B,0x4F09,0x5025,
+0x5175,0x5305,0x54E0,0x5715,0x59B4,0x5CD2,0x6086,0x64ED,
+0x6A28,0x7060,0x77C3,0x808C,0x8AFC,0x9764,0xA622,0xB7A8,
+/* A:1b B:05 */
+0x49E4,0x49FD,0x4A1B,0x4A3F,0x4A69,0x4A9C,0x4AD7,0x4B1E,
+0x4B73,0x4BD7,0x4C4E,0x4CDC,0x4D85,0x4E4D,0x4F3B,0x5055,
+0x51A6,0x5335,0x5510,0x5744,0x59E3,0x5D00,0x60B3,0x6519,
+0x6A53,0x7089,0x77EB,0x80B1,0x8B1F,0x9784,0xA63F,0xB7C1,
+/* A:1b B:06 */
+0x4A20,0x4A39,0x4A57,0x4A7B,0x4AA5,0x4AD7,0x4B13,0x4B5A,
+0x4BAE,0x4C13,0x4C8A,0x4D17,0x4DC0,0x4E88,0x4F75,0x5090,
+0x51DF,0x536E,0x5549,0x577C,0x5A1A,0x5D36,0x60E9,0x654D,
+0x6A86,0x70BA,0x781A,0x80DE,0x8B49,0x97AB,0xA662,0xB7DF,
+/* A:1b B:07 */
+0x4A67,0x4A81,0x4A9E,0x4AC2,0x4AEC,0x4B1E,0x4B5A,0x4BA1,
+0x4BF5,0x4C59,0x4CD0,0x4D5E,0x4E06,0x4ECD,0x4FBB,0x50D5,
+0x5224,0x53B3,0x558C,0x57BF,0x5A5C,0x5D77,0x6128,0x658C,
+0x6AC3,0x70F5,0x7853,0x8114,0x8B7B,0x97D9,0xA68B,0xB802,
+/* A:1b B:08 */
+0x4ABC,0x4AD5,0x4AF3,0x4B17,0x4B41,0x4B73,0x4BAE,0x4BF5,
+0x4C49,0x4CAD,0x4D24,0x4DB1,0x4E59,0x4F20,0x500D,0x5127,
+0x5276,0x5404,0x55DD,0x580F,0x5AAB,0x5DC5,0x6174,0x65D6,
+0x6B0B,0x713B,0x7895,0x8153,0x8BB7,0x980F,0xA6BC,0xB82C,
+/* A:1b B:09 */
+0x4B21,0x4B3A,0x4B58,0x4B7B,0x4BA5,0x4BD7,0x4C13,0x4C59,
+0x4CAD,0x4D11,0x4D87,0x4E14,0x4EBC,0x4F83,0x5070,0x5189,
+0x52D7,0x5464,0x563C,0x586D,0x5B08,0x5E21,0x61CE,0x662E,
+0x6B60,0x718E,0x78E5,0x819E,0x8BFD,0x9850,0xA6F6,0xB85E,
+/* A:1b B:0a */
+0x4B98,0x4BB1,0x4BCF,0x4BF2,0x4C1C,0x4C4E,0x4C8A,0x4CD0,
+0x4D24,0x4D87,0x4DFE,0x4E8A,0x4F32,0x4FF8,0x50E4,0x51FD,
+0x534A,0x54D7,0x56AE,0x58DE,0x5B77,0x5E8E,0x623A,0x6697,
+0x6BC6,0x71F0,0x7943,0x81F8,0x8C51,0x989D,0xA73B,0xB89A,
+/* A:1b B:0b */
+0x4C27,0x4C40,0x4C5D,0x4C80,0x4CAA,0x4CDC,0x4D17,0x4D5E,
+0x4DB1,0x4E14,0x4E8A,0x4F17,0x4FBD,0x5084,0x516F,0x5287,
+0x53D3,0x555F,0x5735,0x5963,0x5BFB,0x5F0F,0x62B9,0x6713,
+0x6C3F,0x7265,0x79B4,0x8263,0x8CB5,0x98F9,0xA78D,0xB8E0,
+/* A:1b B:0c */
+0x4CD0,0x4CE9,0x4D06,0x4D29,0x4D53,0x4D85,0x4DC0,0x4E06,
+0x4E59,0x4EBC,0x4F32,0x4FBD,0x5064,0x5129,0x5214,0x532B,
+0x5476,0x5601,0x57D5,0x5A02,0x5C97,0x5FAA,0x6350,0x67A7,
+0x6CCF,0x72F0,0x7A39,0x82E1,0x8D2B,0x9966,0xA7EE,0xB934,
+/* A:1b B:0d */
+0x4D99,0x4DB1,0x4DCF,0x4DF2,0x4E1B,0x4E4D,0x4E88,0x4ECD,
+0x4F20,0x4F83,0x4FF8,0x5084,0x5129,0x51EE,0x52D8,0x53EE,
+0x5538,0x56C1,0x5894,0x5ABE,0x5D51,0x6061,0x6404,0x6857,
+0x6D7A,0x7395,0x7AD7,0x8377,0x8DB8,0x99E7,0xA862,0xB998,
+/* A:1b B:0e */
+0x4E87,0x4EA0,0x4EBD,0x4EE0,0x4F09,0x4F3B,0x4F75,0x4FBB,
+0x500D,0x5070,0x50E4,0x516F,0x5214,0x52D8,0x53C1,0x54D5,
+0x561E,0x57A5,0x5976,0x5B9E,0x5E2F,0x613B,0x64DA,0x6928,
+0x6E45,0x745A,0x7B94,0x842A,0x8E5F,0x9A81,0xA8EC,0xBA0E,
+/* A:1b B:0f */
+0x4FA3,0x4FBC,0x4FD9,0x4FFB,0x5025,0x5055,0x5090,0x50D5,
+0x5127,0x5189,0x51FD,0x5287,0x532B,0x53EE,0x54D5,0x55E9,
+0x5730,0x58B5,0x5A83,0x5CA9,0x5F36,0x623E,0x65D8,0x6A20,
+0x6F37,0x7543,0x7C73,0x84FF,0x8F26,0x9B37,0xA98F,0xBA9B,
+/* A:1b B:10 */
+0x50F4,0x510D,0x512A,0x514C,0x5175,0x51A6,0x51DF,0x5224,
+0x5276,0x52D7,0x534A,0x53D3,0x5476,0x5538,0x561E,0x5730,
+0x5875,0x59F8,0x5BC3,0x5DE5,0x606E,0x6371,0x6706,0x6B47,
+0x7056,0x7659,0x7D7E,0x85FB,0x9012,0x9C11,0xAA52,0xBB42,
+/* A:1b B:11 */
+0x5285,0x529D,0x52BA,0x52DC,0x5305,0x5335,0x536E,0x53B3,
+0x5404,0x5464,0x54D7,0x555F,0x5601,0x56C1,0x57A5,0x58B5,
+0x59F8,0x5B77,0x5D3F,0x5F5D,0x61E1,0x64DF,0x686D,0x6CA6,
+0x71AB,0x77A2,0x7EBA,0x8727,0x912B,0x9D13,0xAB39,0xBC09,
+/* A:1b B:12 */
+0x5461,0x5479,0x5496,0x54B8,0x54E0,0x5510,0x5549,0x558C,
+0x55DD,0x563C,0x56AE,0x5735,0x57D5,0x5894,0x5976,0x5A83,
+0x5BC3,0x5D3F,0x5F03,0x611C,0x639B,0x6692,0x6A17,0x6E47,
+0x7341,0x792A,0x8031,0x888C,0x9279,0x9E46,0xAC4B,0xBCF6,
+/* A:1b B:13 */
+0x5697,0x56AF,0x56CB,0x56ED,0x5715,0x5744,0x577C,0x57BF,
+0x580F,0x586D,0x58DE,0x5963,0x5A02,0x5ABE,0x5B9E,0x5CA9,
+0x5DE5,0x5F5D,0x611C,0x6330,0x65A7,0x6896,0x6C12,0x7036,
+0x7522,0x7AFC,0x81F0,0x8A34,0x9406,0x9FB2,0xAD92,0xBE0F,
+/* A:1b B:14 */
+0x5938,0x5950,0x596B,0x598D,0x59B4,0x59E3,0x5A1A,0x5A5C,
+0x5AAB,0x5B08,0x5B77,0x5BFB,0x5C97,0x5D51,0x5E2F,0x5F36,
+0x606E,0x61E1,0x639B,0x65A7,0x6817,0x6AFC,0x6E6D,0x7283,
+0x775F,0x7D26,0x8403,0x8C2B,0x95DD,0xA163,0xAF15,0xBF5C,
+/* A:1b B:15 */
+0x5C58,0x5C6F,0x5C8A,0x5CAB,0x5CD2,0x5D00,0x5D36,0x5D77,
+0x5DC5,0x5E21,0x5E8E,0x5F0F,0x5FAA,0x6061,0x613B,0x623E,
+0x6371,0x64DF,0x6692,0x6896,0x6AFC,0x6DD5,0x7139,0x753F,
+0x7A08,0x7FB8,0x867A,0x8E82,0x980E,0xA366,0xB0E2,0xC0E9,
+/* A:1b B:16 */
+0x600E,0x6025,0x6040,0x6060,0x6086,0x60B3,0x60E9,0x6128,
+0x6174,0x61CE,0x623A,0x62B9,0x6350,0x6404,0x64DA,0x65D8,
+0x6706,0x686D,0x6A17,0x6C12,0x6E6D,0x7139,0x748C,0x787F,
+0x7D31,0x82C6,0x8968,0x914A,0x9AA8,0xA5CB,0xB306,0xC2C1,
+/* A:1b B:17 */
+0x6478,0x648E,0x64A8,0x64C7,0x64ED,0x6519,0x654D,0x658C,
+0x65D6,0x662E,0x6697,0x6713,0x67A7,0x6857,0x6928,0x6A20,
+0x6B47,0x6CA6,0x6E47,0x7036,0x7283,0x753F,0x787F,0x7C5C,
+0x80F3,0x8667,0x8CE3,0x9497,0x9DC0,0xA8A2,0xB592,0xC4F1,
+/* A:1b B:18 */
+0x69B6,0x69CC,0x69E5,0x6A04,0x6A28,0x6A53,0x6A86,0x6AC3,
+0x6B0B,0x6B60,0x6BC6,0x6C3F,0x6CCF,0x6D7A,0x6E45,0x6F37,
+0x7056,0x71AB,0x7341,0x7522,0x775F,0x7A08,0x7D31,0x80F3,
+0x8569,0x8AB8,0x9106,0x9884,0xA16D,0xAC03,0xB897,0xC78B,
+/* A:1b B:19 */
+0x6FF2,0x7007,0x701F,0x703D,0x7060,0x7089,0x70BA,0x70F5,
+0x713B,0x718E,0x71F0,0x7265,0x72F0,0x7395,0x745A,0x7543,
+0x7659,0x77A2,0x792A,0x7AFC,0x7D26,0x7FB8,0x82C6,0x8667,
+0x8AB8,0x8FD8,0x95F1,0x9D2F,0xA5CB,0xB006,0xBC2F,0xCAA3,
+/* A:1b B:1a */
+0x775A,0x776E,0x7786,0x77A2,0x77C3,0x77EB,0x781A,0x7853,
+0x7895,0x78E5,0x7943,0x79B4,0x7A39,0x7AD7,0x7B94,0x7C73,
+0x7D7E,0x7EBA,0x8031,0x81F0,0x8403,0x867A,0x8968,0x8CE3,
+0x9106,0x95F1,0x9BC9,0xA2BB,0xAAFC,0xB4CB,0xC074,0xCE50,
+/* A:1b B:1b */
+0x8028,0x803B,0x8051,0x806C,0x808C,0x80B1,0x80DE,0x8114,
+0x8153,0x819E,0x81F8,0x8263,0x82E1,0x8377,0x842A,0x84FF,
+0x85FB,0x8727,0x888C,0x8A34,0x8C2B,0x8E82,0x914A,0x9497,
+0x9884,0x9D2F,0xA2BB,0xA952,0xB127,0xBA77,0xC588,0xD2AE,
+/* A:1b B:1c */
+0x8A9E,0x8AB0,0x8AC5,0x8ADE,0x8AFC,0x8B1F,0x8B49,0x8B7B,
+0x8BB7,0x8BFD,0x8C51,0x8CB5,0x8D2B,0x8DB8,0x8E5F,0x8F26,
+0x9012,0x912B,0x9279,0x9406,0x95DD,0x980E,0x9AA8,0x9DC0,
+0xA16D,0xA5CB,0xAAFC,0xB127,0xB87D,0xC134,0xCB90,0xD7DF,
+/* A:1b B:1d */
+0x970E,0x971E,0x9731,0x9748,0x9764,0x9784,0x97AB,0x97D9,
+0x980F,0x9850,0x989D,0x98F9,0x9966,0x99E7,0x9A81,0x9B37,
+0x9C11,0x9D13,0x9E46,0x9FB2,0xA163,0xA366,0xA5CB,0xA8A2,
+0xAC03,0xB006,0xB4CB,0xBA77,0xC134,0xC936,0xD2BB,0xDE0B,
+/* A:1b B:1e */
+0xA5D5,0xA5E4,0xA5F5,0xA60A,0xA622,0xA63F,0xA662,0xA68B,
+0xA6BC,0xA6F6,0xA73B,0xA78D,0xA7EE,0xA862,0xA8EC,0xA98F,
+0xAA52,0xAB39,0xAC4B,0xAD92,0xAF15,0xB0E2,0xB306,0xB592,
+0xB897,0xBC2F,0xC074,0xC588,0xCB90,0xD2BB,0xDB40,0xE561,
+/* A:1b B:1f */
+0xB766,0xB773,0xB782,0xB793,0xB7A8,0xB7C1,0xB7DF,0xB802,
+0xB82C,0xB85E,0xB89A,0xB8E0,0xB934,0xB998,0xBA0E,0xBA9B,
+0xBB42,0xBC09,0xBCF6,0xBE0F,0xBF5C,0xC0E9,0xC2C1,0xC4F1,
+0xC78B,0xCAA3,0xCE50,0xD2AE,0xD7DF,0xDE0B,0xE561,0xEE18,
+/* A: 968D89C0 */
+/* A:1c B:00 */
+0x5719,0x5731,0x574D,0x576E,0x5796,0x57C5,0x57FE,0x5840,
+0x5890,0x58EE,0x595E,0x59E3,0x5A82,0x5B3E,0x5C1E,0x5D28,
+0x5E64,0x5FDB,0x6199,0x63AC,0x6622,0x6910,0x6C8A,0x70AD,
+0x7597,0x7B6E,0x825E,0x8A9E,0x946C,0xA013,0xADEC,0xBE62,
+/* A:1c B:01 */
+0x5731,0x5748,0x5765,0x5786,0x57AE,0x57DD,0x5815,0x5858,
+0x58A7,0x5906,0x5976,0x59FB,0x5A99,0x5B55,0x5C35,0x5D3F,
+0x5E7A,0x5FF2,0x61B0,0x63C2,0x6638,0x6925,0x6C9F,0x70C1,
+0x75AB,0x7B81,0x8271,0x8AB0,0x947D,0xA022,0xADFA,0xBE6E,
+/* A:1c B:02 */
+0x574D,0x5765,0x5781,0x57A2,0x57CA,0x57F9,0x5831,0x5874,
+0x58C3,0x5921,0x5991,0x5A17,0x5AB5,0x5B71,0x5C50,0x5D5A,
+0x5E96,0x600D,0x61CB,0x63DD,0x6652,0x693F,0x6CB9,0x70DA,
+0x75C3,0x7B98,0x8287,0x8AC5,0x9490,0xA035,0xAE0A,0xBE7C,
+/* A:1c B:03 */
+0x576E,0x5786,0x57A2,0x57C4,0x57EB,0x581A,0x5853,0x5895,
+0x58E4,0x5943,0x59B3,0x5A38,0x5AD6,0x5B92,0x5C71,0x5D7A,
+0x5EB6,0x602D,0x61EA,0x63FC,0x6671,0x695D,0x6CD7,0x70F7,
+0x75DF,0x7BB4,0x82A2,0x8ADE,0x94A8,0xA04A,0xAE1E,0xBE8C,
+/* A:1c B:04 */
+0x5796,0x57AE,0x57CA,0x57EB,0x5813,0x5842,0x587A,0x58BD,
+0x590C,0x596A,0x59DA,0x5A5F,0x5AFD,0x5BB9,0x5C98,0x5DA1,
+0x5EDC,0x6053,0x6210,0x6421,0x6696,0x6982,0x6CFA,0x711A,
+0x7601,0x7BD4,0x82C1,0x8AFC,0x94C4,0xA064,0xAE34,0xBEA0,
+/* A:1c B:05 */
+0x57C5,0x57DD,0x57F9,0x581A,0x5842,0x5871,0x58A9,0x58EC,
+0x593B,0x5999,0x5A09,0x5A8D,0x5B2B,0x5BE7,0x5CC6,0x5DCF,
+0x5F0A,0x6080,0x623D,0x644E,0x66C2,0x69AD,0x6D24,0x7143,
+0x7629,0x7BFB,0x82E6,0x8B1F,0x94E5,0xA082,0xAE50,0xBEB7,
+/* A:1c B:06 */
+0x57FE,0x5815,0x5831,0x5853,0x587A,0x58A9,0x58E1,0x5924,
+0x5973,0x59D1,0x5A40,0x5AC5,0x5B63,0x5C1E,0x5CFD,0x5E05,
+0x5F40,0x60B6,0x6272,0x6482,0x66F6,0x69E0,0x6D57,0x7175,
+0x7659,0x7C2A,0x8313,0x8B49,0x950C,0xA0A6,0xAE70,0xBED3,
+/* A:1c B:07 */
+0x5840,0x5858,0x5874,0x5895,0x58BD,0x58EC,0x5924,0x5966,
+0x59B5,0x5A13,0x5A82,0x5B07,0x5BA4,0x5C5F,0x5D3E,0x5E46,
+0x5F80,0x60F6,0x62B2,0x64C1,0x6734,0x6A1D,0x6D93,0x71AF,
+0x7692,0x7C60,0x8347,0x8B7B,0x953B,0xA0D1,0xAE96,0xBEF4,
+/* A:1c B:08 */
+0x5890,0x58A7,0x58C3,0x58E4,0x590C,0x593B,0x5973,0x59B5,
+0x5A04,0x5A61,0x5AD1,0x5B55,0x5BF2,0x5CAD,0x5D8B,0x5E93,
+0x5FCD,0x6142,0x62FD,0x650C,0x677E,0x6A65,0x6DDA,0x71F4,
+0x76D5,0x7CA2,0x8386,0x8BB7,0x9572,0xA104,0xAEC4,0xBF1C,
+/* A:1c B:09 */
+0x58EE,0x5906,0x5921,0x5943,0x596A,0x5999,0x59D1,0x5A13,
+0x5A61,0x5ABF,0x5B2E,0x5BB2,0x5C4F,0x5D0A,0x5DE7,0x5EEF,
+0x6028,0x619C,0x6356,0x6564,0x67D5,0x6ABB,0x6E2E,0x7247,
+0x7726,0x7CEF,0x83D0,0x8BFD,0x95B5,0xA141,0xAEFA,0xBF4A,
+/* A:1c B:0a */
+0x595E,0x5976,0x5991,0x59B3,0x59DA,0x5A09,0x5A40,0x5A82,
+0x5AD1,0x5B2E,0x5B9D,0x5C21,0x5CBD,0x5D77,0x5E55,0x5F5C,
+0x6094,0x6207,0x63C1,0x65CD,0x683D,0x6B22,0x6E92,0x72A9,
+0x7785,0x7D4B,0x8429,0x8C51,0x9603,0xA189,0xAF3B,0xBF82,
+/* A:1c B:0b */
+0x59E3,0x59FB,0x5A17,0x5A38,0x5A5F,0x5A8D,0x5AC5,0x5B07,
+0x5B55,0x5BB2,0x5C21,0x5CA4,0x5D40,0x5DFA,0x5ED7,0x5FDD,
+0x6114,0x6287,0x643F,0x664A,0x68B8,0x6B9B,0x6F0A,0x731E,
+0x77F6,0x7DB9,0x8492,0x8CB5,0x9660,0xA1DF,0xAF87,0xBFC4,
+/* A:1c B:0c */
+0x5A82,0x5A99,0x5AB5,0x5AD6,0x5AFD,0x5B2B,0x5B63,0x5BA4,
+0x5BF2,0x5C4F,0x5CBD,0x5D40,0x5DDC,0x5E95,0x5F71,0x6077,
+0x61AD,0x631E,0x64D5,0x66DF,0x694B,0x6C2C,0x6F97,0x73A8,
+0x787D,0x7E3B,0x850E,0x8D2B,0x96CF,0xA244,0xAFE3,0xC012,
+/* A:1c B:0d */
+0x5B3E,0x5B55,0x5B71,0x5B92,0x5BB9,0x5BE7,0x5C1E,0x5C5F,
+0x5CAD,0x5D0A,0x5D77,0x5DFA,0x5E95,0x5F4E,0x6029,0x612D,
+0x6263,0x63D3,0x6588,0x6790,0x69F9,0x6CD7,0x7040,0x744D,
+0x791D,0x7ED6,0x85A3,0x8DB8,0x9753,0xA2BD,0xB04F,0xC06F,
+/* A:1c B:0e */
+0x5C1E,0x5C35,0x5C50,0x5C71,0x5C98,0x5CC6,0x5CFD,0x5D3E,
+0x5D8B,0x5DE7,0x5E55,0x5ED7,0x5F71,0x6029,0x6103,0x6206,
+0x633A,0x64A9,0x665C,0x6862,0x6AC9,0x6DA3,0x7108,0x7511,
+0x79DC,0x7F8E,0x8653,0x8E5F,0x97EF,0xA34D,0xB0D0,0xC0DE,
+/* A:1c B:0f */
+0x5D28,0x5D3F,0x5D5A,0x5D7A,0x5DA1,0x5DCF,0x5E05,0x5E46,
+0x5E93,0x5EEF,0x5F5C,0x5FDD,0x6077,0x612D,0x6206,0x6308,
+0x643B,0x65A7,0x6758,0x695B,0x6BBF,0x6E96,0x71F6,0x75F9,
+0x7ABE,0x8069,0x8725,0x8F26,0x98AA,0xA3F8,0xB168,0xC161,
+/* A:1c B:10 */
+0x5E64,0x5E7A,0x5E96,0x5EB6,0x5EDC,0x5F0A,0x5F40,0x5F80,
+0x5FCD,0x6028,0x6094,0x6114,0x61AD,0x6263,0x633A,0x643B,
+0x656C,0x66D6,0x6884,0x6A84,0x6CE4,0x6FB6,0x7311,0x770E,
+0x7BCB,0x816C,0x881E,0x9012,0x9987,0xA4C3,0xB21E,0xC1FE,
+/* A:1c B:11 */
+0x5FDB,0x5FF2,0x600D,0x602D,0x6053,0x6080,0x60B6,0x60F6,
+0x6142,0x619C,0x6207,0x6287,0x631E,0x63D3,0x64A9,0x65A7,
+0x66D6,0x683D,0x69E8,0x6BE4,0x6E40,0x710D,0x7461,0x7856,
+0x7D0A,0x82A1,0x8946,0x912B,0x9A8E,0xA5B5,0xB2F6,0xC2B7,
+/* A:1c B:12 */
+0x6199,0x61B0,0x61CB,0x61EA,0x6210,0x623D,0x6272,0x62B2,
+0x62FD,0x6356,0x63C1,0x643F,0x64D5,0x6588,0x665C,0x6758,
+0x6884,0x69E8,0x6B90,0x6D87,0x6FDD,0x72A4,0x75F1,0x79DD,
+0x7E86,0x8410,0x8AA6,0x9279,0x9BC6,0xA6D4,0xB3F7,0xC394,
+/* A:1c B:13 */
+0x63AC,0x63C2,0x63DD,0x63FC,0x6421,0x644E,0x6482,0x64C1,
+0x650C,0x6564,0x65CD,0x664A,0x66DF,0x6790,0x6862,0x695B,
+0x6A84,0x6BE4,0x6D87,0x6F79,0x71C8,0x7488,0x77CB,0x7BAD,
+0x8049,0x85C4,0x8C48,0x9406,0x9D39,0xA829,0xB528,0xC49B,
+/* A:1c B:14 */
+0x6622,0x6638,0x6652,0x6671,0x6696,0x66C2,0x66F6,0x6734,
+0x677E,0x67D5,0x683D,0x68B8,0x694B,0x69F9,0x6AC9,0x6BBF,
+0x6CE4,0x6E40,0x6FDD,0x71C8,0x7411,0x76C7,0x7A00,0x7DD4,
+0x8262,0x87CB,0x8E39,0x95DD,0x9EF3,0xA9BE,0xB693,0xC5D3,
+/* A:1c B:15 */
+0x6910,0x6925,0x693F,0x695D,0x6982,0x69AD,0x69E0,0x6A1D,
+0x6A65,0x6ABB,0x6B22,0x6B9B,0x6C2C,0x6CD7,0x6DA3,0x6E96,
+0x6FB6,0x710D,0x72A4,0x7488,0x76C7,0x7972,0x7C9E,0x8064,
+0x84DF,0x8A33,0x9088,0x980E,0xA0FF,0xABA0,0xB842,0xC745,
+/* A:1c B:16 */
+0x6C8A,0x6C9F,0x6CB9,0x6CD7,0x6CFA,0x6D24,0x6D57,0x6D93,
+0x6DDA,0x6E2E,0x6E92,0x6F0A,0x6F97,0x7040,0x7108,0x71F6,
+0x7311,0x7461,0x75F1,0x77CB,0x7A00,0x7C9E,0x7FBC,0x836F,
+0x87D5,0x8D0F,0x9346,0x9AA8,0xA36F,0xADDD,0xBA42,0xC8FE,
+/* A:1c B:17 */
+0x70AD,0x70C1,0x70DA,0x70F7,0x711A,0x7143,0x7175,0x71AF,
+0x71F4,0x7247,0x72A9,0x731E,0x73A8,0x744D,0x7511,0x75F9,
+0x770E,0x7856,0x79DD,0x7BAD,0x7DD4,0x8064,0x836F,0x870D,
+0x8B5A,0x9076,0x9688,0x9DC0,0xA654,0xB085,0xBCA3,0xCB0A,
+/* A:1c B:18 */
+0x7597,0x75AB,0x75C3,0x75DF,0x7601,0x7629,0x7659,0x7692,
+0x76D5,0x7726,0x7785,0x77F6,0x787D,0x791D,0x79DC,0x7ABE,
+0x7BCB,0x7D0A,0x7E86,0x8049,0x8262,0x84DF,0x87D5,0x8B5A,
+0x8F88,0x9480,0x9A68,0xA16D,0xA9C4,0xB3AE,0xBF77,0xCD78,
+/* A:1c B:19 */
+0x7B6E,0x7B81,0x7B98,0x7BB4,0x7BD4,0x7BFB,0x7C2A,0x7C60,
+0x7CA2,0x7CEF,0x7D4B,0x7DB9,0x7E3B,0x7ED6,0x7F8E,0x8069,
+0x816C,0x82A1,0x8410,0x85C4,0x87CB,0x8A33,0x8D0F,0x9076,
+0x9480,0x994D,0x9F02,0xA5CB,0xADDB,0xB770,0xC2D3,0xD05C,
+/* A:1c B:1a */
+0x825E,0x8271,0x8287,0x82A2,0x82C1,0x82E6,0x8313,0x8347,
+0x8386,0x83D0,0x8429,0x8492,0x850E,0x85A3,0x8653,0x8725,
+0x881E,0x8946,0x8AA6,0x8C48,0x8E39,0x9088,0x9346,0x9688,
+0x9A68,0x9F02,0xA47B,0xAAFC,0xB2B6,0xBBE6,0xC6D1,0xD3CB,
+/* A:1c B:1b */
+0x8A9E,0x8AB0,0x8AC5,0x8ADE,0x8AFC,0x8B1F,0x8B49,0x8B7B,
+0x8BB7,0x8BFD,0x8C51,0x8CB5,0x8D2B,0x8DB8,0x8E5F,0x8F26,
+0x9012,0x912B,0x9279,0x9406,0x95DD,0x980E,0x9AA8,0x9DC0,
+0xA16D,0xA5CB,0xAAFC,0xB127,0xB87D,0xC134,0xCB90,0xD7DF,
+/* A:1c B:1c */
+0x946C,0x947D,0x9490,0x94A8,0x94C4,0x94E5,0x950C,0x953B,
+0x9572,0x95B5,0x9603,0x9660,0x96CF,0x9753,0x97EF,0x98AA,
+0x9987,0x9A8E,0x9BC6,0x9D39,0x9EF3,0xA0FF,0xA36F,0xA654,
+0xA9C4,0xADDB,0xB2B6,0xB87D,0xBF5A,0xC782,0xD134,0xDCB9,
+/* A:1c B:1d */
+0xA013,0xA022,0xA035,0xA04A,0xA064,0xA082,0xA0A6,0xA0D1,
+0xA104,0xA141,0xA189,0xA1DF,0xA244,0xA2BD,0xA34D,0xA3F8,
+0xA4C3,0xA5B5,0xA6D4,0xA829,0xA9BE,0xABA0,0xADDD,0xB085,
+0xB3AE,0xB770,0xBBE6,0xC134,0xC782,0xCF00,0xD7E8,0xE27D,
+/* A:1c B:1e */
+0xADEC,0xADFA,0xAE0A,0xAE1E,0xAE34,0xAE50,0xAE70,0xAE96,
+0xAEC4,0xAEFA,0xAF3B,0xAF87,0xAFE3,0xB04F,0xB0D0,0xB168,
+0xB21E,0xB2F6,0xB3F7,0xB528,0xB693,0xB842,0xBA42,0xBCA3,
+0xBF77,0xC2D3,0xC6D1,0xCB90,0xD134,0xD7E8,0xDFDF,0xE957,
+/* A:1c B:1f */
+0xBE62,0xBE6E,0xBE7C,0xBE8C,0xBEA0,0xBEB7,0xBED3,0xBEF4,
+0xBF1C,0xBF4A,0xBF82,0xBFC4,0xC012,0xC06F,0xC0DE,0xC161,
+0xC1FE,0xC2B7,0xC394,0xC49B,0xC5D3,0xC745,0xC8FE,0xCB0A,
+0xCD78,0xD05C,0xD3CB,0xD7DF,0xDCB9,0xE27D,0xE957,0xF17C,
+/* A: 968D89C0 */
+/* A:1d B:00 */
+0x67A6,0x67BC,0x67D6,0x67F4,0x6819,0x6844,0x6878,0x68B6,
+0x68FF,0x6955,0x69BD,0x6A37,0x6AC9,0x6B76,0x6C44,0x6D39,
+0x6E5B,0x6FB5,0x7150,0x7338,0x757C,0x782D,0x7B61,0x7F2E,
+0x83B4,0x8914,0x8F77,0x970E,0xA013,0xAACC,0xB78A,0xC6AF,
+/* A:1d B:01 */
+0x67BC,0x67D1,0x67EB,0x680A,0x682F,0x685A,0x688E,0x68CB,
+0x6914,0x696B,0x69D2,0x6A4D,0x6ADE,0x6B8B,0x6C59,0x6D4E,
+0x6E70,0x6FCA,0x7164,0x734C,0x7590,0x7841,0x7B74,0x7F42,
+0x83C6,0x8926,0x8F88,0x971E,0xA022,0xAADA,0xB797,0xC6BA,
+/* A:1d B:02 */
+0x67D6,0x67EB,0x6805,0x6824,0x6849,0x6874,0x68A8,0x68E5,
+0x692E,0x6985,0x69EC,0x6A66,0x6AF8,0x6BA5,0x6C72,0x6D67,
+0x6E89,0x6FE2,0x717D,0x7364,0x75A8,0x7859,0x7B8B,0x7F58,
+0x83DD,0x893B,0x8F9C,0x9731,0xA035,0xAAEB,0xB7A6,0xC6C7,
+/* A:1d B:03 */
+0x67F4,0x680A,0x6824,0x6843,0x6867,0x6893,0x68C6,0x6904,
+0x694D,0x69A3,0x6A0A,0x6A85,0x6B16,0x6BC3,0x6C90,0x6D85,
+0x6EA7,0x7000,0x719A,0x7381,0x75C4,0x7875,0x7BA7,0x7F73,
+0x83F7,0x8954,0x8FB4,0x9748,0xA04A,0xAAFE,0xB7B7,0xC6D6,
+/* A:1d B:04 */
+0x6819,0x682F,0x6849,0x6867,0x688C,0x68B7,0x68EB,0x6928,
+0x6971,0x69C7,0x6A2E,0x6AA9,0x6B3A,0x6BE7,0x6CB4,0x6DA8,
+0x6ECA,0x7023,0x71BD,0x73A4,0x75E6,0x7896,0x7BC8,0x7F93,
+0x8416,0x8972,0x8FD1,0x9764,0xA064,0xAB16,0xB7CC,0xC6E8,
+/* A:1d B:05 */
+0x6844,0x685A,0x6874,0x6893,0x68B7,0x68E3,0x6916,0x6953,
+0x699C,0x69F3,0x6A59,0x6AD4,0x6B65,0x6C11,0x6CDF,0x6DD2,
+0x6EF4,0x704D,0x71E6,0x73CC,0x760F,0x78BE,0x7BEF,0x7FB9,
+0x843B,0x8996,0x8FF3,0x9784,0xA082,0xAB32,0xB7E5,0xC6FD,
+/* A:1d B:06 */
+0x6878,0x688E,0x68A8,0x68C6,0x68EB,0x6916,0x694A,0x6987,
+0x69CF,0x6A26,0x6A8D,0x6B07,0x6B98,0x6C44,0x6D11,0x6E05,
+0x6F26,0x707E,0x7217,0x73FD,0x763F,0x78ED,0x7C1D,0x7FE6,
+0x8467,0x89C0,0x901C,0x97AB,0xA0A6,0xAB53,0xB803,0xC717,
+/* A:1d B:07 */
+0x68B6,0x68CB,0x68E5,0x6904,0x6928,0x6953,0x6987,0x69C4,
+0x6A0C,0x6A63,0x6AC9,0x6B43,0x6BD4,0x6C80,0x6D4D,0x6E40,
+0x6F61,0x70B9,0x7251,0x7437,0x7677,0x7925,0x7C54,0x801C,
+0x849B,0x89F3,0x904D,0x97D9,0xA0D1,0xAB7A,0xB826,0xC735,
+/* A:1d B:08 */
+0x68FF,0x6914,0x692E,0x694D,0x6971,0x699C,0x69CF,0x6A0C,
+0x6A55,0x6AAB,0x6B12,0x6B8B,0x6C1C,0x6CC8,0x6D94,0x6E87,
+0x6FA8,0x70FF,0x7297,0x747B,0x76BB,0x7968,0x7C95,0x805C,
+0x84D9,0x8A2F,0x9086,0x980F,0xA104,0xABA9,0xB850,0xC759,
+/* A:1d B:09 */
+0x6955,0x696B,0x6985,0x69A3,0x69C7,0x69F3,0x6A26,0x6A63,
+0x6AAB,0x6B01,0x6B67,0x6BE1,0x6C71,0x6D1D,0x6DE9,0x6EDB,
+0x6FFB,0x7152,0x72E9,0x74CD,0x770B,0x79B7,0x7CE3,0x80A8,
+0x8523,0x8A76,0x90CA,0x9850,0xA141,0xABE1,0xB882,0xC784,
+/* A:1d B:0a */
+0x69BD,0x69D2,0x69EC,0x6A0A,0x6A2E,0x6A59,0x6A8D,0x6AC9,
+0x6B12,0x6B67,0x6BCD,0x6C47,0x6CD7,0x6D82,0x6E4D,0x6F3F,
+0x705F,0x71B5,0x734B,0x752D,0x776B,0x7A15,0x7D3F,0x8102,
+0x857B,0x8ACB,0x911C,0x989D,0xA189,0xAC23,0xB8BD,0xC7B7,
+/* A:1d B:0b */
+0x6A37,0x6A4D,0x6A66,0x6A85,0x6AA9,0x6AD4,0x6B07,0x6B43,
+0x6B8B,0x6BE1,0x6C47,0x6CC0,0x6D4F,0x6DFA,0x6EC5,0x6FB6,
+0x70D5,0x722A,0x73BF,0x75A0,0x77DD,0x7A85,0x7DAD,0x816D,
+0x85E3,0x8B30,0x917C,0x98F9,0xA1DF,0xAC72,0xB903,0xC7F3,
+/* A:1d B:0c */
+0x6AC9,0x6ADE,0x6AF8,0x6B16,0x6B3A,0x6B65,0x6B98,0x6BD4,
+0x6C1C,0x6C71,0x6CD7,0x6D4F,0x6DDF,0x6E89,0x6F53,0x7044,
+0x7162,0x72B5,0x7449,0x7629,0x7863,0x7B09,0x7E2F,0x81ED,
+0x865F,0x8BA7,0x91EF,0x9966,0xA244,0xACCF,0xB957,0xC83B,
+/* A:1d B:0d */
+0x6B76,0x6B8B,0x6BA5,0x6BC3,0x6BE7,0x6C11,0x6C44,0x6C80,
+0x6CC8,0x6D1D,0x6D82,0x6DFA,0x6E89,0x6F32,0x6FFC,0x70EC,
+0x7209,0x735B,0x74ED,0x76CC,0x7904,0x7BA7,0x7ECA,0x8284,
+0x86F2,0x8C36,0x9277,0x99E7,0xA2BD,0xAD3E,0xB9BA,0xC890,
+/* A:1d B:0e */
+0x6C44,0x6C59,0x6C72,0x6C90,0x6CB4,0x6CDF,0x6D11,0x6D4D,
+0x6D94,0x6DE9,0x6E4D,0x6EC5,0x6F53,0x6FFC,0x70C5,0x71B3,
+0x72CF,0x7420,0x75B1,0x778D,0x79C3,0x7C63,0x7F82,0x8338,
+0x87A1,0x8CDF,0x9319,0x9A81,0xA34D,0xADC2,0xBA30,0xC8F6,
+/* A:1d B:0f */
+0x6D39,0x6D4E,0x6D67,0x6D85,0x6DA8,0x6DD2,0x6E05,0x6E40,
+0x6E87,0x6EDB,0x6F3F,0x6FB6,0x7044,0x70EC,0x71B3,0x72A1,
+0x73BB,0x750A,0x7699,0x7872,0x7AA5,0x7D42,0x805D,0x840E,
+0x8871,0x8DA8,0x93DA,0x9B37,0xA3F8,0xAE5F,0xBABC,0xC96E,
+/* A:1d B:10 */
+0x6E5B,0x6E70,0x6E89,0x6EA7,0x6ECA,0x6EF4,0x6F26,0x6F61,
+0x6FA8,0x6FFB,0x705F,0x70D5,0x7162,0x7209,0x72CF,0x73BB,
+0x74D3,0x7620,0x77AC,0x7983,0x7BB2,0x7E4B,0x8161,0x850C,
+0x8968,0x8E97,0x94BF,0x9C11,0xA4C3,0xAF1A,0xBB63,0xC9FE,
+/* A:1d B:11 */
+0x6FB5,0x6FCA,0x6FE2,0x7000,0x7023,0x704D,0x707E,0x70B9,
+0x70FF,0x7152,0x71B5,0x722A,0x72B5,0x735B,0x7420,0x750A,
+0x7620,0x776B,0x78F4,0x7AC7,0x7CF2,0x7F86,0x8296,0x863A,
+0x8A8E,0x8FB3,0x95CF,0x9D13,0xA5B5,0xAFF8,0xBC29,0xCAA8,
+/* A:1d B:12 */
+0x7150,0x7164,0x717D,0x719A,0x71BD,0x71E6,0x7217,0x7251,
+0x7297,0x72E9,0x734B,0x73BF,0x7449,0x74ED,0x75B1,0x7699,
+0x77AC,0x78F4,0x7A7A,0x7C49,0x7E6F,0x80FD,0x8406,0x87A1,
+0x8BEB,0x9104,0x9713,0x9E46,0xA6D4,0xB0FF,0xBD15,0xCB72,
+/* A:1d B:13 */
+0x7338,0x734C,0x7364,0x7381,0x73A4,0x73CC,0x73FD,0x7437,
+0x747B,0x74CD,0x752D,0x75A0,0x7629,0x76CC,0x778D,0x7872,
+0x7983,0x7AC7,0x7C49,0x7E13,0x8033,0x82BA,0x85BB,0x894C,
+0x8D8A,0x9295,0x9893,0x9FB2,0xA829,0xB238,0xBE2D,0xCC63,
+/* A:1d B:14 */
+0x757C,0x7590,0x75A8,0x75C4,0x75E6,0x760F,0x763F,0x7677,
+0x76BB,0x770B,0x776B,0x77DD,0x7863,0x7904,0x79C3,0x7AA5,
+0x7BB2,0x7CF2,0x7E6F,0x8033,0x824C,0x84CB,0x87C2,0x8B47,
+0x8F77,0x9472,0x9A5C,0xA163,0xA9BE,0xB3AC,0xBF7A,0xCD80,
+/* A:1d B:15 */
+0x782D,0x7841,0x7859,0x7875,0x7896,0x78BE,0x78ED,0x7925,
+0x7968,0x79B7,0x7A15,0x7A85,0x7B09,0x7BA7,0x7C63,0x7D42,
+0x7E4B,0x7F86,0x80FD,0x82BA,0x84CB,0x873F,0x8A2A,0x8DA2,
+0x91C2,0x96A8,0x9C7B,0xA366,0xABA0,0xB567,0xC105,0xCED4,
+/* A:1d B:16 */
+0x7B61,0x7B74,0x7B8B,0x7BA7,0x7BC8,0x7BEF,0x7C1D,0x7C54,
+0x7C95,0x7CE3,0x7D3F,0x7DAD,0x7E2F,0x7ECA,0x7F82,0x805D,
+0x8161,0x8296,0x8406,0x85BB,0x87C2,0x8A2A,0x8D08,0x906F,
+0x947A,0x9949,0x9F00,0xA5CB,0xADDD,0xB775,0xC2DB,0xD068,
+/* A:1d B:17 */
+0x7F2E,0x7F42,0x7F58,0x7F73,0x7F93,0x7FB9,0x7FE6,0x801C,
+0x805C,0x80A8,0x8102,0x816D,0x81ED,0x8284,0x8338,0x840E,
+0x850C,0x863A,0x87A1,0x894C,0x8B47,0x8DA2,0x906F,0x93C2,
+0x97B6,0x9C69,0xA1FF,0xA8A2,0xB085,0xB9E5,0xC50A,0xD248,
+/* A:1d B:18 */
+0x83B4,0x83C6,0x83DD,0x83F7,0x8416,0x843B,0x8467,0x849B,
+0x84D9,0x8523,0x857B,0x85E3,0x865F,0x86F2,0x87A1,0x8871,
+0x8968,0x8A8E,0x8BEB,0x8D8A,0x8F77,0x91C2,0x947A,0x97B6,
+0x9B8F,0xA020,0xA58E,0xAC03,0xB3AE,0xBCCC,0xC7A2,0xD482,
+/* A:1d B:19 */
+0x8914,0x8926,0x893B,0x8954,0x8972,0x8996,0x89C0,0x89F3,
+0x8A2F,0x8A76,0x8ACB,0x8B30,0x8BA7,0x8C36,0x8CDF,0x8DA8,
+0x8E97,0x8FB3,0x9104,0x9295,0x9472,0x96A8,0x9949,0x9C69,
+0xA020,0xA48A,0xA9CA,0xB006,0xB770,0xC03F,0xCAB7,0xD728,
+/* A:1d B:1a */
+0x8F77,0x8F88,0x8F9C,0x8FB4,0x8FD1,0x8FF3,0x901C,0x904D,
+0x9086,0x90CA,0x911C,0x917C,0x91EF,0x9277,0x9319,0x93DA,
+0x94BF,0x95CF,0x9713,0x9893,0x9A5C,0x9C7B,0x9F00,0xA1FF,
+0xA58E,0xA9CA,0xAED1,0xB4CB,0xBBE6,0xC458,0xCE60,0xDA4E,
+/* A:1d B:1b */
+0x970E,0x971E,0x9731,0x9748,0x9764,0x9784,0x97AB,0x97D9,
+0x980F,0x9850,0x989D,0x98F9,0x9966,0x99E7,0x9A81,0x9B37,
+0x9C11,0x9D13,0x9E46,0x9FB2,0xA163,0xA366,0xA5CB,0xA8A2,
+0xAC03,0xB006,0xB4CB,0xBA77,0xC134,0xC936,0xD2BB,0xDE0B,
+/* A:1d B:1c */
+0xA013,0xA022,0xA035,0xA04A,0xA064,0xA082,0xA0A6,0xA0D1,
+0xA104,0xA141,0xA189,0xA1DF,0xA244,0xA2BD,0xA34D,0xA3F8,
+0xA4C3,0xA5B5,0xA6D4,0xA829,0xA9BE,0xABA0,0xADDD,0xB085,
+0xB3AE,0xB770,0xBBE6,0xC134,0xC782,0xCF00,0xD7E8,0xE27D,
+/* A:1d B:1d */
+0xAACC,0xAADA,0xAAEB,0xAAFE,0xAB16,0xAB32,0xAB53,0xAB7A,
+0xABA9,0xABE1,0xAC23,0xAC72,0xACCF,0xAD3E,0xADC2,0xAE5F,
+0xAF1A,0xAFF8,0xB0FF,0xB238,0xB3AC,0xB567,0xB775,0xB9E5,
+0xBCCC,0xC03F,0xC458,0xC936,0xCF00,0xD5E1,0xDE0E,0xE7C6,
+/* A:1d B:1e */
+0xB78A,0xB797,0xB7A6,0xB7B7,0xB7CC,0xB7E5,0xB803,0xB826,
+0xB850,0xB882,0xB8BD,0xB903,0xB957,0xB9BA,0xBA30,0xBABC,
+0xBB63,0xBC29,0xBD15,0xBE2D,0xBF7A,0xC105,0xC2DB,0xC50A,
+0xC7A2,0xCAB7,0xCE60,0xD2BB,0xD7E8,0xDE0E,0xE55D,0xEE0D,
+/* A:1d B:1f */
+0xC6AF,0xC6BA,0xC6C7,0xC6D6,0xC6E8,0xC6FD,0xC717,0xC735,
+0xC759,0xC784,0xC7B7,0xC7F3,0xC83B,0xC890,0xC8F6,0xC96E,
+0xC9FE,0xCAA8,0xCB72,0xCC63,0xCD80,0xCED4,0xD068,0xD248,
+0xD482,0xD728,0xDA4E,0xDE0B,0xE27D,0xE7C6,0xEE0D,0xF583,
+/* A: 968D89C0 */
+/* A:1e B:00 */
+0x7B51,0x7B65,0x7B7C,0x7B98,0x7BB8,0x7BE0,0x7C0E,0x7C45,
+0x7C86,0x7CD4,0x7D31,0x7D9F,0x7E21,0x7EBD,0x7F75,0x8051,
+0x8156,0x828B,0x83FC,0x85B2,0x87BA,0x8A24,0x8D03,0x906C,
+0x947B,0x994C,0x9F07,0xA5D5,0xADEC,0xB78A,0xC2F8,0xD08D,
+/* A:1e B:01 */
+0x7B65,0x7B78,0x7B90,0x7BAB,0x7BCC,0x7BF3,0x7C21,0x7C58,
+0x7C9A,0x7CE8,0x7D44,0x7DB2,0x7E35,0x7ED0,0x7F88,0x8064,
+0x8168,0x829E,0x840E,0x85C4,0x87CC,0x8A36,0x8D15,0x907E,
+0x948B,0x995C,0x9F16,0xA5E4,0xADFA,0xB797,0xC303,0xD097,
+/* A:1e B:02 */
+0x7B7C,0x7B90,0x7BA7,0x7BC2,0x7BE3,0x7C0A,0x7C38,0x7C70,
+0x7CB1,0x7CFF,0x7D5B,0x7DC9,0x7E4C,0x7EE7,0x7F9F,0x807A,
+0x817F,0x82B4,0x8424,0x85DA,0x87E1,0x8A4B,0x8D29,0x9092,
+0x949F,0x996F,0x9F28,0xA5F5,0xAE0A,0xB7A6,0xC310,0xD0A2,
+/* A:1e B:03 */
+0x7B98,0x7BAB,0x7BC2,0x7BDE,0x7BFF,0x7C26,0x7C54,0x7C8B,
+0x7CCC,0x7D1A,0x7D76,0x7DE4,0x7E67,0x7F02,0x7FBA,0x8095,
+0x8199,0x82CF,0x843F,0x85F4,0x87FB,0x8A64,0x8D42,0x90AA,
+0x94B6,0x9986,0x9F3E,0xA60A,0xAE1E,0xB7B7,0xC320,0xD0AF,
+/* A:1e B:04 */
+0x7BB8,0x7BCC,0x7BE3,0x7BFF,0x7C1F,0x7C46,0x7C75,0x7CAC,
+0x7CED,0x7D3B,0x7D97,0x7E05,0x7E87,0x7F22,0x7FDA,0x80B5,
+0x81B9,0x82EE,0x845E,0x8612,0x8819,0x8A82,0x8D5F,0x90C7,
+0x94D2,0x99A1,0x9F58,0xA622,0xAE34,0xB7CC,0xC333,0xD0C0,
+/* A:1e B:05 */
+0x7BE0,0x7BF3,0x7C0A,0x7C26,0x7C46,0x7C6D,0x7C9C,0x7CD2,
+0x7D14,0x7D61,0x7DBE,0x7E2B,0x7EAD,0x7F48,0x8000,0x80DB,
+0x81DF,0x8314,0x8483,0x8637,0x883D,0x8AA6,0x8D82,0x90E9,
+0x94F3,0x99C1,0x9F76,0xA63F,0xAE50,0xB7E5,0xC349,0xD0D3,
+/* A:1e B:06 */
+0x7C0E,0x7C21,0x7C38,0x7C54,0x7C75,0x7C9C,0x7CCA,0x7D01,
+0x7D42,0x7D8F,0x7DEB,0x7E59,0x7EDB,0x7F76,0x802D,0x8108,
+0x820B,0x8340,0x84AF,0x8662,0x8868,0x8AD0,0x8DAC,0x9111,
+0x951B,0x99E7,0x9F9B,0xA662,0xAE70,0xB803,0xC364,0xD0E9,
+/* A:1e B:07 */
+0x7C45,0x7C58,0x7C70,0x7C8B,0x7CAC,0x7CD2,0x7D01,0x7D37,
+0x7D78,0x7DC6,0x7E22,0x7E8F,0x7F11,0x7FAC,0x8063,0x813D,
+0x8241,0x8375,0x84E3,0x8696,0x889B,0x8B02,0x8DDD,0x9141,
+0x954A,0x9A14,0x9FC6,0xA68B,0xAE96,0xB826,0xC383,0xD104,
+/* A:1e B:08 */
+0x7C86,0x7C9A,0x7CB1,0x7CCC,0x7CED,0x7D14,0x7D42,0x7D78,
+0x7DB9,0x7E07,0x7E63,0x7ED0,0x7F52,0x7FEC,0x80A3,0x817D,
+0x8280,0x83B3,0x8521,0x86D4,0x88D8,0x8B3E,0x8E18,0x917B,
+0x9581,0x9A4A,0x9FFA,0xA6BC,0xAEC4,0xB850,0xC3A8,0xD124,
+/* A:1e B:09 */
+0x7CD4,0x7CE8,0x7CFF,0x7D1A,0x7D3B,0x7D61,0x7D8F,0x7DC6,
+0x7E07,0x7E54,0x7EB0,0x7F1D,0x7F9E,0x8038,0x80EF,0x81C8,
+0x82CB,0x83FE,0x856B,0x871D,0x8920,0x8B85,0x8E5D,0x91BF,
+0x95C3,0x9A8A,0xA037,0xA6F6,0xAEFA,0xB882,0xC3D5,0xD14B,
+/* A:1e B:0a */
+0x7D31,0x7D44,0x7D5B,0x7D76,0x7D97,0x7DBE,0x7DEB,0x7E22,
+0x7E63,0x7EB0,0x7F0B,0x7F78,0x7FF9,0x8093,0x8149,0x8222,
+0x8324,0x8456,0x85C2,0x8773,0x8976,0x8BD9,0x8EB0,0x920F,
+0x9612,0x9AD6,0xA080,0xA73B,0xAF3B,0xB8BD,0xC40A,0xD178,
+/* A:1e B:0b */
+0x7D9F,0x7DB2,0x7DC9,0x7DE4,0x7E05,0x7E2B,0x7E59,0x7E8F,
+0x7ED0,0x7F1D,0x7F78,0x7FE4,0x8065,0x80FE,0x81B4,0x828D,
+0x838E,0x84C0,0x862B,0x87DA,0x89DC,0x8C3D,0x8F12,0x9270,
+0x966F,0x9B30,0xA0D6,0xA78D,0xAF87,0xB903,0xC449,0xD1AE,
+/* A:1e B:0c */
+0x7E21,0x7E35,0x7E4C,0x7E67,0x7E87,0x7EAD,0x7EDB,0x7F11,
+0x7F52,0x7F9E,0x7FF9,0x8065,0x80E6,0x817E,0x8234,0x830B,
+0x840C,0x853D,0x86A7,0x8855,0x8A55,0x8CB4,0x8F87,0x92E2,
+0x96DE,0x9B9B,0xA13D,0xA7EE,0xAFE3,0xB957,0xC493,0xD1EE,
+/* A:1e B:0d */
+0x7EBD,0x7ED0,0x7EE7,0x7F02,0x7F22,0x7F48,0x7F76,0x7FAC,
+0x7FEC,0x8038,0x8093,0x80FE,0x817E,0x8216,0x82CB,0x83A2,
+0x84A2,0x85D1,0x873A,0x88E7,0x8AE4,0x8D42,0x9012,0x9369,
+0x9762,0x9C1B,0xA1B7,0xA862,0xB04F,0xB9BA,0xC4EC,0xD23A,
+/* A:1e B:0e */
+0x7F75,0x7F88,0x7F9F,0x7FBA,0x7FDA,0x8000,0x802D,0x8063,
+0x80A3,0x80EF,0x8149,0x81B4,0x8234,0x82CB,0x837F,0x8455,
+0x8554,0x8682,0x87E9,0x8994,0x8B8F,0x8DEA,0x90B7,0x940B,
+0x97FF,0x9CB2,0xA248,0xA8EC,0xB0D0,0xBA30,0xC555,0xD294,
+/* A:1e B:0f */
+0x8051,0x8064,0x807A,0x8095,0x80B5,0x80DB,0x8108,0x813D,
+0x817D,0x81C8,0x8222,0x828D,0x830B,0x83A2,0x8455,0x852A,
+0x8627,0x8754,0x88B9,0x8A62,0x8C5A,0x8EB2,0x917B,0x94CA,
+0x98B9,0x9D66,0xA2F5,0xA98F,0xB168,0xBABC,0xC5D3,0xD300,
+/* A:1e B:10 */
+0x8156,0x8168,0x817F,0x8199,0x81B9,0x81DF,0x820B,0x8241,
+0x8280,0x82CB,0x8324,0x838E,0x840C,0x84A2,0x8554,0x8627,
+0x8722,0x884D,0x89B0,0x8B56,0x8D4C,0x8FA0,0x9264,0x95AE,
+0x9997,0x9E3C,0xA3C2,0xAA52,0xB21E,0xBB63,0xC668,0xD37F,
+/* A:1e B:11 */
+0x828B,0x829E,0x82B4,0x82CF,0x82EE,0x8314,0x8340,0x8375,
+0x83B3,0x83FE,0x8456,0x84C0,0x853D,0x85D1,0x8682,0x8754,
+0x884D,0x8976,0x8AD6,0x8C79,0x8E6B,0x90BA,0x9379,0x96BD,
+0x9A9E,0x9F3A,0xA4B5,0xAB39,0xB2F6,0xBC29,0xC719,0xD417,
+/* A:1e B:12 */
+0x83FC,0x840E,0x8424,0x843F,0x845E,0x8483,0x84AF,0x84E3,
+0x8521,0x856B,0x85C2,0x862B,0x86A7,0x873A,0x87E9,0x88B9,
+0x89B0,0x8AD6,0x8C33,0x8DD2,0x8FC0,0x920A,0x94C3,0x97FF,
+0x9BD7,0xA069,0xA5D7,0xAC4B,0xB3F7,0xBD15,0xC7EB,0xD4CC,
+/* A:1e B:13 */
+0x85B2,0x85C4,0x85DA,0x85F4,0x8612,0x8637,0x8662,0x8696,
+0x86D4,0x871D,0x8773,0x87DA,0x8855,0x88E7,0x8994,0x8A62,
+0x8B56,0x8C79,0x8DD2,0x8F6D,0x9155,0x9399,0x964A,0x997D,
+0x9D4B,0xA1D0,0xA72F,0xAD92,0xB528,0xBE2D,0xC8E5,0xD5A2,
+/* A:1e B:14 */
+0x87BA,0x87CC,0x87E1,0x87FB,0x8819,0x883D,0x8868,0x889B,
+0x88D8,0x8920,0x8976,0x89DC,0x8A55,0x8AE4,0x8B8F,0x8C5A,
+0x8D4C,0x8E6B,0x8FC0,0x9155,0x9336,0x9573,0x981B,0x9B44,
+0x9F05,0xA37B,0xA8C8,0xAF15,0xB693,0xBF7A,0xCA0E,0xD6A1,
+/* A:1e B:15 */
+0x8A24,0x8A36,0x8A4B,0x8A64,0x8A82,0x8AA6,0x8AD0,0x8B02,
+0x8B3E,0x8B85,0x8BD9,0x8C3D,0x8CB4,0x8D42,0x8DEA,0x8EB2,
+0x8FA0,0x90BA,0x920A,0x9399,0x9573,0x97A6,0x9A44,0x9D60,
+0xA112,0xA576,0xAAAE,0xB0E2,0xB842,0xC105,0xCB6F,0xD7D0,
+/* A:1e B:16 */
+0x8D03,0x8D15,0x8D29,0x8D42,0x8D5F,0x8D82,0x8DAC,0x8DDD,
+0x8E18,0x8E5D,0x8EB0,0x8F12,0x8F87,0x9012,0x90B7,0x917B,
+0x9264,0x9379,0x94C3,0x964A,0x981B,0x9A44,0x9CD5,0x9FE2,
+0xA382,0xA7D1,0xACF0,0xB306,0xBA42,0xC2DB,0xCD13,0xD938,
+/* A:1e B:17 */
+0x906C,0x907E,0x9092,0x90AA,0x90C7,0x90E9,0x9111,0x9141,
+0x917B,0x91BF,0x920F,0x9270,0x92E2,0x9369,0x940B,0x94CA,
+0x95AE,0x96BD,0x97FF,0x997D,0x9B44,0x9D60,0x9FE2,0xA2DD,
+0xA668,0xAA9E,0xAF9F,0xB592,0xBCA3,0xC50A,0xCF06,0xDAE4,
+/* A:1e B:18 */
+0x947B,0x948B,0x949F,0x94B6,0x94D2,0x94F3,0x951B,0x954A,
+0x9581,0x95C3,0x9612,0x966F,0x96DE,0x9762,0x97FF,0x98B9,
+0x9997,0x9A9E,0x9BD7,0x9D4B,0x9F05,0xA112,0xA382,0xA668,
+0xA9DA,0xADF2,0xB2CF,0xB897,0xBF77,0xC7A2,0xD157,0xDCE0,
+/* A:1e B:19 */
+0x994C,0x995C,0x996F,0x9986,0x99A1,0x99C1,0x99E7,0x9A14,
+0x9A4A,0x9A8A,0x9AD6,0x9B30,0x9B9B,0x9C1B,0x9CB2,0x9D66,
+0x9E3C,0x9F3A,0xA069,0xA1D0,0xA37B,0xA576,0xA7D1,0xAA9E,
+0xADF2,0xB1E6,0xB699,0xBC2F,0xC2D3,0xCAB7,0xD417,0xDF3D,
+/* A:1e B:1a */
+0x9F07,0x9F16,0x9F28,0x9F3E,0x9F58,0x9F76,0x9F9B,0x9FC6,
+0x9FFA,0xA037,0xA080,0xA0D6,0xA13D,0xA1B7,0xA248,0xA2F5,
+0xA3C2,0xA4B5,0xA5D7,0xA72F,0xA8C8,0xAAAE,0xACF0,0xAF9F,
+0xB2CF,0xB699,0xBB1A,0xC074,0xC6D1,0xCE60,0xD75D,0xE20B,
+/* A:1e B:1b */
+0xA5D5,0xA5E4,0xA5F5,0xA60A,0xA622,0xA63F,0xA662,0xA68B,
+0xA6BC,0xA6F6,0xA73B,0xA78D,0xA7EE,0xA862,0xA8EC,0xA98F,
+0xAA52,0xAB39,0xAC4B,0xAD92,0xAF15,0xB0E2,0xB306,0xB592,
+0xB897,0xBC2F,0xC074,0xC588,0xCB90,0xD2BB,0xDB40,0xE561,
+/* A:1e B:1c */
+0xADEC,0xADFA,0xAE0A,0xAE1E,0xAE34,0xAE50,0xAE70,0xAE96,
+0xAEC4,0xAEFA,0xAF3B,0xAF87,0xAFE3,0xB04F,0xB0D0,0xB168,
+0xB21E,0xB2F6,0xB3F7,0xB528,0xB693,0xB842,0xBA42,0xBCA3,
+0xBF77,0xC2D3,0xC6D1,0xCB90,0xD134,0xD7E8,0xDFDF,0xE957,
+/* A:1e B:1d */
+0xB78A,0xB797,0xB7A6,0xB7B7,0xB7CC,0xB7E5,0xB803,0xB826,
+0xB850,0xB882,0xB8BD,0xB903,0xB957,0xB9BA,0xBA30,0xBABC,
+0xBB63,0xBC29,0xBD15,0xBE2D,0xBF7A,0xC105,0xC2DB,0xC50A,
+0xC7A2,0xCAB7,0xCE60,0xD2BB,0xD7E8,0xDE0E,0xE55D,0xEE0D,
+/* A:1e B:1e */
+0xC2F8,0xC303,0xC310,0xC320,0xC333,0xC349,0xC364,0xC383,
+0xC3A8,0xC3D5,0xC40A,0xC449,0xC493,0xC4EC,0xC555,0xC5D3,
+0xC668,0xC719,0xC7EB,0xC8E5,0xCA0E,0xCB6F,0xCD13,0xCF06,
+0xD157,0xD417,0xD75D,0xDB40,0xDFDF,0xE55D,0xEBE4,0xF3A6,
+/* A:1e B:1f */
+0xD08D,0xD097,0xD0A2,0xD0AF,0xD0C0,0xD0D3,0xD0E9,0xD104,
+0xD124,0xD14B,0xD178,0xD1AE,0xD1EE,0xD23A,0xD294,0xD300,
+0xD37F,0xD417,0xD4CC,0xD5A2,0xD6A1,0xD7D0,0xD938,0xDAE4,
+0xDCE0,0xDF3D,0xE20B,0xE561,0xE957,0xEE0D,0xF3A6,0xFA4D,
+/* A: 968D89C0 */
+/* A:1f B:00 */
+0x92B2,0x92C3,0x92D7,0x92EF,0x930B,0x932D,0x9355,0x9384,
+0x93BD,0x9400,0x9450,0x94AF,0x9520,0x95A6,0x9645,0x9703,
+0x97E4,0x98EF,0x9A2D,0x9BA7,0x9D68,0x9F7E,0xA1F8,0xA4EA,
+0xA86B,0xAC94,0xB186,0xB766,0xBE62,0xC6AF,0xD08D,0xDC47,
+/* A:1f B:01 */
+0x92C3,0x92D4,0x92E8,0x9300,0x931C,0x933E,0x9366,0x9395,
+0x93CE,0x9411,0x9461,0x94BF,0x9530,0x95B6,0x9656,0x9713,
+0x97F4,0x98FF,0x9A3D,0x9BB7,0x9D78,0x9F8D,0xA207,0xA4F9,
+0xA879,0xACA2,0xB193,0xB773,0xBE6E,0xC6BA,0xD097,0xDC4F,
+/* A:1f B:02 */
+0x92D7,0x92E8,0x92FC,0x9314,0x9330,0x9352,0x937A,0x93A9,
+0x93E2,0x9425,0x9474,0x94D3,0x9544,0x95CA,0x9669,0x9726,
+0x9807,0x9912,0x9A50,0x9BCA,0x9D8A,0x9FA0,0xA219,0xA50B,
+0xA88A,0xACB2,0xB1A3,0xB782,0xBE7C,0xC6C7,0xD0A2,0xDC59,
+/* A:1f B:03 */
+0x92EF,0x9300,0x9314,0x932B,0x9348,0x9369,0x9391,0x93C1,
+0x93F9,0x943C,0x948C,0x94EB,0x955B,0x95E1,0x9680,0x973D,
+0x981E,0x9929,0x9A67,0x9BE0,0x9DA0,0x9FB5,0xA22F,0xA51F,
+0xA89E,0xACC5,0xB1B5,0xB793,0xBE8C,0xC6D6,0xD0AF,0xDC64,
+/* A:1f B:04 */
+0x930B,0x931C,0x9330,0x9348,0x9364,0x9386,0x93AD,0x93DD,
+0x9415,0x9458,0x94A8,0x9507,0x9577,0x95FD,0x969C,0x9759,
+0x983A,0x9944,0x9A82,0x9BFB,0x9DBB,0x9FCF,0xA248,0xA538,
+0xA8B6,0xACDD,0xB1CB,0xB7A8,0xBEA0,0xC6E8,0xD0C0,0xDC72,
+/* A:1f B:05 */
+0x932D,0x933E,0x9352,0x9369,0x9386,0x93A7,0x93CF,0x93FE,
+0x9437,0x947A,0x94C9,0x9528,0x9598,0x961E,0x96BD,0x977A,
+0x985A,0x9965,0x9AA2,0x9C1A,0x9DDA,0x9FEE,0xA266,0xA556,
+0xA8D3,0xACF8,0xB1E6,0xB7C1,0xBEB7,0xC6FD,0xD0D3,0xDC82,
+/* A:1f B:06 */
+0x9355,0x9366,0x937A,0x9391,0x93AD,0x93CF,0x93F7,0x9426,
+0x945E,0x94A1,0x94F1,0x954F,0x95C0,0x9645,0x96E4,0x97A0,
+0x9881,0x998B,0x9AC7,0x9C40,0x9DFF,0xA012,0xA28A,0xA579,
+0xA8F5,0xAD19,0xB205,0xB7DF,0xBED3,0xC717,0xD0E9,0xDC96,
+/* A:1f B:07 */
+0x9384,0x9395,0x93A9,0x93C1,0x93DD,0x93FE,0x9426,0x9456,
+0x948E,0x94D1,0x9520,0x957E,0x95EE,0x9674,0x9712,0x97CF,
+0x98AE,0x99B8,0x9AF5,0x9C6C,0x9E2B,0xA03E,0xA2B4,0xA5A2,
+0xA91D,0xAD40,0xB22B,0xB802,0xBEF4,0xC735,0xD104,0xDCAD,
+/* A:1f B:08 */
+0x93BD,0x93CE,0x93E2,0x93F9,0x9415,0x9437,0x945E,0x948E,
+0x94C6,0x9509,0x9558,0x95B6,0x9626,0x96AB,0x9749,0x9805,
+0x98E5,0x99EE,0x9B2A,0x9CA1,0x9E5F,0xA071,0xA2E7,0xA5D3,
+0xA94D,0xAD6E,0xB257,0xB82C,0xBF1C,0xC759,0xD124,0xDCC8,
+/* A:1f B:09 */
+0x9400,0x9411,0x9425,0x943C,0x9458,0x947A,0x94A1,0x94D1,
+0x9509,0x954B,0x959A,0x95F8,0x9668,0x96ED,0x978B,0x9847,
+0x9926,0x9A2F,0x9B6A,0x9CE0,0x9E9D,0xA0AE,0xA323,0xA60E,
+0xA986,0xADA5,0xB28C,0xB85E,0xBF4A,0xC784,0xD14B,0xDCE9,
+/* A:1f B:0a */
+0x9450,0x9461,0x9474,0x948C,0x94A8,0x94C9,0x94F1,0x9520,
+0x9558,0x959A,0x95E9,0x9647,0x96B7,0x973B,0x97D9,0x9894,
+0x9973,0x9A7B,0x9BB5,0x9D2B,0x9EE7,0xA0F7,0xA36A,0xA654,
+0xA9CA,0xADE7,0xB2CA,0xB89A,0xBF82,0xC7B7,0xD178,0xDD10,
+/* A:1f B:0b */
+0x94AF,0x94BF,0x94D3,0x94EB,0x9507,0x9528,0x954F,0x957E,
+0x95B6,0x95F8,0x9647,0x96A5,0x9714,0x9798,0x9835,0x98F0,
+0x99CE,0x9AD6,0x9C0F,0x9D84,0x9F3F,0xA14D,0xA3BF,0xA6A7,
+0xAA1A,0xAE35,0xB315,0xB8E0,0xBFC4,0xC7F3,0xD1AE,0xDD3E,
+/* A:1f B:0c */
+0x9520,0x9530,0x9544,0x955B,0x9577,0x9598,0x95C0,0x95EE,
+0x9626,0x9668,0x96B7,0x9714,0x9783,0x9807,0x98A3,0x995E,
+0x9A3B,0x9B42,0x9C7A,0x9DEE,0x9FA7,0xA1B4,0xA424,0xA709,
+0xAA7A,0xAE91,0xB36D,0xB934,0xC012,0xC83B,0xD1EE,0xDD75,
+/* A:1f B:0d */
+0x95A6,0x95B6,0x95CA,0x95E1,0x95FD,0x961E,0x9645,0x9674,
+0x96AB,0x96ED,0x973B,0x9798,0x9807,0x988A,0x9926,0x99E0,
+0x9ABC,0x9BC2,0x9CF9,0x9E6C,0xA023,0xA22E,0xA49C,0xA77E,
+0xAAEC,0xAEFF,0xB3D6,0xB998,0xC06F,0xC890,0xD23A,0xDDB6,
+/* A:1f B:0e */
+0x9645,0x9656,0x9669,0x9680,0x969C,0x96BD,0x96E4,0x9712,
+0x9749,0x978B,0x97D9,0x9835,0x98A3,0x9926,0x99C1,0x9A7A,
+0x9B56,0x9C5A,0x9D90,0x9F01,0xA0B7,0xA2BF,0xA52A,0xA809,
+0xAB73,0xAF81,0xB453,0xBA0E,0xC0DE,0xC8F6,0xD294,0xDE03,
+/* A:1f B:0f */
+0x9703,0x9713,0x9726,0x973D,0x9759,0x977A,0x97A0,0x97CF,
+0x9805,0x9847,0x9894,0x98F0,0x995E,0x99E0,0x9A7A,0x9B32,
+0x9C0C,0x9D10,0x9E44,0x9FB2,0xA166,0xA36C,0xA5D3,0xA8AE,
+0xAC13,0xB01C,0xB4E8,0xBA9B,0xC161,0xC96E,0xD300,0xDE5F,
+/* A:1f B:10 */
+0x97E4,0x97F4,0x9807,0x981E,0x983A,0x985A,0x9881,0x98AE,
+0x98E5,0x9926,0x9973,0x99CE,0x9A3B,0x9ABC,0x9B56,0x9C0C,
+0x9CE5,0x9DE7,0x9F19,0xA085,0xA236,0xA439,0xA69C,0xA973,
+0xACD2,0xB0D5,0xB599,0xBB42,0xC1FE,0xC9FE,0xD37F,0xDECC,
+/* A:1f B:11 */
+0x98EF,0x98FF,0x9912,0x9929,0x9944,0x9965,0x998B,0x99B8,
+0x99EE,0x9A2F,0x9A7B,0x9AD6,0x9B42,0x9BC2,0x9C5A,0x9D10,
+0x9DE7,0x9EE7,0xA017,0xA180,0xA32E,0xA52C,0xA78B,0xAA5C,
+0xADB5,0xB1B0,0xB66A,0xBC09,0xC2B7,0xCAA8,0xD417,0xDF4E,
+/* A:1f B:12 */
+0x9A2D,0x9A3D,0x9A50,0x9A67,0x9A82,0x9AA2,0x9AC7,0x9AF5,
+0x9B2A,0x9B6A,0x9BB5,0x9C0F,0x9C7A,0x9CF9,0x9D90,0x9E44,
+0x9F19,0xA017,0xA144,0xA2AA,0xA454,0xA64E,0xA8A7,0xAB72,
+0xAEC3,0xB2B4,0xB764,0xBCF6,0xC394,0xCB72,0xD4CC,0xDFE8,
+/* A:1f B:13 */
+0x9BA7,0x9BB7,0x9BCA,0x9BE0,0x9BFB,0x9C1A,0x9C40,0x9C6C,
+0x9CA1,0x9CE0,0x9D2B,0x9D84,0x9DEE,0x9E6C,0x9F01,0x9FB2,
+0xA085,0xA180,0xA2AA,0xA40D,0xA5B2,0xA7A6,0xA9F9,0xACBB,
+0xB003,0xB3EA,0xB88C,0xBE0F,0xC49B,0xCC63,0xD5A2,0xE0A0,
+/* A:1f B:14 */
+0x9D68,0x9D78,0x9D8A,0x9DA0,0x9DBB,0x9DDA,0x9DFF,0x9E2B,
+0x9E5F,0x9E9D,0x9EE7,0x9F3F,0x9FA7,0xA023,0xA0B7,0xA166,
+0xA236,0xA32E,0xA454,0xA5B2,0xA751,0xA93F,0xAB8A,0xAE43,
+0xB180,0xB55A,0xB9ED,0xBF5C,0xC5D3,0xCD80,0xD6A1,0xE17A,
+/* A:1f B:15 */
+0x9F7E,0x9F8D,0x9FA0,0x9FB5,0x9FCF,0x9FEE,0xA012,0xA03E,
+0xA071,0xA0AE,0xA0F7,0xA14D,0xA1B4,0xA22E,0xA2BF,0xA36C,
+0xA439,0xA52C,0xA64E,0xA7A6,0xA93F,0xAB25,0xAD67,0xB015,
+0xB345,0xB70F,0xBB8F,0xC0E9,0xC745,0xCED4,0xD7D0,0xE27D,
+/* A:1f B:16 */
+0xA1F8,0xA207,0xA219,0xA22F,0xA248,0xA266,0xA28A,0xA2B4,
+0xA2E7,0xA323,0xA36A,0xA3BF,0xA424,0xA49C,0xA52A,0xA5D3,
+0xA69C,0xA78B,0xA8A7,0xA9F9,0xAB8A,0xAD67,0xAF9D,0xB23F,
+0xB55F,0xB916,0xBD81,0xC2C1,0xC8FE,0xD068,0xD938,0xE3B1,
+/* A:1f B:17 */
+0xA4EA,0xA4F9,0xA50B,0xA51F,0xA538,0xA556,0xA579,0xA5A2,
+0xA5D3,0xA60E,0xA654,0xA6A7,0xA709,0xA77E,0xA809,0xA8AE,
+0xA973,0xAA5C,0xAB72,0xACBB,0xAE43,0xB015,0xB23F,0xB4D1,
+0xB7DF,0xBB80,0xBFD1,0xC4F1,0xCB0A,0xD248,0xDAE4,0xE51F,
+/* A:1f B:18 */
+0xA86B,0xA879,0xA88A,0xA89E,0xA8B6,0xA8D3,0xA8F5,0xA91D,
+0xA94D,0xA986,0xA9CA,0xAA1A,0xAA7A,0xAAEC,0xAB73,0xAC13,
+0xACD2,0xADB5,0xAEC3,0xB003,0xB180,0xB345,0xB55F,0xB7DF,
+0xBAD7,0xBE5E,0xC28F,0xC78B,0xCD78,0xD482,0xDCE0,0xE6D2,
+/* A:1f B:19 */
+0xAC94,0xACA2,0xACB2,0xACC5,0xACDD,0xACF8,0xAD19,0xAD40,
+0xAD6E,0xADA5,0xADE7,0xAE35,0xAE91,0xAEFF,0xAF81,0xB01C,
+0xB0D5,0xB1B0,0xB2B4,0xB3EA,0xB55A,0xB70F,0xB916,0xBB80,
+0xBE5E,0xC1C6,0xC5D3,0xCAA3,0xD05C,0xD728,0xDF3D,0xE8D7,
+/* A:1f B:1a */
+0xB186,0xB193,0xB1A3,0xB1B5,0xB1CB,0xB1E6,0xB205,0xB22B,
+0xB257,0xB28C,0xB2CA,0xB315,0xB36D,0xB3D6,0xB453,0xB4E8,
+0xB599,0xB66A,0xB764,0xB88C,0xB9ED,0xBB8F,0xBD81,0xBFD1,
+0xC28F,0xC5D3,0xC9B4,0xCE50,0xD3CB,0xDA4E,0xE20B,0xEB3E,
+/* A:1f B:1b */
+0xB766,0xB773,0xB782,0xB793,0xB7A8,0xB7C1,0xB7DF,0xB802,
+0xB82C,0xB85E,0xB89A,0xB8E0,0xB934,0xB998,0xBA0E,0xBA9B,
+0xBB42,0xBC09,0xBCF6,0xBE0F,0xBF5C,0xC0E9,0xC2C1,0xC4F1,
+0xC78B,0xCAA3,0xCE50,0xD2AE,0xD7DF,0xDE0B,0xE561,0xEE18,
+/* A:1f B:1c */
+0xBE62,0xBE6E,0xBE7C,0xBE8C,0xBEA0,0xBEB7,0xBED3,0xBEF4,
+0xBF1C,0xBF4A,0xBF82,0xBFC4,0xC012,0xC06F,0xC0DE,0xC161,
+0xC1FE,0xC2B7,0xC394,0xC49B,0xC5D3,0xC745,0xC8FE,0xCB0A,
+0xCD78,0xD05C,0xD3CB,0xD7DF,0xDCB9,0xE27D,0xE957,0xF17C,
+/* A:1f B:1d */
+0xC6AF,0xC6BA,0xC6C7,0xC6D6,0xC6E8,0xC6FD,0xC717,0xC735,
+0xC759,0xC784,0xC7B7,0xC7F3,0xC83B,0xC890,0xC8F6,0xC96E,
+0xC9FE,0xCAA8,0xCB72,0xCC63,0xCD80,0xCED4,0xD068,0xD248,
+0xD482,0xD728,0xDA4E,0xDE0B,0xE27D,0xE7C6,0xEE0D,0xF583,
+/* A:1f B:1e */
+0xD08D,0xD097,0xD0A2,0xD0AF,0xD0C0,0xD0D3,0xD0E9,0xD104,
+0xD124,0xD14B,0xD178,0xD1AE,0xD1EE,0xD23A,0xD294,0xD300,
+0xD37F,0xD417,0xD4CC,0xD5A2,0xD6A1,0xD7D0,0xD938,0xDAE4,
+0xDCE0,0xDF3D,0xE20B,0xE561,0xE957,0xEE0D,0xF3A6,0xFA4D,
+/* A:1f B:1f */
+0xDC47,0xDC4F,0xDC59,0xDC64,0xDC72,0xDC82,0xDC96,0xDCAD,
+0xDCC8,0xDCE9,0xDD10,0xDD3E,0xDD75,0xDDB6,0xDE03,0xDE5F,
+0xDECC,0xDF4E,0xDFE8,0xE0A0,0xE17A,0xE27D,0xE3B1,0xE51F,
+0xE6D2,0xE8D7,0xEB3E,0xEE18,0xF17C,0xF583,0xFA4D,0xFFFF,
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/io68/ymoutorg.h Added

@@ -0,0 +1,257 @@
+{
+  0x19,0x37,0x68,0x9c,0xe6,0x139,0x1cb,0x26a,0x380,0x4c7,0x6ff,0x995,0xe55,0x1432,0x207f,0x3227,
+    0x44,0x73,0xa7,0xd3,0x120,0x172,0x203,0x2a1,0x3b6,0x4f9,0x738,0x9c8,0xe84,0x1465,0x208d,0x3223,
+    0x72,0xa3,0xd9,0x104,0x14e,0x1a2,0x233,0x2d0,0x3e3,0x526,0x763,0x9ef,0xeab,0x1486,0x20ad,0x320a,
+    0x96,0xd6,0x102,0x133,0x17c,0x1ce,0x260,0x2fc,0x412,0x552,0x78b,0xa17,0xed0,0x149f,0x20be,0x3226,
+    0xdb,0x121,0x14d,0x17b,0x1c4,0x218,0x2a8,0x343,0x458,0x596,0x7d1,0xa56,0xf09,0x14d8,0x20d4,0x321f,
+    0x130,0x16c,0x19d,0x1cc,0x214,0x267,0x2fa,0x392,0x4a4,0x5e5,0x817,0xa9f,0xf49,0x1515,0x20f6,0x322b,
+    0x1cd,0x1fe,0x232,0x25e,0x2a8,0x2f8,0x387,0x41f,0x52e,0x66a,0x89b,0xb1d,0xfbe,0x157c,0x213c,0x3232,
+    0x26b,0x29e,0x2d0,0x2fb,0x342,0x393,0x41e,0x4b9,0x5c5,0x6fd,0x929,0xba6,0x103d,0x15e7,0x2193,0x322e,
+    0x378,0x3ba,0x3e3,0x411,0x457,0x4a5,0x52f,0x5c3,0x6d0,0x802,0xa24,0xc9a,0x1127,0x16c0,0x2238,0x324a,
+    0x4c0,0x4fe,0x523,0x551,0x597,0x5e2,0x66b,0x6fc,0x7fb,0x930,0xb4f,0xdb6,0x1235,0x17bf,0x22f5,0x3291,
+    0x711,0x740,0x76b,0x791,0x7d5,0x821,0x8a4,0x933,0xa30,0xb52,0xd65,0xfc4,0x1422,0x1993,0x2487,0x3344,
+    0x9a4,0x9d3,0xa00,0xa24,0xa66,0xab0,0xb2a,0xbb3,0xca8,0xdc7,0xfc7,0x1218,0x1665,0x1bb7,0x2672,0x3485,
+    0xe70,0xe97,0xec0,0xee2,0xf20,0xf60,0xfd6,0x1056,0x113b,0x124a,0x1436,0x165f,0x1a9f,0x1fd1,0x2a3c,0x3750,
+    0x145e,0x148b,0x14a9,0x14ca,0x14fa,0x1538,0x159c,0x160d,0x16e6,0x17df,0x19ac,0x1bd2,0x1fda,0x24f9,0x2f19,0x3b4d,
+    0x20e1,0x20fd,0x2107,0x211d,0x213b,0x2160,0x21a0,0x21ef,0x228a,0x2351,0x24da,0x26be,0x2a7e,0x2f31,0x3884,0x438d,
+    0x32b2,0x32cb,0x32c5,0x32c6,0x32ce,0x32c4,0x32cc,0x32d1,0x32e9,0x331e,0x33cd,0x34ef,0x37b9,0x3baa,0x43aa,0x4d99,
+    0x47,0x70,0xab,0xd5,0x122,0x173,0x203,0x2a3,0x3b8,0x4fa,0x736,0x9c7,0xe81,0x1466,0x2092,0x3221,
+    0x7b,0xb4,0xe2,0x10e,0x158,0x1ad,0x23e,0x2d9,0x3ee,0x530,0x76b,0x9f7,0xeaf,0x1482,0x20ac,0x3227,
+    0xa0,0xe4,0x10f,0x13f,0x187,0x1db,0x26c,0x309,0x41b,0x55d,0x797,0xa22,0xeda,0x14aa,0x20b8,0x3222,
+    0xce,0x108,0x13c,0x16b,0x1b4,0x209,0x298,0x335,0x448,0x58a,0x7c1,0xa4a,0xef9,0x14ca,0x20c9,0x320d,
+    0x126,0x155,0x188,0x1b3,0x1fe,0x250,0x2e1,0x37a,0x48d,0x5cc,0x800,0xa89,0xf34,0x1500,0x20ec,0x3231,
+    0x176,0x1a7,0x1da,0x207,0x24e,0x2a0,0x32f,0x3cb,0x4d9,0x617,0x84b,0xacd,0xf76,0x153b,0x210e,0x3232,
+    0x1ff,0x23f,0x26c,0x297,0x2de,0x330,0x3be,0x455,0x563,0x69f,0x8ce,0xb4b,0xfe9,0x159b,0x215b,0x322c,
+    0x29c,0x2df,0x306,0x334,0x37a,0x3c9,0x456,0x4ee,0x5fa,0x732,0x95a,0xbd3,0x106c,0x1610,0x21a9,0x3233,
+    0x3bc,0x3f0,0x419,0x446,0x48c,0x4db,0x563,0x5fa,0x700,0x836,0xa56,0xcc9,0x114d,0x16e7,0x223f,0x3254,
+    0x4fe,0x52c,0x55d,0x588,0x5cb,0x617,0x69f,0x730,0x835,0x962,0xb7a,0xde7,0x125c,0x17e0,0x2302,0x328f,
+    0x747,0x770,0x79f,0x7c6,0x809,0x854,0x8d6,0x963,0xa5b,0xb88,0xd92,0xfea,0x1448,0x19b2,0x2492,0x334f,
+    0x9d2,0xa04,0xa30,0xa58,0xa96,0xadf,0xb5c,0xbe5,0xcd7,0xdf0,0xff2,0x123d,0x1682,0x1bcf,0x2685,0x347d,
+    0xe99,0xeca,0xeeb,0xf12,0xf4c,0xf8d,0x1000,0x107f,0x1162,0x1270,0x1454,0x168f,0x1ab8,0x1fdc,0x2a49,0x375a,
+    0x1486,0x14b6,0x14d1,0x14eb,0x1523,0x155c,0x15c1,0x1637,0x170a,0x1802,0x19ca,0x1bdb,0x1ff3,0x2507,0x2f10,0x3b5d,
+    0x20fd,0x210b,0x2128,0x2131,0x214e,0x2175,0x21b8,0x2205,0x22a3,0x235b,0x24e5,0x26cb,0x2a7f,0x2f43,0x387b,0x438b,
+    0x32cd,0x32c5,0x32c8,0x32cf,0x32ca,0x32c4,0x32ce,0x32d9,0x32ed,0x332b,0x33cf,0x3503,0x37c4,0x3b8f,0x43b0,0x4d98,
+    0x64,0xac,0xd5,0x106,0x14f,0x1a2,0x234,0x2d0,0x3e6,0x528,0x764,0x9ef,0xead,0x1488,0x20aa,0x321f,
+    0xa4,0xe4,0x110,0x13e,0x187,0x1da,0x26c,0x307,0x41e,0x55d,0x797,0xa20,0xecd,0x14ab,0x20c2,0x320c,
+    0xcd,0x10c,0x141,0x16c,0x1b8,0x209,0x29a,0x336,0x448,0x589,0x7c2,0xa4c,0xefe,0x14ce,0x20cb,0x322f,
+    0x107,0x13b,0x16e,0x199,0x1e5,0x235,0x2c7,0x361,0x474,0x5b2,0x7eb,0xa72,0xf1f,0x14ec,0x20dc,0x3233,
+    0x152,0x18d,0x1b9,0x1e3,0x22d,0x27e,0x30f,0x3a7,0x4ba,0x5f7,0x82c,0xab1,0xf5b,0x151a,0x20fd,0x321c,
+    0x19b,0x1de,0x207,0x235,0x27e,0x2ce,0x35e,0x3f7,0x508,0x643,0x874,0xaf5,0xf9c,0x1553,0x2125,0x322d,
+    0x22c,0x26d,0x298,0x2c7,0x30e,0x35e,0x3e9,0x483,0x592,0x6c8,0x8f7,0xb75,0x100f,0x15bc,0x2160,0x322b,
+    0x2d3,0x304,0x332,0x360,0x3a7,0x3f8,0x483,0x51a,0x627,0x75d,0x980,0xbff,0x108d,0x1632,0x21b2,0x3238,
+    0x3ec,0x41a,0x44a,0x474,0x4bd,0x508,0x592,0x626,0x72c,0x860,0xa7e,0xcef,0x116f,0x16fe,0x2246,0x325a,
+    0x523,0x559,0x588,0x5b3,0x5f9,0x642,0x6cb,0x75c,0x85e,0x985,0xba4,0xe07,0x1279,0x17f9,0x231b,0x3287,
+    0x769,0x79f,0x7c4,0x7f1,0x833,0x87d,0x900,0x98b,0xa86,0xbaa,0xdb4,0x100b,0x1467,0x19c6,0x24a8,0x334a,
+    0x9fc,0xa33,0xa58,0xa82,0xabf,0xb04,0xb84,0xc09,0xcfa,0xe15,0x1012,0x1255,0x16a6,0x1beb,0x2684,0x3488,
+    0xec8,0xef2,0xf14,0xf35,0xf72,0xfb5,0x1026,0x10a5,0x1187,0x1290,0x1477,0x16ad,0x1ac6,0x1ff2,0x2a48,0x3755,
+    0x14b1,0x14cf,0x14f5,0x1513,0x1547,0x157f,0x15e7,0x1653,0x1727,0x1819,0x19de,0x1c00,0x2001,0x24f8,0x2f17,0x3b57,
+    0x210f,0x2127,0x2135,0x213f,0x2166,0x2186,0x21c8,0x2219,0x22ad,0x2370,0x24f1,0x26c0,0x2a8b,0x2f47,0x387a,0x4393,
+    0x32cc,0x32c3,0x32c6,0x32cb,0x32bc,0x32c8,0x32cd,0x32d7,0x32f2,0x331b,0x33cf,0x3500,0x37ba,0x3ba7,0x43b0,0x4d77,
+    0x90,0xdc,0x101,0x135,0x17d,0x1cf,0x262,0x2fd,0x413,0x553,0x78c,0xa16,0xed1,0x14a0,0x20bd,0x3230,
+    0xdc,0x10b,0x140,0x16a,0x1b5,0x209,0x299,0x334,0x448,0x588,0x7c3,0xa4b,0xefb,0x14cd,0x20c5,0x3227,
+    0x109,0x13d,0x172,0x19b,0x1e5,0x238,0x2c6,0x363,0x474,0x5b4,0x7e8,0xa73,0xf1f,0x14ef,0x20e5,0x320c,
+    0x138,0x16f,0x19b,0x1c9,0x212,0x264,0x2f2,0x38e,0x49e,0x5dd,0x813,0xa98,0xf44,0x1509,0x20f8,0x3226,
+    0x177,0x1b7,0x1e3,0x212,0x25a,0x2ac,0x33b,0x3d4,0x4e6,0x620,0x854,0xad5,0xf7c,0x153d,0x210c,0x3220,
+    0x1c8,0x206,0x235,0x262,0x2ab,0x2fd,0x38b,0x421,0x531,0x66f,0x89e,0xb1f,0xfbd,0x1577,0x2132,0x322c,
+    0x264,0x296,0x2c9,0x2f2,0x33b,0x38a,0x418,0x4af,0x5bd,0x6f5,0x91e,0xb98,0x1033,0x15de,0x2173,0x3232,
+    0x301,0x331,0x364,0x38f,0x3d4,0x425,0x4ad,0x543,0x650,0x785,0x9ab,0xc1f,0x10ae,0x164c,0x21ca,0x323b,
+    0x40c,0x44a,0x473,0x4a1,0x4e3,0x532,0x5bc,0x650,0x756,0x885,0xaa3,0xd14,0x1196,0x171b,0x225f,0x3255,
+    0x54d,0x58b,0x5b2,0x5df,0x620,0x66f,0x6f5,0x784,0x880,0x9b0,0xbc7,0xe29,0x129f,0x1814,0x2322,0x328f,
+    0x798,0x7cc,0x7f6,0x81a,0x85b,0x8a7,0x926,0x9b3,0xaad,0xbca,0xdd9,0x102f,0x1485,0x19e4,0x24ae,0x3349,
+    0xa2b,0xa55,0xa83,0xaa8,0xae8,0xb31,0xbaa,0xc2e,0xd1f,0xe3c,0x1036,0x1280,0x16bc,0x1bfe,0x2692,0x3484,
+    0xee9,0xf10,0xf39,0xf5b,0xf95,0xfd4,0x1048,0x10c8,0x11a9,0x12b0,0x1496,0x16ba,0x1ae3,0x2004,0x2a47,0x3759,
+    0x14cb,0x14f5,0x1511,0x1532,0x1563,0x159f,0x1602,0x1675,0x1746,0x1837,0x19ff,0x1c14,0x2012,0x2517,0x2f1e,0x3b4d,
+    0x2121,0x2139,0x2144,0x2157,0x2176,0x2190,0x21d9,0x2222,0x22b9,0x237d,0x24fe,0x26d6,0x2a8b,0x2f29,0x387b,0x4387,
+    0x32ba,0x32c9,0x32d1,0x32c5,0x32cd,0x32cb,0x32d0,0x32d2,0x32f3,0x3328,0x33db,0x34fc,0x37c2,0x3bb0,0x43b0,0x4da7,
+    0xf3,0x11c,0x154,0x17c,0x1c8,0x219,0x2aa,0x346,0x458,0x598,0x7cc,0xa59,0xf0c,0x14de,0x20d9,0x3212,
+    0x129,0x159,0x188,0x1b6,0x1ff,0x253,0x2e2,0x37c,0x48e,0x5cc,0x801,0xa87,0xf38,0x14f6,0x20f5,0x3222,
+    0x14a,0x18e,0x1b8,0x1e7,0x22e,0x281,0x310,0x3aa,0x4ba,0x5f8,0x82c,0xab0,0xf5c,0x151d,0x2100,0x3227,
+    0x17a,0x1b9,0x1e4,0x212,0x25a,0x2ac,0x33d,0x3d7,0x4e6,0x625,0x856,0xada,0xf7a,0x153b,0x2112,0x3219,
+    0x1ca,0x1fc,0x232,0x25a,0x2a5,0x2f4,0x383,0x41e,0x52b,0x666,0x895,0xb19,0xfb5,0x1573,0x212d,0x3228,
+    0x21d,0x250,0x282,0x2ab,0x2f6,0x345,0x3d2,0x46a,0x576,0x6b3,0x8e0,0xb5c,0xff4,0x15ac,0x2154,0x3233,
+    0x2af,0x2e3,0x310,0x33c,0x380,0x3d2,0x45e,0x4f5,0x600,0x734,0x960,0xbd8,0x106b,0x1608,0x2199,0x322e,
+    0x341,0x380,0x3a9,0x3d5,0x41d,0x46b,0x4f6,0x58a,0x693,0x7c6,0x9ed,0xc5e,0x10e9,0x167a,0x21e7,0x3233,
+    0x456,0x492,0x4ba,0x4e5,0x52b,0x579,0x5fe,0x693,0x79a,0x8c5,0xae6,0xd50,0x11c4,0x174b,0x2275,0x3254,
+    0x59f,0x5cb,0x5f8,0x623,0x667,0x6b2,0x737,0x7c6,0x8c7,0x9f2,0xc04,0xe68,0x12cc,0x183d,0x233a,0x3291,
+    0x7e0,0x80a,0x838,0x85d,0x89e,0x8e9,0x969,0x9f5,0xae8,0xc0b,0xe13,0x1063,0x14b5,0x1a05,0x24b9,0x3358,
+    0xa63,0xa98,0xac1,0xae7,0xb29,0xb6d,0xbe7,0xc6e,0xd5f,0xe6e,0x106c,0x12b2,0x16e8,0x1c27,0x26a1,0x347b,
+    0xf1e,0xf50,0xf74,0xf95,0xfcf,0x1011,0x1083,0x10fd,0x11dd,0x12e6,0x14c4,0x16f0,0x1b0a,0x2012,0x2a5d,0x3761,
+    0x14fd,0x152a,0x1549,0x1566,0x1597,0x15cd,0x1631,0x16a4,0x1770,0x1863,0x1a25,0x1c2c,0x2030,0x252e,0x2f19,0x3b4f,
+    0x214b,0x2152,0x2166,0x2179,0x218e,0x21b7,0x21f8,0x223f,0x22d4,0x2395,0x250d,0x26ee,0x2a8d,0x2f4d,0x387d,0x438b,
+    0x32c9,0x32c9,0x32c7,0x32ca,0x32cd,0x32c4,0x32d0,0x32d8,0x32f0,0x3326,0x33d3,0x34fc,0x37c5,0x3b91,0x43af,0x4d97,
+    0x130,0x17a,0x1a3,0x1d1,0x21c,0x26e,0x2fd,0x396,0x4a8,0x5e6,0x81b,0xaa1,0xf4e,0x1515,0x2103,0x3225,
+    0x16f,0x1b1,0x1dc,0x209,0x252,0x2a5,0x334,0x3ce,0x4dd,0x61a,0x84d,0xad1,0xf78,0x1539,0x2115,0x3214,
+    0x19e,0x1da,0x20c,0x23a,0x283,0x2d1,0x35f,0x3fa,0x50c,0x646,0x876,0xafb,0xf9d,0x1552,0x211f,0x3232,
+    0x1d9,0x206,0x239,0x264,0x2ad,0x2fe,0x38d,0x426,0x536,0x671,0x8a0,0xb1e,0xfbd,0x157e,0x2133,0x322c,
+    0x21e,0x255,0x284,0x2ad,0x2f5,0x345,0x3d2,0x46b,0x57b,0x6b1,0x8df,0xb5c,0xff8,0x15aa,0x2156,0x322c,
+    0x269,0x2a6,0x2cf,0x2fd,0x345,0x396,0x420,0x4b9,0x5c4,0x6fe,0x929,0xba0,0x103a,0x15de,0x217a,0x322c,
+    0x2f8,0x336,0x35f,0x38d,0x3d2,0x423,0x4aa,0x542,0x64c,0x780,0x9a9,0xc1c,0x10a8,0x1648,0x21b1,0x322d,
+    0x39a,0x3cb,0x3fa,0x426,0x46d,0x4bb,0x545,0x5d5,0x6e1,0x810,0xa2e,0xca2,0x1123,0x16b3,0x21fd,0x323f,
+    0x4ae,0x4dc,0x50e,0x537,0x57b,0x5c8,0x64d,0x6e2,0x7e3,0x911,0xb29,0xd8f,0x1202,0x177f,0x2298,0x3260,
+    0x5e4,0x618,0x648,0x671,0x6b4,0x6fe,0x783,0x812,0x914,0xa32,0xc48,0xea7,0x1309,0x1872,0x2359,0x3286,
+    0x81f,0x859,0x87f,0x8a7,0x8ea,0x932,0x9ae,0xa37,0xb31,0xc4f,0xe51,0x10a5,0x14ec,0x1a33,0x24d5,0x334e,
+    0xaaf,0xae6,0xb06,0xb30,0xb6c,0xbb0,0xc2c,0xcb4,0xd9d,0xeb4,0x10a7,0x12e0,0x1721,0x1c50,0x26b2,0x347d,
+    0xf6a,0xf94,0xfb7,0xfd9,0x1011,0x1051,0x10c1,0x1139,0x1218,0x1320,0x14fe,0x1726,0x1b2b,0x203d,0x2a63,0x375d,
+    0x1544,0x1565,0x1584,0x15a1,0x15d4,0x1609,0x166b,0x16d9,0x17a2,0x1898,0x1a4f,0x1c66,0x204f,0x2529,0x2f1b,0x3b5a,
+    0x216c,0x217f,0x2187,0x2199,0x21bb,0x21db,0x2216,0x2262,0x22f7,0x23b1,0x2526,0x26fc,0x2a99,0x2f4c,0x387b,0x4396,
+    0x32cd,0x32ca,0x32d3,0x32cd,0x32ca,0x32d1,0x32d0,0x32d6,0x32fc,0x3323,0x33db,0x3503,0x37bf,0x3ba2,0x43b3,0x4d92,
+    0x1c5,0x20f,0x23a,0x268,0x2ab,0x2fe,0x38c,0x425,0x535,0x66f,0x89f,0xb21,0xfc3,0x1577,0x214b,0x323b,
+    0x20f,0x23e,0x273,0x29a,0x2e4,0x335,0x3c1,0x45a,0x568,0x6a3,0x8d1,0xb50,0xfee,0x15a9,0x2158,0x322c,
+    0x23c,0x26d,0x2a0,0x2ca,0x313,0x363,0x3ef,0x485,0x595,0x6cf,0x8fa,0xb78,0x1014,0x15c6,0x216e,0x3216,
+    0x26b,0x29f,0x2c9,0x2f5,0x33c,0x390,0x41b,0x4b3,0x5bd,0x6f6,0x921,0xb9c,0x1038,0x15df,0x2183,0x322e,
+    0x2a9,0x2e7,0x310,0x33e,0x386,0x3d5,0x45e,0x4f7,0x603,0x739,0x963,0xbd9,0x106e,0x160f,0x2197,0x322c,
+    0x2f9,0x331,0x361,0x38d,0x3d5,0x422,0x4ae,0x543,0x651,0x782,0x9a9,0xc1e,0x10ac,0x1647,0x21bc,0x3233,
+    0x390,0x3c0,0x3f0,0x41a,0x460,0x4ae,0x538,0x5ce,0x6d3,0x806,0xa25,0xc97,0x1119,0x16aa,0x21f3,0x323e,
+    0x429,0x457,0x48a,0x4b4,0x4fa,0x546,0x5cb,0x660,0x766,0x894,0xab0,0xd1a,0x1193,0x1718,0x2240,0x3240,
+    0x52f,0x56d,0x597,0x5c0,0x605,0x650,0x6d7,0x763,0x867,0x991,0xba4,0xe07,0x126e,0x17da,0x22dd,0x3250,
+    0x66c,0x6a7,0x6ce,0x6f9,0x73a,0x784,0x807,0x895,0x990,0xab5,0xcc0,0xf13,0x1371,0x18cc,0x238b,0x3292,
+    0x8ae,0x8de,0x904,0x92a,0x96b,0x9b1,0xa2f,0xab8,0xbae,0xcc3,0xec4,0x1111,0x1550,0x1a8c,0x2501,0x3351,
+    0xb39,0xb60,0xb8a,0xbad,0xbec,0xc30,0xcaa,0xd29,0xe14,0xf26,0x1113,0x1350,0x1774,0x1c97,0x26d4,0x3490,
+    0xfe3,0x1006,0x102b,0x104b,0x1089,0x10c4,0x1134,0x11ae,0x1286,0x138a,0x155d,0x1772,0x1b81,0x207d,0x2a71,0x375b,
+    0x15a7,0x15c8,0x15ee,0x1607,0x1638,0x166f,0x16d1,0x173c,0x1804,0x18f1,0x1aa9,0x1cb0,0x2086,0x2564,0x2f24,0x3b4f,
+    0x21af,0x21c1,0x21cd,0x21e2,0x21ff,0x2217,0x2257,0x22a4,0x2330,0x23e8,0x2550,0x271f,0x2aad,0x2f40,0x3887,0x4393,
+    0x32b8,0x32d5,0x32d4,0x32cf,0x32c7,0x32d6,0x32dc,0x32e6,0x32f8,0x332c,0x33db,0x34fc,0x37c4,0x3baf,0x43a8,0x4d98,
+    0x27b,0x2a3,0x2d9,0x302,0x34a,0x39a,0x427,0x4bf,0x5cb,0x704,0x92e,0xbad,0x1040,0x15f9,0x21a3,0x3223,
+    0x2ac,0x2dd,0x30d,0x33a,0x381,0x3d0,0x45d,0x4f5,0x5fe,0x733,0x961,0xbda,0x1074,0x1617,0x21b7,0x3237,
+    0x2cf,0x312,0x33c,0x369,0x3af,0x3fd,0x489,0x51e,0x62a,0x761,0x98b,0xbfe,0x1091,0x1639,0x21c2,0x3236,
+    0x2fd,0x33e,0x368,0x396,0x3d9,0x429,0x4b5,0x54a,0x655,0x789,0x9ae,0xc24,0x10b3,0x1651,0x21cf,0x323f,
+    0x345,0x37e,0x3b1,0x3da,0x422,0x46e,0x4fa,0x58f,0x698,0x7cb,0x9ed,0xc63,0x10e9,0x1682,0x21e7,0x3241,
+    0x39d,0x3cf,0x400,0x428,0x470,0x4be,0x546,0x5db,0x6e2,0x814,0xa33,0xca7,0x1124,0x16bd,0x2208,0x3242,
+    0x42d,0x460,0x48b,0x4b4,0x4fa,0x549,0x5d0,0x65f,0x765,0x895,0xab0,0xd18,0x1193,0x1716,0x224e,0x323f,
+    0x4b9,0x4f8,0x520,0x54d,0x590,0x5dc,0x664,0x6f4,0x7f7,0x922,0xb39,0xd9d,0x1211,0x1781,0x228a,0x3243,
+    0x5c5,0x603,0x62b,0x657,0x69a,0x6e4,0x768,0x7f5,0x8f5,0xa16,0xc2b,0xe85,0x12e6,0x1848,0x2316,0x3264,
+    0x70b,0x736,0x764,0x78b,0x7cc,0x816,0x897,0x922,0xa1c,0xb3e,0xd42,0xf97,0x13e3,0x1930,0x23cb,0x32a0,
+    0x93e,0x968,0x996,0x9bb,0x9fb,0xa41,0xab9,0xb40,0xc30,0xd4d,0xf44,0x117f,0x15b6,0x1ae7,0x2538,0x3359,
+    0xbba,0xbe9,0xc14,0xc39,0xc77,0xcb6,0xd2e,0xdad,0xe96,0xfa2,0x118e,0x13c2,0x17dc,0x1ced,0x270b,0x347f,
+    0x105f,0x108d,0x10aa,0x10d1,0x1107,0x1143,0x11b1,0x1228,0x12fc,0x13fb,0x15c9,0x17e2,0x1bd4,0x20b9,0x2a9a,0x3759,
+    0x161a,0x1649,0x1662,0x167f,0x16a9,0x16df,0x1743,0x17a8,0x1870,0x1953,0x1b04,0x1d00,0x20d1,0x2593,0x2f1b,0x3b54,
+    0x220c,0x2212,0x2222,0x2231,0x224c,0x226c,0x22a0,0x22ee,0x2378,0x2429,0x258a,0x2750,0x2acc,0x2f60,0x3884,0x438e,
+    0x32e2,0x32df,0x32d5,0x32dd,0x32dd,0x32d5,0x32e3,0x32e6,0x32ff,0x332c,0x33de,0x3502,0x37c5,0x3ba6,0x43b1,0x4da6,
+    0x386,0x3c9,0x3ee,0x41c,0x464,0x4b2,0x53a,0x5d0,0x6d7,0x809,0xa2f,0xca3,0x1132,0x16cd,0x2247,0x325c,
+    0x3bd,0x3fd,0x427,0x453,0x497,0x4e6,0x56e,0x603,0x70a,0x83c,0xa5c,0xcd1,0x1156,0x16ed,0x225d,0x3241,
+    0x3ee,0x429,0x456,0x47f,0x4c6,0x50f,0x59a,0x62f,0x734,0x867,0xa85,0xcf4,0x1173,0x170a,0x2260,0x3262,
+    0x420,0x451,0x481,0x4a8,0x4ee,0x53c,0x5c6,0x657,0x75e,0x88d,0xaad,0xd1a,0x119a,0x172a,0x2271,0x325a,
+    0x467,0x496,0x4c3,0x4f0,0x533,0x582,0x609,0x698,0x79d,0x8ce,0xae8,0xd53,0x11d1,0x1759,0x228e,0x3256,
+    0x4b4,0x4e9,0x511,0x53f,0x581,0x5ce,0x655,0x6e7,0x7e6,0x916,0xb2e,0xd95,0x1209,0x1784,0x22a9,0x3259,
+    0x535,0x572,0x59c,0x5c6,0x60a,0x656,0x6d9,0x769,0x86b,0x993,0xba9,0xe0b,0x1273,0x17e2,0x22d9,0x3264,
+    0x5cc,0x604,0x630,0x659,0x69e,0x6e8,0x76c,0x7f5,0x8f6,0xa1e,0xc26,0xe8a,0x12e6,0x184b,0x231a,0x3270,
+    0x6de,0x70c,0x73a,0x760,0x7a4,0x7eb,0x86b,0x8f8,0x9ef,0xb15,0xd18,0xf6a,0x13b9,0x1908,0x23a2,0x328a,
+    0x815,0x83e,0x86c,0x893,0x8d1,0x919,0x996,0xa20,0xb14,0xc2c,0xe2c,0x1075,0x14b1,0x19e6,0x2453,0x32bd,
+    0xa35,0xa6d,0xa93,0xabb,0xaf6,0xb3d,0xbb4,0xc39,0xd26,0xe36,0x1022,0x125c,0x167f,0x1b94,0x25b3,0x3368,
+    0xcb4,0xce9,0xd07,0xd2c,0xd69,0xdab,0xe1d,0xe9f,0xf7b,0x1085,0x1264,0x1483,0x1896,0x1d91,0x2766,0x3498,
+    0x114f,0x1175,0x1195,0x11b3,0x11ea,0x1226,0x1289,0x1303,0x13d6,0x14ca,0x168f,0x189e,0x1c7a,0x2146,0x2add,0x3760,
+    0x16fd,0x171b,0x1734,0x1754,0x177c,0x17af,0x180e,0x1872,0x192a,0x1a0f,0x1baf,0x1da6,0x2158,0x25f1,0x2f55,0x3b5a,
+    0x2297,0x22b8,0x22c6,0x22d0,0x22f1,0x2307,0x2337,0x237b,0x2401,0x24a5,0x25fd,0x27ab,0x2b1d,0x2f8b,0x386d,0x438b,
+    0x32fd,0x32f6,0x32fb,0x32f8,0x32f0,0x32ff,0x3300,0x3301,0x331d,0x3351,0x33f5,0x3513,0x37c6,0x3ba9,0x43b8,0x4d8f,
+    0x4ce,0x513,0x53c,0x565,0x5aa,0x5f4,0x67d,0x70e,0x812,0x940,0xb59,0xdc4,0x1245,0x17cf,0x2317,0x32a5,
+    0x510,0x53f,0x571,0x596,0x5dd,0x629,0x6b0,0x740,0x842,0x96d,0xb87,0xdf5,0x126a,0x17f3,0x231f,0x32a3,
+    0x53d,0x56b,0x59c,0x5c4,0x609,0x653,0x6d9,0x769,0x86b,0x997,0xbae,0xe17,0x128c,0x180b,0x2331,0x3299,
+    0x567,0x59c,0x5c2,0x5ed,0x630,0x67a,0x703,0x791,0x893,0x9be,0xbd3,0xe3b,0x12a8,0x1822,0x233f,0x329d,
+    0x5a1,0x5de,0x608,0x633,0x677,0x6c1,0x742,0x7d3,0x8d4,0x9fb,0xc12,0xe72,0x12de,0x184e,0x2354,0x329c,
+    0x5ef,0x627,0x653,0x67f,0x6c2,0x709,0x790,0x81a,0x91c,0xa41,0xc52,0xeb3,0x1315,0x1879,0x2365,0x329e,
+    0x680,0x6af,0x6dc,0x705,0x746,0x78f,0x813,0x89f,0x999,0xac0,0xcc8,0xf21,0x137c,0x18d7,0x239a,0x32ad,
+    0x712,0x741,0x76d,0x795,0x7d8,0x822,0x8a2,0x92d,0xa25,0xb40,0xd49,0xf9d,0x13eb,0x193c,0x23dd,0x32b0,
+    0x811,0x848,0x871,0x899,0x8d7,0x91f,0x99f,0xa25,0xb1a,0xc37,0xe32,0x107b,0x14b6,0x19e8,0x245f,0x32bc,
+    0x93e,0x975,0x99c,0x9c3,0xa02,0xa45,0xac4,0xb4b,0xc37,0xd4c,0xf40,0x117e,0x15ad,0x1ac9,0x24fb,0x32ee,
+    0xb67,0xb99,0xbbe,0xbe0,0xc1d,0xc62,0xcd5,0xd56,0xe3c,0xf47,0x112d,0x135b,0x175e,0x1c68,0x264d,0x33a6,
+    0xde0,0xe06,0xe2c,0xe4b,0xe88,0xec6,0xf38,0xfb1,0x108d,0x1190,0x1362,0x1582,0x1976,0x1e50,0x27f6,0x34ba,
+    0x1265,0x1287,0x12a7,0x12c2,0x12fa,0x1334,0x1396,0x140a,0x14d3,0x15c3,0x1778,0x1977,0x1d42,0x21fa,0x2b36,0x3771,
+    0x17f9,0x1816,0x1837,0x1852,0x1878,0x18ac,0x1900,0x195e,0x1a1a,0x1aea,0x1c8a,0x1e67,0x2207,0x2687,0x2fa7,0x3b5a,
+    0x237c,0x2387,0x238a,0x23a2,0x23b7,0x23c6,0x23ff,0x2438,0x24b4,0x2559,0x269a,0x2838,0x2b7e,0x2fca,0x3894,0x4388,
+    0x3325,0x333a,0x333e,0x3321,0x3335,0x3334,0x3334,0x3346,0x3355,0x3381,0x3420,0x3533,0x37dc,0x3bb2,0x43b0,0x4d97,
+    0x728,0x74a,0x77b,0x7a4,0x7e6,0x830,0x8b4,0x940,0xa3a,0xb63,0xd6c,0xfd2,0x1434,0x19a5,0x24a9,0x3367,
+    0x752,0x781,0x7aa,0x7d7,0x81a,0x85d,0x8e5,0x970,0xa69,0xb91,0xd9b,0xff7,0x145a,0x19bf,0x24ac,0x3364,
+    0x775,0x7b0,0x7d8,0x802,0x842,0x88d,0x90d,0x99a,0xa92,0xbb4,0xdc3,0x1018,0x1474,0x19da,0x24b9,0x3366,
+    0x7a1,0x7da,0x800,0x82b,0x86a,0x8b3,0x935,0x9bb,0xab7,0xbdb,0xde2,0x1039,0x1491,0x19ef,0x24c8,0x3366,
+    0x7e4,0x817,0x844,0x86d,0x8ac,0x8f3,0x975,0xa00,0xaf4,0xc17,0xe1c,0x1072,0x14c1,0x1a19,0x24d7,0x3371,
+    0x836,0x860,0x890,0x8b6,0x8f5,0x93e,0x9be,0xa46,0xb3c,0xc59,0xe5c,0x10ac,0x14f2,0x1a45,0x24ea,0x336c,
+    0x8bc,0x8e9,0x90f,0x936,0x978,0x9bd,0xa3b,0xac3,0xbb4,0xcd0,0xec7,0x1116,0x1554,0x1a90,0x251e,0x3366,
+    0x93f,0x977,0x99b,0x9c2,0xa03,0xa49,0xac4,0xb4c,0xc39,0xd51,0xf4b,0x118b,0x15c2,0x1aed,0x2553,0x336e,
+    0xa3d,0xa72,0xa98,0xabe,0xaf9,0xb41,0xbb7,0xc3d,0xd25,0xe36,0x1027,0x1262,0x1675,0x1b9b,0x25b8,0x337d,
+    0xb6c,0xb92,0xbb8,0xbe1,0xc1b,0xc5e,0xcd6,0xd53,0xe3a,0xf46,0x112b,0x135b,0x1768,0x1c69,0x2654,0x33b0,
+    0xd84,0xda8,0xdd0,0xdef,0xe2c,0xe6b,0xed8,0xf57,0x1030,0x1135,0x1307,0x1523,0x1914,0x1df3,0x2780,0x3440,
+    0xfe5,0x1008,0x1032,0x1052,0x1087,0x10c1,0x112d,0x11a0,0x1273,0x1369,0x152b,0x1738,0x1b03,0x1fc7,0x2919,0x353d,
+    0x1453,0x147b,0x1493,0x14b1,0x14e1,0x1515,0x1575,0x15df,0x169e,0x1783,0x1926,0x1b17,0x1eb9,0x233e,0x2c3e,0x37d2,
+    0x19cb,0x19f4,0x1a0a,0x1a18,0x1a48,0x1a74,0x1ac3,0x1b1f,0x1bc6,0x1c89,0x1e0c,0x1fda,0x234d,0x27af,0x303c,0x3b83,
+    0x2515,0x2508,0x2521,0x252a,0x253a,0x254d,0x2578,0x25aa,0x2617,0x26a9,0x27d8,0x295f,0x2c6a,0x307a,0x38d2,0x4388,
+    0x33fa,0x33fc,0x33ee,0x33f6,0x33f6,0x33e3,0x33ee,0x33fc,0x340b,0x3437,0x34be,0x35b5,0x3837,0x3bd8,0x43b0,0x4d91,
+    0x9b4,0x9e8,0xa14,0xa3d,0xa7a,0xac4,0xb3f,0xbc9,0xcbd,0xdd5,0xfdc,0x122a,0x167e,0x1bd2,0x2698,0x349d,
+    0x9e9,0xa1f,0xa43,0xa6f,0xaac,0xaf4,0xb71,0xbf7,0xcea,0xe04,0xfff,0x124b,0x1698,0x1beb,0x26b0,0x34ad,
+    0xa10,0xa4b,0xa70,0xa96,0xad4,0xb15,0xb99,0xc1d,0xd08,0xe27,0x1020,0x1270,0x16b2,0x1c02,0x26ac,0x34a6,
+    0xa40,0xa6a,0xa97,0xabc,0xafb,0xb41,0xbbb,0xc44,0xd33,0xe4a,0x1045,0x128d,0x16ce,0x1c19,0x26b3,0x34ae,
+    0xa82,0xaab,0xad6,0xaf8,0xb3c,0xb7f,0xbf9,0xc7d,0xd6f,0xe85,0x1079,0x12c1,0x16f9,0x1c39,0x26c7,0x34a1,
+    0xac9,0xaf7,0xb17,0xb45,0xb80,0xbc7,0xc3d,0xcc2,0xdaf,0xec4,0x10b8,0x12f4,0x1729,0x1c5b,0x26d2,0x34a2,
+    0xb3e,0xb73,0xb97,0xbbd,0xbfb,0xc40,0xcb8,0xd39,0xe22,0xf35,0x1125,0x135a,0x1786,0x1cac,0x26f2,0x349c,
+    0xbc9,0xbf6,0xc1d,0xc45,0xc81,0xcc3,0xd3b,0xdb7,0xea3,0xfb2,0x118d,0x13cd,0x17e6,0x1cf7,0x271f,0x34ab,
+    0xcc5,0xced,0xd18,0xd35,0xd72,0xdb0,0xe25,0xea4,0xf83,0x108d,0x126c,0x1493,0x189d,0x1d9e,0x2778,0x34bc,
+    0xde4,0xe0a,0xe32,0xe50,0xe88,0xecc,0xf3a,0xfb5,0x1090,0x1191,0x1365,0x1583,0x196a,0x1e54,0x2809,0x34d9,
+    0xfe7,0x1018,0x1033,0x1055,0x1087,0x10c5,0x1131,0x11a4,0x1277,0x136f,0x152e,0x173a,0x1b11,0x1fc6,0x291b,0x3557,
+    0x123f,0x126a,0x1286,0x12a7,0x12da,0x130e,0x1374,0x13e1,0x14a9,0x1591,0x1748,0x1940,0x1cf6,0x2184,0x2a71,0x363a,
+    0x169d,0x16b1,0x16d5,0x16ee,0x1719,0x174c,0x17a2,0x1804,0x18be,0x1991,0x1b23,0x1cfd,0x207a,0x24e1,0x2d7d,0x3888,
+    0x1c0c,0x1c1c,0x1c2f,0x1c46,0x1c69,0x1c91,0x1cdb,0x1d2a,0x1dc1,0x1e82,0x1fe7,0x21a3,0x24f0,0x2912,0x3167,0x3c15,
+    0x26ed,0x2706,0x270f,0x2705,0x2725,0x2733,0x274c,0x2781,0x27df,0x285c,0x2969,0x2acc,0x2dbd,0x3191,0x3974,0x43ab,
+    0x3535,0x352f,0x352e,0x3534,0x351f,0x3536,0x3534,0x3534,0x3546,0x355f,0x35d0,0x36ae,0x38ef,0x3c5a,0x43d3,0x4d89,
+    0xe88,0xec0,0xede,0xf06,0xf41,0xf79,0xff4,0x1071,0x1158,0x1265,0x144e,0x1680,0x1aba,0x1ffb,0x2a79,0x3791,
+    0xec0,0xeeb,0xf12,0xf30,0xf6b,0xfad,0x101f,0x109a,0x1182,0x128c,0x1473,0x16aa,0x1ad5,0x200b,0x2a6e,0x3785,
+    0xee5,0xf0c,0xf35,0xf55,0xf90,0xfd0,0x1045,0x10bf,0x11a3,0x12aa,0x148f,0x16c5,0x1ae8,0x2019,0x2a7c,0x3781,
+    0xf0a,0xf2f,0xf54,0xf77,0xfb4,0xff2,0x1065,0x10e4,0x11bb,0x12c8,0x14b0,0x16e0,0x1b01,0x2026,0x2a75,0x3784,
+    0xf3c,0xf6d,0xf8c,0xfb5,0xfea,0x102a,0x1099,0x1117,0x11f7,0x12ff,0x14de,0x1708,0x1b1d,0x2042,0x2a84,0x3788,
+    0xf7d,0xfb1,0xfd1,0xff4,0x102a,0x1068,0x10dc,0x1157,0x1232,0x133a,0x1509,0x173c,0x1b47,0x205e,0x2a88,0x3785,
+    0xff1,0x101e,0x1042,0x1064,0x109f,0x10db,0x114b,0x11c4,0x1298,0x139f,0x1574,0x1790,0x1b99,0x2097,0x2a98,0x378d,
+    0x1080,0x109f,0x10c7,0x10e3,0x111a,0x1156,0x11c2,0x123b,0x1311,0x140b,0x15da,0x17f8,0x1be3,0x20e1,0x2ac3,0x3786,
+    0x1163,0x118d,0x11aa,0x11c8,0x11fd,0x1236,0x12a1,0x1314,0x13e2,0x14de,0x1694,0x18ac,0x1c8f,0x2156,0x2aff,0x378b,
+    0x1267,0x1298,0x12b6,0x12d3,0x1305,0x133c,0x139f,0x1410,0x14dd,0x15c7,0x1784,0x1986,0x1d4f,0x2206,0x2b49,0x37a4,
+    0x145e,0x1483,0x14a1,0x14bb,0x14ea,0x1523,0x1581,0x15e8,0x16ab,0x178e,0x1935,0x1b24,0x1eb1,0x234c,0x2c46,0x37e5,
+    0x16a6,0x16c3,0x16de,0x16fc,0x1726,0x1753,0x17b0,0x180e,0x18c1,0x199a,0x1b28,0x1cfe,0x2082,0x24e2,0x2d8d,0x38a1,
+    0x1ae5,0x1afc,0x1b10,0x1b19,0x1b49,0x1b70,0x1bbc,0x1c0c,0x1caf,0x1d68,0x1ed9,0x2094,0x23de,0x2803,0x301d,0x3aaa,
+    0x202a,0x202d,0x204d,0x205a,0x2073,0x2091,0x20c8,0x210b,0x2189,0x222f,0x236d,0x24fc,0x2811,0x2bfb,0x33cf,0x3dab,
+    0x2ad5,0x2ade,0x2ada,0x2adf,0x2ae0,0x2aee,0x2b01,0x2b17,0x2b59,0x2bba,0x2c96,0x2dd3,0x3072,0x33fd,0x3b49,0x44a4,
+    0x380c,0x380d,0x3802,0x37f1,0x380c,0x3804,0x3806,0x380f,0x381b,0x381d,0x3864,0x390d,0x3af6,0x3e0a,0x44c4,0x4ddc,
+    0x14a1,0x14b4,0x14df,0x14fb,0x1529,0x1567,0x15ce,0x163f,0x1711,0x180e,0x19d7,0x1bfe,0x200d,0x2529,0x2f46,0x3b86,
+    0x14bc,0x14e2,0x14fe,0x1522,0x1555,0x158b,0x15f6,0x1668,0x172b,0x182b,0x19f8,0x1c15,0x201f,0x2535,0x2f53,0x3b8c,
+    0x14d7,0x1506,0x1524,0x153f,0x156c,0x15a9,0x1612,0x1682,0x1751,0x1846,0x1a0f,0x1c29,0x202b,0x2540,0x2f54,0x3b82,
+    0x14f7,0x1520,0x153c,0x1564,0x1590,0x15c8,0x1630,0x169c,0x176c,0x1861,0x1a18,0x1c3c,0x2038,0x2544,0x2f53,0x3b90,
+    0x152c,0x1554,0x1573,0x1590,0x15c3,0x15f7,0x1660,0x16d0,0x178c,0x188b,0x1a4b,0x1c5e,0x205b,0x255d,0x2f4e,0x3b8e,
+    0x156b,0x158a,0x15ae,0x15cc,0x15fb,0x1632,0x1692,0x1703,0x17c9,0x18b8,0x1a76,0x1c86,0x206c,0x256e,0x2f57,0x3b90,
+    0x15d5,0x15f5,0x1617,0x1631,0x165d,0x1697,0x16f4,0x1762,0x1826,0x1915,0x1ac2,0x1cd0,0x20b3,0x2590,0x2f64,0x3b79,
+    0x1640,0x166d,0x1687,0x16a1,0x16d4,0x1703,0x1761,0x17cd,0x188a,0x1973,0x1b24,0x1d21,0x20f0,0x25bf,0x2f61,0x3b90,
+    0x1714,0x173d,0x1757,0x176f,0x179c,0x17d1,0x182a,0x188f,0x194b,0x1a26,0x1bc9,0x1dbf,0x2160,0x261e,0x2f8a,0x3b8a,
+    0x181b,0x1839,0x184b,0x1869,0x1892,0x18c0,0x191d,0x1979,0x1a2d,0x1b08,0x1c9b,0x1e7c,0x221b,0x269e,0x2fc5,0x3b93,
+    0x19ec,0x1a06,0x1a21,0x1a34,0x1a5f,0x1a86,0x1ada,0x1b34,0x1bd9,0x1ca6,0x1e23,0x1fed,0x2360,0x27bd,0x3061,0x3bbb,
+    0x1c1c,0x1c29,0x1c47,0x1c58,0x1c77,0x1ca0,0x1ce8,0x1d37,0x1dd1,0x1e8e,0x1ff7,0x21aa,0x24f7,0x2923,0x3178,0x3c2c,
+    0x2033,0x2048,0x2052,0x206e,0x2080,0x2098,0x20d2,0x2115,0x2194,0x2238,0x2374,0x2508,0x2817,0x2c02,0x33df,0x3dca,
+    0x2562,0x2572,0x257d,0x2573,0x258b,0x25a0,0x25c5,0x25f6,0x264b,0x26d4,0x27e7,0x2942,0x2c15,0x2fc8,0x371f,0x407d,
+    0x2fbc,0x2f9f,0x2fac,0x2fb5,0x2fb9,0x2fbe,0x2fc0,0x2fc4,0x2fe4,0x3022,0x30c5,0x31ca,0x3411,0x374e,0x3e1a,0x46cb,
+    0x3c0e,0x3c0b,0x3c0a,0x3c0e,0x3c0e,0x3c00,0x3c11,0x3c0f,0x3c0c,0x3c11,0x3c2a,0x3c93,0x3e23,0x40c8,0x46e1,0x4f11,
+    0x2117,0x212d,0x213f,0x214f,0x216d,0x218f,0x21c3,0x221f,0x22ba,0x236e,0x2505,0x26e9,0x2a9f,0x2f60,0x38a2,0x43af,
+    0x212e,0x2140,0x2152,0x2160,0x217a,0x21a2,0x21e3,0x222a,0x22c6,0x2384,0x250d,0x26f1,0x2aab,0x2f65,0x38a6,0x43a3,
+    0x213b,0x215a,0x2162,0x2171,0x2191,0x21af,0x21f0,0x223e,0x22d4,0x2396,0x2517,0x26f3,0x2aad,0x2f67,0x38a8,0x43bd,
+    0x2150,0x2162,0x2176,0x2184,0x219d,0x21be,0x21fd,0x224c,0x22e5,0x23a1,0x251d,0x26f6,0x2aaf,0x2f6d,0x38a4,0x43b3,
+    0x2178,0x2181,0x218a,0x21a1,0x21bc,0x21df,0x221e,0x2260,0x22fa,0x23b7,0x2522,0x270c,0x2ab4,0x2f68,0x38a3,0x43ad,
+    0x2197,0x21aa,0x21b8,0x21c1,0x21de,0x21ff,0x2237,0x2286,0x231a,0x23d1,0x2541,0x2712,0x2ac2,0x2f74,0x389f,0x43a8,
+    0x21d2,0x21e8,0x21fa,0x21ff,0x2218,0x2240,0x2275,0x22bf,0x2353,0x23fd,0x2573,0x273b,0x2ab8,0x2f72,0x38a4,0x43a7,
+    0x2221,0x2233,0x223e,0x2257,0x226a,0x2283,0x22c1,0x2305,0x2392,0x2444,0x259d,0x2764,0x2aed,0x2f6d,0x38a6,0x43ad,
+    0x22c2,0x22cd,0x22dd,0x22e9,0x22fc,0x231d,0x2350,0x2397,0x240d,0x24be,0x2616,0x27be,0x2b2f,0x2f9b,0x38a7,0x43b6,
+    0x238b,0x2381,0x23a7,0x23ad,0x23c0,0x23d6,0x2406,0x2440,0x24c2,0x255f,0x269b,0x2844,0x2b92,0x2fde,0x38b7,0x438a,
+    0x2513,0x2527,0x2529,0x2535,0x253e,0x254c,0x257f,0x25b3,0x2617,0x26b0,0x27d5,0x295d,0x2c73,0x3084,0x38ed,0x43ae,
+    0x26fe,0x2714,0x2712,0x2714,0x2728,0x2732,0x274e,0x277c,0x27d9,0x2855,0x2966,0x2ad0,0x2db7,0x3194,0x397c,0x43cf,
+    0x2ad9,0x2abe,0x2ad9,0x2adc,0x2ac5,0x2ae2,0x2afa,0x2b0d,0x2b53,0x2bb0,0x2c8b,0x2dcc,0x305f,0x33f6,0x3b3b,0x44ab,
+    0x2fa8,0x2fa9,0x2fa1,0x2f9f,0x2fa8,0x2fa4,0x2fa4,0x2fb9,0x2fd1,0x3016,0x30ae,0x31ad,0x33fe,0x373e,0x3e05,0x46c2,
+    0x38fe,0x3909,0x3903,0x38e8,0x3905,0x3906,0x3902,0x3908,0x390d,0x3905,0x3940,0x39d2,0x3b7b,0x3e38,0x443b,0x4c2e,
+    0x4434,0x4427,0x442a,0x4425,0x4421,0x4434,0x4435,0x4425,0x442b,0x4428,0x4423,0x4444,0x4507,0x46ff,0x4c50,0x5388,
+    0x3331,0x3338,0x3334,0x332b,0x3330,0x3322,0x332d,0x3336,0x332c,0x337d,0x341d,0x353b,0x3802,0x3bdf,0x43de,0x4dc4,
+    0x333a,0x3336,0x3330,0x332a,0x3329,0x332d,0x332e,0x332b,0x3350,0x3377,0x341b,0x3543,0x37fc,0x3bd9,0x43d4,0x4dcf,
+    0x333b,0x332e,0x3330,0x332e,0x3327,0x3334,0x3335,0x3331,0x3345,0x337a,0x3412,0x3544,0x37fe,0x3bd9,0x43d4,0x4dc4,
+    0x3331,0x3332,0x332a,0x3330,0x3328,0x332f,0x3330,0x3334,0x3334,0x3378,0x3423,0x3528,0x37f7,0x3bd7,0x43d0,0x4dc7,
+    0x3331,0x3333,0x3335,0x332b,0x332d,0x332c,0x332e,0x332f,0x3350,0x3370,0x3426,0x3545,0x37f6,0x3bde,0x43df,0x4dbb,
+    0x3334,0x3338,0x332b,0x332b,0x3326,0x3333,0x3334,0x3330,0x334f,0x337e,0x3422,0x3546,0x37f8,0x3bbe,0x43d6,0x4dc6,
+    0x332b,0x3332,0x3335,0x332f,0x3338,0x332f,0x3329,0x3340,0x334e,0x337e,0x3427,0x353d,0x3801,0x3be6,0x43db,0x4dbc,
+    0x333f,0x3335,0x333d,0x3339,0x3339,0x3336,0x3331,0x3340,0x3355,0x337b,0x342c,0x354d,0x37ea,0x3bd7,0x43d8,0x4dbe,
+    0x3357,0x334e,0x334d,0x3356,0x3355,0x3343,0x3352,0x334f,0x3363,0x339e,0x3438,0x354f,0x3800,0x3bd9,0x43e1,0x4db5,
+    0x3375,0x3389,0x3381,0x3383,0x3388,0x3381,0x337f,0x338c,0x339a,0x33b6,0x345d,0x3563,0x3816,0x3be6,0x43d7,0x4db7,
+    0x3436,0x3417,0x3430,0x3438,0x342b,0x3432,0x342a,0x3426,0x343d,0x3462,0x34e8,0x35e2,0x3853,0x3bfd,0x43e7,0x4da2,
+    0x355e,0x3553,0x355a,0x355a,0x355b,0x3554,0x355b,0x3559,0x3558,0x357d,0x35e6,0x36c8,0x3908,0x3c76,0x43f1,0x4dc5,
+    0x3822,0x3820,0x3829,0x3816,0x3820,0x3826,0x3801,0x381e,0x3828,0x3827,0x3874,0x3915,0x3b00,0x3e0c,0x44d7,0x4df6,
+    0x3c11,0x3c0f,0x3c09,0x3c13,0x3bf2,0x3c0d,0x3c0c,0x3c00,0x3c10,0x3c0e,0x3c1e,0x3c98,0x3e1f,0x40c3,0x46eb,0x4f24,
+    0x4431,0x4442,0x4434,0x4443,0x4438,0x4437,0x442f,0x4437,0x442f,0x443b,0x4431,0x4446,0x4519,0x4707,0x4c54,0x5394,
+    0x4e4a,0x4e42,0x4e43,0x4e3b,0x4e41,0x4e3d,0x4e12,0x4e3b,0x4e3c,0x4e39,0x4e33,0x4e37,0x4e5a,0x4f7a,0x53b3,0x5a34,}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/libsc68.c Added

@@ -0,0 +1,47 @@
+/*
+ * @file libsc68.c
+ * @brief sc68 API
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "sc68.h"
+
+#ifndef PACKAGE_STRING
+# define PACKAGE_STRING "libsc68 n/a"
+#endif
+
+#ifndef PACKAGE_VERNUM
+# define PACKAGE_VERNUM 0
+#endif
+
+const char * sc68_versionstr(void)
+{
+ return PACKAGE_STRING;
+}
+
+int sc68_version(void)
+{
+ return PACKAGE_VERNUM;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/mixer68.c Added

@@ -0,0 +1,327 @@
+/*
+ * @file api68.c
+ * @brief audio mixer
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "mixer68.h"
+
+/* ARM compliant version */
+/* #define SWAP_16BITWORD(V) ((V^=V<<16), (V^=V>>16), (V^=V<<16)) */
+
+#define SWAP_16BITWORD(V) (((u32)(V)>>16)+(V<<16))
+
+/* Mix 16-bit-stereo PCM into 16-bit-stereo with sign change.
+ *
+ * PCM' = PCM ^ sign
+ *
+ * sign=0 : Keep input sign,
+ * sign=0x00008000 : Change left channel sign
+ * sign=0x80000000 : Change right channel sign
+ * sign=0x80008000 : Change both channel
+ */
+void mixer68_stereo_16_LR(u32 * dst, u32 * src, int nb, const u32 sign)
+{
+ u32 *end;
+
+ /* Optimize trivial case : same buffer, no sign change */
+ if (!sign && dst == src) {
+ return;
+ }
+
+ end = dst+nb;
+ if (nb&1) {
+ *dst++ = (*src++) ^ sign;
+ }
+ if (nb&2) {
+ *dst++ = (*src++) ^ sign;
+ *dst++ = (*src++) ^ sign;
+ }
+ if (dst<end) {
+ do {
+ *dst++ = (*src++) ^ sign;
+ *dst++ = (*src++) ^ sign;
+ *dst++ = (*src++) ^ sign;
+ *dst++ = (*src++) ^ sign;
+ } while (dst < end);
+ }
+
+}
+
+/* Mix 16-bit-stereo PCM into 16-bit-stereo PCM with channel swapping.
+ */
+void mixer68_stereo_16_RL(u32 * dst, u32 * src, int nb, const u32 sign)
+{
+ u32 *end;
+
+#undef MIX_ONE
+#define MIX_ONE \
+ v = (*src++); \
+ *dst++ = SWAP_16BITWORD(v) ^ sign
+
+ end = dst+nb;
+ if (nb&1) {
+ u32 v;
+ MIX_ONE;
+ }
+ if (nb&2) {
+ u32 v;
+ MIX_ONE;
+ MIX_ONE;
+ }
+ if (dst<end) {
+ do {
+ u32 v;
+ MIX_ONE;
+ MIX_ONE;
+ MIX_ONE;
+ MIX_ONE;
+ } while (dst < end);
+ }
+
+}
+
+/* Mix 16-bit-stereo PCM into 32-bit-stereo-float (-norm..norm)
+ */
+void mixer68_stereo_FL_LR (float * dst, u32 * src, int nb,
+ const u32 sign, const float norm)
+{
+ const float mult = norm / 32768.0f;
+ int v;
+ float * const end = dst + (nb<<1);
+ if (dst < end) {
+ do {
+ v = (int)(s32)(*src++ ^ sign);
+ *dst++ = mult * (float)(s16)(v);
+ *dst++ = mult * (float)(v>>16);
+ } while (dst < end);
+ }
+}
+
+/* Duplicate left channel into right channel and change sign.
+ * PCM' = ( PCM-L | (PCM-L<<16) ) ^ sign
+ */
+void mixer68_dup_L_to_R(u32 *dst, u32 *src, int nb,
+ const u32 sign)
+{
+ u32 * const end = dst+nb;
+ if (nb&1) {
+ u32 v;
+ v = (u16)*src++; *dst++ = ((v<<16)|v) ^ sign;
+ }
+ if (nb&2) {
+ u32 v;
+ v = (u16)*src++; *dst++ = ((v<<16)|v) ^ sign;
+ v = (u16)*src++; *dst++ = ((v<<16)|v) ^ sign;
+ }
+ if (dst < end) {
+ do {
+ u32 v;
+ v = (u16)*src++; *dst++ = ((v<<16)|v) ^ sign;
+ v = (u16)*src++; *dst++ = ((v<<16)|v) ^ sign;
+ v = (u16)*src++; *dst++ = ((v<<16)|v) ^ sign;
+ v = (u16)*src++; *dst++ = ((v<<16)|v) ^ sign;
+ } while (dst < end);
+ }
+
+}
+
+/* Duplicate right channel into left channel and change sign.
+ * PCM = ( PCM-R | (PCM-R>>16) ) ^ sign
+ */
+void mixer68_dup_R_to_L(u32 *dst, u32 *src, int nb, const u32 sign)
+{
+ u32 * const end = dst+nb;
+
+ if (nb&1) {
+ u32 v;
+ v = *src++&0xFFFF0000; *dst++ = ((v>>16)|v) ^ sign;
+ }
+ if (nb&2) {
+ u32 v;
+ v = *src++&0xFFFF0000; *dst++ = ((v>>16)|v) ^ sign;
+ v = *src++&0xFFFF0000; *dst++ = ((v>>16)|v) ^ sign;
+ }
+ if (dst < end) {
+ do {
+ u32 v;
+ v = *src++&0xFFFF0000; *dst++ = ((v>>16)|v) ^ sign;
+ v = *src++&0xFFFF0000; *dst++ = ((v>>16)|v) ^ sign;
+ v = *src++&0xFFFF0000; *dst++ = ((v>>16)|v) ^ sign;
+ v = *src++&0xFFFF0000; *dst++ = ((v>>16)|v) ^ sign;
+ } while (dst < end);
+ }
+
+}
+
+/* Blend Left and right voice :
+ * factor 0..65536, 0:blend nothing, 65536:swap L/R
+ */
+void mixer68_blend_LR(u32 * dst, u32 * src, int nb,
+ int factor,
+ const u32 sign_r, const u32 sign_w)
+{
+ u32 *end;
+ int oof;
+
+ if (factor < 0) {
+ factor = 0;
+ } else if (factor > 65536) {
+ factor = 65536;
+ }
+
+#undef MIX_ONE
+#define MIX_ONE \
+ r = (int)(s32)(*src++ ^ sign_r); \
+ l = r >> 16; \
+ r = (int)(s16)r; \
+ *dst++ = ( \
+ ((l*oof+r*factor)&0xFFFF0000) \
+ | \
+ ((u32)(r*oof+l*factor) >> 16) \
+ ) ^ sign_w
+
+ oof = 65536-factor;
+ end = dst+nb;
+ if (nb&1) {
+ int l,r;
+ MIX_ONE;
+ }
+ if (nb&2) {
+ int l,r;
+ MIX_ONE;
+ MIX_ONE;
+ }
+ if (dst < end) {
+ do {
+ int l,r;
+
+ MIX_ONE;
+ MIX_ONE;
+ MIX_ONE;
+ MIX_ONE;
+ } while (dst < end);
+ }
+
+}
+
+/* Multiply left/right (signed) channel by ml/mr factor -65536..65536
+ */
+void mixer68_mult_LR(u32 *dst, u32 *src, int nb,
+ const int ml, const int mr,
+ const u32 sign_r, const u32 sign_w)
+{
+ u32 * end;
+
+ /* Optimize some trivial case. */
+
+ if (ml == 65536 && mr == 65536) {
+ mixer68_stereo_16_LR(dst, src, nb, sign_r ^ sign_w);
+ return;
+ }
+
+ if (ml==0 && mr==0) {
+ mixer68_fill(dst, nb, sign_w);
+ return;
+ }
+
+#undef MIX_ONE
+#define MIX_ONE \
+ r = (int)(s32)(*src++ ^ sign_r); \
+ l = (int)(s16)r; \
+ r = r >> 16; \
+ *dst++ = ((((u32)(l*ml))>>16) | ((r*mr)&0xFFFF0000)) ^ sign_w
+
+ end = dst+nb;
+
+ if (nb&1) {
+ int l,r;
+ MIX_ONE;
+ }
+
+ if (nb&2) {
+ int l,r;
+ MIX_ONE;
+ MIX_ONE;
+ }
+
+ if (dst < end) {
+ do {
+ int l,r;
+ MIX_ONE;
+ MIX_ONE;
+ MIX_ONE;
+ MIX_ONE;
+ } while (dst < end);
+ }
+
+}
+
+/* Fill buffer sign with value (RRRRLLLL)
+ */
+void mixer68_fill(u32 * dst, int nb, const u32 sign)
+{
+ u32 * const end = dst+nb;;
+
+ if (nb&1) {
+ *dst++ = sign;
+ }
+ if (nb&2) {
+ *dst++ = sign;
+ *dst++ = sign;
+ }
+ if (dst < end) {
+ do {
+ *dst++ = sign;
+ *dst++ = sign;
+ *dst++ = sign;
+ *dst++ = sign;
+ } while (dst < end);
+ }
+}
+
+void mixer68_copy(u32 * dst, u32 * src, int nb)
+{
+ /* Optimize trivial case : same buffer */
+ if (dst == src || nb <= 0) {
+ return;
+ } else {
+ u32 * const end = dst+nb;
+ if (nb&1) {
+ *dst++ = *src++;
+ }
+ if (nb&2) {
+ *dst++ = *src++;
+ *dst++ = *src++;
+ }
+ if (dst<end) {
+ do {
+ *dst++ = *src++;
+ *dst++ = *src++;
+ *dst++ = *src++;
+ *dst++ = *src++;
+ } while (dst < end);
+ }
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/sc68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/sc68/conf68.h Added

@@ -0,0 +1,79 @@
+/**
+ * @ingroup   lib_sc68
+ * @file      sc68/conf68.h
+ * @brief     configuration file.
+ * @author    Benjamin Gerard
+ * @date      1999/07/27
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef SC68_CONF68_H
+#define SC68_CONF68_H
+
+#ifndef SC68_EXTERN
+# ifdef __cplusplus
+#  define SC68_EXTERN extern "C"
+# else
+#  define SC68_EXTERN
+# endif
+#endif
+
+/**
+ *  @defgroup  lib_sc68_conf  Access to sc68 configuration
+ *  @ingroup   lib_sc68
+ *
+ *  This module prodives functions to access sc68 configuration.
+ *
+ *  @{
+ */
+
+SC68_EXTERN
+/**
+ *  Load config.
+ *
+ *  @param  name  name of application
+ *
+ *  @return error code
+ *  @retval 0 on success
+ *  @retval 0 on error
+ */
+int config68_load(const char * name);
+
+SC68_EXTERN
+/**
+ *  Save config.
+ *
+ *  @param  name  name of application
+ *
+ *  @return error code
+ *  @retval 0 on success
+ *  @retval 0 on error
+ */
+int config68_save(const char * name);
+
+
+SC68_EXTERN
+/**
+ *  Library one time init.
+ *
+ *  @param  argc  argument count.
+ *  @param  argv  argument values.
+ *
+ *  @return number of argument remaining in argv
+ *  @retval 0 on success
+ *  @retval 0 on error
+ */
+int config68_init(int argc, char * argv);
+
+SC68_EXTERN
+/**
+ *  Library one time shutdown shutdown.
+ */
+void config68_shutdown(void);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/sc68/mixer68.h Added

@@ -0,0 +1,207 @@
+/**
+ * @ingroup lib_sc68
+ * @file sc68/mixer68.h
+ * @brief audio mixer header.
+ * @author Benjamin Gerard
+ * @date 1999/05/17
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef MIXER68_H
+#define MIXER68_H
+
+#include "emu68/type68.h"
+
+#ifndef SC68_EXTERN
+# ifdef __cplusplus
+# define SC68_EXTERN extern "C"
+# else
+# define SC68_EXTERN
+# endif
+#endif
+
+/**
+ * @defgroup lib_sc68_mixer Simple audio mixer
+ * @ingroup lib_sc68
+ *
+ * sc68 audio mixer provides functions for computing audio data PCM.
+ * Almost all functions work on 16 bit stereo PCM. Some functions
+ * require signed input to work properly. All functions allow to
+ * change PCM sign. Functions that require signed input perform a
+ * double sign change operation which allow to have any kind of
+ * input PCM.
+ *
+ * Internaly PCM are read as 32bit integer. This implies that buffer
+ * must be properly aligned (depending on the architecture). Left
+ * channel is stored the less signifiant 16 bit and right the most
+ * signifiant 16 bit. Ensure the audio device use the same byte
+ * order.
+ *
+ * @{
+ */
+
+/**
+ * @name Constants for PCM sign transformation.
+ * @{
+ */
+#define MIXER68_SAME_SIGN 0x00000000 /**< No channel. */
+#define MIXER68_CHANGE_LEFT_CHANNEL_SIGN 0x00008000 /**< Left channel. */
+#define MIXER68_CHANGE_RIGHT_CHANNEL_SIGN 0x80000000 /**< Right channel. */
+#define MIXER68_CHANGE_SIGN 0x80008000 /**< Both channels. */
+/**
+ * @}
+ */
+
+SC68_EXTERN
+/**
+ * Copy 16-bit-stereo PCM with optionnal sign change.
+ *
+ * @param dst dstination PCM buffer
+ * @param src Source PCM buffer (can be same as dst).
+ * @param nb Number of PCM
+ * @param sign Sign transformation.
+ */
+void mixer68_stereo_16_LR(u32 * dst, u32 * src, int nb,
+ const u32 sign);
+
+SC68_EXTERN
+/**
+ * Copy 16-bit-stereo PCM with channel swapping and optionnal sign
+ * change.
+ *
+ * @note Sign change occurs after channel swapping.
+ *
+ * @param dst Destination PCM buffer
+ * @param src Source PCM buffer (can be same as dst).
+ * @param nb Number of PCM
+ * @param sign Sign transformation.
+ */
+void mixer68_stereo_16_RL(u32 * dst, u32 * src, int nb,
+ const u32 sign);
+
+SC68_EXTERN
+/**
+ * Copy 16-bit-stereo PCM into normalized float-stereo (-norm..+norm).
+ *
+ * @note Sign change occurs before float transformation.
+ * @warning PCM are assumed to be signed after sign transform.
+ *
+ * @param dst dstination PCM buffer
+ * @param src Source PCM buffer (can be same as dst).
+ * @param nb Number of PCM
+ * @param sign Sign transformation.
+ * @param norm float absolute range (normalization).
+ *
+ * @note Minus norm causes a sign/phase inversion.
+ */
+void mixer68_stereo_FL_LR(float * dst, u32 * src, int nb,
+ const u32 sign, const float norm);
+
+SC68_EXTERN
+/**
+ * Copy left channel of 16-bit stereo PCM into L/R channels with
+ * optionnal sign change.
+ *
+ * @param dst Destination PCM buffer
+ * @param src Source PCM buffer (can be same as dst).
+ * @param nb Number of PCM
+ * @param sign Sign transformation.
+ */
+void mixer68_dup_L_to_R(u32 * dst, u32 * src, int nb, const u32 sign);
+
+SC68_EXTERN
+/**
+ * Copy right channel of 16-bit stereo PCM into L/R channels
+ * with optionnal sign change.
+ *
+ * @param dst Destination PCM buffer
+ * @param src Source PCM buffer (can be same as dst).
+ * @param nb Number of PCM
+ * @param sign Sign transformation.
+ */
+void mixer68_dup_R_to_L(u32 * dst, u32 * src, int nb, const u32 sign);
+
+SC68_EXTERN
+/**
+ * Copy 16-bit-stereo PCM with L/R blending and optionnal sign change.
+ *
+ * This function performs following transformations in this order :
+ * - Read 32 bit value from src.
+ * - Apply sign_r transformation; it is a bitwise EOR.
+ * - Apply blending (here PCM are asuumed to be signed).
+ * - Apply sign_w transformation; it is a bitwise EOR too.
+ * - Store 32 bit value.
+ *
+ * @warning As the blending occurs on signed PCM the sign_r and
+ * the sign_w must be setted properly.
+ *
+ * @param dst Destination PCM buffer
+ * @param src Source PCM buffer (can be same as dst).
+ * @param nb Number of PCM
+ * @param factor Blending factor from 0..65536.
+ * - 0, blend nothing.
+ * - 65536, Swap L/R.
+ * - other value, linear blending.
+ * @param sign_r sign transform for input PCM.
+ * @param sign_w sign transform for output PCM.
+ */
+void mixer68_blend_LR(u32 * dst, u32 * src, int nb,
+ int factor,
+ const u32 sign_r, const u32 sign_w);
+
+SC68_EXTERN
+/**
+ * Copy 16-bit-stereo PCM with L/R amplitude factor and optionnal sign
+ * change.
+ *
+ * This function performs following transformations in this order :
+ * - Read 32 bit value from src.
+ * - Apply sign_r transformation; it is a bitwise EOR.
+ * - Apply signed modulation to both channels.
+ * - Apply sign_w transformation; it is a bitwise EOR too.
+ * - Store 32 bit value.
+ *
+ * @warning As the modulation occurs on signed PCM the sign_r and
+ * the sign_w must be setted properly.
+ *
+ * @note Amplitude factors (ml and mr) can be minus to invert phase.
+ *
+ * @param dst Destination PCM buffer
+ * @param src Source PCM buffer (can be same as dst).
+ * @param nb Number of PCM
+ * @param ml Left channel factor from -65536..65536.
+ * @param mr Like ml but for right channel.
+ * @param sign_r sign transform for input PCM.
+ * @param sign_w sign transform for output PCM.
+ */
+void mixer68_mult_LR(u32 * dst, u32 * src, int nb,
+ const int ml, const int mr,
+ const u32 sign_r, const u32 sign_w);
+
+SC68_EXTERN
+/**
+ * Fill 16-bit-stereo buffer with sign value (RRRRLLLL).
+ *
+ * @param dst Destination PCM buffer
+ * @param nb Number of PCM
+ * @param sign PCM value written (right channel is MSW).
+ */
+void mixer68_fill(u32 * dst, int nb,
+ const u32 sign);
+
+SC68_EXTERN
+/**
+ * Copy 16-bit-stereo buffer.
+ *
+ * @param dst Destination PCM buffer
+ * @param src Source PCM buffer
+ * @param nb Number of PCM
+ */
+void mixer68_copy(u32 * dst, u32 * src, int nb);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/sc68/sc68.h Added

@@ -0,0 +1,760 @@
+/**
+ * @ingroup lib_sc68
+ * @file sc68/sc68.h
+ * @brief sc68 API header.
+ * @author Benjamin Gerard
+ * @date 2003/08/07
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef SC68_SC68_H
+#define SC68_SC68_H
+
+#ifndef SC68_EXTERN
+# ifdef __cplusplus
+# define SC68_EXTERN extern "C"
+# else
+# define SC68_EXTERN extern
+# endif
+#endif
+
+#ifndef SC68_API
+/* Building */
+# ifdef SC68_EXPORT
+# if defined(DLL_EXPORT) && defined(HAVE_DECLSPEC)
+# define SC68_API __declspec(dllexport)
+# elif defined(HAVE_VISIBILITY)
+# define SC68_API SC68_EXTERN __attribute__ ((visibility("default")))
+# else
+# define SC68_API SC68_EXTERN
+# endif
+/* Using */
+# else
+# if defined(SC68_DLL)
+# define SC68_API __declspec(dllimport)
+# else
+# define SC68_API SC68_EXTERN
+# endif
+# endif
+#endif
+
+/**
+ * @defgroup lib_sc68 sc68 library
+ * @ingroup sc68_dev_lib
+ *
+ * This API provides functions to use sc68 libraries efficiently.
+ *
+ * @par Multi-threading concern
+ *
+ * sc68 should now be thread safe. At least concerning the functions
+ * with a sc68_t parameter. As no torture test has been run against
+ * it this should be considered as quiet experimental.
+ *
+ * @par Quick start
+ *
+ * Here is a quiet minimalist piece of code to use basics of sc68
+ * library:
+ *
+ * @code
+ * #include <sc68/sc68.h>
+ * #include <stdio.h>
+ *
+ * sc68_t * sc68 = 0;
+ * char buffer512*4;
+ * int n;
+ *
+ * // Initialise the library.
+ * // You should consider using sc68_init_t struct.
+ * if (sc68_init(0)) goto error;
+ *
+ * // Create an emulator instance.
+ * // You should consider using sc68_create_t struct.
+ * if (sc68 = sc68_create(0), !sc68) goto error;
+ *
+ * // Load an sc68 file.
+ * if (sc68_load_uri(sc68, fname))
+ * goto error;
+ *
+ * // Set track and loop (optionnal).
+ * sc68_play(sc68, 1, 1);
+ *
+ * // Loop until the end of disk. You can use SC68_LOOP to wait the end
+ * // of the track. Notice that SC68_ERROR set all bits and make the loop
+ * // break too.
+ * while ( (n=sizeof(buffer)>>2), ! (sc68_process(sc68, buffer, &n) & SC68_END))
+ * fwrite(buffer, 1, n, stdout); // copy PCM to stdout
+ *
+ * // Close eject the current disk.
+ * sc68_close(sc68);
+ *
+ * error:
+ *
+ * // Destroy sc68 instance.
+ * sc68_destroy(sc68);
+ *
+ * // Shutdown sc68 library.
+ * sc68_shutdown();
+ *
+ * @endcode
+ *
+ * @{
+ */
+
+#ifndef SC68_API
+/**
+ * sc68 exported symbol.
+ *
+ * Define special atribut for exported symbol.
+ *
+ * - empty: static or classic .so library
+ * - __attribute__ (visibility("default"))): gcc support visibility.
+ * - __declspec(dllexport): creating a win32 DLL.
+ * - __declspec(dllimport): using a win32 DLL.
+ */
+#define SC68_API extern
+#endif
+
+/** API information. */
+typedef struct _sc68_s sc68_t;
+
+/** API disk. */
+typedef void * sc68_disk_t;
+
+/**
+ * Message function.
+ *
+ * @param cat @ref msg68_cat_e "message category"
+ * @param sc68 sc68 instance
+ * @param fmt printf like format string
+ * @param list variable argument list
+ * */
+typedef void (*sc68_msg_t)();
+
+/**
+ * API initialization parameters.
+ *
+ * The sc68_init_t must be properly filled before calling the
+ * sc68_init() function.
+ *
+ */
+typedef struct {
+
+ /** message handler. */
+ sc68_msg_t msg_handler;
+
+ /** debug mask (set bit to clear in msg68). */
+ int debug_clr_mask;
+
+ /** debug mask (set bit to set in msg68). */
+ int debug_set_mask;
+
+ /** number of arguments in command line (modified) */
+ int argc;
+
+ /** command line arguments */
+ char ** argv;
+
+ /** structure for init flags. */
+ struct init_flags {
+ /** set to avoid skip loading on init. */
+ unsigned int no_load_config : 1;
+ /** set to skip config saving on shutdown. */
+ unsigned int no_save_config : 1;
+ } flags; /**< init flags (0 is always the default behaviour). */
+
+} sc68_init_t;
+
+/**
+ * Instance creation parameters.
+ */
+typedef struct {
+ /** sampling rate in hz (non 0 value overrides config default).
+ * The real used value is set by sc68_create() function.
+ */
+ unsigned int sampling_rate;
+
+ /** short name. */
+ const char * name;
+
+ /** 68k memory size (2^log2mem). */
+ int log2mem;
+
+ /** Run 68k emulator in debug mode.
+ * bit #0: enable hardware trace and exception handler.
+ * bit #1: enable rsp server (gdb)
+ */
+ int emu68_debug;
+
+ /** User private data. */
+ void * cookie;
+
+} sc68_create_t;
+
+/**
+ * metatag struct.
+ * @warning MUST match the tag68_t struct defined in tag68.h.
+ */
+typedef struct {
+ char * key; /**< Tag name. */
+ char * val; /**< Tag value. */
+} sc68_tag_t;
+
+/**
+ * Music common information.
+ */
+typedef struct {
+ unsigned track; /**< Current/Default track 1..99. */
+ unsigned time_ms; /**< Track/Disk duration. */
+ char time12; /**< Time in format TT MM:SS. */
+ unsigned ym:1; /**< Music uses YM-2149 (ST). */
+ unsigned ste:1; /**< Music uses STE specific hardware. */
+ unsigned amiga:1; /**< Music uses Paula Amiga hardware. */
+ unsigned asid:1; /**< aSid caps. */
+ const char * hw; /**< Hardware name. */
+ int tags; /**< Number of tags. */
+ sc68_tag_t * tag; /**< Tags array */
+} sc68_cinfo_t;
+
+/**
+ * Music information.
+ */
+typedef struct {
+ int tracks; /**< number of tracks 1..99. */
+
+ unsigned int addr; /**< Load address. */
+ unsigned int rate; /**< Replay rate. */
+ char * replay; /**< replay name. */
+
+ sc68_cinfo_t dsk; /**< disk info. */
+ sc68_cinfo_t trk; /**< track info (MUST BE behind dsk). */
+
+ /** Predefined tags
+ *
+ * @warning album must be first and _lasttag last.
+ */
+ char * album; /**< Points to disk's title tag. */
+ char * title; /**< Points to track's title tag. */
+ char * artist; /**< Points to track's artist tag. */
+ char * format; /**< Points to disk's format tag. */
+ char * genre; /**< Points to track's genre tag. */
+ char * year; /**< Points to "year" tag. */
+ char * ripper; /**< Points to "ripper" tag. */
+ char * converter; /**< Points to "converter" tag. */
+ char * _lasttag; /**< Last predefined tag. */
+
+} sc68_music_info_t;
+
+/** Alias type for sc68_music_info_t. */
+typedef sc68_music_info_t sc68_minfo_t;
+
+/**
+ * Flags returned eturn codeby the sc68_process() functions.
+ */
+enum sc68_code_e {
+ SC68_IDLE = (1<<0), /**< Set if no emulation has been runned. */
+ SC68_CHANGE = (1<<1), /**< Set if track has changed. */
+ SC68_LOOP = (1<<2), /**< Set if track has looped. */
+ SC68_END = (1<<3), /**< Set if track(s) has ended. */
+ SC68_SEEK = (1<<4), /**< Set if currently seeking. */
+ /* */
+ SC68_OK = 0, /**< Success return code. */
+ SC68_ERROR = ~0 /**< Failure return code (all bits set). */
+};
+
+/**
+ * sc68 sampling rate values in hertz (hz).
+ */
+enum sc68_spr_e {
+ SC68_SPR_QUERY = -1, /**< Query default or current sampling rate. */
+ SC68_SPR_DEFAULT = 0 /**< Default sampling rate. */
+};
+
+/**
+ * sc68_play() function parameters.
+ */
+enum sc68_play_e {
+ SC68_DSK_TRACK = 0, /**< special value for addressing disk. */
+ SC68_DEF_LOOP = 0, /**< loop value for the default loop. */
+ SC68_INF_LOOP = -1, /**< loop value for infinite loop. */
+ SC68_DEF_TRACK = -1, /**< track value for the default track. */
+ SC68_CUR_TRACK = -2, /**< track value for the current track. */
+ SC68_CUR_LOOP = -2, /**< track value for the current track. */
+};
+
+/**
+ * PCM formats.
+ */
+enum sc68_pcm_e {
+ SC68_PCM_S16 = 1, /**< Native 16bit signed. */
+ SC68_PCM_F32 = 2 /**< native 32bit float. */
+};
+
+/**
+ * aSIDifier flags.
+ */
+enum sc68_asid_e {
+ SC68_ASID_OFF = 0,
+ SC68_ASID_ON = 1, /**< aSIDifier enable/disable. */
+ SC68_ASID_FORCE = 2, /**< Force aSIDify unsafe track. */
+ SC68_ASID_NO_A = 4, /**< Disable ASIDifier for channel A. */
+ SC68_ASID_NO_B = 8, /**< Disable ASIDifier for channel B. */
+ SC68_ASID_NO_C = 16, /**< Disable ASIDifier for channel C. */
+};
+
+/**
+ * sc68_cntl() op parameter.
+ */
+enum sc68_cntl_e {
+ SC68_NOP = 0, /**< No OPeration. */
+ SC68_GET_LAST, /**< Get the last command #. */
+ SC68_GET_NAME, /**< Get sc68 instance name. */
+ SC68_GET_TRACKS, /**< Get number of tracks. */
+ SC68_GET_TRACK, /**< Get current track. */
+ SC68_GET_DEFTRK, /**< Get disk default track. */
+ SC68_GET_LOOPS, /**< Number of loops to play. */
+ SC68_GET_LOOP, /**< Get current loop. */
+ SC68_GET_DISK, /**< Get a pointer to disk. */
+ SC68_GET_SPR, /**< Get sampling rate. */
+ SC68_SET_SPR, /**< Set sampling rate. */
+ SC68_GET_LEN, /**< Get current track length. */
+ SC68_GET_TRKLEN, /**< Get some track length. */
+ SC68_GET_DSKLEN, /**< Get disk length. */
+ SC68_GET_ORG, /**< Get current track origin. */
+ SC68_GET_TRKORG, /**< Get some track origin. */
+ SC68_GET_POS, /**< Get track position (ms). */
+ SC68_GET_DSKPOS, /**< Get disk position (ms). */
+ SC68_GET_PLAYPOS, /**< Get play position (ms). */
+ SC68_SET_POS, /**< Set position. */
+ SC68_GET_PCM, /**< Get PCM format */
+ SC68_SET_PCM, /**< Set PCM format */
+ SC68_CAN_ASID, /**< Get aSID caps */
+ SC68_GET_ASID, /**< Get aSID mode */
+ SC68_SET_ASID, /**< Set aSID mode */
+ SC68_GET_COOKIE, /**< Get cookie (user data). */
+ SC68_SET_COOKIE, /**< Set cookie (user data). */
+ SC68_EMULATORS, /**< Get emulators array. */
+ SC68_CONFIG_LOAD, /**< Load and apply config. */
+ SC68_CONFIG_SAVE, /**< Save config */
+ SC68_ENUM_OPT, /**< Enumerate options. */
+ SC68_GET_OPT, /**< Get options. */
+ SC68_SET_OPT_STR, /**< Set options (string). */
+ SC68_SET_OPT_INT, /**< Set options (integer). */
+ SC68_DIAL, /**< Run a dialog. */
+
+ /* Always last */
+ SC68_CNTL_LAST /**< Last command #. */
+};
+
+/**
+ * @name API control functions.
+ * @{
+ */
+
+SC68_API
+/**
+ * Get version number
+ */
+int sc68_version(void);
+
+SC68_API
+/**
+ * Get version string
+ *
+ */
+const char * sc68_versionstr(void);
+
+SC68_API
+/**
+ * Initialise sc68 API.
+ *
+ * @param init Initialization parameters.
+ *
+ * @return error-code
+ * @retval 0 Success
+ * @retval -1 Error
+ *
+ * @see sc68_shutdown()
+ */
+int sc68_init(sc68_init_t * init);
+
+SC68_API
+/**
+ * Destroy sc68 API.
+ *
+ */
+void sc68_shutdown(void);
+
+SC68_API
+/**
+ * Create sc68 instance.
+ *
+ * @param create Creation parameters.
+ *
+ * @return Pointer to created sc68 instance.
+ * @retval 0 Error.
+ *
+ * @see sc68_destroy()
+ */
+sc68_t * sc68_create(sc68_create_t * create);
+
+SC68_API
+/**
+ * Destroy sc68 instance.
+ *
+ * @param sc68 sc68 instance to destroy.
+ *
+ * @see sc68_create()
+ * @note It is safe to call with null api.
+ */
+void sc68_destroy(sc68_t * sc68);
+
+SC68_API
+/**
+ * Generic control function.
+ *
+ * @param sc68 sc68 instance or 0 for general control.
+ * @param op @ref sc68_dial_e operation
+ *
+ * @retval 0 success
+ * @retval -1 failure
+ */
+int sc68_cntl(sc68_t * sc68, int op, ...);
+
+SC68_API
+/**
+ * Return last error message.
+ *
+ * @param sc68 sc68 instance or 0 for library messages.
+ * @return Error string.
+ * @retval 0 No stacked error message.
+ */
+const char * sc68_error(sc68_t * sc68);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name Music control functions.
+ * @{
+ */
+
+SC68_API
+/**
+ * Fill PCM buffer.
+ *
+ * The sc68_process() function fills the PCM buffer with the current
+ * music data. If the current track is finished and it is not the last
+ * the next one is automatically loaded. The function returns status
+ * value that report events that have occured during this pass.
+ *
+ * @param sc68 sc68 instance.
+ * @param buf PCM buffer (must be at least 4*n bytes).
+ * @param n Pointer to number of PCM sample to fill.
+ *
+ * @return Process status
+ *
+ */
+int sc68_process(sc68_t * sc68, void * buf, int * n);
+
+SC68_API
+/**
+ * Set/Get current track.
+ *
+ * The sc68_play() function get or set current track.
+ *
+ * If track == SC68_CUR_TRACK (-1) and loop != SC68_CUR_LOOP the
+ * function returns the current track or 0 if none.
+ *
+ * If track == SC68_CUR_TRACK (-1) and loop == SC68_CUR_LOOP the
+ * returns the current loop counter.
+ *
+ * Forced track and loop values while disk loading (see sc68_uri)
+ * are prior to the track and loop parameters.
+ *
+ * If track == SC68_DEF_TRACK, the disk default trackis used unless
+ * config "force-track" is non zero.
+ *
+ * If loop == SC68_LOOP_DEF, the default number of loop is used
+ * unless config "force-loop" is non zero.
+ *
+ * To avoid multi-threading issues the track is not changed directly
+ * but a change-track event is posted. This event will be processed
+ * at the next call to the sc68_process() function.
+ *
+ * @param sc68 sc68 instance.
+ * @param track track number (see sc68_play_e)
+ * @param loop number of loop (see sc68_play_e)
+ *
+ * @return error code or track number.
+ * @retval 0 Success or no current track or loop counter
+ * @retval >0 Current track or loop counter
+ * @retval -1 Failure.
+ *
+ * @see sc68_play_e
+ * @see sc68_uri
+ *
+ */
+int sc68_play(sc68_t * sc68, int track, int loop);
+
+SC68_API
+/**
+ * Stop playing.
+ *
+ * The sc68_stop() function stop current playing track. Like the
+ * sc68_play() function the sc68_stop() function does not really
+ * stop the music but send a stop-event that will be processed by
+ * the next call to sc68_process() function.
+ *
+ * @param sc68 sc68 instance.
+ * @return error code
+ * @retval 0 Success
+ * @retval -1 Failure
+ */
+int sc68_stop(sc68_t * sc68);
+
+SC68_API
+/**
+ * Get disk/track information.
+ *
+ * @param info pointer to a sc68_music_info_t struct to be fill.
+ * @param sc68 sc68 instance
+ * @param track track number
+ * @param disk disk to get information from (0 for current disk).
+ *
+ * @return error code
+ * @retval 0 Success.
+ * @retval -1 Failure.
+ *
+ */
+int sc68_music_info(sc68_t * sc68, sc68_music_info_t * info,
+ int track, sc68_disk_t disk);
+
+SC68_API
+/**
+ * Get disk/track meta tag.
+ *
+ * @param sc68 sc68 instance
+ * @param tag tag to look for (tag68_t::key must be set).
+ * @param track track number (0:disk tags, -1:current/default).
+ * @param disk disk to get information from (0 for current disk).
+ *
+ * @return error code
+ * @retval 0 Success.
+ * @retval -1 Failure.
+ *
+ *
+ * @see file68_tag_get()
+ */
+int sc68_tag_get(sc68_t * sc68, sc68_tag_t * tag,
+ int track, sc68_disk_t disk);
+
+
+SC68_API
+/**
+ * Get a copy of disk/track meta tag.
+ *
+ * @param sc68 sc68 instance
+ * @param key tag to look for (tag68_t::key must be set).
+ * @param track track number (0:disk tags, -1:current/default).
+ * @param disk disk to get information from (0 for current disk).
+ *
+ * @return dynamic copy of a metatag
+ * @retval 0 Failure.
+ *
+ * @see file68_tag() for more infornmation.
+ */
+char * sc68_tag(sc68_t * sc68, const char * key, int track, sc68_disk_t disk);
+
+SC68_API
+/**
+ * Get disk/track meta tag.
+ *
+ * @param sc68 sc68 instance
+ * @param tag result tag.
+ * @param track track number (0:disk tags, -1:current/default).
+ * @param idx index of the metatag.
+ * @param disk disk to get information from (0 for current disk).
+ *
+ * @return error code
+ * @retval 0 Success.
+ * @retval -1 Failure.
+ *
+ */
+int sc68_tag_enum(sc68_t * sc68, sc68_tag_t * tag,
+ int track, int idx, sc68_disk_t disk);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @name File functions.
+ * @{
+ */
+
+SC68_API
+/**
+ * Get official sc68 mime-type.
+ * @retval "audio/x-sc68"
+ */
+const char * sc68_mimetype(void);
+
+#ifndef HAVE_VFS68
+typedef struct _vfs68_t vfs68_t; /**< normally defined in sc68/file68_vfs.h */
+#define HAVE_VFS68 1
+#endif
+
+SC68_API
+/**
+ * Create a VFS from uri.
+ *
+ * @param uri URI or path
+ * @param mode open mode
+ * @param argc number of supplemental arguments
+ *
+ * @return VFS
+ * @retval 0 on error
+ */
+vfs68_t * sc68_vfs(const char * uri, int mode, int argc, ...);
+
+SC68_API
+/**
+ * Checks if this uri is an sc68 file.
+ */
+int sc68_is_our_uri(const char * uri,
+ const char *exts, int * is_remote);
+
+/**
+ * Load an sc68 disk for playing.
+ */
+SC68_API
+int sc68_load(sc68_t * sc68, vfs68_t * is);
+SC68_API
+int sc68_load_uri(sc68_t * sc68, const char * uri);
+SC68_API
+int sc68_load_mem(sc68_t * sc68, const void * buffer, int len);
+
+/**
+ * Load an sc68 disk outside the API.
+ *
+ * @note Free it with sc68_disk_free() function.
+ */
+SC68_API
+sc68_disk_t sc68_load_disk(vfs68_t * is);
+SC68_API
+sc68_disk_t sc68_load_disk_uri(const char * uri);
+SC68_API
+sc68_disk_t sc68_disk_load_mem(const void * buffer, int len);
+SC68_API
+void sc68_disk_free(sc68_disk_t disk);
+
+SC68_API
+/**
+ * Change current disk.
+ *
+ * @param sc68 sc68 instance
+ * @param disk New disk (0 does a sc68_close())
+ *
+ * @return error code
+ * @retval 0 Success, disk has been loaded.
+ * @retval -1 Failure, no disk has been loaded (occurs if disk was 0).
+ *
+ * @note Can be safely call with null sc68.
+ * @warning After sc68_open() failure, the disk has been freed.
+ * @warning Beware not to use disk information after sc68_close() call
+ * because the disk should have been destroyed.
+ */
+int sc68_open(sc68_t * sc68, sc68_disk_t disk);
+
+SC68_API
+/**
+ * Close current disk.
+ *
+ * @param sc68 sc68 instance
+ *
+ * @note Can be safely call with null sc68 or if no disk has been loaded.
+ */
+void sc68_close(sc68_t * sc68);
+
+/**
+ * @}
+ */
+
+/**
+ * @name Dialog helper.
+ *
+ * The dialog helper is meant to help handling common dialogs used
+ * by various sc68 players. It provides a system free communication
+ * method that allow to create dialogs that does not need to link
+ * with sc68 shared library.
+ *
+ * @{
+ */
+
+/**
+ * Operation (3rd parameter) for the sc68_dial_f handler function.
+ */
+enum sc68_dial_e {
+ SC68_DIAL_CALL, /**< Call special function. */
+
+ SC68_DIAL_GETI, /**< Get integer value. */
+ SC68_DIAL_SETI, /**< Set integer value. */
+ SC68_DIAL_GETS, /**< Get string value. */
+ SC68_DIAL_SETS, /**< Set string value. */
+
+ SC68_DIAL_MIN, /**< Get minimal value. */
+ SC68_DIAL_MAX, /**< Get maximal value. */
+ SC68_DIAL_CNT, /**< Get enum count. */
+
+ SC68_DIAL_ENUM, /**< Get enum values. */
+ SC68_DIAL_DESC, /**< Get a description. */
+ SC68_DIAL_CAT, /**< Get a category. */
+};
+
+#define SC68_DIAL_NEW "new" /**< key to create the dialog. */
+#define SC68_DIAL_KILL "kill" /**< key to destroy the dialog. */
+#define SC68_DIAL_HELLO "hello" /**< key to start a connection. */
+#define SC68_DIAL_WAIT "wait" /**< key to wait for dialog. */
+
+/**
+ * Union used by the sc68_dial_f handler (4th parameter).
+ */
+union sc68_dialval_u {
+ int i; /**< Integer. */
+ const char * s; /**< String. */
+};
+
+/**
+ * Typedef for the sc68_dialval_u union.
+ */
+typedef union sc68_dialval_u sc68_dialval_t;
+
+/**
+ * Dialog helper control function.
+ *
+ * @param cookie
+ * @param key
+ * @param op
+ * @param val
+ *
+ * @return error code
+ * @retval 0 on success
+ * @retval 1 not handled
+ * @retval -1 on error (handled but something got wrong)
+ */
+typedef int (*sc68_dial_f)(void *, const char *, int, sc68_dialval_t *);
+
+/**
+ * @}
+ */
+
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/libsc68/sc68/trap68.h Added

@@ -0,0 +1,39 @@
+96,16,8,56,0,3,250,23,103,6,17,252,0,223,250,17,
+78,115,72,231,128,224,49,252,0,16,4,26,65,250,0,86,
+33,200,0,20,33,200,0,128,65,250,0,76,33,200,0,132,
+65,250,0,218,33,200,0,184,67,248,250,0,66,41,0,29,
+65,250,255,192,33,200,1,20,48,60,0,32,1,137,0,7,
+1,137,0,19,17,252,0,192,250,35,17,252,0,80,250,29,
+65,250,0,142,67,239,252,0,33,9,76,223,7,1,78,117,
+76,223,127,255,78,115,72,231,255,254,77,239,0,66,48,30,
+176,124,0,9,103,34,176,124,0,32,103,46,176,124,0,48,
+103,78,176,124,0,72,103,88,176,124,0,73,103,102,78,114,
+47,33,78,112,96,0,255,202,32,94,112,0,82,64,103,4,
+74,24,102,248,46,128,96,0,255,184,32,30,103,26,176,188,
+0,0,0,1,103,4,112,0,103,16,64,192,2,64,32,0,
+86,192,2,64,0,1,103,2,112,1,46,128,96,0,255,146,
+32,60,0,0,21,0,46,128,96,0,255,134,0,0,0,0,
+65,250,255,254,32,32,144,158,8,128,0,0,32,128,46,128,
+96,0,255,110,112,0,46,128,96,0,255,102,72,231,255,254,
+77,239,0,66,48,30,176,124,0,31,103,0,0,226,176,124,
+0,32,103,84,176,124,0,38,103,22,176,124,0,128,103,26,
+176,124,0,129,103,40,78,114,47,46,78,112,96,0,255,50,
+72,122,255,46,47,30,78,117,0,0,48,60,255,127,65,250,
+255,250,74,224,102,2,112,1,46,128,96,0,255,20,112,128,
+65,250,255,232,74,32,103,4,66,16,112,0,46,128,96,0,
+255,0,0,0,0,0,0,0,65,250,255,254,34,94,179,252,
+0,0,0,1,102,4,46,160,96,80,69,248,136,0,112,0,
+50,40,255,252,16,25,107,10,225,72,16,25,1,138,0,0,
+96,242,176,60,0,128,102,4,18,25,96,232,176,60,0,129,
+102,24,16,25,20,25,22,25,24,0,225,76,24,1,9,138,
+0,0,182,1,103,16,146,2,96,238,16,25,103,8,78,114,
+47,46,78,112,96,4,33,9,49,1,96,0,254,148,1,52,
+250,25,250,31,240,5,1,32,250,27,250,33,240,0,1,20,
+250,29,250,35,15,21,1,16,250,29,250,37,240,20,69,250,
+255,222,112,3,192,94,231,72,212,192,58,106,0,2,24,21,
+16,42,0,6,200,0,26,132,50,30,70,0,91,194,2,66,
+0,4,229,105,194,64,136,65,56,106,0,4,48,30,24,128,
+112,7,114,0,18,42,0,7,192,1,230,73,67,248,250,0,
+1,241,16,7,1,241,16,19,52,82,36,158,26,132,96,0,
+254,32,95,77,67,72,0,1,0,0,0,0,0,0,
+

deadbeef-1.9.6.tar.bz2/plugins/sc68/unice68 Added

deadbeef-1.9.6.tar.bz2/plugins/sc68/unice68/unice68.h Added

@@ -0,0 +1,173 @@
+/**
+ * @ingroup lib_unice68
+ * @file unice68.h
+ * @author Benjamin Gerard
+ * @date 2003/08/06
+ * @brief ICE! depacker header
+ */
+
+/* Copyright (c) 1998-2015 Benjamin Gerard */
+
+#ifndef UNICE68_H
+#define UNICE68_H
+
+#ifndef UNICE68_EXTERN
+# ifdef __cplusplus
+# define UNICE68_EXTERN extern "C"
+# else
+# define UNICE68_EXTERN extern
+# endif
+#endif
+
+#ifndef UNICE68_API
+/* Building */
+# ifdef UNICE68_EXPORT
+# if defined(DLL_EXPORT) && defined(HAVE_DECLSPEC)
+# define UNICE68_API __declspec(dllexport)
+# elif defined(HAVE_VISIBILITY)
+# define UNICE68_API UNICE68_EXTERN __attribute__ ((visibility("default")))
+# else
+# define UNICE68_API UNICE68_EXTERN
+# endif
+/* Using */
+# else
+# if defined(UNICE68_DLL)
+# define UNICE68_API __declspec(dllimport)
+# else
+# define UNICE68_API UNICE68_EXTERN
+# endif
+# endif
+#endif
+
+/**
+ * @defgroup lib_unice68 unice68 library
+ * @ingroup sc68_dev_lib
+ * @brief ICE! 2.4 packer and depacker.
+ *
+ * unice68 library provides functions to pack or depack ICE! packed
+ * buffer. The depacker used is a rought conversion of the
+ * original ICE 2.4 routine written in 68000 assembler. ICE packer
+ * was (and may be still is) widely used on the Atari ST the Atari
+ * ST. More importantly it is the packer used by
+ * the sndh music archive(http://dbug.kicks-ass.net/sndh/).
+ *
+ * @note unice68 library is re-entrant (thread-safe).
+ *
+ * @note It is pretty much impossible to implement a progressive
+ * version of the depacker. At least the entire packed file must be
+ * loaded before depacking it because data order is reversed.
+ *
+ * @{
+ */
+
+#ifndef UNICE68_API
+/**
+ * unice68 symbols specification.
+ *
+ * Define special atributs for importing/exporting unice68 symbols.
+ */
+#define UNICE68_API UNICE68_EXTERN
+#error "UNICE68_API should be defined"
+#endif
+
+UNICE68_API
+/**
+ * Get unice68 version.
+ *
+ * @return version number
+ */
+int unice68_version(void);
+
+UNICE68_API
+/**
+ * Get unice68 version.
+ *
+ * @return version string
+ */
+const char * unice68_versionstr(void);
+
+UNICE68_API
+/**
+ * Get ICE depacker version.
+ *
+ * @return version number (MAJOR*100+MINOR)
+ */
+int unice68_unice_version(void);
+
+UNICE68_API
+/**
+ * Get ICE packer version.
+ *
+ * @return version number (MAJOR*100+MINOR)
+ */
+int unice68_ice_version(void);
+
+UNICE68_API
+/**
+ * Test ICE and get compressed and uncompresed size.
+ *
+ * The unice68_depacked_size() function returns the uncompressed
+ * size of a ICE compressed buffer. If p_size is not 0 it is fill with
+ * the size of the compressed data found in header (useful for stream
+ * operation).
+ * If the value pointed by p_csize is not 0 the function assumes that it is
+ * an expected compressed size and compares it to header one. If it differs
+ * the function returns the bitwise NOT value of uncompressed data. This
+ * should be a minus value but not -1.
+ *
+ * @param buffer buffer with at least 12 bytes of data (ice header).
+ * @param p_csize Optionnal pointer to store compressed size.
+ * May be use to verify an expected compressed size.
+ * See function documentation for more details.
+ *
+ * @return uncompressed size
+ * @retval >0 Uncompressed size
+ * @retval -1 Error; not a valid ICE packed buffer
+ * @retval <0 Bitwise NOT of uncompressed size but verify failed.
+ *
+ */
+int unice68_depacked_size(const void * buffer, int * p_csize);
+
+UNICE68_API
+/**
+ * Depack an ICE buffer into another.
+ *
+ * The unice68_depacker() function depacks src input ICE compressed
+ * buffer into dst output buffer. The dst buffer is assumed to be
+ * already allocated and large enough.
+ *
+ * @param dst output (destination) buffer (uncompressed data).
+ * @param src input (source) buffer (compressed data).
+ *
+ * @return error code
+ * @retval 0 succcess
+ * @retval -1 failure
+ *
+ * @warning The original ICE depacker may allow to use the same buffer for
+ * compressed and uncompressed data. Anyway this has not been tested
+ * and you are encouraged to add guard bands.
+ */
+int unice68_depacker(void * dst, const void * src);
+
+UNICE68_API
+/**
+ * Pack a buffer with ice packer.
+ *
+ * @param dst output (destination) buffer (compressed data).
+ * @param max output buffer size.
+ * @param src input (source) buffer (uncompressed data).
+ * @param len input buffer length.
+ *
+ * @return packed size
+ * @retval -1 failure
+ *
+ * @warning Output buffer overflow is currently not checked and will
+ * happen if the output buffer is not large enough.
+ */
+int unice68_packer(void * dst, int max, const void * src, int len);
+
+/**
+ * @}
+ */
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/sc68/unice68/unice68_pack.c Added

@@ -0,0 +1,621 @@
+/*
+ * @file ice68_pack.c
+ * @brief Ice Packer 2.35 (native version)
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#ifndef PACKAGE_NAME
+# define PACKAGE_NAME "unice68"
+#endif
+#ifndef PACKAGE_VERSION
+# define PACKAGE_VERSION __DATE__
+#endif
+#ifndef PACKAGE_VERNUM
+# define PACKAGE_VERNUM 0
+#endif
+
+#include "unice68.h"
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_ASSERT_H
+# include <assert.h>
+#endif
+
+typedef uint8_t * areg_t;
+typedef int dreg_t;
+
+typedef struct {
+ areg_t a0,a1,a2,a3,a4,a5,a6,ax;
+ dreg_t d0,d1,d2,d3,d4,d5,d6,d7;
+ areg_t srcbuf,srcend,dstbuf,dstend;
+ int srclen, dstlen, dstmax;
+ int error, optimize, maxlength, maxgleich, maxoffset;
+} all_regs_t;
+
+#define ICE_MAGIC 0x49636521 /* 'Ice!' */
+
+#define EQ(A,B) ((A) == (B))
+#define NE(A,B) ((A) != (B))
+
+#define GE(A,B) ((A) <= (B))
+#define LE(A,B) ((A) >= (B))
+#define HI(A,B) ((A) < (B))
+#define LS(A,B) ((A) >= (B))
+#define GT(A,B) ((A) < (B))
+#define LT(A,B) ((A) > (B))
+
+#define B_CC(CC, LABEL) if (CC) {goto LABEL;} else
+#define DB_CC(CC, REG, LABEL) if (!(CC) && --REG >= 0) {goto LABEL;} else
+#define DBF(REG,LABEL) DB_CC(0, REG, LABEL)
+#define DBF_COUNT(REG) ( ( (REG) & 0xFFFF ) + 1 )
+
+#define BRA(LABEL) goto LABEL
+#define BEQ(A, B, LABEL) B_CC( EQ(A,B), LABEL )
+#define BNE(A, B, LABEL) B_CC( NE(A,B), LABEL )
+#define BHI(A, B, LABEL) B_CC( HI(A,B), LABEL )
+#define BGE(A, B, LABEL) B_CC( GE(A,B), LABEL )
+#define BGT(A, B, LABEL) B_CC( GT(A,B), LABEL )
+#define BLS(A, B, LABEL) B_CC( LS(A,B), LABEL )
+#define BLE(A, B, LABEL) B_CC( LE(A,B), LABEL )
+#define BLT(A, B, LABEL) B_CC( LT(A,B), LABEL )
+
+#define DBGE(A,B,REG,LABEL) DB_CC( GE(A,B), REG, LABEL )
+
+
+static void longword_store(all_regs_t *R);
+static void put_bits(all_regs_t * R);
+static void make_stringlength(all_regs_t * R);
+static void make_normal_bytes(all_regs_t * R);
+
+/* Store d7.l
+ */
+static void longword_store(all_regs_t *R)
+{
+ *R->a1++ = R->d7 >> 24;
+ *R->a1++ = R->d7 >> 16;
+ *R->a1++ = R->d7 >> 8;
+ *R->a1++ = R->d7;
+}
+
+/* Store bit field
+ *
+ * d1d4+1 bit field
+ * d7: bit acu
+ * d6: free bit in d7 minus 1
+ */
+static void put_bits(all_regs_t *R)
+{
+ assert(R->d7 >= 0 && R->d7 < 0x100);
+ assert(R->d4 >= 0 && R->d4 < 32);
+
+ do {
+ R->d7 |= (R->d1 & 1) << 8;
+ R->d1 >>= 1;
+ R->d7 >>= 1;
+ if (--R->d6 < 0) {
+ *R->a1++ = R->d7;
+ R->d7 = 0;
+ R->d6 = 7;
+ }
+ } while (--R->d4 >= 0);
+}
+
+
+static void make_offset_2(all_regs_t * R)
+{
+ /* move.w d0,d1 */
+ R->d1 = R->d0;
+ /* cmpi.w #$3f,d1 */
+ /* ble.s offs_3f */
+ BLE ( 0x3f, R->d1, offs_3f );
+ /* subi.w #$40,d1 */
+ R->d1 -= 0x40;
+ /* moveq #9,d4 */
+ R->d4 = 9;
+ /* bset d4,d1 */
+ R->d1 |= 1 << R->d4;
+ /* bra put_bits */
+ goto put;
+offs_3f:
+ /* moveq #6,d4 */
+ R->d4 = 6;
+put:
+ /* bra.s put_bits */
+ put_bits(R);
+}
+
+static void make_offset_mehr(all_regs_t * R)
+{
+ static const int16_t table36 = {
+ 0x0000,0x0020,0x0120,
+ 0x0606,0x0908,0x0C0D
+ };
+ /* moveq #2,d3 */
+ R->d3 = 2;
+look_on:
+ /* add.w d3,d3 */
+ /* move.w 0(a3,d3.w),d4 */
+ /* lsr.w #1,d3 */
+ R->d4 = table3R->d3;
+
+ /* cmp.w d4,d0 */
+ /* dbge d3,look_on */
+ DBGE ( R->d4, R->d0, R->d3, look_on );
+ /* sub.w d4,d0 */
+ R->d0 -= R->d4;
+
+ /* add.w d3,d3 */
+ /* move.w 6(a3,d3.w),d3 */
+ /* move.w d3,d4 */
+ R->d4 = R->d3 = table33+R->d3;
+ /* lsr.w #8,d3 */
+ R->d3 >>= 8;
+ /* moveq #-1,d1 */
+ /* lsl.w d3,d1 */
+ /* or.w d0,d1 */
+ R->d1 = (-1 << R->d3) | R->d0;
+ /* andi.w #$f,d4 */
+ R->d4 &= 0xf;
+ /* bra put_bits */
+ put_bits(R);
+}
+
+static void make_stringlength(all_regs_t *R)
+{
+ static const int ta5 = { 0x2, 0x3, 0x4, 0x6, 0xa };
+ static const int tb5 = { 0x1, 0x1, 0x2, 0x3, 0xa };
+ int i, d4, d0;
+
+ assert(R->maxlength >= 2);
+ for (i=4, d0 = R->maxlength;
+ d0 < (d4 = tai);
+ --i);
+ d0 -= d4;
+ assert ( i >= 0 );
+ assert ( i < 5 );
+ d4 = tbi;
+ R->d1 = (-1 << d4) | d0;
+ R->d4 = d4 + i - 1;
+ put_bits(R);
+}
+
+static int ice_crunch(all_regs_t *R)
+{
+ R->a0 = R->srcbuf;
+ R->d0 = R->srclen;
+
+mainloop:
+
+/***********************************************************************
+ * 1. Sequence of identical bytes are looking for pay
+ */
+
+ /* lea $409(a0),a4 */
+ R->a4 = R->a0 + 0x409; /* a4 = End of the search range */
+ /* cmpa.l src_ende,a4 */
+ /* ble.s gleich_ok */
+ BLE ( R->srcend, R->a4, gleich_ok);
+ /* movea.l src_ende,a4 */
+ R->a4 = R->srcend;
+
+gleich_ok:
+/* a0 : search start
+ * a3 : search current
+ * a4 : search end
+ */
+
+ /* move.l a0,a3 */
+ R->a3 = R->a0; /* a3 = Beginning of the search range */
+ /* move.b (a3)+,d0 */
+ R->d0 = *R->a3++; /* current byte */
+
+ /* while ( R->d0 == *R->a3++ && R->a3 < R->a4) */
+ /* ; */
+
+gleich_compare:
+ /* cmp.b (a3)+,d0 */
+ /* bne.s gleich_ende */
+ BNE( *R->a3++, R->d0, gleich_ende );
+ /* cmpa.l a4,a3 */
+ /* blt.s gleich_compare */
+ BLT ( R->a4, R->a3, gleich_compare );
+gleich_ende:
+
+ /* move.l a3,d1 */
+ /* sub.l a0,d1 */
+ /* subq.l #2,d1 */
+ /* move.l d1,maxgleich */
+ R->maxgleich = R->d1 = R->a3 - R->a0 - 2;
+
+ /* cmp.l #$409,d1 */
+ /* beq gleich_ablegen */
+ BEQ (0x409, R->d1, gleich_ablegen);
+
+
+/*************************************************************
+ * 2. Search string with the greatest possible length and a small offset
+ */
+
+ /* move.l a0,a3 */
+ /* adda.l optimize(pc),a3 */
+ R->a3 = R->a0 + R->optimize;
+ /* cmpa.l src_ende,a3 */
+ /* ble.s offset_ende */
+ BLE ( R->srcend, R->a3, offset_ende );
+ /* movea.l src_ende,a3 */
+ R->a3 = R->srcend;
+
+offset_ende:
+ /* if (R->a3 > R->srcend) */
+ /* R->a3 = R->srcend; */
+
+ /* moveq #1,d4 */
+ R->d4 = 1;
+ /* lea 2(a0),a4 */
+ R->a4 = R->a0 + 2;
+
+weiter_mit_string:
+ /* move.b (a0),d0 */
+ R->d0 = *R->a0;
+ /* move.b 1(a0),d1 */
+ R->d1 = R->a01;
+
+search_string:
+ /* cmp.b (a4)+,d0 */
+ /* beq.s ein_byte_stimmt */
+ BEQ ( *R->a4++, R->d0, ein_byte_stimmt );
+
+no_string:
+ /* cmpa.l a4,a3 */
+ /* bgt.s search_string */
+ BGT ( R->a4, R->a3, search_string );
+ /* bra.s string_suche_fertig */
+ BRA(string_suche_fertig);
+
+ein_byte_stimmt:
+ /* cmp.b (a4),d1 */
+ /* bne.s no_string */
+ BNE ( *R->a4, R->d1, no_string );
+
+/* string_start_found: */
+ /* move.l a4,a6 */
+ /* subq.w #1,a6 */
+ R->a6 = R->a4 - 1;
+ /* move.l a6,d0 */
+ R->ax = R->a6;
+ /* movea.l a0,a5 */
+ R->a5 = R->a0;
+
+string_compare:
+ /* cmpm.b (a5)+,(a6)+ */
+ /* bne.s string_zu_ende */
+ BNE ( *R->a5++, *R->a6++, string_zu_ende);
+ /* cmp.l d0,a5 */
+ /* bhi.s string_zu_ende */
+ BHI( R->ax, R->a5, string_zu_ende );
+ /* cmpa.l a6,a3 */
+ /* bgt.s string_compare */
+ BGT ( R->a6, R->a3, string_compare );
+
+string_zu_ende:
+ /* move.l a5,d1 */
+ /* sub.l a0,d1 */
+ /* subq.l #1,d1 */
+ R->d1 = R->a5 - R->a0 - 1;
+
+ /* move.l a6,d2 */
+ /* sub.l a5,d2 */
+ /* sub.l d1,d2 */
+ /* addq.l #1,d2 */
+ R->d2 = R->a6 - R->a5 - R->d1 + 1;
+
+ /* move.l #$409,d0 */
+ R->d0 = 0x409; /* max string length */
+
+ /* cmp.l d0,d4 */
+ /* beq.s string_suche_fertig */
+ BEQ ( R->d0, R->d4, string_suche_fertig );
+
+ /* cmp.l d0,d1 */
+ /* bls.s not_too_large */
+ BLS ( R->d0, R->d1, not_too_large );
+
+ /* sub.l d0,d1 */
+ R->d1 -= R->d0;
+ /* add.l d1,d2 */
+ R->d2 += R->d1;
+
+ /* move.l d0,d1 */
+ R->d1 = R->d0;
+not_too_large:
+
+ /* cmp.l d1,d4 */
+ /* bge.s string_lohnt_nicht */
+ BGE( R->d1, R->d4, string_lohnt_nicht );
+ /* cmp.w #2,d1 */
+ /* bls.s shortstring */
+ BLS ( 2, R->d1, shortstring );
+ /* cmp.w #$111f,d2 */
+ /* bhi.s string_lohnt_nicht */
+ BHI ( 0x111f, R->d2, string_lohnt_nicht );
+
+shortstring:
+ /* move.l d1,d4 */
+ /* move.w d1,maxlength */
+ /* move.w d2,maxoffset */
+ R->maxlength = R->d4 = R->d1;
+ R->maxoffset = R->d2;
+
+string_lohnt_nicht:
+ /* cmpa.l a4,a3 */
+ /* bgt weiter_mit_string */
+ BGT ( R->a4, R->a3, weiter_mit_string );
+
+string_suche_fertig:
+ /* move.l maxgleich,d0 */
+ R->d0 = R->maxgleich;
+ /* cmp.w #1,d0 */
+ /* ble.s nogleich */
+ BLE ( 1, R->d0, nogleich );
+ /* cmp.l d4,d0 */
+ /* bge.s gleich_ablegen */
+ BGE( R->d4, R->d0, gleich_ablegen );
+
+nogleich:
+
+ /* move.w maxoffset(pc),d0 */
+ R->d0 = R->maxoffset;
+ /* move.w d4,d1 */
+ R->d1 = R->d4;
+ /* cmpi.w #1,d1 */
+ /* beq.s ein_byte_ablegen */
+ BEQ ( 1, R->d1, ein_byte_ablegen );
+ /* cmpi.w #2,d1 */
+ /* beq.s zwei_byte_ablegen */
+ BEQ ( 2, R->d1, zwei_byte_ablegen );
+ /* bra.s mehr_bytes_ablegen */
+ BRA(mehr_bytes_ablegen);
+
+/* ====================================================================== */
+
+ein_byte_ablegen:
+ /* move.b (a0)+,(a1)+ */
+
+ /* fprintf(stdout,"%04x %02x (%s:%d) / ein_byte_ablegen\n", */
+ /* R->a1 - R->dstbuf, */
+ /* *R->a0, */
+ /* __FUNCTION__, __LINE__); */
+ *R->a1++ = *R->a0++;
+ /* addq.l #1,d5 */
+ R->d5++;
+ /* bra.s kein_byte_ablegen */
+ BRA ( kein_byte_ablegen );
+
+gleich_ablegen:
+ /* move.l maxgleich,d1 */
+ R->d1 = R->maxgleich;
+ /* move.w d1,maxlength */
+ R->maxlength = R->d1;
+ /* moveq #0,d0 */
+ R->d0 = 0;
+ /* subq.l #2,d1 */
+ /* bne.s mehr_bytes_ablegen */
+ if ( (R->d1 -= 2) != 0 )
+ goto mehr_bytes_ablegen;
+
+zwei_byte_ablegen:
+ /* cmpi.w #$23f,d0 */
+ /* bhi.s ein_byte_ablegen */
+ BHI( 0x23f, R->d0, ein_byte_ablegen );
+ /* bsr make_normal_bytes */
+ make_normal_bytes(R);
+ /* cmpi.w #$23f,d0 */
+ /* bhi ein_byte_ablegen */
+ BHI( 0x23f, R->d0, ein_byte_ablegen );
+ /* bsr make_offset_2 */
+ make_offset_2(R);
+ /* bra.s drop_length */
+ BRA(drop_length);
+
+mehr_bytes_ablegen:
+ /* bsr make_normal_bytes */
+ make_normal_bytes(R);
+ /* bsr make_offset_mehr */
+ make_offset_mehr(R);
+
+drop_length:
+ /* bsr make_stringlength */
+ make_stringlength(R);
+ /* moveq #0,d5 */
+ R->d5 = 0;
+ /* move.w maxlength(pc),d0 */
+ R->d0 = R->maxlength;
+ /* add.w d0,a0 */
+ R->a0 += R->d0;
+
+kein_byte_ablegen:
+ /* move.l src_ende,d0 */
+ /* sub.l a0,d0 */
+ /* subq.l #3,d0 */
+ /* bpl mainloop */
+ if ( ( R->d0 = R->srcend - R->a0 - 3 ) >= 0 )
+ goto mainloop;
+
+still_packing:
+ /* cmp.l src_ende,a0 */
+ /* bge.s all_packed */
+ BGE ( R->srcend, R->a0, all_packed );
+ /* move.b (a0)+,(a1)+ */
+ /* fprintf(stdout,"%04x %02x (%s:%d) / still_packing\n", */
+ /* R->a1 - R->dstbuf, */
+ /* *R->a0, */
+ /* __FUNCTION__ , __LINE__); */
+ *R->a1++ = *R->a0++;
+ /* addq.l #1,d5 */
+ R->d5++;
+ /* bra.s still_packing */
+ BRA(still_packing);
+
+all_packed:
+ /* bsr make_normal_bytes */
+ make_normal_bytes(R);
+ /* bset d6,d7 */
+ /* move.b d7,(a1)+ */
+
+ /* fprintf(stdout,"%04x %02x (%s:%d) /all_packed\n", */
+ /* R->a1 - R->dstbuf, */
+ /* R->d7 | (1 << R->d6), */
+ /* __FUNCTION__ , __LINE__); */
+ *R->a1++ = R->d7 |= (1 << R->d6);
+ /* sub.l packed_data(pc),a1 */
+ /* move.l a1,d0 */
+ /* move.l d0,d7 */
+ R->d7 = R->d0 = R->a1 - R->dstbuf;
+ /* move.l packed_data,a1 */
+ /* addq.l #4,a1 */
+ /* bsr longword_store */
+ R->a1 = R->dstbuf + 4;
+ longword_store(R);
+ /* rts */
+ return R->d0;
+}
+
+static void make_normal_bytes(all_regs_t * R)
+{
+ static const int t1a7 = { 0, 1, 2, 5, 8, 15, 270 };
+
+ static const int tib72 = {
+ { 0x01,0x01 }, { 0x01, 0x02 }, { 0x02, 0x04 }, { 0x02, 0x06 },
+ { 0x03,0x09 }, { 0x08, 0x11 }, { 0x0f, 0x20 }
+ };
+
+ /* cmp.l #$810d,d5 */
+ /* bls.s noerror */
+ BLS ( 0x810d, R->d5, noerror );
+
+ /* move.w #-1,error */
+ /* move.l a0,src_ende */
+ R->error = -1;
+ R->srcend = R->a0;
+noerror:
+
+ /* lea.l table1(pc),a3 */
+ /* moveq #6,d3 */
+ R->d3 = 6;
+kleiner:
+ /* move.w -(a3),d4 */
+
+ assert (R->d3 >= 0);
+ assert (R->d3 < 7);
+ R->d4 = t1aR->d3;
+ /* cmp.w d4,d5 */
+ /* dbge d3,kleiner */
+ DBGE ( R->d4, R->d5, R->d3, kleiner );
+ /* sub.w d4,d5 */
+ R->d5 -= R->d4;
+
+ assert (R->d3 >= 0);
+ assert (R->d3 < 7);
+
+ R->d2 = tibR->d30;
+ /* moveq #-1,d1 */
+ /* lsl.l d2,d1 */
+ /* or.w d5,d1 */
+ R->d1 = (-1 << R->d2) | R->d5;
+ /* moveq #0,d5 */
+ R->d5 = 0;
+ /* move.b (a3)+,d4 */
+ /* ext.w d4 */
+ /* subq.w #1,d4 */
+ R->d4 = tibR->d31 - 1;
+ /* bra put_bits */
+ put_bits(R);
+}
+
+int unice68_packer(void * dst, int dstsz, const void * src, int srcsz)
+{
+ all_regs_t allregs, *R = &allregs;
+
+
+ /***********************************************************************
+ * Save parameters
+ */
+ R->srcbuf = (areg_t) src;
+ R->srcend = R->srcbuf + srcsz;
+ R->srclen = srcsz;
+ R->dstbuf = (areg_t) dst;
+ R->dstend = R->dstbuf + dstsz;
+ R->dstlen = 0;
+ R->dstmax = dstsz;
+
+ R->a0 = R->srcbuf;
+ R->d0 = R->srclen;
+ R->a1 = R->dstbuf;
+
+ R->a2 = R->a3 = R->a4 = R->a5 = R->a6 = 0;
+
+ R->error = 0;
+ R->optimize = 0x1580;
+ R->maxlength = 0;
+ R->maxgleich = 0;
+ R->maxoffset = 0;
+
+ /***********************************************************************
+ * Store header
+ */
+
+ /* move.l #'Ice!',d7 */
+ /* bsr longword_store */
+ /* addq.l #4,a1 */
+ /* move.l filesize(pc),d7 */
+ /* bsr longword_store */
+
+ R->d7 = ICE_MAGIC; /* Store magic id 'Ice!' */
+ longword_store(R);
+ R->a1 += 4; /* Leave space for packed length */
+ R->d7 = R->srclen; /* Store unpacked length */
+ longword_store(R);
+
+ /* moveq #0,d5 */
+ /* moveq #0,d7 */
+ /* moveq #0,d4 */
+ /* moveq #0,d1 */
+ R->d1 = R->d2 = R->d3 = R->d4 = R->d5 = R->d7 = 0;
+ /* moveq #7,d6 */
+ R->d6 = 7;
+ /* bsr put_bits */
+
+ /* Store one bit for picture flag */
+ put_bits(R);
+
+
+ /* Main loop */
+ ice_crunch(R);
+
+ if (R->error)
+ R->d0 = -1;
+
+ return R->d0;
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/unice68/unice68_unpack.c Added

@@ -0,0 +1,550 @@
+/*
+ * @file unice68_unpack.c
+ * @brief Ice Depacker 2.40 (native version)
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "unice68.h"
+
+#ifdef TYPE_U8
+typedef TYPE_U8 u8
+#else
+typedef unsigned char u8;
+#endif
+
+#ifdef TYPE_S8
+typedef TYPE_S8 s8
+#else
+typedef signed char s8;
+#endif
+
+#ifdef TYPE_S16
+typedef TYPE_S16 s16
+#else
+typedef signed short s16;
+#endif
+
+typedef u8 * areg_t;
+typedef int dreg_t;
+
+typedef struct {
+ areg_t a0,a1,a2,a3,a4,a5,a6,a7;
+ dreg_t d0,d1,d2,d3,d4,d5,d6,d7;
+ areg_t srcbuf,srcend,dstbuf,dstend;
+ int overflow;
+} all_regs_t;
+
+#define ICE_MAGIC 0x49434521 /* 'ICE!' */
+
+#define B_CC(CC, LABEL) if (CC) {goto LABEL;} else
+#define DB_CC(CC, REG, LABEL) if (!(CC) && --REG >= 0) {goto LABEL;} else
+#define DBF(REG,LABEL) DB_CC(0, REG, LABEL)
+#define GET_1_BIT_BCC(LABEL) B_CC(!get_1_bit(R), LABEL)
+#define DBF_COUNT(REG) ( ( (REG) & 0xFFFF ) + 1 )
+
+static const int direkt_tab = {
+ 0x7fff000e,0x00ff0007,0x00070002,0x00030001,0x00030001,
+ 270-1, 15-1, 8-1, 5-1, 2-1
+};
+
+static const u8 length_tab = {
+ 9,1,0,-1,-1,
+ 8,4,2,1,0
+};
+
+static const s8 more_offset = {
+ 11, 4, 7, 0,
+ 0x01,0x1f, -1,-1, 0x00,0x1F
+};
+
+static const int more_offset_word = {
+ 0x0b04,0x0700,0x011f,-1,0x001f
+};
+
+#if 0
+static void dump_regs(const char * label)
+{
+ if (label) {
+ fprintf(stderr, "%s:\n", label);
+ }
+#define DUMP(N) fprintf(stderr,"d%d=%08X a%d=%p\n",N,d##N,N,a##N)
+ DUMP(0);
+ DUMP(1);
+ DUMP(2);
+ DUMP(3);
+ DUMP(4);
+ DUMP(5);
+ DUMP(6);
+ DUMP(7);
+}
+#endif
+
+
+static void strings(all_regs_t *);
+static void normal_bytes(all_regs_t *);
+static int get_d0_bits(all_regs_t *, int d0);
+
+static inline int chk_dst_range(all_regs_t *R, const areg_t a, const areg_t b)
+{
+ R->overflow |= (a < R->dstbuf) << 0;
+ R->overflow |= (b >= R->dstend) << 1;
+ return R->overflow;
+}
+
+static inline int chk_src_range(all_regs_t *R, const areg_t a, const areg_t b)
+{
+ R->overflow |= (a < R->srcbuf) << 2;
+ R->overflow |= (b >= R->srcend) << 3;
+ return R->overflow;
+}
+
+/* getinfo: moveq #3,d1 */
+/* getbytes: lsl.l #8,d0 */
+/* move.b (a0)+,d0 */
+/* dbf d1,getbytes */
+/* rts */
+static inline int getinfo(all_regs_t *R)
+{
+ const areg_t a0 = R->a0;
+ const int r0 = (0a0<<24) + (1a0<<16) + (2a0<<8) + 3a0;
+ R->a0 = a0+4;
+ return r0;
+}
+
+/* get_1_bit: */
+/* add.b d7,d7 */
+/* bne.s bitfound */
+/* move.b -(a5),d7 */
+/* addx.b d7,d7 */
+/* bitfound: */
+/* rts */
+
+static inline int get_1_bit(all_regs_t *R)
+{
+ int r;
+
+ r = (R->d7 & 255) << 1;
+ B_CC(r & 255, bitfound);
+
+ chk_src_range(R,R->a5-1,R->a5-1);
+
+ r = (r>>8) + (*(--R->a5) << 1);
+bitfound:
+ R->d7 = (R->d7 & ~0xFF) | (r & 0xFF);
+ return r >> 8;
+}
+
+
+/* ice_decrunch:
+ * a0 = Pointer to packed data
+ * a1 = Address to which the data is unpacked
+ *
+ * During depacking:
+ *
+ * a5 : current packed data pointer (read from bottom to top)
+ * a6 : current depacked data pointer (written from bottom to top)
+ * a4 : depack buffer top, used to detect end of depacking.
+ */
+
+static int ice_decrunch(all_regs_t *R)
+{
+ int id;
+ int csize;
+ int dsize;
+
+/* movem.l d0-a6,-(a7) */
+/* bsr.s getinfo */
+/* cmpi.l #'ICE!',d0 */
+/* bne not_packed */
+/* bsr.s getinfo */
+/* lea.l -8(a0,d0.l),a5 */
+/* bsr.s getinfo */
+/* move.l d0,(a7) */
+/* move.l a1,a4 */
+/* move.l a1,a6 */
+/* adda.l d0,a6 */
+/* move.l a6,a3 */
+/* move.b -(a5),d7 */
+/* bsr normal_bytes */
+
+ R->srcbuf = R->a0;
+ R->dstbuf = R->a1;
+
+ id = getinfo(R); /* Works with 'Ice!' too */
+ if ( ( id & ~0x202000 ) != ICE_MAGIC) {
+ return -1;
+ }
+ csize = getinfo(R);
+ R->srcend = R->a5 = R->a0 - 8 + csize;
+ R->d0 = dsize = getinfo(R);
+ R->a6 = R->a4 = R->a1;
+ R->a6 += R->d0;
+ R->dstend = R->a3 = R->a6;
+
+ R->d7 = *(--R->a5);
+ normal_bytes(R);
+
+/* move.l a3,a6 */
+/* bsr get_1_bit */
+/* bcc.s not_packed */
+/* move.w #$0f9f,d7 */
+/* bsr get_1_bit */
+/* bcc.s ice_00 */
+/* moveq #15,d0 */
+/* bsr get_d0_bits */
+/* move.w d1,d7 */
+
+ R->a6 = R->a3;
+ GET_1_BIT_BCC(not_packed);
+ R->d7 = 0x0f9f;
+ GET_1_BIT_BCC(ice_00);
+ R->d7 = R->d1 = get_d0_bits(R, 15);
+
+/* ice_00: moveq #3,d6 */
+/* ice_01: move.w -(a3),d4 */
+/* moveq #3,d5 */
+/* ice_02: add.w d4,d4 */
+/* addx.w d0,d0 */
+/* add.w d4,d4 */
+/* addx.w d1,d1 */
+/* add.w d4,d4 */
+/* addx.w d2,d2 */
+/* add.w d4,d4 */
+/* addx.w d3,d3 */
+/* dbra d5,ice_02 */
+/* dbra d6,ice_01 */
+/* movem.w d0-d3,(a3) */
+/* dbra d7,ice_00 */
+
+ice_00:
+ R->d6 = 3;
+ice_01:
+ R->a3 -= 2;
+ R->d4 = (R->a30<<8) | R->a31;
+ R->d5 = 3;
+ice_02:
+ R->d4 += R->d4;
+ R->d0 += R->d0 + (R->d4>>16);
+ R->d4 &= 0xFFFF;
+
+ R->d4 += R->d4;
+ R->d1 += R->d1 + (R->d4>>16);
+ R->d4 &= 0xFFFF;
+
+ R->d4 += R->d4;
+ R->d2 += R->d2 + (R->d4>>16);
+ R->d4 &= 0xFFFF;
+
+ R->d4 += R->d4;
+ R->d3 += R->d3 + (R->d4>>16);
+ R->d4 &= 0xFFFF;
+
+ DBF(R->d5,ice_02);
+ DBF(R->d6,ice_01);
+
+ if (chk_src_range(R, R->a3, R->a3+7)) {
+ goto not_packed;
+ }
+
+ 0R->a3 = R->d0 >> 8;
+ 1R->a3 = R->d0;
+
+ 2R->a3 = R->d1 >> 8;
+ 3R->a3 = R->d1;
+
+ 4R->a3 = R->d2 >> 8;
+ 5R->a3 = R->d2;
+
+ 6R->a3 = R->d3 >> 8;
+ 7R->a3 = R->d3;
+
+ DBF(R->d7,ice_00);
+
+not_packed:
+ return -!!R->overflow;
+}
+
+static void normal_bytes(all_regs_t *R)
+{
+/* normal_bytes: */
+/* bsr.s get_1_bit */
+/* bcc.s test_if_end */
+/* moveq.l #0,d1 */
+/* bsr.s get_1_bit */
+/* bcc.s copy_direkt */
+/* lea.l direkt_tab+20(pc),a1 */
+/* moveq.l #4,d3 */
+/* nextgb: move.l -(a1),d0 */
+/* bsr.s get_d0bits */
+/* swap.w d0 */
+/* cmp.w d0,d1 */
+/* dbne d3,nextgb */
+/* no_more: add.l 20(a1),d1 */
+/* copy_direkt: */
+/* move.b -(a5),-(a6) */
+/* dbf d1,copy_direkt */
+/* test_if_end: */
+/* cmpa.l a4,a6 */
+/* bgt.s strings */
+/* rts */
+
+
+ while (1) {
+ const int * tab;
+
+ GET_1_BIT_BCC(test_if_end);
+ R->d1 = 0;
+ GET_1_BIT_BCC(copy_direkt);
+
+ tab = direkt_tab + (20>>2);
+ R->d3 = 4;
+ nextgb:
+ R->d0 = * (--tab);
+ R->d1 = get_d0_bits(R, R->d0);
+ R->d0 = (R->d0 >> 16) | ~0xFFFF;
+ DB_CC((R->d0^R->d1)&0xFFFF, R->d3, nextgb);
+/* no_more: */
+ R->d1 += tab(20>>2);
+
+ copy_direkt:
+ {
+ const int cnt = DBF_COUNT(R->d1);
+ if (chk_dst_range(R, R->a6-cnt, R->a6-1) |
+ chk_src_range(R, R->a5-cnt, R->a5-1)) {
+ break;
+ }
+ }
+ lp_copy:
+ *(--R->a6) = *(--R->a5);
+ DBF(R->d1,lp_copy);
+
+ test_if_end:
+ if (R->a6 <= R->a4) {
+ if (R->a6 < R->a4) {
+ chk_dst_range(R, R->a6, R->a6);
+ }
+ break;
+ }
+ strings(R);
+ }
+}
+
+
+
+/* get_d0_bits: */
+/* moveq.l #0,d1 */
+/* hole_bit_loop: */
+/* add.b d7,d7 */
+/* bne.s on_d0 */
+/* move.b -(a5),d7 */
+/* addx.b d7,d7 */
+/* on_d0: addx.w d1,d1 */
+/* dbf d0,hole_bit_loop */
+/* rts */
+
+static int get_d0_bits(all_regs_t *R, int r0)
+{
+ int r7 = R->d7;
+ int r1 = 0;
+
+ r0 &= 0xFFFF;
+ if (r0 > 15) {
+ R->overflow |= (1 << 4);
+ return 0;
+ }
+
+hole_bit_loop:
+ r7 = (r7 & 255) << 1;
+ B_CC(r7 & 255, on_d0);
+
+ chk_src_range(R,R->a5-1,R->a5-1);
+
+ r7 = (*(--R->a5) << 1) + (r7>>8);
+on_d0:
+ r1 += r1 + (r7>>8);
+ DBF(r0,hole_bit_loop);
+ R->d7 = (R->d7 &~0xFF) | (r7 & 0xFF);
+ R->d0 |= 0xFFFF;
+ return r1;
+}
+
+static void strings(all_regs_t *R)
+{
+/* strings: */
+/* lea.l length_tab(pc),a1 */
+/* moveq.l #3,d2 */
+/* get_length_bit: */
+/* bsr.s get_1_bit */
+/* dbcc d2,get_length_bit */
+/* no_length_bit: */
+/* moveq.l #0,d4 */
+/* moveq.l #0,d1 */
+/* move.b 1(a1,d2.w),d0 */
+/* ext.w d0 */
+/* bmi.s no_Ober */
+/* get_Ober: bsr.s get_d0_bits */
+/* no_Ober: move.b 6(a1,d2.w),d4 */
+/* add.w d1,d4 */
+/* beq.s get_offset_2 */
+
+ R->a1 = (areg_t)length_tab;
+ R->d2 = 3;
+get_length_bit:
+ DB_CC(get_1_bit(R)==0, R->d2, get_length_bit);
+/* no_length_bit: */
+ R->d4 = R->d1 = 0; /* $$$ d4 is not needed here. */
+ R->d0 = (R->d0 & ~0xFFFF) | (0xFFFF & (s8)R->a1 1 + (s16)R->d2 );
+ B_CC(R->d0&0x8000, no_Ober);
+/* get_Ober: */
+ R->d1 = get_d0_bits(R, R->d0);
+ R->d0 |= 0xFFFF;
+no_Ober:
+ R->d4 = R->a1 6 + (s16)R->d2 ;
+ R->d4 += R->d1;
+ B_CC(R->d4==0,get_offset_2);
+
+/* lea.l more_offset(pc),a1 */
+/* moveq.l #1,d2 */
+/* getoffs: bsr.s get_1_bit */
+/* dbcc d2,getoffs */
+/* moveq.l #0,d1 */
+/* move.b 1(a1,d2.w),d0 */
+/* ext.w d0 */
+/* bsr.s get_d0_bits */
+/* add.w d2,d2 */
+/* add.w 6(a1,d2.w),d1 */
+/* bpl.s depack_bytes */
+/* sub.w d4,d1 */
+/* bra.s depack_bytes */
+
+ R->a1 = (areg_t)more_offset;
+ R->d2 = 1;
+getoffs:
+ DB_CC(get_1_bit(R)==0,R->d2,getoffs);
+
+ R->d1 = get_d0_bits(R,(int)(s8)more_offset1+(s16)R->d2);
+ R->d0 |= 0xFFFF;
+ R->d1 += more_offset_word3+(s16)R->d2;
+ if (R->d1 < 0) {
+ R->d1 -= R->d4;
+ }
+ goto depack_bytes;
+
+
+ /* get_offset_2: */
+ /* moveq.l #0,d1 */
+ /* moveq.l #5,d0 */
+ /* moveq.l #-1,d2 */
+ /* bsr.s get_1_bit */
+ /* bcc.s less_40 */
+ /* moveq.l #8,d0 */
+ /* moveq.l #$3f,d2 */
+ /* less_40: bsr.s get_d0_bits */
+ /* add.w d2,d1 */
+
+get_offset_2:
+ R->d1 = 0;
+ R->d0 = 5;
+ R->d2 = -1;
+ GET_1_BIT_BCC(less_40);
+ R->d0 = 8;
+ R->d2 = 0x3f;
+less_40:
+ R->d1 = get_d0_bits(R, R->d0);
+ R->d0 |= 0xFFFF;
+ R->d1 += R->d2;
+
+ /* depack_bytes: */
+ /* lea.l 2(a6,d4.w),a1 */
+ /* adda.w d1,a1 */
+ /* move.b -(a1),-(a6) */
+ /* dep_b: move.b -(a1),-(a6) */
+ /* dbf d4,dep_b */
+ /* bra normal_bytes */
+
+depack_bytes:
+ R->a1 = R->a6 + 2 + (s16)R->d4 + (s16)R->d1;
+ chk_dst_range(R, R->a6 - DBF_COUNT(R->d4) - 1, R->a6-1);
+ if (R->a6>R->a4) *(--R->a6) = *(--R->a1);
+dep_b:
+ if (R->a6>R->a4) *(--R->a6) = *(--R->a1);
+ DBF(R->d4,dep_b);
+}
+
+int unice68_depacked_size(const void * buffer, int * p_csize)
+{
+ int id, csize, dsize;
+ int csize_verif = p_csize ? *p_csize : 0;
+ all_regs_t allregs;
+
+ if (csize_verif && csize_verif<12) {
+ return -1;
+ }
+
+ allregs.a0 = (areg_t)buffer;
+ id = getinfo(&allregs);
+ if ( ( id & ~0x202000 ) != ICE_MAGIC) {
+ return -1;
+ }
+ csize = getinfo(&allregs);
+ if (csize < 12) {
+ return -2;
+ }
+ /* csize -= 12; */
+ dsize = getinfo(&allregs);
+ if (p_csize) {
+ *p_csize = csize;
+ }
+ if (csize_verif && (csize != csize_verif)) {
+ dsize = ~dsize;
+ }
+ return dsize;
+}
+
+int unice68_depacker(void * dest, const void * src)
+{
+ all_regs_t allregs;
+
+ allregs.d0 =
+ allregs.d1 =
+ allregs.d2 =
+ allregs.d3 =
+ allregs.d4 =
+ allregs.d5 =
+ allregs.d6 =
+ allregs.d7 = 0;
+
+ allregs.a2 =
+ allregs.a3 =
+ allregs.a4 =
+ allregs.a5 =
+ allregs.a6 =
+ allregs.a7 = 0;
+
+ allregs.a0 = (areg_t)src;
+ allregs.a1 = dest;
+ allregs.overflow = 0;
+
+ return ice_decrunch(&allregs);
+}

deadbeef-1.9.6.tar.bz2/plugins/sc68/unice68/unice68_version.c Added

@@ -0,0 +1,57 @@
+/*
+ * @file unice68_version.c
+ * @brief library, packer and depacker version
+ * @author http://sourceforge.net/users/benjihan
+ *
+ * Copyright (c) 1998-2015 Benjamin Gerard
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#ifndef PACKAGE_NAME
+# define PACKAGE_NAME "unice68"
+#endif
+#ifndef PACKAGE_VERSION
+# define PACKAGE_VERSION __DATE__
+#endif
+#ifndef PACKAGE_VERNUM
+# define PACKAGE_VERNUM 0
+#endif
+
+#include "unice68.h"
+
+int unice68_unice_version(void)
+{
+ return 240;
+}
+
+int unice68_ice_version(void)
+{
+ return 235;
+}
+
+const char * unice68_versionstr(void)
+{
+ return PACKAGE_NAME " " PACKAGE_VERSION " ICE! 2.25/2.40" ;
+}
+
+int unice68_version(void)
+{
+ return PACKAGE_VERNUM;
+}

deadbeef-0.6.2.tar.bz2/plugins/shellexec/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/shellexec/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/shellexec/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/shellexec/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/shellexec/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/shellexec/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/shellexec/shellexec.c -> deadbeef-1.9.6.tar.bz2/plugins/shellexec/shellexec.c Changed

@@ -2,7 +2,7 @@
 Shellexec plugin for DeaDBeeF
 Copyright (C) 2010-2014 Deadbeef team
 Original developer Viktor Semykin <thesame.ml@gmail.com>
- Maintenance, minor improvements Alexey Yakovenko <waker@users.sf.net>
+ Maintenance, minor improvements Oleksiy Yakovenko <waker@users.sf.net>
 GUI support and bugfixing Azeem Arshad <kr00r4n@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
@@ -20,20 +20,17 @@
 */
 
 /*
- Configuration scheme:
+ Configuration options:
 
- shellexec.NN shcmd:title:name:flags
- 
- @shcmd is the command executed by the shell
+ command: the command executed by the shell
 formating directives are allowed, see
 format_shell_command function
 
- @title is the title of command displayed in UI
+ title: the title of command displayed in the UI
 
- @name used for referencing command, for example in hotkeys
- configuration
+ name: used for referencing plugin actions
 
- @flags comma-separated of command flags, allowed flags are:
+ flags: a list of flags:
 single - command allowed for single track
 multiple - command allowerd for multiple tracks
 local - command allowed for local files
@@ -49,14 +46,16 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <assert.h>
-#include "../../deadbeef.h"
+#include <jansson.h>
+#include <deadbeef/deadbeef.h>
 #include "shellexec.h"
+#include "shellexecutil.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
 static Shx_plugin_t plugin;
-static DB_functions_t *deadbeef;
+DB_functions_t *deadbeef;
 
 static Shx_action_t *actions;
 
@@ -66,48 +65,14 @@
 return DB_PLUGIN (&plugin);
 }
 
-static const char*
-trim (char* s)
-{
- if (!s) {
- return "";
- }
- char *h, *t;
- 
- for (h = s; *h == ' ' || *h == '\t'; h++);
- for (t = s + strlen (s)-1; *t == ' ' || *t == '\t'; t--);
- *(t+1) = 0;
- return h;
-}
-
 static int shx_exec_track_cmd (Shx_action_t *action, DB_playItem_t *it) {
 char cmd_POSIX_ARG_MAX;
- int res = deadbeef->pl_format_title_escaped (it, -1, cmd, sizeof (cmd) - 2, -1, action->shcommand);
- if (res < 0) {
- trace ("shellexec: failed to format string for execution (too long?)\n");
+ if (shellexec_eval_command(action->shcommand, cmd, sizeof (cmd), it) < 0) {
 return -1;
 }
- strcat (cmd, "&");
-
- // replace \' with '"'"'
- size_t l = strlen (cmd);
- size_t remaining = _POSIX_ARG_MAX - l - 1;
- for (int i = 0; cmdi; i++) {
- if (cmdi == '\\' && cmdi+1 == '\'' && remaining >= 3) {
- memmove (&cmdi+5, &cmdi+2, l - i + 1 - 2);
- memcpy (&cmdi, "'\"'\"'", 5);
- l += 3;
- remaining -= 3;
- i += 5;
- }
- else if (remaining < 3) {
- fprintf (stderr, "shellexec: command is too long.\n");
- return -1;
- }
- }
 
 trace ("%s\n", cmd);
- res = system (cmd);
+ system (cmd);
 return 0;
 }
 
@@ -128,7 +93,7 @@
 DB_playItem_t **items = NULL;
 int items_count = deadbeef->plt_getselcount (plt);
 if (0 < items_count) {
- items = malloc (sizeof (DB_playItem_t *) * items_count);
+ items = calloc (items_count, sizeof (DB_playItem_t *));
 if (items) {
 int n = 0;
 DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
@@ -158,13 +123,13 @@
 break;
 case DDB_ACTION_CTX_PLAYLIST:
 {
- ddb_playlist_t *plt = deadbeef->plt_get_curr ();
+ ddb_playlist_t *plt = deadbeef->action_get_playlist ();
 if (plt) {
 deadbeef->pl_lock ();
- DB_playItem_t **items;
+ DB_playItem_t **items = NULL;
 int items_count = deadbeef->plt_get_item_count (plt, PL_MAIN);
 if (0 < items_count) {
- items = malloc (sizeof (DB_playItem_t *) * items_count);
+ items = calloc (items_count, sizeof (DB_playItem_t *));
 if (items) {
 int n = 0;
 DB_playItem_t *it = deadbeef->pl_get_first (PL_MAIN);
@@ -188,7 +153,7 @@
 break;
 case DDB_ACTION_CTX_NOWPLAYING:
 {
- DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
 if (it) {
 res = shx_exec_track_cmd (action, it);
 deadbeef->pl_item_unref (it);
@@ -220,146 +185,152 @@
 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;
-}
-
 void
 shx_save_actions (void)
 {
- deadbeef->conf_remove_items("shellexec.");
- Shx_action_t *action = actions;
+ json_t *json = json_array ();
+
 int i = 0;
- while(action) {
- // build config line
- // format- shellexec.NN shcmd:title:name:flags
- size_t conf_line_length = 100 +
- strlen(action->shcommand) + 1 +
- strlen(action->parent.title) + 1 +
- strlen(action->parent.name) + 1;
- char conf_lineconf_line_length;
- char conf_key50;
- sprintf(conf_key, "shellexec.%d", i);
- sprintf(conf_line, "%s:%s:%s:", action->shcommand,
- action->parent.title,
- action->parent.name);
+ Shx_action_t *action = actions;
+ while (action) {
+ json_t *item = json_object ();
+
+ json_object_set_new (item, "command", json_string (action->shcommand));
+ json_object_set_new (item, "title", json_string (action->parent.title));
+ json_object_set_new (item, "name", json_string (action->parent.name));
+ json_t *flags = json_array ();
+
 if(action->shx_flags & SHX_ACTION_REMOTE_ONLY) {
- strcat(conf_line, "remote,");
+ json_array_append_new (flags, json_string ("remote"));
 }
 if(action->shx_flags & SHX_ACTION_LOCAL_ONLY) {
- strcat(conf_line, "local,");
+ json_array_append_new (flags, json_string ("local"));
 }
 if(action->parent.flags & DB_ACTION_SINGLE_TRACK) {
- strcat(conf_line, "single,");
+ json_array_append_new (flags, json_string ("single"));
 }
 if(action->parent.flags & DB_ACTION_MULTIPLE_TRACKS) {
- strcat(conf_line, "multiple,");
+ json_array_append_new (flags, json_string ("multiple"));
 }
 if(action->parent.flags & DB_ACTION_COMMON) {
- strcat(conf_line, "common,");
+ json_array_append_new (flags, json_string ("common"));
 }
- deadbeef->conf_set_str(conf_key, conf_line);
+ json_object_set_new (item, "flags", flags);
+ json_array_append_new (json, item);
 action = (Shx_action_t*)action->parent.next;
 i++;
 }
- deadbeef->conf_save();
+ char *str = json_dumps (json, 0);
+ json_decref (json);
+ if (str) {
+ deadbeef->conf_set_str("shellexec_config", str);
+ free (str);
+ deadbeef->conf_save();
+ }
+ else {
+ fprintf (stderr, "shellexec: failed to save json configuration\n");
+ }
 }
 
-Shx_action_t*
-shx_get_actions (DB_plugin_action_callback2_t callback)
-{
+static Shx_action_t *
+shx_get_actions_json (json_t *json) {
 Shx_action_t *action_list = NULL;
 Shx_action_t *prev = NULL;
- DB_conf_item_t *item = deadbeef->conf_find ("shellexec.", NULL);
- while (item)
- {
- size_t l = strlen (item->value) + 1;
- char tmpl;
- strcpy (tmp, item->value);
- trace ("Shellexec: %s\n", tmp);
-
- char *args4 = {0};
-
- int idx = 0;
- char *p = tmp;
- while (idx < 4 && p) {
- char *e = shx_find_sep (p);
- argsidx++ = p;
- if (!e) {
- break;
- }
- *e = 0;
- p = e+1;
+
+ if (!json_is_array (json)) {
+ return NULL;
+ }
+
+ size_t n = json_array_size (json);
+ for (int i = 0; i < n; i++) {
+ json_t *item = json_array_get (json, i);
+ if (!json_is_object (item)) {
+ continue;
 }
 
- if (idx < 2)
- {
- fprintf (stderr, "Shellexec: need at least command and title (%s)\n", item->value);
+ json_t *jcommand = json_object_get (item, "command");
+ json_t *jtitle = json_object_get (item, "title");
+ json_t *jname = json_object_get (item, "name");
+ json_t *jflags = json_object_get (item, "flags");
+
+ if (!json_is_string (jcommand)
+ || !json_is_string (jtitle)
+ || (jname && !json_is_string (jname))
+ || (jflags && !json_is_array (jflags))) {
 continue;
 }
 
- const char *command = trim (args0);
- const char *title = trim (args1);
- const char *name = trim (args2);
- const char *flags = trim (args3);
- if (!name) {
- name = "noname";
+ const char *command = json_string_value (jcommand);
+ const char *title = json_string_value (jtitle);
+
+ const char *name;
+
+ if (jname) {
+ name = json_string_value (jname);
 }
- if (!flags) {
- flags = "local,single";
+ else {
+ name = "noname";
 }
 
- Shx_action_t *action = calloc (sizeof (Shx_action_t), 1);
+ Shx_action_t *action = calloc (1, sizeof (Shx_action_t));
 
 action->parent.title = strdup (title);
 action->parent.name = strdup (name);
 action->shcommand = strdup (command);
- action->parent.callback2 = callback;
+ action->parent.callback2 = (DB_plugin_action_callback2_t)shx_callback;
 action->parent.next = NULL;
 action->parent.flags |= DB_ACTION_ADD_MENU;
 
- action->shx_flags = 0;
+ if (!jflags) {
+ action->shx_flags = SHX_ACTION_LOCAL_ONLY | DB_ACTION_SINGLE_TRACK;
+ }
+ else {
+ action->shx_flags = 0;
 
- if (strstr (flags, "local"))
- action->shx_flags |= SHX_ACTION_LOCAL_ONLY;
+ size_t nflags = json_array_size (jflags);
+ for (int i = 0; i < nflags; i++) {
+ json_t *jflag = json_array_get (jflags, i);
+ if (!json_is_string (jflag)) {
+ continue;
+ }
+ const char *flag = json_string_value (jflag);
+ if (strstr (flag, "local")) {
+ action->shx_flags |= SHX_ACTION_LOCAL_ONLY;
+ }
 
- if (strstr (flags, "remote"))
- action->shx_flags |= SHX_ACTION_REMOTE_ONLY;
+ if (strstr (flag, "remote")) {
+ action->shx_flags |= SHX_ACTION_REMOTE_ONLY;
+ }
 
- if (strstr (flags, "single"))
- action->parent.flags |= DB_ACTION_SINGLE_TRACK;
+ if (strstr (flag, "single")) {
+ action->parent.flags |= DB_ACTION_SINGLE_TRACK;
+ }
 
- if (strstr (flags, "multiple"))
- action->parent.flags |= DB_ACTION_MULTIPLE_TRACKS;
+ if (strstr (flag, "multiple")) {
+ action->parent.flags |= DB_ACTION_MULTIPLE_TRACKS;
+ }
 
- if (strstr (flags, "common"))
- action->parent.flags |= DB_ACTION_COMMON;
+ if (strstr (flag, "common")) {
+ action->parent.flags |= DB_ACTION_COMMON;
+ }
+ }
+ }
 
- if (prev)
+ if (prev) {
 prev->parent.next = (DB_plugin_action_t *)action;
+ }
 prev = action;
 
- if (!action_list)
+ if (!action_list) {
 action_list = action;
-
- item = deadbeef->conf_find ("shellexec.", item);
+ }
 }
 return action_list;
 }
 
 Shx_action_t*
 shx_action_add (void) {
- Shx_action_t *a = calloc (sizeof (Shx_action_t), 1);
+ Shx_action_t *a = calloc (1, sizeof (Shx_action_t));
 a->parent.callback2 = (DB_plugin_action_callback2_t)shx_callback;
 if (!actions) {
 actions = a;
@@ -410,7 +381,25 @@
 static int
 shx_start ()
 {
- actions = shx_get_actions((DB_plugin_action_callback2_t)shx_callback);
+ deadbeef->conf_lock ();
+ const char *conf = deadbeef->conf_get_str_fast ("shellexec_config", NULL);
+ if (!conf) {
+ // added right after 1.8.6 release:
+ // the `shellexec_config_wip` was used from 2016 to 2021, so this needs to be here for migration
+ deadbeef->conf_get_str_fast ("shellexec_config_wip", NULL);
+ }
+ if (conf) {
+ json_error_t err;
+ json_t *json = json_loads (conf, 0, &err);
+ if (json) {
+ actions = shx_get_actions_json (json);
+ json_decref (json);
+ }
+ else {
+ fprintf (stderr, "shellexec: json parser error at line %d:\n%s\n", err.line, err.text);
+ }
+ }
+ deadbeef->conf_unlock ();
 return 0;
 }
 
@@ -438,33 +427,19 @@
 
 // define plugin interface
 static Shx_plugin_t plugin = {
- .misc.plugin.api_vmajor = 1,
- .misc.plugin.api_vminor = 5,
+ .misc.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .misc.plugin.api_vminor = DB_API_VERSION_MINOR,
 .misc.plugin.version_major = 1,
- .misc.plugin.version_minor = 1,
+ .misc.plugin.version_minor = 2,
 .misc.plugin.type = DB_PLUGIN_MISC,
 .misc.plugin.id = "shellexec",
 .misc.plugin.name = "Shell commands",
- .misc.plugin.descr = "Executes configurable shell commands for tracks\n"
- "If you don't have shellexecui installed,\n"
- "you can still use the following syntax in the config file:\n\n"
- "shellexec.NN shcmd:title:name:flag1,flag2,flag3,...\n\n"
- "NN is any (unique) number, e.g. 01, 02, 03, etc\n\n"
- "shcmd is the command to execute, supports title formatting\n\n"
- "title is the name of command displayed in UI (context menu)\n\n"
- "name used for referencing commands from other plugins, e.g hotkeys\n\n"
- "flags are comma-separated list of items, allowed items are:\n"
- " single - command allowed only for single track\n"
- " local - command allowed only for local files\n"
- " remote - command allowed only for non-local files\n"
- "EXAMPLE: shellexec.00 notify-send \"%a - %t\":Show selected track:notify:single\n"
- "this would show the name of selected track in notification popup"
- ,
+ .misc.plugin.descr = "Run custom shell commands as plugin actions.\n",
 .misc.plugin.copyright = 
 "Shellexec plugin for DeaDBeeF\n"
 "Copyright (C) 2010-2014 Deadbeef team\n"
 "Original developer Viktor Semykin <thesame.ml@gmail.com>\n"
- "Maintenance, minor improvements Alexey Yakovenko <waker@users.sf.net>\n"
+ "Maintenance, minor improvements Oleksiy Yakovenko <waker@users.sf.net>\n"
 "GUI support and bugfixing Azeem Arshad <kr00r4n@gmail.com>"
 "\n"
 "This program is free software; you can redistribute it and/or\n"

deadbeef-0.6.2.tar.bz2/plugins/shellexec/shellexec.h -> deadbeef-1.9.6.tar.bz2/plugins/shellexec/shellexec.h Changed

@@ -2,7 +2,7 @@
 Shellexec plugin for DeaDBeeF
 Copyright (C) 2010-2012 Deadbeef team
 Original developer Viktor Semykin <thesame.ml@gmail.com>
- Maintainance, minor improvements Alexey Yakovenko <waker@users.sf.net>
+ Maintainance, minor improvements Oleksiy Yakovenko <waker@users.sf.net>
 GUI support and bugfixing Azeem Arshad <kr00r4n@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,14 @@
 #ifndef __SHELLEXEC_H
 #define __SHELLEXEC_H
 
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+
+// Version history:
+// 1.2: changed configuration to JSON, use new title formatting
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 //Probably it's reasonable to move these flags to parent struct
 enum {
@@ -39,12 +46,16 @@
 
 typedef struct Shx_plugin_s
 {
-	DB_misc_t misc;
-
-	void (*save_actions) (void);
-	Shx_action_t* (*action_add) (void);
-	void (*action_remove) (Shx_action_t *a);
-	void (*action_free) (Shx_action_t *a);
+ DB_misc_t misc;
+ 
+ void (*save_actions) (void);
+ Shx_action_t* (*action_add) (void);
+ void (*action_remove) (Shx_action_t *a);
+ void (*action_free) (Shx_action_t *a);
 } Shx_plugin_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

deadbeef-1.9.6.tar.bz2/plugins/shellexec/shellexecutil.c Added

@@ -0,0 +1,65 @@
+#include "shellexecutil.h"
+#include <string.h>
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+extern DB_functions_t *deadbeef;
+
+int
+shellexec_eval_command (const char *shcommand, char *output, size_t size, DB_playItem_t *it) {
+ int res = deadbeef->pl_format_title_escaped (it, -1, output, (int)(size - 2), -1, shcommand);
+ if (res < 0) {
+ trace ("shellexec: failed to format string for execution (too long?)\n");
+ return -1;
+ }
+ // Run in background
+ #ifndef __MINGW32__
+ strncat (output, "&", size);
+ #else
+ {
+ const char *cmd_prefix = "start /b \"\" cmd /c \"";
+ size_t conv_len = strlen(output) + strlen(cmd_prefix) + 1;
+ size_t len = strlen(output);
+ if ( conv_len > size) {
+ trace ("shellexec: string too long\n");
+ return -1;
+ }
+ memmove (output + strlen(cmd_prefix), output, len);
+ outputconv_len = 0;
+ outputconv_len - 1 = '\"';
+ memcpy (output, cmd_prefix, strlen(cmd_prefix));
+ }
+ #endif
+
+ // replace \' with '"'"'
+ size_t l = strlen (output);
+ size_t remaining = size - l - 1;
+ for (int i = 0; outputi; i++) {
+ if (outputi == '\\' && outputi+1 == '\'') {
+ if (remaining < 3) {
+ trace ("shellexec command is too long.\n");
+ return -1;
+ }
+ memmove (&outputi+5, &outputi+2, l - i + 1 - 2);
+ memcpy (&outputi, "'\"'\"'", 5);
+ l += 3;
+ remaining -= 3;
+ i += 4;
+ }
+ else if (remaining < 3) {
+ fprintf (stderr, "shellexec: command is too long.\n");
+ return -1;
+ }
+ }
+ #ifdef __MINGW32__
+ // replace ' with "
+ // Required for paths to work
+ char *str_p = output;
+ while(str_p = strchr(str_p, '\'')) {
+ *str_p = '\"';
+ }
+ #endif
+ return 0;
+}
+

deadbeef-1.9.6.tar.bz2/plugins/shellexec/shellexecutil.h Added

deadbeef-0.6.2.tar.bz2/plugins/shellexecui/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/shellexecui/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/shellexecui/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/shellexecui/Makefile.am Changed

@@ -1,6 +1,7 @@
-if HAVE_SHELLEXECUI
+pluginpath=@top_srcdir@/plugins/shellexecui
+EXTRA_DIST = $(pluginpath)/shellexec.glade
 
-EXTRA_DIST = shellexec.glade
+if HAVE_SHELLEXECUI
 
 if HAVE_GTK2
 if HAVE_GTK3
@@ -14,29 +15,18 @@
 endif
 endif
 
-AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
-
 if HAVE_GTK2
 shellexecui_gtk2_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h
 shellexecui_gtk2_la_LDFLAGS = -module -avoid-version
-if STATICLINK
-GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
-
-shellexecui_gtk2_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lrt
-
-shellexecui_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
 shellexecui_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS)
-shellexecui_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS)
-endif
+shellexecui_gtk2_la_CFLAGS = $(CFLAGS) -std=c99 $(GTK2_DEPS_CFLAGS) -I@top_srcdir@/include -fPIC
 endif
 
 if HAVE_GTK3
 shellexecui_gtk3_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h
 shellexecui_gtk3_la_LDFLAGS = -module -avoid-version
 shellexecui_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS)
-shellexecui_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS)
+shellexecui_gtk3_la_CFLAGS = $(CFLAGS) -std=c99 $(GTK3_DEPS_CFLAGS) -I@top_srcdir@/include -fPIC
 endif
 
-
 endif

deadbeef-0.6.2.tar.bz2/plugins/shellexecui/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/shellexecui/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/shellexecui/shellexecui.c -> deadbeef-1.9.6.tar.bz2/plugins/shellexecui/shellexecui.c Changed

@@ -1,7 +1,7 @@
 /*
 ShellExec GUI plugin for DeaDBeeF Player
 Copyright (C) 2012 Azeem Arshad <kr00r4n@gmail.com>
- Copyright (C) 2013-2014 Alexey Yakovenko
+ Copyright (C) 2013-2014 Oleksiy Yakovenko
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
 #include "interface.h"
 #include "callbacks.h"
 #include "support.h"
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include "../gtkui/gtkui_api.h"
 #include "../shellexec/shellexec.h"
 
@@ -81,7 +81,7 @@
 gtk_widget_destroy(conf_dlg);
 }
 
-GtkWidget *create_edit_dlg() {
+GtkWidget *create_edit_dlg(void) {
 GtkWidget *dlg = create_shellexec_conf_edit_dialog();
 gtk_window_set_transient_for(GTK_WINDOW(dlg),
 GTK_WINDOW(conf_dlg));
@@ -369,7 +369,7 @@
 }
 
 static int
-shellexecui_action_callback(DB_plugin_action_t *action, int ctx) {
+shellexecui_action_callback(DB_plugin_action_t *action, ddb_action_context_t ctx) {
 g_idle_add (shellexecui_action_gtk, NULL);
 return 0;
 }
@@ -387,7 +387,7 @@
 return &shellexecui_action;
 }
 
-int shxui_connect() {
+int shxui_connect(void) {
 gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id (DDB_GTKUI_PLUGIN_ID);
 if (!gtkui_plugin) {
 fprintf (stderr, "shellexecui: can't find gtkui plugin\n");
@@ -407,23 +407,21 @@
 }
 
 static DB_misc_t plugin = {
- .plugin.type = DB_PLUGIN_MISC,
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 5,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
+ .plugin.type = DB_PLUGIN_MISC,
 #if GTK_CHECK_VERSION(3,0,0)
 .plugin.id = "shellexecui_gtk3",
- .plugin.name = "Shellexec GTK3 UI",
 #else
 .plugin.id = "shellexecui_gtk2",
- .plugin.name = "Shellexec GTK2 UI",
 #endif
+ .plugin.name = "Shellexec UI",
 .plugin.descr = "A GTK UI for the Shellexec plugin",
 .plugin.copyright = 
 "ShellExec GUI plugin for DeaDBeeF Player\n"
 "Copyright (C) 2012 Azeem Arshad <kr00r4n@gmail.com>\n"
- "Copyright (C) 2013-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2013-2014 Oleksiy Yakovenko\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"

deadbeef-0.6.2.tar.bz2/plugins/shn/AUTHORS -> deadbeef-1.9.6.tar.bz2/plugins/shn/AUTHORS Changed

deadbeef-0.6.2.tar.bz2/plugins/shn/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/shn/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/shn/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/shn/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/shn/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/shn/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/shn/shn.c -> deadbeef-1.9.6.tar.bz2/plugins/shn/shn.c Changed

@@ -1,6 +1,6 @@
 /*
 SHN (Shorten) plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2014 Oleksiy Yakovenko <waker@users.sourceforge.net>
 
 Based on xmms-shn, http://www.etree.org/shnutils/xmms-shn/
 Copyright (C) 2000-2007 Jason Jordan <shnutils@freeshell.org>
@@ -30,7 +30,8 @@
 #include <stdlib.h>
 #include <math.h>
 #include "shorten.h"
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 #include "bitshift.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
@@ -59,9 +60,9 @@
 int cklen;
 uchar tmp;
 
- int currentsample;
- int startsample;
- int endsample;
+ int64_t currentsample;
+ int64_t startsample;
+ int64_t endsample;
 
 int skipsamples;
 } shn_fileinfo_t;
@@ -70,10 +71,8 @@
 
 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;
+ shn_fileinfo_t *info = calloc (1, sizeof (shn_fileinfo_t));
+ return &info->info;
 }
 
 int
@@ -330,10 +329,11 @@
 DB_FILE *f;
 
 deadbeef->pl_lock ();
-	f = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
-	deadbeef->pl_unlock ();
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ f = deadbeef->fopen (uri);
 if (!f) {
- trace ("shn: failed to open %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ trace ("shn: failed to open %s\n", uri);
 return -1;
 }
 
@@ -374,9 +374,10 @@
 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;
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample (it);
+ info->endsample = endsample;
 plugin.seek_sample (_info, 0);
 }
 else {
@@ -747,7 +748,7 @@
 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;
+ size = (int)((info->endsample - info->currentsample + 1) * samplesize);
 if (size <= 0) {
 return 0;
 }
@@ -810,7 +811,7 @@
 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;
+ info->skipsamples = (int)(sample - info->currentsample);
 }
 else {
 // restart
@@ -848,7 +849,7 @@
 
 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;
+ seekto_offset = (ulong)(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);
@@ -910,14 +911,12 @@
 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);
+ deadbeef->junk_apev2_read (it, tmp_file->vars.fd);
+ deadbeef->junk_id3v2_read (it, tmp_file->vars.fd);
+ deadbeef->junk_id3v1_read (it, tmp_file->vars.fd);
 
 char s100;
- snprintf (s, sizeof (s), "%lld", fsize);
+ snprintf (s, sizeof (s), "%lld", (long long)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);
@@ -930,6 +929,8 @@
 deadbeef->pl_add_meta (it, ":BITRATE", s);
 deadbeef->pl_add_meta (it, "title", NULL);
 
+ shn_unload(tmp_file);
+
 after = deadbeef->plt_insert_item (plt, after, it);
 deadbeef->pl_item_unref (it);
 return after;
@@ -1173,8 +1174,8 @@
 /* bitshifts */
 /*************/
 
-void fix_bitshift(buffer, nitem, bitshift, ftype) slong *buffer; int nitem,
- bitshift, ftype; {
+void fix_bitshift(slong *buffer, int nitem, int bitshift, int ftype)
+{
 int i;
 
 if(ftype == TYPE_AU1)
@@ -1807,8 +1808,7 @@
 
 // define plugin interface
 static DB_decoder_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_DECODER,
@@ -1817,7 +1817,7 @@
 .plugin.descr = "decodes shn files",
 .plugin.copyright = 
 "SHN (Shorten) plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2009-2014 Oleksiy 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"

deadbeef-0.6.2.tar.bz2/plugins/shn/shn.h -> deadbeef-1.9.6.tar.bz2/plugins/shn/shn.h Changed

deadbeef-0.6.2.tar.bz2/plugins/shn/vario.c -> deadbeef-1.9.6.tar.bz2/plugins/shn/vario.c Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/sid/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/sid/Makefile.am Changed

@@ -1,111 +1,111 @@
-if HAVE_SID
 sidpath=@top_srcdir@/plugins/sid/sidplay-libs
 EXTRA_DIST = \
 	$(sidpath)/libsidutils/README $(sidpath)/libsidplay/README $(sidpath)/resid/README\
 	$(sidpath)/libsidutils/COPYING $(sidpath)/libsidplay/COPYING $(sidpath)/resid/COPYING\
 	$(sidpath)/libsidutils/AUTHORS $(sidpath)/libsidplay/AUTHORS $(sidpath)/resid/AUTHORS
 
+if HAVE_SID
 pkglib_LTLIBRARIES = sid.la
 sid_la_SOURCES = plugin.c csid.cpp csid.h\
-sidplay-libs/libsidplay/src/mixer.cpp\
-sidplay-libs/libsidplay/src/player.cpp\
-sidplay-libs/libsidplay/src/mos656x/mos656x.cpp\
-sidplay-libs/libsidplay/src/mos6510/mos6510.cpp\
-sidplay-libs/libsidplay/src/sid6526/sid6526.cpp\
-sidplay-libs/libsidplay/src/sidtune/MUS.cpp\
-sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp\
-sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp\
-sidplay-libs/libsidplay/src/sidtune/SidTune.cpp\
-sidplay-libs/libsidplay/src/sidtune/PSID.cpp\
-sidplay-libs/libsidplay/src/sidtune/PP20.cpp\
-sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp\
-sidplay-libs/libsidplay/src/event.cpp\
-sidplay-libs/libsidplay/src/psiddrv.cpp\
-sidplay-libs/libsidplay/src/config.cpp\
-sidplay-libs/libsidplay/src/sidplay2.cpp\
-sidplay-libs/libsidplay/src/xsid/xsid.cpp\
-sidplay-libs/libsidplay/src/mos6526/mos6526.cpp\
-sidplay-libs/builders/resid-builder/src/resid.cpp\
-sidplay-libs/builders/resid-builder/src/resid-builder.cpp\
-sidplay-libs/resid/wave8580_PS_.cpp\
-sidplay-libs/resid/filter.cpp\
-sidplay-libs/resid/pot.cpp\
-sidplay-libs/resid/wave.cpp\
-sidplay-libs/resid/version.cpp\
-sidplay-libs/resid/wave6581__ST.cpp\
-sidplay-libs/resid/extfilt.cpp\
-sidplay-libs/resid/wave8580_PST.cpp\
-sidplay-libs/resid/wave6581_PST.cpp\
-sidplay-libs/resid/wave6581_P_T.cpp\
-sidplay-libs/resid/wave6581_PS_.cpp\
-sidplay-libs/resid/envelope.cpp\
-sidplay-libs/resid/voice.cpp\
-sidplay-libs/resid/sid.cpp\
-sidplay-libs/resid/wave8580__ST.cpp\
-sidplay-libs/resid/wave8580_P_T.cpp\
-sidplay-libs/libsidplay/src/reloc65.c\
-sidplay-libs/unix/config.h\
-sidplay-libs/libsidplay/win/VC/sidconfig.h\
-sidplay-libs/libsidplay/win/VC/sidint.h\
-sidplay-libs/libsidplay/win/VC/config.h\
-sidplay-libs/libsidplay/unix/sidconfig.h\
-sidplay-libs/libsidplay/unix/sidint.h\
-sidplay-libs/libsidplay/src/xsid/xsid.h\
-sidplay-libs/libsidplay/src/mos6526/mos6526.h\
-sidplay-libs/libsidplay/src/sid6526/sid6526.h\
-sidplay-libs/libsidplay/src/mos656x/mos656x.h\
-sidplay-libs/libsidplay/src/c64/c64xsid.h\
-sidplay-libs/libsidplay/src/c64/c64cia.h\
-sidplay-libs/libsidplay/src/c64/c64vic.h\
-sidplay-libs/libsidplay/src/nullsid.h\
-sidplay-libs/libsidplay/src/sidtune/PP20_Defs.h\
-sidplay-libs/libsidplay/src/sidtune/SidTuneTools.h\
-sidplay-libs/libsidplay/src/sidtune/SidTuneCfg.h\
-sidplay-libs/libsidplay/src/sidtune/PP20.h\
-sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.h\
-sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.h\
-sidplay-libs/libsidplay/src/mos6510/mos6510.h\
-sidplay-libs/libsidplay/src/mos6510/conf6510.h\
-sidplay-libs/libsidplay/src/mos6510/opcodes.h\
-sidplay-libs/libsidplay/src/player.h\
-sidplay-libs/libsidplay/include/sidplay/SmartPtr.h\
-sidplay-libs/libsidplay/include/sidplay/sidusage.h\
-sidplay-libs/libsidplay/include/sidplay/sidtypes.h\
-sidplay-libs/libsidplay/include/sidplay/sidplay2.h\
-sidplay-libs/libsidplay/include/sidplay/sidconfig.h\
-sidplay-libs/libsidplay/include/sidplay/SidTune.h\
-sidplay-libs/libsidplay/include/sidplay/sid2types.h\
-sidplay-libs/libsidplay/include/sidplay/c64env.h\
-sidplay-libs/libsidplay/include/sidplay/sidbuilder.h\
-sidplay-libs/libsidplay/include/sidplay/sidint.h\
-sidplay-libs/libsidplay/include/sidplay/component.h\
-sidplay-libs/libsidplay/include/sidplay/event.h\
-sidplay-libs/libsidplay/include/sidplay/sidendian.h\
-sidplay-libs/libsidplay/include/sidplay/Buffer.h\
-sidplay-libs/libsidplay/include/sidenv.h\
-sidplay-libs/libsidplay/include/config.h\
-sidplay-libs/builders/resid-builder/win/VC/config.h\
-sidplay-libs/builders/resid-builder/src/resid-emu.h\
-sidplay-libs/builders/resid-builder/include/sidplay/builders/resid.h\
-sidplay-libs/builders/resid-builder/include/config.h\
-sidplay-libs/resid/voice.h\
-sidplay-libs/resid/siddefs.h\
-sidplay-libs/resid/wave.h\
-sidplay-libs/resid/sid.h\
-sidplay-libs/resid/filter.h\
-sidplay-libs/resid/envelope.h\
-sidplay-libs/resid/spline.h\
-sidplay-libs/resid/pot.h\
-sidplay-libs/resid/extfilt.h\
-sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.i\
-sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.i\
-sidplay-libs/libsidplay/src/kernal.bin\
-sidplay-libs/libsidplay/src/psiddrv.bin\
-sidplay-libs/libsidplay/src/poweron.bin
+	sidplay-libs/libsidplay/src/mixer.cpp\
+	sidplay-libs/libsidplay/src/player.cpp\
+	sidplay-libs/builders/resid-builder/include/config.h\
+	sidplay-libs/builders/resid-builder/include/sidplay/builders/resid.h\
+	sidplay-libs/builders/resid-builder/src/resid-builder.cpp\
+	sidplay-libs/builders/resid-builder/src/resid-emu.h\
+	sidplay-libs/builders/resid-builder/src/resid.cpp\
+	sidplay-libs/builders/resid-builder/win/VC/config.h\
+	sidplay-libs/libsidplay/include/config.h\
+	sidplay-libs/libsidplay/include/sidenv.h\
+	sidplay-libs/libsidplay/include/sidplay/Buffer.h\
+	sidplay-libs/libsidplay/include/sidplay/SidTune.h\
+	sidplay-libs/libsidplay/include/sidplay/SmartPtr.h\
+	sidplay-libs/libsidplay/include/sidplay/c64env.h\
+	sidplay-libs/libsidplay/include/sidplay/component.h\
+	sidplay-libs/libsidplay/include/sidplay/event.h\
+	sidplay-libs/libsidplay/include/sidplay/sid2types.h\
+	sidplay-libs/libsidplay/include/sidplay/sidbuilder.h\
+	sidplay-libs/libsidplay/include/sidplay/sidconfig.h\
+	sidplay-libs/libsidplay/include/sidplay/sidendian.h\
+	sidplay-libs/libsidplay/include/sidplay/sidint.h\
+	sidplay-libs/libsidplay/include/sidplay/sidplay2.h\
+	sidplay-libs/libsidplay/include/sidplay/sidtypes.h\
+	sidplay-libs/libsidplay/include/sidplay/sidusage.h\
+	sidplay-libs/libsidplay/src/c64/c64cia.h\
+	sidplay-libs/libsidplay/src/c64/c64vic.h\
+	sidplay-libs/libsidplay/src/c64/c64xsid.h\
+	sidplay-libs/libsidplay/src/config.cpp\
+	sidplay-libs/libsidplay/src/event.cpp\
+	sidplay-libs/libsidplay/src/kernal.bin\
+	sidplay-libs/libsidplay/src/mos6510/conf6510.h\
+	sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.h\
+	sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.i\
+	sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.h\
+	sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.i\
+	sidplay-libs/libsidplay/src/mos6510/mos6510.cpp\
+	sidplay-libs/libsidplay/src/mos6510/mos6510.h\
+	sidplay-libs/libsidplay/src/mos6510/opcodes.h\
+	sidplay-libs/libsidplay/src/mos6526/mos6526.cpp\
+	sidplay-libs/libsidplay/src/mos6526/mos6526.h\
+	sidplay-libs/libsidplay/src/mos656x/mos656x.cpp\
+	sidplay-libs/libsidplay/src/mos656x/mos656x.h\
+	sidplay-libs/libsidplay/src/nullsid.h\
+	sidplay-libs/libsidplay/src/player.h\
+	sidplay-libs/libsidplay/src/poweron.bin\
+	sidplay-libs/libsidplay/src/psiddrv.bin\
+	sidplay-libs/libsidplay/src/psiddrv.cpp\
+	sidplay-libs/libsidplay/src/reloc65.c\
+	sidplay-libs/libsidplay/src/sid6526/sid6526.cpp\
+	sidplay-libs/libsidplay/src/sid6526/sid6526.h\
+	sidplay-libs/libsidplay/src/sidplay2.cpp\
+	sidplay-libs/libsidplay/src/sidtune/IconInfo.cpp\
+	sidplay-libs/libsidplay/src/sidtune/InfoFile.cpp\
+	sidplay-libs/libsidplay/src/sidtune/MUS.cpp\
+	sidplay-libs/libsidplay/src/sidtune/PP20.cpp\
+	sidplay-libs/libsidplay/src/sidtune/PP20.h\
+	sidplay-libs/libsidplay/src/sidtune/PP20_Defs.h\
+	sidplay-libs/libsidplay/src/sidtune/PSID.cpp\
+	sidplay-libs/libsidplay/src/sidtune/SidTune.cpp\
+	sidplay-libs/libsidplay/src/sidtune/SidTuneCfg.h\
+	sidplay-libs/libsidplay/src/sidtune/SidTuneTools.cpp\
+	sidplay-libs/libsidplay/src/sidtune/SidTuneTools.h\
+	sidplay-libs/libsidplay/src/xsid/xsid.cpp\
+	sidplay-libs/libsidplay/src/xsid/xsid.h\
+	sidplay-libs/libsidplay/unix/sidconfig.h\
+	sidplay-libs/libsidplay/unix/sidint.h\
+	sidplay-libs/libsidplay/win/VC/config.h\
+	sidplay-libs/libsidplay/win/VC/sidconfig.h\
+	sidplay-libs/libsidplay/win/VC/sidint.h\
+	sidplay-libs/resid/envelope.cpp\
+	sidplay-libs/resid/envelope.h\
+	sidplay-libs/resid/extfilt.cpp\
+	sidplay-libs/resid/extfilt.h\
+	sidplay-libs/resid/filter.cpp\
+	sidplay-libs/resid/filter.h\
+	sidplay-libs/resid/pot.cpp\
+	sidplay-libs/resid/pot.h\
+	sidplay-libs/resid/sid.cpp\
+	sidplay-libs/resid/sid.h\
+	sidplay-libs/resid/siddefs.h\
+	sidplay-libs/resid/spline.h\
+	sidplay-libs/resid/version.cpp\
+	sidplay-libs/resid/voice.cpp\
+	sidplay-libs/resid/voice.h\
+	sidplay-libs/resid/wave.cpp\
+	sidplay-libs/resid/wave.h\
+	sidplay-libs/resid/wave6581_PST.cpp\
+	sidplay-libs/resid/wave6581_PS_.cpp\
+	sidplay-libs/resid/wave6581_P_T.cpp\
+	sidplay-libs/resid/wave6581__ST.cpp\
+	sidplay-libs/resid/wave8580_PST.cpp\
+	sidplay-libs/resid/wave8580_PS_.cpp\
+	sidplay-libs/resid/wave8580_P_T.cpp\
+	sidplay-libs/resid/wave8580__ST.cpp\
+	sidplay-libs/unix/config.h
 	
 sid_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
 
-AM_CFLAGS = $(CFLAGS) -std=c99 -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC
-AM_CPPFLAGS = $(CXXFLAGS) -DHAVE_UNIX -I$(sidpath) -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -fno-exceptions -fno-rtti -fno-unwind-tables
+sid_la_CFLAGS = $(CFLAGS) -std=c99 -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include -fPIC -I@top_srcdir@/include
+sid_la_CXXFLAGS = $(CXXFLAGS) -DHAVE_UNIX -I$(sidpath) -I$(sidpath)/unix -I$(sidpath)/libsidplay -I$(sidpath)/libsidplay/include -I$(sidpath)/libsidplay/include/sidplay -I$(sidpath)/libsidutils/include/sidplay/utils -I$(sidpath)/builders/resid-builder/include/sidplay/builders -I$(sidpath)/builders/resid-builder/include -I@top_srcdir@/include -DHAVE_STRCASECMP -DHAVE_STRNCASECMP -fno-exceptions -fno-rtti -fno-unwind-tables
 
 endif

deadbeef-0.6.2.tar.bz2/plugins/sid/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/sid/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/csid.cpp -> deadbeef-1.9.6.tar.bz2/plugins/sid/csid.cpp Changed

@@ -1,6 +1,6 @@
 /*
 SID plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2014 Oleksiy 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
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#include <sys/stat.h>
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -27,7 +28,8 @@
 //#include "md5.h"
 // #include "sidplay/sidendian.h"
 
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 #include "csid.h"
 
 extern DB_decoder_t sid_plugin;
@@ -46,38 +48,38 @@
 ReSIDBuilder *resid;
 SidTune *tune;
 float duration; // of the current song
+ int chip_voices;
+ int rawsignal;
 } sid_info_t;
 
 static inline void
 le_int16 (int16_t in, unsigned char *out) {
- char *pin = (char *)&in;
-#if !WORDS_BIGENDIAN
- out0 = pin0;
- out1 = pin1;
-#else
- out1 = pin0;
- out0 = pin1;
-#endif
+ out0 = in&0xff;
+ out1 = (in&0xff00)>>8;
 }
 
-// SLDB support costs ~1M!!!
-// current hvsc sldb size is ~35k songs
-#define SLDB_MAX_SONGS 40000
-// ~50k subsongs in current sldb
-#define SLDB_POOL_SIZE 55000
+// NOTE: we know that current SLDB is larger than that, but we want the code to go into realloc path
+#define SLDB_PREALLOC_ITEMS 50000
+#define SLDB_PREALLOC_LENGTHS SLDB_PREALLOC_ITEMS
 typedef struct {
- uint8_t sldb_digestsSLDB_MAX_SONGS16;
- int16_t sldb_poolSLDB_POOL_SIZE;
- int sldb_poolmark;
- int16_t *sldb_lengthsSLDB_MAX_SONGS;
- int sldb_size;
-} sldb_t;
+ uint8_t digest16;
+ size_t lengths_offset;
+ uint16_t subsongs;
+} sldb_item_t;
+
+static sldb_item_t *sldb;
+static size_t sldb_allocated_size;
+static size_t sldb_count;
+
+static uint16_t *sldb_lengths;
+static size_t sldb_lengths_allocated_size;
+static size_t sldb_lengths_count;
+
 static int sldb_loaded;
-static sldb_t *sldb;
 static int sldb_disable;
+static int sldb_legacy;
 
-static int chip_voices = 0xff;
-static int chip_voices_changed = 0;
+static int conf_hvsc_enable = 0;
 
 static void
 sldb_load()
@@ -86,7 +88,6 @@
 return;
 }
 trace ("sldb_load\n");
- int conf_hvsc_enable = deadbeef->conf_get_int ("hvsc_enable", 0);
 if (sldb_loaded || !conf_hvsc_enable) {
 sldb_disable = 1;
 return;
@@ -98,6 +99,12 @@
 return;
 }
 sldb_loaded = 1;
+
+ const char *ext = conf_hvsc_path + strlen (conf_hvsc_path) - 4;
+ if (!strcmp (ext, ".txt")) {
+ sldb_legacy = 1;
+ }
+
 const char *fname = conf_hvsc_path;
 FILE *fp = fopen (fname, "r");
 if (!fp) {
@@ -116,13 +123,15 @@
 }
 
 if (!sldb) {
- sldb = (sldb_t *)malloc (sizeof (sldb_t));
- memset (sldb, 0, sizeof (sldb_t));
+ sldb = (sldb_item_t *)calloc (SLDB_PREALLOC_ITEMS, sizeof(sldb_item_t));
+ sldb_allocated_size = SLDB_PREALLOC_ITEMS;
+ sldb_lengths = (uint16_t *)calloc (SLDB_PREALLOC_LENGTHS, sizeof (uint16_t));
+ sldb_lengths_allocated_size = SLDB_PREALLOC_LENGTHS;
 }
 while (fgets (str, 1024, fp) == str) {
- if (sldb->sldb_size >= SLDB_MAX_SONGS) {
- trace ("sldb loader ran out of memory.\n");
- break;
+ if (sldb_count >= sldb_allocated_size) {
+ sldb_allocated_size += 10000;
+ sldb = (sldb_item_t *)realloc (sldb, sldb_allocated_size * sizeof (sldb_item_t));
 }
 line++;
 if (str0 == ';') {
@@ -171,17 +180,6 @@
 trace ("bad md5 (sz=%d, line=%d)\n", sz, line);
 continue; // bad song md5
 }
-// else {
-// trace ("digest: ");
-// for (int j = 0; j < 16; j++) {
-// trace ("%02x", (int)digestj);
-// }
-// trace ("\n");
-// exit (0);
-// }
- memcpy (sldb->sldb_digestssldb->sldb_size, digest, 16);
- sldb->sldb_lengthssldb->sldb_size = &sldb->sldb_poolsldb->sldb_poolmark;
- sldb->sldb_size++;
 // check '=' sign
 if (*p != '=') {
 continue; // no '=' sign
@@ -190,7 +188,10 @@
 if (!(*p)) {
 continue; // unexpected eol
 }
- int subsong = 0;
+
+ memcpy (sldbsldb_count.digest, digest, 16);
+ sldbsldb_count.lengths_offset = sldb_lengths_count;
+
 while (*p >= ' ') {
 // read subsong lengths until eol
 char timestamp7; // up to MMM:SS
@@ -199,7 +200,7 @@
 timestampsz++ = *p;
 p++;
 }
- if (sz < 4 || sz == 6 && *p > ' ' && *p != '(') {
+ if (sz < 4 || (sz == 6 && *p > ' ' && *p != '(')) {
 break; // bad timestamp
 }
 timestampsz = 0;
@@ -224,14 +225,14 @@
 //trace ("subsong %d, time %s:%s\n", subsong, minute, second);
 time = atoi (minute) * 60 + atoi (second);
 }
- if (sldb->sldb_poolmark >= SLDB_POOL_SIZE) {
- trace ("sldb ran out of memory\n");
- goto fail;
+
+ if (sldb_lengths_count >= sldb_lengths_allocated_size) {
+ sldb_lengths_allocated_size += 10000;
+ sldb_lengths = (uint16_t *)realloc (sldb_lengths, sizeof (uint16_t) * sldb_lengths_allocated_size);
 }
- 
- sldb->sldb_lengthssldb->sldb_size-1subsong = time;
- sldb->sldb_poolmark++;
- subsong++;
+
+ sldb_lengthssldb_lengths_count++ = time;
+ sldbsldb_count.subsongs++;
 
 // prepare for next timestamp
 if (*p == '(') {
@@ -251,6 +252,7 @@
 break; // eol
 }
 }
+ sldb_count++;
 }
 
 fail:
@@ -265,8 +267,8 @@
 trace ("sldb not loaded\n");
 return -1;
 }
- for (int i = 0; i < sldb->sldb_size; i++) {
- if (!memcmp (digest, sldb->sldb_digestsi, 16)) {
+ for (int i = 0; i < sldb_count; i++) {
+ if (!memcmp (digest, sldbi.digest, 16)) {
 return i;
 }
 }
@@ -275,9 +277,10 @@
 
 DB_fileinfo_t *
 csid_open (uint32_t hints) {
- DB_fileinfo_t *_info = (DB_fileinfo_t *)malloc (sizeof (sid_info_t));
- memset (_info, 0, sizeof (sid_info_t));
- return _info;
+ sid_info_t *info = (sid_info_t *)calloc (1, sizeof (sid_info_t));
+ info->rawsignal = hints & DDB_DECODER_HINT_RAW_SIGNAL;
+ info->chip_voices = 0xff;
+ return &info->info;
 }
 
 static void
@@ -288,7 +291,20 @@
 if (emu) {
 for (int i = 0; i < 3; i++) {
 bool mute = chip_voices & (1 << i) ? false : true;
- emu->voice (i, mute ? 0x00 : 0xff, mute);
+
+ if (maxsids == 2) {
+ // in stereo mode, sid0 has voices 0 and 2 muted, and sid1 has voice 1 muted
+ // (libsidplay2 config.cpp:217)
+ if (k == 0 && i != 1) {
+ mute = true;
+ }
+ else if (k == 1 && i == 1) {
+ mute = true;
+ }
+ }
+
+ // volume parameter is ignored, pass 0
+ emu->voice (i, 0, mute);
 }
 }
 }
@@ -301,8 +317,9 @@
 // libsidplay crashes if file doesn't exist
 // so i have to check it here
 deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
 if (!fp ){
 return -1;
 }
@@ -330,7 +347,8 @@
 conf = info->sidplay->config ();
 conf.frequency = samplerate;
 conf.precision = bps;
- conf.playback = info->tune->isStereo () ? sid2_stereo : sid2_mono;
+
+ conf.playback = deadbeef->conf_get_int ("sid.mono", 0) ? sid2_mono : sid2_stereo;
 conf.sidEmulation = info->resid;
 conf.optimisation = 0;
 info->sidplay->config (conf);
@@ -343,8 +361,6 @@
 _info->fmt.channelmask = _info->fmt.channels == 1 ? DDB_SPEAKER_FRONT_LEFT : (DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT);
 _info->readpos = 0;
 
- chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
- csid_mute_voices (info, chip_voices);
 return 0;
 }
 
@@ -359,6 +375,17 @@
 }
 }
 
+static void
+_mute_voices(sid_info_t *info) {
+ if (!info->rawsignal) {
+ int chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
+ if (chip_voices != info->chip_voices) {
+ info->chip_voices = chip_voices;
+ csid_mute_voices (info, chip_voices);
+ }
+ }
+}
+
 int
 csid_read (DB_fileinfo_t *_info, char *bytes, int size) {
 sid_info_t *info = (sid_info_t *)_info;
@@ -366,11 +393,7 @@
 return 0;
 }
 
- if (chip_voices_changed) {
- chip_voices = deadbeef->conf_get_int ("chip.voices", 0xff);
- chip_voices_changed = 0;
- csid_mute_voices (info, chip_voices);
- }
+ _mute_voices(info);
 
 int rd = info->sidplay->play (bytes, size);
 
@@ -389,6 +412,7 @@
 if (t < _info->readpos) {
 // reinit
 info->sidplay->load (info->tune);
+ _mute_voices(info);
 }
 else {
 t -= _info->readpos;
@@ -426,9 +450,42 @@
 return NULL;
 }
 
+static void
+find_hvsc_path_from_fname (const char *fname) {
+ if (conf_hvsc_enable && !sldb_loaded && !sldb_disable) {
+ char conf_hvsc_path1000;
+ deadbeef->conf_get_str ("hvsc_path", "", conf_hvsc_path, sizeof (conf_hvsc_path));
+ if (!conf_hvsc_path0) {
+ strcpy (conf_hvsc_path, fname);
+ char *p;
+ while ((p = strrchr (conf_hvsc_path, '/'))) {
+ struct stat st;
+ strcpy (p, "/DOCUMENTS/Songlengths.md5");
+ int err = stat (conf_hvsc_path, &st);
+ if (!err && (st.st_mode & S_IFREG)) {
+ deadbeef->conf_set_str ("hvsc_path", conf_hvsc_path);
+ deadbeef->conf_save ();
+ break;
+ }
+ strcpy (p, "/DOCUMENTS/Songlengths.txt");
+ err = stat (conf_hvsc_path, &st);
+ if (!err && (st.st_mode & S_IFREG)) {
+ deadbeef->conf_set_str ("hvsc_path", conf_hvsc_path);
+ deadbeef->conf_save ();
+ break;
+ }
+ *p = 0;
+ }
+ }
+ }
+}
+
 extern "C" DB_playItem_t *
 csid_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
 trace ("inserting %s\n", fname);
+
+ find_hvsc_path_from_fname (fname);
+
 sldb_load ();
 SidTune *tune;
 trace ("new SidTune\n");
@@ -437,57 +494,31 @@
 trace ("subtunes: %d\n", tunes);
 uint8_t sig16;
 unsigned char tmp2;
-#if 1
 trace ("calculating md5\n");
 DB_md5_t md5;
 deadbeef->md5_init (&md5);
- deadbeef->md5_append (&md5, (const uint8_t *)tune->cache.get () + tune->fileOffset, tune->getInfo ().c64dataLen);
- le_int16 (tune->getInfo ().initAddr, tmp);
- deadbeef->md5_append (&md5, tmp, 2);
- le_int16 (tune->getInfo ().playAddr, tmp);
- deadbeef->md5_append (&md5, tmp, 2);
- le_int16 (tune->getInfo ().songs, tmp);
- deadbeef->md5_append (&md5, tmp, 2);
- for (int s = 1; s <= tunes; s++)
- {
- tune->selectSong (s);
- // songspeed is uint8_t, so no need for byteswap
- deadbeef->md5_append (&md5, &tune->getInfo ().songSpeed, 1);
- }
- if (tune->getInfo ().clockSpeed == SIDTUNE_CLOCK_NTSC) {
- deadbeef->md5_append (&md5, &tune->getInfo ().clockSpeed, sizeof (tune->getInfo ().clockSpeed));
- }
- deadbeef->md5_finish (&md5, sig);
-#else
- // md5 calc from libsidplay2
- MD5 myMD5;
- myMD5.append ((const char *)tune->cache.get() + tune->fileOffset, tune->getInfo ().c64dataLen);
- // Include INIT and PLAY address.
- endian_little16 (tmp,tune->getInfo ().initAddr);
- myMD5.append (tmp,sizeof(tmp));
- endian_little16 (tmp,tune->getInfo ().playAddr);
- myMD5.append (tmp,sizeof(tmp));
- // Include number of songs.
- endian_little16 (tmp,tune->getInfo ().songs);
- myMD5.append (tmp,sizeof(tmp));
- {
- // Include song speed for each song.
- for (uint_least16_t s = 1; s <= tune->getInfo ().songs; s++)
+ if (sldb_legacy) {
+ deadbeef->md5_append (&md5, (const uint8_t *)tune->cache.get () + tune->fileOffset, tune->getInfo ().c64dataLen);
+ le_int16 (tune->getInfo ().initAddr, tmp);
+ deadbeef->md5_append (&md5, tmp, 2);
+ le_int16 (tune->getInfo ().playAddr, tmp);
+ deadbeef->md5_append (&md5, tmp, 2);
+ le_int16 (tune->getInfo ().songs, tmp);
+ deadbeef->md5_append (&md5, tmp, 2);
+ for (int s = 1; s <= tunes; s++)
 {
 tune->selectSong (s);
- myMD5.append (&tune->getInfo ().songSpeed,1);
+ // songspeed is uint8_t, so no need for byteswap
+ deadbeef->md5_append (&md5, &tune->getInfo ().songSpeed, 1);
+ }
+ if (tune->getInfo ().clockSpeed == SIDTUNE_CLOCK_NTSC) {
+ deadbeef->md5_append (&md5, &tune->getInfo ().clockSpeed, sizeof (tune->getInfo ().clockSpeed));
 }
 }
- // Deal with PSID v2NG clock speed flags: Let only NTSC
- // clock speed change the MD5 fingerprint. That way the
- // fingerprint of a PAL-speed sidtune in PSID v1, v2, and
- // PSID v2NG format is the same.
- if (tune->getInfo ().clockSpeed == SIDTUNE_CLOCK_NTSC) {
- myMD5.append (&tune->getInfo ().clockSpeed,sizeof(tune->getInfo ().clockSpeed));
+ else {
+ deadbeef->md5_append (&md5, (const uint8_t *)tune->cache.get (), tune->getInfo ().dataFileLen);
 }
- myMD5.finish ();
- memcpy (sig, myMD5.getDigest (), 16);
-#endif
+ deadbeef->md5_finish (&md5, sig);
 
 int song = -1;
 if (sldb_loaded) {
@@ -515,19 +546,19 @@
 meta = "title";
 title_added = 1;
 }
- deadbeef->pl_add_meta (it, meta, convstr (sidinfo.infoString0, strlen (sidinfo.infoString0), temp, sizeof (temp)));
+ deadbeef->pl_add_meta (it, meta, convstr (sidinfo.infoString0, (int)strlen (sidinfo.infoString0), temp, sizeof (temp)));
 }
 if (i >= 2 && sidinfo.infoString1 && sidinfo.infoString10) {
- deadbeef->pl_add_meta (it, "artist", convstr (sidinfo.infoString1, strlen (sidinfo.infoString1), temp, sizeof (temp)));
+ deadbeef->pl_add_meta (it, "artist", convstr (sidinfo.infoString1, (int)strlen (sidinfo.infoString1), temp, sizeof (temp)));
 }
 if (i >= 3 && sidinfo.infoString2 && sidinfo.infoString20) {
- deadbeef->pl_add_meta (it, "copyright", convstr (sidinfo.infoString2, strlen (sidinfo.infoString2), temp, sizeof (temp)));
+ deadbeef->pl_add_meta (it, "copyright", convstr (sidinfo.infoString2, (int)strlen (sidinfo.infoString2), temp, sizeof (temp)));
 }
 
 for (int j = 3; j < i; j++)
 {
 if (sidinfo.infoStringj && sidinfo.infoStringj0) {
- deadbeef->pl_add_meta (it, "info", convstr (sidinfo.infoStringj, strlen (sidinfo.infoStringj), temp, sizeof (temp)));
+ deadbeef->pl_add_meta (it, "info", convstr (sidinfo.infoStringj, (int)strlen (sidinfo.infoStringj), temp, sizeof (temp)));
 }
 }
 char trk10;
@@ -538,17 +569,11 @@
 }
 
 float length = deadbeef->conf_get_float ("sid.defaultlength", 180);
- if (sldb_loaded) {
- if (song >= 0 && sldb->sldb_lengthssongs >= 0) {
- length = sldb->sldb_lengthssongs;
+ if (sldb_loaded && song >= 0 && s < sldbsong.subsongs) {
+ uint16_t l = sldb_lengthssldbsong.lengths_offset+s;
+ if (l >= 0) {
+ length = l;
 }
- // if (song < 0) {
- // trace ("song %s not found in db, md5: ", fname);
- // for (int j = 0; j < 16; j++) {
- // trace ("%02x", (int)sigj);
- // }
- // trace ("\n");
- // }
 }
 deadbeef->plt_set_item_duration (plt, it, length);
 deadbeef->pl_add_meta (it, ":FILETYPE", "SID");
@@ -562,24 +587,29 @@
 return after;
 }
 
+static void
+sldb_free (void) {
+ free (sldb);
+ sldb = NULL;
+ sldb_allocated_size = 0;
+ sldb_count = 0;
+ free (sldb_lengths);
+ sldb_lengths = NULL;
+ sldb_lengths_allocated_size = 0;
+ sldb_lengths_count = 0;
+ sldb_loaded = 0;
+}
+
 static int
 sid_configchanged (void) {
- int conf_hvsc_enable = deadbeef->conf_get_int ("hvsc_enable", 0);
+ conf_hvsc_enable = deadbeef->conf_get_int ("hvsc_enable", 0);
 int disable = !conf_hvsc_enable;
 if (disable != sldb_disable) {
 sldb_disable = disable;
 }
 
 // pick up new sldb filename in case it was changed
- if (sldb) {
- free (sldb);
- sldb = NULL;
- sldb_loaded = 0;
- }
-
- if (chip_voices != deadbeef->conf_get_int ("chip.voices", 0xff)) {
- chip_voices_changed = 1;
- }
+ sldb_free ();
 
 return 0;
 }
@@ -596,16 +626,13 @@
 
 int
 csid_start (void) {
+ sid_configchanged ();
 return 0;
 }
 
 int
 csid_stop (void) {
- if (sldb) {
- free (sldb);
- sldb = NULL;
- }
- sldb_loaded = 0;
+ sldb_free();
 return 0;
 }

deadbeef-0.6.2.tar.bz2/plugins/sid/csid.h -> deadbeef-1.9.6.tar.bz2/plugins/sid/csid.h Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/plugin.c -> deadbeef-1.9.6.tar.bz2/plugins/sid/plugin.c Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/builders/resid-builder/src/resid-emu.h -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/builders/resid-builder/src/resid-emu.h Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/builders/resid-builder/src/resid.cpp -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/builders/resid-builder/src/resid.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/libsidplay/include/sidplay/event.h -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/libsidplay/include/sidplay/event.h Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/event.cpp -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/event.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.h -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.h Changed

@@ -76,13 +76,16 @@
 class MOS6510: public C64Environment, public Event
 {
 private:
-    jmp_buf jmp_env;
     // External signals
     bool aec; /* Address Controller, blocks all */
     bool rdy; /* Bus Access, blocks reads */
     bool m_blocked;
+#if 0
+	jmp_buf jmp_env;
+#endif
 
 protected:
+    int m_stealCycleDelta;
     bool dodump;
     EventContext &eventContext;
    
@@ -295,16 +298,19 @@
 {
     int_least8_t i = cycleCount++;
 
-// C++ exception version
-//    try {
-//        (this->*procCyclei) ();
-//    } catch (int_least8_t delta) {
-//        cycleCount += delta;
-//        m_blocked   = true;
-//        eventContext.cancel (this);
-//    }
+#if 0
+	// C++ exception version
+    try {
+        (this->*procCyclei) ();
+    } catch (int_least8_t delta) {
+        cycleCount += delta;
+        m_blocked   = true;
+        eventContext.cancel (this);
+    }
+#endif
 
-    // longjmp version
+#if 0
+	// longjmp version
     int_least8_t delta = setjmp (jmp_env);
     if (delta == 0) {
         (this->*procCyclei) ();
@@ -314,6 +320,22 @@
         m_blocked   = true;
         eventContext.cancel (this);
     }
+#endif
+
+#if 1
+    if (!rdy || !aec) {
+        m_stealCycleDelta = -1;
+    }
+    else {
+        (this->*procCyclei) ();
+    }
+    if (m_stealCycleDelta != 0) {
+        cycleCount += m_stealCycleDelta;
+        m_stealCycleDelta = 0;
+        m_blocked   = true;
+        eventContext.cancel (this);
+    }
+#endif
 }
 
 inline void MOS6510::event (void)

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.i -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/mos6510c.i Changed

@@ -169,15 +169,32 @@
 #define getFlagZ()    (Register_z_Flag == 0)
 #define getFlagC()    (Register_c_Flag != 0)
 
+#if 0
 // c++ exception version
-//#define stealCycle() \
-//    interrupts.delay++; \
-//    throw((int_least8_t) -1);
+#define stealCycle() \
+    interrupts.delay++; \
+    throw((int_least8_t) -1);
+#define ReturnIfCycleStolen()
+#endif
 
+#if 0
 // longjmp version
 #define stealCycle() \
     interrupts.delay++; \
     longjmp (jmp_env, -1);
+#define ReturnIfCycleStolen()
+#endif
+
+#if 1
+// global variable version
+#define stealCycle() \
+    interrupts.delay++; \
+    m_stealCycleDelta = -1; \
+    return;
+
+#define ReturnIfCycleStolen()\
+	{ if (m_stealCycleDelta != 0) return; }
+#endif
 
 // Handle bus access signals
 void MOS6510::aecSignal (bool state)
@@ -435,6 +452,7 @@
 void MOS6510::IRQRequest (void)
 {
     PushSR   (false);
+	ReturnIfCycleStolen();
     setFlagI (true);
     interrupts.irqRequest = false;
 }
@@ -581,6 +599,7 @@
     uint8_t page;
     // Rev 1.05 (saw) - Call base Function
     FetchHighAddr ();
+	ReturnIfCycleStolen ();
     page = endian_16hi8 (Cycle_EffectiveAddress);
     Cycle_EffectiveAddress += Register_X;
 
@@ -595,6 +614,7 @@
 void MOS6510::FetchHighAddrX2 (void)
 {
     FetchHighAddr ();
+	ReturnIfCycleStolen();
     Cycle_EffectiveAddress += Register_X;
 }
 
@@ -1640,7 +1660,9 @@
 //MOS6510::MOS6510 (model_t _model, const char *id)
 MOS6510::MOS6510 (EventContext *context)
 :eventContext(*context),
- Event("CPU")
+ Event("CPU"),
+ m_stealCycleDelta (0)
+
 {
     struct ProcessorOperations *instr;
     uint8_t legalMode  = true;

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.i -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/mos6510/cycle_based/sid6510c.i Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/player.cpp -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/player.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/player.h -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/player.h Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTune.cpp -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTune.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTuneCfg.h -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/sidtune/SidTuneCfg.h Changed

deadbeef-0.6.2.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp -> deadbeef-1.9.6.tar.bz2/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.cpp Changed

deadbeef-0.6.2.tar.bz2/plugins/sndfile/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/sndfile/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/sndfile/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/sndfile/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/sndfile/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/sndfile/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/sndfile/sndfile.c -> deadbeef-1.9.6.tar.bz2/plugins/sndfile/sndfile.c Changed

@@ -1,6 +1,6 @@
 /*
 libsndfile plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2014 Oleksiy 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
@@ -26,30 +26,33 @@
 #include <sndfile.h>
 #include <math.h>
 #include <stdlib.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.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,...)
+#define trace(...) { deadbeef->log_detailed (&plugin.decoder.plugin, 0, __VA_ARGS__); }
 
-static DB_decoder_t plugin;
+static ddb_decoder2_t plugin;
 static DB_functions_t *deadbeef;
 
 typedef struct {
 DB_fileinfo_t info;
 SNDFILE *ctx;
 DB_FILE *file;
- int startsample;
- int endsample;
- int currentsample;
+ int64_t startsample;
+ int64_t endsample;
+ int64_t currentsample;
 int bitrate;
 int sf_format;
 int read_as_short;
 int sf_need_endswap;
 } sndfile_info_t;
 
+static int
+sndfile_seek_sample64 (DB_fileinfo_t *_info, int64_t sample);
+
 // vfs wrapper for sf
 static sf_count_t
 sf_vfs_get_filelen (void *user_data) {
@@ -94,12 +97,12 @@
 
 static DB_fileinfo_t *
 sndfile_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (sndfile_info_t));
- memset (_info, 0, sizeof (sndfile_info_t));
- return _info;
+ sndfile_info_t *info = calloc (1, sizeof (sndfile_info_t));
+ return &info->info;
 }
 
 
+#if 0
 // taken from libsndfile
 #define ARRAY_LEN(x) ((int) (sizeof (x) / sizeof ((x) 0)))
 /* This stores which bit in dwChannelMask maps to which channel */
@@ -155,33 +158,37 @@
 
 return mask ;
 } /* wavex_gen_channel_mask */
-
+#endif
 
 static int
 sndfile_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
 sndfile_info_t *info = (sndfile_info_t*)_info;
 
- SF_INFO inf;
+ SF_INFO inf = {0};
 deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
 if (!fp) {
- trace ("sndfile: failed to open %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ trace ("sndfile: failed to open %s\n", uri);
 return -1;
 }
- int fsize = deadbeef->fgetlength (fp);
+ int64_t fsize = deadbeef->fgetlength (fp);
 
 info->file = fp;
+
 info->ctx = sf_open_virtual (&vfs, SFM_READ, &inf, info);
 if (!info->ctx) {
 trace ("sndfile: %s: unsupported file format\n");
+ deadbeef->fclose (fp);
+ info->file = NULL;
 return -1;
 }
- _info->plugin = &plugin;
- info->sf_format = inf.format&0x000f;
+ _info->plugin = &plugin.decoder;
+ info->sf_format = inf.format&SF_FORMAT_SUBMASK;
 info->sf_need_endswap = sf_command (info->ctx, SFC_RAW_DATA_NEEDS_ENDSWAP, NULL, 0);
 
- switch (inf.format&0x000f) {
+ switch (inf.format&SF_FORMAT_SUBMASK) {
 case SF_FORMAT_PCM_S8:
 case SF_FORMAT_PCM_U8:
 _info->fmt.bps = 8;
@@ -200,7 +207,7 @@
 default:
 info->read_as_short = 1;
 _info->fmt.bps = 16;
- trace ("sndfile unidentified input format: 0x%X\n", inf.format&0x000f);
+ trace ("sndfile unidentified input format: 0x%X\n", inf.format&SF_FORMAT_SUBMASK);
 break;
 }
 
@@ -225,10 +232,11 @@
 }
 
 _info->readpos = 0;
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
- if (plugin.seek_sample (_info, 0) < 0) {
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample (it);
+ info->endsample = endsample;
+ if (sndfile_seek_sample64 (_info, 0) < 0) {
 return -1;
 }
 }
@@ -238,7 +246,7 @@
 }
 // hack bitrate
 
- int totalsamples = inf.frames;
+ int64_t totalsamples = inf.frames;
 float sec = (float)totalsamples / inf.samplerate;
 if (sec > 0) {
 info->bitrate = fsize / sec * 8 / 1000;
@@ -252,6 +260,8 @@
 
 static void
 sndfile_free (DB_fileinfo_t *_info) {
+ if (!_info)
+ return ;
 sndfile_info_t *info = (sndfile_info_t*)_info;
 if (info->ctx) {
 sf_close (info->ctx);
@@ -259,7 +269,7 @@
 if (info->file) {
 deadbeef->fclose (info->file);
 }
- memset (&info, 0, sizeof (info));
+ free (_info);
 }
 
 static int
@@ -267,14 +277,14 @@
 sndfile_info_t *info = (sndfile_info_t*)_info;
 int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
 if (size / samplesize + info->currentsample > info->endsample) {
- size = (info->endsample - info->currentsample + 1) * samplesize;
+ size = (int)((info->endsample - info->currentsample + 1) * samplesize);
 trace ("sndfile: size truncated to %d bytes, cursample=%d, endsample=%d\n", size, info->currentsample, info->endsample);
 if (size <= 0) {
 return 0;
 }
 }
 
- int n = 0;
+ int64_t n = 0;
 if (info->read_as_short) {
 n = sf_readf_short(info->ctx, (short *)bytes, size/samplesize);
 }
@@ -299,7 +309,7 @@
 break;
 case 24:
 {
- uint8_t *data = bytes;
+ uint8_t *data = (uint8_t *)bytes;
 for (int i = 0; i < n/3; i++, data += 3) {
 uint8_t temp = data0;
 data0 = data2;
@@ -322,7 +332,7 @@
 
 info->currentsample += n;
 
- size = n * samplesize;
+ size = (int)(n * samplesize);
 _info->readpos = (float)(info->currentsample-info->startsample)/_info->fmt.samplerate;
 if (info->bitrate > 0) {
 deadbeef->streamer_set_bitrate (info->bitrate);
@@ -331,9 +341,9 @@
 }
 
 static int
-sndfile_seek_sample (DB_fileinfo_t *_info, int sample) {
+sndfile_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
 sndfile_info_t *info = (sndfile_info_t*)_info;
- int ret = sf_seek (info->ctx, sample + info->startsample, SEEK_SET);
+ int64_t ret = sf_seek (info->ctx, sample + info->startsample, SEEK_SET);
 if (ret < 0) {
 return -1;
 }
@@ -343,49 +353,71 @@
 }
 
 static int
+sndfile_seek_sample (DB_fileinfo_t *_info, int sample) {
+ return sndfile_seek_sample64(_info, sample);
+}
+
+static int
 sndfile_seek (DB_fileinfo_t *_info, float sec) {
- return sndfile_seek_sample (_info, sec * _info->fmt.samplerate);
+ return sndfile_seek_sample64 (_info, (int64_t)((double)sec * (int64_t)_info->fmt.samplerate));
 }
 
+static int
+_sndfile_ctx_read_tags (DB_playItem_t *it, SNDFILE *ctx);
+
 static DB_playItem_t *
 sndfile_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
 trace ("adding file %s\n", fname);
- SF_INFO inf;
- sndfile_info_t info;
- memset (&info, 0, sizeof (info));
- info.file = deadbeef->fopen (fname);
- if (!info.file) {
+ SF_INFO inf = {0};
+ sndfile_info_t info = {0};
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
 trace ("sndfile: failed to open %s\n", fname);
 return NULL;
 }
- int64_t fsize = deadbeef->fgetlength (info.file);
- trace ("file: %p, size: %lld\n", info.file, deadbeef->fgetlength (info.file));
+
+ info.file = fp;
+
+ int64_t fsize = deadbeef->fgetlength(fp);
+ trace ("file: %p, size: %lld\n", fp, fsize);
+
 trace ("calling sf_open_virtual\n");
 info.ctx = sf_open_virtual (&vfs, SFM_READ, &inf, &info);
 if (!info.ctx) {
- trace ("sndfile: sf_open failed\n");
- deadbeef->fclose (info.file);
+ trace ("sndfile: sf_open failed for %s\n", fname);
+ deadbeef->fclose (fp);
 return NULL;
 }
+
+ if (inf.samplerate == 0) {
+ trace ("sndfile: invalid samplerate 0 in file %s\n", fname);
+ deadbeef->fclose (fp);
+ return NULL;
+ }
+
 trace ("calling sf_open_virtual ok\n");
- int totalsamples = inf.frames;
+ int64_t totalsamples = inf.frames;
 int samplerate = inf.samplerate;
- sf_close (info.ctx);
- deadbeef->fclose (info.file);
 
 float duration = (float)totalsamples / samplerate;
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
 deadbeef->pl_add_meta (it, ":FILETYPE", "wav");
 deadbeef->plt_set_item_duration (plt, it, duration);
 
 trace ("sndfile: totalsamples=%d, samplerate=%d, duration=%f\n", totalsamples, samplerate, duration);
 
 char s100;
- snprintf (s, sizeof (s), "%lld", fsize);
+ snprintf (s, sizeof (s), "%lld", (long long)fsize);
 deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
 
 int bps = -1;
- switch (inf.format&0x000f) {
+ switch (inf.format&SF_FORMAT_SUBMASK) {
+ case SF_FORMAT_IMA_ADPCM:
+ case SF_FORMAT_MS_ADPCM:
+ bps = 4;
+ break;
+ case SF_FORMAT_ALAW:
+ case SF_FORMAT_ULAW:
 case SF_FORMAT_PCM_S8:
 case SF_FORMAT_PCM_U8:
 bps = 8;
@@ -413,13 +445,45 @@
 deadbeef->pl_add_meta (it, ":CHANNELS", s);
 snprintf (s, sizeof (s), "%d", samplerate);
 deadbeef->pl_add_meta (it, ":SAMPLERATE", s);
- int br = (int)roundf(fsize / duration * 8 / 1000);
- snprintf (s, sizeof (s), "%d", br);
- deadbeef->pl_add_meta (it, ":BITRATE", s);
+ if (duration > 0) {
+ int br = (int)roundf(fsize / duration * 8 / 1000);
+ snprintf (s, sizeof (s), "%d", br);
+ deadbeef->pl_add_meta (it, ":BITRATE", s);
+ }
 
 // sndfile subformats
+ int subformat_ids = {
+ SF_FORMAT_PCM_S8,
+ SF_FORMAT_PCM_16,
+ SF_FORMAT_PCM_24,
+ SF_FORMAT_PCM_32,
+ SF_FORMAT_PCM_U8,
+ SF_FORMAT_FLOAT,
+ SF_FORMAT_DOUBLE,
+ SF_FORMAT_ULAW,
+ SF_FORMAT_ALAW,
+ SF_FORMAT_IMA_ADPCM,
+ SF_FORMAT_MS_ADPCM,
+ SF_FORMAT_GSM610,
+ SF_FORMAT_VOX_ADPCM,
+ SF_FORMAT_G721_32,
+ SF_FORMAT_G723_24,
+ SF_FORMAT_G723_40,
+ SF_FORMAT_DWVW_12,
+ SF_FORMAT_DWVW_16,
+ SF_FORMAT_DWVW_24,
+ SF_FORMAT_DWVW_N,
+ SF_FORMAT_DPCM_8,
+ SF_FORMAT_DPCM_16,
+ SF_FORMAT_VORBIS,
+ SF_FORMAT_ALAC_16,
+ SF_FORMAT_ALAC_20,
+ SF_FORMAT_ALAC_24,
+ SF_FORMAT_ALAC_32,
+ -1
+ };
+
 const char *subformats = {
- "",
 "PCM_S8",
 "PCM_16",
 "PCM_24",
@@ -427,80 +491,114 @@
 "PCM_U8",
 "FLOAT",
 "DOUBLE",
- "",
- "",
 "ULAW",
 "ALAW",
 "IMA_ADPCM",
 "MS_ADPCM",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
 "GSM610",
 "VOX_ADPCM",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
 "G721_32",
 "G723_24",
 "G723_40",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
 "DWVW_12",
 "DWVW_16",
 "DWVW_24",
 "DWVW_N",
- "",
- "",
- "",
- "",
- "",
- "",
 "DPCM_8",
 "DPCM_16",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
 "VORBIS",
+ "ALAC_16",
+ "ALAC_20",
+ "ALAC_24",
+ "ALAC_32",
 };
 
- if (inf.format&0x000f <= SF_FORMAT_VORBIS) {
- deadbeef->pl_add_meta (it, ":SF_FORMAT", subformatsinf.format&0x000f);
+ for (int i = 0; subformat_idsi != -1; i++) {
+ if ((inf.format&SF_FORMAT_SUBMASK) == subformat_idsi) {
+ deadbeef->pl_add_meta (it, ":SF_FORMAT", subformatsi);
+ break;
+ }
 }
 
- DB_playItem_t *cue_after = deadbeef->plt_insert_cue (plt, after, it, totalsamples, samplerate);
- if (cue_after) {
+ DB_playItem_t *cue = deadbeef->plt_process_cue (plt, after, it, totalsamples, samplerate);
+ if (cue) {
 deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue_after);
- return cue_after;
+ sf_close (info.ctx);
+ deadbeef->fclose (fp);
+ return cue;
 }
 
 deadbeef->pl_add_meta (it, "title", NULL);
+
+ _sndfile_ctx_read_tags (it, info.ctx);
+ sf_close (info.ctx);
+ deadbeef->fclose (fp);
+
 after = deadbeef->plt_insert_item (plt, after, it);
 deadbeef->pl_item_unref (it);
 
 return after;
 }
 
+#define ARRAY_LEN(x) ((int) (sizeof (x) / sizeof ((x) 0)))
+
+static const struct metamap_s {
+ int str_type;
+ const char* meta_name;
+} metamap_items = {
+ { SF_STR_TITLE, "title" },
+ { SF_STR_COPYRIGHT, "copyright" } ,
+ { SF_STR_SOFTWARE, "encoder" },
+ { SF_STR_ARTIST, "artist" },
+ { SF_STR_COMMENT, "comment" },
+ { SF_STR_DATE, "year" },
+ { SF_STR_ALBUM, "album" },
+ { SF_STR_TRACKNUMBER, "track" },
+ { SF_STR_GENRE, "genre" },
+};
+
+static int
+sndfile_read_metadata (DB_playItem_t *it) {
+ DB_fileinfo_t* info = sndfile_open (0);
+ int res = sndfile_init (info, it);
+ if (res) {
+ sndfile_free (info);
+ return -1;
+ }
+ SNDFILE *ctx = ((sndfile_info_t*)info)->ctx;
+ _sndfile_ctx_read_tags (it, ctx);
+
+ sndfile_free (info);
+ return 0;
+}
+
+static int
+_sndfile_ctx_read_tags (DB_playItem_t *it, SNDFILE *ctx)
+{
+ int i;
+ for (i = 0; i < ARRAY_LEN(metamap_items); i++) {
+ const struct metamap_s *kv = &metamap_itemsi;
+ const char *meta_str = sf_get_string (ctx, kv->str_type);
+ if (!meta_str)
+ continue ;
+ const char *charset = deadbeef->junk_detect_charset (meta_str);
+ if (charset) {
+ // recode non-UTF-8 metadata string.
+ size_t l = strlen (meta_str);
+ char *recbuf = malloc (l * 4 + 1);
+ int res = deadbeef->junk_recode (meta_str, (int)l, recbuf, (int)(l * 4 + 1), charset);
+ if (res >= 0) {
+ deadbeef->pl_add_meta (it, kv->meta_name, recbuf);
+ }
+ free (recbuf);
+ }
+ else {
+ deadbeef->pl_add_meta (it, kv->meta_name, meta_str);
+ }
+ }
+ return 0;
+}
+
 #define DEFAULT_EXTS "wav;aif;aiff;snd;au;paf;svx;nist;voc;ircam;w64;mat4;mat5;pvf;xi;htk;sds;avr;wavex;sd2;caf;wve"
 
 #define EXT_MAX 100
@@ -546,6 +644,12 @@
 switch (id) {
 case DB_EV_CONFIGCHANGED:
 sndfile_init_exts ();
+ if (deadbeef->conf_get_int ("sndfile.trace", 0)) {
+ plugin.decoder.plugin.flags |= DDB_PLUGIN_FLAG_LOGGING;
+ }
+ else {
+ plugin.decoder.plugin.flags &= ~DDB_PLUGIN_FLAG_LOGGING;
+ }
 break;
 }
 return 0;
@@ -568,22 +672,23 @@
 
 static const char settings_dlg =
 "property \"File Extensions (separate with ';')\" entry sndfile.extensions \"" DEFAULT_EXTS "\";\n"
+ "property \"Enable logging\" checkbox sndfile.trace 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 = "sndfile",
- .plugin.name = "WAV/PCM player",
- .plugin.descr = "wav/aiff player using libsndfile",
- .plugin.copyright = 
+static ddb_decoder2_t plugin = {
+ .decoder.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .decoder.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .decoder.plugin.version_major = 1,
+ .decoder.plugin.version_minor = 0,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.id = "sndfile",
+ .decoder.plugin.name = "WAV/PCM player",
+ .decoder.plugin.descr = "wav/aiff player using libsndfile",
+ .decoder.plugin.copyright =
 "libsndfile plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2009-2014 Oleksiy 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"
@@ -599,19 +704,21 @@
 "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",
- .open = sndfile_open,
- .init = sndfile_init,
- .free = sndfile_free,
- .read = sndfile_read,
- .seek = sndfile_seek,
- .seek_sample = sndfile_seek_sample,
- .insert = sndfile_insert,
- .exts = (const char **)exts,
- .plugin.start = sndfile_start,
- .plugin.stop = sndfile_stop,
- .plugin.configdialog = settings_dlg,
- .plugin.message = sndfile_message,
+ .decoder.plugin.website = "http://deadbeef.sf.net",
+ .decoder.open = sndfile_open,
+ .decoder.init = sndfile_init,
+ .decoder.free = sndfile_free,
+ .decoder.read = sndfile_read,
+ .decoder.seek = sndfile_seek,
+ .decoder.seek_sample = sndfile_seek_sample,
+ .decoder.insert = sndfile_insert,
+ .decoder.read_metadata = sndfile_read_metadata,
+ .decoder.exts = (const char **)exts,
+ .decoder.plugin.start = sndfile_start,
+ .decoder.plugin.stop = sndfile_stop,
+ .decoder.plugin.configdialog = settings_dlg,
+ .decoder.plugin.message = sndfile_message,
+ .seek_sample64 = sndfile_seek_sample64,
 };
 
 DB_plugin_t *

deadbeef-1.9.6.tar.bz2/plugins/soundtouch Added

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/Makefile.am Added

@@ -0,0 +1,50 @@
+if HAVE_SOUNDTOUCH
+soundtouchpath=@top_srcdir@/plugins/soundtouch/soundtouch
+
+pkglib_LTLIBRARIES = ddb_soundtouch.la
+
+ddb_soundtouch_la_CFLAGS = $(CFLAGS) -std=c99 -I$(soundtouchpath)/include -I$(soundtouchpath)/source/soundtouch -I@top_srcdir@/include -fPIC
+ddb_soundtouch_la_LDFLAGS = -module -avoid-version $(NOCPPLIB) -lm
+
+ddb_soundtouch_la_CXXFLAGS = $(CXXFLAGS) -I$(soundtouchpath)/include -I$(soundtouchpath)/source/soundtouch -I@top_srcdir@/include
+if HAVE_SSE2
+ddb_soundtouch_la_CXXFLAGS += -msse2
+endif
+
+ddb_soundtouch_la_SOURCES = \
+	plugin.c\
+	st.cpp\
+	st.h\
+    soundtouch/include/BPMDetect.h\
+    soundtouch/include/FIFOSampleBuffer.h\
+    soundtouch/include/FIFOSamplePipe.h\
+    soundtouch/include/STTypes.h\
+    soundtouch/include/SoundTouch.h\
+    soundtouch/include/soundtouch_config.h\
+    soundtouch/source/SoundTouch/AAFilter.cpp\
+    soundtouch/source/SoundTouch/AAFilter.h\
+    soundtouch/source/SoundTouch/BPMDetect.cpp\
+    soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp\
+    soundtouch/source/SoundTouch/FIRFilter.cpp\
+    soundtouch/source/SoundTouch/FIRFilter.h\
+    soundtouch/source/SoundTouch/InterpolateCubic.cpp\
+    soundtouch/source/SoundTouch/InterpolateCubic.h\
+    soundtouch/source/SoundTouch/InterpolateLinear.cpp\
+    soundtouch/source/SoundTouch/InterpolateLinear.h\
+    soundtouch/source/SoundTouch/InterpolateShannon.cpp\
+    soundtouch/source/SoundTouch/InterpolateShannon.h\
+    soundtouch/source/SoundTouch/PeakFinder.cpp\
+    soundtouch/source/SoundTouch/PeakFinder.h\
+    soundtouch/source/SoundTouch/RateTransposer.cpp\
+    soundtouch/source/SoundTouch/RateTransposer.h\
+    soundtouch/source/SoundTouch/SoundTouch.cpp\
+    soundtouch/source/SoundTouch/SoundTouch.sln\
+    soundtouch/source/SoundTouch/SoundTouch.vcxproj\
+    soundtouch/source/SoundTouch/TDStretch.cpp\
+    soundtouch/source/SoundTouch/TDStretch.h\
+    soundtouch/source/SoundTouch/cpu_detect.h\
+    soundtouch/source/SoundTouch/cpu_detect_x86.cpp\
+    soundtouch/source/SoundTouch/mmx_optimized.cpp\
+    soundtouch/source/SoundTouch/sse_optimized.cpp
+
+endif

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/Makefile.in Added

@@ -0,0 +1,973 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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@
+@HAVE_SOUNDTOUCH_TRUE@@HAVE_SSE2_TRUE@am__append_1 = -msse2
+subdir = plugins/soundtouch
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+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, filesdir }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ddb_soundtouch_la_LIBADD =
+am__ddb_soundtouch_la_SOURCES_DIST = plugin.c st.cpp st.h \
+	soundtouch/include/BPMDetect.h \
+	soundtouch/include/FIFOSampleBuffer.h \
+	soundtouch/include/FIFOSamplePipe.h \
+	soundtouch/include/STTypes.h soundtouch/include/SoundTouch.h \
+	soundtouch/include/soundtouch_config.h \
+	soundtouch/source/SoundTouch/AAFilter.cpp \
+	soundtouch/source/SoundTouch/AAFilter.h \
+	soundtouch/source/SoundTouch/BPMDetect.cpp \
+	soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp \
+	soundtouch/source/SoundTouch/FIRFilter.cpp \
+	soundtouch/source/SoundTouch/FIRFilter.h \
+	soundtouch/source/SoundTouch/InterpolateCubic.cpp \
+	soundtouch/source/SoundTouch/InterpolateCubic.h \
+	soundtouch/source/SoundTouch/InterpolateLinear.cpp \
+	soundtouch/source/SoundTouch/InterpolateLinear.h \
+	soundtouch/source/SoundTouch/InterpolateShannon.cpp \
+	soundtouch/source/SoundTouch/InterpolateShannon.h \
+	soundtouch/source/SoundTouch/PeakFinder.cpp \
+	soundtouch/source/SoundTouch/PeakFinder.h \
+	soundtouch/source/SoundTouch/RateTransposer.cpp \
+	soundtouch/source/SoundTouch/RateTransposer.h \
+	soundtouch/source/SoundTouch/SoundTouch.cpp \
+	soundtouch/source/SoundTouch/SoundTouch.sln \
+	soundtouch/source/SoundTouch/SoundTouch.vcxproj \
+	soundtouch/source/SoundTouch/TDStretch.cpp \
+	soundtouch/source/SoundTouch/TDStretch.h \
+	soundtouch/source/SoundTouch/cpu_detect.h \
+	soundtouch/source/SoundTouch/cpu_detect_x86.cpp \
+	soundtouch/source/SoundTouch/mmx_optimized.cpp \
+	soundtouch/source/SoundTouch/sse_optimized.cpp
+am__dirstamp = $(am__leading_dot)dirstamp
+@HAVE_SOUNDTOUCH_TRUE@am_ddb_soundtouch_la_OBJECTS = \
+@HAVE_SOUNDTOUCH_TRUE@	ddb_soundtouch_la-plugin.lo \
+@HAVE_SOUNDTOUCH_TRUE@	ddb_soundtouch_la-st.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-AAFilter.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-BPMDetect.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-FIFOSampleBuffer.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-FIRFilter.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateCubic.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateLinear.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateShannon.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-PeakFinder.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-RateTransposer.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-SoundTouch.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-TDStretch.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-cpu_detect_x86.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-mmx_optimized.lo \
+@HAVE_SOUNDTOUCH_TRUE@	soundtouch/source/SoundTouch/ddb_soundtouch_la-sse_optimized.lo
+ddb_soundtouch_la_OBJECTS = $(am_ddb_soundtouch_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+ddb_soundtouch_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+	$(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) \
+	$(ddb_soundtouch_la_LDFLAGS) $(LDFLAGS) -o $@
+@HAVE_SOUNDTOUCH_TRUE@am_ddb_soundtouch_la_rpath = -rpath $(pkglibdir)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(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_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+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_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(ddb_soundtouch_la_SOURCES)
+DIST_SOURCES = $(am__ddb_soundtouch_la_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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_SOUNDTOUCH_TRUE@soundtouchpath = @top_srcdir@/plugins/soundtouch/soundtouch
+@HAVE_SOUNDTOUCH_TRUE@pkglib_LTLIBRARIES = ddb_soundtouch.la
+@HAVE_SOUNDTOUCH_TRUE@ddb_soundtouch_la_CFLAGS = $(CFLAGS) -std=c99 -I$(soundtouchpath)/include -I$(soundtouchpath)/source/soundtouch -I@top_srcdir@/include -fPIC
+@HAVE_SOUNDTOUCH_TRUE@ddb_soundtouch_la_LDFLAGS = -module -avoid-version $(NOCPPLIB) -lm
+@HAVE_SOUNDTOUCH_TRUE@ddb_soundtouch_la_CXXFLAGS = $(CXXFLAGS) \
+@HAVE_SOUNDTOUCH_TRUE@	-I$(soundtouchpath)/include \
+@HAVE_SOUNDTOUCH_TRUE@	-I$(soundtouchpath)/source/soundtouch \
+@HAVE_SOUNDTOUCH_TRUE@	-I@top_srcdir@/include $(am__append_1)
+@HAVE_SOUNDTOUCH_TRUE@ddb_soundtouch_la_SOURCES = \
+@HAVE_SOUNDTOUCH_TRUE@	plugin.c\
+@HAVE_SOUNDTOUCH_TRUE@	st.cpp\
+@HAVE_SOUNDTOUCH_TRUE@	st.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/include/BPMDetect.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/include/FIFOSampleBuffer.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/include/FIFOSamplePipe.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/include/STTypes.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/include/SoundTouch.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/include/soundtouch_config.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/AAFilter.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/AAFilter.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/BPMDetect.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/FIRFilter.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/FIRFilter.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/InterpolateCubic.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/InterpolateCubic.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/InterpolateLinear.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/InterpolateLinear.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/InterpolateShannon.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/InterpolateShannon.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/PeakFinder.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/PeakFinder.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/RateTransposer.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/RateTransposer.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/SoundTouch.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/SoundTouch.sln\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/SoundTouch.vcxproj\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/TDStretch.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/TDStretch.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/cpu_detect.h\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/cpu_detect_x86.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/mmx_optimized.cpp\
+@HAVE_SOUNDTOUCH_TRUE@ soundtouch/source/SoundTouch/sse_optimized.cpp
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .cpp .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 --ignore-deps plugins/soundtouch/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps plugins/soundtouch/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)
+	@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 " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
+	 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)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+soundtouch/source/SoundTouch/$(am__dirstamp):
+	@$(MKDIR_P) soundtouch/source/SoundTouch
+	@: > soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-AAFilter.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-BPMDetect.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-FIFOSampleBuffer.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-FIRFilter.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateCubic.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateLinear.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateShannon.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-PeakFinder.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-RateTransposer.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-SoundTouch.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-TDStretch.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-cpu_detect_x86.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-mmx_optimized.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+soundtouch/source/SoundTouch/ddb_soundtouch_la-sse_optimized.lo: \
+	soundtouch/source/SoundTouch/$(am__dirstamp)
+
+ddb_soundtouch.la: $(ddb_soundtouch_la_OBJECTS) $(ddb_soundtouch_la_DEPENDENCIES) $(EXTRA_ddb_soundtouch_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(ddb_soundtouch_la_LINK) $(am_ddb_soundtouch_la_rpath) $(ddb_soundtouch_la_OBJECTS) $(ddb_soundtouch_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f soundtouch/source/SoundTouch/*.$(OBJEXT)
+	-rm -f soundtouch/source/SoundTouch/*.lo
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+ddb_soundtouch_la-plugin.lo: plugin.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CFLAGS) $(CFLAGS) -c -o ddb_soundtouch_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
+
+.cpp.o:
+	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+	$(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $<
+
+ddb_soundtouch_la-st.lo: st.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o ddb_soundtouch_la-st.lo `test -f 'st.cpp' || echo '$(srcdir)/'`st.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-AAFilter.lo: soundtouch/source/SoundTouch/AAFilter.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-AAFilter.lo `test -f 'soundtouch/source/SoundTouch/AAFilter.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/AAFilter.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-BPMDetect.lo: soundtouch/source/SoundTouch/BPMDetect.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-BPMDetect.lo `test -f 'soundtouch/source/SoundTouch/BPMDetect.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/BPMDetect.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-FIFOSampleBuffer.lo: soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-FIFOSampleBuffer.lo `test -f 'soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-FIRFilter.lo: soundtouch/source/SoundTouch/FIRFilter.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-FIRFilter.lo `test -f 'soundtouch/source/SoundTouch/FIRFilter.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/FIRFilter.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateCubic.lo: soundtouch/source/SoundTouch/InterpolateCubic.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateCubic.lo `test -f 'soundtouch/source/SoundTouch/InterpolateCubic.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/InterpolateCubic.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateLinear.lo: soundtouch/source/SoundTouch/InterpolateLinear.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateLinear.lo `test -f 'soundtouch/source/SoundTouch/InterpolateLinear.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/InterpolateLinear.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateShannon.lo: soundtouch/source/SoundTouch/InterpolateShannon.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-InterpolateShannon.lo `test -f 'soundtouch/source/SoundTouch/InterpolateShannon.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/InterpolateShannon.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-PeakFinder.lo: soundtouch/source/SoundTouch/PeakFinder.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-PeakFinder.lo `test -f 'soundtouch/source/SoundTouch/PeakFinder.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/PeakFinder.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-RateTransposer.lo: soundtouch/source/SoundTouch/RateTransposer.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-RateTransposer.lo `test -f 'soundtouch/source/SoundTouch/RateTransposer.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/RateTransposer.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-SoundTouch.lo: soundtouch/source/SoundTouch/SoundTouch.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-SoundTouch.lo `test -f 'soundtouch/source/SoundTouch/SoundTouch.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/SoundTouch.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-TDStretch.lo: soundtouch/source/SoundTouch/TDStretch.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-TDStretch.lo `test -f 'soundtouch/source/SoundTouch/TDStretch.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/TDStretch.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-cpu_detect_x86.lo: soundtouch/source/SoundTouch/cpu_detect_x86.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-cpu_detect_x86.lo `test -f 'soundtouch/source/SoundTouch/cpu_detect_x86.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/cpu_detect_x86.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-mmx_optimized.lo: soundtouch/source/SoundTouch/mmx_optimized.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-mmx_optimized.lo `test -f 'soundtouch/source/SoundTouch/mmx_optimized.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/mmx_optimized.cpp
+
+soundtouch/source/SoundTouch/ddb_soundtouch_la-sse_optimized.lo: soundtouch/source/SoundTouch/sse_optimized.cpp
+	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ddb_soundtouch_la_CXXFLAGS) $(CXXFLAGS) -c -o soundtouch/source/SoundTouch/ddb_soundtouch_la-sse_optimized.lo `test -f 'soundtouch/source/SoundTouch/sse_optimized.cpp' || echo '$(srcdir)/'`soundtouch/source/SoundTouch/sse_optimized.cpp
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf soundtouch/source/SoundTouch/.libs soundtouch/source/SoundTouch/_libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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)
+	-rm -f soundtouch/source/SoundTouch/$(am__dirstamp)
+
+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 -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 -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 TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \
+	ctags-am 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 tags-am uninstall uninstall-am \
+	uninstall-pkglibLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/plugins/soundtouch/plugin.c Added

@@ -0,0 +1,277 @@
+/*
+ DeaDBeeF - The Ultimate Music Player
+ Copyright (C) 2009-2013 Oleksiy 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/deadbeef.h>
+#include "st.h"
+
+enum {
+ ST_PARAM_TEMPO,
+ ST_PARAM_PITCH,
+ ST_PARAM_RATE,
+ ST_PARAM_USE_AA_FILTER,
+ ST_PARAM_AA_FILTER_LENGTH,
+ ST_PARAM_USE_QUICKSEEK,
+ ST_PARAM_SEQUENCE_MS,
+ ST_PARAM_SEEKWINDOW_MS,
+ ST_PARAM_COUNT
+};
+
+static DB_functions_t *deadbeef;
+static DB_dsp_t plugin;
+
+typedef struct {
+ ddb_dsp_context_t ctx;
+ void *st;
+ float tempo;
+ float pitch;
+ float rate;
+ int use_aa_filter;
+ int aa_filter_length;
+ int use_quickseek;
+ int sequence_ms;
+ int seekwindow_ms;
+ int changed;
+} ddb_soundtouch_t;
+
+ddb_dsp_context_t*
+st_open (void) {
+ ddb_soundtouch_t *st = malloc (sizeof (ddb_soundtouch_t));
+ DDB_INIT_DSP_CONTEXT (st,ddb_soundtouch_t,&plugin);
+ st->st = st_alloc ();
+ st->changed = 1;
+ st->tempo = 0;
+ st->rate = 0;
+ st->pitch = 0;
+ st->use_aa_filter = 0;
+ st->aa_filter_length = 32;
+ st->use_quickseek = 0;
+ st->sequence_ms = 82;
+ st->seekwindow_ms = 28;
+ return (ddb_dsp_context_t *)st;
+}
+
+void
+st_close (ddb_dsp_context_t *_src) {
+ ddb_soundtouch_t *st = (ddb_soundtouch_t *)_src;
+ if (st->st) {
+ st_free (st->st);
+ }
+ free (st);
+}
+
+void
+st_reset (ddb_dsp_context_t *_src) {
+ ddb_soundtouch_t *st = (ddb_soundtouch_t *)_src;
+ st_clear (st->st);
+}
+
+int
+st_process (ddb_dsp_context_t *_src, float *samples, int nframes, int maxframes, ddb_waveformat_t *fmt, float *ratio) {
+ ddb_soundtouch_t *st = (ddb_soundtouch_t *)_src;
+ if (st->changed) {
+ st_set_rate (st->st, 1);
+ st_set_rate_change (st->st, st->rate);
+ st_set_pitch_semi_tones (st->st, st->pitch);
+ st_set_tempo_change (st->st, st->tempo);
+ st_set_setting (st->st, SETTING_USE_AA_FILTER, st->use_aa_filter);
+ st_set_setting (st->st, SETTING_AA_FILTER_LENGTH, st->aa_filter_length &~ 7);
+ st_set_setting (st->st, SETTING_USE_QUICKSEEK, st->use_quickseek);
+ st_set_setting (st->st, SETTING_SEQUENCE_MS, st->sequence_ms);
+ st_set_setting (st->st, SETTING_SEEKWINDOW_MS, st->seekwindow_ms);
+ st->changed = 0;
+ }
+ *ratio = (1.f + 0.01f * st->tempo);
+
+ st_set_sample_rate (st->st, fmt->samplerate);
+ st_set_channels (st->st, fmt->channels);
+
+ st_put_samples (st->st, samples, nframes);
+ int nout = 0;
+ int n = 0;
+ do {
+ n = st_receive_samples (st->st, samples, maxframes);
+ maxframes -= n;
+ samples += n * fmt->channels;
+ nout += n;
+ } while (n != 0);
+
+ return nout;
+}
+
+const char *
+st_get_param_name (int p) {
+ switch (p) {
+ case ST_PARAM_TEMPO:
+ return "Tempo";
+ case ST_PARAM_PITCH:
+ return "Pitch";
+ case ST_PARAM_RATE:
+ return "Playback Rate";
+ case ST_PARAM_USE_AA_FILTER:
+ return "Use AA Filter";
+ case ST_PARAM_AA_FILTER_LENGTH:
+ return "AA Filter Length";
+ case ST_PARAM_USE_QUICKSEEK:
+ return "Use Quickseek";
+ case ST_PARAM_SEQUENCE_MS:
+ return "Time Stretch Sequence Length (ms)";
+ case ST_PARAM_SEEKWINDOW_MS:
+ return "Time Stretch Seek Window Length (ms)";
+ default:
+ fprintf (stderr, "st_param_name: invalid param index (%d)\n", p);
+ }
+ return NULL;
+}
+
+int
+st_num_params (void) {
+ return ST_PARAM_COUNT;
+}
+
+void
+st_set_param (ddb_dsp_context_t *ctx, int p, const char *val) {
+ ddb_soundtouch_t *st = (ddb_soundtouch_t *)ctx;
+ switch (p) {
+ case ST_PARAM_TEMPO:
+ st->tempo = atof (val);
+ st->changed = 1;
+ break;
+ case ST_PARAM_PITCH:
+ st->pitch = atof (val);
+ st->changed = 1;
+ break;
+ case ST_PARAM_RATE:
+ st->rate = atof (val);
+ st->changed = 1;
+ break;
+ case ST_PARAM_USE_AA_FILTER:
+ st->use_aa_filter = atoi (val);
+ st->changed = 1;
+ break;
+ case ST_PARAM_AA_FILTER_LENGTH:
+ st->aa_filter_length = atoi (val);
+ st->changed = 1;
+ break;
+ case ST_PARAM_USE_QUICKSEEK:
+ st->use_quickseek = atoi (val);
+ st->changed = 1;
+ break;
+ case ST_PARAM_SEQUENCE_MS:
+ st->sequence_ms = atoi (val);
+ st->changed = 1;
+ break;
+ case ST_PARAM_SEEKWINDOW_MS:
+ st->seekwindow_ms = atoi (val);
+ st->changed = 1;
+ break;
+ default:
+ fprintf (stderr, "st_param: invalid param index (%d)\n", p);
+ }
+}
+
+void
+st_get_param (ddb_dsp_context_t *ctx, int p, char *val, int sz) {
+ ddb_soundtouch_t *st = (ddb_soundtouch_t *)ctx;
+ switch (p) {
+ case ST_PARAM_TEMPO:
+ snprintf (val, sz, "%f", st->tempo);
+ break;
+ case ST_PARAM_PITCH:
+ snprintf (val, sz, "%f", st->pitch);
+ break;
+ case ST_PARAM_RATE:
+ snprintf (val, sz, "%f", st->rate);
+ break;
+ case ST_PARAM_USE_AA_FILTER:
+ snprintf (val, sz, "%d", st->use_aa_filter);
+ break;
+ case ST_PARAM_AA_FILTER_LENGTH:
+ snprintf (val, sz, "%d", st->aa_filter_length);
+ break;
+ case ST_PARAM_USE_QUICKSEEK:
+ snprintf (val, sz, "%d", st->use_quickseek);
+ break;
+ case ST_PARAM_SEQUENCE_MS:
+ snprintf (val, sz, "%d", st->sequence_ms);
+ break;
+ case ST_PARAM_SEEKWINDOW_MS:
+ snprintf (val, sz, "%d", st->seekwindow_ms);
+ break;
+ default:
+ fprintf (stderr, "st_get_param: invalid param index (%d)\n", p);
+ }
+}
+
+static const char settings_dlg =
+ "property \"Tempo Change (%)\" spinbtn-90,200,1 0 0;\n"
+ "property \"Pitch Change (semi-tones)\" spinbtn-24,24,0.0000001 1 0;\n"
+ "property \"Playback Rate Change (%)\" spinbtn-90,200,1 2 0;\n"
+ "property \"Use AA Filter\" checkbox 3 0;\n"
+ "property \"AA Filter Length\" spinbtn16,64,1 4 32;\n"
+ "property \"Use Quickseek\" checkbox 5 0;\n"
+ "property \"Time Stretch Sequence Length (ms)\" spinbtn10,50,1 6 10;\n"
+ "property \"Time Stretch Seek Window Length (ms)\" spinbtn10,50,1 7 28;\n"
+;
+
+static DB_dsp_t plugin = {
+ DDB_PLUGIN_SET_API_VERSION
+ .open = st_open,
+ .close = st_close,
+ .process = st_process,
+ .plugin.version_major = 0,
+ .plugin.version_minor = 1,
+ .plugin.type = DB_PLUGIN_DSP,
+ .plugin.id = "soundtouch",
+ .plugin.name = "Soundtouch",
+ .plugin.descr = "Tempo/Pitch/Rate changer using SoundTouch Library (http://www.surina.net/soundtouch)",
+ .plugin.copyright = 
+ "Copyright (C) 2009-2013 Oleksiy Yakovenko <waker@users.sourceforge.net>\n"
+ "\n"
+ "Uses SoundTouch Library 2.1.2, (C) Olli Parviainen"
+ "\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 = st_num_params,
+ .get_param_name = st_get_param_name,
+ .set_param = st_set_param,
+ .get_param = st_get_param,
+ .reset = st_reset,
+ .configdialog = settings_dlg,
+};
+
+DB_plugin_t *
+ddb_soundtouch_load (DB_functions_t *f) {
+ deadbeef = f;
+ return &plugin.plugin;
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch Added

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/include Added

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/include/BPMDetect.h Added

@@ -0,0 +1,205 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Beats-per-minute (BPM) detection routine.
+///
+/// The beat detection algorithm works as follows:
+/// - Use function 'inputSamples' to input a chunks of samples to the class for
+/// analysis. It's a good idea to enter a large sound file or stream in smallish
+/// chunks of around few kilosamples in order not to extinguish too much RAM memory.
+/// - Input sound data is decimated to approx 500 Hz to reduce calculation burden,
+/// which is basically ok as low (bass) frequencies mostly determine the beat rate.
+/// Simple averaging is used for anti-alias filtering because the resulting signal
+/// quality isn't of that high importance.
+/// - Decimated sound data is enveloped, i.e. the amplitude shape is detected by
+/// taking absolute value that's smoothed by sliding average. Signal levels that
+/// are below a couple of times the general RMS amplitude level are cut away to
+/// leave only notable peaks there.
+/// - Repeating sound patterns (e.g. beats) are detected by calculating short-term 
+/// autocorrelation function of the enveloped signal.
+/// - After whole sound data file has been analyzed as above, the bpm level is 
+/// detected by function 'getBpm' that finds the highest peak of the autocorrelation 
+/// function, calculates it's precise location and converts this reading to bpm's.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _BPMDetect_H_
+#define _BPMDetect_H_
+
+#include <vector>
+#include "STTypes.h"
+#include "FIFOSampleBuffer.h"
+
+namespace soundtouch
+{
+
+ /// Minimum allowed BPM rate. Used to restrict accepted result above a reasonable limit.
+ #define MIN_BPM 45
+
+ /// Maximum allowed BPM rate range. Used for calculating algorithm parametrs
+ #define MAX_BPM_RANGE 200
+
+ /// Maximum allowed BPM rate range. Used to restrict accepted result below a reasonable limit.
+ #define MAX_BPM_VALID 190
+
+////////////////////////////////////////////////////////////////////////////////
+
+ typedef struct
+ {
+ float pos;
+ float strength;
+ } BEAT;
+
+
+ class IIR2_filter
+ {
+ double coeffs5;
+ double prev5;
+
+ public:
+ IIR2_filter(const double *lpf_coeffs);
+ float update(float x);
+ };
+
+
+ /// Class for calculating BPM rate for audio data.
+ class BPMDetect
+ {
+ protected:
+ /// Auto-correlation accumulator bins.
+ float *xcorr;
+
+ /// Sample average counter.
+ int decimateCount;
+
+ /// Sample average accumulator for FIFO-like decimation.
+ soundtouch::LONG_SAMPLETYPE decimateSum;
+
+ /// Decimate sound by this coefficient to reach approx. 500 Hz.
+ int decimateBy;
+
+ /// Auto-correlation window length
+ int windowLen;
+
+ /// Number of channels (1 = mono, 2 = stereo)
+ int channels;
+
+ /// sample rate
+ int sampleRate;
+
+ /// Beginning of auto-correlation window: Autocorrelation isn't being updated for
+ /// the first these many correlation bins.
+ int windowStart;
+
+ /// window functions for data preconditioning
+ float *hamw;
+ float *hamw2;
+
+ // beat detection variables
+ int pos;
+ int peakPos;
+ int beatcorr_ringbuffpos;
+ int init_scaler;
+ float peakVal;
+ float *beatcorr_ringbuff;
+
+ /// FIFO-buffer for decimated processing samples.
+ soundtouch::FIFOSampleBuffer *buffer;
+
+ /// Collection of detected beat positions
+ //BeatCollection beats;
+ std::vector<BEAT> beats;
+
+ // 2nd order low-pass-filter
+ IIR2_filter beat_lpf;
+
+ /// Updates auto-correlation function for given number of decimated samples that 
+ /// are read from the internal 'buffer' pipe (samples aren't removed from the pipe 
+ /// though).
+ void updateXCorr(int process_samples /// How many samples are processed.
+ );
+
+ /// Decimates samples to approx. 500 Hz.
+ ///
+ /// \return Number of output samples.
+ int decimate(soundtouch::SAMPLETYPE *dest, ///< Destination buffer
+ const soundtouch::SAMPLETYPE *src, ///< Source sample buffer
+ int numsamples ///< Number of source samples.
+ );
+
+ /// Calculates amplitude envelope for the buffer of samples.
+ /// Result is output to 'samples'.
+ void calcEnvelope(soundtouch::SAMPLETYPE *samples, ///< Pointer to input/output data buffer
+ int numsamples ///< Number of samples in buffer
+ );
+
+ /// remove constant bias from xcorr data
+ void removeBias();
+
+ // Detect individual beat positions
+ void updateBeatPos(int process_samples);
+
+
+ public:
+ /// Constructor.
+ BPMDetect(int numChannels, ///< Number of channels in sample data.
+ int sampleRate ///< Sample rate in Hz.
+ );
+
+ /// Destructor.
+ virtual ~BPMDetect();
+
+ /// Inputs a block of samples for analyzing: Envelopes the samples and then
+ /// updates the autocorrelation estimation. When whole song data has been input
+ /// in smaller blocks using this function, read the resulting bpm with 'getBpm' 
+ /// function. 
+ /// 
+ /// Notice that data in 'samples' array can be disrupted in processing.
+ void inputSamples(const soundtouch::SAMPLETYPE *samples, ///< Pointer to input/working data buffer
+ int numSamples ///< Number of samples in buffer
+ );
+
+ /// Analyzes the results and returns the BPM rate. Use this function to read result
+ /// after whole song data has been input to the class by consecutive calls of
+ /// 'inputSamples' function.
+ ///
+ /// \return Beats-per-minute rate, or zero if detection failed.
+ float getBpm();
+
+ /// Get beat position arrays. Note: The array includes also really low beat detection values 
+ /// in absence of clear strong beats. Consumer may wish to filter low values away.
+ /// - "pos" receive array of beat positions
+ /// - "values" receive array of beat detection strengths
+ /// - max_num indicates max.size of "pos" and "values" array. 
+ ///
+ /// You can query a suitable array sized by calling this with NULL in "pos" & "values".
+ ///
+ /// \return number of beats in the arrays.
+ int getBeats(float *pos, float *strength, int max_num);
+ };
+}
+#endif // _BPMDetect_H_

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/include/FIFOSampleBuffer.h Added

@@ -0,0 +1,177 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// A buffer class for temporarily storaging sound samples, operates as a 
+/// first-in-first-out pipe.
+///
+/// Samples are added to the end of the sample buffer with the 'putSamples' 
+/// function, and are received from the beginning of the buffer by calling
+/// the 'receiveSamples' function. The class automatically removes the 
+/// output samples from the buffer as well as grows the storage size 
+/// whenever necessary.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef FIFOSampleBuffer_H
+#define FIFOSampleBuffer_H
+
+#include "FIFOSamplePipe.h"
+
+namespace soundtouch
+{
+
+/// Sample buffer working in FIFO (first-in-first-out) principle. The class takes
+/// care of storage size adjustment and data moving during input/output operations.
+///
+/// Notice that in case of stereo audio, one sample is considered to consist of 
+/// both channel data.
+class FIFOSampleBuffer : public FIFOSamplePipe
+{
+private:
+ /// Sample buffer.
+ SAMPLETYPE *buffer;
+
+ // Raw unaligned buffer memory. 'buffer' is made aligned by pointing it to first
+ // 16-byte aligned location of this buffer
+ SAMPLETYPE *bufferUnaligned;
+
+ /// Sample buffer size in bytes
+ uint sizeInBytes;
+
+ /// How many samples are currently in buffer.
+ uint samplesInBuffer;
+
+ /// Channels, 1=mono, 2=stereo.
+ uint channels;
+
+ /// Current position pointer to the buffer. This pointer is increased when samples are 
+ /// removed from the pipe so that it's necessary to actually rewind buffer (move data)
+ /// only new data when is put to the pipe.
+ uint bufferPos;
+
+ /// Rewind the buffer by moving data from position pointed by 'bufferPos' to real 
+ /// beginning of the buffer.
+ void rewind();
+
+ /// Ensures that the buffer has capacity for at least this many samples.
+ void ensureCapacity(uint capacityRequirement);
+
+ /// Returns current capacity.
+ uint getCapacity() const;
+
+public:
+
+ /// Constructor
+ FIFOSampleBuffer(int numChannels = 2 ///< Number of channels, 1=mono, 2=stereo.
+ ///< Default is stereo.
+ );
+
+ /// destructor
+ ~FIFOSampleBuffer();
+
+ /// Returns a pointer to the beginning of the output samples. 
+ /// This function is provided for accessing the output samples directly. 
+ /// Please be careful for not to corrupt the book-keeping!
+ ///
+ /// When using this function to output samples, also remember to 'remove' the
+ /// output samples from the buffer by calling the 
+ /// 'receiveSamples(numSamples)' function
+ virtual SAMPLETYPE *ptrBegin();
+
+ /// Returns a pointer to the end of the used part of the sample buffer (i.e. 
+ /// where the new samples are to be inserted). This function may be used for 
+ /// inserting new samples into the sample buffer directly. Please be careful
+ /// not corrupt the book-keeping!
+ ///
+ /// When using this function as means for inserting new samples, also remember 
+ /// to increase the sample count afterwards, by calling the 
+ /// 'putSamples(numSamples)' function.
+ SAMPLETYPE *ptrEnd(
+ uint slackCapacity ///< How much free capacity (in samples) there _at least_ 
+ ///< should be so that the caller can successfully insert the 
+ ///< desired samples to the buffer. If necessary, the function 
+ ///< grows the buffer size to comply with this requirement.
+ );
+
+ /// Adds 'numSamples' pcs of samples from the 'samples' memory position to
+ /// the sample buffer.
+ virtual void putSamples(const SAMPLETYPE *samples, ///< Pointer to samples.
+ uint numSamples ///< Number of samples to insert.
+ );
+
+ /// Adjusts the book-keeping to increase number of samples in the buffer without 
+ /// copying any actual samples.
+ ///
+ /// This function is used to update the number of samples in the sample buffer
+ /// when accessing the buffer directly with 'ptrEnd' function. Please be 
+ /// careful though!
+ virtual void putSamples(uint numSamples ///< Number of samples been inserted.
+ );
+
+ /// Output samples from beginning of the sample buffer. Copies requested samples to 
+ /// output buffer and removes them from the sample buffer. If there are less than 
+ /// 'numsample' samples in the buffer, returns all that available.
+ ///
+ /// \return Number of samples returned.
+ virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples.
+ uint maxSamples ///< How many samples to receive at max.
+ );
+
+ /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
+ /// sample buffer without copying them anywhere. 
+ ///
+ /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
+ /// with 'ptrBegin' function.
+ virtual uint receiveSamples(uint maxSamples ///< Remove this many samples from the beginning of pipe.
+ );
+
+ /// Returns number of samples currently available.
+ virtual uint numSamples() const;
+
+ /// Sets number of channels, 1 = mono, 2 = stereo.
+ void setChannels(int numChannels);
+
+ /// Get number of channels
+ int getChannels() 
+ {
+ return channels;
+ }
+
+ /// Returns nonzero if there aren't any samples available for outputting.
+ virtual int isEmpty() const;
+
+ /// Clears all the samples.
+ virtual void clear();
+
+ /// allow trimming (downwards) amount of samples in pipeline.
+ /// Returns adjusted amount of samples
+ uint adjustAmountOfSamples(uint numSamples);
+};
+
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/include/FIFOSamplePipe.h Added

@@ -0,0 +1,230 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// 'FIFOSamplePipe' : An abstract base class for classes that manipulate sound
+/// samples by operating like a first-in-first-out pipe: New samples are fed
+/// into one end of the pipe with the 'putSamples' function, and the processed
+/// samples are received from the other end with the 'receiveSamples' function.
+///
+/// 'FIFOProcessor' : A base class for classes the do signal processing with 
+/// the samples while operating like a first-in-first-out pipe. When samples
+/// are input with the 'putSamples' function, the class processes them
+/// and moves the processed samples to the given 'output' pipe object, which
+/// may be either another processing stage, or a fifo sample buffer object.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef FIFOSamplePipe_H
+#define FIFOSamplePipe_H
+
+#include <assert.h>
+#include <stdlib.h>
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+/// Abstract base class for FIFO (first-in-first-out) sample processing classes.
+class FIFOSamplePipe
+{
+protected:
+
+ bool verifyNumberOfChannels(int nChannels) const
+ {
+ if ((nChannels > 0) && (nChannels <= SOUNDTOUCH_MAX_CHANNELS))
+ {
+ return true;
+ }
+ assert(0);
+ return false;
+ }
+
+public:
+ // virtual default destructor
+ virtual ~FIFOSamplePipe() {}
+
+
+ /// Returns a pointer to the beginning of the output samples. 
+ /// This function is provided for accessing the output samples directly. 
+ /// Please be careful for not to corrupt the book-keeping!
+ ///
+ /// When using this function to output samples, also remember to 'remove' the
+ /// output samples from the buffer by calling the 
+ /// 'receiveSamples(numSamples)' function
+ virtual SAMPLETYPE *ptrBegin() = 0;
+
+ /// Adds 'numSamples' pcs of samples from the 'samples' memory position to
+ /// the sample buffer.
+ virtual void putSamples(const SAMPLETYPE *samples, ///< Pointer to samples.
+ uint numSamples ///< Number of samples to insert.
+ ) = 0;
+
+
+ // Moves samples from the 'other' pipe instance to this instance.
+ void moveSamples(FIFOSamplePipe &other ///< Other pipe instance where from the receive the data.
+ )
+ {
+ int oNumSamples = other.numSamples();
+
+ putSamples(other.ptrBegin(), oNumSamples);
+ other.receiveSamples(oNumSamples);
+ };
+
+ /// Output samples from beginning of the sample buffer. Copies requested samples to 
+ /// output buffer and removes them from the sample buffer. If there are less than 
+ /// 'numsample' samples in the buffer, returns all that available.
+ ///
+ /// \return Number of samples returned.
+ virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples.
+ uint maxSamples ///< How many samples to receive at max.
+ ) = 0;
+
+ /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
+ /// sample buffer without copying them anywhere. 
+ ///
+ /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
+ /// with 'ptrBegin' function.
+ virtual uint receiveSamples(uint maxSamples ///< Remove this many samples from the beginning of pipe.
+ ) = 0;
+
+ /// Returns number of samples currently available.
+ virtual uint numSamples() const = 0;
+
+ // Returns nonzero if there aren't any samples available for outputting.
+ virtual int isEmpty() const = 0;
+
+ /// Clears all the samples.
+ virtual void clear() = 0;
+
+ /// allow trimming (downwards) amount of samples in pipeline.
+ /// Returns adjusted amount of samples
+ virtual uint adjustAmountOfSamples(uint numSamples) = 0;
+
+};
+
+
+/// Base-class for sound processing routines working in FIFO principle. With this base 
+/// class it's easy to implement sound processing stages that can be chained together,
+/// so that samples that are fed into beginning of the pipe automatically go through 
+/// all the processing stages.
+///
+/// When samples are input to this class, they're first processed and then put to 
+/// the FIFO pipe that's defined as output of this class. This output pipe can be
+/// either other processing stage or a FIFO sample buffer.
+class FIFOProcessor :public FIFOSamplePipe
+{
+protected:
+ /// Internal pipe where processed samples are put.
+ FIFOSamplePipe *output;
+
+ /// Sets output pipe.
+ void setOutPipe(FIFOSamplePipe *pOutput)
+ {
+ assert(output == NULL);
+ assert(pOutput != NULL);
+ output = pOutput;
+ }
+
+ /// Constructor. Doesn't define output pipe; it has to be set be 
+ /// 'setOutPipe' function.
+ FIFOProcessor()
+ {
+ output = NULL;
+ }
+
+ /// Constructor. Configures output pipe.
+ FIFOProcessor(FIFOSamplePipe *pOutput ///< Output pipe.
+ )
+ {
+ output = pOutput;
+ }
+
+ /// Destructor.
+ virtual ~FIFOProcessor()
+ {
+ }
+
+ /// Returns a pointer to the beginning of the output samples. 
+ /// This function is provided for accessing the output samples directly. 
+ /// Please be careful for not to corrupt the book-keeping!
+ ///
+ /// When using this function to output samples, also remember to 'remove' the
+ /// output samples from the buffer by calling the 
+ /// 'receiveSamples(numSamples)' function
+ virtual SAMPLETYPE *ptrBegin()
+ {
+ return output->ptrBegin();
+ }
+
+public:
+
+ /// Output samples from beginning of the sample buffer. Copies requested samples to 
+ /// output buffer and removes them from the sample buffer. If there are less than 
+ /// 'numsample' samples in the buffer, returns all that available.
+ ///
+ /// \return Number of samples returned.
+ virtual uint receiveSamples(SAMPLETYPE *outBuffer, ///< Buffer where to copy output samples.
+ uint maxSamples ///< How many samples to receive at max.
+ )
+ {
+ return output->receiveSamples(outBuffer, maxSamples);
+ }
+
+ /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
+ /// sample buffer without copying them anywhere. 
+ ///
+ /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
+ /// with 'ptrBegin' function.
+ virtual uint receiveSamples(uint maxSamples ///< Remove this many samples from the beginning of pipe.
+ )
+ {
+ return output->receiveSamples(maxSamples);
+ }
+
+ /// Returns number of samples currently available.
+ virtual uint numSamples() const
+ {
+ return output->numSamples();
+ }
+
+ /// Returns nonzero if there aren't any samples available for outputting.
+ virtual int isEmpty() const
+ {
+ return output->isEmpty();
+ }
+
+ /// allow trimming (downwards) amount of samples in pipeline.
+ /// Returns adjusted amount of samples
+ virtual uint adjustAmountOfSamples(uint numSamples)
+ {
+ return output->adjustAmountOfSamples(numSamples);
+ }
+};
+
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/include/STTypes.h Added

@@ -0,0 +1,183 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Common type definitions for SoundTouch audio processing library.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef STTypes_H
+#define STTypes_H
+
+typedef unsigned int uint;
+typedef unsigned long ulong;
+
+// Patch for MinGW: on Win64 long is 32-bit
+#ifdef _WIN64
+ typedef unsigned long long ulongptr;
+#else
+ typedef ulong ulongptr;
+#endif
+
+
+// Helper macro for aligning pointer up to next 16-byte boundary
+#define SOUNDTOUCH_ALIGN_POINTER_16(x) ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 )
+
+
+#if (defined(__GNUC__) && !defined(ANDROID))
+ // In GCC, include soundtouch_config.h made by config scritps.
+ // Skip this in Android compilation that uses GCC but without configure scripts.
+ #include "soundtouch_config.h"
+#endif
+
+
+namespace soundtouch
+{
+ /// Max allowed number of channels
+ #define SOUNDTOUCH_MAX_CHANNELS 16
+
+ /// Activate these undef's to overrule the possible sampletype 
+ /// setting inherited from some other header file:
+ //#undef SOUNDTOUCH_INTEGER_SAMPLES
+ //#undef SOUNDTOUCH_FLOAT_SAMPLES
+
+ /// If following flag is defined, always uses multichannel processing 
+ /// routines also for mono and stero sound. This is for routine testing 
+ /// purposes; output should be same with either routines, yet disabling 
+ /// the dedicated mono/stereo processing routines will result in slower 
+ /// runtime performance so recommendation is to keep this off.
+ // #define USE_MULTICH_ALWAYS
+
+ #if (defined(__SOFTFP__) && defined(ANDROID))
+ // For Android compilation: Force use of Integer samples in case that
+ // compilation uses soft-floating point emulation - soft-fp is way too slow
+ #undef SOUNDTOUCH_FLOAT_SAMPLES
+ #define SOUNDTOUCH_INTEGER_SAMPLES 1
+ #endif
+
+ #if !(SOUNDTOUCH_INTEGER_SAMPLES || SOUNDTOUCH_FLOAT_SAMPLES)
+ 
+ /// Choose either 32bit floating point or 16bit integer sampletype
+ /// by choosing one of the following defines, unless this selection 
+ /// has already been done in some other file.
+ ////
+ /// Notes:
+ /// - In Windows environment, choose the sample format with the
+ /// following defines.
+ /// - In GNU environment, the floating point samples are used by 
+ /// default, but integer samples can be chosen by giving the 
+ /// following switch to the configure script:
+ /// ./configure --enable-integer-samples
+ /// However, if you still prefer to select the sample format here 
+ /// also in GNU environment, then please #undef the INTEGER_SAMPLE
+ /// and FLOAT_SAMPLE defines first as in comments above.
+ //#define SOUNDTOUCH_INTEGER_SAMPLES 1 //< 16bit integer samples
+ #define SOUNDTOUCH_FLOAT_SAMPLES 1 //< 32bit float samples
+ 
+ #endif
+
+ #if (_M_IX86 || __i386__ || __x86_64__ || _M_X64)
+ /// Define this to allow X86-specific assembler/intrinsic optimizations. 
+ /// Notice that library contains also usual C++ versions of each of these
+ /// these routines, so if you're having difficulties getting the optimized 
+ /// routines compiled for whatever reason, you may disable these optimizations 
+ /// to make the library compile.
+
+ #define SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS 1
+
+ /// In GNU environment, allow the user to override this setting by
+ /// giving the following switch to the configure script:
+ /// ./configure --disable-x86-optimizations
+ /// ./configure --enable-x86-optimizations=no
+ #ifdef SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS
+ #undef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
+ #endif
+ #else
+ /// Always disable optimizations when not using a x86 systems.
+ #undef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
+
+ #endif
+
+ // If defined, allows the SIMD-optimized routines to take minor shortcuts 
+ // for improved performance. Undefine to require faithfully similar SIMD 
+ // calculations as in normal C implementation.
+ #define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION 1
+
+
+ #ifdef SOUNDTOUCH_INTEGER_SAMPLES
+ // 16bit integer sample type
+ typedef short SAMPLETYPE;
+ // data type for sample accumulation: Use 32bit integer to prevent overflows
+ typedef long LONG_SAMPLETYPE;
+
+ #ifdef SOUNDTOUCH_FLOAT_SAMPLES
+ // check that only one sample type is defined
+ #error "conflicting sample types defined"
+ #endif // SOUNDTOUCH_FLOAT_SAMPLES
+
+ #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
+ // Allow MMX optimizations (not available in X64 mode)
+ #if (!_M_X64)
+ #define SOUNDTOUCH_ALLOW_MMX 1
+ #endif
+ #endif
+
+ #else
+
+ // floating point samples
+ typedef float SAMPLETYPE;
+ // data type for sample accumulation: Use double to utilize full precision.
+ typedef double LONG_SAMPLETYPE;
+
+ #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
+ // Allow SSE optimizations
+ #define SOUNDTOUCH_ALLOW_SSE 1
+ #endif
+
+ #endif // SOUNDTOUCH_INTEGER_SAMPLES
+
+};
+
+// define ST_NO_EXCEPTION_HANDLING switch to disable throwing std exceptions:
+// #define ST_NO_EXCEPTION_HANDLING 1
+#ifdef ST_NO_EXCEPTION_HANDLING
+ // Exceptions disabled. Throw asserts instead if enabled.
+ #include <assert.h>
+ #define ST_THROW_RT_ERROR(x) {assert((const char *)x);}
+#else
+ // use c++ standard exceptions
+ #include <stdexcept>
+ #include <string>
+ #define ST_THROW_RT_ERROR(x) {throw std::runtime_error(x);}
+#endif
+
+// When this #define is active, eliminates a clicking sound when the "rate" or "pitch" 
+// parameter setting crosses from value <1 to >=1 or vice versa during processing. 
+// Default is off as such crossover is untypical case and involves a slight sound 
+// quality compromise.
+//#define SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER 1
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/include/SoundTouch.h Added

@@ -0,0 +1,348 @@
+//////////////////////////////////////////////////////////////////////////////
+///
+/// SoundTouch - main class for tempo/pitch/rate adjusting routines. 
+///
+/// Notes:
+/// - Initialize the SoundTouch object instance by setting up the sound stream 
+/// parameters with functions 'setSampleRate' and 'setChannels', then set 
+/// desired tempo/pitch/rate settings with the corresponding functions.
+///
+/// - The SoundTouch class behaves like a first-in-first-out pipeline: The 
+/// samples that are to be processed are fed into one of the pipe by calling
+/// function 'putSamples', while the ready processed samples can be read 
+/// from the other end of the pipeline with function 'receiveSamples'.
+/// 
+/// - The SoundTouch processing classes require certain sized 'batches' of 
+/// samples in order to process the sound. For this reason the classes buffer 
+/// incoming samples until there are enough of samples available for 
+/// processing, then they carry out the processing step and consequently
+/// make the processed samples available for outputting.
+/// 
+/// - For the above reason, the processing routines introduce a certain 
+/// 'latency' between the input and output, so that the samples input to
+/// SoundTouch may not be immediately available in the output, and neither 
+/// the amount of outputtable samples may not immediately be in direct 
+/// relationship with the amount of previously input samples.
+///
+/// - The tempo/pitch/rate control parameters can be altered during processing.
+/// Please notice though that they aren't currently protected by semaphores,
+/// so in multi-thread application external semaphore protection may be
+/// required.
+///
+/// - This class utilizes classes 'TDStretch' for tempo change (without modifying
+/// pitch) and 'RateTransposer' for changing the playback rate (that is, both 
+/// tempo and pitch in the same ratio) of the sound. The third available control 
+/// 'pitch' (change pitch but maintain tempo) is produced by a combination of
+/// combining the two other controls.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef SoundTouch_H
+#define SoundTouch_H
+
+#include "FIFOSamplePipe.h"
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+/// Soundtouch library version string
+#define SOUNDTOUCH_VERSION "2.1.3"
+
+/// SoundTouch library version id
+#define SOUNDTOUCH_VERSION_ID (20103)
+
+//
+// Available setting IDs for the 'setSetting' & 'get_setting' functions:
+
+/// Enable/disable anti-alias filter in pitch transposer (0 = disable)
+#define SETTING_USE_AA_FILTER 0
+
+/// Pitch transposer anti-alias filter length (8 .. 128 taps, default = 32)
+#define SETTING_AA_FILTER_LENGTH 1
+
+/// Enable/disable quick seeking algorithm in tempo changer routine
+/// (enabling quick seeking lowers CPU utilization but causes a minor sound
+/// quality compromising)
+#define SETTING_USE_QUICKSEEK 2
+
+/// Time-stretch algorithm single processing sequence length in milliseconds. This determines 
+/// to how long sequences the original sound is chopped in the time-stretch algorithm. 
+/// See "STTypes.h" or README for more information.
+#define SETTING_SEQUENCE_MS 3
+
+/// Time-stretch algorithm seeking window length in milliseconds for algorithm that finds the 
+/// best possible overlapping location. This determines from how wide window the algorithm 
+/// may look for an optimal joining location when mixing the sound sequences back together. 
+/// See "STTypes.h" or README for more information.
+#define SETTING_SEEKWINDOW_MS 4
+
+/// Time-stretch algorithm overlap length in milliseconds. When the chopped sound sequences 
+/// are mixed back together, to form a continuous sound stream, this parameter defines over 
+/// how long period the two consecutive sequences are let to overlap each other. 
+/// See "STTypes.h" or README for more information.
+#define SETTING_OVERLAP_MS 5
+
+
+/// Call "getSetting" with this ID to query processing sequence size in samples. 
+/// This value gives approximate value of how many input samples you'll need to 
+/// feed into SoundTouch after initial buffering to get out a new batch of
+/// output samples. 
+///
+/// This value does not include initial buffering at beginning of a new processing 
+/// stream, use SETTING_INITIAL_LATENCY to get the initial buffering size.
+///
+/// Notices: 
+/// - This is read-only parameter, i.e. setSetting ignores this parameter
+/// - This parameter value is not constant but change depending on 
+/// tempo/pitch/rate/samplerate settings.
+#define SETTING_NOMINAL_INPUT_SEQUENCE 6
+
+
+/// Call "getSetting" with this ID to query nominal average processing output 
+/// size in samples. This value tells approcimate value how many output samples 
+/// SoundTouch outputs once it does DSP processing run for a batch of input samples.
+///
+/// Notices: 
+/// - This is read-only parameter, i.e. setSetting ignores this parameter
+/// - This parameter value is not constant but change depending on 
+/// tempo/pitch/rate/samplerate settings.
+#define SETTING_NOMINAL_OUTPUT_SEQUENCE 7
+
+
+/// Call "getSetting" with this ID to query initial processing latency, i.e.
+/// approx. how many samples you'll need to enter to SoundTouch pipeline before 
+/// you can expect to get first batch of ready output samples out. 
+///
+/// After the first output batch, you can then expect to get approx. 
+/// SETTING_NOMINAL_OUTPUT_SEQUENCE ready samples out for every
+/// SETTING_NOMINAL_INPUT_SEQUENCE samples that you enter into SoundTouch.
+///
+/// Example:
+/// processing with parameter -tempo=5
+/// => initial latency = 5509 samples
+/// input sequence = 4167 samples
+/// output sequence = 3969 samples
+///
+/// Accordingly, you can expect to feed in approx. 5509 samples at beginning of 
+/// the stream, and then you'll get out the first 3969 samples. After that, for 
+/// every approx. 4167 samples that you'll put in, you'll receive again approx. 
+/// 3969 samples out.
+///
+/// This also means that average latency during stream processing is 
+/// INITIAL_LATENCY-OUTPUT_SEQUENCE/2, in the above example case 5509-3969/2 
+/// = 3524 samples
+/// 
+/// Notices: 
+/// - This is read-only parameter, i.e. setSetting ignores this parameter
+/// - This parameter value is not constant but change depending on 
+/// tempo/pitch/rate/samplerate settings.
+#define SETTING_INITIAL_LATENCY 8
+
+
+class SoundTouch : public FIFOProcessor
+{
+private:
+ /// Rate transposer class instance
+ class RateTransposer *pRateTransposer;
+
+ /// Time-stretch class instance
+ class TDStretch *pTDStretch;
+
+ /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.
+ double virtualRate;
+
+ /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.
+ double virtualTempo;
+
+ /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.
+ double virtualPitch;
+
+ /// Flag: Has sample rate been set?
+ bool bSrateSet;
+
+ /// Accumulator for how many samples in total will be expected as output vs. samples put in,
+ /// considering current processing settings.
+ double samplesExpectedOut;
+
+ /// Accumulator for how many samples in total have been read out from the processing so far
+ long samplesOutput;
+
+ /// Calculates effective rate & tempo valuescfrom 'virtualRate', 'virtualTempo' and 
+ /// 'virtualPitch' parameters.
+ void calcEffectiveRateAndTempo();
+
+protected :
+ /// Number of channels
+ uint channels;
+
+ /// Effective 'rate' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'
+ double rate;
+
+ /// Effective 'tempo' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'
+ double tempo;
+
+public:
+ SoundTouch();
+ virtual ~SoundTouch();
+
+ /// Get SoundTouch library version string
+ static const char *getVersionString();
+
+ /// Get SoundTouch library version Id
+ static uint getVersionId();
+
+ /// Sets new rate control value. Normal rate = 1.0, smaller values
+ /// represent slower rate, larger faster rates.
+ void setRate(double newRate);
+
+ /// Sets new tempo control value. Normal tempo = 1.0, smaller values
+ /// represent slower tempo, larger faster tempo.
+ void setTempo(double newTempo);
+
+ /// Sets new rate control value as a difference in percents compared
+ /// to the original rate (-50 .. +100 %)
+ void setRateChange(double newRate);
+
+ /// Sets new tempo control value as a difference in percents compared
+ /// to the original tempo (-50 .. +100 %)
+ void setTempoChange(double newTempo);
+
+ /// Sets new pitch control value. Original pitch = 1.0, smaller values
+ /// represent lower pitches, larger values higher pitch.
+ void setPitch(double newPitch);
+
+ /// Sets pitch change in octaves compared to the original pitch 
+ /// (-1.00 .. +1.00)
+ void setPitchOctaves(double newPitch);
+
+ /// Sets pitch change in semi-tones compared to the original pitch
+ /// (-12 .. +12)
+ void setPitchSemiTones(int newPitch);
+ void setPitchSemiTones(double newPitch);
+
+ /// Sets the number of channels, 1 = mono, 2 = stereo
+ void setChannels(uint numChannels);
+
+ /// Sets sample rate.
+ void setSampleRate(uint srate);
+
+ /// Get ratio between input and output audio durations, useful for calculating
+ /// processed output duration: if you'll process a stream of N samples, then 
+ /// you can expect to get out N * getInputOutputSampleRatio() samples.
+ ///
+ /// This ratio will give accurate target duration ratio for a full audio track, 
+ /// given that the the whole track is processed with same processing parameters.
+ /// 
+ /// If this ratio is applied to calculate intermediate offsets inside a processing
+ /// stream, then this ratio is approximate and can deviate +- some tens of milliseconds 
+ /// from ideal offset, yet by end of the audio stream the duration ratio will become
+ /// exact.
+ ///
+ /// Example: if processing with parameters "-tempo=15 -pitch=-3", the function
+ /// will return value 0.8695652... Now, if processing an audio stream whose duration
+ /// is exactly one million audio samples, then you can expect the processed 
+ /// output duration be 0.869565 * 1000000 = 869565 samples.
+ double getInputOutputSampleRatio();
+
+ /// Flushes the last samples from the processing pipeline to the output.
+ /// Clears also the internal processing buffers.
+ //
+ /// Note: This function is meant for extracting the last samples of a sound
+ /// stream. This function may introduce additional blank samples in the end
+ /// of the sound stream, and thus it's not recommended to call this function
+ /// in the middle of a sound stream.
+ void flush();
+
+ /// Adds 'numSamples' pcs of samples from the 'samples' memory position into
+ /// the input of the object. Notice that sample rate _has_to_ be set before
+ /// calling this function, otherwise throws a runtime_error exception.
+ virtual void putSamples(
+ const SAMPLETYPE *samples, ///< Pointer to sample buffer.
+ uint numSamples ///< Number of samples in buffer. Notice
+ ///< that in case of stereo-sound a single sample
+ ///< contains data for both channels.
+ );
+
+ /// Output samples from beginning of the sample buffer. Copies requested samples to 
+ /// output buffer and removes them from the sample buffer. If there are less than 
+ /// 'numsample' samples in the buffer, returns all that available.
+ ///
+ /// \return Number of samples returned.
+ virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples.
+ uint maxSamples ///< How many samples to receive at max.
+ );
+
+ /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
+ /// sample buffer without copying them anywhere. 
+ ///
+ /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
+ /// with 'ptrBegin' function.
+ virtual uint receiveSamples(uint maxSamples ///< Remove this many samples from the beginning of pipe.
+ );
+
+ /// Clears all the samples in the object's output and internal processing
+ /// buffers.
+ virtual void clear();
+
+ /// Changes a setting controlling the processing system behaviour. See the
+ /// 'SETTING_...' defines for available setting ID's.
+ /// 
+ /// \return 'true' if the setting was successfully changed
+ bool setSetting(int settingId, ///< Setting ID number. see SETTING_... defines.
+ int value ///< New setting value.
+ );
+
+ /// Reads a setting controlling the processing system behaviour. See the
+ /// 'SETTING_...' defines for available setting ID's.
+ ///
+ /// \return the setting value.
+ int getSetting(int settingId ///< Setting ID number, see SETTING_... defines.
+ ) const;
+
+ /// Returns number of samples currently unprocessed.
+ virtual uint numUnprocessedSamples() const;
+
+ /// Return number of channels
+ uint numChannels() const
+ {
+ return channels;
+ }
+
+ /// Other handy functions that are implemented in the ancestor classes (see
+ /// classes 'FIFOProcessor' and 'FIFOSamplePipe')
+ ///
+ /// - receiveSamples() : Use this function to receive 'ready' processed samples from SoundTouch.
+ /// - numSamples() : Get number of 'ready' samples that can be received with 
+ /// function 'receiveSamples()'
+ /// - isEmpty() : Returns nonzero if there aren't any 'ready' samples.
+ /// - clear() : Clears all samples from ready/processing buffers.
+};
+
+}
+#endif

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/include/soundtouch_config.h Added

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source Added

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch Added

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/AAFilter.cpp Added

@@ -0,0 +1,222 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// FIR low-pass (anti-alias) filter with filter coefficient design routine and
+/// MMX optimization. 
+/// 
+/// Anti-alias filter is used to prevent folding of high frequencies when 
+/// transposing the sample rate with interpolation.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <memory.h>
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include "AAFilter.h"
+#include "FIRFilter.h"
+
+using namespace soundtouch;
+
+#define PI 3.14159265358979323846
+#define TWOPI (2 * PI)
+
+// define this to save AA filter coefficients to a file
+// #define _DEBUG_SAVE_AAFILTER_COEFFICIENTS 1
+
+#ifdef _DEBUG_SAVE_AAFILTER_COEFFICIENTS
+ #include <stdio.h>
+
+ static void _DEBUG_SAVE_AAFIR_COEFFS(SAMPLETYPE *coeffs, int len)
+ {
+ FILE *fptr = fopen("aa_filter_coeffs.txt", "wt");
+ if (fptr == NULL) return;
+
+ for (int i = 0; i < len; i ++)
+ {
+ double temp = coeffsi;
+ fprintf(fptr, "%lf\n", temp);
+ }
+ fclose(fptr);
+ }
+
+#else
+ #define _DEBUG_SAVE_AAFIR_COEFFS(x, y)
+#endif
+
+/*****************************************************************************
+ *
+ * Implementation of the class 'AAFilter'
+ *
+ *****************************************************************************/
+
+AAFilter::AAFilter(uint len)
+{
+ pFIR = FIRFilter::newInstance();
+ cutoffFreq = 0.5;
+ setLength(len);
+}
+
+
+AAFilter::~AAFilter()
+{
+ delete pFIR;
+}
+
+
+// Sets new anti-alias filter cut-off edge frequency, scaled to
+// sampling frequency (nyquist frequency = 0.5).
+// The filter will cut frequencies higher than the given frequency.
+void AAFilter::setCutoffFreq(double newCutoffFreq)
+{
+ cutoffFreq = newCutoffFreq;
+ calculateCoeffs();
+}
+
+
+// Sets number of FIR filter taps
+void AAFilter::setLength(uint newLength)
+{
+ length = newLength;
+ calculateCoeffs();
+}
+
+
+// Calculates coefficients for a low-pass FIR filter using Hamming window
+void AAFilter::calculateCoeffs()
+{
+ uint i;
+ double cntTemp, temp, tempCoeff,h, w;
+ double wc;
+ double scaleCoeff, sum;
+ double *work;
+ SAMPLETYPE *coeffs;
+
+ assert(length >= 2);
+ assert(length % 4 == 0);
+ assert(cutoffFreq >= 0);
+ assert(cutoffFreq <= 0.5);
+
+ work = new doublelength;
+ coeffs = new SAMPLETYPElength;
+
+ wc = 2.0 * PI * cutoffFreq;
+ tempCoeff = TWOPI / (double)length;
+
+ sum = 0;
+ for (i = 0; i < length; i ++) 
+ {
+ cntTemp = (double)i - (double)(length / 2);
+
+ temp = cntTemp * wc;
+ if (temp != 0) 
+ {
+ h = sin(temp) / temp; // sinc function
+ } 
+ else 
+ {
+ h = 1.0;
+ }
+ w = 0.54 + 0.46 * cos(tempCoeff * cntTemp); // hamming window
+
+ temp = w * h;
+ worki = temp;
+
+ // calc net sum of coefficients 
+ sum += temp;
+ }
+
+ // ensure the sum of coefficients is larger than zero
+ assert(sum > 0);
+
+ // ensure we've really designed a lowpass filter...
+ assert(worklength/2 > 0);
+ assert(worklength/2 + 1 > -1e-6);
+ assert(worklength/2 - 1 > -1e-6);
+
+ // Calculate a scaling coefficient in such a way that the result can be
+ // divided by 16384
+ scaleCoeff = 16384.0f / sum;
+
+ for (i = 0; i < length; i ++) 
+ {
+ temp = worki * scaleCoeff;
+ // scale & round to nearest integer
+ temp += (temp >= 0) ? 0.5 : -0.5;
+ // ensure no overfloods
+ assert(temp >= -32768 && temp <= 32767);
+ coeffsi = (SAMPLETYPE)temp;
+ }
+
+ // Set coefficients. Use divide factor 14 => divide result by 2^14 = 16384
+ pFIR->setCoefficients(coeffs, length, 14);
+
+ _DEBUG_SAVE_AAFIR_COEFFS(coeffs, length);
+
+ delete work;
+ delete coeffs;
+}
+
+
+// Applies the filter to the given sequence of samples. 
+// Note : The amount of outputted samples is by value of 'filter length' 
+// smaller than the amount of input samples.
+uint AAFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const
+{
+ return pFIR->evaluate(dest, src, numSamples, numChannels);
+}
+
+
+/// Applies the filter to the given src & dest pipes, so that processed amount of
+/// samples get removed from src, and produced amount added to dest 
+/// Note : The amount of outputted samples is by value of 'filter length' 
+/// smaller than the amount of input samples.
+uint AAFilter::evaluate(FIFOSampleBuffer &dest, FIFOSampleBuffer &src) const
+{
+ SAMPLETYPE *pdest;
+ const SAMPLETYPE *psrc;
+ uint numSrcSamples;
+ uint result;
+ int numChannels = src.getChannels();
+
+ assert(numChannels == dest.getChannels());
+
+ numSrcSamples = src.numSamples();
+ psrc = src.ptrBegin();
+ pdest = dest.ptrEnd(numSrcSamples);
+ result = pFIR->evaluate(pdest, psrc, numSrcSamples, numChannels);
+ src.receiveSamples(result);
+ dest.putSamples(result);
+
+ return result;
+}
+
+
+uint AAFilter::getLength() const
+{
+ return pFIR->getLength();
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/AAFilter.h Added

@@ -0,0 +1,93 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo 
+/// while maintaining the original pitch by using a time domain WSOLA-like method 
+/// with several performance-increasing tweaks.
+///
+/// Anti-alias filter is used to prevent folding of high frequencies when 
+/// transposing the sample rate with interpolation.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef AAFilter_H
+#define AAFilter_H
+
+#include "STTypes.h"
+#include "FIFOSampleBuffer.h"
+
+namespace soundtouch
+{
+
+class AAFilter
+{
+protected:
+    class FIRFilter *pFIR;
+
+    /// Low-pass filter cut-off frequency, negative = invalid
+    double cutoffFreq;
+
+    /// num of filter taps
+    uint length;
+
+    /// Calculate the FIR coefficients realizing the given cutoff-frequency
+    void calculateCoeffs();
+public:
+    AAFilter(uint length);
+
+    ~AAFilter();
+
+    /// Sets new anti-alias filter cut-off edge frequency, scaled to sampling 
+    /// frequency (nyquist frequency = 0.5). The filter will cut off the 
+    /// frequencies than that.
+    void setCutoffFreq(double newCutoffFreq);
+
+    /// Sets number of FIR filter taps, i.e. ~filter complexity
+    void setLength(uint newLength);
+
+    uint getLength() const;
+
+    /// Applies the filter to the given sequence of samples. 
+    /// Note : The amount of outputted samples is by value of 'filter length' 
+    /// smaller than the amount of input samples.
+    uint evaluate(SAMPLETYPE *dest, 
+                  const SAMPLETYPE *src, 
+                  uint numSamples, 
+                  uint numChannels) const;
+
+    /// Applies the filter to the given src & dest pipes, so that processed amount of
+    /// samples get removed from src, and produced amount added to dest 
+    /// Note : The amount of outputted samples is by value of 'filter length' 
+    /// smaller than the amount of input samples.
+    uint evaluate(FIFOSampleBuffer &dest, 
+                  FIFOSampleBuffer &src) const;
+
+};
+
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/BPMDetect.cpp Added

@@ -0,0 +1,573 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Beats-per-minute (BPM) detection routine.
+///
+/// The beat detection algorithm works as follows:
+/// - Use function 'inputSamples' to input a chunks of samples to the class for
+/// analysis. It's a good idea to enter a large sound file or stream in smallish
+/// chunks of around few kilosamples in order not to extinguish too much RAM memory.
+/// - Inputted sound data is decimated to approx 500 Hz to reduce calculation burden,
+/// which is basically ok as low (bass) frequencies mostly determine the beat rate.
+/// Simple averaging is used for anti-alias filtering because the resulting signal
+/// quality isn't of that high importance.
+/// - Decimated sound data is enveloped, i.e. the amplitude shape is detected by
+/// taking absolute value that's smoothed by sliding average. Signal levels that
+/// are below a couple of times the general RMS amplitude level are cut away to
+/// leave only notable peaks there.
+/// - Repeating sound patterns (e.g. beats) are detected by calculating short-term 
+/// autocorrelation function of the enveloped signal.
+/// - After whole sound data file has been analyzed as above, the bpm level is 
+/// detected by function 'getBpm' that finds the highest peak of the autocorrelation 
+/// function, calculates it's precise location and converts this reading to bpm's.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#define _USE_MATH_DEFINES
+
+#include <math.h>
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include <cfloat>
+#include "FIFOSampleBuffer.h"
+#include "PeakFinder.h"
+#include "BPMDetect.h"
+
+using namespace soundtouch;
+
+// algorithm input sample block size
+static const int INPUT_BLOCK_SIZE = 2048;
+
+// decimated sample block size
+static const int DECIMATED_BLOCK_SIZE = 256;
+
+/// Target sample rate after decimation
+static const int TARGET_SRATE = 1000;
+
+/// XCorr update sequence size, update in about 200msec chunks
+static const int XCORR_UPDATE_SEQUENCE = (int)(TARGET_SRATE / 5);
+
+/// Moving average N size
+static const int MOVING_AVERAGE_N = 15;
+
+/// XCorr decay time constant, decay to half in 30 seconds
+/// If it's desired to have the system adapt quicker to beat rate 
+/// changes within a continuing music stream, then the 
+/// 'xcorr_decay_time_constant' value can be reduced, yet that
+/// can increase possibility of glitches in bpm detection.
+static const double XCORR_DECAY_TIME_CONSTANT = 30.0;
+
+/// Data overlap factor for beat detection algorithm
+static const int OVERLAP_FACTOR = 4;
+
+static const double TWOPI = (2 * M_PI);
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Enable following define to create bpm analysis file:
+
+//#define _CREATE_BPM_DEBUG_FILE
+
+#ifdef _CREATE_BPM_DEBUG_FILE
+
+ static void _SaveDebugData(const char *name, const float *data, int minpos, int maxpos, double coeff)
+ {
+ FILE *fptr = fopen(name, "wt");
+ int i;
+
+ if (fptr)
+ {
+ printf("\nWriting BPM debug data into file %s\n", name);
+ for (i = minpos; i < maxpos; i ++)
+ {
+ fprintf(fptr, "%d\t%.1lf\t%f\n", i, coeff / (double)i, datai);
+ }
+ fclose(fptr);
+ }
+ }
+
+ void _SaveDebugBeatPos(const char *name, const std::vector<BEAT> &beats)
+ {
+ printf("\nWriting beat detections data into file %s\n", name);
+
+ FILE *fptr = fopen(name, "wt");
+ if (fptr)
+ {
+ for (uint i = 0; i < beats.size(); i++)
+ {
+ BEAT b = beatsi;
+ fprintf(fptr, "%lf\t%lf\n", b.pos, b.strength);
+ }
+ fclose(fptr);
+ }
+ }
+#else
+ #define _SaveDebugData(name, a,b,c,d)
+ #define _SaveDebugBeatPos(name, b)
+#endif
+
+// Hamming window
+void hamming(float *w, int N)
+{
+ for (int i = 0; i < N; i++)
+ {
+ wi = (float)(0.54 - 0.46 * cos(TWOPI * i / (N - 1)));
+ }
+
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// IIR2_filter - 2nd order IIR filter
+
+IIR2_filter::IIR2_filter(const double *lpf_coeffs)
+{
+ memcpy(coeffs, lpf_coeffs, 5 * sizeof(double));
+ memset(prev, 0, sizeof(prev));
+}
+
+
+float IIR2_filter::update(float x)
+{
+ prev0 = x;
+ double y = x * coeffs0;
+
+ for (int i = 4; i >= 1; i--)
+ {
+ y += coeffsi * previ;
+ previ = previ - 1;
+ }
+
+ prev3 = y;
+ return (float)y;
+}
+
+
+// IIR low-pass filter coefficients, calculated with matlab/octave cheby2(2,40,0.05)
+const double _LPF_coeffs5 = { 0.00996655391939, -0.01944529148401, 0.00996655391939, 1.96867605796247, -0.96916387431724 };
+
+////////////////////////////////////////////////////////////////////////////////
+
+BPMDetect::BPMDetect(int numChannels, int aSampleRate) :
+ beat_lpf(_LPF_coeffs)
+{
+ beats.reserve(250); // initial reservation to prevent frequent reallocation
+
+ this->sampleRate = aSampleRate;
+ this->channels = numChannels;
+
+ decimateSum = 0;
+ decimateCount = 0;
+
+ // choose decimation factor so that result is approx. 1000 Hz
+ decimateBy = sampleRate / TARGET_SRATE;
+ if ((decimateBy <= 0) || (decimateBy * DECIMATED_BLOCK_SIZE < INPUT_BLOCK_SIZE))
+ {
+ assert(0);
+ }
+
+ // Calculate window length & starting item according to desired min & max bpms
+ windowLen = (60 * sampleRate) / (decimateBy * MIN_BPM);
+ windowStart = (60 * sampleRate) / (decimateBy * MAX_BPM_RANGE);
+
+ assert(windowLen > windowStart);
+
+ // allocate new working objects
+ xcorr = new floatwindowLen;
+ memset(xcorr, 0, windowLen * sizeof(float));
+
+ pos = 0;
+ peakPos = 0;
+ peakVal = 0;
+ init_scaler = 1;
+ beatcorr_ringbuffpos = 0;
+ beatcorr_ringbuff = new floatwindowLen;
+ memset(beatcorr_ringbuff, 0, windowLen * sizeof(float));
+
+ // allocate processing buffer
+ buffer = new FIFOSampleBuffer();
+ // we do processing in mono mode
+ buffer->setChannels(1);
+ buffer->clear();
+
+ // calculate hamming windows
+ hamw = new floatXCORR_UPDATE_SEQUENCE;
+ hamming(hamw, XCORR_UPDATE_SEQUENCE);
+ hamw2 = new floatXCORR_UPDATE_SEQUENCE / 2;
+ hamming(hamw2, XCORR_UPDATE_SEQUENCE / 2);
+}
+
+
+BPMDetect::~BPMDetect()
+{
+ delete xcorr;
+ delete beatcorr_ringbuff;
+ delete hamw;
+ delete hamw2;
+ delete buffer;
+}
+
+
+/// convert to mono, low-pass filter & decimate to about 500 Hz. 
+/// return number of outputted samples.
+///
+/// Decimation is used to remove the unnecessary frequencies and thus to reduce 
+/// the amount of data needed to be processed as calculating autocorrelation 
+/// function is a very-very heavy operation.
+///
+/// Anti-alias filtering is done simply by averaging the samples. This is really a 
+/// poor-man's anti-alias filtering, but it's not so critical in this kind of application
+/// (it'd also be difficult to design a high-quality filter with steep cut-off at very 
+/// narrow band)
+int BPMDetect::decimate(SAMPLETYPE *dest, const SAMPLETYPE *src, int numsamples)
+{
+ int count, outcount;
+ LONG_SAMPLETYPE out;
+
+ assert(channels > 0);
+ assert(decimateBy > 0);
+ outcount = 0;
+ for (count = 0; count < numsamples; count ++) 
+ {
+ int j;
+
+ // convert to mono and accumulate
+ for (j = 0; j < channels; j ++)
+ {
+ decimateSum += srcj;
+ }
+ src += j;
+
+ decimateCount ++;
+ if (decimateCount >= decimateBy) 
+ {
+ // Store every Nth sample only
+ out = (LONG_SAMPLETYPE)(decimateSum / (decimateBy * channels));
+ decimateSum = 0;
+ decimateCount = 0;
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+ // check ranges for sure (shouldn't actually be necessary)
+ if (out > 32767) 
+ {
+ out = 32767;
+ } 
+ else if (out < -32768) 
+ {
+ out = -32768;
+ }
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+ destoutcount = (SAMPLETYPE)out;
+ outcount ++;
+ }
+ }
+ return outcount;
+}
+
+
+// Calculates autocorrelation function of the sample history buffer
+void BPMDetect::updateXCorr(int process_samples)
+{
+ int offs;
+ SAMPLETYPE *pBuffer;
+ 
+ assert(buffer->numSamples() >= (uint)(process_samples + windowLen));
+ assert(process_samples == XCORR_UPDATE_SEQUENCE);
+
+ pBuffer = buffer->ptrBegin();
+
+ // calculate decay factor for xcorr filtering
+ float xcorr_decay = (float)pow(0.5, 1.0 / (XCORR_DECAY_TIME_CONSTANT * TARGET_SRATE / process_samples));
+
+ // prescale pbuffer
+ float tmpXCORR_UPDATE_SEQUENCE;
+ for (int i = 0; i < process_samples; i++)
+ {
+ tmpi = hamwi * hamwi * pBufferi;
+ }
+
+ #pragma omp parallel for
+ for (offs = windowStart; offs < windowLen; offs ++) 
+ {
+ float sum;
+ int i;
+
+ sum = 0;
+ for (i = 0; i < process_samples; i ++) 
+ {
+ sum += tmpi * pBufferi + offs; // scaling the sub-result shouldn't be necessary
+ }
+ xcorroffs *= xcorr_decay; // decay 'xcorr' here with suitable time constant.
+
+ xcorroffs += (float)fabs(sum);
+ }
+}
+
+
+// Detect individual beat positions
+void BPMDetect::updateBeatPos(int process_samples)
+{
+ SAMPLETYPE *pBuffer;
+
+ assert(buffer->numSamples() >= (uint)(process_samples + windowLen));
+
+ pBuffer = buffer->ptrBegin();
+ assert(process_samples == XCORR_UPDATE_SEQUENCE / 2);
+
+ // static double thr = 0.0003;
+ double posScale = (double)this->decimateBy / (double)this->sampleRate;
+ int resetDur = (int)(0.12 / posScale + 0.5);
+
+ // prescale pbuffer
+ float tmpXCORR_UPDATE_SEQUENCE / 2;
+ for (int i = 0; i < process_samples; i++)
+ {
+ tmpi = hamw2i * hamw2i * pBufferi;
+ }
+
+ #pragma omp parallel for
+ for (int offs = windowStart; offs < windowLen; offs++)
+ {
+ float sum = 0;
+ for (int i = 0; i < process_samples; i++)
+ {
+ sum += tmpi * pBufferoffs + i;
+ }
+ beatcorr_ringbuff(beatcorr_ringbuffpos + offs) % windowLen += (float)((sum > 0) ? sum : 0); // accumulate only positive correlations
+ }
+
+ int skipstep = XCORR_UPDATE_SEQUENCE / OVERLAP_FACTOR;
+
+ // compensate empty buffer at beginning by scaling coefficient
+ float scale = (float)windowLen / (float)(skipstep * init_scaler);
+ if (scale > 1.0f)
+ {
+ init_scaler++;
+ }
+ else
+ {
+ scale = 1.0f;
+ }
+
+ // detect beats
+ for (int i = 0; i < skipstep; i++)
+ {
+ LONG_SAMPLETYPE max = 0;
+
+ float sum = beatcorr_ringbuffbeatcorr_ringbuffpos;
+ sum -= beat_lpf.update(sum);
+
+ if (sum > peakVal)
+ {
+ // found new local largest value
+ peakVal = sum;
+ peakPos = pos;
+ }
+ if (pos > peakPos + resetDur)
+ {
+ // largest value not updated for 200msec => accept as beat
+ peakPos += skipstep;
+ if (peakVal > 0)
+ {
+ // add detected beat to end of "beats" vector
+ BEAT temp = { (float)(peakPos * posScale), (float)(peakVal * scale) };
+ beats.push_back(temp);
+ }
+
+ peakVal = 0;
+ peakPos = pos;
+ }
+
+ beatcorr_ringbuffbeatcorr_ringbuffpos = 0;
+ pos++;
+ beatcorr_ringbuffpos = (beatcorr_ringbuffpos + 1) % windowLen;
+ }
+}
+
+
+#define max(x,y) ((x) > (y) ? (x) : (y))
+
+void BPMDetect::inputSamples(const SAMPLETYPE *samples, int numSamples)
+{
+ SAMPLETYPE decimatedDECIMATED_BLOCK_SIZE;
+
+ // iterate so that max INPUT_BLOCK_SAMPLES processed per iteration
+ while (numSamples > 0)
+ {
+ int block;
+ int decSamples;
+
+ block = (numSamples > INPUT_BLOCK_SIZE) ? INPUT_BLOCK_SIZE : numSamples;
+
+ // decimate. note that converts to mono at the same time
+ decSamples = decimate(decimated, samples, block);
+ samples += block * channels;
+ numSamples -= block;
+
+ buffer->putSamples(decimated, decSamples);
+ }
+
+ // when the buffer has enough samples for processing...
+ int req = max(windowLen + XCORR_UPDATE_SEQUENCE, 2 * XCORR_UPDATE_SEQUENCE);
+ while ((int)buffer->numSamples() >= req) 
+ {
+ // ... update autocorrelations...
+ updateXCorr(XCORR_UPDATE_SEQUENCE);
+ // ...update beat position calculation...
+ updateBeatPos(XCORR_UPDATE_SEQUENCE / 2);
+ // ... and remove proceessed samples from the buffer
+ int n = XCORR_UPDATE_SEQUENCE / OVERLAP_FACTOR;
+ buffer->receiveSamples(n);
+ }
+}
+
+
+void BPMDetect::removeBias()
+{
+ int i;
+
+ // Remove linear bias: calculate linear regression coefficient
+ // 1. calc mean of 'xcorr' and 'i'
+ double mean_i = 0;
+ double mean_x = 0;
+ for (i = windowStart; i < windowLen; i++)
+ {
+ mean_x += xcorri;
+ }
+ mean_x /= (windowLen - windowStart);
+ mean_i = 0.5 * (windowLen - 1 + windowStart);
+
+ // 2. calculate linear regression coefficient
+ double b = 0;
+ double div = 0;
+ for (i = windowStart; i < windowLen; i++)
+ {
+ double xt = xcorri - mean_x;
+ double xi = i - mean_i;
+ b += xt * xi;
+ div += xi * xi;
+ }
+ b /= div;
+
+ // subtract linear regression and resolve min. value bias
+ float minval = FLT_MAX; // arbitrary large number
+ for (i = windowStart; i < windowLen; i ++)
+ {
+ xcorri -= (float)(b * i);
+ if (xcorri < minval)
+ {
+ minval = xcorri;
+ }
+ }
+
+ // subtract min.value
+ for (i = windowStart; i < windowLen; i ++)
+ {
+ xcorri -= minval;
+ }
+}
+
+
+// Calculate N-point moving average for "source" values
+void MAFilter(float *dest, const float *source, int start, int end, int N)
+{
+ for (int i = start; i < end; i++)
+ {
+ int i1 = i - N / 2;
+ int i2 = i + N / 2 + 1;
+ if (i1 < start) i1 = start;
+ if (i2 > end) i2 = end;
+
+ double sum = 0;
+ for (int j = i1; j < i2; j ++)
+ { 
+ sum += sourcej;
+ }
+ desti = (float)(sum / (i2 - i1));
+ }
+}
+
+
+float BPMDetect::getBpm()
+{
+ double peakPos;
+ double coeff;
+ PeakFinder peakFinder;
+
+ // remove bias from xcorr data
+ removeBias();
+
+ coeff = 60.0 * ((double)sampleRate / (double)decimateBy);
+
+ // save bpm debug data if debug data writing enabled
+ _SaveDebugData("soundtouch-bpm-xcorr.txt", xcorr, windowStart, windowLen, coeff);
+
+ // Smoothen by N-point moving-average
+ float *data = new floatwindowLen;
+ memset(data, 0, sizeof(float) * windowLen);
+ MAFilter(data, xcorr, windowStart, windowLen, MOVING_AVERAGE_N);
+
+ // find peak position
+ peakPos = peakFinder.detectPeak(data, windowStart, windowLen);
+
+ // save bpm debug data if debug data writing enabled
+ _SaveDebugData("soundtouch-bpm-smoothed.txt", data, windowStart, windowLen, coeff);
+
+ delete data;
+
+ assert(decimateBy != 0);
+ if (peakPos < 1e-9) return 0.0; // detection failed.
+
+ _SaveDebugBeatPos("soundtouch-detected-beats.txt", beats);
+
+ // calculate BPM
+ float bpm = (float)(coeff / peakPos);
+ return (bpm >= MIN_BPM && bpm <= MAX_BPM_VALID) ? bpm : 0;
+}
+
+
+/// Get beat position arrays. Note: The array includes also really low beat detection values 
+/// in absence of clear strong beats. Consumer may wish to filter low values away.
+/// - "pos" receive array of beat positions
+/// - "values" receive array of beat detection strengths
+/// - max_num indicates max.size of "pos" and "values" array. 
+///
+/// You can query a suitable array sized by calling this with NULL in "pos" & "values".
+///
+/// \return number of beats in the arrays.
+int BPMDetect::getBeats(float *pos, float *values, int max_num)
+{
+ int num = beats.size();
+ if ((!pos) || (!values)) return num; // pos or values NULL, return just size
+
+ for (int i = 0; (i < num) && (i < max_num); i++)
+ {
+ posi = beatsi.pos;
+ valuesi = beatsi.strength;
+ }
+ return num;
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/FIFOSampleBuffer.cpp Added

@@ -0,0 +1,267 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// A buffer class for temporarily storaging sound samples, operates as a 
+/// first-in-first-out pipe.
+///
+/// Samples are added to the end of the sample buffer with the 'putSamples' 
+/// function, and are received from the beginning of the buffer by calling
+/// the 'receiveSamples' function. The class automatically removes the 
+/// outputted samples from the buffer, as well as grows the buffer size 
+/// whenever necessary.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <stdlib.h>
+#include <memory.h>
+#include <string.h>
+#include <assert.h>
+
+#include "FIFOSampleBuffer.h"
+
+using namespace soundtouch;
+
+// Constructor
+FIFOSampleBuffer::FIFOSampleBuffer(int numChannels)
+{
+ assert(numChannels > 0);
+ sizeInBytes = 0; // reasonable initial value
+ buffer = NULL;
+ bufferUnaligned = NULL;
+ samplesInBuffer = 0;
+ bufferPos = 0;
+ channels = (uint)numChannels;
+ ensureCapacity(32); // allocate initial capacity 
+}
+
+
+// destructor
+FIFOSampleBuffer::~FIFOSampleBuffer()
+{
+ delete bufferUnaligned;
+ bufferUnaligned = NULL;
+ buffer = NULL;
+}
+
+
+// Sets number of channels, 1 = mono, 2 = stereo
+void FIFOSampleBuffer::setChannels(int numChannels)
+{
+ uint usedBytes;
+
+ if (!verifyNumberOfChannels(numChannels)) return;
+
+ usedBytes = channels * samplesInBuffer;
+ channels = (uint)numChannels;
+ samplesInBuffer = usedBytes / channels;
+}
+
+
+// if output location pointer 'bufferPos' isn't zero, 'rewinds' the buffer and
+// zeroes this pointer by copying samples from the 'bufferPos' pointer 
+// location on to the beginning of the buffer.
+void FIFOSampleBuffer::rewind()
+{
+ if (buffer && bufferPos) 
+ {
+ memmove(buffer, ptrBegin(), sizeof(SAMPLETYPE) * channels * samplesInBuffer);
+ bufferPos = 0;
+ }
+}
+
+
+// Adds 'numSamples' pcs of samples from the 'samples' memory position to 
+// the sample buffer.
+void FIFOSampleBuffer::putSamples(const SAMPLETYPE *samples, uint nSamples)
+{
+ memcpy(ptrEnd(nSamples), samples, sizeof(SAMPLETYPE) * nSamples * channels);
+ samplesInBuffer += nSamples;
+}
+
+
+// Increases the number of samples in the buffer without copying any actual
+// samples.
+//
+// This function is used to update the number of samples in the sample buffer
+// when accessing the buffer directly with 'ptrEnd' function. Please be 
+// careful though!
+void FIFOSampleBuffer::putSamples(uint nSamples)
+{
+ uint req;
+
+ req = samplesInBuffer + nSamples;
+ ensureCapacity(req);
+ samplesInBuffer += nSamples;
+}
+
+
+// Returns a pointer to the end of the used part of the sample buffer (i.e. 
+// where the new samples are to be inserted). This function may be used for 
+// inserting new samples into the sample buffer directly. Please be careful! 
+//
+// Parameter 'slackCapacity' tells the function how much free capacity (in
+// terms of samples) there _at least_ should be, in order to the caller to
+// successfully insert all the required samples to the buffer. When necessary, 
+// the function grows the buffer size to comply with this requirement.
+//
+// When using this function as means for inserting new samples, also remember 
+// to increase the sample count afterwards, by calling the 
+// 'putSamples(numSamples)' function.
+SAMPLETYPE *FIFOSampleBuffer::ptrEnd(uint slackCapacity) 
+{
+ ensureCapacity(samplesInBuffer + slackCapacity);
+ return buffer + samplesInBuffer * channels;
+}
+
+
+// Returns a pointer to the beginning of the currently non-outputted samples. 
+// This function is provided for accessing the output samples directly. 
+// Please be careful!
+//
+// When using this function to output samples, also remember to 'remove' the
+// outputted samples from the buffer by calling the 
+// 'receiveSamples(numSamples)' function
+SAMPLETYPE *FIFOSampleBuffer::ptrBegin()
+{
+ assert(buffer);
+ return buffer + bufferPos * channels;
+}
+
+
+// Ensures that the buffer has enough capacity, i.e. space for _at least_
+// 'capacityRequirement' number of samples. The buffer is grown in steps of
+// 4 kilobytes to eliminate the need for frequently growing up the buffer,
+// as well as to round the buffer size up to the virtual memory page size.
+void FIFOSampleBuffer::ensureCapacity(uint capacityRequirement)
+{
+ SAMPLETYPE *tempUnaligned, *temp;
+
+ if (capacityRequirement > getCapacity()) 
+ {
+ // enlarge the buffer in 4kbyte steps (round up to next 4k boundary)
+ sizeInBytes = (capacityRequirement * channels * sizeof(SAMPLETYPE) + 4095) & (uint)-4096;
+ assert(sizeInBytes % 2 == 0);
+ tempUnaligned = new SAMPLETYPEsizeInBytes / sizeof(SAMPLETYPE) + 16 / sizeof(SAMPLETYPE);
+ if (tempUnaligned == NULL)
+ {
+ assert(0);
+ }
+ // Align the buffer to begin at 16byte cache line boundary for optimal performance
+ temp = (SAMPLETYPE *)SOUNDTOUCH_ALIGN_POINTER_16(tempUnaligned);
+ if (samplesInBuffer)
+ {
+ memcpy(temp, ptrBegin(), samplesInBuffer * channels * sizeof(SAMPLETYPE));
+ }
+ delete bufferUnaligned;
+ buffer = temp;
+ bufferUnaligned = tempUnaligned;
+ bufferPos = 0;
+ } 
+ else 
+ {
+ // simply rewind the buffer (if necessary)
+ rewind();
+ }
+}
+
+
+// Returns the current buffer capacity in terms of samples
+uint FIFOSampleBuffer::getCapacity() const
+{
+ return sizeInBytes / (channels * sizeof(SAMPLETYPE));
+}
+
+
+// Returns the number of samples currently in the buffer
+uint FIFOSampleBuffer::numSamples() const
+{
+ return samplesInBuffer;
+}
+
+
+// Output samples from beginning of the sample buffer. Copies demanded number
+// of samples to output and removes them from the sample buffer. If there
+// are less than 'numsample' samples in the buffer, returns all available.
+//
+// Returns number of samples copied.
+uint FIFOSampleBuffer::receiveSamples(SAMPLETYPE *output, uint maxSamples)
+{
+ uint num;
+
+ num = (maxSamples > samplesInBuffer) ? samplesInBuffer : maxSamples;
+
+ memcpy(output, ptrBegin(), channels * sizeof(SAMPLETYPE) * num);
+ return receiveSamples(num);
+}
+
+
+// Removes samples from the beginning of the sample buffer without copying them
+// anywhere. Used to reduce the number of samples in the buffer, when accessing
+// the sample buffer with the 'ptrBegin' function.
+uint FIFOSampleBuffer::receiveSamples(uint maxSamples)
+{
+ if (maxSamples >= samplesInBuffer)
+ {
+ uint temp;
+
+ temp = samplesInBuffer;
+ samplesInBuffer = 0;
+ return temp;
+ }
+
+ samplesInBuffer -= maxSamples;
+ bufferPos += maxSamples;
+
+ return maxSamples;
+}
+
+
+// Returns nonzero if the sample buffer is empty
+int FIFOSampleBuffer::isEmpty() const
+{
+ return (samplesInBuffer == 0) ? 1 : 0;
+}
+
+
+// Clears the sample buffer
+void FIFOSampleBuffer::clear()
+{
+ samplesInBuffer = 0;
+ bufferPos = 0;
+}
+
+
+/// allow trimming (downwards) amount of samples in pipeline.
+/// Returns adjusted amount of samples
+uint FIFOSampleBuffer::adjustAmountOfSamples(uint numSamples)
+{
+ if (numSamples < samplesInBuffer)
+ {
+ samplesInBuffer = numSamples;
+ }
+ return samplesInBuffer;
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/FIRFilter.cpp Added

@@ -0,0 +1,324 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// General FIR digital filter routines with MMX optimization. 
+///
+/// Notes : MMX optimized functions reside in a separate, platform-specific file, 
+/// e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp'
+///
+/// This source file contains OpenMP optimizations that allow speeding up the
+/// corss-correlation algorithm by executing it in several threads / CPU cores 
+/// in parallel. See the following article link for more detailed discussion 
+/// about SoundTouch OpenMP optimizations:
+/// http://www.softwarecoven.com/parallel-computing-in-embedded-mobile-devices
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <memory.h>
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include "FIRFilter.h"
+#include "cpu_detect.h"
+
+using namespace soundtouch;
+
+/*****************************************************************************
+ *
+ * Implementation of the class 'FIRFilter'
+ *
+ *****************************************************************************/
+
+FIRFilter::FIRFilter()
+{
+ resultDivFactor = 0;
+ resultDivider = 0;
+ length = 0;
+ lengthDiv8 = 0;
+ filterCoeffs = NULL;
+}
+
+
+FIRFilter::~FIRFilter()
+{
+ delete filterCoeffs;
+}
+
+
+// Usual C-version of the filter routine for stereo sound
+uint FIRFilter::evaluateFilterStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const
+{
+ int j, end;
+#ifdef SOUNDTOUCH_FLOAT_SAMPLES
+ // when using floating point samples, use a scaler instead of a divider
+ // because division is much slower operation than multiplying.
+ double dScaler = 1.0 / (double)resultDivider;
+#endif
+
+ assert(length != 0);
+ assert(src != NULL);
+ assert(dest != NULL);
+ assert(filterCoeffs != NULL);
+
+ end = 2 * (numSamples - length);
+
+ #pragma omp parallel for
+ for (j = 0; j < end; j += 2) 
+ {
+ const SAMPLETYPE *ptr;
+ LONG_SAMPLETYPE suml, sumr;
+ uint i;
+
+ suml = sumr = 0;
+ ptr = src + j;
+
+ for (i = 0; i < length; i += 4) 
+ {
+ // loop is unrolled by factor of 4 here for efficiency
+ suml += ptr2 * i + 0 * filterCoeffsi + 0 +
+ ptr2 * i + 2 * filterCoeffsi + 1 +
+ ptr2 * i + 4 * filterCoeffsi + 2 +
+ ptr2 * i + 6 * filterCoeffsi + 3;
+ sumr += ptr2 * i + 1 * filterCoeffsi + 0 +
+ ptr2 * i + 3 * filterCoeffsi + 1 +
+ ptr2 * i + 5 * filterCoeffsi + 2 +
+ ptr2 * i + 7 * filterCoeffsi + 3;
+ }
+
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+ suml >>= resultDivFactor;
+ sumr >>= resultDivFactor;
+ // saturate to 16 bit integer limits
+ suml = (suml < -32768) ? -32768 : (suml > 32767) ? 32767 : suml;
+ // saturate to 16 bit integer limits
+ sumr = (sumr < -32768) ? -32768 : (sumr > 32767) ? 32767 : sumr;
+#else
+ suml *= dScaler;
+ sumr *= dScaler;
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+ destj = (SAMPLETYPE)suml;
+ destj + 1 = (SAMPLETYPE)sumr;
+ }
+ return numSamples - length;
+}
+
+
+// Usual C-version of the filter routine for mono sound
+uint FIRFilter::evaluateFilterMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const
+{
+ int j, end;
+#ifdef SOUNDTOUCH_FLOAT_SAMPLES
+ // when using floating point samples, use a scaler instead of a divider
+ // because division is much slower operation than multiplying.
+ double dScaler = 1.0 / (double)resultDivider;
+#endif
+
+ assert(length != 0);
+
+ end = numSamples - length;
+ #pragma omp parallel for
+ for (j = 0; j < end; j ++) 
+ {
+ const SAMPLETYPE *pSrc = src + j;
+ LONG_SAMPLETYPE sum;
+ uint i;
+
+ sum = 0;
+ for (i = 0; i < length; i += 4) 
+ {
+ // loop is unrolled by factor of 4 here for efficiency
+ sum += pSrci + 0 * filterCoeffsi + 0 + 
+ pSrci + 1 * filterCoeffsi + 1 + 
+ pSrci + 2 * filterCoeffsi + 2 + 
+ pSrci + 3 * filterCoeffsi + 3;
+ }
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+ sum >>= resultDivFactor;
+ // saturate to 16 bit integer limits
+ sum = (sum < -32768) ? -32768 : (sum > 32767) ? 32767 : sum;
+#else
+ sum *= dScaler;
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+ destj = (SAMPLETYPE)sum;
+ }
+ return end;
+}
+
+
+uint FIRFilter::evaluateFilterMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels)
+{
+ int j, end;
+
+#ifdef SOUNDTOUCH_FLOAT_SAMPLES
+ // when using floating point samples, use a scaler instead of a divider
+ // because division is much slower operation than multiplying.
+ double dScaler = 1.0 / (double)resultDivider;
+#endif
+
+ assert(length != 0);
+ assert(src != NULL);
+ assert(dest != NULL);
+ assert(filterCoeffs != NULL);
+ assert(numChannels < 16);
+
+ end = numChannels * (numSamples - length);
+
+ #pragma omp parallel for
+ for (j = 0; j < end; j += numChannels)
+ {
+ const SAMPLETYPE *ptr;
+ LONG_SAMPLETYPE sums16;
+ uint c, i;
+
+ for (c = 0; c < numChannels; c ++)
+ {
+ sumsc = 0;
+ }
+
+ ptr = src + j;
+
+ for (i = 0; i < length; i ++)
+ {
+ SAMPLETYPE coef=filterCoeffsi;
+ for (c = 0; c < numChannels; c ++)
+ {
+ sumsc += ptr0 * coef;
+ ptr ++;
+ }
+ }
+ 
+ for (c = 0; c < numChannels; c ++)
+ {
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+ sumsc >>= resultDivFactor;
+#else
+ sumsc *= dScaler;
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+ destj+c = (SAMPLETYPE)sumsc;
+ }
+ }
+ return numSamples - length;
+}
+
+
+// Set filter coeffiecients and length.
+//
+// Throws an exception if filter length isn't divisible by 8
+void FIRFilter::setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint uResultDivFactor)
+{
+ assert(newLength > 0);
+ if (newLength % 8) assert(0);
+
+ lengthDiv8 = newLength / 8;
+ length = lengthDiv8 * 8;
+ assert(length == newLength);
+
+ resultDivFactor = uResultDivFactor;
+ resultDivider = (SAMPLETYPE)::pow(2.0, (int)resultDivFactor);
+
+ delete filterCoeffs;
+ filterCoeffs = new SAMPLETYPElength;
+ memcpy(filterCoeffs, coeffs, length * sizeof(SAMPLETYPE));
+}
+
+
+uint FIRFilter::getLength() const
+{
+ return length;
+}
+
+
+// Applies the filter to the given sequence of samples. 
+//
+// Note : The amount of outputted samples is by value of 'filter_length' 
+// smaller than the amount of input samples.
+uint FIRFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) 
+{
+ assert(length > 0);
+ assert(lengthDiv8 * 8 == length);
+
+ if (numSamples < length) return 0;
+
+#ifndef USE_MULTICH_ALWAYS
+ if (numChannels == 1)
+ {
+ return evaluateFilterMono(dest, src, numSamples);
+ } 
+ else if (numChannels == 2)
+ {
+ return evaluateFilterStereo(dest, src, numSamples);
+ }
+ else
+#endif // USE_MULTICH_ALWAYS
+ {
+ assert(numChannels > 0);
+ return evaluateFilterMulti(dest, src, numSamples, numChannels);
+ }
+}
+
+
+// Operator 'new' is overloaded so that it automatically creates a suitable instance 
+// depending on if we've a MMX-capable CPU available or not.
+void * FIRFilter::operator new(size_t s)
+{
+ // Notice! don't use "new FIRFilter" directly, use "newInstance" to create a new instance instead!
+ assert(0);
+ return newInstance();
+}
+
+
+FIRFilter * FIRFilter::newInstance()
+{
+ uint uExtensions;
+
+ uExtensions = detectCPUextensions();
+
+ // Check if MMX/SSE instruction set extensions supported by CPU
+
+#ifdef SOUNDTOUCH_ALLOW_MMX
+ // MMX routines available only with integer sample types
+ if (uExtensions & SUPPORT_MMX)
+ {
+ return ::new FIRFilterMMX;
+ }
+ else
+#endif // SOUNDTOUCH_ALLOW_MMX
+
+#ifdef SOUNDTOUCH_ALLOW_SSE
+ if (uExtensions & SUPPORT_SSE)
+ {
+ // SSE support
+ return ::new FIRFilterSSE;
+ }
+ else
+#endif // SOUNDTOUCH_ALLOW_SSE
+
+ {
+ // ISA optimizations not supported, use plain C version
+ return ::new FIRFilter;
+ }
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/FIRFilter.h Added

@@ -0,0 +1,139 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// General FIR digital filter routines with MMX optimization. 
+///
+/// Note : MMX optimized functions reside in a separate, platform-specific file, 
+/// e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp'
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef FIRFilter_H
+#define FIRFilter_H
+
+#include <stddef.h>
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+class FIRFilter 
+{
+protected:
+ // Number of FIR filter taps
+ uint length; 
+ // Number of FIR filter taps divided by 8
+ uint lengthDiv8;
+
+ // Result divider factor in 2^k format
+ uint resultDivFactor;
+
+ // Result divider value.
+ SAMPLETYPE resultDivider;
+
+ // Memory for filter coefficients
+ SAMPLETYPE *filterCoeffs;
+
+ virtual uint evaluateFilterStereo(SAMPLETYPE *dest, 
+ const SAMPLETYPE *src, 
+ uint numSamples) const;
+ virtual uint evaluateFilterMono(SAMPLETYPE *dest, 
+ const SAMPLETYPE *src, 
+ uint numSamples) const;
+ virtual uint evaluateFilterMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels);
+
+public:
+ FIRFilter();
+ virtual ~FIRFilter();
+
+ /// Operator 'new' is overloaded so that it automatically creates a suitable instance 
+ /// depending on if we've a MMX-capable CPU available or not.
+ static void * operator new(size_t s);
+
+ static FIRFilter *newInstance();
+
+ /// Applies the filter to the given sequence of samples. 
+ /// Note : The amount of outputted samples is by value of 'filter_length' 
+ /// smaller than the amount of input samples.
+ ///
+ /// \return Number of samples copied to 'dest'.
+ uint evaluate(SAMPLETYPE *dest, 
+ const SAMPLETYPE *src, 
+ uint numSamples, 
+ uint numChannels);
+
+ uint getLength() const;
+
+ virtual void setCoefficients(const SAMPLETYPE *coeffs, 
+ uint newLength, 
+ uint uResultDivFactor);
+};
+
+
+// Optional subclasses that implement CPU-specific optimizations:
+
+#ifdef SOUNDTOUCH_ALLOW_MMX
+
+/// Class that implements MMX optimized functions exclusive for 16bit integer samples type.
+ class FIRFilterMMX : public FIRFilter
+ {
+ protected:
+ short *filterCoeffsUnalign;
+ short *filterCoeffsAlign;
+
+ virtual uint evaluateFilterStereo(short *dest, const short *src, uint numSamples) const;
+ public:
+ FIRFilterMMX();
+ ~FIRFilterMMX();
+
+ virtual void setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor);
+ };
+
+#endif // SOUNDTOUCH_ALLOW_MMX
+
+
+#ifdef SOUNDTOUCH_ALLOW_SSE
+ /// Class that implements SSE optimized functions exclusive for floating point samples type.
+ class FIRFilterSSE : public FIRFilter
+ {
+ protected:
+ float *filterCoeffsUnalign;
+ float *filterCoeffsAlign;
+
+ virtual uint evaluateFilterStereo(float *dest, const float *src, uint numSamples) const;
+ public:
+ FIRFilterSSE();
+ ~FIRFilterSSE();
+
+ virtual void setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor);
+ };
+
+#endif // SOUNDTOUCH_ALLOW_SSE
+
+}
+
+#endif // FIRFilter_H

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/InterpolateCubic.cpp Added

@@ -0,0 +1,196 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Cubic interpolation routine.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <stddef.h>
+#include <math.h>
+#include "InterpolateCubic.h"
+#include "STTypes.h"
+
+using namespace soundtouch;
+
+// cubic interpolation coefficients
+static const float _coeffs= 
+{ -0.5f, 1.0f, -0.5f, 0.0f,
+ 1.5f, -2.5f, 0.0f, 1.0f,
+ -1.5f, 2.0f, 0.5f, 0.0f,
+ 0.5f, -0.5f, 0.0f, 0.0f};
+
+
+InterpolateCubic::InterpolateCubic()
+{
+ fract = 0;
+}
+
+
+void InterpolateCubic::resetRegisters()
+{
+ fract = 0;
+}
+
+
+/// Transpose mono audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateCubic::transposeMono(SAMPLETYPE *pdest, 
+ const SAMPLETYPE *psrc, 
+ int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 4;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ float out;
+ const float x3 = 1.0f;
+ const float x2 = (float)fract; // x
+ const float x1 = x2*x2; // x^2
+ const float x0 = x1*x2; // x^3
+ float y0, y1, y2, y3;
+
+ assert(fract < 1.0);
+
+ y0 = _coeffs0 * x0 + _coeffs1 * x1 + _coeffs2 * x2 + _coeffs3 * x3;
+ y1 = _coeffs4 * x0 + _coeffs5 * x1 + _coeffs6 * x2 + _coeffs7 * x3;
+ y2 = _coeffs8 * x0 + _coeffs9 * x1 + _coeffs10 * x2 + _coeffs11 * x3;
+ y3 = _coeffs12 * x0 + _coeffs13 * x1 + _coeffs14 * x2 + _coeffs15 * x3;
+
+ out = y0 * psrc0 + y1 * psrc1 + y2 * psrc2 + y3 * psrc3;
+
+ pdesti = (SAMPLETYPE)out;
+ i ++;
+
+ // update position fraction
+ fract += rate;
+ // update whole positions
+ int whole = (int)fract;
+ fract -= whole;
+ psrc += whole;
+ srcCount += whole;
+ }
+ srcSamples = srcCount;
+ return i;
+}
+
+
+/// Transpose stereo audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateCubic::transposeStereo(SAMPLETYPE *pdest, 
+ const SAMPLETYPE *psrc, 
+ int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 4;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ const float x3 = 1.0f;
+ const float x2 = (float)fract; // x
+ const float x1 = x2*x2; // x^2
+ const float x0 = x1*x2; // x^3
+ float y0, y1, y2, y3;
+ float out0, out1;
+
+ assert(fract < 1.0);
+
+ y0 = _coeffs0 * x0 + _coeffs1 * x1 + _coeffs2 * x2 + _coeffs3 * x3;
+ y1 = _coeffs4 * x0 + _coeffs5 * x1 + _coeffs6 * x2 + _coeffs7 * x3;
+ y2 = _coeffs8 * x0 + _coeffs9 * x1 + _coeffs10 * x2 + _coeffs11 * x3;
+ y3 = _coeffs12 * x0 + _coeffs13 * x1 + _coeffs14 * x2 + _coeffs15 * x3;
+
+ out0 = y0 * psrc0 + y1 * psrc2 + y2 * psrc4 + y3 * psrc6;
+ out1 = y0 * psrc1 + y1 * psrc3 + y2 * psrc5 + y3 * psrc7;
+
+ pdest2*i = (SAMPLETYPE)out0;
+ pdest2*i+1 = (SAMPLETYPE)out1;
+ i ++;
+
+ // update position fraction
+ fract += rate;
+ // update whole positions
+ int whole = (int)fract;
+ fract -= whole;
+ psrc += 2*whole;
+ srcCount += whole;
+ }
+ srcSamples = srcCount;
+ return i;
+}
+
+
+/// Transpose multi-channel audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateCubic::transposeMulti(SAMPLETYPE *pdest, 
+ const SAMPLETYPE *psrc, 
+ int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 4;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ const float x3 = 1.0f;
+ const float x2 = (float)fract; // x
+ const float x1 = x2*x2; // x^2
+ const float x0 = x1*x2; // x^3
+ float y0, y1, y2, y3;
+
+ assert(fract < 1.0);
+
+ y0 = _coeffs0 * x0 + _coeffs1 * x1 + _coeffs2 * x2 + _coeffs3 * x3;
+ y1 = _coeffs4 * x0 + _coeffs5 * x1 + _coeffs6 * x2 + _coeffs7 * x3;
+ y2 = _coeffs8 * x0 + _coeffs9 * x1 + _coeffs10 * x2 + _coeffs11 * x3;
+ y3 = _coeffs12 * x0 + _coeffs13 * x1 + _coeffs14 * x2 + _coeffs15 * x3;
+
+ for (int c = 0; c < numChannels; c ++)
+ {
+ float out;
+ out = y0 * psrcc + y1 * psrcc + numChannels + y2 * psrcc + 2 * numChannels + y3 * psrcc + 3 * numChannels;
+ pdest0 = (SAMPLETYPE)out;
+ pdest ++;
+ }
+ i ++;
+
+ // update position fraction
+ fract += rate;
+ // update whole positions
+ int whole = (int)fract;
+ fract -= whole;
+ psrc += numChannels*whole;
+ srcCount += whole;
+ }
+ srcSamples = srcCount;
+ return i;
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/InterpolateCubic.h Added

@@ -0,0 +1,63 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Cubic interpolation routine.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _InterpolateCubic_H_
+#define _InterpolateCubic_H_
+
+#include "RateTransposer.h"
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+class InterpolateCubic : public TransposerBase
+{
+protected:
+    virtual void resetRegisters();
+    virtual int transposeMono(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+    virtual int transposeStereo(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+    virtual int transposeMulti(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+
+    double fract;
+
+public:
+    InterpolateCubic();
+};
+
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/InterpolateLinear.cpp Added

@@ -0,0 +1,296 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Linear interpolation algorithm.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <assert.h>
+#include <stdlib.h>
+#include "InterpolateLinear.h"
+
+using namespace soundtouch;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// InterpolateLinearInteger - integer arithmetic implementation
+// 
+
+/// fixed-point interpolation routine precision
+#define SCALE 65536
+
+
+// Constructor
+InterpolateLinearInteger::InterpolateLinearInteger() : TransposerBase()
+{
+ // Notice: use local function calling syntax for sake of clarity, 
+ // to indicate the fact that C++ constructor can't call virtual functions.
+ resetRegisters();
+ setRate(1.0f);
+}
+
+
+void InterpolateLinearInteger::resetRegisters()
+{
+ iFract = 0;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Mono' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int InterpolateLinearInteger::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 1;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ LONG_SAMPLETYPE temp;
+ 
+ assert(iFract < SCALE);
+
+ temp = (SCALE - iFract) * src0 + iFract * src1;
+ desti = (SAMPLETYPE)(temp / SCALE);
+ i++;
+
+ iFract += iRate;
+
+ int iWhole = iFract / SCALE;
+ iFract -= iWhole * SCALE;
+ srcCount += iWhole;
+ src += iWhole;
+ }
+ srcSamples = srcCount;
+
+ return i;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Stereo' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int InterpolateLinearInteger::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 1;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ LONG_SAMPLETYPE temp0;
+ LONG_SAMPLETYPE temp1;
+ 
+ assert(iFract < SCALE);
+
+ temp0 = (SCALE - iFract) * src0 + iFract * src2;
+ temp1 = (SCALE - iFract) * src1 + iFract * src3;
+ dest0 = (SAMPLETYPE)(temp0 / SCALE);
+ dest1 = (SAMPLETYPE)(temp1 / SCALE);
+ dest += 2;
+ i++;
+
+ iFract += iRate;
+
+ int iWhole = iFract / SCALE;
+ iFract -= iWhole * SCALE;
+ srcCount += iWhole;
+ src += 2*iWhole;
+ }
+ srcSamples = srcCount;
+
+ return i;
+}
+
+
+int InterpolateLinearInteger::transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 1;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ LONG_SAMPLETYPE temp, vol1;
+ 
+ assert(iFract < SCALE);
+ vol1 = (SCALE - iFract);
+ for (int c = 0; c < numChannels; c ++)
+ {
+ temp = vol1 * srcc + iFract * srcc + numChannels;
+ dest0 = (SAMPLETYPE)(temp / SCALE);
+ dest ++;
+ }
+ i++;
+
+ iFract += iRate;
+
+ int iWhole = iFract / SCALE;
+ iFract -= iWhole * SCALE;
+ srcCount += iWhole;
+ src += iWhole * numChannels;
+ }
+ srcSamples = srcCount;
+
+ return i;
+}
+
+
+// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower 
+// iRate, larger faster iRates.
+void InterpolateLinearInteger::setRate(double newRate)
+{
+ iRate = (int)(newRate * SCALE + 0.5);
+ TransposerBase::setRate(newRate);
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// InterpolateLinearFloat - floating point arithmetic implementation
+// 
+//////////////////////////////////////////////////////////////////////////////
+
+
+// Constructor
+InterpolateLinearFloat::InterpolateLinearFloat() : TransposerBase()
+{
+ // Notice: use local function calling syntax for sake of clarity, 
+ // to indicate the fact that C++ constructor can't call virtual functions.
+ resetRegisters();
+ setRate(1.0);
+}
+
+
+void InterpolateLinearFloat::resetRegisters()
+{
+ fract = 0;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Mono' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int InterpolateLinearFloat::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 1;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ double out;
+ assert(fract < 1.0);
+
+ out = (1.0 - fract) * src0 + fract * src1;
+ desti = (SAMPLETYPE)out;
+ i ++;
+
+ // update position fraction
+ fract += rate;
+ // update whole positions
+ int whole = (int)fract;
+ fract -= whole;
+ src += whole;
+ srcCount += whole;
+ }
+ srcSamples = srcCount;
+ return i;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Mono' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int InterpolateLinearFloat::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 1;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ double out0, out1;
+ assert(fract < 1.0);
+
+ out0 = (1.0 - fract) * src0 + fract * src2;
+ out1 = (1.0 - fract) * src1 + fract * src3;
+ dest2*i = (SAMPLETYPE)out0;
+ dest2*i+1 = (SAMPLETYPE)out1;
+ i ++;
+
+ // update position fraction
+ fract += rate;
+ // update whole positions
+ int whole = (int)fract;
+ fract -= whole;
+ src += 2*whole;
+ srcCount += whole;
+ }
+ srcSamples = srcCount;
+ return i;
+}
+
+
+int InterpolateLinearFloat::transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 1;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ float temp, vol1, fract_float;
+ 
+ vol1 = (float)(1.0 - fract);
+		fract_float = (float)fract;
+ for (int c = 0; c < numChannels; c ++)
+ {
+			temp = vol1 * srcc + fract_float * srcc + numChannels;
+ *dest = (SAMPLETYPE)temp;
+ dest ++;
+ }
+ i++;
+
+ fract += rate;
+
+ int iWhole = (int)fract;
+ fract -= iWhole;
+ srcCount += iWhole;
+ src += iWhole * numChannels;
+ }
+ srcSamples = srcCount;
+
+ return i;
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/InterpolateLinear.h Added

@@ -0,0 +1,88 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Linear interpolation routine.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _InterpolateLinear_H_
+#define _InterpolateLinear_H_
+
+#include "RateTransposer.h"
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+/// Linear transposer class that uses integer arithmetic
+class InterpolateLinearInteger : public TransposerBase
+{
+protected:
+    int iFract;
+    int iRate;
+
+    virtual void resetRegisters();
+
+    virtual int transposeMono(SAMPLETYPE *dest, 
+                       const SAMPLETYPE *src, 
+                       int &srcSamples);
+    virtual int transposeStereo(SAMPLETYPE *dest, 
+                         const SAMPLETYPE *src, 
+                         int &srcSamples);
+    virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples);
+public:
+    InterpolateLinearInteger();
+
+    /// Sets new target rate. Normal rate = 1.0, smaller values represent slower 
+    /// rate, larger faster rates.
+    virtual void setRate(double newRate);
+};
+
+
+/// Linear transposer class that uses floating point arithmetic
+class InterpolateLinearFloat : public TransposerBase
+{
+protected:
+    double fract;
+
+    virtual void resetRegisters();
+
+    virtual int transposeMono(SAMPLETYPE *dest, 
+                       const SAMPLETYPE *src, 
+                       int &srcSamples);
+    virtual int transposeStereo(SAMPLETYPE *dest, 
+                         const SAMPLETYPE *src, 
+                         int &srcSamples);
+    virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, int &srcSamples);
+
+public:
+    InterpolateLinearFloat();
+};
+
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/InterpolateShannon.cpp Added

@@ -0,0 +1,181 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sample interpolation routine using 8-tap band-limited Shannon interpolation 
+/// with kaiser window.
+///
+/// Notice. This algorithm is remarkably much heavier than linear or cubic
+/// interpolation, and not remarkably better than cubic algorithm. Thus mostly
+/// for experimental purposes
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <math.h>
+#include "InterpolateShannon.h"
+#include "STTypes.h"
+
+using namespace soundtouch;
+
+
+/// Kaiser window with beta = 2.0
+/// Values scaled down by 5% to avoid overflows
+static const double _kaiser88 = 
+{
+ 0.41778693317814,
+ 0.64888025049173,
+ 0.83508562409944,
+ 0.93887857733412,
+ 0.93887857733412,
+ 0.83508562409944,
+ 0.64888025049173,
+ 0.41778693317814
+};
+
+
+InterpolateShannon::InterpolateShannon()
+{
+ fract = 0;
+}
+
+
+void InterpolateShannon::resetRegisters()
+{
+ fract = 0;
+}
+
+
+#define PI 3.1415926536
+#define sinc(x) (sin(PI * (x)) / (PI * (x)))
+
+/// Transpose mono audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateShannon::transposeMono(SAMPLETYPE *pdest, 
+ const SAMPLETYPE *psrc, 
+ int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 8;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ double out;
+ assert(fract < 1.0);
+
+ out = psrc0 * sinc(-3.0 - fract) * _kaiser80;
+ out += psrc1 * sinc(-2.0 - fract) * _kaiser81;
+ out += psrc2 * sinc(-1.0 - fract) * _kaiser82;
+ if (fract < 1e-6)
+ {
+ out += psrc3 * _kaiser83; // sinc(0) = 1
+ }
+ else
+ {
+ out += psrc3 * sinc(- fract) * _kaiser83;
+ }
+ out += psrc4 * sinc( 1.0 - fract) * _kaiser84;
+ out += psrc5 * sinc( 2.0 - fract) * _kaiser85;
+ out += psrc6 * sinc( 3.0 - fract) * _kaiser86;
+ out += psrc7 * sinc( 4.0 - fract) * _kaiser87;
+
+ pdesti = (SAMPLETYPE)out;
+ i ++;
+
+ // update position fraction
+ fract += rate;
+ // update whole positions
+ int whole = (int)fract;
+ fract -= whole;
+ psrc += whole;
+ srcCount += whole;
+ }
+ srcSamples = srcCount;
+ return i;
+}
+
+
+/// Transpose stereo audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateShannon::transposeStereo(SAMPLETYPE *pdest, 
+ const SAMPLETYPE *psrc, 
+ int &srcSamples)
+{
+ int i;
+ int srcSampleEnd = srcSamples - 8;
+ int srcCount = 0;
+
+ i = 0;
+ while (srcCount < srcSampleEnd)
+ {
+ double out0, out1, w;
+ assert(fract < 1.0);
+
+ w = sinc(-3.0 - fract) * _kaiser80;
+ out0 = psrc0 * w; out1 = psrc1 * w;
+ w = sinc(-2.0 - fract) * _kaiser81;
+ out0 += psrc2 * w; out1 += psrc3 * w;
+ w = sinc(-1.0 - fract) * _kaiser82;
+ out0 += psrc4 * w; out1 += psrc5 * w;
+ w = _kaiser83 * ((fract < 1e-5) ? 1.0 : sinc(- fract)); // sinc(0) = 1
+ out0 += psrc6 * w; out1 += psrc7 * w;
+ w = sinc( 1.0 - fract) * _kaiser84;
+ out0 += psrc8 * w; out1 += psrc9 * w;
+ w = sinc( 2.0 - fract) * _kaiser85;
+ out0 += psrc10 * w; out1 += psrc11 * w;
+ w = sinc( 3.0 - fract) * _kaiser86;
+ out0 += psrc12 * w; out1 += psrc13 * w;
+ w = sinc( 4.0 - fract) * _kaiser87;
+ out0 += psrc14 * w; out1 += psrc15 * w;
+
+ pdest2*i = (SAMPLETYPE)out0;
+ pdest2*i+1 = (SAMPLETYPE)out1;
+ i ++;
+
+ // update position fraction
+ fract += rate;
+ // update whole positions
+ int whole = (int)fract;
+ fract -= whole;
+ psrc += 2*whole;
+ srcCount += whole;
+ }
+ srcSamples = srcCount;
+ return i;
+}
+
+
+/// Transpose stereo audio. Returns number of produced output samples, and 
+/// updates "srcSamples" to amount of consumed source samples
+int InterpolateShannon::transposeMulti(SAMPLETYPE *pdest, 
+ const SAMPLETYPE *psrc, 
+ int &srcSamples)
+{
+ // not implemented
+ assert(false);
+ return 0;
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/InterpolateShannon.h Added

@@ -0,0 +1,68 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sample interpolation routine using 8-tap band-limited Shannon interpolation 
+/// with kaiser window.
+///
+/// Notice. This algorithm is remarkably much heavier than linear or cubic
+/// interpolation, and not remarkably better than cubic algorithm. Thus mostly
+/// for experimental purposes
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _InterpolateShannon_H_
+#define _InterpolateShannon_H_
+
+#include "RateTransposer.h"
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+class InterpolateShannon : public TransposerBase
+{
+protected:
+    void resetRegisters();
+    int transposeMono(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+    int transposeStereo(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+    int transposeMulti(SAMPLETYPE *dest, 
+                        const SAMPLETYPE *src, 
+                        int &srcSamples);
+
+    double fract;
+
+public:
+    InterpolateShannon();
+};
+
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/PeakFinder.cpp Added

@@ -0,0 +1,277 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Peak detection routine. 
+///
+/// The routine detects highest value on an array of values and calculates the 
+/// precise peak location as a mass-center of the 'hump' around the peak value.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <math.h>
+#include <assert.h>
+
+#include "PeakFinder.h"
+
+using namespace soundtouch;
+
+#define max(x, y) (((x) > (y)) ? (x) : (y))
+
+
+PeakFinder::PeakFinder()
+{
+ minPos = maxPos = 0;
+}
+
+
+// Finds real 'top' of a peak hump from neighnourhood of the given 'peakpos'.
+int PeakFinder::findTop(const float *data, int peakpos) const
+{
+ int i;
+ int start, end;
+ float refvalue;
+
+ refvalue = datapeakpos;
+
+ // seek within �10 points
+ start = peakpos - 10;
+ if (start < minPos) start = minPos;
+ end = peakpos + 10;
+ if (end > maxPos) end = maxPos;
+
+ for (i = start; i <= end; i ++)
+ {
+ if (datai > refvalue)
+ {
+ peakpos = i;
+ refvalue = datai;
+ }
+ }
+
+ // failure if max value is at edges of seek range => it's not peak, it's at slope.
+ if ((peakpos == start) || (peakpos == end)) return 0;
+
+ return peakpos;
+}
+
+
+// Finds 'ground level' of a peak hump by starting from 'peakpos' and proceeding
+// to direction defined by 'direction' until next 'hump' after minimum value will 
+// begin
+int PeakFinder::findGround(const float *data, int peakpos, int direction) const
+{
+ int lowpos;
+ int pos;
+ int climb_count;
+ float refvalue;
+ float delta;
+
+ climb_count = 0;
+ refvalue = datapeakpos;
+ lowpos = peakpos;
+
+ pos = peakpos;
+
+ while ((pos > minPos+1) && (pos < maxPos-1))
+ {
+ int prevpos;
+
+ prevpos = pos;
+ pos += direction;
+
+ // calculate derivate
+ delta = datapos - dataprevpos;
+ if (delta <= 0)
+ {
+ // going downhill, ok
+ if (climb_count)
+ {
+ climb_count --; // decrease climb count
+ }
+
+ // check if new minimum found
+ if (datapos < refvalue)
+ {
+ // new minimum found
+ lowpos = pos;
+ refvalue = datapos;
+ }
+ }
+ else
+ {
+ // going uphill, increase climbing counter
+ climb_count ++;
+ if (climb_count > 5) break; // we've been climbing too long => it's next uphill => quit
+ }
+ }
+ return lowpos;
+}
+
+
+// Find offset where the value crosses the given level, when starting from 'peakpos' and
+// proceeds to direction defined in 'direction'
+int PeakFinder::findCrossingLevel(const float *data, float level, int peakpos, int direction) const
+{
+ float peaklevel;
+ int pos;
+
+ peaklevel = datapeakpos;
+ assert(peaklevel >= level);
+ pos = peakpos;
+ while ((pos >= minPos) && (pos + direction < maxPos))
+ {
+ if (datapos + direction < level) return pos; // crossing found
+ pos += direction;
+ }
+ return -1; // not found
+}
+
+
+// Calculates the center of mass location of 'data' array items between 'firstPos' and 'lastPos'
+double PeakFinder::calcMassCenter(const float *data, int firstPos, int lastPos) const
+{
+ int i;
+ float sum;
+ float wsum;
+
+ sum = 0;
+ wsum = 0;
+ for (i = firstPos; i <= lastPos; i ++)
+ {
+ sum += (float)i * datai;
+ wsum += datai;
+ }
+
+ if (wsum < 1e-6) return 0;
+ return sum / wsum;
+}
+
+
+/// get exact center of peak near given position by calculating local mass of center
+double PeakFinder::getPeakCenter(const float *data, int peakpos) const
+{
+ float peakLevel; // peak level
+ int crosspos1, crosspos2; // position where the peak 'hump' crosses cutting level
+ float cutLevel; // cutting value
+ float groundLevel; // ground level of the peak
+ int gp1, gp2; // bottom positions of the peak 'hump'
+
+ // find ground positions.
+ gp1 = findGround(data, peakpos, -1);
+ gp2 = findGround(data, peakpos, 1);
+
+ peakLevel = datapeakpos;
+
+ if (gp1 == gp2) 
+ {
+ // avoid rounding errors when all are equal
+ assert(gp1 == peakpos);
+ cutLevel = groundLevel = peakLevel;
+ } else {
+ // get average of the ground levels
+ groundLevel = 0.5f * (datagp1 + datagp2);
+
+ // calculate 70%-level of the peak
+ cutLevel = 0.70f * peakLevel + 0.30f * groundLevel;
+ }
+
+ // find mid-level crossings
+ crosspos1 = findCrossingLevel(data, cutLevel, peakpos, -1);
+ crosspos2 = findCrossingLevel(data, cutLevel, peakpos, 1);
+
+ if ((crosspos1 < 0) || (crosspos2 < 0)) return 0; // no crossing, no peak..
+
+ // calculate mass center of the peak surroundings
+ return calcMassCenter(data, crosspos1, crosspos2);
+}
+
+
+double PeakFinder::detectPeak(const float *data, int aminPos, int amaxPos) 
+{
+
+ int i;
+ int peakpos; // position of peak level
+ double highPeak, peak;
+
+ this->minPos = aminPos;
+ this->maxPos = amaxPos;
+
+ // find absolute peak
+ peakpos = minPos;
+ peak = dataminPos;
+ for (i = minPos + 1; i < maxPos; i ++)
+ {
+ if (datai > peak) 
+ {
+ peak = datai;
+ peakpos = i;
+ }
+ }
+ 
+ // Calculate exact location of the highest peak mass center
+ highPeak = getPeakCenter(data, peakpos);
+ peak = highPeak;
+
+ // Now check if the highest peak were in fact harmonic of the true base beat peak 
+ // - sometimes the highest peak can be Nth harmonic of the true base peak yet 
+ // just a slightly higher than the true base
+
+ for (i = 1; i < 3; i ++)
+ {
+ double peaktmp, harmonic;
+ int i1,i2;
+
+ harmonic = (double)pow(2.0, i);
+ peakpos = (int)(highPeak / harmonic + 0.5f);
+ if (peakpos < minPos) break;
+ peakpos = findTop(data, peakpos); // seek true local maximum index
+ if (peakpos == 0) continue; // no local max here
+
+ // calculate mass-center of possible harmonic peak
+ peaktmp = getPeakCenter(data, peakpos);
+
+ // accept harmonic peak if 
+ // (a) it is found
+ // (b) is within �4% of the expected harmonic interval
+ // (c) has at least half x-corr value of the max. peak
+
+ double diff = harmonic * peaktmp / highPeak;
+ if ((diff < 0.96) || (diff > 1.04)) continue; // peak too afar from expected
+
+ // now compare to highest detected peak
+ i1 = (int)(highPeak + 0.5);
+ i2 = (int)(peaktmp + 0.5);
+ if (datai2 >= 0.4*datai1)
+ {
+ // The harmonic is at least half as high primary peak,
+ // thus use the harmonic peak instead
+ peak = peaktmp;
+ }
+ }
+
+ return peak;
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/PeakFinder.h Added

@@ -0,0 +1,90 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// The routine detects highest value on an array of values and calculates the 
+/// precise peak location as a mass-center of the 'hump' around the peak value.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _PeakFinder_H_
+#define _PeakFinder_H_
+
+namespace soundtouch
+{
+
+class PeakFinder
+{
+protected:
+ /// Min, max allowed peak positions within the data vector
+ int minPos, maxPos;
+
+ /// Calculates the mass center between given vector items.
+ double calcMassCenter(const float *data, ///< Data vector.
+ int firstPos, ///< Index of first vector item belonging to the peak.
+ int lastPos ///< Index of last vector item belonging to the peak.
+ ) const;
+
+ /// Finds the data vector index where the monotoniously decreasing signal crosses the
+ /// given level.
+ int findCrossingLevel(const float *data, ///< Data vector.
+ float level, ///< Goal crossing level.
+ int peakpos, ///< Peak position index within the data vector.
+ int direction /// Direction where to proceed from the peak: 1 = right, -1 = left.
+ ) const;
+
+ // Finds real 'top' of a peak hump from neighnourhood of the given 'peakpos'.
+ int findTop(const float *data, int peakpos) const;
+
+
+ /// Finds the 'ground' level, i.e. smallest level between two neighbouring peaks, to right- 
+ /// or left-hand side of the given peak position.
+ int findGround(const float *data, /// Data vector.
+ int peakpos, /// Peak position index within the data vector.
+ int direction /// Direction where to proceed from the peak: 1 = right, -1 = left.
+ ) const;
+
+ /// get exact center of peak near given position by calculating local mass of center
+ double getPeakCenter(const float *data, int peakpos) const;
+
+public:
+ /// Constructor. 
+ PeakFinder();
+
+ /// Detect exact peak position of the data vector by finding the largest peak 'hump'
+ /// and calculating the mass-center location of the peak hump.
+ ///
+ /// \return The location of the largest base harmonic peak hump.
+ double detectPeak(const float *data, /// Data vector to be analyzed. The data vector has
+ /// to be at least 'maxPos' items long.
+ int minPos, ///< Min allowed peak location within the vector data.
+ int maxPos ///< Max allowed peak location within the vector data.
+ );
+};
+
+}
+
+#endif // _PeakFinder_H_

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/RateTransposer.cpp Added

@@ -0,0 +1,307 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sample rate transposer. Changes sample rate by using linear interpolation 
+/// together with anti-alias filtering (first order interpolation with anti-
+/// alias filtering should be quite adequate for this application)
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <memory.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include "RateTransposer.h"
+#include "InterpolateLinear.h"
+#include "InterpolateCubic.h"
+#include "InterpolateShannon.h"
+#include "AAFilter.h"
+
+using namespace soundtouch;
+
+// Define default interpolation algorithm here
+TransposerBase::ALGORITHM TransposerBase::algorithm = TransposerBase::CUBIC;
+
+
+// Constructor
+RateTransposer::RateTransposer() : FIFOProcessor(&outputBuffer)
+{
+ bUseAAFilter = 
+#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER
+ true;
+#else
+ // Disable Anti-alias filter if desirable to avoid click at rate change zero value crossover
+ false;
+#endif
+
+ // Instantiates the anti-alias filter
+ pAAFilter = new AAFilter(64);
+ pTransposer = TransposerBase::newInstance();
+}
+
+
+RateTransposer::~RateTransposer()
+{
+ delete pAAFilter;
+ delete pTransposer;
+}
+
+
+/// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable
+void RateTransposer::enableAAFilter(bool newMode)
+{
+#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER
+ // Disable Anti-alias filter if desirable to avoid click at rate change zero value crossover
+ bUseAAFilter = newMode;
+#endif
+}
+
+
+/// Returns nonzero if anti-alias filter is enabled.
+bool RateTransposer::isAAFilterEnabled() const
+{
+ return bUseAAFilter;
+}
+
+
+AAFilter *RateTransposer::getAAFilter()
+{
+ return pAAFilter;
+}
+
+
+// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower 
+// iRate, larger faster iRates.
+void RateTransposer::setRate(double newRate)
+{
+ double fCutoff;
+
+ pTransposer->setRate(newRate);
+
+ // design a new anti-alias filter
+ if (newRate > 1.0) 
+ {
+ fCutoff = 0.5 / newRate;
+ } 
+ else 
+ {
+ fCutoff = 0.5 * newRate;
+ }
+ pAAFilter->setCutoffFreq(fCutoff);
+}
+
+
+// Adds 'nSamples' pcs of samples from the 'samples' memory position into
+// the input of the object.
+void RateTransposer::putSamples(const SAMPLETYPE *samples, uint nSamples)
+{
+ processSamples(samples, nSamples);
+}
+
+
+// Transposes sample rate by applying anti-alias filter to prevent folding. 
+// Returns amount of samples returned in the "dest" buffer.
+// The maximum amount of samples that can be returned at a time is set by
+// the 'set_returnBuffer_size' function.
+void RateTransposer::processSamples(const SAMPLETYPE *src, uint nSamples)
+{
+ uint count;
+
+ if (nSamples == 0) return;
+
+ // Store samples to input buffer
+ inputBuffer.putSamples(src, nSamples);
+
+ // If anti-alias filter is turned off, simply transpose without applying
+ // the filter
+ if (bUseAAFilter == false) 
+ {
+ count = pTransposer->transpose(outputBuffer, inputBuffer);
+ return;
+ }
+
+ assert(pAAFilter);
+
+ // Transpose with anti-alias filter
+ if (pTransposer->rate < 1.0f) 
+ {
+ // If the parameter 'Rate' value is smaller than 1, first transpose
+ // the samples and then apply the anti-alias filter to remove aliasing.
+
+ // Transpose the samples, store the result to end of "midBuffer"
+ pTransposer->transpose(midBuffer, inputBuffer);
+
+ // Apply the anti-alias filter for transposed samples in midBuffer
+ pAAFilter->evaluate(outputBuffer, midBuffer);
+ } 
+ else 
+ {
+ // If the parameter 'Rate' value is larger than 1, first apply the
+ // anti-alias filter to remove high frequencies (prevent them from folding
+ // over the lover frequencies), then transpose.
+
+ // Apply the anti-alias filter for samples in inputBuffer
+ pAAFilter->evaluate(midBuffer, inputBuffer);
+
+ // Transpose the AA-filtered samples in "midBuffer"
+ pTransposer->transpose(outputBuffer, midBuffer);
+ }
+}
+
+
+// Sets the number of channels, 1 = mono, 2 = stereo
+void RateTransposer::setChannels(int nChannels)
+{
+ if (!verifyNumberOfChannels(nChannels) ||
+ (pTransposer->numChannels == nChannels)) return;
+
+ pTransposer->setChannels(nChannels);
+ inputBuffer.setChannels(nChannels);
+ midBuffer.setChannels(nChannels);
+ outputBuffer.setChannels(nChannels);
+}
+
+
+// Clears all the samples in the object
+void RateTransposer::clear()
+{
+ outputBuffer.clear();
+ midBuffer.clear();
+ inputBuffer.clear();
+}
+
+
+// Returns nonzero if there aren't any samples available for outputting.
+int RateTransposer::isEmpty() const
+{
+ int res;
+
+ res = FIFOProcessor::isEmpty();
+ if (res == 0) return 0;
+ return inputBuffer.isEmpty();
+}
+
+
+/// Return approximate initial input-output latency
+int RateTransposer::getLatency() const
+{
+ return (bUseAAFilter) ? pAAFilter->getLength() : 0;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// TransposerBase - Base class for interpolation
+// 
+
+// static function to set interpolation algorithm
+void TransposerBase::setAlgorithm(TransposerBase::ALGORITHM a)
+{
+ TransposerBase::algorithm = a;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// Returns the number of samples returned in the "dest" buffer
+int TransposerBase::transpose(FIFOSampleBuffer &dest, FIFOSampleBuffer &src)
+{
+ int numSrcSamples = src.numSamples();
+ int sizeDemand = (int)((double)numSrcSamples / rate) + 8;
+ int numOutput;
+ SAMPLETYPE *psrc = src.ptrBegin();
+ SAMPLETYPE *pdest = dest.ptrEnd(sizeDemand);
+
+#ifndef USE_MULTICH_ALWAYS
+ if (numChannels == 1)
+ {
+ numOutput = transposeMono(pdest, psrc, numSrcSamples);
+ }
+ else if (numChannels == 2) 
+ {
+ numOutput = transposeStereo(pdest, psrc, numSrcSamples);
+ } 
+ else 
+#endif // USE_MULTICH_ALWAYS
+ {
+ assert(numChannels > 0);
+ numOutput = transposeMulti(pdest, psrc, numSrcSamples);
+ }
+ dest.putSamples(numOutput);
+ src.receiveSamples(numSrcSamples);
+ return numOutput;
+}
+
+
+TransposerBase::TransposerBase()
+{
+ numChannels = 0;
+ rate = 1.0f;
+}
+
+
+TransposerBase::~TransposerBase()
+{
+}
+
+
+void TransposerBase::setChannels(int channels)
+{
+ numChannels = channels;
+ resetRegisters();
+}
+
+
+void TransposerBase::setRate(double newRate)
+{
+ rate = newRate;
+}
+
+
+// static factory function
+TransposerBase *TransposerBase::newInstance()
+{
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+ // Notice: For integer arithmetic support only linear algorithm (due to simplest calculus)
+ return ::new InterpolateLinearInteger;
+#else
+ switch (algorithm)
+ {
+ case LINEAR:
+ return new InterpolateLinearFloat;
+
+ case CUBIC:
+ return new InterpolateCubic;
+
+ case SHANNON:
+ return new InterpolateShannon;
+
+ default:
+ assert(false);
+ return NULL;
+ }
+#endif
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/RateTransposer.h Added

@@ -0,0 +1,163 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sample rate transposer. Changes sample rate by using linear interpolation 
+/// together with anti-alias filtering (first order interpolation with anti-
+/// alias filtering should be quite adequate for this application).
+///
+/// Use either of the derived classes of 'RateTransposerInteger' or 
+/// 'RateTransposerFloat' for corresponding integer/floating point tranposing
+/// algorithm implementation.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef RateTransposer_H
+#define RateTransposer_H
+
+#include <stddef.h>
+#include "AAFilter.h"
+#include "FIFOSamplePipe.h"
+#include "FIFOSampleBuffer.h"
+
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+/// Abstract base class for transposer implementations (linear, advanced vs integer, float etc)
+class TransposerBase
+{
+public:
+ enum ALGORITHM {
+ LINEAR = 0,
+ CUBIC,
+ SHANNON
+ };
+
+protected:
+ virtual void resetRegisters() = 0;
+
+ virtual int transposeMono(SAMPLETYPE *dest, 
+ const SAMPLETYPE *src, 
+ int &srcSamples) = 0;
+ virtual int transposeStereo(SAMPLETYPE *dest, 
+ const SAMPLETYPE *src, 
+ int &srcSamples) = 0;
+ virtual int transposeMulti(SAMPLETYPE *dest, 
+ const SAMPLETYPE *src, 
+ int &srcSamples) = 0;
+
+ static ALGORITHM algorithm;
+
+public:
+ double rate;
+ int numChannels;
+
+ TransposerBase();
+ virtual ~TransposerBase();
+
+ virtual int transpose(FIFOSampleBuffer &dest, FIFOSampleBuffer &src);
+ virtual void setRate(double newRate);
+ virtual void setChannels(int channels);
+
+ // static factory function
+ static TransposerBase *newInstance();
+
+ // static function to set interpolation algorithm
+ static void setAlgorithm(ALGORITHM a);
+};
+
+
+/// A common linear samplerate transposer class.
+///
+class RateTransposer : public FIFOProcessor
+{
+protected:
+ /// Anti-alias filter object
+ AAFilter *pAAFilter;
+ TransposerBase *pTransposer;
+
+ /// Buffer for collecting samples to feed the anti-alias filter between
+ /// two batches
+ FIFOSampleBuffer inputBuffer;
+
+ /// Buffer for keeping samples between transposing & anti-alias filter
+ FIFOSampleBuffer midBuffer;
+
+ /// Output sample buffer
+ FIFOSampleBuffer outputBuffer;
+
+ bool bUseAAFilter;
+
+
+ /// Transposes sample rate by applying anti-alias filter to prevent folding. 
+ /// Returns amount of samples returned in the "dest" buffer.
+ /// The maximum amount of samples that can be returned at a time is set by
+ /// the 'set_returnBuffer_size' function.
+ void processSamples(const SAMPLETYPE *src, 
+ uint numSamples);
+
+public:
+ RateTransposer();
+ virtual ~RateTransposer();
+
+ /// Returns the output buffer object
+ FIFOSamplePipe *getOutput() { return &outputBuffer; };
+
+ /// Return anti-alias filter object
+ AAFilter *getAAFilter();
+
+ /// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable
+ void enableAAFilter(bool newMode);
+
+ /// Returns nonzero if anti-alias filter is enabled.
+ bool isAAFilterEnabled() const;
+
+ /// Sets new target rate. Normal rate = 1.0, smaller values represent slower 
+ /// rate, larger faster rates.
+ virtual void setRate(double newRate);
+
+ /// Sets the number of channels, 1 = mono, 2 = stereo
+ void setChannels(int channels);
+
+ /// Adds 'numSamples' pcs of samples from the 'samples' memory position into
+ /// the input of the object.
+ void putSamples(const SAMPLETYPE *samples, uint numSamples);
+
+ /// Clears all the samples in the object
+ void clear();
+
+ /// Returns nonzero if there aren't any samples available for outputting.
+ int isEmpty() const;
+
+ /// Return approximate initial input-output latency
+ int getLatency() const;
+};
+
+}
+
+#endif

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/SoundTouch.cpp Added

@@ -0,0 +1,538 @@
+//////////////////////////////////////////////////////////////////////////////
+///
+/// SoundTouch - main class for tempo/pitch/rate adjusting routines. 
+///
+/// Notes:
+/// - Initialize the SoundTouch object instance by setting up the sound stream 
+/// parameters with functions 'setSampleRate' and 'setChannels', then set 
+/// desired tempo/pitch/rate settings with the corresponding functions.
+///
+/// - The SoundTouch class behaves like a first-in-first-out pipeline: The 
+/// samples that are to be processed are fed into one of the pipe by calling
+/// function 'putSamples', while the ready processed samples can be read 
+/// from the other end of the pipeline with function 'receiveSamples'.
+/// 
+/// - The SoundTouch processing classes require certain sized 'batches' of 
+/// samples in order to process the sound. For this reason the classes buffer 
+/// incoming samples until there are enough of samples available for 
+/// processing, then they carry out the processing step and consequently
+/// make the processed samples available for outputting.
+/// 
+/// - For the above reason, the processing routines introduce a certain 
+/// 'latency' between the input and output, so that the samples input to
+/// SoundTouch may not be immediately available in the output, and neither 
+/// the amount of outputtable samples may not immediately be in direct 
+/// relationship with the amount of previously input samples.
+///
+/// - The tempo/pitch/rate control parameters can be altered during processing.
+/// Please notice though that they aren't currently protected by semaphores,
+/// so in multi-thread application external semaphore protection may be
+/// required.
+///
+/// - This class utilizes classes 'TDStretch' for tempo change (without modifying
+/// pitch) and 'RateTransposer' for changing the playback rate (that is, both 
+/// tempo and pitch in the same ratio) of the sound. The third available control 
+/// 'pitch' (change pitch but maintain tempo) is produced by a combination of
+/// combining the two other controls.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <assert.h>
+#include <stdlib.h>
+#include <memory.h>
+#include <math.h>
+#include <stdio.h>
+
+#include "SoundTouch.h"
+#include "TDStretch.h"
+#include "RateTransposer.h"
+#include "cpu_detect.h"
+
+using namespace soundtouch;
+ 
+/// test if two floating point numbers are equal
+#define TEST_FLOAT_EQUAL(a, b) (fabs(a - b) < 1e-10)
+
+
+/// Print library version string for autoconf
+extern "C" void soundtouch_ac_test()
+{
+ printf("SoundTouch Version: %s\n",SOUNDTOUCH_VERSION);
+} 
+
+
+SoundTouch::SoundTouch()
+{
+ // Initialize rate transposer and tempo changer instances
+
+ pRateTransposer = new RateTransposer();
+ pTDStretch = TDStretch::newInstance();
+
+ setOutPipe(pTDStretch);
+
+ rate = tempo = 0;
+
+ virtualPitch = 
+ virtualRate = 
+ virtualTempo = 1.0;
+
+ calcEffectiveRateAndTempo();
+
+ samplesExpectedOut = 0;
+ samplesOutput = 0;
+
+ channels = 0;
+ bSrateSet = false;
+}
+
+
+SoundTouch::~SoundTouch()
+{
+ delete pRateTransposer;
+ delete pTDStretch;
+}
+
+
+/// Get SoundTouch library version string
+const char *SoundTouch::getVersionString()
+{
+ static const char *_version = SOUNDTOUCH_VERSION;
+
+ return _version;
+}
+
+
+/// Get SoundTouch library version Id
+uint SoundTouch::getVersionId()
+{
+ return SOUNDTOUCH_VERSION_ID;
+}
+
+
+// Sets the number of channels, 1 = mono, 2 = stereo
+void SoundTouch::setChannels(uint numChannels)
+{
+ if (!verifyNumberOfChannels(numChannels)) return;
+
+ channels = numChannels;
+ pRateTransposer->setChannels((int)numChannels);
+ pTDStretch->setChannels((int)numChannels);
+}
+
+
+// Sets new rate control value. Normal rate = 1.0, smaller values
+// represent slower rate, larger faster rates.
+void SoundTouch::setRate(double newRate)
+{
+ virtualRate = newRate;
+ calcEffectiveRateAndTempo();
+}
+
+
+// Sets new rate control value as a difference in percents compared
+// to the original rate (-50 .. +100 %)
+void SoundTouch::setRateChange(double newRate)
+{
+ virtualRate = 1.0 + 0.01 * newRate;
+ calcEffectiveRateAndTempo();
+}
+
+
+// Sets new tempo control value. Normal tempo = 1.0, smaller values
+// represent slower tempo, larger faster tempo.
+void SoundTouch::setTempo(double newTempo)
+{
+ virtualTempo = newTempo;
+ calcEffectiveRateAndTempo();
+}
+
+
+// Sets new tempo control value as a difference in percents compared
+// to the original tempo (-50 .. +100 %)
+void SoundTouch::setTempoChange(double newTempo)
+{
+ virtualTempo = 1.0 + 0.01 * newTempo;
+ calcEffectiveRateAndTempo();
+}
+
+
+// Sets new pitch control value. Original pitch = 1.0, smaller values
+// represent lower pitches, larger values higher pitch.
+void SoundTouch::setPitch(double newPitch)
+{
+ virtualPitch = newPitch;
+ calcEffectiveRateAndTempo();
+}
+
+
+// Sets pitch change in octaves compared to the original pitch
+// (-1.00 .. +1.00)
+void SoundTouch::setPitchOctaves(double newPitch)
+{
+ virtualPitch = exp(0.69314718056 * newPitch);
+ calcEffectiveRateAndTempo();
+}
+
+
+// Sets pitch change in semi-tones compared to the original pitch
+// (-12 .. +12)
+void SoundTouch::setPitchSemiTones(int newPitch)
+{
+ setPitchOctaves((double)newPitch / 12.0);
+}
+
+
+void SoundTouch::setPitchSemiTones(double newPitch)
+{
+ setPitchOctaves(newPitch / 12.0);
+}
+
+
+// Calculates 'effective' rate and tempo values from the
+// nominal control values.
+void SoundTouch::calcEffectiveRateAndTempo()
+{
+ double oldTempo = tempo;
+ double oldRate = rate;
+
+ tempo = virtualTempo / virtualPitch;
+ rate = virtualPitch * virtualRate;
+
+ if (!TEST_FLOAT_EQUAL(rate,oldRate)) pRateTransposer->setRate(rate);
+ if (!TEST_FLOAT_EQUAL(tempo, oldTempo)) pTDStretch->setTempo(tempo);
+
+#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER
+ if (rate <= 1.0f) 
+ {
+ if (output != pTDStretch) 
+ {
+ FIFOSamplePipe *tempoOut;
+
+ assert(output == pRateTransposer);
+ // move samples in the current output buffer to the output of pTDStretch
+ tempoOut = pTDStretch->getOutput();
+ tempoOut->moveSamples(*output);
+ // move samples in pitch transposer's store buffer to tempo changer's input
+ // deprecated : pTDStretch->moveSamples(*pRateTransposer->getStore());
+
+ output = pTDStretch;
+ }
+ }
+ else
+#endif
+ {
+ if (output != pRateTransposer) 
+ {
+ FIFOSamplePipe *transOut;
+
+ assert(output == pTDStretch);
+ // move samples in the current output buffer to the output of pRateTransposer
+ transOut = pRateTransposer->getOutput();
+ transOut->moveSamples(*output);
+ // move samples in tempo changer's input to pitch transposer's input
+ pRateTransposer->moveSamples(*pTDStretch->getInput());
+
+ output = pRateTransposer;
+ }
+ } 
+}
+
+
+// Sets sample rate.
+void SoundTouch::setSampleRate(uint srate)
+{
+ // set sample rate, leave other tempo changer parameters as they are.
+ pTDStretch->setParameters((int)srate);
+ bSrateSet = true;
+}
+
+
+// Adds 'numSamples' pcs of samples from the 'samples' memory position into
+// the input of the object.
+void SoundTouch::putSamples(const SAMPLETYPE *samples, uint nSamples)
+{
+ if (bSrateSet == false) 
+ {
+ assert(0);
+ } 
+ else if (channels == 0) 
+ {
+ assert(0);
+ }
+
+ // accumulate how many samples are expected out from processing, given the current 
+ // processing setting
+ samplesExpectedOut += (double)nSamples / ((double)rate * (double)tempo);
+
+#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER
+ if (rate <= 1.0f) 
+ {
+ // transpose the rate down, output the transposed sound to tempo changer buffer
+ assert(output == pTDStretch);
+ pRateTransposer->putSamples(samples, nSamples);
+ pTDStretch->moveSamples(*pRateTransposer);
+ } 
+ else 
+#endif
+ {
+ // evaluate the tempo changer, then transpose the rate up, 
+ assert(output == pRateTransposer);
+ pTDStretch->putSamples(samples, nSamples);
+ pRateTransposer->moveSamples(*pTDStretch);
+ }
+}
+
+
+// Flushes the last samples from the processing pipeline to the output.
+// Clears also the internal processing buffers.
+//
+// Note: This function is meant for extracting the last samples of a sound
+// stream. This function may introduce additional blank samples in the end
+// of the sound stream, and thus it's not recommended to call this function
+// in the middle of a sound stream.
+void SoundTouch::flush()
+{
+ int i;
+ int numStillExpected;
+ SAMPLETYPE *buff = new SAMPLETYPE128 * channels;
+
+ // how many samples are still expected to output
+ numStillExpected = (int)((long)(samplesExpectedOut + 0.5) - samplesOutput);
+ if (numStillExpected < 0) numStillExpected = 0;
+
+ memset(buff, 0, 128 * channels * sizeof(SAMPLETYPE));
+ // "Push" the last active samples out from the processing pipeline by
+ // feeding blank samples into the processing pipeline until new, 
+ // processed samples appear in the output (not however, more than 
+ // 24ksamples in any case)
+ for (i = 0; (numStillExpected > (int)numSamples()) && (i < 200); i ++)
+ {
+ putSamples(buff, 128);
+ }
+
+ adjustAmountOfSamples(numStillExpected);
+
+ delete buff;
+
+ // Clear input buffers
+ pTDStretch->clearInput();
+ // yet leave the output intouched as that's where the
+ // flushed samples are!
+}
+
+
+// Changes a setting controlling the processing system behaviour. See the
+// 'SETTING_...' defines for available setting ID's.
+bool SoundTouch::setSetting(int settingId, int value)
+{
+ int sampleRate, sequenceMs, seekWindowMs, overlapMs;
+
+ // read current tdstretch routine parameters
+ pTDStretch->getParameters(&sampleRate, &sequenceMs, &seekWindowMs, &overlapMs);
+
+ switch (settingId) 
+ {
+ case SETTING_USE_AA_FILTER :
+ // enables / disabless anti-alias filter
+ pRateTransposer->enableAAFilter((value != 0) ? true : false);
+ return true;
+
+ case SETTING_AA_FILTER_LENGTH :
+ // sets anti-alias filter length
+ pRateTransposer->getAAFilter()->setLength(value);
+ return true;
+
+ case SETTING_USE_QUICKSEEK :
+ // enables / disables tempo routine quick seeking algorithm
+ pTDStretch->enableQuickSeek((value != 0) ? true : false);
+ return true;
+
+ case SETTING_SEQUENCE_MS:
+ // change time-stretch sequence duration parameter
+ pTDStretch->setParameters(sampleRate, value, seekWindowMs, overlapMs);
+ return true;
+
+ case SETTING_SEEKWINDOW_MS:
+ // change time-stretch seek window length parameter
+ pTDStretch->setParameters(sampleRate, sequenceMs, value, overlapMs);
+ return true;
+
+ case SETTING_OVERLAP_MS:
+ // change time-stretch overlap length parameter
+ pTDStretch->setParameters(sampleRate, sequenceMs, seekWindowMs, value);
+ return true;
+
+ default :
+ return false;
+ }
+}
+
+
+// Reads a setting controlling the processing system behaviour. See the
+// 'SETTING_...' defines for available setting ID's.
+//
+// Returns the setting value.
+int SoundTouch::getSetting(int settingId) const
+{
+ int temp;
+
+ switch (settingId) 
+ {
+ case SETTING_USE_AA_FILTER :
+ return (uint)pRateTransposer->isAAFilterEnabled();
+
+ case SETTING_AA_FILTER_LENGTH :
+ return pRateTransposer->getAAFilter()->getLength();
+
+ case SETTING_USE_QUICKSEEK :
+ return (uint)pTDStretch->isQuickSeekEnabled();
+
+ case SETTING_SEQUENCE_MS:
+ pTDStretch->getParameters(NULL, &temp, NULL, NULL);
+ return temp;
+
+ case SETTING_SEEKWINDOW_MS:
+ pTDStretch->getParameters(NULL, NULL, &temp, NULL);
+ return temp;
+
+ case SETTING_OVERLAP_MS:
+ pTDStretch->getParameters(NULL, NULL, NULL, &temp);
+ return temp;
+
+ case SETTING_NOMINAL_INPUT_SEQUENCE :
+ {
+ int size = pTDStretch->getInputSampleReq();
+
+#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER
+ if (rate <= 1.0)
+ {
+ // transposing done before timestretch, which impacts latency
+ return (int)(size * rate + 0.5);
+ }
+#endif
+ return size;
+ }
+
+ case SETTING_NOMINAL_OUTPUT_SEQUENCE :
+ {
+ int size = pTDStretch->getOutputBatchSize();
+
+ if (rate > 1.0)
+ {
+ // transposing done after timestretch, which impacts latency
+ return (int)(size / rate + 0.5);
+ }
+ return size;
+ }
+
+ case SETTING_INITIAL_LATENCY:
+ {
+ double latency = pTDStretch->getLatency();
+ int latency_tr = pRateTransposer->getLatency();
+
+#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER
+ if (rate <= 1.0)
+ {
+ // transposing done before timestretch, which impacts latency
+ latency = (latency + latency_tr) * rate;
+ }
+ else
+#endif
+ {
+ latency += (double)latency_tr / rate;
+ }
+
+ return (int)(latency + 0.5);
+ }
+
+ default :
+ return 0;
+ }
+}
+
+
+// Clears all the samples in the object's output and internal processing
+// buffers.
+void SoundTouch::clear()
+{
+ samplesExpectedOut = 0;
+ samplesOutput = 0;
+ pRateTransposer->clear();
+ pTDStretch->clear();
+}
+
+
+/// Returns number of samples currently unprocessed.
+uint SoundTouch::numUnprocessedSamples() const
+{
+ FIFOSamplePipe * psp;
+ if (pTDStretch)
+ {
+ psp = pTDStretch->getInput();
+ if (psp)
+ {
+ return psp->numSamples();
+ }
+ }
+ return 0;
+}
+
+
+/// Output samples from beginning of the sample buffer. Copies requested samples to 
+/// output buffer and removes them from the sample buffer. If there are less than 
+/// 'numsample' samples in the buffer, returns all that available.
+///
+/// \return Number of samples returned.
+uint SoundTouch::receiveSamples(SAMPLETYPE *output, uint maxSamples)
+{
+ uint ret = FIFOProcessor::receiveSamples(output, maxSamples);
+ samplesOutput += (long)ret;
+ return ret;
+}
+
+
+/// Adjusts book-keeping so that given number of samples are removed from beginning of the 
+/// sample buffer without copying them anywhere. 
+///
+/// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
+/// with 'ptrBegin' function.
+uint SoundTouch::receiveSamples(uint maxSamples)
+{
+ uint ret = FIFOProcessor::receiveSamples(maxSamples);
+ samplesOutput += (long)ret;
+ return ret;
+}
+
+
+/// Get ratio between input and output audio durations, useful for calculating
+/// processed output duration: if you'll process a stream of N samples, then 
+/// you can expect to get out N * getInputOutputSampleRatio() samples.
+double SoundTouch::getInputOutputSampleRatio()
+{
+ return 1.0 / (tempo * rate);
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/SoundTouch.sln Added

@@ -0,0 +1,29 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "SoundTouch.vcxproj", "{68A5DD20-7057-448B-8FE0-B6AC8D205509}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+		ReleaseX64|Win32 = ReleaseX64|Win32
+		ReleaseX64|x64 = ReleaseX64|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.ActiveCfg = Debug|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.ActiveCfg = Debug|x64
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.ActiveCfg = Release|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.ActiveCfg = Release|x64
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.ReleaseX64|Win32.ActiveCfg = ReleaseX64|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.ReleaseX64|Win32.Build.0 = ReleaseX64|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.ReleaseX64|x64.ActiveCfg = ReleaseX64|x64
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.ReleaseX64|x64.Build.0 = ReleaseX64|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/SoundTouch.vcxproj Added

@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{68A5DD20-7057-448B-8FE0-B6AC8D205509}</ProjectGuid>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ <UseOfMfc>false</UseOfMfc>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ <TargetName>$(ProjectName)_x64</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ <TargetName>$(ProjectName)D</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <OutDir>$(Platform)\$(Configuration)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
+ <TargetName>$(ProjectName)D_x64</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <PrecompiledHeader />
+ <PrecompiledHeaderOutputFile>$(OutDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(OutDir)</AssemblerListingLocation>
+ <ObjectFileName>$(OutDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat />
+ <CompileAs>Default</CompileAs>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
+ <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040b</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <PostBuildEvent>
+ <Command>if not exist ..\..\lib mkdir ..\..\lib
+copy $(OutDir)$(TargetName)$(TargetExt) ..\..\lib</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <PrecompiledHeader />
+ <PrecompiledHeaderOutputFile>$(OutDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(OutDir)</AssemblerListingLocation>
+ <ObjectFileName>$(OutDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat />
+ <CompileAs>Default</CompileAs>
+ <EnableEnhancedInstructionSet>
+ </EnableEnhancedInstructionSet>
+ <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
+ <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040b</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <PostBuildEvent>
+ <Command>if not exist ..\..\lib mkdir ..\..\lib
+copy $(OutDir)$(TargetName)$(TargetExt) ..\..\lib</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <PrecompiledHeader />
+ <PrecompiledHeaderOutputFile>$(OutDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(OutDir)</AssemblerListingLocation>
+ <ObjectFileName>$(OutDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+ <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
+ <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040b</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <PostBuildEvent>
+ <Command>if not exist ..\..\lib mkdir ..\..\lib
+copy $(OutDir)$(TargetName)$(TargetExt) ..\..\lib</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <FloatingPointModel>Fast</FloatingPointModel>
+ <PrecompiledHeader />
+ <PrecompiledHeaderOutputFile>$(OutDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(OutDir)</AssemblerListingLocation>
+ <ObjectFileName>$(OutDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <CompileAs>Default</CompileAs>
+ <EnableEnhancedInstructionSet>
+ </EnableEnhancedInstructionSet>
+ <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
+ <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040b</Culture>
+ </ResourceCompile>
+ <Lib>
+ <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <PostBuildEvent>
+ <Command>if not exist ..\..\lib mkdir ..\..\lib
+copy $(OutDir)$(TargetName)$(TargetExt) ..\..\lib</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="AAFilter.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+ </ClCompile>
+ <ClCompile Include="BPMDetect.cpp">
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4996</DisableSpecificWarnings>
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4996</DisableSpecificWarnings>
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4996</DisableSpecificWarnings>
+ <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4996</DisableSpecificWarnings>
+ </ClCompile>
+ <ClCompile Include="cpu_detect_x86.cpp" />
+ <ClCompile Include="FIFOSampleBuffer.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+ </ClCompile>
+ <ClCompile Include="FIRFilter.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+ </ClCompile>
+ <ClCompile Include="InterpolateCubic.cpp" />
+ <ClCompile Include="InterpolateLinear.cpp" />
+ <ClCompile Include="InterpolateShannon.cpp" />
+ <ClCompile Include="mmx_optimized.cpp" />
+ <ClCompile Include="PeakFinder.cpp" />
+ <ClCompile Include="RateTransposer.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+ </ClCompile>
+ <ClCompile Include="SoundTouch.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+ </ClCompile>
+ <ClCompile Include="sse_optimized.cpp" />
+ <ClCompile Include="TDStretch.cpp">
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
+ <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
+ <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
+ <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\BPMDetect.h" />
+ <ClInclude Include="..\..\include\FIFOSampleBuffer.h" />
+ <ClInclude Include="..\..\include\FIFOSamplePipe.h" />
+ <ClInclude Include="..\..\include\SoundTouch.h" />
+ <ClInclude Include="..\..\include\STTypes.h" />
+ <ClInclude Include="AAFilter.h" />
+ <ClInclude Include="cpu_detect.h" />
+ <ClInclude Include="FIRFilter.h" />
+ <ClInclude Include="InterpolateCubic.h" />
+ <ClInclude Include="InterpolateLinear.h" />
+ <ClInclude Include="InterpolateShannon.h" />
+ <ClInclude Include="PeakFinder.h" />
+ <ClInclude Include="RateTransposer.h" />
+ <ClInclude Include="TDStretch.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/TDStretch.cpp Added

@@ -0,0 +1,1111 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo 
+/// while maintaining the original pitch by using a time domain WSOLA-like 
+/// method with several performance-increasing tweaks.
+///
+/// Notes : MMX optimized functions reside in a separate, platform-specific 
+/// file, e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp'.
+///
+/// This source file contains OpenMP optimizations that allow speeding up the
+/// corss-correlation algorithm by executing it in several threads / CPU cores 
+/// in parallel. See the following article link for more detailed discussion 
+/// about SoundTouch OpenMP optimizations:
+/// http://www.softwarecoven.com/parallel-computing-in-embedded-mobile-devices
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <string.h>
+#include <limits.h>
+#include <assert.h>
+#include <math.h>
+#include <float.h>
+
+#include "STTypes.h"
+#include "cpu_detect.h"
+#include "TDStretch.h"
+
+using namespace soundtouch;
+
+#define max(x, y) (((x) > (y)) ? (x) : (y))
+
+
+/*****************************************************************************
+ *
+ * Constant definitions
+ *
+ *****************************************************************************/
+
+// Table for the hierarchical mixing position seeking algorithm
+const short _scanOffsets524={
+ { 124, 186, 248, 310, 372, 434, 496, 558, 620, 682, 744, 806,
+ 868, 930, 992, 1054, 1116, 1178, 1240, 1302, 1364, 1426, 1488, 0},
+ {-100, -75, -50, -25, 25, 50, 75, 100, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+ { -20, -15, -10, -5, 5, 10, 15, 20, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+ { -4, -3, -2, -1, 1, 2, 3, 4, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+ { 121, 114, 97, 114, 98, 105, 108, 32, 104, 99, 117, 111,
+ 116, 100, 110, 117, 111, 115, 0, 0, 0, 0, 0, 0}};
+
+/*****************************************************************************
+ *
+ * Implementation of the class 'TDStretch'
+ *
+ *****************************************************************************/
+
+
+TDStretch::TDStretch() : FIFOProcessor(&outputBuffer)
+{
+ bQuickSeek = false;
+ channels = 2;
+
+ pMidBuffer = NULL;
+ pMidBufferUnaligned = NULL;
+ overlapLength = 0;
+
+ bAutoSeqSetting = true;
+ bAutoSeekSetting = true;
+
+ maxnorm = 0;
+ maxnormf = 1e8;
+
+ skipFract = 0;
+
+ tempo = 1.0f;
+ setParameters(44100, DEFAULT_SEQUENCE_MS, DEFAULT_SEEKWINDOW_MS, DEFAULT_OVERLAP_MS);
+ setTempo(1.0f);
+
+ clear();
+}
+
+
+
+TDStretch::~TDStretch()
+{
+ delete pMidBufferUnaligned;
+}
+
+
+
+// Sets routine control parameters. These control are certain time constants
+// defining how the sound is stretched to the desired duration.
+//
+// 'sampleRate' = sample rate of the sound
+// 'sequenceMS' = one processing sequence length in milliseconds (default = 82 ms)
+// 'seekwindowMS' = seeking window length for scanning the best overlapping 
+// position (default = 28 ms)
+// 'overlapMS' = overlapping length (default = 12 ms)
+
+void TDStretch::setParameters(int aSampleRate, int aSequenceMS, 
+ int aSeekWindowMS, int aOverlapMS)
+{
+ // accept only positive parameter values - if zero or negative, use old values instead
+ if (aSampleRate > 0)
+ {
+ if (aSampleRate > 192000) assert(0);
+ this->sampleRate = aSampleRate;
+ }
+
+ if (aOverlapMS > 0) this->overlapMs = aOverlapMS;
+
+ if (aSequenceMS > 0)
+ {
+ this->sequenceMs = aSequenceMS;
+ bAutoSeqSetting = false;
+ } 
+ else if (aSequenceMS == 0)
+ {
+ // if zero, use automatic setting
+ bAutoSeqSetting = true;
+ }
+
+ if (aSeekWindowMS > 0) 
+ {
+ this->seekWindowMs = aSeekWindowMS;
+ bAutoSeekSetting = false;
+ } 
+ else if (aSeekWindowMS == 0) 
+ {
+ // if zero, use automatic setting
+ bAutoSeekSetting = true;
+ }
+
+ calcSeqParameters();
+
+ calculateOverlapLength(overlapMs);
+
+ // set tempo to recalculate 'sampleReq'
+ setTempo(tempo);
+}
+
+
+
+/// Get routine control parameters, see setParameters() function.
+/// Any of the parameters to this function can be NULL, in such case corresponding parameter
+/// value isn't returned.
+void TDStretch::getParameters(int *pSampleRate, int *pSequenceMs, int *pSeekWindowMs, int *pOverlapMs) const
+{
+ if (pSampleRate)
+ {
+ *pSampleRate = sampleRate;
+ }
+
+ if (pSequenceMs)
+ {
+ *pSequenceMs = (bAutoSeqSetting) ? (USE_AUTO_SEQUENCE_LEN) : sequenceMs;
+ }
+
+ if (pSeekWindowMs)
+ {
+ *pSeekWindowMs = (bAutoSeekSetting) ? (USE_AUTO_SEEKWINDOW_LEN) : seekWindowMs;
+ }
+
+ if (pOverlapMs)
+ {
+ *pOverlapMs = overlapMs;
+ }
+}
+
+
+// Overlaps samples in 'midBuffer' with the samples in 'pInput'
+void TDStretch::overlapMono(SAMPLETYPE *pOutput, const SAMPLETYPE *pInput) const
+{
+ int i;
+ SAMPLETYPE m1, m2;
+
+ m1 = (SAMPLETYPE)0;
+ m2 = (SAMPLETYPE)overlapLength;
+
+ for (i = 0; i < overlapLength ; i ++) 
+ {
+ pOutputi = (pInputi * m1 + pMidBufferi * m2 ) / overlapLength;
+ m1 += 1;
+ m2 -= 1;
+ }
+}
+
+
+
+void TDStretch::clearMidBuffer()
+{
+ memset(pMidBuffer, 0, channels * sizeof(SAMPLETYPE) * overlapLength);
+}
+
+
+void TDStretch::clearInput()
+{
+ inputBuffer.clear();
+ clearMidBuffer();
+ isBeginning = true;
+}
+
+
+// Clears the sample buffers
+void TDStretch::clear()
+{
+ outputBuffer.clear();
+ clearInput();
+}
+
+
+
+// Enables/disables the quick position seeking algorithm. Zero to disable, nonzero
+// to enable
+void TDStretch::enableQuickSeek(bool enable)
+{
+ bQuickSeek = enable;
+}
+
+
+// Returns nonzero if the quick seeking algorithm is enabled.
+bool TDStretch::isQuickSeekEnabled() const
+{
+ return bQuickSeek;
+}
+
+
+// Seeks for the optimal overlap-mixing position.
+int TDStretch::seekBestOverlapPosition(const SAMPLETYPE *refPos)
+{
+ if (bQuickSeek) 
+ {
+ return seekBestOverlapPositionQuick(refPos);
+ }
+ else 
+ {
+ return seekBestOverlapPositionFull(refPos);
+ }
+}
+
+
+// Overlaps samples in 'midBuffer' with the samples in 'pInputBuffer' at position
+// of 'ovlPos'.
+inline void TDStretch::overlap(SAMPLETYPE *pOutput, const SAMPLETYPE *pInput, uint ovlPos) const
+{
+#ifndef USE_MULTICH_ALWAYS
+ if (channels == 1)
+ {
+ // mono sound.
+ overlapMono(pOutput, pInput + ovlPos);
+ }
+ else if (channels == 2)
+ {
+ // stereo sound
+ overlapStereo(pOutput, pInput + 2 * ovlPos);
+ } 
+ else 
+#endif // USE_MULTICH_ALWAYS
+ {
+ assert(channels > 0);
+ overlapMulti(pOutput, pInput + channels * ovlPos);
+ }
+}
+
+
+// Seeks for the optimal overlap-mixing position. The 'stereo' version of the
+// routine
+//
+// The best position is determined as the position where the two overlapped
+// sample sequences are 'most alike', in terms of the highest cross-correlation
+// value over the overlapping period
+int TDStretch::seekBestOverlapPositionFull(const SAMPLETYPE *refPos) 
+{
+ int bestOffs;
+ double bestCorr;
+ int i;
+ double norm;
+
+ bestCorr = -FLT_MAX;
+ bestOffs = 0;
+
+ // Scans for the best correlation value by testing each possible position
+ // over the permitted range.
+ bestCorr = calcCrossCorr(refPos, pMidBuffer, norm);
+ bestCorr = (bestCorr + 0.1) * 0.75;
+
+ #pragma omp parallel for
+ for (i = 1; i < seekLength; i ++) 
+ {
+ double corr;
+ // Calculates correlation value for the mixing position corresponding to 'i'
+#ifdef _OPENMP
+ // in parallel OpenMP mode, can't use norm accumulator version as parallel executor won't
+ // iterate the loop in sequential order
+ corr = calcCrossCorr(refPos + channels * i, pMidBuffer, norm);
+#else
+ // In non-parallel version call "calcCrossCorrAccumulate" that is otherwise same
+ // as "calcCrossCorr", but saves time by reusing & updating previously stored 
+ // "norm" value
+ corr = calcCrossCorrAccumulate(refPos + channels * i, pMidBuffer, norm);
+#endif
+ // heuristic rule to slightly favour values close to mid of the range
+ double tmp = (double)(2 * i - seekLength) / (double)seekLength;
+ corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp));
+
+ // Checks for the highest correlation value
+ if (corr > bestCorr) 
+ {
+ // For optimal performance, enter critical section only in case that best value found.
+ // in such case repeat 'if' condition as it's possible that parallel execution may have
+ // updated the bestCorr value in the mean time
+ #pragma omp critical
+ if (corr > bestCorr)
+ {
+ bestCorr = corr;
+ bestOffs = i;
+ }
+ }
+ }
+
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+ adaptNormalizer();
+#endif
+
+ // clear cross correlation routine state if necessary (is so e.g. in MMX routines).
+ clearCrossCorrState();
+
+ return bestOffs;
+}
+
+
+// Quick seek algorithm for improved runtime-performance: First roughly scans through the 
+// correlation area, and then scan surroundings of two best preliminary correlation candidates
+// with improved precision
+//
+// Based on testing:
+// - This algorithm gives on average 99% as good match as the full algorithm
+// - this quick seek algorithm finds the best match on ~90% of cases
+// - on those 10% of cases when this algorithm doesn't find best match, 
+// it still finds on average ~90% match vs. the best possible match
+int TDStretch::seekBestOverlapPositionQuick(const SAMPLETYPE *refPos)
+{
+#define _MIN(a, b) (((a) < (b)) ? (a) : (b))
+#define SCANSTEP 16
+#define SCANWIND 8
+
+ int bestOffs;
+ int i;
+ int bestOffs2;
+ float bestCorr, corr;
+ float bestCorr2;
+ double norm;
+
+ // note: 'float' types used in this function in case that the platform would need to use software-fp
+
+ bestCorr =
+ bestCorr2 = -FLT_MAX;
+ bestOffs = 
+ bestOffs2 = SCANWIND;
+
+ // Scans for the best correlation value by testing each possible position
+ // over the permitted range. Look for two best matches on the first pass to
+ // increase possibility of ideal match.
+ //
+ // Begin from "SCANSTEP" instead of SCANWIND to make the calculation
+ // catch the 'middlepoint' of seekLength vector as that's the a-priori 
+ // expected best match position
+ //
+ // Roughly:
+ // - 15% of cases find best result directly on the first round,
+ // - 75% cases find better match on 2nd round around the best match from 1st round
+ // - 10% cases find better match on 2nd round around the 2nd-best-match from 1st round
+ for (i = SCANSTEP; i < seekLength - SCANWIND - 1; i += SCANSTEP)
+ {
+ // Calculates correlation value for the mixing position corresponding
+ // to 'i'
+ corr = (float)calcCrossCorr(refPos + channels*i, pMidBuffer, norm);
+ // heuristic rule to slightly favour values close to mid of the seek range
+ float tmp = (float)(2 * i - seekLength - 1) / (float)seekLength;
+ corr = ((corr + 0.1f) * (1.0f - 0.25f * tmp * tmp));
+
+ // Checks for the highest correlation value
+ if (corr > bestCorr)
+ {
+ // found new best match. keep the previous best as 2nd best match
+ bestCorr2 = bestCorr;
+ bestOffs2 = bestOffs;
+ bestCorr = corr;
+ bestOffs = i;
+ }
+ else if (corr > bestCorr2)
+ {
+ // not new best, but still new 2nd best match
+ bestCorr2 = corr;
+ bestOffs2 = i;
+ }
+ }
+
+ // Scans surroundings of the found best match with small stepping
+ int end = _MIN(bestOffs + SCANWIND + 1, seekLength);
+ for (i = bestOffs - SCANWIND; i < end; i++)
+ {
+ if (i == bestOffs) continue; // this offset already calculated, thus skip
+
+ // Calculates correlation value for the mixing position corresponding
+ // to 'i'
+ corr = (float)calcCrossCorr(refPos + channels*i, pMidBuffer, norm);
+ // heuristic rule to slightly favour values close to mid of the range
+ float tmp = (float)(2 * i - seekLength - 1) / (float)seekLength;
+ corr = ((corr + 0.1f) * (1.0f - 0.25f * tmp * tmp));
+
+ // Checks for the highest correlation value
+ if (corr > bestCorr)
+ {
+ bestCorr = corr;
+ bestOffs = i;
+ }
+ }
+
+ // Scans surroundings of the 2nd best match with small stepping
+ end = _MIN(bestOffs2 + SCANWIND + 1, seekLength);
+ for (i = bestOffs2 - SCANWIND; i < end; i++)
+ {
+ if (i == bestOffs2) continue; // this offset already calculated, thus skip
+
+ // Calculates correlation value for the mixing position corresponding
+ // to 'i'
+ corr = (float)calcCrossCorr(refPos + channels*i, pMidBuffer, norm);
+ // heuristic rule to slightly favour values close to mid of the range
+ float tmp = (float)(2 * i - seekLength - 1) / (float)seekLength;
+ corr = ((corr + 0.1f) * (1.0f - 0.25f * tmp * tmp));
+
+ // Checks for the highest correlation value
+ if (corr > bestCorr)
+ {
+ bestCorr = corr;
+ bestOffs = i;
+ }
+ }
+
+ // clear cross correlation routine state if necessary (is so e.g. in MMX routines).
+ clearCrossCorrState();
+
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+ adaptNormalizer();
+#endif
+
+ return bestOffs;
+}
+
+
+
+
+/// For integer algorithm: adapt normalization factor divider with music so that 
+/// it'll not be pessimistically restrictive that can degrade quality on quieter sections
+/// yet won't cause integer overflows either
+void TDStretch::adaptNormalizer()
+{
+ // Do not adapt normalizer over too silent sequences to avoid averaging filter depleting to
+ // too low values during pauses in music
+ if ((maxnorm > 1000) || (maxnormf > 40000000))
+ { 
+ //norm averaging filter
+ maxnormf = 0.9f * maxnormf + 0.1f * (float)maxnorm;
+
+ if ((maxnorm > 800000000) && (overlapDividerBitsNorm < 16))
+ {
+ // large values, so increase divider
+ overlapDividerBitsNorm++;
+ if (maxnorm > 1600000000) overlapDividerBitsNorm++; // extra large value => extra increase
+ }
+ else if ((maxnormf < 1000000) && (overlapDividerBitsNorm > 0))
+ {
+ // extra small values, decrease divider
+ overlapDividerBitsNorm--;
+ }
+ }
+
+ maxnorm = 0;
+}
+
+
+/// clear cross correlation routine state if necessary 
+void TDStretch::clearCrossCorrState()
+{
+ // default implementation is empty.
+}
+
+
+/// Calculates processing sequence length according to tempo setting
+void TDStretch::calcSeqParameters()
+{
+ // Adjust tempo param according to tempo, so that variating processing sequence length is used
+ // at various tempo settings, between the given low...top limits
+ #define AUTOSEQ_TEMPO_LOW 0.5 // auto setting low tempo range (-50%)
+ #define AUTOSEQ_TEMPO_TOP 2.0 // auto setting top tempo range (+100%)
+
+ // sequence-ms setting values at above low & top tempo
+ #define AUTOSEQ_AT_MIN 90.0
+ #define AUTOSEQ_AT_MAX 40.0
+ #define AUTOSEQ_K ((AUTOSEQ_AT_MAX - AUTOSEQ_AT_MIN) / (AUTOSEQ_TEMPO_TOP - AUTOSEQ_TEMPO_LOW))
+ #define AUTOSEQ_C (AUTOSEQ_AT_MIN - (AUTOSEQ_K) * (AUTOSEQ_TEMPO_LOW))
+
+ // seek-window-ms setting values at above low & top tempoq
+ #define AUTOSEEK_AT_MIN 20.0
+ #define AUTOSEEK_AT_MAX 15.0
+ #define AUTOSEEK_K ((AUTOSEEK_AT_MAX - AUTOSEEK_AT_MIN) / (AUTOSEQ_TEMPO_TOP - AUTOSEQ_TEMPO_LOW))
+ #define AUTOSEEK_C (AUTOSEEK_AT_MIN - (AUTOSEEK_K) * (AUTOSEQ_TEMPO_LOW))
+
+ #define CHECK_LIMITS(x, mi, ma) (((x) < (mi)) ? (mi) : (((x) > (ma)) ? (ma) : (x)))
+
+ double seq, seek;
+ 
+ if (bAutoSeqSetting)
+ {
+ seq = AUTOSEQ_C + AUTOSEQ_K * tempo;
+ seq = CHECK_LIMITS(seq, AUTOSEQ_AT_MAX, AUTOSEQ_AT_MIN);
+ sequenceMs = (int)(seq + 0.5);
+ }
+
+ if (bAutoSeekSetting)
+ {
+ seek = AUTOSEEK_C + AUTOSEEK_K * tempo;
+ seek = CHECK_LIMITS(seek, AUTOSEEK_AT_MAX, AUTOSEEK_AT_MIN);
+ seekWindowMs = (int)(seek + 0.5);
+ }
+
+ // Update seek window lengths
+ seekWindowLength = (sampleRate * sequenceMs) / 1000;
+ if (seekWindowLength < 2 * overlapLength) 
+ {
+ seekWindowLength = 2 * overlapLength;
+ }
+ seekLength = (sampleRate * seekWindowMs) / 1000;
+}
+
+
+
+// Sets new target tempo. Normal tempo = 'SCALE', smaller values represent slower 
+// tempo, larger faster tempo.
+void TDStretch::setTempo(double newTempo)
+{
+ int intskip;
+
+ tempo = newTempo;
+
+ // Calculate new sequence duration
+ calcSeqParameters();
+
+ // Calculate ideal skip length (according to tempo value) 
+ nominalSkip = tempo * (seekWindowLength - overlapLength);
+ intskip = (int)(nominalSkip + 0.5);
+
+ // Calculate how many samples are needed in the 'inputBuffer' to 
+ // process another batch of samples
+ //sampleReq = max(intskip + overlapLength, seekWindowLength) + seekLength / 2;
+ sampleReq = max(intskip + overlapLength, seekWindowLength) + seekLength;
+}
+
+
+
+// Sets the number of channels, 1 = mono, 2 = stereo
+void TDStretch::setChannels(int numChannels)
+{
+ if (!verifyNumberOfChannels(numChannels) ||
+ (channels == numChannels)) return;
+
+ channels = numChannels;
+ inputBuffer.setChannels(channels);
+ outputBuffer.setChannels(channels);
+
+ // re-init overlap/buffer
+ overlapLength=0;
+ setParameters(sampleRate);
+}
+
+
+// nominal tempo, no need for processing, just pass the samples through
+// to outputBuffer
+/*
+void TDStretch::processNominalTempo()
+{
+ assert(tempo == 1.0f);
+
+ if (bMidBufferDirty) 
+ {
+ // If there are samples in pMidBuffer waiting for overlapping,
+ // do a single sliding overlapping with them in order to prevent a 
+ // clicking distortion in the output sound
+ if (inputBuffer.numSamples() < overlapLength) 
+ {
+ // wait until we've got overlapLength input samples
+ return;
+ }
+ // Mix the samples in the beginning of 'inputBuffer' with the 
+ // samples in 'midBuffer' using sliding overlapping 
+ overlap(outputBuffer.ptrEnd(overlapLength), inputBuffer.ptrBegin(), 0);
+ outputBuffer.putSamples(overlapLength);
+ inputBuffer.receiveSamples(overlapLength);
+ clearMidBuffer();
+ // now we've caught the nominal sample flow and may switch to
+ // bypass mode
+ }
+
+ // Simply bypass samples from input to output
+ outputBuffer.moveSamples(inputBuffer);
+}
+*/
+
+
+// Processes as many processing frames of the samples 'inputBuffer', store
+// the result into 'outputBuffer'
+void TDStretch::processSamples()
+{
+ int ovlSkip;
+ int offset = 0;
+ int temp;
+
+ /* Removed this small optimization - can introduce a click to sound when tempo setting
+ crosses the nominal value
+ if (tempo == 1.0f) 
+ {
+ // tempo not changed from the original, so bypass the processing
+ processNominalTempo();
+ return;
+ }
+ */
+
+ // Process samples as long as there are enough samples in 'inputBuffer'
+ // to form a processing frame.
+ while ((int)inputBuffer.numSamples() >= sampleReq) 
+ {
+ if (isBeginning == false)
+ {
+ // apart from the very beginning of the track, 
+ // scan for the best overlapping position & do overlap-add
+ offset = seekBestOverlapPosition(inputBuffer.ptrBegin());
+
+ // Mix the samples in the 'inputBuffer' at position of 'offset' with the 
+ // samples in 'midBuffer' using sliding overlapping
+ // ... first partially overlap with the end of the previous sequence
+ // (that's in 'midBuffer')
+ overlap(outputBuffer.ptrEnd((uint)overlapLength), inputBuffer.ptrBegin(), (uint)offset);
+ outputBuffer.putSamples((uint)overlapLength);
+ offset += overlapLength;
+ }
+ else
+ {
+ // Adjust processing offset at beginning of track by not perform initial overlapping
+ // and compensating that in the 'input buffer skip' calculation
+ isBeginning = false;
+ int skip = (int)(tempo * overlapLength + 0.5);
+
+ #ifdef SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION
+ #ifdef SOUNDTOUCH_ALLOW_SSE
+ // if SSE mode, round the skip amount to value corresponding to aligned memory address
+ if (channels == 1)
+ {
+ skip &= -4;
+ }
+ else if (channels == 2)
+ {
+ skip &= -2;
+ }
+ #endif
+ #endif
+ skipFract -= skip;
+ assert(nominalSkip >= -skipFract);
+ }
+
+ // ... then copy sequence samples from 'inputBuffer' to output:
+
+ // crosscheck that we don't have buffer overflow...
+ if ((int)inputBuffer.numSamples() < (offset + seekWindowLength - overlapLength))
+ {
+ continue; // just in case, shouldn't really happen
+ }
+
+ // length of sequence
+ temp = (seekWindowLength - 2 * overlapLength);
+ outputBuffer.putSamples(inputBuffer.ptrBegin() + channels * offset, (uint)temp);
+
+ // Copies the end of the current sequence from 'inputBuffer' to 
+ // 'midBuffer' for being mixed with the beginning of the next 
+ // processing sequence and so on
+ assert((offset + temp + overlapLength) <= (int)inputBuffer.numSamples());
+ memcpy(pMidBuffer, inputBuffer.ptrBegin() + channels * (offset + temp), 
+ channels * sizeof(SAMPLETYPE) * overlapLength);
+
+ // Remove the processed samples from the input buffer. Update
+ // the difference between integer & nominal skip step to 'skipFract'
+ // in order to prevent the error from accumulating over time.
+ skipFract += nominalSkip; // real skip size
+ ovlSkip = (int)skipFract; // rounded to integer skip
+ skipFract -= ovlSkip; // maintain the fraction part, i.e. real vs. integer skip
+ inputBuffer.receiveSamples((uint)ovlSkip);
+ }
+}
+
+
+// Adds 'numsamples' pcs of samples from the 'samples' memory position into
+// the input of the object.
+void TDStretch::putSamples(const SAMPLETYPE *samples, uint nSamples)
+{
+ // Add the samples into the input buffer
+ inputBuffer.putSamples(samples, nSamples);
+ // Process the samples in input buffer
+ processSamples();
+}
+
+
+
+/// Set new overlap length parameter & reallocate RefMidBuffer if necessary.
+void TDStretch::acceptNewOverlapLength(int newOverlapLength)
+{
+ int prevOvl;
+
+ assert(newOverlapLength >= 0);
+ prevOvl = overlapLength;
+ overlapLength = newOverlapLength;
+
+ if (overlapLength > prevOvl)
+ {
+ delete pMidBufferUnaligned;
+
+ pMidBufferUnaligned = new SAMPLETYPEoverlapLength * channels + 16 / sizeof(SAMPLETYPE);
+ // ensure that 'pMidBuffer' is aligned to 16 byte boundary for efficiency
+ pMidBuffer = (SAMPLETYPE *)SOUNDTOUCH_ALIGN_POINTER_16(pMidBufferUnaligned);
+
+ clearMidBuffer();
+ }
+}
+
+
+// Operator 'new' is overloaded so that it automatically creates a suitable instance 
+// depending on if we've a MMX/SSE/etc-capable CPU available or not.
+void * TDStretch::operator new(size_t s)
+{
+ // Notice! don't use "new TDStretch" directly, use "newInstance" to create a new instance instead!
+ assert(0);
+ return newInstance();
+}
+
+
+TDStretch * TDStretch::newInstance()
+{
+ uint uExtensions;
+
+ uExtensions = detectCPUextensions();
+
+ // Check if MMX/SSE instruction set extensions supported by CPU
+
+#ifdef SOUNDTOUCH_ALLOW_MMX
+ // MMX routines available only with integer sample types
+ if (uExtensions & SUPPORT_MMX)
+ {
+ return ::new TDStretchMMX;
+ }
+ else
+#endif // SOUNDTOUCH_ALLOW_MMX
+
+
+#ifdef SOUNDTOUCH_ALLOW_SSE
+ if (uExtensions & SUPPORT_SSE)
+ {
+ // SSE support
+ return ::new TDStretchSSE;
+ }
+ else
+#endif // SOUNDTOUCH_ALLOW_SSE
+
+ {
+ // ISA optimizations not supported, use plain C version
+ return ::new TDStretch;
+ }
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Integer arithmetic specific algorithm implementations.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+
+// Overlaps samples in 'midBuffer' with the samples in 'input'. The 'Stereo' 
+// version of the routine.
+void TDStretch::overlapStereo(short *poutput, const short *input) const
+{
+ int i;
+ short temp;
+ int cnt2;
+
+ for (i = 0; i < overlapLength ; i ++) 
+ {
+ temp = (short)(overlapLength - i);
+ cnt2 = 2 * i;
+ poutputcnt2 = (inputcnt2 * i + pMidBuffercnt2 * temp ) / overlapLength;
+ poutputcnt2 + 1 = (inputcnt2 + 1 * i + pMidBuffercnt2 + 1 * temp ) / overlapLength;
+ }
+}
+
+
+// Overlaps samples in 'midBuffer' with the samples in 'input'. The 'Multi'
+// version of the routine.
+void TDStretch::overlapMulti(SAMPLETYPE *poutput, const SAMPLETYPE *input) const
+{
+ SAMPLETYPE m1=(SAMPLETYPE)0;
+ SAMPLETYPE m2;
+ int i=0;
+
+ for (m2 = (SAMPLETYPE)overlapLength; m2; m2 --)
+ {
+ for (int c = 0; c < channels; c ++)
+ {
+ poutputi = (inputi * m1 + pMidBufferi * m2) / overlapLength;
+ i++;
+ }
+
+ m1++;
+ }
+}
+
+// Calculates the x having the closest 2^x value for the given value
+static int _getClosest2Power(double value)
+{
+ return (int)(log(value) / log(2.0) + 0.5);
+}
+
+
+/// Calculates overlap period length in samples.
+/// Integer version rounds overlap length to closest power of 2
+/// for a divide scaling operation.
+void TDStretch::calculateOverlapLength(int aoverlapMs)
+{
+ int newOvl;
+
+ assert(aoverlapMs >= 0);
+
+ // calculate overlap length so that it's power of 2 - thus it's easy to do
+ // integer division by right-shifting. Term "-1" at end is to account for 
+ // the extra most significatnt bit left unused in result by signed multiplication 
+ overlapDividerBitsPure = _getClosest2Power((sampleRate * aoverlapMs) / 1000.0) - 1;
+ if (overlapDividerBitsPure > 9) overlapDividerBitsPure = 9;
+ if (overlapDividerBitsPure < 3) overlapDividerBitsPure = 3;
+ newOvl = (int)pow(2.0, (int)overlapDividerBitsPure + 1); // +1 => account for -1 above
+
+ acceptNewOverlapLength(newOvl);
+
+ overlapDividerBitsNorm = overlapDividerBitsPure;
+
+ // calculate sloping divider so that crosscorrelation operation won't 
+ // overflow 32-bit register. Max. sum of the crosscorrelation sum without 
+ // divider would be 2^30*(N^3-N)/3, where N = overlap length
+ slopingDivider = (newOvl * newOvl - 1) / 3;
+}
+
+
+double TDStretch::calcCrossCorr(const short *mixingPos, const short *compare, double &norm)
+{
+ long corr;
+ unsigned long lnorm;
+ int i;
+
+ corr = lnorm = 0;
+ // Same routine for stereo and mono. For stereo, unroll loop for better
+ // efficiency and gives slightly better resolution against rounding. 
+ // For mono it same routine, just unrolls loop by factor of 4
+ for (i = 0; i < channels * overlapLength; i += 4) 
+ {
+ corr += (mixingPosi * comparei + 
+ mixingPosi + 1 * comparei + 1) >> overlapDividerBitsNorm; // notice: do intermediate division here to avoid integer overflow
+ corr += (mixingPosi + 2 * comparei + 2 + 
+ mixingPosi + 3 * comparei + 3) >> overlapDividerBitsNorm;
+ lnorm += (mixingPosi * mixingPosi + 
+ mixingPosi + 1 * mixingPosi + 1) >> overlapDividerBitsNorm; // notice: do intermediate division here to avoid integer overflow
+ lnorm += (mixingPosi + 2 * mixingPosi + 2 + 
+ mixingPosi + 3 * mixingPosi + 3) >> overlapDividerBitsNorm;
+ }
+
+ if (lnorm > maxnorm)
+ {
+ // modify 'maxnorm' inside critical section to avoid multi-access conflict if in OpenMP mode
+ #pragma omp critical
+ if (lnorm > maxnorm)
+ {
+ maxnorm = lnorm;
+ }
+ }
+ // Normalize result by dividing by sqrt(norm) - this step is easiest 
+ // done using floating point operation
+ norm = (double)lnorm;
+ return (double)corr / sqrt((norm < 1e-9) ? 1.0 : norm);
+}
+
+
+/// Update cross-correlation by accumulating "norm" coefficient by previously calculated value
+double TDStretch::calcCrossCorrAccumulate(const short *mixingPos, const short *compare, double &norm)
+{
+ long corr;
+ unsigned long lnorm;
+ int i;
+
+ // cancel first normalizer tap from previous round
+ lnorm = 0;
+ for (i = 1; i <= channels; i ++)
+ {
+ lnorm -= (mixingPos-i * mixingPos-i) >> overlapDividerBitsNorm;
+ }
+
+ corr = 0;
+ // Same routine for stereo and mono. For stereo, unroll loop for better
+ // efficiency and gives slightly better resolution against rounding. 
+ // For mono it same routine, just unrolls loop by factor of 4
+ for (i = 0; i < channels * overlapLength; i += 4) 
+ {
+ corr += (mixingPosi * comparei + 
+ mixingPosi + 1 * comparei + 1) >> overlapDividerBitsNorm; // notice: do intermediate division here to avoid integer overflow
+ corr += (mixingPosi + 2 * comparei + 2 + 
+ mixingPosi + 3 * comparei + 3) >> overlapDividerBitsNorm;
+ }
+
+ // update normalizer with last samples of this round
+ for (int j = 0; j < channels; j ++)
+ {
+ i --;
+ lnorm += (mixingPosi * mixingPosi) >> overlapDividerBitsNorm;
+ }
+
+ norm += (double)lnorm;
+ if (norm > maxnorm)
+ {
+ maxnorm = (unsigned long)norm;
+ }
+
+ // Normalize result by dividing by sqrt(norm) - this step is easiest 
+ // done using floating point operation
+ return (double)corr / sqrt((norm < 1e-9) ? 1.0 : norm);
+}
+
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Floating point arithmetic specific algorithm implementations.
+//
+
+#ifdef SOUNDTOUCH_FLOAT_SAMPLES
+
+// Overlaps samples in 'midBuffer' with the samples in 'pInput'
+void TDStretch::overlapStereo(float *pOutput, const float *pInput) const
+{
+ int i;
+ float fScale;
+ float f1;
+ float f2;
+
+ fScale = 1.0f / (float)overlapLength;
+
+ f1 = 0;
+ f2 = 1.0f;
+
+ for (i = 0; i < 2 * (int)overlapLength ; i += 2) 
+ {
+ pOutputi + 0 = pInputi + 0 * f1 + pMidBufferi + 0 * f2;
+ pOutputi + 1 = pInputi + 1 * f1 + pMidBufferi + 1 * f2;
+
+ f1 += fScale;
+ f2 -= fScale;
+ }
+}
+
+
+// Overlaps samples in 'midBuffer' with the samples in 'input'. 
+void TDStretch::overlapMulti(float *pOutput, const float *pInput) const
+{
+ int i;
+ float fScale;
+ float f1;
+ float f2;
+
+ fScale = 1.0f / (float)overlapLength;
+
+ f1 = 0;
+ f2 = 1.0f;
+
+ i=0;
+ for (int i2 = 0; i2 < overlapLength; i2 ++)
+ {
+ // note: Could optimize this slightly by taking into account that always channels > 2
+ for (int c = 0; c < channels; c ++)
+ {
+ pOutputi = pInputi * f1 + pMidBufferi * f2;
+ i++;
+ }
+ f1 += fScale;
+ f2 -= fScale;
+ }
+}
+
+
+/// Calculates overlapInMsec period length in samples.
+void TDStretch::calculateOverlapLength(int overlapInMsec)
+{
+ int newOvl;
+
+ assert(overlapInMsec >= 0);
+ newOvl = (sampleRate * overlapInMsec) / 1000;
+ if (newOvl < 16) newOvl = 16;
+
+ // must be divisible by 8
+ newOvl -= newOvl % 8;
+
+ acceptNewOverlapLength(newOvl);
+}
+
+
+/// Calculate cross-correlation
+double TDStretch::calcCrossCorr(const float *mixingPos, const float *compare, double &anorm)
+{
+ double corr;
+ double norm;
+ int i;
+
+ corr = norm = 0;
+ // Same routine for stereo and mono. For Stereo, unroll by factor of 2.
+ // For mono it's same routine yet unrollsd by factor of 4.
+ for (i = 0; i < channels * overlapLength; i += 4) 
+ {
+ corr += mixingPosi * comparei +
+ mixingPosi + 1 * comparei + 1;
+
+ norm += mixingPosi * mixingPosi + 
+ mixingPosi + 1 * mixingPosi + 1;
+
+ // unroll the loop for better CPU efficiency:
+ corr += mixingPosi + 2 * comparei + 2 +
+ mixingPosi + 3 * comparei + 3;
+
+ norm += mixingPosi + 2 * mixingPosi + 2 +
+ mixingPosi + 3 * mixingPosi + 3;
+ }
+
+ anorm = norm;
+ return corr / sqrt((norm < 1e-9 ? 1.0 : norm));
+}
+
+
+/// Update cross-correlation by accumulating "norm" coefficient by previously calculated value
+double TDStretch::calcCrossCorrAccumulate(const float *mixingPos, const float *compare, double &norm)
+{
+ double corr;
+ int i;
+
+ corr = 0;
+
+ // cancel first normalizer tap from previous round
+ for (i = 1; i <= channels; i ++)
+ {
+ norm -= mixingPos-i * mixingPos-i;
+ }
+
+ // Same routine for stereo and mono. For Stereo, unroll by factor of 2.
+ // For mono it's same routine yet unrollsd by factor of 4.
+ for (i = 0; i < channels * overlapLength; i += 4) 
+ {
+ corr += mixingPosi * comparei +
+ mixingPosi + 1 * comparei + 1 +
+ mixingPosi + 2 * comparei + 2 +
+ mixingPosi + 3 * comparei + 3;
+ }
+
+ // update normalizer with last samples of this round
+ for (int j = 0; j < channels; j ++)
+ {
+ i --;
+ norm += mixingPosi * mixingPosi;
+ }
+
+ return corr / sqrt((norm < 1e-9 ? 1.0 : norm));
+}
+
+
+#endif // SOUNDTOUCH_FLOAT_SAMPLES

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/TDStretch.h Added

@@ -0,0 +1,279 @@
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo 
+/// while maintaining the original pitch by using a time domain WSOLA-like method 
+/// with several performance-increasing tweaks.
+///
+/// Note : MMX/SSE optimized functions reside in separate, platform-specific files 
+/// 'mmx_optimized.cpp' and 'sse_optimized.cpp'
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef TDStretch_H
+#define TDStretch_H
+
+#include <stddef.h>
+#include "STTypes.h"
+#include "RateTransposer.h"
+#include "FIFOSamplePipe.h"
+
+namespace soundtouch
+{
+
+/// Default values for sound processing parameters:
+/// Notice that the default parameters are tuned for contemporary popular music 
+/// processing. For speech processing applications these parameters suit better:
+/// #define DEFAULT_SEQUENCE_MS 40
+/// #define DEFAULT_SEEKWINDOW_MS 15
+/// #define DEFAULT_OVERLAP_MS 8
+///
+
+/// Default length of a single processing sequence, in milliseconds. This determines to how 
+/// long sequences the original sound is chopped in the time-stretch algorithm.
+///
+/// The larger this value is, the lesser sequences are used in processing. In principle
+/// a bigger value sounds better when slowing down tempo, but worse when increasing tempo
+/// and vice versa.
+///
+/// Increasing this value reduces computational burden & vice versa.
+//#define DEFAULT_SEQUENCE_MS 40
+#define DEFAULT_SEQUENCE_MS USE_AUTO_SEQUENCE_LEN
+
+/// Giving this value for the sequence length sets automatic parameter value
+/// according to tempo setting (recommended)
+#define USE_AUTO_SEQUENCE_LEN 0
+
+/// Seeking window default length in milliseconds for algorithm that finds the best possible 
+/// overlapping location. This determines from how wide window the algorithm may look for an 
+/// optimal joining location when mixing the sound sequences back together. 
+///
+/// The bigger this window setting is, the higher the possibility to find a better mixing
+/// position will become, but at the same time large values may cause a "drifting" artifact
+/// because consequent sequences will be taken at more uneven intervals.
+///
+/// If there's a disturbing artifact that sounds as if a constant frequency was drifting 
+/// around, try reducing this setting.
+///
+/// Increasing this value increases computational burden & vice versa.
+//#define DEFAULT_SEEKWINDOW_MS 15
+#define DEFAULT_SEEKWINDOW_MS USE_AUTO_SEEKWINDOW_LEN
+
+/// Giving this value for the seek window length sets automatic parameter value
+/// according to tempo setting (recommended)
+#define USE_AUTO_SEEKWINDOW_LEN 0
+
+/// Overlap length in milliseconds. When the chopped sound sequences are mixed back together, 
+/// to form a continuous sound stream, this parameter defines over how long period the two 
+/// consecutive sequences are let to overlap each other. 
+///
+/// This shouldn't be that critical parameter. If you reduce the DEFAULT_SEQUENCE_MS setting 
+/// by a large amount, you might wish to try a smaller value on this.
+///
+/// Increasing this value increases computational burden & vice versa.
+#define DEFAULT_OVERLAP_MS 8
+
+
+/// Class that does the time-stretch (tempo change) effect for the processed
+/// sound.
+class TDStretch : public FIFOProcessor
+{
+protected:
+ int channels;
+ int sampleReq;
+
+ int overlapLength;
+ int seekLength;
+ int seekWindowLength;
+ int overlapDividerBitsNorm;
+ int overlapDividerBitsPure;
+ int slopingDivider;
+ int sampleRate;
+ int sequenceMs;
+ int seekWindowMs;
+ int overlapMs;
+
+ unsigned long maxnorm;
+ float maxnormf;
+
+ double tempo;
+ double nominalSkip;
+ double skipFract;
+
+ bool bQuickSeek;
+ bool bAutoSeqSetting;
+ bool bAutoSeekSetting;
+ bool isBeginning;
+
+ SAMPLETYPE *pMidBuffer;
+ SAMPLETYPE *pMidBufferUnaligned;
+
+ FIFOSampleBuffer outputBuffer;
+ FIFOSampleBuffer inputBuffer;
+
+ void acceptNewOverlapLength(int newOverlapLength);
+
+ virtual void clearCrossCorrState();
+ void calculateOverlapLength(int overlapMs);
+
+ virtual double calcCrossCorr(const SAMPLETYPE *mixingPos, const SAMPLETYPE *compare, double &norm);
+ virtual double calcCrossCorrAccumulate(const SAMPLETYPE *mixingPos, const SAMPLETYPE *compare, double &norm);
+
+ virtual int seekBestOverlapPositionFull(const SAMPLETYPE *refPos);
+ virtual int seekBestOverlapPositionQuick(const SAMPLETYPE *refPos);
+ virtual int seekBestOverlapPosition(const SAMPLETYPE *refPos);
+
+ virtual void overlapStereo(SAMPLETYPE *output, const SAMPLETYPE *input) const;
+ virtual void overlapMono(SAMPLETYPE *output, const SAMPLETYPE *input) const;
+ virtual void overlapMulti(SAMPLETYPE *output, const SAMPLETYPE *input) const;
+
+ void clearMidBuffer();
+ void overlap(SAMPLETYPE *output, const SAMPLETYPE *input, uint ovlPos) const;
+
+ void calcSeqParameters();
+ void adaptNormalizer();
+
+ /// Changes the tempo of the given sound samples.
+ /// Returns amount of samples returned in the "output" buffer.
+ /// The maximum amount of samples that can be returned at a time is set by
+ /// the 'set_returnBuffer_size' function.
+ void processSamples();
+ 
+public:
+ TDStretch();
+ virtual ~TDStretch();
+
+ /// Operator 'new' is overloaded so that it automatically creates a suitable instance 
+ /// depending on if we've a MMX/SSE/etc-capable CPU available or not.
+ static void *operator new(size_t s);
+
+ /// Use this function instead of "new" operator to create a new instance of this class. 
+ /// This function automatically chooses a correct feature set depending on if the CPU
+ /// supports MMX/SSE/etc extensions.
+ static TDStretch *newInstance();
+ 
+ /// Returns the output buffer object
+ FIFOSamplePipe *getOutput() { return &outputBuffer; };
+
+ /// Returns the input buffer object
+ FIFOSamplePipe *getInput() { return &inputBuffer; };
+
+ /// Sets new target tempo. Normal tempo = 'SCALE', smaller values represent slower 
+ /// tempo, larger faster tempo.
+ void setTempo(double newTempo);
+
+ /// Returns nonzero if there aren't any samples available for outputting.
+ virtual void clear();
+
+ /// Clears the input buffer
+ void clearInput();
+
+ /// Sets the number of channels, 1 = mono, 2 = stereo
+ void setChannels(int numChannels);
+
+ /// Enables/disables the quick position seeking algorithm. Zero to disable, 
+ /// nonzero to enable
+ void enableQuickSeek(bool enable);
+
+ /// Returns nonzero if the quick seeking algorithm is enabled.
+ bool isQuickSeekEnabled() const;
+
+ /// Sets routine control parameters. These control are certain time constants
+ /// defining how the sound is stretched to the desired duration.
+ //
+ /// 'sampleRate' = sample rate of the sound
+ /// 'sequenceMS' = one processing sequence length in milliseconds
+ /// 'seekwindowMS' = seeking window length for scanning the best overlapping 
+ /// position
+ /// 'overlapMS' = overlapping length
+ void setParameters(int sampleRate, ///< Samplerate of sound being processed (Hz)
+ int sequenceMS = -1, ///< Single processing sequence length (ms)
+ int seekwindowMS = -1, ///< Offset seeking window length (ms)
+ int overlapMS = -1 ///< Sequence overlapping length (ms)
+ );
+
+ /// Get routine control parameters, see setParameters() function.
+ /// Any of the parameters to this function can be NULL, in such case corresponding parameter
+ /// value isn't returned.
+ void getParameters(int *pSampleRate, int *pSequenceMs, int *pSeekWindowMs, int *pOverlapMs) const;
+
+ /// Adds 'numsamples' pcs of samples from the 'samples' memory position into
+ /// the input of the object.
+ virtual void putSamples(
+ const SAMPLETYPE *samples, ///< Input sample data
+ uint numSamples ///< Number of samples in 'samples' so that one sample
+ ///< contains both channels if stereo
+ );
+
+ /// return nominal input sample requirement for triggering a processing batch
+ int getInputSampleReq() const
+ {
+ return (int)(nominalSkip + 0.5);
+ }
+
+ /// return nominal output sample amount when running a processing batch
+ int getOutputBatchSize() const
+ {
+ return seekWindowLength - overlapLength;
+ }
+
+	/// return approximate initial input-output latency
+	int getLatency() const
+	{
+		return sampleReq;
+	}
+};
+
+
+// Implementation-specific class declarations:
+
+#ifdef SOUNDTOUCH_ALLOW_MMX
+ /// Class that implements MMX optimized routines for 16bit integer samples type.
+ class TDStretchMMX : public TDStretch
+ {
+ protected:
+ double calcCrossCorr(const short *mixingPos, const short *compare, double &norm);
+ double calcCrossCorrAccumulate(const short *mixingPos, const short *compare, double &norm);
+ virtual void overlapStereo(short *output, const short *input) const;
+ virtual void clearCrossCorrState();
+ };
+#endif /// SOUNDTOUCH_ALLOW_MMX
+
+
+#ifdef SOUNDTOUCH_ALLOW_SSE
+ /// Class that implements SSE optimized routines for floating point samples type.
+ class TDStretchSSE : public TDStretch
+ {
+ protected:
+ double calcCrossCorr(const float *mixingPos, const float *compare, double &norm);
+ double calcCrossCorrAccumulate(const float *mixingPos, const float *compare, double &norm);
+ };
+
+#endif /// SOUNDTOUCH_ALLOW_SSE
+
+}
+#endif /// TDStretch_H

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/cpu_detect.h Added

@@ -0,0 +1,55 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// A header file for detecting the Intel MMX instructions set extension.
+///
+/// Please see 'mmx_win.cpp', 'mmx_cpp.cpp' and 'mmx_non_x86.cpp' for the 
+/// routine implementations for x86 Windows, x86 gnu version and non-x86 
+/// platforms, respectively.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _CPU_DETECT_H_
+#define _CPU_DETECT_H_
+
+#include "STTypes.h"
+
+#define SUPPORT_MMX         0x0001
+#define SUPPORT_3DNOW       0x0002
+#define SUPPORT_ALTIVEC     0x0004
+#define SUPPORT_SSE         0x0008
+#define SUPPORT_SSE2        0x0010
+
+/// Checks which instruction set extensions are supported by the CPU.
+///
+/// \return A bitmask of supported extensions, see SUPPORT_... defines.
+uint detectCPUextensions(void);
+
+/// Disables given set of instruction extensions. See SUPPORT_... defines.
+void disableExtensions(uint wDisableMask);
+
+#endif  // _CPU_DETECT_H_

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/cpu_detect_x86.cpp Added

@@ -0,0 +1,130 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Generic version of the x86 CPU extension detection routine.
+///
+/// This file is for GNU & other non-Windows compilers, see 'cpu_detect_x86_win.cpp' 
+/// for the Microsoft compiler version.
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include "cpu_detect.h"
+#include "STTypes.h"
+
+
+#if defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
+
+ #if defined(__GNUC__) && defined(__i386__)
+ // gcc
+ #include "cpuid.h"
+ #elif defined(_M_IX86)
+ // windows non-gcc
+ #include <intrin.h>
+ #endif
+
+ #define bit_MMX (1 << 23)
+ #define bit_SSE (1 << 25)
+ #define bit_SSE2 (1 << 26)
+#endif
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// processor instructions extension detection routines
+//
+//////////////////////////////////////////////////////////////////////////////
+
+// Flag variable indicating whick ISA extensions are disabled (for debugging)
+static uint _dwDisabledISA = 0x00; // 0xffffffff; //<- use this to disable all extensions
+
+// Disables given set of instruction extensions. See SUPPORT_... defines.
+void disableExtensions(uint dwDisableMask)
+{
+ _dwDisabledISA = dwDisableMask;
+}
+
+
+/// Checks which instruction set extensions are supported by the CPU.
+uint detectCPUextensions(void)
+{
+/// If building for a 64bit system (no Itanium) and the user wants optimizations.
+/// Return the OR of SUPPORT_{MMX,SSE,SSE2}. 11001 or 0x19.
+/// Keep the _dwDisabledISA test (2 more operations, could be eliminated).
+#if ((defined(__GNUC__) && defined(__x86_64__)) \
+ || defined(_M_X64)) \
+ && defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
+ return 0x19 & ~_dwDisabledISA;
+
+/// If building for a 32bit system and the user wants optimizations.
+/// Keep the _dwDisabledISA test (2 more operations, could be eliminated).
+#elif ((defined(__GNUC__) && defined(__i386__)) \
+ || defined(_M_IX86)) \
+ && defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
+
+ if (_dwDisabledISA == 0xffffffff) return 0;
+ 
+ uint res = 0;
+ 
+#if defined(__GNUC__)
+ // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
+ uint eax, ebx, ecx, edx; // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
+
+ // Check if no cpuid support.
+ if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx)) return 0; // always disable extensions.
+
+ if (edx & bit_MMX) res = res | SUPPORT_MMX;
+ if (edx & bit_SSE) res = res | SUPPORT_SSE;
+ if (edx & bit_SSE2) res = res | SUPPORT_SSE2;
+
+#else
+ // Window / VS version of cpuid. Notice that Visual Studio 2005 or later required 
+ // for __cpuid intrinsic support.
+ int reg4 = {-1};
+
+ // Check if no cpuid support.
+ __cpuid(reg,0);
+ if ((unsigned int)reg0 == 0) return 0; // always disable extensions.
+
+ __cpuid(reg,1);
+ if ((unsigned int)reg3 & bit_MMX) res = res | SUPPORT_MMX;
+ if ((unsigned int)reg3 & bit_SSE) res = res | SUPPORT_SSE;
+ if ((unsigned int)reg3 & bit_SSE2) res = res | SUPPORT_SSE2;
+
+#endif
+
+ return res & ~_dwDisabledISA;
+
+#else
+
+/// One of these is true:
+/// 1) We don't want optimizations.
+/// 2) Using an unsupported compiler.
+/// 3) Running on a non-x86 platform.
+ return 0;
+
+#endif
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/mmx_optimized.cpp Added

@@ -0,0 +1,396 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// MMX optimized routines. All MMX optimized functions have been gathered into 
+/// this single source code file, regardless to their class or original source 
+/// code file, in order to ease porting the library to other compiler and 
+/// processor platforms.
+///
+/// The MMX-optimizations are programmed using MMX compiler intrinsics that
+/// are supported both by Microsoft Visual C++ and GCC compilers, so this file
+/// should compile with both toolsets.
+///
+/// NOTICE: If using Visual Studio 6.0, you'll need to install the "Visual C++ 
+/// 6.0 processor pack" update to support compiler intrinsic syntax. The update
+/// is available for download at Microsoft Developers Network, see here:
+/// http://msdn.microsoft.com/en-us/vstudio/aa718349.aspx
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include "STTypes.h"
+
+#ifdef SOUNDTOUCH_ALLOW_MMX
+// MMX routines available only with integer sample type
+
+using namespace soundtouch;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// implementation of MMX optimized functions of class 'TDStretchMMX'
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#include "TDStretch.h"
+#include <mmintrin.h>
+#include <limits.h>
+#include <math.h>
+
+
+// Calculates cross correlation of two buffers
+double TDStretchMMX::calcCrossCorr(const short *pV1, const short *pV2, double &dnorm)
+{
+ const __m64 *pVec1, *pVec2;
+ __m64 shifter;
+ __m64 accu, normaccu;
+ long corr, norm;
+ int i;
+ 
+ pVec1 = (__m64*)pV1;
+ pVec2 = (__m64*)pV2;
+
+ shifter = _m_from_int(overlapDividerBitsNorm);
+ normaccu = accu = _mm_setzero_si64();
+
+ // Process 4 parallel sets of 2 * stereo samples or 4 * mono samples 
+ // during each round for improved CPU-level parallellization.
+ for (i = 0; i < channels * overlapLength / 16; i ++)
+ {
+ __m64 temp, temp2;
+
+ // dictionary of instructions:
+ // _m_pmaddwd : 4*16bit multiply-add, resulting two 32bits = a0*b0+a1*b1 ; a2*b2+a3*b3
+ // _mm_add_pi32 : 2*32bit add
+ // _m_psrad : 32bit right-shift
+
+ temp = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec10, pVec20), shifter),
+ _mm_sra_pi32(_mm_madd_pi16(pVec11, pVec21), shifter));
+ temp2 = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec10, pVec10), shifter),
+ _mm_sra_pi32(_mm_madd_pi16(pVec11, pVec11), shifter));
+ accu = _mm_add_pi32(accu, temp);
+ normaccu = _mm_add_pi32(normaccu, temp2);
+
+ temp = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec12, pVec22), shifter),
+ _mm_sra_pi32(_mm_madd_pi16(pVec13, pVec23), shifter));
+ temp2 = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec12, pVec12), shifter),
+ _mm_sra_pi32(_mm_madd_pi16(pVec13, pVec13), shifter));
+ accu = _mm_add_pi32(accu, temp);
+ normaccu = _mm_add_pi32(normaccu, temp2);
+
+ pVec1 += 4;
+ pVec2 += 4;
+ }
+
+ // copy hi-dword of mm0 to lo-dword of mm1, then sum mmo+mm1
+ // and finally store the result into the variable "corr"
+
+ accu = _mm_add_pi32(accu, _mm_srli_si64(accu, 32));
+ corr = _m_to_int(accu);
+
+ normaccu = _mm_add_pi32(normaccu, _mm_srli_si64(normaccu, 32));
+ norm = _m_to_int(normaccu);
+
+ // Clear MMS state
+ _m_empty();
+
+ if (norm > (long)maxnorm)
+ {
+ // modify 'maxnorm' inside critical section to avoid multi-access conflict if in OpenMP mode
+ #pragma omp critical
+ if (norm > (long)maxnorm)
+ {
+ maxnorm = norm;
+ }
+ }
+
+ // Normalize result by dividing by sqrt(norm) - this step is easiest 
+ // done using floating point operation
+ dnorm = (double)norm;
+
+ return (double)corr / sqrt(dnorm < 1e-9 ? 1.0 : dnorm);
+ // Note: Warning about the missing EMMS instruction is harmless
+ // as it'll be called elsewhere.
+}
+
+
+/// Update cross-correlation by accumulating "norm" coefficient by previously calculated value
+double TDStretchMMX::calcCrossCorrAccumulate(const short *pV1, const short *pV2, double &dnorm)
+{
+ const __m64 *pVec1, *pVec2;
+ __m64 shifter;
+ __m64 accu;
+ long corr, lnorm;
+ int i;
+ 
+ // cancel first normalizer tap from previous round
+ lnorm = 0;
+ for (i = 1; i <= channels; i ++)
+ {
+ lnorm -= (pV1-i * pV1-i) >> overlapDividerBitsNorm;
+ }
+
+ pVec1 = (__m64*)pV1;
+ pVec2 = (__m64*)pV2;
+
+ shifter = _m_from_int(overlapDividerBitsNorm);
+ accu = _mm_setzero_si64();
+
+ // Process 4 parallel sets of 2 * stereo samples or 4 * mono samples 
+ // during each round for improved CPU-level parallellization.
+ for (i = 0; i < channels * overlapLength / 16; i ++)
+ {
+ __m64 temp;
+
+ // dictionary of instructions:
+ // _m_pmaddwd : 4*16bit multiply-add, resulting two 32bits = a0*b0+a1*b1 ; a2*b2+a3*b3
+ // _mm_add_pi32 : 2*32bit add
+ // _m_psrad : 32bit right-shift
+
+ temp = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec10, pVec20), shifter),
+ _mm_sra_pi32(_mm_madd_pi16(pVec11, pVec21), shifter));
+ accu = _mm_add_pi32(accu, temp);
+
+ temp = _mm_add_pi32(_mm_sra_pi32(_mm_madd_pi16(pVec12, pVec22), shifter),
+ _mm_sra_pi32(_mm_madd_pi16(pVec13, pVec23), shifter));
+ accu = _mm_add_pi32(accu, temp);
+
+ pVec1 += 4;
+ pVec2 += 4;
+ }
+
+ // copy hi-dword of mm0 to lo-dword of mm1, then sum mmo+mm1
+ // and finally store the result into the variable "corr"
+
+ accu = _mm_add_pi32(accu, _mm_srli_si64(accu, 32));
+ corr = _m_to_int(accu);
+
+ // Clear MMS state
+ _m_empty();
+
+ // update normalizer with last samples of this round
+ pV1 = (short *)pVec1;
+ for (int j = 1; j <= channels; j ++)
+ {
+ lnorm += (pV1-j * pV1-j) >> overlapDividerBitsNorm;
+ }
+ dnorm += (double)lnorm;
+
+ if (lnorm > (long)maxnorm)
+ {
+ maxnorm = lnorm;
+ }
+
+ // Normalize result by dividing by sqrt(norm) - this step is easiest 
+ // done using floating point operation
+ return (double)corr / sqrt((dnorm < 1e-9) ? 1.0 : dnorm);
+}
+
+
+void TDStretchMMX::clearCrossCorrState()
+{
+ // Clear MMS state
+ _m_empty();
+ //_asm EMMS;
+}
+
+
+// MMX-optimized version of the function overlapStereo
+void TDStretchMMX::overlapStereo(short *output, const short *input) const
+{
+ const __m64 *pVinput, *pVMidBuf;
+ __m64 *pVdest;
+ __m64 mix1, mix2, adder, shifter;
+ int i;
+
+ pVinput = (const __m64*)input;
+ pVMidBuf = (const __m64*)pMidBuffer;
+ pVdest = (__m64*)output;
+
+ // mix1 = mixer values for 1st stereo sample
+ // mix1 = mixer values for 2nd stereo sample
+ // adder = adder for updating mixer values after each round
+ 
+ mix1 = _mm_set_pi16(0, overlapLength, 0, overlapLength);
+ adder = _mm_set_pi16(1, -1, 1, -1);
+ mix2 = _mm_add_pi16(mix1, adder);
+ adder = _mm_add_pi16(adder, adder);
+
+ // Overlaplength-division by shifter. "+1" is to account for "-1" deduced in
+ // overlapDividerBits calculation earlier.
+ shifter = _m_from_int(overlapDividerBitsPure + 1);
+
+ for (i = 0; i < overlapLength / 4; i ++)
+ {
+ __m64 temp1, temp2;
+ 
+ // load & shuffle data so that input & mixbuffer data samples are paired
+ temp1 = _mm_unpacklo_pi16(pVMidBuf0, pVinput0); // = i0l m0l i0r m0r
+ temp2 = _mm_unpackhi_pi16(pVMidBuf0, pVinput0); // = i1l m1l i1r m1r
+
+ // temp = (temp .* mix) >> shifter
+ temp1 = _mm_sra_pi32(_mm_madd_pi16(temp1, mix1), shifter);
+ temp2 = _mm_sra_pi32(_mm_madd_pi16(temp2, mix2), shifter);
+ pVdest0 = _mm_packs_pi32(temp1, temp2); // pack 2*2*32bit => 4*16bit
+
+ // update mix += adder
+ mix1 = _mm_add_pi16(mix1, adder);
+ mix2 = _mm_add_pi16(mix2, adder);
+
+ // --- second round begins here ---
+
+ // load & shuffle data so that input & mixbuffer data samples are paired
+ temp1 = _mm_unpacklo_pi16(pVMidBuf1, pVinput1); // = i2l m2l i2r m2r
+ temp2 = _mm_unpackhi_pi16(pVMidBuf1, pVinput1); // = i3l m3l i3r m3r
+
+ // temp = (temp .* mix) >> shifter
+ temp1 = _mm_sra_pi32(_mm_madd_pi16(temp1, mix1), shifter);
+ temp2 = _mm_sra_pi32(_mm_madd_pi16(temp2, mix2), shifter);
+ pVdest1 = _mm_packs_pi32(temp1, temp2); // pack 2*2*32bit => 4*16bit
+
+ // update mix += adder
+ mix1 = _mm_add_pi16(mix1, adder);
+ mix2 = _mm_add_pi16(mix2, adder);
+
+ pVinput += 2;
+ pVMidBuf += 2;
+ pVdest += 2;
+ }
+
+ _m_empty(); // clear MMS state
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// implementation of MMX optimized functions of class 'FIRFilter'
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#include "FIRFilter.h"
+
+
+FIRFilterMMX::FIRFilterMMX() : FIRFilter()
+{
+ filterCoeffsAlign = NULL;
+ filterCoeffsUnalign = NULL;
+}
+
+
+FIRFilterMMX::~FIRFilterMMX()
+{
+ delete filterCoeffsUnalign;
+}
+
+
+// (overloaded) Calculates filter coefficients for MMX routine
+void FIRFilterMMX::setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor)
+{
+ uint i;
+ FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor);
+
+ // Ensure that filter coeffs array is aligned to 16-byte boundary
+ delete filterCoeffsUnalign;
+ filterCoeffsUnalign = new short2 * newLength + 8;
+ filterCoeffsAlign = (short *)SOUNDTOUCH_ALIGN_POINTER_16(filterCoeffsUnalign);
+
+ // rearrange the filter coefficients for mmx routines 
+ for (i = 0;i < length; i += 4) 
+ {
+ filterCoeffsAlign2 * i + 0 = coeffsi + 0;
+ filterCoeffsAlign2 * i + 1 = coeffsi + 2;
+ filterCoeffsAlign2 * i + 2 = coeffsi + 0;
+ filterCoeffsAlign2 * i + 3 = coeffsi + 2;
+
+ filterCoeffsAlign2 * i + 4 = coeffsi + 1;
+ filterCoeffsAlign2 * i + 5 = coeffsi + 3;
+ filterCoeffsAlign2 * i + 6 = coeffsi + 1;
+ filterCoeffsAlign2 * i + 7 = coeffsi + 3;
+ }
+}
+
+
+// mmx-optimized version of the filter routine for stereo sound
+uint FIRFilterMMX::evaluateFilterStereo(short *dest, const short *src, uint numSamples) const
+{
+ // Create stack copies of the needed member variables for asm routines :
+ uint i, j;
+ __m64 *pVdest = (__m64*)dest;
+
+ if (length < 2) return 0;
+
+ for (i = 0; i < (numSamples - length) / 2; i ++)
+ {
+ __m64 accu1;
+ __m64 accu2;
+ const __m64 *pVsrc = (const __m64*)src;
+ const __m64 *pVfilter = (const __m64*)filterCoeffsAlign;
+
+ accu1 = accu2 = _mm_setzero_si64();
+ for (j = 0; j < lengthDiv8 * 2; j ++)
+ {
+ __m64 temp1, temp2;
+
+ temp1 = _mm_unpacklo_pi16(pVsrc0, pVsrc1); // = l2 l0 r2 r0
+ temp2 = _mm_unpackhi_pi16(pVsrc0, pVsrc1); // = l3 l1 r3 r1
+
+ accu1 = _mm_add_pi32(accu1, _mm_madd_pi16(temp1, pVfilter0)); // += l2*f2+l0*f0 r2*f2+r0*f0
+ accu1 = _mm_add_pi32(accu1, _mm_madd_pi16(temp2, pVfilter1)); // += l3*f3+l1*f1 r3*f3+r1*f1
+
+ temp1 = _mm_unpacklo_pi16(pVsrc1, pVsrc2); // = l4 l2 r4 r2
+
+ accu2 = _mm_add_pi32(accu2, _mm_madd_pi16(temp2, pVfilter0)); // += l3*f2+l1*f0 r3*f2+r1*f0
+ accu2 = _mm_add_pi32(accu2, _mm_madd_pi16(temp1, pVfilter1)); // += l4*f3+l2*f1 r4*f3+r2*f1
+
+ // accu1 += l2*f2+l0*f0 r2*f2+r0*f0
+ // += l3*f3+l1*f1 r3*f3+r1*f1
+
+ // accu2 += l3*f2+l1*f0 r3*f2+r1*f0
+ // l4*f3+l2*f1 r4*f3+r2*f1
+
+ pVfilter += 2;
+ pVsrc += 2;
+ }
+ // accu >>= resultDivFactor
+ accu1 = _mm_srai_pi32(accu1, resultDivFactor);
+ accu2 = _mm_srai_pi32(accu2, resultDivFactor);
+
+ // pack 2*2*32bits => 4*16 bits
+ pVdest0 = _mm_packs_pi32(accu1, accu2);
+ src += 4;
+ pVdest ++;
+ }
+
+ _m_empty(); // clear emms state
+
+ return (numSamples & 0xfffffffe) - length;
+}
+
+#else
+
+// workaround to not complain about empty module
+bool _dontcomplain_mmx_empty;
+
+#endif // SOUNDTOUCH_ALLOW_MMX

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/soundtouch/source/SoundTouch/sse_optimized.cpp Added

@@ -0,0 +1,365 @@
+////////////////////////////////////////////////////////////////////////////////
+///
+/// SSE optimized routines for Pentium-III, Athlon-XP and later CPUs. All SSE 
+/// optimized functions have been gathered into this single source 
+/// code file, regardless to their class or original source code file, in order 
+/// to ease porting the library to other compiler and processor platforms.
+///
+/// The SSE-optimizations are programmed using SSE compiler intrinsics that
+/// are supported both by Microsoft Visual C++ and GCC compilers, so this file
+/// should compile with both toolsets.
+///
+/// NOTICE: If using Visual Studio 6.0, you'll need to install the "Visual C++ 
+/// 6.0 processor pack" update to support SSE instruction set. The update is 
+/// available for download at Microsoft Developers Network, see here:
+/// http://msdn.microsoft.com/en-us/vstudio/aa718349.aspx
+///
+/// If the above URL is expired or removed, go to "http://msdn.microsoft.com" and 
+/// perform a search with keywords "processor pack".
+///
+/// Author : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+// SoundTouch audio processing library
+// Copyright (c) Olli Parviainen
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include "cpu_detect.h"
+#include "STTypes.h"
+
+using namespace soundtouch;
+
+#ifdef SOUNDTOUCH_ALLOW_SSE
+
+// SSE routines available only with float sample type 
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// implementation of SSE optimized functions of class 'TDStretchSSE'
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#include "TDStretch.h"
+#include <xmmintrin.h>
+#include <math.h>
+
+// Calculates cross correlation of two buffers
+double TDStretchSSE::calcCrossCorr(const float *pV1, const float *pV2, double &anorm)
+{
+ int i;
+ const float *pVec1;
+ const __m128 *pVec2;
+ __m128 vSum, vNorm;
+
+ // Note. It means a major slow-down if the routine needs to tolerate 
+ // unaligned __m128 memory accesses. It's way faster if we can skip 
+ // unaligned slots and use _mm_load_ps instruction instead of _mm_loadu_ps.
+ // This can mean up to ~ 10-fold difference (incl. part of which is
+ // due to skipping every second round for stereo sound though).
+ //
+ // Compile-time define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION is provided
+ // for choosing if this little cheating is allowed.
+
+#ifdef SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION
+ // Little cheating allowed, return valid correlation only for 
+ // aligned locations, meaning every second round for stereo sound.
+
+ #define _MM_LOAD _mm_load_ps
+
+ if (((ulongptr)pV1) & 15) return -1e50; // skip unaligned locations
+
+#else
+ // No cheating allowed, use unaligned load & take the resulting
+ // performance hit.
+ #define _MM_LOAD _mm_loadu_ps
+#endif 
+
+ // ensure overlapLength is divisible by 8
+ assert((overlapLength % 8) == 0);
+
+ // Calculates the cross-correlation value between 'pV1' and 'pV2' vectors
+ // Note: pV2 _must_ be aligned to 16-bit boundary, pV1 need not.
+ pVec1 = (const float*)pV1;
+ pVec2 = (const __m128*)pV2;
+ vSum = vNorm = _mm_setzero_ps();
+
+ // Unroll the loop by factor of 4 * 4 operations. Use same routine for
+ // stereo & mono, for mono it just means twice the amount of unrolling.
+ for (i = 0; i < channels * overlapLength / 16; i ++) 
+ {
+ __m128 vTemp;
+ // vSum += pV10..3 * pV20..3
+ vTemp = _MM_LOAD(pVec1);
+ vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp ,pVec20));
+ vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
+
+ // vSum += pV14..7 * pV24..7
+ vTemp = _MM_LOAD(pVec1 + 4);
+ vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec21));
+ vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
+
+ // vSum += pV18..11 * pV28..11
+ vTemp = _MM_LOAD(pVec1 + 8);
+ vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec22));
+ vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
+
+ // vSum += pV112..15 * pV212..15
+ vTemp = _MM_LOAD(pVec1 + 12);
+ vSum = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec23));
+ vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
+
+ pVec1 += 16;
+ pVec2 += 4;
+ }
+
+ // return value = vSum0 + vSum1 + vSum2 + vSum3
+ float *pvNorm = (float*)&vNorm;
+ float norm = (pvNorm0 + pvNorm1 + pvNorm2 + pvNorm3);
+ anorm = norm;
+
+ float *pvSum = (float*)&vSum;
+ return (double)(pvSum0 + pvSum1 + pvSum2 + pvSum3) / sqrt(norm < 1e-9 ? 1.0 : norm);
+
+ /* This is approximately corresponding routine in C-language yet without normalization:
+ double corr, norm;
+ uint i;
+
+ // Calculates the cross-correlation value between 'pV1' and 'pV2' vectors
+ corr = norm = 0.0;
+ for (i = 0; i < channels * overlapLength / 16; i ++) 
+ {
+ corr += pV10 * pV20 +
+ pV11 * pV21 +
+ pV12 * pV22 +
+ pV13 * pV23 +
+ pV14 * pV24 +
+ pV15 * pV25 +
+ pV16 * pV26 +
+ pV17 * pV27 +
+ pV18 * pV28 +
+ pV19 * pV29 +
+ pV110 * pV210 +
+ pV111 * pV211 +
+ pV112 * pV212 +
+ pV113 * pV213 +
+ pV114 * pV214 +
+ pV115 * pV215;
+
+ for (j = 0; j < 15; j ++) norm += pV1j * pV1j;
+
+ pV1 += 16;
+ pV2 += 16;
+ }
+ return corr / sqrt(norm);
+ */
+}
+
+
+
+double TDStretchSSE::calcCrossCorrAccumulate(const float *pV1, const float *pV2, double &norm)
+{
+ // call usual calcCrossCorr function because SSE does not show big benefit of 
+ // accumulating "norm" value, and also the "norm" rolling algorithm would get 
+ // complicated due to SSE-specific alignment-vs-nonexact correlation rules.
+ return calcCrossCorr(pV1, pV2, norm);
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// implementation of SSE optimized functions of class 'FIRFilter'
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#include "FIRFilter.h"
+
+FIRFilterSSE::FIRFilterSSE() : FIRFilter()
+{
+ filterCoeffsAlign = NULL;
+ filterCoeffsUnalign = NULL;
+}
+
+
+FIRFilterSSE::~FIRFilterSSE()
+{
+ delete filterCoeffsUnalign;
+ filterCoeffsAlign = NULL;
+ filterCoeffsUnalign = NULL;
+}
+
+
+// (overloaded) Calculates filter coefficients for SSE routine
+void FIRFilterSSE::setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor)
+{
+ uint i;
+ float fDivider;
+
+ FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor);
+
+ // Scale the filter coefficients so that it won't be necessary to scale the filtering result
+ // also rearrange coefficients suitably for SSE
+ // Ensure that filter coeffs array is aligned to 16-byte boundary
+ delete filterCoeffsUnalign;
+ filterCoeffsUnalign = new float2 * newLength + 4;
+ filterCoeffsAlign = (float *)SOUNDTOUCH_ALIGN_POINTER_16(filterCoeffsUnalign);
+
+ fDivider = (float)resultDivider;
+
+ // rearrange the filter coefficients for mmx routines 
+ for (i = 0; i < newLength; i ++)
+ {
+ filterCoeffsAlign2 * i + 0 =
+ filterCoeffsAlign2 * i + 1 = coeffsi + 0 / fDivider;
+ }
+}
+
+
+
+// SSE-optimized version of the filter routine for stereo sound
+uint FIRFilterSSE::evaluateFilterStereo(float *dest, const float *source, uint numSamples) const
+{
+ int count = (int)((numSamples - length) & (uint)-2);
+ int j;
+
+ assert(count % 2 == 0);
+
+ if (count < 2) return 0;
+
+ assert(source != NULL);
+ assert(dest != NULL);
+ assert((length % 8) == 0);
+ assert(filterCoeffsAlign != NULL);
+ assert(((ulongptr)filterCoeffsAlign) % 16 == 0);
+
+ // filter is evaluated for two stereo samples with each iteration, thus use of 'j += 2'
+ #pragma omp parallel for
+ for (j = 0; j < count; j += 2)
+ {
+ const float *pSrc;
+ float *pDest;
+ const __m128 *pFil;
+ __m128 sum1, sum2;
+ uint i;
+
+ pSrc = (const float*)source + j * 2; // source audio data
+ pDest = dest + j * 2; // destination audio data
+ pFil = (const __m128*)filterCoeffsAlign; // filter coefficients. NOTE: Assumes coefficients 
+ // are aligned to 16-byte boundary
+ sum1 = sum2 = _mm_setzero_ps();
+
+ for (i = 0; i < length / 8; i ++) 
+ {
+ // Unroll loop for efficiency & calculate filter for 2*2 stereo samples 
+ // at each pass
+
+ // sum1 is accu for 2*2 filtered stereo sound data at the primary sound data offset
+ // sum2 is accu for 2*2 filtered stereo sound data for the next sound sample offset.
+
+ sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc) , pFil0));
+ sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 2), pFil0));
+
+ sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 4), pFil1));
+ sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 6), pFil1));
+
+ sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 8) , pFil2));
+ sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 10), pFil2));
+
+ sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 12), pFil3));
+ sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 14), pFil3));
+
+ pSrc += 16;
+ pFil += 4;
+ }
+
+ // Now sum1 and sum2 both have a filtered 2-channel sample each, but we still need
+ // to sum the two hi- and lo-floats of these registers together.
+
+ // post-shuffle & add the filtered values and store to dest.
+ _mm_storeu_ps(pDest, _mm_add_ps(
+ _mm_shuffle_ps(sum1, sum2, _MM_SHUFFLE(1,0,3,2)), // s2_1 s2_0 s1_3 s1_2
+ _mm_shuffle_ps(sum1, sum2, _MM_SHUFFLE(3,2,1,0)) // s2_3 s2_2 s1_1 s1_0
+ ));
+ }
+
+ // Ideas for further improvement:
+ // 1. If it could be guaranteed that 'source' were always aligned to 16-byte 
+ // boundary, a faster aligned '_mm_load_ps' instruction could be used.
+ // 2. If it could be guaranteed that 'dest' were always aligned to 16-byte 
+ // boundary, a faster '_mm_store_ps' instruction could be used.
+
+ return (uint)count;
+
+ /* original routine in C-language. please notice the C-version has differently 
+ organized coefficients though.
+ double suml1, suml2;
+ double sumr1, sumr2;
+ uint i, j;
+
+ for (j = 0; j < count; j += 2)
+ {
+ const float *ptr;
+ const float *pFil;
+
+ suml1 = sumr1 = 0.0;
+ suml2 = sumr2 = 0.0;
+ ptr = src;
+ pFil = filterCoeffs;
+ for (i = 0; i < lengthLocal; i ++) 
+ {
+ // unroll loop for efficiency.
+
+ suml1 += ptr0 * pFil0 + 
+ ptr2 * pFil2 +
+ ptr4 * pFil4 +
+ ptr6 * pFil6;
+
+ sumr1 += ptr1 * pFil1 + 
+ ptr3 * pFil3 +
+ ptr5 * pFil5 +
+ ptr7 * pFil7;
+
+ suml2 += ptr8 * pFil0 + 
+ ptr10 * pFil2 +
+ ptr12 * pFil4 +
+ ptr14 * pFil6;
+
+ sumr2 += ptr9 * pFil1 + 
+ ptr11 * pFil3 +
+ ptr13 * pFil5 +
+ ptr15 * pFil7;
+
+ ptr += 16;
+ pFil += 8;
+ }
+ dest0 = (float)suml1;
+ dest1 = (float)sumr1;
+ dest2 = (float)suml2;
+ dest3 = (float)sumr2;
+
+ src += 4;
+ dest += 4;
+ }
+ */
+}
+
+#endif // SOUNDTOUCH_ALLOW_SSE

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/st.cpp Added

@@ -0,0 +1,112 @@
+/*
+ DeaDBeeF - The Ultimate Music Player
+ Copyright (C) 2009-2013 Oleksiy 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 "SoundTouch.h"
+#include "st.h"
+
+using namespace soundtouch;
+
+void*
+st_alloc (void) {
+ return new SoundTouch ();
+}
+
+void
+st_free (void *st) {
+ delete (SoundTouch *)st;
+}
+
+void
+st_set_rate (void *st, float r) {
+ ((SoundTouch *)st)->setRate (r);
+}
+
+void
+st_set_tempo (void *st, float t) {
+ ((SoundTouch *)st)->setTempo (t);
+}
+
+void
+st_set_rate_change (void *st, float r) {
+ ((SoundTouch *)st)->setRateChange (r);
+}
+
+void
+st_set_tempo_change (void *st, float t) {
+ ((SoundTouch *)st)->setTempoChange (t);
+}
+
+void
+st_set_pitch (void *st, float p) {
+ ((SoundTouch *)st)->setPitch (p);
+}
+
+void
+st_set_pitch_octaves (void *st, float po) {
+ ((SoundTouch *)st)->setPitchOctaves (po);
+}
+
+void
+st_set_pitch_semi_tones (void *st, float p) {
+ ((SoundTouch *)st)->setPitchSemiTones (p);
+}
+
+void
+st_set_channels (void *st, int c) {
+ ((SoundTouch *)st)->setChannels (c);
+}
+
+void
+st_set_sample_rate (void *st, int r) {
+ ((SoundTouch *)st)->setSampleRate (r);
+}
+
+void
+st_flush (void *st) {
+ ((SoundTouch *)st)->flush ();
+}
+
+void
+st_put_samples (void *st, float *samples, int nsamples) {
+ ((SoundTouch *)st)->putSamples (samples, nsamples);
+}
+
+void
+st_clear (void *st) {
+ ((SoundTouch *)st)->clear ();
+}
+
+void
+st_set_setting (void *st, int id, int value) {
+ ((SoundTouch *)st)->setSetting (id, value);
+}
+
+int
+st_get_setting (void *st, int id) {
+ return ((SoundTouch *)st)->getSetting (id);
+}
+
+unsigned int
+st_num_unprocessed_samples (void *st) {
+ return ((SoundTouch *)st)->numUnprocessedSamples ();
+}
+
+unsigned int
+st_receive_samples (void *st, float *out, unsigned int max_samples) {
+ return ((SoundTouch *)st)->receiveSamples (out, max_samples);
+}

deadbeef-1.9.6.tar.bz2/plugins/soundtouch/st.h Added

@@ -0,0 +1,115 @@
+/*
+ DeaDBeeF - The Ultimate Music Player
+ Copyright (C) 2009-2013 Oleksiy 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.
+*/
+#ifndef __ST_H
+#define __ST_H
+
+//////////////////////////////////
+// C-wrapper for soundtouch class
+
+/// Enable/disable anti-alias filter in pitch transposer (0 = disable)
+#define SETTING_USE_AA_FILTER 0
+
+/// Pitch transposer anti-alias filter length (8 .. 128 taps, default = 32)
+#define SETTING_AA_FILTER_LENGTH 1
+
+/// Enable/disable quick seeking algorithm in tempo changer routine
+/// (enabling quick seeking lowers CPU utilization but causes a minor sound
+/// quality compromising)
+#define SETTING_USE_QUICKSEEK 2
+
+/// Time-stretch algorithm single processing sequence length in milliseconds. This determines 
+/// to how long sequences the original sound is chopped in the time-stretch algorithm. 
+/// See "STTypes.h" or README for more information.
+#define SETTING_SEQUENCE_MS 3
+
+/// Time-stretch algorithm seeking window length in milliseconds for algorithm that finds the 
+/// best possible overlapping location. This determines from how wide window the algorithm 
+/// may look for an optimal joining location when mixing the sound sequences back together. 
+/// See "STTypes.h" or README for more information.
+#define SETTING_SEEKWINDOW_MS 4
+
+/// Time-stretch algorithm overlap length in milliseconds. When the chopped sound sequences 
+/// are mixed back together, to form a continuous sound stream, this parameter defines over 
+/// how long period the two consecutive sequences are let to overlap each other. 
+/// See "STTypes.h" or README for more information.
+#define SETTING_OVERLAP_MS 5
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void*
+st_alloc (void);
+
+void
+st_free (void *st);
+
+void
+st_set_rate (void *st, float r);
+
+void
+st_set_tempo (void *st, float t);
+
+void
+st_set_rate_change (void *st, float r);
+
+void
+st_set_tempo_change (void *st, float t);
+
+void
+st_set_pitch (void *st, float p);
+
+void
+st_set_pitch_octaves (void *st, float po);
+
+void
+st_set_pitch_semi_tones (void *st, float p);
+
+void
+st_set_channels (void *st, int c);
+
+void
+st_set_sample_rate (void *st, int r);
+
+void
+st_flush (void *st);
+
+void
+st_put_samples (void *st, float *samples, int nsamples);
+
+void
+st_clear (void *st);
+
+void
+st_set_setting (void *st, int id, int value);
+
+int
+st_get_setting (void *st, int id);
+
+unsigned int
+st_num_unprocessed_samples (void *st);
+
+unsigned int
+st_receive_samples (void *st, float *out, unsigned int max_samples);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

deadbeef-0.6.2.tar.bz2/plugins/supereq/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/supereq/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/supereq/Equ.cpp -> deadbeef-1.9.6.tar.bz2/plugins/supereq/Equ.cpp Changed

@@ -1,6 +1,6 @@
 /*
 SuperEQ DSP plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2014 Oleksiy Yakovenko <waker@users.sourceforge.net>
 Original SuperEQ code (C) Naoki Shibata <shibatch@users.sf.net>
 
 This program is free software; you can redistribute it and/or
@@ -24,17 +24,14 @@
 #include "paramlist.hpp"
 #include "Equ.h"
 
-#ifdef USE_OOURA
 extern "C" void rdft(int, int, REAL *, int *, REAL *);
-void rfft(int n,int isign,REAL *x)
+
+void rfft(FFTCTX *ctx, int n,int isign,REAL *x)
 {
- static int ipsize = 0,wsize=0;
- static int *ip = NULL;
- static REAL *w = NULL;
 int newipsize,newwsize;
 if (n == 0) {
- free(ip); ip = NULL; ipsize = 0;
- free(w); w = NULL; wsize = 0;
+ free(ctx->ip); ctx->ip = NULL; ctx->ipsize = 0;
+ free(ctx->w); ctx->w = NULL; ctx->wsize = 0;
 return;
 }
 
@@ -42,30 +39,20 @@
 
 
 newipsize = 2+sqrt(n/2);
- if (newipsize > ipsize) {
- ipsize = newipsize;
- ip = (int *)realloc(ip,sizeof(int)*ipsize);
- ip0 = 0;
+ if (newipsize > ctx->ipsize) {
+ ctx->ipsize = newipsize;
+ ctx->ip = (int *)realloc(ctx->ip,sizeof(int)*ctx->ipsize);
+ ctx->ip0 = 0;
 }
 
 newwsize = n/2;
- if (newwsize > wsize) {
- wsize = newwsize;
- w = (REAL *)realloc(w,sizeof(REAL)*wsize);
+ if (newwsize > ctx->wsize) {
+ ctx->wsize = newwsize;
+ ctx->w = (REAL *)realloc(ctx->w,sizeof(REAL)*ctx->wsize);
 }
 
- rdft(n,isign,x,ip,w);
-}
-#elif defined(USE_FFMPEG) || defined(USE_SHIBATCH)
-extern "C" void rfft(int n,int isign,REAL *x);
-#endif
-
-#if defined(USE_SHIBATCH)
-extern "C" {
-#include "SIMDBase.h"
+ rdft(n,isign,x,ctx->ip,ctx->w);
 }
-#endif
-
 
 #define PI 3.1415926535897932384626433832795
 
@@ -77,7 +64,7 @@
 static REAL iza = 0;
 
 #define NBANDS 17
-static REAL bands = {
+static REAL bandsNBANDS = {
 65.406392,92.498606,130.81278,184.99721,261.62557,369.99442,523.25113,
 739.9884 ,1046.5023,1479.9768,2093.0045,2959.9536,4186.0091,5919.9072,
 8372.0181,11839.814,16744.036
@@ -106,19 +93,11 @@
 }
 
 void *equ_malloc (int size) {
-#ifdef USE_SHIBATCH
- return SIMDBase_alignedMalloc (size);
-#else
 return malloc (size);
-#endif
 }
 
 void equ_free (void *mem) {
-#ifdef USE_SHIBATCH
- SIMDBase_alignedFree (mem);
-#else
 free (mem);
-#endif
 }
 
 extern "C" void equ_init(SuperEqState *state, int wb, int channels)
@@ -230,8 +209,8 @@
 for(i=0,pp=&param2.elm;i<=NBANDS;i++,pp = &(*pp)->next)
 {
 (*pp) = new paramlistelm;
-	(*pp)->lower = i == 0 ? 0 : bandsi-1;
-	(*pp)->upper = i == NBANDS-1 ? fs : bandsi ;
+	(*pp)->lower = i == 0 ? 0 : bandsi-1;
+	(*pp)->upper = i == NBANDS ? fs : bandsi ;
 	(*pp)->gain = bci;
 }
 
@@ -318,7 +297,7 @@
 for(;i<state->tabsize;i++)
 state->iresti = 0;
 
- rfft(state->fft_bits,1,state->irest);
+ rfft(&state->fftctx, state->fft_bits,1,state->irest);
 
 nires = cires == 1 ? state->lires2 : state->lires1;
 nires += ch * state->tabsize;
@@ -346,7 +325,7 @@
 state->finbuf = NULL;
 state->outbuf = NULL;
 
- rfft(0,0,NULL);
+ rfft(&state->fftctx,0,0,NULL);
 }
 
 extern "C" void equ_clearbuf(SuperEqState *state)
@@ -363,7 +342,6 @@
 REAL *ires;
 float amax = 1.0f;
 float amin = -1.0f;
- static float hm1 = 0, hm2 = 0;
 
 if (state->chg_ires) {
 	 state->cur_ires = state->chg_ires;
@@ -403,7 +381,7 @@
 				state->fsamplesi = 0;
 
 			if (state->enable) {
-				rfft(state->fft_bits,1,state->fsamples);
+				rfft(&state->fftctx, state->fft_bits,1,state->fsamples);
 
 				state->fsamples0 = ires0*state->fsamples0;
 				state->fsamples1 = ires1*state->fsamples1; 
@@ -419,7 +397,7 @@
 						state->fsamplesi*2+1 = im;
 					}
 
-				rfft(state->fft_bits,-1,state->fsamples);
+				rfft(&state->fftctx, state->fft_bits,-1,state->fsamples);
 			} else {
 				for(i=state->winlen-1+state->winlen/2;i>=state->winlen/2;i--) state->fsamplesi = state->fsamplesi-state->winlen/2*state->tabsize/2;
 				for(;i>=0;i--) state->fsamplesi = 0;
@@ -437,12 +415,12 @@
 				float s = state->outbufstate->nbufsamples*nch+i;
 				if (state->dither) {
 					float u;
-					s -= hm1;
+					s -= state->hm1;
 					u = s;
 //					s += ditherbuf(ditherptr++) & (DITHERLEN-1);
 					if (s < amin) s = amin;
 					if (amax < s) s = amax;
-					hm1 = s - u;
+					state->hm1 = s - u;
 					((float *)buf)i+p*nch = s;
 				} else {
 					if (s < amin) s = amin;

deadbeef-0.6.2.tar.bz2/plugins/supereq/Equ.h -> deadbeef-1.9.6.tar.bz2/plugins/supereq/Equ.h Changed

deadbeef-0.6.2.tar.bz2/plugins/supereq/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/supereq/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/supereq/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/supereq/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/supereq/paramlist.hpp -> deadbeef-1.9.6.tar.bz2/plugins/supereq/paramlist.hpp Changed

deadbeef-0.6.2.tar.bz2/plugins/supereq/supereq.c -> deadbeef-1.9.6.tar.bz2/plugins/supereq/supereq.c Changed

@@ -1,6 +1,6 @@
 /*
 SuperEQ DSP plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2014 Oleksiy 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
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include "Equ.h"
 
 static DB_functions_t *deadbeef;
@@ -80,14 +80,6 @@
 supereq_reset (ctx);
 }
 supereq->enabled = ctx->enabled;
-
-// this causes a glitch on 1st track
-// DB_playItem_t *it = deadbeef->streamer_get_playing_track ();
-// if (it) {
-// float playpos = deadbeef->streamer_get_playpos ();
-// deadbeef->streamer_seek (playpos);
-// deadbeef->pl_item_unref (it);
-// }
 }
 if (supereq->params_changed) {
 recalc_table (supereq);
@@ -250,31 +242,30 @@
 }
 
 static const char settings_dlg =
- "property \"\" hbox19 hmg fill expand border=0 spacing=8 height=200;\n"
- "property \"Preamp\" vscale20,-20,1 vert 0 0;\n"
- "property \"55 Hz\" vscale20,-20,1 vert 1 0;\n"
- "property \"77 Hz\" vscale20,-20,1 vert 2 0;\n"
- "property \"110 Hz\" vscale20,-20,1 vert 3 0;\n"
- "property \"156 Hz\" vscale20,-20,1 vert 4 0;\n"
- "property \"220 Hz\" vscale20,-20,1 vert 5 0;\n"
- "property \"311 Hz\" vscale20,-20,1 vert 6 0;\n"
- "property \"440 Hz\" vscale20,-20,1 vert 7 0;\n"
- "property \"622 Hz\" vscale20,-20,1 vert 8 0;\n"
- "property \"880 Hz\" vscale20,-20,1 vert 9 0;\n"
- "property \"1.2 kHz\" vscale20,-20,1 vert 10 0;\n"
- "property \"1.8 kHz\" vscale20,-20,1 vert 11 0;\n"
- "property \"2.5 kHz\" vscale20,-20,1 vert 12 0;\n"
- "property \"3.5 kHz\" vscale20,-20,1 vert 13 0;\n"
- "property \"5 kHz\" vscale20,-20,1 vert 14 0;\n"
- "property \"7 kHz\" vscale20,-20,1 vert 15 0;\n"
- "property \"10 kHz\" vscale20,-20,1 vert 16 0;\n"
- "property \"14 kHz\" vscale20,-20,1 vert 17 0;\n"
- "property \"20 kHz\" vscale20,-20,1 vert 18 0;\n"
+ "property \"\" hbox19 hmg fill expand border=0 spacing=8 height=200 noclip itemwidth=30;\n"
+ "property \"Preamp\" vscale20,-20,0.5 vert 0 0;\n"
+ "property \"55\" vscale20,-20,0.5 vert 1 0;\n"
+ "property \"77\" vscale20,-20,0.5 vert 2 0;\n"
+ "property \"110\" vscale20,-20,0.5 vert 3 0;\n"
+ "property \"156\" vscale20,-20,0.5 vert 4 0;\n"
+ "property \"220\" vscale20,-20,0.5 vert 5 0;\n"
+ "property \"311\" vscale20,-20,0.5 vert 6 0;\n"
+ "property \"440\" vscale20,-20,0.5 vert 7 0;\n"
+ "property \"622\" vscale20,-20,0.5 vert 8 0;\n"
+ "property \"880\" vscale20,-20,0.5 vert 9 0;\n"
+ "property \"1.2K\" vscale20,-20,0.5 vert 10 0;\n"
+ "property \"1.8K\" vscale20,-20,0.5 vert 11 0;\n"
+ "property \"2.5K\" vscale20,-20,0.5 vert 12 0;\n"
+ "property \"3.5K\" vscale20,-20,0.5 vert 13 0;\n"
+ "property \"5K\" vscale20,-20,0.5 vert 14 0;\n"
+ "property \"7K\" vscale20,-20,0.5 vert 15 0;\n"
+ "property \"10K\" vscale20,-20,0.5 vert 16 0;\n"
+ "property \"14K\" vscale20,-20,0.5 vert 17 0;\n"
+ "property \"20K\" vscale20,-20,0.5 vert 18 0;\n"
 ;
 
 static DB_dsp_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_DSP,
@@ -283,7 +274,7 @@
 .plugin.descr = "equalizer plugin using SuperEQ library",
 .plugin.copyright = 
 "SuperEQ DSP plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko <waker@users.sourceforge.net>\n"
 "\n"
 "Uses supereq library by Naoki Shibata, http://shibatch.sourceforge.net\n"
 "Uses FFT library by Takuya Ooura, http://www.kurims.kyoto-u.ac.jp/~ooura/\n"

deadbeef-0.6.2.tar.bz2/plugins/tta/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/tta/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/tta/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/tta/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/tta/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/tta/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/tta/ttadec.c -> deadbeef-1.9.6.tar.bz2/plugins/tta/ttadec.c Changed

deadbeef-0.6.2.tar.bz2/plugins/tta/ttadec.h -> deadbeef-1.9.6.tar.bz2/plugins/tta/ttadec.h Changed

deadbeef-0.6.2.tar.bz2/plugins/tta/ttaplug.c -> deadbeef-1.9.6.tar.bz2/plugins/tta/ttaplug.c Changed

@@ -1,6 +1,6 @@
 /*
 TTA plugin for DeaDBeeF
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy Yakovenko
 
 Based on TTAv1 decoder library for HW players
 Copyright (c) 2004 True Audio Software. All rights reserved.
@@ -34,7 +34,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
@@ -50,9 +51,9 @@
 typedef struct {
 DB_fileinfo_t info;
 tta_info tta;
- int currentsample;
- int startsample;
- int endsample;
+ int64_t currentsample;
+ int64_t startsample;
+ int64_t endsample;
 char bufferPCM_BUFFER_LENGTH * MAX_BSIZE * MAX_NCH;
 int remaining;
 int samples_to_skip;
@@ -60,10 +61,8 @@
 
 static DB_fileinfo_t *
 tta_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (tta_info_t));
- tta_info_t *info = (tta_info_t *)_info;
- memset (info, 0, sizeof (tta_info_t));
- return _info;
+ tta_info_t *info = calloc (1, sizeof (tta_info_t));
+ return &info->info;
 }
 
 static int
@@ -71,20 +70,18 @@
 tta_info_t *info = (tta_info_t *)_info;
 
 deadbeef->pl_lock ();
- const char *fname = deadbeef->pl_find_meta (it, ":URI")
+ const char *fname = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
 trace ("open_tta_file %s\n", fname);
 if (open_tta_file (fname, &info->tta, 0) != 0) {
- deadbeef->pl_unlock ();
 fprintf (stderr, "tta: failed to open %s\n", fname);
 return -1;
 }
 
 if (player_init (&info->tta) != 0) {
- deadbeef->pl_unlock ();
 fprintf (stderr, "tta: failed to init player for %s\n", fname);
 return -1;
 }
- deadbeef->pl_unlock ();
 
 _info->fmt.bps = info->tta.BPS;
 _info->fmt.channels = info->tta.NCH;
@@ -95,9 +92,10 @@
 _info->readpos = 0;
 _info->plugin = &plugin;
 
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample (it);
+ info->endsample = endsample;
 plugin.seek_sample (_info, 0);
 }
 else {
@@ -158,7 +156,7 @@
 }
 
 if (size > 0 && !info->remaining) {
- info->remaining = get_samples (&info->tta, info->buffer);
+ info->remaining = get_samples (&info->tta, (unsigned char *)info->buffer);
 if (info->remaining <= 0) {
 break;
 }
@@ -187,7 +185,6 @@
 
 static int
 tta_seek (DB_fileinfo_t *_info, float time) {
- tta_info_t *info = (tta_info_t *)_info;
 return tta_seek_sample (_info, time * _info->fmt.samplerate);
 }
 
@@ -223,23 +220,8 @@
 deadbeef->fclose (fp);
 }
 
- // embedded cue
- deadbeef->pl_lock ();
- const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
- DB_playItem_t *cue = NULL;
- if (cuesheet) {
- cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), totalsamples, tta.SAMPLERATE);
- if (cue) {
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
- deadbeef->pl_unlock ();
- return cue;
- }
- }
- deadbeef->pl_unlock ();
-
 char s100;
- snprintf (s, sizeof (s), "%lld", fsize);
+ snprintf (s, sizeof (s), "%lld", (long long)fsize);
 deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
 snprintf (s, sizeof (s), "%d", tta.BPS);
 deadbeef->pl_add_meta (it, ":BPS", s);
@@ -250,10 +232,9 @@
 snprintf (s, sizeof (s), "%d", tta.BITRATE);
 deadbeef->pl_add_meta (it, ":BITRATE", s);
 
- cue = deadbeef->plt_insert_cue (plt, after, it, totalsamples, tta.SAMPLERATE);
+ DB_playItem_t *cue = deadbeef->plt_process_cue (plt, after, it, totalsamples, tta.SAMPLERATE);
 if (cue) {
 deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
 return cue;
 }
 
@@ -266,8 +247,9 @@
 
 static int tta_read_metadata (DB_playItem_t *it) {
 deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
 if (!fp) {
 return -1;
 }
@@ -312,7 +294,7 @@
 
 int id3v2_version = 4;
 char id3v1_encoding50;
- deadbeef->conf_get_str ("mp3.id3v1_encoding", "iso8859-1", id3v1_encoding, sizeof (id3v1_encoding));
+ deadbeef->conf_get_str ("mp3.id3v1_encoding", "cp1252", id3v1_encoding, sizeof (id3v1_encoding));
 return deadbeef->junk_rewrite_tags (it, junk_flags, id3v2_version, id3v1_encoding);
 }
 
@@ -331,8 +313,7 @@
 
 // define plugin interface
 static DB_decoder_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_DECODER,
@@ -341,7 +322,7 @@
 .plugin.descr = "tta decoder based on TTA Hardware Players Library Version 1.2",
 .plugin.copyright = 
 "TTA plugin for DeaDBeeF\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "Based on TTAv1 decoder library for HW players\n"
 "Copyright (c) 2004 True Audio Software. All rights reserved.\n"

deadbeef-0.6.2.tar.bz2/plugins/vfs_curl/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/vfs_curl/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/vfs_curl/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/vfs_curl/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/vfs_curl/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/vfs_curl/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/vfs_curl/vfs_curl.c -> deadbeef-1.9.6.tar.bz2/plugins/vfs_curl/vfs_curl.c Changed

@@ -1,6 +1,6 @@
 /*
 CURL VFS plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy 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
@@ -25,70 +25,19 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <errno.h>
 #include <assert.h>
 #include <curl/curlver.h>
-#include <time.h>
-#include "../../deadbeef.h"
+#include <sys/time.h>
+#include "vfs_curl.h"
 
-//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-#define trace(fmt,...)
+#define trace(...) { deadbeef->log_detailed (&plugin.plugin, 0, __VA_ARGS__); }
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
 
 static DB_functions_t *deadbeef;
 
-#define BUFFER_SIZE (0x10000)
-#define BUFFER_MASK 0xffff
-
-#define MAX_METADATA 1024
-
-#define TIMEOUT 10 // in seconds
-
-enum {
- STATUS_INITIAL = 0,
- STATUS_READING = 1,
- STATUS_FINISHED = 2,
- STATUS_ABORTED = 3,
- STATUS_SEEK = 4,
- STATUS_DESTROY = 5,
-};
-
-typedef struct {
- DB_vfs_t *vfs;
- char *url;
- uint8_t bufferBUFFER_SIZE;
-
- DB_playItem_t *track;
- int64_t pos; // position in stream; use "& BUFFER_MASK" to make it index into ringbuffer
- int64_t length;
- int32_t remaining; // remaining bytes in buffer read from stream
- int64_t skipbytes;
- intptr_t tid; // thread id which does http requests
- intptr_t mutex;
- uint8_t nheaderpackets;
- char *content_type;
- CURL *curl;
- struct timeval last_read_time;
- uint8_t status;
- int icy_metaint;
- int wait_meta;
-
- char metadataMAX_METADATA;
- int metadata_size; // size of metadata in stream
- int metadata_have_size; // amount which is already in metadata buffer
-
- char http_errCURL_ERROR_SIZE;
-
- float prev_playtime;
- time_t started_timestamp;
-
- // flags (bitfields to save some space)
- unsigned seektoend : 1; // indicates that next tell must return length
- unsigned gotheader : 1; // tells that all headers (including ICY) were processed (to start reading body)
- unsigned icyheader : 1; // tells that we're currently reading ICY headers
- unsigned gotsomeheader : 1; // tells that we got some headers before body started
-} HTTP_FILE;
 
 static DB_vfs_t plugin;
 
@@ -99,26 +48,20 @@
 
 static int64_t biglock;
 
+static uint64_t _curr_identifier;
+
 #define MAX_ABORT_FILES 100
-static DB_FILE *open_filesMAX_ABORT_FILES;
-static int num_open_files = 0;
-static DB_FILE *abort_filesMAX_ABORT_FILES;
+static uint64_t abort_filesMAX_ABORT_FILES;
 static int num_abort_files = 0;
 
 static int
-http_need_abort (DB_FILE *fp);
-
-static void
-http_cancel_abort (DB_FILE *fp);
+http_need_abort (uint64_t identifier);
 
 static void
-http_abort (DB_FILE *fp);
+http_cancel_abort (uint64_t identifier);
 
 static void
-http_reg_open_file (DB_FILE *fp);
-
-static void
-http_unreg_open_file (DB_FILE *fp);
+vfs_curl_abort_with_identifier (uint64_t identifier);
 
 static size_t
 http_curl_write_wrapper (HTTP_FILE *fp, void *ptr, size_t size) {
@@ -130,7 +73,7 @@
 deadbeef->mutex_unlock (fp->mutex);
 return 0;
 }
- if (http_need_abort ((DB_FILE*)fp)) {
+ if (http_need_abort (fp->identifier)) {
 fp->status = STATUS_ABORTED;
 trace ("vfs_curl STATUS_ABORTED in the middle of packet\n");
 deadbeef->mutex_unlock (fp->mutex);
@@ -140,10 +83,10 @@
 // don't allow to fill more than half -- used for seeking backwards
 
 if (sz > 5000) { // wait until there are at least 5k bytes free
- int cp = min (avail, sz);
+ size_t cp = min (avail, sz);
 int writepos = (fp->pos + fp->remaining) & BUFFER_MASK;
 // copy 1st portion (before end of buffer
- int part1 = BUFFER_SIZE - writepos;
+ size_t part1 = BUFFER_SIZE - writepos;
 // may not be more than total
 part1 = min (part1, cp);
 memcpy (fp->buffer+writepos, ptr, part1);
@@ -169,7 +112,7 @@
 const char *cs = deadbeef->junk_detect_charset (value);
 if (cs) {
 char out1024;
- deadbeef->junk_recode (value, strlen (value), out, sizeof (out), cs);
+ deadbeef->junk_recode (value, (int)strlen (value), out, sizeof (out), cs);
 deadbeef->pl_replace_meta (it, meta, out);
 }
 else {
@@ -187,15 +130,15 @@
 }
 
 int
-http_parse_shoutcast_meta (HTTP_FILE *fp, const char *meta, int size) {
- trace ("reading %d bytes of metadata\n", size);
+http_parse_shoutcast_meta (HTTP_FILE *fp, const char *meta, size_t size) {
+// trace ("reading %d bytes of metadata\n", size);
 trace ("%s\n", meta);
 const char *e = meta + size;
 const char strtitle = "StreamTitle='";
 char title256 = "";
 while (meta < e) {
 if (!memcmp (meta, strtitle, sizeof (strtitle)-1)) {
- trace ("extracting streamtitle\n");
+// trace ("extracting streamtitle\n");
 meta += sizeof (strtitle)-1;
 const char *substr_end = meta;
 while (substr_end < e-1 && (*substr_end != '\'' || *(substr_end+1) != ';')) {
@@ -204,7 +147,7 @@
 if (substr_end >= e) {
 return -1; // end of string not found
 }
- int s = substr_end - meta;
+ size_t s = substr_end - meta;
 s = min (sizeof (title)-1, s);
 memcpy (title, meta, s);
 titles = 0;
@@ -213,7 +156,7 @@
 int songstarted = 0;
 char *tit = strstr (title, " - ");
 deadbeef->pl_lock ();
- int emulate_trackchange = deadbeef->conf_get_int ("vfs_curl.emulate_trackchange", 0);
+ int emulate_trackchange = 1;
 // create dummy track with previous meta
 DB_playItem_t *from = NULL;
 if (emulate_trackchange) {
@@ -229,19 +172,19 @@
 const char *orig_artist = deadbeef->pl_find_meta (fp->track, "artist");
 
 if (!orig_title || strcasecmp (orig_title, tit)) {
- vfs_curl_set_meta (fp->track, "title", tit);
+ vfs_curl_set_meta (fp->track, "!title", tit);
 songstarted = 1;
 }
 if (!orig_artist || strcasecmp (orig_artist, title)) {
- vfs_curl_set_meta (fp->track, "artist", title);
+ vfs_curl_set_meta (fp->track, "!artist", title);
 songstarted = 1;
 }
 }
 else {
 const char *orig_title = deadbeef->pl_find_meta (fp->track, "title");
 if (!orig_title || strcasecmp (orig_title, title)) {
- deadbeef->pl_delete_meta (fp->track, "artist");
- vfs_curl_set_meta (fp->track, "title", title);
+ deadbeef->pl_delete_meta (fp->track, "!artist");
+ vfs_curl_set_meta (fp->track, "!title", title);
 songstarted = 1;
 }
 }
@@ -251,7 +194,7 @@
 deadbeef->plt_modified (plt);
 deadbeef->plt_unref (plt);
 }
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 if (songstarted) {
 
 float playpos = deadbeef->streamer_get_playpos ();
@@ -297,6 +240,7 @@
 
 static void
 http_stream_reset (HTTP_FILE *fp) {
+ // FIXME: calling this without reopening the entire stream causes metadata counter unsync.
 fp->gotheader = 0;
 fp->icyheader = 0;
 fp->gotsomeheader = 0;
@@ -309,127 +253,9 @@
 fp->wait_meta = 0;
 }
 
-static size_t
-http_curl_write (void *ptr, size_t size, size_t nmemb, void *stream) {
- int avail = size * nmemb;
- HTTP_FILE *fp = (HTTP_FILE *)stream;
-
-// trace ("http_curl_write %d bytes, wait_meta=%d\n", size * nmemb, fp->wait_meta);
- gettimeofday (&fp->last_read_time, NULL);
- if (http_need_abort (stream)) {
- fp->status = STATUS_ABORTED;
- trace ("vfs_curl STATUS_ABORTED at start of packet\n");
- return 0;
- }
-// if (fp->gotsomeheader) {
-// fp->gotheader = 1;
-// }
- if (!fp->gotheader) {
- // check if that's ICY
- if (!fp->icyheader && avail >= 10 && !memcmp (ptr, "ICY 200 OK", 10)) {
- trace ("icy headers in the stream\n");
- fp->icyheader = 1;
- }
- if (fp->icyheader) {
- if (fp->nheaderpackets > 10) {
- fprintf (stderr, "vfs_curl: warning: seems like stream has unterminated ICY headers\n");
- fp->gotheader = 1;
- }
- else {
-// trace ("parsing icy headers:\n%s\n", ptr);
- fp->nheaderpackets++;
- avail = http_content_header_handler (ptr, size, nmemb, stream);
- if (avail == size * nmemb) {
- if (fp->gotheader) {
- fp->gotheader = 0; // don't reset icy header
- }
- }
- else {
- fp->gotheader = 1;
- }
- }
- }
- else {
- fp->gotheader = 1;
- }
- if (!avail) {
- return nmemb*size;
- }
- }
-
- deadbeef->mutex_lock (fp->mutex);
- if (fp->status == STATUS_INITIAL && fp->gotheader) {
- fp->status = STATUS_READING;
- }
- deadbeef->mutex_unlock (fp->mutex);
-
- if (fp->icy_metaint > 0) {
- for (;;) {
-// trace ("wait_meta=%d, avail=%d\n", fp->wait_meta, avail);
- if (fp->metadata_size > 0) {
- if (fp->metadata_size > fp->metadata_have_size) {
- trace ("metadata fetch mode, avail: %d, metadata_size: %d, metadata_have_size: %d)\n", avail, fp->metadata_size, fp->metadata_have_size);
- int sz = (fp->metadata_size - fp->metadata_have_size);
- sz = min (sz, avail);
- if (sz > 0) {
- trace ("fetching %d bytes of metadata (out of %d)\n", sz, fp->metadata_size);
- memcpy (fp->metadata + fp->metadata_have_size, ptr, sz);
- avail -= sz;
- ptr += sz;
- fp->metadata_have_size += sz;
- }
- }
- if (fp->metadata_size == fp->metadata_have_size) {
- int sz = fp->metadata_size;
- fp->metadata_size = fp->metadata_have_size = 0;
- if (http_parse_shoutcast_meta (fp, fp->metadata, sz) < 0) {
- trace ("vfs_curl: got invalid icy metadata block\n");
- http_stream_reset (fp);
- fp->status = STATUS_SEEK;
- return 0;
- }
- }
- }
- if (fp->wait_meta < avail) {
- // read bytes remaining until metadata block
- size_t res1 = http_curl_write_wrapper (fp, ptr, fp->wait_meta);
- if (res1 != fp->wait_meta) {
- return 0;
- }
- avail -= res1;
- ptr += res1;
- uint32_t sz = (uint32_t)(*((uint8_t *)ptr)) * 16;
- ptr ++;
- fp->metadata_size = sz;
- fp->metadata_have_size = 0;
- fp->wait_meta = fp->icy_metaint;
- avail--;
- if (sz != 0) {
- trace ("found metadata block, size: %d (avail=%d)\n", sz, avail);
- }
- }
- if ((!fp->metadata_size || !avail) && fp->wait_meta >= avail) {
- break;
- }
- if (avail < 0) {
- trace ("vfs_curl: something bad happened in metadata parser. can't continue streaming.\n");
- return 0;
- }
- }
- }
-
- if (avail) {
-// trace ("http_curl_write_wrapper 2 %d\n", avail);
- size_t res = http_curl_write_wrapper (fp, ptr, avail);
- avail -= res;
- fp->wait_meta -= res;
- }
- return nmemb * size - avail;
-}
-
 static const uint8_t *
 parse_header (const uint8_t *p, const uint8_t *e, uint8_t *key, int keysize, uint8_t *value, int valuesize) {
- int sz; // will hold lenght of extracted string
+ size_t sz; // will hold lenght of extracted string
 const uint8_t *v; // pointer to current character
 keysize--;
 valuesize--;
@@ -471,7 +297,7 @@
 while (v < e && *v != 0x0d && *v != 0x0a) {
 v++;
 }
- 
+
 // copy value
 sz = v-p;
 sz = min (valuesize, sz);
@@ -482,12 +308,12 @@
 }
 
 static size_t
-http_content_header_handler (void *ptr, size_t size, size_t nmemb, void *stream) {
- trace ("http_content_header_handler\n");
+http_content_header_handler_int (const void *ptr, size_t size, void *stream, int *end_of_headers) {
+// trace ("http_content_header_handler\n");
 assert (stream);
 HTTP_FILE *fp = (HTTP_FILE *)stream;
 const uint8_t *p = ptr;
- const uint8_t *end = p + size*nmemb;
+ const uint8_t *end = p + size;
 uint8_t key256;
 uint8_t value256;
 int refresh_playlist = 0;
@@ -500,7 +326,8 @@
 if (p <= end - 4) {
 if (!memcmp (p, "\r\n\r\n", 4)) {
 p += 4;
- return size * nmemb - (size_t)(p-(const uint8_t *)ptr);
+ *end_of_headers = 1;
+ return p - (uint8_t *)ptr;
 }
 }
 // skip linebreaks
@@ -509,31 +336,42 @@
 }
 p = parse_header (p, end, key, sizeof (key), value, sizeof (value));
 trace ("%skey=%s value=%s\n", fp->icyheader ? "icy " : "", key, value);
- if (!strcasecmp (key, "Content-Type")) {
+ if (!strcasecmp ((char *)key, "Content-Type")) {
 if (fp->content_type) {
 free (fp->content_type);
 }
- fp->content_type = strdup (value);
+ fp->content_type = strdup ((char *)value);
 }
- else if (!strcasecmp (key, "Content-Length")) {
- fp->length = atoi (value);
+ else if (!strcasecmp ((char *)key, "Content-Length")) {
+ fp->length = atoi ((char *)value);
 }
- else if (!strcasecmp (key, "icy-name")) {
+ else if (!strcasecmp ((char *)key, "icy-name")) {
 if (fp->track) {
- vfs_curl_set_meta (fp->track, "album", value);
+ vfs_curl_set_meta (fp->track, "title", (char *)value);
 refresh_playlist = 1;
 }
 }
- else if (!strcasecmp (key, "icy-genre")) {
+ else if (!strcasecmp ((char *)key, "icy-genre")) {
 if (fp->track) {
- vfs_curl_set_meta (fp->track, "genre", value);
+ vfs_curl_set_meta (fp->track, "genre", (char *)value);
 refresh_playlist = 1;
 }
 }
- else if (!strcasecmp (key, "icy-metaint")) {
+ else if (!strcasecmp ((char *)key, "icy-metaint")) {
 //printf ("icy-metaint: %d\n", atoi (value));
- fp->icy_metaint = atoi (value);
- fp->wait_meta = fp->icy_metaint; 
+ fp->icy_metaint = atoi ((char *)value);
+ fp->wait_meta = fp->icy_metaint;
+ }
+ else if (!strcasecmp ((char *)key, "icy-url")) {
+ if (fp->track) {
+ vfs_curl_set_meta (fp->track, "url", (char *)value);
+ refresh_playlist = 1;
+ }
+ }
+
+ // for icy streams, reset length
+ if (!strncasecmp ((char *)key, "icy-", 4)) {
+ fp->length = -1;
 }
 }
 ddb_playlist_t *plt = deadbeef->plt_get_curr ();
@@ -542,12 +380,196 @@
 deadbeef->plt_unref (plt);
 }
 if (refresh_playlist) {
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 }
+
 if (!fp->icyheader) {
 fp->gotsomeheader = 1;
 }
- return size * nmemb;
+ return p - (uint8_t *)ptr;
+}
+
+// returns number of bytes consumed
+size_t
+vfs_curl_handle_icy_headers (size_t avail, HTTP_FILE *fp, const char *ptr) {
+ size_t size = avail;
+
+ // check if that's ICY
+ if (!fp->icyheader && avail >= 10 && !memcmp (ptr, "ICY 200 OK", 10)) {
+ trace ("icy headers in the stream %p\n", fp);
+ ptr += 10;
+ avail -= 10;
+
+ fp->icyheader = 1;
+
+ // check for ternmination marker
+ if (avail >= 4 && !memcmp (ptr, "\r\n\r\n", 4)) {
+ avail -= 4;
+ ptr += 4;
+ fp->gotheader = 1;
+
+ return size - avail;
+ }
+
+ // skip remaining linebreaks
+ while (avail > 0 && (*ptr == '\r' || *ptr == '\n')) {
+ avail--;
+ ptr++;
+ }
+ }
+ if (fp->icyheader) {
+ if (fp->nheaderpackets > 10) {
+ fprintf (stderr, "vfs_curl: warning: seems like stream has unterminated ICY headers\n");
+ fp->icy_metaint = 0;
+ fp->wait_meta = 0;
+ fp->gotheader = 1;
+ }
+ else if (avail) {
+ // trace ("parsing icy headers:\n%s\n", ptr);
+ fp->nheaderpackets++;
+
+ int end = 0;
+ size_t consumed = http_content_header_handler_int (ptr, avail, fp, &end);
+ avail -= consumed;
+ ptr += consumed;
+ fp->gotheader = end || (avail != 0);
+ }
+ }
+ else {
+ fp->gotheader = 1;
+ }
+ if (!avail) {
+ return size;
+ }
+
+ return size-avail;
+}
+
+static size_t
+_handle_icy_metadata(size_t avail, HTTP_FILE *fp, char *ptr, int *error) {
+ size_t size = avail;
+ while (fp->icy_metaint > 0) {
+ // trace ("wait_meta=%d, avail=%d\n", fp->wait_meta, avail);
+ if (fp->metadata_size > 0) {
+ if (fp->metadata_size > fp->metadata_have_size) {
+ trace ("metadata fetch mode, avail: %d, metadata_size: %d, metadata_have_size: %d)\n", avail, fp->metadata_size, fp->metadata_have_size);
+ size_t sz = (fp->metadata_size - fp->metadata_have_size);
+ sz = min (sz, avail);
+ size_t space = MAX_METADATA - fp->metadata_have_size;
+ size_t copysize = min (space, sz);
+ if (copysize > 0) {
+ trace ("fetching %d bytes of metadata (out of %d)\n", sz, fp->metadata_size);
+ memcpy (fp->metadata + fp->metadata_have_size, ptr, copysize);
+ }
+ avail -= sz;
+ ptr += sz;
+ fp->metadata_have_size += sz;
+ }
+ if (fp->metadata_size == fp->metadata_have_size) {
+ size_t sz = fp->metadata_size;
+ fp->metadata_size = fp->metadata_have_size = 0;
+ if (http_parse_shoutcast_meta (fp, fp->metadata, sz) < 0) {
+ fp->metadata_size = 0;
+ fp->metadata_have_size = 0;
+ fp->wait_meta = 0;
+ fp->icy_metaint = 0;
+ break;
+ }
+ }
+ }
+ if (fp->wait_meta < avail) {
+ // read bytes remaining until metadata block
+ size_t res1 = http_curl_write_wrapper (fp, ptr, fp->wait_meta);
+ if (res1 != fp->wait_meta) {
+ *error = 1;
+ return 0;
+ }
+ avail -= res1;
+ ptr += res1;
+ uint32_t sz = (uint32_t)(*((uint8_t *)ptr)) * 16;
+ if (sz > MAX_METADATA) {
+ trace ("metadata size %d is too large\n", sz);
+ ptr += sz;
+ fp->metadata_size = 0;
+ fp->metadata_have_size = 0;
+ fp->wait_meta = 0;
+ fp->icy_metaint = 0;
+ break;
+ }
+ //assert (sz < MAX_METADATA);
+ ptr ++;
+ fp->metadata_size = sz;
+ fp->metadata_have_size = 0;
+ fp->wait_meta = fp->icy_metaint;
+ avail--;
+ if (sz != 0) {
+ trace ("found metadata block at pos %lld, size: %d (avail=%d)\n", fp->pos, sz, avail);
+ }
+ }
+ if ((!fp->metadata_size || !avail) && fp->wait_meta >= avail) {
+ break;
+ }
+ if (avail < 0) {
+ trace ("vfs_curl: something bad happened in metadata parser. can't continue streaming.\n");
+ *error = 1;
+ return 0;
+ }
+ }
+ return size-avail;
+}
+
+static size_t
+http_curl_write (void *_ptr, size_t size, size_t nmemb, void *stream) {
+ char *ptr = _ptr;
+ size_t avail = size * nmemb;
+ HTTP_FILE *fp = (HTTP_FILE *)stream;
+
+// trace ("http_curl_write %d bytes, wait_meta=%d\n", size * nmemb, fp->wait_meta);
+ gettimeofday (&fp->last_read_time, NULL);
+ if (http_need_abort (fp->identifier)) {
+ fp->status = STATUS_ABORTED;
+ trace ("vfs_curl STATUS_ABORTED at start of packet\n");
+ return 0;
+ }
+
+ // process the in-stream headers, if present
+ if (!fp->gotheader) {
+ size_t consumed = vfs_curl_handle_icy_headers (avail, fp, ptr);
+ avail -= consumed;
+ ptr += consumed;
+ if (!avail) {
+ return nmemb*size;
+ }
+ }
+
+ deadbeef->mutex_lock (fp->mutex);
+ if (fp->status == STATUS_INITIAL && fp->gotheader) {
+ fp->status = STATUS_READING;
+ }
+ deadbeef->mutex_unlock (fp->mutex);
+
+ int error = 0;
+ size_t consumed = _handle_icy_metadata (avail, fp, ptr, &error);
+ if (error) {
+ return 0;
+ }
+ avail -= consumed;
+ ptr += consumed;
+
+ // the remaining bytes are the normal stream, without metadata or headers
+ if (avail) {
+// trace ("http_curl_write_wrapper 2 %d\n", avail);
+ size_t res = http_curl_write_wrapper (fp, ptr, avail);
+ avail -= res;
+ fp->wait_meta -= res;
+ }
+ return nmemb * size - avail;
+}
+
+static size_t
+http_content_header_handler (void *ptr, size_t size, size_t nmemb, void *stream) {
+ int end = 0;
+ return http_content_header_handler_int (ptr, size*nmemb, stream, &end);
 }
 
 static int
@@ -559,8 +581,8 @@
 gettimeofday (&tm, NULL);
 float sec = tm.tv_sec - fp->last_read_time.tv_sec;
 long response;
- CURLcode code = curl_easy_getinfo (fp->curl, CURLINFO_RESPONSE_CODE, &response);
- trace ("http_curl_control: status = %d, response = %d, interval: %f seconds\n", fp ? fp->status : -1, (int)response, sec);
+ curl_easy_getinfo (fp->curl, CURLINFO_RESPONSE_CODE, &response);
+ //trace ("http_curl_control: status = %d, response = %d, interval: %f seconds\n", fp ? fp->status : -1, (int)response, sec);
 if (fp->status == STATUS_READING && sec > TIMEOUT) {
 trace ("http_curl_control: timed out, restarting read\n");
 memcpy (&fp->last_read_time, &tm, sizeof (struct timeval));
@@ -572,7 +594,7 @@
 deadbeef->mutex_unlock (fp->mutex);
 return -1;
 }
- if (http_need_abort ((DB_FILE *)fp)) {
+ if (http_need_abort (fp->identifier)) {
 fp->status = STATUS_ABORTED;
 trace ("vfs_curl STATUS_ABORTED in progress callback\n");
 deadbeef->mutex_unlock (fp->mutex);
@@ -582,8 +604,8 @@
 return 0;
 }
 
-static void
-http_destroy (HTTP_FILE *fp) {
+void
+vfs_curl_free_file (HTTP_FILE *fp) {
 if (fp->content_type) {
 free (fp->content_type);
 }
@@ -613,6 +635,8 @@
 trace ("vfs_curl: started loading data %s\n", fp->url);
 for (;;) {
 struct curl_slist *headers = NULL;
+ struct curl_slist *ok_aliases = curl_slist_append (NULL, "ICY 200 OK");
+
 curl_easy_reset (curl);
 curl_easy_setopt (curl, CURLOPT_URL, fp->url);
 char ua100;
@@ -633,8 +657,15 @@
 // enable up to 10 redirects
 curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
 curl_easy_setopt (curl, CURLOPT_MAXREDIRS, 10);
+
+ curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, 10);
+
 headers = curl_slist_append (headers, "Icy-Metadata:1");
 curl_easy_setopt (curl, CURLOPT_HTTPHEADER, headers);
+ curl_easy_setopt (curl, CURLOPT_HTTP200ALIASES, ok_aliases);
+#ifdef __MINGW32__
+ curl_easy_setopt (curl,CURLOPT_CAINFO, getenv("CURL_CA_BUNDLE"));
+#endif
 if (fp->pos > 0 && fp->length >= 0) {
 curl_easy_setopt (curl, CURLOPT_RESUME_FROM, (long)fp->pos);
 }
@@ -693,25 +724,6 @@
 trace ("curl error:\n%s\n", fp->http_err);
 }
 deadbeef->mutex_lock (fp->mutex);
-#if 0
- if (status == 0 && fp->length < 0 && fp->status != STATUS_ABORTED && fp->status != STATUS_SEEK) {
- trace ("vfs_curl: restarting stream\n");
- // NOTE: don't do http_stream_reset here - we don't want to cut the ending
- fp->status = STATUS_INITIAL;
- fp->gotheader = 0;
- fp->icyheader = 0;
- fp->gotsomeheader = 0;
- fp->metadata_size = 0;
- fp->metadata_have_size = 0;
- fp->skipbytes = 0;
- fp->nheaderpackets = 0;
- fp->seektoend = 0;
- fp->icy_metaint = 0;
- fp->wait_meta = 0;
- deadbeef->mutex_unlock (fp->mutex);
- continue;
- }
-#endif
 if (fp->status != STATUS_SEEK) {
 trace ("vfs_curl: break loop\n");
 deadbeef->mutex_unlock (fp->mutex);
@@ -739,6 +751,7 @@
 }
 deadbeef->mutex_unlock (fp->mutex);
 curl_slist_free_all (headers);
+ curl_slist_free_all (ok_aliases);
 }
 fp->curl = NULL;
 curl_easy_cleanup (curl);
@@ -750,8 +763,8 @@
 }
 else {
 trace ("vfs_curl: thread ended normally\n");
+ fp->status = STATUS_FINISHED;
 }
- fp->status = STATUS_FINISHED;
 deadbeef->mutex_unlock (fp->mutex);
 }
 
@@ -767,10 +780,17 @@
 if (!allow_new_streams) {
 return NULL;
 }
- trace ("http_open\n");
+
+ if (deadbeef->conf_get_int ("vfs_curl.trace", 0)) {
+ plugin.plugin.flags |= DDB_PLUGIN_FLAG_LOGGING;
+ }
+ else {
+ plugin.plugin.flags &= ~DDB_PLUGIN_FLAG_LOGGING;
+ }
 HTTP_FILE *fp = malloc (sizeof (HTTP_FILE));
- http_reg_open_file ((DB_FILE *)fp);
 memset (fp, 0, sizeof (HTTP_FILE));
+
+ fp->identifier = ++_curr_identifier;
 fp->vfs = &plugin;
 fp->url = strdup (fname);
 return (DB_FILE*)fp;
@@ -791,13 +811,13 @@
 assert (stream);
 HTTP_FILE *fp = (HTTP_FILE *)stream;
 
- http_abort (stream);
+ uint64_t identifier = fp->identifier;
+ vfs_curl_abort_with_identifier (identifier);
 if (fp->tid) {
 deadbeef->thread_join (fp->tid);
 }
- http_cancel_abort ((DB_FILE *)fp);
- http_destroy (fp);
- http_unreg_open_file ((DB_FILE *)fp);
+ http_cancel_abort (identifier);
+ vfs_curl_free_file (fp);
 trace ("http_close done\n");
 }
 
@@ -808,17 +828,19 @@
 HTTP_FILE *fp = (HTTP_FILE *)stream;
 // trace ("http_read %d (status=%d)\n", size*nmemb, fp->status);
 fp->seektoend = 0;
- int sz = size * nmemb;
 if (fp->status == STATUS_ABORTED || (fp->status == STATUS_FINISHED && fp->remaining == 0)) {
- return -1;
+ errno = ECONNABORTED;
+ return 0;
 }
 if (!fp->tid) {
 http_start_streamer (fp);
 }
- while ((fp->remaining > 0 || fp->status != STATUS_FINISHED) && sz > 0)
+
+ size_t sz = size * nmemb;
+ while ((fp->remaining > 0 || (fp->status != STATUS_FINISHED && fp->status != STATUS_ABORTED)) && sz > 0)
 {
 // wait until data is available
- while ((fp->remaining == 0 || fp->skipbytes > 0) && fp->status != STATUS_FINISHED) {
+ while ((fp->remaining == 0 || fp->skipbytes > 0) && fp->status != STATUS_FINISHED && fp->status != STATUS_ABORTED) {
 // trace ("vfs_curl: readwait, status: %d..\n", fp->status);
 deadbeef->mutex_lock (fp->mutex);
 if (fp->status == STATUS_READING) {
@@ -835,10 +857,11 @@
 deadbeef->streamer_reset (1);
 continue;
 }
+ errno = ETIMEDOUT;
 return 0;
 }
 }
- int skip = min (fp->remaining, fp->skipbytes);
+ int64_t skip = min (fp->remaining, fp->skipbytes);
 if (skip > 0) {
 // trace ("skipping %d bytes\n");
 fp->pos += skip;
@@ -851,9 +874,9 @@
 // trace ("buffer remaining: %d\n", fp->remaining);
 deadbeef->mutex_lock (fp->mutex);
 //trace ("http_read %lld/%lld/%d\n", fp->pos, fp->length, fp->remaining);
- int cp = min (sz, fp->remaining);
- int readpos = fp->pos & BUFFER_MASK;
- int part1 = BUFFER_SIZE-readpos;
+ size_t cp = min (sz, fp->remaining);
+ int64_t readpos = fp->pos & BUFFER_MASK;
+ size_t part1 = BUFFER_SIZE-readpos;
 part1 = min (part1, cp);
 // trace ("readpos=%d, remaining=%d, req=%d, cp=%d, part1=%d, part2=%d\n", readpos, fp->remaining, sz, cp, part1, cp-part1);
 memcpy (ptr, fp->buffer+readpos, part1);
@@ -871,10 +894,14 @@
 }
 deadbeef->mutex_unlock (fp->mutex);
 }
+ if (fp->status == STATUS_ABORTED) {
+ errno = ECONNABORTED;
+ return 0;
+ }
 // if (size * nmemb == 1) {
 // trace ("%02x\n", (unsigned int)*((uint8_t*)ptr));
 // }
- return size * nmemb - sz;
+ return (size * nmemb - sz) / size;
 }
 
 static int
@@ -959,7 +986,7 @@
 
 static int64_t
 http_getlength (DB_FILE *stream) {
- trace ("http_getlength\n");
+ trace ("http_getlength %p\n", stream);
 assert (stream);
 HTTP_FILE *fp = (HTTP_FILE *)stream;
 if (fp->status == STATUS_ABORTED) {
@@ -994,37 +1021,22 @@
 while (fp->status != STATUS_FINISHED && fp->status != STATUS_ABORTED && !fp->gotheader) {
 usleep (3000);
 }
- return fp->content_type;
-}
 
-static void
-http_abort (DB_FILE *fp) {
- trace ("abort file: %p\n", fp);
- deadbeef->mutex_lock (biglock);
- int i;
- for (i = 0; i < num_abort_files; i++) {
- if (abort_filesi == fp) {
- break;
- }
+ if (!fp->content_type && fp->icyheader) {
+ // assume mp3
+ return "audio/mpeg";
 }
- if (i == num_abort_files) {
- if (num_abort_files == MAX_ABORT_FILES) {
- trace ("vfs_curl: abort_files list overflow\n");
- }
- else {
- trace ("added file to abort list: %p\n", fp);
- abort_filesnum_abort_files++ = fp;
- }
- }
- deadbeef->mutex_unlock (biglock);
+
+ return fp->content_type;
 }
 
+
 static int
-http_need_abort (DB_FILE *fp) {
+http_need_abort (uint64_t identifier) {
 deadbeef->mutex_lock (biglock);
 for (int i = 0; i < num_abort_files; i++) {
- if (abort_filesi == fp) {
- trace ("need to abort: %p\n", fp);
+ if (abort_filesi == identifier) {
+ trace ("need to abort: %lld\n", identifier);
 deadbeef->mutex_unlock (biglock);
 return 1;
 }
@@ -1034,10 +1046,10 @@
 }
 
 static void
-http_cancel_abort (DB_FILE *fp) {
+http_cancel_abort (uint64_t identifier) {
 deadbeef->mutex_lock (biglock);
 for (int i = 0; i < num_abort_files; i++) {
- if (abort_filesi == fp) {
+ if (abort_filesi == identifier) {
 if (i != num_abort_files-1) {
 abort_filesi = abort_filesnum_abort_files-1;
 }
@@ -1048,57 +1060,6 @@
 deadbeef->mutex_unlock (biglock);
 }
 
-static void
-http_reg_open_file (DB_FILE *fp) {
- deadbeef->mutex_lock (biglock);
- for (int i = 0; i < num_open_files; i++) {
- if (open_filesi == fp) {
- deadbeef->mutex_unlock (biglock);
- return;
- }
- }
- if (num_open_files == MAX_ABORT_FILES) {
- fprintf (stderr, "vfs_curl: open files overflow\n");
- deadbeef->mutex_unlock (biglock);
- return;
- }
- open_filesnum_open_files++ = fp;
- deadbeef->mutex_unlock (biglock);
-}
-
-static void
-http_unreg_open_file (DB_FILE *fp) {
- deadbeef->mutex_lock (biglock);
- int i;
- for (i = 0; i < num_open_files; i++) {
- if (open_filesi == fp) {
- if (i != num_open_files-1) {
- open_filesi = open_filesnum_open_files-1;
- }
- num_open_files--;
- trace ("remove from open list: %p\n", fp);
- break;
- }
- }
-
- // gc abort_files
- int j = 0;
- while (j < num_abort_files) {
- for (i = 0; i < num_open_files; i++) {
- if (abort_filesj == open_filesi) {
- break;
- }
- }
- if (i == num_open_files) {
- // remove abort
- http_cancel_abort (abort_filesj);
- continue;
- }
- j++;
- }
- deadbeef->mutex_unlock (biglock);
-}
-
 static int
 vfs_curl_start (void) {
 allow_new_streams = 1;
@@ -1116,7 +1077,7 @@
 return 0;
 }
 
-static const char *scheme_names = { "http://", "ftp://", NULL };
+static const char *scheme_names = { "http://", "https://", "ftp://", NULL };
 
 const char **
 http_get_schemes (void) {
@@ -1128,22 +1089,58 @@
 return 1;
 }
 
+static uint64_t
+vfs_curl_get_identifier (DB_FILE *f) {
+ deadbeef->mutex_lock (biglock);
+
+ HTTP_FILE *file = (HTTP_FILE *)f;
+ uint64_t identifier = file->identifier;
+
+ deadbeef->mutex_unlock (biglock);
+
+ return identifier;
+}
+
+static void
+vfs_curl_abort_with_identifier (uint64_t identifier) {
+ trace ("abort vfs_curl stream: %lld\n", identifier);
+ deadbeef->mutex_lock (biglock);
+ int i;
+ for (i = 0; i < num_abort_files; i++) {
+ if (abort_filesi == identifier) {
+ break;
+ }
+ }
+ if (i == num_abort_files) {
+ if (num_abort_files == MAX_ABORT_FILES) {
+ trace ("vfs_curl: abort_files list overflow\n");
+ }
+ else {
+ trace ("added file to abort list: %lld\n", identifier);
+ abort_filesnum_abort_files++ = identifier;
+ }
+ }
+ deadbeef->mutex_unlock (biglock);
+}
+
+
 static const char settings_dlg =
- "property \"Emulate track change events (for scrobbling)\" checkbox vfs_curl.emulate_trackchange 0;\n"
+ "property \"Enable logging\" checkbox vfs_curl.trace 0;\n"
 ;
 
+
 static DB_vfs_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_VFS,
+// .plugin.flags = DDB_PLUGIN_FLAG_LOGGING,
 .plugin.id = "vfs_curl",
 .plugin.name = "cURL vfs",
 .plugin.descr = "http and ftp streaming module using libcurl, with ICY protocol support",
 .plugin.copyright = 
 "CURL VFS plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "This software is provided 'as-is', without any express or implied\n"
 "warranty. In no event will the authors be held liable for any damages\n"
@@ -1164,13 +1161,12 @@
 "3. This notice may not be removed or altered from any source distribution.\n"
 ,
 .plugin.website = "http://deadbeef.sf.net",
+ .plugin.configdialog = settings_dlg,
 .plugin.start = vfs_curl_start,
 .plugin.stop = vfs_curl_stop,
- .plugin.configdialog = settings_dlg,
 .open = http_open,
 .set_track = http_set_track,
 .close = http_close,
- .abort = http_abort,
 .read = http_read,
 .seek = http_seek,
 .tell = http_tell,
@@ -1179,6 +1175,8 @@
 .get_content_type = http_get_content_type,
 .get_schemes = http_get_schemes,
 .is_streaming = http_is_streaming,
+ .get_identifier = vfs_curl_get_identifier,
+ .abort_with_identifier = vfs_curl_abort_with_identifier,
 };
 
 DB_plugin_t *

deadbeef-1.9.6.tar.bz2/plugins/vfs_curl/vfs_curl.h Added

@@ -0,0 +1,83 @@
+//
+// vfs_curl.h
+// deadbeef
+//
+// Created by Oleksiy Yakovenko on 11/10/19.
+// Copyright © 2019 Oleksiy Yakovenko. All rights reserved.
+//
+
+#ifndef vfs_curl_h
+#define vfs_curl_h
+
+#include <curl/curl.h>
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define BUFFER_SIZE (0x10000)
+#define BUFFER_MASK 0xffff
+
+#define MAX_METADATA 1024
+
+#define TIMEOUT 10 // in seconds
+
+enum {
+ STATUS_INITIAL = 0,
+ STATUS_READING = 1,
+ STATUS_FINISHED = 2,
+ STATUS_ABORTED = 3,
+ STATUS_SEEK = 4,
+ STATUS_DESTROY = 5,
+};
+
+typedef struct {
+ DB_vfs_t *vfs;
+ char *url;
+ uint8_t bufferBUFFER_SIZE;
+
+ DB_playItem_t *track;
+ int64_t pos; // position in stream; use "& BUFFER_MASK" to make it index into ringbuffer
+ int64_t length;
+ int32_t remaining; // remaining bytes in buffer read from stream
+ int64_t skipbytes;
+ intptr_t tid; // thread id which does http requests
+ intptr_t mutex;
+ uint8_t nheaderpackets;
+ char *content_type;
+ CURL *curl;
+ struct timeval last_read_time;
+ uint8_t status;
+ int icy_metaint;
+ int wait_meta;
+
+ char metadataMAX_METADATA;
+ size_t metadata_size; // size of metadata in stream
+ size_t metadata_have_size; // amount which is already in metadata buffer
+
+ char http_errCURL_ERROR_SIZE;
+
+ float prev_playtime;
+ time_t started_timestamp;
+
+ uint64_t identifier;
+
+ // flags (bitfields to save some space)
+ unsigned seektoend : 1; // indicates that next tell must return length
+ unsigned gotheader : 1; // tells that all headers (including ICY) were processed (to start reading body)
+ unsigned icyheader : 1; // tells that we're currently reading ICY headers
+ unsigned gotsomeheader : 1; // tells that we got some headers before body started
+} HTTP_FILE;
+
+size_t
+vfs_curl_handle_icy_headers (size_t avail, HTTP_FILE *fp, const char *ptr);
+
+void
+vfs_curl_free_file (HTTP_FILE *fp);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* vfs_curl_h */

deadbeef-0.6.2.tar.bz2/plugins/vfs_zip/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/vfs_zip/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/vfs_zip/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/vfs_zip/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/vfs_zip/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/vfs_zip/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/vfs_zip/vfs_zip.c -> deadbeef-1.9.6.tar.bz2/plugins/vfs_zip/vfs_zip.c Changed

@@ -1,6 +1,6 @@
 /*
 ZIP VFS plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy 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
@@ -25,7 +25,7 @@
 #include <zip.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
@@ -46,15 +46,15 @@
 struct zip* z;
 struct zip_file *zf;
 int64_t offset;
- int index;
+ zip_uint64_t index;
 int64_t size;
 
 #if ENABLE_CACHE
 uint8_t bufferZIP_BUFFER_SIZE;
- int buffer_remaining;
+ zip_int64_t buffer_remaining;
 int buffer_pos;
 #endif
-} zip_file_t;
+} ddb_zip_file_t;
 
 static const char *scheme_names = { "zip://", NULL };
 
@@ -77,28 +77,43 @@
 }
 
 fname += 6;
- const char *colon = strchr (fname, ':');
- if (!colon) {
- return NULL;
- }
 
+ struct zip *z = NULL;
+ struct zip_stat st;
 
- char zipnamecolon-fname+1;
- memcpy (zipname, fname, colon-fname);
- zipnamecolon-fname = 0;
+ const char *colon = fname;
 
- fname = colon+1;
+ for (;;) {
+ colon = strchr (colon, ':');
+ if (!colon) {
+ break;
+ }
 
- struct zip *z = zip_open (zipname, 0, NULL);
- if (!z) {
- return NULL;
+ char zipnamecolon-fname+1;
+ memcpy (zipname, fname, colon-fname);
+ zipnamecolon-fname = 0;
+
+ colon = colon+1;
+
+ z = zip_open (zipname, 0, NULL);
+ if (!z) {
+ continue;
+ }
+ memset (&st, 0, sizeof (st));
+
+ while (*colon == '/') {
+ colon++;
+ }
+ int res = zip_stat(z, colon, 0, &st);
+ if (res != 0) {
+ zip_close (z);
+ return NULL;
+ }
+
+ break;
 }
- struct zip_stat st;
- memset (&st, 0, sizeof (st));
 
- int res = zip_stat(z, fname, 0, &st);
- if (res != 0) {
- zip_close (z);
+ if (!z) {
 return NULL;
 }
 
@@ -108,8 +123,8 @@
 return NULL;
 }
 
- zip_file_t *f = malloc (sizeof (zip_file_t));
- memset (f, 0, sizeof (zip_file_t));
+ ddb_zip_file_t *f = malloc (sizeof (ddb_zip_file_t));
+ memset (f, 0, sizeof (ddb_zip_file_t));
 f->file.vfs = &plugin;
 f->z = z;
 f->zf = zf;
@@ -122,7 +137,7 @@
 void
 vfs_zip_close (DB_FILE *f) {
 trace ("vfs_zip: close\n");
- zip_file_t *zf = (zip_file_t *)f;
+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f;
 if (zf->zf) {
 zip_fclose (zf->zf);
 }
@@ -134,7 +149,7 @@
 
 size_t
 vfs_zip_read (void *ptr, size_t size, size_t nmemb, DB_FILE *f) {
- zip_file_t *zf = (zip_file_t *)f;
+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f;
 // printf ("read: %d\n", size*nmemb);
 
 size_t sz = size * nmemb;
@@ -142,13 +157,13 @@
 while (sz) {
 if (zf->buffer_remaining == 0) {
 zf->buffer_pos = 0;
- int rb = zip_fread (zf->zf, zf->buffer, ZIP_BUFFER_SIZE);
+ zip_int64_t rb = zip_fread (zf->zf, zf->buffer, ZIP_BUFFER_SIZE);
 if (rb <= 0) {
 break;
 }
 zf->buffer_remaining = rb;
 }
- int from_buf = min (sz, zf->buffer_remaining);
+ size_t from_buf = min (sz, zf->buffer_remaining);
 memcpy (ptr, zf->buffer+zf->buffer_pos, from_buf);
 zf->buffer_remaining -= from_buf;
 zf->buffer_pos += from_buf;
@@ -167,7 +182,7 @@
 
 int
 vfs_zip_seek (DB_FILE *f, int64_t offset, int whence) {
- zip_file_t *zf = (zip_file_t *)f;
+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f;
 // printf ("seek: %lld (%d)\n", offset, whence);
 
 if (whence == SEEK_CUR) {
@@ -225,7 +240,7 @@
 char buf4096;
 int64_t n = offset - zf->offset;
 while (n > 0) {
- int sz = min (n, sizeof (buf));
+ int64_t sz = min (n, sizeof (buf));
 ssize_t rb = zip_fread (zf->zf, buf, sz);
 n -= rb;
 assert (n >= 0);
@@ -242,13 +257,13 @@
 
 int64_t
 vfs_zip_tell (DB_FILE *f) {
- zip_file_t *zf = (zip_file_t *)f;
+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f;
 return zf->offset;
 }
 
 void
 vfs_zip_rewind (DB_FILE *f) {
- zip_file_t *zf = (zip_file_t *)f;
+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f;
 zip_fclose (zf->zf);
 zf->zf = zip_fopen_index (zf->z, zf->index, 0);
 assert (zf->zf); // FIXME: better error handling?
@@ -260,7 +275,7 @@
 
 int64_t
 vfs_zip_getlength (DB_FILE *f) {
- zip_file_t *zf = (zip_file_t *)f;
+ ddb_zip_file_t *zf = (ddb_zip_file_t *)f;
 return zf->size;
 }
 
@@ -274,19 +289,25 @@
 return -1;
 }
 
- int n = zip_get_num_files (z);
- *namelist = malloc (sizeof (void *) * n);
+ int num_files = 0;
+ const int n = zip_get_num_files(z);
+ *namelist = malloc(sizeof(void *) * n);
 for (int i = 0; i < n; i++) {
- (*namelist)i = malloc (sizeof (struct dirent));
- memset ((*namelist)i, 0, sizeof (struct dirent));
- const char *nm = zip_get_name (z, i, 0);
- trace ("vfs_zip: %s\n", nm);
- snprintf ((*namelist)i->d_name, sizeof ((*namelist)i->d_name), "%s", nm);
+ const char *nm = zip_get_name(z, i, 0);
+ struct dirent entry;
+ strncpy(entry.d_name, nm, sizeof(entry.d_name)-1);
+ entry.d_namesizeof(entry.d_name)-1 = '\0';
+ if (!selector || selector(&entry)) {
+ (*namelist)num_files = calloc(1, sizeof(struct dirent));
+ strcpy((*namelist)num_files->d_name, entry.d_name);
+ num_files++;
+ trace("vfs_zip: %s\n", nm);
+ }
 }
 
 zip_close (z);
 trace ("vfs_zip: scandir done\n");
- return n;
+ return num_files;
 }
 
 int
@@ -303,8 +324,7 @@
 }
 
 static DB_vfs_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 6,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_VFS,
@@ -313,7 +333,7 @@
 .plugin.descr = "play files directly from zip files",
 .plugin.copyright = 
 "ZIP VFS plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "This software is provided 'as-is', without any express or implied\n"
 "warranty. In no event will the authors be held liable for any damages\n"

deadbeef-0.6.2.tar.bz2/plugins/vorbis/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/vorbis/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/vorbis/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/vorbis/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/vorbis/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/vorbis/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/vorbis/vorbis.c -> deadbeef-1.9.6.tar.bz2/plugins/vorbis/vorbis.c Changed

@@ -1,6 +1,6 @@
 /*
 DeaDBeeF -- the music player
- Copyright (C) 2009-2014 Alexey Yakovenko and other contributors
+ Copyright (C) 2009-2014 Oleksiy Yakovenko and other contributors
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -22,17 +22,23 @@
 */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+ #include <config.h>
 #endif
-#include <vorbis/vorbisfile.h>
 #include <string.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <unistd.h>
 #include <math.h>
 #include <stdbool.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #include "../liboggedit/oggedit.h"
+#if TREMOR
+ #include <tremor/ivorbisfile.h>
+ #define FIXED_POINT 1
+#else
+ #include <vorbis/vorbisfile.h>
+#endif
+#include <deadbeef/strdupa.h>
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
@@ -46,10 +52,24 @@
 #define CVORBIS_ENDIANNESS 0
 #endif
 
-#define RG_REFERENCE_LOUDNESS -1
-#define DELIMITER "\n - \n"
+static const char *tag_rg_names = {
+ "REPLAYGAIN_ALBUM_GAIN",
+ "REPLAYGAIN_ALBUM_PEAK",
+ "REPLAYGAIN_TRACK_GAIN",
+ "REPLAYGAIN_TRACK_PEAK",
+ NULL
+};
+
+// replaygain key names in deadbeef internal metadata
+static const char *ddb_internal_rg_keys = {
+ ":REPLAYGAIN_ALBUMGAIN",
+ ":REPLAYGAIN_ALBUMPEAK",
+ ":REPLAYGAIN_TRACKGAIN",
+ ":REPLAYGAIN_TRACKPEAK",
+ NULL
+};
 
-static DB_decoder_t plugin;
+static ddb_decoder2_t plugin;
 static DB_functions_t *deadbeef;
 
 typedef struct {
@@ -58,8 +78,11 @@
 int cur_bit_stream;
 float next_update;
 DB_playItem_t *it;
+ int set_bitrate;
 const DB_playItem_t *new_track;
 uint8_t *channel_map;
+ float prev_playpos;
+ time_t started_timestamp;
 } ogg_info_t;
 
 static size_t
@@ -86,57 +109,10 @@
 return deadbeef->ftell (datasource);
 }
 
-static const char
-*gain_tag_name(const int tag_enum)
-{
- switch(tag_enum) {
- case DDB_REPLAYGAIN_ALBUMGAIN:
- return "REPLAYGAIN_ALBUM_GAIN";
- case DDB_REPLAYGAIN_ALBUMPEAK:
- return "REPLAYGAIN_ALBUM_PEAK";
- case DDB_REPLAYGAIN_TRACKGAIN:
- return "REPLAYGAIN_TRACK_GAIN";
- case DDB_REPLAYGAIN_TRACKPEAK:
- return "REPLAYGAIN_TRACK_PEAK";
- case RG_REFERENCE_LOUDNESS:
- return "REPLAYGAIN_REFERENCE_LOUDNESS";
- default:
- return "";
- }
-}
-
-static bool
-is_special_tag(const char *tag) {
- return !strcasecmp(tag, gain_tag_name(DDB_REPLAYGAIN_ALBUMGAIN)) ||
- !strcasecmp(tag, gain_tag_name(DDB_REPLAYGAIN_ALBUMPEAK)) ||
- !strcasecmp(tag, gain_tag_name(DDB_REPLAYGAIN_TRACKGAIN)) ||
- !strcasecmp(tag, gain_tag_name(DDB_REPLAYGAIN_TRACKPEAK)) ||
- !strcasecmp(tag, gain_tag_name(RG_REFERENCE_LOUDNESS));
-}
-
-static bool
-add_meta(DB_playItem_t *it, const char *key, const char *value)
-{
- const char *old_value = deadbeef->pl_find_meta(it, key);
- if (old_value) {
- char *new_value = malloc(strlen(old_value) + strlen(DELIMITER) + strlen(value) + 1);
- if (new_value) {
- sprintf(new_value, "%s"DELIMITER"%s", old_value, value);
- deadbeef->pl_replace_meta(it, key, new_value);
- free(new_value);
- return true;
- }
- }
- else {
- deadbeef->pl_add_meta(it, key, value);
- return true;
- }
-}
-
 static bool
 replaygain_tag(DB_playItem_t *it, const int tag_enum, const char *tag, const char *value)
 {
- if (strcasecmp(gain_tag_name(tag_enum), tag))
+ if (strcasecmp(tag_rg_namestag_enum, tag))
 return false;
 
 deadbeef->pl_set_item_replaygain (it, tag_enum, atof(value));
@@ -155,17 +131,22 @@
 for (int i = 0; i < vc->comments; i++) {
 char *tag = strdup(vc->user_commentsi);
 char *value;
- if (tag && (value = strchr(tag, '='))) {
+ if (tag && (value = strchr(tag, '='))
+#ifdef ANDROID
+ && strlen (value) < 4000
+#endif
+ ) {
 *value++ = '\0';
 if (!replaygain_tag(it, DDB_REPLAYGAIN_ALBUMGAIN, tag, value) &&
 !replaygain_tag(it, DDB_REPLAYGAIN_ALBUMPEAK, tag, value) &&
 !replaygain_tag(it, DDB_REPLAYGAIN_TRACKGAIN, tag, value) &&
- !replaygain_tag(it, DDB_REPLAYGAIN_TRACKPEAK, tag, value)) {
- if (!strcasecmp(tag, gain_tag_name(RG_REFERENCE_LOUDNESS)))
- deadbeef->pl_replace_meta(it, ":REPLAYGAIN_REFERENCE_LOUDNESS", value);
- else
- add_meta(it, oggedit_map_tag(tag, "tag2meta"), value);
- }
+ !replaygain_tag(it, DDB_REPLAYGAIN_TRACKPEAK, tag, value)
+ && strcasecmp (tag, "METADATA_BLOCK_PICTURE")
+ && *value) {
+ deadbeef->pl_append_meta(it, oggedit_map_tag(tag, "tag2meta"), value);
+ }
+ }
+ if (tag) {
 free(tag);
 }
 }
@@ -180,7 +161,7 @@
 deadbeef->plt_modified (plt);
 deadbeef->plt_unref (plt);
 }
- deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 
 return 0;
 }
@@ -189,12 +170,12 @@
 set_meta_ll(DB_playItem_t *it, const char *key, const int64_t value)
 {
 char string11;
- sprintf(string, "%lld", value);
+ snprintf(string, sizeof(string), "%lld", (long long)value);
 deadbeef->pl_replace_meta(it, key, string);
 }
 
 static int
-cvorbis_seek_sample (DB_fileinfo_t *_info, int sample) {
+cvorbis_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
 ogg_info_t *info = (ogg_info_t *)_info;
 if (sample < 0) {
 trace ("vorbis: negative seek sample - ignored, but it is a bug!\n");
@@ -212,26 +193,66 @@
 }
 deadbeef->pl_unlock ();
 }
- sample += info->it->startsample;
+ int64_t startsample = deadbeef->pl_item_get_startsample (info->it);
+ sample += startsample;
 trace ("vorbis: seek to sample %d\n", sample);
 int res = ov_pcm_seek (&info->vorbis_file, sample);
 if (res != 0 && res != OV_ENOSEEK) {
 trace ("vorbis: error %x seeking to sample %d\n", res, sample);
 return -1;
 }
- int tell = ov_pcm_tell (&info->vorbis_file);
+ int64_t tell = ov_pcm_tell (&info->vorbis_file);
 if (tell != sample) {
 trace ("vorbis: failed to do sample-accurate seek (%d->%d)\n", sample, tell);
 }
 trace ("vorbis: seek successful\n")
- _info->readpos = (float)(sample - info->it->startsample)/_info->fmt.samplerate;
+ _info->readpos = (int64_t)((double)(sample - startsample)/_info->fmt.samplerate);
 info->next_update = -2;
 return 0;
 }
 
+static int
+cvorbis_seek_sample (DB_fileinfo_t *_info, int sample) {
+ return cvorbis_seek_sample64(_info, sample);
+}
+
+static ogg_info_t *
+cvorbis_open_int (uint32_t hints) {
+ ogg_info_t *info = calloc(1, sizeof(ogg_info_t));
+ if (info) {
+ info->info.plugin = &plugin.decoder;
+#if FIXED_POINT
+ info->info.fmt.bps = 16;
+#else
+ info->info.fmt.is_float = 1;
+ info->info.fmt.bps = 32;
+#endif
+ info->set_bitrate = hints & DDB_DECODER_HINT_NEED_BITRATE;
+ }
+ return info;
+}
+
 static DB_fileinfo_t *
 cvorbis_open (uint32_t hints) {
- return calloc(1, sizeof (ogg_info_t));
+ return (DB_fileinfo_t *)cvorbis_open_int(hints);
+}
+
+static DB_fileinfo_t *
+cvorbis_open2 (uint32_t hints, DB_playItem_t *it) {
+ ogg_info_t *info = cvorbis_open_int(hints);
+ if (!info) {
+ return NULL;
+ }
+
+ deadbeef->pl_lock();
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock();
+ info->info.file = deadbeef->fopen(uri);
+ if (!info->info.file) {
+ trace("cvorbis_open2 failed to open file %s\n", uri);
+ }
+
+ return &info->info;
 }
 
 static int
@@ -240,15 +261,18 @@
 ogg_info_t *info = (ogg_info_t *)_info;
 info->new_track = info->it = it;
 deadbeef->pl_item_ref (it);
- deadbeef->pl_replace_meta (it, "!FILETYPE", "OggVorbis");
 
- deadbeef->pl_lock ();
- info->info.file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
- deadbeef->pl_unlock ();
 if (!info->info.file) {
- trace ("ogg: failed to open file %s\n", deadbeef->pl_find_meta (it, ":URI"));
- return -1;
+ deadbeef->pl_lock ();
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
+ deadbeef->pl_unlock ();
+ info->info.file = deadbeef->fopen (uri);
+ if (!info->info.file) {
+ trace ("cvorbis_init failed to open file %s\n", uri);
+ return -1;
+ }
 }
+
 if (info->info.file->vfs->is_streaming () && deadbeef->fgetlength (info->info.file) == -1) {
 ov_callbacks ovcb = {
 .read_func = cvorbis_fread,
@@ -268,7 +292,6 @@
 if (plt) {
 deadbeef->plt_unref (plt);
 }
- deadbeef->pl_replace_meta (it, "!FILETYPE", "OggVorbis");
 }
 else
 {
@@ -288,12 +311,12 @@
 }
 // _info->readpos = 0;
 if (info->info.file->vfs->is_streaming ()) {
- info->it->startsample = 0;
+ deadbeef->pl_item_set_startsample (info->it, 0);
 if (deadbeef->pl_get_item_duration (it) < 0) {
- it->endsample = -1;
+ deadbeef->pl_item_set_endsample (info->it, -1);
 }
 else {
- it->endsample = ov_pcm_total (&info->vorbis_file, -1)-1;
+ deadbeef->pl_item_set_endsample (it, ov_pcm_total (&info->vorbis_file, -1)-1);
 }
 if (update_vorbis_comments (it, &info->vorbis_file, -1))
 return -1;
@@ -312,15 +335,21 @@
 trace ("vorbis: bad samplerate\n");
 return -1;
 }
- _info->plugin = &plugin;
- _info->fmt.bps = 16;
- _info->fmt.samplerate = vi->rate;
+ _info->fmt.samplerate = (int)vi->rate;
 _info->fmt.channels = vi->channels;
 info->channel_map = oggedit_vorbis_channel_map(vi->channels);
 for (int i = 0; i < _info->fmt.channels; i++) {
 _info->fmt.channelmask |= 1 << i;
 }
 
+ deadbeef->pl_set_meta_int (it, ":TRACKNUM", 0);
+ deadbeef->pl_set_meta_int (it, ":CHANNELS", vi->channels);
+ deadbeef->pl_set_meta_int (it, ":SAMPLERATE", (int)vi->rate);
+ deadbeef->pl_replace_meta (it, "!FILETYPE", "Ogg Vorbis");
+ info->cur_bit_stream = -1;
+
+ info->started_timestamp = time(NULL);
+
 return 0;
 }
 
@@ -349,7 +378,7 @@
 static void send_event(DB_playItem_t *it, const int event_enum)
 {
 ddb_event_track_t *event = (ddb_event_track_t *)deadbeef->event_alloc(event_enum);
- if (event->track = it)
+ if ((event->track = it))
 deadbeef->pl_item_ref(event->track);
 deadbeef->event_send((ddb_event_t *)event, 0, 0);
 }
@@ -357,30 +386,52 @@
 static bool
 new_streaming_link(ogg_info_t *info, const int new_link)
 {
- if (info->cur_bit_stream == 0 && new_link != 1)
+ // Typically the files with multiple links are split into multiple tracks,
+ // and we don't want the file's properties to change while it's playing.
+ // However, we want this for network streams.
+ if (!info->info.file->vfs->is_streaming () || new_link < 0) {
 return false;
+ }
 
- trace("Streaming link changed from %d to %d\n", info->cur_bit_stream, new_link);
- deadbeef->pl_set_meta_int(info->it, ":TRACKNUM", new_link);
- update_vorbis_comments(info->it, &info->vorbis_file, new_link);
- send_event(info->it, DB_EV_SONGSTARTED);
- send_event(info->it, DB_EV_TRACKINFOCHANGED);
- deadbeef->sendmessage(DB_EV_PLAYLISTCHANGED, 0, 0, 0);
+ DB_playItem_t *from = deadbeef->pl_item_alloc ();
+ deadbeef->pl_items_copy_junk (info->it, from, from);
+
+ trace ("Streaming link changed from %d to %d\n", info->cur_bit_stream, new_link);
+ update_vorbis_comments (info->it, &info->vorbis_file, new_link);
+
+ ddb_event_trackchange_t *ev = (ddb_event_trackchange_t *)deadbeef->event_alloc (DB_EV_SONGCHANGED);
+ float playpos = deadbeef->streamer_get_playpos ();
+ ev->from = from;
+ ev->to = info->it;
+ ev->playtime = playpos - info->prev_playpos;
+ ev->started_timestamp = info->started_timestamp;
+ deadbeef->pl_item_ref (ev->from);
+ deadbeef->pl_item_ref (ev->to);
+ deadbeef->event_send ((ddb_event_t *)ev, 0, 0);
+ deadbeef->pl_item_unref (from);
+ from = NULL;
+
+ info->started_timestamp = time(NULL);
+ info->prev_playpos = playpos;
+
+ send_event (info->it, DB_EV_SONGSTARTED);
+ send_event (info->it, DB_EV_TRACKINFOCHANGED);
+ deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
 info->cur_bit_stream = new_link;
 
 vorbis_info *vi = ov_info (&info->vorbis_file, new_link);
- if (vi && info->info.fmt.channels != vi->channels || info->info.fmt.samplerate != vi->rate) {
- // Streamer can't do this, so re-init the stream
- trace("Stream channel count changed from %d to %d\n", info->info.fmt.channels, vi->channels);
- trace("Stream channel count changed from %d to %d\n", info->info.fmt.samplerate, vi->rate);
- deadbeef->sendmessage(DB_EV_PAUSE, 0, 0, 0);
- deadbeef->sendmessage(DB_EV_TOGGLE_PAUSE, 0, 0, 0);
+ if (vi && (info->info.fmt.channels != vi->channels || info->info.fmt.samplerate != vi->rate)) {
+ info->info.fmt.samplerate = (int)vi->rate;
+ info->info.fmt.channels = vi->channels;
+ deadbeef->pl_set_meta_int (info->it, ":CHANNELS", vi->channels);
+ deadbeef->pl_set_meta_int (info->it, ":SAMPLERATE", (int)vi->rate);
 return true;
 }
 
 return false;
 }
 
+#if FIXED_POINT
 static void
 map_channels(int16_t *dest, const int16_t *src, const int16_t *src_end, const uint8_t *map, const int channel_count)
 {
@@ -390,11 +441,12 @@
 dest += channel_count;
 }
 }
+#endif
 
 static bool
 is_playing_track(const DB_playItem_t *it)
 {
- DB_playItem_t *track = deadbeef->streamer_get_playing_track();
+ DB_playItem_t *track = deadbeef->streamer_get_playing_track_safe();
 if (track)
 deadbeef->pl_item_unref(track);
 return track == it;
@@ -412,27 +464,37 @@
 }
 
 /* Don't read past the end of a sub-track */
- if (deadbeef->pl_get_item_flags(info->it) & DDB_IS_SUBTRACK) {
- const ogg_int64_t bytes_left = (info->it->endsample - ov_pcm_tell(&info->vorbis_file)) * 2 * _info->fmt.channels;
- if (bytes_left < bytes_to_read)
- bytes_to_read = bytes_left;
+ int samples_to_read = bytes_to_read / sizeof(float) / _info->fmt.channels;
+ int64_t endsample = deadbeef->pl_item_get_endsample (info->it);
+ if (endsample > 0) {
+ const ogg_int64_t samples_left = endsample - ov_pcm_tell(&info->vorbis_file);
+ if (samples_left < samples_to_read) {
+ samples_to_read = (int)samples_left;
+ bytes_to_read = samples_to_read * sizeof(float) * _info->fmt.channels;
+ }
 }
 
 /* Read until we have enough bytes to satisfy streamer, or there are none left */
+ int bytes_read = 0;
+ int ret = OV_HOLE;
+
+#if FIXED_POINT
 char map_bufferinfo->channel_map ? bytes_to_read : 0;
 char *ptr = info->channel_map ? map_buffer : buffer;
- int ret = OV_HOLE;
- int bytes_read = 0;
 while ((ret > 0 || ret == OV_HOLE) && bytes_read < bytes_to_read)
 {
 int new_link = -1;
- ret=ov_read (&info->vorbis_file, ptr+bytes_read, bytes_to_read-bytes_read, CVORBIS_ENDIANNESS, 2, 1, &new_link);
-
+#if TREMOR
+ ret=ov_read(&info->vorbis_file, ptr+bytes_read, bytes_to_read-bytes_read, &new_link);
+#else
+ ret=ov_read(&info->vorbis_file, ptr+bytes_read, bytes_to_read-bytes_read, CVORBIS_ENDIANNESS, 2, 1, &new_link);
+#endif
 if (ret < 0) {
 trace("cvorbis_read: ov_read returned %d\n", ret);
 }
- else if (new_link != info->cur_bit_stream && !ov_seekable(&info->vorbis_file) && new_streaming_link(info, new_link)) {
+ else if (new_link != info->cur_bit_stream && new_streaming_link(info, new_link)) {
 bytes_read = bytes_to_read;
+ break;
 }
 else {
 bytes_read += ret;
@@ -442,16 +504,48 @@
 }
 
 if (info->channel_map)
- map_channels((int16_t *)buffer, (int16_t *)map_buffer, (int16_t *)(ptr+bytes_read), info->channel_map, _info->fmt.channels);
+ map_channels((int16_t *)buffer, (int16_t *)map_buffer, (int16_t *)ptr, info->channel_map, _info->fmt.channels);
+#else
+ int samples_read = 0;
+ while (samples_read < samples_to_read && (ret > 0 || ret == OV_HOLE))
+ {
+ float **pcm = NULL;
+ int new_link = -1;
+ ret = (int)ov_read_float(&info->vorbis_file, &pcm, samples_to_read-samples_read, &new_link);
+
+ if (ret < 0) {
+ trace("cvorbis_read: ov_read returned %d\n", ret);
+ }
+ else if (new_link != info->cur_bit_stream && new_streaming_link(info, new_link)) {
+ samples_read = samples_to_read;
+ break;
+ }
+ else if (ret > 0) {
+ float *ptr = (float *)buffer + samples_read*_info->fmt.channels;
+ for (int channel = 0; channel < _info->fmt.channels; channel++, ptr++) {
+ const float *pcm_channel = pcminfo->channel_map ? info->channel_mapchannel : channel;
+ for (int sample = 0; sample < ret; sample++) {
+ ptrsample*_info->fmt.channels = pcm_channelsample;
+ }
+ }
+ samples_read += ret;
+ }
 
- _info->readpos = (float)(ov_pcm_tell(&info->vorbis_file) - info->it->startsample) / _info->fmt.samplerate;
- if (_info->readpos > info->next_update) {
- const int rate = ov_bitrate_instant(&info->vorbis_file) / 1000;
+// trace("cvorbis_read got %d samples towards %d bytes (%d samples still required)\n", ret, bytes_to_read, samples_to_read-samples_read);
+ }
+ bytes_read = samples_read * sizeof(float) * _info->fmt.channels;
+#endif
+
+ int64_t startsample = deadbeef->pl_item_get_startsample (info->it);
+ _info->readpos = (float)(ov_pcm_tell(&info->vorbis_file) - startsample) / _info->fmt.samplerate;
+ if (info->set_bitrate && _info->readpos > info->next_update) {
+ const int rate = (int)ov_bitrate_instant(&info->vorbis_file) / 1000;
 if (rate > 0) {
 deadbeef->streamer_set_bitrate(rate);
 info->next_update = info->next_update <= 0 ? info->next_update + 1 : _info->readpos + 5;
 }
 }
+
 // trace("cvorbis_read returning %d bytes out of %d\n", bytes_read, bytes_to_read);
 return bytes_read;
 }
@@ -459,7 +553,7 @@
 static int
 cvorbis_seek (DB_fileinfo_t *_info, float time) {
 ogg_info_t *info = (ogg_info_t *)_info;
- return cvorbis_seek_sample (_info, time * info->info.fmt.samplerate);
+ return cvorbis_seek_sample64 (_info, (int64_t)((double)time * (int64_t)info->info.fmt.samplerate));
 }
 
 static off_t sample_offset(OggVorbis_File *vorbis_file, const ogg_int64_t sample)
@@ -484,7 +578,7 @@
 }
 int64_t fsize = deadbeef->fgetlength (fp);
 if (fp->vfs->is_streaming ()) {
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
 deadbeef->plt_set_item_duration (plt, it, -1);
 deadbeef->pl_add_meta (it, "title", NULL);
 after = deadbeef->plt_insert_item (plt, after, it);
@@ -508,31 +602,38 @@
 }
 
 long nstreams = ov_streams (&vorbis_file);
- int currentsample = 0;
+ int64_t currentsample = 0;
 for (int stream = 0; stream < nstreams; stream++) {
 const vorbis_info *vi = ov_info (&vorbis_file, stream);
 if (!vi) {
 trace ("vorbis: ov_info failed for file %s stream %d\n", fname, stream);
 continue;
 }
- float duration = ov_time_total (&vorbis_file, stream);
- int totalsamples = ov_pcm_total (&vorbis_file, stream);
+#if TREMOR
+ const float duration = ov_time_total(&vorbis_file, stream) / 1000.0;
+#else
+ const float duration = ov_time_total(&vorbis_file, stream);
+#endif
+ int64_t totalsamples = ov_pcm_total (&vorbis_file, stream);
 
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
 deadbeef->pl_set_meta_int (it, ":TRACKNUM", stream);
 deadbeef->plt_set_item_duration (plt, it, duration);
 if (nstreams > 1) {
- it->startsample = currentsample;
- it->endsample = currentsample + totalsamples - 1;
+ deadbeef->pl_item_set_startsample (it, currentsample);
+ deadbeef->pl_item_set_endsample (it, currentsample + totalsamples - 1);
 deadbeef->pl_set_item_flags (it, DDB_IS_SUBTRACK);
 }
 
 if (update_vorbis_comments (it, &vorbis_file, stream))
 continue;
- int samplerate = vi->rate;
+ int samplerate = (int)vi->rate;
 
- const off_t start_offset = sample_offset(&vorbis_file, it->startsample-1);
- const off_t end_offset = sample_offset(&vorbis_file, it->endsample);
+ int64_t startsample = deadbeef->pl_item_get_startsample (it);
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+
+ const off_t start_offset = sample_offset(&vorbis_file, startsample-1);
+ const off_t end_offset = sample_offset(&vorbis_file, endsample);
 char *filetype = NULL;
 const off_t stream_size = oggedit_vorbis_stream_info(deadbeef->fopen(fname), start_offset, end_offset, &filetype);
 if (filetype) {
@@ -544,36 +645,18 @@
 deadbeef->pl_set_meta_int(it, ":BITRATE", 8.f * samplerate * stream_size / totalsamples / 1000);
 }
 set_meta_ll (it, ":FILE_SIZE", fsize);
- deadbeef->pl_add_meta (it, ":BPS", "16");
+// deadbeef->pl_add_meta (it, ":BPS", "32");
 deadbeef->pl_set_meta_int (it, ":CHANNELS", vi->channels);
 deadbeef->pl_set_meta_int (it, ":SAMPLERATE", samplerate);
 // deadbeef->pl_set_meta_int (it, ":BITRATE", ov_bitrate (&vorbis_file, stream)/1000);
 
 if (nstreams == 1) {
- DB_playItem_t *cue = deadbeef->plt_insert_cue (plt, after, it, totalsamples, samplerate);
+ DB_playItem_t *cue = deadbeef->plt_process_cue (plt, after, it, totalsamples, samplerate);
 if (cue) {
 deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
 ov_clear (&vorbis_file);
 return cue;
 }
-
- deadbeef->pl_lock ();
- const char *cuesheet_meta = deadbeef->pl_find_meta (it, "cuesheet");
- if (cuesheet_meta) {
- trace("Embedded cuesheet found for %s\n", fname);
- const char *last_sheet = strstr(cuesheet_meta, DELIMITER);
- const char *cuesheet = last_sheet ? last_sheet + strlen(DELIMITER) : cuesheet_meta;
- cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), totalsamples, samplerate);
- if (cue) {
- deadbeef->pl_unlock ();
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
- ov_clear (&vorbis_file);
- return cue;
- }
- }
- deadbeef->pl_unlock ();
 }
 else {
 currentsample += totalsamples;
@@ -602,14 +685,16 @@
 vorbis_info *vi = NULL;
 
 deadbeef->pl_lock ();
- fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ fp = deadbeef->fopen (uri);
 if (!fp) {
- trace ("cvorbis_read_metadata: failed to fopen %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ trace ("cvorbis_read_metadata: failed to fopen %s\n", uri);
 return -1;
 }
 if (fp->vfs->is_streaming ()) {
- trace ("cvorbis_read_metadata: failed to fopen %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ trace ("cvorbis_read_metadata: failed to fopen %s\n", uri);
+ deadbeef->fclose(fp);
 return -1;
 }
 ov_callbacks ovcb = {
@@ -621,12 +706,13 @@
 int res = ov_open_callbacks (fp, &vorbis_file, NULL, 0, ovcb);
 if (res != 0) {
 trace ("cvorbis_read_metadata: ov_open_callbacks returned %d\n", res);
+ deadbeef->fclose(fp);
 return -1;
 }
 int tracknum = deadbeef->pl_find_meta_int (it, ":TRACKNUM", -1);
 vi = ov_info (&vorbis_file, tracknum);
 if (!vi) {
- trace ("cvorbis_read_metadata: failed to ov_open %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ trace ("cvorbis_read_metadata: failed to ov_open %s\n", uri);
 ov_clear (&vorbis_file);
 return -1;
 }
@@ -641,68 +727,53 @@
 }
 
 static void
-split_tag(vorbis_comment *tags, const char *key, const char *value)
+split_tag(vorbis_comment *tags, const char *key, const char *value, int valuesize)
 {
- if (key && value) {
- const char *p;
- while (p = strstr(value, DELIMITER)) {
- char vp - value + 1;
- strncpy(v, value, p-value);
- vp-value = 0;
- vorbis_comment_add_tag(tags, key, v);
- value = p + strlen(DELIMITER);
- }
-
+ while (valuesize > 0) {
 vorbis_comment_add_tag(tags, key, value);
+ size_t l = strlen (value) + 1;
+ value += l;
+ valuesize -= l;
 }
 }
 
-static void
-merge_gain_tag(DB_playItem_t *it, vorbis_comment *vc, vorbis_comment *tags, const int tag_enum, const char *pattern, const int min, const int max)
+static vorbis_comment *
+tags_list(DB_playItem_t *it, OggVorbis_File *vorbis_file)
 {
- const char *key = gain_tag_name(tag_enum);
-
- char *end;
- const char *meta_value = deadbeef->pl_find_meta(it, key);
- const float value = meta_value ? strtof(meta_value, &end) : 0;
- if (meta_value && end != meta_value && value > min && value < max) {
- char tag_value10;
- sprintf(tag_value, pattern, value);
- vorbis_comment_add_tag(tags, key, tag_value);
- }
- else {
- const char *tag_value = vorbis_comment_query(vc, key, 0);
- if (tag_value)
- vorbis_comment_add_tag(tags, key, tag_value);
- }
-}
-
-static vorbis_comment
-*tags_list(DB_playItem_t *it, OggVorbis_File *vorbis_file)
-{
- vorbis_comment *vc = ov_comment (vorbis_file, -1);
- if (!vc)
- return NULL;
-
- vorbis_comment *tags = calloc(1, sizeof(vorbis_comment));
+ vorbis_comment *tags = calloc (1, sizeof (vorbis_comment));
 if (!tags)
 return NULL;
 
 deadbeef->pl_lock ();
- merge_gain_tag(it, vc, tags, DDB_REPLAYGAIN_ALBUMGAIN, "%0.2f dB", -100, 100);
- merge_gain_tag(it, vc, tags, DDB_REPLAYGAIN_ALBUMPEAK, "%0.8f", 0, 2);
- merge_gain_tag(it, vc, tags, DDB_REPLAYGAIN_TRACKGAIN, "%0.2f dB", -100, 100);
- merge_gain_tag(it, vc, tags, DDB_REPLAYGAIN_TRACKPEAK, "%0.8f", 0, 2);
- merge_gain_tag(it, vc, tags, RG_REFERENCE_LOUDNESS, "%0.1f dB", 0, 128);
- for (DB_metaInfo_t *m = deadbeef->pl_get_metadata_head(it); m; m = m->next) {
- char *key = strdup(m->key);
- if (key && key0 != ':' && key0 != '!' && !is_special_tag(key)) {
- split_tag(tags, oggedit_map_tag(key, "meta2tag"), m->value);
- free(key);
+ for (DB_metaInfo_t *m = deadbeef->pl_get_metadata_head (it); m; m = m->next) {
+ if (strchr (":!_", m->key0)) {
+ break;
 }
+ char *key = strdupa (m->key);
+ split_tag (tags, oggedit_map_tag (key, "meta2tag"), m->value, m->valuesize);
 }
 deadbeef->pl_unlock ();
 
+ // add replaygain values
+ for (int n = 0; ddb_internal_rg_keysn; n++) {
+ if (deadbeef->pl_find_meta (it, ddb_internal_rg_keysn)) {
+ float value = deadbeef->pl_get_item_replaygain (it, n);
+ char s100;
+ // https://wiki.hydrogenaud.io/index.php?title=ReplayGain_2.0_specification#Metadata_format
+ switch (n) {
+ case DDB_REPLAYGAIN_ALBUMGAIN:
+ case DDB_REPLAYGAIN_TRACKGAIN:
+ snprintf (s, sizeof (s), "%.2f dB", value);
+ break;
+ case DDB_REPLAYGAIN_ALBUMPEAK:
+ case DDB_REPLAYGAIN_TRACKPEAK:
+ snprintf (s, sizeof (s), "%.6f", value);
+ break;
+ }
+ split_tag (tags, tag_rg_namesn, s, (int)strlen (s)+1);
+ }
+ }
+
 return tags;
 }
 
@@ -744,31 +815,41 @@
 const off_t file_size = oggedit_write_vorbis_metadata (deadbeef->fopen(fname), fname, 0, stream_size, tags->comments, tags->user_comments);
 vorbis_comment_clear(tags);
 free(tags);
+
+ int res = 0;
+
 if (file_size <= 0) {
 trace ("cvorbis_write_metadata: failed to write tags to %s, code %d\n", fname, file_size);
- return -1;
+ res = -1;
+ }
+
+ ov_clear (&vorbis_file);
+
+ if (!res) {
+ set_meta_ll(it, ":FILE_SIZE", (int64_t)file_size);
+ res = cvorbis_read_metadata(it);
 }
 
- set_meta_ll(it, ":FILE_SIZE", (int64_t)file_size);
- return cvorbis_read_metadata(it);
+ return res;
 }
 
 
 static const char * exts = { "ogg", "ogx", "oga", NULL };
 
 // 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 = "stdogg",
- .plugin.name = "OggVorbis decoder",
- .plugin.descr = "OggVorbis decoder using standard xiph.org libraries",
- .plugin.copyright =
- "OggVorbis plugin for DeaDBeeF\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko et al.\n"
+static ddb_decoder2_t plugin = {
+ .decoder.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .decoder.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .decoder.plugin.version_major = 1,
+ .decoder.plugin.version_minor = 0,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.id = "stdogg",
+ .decoder.plugin.name = "Ogg Vorbis decoder",
+ .decoder.plugin.descr = "Ogg Vorbis decoder using standard xiph.org libraries",
+ .decoder.plugin.copyright =
+ "Ogg Vorbis plugin for DeaDBeeF\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko et al.\n"
 "\n"
 "vcedit.c\n"
 "Ogg Vorbis plugin Ogg edit functions\n"
@@ -823,21 +904,21 @@
 "NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n"
 "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
 ,
- .plugin.website = "http://deadbeef.sf.net",
- .plugin.start = vorbis_start,
- .plugin.stop = vorbis_stop,
- .open = cvorbis_open,
- .init = cvorbis_init,
- .free = cvorbis_free,
- .read = cvorbis_read,
- // vorbisfile can't output float32
-// .read_float32 = cvorbis_read_float32,
- .seek = cvorbis_seek,
- .seek_sample = cvorbis_seek_sample,
- .insert = cvorbis_insert,
- .read_metadata = cvorbis_read_metadata,
- .write_metadata = cvorbis_write_metadata,
- .exts = exts
+ .decoder.plugin.website = "http://deadbeef.sf.net",
+ .decoder.plugin.start = vorbis_start,
+ .decoder.plugin.stop = vorbis_stop,
+ .decoder.open = cvorbis_open,
+ .decoder.open2 = cvorbis_open2,
+ .decoder.init = cvorbis_init,
+ .decoder.free = cvorbis_free,
+ .decoder.read = cvorbis_read,
+ .decoder.seek = cvorbis_seek,
+ .decoder.seek_sample = cvorbis_seek_sample,
+ .decoder.insert = cvorbis_insert,
+ .decoder.read_metadata = cvorbis_read_metadata,
+ .decoder.write_metadata = cvorbis_write_metadata,
+ .decoder.exts = exts,
+ .seek_sample64 = cvorbis_seek_sample64,
 };
 
 DB_plugin_t *

deadbeef-0.6.2.tar.bz2/plugins/vtx/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/vtx/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/vtx/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/vtx/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/vtx/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/vtx/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/vtx/lh5dec.c -> deadbeef-1.9.6.tar.bz2/plugins/vtx/lh5dec.c Changed

deadbeef-0.6.2.tar.bz2/plugins/vtx/vtx.c -> deadbeef-1.9.6.tar.bz2/plugins/vtx/vtx.c Changed

@@ -1,6 +1,6 @@
 /*
 VTX plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy Yakovenko
 
 Based on libayemu (C) 2005-2008 Alexander Sashnov
 
@@ -25,7 +25,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 #include "ayemu.h"
 
 #define min(x,y) ((x)<(y)?(x):(y))
@@ -45,7 +46,7 @@
 DB_fileinfo_t info;
 ayemu_vtx_t *decoder;
 ayemu_ay_t ay;
- char regsAY_FRAME_SIZE;
+ ayemu_ay_reg_frame_t regs;
 int vtx_pos;
 int left;
 int rate;
@@ -54,9 +55,8 @@
 
 static DB_fileinfo_t *
 vtx_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (vtx_info_t));
- memset (_info, 0, sizeof (vtx_info_t));
- return _info;
+ vtx_info_t *info = calloc (1, sizeof (vtx_info_t));
+ return &info->info;
 }
 
 static int
@@ -69,30 +69,36 @@
 char *buf = NULL;
 
 deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
 if (!fp) {
- trace ("vtx: failed to open file %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ trace ("vtx: failed to open file %s\n", uri);
 return -1;
 }
 
 sz = deadbeef->fgetlength (fp);
 if (sz <= 0) {
 trace ("vtx: bad file size\n");
+ deadbeef->fclose (fp);
 return -1;
 }
 
 buf = malloc (sz);
 if (!buf) {
 trace ("vtx: out of memory\n");
+ deadbeef->fclose (fp);
 return -1;
 }
 if (deadbeef->fread (buf, 1, sz, fp) != sz) {
 trace ("vtx: read failed\n");
 free (buf);
+ deadbeef->fclose (fp);
 return -1;
 }
 
+ deadbeef->fclose (fp);
+
 info->decoder = ayemu_vtx_load (buf, sz);
 if (!info->decoder) {
 trace ("vtx: ayemu_vtx_load failed\n");
@@ -154,7 +160,7 @@
 return 0;
 }
 int n;
- char *p = info->decoder->regdata + info->vtx_pos;
+ unsigned char *p = info->decoder->regdata + info->vtx_pos;
 for(n = 0 ; n < AY_FRAME_SIZE ; n++, p += numframes) {
 info->regsn = *p;
 }
@@ -214,7 +220,7 @@
 }
 // copy register data
 int n;
- char *p = info->decoder->regdata + info->vtx_pos;
+ unsigned char *p = info->decoder->regdata + info->vtx_pos;
 for(n = 0 ; n < AY_FRAME_SIZE ; n++, p += num_frames) {
 info->regsn = *p;
 }
@@ -302,13 +308,12 @@
 }
 
 static const char settings_dlg =
- "property \"Bits per sample (8 or 16)\" entry vtx.bps 16;\n"
+ "property \"Bits per sample\" select2 vtx.bps 0 16 8;\n"
 ;
 
 // define plugin interface
 static DB_decoder_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
 .plugin.type = DB_PLUGIN_DECODER,
@@ -317,7 +322,7 @@
 .plugin.descr = "AY8910/12 chip emulator and vtx file player",
 .plugin.copyright = 
 "VTX plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "Based on libayemu (C) 2005-2008 Alexander Sashnov\n"
 "\n"

deadbeef-0.6.2.tar.bz2/plugins/vtx/vtxfile.c -> deadbeef-1.9.6.tar.bz2/plugins/vtx/vtxfile.c Changed

deadbeef-0.6.2.tar.bz2/plugins/wavpack/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/wavpack/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/wavpack/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/wavpack/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/wavpack/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/wavpack/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/wavpack/wavpack.c -> deadbeef-1.9.6.tar.bz2/plugins/wavpack/wavpack.c Changed

@@ -1,6 +1,6 @@
 /*
 WavPack plugin for DeaDBeeF Player
- Copyright (C) 2009-2011, Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2009-2011, Oleksiy Yakovenko <waker@users.sourceforge.net>
 Copyright (C) 2010-2011, David Bryant <david@wavpack.com>
 All rights reserved.
 
@@ -27,16 +27,23 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
 #include <string.h>
-#ifdef TINYWV
+#if defined(TINYWV) || defined(OSX_BUILD)
 #include <wavpack.h>
 #else
 #include <wavpack/wavpack.h>
 #endif
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 
 #define min(x,y) ((x)<(y)?(x):(y))
 #define max(x,y) ((x)>(y)?(x):(y))
@@ -44,7 +51,7 @@
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
-static DB_decoder_t plugin;
+static ddb_decoder2_t plugin;
 static DB_functions_t *deadbeef;
 
 typedef struct {
@@ -54,10 +61,13 @@
 DB_FILE *c_file;
 #endif
 WavpackContext *ctx;
- int startsample;
- int endsample;
+ int64_t startsample;
+ int64_t endsample;
 } wvctx_t;
 
+static int
+wv_seek_sample64 (DB_fileinfo_t *_info, int64_t sample);
+
 #ifdef TINYWV
 int32_t wv_read_stream(void *buf, int32_t sz, void *file_handle) {
 return deadbeef->fread (buf, 1, sz, (DB_FILE *)file_handle);
@@ -65,12 +75,12 @@
 #else
 int32_t wv_read_bytes(void *id, void *data, int32_t bcount) {
 // trace ("wv_read_bytes\n");
- return deadbeef->fread (data, 1, bcount, id);
+ return (int32_t)deadbeef->fread (data, 1, bcount, id);
 }
 
 uint32_t wv_get_pos(void *id) {
 // trace ("wv_get_pos\n");
- return deadbeef->ftell (id);
+ return (uint32_t)deadbeef->ftell (id);
 }
 
 int wv_set_pos_abs(void *id, uint32_t pos) {
@@ -84,7 +94,7 @@
 int wv_push_back_byte(void *id, int c) {
 // trace ("wv_push_back_byte\n");
 deadbeef->fseek (id, -1, SEEK_CUR);
- return deadbeef->ftell (id);
+ return (int)deadbeef->ftell (id);
 }
 uint32_t wv_get_length(void *id) {
 // trace ("wv_get_length\n");
@@ -92,7 +102,7 @@
 deadbeef->fseek (id, 0, SEEK_END);
 size_t sz = deadbeef->ftell (id);
 deadbeef->fseek (id, pos, SEEK_SET);
- return sz;
+ return (uint32_t)sz;
 }
 int wv_can_seek(void *id) {
 // trace ("wv_can_seek\n");
@@ -117,47 +127,52 @@
 
 static DB_fileinfo_t *
 wv_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (wvctx_t));
- memset (_info, 0, sizeof (wvctx_t));
- return _info;
+ wvctx_t *info = calloc (1, sizeof (wvctx_t));
+ return &info->info;
 }
 
 static int
 wv_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
 wvctx_t *info = (wvctx_t *)_info;
 deadbeef->pl_lock ();
- info->file = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ info->file = deadbeef->fopen (uri);
 if (!info->file) {
 return -1;
 }
 
 #ifndef TINYWV
 deadbeef->pl_lock ();
- const char *uri = deadbeef->pl_find_meta (it, ":URI");
+ uri = deadbeef->pl_find_meta (it, ":URI");
 char *c_fname = alloca (strlen (uri) + 2);
 if (c_fname) {
 strcpy (c_fname, uri);
+ deadbeef->pl_unlock ();
 strcat (c_fname, "c");
 info->c_file = deadbeef->fopen (c_fname);
 }
 else {
+ deadbeef->pl_unlock ();
 fprintf (stderr, "wavpack warning: failed to alloc memory for correction file name\n");
 }
- deadbeef->pl_unlock ();
 #endif
 
 char error80;
 #ifdef TINYWV
 info->ctx = WavpackOpenFileInput (wv_read_stream, info->file, error);
 #else
- info->ctx = WavpackOpenFileInputEx (&wsr, info->file, info->c_file, error, OPEN_NORMALIZE, 0);
+ int flags = OPEN_NORMALIZE;
+#if defined(DSD_FLAG) && defined(OPEN_DSD_AS_PCM)
+ flags = DSD_FLAG|OPEN_DSD_AS_PCM;
+#endif
+ info->ctx = WavpackOpenFileInputEx (&wsr, info->file, info->c_file, error, flags, 0);
 #endif
 if (!info->ctx) {
 fprintf (stderr, "wavpack error: %s\n", error);
 return -1;
 }
- _info->plugin = &plugin;
+ _info->plugin = &plugin.decoder;
 _info->fmt.bps = WavpackGetBytesPerSample (info->ctx) * 8;
 _info->fmt.channels = WavpackGetNumChannels (info->ctx);
 _info->fmt.samplerate = WavpackGetSampleRate (info->ctx);
@@ -172,10 +187,11 @@
 _info->fmt.channelmask |= 1 << i;
 }
 _info->readpos = 0;
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
- if (plugin.seek_sample (_info, 0) < 0) {
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample (it);
+ info->endsample = endsample;
+ if (wv_seek_sample64(_info, 0) < 0) {
 return -1;
 }
 }
@@ -214,7 +230,7 @@
 int currentsample = WavpackGetSampleIndex (info->ctx);
 int samplesize = _info->fmt.channels * _info->fmt.bps / 8;
 if (size / samplesize + currentsample > info->endsample) {
- size = (info->endsample - currentsample + 1) * samplesize;
+ size = (int)((info->endsample - currentsample + 1) * samplesize);
 trace ("wv: size truncated to %d bytes (%d samples), cursample=%d, endsample=%d\n", size, info->endsample - currentsample + 1, currentsample, info->endsample);
 if (size <= 0) {
 return 0;
@@ -272,19 +288,24 @@
 }
 
 static int
-wv_seek_sample (DB_fileinfo_t *_info, int sample) {
+wv_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
 #ifndef TINYWV
 wvctx_t *info = (wvctx_t *)_info;
- WavpackSeekSample (info->ctx, sample + info->startsample);
- _info->readpos = (float)(WavpackGetSampleIndex (info->ctx) - info->startsample) / WavpackGetSampleRate (info->ctx);
+ WavpackSeekSample64 (info->ctx, sample + info->startsample);
+ _info->readpos = (float)((double)(WavpackGetSampleIndex64 (info->ctx) - info->startsample) / WavpackGetSampleRate (info->ctx));
 #endif
 return 0;
 }
 
 static int
+wv_seek_sample (DB_fileinfo_t *_info, int sample) {
+ return wv_seek_sample64(_info, sample);
+}
+
+static int
 wv_seek (DB_fileinfo_t *_info, float sec) {
 wvctx_t *info = (wvctx_t *)_info;
- return wv_seek_sample (_info, sec * WavpackGetSampleRate (info->ctx));
+ return wv_seek_sample64 (_info, (int64_t)((double)sec * (int64_t)WavpackGetSampleRate (info->ctx)));
 }
 
 static DB_playItem_t *
@@ -297,7 +318,11 @@
 #ifdef TINYWV
 WavpackContext *ctx = WavpackOpenFileInput (wv_read_stream, fp, error);
 #else
- WavpackContext *ctx = WavpackOpenFileInputEx (&wsr, fp, NULL, error, 0, 0);
+ int flags = 0;
+#if defined(DSD_FLAG) && defined(OPEN_DSD_AS_PCM)
+ flags = DSD_FLAG|OPEN_DSD_AS_PCM;
+#endif
+ WavpackContext *ctx = WavpackOpenFileInputEx (&wsr, fp, NULL, error, flags, 0);
 #endif
 if (!ctx) {
 fprintf (stderr, "wavpack error: %s\n", error);
@@ -308,7 +333,7 @@
 int samplerate = WavpackGetSampleRate (ctx);
 float duration = (float)totalsamples / samplerate;
 
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
 deadbeef->pl_add_meta (it, ":FILETYPE", "wv");
 deadbeef->plt_set_item_duration (plt, it, duration);
 trace ("wv: totalsamples=%d, samplerate=%d, duration=%f\n", totalsamples, samplerate, duration);
@@ -335,7 +360,7 @@
 deadbeef->pl_add_meta (it, "title", NULL);
 
 char s100;
- snprintf (s, sizeof (s), "%lld", deadbeef->fgetlength (fp));
+ snprintf (s, sizeof (s), "%lld", (long long)deadbeef->fgetlength (fp));
 deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
 snprintf (s, sizeof (s), "%d", WavpackGetBytesPerSample (ctx) * 8);
 deadbeef->pl_add_meta (it, ":BPS", s);
@@ -348,30 +373,12 @@
 snprintf (s, sizeof (s), "%s", (WavpackGetMode (ctx) & MODE_FLOAT) ? "FLOAT" : "INTEGER");
 deadbeef->pl_add_meta (it, ":WAVPACK_MODE", s);
 
- // embedded cue
- deadbeef->pl_lock ();
- const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
- if (cuesheet) {
- trace ("found cuesheet: %s\n", cuesheet);
- DB_playItem_t *last = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), totalsamples, samplerate);
- if (last) {
- deadbeef->pl_unlock ();
- deadbeef->fclose (fp);
- WavpackCloseFile (ctx);
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (last);
- return last;
- }
- }
- deadbeef->pl_unlock ();
- // cue file on disc
- DB_playItem_t *cue_after = deadbeef->plt_insert_cue (plt, after, it, totalsamples, samplerate);
- if (cue_after) {
+ DB_playItem_t *cue = deadbeef->plt_process_cue (plt, after, it, totalsamples, samplerate);
+ if (cue) {
+ deadbeef->pl_item_unref (it);
 deadbeef->fclose (fp);
 WavpackCloseFile (ctx);
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue_after);
- return cue_after;
+ return cue;
 }
 
 after = deadbeef->plt_insert_item (plt, after, it);
@@ -385,8 +392,9 @@
 int
 wv_read_metadata (DB_playItem_t *it) {
 deadbeef->pl_lock ();
- DB_FILE *fp = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ DB_FILE *fp = deadbeef->fopen (uri);
 if (!fp) {
 return -1;
 }
@@ -429,18 +437,19 @@
 
 static const char *exts = { "wv", NULL };
 // 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 = "wv",
- .plugin.name = "WavPack decoder",
- .plugin.descr = "WavPack (.wv, .iso.wv) player",
- .plugin.copyright = 
+static ddb_decoder2_t plugin = {
+ .decoder.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .decoder.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .decoder.plugin.version_major = 1,
+ .decoder.plugin.version_minor = 0,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.id = "wv",
+ .decoder.plugin.name = "WavPack decoder",
+ .decoder.plugin.descr = "WavPack (.wv, .iso.wv) player",
+ .decoder.plugin.copyright =
 "WavPack plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2011, Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2009-2011, Oleksiy Yakovenko <waker@users.sourceforge.net>\n"
 "Copyright (C) 2010-2011, David Bryant <david@wavpack.com>\n"
 "All rights reserved.\n"
 "\n"
@@ -466,17 +475,18 @@
 "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n"
 "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
 ,
- .plugin.website = "http://deadbeef.sf.net",
- .open = wv_open,
- .init = wv_init,
- .free = wv_free,
- .read = wv_read,
- .seek = wv_seek,
- .seek_sample = wv_seek_sample,
- .insert = wv_insert,
- .read_metadata = wv_read_metadata,
- .write_metadata = wv_write_metadata,
- .exts = exts,
+ .decoder.plugin.website = "http://deadbeef.sf.net",
+ .decoder.open = wv_open,
+ .decoder.init = wv_init,
+ .decoder.free = wv_free,
+ .decoder.read = wv_read,
+ .decoder.seek = wv_seek,
+ .decoder.seek_sample = wv_seek_sample,
+ .decoder.insert = wv_insert,
+ .decoder.read_metadata = wv_read_metadata,
+ .decoder.write_metadata = wv_write_metadata,
+ .decoder.exts = exts,
+ .seek_sample64 = wv_seek_sample64,
 };
 
 DB_plugin_t *

deadbeef-0.6.2.tar.bz2/plugins/wildmidi/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/wildmidi/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/wildmidi/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/wildmidi/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/wildmidi/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/wildmidi/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/wildmidi/README -> deadbeef-1.9.6.tar.bz2/plugins/wildmidi/README Changed

deadbeef-0.6.2.tar.bz2/plugins/wildmidi/src/wildmidi_lib.c -> deadbeef-1.9.6.tar.bz2/plugins/wildmidi/src/wildmidi_lib.c Changed

@@ -166,11 +166,11 @@
 */
 
 int WM_Initialized = 0;
-signed short int WM_MasterVolume = 948;
-unsigned short int WM_SampleRate = 0;
-unsigned short int WM_MixerOptions = 0;
+static signed short int WM_MasterVolume = 948;
+static unsigned short int WM_SampleRate = 0;
+static unsigned short int WM_MixerOptions = 0;
 
-char WM_Version = "WildMidi Processing Library " WILDMIDILIB_VERSION;
+static char WM_Version = "WildMidi Processing Library " WILDMIDILIB_VERSION;
 
 struct _lowpass {
 	signed long int in2;
@@ -228,7 +228,7 @@
 
 struct _patch *patch128;
 
-int patch_lock;
+static int patch_lock;
 
 struct _channel {
 	unsigned char bank;
@@ -300,7 +300,7 @@
 	struct _WM_Info *tmp_info;
 	unsigned char recalc_samples;
 	struct _channel channel16;
-	struct _note *note128;
+	struct _note *note1024;
 	struct _note **last_note;
 	struct _note note_table216128;
 
@@ -324,10 +324,10 @@
 
 /* Gauss Interpolation code adapted from code supplied by Eric. A. Welsh */
 
-double newt_coeffs5858;		/* for start/end of samples */
-float *gauss_table(1<<10) = {0};	/* don't need doubles */
-int gauss_window35 = {0};
-int gauss_n = 34;	/* do not set this value higher than 34 */
+static double newt_coeffs5858;		/* for start/end of samples */
+static float *gauss_table(1<<10) = {0};	/* don't need doubles */
+static int gauss_window35 = {0};
+static int gauss_n = 34;	/* do not set this value higher than 34 */
 			/* 34 is as high as we can go before errors crop up */
 
 void init_gauss (void) {
@@ -394,11 +394,11 @@
 }
 }
 
-unsigned long int delay_size42;
-signed long int a52;
-signed long int b52;
-signed long int gain_in4;
-signed long int gain_out4;
+static unsigned long int delay_size42;
+static signed long int a52;
+static signed long int b52;
+static signed long int gain_in4;
+static signed long int gain_out4;
 
 void init_lowpass (void) {
 	float c = 0;
@@ -443,7 +443,7 @@
 	struct _hndl *prev;
 };
 
-struct _hndl * first_handle = NULL;
+static struct _hndl * first_handle = NULL;
 
 //f: ( VOLUME / 127 )
 //f: pow(( VOLUME / 127 ), 1.660964047 )
@@ -457,11 +457,11 @@
 //signed short int pan_volume = { 0, 55, 84, 107, 127, 146, 162, 178, 193, 208, 221, 234, 247, 259, 271, 282, 294, 305, 315, 326, 336, 346, 356, 366, 375, 384, 394, 403, 412, 420, 429, 438, 446, 454, 463, 471, 479, 487, 495, 503, 510, 518, 525, 533, 540, 548, 555, 562, 570, 577, 584, 591, 598, 605, 611, 618, 625, 632, 638, 645, 651, 658, 664, 671, 677, 684, 690, 696, 703, 709, 715, 721, 727, 733, 739, 745, 751, 757, 763, 769, 775, 781, 786, 792, 798, 804, 809, 815, 821, 826, 832, 837, 843, 848, 854, 859, 865, 870, 876, 881, 886, 892, 897, 902, 907, 913, 918, 923, 928, 933, 939, 944, 949, 954, 959, 964, 969, 974, 979, 984, 989, 994, 999, 1004, 1009, 1014, 1019, 1024 };
 signed short int pan_volume = { 0, 90, 128, 157, 181, 203, 222, 240, 257, 272, 287, 301, 314, 327, 339, 351, 363, 374, 385, 396, 406, 416, 426, 435, 445, 454, 463, 472, 480, 489, 497, 505, 514, 521, 529, 537, 545, 552, 560, 567, 574, 581, 588, 595, 602, 609, 616, 622, 629, 636, 642, 648, 655, 661, 667, 673, 679, 686, 692, 697, 703, 709, 715, 721, 726, 732, 738, 743, 749, 754, 760, 765, 771, 776, 781, 786, 792, 797, 802, 807, 812, 817, 822, 827, 832, 837, 842, 847, 852, 857, 862, 866, 871, 876, 880, 885, 890, 894, 899, 904, 908, 913, 917, 922, 926, 931, 935, 939, 944, 948, 953, 957, 961, 965, 970, 974, 978, 982, 987, 991, 995, 999, 1003, 1007, 1011, 1015, 1019, 1024 };
 
-unsigned long int reverb_val = 92;
-unsigned long int comb_size82;
-unsigned long int allpass_size22;
+static unsigned long int reverb_val = 92;
+static unsigned long int comb_size82;
+static unsigned long int allpass_size22;
 
-float env_time_table = {
+static float env_time_table = {
 	0.0, 0.092857143, 0.046428571, 0.030952381, 0.023214286, 0.018571429, 0.015476190, 0.013265306, 0.011607143, 0.010317460, 0.009285714, 0.008441558, 0.007738095, 0.007142857, 0.006632653, 0.006190476, 0.005803571, 0.005462185, 0.005158730, 0.004887218, 0.004642857, 0.004421769, 0.004220779, 0.004037267, 0.003869048, 0.003714286, 0.003571429, 0.003439153, 0.003316327, 0.003201970, 0.003095238, 0.002995392, 0.002901786, 0.002813853, 0.002731092, 0.002653061, 0.002579365, 0.002509653, 0.002443609, 0.002380952, 0.002321429, 0.002264808, 0.002210884, 0.002159468, 0.002110390, 0.002063492, 0.002018634, 0.001975684, 0.001934524, 0.001895044, 0.001857143, 0.001820728, 0.001785714, 0.001752022, 0.001719577, 0.001688312, 0.001658163, 0.001629073, 0.001600985, 0.001573850, 0.001547619, 0.001522248, 0.001497696, 0.001473923,
 	0.0, 0.742857143, 0.371428571, 0.247619048, 0.185714286, 0.148571429, 0.123809524, 0.106122449, 0.092857143, 0.082539683, 0.074285714, 0.067532468, 0.061904762, 0.057142857, 0.053061224, 0.049523810, 0.046428571, 0.043697479, 0.041269841, 0.039097744, 0.037142857, 0.035374150, 0.033766234, 0.032298137, 0.030952381, 0.029714286, 0.028571429, 0.027513228, 0.026530612, 0.025615764, 0.024761905, 0.023963134, 0.023214286, 0.022510823, 0.021848739, 0.021224490, 0.020634921, 0.020077220, 0.019548872, 0.019047619, 0.018571429, 0.018118467, 0.017687075, 0.017275748, 0.016883117, 0.016507937, 0.016149068, 0.015805471, 0.015476190, 0.015160350, 0.014857143, 0.014565826, 0.014285714, 0.014016173, 0.013756614, 0.013506494, 0.013265306, 0.013032581, 0.012807882, 0.012590799, 0.012380952, 0.012177986, 0.011981567, 0.011791383,
 	0.0, 5.942857143, 2.971428571, 1.980952381, 1.485714286, 1.188571429, 0.990476190, 0.848979592, 0.742857143, 0.660317460, 0.594285714, 0.540259740, 0.495238095, 0.457142857, 0.424489796, 0.396190476, 0.371428571, 0.349579832, 0.330158730, 0.312781955, 0.297142857, 0.282993197, 0.270129870, 0.258385093, 0.247619048, 0.237714286, 0.228571429, 0.220105820, 0.212244898, 0.204926108, 0.198095238, 0.191705069, 0.185714286, 0.180086580, 0.174789916, 0.169795918, 0.165079365, 0.160617761, 0.156390977, 0.152380952, 0.148571429, 0.144947735, 0.141496599, 0.138205980, 0.135064935, 0.132063492, 0.129192547, 0.126443769, 0.123809524, 0.121282799, 0.118857143, 0.116526611, 0.114285714, 0.112129380, 0.110052910, 0.108051948, 0.106122449, 0.104260652, 0.102463054, 0.100726392, 0.099047619, 0.097423888, 0.095852535, 0.094331066,
@@ -469,12 +469,12 @@
 };
 
 #if 0
-unsigned long int freq_table = {
+static unsigned long int freq_table = {
 	8372018, 8376855, 8381695, 8386538, 8391384, 8396232, 8401084, 8405938, 8410795, 8415654, 8420517, 8425382, 8430250, 8435121, 8439995, 8444871, 8449751, 8454633, 8459518, 8464406, 8469296, 8474190, 8479086, 8483985, 8488887, 8493792, 8498700, 8503610, 8508523, 8513439, 8518358, 8523280, 8528205, 8533132, 8538063, 8542996, 8547932, 8552871, 8557813, 8562757, 8567705, 8572655, 8577608, 8582564, 8587523, 8592485, 8597450, 8602417, 8607387, 8612361, 8617337, 8622316, 8627298, 8632282, 8637270, 8642261, 8647254, 8652250, 8657250, 8662252, 8667257, 8672264, 8677275, 8682289, 8687305, 8692325, 8697347, 8702372, 8707400, 8712431, 8717465, 8722502, 8727542, 8732585, 8737630, 8742679, 8747730, 8752785, 8757842, 8762902, 8767965, 8773031, 8778100, 8783172, 8788247, 8793325, 8798405, 8803489, 8808575, 8813665, 8818757, 8823853, 8828951, 8834052, 8839157, 8844264, 8849374, 8854487, 8859603, 8864722, 8869844, 8874969, 8880097, 8885227, 8890361, 8895498, 8900638, 8905780, 8910926, 8916075, 8921226, 8926381, 8931538, 8936699, 8941863, 8947029, 8952199, 8957371, 8962546, 8967725, 8972906, 8978091, 8983278, 8988469, 8993662, 8998859, 9004058, 9009260, 9014466, 9019674, 9024886, 9030100, 9035318, 9040538, 9045762, 9050988, 9056218, 9061451, 9066686, 9071925, 9077166, 9082411, 9087659, 9092910, 9098163, 9103420, 9108680, 9113943, 9119209, 9124478, 9129750, 9135025, 9140303, 9145584, 9150868, 9156156, 9161446, 9166739, 9172036, 9177335, 9182638, 9187944, 9193252, 9198564, 9203879, 9209197, 9214518, 9219842, 9225169, 9230499, 9235832, 9241169, 9246508, 9251851, 9257196, 9262545, 9267897, 9273252, 9278610, 9283971, 9289335, 9294702, 9300073, 9305446, 9310823, 9316202, 9321585, 9326971, 9332360, 9337752, 9343147, 9348546, 9353947, 9359352, 9364760, 9370171, 9375585, 9381002, 9386422, 9391845, 9397272, 9402701, 9408134, 9413570, 9419009, 9424451, 9429897, 9435345, 9440797, 9446252, 9451710, 9457171, 9462635, 9468102, 9473573, 9479047, 9484524, 9490004, 9495487, 9500973, 9506463, 9511955, 9517451, 9522950, 9528453, 9533958, 9539467, 9544979, 9550494, 9556012, 9561533, 9567058, 9572585, 9578116, 9583650, 9589188, 9594728, 9600272, 9605819, 9611369, 9616922, 9622479, 9628039, 9633602, 9639168, 9644737, 9650310, 9655886, 9661465, 9667047, 9672633, 9678221, 9683813, 9689409, 9695007, 9700609, 9706214, 9711822, 9717433, 9723048, 9728666, 9734287, 9739911, 9745539, 9751170, 9756804, 9762441, 9768082, 9773726, 9779373, 9785023, 9790677, 9796334, 9801994, 9807657, 9813324, 9818994, 9824667, 9830344, 9836024, 9841707, 9847394, 9853083, 9858776, 9864473, 9870172, 9875875, 9881581, 9887291, 9893003, 9898719, 9904439, 9910162, 9915887, 9921617, 9927349, 9933085, 9938825, 9944567, 9950313, 9956062, 9961815, 9967570, 9973330, 9979092, 9984858, 9990627, 9996399, 10002175, 10007954, 10013737, 10019523, 10025312, 10031104, 10036900, 10042700, 10048502, 10054308, 10060117, 10065930, 10071746, 10077565, 10083388, 10089214, 10095043, 10100876, 10106712, 10112552, 10118395, 10124241, 10130091, 10135944, 10141800, 10147660, 10153523, 10159390, 10165260, 10171133, 10177010, 10182890, 10188774, 10194661, 10200551, 10206445, 10212342, 10218243, 10224147, 10230054, 10235965, 10241879, 10247797, 10253718, 10259642, 10265570, 10271502, 10277436, 10283374, 10289316, 10295261, 10301210, 10307162, 10313117, 10319076, 10325038, 10331004, 10336973, 10342945, 10348921, 10354901, 10360884, 10366870, 10372860, 10378853, 10384850, 10390850, 10396854, 10402861, 10408872, 10414886, 10420904, 10426925, 10432949, 10438977, 10445009, 10451044, 10457083, 10463124, 10469170, 10475219, 10481271, 10487327, 10493387, 10499450, 10505516, 10511586, 10517660, 10523737, 10529817, 10535901, 10541989, 10548080, 10554174, 10560273, 10566374, 10572480, 10578589, 10584701, 10590817, 10596936, 10603059, 10609186, 10615316, 10621449, 10627586, 10633727, 10639871, 10646019, 10652170, 10658325, 10664483, 10670645, 10676811, 10682980, 10689153, 10695329, 10701509, 10707692, 10713879, 10720069, 10726264, 10732461, 10738662, 10744867, 10751076, 10757288, 10763503, 10769722, 10775945, 10782172, 10788402, 10794635, 10800872, 10807113, 10813357, 10819605, 10825857, 10832112, 10838371, 10844634, 10850900, 10857169, 10863443, 10869720, 10876000, 10882284, 10888572, 10894864, 10901159, 10907457, 10913760, 10920066, 10926375, 10932689, 10939006, 10945326, 10951650, 10957978, 10964310, 10970645, 10976984, 10983326, 10989673, 10996022, 11002376, 11008733, 11015094, 11021459, 11027827, 11034199, 11040574, 11046954, 11053337, 11059723, 11066114, 11072508, 11078905, 11085307, 11091712, 11098121, 11104533, 11110949, 11117369, 11123793, 11130220, 11136651, 11143086, 11149525, 11155967, 11162413, 11168863, 11175316, 11181773, 11188234, 11194699, 11201167, 11207639, 11214115, 11220594, 11227078, 11233565, 11240055, 11246550, 11253048, 11259550, 11266056, 11272566, 11279079, 11285596, 11292117, 11298642, 11305170, 11311702, 11318238, 11324778, 11331321, 11337868, 11344420, 11350974, 11357533, 11364095, 11370662, 11377232, 11383805, 11390383, 11396964, 11403550, 11410139, 11416731, 11423328, 11429928, 11436533, 11443141, 11449753, 11456368, 11462988, 11469611, 11476238, 11482869, 11489504, 11496143, 11502785, 11509432, 11516082, 11522736, 11529394, 11536056, 11542721, 11549390, 11556064, 11562741, 11569422, 11576107, 11582795, 11589488, 11596184, 11602885, 11609589, 11616297, 11623009, 11629725, 11636444, 11643168, 11649895, 11656627, 11663362, 11670101, 11676844, 11683591, 11690342, 11697097, 11703855, 11710618, 11717384, 11724154, 11730929, 11737707, 11744489, 11751275, 11758065, 11764859, 11771656, 11778458, 11785264, 11792073, 11798887, 11805704, 11812526, 11819351, 11826180, 11833013, 11839851, 11846692, 11853537, 11860386, 11867239, 11874096, 11880956, 11887821, 11894690, 11901563, 11908440, 11915320, 11922205, 11929094, 11935986, 11942883, 11949784, 11956688, 11963597, 11970510, 11977426, 11984347, 11991271, 11998200, 12005133, 12012069, 12019010, 12025954, 12032903, 12039856, 12046812, 12053773, 12060738, 12067706, 12074679, 12081656, 12088637, 12095622, 12102610, 12109603, 12116600, 12123601, 12130606, 12137615, 12144629, 12151646, 12158667, 12165692, 12172722, 12179755, 12186793, 12193834, 12200880, 12207930, 12214983, 12222041, 12229103, 12236169, 12243239, 12250313, 12257392, 12264474, 12271561, 12278651, 12285746, 12292844, 12299947, 12307054, 12314165, 12321280, 12328400, 12335523, 12342651, 12349782, 12356918, 12364058, 12371202, 12378350, 12385502, 12392658, 12399819, 12406984, 12414152, 12421325, 12428502, 12435684, 12442869, 12450059, 12457252, 12464450, 12471652, 12478858, 12486069, 12493283, 12500502, 12507725, 12514952, 12522183, 12529418, 12536658, 12543901, 12551149, 12558401, 12565658, 12572918, 12580183, 12587452, 12594725, 12602002, 12609283, 12616569, 12623859, 12631153, 12638451, 12645754, 12653061, 12660372, 12667687, 12675006, 12682330, 12689658, 12696990, 12704326, 12711667, 12719012, 12726361, 12733714, 12741072, 12748433, 12755800, 12763170, 12770544, 12777923, 12785306, 12792694, 12800085, 12807481, 12814882, 12822286, 12829695, 12837108, 12844525, 12851947, 12859373, 12866803, 12874237, 12881676, 12889119, 12896567, 12904018, 12911474, 12918934, 12926399, 12933868, 12941341, 12948819, 12956301, 12963787, 12971277, 12978772, 12986271, 12993775, 13001283, 13008795, 13016311, 13023832, 13031357, 13038887, 13046421, 13053959, 13061502, 13069049, 13076600, 13084156, 13091716, 13099280, 13106849, 13114422, 13122000, 13129582, 13137168, 13144759, 13152354, 13159953, 13167557, 13175165, 13182778, 13190395, 13198016, 13205642, 13213273, 13220907, 13228546, 13236190, 13243838, 13251490, 13259147, 13266808, 13274474, 13282144, 13289818, 13297497, 13305180, 13312868, 13320560, 13328257, 13335958, 13343663, 13351373, 13359088, 13366807, 13374530, 13382258, 13389990, 13397727, 13405468, 13413214, 13420964, 13428719, 13436478, 13444241, 13452010, 13459782, 13467559, 13475341, 13483127, 13490918, 13498713, 13506512, 13514316, 13522125, 13529938, 13537756, 13545578, 13553405, 13561236, 13569071, 13576912, 13584756, 13592606, 13600460, 13608318, 13616181, 13624048, 13631920, 13639797, 13647678, 13655564, 13663454, 13671349, 13679248, 13687152, 13695060, 13702974, 13710891, 13718813, 13726740, 13734671, 13742607, 13750548, 13758493, 13766443, 13774397, 13782356, 13790319, 13798287, 13806260, 13814237, 13822219, 13830206, 13838197, 13846193, 13854193, 13862198, 13870208, 13878222, 13886241, 13894264, 13902292, 13910325, 13918363, 13926405, 13934451, 13942503, 13950559, 13958619, 13966685, 13974755, 13982829, 13990909, 13998993, 14007081, 14015175, 14023273, 14031375, 14039483, 14047595, 14055712, 14063833, 14071959, 14080090, 14088225, 14096366, 14104511, 14112660, 14120815, 14128974, 14137137, 14145306, 14153479, 14161657, 14169840, 14178027, 14186219, 14194416, 14202618, 14210824, 14219035, 14227251, 14235471, 14243697, 14251927, 14260161, 14268401, 14276645, 14284894, 14293148, 14301407, 14309670, 14317938, 14326211, 14334489, 14342772, 14351059, 14359351, 14367648, 14375949, 14384256, 14392567, 14400883, 14409204, 14417530, 14425860, 14434196, 14442536, 14450881, 14459230, 14467585, 14475944, 14484309, 14492678, 14501052, 14509430, 14517814, 14526202, 14534596, 14542994, 14551397, 14559805, 14568217, 14576635, 14585057, 14593485, 14601917, 14610354, 14618796, 14627242, 14635694, 14644151, 14652612, 14661078, 14669550, 14678026, 14686507, 14694993, 14703483, 14711979, 14720480, 14728985, 14737496, 14746011, 14754531, 14763057, 14771587, 14780122, 14788662, 14797207, 14805757, 14814311, 14822871, 14831436, 14840005, 14848580, 14857160, 14865744, 14874334, 14882928, 14891527, 14900132, 14908741, 14917355, 14925975, 14934599, 14943228, 14951862, 14960502, 14969146, 14977795, 14986449, 14995109, 15003773, 15012442, 15021116, 15029795, 15038480, 15047169, 15055863, 15064563, 15073267, 15081976, 15090691, 15099410, 15108135, 15116864, 15125599, 15134338, 15143083, 15151833, 15160587, 15169347, 15178112, 15186882, 15195657, 15204437, 15213222, 15222013, 15230808, 15239608, 15248414, 15257224, 15266040, 15274861, 15283687, 15292518, 15301354, 15310195, 15319041, 15327893, 15336749, 15345611, 15354477, 15363349, 15372226, 15381108, 15389996, 15398888, 15407786, 15416688, 15425596, 15434509, 15443427, 15452350, 15461279, 15470212, 15479151, 15488095, 15497044, 15505998, 15514958, 15523922, 15532892, 15541867, 15550847, 15559832, 15568823, 15577819, 15586820, 15595826, 15604837, 15613853, 15622875, 15631902, 15640934, 15649972, 15659014, 15668062, 15677115, 15686173, 15695237, 15704306, 15713380, 15722459, 15731543, 15740633, 15749728, 15758828, 15767934, 15777045, 15786161, 15795282, 15804408, 15813540, 15822677, 15831820, 15840967, 15850120, 15859279, 15868442, 15877611, 15886785, 15895965, 15905149, 15914339, 15923535, 15932735, 15941941, 15951153, 15960369, 15969591, 15978818, 15988051, 15997289, 16006532, 16015781, 16025035, 16034294, 16043559, 16052829, 16062104, 16071385, 16080671, 16089962, 16099259, 16108561, 16117869, 16127182, 16136500, 16145824, 16155153, 16164488, 16173828, 16183173, 16192523, 16201880, 16211241, 16220608, 16229980, 16239358, 16248741, 16258130, 16267524, 16276923, 16286328, 16295738, 16305154, 16314575, 16324002, 16333434, 16342871, 16352314, 16361763, 16371217, 16380676, 16390141, 16399611, 16409087, 16418568, 16428055, 16437547, 16447044, 16456548, 16466056, 16475570, 16485090, 16494615, 16504146, 16513682, 16523224, 16532771, 16542323, 16551882, 16561445, 16571015, 16580589, 16590170, 16599755, 16609347, 16618944, 16628546, 16638154, 16647768, 16657387, 16667012, 16676642, 16686278, 16695919, 16705566, 16715219, 16724877, 16734540
 };
 #endif
 
-unsigned long int freq_table = {
+static unsigned long int freq_table = {
 	837201792, 837685632, 838169728, 838653568, 839138240, 839623232, 840108480, 840593984, 841079680, 841565184, 842051648, 842538240, 843025152, 843512320, 843999232, 844486976, 844975040, 845463360, 845951936, 846440320, 846929536, 847418944, 847908608, 848398656, 848888960, 849378944, 849869824, 850361024, 850852416, 851344192, 851835584, 852327872, 852820480, 853313280, 853806464, 854299328, 854793024, 855287040, 855781312, 856275904, 856770752, 857265344, 857760704, 858256448, 858752448, 859248704, 859744768, 860241600, 860738752, 861236160, 861733888, 862231360, 862729600, 863228160, 863727104, 864226176, 864725696, 865224896, 865724864, 866225152, 866725760, 867226688, 867727296, 868228736, 868730496, 869232576, 869734912, 870236928, 870739904, 871243072, 871746560, 872250368, 872754496, 873258240, 873762880, 874267840, 874773184, 875278720, 875783936, 876290112, 876796480, 877303232, 877810176, 878317504, 878824512, 879332416, 879840576, 880349056, 880857792, 881366272, 881875712, 882385280, 882895296, 883405440, 883915456, 884426304, 884937408, 885448832, 885960512, 886472512, 
 	886984192, 887496768, 888009728, 888522944, 889036352, 889549632, 890063680, 890578048, 891092736, 891607680, 892122368, 892637952, 893153792, 893670016, 894186496, 894703232, 895219648, 895737024, 896254720, 896772672, 897290880, 897808896, 898327744, 898846912, 899366336, 899886144, 900405568, 900925952, 901446592, 901967552, 902488768, 903010368, 903531584, 904053760, 904576256, 905099008, 905622016, 906144896, 906668480, 907192512, 907716800, 908241408, 908765632, 909290816, 909816256, 910342144, 910868160, 911394624, 911920768, 912447680, 912975104, 913502720, 914030592, 914558208, 915086784, 915615552, 916144768, 916674176, 917203968, 917733440, 918263744, 918794496, 919325440, 919856704, 920387712, 920919616, 921451840, 921984320, 922517184, 923049728, 923583168, 924116928, 924651008, 925185344, 925720000, 926254336, 926789696, 927325312, 927861120, 928397440, 928933376, 929470208, 930007296, 930544768, 931082560, 931619968, 932158464, 932697152, 933236160, 933775488, 934315072, 934854464, 935394688, 935935296, 936476224, 937017344, 937558208, 938100160, 938642304, 939184640, 
 	939727488, 940269888, 940813312, 941357056, 941900992, 942445440, 942990016, 943534400, 944079680, 944625280, 945171200, 945717440, 946263360, 946810176, 947357376, 947904832, 948452672, 949000192, 949548608, 950097280, 950646400, 951195776, 951745472, 952294912, 952845184, 953395904, 953946880, 954498176, 955049216, 955601088, 956153408, 956705920, 957258816, 957812032, 958364928, 958918848, 959472960, 960027456, 960582272, 961136768, 961692224, 962248000, 962804032, 963360448, 963916608, 964473600, 965031040, 965588736, 966146816, 966705152, 967263168, 967822144, 968381440, 968941120, 969501056, 970060736, 970621376, 971182272, 971743488, 972305088, 972866368, 973428608, 973991104, 974554048, 975117312, 975680768, 976243968, 976808192, 977372736, 977937536, 978502656, 979067584, 979633344, 980199488, 980765888, 981332736, 981899200, 982466688, 983034432, 983602624, 984171008, 984739776, 985308160, 985877632, 986447360, 987017472, 987587904, 988157952, 988729088, 989300416, 989872192, 990444224, 991016000, 991588672, 992161728, 992735168, 993308864, 993882880, 994456576, 995031296, 
@@ -625,13 +625,14 @@
 			buffer_dirstrlen(buffer_dir)+1 = '\0';
 			buffer_dirstrlen(buffer_dir) = '/';
 		}
-		buffer_file = realloc(buffer_file,(strlen(buffer_file) + strlen(buffer_dir) + 1));
-		if (buffer_file == NULL) {
+		char *new_buffer_file = realloc(buffer_file,(strlen(buffer_file) + strlen(buffer_dir) + 1));
+		if (new_buffer_file == NULL) {
+			free (buffer_file);
 			WM_ERROR(__FUNCTION__, __LINE__, WM_ERR_MEM, NULL, errno);
 			WM_ERROR(__FUNCTION__, __LINE__, WM_ERR_LOAD, filename, errno);
-			free(buffer_file);
 			return NULL;
 		}
+		buffer_file = new_buffer_file;
 		memmove((buffer_file + strlen(buffer_dir)), buffer_file, strlen(buffer_file)+1);
 		strncpy (buffer_file,buffer_dir,strlen(buffer_dir));
 	}

deadbeef-0.6.2.tar.bz2/plugins/wildmidi/wildmidiplug.c -> deadbeef-1.9.6.tar.bz2/plugins/wildmidi/wildmidiplug.c Changed

@@ -1,6 +1,6 @@
 /*
 WildMidi plugin for DeaDBeeF Player
- Copyright (C) 2009-2014 Alexey Yakovenko
+ Copyright (C) 2009-2014 Oleksiy Yakovenko
 
 Based on wildmidi library
 	Midi Wavetable Processing library
@@ -29,7 +29,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/strdupa.h>
 #include "wildmidi_lib.h"
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
@@ -53,20 +54,27 @@
 
 DB_fileinfo_t *
 wmidi_open (uint32_t hints) {
- DB_fileinfo_t *_info = (DB_fileinfo_t *)malloc (sizeof (wmidi_info_t));
- memset (_info, 0, sizeof (wmidi_info_t));
- return _info;
+ wmidi_info_t *info = calloc (1, sizeof (wmidi_info_t));
+ return &info->info;
 }
 
+static int
+wmidi_init_conf (void);
+
 int
 wmidi_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ if (wmidi_init_conf () < 0) {
+ return -1;
+ }
+
 wmidi_info_t *info = (wmidi_info_t *)_info;
 
 deadbeef->pl_lock ();
- info->m = WildMidi_Open (deadbeef->pl_find_meta (it, ":URI"));
+ const char *uri = strdupa (deadbeef->pl_find_meta (it, ":URI"));
 deadbeef->pl_unlock ();
+ info->m = WildMidi_Open (uri);
 if (!info->m) {
- trace ("wmidi: failed to open %s\n", deadbeef->pl_find_meta (it, ":URI"));
+ trace ("wmidi: failed to open %s\n", uri);
 return -1;
 }
 
@@ -120,6 +128,10 @@
 
 DB_playItem_t *
 wmidi_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+ if (wmidi_init_conf () < 0) {
+ return NULL;
+ }
+
 DB_playItem_t *it = NULL;
 
 midi *m = WildMidi_Open (fname);
@@ -141,8 +153,13 @@
 
 #define DEFAULT_TIMIDITY_CONFIG "/etc/timidity++/timidity-freepats.cfg:/etc/timidity/freepats.cfg:/etc/timidity/freepats/freepats.cfg"
 
-int
-wmidi_start (void) {
+extern int WM_Initialized;
+
+static int
+wmidi_init_conf (void) {
+ if (WM_Initialized) {
+ return 0;
+ }
 char config_files1000;
 deadbeef->conf_get_str ("wildmidi.config", DEFAULT_TIMIDITY_CONFIG, config_files, sizeof (config_files));
 char config1024 = "";
@@ -164,6 +181,7 @@
 fclose (f);
 break;
 }
+ *config = 0;
 }
 p = e;
 }
@@ -172,13 +190,21 @@
 }
 else {
 fprintf (stderr, _("wildmidi: freepats config file not found. Please install timidity-freepats package, or specify path to freepats.cfg in the plugin settings."));
+ return -1;
 }
 return 0;
 }
 
 int
+wmidi_start (void) {
+ return 0;
+}
+
+int
 wmidi_stop (void) {
- WildMidi_Shutdown ();
+ if (WM_Initialized) {
+ WildMidi_Shutdown ();
+ }
 return 0;
 }
 
@@ -188,15 +214,14 @@
 return DB_PLUGIN (&wmidi_plugin);
 }
 
-static const char *exts = { "mid",NULL };
+static const char *exts = { "mid","midi",NULL };
 
 static const char settings_dlg =
 "property \"Timidity++ bank configuration file\" file wildmidi.config \"" DEFAULT_TIMIDITY_CONFIG "\";\n"
 ;
 // define plugin interface
 DB_decoder_t wmidi_plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 0,
+ DDB_PLUGIN_SET_API_VERSION
 .plugin.type = DB_PLUGIN_DECODER,
 .plugin.version_major = 1,
 .plugin.version_minor = 0,
@@ -204,7 +229,7 @@
 .plugin.descr = "MIDI player based on WildMidi library\n\nRequires freepats package to be installed\nSee http://freepats.zenvoid.org/\nMake sure to set correct freepats.cfg path in plugin settings.",
 .plugin.copyright = 
 "WildMidi plugin for DeaDBeeF Player\n"
- "Copyright (C) 2009-2014 Alexey Yakovenko\n"
+ "Copyright (C) 2009-2014 Oleksiy Yakovenko\n"
 "\n"
 "Based on wildmidi library\n"
 "Midi Wavetable Processing library\n"

deadbeef-0.6.2.tar.bz2/plugins/wma/COPYING -> deadbeef-1.9.6.tar.bz2/plugins/wma/COPYING Changed

deadbeef-0.6.2.tar.bz2/plugins/wma/Makefile.am -> deadbeef-1.9.6.tar.bz2/plugins/wma/Makefile.am Changed

deadbeef-0.6.2.tar.bz2/plugins/wma/Makefile.in -> deadbeef-1.9.6.tar.bz2/plugins/wma/Makefile.in Changed

deadbeef-0.6.2.tar.bz2/plugins/wma/asfheader.c -> deadbeef-1.9.6.tar.bz2/plugins/wma/asfheader.c Changed

@@ -30,7 +30,7 @@
 #include <ctype.h>
 #include <inttypes.h>
 #include <unistd.h>
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 
 #include <libasf/asf.h>
 
@@ -43,8 +43,7 @@
 
 #define SKIP_BYTES(fd,x) {\
 if (x > 0) {\
- char bufx;\
- deadbeef->fread (buf, x, 1, fd);\
+ deadbeef->fseek(fd, x, SEEK_CUR);\
 }\
 }
 
@@ -388,6 +387,19 @@
 return;
 }
 
+static int
+asf_add_disc_meta (DB_playItem_t *it, const char *disc) {
+ char *slash = strchr (disc, '/');
+ if (slash) {
+ // split into track/number
+ *slash = 0;
+ slash++;
+ deadbeef->pl_add_meta (it, "numdiscs", slash);
+ }
+ deadbeef->pl_add_meta (it, "disc", disc);
+ return 0;
+}
+
 static int asf_parse_header(DB_FILE *fd, asf_waveformatex_t* wfx, DB_playItem_t *it)
 {
 asf_object_t current;
@@ -603,7 +615,7 @@
 read_uint16le(fd, &length);
 trace ("ext md id: %s\n", utf8buf);
 
- if (!strcmp("WM/TrackNumber",utf8buf)) {
+ if (!strcmp("WM/TrackNumber",utf8buf) || !strcmp("WM/Track",utf8buf)) {
 if (type == 0) {
 unsigned char *s = id3buf;
 asf_utf16LEdecode(fd, length, &id3buf, &id3buf_remaining);
@@ -633,12 +645,12 @@
 if (type == 0) {
 unsigned char *s = id3buf;
 asf_utf16LEdecode(fd, length, &id3buf, &id3buf_remaining);
- deadbeef->pl_append_meta (it, "disc", s);
+ asf_add_disc_meta (it, s);
 } else if ((type >=2) && (type <= 5)) {
- int tracknum = asf_intdecode(fd, type, length);
+ int num = asf_intdecode(fd, type, length);
 char n100;
- snprintf (n, sizeof (n), "%d", tracknum);
- deadbeef->pl_append_meta (it, "disc", n);
+ snprintf (n, sizeof (n), "%d", num);
+ deadbeef->pl_replace_meta (it, "disc", n);
 } else {
 SKIP_BYTES(fd, length);
 }
@@ -675,6 +687,32 @@
 } else {
 SKIP_BYTES(fd, length);
 }
+ } else if (!strcmp("WM/OriginalReleaseYear", utf8buf)) {
+ if (type == 0) {
+ unsigned char *s = id3buf;
+ asf_utf16LEdecode(fd, length, &id3buf, &id3buf_remaining);
+ deadbeef->pl_append_meta (it, "original_release_year", s);
+ } else if ((type >=2) && (type <= 5)) {
+ int year = asf_intdecode(fd, type, length);
+ char n100;
+ snprintf (n, sizeof (n), "%d", year);
+ deadbeef->pl_append_meta (it, "original_release_year", n);
+ } else {
+ SKIP_BYTES(fd, length);
+ }
+ } else if (!strcmp("WM/OriginalReleaseTime", utf8buf)) {
+ if (type == 0) {
+ unsigned char *s = id3buf;
+ asf_utf16LEdecode(fd, length, &id3buf, &id3buf_remaining);
+ deadbeef->pl_append_meta (it, "original_release_time", s);
+ } else if ((type >=2) && (type <= 5)) {
+ int date = asf_intdecode(fd, type, length);
+ char n100;
+ snprintf (n, sizeof (n), "%d", date);
+ deadbeef->pl_append_meta (it, "original_release_time", n);
+ } else {
+ SKIP_BYTES(fd, length);
+ }
 } else if (!strncmp("replaygain_", utf8buf, 11)) {
 char *s = utf8buf;
 char *value = id3buf;
@@ -749,7 +787,7 @@
 #endif
 } else {
 if (type == 0) { // FIXME: custom fields -- after others work
- unsigned char *s = id3buf;
+ unsigned char *s = id3buf; // FIXME: skip empty
 asf_utf16LEdecode(fd, length, &id3buf, &id3buf_remaining);
 if (!strcmp (utf8buf, "MusicBrainz/Track Id")) {
 strcpy (utf8buf, "musicbrainz_trackid");

deadbeef-0.6.2.tar.bz2/plugins/wma/libasf/asf.c -> deadbeef-1.9.6.tar.bz2/plugins/wma/libasf/asf.c Changed

deadbeef-0.6.2.tar.bz2/plugins/wma/libasf/asf.h -> deadbeef-1.9.6.tar.bz2/plugins/wma/libasf/asf.h Changed

deadbeef-0.6.2.tar.bz2/plugins/wma/libwma/ffmpeg_bitstream.c -> deadbeef-1.9.6.tar.bz2/plugins/wma/libwma/ffmpeg_bitstream.c Changed

deadbeef-0.6.2.tar.bz2/plugins/wma/libwma/wmadec.h -> deadbeef-1.9.6.tar.bz2/plugins/wma/libwma/wmadec.h Changed

deadbeef-0.6.2.tar.bz2/plugins/wma/libwma/wmadeci.c -> deadbeef-1.9.6.tar.bz2/plugins/wma/libwma/wmadeci.c Changed

deadbeef-0.6.2.tar.bz2/plugins/wma/libwma/wmafixed.c -> deadbeef-1.9.6.tar.bz2/plugins/wma/libwma/wmafixed.c Changed

deadbeef-0.6.2.tar.bz2/plugins/wma/wma_plugin.c -> deadbeef-1.9.6.tar.bz2/plugins/wma/wma_plugin.c Changed

@@ -1,6 +1,6 @@
 /*
 WMA plugin for deadbeef
- Copyright (C) 2013 Alexey Yakovenko <waker@users.sourceforge.net>
+ Copyright (C) 2013 Oleksiy Yakovenko <waker@users.sourceforge.net>
 WMA and ASF libraries (C) RockBox & FFMPEG developers
 
 This software is provided 'as-is', without any express or implied
@@ -21,7 +21,7 @@
 
 3. This notice may not be removed or altered from any source distribution.
 */
-#include "../../deadbeef.h"
+#include <deadbeef/deadbeef.h>
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
@@ -45,7 +45,7 @@
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
 
-static DB_decoder_t plugin;
+static ddb_decoder2_t plugin;
 DB_functions_t *deadbeef;
 
 typedef struct {
@@ -57,23 +57,23 @@
 WMADecodeContext wmadec;
 #endif
 int64_t first_frame_offset;
- int currentsample;
- int startsample;
- int endsample;
+ int64_t currentsample;
+ int64_t startsample;
+ int64_t endsample;
 int skipsamples;
 char buffer200000; // can't predict its size, so set to max
 int remaining;
 int open2_was_used;
 } wmaplug_info_t;
 
+static int
+wmaplug_seek_sample64 (DB_fileinfo_t *_info, int64_t sample);
+
 // allocate codec control structure
 static DB_fileinfo_t *
 wmaplug_open (uint32_t hints) {
- DB_fileinfo_t *_info = malloc (sizeof (wmaplug_info_t));
- wmaplug_info_t *info = (wmaplug_info_t *)_info;
- memset (info, 0, sizeof (wmaplug_info_t));
-
- return _info;
+ wmaplug_info_t *info = calloc (1, sizeof (wmaplug_info_t));
+ return &info->info;
 }
 
 static DB_fileinfo_t *
@@ -83,13 +83,11 @@
 return NULL;
 }
 
- DB_fileinfo_t *_info = malloc (sizeof (wmaplug_info_t));
- wmaplug_info_t *info = (wmaplug_info_t *)_info;
- memset (info, 0, sizeof (wmaplug_info_t));
+ wmaplug_info_t *info = calloc (1, sizeof (wmaplug_info_t));
 info->open2_was_used = 1;
 info->info.file = file;
 
- return _info;
+ return &info->info;
 }
 
 int get_asf_metadata(DB_FILE *fd, DB_playItem_t *it, asf_waveformatex_t *wfx, int64_t *first_frame_offset);
@@ -152,9 +150,9 @@
 return -1;
 }
 
- info->startsample = it->startsample;
- info->endsample = it->endsample;
- _info->plugin = &plugin;
+ info->startsample = deadbeef->pl_item_get_startsample (it);
+ info->endsample = deadbeef->pl_item_get_endsample (it);
+ _info->plugin = &plugin.decoder;
 _info->fmt.bps = info->wfx.bitspersample;
 _info->fmt.channels = info->wfx.channels;
 _info->fmt.samplerate = info->wfx.rate;
@@ -163,10 +161,11 @@
 }
 
 if (!info->info.file->vfs->is_streaming ()) {
- if (it->endsample > 0) {
- info->startsample = it->startsample;
- info->endsample = it->endsample;
- plugin.seek_sample (_info, 0);
+ int64_t endsample = deadbeef->pl_item_get_endsample (it);
+ if (endsample > 0) {
+ info->startsample = deadbeef->pl_item_get_startsample (it);
+ info->endsample = endsample;
+ wmaplug_seek_sample64 (_info, 0);
 }
 }
 if (info->info.file->vfs->is_streaming ()) {
@@ -234,12 +233,6 @@
 int wmares = wma_decode_superframe_frame(&info->wmadec,
 audiobuf + b * info->wfx.blockalign, info->wfx.blockalign);
 
-
- if (wmares * info->wfx.channels * info->wfx.bitspersample / 8 > sizeof (info->buffer) - info->remaining) {
- fprintf (stderr, "WMA: decoding buffer is too small\n");
- break;
- }
-
 if (wmares < 0) {
 /* Do the above, but for errors in decode. */
 errcount++;
@@ -250,11 +243,16 @@
 goto new_packet;
 }
 } else if (wmares > 0) {
+ if (wmares * info->wfx.channels * info->wfx.bitspersample / 8 > sizeof (info->buffer) - info->remaining) {
+ fprintf (stderr, "WMA: decoding buffer is too small\n");
+ break;
+ }
+
 int16_t *p = (int16_t *)&(info->bufferinfo->remaining);
 for (int s = 0; s < wmares; s++) {
 for (int ch = 0; ch < info->wfx.channels; ch++) {
 fixed32 *chan = info->wmadec.frame_outch;
- ps*info->wfx.channels+ch = chans >> 16;
+ ps*info->wfx.channels+ch = chans >> 15;
 }
 }
 info->remaining += wmares * info->wfx.channels * info->wfx.bitspersample / 8;
@@ -345,12 +343,12 @@
 }
 
 static int
-wmaplug_seek_sample (DB_fileinfo_t *_info, int sample) {
+wmaplug_seek_sample64 (DB_fileinfo_t *_info, int64_t sample) {
 wmaplug_info_t *info = (wmaplug_info_t *)_info;
 
 sample += info->startsample;
 
- trace ("seek to sample %d\n", sample);
+ trace ("seek to sample %lld\n", sample);
 
 info->remaining = 0;
 info->wmadec.last_superframe_len = 0;
@@ -358,18 +356,8 @@
 
 memset(info->wmadec.frame_out, 0, sizeof(fixed32) * MAX_CHANNELS * BLOCK_MAX_SIZE * 2);
 
-#if 0
- // this only works for CBR wma
- int n_subframes = info->wfx.packet_size / info->wfx.blockalign;
-
- int frame = sample / (info->wmadec.frame_len * n_subframes);
- int64_t offs = frame * info->wfx.packet_size + info->first_frame_offset;
- deadbeef->fseek (info->info.file, offs, SEEK_SET);
- info->skipsamples = sample - frame * info->wmadec.frame_len * n_subframes;
- info->currentsample = sample;
-#else
 int skip_ms;
- int res = asf_seek ((int64_t)sample * 1000 / info->wfx.rate, &info->wfx, info->info.file, info->first_frame_offset, &skip_ms);
+ int res = asf_seek (sample * 1000 / info->wfx.rate, &info->wfx, info->info.file, info->first_frame_offset, &skip_ms);
 if (res < 0) {
 info->skipsamples = 0;
 info->currentsample = 0;
@@ -378,16 +366,20 @@
 info->skipsamples = (int64_t)skip_ms * info->wfx.rate / 1000;
 info->currentsample = sample;
 }
-#endif
 
- _info->readpos = (float)(info->currentsample - info->startsample)/_info->fmt.samplerate;
+ _info->readpos = (float)((double)(info->currentsample - info->startsample)/_info->fmt.samplerate);
 
 return 0;
 }
 
 static int
+wmaplug_seek_sample (DB_fileinfo_t *_info, int sample) {
+ return wmaplug_seek_sample64(_info, sample);
+}
+
+static int
 wmaplug_seek (DB_fileinfo_t *_info, float t) {
- return wmaplug_seek_sample (_info, t * _info->fmt.samplerate);
+ return wmaplug_seek_sample (_info, (int64_t)((double)t * (int64_t)_info->fmt.samplerate));
 }
 
 static int
@@ -418,7 +410,7 @@
 
 int64_t first_frame_offset;
 
- DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.plugin.id);
+ DB_playItem_t *it = deadbeef->pl_item_alloc_init (fname, plugin.decoder.plugin.id);
 
 int res = get_asf_metadata (fp, it, &wfx, &first_frame_offset);
 if (!res) {
@@ -430,6 +422,7 @@
 
 int64_t l = deadbeef->fgetlength (fp);
 deadbeef->fclose (fp);
+ fp = NULL;
 
 int64_t i_count = (l - first_frame_offset) / wfx.packet_size;
 
@@ -442,32 +435,15 @@
 deadbeef->plt_set_item_duration (plt, it, totalsamples / (float)wfx.rate);
 deadbeef->pl_append_meta (it, ":FILETYPE", "WMA");
 
- it->startsample = 0;
- it->endsample = totalsamples-1;
-
- deadbeef->pl_lock ();
- const char *cuesheet = deadbeef->pl_find_meta (it, "cuesheet");
- DB_playItem_t *cue = NULL;
-
- if (cuesheet) {
- cue = deadbeef->plt_insert_cue_from_buffer (plt, after, it, cuesheet, strlen (cuesheet), totalsamples, wfx.rate);
- if (cue) {
- deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
- deadbeef->pl_unlock ();
- return cue;
- }
- }
- deadbeef->pl_unlock ();
+ deadbeef->pl_item_set_startsample (it, 0);
+ deadbeef->pl_item_set_endsample (it, totalsamples-1);
 
- cue = deadbeef->plt_insert_cue (plt, after, it, totalsamples, wfx.rate);
+ DB_playItem_t *cue = deadbeef->plt_process_cue (plt, after, it, totalsamples, wfx.rate);
 if (cue) {
 deadbeef->pl_item_unref (it);
- deadbeef->pl_item_unref (cue);
 return cue;
 }
 
-
 after = deadbeef->plt_insert_item (plt, after, it);
 deadbeef->pl_item_unref (it);
 return after;
@@ -476,18 +452,19 @@
 static const char * exts = { "wma", NULL };
 
 // define plugin interface
-static DB_decoder_t plugin = {
- .plugin.api_vmajor = 1,
- .plugin.api_vminor = 7,
- .plugin.version_major = 1,
- .plugin.version_minor = 0,
- .plugin.type = DB_PLUGIN_DECODER,
- .plugin.id = "wma",
- .plugin.name = "WMA player",
- .plugin.descr = "plays WMA files",
- .plugin.copyright = 
+static ddb_decoder2_t plugin = {
+ .decoder.plugin.api_vmajor = DB_API_VERSION_MAJOR,
+ .decoder.plugin.api_vminor = DB_API_VERSION_MINOR,
+ .decoder.plugin.version_major = 1,
+ .decoder.plugin.version_minor = 0,
+ .decoder.plugin.type = DB_PLUGIN_DECODER,
+ .decoder.plugin.flags = DDB_PLUGIN_FLAG_IMPLEMENTS_DECODER2,
+ .decoder.plugin.id = "wma",
+ .decoder.plugin.name = "WMA player",
+ .decoder.plugin.descr = "plays WMA files",
+ .decoder.plugin.copyright =
 "WMA plugin for deadbeef\n"
- "Copyright (C) 2013 Alexey Yakovenko <waker@users.sourceforge.net>\n"
+ "Copyright (C) 2013 Oleksiy Yakovenko <waker@users.sourceforge.net>\n"
 "WMA and ASF libraries (C) RockBox & FFMPEG developers\n"
 "\n"
 "This software is provided 'as-is', without any express or implied\n"
@@ -508,17 +485,18 @@
 "\n"
 "3. This notice may not be removed or altered from any source distribution.\n"
 ,
- .plugin.website = "http://deadbeef.sf.net",
- .open = wmaplug_open,
- .open2 = wmaplug_open2,
- .init = wmaplug_init,
- .free = wmaplug_free,
- .read = wmaplug_read,
- .seek = wmaplug_seek,
- .seek_sample = wmaplug_seek_sample,
- .insert = wmaplug_insert,
- .read_metadata = wmaplug_read_metadata,
- .exts = exts,
+ .decoder.plugin.website = "http://deadbeef.sf.net",
+ .decoder.open = wmaplug_open,
+ .decoder.open2 = wmaplug_open2,
+ .decoder.init = wmaplug_init,
+ .decoder.free = wmaplug_free,
+ .decoder.read = wmaplug_read,
+ .decoder.seek = wmaplug_seek,
+ .decoder.seek_sample = wmaplug_seek_sample,
+ .decoder.insert = wmaplug_insert,
+ .decoder.read_metadata = wmaplug_read_metadata,
+ .decoder.exts = exts,
+ .seek_sample64 = wmaplug_seek_sample64,
 };
 
 DB_plugin_t *

deadbeef-0.6.2.tar.bz2/po/LINGUAS -> deadbeef-1.9.6.tar.bz2/po/LINGUAS Changed

deadbeef-0.6.2.tar.bz2/po/Makefile.in.in -> deadbeef-1.9.6.tar.bz2/po/Makefile.in.in Changed

@@ -33,8 +33,7 @@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@
 
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+	$(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
 	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@
 install-data-yes: all
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	 dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	 dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
 	 $(mkdir_p) $$dir; \
 	 if test -r $$lang.gmo; then \
 	 $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
 uninstall:
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	 rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	 rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	 rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
 
 check: all $(GETTEXT_PACKAGE).pot

deadbeef-0.6.2.tar.bz2/po/POTFILES.in -> deadbeef-1.9.6.tar.bz2/po/POTFILES.in Changed

@@ -1,36 +1,52 @@
+deadbeef.desktop.in
+intl/plural.c
+src/main.c
+src/playlist.c
+src/plugins.c
+plugins/converter/converter.glade
+plugins/converter/convgui.c
+plugins/converter/interface.c
+plugins/converter/support.c
+plugins/gtkui/actionhandlers.c
 plugins/gtkui/callbacks.c
+plugins/gtkui/covermanager/albumartwidget.c
+plugins/gtkui/ctmapping.c
 plugins/gtkui/ddbtabstrip.c
+plugins/gtkui/deadbeef.glade
+plugins/gtkui/dspconfig.c
 plugins/gtkui/eq.c
+plugins/gtkui/fileman.c
+plugins/gtkui/gtk/menus.ui
 plugins/gtkui/gtkui.c
+plugins/gtkui/gtkui_deletefromdisk.c
 plugins/gtkui/interface.c
-plugins/gtkui/mainplaylist.c
-plugins/gtkui/plcommon.c
+plugins/gtkui/playlist/mainplaylist.c
+plugins/gtkui/playlist/plcommon.c
+plugins/gtkui/playlist/searchplaylist.c
+plugins/gtkui/plmenu.c
+plugins/gtkui/pltmenu.c
 plugins/gtkui/pluginconf.c
-plugins/gtkui/prefwin.c
+plugins/gtkui/prefwin/prefwin.c
+plugins/gtkui/prefwin/prefwinappearance.c
+plugins/gtkui/prefwin/prefwinmisc.c
+plugins/gtkui/prefwin/prefwinnetwork.c
+plugins/gtkui/prefwin/prefwinplayback.c
+plugins/gtkui/prefwin/prefwinplugins.c
+plugins/gtkui/prefwin/prefwinsound.c
 plugins/gtkui/progress.c
+plugins/gtkui/rg.c
 plugins/gtkui/search.c
+plugins/gtkui/selpropertieswidget.c
 plugins/gtkui/trkproperties.c
+plugins/gtkui/widgets.c
+plugins/hotkeys/actionhandlers.c
 plugins/notify/notify.c
-main.c
-playlist.c
-plugins.c
-deadbeef.desktop.in
-intl/plural.c
-plugins/gtkui/deadbeef.glade
-plugins/wildmidi/wildmidiplug.c
-translation/extra.c
-plugins/converter/convgui.c
-plugins/converter/interface.c
-plugins/converter/support.c
-plugins/gtkui/dspconfig.c
-plugins/gtkui/fileman.c
-plugins/converter/converter.glade
+plugins/pltbrowser/pltbrowser.c
 plugins/shellexecui/interface.c
+plugins/shellexecui/shellexec.glade
 plugins/shellexecui/shellexecui.c
 plugins/shellexecui/support.c
-plugins/shellexecui/shellexec.glade
-plugins/gtkui/actionhandlers.c
-plugins/gtkui/ctmapping.c
-plugins/gtkui/widgets.c
-plugins/gtkui/pltmenu.c
-plugins/pltbrowser/pltbrowser.c
+plugins/wildmidi/wildmidiplug.c
+src/tf.c
+translation/extra.c
+translation/plugins.c

deadbeef-0.6.2.tar.bz2/po/be.po -> deadbeef-1.9.6.tar.bz2/po/be.po Changed

@@ -1,2070 +1,2627 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Yauhen Bugamol <haxycgm@gmail.com>, 2013
-# Yauhen Bugamol <haxycgm@gmail.com>, 2013
+# Yauhen Bugamol, 2013
+# DeadMetaler <dead.666@bk.ru>, 2018-2020
+# Макс Крапіўка, 2018
+# Yauhen Bugamol, 2013
+# Źmicier Turok <nashtlumach@gmail.com>, 2017,2019-2020
+# Źmicier Turok <nashtlumach@gmail.com>, 2017
+# Zmicer Turok <zmicerturok@gmail.com>, 2017-2018
+# Zmicer Turok <zmicerturok@gmail.com >, 2017
+# Zmicer Turok <zmicerturok@gmail.com >, 201, 2017-2018
+# Źmicier Turok <nashtlumach@gmail.com>, 2017
 # Максім Тамковіч <quendimax@tut.by>, 2011
 # Максім Томкавіч <quendimax@tut.by>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Belarusian (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/be/)\n"
-"Language: be\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Максім Томкавіч <quendimax@tut.by>, 2011\n"
+"Language-Team: Belarusian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/be/)\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Пра праграму DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Выкарыстанне: deadbeef options -- file(s)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Змены ў DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Параметры:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Перакладчыкі DeaDBeeF"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ці -h Адлюстраваць даведку (гэты тэкст) і выйсці\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Захаваць перадусталёўкі эквалайзера DeaDBeeF"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Выйсці з плэера\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Файлы перадусталёвак DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Вывесці інфармацыю пра версію праграмы і выйсці\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Загрузіць перадусталёўкі эквалайзера DeaDBeeF..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Прайграць\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Перадусталёўкі эквалайзера DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Спыніць прайграванне\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Імпартаваць перадусталёўку эквалайзера Foobar2000..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Прыпыніць прайграванне\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Перадусталёўкі эквалайзера Foobar2000 (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Пераключыць паўзу\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Запісаць"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr "--play-pause Пачаць прайграванне, калі спынена, інакш пераключыць паўзу\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Загрузіць"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Наступная песня ў плэйлісце\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Імпартаваць перадусталёўку Foobar2000"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Папярэдняя песня ў плэйлісце\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Уключыць"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Выпадковая песня ў плэйлісце\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Абнуліць усё"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Дадаць файл(ы) у існы плэйліст\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Абнуліць перадузмацненне"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Абраць убудову інтэрфейсу, прадвызначана \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Абнуліць частоты"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Адлюстраваць адфарматаваную назву трэка\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Профілі"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr "FMT %%-сінтаксіс: %%a-выканаўца, %%t-назва, %%b-альбом,\n %%l-даўжыня, %%n-нумар трэка, %%y-год, %%c-каментар,\n %%r-аўтарскія правы, %%e-пройдзены час\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 дзень %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " Напрыклад: --nowplaying \"%%a - %%t\" выводзіць \"выканаўца - назва\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d дзён %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " для дадатковай інфармацыі глядзіце %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Стоп | %d трэкаў | %s агульны час"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " НАТАТКА: параметр --nowplaying састарэў.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Мона"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Вывесці на экран адфарматаваную назву трэка, выкарыстоўваючы новае фарматаванне загалоўка\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Стэрэа"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " Сінтаксіс FMT: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d кбіт/с "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " напрыклад: --nowplaying-tf \"%%artist%% - %%title%%\" выводзіць \"выканаўца - назва\"\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Паўза | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume ЛІК Вывад альбо прызначэнне ўзроўню гуку deadbeef.\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " Параметр ЛІК можа быць вызначаны ў адсотках (абсалютнае значэнне альбо павелічэнне ці памяншэнне)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " альбо ў Дб -50, 0 (калі з суфіксам).\n"
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Прыклады: --volume 80, --volume +10, --volume -5 альбо --volume -20Дб\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
 msgstr ""
-"%s%s %s| %dГц | %d біт | %s | %d:%02d / %s | %d трэкаў | %s агульны час"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Новы плэйліст"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:165
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Новы плэйліст (%d)"
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Плэйліст са ўстаўкамі"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Прадвызначана"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Плэйліст"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Мона"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Падзяляльнік (верху і нізу)"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Стэрэа"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Падзяляльнік (левага і правага)"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Так"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Укладкі плэйліста"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Не"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Каталог вываду:"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Паказваць вокладкі альбомаў"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Запісаць у каталог крыніцы трэка"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Захоўваць структуру каталогаў"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Капіяваць, калі фармат не змяняецца"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Перазапіс пазнак пасля капіявання"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Назва файла вываду:"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Пашырэнне (напрыклад, .mp3) дадасца аўтаматычна.\nПакіньце поле пустым для прадвызначанага значэння (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Кнопка"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Кадавальнік:"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Прадвызначаныя налады DSP:"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Колькасць струменяў:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Фармат выходнага сэмпла:"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:14
+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 "Пакінуць зыходны фармат\n8 bit signed int\n16 bit signed int\n24 bit signed int\n32 bit signed int\n32 bit float"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Не ўдалося прачытаць файл даведкі"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Калі файл існуе:"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Не ўдалося загрузіць файл даведкі"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Прамінуць\nПадказка\nПеразапісаць"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Рэдагаваць налады кадавальніка"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Назва:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Неназваны кадавальнік"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Пашырэнне файла вываду:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Напр. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Загадны радок:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"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/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Насамрэч жадаеце выйсці?"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - назва файла вываду\n%i - назва файла часовага ўводу"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Метад:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Канал\nЧасовы файл\nЗыходны файл"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Рэдактар пазнак"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Рэдактар налад DSP"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Назва"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Неназваны профіль налад DSP"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Дадаць"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Выдаліць"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Канфігурацыя"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Абярыце убудову DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Убудова"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Профілі"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Убудаваны %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Файл ужо існуе. Перазапісаць?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Папярэджанне канверсіі"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Абярыце кадавальнік"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Памылка канверсіі"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Канверсія..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Абраць каталог..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Не атрымалася захаваць налады кадавальніка"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Праверце правы доступу да каталога, паспрабуйце іншую назву, ці вызвальце месца на дыску"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Профіль з такой назвай ужо існуе. Паспрабуйце іншую назву."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Памылка"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Дадаць кадавальнік"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Рэдагаваць кадавальнік"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Выдаліць налады"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Налады будуць выдаленыя. Упэўненыя?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Увага"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Кадавальнікі"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Дадаць убудову ў ланцуг DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Не атрымалася захаваць налады DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Новыя прадвызначаныя налады DSP"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Рэдагаваць налады DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Прадвызначаныя налады DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Даведка"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Захоўваць фармат крыніцы"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8-біт цэлая"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16-біт цэлая"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 біт цэлая"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32- біт цэлая"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32-біт плыўная"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Прамінуць"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Спытаць"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Перазапісаць"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Канал"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Часовы файл"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Зыходны файл"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Не атрымалася знайсці файл выявы: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Адкрыць файл(ы)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Дадаць файл(ы) ў плэйліст..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Дадаць каталог(і) ў плэйліст..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Загрузіць плэйліст"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Захаваць плэйліст як"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Пра праграму DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Змены ў DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Перакладчыкі DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Тып змесціва"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Убудовы"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Хібнае(ыя) значэнне(і)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Палі тыпу змесціва і ўбудовы мусяць быць запоўненымі і адпавядаць правілам.\nПрыклад тыпу змесціва: 'audio/mpeg'.\nПрыклад ідэнтыфікатара ўбудовы 'stdmpg ffmpeg'.\nПрагалы мусяць быць выкарыстаныя ў якасці падзяляльнікаў спісаў убудоў і ідэнтыфікатараў.\nТып змесціва мусіць утрымліваць толькі літары, лічбы і '-' знак.\nІдэнтыфікатар убудовы можа ўтрымліваць толькі літары і лічбы."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Нічога не абрана."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Адкрыць файл(ы)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Дадаць файл(ы)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Дадаць каталог(і)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
-msgstr "Дадаць месцазнаходжанне"
+msgstr "Дадаць размяшчэнне"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Новы плэйліст"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
-msgstr "Прачытаць плэйліст"
+msgstr "Загрузіць плэйліст"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
-msgstr "Запісаць плэйліст"
+msgstr "Захаваць плэйліст"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Выйсцi"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Рэдагаваць"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Ачысціць"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
-msgstr "Вылучыць усё"
+msgstr "Абраць усё"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
-msgstr "Зняць вылучэнне"
+msgstr "Зняць"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
-msgstr "Інвертаваць вылучэнне"
+msgstr "Інвертаваць"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
-msgstr "Вылучэнне"
+msgstr "Абраць"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Сцерці"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
-msgstr "Пакінуць вылучанае"
+msgstr "Пакінуць"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Знайсці"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
-msgstr ""
+msgstr "Сартаваць па"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Назва"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Нумар трэка"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Альбом"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Выканаўца"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Дата"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Выпадкова"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
-msgstr "Карыстальніцкі"
+msgstr "Адвольна"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
-msgstr "Наладкі"
+msgstr "Налады"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Выгляд"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Радок стану"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Эквалайзер"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
-msgstr ""
+msgstr "Рэжым дызайну"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Журнал"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
-msgstr "Прай_граванне"
+msgstr "_Прайграванне"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Чарга"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Лінейная"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Перамяшаць трэкі"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Перамяшаць альбомы"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Паўтараць"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Паўтор плэйліста"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Паўтараць адзіны запіс"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Не паўтараць"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Перамяшаць"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Выключана"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Трэкі"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Альбомы"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Выпадковыя трэкі"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Паўтор"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Усе трэкі"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Адзін трэк"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Пракручваць плэйліст аўтаматычна"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
-msgstr "Вылучаць бягучы трэк"
+msgstr "Абіраць бягучы трэк"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Спыніць пасля бягучага трэка"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Спыніць пасля бягучага альбома"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
-msgstr "Перайсці на бягучы трэк"
+msgstr "Перайсці да бягучага трэка"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Даведка"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Змены"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Пра праграму"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Перакладчыкі"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Пошук"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
-msgstr "Стоп"
+msgstr "Спыніць"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Прайграць"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Паўза"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Папярэдняя"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Наступная"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Граць выпадкова"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Пра праграму"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Выйсці"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Даведка"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Уласцівасці трэка"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
-msgstr "Месцазнаходжанне"
+msgstr "Размяшчэнне:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
-msgstr "Настаўленні"
+msgstr "Налады"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Ужыць"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
-msgstr "_Замкнуць"
+msgstr "_Закрыць"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Метаданыя"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Уласцівасці"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Назва:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Скасаваць"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Добра"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Увядзіце назву новага слупка"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Тып:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Нумар"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Прайграецца"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Вокладка альбома"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Выканаўца - Альбом"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Працягласць"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Нумар трэка"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Гурт / Выканаўца альбома"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Фармат:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Выраўніванне:"
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Фармат сартавання:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(калі не пуста)"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Па леваму краю"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Па праваму краю"
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Выраўноўванне:"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Скасаваць"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Лева\nПрава\nЦэнтр"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_ОК"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Колер тэксту:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
-msgstr "Модуль вываду:"
+msgstr "Убудова вываду:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Прылада вываду:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Заўсёды канверсаваць 8-біт аўдыё ў 16-біт"
+msgstr "Заўсёды пераўтвараць аўдыё 8-біт ў 16-біт"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Заўсёды пераўтвараць аўдыё 16 біт ў 24 біта"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Мэтавая чашчыня дыскрэтызацыі:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Для кратных 48KHz (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Для кратных 44.1KHz (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "На падставе ўваходнай чашчыні дыскрэтызацыі"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Перавызначыць чашчыню дыскрэтызацыі"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Гук"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Рэжым аўтаўстаноўкі гучнасці:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Адключаны"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Рэжым крыніцы:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Трэк"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Па парадку прайгравання\nТрэк\nАльбом"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Выкарыстоўваць пікавае значэнне"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "У працэсе:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Нічога\nУжыць узмацненне\nУжыць узмацненне і прадухіліць абрэзку згодна піку\nТолькі прадухіліць абрэзку"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 дБ"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Перадузмацненне з рыплэйгейна:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Глабальнае перадузмацненне:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Перадузмацненне з данымі RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Перадузмацненне без даных RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "Перадузмацненне"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-"Дадаваць файлы з загаднага радка (ці файлавага кіраўніка) у гэты плэйліст:"
+msgstr "Дадаваць файлы з загаднага радка (ці файлавага кіраўніка) у гэты плэйліст:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Узнаўляць папярэдні сеанс пры запуску"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Не дадаваць з архіваў пры праглядзе каталога"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "Налада \"Спыніць пасля бягучага трэка\" будзе пераключацца пасля запісу пазнакі"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "Налада \"Спыніць пасля бягучага альбома\" будзе пераключацца пасля запісу пазнакі"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Прайграванне"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Канфігурацыя"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "Профіль ланцужкоў DSP"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
-msgstr "_Чытаць"
+msgstr "_Загрузіць"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Згортваць на прастору апавяшчэнняў падчас запуску"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
-msgstr "Згортваць у трэй замест закрыцця"
+msgstr "Згортваць на прастору апавяшчэнняў замест закрыцця"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
-msgstr "Не паказваць іконку у трэі"
+msgstr "Не паказваць значок на прасторы апавяшчэнняў"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "Для выдалення з дыска патрэбна выкарыстоўваць сметніцу"
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Уключыць японскае SHIFT-JIS выяўленне і запіс"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
+msgstr "Уключыць кітайскае СР936 выяўленне і запіс"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
-msgstr "Частата абнаўлення інтэрфейсу (разоў за сек.):"
+msgstr "Чашчыня абнаўлення інтэрфейсу (разоў на сек.):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Тэкст загалоўка пры прайграванні:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Тэкст загалоўка пры спыненні:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr "Плагін графічнага інтэрфейсу (змена патрабуе перазапуску):"
+msgstr "Убудова графічнага інтэрфейсу (змена патрабуе перазапуску):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Адлюстроўваць час прайгравання на панэлі стану"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr ""
+msgstr "Плэер"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Закрываць плэйліст сярэдняй кнопкай мышы"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Пераключыцца на наступную песню, калі прайграваемая на дадзены момант песня выдаліцца з дыска"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Аўтаматычна называць плэйліст, калі дадаецца адзін каталог"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Аўтаматычная змена памераў слупкоў па памеры акна"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Групавы інтэрвал:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "пікселяў"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Плэйліст"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
-msgstr ""
+msgstr "Інтэрфейс/Рознае"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Замяніць"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Пярэдні план"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Фон"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Асноўныя колеры"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Сярэдні"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Светлы"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Цёмны"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Грунтоўны"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Тэкст"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Колеры картак"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr ""
-"Замяніць (губляюцца настаўленні тэмы GTK, але павялічваецца хуткасць "
-"адлюстравання)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Цотны радок"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Няцотны радок"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Вылучаны радок"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Вылучаны тэкст"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Курсор"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Колеры плэйліста"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Колеры"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Лініі"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Фон (эквалайзер)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Перамотка/Гучнасць/Эквалайзер"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Асноўны:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Цёмны:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Светлы:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Сярэдні:"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Тэкст:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Тлусты"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Курсіў"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Тэкст пры прайграванні:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Абраны тэкст:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Рыска ўкладкі"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Звычайны(я) трэк(і):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Граючы(я) трэк(і):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Абраны(я) трэк(і):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Слупкі:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Загаловак групы:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Пярэдні план:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Цотны:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Няцотны:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Абранае:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Курсор:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Фон:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Override (губляецца GTK treeview тэматызацыя, але паскараецца адмалёўка)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Выгляд"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Уключыць проксі-сервер"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Адрас:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Порт:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Тып проксі:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Імя карыстальніка:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Пароль:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "Наладзіць адлюстраванне тыпу змесціва"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Сетка"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Гарачыя клавішы:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
-msgstr ""
+msgstr "Дзеянні:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
-msgstr ""
+msgstr "<Не прызначана>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
-msgstr ""
+msgstr "Спалучэнні клавіш:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr ""
+msgstr "Глабальныя спалучэнні клавіш"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "Націсніце на \"Ужыць\", каб захаваць змены,\nальбо \"Адрабіць\" каб адкінуць змены.\nЗмены не захаваюцца\nкалі не націснеце на \"Ужыць\"."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "_Прадвызначаныя"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
+msgstr "Гарачыя клавішы"
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Версія: "
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Аўтарскія правы"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Дадаткі"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Скінуць да прадвызначаных"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Версія: "
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Увесці свой загаловак"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
-msgstr ""
+msgstr "Згрупаваць па…"
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Фармат"
+msgstr "Сартаваць па…"
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Да павелічэння"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Да памяншэння"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Вылучце плагін DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Плагін"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Да павелічэння\nДа памяншэння"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
-msgstr "Настаўленні рэдактара тэгаў"
+msgstr "Налады рэдактара пазнак"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
-msgstr "Пісаць ID3v2"
+msgstr "Запісваць ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
-msgstr "Пісаць ID3v1"
+msgstr "Запісваць ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
-msgstr "Пісаць APEv2"
+msgstr "Запісваць APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Выразаць ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Выразаць ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Выразаць APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Версія ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (рэкамендавана)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Рэкамендавана)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "Знаказбор ID3v1 (прадвызначаны iso8859-1)"
+msgstr "ID3v1 (прадвызначаны iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
-msgstr "Пісать ID3v2.4"
+msgstr "Запісваць ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "Адлюстраванне тыпу змесціва"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr ""
+msgstr "Гэтая табліца вызначае адпаведнасці паміж тыпамі змесціва сеціўнага вяшчання і ўбудовамі дэкодэра DeaDBeeF. Напрыклад, mp3-файлы могуць мець тып змесціва \"audio/x-mpeg\", і мусяць быць расшыфраваныя уласнай \"stdmpg\" убудовай DeaDBeeF, альбо \"FFmpeg\" убудовай."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr ""
+msgstr "Тып змесціва:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
-msgstr "Дадаткі:"
+msgstr "Убудовы:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
-msgstr ""
+msgstr "Налады кнопкі"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
-msgstr ""
+msgstr "Колер:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
-msgstr ""
+msgstr "Значок :"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
-msgstr ""
+msgstr "Адмеціна:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
-msgstr ""
+msgstr "Абраць дзеянне"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "Гэты дыялог дазваляе даць адвольную назву любому трэку. Гэта асабліва карысна для радыёстанцый. Магчымасць даць адвольны загаловак таксама прысутнічае ў \"Дадаць размяшчэнне\" дыялогавага акна. Сама назва будзе бачная ў слупках, якія адлюстроўваюць поле метаданых \"Выканаўца\". Гэта павінна выглядаць так: \"адвольна выканаўца\", калі поле \"Выканаўца\" прысутнічае, ці проста \"адвольна\" у адваротным выпадку."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Выканаўца / Альбом"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Рэдагаваць"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Трэк №"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Рэдагаваць (лакальна)"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Дадаць новае поле..."
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Рэдагаваць значэнне"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Назва поля:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Значэнне поля:"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Дадаць слупок"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "Журнал DeaDBeeF"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Рэдагаваць слупок"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Ачысціць"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Прыбраць слупок"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Ход сканавання ReplayGain"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Бягучы файл:"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Групаваць па"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Стан"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Няма"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Скасаваць"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Выканаўца/Дата/Альбом"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Вынікі сканавання ReplayGain"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Адкрыць файл..."
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Абнавіць пазнакі файлаў"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Наставіць %s"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Прадвызначаная прылада аўдыё"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Даданне файлаў..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Ініцыялізацыя..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Дадзеныя для гэтага трэка былі зменены."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Захаваць прадвызначаныя налады эквалайзера DeaDBeeF"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Закрыць акно?"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Файлы налад эквалайзера DeaDBeeF (*.ddbeq)"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Некалькі велічынь "
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Загрузіць прадвызначаныя налады эквалайзера DeaDBeeF..."
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Ключ"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Прадвызначаныя налады эквалайзера DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Значэнне"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Імпартаваць прадвызначаныя налады эквалайзера Foobar2000..."
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr ""
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Прадвызначаныя налады эквалайзера Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Запісанне тэгаў..."
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Захаваць"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr ""
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Загрузіць"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Назва:"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Імпартаваць прадвызначаныя налады Foobar2000"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Назвы палёў не могуць пачынацца з : ці _"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Уключыць"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Немагчыма дадаць поле"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Абнуліць усё"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Поле з такой назвай ужо ёсць, паспрабуйце назваць інакш."
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Абнуліць перадузмацненне"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Дадаць поле"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Абнуліць чашчыні"
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Сцерці поле"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Новы плэйліст"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr ""
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Падтрымліваемыя фарматы гукаў"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Опцыі:\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Усе файлы(*)"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help ці -h Адлюстраваць даведку (гэты тэкст) і выйсці\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Фарматы плэйлістоў, якія падтрымліваюцца"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Усе файлы"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Выйсці з плэера\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Іншыя файлы (*)"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr ""
-" --version Адлюстраваць інфармацыю аб версіі праграмы і выйсці\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Файлы плэйлістоў DeaDBeeF (*.dbpl)"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Пачаць граць\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Выкарыстоўваць спасылку"
 
-#: ../main.c:96
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Спыніць прайграванне\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 дзень %d:%02d:%02d"
 
-#: ../main.c:97
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Прыпыніць прайграванне\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d дзён %d:%02d:%02d"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Пераключыць паўзу\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "агульны час прайгравання"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Прыпынена"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "бітаў"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "час прайгравання абранага"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Спынена"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
-" --play-pause Пачаць прайграванне, калі спынена, іначай пераключыць "
-"паўзу\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Змяніць назву плэйліста"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Настуная песня ў плэйлісце\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Выдаленне плэйліста"
 
-#: ../main.c:101
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Папярэдняя песня ў плэйлісце\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Сапраўды хочаце выдаліць плэйліст \"%s\"?"
 
-#: ../main.c:102
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Выпадковая песня ў плэлісце\n"
+msgid "New Playlist (%d)"
+msgstr "Новы плэйліст (%d)"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Дадаць файл(ы) у існуючы плэйліст\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Плэйліст з укладкамі"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Падзяляльнік (верху і нізу)"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Адлюстраваць адфарматыраваную назву трэка\n"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Падзяляльнік (левага і правага)"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-сінтаксіс: %%a-выканаўца, %%t-назва, %%b-"
-"альбом,\n"
-" %%l-даўжыня, %%n-нумар трэка, %%y-год, %%c-"
-"каментарый,\n"
-" %%r-аўтарскія правы, %%e-пройдзены час\n"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Укладкі"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr ""
-" Напрыклад: --nowplaying \"%%a - %%t\" павінна вывесці "
-"на экран \"artist - title\"\n"
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Укладкі плэйліста"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Налады выбару"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Паказваць вокладкі альбомаў"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Прадвызначана"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Спектр"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Так"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Не"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Кнопка"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Радок перамоткі"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Кіраванне прайграваннем"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Радок гучнасці"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Кіраванне каналамі Chiptune"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Праглядзець журнал"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
-"Левы\n"
-"Правы"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Не атрымалася прачытаць файл даведкі"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Не атрымалася загрузіць файл даведкі"
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Адключыць\n"
-"Трэк\n"
-"Альбом"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Плэер зараз працуе ў фоне. Калі вы выйдзеце, задачы будуць скасаваныя або спыненыя. Гэта можа прывесці да страты даных."
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Сапраўды жадаеце выйсці?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Ascending\n"
-"Descending"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Да павелічэння\n"
-"Да памяншэння"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"2.3 (Рэкамендавана)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, 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 "Do you really want to delete the selected file?%s"
 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Паказаць на Last.fm"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Выкарыстоўваць перадыскрэтызацыю з дапамогай ALSA"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Вызваляць прыстасаванне ў час спынення"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Упадабаны памер буферу"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Выдаліць"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Упадабаны памер перыяду"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Па леваму боку"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Уключыць скроблер"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Па праваму боку"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Не выкарыстоўваць інфармацыю аб бягучым трэку"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Па цэнтры"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Імя карыстальніка"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Пароль"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Адрас для скроблінга"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Файл прылады"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Абход хібы OSS4 samplerate"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Па парадку прайгравання"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Перыяд аднаўлення кэша (гадзіны)"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Трэк"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Атрымліваць з унутраных тэгаў"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Няма"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Атрымліваць з лакальнай тэчкі"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Ужыць узмацненне"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Ужыць узмацненне і прадухіліць абрэзку згодна піку"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Толькі прадухіліць абрэзку"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Файлавая маска для лакальных вокладак"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Атрымліваць з last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Атрымліваць з albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Маштабаваць выявы па даўжэйшым баку"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Выкарыстоўваць CDDB/FreeDB"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Да павелічэння"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Выкарытоўваць CD-Text замест CDDB"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Да памяншэння"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (напрыклад, 'freedb.org')"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (рэкамендавана)"
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Нумар парта CDDB (напрыклад, '888')"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Выкарыстоўваць пратакол CDDB замест HTTP"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Выканаўца / Альбом"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Уключыць падтрымку NRG вобразаў"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Трэк №"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Якасць перадысрэтызацыі (0..2, вышэй - лепш)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Працягласць"
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Нумар"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Максімальная даўжыня трэка (у хвілінах)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Прайграецца"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Вокладка альбома"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Выканаўца - Альбом"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Запытваць пацверджанне на выдаленне файлаў з жорсткага дыска"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Год"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Адчувальнасць рэгулятара гучнасці ў значку статусу"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Нумар трэка"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Карстальніцкі значок статусу"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Гурт / Выканаўца альбома"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Запускаць gtk_init з ключом --sync (рэжым адладкі)"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Кодэк"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Дадаваць раздзельнікі паміж пунктамі кантэкстнага меню плагінаў"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Бітрэйт"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Фармат загалоўка паведамлення"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Дадаць слупок"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Фармат зместу паведамлення"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Рэдагаваць слупок"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Паказваць вокладку альбома"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Прыбраць слупок"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Памер вокладкі альбома (пікс.)"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Прымацоўваць групы падчас пракруткі"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Сервер PulseAudio"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Групаваць па"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Частата дыскрэтызацыі"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Выканаўца/Дата/Альбом"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Адносны шлях табліцы пошуку"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Абсолютный путь таблицы поиска"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Пераставіць месцамі аўдыё байты"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Уключыць падтрымку HVSC Songlength DB"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Перазагрузіць метаданыя"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (from HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Бітаў на сэмпл (8 ці 16)"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Тыповая даўжыня трэка (сек.)"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Файл канфігурацыі для банка Timidity++"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Назва трэка"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Выканаўца"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Выдаліць плэйліст"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Усяго трэкаў"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Дадаць новы плэйліст"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Жанр"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Уключыць аўтасартаванне"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Кампазітар"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Нумар дыска"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Адкрыць файл..."
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Каментар"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Наладзіць %s"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Кодер / Продавец"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Вы змянілі налады гарачых клавіш, але не захавалі змены."
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Месцазнаходжанне"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Сапраўды захаваць і працягнуць?"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Нумар укладзенага трэка"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Прадвызначаная аўдыяпрылада"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Тып(ы) тэгаў"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Файлы дадаюцца..."
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Укладзены файл cue"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Ініцыялізацыя..."
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Кодэк"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Ход абнаўлення пазнак файлаў"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Канчаткі файлаў (праз ';')"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Назва"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Канверсаваць"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Узмацненне альбома"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Узмацненне трэка"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Пік альбома"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Пік трэка"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Паспяхова"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Файл не існуе"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Хібны файл"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Пошук (%list_total% вынікаў)"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Мэтавая частата дыскрэтызацыі"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Паказваць загалоўкі слупкоў"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr ""
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Значэнне"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Аўтаматычная частата дыскрэтызацыі (перакрывае Мэтавую)"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Даныя гэтага трэка былі змененыя."
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Закрыць акно?"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Множныя значэнні "
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Ключ"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Множныя значэнні"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Запіс пазнак..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Файл ужо існуе. Перапісаць?"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Назва поля"
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Папярэджанне канвертара"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Назва:"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Выберыце кадавальнік"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Назвы палёў не могуць пачынацца з : ці _"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Памылка кадавальніка"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Немагчыма дадаць поле"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Пераўтварэнне..."
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Поле з такой назвай ужо існуе, паспрабуйце назваць інакш."
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Вылучыць каталог..."
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Віджэт \"%s\" не знойдзены"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Не ўдалося запісаць профіль кадавальніка"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Замяніць на..."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
-msgstr ""
-"Праверце правы доступу каталога, паспрабуйце іншую назву, ці высвабадзіце "
-"месца на дыску"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Уставіць..."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "Профіль з такой назвай ужо існуе. Паспрабуйце іншую назву."
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Выразаць"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Памылка"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Капіяваць"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Дадаць кадавальнік"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Уставіць"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Рэдагаваць кадавальнік"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Бацькоўскі"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Сцерці профіль"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Множныя віджэты гэтага тыпу не падтрымліваюцца"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Гэта дзеянне выдаліць вылучаны профіль. Упэўнены?"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Прапарцыйны памер"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Кадавальнікі"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Заблакаваць вышыню верхняй панэлі"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Дадаць плагін у ланцуг DSP"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Заблакаваць шырыню левай панэлі"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Не ўдалося запісаць профіль DSP"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Заблакаваць вышыню ніжняй панэлі"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Новы профіль DSP"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Заблакаваць шырыню правай панэлі"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Рэдагаваць профіль DSP"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Змяніць назву ўкладкі"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Профілі DSP"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Выдаліць укладку"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Каталог вываду:"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Дадаць новую ўкладку"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Перамясціць укладку ўлева"
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Перамясціць укладку ўправа"
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Назва файла вываду:"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
-#, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
 msgstr ""
-"Канчатак файла (напр. mp3) будзе дададзены аўтаматычна.\n"
-"Пакіньце гэта поле пустым для прадвызначэння (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Кадавальнік:"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Профіль DSP:"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Колькасць нітак:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Фармат выходнага сэмпла:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Захоўваць фармат крыніцы"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8-біт знакавая цэлая"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16-біт знакавая цэлая"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24-біт знакавая цэлая"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32-біт знакавая цэлая"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32-біт плыўная"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Калі файл існуе:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Спытаць"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Перапісаць"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Рэдагаваць профіль кадавальніка"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Неназваны кадавальнік"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Канчатак файла вываду:"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Напр. mp3"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Загадны радок:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
-"Прыклад: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
-"%o - назва файла вываду\n"
-"%i - назва файла часовага ўводу"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Метад:"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Канвеер"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Часовы файл"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Пашырыць на 1 элемент"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Паменшыць на адзін элемент"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Аднастайны"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Пашырыць"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Запоўніць"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Рэдактар тэгаў"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Наладзіць кнопку"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Рэдактар профіляў DSP"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Неназваны профіль DSP"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Дадаць"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не ўдалося знайсці файл выявы: %s"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Галасы:"
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "(прыпынена)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "(спынена)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "(прайграецца)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Элементы"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Прагляд плэйліста"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr ""
-
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Рэдагаваць"
+msgstr "Адвольныя загады абалонкі"
 
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
-msgstr "Зачыніць"
+msgstr "Закрыць"
 
 #: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr "Рэдагаваць каманду"
+msgstr "Рэдагаваць загад"
 
 #: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr "Каманда:"
+msgstr "Загад:"
 
 #: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
@@ -2073,74 +2630,74 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
+msgstr "Адвольны загад абалонкі. Будзе выконвацца ў кантэксце абалонкі . Можа быць выкарыстаная назва фарматавання. прыклад: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
 #: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr ""
+msgstr "Адвольная назва, напрыклад \"My Shell Command\""
 
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Ідэнтыфікатар загаду, гэта павінна быць нешта кароткае, напрыклад, \"youtube_open\". Выраз мусіць быць непаўторным."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
-msgstr ""
+msgstr "Трэк"
 
 #: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
-msgstr ""
+msgstr "Працаваць з адным трэкам."
 
 #: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
-msgstr ""
+msgstr "Некалькі трэкаў"
 
 #: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
-msgstr ""
+msgstr "Працаваць з некалькімі трэкамі."
 
 #: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
-msgstr ""
+msgstr "Лакальна"
 
 #: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
-msgstr ""
+msgstr "Працаваць з лакальнымі файламі."
 
 #: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr ""
+msgstr "На адлегласці"
 
 #: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr ""
+msgstr "Працаваць з адлеглымі файламі"
 
 #: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Асноўныя (галоўнае меню)"
 
 #: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
-msgstr ""
+msgstr "Пункт мусіць з'явіцца ў галоўным меню"
 
 #: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
@@ -2148,223 +2705,1271 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
+msgstr "Калі вы хочаце дадаць загад у галоўнае меню, пераканайцеся, што назва ўтрымлівае шлях да меню накшталт гэтага :\"File/My Command\", дзе файл -гэта назва меню ў англійскай версіі."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr "Дадаць каманду"
-
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr ""
+msgstr "Дадаць загад"
 
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
+msgstr "Гэтае дзеянне выдаліць абраны загад абалонкі. Вы ўпэўненыя?"
 
 #: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr ""
+msgstr "Пацвердзіць выдаленне"
 
 #: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr ""
+msgstr "Ідэнтыфікатар мусіць быць запоўнены і непаўторны\n"
 
 #: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr ""
+msgstr "Загаловак мусіць быць запоўнены.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr ""
+msgstr "Загад абалонкі мусіць быць запоўнены\n"
 
 #: ../plugins/shellexecui/shellexecui.c:248
 #: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
+msgstr "Хібныя значэнні"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 у наладах убудовы."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "мона"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "стэрэа"
+
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Назва трэка"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Выканаўца"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Усяго трэкаў"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Жанр"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Кампазітар"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Нумар дыска"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Дыскаў агулам"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Каментар"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Кадавальнік/Вытворца"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Аўтарскія правы"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Размяшчэнне"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Нумар укладзенага трэка"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Тып(ы) пазнак"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Укладзены файл cue"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Усе файлы(*)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Адкрыць файл(ы)..."
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Пераважна выкарыстоўваць эмулятар Ken, а не Satoh (surround не будзе працаваць)"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Дадаць файл(ы) ў плэйліст..."
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Уключыць аб'ёмнае гучанне"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Дадаць папку(і) ў плэйліст..."
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Выкарыстоўваць перадыскрэтызацыю з дапамогай ALSA"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Пажаданы памер буферу"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Пажаданы памер перыяду"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Атрымліваць з унутраных пазнак"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Атрымліваць з лакальнага каталога"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Атрымліваць з Last.fm"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Атрымліваць з MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Атрымліваць з Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Калі няма даступных вокладак"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "пакінуць пустым"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "выкарыстоўваць прадвызначаную вокладку DeaDBeeF"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "паказваць адвольную выяву"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Шлях да адвольнай выявы"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "CD-дыскавод для загрузкі"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Дыскавод аўдыя-CD"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Файл"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Дадаць аўдыя-CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Выкарыстоўваць CD-Text замест CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Выкарыстоўваць пратакол CDDB"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Уключыць падтрымку вобразаў NRG"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Хуткасць дыскавода пры звычайным прайграванні"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Максімальна"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Выкарыстоўваць выпраўленне памылак cdparanoia падчас запісвання"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Пераўтварыць"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Аўтавызначэнне чашчыні дыскрэтызацыі з выходных прылад"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Прызначаць чашчыню дыскрэтызацыі непасрэдна"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Якасць/Алгарытм"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Якасць перадыскрэтызацыі"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Унутраны гук DUMB"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Нарошчванне гуку"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Толькі Укл/Выкл"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Цалкам"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8-бітны вывад"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Выкарыстоўваць усе падтрымліваемыя ffmpeg пашырэнні"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Канчаткі файлаў (праз ';')"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Не зважаць на памылкі загалоўкаў"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Не зважаць на памылкі струменяў, якія немагчыма разабраць"
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Максімальная даўжыня трэка (у хвілінах)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Працягласць заглушэння (у секундах)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Колькі разоў прайграваць цыклы (калі ёсць)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (для файлаў фармату SGC)"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Выдаліць інфармацыю ReplayGain"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Сканаваць абранае як альбом (па пазнаках)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Сканаваць абранае як адзін альбом"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Сканаванне ўзмацнення кожнага файла"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Сканаванне ўзмацнення кожнага файла, калі не выконвалася"
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Зняць"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Абраць усё"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Дадаць размяшчэнне"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Дадаць каталог(і)"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Дадаць файл(ы)"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Адкрыць файл(ы)"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Паказаць старонку дапамогі"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Рэжым цыклічнага паўтору"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Паўтор — выкл."
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Паўтор — адзін трэк"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Паўтор — усе"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Рэжым цыклічнага змешвання"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Змешванне — выпадковыя трэкі"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Змешванне — альбомы"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Змешванне — трэкі"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Змешванне — выкл."
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Пераключыць курсор на прайграванне"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Пракручваць плэйліст аўтаматычна"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Праглядзець"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Паказаць\\/Схаваць меню"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Паказаць/схаваць радок стану"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Пераключыць рэжым дызайну"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Адвольнае сартаванне"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Абрэзаць абранае"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Захаваць плэйліст"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Выдаліць бягучы плэйліст"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Выняць"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Паказаць\\/Схаваць эквалайзер"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Капіяваць"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Схаваць эквалайзер"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Уставіць"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Паказаць эквалайзер"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Паказаць\\/Схаваць акно плэера"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Схаваць акно плэера"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Паказаць акно плэера"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Пошук"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Паказаць\\/Схаваць акно журнала"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Пытацца дазволу пры выдаленні файлаў з дыска"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Адчувальнасць рэгулятара гучнасці на значку стану"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Адвольны значок стану"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Дадаваць падзяляльнікі паміж пунктамі кантэкстнага меню убудоў"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Выкарыстоўваць сімвалы юнікоду замест выяў для стану трэка"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Адлюстроўваць час прайгравання на панэлі стану"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Перайсці да"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Наступны плэйліст"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Сартаваць выпадкова"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Адвярнуць вылучэнне"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Ачысціць плэйліст"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Перамясціць"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Перамясціць трэк ніжэй"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Перамясціць трэк вышэй"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Пераключыць бязгучнасць"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Пераключыць паўзу"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Прайграць\\/Прыпыніць"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Матаць на 1 с уперад"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Матаць на 1 с назад"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Матаць на 5 с уперад"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Матаць на 5 с назад"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Матаць на 1% F уперад"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Матаць на 1% назад"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Матаць на 5% F уперад"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Матаць на 5% назад"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Павялічыць гучнасць"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Паменшыць гучнасць"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Спыніць пасля бягучага трэка"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Спыніць пасля бягучага альбома"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Уключыць скроблер"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Не выкарыстоўваць інфармацыю пра бягучы трэк"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Імя карыстальніка"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Пароль"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Адрас для скроблінга"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Аддаць перавагу поля Альбом Выканаўца над полем Выканаўца"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Адправіць ідэнтыфікатар MusicBrainz"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Дадаць трэкі карацей за 30 секунд (не рэкамендавана)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Левы мікс"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Правы мікс"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Прымусовы вывад 16 біт"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Рухавік"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Фармат загалоўка апавяшчэння"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Фармат змесціва апавяшчэння"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Паказваць вокладку альбома"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Памер вокладкі альбома (пікс.)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Файл прылады"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Падсвятленне бягучага плэйліста"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Прайграваць падвойнай пстрычкай"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Памер буфера (-1 - аптымальнае значэнне, абранае portaudio)"
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Кадаванне назвы прылады"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Вызначана ніжэй"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Адвольнае кадаванне назвы прылады"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio server (пакіньце пустым для прадвызначанага)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Прадвызначаная працягласць трэка (у хвілінах)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Чашчыня дыскрэтызацыі"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Мінаць карацейшыя за (секунд)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Наладзіць адвольныя загады"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Адносны шлях табліцы пошуку"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Абсалютны шлях табліцы пошуку"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Пераставіць аўдыябайты"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Уключыць падтрымку HVSC Songlength DB"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Поўны шлях да Songlengths.md5/.txt"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Бітаў на сэмпл"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Прадвызначаная даўжыня трэка (сек.)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Сінхранізацыя мона"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Уключыць вядзенне журнала "
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Перадузмацненне"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Файл канфігурацыі для банка Timidity++"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/bg.po -> deadbeef-1.9.6.tar.bz2/po/bg.po Changed

@@ -1,903 +1,1459 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Kiril Kirilov <cybercop_montana@abv.bg>, 2015-2019
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/bg/)\n"
-"Language: bg\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Kiril Kirilov <cybercop_montana@abv.bg>, 2015-2019\n"
+"Language-Team: Bulgarian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Относно DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Използвай : deadbeef options -- file(s)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s Списък с промени"
+msgid "Options:\n"
+msgstr "Опции:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Преводачи на DeaDBeeF"
-
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Запамети стойностите на Тонкоректора"
-
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Файлове със стойности на Тонкоректора (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Зареждане стойности на Тонкоректора..."
-
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Зададени стойности на Тонкоректора (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Внасяне на стойности за Тонкоректор: Foobar2000..."
-
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Стойности на Тонкоректора Foobar2000 (*.feq)"
-
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Запамети зададеното"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr "--help или -h Изписва помощ (това съобщение) и излиза\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Зареди зададено"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr "--quit Изход от Плейъра\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Внасяне на стойности Foobar2000"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr "--version Изписва информация за версията и излиза\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Активирай"
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr "--play Възпроизвеждане\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Анулирай всичко"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr "--stop Спиране\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Анулирай предусилвателя"
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr "--pause Паузиране\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Анулирай лентите"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr "--toggle-pause Превключване в\\от режим на пауза\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Предварително зададени"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr "--play-pause Започване на възпроизвеждане, ако е спряно или излизане от режим на пауза\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:144
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 ден %d:%02d:%02d"
+msgid " --next Next song in playlist\n"
+msgstr "--next Следващата песен в листа\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:145
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d дена %d:%02d:%02d"
+msgid " --prev Previous song in playlist\n"
+msgstr "--prev Предишната песен в листа\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:146
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Спрян | %d песни | %s времетраене"
+msgid " --random Random song in playlist\n"
+msgstr "--random Произволна песен от листа\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Моно"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr "--queue Прибавяне на файл(ове) в съществуващия лист\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Стерео"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr "  --gui PLUGIN Показва коя GUI приставка да използва, по подразбиране е \"GTK2\"\n"
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:149
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d кбвс"
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr "--nowplaying \"Формат\" Изписва Форматирано име\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Паузиран |"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr "Синтаксис на Формата (започва с %%): a-Изпълнител, t-Заглавие,\nb-Албум, l-Времетраене, n-Номер на песента,\ny-Година, c-Коментар, r-Авторски права, e-Изминали\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:153
 #, 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 времетраене"
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr "primer: ----nowplaying \"%% a - %%\" трябва да отпечата\"изпълнител-заглавие\"\n"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Нов Списък"
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr "за повече информация, вижте %s\n"
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:155
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Нов Списък (%d)"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "Бележка: --nowplaying е отхвърлено.\n"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr ""
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "По подразбиране"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Моно"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Стерео"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Да"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Не"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Резултатна директория:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Запиши в папката в която е песента"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Съхрани структурата на папката"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Копирайте, ако форматът не се променя"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Възстановяване на тага след копиране"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Име на изходния файл:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Кодиране:"
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP профил:"
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Брой на нишките:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Формат на резултатната честота:"
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Когато файла съществува:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Пропускане\nНов опит\nПрезапис"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Редактиране на профила за кодиране"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Заглавие:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Неименуван профил за кодиране"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Разширение на резултатния файл:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Пример: mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Команда:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Например: характерно \"- %o\"\nза файла източник \"%i\", за резултатния файл \"%o\", за стандартен източник \"-\""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "\"%o\" - име на резултатен файл\nиме на временния източник - \"%i\""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Метод:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "Записване на APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "Записване на ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "Записване на ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Създаване на етикети"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Редактор на DSP профили"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Заглавие"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Неозаглавен DSP профил"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Добави"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Премахване"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Настройване"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Избор на приставка за DSP (разпределение на цифровите сигнали)"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Приставка"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Предварително зададени"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Грешка при четене на помощен файл"
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Файлът вече съществува. Презаписване?"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Грешка при зареждане на помощен файл"
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Предупреждение за конвертирането"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Моля изберете кодиране"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Грешка при конвертиране"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Конвертиране..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Избор на директория..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Неуспех при записване за избраното кодиране"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Проверете правата за избраната папка, пробвайте да изберете друго име на файла или освободете място на диска."
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr ""
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Дублират се имената. Пробвайте да изберете друго име."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Грешка"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Добави ново кодиране"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Редактиране на кодирането"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Премахни зададеното"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Това ще премахне зададения профил. Сигурни ли сте?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Планове за кодиране"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Слагане на добавка в DSP канала"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Неуспех при запаметяване на DSP профила"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Нов DSP профил"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Редактирай DSP профила"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP профили"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Помощ"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Запази формата от източника"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8-битов подпис"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16-битов подпис"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24-битов подпис"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32-битов подпис"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32-битов (плаващ)"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Пропусни"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Подсказване"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Презаписване"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Поток"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Временен файл"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Изходен файл"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Не е открито Х-изображение: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Отваряне на файл(ове)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Добавяне на файл(ове) в списъка..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Добавяне на папка(и) в списъка..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Зареждане на списък"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Запазване на списъка като"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Относно DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s Списък с промени"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Преводачи на DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Съдържание-Тип"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Приставки"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Невалидна стойност(и)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Нищо не е избрано."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Отваряне на файл(ове)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Добави файл(ове)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Добави папка/и"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Добави местоположение"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Нов списък"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Зареждане на списък"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
-msgstr "Зпаметяване на списъка"
+msgstr "Запаметяване на списъка"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Изход от приложението"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Изчистване"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Маркиране на всички"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Демаркиране на всички"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Обръщане на избора"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
-msgstr "Подбиране"
-
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Премахване"
+msgstr "Селекция"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
-msgstr "Изрязване"
+msgstr "Групиране"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Търсене"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
-msgstr ""
+msgstr "Сортиране по"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Заглавие"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Номер на файла"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Албум"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Изпълнител"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Дата"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Произволно"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
-msgstr "Предпочитани"
+msgstr "Потребителски"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Предпочитания"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Изглед"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
-msgstr "Панел на състоянието"
+msgstr "Лента на състоянието"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Тонкоректор"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
-msgstr ""
+msgstr "Дизайнерски режим"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Лог"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Изпълнява се"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Подредба"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Линейно"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Разбъркване на песни"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Разбъркване на албуми"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Повтаряемост"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Разбъркано"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Изключено"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Записи"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Албуми"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Произволни записи"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Повторение"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Всички записи"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Един запис"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Превъртане следва изпълняването"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Курсора следва изпълняването"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Спри след текущата песен"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Спри след текущия албум"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Прескачане до текущата песен"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Отчет"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "От_носно"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "П_реводачи"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Търсене"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Спиране"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Пускане"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Паузиране"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Предишна"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Следваща"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Произволно изпълняване"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Относно"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Изход"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Помощ"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Свойства за Песента"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
-msgstr ""
+msgstr "Местоположение:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Настройки"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Прилагане"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Затваряне"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Метаданни"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Свойства"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Заглавие:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Отказ"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Да"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Име на нова колона:"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Вид:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Индекс на елемента"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Изпълнява се"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Обложка на албума"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Изпълнител - Албум"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Продължителност"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Номер на песента"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Група / Изпълнител на албума"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Формат на подреждане:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(ако не е празно)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Подравняване:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Ляво"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Дясно"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Отказ"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Ляво\nДясно\nЦентър"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_Да"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Цвят на текста:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Изходна приставка:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
-msgstr "Иходно устройство:"
+msgstr "Изходно устройство:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Винаги да се конвертира 8-битов звук в 16-битов"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Винаги преобразувай 16 битово аудио в 24 битово"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Целева честота на дискретизация:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "За кратни на 48KHz (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "За кратни на 44.1KHz (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Базирано на входната честота на дискретизация"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Замяна на честота на дискретизация"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Режим на усилване:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Деактивиране"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Изходен режим:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Име на файла"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "По ред на изпълнение\nПесен\nАлбум"
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Обработка:"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Скала за усилване на максимума"
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 дБ"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Режим на усилване:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Усилване за цялата система:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Предусилвател с RG информация:"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Предусилвател без RG информация:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
 msgstr ""
-"Добавяне на файлове с команда (или файлов мениджър) в този лист за "
-"изпълнение:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Добавяне на файлове с команда (или файлов мениджър) в този лист за изпълнение:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "При следващото стартиране, продължи предишната сесия"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Да не се добавят от архиви, когато се добавят папки"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "Опцията \"Спиране след текущия запис\" ще предизвика изключване след нейното стартиране"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "Опцията \"Спиране след текущия албум\" ще се изключи след задействането"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Възпроизвеждане"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Настройване"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "Запамети зададеното за DSP (Разпределение на цифровите сигнали)"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "Заре_ждане"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "Разпределение на цифровите сигнали (DSP)"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "При затваряне, минимизирай в панела"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Скрий иконата в таблата"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Опресняване (пъти в секунда):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Заглавен текст при изпълнение:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Заглавен текст при спиране:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Приставка за графичния вид (промяната изисква рестарт):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Показване на времето за изпълнение в лентата на състоянието"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr ""
+msgstr "Плеър"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Затвори списъка със средния бутон на мишката"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
-msgstr ""
-"Автоматично именуване на листа за изпълнение, когато е добавена само една "
-"папка"
+msgstr "Автоматично именуване на листа за изпълнение, когато е добавена само една папка"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Авто-оразмеряване на колоните по размера на прозореца"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Разстояние между групите:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "пиксели"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Списък"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
-msgstr ""
+msgstr "Интерфейс/Разни"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Презапис"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "На преден план"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "На фон"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Цвят на бутона за Превъртане/Усилване"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Среден"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Светъл"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Тъмен"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Основен"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Текст"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Цветове на разделната лента"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Презапис (увеличава се производителността, но се губи естетиката)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Четен ред"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Нечетен ред"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Маркираният ред"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Маркираният текст"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Курсор"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Цветове на листа"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Цветове"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Прегради"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Фон (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Ленти за търсене, сила на звука и EQ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Базов:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Тъмен:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Светъл:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Среден:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Текст:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Удебелен"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Наклонен"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Текст на изпълнявана песен:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Текст на избрана песен:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Лента на раздел"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Нормални песни:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Изпълнявана песен:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Избрани песни:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Колони:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Заглавие на група:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Преден план:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Събитие:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Всякакви:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Избрани:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Показалец:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Фон:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Форсиране (губи се дървовидния изглед в GTK облика, но се ускорява зареждането)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Външен вид"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Активиране на помощен сървър"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Адрес на помощния сървър:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Порт на помощния сървър:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Вид помощен сървър:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Потребителско име:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Парола:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "HTTP Потребителски агент:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "Редактиране на съдържание-Клавиатурна карта"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Присвоени бързи клавиши:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
-msgstr ""
+msgstr "Действие:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
-msgstr ""
+msgstr "<Not set>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
-msgstr ""
+msgstr "Клавишна комбинация:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr ""
+msgstr "Глобални клавиши"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -905,128 +1461,124 @@
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "По подразбиране"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
+msgstr "Бързи клавиши"
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Версия:"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Copyright"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Приставки"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Върни първоначалните настройки"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Версия:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "Адрес:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Задай заглавие поподразбиране"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
-msgstr ""
+msgstr "Групиране по ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Формат"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Възходящ"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Низходящ"
+msgstr "Сортиране по ..."
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Избор на приставка за DSP (разпределение на цифровите сигнали)"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Приставка"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Възходящо\nНизходящо"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Настройки на редактора на етикети"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Запиши ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Запиши ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Зпаиши APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Лента ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Лента ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Лента APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Версия на ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Препоръчителна)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Препоръчителна)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Транслиране на символите за ID3v1 (по подразбиране е iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Запиши ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1034,1331 +1586,2379 @@
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr "Съдържание-Тип:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr "Добавки:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr "Свойства на бутон"
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "Цвят:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "Икона:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr "Етикет:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr "Избор на действие"
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Редактиране"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Редактиране (на място)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Добавяне на ново поле"
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Редактиране на стойност"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Име на поле:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Стойност на поле:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "Лог на DeaDBeeF"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Изчистване"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Текущ файл:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Статус"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Отказ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Актуализиране на маркерите на файловете"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Запамети стойностите на Тонкоректора"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Файлове със стойности на Тонкоректора (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Зареждане стойности на Тонкоректора..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Зададени стойности на Тонкоректора (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Внасяне на стойности за Тонкоректор: Foobar2000..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Стойности на Тонкоректора Foobar2000 (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Запамети зададеното"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Зареди зададено"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Внасяне на стойности Foobar2000"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Активирай"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Анулирай всичко"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Анулирай предусилвателя"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Анулирай лентите"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Нов Списък"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Неподдържан звуков формат"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Всички файлове (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Други файлове (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF списък с файлове (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Следвайте символнитевръзки"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 ден %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d дена %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "общо време за изпълнение"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "На пауза"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "бит"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "избор на време за изпълнение"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Спряно"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Преименуване на списък"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Нов Списък (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Списък с раздели"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Сплитер (отгоре и отдолу)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Сплитер (отляво и отдясно)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Раздели"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Списък раздели"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Свойства на селекция"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Покажи обложката на албума"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Спектър"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Бутон"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Лента за търсене"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Контролери за изпълнение"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Лента с устройства"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "8 битов звук"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Преглед на лога"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Грешка при четене на помощен файл"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Грешка при зареждане на помощен файл"
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Плеъра все още изпълнява задачи във фонов режим. Ако го изключите сега, задачите ще бъдат спрени или прекъснати. Това може да доведе до загуба на данни."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Все още ли искате да излезете?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Артист/Албум"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Номер на Песента"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Изтриване"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Ляво"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Дясно"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Център"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "По ред на изпълнение"
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Име на файла"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Нищо"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Само предотврати изрязването"
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Възходящ"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Низходящ"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Препоръчителна)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Изпълнител/Албум"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Номер на Песен"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Време"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Индекс на елемента"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Изпълнява се"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Обложка на албума"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Изпълнител - Албум"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Година"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Номер на песента"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Група / Изпълнител на албума"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Кодек"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Скорост на предаване"
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
 msgid "Add column"
 msgstr "Добавяне на Колона"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
 msgid "Edit column"
 msgstr "Редактиране на Колона"
 
-#: ../plugins/gtkui/plcommon.c:1224
+#: ../plugins/gtkui/playlist/plcommon.c:869
 msgid "Remove column"
 msgstr "Премахване на Колона"
 
-#: ../plugins/gtkui/plcommon.c:1234
+#: ../plugins/gtkui/playlist/plcommon.c:884
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "Фиксиране на групите при превъртане"
 
-#: ../plugins/gtkui/plcommon.c:1239
+#: ../plugins/gtkui/playlist/plcommon.c:889
 msgid "Group by"
 msgstr "Групиране по"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Нищо"
-
-#: ../plugins/gtkui/plcommon.c:1250
+#: ../plugins/gtkui/playlist/plcommon.c:900
 msgid "Artist/Date/Album"
 msgstr "Изпълнител/Дата/Албум"
 
-#: ../plugins/gtkui/pluginconf.c:42
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Презареждане на метаданните"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Премахване на списък"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Добавяне на нов списък"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:47
 msgid "Open file..."
 msgstr "Отвори файл..."
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/gtkui/pluginconf.c:559
 #, c-format
 msgid "Configure %s"
 msgstr "Настройване на %s"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Аудио устройство по подразбиране"
-
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin/prefwin.c:140
 msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+msgstr "Вие променихте бързите клавиши, но не сте запазили промените."
 
-#: ../plugins/gtkui/prefwin.c:350
+#: ../plugins/gtkui/prefwin/prefwin.c:142
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "Наистина ли искате да излезете без да запазите промените?"
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Аудио устройство по подразбиране"
 
-#: ../plugins/gtkui/progress.c:56
+#: ../plugins/gtkui/progress.c:62
 msgid "Adding files..."
 msgstr "Добавяне на файлове..."
 
-#: ../plugins/gtkui/progress.c:89
+#: ../plugins/gtkui/progress.c:95
 msgid "Initializing..."
 msgstr "Разпознаване..."
 
-#: ../plugins/gtkui/trkproperties.c:168
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Обновяване на таговете на файловете"
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Име"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Успех"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Файла не е намерен"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Невалиден файл"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Търсене (%list_total% results)"
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Показване заглавията на колоните"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Стойност"
+
+#: ../plugins/gtkui/trkproperties.c:116
 msgid "You've modified data for this track."
 msgstr "Имате променяни данни за тази песен."
 
-#: ../plugins/gtkui/trkproperties.c:170
+#: ../plugins/gtkui/trkproperties.c:118
 msgid "Really close the window?"
 msgstr "Да се затвори ли прозореца?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
 msgid "Multiple values "
 msgstr "Множество стойности"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
+#: ../plugins/gtkui/trkproperties.c:455
 msgid "Key"
 msgstr "Ключ"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Стойност"
-
-#: ../plugins/gtkui/trkproperties.c:522
+#: ../plugins/gtkui/trkproperties.c:473
 msgid "Multiple values"
-msgstr ""
+msgstr "Множество стойности"
 
-#: ../plugins/gtkui/trkproperties.c:701
+#: ../plugins/gtkui/trkproperties.c:662
 msgid "Writing tags..."
 msgstr "Записване на етикетите..."
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Име на полето"
+
+#: ../plugins/gtkui/trkproperties.c:1213
 msgid "Name:"
 msgstr "Име:"
 
-#: ../plugins/gtkui/trkproperties.c:745
+#: ../plugins/gtkui/trkproperties.c:1226
 msgid "Field names must not start with : or _"
 msgstr "Имената на полетата не могат да започват с \":\" или \"_\""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
 msgid "Cannot add field"
 msgstr "Не може да бъде добавено поле"
 
-#: ../plugins/gtkui/trkproperties.c:784
+#: ../plugins/gtkui/trkproperties.c:1267
 msgid "Field with such name already exists, please try different name."
 msgstr "Вече съществува поле със същото име, моля пробвайте с друго!"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Добавяне на поле"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Премахване на поле"
-
-#: ../main.c:90
+#: ../plugins/gtkui/widgets.c:460
 #, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+msgid "Widget \"%s\" is not available"
+msgstr "Джаджа \"%s\" не е налична"
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Замяна с..."
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Вмъкване..."
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Отрязване"
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Копиране"
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Поставяне"
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Опции:\n"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Множество джаджи от този тип не се поддържат"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr "--help или -h Изписва помощ (това съобщение) и излиза\n"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Оразмеряване според прозореца"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr "--quit Изход от Плейъра\n"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Заключване височината на горния панел"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr "--version Изписва информация за версията и излиза\n"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Заключване ширината на левия панел"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr "--play Възпроизвеждане\n"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Заключване височината на долния панел"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr "--stop Спиране\n"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Заключване ширината на десния панел"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr "--pause Паузиране\n"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Преименуване на раздел"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr "--toggle-pause Превключване в\\от режим на пауза\n"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Премахване на раздел"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
-"--play-pause Започване на възпроизвеждане, ако е спряно или излизане от "
-"режим на пауза\n"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Добавяне на нов раздел"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr "--next Следващата песен в листа\n"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Преместване раздела наляво"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr "--prev Предишната песен в листа\n"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Преместване раздела надясно"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr "--random Произволна песен от листа\n"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr "--queue Прибавяне на файл(ове) в съществуващия лист\n"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr "--nowplaying \"Формат\" Изписва Форматирано име\n"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
+
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
+
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
 msgstr ""
-"Синтаксис на Формата (започва с %%): a-Изпълнител, t-Заглавие,\n"
-"b-Албум, l-Времетраене, n-Номер на песента,\n"
-"y-Година, c-Коментар, r-Авторски права, e-Изминали\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr "пр.: --nowplaying \"%%a - %%t\" ще изведе \"изпълнител - песен\"\n"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "По подразбиране"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Да"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Не"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
 msgstr ""
-"Ляво\n"
-"Дясно"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
-"Деактивиране\n"
-"Песен\n"
-"Албум"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
 msgstr ""
-"Възходящо\n"
-"Низходящо"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
 msgstr ""
-"2.3 (Препоръчителна)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 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"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Свързване към Last.fm"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Използване на ALSA ресемплинг"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Освободи устройство след спиране"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Предпочитан размер на буфера"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Предпочитана дължина на периода"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Активиране на помощен сървър"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Деактивиране на настоящо изпълнение"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Потребителско име:"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Парола:"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Разширяване на кутията с 1 елемент"
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Адрес на помощния сървър"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Свиване на кутията с 1 елемент"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Хомогенен"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Файл за устройство"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Разширяване"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Решение за OSS4 бъг"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Изпълване"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Период за обновяване на кеш (часове)"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Конфигуриране на бутон"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Извличане от вградените етикети"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Извличане от местна папка"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Маска за обложка от файл"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Извличане от last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Извличане от albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Оразмеряване на обложката към по-дългата страна"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Използвай CDDB/FreeDB"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Предпочита се CD-Text пред CDDB"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Гласове:"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB външен линк (пр: \"freedb.org\")"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB номер на порт (пр: \"888\")"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Предпочита се CDDB протокол пред HTTP"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Прилагане на поддръжка за NRG изображения"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Подобряване на качеството (от 0 до 2, по-голямото е по-добро)"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Най-голяма дължина на песен (в минути)"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Елементи"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Браузър на списъка"
+
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Потребителска шел команда"
+
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Затваряне"
+
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Редактиране на команда"
+
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Команда:"
+
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Искай потвърждение за изтриване на файлове от диска"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Чувствителност на контрола на звука от иконата"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Име по желание, например \"Моята шел команда\""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Друга икона"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "ID командата, обикновено е нещо кратко, например \"youtube_open\". Тя трябва да бъде уникална."
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Изпълни gtk_init с добавен -sync (режим на дебъгване)"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Една песен"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Добави разделители между елементите на контекстното меню на добавката"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Работи с една песен."
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Формат на заглавието в известието"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Множество песни"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Формат на съдържанието в известието"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Работи с множество песни."
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Показвай обложка на албума"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Локално"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Размер на обложката (пиксели)"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Работи с локални файлове"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Сървър на PulseAudio"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Отдалечен достъп"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Честота"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Работи с отдалечен достъп (напр. http:// streams)"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Относително положение на полето за превъртане"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Общи (Основно меню)"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Абсолютно положение на полето за превъртане"
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "Елементи, които да се виждат в основното меню"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Размени аудио частите (превключване ако всичко е статично)"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Активиране на HVSC Songlength база данни"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Добавяне на команда"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlenghts.txt (от HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Части за период (8 или 16)"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "Това действие ще изтрие избраните команди. Сигурен ли сте?"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Дължина на песен по подразбиране (секунди)"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Потвърди премахването"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ празен файл с настройки"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID трябва да не е празен и да не се дублира.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Заглавието не трябва да бъде празно.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "Шел командата не трябва да бъде празна.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Невалидна стойност"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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, в настройките на приставката!"
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "моно"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "стерео"
 
-#: ../translation/extra.c:70
+#: ../translation/extra.c:3
 msgid "Track Title"
 msgstr "Заглавие на песента"
 
-#: ../translation/extra.c:71
+#: ../translation/extra.c:4
 msgid "Performer"
 msgstr "Изпълнител"
 
-#: ../translation/extra.c:76
+#: ../translation/extra.c:9
 msgid "Total Tracks"
 msgstr "Всички песни"
 
-#: ../translation/extra.c:77
+#: ../translation/extra.c:10
 msgid "Genre"
 msgstr "Жанр"
 
-#: ../translation/extra.c:78
+#: ../translation/extra.c:11
 msgid "Composer"
 msgstr "Композитор"
 
-#: ../translation/extra.c:79
+#: ../translation/extra.c:12
 msgid "Disc Number"
 msgstr "Колекция"
 
-#: ../translation/extra.c:80
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Общо дискове"
+
+#: ../translation/extra.c:14
 msgid "Comment"
 msgstr "Коментар"
 
-#: ../translation/extra.c:81
+#: ../translation/extra.c:15
 msgid "Encoder / Vendor"
 msgstr "Кодировчик/Доставчик"
 
-#: ../translation/extra.c:83
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Авторски права"
+
+#: ../translation/extra.c:17
 msgid "Location"
 msgstr "Местоположение"
 
-#: ../translation/extra.c:84
+#: ../translation/extra.c:18
 msgid "Subtrack Index"
 msgstr "Индекс на подзаглавието"
 
-#: ../translation/extra.c:85
+#: ../translation/extra.c:19
 msgid "Tag Type(s)"
 msgstr "Тип(ове) Етикет(и)"
 
-#: ../translation/extra.c:86
+#: ../translation/extra.c:20
 msgid "Embedded Cuesheet"
 msgstr "Вградени фрази"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Кодек"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Разширение на файловете (разделяне с \";\")"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr ""
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Разреши съраунд"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Използване на ALSA ресемплинг"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Предпочитан размер на буфера"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Предпочитана дължина на периода"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
+
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Извличане от вградените етикети"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Извличане от местна папка"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Извличане от Last.fm"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Извличане от MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Извличане от Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Когато не е намерено изображение"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "остави празно"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "използвай стандартната обложка на DeaDBeeF"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "покажи изображение по подразбиране"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Път до изображението по подразбиране"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "CD устройство за зареждане"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Аудио CD устройство"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Файл"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Добавяне на аудио CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Предпочита се CD-Text пред CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Използвай CDDB протокол"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Прилагане на поддръжка за NRG изображения"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Скорост на устройството за нормално изпълнение"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Макс"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
 msgid "Convert"
 msgstr "Превръщане"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Честота на резултатния файл"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Задай честотата на дискретизация директно"
 
-#: ../translation/extra.c:94
+#: ../translation/plugins.c:105
+#, no-c-format
 msgid "Quality / Algorithm"
+msgstr "Качество / Алгоритъм"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
-"Автоматична честота (презаписва зададената честота на резултатния файл)"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Само Включване/Изключване"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Пълно"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Разширение на файловете (разделяне с \";\")"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Файлът вече съществува. Презипасване?"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Внимание при превръщане"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Най-голяма дължина на песен (в минути)"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Моля изберете кодиране"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Продължителност на заглъхване (секунди)"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Грешка при превръщане"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Повторение на изпълнението бр. пъти (ако е налично)"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Превръщане..."
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Избор на директория..."
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Неуспех при записване за избраното кодиране"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
-"Проверете правата за избраната папка, пробвайте да изберете друго име на "
-"файла или освободете място на диска."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "Дублират се имената. Пробвайте да изберете друго име."
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Грешка"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Добави ново кодиране"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Редактиране на кодирането"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Премахване на избора на всички"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Премахни зададеното"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Избиране на всички"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Това ще премахне зададения профил. Сигурни ли сте?"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Добавяне на местоположение"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Планове за кодиране"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Добавяне на папка(и)"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Слагане на добавка в DSP канала"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Добавяне на файл(ове)"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Неуспех при запаметяване на DSP профила"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Отваряне на файл(ове)"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Нов DSP профил"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Покажи помощната страница"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Редактирай DSP профила"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP профили"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Повторение - Изключено"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Резултатна директория:"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Повторение - една песен"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Повторение - Всички"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Цикличен режим на разбъркване"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Разбъркване - Случайни песни"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Разбъркване - Албуми"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Разбъркване - Песни"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Разбъркване - Изключено"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Име на резултатния файл:"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Преглед"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:206
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Show\\/Hide menu"
+msgstr "Показване\\/Скриване на менюто"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Показване\\/Скриване на лентата на състоянието"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Превключване в дизайнерски режим"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Потребителски избор"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
-"Разширението (пр: .mp3) ще бъде прикрепено автоматинчо.\n"
-"За използване на настройките по подразбиране оставете полето празно (%a - "
-"%t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Кодиране:"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP профил:"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Запазване на списъка"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Брой на нишките:"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Формат на резултатната честота:"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Запази формата от източника"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8-битов подпис"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16-битов подпис"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24-битов подпис"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32-битов подпис"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32-битов (плаващ)"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Когато файла съществува:"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Подсказване"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Презаписване"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Искай потвърждение за изтриване на файлове от диска"
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Редактиране на профила за кодиране"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Неименуван профил за кодиране"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Чувствителност на контрола на звука от иконата"
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Разширение на резултатния файл:"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Друга икона"
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Пример: mp3"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Команда:"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Добави разделители между елементите на контекстното меню на добавката"
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:258
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
-"Например: характерно \"- %o\"\n"
-"за файла източник \"%i\", за резултатния файл \"%o\", за стандартен източник "
-"\"-\""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:260
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Disable seekbar overlay text"
 msgstr ""
-"\"%o\" - име на резултатен файл\n"
-"име на временния източник - \"%i\""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Метод:"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Поток"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Временен файл"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "Записване на APEv2"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Прескочи до"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "Записване на ID3v1"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "Записване на ID3v2"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Създаване на етикети"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Редактор на DSP профили"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Неозаглавен DSP профил"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Добави"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не е открито Х-изображение: %s"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:307
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Активиране на помощен сървър"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Деактивиране на настоящо изпълнение"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Потребителско име:"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Парола:"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Адрес на помощния сървър"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Предпочитане на Албум Изпълнител пред Музикална област"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Формат на заглавието в известието"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Формат на съдържанието в известието"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Показвай обложка на албума"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Размер на обложката (пиксели)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Файл за устройство"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Честота"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Конфигуриране на потребителски команди"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Относително положение на полето за превъртане"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Абсолютно положение на полето за превъртане"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Размени аудио частите (превключване ако всичко е статично)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Активиране на HVSC Songlength база данни"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Дължина на песен по подразбиране (секунди)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ празен файл с настройки"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/bn.po -> deadbeef-1.9.6.tar.bz2/po/bn.po Changed

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Israt Jahan <israt@ankur.org.bd>, 2010
 # Ummey Salma Snigdha <snighda@ankur.org.bd>, 2010
@@ -9,2329 +9,3957 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Bengali (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/bn/)\n"
-"Language: bn\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Ummey Salma Snigdha <snighda@ankur.org.bd>, 2010\n"
+"Language-Team: Bengali (http://app.transifex.com/deadbeef-player/deadbeef-player/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr "DeaDBeeF %s সম্বন্ধে"
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "অপশন:\n"
+
+#: ../src/main.c:136
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --সহায়তা অথবা -h সহায়তা মুদ্রণ করুন (এই বার্তা) এবং প্রস্থান করুন\n"
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --বন্ধ করুন প্লেয়ার বন্ধ করুন\n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --সংস্করণ সংস্করণের তথ্য মুদ্রণ করে বন্ধ করুন\n"
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --চালান প্লেব্যাক শুরু করুন\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --বন্ধ করুন প্লেব্যাক বন্ধ করুন\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --বিরতি প্লেব্যাক বিরত রাখুন\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --পরবর্তী প্লেলিস্টে পরবর্তী গান\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --পূর্ববর্তী প্লেলিস্টে পূর্ববর্তী গান\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --এলোমেলো প্লেলিস্টে এলোমেলো গান\n"
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --সারি বিদ্যমান প্লেলিস্টে সবশেষে যোগ করা ফাইল\n"
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --FMT এখন চলছে স্ট্যান্ডআউটে বিন্যাসিত ট্র্যাক নাম মুদ্রণ করুন\n"
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "পূর্বনির্ধারিত"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "মোনো"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "স্টেরিও"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "হ্যাঁ"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "না"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "শিরোনাম:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "শিরোনাম"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "যোগ"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "অপসারণ"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "কনফিগার"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "সতর্কবানী"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "সহায়তা"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "pixmap ফাইল পায়নি: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeaDBeeF %s সম্বন্ধে"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s লগপরিবর্তন"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "প্লাগইন"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "ফাইল (_F)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "ফাইল খুলুন (_O)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "ফাইল যোগ করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "ফোল্ডার যোগ করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "অবস্থান যোগ করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "নতুন প্লেলিস্ট"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "প্লেলিস্ট লোড করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "প্লেলিস্ট সংরক্ষণ করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "প্রস্থান করুন (_Q)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "সম্পাদনা করুন (_Q)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "মুছে ফেলুন (_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "সব নির্বাচন করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "সব অনির্বাচিত করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "বিপরীতমুখী নির্বাচন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "নির্বাচন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "ছাঁটা"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "খুঁজুন (_F)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "অ্যালবাম"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "শিল্পী"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "এলোমেলো"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "স্বনির্ধারিত"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "পছন্দসমূহ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "প্রদর্শন করুন (_V)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "স্ট্যাটাস বার"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "ইকুয়ালাইজার"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "প্লেব্যাক (_P)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "স্ক্রল প্লেব্যাককে অনুসরণ করে"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "কার্সার প্লেব্যাককে অনুসরণ করে"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "সহায়তা (_H)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "লগপরিবর্তন (_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "সম্বন্ধে (_A)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "অনুসন্ধান করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "বন্ধ করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "চালান"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "বিরতি"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "পূর্ববর্তী"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "পরবর্তী"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "এলোমেলোভাবে চালান"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "সম্বন্ধে"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "প্রস্থান করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "ট্র্যাক বৈশিষ্ট্যাবলী"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "প্রয়োগ করুন (_A)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "বন্ধ করুন (_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "মেটাডাটা"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "বৈশিষ্ট্যাবলী"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "বাতিল (_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "ঠিক আছে (_O)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "নতুন কলাম শিরোনাম দিন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "টাইপ করুন:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "বিন্যাস:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "প্রান্তিককরণ:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "অাউটপুট প্লাগইন:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "অাউটপুট ডিভাইস:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "শব্দ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "ট্রে ছোট করতে বন্ধ করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr ""
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "উপেক্ষা করা"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "প্রক্সি সার্ভার সক্রিয় করুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "প্রক্সি সার্ভারের ঠিকানা:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "প্রক্সি সার্ভারের পোর্ট:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "প্রক্সির ধরণ:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "প্রক্সি ব্যবহারকাীর নাম:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "প্রক্সি পাসওয়ার্ড:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "নেটওয়ার্ক"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s লগপরিবর্তন"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:626
-#, c-format
-msgid "DeaDBeeF Translators"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "ID3v2 লিখুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "ID3v1 লিখুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "APEv2 লিখুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "ID3v2 অংশ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "ID3v1 অংশ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "APEv2 অংশ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "ID3v2 সংস্করণ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "২.৩ (সুপারিশকৃত)‌‌\n২.৪"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 অক্ষর এনকোড করছে (iso8859-1 পূর্বনির্ধারিত)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "ID3v2.4 লিখুন"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:141
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "পূর্বনির্ধারিত DeaDBeeF EQ সংরক্ষণ করুন"
 
-#: ../plugins/gtkui/eq.c:148
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "পূর্বনির্ধারিত DeaDBeeF EQ ফাইলসমূহ (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:187
+#: ../plugins/gtkui/eq.c:183
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "পূর্বনির্ধারিত DeaDBeeF EQ লোড করুন..."
 
-#: ../plugins/gtkui/eq.c:191
+#: ../plugins/gtkui/eq.c:187
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "পূর্বনির্ধারিত DeaDBeeF EQ (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:252
+#: ../plugins/gtkui/eq.c:224
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "পূর্বনির্ধারিত Foobar2000 EQ ইম্পোর্ট করুন..."
 
-#: ../plugins/gtkui/eq.c:256
+#: ../plugins/gtkui/eq.c:228
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "পূর্বনির্ধারিত Foobar2000 EQ (*.feq)"
 
-#: ../plugins/gtkui/eq.c:321
+#: ../plugins/gtkui/eq.c:269
 msgid "Save Preset"
 msgstr "পূর্বনির্ধারিত অংশ সংরক্ষণ করুন"
 
-#: ../plugins/gtkui/eq.c:329
+#: ../plugins/gtkui/eq.c:277
 msgid "Load Preset"
 msgstr "পূর্বনির্ধারিত অংশ লোড করুন"
 
-#: ../plugins/gtkui/eq.c:337
+#: ../plugins/gtkui/eq.c:285
 msgid "Import Foobar2000 Preset"
 msgstr "পূর্বনির্ধারিত Foobar2000 ইম্পোর্ট করুন"
 
-#: ../plugins/gtkui/eq.c:362
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
 msgid "Enable"
 msgstr "সক্রিয়"
 
-#: ../plugins/gtkui/eq.c:371
+#: ../plugins/gtkui/eq.c:320
 msgid "Zero All"
 msgstr "সবগুলো শূন্য"
 
-#: ../plugins/gtkui/eq.c:378
+#: ../plugins/gtkui/eq.c:327
 msgid "Zero Preamp"
 msgstr "শূন্য প্রিম্প"
 
-#: ../plugins/gtkui/eq.c:385
+#: ../plugins/gtkui/eq.c:334
 msgid "Zero Bands"
 msgstr "শূন্য ব্যান্ড"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "নতুন প্লেলিস্ট"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "প্রথম দিন %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d দিন %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:179
-#, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "বন্ধ | %d ট্র্যাকসমুহ | %s সর্বমোট যতটুকু সময় চালানো হয়েছে"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "মোনো"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "স্টেরিও"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "বিরত | "
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
-msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
 msgstr ""
-"%s%s %s| %dHz | %d বিট | %s | %d:%02d / %s | %d ট্র্যাকসমূহ | %s যতটুকু সময় "
-"চালানো হয়েছে"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "নতুন প্লেলিস্ট"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "নতুন প্লেলিস্ট (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:956
+#: ../plugins/gtkui/gtkui.c:1452
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:960
+#: ../plugins/gtkui/gtkui.c:1456
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
+#: ../plugins/gtkui/gtkui.c:1457
 msgid "Splitter (left and right)"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1460
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:1461
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
+#: ../plugins/gtkui/gtkui.c:1462
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
+#: ../plugins/gtkui/gtkui.c:1464
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:1465
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:1466
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
+#: ../plugins/gtkui/gtkui.c:1468
 msgid "Seekbar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:1469
 msgid "Playback controls"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:1470
 msgid "Volume bar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "সহায়িকা ফাইল পড়তে ব্যর্থ হয়েছে"
-
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "সহায়িকা ফাইল লোড করতে ব্যর্থ হয়েছে"
-
-#: ../plugins/gtkui/gtkui.c:1171
-msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "সতর্কবানী"
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "ফাইল (_F)"
-
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "ফাইল খুলুন (_O)"
-
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "ফাইল যোগ করুন"
-
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "ফোল্ডার যোগ করুন"
-
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "অবস্থান যোগ করুন"
-
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "নতুন প্লেলিস্ট"
-
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "প্লেলিস্ট লোড করুন"
-
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "প্লেলিস্ট সংরক্ষণ করুন"
-
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "প্রস্থান করুন (_Q)"
-
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "সম্পাদনা করুন (_Q)"
-
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "মুছে ফেলুন (_C)"
-
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "সব নির্বাচন করুন"
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "সব অনির্বাচিত করুন"
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "বিপরীতমুখী নির্বাচন"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "নির্বাচন"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "সহায়িকা ফাইল পড়তে ব্যর্থ হয়েছে"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "অপসারণ"
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "সহায়িকা ফাইল লোড করতে ব্যর্থ হয়েছে"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "ছাঁটা"
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "খুঁজুন (_F)"
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "শিরোনাম"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "অ্যালবাম"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "শিল্পী"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "এলোমেলো"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "স্বনির্ধারিত"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "পছন্দসমূহ"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "বাম"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "প্রদর্শন করুন (_V)"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "ডান"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "স্ট্যাটাস বার"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "ইকুয়ালাইজার"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "প্লেব্যাক (_P)"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "ক্রম"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "রৈখিক"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "ট্র্যাক"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "কোনটি না"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "পুনরাবৃত্তি হচ্ছে"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "স্ক্রল প্লেব্যাককে অনুসরণ করে"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "২.৩ (সুপারিশকৃত)"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "কার্সার প্লেব্যাককে অনুসরণ করে"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "২.৪"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "শিল্পী / অ্যালবাম"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "ট্র্যাক নং"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "স্থিতিকাল"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "সহায়তা (_H)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "চলছে"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "লগপরিবর্তন (_C)"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "অ্যালবাম শিল্প"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "শিল্পী - অ্যালবাম"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "সম্বন্ধে (_A)"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "ব্যান্ড / অ্যালবাম শিল্পী"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "অনুসন্ধান করুন"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "বন্ধ করুন"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "কলাম যোগ করুন"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "চালান"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "কলাম সম্পাদনা করুন"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "বিরতি"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "কলাম অপসারণ করুন"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "পূর্ববর্তী"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "পরবর্তী"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "যা অনুসারে গ্রুপ হবে"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "এলোমেলোভাবে চালান"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "শিল্পী/তারিখ/অ্যালবাম"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "সম্বন্ধে"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "প্রস্থান করুন"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "সহায়তা"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "ট্র্যাক বৈশিষ্ট্যাবলী"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "প্রয়োগ করুন (_A)"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "বন্ধ করুন (_C)"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "মেটাডাটা"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "বৈশিষ্ট্যাবলী"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "শিরোনাম:"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "নতুন কলাম শিরোনাম দিন"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "টাইপ করুন:"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "ফাইল খুলুন..."
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "চলছে"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "অ্যালবাম শিল্প"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "শিল্পী - অ্যালবাম"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "পূর্বনির্ধারিত অডিও ডিভাইস"
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "স্থিতিকাল"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "ফাইল যোগ করা হচ্ছে..."
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr ""
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "আরম্ভ করা হচ্ছে..."
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "ব্যান্ড / অ্যালবাম শিল্পী"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "বিন্যাস:"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "প্রান্তিককরণ:"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "বাম"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "ডান"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "বাতিল (_C)"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "ঠিক আছে (_O)"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "অাউটপুট প্লাগইন:"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "অাউটপুট ডিভাইস:"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "শব্দ"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "মান"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "পুনরায় চালানোর মোড:"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "আপনি এই ট্র্যাকে ডাটা পরিবর্তন করেছেন।"
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "নিষ্ক্রিয়"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "সত্যিই উইন্ডোটি বন্ধ করতে চান?"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "ট্র্যাক"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "পুনরায় চালনার সর্বোচ্চ মান"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "কী"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "কনফিগার"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "ট্রে ছোট করতে বন্ধ করুন"
-
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "উপেক্ষা করা"
-
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "পুরোভূমি"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "পটভূমি"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "সিকবার/ভলিউমবার এর রঙ"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "মধ্যবর্তী"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "হালকা"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "গাঢ়"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "ভিত্তি"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "টেক্সট"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "ট্যাবের অংশের রং"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "উপেক্ষা (GTK ট্রিভিউ থিমিং হারায়, কিন্তু পরিণত করার গতি বাড়ায়)"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "জোড় সংখ্যক সারি"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "বিজোড় সংখ্যক সারি"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "নির্বাচিত সারি"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "নির্বাচিত টেক্সট"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "কারসার"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "প্লেলিস্টের রং"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "প্রক্সি সার্ভার সক্রিয় করুন"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "প্রক্সি সার্ভারের ঠিকানা:"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "প্রক্সি সার্ভারের পোর্ট:"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "প্রক্সির ধরণ:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "প্রক্সি ব্যবহারকাীর নাম:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "প্রক্সি পাসওয়ার্ড:"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "নেটওয়ার্ক"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "প্লাগইন"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "ID3v2 লিখুন"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "ID3v1 লিখুন"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "APEv2 লিখুন"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "ID3v2 অংশ"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "ID3v1 অংশ"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "APEv2 অংশ"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "ID3v2 সংস্করণ"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "২.৩ (সুপারিশকৃত)"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "২.৪"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 অক্ষর এনকোড করছে (iso8859-1 পূর্বনির্ধারিত)"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "ID3v2.4 লিখুন"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "শিল্পী / অ্যালবাম"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "ট্র্যাক নং"
-
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "কলাম যোগ করুন"
-
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "কলাম সম্পাদনা করুন"
-
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "কলাম অপসারণ করুন"
-
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "যা অনুসারে গ্রুপ হবে"
-
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "কোনটি না"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "শিল্পী/তারিখ/অ্যালবাম"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "ফাইল খুলুন..."
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, c-format
-msgid "Configure %s"
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "পূর্বনির্ধারিত অডিও ডিভাইস"
-
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "ফাইল যোগ করা হচ্ছে..."
-
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "আরম্ভ করা হচ্ছে..."
-
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "আপনি এই ট্র্যাকে ডাটা পরিবর্তন করেছেন।"
-
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "সত্যিই উইন্ডোটি বন্ধ করতে চান?"
-
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../translation/extra.c:3
+msgid "Track Title"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "কী"
-
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "মান"
-
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../translation/extra.c:4
+msgid "Performer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../translation/extra.c:10
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
+#: ../translation/extra.c:11
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#: ../translation/extra.c:12
+msgid "Disc Number"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#: ../translation/extra.c:14
+msgid "Comment"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../translation/extra.c:16
+msgid "Copyright"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../translation/extra.c:17
+msgid "Location"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "অপশন:\n"
-
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --সহায়তা অথবা -h সহায়তা মুদ্রণ করুন (এই বার্তা) এবং প্রস্থান করুন\n"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --বন্ধ করুন প্লেয়ার বন্ধ করুন\n"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "ট্যাগের ধরণ"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --সংস্করণ সংস্করণের তথ্য মুদ্রণ করে বন্ধ করুন\n"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "সন্নিবেশিত তথ্যপৃষ্ঠা"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --চালান প্লেব্যাক শুরু করুন\n"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --বন্ধ করুন প্লেব্যাক বন্ধ করুন\n"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --বিরতি প্লেব্যাক বিরত রাখুন\n"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --পরবর্তী প্লেলিস্টে পরবর্তী গান\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --পূর্ববর্তী প্লেলিস্টে পূর্ববর্তী গান\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --এলোমেলো প্লেলিস্টে এলোমেলো গান\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --সারি বিদ্যমান প্লেলিস্টে সবশেষে যোগ করা ফাইল\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --FMT এখন চলছে স্ট্যান্ডআউটে বিন্যাসিত ট্র্যাক নাম মুদ্রণ করুন\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
-" e.g.: --এখন চলছে \"%%a - %%t\" মুদ্রণ হবে \"শিল্পী - "
-"শিরোনাম\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "পূর্বনির্ধারিত"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "হ্যাঁ"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "না"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
-"বাম\n"
-"ডান"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
-"নিষ্ক্রিয়\n"
-"ট্র্যাক\n"
-"অ্যালবাম"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
-"২.৩ (সুপারিশকৃত)‌‌\n"
-"২.৪"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 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"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "ট্যাগের ধরণ"
-
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "সন্নিবেশিত তথ্যপৃষ্ঠা"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
 msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:281
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:319
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:321
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "যোগ"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "pixmap ফাইল পায়নি: %s"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:377
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/ca.po -> deadbeef-1.9.6.tar.bz2/po/ca.po Changed

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # vctrflc <chatgren@gmail.com>, 2014
 # vctrflc <chatgren@gmail.com>, 2014
@@ -9,2316 +9,3957 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/ca/)\n"
-"Language: ca\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: vctrflc <chatgren@gmail.com>, 2014\n"
+"Language-Team: Catalan (http://app.transifex.com/deadbeef-player/deadbeef-player/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Sobre DeaDBeeF %s"
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr ""
+
+#: ../src/main.c:136
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr ""
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr ""
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr ""
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr ""
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr ""
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr ""
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr ""
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr ""
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr ""
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr ""
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr ""
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr ""
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Estèreo"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr ""
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Títol:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Títol"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Elimina"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Configs."
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Ajuda"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Sobre DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Registre de canvis de DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Traductors de DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Fitxer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Obre fitxer(s)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Afegeix fitxer(s)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Afegeix fitxer(s)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Afegeix localització"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Nova llista de reproducció"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Carrega la llista de reproducció"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Desa la llista de reproducció"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Surt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Edita"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Neteja"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Selecciona-ho tot"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Deselecciona-ho tot"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Inverteix la selecció"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Selecció"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Àlbum"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Artista"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Aleatori"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Personalització"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Preferències"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Vista"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Barra d'estat"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Equalitzador"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Reproducció"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_Registre de Canvis"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_Sobre"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Cerca"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Atura"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "En pausa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Següent"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Reproducció aleatòria"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "Sobre"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Surt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Propietats del tema"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Aplica"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Tanca"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadada"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Propietats"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Cancel·la"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Correcte"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Introduïu un nou títol de columna aquí"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Tipus:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Format:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Alineació:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Dispositiu de sortida"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "So"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr ""
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Registre de canvis de DeaDBeeF %s"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:626
-#, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Traductors de DeaDBeeF"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:141
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Desar la config. de l'EQ"
 
-#: ../plugins/gtkui/eq.c:148
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Fitxers de config. de l'EQ (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:187
+#: ../plugins/gtkui/eq.c:183
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Carrega els Preajustaments del DeaDBeeF EQ..."
 
-#: ../plugins/gtkui/eq.c:191
+#: ../plugins/gtkui/eq.c:187
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Preajustaments del DeaDBeeF EQ (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:252
+#: ../plugins/gtkui/eq.c:224
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Importa els Preajustaments Foobar2000 EQ..."
 
-#: ../plugins/gtkui/eq.c:256
+#: ../plugins/gtkui/eq.c:228
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Preajustaments Foobar2000 EQ (*.feq)"
 
-#: ../plugins/gtkui/eq.c:321
+#: ../plugins/gtkui/eq.c:269
 msgid "Save Preset"
 msgstr "Desa els preajustaments"
 
-#: ../plugins/gtkui/eq.c:329
+#: ../plugins/gtkui/eq.c:277
 msgid "Load Preset"
 msgstr "Carrega els preajustaments"
 
-#: ../plugins/gtkui/eq.c:337
+#: ../plugins/gtkui/eq.c:285
 msgid "Import Foobar2000 Preset"
 msgstr "Importa els preajustaments del Foobar2000"
 
-#: ../plugins/gtkui/eq.c:362
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
 msgid "Enable"
 msgstr "Activa"
 
-#: ../plugins/gtkui/eq.c:371
+#: ../plugins/gtkui/eq.c:320
 msgid "Zero All"
 msgstr "Tots nuls"
 
-#: ../plugins/gtkui/eq.c:378
+#: ../plugins/gtkui/eq.c:327
 msgid "Zero Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:385
+#: ../plugins/gtkui/eq.c:334
 msgid "Zero Bands"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Configs."
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Llista de Reproducció Nova"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dia %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dies %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:179
-#, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Aturat | %d pistes | %s temps total"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Estèreo"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "En pausa |"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
-msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistes | %s temps total"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Llista de Reproducció Nova"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Llista de Reproducció Nova (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:956
+#: ../plugins/gtkui/gtkui.c:1452
 msgid "Playlist with tabs"
 msgstr "Playlist amb pestanyes"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:960
+#: ../plugins/gtkui/gtkui.c:1456
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
+#: ../plugins/gtkui/gtkui.c:1457
 msgid "Splitter (left and right)"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1460
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:1461
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
+#: ../plugins/gtkui/gtkui.c:1462
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
+#: ../plugins/gtkui/gtkui.c:1464
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:1465
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:1466
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
+#: ../plugins/gtkui/gtkui.c:1468
 msgid "Seekbar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:1469
 msgid "Playback controls"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:1470
 msgid "Volume bar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:1471
 msgid "Chiptune voices"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
 msgid "Failed while reading help file"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1160
+#: ../plugins/gtkui/gtkui.c:1695
 msgid "Failed to load help file"
 msgstr "Error en la càrrega del fitxer d'ajuda"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
+#: ../plugins/gtkui/gtkui.c:1714
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Fitxer"
-
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Obre fitxer(s)"
-
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Afegeix fitxer(s)"
-
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Afegeix fitxer(s)"
-
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Afegeix localització"
-
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Nova llista de reproducció"
-
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Carrega la llista de reproducció"
-
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Desa la llista de reproducció"
-
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Surt"
-
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Edita"
-
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Neteja"
-
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Selecciona-ho tot"
-
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Deselecciona-ho tot"
-
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Inverteix la selecció"
-
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Selecció"
-
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Elimina"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Títol"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Àlbum"
-
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Artista"
-
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Aleatori"
-
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Personalització"
-
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Preferències"
-
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Vista"
-
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Barra d'estat"
-
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Equalitzador"
-
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_Reproducció"
-
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Ordre"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Ajuda"
-
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_Registre de Canvis"
-
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_Sobre"
-
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Cerca"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Esquerra"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Atura"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Dreta"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "En pausa"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Anterior"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Següent"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Reproducció aleatòria"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "Sobre"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Surt"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Ajuda"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Propietats del tema"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Aplica"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Tanca"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Metadada"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Propietats"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Títol:"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Introduïu un nou títol de columna aquí"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Tipus:"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1343
+#: ../plugins/gtkui/playlist/plcommon.c:73
 msgid "Item Index"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
 msgid "Playing"
 msgstr "Reproduint"
 
-#: ../plugins/gtkui/interface.c:1345
+#: ../plugins/gtkui/playlist/plcommon.c:75
 msgid "Album Art"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1346
+#: ../plugins/gtkui/playlist/plcommon.c:76
 msgid "Artist - Album"
 msgstr "Artista - Àlbum"
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
 msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
 msgid "Band / Album Artist"
 msgstr "Banda / Àlbum Artista"
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Format:"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Alineació:"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Esquerra"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Dreta"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Cancel·la"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_Correcte"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Dispositiu de sortida"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "So"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Afegint fitxers..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
-msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Afegint fitxers..."
-
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 ""
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../translation/extra.c:3
+msgid "Track Title"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../translation/extra.c:4
+msgid "Performer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#: ../translation/extra.c:10
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
+#: ../translation/extra.c:11
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#: ../translation/extra.c:12
+msgid "Disc Number"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../translation/extra.c:14
+msgid "Comment"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
+#: ../translation/extra.c:16
+msgid "Copyright"
 msgstr ""
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
+#: ../translation/extra.c:17
+msgid "Location"
 msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
 msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
 msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
 msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
 msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
 msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
 msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
 msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
 msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
 msgstr ""
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
 msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 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"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
 msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
 msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
 msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:281
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:319
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:321
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
 msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:377
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/cs.po -> deadbeef-1.9.6.tar.bz2/po/cs.po Changed

@@ -1,906 +1,1461 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Joe Bliss <pcpepik0@gmail.com>, 2013
+# Joe Bliss <pcpepik0@gmail.com>, 2013,2016,2020
 # Joe Bliss <pcpepik0@gmail.com>, 2013
 # Vašek Kovářík <l3d9z6@seznam.cz>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/cs/)\n"
-"Language: cs\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Joe Bliss <pcpepik0@gmail.com>, 2013,2016,2020\n"
+"Language-Team: Czech (http://app.transifex.com/deadbeef-player/deadbeef-player/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "O aplikaci DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Použití: deadbeef volby -- soubor(y)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s ChangeLog"
+msgid "Options:\n"
+msgstr "Volby:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF přeložili"
+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"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Uložit předvolbu ekvalizéru DeaDBeeF"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Ukončit přehrávač\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Soubory předvoleb ekvalizéru DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Zobrazit verzi a ukončit\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Načíst předvolby ekvalizéru DeaDBeeF..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Zahájit přehrávání\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Předvolby ekvalizéru DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Zastavit přehrávání\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importovat předvolby ekvalizéru Foobar2000..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pozastavit přehrávání\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Předvolby ekvalizéru Foobar2000 (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Přepnout pozastavení\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Uložit předvolbu"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Zahájit přehrávání pokud je zastaveno, jinak přepnout pozastavení\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Načíst předvolbu"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Další skladba z playlistu\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importovat předvolby Foobar2000"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Předchozí skladba z playlistu\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Povolit"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Náhodná skladba z playlistu\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Vynulovat vše"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Připojit soubor(y) do existujícího playlistu\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Vynulovat předzesilovač"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr "--gui PLUGIN Určí, který zásuvný modul GUI bude použit, výchozí je \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Vynulovat pásma"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Zapsat zformátovaný název stopy do stdout\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Předvolby"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 den %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d dní %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "více info viz. %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Zastaveno | %d skladeb | %s celkový čas přehrávání"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "Pozn.: --nowplaying se již nepoužívá.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Zapsat zformátovaný název stopy do stdout, s použitím nového formátování názvu\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr "příklad: --nowplaying-tf \"%%artist%% - %%title%%\" should print \"artist - title\"\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Zastaveno | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d skladeb | %s celkový čas "
-"přehrávání"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nový playlist"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Nový playlist (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Playlist se záložkami"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Playlist"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Rozdělovač (nahoře a dole)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Rozdělovač (vlevo a vpravo)"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Výchozí"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Záložky playlistu"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Vlastnosti výběru"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Zobrazit obal alba"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Ano"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Křivka"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Ne"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Spektrální analyzér"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Výstupní adresář:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Zapsat do zdrojové složky skladby"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Zachovat strukturu adresáře"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Tlačítko"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Přeznačkovat po zkopírování"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Název výstupního souboru:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Přípona (např. .mp3) bude připojena automaticky.\nPonechte pole prázdné pro výchozí (%tracknumber%. %artist% - %title%)."
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Enkodér:"
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Předvolba DSP:"
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Počet vláken:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Výstupní formát vzorku:"
+
+#: ../plugins/converter/converter.glade.h:14
+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\n8 bit podepsaný int\n16 bit podepsaný int\n24 bit podepsaný int\n32 bit podepsaný int\n32 bit plovoucí"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Pokud soubor existuje:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Upravit předvolbu enkodéru"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Název:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Enkodér bez názvu"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Přípona výstupního souboru:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Např. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Příkazový řádek:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-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/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metoda:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Zápis značek"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Editor předvolby DSP"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Název"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Předvolba DSP bez názvu"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Přidat"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Odstranit"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Nastavit"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Vybrat zásuvný modul DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Zásuvný modul"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Předvolby"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Chyba při čtení souboru nápovědy"
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Soubor již existuje. Přepsat?"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Selhalo načtení souboru nápovědy"
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Varování konvertoru"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Vyberte enkodér"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Chyba konvertoru"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Převádí se..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Vybrat adresář..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Selhalo ukládání předvolby enkodéru"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"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/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Stále chcete odejít?"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+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/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Chyba"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Přidat nový enkodér"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Upravit enkodér"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Odstranit předvolbu"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Tato akce odstraní vybranou předvolbu. Pokračovat?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Upozornění"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Enkodéry"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Přidat zásuvný modul do řetězce DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Selhalo ukládání předvolby DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Nová předvolba DSP"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Upravit předvolbu DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Předvolby DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Nápověda"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Zachovat zdrojový formát"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit podepsaný int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit podepsaný int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit podepsaný int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit podepsaný int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit plovoucí"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Přeskočit"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Prompt"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Přepsat"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Roura"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nelze najít pixmap soubor: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Otevřít soubor(y)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Přidat soubor(y) do playlistu..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Přidat složku(y) do playlistu..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Načíst playlist"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Uložit playlist jako"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "O aplikaci DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Přehled změn pro DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF přeložili"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Typ-Obsahu"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Zásuvné moduly"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Neplatná hodnota(y)"
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Pole Typ-obsahu a Zásuvné moduly nesmí zůstat prázdné a musí vyhovovat pravidlům.\nPříklad typu-obsahu: 'audio/mpeg'.\nPříklad id zásuvného modulu: 'stdmpg ffmpeg'.\nMezery slouží jako oddělovače jednotlivých id zásuvných modulů.\nTyp obsahu by se měl skládat pouze z písmen, číslic a znaku \"-\".\nId zásuvných modulů může obsahovat pouze písmena a číslice."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Není nic vybráno."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Soubor"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Otevřít soubor(y)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Přidat soubor(y)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Přidat složku(y)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Přidat umístění"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Nový playlist"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Načíst playlist"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Uložit playlist"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
-msgstr "_Zavřít"
+msgstr "_Ukončit"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Smazat"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Vybrat vše"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Zrušit výběr"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Invertovat výběr"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Výběr"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Odstranit"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Ořez"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Hledat"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
-msgstr "Třídit dle"
-
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Název"
+msgstr "Řadit dle"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Číslo stopy"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Umělec"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Náhodně"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Vlastní"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Stavový řádek"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Ekvalizér"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Režim návrhu"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Přehrát"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Pořadí"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Lineárně"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Promísit skladby"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Náhodná alba"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Náhodně"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Vypnuto"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Stopy"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Alba"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Náhodné stopy"
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
 msgstr "Opakování"
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Opakovat vše"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Opakovat jednotlivou skladbu"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Neopakovat"
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Všechny stopy"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Jedna stopa"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Posunovat s přehráváním"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Sledovat kurzorem přehrávání"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Zastavit po aktuální stopě"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Zastavit po aktuálním albu"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Přeskočit na aktuální stopu"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
-msgstr "_ChangeLog"
+msgstr "Přehled _změn"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_O aplikaci"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Přeložili"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Hledat"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Zastavit"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Přehrát"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
-msgstr "Pauza"
+msgstr "Pozastavit"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Následující"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Přehrát náhodně"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Info"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Konec"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Nápověda"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
-msgstr "Vlastnosti skladby"
+msgstr "Vlastnosti stopy"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Umístění:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Použít"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Název:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Zrušit"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Zde vložit nový název sloupce"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Rejstřík"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Přehrávání"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Obal alba"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Umělec - Album"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Trvání"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Číslo stopy"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Skupina / Skladatel"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Formát:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Formát řazení:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(není-li prázdný)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Zarovnání:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Vlevo"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Vpravo"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Zrušit"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Barva textu:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Výstupní zásuvné moduly:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Výstupní zařízení:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 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:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Vždy převést 16 bit audio na 24 bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Cílová vzorkovací frekvence:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Pro násobky 48KHz (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Pro násobky 44.1KHz (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Založeno na vstupní vzorkovací frekvenci"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Režim replaygain:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Zakázat"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Režim zdroje:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Skladba"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Dle pořadí přehrávání\nStopa\nAlbum"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Měřítko vrcholu replaygain"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Zpracování:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Žádné\nPoužít zesílení\nPoužít zesílení a zabránit clippingu v závislosti na vrcholu\nPouze zabránit clippingu"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Předzesilovač replaygain:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Globální předzesilovač (preamp):"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Předzesílení s RG informacemi:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Předzesílení bez RG informací:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 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:"
+msgstr "Přidat soubory z příkazové řádky (nebo souborového manažeru) do tohoto playlistu:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Při startu obnovit předchozí sezení"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Ignorovat archivy během přidávání adresářů"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "Volba \"Zastavit po aktuální stopě\" se po provedení deaktivuje"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "Volba \"Zastavit po aktuálním albu\" se po provedení deaktivuje"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Přehrát"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Nastavit"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "Předvolba DSP"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Načíst"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Zavřít do traye"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Skrýt ikonu v trayi"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Povolit detekci a záznam ruského CP1251"
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Povolit detekci a záznam japonského SHIFT-JIS"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Povolit detekci a záznam čínského CP936"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Četnost obnovení rozhraní (za vteřinu):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Titulní text během přehrávání:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Titulní text během zastavení:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Zásuvný modul GUI (změny vyžadují restart):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr "Přehrávač"
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Zavírat playlisty prostředním tlačítkem myši"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Přepnout na následující skladbu pokud je aktuálně přehrávaná odstraněna z disku"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Automaticky pojmenovat přidaný adresář"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "GUI/Různé"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Předefinovat"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Popředí"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Pozadí"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Barvy průběhu hledání/hlasitosti"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Střední"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Světlé"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Tmavé"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Základní"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Text"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Barvy lišty záložek"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-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:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Sudý řádek"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Lichý řádek"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Vybraný řádek"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Vybraný text"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Kurzor"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Barvy playlistu"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Barvy"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Lišta karet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Přehrávaná stopa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Vybraná stopa(y):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Sloupce:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Popředí:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Pozadí:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Vzhled"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Povolit server Proxy"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Adresa Proxy serveru:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Port Proxy serveru:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Typ Proxy:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Uživatelské jméno Proxy:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Heslo Proxy:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "Upravit mapování Typu-Obsahu"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Síť"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Přiřazené klávesové zkratky:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Nenastaveno>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Globální klávesová zkratka"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -908,1160 +1463,1142 @@
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "_Výchozí hodnoty"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Klávesové zkratky"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Verze: "
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Copyright"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Zásuvné moduly"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Obnovit výchozí"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Verze: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Seskupit dle ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr "Třídit dle ..."
-
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Formát"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Vzestupně"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Sestupně"
+msgstr "Řadit dle ..."
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Vybrat zásuvný modul DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Zásuvný modul"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Vzestupně\nSestupně"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
-msgstr "Nastavení autora popisku"
+msgstr "Nastavení zápisu značek"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Zapsat ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Zapsat ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Zapsat APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Odstranit ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Odstranit ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Odstranit APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Verze ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Doporučeno)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Doporučeno)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Kódování znaků ID3v1 (výchozí je iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Zapsat ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "Mapování Typu-Obsahu"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"Tato tabulka definuje vazby mezi jednotlivými typy obsahu síťových streamů a "
-"dekódovacích zásuvných modulů DeaDBeeF. Například, soubory mp3 mohou mít typ "
-"obsahu \"audio/x-mpeg\" a vyžadovat dekódování DeaDBeeF zásuvným modulem "
-"\"stdmpg\" nebo \"ffmpeg\"."
+msgstr "Tato tabulka definuje vazby mezi jednotlivými typy obsahu síťových streamů a dekódovacích zásuvných modulů DeaDBeeF. Například, soubory mp3 mohou mít typ obsahu \"audio/x-mpeg\" a vyžadovat dekódování DeaDBeeF zásuvným modulem \"stdmpg\" nebo \"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Obnovit výchozí"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "Typ-Obsahu:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Zásuvné moduly:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
-msgstr ""
+msgstr "Ikona:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Umělec / Album"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Upravit"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Skladba č."
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Přidat sloupec"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Upravit sloupec"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Odstranit sloupec"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Průběh skenování ReplayGain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Seskupit dle"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Žádné"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Umělec/Datum/Album"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Výsledky skenování ReplayGain"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Otevřít soubor..."
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Aktualizovat značky souboru"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Nastavit %s"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Výchozí audio zařízení"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Přidávají se soubory..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Inicializuje se..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Byla změněna data této skladby."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Uložit předvolbu ekvalizéru DeaDBeeF"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Opravdu zavřít okno?"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Soubory předvoleb ekvalizéru DeaDBeeF (*.ddbeq)"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Vícenásobné hodnoty "
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Načíst předvolby ekvalizéru DeaDBeeF..."
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Klávesa"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Předvolby ekvalizéru DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Hodnota"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importovat předvolby ekvalizéru Foobar2000..."
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Vícenásobné hodnoty "
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Předvolby ekvalizéru Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Zapisují se tagy..."
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Uložit předvolbu"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Název pole"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Načíst předvolbu"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Jméno:"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importovat předvolby Foobar2000"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Název pole nesmí začínat : nebo _"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Povolit"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Nelze přidat pole"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Vynulovat vše"
 
-#: ../plugins/gtkui/trkproperties.c:784
-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/eq.c:327
+msgid "Zero Preamp"
+msgstr "Vynulovat předzesilovač"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Přidat pole"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Odstranit pole"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Vynulovat pásma"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Použití: deadbeef volby -- soubor(y)\n"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nový playlist"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Volby:\n"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Podporované zvukové formáty"
 
-#: ../main.c:92
-#, 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"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Všechny soubory (*)"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Zavřít přehrávač\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Podporované formáty playlistů"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Zobrazit verzi a ukončit\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Zahájit přehrávání\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Ostatní soubory (*)"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Zastavit přehrávání\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Soubory playlistů DeaDBeeF (*.dbpl)"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pauza přehrávání\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Následovat symlinky"
 
-#: ../main.c:98
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Přepnout pauzu\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 den %d:%02d:%02d"
 
-#: ../main.c:99
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, 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"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dní %d:%02d:%02d"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Další skladba z playlistu\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "celkový čas přehrávání"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Pozastaveno"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "čas přehrávání výběru"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Zastaveno"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Předchozí skladba z playlistu\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Přejmenovat playlist"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Náhodná skladba z playlistu\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Odstraňování playlistu"
 
-#: ../main.c:103
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Připojit soubor(y) do existujícího playlistu\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Opravdu odstranit playlist '%s'?"
 
-#: ../main.c:104
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgid "New Playlist (%d)"
+msgstr "Nový playlist (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Playlist s pásem karet"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Rozdělovač (nahoře a dole)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Rozdělovač (vlevo a vpravo)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Karty"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Karty playlistu"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Vlastnosti výběru"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Zobrazit obal alba"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
-"--gui PLUGIN Určí, který zásuvný modul GUI bude použit, výchozí je \"GTK2\"\n"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Zapsat zformátovaný název skladby do stdout\n"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektrum"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Tlačítko"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
 msgstr ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Ovládací prvky přehrávání"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
 msgstr ""
-" např.: --nowplaying \"%%a - %%t\" zapíše \"umělec - "
-"název\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Výchozí"
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Prohlížeč záznamů"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Ano"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Ne"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Chyba při čtení souboru nápovědy"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Selhalo načtení souboru nápovědy"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/gtkui.c:1712
 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í"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Přehrávač momentálně zpracovává úlohy na pozadí. Ukončíte-li jej nyní, úlohy budou zrušeny či přerušeny, což může způsobit ztrátu dat."
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Stále chcete odejít?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Left\n"
-"Right"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Vlevo\n"
-"Vpravo"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Zakázat\n"
-"Skladba\n"
-"Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
-"Vzestupně\n"
-"Sestupně"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-"2.3 (Doporučeno)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
 #, 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 "Do you really want to delete all %d files from the current playlist?%s"
 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Vyhledat na Last.fm"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Použít ALSA převzorkování"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Smazat"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Při zastavení uvolnit zařízení"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Vlevo"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Preferovaná velikost bufferu"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Vpravo"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Preferovaná perioda bufferu"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Vystředit"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Povolit scrobbler"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Zakázat nowplaying"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Uživatelské jméno"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Heslo"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Upřednostnit pole Skladatele před Umělcem"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Dle pořadí přehrávání"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Soubor zařízení"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Stopa"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Obcházení chyb vzorkovací frekvence OSS4"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Žádné"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Perioda aktualizace vyrovnávací paměti (hod)"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Použít zesílení"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Použít zesílení a zabránit clippingu v závislosti na vrcholu"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Pouze zabránit clippingu"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Získat z vložených popisků"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Vzestupně"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Získat z místního adresáře"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Sestupně"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Maska místního souboru s obalem"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Získat z Last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Získat z albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Přizpůsobit obrázek delší straně"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Použít CDDB/FreeDB"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Doporučeno)"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Upřednostnit CD-Text před CDDB"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (např. 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Číslo portu CDDB (např. '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Upřednostnit protokol CDDB před HTTP"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Umělec / Album"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Povolit podporu obrázků NRG"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Stopa č"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Převzorkovat kvalitu (0..2, vyšší je lepší)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-bit výstup (výchozí je 16)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Trvání"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Maximální délka skladby (v minutách)"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Rejstřík"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Délka slábnutí (sekundy)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Přehrávání"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Kolikrát opakovat smyčku (je-li dostupná)"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Obal alba"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Potvrzovat mazání souborů z disku"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Umělec - Album"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Citlivost ovládání hlasitosti"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Vlastní ikona stavu"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Číslo stopy"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Spustit gtk_init se --sync (ladící režim )"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Skupina / Skladatel"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Přidat oddělovače mezi položky kontextového menu zásuvných modulů"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodek"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Formát titulku upozornění"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Formát obsahu upozornění"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Přidat sloupec"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Zobrazit obal alba"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Upravit sloupec"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Velikost obalu alba (px)"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Odstranit sloupec"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Server PulseAudio"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Vzorkovací frekvence"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Seskupit dle"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Relativní cesta vyhledávací tabulky"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Umělec/Datum/Album"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Absolutní cesta vyhledávací tabulky"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Přehození audio bajtů (zapnout pokud je zvuk statický)"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Povolit HVSC Songlength DB"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (z HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bitů na vzorek (8 or 16)"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Znovu načíst metadata"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Výchozí délka skladby (s)"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Konfigurační soubor Timidity++ bank"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Název skladby"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Protagonista"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Celkem stop"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Odstranit playlist"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Žánr"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Přidat nový playlist"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Skladatel"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Povolit automatické řazení"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Číslo disku"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Komentář"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Otevřít soubor..."
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Kódování / Vydavatel"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Nastavit %s"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Umístění"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Subtrack rejstřík"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Typ(y) popisků"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Výchozí audio zařízení"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Vložený Cuesheet"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Přidávají se soubory..."
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Kodek"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Inicializuje se..."
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Přípony souborů (oddělené s ';')"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Probíhá aktualizace značek souborů"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Převést"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Cílová vzorkovací frekvence"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Zesílení alba"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Kvalita / Algoritmus"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Zesílení stopy"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
 msgstr ""
-"Automatická vzorkovací frekvence (přepíše cílovou vzorkovací frekvenci)"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Vrchol stopy"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Zakázat přehrávání bez přerušení (rychlejší skenování)"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Upřednostnit emulátor Ken před Satoh (prostorový zvuk nebude fungovat)"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Povolit prostorový zvuk"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Hledání (%list_total% výsledků)"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Zobrazit záhlaví sloupců"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Hodnota"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Byla změněna data této stopy."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Opravdu zavřít okno?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Vícenásobné hodnoty "
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Klávesa"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Vícenásobné hodnoty "
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Zapisují se značky..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Soubor již existuje. Přepsat?"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Varování konvertoru"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Název pole"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Vyberte enkodér"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Jméno:"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Chyba konvertoru"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Název pole nesmí začínat : nebo _"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Převádí se..."
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Nelze přidat pole"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Vybrat adresář..."
+#: ../plugins/gtkui/trkproperties.c:1267
+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/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Selhalo ukládání předvolby enkodéru"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Widget \"%s\" není dostupný"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
 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:771 ../plugins/converter/convgui.c:1324
-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/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Chyba"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Vyjmout"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Přidat nový enkodér"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopírovat"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Upravit enkodér"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Vložit"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Odstranit předvolbu"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Tato akce odstraní vybranou předvolbu. Pokračovat?"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Enkodéry"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Přidat zásuvný modul do řetězce DSP"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Selhalo ukládání předvolby DSP"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Nová předvolba DSP"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Upravit předvolbu DSP"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Předvolby DSP"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Přejmenovat kartu"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Výstupní adresář:"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Odstranit kartu"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Zapsat do zdrojové složky skladby"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Přidat novou kartu"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Zachovat strukturu adresáře"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Přesunout kartu doleva"
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Název výstupního souboru:"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Přesunout kartu doprava"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "1x"
 msgstr ""
-"Přípona (např. .mp3) bude připojena automaticky.\n"
-"Ponechte pole prázdné pro výchozí (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Enkodér:"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Předvolba DSP:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Počet vláken:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Výstupní formát vzorku:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Zachovat zdrojový formát"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit podepsaný int"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit podepsaný int"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit podepsaný int"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit podepsaný int"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit plovoucí"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Pokud soubor existuje:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Prompt"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Přepsat"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Upravit předvolbu enkodéru"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Enkodér bez názvu"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Přípona výstupního souboru:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Např. mp3"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Příkazový řádek:"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
-"Příklad: lame - %o\n"
-"%i pro vstupní soubor, %o pro výstupní soubor, - pro stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
-"%o - název výstupního souboru\n"
-"%i - název dočasného vstupního souboru"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Metoda:"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Roura"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Dočasný soubor"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Rozšířit"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Vyplnit"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Autor popisku"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Editor předvolby DSP"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Předvolba DSP bez názvu"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Přidat"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nelze najít pixmap soubor: %s"
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 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í"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "(pozastaveno)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
-"Prompt\n"
-"Přepsat"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "(přehrávání)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Položky"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
 msgstr ""
-"Roura\n"
-"Dočasný soubor"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Prohlížeč playlistů"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "Vlastní příkazy shellu"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Upravit"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2084,10 +2621,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"Libovolný příkaz shellu. Bude spuštěn v kontextu shellu, ze kterého byla "
-"spuštěna hlavní aplikace. Může být použito formátování názvu. Příklad: xdg-"
-"open %D"
+msgstr "Libovolný příkaz shellu. Bude spuštěn v kontextu shellu, ze kterého byla spuštěna hlavní aplikace. Může být použito formátování názvu. Příklad: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2102,11 +2636,9 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"ID příkazu, mělo by to být něco krátkého, například \"youtube_otevřít\". "
-"Musí být unikátní."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "ID příkazu, mělo by být něco krátkého, například \"youtube_otevřít\". Musí být unikátní."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2170,10 +2702,6 @@
 msgid "Add Command"
 msgstr "Přidat příkaz"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Smazat"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Tato akce odstraní vybraný příkaz shellu. Pokračovat?"
@@ -2199,197 +2727,1240 @@
 msgid "Invalid Values"
 msgstr "Neplatné hodnoty"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Podporované zvukové formáty"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Všechny soubory (*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Otevřít soubor(y)..."
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Přidat soubor(y) do playlistu..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Název skladby"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Přidat složku(y) do playlistu..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Protagonista"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Následovat symlinky"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Celkem stop"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Žánr"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Smazat soubory z disku"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Skladatel"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Číslo disku"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
-"Soubory budou ztraceny. Pokračovat?\n"
-"(Tento dialog lze vypnout v nastavení zásuvného modulu GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Načíst playlist"
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Komentář"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Ostatní soubory (*)"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Kódování / Vydavatel"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Uložit playlist jako"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Copyright"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Soubory playlistů DeaDBeeF (*.dbpl)"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Umístění"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Typ-Obsahu"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Subtrack rejstřík"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Neplatná hodnota(y)"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Typ(y) značek"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Vložený Cuesheet"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-"Pole Typ-obsahu a Zásuvné moduly nesmí zůstat prázdné a musí vyhovovat "
-"pravidlům.\n"
-"Příklad typu-obsahu: 'audio/mpeg'.\n"
-"Příklad id zásuvného modulu: 'stdmpg ffmpeg'.\n"
-"Mezery slouží jako oddělovače jednotlivých id zásuvných modulů.\n"
-"Typ obsahu by se měl skládat pouze z písmen, číslic a znaku \"-\".\n"
-"Id zásuvných modulů může obsahovat pouze písmena a číslice."
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Není nic vybráno."
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Upřednostnit emulátor Ken před Satoh (prostorový zvuk nebude fungovat)"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Povolit prostorový zvuk"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Použít ALSA převzorkování"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Preferovaná velikost bufferu"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Preferovaná perioda bufferu"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Získat z vložených značek"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Získat z místního adresáře"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Přidat Audio CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Upřednostnit CD-Text před CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Povolit podporu obrázků NRG"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Převést"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Kvalita / Algoritmus"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Pouze Zap/Vyp"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Přípony souborů (oddělené s ';')"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Maximální délka skladby (v minutách)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Délka slábnutí (sekundy)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Kolikrát opakovat smyčku (je-li dostupná)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Odstranit ReplayGain informaci"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Skenovat výběr jako alba (dle značek)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Skenovat výběr jako jedno album"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Skenovat zesílení stopy"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Skenovat zesílení stopy nebylo-li skenováno"
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Zobrazit nápovědu"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Přepnout režim opakování"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Opakování - Vypnuto"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Opakování - Jedna stopa"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Opakování - Vše"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Přepnout náhodný režim"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Náhodně - Náhodné stopy"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Náhodně - Alba"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Náhodně - Stopy"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Náhodně - Vypnuto"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Přepnout sledovat kurzorem přehrávání"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Přepnout posun s přehráváním"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Vlastní řazení"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Uložit playlist"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Odebrat aktuální playlist"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Potvrzovat mazání souborů z disku"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Citlivost ovládání hlasitosti"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Vlastní ikona stavu"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Přidat oddělovače mezi položky kontextového menu zásuvných modulů"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Použít unicode znaky namísto obrázků pro stav stopy"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Přeskočit na"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Následující playlist"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Řadit náhodně"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Vyčistit playlist"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Posunout stopy dolů"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Posunout stopy nahoru"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Přepnout pozastavení"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Přehrát\\/Pozastavit"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Přepnout zastavení po aktuální stopě"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Povolit scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Zakázat nowplaying"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Heslo"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Upřednostnit pole Skladatele před Umělcem"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Předložit stopy kratší než 30 sekund (nedoporučováno)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Formát titulku upozornění"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Formát obsahu upozornění"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Zobrazit obal alba"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Velikost obalu alba (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Soubor zařízení"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Zvýraznit aktuální playlist"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Vzorkovací frekvence"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Přeskočit pokud kratší než (s)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr ""
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Relativní cesta vyhledávací tabulky"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Absolutní cesta vyhledávací tabulky"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Přehození audio bajtů (zapnout pokud je zvuk statický)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Povolit HVSC Songlength DB"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Výchozí délka skladby (s)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Konfigurační soubor Timidity++ bank"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/da.po -> deadbeef-1.9.6.tar.bz2/po/da.po Changed

@@ -1,2341 +1,3964 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Joe Hansen <joedalton2@yahoo.dk>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/da/)\n"
-"Language: da\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>, 2010\n"
+"Language-Team: Danish (http://app.transifex.com/deadbeef-player/deadbeef-player/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Om DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s - ændringslog"
+msgid "Options:\n"
+msgstr "Tilvalg:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Oversættere af DeaDBeeF"
-
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Gem DeaDBeef EQ-forhåndsindstilling"
-
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ-forhåndsindstillede filer (*.ddbeq)"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help eller -h Vis hjælp (denne besked) og afslut\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Indlæs DeaDBeeF EQ forhåndsindstilling..."
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Afslut afspiller\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ-forhåndsindstillinger (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Vis versionsinfo og afslut\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importer Foobar2000 EQ-forhåndsindstilling..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Start afspilning\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ-forhåndsindstillinger (*.feq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Stop afspilning\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Gem forhåndsindstilling"
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pause afspilning\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Indlæs forhåndsindstilling"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importer Foobar2000-forhåndsindstilling"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Aktiver"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Næste sang i afspilningsliste\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Nulstil alle"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Forrige sang i afspilningsliste\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Nulstil forforstærkning"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Tilfældig sang i afspilningsliste\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Nulstil frekvensbånd"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Tilføj filer til eksisterende afspilningsliste\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Forhåndsindstillinger"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:149
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 dag %d:%02d:%02d"
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Vis formateret nummernavn til stdout\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:150
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d dage %d:%02d:%02d"
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntaks: a kunstner, t titel, b album,\n l længde, n nummer, y år, c bemærkning,\n r ophavsret, e forløbet\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:153
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Stoppet | %d numre | %s samlet afspilningstid"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:156
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pause | "
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:158
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
 msgstr ""
-"%s%s %s| %d Hz | %d bit | %s | %d:%02d / %s | %d numre | %s samlet "
-"afspilningstid"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Ny afspilningsliste"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:160
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Ny afspilningsliste (%d)"
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Standard"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nej"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Kunne ikke læse hjælpefil"
+#: ../plugins/converter/converter.glade.h:14
+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 ""
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Kunne ikke indlæse hjælpefil"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:21
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"Skip\n"
+"Prompt\n"
+"Overwrite"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Advarsel"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Titel:"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Fil"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Åbn filer"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Tilføj filer"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Tilføj mapper"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Tilføj placering"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Ny afspilningsliste"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Indlæs afspilningsliste"
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Gem afspilningsliste"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Afslut"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Rediger"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Titel"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Tilføj"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Fjern"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Konfigurer"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Forhåndsindstillinger"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Advarsel"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Hjælp"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Kunne ikke finde pixmapfil: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Om DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s - ændringslog"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Oversættere af DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Udvidelsesmoduler"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Fil"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Åbn filer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Tilføj filer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Tilføj mapper"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Tilføj placering"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Ny afspilningsliste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Indlæs afspilningsliste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Gem afspilningsliste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Afslut"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Rediger"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Ryd"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Vælg alle"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Fravælg alle"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Inverter markering"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Markering"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Fjern"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Beskær"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Find"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Nummer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Kunstner"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Dato"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Tilfældig"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Tilpasset"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Vis"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Statusbjælke"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Equalizer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Afspilning"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Rul følger afspilning"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Markør følger afspilning"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Spring til aktuelle nummer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Hjælp"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_Ændringslog"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_Om"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "Oversæ_ttere"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Søg"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Stop"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Afspil"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pause"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Næste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Afspil tilfældig"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "Om"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Afslut"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Nummeregenskaber"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Indstillinger"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Anvend"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Luk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Egenskaber"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Afbryd"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_O.k."
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Indtast ny kolonnetitel her"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Type:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Format:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Justering:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Udvidelsesmodul for uddata:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Uddataenhed:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Konverter altid 8-bits lyd til 16-bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Lyd"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+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/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Genoptag forrige session ved opstart"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Afspilning"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Luk minimeringer til statusfelt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Skjul statusikon"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Titelbjælketekst under afspilning:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Titelbjælketekst når stoppet:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr ""
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Overskriv"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Aktiver proxyserver"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Adresse for proxyserver:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Port til proxyserver:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Proxytype:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Brugernavn til proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Adgangskode til proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Netværk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "Internetadresse:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Skriv ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Skriv ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Skriv APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Fjern ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Fjern ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Fjern APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "ID3v2-version"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Anbefalet)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1-tegnkodning (standard er iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Skriv ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Gem DeaDBeef EQ-forhåndsindstilling"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ-forhåndsindstillede filer (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Indlæs DeaDBeeF EQ forhåndsindstilling..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ-forhåndsindstillinger (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importer Foobar2000 EQ-forhåndsindstilling..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ-forhåndsindstillinger (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Gem forhåndsindstilling"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Indlæs forhåndsindstilling"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importer Foobar2000-forhåndsindstilling"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Aktiver"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Nulstil alle"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Nulstil forforstærkning"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Nulstil frekvensbånd"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Ny afspilningsliste"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 dag %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dage %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Ny afspilningsliste (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Kunne ikke læse hjælpefil"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Kunne ikke indlæse hjælpefil"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Titel"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "Nummer"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Album"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Kunstner"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Dato"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Tilfældig"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Venstre"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Tilpasset"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Højre"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Indstillinger"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Vis"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Statusbjælke"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Equalizer"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_Afspilning"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Rækkefølge"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Lineær"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Nummer"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Bland numre"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Ingen"
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Bland albums"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Gentage"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Rul følger afspilning"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Anbefalet)"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Markør følger afspilning"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Kunster / album"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Nummer"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Spring til aktuelle nummer"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Varighed"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Hjælp"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Indeks"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_Ændringslog"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Spiller"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Albumomslag"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Kunstner - Album"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_Om"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "Oversæ_ttere"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Nummer"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Søg"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Band-/albumkunstner"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Stop"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codec"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Afspil"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Pause"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Tilføj kolonne"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Forrige"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Rediger kolonne"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Næste"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Fjern kolonne"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Afspil tilfældig"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "Om"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Grupper efter"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Afslut"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Kunster/dato/album"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Hjælp"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Nummeregenskaber"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "Indstillinger"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Anvend"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Luk"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Metadata"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Egenskaber"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Titel:"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Indtast ny kolonnetitel her"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Type:"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Indeks"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Spiller"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Åbn fil..."
 
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Albumomslag"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Kunstner - Album"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Varighed"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Nummer"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Standardlydenhed"
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Band-/albumkunstner"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Tilføjer filer..."
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Format:"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Initialiserer..."
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Justering:"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Venstre"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Højre"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Afbryd"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_O.k."
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Udvidelsesmodul for uddata:"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Uddataenhed:"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Konverter altid 8-bits lyd til 16-bit"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Lyd"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Replaygains tilstand:"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Deaktiver"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Værdi"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Nummer"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Du har ændret data for dette nummer."
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Replaygains niveauskala"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Luk vinduet?"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
-msgstr "-12 dB"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
-msgstr "+12 dB"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Tast"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
-"Tilføj filer fra kommandolinje (eller filhåndtering) til afspilningslisten:"
-
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "Genoptag forrige session ved opstart"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Afspilning"
-
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Konfigurer"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Luk minimeringer til statusfelt"
-
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Skjul statusikon"
-
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "Titelbjælketekst under afspilning:"
-
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Titelbjælketekst når stoppet:"
-
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Overskriv"
-
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Forgrund"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Baggrund"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Farver for søgebjælke/lydstyrkebjælke"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Midt"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Lys"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Mørk"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Base"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Tekst"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Farver for fanebladsfjernelse"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
 msgstr ""
-"Overskriv (mister tema for GTK-trævisning, men øger optegningshastigheden)"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Lige række"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Ulige række"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Markeret række"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Markeret tekst"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Markør"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Farver på afspilningsliste"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Farver"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Aktiver proxyserver"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Adresse for proxyserver:"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Port til proxyserver:"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Proxytype:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Brugernavn til proxy:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Adgangskode til proxy:"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Netværk"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Udvidelsesmoduler"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "Internetadresse:"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Skriv ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Skriv ID3v1"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Skriv APEv2"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "Fjern ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "Fjern ID3v1"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "Fjern APEv2"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "ID3v2-version"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Anbefalet)"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1-tegnkodning (standard er iso8859-1)"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "Skriv ID3v2.4"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Kunster / album"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Nummer"
-
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Tilføj kolonne"
-
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Rediger kolonne"
-
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Fjern kolonne"
-
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Grupper efter"
-
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Ingen"
-
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Kunster/dato/album"
-
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Åbn fil..."
-
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Standardlydenhed"
-
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Tilføjer filer..."
-
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Initialiserer..."
-
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Du har ændret data for dette nummer."
-
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Luk vinduet?"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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."
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Tast"
-
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Værdi"
-
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../translation/extra.c:3
+msgid "Track Title"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../translation/extra.c:4
+msgid "Performer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#: ../translation/extra.c:10
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
+#: ../translation/extra.c:11
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#: ../translation/extra.c:12
+msgid "Disc Number"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../translation/extra.c:14
+msgid "Comment"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Tilvalg:\n"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr ""
 
-#: ../main.c:92
-#, 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"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Afslut afspiller\n"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Vis versionsinfo og afslut\n"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Mærketyper"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Start afspilning\n"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Indlejret stikordsliste (cuesheet)"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Stop afspilning\n"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pause afspilning\n"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Næste sang i afspilningsliste\n"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Forrige sang i afspilningsliste\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Tilfældig sang i afspilningsliste\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Tilføj filer til eksisterende afspilningsliste\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Vis formateret nummernavn til stdout\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
 msgstr ""
-" FMT %%-syntaks: a kunstner, t titel, b album,\n"
-" l længde, n nummer, y år, c bemærkning,\n"
-" r ophavsret, e forløbet\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
-" f.eks.: --nowplaying \"%%a - %%t\" skal vise »kunstner "
-"- titel«\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Standard"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Ja"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Nej"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
-"Venstre\n"
-"Højre"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
-"Deaktiver\n"
-"Nummer\n"
-"Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
-"2.3 (Anbefalet)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
-"wildmidi: Konfigurationsfil til freepats ikke fundes. Installer venligst "
-"pakken timidity-freepats, eller angiv stien til freepats.cfg i "
-"udvidelsesmodulopsætningen."
 
-#. 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"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Mærketyper"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Indlejret stikordsliste (cuesheet)"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Codec"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:281
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:319
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:321
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Tilføj"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Kunne ikke finde pixmapfil: %s"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:377
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/de.po -> deadbeef-1.9.6.tar.bz2/po/de.po Changed

@@ -1,9 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# aasche <anton.asche@mhinac.de>, 2017,2019
+# aer, 2019
+# aer, 2019
+# aer, 2019,2022-2023
+# aer, 2019-2022
+# aasche <anton.asche@mhinac.de>, 2017,2019
+# copycat <copycat@onlinehome.de>, 2016
+# copycat <copycat@onlinehome.de>, 2016
+# toemmesoft <development@toemmesoft.de>, 2014
+# a287ca4390ac1060252ff7344e07cfb3_ddf63c0 <12d9bb92f00a9c2841133eeaac7a25bb_727560>, 2018
+# Jakub Wasylków <kuba_160@protonmail.com>, 2022
 # Zykure <zykure@web.de>, 2013
+# Josua Stingelin <josuast@hotmail.com>, 2016
+# oxyd24foo <oxyd24@yopmail.com>, 2019
+# s. oxyd <oxyd24foo@yopmail.com>, 2019
+# Tag Tag <Datenkeiler@yahoo.de>, 2021
+# toemmesoft <development@toemmesoft.de>, 2014
 # Wander <wander.homer@gmail.com>, 2013
 # Wander <wander.homer@gmail.com>, 2013
 # Zykure <zykure@web.de>, 2013
@@ -12,2401 +28,3957 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/de/)\n"
-"Language: de\n"
+"POT-Creation-Date: 2023-11-07 19:05+0100\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: aer, 2019,2022-2023\n"
+"Language-Team: German (http://app.transifex.com/deadbeef-player/deadbeef-player/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Über DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Benutzung: deadbeef Optionen -- Datei(en)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s ChangeLog"
+msgid "Options:\n"
+msgstr "Optionen:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF Übersetzer"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help oder -h Hilfe (diese Meldung) anzeigen und beenden\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "DeaDBeeF EQ Voreinstellung speichern"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit DeaDBeeF beenden\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ Voreinstellung (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Versionsinformationen anzeigen und beenden\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "DeaDBeeF EQ Voreinstellung laden..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Wiedergabe starten\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ Voreinstellungen (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Wiedergabe beenden\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Foobar2000 EQ Voreinstellung laden..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Wiedergabe pausieren\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ Voreinstellungen (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Wiedergabe umschalten (Play/Pause)\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Voreinstellung speichern"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Wiedergabe starten falls angehalten, sonst pausieren\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Voreinstellung laden"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Nächster Titel in der Wiedergabeliste\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importiere Foobar2000 Voreinstellung"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Vorheriger Titel in der Wiedergabeliste\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Aktivieren"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Zufälliger Titel in der Wiedergabeliste\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Alles zurücksetzen"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Datei(en) an bestehende Wiedergabeliste anhängen\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Vorverstärkung zurücksetzen"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr "--gui PLUGIN Gibt an welches GUI-Plugin benutzt werden soll, Standard ist \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Equalizer zurücksetzen"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Formatierten Titelnamen in Standardausgabe schreiben\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Voreinstellungen"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-Syntax: artist, titel, Album,\n länge, Titelnummer, yJahr, cKommentar,\n copyright, everstrichen\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 Tag %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " Beispiel: --nowplaying \"%%a - %%t\" ergibt \"Interpret - Titel\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d Tage %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "für weitere Informationen siehe %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Angehalten | %d Titel | %s gesamte Spielzeit"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "Anmerkung: -nowplaying ist nicht möglich\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Ausgabe des formatierten Titels nach stdout, unter Verwendung des neuen Titelformats\n"
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " FMT Syntax: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " Beispiel: --nowplaying-tf \"%%artist%% - %%title%%\" ergint \"Interpret - Titel\"\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Anzeige oder Setzen des Lautstärkepegels von DeaDBeeF.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr "Der NUM-Parameter kann in Prozent angegeben werden (absoluter Wert oder Anstieg/Verminderung)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr "oder in dB -50,0 (falls mit Dateinamenerweiterung)\n"
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr "Beispiele: --volume 80, --volume +10, --volume -5 or --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr " --plugin=PLUG Kommando an eine ausgewählte Erweiterung senden. Use PLUG=main Kommando direkt an deadbeef senden.\n"
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr " Liste ausgewählter Befehlszeilen aufrufen --plugin=PLUG --help\n"
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr " --plugin-list Alle verfügbaren Erweiterungen auflisten.\n"
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Standard"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Ja"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pausiert | "
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nein"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Zielverzeichnis:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "In Verzeichnis der Quelldatei schreiben"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Verzeichnisstruktur beibehalten"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Kopieren, falls das Format unverändert bleibt"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Metadaten nach Kopiervorgang neu schreiben"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Dateiname:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-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 Titel | %s gesamte Spielzeit"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Dateiendungen (wie .mp3) werden automatisch angehängt.\nFeld frei lassen für Standard (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Neue Wiedergabeliste"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Encoder:"
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Neue Wiedergabeliste (%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP-Profil:"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Wiedergabeliste mit Reitern"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Thread-Anzahl:"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Wiedergabeliste"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Ausgabe-Sampleformat:"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Splitter (oben/unten)"
+#: ../plugins/converter/converter.glade.h:14
+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 "Ursprüngliches Format beibehalten\n8-bit signed int\n16-bit signed int\n24-bit signed int\n32-bit signed int\n32-bit float"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Splitter (links/rechts)"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Falls Datei bereits existiert:"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Reiter für Wiedergabelisten"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Überspringen\nNachfragen\nÜberschreiben"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Auswahl-Eigenschaften"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Profil laden"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Album Artwork"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Titel:"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Oszilloskop"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Neuer Encoder"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Spektrum"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Endung der Zieldatei:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "z.B. mp3"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Kommandozeile:"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Knopf"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-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/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Methode:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Pipe\nTemporäre Datei\nQuelldatei"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Fehler beim Lesen der Hilfedatei"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Fehler beim Laden der Hilfedatei"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Metadaten schreiben"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP-Profileditor"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Titel"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Neues DSP-Profil"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Aus Liste entfernen"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Einstellungen"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Auswahl des DSP-Plugins"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Erweiterung"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Voreinstellungen"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Intern %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Die Datei existiert bereits. Überschreiben?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Warnung (Umwandler)"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Einen Encoder wählen"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Fehler (Umwandler)"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Wandle um..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Verzeichnis wählen..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Fehler beim Speichern des Encoder-Profils"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Zugriffsrechte auf das Verzeichnis prüfen, einen anderen Titel wählen oder freien Platz auf der Festplatte schaffen"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Wollen Sie trotzdem beenden?"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+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:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Fehler"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Neuen Encoder hinzufügen"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Encoder bearbeiten"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Profil entfernen"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Diese Aktion wird das gewählte Profil löschen. Fortfahren?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Encoder"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Plugin in DSP-Kette einfügen"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Fehler beim Speichern des DSP-Profils"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Neues DSP-Profil"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "DSP-Profil bearbeiten"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP-Profile"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Hilfe"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Format der Eingangsdatei verwenden"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8-bit signed int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16-bit signed int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24-bit signed int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32-bit signed int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32-bit float"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Überspringen"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Nachfragen"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Überschreiben"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Pipe"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Temporäre Datei"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Quelldatei"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Pixmap-Datei nicht gefunden: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Öffne Datei(en)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Datei(en) zu Wiedergabeliste hinzufügen..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Ordner zu Wiedergabeliste hinzufügen..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Wiedergabeliste laden"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Speichere Wiedergabeliste als"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Über DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s Änderungsprotokoll"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF-Übersetzung"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr "Aktueller Titel"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr "Ausgewählte Titel"
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Inhaltstyp"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Erweiterungen"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Ungültige(r) Wert(e)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Die Felder Inhaltstyp und Erweiterung dürfen nicht leer sein, und müssen den Regeln entsprechen:\nBeispiel Inhaltstyp: 'audio/mpeg'.\nBeispiel Erweiterung: 'stdmpg ffmpeg'.\nLeerzeichen müssen als Trenner im Erweiterungs-Feld verwendet werden.\nInhaltstypen dürfen nur Buchstaben, Ziffern und das '-' Zeichen enthalten.\nErweiterungen dürfen nur Buchstaben und Ziffern enthalten."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Nichts ausgewählt."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Datei"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
-msgstr "Dateien ö_ffnen"
+msgstr "_Datei(en) öffnen"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
-msgstr "Dateien hinzufügen"
+msgstr "Datei(en) hinzufügen"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
-msgstr "Verzeichnisse hinzufügen"
+msgstr "Verzeichnis(se) hinzufügen"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
-msgstr "Ort hinzufügen"
+msgstr "Web-Adresse hinzufügen"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Wiedergabeliste laden"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Wiedergabeliste speichern"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
-msgstr "_Löschen"
+msgstr "_Alle aus Wiedergabeliste entfernen"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
-msgstr "Alles auswählen"
+msgstr "Alle auswählen"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
-msgstr "Alles abwählen"
+msgstr "Alle abwählen"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Auswahl"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
-msgstr "Abschneiden"
+msgstr "Freistellen"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
-msgstr "Suchen"
+msgstr "_Suchen"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
-msgstr "Sortiere nach"
-
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Titel"
+msgstr "Sortieren nach"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
-msgstr "Track-Nummer"
+msgstr "Titelnummer"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Künstler"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Zufällig"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Statusleiste"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Designmodus"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Protokoll"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Reihenfolge"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Linear"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Track-Shuffle"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Album-Shuffle"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Zufallsmodus"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Aus"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Titel"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Alben"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Zufällige Titel"
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
 msgstr "Wiederholen"
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Wiederhole alles"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Wiederhole einzelnen Track"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Keine Wiederholung"
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Alle Titel"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Einzelner Titel"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Bildlauf folgt Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Mauszeiger folgt Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Nach aktuellem Titel anhalten"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Nach aktuellem Album anhalten"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Zu aktuellem Titel springen"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
-msgstr "_ChangeLog"
+msgstr "_Änderungsprotokoll"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
-msgstr "_Info"
+msgstr "_Über"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
-msgstr "_Übersetzer"
+msgstr "_Übersetzung"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Suche"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Abspielen"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
-msgstr "Anhalten"
+msgstr "Pause"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
-msgstr "Vorheriges"
+msgstr "Vorheriger Titel"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
-msgstr "Nächstes"
+msgstr "Nächster Titel"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
-msgstr "Zufälliges Abspielen"
+msgstr "Zufälliger Titel"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
-msgstr "Info"
+msgstr "Über"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Hilfe"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Titeleigenschaften"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Ort:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
-msgstr "A_nwenden"
+msgstr "_Anwenden"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
-msgstr "S_chließen"
+msgstr "_Schließen"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Titel:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Abbrechen"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Neuen Spaltentitel eingeben"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Index"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Wiedergabe"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Album Artwork"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Künstler - Album"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Dauer"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Track-Nummer"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Band / Album-Künstler"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Sortierformat:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(falls nicht-leer lassen)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Ausrichtung:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Linksbündig"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Rechtsbündig"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Abbrechen"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Links\nRechts \nMitte"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Textfarbe:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
-msgstr "Ausgabeplugin:"
+msgstr "Ausgabeerweiterung:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Ausgabegerät:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Immer 8-bit Audio nach 16-bit konvertieren"
+msgstr "8-bit-Audio immer zu 16-bit konvertieren"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
-msgstr "Immer 16-bit Audio nach 24-bit konvertieren"
+msgstr "16-bit-Audio immer zu 24-bit konvertieren"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Audio"
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr "Bit-Tiefe überschreiben:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr "Deaktivierter\n8 bit\n16 bit\n24 bit\n32 bit\n32 bit float"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Replaygain-Modus:"
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Ziel-Sample-Rate:"
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Deaktivieren"
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Vielfache Werte von 48KHz (96K, 192K,...):"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Titel"
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Vielfache Werte von 44.1KHz (88.2K, 176.4K,...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Auf Input-Sample-Rate basierend"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Sample-Rate überschreiben"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Klangausgabe"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Quellmodus:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Nach Wiedergabe sortieren\nTitel\nAlbum"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Replaygain-Ausschlagschutz"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Verarbeite:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Kein\nReplayGain anwenden\nReplayGain anwenden, aber Clipping bei Berücksichtigung des Höchstwerts vermeiden\nNur Clipping vermeiden"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Replaygain-Vorverstärkung:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Globale Vorverstärkung:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Mit ReplayGain-Informationen verstärken:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Ohne ReplayGain-Informationen verstärken:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 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:"
+msgstr "Datei(en) beim Hinzufügen an diese Liste anhängen:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Beim Start letzte Sitzung wiederherstellen"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
-msgstr ""
-"Dateien innerhalb von Archiven beim Hinzufügen von Verzeichnissen auslassen"
+msgstr "Archive beim Hinzufügen von Verzeichnissen auslassen"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "\"Nach aktuellem Titel anhalten\" wird zurückgesetzt, wenn eingetreten"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "\"Nach aktuellem Album anhalten\" wird zurückgesetzt, wenn eingetreten"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Wiedergabe"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Einstellungen"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
-msgstr "DSP Voreinstellung"
+msgstr "DSP-Voreinstellung"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Laden"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Beim Start in Systemleiste minimieren"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
-msgstr "Beim Schließen minimieren"
+msgstr "Beim Schließen in Systemleiste minimieren"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
-msgstr "Systemleisten-Icon verstecken"
+msgstr "Systemleistensymbol verstecken"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "In den Papierkorb löschen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Erkennen und Rekodierung von SHIFT-JIS (japanisch)"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Erkennung und Rekodierung von CP1251 (russisch)"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr "Erkennen und Rekodierung von CP1251 (kyrillisch)"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr "Erkennung und Rekodierung von CP936 (chinesisch)"
+msgstr "Erkennen und Rekodierung von CP936 (chinesisch)"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Aktualisierungsrate der Benutzeroberfläche (Ereignisse pro Sekunde):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Fenstertitel beim Abspielen:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
-msgstr "Fenstertitel wenn angehalten:"
+msgstr "Fenstertitel, wenn angehalten:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr "GUI-Plugin (Änderung benötigt Neustart):"
+msgstr "GUI-Erweiterung (Änderung benötigt Neustart):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Gesamtzeit der Auswahl in Statusleiste anzeigen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr "Player"
+msgstr "GUI"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr "Wiedergabeliste mit Mittelklick schließen"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Aktuellen Titel hervorheben"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr "Eintrag \"Vom Datenträger entfernen\" im Kontextmenü verstecken"
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Zum nächsten Lied wechseln, wenn gewähltes von der Festplatte gelöscht wurde"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
-msgstr ""
-"Wiedergabeliste beim Hinzufügen einzelner Verzeichnisse automatisch benennen"
+msgstr "Wiedergabeliste beim Hinzufügen einzelner Verzeichnisse automatisch benennen"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr "Spalten automatisch an die Fenstergröße anpassen"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Gruppenzwischenräume:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "Pixel"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Wiedergabeliste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "GUI/Diverses"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Überschreiben"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Vordergrund"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Hintergrund"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Farben von Suchleiste und Lautstärkeregler"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Mittel"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Hell"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Dunkel"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Basis"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Text"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Farben der Reiterleiste"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Überschreiben (beschleunigt die Darstellung)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Gerade Zeile"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Ungerade Zeile"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Ausgewählte Zeile"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Ausgewählter Text"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Mauszeiger"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Farben der Wiedergabeliste"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Farben"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Balken"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Hintergrund (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Fortschrittsbalken/Lautstärkeregler/EQ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Basis:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Dunkel:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Hell:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Mittel:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Text:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Fett:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Kursiv:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Text für Wiedergabe:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Text für Auswahl:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Reiterleiste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Normale(r) Titel:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Aktueller Titel:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Ausgewählte(r) Titel:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Spalten:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Gruppenüberschrift:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Vordergrund:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Gerade:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Ungerade"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Ausgewählt:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Mauszeiger:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Hintergrund:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Überschreiben (ohne GTK-Baumansicht, aber schnellere Darstellung)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr "Standardfarbe der Visualisierung"
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr "Hintergrundfarbe der Visualisierung"
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Visualierungen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Aussehen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Medienbibliothek einschalten"
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "Musikorder hizufügen / entfernen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Medienbibliothek"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Proxyserver aktivieren"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Adresse des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Port des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Art des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
-msgstr "Benutzername für Proxyserver:"
+msgstr "Benutzername des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
-msgstr "Passwort für Proxyserver:"
+msgstr "Passwort des Proxyservers:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr "HTTP User Agent:"
+msgstr "HTTP-Kennung:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr "Bearbeite Zuordnung von Inhalts-Typen "
+msgstr "Zuordnung von Inhaltstypen"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr "Zugeordnete Hotkeys:"
+msgstr "Tastenkombinationen:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Aktion:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
-msgstr "<Nicht gesetzt>"
+msgstr "<Not set>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Tastenkombination:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr "Globaler Hotkey"
+msgstr "Systemweite Tastenkombination"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"Zum Speichern von Änderungen muss \"Anwenden\"\n"
-"betätigt werden.\n"
-"Mit \"Zurücksetzen\" können diese wieder rückgängig\n"
-"gemacht werden."
+msgstr "\"Anwenden\" klicken, um Änderungen zu speichern.\n\"Zurücksetzen\" macht die Änderungen rückgängig."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "_Vorgabewerte"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
-msgstr "Hotkeys"
+msgstr "Tastatur"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Version: "
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Einstellungen"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Copyright"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Info"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Erweiterungen"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Lizenz"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Vorgabewerte"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Version: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Benutzerdefinierten Titel festlegen"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Gruppiere nach ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr "Sortiere nach ..."
-
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Format"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Aufsteigend"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Absteigend"
+msgstr "Sortieren nach ..."
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Auswahl des DSP-Plugins"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Erweiterung"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Aufsteigend\nAbsteigend"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
-msgstr "Einstellungen für den Tag-Editor"
+msgstr "Einstellungen des Metadaten-Editors"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Schreibe ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Schreibe ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "APEv2 schreiben"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "ID3v2 entfernen"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "ID3v1 entfernen"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "APEv2 entfernen"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 Version"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (empfohlen)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Empfohlen)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 Zeichensatz (Vorgabe ist iso8859-1)"
+msgstr "ID3v1-Zeichensatz (Vorgabe ist iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Schreibe ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr "Zuordnung von Inhalts-Typen"
+msgstr "Zuordnung von Inhaltstypen"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"Diese Tabelle definiert die Zuordnung zwischen Inhalts-Typen von Netzwerk-"
-"Streams und DeaDBeeF Decoder-Erweiterungen. Zum Beispiel können mp3-Dateien "
-"den Inhaltstyp \"audio/x-mpeg\" haben, und werden von DeaDBeeFs eigener "
-"Erweiterung \"stdmpg\" oder der Erweiterung \"ffmpeg\" dekodiert."
+msgstr "Diese Tabelle definiert die Zuordnung zwischen Inhaltstypen von Netzwerk-Streams und DeaDBeeF Decoder-Erweiterungen. Zum Beispiel können mp3-Dateien den Inhaltstyp \"audio/x-mpeg\" haben, und werden von DeaDBeeFs eigener Erweiterung \"stdmpg\" oder der Erweiterung \"ffmpeg\" umgewandelt."
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Vorgabewerte"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr "Inhalts-Typ:"
+msgstr "Inhaltstyp:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Erweiterungen:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Knopf-Einstellungen"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Farbe:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Textfarbe:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Symbol:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Titel:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Aktion auswählen"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "Dieser Dialog erlaubt das Festlegen von benutzerdefinierten Bezeichnungen für jeden Titel. Das ist am sinnvollsten bei Radiosendern. Dies ist auch möglich im \"Web-Adresse hinzufügen\"-Dialog. Die Bezeichnung selbst ist in Spalten sichtbar, die das \"Künstler\"-Metadaten-Feld darstellen. Es sollte aussehen wie \"benutzerdefiniert Künstler\" wenn das Künstlerfeld gesetzt ist, andernfalls \"benutzerdefiniert\"."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Bearbeiten (direkt)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Neues Feld hinzufügen..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Wert bearbeiten"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Feldname:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Feldwert:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Zum Trennen verschiedener Werte Semikolon ; benutzen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF-Protokoll"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Leeren"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Fortschritt des ReplayGain-Scans"
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Aktuelle Datei:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Status"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Ergebnis des ReplayGain-Scans"
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Metadaten aktualisieren"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "Report kopieren"
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Nur Erweiterungen mit Konfigurationsmenü anzeigen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr "Mehrere Titel bearbeiten"
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Feldname:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr "Einzelner Wert"
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr "Individuelle Werte"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "DeaDBeeF-EQ-Voreinstellung speichern"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF-EQ-Voreinstellungsdatei (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "DeaDBeeF-EQ-Voreinstellung laden..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF-EQ-Voreinstellungen (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000-EQ-Voreinstellung laden..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000-EQ-Voreinstellungen (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Voreinstellung speichern"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Voreinstellung laden"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importiere Foobar2000-Voreinstellung"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Aktivieren"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Alles zurücksetzen"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Vorverstärkung zurücksetzen"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Equalizer zurücksetzen"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Neue Wiedergabeliste"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Unterstützte Sound-Formate"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Alle Dateien (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Unterstützte Wiedergabelisten-Formate"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Alle Dateien"
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Andere Dateien (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF playlist files (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Verknüpfungen folgen"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 Tag %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d Tage %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "Gesamtzeit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Pausiert"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "Gesamtzeit ausgewählter Titel"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Angehalten"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Wiedergabeliste umbenennen"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Abspielliste entfernen"
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Abspielliste '%s' wirklich entfernen?"
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Neue Wiedergabeliste (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Wiedergabeliste mit Reitern"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Trennlinie (oben/unten)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Trennlinie (links/rechts)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Reiter"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Reiter für Wiedergabelisten"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Auswahl-Eigenschaften"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Titelbild-Anzeige"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Oszilloskop"
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektrum"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Knopf"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Fortschrittsbalken"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Wiedergabesteuerung"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Lautstärkeregler"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune-Stimmen"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Protokollbetrachter"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Ansicht Medienbibliothek"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Fehler beim Lesen der Hilfedatei"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Fehler beim Laden der Hilfedatei"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "DeaDBeeF hat laufende Hintergrundaufgaben. Bei sofortigem Programmabruch werden diese beendet oder unterbrochen. Dies kann Datenverlust zur Folge haben."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Trotzdem beenden?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Die Dateien werden in den Papierkorb gelöscht."
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Die Dateien werden endgültig von der Festplatte gelöscht."
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr "Gewählte Datei wirklich löschen? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr "Gewählte %d Dateien wirklich löschen? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr "Gewählte %d Dateien aus aktueller Abspielliste entfernen? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "Die gerade abspielende Datei wirkilich löschen?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Vom Datenträger löschen"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Linksbündig"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Rechtsbündig"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Mittig"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr "8 bit"
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr "16 bit"
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr "24 bit"
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr "32 bit"
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Nach Wiedergabereihenfolge"
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Titel"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Nichts"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "ReplayGain anwenden"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "ReplayGain anwenden, aber Clipping bei Berücksichtigung des Höchstwerts vermeiden"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Nur Clipping verhindern"
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Aufsteigend"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Absteigend"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (empfohlen)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
 msgid "Artist / Album"
 msgstr "Künstler / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
 msgid "Track No"
-msgstr "Track-Nr."
+msgstr "Titelnr."
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Dauer"
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Index"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Wiedergabe"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Titelbild"
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Künstler - Album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Jahr"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Titelnummer"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Band / Album-Künstler"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codec"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
 msgid "Add column"
 msgstr "Spalte hinzufügen"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
 msgid "Edit column"
 msgstr "Spalte bearbeiten"
 
-#: ../plugins/gtkui/plcommon.c:1224
+#: ../plugins/gtkui/playlist/plcommon.c:869
 msgid "Remove column"
 msgstr "Spalte entfernen"
 
-#: ../plugins/gtkui/plcommon.c:1234
+#: ../plugins/gtkui/playlist/plcommon.c:884
 msgid "Pin groups when scrolling"
-msgstr "Gruppen beim Scrollen fixieren"
+msgstr "Gruppen beim scrollen fixieren"
 
-#: ../plugins/gtkui/plcommon.c:1239
+#: ../plugins/gtkui/playlist/plcommon.c:889
 msgid "Group by"
 msgstr "Gruppieren nach"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Nichts"
-
-#: ../plugins/gtkui/plcommon.c:1250
+#: ../plugins/gtkui/playlist/plcommon.c:900
 msgid "Artist/Date/Album"
 msgstr "Künstler/Datum/Album"
 
-#: ../plugins/gtkui/pluginconf.c:42
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Titel als nächsten abspielen"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Titel in Warteschlange einreihen"
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Aus Warteschlange entfernen"
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Metadaten neu laden"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "_Ausschneiden"
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "_Kopieren"
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "_Einfügen"
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Vom Datenträger löschen"
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Wiedergabeliste entfernen"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Neue Wiedergabeliste"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Automatische Sortierung aktivieren"
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr "Beim Hinzufügen neuer Dateien zur Wiedergabeliste wird die zuletzt gewählte Sortierung jedes Mal wieder angewendet."
+
+#: ../plugins/gtkui/pluginconf.c:47
 msgid "Open file..."
 msgstr "Datei öffnen..."
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/gtkui/pluginconf.c:559
 #, c-format
 msgid "Configure %s"
 msgstr "%s konfigurieren"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Standard Ausgabegerät"
-
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin/prefwin.c:140
 msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr "Änderungen an den Hotkey-Einstellungen wurde nicht gespeichert"
+msgstr "Änderungen der Tastenkombinationen wurden nicht gespeichert."
 
-#: ../plugins/gtkui/prefwin.c:350
+#: ../plugins/gtkui/prefwin/prefwin.c:142
 msgid "Are you sure you want to continue without saving?"
-msgstr "Wollen Sie sicher ohne Speichern fortfahren?"
+msgstr "Ohne Speichern fortfahren?"
 
-#: ../plugins/gtkui/progress.c:56
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Standard-Ausgabegerät"
+
+#: ../plugins/gtkui/progress.c:62
 msgid "Adding files..."
 msgstr "Dateien hinzufügen..."
 
-#: ../plugins/gtkui/progress.c:89
+#: ../plugins/gtkui/progress.c:95
 msgid "Initializing..."
-msgstr "Initialisiere..."
+msgstr "Starte..."
+
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Fortschritt der Metadaten-Aktualisierung"
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Name"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Album-Gain"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Titel-Gain"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Album-Höchstwert"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Titelhöchstwert"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Erfolg"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Datei nicht gefunden"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Ungültige Datei"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Suche (%list_total% results)"
 
-#: ../plugins/gtkui/trkproperties.c:168
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Spaltentitel anzeigen"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Wert"
+
+#: ../plugins/gtkui/trkproperties.c:116
 msgid "You've modified data for this track."
-msgstr "Sie haben Daten für diesen Titel geändert."
+msgstr "Die Daten dieses Titel wurden verändert."
 
-#: ../plugins/gtkui/trkproperties.c:170
+#: ../plugins/gtkui/trkproperties.c:118
 msgid "Really close the window?"
-msgstr "Möchten Sie das Fenster wirklich schließen?"
+msgstr "Fenster wirklich schließen?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
 msgid "Multiple values "
 msgstr "Mehrere Werte "
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
+#: ../plugins/gtkui/trkproperties.c:455
 msgid "Key"
 msgstr "Schlüssel"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Wert"
-
-#: ../plugins/gtkui/trkproperties.c:522
+#: ../plugins/gtkui/trkproperties.c:473
 msgid "Multiple values"
 msgstr "Mehrere Werte"
 
-#: ../plugins/gtkui/trkproperties.c:701
+#: ../plugins/gtkui/trkproperties.c:662
 msgid "Writing tags..."
-msgstr "Speichere Tags..."
+msgstr "Schreibe Metadaten..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "Element"
 
-#: ../plugins/gtkui/trkproperties.c:730
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Feld"
+
+#: ../plugins/gtkui/trkproperties.c:1210
 msgid "Field name"
 msgstr "Feldname"
 
-#: ../plugins/gtkui/trkproperties.c:733
+#: ../plugins/gtkui/trkproperties.c:1213
 msgid "Name:"
 msgstr "Name:"
 
-#: ../plugins/gtkui/trkproperties.c:745
+#: ../plugins/gtkui/trkproperties.c:1226
 msgid "Field names must not start with : or _"
 msgstr "Feldnamen dürfen nicht mit : oder _ beginnen"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
 msgid "Cannot add field"
-msgstr "Kann Feld nicht hinzufügen"
+msgstr "Feld konnte nicht hinzugefügt werden"
 
-#: ../plugins/gtkui/trkproperties.c:784
+#: ../plugins/gtkui/trkproperties.c:1267
 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."
+msgstr "Ein Feld mit diesem Namen existiert bereits, bitte einen anderen Namen wählen."
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Feld hinzufügen"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Widget \"%s\" ist nicht verfügbar"
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Feld entfernen"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Ersetze durch..."
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Benutzung: deadbeef Optionen -- Datei(en)\n"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Einfügen..."
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Optionen:\n"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Ausschneiden"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help oder -h Hilfe (diese Meldung) anzeigen und beenden\n"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopieren"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Player beenden\n"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Einfügen"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Versionsinformationen anzeigen und beenden\n"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Bezug"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Wiedergabe starten\n"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Mehrere Widgets dieser Art werden nicht unterstützt"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Wiedergabe beenden\n"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Proportionale Größeneinteilung"
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Höhe des unteren Bereichs sperren"
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Breite des linken Bereichs sperren"
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Höhe des oberen Bereichs sperren"
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Breite des rechten Bereichs sperren"
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Reiter umbenennen"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Wiedergabe pausieren\n"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Reiter entfernen"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Wiedergabe umschalten (Play/Pause)\n"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Neuen Reiter hinzufügen"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
-" --play-pause Wiedergabe starten falls angehalten, sonst pausieren\n"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Reiter nach links verschieben"
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Reiter nach rechts verschieben"
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr "Rendering-Modus"
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr "Mehrkanal"
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr "Skala"
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "Automatisch"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Nächster Titel in der Wiedergabeliste\n"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Vorheriger Titel in der Wiedergabeliste\n"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Zufälliger Titel in der Wiedergabeliste\n"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr "3x"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr ""
-" --queue Datei(en) an bestehende Wiedergabeliste anhängen\n"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
-"--gui PLUGIN Gibt an welches GUI-Plugin benutzt werden soll, Standard ist "
-"\"GTK2\"\n"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr "Fragmentdauer"
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 ms"
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 ms"
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 ms"
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 ms"
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 ms"
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr "Einzelne Frequenzen"
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr "1/12 Oktavband"
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr "1/24 Oktavband"
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr "Lückengröße"
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr "1/2 Balken"
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr "1/3 Balken"
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr "1/4 Balken"
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr "1/5 Balken"
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr "1/6 Balken"
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr "1/7 Balken"
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr "1/8 Balken"
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr "1/9 Balken"
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr "1/10 Balken"
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Box um 1 Element erweitern"
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Box um 1 Element verkleinern"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr ""
-" --nowplaying FMT Formatierten Tracknamen auf Standardausgabe schreiben\n"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Gleichmäßig"
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Erweitern"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Ausfüllen"
 
-#: ../main.c:106
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Knopf konfigurieren"
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr "Dezibel-Skala"
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr "Lineare Skala"
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr "Kubische Skala"
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Stimmen:"
+
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-Syntax: artist, titel, Album,\n"
-" länge, Titelnummer, yJahr, cKommentar,\n"
-" copyright, everstrichen\n"
+msgid "Copy of %s"
+msgstr "Kopie von %s"
 
-#: ../main.c:109
+#: ../plugins/hotkeys/actionhandlers.c:827
 #, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr ""
-" z.B.: --nowplaying \"%%a - %%t\" sollte \"Artist - "
-"Titel\" ausgeben\n"
+msgid "Copy of %s (%d)"
+msgstr "Kopie von %s (%d)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "(pausiert)"
 
-#: ../main.c:110
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "(gestoppt)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "(spielend)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
 #, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Standard"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Elemente"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Ja"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Wiedergabelisten-Browser"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Nein"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Benutzerdefinierte Shell-Kommandos"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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\n"
-"Wiedergabe\n"
-"Album Art\n"
-"Künstler - Album\n"
-"Künstler\n"
-"Album\n"
-"Titel\n"
-"Dauer\n"
-"Track-Nr.\n"
-"Band / Album-Künstler\n"
-"Benutzerdefiniert"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Schließen"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Links\n"
-"Rechts"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Kommando bearbeiten"
+
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Kommando:"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Ausschalten\n"
-"Track\n"
-"Album"
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr "Beliebiges Shell-Kommando. Wird in der Shell ausgeführt, in der die Anwendung gestartet wurde. Titelformatierung kann genutzt werden. Beispiel: xdg-open %D"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
+
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Beliebiger Name, zum Beispiel \"Mein Shell-Command\""
+
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Ascending\n"
-"Descending"
-msgstr ""
-"Aufsteigend\n"
-"Absteigend"
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Befehls-ID, vorzugsweise eine kurze Bezeichnung, zum Beispiel \"youtube_open\". Die Bezeichnung muss eindeutig sein."
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Einzelne Titel"
+
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Funktioniert mit einzelnem Titel."
+
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Mehrere Titel"
+
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Funktioniert mit mehreren Titel."
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Lokale Dateien"
+
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Funktioniert mit lokalen Dateien."
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Entfernte Dateien"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Funktioniert mit entfernten Dateien (z.B. http:// Streams)"
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Allgemein (Hauptmenü)"
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "Element soll im Hauptmenü erscheinen"
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
-msgstr ""
-"2.3 (Empfohlen)\n"
-"2.4"
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr "Beim Hinzufügen des Kommandos zum Hauptmenü bitte sicherstellen, dass der Titel den Menüpfad in Englisch enthält. Zum Beispiel: \"File/My Command\""
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Kommando hinzufügen"
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "Diese Aktion wird das gewählte Profil löschen. Fortfahren?"
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Löschen bestätigen"
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID darf nicht leer und muss eindeutig sein.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Titel darf nicht leer sein.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "Shell-Kommando darf nicht leer sein.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Ungültige Werte"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, 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-Konfigurationsdatei nicht gefunden. Bitte das Paket "
-"timidity-freepats installieren, oder den Pfad zur freepats.cfg in den Plugin-"
-"Einstellungen angeben."
+msgstr "wildmidi: freepats-Konfigurationsdatei nicht gefunden. Bitte das Paket timidity-freepats installieren, oder den Pfad zur freepats.cfg in den Plugin-Einstellungen angeben."
 
-#. 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 "Bei Last.fm nachschlagen"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "Mono"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "ALSA-Resampling verwenden"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "Stereo"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Gerät bei angehaltener Wiedergabe freigeben"
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Titel"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Bevorzugte Puffergröße"
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Interpret"
 
 #: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Bevorzugte Periodengröße"
+msgid "Total Tracks"
+msgstr "Gesamtanzahl Titel"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Genre"
 
-#. Last.fm plugin
 #: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Scrobbler aktivieren"
+msgid "Composer"
+msgstr "Komponist"
 
 #: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Nowplaying deaktivieren"
+msgid "Disc Number"
+msgstr "CD-Nummer"
 
 #: ../translation/extra.c:13
-msgid "Username"
-msgstr "Benutzername"
+msgid "Total Discs"
+msgstr "Anzahl CDs"
 
 #: ../translation/extra.c:14
-msgid "Password"
-msgstr "Passwort"
+msgid "Comment"
+msgstr "Kommentar"
 
 #: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble-URL"
+msgid "Encoder / Vendor"
+msgstr "Encoder / Anbieter"
 
 #: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Bevorzuge Album-Künstler statt Künstler als Feld"
+msgid "Copyright"
+msgstr "Lizenz"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Ort"
 
-#. OSS output plugin
 #: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Ausgabegerät"
+msgid "Subtrack Index"
+msgstr "Subtitel-Index"
 
 #: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Workaround für den OSS4-Samplerate-Bug"
+msgid "Tag Type(s)"
+msgstr "Metadaten-Typ"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Eingebettetes Cusheet"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr "Name des PipeWire-Fernbedienungs-Daemon (Standard: leer)"
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr "Benutzerdefinierte Eigenschaften (ersetzt bestehende):"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Cache-Aktualisierungsperiode (Stunden)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr "PipeWire-Laustärkeregelung nutzen"
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Ken-Emulation statt Satoh bevorzugen (Surround wird nicht funktionieren)"
 
-#: ../translation/extra.c:22
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Surround-Sound aktivieren"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "ALSA-Resampling verwenden"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Bevorzugte Puffergröße"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Bevorzugte Periodengröße"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr "Titelbild aktualisieren"
+
+#: ../translation/plugins.c:24
+#, no-c-format
 msgid "Fetch from embedded tags"
-msgstr "Aus eingebetteten Tags lesen"
+msgstr "Aus eingebetteten Metadaten lesen"
 
-#: ../translation/extra.c:23
+#: ../translation/plugins.c:26
+#, no-c-format
 msgid "Fetch from local folder"
 msgstr "Aus lokalem Verzeichnis lesen"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Maske für lokale Cover-Dateien"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Von Last.fm holen"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Von albumart.org holen"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Artwork zu längerer Seite skalieren"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "CDDB/FreeDB verwenden"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "von last.fm beziehen"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "von MusicBrainz beziehen"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "von albumart.org beziehen"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "von World of Spectrum (AY-Dateien) beziehen"
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Heruntergeladene Dateien im Musikordner speichern"
 
-#: ../translation/extra.c:30
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Falls kein Titelbild gefunden wurde"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "Leer lassen"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "Das Standard-Titelbild nehmen"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "Benutzerdefiniertes Titelbild anzeigen"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Pfad zum Titelbild:"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "Unter Dateinamen speichern"
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr "Suchmaske (getrennt durch ;)"
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr "Suchordner (getrennt durch ;)"
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "Cache-Auffrischung (Std.)"
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "Vereinfachte Cache-Dateinamen"
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Bildgröße (Pixel)"
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "Zu ladendes CD-Laufwerk"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Audio-CD Laufwerk"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Datei"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Audio-CD hinzufügen"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr "Benutze CDDB/GnuDb"
+
+#: ../translation/plugins.c:71
+#, no-c-format
 msgid "Prefer CD-Text over CDDB"
-msgstr "CD-Text gegenüber CDDB vorziehen"
+msgstr "CD-Text statt CDDB bevorzugen"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB-URL (z.B. 'freedb.org')"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr "CDDB-Webadresse (z.B. 'gnudb.gnudb.org')"
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB-Port (z.B. '888')"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr "CDDB-Port-Nummer (z.B. '8880')"
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "CDDB-Protokoll gegenüber HTTP vorziehen"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Benutze das CDDB-Protokoll"
 
-#: ../translation/extra.c:34
+#: ../translation/plugins.c:79
+#, no-c-format
 msgid "Enable NRG image support"
-msgstr "Unterstützung von NRG-Abbilddateien einschalten"
+msgstr "Unterstützung von NRG-Abbilddateien aktivieren"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Resampling-Qualität (0..2, höher ist besser)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-bit Ausgabe (Standard ist 16)"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Laufwerksgeschwindigkeit für normales Abspielen"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Maximale Song-Länge (in Minuten)"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Ausblenddauer (Sekunden)"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Spiele Wiederholungen mehrmals (wenn verfügbar)"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Max"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Entfernen von Dateien vom Datenträger bestätigen lassen"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Beim Auslesen cdparanoia-Fehlerkorrektur benutzen"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Sensitivität des Volumenreglers im Systemleisten-Icon"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Umwandeln"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Benutzerdefiniertes Systemleisten-Icon"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Sample-Rate des Geräts automatisch erkennen"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "gtk_init mit --sync ausführen (Debug-Modus)"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Sample-Rate direkt setzen"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Kontextmenü-Einträge von verschiedenen Plugins trennen"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Qualität / Algorithmus"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Titel der Benachrichtigung"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Resampling-Qualität"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Inhalt der Benachrichtigung"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Interne DUMB-Lautstärke"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Album Artwork anzeigen"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Lautstärkeregler"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Größe des Album Artworks (Pixel)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Nur An/Aus"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio Server"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Alles"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Samplerate"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8-bit-Audioausgabe"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Relativer Pfad der Suchtabelle"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Alle von ffmpeg unterstützten Erweiterungen benutzen"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Absoluter Pfad der Suchtabelle"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Dateiendungen (getrennt durch ;)"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Audio-Bytes vertauschen (umschalten, falls nur Rauschen zu hören ist)"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr "DoP-Ausgabe aktivieren"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "HVSC Songlängen-Datenbank aktivieren"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Defekte Kopfzeilen ignorieren"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Pfad zur songlengths.txt (von HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bits pro Sample (8 oder 16)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Nichtdekodierbare Fehler beim Streamen ignorieren"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Standard-Songlänge (Sekunden)"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Maximale Lieddauer (in Minuten)"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ Konfigurationsdatei"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Ausblenddauer (Sekunden)"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Titel"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Anzahl der Wiederholungen (falls verfügbar)"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Interpret"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (für SGC Format)"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Gesamtanzahl Tracks"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Genre"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "ReplayGain-Informationen entfernen"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Verfasser"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Auswahl als Alben scannen (anhand der Metadaten)"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Disk-Nummer"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Auswahl als einzelnes Album scannen"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Kommentar"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Einzelne(n) Titel scannen"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Encoder / Anbieter"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Alle Dateien Track-Gainen, die keine Metainfos haben"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Ort"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Auswahl aufheben"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Subtrack-Index"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Alle auswählen"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tag-Typ"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Web-Adresse hinzufügen"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Eingebettetes Cusheet"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Verzeichnis(se) hinzufügen"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Codec"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Datei(en) hinzufügen"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Dateiendungen (trennen mit ';')"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Datei(en) öffnen"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Konvertieren"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Hilfeseite anzeigen"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Samplerate"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Wiederholungsmodus durchwechseln"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Qualität / Algorithmus"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Wiederholung - Aus"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Automatische Samplerate (überschreibt die Ziel-Samplerate)"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Wiederholung - Einzelner Titel"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Widerholung - Alle"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Deaktiviere lückenlose Wiedergabe (schnelleres Scannen)"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Zufallsmodus durchwechseln"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
-"Bevorzuge Ken-emulation gegenüber Satoh (Surround wird nicht funktionieren)"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Zufallsmodus - Zufällige Titel"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Aktiviere Surround-Sound"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Zufallsmodus - Alben"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr ""
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Zufallsmodus - Titel"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Die Datei existiert bereits. Überschreiben?"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Zufallsmodus - Aus"
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Converter: Warnung"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Mauszeiger folgt Wiedergabe umschalten"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Bitte einen Encoder auswählen"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Bildlauf folgt Wiedergabe umschalten"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Converter: Fehler"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Ansicht"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Konvertiere..."
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Menü anzeigen\\/verstecken"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Verzeichnis wählen..."
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Statusbar anzeigen\\/verstecken"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Fehler beim Speichern des Encoder-Profil"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Designmodus umschalten"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-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"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Benutzerdefiniertes Sortieren"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-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."
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Auswahl freistellen"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Fehler"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr "Titel aus Wiedergabeliste entfernen"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Neuen Encoder hinzufügen"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Wiedergabeliste speichern"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Encoder bearbeiten"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Aktuelle Wiedergabeliste entfernen"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Profil entfernen"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "Aktuelle Wiedergabeliste umbenennen"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Diese Aktion wird das gewählte Profil löschen. Sind Sie sicher?"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Equalizer anzeigen\\/verstecken"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Encoder"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Equalizer verstecken"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Plugin in DSP-Kette einfügen"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Equalizer anzeigen"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Fehler beim Speichern des DSP-Profils"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "DeaDBeeF-Fenster anzeigen\\/verstecken"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Neues DSP-Profil"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "DeaDBeeF-Fenster verstecken"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "DSP-Profil bearbeiten"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "DeaDBeeF-Fenster anzeigen"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP-Profile"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Suchen"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Zielverzeichnis:"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Log anzeigen\\/verstecken"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "In Verzeichnis der Quelldatei schreiben"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Löschen der Dateien vom Datenträger bestätigen lassen"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Verzeichnisstruktur beibehalten"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "Einstellungen Statussymbol"
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Dateiname:"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Empfindlichkeit des Lautstärkereglers in der Statusleiste"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:252
 #, no-c-format
-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)."
+msgid "Custom status icon"
+msgstr "Benutzerdefiniertes Statusleistensymbol"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Encoder:"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr "Sonstiges"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP-Profil:"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Kontextmenü-Einträge von verschiedenen Plugins trennen"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Thread-Anzahl:"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Unicode-Charakter statt Bildern für Titelstatus verwenden"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Ausgabe-Sampleformat:"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Overlay-Text in Fortschrittsbalken deaktivieren"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Format der Eingangsdatei verwenden"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr "Vorheriger Titel oder aktuellen Titel neu laden"
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit signed int"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "Wiedergabeliste duplizieren"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit signed int"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr "Zum aktuellen Titel springen"
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit signed int"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Springen zu"
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit signed int"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Vorheriges Genre"
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit float"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Vorheriger Komponist"
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Falls Datei bereits existiert:"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Vorheriger Künstler"
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Nachfragen"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Vorheriges Album"
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Überschreiben"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Nächstes Genre"
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Profil laden"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Nächster Komponist"
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Neuer Encoder"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Nächster Künstler"
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Endung der Zieldatei:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "Nächstes Album"
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Z.B. mp3"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Nächste Wiedergabeliste"
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Kommandozeile:"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Vorherige Wiedergabeliste"
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:293
 #, no-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"
+msgid "Switch to Playlist 10"
+msgstr "Zu Wiedergabeliste 10 wechseln"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:295
 #, no-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"
+msgid "Switch to Playlist 9"
+msgstr "Zu Wiedergabeliste 9 wechseln"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Methode:"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "Zu Wiedergabeliste 8 wechseln"
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Pipe"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Zu Wiedergabeliste 7 wechseln"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Temporäre Datei"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "Zu Wiedergabeliste 6 wechseln"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Zu Wiedergabeliste 5 wechseln"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Zu Wiedergabeliste 4 wechseln"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Zu Wiedergabeliste 3 wechseln"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Zu Wiedergabeliste 2 wechseln"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Zu Wiedergabeliste 1 wechseln"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Tags schreiben"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Zufällig sortieren"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP-Profileditor"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Nach Datum sortieren"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Neues DSP-Profil"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Nach Künstler sortieren"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Hinzufügen"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Nach Album sortieren"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Pixmap-Datei nicht gefunden: %s"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Nach Titelnummer sortieren"
 
-#: ../plugins/converter/converter.glade.h:12
-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 ""
-"Ursprüngliches Format behalten\n"
-"8 bit signed int\n"
-"16 bit signed int\n"
-"24 bit signed int\n"
-"32 bit signed int\n"
-"32 bit float"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Nach Titel sortieren"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
-msgstr ""
-"Nachfragen\n"
-"Überschreiben"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Auswahl umkehren"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
-"Pipe\n"
-"Temporäre Datei"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Wiedergabeliste löschen"
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
-msgstr "Benutzerdefinierte Shell-Kommandos"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr "Zur Warteschlange hinzufügen"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Bearbeiten"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr "An den Anfang der Warteschlange stellen"
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
-msgstr "Schließen"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr "Warteschlange umschalten"
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
-msgstr "Kommando bearbeiten"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Verschieben"
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
-msgstr "Kommando:"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Titel nach unten verschieben"
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:341
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
-msgstr ""
-"Beliebiges Shell-Kommando. Wird in der Shell ausgeführt, in welcher die "
-"Anwendung gestartet wurde. Titel-Formatierung kann benutzt werden. Beispiel: "
-"xdg-open %D"
+msgid "Move Tracks Up"
+msgstr "Titel nach oben verschieben"
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
-msgstr "ID:"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Stumm umschalten"
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
-msgstr "Beliebiger Name, zum Beispiel \"Mein Shell-Command\""
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Pause umschalten"
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"Befehls-ID, normalerweise sollte es eine kurze Bezeichnung sein, zum "
-"Beispiel \"youtube_open\". Die Bezeichnung muss eindeutig sein."
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Abspielen\\/Pausieren"
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
-msgstr "Einzelne Tracks"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Springe 1s nach vorne"
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
-msgstr "Funktioniert mit einzelnem Track."
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Springe 1s zurück"
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
-msgstr "Mehrere Tracks"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Springe 5s nach vorne"
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
-msgstr "Funktioniert mit mehreren Tracks."
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Springe 5s zurück"
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
-msgstr "Lokale Dateien"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Springe 1% nach vorne"
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
-msgstr "Funktioniert mit lokalen Dateien."
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Springe 1% zurück"
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
-msgstr "Entfernte Dateien"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Springe 5% nach vorne"
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
-msgstr "Funktioniert mit entfernten Dateien (z.B. http:// Streams)"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Springe 5% zurück"
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
-msgstr "Allgemein (Hauptmenü)"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Lautstärke hoch"
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
-msgstr "Element soll im Hauptmenü erscheinen"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Lautstärke herunter"
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
-msgstr ""
-"Wenn Sie das Kommando zum Hauptmenü hinzufügen wollen, stellen Sie "
-"sicher, dass der Titel den Menüpfad in Englisch enthält. Zum Beispiel: "
-"\"File/My Command\""
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Nach aktuellem Titel anhalten"
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
-msgstr "Kommando hinzufügen"
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Nach aktuellem Album anhalten"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Löschen"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr "Bei Last.fm nachschlagen"
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
-"Diese Aktion wird das ausgewählte Shell-Kommando löschen. Sind Sie sicher?"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "scrobbler aktivieren"
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
-msgstr "Bestätige Entfernen"
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "nowplaying deaktivieren"
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
-msgstr "ID darf nicht leer und muss eindeutig sein.\n"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Benutzername"
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
-msgstr "Titel darf nicht leer sein.\n"
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Passwort"
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
-msgstr "Shell-Kommando darf nicht leer sein.\n"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "scrobble-URL"
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
-msgstr "Ungültige Werte"
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Album-Künstler statt Künstler als Feld bevorzugen"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Unterstützte Sound-Formate"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "MusicBrainz-ID senden"
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Alle Dateien (*)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Titel kürzer als 30 Sekunden übermitteln (nicht empfohlen)"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Öffne Datei(en)..."
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Mix links"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Datei(en) zu Wiedergabeliste hinzufügen..."
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Mix rechts"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Ordner zu Wiedergabeliste hinzufügen..."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "16-bit Ausgabe erzwingen"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Folge symbolischen Links"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Backend"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Titelformat der Benachrichtigung"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Lösche von Datenträger"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Inhaltsformat der Benachrichtigung"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
-msgstr ""
-"Dateien werden verloren gehen. Fortführen?\n"
-"(Dieser Dialog kann in den Einstellung des GTKUI-Plugins deaktiviert werden)"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Titelbild anzeigen"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Wiedergabeliste laden"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Größe des Titelbilds (Pixel)"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Andere Dateien (*)"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr "Benachrichtigungen nicht wiederverwenden (KDE-Eigenart)"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Speichere Wiedergabeliste als"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Ausgabegerät"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "DeaDBeeF playlist files (*.dbpl)"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Aktuelle Wiedergabeliste hervorheben"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Inhalts-Typ"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Bei Doppelklick abspielen"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Ungültige(r) Wert(e)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Puffergröße (-1 als optimaler Wert portaudio)"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
-msgstr ""
-"Die Felder Inhalts-Typ und Erweiterung dürfen nicht leer sein, und müssen "
-"den Regeln entsprechen:\n"
-"Beispiel Inhalts-Typ: 'audio/mpeg'.\n"
-"Beispiel Erweiterung: 'stdmpg ffmpeg'.\n"
-"Leerzeichen müssen als Trenner im Erweiterungs-Feld verwendet werden.\n"
-"Inhalts-Typen dürfen nur Buchstaben, Ziffern und das '-' Zeichen enthalten.\n"
-"Erweiterungen dürfen nur Buchstaben und Ziffern enthalten."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Gerätenamen-Kodierung"
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Nichts ist ausgewählt."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr ""
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Ersetze mit..."
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Im Folgenden definiert"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Einfügen..."
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Standard-Gerätenamen-Kodierung"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Ausschneiden"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio Server (leer lassen für Standard)"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Kopieren"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Standard-Lieddauer (in Minuten)"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Einfügen"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Sample-Rate"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr "Mehrere Widgets dieser Art werden nicht unterstützt"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Überspringen, wenn kürzer als (Sekunden)"
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Position sperren"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Reiter nach links bewegen"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Reiter nach rechts bewegen"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Benutzerdefinierte Shell-Kommandos"
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Reiter entfernen"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Relativer Pfad der Suchtabelle"
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Reiter umbennen"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Absoluter Pfad der Suchtabelle"
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Neuen Reiter hinzufügen"
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Audio-Bytes vertauschen (umschalten, falls nur Rauschen zu hören ist)"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Zeige Spaltentitel"
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "HVSC Songlängen-Datenbank aktivieren"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Erweitere die Box um 1 Element"
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Voller Pfad zu Songlengths.md5/.txt"
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "Reduziere die Box um 1 Element"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Bits pro Sample"
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Gleichmäßig"
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Standard-Lieddauer (Sekunden)"
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Erweitern"
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Mono-Synth"
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Ausfüllen"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Protokollierung aktivieren"
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Bearbeite Knopf"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Vorverstärker"
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr ""
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Wiedergabeliste editieren"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Wiedergabeliste umbenennen"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Wiedergabeliste entfernen"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Neue Wiedergabeliste"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Name"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Wiedergabelisten-Browser"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ Konfigurationsdatei"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "Dateiendung"
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr "Encoder-Kommandozeile"
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr "Datenübertragungsmethode"
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr "Pipe (stdin)"
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "Temporäre Datei"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "Quelldatei"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "ID3v2-Metadaten schreiben"
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "ID3v1-Metadaten schreiben"
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "APEv2-Metadaten schreiben"
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "FLAC-Metadaten schreiben"
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "OggVorbis-Metadaten schreiben"
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "MP4-Metadaten schreiben"

deadbeef-0.6.2.tar.bz2/po/el.po -> deadbeef-1.9.6.tar.bz2/po/el.po Changed

@@ -1,908 +1,1464 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # George Koutsikos <ragecryx@yahoo.gr>, 2010
 # George Koutsikos <ragecryx@yahoo.gr>, 2010
-# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2013
+# mAnlis mAnlAkis <www.1908jeep@gmail.com>, 2016
+# N P <avnpap@gmail.com>, 2017
+# Γιάννης Ανθυμίδης, 2013
+# Yannis Anthymidis, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/el/)\n"
-"Language: el\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Γιάννης Ανθυμίδης, 2013\n"
+"Language-Team: Greek (http://app.transifex.com/deadbeef-player/deadbeef-player/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Σχετικά με το DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Χρήση: deadbeef επιλογές -- αρχείο(-α)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Αλλαγές DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Επιλογές:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Μεταφραστές του DeaDBeeF"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ή -h Εμφάνιση κειμένου βοήθειας (αυτό το κείμενο) και έξοδος\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Αποθήκευση ρύθμισης DeaDBeeF EQ"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr "--quit Έξοδος\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Αρχεία ρύθμισης DeaDBeeF EQ (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr "--version Εμφάνιση πληροφοριών έκδοσης και έξοδος\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Φόρτωση ρύθμισης DeaDBeeF EQ"
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr "--play Εκκίνηση αναπαραγωγής\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Ρυθμίσεις DeaDBeeF EQ (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr "--stop Διακοπή αναπαραγωγής\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Εισαγωγή ρυθμίσεων Foobar2000 EQ..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr "--pause Παύση αναπαραγωγής\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Ρυθμίσεις Foobar2000 EQ (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr "--toggle-pause Εναλλαγή παύσης\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Αποθήκευση Ρύθμισης"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr "--play-pause Εκκίνηση αναπαραγωγής αν είναι σταματημένο, αλλιώς εναλλαγή παύσης\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Φόρτωση Ρύθμισης"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr "--next Επόμενο κομμάτι στη λίστα αναπαραγωγής\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Εισαγωγή Ρύθμισης Foobar2000"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr "--prev Προηγούμενο κομμάτι στη λίστα αναπαραγωγής\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Ενεργό"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr "--random Τυχαίο κομμάτι στη λίστα αναπαραγωγής\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Μηδενισμός Όλων"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr "--queue Προσάρτηση αρχείου(-ων) στην υπάρχουσα λίστα αναπαραγωγής\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Μηδενισμός Προενίσχυσης"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr "--gui PLUGIN Επιλέγει ποιό πρόσθετο γραφικής διεπαφής θα χρησιμοποιηθεί, το προκαθορισμένο είναι το \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Μηδενισμός Ζωνών"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr "--nowplaying FMT Εμφάνιση μορφοποιημένου ονόματος κομματιού\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Προρυθμίσεις"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr "FMT %%-συντακτικό: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 μέρα %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d μέρες %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "για περισσότερες πληροφορίες, δες %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Σταματημένο | %d κομμάτια | %s συνολικός χρόνος αναπαραγωγής"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Μονοφωνικό"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Στερεοφωνικό"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Παύση | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d κομμάτια | %s συνολικός "
-"χρόνος αναπαραγωγής"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Νέα Λίστα Αναπαραγωγής"
-
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:161
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Νέα Λίστα Αναπαραγωγής (%d)"
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Λίστα αναπαραγωγής με καρτέλες"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Λίστα Αναπαραγωγής"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Καρτέλες λιστών αναπαραγωγής"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Προεπιλογή"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Ιδιότητες επιλογής"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Μονοφωνικό"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Προβολή εξώφυλλων"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Στερεοφωνικό"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Ναί"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Όχι"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Φάκελος εξόδου:"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Κουμπί"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Όνομα αρχείου εξόδου:"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Κωδικοποιητής:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Ρύθμιση DSP:"
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Αριθμός νημάτων:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Μορφή δειγματοληψίας εξόδου:"
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Όταν το αρχείο υπάρχει ήδη:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Αποτυχία κατά την ανάγνωση του αρχείου βοήθειας"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Επεξεργασία Ρύθμισης Κωδικοποιητή"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Αποτυχία κατά τη φόρτωση του αρχείου βοήθειας"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Τίτλος:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Ανώνυμος Κωδικοποιητής"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Επέκταση αρχείου εξόδου:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Π.χ. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Γραμμή εντολών:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - όνομα αρχείου εξόδου\n%i - όνομα προσωρινού αρχείου εισόδου"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Μέθοδος"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:37
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Θέλετε πραγματικά να τερματίσετε την εφαρμογή;"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Συγγραφέας ετικετών"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Επεξεργαστής Ρυθμίσεων DSP"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Τίτλος"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Ανώνυμη Ρύθμιση DSP"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Προσθήκη"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Αφαίρεση"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Ρύθμιση"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Επιλέξτε Πρόσθετο DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Πρόσθετο"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Προρυθμίσεις"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Το αρχείο υπάρχει ήδη. Να αντικατασταθεί;"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Προειδοποίηση μετατροπής"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Παρακαλώ επιλέξτε κωδικοποιητή "
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Σφάλμα μετατροπέα"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Μετατροπή..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Επιλογή φακέλου"
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Αποτυχία αποθήκευσης προρύθμισης κωδικοποιητή "
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Ελέγξτε τα δικαιώματα του φακέλου προρυθμίσεων, δοκιμάστε με ένα διαφορετικό όνομα, ή ελευθερώστε χώρο στο σκληρό δίσκο"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Υπάρχει ήδη μια προρύθμιση με αυτό το όνομα. Δοκιμάστε να διαλέξετε ένα διαφορετικό όνομα."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Προσθήκη κωδικοποιητή"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Επεξεργασία κωδικοποιητή"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Αφαίρεση προρύθμισης"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Αυτή η ενέργεια θα διαγράψει την επιλεγμένη προρύθμιση. Είστε σίγουροι;"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Κωδικοποιητές"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Προσθήκη πρόσθετου στην αλυσίδα DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Αποτυχία αποθήκευσης προρύθμισης DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Νέα Προρύθμιση DSP"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Επεξεργασία Προρύθμισης DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Προρυθμίσεις DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Βοήθεια"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Διατήρηση μορφής εισόδου"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "Προσημασμένος ακέραιος 8 bit"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "Προσημασμένος ακέραιος 16 bit"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "Προσημασμένος ακέραιος 24 bit"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "Προσημασμένος ακέραιος 32 bit"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "Δεκαδικός 32 bit"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Παράλειψη "
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Ερώτηση"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Αντικατάσταση"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Σωλήνωση"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Δε βρέθηκε το αρχείο pixmap: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Άνοιγμα αρχείου(-ων)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Προσθήκη αρχείου(-ων) στη λίστα αναπαραγωγής..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Προσθήκη φακέλου(-ων) στη λίστα αναπαραγωγής..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Φόρτωση Λίστας Αναπαραγωγής"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Αποθήκευση Λίστας Αναπαραγωγής Ως"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Σχετικά με το DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Αλλαγές DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Μεταφραστές του DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Τύπος περιεχομένου"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Πρόσθετα"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Μη έγκυρη(-ες) τιμή(-ες)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Δεν έχει επιλεχτεί τίποτα."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Άνοιγμα αρχείου(-ων)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Προσθήκη αρχείου(-ων)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Προσθήκη φακέλου(-ων)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Προσθήκη τοποθεσίας"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Νέα λίστα αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Φόρτωση λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Αποθήκευση λίστας αναπαραγωγής"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Καθαρισμός"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Επιλογή όλων"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Αποεπιλογή όλων"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Αναστροφή επιλογής"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Επιλεγμένο"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Αφαίρεση"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Περικοπή"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Αναζήτηση"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Ταξινόμηση κατά"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Τίτλος"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Αριθμός κομματιού"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Άλμπουμ"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Καλλιτέχνης"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Τυχαία"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Αυτοσχέδιο"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Ρυθμίσεις"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Εμφανίση"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Μπάρα κατάστασης"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Ισοσταθμιστής"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Λειτουργία σχεδίασης"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "Α_ναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Σειρά"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Γραμμικά"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Ανακάτεμα κομματιών"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Ανακάτεμα άλμπουμ"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Επανάληψη"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Επανάληψη όλων"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Επανάληψη ενός τραγουδιού"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Να μην γίνει επανάληψη"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Η κύλιση ακολουθεί την αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Ο δείκτης ποντικιού ακολουθεί την αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Μεταπήδηση στο τρέχον κομμάτι"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Αλλαγές"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Σχετικά"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Μεταφραστές"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Διακοπή"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Αναπαραγωγή τυχαίου"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Σχετικά"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Βοήθεια"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Ιδιότητες Κομματιού"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Τοποθεσία:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Επιλογές"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Εφαρμογή"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Μεταδεδομένα"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Τίτλος:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Άκυρο"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Εντάξει"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Εισαγωγή νέου τίτλου για τη στήλη"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Τύπος"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Αριθμός αντικειμένου"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Αναπαραγωγή"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Σχέδιο άλπουμ"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Καλλιτέχνης - Άλμπουμ"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Διάρκεια"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Αριθμός Κομματιού"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Συγκρότημα / Καλλιτέχνης άλμπουμ"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Μορφή:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Στοίχιση:"
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Αριστερά"
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Δεξιά"
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Στοίχιση:"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Άκυρο"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Αριστερά\nΔεξιά\nΚέντρο"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_Εντάξει"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Χρώμα κειμένου:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Πρόσθετο εξόδου:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Συσκευή εξόδου:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Να γίνεται πάντα μετατροπή του ήχου 8 bit σε 16 bit"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Να γίνεται πάντα μετατροπή του ήχου 16 bit σε 24 bit"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Ήχος"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Λειτουργία Replaygain:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Ανενεργό"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Κομμάτι"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Κορυφή κλίμακας Replaygain"
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Προενίσχυση Replaygain:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Καθολική προενίσχυση"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
 msgstr ""
-"Προσθήκη αρχείων από την γραμμή εντολών (ή το διαχειριστή αρχείων) σε αυτή "
-"τη λίστα αναπαραγωγής:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Προσθήκη αρχείων από την γραμμή εντολών (ή το διαχειριστή αρχείων) σε αυτή τη λίστα αναπαραγωγής:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Συνέχεια προηγούμενης συνεδρίας στην εκκίνηση"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Να μη γίνεται προσθήκη από αρχειοθήκες κατά την προσθήκη φακέλων"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Αναπαραγωγή"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Ρύθμιση"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "Προκαθορισμένες Ρυθμίσεις Αλυσίδας DSP"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Φόρτωση"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Ελαχιστοποίηση στο πλαίσιο συστήματος στο κλείσιμο"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Απόκρυψη εικονιδίου στο πλαίσιο συστήματος"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Ρυθμός ανανέωσης γραφικής διεπαφής (φορές το δευτερόλεπτο):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Τίτλος παραθύρου κατά την αναπαραγωγή:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Τίτος παραθύρου κατά τη διακοπή:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Πρόσθετο γραφικής διεπαφής (αλλαγή απαιτεί επανεκκίνηση):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "Αναπαραγωγέας"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr "Κλείσιμο λιστών αναπαραγωγής με το μέσο πλήκτρο του ποντικιού"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
-msgstr ""
-"Αυτόματη απόδοση ονόματος στις λίστες αναπαραγωγής όταν φορτώνεται ένας "
-"κατάλογος"
+msgstr "Αυτόματη απόδοση ονόματος στις λίστες αναπαραγωγής όταν φορτώνεται ένας κατάλογος"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Λίστα Αναπαραγωγής"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Παράκαμψη"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Προσκήνιο"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Παρασκήνιο"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Χρώματα μπάρας μετατόπισης/ήχου"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Μέση"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Φωτεινό"
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
 msgstr "Σκοτεινό"
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Βάση"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Φωτεινό"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Μεσαίο"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
 msgstr "Κείμενο"
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Χρώματα στο χώρο καρτελών"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Παράκαμψη (χάνει το θέμα GTK treeview, αλλά επιταχύνει την απόδοση)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Ζυγή σειρά"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Μονή σειρά"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Επιλεγμένη σειρά"
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
 msgstr "Επιλεγμένο κείμενο"
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Δείκτης ποντικιού"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Χρώματα λίστας αναπαραγωγής"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Χρώματα"
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Στήλες"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Επιλεγμένο"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Δρομέας"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Φόντο:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Εμφάνιση"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Ενεργοποίηση Proxy Server"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Διεύθυνση Proxy Server:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Πόρτα Proxy Server:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Τύπος Proxy:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Όνομα χρήστη Proxy:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Κωδικός Proxy:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "Επεξεργασία Τύπων Περιεχομένου"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Δίκτυο"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "Προσδιορισμένες Συντομεύσεις:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Ενέργεια:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Δεν έχει οριστεί>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Συνδυασμός πλήκτρων:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Γενική συντόμευση"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -910,128 +1466,124 @@
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "_Προκαθορισμένα"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Συντομεύσεις"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Έκδοση:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Πνευματικά δικαιώματα"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Πρόσθετα"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Επαναφορά στα προκαθορισμένα"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Έκδοση:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Ομαδοποίηση Κατά ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Ταξινόμηση κατά ..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Μορφή"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Αύξουσα σειρά"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Φθίνουσα σειρά"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Επιλέξτε Πρόσθετο DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Πρόσθετο"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Αύξουσα σειρά\nΦθίνουσα σειρά"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Επιλογές Συγγραφέα Ετικετών"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Εγγραφή ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Εγγραφή ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Εγγραφή APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Αφαίρεση ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Αφαίρεση ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Αφαίρεση APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Έκδοση ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Προτείνεται)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Προτείνεται)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 κωδικοποίηση χαρακτήρων (προεπιλογή είναι iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Εγγραφή ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "Επιλογή Τύπων Περιεχομένου"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1039,1021 +1591,1017 @@
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Επαναφορά στα προκαθορισμένα"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "Τύπος περιεχομένου:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Πρόσθετα:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Ιδιότητες κουμπιού"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Χρώμα:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Χρώμα κειμένου:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Εικονίδιο:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Ετικέτα:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Επιλογή ενέργειας"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Καλλιτέχνης / Άλμπουμ"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Επεξεργασία"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Αρ. Κομματιού"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Προσθήκη στήλης"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Επεξεργασία στήλης"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Αφαίρεση στήλης"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Ομαδοποίηση κατά"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Καμία"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Καλλιτέχνης/Ημερομηνία/Άλμπουμ"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Άνοιγμα αρχείου..."
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Ρύθμιση %s"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Προεπιλεγμένη συσκευή ήχου"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Προσθήκη αρχείων"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Αρχικοποίηση..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Έχετε τροποποιήσει στοιχεία του κομματιού."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Είστε σίγουροι πως θέλετε να κλείσετε το παράθυρο;"
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Αποθήκευση ρύθμισης DeaDBeeF EQ"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Πολλαπλές τιμές"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Αρχεία ρύθμισης DeaDBeeF EQ (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Πλήκτρο"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Φόρτωση ρύθμισης DeaDBeeF EQ"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Τιμή"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Ρυθμίσεις DeaDBeeF EQ (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Πολλαπλές τιμές"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Εισαγωγή ρυθμίσεων Foobar2000 EQ..."
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Εγγραφή ετικετών..."
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Ρυθμίσεις Foobar2000 EQ (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Όνομα πεδίου"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Αποθήκευση Ρύθμισης"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Όνομα:"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Φόρτωση Ρύθμισης"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Τα πεδία ονόματος δεν πρέπει να ξεκινούν με : ή _"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Εισαγωγή Ρύθμισης Foobar2000"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Αποτυχία προσθήκης πεδίου"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Ενεργό"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Μηδενισμός Όλων"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Μηδενισμός Προενίσχυσης"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Μηδενισμός Ζωνών"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Νέα Λίστα Αναπαραγωγής"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Υποστηριζόμενα αρχεία ήχου "
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Όλα τα αρχεία (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
 msgstr ""
-"Υπάρχει ήδη πεδίο με αυτό το όνομα, παρακαλώ προσπαθήστε με ένα διαφορετικό "
-"όνομα."
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Προσθήκη πεδίου"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Αφαίρεση πεδίου"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Χρήση: deadbeef επιλογές -- αρχείο(-α)\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Άλλα αρχεία (*)"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Επιλογές:\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Αρχεία λιστών αναπαραγωγής DeaDBeeF EQ (*.dbpl)"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help ή -h Εμφάνιση κειμένου βοήθειας (αυτό το κείμενο) και έξοδος\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Ακολούθηση συμβολικών συνδέσμων"
 
-#: ../main.c:93
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --quit Quit player\n"
-msgstr "--quit Έξοδος\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 μέρα %d:%02d:%02d"
 
-#: ../main.c:94
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --version Print version info and exit\n"
-msgstr "--version Εμφάνιση πληροφοριών έκδοσης και έξοδος\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d μέρες %d:%02d:%02d"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr "--play Εκκίνηση αναπαραγωγής\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr "--stop Διακοπή αναπαραγωγής\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr "--pause Παύση αναπαραγωγής\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr "--toggle-pause Εναλλαγή παύσης\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
 msgstr ""
-"--play-pause Εκκίνηση αναπαραγωγής αν είναι σταματημένο, αλλιώς εναλλαγή "
-"παύσης\n"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr "--next Επόμενο κομμάτι στη λίστα αναπαραγωγής\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Μετονομασία Λίστας Αναπαραγωγής"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr "--prev Προηγούμενο κομμάτι στη λίστα αναπαραγωγής\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
 
-#: ../main.c:102
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --random Random song in playlist\n"
-msgstr "--random Τυχαίο κομμάτι στη λίστα αναπαραγωγής\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../main.c:103
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr "--queue Προσάρτηση αρχείου(-ων) στην υπάρχουσα λίστα αναπαραγωγής\n"
+msgid "New Playlist (%d)"
+msgstr "Νέα Λίστα Αναπαραγωγής (%d)"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Λίστα αναπαραγωγής με καρτέλες"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Χώρισμα (πάνω και κάτω)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Χώρισμα (αριστερά και δεξιά)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Καρτέλες"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Καρτέλες λιστών αναπαραγωγής"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Ιδιότητες επιλογής"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Προβολή εξώφυλλων"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
-"--gui PLUGIN Επιλέγει ποιό πρόσθετο γραφικής διεπαφής θα χρησιμοποιηθεί, το "
-"προκαθορισμένο είναι το \"GTK2\"\n"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr "--nowplaying FMT Εμφάνιση μορφοποιημένου ονόματος κομματιού\n"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Φάσμα"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
 msgstr ""
-"FMT %%-συντακτικό: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr "π.χ.: --nowplaying \"%%a - %%t\" θα εμφανίσει \"artist - title\"\n"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr ""
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Κουμπί"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Προεπιλογή"
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Ναί"
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Όχι"
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
-"Αριστερα\n"
-"Δεξιά"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Αποτυχία κατά την ανάγνωση του αρχείου βοήθειας"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Αποτυχία κατά τη φόρτωση του αρχείου βοήθειας"
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"Απενεργοποίηση\n"
-"Κομμάτι\n"
-"Άλμπουμ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Θέλετε πραγματικά να τερματίσετε την εφαρμογή;"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Ascending\n"
-"Descending"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Αύξουσα σειρά\n"
-"Φθίνουσα σειρά"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"2.3 (Προτείνεται)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, 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 "Do you really want to delete the selected file?%s"
 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Αναζήτηση στο Last.fm"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Χρήση αναδειγματοληψίας ALSA"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Απελευθέρωση συσκευής κατά τη διακοπή:"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Προτεινόμενο μέγεθος ενδιάμεσης μνήμης"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Διαγραφή"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Προτεινόμενο μέγεθος περιόδου"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Αριστερά"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Ενεργοποίηση scrobbler"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Δεξιά"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Απενεργοποίηση τρέχουσας-αναπαραγωγής"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Κέντρο"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Όνομα χρήστη:"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Κωδικός:"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Αρχείο συσκευής"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Επίλυση σφάλματος δειγματοληψίας OSS4"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Περίοδος ενημέρωσης προσωρινής μνήμης"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Κομμάτι"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Λήψη από τις ενσωματωμένες ετικέτες"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Καμία"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Λήψη από τον τοπικό φάκελο"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Αρχείο μάσκας τοπικού εξώφυλλου"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Λήψη από το last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Λήψη από το albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Κλιμάκωση εξώφυλλου ως προς τη μεγαλύτερη πλευρά"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Χρήση CDDB/FreeDB"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Προτίμηση κειμένου-CD έναντι CDDB"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (π.χ. 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Αριθμός θύρας CDDB (π.χ. '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Προτίμηση πρωτοκόλλου CDDB έναντι HTTP"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Αύξουσα σειρά"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Ενεργοποίηση αρχείων εικόνων NRG"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Φθίνουσα σειρά"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Προτείνεται)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Καλλιτέχνης / Άλμπουμ"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Ποιότητα αναδειγματοληψίας (0..2, μεγαλύτερο είναι καλύτερο)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Αρ. Κομματιού"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Διάρκεια"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Αριθμός αντικειμένου"
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Αναπαραγωγή"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Σχέδιο άλπουμ"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Καλλιτέχνης - Άλμπουμ"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Μέγιστη διάρκεια τραγουδιού (σε λεπτά)"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Αριθμός Κομματιού"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Συγκρότημα / Καλλιτέχνης άλμπουμ"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Κωδικοποιητής"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Προσθήκη στήλης"
+
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Επεξεργασία στήλης"
+
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Αφαίρεση στήλης"
+
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Ερώτηση επιβεβαίωσης για τη διαγραφή αρχείων από το δίσκο"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Ομαδοποίηση κατά"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Ευαισθησία εικονιδίου κατάστασης ελέγχου έντασης"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Καλλιτέχνης/Ημερομηνία/Άλμπουμ"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Προσαρμοσμένο εικονίδιο κατάστασης"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Εκτέλεση gtk_init με --sync (λειτουργία αποσφαλμάτωσης)"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Προσθήκη διαχωριστικών μεταξύ αντικειμένων μενού πρόσθετων"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Μορφή τίτλου ειδοποίησης"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Επαναφόρτωση μεταδεδομένων"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Μορφή περιεχομένου ειδοποίησης"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Εμφάνιση εξώφυλλου άλμπουμ"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Μέγεθος εξώφυλλου άλμπουμ (px)"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Διακομιστής PulseAudio"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Δειγματοληψία"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Αφαίρεση Λίστας Αναπαραγωγής"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Διαδρομή πίνακα σχετικής αναζήτησης"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Προσθήκη Νέας Λίστας Αναπαραγωγής"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Διαδρομή πίνακα απόλυτης αναζήτησης"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Εναλλαγή bytes ήχου (επιλέξτε αν ακούτε μόνο κάτι στατικό)"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Ενεργοποίηση HVSC Songlength DB"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Άνοιγμα αρχείου..."
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (from HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bits ανά δείγμα (8 or 16)"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Ρύθμιση %s"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Προεπιλεγμένη διάρκεια τραγουδιού (δευτ)"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Τροποποίησες τις ρυθμίσεις των πλήκτρων συντόμευσης, αλλά δεν τις αποθήκευσες."
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Αρχείο ρυθμίσεων Timidity++"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Είσαι σίγουρος ότι θέλεις να προχωρήσεις χωρίς αποθήκευση;"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Τίτλος Κομματιού"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Προεπιλεγμένη συσκευή ήχου"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Εκτελεστής"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Προσθήκη αρχείων"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Σύνολο Κομματιών"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Αρχικοποίηση..."
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Είδος"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Συνθέτης"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Όνομα"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Αριθμός Δίσκου"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Σχόλιο"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Κωδικοποίηση / Προμηθευτής"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Τοποθεσία"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Δείκτης Υποκομματιού"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Τύπος Ετικέτας(-ων)"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Ενσωματωμένα Cuesheet"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Κωδικοποιητής"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Επεκτάσεις αρχείων (διαχωρισμός με ';')"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Εμφάνιση Κεφαλίδων Στηλών"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Μετατροπή"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Τιμή"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Στόχος δειγματοληψίας"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Έχετε τροποποιήσει στοιχεία του κομματιού."
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Ποιότητα / Αλγόριθμος"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Είστε σίγουροι πως θέλετε να κλείσετε το παράθυρο;"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Αυτόματη δειγματοληψία (υπερέχει του στόχου δειγματοληψίας)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Πολλαπλές τιμές"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Πλήκτρο"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Πολλαπλές τιμές"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Εγγραφή ετικετών..."
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Ενεργοποίηση περιφερειακού ήχου"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Όνομα πεδίου"
+
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Όνομα:"
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Τα πεδία ονόματος δεν πρέπει να ξεκινούν με : ή _"
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Αποτυχία προσθήκης πεδίου"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Υπάρχει ήδη πεδίο με αυτό το όνομα, παρακαλώ προσπαθήστε με ένα διαφορετικό όνομα."
 
-#: ../plugins/converter/convgui.c:84
+#: ../plugins/gtkui/widgets.c:460
 #, c-format
-msgid "Built-in %s"
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Το αρχείο υπάρχει ήδη. Να αντικατασταθεί;"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Αντικατάσταση με..."
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Προειδοποίηση μετατροπής"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Εισαγωγή..."
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Παρακαλώ επιλέξτε κωδικοποιητή "
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Αποκοπή"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Σφάλμα μετατροπέα"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Αντιγραφή"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Μετατροπή..."
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Επικόλληση"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Επιλογή φακέλου"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Αποτυχία αποθήκευσης προρύθμισης κωδικοποιητή "
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
-"Ελέγξτε τα δικαιώματα του φακέλου προρυθμίσεων, δοκιμάστε με ένα διαφορετικό "
-"όνομα, ή ελευθερώστε χώρο στο σκληρό δίσκο"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
-"Υπάρχει ήδη μια προρύθμιση με αυτό το όνομα. Δοκιμάστε να διαλέξετε ένα "
-"διαφορετικό όνομα."
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Σφάλμα"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Προσθήκη κωδικοποιητή"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Επεξεργασία κωδικοποιητή"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Αφαίρεση προρύθμισης"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
 msgstr ""
-"Αυτή η ενέργεια θα διαγράψει την επιλεγμένη προρύθμιση. Είστε σίγουροι;"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Κωδικοποιητές"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Προσθήκη πρόσθετου στην αλυσίδα DSP"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Αποτυχία αποθήκευσης προρύθμισης DSP"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Νέα Προρύθμιση DSP"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Επεξεργασία Προρύθμισης DSP"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Προρυθμίσεις DSP"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Φάκελος εξόδου:"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Όνομα αρχείου εξόδου:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "4x"
 msgstr ""
-"Η επέκταση (π.χ. .mp3) θα προστεθεί αυτόματα.\n"
-"Αφήστε το πεδίο κενό για την προεπιλογή (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Κωδικοποιητής:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Ρύθμιση DSP:"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Αριθμός νημάτων:"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Μορφή δειγματοληψίας εξόδου:"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Διατήρηση μορφής εισόδου"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "Προσημασμένος ακέραιος 8 bit"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "Προσημασμένος ακέραιος 16 bit"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "Προσημασμένος ακέραιος 24 bit"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "Προσημασμένος ακέραιος 32 bit"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "Δεκαδικός 32 bit"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Όταν το αρχείο υπάρχει ήδη:"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Ερώτηση"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Αντικατάσταση"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Επεξεργασία Ρύθμισης Κωδικοποιητή"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Ανώνυμος Κωδικοποιητής"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Επέκταση αρχείου εξόδου:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Π.χ. mp3"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Γραμμή εντολών:"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
-"Παράδειγμα: lame - %o\n"
-"%i για το αρχείο εισόδου, %o για το αρχείο εξόδου, - για το stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
-"%o - όνομα αρχείου εξόδου\n"
-"%i - όνομα προσωρινού αρχείου εισόδου"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Μέθοδος"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Σωλήνωση"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Ομογενής"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Προσωρινό αρχείο"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Ανάπτυξη"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Γέμιση"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Συγγραφέας ετικετών"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Επεξεργαστής Ρυθμίσεων DSP"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Ανώνυμη Ρύθμιση DSP"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Προσθήκη"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Δε βρέθηκε το αρχείο pixmap: %s"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "αντικείμενα"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
 msgstr ""
 
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "φυλλομετρητής Λίστας Αναπαραγωγής"
+
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "Προσαρμοσμένες Εντολές Κελύφους"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Επεξεργασία"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2091,8 +2639,8 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
 #: ../plugins/shellexecui/interface.c:208
@@ -2157,14 +2705,9 @@
 msgid "Add Command"
 msgstr "Προσθήκη Εντολής"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Διαγραφή"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
-"Αυτή η ενέργεια θα διαγράψει την επιλεγμένη εντολή κελύφους. Είστε σίγουροι;"
+msgstr "Αυτή η ενέργεια θα διαγράψει την επιλεγμένη εντολή κελύφους. Είστε σίγουροι;"
 
 #: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
@@ -2187,188 +2730,1240 @@
 msgid "Invalid Values"
 msgstr "Μη Έγκυρες Τιμές."
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 στις επιλογές του πρόσθετου."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "μονοφωνικό"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "στερεοφωνικό"
+
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Τίτλος Κομματιού"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Εκτελεστής"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Σύνολο Κομματιών"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Είδος"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Συνθέτης"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Αριθμός Δίσκου"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Όλα τα αρχεία (*)"
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Σχόλιο"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Άνοιγμα αρχείου(-ων)..."
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Κωδικοποίηση / Προμηθευτής"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Προσθήκη αρχείου(-ων) στη λίστα αναπαραγωγής..."
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Πνευματικά δικαιώματα"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Προσθήκη φακέλου(-ων) στη λίστα αναπαραγωγής..."
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Τοποθεσία"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Ακολούθηση συμβολικών συνδέσμων"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Δείκτης Υποκομματιού"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Τύπος Ετικέτας(-ων)"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Διαγραφή αρχείων από τον δίσκο"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Ενσωματωμένα Cuesheet"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Φόρτωση Λίστας Αναπαραγωγής"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Άλλα αρχεία (*)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Αποθήκευση Λίστας Αναπαραγωγής Ως"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Αρχεία λιστών αναπαραγωγής DeaDBeeF EQ (*.dbpl)"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Ενεργοποίηση περιφερειακού ήχου"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Τύπος περιεχομένου"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Χρήση αναδειγματοληψίας ALSA"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Μη έγκυρη(-ες) τιμή(-ες)."
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Προτεινόμενο μέγεθος ενδιάμεσης μνήμης"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Προτεινόμενο μέγεθος περιόδου"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Δεν έχει επιλεχτεί τίποτα."
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Λήψη από τις ενσωματωμένες ετικέτες"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Λήψη από τον τοπικό φάκελο"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Αντικατάσταση με..."
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Εισαγωγή..."
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Αποκοπή"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Αντιγραφή"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Επικόλληση"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Κλείδωμα κίνησης"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Μετακίνηση καρτέλας αριστερά"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Μετακίνηση καρτέλας δεξιά"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Αφαίρεση καρτέλας"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Μετονομασία καρτέλας"
-
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Προσθήκη νέας καρτέλας"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Εμφάνιση Κεφαλίδων Στηλών"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Ανάπτυξη κουτιού κατά 1 αντικείμενο"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Ομογενής"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Ανάπτυξη"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Γέμιση"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Ρύθμιση κουμπιού"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Επεξεργασία λίστας αναπαραγωγής"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Μετονομασία Λίστας Αναπαραγωγής"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Αφαίρεση Λίστας Αναπαραγωγής"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Προσθήκη Νέας Λίστας Αναπαραγωγής"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Όνομα"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Προτίμηση κειμένου-CD έναντι CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Ενεργοποίηση αρχείων εικόνων NRG"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr ""
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Μετατροπή"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Ποιότητα / Αλγόριθμος"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Επεκτάσεις αρχείων (διαχωρισμός με ';')"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Μέγιστη διάρκεια τραγουδιού (σε λεπτά)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr ""
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr ""
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Ερώτηση επιβεβαίωσης για τη διαγραφή αρχείων από το δίσκο"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Ευαισθησία εικονιδίου κατάστασης ελέγχου έντασης"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Προσαρμοσμένο εικονίδιο κατάστασης"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Προσθήκη διαχωριστικών μεταξύ αντικειμένων μενού πρόσθετων"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Ενεργοποίηση scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Απενεργοποίηση τρέχουσας-αναπαραγωγής"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Όνομα χρήστη:"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Κωδικός:"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr ""
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Μορφή τίτλου ειδοποίησης"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Μορφή περιεχομένου ειδοποίησης"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Εμφάνιση εξώφυλλου άλμπουμ"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Μέγεθος εξώφυλλου άλμπουμ (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Αρχείο συσκευής"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Δειγματοληψία"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr ""
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr ""
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Διαδρομή πίνακα σχετικής αναζήτησης"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Διαδρομή πίνακα απόλυτης αναζήτησης"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Εναλλαγή bytes ήχου (επιλέξτε αν ακούτε μόνο κάτι στατικό)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Ενεργοποίηση HVSC Songlength DB"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Προεπιλεγμένη διάρκεια τραγουδιού (δευτ)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Αρχείο ρυθμίσεων Timidity++"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/en_GB.po -> deadbeef-1.9.6.tar.bz2/po/en_GB.po Changed

@@ -1,2350 +1,3964 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Ian Nartowicz <deadbeef@nartowicz.co.uk>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
-"deadbeef-player/language/en_GB/)\n"
-"Language: en_GB\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Ian Nartowicz <deadbeef@nartowicz.co.uk>, 2014\n"
+"Language-Team: English (United Kingdom) (http://app.transifex.com/deadbeef-player/deadbeef-player/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "About DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s ChangeLog"
+msgid "Options:\n"
+msgstr "Options:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF Translators"
-
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Save DeaDBeeF EQ Preset"
-
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ preset files (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Load DeaDBeeF EQ Preset..."
-
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ presets (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Import Foobar2000 EQ Preset..."
-
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ presets (*.feq)"
-
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Save Preset"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h Print help (this message) and exit\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Load Preset"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Quit player\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Import Foobar2000 Preset"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Print version info and exit\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Enable"
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Start playback\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Zero All"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Stop playback\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Zero Preamp"
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pause playback\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Zero Bands"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Toggle pause\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Presets"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Start playback if stopped, toggle pause otherwise\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:144
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 day %d:%02d:%02d"
+msgid " --next Next song in playlist\n"
+msgstr " --next Next song in playlist\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:145
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d days %d:%02d:%02d"
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Previous song in playlist\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:146
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Stopped | %d tracks | %s total playtime"
+msgid " --random Random song in playlist\n"
+msgstr " --random Random song in playlist\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Append file(s) to existing playlist\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:149
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Print formatted track name to stdout\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Paused | "
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:153
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
-
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "New Playlist"
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:154
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "New Playlist (%d)"
-
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
+msgid " for more info, see %s\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Default"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Yes"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Failed while reading help file"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "No"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Failed to load help file"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Output folder:"
 
-#: ../plugins/gtkui/gtkui.c:1171
-msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Warning"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_File"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Open file(s)"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Output file name:"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Add file(s)"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Add folder(s)"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Encoder:"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Add location"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP preset:"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "New playlist"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Number of threads:"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Load playlist"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Output sample format:"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Save playlist"
+#: ../plugins/converter/converter.glade.h:14
+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 ""
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Quit"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "When file exists:"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Edit"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Clear"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Edit Encoder Preset"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Select all"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Title:"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Deselect all"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Untitled Encoder"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Invert selection"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Output file extension:"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Selection"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "E.g. mp3"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Remove"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Crop"
-
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Find"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Command line:"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+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/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Title"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-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/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "Track number"
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Method:"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Album"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Artist"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Date"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Random"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Custom"
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Preferences"
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_View"
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Status bar"
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Tag writer"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Equaliser"
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP Preset Editor"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Title"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_Playback"
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Untitled DSP Preset"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Order"
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Add"
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Linear"
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Remove"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Shuffle tracks"
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Configure"
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Shuffle albums"
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Select DSP Plugin"
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Looping"
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Plugin"
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Presets"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr ""
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "The file already exists. Overwrite?"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Scroll follows playback"
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Converter warning"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Cursor follows playback"
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Please select encoder"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
-msgstr ""
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Converter error"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
-msgstr ""
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Converting..."
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Jump to current track"
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Select folder..."
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Help"
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Failed to save encoder preset"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_ChangeLog"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+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/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+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/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Error"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_About"
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Add new encoder"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "_Translators"
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Edit encoder"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Search"
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Remove preset"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Stop"
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "This action will delete the selected preset. Are you sure?"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Play"
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Warning"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Pause"
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Encoders"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Previous"
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Add plugin to DSP chain"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Next"
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Failed to save DSP preset"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Play Random"
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "New DSP Preset"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "About"
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Edit DSP Preset"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Quit"
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP Presets"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
 msgid "Help"
 msgstr "Help"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Track Properties"
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Keep source format"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
-msgstr ""
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit signed integer"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "Settings"
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit signed integer"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Apply"
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit signed integer"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Close"
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit signed integer"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Metadata"
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit float"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Properties"
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Title:"
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Prompt"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Enter new column title here"
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Overwrite"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Type:"
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Pipe"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Item Index"
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Playing"
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Album Art"
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Couldn’t find pixmap file: %s"
 
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artist - Album"
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Duration"
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Track Number"
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Band / Album Artist"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Format:"
-
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Alignment:"
-
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Left"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Right"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Cancel"
-
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
-
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Output plugin:"
-
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Output device:"
-
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Always convert 8 bit audio to 16 bit"
-
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Sound"
-
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Replay-gain mode:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Disable"
-
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Track"
-
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Replay-gain peak scale"
-
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
-msgstr "-12 dB"
-
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
-msgstr "+12 dB"
-
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Replay-gain preamp:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Global preamp:"
-
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-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:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "Resume previous session on startup"
-
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
-msgstr "Don't add from archives when adding folders"
-
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "_Playback"
-
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Configure"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
-msgstr "DSP Chain Preset"
-
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
-msgstr "_Load"
-
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
-msgstr "DSP"
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "About DeaDBeeF %s"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Close minimises to tray"
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s ChangeLog"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Hide system tray icon"
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF Translators"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
-msgstr "Interface refresh rate (times per second):"
-
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "Titlebar text while playing:"
-
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Titlebar text while stopped:"
-
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
-msgstr "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Plugins"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_File"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
-msgstr "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Open file(s)"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Add file(s)"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Add folder(s)"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Override"
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Add location"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Foreground"
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "New playlist"
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Background"
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Load playlist"
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Seek-bar/Volume-bar colours"
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Save playlist"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Middle"
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Quit"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Light"
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Edit"
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Dark"
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Clear"
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Base"
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Select all"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Text"
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Deselect all"
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Tab strip colours"
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Invert selection"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Override (loses GTK tree-view theming, but speeds up rendering)"
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Selection"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Even row"
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Crop"
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Odd row"
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Find"
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Selected row"
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Selected text"
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Track number"
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Cursor"
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Playlist colours"
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Artist"
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Colours"
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Date"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Enable Proxy Server"
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Random"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Proxy Server Address:"
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Custom"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Proxy Server Port:"
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Preferences"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Proxy Type:"
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_View"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Proxy User-name:"
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Status bar"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Proxy Password:"
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Equaliser"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Network"
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Playback"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Version: "
-
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Copyright"
-
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Plugins"
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Scroll follows playback"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Cursor follows playback"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Jump to current track"
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Format"
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Help"
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Ascending"
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Descending"
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Select DSP Plugin"
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Plugin"
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_About"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
-msgstr "Tag Writer Settings"
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Translators"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Write ID3v2"
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Search"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Write ID3v1"
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Write APEv2"
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Play"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "Strip ID3v2"
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pause"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "Strip ID3v1"
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Previous"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "Strip APEv2"
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Next"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "ID3v2 version"
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Play Random"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Recommended)"
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "About"
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Quit"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 character encoding (default is iso8859-1)"
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Track Properties"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "Write ID3v2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Settings"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Apply"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Close"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Properties"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Enter new column title here"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Type:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Format:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Alignment:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
 msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+"Left\n"
+"Right\n"
+"Center"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Text colour:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Output plugin:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Output device:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Always convert 8 bit audio to 16 bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Sound"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:101
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+"By playback order\n"
+"Track\n"
+"Album"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artist / Album"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Track No."
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Add column"
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+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/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Edit column"
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Resume previous session on startup"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Remove column"
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Don't add from archives when adding folders"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Group by"
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "None"
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Playback"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Artist/Date/Album"
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr "DSP Chain Preset"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Open file..."
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "_Load"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Configure %s"
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Default Audio Device"
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Close minimises to tray"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Hide system tray icon"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Adding files..."
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Initialising..."
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "You’ve modified data for this track."
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr "Interface refresh rate (times per second):"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Really close the window?"
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Titlebar text while playing:"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Multiple values "
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Titlebar text while stopped:"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Key short-cuts"
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr "GUI Plugin (changing requires restart):"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Value"
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Writing tags..."
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Name:"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Field names must not start with : or _"
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Auto-name playlists when adding a single folder"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Cannot add field"
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Field with such name already exists, please try different name."
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Add field"
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Remove field"
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Options:\n"
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Override"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help or -h Print help (this message) and exit\n"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Quit player\n"
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Enable Proxy Server"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Proxy Server Address:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Proxy Server Port:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Proxy Type:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Proxy User-name:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Proxy Password:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Network"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Version: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Ascending\nDescending"
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr "Tag Writer Settings"
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Write ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Write ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Write APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Strip ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Strip ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Strip APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "ID3v2 version"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Recommended)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 character encoding (default is iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Write ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "Colour:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Save DeaDBeeF EQ Preset"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ preset files (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Load DeaDBeeF EQ Preset..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ presets (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Import Foobar2000 EQ Preset..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ presets (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Save Preset"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Load Preset"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Import Foobar2000 Preset"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Enable"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Zero All"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Zero Preamp"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Zero Bands"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "New Playlist"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 day %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d days %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "New Playlist (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Failed while reading help file"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Failed to load help file"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Left"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Right"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Track"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "None"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Ascending"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Descending"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Recommended)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artist / Album"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Track No."
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Duration"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Item Index"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Playing"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Album Art"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artist - Album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Track Number"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Band / Album Artist"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codec"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Add column"
+
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Edit column"
+
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Remove column"
+
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Group by"
+
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artist/Date/Album"
+
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Open file..."
+
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Configure %s"
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Default Audio Device"
+
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Adding files..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Initialising..."
+
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Value"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "You’ve modified data for this track."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Really close the window?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Multiple values "
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Key short-cuts"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Writing tags..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Name:"
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Field names must not start with : or _"
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Cannot add field"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Field with such name already exists, please try different name."
+
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr ""
+
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
+
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Print version info and exit\n"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Start playback\n"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Stop playback\n"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pause playback\n"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Toggle pause\n"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Next song in playlist\n"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Previous song in playlist\n"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Random song in playlist\n"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Append file(s) to existing playlist\n"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../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"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Default"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Yes"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "No"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Item Index\n"
-"PlayingAlbum ArtArtist - AlbumArtistAlbumTitleDurationTrack NumberBand / "
-"Album ArtistCustom"
-
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
-"Left\n"
-"Right"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
 msgstr ""
-"Disable\n"
-"Track\n"
-"Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
 msgstr ""
-"Ascending\n"
-"Descending"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
 msgstr ""
-"2.3 (Recommended)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, 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."
+
+#: ../src/tf.c:2237
+msgid "mono"
 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"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Track Title"
+
 #: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Lookup on Last.fm"
+msgid "Performer"
+msgstr "Artist"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Total Tracks"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Genre"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Composer"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Disc Number"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Comment"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Encoder / Vendor"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Location"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Sub-track Index"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tag Type(s)"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Embedded Cue-sheet"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr ""
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr ""
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
 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:55
+#: ../translation/plugins.c:17
+#, no-c-format
 msgid "Preferred buffer size"
 msgstr "Preferred buffer size"
 
-#: ../translation/extra.c:9
+#: ../translation/plugins.c:19
+#, no-c-format
 msgid "Preferred period size"
 msgstr "Preferred period size"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Enable scrobbler"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
+
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Fetch from embedded tags"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Fetch from local folder"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Disable now playing"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Username"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Password"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Device file"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 sample rate bug workaround"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Cache update period (hr)"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Fetch from embedded tags"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Fetch from local folder"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Local cover file mask"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Fetch from last.fm"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Fetch from albumart.org"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Scale artwork towards longer side"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Use CDDB/FreeDB"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
 
-#: ../translation/extra.c:30
+#: ../translation/plugins.c:71
+#, no-c-format
 msgid "Prefer CD-Text over CDDB"
 msgstr "Prefer CD-Text over CDDB"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (e.g. 'freedb.org')"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB port number (e.g. '888')"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Prefer CDDB protocol over HTTP"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
 
-#: ../translation/extra.c:34
+#: ../translation/plugins.c:79
+#, no-c-format
 msgid "Enable NRG image support"
 msgstr "Enable NRG image support"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Re-sampling quality (0..2, higher is better)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Maximum song length (in minutes)"
-
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Ask for confirmation to delete files from disk"
-
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Status icon volume control sensitivity"
-
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Custom status icon"
-
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Run gtk_init with --sync (debug mode)"
-
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Add separators between plugin context menu items"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Notification title format"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Notification content format"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Convert"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Show album art"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Album art size (px)"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio server"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Sample rate"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Relative seek table path"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Absolute seek table path"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bits per sample (8 or 16)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Default song length (sec)"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "File Extensions (separate with ';')"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ bank configuration file"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Track Title"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Artist"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Total Tracks"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Maximum song length (in minutes)"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Genre"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Composer"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Disc Number"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Comment"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Encoder / Vendor"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Location"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Sub-track Index"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tag Type(s)"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Embedded Cue-sheet"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Codec"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "File Extensions (separate with ';')"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Convert"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Target sample rate"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Automatic sample rate (overrides Target sample rate)"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "The file already exists. Overwrite?"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Converter warning"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Please select encoder"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Converter error"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Converting..."
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Select folder..."
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Failed to save encoder preset"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
-"Check preset folder permissions, try to pick a different title, or free up "
-"some disk space"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "Preset with the same name already exists. Pick another title."
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Error"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Add new encoder"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Edit encoder"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Remove preset"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Encoders"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Add plugin to DSP chain"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Failed to save DSP preset"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "New DSP Preset"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Edit DSP Preset"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP Presets"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Output folder:"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Output file name:"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:244
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Show\\/Hide Log window"
 msgstr ""
-"File extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for the default (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Encoder:"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Ask for confirmation to delete files from disk"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP preset:"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Number of threads:"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Status icon volume control sensitivity"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Output sample format:"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Custom status icon"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Keep source format"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit signed integer"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Add separators between plugin context menu items"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit signed integer"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit signed integer"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit signed integer"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit float"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "When file exists:"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Prompt"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Overwrite"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Edit Encoder Preset"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Untitled Encoder"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Output file extension:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "E.g. mp3"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Command line:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:285
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Next Artist"
 msgstr ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:287
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Next Album"
 msgstr ""
-"%o - output file name\n"
-"%i - temporary input file name"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Method:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Pipe"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Temporary file"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Tag writer"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP Preset Editor"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Untitled DSP Preset"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Add"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Couldn’t find pixmap file: %s"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:333
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Enable scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Disable now playing"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Username"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Password"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Notification title format"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Notification content format"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Show album art"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Album art size (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Device file"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Sample rate"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Relative seek table path"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Absolute seek table path"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Swap audio bytes (toggle if all you hear is static)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Enable HVSC Songlength DB"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Default song length (sec)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ bank configuration file"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/es.po -> deadbeef-1.9.6.tar.bz2/po/es.po Changed

@@ -1,2409 +1,3985 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2013
-# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2013
-# Carlos, 2013-2014
-# Charlesles, 2013
+# Adolfo Jayme Barrientos, 2013
+# Adolfo Jayme-Barrientos, 2013
+# Adolfo Jayme Barrientos, 2013
+# Adolfo Jayme-Barrientos, 2021
+# Adolfo Jayme-Barrientos, 2013
+# Adolfo Jayme-Barrientos, 2013
+# AR Tecnico, 2021
+# b0c7556da723b83b1e5bd960cf255433, 2014
+# b0c7556da723b83b1e5bd960cf255433, 2013-2014
+# Charlesles, 2013-2014,2016
 # depaz <depazzz@gmail.com>, 2010
+# Eder Dureaux <1mmolationstayhc@gmail.com>, 2017
+# b0c7556da723b83b1e5bd960cf255433, 2016-2017
+# Fito JB, 2013
+# Fitoschido, 2013
 # Hugo Florentino <sysadmin@cips.cu>, 2010
 # Roony Alvarez <legion1978@gmail.com>, 2013
+# Martin Müller <fmartinmuller@gmail.com>, 2022
+# Matías Alejandro Aguilar Peiró <matias.a.aguilar@gmail.com>, 2017
+# meegle84 <meegle84@gmail.com>, 2022
 # Roony Alvarez <legion1978@gmail.com>, 2013
+# Toni Estévez <toni.estevez@gmail.com>, 2018-2021,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Toni Estévez <toni.estevez@gmail.com>, 2018-2021,2023\n"
+"Language-Team: Spanish (http://app.transifex.com/deadbeef-player/deadbeef-player/language/es/)\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"
+"Language: es\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Acerca de DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Uso: deadbeef opciones -- archivo(s)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Cambios en DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Opciones:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Traductores de DeaDBeeF"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help o -h Mostrar la ayuda (este mensaje) y salir\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Guardar preajuste de EQ de DeaDBeeF"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Salir del reproductor\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Ajustes del EQ de DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Mostrar la versión y salir\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Cargar ajustes del EQ de DeaDBeeF…"
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Iniciar la reproducción\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Ajustes del EQ de DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Parar la reproducción\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importar ajustes del EQ de Foobar2000…"
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pausar la reproducción\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Ajustes de EQ de Foobar2000 (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Pausar o reanudar\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Guardar ajustes"
+#: ../src/main.c:143
+#, 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"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Cargar ajustes"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Pista siguiente de la lista de reproducción\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importar ajustes de Foobar2000"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Pista anterior de la lista de reproducción \n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Activar"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Canción al azar de la lista de reproducción\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Restablecer todo"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Añadir archivo(s) a la lista de reproducción\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Restablecer preamp"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui COMPLEMENTO Indica qué complemento de IGU usar; GTK2 es el predeterminado\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Restablecer bandas"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Envía por la salida estándar el nombre formateado de la pista\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Preajustes"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-sintaxis: a: Artista, t: Título, b: Álbum,\n l: Duración, n: Pista, y: Año, c: Comentario,\n r: Copyright, e: Tiempo restante\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 día y %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " ejemplo: --nowplaying «%%a - %%t» mostraría «artista - título»\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d días y %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " más información en %s\n"
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " NOTA: --nowplaying está considerada obsoleta.\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Envía por la salida estándar el nombre formateado de la pista,\n usando el formato de título nuevo\n"
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " Sintaxis FMT: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " ejemplo: --nowplaying-tf «%%artist%% - %%title%%» mostraría «artista - título»\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr "--volume NUM Muestra o configura el volumen.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " El parámetro NUM puede especificarse en porcentaje (valor absoluto o incremento/reducción)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " o en dB -50, 0 (si es con sufijo).\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:162
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Detenido | %d pistas | Tiempo total: %s"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Ejemplos: --volume 80, --volume +10, --volume -5 o --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr " --plugin=PLUG Enviar comandos a un plugin específico. Utilice PLUG=main para enviar comandos al propio deadbeef.\n"
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr " Para obtener los comandos específicos del plugin, utilice --plugin=PLUG --help\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr " --plugin-list Lista de todos los plugins disponibles, incluyendo la indicación de los plugins que soportan comandos.\n"
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Por defecto"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "Monoaural"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kb/s "
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Sí"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pausado | "
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "No"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Carpeta de salida:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Escribir en la carpeta de la pista original"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Conservar la estructura de las carpetas"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Copiar si el formato no cambia"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Reetiquetar después de copiar"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Nombre del archivo de salida:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-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"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "La extensión (por ejemplo, .mp3) se añadirá automáticamente.\nDeje el campo en blanco para la configuración predeterminada (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Lista de reproducción nueva"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Codificador:"
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Lista de reproducción nueva (%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Preajuste de DSP:"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Lista de reproducción con pestañas"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Número de hilos:"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Lista de reproducción"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Formato de muestra de salida:"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Divisor (superior e inferior)"
+#: ../plugins/converter/converter.glade.h:14
+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 "Mantener el formato original\nEntero con signo de 8 bits\nEntero con signo de 16 bits\nEntero con signo de 24 bits\nEntero con signo de 32 bits\nFlotante de 32 bits"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Divisor (izquierdo y derecho)"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Cuando el archivo exista:"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Pestañas de lista de reproducción"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Omitir\nPreguntar\nSobreescribir"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Propiedades de selección"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Editar el preajuste del codificador"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Mostrar portada"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Título:"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Alcance"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Codificador sin nombre"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Espectro"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Extensión del archivo de salida:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "Hbox"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "P. ej.: mp3"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "Vbox"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Línea de órdenes:"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Botón"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-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/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Método:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Tubería\nArchivo temporal\nArchivo original"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Error al leer el archivo de ayuda"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Error al cargar el archivo de ayuda"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Editor de etiquetas"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Editor de preajustes de DSP"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Título"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Preajuste de DSP sin nombre"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Añadir"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Configurar"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Seleccionar el complemento DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Complemento"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Preajustes"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Incorporado %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "El archivo ya existe. ¿Quiere sobreescribirlo?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Alerta del convertidor"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Seleccione el codificador"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Error del convertidor"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Convirtiendo…"
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Seleccionar una carpeta..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "No se ha podido guardar el preajuste del codificador"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Compruebe los permisos de la carpeta de preajustes, elija otro nombre o libere algo de espacio en disco"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "¿Está seguro de que quiere salir?"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Ya existe un preajuste con el mismo nombre. Elija otro nombre."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Error"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Añadir un codificador nuevo"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Editar el codificador"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Eliminar el preajuste"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Esta acción eliminará el preajuste seleccionado. ¿Está seguro?"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Codificadores"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Añadir el complemento a la cadena DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "No se ha podido guardar el preajuste de DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Preajuste de DSP nuevo"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Editar el preajuste de DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Preajustes de DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Ayuda"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Mantener el formato original"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "Entero con signo de 8 bits"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "Entero con signo de 16 bits"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "Entero con signo de 24 bits"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "Entero con signo de 32 bits"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "Flotante de 32 bits"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Omitir"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Preguntar"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Sobreescribir"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Tubería"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Archivo temporal"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Archivo original"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "No se ha podido encontrar el archivo pixmap: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Abrir archivo(s)…"
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Añadir archivo(s) a la lista…"
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Añadir carpeta(s) a la lista…"
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Cargar la lista de reproducción"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Guardar la lista de reproducción como"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Acerca de DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Cambios en DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Traductores de DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr "Pista en reproducción"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr "Pista seleccionada"
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Tipo de contenido"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Complementos"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Valor(es) no válido(s)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Los campos del tipo de contenido y de los complementos no deben estar en blanco y deben cumplir las reglas.\nEjemplo de tipo de contenido: «audio/mpg».\nEjemplo de identificadores de complementos: «stdmpg ffmpeg».\nDeben usarse espacios para separar los identificadores de complementos.\nLos tipos de contenido solo deben contener letras, números y el carácter «-».\nLos identificadores de complementos solo deben contener letras y números."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "No se ha seleccionado nada."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Abrir archivo(s)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Añadir archivo(s)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Añadir carpeta(s)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
-msgstr "Añadir dirección"
+msgstr "Añadir una ubicación"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Nueva lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
-msgstr "Cargar lista de reproducción"
+msgstr "Cargar una lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
-msgstr "Guardar lista de reproducción"
+msgstr "Guardar la lista de reproducción"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
-msgstr "_Limpiar"
+msgstr "_Borrar"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Deseleccionar todo"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
-msgstr "Invertir selección"
+msgstr "Invertir la selección"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Selección"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Quitar"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Recortar"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Buscar"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Título"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "N.º de la pista"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Álbum"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Artista"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Fecha"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
-msgstr "Aleatorio"
+msgstr "Al azar"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
-msgstr "Personalizado"
+msgstr "Personalizar"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Barra de estado"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Ecualizador"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Modo de diseño"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Registro"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Orden"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Lineal"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Barajar pistas"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Mezclar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Desactivar"
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Barajar álbumes"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Repetir"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Repetir todo"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Repetir una sola canción"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "No repetir"
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Pistas"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Álbumes"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Pistas al azar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Modo de repetición"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Todas las pistas"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Una pista"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Desplazar al cambiar de pista"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Seleccionar al cambiar de pista"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Detener al terminar la pista actual"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Detener al terminar el álbum actual"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Saltar a la pista actual"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
-msgstr "Ay_uda"
+msgstr "_Ayuda"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
-msgstr "_Cambios"
+msgstr "_Registro de cambios"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
-msgstr "_GPLv2"
+msgstr "_GPL versión 2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
+msgstr "_LGPL versión 2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Traductores"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Buscar"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Detener"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
-msgstr "Aleatorio"
+msgstr "Reproducción al azar"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Acerca de"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Salir"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Ayuda"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Propiedades de la pista"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Ubicación:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Título:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Aceptar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
-msgstr "Escriba el título de la columna"
+msgstr "Escriba el título de la nueva columna aqui"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Índice del elemento"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Reproduciendo"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Carátula"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artista - Álbum"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Duración"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "N.º de la pista"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Banda / Artista"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Formato de ordenación:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(si no está vacío)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Alineación:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Izquierda"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Derecha"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Izquierda\nDerecha\nCentro"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_Aceptar"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Color del texto:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Complemento de salida:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Dispositivo de salida:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Siempre convertir audio de 8 bits a 16 bits"
+msgstr "Convertir siempre audio de 8 bits en 16 bits"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
-msgstr "Siempre convertir el sonido de 16 bits a 24 bits"
+msgstr "Convertir siempre audio de 16 bits en 24 bits"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Tasa de muestreo de destino:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Para múltiplos de 48KHz (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Para múltiplos de 44.1KHz (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Basado en la tasa de muestreo de entrada"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Reemplazar la tasa de muestreo"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Modo replaygain:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Desactivar"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Modo fuente:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Pista"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Por orden de reproducción\nPista\nÁlbum"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Normalizar con replaygain"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Procesando:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Ninguna\nAplicar la ganancia\nAplicar la ganancia y evitar recortes según el pico\nSólo evitar el recorte"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Preamplificación replaygain:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Preamplificación global:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Preamplificador con información RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Preamplificador sin información RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 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:"
+msgstr "Añadir archivos desde la línea de órdenes (o el gestor de archivos) a la lista de reproducción:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Reanudar la sesión anterior al inicio"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
-msgstr "Al añadir carpetas, no añadir de archivos comprimidos"
+msgstr "No añadir desde archivos al añadir carpetas"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "Desactivar la opción «Detener al terminar la pista actual» después de que se ejecute"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "Desactivar la opción «Detener al terminar el álbum actual» después de que se ejecute"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Reproducción"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "Preajuste de la cadena DSP"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Cargar"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Minimizar a la bandeja al iniciar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Cerrar minimiza a la bandeja"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
-msgstr "Esconder icono de la bandeja del sistema"
+msgstr "Esconder el icono de la bandeja del sistema"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "Eliminar del disco debe utilizar la papelera"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Detectar y recodificar SHIFT-JIS japonés"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Activar la detección y grabación de Ruso CP1251"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr "Activar la detección y grabación de Chino CP936"
+msgstr "Detectar y recodificar la CP936 para el chino"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Tasa de refresco de la interfaz (veces por segundo):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
-msgstr "Texto a mostrar en la barra de título mientras se reproduce:"
+msgstr "Texto de la barra de título al reproducir:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
-msgstr "Texto a mostrar en la barra de título mientras no se reproduce:"
+msgstr "Texto de la barra de título en parada:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr "Complemento de interfaz gráfica (cambiarlo requiere reiniciar):"
+msgstr "Complemento de la interfaz gráfica (cambiarlo requiere reiniciar):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Mostrar el tiempo de reproducción de la selección en la barra de estado"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "Reproductor"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr "Cerrar listas de reproducción con botón central del ratón"
+msgstr "Cerrar listas de reproducción con el botón central del ratón"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Resaltar en negritas la pista en reproducción"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr "Ocultar la opción \"Eliminar del disco\" del menú contextual "
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Cambiar a la siguiente canción al eliminar del disco la canción que se está reproduciendo"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
-msgstr "Autonombrar listas de reproducción al añadir una carpeta"
+msgstr "Nombrar automáticamente las listas de reproducción al añadir una carpeta"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr "Ajustar automáticamente las columnas a la ventana"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Espacio entre los grupos:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "píxeles"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Lista de reproducción"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
-msgstr "Interfaz y más"
+msgstr "Interfaz/Varios"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
-msgstr "Anular"
+msgstr "Reemplazar"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Frente"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Fondo"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Colores de barras de tiempo/volumen"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Medio"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Claro"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Oscuro"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Base"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Texto"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Colores de pestañas"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Cambiar (ignora el tema GTK, pero acelera el renderizado)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Fila par"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Fila impar"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Fila seleccionada"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Texto seleccionado"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Cursor"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Colores de lista de reproducción"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Colores"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Barras"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Fondo (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Barra de búsqueda/Barra de volumen/EQ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Base:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Oscuro:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Claro:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Medio:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Texto:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Negrita"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Cursiva"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Texto en reproducción:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Texto seleccionado:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Barra de pestañas"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Pistas normales:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Pista en reproducción:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Pistas seleccionadas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Columnas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Encabezado de grupo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Frente:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Líneas pares:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Líneas impares:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Líneas seleccionadas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Cursor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Fondo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Personalizar (ignora el tema GTK, pero acelera la respresentación)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr "Color base de visualización personalizado"
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr "Color de fondo de la visualización personalizado"
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Visualizaciones"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Apariencia"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Habilitar la biblioteca multimedia"
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "Agregar/quitar carpetas de música"
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Biblioteca multimedia"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Activar el servidor proxy"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
-msgstr "Dirección:"
+msgstr "Dirección del Servidor Proxy:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
-msgstr "Puerto:"
+msgstr "Puerto del Servidor Proxy:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
-msgstr "Tipo:"
+msgstr "Tipo de Proxy:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
-msgstr "Usuario:"
+msgstr "Usuario del Proxy:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
-msgstr "Contraseña:"
+msgstr "Contraseña del Proxy:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "Agente de usuario HTTP:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr "Editar asignación de tipo de contenido"
+msgstr "Editar la asignación de los tipos de contenido"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Red"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr "Teclas asignadas:"
+msgstr "Atajos de teclado asignados:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Acción:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Sin asignar>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Combinación de teclas:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr "Tecla global"
+msgstr "Atajo de teclado global"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"Para guardar los cambios pulse en Aplicar,\n"
-"o para deshacerlos pulse en Revertir.\n"
-"NO se guardarán los cambios\n"
-"si no pulsa en Aplicar."
+msgstr "Para guardar los cambios pulse en Aplicar,\no para deshacerlos pulse en Revertir.\nNO se guardarán los cambios\nsi no pulsa en Aplicar."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr "_Predeterminados"
+msgstr "_Por defecto"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Atajos de teclado"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Versión:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Configuración"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Copyright"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Información"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Licencia"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Complementos"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Restablecer los valores predeterminados"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versión:"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Configurar un título personalizado"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Agrupar por…"
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Ordenar por…"
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Formato"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Ascendente"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Descendente"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Seleccione el complemento DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr "Formato"
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Complemento"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Ascendente\nDescendente"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Preferencias del editor de etiquetas"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Escribir ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Escribir ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Escribir APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
-msgstr "Recortar ID3v2"
+msgstr "Borrar ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
-msgstr "Recortar ID3v1"
+msgstr "Borrar ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
-msgstr "Recortar APEv2"
+msgstr "Borrar APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Versión de ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (recomendada)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (recomendada)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "Codificación de ID3v1 (la predet. es iso8859-1)"
+msgstr "Codificación de ID3v1 (iso8859-1 por defecto)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Escribir ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr "Mapeo de tipo de contenido"
+msgstr "Asignación de tipos de contenido"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"Esta tabla define el enlace entre tipos de contenido de flujos de red y "
-"plugins decodificadores de DeaDBeeF. Por ejemplo, archivos mp3 pueden ser "
-"del tipo \"audio/x-mpeg\", y necesitar ser decodificados por el propio "
-"plugin \"stdmpg\" de DeaDBeeF o por el plugin \"ffmpeg\"."
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Restablecer los valores predeterminados"
+msgstr "Esta tabla define la vinculación entre los tipos de contenido de transmisión de red y los complementos de decodificación de DeaDBeeF. Por ejemplo, los archivos mp3 pueden ser del tipo «audio/x-mpeg» y se pueden decodificar con el complemento «stdmpg» propio de DeaDBeeF o con el complemento «ffmpeg»."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "Tipo de contenido:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Complementos:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
-msgstr "Propiedades del botón:"
+msgstr "Propiedades del botón"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Color:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Color del texto:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Icono:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Seleccione una acción"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "Este diálogo permite configurar un título personalizado para una pista. Es especialmente útil para las emisoras de radio. La opción para configurar un título personalizado también está presente en el diálogo «Añadir una ubicación». El título es visible en las columnas que muestran el campo «Artista» y se muestra como « artista personalizado», si el campo está presente, o «personalizado», en caso contrario."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artista / Álbum"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Editar"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Pista n.º"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Editar (en el lugar)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Añadir un campo nuevo..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Editar Valor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Nombre del campo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Valor del campo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Use el carácter ; para separar varios valores."
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "Registro de DeaDBeeF"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Borrar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Progreso de la exploración de Replaygain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Archivo actual:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Estado"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Resultados de la exploración de Replaygain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Actualizar las etiquetas del archivo"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "Copiar el informe"
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Mostrar solo los complementos que tengan configuración"
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr "Editar pistas varias"
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Nombre del campo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr "Valor único"
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr "Valores individuales"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Guardar ajustes del EQ de DeaDBeeF"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Ajustes del EQ de DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Cargar ajustes del EQ de DeaDBeeF…"
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Ajustes del EQ de DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importar ajustes del EQ de Foobar2000…"
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Ajustes de EQ de Foobar2000 (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Guardar ajustes"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Cargar ajustes"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importar ajustes de Foobar2000"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Activar"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Restablecer todo"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Restablecer preamplificador"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Restablecer bandas"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Lista de reproducción nueva"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Formatos de audio compatibles"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Todos los archivos (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Formatos de lista de reproducción compatibles"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Todos los archivos"
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Otros archivos (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Archivos de DeaDBeeF (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Seguir enlaces simbólicos"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 día y %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d días y %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "tiempo total de reproducción"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "En pausa"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bits"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "tiempo de reproducción de la selección"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Detenido"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Renombrar la lista de reproducción"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Eliminando la lista de reproducción"
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "¿Confirma que quiere eliminar la lista de reproducción «%s»?"
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Lista de reproducción nueva (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Lista de reproducción con pestañas"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Divisor (superior e inferior)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Divisor (izquierdo y derecho)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Pestañas"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Pestañas de la lista de reproducción"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Propiedades de la selección"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Mostrar la carátula"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Osciloscopio"
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Espectro"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "Hbox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "Vbox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Botón"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Barra de búsqueda"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Controles de reproducción"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Barra de volumen"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Voces «chiptune»"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Visor del registro"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Visor de la biblioteca multimedia"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Error al leer el archivo de ayuda"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Error al cargar el archivo de ayuda"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "El reproductor está ejecutando tareas en segundo plano. Si sale ahora, las tareas se cancelarán o se interrumpirán. Esto puede ocasionar la pérdida de datos."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "¿Seguro que quiere salir?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr " Los archivos se moverán a la papelera.\n\n(Este diálogo se puede desactivar en la configuración del complemento GTKUI)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr " Los archivos se perderán.\n\n(Este diálogo se puede desactivar en la configuración del complemento GTKUI)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr "¿Seguro que quiere eliminar el archivo seleccionado? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr "¿Seguro que quiere eliminar los %d archivos seleccionados?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr "¿Seguro que quiere borrar los %d archivos de la lista de reproducción actual?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "¿Seguro que quiere borrar el archivo que se está reproduciendo?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Borrar archivos del disco"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Izquierda"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Derecha"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Centro"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Por orden de reproducción"
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Pista"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Nada"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Aplicar la ganancia"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Aplicar la ganancia y evitar recortes según el pico"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Sólo evitar el recorte"
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Descendente"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (recomendada)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artista / Álbum"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "N.º de la pista"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Duración"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Índice del elemento"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Reproduciendo"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Carátula"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artista - Álbum"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Año"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "N.º de la pista"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Banda / Artista del álbum"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Códec"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Tasa de bits"
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
 msgid "Add column"
 msgstr "Añadir una columna"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
 msgid "Edit column"
 msgstr "Editar la columna"
 
-#: ../plugins/gtkui/plcommon.c:1224
+#: ../plugins/gtkui/playlist/plcommon.c:869
 msgid "Remove column"
-msgstr "Quitar la columna"
+msgstr "Eliminar la columna"
 
-#: ../plugins/gtkui/plcommon.c:1234
+#: ../plugins/gtkui/playlist/plcommon.c:884
 msgid "Pin groups when scrolling"
-msgstr "Mantener grupos al desplazarse"
+msgstr "Mantener los grupos al desplazarse"
 
-#: ../plugins/gtkui/plcommon.c:1239
+#: ../plugins/gtkui/playlist/plcommon.c:889
 msgid "Group by"
 msgstr "Agrupar por"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Nada"
-
-#: ../plugins/gtkui/plcommon.c:1250
+#: ../plugins/gtkui/playlist/plcommon.c:900
 msgid "Artist/Date/Album"
 msgstr "Artista/Fecha/Álbum"
 
-#: ../plugins/gtkui/pluginconf.c:42
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Reproducir el siguiente"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Reproducir después"
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Quitar de la cola de reproducción"
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Recargar metadatos"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Eliminar del disco"
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Eliminar la lista de reproducción"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Añadir una nueva lista de reproducción"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Activar la ordenación automática"
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr "Volver a aplicar la última clasificación elegida cada vez que se añadan nuevos archivos a esta lista de reproducción"
+
+#: ../plugins/gtkui/pluginconf.c:47
 msgid "Open file..."
 msgstr "Abrir un archivo…"
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/gtkui/pluginconf.c:559
 #, c-format
 msgid "Configure %s"
 msgstr "Configurar %s"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Dispositivo de sonido predeterminado"
-
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin/prefwin.c:140
 msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
-"Modificó la configuración de atajos de teclado, pero no guardó los cambios."
+msgstr "Ha modificado la configuración de los atajos de teclado, pero no ha guardado los cambios."
 
-#: ../plugins/gtkui/prefwin.c:350
+#: ../plugins/gtkui/prefwin/prefwin.c:142
 msgid "Are you sure you want to continue without saving?"
 msgstr "¿Quiere continuar sin guardar?"
 
-#: ../plugins/gtkui/progress.c:56
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Dispositivo de sonido predeterminado"
+
+#: ../plugins/gtkui/progress.c:62
 msgid "Adding files..."
 msgstr "Añadiendo archivos…"
 
-#: ../plugins/gtkui/progress.c:89
+#: ../plugins/gtkui/progress.c:95
 msgid "Initializing..."
 msgstr "Inicializando…"
 
-#: ../plugins/gtkui/trkproperties.c:168
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Progreso de la actualización de las etiquetas del archivo"
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nombre"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Ganancia del álbum"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Ganancia de pista"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Pico del álbum"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Pico de la pista"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Éxito"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Archivo no encontrado"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Archivo no válido"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Buscar (%list_total% resultados)"
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Mostrar los títulos de las columnas"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Valor"
+
+#: ../plugins/gtkui/trkproperties.c:116
 msgid "You've modified data for this track."
 msgstr "Ha modificado los datos de esta pista."
 
-#: ../plugins/gtkui/trkproperties.c:170
+#: ../plugins/gtkui/trkproperties.c:118
 msgid "Really close the window?"
-msgstr "¿Realmente quiere cerrar la ventana?"
+msgstr "¿Seguro que quiere cerrar la ventana?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
 msgid "Multiple values "
 msgstr "Valores múltiples"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
+#: ../plugins/gtkui/trkproperties.c:455
 msgid "Key"
 msgstr "Clave"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Valor"
-
-#: ../plugins/gtkui/trkproperties.c:522
+#: ../plugins/gtkui/trkproperties.c:473
 msgid "Multiple values"
 msgstr "Valores múltiples"
 
-#: ../plugins/gtkui/trkproperties.c:701
+#: ../plugins/gtkui/trkproperties.c:662
 msgid "Writing tags..."
 msgstr "Escribiendo las etiquetas…"
 
-#: ../plugins/gtkui/trkproperties.c:730
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "Elemento"
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Campo"
+
+#: ../plugins/gtkui/trkproperties.c:1210
 msgid "Field name"
 msgstr "Nombre del campo"
 
-#: ../plugins/gtkui/trkproperties.c:733
+#: ../plugins/gtkui/trkproperties.c:1213
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../plugins/gtkui/trkproperties.c:745
+#: ../plugins/gtkui/trkproperties.c:1226
 msgid "Field names must not start with : or _"
-msgstr "Los nombres de campos no deben comenzar con : o _"
+msgstr "Los nombres de campo no deben comenzar por «:» o «_»"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
 msgid "Cannot add field"
 msgstr "No se puede añadir el campo"
 
-#: ../plugins/gtkui/trkproperties.c:784
+#: ../plugins/gtkui/trkproperties.c:1267
 msgid "Field with such name already exists, please try different name."
-msgstr "Ya existe un campo con ese nombre, por favor utilice otro diferente."
+msgstr "Ya existe un campo con ese nombre; utilice uno diferente."
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Añadir campo"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "El control «%s» no está disponible"
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Quitar campo"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Reemplazar con…"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Uso: deadbeef opciones -- archivo(s)\n"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Insertar…"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opciones:\n"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Cortar"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help o -h Mostrar la ayuda (este mensaje) y salir\n"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Copiar"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Salir del reproductor\n"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Pegar"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Mostar la versión y salir\n"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Superior"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Iniciar reproducción\n"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "No se admiten múltiples controles de este tipo"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Parar reproducción\n"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Tamaño proporcional"
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Bloquear la altura del panel superior"
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Bloquear la anchura del panel izquierdo"
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Bloquear la altura del panel inferior"
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Bloquear la anchura del panel derecho"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pausar reproducción\n"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Renombrar la pestaña"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Alternar pausa\n"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Eliminar la pestaña"
 
-#: ../main.c:99
-#, 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"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Añadir una pestaña nueva"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Siguiente pista de la lista de reproducción\n"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Mover la pestaña a la izquierda"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Pista anterior de la lista de reproducción \n"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Mover la pestaña a la derecha"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Canción aleatoria de la lista de reproducción\n"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr "Modo de renderizado"
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr "Multicanal"
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr "Escala"
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "Automático"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Añadir archivo(s) a la lista de reproducción\n"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr "--gui PLUGIN Dice cual plugin de IGU usar, \"GTK2\" por defecto\n"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../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"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr "3x"
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr "Duración del fragmento"
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 ms"
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 ms"
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 ms"
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 ms"
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 ms"
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr "Frecuencias discretas"
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr "Bandas de 1/12 de octava"
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr "Bandas de 1/24 de octava"
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr "Tamaño del intervalo"
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr "1/2 compás"
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr "1/3 compás"
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr "1/4 compás"
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr "1/5 compás"
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr "1/6 compás"
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr "1/7 compás"
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr "1/8 compás"
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr "1/9 compás"
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr "1/10 compás"
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Expandir el cuadro en 1 elemento"
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Reducir el cuadro en 1 elemento"
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogéneo"
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Expandir"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Rellenar"
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Configurar el botón"
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr "_Escala de dB"
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr "_Escala lineal"
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr "_Escala cúbica"
 
-#: ../main.c:106
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Voces:"
+
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-syntaxis: a: Artista, t: Título, b: Álbum,\n"
-" l: Duración, n: Pista, y: Año, c: Comentario,\n"
-" r: Copyright, e: Tiempo restante\n"
+msgid "Copy of %s"
+msgstr "Copia de %s"
 
-#: ../main.c:109
+#: ../plugins/hotkeys/actionhandlers.c:827
 #, 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 "Copy of %s (%d)"
+msgstr "Copia de %s (%d)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "(en pausa)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "(detenido)"
 
-#: ../main.c:110
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "(reproduciendo)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
 #, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Predeterminado"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Elementos"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Sí"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Navegador de listas de reproducción"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "No"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Órdenes personalizadas"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Índice del elemento\n"
-"Reproduciendo\n"
-"Arte del álbum\n"
-"Artista - Álbum\n"
-"Artista\n"
-"Album\n"
-"Título\n"
-"Duración\n"
-"Número de pista\n"
-"Banda / Artista del álbum\n"
-"Personalizado"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Cerrar"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Izquierda\n"
-"Derecha"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Editar la orden"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Orden:"
+
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Deshabilitar\n"
-"\\Pista\n"
-"Album"
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr "Orden arbitraria. Se ejecutará en el mismo contexto del intérprete de órdenes desde el que se inició la aplicación principal. Se puede utilizar el formato de título. Ejemplo: xdg-open %D"
+
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "Identificador:"
+
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Nombre de libre elección, por ejemplo «Mi orden»"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Ascending\n"
-"Descending"
-msgstr ""
-"Ascendente\n"
-"Descendente"
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "El identificador de la orden: debe ser corto y único, p. ej., «abrir_youtube»."
+
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Pistas individuales"
+
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Funciona con una pista individual"
+
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Múltiples pistas"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Funciona con múltiples pistas"
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Archivos locales"
+
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Funciona con archivos locales"
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Archivos remotos"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Funciona con archivos remotos (p.e: transmisiones http://)"
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Genérico (menú principal)"
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "El elemento debe aparecer en el menú principal"
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
-msgstr ""
-"2.3 (recomendada)\n"
-"2.4"
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr "Si desea añadir la orden al menú principal, asegúrese de que el título incluya la ruta al menú de la siguiente forma: «Archivo/Mi orden», donde Archivo es el nombre del menú en la versión inglesa."
+
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Añadir una orden"
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "Esta acción eliminará la orden seleccionada. ¿Está seguro?"
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Confirmar la eliminación"
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "El identificador es obligatorio y debe ser único.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "El título es obligatorio.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "La orden no se puede dejar en blanco.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Valores no válidos"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, 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."
+msgstr "wildmidi: No se encontró el archivo de configuración freepats. Instale el paquete timidity-freepats o especifique la ruta al archivo freepats.cfg en la configuración del complemento."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "monoaural"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "estéreo"
 
-#. 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 ""
+msgid "Track Title"
+msgstr "Título de la pista"
 
 #: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Buscar en Last.fm"
-
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Usar remuestreo ALSA"
-
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Liberar el dispositivo al detener"
-
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Tamaño preferido del búfer"
+msgid "Performer"
+msgstr "Intérprete"
 
 #: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Tamaño preferido del periodo"
+msgid "Total Tracks"
+msgstr "Total de pistas"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Género"
 
-#. Last.fm plugin
 #: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Habilitar scrobbler"
+msgid "Composer"
+msgstr "Compositor"
 
 #: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Deshabilitar reproduciendo ahora"
+msgid "Disc Number"
+msgstr "Número del disco"
 
 #: ../translation/extra.c:13
-msgid "Username"
-msgstr "Nombre de usuario"
+msgid "Total Discs"
+msgstr "Total de discos"
 
 #: ../translation/extra.c:14
-msgid "Password"
-msgstr "Contraseña"
+msgid "Comment"
+msgstr "Comentario"
 
 #: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "URL de Scrobble"
+msgid "Encoder / Vendor"
+msgstr "Codificador / Proveedor"
 
 #: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Preferir campo «Artista del álbum» sobre «Artista»"
+msgid "Copyright"
+msgstr "Derechos de autor"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Ubicación"
 
-#. OSS output plugin
 #: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Dispositivo de archivo"
+msgid "Subtrack Index"
+msgstr "Índice de la subpista"
 
 #: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Solución para error de muestreo de OSS4"
+msgid "Tag Type(s)"
+msgstr "Tipos de etiquetas"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Hoja cue incrustada"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr "Nombre del servicio remoto de PipeWire (en blanco por defecto)"
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr "Propiedades personalizadas (anula las existentes):"
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr "Usar el control de volumen de PipeWire"
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Preferir emulador Ken sobre Satoh (el sonido envolvente no funcionará)"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Activar el sonido envolvente"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Usar el remuestreo ALSA"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Tamaño de búfer preferido"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Periodo de actualización de la cache (hr)"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Tamaño de período preferido"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr "Actualizar el arte de tapa"
 
-#: ../translation/extra.c:22
+#: ../translation/plugins.c:24
+#, no-c-format
 msgid "Fetch from embedded tags"
-msgstr "Obtener de etiquetas incrustadas"
+msgstr "Obtener de las etiquetas incrustadas"
 
-#: ../translation/extra.c:23
+#: ../translation/plugins.c:26
+#, no-c-format
 msgid "Fetch from local folder"
-msgstr "Obtener de carpeta local"
-
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Máscara de archivo para portada local"
+msgstr "Obtener de la carpeta local"
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr "Obtener de Last.fm"
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Obtener de albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Escalar gráfico hacia el lado largo"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Usar CDDB/FreeDB"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Obtener de MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Obtener de Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "Obtención de información de World of Spectrum (archivos AY)"
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Guardar los archivos descargados en carpetas de música"
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Cuando no se ha encontrado ninguna imagen"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "dejar en blanco"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "usar la carátula por defecto de DeaDBeeF"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "mostrar una imagen personalizada"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Ruta de la imagen personalizada"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "Guardar en nombre de archivo"
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr "Buscar máscaras (separadas por ;)"
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr "Buscar carpetas (separadas por ;)"
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "Actualizar caché (hs)"
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "Nombres de archivos de caché simplificados"
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Tamaño de la imagen"
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "Unidad de CD para cargar"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Unidad de CD de audio"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Archivo"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Añadir un CD de audio"
 
-#: ../translation/extra.c:30
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr "Usar CDDB/GnuDb"
+
+#: ../translation/plugins.c:71
+#, no-c-format
 msgid "Prefer CD-Text over CDDB"
 msgstr "Preferir CD-Text sobre CDDB"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "url CDDB (ej.: 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Número de puerto CDDB (ej.: '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Preferir protocolo CDDB sobre HTTP"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr "URL de CDDB (por ejemplo, «gnudb.gnudb.org»)"
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr "Número de puerto de CDDB (por ejemplo, «8880»)"
 
-#: ../translation/extra.c:34
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Usar el protocolo CDDB"
+
+#: ../translation/plugins.c:79
+#, no-c-format
 msgid "Enable NRG image support"
-msgstr "Habilitar soporte a imágenes NRG"
+msgstr "Activar la compatibilidad con imágenes NRG"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "calidad de remuestreo (0..2, superior es mejor)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "Salida de 8 bits (predeterminada: 16)"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Velocidad de la unidad para una reproducción normal"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Duración máxima de la canción (en minutos)"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Duración del desvanecido (segundos)"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Repetir n veces (si está disponible)"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Máx."
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Pedir confirmación para eliminar archivos del disco"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Usar la corrección de errores de cdparanoia durante la extracción"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Sensibilidad del icono de control del volumen"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Convertir"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Icono de estado personalizado"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Detección automática de la tasa de muestreo del dispositivo de salida"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Ejecutar gtk_init with --sync (modo depuración)"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Configurar la tasa de muestreo directamente"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr ""
-"Añadir separadores entre los elementos contextuales de los complementos"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Calidad/algoritmo"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Formato del título de notificación"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Calidad del remuestreo"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Formato del contenido de notificación"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Volumen DUMB interno"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Mostrar arte del álbum"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Aumento de volumen"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Tamaño del arte del álbum (px)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Solo encendido/apagado"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Servidor PulseAudio"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Completo"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Tasa de muetreo"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "Salida de 8 bits"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Ruta de la tabla de búsqueda relativa"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Usar todas las extensiones compatibles con ffmpeg"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Ruta de la tabla de búsqueda absoluta"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Extensiones de archivos (separadas por «;»)"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
-"Intercambiar bytes de audio (alternar si lo único que escucha es estática)"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Habilitar BBDD HVSC Songlength"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Ignorar los errores de encabezado incorrecto"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (de HVSC)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Ignorar los errores de transmisión que no se pueden analizar"
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bits por muestra (8 o 16)"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Duración máxima de la canción (en minutos)"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Duración predeterminada de la canción (seg.)"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Duración del fundido (segundos)"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Achivo de configuración del banco de Timidity++"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Repetir n veces (si está disponible)"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Título de la pista"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "BIOS de ColecoVision (para el formato de archivo SGC)"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Intérprete"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Total de pistas"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Eliminar la información de ReplayGain"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Género"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Explorar la selección como álbumes (por etiquetas)"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Compositor"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Analizar la selección como un solo álbum"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Número del disco"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Explorar la ganancia de pista por archivo"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Comentario"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Explorar la ganancia de pista por archivo si no se ha explorado"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Codificador / Proveedor"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Deseleccionar todo"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Ubicación"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Seleccionar todo"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Índice de la subpista"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Añadir una ubicación"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tipo de etiqueta(s)"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Añadir carpetas"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Hoja Cue incrustada"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Añadir archivos"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Códec"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Abrir archivos"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Extensiones de archivos (delimitadas por ';' )"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Mostrar la página de ayuda"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Convertir"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Cambiar el modo de repetición"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Tasa de muestreo de destino"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Repetición desactivada"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Calidad/algoritmo"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Repetir una sola pista"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Muestreo automático (anula la tasa de muestreo de destino)"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Repetir todas las pistas"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Cambiar el modo aleatorio"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Desactivar la reproducción sin pausas (análisis más rápido)"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Barajar pistas al azar"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Preferir emulador Ken sobre Satoh (el sonido envolvente no funcionará)"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Barajar álbums"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Activar el sonido envolvente"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Barajar pistas"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr ""
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Desactivar el modo aleatorio"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "El archivo ya existe. ¿Sobreescribir?"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "El cursor sigue la reproducción"
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Alerta del convertidor"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "El desplazamiento sigue la reproducción"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Por favor, seleccione el codificador"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Ver"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Error del convertidor"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Mostrar\\/ocultar el menú"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Convirtiendo…"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Mostrar\\/ocultar la barra de estado"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Seleccionar carpeta..."
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Activar o desactivar el modo de diseño"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Fallo al guardar preajuste del codificador"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Ordenación personalizada"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-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"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Recortar la selección"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-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."
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr "Quitar pista(s) de la lista de reproducción"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Error"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Guardar la lista de reproducción"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Añadir nuevo codificador"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Eliminar la lista de reproducción"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Modificar codificador"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "Renombra la lista de reproducción"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Quitar preajuste"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Mostrar\\/ocultar el ecualizador"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Esta acción eliminará el preajuste seleccionado. ¿Está seguro?"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Ocultar el ecualizador"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Codificadores"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Mostrar el ecualizador"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Añadir complemento a la cadena DSP"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Mostrar\\/ocultar la ventana del reproductor"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Fallo al guardar preajuste DSP"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Ocultar la ventana del reproductor"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Nuevo preajuste DSP"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Mostrar la ventana del reproductor"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Modificar preajuste DSP"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Buscar"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Preajustes DSP"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Mostrar\\/ocultar la ventana del registro"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Carpeta de salida:"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Pedir confirmación para eliminar archivos del disco"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Escribir a la carpeta fuente de la pista"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "Configuración del ícono de estado:"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Conservar estructura de las carpetas"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Sensibilidad del control del volumen en el icono de estado"
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Nombre del archivo de salida:"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Icono de estado personalizado"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:254
 #, no-c-format
-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)."
+msgid "Misc:"
+msgstr "Varios:"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Codificador:"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Añadir separadores entre los elementos del menú contextual de los complementos"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Preajuste DSP:"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Usar caracteres Unicode en vez de imágenes para el estado de la pista"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Número de hilos:"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Desactivar el texto superpuesto de la barra de búsqueda"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Formato de muestra de salida:"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr "Anterior o reiniciar la pista actual"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Mantener el formato de origen"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "Duplicar lista de reproducción"
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "entero 8 bit con signo"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr "Saltar a la pista que se está reproduciendo"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "entero 16 bit con signo"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Saltar a"
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "entero 24 bit con signo"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Género anterior"
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "entero 32 bit con signo"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Compositor anterior"
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "flotante 32 bit"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Artista anterior"
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Cuando el archivo exista:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Álbum anterior"
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Preguntar"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Género siguiente"
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Sobreescribir"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Compositor siguiente"
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Modificar preajuste del codificador"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Artista siguiente"
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Codificador sin nombre"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "Álbum siguiente"
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Extensión del archivo de salida:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Lista de reproducción siguiente"
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "P. ej. mp3"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Lista de reproducción anterior"
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Línea de órdenes:"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "Cambiar a lista de reproducción 10"
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:295
 #, no-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"
+msgid "Switch to Playlist 9"
+msgstr "Cambiar a lista de reproducción 9"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:297
 #, no-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"
+msgid "Switch to Playlist 8"
+msgstr "Cambiar a lista de reproducción 8"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Método:"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Cambiar a lista de reproducción 7"
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Tubería"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "Cambiar a lista de reproducción 6"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Archivo temporal"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Cambiar a lista de reproducción 5"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Cambiar a lista de reproducción 4"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Cambiar a lista de reproducción 3"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Cambiar a lista de reproducción 2"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Cambiar a lista de reproducción 1"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Ordenar al azar"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Editor de etiquetas"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Ordenar por fecha"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Editor de preajustes DSP"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Ordenar por artista"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Preajuste DSP sin nombre"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Ordenar por álbum"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Añadir"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Ordenar por número de pista"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Imposible encontrar el archivo pixmap: %s"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Ordenar por título"
 
-#: ../plugins/converter/converter.glade.h:12
-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 ""
-"Mantener el formato original\n"
-"Entero firmado de 8 bits\n"
-"Entero firmado de 16 bits\n"
-"Entero firmado de 24 bits\n"
-"Entero firmado de 32 bits\n"
-"Flotante de 32 bits"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Invertir la selección"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
-msgstr ""
-"Preguntar\n"
-"Sobreescribir"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Borrar la lista de reproducción"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
-"Pipe\n"
-"Archivo temporal"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr "Agregar a la cola de reproducción"
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
-msgstr "Órdenes personalizadas"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr "Agregar al principio de la cola de reproducción"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Editar"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr "Alternar en la cola de reproducción"
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
-msgstr "Cerrar"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Mover"
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
-msgstr "Editar la orden"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Mover las pistas hacia abajo"
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
-msgstr "Orden:"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Mover las pistas hacia arriba"
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:343
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
-msgstr ""
-"Cualquier orden de consola. Se ejecutará en el contexto que inició la "
-"aplicación. Puede usarse formato de título. Ejemplo: xdg-open %D"
+msgid "Toggle Mute"
+msgstr "Silenciar"
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
-msgstr "Id.:"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Pausar"
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
-msgstr "Nombre libre, por ejemplo «Mi orden de consola»"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Reproducción\\/pausa"
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"El identificador de la orden: debe ser corto y único, p.ej., «youtube_abrir»."
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Avanzar 1 s"
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
-msgstr "Pistas individuales"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Retroceder 1 s"
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
-msgstr "Funciona en pista individual"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Avanzar 5 s"
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
-msgstr "Múltiples pistas"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Retroceder 5 s"
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
-msgstr "Funciona en múltiples pistas"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Avanzar un 1%"
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
-msgstr "Locales"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Retroceder un 1%"
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
-msgstr "Funciona en archivos locales"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Avanzar un 5%"
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
-msgstr "Remotos"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Retroceder un 5%"
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
-msgstr "Funciona en archivos remotos (p.ej., transmisiones http://)"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Subir el volumen"
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
-msgstr "Genérico (menú principal)"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Bajar el volumen"
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
-msgstr "El elemento debe aparecer en el menú principal"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Detener después de la pista actual"
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
-msgstr ""
-"Si desea añadir la orden al menú principal, asegúrese que el título "
-"incluya la ruta al menú de la siguiente forma: \"File/Mi orden\", donde File "
-"es el nombre del menú en la versión inglesa."
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Detener después del álbum actual"
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
-msgstr "Añadir orden"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr "Buscar en Last.fm"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Eliminar"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Activar Scrobbler"
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "Esta acción eliminará la orden de consola seleccionada. ¿Está seguro?"
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "No enviar información sobre la pista actual"
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
-msgstr "Confirmar eliminación"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Nombre de usuario"
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
-msgstr "El id. es obligatorio y debe ser único.\n"
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Contraseña"
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
-msgstr "El título es obligatorio.\n"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "URL de Scrobble"
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
-msgstr "Debe proporcionar la orden del intérprete.\n"
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Preferir el campo «Artista del álbum» sobre «Artista»"
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
-msgstr "Valores no válidos"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Enviar el identificador de MusicBrainz"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Formatos de sonido admitidos"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Enviar pistas de menos de 30 segundos (no recomendado)"
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Todos los archivos (*)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Mezcla izquierda"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Abrir archivo(s)…"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Mezcla derecha"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Añadir archivo(s) a la lista…"
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Forzar la salida de 16 bits"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Añadir carpeta(s) a la lista…"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Motor"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Seguir enlaces simbólicos"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Formato del título de la notificación"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Formato del contenido de la notificación"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Eliminar los archivos del disco"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Mostrar la carátula del álbum"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Tamaño de la carátula del álbum (píxeles)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
-"Los archivos se perderán. ¿Continuar?\n"
-"(Este diálogo puede desactivarse en las preferencias del plugin GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Cargar lista de reproducción"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Archivo del dispositivo"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Otros archivos (*)"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Resaltar la lista de reproducción actual"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Guardar lista de reproducción como"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Reproducir con un doble clic"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Archivos de DeaDBeeF (*.dbpl)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Tamaño del búfer (-1 para usar el valor óptimo elegido por PortAudio)"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Tipo de contenido"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Codificación del nombre del dispositivo"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Valor(es) no válido(s)."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII/UTF-8"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
-msgstr ""
-"Los campos Plugins y Content-Type no deben estar vacíos y deben ser "
-"correctos.\n"
-"Ejemplo de Content-Type: 'audio/mpg'.\n"
-"Ejemplo de ID de plugin: 'stdmpg ffmpeg'.\n"
-"Deben usarse espacios como separadores en las IDs de plugins.\n"
-"Content-Type deben ser solo letras, números y '-'.\n"
-"Los ID de plugins deben ser solo letras y números."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "CP1250"
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "No se ha seleccionado nada."
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Se define a continuación"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr ""
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Codificación de los nombres de dispositivo definida por el usuario"
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Reemplazar con…"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "Servidor PulseAudio (dejar en blanco para la detección automática)"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Insertar…"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Duración predeterminada de la canción (en minutos)"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Cortar"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Tasa de muestreo"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Copiar"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Saltar cuando sea más corta que (en segundos) "
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Pegar"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Configurar órdenes personalizadas"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr "No se admiten múltiples widgets de este tipo"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Ruta relativa de la tabla de búsqueda"
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Bloquear el movimiento"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Ruta absoluta de la tabla de búsqueda"
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Mover la pestaña a la izquierda"
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Intercambiar los bytes de audio (cambiar si lo único que escucha es estática)"
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Mover la pestaña a la derecha"
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Activar BBDD HVSC Songlength"
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Eliminar la pestaña"
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Ruta completa a Songlengths.md5/.txt"
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Renombrar la pestaña"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Bits por muestra"
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Añadir una pestaña nueva"
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Duración predeterminada de la canción (s)"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Mostrar los títulos de las columnas"
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Sintetizador mono"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Activar el registro"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Expandir el cuadro un elemento"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "Reducir el cuadro un elemento"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Preamplificador"
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Homogéneo"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Expandir"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Rellenar"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Configurar el botón"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr ""
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Editar lista de reproducción"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Renombrar lista de reproducción"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Eliminar lista de reproducción"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Añadir lista de reproducción nueva"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Nombre"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Achivo de configuración del banco de Timidity++"
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Navegador de listas de reproducción"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "Extensión del archivo"
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr "Línea de comandos del codificador"
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr "Método de transferencia de datos"
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr "Pipe (stdin)"
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "Archivo temporal"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "Archivo fuente"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "Escribir etiqueta ID3v2"
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "Escribir etiqueta ID3v1"
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "Escribir etiqueta APEv2"
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "Escribir etiqueta FLAC"
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "Escribir etiqueta OggVorbis"
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "Escribir etiqueta MP4"

deadbeef-0.6.2.tar.bz2/po/et.po -> deadbeef-1.9.6.tar.bz2/po/et.po Changed

@@ -1,2061 +1,2616 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Anari Jalakas <anari.jalakas@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Estonian (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/et/)\n"
-"Language: et\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Anari Jalakas <anari.jalakas@gmail.com>, 2021\n"
+"Language-Team: Estonian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "DeaDBeeF %s teave"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Kasutamine: deadbeef võtmed -- fail(id)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s muudatuste logi"
+msgid "Options:\n"
+msgstr "Valikud:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF tõlkijad"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help või -h Prindib abiinfo (praeguse tekst) ja väljub\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Salvesta DeaDBeeF EQ eelhäälestus"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Väljub mängijast\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ eelhäälestus failid (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Väljastab versiooniteabe ja väljub\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Lae DeaDBeeF EQ eelhäälestus..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Käivitab esituse\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ eelhäälestus (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Seiskab esituse\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Impordi Foobar2000 EQ eelhäälestus..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Peatab esituse\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ eelhäälestus (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Pausi lülitamine\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Salvesta eelhäälestus"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Kui peatatud siis alustab esituse, muul juhul lülitab ümber\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Lae eelhäälestus"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Järgmine esitusloendi lugu\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Impordi Foobar2000 eelhäälestus"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Eelmine lugu esitusloendist\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Luba"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Juhuslik lugu esitusloendist\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Nulli kõik"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Lisab esitusloendisse faili(e)\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Nulli eelvõimendus"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Määrab, millist GUI pluginat kasutada, vaikimisi on \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Nulli ribad"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Prindib pala andmed etteantud formaadis\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Eelhäälestused"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-süntaks: artist, tiitel, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 päev %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " näide: --nowplaying \"%%a - %%t\" peaks printima \"esitaja - pealkiri\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d päeva %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " rohkema teabe jaoks vaata %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Peatatud | %d lugu | %s kokku mängitud"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " MÄRKUS: --nowplaying on aegunud.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Prindib pala vormindatud nime stdout-i, kasutades uut pealkirja vormingut\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " FMT süntaks: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " näide: --nowplaying-tf \"%%artist%% - %%title%%\" peaks printima \"esitaja - pealkiri\"\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Paus | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Prindib või määrab helitaseme.\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, 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"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " NUM parameetrit saab täpsustada protsentides (absoluutväärtus või juurdekasv/vähenemine)\n"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Uus esitusloend"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " või dB-des -50, 0 (kui järelliitega).\n"
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Uus esitusloend (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Näited: --volume 80, --volume +10, --volume -5 või --volume -20dB\n"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr ""
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Vaikimisi"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr ""
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr ""
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr ""
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Jah"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr ""
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Ei"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Väljundkaust:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Kirjuta sisendpala kausta"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Kaustastruktuuri säilitamine"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Kopeeri, kui formaat ei muutu"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Sildista uuesti pärast kopeerimist"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Väljundfaili nimi:"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Laiendus (nt .mp3) lisatakse automaatselt.\nKui jätta tühjaks, on vaikimisi (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Enkooder:"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP seadistus:"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Abifaili lugemine ebaõnnestus"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Lõimede arv:"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Abifaili laadimine ebaõnnestus"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Väljund diskreedi formaat:"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:14
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"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 "Sisendi formaadi säilitamine\n8-bitine märgiga int\n16-bitine märgiga int\n24-bitine märgiga int\n32-bitine märgiga int\n32-bitine ujukoma"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Kui fail on olemas:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Jäta vahele\nKüsi\nKirjuta üle"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Enkodeeri eelseadistuse muutmine"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Tiitel:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Nimetu kodeerija"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Väljundfaili laiend:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Näiteks mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Käsurida:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-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/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Meetod:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Toru\nTemp-fail\nLähtefail"
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Sildikirjutaja"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP seadistuse redaktor"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Tiitel"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Nimetu DSP seadistus"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Lisa"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Eemalda"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Seadistamine"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Vali DSP plugin"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Eelhäälestused"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Sisseehitatud %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Fail on juba olemas. Kas kirjutada see üle?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Konverteerimise hoiatus"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Palun vali enkodeer"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Konverteerimise viga"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Konverteerimine..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Kausta valimine..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Enkodeeri eelseadistuse salvestamine ebaõnnestus"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+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/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Sama nimega eelhäälestus juba eksisteerib. Vali teistsugune nimi."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Viga"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Lisa uus enkooder"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Enkooderi muutmine"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Eemalda eelseadistus"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "See kustutab valitud eelhäälestuse. Oled sa kindel?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Enkooderid"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Lisa DSP plugin"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "DSP seadistuse salvestamine ebaõnnestus"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Uus DSP seadistus"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "DSP seadistuse muutmine"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP seadistused"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Abi"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Säilita sisendi formaat"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit signed int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit signed int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit signed int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Jäta vahele"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Küsi"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Kirjuta üle"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Toru"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Ajutine fail"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Lähtefail"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Ei leitud pixmap faili: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Ava fail(e)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Lisa fail(e) esitusloendisse..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Lisa kaust(ad) esitusloendisse..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Lae esitusloend"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Salvesta esitusloend kui"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeaDBeeF %s teave"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s muudatuste logi"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF tõlkijad"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Sisutüüp"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Pluginad"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Vigane väärtus või väärtused."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Sisutüübi ja pluginate väljad peavad olema mittetühjad ja vastama eeskirjadele.\nSisutüübi näide: 'audio/mpeg'.\nNäide plugina ID-d: 'stdmpg ffmpeg'.\nPluginate ID-de loendis tuleb eraldajana kasutada tühikuid.\nSisutüüp peaks olema ainult tähed, numbrid ja tähis „-”.\nPlugina ID võib sisaldada ainult tähti ja numbreid."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Midagi ei ole valitud."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Fail"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Ava fail(e)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Lisa fail(e)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Lisa kaust(ad)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Lisa asukoht"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Uus esitusloend"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Lae esitusloend"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Salvesta esitusloend"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Välju"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Redigeerimine"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
-msgstr "_Puhasta"
+msgstr "_Tühjenda"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Vali kõik"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
-msgstr "Tühista kõik"
+msgstr "Eemalda märgistus"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Pööra valik"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Valik"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Eemalda"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Kärbi"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
-msgstr "_Otsi"
+msgstr "_Otsing"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
-msgstr ""
+msgstr "Sorteerimise alus"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Tiitel"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
-msgstr "Loo number"
+msgstr "Pala number"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
-msgstr "Artist"
+msgstr "Esitaja"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
-msgstr "Aeg"
+msgstr "Kuupäev"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Juhuslik"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
-msgstr "Muu"
+msgstr "Kohandatud"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Eelistused"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
-msgstr "_Vaade"
+msgstr "_Kuva"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Olekuriba"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Ekvalaiser"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
-msgstr ""
+msgstr "Koostamisrežiim"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Logi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Taasesitus"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Järjestus"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Järjest"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Lugude juhuesitus"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Albumite juhuesitus"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Kordamine"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Juhuesitus"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Väljas"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Palad"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Albumid"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Juhuslikud palad"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Kordumine"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Kõik palad"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Üks pala"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
-msgstr "Kerimisriba järgib taasesitust"
+msgstr "Kerimisriba järgib esitust"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
-msgstr "Kursor järgib taasesitust"
+msgstr "Kursor järgib esitust"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Seiska esitus pärast selle pala lõppu"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Seiska esitus pärast selle albumi lõppu"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
-msgstr "Hüppa praeguse loo juurde"
+msgstr "Hüppa praeguse pala juurde"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Abi"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Muudatuste logi"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
-msgstr "_Teave"
+msgstr "_Programmist lähemalt"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Tõlkijad"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Otsi"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
-msgstr "Seiska"
+msgstr "Seiskamine"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Esita"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Peata"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Eelmine"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Järgmine"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Mängi juhuslikult"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
-msgstr "Teave"
+msgstr "Programmist lähemalt"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Välju"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Abi"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
-msgstr "Loo omadused"
+msgstr "Pala omadused"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
-msgstr ""
+msgstr "Asukoht:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
-msgstr "Seaded"
+msgstr "Sätted"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Rakenda"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Sulge"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metaandmed"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Omadused"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Tiitel:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Loobu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Sisesta siia uue veeru pealkiri"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Tüüp:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Register"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Mängib"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Albumikujundus"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Esitaja - Album"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Kestvus"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Loo number"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Bänd / Albumi esitaja"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Formaat:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Sorteerimise formaat:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(kui mittetühi)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Paigutus:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Vasakul"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Paremal"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Tühista"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Vasakul\nParemal\nKeskel"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Teksti värv:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Väljund plugin:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Väljund seade:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Alati teisendada 8 bitine heli 16 bitiseks"
+msgstr "Alati teisendada 8-bitine heli-16 bitiseks"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Alati teisendada 16-bitine heli 24-bitiseks"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Tulemuse diskreetimissagedus:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "48 kHz kordsed (96k, 192k, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "44.1 kHz kordsed (88.2k, 176.4k, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Sisendi diskreetimissageduse alusel"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Diskreetimissageduse eiramine"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Heli"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Helitugevuse parandus:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Keela"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Allika režiim:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Lugu"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Mängimise järjekord\nPala\nAlbum"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Helitugevuse paranduse piigi väärtus"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Töötlemine:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Puudub\nRakenda helitaseme parand\nRakenda helitaseme parand ja väldi heli lõikamist vastavalt tippudele\nVältige ainult heli lõikamist"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Taasesituse eelvõimendus:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Globaalne eelvõimendus:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Eelvõimendus koos RG infoga:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Eelvõimendus ilma RG infoga:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 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:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
-msgstr "Jätka käivitamisel eelmist seanssi"
+msgstr "Käivitamisel jätkatakse eelmist seanssi"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Ära lisa kaustade lisamisel arhiivide sisu"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "\"Peata pärast käesolevat pala\" valik lülitub pärast käivitamist välja"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "\"Peata pärast käesolevat albumit\" lülitub pärast käivitamist välja"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Taasesitus"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Seadistamine"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "DSP eelseadistus"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Lae"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Minimeeri käivitumisel süsteemisalve"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Sulgemine minimeerib akna"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
-msgstr "Süsteemisalve ikooni peitmine"
+msgstr "Peida süsteemisalve ikoon"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "Kettalt kustutamine peaks kasutama prügikasti "
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Luba jaapani SHIFT-JIS tuvastamine ja ümberkodeerimine"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
+msgstr "Luba hiina CP1251 tuvastamine ja ümberkodeerimine"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Kasutajaliidese värskendussagedus (korda sekundis):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Tiitelriba tekst esitamise ajal:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Tiitelriba tekst peatamise ajal:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Graafiline plugin (muutus nõuab taaskäivitust):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Kuva olekuribal valiku esituse aega"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr ""
+msgstr "Mängija"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Hiire keskmine nupp sulgeb esitusloendi"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Lülitu järgmise loo juurde, kui hetkel mängiv eemaldatakse kettalt"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Esitusloendi automaatne nimetamine üksiku kausta lisamisel"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Veergude suuruse automaatne muutmine"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Rühma vahe:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pikslit"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Esitusloend"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
-msgstr ""
+msgstr "Kasutajaliides/Mitmesugust"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Eira parameetreid"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Esiplaan"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Taust"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Heli- ja esitlusliuguri värvid"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Keskel"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Hele"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Tume"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Alus"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Tekst"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Tabeli värv"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Tühista (kaotab GTK puuvaate teema, kuid kiirendab renderdamist)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Paaris rida"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Paaritu rida"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Valitud rida"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Valitud tekst"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Kursor"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Esitusloendi värvid"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Värvid"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Tulbad"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Taust (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Otsinguriba/Helitaseme riba/Ekvalaiser"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Baas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Tume:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Hele:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Keskkoht:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Tekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Rasvane kiri"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Kaldkiri"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Esitamise tekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Valitud tekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Vahekaardi riba"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Tavalised pala(d):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Esitamisel pala:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Valitud pala(d):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Veerge:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Rühma päis:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Esiplaan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Paaris:"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Paaritu:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Valitud:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Kursor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Taust:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Alistage (kaotab GTK-de ülevaatuse, kuid kiirendab renderdamist)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Välimus"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
-msgstr "Puhverserveri lubamine"
+msgstr "Luba puhverserver"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Puhverserveri aadress:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Puhverserveri port:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Puhverserveri tüüp:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Puhverserveri kasutajanimi:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Puhverserveri parool:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "HTTP identifikaator:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "Sisutüübi kaardistamise muutmine"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Võrk"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Määratud kiirklahvid:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
-msgstr ""
+msgstr "Toiming:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
-msgstr ""
+msgstr "<Määramata>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
-msgstr ""
+msgstr "Klahvikombinatsioon:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr ""
+msgstr "Globaalne kiirklahv"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "Muudatuste salvestamiseks kasutage nuppu Rakenda\nMuudatuste tagasivõtmiseks vajutage nuppu Tagasi.\nMuudatusi EI salvestata\nkui te ei vajuta Rakenda."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "_Vaikimisi"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
-msgstr ""
+msgstr "Kiirklahvid"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Versioon: "
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Seadistused"
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Info"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Litsents"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Autoriõigused"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Taasta vaikeväärtused"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Pluginad"
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versioon: "
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Kohandatud pealdis"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
-msgstr ""
+msgstr "Rühmitamise alus..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Formaat"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Kasvav"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Kahanev"
+msgstr "Sorteerimine..."
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Vali DSP plugin"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Plugin"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Kasvav\nKahanev"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Sildikirjutaja seaded"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Kirjuta ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Kirjuta ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Kirjuta APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "ID3v2 eemaldamine"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "ID3v1 eemaldamine"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "APEv2 eemaldamine"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 versioon"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Soovitatav)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Soovitatav)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 märgikodeering (vaikimisi iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Kirjuta ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "Sisutüübi kaardistamine"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
+msgstr "Selles tabelis määratletakse sidumine võrgu voogude tüüpide ja DeaDBeeF dekoodri pluginate vahel. Näiteks võib mp3-failidel olla sisu tüüp \"audio/x-mpeg\" ja need tuleb dekodeerida DeaDBeeF-i enda \"stdmpg\" pluginaga või \"ffmpeg\" pluginaga."
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr ""
+msgstr "Sisutüüp:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
-msgstr ""
+msgstr "Pluginad:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
-msgstr ""
+msgstr "Nupu omadused"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
-msgstr ""
+msgstr "Värv:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
-msgstr ""
+msgstr "Ikoon:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
-msgstr ""
+msgstr "Märgend:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
-msgstr ""
+msgstr "Vali toiming"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "See dialoog võimaldab määrata kohandatud pealkirja mis tahes pala jaoks. See on kõige kasulikum raadiojaamade jaoks. Dialoogis „Asukoha lisamine“ on olemas ka valik kohandatud pealkirja määramiseks. Pealkiri ise on nähtav veergudes, kus kuvatakse \"Artist\" metaandmete väli. Kui kunstniku väli on olemas, peaks see nägema välja nagu custom artist või lihtsalt \"custom\"."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Esitaja / Album"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Redigeeri"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Loo number"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Muutmine (asukohas)"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Lisa uus väli..."
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Väärtuse muutmine"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Välja nimi:"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Välja väärtus:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Lisa veerg"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF logi"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Muuda veergu"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Tühjenda"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Eemalda veerg"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "ReplayGain analüüs töös"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Praegune fail:"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Rühmitamise alus"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Olek"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Mitte ükski"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Loobu"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Esitaja/Aeg/Album"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "ReplayGain analüüsi tulemused"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Faili avamine..."
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Uuenda failide andmed"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Konfigureeri %s"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "Kopeeri raport"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Vaikimisi audioseade"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Näita ainult seadistustega pluginaid"
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Failide lisamine..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Algväärtustamine..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Sa oled selle loo andmeid muutnud."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Salvesta DeaDBeeF EQ eelhäälestus"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Kas soovid akna sulgeda?"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ eelhäälestus failid (*.ddbeq)"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Mitu väärtust "
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Lae DeaDBeeF EQ eelhäälestus..."
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Võti"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ eelhäälestused (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Väärtus"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Impordi Foobar2000 EQ eelhäälestus..."
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr ""
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ eelhäälestus (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Siltide kirjutamine..."
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Salvesta eelhäälestus"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr ""
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Lae eelhäälestus"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Nimi:"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Impordi Foobar2000 eelhäälestus"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Väljanimi ei tohi alata sümboliga : või _"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Luba"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Ei õnnestu välja lisada"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Nulli kõik"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Sellise nimega väli on juba olemas, proovi teist nime."
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Nulli eelvõimendus"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Lisa väli"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Eemalda väli"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Nulli ribad"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr ""
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Uus esitusloend"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Valikud:\n"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Toetatud helivormingud"
 
-#: ../main.c:92
-#, 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"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Kõik failid (*)"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Mängijast väljumine\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Toetatud esitusloendi formaadid"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Väljastab versiooniteabe ja väljub\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Kõik failid"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Alustab taasesitlust\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Muud failid (*)"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Peatab taasesitluse\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF esitusloendi failid (*.dbpl)"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Taasesituse paus\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Nimeviitade järgimine"
 
-#: ../main.c:98
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Pausi lülitamine\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 päev %d:%02d:%02d"
 
-#: ../main.c:99
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, 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"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d päeva %d:%02d:%02d"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Järgmine lugu esitlusloendist\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "kogu esitusaeg"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Pausitud"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "valiku esitusaeg"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Peatatud"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Eelmine lugu esitlusloendist\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Esitusloendi ümbernimetamine"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Juhuslik lugu esitlusloendist\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Esitusloendi eemaldamine"
 
-#: ../main.c:103
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Lisab faili(e) esitlusloendisse\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Kas soovid tõesti eemaldada esitusloendi '%s'?"
 
-#: ../main.c:104
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
+msgid "New Playlist (%d)"
+msgstr "Uus esitusloend (%d)"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Prindib loo andmed etteantud formaadis\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Esitusloend tabeldusmärkidega"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-syntax: artist, tiitel, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Eraldaja (üleval ja all)"
 
-#: ../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"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Eraldaja (vasakul ja paremal)"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Tabelduskohad"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Esitusloendi tabeldusmärkid"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Valiku omadused"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Kaanepildi kuva"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Vaikimisi"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spekter"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Jah"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Ei"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Nupp"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Otsinguriba"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Esituse juhtimine"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Helitaseme riba"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune hääled"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Loginäitaja"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
-"Vasak\n"
-"Parem"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Abiinfo faili lugemine ebaõnnestus"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Abiinfo faili laadimine ebaõnnestus"
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Keela\n"
-"Lugu\n"
-"Album"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Mängija töötab taustal. Kui praegu väljuda, siis tühistatakse ja katkestatakse kõik tegevused. See võib põhjustada andmete kadumist."
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Kas soovid tõesti väljuda?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Ascending\n"
-"Descending"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Kasvav\n"
-"Kahanev"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"2.3 (Soovitatav)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, 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 "Do you really want to delete the selected file?%s"
 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Järgiuurimine Last.fm-ist"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Kasuta ALSA ümberdiskreetimist"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Vabasta seade, kui peatatud"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Eelistatud puhvri suurus"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Kustuta"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Eelistatud perioodi suurus"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Vasakul"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Luba scrobbler"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Paremal"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Keela hetkel mängiv"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Keskele"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Kasutajanimi"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Parool"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Seadmefail"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 diskreetimissageduse vea vältimine"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Taasesituse järjekorra alusel"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Vahemälu uuendamise periood (tund)"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Pala"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Hangi põimitud siltidest"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Puudub"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Hangi lokaalsest kaustast"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Rakenda võimendus"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Lokaalne faili mask"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Hangi Last.fm lehelt"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Hangi albumart.org lehelt"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Albumikunst skaleeritakse pikema külje järgi"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "CDDB/FreeDB kasutamine"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Määra ja rakenda võimendus vastavalt helitaseme tippudele"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "CD-Teksti eelistamine CDDB ees"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Ainult väldi piiri ületamist"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB aadress (näiteks 'freedb.org')"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Kasvav"
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB pordi number (näiteks '888')"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Kahanev"
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Eelista CDDB protokolli HTTP-le"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Soovitatav)"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Võimalda NRG piltide toetus"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Ümberdiskreetimise kvaliteet (0..2, suurem on parem)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Esitaja / Album"
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Pala nr"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Maksimaalne loo pikkus (minutites)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Kestvus"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Register"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Esitamine"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Küsi failide kustutamise kohta kinnitust"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Albumikujundus"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Staatusikooni helitugevuse kontrolli tundlikus"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Esitaja - Album"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Kohandatud staatusikoon"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Aasta"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Käivita gtk_init koos --sync (debug reziim)"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Pala number"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Lisa plugina menüüde vahele eraldajaid"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Bänd / Albumi esitaja"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Teate tiitli formaat"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Koodek"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Teate sisu formaat"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bitikiirus"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Albumikunsti näitamine"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Lisa veerg"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Albumikunsti suurus (px)"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Veeru muutmine"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio server"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Eemalda veerg"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Diskreetimissagedus"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Kerimisel hoitakse grupid koos"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Otsimistabeli relatiivne aadress"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Rühmitamise alus"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Otsimistabeli absoluutne aadress"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Esitaja/Aeg/Album"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Audiobittide vahetamine (vali, kui kuuled ühtlast signaali)"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Võimalda HVSC lugude pikkuste andmebaas"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (HVSC-st)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bitte sampli kohta (8 või 16)"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Vaikimis loo pikkus (sek.)"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Metaandmete uuestilaadimine"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ konfiguratsioonifail"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Loo nimi"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Esitaja"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Lugusid kokku"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Žanr"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Esitusloendi eemaldamine"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Helilooja"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Lisa uus esitusloend"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Plaadi number"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Luba automaatne sortimine"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Kommentaar"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Helikodeerija / Tootja"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Faili avamine..."
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Asukoht"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Seadista %s"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Subtrack Indeks"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Muutsid kiirklahvide seadeid, kuid ei salvestanud muudatusi."
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Sildi tüüp(id)"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Oled sa kindel, et soovid jätkata ilma salvestamata?"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Põimitud kavaleht"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Vaikimisi audioseade"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Koodek"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Failide lisamine..."
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Faililaiendid (eralda sümboliga ';')"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Algväärtustamine..."
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Teisenda"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Uuendatakse failide siltide"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Tulemuse diskreetimissagedus"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nimi"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr ""
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Albumi helitaseme parand"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Pala helitaseme parand"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Albumi helitaseme tipp"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Pala helitaseme tipp"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Edukas"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Faili ei leitud"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Vigane fail"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Otsing (%list_total% tulemust)"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr ""
-"Automaatne diskreetimissagedus ('Tulemuse diskreetimissagedus' tühistatakse)"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Kuva tulba päiseid"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Väärtus"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Sa oled selle pala andmeid muutnud."
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Kas soovid akna sulgeda?"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Mitu väärtust "
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Klahv"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Mitu väärtust"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Siltide kirjutamine..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Fail on juba olemas. Kas kirjutada see üle?"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Välja nimi"
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Konverteri hoiatus"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Nimi:"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Palun vali kodeerija"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Välja nimi ei tohi alata sümboliga : või _"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Konverteerimise viga"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Ei õnnestu välja lisada"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Konvertimine..."
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Sellise nimega väli on juba olemas, proovi teist nime."
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Kausta valimine..."
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Vidin \"%s\" pole saadaval"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Kodeerija eelseadistuse salvestamine ebaõnnestus"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Asenda..."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-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/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Lisa..."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr ""
-"Sama nimega seadistus juba eksisteerib. Vali seadistusele teistsugune nimi."
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Lõika"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Viga"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopeeri"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Lisa uus kodeerija"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Aseta"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Muuda kodeerijat"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Vanem"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Eemalda eelseadistus"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Mitu seda tüüpi vidinat pole toetatud"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "See kustutab valitud seadistuse. Oled sa kindel?"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Proportsionaalne suurus"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Kodeerijad"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Lukusta ülemise paani kõrgus"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Lisa DSP plugin"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Lukusta vasaku külgpaani laius"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "DSP seadistuse salvestamine ebaõnnestus"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Lukusta alumise paani kõrgus"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Uus DSP seadistus"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Lukusta parema külgpaani laius"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "DSP seadistuse muutmine"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Nimeta kaart ümber"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP seadistused"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Eemalda kaart"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Väljundkaust:"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Lisa uus kaart"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Liiguta kaart vasakule"
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Liiguta kaart paremale"
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Väljundfaili nimi:"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
-#, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
 msgstr ""
-"Faililaiendused (näiteks .mp3) lisatakse automaatselt.\n"
-"Vaikimisi väärtuse jaoks jäta väli tühjaks (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Enkooder:"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP seadistus:"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Lõimede arv:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Väljundsämpli formaat:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Säilita allika formaat"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit signed int"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit signed int"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit signed int"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit signed int"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit float"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Kui fail on olemas:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Küsi"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Kirjuta üle"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Kodeerija seadistuste muutmine"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Ilma nimeta kodeerija"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Väljundfaili laiend:"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Näiteks mp3"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Käsurida:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
-"Näide: lame - %o\n"
-"%i sisendfail, %o väljundfail, - stdin jaoks"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
-"%o - väljundfaili nimi\n"
-"%i - ajutise sisendfaili nimi"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Meetod:"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Toru"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Ajutine fail"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Kasti laiendamine 1 väärtusega"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Kasti kahandamine 1 väärtusega"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogeenne"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Laiendamine"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Täida"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Sildi kirjutaja"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Seadista nupp"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP seadistuse redaktor"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Ilma nimeta DSP seadistus"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Lisa"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Ei leitud pixmap faili: %s"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Hääled:"
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr " (peatatud)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr " (seisatud)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr " (esitamisel)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Elemendid"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Esitusloendi sirvija"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr ""
-
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr ""
+msgstr "Kohandatud Shell käsud"
 
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
-msgstr ""
+msgstr "Sulge"
 
 #: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr ""
+msgstr "Käsu muutmine"
 
 #: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr ""
+msgstr "Käsk:"
 
 #: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
@@ -2064,74 +2619,74 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
+msgstr "Sõltumatu shellikäsk. Teostatakse shellikäsu kontekstis, millest põhirakendus algas. Kasutada võib pealkirja vormindamist. Näide: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
 #: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr ""
+msgstr "Vabateksti nimi, näiteks \"Minu shell-i käsk\""
 
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Käsu ID, tavaliselt peaks see olema midagi lühikest, näiteks \"youtube_open\". See peab olema unikaalne."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
-msgstr ""
+msgstr "Üksikud pala(d)"
 
 #: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
-msgstr ""
+msgstr "Töötab üksiku pala korral."
 
 #: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
-msgstr ""
+msgstr "Mitu pala"
 
 #: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
-msgstr ""
+msgstr "Töötab mitme palaga."
 
 #: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
-msgstr ""
+msgstr "Kohalik"
 
 #: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
-msgstr ""
+msgstr "Töötab kohalike failidega."
 
 #: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr ""
+msgstr "Kaug"
 
 #: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr ""
+msgstr "Töötab kaugfailidega (nt http:// striim)"
 
 #: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Üldine (põhimenüü)"
 
 #: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
-msgstr ""
+msgstr "Element peaks olema põhimenüüs kuvatud"
 
 #: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
@@ -2139,223 +2694,1271 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
+msgstr "Kui soovid lisada käsku peamenüüsse, veendu, et pealkiri sisaldab sellist menüü rada: \"Fail/Minu käsk\", kus Fail on menüü nimi inglise keeles."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr ""
-
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr ""
+msgstr "Lisa käsk"
 
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
+msgstr "See kustutab valitud käsurea seadistuse. Oled sa kindel?"
 
 #: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr ""
+msgstr "Kinnita eemaldamine"
 
 #: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr ""
+msgstr "ID peab olema mittetühi ja kordumatu.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr ""
+msgstr "Pealkiri ei või olla tühi.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr ""
+msgstr "Shell käsk ei või olla tühi.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:248
 #: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
+msgstr "Vigased väärtused"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
+
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Pala nimi"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Esitaja"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Palasid kokku"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Žanr"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Helilooja"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Plaadi number"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Plaate kokku"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Kommentaar"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Enkooder / Tootja"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Autoriõigus"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Asukoht"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Alampala indeks"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Sildi tüüp/tüübid"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Põimitud kavaleht"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Eelista Ken emu üle Satoh-i (ruumiline heli ei tööta)"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Luba ruumiline heli"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Kasuta ALSA ümberdiskreetimist"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Eelistatud puhvri suurus"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Eelistatud perioodi pikkus"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Hangi põimitud siltidest"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Hangi lokaalsest kaustast"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Hangi lehelt Last.fm"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Hangi lehelt MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Hangi lehelt Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Kui albumikujundust ei leita"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "jäta tühjaks"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "kasutatakse DeaDBeeF-i vaikimisi katet"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "kohandatud pildi kuvamine"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Kohandatud pildi asukoht"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "CD-seade"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Audio-CD seade"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Fail"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Lisa audio CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Eelista CD-teksti CDDB ees"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Kasuta CDDB protokolli"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Võimalda NRG piltide toetus"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Ketta tavaesituse kiirus"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Maks"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Kasuta konverteerimisel cdparanoia veaparandust"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Konverteerimine"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Diskreetimissageduse automaatne tuvastamine väljundseadmelt"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Diskreetimissageduse määramine otse"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Kvaliteet / Algoritm"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Ümberdiskreetimise kvaliteet"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Sisemine DUMB maht"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Helitaseme suurendamine"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Ainult Sees/Väljas"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Täielik"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8-bitine väljund"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Kasutatakse kõiki ffmpeg-i poolt toetatud laiendusi"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Faililaiendid (eralda sümboliga ';')"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Eira mittekorrektse päiserea vigu"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Eira voogedastuse vigu"
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Maksimaalne pala pikkus (minutites)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Hääbumise kestus (sekundites)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Taasesitamine nr. korda (kui võimalik)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (SGC-vormingu jaoks)"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Helitaseme parandi info eemaldamine"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Valiku analüüsimine albumite kaupa (siltide alusel)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Valiku analüüsimine ühe albumina"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Valiku analüüsimine failide kaupa"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Kõigi määramata lugude analüüsimine failide kaupa"
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Eemalda märgistus"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Vali kõik"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Lisa asukoht"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Lisa kaust(ad)"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Lisa fail(e)"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Ava fail(e)"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Kuva abiinfo lehekülge"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "_Kordav režiim"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Kordamine - väljas"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Kordamine - üksik pala"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Kordamine - kõik"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "_Juhuesituse režiim"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Juhuesitlus - juhuslikud palad"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Juhuesitlus - albumid"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Juhuesitlus - palad"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Juhuesitlus - väljas"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Kursor järgib esitust - ümberlülitamine"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Kerimisriba järgib esitust - ümberlülitamine"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Kuva"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Näita\\/peida menüü"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Näita\\/peida olekuriba"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Lülita koostamisrežiimi"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Kohandatud sortimine"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Valiku kärpimine"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Salvesta esitusloend"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Eemalda praegune esitusloend"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "Nimeta see esitlusloend ümber"
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Näita\\/peida ekvalaiser"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Peida ekvalaiser"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Kuva ekvalaiser"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Näita\\/peida mängimise aken"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Peida mängimise aken"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Kuva mängimise aken"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Otsing"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Näita\\/peida logiinfo aken"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Küsi failide kustutamise kohta kinnitust"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Olekuikooni helitaseme tundlikus"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Kohandatud staatusikoon"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Lisa pluginate menüüde vahele eraldajaid"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Kasuta oleku kuvamisel piltide asemel unicode-märke"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Keela otsinguriba ülekatte tekst"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Hüppa kohale"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Järgmine esitusloend"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Sorteeri juhuslikult"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Pööra valik"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Tühjenda esitusloend"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Liikumine"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Liiguta palasid alla"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Liiguta palasid üles"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Helivaigistamise ümberlülitamine"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Pausi lülitamine"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Esitus\\/Paus"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Kerimine 1s edasi"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Kerimine 1s tagasi"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Kerimine 5s edasi"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Kerimine 5s tagasi"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Kerimine 1% edasi"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Kerimine 1% tagasi"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Kerimine 5% edasi"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Kerimine 5% tagasi"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Heli tugevamaks"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Heli nõrgemaks"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Seiska esitus pärast selle pala lõppu - ümberlülitamine"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Seiska esitus pärast selle albumi lõppu - ümberlülitamine"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Luba scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Keela hetkel mängiv"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Kasutajanimi"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Parool"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Eelista albumi esitaja välja esitaja välja ees"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "MusicBrainz ID saatmine"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Saada lühemad kui 30 sekundi pikkused palad (pole soovitatav)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Vasak mix"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Parem mix"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Sunni peale 16-bitine väljund"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Taustaprogramm"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Teate tiitli formaat"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Teate sisu formaat"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Kuva albumikujundust"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Albumikujunduse suurus (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Seadmefail"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Käesolev esitusloend tõstetakse esile"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Topeltklõps käivitab mängimise"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Puhvri suurus (-1 kasutab portaudio valitud optimaalset väärtust)"
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Seadme nime kodeering"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Määratud allpool"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Kohandatud seadme nime kodeering"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio server (vaikimisi jäetakse tühjaks)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Vaikimisi pala pikkus (minutites)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Diskreetimissagedus"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Jäetakse vahele, kui on lühem (s)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Seadista kohandatud Shelli käsud"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Otsimistabeli relatiivne aadress"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Otsimistabeli absoluutne aadress"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Audiobittide vahetamine (vali, kui kuuled ainult ühtlast signaali)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Võimalda HVSC lugude pikkuste andmebaas"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Täispikk tee asukohta Songlengths.md5/.txt"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Bitte sämpli kohta"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Vaikimisi pala pikkus (sek.)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Mono süntesaator"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Luba logimine"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Eelvõimendus"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "5K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ konfiguratsioonifail"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/eu.po -> deadbeef-1.9.6.tar.bz2/po/eu.po Changed

@@ -1,2402 +1,3966 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# aboutafteragain <aboutafteragain@gmail.com>, 2013
-# aboutafteragain <aboutafteragain@gmail.com>, 2013-2014
-# aboutafteragain <aboutafteragain@gmail.com>, 2013
+# John Smith <aboutafteragain@gmail.com>, 2013
+# John Smith <aboutafteragain@gmail.com>, 2013-2014,2016
+# John Smith <aboutafteragain@gmail.com>, 2013,2016
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 21:13+0000\n"
-"Last-Translator: aboutafteragain <aboutafteragain@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/eu/)\n"
-"Language: eu\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: John Smith <aboutafteragain@gmail.com>, 2013,2016\n"
+"Language-Team: Basque (http://app.transifex.com/deadbeef-player/deadbeef-player/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "DeadBeeF %s-(r)i buruz"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Erabilera: deadbeef aukerak -- fitxategia(k)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeadBeeF %s-(r)en aldaketa egunkaria"
+msgid "Options:\n"
+msgstr "Aukerak:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeadBeeF itzultzaileak"
-
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Gorde DeaDBeeF EQ aurrezarpena"
-
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ aurrezarpen-fitxategiak (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Kargatu DeaDBeeF EQ aurrezarpena..."
-
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ aurrezarpenak (*.ddbeq)"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h Inprimatu laguntza (mezu hau) eta irten\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Inportatu Foobar2000 EQ aurrezarpena..."
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Irten erreproduzitzailetik\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ aurrezarpenak (*.feq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Inprimatu bertsio-informazioa eta irten\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Gorde aurrezarpena"
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Hasi erreprodukzioa\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Kargatu aurrezarpena"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Gelditu erreprodukzioa\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Inportatu Foobar 2000 aurrezarpena"
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pausatu erreprodukzioa\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Gaitu"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Txandakatu pausatzea\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Zerotu guztia"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Hasi erreproduzitzen geldituta badago, bestela txandakatu pausa\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Zerotu aurreanplifikazioa"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Erreprodukzio-zerrendako hurrengo kanta\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Zerotu bandak"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Erreprodukzio-zerrendako aurreko kanta\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Aurrezarpenak"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Erreprodukzio-zerrendako ausazko kanta\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:147
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "Egun 1 %d:%02d:%02d"
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Gehitu fitxategia(k) existitzen den erreprodukzio-zerrendara\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:148
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d egun %d:%02d:%02d"
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr "--gui PLUGIN-ek zein GUI plugin erabili esaten du, lehenetsia \"GTK2\" da\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:149
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Geldituta | %d pista | guztizko erreprodukzio-denbora: %s"
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Inprimatu formatudun pista-izena irteera estandarrera\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-sintaxia: a: artista, t: izenburua, b: albuma,\n l: iraupena, n: pista zenbakia, y: urtea, c: iruzkina,\n r: copyright-a, e: igarotakoa\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Estereo"
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:154
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kb/s "
+msgid " for more info, see %s\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pausatuta | "
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:156
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pista | guztizko "
-"erreprodukzio-denbora: %s"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Erreprodukzio-zerrenda berria"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:158
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Erreprodukzio-zerrenda berria (%d)"
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Fitxadun erreprodukzio-zerrenda"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Erreprodukzio zerrenda"
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Zatitzailea (goi eta behe)"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Zatitzailea (ezker eta eskuin)"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Erreprodukzio zerrendaren fitxak"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Aukeraketaren propietateak"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Albumaren azala erakutsi"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Esparrua"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Lehenetsia"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Espektroa"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Estereo"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Bai"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Botoia"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Ez"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr "Bilaketa-barra"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Irteerako karpeta:"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr "Erreprodukzio kontrolak"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Iturburu pista karpetan idatzi"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "Ozentasun barra"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Karpeta egitura mantendu"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr "Txiptune ahotsak"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Hutsegitea laguntza fitxategia irakurtzean"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Hutsegitea laguntza fitxategia kargatzean"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Irteerako fitxategi-izena:"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
-"Erreproduzitzailea atzeko planoan lan egiten ari da. Orain ateratzen bazara, "
-"zeregin hauek bertan behera utziko ditu. Honek datuak galtzea eragin dezake."
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Ziur zaude atera nahi duzula?"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Kodetzailea:"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Abisua"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP aurrezarpena:"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Fitxategia"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Hari kopurua:"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Ireki fitxategia(k)"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Irteerako lagin-formatua:"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Gehitu fitxategia(k)"
+#: ../plugins/converter/converter.glade.h:14
+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 "Iturburu formatua mantendu\n8 bit signed int\n16 bit signed int\n24 bit signed int\n32 bit signed int\n32 bit float"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Gehitu karpeta(k)"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Fitxategia existitzen denean:"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Gehitu kokapena"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Erreprodukzio-zerrenda berria"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Editatu kodetzailearen aurrezarpena"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Kargatu erreprodukzio-zerrenda"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Izenburua:"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Gorde erreprodukzio-zerrenda"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Kodetzaile izengabeak"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Irten"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Irteerako fitxategiaren luzapena:"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Editatu"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Adibidez, mp3"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Garbitu"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Komando-lerroa:"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Hautatu dena"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Adibidea: lame - %o\n%i sarrerako fitxategiarentzat, %o irteerako fitxategiarentzat, - irteera estandarrarentzat"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Desautatu dena"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - irteerako fitxategi-izena\n%i - aldi baterako sarrerako fitxategi-izena"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Alderantzikatu hautapena"
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metodoa:"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Hautapena"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Etiketa idazlea"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP aurrezarpenen editorea"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Izenburua"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Izenbururik gabeko DSP aurrezarpena"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Gehitu"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "Kendu"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Moztu"
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Konfiguratu"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Aurkitu"
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Hautatu DSP plugina"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr "Ordenatu"
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Plugina"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Izenburua"
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Aurrezarpenak"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "Pista zenbakia"
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Albuma"
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Fitxategia dagoeneko existitzen da. Gainidatzi?"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Artista"
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Bihurtzailearen abisua"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Data"
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Mesedez hautatu kodetzailea"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Ausazkoa"
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Bihurtzailearen errorea"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Pertsonalizatua"
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Bihurtzen..."
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Hobespenak"
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Hautatu karpeta..."
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Ikusi"
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Huts egin du kodetzailearen aurrezarpena gordetzean"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Egoera-barra"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Egiaztatu aurrezarpenen karpetaren baimenak, erabili beste izen bat edo egin leku librea diskoan"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Ekualizadorea"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Izen bereko aurrezarpen bat existitzen da dagoeneko. Aukeratu beste izenburu bat."
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr "Diseinu modua"
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Errorea"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_Erreproduzitu"
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Gehitu kodetzaile berria"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Ordena"
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Editatu kodetzailea"
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Lineala"
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Kendu aurrezarpena"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Nahastu pistak"
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Ekintza honek hautatutako aurrezarpena ezabatuko du. Ziur zaude?"
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Nahastu albumak"
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Abisua"
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Errepikapenak"
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Kodetzaileak"
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Dena errepikatu"
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Gehitu plugina DSP kateari"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Abesti bakarra errepikatu"
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Hutsegitea DSP aurrezarpena gordetzean"
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Ez errepikatu"
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "DSP aurrezarpen berria"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Korritzeak erreprodukzioa jarraitzen du"
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Editatu DSP aurrezarpena"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Kurtsoreak erreprodukzioa jarraitzen du"
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP aurrezarpenak"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
-msgstr ""
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Laguntza"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
-msgstr ""
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Mantendu iturburuko formatua"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Jauzi uneko pistara"
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 biteko zeinudun osokoa"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Laguntza"
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 biteko zeinudun osokoa"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_Aldaketa-egunkaria"
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 biteko zeinudun osokoa"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 biteko zeinudun osokoa"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 biteko koma mugikorreko zenbakia"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_Honi buruz"
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Saltatu"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "_Itzultzaileak"
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Gonbita"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Bilatu"
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Gainidatzi"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Gelditu"
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Kanalizazioa"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Erreproduzitu"
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Pausatu"
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Aurrekoa"
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Ezin izan da pixmap fitxategia aurkitu: %s"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Hurrengoa"
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Ireki fitxategia(k)..."
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Erreproduzitu ausazkoa"
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Fitxategia(k) erreprodukzio-zerrendara gehitu..."
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "Honi buruz"
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Karpeta(k) erreprodukzio-zerrendara gehitu..."
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Irten"
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Erreprodukzio zerrenda kargatu"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Erreprodukzio-zerrenda ... gisa gorde"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeadBeeF %s-(r)i buruz"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeadBeeF %s-(r)en aldaketa egunkaria"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeadBeeF itzultzaileak"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Pluginak"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Balio Baliogabea(k)"
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Ez dago ezer hautaturik."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Fitxategia"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Ireki fitxategia(k)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Gehitu fitxategia(k)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Gehitu karpeta(k)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Gehitu kokapena"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Erreprodukzio-zerrenda berria"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Kargatu erreprodukzio-zerrenda"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Gorde erreprodukzio-zerrenda"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Irten"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Editatu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Garbitu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Hautatu dena"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Desautatu dena"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Alderantzikatu hautapena"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Hautapena"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Moztu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Aurkitu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr "Ordenatu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Pista zenbakia"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Albuma"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Artista"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Data"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Ausazkoa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Pertsonalizatua"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Ikusi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Egoera-barra"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Ekualizadorea"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr "Diseinu modua"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Erreproduzitu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Korritzeak erreprodukzioa jarraitzen du"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Kurtsoreak erreprodukzioa jarraitzen du"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr "Uneko pistaren ondoren gelditu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr "Uneko albumaren ondoren gelditu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Jauzi uneko pistara"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Laguntza"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_Aldaketa-egunkaria"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_Honi buruz"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Itzultzaileak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Bilatu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Gelditu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Erreproduzitu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pausatu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Aurrekoa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Hurrengoa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Erreproduzitu ausazkoa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "Honi buruz"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Irten"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Pistaren propietateak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "Kokapena:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Aplikatu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Itxi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadatuak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Propietateak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Ados"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Sartu zutabe berriaren goiburua hemen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Mota:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Formatua:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Lerrokatzea:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Testuaren kolorea:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Irteera plugina:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Irteera gailua:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Bihurtu beti 8 biteko audioa 16 bitera"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Beti bihurtu 16 biteko audioa 24 bitera"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Soinua"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Gehitu fitxategiak erreprodukzio-zerrenda honetara komando-lerrotik (edo fitxategi-kudeatzailetik):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Berrezarri aurreko saioa abiatzean"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Ez gehitu fitxategietatik karpetak gehitzean"
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Erreproduzitu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr "DSP katearen aurrezarpenak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "_Kargatu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Ixteak erretilura minimizatzen du"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Ezkutatu sistemaren erretiluko ikonoa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Japoniako SHIFT-JIS detekzioa eta birkodeaketa gaitu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr "Txinatar CP936 detekzioa eta birkodeaketa gaitu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr "Interfazearen freskatze-maiztasuna (zenbatetan segundoko)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "TItulu-barraren testua erreproduzitzean:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Titulu-barraren testua gelditutakoan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr "GUI plugina (aldatzeak berrabiaraztea eskatzen du):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr "Erreproduzitzailea"
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr "Playlist-ak erdiko botoiarekin itxi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Izendatu erreprodukzio-zerrendak automatikoki karpeta bakar bat gehitzean"
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr "Zutabeen tamaina auto-aldarazi leihora egokitzeko"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Erreprodukzio zerrenda"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr "GUI/Misc"
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Indargabetu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Iluna:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Argia:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Hautatutako pista(k):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Zutabeak:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Talde goiburua:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Hautatutakoa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Kurtsorea:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Atzeko planoa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Itxura"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Gaitu proxy zerbitzaria"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Proxy zerbitzariaren helbidea:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Proxy zerbitzaria ataka:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Proxy mota:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Proxy erabiltzaile-izena:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Proxy pasahitza:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr "HTTP User Agent-a:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr "Content-Type mapeoa editatu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Sarea"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr "<Ez ezarrita>"
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr "Abio-lasterreko tekla globala"
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr "Abio-lasterreko teklak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Bertsioa: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URLa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr "Taldekatzeko irizpidea ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr "Ordenatzeko irizpidea ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Gorakorra\nBeherakorra"
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr "Etiketa-idazlearen ezarpenak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Idatzi ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Idatzi ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Idatzi APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Soildu ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Soildu ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Soildu APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "ID3v2 bertsioa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Gomendatua)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 karaktere-kodeketa (lehenetsia iso8859-1 da)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Idatzi ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr "Content-Type Mapeoa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr "Pluginak:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr "Botoiaren propietateak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "Kolorea:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "Ikonoa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr "Hautatu ekintza"
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Editatu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Gorde DeaDBeeF EQ aurrezarpena"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ aurrezarpen-fitxategiak (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Kargatu DeaDBeeF EQ aurrezarpena..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ aurrezarpenak (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Inportatu Foobar2000 EQ aurrezarpena..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ aurrezarpenak (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Gorde aurrezarpena"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Kargatu aurrezarpena"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Inportatu Foobar 2000 aurrezarpena"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Gaitu"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Zerotu guztia"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Zerotu aurreanplifikazioa"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Zerotu bandak"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Erreprodukzio-zerrenda berria"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Onartutako soinu formatuak"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Fitxategi guztiak (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Beste fitxategiak (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF erreprodukzio-zerrenda fitxategiak (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Symlink-ak segi"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "Egun 1 %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d egun %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Erreprodukzio-zerrendaren izena aldatu"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Erreprodukzio-zerrenda berria (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Fitxadun erreprodukzio-zerrenda"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Zatitzailea (goi eta behe)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Zatitzailea (ezker eta eskuin)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Fitxak"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Erreprodukzio zerrendaren fitxak"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Aukeraketaren propietateak"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Albumaren azala erakutsi"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Espektroa"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Botoia"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Bilaketa-barra"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Erreprodukzio kontrolak"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Ozentasun barra"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Txiptune ahotsak"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Hutsegitea laguntza fitxategia irakurtzean"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Hutsegitea laguntza fitxategia kargatzean"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Erreproduzitzailea atzeko planoan lan egiten ari da. Orain ateratzen bazara, zeregin hauek bertan behera utziko ditu. Honek datuak galtzea eragin dezake."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Ziur zaude atera nahi duzula?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Ezkerrean"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Eskuinean"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Erdia"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Pista"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Laguntza"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Bat ere ez"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Pistaren propietateak"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
-msgstr "Kokapena:"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "Ezarpenak"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Aplikatu"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Gorakorra"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Itxi"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Beherakorra"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Metadatuak"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Gomendatua)"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Propietateak"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Izenburua:"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artista / Albuma"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Sartu zutabe berriaren goiburua hemen"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Pista zbk"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Mota:"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Iraupena"
 
-#: ../plugins/gtkui/interface.c:1343
+#: ../plugins/gtkui/playlist/plcommon.c:73
 msgid "Item Index"
 msgstr "Elementuaren indizea"
 
-#: ../plugins/gtkui/interface.c:1344
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
 msgid "Playing"
 msgstr "Erreproduzitzen"
 
-#: ../plugins/gtkui/interface.c:1345
+#: ../plugins/gtkui/playlist/plcommon.c:75
 msgid "Album Art"
 msgstr "Albumaren azala"
 
-#: ../plugins/gtkui/interface.c:1346
+#: ../plugins/gtkui/playlist/plcommon.c:76
 msgid "Artist - Album"
 msgstr "Artista - Albuma"
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Iraupena"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
 msgid "Track Number"
 msgstr "Pista zenbakia"
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
 msgid "Band / Album Artist"
 msgstr "Taldea / Albuma Artista"
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Formatua:"
-
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Lerrokatzea:"
-
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Ezkerrean"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Eskuinean"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Utzi"
-
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_Ados"
-
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Irteera plugina:"
-
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Irteera gailua:"
-
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Bihurtu beti 8 biteko audioa 16 bitera"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodeka"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Soinua"
-
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Replaygain modua:"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Gehitu zutabea"
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Desgaitu"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Editatu zutabea"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Pista"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Kendu zutabea"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Replaygain gailurraren eskala"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
-msgstr "-12 dB"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Taldekatzeko irizpidea"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
-msgstr "+12 dB"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artista/Data/Albuma"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Replaygain aurre-anplifikazioa:"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Aurreanplifikazio orokorra:"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
 msgstr ""
-"Gehitu fitxategiak erreprodukzio-zerrenda honetara komando-lerrotik (edo "
-"fitxategi-kudeatzailetik):"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "Berrezarri aurreko saioa abiatzean"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Birkargatu metadatuak"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
-msgstr "Ez gehitu fitxategietatik karpetak gehitzean"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Erreproduzitu"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Konfiguratu"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Erreprodukzio-zerrenda kendu"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
-msgstr "DSP katearen aurrezarpenak"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Erreprodukzio-zerrenda berria gehitu"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
-msgstr "_Kargatu"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
-msgstr "DSP"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Ixteak erretilura minimizatzen du"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Ireki fitxategia..."
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Ezkutatu sistemaren erretiluko ikonoa"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Konfiguratu %s"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Errusiar CP1251 detekzioa eta birkodeaketa gaitu"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Gorde gabe jarraitu nahi duzula ziur zaude?"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
-msgstr "Txinatar CP936 detekzioa eta birkodeaketa gaitu"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Audio gailu lehenetsia"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
-msgstr "Interfazearen freskatze-maiztasuna (zenbatetan segundoko)"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Fitxategiak gehitzen..."
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "TItulu-barraren testua erreproduzitzean:"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Hasieratzen..."
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Titulu-barraren testua gelditutakoan:"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
-msgstr "GUI plugina (aldatzeak berrabiaraztea eskatzen du):"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Izena"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
 msgstr ""
-"Izendatu erreprodukzio-zerrendak automatikoki karpeta bakar bat gehitzean"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
-msgstr "GUI/Misc"
-
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Indargabetu"
-
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Aurreko planoa"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Atzeko planoa"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Bilaketa-barra/Bolumen-barraren koloreak"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Ertaina"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Argia"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Iluna"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Oinarrizkoa"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Testua"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Fitxen koloreak"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
 msgstr ""
-"Indargabetu (GTK zuhaitz-ikuspegien gaiak galtzen dira, baina errendatzea "
-"azkartzen da)"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Errenkada bikoitia"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Bilatu (%list_total% results)"
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Errenkada bakoitia"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Hautatutako errenkada"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Balioa"
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Hautatutako testua"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Pista honen datuak aldatu dituzu."
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Kurtsorea"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Ziur leihoa itxi nahi duzula?"
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Erreprodukzio-zerrenda koloreak"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Hainbat balio "
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Koloreak"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Gakoa"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Gaitu proxy zerbitzaria"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Hainbat balio "
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Proxy zerbitzariaren helbidea:"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Etiketak idazten..."
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Proxy zerbitzaria ataka:"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Proxy mota:"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Proxy erabiltzaile-izena:"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Eremu izena"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Proxy pasahitza:"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Izena:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
-msgstr "HTTP User Agent-a:"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Ezin dituzu : edo _ erabili eremu-izenen hasieran"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
-msgstr "Content-Type mapeoa editatu"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Ezin da eremua gehitu"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Sarea"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Izen hori duen eremua existitzen da dagoeneko, mesedez erabili izen desberdin bat."
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "\"%s\" widgeta ez dago erabilgarri"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Honekin ordeztu"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
-msgstr "<Ez ezarrita>"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Txertatu"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Moztu"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
-msgstr "Abio-lasterreko tekla globala"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopiatu"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
-msgstr ""
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Itsatsi"
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
-msgstr "Abio-lasterreko teklak"
-
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Bertsioa: "
-
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Copyright-a"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Pluginak"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URLa:"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
-msgstr "Taldekatzeko irizpidea ..."
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
-msgstr "Ordenatzeko irizpidea ..."
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Formatua"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Gorakorra"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Beherakorra"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Hautatu DSP plugina"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Plugina"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
-msgstr "Etiketa-idazlearen ezarpenak"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Idatzi ID3v2"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Idatzi ID3v1"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Idatzi APEv2"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "Soildu ID3v2"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "Soildu ID3v1"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "Soildu APEv2"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "ID3v2 bertsioa"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Gomendatua)"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 karaktere-kodeketa (lehenetsia iso8859-1 da)"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "Idatzi ID3v2.4"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
-msgstr "Content-Type Mapeoa"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
-msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artista / Albuma"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Pista zbk"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Gehitu zutabea"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Zabaldu"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Editatu zutabea"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Bete"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Kendu zutabea"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Taldekatzeko irizpidea"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Bat ere ez"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Artista/Data/Albuma"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Ahotsak:"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Ireki fitxategia..."
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/hotkeys/actionhandlers.c:827
 #, c-format
-msgid "Configure %s"
-msgstr "Konfiguratu %s"
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Audio gailu lehenetsia"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Fitxategiak gehitzen..."
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Hasieratzen..."
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Pista honen datuak aldatu dituzu."
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Ziur leihoa itxi nahi duzula?"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Erreprodukzio-zerrenda nabigatzailea"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Hainbat balio "
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Shell komando pertsonalizatuak"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Gakoa"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Itxi"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Balioa"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Editatu komandoa"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Hainbat balio "
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Komandoa:"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Etiketak idazten..."
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr "Shell komando arbitrarioa. Hasierako aplikazio nagusian hasitako shell testuinguruan exekutatuko da. Titulu formatua erabili daiteke. Adibidez: xdg-open %D"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Eremu izena"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "IDa:"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Izena:"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Era-libreko izena, adibidez \"Nire Shell Komandoa\""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Ezin dituzu : edo _ erabili eremu-izenen hasieran"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Komandu IDa, normalean zerbait motza, adibidez \"youtube_open\". Izen soila izan behar du."
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Ezin da eremua gehitu"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Banakako Pistak"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr ""
-"Izen hori duen eremua existitzen da dagoeneko, mesedez erabili izen "
-"desberdin bat."
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Banakako pistan badabil."
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Gehitu eremua"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Pista Anitzak"
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Kendu eremua"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Pista anitzetan badabil."
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Erabilera: deadbeef aukerak -- fitxategia(k)\n"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Lokala"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Aukerak:\n"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Fitxategi lokaletan badabil."
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help or -h Inprimatu laguntza (mezu hau) eta irten\n"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Urruneko"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Urruneko fitxategietan badabil (adib. http:// streams)"
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "Elementua menu nagusian agertu behar da"
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Komandoa Gehitu"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Irten erreproduzitzailetik\n"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "Ekintza honek hautatutako komandoa ezabatuko du. Ziur al zaude?"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Inprimatu bertsio-informazioa eta irten\n"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Berretsi Ezabatu"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Hasi erreprodukzioa\n"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "IDa ezin da hutsik egon eta bakarra izan behar da.\n"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Gelditu erreprodukzioa\n"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Izenburua ezin da hutsik egon.\n"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pausatu erreprodukzioa\n"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "Shell Komandoa ezin da hutsik egon.\n"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Txandakatu pausatzea\n"
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Balio Baliogabeak"
 
-#: ../main.c:99
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, c-format
 msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
-" --play-pause Hasi erreproduzitzen geldituta badago, bestela "
-"txandakatu pausa\n"
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr "wildmidi: ez da aurkitu freepats konfigurazio-fitxategia. Mesedez instalatu timidity-freepats paketea edo zehaztu freepats.cfg fitxategirako bidea pluginaren ezarpenetan."
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Erreprodukzio-zerrendako hurrengo kanta\n"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Erreprodukzio-zerrendako aurreko kanta\n"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Erreprodukzio-zerrendako ausazko kanta\n"
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Pistaren izenburua"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr ""
-" --queue Gehitu fitxategia(k) existitzen den erreprodukzio-"
-"zerrendara\n"
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Interpretatzailea"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
-"--gui PLUGIN-ek zein GUI plugin erabili esaten du, lehenetsia \"GTK2\" da\n"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Pistak guztira"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr ""
-" --nowplaying FMT Inprimatu formatudun pista-izena irteera estandarrera\n"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Generoa"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-sintaxia: a: artista, t: izenburua, b: albuma,\n"
-" l: iraupena, n: pista zenbakia, y: urtea, c: "
-"iruzkina,\n"
-" r: copyright-a, e: igarotakoa\n"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Konpositorea"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr ""
-" adibidez.: --nowplaying \"%%a - %%t\" erabiliz gero "
-"\"artista - titulua\" inprimatuko du\n"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Disko zenbakia"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Lehenetsia"
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Iruzkina"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Bai"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Kodetzailea / Saltzailea"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Ez"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Copyright-a"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Elementuaren indizea\n"
-"Erreproduzitzen\n"
-"Albumaren azala\n"
-"Artista - Albuma\n"
-"Artista\n"
-"Albuma\n"
-"Izenburua\n"
-"Iraupena\n"
-"Pista zenbakia\n"
-"Taldea / Albuma Artista\n"
-"Pertsonalizatua"
-
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Ezkerra\n"
-"Eskuina"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Kokapena"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Desgaitu\n"
-"Pista\n"
-"Albuma"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Azpi-pista indizea"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
-msgstr ""
-"Gorakorra\n"
-"Beherakorra"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Etiketa mota(k)"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Txertatutako cue-orria"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-"2.3 (Gomendatua)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
-"wildmidi: ez da aurkitu freepats konfigurazio-fitxategia. Mesedez instalatu "
-"timidity-freepats paketea edo zehaztu freepats.cfg fitxategirako bidea "
-"pluginaren ezarpenetan."
 
-#. 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"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Bilatu Last.fm-n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Ken emuladorea Satoh-en gainetik hobetsi (surround ez da ibiliko)"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Surround gaitu"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
 msgid "Use ALSA resampling"
 msgstr "Erabili ALSA berlaginketa"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Askatu gailua geldituta dagoen bitartean"
-
-#: ../translation/extra.c:8 ../translation/extra.c:55
+#: ../translation/plugins.c:17
+#, no-c-format
 msgid "Preferred buffer size"
 msgstr "Hobetsitako buffer tamaina"
 
-#: ../translation/extra.c:9
+#: ../translation/plugins.c:19
+#, no-c-format
 msgid "Preferred period size"
 msgstr "Hobetsitako epe-tamaina"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Gaitu scrobbler"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Desgaitu orain erreproduzitzen"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Eskuratu txertatutako etiketetatik"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Erabiltzaile-izena"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Eskuratu karpeta lokaletik"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Pasahitza"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URLa"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Albumaren Artista nahiago Artista eremua baino"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Gailu-fitxategia"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 lagintze-maiztasun errorearen konponbidea"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Cache-aren eguneraketaren epea (ordu)"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Eskuratu txertatutako etiketetatik"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Eskuratu karpeta lokaletik"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Azal-fitxategi lokalen maskara"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Eskuratu last.fm-tik"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Eskuratu albumart.org-etik"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Eskalatu azala alderik handieneruntz"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Audio CDa gehitu"
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Erabili CDDB/FreeDB"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
 
-#: ../translation/extra.c:30
+#: ../translation/plugins.c:71
+#, no-c-format
 msgid "Prefer CD-Text over CDDB"
 msgstr "Hobetsi CD-Text CDDBren aurrean"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url-a (adibidez, 'freedb.org')"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB ataka zenbakia (adibidez, '888')"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Hobetsi CDDB protokoloa HTTPren aurrean"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
 
-#: ../translation/extra.c:34
+#: ../translation/plugins.c:79
+#, no-c-format
 msgid "Enable NRG image support"
 msgstr "Gaitu NRG irudien euskarria"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Birlaginketa kalitatea (0..2, altuagoa hobea da)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-bit irteera (lehenetsia 16 da)"
-
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Kantuen gehienezko iraupena (minututan)"
-
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Irteera-itzaltze iraupena (segundutan)"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Errepikapenak n aldiz jo (eskuragarri badago)"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Eskatu berrespena diskotik fitxategiak ezabatzeko"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Bolumen-kontrola egoera-ikonoaren sentikortasuna"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Egoera-ikono pertsonalizatua"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Exekutatu gtk_init --sync aukerarekin (arazketa modua)"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Bihurtu"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Gehitu banatzaileak pluginen laster-menuetako elementuen artean"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Jakinarazpenen izenburuaren formatua"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Jakinarazpenen edukiaren formatua"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Kalitatea / Algoritmoa"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Erakutsi albumen azalak"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Albumen azalen tamaina (px)"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio zerbitzaria"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Lagintze-maiztasuna"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Bilaketa taularen bide erlatiboa"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Bilaketa taularen bide absolutua"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
-"Trukatu audio bytak (txandakatu entzuten duzun gauza bakarra soinu estatikoa "
-"bada)"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Gaitu HVSC Songlength DB"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Fitxategi-luzapenak (';'-z banatuta)"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (HVSC-tik)"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bitak lagineko (8 ala 16)"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Kanten iraupen lehenetsia (seg)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ bankuaren konfigurazio-fitxategia"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Kantuen gehienezko iraupena (minututan)"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Pistaren izenburua"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Irteera-itzaltze iraupena (segundutan)"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Interpretatzailea"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Errepikapenak n aldiz jo (eskuragarri badago)"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Pistak guztira"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Generoa"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Konpositorea"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Disko zenbakia"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Iruzkina"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Kodetzailea / Saltzailea"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Kokapena"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Azpi-pista indizea"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Etiketa mota(k)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Txertatutako cue-orria"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Kodeka"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Fitxategi-luzapenak (';'-z banatuta)"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Bihurtu"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Helburuko lagintze-maiztasuna"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Kalitatea / Algoritmoa"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
-"Lagintze-maiztasun automatikoa (helburuko lagintze-maiztasuna indargabetzen "
-"du)"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Hutsunerik gabeko erreprodukzioa ezgaitu (eskaneatze azkarragoa)"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Ken emuladorea Satoh-en gainetik hobetsi (surround ez da ibiliko)"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Surround gaitu"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Fitxategia dagoeneko existitzen da. Gainidatzi?"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Bihurtzailearen abisua"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Mesedez hautatu kodetzailea"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Bihurtzailearen errorea"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Bihurtzen..."
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Hautatu karpeta..."
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Huts egin du kodetzailearen aurrezarpena gordetzean"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
-"Egiaztatu aurrezarpenen karpetaren baimenak, erabili beste izen bat edo egin "
-"leku librea diskoan"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
-"Izen bereko aurrezarpen bat existitzen da dagoeneko. Aukeratu beste izenburu "
-"bat."
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Errorea"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Gehitu kodetzaile berria"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Editatu kodetzailea"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Kendu aurrezarpena"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Ekintza honek hautatutako aurrezarpena ezabatuko du. Ziur zaude?"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Kodetzaileak"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Gehitu plugina DSP kateari"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Hutsegitea DSP aurrezarpena gordetzean"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "DSP aurrezarpen berria"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Editatu DSP aurrezarpena"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP aurrezarpenak"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Irteerako karpeta:"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Iturburu pista karpetan idatzi"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Karpeta egitura mantendu"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Eskatu berrespena diskotik fitxategiak ezabatzeko"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Irteerako fitxategi-izena:"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Bolumen-kontrola egoera-ikonoaren sentikortasuna"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:252
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Custom status icon"
+msgstr "Egoera-ikono pertsonalizatua"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
-"Luzapena (adibidez, .mp3) automatikoki gehituko da.\n"
-"Utzi eremua hutsik balio lehenetsia erabiltzeko (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Kodetzailea:"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Gehitu banatzaileak pluginen laster-menuetako elementuen artean"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP aurrezarpena:"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Hari kopurua:"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Irteerako lagin-formatua:"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Mantendu iturburuko formatua"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 biteko zeinudun osokoa"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 biteko zeinudun osokoa"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 biteko zeinudun osokoa"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 biteko zeinudun osokoa"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 biteko koma mugikorreko zenbakia"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Fitxategia existitzen denean:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Gonbita"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Gainidatzi"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Editatu kodetzailearen aurrezarpena"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Kodetzaile izengabeak"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Irteerako fitxategiaren luzapena:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Adibidez, mp3"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Komando-lerroa:"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:295
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Switch to Playlist 9"
 msgstr ""
-"Adibidea: lame - %o\n"
-"%i sarrerako fitxategiarentzat, %o irteerako fitxategiarentzat, - irteera "
-"estandarrarentzat"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:297
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Switch to Playlist 8"
 msgstr ""
-"%o - irteerako fitxategi-izena\n"
-"%i - aldi baterako sarrerako fitxategi-izena"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Metodoa:"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Kanalizazioa"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Aldi baterako fitxategia"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Etiketa idazlea"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP aurrezarpenen editorea"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Izenbururik gabeko DSP aurrezarpena"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Gehitu"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Ezin izan da pixmap fitxategia aurkitu: %s"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
-"Iturburu formatua mantendu\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:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
-"Iradoki\n"
-"Gainidatzi"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
-"Kanalizazioa\n"
-"Aldi baterako fitxategia"
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
-msgstr "Shell komando pertsonalizatuak"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Editatu"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
-msgstr "Itxi"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
-msgstr "Editatu komandoa"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
-msgstr "Komandoa:"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:343
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Toggle Mute"
 msgstr ""
-"Shell komando arbitrarioa. Hasierako aplikazio nagusian hasitako shell "
-"testuinguruan exekutatuko da. Titulu formatua erabili daiteke. Adibidez: xdg-"
-"open %D"
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
-msgstr "IDa:"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
-msgstr "Era-libreko izena, adibidez \"Nire Shell Komandoa\""
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
-"Komandu IDa, normalean zerbait motza, adibidez \"youtube_open\". Izen soila "
-"izan behar du."
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
-msgstr "Banakako Pistak"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
-msgstr "Banakako pistan badabil."
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
-msgstr "Pista Anitzak"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
-msgstr "Pista anitzetan badabil."
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
-msgstr "Lokala"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
-msgstr "Fitxategi lokaletan badabil."
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
-msgstr "Urruneko"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
-msgstr "Urruneko fitxategietan badabil (adib. http:// streams)"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
-msgstr "Elementua menu nagusian agertu behar da"
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
-msgstr "Komandoa Gehitu"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Gaitu scrobbler"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Ezabatu"
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Desgaitu orain erreproduzitzen"
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "Ekintza honek hautatutako komandoa ezabatuko du. Ziur al zaude?"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Erabiltzaile-izena"
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
-msgstr "Berretsi Ezabatu"
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Pasahitza"
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
-msgstr "IDa ezin da hutsik egon eta bakarra izan behar da.\n"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URLa"
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
-msgstr "Izenburua ezin da hutsik egon.\n"
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Albumaren Artista nahiago Artista eremua baino"
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
-msgstr "Shell Komandoa ezin da hutsik egon.\n"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
-msgstr "Balio Baliogabeak"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Onartutako soinu formatuak"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Fitxategi guztiak (*)"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Ireki fitxategia(k)..."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Fitxategia(k) erreprodukzio-zerrendara gehitu..."
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Karpeta(k) erreprodukzio-zerrendara gehitu..."
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Jakinarazpenen izenburuaren formatua"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Symlink-ak segi"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Jakinarazpenen edukiaren formatua"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Erakutsi albumen azalak"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Fitxategiak diskotik ezabatu"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Albumen azalen tamaina (px)"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
-"FItxategiak galdu egingo dira. Jarraitu?\n"
-"(Hizketa hau GTK UI plugin aukeretan desgaitu daiteke)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Erreprodukzio zerrenda kargatu"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Gailu-fitxategia"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Beste fitxategiak (*)"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Erreprodukzio-zerrenda ... gisa gorde"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "DeaDBeeF erreprodukzio-zerrenda fitxategiak (*.dbpl)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Lagintze-maiztasuna"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Bilaketa taularen bide erlatiboa"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Bilaketa taularen bide absolutua"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Trukatu audio bytak (txandakatu entzuten duzun gauza bakarra soinu estatikoa bada)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Gaitu HVSC Songlength DB"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Kanten iraupen lehenetsia (seg)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ bankuaren konfigurazio-fitxategia"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/fa.po -> deadbeef-1.9.6.tar.bz2/po/fa.po Changed

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ali Yousefi Sabzevar <aysabzevar@gmail.com>, 2010
 # Ali Yousefi Sabzevar <aysabzevar@gmail.com>, 2010
@@ -9,2328 +9,3957 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Persian (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/fa/)\n"
-"Language: fa\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Ali Yousefi Sabzevar <aysabzevar@gmail.com>, 2010\n"
+"Language-Team: Persian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "گزینه‌ها: \n"
+
+#: ../src/main.c:136
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr "--help یا -h کمک(این پیام) را نشان می‌دهد و خارج می‌شود \n"
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr "--quit از پخش کننده خارج می‌شود \n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr "--version اطلاعات نسخه را نمایش می‌دهد و خارج می‌شود \n"
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr "--play پخش را آغاز می‌کند\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr "--stop پخش را متوقف می‌کند\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr "--pause پخش را مکث می‌دهد\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr "--next آهنگ بعدی در فهرست پخش\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr "--prev آهنگ قبلی در فهرست پخش\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr "--random آهنگ اتفاقی در فهرست پخش\n"
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr "--queue پیوست کردن پرونده(ها) به فهرست پخش موجود\n"
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr "--nowplaying FMT چاپ نام آهنگ قالب‌بندی شده در خروجی استاندارد\n"
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-ترکیب: هنرمند،عنوان، آلبوم،\n مدت زمان، شماره آهنگ، سال،نظر،\n حقنشر،سپری شده\n"
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "پیش‌فرض"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "تک کاناله"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "استریو"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "بله"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "خیر"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "عنوان:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "عنوان"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "افزودن"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "حذف"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "پیکره‌بندی:"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "هشدار"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "کمک"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "پرونده تصویر بیتی پیدا نشد:%s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "درباره DeaDBeef %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "گزارش تغییرات %s DeaDBeeF"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "افزونه‌ها"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_ پرونده"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_باز کردن پرونده(ها)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "افزودن پرونده(ها)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "افزودن پوشه(ها)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "افزودن محل"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "لیست پخش جدید"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "بارگذاری لیست پخش"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "ذخیره لیست پخش"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_ خروج"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_ویرایش"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_ پاک سازی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "انتخاب همگی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "از انتخاب درآوردن همگی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "انتخاب معکوس"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "انتخاب"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "محصول"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_یافتن"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "آلبوم"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "هنرمند"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "اتفاقی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "شخصی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "تنظیمات"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_نما"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "نوار وضعیت"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "اکولایزر"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_پخش"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "پیمایش،پخش را دنبال می‌کند"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "مکان نما پخش را دنبال می‌کند"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_ کمک"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_تغییرات"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_درباره"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "جستجوی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "توقف"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "پخش"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "مکث"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "قبلی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "بعدی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "پخش اتفاقی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "درباره"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "خروج"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "ویژگی آهنگ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "ـ اعمال"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "ـ بستن"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "فرا داده"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "ویژگی‌ها"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "ـ لغو"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "ـ قبول"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "ستون عنوان جدید را اینجا وارد کنید"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "نوع:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "قالب:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "هم‌ترازی:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "افزونه خروجی:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "دستگاه خروجی:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "صوت"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "افزودن فایل‌ها از خط فرمان (‌یا مدیر فایل) به این فهرست پخش:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "ادامه نشست قبلی در این آغاز به کار"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "پخش"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "بستن حداقل شده‌ها برای رفتن به سینی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "مخفی کردن آیکون سینی سیستم"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "متن نوار عنوان در زمان پخش:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "متن نوار عنوان در زمان توقف:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr ""
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "غلبه"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "فعال سازی خادم پروکسی"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "آدرس سرویس دهنده پروکسی:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "درگاه سرویس دهنده پروکسی:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "نوع پروکسی:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "نام کاربری پروکسی:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "گذرواژه پروکسی:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "شبکه"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:353
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr "درباره DeaDBeef %s"
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "گزارش تغییرات %s DeaDBeeF"
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "آدرس اینترنتی:"
 
-#: ../plugins/gtkui/callbacks.c:626
-#, c-format
-msgid "DeaDBeeF Translators"
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "بنویسید ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "بنویسید ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "بنویسید APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "ID3v2 را پاک کنید"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "ID3v1 را پاک کنید"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "APEv2 را پاک کنید"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "نسخه ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "۲٫۳ (توصیه شده)\n۲٫۴"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "کدگشایی کاراکتر ID3v1 (پیش‌فرض iso8859-1 است)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "بنویسید ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:141
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "ذخیره اکولایزر از پیش مرتب شده DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:148
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "فایل‌های اکولایزر از پیش مرتب شده DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:187
+#: ../plugins/gtkui/eq.c:183
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "بارگذاری اکولایزر از پیش مرتب شده DeaDBeeF ..."
 
-#: ../plugins/gtkui/eq.c:191
+#: ../plugins/gtkui/eq.c:187
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "اکولایزر از پیش مرتب شده DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:252
+#: ../plugins/gtkui/eq.c:224
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "وارد کردن اکولایزر از پیش تنطیم شده Foobar2000 ..."
 
-#: ../plugins/gtkui/eq.c:256
+#: ../plugins/gtkui/eq.c:228
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "اکولایزر از پیش تعیین شده Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/eq.c:321
+#: ../plugins/gtkui/eq.c:269
 msgid "Save Preset"
 msgstr "ذخیره از پیش تنظیم شده"
 
-#: ../plugins/gtkui/eq.c:329
+#: ../plugins/gtkui/eq.c:277
 msgid "Load Preset"
 msgstr "بارگذاری از پیش تنظیم شده"
 
-#: ../plugins/gtkui/eq.c:337
+#: ../plugins/gtkui/eq.c:285
 msgid "Import Foobar2000 Preset"
 msgstr "وارد کردن Foobar2000 از پیش تنظیم شده "
 
-#: ../plugins/gtkui/eq.c:362
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
 msgid "Enable"
 msgstr "فعال"
 
-#: ../plugins/gtkui/eq.c:371
+#: ../plugins/gtkui/eq.c:320
 msgid "Zero All"
 msgstr "صفر کردن همگی"
 
-#: ../plugins/gtkui/eq.c:378
+#: ../plugins/gtkui/eq.c:327
 msgid "Zero Preamp"
 msgstr "صفر کردن پیش تقویت کننده"
 
-#: ../plugins/gtkui/eq.c:385
+#: ../plugins/gtkui/eq.c:334
 msgid "Zero Bands"
 msgstr "نوارهای صفر"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "لیست پخش جدید"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "۱ روز %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d روز %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:179
-#, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "متوقف| %d آهنگ| %s کل زمان پخش"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "تک کاناله"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "استریو"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d کیلو بیت بر ثانیه"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "مکث کرده|"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
-msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
 msgstr ""
-"%s%s %s| %dهرتز | %d بیت | %s | %d:%02d / %s | %d آهنگ | %s کل زمان پخش"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "لیست پخش جدید"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "لیست پخش جدید (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:956
+#: ../plugins/gtkui/gtkui.c:1452
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:960
+#: ../plugins/gtkui/gtkui.c:1456
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
+#: ../plugins/gtkui/gtkui.c:1457
 msgid "Splitter (left and right)"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1460
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:1461
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
+#: ../plugins/gtkui/gtkui.c:1462
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
+#: ../plugins/gtkui/gtkui.c:1464
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:1465
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:1466
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
+#: ../plugins/gtkui/gtkui.c:1468
 msgid "Seekbar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:1469
 msgid "Playback controls"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:1470
 msgid "Volume bar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:1471
 msgid "Chiptune voices"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "شکست در خواندن فایل کمک"
-
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "شکست در بارگذاری فایل کمک"
-
-#: ../plugins/gtkui/gtkui.c:1171
-msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "هشدار"
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_ پرونده"
-
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_باز کردن پرونده(ها)"
-
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "افزودن پرونده(ها)"
-
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "افزودن پوشه(ها)"
-
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "افزودن محل"
-
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "لیست پخش جدید"
-
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "بارگذاری لیست پخش"
-
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "ذخیره لیست پخش"
-
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_ خروج"
-
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_ویرایش"
-
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_ پاک سازی"
-
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "انتخاب همگی"
-
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "از انتخاب درآوردن همگی"
-
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "انتخاب معکوس"
-
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "انتخاب"
-
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "حذف"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "شکست در خواندن فایل کمک"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "محصول"
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "شکست در بارگذاری فایل کمک"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_یافتن"
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "عنوان"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "آلبوم"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "هنرمند"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "اتفاقی"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "شخصی"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "تنظیمات"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_نما"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "چپ"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "نوار وضعیت"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "راست"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "اکولایزر"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_پخش"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "ترتیب"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "خطی"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "حلقه‌ زنی"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "آهنگ"
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "هیچ"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "پیمایش،پخش را دنبال می‌کند"
-
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "مکان نما پخش را دنبال می‌کند"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "۲٫۳ (پیشنهاد شده)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "۲٫۴"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "هنرمند/آلبوم"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "شماره آهنگ"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "مدت زمان"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_ کمک"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "در حال پخش"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_تغییرات"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "آلبوم هنری"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "هنرمند-آلبوم"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_درباره"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "هنرمند آلبوم/گروه"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "کدک‌"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "جستجوی"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "افزودن ستون"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "توقف"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "ویرایش ستون"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "پخش"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "حذف ستون"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "مکث"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "قبلی"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "گروه با"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "بعدی"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "هنرمند/تاریخ/آلبوم"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "پخش اتفاقی"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "درباره"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "خروج"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "کمک"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "ویژگی آهنگ"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "ـ اعمال"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "ـ بستن"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "فرا داده"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "ویژگی‌ها"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "عنوان:"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "ستون عنوان جدید را اینجا وارد کنید"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "باز کردن پرونده..."
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "نوع:"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "در حال پخش"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "آلبوم هنری"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "دستگاه صوتی پیش‌فرض"
 
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "هنرمند-آلبوم"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "افزودن فایل‌ها..."
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "مدت زمان"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "آماده سازی اولیه..."
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "هنرمند آلبوم/گروه"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "قالب:"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "هم‌ترازی:"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "چپ"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "راست"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "ـ لغو"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "ـ قبول"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "افزونه خروجی:"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "دستگاه خروجی:"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "صوت"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "مقدار"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "حالت پخش مجدد:"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "شما اطلاعات این آهنگ را تغییر داده‌اید."
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "غیرفعال"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "واقعا می‌خواهید پنجره را ببندید؟"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "آهنگ"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "پخش مجدد مقیاس قله"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "کلید"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "افزودن فایل‌ها از خط فرمان (‌یا مدیر فایل) به این فهرست پخش:"
-
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "ادامه نشست قبلی در این آغاز به کار"
-
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "پخش"
-
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "پیکره‌بندی:"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "بستن حداقل شده‌ها برای رفتن به سینی"
-
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "مخفی کردن آیکون سینی سیستم"
-
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "متن نوار عنوان در زمان پخش:"
-
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "متن نوار عنوان در زمان توقف:"
-
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "غلبه"
-
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "پیش زمینه"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "پس‌زمینه"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "رنگ‌های نوار پویش/ حجم صدا"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "متوسط"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "روشن"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "تیره"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "پایه"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "متن"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "رنگ‌های نوار لبه"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "غلبه (درختواره GTK ضعیف می‌شود اما سرعت نمایش افزایش می‌یابد)"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "ردیف زوج"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "ردیف فرد"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "ردیف انتخاب شده"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "متن انتخاب شده"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "مکان‌نما"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "رنگ‌های فهرست پخش"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "رنگ‌ها"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "فعال سازی خادم پروکسی"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "آدرس سرویس دهنده پروکسی:"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "درگاه سرویس دهنده پروکسی:"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "نوع پروکسی:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "نام کاربری پروکسی:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "گذرواژه پروکسی:"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "شبکه"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "افزونه‌ها"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "آدرس اینترنتی:"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "بنویسید ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "بنویسید ID3v1"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "بنویسید APEv2"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "ID3v2 را پاک کنید"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "ID3v1 را پاک کنید"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "APEv2 را پاک کنید"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "نسخه ID3v2"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "۲٫۳ (پیشنهاد شده)"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "۲٫۴"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "کدگشایی کاراکتر ID3v1 (پیش‌فرض iso8859-1 است)"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "بنویسید ID3v2.4"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "هنرمند/آلبوم"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "شماره آهنگ"
-
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "افزودن ستون"
-
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "ویرایش ستون"
-
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "حذف ستون"
-
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "گروه با"
-
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "هیچ"
-
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "هنرمند/تاریخ/آلبوم"
-
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "باز کردن پرونده..."
-
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "دستگاه صوتی پیش‌فرض"
-
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "افزودن فایل‌ها..."
-
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "آماده سازی اولیه..."
-
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "شما اطلاعات این آهنگ را تغییر داده‌اید."
-
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "واقعا می‌خواهید پنجره را ببندید؟"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 را برای تنظیم افزونه مشخص کنید."
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "کلید"
-
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "مقدار"
-
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../translation/extra.c:3
+msgid "Track Title"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../translation/extra.c:4
+msgid "Performer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#: ../translation/extra.c:10
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
+#: ../translation/extra.c:11
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#: ../translation/extra.c:12
+msgid "Disc Number"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../translation/extra.c:14
+msgid "Comment"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "گزینه‌ها: \n"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr ""
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr "--help یا -h کمک(این پیام) را نشان می‌دهد و خارج می‌شود \n"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr "--quit از پخش کننده خارج می‌شود \n"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr "--version اطلاعات نسخه را نمایش می‌دهد و خارج می‌شود \n"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "نوع(های) برچسب"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr "--play پخش را آغاز می‌کند\n"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "برگه راهنمایی توکار"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr "--stop پخش را متوقف می‌کند\n"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr "--pause پخش را مکث می‌دهد\n"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr "--next آهنگ بعدی در فهرست پخش\n"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr "--prev آهنگ قبلی در فهرست پخش\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr "--random آهنگ اتفاقی در فهرست پخش\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr "--queue پیوست کردن پرونده(ها) به فهرست پخش موجود\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr "--nowplaying FMT چاپ نام آهنگ قالب‌بندی شده در خروجی استاندارد\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
 msgstr ""
-" FMT %%-ترکیب: هنرمند،عنوان، آلبوم،\n"
-" مدت زمان، شماره آهنگ، سال،نظر،\n"
-" حقنشر،سپری شده\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr "مثال: \"%%a - %%t\" باید \"هنرمند-عنوان\" را چاپ کند\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "پیش‌فرض"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "بله"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "خیر"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
-"چپ\n"
-"راست"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
-"غیرفعال\n"
-"آهنگ\n"
-"آلبوم"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
-"۲٫۳ (توصیه شده)\n"
-"۲٫۴"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 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"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "نوع(های) برچسب"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "برگه راهنمایی توکار"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "کدک‌"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:281
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:319
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:321
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "افزودن"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "پرونده تصویر بیتی پیدا نشد:%s"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:377
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/fi.po -> deadbeef-1.9.6.tar.bz2/po/fi.po Changed

@@ -1,2077 +1,2605 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# elain1 <heikki.auvinen@gmail.com>, 2014
-# elain1 <heikki.auvinen@gmail.com>, 2014
+# elain1, 2014
+# elain1, 2014
+# elain1, 2014
+# maku - <oottela@cs.helsinki.fi>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/fi/)\n"
-"Language: fi\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: maku - <oottela@cs.helsinki.fi>, 2020\n"
+"Language-Team: Finnish (http://app.transifex.com/deadbeef-player/deadbeef-player/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Tietoja ohjelmasta DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Käyttö: deadbeef asetukset -- tiedosto(t)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s:n muutosloki"
+msgid "Options:\n"
+msgstr "Valitsimet:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeFin kääntäjät"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help tai -h Näytä ohje (tämä viesti) ja poistu\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Tallenna DeaDBeeF EQ esiasetus"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Sulje soitin\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ esiasetustiedostot (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Näytä versiotiedot ja poistu\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Lataa DeaDBeeF EQ esiasetus..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Aloita toisto\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ esiasetukset (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Pysäytä toisto\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Tuo Foobar2000 EQ esiasetus..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Keskeytä toisto\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ esiasetukset (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Vaihda keskeytyksen ja toiston välillä\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Tallenna esiasetus"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Aloita toisto, jos pysäytetty, muuten vaihda keskeytyksen ja toiston välillä\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Lataa esiasetus"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Seuraava kappale soittolistalla\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Tuo Foobar2000 EQ Esiasetus"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Edellinen kappale soittolistalla\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Kytke päälle"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Satunnainen kappale soittolistalla\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Nolla kaikki"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Lisää tiedosto(t) olemassa olevaan soittolistaan\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Nollaa esivahvistin"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr "--gui PLUGIN Kertoo mitä graafisen käyttöliittymän liitännäistä käytetään, oletus on \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Nollaa kanavat"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Tulosta muotoiltu raidan nimi stdoutiin\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Esiasetukset"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntaksi: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 päivä %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr "esimerkki: --nowplaying \"1%%a - 1%%t\" :n pitäisi tulostaa \"artisti - kappalenimi\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d päivää %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "lisätietoja saadaksesi, katso 1%s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Pysäytetty | %d raitaa | kokonaiskesto %s"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "HUOM: --nowplaying on vanhentunut.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr "--nowplaying-tf FMT Tulosta muotoiltu kappaleennimi stdout virtaan käyttämällä uutta otsikon muotoilua\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr "FMT syntaksi: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr "esimerkki: --nowplaying-tf \"%% artist 1%% - %% title 1%%\" pitäisi tulostaa \"artist - title\"\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr "--volume NUM Tulosta tai aseta deadbeef:in äänen voimakkuus.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr "NUM parametri voidaan määritellä prosentteina (absoluuttinen arvo tai lisäyksenä/vähennyksenä)\n"
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:161
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d Kb/s "
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr "tai dB:issä -50, 0 (jos yksikön kanssa).\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Keskeytetty | "
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr "Esimerkit: --volume 80, --volume +10, --volume -5 tai --volume -20dB\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:163
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
 msgstr ""
-"%s%s %s| %dHz | %d bittiä | %s | %d:%02d / %s | %d raitaa | kokonaiskesto %s"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Uusi soittolista"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:165
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Uusi soittolista (%d)"
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Soittolista välilehdillä"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Oletus"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Soittolista"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Jakaja (ylä- ja alapuoli)"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Jakaja (vasen ja oikea)"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Kyllä"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Soittolista välilehdet"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Ei"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Valinnan ominaisuudet"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Ulostulokansio:"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Albumin kuvituksen näyttö"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Tallenna lähdekansioon"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Oskilloskooppi"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Säilytä kansiorakenne"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Spektri"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Kopioi jos formaatti ei ole vaihtuva"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Uudelleentagaa kopioinnin jälkeen"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Ulostulotiedoston nimi:"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Tiedostopääte (esim. .mp3) lisätään tiedostonimen loppuun automaattisesti.\nJätä kenttä tyhjäksi oletusasetusta käyttääksesi (%tracknumber%.1%artist% - 5%title%)."
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Painike"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Enkooderi:"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP-esiasetus:"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Säikeiden määrä:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Ulostulon näytemuoto:"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:14
+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 "Pidä lähteen tiedostomuoto\n8 bit signed int\n16 bit signed int\n24 bit signed int\n32 bit signed int\n32 bit float"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Virhe ohjetiedostoa avattaessa"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Kun tiedosto on jo olemassa:"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Ohjetiedoston avaaminen epäonnistui"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Ohita\nKehote\nYlikirjoita"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Muokkaa enkooderin esiasetusta"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Nimi:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Nimeämätön enkooderi"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Ulostulon tiedostopääte:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Esim. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Komentorivi:"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"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/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Haluatko silti poistua?"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - ulostulotiedoston nimi\n%i - väliaikaisen sisääntulotiedoston nimi"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Menetelmä:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Putki\nVäliaikaistiedosto\nLähdetiedosto"
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "Ogg Vorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Tagikirjoittaja"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP-esiasetuksen muokkain"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Nimi"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Nimeämätön DSP-esiasetus"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Lisää"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Poista"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Tee asetukset"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Valitse DSP-liitännäinen"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Liitännäinen"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Esiasetukset"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Sisäänrakennettu 1%s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Tiedosto on jo olemassa. Ylikirjoita?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Muuntimen varoitus"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Valitse koodekki"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Muuntimen virhe"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Muunnetaan..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Valitse kansio..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Enkooderin esiasetuksen tallentaminen epäonnistui."
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Tarkista esiasetuskansion käyttöoikeudet, yritä keksiä toinen nimi tai vapauta levytilaa."
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Esiasetus samalla nimellä on jo olemassa. Yritä keksiä toinen nimi."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Virhe"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Lisää uusi enkooderi"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Muokkaa enkooderia"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Poista esiasetus"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Tämä toiminto poistaa valikoidun esiasetuksen. Oletko varma?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Enkooderit"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Lisää liitännäinen DSP-ketjuun"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "DSP-esiasetuksen tallennus epäonnistui"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Uusi DSP-esiasetus"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Muokkaa DSP-esiasetusta"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP-esiasetukset"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Ohje"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Pidä lähteen tiedostomuoto"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit signed int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit signed int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit signed int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Ohita"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Kysy"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Ylikirjoita"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Putki"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Väliaikaistiedosto"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Lähdetiedosto"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Bittikarttatiedostoa ei löydetty: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Avaa tiedosto(ja)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Lisää tiedosto(ja) soittolistalle..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Lisää kansio(ita) soittolistalle..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Avaa Soittolista"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Tallenna Soittolista Nimellä"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Tietoja ohjelmasta DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s:n muutosloki"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeFin kääntäjät"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Sisällön-Tyyppi"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Liitännäiset"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Virheellinen arvo."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Sisällöntyyppi- ja liitännäiskentät eivät voi olla tyhjiä ja niiden pitää noudattaa sääntöjä.\nEsimerkiksi sisällöntyyppi: 'audio/mpeg'.\nEsimerkiksi liitännäisten tunnisteet: 'stdmpg ffmpeg'.\nVälilyöntiä tulee käyttää erottimena liitännäisten tunnisteita listattaessa.\nSisällöntyyppi tulee olla ainoastaan kirjaimia, numeroita ja '-' merkki.\nLiitännäisen tunniste voi sisältää ainoastaan kirjaimia ja numeroita."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Mitään ei ole valittuna."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Avaa tiedosto(ja)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Lisää tiedosto(ja)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Lisää hakemisto(ja)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Lisää sijainti"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Uusi soittolista"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Avaa soittolista"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Tallenna soittolista"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Tyhjennä"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Valitse kaikki"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Poista valinta"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Käännä valinta"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Valinta"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Poista"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Rajaa"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Etsi"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Järjestä"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Nimi"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Raidan numero"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Albumi"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Artisti"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Satunnainen"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Mukautettu"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Tilapalkki"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Taajuuskorjain"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Suunnittelutila"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Loki"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "T_oisto"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Järjestys"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Lineaarinen"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Sekoita raitoja"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Sekoita albumeita"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Toisto"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Toista kaikki"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Toista yksittäistä kappaletta"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Älä toista"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Sekoita"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Sammutettu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Raidat"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Albumit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Satunnaiset Raidat"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Uudelleentoisto"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Kaikki Kappaleet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Yksi Kappale"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Vieritys seuraa toistoa"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
-msgstr "Hiiri seuraa toistoa"
+msgstr "Hiiren osoitin seuraa toistoa"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Pysäytä nykyisen kappaleen jälkeen"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Pysäytä nykyisen albumin jälkeen"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Hyppää nykyiseen raitaan"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Ohje"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Muutosloki"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Kääntäjät"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Etsi"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Soita"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Tauko"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Toista satunnainen"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Tietoja"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Ohje"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Raidan ominaisuudet"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Sijainti:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Käytä"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metatiedot"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Nimi:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Peruuta"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Anna uuden rivin otsikko"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "KOhteen indeksi"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Soitetaan"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Albumin Kuvitus"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artisti - Albumi"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Kesto"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Raidan Numero"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Yhtye / Albumin artisti"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Tiedostomuoto:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Järjestyksen esitysasu:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(jos ei tyhjä)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Kohdistus:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Vasen"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Oikea"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Peruuta"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Vasen\nOikea\nKeskitetty"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Tekstin väri"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Ulostuloliitännäinen:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Ulostulolaite:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Muunna aina 8-bittinen ääni 16-bittiseksi"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Muunna aina 16-bittinen ääni 24-bittiseksi"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Kohdenäytteenottotaajuus"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "48KHz monikerroille (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "44.1KHz monikerroille (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Sisääntulon näytteenottotaajuuteen perustuva"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Ohita näytteenottotaajuus"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Ääni"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Replaygain-tila:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Pois päältä"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Lähdevalinta"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Raita"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Toistojärjestyksen mukaan\nRaita\nAlbumi"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Replaygain-huippuskaala"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Prosessointi:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Ei Mikään\nHyväksy vahvistus\nHyväksy vahvistus ja estä äänen leikkaantuminen huippuarvon perusteella\nEstä vain äänen leikkaantuminen"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Replaygain-esivahvistus:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Yleinen esivahvistus:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Esivahvistin RG-informaatiolla:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Esivahvistus ilman RG-informaatiota:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-"Lisää tiedostoja komentoriviltä (tai tiedostonhallinnasta) tähän "
-"soittolistaan:"
+msgstr "Lisää tiedostoja komentoriviltä (tai tiedostonhallinnasta) tähän soittolistaan:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Palauta edellinen istunto käynnistyksessä"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Älä lisää arkistoista lisättäessä kansioita"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "\"Pysäytä nykyisen kappaleen jälkeen\" valinta poistuu käytön jälkeen"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "\"Pysäytä nykyisen albumin jälkeen\" valinta poistuu käytön jälkeen"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Toisto"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Tee asetukset"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "DSP ketjuesiasetus"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Lataa"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Pienennä ilmoitusalueelle käynnistettäessä."
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Pienennä ilmaisinalueelle suljettaessa"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Piilota ilmaisinalueen kuvake"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Ota käyttöön SHIFT-JIS merkistökoodauksen tunnistus ja muuntaminen (japani)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr ""
-"Ota käyttöön CP1251 -merkistökoodauksen tunnistus ja muuntaminen (venäjä)"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
-"Ota käyttöön CP936 -merkistökoodauksen tunnistus ja muuntaminen (kiina)"
+msgstr "Ota käyttöön CP936 -merkistökoodauksen tunnistus ja muuntaminen (kiina)"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Käyttöliittymän päivitysnopeus (kertaa sekunnissa):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Otsikkopalkin teksti toistettaessa:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Otsikkopalkin teksti, kun toisto on pysäytetty:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr ""
-"Käyttöliittymäliitännäinen (vaihtaminen vaatii ohjelman "
-"uudellenkäynnistyksen):"
+msgstr "Käyttöliittymäliitännäinen (vaihtaminen vaatii ohjelman uudellenkäynnistyksen):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Näytä valinnan toistoaika tehtäväpalkissa"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "Soitin"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr "Sulje soittolistoja hiiren keskimmäisellä painikkeella"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Näytä soiva raita lihavoituna"
-
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Vaihda seuraavaan kappaleeseen kun parhaillaan soiva kappale poistetaan levyltä"
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Nimeä soittolista automaattisesti lisättäessä yksittäinen kansio"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr "Sovita sarakkeet ikkunaan"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Ryhmän välistys"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pikseliä"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Soittolista"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "GUI/Sekalainen"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Ohita"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Etuala"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Tahtia"
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Tausta"
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Tausta (EQ)"
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Etsintä-/äänenvoimakkuuspalkin värit"
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Toistonedistymispalkki/Äänenvoimakkuuspalkki/EQ"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Keski"
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Pohja:"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Kevyt"
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Tumma:"
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Tumma"
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Vaalea:"
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Pohja"
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Keski:"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Teksti"
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Teksti:"
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Välilehden värit"
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Lihavoitu"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr ""
-"Ohita asetus (GTKn treeview-teema menetetään, mutta nopeuttaa renderöintiä)"
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Kursivoitu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Toistoteksti:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Valittu teksti:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Välilehtinauha"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Parillinen rivi"
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Normaali raita (tai raidat):"
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Pariton rivi"
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Toistettava raita:"
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Valittu rivi"
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Valitut raidat (yksi tai useampi):"
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Valittu teksti"
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Sarakkeet:"
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Hiiriosoitin"
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Ryhmän otsake:"
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Soittolistojen värit"
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Etuala:"
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Värit"
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Parillinen:"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Pariton:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Valittu:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Osoitin:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Tausta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Ohita (poistaa GTK puunäkymän teeman, mutta nopeuttaa renderöintiä)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Ulkoasu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Ota käyttöön välityspalvelin"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Välityspalvelimen osoite:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Välityspalvelimen portti:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Välityspalvelimen tyyppi:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Välityspalvelimen käyttäjänimi:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Välityspalvelimen salasana:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "Muokkaa sisältötyypin kartoitusta"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Verkko"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "Määritellyt pikanäppäimet:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Toiminto:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Ei ole asetettu>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Näppäinyhdistelmä:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Yleinen pikanäppäin"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"Tallenna muutokset Käytä painikkeella,\n"
-"tai peruuta muutokset Palauta painikkeella.\n"
-"Muutoksia EI tallenneta\n"
-"jos et paina Käytä painiketta."
+msgstr "Tallenna muutokset Käytä painikkeella,\ntai peruuta muutokset Palauta painikkeella.\nMuutoksia EI tallenneta\njos et paina Käytä painiketta."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "_Oletukset"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Pikanäppäimet"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Versio: "
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Tekijänoikeus"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Liitännäiset"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Palauta oletukset"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versio: "
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Aseta Itsemääritelty Otsikko"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Ryhmitä..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Järjestä..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Tiedostomuoto"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Nouseva"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Laskeva"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Valitse DSP-liitännäinen"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Liitännäinen"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Nouseva\nLaskeva"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Tagikirjoittajan asetukset"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Kirjoita ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Kirjoita ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Kirjoita APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Poista ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Poista ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Poista APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 versio"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (suositeltu)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (suositeltu)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1-merkistökoodaus (oletus: iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Kirjoita ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "Sisältötyypin kartoitus"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"Tämä taulukko määrittää verkon suoratoiston sisältötyypin ja DeaDBeeFin "
-"dekooderiliitännäisten sidoksen. Esimerkiksi, mp3-tiedostot voivat olla "
-"sisältötyypiltään \"audio/x-mpeg\", ja ne pitää dekoodata joko DeaDBeeFin "
-"omalla \"stdmpg\"-liitännäisellä tai \"ffmpeg\"-liitännäisellä."
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Palauta oletukset"
+msgstr "Tämä taulukko määrittää verkon suoratoiston sisältötyypin ja DeaDBeeFin dekooderiliitännäisten sidoksen. Esimerkiksi, mp3-tiedostot voivat olla sisältötyypiltään \"audio/x-mpeg\", ja ne pitää dekoodata joko DeaDBeeFin omalla \"stdmpg\"-liitännäisellä tai \"ffmpeg\"-liitännäisellä."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "Sisällön-Tyyppi:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Liitännäiset"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Painikkeen ominaisuudet"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Väri:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Tekstin väri"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Kuvake:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Nimike:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Valitse toiminto"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
+msgstr "Tässä ikkunassa on mahdollista määritellä oma nimi mille tahansa kappaleelle. Tästä on eniten hyötyä radiokanavien kohdalla. Mahdollisuus valita oma nimi löytyy myös \"Lisää Sijainti\" valikosta. Nimi itsessään näkyy sarakkeissa jotka näyttävät \"Artisti\" kentän metadatan. Siinä pitäisi näkyä \"custom artist\" jost Artisti kenttä on olemassa -- muussa tapauksessa pitäisi näkyä vain \"custom\"."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Muokkaa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Muokkaa (näkymässä)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Lisää uusi kenttä..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Muokkaa Arvoa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Kentän nimi:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Kentän arvo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artisti / Albumi"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF Loki"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Raita nro"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Tyhjennä"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "ReplayGain Skannaukksen Edistyminen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Nykyinen Tiedosto:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Tila"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "ReplayGain Skannauksen Tulokset"
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Päivitä Tiedoston Tagit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Lisää sarake"
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Muokkaa saraketta"
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Poista sarake"
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Tallenna DeaDBeeF EQ esiasetus"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr "Kiinnitä ryhmät vierittäessä"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ esiasetustiedostot (*.ddbeq)"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Ryhmittele"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Lataa DeaDBeeF EQ esiasetus..."
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Ei mitään"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ esiasetukset (*.ddbeq)"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Artisti/Pvm/Albumi"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Tuo Foobar2000 EQ esiasetus..."
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Avaa tiedosto..."
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ esiasetukset (*.feq)"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Tee asetukset %s"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Tallenna esiasetus"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Oletusäänilaite"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Lataa esiasetus"
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr "Muokkasit pikanäppäinasetuksia, mutta et tallentanut muutoksiasi."
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Tuo Foobar2000 EQ Esiasetus"
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr "Haluatko varmasti jatkaa ilman tallentamista?"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Kytke päälle"
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Lisätään tiedostoja..."
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Nolla kaikki"
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Alustetaan..."
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Nollaa esivahvistin"
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Olet muokannut tämän raidan dataa."
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Nollaa kanavat"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Haluatko varmasti sulkea tämän ikkunan?"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Uusi soittolista"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Useita arvoja "
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Tuetut äänityypit"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Avain"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Kaikki tiedostot (*)"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Arvo"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Tuetut soittolistaformaatit"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Kaikki tiedostot"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Useita arvoja"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Muut tiedostot (*)"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Kirjoitetaan tageja..."
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeFin soittolistatiedostot (*.dbpl)"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Kentän nimi"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Seuraa symbolisia linkkejä"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Nimi:"
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 päivä %d:%02d:%02d"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Tiedostonimet eivät voi alkaa merkeillä : tai _"
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d päivää %d:%02d:%02d"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Kenttää ei voi lisätä"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "kokonaistoistoaika"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Samanniminen kenttä on jo olemassa, yritä toista nimeä."
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Tauko"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Lisää kenttä"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Poista kentät"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bitti"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "valinnan soittoaika"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Pysäytetty"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Käyttö: deadbeef asetukset -- tiedosto(t)\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Nimeä Soittolista"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Valitsimet:\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Poistetaan soittolistaa"
 
-#: ../main.c:92
+#: ../plugins/gtkui/gtkui.c:613
 #, 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"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Haluatko varmasti poistaa soittolistan '1%s'?"
 
-#: ../main.c:93
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Sulje soitin\n"
+msgid "New Playlist (%d)"
+msgstr "Uusi soittolista (%d)"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Näytä versiotiedot ja poistu\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Soittolista välilehdillä"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Aloita toisto\n"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Jakaja (ylä- ja alapuoli)"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Pysäytä toisto\n"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Jakaja (vasen ja oikea)"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Keskeytä toisto\n"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Välilehdet"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Vaihda keskeytyksen ja toiston välillä\n"
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Soittolista välilehdet"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Valinnan ominaisuudet"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Albumin kuvituksen näyttö"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
-" --play-pause Aloita toisto, jos pysäytetty, muuten vaihda "
-"keskeytyksen ja toiston välillä\n"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Seuraava kappale soittolistalla\n"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektri"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Edellinen kappale soittolistalla\n"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Satunnainen kappale soittolistalla\n"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Painike"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Etsintäpalkki"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Toistosäätimet"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Äänenvoimakkuuspalkki"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune-äänet"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Lokitiedostonäkymä"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
-" --queue Lisää tiedosto(t) olemassa olevaan soittolistaan\n"
 
-#: ../main.c:104
-#, c-format
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Virhe ohjetiedostoa avattaessa"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Ohjetiedoston avaaminen epäonnistui"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Soitin ajaa parhaillaan tehtäviä taustalla. Jos suljet ohjelman nyt, tehtävät joko peruutetaan tai keskeytetään. Tämä saattaa johtaa datan menettämiseen."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Haluatko silti poistua?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"--gui PLUGIN Kertoo mitä graafisen käyttöliittymän liitännäistä käytetään, "
-"oletus on \"GTK2\"\n"
 
-#: ../main.c:105
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Tulosta muotoiltu raidan nimi stdoutiin\n"
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
 
-#: ../main.c:106
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
 #, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-" FMT %%-syntaksi: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
 
-#: ../main.c:109
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
 #, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
-" esim.: --nowplaying \"%%a - %%t\" tulostaa \"artisti - "
-"otsikko\"\n"
 
-#: ../main.c:110
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
 #, c-format
-msgid " for more info, see %s\n"
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Oletus"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Kyllä"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Poista"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Ei"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Vasen"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Kohteen indeksi\n"
-"Soitetaan\n"
-"Albumin kansikuva\n"
-"Artisti - Albumi\n"
-"Artisti\n"
-"Albumi\n"
-"Otsikko\n"
-"Kesto\n"
-"Raidan numero\n"
-"Bändi / Albumin artisti\n"
-"Mukautettu"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Oikea"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Vasen\n"
-"Oikea"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Keskitetty"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
 msgstr ""
-"Pois käytöstä\n"
-"Raita\n"
-"Albumi"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 msgstr ""
-"Nouseva\n"
-"Laskeva"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
 msgstr ""
-"2.3 (suositeltu)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
-"wildmidi: freepats-asetustiedostoa ei löydetty. Asenna paketti timidity-"
-"freepats tai määrittele tiedoston freepats.cfg sijainti liitännäisten "
-"asetuksissa."
 
-#. 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"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
 msgstr ""
 
-#: ../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 "Käytä ALSA:n uudelleennäytteistystä"
-
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Vapauta laite, kun toisto on lopetettu"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Toistojärjestyksen mukaan"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Ensisijainen puskurin koko"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Raita"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Ensisijainen jakson koko"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Ei mitään"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Ota käyttöön scrobbler"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Ota vahvistus käyttöön"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Ota vahvistus käyttöön ja estä äänen leikkaantuminen huippuarvoon pohjautuen"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Estä vain äänen leikkaantuminen"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Ota nowplaying pois käytöstö"
-
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Käyttäjänimi"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Nouseva"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Salasana"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Laskeva"
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (suositeltu)"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Suosi Albumin artistia Artisti-kentän edelle"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Laitetiedosto"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artisti / Albumi"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 näytteenottotaajuusongelman kiertäminen"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Raita nro"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Välimuistin päivitysväli"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Kesto"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Nouda sisällytetyistä tageista"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "KOhteen indeksi"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Nouda paikallisesta kansiosta"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Soitetaan"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Paikallinen peitetiedostomaski"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Hae last.fm -palvelusta"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Hae albumart.org -palvelusta"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Skaalaa albumin kuva pidempää sivua kohti"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Käytä CDDB/FreeDB:tä"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Albumin Kuvitus"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Suosi CD-Textiä CDDB:n yli"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artisti - Albumi"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB:n url (esim. \"freedb.org\")"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB:n portin numero (esim. \"888\")"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Suosi CDDB-protokollaa HTTP:n yli"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Vuosi"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Ota käyttöön tuki NRG-levykuville"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Raidan Numero"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Uudelleennäytteistyksen laatu (0..2, suurempi on parempi)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-bittinen ulostulo (vakio on 16)"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Yhtye / Albumin artisti"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Kappaleen maksimipituus (minuuteissa)"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Koodekki"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Loppuhäivytyksen pituus (sekunneissa)"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bittitaajuus"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Toistojen määrä (jos käytössä)"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Lisää sarake"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Kysy vahvistus ennen kuin tiedostoja poistetaan levyltä"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Muokkaa saraketta"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Ilmaisinaluekuvakkeen äänenvoimakkuuden säädön herkkyys"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Poista sarake"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Oma tilakuvake"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Kiinnitä ryhmät vierittäessä"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Suorita gtk_init --sync-valitsimen kanssa (virheenjäljitystila)"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Ryhmittele"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Käytä erottajia liitännäisten kontekstivalintojen väleissä"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artisti/Pvm/Albumi"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Ilmoituksen otsikon muoto"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Ilmoituksen sisällön muoto"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Näytä albumin kansi"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Albumin kannen koko (px)"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Uudelleenlataa Metadata"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio-palvelin"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Näytetaajuus"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Suhteellinen hakutalukon polku"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Absoluuttiinen hakutaulukon polku"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Vaihda audiotavuja (käytä jos kuulet pelkkää kohinaa)"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Poista Soittolista"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Ota käyttöön HVSC kappaleiden pituustietokanta"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Lisää Uusi Soittolista"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "HVSC:n songlengths.txt"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bittiä/näyte (8 tai 16)"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Kytke Automaattijärjestys Päälle"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Kappaleen oletuspituus (sek)"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ asetustiedosto"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Avaa tiedosto..."
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Raidan otsikko"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Tee asetukset %s"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Esittäjä"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Muokkasit pikanäppäinasetuksia, mutta et tallentanut muutoksiasi."
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Raitoja yhteensä"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Haluatko varmasti jatkaa ilman tallentamista?"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Tyylilaji"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Oletusäänilaite"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Säveltäjä"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Lisätään tiedostoja..."
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Levyn numero"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Alustetaan..."
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Kommentti"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Päivitetään Tiedostojen Tagausprosessia"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Enkooderi / toimittaja"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nimi"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Sijainti"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Albumin Vahvistus"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Raidan Vahvistus"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Albumin Huippu"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Raidan Huippu"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Onnistui"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Tiedostoa ei löytynyt"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Epäkelpo tiedosto"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Etsi (%listaa_kaikki%) tulokset"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Aliraitaindeksi"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Näytä sarakkeiden otsakkeet"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tagien tyypit"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Arvo"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Sisällytetty cuesheet"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Olet muokannut tämän raidan dataa."
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Koodekki"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Haluatko varmasti sulkea tämän ikkunan?"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Tiedostopäätteet (erota \";\"-merkillä)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Useita arvoja "
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Muunna"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Avain"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Tavoite näytteenottotaajuus"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Useita arvoja"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Laatu / Algoritmi"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Kirjoitetaan tageja..."
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
-"Automaattinen näytteenottotaajuus (korvaa tavoite näytteenottotaajuuden)"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Ota tauoton toisto pois käytöstä (nopeampi skannaus)"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Kentän nimi"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Suosi Ken-emulointia Satohin edelle (tilaääni ei toimi)"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Nimi:"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Ota käyttöön tilaääni"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Tiedostonimet eivät voi alkaa merkeillä : tai _"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Kenttää ei voi lisätä"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Tiedosto on jo olemassa. Ylikirjoita?"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Samanniminen kenttä on jo olemassa, yritä toista nimeä."
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Muuntimen varoitus"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Widgetti \"1%s\" ei ole saatavilla"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Valitse koodekki"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Korvaa..."
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Muuntimen virhe"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Lisää..."
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Muunnetaan..."
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Leikkaa"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Valitse kansio..."
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopioi"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Enkooderin esiasetuksen tallentaminen epäonnistui."
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Liitä"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
-"Tarkista esiasetuskansion käyttöoikeudet, yritä keksiä toinen nimi tai "
-"vapauta levytilaa."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "Esiasetus samalla nimellä on jo olemassa. Yritä keksiä toinen nimi."
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Useammat tämän tyypin widgetit eivät ole tuettuja"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Virhe"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Verrannollinen Mitoitus"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Lisää uusi enkooderi"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Lukitse Ylimmän Ruudun Korkeus"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Muokkaa enkooderia"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Lukitse Vasemman Ruudun Leveys"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Poista esiasetus"
-
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Tämä toiminto poistaa valikoidun esiasetuksen. Oletko varma?"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Lukitse Alimman Ruudun Korkeus"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Enkooderit"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Lukitse Oikeanpuoleisen Ruudun Leveys"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Lisää liitännäinen DSP-ketjuun"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Uudelleennimeä Välilehti"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "DSP-esiasetuksen tallennus epäonnistui"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Poista Välilehti"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Uusi DSP-esiasetus"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Lisää Uusi Välilehti"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Muokkaa DSP-esiasetusta"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Siirrä Välilehti Vasemmalle"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP-esiasetukset"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Siirrä Välilehti Oikealle"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Ulostulokansio:"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Tallenna lähdekansioon"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Säilytä kansiorakenne"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Ulostulotiedoston nimi:"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
 #, no-c-format
-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"
-"Jätettäessä tyhjäksi oletus on (%a - %t)."
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Enkooderi:"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP-esiasetus:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Säikeiden määrä:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Ulostulon näytemuoto:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Pidä lähteen tiedostomuoto"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit signed int"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit signed int"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit signed int"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit signed int"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit float"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Kun tiedosto on jo olemassa:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Kysy"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Ylikirjoita"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Muokkaa enkooderin esiasetusta"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Nimeämätön enkooderi"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Ulostulon tiedostopääte:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Esim. mp3"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Komentorivi:"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
-"Esimerkki: lame - %o\n"
-"%i on sisääntulotiedosto, %o on ulostulotiedosto, - on stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
-"%o - ulostulotiedoston nimi\n"
-"%i - väliaikaisen sisääntulotiedoston nimi"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Menetelmä:"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Putki"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Tilapäinen tiedosto"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Kasvata Laatikkoa yhdellä alkiolla"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Kutista Laatikkoa yhdellä alkiolla"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Yhtenäinen"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "Ogg Vorbis"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Laajenna"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Täytä"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Muokkaa Nappia"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Tagikirjoittaja"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP-esiasetuksen muokkain"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Nimeämätön DSP-esiasetus"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Lisää"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Äänet:"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Bittikarttatiedostoa ei löydetty: %s"
-
-#: ../plugins/converter/converter.glade.h:12
-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"
+msgid "Copy of %s"
 msgstr ""
-"Pidä lähteen tiedostomuoto\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:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
-"Kysy\n"
-"Ylikirjoita"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
-"Putki\n"
-"Väliaikainen tiedosto"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "(tauolla)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "(pysäytetty)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "(toistaa)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%d vrk %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "alkiota"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Soittolistaselain"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "Mukautetut komentotulkkikomennot"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Muokkaa"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2094,10 +2622,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"Mielivaltainen komentotulkin komento. Suoritetaan samassa komentotulkin "
-"kontekstissa jossa sovellus käynnistettiin. Otsikkomuotoilua voidaan "
-"käyttää. Esimerkiksi: xdg-open %D"
+msgstr "Mielivaltainen komentotulkin komento. Suoritetaan samassa komentotulkin kontekstissa jossa sovellus käynnistettiin. Otsikkomuotoilua voidaan käyttää. Esimerkiksi: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2112,11 +2637,9 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"Komennon tunnisteen tulisi normaalisti olla jotain lyhyttä, esim. "
-"\"youtube_open\" ja sen täytyy olla uniikki."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Komennon tunnisteen tulisi normaalisti olla jotain lyhyttä, esim. \"youtube_open\" ja sen täytyy olla uniikki."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2174,19 +2697,12 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
-"Jos haluat lisätä komennon päävalikkoon, varmista että otsikko "
-"sisältää valikkopolun tähän tapaan: \"File/Minun komentoni\", jossa File on "
-"Tiedosto-valikon nimi englanninkielisessä versiossa."
+msgstr "Jos haluat lisätä komennon päävalikkoon, varmista että otsikko sisältää valikkopolun tähän tapaan: \"File/Minun komentoni\", jossa File on Tiedosto-valikon nimi englanninkielisessä versiossa."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Lisää komento"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Poista"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Tämä toiminto poistaa valikoidun komentotulkkikomennon. Oletko varma?"
@@ -2212,198 +2728,1240 @@
 msgid "Invalid Values"
 msgstr "Virheellinen arvo"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Tuetut äänityypit"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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-asetustiedostoa ei löydetty. Asenna paketti timidity-freepats tai määrittele tiedoston freepats.cfg sijainti liitännäisten asetuksissa."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Kaikki tiedostot (*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Avaa tiedosto(ja)..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Raidan otsikko"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Lisää tiedosto(ja) soittolistalle..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Esittäjä"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Lisää kansio(ita) soittolistalle..."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Raitoja yhteensä"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Seuraa symbolisia linkkejä"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Tyylilaji"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Säveltäjä"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Poisto tiedostot kiintolevyltä"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Levyn numero"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Levyjä Yhteensä"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Kommentti"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Enkooderi / toimittaja"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Tekijänoikeus"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Sijainti"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Aliraitaindeksi"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tagien tyypit"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Sisällytetty cuesheet"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-"Tiedostot häviävät. Jatketaanko?\n"
-"(Tämän valintaikkunan voi sammuttaa GTKUI-liitännäisen asetuksista)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Avaa Soittolista"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Muut tiedostot (*)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Tallenna Soittolista Nimellä"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Suosi Ken-emulointia Satohin edelle (tilaääni ei toimi)"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "DeaDBeeFin soittolistatiedostot (*.dbpl)"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Ota käyttöön tilaääni"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Sisällön-Tyyppi"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Käytä ALSA:n uudelleennäytteistystä"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Virheellinen arvo."
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Ensisijainen puskurin koko"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Ensisijainen jakson koko"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
-"Sisällöntyyppi- ja liitännäiskentät eivät voi olla tyhjiä ja niiden pitää "
-"noudattaa sääntöjä.\n"
-"Esimerkiksi sisällöntyyppi: 'audio/mpeg'.\n"
-"Esimerkiksi liitännäisten tunnisteet: 'stdmpg ffmpeg'.\n"
-"Välilyöntiä tulee käyttää erottimena liitännäisten tunnisteita "
-"listattaessa.\n"
-"Sisällöntyyppi tulee olla ainoastaan kirjaimia, numeroita ja '-' merkki.\n"
-"Liitännäisen tunniste voi sisältää ainoastaan kirjaimia ja numeroita."
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Mitään ei ole valittuna."
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Nouda sisällytetyistä tageista"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Nouda paikallisesta kansiosta"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Nouda Last.fm:stä"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Nouda MusicBrainz:ista"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Nouda Albumart.org:ista"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Korvaa..."
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Lisää..."
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Kun kansikuvaa ei löydy"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Leikkaa"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "jätä tyhjäksi"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Kopioi"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "Käytä DeaDBeeF oletuskansikuvaa"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Liitä"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "näytä itse valittu kuva"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr "Useammat tämän tyypin widgetit eivät ole tuettuja"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Itsevalitun kuvan polku"
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Lukitse liikkuvuus"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Siirrä välilehteä vasemmalle"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Siirrä välilehteä oikealle"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Poista välilehti"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Nimeä välilehti"
-
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Lisää uusi välilehti"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Näytä sarakkeiden otsakkeet"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Laajenna laatikkoa 1:llä elementillä"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "Pienennä laatikkoa 1:llä elementillä"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Yhtenäinen"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Laajenna"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Täytä"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Tee painikkeen asetukset"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "Ladattava CD-asema"
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Ääni-CD-asema"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Tiedosto"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Lisää Ääni-CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Muokka soittolistaa"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Suosi CD-Textiä CDDB:n yli"
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Nimeä Soittolista"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Poista Soittolista"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Lisää Uusi Soittolista"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Käytä CDDB-protokollaa"
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Nimi"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Ota käyttöön tuki NRG-levykuville"
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Soittolistaselain"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Aseman nopeus normaalitoistossa"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Maksimi"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Käytä cdparanoia -virheenkorjausta kopioidessa"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Muunna"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Tunnista näytteenottotaajuus automaattisesti ulostulolaitteesta"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Aseta näytteenottotaajuus suoraan"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Laatu / Algoritmi"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Uudelleensamplauksen laatu"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Sisäinen DUMB ääni"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Äänenvoimakkuuden kasvatus"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Vain On/Off"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Täysi"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8-bittinen ulostulo"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Käytä kaikkia ffmpeg:in tukemia laajennuksia"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Tiedostopäätteet (erota \";\"-merkillä)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Sivuuta \"viallinen otsake\" -virheilmoitukset"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Sivuuta \"äänivirta ei parsittavissa\" -virheilmoitukset"
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Kappaleen maksimipituus (minuuteissa)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Loppuhäivytyksen pituus (sekunneissa)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Toistojen määrä (jos käytössä)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (SGC tiedostoformaateille)"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Poista ReplayGain Informaatio"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Skannaa Valinta Albumeina (Tagien Perusteella)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Skannaa Valinta Yksittäisenä Albumina"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Skannaa Tiedostokohtainen Kappaleen Vahvistus"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Skannaa Tiedostokohtainen Kappaleen Vahvistus Jos Ei Vielä Skannattu"
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Poista Valinta"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Valitse Kaikki"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Lisää Sijainti"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Lisää Kansio(t)"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Lisää Tiedosto(t)"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Avaa Tiedosto(t)"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Näytä Tukisivusto"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Kierrä Uudelleentoistovalintaa"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Uuudelleentoisto - Pois Päältä"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Uudelleentoisto - Yksi Raita"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Uudelleentoisto - Kaikki"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Kierrä Sekoitusvalintaa"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Sekoita - Satunnainen Raita"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Sekoita - Albumit"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Sekoita - Raidat"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Sekoita - Pois Päältä"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Kytke Päälle\\/Pois Kursorin Toistettavan Kappaleen Seuraaminen"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Kytke Päälle\\/Pois Vieritys Joka Seuraa Toistettavaa Kappaletta"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Näkymä"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Näytä\\/Piilota valikko"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Näytä\\/Piilota tilapalkki"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Kytke Päälle\\/Pois Suunnittelutila"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Järjestä Mukautettu"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Rajaa Valitut"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Tallenna Soittolista"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Poista Nykyinen Soittolista"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Näytä\\/Piilota Taajuuskorjain"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Piilota Taajuuskorjain"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Näytä Taajuuskorjain"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Näytä\\/Piilota Soitinikkuna"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Piilota Soitinikkuna"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Näytä Soitinikkuna"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Etsi"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Näytä\\/Piilota Loki-ikkuna"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Kysy vahvistus ennen kuin tiedostoja poistetaan levyltä"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Ilmaisinaluekuvakkeen äänenvoimakkuuden säädön herkkyys"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Oma tilakuvake"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Käytä erottajia liitännäisten kontekstivalintojen väleissä"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Käytä unicode-merkkejä kuvien sijaan raidan tilan näyttämiseksi"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Piilota toistopalkin päällysteksti"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Siirry"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Seuraava Soittolista"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Järjestä Satunnaisesti"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Teen Käänteinen Valinta"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Tyhjennä Soittolista"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Siirrä"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Siirrä Raitoja Alas"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Siirrä Raitoja Ylös"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Kytke Vaiennus Päälle\\/Pois"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Kytke Tauko Päälle\\/Pois"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Toista\\/Tauko"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Siirry 1s Eteenpäin"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Siirry 1s Taaksepäin"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Siirry 5s Eteenpäin"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Siirry 5s Taaksepäin"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Siirry 1% Eteenpäin"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Siirry 1% Taaksepäin"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Siirry 5% Eteenpäin"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Siirry 5% Taaksepäin"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Lisää Äänenvoimakkuutta"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Laske Äänenvoimakkuutta"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Kytke Pysähtyminen Nykyisen Kappaleen Jälkeen Päälle\\/Pois"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Kytke Pysähtyminen Nykyisen Albumin Jälkeen Päälle\\/Pois"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Ota käyttöön scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Ota nowplaying pois käytöstö"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Käyttäjänimi"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Salasana"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Suosi Albumin artistia Artisti-kentän edelle"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Lähetä MusicBrainz ID"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Lähetä alle 30 sekuntia pitkät kappaleet (ei suositella)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Vasemmalle miksaus"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Oikealle miksaus"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Pakota 16-bittinen ulostulo"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Backend"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Ilmoituksen otsikon muoto"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Ilmoituksen sisällön muoto"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Näytä albumin kansi"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Albumin kannen koko (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Laitetiedosto"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Korosta nykyinen soittolista"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Toista tuplaklikatessa"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Puskurikoko (-1 käyttää portaudion valitsemaa optimaalista arvoa)"
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Laitteen nimen enkoodaus"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Määritelty alla"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Mukautettu laitenimen enkoodaus"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio palvelin (jätä tyhjäksi oletuspalvelinta käyttääksesi)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Oletuskappalepituus (minuuteissa)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Näytetaajuus"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Ohita kun lyhyempi kuin (sekuntia)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Aseta Mukautetut Shell-komennot"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Suhteellinen hakutalukon polku"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Absoluuttiinen hakutaulukon polku"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Vaihda audiotavuja (käytä jos kuulet pelkkää kohinaa)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Ota käyttöön HVSC kappaleiden pituustietokanta"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Koko polku tiedostoon Songlenghts.md5/.txt"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Bittiä per näyte"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Kappaleen oletuspituus (sek)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Mono synth"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Kytke lokitus päälle"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Esivahvistin"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ asetustiedosto"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-0.6.2.tar.bz2/po/fr.po -> deadbeef-1.9.6.tar.bz2/po/fr.po Changed

@@ -1,2084 +1,2612 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Charles Monzat <c.monzat@laposte.net>, 2014,2017-2023
+# Charles Monzat <superboa@hotmail.fr>, 2014-2018
+# Charles Monzat <c.monzat@laposte.net>, 2017
+# Charles Monzat <c.monzat@laposte.net>, 2017
+# Charles Monzat <c.monzat@laposte.net>, 2018
 # Olowen Cilyan <gaknar@gmail.com>, 2010
-# iceTwy <icetwy@inventati.org>, 2013
+# 097950c3e38693254c8793afaa517ec3_d5cd331 <cf836c24550e2ded1c5e47f5d946d87a_102749>, 2013
+# 097950c3e38693254c8793afaa517ec3_d5cd331 <cf836c24550e2ded1c5e47f5d946d87a_102749>, 2013
 # Olowen Cilyan <gaknar@gmail.com>, 2010
-# Superboa <superboa@hotmail.fr>, 2014
-# Superboa <superboa@hotmail.fr>, 2014
+# Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>, 2014
+# Charles Monzat <c.monzat@laposte.net>, 2014-2015
+# Charles Monzat <c.monzat@laposte.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/fr/)\n"
-"Language: fr\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Charles Monzat <c.monzat@laposte.net>, 2014,2017-2023\n"
+"Language-Team: French (http://app.transifex.com/deadbeef-player/deadbeef-player/language/fr/)\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"
+"Language: fr\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "À propos de DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Utilisation : deadbeef options -- fichier(s)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Notes de version pour DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Options :\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Traducteurs de DeaDBeeF"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ou -h Affiche l’aide (ce message) et quitte\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Enregistrer les paramètres prédéfinis de l'égaliseur DeaDBeeF"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Ferme le lecteur\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Paramètres prédéfinis d'égaliseur DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Affiche les informations de version et quitte\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Charger des paramètres prédéfinis pour l'égaliseur DeaDBeeF..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Démarre la lecture\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Paramètres prédéfinis d'égaliseur DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Arrête la lecture\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importer des paramètres EQ Foobar2000..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Suspend la lecture\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Paramètres d'égaliseur Foobar2000 (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Bascule sur pause\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Enregistrer"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Démarre la lecture si elle est arrêtée, sinon bascule sur pause\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Charger"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Morceau suivant dans la liste de lecture\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importer des paramètres Foobar2000"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Morceau précédent dans la liste de lecture\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Activer"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Morceau aléatoire dans la liste de lecture\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Tout à zéro"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Ajoute le ou les fichiers dans la liste existante\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Pré-ampli à zéro"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr "...--gui PLUGIN Indique le greffon d’interface à utiliser, « GTK2 » par défaut\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Bandes à zéro"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Envoie le nom de la piste formatée dans stdout\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Préréglages"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntaxe : artiste, titre, album,\n longueur, numéro de piste, yannée, commentaire,\n copyright, eécoulé\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 jour %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " ex : --nowplaying \"%%a - %%t\" affiche « artiste - titre »\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d jours %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "pour plus d’informations, voir %s\n"
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " NOTE : --nowplaying est obsolète.\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Affiche le nom de la piste formatée dans stdout, utilisant le nouveau formatage de titre\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:157
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Arrêté | %d pistes | %s de temps d'écoute total"
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " Syntaxe FMT : http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " ex : --nowplaying-tf \"%%artist%% - %%title%%\" affiche « artiste - titre »\n\n\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Affiche ou définit le niveau sonore de deadbeef.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " Le paramètre NUM peut être spécifié en pourcentages (valeur absolue ou incrémentation/décrémentation)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " ou en dB -50, 0 (si avec suffixe).\n"
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Exemples : --volume 80, --volume +10, --volume -5 ou --volume -20 dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr " --plugin=PLUG Envoie des commandes à un greffon spécifique. Utiliser PLUG=main pour envoyer des commandes à deadbeef.\n"
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr " Pour obtenir des commandes spécifiques au greffon, utiliser --plugin=PLUG --help\n"
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr " --plugin-list Répertorie tous les greffons disponibles, y compris ceux qui prennent en charge des commandes.\n"
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Par défaut"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Oui"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "En pause | "
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Non"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Dossier de destination :"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Écrire dans le dossier source de la piste"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Préserver la structure du dossier"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Copier si le format reste inchangé"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Re-baliser après la copie "
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Nom de fichier de sortie :"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-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"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "L’extension (ex : .mp3) sera ajoutée automatiquement.\nLaisser le champ vide pour le réglage par défaut (%numéro de piste%. %artiste% - %titre%)."
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nouvelle liste de lecture"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Codeur :"
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Nouvelle liste de lecture (%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Préréglage DSP :"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Liste de lecture avec onglet"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Nombre de fils :"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Liste de lecture"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Format d’échantillon de sortie :"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Séparateur (haut et bas)"
+#: ../plugins/converter/converter.glade.h:14
+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 "Garder le format source\n8 bits entiers signés\n16 bits entiers signés\n24 bits entiers signés\n32 bits entiers signés\n32 bits flottants"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Séparateur (droit et gauche)"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Lorsque le fichier existe :"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Onglets des listes de lecture"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Ignorer\nDemander\nÉcraser"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Propriétés de la sélection"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Éditer le préréglage du codeur"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Affichage de la couverture de l'album"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Titre :"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Portée"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Codeur sans nom"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Spectre"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Extension de fichier de sortie :"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Ex : mp3"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Ligne de commande :"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Bouton"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Exemple : lame - %o\n%i pour fichier d’entrée, %o pour fichier de sortie, - pour stdin"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr "Barre de lecture"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - nom de fichier de sortie\n%i - nom de fichier d’entrée temporaire"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Méthode :"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "Barre de volume"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Tube\nFichier temporaire\nFichier source"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Échec à la lecture du fichier d'aide"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Échec à l'ouverture du fichier d'aide"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Éditeur de balise"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Éditeur de préréglage DSP"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Titre"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Préréglage DSP sans nom"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Ajouter"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Supprimer"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Configurer"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Choisir le greffon DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Greffon"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Préréglages"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Intégré %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Le fichier existe déjà. Voulez-vous l’écraser ?"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Avertissement du convertisseur"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Veuillez sélectionner un codeur"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Erreur du convertisseur"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Conversion en cours…"
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Sélectionner un dossier…"
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Impossible d’enregistrer le préréglage du codeur"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
-"Le lecteur est actuellement actif en tâche de fond. Si vous quittez "
-"maintenant, les tâches seront ignorées ou interrompues. Cela peut provoquer "
-"des pertes de données."
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Vérifier les permissions du dossier de préréglage, choisissez un nom différent, ou libérer de l’espace disque"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Voulez-vous toujours quitter ?"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Un préréglage avec le même nom existe déjà. Essayez avec un nom différent."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Erreur"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Ajouter un nouveau codeur"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Éditer le codeur"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Supprimer le préréglage"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Cette action va supprimer le préréglage sélectionné. Continuer ?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Codeurs"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Ajouter le greffon à la chaîne DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Impossible d’enregistrer le préréglage DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Nouveau préréglage DSP"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Éditer le préréglage DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Préréglages DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Aide"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Garder le format source"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bits entiers signés"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bits entiers signés"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bits entiers signés"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bits entiers signés"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bits flottants"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Ignorer"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Demander"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Écraser"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Tube"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Fichier temporaire"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Fichier source"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Impossible de trouver le fichier pixmap : %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Ouvrir un ou des fichiers…"
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Ajouter un ou des fichiers à la liste de lecture…"
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Ajouter un ou des dossiers à la liste de lecture…"
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "aide.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Charger une liste de lecture"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Enregistrer la liste de lecture sous"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "À propos de DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Notes de version pour DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Traducteurs de DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr "Piste en cours de lecture"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr "Piste sélectionnée"
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Type de contenu"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Greffons"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Valeur(s) non valide(s)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Les champs de greffons et de type de contenu ne doivent pas être vide, et doivent respecter les règles.\nExemple de type de contenu : « audio/mpeg ».\nExemple d’ID de greffon : « stdmpg ffmpeg ».\nLes espaces doivent être utilisés comme des séparateurs dans la liste d’ID de greffon.\nLe type de contenu doit seulement être des lettres, des numéros et le signe « - ».\nL’ID de greffon peut seulement contenir des lettres et des numéros."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Rien n’a été sélectionné."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
-msgstr "_Ouvrir un (des) fichier(s)"
+msgstr "_Ouvrir un ou plusieurs fichiers"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
-msgstr "Ajouter un (des) fichier(s)"
+msgstr "Ajouter un ou plusieurs fichiers"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
-msgstr "Ajouter un (des) dossier(s)"
+msgstr "Ajouter un ou plusieurs dossiers"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Ajouter un emplacement"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Nouvelle liste de lecture"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Charger une liste de lecture"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Enregistrer la liste de lecture"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
-msgstr "Édit_er"
+msgstr "É_dition"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Tout désélectionner"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Inverser la sélection"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Sélection"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Enlever"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Découper"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Rechercher"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
-msgstr "Classer par"
+msgstr "Trier par"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Titre"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Numéro de piste"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Artiste"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Date"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Aléatoire"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
-msgstr "Barre d'état"
+msgstr "Barre d’état"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Égaliseur"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Mode design"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Journal"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Lecture"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Ordre"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Linéaire"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Mélanger les pistes"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Mélanger les albums"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Boucler"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Tout répéter"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Répéter une seule piste"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Ne pas répéter"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Aléatoire"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Désactivé"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Pistes"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Albums"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Pistes aléatoires"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Mode répétition"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Toutes les pistes"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Une piste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Le défilement suit la lecture"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "La sélection suit la lecture"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Arrêter après la piste actuelle"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr "Arrêter après l'album actuel"
+msgstr "Arrêter après l’album actuel"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
-msgstr "Passer à la prochaine piste"
+msgstr "Passer à la piste actuelle"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
-msgstr "_Aide"
+msgstr "Aid_e"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Notes de version"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
-msgstr "À pr_opos"
+msgstr "À _propos"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Traducteurs"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
-msgstr "Stop"
+msgstr "Arrêt"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
-msgstr "Lire"
+msgstr "Lecture"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Pause"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Suivant"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Lecture aléatoire"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "À propos"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Aide"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
-msgstr "Propriétés de la piste"
+msgstr "Propriétés de piste"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
-msgstr "Location:"
+msgstr "Emplacement :"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Appliquer"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
-msgstr "Métadonnée"
+msgstr "Métadonnées"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Propriétés"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Titre :"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "A_nnuler"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Valider"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
-msgstr "Entrez le nom de la nouvelle colonne ici"
+msgstr "Entrer le nom de la nouvelle colonne ici"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
-msgstr "Type :"
-
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Index de l'item"
+msgstr "Type :"
 
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Lecture"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Couverture de l'album"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artiste - Album"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Durée"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Numéro de Piste"
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Format :"
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Groupe / Artiste de l'album"
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Format de tri :"
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Format :"
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(si non vide)"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Alignement :"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Gauche"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Droite"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "A_nnuler"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Gauche\nDroite\nCentre"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_Valider"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Couleur du texte :"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
-msgstr "Greffon de sortie :"
+msgstr "Greffon de sortie :"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
-msgstr "Périphérique de sortie :"
+msgstr "Périphérique de sortie :"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Toujours convertir l'audio 8 bits à 16 bits"
+msgstr "Toujours convertir l’audio 8 bits à 16 bits"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
-msgstr "Toujours convertir l'audio 16 bits à 24 bits"
+msgstr "Toujours convertir l’audio 16 bits à 24 bits"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Fréquence d’échantillonnage cible :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Pour les multiples de 48 KHz (96 K, 192 K…) :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Pour les multiples de 44.1 KHz (88.2 K, 176.4 K…) :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Basé sur la fréquence d’échantillonnage d’entrée"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Redéfinir la fréquence d’échantillonnage"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Son"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Mode du ReplayGain (ajustement du volume) :"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Désactiver"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Mode source :"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Piste"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Par ordre de lecture\nPiste\nAlbum"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Ajustement des crêtes par ReplayGain"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Traitement :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Aucun\nAppliquer le gain\nAppliquer le gain et empêcher la saturation\nEmpêcher la saturation uniquement"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
-msgstr "-12 dB"
+msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
-msgstr "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Préampli avec info RG :"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Préampli Replaygain:"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Préampli sans info RG :"
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Préampli global:"
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 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 du gestionnaire de fichiers) :"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Charger la session précédente au démarrage"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
-msgstr "Ne pas ajouter depuis des archives pendant l'ajout de dossiers"
+msgstr "Ne pas ajouter depuis des archives lors de l’ajout de dossiers"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "L’option « Arrêter après la piste actuelle » sera désactivée après avoir été déclenchée"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "L’option « Arrêter après l’album actuel » sera désactivée après avoir été déclenchée"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Lecture"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Configurer"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "Réglage de la chaîne DSP"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Charger"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Réduire dans la zone de notification au démarrage"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
-msgstr "Fermer la fenêtre la réduit dans la zone de notification"
+msgstr "Réduire dans la zone de notification à la fermeture"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
-msgstr "Masquer l'icône de notification"
+msgstr "Masquer l’icône de notification"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "L’action « Supprimer du disque » doit utiliser la corbeille"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Activer la détection et le recodage du Japonais SHIFT-JIS"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Activer la détection et le ré-encodage du Russe CP1251 "
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr "Activer la détection et le ré-encodage du Chinois CP936"
+msgstr "Activer la détection et le recodage du Chinois CP936"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
-msgstr "Taux de rafraîchissement de l'interface (fois par seconde):"
+msgstr "Taux de rafraîchissement de l’interface (fois par seconde) :"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
-msgstr "Barre de titre en lecture :"
+msgstr "Barre de titre en lecture :"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
-msgstr "Barre de titre à l'arrêt :"
+msgstr "Barre de titre à l’arrêt :"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr "Plugin du GUI (tout changement nécessite un redémarrage):"
+msgstr "Greffon de l’interface (tout changement nécessite un redémarrage) :"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Afficher le temps de lecture de la sélection dans la barre d’état"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "Lecteur"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr "fermer les listes de lecture avec le bouton du milieu de la souris"
+msgstr "Fermer les listes de lecture avec le bouton du milieu de la souris"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Afficher la piste courante en utilisant des caractères gras"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr "Masquer l’entrée « Supprimer du disque » du menu contextuel"
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr "Masquer l'entrée \"Supprimer du disque\" du menu contextuel"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Passer au morceau suivant lorsque celui en cours de lecture est supprimé du disque"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
-msgstr ""
-"Nommer automatiquement les listes de lecture à l'ajout d'un seul dossier"
+msgstr "Nommer automatiquement les listes de lecture à l’ajout d’un seul dossier"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr "Adapter automatiquement les colonnes à la fenêtre"
+msgstr "Redimensionner automatiquement les colonnes pour s’adapter à la fenêtre"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Espace entre les groupes :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pixels"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Liste de lecture"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
-msgstr "GUI/Divers"
+msgstr "Interface / Divers"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Redéfinir"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Premier plan"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Arrière-plan"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Couleurs de la barre de lecture/échelle du volume"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Fond"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Clair"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Sombre"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Base"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Texte"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Couleur des onglets"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Barres"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Arrière-plan (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Barre de lecture / Barre de volume / EQ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Base :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Sombre :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Clair :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Fond :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Texte :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Gras"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Italique"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Texte de lecture :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Texte sélectionné :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Bande d’onglet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Piste(s) normale(s) :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Piste de lecture :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Piste(s) sélectionnée(s) :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Colonnes :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "En-tête de groupe :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Premier plan :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Lignes paires :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Lignes impaires :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Ligne(s) sélectionnée(s) :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Curseur :"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Arrière-plan :"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses 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:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Lignes paires"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Lignes impaires"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Ligne sélectionnée"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Texte sélectionné"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Curseur"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Couleurs des listes de lecture"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Couleurs"
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr "Personnaliser la couleur de base de la visualisation"
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr "Couleur d’arrière-plan de la visualisation personnalisée"
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Visualisations"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Apparence"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Activer la médiathèque"
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "Ajouter / supprimer des dossiers de musique "
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Médiathèque"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Activer le serveur mandataire"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
-msgstr "Adresse du serveur mandataire :"
+msgstr "Adresse du serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
-msgstr "Port du serveur mandataire :"
+msgstr "Port du serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Type de serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
-msgstr "Nom d'utilisateur sur le serveur mandataire :"
+msgstr "Nom d’utilisateur sur le serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Mot de passe sur le serveur mandataire :"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr "HTTP User Agent:"
+msgstr "Agent utilisateur HTTP :"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr "Editer le Content-Type Mapping"
+msgstr "Éditer la table du type de contenu"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Réseau"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr "Raccourcis clavier définis:"
+msgstr "Raccourcis clavier définis :"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
-msgstr "Action:"
+msgstr "Action :"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Non défini>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
-msgstr "Combinaison de touches:"
+msgstr "Combinaison de touches :"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Raccourci général"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"Utiliser le bouton Appliquer pour sauvegarder les modifications, \n"
-"ou le bouton Rétablir pour les annuler.\n"
-"Les changements ne seront pas sauvegardés \n"
-"si vous ne cliquez pas sur Appliquer."
+msgstr "Utiliser le bouton « Appliquer » pour sauvegarder les modifications, \nou le bouton « Rétablir » pour les annuler.\nLes changements ne seront pas sauvegardés\nsi vous ne cliquez pas sur « Appliquer »."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr "_Défauts"
+msgstr "Par _défaut"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Raccourcis"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Version:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Configuration"
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Infos"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Licence"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Copyright"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Restaurer les paramètres par défaut"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Greffons"
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Version :"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL :"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Définir un titre personnalisé"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
-msgstr "Grouper par..."
+msgstr "Grouper par…"
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr "Classer par..."
+msgstr "Trier par…"
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Format"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Ascendant"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Descendant"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Choisir le plugin DSP"
-
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Greffon"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Ascendant\nDescendant"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
-msgstr "Paramètres de l'éditeur de tags"
+msgstr "Paramètres de l’éditeur de balise"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Écrire ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Écrire ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Écrire APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Effacer ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Effacer ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Effacer APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Version ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Recommandé)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Recommandé)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "Encodage des caractères ID3v1 (iso8859-1 par défaut)"
+msgstr "Codage des caractères ID3v1 (iso8859-1 par défaut)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Écrire ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr "Content-Type Mapping"
+msgstr "Table du type de contenu"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"Cette table définit la liaison entre les types de contenu de flux réseau et "
-"les greffons du décodeur de DeaDBeeF. Par exemple, les fichiers mp3 peuvent "
-"avoir le type de contenu \"audio/x-mpeg\", et avoir besoin d'être décodé par "
-"le propre greffon \"stdmpg\" de DeaDBeeF, ou le greffon \"ffmpeg\"."
+msgstr "Cette table définit la liaison entre les types de contenu de flux réseau et les greffons du décodeur de DeaDBeeF. Par exemple, les fichiers mp3 peuvent avoir le type de contenu « audio/x-mpeg », et avoir besoin d’être décodé par le propre greffon « stdmpg » de DeaDBeeF, ou le greffon « ffmpeg »."
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Revenir aux paramètres par défaut"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr "Type de Contenu"
+msgstr "Type de contenu :"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
-msgstr "Greffons:"
+msgstr "Greffons :"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Propriétés du bouton"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
-msgstr "Couleur:"
-
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Couleur du texte:"
+msgstr "Couleur :"
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
-msgstr "Icône:"
+msgstr "Icône :"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
-msgstr "Étiquette"
+msgstr "Étiquette :"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Choisir une action"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "Cette fenêtre permet de définir un titre personnalisé pour n’importe quelle piste. C’est essentiellement utile pour les stations de radio. Une option pour définir le titre personnalisé est aussi disponible dans la fenêtre « Ajouter un emplacement ». Le titre est visible dans les colonnes affichant le champ de métadonnées « Artiste ». Cela devrait ressembler à « custom artist » si le champ Artiste est présent, ou juste « custom »."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artiste / Album"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Éditer"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "N° piste"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Éditer (en place)"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr "Ajouter à la file d'attente de lecture"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Ajouter un nouveau champ…"
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr "Enlever de la file d'attente de lecture"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Édition des valeurs"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr "Recharger les métadonnées"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Nom du champ :"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr "Supprimer du disque"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Valeur du champ :"
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Ajouter une colonne"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Utiliser le caractère « ; » pour séparer plusieurs valeurs."
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Éditer la colonne"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "Journal de DeaDBeeF"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Enlever la colonne"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Effacer"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr "Épingler les groupes lors du défilement"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Analyse ReplayGain en cours"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Grouper par"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Fichier actuel :"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Aucun"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Statut"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Artiste/Date/Album"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Annuler"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Ouvrir un fichier..."
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Résultats de l’analyse ReplayGain"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Configurer %s"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Mettre à jour les balises de fichier"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Périphérique audio par défaut"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Afficher uniquement les greffons avec configuration"
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
-"Vous avez modifié les paramètres des raccourcis, mais vous n'avez pas "
-"sauvegarder les changements."
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr "Êtes-vous sûr de vouloir continuer sans avoir sauvegardé?"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Nom du champ :"
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Ajout des fichiers..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Initialisation..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Vous avez modifié des données pour cette piste."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Enregistrer les préréglages de l’égaliseur DeaDBeeF"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Fermer réellement la fenêtre ?"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Fichiers de préréglage d’égaliseur DeaDBeeF (*.ddbeq)"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Plusieurs valeurs"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Chargement des préréglages pour l’égaliseur DeaDBeeF…"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Clé"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Préréglages d’égaliseur DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Valeur"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importation des préréglages EQ de Foobar2000…"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Plusieurs valeurs"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Préréglages d’égaliseur Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Edition des tags..."
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Enregistrer les préréglages"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Nom du champ"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Charger des préréglages"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Nom:"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importer des préréglages de Foobar2000"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Les noms de champ ne doivent pas commencer par : ou _"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Activer"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Impossible d'ajouter le champ"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Tout à zéro"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Un champ avec le même nom existe, merci d'utiliser un nom différent."
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Préampli à zéro"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Ajouter un champ"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Bandes à zéro"
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Enlever le champ"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nouvelle liste de lecture"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Utilisation: deadbeef options -- fichier(s)\n"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Formats audio pris en charge"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Options :\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Tous les fichiers (*)"
 
-#: ../main.c:92
-#, 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"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Formats de liste de lecture pris en charge"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Tous les fichiers"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Fermer le lecteur\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Autres fichiers (*)"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Affiche les informations de version et quitte\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Fichiers de liste de lecture DeaDBeeF (*.dbpl)"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Démarre la lecture\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Suivre les liens symboliques"
 
-#: ../main.c:96
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Arrête la lecture\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 jour %d:%02d:%02d"
 
-#: ../main.c:97
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Suspend la lecture\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d jours %d:%02d:%02d"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr "--toggle-pause Mettre en pause\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "de temps d’écoute total"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "En pause"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bits"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "de temps d’écoute de la sélection"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Arrêté"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
-"--play-pause Jouer la piste si elle est arrêtée, mettre en pause sinon\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Renommer la liste de lecture"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Musique suivante dans la liste de lecture\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Suppression de la liste de lecture"
 
-#: ../main.c:101
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Musique précédente dans la liste de lecture\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Voulez-vous vraiment supprimer la liste de lecture « %s » ?"
 
-#: ../main.c:102
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Musique aléatoire dans la liste de lecture\n"
+msgid "New Playlist (%d)"
+msgstr "Nouvelle liste de lecture (%d)"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr ""
-" --queue Ajoute le(s) fichier(s) dans la liste existante\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Liste de lecture avec onglets"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
-"--gui GREFFON Indique le greffon GUI à utiliser, par défault \"GTK2\"\n"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Séparateur (haut et bas)"
 
-#: ../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"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Séparateur (gauche et droite)"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-syntaxe : artiste, titre, album,\n"
-" longueur, numéro de piste, yannée, "
-"commentaire,\n"
-" copyright, ecoulé\n"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Onglets"
 
-#: ../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"
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Onglets des listes de lecture"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Propriétés de la sélection"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Défaut"
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Affichage de la couverture de l’album"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Oui"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Oscilloscope"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Non"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spectre"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 des Items\n"
-"Lecture\n"
-"Couverture de l'album\n"
-"Artiste - Album\n"
-"Album\n"
-"Titre\n"
-"Durée\n"
-"Numéro de piste\n"
-"Artiste du groupe / de l'album\n"
-"Personnalisé"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Gauche\n"
-"Droite"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Bouton"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Barre de lecture"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Contrôles de lecture"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Barre de volume"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Voix chiptune"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Visionneur de journal"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Visionneur de médiathèque"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Impossible de lire le fichier d’aide"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Impossible de charger le fichier d’aide"
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Désactivé\n"
-"Piste\n"
-"Album"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Le lecteur est actuellement actif en tâche de fond. Si vous quittez maintenant, les tâches seront ignorées ou interrompues. Cela peut provoquer des pertes de données."
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Voulez-vous toujours quitter ?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Ascending\n"
-"Descending"
-msgstr ""
-"Ascendant\n"
-"Descendant"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Les fichiers seront déplacés vers la corbeille.\n\n(Cet avertissement peut être désactivé dans les paramètres du greffon GTKUI)"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
-msgstr ""
-"2.3 (Recommandé)\n"
-"2.4"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Les fichiers seront perdus.\n\n(Cet avertissement peut être désactivé dans les paramètres du greffon GTKUI)"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, 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 "Do you really want to delete the selected file?%s"
+msgstr "Voulez-vous vraiment supprimer le fichier sélectionné ? %s"
 
-#. 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/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr "Voulez-vous vraiment supprimer les %d fichiers sélectionnés ? %s"
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Rechercher sur Last.fm"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr "Voulez-vous vraiment supprimer les %d fichiers de la liste de lecture actuelle ? %s"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Utiliser le rééchantillonnage ALSA"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "Voulez-vous vraiment supprimer le fichier en cours de lecture ? %s"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Libérer l'appareil à l'arrêt"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Supprimer les fichiers du disque"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Taille de tampon préférée"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Supprimer"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Taille de période préférée"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Gauche"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Activer le scrobbler"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Droite"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Désactiver nowplaying"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Centre"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Nom d'utilisateu"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Mot de pass"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobbler l'URL"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Préférer l'Artiste de l'Album au champ Artiste"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Fichier de l'appareil"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Contournement du bug de la taille d'échantillon d'OSS4"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Par ordre de lecture"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Période de mise à jour du cache (hr)"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Piste"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Récupérer depuis les tags"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Sans"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Prendre dans un dossier local"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Appliquer le gain"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Masque de fichier local de jaquette"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Récupérer sur last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Récupérer sur albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Mettre la jaquette à l'échelle du côté le plus long"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Utiliser CDDB/FreeDB"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Appliquer le gain et empêcher la saturation"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Préférer CD-Text à CDDB"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Empêcher la saturation uniquement"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "URL CDDB (par exemple 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB numéro de port (par exemple '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Préférer le protocole CDDB à HTTP"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Ascendant"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Activer le support du format d'image NRG"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Descendant"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr ""
-"Qualité du rééchantillonnage (0..2, plus grand pour une meilleure qualité)"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Recommandé)"
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "Sortie 8-bit (Le défaut est 16)"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Durée maximale d'un morceau (minutes)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artiste / Album"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Durée du fadeout (secondes)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Piste"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Jouer les boucles nombre de fois (si disponible)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Durée"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Demander confirmation pour éffacer des fichiers du disque"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Index de l’élément"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Icône de statut du contrôle de la sensitivité du volume"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Lecture"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Icône de statut personnalisée"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Couverture de l’album"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Éxécuter gtk_init avec --sync (mode débug)"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artiste - Album"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr ""
-"Ajouter des séparateurs entre les entrées du menu contextuel de greffon"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Année"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Format de titre de notification"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Numéro de piste"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Format de contenu de notification"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Groupe / Artiste de l’album"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Montrer la couverture de l'album"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codec"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Taille de la couverture de l'album (px)"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Débit binaire"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Serveur PulseAudio"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Ajouter une colonne"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Taux d'échantillonnage"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Éditer la colonne"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Chemin de table de recherche relatif"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Supprimer la colonne"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Chemin de table de recherche absolu"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Épingler les groupes lors du défilement"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr ""
-"Permuter les octets audio (basculez si tout ce que vous entendez est "
-"statique)"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Grouper par"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Activer HVSC Songlenght DB"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artiste/Date/Album"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (de HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bits par échantillon (8 ou 16)"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Lecture suivante"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Lecture différée"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Longueur de morceau par défaut (sec)"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Supprimer de la file d’attente de lecture"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Banque de fichier de configuration Timidity++ bank"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Recharger les métadonnées"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Titre"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "_Couper"
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "Co_pier"
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "C_oller"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Interprète"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Supprimer du disque"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Pistes totales"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Supprimer la liste de lecture"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Genre"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Ajouter une nouvelle liste de lecture"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Compositeur"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Activer le tri automatique"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Numéro de disque"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr "Applique une nouvelle fois le dernier tri sélectionné lors de l’ajout de nouveaux fichiers à cette liste de lecture."
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Commentaires"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Ouvrir un ou des fichiers…"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Encodeur / Vendeur"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Configurer %s"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Emplacement"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Vous avez modifié les paramètres des raccourcis, mais vous n’avez pas enregistrer les changements."
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Index de sous-piste"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Voulez-vous vraiment continuer sans avoir enregistré ?"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Type(s) de tags"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Périphérique audio par défaut"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Cuesheet incorporée"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Ajout des fichiers…"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Codec"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Initialisation…"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Extensions de fichier (séparées par ';')"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Mise à jour des balises de fichier en cours"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Convertir"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nom"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Taux d'échantillonnage cible"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Gain album"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Gain piste"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Crête album"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Crête piste"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Opération réussie"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Fichier introuvable"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Fichier non valide"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Recherche (%liste_totale% résultats)"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Qualité / Algorithme"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Montrer les en-têtes de colonne"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr ""
-"Taux d'échantillonnage automatique (ignorer le taux d'échantillonnage cible)"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Valeur"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Vous avez modifié des données pour cette piste."
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Désactiver la lecture sans blanc (scan plus rapide)"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Vraiment fermer la fenêtre ?"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Préférer Ken emu à Satoh (surround ne fonctionnera pas)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Plusieurs valeurs "
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Activer surround"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Clé"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Plusieurs valeurs "
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Le fichier existe déjà. L'écraser?"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Écriture des balises…"
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Avertissement du convertisseur"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "Élément"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Veuillez sélectionner un encodeur"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Champ"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Erreur du convertisseur"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Nom du champ"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Conversion en cours..."
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Nom :"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Sélectionner un dossier..."
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Les noms de champ ne doivent pas commencer par : ou _"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Échec de sauvegarde du préréglage de l'encodeur"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Impossible d’ajouter le champ"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
-msgstr ""
-"Vérifier les permissions du dossier de préréglage, choisissez un nom "
-"différent, ou libérer de l'espace disque"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Un champ contenant le même nom existe déjà, merci d’utiliser un nom différent."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr ""
-"Un préréglage avec le même nom existe déjà. Essayez avec un nom différent."
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Le widget « %s » n’est pas disponible"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Erreur"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Remplacer par…"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Ajouter un nouvel encodeur"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Insertion…"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Éditer l'encodeur"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Couper"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Enlever le préréglage"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Copier"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Cette action va supprimer le préréglage sélectionné. Êtes-vous sûr?"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Coller"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Encodeurs"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Parent"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Ajouter le greffon à la chaîne DSP"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Plusieurs widgets de ce type ne sont pas pris en charge"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Échec de sauvegarde du préréglage DSP"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Redimensionnement proportionnel"
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Verrouiller la hauteur du volet supérieur"
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Verrouiller la largeur du volet gauche"
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Verrouiller la hauteur du volet inférieur"
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Verrouiller la largeur du volet droit"
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Renommer l’onglet"
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Supprimer l’onglet"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Nouveau préréglage DSP"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Ajouter un nouvel onglet"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Éditer le préréglage DSP"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Déplacer l’onglet vers la gauche"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Préréglages DSP"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Déplacer l’onglet vers la droite"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Dossier de destination:"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Écrire dans le dossier source de la piste"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Préserver la structure du dossier"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Nom de fichier de sortie :"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "Auto"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
-msgstr ""
-"L'extension (ex : .mp3) sera ajoutée automatiquement.\n"
-"Laissez le champ vide pour le réglage par défaut (%a - %t)"
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Encodeur :"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Préréglage DSP :"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Nombre de fils :"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Format d'échantillon de sortie :"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Garder le format source"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bits entiers signés"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bits entiers signés"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bits entiers signés"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bits entiers signés"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bits flottants"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Lorsque le fichier existe :"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Demander quoi faire"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Écraser"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Éditer le préréglage de l'encodeur"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Encodeur sans nom"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Extension de fichier de sortie :"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Ex: mp3"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Ligne de commande :"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
-"Exemple : lame - %o\n"
-"%i pour fichier d'entrée, %o pour fichier de sortie, - pour stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
-"%o - nom de fichier de sortie\n"
-"%i - nom de fichier d'entrée temporaire"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Méthode :"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Tube"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Fichier temporaire"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Développer la case d’un élément"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Réduire la case d’un élément"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogène"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Développer"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Remplir"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Configurer le bouton"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Éditeur d'étiquette"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Éditeur de préréglage DSP"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Préréglage DSP sans nom"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Ajouter"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Voix :"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Impossible de trouver le fichier pixmap : %s"
-
-#: ../plugins/converter/converter.glade.h:12
-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"
+msgid "Copy of %s"
 msgstr ""
-"Garder le format source\n"
-"8 bits entiers signés\n"
-"16 bits entiers signés\n"
-"24 bits entiers signés\n"
-"32 bits entiers signés\n"
-"32 bits flottants"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
-"Demander quoi faire\n"
-"Écraser"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
-"Tube\n"
-"Fichier temporaire"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr " (en pause)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr " (arrêté)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr " (en lecture)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dj %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Éléments"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Navigateur de liste de lecture"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr "Commandes personnalisées de l'interface"
-
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Éditer"
+msgstr "Commandes personnalisées de l’interface"
 
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
@@ -2093,7 +2621,7 @@
 #: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr "Commande :"
+msgstr "Commande :"
 
 #: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
@@ -2102,29 +2630,24 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"Commande d'interface arbitraire. Sera exécuté dans le contexte de "
-"l'interface de l'application principale qui a été démarrée. Le formatage de "
-"titre peut être utilisé. Exemple: xdg-open %D"
+msgstr "Commande d’interface arbitraire. Sera exécuté dans le contexte de l’interface de l’application principale qui a été démarrée. Le formatage de titre peut être utilisé. Exemple : xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr " Identification :"
+msgstr "Identification :"
 
 #: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr "Nom à structure libre, par exemple \"Ma commande d'interface\""
+msgstr "Nom à structure libre, par exemple « Ma commande d’interface »"
 
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"Commande d'identification, devrait être normalement quelque chose de court, "
-"par exemple \"youtube_open\". Cela doit être unique."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Commande d’identification, devrait être normalement quelque chose de court, par exemple « youtube_open ». Cela doit être unique."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2139,7 +2662,7 @@
 #: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
-msgstr "Plusieurs Pistes"
+msgstr "Plusieurs pistes"
 
 #: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
@@ -2164,7 +2687,7 @@
 #: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr "Fonctionne sur des fichiers distants (ex : http:// streams)"
+msgstr "Fonctionne sur des fichiers distants (ex : http:// streams)"
 
 #: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
@@ -2174,7 +2697,7 @@
 #: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
-msgstr "L'objet devrait apparaître dans le menu principal "
+msgstr "L’élément devrait apparaître dans le menu principal"
 
 #: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
@@ -2182,22 +2705,15 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
-"Si vous voulez ajouter la commande au menu principal, assurez-vous "
-"que le titre contienne le chemin de menu comme ceci: \"Fichier/Ma Commande"
-"\", où le fichier est le nom du menu dans la version anglaise."
+msgstr "Si vous voulez ajouter la commande au menu principal, assurez-vous que le titre contienne le chemin de menu comme celui-ci : « Fichier/Ma Commande », où Fichier est le nom du menu dans la version anglaise."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Ajouter une commande"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Supprimer"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "Cette action va supprimer le préréglage sélectionné. Êtes-vous sûr?"
+msgstr "Cette action va supprimer la commande d’interface sélectionnée. Continuer ?"
 
 #: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
@@ -2205,214 +2721,1255 @@
 
 #: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr "L'identification ne doit pas être vide et unique.\n"
+msgstr "L’identification ne doit pas être vide et unique.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr "Le titre ne doit pas être vide\n"
+msgstr "Le titre ne doit pas être vide.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr "La commande de l'interface ne doit pas être vide.\n"
+msgstr "La commande de l’interface ne doit pas être vide.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:248
 #: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
-msgstr "Valeurs invalides"
+msgstr "Valeurs non valides"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Formats de son supportés"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Tous les fichiers (*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stéréo"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Ouvrir un (des) fichier(s)..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Titre de la piste"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Ajouter un (des) fichier(s) à la liste de lecture..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Interprète"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Ajouter un (des) dossier(s) à la liste de lecture..."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Nombre de piste"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Suivre les liens symboliques"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Genre"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "aide.txt"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Compositeur"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Supprimer les fichiers du disque"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Numéro de disque"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Nombre de disque"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Commentaire"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Codeur / Vendeur"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Emplacement"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Index de sous-piste"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Type(s) de balise"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Cuesheet intégré"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr "Nom du démon distant de PipeWire (vide pour les réglages par défaut)"
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr "Propriétés personnalisées (remplace les propriétés existantes) :"
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr "Utiliser le contrôle du volume de PipeWire"
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Préférer Ken emu à Satoh (surround ne fonctionnera pas)"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Activer surround"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Utiliser le rééchantillonnage ALSA"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Taille de tampon préférée"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Taille de période préférée"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr "Actualiser la pochette"
+
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Récupérer depuis les balises intégrées"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Récupérer depuis un dossier local"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Récupérer depuis Last.fm"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Récupérer depuis MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Récupérer depuis Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "Récupérer depuis World of Spectrum (fichiers AY)"
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Enregistrer les fichiers téléchargés dans les dossiers de musique"
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Si aucune pochette n’a été trouvée"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "laisser vide"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "utiliser la pochette par défaut de DeaDBeeF"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "afficher une image personnalisée"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Chemin d’images personnalisées"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "Enregistrer sous le nom de fichier"
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr "Masques de recherche (séparés par « ; »)"
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr "Dossiers de recherche (séparés par « ; »)"
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "Actualisation du cache (heures)"
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "Noms de fichiers de cache simplifiés"
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Taille d’image"
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "Lecteur CD à charger"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Lecteur de CD audio"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Fichier"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Ajouter un CD audio"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
-"Les fichiers seront perdus. Procéder ?\n"
-"(Ce dialogue peut être désactivé dans les paramètres du greffon GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Charger une liste de lecture"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Préférer CD-Text à CDDB"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Autres fichiers (*)"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Enregistrer la liste de lecture sous"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Fichiers de liste de lecture DeaDBeeF (*.dbpl)"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Utiliser le protocole CDDB"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Type de contenu"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Activer la prise en charge du format d’image NRG"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Valeur(s) invalide(s)."
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Vitesse du lecteur pour une lecture normale"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Max"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Utiliser la correction d’erreurs cdparanoia pendant l’extraction"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Convertir"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Détecter automatiquement la fréquence d’échantillonnage du périphérique de sortie"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Définir la fréquence d’échantillonnage directement"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Qualité / Algorithme"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Qualité de rééchantillonnage"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Volume DUMB interne"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Augmentation du volume"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Marche/arrêt seulement"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Complète"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "Sortie 8 bits"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Utiliser toutes les extensions prises en charge par ffmpeg"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Extensions de fichier (séparées par « ; »)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
-"Les champs des greffons et type de contenu ne doivent pas être vide, et "
-"doivent respecter les règles.\n"
-"Exemple de type de contenu: 'audio/mpeg'.\n"
-"Exemple de greffon ids: 'stdmpg ffmpeg'.\n"
-"Les espaces doivent être utilisés comme des séparateurs dans la liste de "
-"greffon ids.\n"
-"Le type de contenu doit seulement être des lettres, des numéros et le signe "
-"'-'.\n"
-"Le greffon id peut seulement contenir des lettres et des numéros."
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Rien n'a été sélectionné"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Ignorer les erreurs de mauvais en-tête"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr "Le gadget \"%s\" n'est pas disponible"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Ignorer les erreurs de flux non analysables"
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Remplacer par..."
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Durée maximale d’un morceau (minutes)"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Insérer..."
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Durée du fondu en fermeture (secondes)"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Couper"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Lire les boucles nombre de fois (si disponible)"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Copier"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "BIOS ColecoVision (pour les formats de fichier SGC)"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Coller"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr "Plusieurs gadgets de ce type ne sont pas pris en charge"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Supprimer les informations ReplayGain"
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Verrouiller tout déplacement"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Déplacer l'onglet vers la gauche"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Déplacer l'onglet vers la droite"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Enlever l'onglet"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Renommer l'onglet"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Analyser la sélection en tant qu’albums (par balises)"
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Ajouter un nouvel onglet"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Analyser la sélection en tant qu’album seul"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Montrer les en-têtes de colonne"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Analyser le gain de piste par fichier"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Développer la boîte par 1 objet"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "Réduire la boîte par 1 objet"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Analyser le gain de piste par fichier (si non analysé)"
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Homogène"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Tout désélectionner"
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Développer"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Tout sélectionner"
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Remplir"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Ajouter un emplacement"
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Configurer le bouton"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Ajouter un ou plusieurs dossiers"
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr "Voix :"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Ajouter un ou plusieurs fichiers"
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Éditer la liste de lecture"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Ouvrir un ou plusieurs fichiers"
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Renommer la liste de lecture"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Afficher la page d’aide"
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Enlever la liste de lecture"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Mode répétition"
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Ajouter une nouvelle liste de lecture"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Répétition - Désactivée"
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Nom"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Répétition - Piste seule"
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Navigateur de liste de lecture"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Répétition - Tout"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Mode aléatoire"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Aléatoire - Mélanger les pistes"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Aléatoire - Albums"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Aléatoire - Pistes"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Aléatoire - Désactivé"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "La sélection suit la lecture"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Le défilement suit la lecture"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Affichage"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Afficher\\/Masquer le menu"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Afficher\\/Masquer la barre d’état"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Basculer le mode design"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Tri personnalisé"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Découper la sélection"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr "Supprimer la ou les pistes de la liste de lecture"
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Enregistrer la liste de lecture"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Supprimer la liste de lecture actuelle"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "Renommer la liste de lecture actuelle"
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Afficher\\/Masquer l’égaliseur"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Masquer l’égaliseur"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Afficher l’égaliseur"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Afficher\\/Masquer la fenêtre du lecteur"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Masquer la fenêtre du lecteur"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Afficher la fenêtre du lecteur"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Rechercher"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Afficher\\/Masquer la fenêtre du journal"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Demander confirmation pour effacer des fichiers du disque"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "Paramètres de l’icône de statut :"
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Icône de statut du contrôle de la sensibilité du volume"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Icône de statut personnalisée"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr "Divers :"
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Ajouter des séparateurs entre les entrées du menu contextuel de greffon"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Utiliser des caractères Unicode plutôt que des images pour l’état de la piste"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Désactiver le texte en surimpression de la barre de lecture"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "Dupliquer la liste de lecture"
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr "Passer à la piste en cours de lecture"
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Passer à"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Genre précédent"
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Compositeur précédent"
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Artiste précédent"
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Album précédent"
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Genre suivant"
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Compositeur suivant"
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Artiste suivant"
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "Album suivant"
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Liste de lecture suivante"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Liste de lecture précédente"
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "Basculer vers la liste de lecture 10"
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr "Basculer vers la liste de lecture 9"
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "Basculer vers la liste de lecture 8"
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Basculer vers la liste de lecture 7"
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "Basculer vers la liste de lecture 6"
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Basculer vers la liste de lecture 5"
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Basculer vers la liste de lecture 4"
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Basculer vers la liste de lecture 3"
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Basculer vers la liste de lecture 2"
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Basculer vers la liste de lecture 1"
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Trier aléatoirement"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Trier par date"
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Trier par artiste"
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Trier par album"
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Trier par numéro de piste"
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Trier par titre"
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Inverser la sélection"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Effacer la liste de lecture"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr "Ajouter à la file d’attente de lecture"
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr "Ajouter au début de la file d’attente de lecture"
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr "Basculer dans la file d’attente de lecture"
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Déplacer"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Déplacer les pistes vers le bas"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Déplacer les pistes vers le haut"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Couper le son"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Mettre en pause"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Lecture\\/Pause"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Avancer d’une seconde"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Reculer d’une seconde"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Avancer de cinq secondes"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Reculer de cinq secondes"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Positionner 1 % en avant"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Positionner 1 % en arrière"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Positionner 5 % en avant"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Positionner 5 % en arrière"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Augmenter le volume"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Diminuer le volume"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Arrêter après la piste actuelle"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Arrêter après l’album actuel"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr "Rechercher sur Last.fm"
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Activer le scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Désactiver nowplaying"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Nom d’utilisateur"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Mot de passe"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobbler l’URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Préférer « Artiste de l’album » au champ « Artiste »"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Envoyer l’ID de MusicBrainz"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Soumettre les pistes inférieures à 30 secondes (non recommandé)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Mix gauche"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Mix droit"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Forcer la sortie à 16 bits"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Moteur"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Format de titre de notification"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Format de contenu de notification"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Afficher la couverture de l’album"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Taille de la couverture de l’album (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Fichier du périphérique"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Surligner la liste de lecture actuelle"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Démarrer la lecture avec un double-clic"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Taille du tampon (-1 pour utiliser la valeur optimale choisie par portaudio)"
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Défini ci-dessous"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "Serveur PulseAudio (laisser vide pour le réglage par défaut)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Durée de morceau par défaut (en minutes)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Taux d’échantillonnage"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Ignorer les durées inférieures à (en seconde) "
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Configurer les commandes personnalisées de l’interface"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Chemin de table de recherche relatif"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Chemin de table de recherche absolu"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Permuter les octets audio (basculez si tout ce que vous entendez est statique)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Activer HVSC Songlenght DB"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Chemin complet vers Songlengths.md5/.txt"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Bits par échantillon"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Longueur de morceau par défaut (sec)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Synthé mono"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Activer la journalisation"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Préampli"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1,2 K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1,8 K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2,5 K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3,5 K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5 K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7 K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10 K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14 K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20 K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Banque de fichier de configuration Timidity++ bank"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "Extension de fichier"
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr "Tube (stdin)"
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "Fichier temporaire"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "Fichier source"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-0.6.2.tar.bz2/po/gl.po -> deadbeef-1.9.6.tar.bz2/po/gl.po Changed

@@ -1,2087 +1,2604 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# antiparvos <marcoslansgarza@gmail.com>, 2013-2014
+# antiparvos, 2013-2014,2016
 # Miguel Anxo Bouzada <mbouzada@gmail.com>, 2010
 # Miguel Anxo Bouzada <mbouzada@gmail.com>, 2010,2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:16+0000\n"
-"Last-Translator: antiparvos <marcoslansgarza@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/gl/)\n"
-"Language: gl\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>, 2010,2014\n"
+"Language-Team: Galician (http://app.transifex.com/deadbeef-player/deadbeef-player/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Sobre DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Uso: deadbeef opcións -- ficheiro(s)\n\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Cambios en DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Opcións:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Tradutores de DeaDBeeF"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ou -h Amosar a axuda (esta mensaxe) e saír\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Gardar os axustes de ecualización de DeaDBeeF"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Pechar o reprodutor\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Ficheiros de axustes de ecualización de DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Amosar a versión e saír\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Cargar os axustes de ecualización de DeaDBeeF..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Iniciar a reprodución\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Axustes de ecualización de DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Deter a reprodución\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importar os axustes de ecualización de Foobar2000..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pausar a reprodución\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Axustes de ecualización de Foobar2000 (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Inverter a pausa\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Gardar os axustes"
+#: ../src/main.c:143
+#, 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"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Cargar os axustes"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Seguinte canción da lista de reprodución\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importar os axustes de Foobar2000"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Canción anterior da lista de reprodución\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Activar"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Canción ao chou da lista de reprodución\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Restabelecer todo"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Engadir ficheiro(s) á lista de reprodución existente\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Restabelecer o preamplificador"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN indica que engadido de interface de usuario usar, o predeterminado é «GTK2»\n\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Restabelecer as bandas"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Amosar o nome da pista formatado por stdout\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Axustes"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-sintaxe: a: Artista, t: Título, b: Álbum,\n l: Duración, n: Pista, y: Ano, c: Comentario,\n r: Copyright, e: Tempo restante\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 día %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " exemplo: --nowplaying \"%%a - %%t\" imprimiría \"artista - título\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d días %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "para obter máis información, vexa %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Detido | %d pistas | Tempo total: %s"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " NOTA: --nowplaying está obsoleto.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT imprime o nome formatado da pista no stdout, usando o farmatado do novo título\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Estéreo"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " exemplo: --nowplaying-tf \"%%artist%% - %%title%%\" imprimiría \"artista - título\"\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pausado | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d pistas | Tempo total: %s"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nova lista de reprodución"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Nova lista de reprodución (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Listas con lapelas"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Lista de reprodución"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Separador (arriba e abaixo)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Separador (esquerda e dereita)"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Predeterminado"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Lapelas das listas"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Propiedades da selección"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Mostrar portadas"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Si"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Scope"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Non"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Spectrum"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Cartafol de saída:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Escribir no cartafol da pista de orixe"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Conservar a estrutura do cartafol"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Botón"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr "Barra de busca"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr "Controis de reprodución"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Nome do ficheiro de saída:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "Barra de volume"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr "Voces Chiptune"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Codificador"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Produciuse un fallo ao ler o ficheiro de axuda"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Axuste DSP"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Produciuse un fallo ao cargar o ficheiro de axuda"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Número de fíos:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Formato da mostra de saída"
+
+#: ../plugins/converter/converter.glade.h:14
+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 o formato de orixe\nenteiro con signo de 8 bits\nenteiro con signo de 16 bits\nenteiro con signo de 24 bits\nenteiro con signo de 32 bits\nflontante de 32 bits"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Cando o ficheiro xa existe:"
+
+#: ../plugins/converter/converter.glade.h:21
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Saltar\nPreguntar\nSubstituír"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Editar os axustes do codificador"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Título:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Codificador sen título"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Extensión do ficheiro de saída:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "P.ex. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Liña de ordes:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-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/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Método:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
-"O reprodutor está executando tarefas en segundo plano. Se sae agora, as "
-"tarefas cancelaranse ou interrumpiranse e é posíbel que se perdan datos."
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Aínda desexa saír?"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Escritor de etiquetas"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Editor de axustes DSP"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Título"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Axuste DSP sen título"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Engadir"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Retirar"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Configurar"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Escolla o engadido DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Engadido"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Axustes"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Integrado %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Este ficheiro xa existe. Quere sobrescribilo?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Aviso do convertedor"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Escolla o codificador"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Produciuse un erro no convertedor"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Convertendo"
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Seleccionar cartafol"
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Produciuse un fallo ao gardar os axustes do codificador"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+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:971 ../plugins/converter/convgui.c:1542
+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:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Erro"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Engadir un novo codificador"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Editar o codificador"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Retirar o axuste"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+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:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Codificadores"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Engadir un «engadido» á cadea DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Non foi posíbel gardar o axuste DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Novo axuste DSP"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Editar o axuste DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Axustes DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Axuda"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Manter o formato da orixe"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit asinados int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit asinados int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit asinados int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit asinados int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit flotantes"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Saltar"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Preguntar"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Sobrescribir"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Canalización"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Non se atopou o ficheiro de imaxe: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Abrir ficheiro(s)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Engadir ficheiro(s) á lista..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Engadir cartafol(es) á lista..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "axuda.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Cargar lista de reprodución"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Gardar a lista como"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Sobre DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Cambios en DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Tradutores de DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Tipo de contido"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Engadidos"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Valor(es) incorrectos."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Os campos do tipo de contido e dos engadidos non poden quedar baleiros e deben cumprir as regras.\nExemplo de tipo de contido: «audio/mpeg».\nExemplo de tipo de contido: «stdmpg ffmpeg».\nOs espazos deben usarse como separadores na lista de ID dos engadidos.\nO tipo de contido só debe levar letras, números e o signo «-».\nO ID do engadido só debe levar letras e números."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Non se seleccionou nada."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Abrir ficheiro(s)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Engadir ficheiro(s)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Engadir cartafol(es)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Engadir localización"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Nova lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Cargar a lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Gardar a lista de reprodución"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Desmarcar todo"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Inverter a selección"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Selección"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Retirar"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Buscar"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Título"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Número de pista"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Álbum"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Interprete"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Ao chou"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Barra de estado"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Ecualizador"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Modo deseño"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Reproducir"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Orden"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Lineal"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Barallar pistas"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Barallar álbums"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Repetir"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Repetir todas"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Repetir canción"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Non repetir"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Desprazar á seguinte reprodución"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Punteiro na seguinte reprodución"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
 msgstr "Parar despois da pista actual"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
 msgstr "Deter ao rematar o álbum actual"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Ir á pista actual"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Axuda"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Cambios"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Tradutores"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Buscar"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Deter"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Reproducir ao chou"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Saír"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Axuda"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Propiedades da pista"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Localización:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Título:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Aceptar"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Escriba aquí o novo título da columna"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Índice de elementos"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Reproducindo"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Portada"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Interprete - Álbum"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Duración"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Pista numero"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Banda / Interprete do álbum"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Aliñamento"
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Esquerda"
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Dereita"
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Aliñamento"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Esquerda\nDereita\nCentro"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_Aceptar"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Cor do texto:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Engadido de saída:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Dispositivo de saída:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Converter sempre o son de 8 bits a 16 bits"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Converter sempre o son de 16 bits a 24 bits"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Son"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Modo de normalización de volume"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Desactivar"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Pista"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Escala de límite de normalización de volume"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Normalización de volume do preamplificador:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Preamplificación global:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
 msgstr ""
-"Engadir ficheiros desde a liña de ordes (ou xestor de ficheiros) a esta "
-"lista de reprodución:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+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:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Continuar a sesión anterior no inicio"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Non engadir desde ficheiros cando se engaden cartafoles"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
-"A opción «Parar despois da pista actual» desactivarase despois da acción"
+msgstr "A opción «Parar despois da pista actual» desactivarase despois da acción"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
-"A opción «Parar despois do álbum actual» desactivarase despois da acción"
+msgstr "A opción «Parar despois do álbum actual» desactivarase despois da acción"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Reprodución"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "Cadeas DSP predefinidas"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Cargar"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Pechar minimizado na área de notificación"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Agochar a icona da área de notificación"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr "Activar detección e recodificacón do SHIFT-JIS xaponés"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Activar a detección e recodificación do Ruso CP1251"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Activar a detección e recodificación do Chinés CP936"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Frecuencia de actualización da interface (veces por segundo):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Texto da barra de título cando se reproduce:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Texto da barra de título cando está detido:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Engadido de interface de usuario (require reiniciar):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "Reprodutor"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr "Pechar as listas de reprodución co botón central do rato"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Resaltar a pista en reprodución usando tipografía grosa."
-
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr "Agochar o elemento «Eliminar do disco» do menú contextual"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
-"Nomear automaticamente as listas de reprodución ao engadir un só cartafol"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Nomear automaticamente as listas de reprodución ao engadir un só cartafol"
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr "Adaptar as columnas para que se axusten a xanela"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Lista de reprodución"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "GUI/Misc"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
-msgstr "Anular"
+msgstr "Substituír"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Base:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Escuro:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Claro:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Medio:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Texto:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Grosa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Cursiva"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Texto na reprodución:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Texto seleccionado:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Barra das lapelas"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Pista(s) normais:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Reproducindo pista:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Pista(s) seleccionadas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Columnas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Cabeceira do grupo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Primeiro plano:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Par:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Impar:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Seleccionado:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Cursor:"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Fronte"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Fondo"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Cores das barras de busca/volume"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Medio"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Claro"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Escuro"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Base"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Texto"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Cores das lapelas"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Cambiar (ignora o tema GTK, mais acelera o debuxado)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Fila par"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Fila impar"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Fila seleccionada"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Texto seleccionado"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Cursor"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Cores da lista de reprodución"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Cores"
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Fondo:"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Substituír (mellora o procesamento pero perde a vista en árbore de GTK)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Aparencia"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Activar o servidor proxy"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Enderezo do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Porto do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Tipo de proxy:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Nome de usuario do proxy:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Contrasinal do proxy:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "Axente do usuario HTTP:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "Editar a asignación do tipo de contido"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Rede"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "Teclas rápidas asignadas:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Acción:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Sen estabelecer>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Combinación de teclas:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Tecla rápida global"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"Use o botón «Aplicar» para gardar os cambios\n"
-"ou o botón «Reverter» para desfacelos.\n"
-"Os cambios NON se gardarán se non\n"
-"preme «Aplicar»."
+msgstr "Use o botón «Aplicar» para gardar os cambios\nou o botón «Reverter» para desfacelos.\nOs cambios NON se gardarán se non\npreme «Aplicar»."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "_Predeterminados"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Teclas rápidas"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Versión: "
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Dereitos de autor"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Engadidos"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Restabelecer predeterminados"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versión: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
 msgstr "Estabelecer título personalizado"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Agrupar por..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Ordenar por..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Formato"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Ascendente"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Descendente"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Escolla o engadido DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Engadido"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Ascendente\nDescendente"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Configuración do editor de etiquetas"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Escribir ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Escribir ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Escribir APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Eliminar ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Eliminar ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Eliminar APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Versión de ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (recomendado)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (recomendado)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codificación de caracteres de ID3v1 (por omisión é iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Escribir ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "Asignación do tipo de contido"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"Esta táboa define as asignacións entre os tipos de contido de fluxos de rede "
-"e os engadidos decodificadores de DeaDBeeF. Por exemplo, os ficheiros mp3 "
-"poden ter un tipo de contido «audio/x-mpeg» e precisan decodificarse polos "
-"engadidos propios de DeaDBeeF stdmpg ou ffmpeg."
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Restabelecer predeterminados"
+msgstr "Esta táboa define as asignacións entre os tipos de contido de fluxos de rede e os engadidos decodificadores de DeaDBeeF. Por exemplo, os ficheiros mp3 poden ter un tipo de contido «audio/x-mpeg» e precisan decodificarse polos engadidos propios de DeaDBeeF stdmpg ou ffmpeg."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "Tipo de contido:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Engadidos:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Propiedades do boton"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Cor:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Cor do texto:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Icona:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Seleccionar acción"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
+msgstr "Este diálogo permite personalizar o título de calquera pista. Moi útil nas emisoras de radio. Tamén existe unha opción para personalizar o título no diálogo «Engadir localización». O título verase nas columnas que mostran o campo dos metadatos do «Artista». Aparecerá como «Artista personalizado» se existe o campo Artista, do contrario aparecerá unicamente «personalizado»."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Editar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
 msgstr ""
-"Este diálogo permite personalizar o título de calquera pista. Moi útil para "
-"emisoras de radio. Tamén hai unha opción para personalizar os títulos no "
-"diálogo «Engadir localización». O título verase nas columnas que mostran o "
-"campo dos metadatos do «Artista». Aparecerá como personalización artista "
-"se se mostra o campo Artista ou só «personalización» en caso contrario."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Interprete / Álbum"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Pista num."
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr "Engadir á cola de reprodución"
-
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr "Eliminar da cola de reprodución"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr "Recargar os metadatos"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr "Eliminar do disco"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Engadir columna"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Editar columna"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Retirar columna"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr "Fixar os grupos ao desprazarse"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Agrupar por"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Ningún"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Interprete/Data/Álbum"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Abrir ficheiro..."
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Configurar %s"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Dispositivo de son predeterminado"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr "Modificou os axustes das teclas rápidas pero non gardou os cambios."
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr "Desexa continuar sen gardar?"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Engadindo ficheiros,,,"
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Iniciando..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Vostede modificou os datos desta pista."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Gardar os axustes de ecualización de DeaDBeeF"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Ten certeza de que quere pechas esta xanela?"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Ficheiros de axustes de ecualización de DeaDBeeF (*.ddbeq)"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Valores múltiples "
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Cargar os axustes de ecualización de DeaDBeeF..."
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Tecla"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Axustes de ecualización de DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Valor"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importar os axustes de ecualización de Foobar2000..."
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Varios valores"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Axustes de ecualización de Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Escribindo etiquetas"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Gardar os axustes"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Nome do campo"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Cargar os axustes"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Nome:"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importar os axustes de Foobar2000"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Os nomes dos campos non deben comezar con «:» ou «_»"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Activar"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Non é posíbel engadir o campo"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Restabelecer todo"
 
-#: ../plugins/gtkui/trkproperties.c:784
-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/eq.c:327
+msgid "Zero Preamp"
+msgstr "Restabelecer o preamplificador"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Engadir campo"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Retirar campo"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Restabelecer as bandas"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nova lista de reprodución"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Formatos compatíbeis de son"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Todos os ficheiros (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
 msgstr ""
-"Uso: deadbeef opcións -- ficheiro(s)\n"
-"\n"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opcións:\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help ou -h Amosar a axuda (esta mensaxe) e saír\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Outros ficheiros (*)"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Pechar o reprodutor\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Ficheiros de listas de reprodución e DeaDBeeF (*.dbpl)"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Amosar a versión e saír\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Seguir ligazóns simbólicas"
 
-#: ../main.c:95
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --play Start playback\n"
-msgstr " --play Iniciar a reprodución\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 día %d:%02d:%02d"
 
-#: ../main.c:96
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Deter a reprodución\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d días %d:%02d:%02d"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pausar a reprodución\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Inverter a pausa\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
 msgstr ""
-" --play-pause Iniciar a reprodución se se detén, ou pola contra "
-"inverter a pausa\n"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Seguinte canción da lista de reprodución\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Canción anterior da lista de reprodución\n"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Canción ao chou da lista de reprodución\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Renomear a lista"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
 
-#: ../main.c:103
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --queue Append file(s) to existing playlist\n"
+msgid "Do you really want to remove the playlist '%s'?"
 msgstr ""
-" --queue Engadir ficheiro(s) á lista de reprodución existente\n"
 
-#: ../main.c:104
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
+msgid "New Playlist (%d)"
+msgstr "Nova lista de reprodución (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Listas con lapelas"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Separador (arriba e abaixo)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Separador (esquerda e dereita)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Lapelas"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Lapelas das listas"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Propiedades da selección"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Mostrar portadas"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spectrum"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Botón"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Barra de busca"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Controis de reprodución"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Barra de volume"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Voces Chiptune"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Produciuse un fallo ao ler o ficheiro de axuda"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Produciuse un fallo ao cargar o ficheiro de axuda"
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "O reprodutor está executando tarefas en segundo plano. Se sae agora, as tarefas cancelaranse ou interrumpiranse e é posíbel que se perdan datos."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Aínda desexa saír?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-" --gui PLUGIN indica que engadido de interface de usuario usar, o "
-"predeterminado é «GTK2»\n"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
 "\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../main.c:105
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Amosar o nome da pista formatado por stdout\n"
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
 
-#: ../main.c:106
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
 #, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-" FMT %%-sintaxe: a: Artista, t: Título, b: Álbum,\n"
-" l: Duración, n: Pista, y: Ano, c: Comentario,\n"
-" r: Copyright, e: Tempo restante\n"
 
-#: ../main.c:109
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
 #, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
-" e.g.: --nowplaying «%%a - %%t» amosaría: «interprete - "
-"título»\n"
 
-#: ../main.c:110
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
 #, c-format
-msgid " for more info, see %s\n"
-msgstr "para obter máis información, vexa %s\n"
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Predeterminado"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Si"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Eliminar"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Non"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Esquerda"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Índice de elementos\n"
-"Reproducindo\n"
-"Portada do álbum\n"
-"Interprete - Álbum\n"
-"Interprete\n"
-"Álbum\n"
-"Título\n"
-"Duración\n"
-"Número de pista\n"
-"Banda / Intreprete do álbum\n"
-"Personalizado"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Dereita"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Centro"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
 msgstr ""
-"Esquerda\n"
-"Dereita"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 msgstr ""
-"Desactivar\n"
-"Pista\n"
-"Álbum"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
 msgstr ""
-"Ascendente\n"
-"Descendente"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
-"2.3 (recomendado)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
 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
-#: ../translation/extra.c:3
-msgid "Add Audio CD"
-msgstr "Engadir CD de son"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Buscar en Last.fm"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Pista"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Utilizar unha nova mostraxe ALSA"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Ningún"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Liberar o dispositivo cando está detido:"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Tamaño preferido do búfer"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Tamaño preferido do período"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Activar «Compartir escoitas»"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Ascendente"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Desactivar en reprodución"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Descendente"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Nome de usuario"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (recomendado)"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Contrasinal"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "URL de «Compartir escoitas»"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Interprete / Álbum"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Preferir Álbum Artista sobre o campo Artista"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Pista num."
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Ficheiro de dispositivo"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Duración"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Solución de erros de mostraxe OSS4"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Índice de elementos"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Período de actualización (hr)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Reproducindo"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Obter a partir das etiquetas"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Portada"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Obter dun cartafol local"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Interprete - Álbum"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Máscara de portada local"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Obter en Last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Obter en albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Cara máis longa das portadas a escala"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Usar CDDB/FreeDB"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Preferir CD-Text a CDDB"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Pista numero"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (p.ex. «freedb.org»)"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Número do porto CDDB (p.ex. «888»)"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Preferir o protocolo CDDB ao HTTP"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Banda / Interprete do álbum"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Activar compatibilidade coas imaxes NRG"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Códec"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Calidade de sobremostraxe (0..2, maior é mellor)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "Saída de 8-bit (a predeterminada é de 16)"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Duración máxima da canción (en minutos)"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Engadir columna"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Duración do esvaecemento (segundos)"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Editar columna"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Repetir nº de veces (se está dispoñíbel)"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Retirar columna"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Pedir confirmación para eliminar ficheiros do disco"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Fixar os grupos ao desprazarse"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Sensibilidade ao control de volume na icona de estado"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Agrupar por"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Icona de estado personalizada"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Interprete/Data/Álbum"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Executar gtk_init com --sync (modo de depuración)"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
 msgstr ""
-"Engadir separadores entre os engadidos nos elementos do menú contextual"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Formato do título de notificación"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Formato do contido de notificación"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Recargar os metadatos"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Amosar a portada"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Tamaño da portada (px)"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Servidor PulseAudio"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Taxa de mostraxe"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Ruta relativa da táboa de referencia"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Eliminar a lista"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Ruta absoluta da táboa de referencia"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Engadir un lista de reprodución"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Intercambio de bytes de son (cambie só se a escoita é estática)"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Activar HVSC Songlength DB"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (para HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bits por mostra (8 ou 16)"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Abrir ficheiro..."
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Duración predeterminada da canción (segs.)"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Configurar %s"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Ficheiro de configuración do banco Timidity++"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Modificou os axustes das teclas rápidas pero non gardou os cambios."
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Título da pista"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Desexa continuar sen gardar?"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Interprete"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Dispositivo de son predeterminado"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Total de pistas"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Engadindo ficheiros,,,"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Xénero"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Iniciando..."
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Compositor"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Número de disco"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nome"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Comentario"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Codificador / Provedor"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Lugar"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Índice de subpista"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tipo de etiqueta(s)"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Folla de información incrustada"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Códec"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Extensións de ficheiros (separadas por «;»)"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Buscar (%list_total% resultados)"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Converter"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Amosar as cabeceiras das columnas"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Destino da mostraxe"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Valor"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Calidade / Algoritmo"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Vostede modificou os datos desta pista."
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Mostraxe automática (sobrescribe o destinos das mostraxes)"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Ten certeza de que quere pechas esta xanela?"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr "Configurar ordes por terminal personalizadas"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Valores múltiples "
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Desactivar a reprodución sen pausas (escaneo máis rápido)"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Tecla"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Preferir Ken emu a Satoh (o son envolvente non funcionará)"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Varios valores"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Activar son envolvente"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Escribindo etiquetas"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr "Integrado %s"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Este ficheiro xa existe. Quere sobrescribilo?"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Aviso do convertedor"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Nome do campo"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Escolla o codificador"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Produciuse un erro no convertedor"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Os nomes dos campos non deben comezar con «:» ou «_»"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Convertendo"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Non é posíbel engadir o campo"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Seleccionar cartafol"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Xa existe un campo con este nome, tente con outro diferente."
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Produciuse un fallo ao gardar os axustes do codificador"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "O miniaplicativo «%s» non está dispoñíbel"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Substituír con..."
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Inserir..."
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Cortar"
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Pegar"
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
-"Comprobe os permisos predeterminados do cartafol, tente escoller outro "
-"título, ou liberar algo de espazo no disco"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-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/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Múltiples miniaplicativos deste tipo non son compatíbeis"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Erro"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Engadir un novo codificador"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Editar o codificador"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Retirar o axuste"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Esta acción elimina o axuste seleccionado. Está vostede seguro?"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Codificadores"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Engadir un «engadido» á cadea DSP"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Non foi posíbel gardar o axuste DSP"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Novo axuste DSP"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Editar o axuste DSP"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Axustes DSP"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Cartafol de saída:"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Escribir no cartafol da pista de orixe"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Conservar a estrutura do cartafol"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Nome do ficheiro de saída:"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "2x"
 msgstr ""
-"A extensión (p.ex. mp3) engadirase automaticamente.\n"
-"Deixar o campo baleiro de xeito predeterminado (%a -%t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Codificador"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Axuste DSP"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Número de fíos:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Formato da mostra de saída"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Manter o formato da orixe"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit asinados int"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit asinados int"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit asinados int"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit asinados int"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit flotantes"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Cando o ficheiro xa existe:"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Preguntar"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Sobrescribir"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Editar os axustes do codificador"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Codificador sen título"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Extensión do ficheiro de saída:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "P.ex. mp3"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Liña de ordes:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 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:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
-"%o - nome do ficheiro de saída\n"
-"%i - nome do ficheiro temporal de entrada"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Método:"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Canalización"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Ficheiro temporal"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homoxéneo"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Expandir"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Encher"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Escritor de etiquetas"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Editor de axustes DSP"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Axuste DSP sen título"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Voces:"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Engadir"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/hotkeys/actionhandlers.c:827
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Non se atopou o ficheiro de imaxe: %s"
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
-"Manter o formato de orixe\n"
-"enteiro con signo de 8 bits\n"
-"enteiro con signo de 16 bits\n"
-"enteiro con signo de 24 bits\n"
-"enteiro con signo de 32 bits\n"
-"flontante de 32 bits"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
-"Aviso\n"
-"Sobrescribir"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
-"Canalización\n"
-"Ficheiro temporal"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Elementos"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Explorador de listas de reprodución"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "Ordes por terminal personalizadas"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Editar"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2104,10 +2621,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"Orde arbitraria de terminal. Executarase no contexto da terminal no que se "
-"iniciou o aplicativo principal. Pode usarse o formatado do título. Exemplo: "
-"xdg-open %D"
+msgstr "Orde arbitraria de terminal. Executarase no contexto da terminal no que se iniciou o aplicativo principal. Pode usarse o formatado do título. Exemplo: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2122,11 +2636,9 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"ID da orde, normalmente debe ser curto, por exempolo «abrir_youtube». Debe "
-"ser único."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "ID da orde, normalmente debe ser curto, por exempolo «abrir_youtube». Debe ser único."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2184,23 +2696,15 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
-"se desexa engadir a orde ao menú principal, asegúrese que o título "
-"contén o camiño ao menú deste xeito: \"Ficheiro/A_miña_orde\", onde "
-"«Ficheiro» é o nome do menú na versión en inglés."
+msgstr "se desexa engadir a orde ao menú principal, asegúrese que o título contén o camiño ao menú deste xeito: \"Ficheiro/A_miña_orde\", onde «Ficheiro» é o nome do menú na versión en inglés."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Engadir orde"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Eliminar"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
-"Esta acción elimina a orde de terminal seleccionada. Está vostede seguro?"
+msgstr "Esta acción elimina a orde de terminal seleccionada. Está vostede seguro?"
 
 #: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
@@ -2223,197 +2727,1240 @@
 msgid "Invalid Values"
 msgstr "Valores incorrectos"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Formatos compatíbeis de son"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Todos os ficheiros (*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "estéreo"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Abrir ficheiro(s)..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Título da pista"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Engadir ficheiro(s) á lista..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Interprete"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Engadir cartafol(es) á lista..."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Total de pistas"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Seguir ligazóns simbólicas"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Xénero"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "axuda.txt"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Compositor"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Eliminar os ficheiros do disco"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Número de disco"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
-"Perderanse os ficheiros. Continuar?\n"
-"(Este diálogo pode desactivarse nos axustes do engadido GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Cargar lista de reprodución"
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Comentario"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Outros ficheiros (*)"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Codificador / Provedor"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Gardar a lista como"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Dereitos de autor"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Ficheiros de listas de reprodución e DeaDBeeF (*.dbpl)"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Lugar"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Tipo de contido"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Índice de subpista"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Valor(es) incorrectos."
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tipo de etiqueta(s)"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Folla de información incrustada"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-"Os campos do tipo de contido e dos engadidos non poden quedar baleiros e "
-"deben cumprir as regras.\n"
-"Exemplo de tipo de contido: «audio/mpeg».\n"
-"Exemplo de tipo de contido: «stdmpg ffmpeg».\n"
-"Os espazos deben usarse como separadores na lista de ID dos engadidos.\n"
-"O tipo de contido só debe levar letras, números e o signo «-».\n"
-"O ID do engadido só debe levar letras e números."
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Non se seleccionou nada."
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr "O miniaplicativo «%s» non está dispoñíbel"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Substituír con..."
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Preferir Ken emu a Satoh (o son envolvente non funcionará)"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Inserir..."
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Activar son envolvente"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Cortar"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Utilizar unha nova mostraxe ALSA"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Copiar"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Tamaño preferido do búfer"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Pegar"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Tamaño preferido do período"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr "Múltiples miniaplicativos deste tipo non son compatíbeis"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Movemento de bloqueo"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Mover lapela á esquerda"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Mover lapela á dereita"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Eliminar lapela"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Renomear lapela"
-
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Engadir nova lapela"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Obter a partir das etiquetas"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Amosar as cabeceiras das columnas"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Obter dun cartafol local"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Expandir a caixa 1 elemento"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "Encoller a caixa 1 elemento"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Homoxéneo"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Expandir"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Encher"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Configurar botón"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr "Voces:"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Editar a lista"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Renomear a lista"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Eliminar a lista"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Engadir un lista de reprodución"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Nome"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Explorador de listas de reprodución"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Engadir CD de son"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Preferir CD-Text a CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Activar compatibilidade coas imaxes NRG"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr ""
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Converter"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Calidade / Algoritmo"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Extensións de ficheiros (separadas por «;»)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Duración máxima da canción (en minutos)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Duración do esvaecemento (segundos)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Repetir nº de veces (se está dispoñíbel)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Pedir confirmación para eliminar ficheiros do disco"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Sensibilidade ao control de volume na icona de estado"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Icona de estado personalizada"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Engadir separadores entre os engadidos nos elementos do menú contextual"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Activar «Compartir escoitas»"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Desactivar en reprodución"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Nome de usuario"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Contrasinal"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "URL de «Compartir escoitas»"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Preferir Álbum Artista sobre o campo Artista"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Formato do título de notificación"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Formato do contido de notificación"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Amosar a portada"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Tamaño da portada (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Ficheiro de dispositivo"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Taxa de mostraxe"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr ""
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Configurar ordes por terminal personalizadas"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Ruta relativa da táboa de referencia"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Ruta absoluta da táboa de referencia"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Intercambio de bytes de son (cambie só se a escoita é estática)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Activar HVSC Songlength DB"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Duración predeterminada da canción (segs.)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Ficheiro de configuración do banco Timidity++"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-0.6.2.tar.bz2/po/he.po -> deadbeef-1.9.6.tar.bz2/po/he.po Changed

@@ -1,2057 +1,2603 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Yaron Shahrabani <sh.yaron@gmail.com>, 2010,2013-2014
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2010,2013-2014,2017-2018
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2010
+# Yuval Dolev <yuvaldolev@airmail.cc>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-08-02 09:39+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: Hebrew (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/he/)\n"
-"Language: he\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Yuval Dolev <yuvaldolev@airmail.cc>, 2019\n"
+"Language-Team: Hebrew (http://app.transifex.com/deadbeef-player/deadbeef-player/language/he/)\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"
+"Language: he\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "על אודות DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Usage: deadbeef options -- file(s)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "יומן השינויים של DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Options:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "מתרגמי DeaDBeeF"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h Print help (this message) and exit\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "שמירת תצורת האקוולייזר של DeaDBeeF"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Quit player\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "קובץ תצורת אקוולייזר של DeaDBeeF ‏(‎*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Print version info and exit\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "טעינת תצורת אקוולייזר של DeaDBeeF..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Start playback\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "תצורות אקוולייזר של DeaDBeeF ‏(‎*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Stop playback\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "ייבוא קובץ תצורת אקוולייזר של Foobar2000..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pause playback\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "תצורות אקוולייזר של Foobar2000‏ (‎*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Toggle pause\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "שמירת תצורה"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Start playback if stopped, toggle pause otherwise\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "טעינת תצורה"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Next song in playlist\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "ייבוא תצורה של Foobar2000"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Previous song in playlist\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "הפעלה"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Random song in playlist\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "הכל אפס"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Append file(s) to existing playlist\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "איפוס מגבר קדם"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "איפוס הערוצים"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Print formatted track name to stdout\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "תצורות"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "יום אחד %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " example: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d ימים %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " for more info, see %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "נעצר | %d רצועות | %s סך כל זמן הנגינה"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " NOTE: --nowplaying is deprecated.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "מונו"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Print formatted track name to stdout, using the new title formatting\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "סטריאו"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d קסל״ש "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " example: --nowplaying-tf \"%%artist%% - %%title%%\" should print \"artist - title\"\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "מושהה |"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
-"%s%s %s| %d הרץ | %d סיביות | %s | %d:%02d / %s | %d רצועות | %s סך כל זמן "
-"הנגינה"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "רשימת השמעה חדשה"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "רשימת השמעה חדשה (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "רשימת השמעה עם לשוניות"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "רשימת השמעה"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "חוצץ (למעלה ולמטה)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "חוצץ (שמאלה וימינה)"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "בררת מחדל"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "לשוניות רשימות השמעה"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "מונו"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "מאפייני הבחירה"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "סטריאו"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "הצגת עטיפת אלבום"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "כן"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "טווח"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "לא"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "ספקטרום"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "תיקיית הפלט:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "כתיבה לתיקיית הרצועה במקור"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "שימור מבנה התיקיות"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "לחצן"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "שם קובץ הפלט:"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr "פקדי נגינה"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "מצפין:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "פס עצמת השמע"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "תצורת DSP:"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "מספר התהליכים:"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "אירע כשל במהלך קריאת קובץ העזרה"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "מבנה דגימת הפלט:"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "אירע כשל בטעינת קובץ העזרה"
+#: ../plugins/converter/converter.glade.h:14
+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 סיביות"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "כאשר הקובץ קיים:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "דילוג\nשאלה\nשכתוב"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "עריכת תצורת המצפין"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "כותרת:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "מצפין ללא שם"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "סיומת קובץ הפלט:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "לדוגמה: mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "שורת הפקודה:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - שם קובץ הפלט\n%i - השם הזמני לקובץ הקלט"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "שיטה:"
+
+#: ../plugins/converter/converter.glade.h:37
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "האם אכן ברצונך לצאת?"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "כותב תגיות"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "ערוך תצורות DSP"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "כותרת"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "תצורת DSP ללא שם"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "הוספה"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "הסרה"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "הגדרה"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "בחירת תוסף DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "תוסף"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "תצורות"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "מובנה %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "הקובץ כבר קיים. האם לשכתב?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "אזהרה מהממיר"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "נא לבחור מצפין"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "שגיאת ממיר"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "בהמרה..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "בחירת תיקייה..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "אירע כשל בשמירת ערכת ההצפנה"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "נא לבדוק את הרשאות תיקיית התצורות, יש לנסות לבחור בכותרת אחרת או לפנות קצת מקום בכונן"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "תצורה באותו השם כבר קיימת. נא לנסות לבחור בשם אחר."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "שגיאה"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "הוספת מצפין חדש"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "עריכת מצפין"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "הסרת תצורה"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "הפעולה תמחק את התצורה הנבחרת. האם לעשות זאת?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "מצפינים"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "הוספת התוסף לשרשרת ה־DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "שמירת תצורת ה־DSP נכשלה"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "תצורת DSP חדשה"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "עריכת תצורת DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "תצורות DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "עזרה"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "שמירה על מבנה המקור"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "מספר שלם עם סימן ב־8 סיביות"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "מספר שלם עם סימן ב־16 סיביות"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "מספר שלם עם סימן ב־24 סיביות"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "מספר שלם עם סימן ב־32 סיביות"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "מספר עם נקודה צפה ב־32 סיביות"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "דילוג"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "הצגת בקשה"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "שכתוב"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "שרשור"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "לא ניתן למצוא את קובץ ה־pixmap:‏ %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "פתיחת קבצים…"
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "הוספת קבצים לרשימת הנגינה…"
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "הוספת תיקיות לרשימת הנגינה…"
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "טעינת רשימת השמעה"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "שמירת רשימת ההשמעה בשם"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "על אודות DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "יומן השינויים של DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "מתרגמי DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Content-Type"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "תוספים"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "ערכים שגויים"
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "לא נבחר כלום"
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_קובץ"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_פתיחת קובץ/ים"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "הוספת קובץ/ים"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "הוספת תיקייה/ות"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "הוספת מיקום"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "רשימת השמעה חדשה"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "טעינת רשימת השמעה"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "שמירת רשימת השמעה"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "י_ציאה"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_מחיקה"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "בחירת הכל"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "ביטול בחירת הכול"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "הפיכת הבחירה"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "בחירה"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "הסרה"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "חיתוך"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_חיפוש"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "סידור לפי"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "כותרת"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "מספר הרצועה"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "אלבום"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "אומן"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "תאריך"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "אקראי"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "מותאם אישית"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "העדפות"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "שורת מצב"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "אקוולייזר"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "מצב עיצוב"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "רישום"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "ה_שמעה"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "סדר"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "קווי"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "ערבול בין הרצועות"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "ערבול בין האלבומים"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "נגינה בלולאה"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "לולאה על הכול"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "לולאה על שיר אחד"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "ללא לולאה"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "ערבב"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "שירים"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "אלבומים"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "שירים רנדומאלים"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "הגלילה עוקבת אחר ההשמעה"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "הסמן עוקב אחר ההשמעה"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "עצירה לאחר הרצועה הנוכחית"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "עצירה לאחר האלבום הנוכחי"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "מעבר לרצועה הנוכחית"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "ע_זרה"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "יומן _שינויים"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "על _אודות"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "מ_תרגמים"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "עצירה"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "נגינה"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "השהיה"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "הקודם"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "הבא"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "נגינה אקראית"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "על אודות"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "עזרה"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "מאפייני הרצועה"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "מיקום:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "הגדרות"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "ה_חלה"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_סגירה"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "נתוני על"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "מאפיינים"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "כותרת:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_ביטול"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_אישור"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "יש להזין את הכותרת החדשה כאן"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "סוג:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "אינדקס הפריט"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "מתנגן"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "עטיפת האלבום"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "אומן – אלבום"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "משך"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "רצועה מספר"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "להקה / אומן האלבום"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "מבנה:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "תבנית מיון:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(אם לא ריק)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "יישור:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "שמאל"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "ימין"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_ביטול"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "שמאל\nימין\nמרכז"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_אישור"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "צבע הטקסט:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "תוסף פלט:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "התקן הפלט:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "תמיד להמיר שמע של 8 סיביות ל־16 סיביות"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
+msgstr "תמיד להמיר שמע של 16 סיביות ל־24 סיביות"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "שמע"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "מצב הגברת נגינה חוזרת:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "לא פעיל"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "רצועה"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "מידת הגברת הנגינה החוזרת"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "הגברת נגינה חוזרת:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "הגברת נגינה כללית:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "הוספת קבצים משורת הפקודה (או ממנהל הקבצים) לרשימת ההשמעה:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "המשך ההפעלה הקודמת עם התחלת התכנית"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "אין להוסיף מארכיונים בעת הוספת תיקיות"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "האפשרות „עצירה לאחר הרצועה הנוכחית“ תכבה לאחר הפעלתה"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "האפשרות „עצירה לאחר האלבום הנוכחי“ תכבה לאחר הפעלתה"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "השמעה"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "הגדרה"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "תצורת שרשרת DSP"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_טעינה"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "סגירה ממזערת לאזור המערכת"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "הסתרת הסמל באזור הדיווחים"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "הפעלה של זיהוי וקידוד מחדש של רוסית בתקן CP1251"
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "הפעלת זיהוי של יפנית ב־SHIFT-JIS והקלטה"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "הפעלה של זיהוי וקידוד מחדש של סינית בתקן CP936"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "קצב רענון המנשק (פעמים בשנייה):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "טקסט הכותרת בעת ההשמעה:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "טקסט הכותרת בעת עצירה:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "תוסף מנשק משתמש (שינויים דורשים הפעלה מחדש):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr "נגן"
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "סגירת רשימות הנגינה עם לחצן עכבר אמצעי"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "מתן שם אוטומטית לרשימות השמעה בעת הוספת תיקייה בודדת"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
+msgstr "שינוי רוחב העמודות לצורך התאמה לעמוד"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "פיקסלים"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "רשימת השמעה"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "מנשק/שונות"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "דריסה"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "קידמה"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "רקע"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "צבעי פס גלילת ההשמעה/פס עוצמת השמע"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "בינוני"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "בהיר"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "כהה"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "בסיסי"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "טקסט"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "צבעי ראשי הלשוניות"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "דריסה (רכיבי העיצוב של ה־GTK יאבדו אך העיבוד יהיה מהיר יותר)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "שורה זוגית"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "שורה אי־זוגית"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "שורה נבחרת"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "טקסט שנבחר"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "סמן"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "צבעי רשימת ההשמעה"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "צבעים"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "עמודות"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "רקע (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "בסיס:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "כהה:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "בהיר:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "אמצעי:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "טקסט:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "מודגש"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "נטוי"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "טקסט מתנגן:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "טקסט נבחר:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "רצועת לשוניות"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "רצועות רגילות:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "רצועה מתנגנת:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "רצועות נבחרות:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "עמודות"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "כותרת קבוצה:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "קדמה:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "זוגי:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "אי־זוגי:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "נבחר:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "סמן:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "רקע:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "דריסה (אבדן של העיצוב לתצוגת העץ של GTK, אך עיבוד התצוגה מהיר יותר)"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "מראה"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "הפעלת שרת מתווך"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "כתובת שרת התיווך:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "פתחת שרת התיווך:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "סוג שרת התיווך:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "שם המשתמש במתווך:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "הססמה במתווך:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "סוכן משתמש HTTP:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "עריכת מיפוי Content-Type"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "רשת"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "מקשי קיצור מוקצים:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "פעולה:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
-msgstr ""
+msgstr "<לא הוגדר>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "צירוף מקשים:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr ""
+msgstr "מקש קיצור גלובלי"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "יש להשתמש בכפתור ההחלה כדי לשמור את השינויים שלך,\nאו בכפתור שחזור כדי לבטל את השינויים שלך.\nהשינויים לא יישמרו ללא לחיצה על החלה."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "_בררות מחדל"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "מקשי קיצור"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "גרסה:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "זכויות יוצרים"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "תוספים"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "איפוס לבררות מחדל"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "גרסה:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "כתובת:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "הגדרת כותרת משלך"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "קיבוץ לפי …"
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "סידור לפי …"
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "מבנה"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "סדר עולה"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "סדר יורד"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "בחירת תוסף DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "תוסף"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "סדר עולה\nסדר יורד"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "הגדרות כותב התגיות"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "כתיבת ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "כתיבת ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "כתיבת APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "הסרת ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "הסרת ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "הסרת APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "גרסת ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (מומלץ)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (מומלץ)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "קידוד התווים של ID3v1 (בררת המחדל היא iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "כתיבת ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "מיפוי Content-Type"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr ""
+msgstr "טבלה זו מגדירה את הקישור בין סוגי תכני התזרימים ותוספי הפענוח של DeaDBeeF. למשל: לקובצי mp3 יכול להיות מוגדר סוג התוכן „audio/x-mpeg“ ולכן יש לפענח אותו עם אחד התוספים המובנים של DeaDBeeF כגון „“ או „ffmpeg“."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr ""
+msgstr "Content-Type:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "תוספים:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
-msgstr ""
+msgstr "מאפייני כפתור"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "צבע:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "צבע הטקסט:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "סמל:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "תווית:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "בחירת פעולה"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "תיבת דו שיח זו מאפשרת הגדרת כותרת משלך לכל רצועה שהיא. אפשרות זו שימושית להגדרת תזרימים כמו תחנות רדיו. האפשרות להגדרת כותרת משלך קיימת גם בתיבת הדו־שיח „הוספת מיקום“. הכותרת עצמה מופיעה בעמודות המציגים את שדה נתוני העל „אמן“. היא אמורה להיראות בערך כך: „התאמה אישית אמן“ אם קיים שדה אמן, או פשוט „התאמה אישית“ בכל מצב אחר."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "אומן / אלבום"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "עריכה"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "רצועה מספר"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "עריכה (מקומית)"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "הוספת שדה חדש…"
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "עריכת ערך"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "שם השדה:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "ערך השדה:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "הרישום של DeaDBeeF"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "פינוי"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "הוספת עמודה"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "קובץ נוכחי"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "עריכת עמודה"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "מצב"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "הסרת עמודה"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "ביטול"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "קיבוץ לפי"
-
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "ללא"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "אומן/תאריך/אלבום"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "פתיחת קובץ..."
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "הגדרת %s"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "התקן השמע כברירת מחדל"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "מתבצעת הוספת קבצים..."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "שמירת תצורת האקוולייזר של DeaDBeeF"
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "בהפעלה..."
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "קובץ תצורת אקוולייזר של DeaDBeeF ‏(‎*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "השתנו נתונים ברצועה זו."
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "טעינת תצורת אקוולייזר של DeaDBeeF..."
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "האם באמת לסגור את החלון?"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "תצורות אקוולייזר של DeaDBeeF ‏(‎*.ddbeq)"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "ערכים מרובים"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "ייבוא קובץ תצורת אקוולייזר של Foobar2000..."
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "מפתח"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "תצורות אקוולייזר של Foobar2000‏ (‎*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "ערך"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "שמירת תצורה"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "ריבוי ערכים"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "טעינת תצורה"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "התגיות נכתבות..."
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "ייבוא תצורה של Foobar2000"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "שם השדה"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "הפעלה"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "שם:"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "אפס הכל"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "שמות השדות לא יכולים להתחיל בתווים : או _"
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "איפוס מגבר קדם"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "לא ניתן להוסיף שדה"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "איפוס הערוצים"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "שדה בשם זה כבר קיים, נא לנסות שם אחר."
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "רשימת השמעה חדשה"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "הוספת שדה"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "הסרת שדה"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "תבניות השמע הנתמכות"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Usage: deadbeef options -- file(s)\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "כל הקבצים (*)"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Options:\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help or -h Print help (this message) and exit\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Quit player\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "קבצים אחרים (*)"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Print version info and exit\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "קובצי רשימות נגינה של DeaDBeeF ‏(‎*.dbpl)"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Start playback\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "מעקב אחרי קישורים סימבוליים"
 
-#: ../main.c:96
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Stop playback\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "יום אחד %d:%02d:%02d"
 
-#: ../main.c:97
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pause playback\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d ימים %d:%02d:%02d"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Toggle pause\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "זמן נגינה ס\"כ"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "נעצר"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
 msgstr ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Next song in playlist\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "זמן מגינת הבחירה"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Previous song in playlist\n"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "הופסק"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Random song in playlist\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "שינוי שם רשימת ההשמעה"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Append file(s) to existing playlist\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
 
-#: ../main.c:104
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgid "Do you really want to remove the playlist '%s'?"
 msgstr ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
 
-#: ../main.c:105
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Print formatted track name to stdout\n"
+msgid "New Playlist (%d)"
+msgstr "רשימת השמעה חדשה (%d)"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "רשימת השמעה עם לשוניות"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "חוצץ (למעלה ולמטה)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "חוצץ (שמאלה וימינה)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "לשוניות"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "לשוניות רשימות השמעה"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "מאפייני הבחירה"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "הצגת עטיפת אלבום"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "ספקטרום"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
 msgstr ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "בררת מחדל"
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "לחצן"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "כן"
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "סרגל נגינה"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "לא"
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "פקדי נגינה"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "פס עצמת השמע"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "צ׳יפ מיוזיק"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "מציג רישומים"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "אירע כשל במהלך קריאת קובץ העזרה"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "אירע כשל בטעינת קובץ העזרה"
+
+#: ../plugins/gtkui/gtkui.c:1712
 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"
-"מותאם אישית"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "בנגן רצות כעת פעולות רקע. יציאה מההנגן כעת תגרום לביטול או הפרעה לתהליכים. מצב כזה עשוי לגרום לאבדן מידע."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "האם אכן ברצונך לצאת?"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Left\n"
-"Right"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"שמאל\n"
-"ימין"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"נטרול\n"
-"רצועה\n"
-"אלבום"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
-"סדר עולה\n"
-"סדר יורד"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-"2.3 (מומלץ)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
 #, 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 "Do you really want to delete all %d files from the current playlist?%s"
 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "חיפוש ב־Last.fm"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "שימוש בדגימה חוזרת של ALSA"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "מחיקה"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "שחרור ההתקן בעת עצירה"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "שמאל"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "גודל האוגר המועדף"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "ימין"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "משך הזמן המועדף"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "מרכז"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "הפעלת Scrobbler"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "נטרול „מתנגן כעת“"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "שם משתמש"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "ססמה"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "הכתובת של Scrobble"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "קובץ ההתקן"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "רצועה"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "מעקף לתקלת קצב הדגימה ב־OSS4"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "ללא"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "ההפרש בין מועדי עדכון המטמון (שעות)"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "קבלה מתגיות מובנות"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "קבלה מתיקייה מקומית"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "מסכת קבצים של עטיפות מקומיות"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "קבלה מ־Last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "קבלה מ־albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "מתיחת העטיפה לעבר הצד הארוך יותר"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "שימוש ב־CDDB/FreeDB"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "סדר עולה"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "העדפת CD-Text על פני CDDB"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "סדר יורד"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "כתובת ה־CDDB (לדוגמה: 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "מס׳ הפתחה של ה־CDDB (לדוגמה: '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "העדפת הפרוטוקול CDDB על פני HTTP"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (מומלץ)"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "הפעלת תמיכה בתמונות NRG"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "איכות הדגימה החוזרת (0..2, גבוה יותר - איכותי יותר)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "פלט 8 סיביות (בררת המחדל היא 16)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "אומן / אלבום"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "אורך השיר המרבי (בדקות)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "רצועה מספר"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "משך"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "אינדקס הפריט"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "בקשת אישור למחיקת קבצים מהכונן"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "מתנגן"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "רגישות בקרת העצמה דרך סמל המצב"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "עטיפת האלבום"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "סמל מצב מותאם אישית"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "אומן – אלבום"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "הפעלת gtk_init עם הפרמטר ‎--sync (מצב ניפוי שגיאות)"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "שנה"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "הוספת הפרדה בין פריטי תפריט ההקשר של התוסף"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "רצועה מספר"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "מבנה כותרת ההתרעה"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "להקה / אומן האלבום"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "מבנה תוכן ההתרעה"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "קודק"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "הצגת עטיפת האלבום"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "קצב סיביות"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "גודל עטיפת האלבום (פיקסלים)"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "הוספת עמודה"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "שרת PulseAudio"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "עריכת עמודה"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "קצב דגימה"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "הסרת עמודה"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "נתיב טבלת חיפוש יחסי"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "הצמדת הקבוצות בעת גלילה"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "נתיב טבלת חיפוש מוחלט"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "קיבוץ לפי"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "החלפת בתים של שמע (יש להחליף מצב אם שומעים רעש סטטי)"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "אומן/תאריך/אלבום"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "הפעלת מסד נתונים של אורך שירים - HVSC"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (מהשירות HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "סיביות לדגימה (8 או 16)"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "אורך שיר כברירת מחדל (שניות)"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "קובץ מאגר התצורה של Timidity++‎"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "טעינת נתוני העל מחדש"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "כותרת הרצועה"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "מבצע/ת"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "סך כל הרצועות"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "סגנון"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "מלחין/ה"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "הסרת רשימת השמעה"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "דיסק מספר"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "הוספת רשימת השמעה חדשה"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "הערה"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "קידוד / יצור"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "מיקום"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "פתיחת קובץ..."
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "אינדקס תת־הרצועה"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "הגדרת %s"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "סוג/י התגים"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "שינית את הגדרות מקשרי הקיצור אבל לא שמרת את השינויים שלך."
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "רשימת Cue מוטמעת"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "להמשיך מבלי לשמור?"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "קודק"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "התקן השמע כברירת מחדל"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "סיומות קבצים (יש להפריד ב־';')"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "מתבצעת הוספת קבצים..."
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "המרה"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "בהפעלה..."
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "קצב דגימת היעד"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "איכות / אלגוריתם"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "שם"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "קצב דגימה אוטומטי (דורס את קצב דגימת היעד)"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "הקובץ כבר קיים. האם לשכתב?"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "אזהרה מהממיר"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "חיפוש (%list_total% results)"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "נא לבחור מצפין"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "הצגת כותרות העמודות"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "שגיאת ממיר"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "ערך"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "בהמרה..."
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "השתנו נתונים ברצועה זו."
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "בחירת תיקייה..."
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "האם באמת לסגור את החלון?"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "אירע כשל בשמירת ערכת ההצפנה"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "ערכים מרובים"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "מפתח"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "ריבוי ערכים"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "התגיות נכתבות..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
-"נא לבדוק את הרשאות תיקיית התצורות, יש לנסות לבחור בכותרת אחרת או לפנות קצת "
-"מקום בכונן"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "תצורה באותו השם כבר קיימת. נא לנסות לבחור בשם אחר."
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "שגיאה"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "שם השדה"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "הוספת מצפין חדש"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "שם:"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "עריכת מצפין"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "שמות השדות לא יכולים להתחיל בתווים : או _"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "הסרת תצורה"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "לא ניתן להוסיף שדה"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "הפעולה תמחק את התצורה הנבחרת. האם לעשות זאת?"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "שדה בשם זה כבר קיים, נא לנסות שם אחר."
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "מצפינים"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "הווידג׳ט „%s“ אינו זמין"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "הוספת התוסף לשרשרת ה־DSP"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "החלפה ב…"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "שמירת תצורת ה־DSP נכשלה"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "הוספה…"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "תצורת DSP חדשה"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "גזירה"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "עריכת תצורת DSP"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "העתקה"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "תצורות DSP"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "הדבקה"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "תיקיית הפלט:"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "אין תמיכה בריבוי וידג׳טים מסוג זה"
+
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "שימור מבנה התיקיות"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "שם קובץ הפלט:"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "1x"
 msgstr ""
-"סיומות (לדוגמה: .mp3) יתווספו אוטומטית.\n"
-"יש להשאיר את השדה ריק לקבלת שם בררת המחדל ‎(%a - %t)‎."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "מצפין:"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "תצורת DSP:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "מספר התהליכים:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "מבנה דגימת הפלט:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "שמירה על מבנה המקור"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "מספר שלם עם סימן ב־8 סיביות"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "מספר שלם עם סימן ב־16 סיביות"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "מספר שלם עם סימן ב־24 סיביות"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "מספר שלם עם סימן ב־32 סיביות"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "מספר עם נקודה צפה ב־32 סיביות"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "כאשר הקובץ קיים:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "הצגת בקשה"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "שכתוב"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "עריכת תצורת המצפין"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "מצפין ללא שם"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "סיומת קובץ הפלט:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "לדוגמה: mp3"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "שורת הפקודה:"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
-"לדוגמה: lame - %o\n"
-"%i לציון קובץ קלט, %o לציון קובץ קלט, - עבור הקלט מ־stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
-"%o - שם קובץ הפלט\n"
-"%i - השם הזמני לקובץ הקלט"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "שיטה:"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "שרשור"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "קובץ זמני"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "הומוגני"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "הרחבה"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "מילוי"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "כותב תגיות"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "ערוך תצורות DSP"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "תצורת DSP ללא שם"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "הוספה"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "קולות:"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "לא ניתן למצוא את קובץ ה־pixmap:‏ %s"
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
-"שמירה על מבנה המקור\n"
-"מספר שלם עם סימן ב־8 סיביות\n"
-"מספר שלם עם סימן ב־16 סיביות\n"
-"מספר שלם עם סימן ב־24 סיביות\n"
-"מספר שלם עם סימן ב־32 סיביות\n"
-"מספר עם נקודה צפה ב־32 סיביות"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
-"הצגת בקשה\n"
-"שכתוב"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
-"שרשור\n"
-"קובץ זמני"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%d ימים %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "פריטים"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "סייר רשימות השמעה"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr ""
-
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "עריכה"
+msgstr "פקודות מעטפת בהתאמה אישית"
 
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
@@ -2075,7 +2621,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
+msgstr "פקודות מעטפת שרירותיות. אלו תופעלנה בהקשר המעטפת ממנה הופעל היישום. ניתן להשתמש בתבנית מיוחדת לכותרת. למשל: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2090,54 +2636,54 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "מזהה פקודה, בדרך כלל זה אמור להיות משהו קצר כגון: \"youtube_open\". המזהה חייב להיות ייחודי."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
-msgstr ""
+msgstr "רצועות יחידניות"
 
 #: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
-msgstr ""
+msgstr "עבודה על רצועות יחידניות."
 
 #: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
-msgstr ""
+msgstr "רצועות מרובות"
 
 #: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
-msgstr ""
+msgstr "עבודה על רצועות מרובות."
 
 #: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
-msgstr ""
+msgstr "מקומי"
 
 #: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
-msgstr ""
+msgstr "עבטדה על קבצים מקומיים."
 
 #: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr ""
+msgstr "מרוחק"
 
 #: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr ""
+msgstr "עבודה על קבצים מרוחקים (למשל: תזרימי http://‎)"
 
 #: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "כללי (תפריט ראשי)"
 
 #: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
@@ -2150,19 +2696,15 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
+msgstr "כדי להוסיף פקודות לתפריט הראשי, עליך לוודא שהכותרת מכילה את נתיב התפריט באופן הבא: \"File/My Command\", כאשר File הוא שם התפריט בגרסה האנגלית."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "הוספת פקודה"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "מחיקה"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
+msgstr "פעולה זו תמחק את פקודות המעטפת הנבחרות. להמשיך?"
 
 #: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
@@ -2170,203 +2712,1255 @@
 
 #: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr ""
+msgstr "המזהה חייב להכיל משהו ולהיות ייחודי.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr ""
+msgstr "הכותרת לא יכולה להיות ריקה.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr ""
+msgstr "פקודת המעטפת לא יכולה להיות ריקה.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:248
 #: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "ערכים שגויים"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 בהגדרות התוסף."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "מונו"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "סטריאו"
+
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "כותרת הרצועה"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "מבצע/ת"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "סך כל הרצועות"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "סגנון"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "מלחין/ה"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "דיסק מספר"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "כל הקבצים (*)"
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "הערה"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "קידוד / יצור"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "זכויות יוצרים"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "מיקום"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "אינדקס תת־הרצועה"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "סוג/י התגים"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "רשימת Cue מוטמעת"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "הפעלת הדמיית Ken על פני Satoh (אין תמיכה בשמע היקפי)"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "הפעלת שמע היקפי"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "שימוש בדגימה חוזרת של ALSA"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "גודל האוגר המועדף"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "משך הזמן המועדף"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "קבלה מתגיות מובנות"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "קבלה מתיקייה מקומית"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "מחיקת קבצים מהכונן"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "טעינת רשימת השמעה"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "קבצים אחרים (*)"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "שמירת רשימת ההשמעה בשם"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "להשאיר ריק"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "לא נבחר כלום"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "החלפה ב…"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "הוספה…"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "גזירה"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "העתקה"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "הדבקה"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "קובץ"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "הוספת תקליטור שמע"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "נעילת תנועה"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "העברת הלשונית שמאלה"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "העברת הלשונית ימינה"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "הסרת לשונית"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "שינוי שם הלשונית"
-
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "הוספת לשונית חדשה"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "העדפת CD-Text על פני CDDB"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "הצגת כותרות העמודות"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "שימוש בפרוטוקול CDDB"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "הפעלת תמיכה בתמונות NRG"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "הרחבה"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "מילוי"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "הגדרת לחצן"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr "קולות:"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "המרה"
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "עריכת רשימת השמעה"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "שינוי שם רשימת ההשמעה"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "הסרת רשימת השמעה"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "איכות / אלגוריתם"
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "הוספת רשימת השמעה חדשה"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "שם"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "סייר רשימות השמעה"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "סיומות קבצים (יש להפריד ב־';')"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "אורך השיר המרבי (בדקות)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "משך עמעום (שניות)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "נגינת הלולאה מספר מפעמים (אם ניתן)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "הצגת עמוד עזרה"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "בקשת אישור למחיקת קבצים מהכונן"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "רגישות בקרת העצמה דרך סמל המצב"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "סמל מצב מותאם אישית"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "הוספת הפרדה בין פריטי תפריט ההקשר של התוסף"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "רשימת השמעה הבאה"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "הפעלת Scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "נטרול „מתנגן כעת“"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "שם משתמש"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "ססמה"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "הכתובת של Scrobble"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "העדפת שדה אמן האלבום על פני אמן"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "מבנה כותרת ההתרעה"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "מבנה תוכן ההתרעה"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "הצגת עטיפת האלבום"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "גודל עטיפת האלבום (פיקסלים)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "קובץ ההתקן"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "קצב דגימה"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr ""
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "הגדרת פקודות מעטפת משלך"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "נתיב טבלת חיפוש יחסי"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "נתיב טבלת חיפוש מוחלט"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "החלפת בתים של שמע (יש להחליף מצב אם שומעים רעש סטטי)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "הפעלת מסד נתונים של אורך שירים - HVSC"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "אורך שיר כברירת מחדל (שניות)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "קובץ מאגר התצורה של Timidity++‎"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-0.6.2.tar.bz2/po/hr.po -> deadbeef-1.9.6.tar.bz2/po/hr.po Changed

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ivica Kolić <ikoli@yahoo.com>, 2010
 # Ivica Kolić <ikoli@yahoo.com>, 2010
@@ -9,2337 +9,3957 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/hr/)\n"
-"Language: hr\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Ivica Kolić <ikoli@yahoo.com>, 2010\n"
+"Language-Team: Croatian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/hr/)\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"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "Opcije:\n"
+
+#: ../src/main.c:136
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h Ispisuje pomoć (ova poruka) i izlazi\n"
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Isključi svirač\n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Ispis info verzije i izlaz\n"
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Početak reprodukcije\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Zaustavlja reprodukciju\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Zaustavlja reprodukciju\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Slijedaća pjesma na listi izvođenja\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Prethodna pjesma na listi izvođenja\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random nasumična pjesma na listi izvođenja\n"
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr ""
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr ""
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Zadano"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Da"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Ne"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Izlazna mapa:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Ime izlazne datoteke:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP unaprijed postavljeno:"
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Naslov:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Proširenje izlazne datoteke:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Naredbeni redak:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metoda:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Naslov"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Dodaj"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Ukloni"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Konfiguriraj"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Odaberi DSP priključak"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Priključak"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Unaprijed postavljeno"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Odaberi mapu..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Greška"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Ukloni unaprijed postavljeno"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Upozorenje"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP unaprijed postavljeno"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Pomoć"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "O DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF prevoditelji"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Priključci"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Otvori datoteku(e)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Dodaj datoteku(e)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Dodaj mapu(e)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Dodaj lokaciju"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Nova lista izvođenja"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Učitaj listu izvođenja"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Spremi listu izvođenja"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Iskjluči"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Očisti"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Odaberi sve"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Poništi odabrano"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Obrnuti odabir"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Odabir"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Nađi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Broj zapisa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Umjetnik"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Datum"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Nasumično"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Prolagođeno"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Svojstva"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Pogled"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Statusna traka"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Ujednačivač"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Reprodukcija"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Klizač slijedi reprodukciju"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Pokazivač slijedi reprodukciju"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Skoči na trenutni zapis"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Pomoć"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_O programu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Traži"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Stop"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Sviraj"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pauza"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Prethodno"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Slijedeće"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Sviraj nasumično"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "O programu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Isključi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Svojstva zapisa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Postavke"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Primjeni"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Zatvori"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Svojstva"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Odustani"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Unesi naziv novog stupca"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Tip:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Format:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Poravnanje:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Izlazni priključak:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Izlazni uređaj:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Uvijek pretvori 8 bit audio u 16 bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Zvuk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+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/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Reprodukcija"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "_Učitaj"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Tekst naslovne trake dok svira:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Tekst naslovne trake kad je zaustavljeno:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr ""
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Omogući proxy poslužitelj"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Adresa proxy poslužitelja:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Port proxy poslužitelja:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Vrsta proxy-a:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Proxy korisničko ime:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Proxy lozinka:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Mreža"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Verzija: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Piši ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Piši ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Piši APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "ID3v2 verzija"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Preporučeno)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:353
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr "O DeaDBeeF %s"
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:626
-#, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF prevoditelji"
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:141
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:148
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:187
+#: ../plugins/gtkui/eq.c:183
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:191
+#: ../plugins/gtkui/eq.c:187
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:252
+#: ../plugins/gtkui/eq.c:224
 msgid "Import Foobar2000 EQ Preset..."
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:256
+#: ../plugins/gtkui/eq.c:228
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:321
+#: ../plugins/gtkui/eq.c:269
 msgid "Save Preset"
 msgstr "Spremi unaprijed postavljeno"
 
-#: ../plugins/gtkui/eq.c:329
+#: ../plugins/gtkui/eq.c:277
 msgid "Load Preset"
 msgstr "Učitaj unaprijed postavljeno"
 
-#: ../plugins/gtkui/eq.c:337
+#: ../plugins/gtkui/eq.c:285
 msgid "Import Foobar2000 Preset"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:362
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
 msgid "Enable"
 msgstr "Omogući"
 
-#: ../plugins/gtkui/eq.c:371
+#: ../plugins/gtkui/eq.c:320
 msgid "Zero All"
 msgstr "Nula sve"
 
-#: ../plugins/gtkui/eq.c:378
+#: ../plugins/gtkui/eq.c:327
 msgid "Zero Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:385
+#: ../plugins/gtkui/eq.c:334
 msgid "Zero Bands"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Unaprijed postavljeno"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nova lista izvođenja"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dan %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dana %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:179
-#, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Zustavljeno | %d zapisi| %s ukupno vrijeme sviranja"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pauzirano | "
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
-msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d zapisi | %s ukupno vrijeme "
-"sviranja"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nova lista izvođenja"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista izvođenja (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:956
+#: ../plugins/gtkui/gtkui.c:1452
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:960
+#: ../plugins/gtkui/gtkui.c:1456
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
+#: ../plugins/gtkui/gtkui.c:1457
 msgid "Splitter (left and right)"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1460
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:1461
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
+#: ../plugins/gtkui/gtkui.c:1462
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
+#: ../plugins/gtkui/gtkui.c:1464
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:1465
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:1466
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
+#: ../plugins/gtkui/gtkui.c:1468
 msgid "Seekbar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:1469
 msgid "Playback controls"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:1470
 msgid "Volume bar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:1471
 msgid "Chiptune voices"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
 msgid "Failed while reading help file"
 msgstr "Neuspjeh tijekom čitanja datoteke pomoći"
 
-#: ../plugins/gtkui/gtkui.c:1160
+#: ../plugins/gtkui/gtkui.c:1695
 msgid "Failed to load help file"
 msgstr "Neuspjeh u učitavanju datoteke pomoći"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Upozorenje"
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Otvori datoteku(e)"
-
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Dodaj datoteku(e)"
-
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Dodaj mapu(e)"
-
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Dodaj lokaciju"
-
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Nova lista izvođenja"
-
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Učitaj listu izvođenja"
-
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Spremi listu izvođenja"
-
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Iskjluči"
-
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Očisti"
-
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Odaberi sve"
-
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Poništi odabrano"
-
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Obrnuti odabir"
-
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Odabir"
-
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Ukloni"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Nađi"
-
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Naslov"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "Broj zapisa"
-
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Album"
-
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Umjetnik"
-
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Datum"
-
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Nasumično"
-
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Prolagođeno"
-
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Svojstva"
-
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Pogled"
-
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Statusna traka"
-
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Ujednačivač"
-
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_Reprodukcija"
-
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Redoslijed"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Linearni"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Klizač slijedi reprodukciju"
-
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Pokazivač slijedi reprodukciju"
-
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Skoči na trenutni zapis"
-
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
-
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
-
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_O programu"
-
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Traži"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Lijevo"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Stop"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Desno"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Sviraj"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Pauza"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Prethodno"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Slijedeće"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Sviraj nasumično"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "O programu"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Isključi"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Pomoć"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Zapis"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Svojstva zapisa"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Ništa"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "Postavke"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Primjeni"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Zatvori"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Svojstva"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (preporučeno)"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Naslov:"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Unesi naziv novog stupca"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Umjetnik / album"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Tip:"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Broj zapisa"
 
-#: ../plugins/gtkui/interface.c:1343
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Trajanje"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
 msgid "Item Index"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
 msgid "Playing"
 msgstr "Svira"
 
-#: ../plugins/gtkui/interface.c:1345
+#: ../plugins/gtkui/playlist/plcommon.c:75
 msgid "Album Art"
 msgstr "Album Umjetnik"
 
-#: ../plugins/gtkui/interface.c:1346
+#: ../plugins/gtkui/playlist/plcommon.c:76
 msgid "Artist - Album"
 msgstr "Umjetnik _ album"
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Trajanje"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
 msgid "Track Number"
 msgstr "Broj zapisa"
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
 msgid "Band / Album Artist"
 msgstr "Grupa / album umjetnik"
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Format:"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodek"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Poravnanje:"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Lijevo"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Dodaj stupac"
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Desno"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Uredi stupac"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Odustani"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Ukloni stupac"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Izlazni priključak:"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Grupiraj po"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Izlazni uređaj:"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Umjetnik/datum/album"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Uvijek pretvori 8 bit audio u 16 bit"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Zvuk"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Onemogući"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Zapis"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
 msgstr ""
-"Dodaj datoteke iz naredbanog retka (ili upravljača datotekama) na uvu listu "
-"izvođenja:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Otvori datoteku..."
+
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Konfiguriraj %s"
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Zadani audio uređaj"
+
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Dodavanje datoteka..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Reprodukcija"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Konfiguriraj"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
-msgstr "_Učitaj"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
-msgstr "DSP"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Vrijednost"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "Tekst naslovne trake dok svira:"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Stvarno zatvoriti prozor?"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Tekst naslovne trake kad je zaustavljeno:"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Ime:"
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Imena polja ne smiju započinjati sa : ili _"
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Ne mogu dodati polje"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+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/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Pozadina"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Srednje"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Svijetlo"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Tamno"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Tekst"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Odabrani red"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Odabrani tekst"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Pokazivač"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Boje liste izvođenja"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Boje"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Omogući proxy poslužitelj"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Adresa proxy poslužitelja:"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Port proxy poslužitelja:"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Vrsta proxy-a:"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Proxy korisničko ime:"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Proxy lozinka:"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Mreža"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Verzija: "
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Autorska prava"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Priključci"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Format"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Odaberi DSP priključak"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Priključak"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Piši ID3v2"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Piši ID3v1"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Piši APEv2"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "ID3v2 verzija"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (preporučeno)"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
 msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Umjetnik / album"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Broj zapisa"
-
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Dodaj stupac"
-
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Uredi stupac"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Ukloni stupac"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Grupiraj po"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Ništa"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Umjetnik/datum/album"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Otvori datoteku..."
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, c-format
-msgid "Configure %s"
-msgstr "Konfiguriraj %s"
-
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Zadani audio uređaj"
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Dodavanje datoteka..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Naslov zapisa"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Izvođač"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Ukupno zapisa"
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
+#: ../translation/extra.c:10
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
+#: ../translation/extra.c:11
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Stvarno zatvoriti prozor?"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Broj diska"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Komentar"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Vrijednost"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Autorska prava"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr ""
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Lokacija"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Ime:"
-
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Imena polja ne smiju započinjati sa : ili _"
-
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Ne mogu dodati polje"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Polje sa tim imenom već postoji,molim pokušajte s drugim imenom."
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Dodaj polje"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Ukloni polje"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opcije:\n"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr ""
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help or -h Ispisuje pomoć (ova poruka) i izlazi\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Isključi svirač\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Ispis info verzije i izlaz\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Početak reprodukcije\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Zaustavlja reprodukciju\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Zaustavlja reprodukciju\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Slijedaća pjesma na listi izvođenja\n"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Prethodna pjesma na listi izvođenja\n"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random nasumična pjesma na listi izvođenja\n"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
-" e.g.: sada svira \"%%a - %%t\" treba ispisati "
-"\"umjetnik - naslov\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Zadano"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Da"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Ne"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
-"LIjevo\n"
-"Desno"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
-"2.3 (Preporučeno)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 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
+#: ../translation/plugins.c:67
+#, no-c-format
 msgid "Add Audio CD"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Oslobodi uređaj kada se zaustavi"
-
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 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"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Pretvori"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Proširenja datoteke (odvojeno pomoću ';')"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
 msgid "Max song length (in minutes)"
 msgstr ""
 
-#: ../translation/extra.c:40
+#: ../translation/plugins.c:137
+#, no-c-format
 msgid "Fadeout length (seconds)"
 msgstr ""
 
-#: ../translation/extra.c:41
+#: ../translation/plugins.c:139
+#, no-c-format
 msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Pitaj za potvrdu za brisanje datoteka sa diska"
-
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr ""
-
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Naslov zapisa"
-
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Izvođač"
-
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Ukupno zapisa"
-
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Broj diska"
-
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Komentar"
-
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Lokacija"
-
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
 msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Kodek"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Proširenja datoteke (odvojeno pomoću ';')"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Pretvori"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Odaberi mapu..."
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Greška"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Pitaj za potvrdu za brisanje datoteka sa diska"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Ukloni unaprijed postavljeno"
-
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP unaprijed postavljeno"
-
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Izlazna mapa:"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Ime izlazne datoteke:"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:275
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP unaprijed postavljeno:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Proširenje izlazne datoteke:"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Naredbeni redak:"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:313
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:315
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Metoda:"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Privremena datoteka"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Dodaj"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:371
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Onemogući sada svira"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Korisničko ime"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Lozinka"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/hu.po -> deadbeef-1.9.6.tar.bz2/po/hu.po Changed

@@ -1,1037 +1,1587 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Péter Polonkai <polesz@nedudu.hu>, 2014
+# osiixy <osiixy@gmail.com>, 2014
+# osiixy <osiixy@gmail.com>, 2014
+# Péter Polonkai <polesz@nedudu.hu>, 2014,2016
+# Péter Varga <peter.varga96@gmail.com>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/hu/)\n"
-"Language: hu\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Péter Varga <peter.varga96@gmail.com>, 2019\n"
+"Language-Team: Hungarian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "DeaDBeeF %s névjegye"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Használat: deadbeef opciók -- fájl(ok)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s Változás napló"
+msgid "Options:\n"
+msgstr "Opciók:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF Fordítók"
+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"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "DeaDBeeF EQ Hangszín mentése"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Kilépés a lejátszóból\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ hangszín fájlok (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Verzió információ megjelenítése és kilépés\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "DeaDBeeF EQ Hangszín betöltése..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Lejátszás indítása\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ hangszínek (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Lejátszás megállítása\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Foobar2000 EQ Hangszín importálása..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Lejátszás szüneteltetése\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ hangszínek (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Lejátszás/Szüneteltetés\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Hangszín mentés"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Lejátszás indítása, lejátszás közben szüneteltetés\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Hangszín betöltés"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Ugrás a következő számra a lejátszólistában\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 Hangszín betöltése"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Ugrás az előző számra a lejátszólistában\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Engedélyezve"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Véletlenszerű szám a lejátszólistáról\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Mind nulla"
+#: ../src/main.c:147
+#, 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"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Preamp nulla"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Sávok nulla"
+#: ../src/main.c:149
+#, 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"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Hangszínek"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-szintakszis: előadó, tcím, album,\n lhossz, nsávszáma, yév, cmegjegyzés,\n copyright, eltelt idő\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 nap %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d nap %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "további információért nézd meg %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Megállítva | %d sáv | %s teljes lejátszási idő"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "MEGJEGYZÉS: --nowplaying elavult.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Monó"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Sztereó"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Szünet |"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d sáv | %s teljes lejátszási "
-"idő"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Új lejátszólista"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Új lejátszólista (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Lejátszólista fülekkel"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Lejátszólista"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Szétosztás (felső és alsó)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Szétosztás (bal és jobb)"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Alapértelmezett"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Lejátszólista fülek"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Monó"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Kiválasztás tulajdonságai"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Sztereó"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Album borító kijelző"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Igen"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Szkóp"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nem"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Spektrum"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Kimeneti könyvtár:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Írás a dal forrás könyvtárába"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Mappa struktúra megtartása"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Gomb"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr "Léptető sáv"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr "Lejátszó vezérlők"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Kimeneti fájlnév:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "Hangerő sáv"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Kódoló:"
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Súgó fájl olvasása sikertelen"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Szálak száma:"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Súgó fájl betöltése sikertelen"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Kimeneti minta formátuma:"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:14
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"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 ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Még mindig kiszeretne lépni?"
-
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Figyelemeztetés"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Ha a fájl létezik:"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Fájl"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Átlép\nKérdez\nFelülír"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Fájl(ok) megnyitása"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Fájl(ok) hozzáadása"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Cím:"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Könyvtár(ak) hozzáadása"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Névtelen kódoló"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Hely hozzáadása"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Kimeneti fájl kiterjesztése:"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Új lejátszólista"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Például: mp3"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Lejátszólista betöltése"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Parancssor:"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Lejátszólista mentése"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Példa: lame - %o\n%i bemeneti fájlnév, %o kimeneti fájlnév, - stdin használata"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Kilépés"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - kimeneti fájlnév\n%i - átmeneti bemeneti fájlnév"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "Sz_erkesztés"
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metódus:"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Törlés"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Mind kiválaszt"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Minden kiválasztást megszüntet"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Kiválasztás megfordítása"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Választás"
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Eltávolítás"
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Vágás"
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Keresés"
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Címkeíró"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr "Rendezés"
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
 #: ../plugins/shellexecui/shellexecui.c:324
 msgid "Title"
 msgstr "Cím"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "Zeneszám száma"
-
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Album"
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Előadó"
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Hozzáadés"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Dátum"
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Eltávolítás"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Véletlenszerű"
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Beállítás"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Egyéb"
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "DSP beépülő kiválasztása"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Beállítások"
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Beépülő"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Nézet"
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Hangszínek"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Státusz sor"
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Beépített %s"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Hangszínszabályzó"
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Azonos nevű fájl már létezik. Felülírjam?"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr "Tervező mód"
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Konvertálási figyelmeztetés"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_Lejátszás"
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Kérlek, válassz egy enkódert"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Sorrend"
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Konvertálási hiba"
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Lineáris"
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Konvertálás..."
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Számok keverése"
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Mappa kiválasztása..."
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Albumok keverése"
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Ismétlés"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Mindet ismétli"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Egyetlen dal ismétlése"
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Hiba"
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Nincs ismétlés"
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Új enkóder hozzáadása"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "A lapozás követi a lejátszást"
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Enkóder szerkesztése"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "A kurzor követi a lejátszást"
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Mentett hangszín törlése"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
-msgstr ""
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Figyelemeztetés"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Ugrás az aktuális számra"
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Kódolók"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Súgó"
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_Változás napló"
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_Névjegy"
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "Fordí_tók"
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Súgó"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Keresés"
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Forrás formátum megtartása"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Megállítás"
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Lejátszás"
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Szünet"
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Előző"
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Következő"
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit lebegőpontos"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Véletlenszerű lejátszás"
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Átlépés"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "Névjegy"
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Kérdés"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Kilépés"
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Felülírás"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Súgó"
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Cső"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "A sáv tulajdonságai"
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
-msgstr "Hely:"
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "Beállítások"
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nem található a képfájl: %s"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Alkalmaz"
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Fájlok megnyitása..."
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Bezár"
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Fájlok hozzáadása a lejátszólistához..."
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Metaadat"
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Mappák hozzáadása a lejátszólistához..."
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Tulajdonságok"
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Cím:"
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Lejátszólista betöltése"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Adja meg a fejléc új címét"
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Lejátszólista mentése másként"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Típus"
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "A DeaDBeeF %s névjegye"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Elem index"
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s Változásnapló"
 
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Lejátszás"
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF Fordítók"
 
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Album kép"
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Előadó - Album"
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Időtartam"
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Sáv száma"
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Bővítmények"
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Zenekar / Album előadó"
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Érvénytelen érték(ek)."
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Formátum"
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Igazítás"
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Semmi nincs kiválasztva."
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Balra"
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Fájl"
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Jobbra"
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Fájl(ok) megnyitása"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Mégsem"
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Fájl(ok) hozzáadása"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Könyvtár(ak) hozzáadása"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Kimeneti bővítmény:"
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Hely hozzáadása"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Kimeneti eszköz:"
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Új lejátszólista"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "A 8 bites audiót mindig konvertálja át 16 bitessé"
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Lejátszólista betöltése"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
-msgstr "Mindig konvertálja a 16 bites audiót 24 bitre"
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Lejátszólista mentése"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Hang"
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Kilépés"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Újrajátszási mód:"
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "Sz_erkesztés"
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Letiltva"
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Törlés"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Sáv"
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Mind kiválaszt"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Újrajátszási csúcs skála"
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Minden kiválasztást megszüntet"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
-msgstr "-12 dB"
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Kiválasztás megfordítása"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
-msgstr "+12 dB"
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Választás"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Újrajátszás előerősítése:"
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Vágás"
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Általanos előerősítés:"
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Keresés"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-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"
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr "Rendezés"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "Előző állapot helyreállítása indításkor"
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Zeneszám száma"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
-msgstr "Ne adja hozzá az archívumok tartalmát mappák hozzáadásakor"
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Előadó"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Dátum"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Lejátszás"
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Véletlenszerű"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Beállítás"
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Egyéb"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Beállítások"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
-msgstr "_Betöltés"
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Nézet"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
-msgstr "DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Státusz sor"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Bezáráskor a tálcára kerül"
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Hangszínszabályzó"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Rendszertálca ikon elrejtése"
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr "Tervező mód"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Napló"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Orosz CP1251 karakterkészlet detektálás és újrakódolás engedélyezése"
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Lejátszás"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
-msgstr "Kínai CP936 karakterkészlet detektálás és újrakódolás engedélyezése"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Keverés"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
-msgstr "Felhasználói felület képfrissítési rátája ( / mp ):"
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Ki"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "Címsáv szöveg szám lejátszásakor:"
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Számok"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Címsáv szöveg ha nincs lejátszás:"
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Albumok"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
-msgstr "GUI beépülő (újraindítás szükséges):"
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
-msgstr "Lejátszó"
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Ismétlés"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
-msgstr "Lejátszólista bezárása középső egér gombbal"
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Minden Szám"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Az éppen játszott dal félkövér betűtípussal"
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Egy szám"
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "A lapozás követi a lejátszást"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
-msgstr "Lejátszási listák automatikus elnevezése egyetlen mappa hozzáadásakor"
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "A kurzor követi a lejátszást"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
-msgstr "Oszlopok automatikus átméretezése az ablak kitöltéséhez"
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr "Állj a jelenlegi szám után"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
-msgstr "GUI/Egyéb"
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr "Állj a jelenlegi album után"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Felülírás"
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Ugrás az aktuális számra"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Előtér"
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Súgó"
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Háttér"
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_Változás napló"
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Idősáv/Hangerő színek"
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Közép"
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Világos"
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_Névjegy"
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Sötét"
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "Fordí_tók"
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Alap"
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Keresés"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Szöveg"
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Megállítás"
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Fülek színe"
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Lejátszás"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-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)"
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Szünet"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Páros sor"
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Előző"
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Páratlan sor"
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Következő"
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Kiválasztott sor"
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Véletlenszerű lejátszás"
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Kiválasztott szöveg"
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "Névjegy"
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Kurzor"
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Kilépés"
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Lejátszólista színek"
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "A sáv tulajdonságai"
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Színek"
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "Hely:"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Proxy szerver engedélyezése"
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Beállítások"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Proxy szerver cím:"
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Alkalmaz"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Proxy szerver port:"
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Bezár"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Proxy típusa:"
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metaadat"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Proxy felhasználónév:"
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Tulajdonságok"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Proxy jelszó:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Mégsem"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Adja meg a fejléc új címét"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Típus"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Formátum"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Formátum szerinti rendezés:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(ha nem üres)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Igazítás"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Bal\nJobb\nKözép"
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Szöveg szín:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Kimeneti bővítmény:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Kimeneti eszköz:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "A 8 bites audiót mindig konvertálja át 16 bitessé"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Mindig konvertálja a 16 bites audiót 24 bitre"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Kimeneti mintavételi ráta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "48KHz többszörösei (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "44.1KHz többszörösei (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Hang"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Feldolgozás:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+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"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Előző állapot helyreállítása indításkor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Ne adja hozzá az archívumok tartalmát mappák hozzáadásakor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr "\"Állj a jelenlegi szám után\" opció kikapcsol, ha már lefutott"
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr "\"Állj a jelenlegi album után\" opció kikapcsol, ha már lefutott"
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Lejátszás"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr "DSP Lánc Beállítás"
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "_Betöltés"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Bezáráskor a tálcára kerül"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Rendszertálca ikon elrejtése"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Japán SHIFT-JIS karakterkészlet detektálás és újrakódolás engedélyezése"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr "Kínai CP936 karakterkészlet detektálás és újrakódolás engedélyezése"
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr "Felhasználói felület képfrissítési rátája ( / mp ):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Címsáv szöveg szám lejátszásakor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Címsáv szöveg ha nincs lejátszás:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr "GUI beépülő (újraindítás szükséges):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr "Lejátszó"
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr "Lejátszólista bezárása középső egér gombbal"
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Lejátszási listák automatikus elnevezése egyetlen mappa hozzáadásakor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr "Oszlopok automatikus átméretezése az ablak kitöltéséhez"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pixelek"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Lejátszólista"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr "GUI/Egyéb"
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Felülírás"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Háttér (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Alap:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Sötét:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Világos:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Közép:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Szöveg:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Félkövér"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Dőlt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Kiválasztott szöveg:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Fülek sáv"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Normál sávok:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Kiválasztott sávok:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Oszlopok:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Csoport fejléc:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Előtér:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Páros:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Páratlan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Kiválasztott:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Kurzor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Háttér:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses 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)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Kinézet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Proxy szerver engedélyezése"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Proxy szerver cím:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Proxy szerver port:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Proxy típusa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Proxy felhasználónév:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Proxy jelszó:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP Felhasználó azonosító:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Hálózat"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "Hozzárendelt gyorsbillentyűk:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Akció:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Nincs beállítva>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Billentyű kombináció:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Globális billentyűk"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"Használd az Alkalmaz gombot a változások mentéséhez,\n"
-"vagy a Visszavonás gombot a változások elvetéséhez.\n"
-"A változások NEM lesznek mentve\n"
-"amíg nem nyomja meg az Alkalmaz gombot."
+msgstr "Használd az Alkalmaz gombot a változások mentéséhez,\nvagy a Visszavonás gombot a változások elvetéséhez.\nA változások NEM lesznek mentve\namíg nem nyomja meg az Alkalmaz gombot."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "_Alapértelmezett"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Billentyűk"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Verzió:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Copyright"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Bővítmények"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Alapértékekre állít"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Verzió:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
 msgstr "Egyedi Cím megadása"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Csoportosítás ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Rendezés ..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Formátum"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Növekvő"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Csökkenő"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "DSP beépülő kiválasztása"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Beépülő"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Növekvő\nCsökkenő"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Címkeíró beállításai"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "ID3v2 írása"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "ID3v1 írása"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "APEv2 írása"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "ID3v2 vágása"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "ID3v1 vágása"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "APEv2 vágása"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 verzió"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Ajánlott)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Ajánlott)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v2 karakter kódolás (alapértelmezés iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 írása"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1039,1334 +1589,2379 @@
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Alapértékekre állít"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Bővítmények:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Gombok beállítása"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Szín:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Szöveg szín:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Ikon:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Címke:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Válassz műveletet"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
+msgstr "Itt lehetőség van egyedi címet beállítani bármely számnak. Ez főleg a rádióállomások számára hasznos. Egyedi cím beállítása a \"Hely hozzáadása\" ablakban is lehetséges. A cím maga az \"Előadó\"-t megjelenítő oszlopokban látszódik. Ha az \"Előadó\" mező látható, akkor \"egyedi előadő\" formában jelenik meg, egyébként csak \"egyedi\" formában."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Szerkeszt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Szerkesztés (helyben)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Előadó / Album"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Érték szerkesztése"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Sáv száma"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Mező neve:"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr "Lejátszólista várakozósorhoz adás"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Mező értéke:"
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr "Lejátszólista várakozósorból törlés"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr "Metaadatok újratöltése"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr "Törlés a lemezről"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Oszlop hozzáadása"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Oszlop szerkesztése"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Öszlop törlése"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Mégse"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Csoport"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Nincs"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Előadó/Dátum/Album"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Fájl megnyitása..."
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "DeaDBeeF EQ Hangszín mentése"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ hangszín fájlok (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "DeaDBeeF EQ Hangszín betöltése..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ hangszínek (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 EQ Hangszín importálása..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ hangszínek (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Hangszín mentés"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Hangszín betöltés"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 Hangszín betöltése"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Engedélyezve"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Mind nulla"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Preamp nulla"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Sávok nulla"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Új lejátszólista"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Támogatott hangformátumok"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Minden fájl (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Egyéb fájlok (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeadBeeF lejátszólista fájlok (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Szimbolikus linkek követése"
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid "Configure %s"
-msgstr "%s beállítása"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 nap %d:%02d:%02d"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Alapértelmezett Audio Eszköz"
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d nap %d:%02d:%02d"
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "teljes lejátszási idő"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Megállítva"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr "Valóban szeretné folytatni mentés nélkül?"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Leállítva"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Lejátszólista átnevezése"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Új lejátszólista (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Lejátszólista fülekkel"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Szétosztás (felső és alsó)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Szétosztás (bal és jobb)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Fülek"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Lejátszólista fülek"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Kiválasztás tulajdonságai"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Album borító kijelző"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektrum"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Gomb"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Léptető sáv"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Lejátszó vezérlők"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Hangerő sáv"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune hangok"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Súgó fájl olvasása sikertelen"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Súgó fájl betöltése sikertelen"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "A lejátszónak futó folyamatai vannak a háttérben. Ha most kilép, a folyamat meghíúsul vagy megszakad. Ez adatvesztést eredményezhet."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Még mindig kiszeretne lépni?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Törlés"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Balra"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Jobbra"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Közép"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Sáv"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Nincs"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Növekvő"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Csökkenő"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Ajánlott)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Előadó / Album"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Sáv száma"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Időtartam"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Elem index"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Lejátszás"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Album kép"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Előadó - Album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Év"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Sáv száma"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Zenekar / Album előadó"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodek"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bitráta"
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Oszlop hozzáadása"
+
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Oszlop szerkesztése"
+
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Öszlop törlése"
+
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Csoport"
+
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Előadó/Dátum/Album"
+
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Metaadatok újratöltése"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Lejátszólista törlése"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Új lejátszólista hozzáadása"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Fájl megnyitása..."
+
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "%s beállítása"
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Valóban szeretné folytatni mentés nélkül?"
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Alapértelmezett Audio Eszköz"
+
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Fájlok hzzáadása..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Inicializálás..."
+
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Név"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Oszlop fejlécek mutatása"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Érték"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Már módosított adatokat ezen a számon."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Valóban bezárja az ablakot?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Többszörös értékek"
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Billentyű"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Többszörös értékek"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Címkék írása..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Mező neve"
+
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Név:"
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "A szövegmezők tartalma nem kezdődhet kettősponttal vagy aláhúzásjellel"
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Mező hozzáadása sikertelen"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Egy azonos névvel rendelkező mező már létezik, adj meg egy másik nevet."
+
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "\"%s\" beépülő nem elérhető"
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Csere erre..."
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Beszúrás..."
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Kivág"
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Másol"
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Beilleszt"
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogén"
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Kiterjesztés"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Kitöltés"
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Hangok:"
+
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
+
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "elemek"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Lejátszólista böngésző"
+
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Egyedi héjparancsok"
+
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Bezár"
+
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Szerkesztő parancs"
+
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Parancs:"
+
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
+
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Egyedi számok"
+
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Csak egy dalnál működik."
+
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Többszörös Sávok"
+
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Működik többszörös sávokon is."
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Helyi"
+
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Munka csak helyi fájlokkal"
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Távoli"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Munka csak távoli fájlokkal (például: http:// folyamok)"
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Általános (Főmenü)"
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Parancs hozzáadása"
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "Ez törli a kiválasztott héj parancsot. Valóban akarja?"
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Törlés jóváhagyva"
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID nem lehet üres vagy egyedi\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Cím nem lehet üres.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "Héjparancs nem lehet üres.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Érvénytelen érték"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "monó"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "sztereó"
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Fájlok hzzáadása..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Sáv címe"
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Inicializálás..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Előadó"
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Már módosított adatokat ezen a számon."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Összes sáv"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Valóban bezárja az ablakot?"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Műfaj"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Többszörös értékek"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Zeneszerző"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Billentyű"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Lemez száma"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Érték"
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Többszörös értékek"
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Megjegyzés"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Címkék írása..."
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Kódoló / Eladó"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Mező neve"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Copyright"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Név:"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Hely"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "A szövegmezők tartalma nem kezdődhet kettősponttal vagy aláhúzásjellel"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Alsáv Index"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Mező hozzáadása sikertelen"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Címke típus(ok)"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr ""
-"Egy azonos névvel rendelkező mező már létezik, adj meg egy másik nevet."
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Beépített Cue támogatás"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Mező hozzáadása"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Mező eltávolítása"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Használat: deadbeef opciók -- fájl(ok)\n"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opciók:\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr ""
 
-#: ../main.c:92
-#, 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"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Surround engedélyezése"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Kilépés a lejátszóból\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "ALSA újramintavételezés használata"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Verzió információ megjelenítése és kilépés\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Preferált puffer méret"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Lejátszás indítása\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Preferált periódus méret"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Lejátszás megállítása\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Lejátszás szüneteltetése\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Beágyazott címkék olvasása"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Lejátszás/Szüneteltetés\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Olvasás helyi könyvtárból"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
-" --play-pause Lejátszás indítása, lejátszás közben szüneteltetés\n"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Ugrás a következő számra a lejátszólistában\n"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Ugrás az előző számra a lejátszólistában\n"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Véletlenszerű szám a lejátszólistáról\n"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../main.c:103
-#, 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"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
 
-#: ../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"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
-" FMT %%-szintakszis: előadó, tcím, album,\n"
-" lhossz, nsávszáma, yév, cmegjegyzés,\n"
-" copyright, eltelt idő\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
-" pl.: --nowplaying \"%%a - %%t\" kiírása kerül \"előadó "
-"- cím\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Alapértelmezett"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Igen"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Nem"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Elem Index\n"
-"Lejátszás\n"
-"Albumborító\n"
-"Előadó - Album\n"
-"Előadó\n"
-"Album\n"
-"Cím\n"
-"Hossz\n"
-"Sáv\n"
-"Zenekar / Album Előadó\n"
-"Egyéb"
-
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
-"Balra\n"
-"Jobbra"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
-"Letiltás\n"
-"Sáv\n"
-"Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
-"Növekvő\n"
-"Csökkenő"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
-"2.3 (Ajánlott)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 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
-#: ../translation/extra.c:3
-msgid "Add Audio CD"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Keresés a Last.fm-en"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Audio CD hozzáadása"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "ALSA újramintavételezés használata"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Eszköz felszabadítása amíg megállított a lejátszás"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Előnyben részesíti a CD-Text olvasást a CDDB szerverről"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Preferált puffer méret"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Preferált periódus méret"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Scrobbler engedélyezése"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Most játszott tiltása"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "NRG képfájl támogatás engedélyezése"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Felhasználónév"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Jelszó"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Eszköz fájl"
-
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 mintavételezési ráta bug megoldása"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Átmeneti tár frissítési periódus (óra)"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Átalakítás"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Beágyazott címkék olvasása"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Olvasás helyi könyvtárból"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Helyi borító fájl maszk"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Minőség / Algoritmus"
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Olvasás a last.fm-ről"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Olvasás az albumart.org-ról"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "CDDB/FreeDB használata"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Előnyben részesíti a CD-Text olvasást a CDDB szerverről"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (pl. 'freedb.org')"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB port száma (pl. '888')"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "CDDB protokoll HTTP felett előnyben részesítése"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Fájlkiterjesztések (elválasztó jel: ;)"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "NRG képfájl támogatás engedélyezése"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Újramintavételezés minősége (0..2, a nagyobb a jobb)"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-bites kimenet (alapértelmezett 16)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
 msgid "Max song length (in minutes)"
 msgstr "Maximális szám hossz (percben)"
 
-#: ../translation/extra.c:40
+#: ../translation/plugins.c:137
+#, no-c-format
 msgid "Fadeout length (seconds)"
 msgstr "Elhalkítás hossza (másodperc)"
 
-#: ../translation/extra.c:41
+#: ../translation/plugins.c:139
+#, no-c-format
 msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-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:44
-msgid "Status icon volume control sensitivity"
-msgstr "Az állapot ikon hangerőszabályzóként viselkedik"
-
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Egyedi státuszikon"
-
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "gtk_init futtatása --sync kapcsolóval (hibakereső mód)"
-
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Értesítés címének formátuma"
-
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Értesítési tartalom formátuma"
-
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Albumborító mutatása"
-
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Albumborító mérete (px)"
-
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio szerver"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Mintavétel"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Relatív keresési útvonal"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Abszolút keresési útvonal"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
 
-#: ../translation/extra.c:60
-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)"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (HVSC)"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bitek száma mintánként (8 / 16)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Alapértelmezett dal hossz (mp)"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ bank konfigurációs állomány"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Sáv címe"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Előadó"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Összes sáv"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Műfaj"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Zeneszerző"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Lemez száma"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Megjegyzés"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Kódoló / Eladó"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Hely"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Alsáv Index"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Címke típus(ok)"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Beépített Cue támogatás"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Kodek"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Fájlkiterjesztések (elválasztó jel: ;)"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Átalakítás"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Cél mintavételezési rátája"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Minőség / Algoritmus"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Automatikus mintavételezi ráta (minden beállítást felülír)"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Szünetmentes (gapless) lejátszás tiltása (gyorsabb keresés)"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Surround engedélyezése"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr "Beépített %s"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Azonos nevű fájl már létezik. Felülírjam?"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Konvertálási figyelmeztetés"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Kérlek, válassz egy enkódert"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Konvertálási hiba"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Konvertálás..."
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Mappa kiválasztása..."
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Hiba"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Fájlok lemezről való törlésekor megerősítést kér"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Új enkóder hozzáadása"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Enkóder szerkesztése"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Az állapot ikon hangerőszabályzóként viselkedik"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Mentett hangszín törlése"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Egyedi státuszikon"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Kódolók"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Kimeneti könyvtár:"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Írás a dal forrás könyvtárába"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Mappa struktúra megtartása"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Kimeneti fájlnév:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:281
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Next Genre"
 msgstr ""
-"A kiterjesztés (pl: .mp3) automatikusan hozzáadódi.\n"
-"Hagy üresen a mezőt az alapértelmezéshez (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Kódoló:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Szálak száma:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Kimeneti minta formátuma:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Forrás formátum megtartása"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit lebegőpontos"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Ha a fájl létezik:"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Kérdés"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Felülírás"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Névtelen kódoló"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Kimeneti fájl kiterjesztése:"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Például: mp3"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Parancssor:"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:319
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Album"
 msgstr ""
-"Példa: lame - %o\n"
-"%i bemeneti fájlnév, %o kimeneti fájlnév, - stdin használata"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:321
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Track Number"
 msgstr ""
-"%o - kimeneti fájlnév\n"
-"%i - átmeneti bemeneti fájlnév"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Metódus:"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Cső"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Átmeneti fájl"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Címkeíró"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Hozzáadés"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nem található a képfájl: %s"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
-"Kérdés\n"
-"Felülírás"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
-"Cső\n"
-"Átmeneti fájl"
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
-msgstr "Egyedi héjparancsok"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Szerkeszt"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
-msgstr "Bezár"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
-msgstr "Szerkesztő parancs"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
-msgstr "Parancs:"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:377
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
-msgstr "ID:"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
-msgstr "Egyedi számok"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Scrobbler engedélyezése"
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
-msgstr "Csak egy dalnál működik."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Most játszott tiltása"
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
-msgstr "Többszörös Sávok"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Felhasználónév"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Jelszó"
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
-msgstr "Működik többszörös sávokon is."
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
-msgstr "Helyi"
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
-msgstr "Munka csak helyi fájlokkal"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
-msgstr "Távoli"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
-msgstr "Munka csak távoli fájlokkal (például: http:// folyamok)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
-msgstr "Általános (Főmenü)"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
-msgstr "Parancs hozzáadása"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Értesítés címének formátuma"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Törlés"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Értesítési tartalom formátuma"
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "Ez törli a kiválasztott héj parancsot. Valóban akarja?"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Albumborító mutatása"
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
-msgstr "Törlés jóváhagyva"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Albumborító mérete (px)"
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
-msgstr "ID nem lehet üres vagy egyedi\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
-msgstr "Cím nem lehet üres.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Eszköz fájl"
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
-msgstr "Héjparancs nem lehet üres.\n"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
-msgstr "Érvénytelen érték"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Támogatott hangformátumok"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Minden fájl (*)"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Fájlok megnyitása..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Fájlok hozzáadása a lejátszólistához..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Mappák hozzáadása a lejátszólistához..."
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Szimbolikus linkek követése"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Fájlok törlése a diszkről"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Mintavétel"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
-"A fájlok el fognak veszi. Folytatja?\n"
-"(Ez a párbeszéd ablak kikapcsolható a GTKUI bővítmény beállításaiban)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Lejátszólista betöltése"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Egyedi héjparancsok konfigurálása"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Egyéb fájlok (*)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Relatív keresési útvonal"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Lejátszólista mentése másként"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Abszolút keresési útvonal"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "DeadBeeF lejátszólista fájlok (*.dbpl)"
+#: ../translation/plugins.c:466
+#, no-c-format
+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)"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Érvénytelen érték(ek)."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Semmi nincs kiválasztva."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Alapértelmezett dal hossz (mp)"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Csere erre..."
-
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Beszúrás..."
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Kivág"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Másol"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Beilleszt"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Mozgatás megakadályozása"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Fül mozgatása balra"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Fül mozgatása jobbra"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Fül törlése"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Fül átnevezése"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Új fül hozzáadása"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Oszlop fejlécek mutatása"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ bank konfigurációs állomány"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Homogén"
-
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Kiterjesztés"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Kitöltés"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Gombok beállítása"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr "Hangok:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Lejátszólista szerkesztése"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Lejátszólista átnevezése"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Lejátszólista törlése"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Új lejátszólista hozzáadása"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Név"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Lejátszólista böngésző"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-0.6.2.tar.bz2/po/id.po -> deadbeef-1.9.6.tar.bz2/po/id.po Changed

@@ -1,2339 +1,3964 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Andika Triwidada <andika@gmail.com>, 2010
+# Andika Triwidada <andika@gmail.com>, 2010,2014
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/id/)\n"
-"Language: id\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Andika Triwidada <andika@gmail.com>, 2010,2014\n"
+"Language-Team: Indonesian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Tentang DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Cara pakai: deadbeef opsi -- berkas\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "ChangeLog DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Opsi:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Penerjemah DeaDBeeF"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h Cetak bantuan (pesan ini) dan keluar\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Simpan Preset EQ DeaDBeeF"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Keluar dari pemutar\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ preset files (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Cetak info versi dan keluar\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Memuat DeaDBeeF EQ Preset..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Mulai memutar\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ presets (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Berhenti memutar\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Impor Foobar2000 EQ Preset..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Jeda memutar\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ presets (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Jungkitkan jeda\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Simpan Preset"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Mulai memutar bila berhenti, jungkitkan jeda bila tidak\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Memuat Preset"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Lagu selanjutnya di daftar putar\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Impor Foobar2000 Preset"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Lagu sebelumnya di daftar putar\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Aktifkan"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Acak lagu di daftar putar\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Nolkan Semua"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Tambahkan berkas ke daftar putar yang telah ada\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Nolkan Preamp"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Memberi tahu plugin GUI mana yang akan digunakan, bakunya adalah \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Zero Bands"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Cetak nama trek terformat ke stdout\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Preset"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-sintaks: artis, tjudul, album,\n lpanjang, nomor trek, ytahun, ckomentar,\n rhak cipta, elama putar\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 hari %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " contoh: --nowplaying \"%%a - %%t\" akan mencetak \"artis - judul\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d hari %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " untuk info selengkapnya, lihat %s\n"
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " CATATAN: --nowplaying tidak digunakan lagi.\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Mencetak nama trek terformat ke stdout, menggunakan format judul baru\n"
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " Sintaks FMT: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " contoh: --nowplaying-tf \"%%artist%% - %%title%%\" akan mencetak \"artis - judul\"\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Mencetak atau mengatur level volume deadbeef.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " Parameter NUM dapat ditentukan dalam persen (nilai absolut atau kenaikan/penurunan)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " atau dalam dB -50, 0 (jika dengan akhiran).\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:162
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Berhenti | %d trek | %s waktu putar total"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Contoh: --volume 80, --volume +10, --volume -5, atau --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr " --plugin=PLUG Mengirim perintah ke plugin tertentu. Gunakan PLUG=main untuk mengirim perintah ke deadbeef itu sendiri.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr " Untuk mendapatkan perintah spesifik plugin, gunakan --plugin=PLUG --help\n"
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr " --plugin-list Daftar semua plugin yang tersedia termasuk indikasi untuk plugin yang mendukung perintah.\n"
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Baku"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Ya"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Jeda | "
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Tidak"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Folder keluaran:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Menulis ke folder trek sumber"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Pertahankan struktur folder"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Menyalin jika formatnya tidak berubah"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Tag ulang setelah penyalinan"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Nama berkas keluaran:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-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"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Ekstensi (mis. .mp3) akan ditambahkan secara otomatis.\nBiarkan ruas kosong untuk baku (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Daftar Putar Baru"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Enkoder:"
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Daftar Putar Baru (%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Pratata DSP:"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Daftar putar dengan tab"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Cacah thread:"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Daftar putar"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Format cuplikan keluaran:"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Pembelah (atas dan bawah)"
+#: ../plugins/converter/converter.glade.h:14
+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 "Pertahankan format sumber\nInt bertanda 8 bit\nInt bertanda 16 bit\nInt bertanda 24 bit\nInt bertanda 32 bit\nFloat 32 bit"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Pembelah (kiri dan kanan)"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Ketika berkas telah ada:"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Tab daftar putar"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Lewati\nTanya\nTimpa"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Properti pilihan"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Sunting Prataa Enkoder"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Tampilan seni album"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Judul:"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Enkoder Tanpa Judul"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Spektrum"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Ekstensi berkas keluaran:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Mis. mp3"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Baris perintah:"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Tombol"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Contoh: lame - %o\n%i untuk berkas masukan, %o untuk berkas keluaran, - untuk stdin"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - nama berkas keluaran\n%i - nama berkas masukan sementara"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metoda:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Pipa\nBerkas Smnt.\nBerkas Sumber"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Gagal saat membaca berkas bantuan"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Gagal memuat berkas bantuan"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Penulis tag"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Penyunting Pratata DSP"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Judul"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Preset DSP Tanpa Judul"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Tambah"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Buang"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Tata"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Pilih Plugin DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Pratata"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Bawaan %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Berkas telah ada. Timpa?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Peringatan pengonversi"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Harap pilih enkoder"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Kesalahan pengonversi"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Mengonversi..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Pilih folder..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Gagal menyimpan pratata enkoder"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Periksa izin folder pratata, coba pilih judul yang berbeda, atau kosongkan sebagian ruang disk"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Anda masih ingin keluar?"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Pratata dengan nama yang sama sudah ada. Cobalah untuk memilih judul lain."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Kesalahan"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Tambahkan enkoder baru"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Sunting enkoder"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Hapus pratata"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Tindakan ini akan menghapus pratata yang dipilih. Anda yakin?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Enkoder"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Tambahkan plugin ke rantai DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Gagal menyimpan pratata DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Pratata DSP Baru"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Sunting Pratata DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Pratata DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Bantuan"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Pertahankan format sumber"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit signed int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit signed int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit signed int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Lewati"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Tanya"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Timpa"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Pipe"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Berkas Smtr."
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Berkas Sumber"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Tak bisa temukan berkas pixmap: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Buka berkas..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Tambahkan berkas ke daftar putar..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Tambahkan folder ke daftar putar..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Muat Daftar Putar"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Simpan Daftar Putar Sebagai"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Tentang DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "ChangeLog DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Penerjemah DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr "Memutar Trek"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr "Trek yang Dipilih"
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Content-Type"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Plugin"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Nilai tak valid."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Tak ada yang dipilih."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Berkas"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Buka berkas"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Tambah berkas"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Tambah folder"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Tambah lokasi"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Daftar putar baru"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Muat daftar putar"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Simpan daftar putar"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Bersihkan"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Pilih semua"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Pilih tak satupun"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Balik pilihan"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Pilihan"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Buang"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Crop"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Cari"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Urut menurut"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Judul"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Nomor trek"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Artis"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Tanggal"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Acak"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Ubahan"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Preferensi"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Tilik"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Bilah status"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
-msgstr "Equalizer"
+msgstr "Ekualiser"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Mode rancangan"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Log"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Putar"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Urutan"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Linier"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Acak trek"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Acak album"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Perulangan"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Ulang semua"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Ulang satu lagu"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Jangan ulangi"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Kocok"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Mati"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Trek"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Album"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Trek Acak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Ulangi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Semua Trek"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Satu Trek"
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Gulir berikut pemutaran"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Kursor berikut pemutaran"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Berhenti setelah trek ini"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Berhenti setelah album ini"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Lompat ke trek kini"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "Ba_ntuan"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_ChangeLog"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Penerjemah"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Cari"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Berhenti"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Putar"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Jeda"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Selanjutnya"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Putar Acak"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Tentang"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Bantuan"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Properti Trek"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Lokasi:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "Ter_apkan"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Tutup"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Properti"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Judul:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Batal"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Masukkan judul kolom baru disini"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Jenis:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Indeks Butir"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Memutar"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Album Seni"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artis - Album"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Durasi"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Nomor Trek"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Band / Artis Album"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Format pengurutan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(jika tidak kosong)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Perataan:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Kiri"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Kanan"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Batal"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Kiri\nKanan\nTengah"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Warna teks:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Keluaran plugin:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Perangkat keluaran:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Selalu konversikan audio 8 bit ke 16 bit"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Selalu konversi audio 16 bit ke 24 bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Laju cuplik target:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Untuk kelipatan 48kHz (96k, 192k, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Untuk kelipatan 44,1kHz (88,2k, 176,4k, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Berdasarkan laju cuplik masukan"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Timpa laju cuplik"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Suara"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Mode replaygain:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Matikan"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Mode sumber:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Trek"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Skala puncak replaygain"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Memroses:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Nihil\nTerapkan penguatan\nTerapkan penguatan dan cegah pemangkasan sesuai dengan puncak\nHanya cegah pemangkasan"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Replaygain preamp:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Preamp global:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Preamp dengan info RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Preamp tanpa info RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-"Tambahkan berkas dari baris perintah (atau manajer berkas) ke daftar putar "
-"ini:"
+msgstr "Tambahkan berkas dari baris perintah (atau manajer berkas) ke daftar putar ini:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Lanjutkan sesi sebelumnya pada awal mula"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Jangan tambahkan dari arsip ketika menambahkan folder"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "Opsi \"Berhenti setelah trek ini\" akan mati setelah terpicu"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "Opsi \"Berhenti setelah album ini\" akan mati setelah terpicu"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Tata"
+msgstr "Putar"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "Preset Rantai DSP"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Muat"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Minimalkan ke baki saat awal mula"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Menutup meminimalkan ke baki"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Sembunyikan ikon baki sistem"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "Hapus dari disk harus menggunakan Tong Sampah"
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Aktifkan deteksi dan pengodean ulang SHIFT-JIS Jepang"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Fungsikan deteksi dan pengodean ulang CP1251 Rusia"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Fungsikan deteksi dan pengodean ulang CP936 Cina"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Laju penyegaran antar muka (berapa kali per detik):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Teks bilah judul ketika memutar:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Teks bilah judul ketika berhenti:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Plugin GUI (mengubah perlu memulai ulang):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Menampilkan waktu pemutaran pilihan di bilah status"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr ""
+msgstr "Pemutar"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Tutup daftar putar dengan tombol tengah tetikus"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr "Sembunyikan butir menu konteks \"Hapus dari Disk\""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Beralih ke lagu berikutnya saat lagu yang sedang diputar dihapus dari disk"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Namai otomatis daftar putar ketika menambahkan sebuah folder"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
+msgstr "Otomatis ubah ukuran kolom agar pas dengan jendela"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "piksel"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Daftar putar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "GUI/Rupa-rupa"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Timpa"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Latar depan"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Latar belakang"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Warna bilah loncat/volume"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Bilah"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Tengah"
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Latar Belakang (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Basis:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Gelap:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Terang:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Tengah:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Teks:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Tebal"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Miring"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Trek normal:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Trek sedang diputar:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Trek yang dipilih:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Kolom:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Tajuk grup:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Depan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Genap:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Ganjil:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Dipilih:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Kursor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Latar:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Timpa (kehilangan tema tampilan pohon GTK, tetapi mempercepat perenderan)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr "Warna dasar visualisasi ubahan"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Terang"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Gelap"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Basis"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Teks"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Warna strip tab"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Timpa (kehilangan tilikan pohon GTK, tapi mempercepat perenderan)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Baris genap"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Baris ganjil"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Baris yang dipilih"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Teks yang dipilih"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Kursor"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Warna daftar putar"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Warna"
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Visualisasi tampilan"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Penampilan"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Memfungsikan pustaka media"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "Tambah / hapus folder musik"
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Pustaka Media"
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Aktifkan Server Proksi"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Alamat Server Proksi:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Port Server Proksi:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Jenis Proksi:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Nama Pengguna Proksi:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Sandi Proksi:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "Sunting Pemetaan Content-Type (tipe isi)"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Jaringan"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Tombol Pintas yang Ditugaskan:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
-msgstr ""
+msgstr "Aksi:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Tak ditata>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
-msgstr ""
+msgstr "Kombinasi tombol:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Tombol pintas global"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "Gunakan tombol Terapkan untuk menyimpan perubahan Anda,\natau tombol Kembalikan untuk membatalkan perubahan Anda.\nPerubahan TIDAK akan disimpan\njika Anda tidak menekan Terapkan."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "_Baku"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Tombol pintas"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Versi:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Info"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Lisensi"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Hak cipta"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Reset ke nilai bawaan"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Plugin"
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versi: "
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Atur Judul Ubahan"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Kelompokkan Menurut ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Urutkan menurut ..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Format"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Naik"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Turun"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Pilih Plugin DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Plugin"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Naik\nTurun"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Pengaturan Penulis Tag"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Tulis ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Tulis ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Tulis APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Hapus ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Hapus ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Hapus APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Versi ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Disarankan)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Disarankan)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Pengodean karakter ID3v1 (bawaan adalah iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Tulis ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "Pemetaan Content-Type"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
+msgstr "Tabel ini mendefinisikan pengikatan antara jenis konten stream jaringan dan plugin dekoder DeaDBeeF. Misalnya, berkas mp3 dapat memiliki jenis konten \"audio/x-mpeg\", dan perlu diterjemahkan oleh plugin \"stdmpg\" milik DeaDBeeF, atau plugin \"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Reset ke nilai bawaan"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Plugin:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
-msgstr ""
+msgstr "Properti tombol"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
+msgstr "Warna:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "Ikon:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr "Label:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr "Pilih aksi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr "Dialog ini memungkinkan pengaturan judul khusus untuk trek apa pun. Ini paling berguna untuk stasiun radio. Opsi untuk mengatur judul ubahan juga ada dalam dialog \"Tambah Lokasi\". Judul itu sendiri terlihat di kolom yang menampilkan bidang metadata \"Artis\". Ini akan terlihat seperti \"ubahan artis\" jika bidang Artis ada, atau hanya \"ubahan\" bila tidak."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Sunting"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Sunting (di tempat)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Tambah ruas baru..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Sunting Nilai"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Nama ruas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Nilai ruas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Gunakan karakter ; untuk memisahkan beberapa nilai."
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "Log DeaDBeeF"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Bersihkan"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Berkas Saat Ini:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Status"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Batal"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Perbarui Tag Berkas"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "Salin laporan"
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Hanya tampilkan plugin dengan konfigurasi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr "Sunting Beberapa Trek"
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Nama Ruas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr "Nilai Tunggal"
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr "Nilai Individu"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Simpan Preset EQ DeaDBeeF"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ preset files (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Memuat DeaDBeeF EQ Preset..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ presets (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Impor Foobar2000 EQ Preset..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ presets (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Simpan Preset"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Memuat Preset"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Impor Foobar2000 Preset"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Aktifkan"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Nolkan Semua"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Nolkan Preamp"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Zero Bands"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Daftar Putar Baru"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Format suara yang didukung"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Semua berkas (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Format daftar putar yang didukung"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Semua berkas"
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Berkas lain (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Berkas daftar putar DeaDBeeF (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Ikuti symlink"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 hari %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d hari %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "total waktu putar"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Diistirahatkan"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "waktu putar pilihan"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Dihentikan"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Ubah Nama Daftar Putar"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Menghapus daftar putar"
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Anda yakin ingin menghapus daftar putar '%s'?"
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Daftar Putar Baru (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Daftar putar dengan tab"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Pembelah (atas dan bawah)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Pembelah (kiri dan kanan)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Tab"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Tab daftar putar"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Properti pilihan"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Tampilan seni album"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Osiloskop"
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektrum"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Tombol"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Kendali pemutaran"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Bilah volume"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Penilik log"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Penampil pustaka media"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Gagal saat membaca berkas bantuan"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Gagal memuat berkas bantuan"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Anda masih ingin keluar?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr " Berkas akan dipindahkan ke tong sampah.\n\n(Dialog ini dapat dimatikan di pengaturan plugin GTKUI)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr " Berkas akan hilang.\n\n(Dialog ini dapat dimatikan di pengaturan plugin GTKUI)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr "Anda yakin ingin menghapus berkas yang dipilih?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr "Anda yakin ingin menghapus semua %d berkas yang dipilih?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr "Anda yakin ingin menghapus semua %d berkas dari daftar putar saat ini?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "Anda yakin ingin menghapus berkas yang sedang diputar?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Menghapus berkas dari disk"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Hapus"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Kiri"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Kanan"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Tengah"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Menurut urutan main"
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Trek"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Tak ada"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Terapkan penguatan"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Terapkan penguatan dan cegah pemangkasan sesuai dengan puncak"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Hanya cegah pemangkasan"
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Naik"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Turun"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Disarankan)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
 msgid "Artist / Album"
 msgstr "Artis / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
 msgid "Track No"
 msgstr "No Trek"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Durasi"
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Indeks Butir"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Memutar"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Album Seni"
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artis - Album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Tahun"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Nomor Trek"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Band / Artis Album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodek"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Laju Bit"
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
 msgid "Add column"
 msgstr "Tambah kolom"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
 msgid "Edit column"
 msgstr "Sunting kolom"
 
-#: ../plugins/gtkui/plcommon.c:1224
+#: ../plugins/gtkui/playlist/plcommon.c:869
 msgid "Remove column"
 msgstr "Hapus kolom"
 
-#: ../plugins/gtkui/plcommon.c:1234
+#: ../plugins/gtkui/playlist/plcommon.c:884
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "Sematkan grup saat menggulir"
 
-#: ../plugins/gtkui/plcommon.c:1239
+#: ../plugins/gtkui/playlist/plcommon.c:889
 msgid "Group by"
 msgstr "Kelompokkan berdasarkan"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Tak ada"
-
-#: ../plugins/gtkui/plcommon.c:1250
+#: ../plugins/gtkui/playlist/plcommon.c:900
 msgid "Artist/Date/Album"
 msgstr "Artis/Tanggal/Album"
 
-#: ../plugins/gtkui/pluginconf.c:42
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Putar Berikutnya"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Putar Nanti"
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Hapus dari Antrean Putar"
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Muat Ulang Metadata"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "Po_tong"
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "_Salin"
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "Tem_pel"
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Hapus dari Disk"
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Hapus Daftar Putar"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Tambah Daftar Putar Baru"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr "Terapkan kembali pengurutan terakhir yang Anda pilih setiap kali menambahkan berkas baru ke daftar putar ini"
+
+#: ../plugins/gtkui/pluginconf.c:47
 msgid "Open file..."
 msgstr "Buka berkas..."
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/gtkui/pluginconf.c:559
 #, c-format
 msgid "Configure %s"
 msgstr "Tata %s"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Perangkat Suara Bawaan"
-
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin/prefwin.c:140
 msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+msgstr "Anda memodifikasi pengaturan tombol pintas, tetapi tidak menyimpan perubahan Anda."
 
-#: ../plugins/gtkui/prefwin.c:350
+#: ../plugins/gtkui/prefwin/prefwin.c:142
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "Anda yakin ingin melanjutkan tanpa menyimpan?"
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Perangkat Suara Bawaan"
 
-#: ../plugins/gtkui/progress.c:56
+#: ../plugins/gtkui/progress.c:62
 msgid "Adding files..."
 msgstr "Menambah berkas..."
 
-#: ../plugins/gtkui/progress.c:89
+#: ../plugins/gtkui/progress.c:95
 msgid "Initializing..."
 msgstr "Menginisialisasi..."
 
-#: ../plugins/gtkui/trkproperties.c:168
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Kemajuan Memperbarui Tag Berkas"
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nama"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Penguatan Album"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Penguatan Trek"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Puncak Album"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Puncak Trek"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Berhasil"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Berkas tidak ditemukan"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Berkas tak valid"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Cari (hasil %list_total%)"
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Tampilkan Kepala Kolom"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Nilai"
+
+#: ../plugins/gtkui/trkproperties.c:116
 msgid "You've modified data for this track."
 msgstr "Anda telah mengubah data bagi trek ini."
 
-#: ../plugins/gtkui/trkproperties.c:170
+#: ../plugins/gtkui/trkproperties.c:118
 msgid "Really close the window?"
 msgstr "Yakin akan menutup jendela?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
 msgid "Multiple values "
-msgstr "Nilai berganda"
+msgstr "Nilai berganda "
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
+#: ../plugins/gtkui/trkproperties.c:455
 msgid "Key"
 msgstr "Kunci"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Nilai"
-
-#: ../plugins/gtkui/trkproperties.c:522
+#: ../plugins/gtkui/trkproperties.c:473
 msgid "Multiple values"
 msgstr "Nilai berganda"
 
-#: ../plugins/gtkui/trkproperties.c:701
+#: ../plugins/gtkui/trkproperties.c:662
 msgid "Writing tags..."
 msgstr "Menulis tag..."
 
-#: ../plugins/gtkui/trkproperties.c:730
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "Butir"
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Ruas"
+
+#: ../plugins/gtkui/trkproperties.c:1210
 msgid "Field name"
 msgstr "Nama ruas"
 
-#: ../plugins/gtkui/trkproperties.c:733
+#: ../plugins/gtkui/trkproperties.c:1213
 msgid "Name:"
 msgstr "Nama:"
 
-#: ../plugins/gtkui/trkproperties.c:745
+#: ../plugins/gtkui/trkproperties.c:1226
 msgid "Field names must not start with : or _"
 msgstr "Nama ruas tak boleh diawali dengan : atau _"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
 msgid "Cannot add field"
 msgstr "Tak bisa menambah ruas"
 
-#: ../plugins/gtkui/trkproperties.c:784
+#: ../plugins/gtkui/trkproperties.c:1267
 msgid "Field with such name already exists, please try different name."
 msgstr "Ruas dengan nama itu sudah ada, harap coba nama lain."
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Tambah ruas"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Hapus ruas"
-
-#: ../main.c:90
+#: ../plugins/gtkui/widgets.c:460
 #, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Cara pakai: deadbeef opsi -- berkas\n"
+msgid "Widget \"%s\" is not available"
+msgstr "Widget \"%s\" tidak tersedia"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opsi:\n"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Gantikan dengan..."
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help or -h Cetak bantuan (pesan ini) dan keluar\n"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Sisip..."
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Keluar dari pemutar\n"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Potong"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Cetak info versi dan keluar\n"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Salin"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Mulai memutar\n"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Tempel"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Berhenti memutar\n"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Induk"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Jeda memutar\n"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Beberapa widget jenis ini tidak didukung"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Jungkitkan jeda\n"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Ukuran Proporsional"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
-" --play-pause Mulai memutar bila berhenti, jungkitkan jeda bila "
-"tidak\n"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Kunci Tinggi Panel Atas"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Lagu selanjutnya di daftar putar\n"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Kunci Lebar Panel Kiri"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Lagu sebelumnya di daftar putar\n"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Kunci Tinggi Panel Bawah"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Acak lagu di daftar main\n"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Kunci Lebar Panel Kanan"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr ""
-" --queue Tambahkan berkas ke daftar putar yang telah ada\n"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Ganti Nama Tab"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Hapus Tab"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Tambah Tab Baru"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Pindahkan Tab Ke Kiri"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Pindahkan Tab Ke Kanan"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr "Mode Perenderan"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Bawaan"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr "Multikanal"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Ya"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr "Skala"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Tidak"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "Otomatis"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Kiri\n"
-"Kanan"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Dimatikan\n"
-"Trek\n"
-"Album"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr "3x"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
-msgstr ""
-"Naik\n"
-"Turun"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
-msgstr ""
-"2.3 (Disarankan)\n"
-"2.4"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr "Durasi Fragmen"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, 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 ""
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 ms"
 
-#. 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"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 ms"
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 ms"
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 ms"
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 ms"
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Cari di Last.fm"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr "Band 1/12 Oktaf"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Pakai pencuplikan ulang ALSA"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr "Band 1/24 Oktaf"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Lepaskan perangkat ketika berhenti"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr "Ukuran Celah"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Ukuran penyangga yang disukai"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr "1/2 Bar"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Ukuran perioda yang disukai"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr "1/3 Bar"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Fungsikan scrobbler"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr "1/4 Bar"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Matikan nowplaying"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr "1/5 Bar"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Nama pengguna"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr "1/6 Bar"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Sandi"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr "1/7 Bar"
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "URL Scrobble"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr "1/8 Bar"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr "1/9 Bar"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Berkas perangkat"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr "1/10 Bar"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Perluas Kotak Sebanyak 1 Item"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Kecilkan Kotak Sebanyak 1 Item"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Ambil dari tag yang tertanam"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogen"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Ambil dari folder lokal"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Kembangkan"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Penuhi"
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Ambil dari last.fm"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Konfigurasikan Tombol"
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Ambil dari albumart.org"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr "Skala _dB"
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr "Skala _Linier"
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Pakai CDDB/FreeDB"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr "Skala _Kubik"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Suara:"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "url CDDB (mis. 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "nomor port CDDB (mis. '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Lebih suka protokol CDDB daripada HTTP"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr "Salinan %s"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Fungsikan dukungan citra NRG"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr "Salinan %s (%d)"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Kualitas pencuplikan ulang (0..2, lebih tinggi berarti lebih bagus)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "keluaran 8-bit (bawaan adalah 16)"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr " (diistirahatkan)"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Panjang lagu maks (dalam menit)"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr " (dihentikan)"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr ""
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr " (diputar)"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr ""
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr ""
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Butir"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr ""
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Peramban daftar putar"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Perintah Shell Ubahan"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Tutup"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Perintah Sunting"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Perintah:"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Nama bentuk bebas, misalnya \"Perintah Shell Saya\""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "ID Perintah, biasanya itu mesti sesuatu yang pendek, misalnya \"youtube_open\". Harus unik."
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Trek Tunggal"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Bekerja pada satu trek."
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Beberapa Trek"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Bekerja pada beberapa trek."
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Lokal"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Bekerja pada berkas lokal."
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Remote"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Generik (Menu Utama)"
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "Item akan muncul di menu utama"
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Tambah Perintah"
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "Aksi ini akan menghapus perintah shell yang dipilih. Anda yakin?"
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Konfirmasi Hapus"
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID harus tidak kosong dan unik.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Judul harus tidak kosong.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "Perintah Shell harus tidak kosong.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Nilai Tak Valid"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 ""
 
-#: ../translation/extra.c:70
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
+
+#: ../translation/extra.c:3
 msgid "Track Title"
 msgstr "Judul Trek"
 
-#: ../translation/extra.c:71
+#: ../translation/extra.c:4
 msgid "Performer"
-msgstr ""
+msgstr "Penampil"
 
-#: ../translation/extra.c:76
+#: ../translation/extra.c:9
 msgid "Total Tracks"
 msgstr "Total Trek"
 
-#: ../translation/extra.c:77
+#: ../translation/extra.c:10
 msgid "Genre"
 msgstr "Genre"
 
-#: ../translation/extra.c:78
+#: ../translation/extra.c:11
 msgid "Composer"
 msgstr "Komponis"
 
-#: ../translation/extra.c:79
+#: ../translation/extra.c:12
 msgid "Disc Number"
-msgstr "Nomor Disk"
+msgstr "Nomor Cakram"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Total Cakram"
 
-#: ../translation/extra.c:80
+#: ../translation/extra.c:14
 msgid "Comment"
 msgstr "Komentar"
 
-#: ../translation/extra.c:81
+#: ../translation/extra.c:15
 msgid "Encoder / Vendor"
 msgstr "Enkoder / Vendor"
 
-#: ../translation/extra.c:83
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Hak cipta"
+
+#: ../translation/extra.c:17
 msgid "Location"
 msgstr "Lokasi"
 
-#: ../translation/extra.c:84
+#: ../translation/extra.c:18
 msgid "Subtrack Index"
 msgstr "Indeks Subtrek"
 
-#: ../translation/extra.c:85
+#: ../translation/extra.c:19
 msgid "Tag Type(s)"
 msgstr "Tipe Tag"
 
-#: ../translation/extra.c:86
+#: ../translation/extra.c:20
 msgid "Embedded Cuesheet"
 msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Kodek"
-
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Ekstensi Berkas (pisahkan dengan ';')"
-
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Konversi"
-
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Laju Cuplik Target"
-
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Kualitas / Algoritma"
-
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Laju Cuplik Otomatis (menimpa Laju Cuplik Target)"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Matikan pemutaran tanpa celah (pemindaian lebih cepat)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
 msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr "Lebih suka emu Ken daripada Satoh (surround tak akan bekerja)"
 
-#: ../translation/extra.c:102
+#: ../translation/plugins.c:12
+#, no-c-format
 msgid "Enable surround"
 msgstr "Fungsikan surround"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr ""
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Pakai pencuplikan ulang ALSA"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Berkas telah ada. Timpa?"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Ukuran penyangga yang disukai"
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Peringatan pengonversi"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Ukuran perioda yang disukai"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Harap pilih enkoder"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr "Segarkan Gambar Sampul"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Kesalahan pengonversi"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Ambil dari tag yang tertanam"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Mengonversi..."
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Ambil dari folder lokal"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Pilih folder..."
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Ambil dari Last.fm"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Gagal menyimpan preset enkoder"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Ambil dari MusicBrainz"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
-msgstr ""
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Ambil dari Albumart.org"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr ""
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "Ambil dari World of Spectrum (berkas AY)"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Kesalahan"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Simpan berkas yang diunduh ke folder musik"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Tambahkan enkoder baru"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Ketika tidak ada karya seni yang ditemukan"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Sunting enkoder"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "biarkan kosong"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Hapus preset"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "gunakan sampul baku DeaDBeeF"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr ""
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "tampilkan gambar ubahan"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Enkoder"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Path gambar ubahan"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr ""
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "Simpan ke nama berkas"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr ""
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr "Folder pencarian (dipisahkan ;)"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr ""
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "Penyegaran singgahan (jam)"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr ""
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "Nama berkas singgahan yang disederhanakan"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr ""
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Ukuran gambar"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr ""
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "Drive CD yang akan dimuat"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Drive CD Audio"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Berkas"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Tambahkan CD Audio"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:73
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Gunakan protokol CDDB"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Fungsikan dukungan citra NRG"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Kecepatan drive untuk pemutaran normal"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Maks"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Gunakan koreksi kesalahan cdparanoia saat me-rip"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Konversi"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Kualitas / Algoritma"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Kualitas pencuplikan ulang"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Volume menaik (ramp)"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Hanya Hidup/Mati"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Penuh"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "Keluaran 8-bit"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit signed int"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Ekstensi Berkas (pisahkan dengan ';')"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit signed int"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit signed int"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit signed int"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit float"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Panjang lagu maks (dalam menit)"
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Tanya"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Timpa"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Mis. mp3"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:154
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:158
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Deselect All"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Metoda:"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Pilih Semua"
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Pipe"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Tambah Lokasi"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Berkas temporer"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Tambah folder"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Tambah Berkas"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Buka Berkas"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Tampilkan Halaman Bantuan"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Ulangi - Mati"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Penulis tag"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Ulangi - Satu Trek"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Penyunting Preset DSP"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Ulangi - Semua"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Preset DSP Tanpa Judul"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Tambah"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Kocok - Trek Acak"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Tak bisa temukan berkas pixmap: %s"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Kocok - Album"
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Kocok - Trek"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Kocok - Mati"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Sunting"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
-msgstr "Tutup"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
-msgstr "Perintah Sunting"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
-msgstr "Perintah:"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:218
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
-msgstr "ID:"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Sembunyikan Ekualiser"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Tampilkan Ekualiser"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Sembunyikan Jendela Pemutar"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Tampilkan Jendela Pemutar"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Cari"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "Pengaturan ikon status:"
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Ikon status ubahan"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr "Rupa-rupa:"
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Hapus"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Genre Sebelumnya"
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "Aksi ini akan menghapus perintah shell yang dipilih. Anda yakin?"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Komposer Sebelumnya"
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
-msgstr "Konfirmasi Hapus"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Artis Sebelumnya"
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Album Sebelumnya"
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Genre Berikutnya"
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Komposer Berikutnya"
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Artis Berikutnya"
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "Album Berikutnya"
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Daftar Putar Berikutnya"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Daftar Putar Sebelumnya"
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "Beralih ke Daftar Putar 10"
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr "Beralih ke Daftar Putar 9"
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "Beralih ke Daftar Putar 8"
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Beralih ke Daftar Putar 7"
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "Beralih ke Daftar Putar 6"
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Beralih ke Daftar Putar 5"
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Beralih ke Daftar Putar 4"
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Beralih ke Daftar Putar 3"
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Beralih ke Daftar Putar 2"
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Beralih ke Daftar Putar 1"
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Urut menurut Tanggal"
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Urut menurut Artis"
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Urut menurut Album"
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Urut menurut Nomor Trek"
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Urut menurut Judul"
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Balikkan Pilihan"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Hapus Daftar Putar"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
-msgstr "Nilai Tak Valid"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Format suara yang didukung"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Pindah"
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Semua berkas (*)"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Turunkan Trek"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Buka berkas..."
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Naikkan Trek"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Tambahkan berkas ke daftar putar..."
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Jungkitkan Bisu"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Tambahkan folder ke daftar putar..."
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Jungkitkan Jeda"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Ikuti symlink"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Putar\\/Jeda"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Cari 1d Maju"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Cari 1d Mundur"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Cari 5d Maju"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Cari 5d Mundur"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Cari 1% Maju"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Cari 1% Mundur"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Cari 5% Maju"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Cari 5% Mundur"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Besarkan Suara"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Pelankan Suara"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Hapus berkas dari disk"
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
-"Berkas akan hilang. Lanjut?\n"
-"(Dialog ini dapat dimatikan dalam pengaturan plugin GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Muat Daftar Putar"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Fungsikan scrobbler"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Berkas lain (*)"
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Matikan nowplaying"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Simpan Daftar Putar Sebagai"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Nama pengguna"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Berkas daftar putar DeaDBeeF (*.dbpl)"
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Sandi"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Content-Type"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "URL Scrobble"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Nilai tak valid."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Tak ada yang dipilih."
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Berkas perangkat"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr ""
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Fungsikan pencatatan log"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Preamp"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1,2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1,8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2,5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3,5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "Ekstensi berkas"
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr "Baris perintah enkoder"
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr "Metode transfer data"
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "Berkas sementara"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "Berkas sumber"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "Tulis tag ID3v2"
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "Tulis tag ID3v1"
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "Tulis tag APEv2"
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "Tulis tag FLAC"
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "Tulis tag OggVorbis"
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "Tulis tag MP4"

deadbeef-1.9.6.tar.bz2/po/ie.po Added

@@ -0,0 +1,3963 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: DeaDBeeF Player\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Interlingue (http://app.transifex.com/deadbeef-player/deadbeef-player/language/ie/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ie\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Usage: deadbeef optiones -- file(s)\n"
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "Optiones:\n"
+
+#: ../src/main.c:136
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr ""
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Surtir ex li reproductor\n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr ""
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Comensar li reproduction\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Stoppar li reproduction\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pausar li reproduction\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Sequent canzone in li playlist\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Precedent canzone in li playlist\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr ""
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Adjunter file(s) al actual playlist\n"
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Un plugin de GUI a usar, li predefinit es \"GTK2\"\n"
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " Sintaxe %% del FMT: artist, titul, album,\n l=duration, track-numeró, y=annu, comenta,\n jure ed., e=position\n"
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " p.ex.: --nowplaying \"%%a - %%t\" va producter \"artist - titul\"\n"
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " NOTE: --nowplaying es obsolet.\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " Sintaxe del FMT: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " p.ex: --nowplaying-tf \"%%artist%% - %%title%%\" va producter \"artist - titul\"\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Monstar o assignar li volúmine de deadbeef.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Exemples: --volume 80, --volume +10, --volume -5 o --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Predefinit"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Yes"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "No"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Fólder de production:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Extension (p.ex. .mp3) va esser appendet automaticmen.\nLassa vacui por li predefinit (%tracknumber%. %artist% - %title%)."
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Codificator:"
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Si li file existe:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Titul:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Codificator sin nómine"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "P.ex. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Linea de comandes:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Exemple: lame - %o\n%i por fonte, %o por resultate, - por stdin"
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - nómine de file de resultate\n%i - nómine de file temporari de fonte"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metode:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Canal\nFile temporari\nFile de fonte"
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Titul"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Adjunter"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Remover"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Configurar"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Predefinites"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Avise de convertor"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Errore de convertor"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Convertente..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Selecter un fólder..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Errore"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Avise"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Codificatores"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Auxilie"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Omisser"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Confirmar"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Superscrir"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Tube"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Temporari file"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "File de fonte"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Aperter file(s)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Adjunter file(s) al playlist..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Adjunter fólder(es) al playlist..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Cargar un playlist"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Gardar li playlist quam"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Pri About DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Diario de modification de DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Traductores de DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Tip-de-contenete"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Plugines"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Ínvalid valore(s)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Necós es selectet."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_File"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Aperter file(s)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Adjunter file(s)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Adjunter fólder(es)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Adjunter un localisation"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Crear un playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Cargar un playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Salvar li playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "S_urtir"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Modificar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Vacuar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Selecter omnicos"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Deselecter omnicos"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Inverter li selection"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Selection"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Tonder"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Trovar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr "Ordinar secun"
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Nró del track"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Artist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Date"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Hasardal"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Personalisat"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Preferenties"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Vise"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Panel del statu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Equalisator"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Diarium"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "Re_production"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Mixter"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "No"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Tracks"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Albums"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Hazardal tracks"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Repetir"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Omni tracks"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Singul track."
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Rular al reproductet element"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr "Stoppar pos li actual track"
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr "Stoppar pos li actual album"
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Ear al actual track"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "Au_xilie"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "Diarium de _modification"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_Pri"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Traductores"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Serchar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Stoppar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Reproducter"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pausar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Precedent"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Seq"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "Pri"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Surtir"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Proprietás del track"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "Localisation:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Parametres"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Applicar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Cluder"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Proprietás"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Annular"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Tip:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Formate:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Alineament:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Levul\nDextri\nCentre"
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Color del textu:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Plugin de exeada:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Aparate de exeada:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Por multiplicas de 48KHz (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Por multiplicas de 44.1KHz (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Son"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Processante:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Ne adjunter ex archives quande on adjuncta fólderes"
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Reproduction"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "_Cargar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Permisser detection de Japanesi SHIFT-JIS"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Plugin de GUI (modification besona relansa):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr "Reproductor"
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pixeles"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Barras"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Funde (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Obscur:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Medial:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Textu:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Grass"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Italic"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Selectet textu:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Cartes"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Normal track(s):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Reproductet track:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Selectet track(s):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Columnes:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Rubrica de gruppe"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Avanplan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Par:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Ínpar:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Selectet:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Apuntator:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Funde:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Visualisationes"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Aspecte"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Usar li media-biblioteca"
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Media-biblioteca"
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Usar un servitore proxy"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Adresse de proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Portu de proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Tip de proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Nómine de usator de proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Contrasigne de proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr "Agente de usator HTTP:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Rete"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr "Assignat rapid-tastes:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr "Action:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr "<Ne assignat>"
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr "Rapid-taste:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr "Global rapid-taste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr "Pre_definit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr "Rapid-tastes"
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Configuration"
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Info"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Licentie"
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Version: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr "Gruppar secun..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr "Ordinar secun..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr "Formate"
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Ascendentmen\nDescendentmen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Scrir ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Scrir ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Scrir APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Remover ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Remover ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Remover APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "Version de ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Recomendat)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "Codification de caracteres ID3v1 (predefinit: iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Scrir ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr "Content-Type:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr "Plugines:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr "Proprietás de buton"
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "Color:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "Icone:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr "Etiquette:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr "Selecte un action"
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Modificar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Adjunter un nov camp..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Modificar li valore"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Nómine de camp:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Valore de camp:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Usa ; por separar multiplic valores."
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "Diarium de DeaDBeeF"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Vacuar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Actual file:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Statu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Anullar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Nómine de camp:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr "Singul valore"
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "EQ predefinints de DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "EQ predefinits d DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "EQ predefinits de Foobar2000 (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importar predefinits de Foobar2000"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Permisser"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nov playlist"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Omni files (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Omni files"
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Altri files (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Files de playlist de DeaDBeeF (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 die %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dies %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "duration total"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Pausat"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "duration del selection"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Stoppat"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Renominar li playlist"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Removente un playlist"
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Nov playlist (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Playlist con cartes"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Cartes"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Cartes de playlistes"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Proprietás de selection"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Oscilloscop"
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spectre"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Buton"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Barra de position"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Controles de reproduction"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Barra de volúmine"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Voces chiptune"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Visor de diariums"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Navigator del media-biblioteca"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Remover li files ex li disco"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Deleter"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Levul"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Dextri"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Centre"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Track"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Null"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Applicar li gania"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Secun ascension"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Secun descension"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Recomendat)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artist / Album"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Track nró"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Duration"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Index del element"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Reproductent"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Arte del album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artist - Album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Annu"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Numeró del track"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codec"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Adjunter un columne"
+
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Modificar li columne"
+
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Remover li columne"
+
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Gruppar secun"
+
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artist/Date/Album"
+
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Reproducter quam li sequent"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Reproducter plu tard"
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Remover ex li linea"
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Recargar li metadata"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "Exci_ser"
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "Co_llar"
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Remover ex li disco"
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Remover li playlist"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Adjunter un nov playlist"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Aperter un file..."
+
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Configurar %s"
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Audioaparate predefinit"
+
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Adjuntente files..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Inicialisante..."
+
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nómine"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Gania de album"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Gania de track"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Pic del album"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Pic del track"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Successe"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "File ne esset trovat"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "File es ínvalid"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Sercha (%list_total% resultates)"
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Monstrar li rubricas de columnes"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Valore"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Cluder ti-ci fenestre?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Multiplic valores "
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Clave"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Multiplic valores"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Scriente tags..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "Element"
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Camp"
+
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Nómine de camp"
+
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Nómine:"
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Ne successat adjunter un camp"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Un camp con li sam nómine ja exister, ples usar un altri nómine."
+
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Vicear per..."
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Inserter..."
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Exciser"
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Collar"
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Parent"
+
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Renominar li carte"
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Remover li carte"
+
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Adjunter un carte"
+
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Mover li carte a levul"
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Mover li carte a dextri"
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr "Multicanal"
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr "Scale"
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "Auto"
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
+
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
+
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr "3x"
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr "Duration de fragment"
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 ms"
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 ms"
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 ms"
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 ms"
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 ms"
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr "1/2 de mesura"
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr "1/3 de mesura"
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr "1/4 de mesura"
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr "1/5 de mesura"
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr "1/6 de mesura"
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr "1/7 de mesura"
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr "1/8 de mesura"
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr "1/9 de mesura"
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr "1/10 de mesura"
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogen"
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Expander"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Plenar"
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Configurar li buton"
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr "Scale _lineari"
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr "_Cubic scale"
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Voces:"
+
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr "Copie de %s"
+
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr "Copie de %s (%d)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr " (pausat)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr " (stopped)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr " (reproductent)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Elementes"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Navigator de playlist"
+
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Cluder"
+
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Modificar li comande"
+
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Comande:"
+
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
+
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Visibil nómine, p.ex «Mi comande de shell»"
+
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "ID de comande, curt e unic, p.ex. «youtube_open»."
+
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Singul tracks"
+
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Processe un singul track."
+
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Multiplic tracks"
+
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Processe multiplic tracks."
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Local"
+
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Processe local files."
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Lontan"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Supporta lontan files (p.ex. fluvies http://)"
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Géneric (Menú principal)"
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Adjunter un comande"
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID deve esser present e unic.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Li titul deve esser present.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Ínvalid valores"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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: li file de configuration de freepats ne esset trovat. Ples installar li timidity-freepats paccage, o provide un rute de freepats.cfg in li configuration del plugin."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
+
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Track Titul"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Performant"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Tracks total"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Genre"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Compositor"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Nró del disco"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Discos total"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Comenta"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Codificator / Venditor"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Jure editorial"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Localisation"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr ""
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tip(es) de tags"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr ""
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr ""
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr ""
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr ""
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr ""
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr ""
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
+
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Obtener ex li inbedat tags"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Obtener ex un local fólder"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Obtener de Last.fm"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Obtener de MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Obtener de Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "Obtener de World of Spectrum (files AY)"
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Gardar descargat files al fólderes de musica"
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Dimension de image"
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Unité de audio CD"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "File"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Adjunter un audio CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr "Usar CDDB o GnuDB"
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Preferer CD-Text ye CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr "Adresse de CDDB (p.ex. 'gnudb.gnudb.org')"
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr "Portu de CDDB (p.ex. '8880')"
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Usar li protocol CDDB"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr ""
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Max"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Converter"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Qualitá / algoritm"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Complet"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr ""
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr ""
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr ""
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "BIOS de ColecoVision (por formate SGC)"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Deselecter omni"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Selecter omni"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Adjunter un localisation"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Adjunter fólder(es)"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Adjunter file(s)"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Aperter file(s)"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Monstrar li págine de auxilie"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Mode de repetir"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Ne repetir"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Repetir li track"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Repetir omni"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Mode de mixter"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Hazardal tracks"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Mixter albums"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Mixter tracks"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Ne mixter"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Vise"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Tonder li selection"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Gardar li playlist"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Monstrar o celar li equalisator"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Celar li equalisator"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Monstrar li equalisator"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Monstrar o celar li reproductor"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Celar li fenestre del reproductor"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Monstrar li fenestre del reproductor"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Trovar"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr ""
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr ""
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr ""
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr "Varie:"
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr ""
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Usar caracteres de Unicode in vice de images por li statu de track"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "Duplicar li playlist"
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Saltar a"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Precedent genre"
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Precedent compositor"
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Precedent artist"
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Precedent album"
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Sequent genre"
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Sequent compositor"
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Sequent artist"
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "Sequent album"
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Seq playlist"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Precedent playlist"
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "Ear al playlist 10"
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr "Ear al playlist 9"
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "Ear al playlist 8"
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Ear al playlist 7"
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "Ear al playlist 6"
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Ear al playlist 5"
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Ear al playlist 4"
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Ear al playlist 3"
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Ear al playlist 2"
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Ear al playlist 1"
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Secun li date"
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Secun li artist"
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Secun li album"
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Secun li nró"
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Secun li titul"
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Inverter li selection"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Vacuar li playlist"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Mover"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Assurdar"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Reproducter/pausar"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Reproducter/pausar"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Ear 1% ad avan"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Ear 1% retro"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Ear 5% ad avan"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Ear 5% retro"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Augmentar li volúmine"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Diminuer li volúmine"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr ""
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr ""
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Nómine de usator"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Contrasigne"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr ""
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Preferer «Artist del album» ye «Artist»"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Inviar ID de MusicBrainz"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Infrastructura"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr ""
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr ""
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Monstrar li arte del album"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr ""
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "File de aparate"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Reproducter per un duplic clic"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Codification de nómine de aparate"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "Servitor PulseAudio (vacui=predefinit)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Predefinit duration del canzone (min)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Samplerate"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Omisser si plu curt quam (sec)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr ""
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr ""
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr ""
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr ""
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr ""
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr ""
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Mono-sint."
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Preamp"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1,2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1,8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2,5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3,5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr ""
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "Extension de file"
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr "Linea de comande de codificator"
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr "Metode de transmission de data"
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr "Canal (stdin)"
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "File temporari"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "File de fonte"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "Scrir li tag ID3v2"
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "Scrir li tag ID3v1"
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "Scrir li tag APEv2"
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "Scrir li tag FLAC"
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "Scrir li tag OggVorbis"
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "Scrir li tag MP4"

deadbeef-0.6.2.tar.bz2/po/it.po -> deadbeef-1.9.6.tar.bz2/po/it.po Changed

@@ -1,2338 +1,3969 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Mattia Fussi <mattia.fussi@gmail.com>, 2018
+# Mattia Marculli <jumpingtia@gmail.com>, 2015
+# Rosario <oirasor@inventati.org>, 2016
+# Rosario <oirasor@inventati.org>, 2016
+# Rosario <oirasor@inventati.org>, 2016
+# Stefano Mortellaro <fazen74@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/it/)\n"
-"Language: it\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Stefano Mortellaro <fazen74@gmail.com>, 2016\n"
+"Language-Team: Italian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/it/)\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"
+"Language: it\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "Opzioni:\n"
+
+#: ../src/main.c:136
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h Stampa l'aiuto ed esce\n"
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Esce dal player\n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Stampa la versione ed esce\n"
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Inizia la riproduzione\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Ferma la riproduzione\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pausa nella riproduzione\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Canzone successiva nella playlist\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Canzone precedente nella playlist\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Canzone casuale nella playlist\n"
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Aggiunge file(s) ad una playlist esistente\n"
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Stampa il nome della traccia formattato in stdout\n"
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: artista, titolo, album,\n lunghezza, traccianumero, yanno, commento,\n copyright, etrascorso\n"
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Predefinito"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Sì"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "No"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Titolo:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Titolo"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Aggiungi"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Configura"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Seleziona DSP plugin"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Predefiniti"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Attenzione"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Aiuto"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "File pixmap non trovato: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "A proposito di DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeadBeeF %s Changelog"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Traduttori di DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Plugins"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_File"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Apri file"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Aggiungi file"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Aggiungi cartella/e"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Aggiungi locazione"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Nuova playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Carica playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Salva playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Esci"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Modifica"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Pulisci"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Seleziona tutto"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Deseleziona tutto"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Inverti selezione"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Selezione"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Raccolte"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Cerca"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr "Ordina per"
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Traccia numero"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Artista"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Data"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Casuale"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Personalizza"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Visualizza"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Barra di stato"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Equalizzatore"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr "Modalitá design"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Riproduzione"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Scorri seguente riproduzione"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "La selezione segue la riproduzione"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr "Ferma dopo l'attuale traccia"
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr "Ferma dopo l'attuale album"
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Salta alla traccia corrente"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Aiuto"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_Changelog"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_About"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Translators"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Cerca"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Stop"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Riproduci"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pausa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Precedente"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Prossima"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Riproduzione casuale"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "About"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Esci"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Proprietà traccia"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "Localizzazione:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Applica"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Chiudi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Proprietà"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "A_nnulla"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Inserisci nuovo titolo colonna qui"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Formato:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Allineamento:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Colore testo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Plugin d'uscita:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Dispositivo d'uscita:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Converti file audio da 8bit a 16bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Converti file audio da 16bit a 24bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Suono"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+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/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Riprendi sessione precedente all'avvio"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Non aggiungere dagli archivi quando includi le cartelle"
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Riproduzione"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "_Load"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Chiudi minimizza nel vassoio di sistema"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Nasconde l'icona nel vassoio di sistema"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr "Frequenza aggiornamento schermata (n volte a secondo)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Testo della titlebar mentre riproduce:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Testo della titlebar quando fermata:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr ""
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Sovrascrivere"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Dark"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Light"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Testo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Grasseto"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Corsivo"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Testo in esecuzione:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Testo selezionato:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Traccia in esecuzione:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Colonne:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Selezionato:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Cursore:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Aspetto:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Abilita il server proxy"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Indirizzo del server proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Porta del server proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Tipo proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Nome utente del proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Password del proxy"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr "HTTP User Agent:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Rete"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr "Assegna Hotkey:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr "Azione:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr "Hotkey globale"
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr "Usa il bottone applica per salvare i cambiamenti,\nO il tasto ritorna per annullare i cambiamenti\nI cambiamenti NON saranno salvati\nse non premi applica."
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr "Scorciatoie da tastiera"
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:353
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr "A proposito di DeaDBeeF %s"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeadBeeF %s Changelog"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Ripristina predefiniti"
 
-#: ../plugins/gtkui/callbacks.c:626
-#, c-format
-msgid "DeaDBeeF Translators"
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versione:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr "Raggruppa per ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr "Ordina per ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Scrivi ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Scrivi ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Scrivi APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Strip ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Strip ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Strip APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "Versione ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (raccomandato)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 codifica caratteri (predefinito iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Scrivi ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr "Proprietá pulsante"
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "Colore:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "Icona:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr "Etichetta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr "Seleziona azione"
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Modifica"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Modifica (sul posto)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Aggiungi nuovo campo..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Modifica Valore"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Pulisci"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "File Corrente"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Stato"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Annulla"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:141
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Salva parametri predefiniti equalizzatore DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:148
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "DeadBeeF EQ preset files (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:187
+#: ../plugins/gtkui/eq.c:183
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Carica DeaDBeeF EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:191
+#: ../plugins/gtkui/eq.c:187
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "DeadBeeF EQ presets (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:252
+#: ../plugins/gtkui/eq.c:224
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Importa Foobar2000 EQ Preset"
 
-#: ../plugins/gtkui/eq.c:256
+#: ../plugins/gtkui/eq.c:228
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Foobar2000 EQ presets (*.feq)"
 
-#: ../plugins/gtkui/eq.c:321
+#: ../plugins/gtkui/eq.c:269
 msgid "Save Preset"
 msgstr "Salva preset"
 
-#: ../plugins/gtkui/eq.c:329
+#: ../plugins/gtkui/eq.c:277
 msgid "Load Preset"
 msgstr "Carica preset"
 
-#: ../plugins/gtkui/eq.c:337
+#: ../plugins/gtkui/eq.c:285
 msgid "Import Foobar2000 Preset"
 msgstr "Importa Foobar2000 Preset"
 
-#: ../plugins/gtkui/eq.c:362
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
 msgid "Enable"
 msgstr "Abilita"
 
-#: ../plugins/gtkui/eq.c:371
+#: ../plugins/gtkui/eq.c:320
 msgid "Zero All"
 msgstr "Tutto a zero"
 
-#: ../plugins/gtkui/eq.c:378
+#: ../plugins/gtkui/eq.c:327
 msgid "Zero Preamp"
 msgstr "Pre-ampl a zero"
 
-#: ../plugins/gtkui/eq.c:385
+#: ../plugins/gtkui/eq.c:334
 msgid "Zero Bands"
 msgstr "Bande a zero"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nuova playlist"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 giorno %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d giorni %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:179
-#, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Stop | %d tracce | %s tempo totale"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pausa |"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
-msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracce | %s tempo totale"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nuova playlist"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nuova Playlist (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:956
+#: ../plugins/gtkui/gtkui.c:1452
 msgid "Playlist with tabs"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr ""
+msgstr "Playlist con tab"
 
-#: ../plugins/gtkui/gtkui.c:960
+#: ../plugins/gtkui/gtkui.c:1456
 msgid "Splitter (top and bottom)"
-msgstr ""
+msgstr "Splitter (sopra e sotto)"
 
-#: ../plugins/gtkui/gtkui.c:961
+#: ../plugins/gtkui/gtkui.c:1457
 msgid "Splitter (left and right)"
-msgstr ""
+msgstr "Splitter (sinistra e destra)"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Schede"
+
+#: ../plugins/gtkui/gtkui.c:1460
 msgid "Playlist tabs"
-msgstr ""
+msgstr "Schede playlist"
 
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:1461
 msgid "Selection properties"
-msgstr ""
+msgstr "Seleziona proprietá"
 
-#: ../plugins/gtkui/gtkui.c:966
+#: ../plugins/gtkui/gtkui.c:1462
 msgid "Album art display"
-msgstr ""
+msgstr "Mostra copertina album"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
+#: ../plugins/gtkui/gtkui.c:1464
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:1465
 msgid "HBox"
-msgstr ""
+msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:1466
 msgid "VBox"
-msgstr ""
+msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
+#: ../plugins/gtkui/gtkui.c:1468
 msgid "Seekbar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Fallita la lettura del file di aiuto"
-
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Fallito il caricamento del file di aiuto"
-
-#: ../plugins/gtkui/gtkui.c:1171
-msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Attenzione"
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_File"
-
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Apri file"
-
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Aggiungi file"
-
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Aggiungi cartella/e"
-
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Aggiungi locazione"
-
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Nuova playlist"
-
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Carica playlist"
-
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Salva playlist"
-
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Esci"
-
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Modifica"
-
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Pulisci"
-
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Seleziona tutto"
-
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Deseleziona tutto"
-
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Inverti selezione"
-
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Selezione"
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Controlli playback"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Rimuovi"
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Livello volume"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Raccolte"
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Voci Chiptune"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Cerca"
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Titolo"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Fallita la lettura del file di aiuto"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr ""
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Fallito il caricamento del file di aiuto"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Album"
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Il player attualmente sta lavorando in background. Se esci ora, il processo verrà cancellato o interrotto. Comporta perdita di dati."
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Artista"
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Vuoi davvero uscire? "
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Casuale"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Personalizza"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Preferenze"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Visualizza"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Barra di stato"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Equalizzatore"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_Riproduzione"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Sinistra"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Ordina"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Destra"
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Lineare"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Centro"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Looping"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Scorri seguente riproduzione"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Traccia"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "La selezione segue la riproduzione"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Nessuno"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Aiuto"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Crescente"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_Changelog"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Decrescente"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr ""
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (raccomandata)"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr ""
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_About"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artista / Album"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Traccia N°"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Durata"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Cerca"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Riproduzione"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Stop"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Album Art"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Riproduci"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artista - Album"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Pausa"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Anno"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Precedente"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Traccia Numero:"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Prossima"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Band / Album Artista"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Riproduzione casuale"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codec"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "About"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bitrate"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Esci"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Aggiungi colonna"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Aiuto"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Modifica colonna"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Proprietà traccia"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Rimuovi colonna"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Raggruppamento"
+
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artista/Data/Album"
+
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Applica"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Chiudi"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Metadata"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Ricarica Metadata"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Proprietà"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Titolo:"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Inserisci nuovo titolo colonna qui"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Tipo:"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Riproduzione"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Album Art"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artista - Album"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Durata"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Apri file..."
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Band / Album Artista"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Formato:"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Sei sicuro di continuare senza salvare?"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Allineamento:"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Dispositivo audio predefinito"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Sinistra"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Sto aggiungendo i files..."
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Destra"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Inizializzazione..."
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "A_nnulla"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Plugin d'uscita:"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Dispositivo d'uscita:"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Suono"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Modalità ripetizione:"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Disabilita"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Traccia"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Valore"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Modalità di ReplayGain (volume regolabile)"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Hai modificato i dati per questa traccia."
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Vuoi davvero chiudere la finestra?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Tasti"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Scrittura tag..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-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/trkproperties.c:1210
+msgid "Field name"
+msgstr "Nome campo"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "Riprendi sessione precedente all'avvio"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Riproduzione"
-
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Configura"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Chiudi minimizza nel vassoio di sistema"
-
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Nasconde l'icona nel vassoio di sistema"
-
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "Testo della titlebar mentre riproduce:"
-
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Testo della titlebar quando fermata:"
-
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Sovrascrivere"
-
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Primo piano"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Di fondo"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Colori della Seekbar/Barra del volume"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Centrale"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Chiaro"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Scuro"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Base"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Testo"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Colore delle schede"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Sovrascrivi (perdita del tema GTK ma rendering più veloce)"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Righe pari"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Righe dispari"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Riga selezionata"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Testo selezionato"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Cursore"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Colori della playlist"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Colori"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Abilita il server proxy"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Indirizzo del server proxy:"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Porta del server proxy:"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Tipo proxy:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Nome utente del proxy:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Password del proxy"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Rete"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Plugins"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Scrivi ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Scrivi ID3v1"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Scrivi APEv2"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "Strip ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "Strip ID3v1"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "Strip APEv2"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "Versione ID3v2"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (raccomandato)"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 codifica caratteri (predefinito iso8859-1)"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "Scrivi ID3v2.4"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artista / Album"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Traccia N°"
-
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Aggiungi colonna"
-
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Modifica colonna"
-
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Rimuovi colonna"
-
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Raggruppamento"
-
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Nessuno"
-
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Artista/Data/Album"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Apri file..."
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Dispositivo audio predefinito"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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."
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Sto aggiungendo i files..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Titolo Traccia"
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Inizializzazione..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Artista"
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Hai modificato i dati per questa traccia."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Tracce Totali"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Vuoi davvero chiudere la finestra?"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Genere"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr ""
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Compositore"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Tasti"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Numero Disco"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Valore"
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Dischi Totali"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr ""
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Commento"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr ""
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Copyright"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr ""
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Locazione"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr ""
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tipo(i) di etichetta(e)"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr ""
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Cuesheet incorporato"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opzioni:\n"
-
-#: ../main.c:92
-#, 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:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Esce dal player\n"
-
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Stampa la versione ed esce\n"
-
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Inizia la riproduzione\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Ferma la riproduzione\n"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Abilita surround"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pausa nella riproduzione\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Usa resampling ALSA"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Canzone successiva nella playlist\n"
-
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Canzone precedente nella playlist\n"
-
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Canzone casuale nella playlist\n"
-
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Aggiunge file(s) ad una playlist esistente\n"
-
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
 msgstr ""
-" --nowplaying FMT Stampa il nome della traccia formattato in stdout\n"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
 msgstr ""
-" FMT %%-syntax: artista, titolo, album,\n"
-" lunghezza, traccianumero, yanno, commento,\n"
-" copyright, etrascorso\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
-" es: --nowplaying \"%%a - %%t\" dovrebbe stampare "
-"\"artista - titolo\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Predefinito"
-
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Sì"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "No"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
-"Sinistra\n"
-"Destra"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
-"Disabilita\n"
-"Traccia\n"
-"Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "Lascia vuoto"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
-"2.3 (raccomandato)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 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"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tipo(i) di etichetta(e)"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Cuesheet incorporato"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Codec"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:281
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:319
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:321
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Aggiungi"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "File pixmap non trovato: %s"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:377
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/ja.po -> deadbeef-1.9.6.tar.bz2/po/ja.po Changed

@@ -1,2069 +1,2604 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# hirkmt <hirkmt@gmail.com>, 2010,2014
-# hirkmt <hirkmt@gmail.com>, 2010,2014
+# Hironao Komatsu <hirkmt@gmail.com>, 2010,2014
+# Hironao Komatsu <hirkmt@gmail.com>, 2010,2014,2016
 # Hironao Komatsu <hironao@users.sourceforge.net>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/ja/)\n"
-"Language: ja\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Hironao Komatsu <hironao@users.sourceforge.net>, 2010\n"
+"Language-Team: Japanese (http://app.transifex.com/deadbeef-player/deadbeef-player/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "DeaDBeeF %s について"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "使い方: deadbeef オプション -- ファイル...\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s の更新履歴"
+msgid "Options:\n"
+msgstr "オプション:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF の翻訳者"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h ヘルプ (このメッセージ) を表示して終了\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "DeaDBeeF イコライザ設定の保存"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit プレイヤを終了する\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF イコライザ設定 (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version バージョン情報を表示して終了\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "DeaDBeeF イコライザ設定を読み込む..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play 再生を開始する\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF イコライザ設定 (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop 再生を停止する\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Foobar2000 イコライザ設定をインポート..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause ポーズする\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 イコライザ設定 (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause ポーズのトグル\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "イコライザ設定を保存"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause 停止中なら再生開始し、でなければポーズします\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "イコライザ設定の読み込み"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next プレイリストの次の曲へ\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 イコライザ設定をインポート"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev プレイリストの前の曲へ\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "有効にする"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random プレイリストからランダムに選んだ曲へ\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "すべてゼロに"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue ファイルを既存のプレイリストに追加する\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "プリアンプをゼロに"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN 使用する GUI プラグインを指定します。デフォルトは \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "バンドをゼロに"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying 書式 書式化されたトラック名を stdout に書き出します\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "プリセット"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " 書式 (%% に続けて): アーティストa, タイトルt, アルバムb,\n 長さl, トラック番号n, 年y, コメントc,\n 著作権r, 経過時間e\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 日 %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr "例: --nowplaying \"%%a - %%t\" は \"アーティスト - タイトル\" と表示されます\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d 日 %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " 詳細は %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "停止 | %d トラック | %s 合計演奏時間"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "注: --nowplaying は廃止されました。\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr "例: --nowplaying \"%%artist%% - %%title%%\" は \"アーティスト - タイトル\" と表示されます\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "ポーズ | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d トラック | %s 合計演奏時間"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "新規プレイリスト"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "新規プレイリスト (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "タブのついたプレイリスト"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "プレイリスト"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "上下分割"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "左右分割"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "デフォルト"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "プレイリストのタブ"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "選択のプロパティ"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "アルバムアートの表示"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "はい"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "スコープ"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "いいえ"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "スペクトラム"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "出力先フォルダ:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "元のトラックと同じフォルダに書く"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "フォルダ構造を保存する"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "ボタン"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "出力ファイル名:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "エンコーダ:"
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP のプリセット:"
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "スレッドの数:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "出力のサンプルのフォーマット:"
+
+#: ../plugins/converter/converter.glade.h:14
+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 "元のままにする\n8 bit 符号つき整数\n16 bit 符号つき整数\n24 bit 符号つき整数\n32 bit 符号つき整数\n32 bit 浮動小数点数"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "ファイルが存在するとき:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "スキップ\nプロンプト\n上書き"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "エンコーダのプリセット設定"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "タイトル:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "無題のエンコーダ"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "出力ファイルの拡張子:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "例: mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "コマンドライン:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - 出力先のファイル名\n%i - 入力の一時ファイル名"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "経由する:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "ヘルプファイルの読み込み中に失敗しました"
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "タグ書き出し"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "ヘルプファイルの読み込みに失敗しました"
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP プリセットエディタ"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "タイトル"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "無題の DSP プリセット"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "追加"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "取り除く"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "設定"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "DSP プラグインの選択"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "プラグイン"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "プリセット"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "組み込み %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "そのファイルは既に存在します。上書きしますか？"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "コンバータの警告"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "エンコーダを選択してください"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "変換エラー"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "変換中..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "フォルダの選択..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "エンコーダのプリセットの保存に失敗しました"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "フォルダのパーミッション、名前の重複、ディスクの空き容量を確認してください"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "それでも終了しますか？"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "同じ名前のプリセットが既にあります。別の名前で試してください。"
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "エラー"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "新規エンコーダの追加"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "エンコーダの編集"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "プリセットの削除"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "選択中のプリセットを削除します。続けますか？"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "警告"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "エンコーダ"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "プラグインを DSP チェインに追加"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "DSP プリセットの保存に失敗しました"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "新規の DSP プリセット"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "DSP プリセットの編集"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP プリセット"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "ヘルプ"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "元のままにする"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit 符号つき整数"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit 符号つき整数"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit 符号つき整数"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit 符号つき整数"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit 浮動小数点数"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "スキップ"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "尋ねる"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "上書きする"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "パイプ"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Pixmap ファイルが見つかりません: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "ファイルを開く..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "プレイリストにファイルを追加..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "プレイリストにフォルダを追加..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "プレイリストのロード"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "プレイリストに名前を付けて保存"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeaDBeeF %s について"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s の更新履歴"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF の翻訳者"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "コンテントタイプ"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "プラグイン"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "不正な値です。"
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "コンテントタイプとプラグインのフィールとは空にはできません。\nそして以下のルールに従ってください。\nコンテントタイプの例: 'audio/mpeg'\nプラグイン ID の例: 'stdmpg ffmpeg'\nプラグイン ID のリストはスペースで区切りとします。\nコンテントタイプは文字、数字、また '-' 記号で構成されます。\nプラグイン ID は文字と数字だけからなります。"
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "選択がありません。"
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "ファイルを開く(_O)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "ファイルを追加"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "フォルダを追加"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "場所を追加"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "新規プレイリスト"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "プレイリストをロード"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "プレイリストを保存"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "クリア(_C)"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "すべて選択"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "すべて選択解除"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "選択の反転"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "選択"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "取り除く"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "選択以外を取り除く"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "検索(_F)"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "...で並び替え"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "タイトル"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "トラック番号"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "アルバム"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "アーティスト"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "日付"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "ランダム"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "カスタム"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "設定"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "ステータスバー"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "イコライザ"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "デザインモード"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "再生(_P)"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "演奏順"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "順に"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "トラックをシャッフル"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "アルバムをシャッフル"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "ループ"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "全体をループ"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "単一の曲をループ"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "ループしない"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "再生に従ってスクロール"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "再生に従ってカーソルを移動"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "現在のトラックの再生後に停止"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "現在のアルバムの再生後に停止"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "現在のトラックへ飛ぶ"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "更新履歴(_C)"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "情報(_A)"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "翻訳者(_T)"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "検索"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "再生"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "ポーズ"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "前へ"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "次へ"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "ランダムに再生"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "情報"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "終了"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "ヘルプ"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "トラックのプロパティ"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "場所:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "設定"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "適用(_A)"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "メタデータ"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "プロパティ"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "タイトル:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "OK(_O)"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "新規カラムのタイトルをここに入力します"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "形式:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "アイテムのインデックス"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "再生"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "アルバムアート"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "アーティスト - アルバム"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "演奏時間"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "トラック番号"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "バンド / アルバムのアーティスト"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "書式:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "配置:"
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "左"
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "右"
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "配置:"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "キャンセル(_C)"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "左\n右\n中央"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "OK(_O)"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "テキスト色:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "出力プラグイン:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "出力デバイス:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "8 bit オーディオを常に 16 bit に変換する"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "16 bit オーディオを常に 24 bit に変換する"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "音声"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "リプレイゲインのモード:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "無効"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "トラック"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "リプレイゲインのピークを調整する"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "リプレイゲインのプリアンプ:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "全体のプリアンプ:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
 msgstr ""
-"コマンドライン (あるいはファイルマネージャ) からこのプレイリストにファイルを"
-"追加"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "コマンドライン (あるいはファイルマネージャ) からこのプレイリストにファイルを追加"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "立ち上げ時に前回のセッションを復元する"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "フォルダを追加するときアーカイブを含まない"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "\"現在のトラックの再生後に停止\" オプションは作動後にオフになる"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "\"現在のアルバムの再生後に停止\" オプションは作動後にオフになる"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "再生"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "設定"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "DSP チェインプリセット"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "ロード(_L)"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "ウィンドウを閉じたときシステムトレイに格納"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "システムトレイのアイコンを隠す"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "ロシア語の CP1251 の検出と記録を有効にする"
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "日本語 SHIFT-JIS の検出と記録を有効にする"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "中国語の CP936 の検出と記録を有効にする"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "インタフェースの更新頻度 (毎秒):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "再生中のタイトルバーの文字列:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "停止中の文字列:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI プラグイン (再スタートが必要です):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "プレーヤ"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr "プレイリストをマウスの中ボタンで閉じる"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "再生中のトラックは太字で表示する"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "単一のフォルダを追加するときはプレイリスト名を自動でつける"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr "カラムをウィンドウに合わせて自動リサイズする"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "プレイリスト"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "GUI/他"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "デフォルトを上書きする"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "前景色"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "背景色"
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "シークバーと音量バーの色"
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "基本:"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "中間色"
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "暗色:"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "明色"
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "明色:"
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "暗色"
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "中間色:"
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "基底色"
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "テキスト:"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "文字色"
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "太字"
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "タブの色"
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "斜体:"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr ""
-"デフォルトを上書きする (GTKテーマが不適用になりますが描画が高速化します)"
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "再生中のテキスト:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "選択中のテキスト:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "タブ片"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "通常のトラック:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "再生中のトラック:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "選択中のトラック:"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "偶数行"
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "カラム:"
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "奇数行"
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "グループヘッダ:"
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "選択の行"
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "前景色:"
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "選択の文字色"
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "偶数行:"
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "カーソル"
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "奇数行:"
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "プレイリストの色"
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "選択中:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "カーソル:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "背景色:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "上書き (GTK ツリービューのテーマが適用されなくなりますが、代わりに高速化します)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "色"
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "外観"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "プロクシサーバを有効にする"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "プロクシサーバのアドレス:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "プロクシサーバのポート番号:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "プロクシの形式:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "プロクシのユーザ名:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "プロクシのパスワード:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP ユーザエージェント:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "コンテントタイプの割り当てを編集する"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "割り当て済みのホットキー:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "動作:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<未設定>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "キーの組み合わせ:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "グローバルホットキー"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"適用ボタンで変更を保存します。または元に戻す\n"
-"ボタンで変更を取り消します。適用を押さない限り\n"
-"変更は保存されません。"
+msgstr "適用ボタンで変更を保存します。または元に戻す\nボタンで変更を取り消します。適用を押さない限り\n変更は保存されません。"
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "デフォルト(_D)"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "ホットキー"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "バージョン: "
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Copyright"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "プラグイン"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "デフォルトに戻す"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "バージョン: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "独自のタイトルを設定する"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "...でグループ化"
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "...で並び替え"
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "書式"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "昇順"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "降順"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "DSP プラグインの選択"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "プラグイン"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "昇順\n降順"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "タグ書き出しの設定"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "ID3v2 の書き出し"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "ID3v1 の書き出し"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "APEv2 の書き出し"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "ID3v2 の除去"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "ID3v1 の除去"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "APEv2 の除去"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 のバージョン"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (推奨)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (推奨)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 の文字エンコーディング (デフォルトは iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 の書き出し"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "コンテントタイプの割り当て"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"この表はネットワークストリームのコンテントタイプと DeaDBeeF のデコーダプラグ"
-"インとの対応を表しています。例えば、MP3ファイルは \"audio/x-mpeg\" というコン"
-"テントタイプを持ち、それはDeaDBeeF自身の \"stdmpg\" プラグインか、あるいは "
-"\"ffmpeg\" プラグインでデコードされます。"
+msgstr "この表はネットワークストリームのコンテントタイプと DeaDBeeF のデコーダプラグインとの対応を表しています。例えば、MP3ファイルは \"audio/x-mpeg\" というコンテントタイプを持ち、それはDeaDBeeF自身の \"stdmpg\" プラグインか、あるいは \"ffmpeg\" プラグインでデコードされます。"
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "デフォルトに戻す"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "コンテントタイプ:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "プラグイン:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "ボタンのプロパティ"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "色:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "テキスト色:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "アイコン:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "ラベル:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "動作の選択"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
+msgstr "このダイアログでは任意のトラックにタイトルをつけることができます。これは、ラジオ局に対して特に有用です。同様のオプションは \"場所の追加\" ダイアログにもあります。タイトルはメタデータの \"アーティスト\" フィールドで見ることができます。アーティストのフィールドが元からあれば \"タイトル アーティスト\"、でなければ \"タイトル\" のようになります。"
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "編集"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "アーティスト / アルバム"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "トラック番号"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "カラムの追加"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "カラムの編集"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "カラムの削除"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr "スクロール中にグループをピン止め"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "グループ化"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "なし"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "アーティスト/日付/アルバム"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "ファイルを開く..."
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "%s の設定"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "デフォルトの音声デバイス"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr "あなたはホットキーの設定を変更しましたが、保存していません。"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr "保存せずに続行しますか？"
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "ファイルの追加..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "初期化中..."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "DeaDBeeF イコライザ設定の保存"
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "あなたはこのトラックのデータを変更しました。"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF イコライザ設定 (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "本当にウィンドウを閉じますか？"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "DeaDBeeF イコライザ設定を読み込む..."
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "複数の値 "
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF イコライザ設定 (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "キー"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 イコライザ設定をインポート..."
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "値"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 イコライザ設定 (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "複数の値"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "イコライザ設定を保存"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "タグの書き出し中..."
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "イコライザ設定の読み込み"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "フィールド名"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 イコライザ設定をインポート"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "名前:"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "有効にする"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "フィールドは : や _ で始まることができません"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "すべてゼロに"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "フィールドを追加できません"
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "プリアンプをゼロに"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "同じ名前のフィールドがあります。別の名前で試してください。"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "バンドをゼロに"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "フィールドを追加"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "フィールドを削除"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "新規プレイリスト"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "使い方: deadbeef オプション -- ファイル...\n"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "サポートされている音声フォーマット"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "オプション:\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "すべてのファイル (*)"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help or -h ヘルプ (このメッセージ) を表示して終了\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit プレイヤを終了する\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version バージョン情報を表示して終了\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "その他のファイル (*)"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play 再生を開始する\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF プレイリストファイル (*.dbpl)"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop 再生を停止する\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "シンボリックリンクを追跡する"
 
-#: ../main.c:97
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause ポーズする\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 日 %d:%02d:%02d"
 
-#: ../main.c:98
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause ポーズのトグル\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d 日 %d:%02d:%02d"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr " --play-pause 停止中なら再生開始し、でなければポーズします\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next プレイリストの次の曲へ\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev プレイリストの前の曲へ\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random プレイリストからランダムに選んだ曲へ\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue ファイルを既存のプレイリストに追加する\n"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "プレイリストの名前変更"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
 msgstr ""
-" --gui PLUGIN 使用する GUI プラグインを指定します。デフォルトは "
-"\"GTK2\"\n"
 
-#: ../main.c:105
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying 書式 書式化されたトラック名を stdout に書き出します\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../main.c:106
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+msgid "New Playlist (%d)"
+msgstr "新規プレイリスト (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "タブのついたプレイリスト"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "上下分割"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "左右分割"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "タブ"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "プレイリストのタブ"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "選択のプロパティ"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "アルバムアートの表示"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
-" 書式 (%% に続けて): アーティストa, タイトルt, アル"
-"バムb,\n"
-" 長さl, トラック番号n, 年y, コメントc,\n"
-" 著作権r, 経過時間e\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "スペクトラム"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "ボタン"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "シークバー"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "再生コントロール"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "音量バー"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
 msgstr ""
-" 例: --nowplaying \"%%a - %%t\" は \"アーティスト - タイ"
-"トル\" と表示します\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "デフォルト"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "はい"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "ヘルプファイルの読み込み中に失敗しました"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "いいえ"
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "ヘルプファイルの読み込みに失敗しました"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/gtkui.c:1712
 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"
-"カスタム"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "プレーヤは現在バックグラウンドのタスクとして動作しています。今終了した場合、タスクは中断されることになり、データを失う恐れがあります。"
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "それでも終了しますか？"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Left\n"
-"Right"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"左\n"
-"右"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"無効\n"
-"トラック\n"
-"アルバム"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
-"昇順\n"
-"降順"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-"2.3 (推奨)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
 #, 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 "Do you really want to delete all %d files from the current playlist?%s"
 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Last.fm で検索する"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "ALSA のリサンプリングを使う"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "削除"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "停止中はデバイスを開放する"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "左"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "バッファサイズの指定"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "右"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "区分サイズの指定"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "中央"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Scrobber を有効にする"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Nowplaying を無効にする"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "ユーザ名:"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "パスワード:"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "アーティストのフィールドよりアルバムのアーティストを優先する"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "デバイスファイル"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "トラック"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 のサンプルレートのバグを回避する"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "なし"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "キャッシュの更新間隔 (時)"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "埋め込みタグから取得する"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "ローカルのフォルダから取得する"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "ローカルのカバーファイルのマスク"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Last.fm から取得する"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Albumart.org から取得する"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "ジャケット絵を引き伸ばす"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "CDDB/FreeDB を使う"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "昇順"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "CD-Text より CDDB を優先する"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "降順"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB の URL ('freedb.org' など)"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB のポート番号 ('888' など)"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "CDDB プロトコルを HTTP より優先する"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (推奨)"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "NRG イメージのサポートを有効にする"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "リサンプリングを品質 (0..2, 大きい方が高品質)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-bit 出力 (デフォルトは 16)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "アーティスト / アルバム"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "最大の曲長 (分)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "トラック番号"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "フェードアウトの長さ (秒)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "演奏時間"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "アイテムのインデックス"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "ファイルをディスクから削除する前に確認をとる"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "再生"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "ステータスアイコンの音量コントロールの感度"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "アルバムアート"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "ステータスアイコンの変更"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "アーティスト - アルバム"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "--sync の時 gtk_init する (デバッグ用)"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "プラグインのコンテキストメニューのアイテムにセパレータを挟む"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "トラック番号"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "通知のタイトルの書式"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "バンド / アルバムのアーティスト"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "通知の内容の書式"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "コーデック"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "アルバムアート を表示する"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "アルバムアートのサイズ (ピクセル)"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "カラムの追加"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio サーバー"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "カラムの編集"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "サンプルレート"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "カラムの削除"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "相対的なシークテーブルのパス"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "スクロール中にグループをピン止め"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "絶対的なシークテーブルのパス"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "グループ化"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "オーディオのバイトを入れ替える (平坦な音しか聞こえない場合、有効に)"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "アーティスト/日付/アルバム"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "HVSC 曲長データベースを有効にする"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (from HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "サンプルのビット数 (8 or 16)"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "デフォルトの曲の長さ (秒)"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ bank 設定ファイル"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "メタデータの再読み込み"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "トラックのタイトル"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "演奏者"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "総トラック数"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "ジャンル"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "作曲者"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "プレイリストの除去"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "ディスク番号"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "新規プレイリストの追加"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "コメント"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "エンコーダ / ベンダ"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "場所"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "ファイルを開く..."
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "サブトラックのインデックス"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "%s の設定"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "タグの形式"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "あなたはホットキーの設定を変更しましたが、保存していません。"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "埋め込みCUEシート"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "保存せずに続行しますか？"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "コーデック"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "デフォルトの音声デバイス"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "ファイルの拡張子 (';'で区切る)"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "ファイルの追加..."
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "変換する"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "初期化中..."
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "サンプルレートの指定"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "音質 / アルゴリズム"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "名前"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "サンプルレートの自動設定 (指定したサンプルレートを上書きします)"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "ギャップレス再生を無効にする (スキャンが早くなります)"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "サラウンドを有効にする"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "そのファイルは既に存在します。上書きしますか？"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "コンバータの警告"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "検索 (%list_total% の結果)"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "エンコーダを選択してください"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "カラムヘッダの表示"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "変換エラー"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "値"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "変換中..."
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "あなたはこのトラックのデータを変更しました。"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "フォルダの選択..."
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "本当にウィンドウを閉じますか？"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "エンコーダのプリセットの保存に失敗しました"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "複数の値 "
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "キー"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "複数の値"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "タグの書き出し中..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
-"フォルダのパーミッション、名前の重複、ディスクの空き容量を確認してください"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "同じ名前のプリセットが既にあります。別の名前で試してください。"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "エラー"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "フィールド名"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "新規エンコーダの追加"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "名前:"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "エンコーダの編集"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "フィールドは : や _ で始まることができません"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "プリセットの削除"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "フィールドを追加できません"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "選択中のプリセットを削除します。続けますか？"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "同じ名前のフィールドがあります。別の名前で試してください。"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "エンコーダ"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "ウィジェット \"%s\" は利用できません"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "プラグインを DSP チェインに追加"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "...で置き換える"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "DSP プリセットの保存に失敗しました"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "...を挿入する"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "新規の DSP プリセット"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "カット"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "DSP プリセットの編集"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "コピー"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP プリセット"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "ペースト"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "出力先フォルダ:"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "元のトラックと同じフォルダに書く"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "このタイプのウィジェットを複数利用することはできません"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "フォルダ構造を保存する"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "出力ファイル名:"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "1x"
 msgstr ""
-"拡張子 (.mp3など) は自動で追加されます。\n"
-"このフィールドを空にするとデフォルトを使います (%a - %t)。"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "エンコーダ:"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP のプリセット:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "スレッドの数:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "出力のサンプルのフォーマット:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "元のままにする"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit 符号つき整数"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit 符号つき整数"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit 符号つき整数"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit 符号つき整数"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit 浮動小数点数"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "ファイルが存在するとき:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "尋ねる"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "上書きする"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "エンコーダのプリセット設定"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "無題のエンコーダ"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "出力ファイルの拡張子:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "例: mp3"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "コマンドライン:"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
-"例: lame - %o\n"
-"%i: 入力ファイル, %o: 出力ファイル, -: 標準入力"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
-"%o - 出力先のファイル名\n"
-"%i - 入力の一時ファイル名"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "経由する:"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "パイプ"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "一時ファイル"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "大きさを揃える"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "広げる"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "余白を埋める"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "タグ書き出し"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP プリセットエディタ"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "無題の DSP プリセット"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "追加"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "音声:"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Pixmap ファイルが見つかりません: %s"
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
-"元のままにする\n"
-"8 bit 符号つき整数\n"
-"16 bit 符号つき整数\n"
-"24 bit 符号つき整数\n"
-"32 bit 符号つき整数\n"
-"32 bit 浮動小数点数"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
-"尋ねる\n"
-"上書きする"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
-"パイプ\n"
-"一時ファイル"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%d日 %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "アイテム"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "プレイリストブラウザ"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "シェルコマンドの設定"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "編集"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2086,9 +2621,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"任意のシェルのコマンド。アプリケーションを立ち上げたシェルのコンテキストから"
-"実行されます。xdg-open %D のような書式が使えます"
+msgstr "任意のシェルのコマンド。アプリケーションを立ち上げたシェルのコンテキストから実行されます。xdg-open %D のような書式が使えます"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2103,10 +2636,9 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"コマンド ID (\"youtube_open\" のような短い識別子)。一意である必要があります"
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "コマンド ID (\"youtube_open\" のような短い識別子)。一意である必要があります"
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2164,19 +2696,12 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
-"メインメニューにコマンドを追加したい場合、そのタイトルがメニューパスを"
-"以下のように含んでいることを確かめてください: \"File/My Command\", ここでメ"
-"ニュー名 File は英語版でのものです。"
+msgstr "メインメニューにコマンドを追加したい場合、そのタイトルがメニューパスを以下のように含んでいることを確かめてください: \"File/My Command\", ここでメニュー名 File は英語版でのものです。"
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "コマンドの追加"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "削除"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "選択中のシェルのコマンドを削除します。続けますか？"
@@ -2202,197 +2727,1240 @@
 msgid "Invalid Values"
 msgstr "不正な値"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "サポートされている音声フォーマット"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 へのパスをプラグインの設定で指定してください。"
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "すべてのファイル (*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "モノラル"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "ステレオ"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "ファイルを開く..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "トラックのタイトル"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "プレイリストにファイルを追加..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "演奏者"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "プレイリストにフォルダを追加..."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "総トラック数"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "シンボリックリンクを追跡する"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "ジャンル"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "作曲者"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "ファイルをディスクから削除する"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "ディスク番号"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
-"ファイルは失われます。続けますか？\n"
-"(このダイアログは GTKUI プラグインの設定で非表示にできます)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "プレイリストのロード"
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "コメント"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "その他のファイル (*)"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "エンコーダ / ベンダ"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "プレイリストに名前を付けて保存"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Copyright"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "DeaDBeeF プレイリストファイル (*.dbpl)"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "場所"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "コンテントタイプ"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "サブトラックのインデックス"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "不正な値です。"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "タグの形式"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "埋め込みCUEシート"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-"コンテントタイプとプラグインのフィールとは空にはできません。\n"
-"そして以下のルールに従ってください。\n"
-"コンテントタイプの例: 'audio/mpeg'\n"
-"プラグイン ID の例: 'stdmpg ffmpeg'\n"
-"プラグイン ID のリストはスペースで区切りとします。\n"
-"コンテントタイプは文字、数字、また '-' 記号で構成されます。\n"
-"プラグイン ID は文字と数字だけからなります。"
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "選択がありません。"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "...で置き換える"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "...を挿入する"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "サラウンドを有効にする"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "カット"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "ALSA のリサンプリングを使う"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "コピー"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "バッファサイズの指定"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "ペースト"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "区分サイズの指定"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr "このタイプのウィジェットを複数利用することはできません"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "固定する"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "タブを左に移動"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "タブを右に移動"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "タブの削除"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "タブの名前変更"
-
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "新規タブの追加"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "埋め込みタグから取得する"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "カラムヘッダの表示"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "ローカルのフォルダから取得する"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "ボックスを 1 アイテム分広げる"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "ボックスを 1 アイテム分縮める"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "大きさを揃える"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "広げる"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "余白を埋める"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "設定ボタン"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "プレイリストの編集"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "プレイリストの名前変更"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "プレイリストの除去"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "新規プレイリストの追加"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "名前"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "プレイリストブラウザ"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "オーディオCDの追加"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "CD-Text より CDDB を優先する"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "NRG イメージのサポートを有効にする"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr ""
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "変換する"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "音質 / アルゴリズム"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "ファイルの拡張子 (';'で区切る)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "最大の曲長 (分)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "フェードアウトの長さ (秒)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr ""
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "ファイルをディスクから削除する前に確認をとる"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "ステータスアイコンの音量コントロールの感度"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "ステータスアイコンの変更"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "プラグインのコンテキストメニューのアイテムにセパレータを挟む"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Scrobber を有効にする"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Nowplaying を無効にする"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "ユーザ名:"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "パスワード:"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "アーティストのフィールドよりアルバムのアーティストを優先する"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "通知のタイトルの書式"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "通知の内容の書式"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "アルバムアート を表示する"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "アルバムアートのサイズ (ピクセル)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "デバイスファイル"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "サンプルレート"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr ""
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "シェルコマンドの設定"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "相対的なシークテーブルのパス"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "絶対的なシークテーブルのパス"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "オーディオのバイトを入れ替える (平坦な音しか聞こえない場合、有効に)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "HVSC 曲長データベースを有効にする"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "デフォルトの曲の長さ (秒)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ bank 設定ファイル"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-0.6.2.tar.bz2/po/kk.po -> deadbeef-1.9.6.tar.bz2/po/kk.po Changed

@@ -1,2068 +1,2602 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010,2013-2014
+# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010,2013-2014,2016
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/kk/)\n"
-"Language: kk\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2010,2013-2014,2016\n"
+"Language-Team: Kazakh (http://app.transifex.com/deadbeef-player/deadbeef-player/language/kk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "DeaDBeeF %s туралы"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Қолданылуы: deadbeef опциялар файл(дар)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s өзгерістері"
+msgid "Options:\n"
+msgstr "Опциялары:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF аудармашылары"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help не -h Көмек ақпаратын (осы) шығару мен шығу\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "DeaDBeeF EQ баптауын сақтау"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Плеерді жабу\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ баптау файлдары (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Нұсқа ақпаратын шығару мен шығу\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "DeaDBeeF EQ баптауын жүктеу..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Ойнатуды бастау\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ баптаулары (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Ойнатуды тоқтату\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Foobar2000 EQ баптауын импорттау..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Ойнатуды аялдату\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ баптаулары (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Паузаны ауыстыру\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Баптауды сақтау"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Тоқтатылған болса, ойнату, болмаса, паузаны ауыстыру\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Баптауды жүктеу"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Ойнату тізіміндегі келесі трек\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 EQ баптауын импорттау"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Ойнату тізіміндегі алдыңғы трек\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Іске қосу"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Ойнату тізіміндегі кездейсоқ трек\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Барлығын нөлдеу"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Файл(дар)ды бар ойнату тізіміне қосу\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Алдын-ала күшейтуді нөлдеу"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Қолданылатын GUI плагинін көрсетеді. Бастапқысы \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Жиіліктерді нөлдеу"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying ПШМ Шығысқа пішімделген трек атын шығару\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Сақталған баптаулар"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " Пішімі %% синтаксисі: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 күн %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d күн %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " көбірек білу үшін, %s қараңыз\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Тоқтатылған | %d трек | %s жалпы уақыты"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Моно"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Стерео"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d кбит/с "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Аялдатылған | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, 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:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Жаңа ойнату тізімі"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:161
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Жаңа ойнату тізімі (%d)"
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Беттері бар ойнату тізімі"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Ойнату тізімі"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Ажыратқыш (жоғары және төмен)"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Ажыратқыш (сол және оң жақ)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Ойнату тізім беттері"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Бастапқы"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Таңдалғанның қасиеттері"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Альбом мұқабасын көрсету"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Scope"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Иә"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Спектралды талдағыш"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Жоқ"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Шығыс бумасы:"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Бастапқы трек бумасына жазу"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Батырма"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Бумалар құрылысын сақтау"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Шығыс файл аты:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Кодтауыш:"
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP баптауы:"
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Ағымдар саны:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Сэмплдердің шығыс пішімі:"
+
+#: ../plugins/converter/converter.glade.h:14
+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 "Қайнар көз пішімін сақтау\n8 bit signed int\n16 bit signed int\n24 bit signed int\n32 bit signed int\n32 bit float"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Файл бар болса:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Көмек файлын оқу сәтсіз"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Кодтауыш баптауын түзету"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Көмек файлын жүктеу сәтсіз"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Атауы:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Атауысыз кодтауыш"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Шығыс файлдың кеңейтуі:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Мыс. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Командалық жол:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - шығыс файлы аты\n%i - уақытша кіріс файлының аты"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Тәсіл:"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:37
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Шығуды шынымен қалайсыз ба?"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Тег жазушысы"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP баптау түзетушісі"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Атауы"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Атаусыз DSP баптауы"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Қосу"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Өшіру"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Баптау"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "DSP плагинін таңдау"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Плагин"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Сақталған баптаулар"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Құрамындағы %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Файл бар болып тұр. Оны үстінен жазу керек пе?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Түрлендіруші ескертуі"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Кодтауышты таңдаңыз"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Түрлендіруші қатесі"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Түрлендіру..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Буманы тандаңыз..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Кодтауыштың баптауын сақтау сәтсіз"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Баптау сақталатын бума рұқсаттарын тексеріңіз, басқа атауды таңдаңыз не біршама диск кеңістігін босатыңыз."
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Ондай атымен баптау бар болып тұр. Басқа атын көрсетіңіз."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Қате"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Жаңа кодтауышты қосу"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Кодтауышты түзету"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Баптауды өшіру"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Бұл әрекет нәтижесінде таңдалған баптау өшіріледі. Осыны қалайсыз ба?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Ескерту"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Кодтауыштар"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Плагинді DSP тізбегіне қосу"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "DSP баптауын сақтау сәтсіз"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Жаңа DSP баптауы"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "DSP баптауын түзету"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP баптаулары"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Көмек"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Бастапқы пішімді қалдыру"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 биттік таңбалы бүтін"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 биттік таңбалы бүтін"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 биттік таңбалы бүтін"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 биттік таңбалы бүтін"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 биттік қалқымалы"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Сұрау"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Үстінен жазу"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Pipe"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Сурет файлын табу мүмкін емес: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Файл(дар)ды ашу..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Файл(дар)ды ойнату тізіміне қосу..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Бума(лар)ды ойнату тізіміне қосу..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.kk.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Ойнату тізімін жүктеу"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Ойнату тізімін қалайша сақтау"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeaDBeeF %s туралы"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s өзгерістері"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF аудармашылары"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Content-Type"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Плагиндер"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Мән(дер) қате."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Content-type және Плагиндер өрістері бос болмауы және ережелерге сай болуы тиіс.\nМысалы content-type: 'audio/mpeg'.\nМысал плагин ID-лары: 'stdmpg ffmpeg'.\nПлагиндер ID ажыратқыштары ретінде бос аралықтар қолданылуы тиіс.\nҚұрама түрі тек әріптер, сандар және '-' таңбасынан тұруы тиіс.\nПлагин ID-і ішінде тек әріптер және сандар болуы тиіс."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Ешнәрсе таңдалмады."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "Ф_айл(дар)ды ашу"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Файл(дар)ды қосу"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Бума(лар)ды қосу"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Орналасуы бойынша қосу"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Жаңа ойнату тізімі"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Ойнату тізімін жүктеу"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Ойнату тізімін сақтау"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Шығу"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "Тү_зету"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "Та_зарту"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Барлығын таңдау"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Таңдауды алып тастау"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Таңдауды терістеу"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Таңдалған"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Өшіру"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Одан басқасын өшіру"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "Ізд_еу"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Қалайша сұрыптау"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Атауы"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Трек нөмірі"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Альбом"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Әртіс"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Күні"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Кездейсоқ"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Таңдауыңызша"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Баптаулар"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Түрі"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Қалып-күй жолағы"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Эквалайзер"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Дизайн режимі"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "О_йнату"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Реті"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Қалыпты"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Тректерді араластыру"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Альбомдарды араластыру"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Қайталау"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Барлығын қайталау"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Бір тректі қайталау"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Қайталамау"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Ағымдағы трек атын айналдыру"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Ағымдағы тректі ерекшелеу"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Ағыдағы тректен кейін тоқтау"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Ағыдағы альбомнан кейін тоқтау"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Ағымдағы трекке өту"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Көмек"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "Өз_герістер"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "О_сы туралы"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "Ау_дармашылар"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Іздеу"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Тоқтату"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Ойнату"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Аялдату"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Алдыңғы"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Келесі"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Кездейсоқты ойнату"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Осы туралы"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Шығу"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Көмек"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Трек қасиеттері"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Орналасуы:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Баптаулар"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "Іс_ке асыру"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Жабу"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Метаақпарат"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Қасиеттері"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Атауы:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "Ба_с тарту"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_ОК"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Жаңа баған атауын осында енгіңіз"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Түрі:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Реттік нөмірі"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Ойналуда"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Альбом суреті"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Әртіс - Альбом"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Ұзақтығы"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Трек нөмірі"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Топ / Альбом әртісі"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Пішімі:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Туралауы:"
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Сол жақ"
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Оң жақ"
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Туралауы:"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "Ба_с тарту"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_ОК"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Мәтін түсі:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Шығыс плагин:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Шығыс құрылғы:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "8 биттік аудионы әрқашан 16 биттіке түрлендіру"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "16 биттік аудионы әрқашан 24 биттіке түрлендіру"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Дыбыс"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Дыбыс қаттылығын авто түзету:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Сөндірулі"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Трек"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Пиктік мәнін қолдану"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 дБ"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Дыбыс қаттылығын автотүзетудің алдын-ала күшейтілуі:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Дыбыс қаттылығын жалпы алдын-ала күшейту:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
 msgstr ""
-"Бұл ойнату тізіміне файлдарды командалық жолдан (не файлдар басқарушысынан) "
-"қосу:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Бұл ойнату тізіміне файлдарды командалық жолдан (не файлдар басқарушысынан) қосу:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Қосылғанда, соңғы сессияны жалғастыру"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Бумаларды қосқан кезде архивтерден қоспау"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "\"Ағыдағы тректен кейін тоқтау\" опциясы ауысудан кейін сөндіреді"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "\"Ағыдағы альбомнан кейін тоқтау\" опциясы ауысудан кейін сөндіреді"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Ойнату үрдісі"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Баптау"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "DSP тізбегінің баптауы"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "Жү_ктеу"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Жабу орнына трейге орналастыру"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Жүйелік сөре таңбашасын жасыру"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Орыс CP1251 кодталуын анықтауды және қайта кодтауды іске қосу"
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Japanese SHIFT-JIS анықтауды және қайта кодтауды іске қосу"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Қытайша CP936 кодталуын анықтауды және қайта кодтауды іске қосу"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Интерфейсті жаңарту жиілігі (секундына рет)"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Ойнатылған кездегі атау мәтіні:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Тоқтатылған кездегі атау мәтіні:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI плагині (ауыстырылса, қайта қосу керек):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "Плеер"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr "Ойнату тізімдерін тышқанның орта батырмасымен жабу"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Ойнатылып жатқан тректі жуан қаріппен көрсету"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Бірлік буманы қосқан кезде ойнату тізімін автоатау"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr "Бағандар өлшемдерін терезеге сыятындай автоөзгерту"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Ойнату тізімі"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "Интерфейс/түрлі"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Алмастыру"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Алдыңғы көрінісі"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Фон"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Үрдіс/дыбыс жолақтарының түстері"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Ортасы"
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Ашық түсті"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Күңгірт"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Негізгі"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Мәтін"
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Беттер"
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Базалық:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Күңгірт:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Ашық:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Ортасы:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Мәтін:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Жуан"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Көлбеу"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Ойнатылатын мәтін:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Таңдалған мәтін:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Қалыпты трек(тер):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Ойнатылатын трек:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Таңдалған трек(тер):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Бағандар:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Топ тақырыптамасы:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Алдығ,ы көрініс:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Жұп:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Тақ:"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Алмастыру (GTK темасының баптаулары жоғалады, бірақ жылдамдығы артады)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Жұп жол"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Тақ жол"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Ерекшеленген жол"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Ерекшеленген мәтін"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Курсор"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Ойнату тізім түстері"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Түстер"
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Таңдалған:"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Курсор:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Фон:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Сыртқы түрі"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Прокси серверді іске қосу"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Прокси сервер адресі:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Прокси сервер порты:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Прокси түрі:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Прокси пайдаланушысы:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Прокси паролі:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "Content-Type сәйкестіктерін түзету"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Желі"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "Тағайындалған ыстық пернелер:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Әрекет:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Орнатылмаған>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Пернелер комбинациясы:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Глобалды ыстық перне"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"Өзгерістерді сақтау үшін Іске асыру, ал, оларды\n"
-"болдырмау үшін Қайтару батырмасын қолданыңыз.\n"
-"Іске асыру батырмасын баспасаңыз,\n"
-"өзгерістер сақталмайды."
+msgstr "Өзгерістерді сақтау үшін Іске асыру, ал, оларды\nболдырмау үшін Қайтару батырмасын қолданыңыз.\nІске асыру батырмасын баспасаңыз,\nөзгерістер сақталмайды."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "_Бастапқы"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Ыстық пернелер"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Нұсқасы:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Copyright"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Плагиндер"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Бастапқы мәндеріне тастау"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Нұсқасы:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Таңдауыңызша атауды орнату"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Қалайша топтау ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Қалайша сұрыптау ..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Пішімі"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Өсу ретімен"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Кему ретімен"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "DSP плагинін таңдау"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Плагин"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Өсу ретімен\nКему ретімен"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Тег жазушысы баптаулары"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "ID3v2 жазу"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "ID3v1 жазу"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "APEv2 жазу"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "ID3v2 алып тастау"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "ID3v1 алып тастау"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "APEv2 алып тастау"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 нұсқасы"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Ұсынылады)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Ұсынылады)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 таңбалар кодталуы (бастапқысы iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 жазу"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "Content-Type сәйкестіктері"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"Бұл кесте желілік ағындық құрама түрлері және DeaDBeeF декодер плагиндерінің "
-"арасындағы сәйкестіктерді орнатады. Мысалы, mp3 файлдарының құрама түрі "
-"\"audio/x-mpeg\" болады, және оны DeaDBeeF-тің өздік \"stdmpg\" плагині, не "
-"\"ffmpeg\" плагині декодтауы керек."
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Бастапқы мәндеріне тастау"
+msgstr "Бұл кесте желілік ағындық құрама түрлері және DeaDBeeF декодер плагиндерінің арасындағы сәйкестіктерді орнатады. Мысалы, mp3 файлдарының құрама түрі \"audio/x-mpeg\" болады, және оны DeaDBeeF-тің өздік \"stdmpg\" плагині, не \"ffmpeg\" плагині декодтауы керек."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "Content-Type:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Плагиндер:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Батырма қасиеттері"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Түсі:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Мәтін түсі:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Таңбаша:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Белгі:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Әрекетті таңдаңыз"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Әртіс / Альбом"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Түзету"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Трек №"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Бағанды қосу"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Бағанды түзету"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Бағанды өшіру"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr "Айналдыру кезінде топтарды бекіту"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Қалайша топтау"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Ешнәрсе"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Әртіс/Күні/Альбом"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Файлды ашу..."
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "%s баптау"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Негізгі дыбыс құрылғысы"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
 msgstr ""
-"Сіз ыстық перне жарлығын өзгерттіңіз, бірақ, өзгерістерді сақтаған жоқсыз."
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr "Сақтамай-ақ жалғастыруды қалайсыз ба?"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Файлдарды қосу..."
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Іске қосылуда..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Осы трек үшін сіз ақпаратты түзеттіңіз."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Терезені шынымен жабу керек пе?"
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "DeaDBeeF EQ баптауын сақтау"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Бірнеше мәндер "
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ баптау файлдары (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Кілт"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "DeaDBeeF EQ баптауын жүктеу..."
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Мәні"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ баптаулары (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Бірнеше мәндер "
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 EQ баптауын импорттау..."
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Тегтерді жазу..."
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ баптаулары (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Өріс атауы"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Баптауды сақтау"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Аты:"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Баптауды жүктеу"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Өріс атауы : не _ таңбаларынан басталмауы тиіс"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 EQ баптауын импорттау"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Өрісті қосу мүмкін емес"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Іске қосу"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Ондай атымен өріс бар болып тұр, басқа атауын көрсетіңіз."
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Барлығын нөлдеу"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Өрісті қосу"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Өрісті өшіру"
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Алдын-ала күшейтуді нөлдеу"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Қолданылуы: deadbeef опциялар файл(дар)\n"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Жиіліктерді нөлдеу"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Опциялары:\n"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Жаңа ойнату тізімі"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help не -h Көмек ақпаратын (осы) шығару мен шығу\n"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Қолдауы бар дыбыс пішімдері"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Плеерді жабу\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Барлық файлдар (*)"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Нұсқа ақпаратын шығару мен шығу\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Ойнатуды бастау\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Ойнатуды тоқтату\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Басқа файлдар (*)"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Ойнатуды аялдату\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF ойнату тізімі файлдары (*.dbpl)"
 
-#: ../main.c:98
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Сілтемелерден өту"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Паузаны ауыстыру\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 күн %d:%02d:%02d"
 
-#: ../main.c:99
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d күн %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
 msgstr ""
-" --play-pause Тоқтатылған болса, ойнату, болмаса, паузаны ауыстыру\n"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Ойнату тізіміндегі келесі трек\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Ойнату тізіміндегі алдыңғы трек\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Ойнату тізіміндегі кездейсоқ трек\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../main.c:103
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Ойнату тізімінің атын өзгерту"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Файл(дар)ды бар ойнату тізіміне қосу\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../main.c:104
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
+msgid "New Playlist (%d)"
+msgstr "Жаңа ойнату тізімі (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Беттері бар ойнату тізімі"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Ажыратқыш (жоғары және төмен)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Ажыратқыш (сол және оң жақ)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Беттер"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Ойнату тізім беттері"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Таңдалғанның қасиеттері"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Альбом мұқабасын көрсету"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Спектралды талдағыш"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Батырма"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Іздеу жолағы"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Ойнатуды басқару элементтері"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Дыбыс жолағы"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune дыбыстары"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Көмек файлын оқу сәтсіз"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Көмек файлын жүктеу сәтсіз"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Плеер қазір фонда тапсырмаларды орындап тұр. Қазір шықсаңыз, ол тапсырмалардан бас тартылады не олар үзіледі. Бұл әрекет деректердің жоғалуына әкеп соғуы мүмкін."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Шығуды шынымен қалайсыз ба?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-" --gui PLUGIN Қолданылатын GUI плагинін көрсетеді. Бастапқысы "
-"\"GTK2\"\n"
 
-#: ../main.c:105
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying ПШМ Шығысқа пішімделген трек атын шығару\n"
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
 
-#: ../main.c:106
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
 #, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-" Пішімі %% синтаксисі: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
 
-#: ../main.c:109
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
 #, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
-" мыс.: --nowplaying \"%%a - %%t\" экранға \"artist - "
-"title\" шығаруы тиіс\n"
 
-#: ../main.c:110
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
 #, c-format
-msgid " for more info, see %s\n"
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Бастапқы"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Иә"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Өшіру"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Жоқ"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Сол жақ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/interface.c:1415
+msgid "Right"
+msgstr "Оң жақ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Ортасы"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
 msgstr ""
-"Сол жақ\n"
-"Оң жақ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 msgstr ""
-"Сөндірулі\n"
-"Трек\n"
-"Альбом"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
 msgstr ""
-"Өсу ретімен\n"
-"Кему ретімен"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
-"2.3 (Ұсынылады)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
 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"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Last.fm ішінен іздеу"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Трек"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "ALSA шығыс модулі"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Ешнәрсе"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Тоқтатылған кезде дыбыс құрылғысын босату"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Таңдамалы буфер өлшемі"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Таңдамалы период өлшемі"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Скробблингті іске қосу"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Өсу ретімен"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Қазір ойнаудағы трек атын жібермеу"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Кему ретімен"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Пайдаланушы аты"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Ұсынылады)"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Пароль"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Скробблинг сілтемесі"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Әртіс / Альбом"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Альбом әртісі өрісін әртіс өрісінен басым есептеу"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Трек №"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Құрылғы файлы"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Ұзақтығы"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 үшін дискреттеу жиілігінің қатесіне түзету"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Реттік нөмірі"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Кэш жаңарту мерзімі (сағ)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Ойналуда"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Кеңейтілген тегтерден алу"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Альбом суреті"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Жергілікті бумадан алу"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Әртіс - Альбом"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Жергілікті мұқаба үшін файл маскасы"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "last.fm сайтынан алу"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "albumart.org сайтынан алу"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Альбом мұқабасын ұзын жағы бойынша масштабтау"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "CDDB/FreeDB қолдану"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "CDDB алдында CD-Text таңдау"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Трек нөмірі"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB сілтемесі (мыс. 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB порт нөмірі (мыс. '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "HTTP алдында CDDB хаттамасын таңдау"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Топ / Альбом әртісі"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "NRG бейнелер қолдауын іске қосу"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Кодек"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Қайта дискретизация сапасы (0..2, жоғарырақ - жақсырақ)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8 биттік шығыс (бастапқысы 16)"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Тректің макс. ұзындығы (мин)"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Бағанды қосу"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Дыбыс өшуінің ұзақтығы (секунд)"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Бағанды түзету"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Циклдерді ойнату рет саны (қолжетерлік болса)"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Бағанды өшіру"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Файлдарды дисктен өшіру алдында растауды сұрау"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Айналдыру кезінде топтарды бекіту"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Жүйелік сөредегі таңбашаның дыбыс өзгерту сезімділігі"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Қалайша топтау"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Таңдауыңызша жүйелік сөредегі таңбаша"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Әртіс/Күні/Альбом"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "gtk_init --sync қосып, жөнелту (жөндеу режимі)"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Контекст мәзірі элементтері арасына ажыратқышты қосу"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Хабарлама атауының пішімі"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Хабарлама құрамасының пішімі"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Метаақпаратты қайта жүктеу"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Альбом суретін көрсету"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Альбом суретінің өлшемі (пикс)"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio сервері"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Дискреттеу жиілігі"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Іздеу кестесінің салыстырмалы жолы"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Ойнату тізімін өшіру"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Іздеу кестесінің абсолюттік жолы"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Жаңа ойнату тізімін қосу"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Аудио байттар орнын ауыстыру"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "HVSC Songlength DB іске қосу"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (HVSC-дан)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Разрядтылығы (8 не 16)"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Файлды ашу..."
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Тректің үнсіз келісім б/ша ұзындығы (сек)"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "%s баптау"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ банкінің баптау файлы"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Сіз ыстық перне жарлығын өзгерттіңіз, бірақ, өзгерістерді сақтаған жоқсыз."
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Трек атауы"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Сақтамай-ақ жалғастыруды қалайсыз ба?"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Орындайтын"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Негізгі дыбыс құрылғысы"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Жалпы трек саны"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Файлдарды қосу..."
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Жанр"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Іске қосылуда..."
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Композитор"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Диск нөмірі"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Аты"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Комментарий"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Кодтауыш / Шығарушы"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Орналасуы"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Ішкі жолшықтың аты"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Тег түр(лер)і"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Құрамындағы cue файлы"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Кодек"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Файл кеңейтулері (';' ажыратылады)"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Іздеу (%list_total% нәтиже)"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Түрлендіру"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Бағандар атауларын көрсету"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Мақсаттың дискреттеу жиілігі"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Мәні"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Сапасы / Алгоритмі"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Осы трек үшін сіз ақпаратты түзеттіңіз."
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Дискреттеудің автожиілігі (дискреттеу жиілігін қайта анықтайды)"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Терезені шынымен жабу керек пе?"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Бірнеше мәндер "
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Үзіліссіз ойнатуды сөндіру (скандауды жылдамдатады)"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Кілт"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Ken эмуляторын Satoh басым есептеу (surround жасамайтын болады)"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Бірнеше мәндер "
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Surround іске қосу"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Тегтерді жазу..."
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Файл бар болып тұр. Оны үстінен жазу керек пе?"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Түрлендіруші ескертуі"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Өріс атауы"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Кодтауышты таңдаңыз"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Аты:"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Түрлендіруші қатесі"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Өріс атауы : не _ таңбаларынан басталмауы тиіс"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Түрлендіру..."
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Өрісті қосу мүмкін емес"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Буманы тандаңыз..."
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Ондай атымен өріс бар болып тұр, басқа атауын көрсетіңіз."
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Кодтауыштың баптауын сақтау сәтсіз"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "\"%s\" виджеті қолжетерсіз"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Немен алмастыру..."
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Кірістіру..."
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Қиып алу"
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Көшіру"
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Кірістіру"
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
-"Баптау сақталатын бума рұқсаттарын тексеріңіз, басқа атауды таңдаңыз не "
-"біршама диск кеңістігін босатыңыз."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "Ондай атымен баптау бар болып тұр. Басқа атын көрсетіңіз."
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Бұл түрдегі бірнеше виджеттерге қолдау жоқ"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Қате"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Жаңа кодтауышты қосу"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Кодтауышты түзету"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Баптауды өшіру"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Бұл әрекет нәтижесінде таңдалған баптау өшіріледі. Осыны қалайсыз ба?"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Кодтауыштар"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Плагинді DSP тізбегіне қосу"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "DSP баптауын сақтау сәтсіз"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Жаңа DSP баптауы"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "DSP баптауын түзету"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP баптаулары"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Шығыс бумасы:"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Бастапқы трек бумасына жазу"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Бумалар құрылысын сақтау"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Шығыс файл аты:"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "2x"
 msgstr ""
-"Кеңейтуі (мыс. .mp3) автоқосылады.\n"
-"Үнсіз келісім үшін бос қалдырыңыз (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Кодтауыш:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP баптауы:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Ағымдар саны:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Сэмплдердің шығыс пішімі:"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Бастапқы пішімді қалдыру"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 биттік таңбалы бүтін"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 биттік таңбалы бүтін"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 биттік таңбалы бүтін"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 биттік таңбалы бүтін"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 биттік қалқымалы"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Файл бар болса:"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Сұрау"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Үстінен жазу"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Кодтауыш баптауын түзету"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Атауысыз кодтауыш"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Шығыс файлдың кеңейтуі:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Мыс. mp3"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Командалық жол:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
-"Мысалы: lame - %o\n"
-"%i кіріс файлы, %o шығыс файлы үшін, - stdin үшін"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
-"%o - шығыс файлы аты\n"
-"%i - уақытша кіріс файлының аты"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Тәсіл:"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Pipe"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Уақытша файл"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Біртектес"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Жазу"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Толтыру"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Тег жазушысы"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP баптау түзетушісі"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Атаусыз DSP баптауы"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Дыбыстар:"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Қосу"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/hotkeys/actionhandlers.c:827
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Сурет файлын табу мүмкін емес: %s"
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
-"Қайнар көз пішімін сақтау\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:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
-"Сұрау\n"
-"Үстінен жазу"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
-"Pipe\n"
-"Уақытша файл"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Ойнату тізімдерді шолу"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "Таңдауыңызша қоршам командалары"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Түзету"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2085,10 +2619,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"Қалыпты қоршам командасы. Ол басты қолданба іске қосылған қоршам "
-"контекстінде жөнелтілетін болады. Атаудың пішімдеуін қолдануға болады. "
-"Мысалы: xdg-open %D"
+msgstr "Қалыпты қоршам командасы. Ол басты қолданба іске қосылған қоршам контекстінде жөнелтілетін болады. Атаудың пішімдеуін қолдануға болады. Мысалы: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2103,11 +2634,9 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"Команданың ID-і, әдетте ол қысқа бірнәрсе болуы тиіс, мыс. \"youtube_open\". "
-"Және де ол бірегей болуы тиіс."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Команданың ID-і, әдетте ол қысқа бірнәрсе болуы тиіс, мыс. \"youtube_open\". Және де ол бірегей болуы тиіс."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2165,19 +2694,12 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
-"Егер басты мәзірге команданы қосқыңыз келсе, оның атауында мәзір жолы "
-"болғанын тексеріңіз, келесідей: \"File/Менің командам\", бұл жердегі Файл - "
-"ағылшын тіліндегі мәзір аты."
+msgstr "Егер басты мәзірге команданы қосқыңыз келсе, оның атауында мәзір жолы болғанын тексеріңіз, келесідей: \"File/Менің командам\", бұл жердегі Файл - ағылшын тіліндегі мәзір аты."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Команданы қосу"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Өшіру"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Бұл әрекет таңдалған қоршам командасын өшіреді. Осыны қалайсыз ба?"
@@ -2203,197 +2725,1240 @@
 msgid "Invalid Values"
 msgstr "Қате мәндер"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Қолдауы бар дыбыс пішімдері"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 файлына дейінгі жолды көрсетіңіз."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Барлық файлдар (*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Файл(дар)ды ашу..."
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Файл(дар)ды ойнату тізіміне қосу..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Трек атауы"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Бума(лар)ды ойнату тізіміне қосу..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Орындайтын"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Сілтемелерден өту"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Жалпы трек саны"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.kk.txt"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Жанр"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Файлдарды дисктен өшіру"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Композитор"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Диск нөмірі"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
-"Файлдар жоғалады. Жалғастыру керек пе?\n"
-"(Бұл сұхбатты GTKUI плагин баптауларында сөндіруге болады)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Ойнату тізімін жүктеу"
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Комментарий"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Басқа файлдар (*)"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Кодтауыш / Шығарушы"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Ойнату тізімін қалайша сақтау"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Copyright"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "DeaDBeeF ойнату тізімі файлдары (*.dbpl)"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Орналасуы"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Content-Type"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Ішкі жолшықтың аты"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Мән(дер) қате."
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Тег түр(лер)і"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Құрамындағы cue файлы"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-"Content-type және Плагиндер өрістері бос болмауы және ережелерге сай болуы "
-"тиіс.\n"
-"Мысалы content-type: 'audio/mpeg'.\n"
-"Мысал плагин ID-лары: 'stdmpg ffmpeg'.\n"
-"Плагиндер ID ажыратқыштары ретінде бос аралықтар қолданылуы тиіс.\n"
-"Құрама түрі тек әріптер, сандар және '-' таңбасынан тұруы тиіс.\n"
-"Плагин ID-і ішінде тек әріптер және сандар болуы тиіс."
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Ешнәрсе таңдалмады."
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Немен алмастыру..."
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Ken эмуляторын Satoh басым есептеу (surround жасамайтын болады)"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Кірістіру..."
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Surround іске қосу"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Қиып алу"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "ALSA шығыс модулі"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Көшіру"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Таңдамалы буфер өлшемі"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Кірістіру"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Таңдамалы период өлшемі"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr "Бұл түрдегі бірнеше виджеттерге қолдау жоқ"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Жылжытуды блоктау"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Бетті солға жылжыту"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Бетті оңға жылжыту"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Бетті өшіру"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Беттің атын ауыстыру"
-
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Жаңа бетті қосу"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Кеңейтілген тегтерден алу"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Бағандар атауларын көрсету"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Жергілікті бумадан алу"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Бұл боксты 1 элементке кеңейту"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "Бұл боксты 1 элементке азайту"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Біртектес"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Жазу"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Толтыру"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Батырманы баптау"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Ойнату тізімін түзету"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Ойнату тізімінің атын өзгерту"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Ойнату тізімін өшіру"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Жаңа ойнату тізімін қосу"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Аты"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Ойнату тізімдерді шолу"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Аудио CD қосу"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "CDDB алдында CD-Text таңдау"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "NRG бейнелер қолдауын іске қосу"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr ""
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Түрлендіру"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Сапасы / Алгоритмі"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Файл кеңейтулері (';' ажыратылады)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Тректің макс. ұзындығы (мин)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Дыбыс өшуінің ұзақтығы (секунд)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Циклдерді ойнату рет саны (қолжетерлік болса)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Файлдарды дисктен өшіру алдында растауды сұрау"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Жүйелік сөредегі таңбашаның дыбыс өзгерту сезімділігі"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Таңдауыңызша жүйелік сөредегі таңбаша"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Контекст мәзірі элементтері арасына ажыратқышты қосу"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Скробблингті іске қосу"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Қазір ойнаудағы трек атын жібермеу"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Пайдаланушы аты"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Пароль"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Скробблинг сілтемесі"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Альбом әртісі өрісін әртіс өрісінен басым есептеу"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Хабарлама атауының пішімі"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Хабарлама құрамасының пішімі"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Альбом суретін көрсету"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Альбом суретінің өлшемі (пикс)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Құрылғы файлы"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Дискреттеу жиілігі"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr ""
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Таңдауыңызша қоршам командаларын баптау"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Іздеу кестесінің салыстырмалы жолы"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Іздеу кестесінің абсолюттік жолы"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Аудио байттар орнын ауыстыру"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "HVSC Songlength DB іске қосу"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Тректің үнсіз келісім б/ша ұзындығы (сек)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ банкінің баптау файлы"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-0.6.2.tar.bz2/po/km.po -> deadbeef-1.9.6.tar.bz2/po/km.po Changed

@@ -1,2322 +1,3964 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # SatyaN <satyathavy@gmail.com>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Khmer (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/km/)\n"
-"Language: km\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: SatyaN <satyathavy@gmail.com>, 2010\n"
+"Language-Team: Khmer (http://app.transifex.com/deadbeef-player/deadbeef-player/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr "អំពី DeaDBeeF %s"
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr ""
+
+#: ../src/main.c:136
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr ""
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr ""
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr ""
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr ""
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr ""
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr ""
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr ""
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr ""
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr ""
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr ""
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr ""
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr ""
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "ម៉ូណូ"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "ស្តេរេអូ"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr ""
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "ចំណងជើង"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "ចំណងជើង"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "យកចេញ"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "ជំនួយ"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "អំពី DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s ផ្លាស់ប្តួរកំណត់ហេតុ"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "ទិន្នន៍យ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "បើកទិន្នន៍យ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "បញ្ចួលទិន្នន៍យ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "បង្កើតថត"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "បង្កើតទីតាំង"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "បញ្ជីរថ្មី"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "ផ្ទុកបញ្ជីរ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "រក្សាទុកបញ្ជីរ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "ចាកចេញ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "កែសំរួល"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "ជម្រះ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "ជ្រើសទាំងអស់"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "ដោះជម្រើសទាំងអស់"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "ដាក់បញ្ច្រាសជម្រើស"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "ជម្រើស"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "ច្រឹប"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "សែ្វងរក"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "អ៉ាល់បុ៑ម"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "អ្នកនិពន្ធ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "ចៃដន្យ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "ផ្ទាល់ខ្លួន"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "ចំណង់ចំណូលចិត្ត"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "មើល"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "របាស្ថានភាព"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "ធ្វើអោយស្មើគ្នា"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "ចាក់សារថ្មី"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "រមូរចាក់សារថ្មី"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "ជំនួយ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "ផ្លាស់ប្តួរកំណត់ហេតុ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "អំពី"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "ស្វែងរក"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "ឈប់"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "ចាក់"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "ផ្អាក"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "មុន"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "បន្ទាប់"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "ចាក់ចែដន្យ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "អំពី"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "លះបង់"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "ដានលក្ខណះសម្បត្តិ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "អនុវត្ត"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "បិទ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "មេតាទិន្នន៍យ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "លក្ខណះសម្បត្តិ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "បោះបង់"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "យល់ព្រម"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "ប្រភេទ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "ទ្រង់ទ្រាយ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "តម្រឹម"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "ទិន្នផលកម្មវីធីជំនួយ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "សំលេង"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr ""
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s ផ្លាស់ប្តួរកំណត់ហេតុ"
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:626
-#, c-format
-msgid "DeaDBeeF Translators"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:141
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "រក្សា DeaDBeeF EQ Preset"
 
-#: ../plugins/gtkui/eq.c:148
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:187
+#: ../plugins/gtkui/eq.c:183
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "ផ្ទុក DeaDBeeF EQ Preset"
 
-#: ../plugins/gtkui/eq.c:191
+#: ../plugins/gtkui/eq.c:187
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:252
+#: ../plugins/gtkui/eq.c:224
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "បញ្ចូល Foobar2000 EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:256
+#: ../plugins/gtkui/eq.c:228
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:321
+#: ../plugins/gtkui/eq.c:269
 msgid "Save Preset"
 msgstr "រក្សាទុកកំណត់ជាមុន"
 
-#: ../plugins/gtkui/eq.c:329
+#: ../plugins/gtkui/eq.c:277
 msgid "Load Preset"
 msgstr "ផ្ទុកកំណត់ជាមុន"
 
-#: ../plugins/gtkui/eq.c:337
+#: ../plugins/gtkui/eq.c:285
 msgid "Import Foobar2000 Preset"
 msgstr "បញ្ចូល Foobar2000 EQ Preset..."
 
-#: ../plugins/gtkui/eq.c:362
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
 msgid "Enable"
 msgstr "អនុញ្ញាត"
 
-#: ../plugins/gtkui/eq.c:371
+#: ../plugins/gtkui/eq.c:320
 msgid "Zero All"
 msgstr "សូន្យទាំងអស់"
 
-#: ../plugins/gtkui/eq.c:378
+#: ../plugins/gtkui/eq.c:327
 msgid "Zero Preamp"
 msgstr "គ្មានប្រដាប់បំពងសំលេង"
 
-#: ../plugins/gtkui/eq.c:385
+#: ../plugins/gtkui/eq.c:334
 msgid "Zero Bands"
 msgstr "គ្មានក្រុមតន្ត្រី"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "បង្កើតបញ្ជីរថ្មី"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:179
-#, c-format
-msgid "Stopped | %d tracks | %s total playtime"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "ម៉ូណូ"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "ស្តេរេអូ"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "ផ្អាក"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
-msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "បង្កើតបញ្ជីរថ្មី"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
 msgid "New Playlist (%d)"
 msgstr ""
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:956
+#: ../plugins/gtkui/gtkui.c:1452
 msgid "Playlist with tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:960
+#: ../plugins/gtkui/gtkui.c:1456
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
+#: ../plugins/gtkui/gtkui.c:1457
 msgid "Splitter (left and right)"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1460
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:1461
 msgid "Selection properties"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
+#: ../plugins/gtkui/gtkui.c:1462
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
+#: ../plugins/gtkui/gtkui.c:1464
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:1465
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:1466
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
+#: ../plugins/gtkui/gtkui.c:1468
 msgid "Seekbar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:1469
 msgid "Playback controls"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:1470
 msgid "Volume bar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:1471
 msgid "Chiptune voices"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
 msgid "Failed while reading help file"
 msgstr "មានកំហុសពេលកំពុងអានឯកសារជំនួយ"
 
-#: ../plugins/gtkui/gtkui.c:1160
+#: ../plugins/gtkui/gtkui.c:1695
 msgid "Failed to load help file"
 msgstr "មានកំហុសពេលផ្ទុកឯកសារជំនួយ"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
+#: ../plugins/gtkui/gtkui.c:1714
 msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "ទិន្នន៍យ"
-
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "បើកទិន្នន៍យ"
-
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "បញ្ចួលទិន្នន៍យ"
-
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "បង្កើតថត"
-
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "បង្កើតទីតាំង"
-
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "បញ្ជីរថ្មី"
-
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "ផ្ទុកបញ្ជីរ"
-
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "រក្សាទុកបញ្ជីរ"
-
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "ចាកចេញ"
-
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "កែសំរួល"
-
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "ជម្រះ"
-
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "ជ្រើសទាំងអស់"
-
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "ដោះជម្រើសទាំងអស់"
-
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "ដាក់បញ្ច្រាសជម្រើស"
-
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "ជម្រើស"
-
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "យកចេញ"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "ច្រឹប"
-
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "សែ្វងរក"
-
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "ចំណងជើង"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "អ៉ាល់បុ៑ម"
-
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "អ្នកនិពន្ធ"
-
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "ចៃដន្យ"
-
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "ផ្ទាល់ខ្លួន"
-
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "ចំណង់ចំណូលចិត្ត"
-
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "មើល"
-
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "របាស្ថានភាព"
-
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "ធ្វើអោយស្មើគ្នា"
-
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "ចាក់សារថ្មី"
-
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "លំដាប់"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "លីនេអែ៑រ"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "ការរង្វិលជុំ"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "រមូរចាក់សារថ្មី"
-
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "ជំនួយ"
-
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "ផ្លាស់ប្តួរកំណត់ហេតុ"
-
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "អំពី"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "ស្វែងរក"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "ឆ្វេង"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "ឈប់"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "ស្តាំ"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "ចាក់"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "ផ្អាក"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "មុន"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "បន្ទាប់"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "ចាក់ចែដន្យ"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "អំពី"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "លះបង់"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "ជំនួយ"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "ដាន"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "ដានលក្ខណះសម្បត្តិ"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "អនុវត្ត"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "បិទ"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "មេតាទិន្នន៍យ"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "លក្ខណះសម្បត្តិ"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "ចំណងជើង"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "ប្រភេទ"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1343
+#: ../plugins/gtkui/playlist/plcommon.c:73
 msgid "Item Index"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
 msgid "Playing"
 msgstr "កំពុងលេង"
 
-#: ../plugins/gtkui/interface.c:1345
+#: ../plugins/gtkui/playlist/plcommon.c:75
 msgid "Album Art"
 msgstr "តាក់តែងអ៉ាល់បុ៑ម"
 
-#: ../plugins/gtkui/interface.c:1346
+#: ../plugins/gtkui/playlist/plcommon.c:76
 msgid "Artist - Album"
 msgstr "ម្ចាស់អ៉ាល់បុ៑ម"
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
 msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
 msgid "Band / Album Artist"
 msgstr "ក្រុម/ម្ចាស់អ៉ាល់បុ៑ម"
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "ទ្រង់ទ្រាយ"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "តម្រឹម"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "ឆ្វេង"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "ស្តាំ"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "បោះបង់"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "យល់ព្រម"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "ទិន្នផលកម្មវីធីជំនួយ"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "សំលេង"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "ដាន"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "កំពុងផ្ទុកទិន្នន៍យ"
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
-msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "កំពុងផ្ទុកទិន្នន៍យ"
-
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 ""
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../translation/extra.c:3
+msgid "Track Title"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../translation/extra.c:4
+msgid "Performer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#: ../translation/extra.c:10
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
+#: ../translation/extra.c:11
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#: ../translation/extra.c:12
+msgid "Disc Number"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../translation/extra.c:14
+msgid "Comment"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
+#: ../translation/extra.c:16
+msgid "Copyright"
 msgstr ""
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
+#: ../translation/extra.c:17
+msgid "Location"
 msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
 msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
 msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
 msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
 msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
 msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
 msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
 msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
 msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
 msgstr ""
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
 msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 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"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
 msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
 msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
 msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:281
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:319
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:321
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
 msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:377
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-1.9.6.tar.bz2/po/ko.po Added

@@ -0,0 +1,3970 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Junghee Lee <daemul72@gmail.com>, 2021
+# Junghee Lee <daemul72@gmail.com>, 2020
+# Junghee Lee <daemul72@gmail.com>, 2019-2020
+# ieukori <ieukori@gmail.com>, 2016
+# Junghee Lee <daemul72@gmail.com>, 2022-2023
+# Junghee Lee <daemul72@gmail.com>, 2020-2022
+# Junghee Lee <daemul72@gmail.com>, 2021-2023
+msgid ""
+msgstr ""
+"Project-Id-Version: DeaDBeeF Player\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Junghee Lee <daemul72@gmail.com>, 2021-2023\n"
+"Language-Team: Korean (http://app.transifex.com/deadbeef-player/deadbeef-player/language/ko/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "사용법: deadbeef 옵션 -- 파일\n"
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "옵션:\n"
+
+#: ../src/main.c:136
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h 도움말(이 메시지) 출력\n"
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit 프로그램 종료\n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version 버전정보를 보임\n"
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play 재생 시작\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop 멈춤\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause 일시정지\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause 전환 일시정지\n"
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause 중지된 경우 재생 시작, 그렇지 않으면 일시 중지 전환\n"
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next 재생목록의 다음 곡\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev 재생목록의 이전 곡\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random 재생목록의 임의 곡\n"
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue 재생목록에 파일 추가\n"
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN 사용할 GUI 플러그인을 알려주며, 기본값은 \"GTK2\" 입니다.\n"
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT 포맷된 곡 이름을 표준출력으로 인쇄\n"
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " 예제: --nowplaying \"%%a - %%t\" 하면 \"아티스트 - 제목\"으로 나타납니다\n"
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr " 자세한 내용은 %s를 참조하십시오\n"
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " NOTE: --nowplaying은 삭제되었습니다.\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT 새 제목 형식을 사용하여 포맷된 곡 이름을 표준출력으로 인쇄\n"
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " FMT syntax: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " 예제: --nowplaying-tf \"%%artist%% - %%title%%\" 하면 \"아티스트 - 제목\"으로 표시됩니다\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Deadbeef 음량 단계 인쇄 또는 지정\n.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " NUM 매개변수를 백분율로 지정할 수 있음 (절대 값 또는 증가/감소)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " 또는 dB -50, 0 (suffix가 있는 경우).\n"
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " 예제: --volume 80, --volume +10, --volume -5 or --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr " --plugin=PLUG 특정 플러그인에 명령을 보냅니다. PLUG=main을 사용하여 deadbeef 자체에 명령을 보냅니다.\n"
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr " 플러그인 특정 명령을 얻으려면 --plugin=PLUG --help를 사용하십시오\n"
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr " --plugin-list 명령을 지원하는 플러그인에 대한 표시를 포함하여 사용 가능한 모든 플러그인을 나열합니다.\n"
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "기본"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "모노"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "스테레오"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "예"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "아니오"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "출력 폴더:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "원본 곡 폴더에 쓰기"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "폴더 구조를 가져옴"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "형식이 변경되지 않는 경우 복사"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "복사 후 다시 태그 지정"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "출력 파일 이름:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "확장자(예: .mp3)가 자동으로 추가됩니다.\n기본 (%tracknumber%. %artist% - %title%)의 필드를 비워 둡니다."
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "인코더:"
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP 프리셋:"
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "쓰레드 수:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "출력 샘플 형식:"
+
+#: ../plugins/converter/converter.glade.h:14
+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 bit 정수\n부호있는 16 bit 정수\n부호있는 24 bit 정수\n부호있는 32 bit 정수\n32 bit 부동소숫점"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "파일이 있을 경우:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "건너뛰기\n물어보기\n덮어쓰기"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "인코더 프리셋 편집"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "제목:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "제목없는 인코더"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "출력 파일 확장명:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "예: mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "명령행:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - 출력할 파일 이름\n%i - 임시 입력 파일 이름"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "방법:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "파이프\n임시 파일\n원본 파일"
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "태그 편집기"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP 프리셋 편집기"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "제목"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "제목없는 DSP 프리셋"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "추가하기"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "제거하기"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "구성하기"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "DSP 플러그인 선택"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "플러그인"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "프리셋"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Built-in %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "같은 파일이 있습니가. 덮어쓸까요?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "컨버터 경고"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "인코더를 선택하십시오"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "컨버터 오류"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "변환 중입니다..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "폴더 선택..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "인코더 프리셋을 저장할 수 없습니다"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "프리셋된 폴더 사용 권한을 확인하거나 다른 제목을 선택하거나 디스크 공간을 확보합니다"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "이름이 같은 프리셋이 이미 있습니다. 다른 제목을 선택해 보십시오."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "오류"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "새 인코더 추가하기"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "인코더 편집"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "프리셋 제거하기"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "이 작업은 선택한 선택된 프리셋을 지웁니다. 확실합니까?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "경고"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "인코더"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "DSP 체인에 플러그인 추가하기"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "DSP 프리셋 저장 실패"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "새 DSP 프리셋"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "DSP 프리셋 편집"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP 프리셋"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "도움말"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "원본 형식 유지"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit 정수"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit 정수"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit 정수"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit 정수"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit 부동소숫점"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "건너뛰기"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "물어보기"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "덮어쓰기"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "파이프"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "임시 파일"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "원본 파일"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "픽스맵 파일을 찾을 수 없습니다: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "파일 열기..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "재생목록에 파일 추가하기..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "재생목록에 폴더 추가하기..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.ko.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "재생목록 불러오기"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "다른 이름으로 재생목록 저장"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeaDBeeF %s 정보"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s 변경 로그"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF 번역자"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr "재생중인 곡"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr "선택된 곡"
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "콘텐츠 유형"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "플러그인"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "잘못된 값(들)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "컨텐츠 유형 및 플러그인 필드는 비어 있지 않아야 하며 규칙을 준수해야 합니다.\n콘텐츠 유형 예제: 'audio/mpeg'.\n플러그인 ID 예제: 'stdmpg ffmpeg'.\n플러그 인 ID 목록에서 공간을 구분 기호로 사용해야 합니다.\n콘텐츠 유형은 문자, 숫자 및 '-' 기호만 사용해야 합니다.\n플러그인 ID는 문자와 숫자만 포함할 수 있습니다."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "선택된 항목이 없습니다."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "파일(_F)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "파일 열기(_O)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "파일 추가하기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "폴더 추가하기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "위치 추가하기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "새 재생목록"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "재생목록 불러오기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "재생목록 저장"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "종료(_Q)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "편집(_E)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "지우기(_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "모두 선택"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "모두 선택 취소"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "선택 반전"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "선택"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "자르기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "찾기(_F)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr "정렬 기준"
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "곡 번호"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "앨범"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "아티스트"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "날짜"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "무작위"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "사용자 지정"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "기본 설정"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "보기(_V)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "상태표시줄"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "이퀄라이저"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr "디자인 모드"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "로그"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "재생(_P)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "순서섞기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "끄기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "곡"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "앨범"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "곡 무작위 재생"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "반복듣기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "모든 곡"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "한 곡"
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "재생곡 스크롤 따라가기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "재생곡 커서 따라가기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr "현재 재생 곡이 끝난 후 중지"
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr "현재 재생 앨범이 끝난 후 중지"
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "현재 곡으로 이동"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "도움말(_H)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "변경 로그(_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "프로그램 정보(_A)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "번역(_T)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "검색"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "멈춤"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "재생"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "일시정지"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "이전"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "다음"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "무작위 재생"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "정보"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "종료"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "곡 속성"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "위치:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "설정"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "적용(_A)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "닫기(_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "메타정보"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "속성"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "취소(_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "확인(_O)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "새 컬럼 제목을 여기에 입력하십시오"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "유형:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "형식:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "정렬 형식:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(비어있지 않은 경우)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "정렬:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "왼쪽\n오른쪽\n가운데"
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "텍스트 색상:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "출력 플러그인:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "출력 장치:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "항상 8비트 오디오를 16비트로 변환"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr "항상 16비트 오디오를 24비트로 변환"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr "비트 깊이 재정의:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr "비활성화됨\n8비트\n16비트\n24비트\n32비트\n32비트 플로트"
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "대상 샘플레이트:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "48KHz의 배수 (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "44.1KHz의 배수 (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "입력 샘플레이트에 기반함"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "샘플레이트 재정의"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "소리"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "원본 모드:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "재생 순서별\n곡\n앨범"
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "처리 중:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "없음\n게인 적용\n피크에 따라 게인 적용 및 클리핑 방지\n클리핑만 방지"
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "RG 정보가 있는 프리앰프:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "RG 정보가 없는 프리앰프:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "리플레이게인"
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "명령행(또는 파일 관리자)의 파일을 이 재생목록에 추가하기:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "이전의 상태를 시작할 때 자동으로 되살림"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "폴더를 추가할 때 압축파일에서 추가하지 마십시오"
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr "사용한 후 \"현재 재생 곡이 끝난 후 중지\" 옵션이 꺼집니다"
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr "사용한 후 \"현재 재생 앨범이 끝난 후 중지\" 옵션이 꺼집니다"
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "재생"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr "DSP 체인 프리셋"
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "불러오기(_L)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "시작할 때 트레이에 최소화"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "트레이로 최소화"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "시스템 트레이 아이콘 숨김"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "디스크에서 삭제하려면 휴지통을 사용해야 합니다"
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "일본어 SHIFT-JIS 감지 및 레코딩 활성화"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr "키릴 문자 CP1251 감지 및 녹음 활성화"
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr "중국어 CP936 감지 및 레코딩 활성화"
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr "인터페이스 새로고침 속도 (초당 시간):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "재생하는 동안 제목표시줄 텍스트:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "중지된 동안 제목표시줄 텍스트:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr "GUI 플러그인 (변경시 재시작 필요):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "상태표시줄에 선택 재생 시간 표시"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr "재생기"
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr "가운데 단추로 재생목록 닫기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr "\"디스크에서 삭제\" 컨텍스트 메뉴 항목 숨김"
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "현재 재생 중인 곡이 디스크에서 제거되면 다음 곡으로 전환"
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr "추가된 폴더의 이름을 재생목록 이름으로 사용"
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr "창크기에 맞춰 가로줄 자동 맞춤"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "그룹 간격:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "픽셀"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "재생목록"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr "GUI/기타"
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "덮어쓰기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "표시줄"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "배경 (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "탐색/음량조절/EQ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "기본:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "어두운 색상:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "밝은 색상:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "중간 색상:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "텍스트:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "굵게"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "기울임꼴"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "재생중인 텍스트:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "선택된 텍스트:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "탭 스트립"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "정상적인 곡:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "재생중인 곡:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "선택된 곡:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "컬럼:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "그룹 헤더:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "전면:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "짝수:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "홀수:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "선택됨:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "커서:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "배경:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "덮어쓰기(GTK 트리뷰 장식이 없어지지만 그리는 속도는 빨라짐)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr "사용자 지정 시각화 기본 색상"
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr "사용자 지정 시각화 배경색"
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "시각화"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "모양새"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "미디어 라이브러리 활성화"
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "음악 폴더 추가하기 / 제거하기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "미디어 라이브러리"
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "프록시 서버 활성화"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "프록시 서버 주소:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "프록시 서버 포트:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "프록시 종류:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "프록시 사용자 이름:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "프록시 비밀번호:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr "HTTP 사용자 에이전트:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr "콘텐츠 유형 매핑 편집"
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "네트워크"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr "할당된 단축키:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr "동작:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr "<Not set>"
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr "키 조합:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr "전역 단축키"
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr "적용 단추를 누르면 변경된 것이 저장되고,\n되될리기 단추를 누르면 변경된 것이 저장되지 않습니다.\n적용단추를 누르지 않을 경우\n변경된 것은 저장되지 않습니다."
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr "기본(_D)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr "단축키"
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "구성"
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "정보"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "라이센스"
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "기본으로 되돌리기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "버전: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr "사용자 지정 제목 지정"
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr "그룹별 기준 ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr "정렬 기준 ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr "형식"
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "내림차순\n오름차순"
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr "태그 편집기 설정"
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "ID3v2으로 쓰기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "ID3v1으로 쓰기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "APEv2로 쓰기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "ID3v2 없애기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "ID3v1 없애기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "APEv2 없애기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "ID3v2 버전"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (권장)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 문자 인코딩 (기본: iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "ID3v2.4로 쓰기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr "콘텐츠 유형 매핑"
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr "이 표에서는 네트워크 스트림 콘텐츠 유형과 DeaDBeeF 디코더 플러그인 간의 바인딩을 정의합니다. 예를 들어, mp3 파일은 \"audio/x-mpeg\" 콘텐츠 유형을 가질 수 있으며 DeaDBeeF의 자체 \"stdmpg\" 플러그인 또는 \"ffmpeg\" 플러그인으로 디코딩해야 합니다."
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr "콘텐츠 유형:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr "플러그인:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr "단추 속성"
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "색상:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "아이콘:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr "레이블:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr "동작 선택"
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr "이 대화상자를 통해 곡의 사용자 지정 제목을 설정할 수 있습니다. 이것은 인터넷 라디오 제목을 쓸 때 가장 유용합니다. 사용자 지정 제목을 설정하는 옵션은 \"장소 추가하기\" 대화상자에도 있습니다. 제목 자체는 \"아티스트\" 메타데이터 필드를 표시하는 열에 표시됩니다. 아티스트 필드가 있는 경우, \"사용자지정 아티스트\"로 표시되거나 그렇지 않은 경우, \"사용자지정\"으로 표시되어야 합니다."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "편집"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "편집 (제자리)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "새 필드 추가하기..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "값 편집"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "필드 이름:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "필드 값:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "여러 값을 구분하려면 ; 문자를 사용합니다."
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF 로그"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "지우기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "리플레이게인 검색 진행률"
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "현재 파일:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "상태"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "취소"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "리플레이게인 검색 결과"
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "파일 태그 업데이트"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "보고서 복사"
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "구성이 있는 플러그인만 표시하기"
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr "여러 곡 편집"
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "필드 이름:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr "단일 값"
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+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:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "DeaDBeeF EQ 프리셋 불러오기..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ 프리셋 (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 EQ 프리셋 가져오기..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ 프리셋 (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "프리셋 저장"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "프리셋 불러오기"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 프리셋 가져오기"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "활성화"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "모두 0으로"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "프리앰프 0으로"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "밴드 0으로"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "새 재생목록"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "지원하는 음악 형식"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "모든 파일 (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "지원되는 재생목록 형식"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "모든 파일"
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "모든 파일 (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF 재생목록 파일 (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "바로가기를 따라가기"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1일 %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d일 %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "전체 재생시간"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "일시정지됨"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "비트"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "선택 재생시간"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "중지됨"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "재생목록 이름 바꾸기"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "재생목록 제거중"
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "재생목록 '%s'을(를) 정말로 제거하시겠습니까?"
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "새 재생목록 (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "탭으로 표시된 재생목록"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "분할 (상 - 하)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "분할 (좌 - 우)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "탭"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "재생목록 탭"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "선택한 곡의 정보"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "앨범아트 표시"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "오실로스코프"
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "스펙트럼"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "가로영역"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "세로영역"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "단추"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "진행막대"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "재생 조절"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "음량 조절"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "FM 신디사이저"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "로그 뷰어"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "미디어 라이브러리 뷰어"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "도움말 파일을 읽는 동안 실패했습니다"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "도움말 파일을 불러오지 못했습니다"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "재생기가 백그라운드에서 실행 중입니다. 지금 종료하면 작업이 취소되거나 중단됩니다. 이로 인해 데이터가 손실될 수 있습니다."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "중지하시겠습니까?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "파일이 휴지통으로 이동됩니다.\n\n(이 대화창은 GTKUI 플러그인 설정에서 해제할 수 있습니다)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "파일이 손실됩니다.\n\n(이 대화창은 GTKUI 플러그인 설정에서 해제할 수 있습니다.)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr "선택한 파일을 정말로 삭제하시겠습니까?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr "정말로 %d개의 선택한 파일을 모두 삭제하시겠습니까?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr "현재 재생 목록에서 모든 %d개의 파일을 삭제하시겠습니까?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "현재 재생 중인 파일을 정말로 삭제하시겠습니까?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "디스크에서 파일 삭제하기"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "삭제하기"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "왼쪽"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "오른쪽"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "가운데"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr "비활성화됨"
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr "8비트"
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr "16비트"
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr "24비트"
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr "32비트"
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "재생 순서별"
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "곡"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "없음"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "게인 적용"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "피크에 따라 게인 적용 및 클리핑 방지"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "클리핑만 방지"
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "내림차순"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "오름차순"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (권장)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "아티스트 / 앨범"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "곡 번호"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "재생 시간"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "아이템 목록"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "재생중"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "앨범아트"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "아티스트 - 앨범"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "연도"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "곡 번호"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "밴드 / 앨범 아티스트"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "코덱"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "비트레이트"
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "컬럼 추가하기"
+
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "컬럼 편집"
+
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "컬럼 제거하기"
+
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "스크롤할 때 그룹 고정"
+
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "그룹별 기준"
+
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "아티스트/날짜/앨범"
+
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "다음 재생"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "나중에 재생"
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "재생 대기열에서 제거하기"
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "메타정보 새로고침"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "잘라내기(_T)"
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "복사하기(_C)"
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "붙여넣기(_P)"
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "디스크에서 삭제하기"
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "재생목록 제거하기"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "새 재생목록 추가하기"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "자동정렬 활성화"
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr "이 재생목록에 새 파일을 추가할 때마다 선택한 마지막 정렬을 다시 적용합니다"
+
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "파일 열기..."
+
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "%s 구성하기"
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "단축키를 변경했지만 아직 저장하지 않았습니다."
+
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "저장하지 않고 계속 할까요?"
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "기본 오디오 장치"
+
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "파일 추가하기..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "초기화 중..."
+
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "파일 태그 진행률 업데이트 중"
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "이름"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "앨범 게인"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "곡 게인"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "앨범 피크"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "곡 피크"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "성공"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "파일을 찾을 수 없음"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "잘못된 파일"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "(%list_total% 결과) 검색"
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "컬럼 헤더 표시하기"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "값"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "이 곡의 정보를 변경했습니다."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "정말 이 창을 닫으시겠습니까?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "여러 값 "
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "키"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "여러 값"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "태그를 쓰고 있습니다..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "항목"
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "필드"
+
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "필드 이름"
+
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "이름:"
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "필드 이름은 : 또는 _로 시작할 수 없습니다"
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "필드를 추가할 수 없습니다"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "이러한 이름의 필드가 이미 존재하므로 다른 이름을 시도해 보십시오."
+
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "\"%s\" 위젯은 사용할 수 없습니다"
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "바꾸기..."
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "끼워넣기..."
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "자르기"
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "복사하기"
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "붙여넣기"
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "상위"
+
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "이 유형의 여러 위젯은 지원되지 않습니다."
+
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "비례 크기 조정"
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "상단 창 높이 잠금"
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "왼쪽 창 너비 잠금"
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "하단 창 높이 잠금"
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "오른쪽 창 너비 잠금"
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "탭 이름변경"
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "탭 제거하기"
+
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "새 탭 추가하기"
+
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "탭 왼쪽 이동"
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "탭 오른쪽 이동"
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr "렌더링 모드"
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr "다중채널"
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr "스케일"
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "자동"
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
+
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
+
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr "3x"
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr "파편 지속시간"
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 ms"
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 ms"
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 ms"
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 ms"
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 ms"
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr "이산 주파수"
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr "1/12 옥타브 밴드"
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr "1/24 옥타브 밴드"
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr "공백 크기"
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr "1/2 막대"
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr "1/3 막대"
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr "1/4 막대"
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr "1/5 막대"
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr "1/6 막대"
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr "1/7 막대"
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr "1/8 막대"
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr "1/9 막대"
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr "1/10 막대"
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "1개 항목으로 박스 확장"
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "1개 항목으로 박스 축소"
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "같은 종류"
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "확장"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "채우기"
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "단추 구성하기"
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr "_dB 스케일"
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr "_선형 스케일"
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr "_큐빅 스케일"
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "음성:"
+
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr "%s 사본"
+
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr "%s 사본 (%d)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr " (일시정지됨)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr " (중지됨)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr " (재생중)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%d일 %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "아이템"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "재생목록 찾아보기"
+
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "사용자 지정 셸 명령"
+
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "닫기"
+
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "명령 편집"
+
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "명령:"
+
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr "임의 셸 명령입니다. 기본 응용 프로그램이 시작된 셸 컨텍스트에서 실행됩니다. 제목 형식을 사용할 수 있습니다. 예제: xdg-open %D"
+
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
+
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "자유 형식 이름, 예제: \"My Shell Command\""
+
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "명령 ID, 일반적으로 짧아야 합니다. 예제: \"youtube_open\". 이름은 고유한 것이어야 합니다."
+
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "단일 곡"
+
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "단일 곡에서 작동합니다."
+
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "여러 곡"
+
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "여러 곡에서 작동합니다."
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "로컬"
+
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "로컬 파일을 대상으로 합니다."
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "원격"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "원격 파일에서 작동 (예: http:// streams)"
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Generic (주메뉴)"
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "이 아이템은 주메뉴에 나타나게 됩니다"
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr "기본 메뉴에 명령을 추가하려면 제목에 다음과 같은 메뉴 경로가 포함되어 있는지 확인합니다: \"파일/내 명령\"입니다. 여기서 파일은 영어 버전의 메뉴 이름입니다."
+
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "명령 추가하기"
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "선택된 셸 명령을 삭제합니다. 괜찮으시겠어요?"
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "제거하기 확인"
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID는 반드시 고유한 이름이 지정되어야 합니다.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "제목이 비어있지 않습니다.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "셸 명령어가 비어있지 않습니다.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "잘못된 값"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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의 경로를 지정하십시오."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "모노"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "스테레오"
+
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "곡 제목"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "연주자"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "전체 곡"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "쟝르"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "작곡자"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "디스크 번호"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "전체 디스크"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "코멘트"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "인코더 / 벤더"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "저작권"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "위치"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "하위 곡 색인"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "태그 종류"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "임베드된 큐시트"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr "PipeWire 원격 데몬 이름 (기본값은 비어 있음)"
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr "사용자 지정 속성 (기존 속성 재정의):"
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr "PipeWire 음량 조절 사용하기"
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Satoh보다 Ken emu 선호 (서라운드 작동하지 않음)"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "서라운드 활성화"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "ALSA에 지정된 리샘플링을 사용"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "버퍼 크기 지정"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "간격 크기 지정"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr "표지 그림 새로고침"
+
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "임베드된 태그에서 가져오기"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "로컬 폴더에서 가져오기"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Last.fm에서 가져오기"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "MusicBrainz에서 가져오기"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Albumart.org에서 가져오기"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "World of Spectrum에서 가져오기 (AY 파일)"
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "다운로드한 파일을 음악 폴더에 저장"
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "아트워크를 찾을 수 없는 경우"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "비워 둡니다"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "DeaDBeeF 기본 표지 사용"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "사용자 지정 이미지 표시"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "사용자 지정 이미지 경로"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "파일 이름으로 저장"
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr "마스크 검색 (; 구분)"
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr "폴더 검색 (; 구분)"
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "캐시 새로고침 (시간)"
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "단순화된 캐시 파일 이름"
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "이미지 크기"
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "불러올 CD 드라이브"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "오디오 CD 드라이브"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "파일"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "오디오 CD 추가하기"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr "CDDB/GnuDb 사용하기"
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "CD-Text를 CDDB보다 우선 사용"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr "CDDB url (예: 'gnudb.gnudb.org')"
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr "CDDB 포트 번호 (예: '8880')"
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "CDDB 프로토콜 사용"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "NRG image 지원 활성화"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "일반 재생을 위한 드라이브 속도"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8배속"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16배속"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "최대"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "리핑할 때 cdparanoia 오류 수정 사용"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "변환"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "출력 장치에서 샘플레이트 자동 감지"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "샘플링 속도 직접 지정"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "품질 / 알고리즘"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "재샘플링 품질"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "내부 DUMB 음량"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "음량 램핑"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "켜기/끄기 만 가능"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "전체"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8비트 출력"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "FFmpeg에서 지원하는 모든 확장 사용"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "파일 확장자 (';'로 구분)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr "DoP 출력 활성화"
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "불량 헤더 오류 무시"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "해석할 수 없는 스트림 오류 무시"
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "최대 곡 길이 (분)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "서서히 소리줄이기 (초)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "(가능하다면) 반복 재생"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (SGC 파일 형식용)"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "리플레이게인"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "리플레이게인 정보 제거하기"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "앨범으로 검색 선택 (태그별)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "싱글 앨범으로 검색 선택"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "파일별 곡 게인 검색"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "검색되지 않은 경우 파일당 곡 게인 검색"
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "모두 선택 취소"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "모두 선택"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "위치 추가하기"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "폴더 추가하기"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "파일 추가하기"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "파일 열기"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "도움말 페이지 표시하기"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "반복듣기 모드 주기"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "반복듣기 - 끄기"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "반복듣기 - 단일 곡"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "반복듣기 - 모두"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "순서섞기 모드 주기"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "순서섞기 - 곡 무작위"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "순서섞기 - 앨범"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "순서섞기 - 곡"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "순서섞기 - 끄기"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "재생곡 커서 따라가기 전환"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "재생곡 스크롤 따라가기 전환"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "보기"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "메뉴 표시\\/숨김"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "상태표시줄 표시\\/숨김"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "디자인 모드 전환"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "사용자 지정 정렬"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "자르기 선택됨"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr "재생목록에서 곡 제거하기"
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "재생목록 저장"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "현재 재생목록 제거하기"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "현재 재생목록 이름변경"
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "이퀄라이저 표시\\/숨김"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "이퀄라이저 숨김"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "이퀄라이저 표시하기"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "재생기 창 표시\\/숨김"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "재생기 창 숨김"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "재생기 창 표시하기"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "찾기"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "로그 창 표시\\/숨김"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "디스크에서 파일 삭제 확인 묻기"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "상태 아이콘 설정:"
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "상태 아이콘 음량 조절 감도"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "사용자 지정 상태 아이콘"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr "기타:"
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "플러그인 컨텍스트 메뉴 항목 간에 구분기호 추가하기"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "곡 상태에 이미지 대신 유니코드 문자 사용"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "탐색막대 오버레이 텍스트 비활성화"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr "이전 또는 현재 곡 다시 시작"
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "재생목록 복제"
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr "현재 재생 중인 곡으로 이동"
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "다음으로 건너뛰기"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "이전 장르"
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "이전 작곡가"
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "이전 아티스트"
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "이전 앨범"
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "다음 장르"
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "다음 작곡가"
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "다음 아티스트"
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "다음 앨범"
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "다음 재생목록"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "이전 재생목록"
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "재생목록 10으로 전환"
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr "재생목록 9로 전환"
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "재생목록 8로 전환"
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "재생목록 7로 전환"
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "재생목록 6으로 전환"
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "재생목록 5로 전환"
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "재생목록 4로 전환"
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "재생목록 3으로 전환"
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "재생목록 2로 전환"
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "재생목록 1로 전환"
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "무작위화 정렬"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "날짜순으로 정렬"
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "아티스트별로 정렬"
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "앨범별로 정렬"
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "곡 번호순으로 정렬"
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "제목별로 정렬"
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "선택 반전"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "재생목록 지우기"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr "재생 대기열에 추가하기"
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr "재생 대기열 앞에 추가하기"
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr "재생 대기열에서 전환하기"
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "이동"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "곡 아래로 이동"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "곡 위로 이동"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "음소거 전환"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "일시정지 전환"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "재생\\/일시정지"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "1초 앞으로 탐색"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "1초 뒤로 탐색"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "5초 앞으로 탐색"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "5초 뒤로 탐색"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "1% 앞으로 탐색"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "1% 뒤로 탐색"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "5% 앞으로 탐색"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "5% 뒤로 탐색"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "음량 올리기"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "음량 내리기"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "현재 곡 이후 중지 전환"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "현재 앨범 이후 중지 전환"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr "Last.fm에서 조회"
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "스크러블러 활성화"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "지금 재생 비활성화"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "사용자 이름"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "비밀번호"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "아티스트 필드보다 앨범 아티스트 선호"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "MusicBrainz ID 보내기"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "30초 미만의 곡 전송 (권장되지 않음)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "왼쪽 믹스"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "오른쪽 믹스"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "강제 16비트 출력"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "백앤드"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "알림에 나타날 제목의 형식"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "알림 콘텐츠 형식"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "앨범 아트 표시하기"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "앨범아트 크기 (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "디바이스 파일"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "현재 재생목록 강조표시"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "두 번 클릭으로 재생"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "버퍼 크기 (-1을 사용하여 portaudio에서 선택한 최적의 값 사용)"
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "장치 이름 인코딩"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "아래 정의됨"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "사용자 지정 장치 이름 인코딩"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio 서버 (기본값으로 비워두기)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "기본 곡 길이 (분)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "샘플레이트"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "(sec)보다 짧을 경우 건너뛰기"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "사용자 정의 셸 명령 구성하기"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Relative seek table path"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Absolute seek table path"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "오디오 바이트 스왑 (들리는 것이 모두 정적인 경우 전환)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "HVSC Songlength DB 활성화"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Songlength.md5/.txt의 전체 경로"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "샘플별 비트 수"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "기본 곡 길이 (초)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "모노 신디사이저"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "로깅 활성화"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "프리앰프"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ 뱅크 구성 파일"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "파일 확장자"
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr "인코더 명령줄"
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr "데이터 전송 방법"
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr "파이프 (표준 입력)"
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "임시 파일"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "원본 파일"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "ID3v2 태그 쓰기"
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "ID3v1 태그 쓰기"
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "APEv2 태그 쓰기"
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "FLAC 태그 쓰기"
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "OggVorbis 태그 쓰기"
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "MP4 태그 쓰기"

deadbeef-0.6.2.tar.bz2/po/lg.po -> deadbeef-1.9.6.tar.bz2/po/lg.po Changed

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Kizito Birabwa <kbirabwa@yahoo.co.uk>, 2010
 # Kizito Birabwa <kbirabwa@yahoo.co.uk>, 2010
@@ -10,2361 +10,3957 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Ganda (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/lg/)\n"
-"Language: lg\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Kizito Birabwa <kbirabwa@yahoo.co.uk>, 2010\n"
+"Language-Team: Luganda (http://app.transifex.com/deadbeef-player/deadbeef-player/language/lg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Okwanjula DeaDBeef %s"
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "Obuwayiro:\n"
+
+#: ../src/main.c:136
+#, 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"
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Kano kaleetera puloguramu okumala\n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Kano kaleetera puloguramu okukoma ku kukulaga olwandika lwa yo\n"
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Kano kaleetera pulguramu okutandika enyimba\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Kano kaleetera pulguramu okukomya oluyimba\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Kano kaleetera puloguramu okuyimirizamu oluyimba\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Kano kaleetera puloguramu okutandika oluyimba oluddako mu lukalala\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Kano kaleetera puloguramu okutandika olukulembera lw'ebadde ko mu lukalala\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Kano kaleetera puloguramu okuyita mu nyimba muwawa\n"
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Kano kaleetera puloguramu okwongera nyimba ku lukalala\n"
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Kano kaleetera puloguramu okuwandikawo erinnya ly'olutambi\n"
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-empandika: a: muyimbi, t: Linnya lya luyimba, b: Alubamu,\n : Buwanvu bwa luyimba,n: Lutambi,y: Mwaka mwe lwafulumira, c: Ebinnyonyola,\n r: Ebikugizo by'obwa nannyini, e: Ekitundu ky'oluyimba ekiwulirizidwako\n"
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Olukwatakifo"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Siteriyo"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Ye"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nedda"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Mutwe:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Erinnya"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Kaza"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Bigyewo"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Teekateeka"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Puloguramu enyambi"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Koppi ez'ebiteekateekedwa ezaaterekebwa"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Kulabula"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Nyamba"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Fayiro erimu ekifaananyi embuze: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Okwanjula DeaDBeef %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Olukalala lw'enyukakyuka eziri mu DeadBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Abaavvuunula DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Puloguramu enyambi"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Fayiro"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Bikkula fayiro"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Teekako fayiro"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Teekako (ma)terekero"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Teekako obusangiro"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Kolwo olukalala olupya"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Soma olukalala lw'enyimba"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Kaza olukalala lw'enyimba"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Mala"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Kyusa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Bisiimulewo"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Londa byonna"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Ta byonna"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Vuunika okulonda"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Ebirondedwa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Bisagalewo byokka"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Zuula"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Namba y'olutambi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Alubamu"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Muluyimba"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Ennaku"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Muwawa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Bye weteekateekedde"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Enteekateeka"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Endabika"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Olubaawo olulaga ebifa ku biwulirizibwa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Ekiteekateeka entabula y'amaloboozi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "Eby'em_puliriza"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Akaseesa kagoberere empuliriza y'enyimba"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Akasonga kagoberere empuliriza y'enyimba"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Genda ku lutambi olutangaazidwa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Nyamba"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_Enkyukakyuka"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_Kwanjula"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Abaavvuunula"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Noonya"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Yimirira"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Wuliriza"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Yimirizamu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Olukulembedde"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Oluddako"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Wuliriza muwawa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "Kwanjula"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Mala"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Ebikwata ku lutambi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Enteekateeka"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Bikaze"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Ggala"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Ebinyonyola"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Ebirufaako"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Sazamu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Kale"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Wandikawo omutwe g'olukumba"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Kika:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Empandika:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Okwekubirira:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Puloguramu efulumya ebiwulirizibwa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Ebiwulirizibwa gye bifulumira:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Ebiwulirizibwa ebya bbiti 8 bifuulibwenga bya bbiti 16"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Kwogeza"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Olukalala lw'ongereko fayiro nga weyambisa kiwandikiro (oba ekiteekateekafayiro):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Puloguramu bw'etandikibwa etandikirenga gye yakoma ku mulundi ogwasemba"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Eby'empuliriza"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Ggala kireetera puloguramu okufuuka kafaananyi mu kakuŋaanyizo ka ku lubaawo"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Kisa akafaananyi ak'omu kakuŋaanyizo ka ku lubaawo"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Omutwe gw'eddirisa ng'oluyimba luwulirizibwa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Omutwe gw'eddirisa nga puloguramu eyimirizidwa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr ""
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Ssawo enteekateeka eyiyo"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Kozesa ekiwereza kimasanganzira"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Endagiriro y'ekiwereza kimasanganzira:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Pooti y'ekiwereza kimasanganzira:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Kika ky'ekiwereza:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Erinnya ery'okukozesa ku kiwereza:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Ekyama eky'oku kiwereza:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Kayungirizi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Olukalala lw'enyukakyuka eziri mu DeadBeeF %s"
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:626
-#, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Abaavvuunula DeaDBeeF"
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "kaza koppi y'enteekateeka y'obwangufu bw'amaloboozi ag'omu DeaDBeeF"
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
 msgstr ""
-"Fayiro z'enteekateeka z'obwangufu bw'amaloboozi ag'omu DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
 msgstr ""
-"Soma fayiro y'enteekateeka z'obwangufu bw'amaloboozi ag'omu DeaDBeeF..."
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
 msgstr ""
-"Fayiro z'enteekateeka z'obwangufu bw'amaloboozi ag'omu DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
 msgstr ""
-"Nona fayiro y'enteekateeka z'obwangufu bw'amalaboozi ey'ekika kya "
-"Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
 msgstr ""
-"fayiro z'enteekateeka z'obwangufu bw'amaloboozi ez'ekika kya Foobar2000 (*."
-"feq)"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Tereka koppi y'ebiteekateekedwa"
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Wandika ebya ID3v2"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Soma koppi y'ebiteekateekedwa"
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Wandika ebya ID3v1"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Nona koppi y'ebiteekateekedwa ey'ekika kya Foobar2000"
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Wandika ebya APEv2"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Zuukusa"
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Gyamu ebya ID3v2"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Byonna bidde ku zero"
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Gyamu ebya ID3v1"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Ekikangalazaddoboozi ekisooka kisse ku zero"
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Gyamu ebya APEv2"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Amaloboozi gonna gadde ku zero"
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "Oluwandika lwa ID3v2"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Koppi ez'ebiteekateekedwa ezaaterekebwa"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Tukuwa magezi kukozesa luno)\n2.4"
 
-#: ../plugins/gtkui/gtkui.c:167
-#, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "Lunaku 1 %d:%02d:%02d"
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "Enkongojja y'ebiwandike eby'omu ID3v1 (iso8859-1 y'eya bulijjo)"
 
-#: ../plugins/gtkui/gtkui.c:170
-#, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "Nnaku %d %d:%02d:%02d"
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Wandika ebya ID32.4"
 
-#: ../plugins/gtkui/gtkui.c:179
-#, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Eyimirizidwa | Ntambi %d | Awamu zimala %s"
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Siteriyo"
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| kb %4d bs "
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Luyimirizidwamu | "
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
-msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
 msgstr ""
-"%s%s%s| Hz %d | bbiti %d | %s | %d:%02d /%s | ntambi %d | Awamu zimala %s"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Kolawo olukalalala olupya"
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Lukalalala olupya (%d)"
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Wazewo kiremya mu kusoma fayiro ey'obuyambi"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Nnemedwa okubikkula fayiro ey'obuyambi"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1171
-msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Kulabula"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Fayiro"
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Bikkula fayiro"
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Teekako fayiro"
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "kaza koppi y'enteekateeka y'obwangufu bw'amaloboozi ag'omu DeaDBeeF"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Teekako (ma)terekero"
+#: ../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/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Teekako obusangiro"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Soma fayiro y'enteekateeka z'obwangufu bw'amaloboozi ag'omu DeaDBeeF..."
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Kolwo olukalala olupya"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Fayiro z'enteekateeka z'obwangufu bw'amaloboozi ag'omu DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Soma olukalala lw'enyimba"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Nona fayiro y'enteekateeka z'obwangufu bw'amalaboozi ey'ekika kya Foobar2000..."
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Kaza olukalala lw'enyimba"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "fayiro z'enteekateeka z'obwangufu bw'amaloboozi ez'ekika kya Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Mala"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Tereka koppi y'ebiteekateekedwa"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Kyusa"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Soma koppi y'ebiteekateekedwa"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Bisiimulewo"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Nona koppi y'ebiteekateekedwa ey'ekika kya Foobar2000"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Londa byonna"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Zuukusa"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Ta byonna"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Byonna bidde ku zero"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Vuunika okulonda"
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Ekikangalazaddoboozi ekisooka kisse ku zero"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Ebirondedwa"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Amaloboozi gonna gadde ku zero"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Bigyewo"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Kolawo olukalalala olupya"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Bisagalewo byokka"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Zuula"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Erinnya"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "Namba y'olutambi"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Alubamu"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "Lunaku 1 %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "Nnaku %d %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Lukalalala olupya (%d)"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Muluyimba"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Ennaku"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Muwawa"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Bye weteekateekedde"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Enteekateeka"
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Endabika"
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Olubaawo olulaga ebifa ku biwulirizibwa"
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Ekiteekateeka entabula y'amaloboozi"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "Eby'em_puliriza"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Ensengeka"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Ku ziva kumukumu"
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Vunga ntambi"
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Vunga alubamu"
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Eby'okuddiŋana"
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Akaseesa kagoberere empuliriza y'enyimba"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Wazewo kiremya mu kusoma fayiro ey'obuyambi"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Akasonga kagoberere empuliriza y'enyimba"
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Nnemedwa okubikkula fayiro ey'obuyambi"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Genda ku lutambi olutangaazidwa"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Nyamba"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_Enkyukakyuka"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_Kwanjula"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "_Abaavvuunula"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Noonya"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Yimirira"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Ku kkono"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Wuliriza"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Ku ddyo"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Yimirizamu"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Olukulembedde"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Oluddako"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Wuliriza muwawa"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "Kwanjula"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Mala"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Nyamba"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Ebikwata ku lutambi"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Lutambi"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Tosengeka"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "Enteekateeka"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Bikaze"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Ggala"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Ebinyonyola"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Ebirufaako"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Tukuwa magezi ga kukozesa luno)"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Mutwe:"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Wandikawo omutwe g'olukumba"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Muluyimba / Alubamu"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Kika:"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Namba y'olutambi"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Obwuwanvu bwa lwo"
 
-#: ../plugins/gtkui/interface.c:1343
+#: ../plugins/gtkui/playlist/plcommon.c:73
 msgid "Item Index"
 msgstr "Lukalala lw'ebirimu"
 
-#: ../plugins/gtkui/interface.c:1344
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
 msgid "Playing"
 msgstr "Oluliko"
 
-#: ../plugins/gtkui/interface.c:1345
+#: ../plugins/gtkui/playlist/plcommon.c:75
 msgid "Album Art"
 msgstr "Bifaananyi bya ku alubamu"
 
-#: ../plugins/gtkui/interface.c:1346
+#: ../plugins/gtkui/playlist/plcommon.c:76
 msgid "Artist - Album"
 msgstr "Muluyimba - Alubamu"
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Obwuwanvu bwa lwo"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
 msgid "Track Number"
 msgstr "Namba y'olutambi"
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
 msgid "Band / Album Artist"
 msgstr "Kibiina / Muluyimba w'alubamu"
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Empandika:"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Puloguramu ekola ku data enkongojje"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Okwekubirira:"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Ku kkono"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Yongerako oukumbo"
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Ku ddyo"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Kyusa mu lukumbo"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Sazamu"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Gyawo olukumbo"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_Kale"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Puloguramu efulumya ebiwulirizibwa:"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Sengekera ku"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Ebiwulirizibwa gye bifulumira:"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Muyimbi/Amafuluma/Alubamu"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Ebiwulirizibwa ebya bbiti 8 bifuulibwenga bya bbiti 16"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Kwogeza"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Maanyi g'eddoboozi ly'ebiwulirizibwa:"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Gyako"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Lutambi"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Ekigero ky'amaanyi ge'ddoboozi ly'ebiwulirizibwa"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
-msgstr "-12 dB"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
-msgstr "+12 dB"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Bikkula fayiro..."
+
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Ekyuma ekikola ku biwulirizibwa bulijjo"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Maanyi g'eddoboozi ly'ebiwulirizibwa:"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Nyongerako fayiro..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Nteekateeka..."
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Genda ku lutambi olutangaazidwa:"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
 msgstr ""
-"Olukalala lw'ongereko fayiro nga weyambisa kiwandikiro (oba "
-"ekiteekateekafayiro):"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
 msgstr ""
-"Puloguramu bw'etandikibwa etandikirenga gye yakoma ku mulundi ogwasemba"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Eby'empuliriza"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Teekateeka"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Ekikongojje"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Okyusizza mu data y'olutambi luno."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Eddirisa lino ddala liggalibwewo?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
 msgstr ""
-"Ggala kireetera puloguramu okufuuka kafaananyi mu kakuŋaanyizo ka ku lubaawo"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Kisa akafaananyi ak'omu kakuŋaanyizo ka ku lubaawo"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Ppeesa"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "Omutwe gw'eddirisa ng'oluyimba luwulirizibwa:"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Omutwe gw'eddirisa nga puloguramu eyimirizidwa:"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Ssawo enteekateeka eyiyo"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Bwanjo"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Bwaliriro"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Langi eziraga oluyimba we lutuuse/bwangufu bw'eddoboozi"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Langi eyawakkatikati"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Langi entangaavu"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Langi enzirugarivu"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Langi ey'omulamwa"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Bigambo"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Langi ez'oku bukonda"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
 msgstr ""
-"Ssawo enteekateeka eyiyo (kiva ku lulyo lwa langi olwa sisitemu naye "
-"kyanguya puloguramu okulabika)"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Nnyiriri kagabanyizikamubbiri"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Nnyiriri zinantagabanyizikamubbiri"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Olunyiriri olulondedwa"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Ebigambo ebirondedwa"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Akasonga"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Langi ez'oku lukalala lw'enyimba"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Langi"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Kozesa ekiwereza kimasanganzira"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Endagiriro y'ekiwereza kimasanganzira:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Pooti y'ekiwereza kimasanganzira:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Kika ky'ekiwereza:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Erinnya ery'okukozesa ku kiwereza:"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Ekyama eky'oku kiwereza:"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Kayungirizi"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Puloguramu enyambi"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Empandika"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Puloguramu enyambi"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Wandika ebya ID3v2"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Wandika ebya ID3v1"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Wandika ebya APEv2"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "Gyamu ebya ID3v2"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "Gyamu ebya ID3v1"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "Gyamu ebya APEv2"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "Oluwandika lwa ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Tukuwa magezi ga kukozesa luno)"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "Enkongojja y'ebiwandike eby'omu ID3v1 (iso8859-1 y'eya bulijjo)"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "Wandika ebya ID32.4"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
-msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Muluyimba / Alubamu"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Namba y'olutambi"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Yongerako oukumbo"
-
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Kyusa mu lukumbo"
-
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Gyawo olukumbo"
-
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Sengekera ku"
-
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Tosengeka"
-
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Muyimbi/Amafuluma/Alubamu"
-
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Bikkula fayiro..."
-
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Ekyuma ekikola ku biwulirizibwa bulijjo"
-
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Nyongerako fayiro..."
-
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Nteekateeka..."
-
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Okyusizza mu data y'olutambi luno."
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Eddirisa lino ddala liggalibwewo?"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr ""
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Ppeesa"
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Ekikongojje"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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."
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../translation/extra.c:3
+msgid "Track Title"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
+#: ../translation/extra.c:4
+msgid "Performer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
+#: ../translation/extra.c:10
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#: ../translation/extra.c:11
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#: ../translation/extra.c:12
+msgid "Disc Number"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../translation/extra.c:14
+msgid "Comment"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Obuwayiro:\n"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr ""
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
+#: ../translation/extra.c:16
+msgid "Copyright"
 msgstr ""
-" --help oba -h Bw'ossawo kamu ku buno, okoma ku kufuna bino "
-"by'osoma\n"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Kano kaleetera puloguramu okumala\n"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
 msgstr ""
-" --version Kano kaleetera puloguramu okukoma ku kukulaga "
-"olwandika lwa yo\n"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Kano kaleetera pulguramu okutandika enyimba\n"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Bika by'okunnyonyola"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Kano kaleetera pulguramu okukomya oluyimba\n"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Endagiriro y'entegeka y'enyimba ey'omunda"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-" --pause Kano kaleetera puloguramu okuyimirizamu oluyimba\n"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
-" --next Kano kaleetera puloguramu okutandika oluyimba oluddako "
-"mu lukalala\n"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
 msgstr ""
-" --prev Kano kaleetera puloguramu okutandika olukulembera "
-"lw'ebadde ko mu lukalala\n"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
 msgstr ""
-" --random Kano kaleetera puloguramu okuyita mu nyimba muwawa\n"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
 msgstr ""
-" --queue Kano kaleetera puloguramu okwongera nyimba ku "
-"lukalala\n"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
-" --nowplaying FMT Kano kaleetera puloguramu okuwandikawo erinnya "
-"ly'olutambi\n"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
 msgstr ""
-" FMT %%-empandika: a: muyimbi, t: Linnya lya luyimba, "
-"b: Alubamu,\n"
-" : Buwanvu bwa luyimba,n: Lutambi,y: Mwaka mwe "
-"lwafulumira, c: Ebinnyonyola,\n"
-" r: Ebikugizo by'obwa nannyini, e: Ekitundu ky'oluyimba "
-"ekiwulirizidwako\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
 msgstr ""
-" okugeza.: --nowplaying \"%%a - %%t\" kisuubirwa "
-"okuvaamu \"muyibi - linnya lya luyimba\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Olukwatakifo"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Ye"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Nedda"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
-"Kkono\n"
-"Dyo"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
-"Gyako\n"
-"Lutambi\n"
-"Alubamu"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
-"2.3 (Tukuwa magezi kukozesa luno)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 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"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Bika by'okunnyonyola"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Endagiriro y'entegeka y'enyimba ey'omunda"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Puloguramu ekola ku data enkongojje"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:281
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:319
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:321
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Kaza"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Fayiro erimu ekifaananyi embuze: %s"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:377
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/lt.po -> deadbeef-1.9.6.tar.bz2/po/lt.po Changed

@@ -1,2061 +1,2605 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Algimantas <margevicius.algimantas@mail.ru>, 2012
 # Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2012
+# Moo, 2017
+# Moo, 2017-2022
+# Moo, 2023
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Lithuanian (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/lt/)\n"
-"Language: lt\n"
+"POT-Creation-Date: 2023-11-07 19:05+0100\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Moo, 2023\n"
+"Language-Team: Lithuanian (http://app.transifex.com/deadbeef-player/deadbeef-player/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"
+"Language: lt\n"
+"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Apie DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Naudojimas: deadbeef parametrai -- file(s)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s keitimų žurnalas"
+msgid "Options:\n"
+msgstr "Parametrai:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF Vertėjai"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ar -h Parodo pagalbos langą (šį) ir išeina\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Išsaugoti DeadBeef EQ nustatymų rinkinį"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Užverti grotuvą\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ nustatymų rinkiniai (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Parodyti versijos informaciją ir išeiti\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Įkelti DeaDBeeF EQ nustatymų rinkinį..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Pradėti atkūrimą\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ nustatymų rinkiniai (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Stabdyti atkūrimą\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importuoti Foobar2000 EQ nustatymų rinkinį..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pristabdyti atkūrimą\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ nustatymų rinkiniai (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Perjungti pristabdymą\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Įrašyti nustatymų rinkinį"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Pradėti atkūrimą, jei sustabdyta, o kitu atveju perjungti pristabdymą\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Įkelti nustatymų rinkinį"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Kita grojaraščio daina\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importutoi Foobar2000 nustatymų rinkinį"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Ankstesnė grojaraščio daina\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Įjungti"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Atsitiktinė daina grojaraštyje\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Atstatyti visus"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Pridėti failą(-us) į esamą grojaraštį\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Atstatyti Preamp"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui ĮSKIEPIS Nurodo kurį grafinės naudotojo sąsajos įskiepį naudoti, numatytasis yra „GTK2“\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Atstatyti Bands"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Nusiųsti formatuotą takelių sąrašą į stdout\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Nustatymų rinkiniai"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-sintaksė: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 diena %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " pavyzdys: --nowplaying \"%%a - %%t\" turėtų atvaizduoti \"atlikėjas - pavadinimas\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d dienos %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " išsamesnei informacija, žiūrėkite %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Sustabdyta | %d takeliai | %s bendras grojimo laikas"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " PASTABA: --nowplaying yra pasenęs.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Išvesti formatuotą takelio pavadinimą į stdout, naudojant naująjį pavadinimo formatavimą\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " FMT sintaksė: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " pavyzdys: --nowplaying-tf \"%%artist%% - %%title%%\" turėtų atvaizduoti \"atlikėjas - pavadinimas\"\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Sustabdyta | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume SKAIČIUS Parodyti ar nustatyti deadbeef garsio lygį.\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, 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 takeliai | %s bendras "
-"grojimo laikas"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " Parametras NUM gali būti nurodytas procentais (absoliučia reikšme arba padidėjimu/sumažėjimu)\n"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Naujas grojaraštis"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " ar išreiškiant dB -50, 0 (jei su priesaga).\n"
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Naujas grojaraštis (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Pavyzdžiai: --volume 80, --volume +10, --volume -5 ar --volume -20dB\n"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Grojaraštis"
-
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr ""
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Numatytasis"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr ""
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr ""
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr ""
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Taip"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr ""
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Ne"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Išvesties aplankas:"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Rašyti į šaltinio takelio aplanką"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Išlaikyti aplanko struktūrą"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Kopijuoti jeigu nesikeičia formatas"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Po kopijavimo žymėti iš naujo"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Išvesties failo pavadinimas:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Prievardis (pvz., .mp3) bus pridėtas automatiškai.\nPalikite lauką tuščią, kad būtų naudojami numatytieji (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Koduotuvas:"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Klaida skaitant pagalbos failą"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP išankstinė parinktis:"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Pagalbos failo įkelti nepavyko"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Gijų skaičius:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Išvesties pavyzdžio formatas:"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:14
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"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 "Išlaikyti šaltinio formatą\n8 bit signed int\n16 bit signed int\n24 bit signed int\n32 bit signed int\n32 bit float"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Kai failas jau yra:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Praleisti\nKlausti\nPerrašyti"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Taisyti koduotuvo išankstinę parinktį"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Pavadinimas:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Nepavadintas koduotuvas"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Išvesties failo prievardis:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Pvz., mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Komandų eilutė:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Pavyzdys: lame - %o\n%i įvesties failui, %o išvesties failui, - skirta stdin"
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - išvesties failo pavadinimas\n%i - laikinojo įvesties failo pavadinimas"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metodas:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Kanalas\nLaikinasis failas\nŠaltinio failas"
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Žymių rašyklė"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP išankstinių parinkčių redaktorius"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Pavadinimas"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Nepavadinta DSP išankstinė parinktis"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Pridėti"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Šalinti"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Konfigūruoti"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Pasirinkti DSP įskeipį"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Įskiepis"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Išankstinės parinktys"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Įtaisytas %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Failas jau yra. Perrašyti?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Konverterio įspėjimas"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Prašome pasirinkti koduotuvą"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Konverterio klaida"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Konvertuojama..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Pasirinkite aplanką..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Nepavyko įrašyti koduotuvo išankstinės parinkties"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Patikrinkite išankstinių parinkčių aplanko leidimus, pabandykite kitą pavadinimą ar atlaisvinkite vietą diske"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Išankstinė parinktis tokiu pavadinimu jau yra. Pasirinkite kitą pavadinimą."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Klaida"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Pridėti naują koduotuvą"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Taisyti koduotuvą"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Šalinti išankstinę parinktį"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Šis veiksmas ištrins pasirinktą išankstinę parinktį. Ar jūs įsitikinę?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Koduotuvai"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Pridėti įskiepį į DSP grandinę"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Nepavyko įrašyti DSP išankstinės parinkties"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Nauja DSP išankstinė parinktis"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Taisyti DSP išankstinę parinktį"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP išankstinės parinktys"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Žinynas"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Palikti šaltinio formatą"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit signed int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit signed int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit signed int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Praleisti"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Klausti"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Perrašyti"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Kanalas"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Laikinasis failas"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Šaltinio failas"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nepavyko rasti taškinio failo: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Atverti failą(-us)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Pridėti failą(-us) į grojaraštį..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Pridėti aplanką(-us) į grojaraštį..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "žinynas.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Įkelti grojaraštį"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Įrašyti grojaraštį kaip"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Apie DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s keitinių žurnalas"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF vertėjai"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Turinio tipas"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Įskiepiai"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Netinkama reikšmė(-s)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Content-type ir Įskiepių laukai privalo būti ne tušti ir laikytis taisyklių.\nTurinio tipo pavyzdys: 'audio/mpeg'.\nĮskiepių id pavyzdys: 'stdmpg ffmpeg'.\nTarpai įskiepių id sąraše privalo būti naudojami kaip skirtukai.\nTurinio tipe turėtų būti tik raidės, skaičiai ir \"-\" ženklas.\nĮskiepio id gali būti tik raidės ir skaičiai."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Nieko nepasirinkta."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Failas"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Atverti failą(-us)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
-msgstr "Pridėti failą (-us)"
+msgstr "Pridėti failą(-us)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Pridėti aplanką(-us)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Pridėti vietą"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Naujas grojaraštis"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Įkelti grojaraštį"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
-msgstr "Išsaugoti grojaraštį"
+msgstr "Įrašyti grojaraštį"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "I_šeiti"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
-msgstr "K_eisti"
+msgstr "T_aisa"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "Iš_valyti"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
-msgstr "Pasirinkti visus"
+msgstr "Žymėti visus"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
-msgstr "Atžymėti viską"
+msgstr "Nuimti žymėjimą nuo visų"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
-msgstr "Atvirkštinis pasirinkimas"
+msgstr "Atvirkštinis žymėjimas"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
-msgstr "Pasirinkimas"
-
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Pašalinti"
+msgstr "Žymėjimas"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Apkirpti"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
-msgstr "_Ieškoti"
+msgstr "_Rasti"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Rikiuoti pagal"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Pavadinimas"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Takelio numeris"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Albumas"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Atlikėjas"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
-msgstr "Atsitiktine tvarka"
+msgstr "Atsitiktinė tvarka"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
-msgstr "Pasirinkta"
+msgstr "Tinkinta"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
-msgstr "Nustatymai"
+msgstr "Nuostatos"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "R_odymas"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Būsenos juosta"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
-msgstr "Ekvalaizeris"
+msgstr "Glodintuvas"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
-msgstr ""
+msgstr "Dizaino veiksena"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Žurnalas"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Atkūrimas"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Tvarka"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Linijinis"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Maišyti takelius"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Maišyti albumus"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Kartojimas"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Kartoti visus"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Kartoti vieną dainą"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Nekartoti"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Maišyti"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Išjungta"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Takeliai"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Albumai"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Atsitiktiniai takeliai"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Kartoti"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Visi takeliai"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Vienas takelis"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Slinkimas seka atkūrimą"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Žymeklis seka atkūrimą"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Stabdyti po dabartinio takelio"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Stabdyti po dabartinio albumo"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Peršokti į dabartinį takelį"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Žinynas"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
-msgstr "_Keitimų žurnalas"
+msgstr "_Keitinių žurnalas"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Apie"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Vertėjai"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Ieškoti"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Stabdyti"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
-msgstr "Groti"
+msgstr "Atkurti"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Pristabdyti"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Ankstesnis"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
-msgstr "Sekantis"
+msgstr "Kitas"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Atsitiktinis grojimas"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Apie"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Žinynas"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Takelio savybės"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
-msgstr ""
+msgstr "Vieta:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
-msgstr "Prit_aikyti"
+msgstr "T_aikyti"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Užverti"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metaduomenys"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Savybės"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Pavadinimas:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Atsisakyti"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Gerai"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
-msgstr "Įveskite naujo stulpelio pavadinimą čia"
+msgstr "Čia įveskite naujo stulpelio pavadinimą"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Tipas:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Elementų rodyklė"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Atkuriama"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Albumo dizainas"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Atlikėjas - Albumas"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Trukmė"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Takelio numeris"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Grupė / Albumo atlikėjas"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Formatas:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Rikiavimo formatas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(jei netuščia)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Lygiavimas:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Kairė"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Dešinė"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Atsisakyti"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Kairė\nDešinė\nCentras"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_Gerai"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Teksto spalva:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Išvesties įskiepis:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Išvesties įrenginys:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "8 bitų audio visada konvertuoti į 16 bitų"
+msgstr "8 bitų garsą visada konvertuoti į 16 bitų"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
+msgstr "16 bitų garsą visada konvertuoti į 24 bitų"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Paskirties skaitmeninimo dažnis:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Keletui 48KHz (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Keletui 44.1KHz (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Pagrįsta įvesties skaitmeninimo dažniu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Nustelbti skaitmeninimo dažnį"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Garsas"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Garsinimo režimas:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Išjungti"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Šaltinio veiksena:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Takelis"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Pagal atkūrimo tvarką\nTakelis\nAlbumas"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Garsinimo mastelis"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Apdorojimas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Nėra\nTaikyti stiprinimą\nTaikyti stiprinimą ir neleisti apkirpimo pagal maksimumą\nTik neleisti apkirpimo"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Pagarsinimo lygis:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Bendras pagarsinimas:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Preamp su RG informacija:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Preamp be RG informacijos:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-"Į grojaraštį pridėti failus iš komandinės eilutės (ar failų tvarkyklės):"
+msgstr "Pridėti į grojaraštį failus iš komandų eilutės (ar failų tvarkytuvės):"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
-msgstr "Paleidus programą tęsti ankstesnę sesiją"
+msgstr "Paleidus programą, tęsti ankstesnį seansą"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
-msgstr "Prideant aplankus, nepridėti failų iš archyvų"
+msgstr "Pridedant aplankus, nepridėti failų iš archyvų"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "Parametras \"Stabdyti po dabartinio takelio\" jam suveikus, bus išjungiamas"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "Parametras \"Stabdyti po dabartinio albumo\" jam suveikus, bus išjungiamas"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Atkūrimas"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Konfigūruoti"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
-msgstr "DSP Chain nustatymų rinkinys"
+msgstr "DSP grandinės išankstinė parinktis"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
-msgstr "_Įkelti"
+msgstr "Į_kelti"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Paleidimo metu suskleisti į sistemos dėklą"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
-msgstr "Uždaryti į sistemos dėklą"
+msgstr "Užveriant, suskleisti į sistemos dėklą"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Nerodyti sistemos dėklo piktogramos"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "\"Ištrinti iš disko\" turėtų naudoti šiukšlinę"
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Įjungti Japoniškos SHIFT-JIS koduotės aptikimą ir perkodavimą"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Įgalinti Rusiškos CP1251 koduotės aptikimą ir perkodavimą"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr "Įgalinti Kinietiškos CP936 koduotės aptikimą ir perkodavimą"
+msgstr "Įjungti Kinietiškos CP936 koduotės aptikimą ir perkodavimą"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
-msgstr "Sąsajos atnaujinimo dažnis (kartai per sekundę):"
+msgstr "Sąsajos atnaujinimo dažnis (kartų per sekundę):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Pavadinimo juostos tekstas atkuriant:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Pavadinimo juostos tekstas sustabdžius:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr ""
-"Grafinės sąsajos įskiepis (pakeitimam įsigalioti, reikia paleisti iš naujo):"
+msgstr "Grafinės sąsajos įskiepis (pakeitimams įsigalioti, reikia paleisti iš naujo):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Rodyti žymėjimo atkūrimo laiką būsenos juostoje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr ""
+msgstr "Grotuvas"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Užverti grojaraščius vidurinio pelės mygtuko spustelėjimu"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Perjungti į kitą dainą, kai šiuo metu atkuriama daina yra ištrinama iš disko"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
-msgstr "Pridedant tik vieną aplanką, grojaraštį pavadinti automatiškai"
+msgstr "Pridedant tik vieną aplanką, automatiškai suteikti grojaraščiui pavadinimą"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Automatiškai keisti stulpelių dydį taip, kad jie tilptų į langą"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Grupės intervalai:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pikselių"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Grojaraštis"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
-msgstr "GUI/Kita"
+msgstr "Naudotojo sąsaja/Kita"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
-msgstr "Perrašyti"
+msgstr "Nustelbti"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Priekinis planas"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Juostos"
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Fonas"
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Fonas (EQ)"
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Prasukimo juostos/Garso juostos spalvos"
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Prasukimo juosta/Garsio juosta/EQ"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Vidurinis"
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Bazinė:"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Šviesus"
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Tamsi:"
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Tamsus"
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Šviesi:"
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Bazinis"
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Vidutinis:"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Tekstas"
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Tekstas:"
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Kortelės spalvos"
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Pusjuodis"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr ""
-"Perašyti (bus prarasta GTK medžio peržiūra, bet pagreitės atvaizdavimas)"
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Kursyvas"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Atkuriamas tekstas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Pažymėtas tekstas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Kortelių juosta"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Normalūs takeliai:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Atkuriamas takelis:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Pažymėti takeliai:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Stulpeliai:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Grupės antraštė:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Priekinis planas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Lyginiai:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Nelyginiai:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Pažymėta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Žymeklis:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Fonas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Nustelbti (bus prarasta GTK medžio rodinio tema, tačiau pagreitės atvaizdavimas)"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Lyginės eilutės"
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Nelyginės eilutės"
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Pasirinktos eilutės"
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Pažymėtas tekstas"
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Išvaizda"
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Žymeklis"
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Įjungti medijos biblioteką"
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Grojaraščio spalvos"
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "Pridėti / šalinti muzikos aplankus"
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Spalvos"
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Medijos biblioteka"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
-msgstr "Įjungti tarpinį serverį"
+msgstr "Įjungti įgaliotąjį serverį"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
-msgstr "Tarpinis serveris:"
+msgstr "Įgaliotasis serveris:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
-msgstr "Tarpinio serverio prievadas:"
+msgstr "Įgaliotojo serverio prievadas:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
-msgstr "Tarpinio serverio tipas:"
+msgstr "Įgaliotojo serverio tipas:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
-msgstr "Tarpinio serverio naudotojo vardas:"
+msgstr "Įgaliotojo serverio naudotojo vardas:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
-msgstr "Tarpinio serverio slaptažodis:"
+msgstr "Įgaliotojo serverio slaptažodis:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP naudotojo agentas:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "Taisyti Content-Type susiejimus"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Tinklas"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Priskirti spartieji klavišai:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
-msgstr ""
+msgstr "Veiksmas:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
-msgstr ""
+msgstr "<Nenustatyta>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
-msgstr ""
+msgstr "Klavišų kombinacija:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr ""
+msgstr "Visuotinis spartusis klavišas"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "Pakeitimams įrašyti naudokite mygtuką Taikyti,\no pakeitimams atšaukti - mygtuką Sugrąžinti.\nJei nepaspausite mygtuko Taikyti,\npakeitimai NEBUS įrašyti."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "_Numatytieji"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
-msgstr ""
+msgstr "Spartieji klavišai"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Versija: "
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Konfigūracija"
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Informacija"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Licencija"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Autorinės teisės"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Atstatyti į numatytuosius"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Įskiepiai"
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versija: "
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Nustatyti tinkintą pavadinimą"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
-msgstr ""
+msgstr "Grupuoti pagal ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr ""
+msgstr "Rikiuoti pagal ..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Formatas"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Didėjantis"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Mažėjantis"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Pasirinkti DSP įskeipį"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Įskiepis"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Mažėjančiai\nDidėjančiai"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Žymių rašymo nustatymai"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Rašyti ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Rašyti ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Rašyti APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Šalinti ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Šalinti ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Šalinti APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 versija"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Rekomenduojama)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Rekomenduojama)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 simbolių koduotė (numatyta iso8859-1)"
+msgstr "ID3v1 simbolių koduotė (numatytoji yra iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Rašyti ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "Content-Type susiejimai"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr ""
+msgstr "Ši lentelė apibrėžia susiejimus tarp tinklo srautų turinio tipų ir DeaDBeeF dekoderio įskiepių. Pavyzdžiui, mp3 failai gali būti \"audio/x-mpeg\" turinio tipo ir turi būti dekoduoti DeaDBeeF asmeniniu \"stdmpg\" įskiepiu arba \"ffmpeg\" įskiepiu."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr ""
+msgstr "Turinio tipas:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
-msgstr ""
+msgstr "Įskiepiai:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
-msgstr ""
+msgstr "Mygtuko savybės"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr ""
+msgstr "Spalva:"
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
-msgstr ""
+msgstr "Piktograma:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
-msgstr ""
+msgstr "Etiketė:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
-msgstr ""
+msgstr "Pasirinkti veiksmą"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "Šis dialogas leidžia bet kuriam takeliui nustatyti tinkintą pavadinimą. Tai naudingiausia radijo stotims. Parametras, skirtas nustatyti tinkintą pavadinimą taip pat yra prieinamas \"Pridėti vietą\" dialoge. Pavadinimas yra matomas stulpeliuose, rodančiuose \"Atlikėjo\" metaduomenų lauką. Jis turėtų atrodyti taip \"tinkinta atlikėjas\", jeigu Atlikėjo laukas yra, o priešingu atveju, tiesiog, \"tinkinta\"."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Atlikėjas / Albumas"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Taisyti"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Takelio numeris"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Taisyti (vietoje)"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Pridėti naują lauką..."
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Taisyti reikšmę"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Lauko pavadinimas:"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Lauko reikšmė:"
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Pridėti stulpelį"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Naudokite simbolį ; norėdami atskirti kelias reikšmes."
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Keisti stulpelį"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF žurnalas"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Pašalinti stulpelį"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Išvalyti"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "ReplayGain peržiūrėjimo eiga"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Grupuoti pagal"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Dabartinis failas:"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Nieką"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Būsena"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Atlikėjas/Data/Albumas"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Atsisakyti"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Atverti failą..."
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "ReplayGain peržiūrėjimo rezultatai"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Konfigūruoti %s"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Atnaujinti failų žymes"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Numatytasis audio įrenginys"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "Kopijuoti ataskaitą"
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Rodyti tik įskiepius su konfigūracija"
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr "Taisyti kelis takelius"
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Lauko pavadinimas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Pridedami failai..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr "Atskiros reikšmės"
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Inicializuojama..."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Įrašyti DeadBeef EQ išankstinę parinktį"
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Jūs pakeitėte šio takelio duomenis."
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ išankstinių parinkčių failai (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Tikrai užverti šį langą?"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Įkelti DeaDBeeF EQ išankstinę parinktį..."
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Keletas reikšmių"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ išankstinės parinktys (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Raktas"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importuoti Foobar2000 EQ išankstinę parinktį..."
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Reikšmė"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ išankstinės parinktys (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr ""
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Įrašyti išankstinę parinktį"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Rašomos žymės..."
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Įkelti išankstinę parinktį"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr ""
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importuoti Foobar2000 išankstinę parinktį"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Pavadinimas:"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Įjungti"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Laukelių vardai negali prasidėti: tarpu ar _"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Atstatyti visus"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Pridėti laukelio nepavyko"
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Atstatyti Preamp"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Laukelis su tokiu vardu jau yra, pabandykite kitą vardą."
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Atstatyti Bands"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Pridėti lauką"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Naujas grojaraštis"
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Pašalinti lauką"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Palaikomi garso formatai"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Naudojimas: deadbeef parinktysfailai\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Visi failai (*)"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Parinktys:\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Palaikomi grojaraščio formatai"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help ar -h Parodo pagalbos langą (šį) ir išeina\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Visi failai"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Užverti grotuvą\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Kiti failai (*)"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Parodyti versijos informaciją ir išeiti\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF grojaraščio failai (*.dbpl)"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Atkūrti\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Sekti simbolines nuorodas"
 
-#: ../main.c:96
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Sustabdyti\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 diena %d:%02d:%02d"
 
-#: ../main.c:97
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pristabdyti\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dienos %d:%02d:%02d"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Perjungti sustabdymą\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "bendras atkūrimo laikas"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Pristabdyta"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bitų"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "Žymėjimo atkūrimo laikas"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Sustabdyta"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr " --play-pause Jei sustabdyta atkurti, jei grojama sustabdyti\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Pervadinti grojaraštį"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Sekanti grojaraščio daina\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Šalinamas grojaraštis"
 
-#: ../main.c:101
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Ankstesnė grojaraščio daina\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Ar tikrai norite pašalinti grojaraštį \"%s\"?"
 
-#: ../main.c:102
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Atsitiktinė daina grojaraštyje\n"
+msgid "New Playlist (%d)"
+msgstr "Naujas grojaraštis (%d)"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Pridėti failą(-us) į esamą grojaraštį\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Grojaraštis su kortelėmis"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
-" --gui ĮSKIEPIS Nurodo kurį GUI įskiepį naudoti, numatytasis yra "
-"„GTK2“\n"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Skirtukas (viršus ir apačia)"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Nusiųsti formatuotą takelių sąrašą į stdout\n"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Skirtukas (kairė ir dešinė)"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-sintaksė: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Kortelės"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr ""
-" pvz.: --nowplaying \"%%a - %%t\" turėtų atvaizduoti "
-"„atlikėjas - pavadinimas“\n"
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Grojaraščio kortelės"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Žymėjimo savybės"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Numatyta"
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Albumo iliustracijos rodymas"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Taip"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Osciloskopas"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Ne"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektras"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Elementų rodyklė\n"
-"Atkuriama\n"
-"Albumo dizainas\n"
-"Atlikėjas - Albumas\n"
-"Atlikėjas\n"
-"Albumas\n"
-"Pavadinimas\n"
-"Trukmė\n"
-"Takelio numeris\n"
-"Grupė / Albumo atlikėjas\n"
-"Pasirinkta"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Kairė\n"
-"Dešinė"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Mygtukas"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Prasukimo juosta"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Atkūrimo valdikliai"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Garsio juosta"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune balsai"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Žurnalų žiūryklė"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Medijos bibliotekos žiūryklė"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Klaida skaitant pagalbos failą"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Pagalbos failo įkelti nepavyko"
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Išjungti\n"
-"Takelis\n"
-"Albumas"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Šiuo metu grotuvas vykdo fonines užduotis. Jeigu išeisite dabar, užduočių bus atsisakyta arba jos bus nutrauktos. Tai gali sukelti duomenų praradimą."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Ar vis dar norite išeiti?"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Ascending\n"
-"Descending"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Mažėjančiai\n"
-"Didėjančiai"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"2.3 (Rekomenduojama)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, 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 "Do you really want to delete the selected file?%s"
+msgstr "Ar tikrai norite ištrinti pasirinktą failą?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-"wildmidi: freepats konfigūracijos failas nerastas. Įdiekite timidity-"
-"freepats paetą, arba įskiepio nustatymuose nurodykite kelią iki 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Ieškoti Last.fm"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "Ar tikrai norite ištrinti šiuo metu atkuriama failą?%s"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Naudoti ALSA diskretizaciją"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Ištrinti failus iš disko"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Sustabdžius atlaisvinti įrenginį"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Ištrinti"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Pageidaujamas buferio dydis"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Kairė"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Pageidaujamas periodo dydis"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Dešinė"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Įjungti „scrobbler“"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Centras"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Išjungti „dabar grojama“"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr "Išjungta"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Naudotojas"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Slaptažodis"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Primenybę teikti albumo atlikėjo, o ne atlikėjo laukeliui"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Įrenginio failas"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Pagal atkūrimo tvarką"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 diskretizacijos dažnio klaidos sprendimas"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Takelis"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Podėlio atnaujinimo dažnis (hr)"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Nieką"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Gauti iš įterptų žymių"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Taikyti stiprinimą"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Taikyti stiprinimą ir neleisti apkirpimo pagal maksimumą"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Tik neleisti apkirpimo"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Gauti iš vietinio aplanko"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Didėjantis"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Vietinio viršelio failo kaukė"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Gauti iš last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Gauti iš albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Taikyti albumo dizainą prie ilgesnės pusės"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Naudoti CDDB/FreeDB"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Mažėjantis"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Jei įmanoma naudoti CD-tekstą, o ne CDDB"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Rekomenduojama)"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (pvz. „freedb.org“)"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB prievadas (pvz. „888“)"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Jei įmanoma naudoti CDDB protokolą, o ne HTTP"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Įjungti NRG atvaizdžių palaikymą"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Atlikėjas / Albumas"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Diskretizacijos kokybė (0..2, didesnė yra geriau)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-bitų išvestis (numatytoji yra 16)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Takelio numeris"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Didžiausia dainos trukmė (minutėmis)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Trukmė"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Išblankimo trukmė (sekundėmis)"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Elementų rodyklė"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Kiek kartų kartoti ciklus (jei įmanoma)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Atkuriama"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Šalinant failus iš disko prašyti patvirtinimo"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Albumo iliustracija"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Būsenos piktogramos garso valdymo jautrumas"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Atlikėjas - Albumas"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Pasirinktinė būsenos piktograma"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Metai"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Vykdyti gtk_init su --sync (derinimo režimas)"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Takelio numeris"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Tarp įskiepio kontekstinio meniu elementų pridėti skirtukus"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Grupė / Albumo atlikėjas"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Pranešimų pavadinimo formatas"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodekas"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Pranešimų turinio formatas"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Pralaidumas"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Rodyti albumo dizainą"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Pridėti stulpelį"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Albumo dizaino dydis (px)"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Taisyti stulpelį"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio serveris"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Šalinti stulpelį"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Diskretizavimo dažnis"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Slenkant, prisegti grupes"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Reliatyvus prasukimo kortelės kelias"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Grupuoti pagal"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Absoliutus prasukimo kortelės kelias"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Atlikėjas/Data/Albumas"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Sukeisti audio bitus (perjunkite jei girdite trukdžių)"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Atkurti kitą"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Atkurti vėliau"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Įjungti HVSC dainų trukmių DB"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Šalinti iš atkūrimo eilės"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Dainutrukmes.txt (iš HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bitai per diskretizaciją (8 arba 16)"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Iš naujo įkelti metaduomenis"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Numatyta dainos trukmė (s)"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "Iškirp_ti"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ tuščias konfigūracijos failas"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "_Kopijuoti"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Takelio pavadinimas"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "Į_dėti"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Atlikėjas"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Ištrinti iš disko"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Viso takelių"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Šalinti grojaraštį"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Žanras"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Pridėti naują grojaraštį"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Kompozitorius"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Įjungti automatinį rikiavimą"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Disko numeris"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Komentaras"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Atverti failą..."
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Koduotojas / Gamintojas"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Konfigūruoti %s"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Vieta"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Jūs pakeitėte sparčiųjų klavišų nustatymus, tačiau neįrašėte pakeitimų."
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Potakelio rodyklė"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Ar tikrai norite tęsti neįrašę pakeitimų?"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Žymių tipas(-ai)"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Numatytasis garso įrenginys"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Įterptasis Cuesheet"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Pridedami failai..."
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Kodekas"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Inicijuojama..."
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Failų plėtiniai (atskirti „;“)"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Failų žymių atnaujinimo eiga"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Konvertuoti"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Pavadinimas"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Paskirties diskretizacijos dažnis"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Albumo stiprinimas"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Takelio stiprinimas"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Albumo maksimumas"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Takelio maksimumas"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Pavyko"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Failas nerastas"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Neteisingas failas"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Paieška (%list_total% rezultatų)"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Kokybė / Algoritmas"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Rodyti stulpelių antraštes"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Automatinis diskretizacijos dažnis (perrašo Paskirties dažnį)"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Reikšmė"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Jūs pakeitėte šio takelio duomenis."
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Išjungti „gapless“ atkūrimą (greičiau skanuoja)"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Tikrai užverti šį langą?"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Pirmenybę teikti Ken emu, o ne Satoh (erdvinis garsas neveiks)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Keletas reikšmių"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Įjungti erdvinį garsą"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Raktas"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Kelios reikšmės"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Failas jau egzistuoja. Perrašyti?"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Rašomos žymės..."
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Konverterio įspėjimas"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "Elementas"
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Laukas"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Prašome pasirinkti koduotoją"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Lauko pavadinimas"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Konverterio klaida"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Pavadinimas:"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Konvertuojama..."
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Laukelių vardai negali prasidėti: tarpu ar _"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Pasirinkite aplanką..."
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Pridėti laukelio nepavyko"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Koduotojo nustatymų rinkinio išsaugoti nepavyko"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Laukelis tokiu pavadinimu jau yra, pabandykite kitą pavadinimą."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
-msgstr ""
-"Patikrinkite nustatymų rinkinio leidimus, pabandykite kitą pavadinimą ar "
-"atlaisvinkite diske vietos"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Valdiklis \"%s\" yra neprieinamas"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "Nustatymų rinkinys su tokiu vardu jau yra. Pasirinkite kitą vardą."
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Kuo pakeisti..."
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Klaida"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Įterpti..."
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Pridėti naują koduotoją"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Iškirpti"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Keisti koduotoją"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopijuoti"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Pašalinti nustatymų rinkinį"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr " Įdėti"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Bus pašalintas pasirinktas nustatymų rinkinys. Ar jūs įsitikinę?"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Viršesnis"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Koduotojai"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Kelių šio tipo valdiklių atvaizdavimas vienu metu yra nepalaikomas"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Į DSP grandinę pridėti įskiepį"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Proporcionalus dydis"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Naujo DSP nustatymų rinkinio išsaugoti nepavyko"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Užrakinti viršutinio polangio aukštį"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Naujas DSP nustatymų rinkinys"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Užrakinti kairiojo polangio plotį"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Keisti DSP nustatymų rinkinį"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Užrakinti apatinio polangio aukštį"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP nustatymų rinkiniai"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Užrakinti dešiniojo polangio plotį"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Paskirties aplankas:"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Pervadinti kortelę"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Rašyti į takelio šaltinio aplanką"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Šalinti kortelę"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Išlaikyti aplanko struktūrą"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Pridėti naują kortelę"
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Išvesties failas:"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Perkelti kortelę kairėn"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
-#, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
-msgstr ""
-"Plėtinys (pvz. .mp3) bus pridėtas automatiškai.\n"
-"Jei paliksite tuščią laukelį, bus naudojamas numatytasis (%a - %t)."
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Perkelti kortelę dešinėn"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Koduotojas:"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP nustatymų rinkinys:"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Kopijų skaičius:"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Išvesties pavyzdžio formatas:"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Palikti šaltinio formatą"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit signed int"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit signed int"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit signed int"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit signed int"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit float"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 ms"
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Kai failas jau yra:"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 ms"
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Paklausti"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 ms"
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Perrašyti"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 ms"
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Keisti koduotojo nustatymų rinkinį"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 ms"
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Nepavadintas koduotojas"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Išvesties failo plėtinys:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Pvz. mp3"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Komandinė eilutė:"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
-"Pavyzdys: lame - %o\n"
-"%i įvesties failui, %o išvesties failui, - stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
-"%o - išvesties failas\n"
-"%i - laikinas įvesties failas"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Metodas:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Kanalas"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Laikinas failas"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Išplėsti langelį 1 elementu"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Žymių rašyklė"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Sutraukti langelį 1 elementu"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP nustatymų rinkinių redaktorius"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Tolygus"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Nepavadintas DSP nustatymų rinkinys"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Išplėsti"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Pridėti"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Užpildyti"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Pixmap failo rasti nepavyko: %s"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Konfigūruoti mygtuką"
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
-"Išlaikyti šaltinio 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"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
-"Paklausti\n"
-"Perrašyti"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
-"Kanalas\n"
-"Laikinas failas"
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Balsai:"
+
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr "%s kopija"
+
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr "%s (%d) kopija"
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr " (pristabdyta)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr " (sustabdyta)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr " (atkuriama)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd. %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Elementai"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Grojaraščio naršyklė"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr "Pasirinktinės shell komandos"
-
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Keisti"
+msgstr "Pasirinktinės apvalkalo komandos"
 
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
@@ -2065,7 +2609,7 @@
 #: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr "Keisti komandą"
+msgstr "Taisyti komandą"
 
 #: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
@@ -2079,9 +2623,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"Sutartinė shell komanda. Bus įvykdyta tokiam shell kontekste kokiame buvo "
-"paleista programa. Galima naudoti pavadinimo formatą. Pvz. xdg-open %D"
+msgstr "Sutartinė apvalkalo komanda. Bus įvykdyta tokiam apvalkalo kontekste kokiame buvo paleista programa. Galima naudoti pavadinimo formatą. Pvz., xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2091,16 +2633,14 @@
 #: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr "Laisva forma, pavyzdžiui „Mano shell komanda“"
+msgstr "Pavadinimas laisva forma, pavyzdžiui „Mano apvalkalo komanda“"
 
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"Komandos ID, tai turėtų būti kažkas trumpo, pvayzdžiui „youtube_atverti“. "
-"Negali kartotis."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Komandos ID, tai turėtų būti kažkas trumpo, pavyzdžiui, „youtube_atverti“. Negali kartotis."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2135,17 +2675,17 @@
 #: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr "Nutolęs"
+msgstr "Nuotolinis"
 
 #: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr "Veikia su nutolusiais failais (pvz. http:// streams)"
+msgstr "Veikia su nuotoliniais failais (pvz., http:// streams)"
 
 #: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Bendra (Pagrindinis meniu)"
 
 #: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
@@ -2158,23 +2698,19 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
+msgstr "Jeigu į pagrindinį meniu norite pridėti komandą, užtikrinkite, kad pavadinime būtų meniu kelias, kaip pavyzdžiui: \"File/Mano komanda\", kur File yra angliškos versijos meniu pavadinimas."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Pridėti komandą"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Pašalinti"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "Bus pašalinta pasirinkta shell komanda. Ar jūs įsitikinę?"
+msgstr "Šis veiksmas ištrins pasirinktą apvalkalo komandą. Ar jūs įsitikinę?"
 
 #: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr "Patvirtinti pašalinimą"
+msgstr "Patvirtinti šalinimą"
 
 #: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
@@ -2186,195 +2722,1247 @@
 
 #: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr "Shell komanda negali būti tuščia.\n"
+msgstr "Apvalkalo komanda negali būti tuščia.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:248
 #: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
 msgstr "Netinkamos reikšmės"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr ""
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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ūracijos failas nerastas. Įdiekite timidity-freepats paketą, arba įskiepio nustatymuose nurodykite kelią iki freepats.cfg."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr ""
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr ""
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Takelio pavadinimas"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr ""
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Atlikėjas"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr ""
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Viso takelių"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr ""
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Žanras"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr ""
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Kompozitorius"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr ""
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Disko numeris"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
-msgstr ""
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Viso diskų"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr ""
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Komentaras"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr ""
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Koduotuvas / Gamintojas"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr ""
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Autorių teisės"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr ""
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Vieta"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr ""
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Potakelio rodyklė"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr ""
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Žymių tipas(-ai)"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
-msgstr ""
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Įtaisytas Cuesheet"
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr ""
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Teikti pirmenybę Ken emu, o ne Satoh (erdvinis garsas neveiks)"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr ""
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Įjungti erdvinį garsą"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr ""
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Naudoti ALSA diskretizaciją"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr ""
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Pageidaujamas buferio dydis"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr ""
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Pageidaujamas periodo dydis"
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr ""
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Gauti iš įtaisytų žymių"
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr ""
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Gauti iš vietinio aplanko"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Gauti iš Last.fm"
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Gauti iš MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Gauti iš Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Įrašyti atsisiųstus failus į muzikos aplankus"
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Neradus jokios iliustracijos"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "palikti tuščią"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "naudoti numatytąjį DeaDBeeF viršelį"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "rodyti pasirinktiną paveikslą"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Pasirinktino paveikslo kelias"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "Įrašyti į failo pavadinimą"
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "Podėlio įkėlimas iš naujo (val)"
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "Supaprastinti podėlio failų pavadinimai"
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Paveikslo dydis"
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "CD diskas, kurį įkelti"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Garso CD diskas"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Failas"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Pridėti garso CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Jei įmanoma naudoti CD-tekstą, o ne CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Naudoti CDDB protokolą"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Įjungti NRG atvaizdžių palaikymą"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Disko greitis normaliam atkūrimui"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Maks."
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Perrašant, naudoti cdparanoia klaidų korekciją"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Konvertuoti"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Automatiškai aptikti skaitmeninimo dažnį iš išvesties įrenginio"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Nustatyti skaitmeninimo dažnį tiesiogiai"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Kokybė / Algoritmas"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Diskretizacijos kokybė"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Vidinis DUMB garsis"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Garsio prieaugis"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Tik įjungti/išjungti"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Pilnas"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8-bitų išvestis"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Naudoti visus ffmpeg palaikomus plėtinius"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Failų prievardžiai (atskirkite „;“)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Nepaisyti blogos antraštės klaidų"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Nepaisyti neišnagrinėjamo srauto klaidų"
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Didžiausia dainos trukmė (minutėmis)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Laipsniško išnykimo trukmė (sekundėmis)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Kiek kartų kartoti ciklus (jei prieinama)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (skirta SGC failo formatui)"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Šalinti ReplayGain informaciją"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Peržiūrėti žymėjimą kaip albumus (pagal žymes)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Peržiūrėti žymėjimą kaip vieną albumą"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Peržiūrėti po failą takelių stiprinimą"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Peržiūrėti kiekvieno failo takelių stiprinimą, jei neperžiūrėta"
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Nuimti žymėjimą nuo visų"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Žymėti visus"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Pridėti vietą"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Pridėti aplanką(-us)"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Pridėti failą(-us)"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Atverti failą(-us)"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Rodyti žinyno puslapį"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Perjunginėti kartojimo veikseną"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Kartoti - Išjungta"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Kartoti - Vieną takelį"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Kartoti - Visus"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Perjunginėti maišymo veikseną"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Maišyti - Atsitiktinius takelius"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Maišyti - Albumus"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Maišyti - Takelius"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Maišyti - Išjungta"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Perjungti žymeklis seka atkūrimą"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Perjungti slinkimas seka atkūrimą"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Rodymas"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Rodyti\\/slėpti meniu"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Rodyti\\/slėpti būsenos juostą"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Perjungti dizaino veikseną"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Rikiuoti pasirinktinai"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Iškirpti pažymėtus"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr "Šalinti takelį(-ius) iš grojaraščio"
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Įrašyti grojaraštį"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Šalinti dabartinį grojaraštį"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "Pervadinti dabartinį grojaraštį"
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Rodyti\\/slėpti glodintuvą"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Slėpti glodintuvą"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Rodyti glodintuvą"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Rodyti\\/slėpti grotuvo langą"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Slėpti grotuvo langą"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Rodyti grotuvo langą"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Rasti"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Rodyti\\/slėpti žurnalo langą"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Ištrinant failus iš disko klausti patvirtinimo"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "Būsenos piktogramos nustatymai:"
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Būsenos piktogramos garsio valdymo jautrumas"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Pasirinktinė būsenos piktograma"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr "Įvairūs:"
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Tarp įskiepio kontekstinio meniu elementų pridėti skirtukus"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Takelio būsenai, vietoj paveikslų, naudoti unikodo simbolius"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Išjungti prasukimo juostos perdangos tekstą"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "Dubliuoti grojaraštį"
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Peršokti į"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Ankstesnis žanras"
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Ankstesnis kompozitorius"
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Ankstesnis atlikėjas"
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Ankstesnis albumas"
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Kitas žanras"
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Kitas kompozitorius"
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Kitas atlikėjas"
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "Kitas albumas"
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Kitas grojaraštis"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Ankstesnis grojaraštis"
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "Perjungti į grojaraštį 10"
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr "Perjungti į grojaraštį 9"
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "Perjungti į grojaraštį 8"
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Perjungti į grojaraštį 7"
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "Perjungti į grojaraštį 6"
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Perjungti į grojaraštį 5"
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Perjungti į grojaraštį 4"
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Perjungti į grojaraštį 3"
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Perjungti į grojaraštį 2"
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Perjungti į grojaraštį 1"
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Atsitiktinė tvarka"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Rikiuoti pagal datą"
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Rikiuoti pagal atlikėją"
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Rikiuoti pagal albumą"
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Rikiuoti pagal takelio numerį"
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Rikiuoti pagal pavadinimą"
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Invertuoti žymėjimą"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Išvalyti grojaraštį"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr "Pridėti į atkūrimo eilę"
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Perkelti"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Nuleisti takelius"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Pakelti takelius"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Perjungti garso nutildymą"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Perjungti pristabdymą"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Atkurti\\/Pristabdyti"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Prasukti 1 sek. pirmyn"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Prasukti 1 sek. atgal"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Prasukti 5 sek. pirmyn"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Prasukti 5 sek. atgal"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Prasukti 1% pirmyn"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Prasukti 1% atgal"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Prasukti 5% pirmyn"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Prasukti 5% atgal"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Garsinti"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Tildyti"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Stabdyti po dabartinio takelio"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Stabdyti po dabartinio albumo"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Įjungti „scrobbler“"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Išjungti „dabar atkuriama“"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Naudotojo vardas"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Slaptažodis"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Teikti pirmenybę albumo atlikėjo, o ne atlikėjo laukeliui"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Siųsti MusicBrainz ID"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Pateikti trumpesnius nei 30 sekundžių takelius (nerekomenduojama)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Kairysis sumaišymas"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Dešinysis sumaišymas"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Priverstinai naudoti 16 bitų išvestį"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Vidinė pusė"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Pranešimų pavadinimų formatas"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Pranešimų turinio formatas"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Rodyti albumo iliustraciją"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Albumo iliustracijos dydis (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Įrenginio failas"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Paryškinti dabartinį grojaraštį"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Dukart spustelėjus, pradėti atkūrimą"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Buferio dydis (-1, kad būtų naudojama optimali portaudio pasirinkta reikšmė)"
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Įrenginių pavadinimų koduotė"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Apibrėžta žemiau"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Tinkinta įrenginių pavadinimų koduotė"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio serveris (numatytajam, palikite tuščią)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Numatytoji dainos trukmė (minutėmis)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Skaitmeninimo dažnis"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Praleisti kai trumpesnė nei (sek.)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Konfigūruoti pasirinktines apvalkalo komandas"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Santykinis prasukimo lentelės kelias"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Absoliutus prasukimo lentelės kelias"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Sukeisti garso bitus (perjunkite jei girdite trukdžius)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Įjungti HVSC dainų trukmių DB"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Pilnas kelias į Songlengths.md5/.txt"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Bitų per ėminį"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Numatytoji dainos trukmė (s)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Mono sintezatorius"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Įjungti registravimą"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Preamp"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ bank konfigūracijos failas"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "Laikinasis failas"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "Šaltinio failas"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "Rašyti ID3v2 žymę"
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "Rašyti ID3v1 žymę"
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "Rašyti APEv2 žymę"
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "Rašyti FLAC žymę"
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "Rašyti OggVorbis žymę"
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "Rašyti MP4 žymę"

deadbeef-1.9.6.tar.bz2/po/lv.po Added

@@ -0,0 +1,3966 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# hairy_latvian <einars8@gmail.com>, 2014
+# hairy_latvian <einars8@gmail.com>, 2014
+# hairy_latvian <einars8@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: DeaDBeeF Player\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: hairy_latvian <einars8@gmail.com>, 2014\n"
+"Language-Team: Latvian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/lv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Lietošana: deadbeef opcijas -- fails(-i)\n"
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "Opcijas:\n"
+
+#: ../src/main.c:136
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help vai -h Parādīt palīdzību(šo ziņojumu) un iziet\n"
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Iziet no atskaņotāja\n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Parādīt versijas info un iziet\n"
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Sākt atskaņošanu\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Apturēt atskaņošanu\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pauzēt atskaņošanu\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Pārslēgt pauzi\n"
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Sākt atskaņošanu, ja apturēts, pretējā gadījumā pārslēgt pauzi\n"
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Nākamā dziesma repertuārā\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Iepriekšējā dziesma repertuārā\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Nejauša dziesma repertuārā\n"
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Pievienot failu(s) esošajam repertuāram\n"
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui SPRAUDNIS Norāda, kuru lietotāja saskarnes spraudni izmantot, \nnoklusētais ir \"GTK2\"\n"
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Standarta izvadē parādīt formatētu celiņu\n"
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-sintakse: a – izpildītājs, t – nosaukums,\n b – albums, l – ilgums, n – celiņa numurs,\n y – gads, c – komentārs, r – autortiesības,\n e – pagājušais laiks\n"
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr " vairāk informācijai skatiet %s\n"
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Noklusētais"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Jā"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nē"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Izvades mape:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Rakstīt uz celiņa avota mapi"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Saglabāt mapes struktūru"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Izvades faila nosaukums:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Kodētājs:"
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSA sākumuzstādījums:"
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Pavedienu skaits:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Izvades iztvēruma (sample) formāts:"
+
+#: ../plugins/converter/converter.glade.h:14
+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 "Paturēt avota formātu\n8 bitu vesels skaitlis ar zīmi\n16 bitu vesels skaitlis ar zīmi\n24 bitu vesels skaitlis ar zīmi\n32 bitu vesels skaitlis ar zīmi\n32 bitu peldošā komata skaitlis"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Kad fails eksistē:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Rediģēt kodētāja sākumuzstādījumu"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Nosaukums:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Nenosaukts kodētājs"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Izvades faila paplašinājums:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Piem., mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Komandrinda:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Piemērs: lame - %o\n%i ievades failam, %o izvades failam, - standarta ievadei"
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - izvades faila nosaukums\n%i - pagaidu ievades faila nosaukums"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metode:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Tagu rakstītājs"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSA sākumuzstādījumu redaktors"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Nosaukums"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Nenosaukts DSA sākumuzstādījums"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Pievienot"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Izņemt"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Konfigurēt"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Izvēlēties DSA spraudni"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Spraudnis"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Sākumuzstādījumi"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Iebūvētais %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Fails jau eksistē. Pārrakstīt?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Pārveidotāja brīdinājums"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Lūdzu, izvēlieties kodētāju"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Pārveidotāja kļūda"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Pārveido..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Izvēlieties mapi..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Neizdevās saglabāt kodētāja sākumuzstādījumu"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Pārbaudiet sākumuzstādījumu mapes atļaujas, izmēģiniet citu nosaukumu vai atbrīvojiet vietu diskā"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Sākumuzstādījums ar tādu nosaukumu jau pastāv. Mēģiniet izvēlēties citu nosaukumu."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Kļūda"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Pievienot jaunu kodētāju"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Rediģēt kodētāju"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Izņemt sākumuzstādījumu"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Šī darbība izdzēsīs izvēlēto sākumuzstādījumu. Esat pārliecināts(-ta)?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Brīdinājums"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Kodētāji"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Pievienot spraudni DSA ķēdei"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Neizdevās saglabāt DSA sākumuzstādījumu"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Jauns DSA sākumuzstādījums"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Rediģēt DSA sākumuzstādījumu"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSA sākumuzstādījumi"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Palīdzība"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Paturēt avota formātu"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bitu vesels skaitlis ar zīmi"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bitu vesels skaitlis ar zīmi"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bitu vesels skaitlis ar zīmi"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bitu vesels skaitlis ar zīmi"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bitu peldošā komata skaitlis"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Jautāt"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Pārrakstīt"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Caurule (pipe)"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Neizdevās atrast pikseļkartes failu: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Atvērt failu(s)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Pievienot failu(s) repertuāram..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Pievienot mapi(-es) repertuāram..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Ielādēt repertuāru"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Saglabāt repertuāru kā"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Par DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s izmaiņu žurnāls"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF tulkotāji"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Satura tips"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Spraudņi"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Nederīga(s) vērtība(s)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Lauki 'Satura tips' un 'Spraudņi' nevar būt tukši, un tiem jāatbilst noteikumiem.\nPiemēra satura tips: 'audio/mpeg'.\nPiemēra sprauņu id: 'stdmpg ffmpeg'.\nSpraudņu id sarakstā kā atdalītāji jāizmanto atstarpes.\nSatura tipam var saturēt tikai burtus, skaitļus un zīmi '-'.\nSpaudņa id var saturēt tikai burtus un skaitļus."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Nekas nav izvēlēts."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Fails"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Atvērt failu(s)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Pievienot failus"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Pievienot mapes"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Pievienot vietu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Jauns repertuārs"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Ielādēt repertuāru"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Saglabāt repertuāru"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "I_ziet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "R_ediģēt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "Notī_rīt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Iezīmēt visu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Noņemt iezīmējumu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Apgriezt iezīmēto"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Iezīmējums"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Apcirst"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "A_trast"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr "Kārtot pēc"
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Celiņa numurs"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Albums"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Izpildītājs"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Datums"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Nejauši"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Pielāgots"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Iestatījumi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "S_kats"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Statusa josla"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Balansieris"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr "Dizaina režīms"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Atskaņošana"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Ritināšanās seko atskaņošanai"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Kursors seko atskaņošanai"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr "Apturēt pēc pašreizējā celiņa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr "Apturēt pēc pašreizējā albuma"
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Pārlekt uz pašreizējo celiņu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Palīdzība"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_Izmaiņu žurnāls"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_Par"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Tulkotāji"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Meklēt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Apturēt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Atskaņot"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pauze"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Iepriekšējais"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Nākamais"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Atskaņot nejauši"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "Par"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Iziet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Celiņa īpašības"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "Vieta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Iestatījumi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "Pielietot"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "Ai_zvērt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadati"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Īpašības"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "Atcelt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "Labi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Ievadiet jaunās kolonnas nosaukumu šeit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Tips:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Formāts:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Novietojums:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Teksta krāsa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Izvades spraudnis:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Izvades ierīce:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Vienmēr pārveidot 8 bitu audio uz 16 bitu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Vienmēr pārveidot 16 bitu audio uz 24 bitu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Skaņa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "No komandrindas (vai failu pārvaldnieka) izsauktos failus pievienot šim repertuāram:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Palaižot atjaunot iepriekšējo sesiju"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Pievienojot mapes, nepievienot no arhīviem"
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr "Opcija \"Apturēt pēc pašreizējā celiņa\" tika izslēgta pēc palaišanas"
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr "Opcija \"Apturēt pēc pašreizējā albuma\" tika izslēgta pēc palaišanas"
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Atskaņošana"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr "DSA ķēdes sākumuzstādījums"
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "Ie_lādēt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSA"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Aizvēršana minimizē uz sistēmas ikonu joslu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Paslēpt sistēmas ikonu joslas ikonu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Ieslēgt japāņu SHIFT-JIS kodējuma noteikšanu un pārkodēšanu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr "Ieslēgt ķīniešu CP936 kodējuma noteikšanu un pārkodēšanu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr "Saskarnes atjaunināšanas biežums (reizes sekundē):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Nosaukuma joslas teksts atskaņošanas laikā:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Nosaukuma joslas teksts pēc atskaņošanas apturēšanas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Grafiskās lietotāja saskarnes spraudnis (maiņai vajadzīgs restartēšana):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr "Atskaņotājs"
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr "Aizvērt repertuārus ar vidējo peles pogu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Pievienojot vienu mapi, repertuāru automātiski pārdēvēt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr "Automātiski mainīt kolonnu izmēru, lai ietilpinātu logā"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Repertuārs"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr "Grafiskā lietotāja saskarne/citi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Aizstāt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Ieslēgt starpniekserveri"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Starpniekservera adrese:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Starpniekservera ports:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Starpniekservera tips:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Starpniekservera lietotājvārds:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Starpniekservera parole:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr "HTTP lietotāja aģents:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr "Rediģēt satura tipa kartējumus"
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Tīkls"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr "Piesaistītie īsinājumtaustiņi:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr "Darbība:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr "<Nav iestatīts>"
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr "Taustiņu kombinācija:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr "Globālais īsinājumtaustiņš"
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr "Izmantojiem pogu 'Pielietot', lai saglabātu savas izmaiņas,\nvai arī pogu 'Atgriezt', lai atceltu savas izmaiņas.\nIzmaiņas NEtiks saglabātas, ja vien nenospiedīsiet\n'Pielietot'."
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr "_Noklusējumi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr "Īsinājumtaustiņi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Atjaunot noklusēto"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versija: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr "Iestatīt pielāgotu nosaukumu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr "Grupēt pēc ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr "Kārtot pēc ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Augoši\nDilstoši"
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr "Tagu rakstītāja iestatījumi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Rakstīt ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Rakstīt ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Rakstīt APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Izņemt ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Izņemt ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Izņemt APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "ID3v2 versija"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (ieteicams)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 rakstzīmju kodējums (noklusētais ir iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Rakstīt ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr "Satura tipa kartējumi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr "Šī tabula definē saistību starp tīkla straumju satura tipiem un DeaDBeeF dekodera spraudņiem. Piemēram, mp3 failiem satura tips var būt \"audio/x-mpeg\", un tos jādekodē paša DeaDBeeF \"stdmpg\" spraudnim, var arī \"ffmpeg\" spraudnim."
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr "Satura tips:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr "Spraudņi:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr "Pogas īpašības"
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "Krāsa:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "Ikona:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr "Etiķete:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr "Izvēlēties darbību"
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Rediģēt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Saglabāt DeaDBeeF balansiera sākumuzstādījumu"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF balansiera sākumuzstādījumu faili (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Ielādēt DeaDBeeF balansiera sākumuzstādījumu..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF balansiera sākumuzstādījumi (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importēt Foobar2000 balansiera sākumuzstādījumu..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 balansiera sākumuzstādījumi (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Saglabāt sākumuzstādījumu"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Ielādēt sākumuzstādījumu"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importēt Foobar2000 sākumuzstādījumu"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Ieslēgt"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Visu uz nulli"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Priekšpastiprinājumu uz nulli"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Joslas uz nulli"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Jauns repertuārs"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Atbalstītie skaņas formāti"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Visi faili (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Citi faili (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF repertuāra faili (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Sekot simboliskajām saitēm"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 diena %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dienas %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Pārdēvēt repertuāru"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Jauns repertuārs (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Repertuārs ar cilnēm"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Sadalītājs (augšā un apakšā)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Sadalītājs (pa kreisi un pa labi)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Repertuāra cilnes"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Iezīmējums īpašības"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Albuma vāka attēlojums"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektrs"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "Horizontālais rāmis"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "Vertikālais rāmis"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Poga"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Meklēšanas josla"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Atskaņošanas vadība"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Skaļuma josla"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune balsis"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Neizdevās nolasīt palīdzības failu"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Neizdevās ielādēt palīdzības failu"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Atskaņotājam pašreiz ir palaisti fona uzdevumi. Ja tagad iziesiet, uzdevumi tiks atcelti vai pārtraukti. Tas var izraisīt datu zudumu."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Vai tomēr vēlaties iziet?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Dzēst"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Pa kreisi"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Pa labi"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Celiņš"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Neviens"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Augoši"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Dilstoši"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (ieteicams)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Izpildītājs / Albums"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Celiņa nr."
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Ilgums"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Vienumu indekss"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Atskaņo"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Albuma vāks"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Izpildītājs — Albums"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Celiņa numurs"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Grupa / Albuma izpildītājs"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodeks"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Pievienot kolonu"
+
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Rediģēt kolonnu"
+
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Izņemt kolonnu"
+
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Tinot piespraust grupas"
+
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Grupēt pēc"
+
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Izpildītājs/Datums/Albums"
+
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Pārlādēt metadatus"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Izņemt repertuāru"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Pievienot jaunu repertuāru"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Atvērt failu..."
+
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Konfigurēt %s"
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Jūs izmainījāt īsinājumstaustiņu iestatījumus, bet nesaglabājāt savas izmaiņas."
+
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Tiešām vēlaties turpināt bez saglabāšanas?"
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Noklusētā audio ierīce"
+
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Pievieno failus..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Inicializē..."
+
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nosaukums"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Rādīt kolonnu galvenes"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Vērtība"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Jūs esat modificējis(-usi) datus šim celiņam."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Tiešām aizvērt logu?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Vairākas vērtības"
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Atslēga"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Vairākas vērtības"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Raksta tagus..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Lauka nosaukums"
+
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Nosaukums:"
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Lauka nosaukume nevar sākties ar : vai _"
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Nevar pievienot lauku"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Lauks ar tādu nosaukumu jau pastāv, lūdzu, mēģiniet citu nosaukumu."
+
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Sīkrīks \"%s\" nav pieejams"
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Aizvietot ar..."
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Ievietot..."
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Izgriezt"
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopēt"
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Ielīmēt"
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Vairāki šī tipa sīkrīki netiek atbalstīti"
+
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogēns"
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Paplašināt"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Aizpildīt"
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Balsis:"
+
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
+
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Repertuāru pārlūks"
+
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Pielāgotas čaulas komandas"
+
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Aizvērt"
+
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Rediģēt komandu"
+
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Komanda:"
+
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr "Jebkāda čaulas komanda. Tiks izpildīta tajā čaulas kontekstā, no kuras tipa palaista galvenā lietotne. Var izmantot nosaukumu formatēšanu. Piemērs: xdg-open %D"
+
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
+
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Brīvi izvēlēts nosaukums, piemēram, \"Mana čaulas komanda\""
+
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Komandas ID, parasti vajadzētu būt kaut kam īsam, piemēram, \"youtube_open\". Jābūt unikālam."
+
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Atsevišķi celiņi"
+
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Darbojas ar atsevišķiem celiņiem."
+
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Vairāki celiņi"
+
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Darbojas ar vairākiem celiņiem."
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Vietējie"
+
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Darbojas ar vietējiem failiem."
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Attālinātie"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Darbojas ar attālinātajiem failiem (piem., http:// straumēm)"
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Vispārējs (galvenā izvēlne)"
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "Vienumam vajadzētu parādīties galvenajā izvēlnē"
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr "Ja vēlaties pievienot komandu galvenajai izvēlnei, pārliecinaties, ka nosaukums satur ceļu izvēlnē, piem.: \"File/Mana komanda\", kur File ir izvēlnes nosaukums angliskajā versijā."
+
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Pievienot komandu"
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "Šī darbība dzēsīs izvēlēto čaulas komandu. Vai esat pārliecināts(-ta)?"
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Apstiprināt dzēšanu"
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID jābūt ne-tukšam un unikālam.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Nosaukumam jābūt ne-tukšam.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "Čaulas komandai jābūt ne-tukšai.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Nederīgas vērtības"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 konfigurācijas fails nav atrasts. Lūdzu, instalējiet timidity-freepats pakotni, vai arī spraudņa iestatījumos norādiet ceļu uz freepats.cfg."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr ""
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr ""
+
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Celiņa nosaukums"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Izpildītājs"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Celiņi kopā"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Žanrs"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Komponists"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Diska numurs"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Komentārs"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Kodētājs/ražotājs"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Autortiesības"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Vieta"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Apakšceliņa indekss"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tagu tips(-i)"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Iegultais cue fails"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Dot priekšroku Ken emu nevis Satoh (ieskaujošā skaņa (surround) nedarbosies)"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Ieslēgt ieskaušanu (surround)"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Izmantot ALSA diskretizācijas frekvences pārveidotāju"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Vēlamais bufera izmērs"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Vēlamais perioda izmērs"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
+
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Saņemt no iekļautajiem tagiem"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Saņemt no vietējās mapes"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Pievienot audio CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Dot priekšroku CD-Text nevis CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Ieslēgt NRG attēlu atbalstu"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr ""
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Pārveidot"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Kvalitāte/Algoritms"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Failu paplašinājumi (atdalīti ar ';')"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Maksimālais dziesmas ilgums (minūtēs)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Izdzišanas ilgums (sekundēs)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Atskaņot ciklus šādu reižu skaitu (ja pieejams)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Dzēšot failus no diska, jautāt apstiprinājumu"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Statusa ikonas skaļuma kontroles jutīgums"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Pielāgota statusa ikona"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Pievienot atdalītājus starp spraudņu konteksta izvēlnes vienumiem"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Ieslēgt atskaņojumu nosūtītāju (scrobbler)"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Atslēgt 'tagad atskaņo'"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Lietotājvārds"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Parole"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Atskaņojumu nosūtīšanas URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Dot priekšroku 'Albuma izpildītājs' nevis 'Izpildītājs' laukam"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Paziņojuma nosaukuma formāts"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Paziņojuma satura formāts"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Rādīt albuma vāku"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Albuma vāka izmērs (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Ierīces fails"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Iztveršanas frekvence"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr ""
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Konfigurēt pielāgotās čaulas komandas"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Relatīvās meklēšanas tabulas ceļš"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Absolūtās meklēšanas tabulas ceļš"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Apmainīt audio bitus (pārslēdziet, ja dzirdat tikai statisku troksni)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Ieslēgt HVSC dziesmu garumu datubāzi"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Noklusētais dziesmas ilgums (sekundēs)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ kopņu konfigurācijas fails"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-1.9.6.tar.bz2/po/nb.po Added

@@ -0,0 +1,3965 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# heskjestad <cato@heskjestad.xyz>, 2021-2023
+# heskjestad <cato@heskjestad.xyz>, 2019-2021
+msgid ""
+msgstr ""
+"Project-Id-Version: DeaDBeeF Player\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-11-07 19:05+0100\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: heskjestad <cato@heskjestad.xyz>, 2021-2023\n"
+"Language-Team: Norwegian Bokmål (http://app.transifex.com/deadbeef-player/deadbeef-player/language/nb/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Bruk: deadbeef innstillinger - fil(er)\n"
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "Innstillinger:\n"
+
+#: ../src/main.c:136
+#, c-format
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help eller -h Skriv hjelpetekst (denne teksten) og avslutt\n"
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Avslutt spilleren\n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Skriv versjonsinformasjon og avslutt\n"
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Start avspilling\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Stopp avspilling\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pause avspilling\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Slå av/på pause\n"
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Start avspilling hvis stoppet, slå av/på pause ellers\n"
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Neste låt i spillelista\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Forrige låt i spillelista\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Tilfeldig låt i spillelista\n"
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Legg til fil(er) i eksisterende spilleliste\n"
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Angir brukergrensesnitt, standard er «GTK2»\n"
+
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Skriv formatert spornavn til stdout\n"
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntaks: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " eksempel: --nowplaying \"%%a - %%t\" vil skrive \"artist - tittel\"\n"
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr " for mer info, se %s\n"
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " NB: --nowplaying er foreldet.\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Skriv formatert spornavn to stdout, med den nye typen tittelformatering\n"
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " FMT-syntaks: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " eksempel: --nowplaying-tf \"%%artist%% - %%title%%\" vil skrive \"artist - tittel\"\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Skriv eller velg deadbeefs volumnivå.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " NUM-parameteren kan angis i prosent (absoluttverdi eller økning/reduksjon)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " eller i dB -50, 0 (bruk i så fall suffiks).\n"
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Eksempler: --volume 80, --volume +10, --volume -5 eller --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr " --plugin=PLUG Send kommando til valgt tillegg. Velg PLUG=main for å sende kommandoer til selve deadbeef.\n"
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr " Bruk --plugin=PLUG --help for å liste ut kommandoer som er spesifikke for tillegget\n"
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr " --plugin-list Lister ut alle tilgjengelige tillegg og om de støtter kommandoer.\n"
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Standard"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nei"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Lagre i mappe:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Skriv til kildesporets mappe"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Bevar mappestruktur"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Kopier hvis filtypen ikke endres"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Skriv metadata på nytt etter kopiering"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Nytt filnavn: "
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Filetternavnet (f.eks. .mp3) vil legges til automatisk.\nLa være tom for å bruke standardverdien (%tracknumber%. %artist% - %title%)."
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Omkoder:"
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP-oppsett:"
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Antall tråder: "
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Ny bitdybde: "
+
+#: ../plugins/converter/converter.glade.h:14
+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 "Behold kildens\n8-biters heltall med fortegn\n16-biters heltall med fortegn\n24-biters heltall med fortegn\n32-biters heltall med fortegn\n32-biters flyttall"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Hvis fila eksisterer: "
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Hopp over\nSpør\nOverskriv"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Rediger omkodingsoppsett"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Tittel: "
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Navnløs omkoder"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Resultatfilas etternavn: "
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "F.eks. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Kommandolinje:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Eksempel: lame - %o\n%i er innfila, %o er resultatfila, - er stdin"
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - resultatfilnavn\n%i - midlertidig innfilnavn"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metode:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Rør\nMidlertidig fil\nKildefil"
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Skriv metadata"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Redigere DSP-oppsett"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Tittel"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Navnløst DSP-oppsett"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Legg til"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Fjern"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Sett opp ..."
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Velg DSP-programtillegg"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Programtillegg"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Oppsett"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Innebygd %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Fila finnes allerede. Overskrive?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Konverteringsadvarsel"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Velg omkoder"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Konverteringsfeil"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Konverterer ..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Velg mappe ..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Klarte ikke å lagre omkodingsoppsett"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Undersøk mappetillatelser, velg et annet filnavn, eller frigjør diskplass"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Fant et oppsett med samme navn. Velg et annet navn."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Feil"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Legg til ny omkoder"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Rediger omkoder"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Fjern oppsett"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Dette vil slette det valgte oppsettet. Er du sikker?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Advarsel"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Omkodere"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Legg til programtillegg i DSP-kjeden"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Klarte ikke å lagre DSP-oppsett"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Nytt DSP-oppsett"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Rediger DSP-oppsett"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP-oppsett"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Hjelp"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Behold kildens"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8-biters heltall med fortegn"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16-biters heltall med fortegn"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24-biters heltall med fortegn"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32-biters heltall med fortegn"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32-biters flyttall"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Hopp over"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Spør"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Overskriv"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Rør"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Midlertidig fil"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Kildefil"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Fant ikke rasterbilde: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Åpne fil(er) ..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Legg til fil(er) i spilleliste ..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Legg til mappe(r) i spilleliste ..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Åpne spilleliste"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Lagre spilleliste som"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Om DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s – endringslogg"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF-oversettere"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr "Spillende spor"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr "Utvalgt spor"
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Innholdstype"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Programtillegg"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "En eller flere ugyldige verdier."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Feltene «Innholdstype» og «Programtillegg» kan ikke være tomme, og må føye seg etter reglene.\nEksempel på innholdstype: «audio/mpeg».\nEksempel på programtillegg: «stdmpg ffmpeg».\nBruk mellomrom som skilletegn mellom programtilleggene.\nInnholdstypen består av bokstaver, tall og tegnet «-».\nProgramtillegg består kun av bokstaver og tall."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Ingenting er valgt."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Fil"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Åpne fil(er)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Legg til fil(er)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Legg til mappe(r)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Legg til adresse"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Ny spilleliste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Åpne spilleliste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Lagre spilleliste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Avslutt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Rediger"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Tøm"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Velg alle"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Fravelg alle"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Inverter utvalg"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Utvalg"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Beskjær"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Finn"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr "Sorter etter"
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Spornummer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Artist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Dato"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Tilfeldig"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Selvvalgt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Innstillinger"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Vis"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Statuslinje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Equalizer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr "Designmodus"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Logg"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Avspilling"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Bland"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Av"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Spor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Album"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Tilfeldige spor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Gjenta"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Alle spor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Ett spor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Rulling følger avspilling"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Markør følger avspilling"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr "Stopp etter dette sporet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr "Stopp etter dette albumet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Hopp til gjeldende spor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_Endringslogg"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_Om"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Oversettere"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Søk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Stopp"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Spill"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pause"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Neste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Spill tilfeldig"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "Om"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Avslutt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Sporets egenskaper"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "Adresse: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Innstillinger"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Bruk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Lukk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Skriv ny kolonnetittel her"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Type: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Format: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Sorteringsformat: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(hvis ikke tom)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Justering: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Venstre\nHøyre\nMidten"
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Tekstfarge: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Programtillegg for utdata: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Utenhet: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Konverter alltid 8-biters lyd til 16-biters"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Konverter alltid 16-biters lyd til 24-biters"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr "Overstyr bitdybde:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr "Slått av\n8 biter\n16 biter\n24 biter\n32 biter\n32 biter flyttall"
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Ønsket samplingsrate: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "For multipler av 48 kHz (96 kHz, 192 kHz, ...): "
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "For multipler av 44,1 kHz (88,2 kHz, 176,4 kHz, ...): "
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Basert på inndatas samplingsrate"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Overstyr samplingsrate"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Lyd"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Kildemodus: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Avspillingsrekkefølge\nSpor\nAlbum"
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Behandling: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Ingen\nForsterk\nForsterk og unngå klipping av høyeste utslag\nUnngå klipping"
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Forforsterk med RG-informasjon: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Forforsterk uten RG-informasjon: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Legg til filer fra kommandolinja (eller fra filbehandler) i denne spillelista: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Gjenoppta forrige økt ved oppstart"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Ikke legg til fra arkiver når mapper legges til"
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr "Slå av innstillingen «Stopp etter dette sporet» etter utløsning"
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr "Slå av innstillingen «Stopp etter dette albumet» etter utløsning"
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Avspilling"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr "Forvalgt DSP-kjede"
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "_Åpne"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Minimer til systemkurv ved oppstart"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Lukk minimerer til systemkurven"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Skjul ikon i systemkurven"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "Sletting fra disk skal bruke søppelkurven"
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Aktiver gjenkjenning og omkoding av japansk SHIFT-JIS"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr "Aktiver gjenkjenning og omkoding av kyrillisk CP1251"
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr "Aktiver gjenkjenning og omkoding av kinesisk CP936"
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr "Oppdateringsfrekvens for brukergrensesnittet (per sekund)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Tittellinjas tekst under avspilling: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Tittellinjas tekst ellers: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Brukergrensesnitt (endring krever omstart): "
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Vis utvalgets spilletid i statuslinja"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr "Spiller"
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr "Lukk spillelister med midtre museknapp"
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr "Skjul «Slett fra disk» i sprettoppmenyen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Hopp til neste låt hvis den som spilles fjernes fra disk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Gi automatisk navn til spillelister når enkeltmapper legges til"
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr "Tilpass automatisk kolonnebreddene til vindusbredden"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Gruppemellomrom: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "piksler"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Spilleliste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr "Brukergrensesnitt/diverse"
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Overstyr"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Stolper"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Bakgrunn (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Søkebryter/Volumkontroll/EQ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Bakgrunn: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Mørk: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Lys: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Midt: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Tekst: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Fet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Tekst i spillende:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Tekst i valgt: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Fanelinje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Normale spor: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Spillende spor: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Utvalgt(e) spor: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Kolonner: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Gruppeoverskrift: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Forgrunn:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Partallsrad: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Oddetallsrad: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Valgt: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Markør: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Bakgrunn:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Overstyr (trevisningen mister GTK-drakten, men tegnes opp raskere)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr "Selvvalgt basisfarge for visualisering"
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr "Selvvalgt bakgrunnsfarge for visualisering"
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Visualiseringer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Utseende"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Slå på mediebibliotek"
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "Legg til/fjern musikkmapper"
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Mediebibliotek"
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Aktiver mellomtjener"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Mellomtjenerens adresse: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Mellomtjenerens port: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Type mellomtjener: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Brukernavn: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Passord: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr "HTTP User-Agent: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr "Rediger innholdstypekoblinger"
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Nettverk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr "Tilordnede hurtigtaster: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr "Handling: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr "<Not set>"
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr "Tastekombinasjon: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr "Universell hurtigtast"
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr "Velg «Bruk» for å lagre endringene dine,\neller «Tilbakestill» for å angre dem.\nEndringene vil IKKE lagres\nhvis du ikke velger «Bruk»."
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr "_Standardverdier"
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr "Hurtigtaster"
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Oppsett"
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Info"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Lisens"
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Tilbakestill standardverdier"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versjon: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "Adresse: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr "Velg din egen tittel"
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr "Gruppere etter ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr "Sortere etter ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr "Format"
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Stigende\nSynkende"
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr "Innstillinger for metadata"
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Skriv ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Skriv ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Skriv APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Fjern ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Fjern ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Fjern APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "ID3v2-versjon"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (anbefales)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 tegnkoding (standard er iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Skriv ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr "Innholdstypekoblinger"
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr "Denne tabellen definerer koblinger mellom innholdstypene til nettverksstrømmer og DeaDBeeFs dekoderprogramtillegg. For eksempel har mp3-filer innholdstypen «audio/x-mpeg» og må dekodes med DeaDBeeFs eget programtillegg «stdmpg», eller «ffmpeg»."
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr "Innholdstype: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr "Programtillegg: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr "Knappens egenskaper"
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "Farge: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "Ikon: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr "Tekst: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr "Velg handling"
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr "Dette dialogvinduet lar deg velge en egen tittel for et vilkårlig spor. Dette er mest nyttig for radiostasjoner. Det er også mulig å velge egen tittel i dialogvinduet «Legg til adresse». Selve tittelen vises i kolonner som viser metadatafeltet «Artist». Den ser ut som «selvvalgt artist» hvis «Artist»-feltet finnes, ellers bare «selvvalgt»."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Rediger"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Rediger direkte"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Legg til nytt felt ..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Rediger verdi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Feltnavn: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Feltverdi: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Tegnet ';' skiller mellom flere verdier."
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF-logg"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Tøm"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "ReplayGains analyseringsframdrift"
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Gjeldende fil: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Status"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "ReplayGains analyseringsresultater"
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Oppdater filmetadata"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "Kopier rapport"
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Vis kun tillegg med oppsett"
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr "Rediger flere spor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Feltnavn:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr "Enkeltverdi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr "Frittstående verdier"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Lagre DeaDBeeF EQ-oppsett"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ-oppsettsfil (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Les inn DeaDBeeF EQ-oppsett ..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ-oppsett (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importer Foobar2000 EQ-oppsett ..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ-oppsett (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Lagre oppsett"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Les inn oppsett"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importer Foobar2000-oppsett"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Aktiver"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Nullstill alle"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Nullstill forforsterkning"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Nullstill bånd"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Ny spilleliste"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Støttede lydformater"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Alle filer (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Støttede spillelisteformater"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Alle filer"
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Andre filer (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF Spillelistefiler (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Følg symlenker"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 dag %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dager %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "total spilletid"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Pause"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "utvalgt spilletid"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Stoppet"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Endre navn på spilleliste"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Fjerner spilleliste"
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Vil du virkelig fjerne spillelista «%s»?"
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Ny spilleliste (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Spilleliste med faner"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Splitter (topp og bunn)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Splitter (venstre og høyre)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Faner"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Spillelistefaner"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Utvalgets egenskaper"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Visning av albumomslag"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Oscilloskop"
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektrum"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBoks"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBoks"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Knapp"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Søkebryter"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Avspillingsknapper"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Volumkontroll"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune-stemmer"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Visning av loggmeldinger"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Vis mediebibliotek"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Klarte ikke å lese hjelpefila"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Klarte ikke å lese inn hjelpefila"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Spilleren kjører oppgaver i bakgrunnen. Dersom du avslutter nå så vil oppgavene avbrytes. Dette kan medføre tap av data."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Vil du fortsatt avslutte?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Filene vil flyttes til søppelkurven.\n\n(Dette dialogvinduet kan slås av i innstillingene til GTKUI-tillegget)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Dette vil faktisk slette filer.\n\n(Dette dialogvinduet kan slås av i innstillingene til GTKUI-tillegget)."
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr "Vil du virkelig slette valgt fil? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr "Vil du virkelig slette alle de %d valgte filene? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr "Vil du virkelig slette alle %d filer fra gjeldende spilleliste? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "Vil du virkelig slette fila som spiller nå? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Slette filer fra disk"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Fjerne?"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Venstre"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Høyre"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Sentrum"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr "Slått av"
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr "8 biter"
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr "16 biter"
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr "24 biter"
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr "32 biter"
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Avspillingsrekkefølge"
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Spor"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Ingen"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Forsterk"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Forsterk og unngå klipping av høyeste utslag"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Unngå klipping"
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Stigende"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Synkende"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (anbefales)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artist / album"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Spornr."
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Lengde"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Elementindeks"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Spiller nå"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Albumomslag"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artist – album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "År"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Spornummer"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Band / albumartist"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodek"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Legg til kolonne"
+
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Rediger kolonne"
+
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Fjern kolonne"
+
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Fest grupper ved rulling"
+
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Gruppere etter"
+
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artist/dato/album"
+
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Spill etterpå"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Spill senere"
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Fjern fra avspillingskøen"
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Oppdater metadata"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "Klipp _ut"
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "_Kopier"
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "_Lim inn"
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Slett fra disk"
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Fjern spilleliste"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Legg til ny spilleliste"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Aktiver autosortering"
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr "Gjenbruk sist valgte sortering hver gang nye filer legges til denne spillelisten"
+
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Åpne fil ..."
+
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Sett opp %s"
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Du endret hurtigtastoppsettet, men lagret ikke endringene."
+
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Vil du fortsette uten å lagre?"
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Standard lydenhet"
+
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Legger til filer ..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Initialiserer ..."
+
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Framdrift for oppdatering av filmetadata"
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Navn"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Albumforsterkning"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Sporforsterkning"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Albumets maks."
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Sporets maks."
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Lyktes"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Fant ikke fila"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Ugyldig fil"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Søk (%list_total% resultater)"
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Vis kolonneoverskrifter"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Verdi"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Du har endret sporets egenskaper."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Vil du virkelig lukke vinduet?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Flere verdier"
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Nøkkel"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Flere verdier"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Skriver metadata ..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "Element"
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Felt"
+
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Feltnavn"
+
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Navn: "
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Feltnavn kan ikke starte med «:» eller «_»"
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Klarte ikke å legge til felt"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Det finnes allerede et felt som heter dette, forsøk et annet navn."
+
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Skjermelementet «%s» er utilgjengelig"
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Erstatt med ..."
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Sett inn ..."
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopier"
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Lim inn"
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Forelder"
+
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Dette skjermelementet kan kun brukes én gang"
+
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Behold proporsjoner ved skalering"
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Lås den øvre rutas høyde"
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Lås den venstre rutas bredde"
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Lås den nedre rutas høyde"
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Lås den høyre rutas bredde"
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Gi fana nytt navn"
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Fjern fane"
+
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Legg til fane"
+
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Flytt fane til venstre"
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Flytt fane til høyre"
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr "Opptegningsmetode"
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr "Flere kanaler"
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr "Skalering"
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "Automatisk"
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
+
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
+
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr "3x"
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr "Fragmentets varighet"
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 ms"
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 ms"
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 ms"
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 ms"
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 ms"
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr "Diskrete frekvenser"
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr "1/12 oktavbånd"
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr "1/24 oktavbånd"
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr "Mellomrommets størrelse"
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr "1/2 takt"
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr "1/3 takt"
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr "1/4 takt"
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr "1/5 takt"
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr "1/6 takt"
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr "1/7 takt"
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr "1/8 takt"
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr "1/9 takt"
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr "1/10 takt"
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Utvid boksen med 1 element"
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Krymp boksen med 1 element"
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogen"
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Utvid"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Fyll"
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Sett opp knapp"
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr "_dB-skala"
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr "_Lineær skala"
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr "_Kubisk skala"
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Stemmer: "
+
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr "Kopi av %s"
+
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr "Kopi av %s (%d)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "(pause)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "(stoppet)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "(spiller)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Elementer"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Spillelistebehandling"
+
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Egne skallkommandoer"
+
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Lukk"
+
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Rediger kommando"
+
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Kommando:"
+
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr "Vilkårlig skallkommando. Den vil utføres i det skallmiljøet som hovedprogrammet ble startet fra. Du kan bruke tittelformatering. Eksempel: xdg-open %D"
+
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
+
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Fritt valgt navn, for eksempel «Min skallkommando»"
+
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Kommando-ID, bør være kort og må være unik, for eksempel «youtube_open»."
+
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Enkeltspor"
+
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Virker med enkeltspor."
+
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Flere spor"
+
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Virker med flere spor."
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Lokal"
+
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Virker med lokale filer."
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Ekstern"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Virker med eksterne filer (f.eks. http://-strømmer)"
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Generell (hovedmenyen)"
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "Vis elementet i hovedmenyen."
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr "Hvis du vil legge til kommandoen i hovedmenyen så sørg for at tittelen inneholder menystien, som f.eks. «File/Min kommando», der «File» er menynavnet i den engelske utgaven."
+
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Legg til kommando"
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "Denne handlingen vil fjerne den valgte skallkommandoen. Er du sikker?"
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Bekreft fjerning"
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID-en kan ikke være tom, og må være unik.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Tittelen kan ikke være tom.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "Skallkommandoen kan ikke være tom.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Ugyldige verdier"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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: fant ikke oppsettsfila til freepats. Installer pakken timidity-freepats, eller angi stien til freepats.cfg i programtilleggets innstillinger."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
+
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Sportittel"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Utøver"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Totalt antall spor"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Sjanger"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Komponist"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Disknummer"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Totalt antall disker"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Kommentar"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Omkoder / leverandør"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Opphavsrett"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Adresse"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Undersporets indeks"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Metadatatype(r)"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Innebygd cuesheet"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr "Tjenestenavn for ekstern PipeWire (la være tom for å bruke forvalgt)"
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr "Selvvalgte egenskaper (overstyrer eksisterende):"
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr "Bruk PipeWire-volumkontroll"
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Foretrekk Ken emu framfor Satoh (kringlyd vil ikke virke)"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Aktiver kringlyd"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Bruk ALSA-resampling"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Foretrukket bufferstørrelse"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Foretrukket periodestørrelse"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr "Oppdater albumomslag"
+
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Hent fra innebygd metadata"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Hent fra lokal mappe"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Hent fra Last.fm"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Hent fra MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Hent fra Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "Hent fra World of Spectrum (AY-filer)"
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Lagre nedlastede filer til musikkmapper"
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Hvis omslag ikke finnes"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "la være tom"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "vis DeaDBeeFs standardomslag"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "vis selvvalgt bilde"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Sti til selvvalgt bilde"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "Lagre til filnavn"
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr "Søkemasker (adskilt med tegnet ';')"
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr "Søkemapper (adskilt med tegnet ';')"
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "Oppdateringsintervall for hurtiglager (timer)"
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "Forenklede filnavn i hurtiglager"
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Bildestørrelse"
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "Last denne CD-stasjonen"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Stasjon med musikk-CD"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Fil"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Legg til musikk-CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr "Bruk CDDB/GnuDB"
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Foretrekk CD-Text framfor CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr "CDDB-URL (f.eks. 'gnudb.gnudb.org')"
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr "CDDB-portnummer (f.eks. «8880»)"
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Bruk CDDB-protokoll"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Aktiver støtte for NRG-avtrykk"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Hastighet for normal avspilling"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Maks"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Bruk cdparanoias feilkorreksjon under lydkopiering"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Konverter"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Gjenkjenn automatisk samplingsraten til utenheten"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Velg samplingsrate"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Kvalitet/algoritme"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Resamplingskvalitet"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Internt DUMB-volum"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Volumovergang"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Kun av/på"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Full"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8-biters utdata"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Bruk alle filtypene som ffmpeg støtter"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Filtyper (skill dem med «;»)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr "Slå på DoP-utdata"
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Se bort fra feil i filhode"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Se bort fra feil i datastrømmen"
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Lengste låtlengde (i minutter)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Uttoningslengde (sekunder)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Gjenta sløyfer (hvis tilgjengelig)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (for filformatet SGC)"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Fjern ReplayGain-informasjon"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Analyser utvalget som albumer (iht. metadata)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Analyser utvalget som ett album"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Analyser hver fil for seg selv"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Analyser hver fil for seg selv hvis ikke analysert"
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Fravelg alle"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Velg alle"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Legg til adresse"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Legg til mappe(r)"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Legg til fil(er)"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Åpne fil(er)"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Vis hjelpeside"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Veksle mellom repetisjonsmåtene"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Ikke repeter"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Repeter ett spor"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Repeter alle"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Veksle mellom blandingsmåtene"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Bland tilfeldige spor"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Bland albumer"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Bland spor"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Ingen blanding"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Slå av/på markør følger avspilling"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Slå av/på rulling følger avspilling"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Vis"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Vis\\/skjul meny"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Vis\\/skjul statuslinje"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Slå av/på designmodus"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Selvvalgt sortering"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Beskjær utvalgte"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr "Fjern spor fra spilleliste"
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Lagre spilleliste"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Fjern aktiv spilleliste"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "Endre navn på gjeldende spilleliste"
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Vis\\/skjul equalizer"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Skjul equalizer"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Vis equalizer"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Vis\\/skjul spillevindu"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Skjul spillevindu"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Vis spillevindu"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Finn"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Vis\\/skjul loggvindu"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Bekreft sletting av filer fra disk"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "Oppsett av statusikon:"
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Følsomheten til volumkontrollen i systemkurven"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Selvvalgt ikon i systemkurven"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr "Diverse:"
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Legg til separatorer i sprettoppmenyen mellom elementer fra programtillegg"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Bruk Unicode-tegn istedenfor bilder for avspillingsstatus"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Deaktiver tekst oppå søkebryteren"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr "Forrige eller spol tilbake gjeldende spor"
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "Dupliser spilleliste"
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr "Hopp til sporet som spiller"
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Gå til"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Forrige sjanger"
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Forrige komponist"
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Forrige artist"
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Forrige album"
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Neste sjanger"
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Neste komponist"
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Neste artist"
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "Neste album"
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Neste spilleliste"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Forrige spilleliste"
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "Vis spilleliste 10"
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr "Vis spilleliste 9"
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "Vis spilleliste 8"
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Vis spilleliste 7"
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "Vis spilleliste 6"
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Vis spilleliste 5"
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Vis spilleliste 4"
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Vis spilleliste 3"
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Vis spilleliste 2"
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Vis spilleliste 1"
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Tilfeldig sortering"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Sorter etter dato"
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Sorter etter artist"
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Sorter etter album"
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Sorter etter spornummer"
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Sorter etter tittel"
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Inverter utvalg"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Tøm spilleliste"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr "Legg til i avspillingskøen"
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr "Legg til først i avspillingskøen"
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr "Legg til i/fjern fra avspillingskøen "
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Flytt"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Flytt sporene nedover"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Flytt sporene oppover"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Demping av/på"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Pause av/på"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Spill\\/pause"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Spol 1 s framover"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Spol 1 s bakover"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Spol 5 s framover"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Spol 5 s bakover"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Spol 1% framover"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Spol 1% bakover"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Spol 5% framover"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Spol 5% bakover"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Øk volum"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Senk volum"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Slå av/på stopping etter dette sporet"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Slå av/på stopping etter dette albumet"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr "Slå opp på Last.fm"
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Aktiver logging"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Deaktiver «spiller nå»"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Brukernavn"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Passord"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble-URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Foretrekk albumartist framfor artist-feltet"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Send MusicBrainz-ID"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Send inn spor som er kortere enn 30 sekunder (anbefales ikke)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Blandingsforhold venstre"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Blandingsforhold høyre"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Tving 16-biters utdata"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Bakstykke"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Varslets tittelformatering"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Varslets innholdsformatering"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Vis albumomslag"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Albumomslagets størrelse (piksler)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr "Ikke gjenbruk varslinger (særhet i KDE)"
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Enhetsfil"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Uthev aktiv spilleliste"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Dobbeltklikk for å spille"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Bufferstørrelse (velg -1 for å bruke optimal verdi valgt av portaudio)"
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Enhetsnavnets tegnsett"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Definert nedenfor"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Selvvalgt tegnsett for enhetsnavnet"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio-tjener (la være tom for å bruke standard)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Forvalgt låtlengde (i minutter)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Samplingsrate"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Hopp over hvis kortere enn (sek)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Sett opp egne skallkommandoer"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Relativ sti til søketabell"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Absolutt sti til søketabell"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Bytt byterekkefølge (hvis du kun hører støy)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Aktiver HVSCs låtlengdedatabase"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Full sti til Songlengths.md5/.txt"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Bitdybde"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Forvalgt låtlengde (sek)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Monosynt"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Aktiver logging"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Forforst."
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ bankoppsettsfil"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "Filtype"
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr "Konverteringsverktøyets kommandolinjekall"
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr "Metode for dataoverføring"
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr "Rør (stdin)"
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "Midlertidig fil"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "Kildefil"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "Skriv ID3v2-metadata"
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "Skriv ID3v1-metadata"
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "Skriv APEv2-metadata"
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "Skriv FLAC-metadata"
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "Skriv OggVorbis-metadata"
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "Skriv MP4-metadata"

deadbeef-0.6.2.tar.bz2/po/nl.po -> deadbeef-1.9.6.tar.bz2/po/nl.po Changed

@@ -1,2079 +1,2619 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Glenn de Groot, 2010
+# Heimen Stoffels <vistausss@fastmail.com>, 2021-2023
+# Heimen Stoffels <vistausss@fastmail.com>, 2019-2021
 # Pjotr, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/nl/)\n"
-"Language: nl\n"
+"POT-Creation-Date: 2023-11-07 19:05+0100\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>, 2021-2023\n"
+"Language-Team: Dutch (http://app.transifex.com/deadbeef-player/deadbeef-player/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Over DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Gebruik: deadbeef opties bestand(en)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s logboek van wijzigingen"
+msgid "Options:\n"
+msgstr "Opties:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr ""
-"Glenn de Groot\n"
-"Pjotr"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h Hulp printen (dit bericht) en afsluiten\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Bewaar DeaDBeef EQ Voorinstelling"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Speler afsluiten\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeef EQ voorinstelling-bestanden (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Versie-informatie printen en afsluiten\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Laden DeaDBeeF EQ Voorinstelling..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Afspelen starten\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ-voorinstellingen (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Afspelen stoppen\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importeer Foobar2000 EQ Voorinstelling.."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Afspelen pauzeren\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ voorinstellingen (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Pauzeren/Hervatten\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Opslaan voorinstelling"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Start het afspelen indien gestopt of pauzeer\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Laden voorinstelling"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Volgend nummer op afspeellijst\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importeer Foobar2000 Voorinstelling"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Vorig nummer op afspeellijst\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Inschakelen"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Willekeurig nummer op afspeellijst\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Alles op nul"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Bestand(en) toevoegen aan afspeellijst\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Preamp op nul"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Geef op welke GUI-plug-in moet worden gebruikt - standaard is dit ‘GTK2’\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Banden op nul"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Opgemaakte titel van nummer printen naar stdout\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Voorinstellingen"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 dag %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " voorbeeld: --nowplaying \"%%a - %%t\" zou \"artist - title\" moeten printen\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d dagen %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " bekijk %s voor meer informatie\n"
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " LET OP: --nowplaying is verouderd.\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Opgemaakte titel van nummer printen naar stdout middels de nieuwe titelopmaak\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:157
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Gestopt | %d sporen | %s totale speeltijd"
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " FMT-syntax: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " voorbeeld: --nowplaying-tf \"%%artist%% - %%title%%\" zou \"artist - title\" moeten printen\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Print het deadbeef-volumeniveau of stel dit in.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " De NUM-parameter kan worden gespecificeerd in procenten (absolute waarde of verhoging/verlaging)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " of in dB -50, 0 (indien een voorvoegsel aanwezig is).\n"
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Voorbeeld: --volume 80, --volume +10, --volume -5, of --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr " --plugin=PLUG Verstuur opdrachten naar een specifieke plug-in. Gebruik PLUG=main om opdrachten naar deadbeef zelf te versturen.\n"
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr " Gebruik --plugin=PLUG --help voor een overzicht van plug-in-specifieke opdrachten\n"
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr " --plugin-list Toon alle beschikbare plug-ins, inclusief indicaties van plug-ins die opdrachten ondersteunen.\n"
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Standaard"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Ja"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Gepauzeerd | "
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nee"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Uitvoermap:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Wegschrijven naar bronmap"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Mapstructuur behouden"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Kopiëren als het formaat niet is aangepast"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Opnieuw taggen na kopiëren"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Naam van uitvoerbestand:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-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 sporen | %s totale speeltijd"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "De extensie (bijv. .mp3) wordt automatisch toegevoegd.\nLaat het veld leeg voor de standaard (%tracknumber%. rtist% - tle%)."
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nieuwe speellijst"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Codeerder:"
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Nieuwe speellijst (%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP-voorinstelling:"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Aantal processen:"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Voorbeeld van uitvoerformaat:"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:14
+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 "Bronformaat behouden\n8 bit signed int\n16 bit signed int\n24 bit signed int\n32 bit signed int\n32 bit float"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Als het bestand al bestaat:"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Overslaan\nOm bevestiging vragen\nOverschrijven"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Voorinstelling van codeerder bewerken"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Titel:"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Naamloze codeerder"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Extensie van uitvoerbestand:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Bijv. mp3"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Opdrachtregel:"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, 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/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - uitvoerbestandnaaam\n%i - tijdelijke invoerbestandnaam"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Methode:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Pipe\nTijdelijk bestand\nBronbestand"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Fout bij het lezen van het hulpbestand"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Kon hulpbestand niet laden"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Tagschrijver"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP-voorinstellingbewerker"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Titel"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Naamloze DSP-voorinstelling"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Toevoegen"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Instellen"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "DSP-plug-in kiezen"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Plug-in"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Voorinstellingen"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Meegeleverd %s"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Het bestand bestaat al. Wil je het overschrijven?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Converteerwaarschuwing"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Kies een codeerder"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Converteerfout"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Bezig met converteren…"
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Kies een map…"
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Kan codeerder-voorinstelling niet opslaan"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Controleer de maprechten van de voorinstellingsmap, kies een andere titel, of maak schijfruimte vrij"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr ""
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Er is al een voorinstelling met dezelfde naam. Kies een andere naam."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Foutmelding"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Nieuwe codeerder toevoegen"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Codeerder bewerken"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Voorinstelling verwijderen"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Dit verwijdert de geselecteerde voorinstelling. Weet je het zeker?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Codeerders"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Plug-in toevoegen aan DSP-ketting"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Kan DSP-voorinstelling niet opslaan"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Nieuwe DSP-voorinstelling"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "DSP-voorinstelling bewerken"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP-voorinstellingen"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Hulp"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Bronformaat behouden"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit signed int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit signed int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit signed int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Overslaan"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Om bevestiging vragen"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Overschrijven"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Pipe"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Tijdelijk bestand"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Bronbestand"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Kan pixmapbestand niet vinden: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Bestand(en) openen…"
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Bestand(en) toevoegen aan afspeellijst…"
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Map(pen) toevoegen aan afspeellijst…"
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Afspeellijst laden"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Afspeellijst opslaan als"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Over DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s-wijzigingslog"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Glenn de Groot\nPjotr\nHeimen Stoffels"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr "Momenteel spelend nummer"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr "Geselecteerd nummer"
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Inhoudstype:"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Plug-ins"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Ongeldige waarde(n)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "De velden ‘Inhoudstype’ en ‘Plug-ins’ moeten worden ingevuld overeenkomstig de regels.\nVoorbeeld inhoudstype: ‘audio/mpeg’\nVoorbeeld plug-in-id's: ‘stdmpg ffmpeg’\nDe plug-ins moeten spatiegescheiden genoteerd worden.\nInhoudstype mag alleen letters, cijfers en ‘-’ bevatten.\nPlug-ins mag alleen letters en cijfers bevatten."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Er niets geselecteerd."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
-msgstr "_Open bestand(en)"
+msgstr "Bestand(en) _openen"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
-msgstr "Voeg bestand(en) toe"
+msgstr "Bestand(en) toevoegen"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
-msgstr "Voeg map(pen) toe"
+msgstr "Map(pen) toevoegen"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
-msgstr "Voeg locatie toe"
+msgstr "Locatie toevoegen"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
-msgstr "Nieuwe speellijst"
+msgstr "Nieuwe afspeellijst"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
-msgstr "Laad speellijst"
+msgstr "Afspeellijst laden"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
-msgstr "Speellijst opslaan"
+msgstr "Afspeellijst opslaan"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
-msgstr "_Bewerken"
+msgstr "B_ewerken"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Wissen"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
-msgstr "Selecteer alles"
+msgstr "Alles selecteren"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
-msgstr "Deselecteer alles"
+msgstr "Selectie ongedaan maken"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Selectie omkeren"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Selectie"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Bijsnijden"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Zoeken"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
-msgstr ""
+msgstr "Sorteren op"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Titel"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
-msgstr "Spoornummer"
+msgstr "Volgnummer"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Artiest"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Willekeurig"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Aangepast"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Beeld"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Statusbalk"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Equalizer"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
-msgstr ""
+msgstr "Ontwerpmodus"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_Afspelen"
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Log"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Ordenen"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Lineair"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Sporen schuffelen"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Albums schuffelen"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Herhalend"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "Afs_pelen"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Willekeurig"
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Uit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Nummers"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Albums"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Willekeurige nummers"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Herhalen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Alle nummers"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Eén nummer"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
-msgstr "Bladeren volgt afspelen"
+msgstr "Schuiven volgt afspelen"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Aanwijzer volgt afspelen"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Stoppen na huidig nummer"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Stoppen na huidig album"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
-msgstr "Spring naar huidige spoor"
+msgstr "Overschakelen naar huidig nummer"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
-msgstr "_Logboek van wijzigingen"
+msgstr "_Wijzigingslog"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
-msgstr "LGPLv2.1"
+msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Over"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
-msgstr "_Vertalers"
+msgstr "Ver_talers"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Afspelen"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Pauzeren"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Volgende"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Willekeurig afspelen"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Over"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Hulp"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
-msgstr "Eigenschappen van spoor"
+msgstr "Nummereigenschappen"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
-msgstr ""
+msgstr "Locatie:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
-msgstr "_Toepassen"
+msgstr "Toep_assen"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
-msgstr "Bijkomende gegevens"
+msgstr "Metagegevens"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Titel:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Annuleren"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Oké"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Voer hier een nieuwe kolomtitel in"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Type:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Index van elementen"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Aan het afspelen"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Albumkunst"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artiest - Album"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Duur"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Spoornummer"
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Opmaak:"
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Groep / Album Artiest"
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Sorteeropmaak:"
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Opmaaktype:"
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(indien niet leeg)"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Uitlijning:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Links"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Rechts"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Annuleer"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Links\nRechts\nGecentreerd"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Tekstkleur:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
-msgstr "Uitvoerplugin:"
+msgstr "Uitvoerplug-in:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Uitvoerapparaat:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "8-bit-audio altijd omzetten naar 16-bit"
+msgstr "8-bit-audio altijd converteren naar 16-bit"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
-msgstr ""
+msgstr "16-bit-audio altijd converteren naar 24-bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr "Bitdiepte afdwingen:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr "Uitgeschakeld\n8-bit\n16-bit\n24-bit\n32-bit\n32-bit (float)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Doel-samplesnelheid:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Voor vermeerderingen van 48KHz (96K, 192K, …):"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Voor vermeerderingen van 44.1KHz (88.2K, 176.4K, …):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Gebaseerd op invoersamplesnelheid"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Samplesnelheid afdwingen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Replaygain modus:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Uitschakelen"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Bronmodus:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Spoor"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Op afspeelvolgorde\nNummer\nAlbum"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Replaygain piek schaal"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Bezig met verwerken:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Geen\nGain toepassen\nGain toepassen en knippen voorkomen op basis van piek\nAlleen knippen voorkomen"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Replaygain voorversterking:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Preamp met RG-informatie:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Preamp zonder RG-informatie:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-"Voeg bestanden toe vanaf de opdrachtregel (of met de bestandbeheerder) aan "
-"deze speellijst:"
+msgstr "Voeg bestanden toe via de opdrachtregel (of met de bestandsbeheerder) aan deze afspeellijst:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
-msgstr "Hervat vorige sessie bij opstarten"
+msgstr "Vorige sessie hervatten bij opstarten"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
-msgstr "Niet toevoegen vanuit archieven bij het toevoegen van mappen"
+msgstr "Niet toevoegen uit archieven bij het toevoegen van mappen"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "‘Stoppen na huidig nummer’ wordt uitgeschakeld na triggeren"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "‘Stoppen na huidig album’ wordt uitgeschakeld na triggeren"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Afspelen"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Configureer"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
-msgstr "DSP Chain voorinstelling"
+msgstr "DSP Chain-voorinstelling"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Laden"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Minimaliseren naar systeemvak bij opstarten"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
-msgstr "Sluiten minimaliseert naar systeemvak"
+msgstr "Sluiten naar systeemvak"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
-msgstr "Verberg systeemvakpictogram"
+msgstr "Systeemvakpictogram verbergen"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "Prullenbak gebruiken bij ‘Verwijderen van schijf’"
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Japanse SHIFT-JIS-detectie en -hercodering inschakelen"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr "Cyrillische CP1251-detectie en -hercodering inschakelen"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
+msgstr "Chinese CP936-detectie en -hercodering inschakelen"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
-msgstr "Verversingssnelheid van gebruikersschil (keren per seconde):"
+msgstr "Ververssnelheid van toepassing (aantal keren per seconde):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Titelbalktekst gedurende afspelen:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
-msgstr "Titelbalktekst wanneer gestopt:"
+msgstr "Titelbalktekst indien gestopt:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr "GUI Plugin (wijzigen vereist herstart)"
+msgstr "GUI-plug-in (herstart vereist na wijzigen)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Afspeeltijd van selectie tonen op statusbalk"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr ""
+msgstr "Speler"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Afspeellijsten sluiten met middelste muisknop"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr "Rechtermuisknopmenu-item ‘Verwijderen van schijf’ verbergen"
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Overschakelen naar volgende nummer als het huidige verwijderd is wan de schijf"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
-msgstr ""
-"Geef speellijsten automatisch een naam bij het toevoegen van een enkele map"
+msgstr "Automatisch naam toekennen aan afspeellijsten bij het toevoegen van een enkele map"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Kolommen automatisch aanpassen aan venstergrootte"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Groepsruimte:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pixels"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Afspeellijst"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
-msgstr ""
+msgstr "Uiterlijk/Overig"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
-msgstr "Negeer"
+msgstr "Negeren"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Voorgrond"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Achtergrond"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Kleuren zoekbalk/volumebalk"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Midden"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Licht"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Donker"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Basis"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Tekst"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Tabstrook-kleuren"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Negeer (geen boomstructuurthema, maar snellere weergave)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Even rij"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Oneven rij"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Geselecteerde rij"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Geselecteerde tekst"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Aanwijzer"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Speellijst-kleuren"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Kleuren"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Balken"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Achtergrond (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Spoelbalk/Volumebalk/EQ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Basis:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Donker:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Licht:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Midden:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Tekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Vetgedrukt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Cursief"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Afspeeltekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Selectietekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Tabbladstrook"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Normale nummers:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Momenteel spelend nummer:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Geselecteerd(e) nummer(s):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Kolommen:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Groepskop:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Voorgrond:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Even:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Oneven:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Selectie:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Cursor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Achtergrond"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Negeren (GTK-boomweergavethema's worden niet meer gebruikt, maar laden gaat sneller)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr "Aangepaste visualisatiekleur (basis)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr "Aangepaste visualisatie-achtergrondkleur"
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Visualisaties"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Uiterlijk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Mediaverzameling gebruiken"
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "Muziekmappen toevoegen/verwijderen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Mediaverzameling"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
-msgstr "Schakel Proxy Server in"
+msgstr "Proxyserver inschakelen"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
-msgstr "Proxy Server adres:"
+msgstr "Adres van proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
-msgstr "Proxy Server poort:"
+msgstr "Poort van proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
-msgstr "Proxy type:"
+msgstr "Soort proxy:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
-msgstr "Proxy gebruikersnaam:"
+msgstr "Proxy-gebruikersnaam:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
-msgstr "Proxy wachtwoord:"
+msgstr "Proxy-wachtwoord:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "HTTP-gebruikersagent:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "Inhoudstypetoekenning bewerken"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Toegewezen sneltoetsen:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
-msgstr ""
+msgstr "Actie:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
-msgstr ""
+msgstr "<Not set>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
-msgstr ""
+msgstr "Toetsencombinatie"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr ""
+msgstr "Algemene sneltoets"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "Klik op ‘Toepassen’ om je wijzigingen op te slaan\nof op ‘Herstellen’ om ze ongedaan te maken.\nDe wijzigingen worden NIET opgeslagen\nzolang je niet op ‘Toepassen’ klikt."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "Stan_daardwaarden"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
-msgstr ""
+msgstr "Sneltoetsen"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Versie: "
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Instellingen"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Auteursrecht"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Informatie"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Licentie"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Plugins"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Standaardwaarden herstellen"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versie: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Aangepaste titel instellen"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
-msgstr ""
+msgstr "Groeperen op…"
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr ""
+msgstr "Sorteren op…"
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Opmaaktype:"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr "Formaat"
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Oplopend"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Aflopend"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Selecteer DSP-plugin"
-
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Plugin"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Oplopend\nAflopend"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Instellingen van etiketschrijver"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
-msgstr "ID3v2 schrijven"
+msgstr "ID3v2 wegschrijven"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
-msgstr "ID3v1 schrijven"
+msgstr "ID3v1 wegschrijven"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
-msgstr "APEv2 schrijven"
+msgstr "APEv2 wegschrijven"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "ID3v2 verwijderen"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "ID3v1 verwijderen"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "APEv2 verwijderen"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
-msgstr "ID3v2 versie"
-
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (aangeraden)"
+msgstr "ID3v2-versie"
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (aanbevolen)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 tekencodering (standaard is iso8859-1)"
+msgstr "ID3v1-tekencodering (standaard is dit iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
-msgstr "ID3v2.4 schrijven"
+msgstr "ID3v2.4 wegschrijven"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "Inhoudstypetoekenning"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr ""
+msgstr "Deze tabel bepaalt de relatie tussen inhoudstypen van netwerkstreams en DeaDBeeF-decoderplug-ins. Voorbeeld: mp3-bestanden kunnen van het type ‘audio/x-mpeg’ zijn en moeten door DeaDBeeF worden geconverteerd middels de ‘stdmpg’-plug-in of ffmpeg."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr ""
+msgstr "Inhoudstype:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
-msgstr ""
+msgstr "Plug-ins:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
-msgstr ""
+msgstr "Knopeigenschappen"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr ""
+msgstr "Kleur:"
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
-msgstr ""
+msgstr "Pictogram:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
-msgstr ""
+msgstr "Label:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
-msgstr ""
+msgstr "Actie kiezen"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
-
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artiest / Album"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Spoornr."
-
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+msgstr "Dit venster stelt je in staat om aangepaste namen te geven aan nummers. Dit is het nuttigst voor radiostations. Deze optie is ook beschikbaar in het venster ’Locatie toevoegen’. De titel is zichtbaar in kolommen met het ‘Artiest’-veld. Als het ‘Artiest’-veld zichtbaar is, dan moet het moet worden opgemaakt als ‘aangepast artiest’, of anders als ‘aangepast’."
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr ""
-
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Kolom toevoegen"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Bewerken"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Kolom bewerken"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Bewerken (direct)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Nieuw veld toevoegen…"
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Waarde bewerken"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Veldnaam:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Veldwaarde:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Gebruik ; om waarden te scheiden."
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF-logboek"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Wissen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Scanvoortgang van ReplayGain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Huidig bestand:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Status"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Scanresultaten van ReplayGain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Bestandstags bijwerken"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "Rapportage kopiëren"
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Alleen instelbare plug-ins tonen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr "Meerdere nummers bewerken"
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Veldnaam:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr "Eén waarde"
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr "Individuele waarden"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Kolom verwijderen"
-
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr ""
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "DeaDBeef EQ-voorinstelling opslaan"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Groeperen op"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeef EQ-voorinstellingsbestanden (*.ddbeq)"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Geen"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "DeaDBeeF EQ-voorinstelling laden…"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Artiest/Datum/Album"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ-voorinstellingen (*.ddbeq)"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Open bestand.."
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 EQ-voorinstelling laden.."
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Configureer %s"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ-voorinstellingen (*.feq)"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Standaard geluidapparaat"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Voorinstelling opslaan"
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Voorinstelling laden"
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr ""
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000-voorinstelling importeren"
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Bestanden aan het toevoegen..."
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Inschakelen"
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Aan het initialiseren..."
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Alles op nul"
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "U heeft gegevens aangepast voor dit spoor."
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Preamp op nul"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Dit venster echt sluiten?"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Banden op nul"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Meerdere waarden "
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nieuwe afspeellijst"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Toets"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Ondersteunde audioformaten"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Waarde"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Alle bestanden (*)"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr ""
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Ondersteunde afspeellijstindelingen"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Etiketten aan het schrijven..."
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Alle bestanden"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr ""
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Overige bestanden (*)"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Naam:"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF-afspeellijstbestanden (*.dbpl)"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Veldnamen moeten niet beginnen met : of _"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Snelkoppelingen volgen"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Kan veld niet toevoegen"
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 dag %d:%02d:%02d"
 
-#: ../plugins/gtkui/trkproperties.c:784
-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/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dagen %d:%02d:%02d"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Voeg veld toe"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "totale afspeelduur"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Gepauzeerd"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "afspeelduur van selectie"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Gestopt"
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Verwijder veld"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Afspeellijstnaam wijzigen"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr ""
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Afspeellijst verwijderen"
 
-#: ../main.c:91
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid "Options:\n"
-msgstr "Opties:\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Weet je zeker dat je de geselecteerde afspeellijst ‘%s’ wilt verwijderen?"
 
-#: ../main.c:92
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help or -h Drukt hulp af (dit bericht) en sluit af\n"
+msgid "New Playlist (%d)"
+msgstr "Nieuwe afspeellijst (%d)"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Speler afsluiten\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Afspeellijst met tabbladen"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Versie-informatie afdrukken en sluiten\n"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Splitsen (boven- en onderkant)"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Afspelen beginnen\n"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Splitsen (links en rechts)"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Afspelen stoppen\n"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Tabbladen"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Afspelen pauzeren\n"
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Afspeellijst-tabbladen"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Pauze schakelen\n"
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Selectie-eigenschappen"
 
-#: ../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"
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Albumhoesweergave"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Volgend nummer in speellijst\n"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Oscilloscoop"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Vorig nummer in speellijst\n"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spectrum"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Willekeurig nummer in speellijst\n"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Bestand(en) toevoegen aan speellijst\n"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Knop"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Afdrukken geformatteerde spoornaam naar stdout\n"
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Zoekbalk"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Afspeelbediening"
 
-#: ../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"
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Volumebalk"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune-stemmen"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Standaard"
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Logbestand bekijken"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Ja"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Mediaverzamelingsweergave"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Nee"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Fout bij uitlezen van hulpbestand"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Elementen Index\n"
-"Aan het afspelen\n"
-"Albumkunst\n"
-"Artiest - Album\n"
-"Artiest\n"
-"Album\n"
-"Titel\n"
-"Lengte\n"
-"Spoornummer\n"
-"Groep / Album Artiest\n"
-"Aangepast"
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Kan hulpbestand niet laden"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Links\n"
-"Rechts"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "De speler is momenteel bezig met achtergrondtaken. Als je nu afsluit, dan worden de taken onder- of afgebroken. Dit kan leiden tot gegevensverlies."
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Zet uit\n"
-"Spoor\n"
-"Album"
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Weet je zeker dat je wilt afsluiten?"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Ascending\n"
-"Descending"
-msgstr ""
-"Oplopend\n"
-"Aflopend"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr " De bestanden worden verplaatst naar de prullenbak.\n\n(dit venster kan worden uitgeschakeld in de GTKUI-plug-in-instellingen)"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
-msgstr ""
-"2.3 (Aangeraden)\n"
-"2.4"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr " De bestanden gaat verloren.\n\n(dit venster kan worden uitgeschakeld in de instellingen van de GTKUI-plug-in)"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, 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: configuratiebestand voor freepats niet gevonden. Installeer "
-"timidity-freepats-pakket, of specificeer pad naar freepats.cfg in de plugin-"
-"instellingen"
+msgid "Do you really want to delete the selected file?%s"
+msgstr "Weet je zeker dat je het geselecteerde bestand wilt verwijderen?%s"
 
-#. 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/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr "Weet je zeker dat je %d geselecteerde bestanden wilt verwijderen?%s"
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Zoek het op, op Last.fm"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr "Weet je zeker dat je %d geselecteerde bestanden wilt verwijderen van de huidige afspeellijst?%s"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Gebruik ALSA-resampling"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "Weet je zeker dat je het momenteel spelende nummer wilt verwijderen?%s"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Geef apparaat vrij wanneer gestopt"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Bestanden verwijderen van schijf"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Voorkeursomvang van de buffer"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Verwijderen"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Voorkeursomvang van de periode"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Links"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Schakel scrobbler in"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Rechts"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Schakel NuAanHetAfspelen uit"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Gecentreerd"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr "Uitgeschakeld"
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr "8-bit"
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr "16-bit"
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr "24-bit"
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr "32-bit"
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Op afspeelvolgorde"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Gebruikersnaam"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Nummer"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Wachtwoord"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Geen"
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Gain toepassen"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Gain toepassen en knippen voorkomen op basis van piek"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Alleen knippen voorkomen"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr ""
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Oplopend"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Apparaatbestand"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Aflopend"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Stoplap voor OSS4 samplerate-fout"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (aanbevolen)"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Periode voor bijwerken opslag (uur)"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Haal op uit ingebedde etiketten"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artiest / Album"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Haal op uit plaatselijke map"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Volgnummer"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Plaatselijk masker voor hoesbestand"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Haal op van Last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Haal op van albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Schaal kunstwerk naar langere kant"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Gebruik CDDB/FreeDB"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Duur"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Verkies CD-tekst boven CDDB"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Index van elementen"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (bijv. 'freedb.org')"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Je luistert naar"
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB poortnummer (bijv. '888')"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Albumhoes"
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Verkies CDDB-protocol boven HTTP"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artiest - Album"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Schakel NRG-afbeeldingsondersteuning in"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Jaar"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Resampling-kwaliteit (0..2, hoger is beter)"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Volgnummer"
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Band / Albumartiest"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Maximale muziekstukduur (in minuten)"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codec"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bitsnelheid"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Kolom toevoegen"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Vraag bevestiging voor het verwijderen van bestanden van de schijf"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Kolom bewerken"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Statuspictogram voor gevoeligheid van volumeknop"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Kolom verwijderen"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Aangepast statuspictogram"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Groepen vastmaken tijdens scrollen"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Draai gtk_init met --sync (debug-modus)"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Groeperen op"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Voeg scheidingtekens toe tussen contextmenu-onderdelen van plugin"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artiest/Datum/Album"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Bestandtype voor meldingstitel"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Hierna afspelen"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Later afspelen"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Bestandtype voor meldingsinhoud"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Verwijderen uit afspeelwachtrij"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Toon albumkunst"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Metagegevens herladen"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Grootte van albumkunst (px)"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "Kn_ippen"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio-server"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "_Kopiëren"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Samplerate"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "_Plakken"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Relatief pad voor zoektabel"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Verwijderen van schijf"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Absoluut pad voor zoektabel"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Afspeellijst verwijderen"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr ""
-"Verwissel audio-bytes (schakel om indien u slechts statische ruis hoort)"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Nieuwe afspeellijst toevoegen"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Schakel HVSC Songlength DB in"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Automatisch sorteren"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (vanuit HVSC)"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr "Recentste sortering toepassen na elke afspeellijsttoevoeging"
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bits per sample (8 of 16)"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Bestand openen…"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Standaard-liedduur (sec)"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "%s instellen"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Configuratiebestand voor Timidity++ bank"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Je hebt de sneltoetsinstellingen aangepast, maar niet opgeslagen."
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Spoortitel"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Weet je zeker dat je wilt doorgaan zonder ze op te slaan?"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Artiest"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Standaard audio-apparaat"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Totaal aantal sporen"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Bezig met toevoegen van bestanden…"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Genre"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Bezig met initialiseren…"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Componist"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Voortgang van bijwerken van tags"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Schijfnummer"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Naam"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Commentaar"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "AlbumGain"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "NummerGain"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Albumpiek"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Nummerpiek"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Voltooid"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Bestand niet gevonden"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Ongeldig bestand"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "(%list_total% results) doorzoeken"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Encodeur/Verkoper"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Kolomtitels tonen"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Locatie"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Waarde"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Subspoor-index"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Je hebt gegevens van dit nummer aangepast."
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Etiket-type(s)"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Weet je zeker dat je het venster wilt sluiten?"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Ingebedde informatietekst"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Meerdere waarden "
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Codec"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Toets"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Bestandextensies (te scheiden met ';')"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Meerdere waarden"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Omzetten"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Bezig met wegschrijven tags…"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Doel-samplerate"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "Item"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Veld"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Automatische Samplerate (negeert Doel-Samplerate)"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Veldnaam"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Naam:"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Veldnamen mogen niet beginnen met : of _"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Kan veld niet toevoegen"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Er is al een veld met deze naam. Probeer een andere naam."
 
-#: ../plugins/converter/convgui.c:84
+#: ../plugins/gtkui/widgets.c:460
 #, c-format
-msgid "Built-in %s"
-msgstr ""
-
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Het bestand bestaat al. Overschrijven?"
-
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Waarschuwing van omzetter"
-
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Kies a.u.b. een codeerder"
+msgid "Widget \"%s\" is not available"
+msgstr "De widget ‘%s’ is niet beschikbaar"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Fout van omzetter"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Vervangen door…"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Bezig met omzetten..."
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Invoegen…"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Selecteer map..."
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Knippen"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Kon codeerder-voorinstelling niet opslaan"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopiëren"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-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/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Plakken"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-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/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Bovenliggend"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Fout"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Geen ondersteuning voor meerdere widgets van dit type"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Voeg nieuwe codeerder toe"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Proportioneel schalen"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Codeerder bewerken"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Hoogte van bovenste paneel vastzetten"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Verwijder voorinstelling"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Breedte van linkerpaneel vastzetten"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Dit zal de geselecteerde voorinstelling verwijderen. Weet u het zeker?"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Hoogte van onderste paneel vastzetten"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Codeerders"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Breedte van rechterpaneel vastzetten"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Voeg plugin toe aan DSP-ketting"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Tabbladnaam wijzigen"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Kon DSP-voorinstelling niet opslaan"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Tabblad verwijderen"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Nieuwe DSP-voorinstelling"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Nieuw tabblad toevoegen"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "DSP-voorinstelling bewerken"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Tabblad naar links verplaatsen"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP-voorinstellingen"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Tabblad naar rechts verplaatsen"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Uitvoermap:"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr "Rendermodus"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr "Meerdere kanalen"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr "Schaal"
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Naam van uitvoerbestand:"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "Automatisch"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
 #, 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:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Codeerder:"
-
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP-voorinstelling:"
-
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Aantal draadjes:"
-
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Bestandtype van uitvoer-voorbeeld:"
-
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Behoud bronbestandtype"
-
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit signed int"
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit signed int"
-
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit signed int"
-
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit signed int"
-
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit float"
-
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Wanneer het bestand bestaat:"
-
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Vraag bevestiging"
-
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Overschrijf"
-
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Bewerk voorinstelling van codeerder"
-
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Naamloze codeerder"
-
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Extensie van uitvoerbestand:"
-
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Bijv. mp3"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Opdrachtregel:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr "3x"
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
 #, 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"
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
-msgstr ""
-"%o - uitvoerbestandnaaam\n"
-"%i - tijdelijke invoerbestandnaam"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr "Fragmentduur"
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 ms"
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 ms"
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 ms"
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 ms"
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 ms"
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr "Discrete frequenties"
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr "1/12 octaafbanden"
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr "1/24 octaafbanden"
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr "Ruimte-overbrugging"
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr "1/2 bar"
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr "1/3 bar"
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr "1/4 bar"
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr "1/5 bar"
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr "1/6 bar"
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr "1/7 bar"
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr "1/8 bar"
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr "1/9 bar"
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr "1/10 bar"
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Veld uitbreiden met 1 item"
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Veld inperken met 1 item"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Methode:"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Uniform"
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Pijp"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Uitbreiden"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Tijdelijk bestand"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Opvullen"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Knop instellen"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr "_dB-schaal"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr "_Lineaire schaal"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr "Kubis_che schaal"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Stemmen:"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Etiketschrijver"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr "Kopie van %s"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP voorinstellingbewerker"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr "Kopie van %s (%d)"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Naamloze DSP voorinstelling"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "(gepauzeerd)"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Toevoegen"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "(gestopt)"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Kon geen pixmapbestand vinden: %s"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "(aan het afspelen)"
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
-msgstr ""
-"Vraag bevestiging\n"
-"Overschrijven"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Items"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
-"Pijp\n"
-"Tijdelijk bestand"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Afspeellijstverkenner"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr ""
-
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr ""
+msgstr "Aangepaste shell-opdrachten"
 
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr ""
+msgstr "Opdracht bewerken"
 
 #: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr ""
+msgstr "Opdracht:"
 
 #: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
@@ -2082,74 +2622,74 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
+msgstr "Willekeurige shell-opdracht. Deze wordt uitgevoegd in de shell-context van waaruit de hoofdtoepassing is gestart. Er kan titelopmaak worden gebruikt. Voorbeeld: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
 #: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr ""
+msgstr "Vrije naamkeuze, bijv. ‘Mijn shell-opdracht’"
 
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Opdracht-id. Normaal is dit iets korts, zoals ‘youtube_open’. Het moet uniek zijn."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
-msgstr ""
+msgstr "Losse nummers"
 
 #: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
-msgstr ""
+msgstr "Wordt toegepast op losse nummers."
 
 #: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
-msgstr ""
+msgstr "Meerdere nummers"
 
 #: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
-msgstr ""
+msgstr "Wordt toegepast op meerdere nummers."
 
 #: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
-msgstr ""
+msgstr "Lokaal"
 
 #: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
-msgstr ""
+msgstr "Wordt toegepast op lokale bestanden."
 
 #: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr ""
+msgstr "Extern"
 
 #: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr ""
+msgstr "Wordt toegepast op externe bestanden (bijv. http://-streams)"
 
 #: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Algemeen (hoofdmenu)"
 
 #: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
-msgstr ""
+msgstr "Het item moet verschijnen in het hoofdmenu"
 
 #: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
@@ -2157,223 +2697,1271 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
+msgstr "Als je de opdracht wilt toevoegen aan het hoofdmenu, zorg er dan voor dat de titel het menupad bevat, en wel als volgt: ‘Bestand/Mijn opdracht’ - ‘Bestand’ = de Engelse menunaam."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr ""
-
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr ""
+msgstr "Opdracht toevoegen"
 
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
+msgstr "Dit verwijdert de gekozen shell-opdracht. Weet je het zeker?"
 
 #: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr ""
+msgstr "Verwijdering bevestigen"
 
 #: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr ""
+msgstr "ID moet ingevuld zijn en uniek.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr ""
+msgstr "Titel moet ingevuld zijn.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr ""
+msgstr "De shell-opdracht moet ingevuld zijn.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:248
 #: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
-msgstr ""
+msgstr "Ongeldige waarden"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr ""
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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: kan configuratiebestand van freepats niet vinden. Installeer het pakket ‘timidity-freepats’ of voer de locatie van freepats.cfg in in de plug-in-instellingen."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr ""
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr ""
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Titel van nummer"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr ""
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Artiest"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr ""
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Totaal aantal nummers"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr ""
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Genre"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr ""
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Componist"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr ""
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Schijfnummer"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
-msgstr ""
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Totaal aantal schijven"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr ""
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Opmerking"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr ""
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Encoder / Verkoper"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr ""
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Auteursrecht"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr ""
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Locatie"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr ""
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Subnummer-index"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr ""
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tagtype(s)"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
-msgstr ""
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Ingesloten informatietekst"
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr ""
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr "PipeWire-achtergronddienst (laat leeg om de standaard te gebruiken)"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr ""
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr "Aangepaste eigenschappen (overschrĳft reeds bestaande):"
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr ""
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr "PipeWire-volumebediening gebruiken"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr ""
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Voorkeur voor Ken emu boven Satoh (surround werkt niet)"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr ""
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Surround inschakelen"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr ""
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "ALSA-hersampling gebruiken"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr ""
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Voorkeursomvang van buffer"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr ""
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Voorkeursomvang van periode"
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr ""
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr "Hoezen verversen"
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr ""
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Ophalen uit ingesloten tags"
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr ""
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Ophalen uit lokale map"
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr ""
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Ophalen van Last.fm"
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr ""
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Ophalen van MusicBrainz"
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr ""
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Ophalen van Albumart.org"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr ""
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "Ophalen van World of Spectrum (alleen AY-bestanden)"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr ""
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Gedownloade bestanden opslaan in muziekmappen"
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr ""
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Als er geen hoezen worden gevonden:"
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr ""
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "leeglaten"
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr ""
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "standaardhoes van DeaDBeeF gebruiken"
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr ""
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "aangepaste afbeelding tonen"
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr ""
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Pad naar aangepaste afbeelding"
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr ""
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "Opslaan onder bestandsnaam"
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr ""
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr "Zoekfilters (puntkomma-gescheiden)"
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr ""
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr "Zoekmappen (puntkomma-gescheiden)"
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr ""
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "Cache verversen (in uren)"
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr ""
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "Vereenvoudige cachenamen"
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr ""
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Afbeeldingsgrootte"
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr ""
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "Te laden CD-schijf"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Audio-cd"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Bestand"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Audio-cd toevoegen"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr "CDDB/GnuDB gebruiken"
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Voorkeur voor CD-tekst boven CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr "CDDB-url (bijv. ‘gnudb.org’)"
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr "CDDB-poortnummer (bijv. ‘8880’)"
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "CDDB-protocol gebruiken"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "NRG-afbeeldingsondersteuning inschakelen"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Schijfsnelheid bij normaal afspelen"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Max"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "cdparanoia-foutcorrectie toepassen tijdens rippen"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Converteren"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Samplesnelheid automatisch detecteren uit uitvoerapparaat"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Samplesnelheid direct instellen"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Kwaliteit / Algoritme"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Resample-kwaliteit"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Intern DUMB-volume"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Volumeboost"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Alleen aan/uit"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Volledig"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8-bit-uitvoer"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Alle door ffmpeg ondersteunde extensies gebruiken"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Bestandsextensies (gescheiden door ‘;’)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr "DoP-uitvoer inschakelen"
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Slechte kopfouten negeren"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Onverwerkbare streamfouten negeren"
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Maximale duur van nummer (in minuten)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Vervaagduur (in seconden)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Aantal keer herhalen (indien beschikbaar)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (voor SGC-bestandsformaat)"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "ReplayGain-informatie verwijderen"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Selectie scannen als albums (op tags)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Selectie scannel als los album"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Gain per bestand scannen"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Gain per bestand scannen indien niet gescand"
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Selectie ongedaan maken"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Alles selecteren"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Locatie toevoegen"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Map(pen) toevoegen"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Bestand(en) toevoegen"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Bestand(en) openen"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Hulppagina tonen"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Herhaalmodus"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Herhalen - Uit"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Herhalen - Los nummer"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Herhalen - Alles"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Willekeurige modus"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Willekeurig - Willekeurige nummers"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Willekeurig - Albums"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Willekeurig - Nummers"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Willekeurig - Uit"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Aanwijzer volgt afspelen in-/uitschakelen"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Schuiven volgt afspelen in-/uitschakelen"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Beeld"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Menubalk tonen/verbergen"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Statusbalk tonen/verbergen"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Ontwerpmodus aan/uit"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Aangepaste sortering"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Selectie bijsijden"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr "Nummer(s) verwijderen van afspeellijst"
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Afspeellijst opslaan"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Huidige afspeellijst verwijderen"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "Afspeellijstnaam wijzigen"
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Equalizer tonen/verbergen"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Equalizer verbergen"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Equalizer tonen"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Spelervenster tonen/verbergen"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Spelervenster verbergen"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Spelervenster tonen"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Zoeken"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Logboekvenster tonen/verbergen"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Bevestiging vragen alvorens bestanden te verwijderen van de schijf"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "Statuspictograminstellingen:"
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Statuspictogram voor gevoeligheid van volumeknop"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Aangepast statuspictogram"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr "Overig:"
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Scheidingtekens toevoegen tussen rechtermuisknopmenu-onderdelen van plug-in"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Unicode-tekens gebruiken voor status bijhouden i.p.v. afbeeldingen"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Tekstballon van spoelbalk uitschakelen"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr "Vorige of huidige nummer herstarten"
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "Afspeellijst klonen"
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr "Spoelen naar momenteel afspelend nummer"
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Spoelen naar"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Vorig genre"
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Vorige componist"
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Vorige artiest"
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Vorig album"
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Volgend genre"
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Volgende componist"
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Volgende artiest"
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "Volgend album"
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Volgende afspeellijst"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Vorige afspeellijst"
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "Overschakelen naar afspeellijst 10"
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr "Overschakelen naar afspeellijst 9"
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "Overschakelen naar afspeellijst 8"
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Overschakelen naar afspeellijst 7"
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "Overschakelen naar afspeellijst 6"
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Overschakelen naar afspeellijst 5"
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Overschakelen naar afspeellijst 4"
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Overschakelen naar afspeellijst 3"
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Overschakelen naar afspeellijst 2"
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Overschakelen naar afspeellijst 1"
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Willekeurig sorteren"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Sorteren op datum"
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Sorteren op artiest"
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Sorteren op album"
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Sorteren op volgnummer"
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Sorteren op titel"
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Selectie omkeren"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Afspeellijst wissen"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr "Toevoegen aan afspeelwachtrij"
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr "Toevoegen bovenaan afspeelwachtrij"
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr "Schakelen in afspeelwachtrij"
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Verplaatsen"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Nummers omlaag verplaatsen"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Nummers omhoog verplaatsen"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Dempen/Ontdempen"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Pauzeren/Hervatten"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Afspelen/Pauzeren"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "1s vooruitspoelen"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "1s terugspoelen"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "5s vooruitspoelen"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "5s terugspoelen"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "1% vooruitspoelen"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "1% terugspoelen"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "5% vooruitspoelen"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "5% terugspoelen"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Volume omhoog"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Volume omlaag"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Stoppen na huidig nummer"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Stoppen na huidig album"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr "Opzoeken op Last.fm"
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Scrobblen inschakelen"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "‘Je luistert naar’ uitschakelen"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble-url"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Voorkeur voor albumartiest boven artiestveld"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "MusicBrainz-id versturen"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Nummers korter dan 30 seconden versturen (niet aanbevolen)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Linkermix"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Rechtermix"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "16-bituitvoer afdwingen"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Backend"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Opmaak van meldingstitel"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Opmaak van meldingsinhoud"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Albumhoezen tonen"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Grootte van albumhoezen (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr "Meldingen niet hergebruiken (KDE-eigenaardigheid)"
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Apparaatbestand"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Huidige afspeellijst markeren"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Dubbelklikken om af te spelen"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Buffergrootte (-1 = optimale waarde van portaudio gebruiken)"
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Codering van apparaatnaam"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Zoals hieronder opgegeven"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Aangepaste codering van apparaatnaam"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio-server (laat leeg voor de standaardserver)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Standaardduur van nummers (in minuten)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Samplesnelheid"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Overslaan indien korter dan (sec)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Aangepaste shell-opdrachten instellen"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Relatief pad voor zoektabel"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Absoluut pad voor zoektabel"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Audio-bytes verwisselen (schakel om als je slechts statische ruis hoort)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "HVSC Songlength DB inschakelen"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Volledig pad naar Songlengths.md5/.txt"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Bits per sample"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Standaardduur van nummers (sec)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Mono synth"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Loggen inschakelen"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Preamp"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Configuratiebestand van Timidity++-bank"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "Bestandsextensie"
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr "Encodering - opdrachtregel"
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr "Gegevensoverdrachtsmethode"
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr "Sluizen (stdin)"
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "Tijdelijk bestand"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "Bronbestand"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "ID3v2 wegschrijven"
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "ID3v1 wegschrijven"
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "APEv2 wegschrijven"
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "FLAC wegschrijven"
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "OggVorbis wegschrijven"
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "MP4 wegschrijven"

deadbeef-0.6.2.tar.bz2/po/pl.po -> deadbeef-1.9.6.tar.bz2/po/pl.po Changed

@@ -1,2388 +1,3984 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Grzegorz Gibas <amigib@gmail.com>, 2010
+# Jakub Wasylków <kuba_160@protonmail.com>, 2017
+# Jakub Wasylków <kuba_160@protonmail.com>, 2017
+# Jakub Wasylków <kuba_160@protonmail.com>, 2017-2023
 # Łukasz Jasiński <alvarus@alvarus.org>, 2010
+# marcin mikołajczak <me@mkljczk.pl>, 2016
+# Marcin Mikołajczak <m4sk1n@vivaldi.net>, 2016
+# marcin mikołajczak <me@mkljczk.pl>, 2016
+# marcin mikołajczak <me@mkljczk.pl>, 2016
 # Mateusz Łukasik <mati75@linuxmint.pl>, 2013-2014
 # Mateusz Łukasik <mati75@linuxmint.pl>, 2013
+# Mer_lin <solardes@poczta.fm>, 2014
+# Michał Olber <michal@olber.pl>, 2014
+# Michał Olber <michal@olber.pl>, 2014
 # Piotr Sokół <psokol@jabster.pl>, 2010
-# Tazik_85 <inactive+Tazik_85@transifex.com>, 2014
+# 12a483991a9a2349ba03845edd3e0cb7_3feaae4 <a36aa651279f8355668313f88cf32c0e_154802>, 2014
 # Zetok <prendter@gmail.com>, 2013
-# Tazik_85 <inactive+Tazik_85@transifex.com>, 2014
+# Mer_lin <solardes@poczta.fm>, 2014
+# 12a483991a9a2349ba03845edd3e0cb7_3feaae4 <a36aa651279f8355668313f88cf32c0e_154802>, 2014
+# ygyfygy ygyfygy <slepowidzacy@gmail.com>, 2016
 # Zetok <prendter@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/pl/)\n"
-"Language: pl\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Jakub Wasylków <kuba_160@protonmail.com>, 2017-2023\n"
+"Language-Team: Polish (http://app.transifex.com/deadbeef-player/deadbeef-player/language/pl/)\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%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "O programie DeaDBeef %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Użycie: deadbeef opcje -- plik(i)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Lista zmian w DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Opcje:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Tłumacze"
+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"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Wybór pliku"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Wychodzi z programu\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Pliki ustawień korektora DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Wyświetla wersję programu i wychodzi\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Wybór pliku"
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Zaczyna odtwarzanie\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Pliki ustawień korektora DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Zatrzymuje odtwarzanie\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Wybór pliku"
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Wstrzymuje odtwarzanie\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Pliki ustawień korektora Foobar2000 (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Włącz-wyłącz pauzę\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Zapisz ustawienia..."
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Odtwarzaj jeśli zatrzymane, w innym wypadku pauzuj\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Wczytaj ustawienia..."
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Następny utwór na liście odtwarzania\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importuj ustawienia programu Foobar2000..."
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Poprzedni utwór na liście odtwarzania\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Włączenie"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Losowy utwór na liście odtwarzania\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Wyzeruj wszystkie"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Dodaje plik(i) do istniejącej listy odtwarzania\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Wyzeruj Preamp"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui WTYCZKA Wybiera której wtyczki GUI użyć, domyślną jest \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Wyzeruj pojedyncze"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Wysyła sformatowaną nazwę utworu do stdout\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Zapisz ustawienia..."
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-składnia: artysta, tytuł, album,\n długość, numer utworu, rok, komentarz,\n prawa autorskie, epozostało\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 dzień %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr "na przykład: --nowplaying \"%%a - %%t\" powinno wyświetlić \"artysta - tytuł\"\n\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d dni %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "aby uzyskać więcej informacji zobacz %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr ""
-"Zatrzymano odtwarzanie | %d ścieżek | całkowity czas trwania listy "
-"odtwarzania: %s"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "INFORMACJA: --nowplaying jest przestarzałe.\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr "--nowplaying-tf FMT Wysyła sformatowaną nazwę utworu do stdout używając nowego formatowania\n"
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " Składnia FMT: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr "na przykład: --nowplaying-tf \"%%artist%% - %%title%%\" powinno zwrócić \"artysta - tytuł\"\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Wyświetl lub ustaw głośność.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " Opcja NUM może być podana w procentach (wartość absolutna albo przyrost/ubytek)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " albo w dB -50, 0 (jeśli z przyrostkiem).\n"
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Przykłady: --volume 80, --volume +10, --volume -5 albo --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr " --plugin=PLUG Wyślij komendy do konkretnej wtyczki. Użyj PLUG=main do wysyłania komend do programu deadbeef.\n"
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr " Żeby otrzymać komendy do konkretnej wtyczki użyj --plugin=PLUG --help\n"
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr " --plugin-list Wylistuj wszystkie wtyczki. Oznaczone wtyczki wspierają komendy.\n"
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Domyślne"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kb/s "
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Tak"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Wstrzymano odtwarzanie |"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nie"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Folder wyjściowy:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Zapisz do folderu źródłowego ścieżki"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Zachowaj strukturę folderu"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Kopiuj jeśli format jest taki sam"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Taguj ponownie po kopiowaniu"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Nazwa pliku wyjściowego"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-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"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Rozszerzenie (np. .mp3) pojawi się automatycznie.\nZostaw to pole puste, aby użyć domyślnych ustawień (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nowa lista odtwarzania"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Enkoder:"
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Nowa lista odtwarzania (%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Ustawienie DSP:"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Playlisty z kartami"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Ilość wątków:"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Playlista"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Wyjściowa częstotliwość próbkowania formatu:"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Podziałka (góra i dół)"
+#: ../plugins/converter/converter.glade.h:14
+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 "Zachowaj format wyjściowy\n8-bitowa liczba naturalna\n16-bitowa liczba naturalna\n24-bitowa liczba naturalna\n32-bitowa liczba naturalna\n32-bitowa liczba zmiennoprzecinkowa"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Podziałka (lewo i prawo)"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Jeśli plik istnieje:"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Karty playlist"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Pomiń\nPytaj\nZastąp"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Właściwości zaznaczenia"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Edycja ustawień enkodera"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Wyświetlanie okładki albumu"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Tytuł:"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Zakres"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Nienazwany enkoder"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Spektrum"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Rozszerzenie pliku wyjściowego:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Np. mp3"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Linia poleceń:"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Przycisk"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Przykład: lame - %o\n%i dla pliku wejściowego, %o dla pliku wyjściowego, - dla stdin"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - nazwa pliku wyjściowego\n%i - tymczasowa nazwa pliku wejściowego"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metoda:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Potok\nPlik tymczasowy\nPlik źródłowy"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Nie można odczytać pliku pomocy"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Wystąpił błąd przy wczytywaniu pliku pomocy"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Edytor etykiet"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Edytor ustawień DSP"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Tytuł"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Nienazwane ustawienia DSP"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Dodaj"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Usuń"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Konfiguracja"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Wybieraj wtyczkę DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Wtyczki"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Ustawienia korektora..."
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Wbudowane %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Plik już istnieje. Nadpisać?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Ostrzerzenie konwertera"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Wybierz enkoder"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Błąd konwertera"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Konwertowanie..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Wybierz folder..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Błąd zapisu ustawień enkodera"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Sprawdź uprawnienia folderu, spróbuj nadać inną nazwę lub zwolnij trochę miejsca na dysku"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Czy wciąż chcesz wyjść?"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Ustawienie o tej nazwie już istnieje. Spróbuj nadać inną nazwę."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Błąd"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Dodaj nowy enkoder"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Edytuj enkoder"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Usuń ustawienie"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Ta czynność spowoduje usunięcie wybranego ustawienia. Czy jesteś pewien?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Enkodery"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Dodaj wtyczkę do łańcucha DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Błąd zapisu ustawień DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Nowe ustawienia DSP"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Edytuj ustawienia DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Ustawienia DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Pomoc"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Zachowaj format źródłowy"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8-bitowa liczba całkowita"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16-bitowa liczba całkowita"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24-bitowa liczba całkowita"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32-bitowa liczba całkowita"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32-bitowa liczba rzeczywista"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Pomiń"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Pytaj"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Nadpisz"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Potok"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Plik tymczasowy"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Plik źródłowy"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nie można znaleźć pliku pixmapy: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Otwórz plik(i)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Dodaj plik(i) do playlisty..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Dodaj katalog(i) do playlisty..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Wczytaj Playlistę"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Zapisz playlistę jako"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "O programie DeaDBeef %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Lista zmian w DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Tłumacze DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr "Odtwarzany utwór"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr "Zaznaczony utwór"
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Typ MIME"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Nieprawidłowa wartość(i)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Typy MIME i pola pluginów nie mogą być puste i muszą spełniać reguły.\nPrzykładowy typ MIME: 'audio/mpeg'.\nPrzykładowy identyfikator pluginów: 'stdmpg ffmpeg'.\nSpacje muszą być użyte jako separator w polu pluginów.\nTyp MIME powinien składać się tylko z liter, liczb i znaku '-'.\nIdentyfikator pluginów może zawierać tylko litery i liczby."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Nic nie wybrano."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Plik"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Otwórz..."
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Dodaj..."
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Dodaj katalog..."
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Dodaj położenie..."
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Nowa lista odtwarzania"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Wczytaj listę odtwarzania..."
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Zapisz listę odtwarzania"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "Wy_czyść"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
-msgstr "Zaznacz wszystkie"
+msgstr "Zaznacz wszystko"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
-msgstr "Odznacz wszystkie"
+msgstr "Odznacz wszystko"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Odwróć zaznaczenie"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Zaznaczenie"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Usuń"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Usuń pozostałe"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Znajdź"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Sortuj według"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Tytuł"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Numer utworu"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Wykonawca"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Losowo"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Własny"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Widok"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Pasek stanu"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Korektor dźwięku"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Tryb projektowania"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Log"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "Odtwarzanie"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Kolejność"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Liniowa"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Tasuj ścieżki"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Tasuj albumy"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Tasuj"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Wyłączone"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Ścieżki"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Albumy"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Losowe ścieżki"
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
 msgstr "Powtarzanie"
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Zapętl wszystko"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Zapętl pojedynczą piosenkę "
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Nie zapętlaj"
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Wszystkie ścieżki"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Jedna ścieżka"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Przewijanie podąża za odtwarzaniem"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Kursor podąża za odtwarzaniem"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Zatrzymaj po bieżącym utworze"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Zatrzymaj odtwarzanie po bieżącym albumie"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
-msgstr "Przejdź do bieżącego nagrania"
+msgstr "Przejdź do bieżącego utworu"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "Lista zmian"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "O progr_amie"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Tłumacze"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Odtwarzaj"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Następny"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Odtwarzaj losowo"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "O programie"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Pomoc"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Właściwości utworu"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Lokalizacja:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "Z_astosuj"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "Zamknij"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metadane"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Właściwości"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Tytuł:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "An_uluj"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Wpisz nową nazwę kolumny"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Numer ścieżki"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Odtwarzanie"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Okładka albumu"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Wykonawca - Album"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Długość"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Numer utworu"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Wykonawca albumu"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Format sortowania:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(jeśli nie puste)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Wyrównanie:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Lewo"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Prawo"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "An_uluj"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Lewo\nPrawo\nŚrodek"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Kolor tekstu:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Wtyczka wyjścia:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Urządzenie wyjścia:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Zawsze konwertuj 8 bitowe audio do 16 bitowego"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Zawsze konwertuj 16 bitowe audio do 24 bitowego"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr "Nadpisz rozdzielczość bitową:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr "Wyłączone\n8 bitów\n16 bitów\n24 bity\n32 bity\n32 bity zmiennoprzecinkowe"
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Docelowa częstotliwość próbkowania:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Dla wielokrotności 48KHz (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Dla wielokrotności 44.1KHz (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Bazuj na podstawie wejściowej częstotliwości próbkowania"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Wymuś częstotliwość próbkowania"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Tryb Replaygain:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Wyłącz"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Źródło trybu przetwarzania:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Numer utworu"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Kolejność odtwarzania\nŚcieżka\nAlbum"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Szczyt skali Replaygain"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Przetwarzanie:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Nie przetwarzaj\nZastosuj wzmocnienie\nZastosuj wzmocnienie i zapobiegaj przesterowaniu\nZapobiegaj przesterowaniu"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Przedwzmacniacz replaygain:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Przedwzmacniacz powszechny"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Preamp z informacjami RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Preamp bez informacji RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "Domyślna lista odtwarzania:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Wznowienie odtwarzania po uruchomieniu programu"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Nie dodawaj z archiwów podczas dodawania folderów"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "Opcja \"Zatrzymaj po bieżącym utworze\" zostanie wyłączona po przełączeniu"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "Opcja \"Zatrzymaj po obecnym albumie\" zostanie wyłączona po przełączeniu"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Odtwarzanie"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Konfiguracja"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
-msgstr ""
+msgstr "Ustawienie DSP:"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
-msgstr "_Ładuj"
+msgstr "_Wczytaj"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Ukryj do obszaru powiadamiania przy starcie"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Ukrywanie okna do obszaru powiadamiania zamiast zamykania"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Ukrycie ikony obszaru powiadamiania"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "\"Usuń z dysku\" powinno używać kosza"
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Detekcja i zapisywanie Japońskiego SHIFT-JIS"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr "Detekcja i zapisywanie Rosyjskiego CP1251"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Detekcja i zapisywanie Chińskiego CP936"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Częstotliwość odświeżania interfejsu (w ciągu sekundy):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Zawartość paska tytułu podczas odtwarzania:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Zawartość paska tytułu po zatrzymaniu odtwarzania:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr ""
-"Wtyczka interfejsa graficznego (zmiana potrzebuje uruchomienia ponowia)"
+msgstr "Wtyczka interfejsu graficznego (zmiana potrzebuje ponownego uruchomienia)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Wyświetl długość zaznaczonych utworów na pasku stanu"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "Odtwarzacz"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr "Zamknij listy odtwarzania środkowym klawiszem myszy"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Wyświetlaj aktualnie odtwarzany utwór pogrubioną czcionką"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr "Ukryj polecenie \"Usuń z dysku\" w menu podręcznym"
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Przełącz do następnego utworu jeśli aktualnie odtwarzana została usunięta z dysku"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Automatycznie nazywaj playlisty podczas dodawania pojedynczego folderu"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr "Automatycznie dopasuj szerokość kolumn do rozmiaru okna"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Odstępy między grupami:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "piksele"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Playlista"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "GUI/Różne"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
-msgstr "Własne"
-
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Pierwszoplanowy"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Drugoplanowy"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Pasek przewijania i głośności"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Środkowy"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Jasny"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Ciemny"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Baza"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Tekst"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Karty"
+msgstr "Zastąp"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Podmień (traci motyw GTK treeview, ale przyspiesza renderowanie)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Parzysty wiersz"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Nieparzysty wiersz"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Zaznaczony wiersz"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Zaznaczony tekst"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Kursor"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Listy odtwarzania"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Kolory"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Paski"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Tło (korektor)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Pasek przewijania/Głośności/Korektor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Baza:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Ciemny:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Jasny:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Środkowy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Tekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Wytłuszczenie"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Kursywa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Odtwarzany tekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Zaznaczony tekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Pasek kart"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Normalne utwory:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Odtwarzany utwór:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Zaznaczone utwory:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Kolumny:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Nagłówek grupy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Pierwszy plan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Parzyste:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Nieparzyste:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Zaznaczone:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Kursor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Tło:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Zastąp (utracisz motywy katalogów GTK, ale przyspieszy to renderowanie)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr "Własny kolor bazowy wizualizacji"
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr "Własny kolor tła wizualizacji"
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Wizualizacje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Wygląd"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Włącz bibliotekę mediów"
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "Dodaj / usuń foldery z muzyką"
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Biblioteka mediów"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
-msgstr "Serwer pośredniczący"
+msgstr "Serwer pośredniczący proxy"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Adres:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Port:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Nazwa użytkownika:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Hasło:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr "Edytuj mapowanie typu zawartości"
+msgstr "Edytuj mapowanie typów MIME"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Sieć"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "Przydzielone skróty klawiszowe:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Działanie:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Not set>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Kombinacja klawiszy:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr "Globalne skróty klawiszowe"
+msgstr "Globalny skrót klawiszowy"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "Użyj przycisku Zastosuj, aby zapisać zmiany\nlub przycisku Przywróć, aby je cofnąć.\nZmiany nie zostaną zapisane\njeżeli nie wybierzesz Zastosuj."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "_Domyślne"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Skróty klawiszowe"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Wersja:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Konfiguracja"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Prawa autorskie"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Informacje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Licencja"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Wtyczki"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Zresetuj do domyślnych"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Wersja:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Ustaw własny tytuł"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Grupuj według ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Sortuj według ..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Format"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr "Format"
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Wzrastająco"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Malejąco"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Wybieraj wtyczkę DSP"
-
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Wtyczki"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Wzrastająco\nMalejąco"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Ustawienia edytora tagów"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Zapisywanie ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Zapisywanie ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Zapisywanie APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Usuwanie ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Usuwanie ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Usuwanie APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Wersja ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (rekomendowana)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Rekomendowany)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Kodowanie znaków ID3v1 (domyślnie iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Zapisywanie ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "Mapowanie typu zawartości"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
+msgstr "Ta tabela definiuje łączenia pomiędzy typami MIME i pluginami dekodującymi DeaDBeeF. Na przykład pliki mp3 z typem MIME jako \"audio/x-mpeg\" mogą być dekodowane za pomocą własnego pluginu DeaDBeeFa \"stdmpg\" albo za pomocą pluginu \"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Zresetuj do domyślnych"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr "Typ zawarotści:"
+msgstr "Typ MIME:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Wtyczki:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Właściwości przycisku"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Kolor:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Kolor tekstu:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Etykieta:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Wybierz działanie"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "Te okno pozwala ustawić własny tytuł dla każdej ścieżki. Ta opcja może być użyteczna dla stacji radiowych. Opcja ustawienia własnego tytułu jest także dostępna w oknie \"Dodaj położenie...\". Sam tytuł jest widoczny w kolumnach wyświetlających dane o wykonawcy utworu. Wynikiem tego tytuł będzie \"własny wykonawca\" jeśli pole \"Wykonawca\" jest dostępne, albo po prostu \"własny\" jeśli brak wykonawcy w metadanych."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Edytuj"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Edytuj (na miejscu)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Dodaj nowe pole..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Edytuj wartość"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Nazwa pola:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Wartość pola:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Użyj znaku ; do oddzielenia wielu wartości."
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF Log"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Wyczyść"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Progres skanowania ReplayGain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Bieżący plik:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Status"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Wyniki skanowania ReplayGain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Aktualizuj tagi plików"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "Kopiuj raport"
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Pokaż tylko wtyczki z konfiguracją"
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr "Edytuj wiele ścieżek"
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Nazwa pola:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr "Pojedyncza wartość"
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr "Pojedyncze wartości"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Zapisz ustawienie korektora DeaDBeeF"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Pliki ustawień korektora DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Wybierz ustawienie korekta graficznego DeaDBeeF..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Pliki ustawień korektora DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importuj ustawienie korektora graficznego z Foobar2000..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Pliki ustawień korektora Foobar2000 (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Zapisz ustawienia korektora"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Wczytaj ustawienia korektora"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importuj ustawienia korektora z programu Foobar2000"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Włącz"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Wyzeruj wszystko"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Wyzeruj Preamp"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Wyzeruj słupki"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nowa lista odtwarzania"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Wspierane formaty dźwięku"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Wszystkie pliki (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Wspierane formaty playlisty"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Wszystkie pliki"
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Inne pliki (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Plik playlisty DeaDBeeF (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Podążaj za dowiązaniami symbolicznymi"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 dzień %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dni %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "całkowity czas odtwarzania"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Wstrzymane"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "czas odtwarzania zaznaczenia"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Zatrzymane"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Zmień nazwę playlisty"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Usuwanie playlisty"
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Czy na pewno chcesz usunąć playlistę '%s'?"
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Nowa lista odtwarzania (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Playlista z kartami"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Podziałka (góra i dół)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Podziałka (lewo i prawo)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Karty"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Karty z playlistami"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Właściwości zaznaczenia"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Wyświetlanie okładki albumu"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Oscyloskop"
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektrum"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Przycisk"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Pasek postępu"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Kontrolki odtwarzania"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Pasek głośności"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Głosy chiptune"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Log"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Wyświetlacz biblioteki mediów"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Nie można odczytać pliku pomocy"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Wystąpił błąd przy wczytywaniu pliku pomocy"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Odtwarzacz obecnie wykonuje zadania w tyle. Zamknięcie odtwarzacza skutkuje przerwaniem zadań. Może to skutkować utratą danych."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Czy wciąż chcesz wyjść?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Pliki zostaną przeniesione do kosza.\n\n(Ten dialog może zostać wyłączony w ustawieniach wtyczki GTKUI)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Pliki zostaną utracone.\n\n(Ten dialog może zostać wyłączony w ustawieniach wtyczki GTKUI)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr "Czy na pewno chcesz usunąć aktualnie zaznaczony plik?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr "Czy na pewno chcesz usunąć wszystkie %d zaznaczone pliki?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr "Czy na pewno chcesz usunąć wszystkie %d pliki z bieżącej playlisty?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "Czy na pewno chcesz usunąć aktualnie odtwarzany plik?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Usuń pliki z dysku"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Usuń"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Lewo"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Prawo"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Środek"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr "Wyłączone"
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr "8 bitów"
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr "16 bitów"
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr "24 bity"
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr "32 bity"
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Kolejność odtwarzania"
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Numer utworu"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Brak"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Zastosuj wzmocnienie"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Zastosuj wzmocnienie i zapobiegaj przesterowaniu"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Zapobiegaj przesterowaniu"
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Wzrastająco"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Malejąco"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (rekomendowana)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
 msgid "Artist / Album"
 msgstr "Wykonawca / Album"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
 msgid "Track No"
 msgstr "Numer ścieżki"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Długość"
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Numer ścieżki"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Odtwarzanie"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Okładka albumu"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Wykonawca - Album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Rok"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Numer utworu"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Wykonawca albumu"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodek"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bitrate"
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
 msgid "Add column"
 msgstr "Dodaj kolumnę"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
 msgid "Edit column"
 msgstr "Edytuj kolumnę"
 
-#: ../plugins/gtkui/plcommon.c:1224
+#: ../plugins/gtkui/playlist/plcommon.c:869
 msgid "Remove column"
 msgstr "Usuń kolumnę"
 
-#: ../plugins/gtkui/plcommon.c:1234
+#: ../plugins/gtkui/playlist/plcommon.c:884
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "Przypnij grupy podczas przewijania"
 
-#: ../plugins/gtkui/plcommon.c:1239
+#: ../plugins/gtkui/playlist/plcommon.c:889
 msgid "Group by"
 msgstr "Grupowanie"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Brak"
-
-#: ../plugins/gtkui/plcommon.c:1250
+#: ../plugins/gtkui/playlist/plcommon.c:900
 msgid "Artist/Date/Album"
 msgstr "Artysta/Data/Album"
 
-#: ../plugins/gtkui/pluginconf.c:42
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Odtwórz po aktualnym utworze"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Odtwórz później"
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Usuń z kolejki odtwarzania"
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Przeładuj metadane"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "Wy_tnij"
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "_Kopiuj"
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "_Wklej"
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Usuń z dysku"
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Usuń playlistę"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Dodaj nową playlistę"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Włącz autosortowanie"
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr "Ponów ostatnie wybrane sortowanie za każdym razem kiedy nowe pliki zostaną dodane do tej playlisty"
+
+#: ../plugins/gtkui/pluginconf.c:47
 msgid "Open file..."
 msgstr "Otwórz plik..."
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/gtkui/pluginconf.c:559
 #, c-format
 msgid "Configure %s"
 msgstr "Konfiguruj %s"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Domyślne urządzenie dźwiękowe"
-
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin/prefwin.c:140
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr "Zmodyfikowałeś skróty klawiszowe, ale nie zapisałeś zmian."
 
-#: ../plugins/gtkui/prefwin.c:350
+#: ../plugins/gtkui/prefwin/prefwin.c:142
 msgid "Are you sure you want to continue without saving?"
 msgstr "Kontynuować bez zapisywania zmian?"
 
-#: ../plugins/gtkui/progress.c:56
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Domyślne urządzenie dźwiękowe"
+
+#: ../plugins/gtkui/progress.c:62
 msgid "Adding files..."
 msgstr "Dodawanie plików..."
 
-#: ../plugins/gtkui/progress.c:89
+#: ../plugins/gtkui/progress.c:95
 msgid "Initializing..."
 msgstr "Inicjalizowanie..."
 
-#: ../plugins/gtkui/trkproperties.c:168
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Proces aktualizacji tagów"
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nazwa"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Wzmocnienie albumu"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Wzmocnienie ścieżki"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Szczyt albumu"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Szczyt ścieżki"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Sukces"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Nie znaleziono pliku"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Plik nieprawidłowy"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Wyszukiwanie (wyniki: %list_total%)"
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Pokaż nagłówki kolumn"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Wartość"
+
+#: ../plugins/gtkui/trkproperties.c:116
 msgid "You've modified data for this track."
 msgstr "Dane dla tego utworu zostały zmodyfikowane."
 
-#: ../plugins/gtkui/trkproperties.c:170
+#: ../plugins/gtkui/trkproperties.c:118
 msgid "Really close the window?"
 msgstr "Zamknąć okno?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
 msgid "Multiple values "
 msgstr "Wiele wartości"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
+#: ../plugins/gtkui/trkproperties.c:455
 msgid "Key"
 msgstr "Typ"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Wartość"
-
-#: ../plugins/gtkui/trkproperties.c:522
+#: ../plugins/gtkui/trkproperties.c:473
 msgid "Multiple values"
 msgstr "Wiele wartości"
 
-#: ../plugins/gtkui/trkproperties.c:701
+#: ../plugins/gtkui/trkproperties.c:662
 msgid "Writing tags..."
 msgstr "Zapisywanie tagów..."
 
-#: ../plugins/gtkui/trkproperties.c:730
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "Ścieżka"
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Pole"
+
+#: ../plugins/gtkui/trkproperties.c:1210
 msgid "Field name"
 msgstr "Nazwa pola"
 
-#: ../plugins/gtkui/trkproperties.c:733
+#: ../plugins/gtkui/trkproperties.c:1213
 msgid "Name:"
-msgstr "Imię:"
+msgstr "Nazwa:"
 
-#: ../plugins/gtkui/trkproperties.c:745
+#: ../plugins/gtkui/trkproperties.c:1226
 msgid "Field names must not start with : or _"
 msgstr "Nazwa nie może zaczynać się od : lub _"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
 msgid "Cannot add field"
 msgstr "Nie można dodać pola"
 
-#: ../plugins/gtkui/trkproperties.c:784
+#: ../plugins/gtkui/trkproperties.c:1267
 msgid "Field with such name already exists, please try different name."
 msgstr "Pole o takiej nazwie już istnieje, proszę spróbować innej nazwy."
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Dodaj..."
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Widget \"%s\" nie jest dostępny"
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Usuń"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Zastąp..."
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Użycie: deadbeef opcje -- plik(i)\n"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Wstaw..."
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opcje:\n"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Wytnij"
 
-#: ../main.c:92
-#, 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"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopiuj"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Wychodzi z programu\n"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Wklej"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Wyświetla wersję programie i wychodzi\n"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Rodzic"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Zaczyna odtwarzanie\n"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Wiele widżetów tego typu jednocześnie nie jest obsługiwane"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Zatrzymuje odtwarzanie\n"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Rozmiar proporcjonalny"
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Zablokuj wysokość górnej sekcji"
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Zablokuj szerokość lewej sekcji"
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Zablokuj wysokość dolnej sekcji"
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Zablokuj szerokość prawej sekcji"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Wstrzymuje odtwarzanie\n"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Zmień nazwę karty"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Włącz-wyłącz pauzę\n"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Usuń kartę"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
-" --play-pause Odtwarzaj jeśli zatrzymane, w innym wypadku pauzuj\n"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Dodaj nową kartę"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Następny utwór na liście odtwarzania\n"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Przesuń kartę w lewo"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Poprzedni utwór na liście odtwarzania\n"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Przesuń kartę w prawo"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Losowy utwór na liście odtwarzania\n"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr "Tryb renderowania"
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr "Wielokanałowy"
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr "Skalowanie"
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "Auto"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr ""
-" --queue Dodaje plik(i) do istniejącej listy odtwarzania\n"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
-" --gui WTYCZKA Wybiera której wtyczki GUI użyć, domyślną jest "
-"\"GTK2\"\n"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../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"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr "3x"
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr "Długość fragmentu"
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 ms"
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 ms"
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 ms"
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 ms"
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 ms"
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr "Dyskretne częstotliwości"
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr "1/12 pasma oktawy"
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr "1/24 pasma oktawy"
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr "Rozmiar odstępów"
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr "1/2 Belki"
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr "1/3 Belki"
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr "1/4 Belki"
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr "1/5 Belki"
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr "1/6 Belki"
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr "1/7 Belki"
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr "1/8 Belki"
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr "1/9 Belki"
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr "1/10 Belki"
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Rozszerz o jeden element"
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Zmniejsz o jeden element"
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogeniczny"
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Rozszerz"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Wypełnij"
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Konfiguruj przycisk"
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr "Skala _decybelowa"
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr "Skala _liniowa"
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr "Skala _sześcienna"
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Głosy:"
 
-#: ../main.c:106
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-składnia: artysta, tytuł, album,\n"
-" długość, numer utworu, rok, komentarz,\n"
-" prawa autorskie, epozostało\n"
+msgid "Copy of %s"
+msgstr "%s - Kopia"
 
-#: ../main.c:109
+#: ../plugins/hotkeys/actionhandlers.c:827
 #, 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 "Copy of %s (%d)"
+msgstr "%s - Kopia (%d)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "(wstrzymane)"
 
-#: ../main.c:110
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "(zatrzymane)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "(odtwarzane)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
 #, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Domyślne"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Ścieżki"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Tak"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Przeglądarka playlisty"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Nie"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Własne komendy Shell"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Numer ścieżki\n"
-"Odtwarzanie\n"
-"Okładka albumu\n"
-"Wykonawca - album\n"
-"Wykonawca\n"
-"Album\n"
-"Tytuł\n"
-"Czas trwania\n"
-"Numer utworu\n"
-"Zespół / Wykonawca albumu\n"
-"Własny"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Zamknij"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Lewo\n"
-"Prawo"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Edytuj komendę"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Komenda:"
+
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Wyłącz\n"
-"Utwór\n"
-"Album"
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr "Arbitralne komendy shell. Będą uruchomione w kontekście shella z którego została uruchomiona aplikacja. Formatowanie tytułu może zostać użyte. Przykład: xdg-open %D"
+
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
+
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Dowolna nazwa, na przykład \"Moja komenda shell\""
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Ascending\n"
-"Descending"
-msgstr ""
-"Wzrastająco\n"
-"Malejąco"
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "ID komendy, zazwyczaj powinno być to coś krótkiego, na przykład \"otwórz_youtube\". Musi być unikalne."
+
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Pojedyncze ścieżki"
+
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Działa na pojedynczej ścieżce."
+
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Wiele ścieżek"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Działa na wielu ścieżkach."
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Lokalnie"
+
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Działa na plikach lokalnych."
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Zdalnie"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Działa na zdalnych plikach (np. strumienia http://)"
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Ogólne (menu główne)"
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "Pozycja powinna pojawić się w głównym menu"
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
-msgstr ""
-"2.3 (Rekomendowany)\n"
-"2.4"
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr "Jeżeli chcesz dodać komendę do menu głównego, upewnij się, że tytuł zawiera ścieżkę taką jak \"File/Moja komenda\", gdzie \"File\" jest nazwą kategorii w języku angielskim."
+
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Dodaj komendę"
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "To działanie usunie wybraną komendę shell. Czy na pewno to zrobić?"
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Potwierdzenie usunięcia"
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID musi coś zawierać i być unikalne.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Tytył musi coś zawierać.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "Komenda shell musi coś zawierać.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Nieprawidłowe wartości"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, 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."
+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."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
 
-#. 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 ""
+msgid "Track Title"
+msgstr "Tytuł utworu"
 
 #: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Poszukaj na Last.fm"
-
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Przepróbkowywanie ALSA"
-
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Zwolnij urządzenie po zatrzymaniu"
-
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Preferowany rozmiar bufora"
+msgid "Performer"
+msgstr "Wykonawca"
 
 #: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Preferowany okres trwania"
+msgid "Total Tracks"
+msgstr "Ilość utworów"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Gatunek"
 
-#. Last.fm plugin
 #: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Przesyłanie informacji o odtworzonych utworach"
+msgid "Composer"
+msgstr "Kompozytor"
 
 #: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Ukrycie informacji o używanym programie"
+msgid "Disc Number"
+msgstr "Numer płyty"
 
 #: ../translation/extra.c:13
-msgid "Username"
-msgstr "Nazwa użytkownika:"
+msgid "Total Discs"
+msgstr "Wszystkie płyty"
 
 #: ../translation/extra.c:14
-msgid "Password"
-msgstr "Hasło:"
+msgid "Comment"
+msgstr "Komentarz"
 
 #: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Adres URL systemu składania informacji:"
+msgid "Encoder / Vendor"
+msgstr "Program kodujący / Dostawca"
 
 #: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Preferuj Artystę Albumu nad pole Artysty"
+msgid "Copyright"
+msgstr "Prawa autorskie"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Dodawanie położenia"
 
-#. OSS output plugin
 #: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Plik urządzenia"
+msgid "Subtrack Index"
+msgstr "Numer pod-utworu"
 
 #: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Obejście buga częstotliwości próbkowania OSS4"
+msgid "Tag Type(s)"
+msgstr "Typy etykiet"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Okres aktualizacji pamięci podręcznej (h)"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Wewnętrzny Cuesheet"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr "Nazwa zdalnego demona PipeWire (zostaw puste dla domyślnej nazwy)"
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr "Niestandardowe właściwości (nadpisuje istniejące):"
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr "Użyj kontrolera głośności PipeWire"
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Preferuj emulator Kena zamiast Satoha (dźwięk przestrzenny nie będzie działać)"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Włącz dźwięk przestrzenny"
 
-#: ../translation/extra.c:22
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Przepróbkowywanie ALSA"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Preferowany rozmiar bufora"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Preferowany okres trwania"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr "Odśwież okładkę"
+
+#: ../translation/plugins.c:24
+#, no-c-format
 msgid "Fetch from embedded tags"
-msgstr "Pozyskiwanie z etykiet"
+msgstr "Pozyskuj z etykiet"
 
-#: ../translation/extra.c:23
+#: ../translation/plugins.c:26
+#, no-c-format
 msgid "Fetch from local folder"
-msgstr "Pozyskiwanie z lokalnego katalogu"
+msgstr "Pozyskuj z lokalnego katalogu"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Wzór plików okładek:"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Pozyskiwanie z serwisu last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Pozyskiwanie z serwisu albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Skaluj okładkę do dłuższej krawędzi"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Używanie baz danych CDDB/FreeDB"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Pozyskuj z serwisu Last.fm"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Preferowanie danych CD-Text zamiast baz danych CDDB"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Pozyskuj z serwisu MusicBrainz"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "Adres URL bazy danych CDDB (np. „freedb.org”)"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Pozyskuj z serwisu Albumart.org"
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Numer portu bazy danych CDDB (np. „888”)"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "Pozyskaj z serwisu World of Spectrum (pliki AY)"
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Preferuj protokół CDDB zamiast HTTP"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Zapisz pobrane pliki do folderu ze ścieżkami"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Obsługa obrazów płyt w formacie NRG"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Kiedy nie znaleziono okładki"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Jakość przepróbkowywania (0..2, wyższa jest lepsza)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "wyjście 8 bitowe (domyślnie jest 16)"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "zostaw puste"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Maksymalna długość utworu (min):"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "użyj domyślnej okładki DeaDBeeF"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Długość zanikania (sekundy)"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "wyświetl własny obraz"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Odtwarzaj zapętlenia ilość razy (jeśli dostępne)"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Ścieżka własnego obrazu"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Pytaj o potwierdzenie by usunąć pliki z dysku"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "Zapisz do nazwy pliku"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Czułość kontroli głośności ikony obszaru powiadamiania"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr "Maska wyszukiwania (oddzielone ;)"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Własna ikona stanu"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr "Foldery wyszukiwania (oddzielone ;)"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Uruchom gtk_init z opcją --sync (tryb odpluskwiania)"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "Odśwież pamięć podręczną co (godziny)"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Dodaj separatory pomiędzy wpisy w kontekstowym menu wtyczki"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "Uproszczone nazwy plików w pamięci podręcznej"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Format tytułu powiadomienia"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Rozmiar obrazków"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Format zawartości powiadomienia"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "Dysk CD do załadowania"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Pokaż okładkę albumu"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Dysk audio CD"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Rozmiar okładki albumu (px)"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Plik"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Serwer PulseAudio"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Dodaj płytę Audio CD"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Częstotliwość próbkowania"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr "Użyj CDDB/GnuDb"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Względna ścieżka tablicy przeskoków"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Preferuj dane CD-Text nad bazą danych CDDB"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Bezwzględna ścieżka tablicy przeskoków"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr "Link CDDB (np. 'gnudb.gnudb.org')"
 
-#: ../translation/extra.c:60
-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)"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr "Port CDDB (np. '8880')"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr ""
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Użyj protokołu CDDB"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (z HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bitów na próbkę (8 lub 16)"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Obsługuj obrazy płyt w formacie NRG"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Domyślna długość utworu (sek)"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Prędkość napędu dla normalnego odtwarzania"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Plik konfiguracyjny banków Timidity++"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Tytuł utworu"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Wykonawca"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Maksimum"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Ilość utworów"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Korzystaj z korekcji błędów cdparanoia podczas zgrywania"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Gatunek"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Konwertuj"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Kompozytor"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Wykryj częstotliwość próbkowania z urządzenia wyjściowego"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Numer płyty"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Ustaw częstotliwość próbkowania bezpośrednio"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Komentarz"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Jakość / Algorytm"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Program kodujący / Dostawca"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Jakość przepróbkowywania"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Dodawanie położenia"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Wewnętrzna głośność DUMB"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Numer pod-utworu"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Rampowanie głośności"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Typy etykiet"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Tylko włącz/wyłącz"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Wewnętrzny Cuesheet"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Pełne"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Kodek"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8-bitowe wyjście"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Użyj wszystkich rozszerzeń wspieranych przez ffmpeg"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
+#: ../translation/plugins.c:125
+#, no-c-format
 msgid "File Extensions (separate with ';')"
 msgstr "Rozszerzenie pliku (oddzielaj ';')"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Konwertuj"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr "Włącz wyjście DoP"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Docelowa częstotliwość próbkowania"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Ignoruj błędy spowodowane przez złe nagłówki"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Jakość / Algorytm"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Ignoruj błędy transmisji niemożliwe do przeanalizowania"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr ""
-"Automatyczna częstotliwość próbkowania (zastępuje Docelową częstotliwość "
-"próbkowania)"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Maksymalna długość utworu (w minutach):"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Długość zanikania (sekundy)"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Odtwarzaj zapętlenia wielokrotnie (jeśli dostępne)"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "BIOS ColecoVision (dla formatu plików SGC)"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Włącz dźwięk przestrzenny"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr ""
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Usuń informacje ReplayGain"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Plik już istnieje. Nadpisać?"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Skanuj zaznaczenie jako albumy (po etykietach)"
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Ostrzerzenie konwertera"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Skanuj zaznaczenie jako jeden album"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Wybierz enkoder"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Skanuj Gain osobno dla każdej ścieżki"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Błąd konwertera"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Skanuj Gain osobno dla każdej ścieżki jeśli nie zostały zeskanowane"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Konwertowanie..."
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Odznacz wszystko"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Wybierz folder..."
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Zaznacz wszystko"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr ""
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Dodaj położenie..."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
-msgstr ""
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Dodaj katalog..."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr ""
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Dodaj..."
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Błąd"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "_Otwórz..."
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Dodaj nowy enkoder"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Wyświetl pomoc"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Edytuj enkoder"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Przełącz tryb powtarzania"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Usuń ustawienie"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Powtarzanie - Wyłączone"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr ""
-"Ta czynność spowoduje usunięcie wybranego ustawienia. Czy jesteś pewien?"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Powtarzanie - Pojedyncza ścieżka"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Enkodery"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Powtarzanie - Wszystko"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Dodaj wtyczkę do łańcucha DSP"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Przełącz tryb tasowania"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Błąd zapisu ustawień DSP"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Tasowanie - Losowe ścieżki"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Nowe ustawienia DSP"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Tasowanie - Albumy"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Edytuj ustawienia DSP"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Tasowanie - Ścieżki"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Ustawienia DSP"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Tasowanie - Wyłączone"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Folder wyjściowy:"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Przełącz \"Kursor podąża za odtwarzaniem\""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Zapisz do folderu źródłowego ścieżki"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Przełącz \"Przewijanie podąża za odtwarzaniem\""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Zachowaj strukturę folderu"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Widok"
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Nazwa pliku wyjściowego"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Pokaż\\/Ukryj menu"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:208
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
-msgstr ""
-"Rozszerzenie (np. .mp3) będzie dodane automatycznie.\n"
-"Pozostaw to pole dla domyślnego (%a - %t)."
+msgid "Show\\/Hide statusbar"
+msgstr "Pokaż\\/Ukryj pasek stanu"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Enkoder:"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Przełącz tryb projektowania"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Ustawienie DSP:"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Własne sortowanie"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Ilość wątków:"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Wytnij zaznaczone"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Wyjściowa częstotliwość próbkowania formatu:"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr "Usuń utwory z playlisty"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Zachowaj format źródłowy"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Zapisz listę odtwarzania"
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr ""
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Usuń playlistę"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr ""
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "Zmień nazwę bieżącej playlisty"
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr ""
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Pokaż\\/Ukryj korektor dźwięku"
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr ""
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Ukryj korektor dźwięku"
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr ""
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Pokaż korektor dźwięku"
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Jeśli plik istnieje:"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Pokaż\\/Ukryj okno odtwarzacza"
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Pytaj"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Ukryj okno odtwarzacza"
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Nadpisz"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Pokaż okno odtwarzacza"
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr ""
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Znajdź"
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Nienazwany enkoder"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Pokaż\\/Ukryj okno logu"
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Rozszerzenie pliku wyjściowego:"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Pytaj o potwierdzenie by usunąć pliki z dysku"
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Np. mp3"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "Ustawienia ikony obszaru powiadamiania:"
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Linia poleceń:"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Czułość kontroli głośności na ikonie obszaru powiadamiania"
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:252
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
-msgstr ""
-"Przykład: lame - %o\n"
-"%i dla pliku wejściowego, %o dla pliku wyjściowego, - dla stdin"
+msgid "Custom status icon"
+msgstr "Własna ikona stanu"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:254
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
-msgstr ""
-"%o - nazwa pliku wyjściowego\n"
-"%i - tymczasowa nazwa pliku wejściowego"
+msgid "Misc:"
+msgstr "Inne:"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Metoda:"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Dodaj separatory pomiędzy wtyczkami w kontekstowym menu"
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr ""
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Używaj znaków Unicode zamiast obrazków dla stanu odtwarzania"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Plik tymczasowy"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Wyłącz tekst nad paskiem postępu"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr "Poprzedni utwór albo zresetuj odtwarzanie aktualnej ścieżki"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "Duplikuj playlistę"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr "Przejdź do bieżącego utworu"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Przeskocz do"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Poprzedni gatunek"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr ""
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Poprzedni kompozytor"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Edytor ustawień DSP"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Poprzedni wykonawca"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr ""
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Poprzedni album"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Dodaj"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Następny gatunek"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nie można znaleźć pliku pixmapy: %s"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Następny kompozytor"
 
-#: ../plugins/converter/converter.glade.h:12
-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 ""
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Następny wykonawca"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
-msgstr ""
-"Pytaj\n"
-"Nadpisz"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "Następny album"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Następna playlista"
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
-msgstr "Własne komendy Shell"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Poprzednia playlista"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Edytuj"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "Przełącz do playlisty numer 10"
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
-msgstr "Zamknij"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr "Przełącz do playlisty numer 9"
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
-msgstr "Edytuj komendę"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "Przełącz do playlisty numer 8"
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
-msgstr "Komenda:"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Przełącz do playlisty numer 7"
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:301
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
-msgstr ""
-"Arbitralne komendy shell. Będą uruchomione w kontekście shella z którego "
-"została uruchomiona aplikacja. Formatowanie tytułu może zostać użyte. "
-"Przykład: xdg-open %D"
+msgid "Switch to Playlist 6"
+msgstr "Przełącz do playlisty numer 6"
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
-msgstr "ID:"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Przełącz do playlisty numer 5"
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
-msgstr ""
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Przełącz do playlisty numer 4"
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"ID komendy, zazwyczaj powinno być to coś krótkiego, na przykład "
-"\"otwórz_youtube\". Musi być unikalne."
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Przełącz do playlisty numer 3"
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
-msgstr "Pojedyncze ścieżki"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Przełącz do playlisty numer 2"
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
-msgstr "Działa na pojedynczej ścieżce."
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Przełącz do playlisty numer 1"
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
-msgstr "Wiele ścieżek"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Sortuj losowo"
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
-msgstr "Działa na wielu ścieżkach"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Sortuj po dacie"
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
-msgstr "Lokalnie"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Sortuj po wykonawcy"
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
-msgstr "Działa na plikach lokalnych."
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Sortuj po albumie"
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
-msgstr "Zdalnie"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Sortuj po numerze utworu"
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
-msgstr "Działa na zdalnych plikach (np. http:// streams)"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Sortuj po tytule"
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
-msgstr ""
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Odwróć zaznaczenie"
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
-msgstr "Pozycja powinna pojawić się w głównym menu"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Wyczyść playlistę"
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
-msgstr ""
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr "Dodaj do kolejki odtwarzania"
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
-msgstr "Dodaj komendę"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr "Dodaj do początku kolejki odtwarzania"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Usuń"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr "Dodaj/Usuń z kolejki odtwarzania"
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "To działanie usunie wybraną komendę shell. Czy na pewno to zrobić?"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Przenieś"
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
-msgstr "Potwierdzenie usunięcia"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Przesuń utwory w górę"
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
-msgstr "ID musi coś zawierać i być unikalne.\n"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Przesuń utwory w dół"
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
-msgstr "Tytył musi coś zawierać.\n"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Przełącz wyciszenie"
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
-msgstr "Komenda shell musi coś zawierać.\n"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Przełącz pauzę"
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
-msgstr "Nieprawidłowe wartości"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Graj\\/Zapauzuj "
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Wspierane formaty dźwięku"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Przewiń 1 sekundę do przodu"
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Wszystkie pliki (*)"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Przewiń 1 sekundę do tyłu"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Otwórz plik(i)..."
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Przewiń 5 sekund do przodu"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Dodaj plik(i) do playlisty..."
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Przewiń 5 sekund do tyłu"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Dodaj katalog(i) do playlisty..."
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Przewiń o 1% do przodu"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Podążaj za dowiązaniami symbolicznymi"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Przewiń o 1% do tyłu"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Przewiń o 5% do przodu"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Usuń pliki z dysku"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Przewiń o 5% do tyłu"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
-msgstr ""
-"Pliki zostaną utracone. Kontynuować?\n"
-"(Ten dialog może zostać wyłączony w ustawieniach wtyczki GTKUI)"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Zwiększ głośność"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Wczytaj Playlistę"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Zmniejsz głośność"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Inne pliki (*)"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Przełącz zatrzymanie po bieżącym utworze"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Zapisz playlistę jako"
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Przełącz zatrzymanie po bieżącym albumie"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Plik playlisty DeaDBeeF (*.dbpl)"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr "Wyszukaj na Last.fm"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Typ zawartości"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Przesyłanie informacji o odtworzonych utworach"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Nieprawidłowa wartość(i)."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Ukrycie informacji o używanym programie"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
-msgstr ""
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Nazwa użytkownika:"
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Nic nie wybrano."
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Hasło:"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr ""
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Adres URL systemu składania informacji:"
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Zastąp..."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Preferuj Artystę Albumu nad pole Artysty"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Wstaw..."
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Wyślij ID MusicBrainz"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Wytnij"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Wyślij ścieżki krótsze niż 30 sekund (nie zalecane)"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Kopiuj"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Lewy miks"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Wklej"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Prawy miks"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Wymuś 16-bitowe wyjście"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Backend"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Format tytułu powiadomienia"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Format zawartości powiadomienia"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Pokaż okładkę albumu"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Rozmiar okładki albumu (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Blokada ruchu"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Plik urządzenia"
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Przesuń kartę w lewo"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Wyróżnij aktualną playlistę"
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Przesuń kartę w prawo"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Odtwarzaj po podwójnym kliknięciu"
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Usuń kartę"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Rozmiar buforu (-1 dla optymalnej wartości wybranej przez portaudio)"
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Zmień nazwę karty"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Zestaw znaków dla nazw urządzeń"
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Dodaj nową kartę"
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Pokaż nagłówki kolumn"
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr ""
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Zdefiniowane poniżej"
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr ""
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Własny zestaw znaków dla nazw urządzeń"
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Homogeniczny"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "Serwer PulseAudio (domyślnie: zostaw puste)"
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Rozszerz"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Domyślna długość utworu (w minutach):"
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Wypełnij"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Częstotliwość próbkowania"
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Konfiguruj przycisk"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Pomiń jeśli utwór krótszy niż (sek)"
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr ""
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Konfiguruj własne polecenia shell"
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Edytuj playlistę"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Względna ścieżka tablicy przeskoków"
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Zmień nazwę playlisty"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Bezwzględna ścieżka tablicy przeskoków"
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Usuń playlistę"
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Odwróć kolejność bitów audio (przełącz jeśli słyszysz tylko szum)"
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Dodaj nową playlistę"
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Aktywuj bazę długości utworów HVSC"
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Nazwa"
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Pełna ścieżka do Songlengths.md5/.txt"
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Przeglądarka playlisty"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Bitów na próbkę"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Domyślna długość utworu (sek)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Synteza mono"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Włącz logowanie"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Preamp"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Plik konfiguracyjny banków Timidity++"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "Rozszerzenie pliku"
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr "Wiersz poleceń enkodera"
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr "Metoda transferu danych"
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr "Potok (stdin)"
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "Plik tymczasowy"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "Plik źródłowy"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "Zapisz tag ID3v2"
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "Zapisz tag ID3v1"
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "Zapisz tag APEv2"
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "Zapisz tag FLAC"
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "Zapisz tag OggVorbis"
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "Zapisz tag MP4"

deadbeef-0.6.2.tar.bz2/po/pt.po -> deadbeef-1.9.6.tar.bz2/po/pt.po Changed

@@ -1,2079 +1,2603 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Sérgio Marques <smarquespt@gmail.com>, 2013-2014
+# Ricardo Simões <xmcorporation@gmail.com>, 2018
+# Sérgio Marques <smarquespt@gmail.com>, 2013-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 21:02+0000\n"
-"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/pt/)\n"
-"Language: pt\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Ricardo Simões <xmcorporation@gmail.com>, 2018\n"
+"Language-Team: Portuguese (http://app.transifex.com/deadbeef-player/deadbeef-player/language/pt/)\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"
+"Language: pt\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Sobre o DeaDBeef %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Utilização: deadbeef opções -- ficheiro(s)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Alterações no DeaDBeef %s"
+msgid "Options:\n"
+msgstr "Opções:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Tradutores do DeaDBeeF"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ou -h Mostra a ajuda (esta mensagem) e sai\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Gravar pré-ajustes do EQ DeaDBeef"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Sai do DeadBeeF\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Pré-ajustes do EQ DeaDBeef (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Mostra a versão e sai\n\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Carregar pré-ajustes de EQ DeaDBeef..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Inicia a reprodução\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Pré-ajustes do EQ DeaDBeef (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Para a reprodução\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importar pré-ajustes do Foobar2000..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pausa a reprodução\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Pré-ajustes do Foobar2000 (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Retomar/Pausar\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Gravar pré-ajustes"
+#: ../src/main.c:143
+#, 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"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Carregar pré-ajustes"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Avança uma faixa\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importar pré-ajustes do Foobar2000"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Recua uma faixa\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Ativar"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Faixa aleatória da lista\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Nulo"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Junta os ficheiros à lista existente\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Amplificador nulo"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Indica a interface a utilizar, por definição \"GTK2\"\n\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Bandas nulas"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Grava o nome da faixa para stdout\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Pré-ajustes"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-sintaxe: artista, título, álbum,\n lduração, númerodafaixa, yano, comentário,\n direitosdeautor, decorrido\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 dia %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " exemplo: --nowplaying \"%%a - %%t\" deve imprimir \"artista - título\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d dias %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "para mais informações, consulte %s\n"
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " Nota: o comando --nowplaying foi descontinuado.\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Imprime o nome da faixa para stdout, utilizando a nova formatação de título\n"
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " Sintaxe FMT: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " exemplo: --nowplaying-tf \"%%artist%% - %%title%%\" deve imprimir \"artista - título\"\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Mostra ou define o volume da aplicação\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:163
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Parado | %d faixas | %s reproduções"
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Pré-definida"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Sim"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Em pausa | "
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Não"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Pasta de destino:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Gravar na pasta do ficheiro original"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Manter estrutura da pasta"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Copiar se o formato não for alterado"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Atualizar depois de copiar"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Nome do ficheiro:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d faixas | %s reproduções"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nova lista de reprodução"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Codificador:"
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Nova lista de reprodução (%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Pré-ajuste DSP:"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Lista de reprodução com separadores"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Número de processos:"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Lista de reprodução"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Formato de destino:"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Separador (superior e inferior)"
+#: ../plugins/converter/converter.glade.h:14
+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\n8 bit signed int\n16 bit signed int\n24 bit signed int\n32 bit signed int\n32 bit float"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Separador (esquerda e direita)"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Se o ficheiro existir:"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Separadores de lista de reprodução"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Ignorar\nPerguntar\nSubstituir"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Propriedades da seleção"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Editar definições do codificador"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Imagem do álbum"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Título:"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Scope"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Codificador sem nome"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Espetro"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Extensão do ficheiro de destino:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Ex. mp3"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Linha de comandos:"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Botão"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr "Barra de procura"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-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/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr "Controlos de reprodução"
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Método:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "Barra de volume"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Canal\nFicheiro temporário\nFicheiro fonte"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Falha ao abrir a ajuda"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Falha ao carregar a ajuda"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Editor de detalhes"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Editor de DSP"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Título"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Pré-ajuste DSP sem nome"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Adicionar"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Remover"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Configurar"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Selecione o extra DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Extra"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Pré-ajustes"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Nativo %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "O ficheiro já existe. Substituir?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Aviso de conversão"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Por favor escolha o codificador"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Erro de conversão"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "A converter..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Selecione a pasta..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Falha ao guardar definições do codificador"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
-"A aplicação está a executar ações em segundo plano. Se sair agora, as "
-"tarefas serão canceladas ou interrompidas. Poderá provocar a perda de dados."
+"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/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Quer mesmo sair?"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+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:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Erro"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Adicionar novo codificador"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Editar codificador"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Remover pré-ajuste"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Esta ação eliminará o pré-ajuste selecionado. Tem a certeza?"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Codificadores"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Adicionar extra à cadeia DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Falha ao guardar as definições DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Novo pré-ajuste DSP"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Editar pré-ajuste DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Pré-ajustes DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Ajuda"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Manter formato original"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bits signed int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bits signed int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bits signed int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bits float"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Ignorar"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Perguntar"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Substituir"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Canal"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Ficheiro temporário"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Ficheiro fonte"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Incapaz de encontrar o ficheiro: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Abrir ficheiro(s)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Adicionar ficheiro(s) à lista de reprodução..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Adicionar pasta(s) à lista de reprodução..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Carregar lista de reprodução"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Guardar lista de reprodução como"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Sobre o DeaDBeef %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Alterações no DeaDBeef %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Tradutores do DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Tipo de conteúdo"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Extras"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Valor(es) inválido(s)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Os campos tipo de conteúdo e extras não podem ser vazios e devem obedecer às regras.\nExemplo de tipo de conteúdo: audio/mpeg.\nExemplo de extra: stdmpg ffmpeg.\nDeve utilizar espaços para separar os extras\nSó pode utilizar letras, números e o sinal '-' para o tipo de conteúdo.\nSó pode utilizar letras e números para a ID do extra."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Nada selecionado."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "Abrir ficheir_o(s)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Adicionar ficheiro(s)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Adicionar pasta(s)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Adicionar local"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Nova lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Carregar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
-msgstr "Gravar lista de reprodução"
+msgstr "Guardar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Marcar tudo"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Desmarcar tudo"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Inverter seleção"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Seleção"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Remover"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Cortar"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Procurar"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Ordenar por"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Título"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Número de faixa"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Álbum"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Artista"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Aleatório"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Barra de estado"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Equalizador"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Modo de desenho"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Registos"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "Re_produção"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Organização"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Linear"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Desordenar faixas"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Desordenar álbuns"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Repetição"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Repetir tudo"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Repetir uma faixa"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Não repetir"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Deslocamento segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Cursor segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
 msgstr "Parar após a faixa atual"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
 msgstr "Parar após o álbum atual"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Ir para a faixa atual"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "A_juda"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Alterações"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Tradutores"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Procurar"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Parar"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Reproduzir"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Reprodução aleatória"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Ajuda"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Propriedades da faixa"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Localização:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Definições"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "Fe_char"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Detalhes"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Propriedades"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Título:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "C_onfirmar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Indique o novo título da coluna"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Índice de itens"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Reprodução"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Capa do álbum"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artista - Álbum"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Duração"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Número da faixa"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Banda/Artista do álbum"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Modo de organizaçãp:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(se não vazio)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Alinhamento:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Esquerda"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Direita"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Esquerda\nDireita\nCentro"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "C_onfirmar"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Cor do texto:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Sistema de som:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Dispositivo de som:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "Converter áudio 8 bits para 16 bits"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Converter áudio 16 bits para 24 bits"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Para múltiplos de 48KHz (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Para múltiplos de 44.1KHz (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Som"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Modo Replay Gain:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Desativar"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Modo de origem:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Faixa"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Por ordem de reprodução\nFaixa\nÁlbum"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Escala Replay Gain"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "A processar:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Nada\nAplicar ganho\nAplicar ganho e impedir distorção de acordo com o pico\nApenas impedir distorção"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Amplificador Replaygain:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Amplificador:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Amplificação com informação RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Amplificação sem informação RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 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 de reprodução:"
+msgstr "Adicionar ficheiros via linha de comandos (ou gestor de ficheiros) para esta lista de reprodução:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Retomar sessão anterior ao iniciar"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Ao adicionar pastas não adicionar arquivos"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr "A opção \"Parar após a faixa atual\" será desligada após a ativação"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr "A opção \"Parar após o álbum atual\" será desligada após a ativação"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Reprodução"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "Pré-ajustes DSP"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "Carr_egar"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Fechar minimiza para a área de notificação"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Ocultar ícone da área de notificação"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr "Ativar deteção e codificação de SHIFT-JIS japonês"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Ativar deteção e codificação de Russo CP1251"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Ativar deteção e codificação de Mandarim CP936"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Taxa de atualização da interface (vezes por segundo):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Barra de título ao reproduzir:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Barra de título se parada:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Extra da interface (tem que reiniciar):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Mostrar tempo de reprodução na barra de estado"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "Reprodutor"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr "Fechar lista de reprodução com a roda do rato"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Utilizar letra a negrito para a faixa em reprodução"
-
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr "Ocultar item de menu \"Remover do disco\""
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Ao adicionar uma pasta dar nome às listas de reprodução"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr "Ajustar colunas para caber na janela"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Espaçamento entre grupos:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pixeis"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Lista de reprodução"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "Interface/Outras"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Sobrepor"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Principal"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Secundária"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Cor das barras de volume/procura"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Normal"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Claro"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Escuro"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Base"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Texto"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Cores do separador"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-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:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Linha par"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Linha ímpar"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Linha selecionada"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Texto selecionado"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Cursor"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Cores da lista de reprodução"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Cores"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Barras"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Segundo plano (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Barra de pesquisa/barra de volume/EQ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Base:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Escuro:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Claro:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Meio:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Texto:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Negrito"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Itálico"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Texto de reprodução:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Texto selecionado:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Separador"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Faixa(s) normais:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Faixa em reprodução:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Faixa(s) selecionada(s):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Colunas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Título do grupo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Primeiro plano:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Par:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Ímpar:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Selecionada:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Cursor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Segundo plano:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Sobrepor (melhora o processamento, mas perde a vista em árvore GTK)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Aparência"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Ativar servidor proxy"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Endereço do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Porta do servidor proxy:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Tipo de proxy:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Utilizador do proxy:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Senha do proxy:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "Agente HTTP:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "Editar mapeamento de tipo de conteúdo"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Rede"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "Atalhos atribuídos:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Ação:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Não definido>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Combinação de teclas:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Tecla de atalho global"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"Utilize Aplicar para gravar as alterações.\n"
-"Utilize Reverter para anular as alterações.\n"
-"As alterações não serão gravadas\n"
-"se não premir Aplicar."
+msgstr "Utilize Aplicar para gravar as alterações.\nUtilize Reverter para anular as alterações.\nAs alterações não serão guardadas, a menos\nque prima o botão Aplicar."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "Pré-_definições"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Teclas de atalho"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Versão:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Direitos de autor"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Extras"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Restaurar definições originais"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versão:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
 msgstr "Definir título personalizado"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Agrupar por..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Ordenar por..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Formato"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Ascendente"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Descendente"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Selecione o extra DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Extra"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Ascendente\nDescendente"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Definições do editor de detalhes"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Gravar ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Gravar ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Gravar APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Remover ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Remover ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Remover APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Versão ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Recomendado)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Recomendado)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codificação de caracteres ID3v1 (por definição é iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Gravar ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "Mapeamento de tipo de conteúdo"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"Esta tabela define a associação entre o tipo de emissão de rede e os extras "
-"do DeaDBeef. Por exemplo, os ficheiros mp3 podem ser do tipo \"audio/x-mpeg"
-"\" e precisam de ser descodificados pelo extra \"stdmpg\" ou pelo extra "
-"\"ffmpeg\"."
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Restaurar definições originais"
+msgstr "Esta tabela define a associação entre o tipo de emissão de rede e os extras do DeaDBeef. Por exemplo, os ficheiros mp3 podem ser do tipo \"audio/x-mpeg\" e precisam de ser descodificados pelo extra \"stdmpg\" ou pelo extra \"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "Tipo de conteúdo:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Extras:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Propriedades do botão"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Cor:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Cor do texto:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Ícone:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Escolha a ação"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
-"Este diálogo permite-lhe definir um título personalizado para qualquer "
-"faixa. Pode ser útil para estações de rádio. A opção para definir o título "
-"personalizado também está disponível no diálogo \"Adicionar localização\". O "
-"título estará visível na coluna \"Artista\". Deverá aparecer \"artista "
-"personalizado\" se o campo Artista estiver presente e se não estiver "
-"aparece \"personalizado\"."
+msgstr "Este diálogo permite-lhe definir um título personalizada para qualquer faixa. principalmente serve para ser utilizado com estações de rádio. Esta opção também está disponível no diálogo \"Adicionar localização\". O título personalizado será mostrado na coluna \"Artista\". Normalmente será mostrado como \"Artista personalizado\" caso o campo artista esteja presente, caso contrário será apenas \"Personalizado\"."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artista/Álbum"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Editar"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Faixa n.º"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Editar (imediato)"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr "Adicionar à fila de reprodução"
-
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr "Remover da fila de reprodução"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Adicionar novo campo..."
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr "Recarregar meta-dados"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Editar valor"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr "Remover do disco"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Nome do campo:"
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Adicionar coluna"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Valor do campo:"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Editar coluna"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Remover coluna"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "Registos DeadBeef"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr "Fixar grupos as deslocar"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Limpar"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Agrupar por"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Evolução da análise Replay Gain"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Nada"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Ficheiro atual:"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Artista/Data/Álbum"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Estado"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Abrir ficheiro..."
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Configurar %s"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Resultados da análise Replay Gain"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Dispositivo áudio pré-definido"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Atualizar detalhes do ficheiro"
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr "Modificou as teclas de atalho mas não gravou as alterações."
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr "Tem a certeza que quer continuar e não gravar?"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Adição de ficheiros..."
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "A iniciar..."
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Você modificou os dados desta faixa."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Fechar esta janela?"
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Vários valores"
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Guardar pré-ajuste do EQ DeaDBeef"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Tecla"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Pré-ajustes do EQ DeaDBeef (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Valor"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Carregar pré-ajustes de EQ DeaDBeef..."
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Vários valores"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Pré-ajustes do EQ DeaDBeef (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "A escrever detalhes..."
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importar pré-ajustes do Foobar2000..."
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Nome do campo"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Pré-ajustes do Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Nome:"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Guardar pré-ajuste"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Os nomes não podem iniciar com : ou _"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Carregar pré-ajustes"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Incapaz de adicionar campo"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importar pré-ajustes do Foobar2000"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Já existe um campo com este nome. Tente um nome diferente."
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Ativar"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Nulo"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Adicionar campo"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Remover campo"
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Amplificador nulo"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Utilização: deadbeef opções -- ficheiro(s)\n"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Bandas nulas"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opções:\n"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nova lista de reprodução"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help ou -h Mostra a ajuda (esta mensagem) e sai\n"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Formatos suportados"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Sai do DeadBeeF\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Todos os ficheiros (*)"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
 msgstr ""
-" --version Mostra a versão e sai\n"
-"\n"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Inicia a reprodução\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Para a reprodução\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Outros ficheiros (*)"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pausa a reprodução\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Ficheiros DeaDBeeF (*.dbpl)"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Retomar/Pausar\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Ligações simbólicas"
 
-#: ../main.c:99
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, 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"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 dia %d:%02d:%02d"
 
-#: ../main.c:100
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Avança uma faixa\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dias %d:%02d:%02d"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Recua uma faixa\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Faixa aleatória da lista\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Junta os ficheiros à lista existente\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
 msgstr ""
-" --gui PLUGIN Indica a interface a utilizar, por definição \"GTK2\"\n"
-"\n"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Grava o nome da faixa para stdout\n"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Mudar nome da lista de reprodução"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
 msgstr ""
-" FMT %%-sintaxe: artista, título, álbum,\n"
-" lduração, númerodafaixa, yano, comentário,\n"
-" direitosdeautor, decorrido\n"
 
-#: ../main.c:109
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+msgid "Do you really want to remove the playlist '%s'?"
 msgstr ""
-" ex.:: --nowplaying \"%%a - %%t\" deve mostrar "
-"\"artista - título\"\n"
-"\n"
 
-#: ../main.c:110
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " for more info, see %s\n"
-msgstr "para mais informações, consulte %s\n"
+msgid "New Playlist (%d)"
+msgstr "Nova lista de reprodução (%d)"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Pré-definida"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Lista de reprodução com separadores"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Sim"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Separador (superior e inferior)"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Não"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Separador (esquerda e direita)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Separadores"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Separadores de lista de reprodução"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Propriedades da seleção"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Imagem do álbum"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Espetro"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Botão"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Barra de procura"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Controlos de reprodução"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Barra de volume"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Voz sintetizada"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Visualizador de registos"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Falha ao abrir a ajuda"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Falha ao carregar a ajuda"
+
+#: ../plugins/gtkui/gtkui.c:1712
 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 ""
-"Índice de itens\n"
-"Em reprodução\n"
-"Capa do álbum\n"
-"Artista - álbum\n"
-"Artista\n"
-"Álbum\n"
-"Título\n"
-"Duração\n"
-"Faixa\n"
-"Banda / Artista do álbum\n"
-"Personalizar"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "A aplicação está a executar ações em segundo plano. Se sair agora, as tarefas serão canceladas ou interrompidas. Poderá provocar a perda de dados."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Quer mesmo sair?"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Left\n"
-"Right"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Esquerda\n"
-"Direita"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Desativar\n"
-"Faixa\n"
-"Álbum"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
-"Ascendente\n"
-"Descendente"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-"2.3 (Recomendado)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
 #, 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 "Do you really want to delete all %d files from the current playlist?%s"
 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 extra."
 
-#. 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 "Adicionar CD áudio"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Procurar na Last.fm"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Utilizar frequência ALSA"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Eliminar"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Libertar dispositivo se parado"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Esquerda"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Tamanho da memória"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Direita"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Tamanho do período"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Centro"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Ativar \"scrobbler\""
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Desativar em reprodução"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Utilizador"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Senha"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "URL de \"Scrobble\""
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Preferir artista do álbum a artista"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Por ordem de reprodução"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Ficheiro"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Faixa"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Solução alternativa para o erro OSS4"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Nada"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Atualização de cache (horas)"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Aplicar ganho"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Aplicar ganho e impedir distorção de acordo com o pico"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Apenas impedir distorção"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Obter a partir dos detalhes"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Ascendente"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Obter numa pasta local"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Descendente"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Máscara de capa local"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Obter na last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Obter no albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Ajustar tamanho da capa de álbum"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Utilizar CDDB/FreeDB"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Recomendado)"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Preferir CD-Text a CDDB"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "URL CDDB (ex: freedb.org)"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Porta CDDB (ex: 888)"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Preferir CDDB a HTTP"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artista/Álbum"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Ativar suporte a imagens NRG"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Faixa n.º"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Qualidade de frequência (0..2, quanto mais alto melhor)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "Saída 8 bits (pré-definição é 16)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Duração"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Duração máxima da faixa (minutos)"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Índice de itens"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Duração de silenciamento (segundos)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Reprodução"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Repetir estas vezes (se disponível)"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Capa do álbum"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Solicitar confirmação antes de eliminar"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artista - Álbum"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Sensibilidade do ícone de volume na barra de estado"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Ano"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Ícone de estado personalizado"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Número da faixa"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Execute gtk_init com --sync (modo de depuração)"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Banda/Artista do álbum"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Adicionar separadores entre os itens do menu de contexto"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codificador"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Formato do título da notificação"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Taxa de dados"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Formato do texto da notificação"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Adicionar coluna"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Mostrar capa do álbum"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Editar coluna"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Tamanho da capa de álbum (px)"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Remover coluna"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Servidor PulseAudio"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Fixar grupos as deslocar"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Frequência"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Agrupar por"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Caminho da tabela de pesquisa relativa"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artista/Data/Álbum"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Caminho da tabela de pesquisa absoluta"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Trocar bytes áudio (apenas se ouvir defeitos)"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Ativar base de dados HVSC"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (de HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bits por frequência (8 ou 16)"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Recarregar meta-dados"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Duração pré-definida da faixa (seg.)"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Ficheiro de configuração Timidity++"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Título da faixa"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Artista"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Total de faixas"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Remover lista de reprodução"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Género"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Adicionar lista de reprodução"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Compositor"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Número do disco"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Comentário"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Abrir ficheiro..."
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Codificador/Fornecedor"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Configurar %s"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Localização"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Modificou as teclas de atalho mas não guardou as alterações."
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Índice de subfaixa"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Tem a certeza que quer continuar e não gravar?"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tipo de detalhes"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Dispositivo áudio pré-definido"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Cuesheet incorporada"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Adição de ficheiros..."
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Codificador"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "A iniciar..."
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Extensões (separadas por \";\")"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Evolução da atualização dos detalhes"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Converter"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nome"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Frequência final"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Ganho de álbum"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Ganho de faixa"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Pico do álbum"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Pico da faixa"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Sucesso"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Ficheiro não encontrado"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Ficheiro inválido"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Pesquisa (%list_total% resultados)"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Qualidade/Algoritmo"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Mostrar título das colunas"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Frequência automática (substitui frequência final)"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Valor"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr "Configurar comando de consola personalizados"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Você modificou os dados desta faixa."
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Desativar reprodução \"gapless\" (análise mais rápida)"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Fechar esta janela?"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Preferir Ken emu a Satoh (surround não funciona)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Vários valores"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Ativar \"surround\""
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Tecla"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr "Nativo %s"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Vários valores"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "O ficheiro já existe. Substituir?"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "A escrever detalhes..."
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Aviso de conversão"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Por favor escolha o codificador"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Erro de conversão"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Nome do campo"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "A converter..."
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Selecione a pasta..."
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Os nomes não podem iniciar com : ou _"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Falha ao gravar definições do codificador"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Incapaz de adicionar campo"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-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/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Já existe um campo com este nome. Tente um nome diferente."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-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/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "O widget %s não está disponível"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Erro"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Substituir por..."
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Adicionar novo codificador"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Inserir..."
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Editar codificador"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Cortar"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Remover pré-ajuste"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Copiar"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Esta ação eliminará o pré-ajuste selecionado. Tem a certeza?"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Colar"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Codificadores"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Adicionar extra à cadeia DSP"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Não é possível ter vários widgets deste tipo"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Falha ao gravar as definições DSP"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Tamanho proporcional"
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Bloquear altura do painel superior"
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Bloquear largura do painel esquerdo"
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Bloquear altura do painel inferior"
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Bloquear largura do painel direito"
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Renomear separador"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Novo pré-ajuste DSP"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Remover separador"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Editar pré-ajuste DSP"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Adicionar separador"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Pré-ajustes DSP"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Mover separador para a esquerda"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Pasta de destino:"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Mover separador para a direita"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Gravar na pasta do ficheiro original"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Manter estrutura da pasta"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Nome do ficheiro:"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
-#, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
 msgstr ""
-"A extensão (ex: mp3) será adicionada automaticamente.\n"
-"Deixe o campo vazio para utilizar (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Codificador:"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Pré-ajuste DSP:"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Número de processos:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Formato de destino:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Manter formato original"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit signed int"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bits signed int"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bits signed int"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bits signed int"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bits float"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Se o ficheiro existir:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Perguntar"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Substituir"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Editar definições do codificador"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Codificador sem nome"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Extensão do ficheiro de destino:"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Ex. mp3"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Linha de comandos:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
-"Exemplo: lame - %o\n"
-"%i para o ficheiro de origem, %o para o ficheiro de destino, - para stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
-"%o - nome do ficheiro de destino\n"
-"%i - nome do ficheiro temporário"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Método:"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Canal"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Ficheiro temporário"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Expandir caixa por 1 item"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Reduzir caixa por 1 item"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogéneo"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Expandir"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Preencher"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Editor de detalhes"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Configurar botão"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Editor de DSP"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Pré-ajuste DSP sem nome"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Adicionar"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Vozes:"
+
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Incapaz de encontrar o ficheiro: %s"
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 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"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
-"Perguntar\n"
-"Substituir"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
-"Canal\n"
-"Ficheiro temporário"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Itens"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Explorador de listas de reprodução"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "Comandos personalizados"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Editar"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2096,9 +2620,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"Comando de consola aleatório. Será executado na consola em que a aplicação "
-"for iniciada. Pode utilizar a formatação de título. Exemplo: xdg-open %D"
+msgstr "Comando de consola aleatório. Será executado na consola em que a aplicação for iniciada. Pode utilizar a formatação de título. Exemplo: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2113,10 +2635,9 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"ID do comando. Deve ser algo curto e único. Por exemplo \"youtube_open\". "
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "ID do comando. Deve ser algo curto e único. Por exemplo \"youtube_open\". "
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2174,19 +2695,12 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
-"Se quiser adicionar o comando ao menu principal, certifiqu-se que o "
-"título contém o caminho desta forma: \"Ficheiro/Meu comando\", em que "
-"Ficheiro é o nome do menu na versão em inglês."
+msgstr "Se quiser adicionar o comando ao menu principal, certifiqu-se que o título contém o caminho desta forma: \"Ficheiro/Meu comando\", em que Ficheiro é o nome do menu na versão em inglês."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Adicionar comando"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Eliminar"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Esta ação eliminará o comando de consola. Tem a certeza?"
@@ -2212,197 +2726,1240 @@
 msgid "Invalid Values"
 msgstr "Valores inválidos"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Formatos suportados"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 extra."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Todos os ficheiros (*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "estéreo"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Abrir ficheiro(s)..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Título da faixa"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Adicionar ficheiro(s) à lista de reprodução..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Artista"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Adicionar pasta(s) à lista de reprodução..."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Total de faixas"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Ligações simbólicas"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Género"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Compositor"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Eliminar ficheiros do disco"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Número do disco"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Total de discos"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Comentário"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Codificador/Fornecedor"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Direitos de autor"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Localização"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Índice de subfaixa"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tipo de detalhes"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Cuesheet incorporada"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-"Os ficheiros serão eliminados. Continuar?\n"
-"(Pode desativar esta opção nas definições do extra GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Carregar lista de reprodução"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Outros ficheiros (*)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Gravar lista de reprodução como"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Preferir Ken emu a Satoh (surround não funciona)"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Ficheiros DeaDBeeF (*.dbpl)"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Ativar \"surround\""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Tipo de conteúdo"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Utilizar frequência ALSA"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Valor(es) inválido(s)."
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Tamanho da memória"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Tamanho do período"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
-"Os campos tipo de conteúdo e extras não podem ser vazios e devem obedecer às "
-"regras.\n"
-"Exemplo de tipo de conteúdo: audio/mpeg.\n"
-"Exemplo de extra: stdmpg ffmpeg.\n"
-"Deve utilizar espaços para separar os extras\n"
-"Só pode utilizar letras, números e o sinal '-' para o tipo de conteúdo.\n"
-"Só pode utilizar letras e números para a ID do extra."
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Nada selecionado."
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Obter a partir dos detalhes"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr "O widget %s não está disponível"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Obter numa pasta local"
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Substituir por..."
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Inserir..."
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Cortar"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Copiar"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Colar"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr "Não é possível ter vários widgets deste tipo"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Bloquear movimentação"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Mover separador à esquerda"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Mover separador à direita"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "deixar em branco"
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Remover separador"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Mudar nome do separador"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Adicionar separador"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Mostrar título das colunas"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Expandir caixa em 1 item"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "Encolher caixa em 1 item"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Homogéneo"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Expandir"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Preencher"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Configurar botão"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr "Vozes:"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Editar lista de reprodução"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Mudar nome da lista de reprodução"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Ficheiro"
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Remover lista de reprodução"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Adicionar CD áudio"
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Adicionar lista de reprodução"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Nome"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Preferir CD-Text a CDDB"
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Explorador de listas de reprodução"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Ativar suporte a imagens NRG"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Máx"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Converter"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Qualidade/Algoritmo"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Extensões (separadas por \";\")"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Duração máxima da faixa (minutos)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Duração de silenciamento (segundos)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Repetir estas vezes (se disponível)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Solicitar confirmação antes de eliminar"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Sensibilidade do ícone de volume na barra de estado"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Ícone de estado personalizado"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Adicionar separadores entre os itens do menu de contexto"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Avançar para"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Ativar \"scrobbler\""
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Desativar em reprodução"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Utilizador"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Senha"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "URL de \"Scrobble\""
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Preferir artista do álbum a artista"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Formato do título da notificação"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Formato do texto da notificação"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Mostrar capa do álbum"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Tamanho da capa de álbum (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Ficheiro"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Frequência"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr ""
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Configurar comando de consola personalizados"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Caminho da tabela de pesquisa relativa"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Caminho da tabela de pesquisa absoluta"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Trocar bytes áudio (apenas se ouvir defeitos)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Ativar base de dados HVSC"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Duração pré-definida da faixa (seg.)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Ficheiro de configuração Timidity++"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-0.6.2.tar.bz2/po/pt_BR.po -> deadbeef-1.9.6.tar.bz2/po/pt_BR.po Changed

@@ -1,2380 +1,3970 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Alexandro Casanova <shorterfire@gmail.com>, 2014
 # Henrique P. Machado <hpmachado@gnome.org>, 2010
+# Savio saviosiqueira, 2022
 # secipolla <secipolla@gmail.com>, 2010
 # secipolla <secipolla@gmail.com>, 2010
+# Yuri Somacal, 2016,2018
+# Yuri Somacal, 2016,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
-"deadbeef-player/language/pt_BR/)\n"
-"Language: pt_BR\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Savio saviosiqueira, 2022\n"
+"Language-Team: Portuguese (Brazil) (http://app.transifex.com/deadbeef-player/deadbeef-player/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"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Sobre o DeaDBeef %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Uso: deadbeef opções -- arquivo(s)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Registro de alterações - DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Opções:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Tradutores do DeaDBeeF"
-
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Salvar predefinição do equalizador do DeaDBeeF"
-
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Arquivos de predefinição do equalizador do DeaDBeeF (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Carregar predefinição do equalizador do DeaDBeeF..."
-
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Predefinições do equalizador do DeaDBeeF (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importar predefinição do equalizador do Foobar2000..."
-
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Predefinições do equalizador do Foobar2000 (*.feq)"
-
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Salvar predefinição"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ou -h Imprime a ajuda (esta mensagem) e sai\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Carregar predefinição"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Fecha o DeaDBeeF\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importar predefinição do Foobar2000"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Imprime informações da versão e sai\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Habilitar"
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Inicia a reprodução\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Zerar tudo"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Para a reprodução\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Pré-amplificação zero"
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pausa a reprodução\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Bandas a zero"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Pausa/reinicia\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Predefinições"
+#: ../src/main.c:143
+#, 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"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:144
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 dia %d:%02d:%02d"
+msgid " --next Next song in playlist\n"
+msgstr " --next Próxima música na lista de reprodução\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:145
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d dias %d:%02d:%02d"
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Música anterior na lista de reprodução\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:146
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Parado | %d faixas | %s tempo total de reprodução"
+msgid " --random Random song in playlist\n"
+msgstr " --random Música aleatória na lista de reprodução\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Acrescenta arquivos(s) à lista de reprodução existente\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Estéreo"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Informa qual plugin de interface para utilizar, o padrão é \"GTK2\"\n"
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:149
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+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"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pausado | "
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-sintaxe: artista, título, álbum,\n lduração, número da faixa, yano, comentário,\n direitos autorais, tempo decorrido\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:153
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d faixas | %s tempo total de "
-"reprodução"
-
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nova lista"
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:154
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Nova lista (%d)"
-
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
+msgid " for more info, see %s\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Padrão"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Estéreo"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Sim"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Falha ao ler o arquivo de ajuda"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Não"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Falha ao carregar o arquivo de ajuda"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Pasta de saída:"
 
-#: ../plugins/gtkui/gtkui.c:1171
-msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Alerta"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Arquivo"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Abrir arquivos(s)"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Nome do arquivo de saída:"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Adicionar arquivo(s)"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Adicionar pasta(s)"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Codificador:"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Adicionar local"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Predefinição do DSP:"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Nova lista de reprodução"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Número de linhas de execução"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Carregar lista de reprodução"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Formato da amostra de saída:"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Salvar lista de reprodução"
+#: ../plugins/converter/converter.glade.h:14
+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\nInteiro de 8 bits com sinal\nInteiro de 16 bits com sinal\nInteiro de 24 bits com sinal\nInteiro de 32 bits com sinal\n32 bits flutuante"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Sair"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Quando o arquivo existir:"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Editar"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Limpar"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Editar predefinição do codificador"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Selecionar tudo"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Título:"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Desmarcar tudo"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Codificador sem título"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Inverter seleção"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Extensão do arquivo de saída:"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Seleção"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Ex. mp3"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Remover"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Linha de comando:"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Cortar"
-
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Procurar"
-
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Exemplo: lame - %o\n%i para arquivo de entrada, %o para arquivo de saída, - para entrada padrão (stdin)"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Título"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - nome do arquivo de saída\n%i - nome do arquivo de entrada temporário"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "Número da faixa"
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Método:"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Álbum"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Artista"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Data"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Aleatória"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Personalizar"
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Preferências"
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Ver"
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Barra de status"
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Editor de etiquetas"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Equalizador"
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Editor de predefinições do DSP"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Título"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_Reprodução"
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Predefinição do DSP sem título"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Ordem"
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Adicionar"
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Linear"
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Remover"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Embaralhar faixas"
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Configurar"
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Embaralhar álbuns"
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Selecionar plugin do DSP"
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Repetição"
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Plugin"
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Predefinições"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr ""
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "O arquivo já existe. Sobrescrever?"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Rolagem segue a reprodução"
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Alerta do conversor"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Cursor segue a reprodução"
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Selecione o codificador, por favor"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
-msgstr ""
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Erro do conversor"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
-msgstr ""
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Convertendo..."
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Ir para a faixa atual"
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Selecionar pasta..."
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "Aj_uda"
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Falha ao salvar predefinição do codificador"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "Registro de _alterações"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Verifique as permissões da pasta de predefinições, tente com um título diferente ou libere algum espaço no disco"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+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/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Erro"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_Sobre"
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Adicionar novo codificador"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "_Tradutores"
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Editar codificador"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Pesquisar"
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Remover predefinição"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Parar"
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Esta ação irá excluir a predefinição selecionada. Tem certeza?"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Reproduzir"
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Alerta"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Pausar"
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Codificadores"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Anterior "
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Adicionar plugin à corrente do DSP"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Próxima"
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Falha ao salvar predefinição do DSP"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Reprodução aleatória"
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Nova predefinição do DSP"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "Sobre"
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Editar predefinição do DSP"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Sair"
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Predefinições do DSP"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Propriedades da faixa"
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Manter o formato original"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
-msgstr ""
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "Inteiro de 8 bits com sinal"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "Configuração"
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "Inteiro de 16 bits com sinal"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Aplicar"
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "Inteiro de 24 bits com sinal"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Fechar"
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "Inteiro de 32 bits com sinal"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Metadados"
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bits flutuante"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Propriedades"
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Título:"
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Perguntar"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Digite o novo título da coluna aqui"
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Sobrescrever"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Tipo:"
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Pipe"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Índice de itens"
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Em reprodução"
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Capa do álbum"
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Não foi possível encontrar o arquivo pixmap: %s"
 
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artista - Álbum"
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Duração"
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Número da faixa"
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Banda / Artista do álbum"
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Formato:"
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Alinhamento:"
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Esquerda"
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Sobre o DeaDBeef %s"
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Direita"
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Registro de alterações - DeaDBeeF %s"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Tradutores do DeaDBeeF"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Plugin de saída:"
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Dispositivo de saída:"
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Sempre converter áudio de 8 bits para 16 bits"
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Plugins"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Som"
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Modo de normalização:"
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Desabilitado"
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Arquivo"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Faixa"
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Abrir arquivos(s)"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Ajustar a normalização com o nível de pico"
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Adicionar arquivo(s)"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
-msgstr "-12 dB"
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Adicionar pasta(s)"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
-msgstr "+12 dB"
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Adicionar local"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Pré-amplificação da normalização:"
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Nova lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Pré-amplificação global:"
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Carregar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-"Adicionar arquivos pela linha de comando (ou gerenciador de arquivos) a esta "
-"lista de reprodução:"
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Salvar lista de reprodução"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "Continuar a sessão anterior ao iniciar"
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Sair"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
-msgstr "Não adicionar de arquivos ao adicionar pastas"
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Limpar"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Selecionar tudo"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Reprodução"
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Desmarcar tudo"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Configurar"
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Inverter seleção"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
-msgstr "Predefinição de corrente do DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Seleção"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
-msgstr "_Carregar"
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Cortar"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
-msgstr "DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Procurar"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Fechar minimiza para a área de notificação"
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr "Classificar por"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Ocultar o ícone na área de notificação"
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Número da faixa"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Álbum"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr ""
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Artista"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Data"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
-msgstr "Taxa de atualização da interface (vezes por segundo):"
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Aleatória"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "Texto na barra de título durante a reprodução:"
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Personalizar"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Texto na barra de título quando parado:"
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Preferências"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
-msgstr "Plugin da interface gráfica (mudança requer reinício):"
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Ver"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Barra de status"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Equalizador"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr "Modo de design"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Registros"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Reprodução"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
-msgstr "Autonomear listas de reprodução ao adicionar uma única pasta"
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Sobrepujar"
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Primeiro plano"
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Rolagem segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Segundo plano"
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Cursor segue a reprodução"
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Cores das barras volume/pesquisa"
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr "Parar depois dessa musica"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Meio"
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr "Parar depois deste album"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Claro"
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Ir para a faixa atual"
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Escuro"
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "Aj_uda"
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Base"
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "Registro de _alterações"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Texto"
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Cores do separador"
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-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/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_Sobre"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Linha par"
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Tradutores"
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Linha ímpar"
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Pesquisar"
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Linha selecionada"
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Parar"
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Texto selecionado"
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Reproduzir"
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Cursor"
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pausar"
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Cores da lista de reprodução"
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Anterior "
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Cores"
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Próxima"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Habilitar servidor proxy"
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Reprodução aleatória"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Endereço do servidor proxy:"
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "Sobre"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Porta do servidor proxy:"
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Sair"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Tipo de proxy:"
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Propriedades da faixa"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Nome de usuário do proxy:"
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "Localização:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Senha do proxy:"
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Configuração"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Aplicar"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Fechar"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Rede"
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadados"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Propriedades"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Cancelar"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Digite o novo título da coluna aqui"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Formato:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Alinhamento:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
 msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+"Left\n"
+"Right\n"
+"Center"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Cor do texto:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Plugin de saída:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Dispositivo de saída:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Sempre converter áudio de 8 bits para 16 bits"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Sempre converter áudio 8-bit para 16-bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Versão: "
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Direitos autorais"
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Para múltiplos de 48 kHz (96 kHz, 192 KHz, ...):"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Plugins"
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Para múltiplos de 44.1 kHz (88.2 kHz, 176.4 kHz, ...):"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Sobrepor taxa de amostragem"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Som"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Processando:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Formato"
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Ascendente"
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Descendente"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Selecionar plugin do DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Plugin"
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
-msgstr "Configuração do editor de etiquetas"
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Adicionar arquivos pela linha de comando (ou gerenciador de arquivos) a esta lista de reprodução:"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Escrever ID3v2"
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Continuar a sessão anterior ao iniciar"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Escrever ID3v1"
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Não adicionar de arquivos ao adicionar pastas"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Escrever APEv2"
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "Remover ID3v2"
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "Remover ID3v1"
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Reprodução"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "Remover APEv2"
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr "Predefinição de corrente do DSP"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "Versão ID3v2"
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "_Carregar"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Recomendado)"
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "Codificação de caracteres ID3v1 (padrão é iso8859-1)"
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Fechar minimiza para a área de notificação"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "Escrever ID3v2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Ocultar o ícone na área de notificação"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
-msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr "Taxa de atualização da interface (vezes por segundo):"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Texto na barra de título durante a reprodução:"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Texto na barra de título quando parado:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Plugin da interface gráfica (mudança requer reinício):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr "Fechar listas de reprodução com o botão do meio do mouse"
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Autonomear listas de reprodução ao adicionar uma única pasta"
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artista / Álbum"
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Nº da faixa"
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Lista de Reprodução"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Sobrepujar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Adicionar coluna"
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Editar coluna"
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Escuro:"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Remover coluna"
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Claro:"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Meio:"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Agrupar por"
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Texto:"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Nenhum"
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Negrito"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Artista/Data/Álbum"
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Itálico"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Abrir arquivo..."
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Configurar %s"
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Texto selecionado:"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Dispositivo de áudio padrão"
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Adicionando arquivos..."
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Inicializando..."
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Colunas:"
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Você modificou os dados desta faixa."
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Cabeçalho do grupo:"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Deseja realmente fechar esta janela?"
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Primeiro plano:"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Valores múltiplos"
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Linha par:"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Chave"
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Linha ímpar:"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Valor"
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Linha selecionada:"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Cursor:"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Escrevendo etiquetas..."
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Segundo plano:"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Nome:"
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Os nomes dos campos não devem começar com : ou _"
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Incapaz de adicionar campo"
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-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/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Aparência"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Adicionar campo"
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Remover campo"
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opções:\n"
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Habilitar servidor proxy"
 
-#: ../main.c:92
-#, 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"
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Endereço do servidor proxy:"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Fecha o DeaDBeeF\n"
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Porta do servidor proxy:"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Imprime informações da versão e sai\n"
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Tipo de proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Nome de usuário do proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Senha do proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Rede"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr "Ação"
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr "<Não configurado>"
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr "Combinação de teclas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr "Tecla de atalho global"
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr "_Padrões"
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr "Teclas de atalho"
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versão: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr "Configurar título personalizado"
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr "Agrupar por..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr "Ordenar por..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Ascendente\nDescendente"
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr "Configuração do editor de etiquetas"
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Escrever ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Escrever ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Escrever APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Remover ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Remover ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Remover APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "Versão ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Recomendado)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "Codificação de caracteres ID3v1 (padrão é iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Escrever ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr "Propriedades do botão"
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "Cor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "Ícone:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Editar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Salvar predefinição do equalizador do DeaDBeeF"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Arquivos de predefinição do equalizador do DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Carregar predefinição do equalizador do DeaDBeeF..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Predefinições do equalizador do DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importar predefinição do equalizador do Foobar2000..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Predefinições do equalizador do Foobar2000 (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Salvar predefinição"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Carregar predefinição"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importar predefinição do Foobar2000"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Habilitar"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Zerar tudo"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Pré-amplificação zero"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Bandas a zero"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nova lista"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 dia %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dias %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Renomear lista de reprodução"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Nova lista (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Lista de Reprodução com abas"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Dividir (cima e baixo)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Dividir (esquerda e direita)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Abas"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Abas da Lista de Reprodução"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Propriedades da seleção"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Mostrar arte do album"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spectro "
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Botão"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Controles de reprodução"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Barra de volume"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Visualizador de registros"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Falha ao ler o arquivo de ajuda"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Falha ao carregar o arquivo de ajuda"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "A aplicação está executando ações em segundo plano. Se sair agora, as tarefas serão canceladas ou interrompidas. Isso poderá provocar a perda de dados."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Deseja mesmo sair?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Esquerda"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Direita"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Centro"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Por ordem de reprodução"
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Faixa"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Nenhum"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Aplicar ganho"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Aplicar ganho e prevenir clipping de acordo com o pico"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Somente prevenir clipping"
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Descendente"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Recomendado)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artista / Álbum"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Nº da faixa"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Duração"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Índice de itens"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Em reprodução"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Capa do álbum"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artista - Álbum"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Número da faixa"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Banda / Artista do álbum"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codec"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Inicia a reprodução\n"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Para a reprodução\n"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Adicionar coluna"
+
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Editar coluna"
+
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Remover coluna"
+
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Agrupar por"
+
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artista/Data/Álbum"
+
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../main.c:97
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Recarregar metadados"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Remover lista de reprodução"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Nova lista de reprodução"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Abrir arquivo..."
+
+#: ../plugins/gtkui/pluginconf.c:559
 #, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pausa a reprodução\n"
+msgid "Configure %s"
+msgstr "Configurar %s"
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Você modificou as teclas de atalho, mas não salvou suas mudanças."
+
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Tem certeza que deseja continuar sem salvar?"
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Dispositivo de áudio padrão"
+
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Adicionando arquivos..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Inicializando..."
+
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Mostrar cabeçalhos das colunas"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Valor"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Você modificou os dados desta faixa."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Deseja realmente fechar esta janela?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Valores múltiplos"
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Chave"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Valores múltiplos"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Escrevendo etiquetas..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Nome do campo"
+
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Nome:"
 
-#: ../main.c:98
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Os nomes dos campos não devem começar com : ou _"
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Incapaz de adicionar campo"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+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/widgets.c:460
 #, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Pausa/reinicia\n"
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Substituir por..."
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Inserir..."
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Recortar"
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Copiar"
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Colar"
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Expandir"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr ""
 
-#: ../main.c:99
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgid "Copy of %s"
 msgstr ""
-" --play-pause Inicia a reprodução se parado, senão pausa/reinicia\n"
 
-#: ../main.c:100
+#: ../plugins/hotkeys/actionhandlers.c:827
 #, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Próxima música na lista de reprodução\n"
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Música anterior na lista de reprodução\n"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Música aleatória na lista de reprodução\n"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
-" --queue Acrescenta arquivos(s) à lista de reprodução "
-"existente\n"
 
-#: ../main.c:104
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
 #, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgid "%dd %d:%02d:%02d"
 msgstr ""
 
-#: ../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"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Itens"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
 msgstr ""
-" FMT %%-sintaxe: artista, título, álbum,\n"
-" lduração, número da faixa, yano, comentário,\n"
-" direitos autorais, tempo decorrido\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
 msgstr ""
-" ex.: --nowplaying \"%%a - %%t\" deve imprimir\n"
-" \"artista - título\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Padrão"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Fechar"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Sim"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Editar comando"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Não"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Comando:"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Índice de itens\n"
-"Em reprodução\n"
-"Capa do álbum\n"
-"Artista - Álbum\n"
-"Artista\n"
-"Álbum\n"
-"Título\n"
-"Duração\n"
-"Número da faixa\n"
-"Banda / Artista do álbum\n"
-"Personalizar"
-
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
 msgid ""
-"Left\n"
-"Right"
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
 msgstr ""
-"Esquerda\n"
-"Direita"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
-"Desativar\n"
-"Faixa\n"
-"Álbum"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Ascending\n"
-"Descending"
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
-"Ascendente\n"
-"Descendente"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr ""
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
 msgstr ""
-"2.3 (Recomendado)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, 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: arquivo de configuração freepats não encontrado. Instale o pacote "
-"timidity-freepats ou especifique o caminho a freepats.cfg nas configurações "
-"do plugin, por favor."
+msgstr "wildmidi: arquivo de configuração freepats não encontrado. Instale o pacote timidity-freepats ou especifique o caminho a freepats.cfg nas configurações do plugin, por favor."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "estéreo"
 
-#. 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 ""
+msgid "Track Title"
+msgstr "Título da faixa"
 
 #: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Procurar no Last.fm"
+msgid "Performer"
+msgstr "Artista"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Total de faixas"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Gênero"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Compositor"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Número do disco"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Comentário"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Codificador / Fornecedor"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Direitos autorais"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Local"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Índice de subfaixas"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tipo(s) de etiqueta"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Cuesheet embutida"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr ""
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Habilitar surround"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
 msgid "Use ALSA resampling"
 msgstr "Usar reamostragem ALSA"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Liberar dispositivo quando parado"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Tamanho preferido do buffer"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Tamanho preferido do período"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
+
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Buscar nas etiquetas embutidas"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Buscar numa pasta local"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Tamanho preferido do buffer"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Tamanho preferido do período"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Habilitar scrobbler"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Não enviar informações sobre a faixa atual"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Nome de usuário"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Senha"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "URL para scrobbling"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Arquivo de dispositivo"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Contornar falha da taxa de amostragem do OSS4"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Período para atualização do cache (h)"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Buscar nas etiquetas embutidas"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Buscar numa pasta local"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Máscara de arquivo de capa local"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Buscar no last.fm"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Buscar no albumart.org"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Escalar a capa do álbum pelo lado maior"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Adicionar CD de áudio"
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Usar CDDB/FreeDB"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
 
-#: ../translation/extra.c:30
+#: ../translation/plugins.c:71
+#, no-c-format
 msgid "Prefer CD-Text over CDDB"
 msgstr "Preferir CD-Text a CDDB"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "URL de CDDB (ex. 'freedb.org')"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Número da porta CDDB (ex. '888')"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Preferir protocolo CDDB ao HTTP"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
 
-#: ../translation/extra.c:34
+#: ../translation/plugins.c:79
+#, no-c-format
 msgid "Enable NRG image support"
 msgstr "Habilitar suporte ao formato de imagem NRG"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Qualidade de reamostragem (0..2, maior é melhor)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Duração máxima da música (em minutos)"
-
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Pedir confirmação para excluir arquivos do disco"
-
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Sensibilidade ao controle de volume no ícone de status"
-
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Ícone de status personalizado"
-
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Executar gtk_init com --sync (modo de depuração)"
-
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Adicionar separadores entre itens do menu de contexto dos plugins"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Formato de notificação do título"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Formato de notificação do conteúdo"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Converter"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Mostrar a capa do álbum"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Tamanho da capa do álbum (px)"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Servidor PulseAudio"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Qualidade / Algoritmo"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Taxa de amostragem"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Caminho relativo da tabela de referência"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Caminho absoluto da tabela de referência"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Intercâmbio de bytes de áudio (alterne se só ouve estática)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Habilitar banco de dados de duração da HVSC"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (da HVSC)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bits por amostra (8 ou 16)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Duração padrão das músicas (em segundos)"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Extensões de arquivo (separadas por \";\")"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Arquivo de configuração para o banco Timidity++"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Título da faixa"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Artista"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Total de faixas"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Duração máxima da música (em minutos)"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Gênero"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Compositor"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Número do disco"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Comentário"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Codificador / Fornecedor"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Local"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Índice de subfaixas"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tipo(s) de etiqueta"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Cuesheet embutida"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Codec"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Extensões de arquivo (separadas por \";\")"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Converter"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Taxa de amostragem alvo"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Taxa de amostragem automática (sobrepuja a taxa de amostragem alvo)"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "O arquivo já existe. Sobrescrever?"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Alerta do conversor"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Selecione o codificador, por favor"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Erro do conversor"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Convertendo..."
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Selecionar pasta..."
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Falha ao salvar predefinição do codificador"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
-"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:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
-"Uma predefinição com o mesmo nome já existe. Tente um título diferente."
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Erro"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Adicionar novo codificador"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Editar codificador"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Remover predefinição"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Esta ação irá excluir a predefinição selecionada. Tem certeza?"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Codificadores"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Adicionar plugin à corrente do DSP"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Falha ao salvar predefinição do DSP"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Nova predefinição do DSP"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Editar predefinição do DSP"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Predefinições do DSP"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Pasta de saída:"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Nome do arquivo de saída:"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:244
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Show\\/Hide Log window"
 msgstr ""
-"A extensão (ex. .mp3) será adicionada automaticamente.\n"
-"Deixe o campo vazio para o padrão (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Codificador:"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Pedir confirmação para excluir arquivos do disco"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Predefinição do DSP:"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Número de linhas de execução"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Sensibilidade ao controle de volume no ícone de status"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Formato da amostra de saída:"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Ícone de status personalizado"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Manter o formato original"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "Inteiro de 8 bits com sinal"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Adicionar separadores entre itens do menu de contexto dos plugins"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "Inteiro de 16 bits com sinal"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "Inteiro de 24 bits com sinal"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "Inteiro de 32 bits com sinal"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bits flutuante"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Quando o arquivo existir:"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Perguntar"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Sobrescrever"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Editar predefinição do codificador"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Codificador sem título"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Extensão do arquivo de saída:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Ex. mp3"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Linha de comando:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:285
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Next Artist"
 msgstr ""
-"Exemplo: lame - %o\n"
-"%i para arquivo de entrada, %o para arquivo de saída, - para entrada padrão "
-"(stdin)"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:287
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Next Album"
 msgstr ""
-"%o - nome do arquivo de saída\n"
-"%i - nome do arquivo de entrada temporário"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Método:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Pipe"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Arquivo temporário"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Editor de etiquetas"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Editor de predefinições do DSP"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Predefinição do DSP sem título"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Adicionar"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Não foi possível encontrar o arquivo pixmap: %s"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 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:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
-"Perguntar\n"
-"Sobrescrever"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
-"Pipe\n"
-"Arquivo temporário"
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:333
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Habilitar scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Não enviar informações sobre a faixa atual"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Nome de usuário"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Senha"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "URL para scrobbling"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Formato de notificação do título"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Formato de notificação do conteúdo"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Mostrar a capa do álbum"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Tamanho da capa do álbum (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Arquivo de dispositivo"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Taxa de amostragem"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Caminho relativo da tabela de referência"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Caminho absoluto da tabela de referência"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Intercâmbio de bytes de áudio (alterne se só ouve estática)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Habilitar banco de dados de duração da HVSC"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Duração padrão das músicas (em segundos)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Arquivo de configuração para o banco Timidity++"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/ro.po -> deadbeef-1.9.6.tar.bz2/po/ro.po Changed

@@ -1,2086 +1,2610 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Arthur Țițeică <arthur@psw.ro>, 2013
 # Arthur Țițeică <arthur.titeica@gmail.com>, 2013
-# Mișu Moldovan <dumol@l10n.ro>, 2014
+# Cristian Alexe <cristian.alexe@outlook.com>, 2017
+# Daniel <danny3@tutanota.com>, 2016
+# Daniel <danny3@tutanota.com>, 2016,2018,2021-2022
+# Dumitru Moldovan <dumol@gnome.org>, 2014,2016
+# Dumitru Moldovan <dumol@gnome.org>, 2014,2016
 # Mișu Moldovan <dumol@xfce.org>, 2012
 # Arthur Țițeică <arthur.titeica@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-08-02 12:24+0000\n"
-"Last-Translator: Mișu Moldovan <dumol@l10n.ro>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/ro/)\n"
-"Language: ro\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Daniel <danny3@tutanota.com>, 2016,2018,2021-2022\n"
+"Language-Team: Romanian (http://app.transifex.com/deadbeef-player/deadbeef-player/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%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1));\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Despre DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Utilizare: deadbeef opțiuni -- fișier(e)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Istoricul modificărilor DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Opțiuni:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Traducători DeaDBeeF"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help sau -h Arată acest mesaj de ajutor și ieși\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Salvare presetări DeaDBeeF EQ"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Ieșire din lector\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Fișiere cu presetări DeaDBeeF EQ (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Arată detaliile versiunii și ieși\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Încărcare presetări DeaDBeeF EQ..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Pornește redarea\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Presetări DeaDBeeF EQ (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Oprește redarea\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Import de presetări EQ Foobar2000..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pune pauză redării\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Presetări Foobar2000 EQ (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Comută starea de pauză\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Salvare presetări"
+#: ../src/main.c:143
+#, 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"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Încărcare presetări"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Piesa următoare în lista de redare\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Import de presetări Foobar2000..."
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Piesa precedentă în lista de redare\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Activare"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Piesă aleatoare din lista de redare\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Zero tot"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Adaugă fișiere la lista de redare existentă\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Zero preamp"
+#: ../src/main.c:148
+#, 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"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Zero benzi"
+#: ../src/main.c:149
+#, 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"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Presetări"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " Sintaxă FMT prefixată cu %%: artist, titlu, album,\n lungime, număr piesă, y pentru an, comentariu,\n drepturi de autor, durată redată\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "o zi %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr "exemplu: --redareacum \"%%a - %%t\" ar trebui sa arate \"artist - titlu\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d zile %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " pentru mai multe detalii, consultați %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Oprit | %d piese | %s durată totală"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "NOTA: --redareacum nu mai este folosit.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr "--redareacum-tf FMT Afiseaza numele piesei formatate catre stdout, folosind noua formatare de titlu\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr "exemplu: --redareacum-tf \"%%artist%% - %%titlu%%\" ar trebui sa arate \"artist - titlu\"\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pauză | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d piese | %s durată totală"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Listă de redare nouă"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Listă de redare nouă (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Listă de redare cu file"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Listă de redare"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Separator (sus și jos)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Separator (stânga și dreapta)"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Implicit"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "File de liste de redare"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Proprietățile selecției"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Afișare copertă de album"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Da"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Scop"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nu"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Spectru"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Director cu rezultate:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Scrie în directorul pieselor originale"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Păstrează structura de directoare"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Buton"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr "Bară de căutare"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Re-etichetează după copiere"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr "Controale de redare"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Nume fișier rezultat:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "Bară de volum"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr "Voci sintetizate"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Codor:"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Nu s-a putut citi fișierul ce conține ajutorul"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Prestabilire DSP:"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Nu s-a putut încărca fișierul ce conține ajutorul"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Număr de fire de execuție:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Eșantionarea finală:"
+
+#: ../plugins/converter/converter.glade.h:14
+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 "Păstrează formatul original\n8 bit signed int\n16 bit signed int\n24 bit signed int\n32 bit signed int\n32 bit float"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Dacă fișierul există:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Sari\nArata\nRescrie"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Editare prestabilire codor"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Titlu:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Codor fără nume"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Extensie fișier rezultat:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "De ex. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Linie de comandă:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-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/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metodă:"
+
+#: ../plugins/converter/converter.glade.h:37
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
-"Playerul are în lucru unele sarcini în fundal. Dacă îl închideți acum, "
-"aceste sarcini vor fi întrerupte sau se vor pierde. E posibil să pierdeți "
-"anumite date."
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Dorești în continuare să renunți?"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Scriere de etichete"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Editor de prestabiliri DSP"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Titlu"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Prestabilire DSP fără nume"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Adăugare"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Ștergere"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Configurare"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Selectare modul DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Modul"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Prestabiliri"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Inclus %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Fișierul există deja. Doriți să îl suprascrieți?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Avertizare de la convertor"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Selectați un codor"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Eroare de convertire"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "În convertire..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Selectați un director..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Nu s-au putut salva prestabilirile codorului"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+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:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Există deja o prestabilire cu acest nume. Alegeți un alt titlu."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Eroare"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Adăugare codor nou"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Editare codor"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Elimină prestabilire"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Această acțiune va șterge prestabilirea selectată. Sigur doriți asta?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Avertizare"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Codoare"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Adaugare modul în lanțul DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Nu s-a putut salva prestabilirea DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Nouă prestabilire DSP"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Editare prestabilire DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Prestabiliri DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Ajutor"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Păstrează formatul sursei"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit signed int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit signed int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit signed int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Omite"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Întreabă"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Suprascrie"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Conector „pipe”"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Fișier temporar"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Fișier sursă"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nu s-a putut găsi fișierul pixmap: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Deschide fișier(e)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Adaugă fișier(e) în listă..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Adaugă dosar(e) în listă..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Încarcă listă de redare"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Salvează lista de redare ca"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Despre DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Istoricul modificărilor DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Traducători DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Tip de conținut"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Module"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Valoare nevalidă."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Tipul de conținut si câmpurile extensiilor trebuie să fie completate și să respecte regulile.\nExemplu de tip de conținut: 'audio/mpeg'.\nExemplu de id de extensie: 'stdmpg ffmpeg'.\nSpațiile trebuie folosite ca separatori în lista de id-uri de extensii.\nTipul de conținut trebuie să aiba doar litere, numere și semnul '-'.\nID-ul de extensie poate conține doar litere și numere."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Nu s-a selectat nimic."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Fișier"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Deschidere fișiere"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Adăugare fișiere"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Adăugare directoare"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Adăugare link"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Listă de redare nouă"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Încărcare listă de redare"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Salvare listă de redare"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Ieșire"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Editare"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Golire"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Selectare completă"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Deselectare completă"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Inversare a selecției"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Selecție"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Ștergere"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Decupare"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Căutare"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Sortare după"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Titlu"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Numărul piesei"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Artist"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Dată"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Aleatoare"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Personalizare..."
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Preferințe"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Vizualizare"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Bară de stare"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Egalizator"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "Mod design"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Jurnal"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Redare"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Ordine"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Liniară"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Piese amestecate"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Albume amestecate"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Repetare"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Repetare pentru listă"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Repetare pentru piesa curentă"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Fără repetare"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Amestecă"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Piste"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Albume"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Piste aleatorii"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Repetă"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Toate pistele"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "O pistă"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Lista se derulează la redare"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Selecția urmează redarea"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr "Oprire după piesa curentă"
+msgstr "Oprire după piesa actuală"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr "Oprire după albumul curent"
+msgstr "Oprire după albumul actual"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
-msgstr "Salt la piesa curentă"
+msgstr "Salt la piesa actuală"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Istoric"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Despre"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Traducători"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Căutare"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Stop"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Redare"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Pauză"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Înapoi"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Înainte"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Aleator"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Despre"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Ieșire"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Ajutor"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Proprietățile piesei"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Locație:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Opțiuni"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Aplică"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "În_chide"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metadate"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Proprietăți"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Titlu:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Renunță"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Introduceți aici un nou titlu pentru coloană"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Tip:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Index de elemente"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "În redare"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Copertă album"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artist - Album"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Durată"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Numărul piesei"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Formație / Album Artist"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Format sortare:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(dacă nu este gol)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Aliniere:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Stânga"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Dreapta"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Renunță"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Stânga\nDreapta\nCentrală"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Culoare text:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Modul de ieșire audio:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Dispozitiv de ieșire audio:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 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:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Transformă întotdeauna audio pe 16 biți în 24 de biți"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Rată de eșantionare țintă:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Sunet"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Mod ReplayGain:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Dezactivat"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Mod sursă:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Piesă"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Scalare pentru vârfurile ReplayGain"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Se procesează:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Atenție\nAplicați câștigul\nAplicați câștigul și preveniți tăierea conform vârfului\nDoar preveniți tăierea"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Preamplificare ReplayGain"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Preamplificare globală:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "Câștig la redare"
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 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:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "La pornire se reîncarcă sesiunea precedentă"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 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:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr "Opțiunea de oprire după piesa curentă nu persistă"
+msgstr "Opțiunea de oprire după piesa actuală nu persistă"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr "Opțiunea de oprire după albumul curent nu persistă"
+msgstr "Opțiunea de oprire după albumul actual nu persistă"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Redare"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Configurare"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
-msgstr "Presetări lanț DSP:"
+msgstr "Prestabiliri lanț DSP:"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "Înca_rcă"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "Procesare"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Minimizare în zona de notificare la închiderea ferestrei"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Fără iconiță în zona de notificare"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr "Detecție automată pentru codarea japoneză SHIFT-JIS"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Activează detecția și recodarea pentru CP1251 (Rusia)"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Activează detecția si recodarea pentru CP936 (China)"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Frecvență de reîmprospătare a interfeței (per secundă):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Text în bara de titlu la redare:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Text în bara de titlu în pauză:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr "Modul GUI (modificările necesită repornire):"
+msgstr "Modul interfață grafică (modificările necesită repornire):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "Lector"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr "Închide listele de redare cu butonul de clic mijloc"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Desenează piesa care rulează folosind un font îngroșat"
-
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr "Fără „Ștergere de pe disc” în meniul contextual"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Denumire automată pentru liste la adăugarea unui singur director"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr "Dimensionare automată a coloanelor pentru a se încadra în fereastră"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pixeli"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Listă de redare"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "GUI/Altele"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Suprascriere"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Prim-plan"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Fundal"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Culorile barelor de redare și volum"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Între"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Deschis"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Închis"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Bază"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Text"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Culorile taburilor"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-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:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Rând par"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Rând impar"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Rând selectat"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Text selectat"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Bare"
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Selecție"
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Fundal (EG)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Bara de sărire/Bara de volum/EG"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Bază:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Întunecat:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Luminos:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Mijloc:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Text:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Aldin"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Cursiv"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Text în redare:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Text selectat:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Portiunea filei"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Pistă(e) normale:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Pistă în redare:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Piste selectate:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Coloane:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Antetul grupului:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Prim plan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Par:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Impar:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Selectat:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Cursor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Fundal:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Rescrie (inlatura GTK tema treeview, dar accelereaza redarea)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Vizualizări"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Aspect"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Culorile listei de redare"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Culori"
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
-msgstr "Activare server proxy"
+msgstr "Activare servitor proxy"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
-msgstr "Adresă server proxy:"
+msgstr "Adresă servitor proxy:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
-msgstr "Port server proxy:"
+msgstr "Port servitor proxy:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Tip proxy:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Utilizator proxy:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Parolă proxy:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "Editează mapările Content-Type"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Rețea"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "Acceleratori folosiți:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Acțiune:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Nesetat>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Combinație de taste:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Accelerator global"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"Folosește butonul Aplică pe a salva modificările,\n"
-"sau butonul Revenire pentru a anula modificările.\n"
-"Modificările NU vor fi salvate\n"
-"dacă nu vei apăsa Aplică."
+msgstr "Utilizați butonul „Aplică” pentru a salva modificările ori butonul „Restaurează” pentru a le anula. Modificările nu vor fi salvate\ndacă nu folosiți butonul „Aplică”."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "_Implicit"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Acceleratori"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Versiune:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Informații"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Licență"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Drepturi de autor"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Restabilește la implicite"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Module"
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Versiune:"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr "Titlu personalizat"
+msgstr "Stabilire titlu personalizat"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Grupează după ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Sortează după ..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Format"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Crescătoare"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Descrescătoare"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Selectare modul DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Modul"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Ascendent\nDescendent"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Opțiuni pentru scrierea etichetelor"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Scrie ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Scrie ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Scrie APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Șterge ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Șterge ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Șterge APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Versiune ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (recomandată)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Recomandat)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Codare ID3v1 (implicit iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Scrie ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "Mapăre Content-Type"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"Această tabela definește legătura dintre tipurile de conținut ale fluxului "
-"de rețea și extensiile de decodare ale DeaDBeeF. De exemplu, fișierele mp3 "
-"pot avea tipul de conținut \"audio/x-mpeg\", și trebuie decodate de către "
-"extensia \"stdmpg\" proprie DeaDBeeF, sau de către extensia \"ffmpeg\"."
+msgstr "Acest tabel definește asocierile dintre tipurile de conținut ale fluxurilor de rețea și modulele DeaDBeeF. De exemplu, fișierele MP3 pot avea tipul de conținut „audio/x-mpeg” și pot fi decodate de către modulele „stdmpg” ori „ffmpeg”."
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Resetare la setări implicite"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "Tip de conținut:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Extensii:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Proprietățile butonului"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Culoare:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Culoare text:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Pictogramă:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Etichetă:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Alege acțiune"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
+msgstr "Acest dialog permite setarea de titlu personalizat pentru orice pista Acest lucru este cel mai util pentru posturile de radio. O opțiune pentru a seta titlul personalizat este de asemenea prezent in caseta \"Adaugare Locatie\". Titlul in sine este vizibil în coloanele care afiseaza campul de metadate \"Artist\". Ar trebui sa arate ca \"personalizat artist\", in cazul în care campul Artist este prezent, sau pur și simplu \"personalizat\" in caz contrar."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Editare"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
 msgstr ""
-"Acest dialog vă permite să alegeți un nume personalizat pentru orice pistă, "
-"ceea ce poate fi folositor la redarea stațiilor radio. O opțiune pentru a "
-"alege un titlu personalizat este prezentă și în dialogul „Adăugați un link”. "
-"Titlul va fi vizibil în coloanele ce afișează câmpul „Artist” în formatul "
-"„personalizat artist” dacă este prezent câmpul „Artist” sau doar "
-"„personalizat”, dacă nu e prezent."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artist / Album"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Adăugare câmp nou..."
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Nr. piesă"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr "Adăugare în coada de redare"
-
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr "Ștergere din coada de redare"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Nume câmp:"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr "Reîncarcare metadate"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Valoare câmp:"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr "Ștergere de pe disc"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Adăugare coloană"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "Jurnal DeaDBeeF"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Editare coloană"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Curăță"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Ștergere coloană"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Progres scanare Câștig la redare"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr "Fixează grupurile la defilare"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Fișier actual:"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Grupează după"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Stare"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Fără"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Renunță"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Artist/Dată/Album"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Rezultate scanare Câștig la redare"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Deschide fișier..."
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Configurare %s"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Dispozitiv audio implicit"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
-"Ai modificat setările pentru taste rapide dar nu ai salvat schimbările."
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr "Ești sigur că vrei să continui fără să salvezi?"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Adăugare fișiere..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Inițializare..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Ați modificat datele acestei piese."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Salvare prestabiliri EG DeaDBeeF"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Sigur doriți să închideți fereastra?"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Fișiere cu prestabiliri EG DeaDBeeF (*.ddbeq)"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Valori multiple"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Încărcare prestabiliri EG (egalizator) DeaDBeeF..."
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Cheie"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Prestabiliri EG (egalizator) DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Valoare"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Import de prestabiliri EG (egalizator) Foobar2000..."
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Valori multiple"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Prestabiliri EG (egalizator) Foobar2000 (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Se scriu etichetele..."
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Salvare prestabiliri"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Nume câmp"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Încărcare prestabiliri"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Nume:"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Import de prestabiliri Foobar2000..."
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Numele câmpurilor nu pot începe cu : sau _"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Activare"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Nu s-a putut adăuga câmpul"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Zero tot"
 
-#: ../plugins/gtkui/trkproperties.c:784
-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/eq.c:327
+msgid "Zero Preamp"
+msgstr "Zero preamp"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Adăugare câmp"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Ștergere câmp"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Zero benzi"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Utilizare: deadbeef opțiuni -- fișier(e)\n"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Listă de redare nouă"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opțiuni:\n"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Formate de sunet suportate"
 
-#: ../main.c:92
-#, 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"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Toate fișierele (*)"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Ieșire din player\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Arată detaliile versiunii și ieși\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Toate fișierele"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Pornește redarea\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Alte fișiere (*)"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Oprește redarea\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Fișiere de listă DeadBeeF (*.dbpl)"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pune pauză redării\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Urmărește legăturile"
 
-#: ../main.c:98
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Comută starea de pauză\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "o zi %d:%02d:%02d"
 
-#: ../main.c:99
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d zile %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "timpul total de redare"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Pauzat"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
 msgstr ""
-" --play-pause Pornește redarea dacă e cazul sau comută starea de "
-"pauză\n"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Piesa următoare în lista de redare\n"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Oprit"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Piesa precedentă în lista de redare\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Redenumește lista de redare"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Piesă aleatoare din lista de redare\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
 
-#: ../main.c:103
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Adaugă fișiere la lista de redare curentă\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../main.c:104
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
+msgid "New Playlist (%d)"
+msgstr "Listă de redare nouă (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Listă de redare cu file"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Separator (sus și jos)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Separator (stânga și dreapta)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "File"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "File de liste de redare"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Proprietățile selecției"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Afișare copertă de album"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spectru"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Buton"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Bară de căutare"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Controale de redare"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Bară de volum"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Voci sintetizate"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Vizualizator jurnal"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Nu s-a putut citi fișierul ce conține ajutorul"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Nu s-a putut încărca fișierul ce conține ajutorul"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Lectorul are în lucru unele sarcini în fundal. Dacă îl închideți acum, aceste sarcini vor fi întrerupte sau se vor pierde. E posibil să pierdeți anumite date."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Sigur doriți să ieșiți?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-" --gui MODUL Precizează ce modul GUI să fie utilizat, implicit "
-"\"GTK2\"\n"
 
-#: ../main.c:105
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
-" --nowplaying FMT Arată în ieșirea standard numele formatat al piesei\n"
 
-#: ../main.c:106
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
 #, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-" Sintaxă FMT prefixată cu %%: artist, titlu, "
-"album,\n"
-" lungime, număr piesă, y pentru an, "
-"comentariu,\n"
-" drepturi de autor, durată redată\n"
 
-#: ../main.c:109
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
 #, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
-" de ex.: --nowplaying \"%%a - %%t\" va rezulta în "
-"\"artist - titlu\"\n"
 
-#: ../main.c:110
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
 #, c-format
-msgid " for more info, see %s\n"
-msgstr " pentru mai multe detalii, consultați %s\n"
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Implicit"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Da"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Ștergere"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Nu"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Stânga"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/interface.c:1415
+msgid "Right"
+msgstr "Dreapta"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Centru"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
 msgstr ""
-"Stânga\n"
-"Dreapta"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 msgstr ""
-"Dezactivare\n"
-"Piesă\n"
-"Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
 msgstr ""
-"Ascendent\n"
-"Descendent"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
-"2.3 (Recomandat)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
 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ăugați un CD audio"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "După ordinea de redare"
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Căutare pe Last.fm"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Piesă"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Utilizează reeșantionare ALSA"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Fără"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Eliberează dispozitivul la oprirea redării"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Aplică câștigul"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Mărime preferată pentru memoria tampon"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Mărime preferată pentru perioadă"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Doar previne tăierea"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Activare Scrobbler"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Crescătoare"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Dezactivare „nowplaying”"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Descrescătoare"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Utilizator"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (recomandată)"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Parolă"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "URL Scrobble"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artist / Album"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Preferă câmpul Artist al albumului"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Nr. piesă"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Fișierul dispozitivului"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Durată"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Soluție alternativă pentru problema ratei de eșantionare OSS4"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Index de elemente"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Perioadă de actualizare pentru cache (ore)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "În redare"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Extrage din etichetele încorporate"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Copertă album"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Extrage din directorul local"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artist - Album"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Mască pentru fișierele local cu coperte"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Extrage de la Last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Extrage de la albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Scalează copertele după lungime"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Utilizează CDDB/FreeDB"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "An"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Preferă CD-Text înaintea CDDB"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Numărul piesei"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "Server CDDB (de ex. „freedb.org”)"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Port CDDB (de ex. „888”)"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Preferă protocolul CDDB înaintea HTTP"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Formație / Album Artist"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Activează suportul pentru imagini NRG"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codec"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Calitatea reeșantionării (0-2, 2 e calitate maximă)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "Output 8-bit (implicit e 16)"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Rata de biți"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Durată maximă pentru o piesă (în minute)"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Adăugare coloană"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Durata estompării audio (sec)"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Editare coloană"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Numărul de repetări pentru un loop (dacă e cazul)"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Ștergere coloană"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Cere confirmare pentru ștergerea fișierelor de pe disc"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Fixează grupurile la defilare"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Prag de control al volumului prin iconița din zona de notificare"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Grupează după"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Iconiță personalizată pentru zona de notificare"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artist/Dată/Album"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Execută gtk_init cu --sync (mod de depanare)"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Adaugă separatori între elementele modulelor din meniul contextual"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Format pentru titlul notificării"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Format pentru conținutul notificării"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Reîncarcare metadate"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Arată copertele albumelor"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Mărime pentru copertele albumelor (px)"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Server PulseAudio"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Rată de eșantionare"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Cale relativă pentru tabelul de căutare"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Înlătură lista de redare"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Cale absolută pentru tabelul de căutare"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Adaugă o nouă listă de redare"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Inversează biții audio (comutați dacă auziți doar zgomot alb)"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Activează sortarea automată"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Activare HVSC Songlength DB"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (din HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Biți per eșantion (8 sau 16)"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Deschide fișier..."
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Lungime implicită pentru piese (sec)"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Configurare %s"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Fișier de configurare a bancurilor Timidity++"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Ați schimbat opțiunile tastelor rapide, dar nu ați salvat modificările."
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Titlu piesă"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Sigur doriți să continuați fără să salvați?"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Interpret"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Dispozitiv audio implicit"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Număr de piese"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Adăugare fișiere..."
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Gen"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Inițializare..."
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Compozitor"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Număr de disc"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Nume"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Comentariu"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Câștig album"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Câștig pistă"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Vârf album"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Vârf pistă"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Succes"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Fișierul nu a fost găsit"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Fișierul nu este valid"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Căutare (%list_total% rezultate)"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Codor / Comerciant"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Arată titlul coloanelor"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Locație"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Valoare"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Index sub-piesă"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Ați modificat datele acestei piese."
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tip(uri) de etichete"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Sigur doriți să închideți fereastra?"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Cuesheet încorporat"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Valori multiple"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Codec"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Cheie"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Extensii de fișiere (separate prin ;)"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Valori multiple"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Convertire"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Se scriu etichetele..."
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Rată de eșantionare țintă"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Calitate / Algoritm"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Rată de eșantionare automată (suprascrie rata țintă)"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Nume câmp"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr "Comenzi shell personalizate…"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Nume:"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Dezactivează redarea continuă (scanare mai rapidă)"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Numele câmpurilor nu pot începe cu : sau _"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "Preferă Ken emu înaintea Satoh (fără surround)"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Nu s-a putut adăuga câmpul"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Activare surround"
+#: ../plugins/gtkui/trkproperties.c:1267
+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/converter/convgui.c:84
+#: ../plugins/gtkui/widgets.c:460
 #, c-format
-msgid "Built-in %s"
-msgstr "Inclus %s"
+msgid "Widget \"%s\" is not available"
+msgstr "Widgetul „%s” nu este disponibil"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Fișierul există deja. Doriți să îl suprascrieți?"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Înlocuiește cu..."
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Avertizare de la convertor"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Adaugă..."
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Selectați un codor"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Taie"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Eroare de convertire"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Copiază"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "În convertire..."
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Lipește"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Selectați un director..."
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Părinte"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Nu s-au putut salva presetările codorului"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Nu există suport pentru mai multe widgeturi de acest tip"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 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:771 ../plugins/converter/convgui.c:1324
-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:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Eroare"
-
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Adăugare codor nou"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Editare codor"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Ștergere codor"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-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/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Codoare"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Adaugare modul în lanțul DSP"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Nu s-a putut salva predefiniția DSP"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Nouă presetare DSP"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Editare presetare DSP"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Presetări DSP"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Director cu rezultate:"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Scrie în directorul pieselor originale"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Păstrează structura de directoare"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Nume fișier rezultat:"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "2x"
 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:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Codor:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Presetare DSP:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Număr de fire de execuție:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Eșantionarea finală:"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Păstrează formatul sursei"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit signed int"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit signed int"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit signed int"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit signed int"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit float"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Dacă fișierul există:"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Întreabă"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Suprascrie"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Editare presetare codor"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Codor fără nume"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Extensie fișier rezultat:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "De ex. mp3"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Linie de comandă:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
-"Exemplu: lame - %o\n"
-"%i pentru fișierul input, %o pentru fișierul rezultat, - pentru stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
-"%o - nume fișier rezultat\n"
-"%i - nume fișier temporar de input"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Metodă:"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Conector „pipe”"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Fișier temporar"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Omogen"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Extinde"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Umple"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Scriere de etichete"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Editor de presetări DSP"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Presetare DSP fără nume"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Voci:"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Adăugare"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/hotkeys/actionhandlers.c:827
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nu s-a putut găsi fișierul pixmap: %s"
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
-"Păstrează formatul 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"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
-"Întreabă\n"
-"Suprascrie"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
-"Pipă\n"
-"Fișier temporar"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Elemente"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Navigare în listele de redare"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "Comenzi shell personalizate"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Editare"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2103,10 +2627,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"O comandă shell oarecare ce va fi executată în interpretorul shell în care a "
-"fost pornit DeaDBeeF. Se poate utiliza formatarea titlului. De exemplu: xdg-"
-"open %D"
+msgstr "O comandă shell oarecare ce va fi executată în interpretorul shell în care a fost pornit DeaDBeeF. Se poate utiliza formatarea titlului. De exemplu: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2121,11 +2642,9 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"Numele comenzii, în mod obișnuit ar trebui să fie ceva scurt, de exemplu "
-"\"youtube_open\". Trebuie să fie unic."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Numele comenzii, în mod obișnuit ar trebui să fie ceva scurt, de exemplu \"youtube_open\". Trebuie să fie unic."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2183,19 +2702,12 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
-"Dacă doriți să adăugați comanda în meniul principal, asigurați-vă că "
-"titlul conține calea din meniu, de exemplu „File/Comanda Mea”, unde «File» "
-"este numele în engleză al elementului din meniu."
+msgstr "Dacă doriți să adăugați comanda în meniul principal, asigurați-vă că titlul conține calea din meniu, de exemplu „File/Comanda Mea”, unde «File» este numele în engleză al elementului din meniu."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Adăugare coloană"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Ștergere"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Această acțiune va șterge comanda shell selectată. Sigur doriți asta?"
@@ -2221,197 +2733,1240 @@
 msgid "Invalid Values"
 msgstr "Valori nevalide"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Formate de sunet suportate"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Toate fișierele (*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Deschide fișier(e)..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Titlu piesă"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Adaugă fișier(e) în listă..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Interpret"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Adaugă dosar(e) în listă..."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Număr de piese"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Urmărește legăturile"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Gen"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Compozitor"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Șterge fișierele de pe disc"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Număr de disc"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Total discuri"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Comentariu"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Codor / Comerciant"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Drepturi de autor"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Locație"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Index sub-piesă"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tip(uri) de etichete"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Cuesheet încorporat"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-"Fișierele se vor pierde. Continui?\n"
-"(Acest mesaj poate fi dezactivat în setările extensiei GTKUI)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Încarcă listă de redare"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Alte fișiere (*)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Salvează lista de redare ca"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Preferă Ken emu înaintea Satoh (fără surround)"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Fișiere de listă DeadBeeF (*.dbpl)"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Activare surround"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Tip de conținut"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Utilizează reeșantionare ALSA"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Valoare nevalidă."
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Mărime preferată pentru memoria tampon"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Mărime preferată pentru perioadă"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
-"Tipul de conținut si câmpurile extensiilor trebuie să fie completate și să "
-"respecte regulile.\n"
-"Exemplu de tip de conținut: 'audio/mpeg'.\n"
-"Exemplu de id de extensie: 'stdmpg ffmpeg'.\n"
-"Spațiile trebuie folosite ca separatori în lista de id-uri de extensii.\n"
-"Tipul de conținut trebuie să aiba doar litere, numere și semnul '-'.\n"
-"ID-ul de extensie poate conține doar litere și numere."
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Nu s-a selectat nimic."
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Extrage din etichetele încorporate"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr "Widgetul „%s” nu este disponibil"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Extrage din directorul local"
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Înlocuiește cu..."
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Obține de la Last.fm"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Adaugă..."
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Obține de la MusicBrainz"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Taie"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Obține de la Albumart.org"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Copiază"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Lipește"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr "Nu există suport pentru mai multe widgeturi de acest tip"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Blochează mișcarea"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Mută fila spre stânga"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Mută fila spre dreapta"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Înlătură fila"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Redenumește fila"
-
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Adaugă o nouă filă"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "lăsați gol"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Arată titlul coloanelor"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Extinde setul cu 1 element"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "Micșorează setul cu 1 element"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Omogen"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Extinde"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Umple"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Configurează buton"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr "Voci:"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Editează lista de redare"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Redenumește lista de redare"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Înlătură lista de redare"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Adaugă o nouă listă de redare"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Nume"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Fișier"
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "Navigator liste de redare"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Adăugare CD audio"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Preferă CD-Text înaintea CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Activează suportul pentru imagini NRG"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr ""
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Convertire"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Calitate / Algoritm"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "Ieșire pe 8-biți"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Extensii de fișiere (separate prin ;)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Durată maximă pentru o piesă (în minute)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Durata estompării audio (sec)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Numărul de repetări pentru un loop (dacă e cazul)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "Câștig la redare"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Informații Câștig la redare"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Scanează câștigul pistei pentru fiecare fișier"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Scanarea câștigul pistei pentru fiecare fișier dacă nu a fost scanat"
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Deselectează toate"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Selectează toate"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Adăugare locație"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Adăugare dosar(e)"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Adăugare fișier(e)"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Deschide fișier(e)"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Următorul mod de repetare"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Repetare - Oprită"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Repetare - O singură pistă"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Repetare - Toate"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Vizualizare"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Cere confirmare pentru ștergerea fișierelor de pe disc"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Prag de control al volumului prin iconița din zona de notificare"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Iconiță personalizată pentru zona de notificare"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Adaugă separatori între elementele modulelor din meniul contextual"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Sări la"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Mută"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Mută pistele în jos"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Mută pistele în sus"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Redă\\/Pauzează"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Activare Scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Dezactivare „nowplaying”"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Utilizator"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Parolă"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "URL Scrobble"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Preferă câmpul Artist al albumului"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Partea din spate"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Format pentru titlul notificării"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Format pentru conținutul notificării"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Arată copertele albumelor"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Mărime pentru copertele albumelor (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Fișierul dispozitivului"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Codare nume dispozitiv"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Definit mai jos"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Rată de eșantionare"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr ""
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Comenzi shell personalizate…"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Cale relativă pentru tabelul de căutare"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Cale absolută pentru tabelul de căutare"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Inversează biții audio (comutați dacă auziți doar zgomot alb)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Activare HVSC Songlength DB"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Lungime implicită pentru piese (sec)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Activează jurnalizarea"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Fișier de configurare a bancurilor Timidity++"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-0.6.2.tar.bz2/po/si_LK.po -> deadbeef-1.9.6.tar.bz2/po/si_LK.po Changed

@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Amith Chinthaka <amith@compsoc.lk>, 2013
 # Amith Chinthaka <amith@compsoc.lk>, 2013
@@ -9,893 +9,1452 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/"
-"deadbeef-player/language/si_LK/)\n"
-"Language: si_LK\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Amith Chinthaka <amith@compsoc.lk>, 2013\n"
+"Language-Team: Sinhala (Sri Lanka) (http://app.transifex.com/deadbeef-player/deadbeef-player/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "DeaDBeeF පිළිබඳ විස්තර %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "භාවිතය: deadbeef විකල්ප -- ගොනු(ව)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s වෙනස්කම් ලොගය"
+msgid "Options:\n"
+msgstr "විකල්ප:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF පරිවර්තකයින්"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr "--help හෝ -h ආධාරක විස්තර (මෙම පණිවිඩය) දර්ශනය කර ඉවත් වන්න\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "DeaDBeeF සමකාරක සැකසුම් සුරකින්න"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr "--quit ධාවකයෙන් ඉවත්වන්න\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF සමකාරක සැකසුම් ගොනුව (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr "--version සංස්කරණ තොරතුරු දර්ශනය කර ඉවත් වන්න\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "DeaDBeeF සමකාරක සැකසුම් විවෘත කරන්න"
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr "--play ගීත ධාවනය අරඹන්න\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF සමකාරක සැකසුම් (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr "--stop ගීත ධාවනය නවත්වන්න\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Foobar2000 සමකාරක සැකසුම් ලබාගන්න..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr "--pause ගීත ධාවනය මදකට නතර කරන්න\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 සමකාරක සැකසුම් (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr "--toggle-pause ධාවනය මදකට නතර කිරීම හා නැවත ධාවනය කිරීම\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "සැකසුම සුරකින්න"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr "--play-pause ගීත ධාවනය නවතා ඇත්නම් ධාවනය අරභන්න, නැතිනම් ධාවනය මදකට නවත්වන්න\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "සැකසුම විවෘත කරන්න"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr "--next ගීත ලැයිස්තුවේ ඇති ඊළඟ ගීතය ධාවනය කරන්න\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 සැකසුම් ලබාගන්න"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr "--prev ගීත ලැයිස්තුවේ කළින් ඇති ගීතය ධාවනය කරන්න\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "සක්‍රීය කරන්න"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr "--random ගීත ලැයිස්තුවේ ඇති ගීත සසම්භාවී ලෙස ධාවනය කරන්න\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "සියල්ල ශුන්‍යය කරන්න"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr "--queue පවතින ගීත(ය) ලැයිස්තුවට නව ගොනු එකතු කරන්න\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "පූර්ව වර්ධකය ශුන්‍යය කරන්න"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr "--gui PLUGIN භාවිතා කිරීමට අවශ්‍යය අතුරු මුහුණත සඳහන් කරන්න, සාමාන්‍යයෙන් භාවිතා කරන්නේ \\\"GTK2\\\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "කලාප ශුන්‍යය කරන්න"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr "--nowplaying FMT සම්මත ප්‍රතිදානයට ගීතයේ ආකෘතීකරණය කරන ලද නම දර්ශනය කරන්න\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "සැකසුම්"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr "FMT %%-ආකෘතිය: ගායන ශිල්පියාa, ගීත නාමයt, ඇල්බමයb,\n\nධාවන කාලයl, ගීත අංකයn, වර්ෂයy, අදහස් දැක්වීම්c,\n\nපිටපත් කිරීමේ අයිතියr, ධාවනය කිරීමට ඉතිරිව ඇතිe\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "දිනක් %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "දින %d %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Stopped | %d tracks | %s මුළු ධාවන කාලය"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "එකම ශබ්දය දෙපසින්ම ඇසීම"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "ශබ්ද දෙකක් දෙපසින් ඇසීම"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps"
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "මදකට නවතා ඇත |"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, 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:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "නව ගීත ලැයිස්තුව"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:161
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "නව ගීත ලැයිස්තුව (%d)"
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "ටැබ සහිත ගීත ලැයිස්තුව"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "ගීත ලැයිස්තුව"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "විභේදකය (ඉහළ සහ පහළ)"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "විභේදකය (වම සහ දකුණ)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "ගීත ලැයිස්තු ටැබ"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "සාමාන්‍ය භාවිතය"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "වරණ සතු ගුණාංග"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "එකම ශබ්දය දෙපසින්ම ඇසීම"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "ඇල්බම රූප දර්ශනය"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "ශබ්ද දෙකක් දෙපසින් ඇසීම"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "බලපවත්නා අවකාශය"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "ඔව්"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "වර්ණාවලිය"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "නැහැ"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "ප්‍රතිදාන ෆෝල්ඩරය:"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "ගීත අඩංගු ෆෝල්ඩරයට ලියන්න"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "බොත්තම"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "සංරක්ෂිත ෆෝල්ඩර ආකෘතිය"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "ප්‍රතිදාන ගොනු නාමය:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "ආකේතකය:"
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP පෙර සැකසුම"
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "සමාන්තරව ක්‍රියාත්මක වන වැඩසටහන් ගණන:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "ප්‍රතිදාන ආකෘති ආදර්ශය:"
+
+#: ../plugins/converter/converter.glade.h:14
+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\nබිට් 8 ලකුණු සහිත නිඛිල\n\nබිට් 16 ලකුණු සහිත නිඛිල\n\nබිට් 24 ලකුණු සහිත නිඛිල\n\nබිට් 32 ලකුණු සහිත නිඛිල\n\nබිට් 32 ලකුණු සහිත දශම"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "ගොනුව පවතින විට:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "උපකාරක ගොනුව කියවීමට අසමත් විය"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "ආකේතක පෙර සැකසුම් සංස්කරණය කරන්න"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "උපකාරක ගොනුව විවෘත කිරීමට නොහැකි විය"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "ශීර්ෂය:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "නම් නොකල ආකේතකය"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "ප්‍රතිදාන ගොනු දිගුව:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "උදා. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "විධාන අතුරු මුහුණත"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "උදාහරණය: සිත් නොගන්නා - %o\n\nආදාන ගොනු සඳහා %i, ප්‍රතිදාන ගොනු සඳහා %o, -සම්මත ආදානය සඳහා"
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - ප්‍රතිදාන ගොනු නාමය\n\n%i - තාවකාලික ආදාන ගොනු නාමය"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "ක්‍රම:"
+
+#: ../plugins/converter/converter.glade.h:37
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "ඔබට තවමත් වසා දැමීමට අවශ්‍යය ද?"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "ටැග් ලියනය"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP පෙර සැකසුම් සංස්කාරකය"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "මාතෘකාව"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "නම් නොකල DSP පෙර සැකසුම"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "එකතු කරන්න"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "ඉවත් කරන්න"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "හැඩගැස්වීම"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "DSP කෙවෙනි මෘදුකාංගය තෝරන්න"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "කෙවෙනි මෘදුකාංගය"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "සැකසුම්"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "ගොනුව දැනටමත් පවතී. එය මතම ලියන්නද?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "පරිවර්ථක අවවාදයක්"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "කරුණාකර ආකේතකය තෝරන්න"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "පරිවර්ථක දෝෂයක්"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "පරිවර්ථනය කරමින් පවතී..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "ෆෝල්ඩරය සුරකින්න..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "ආකේතක පෙර සැකසුම සුරැකීමට නොහැකි විය"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "පෙර සැකසුම් ෆෝල්ඩරයේ අවසරයන් පරීක්ෂා කරන්න, වෙනත් නාමයක් ලබා ගැනීමට උත්සාහ කරන්න, හෝ දෘඩ තැටියේ යම් ඉඩ ප්‍රමාණයක් නිදහස් කරන්න"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "මෙම නමින් තවත් පෙර සැකසුමක් දැනටමත් පවතී. වෙනත් නාමයක් ලබා දෙන්න."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "දෝෂයක්"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "නව ආකේතකය එකතු කරන්න"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "ආකේතකය සංස්කරණය කරන්න"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "පෙර සැකසුම ඉවත් කරන්න"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "මෙම ක්‍රියාව මඟින් තෝරන ලද පෙර සැකසුම මකාදැමීමට නියමිතයි. එය සිදුකරන්නද?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "අනතුරු ඇඟවීමයි"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "ආකේතක"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "DSP දාමයට කෙවෙනි මෘදුකාංගය ඇතුළත් කරන්න"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "DSP පෙර සැකසුම සුරැකීමට නොහැකි විය"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "නව DSP පෙර සැකසුම"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "DSP පෙර සැකසුම සංස්කරණය කරන්න"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP පෙර සැකසුම්"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "උදව්"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "ප්‍රභව ආකෘතිය පවත්වා ගන්න"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "බිට් 8 ඇති ලකුණු සහිත නිඛිල"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "බිට් 16 ඇති ලකුණු සහිත නිඛිල"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "බිට් 24 ඇති ලකුණු සහිත නිඛිල"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "බිට් 32 ඇති ලකුණු සහිත නිඛිල"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "බිට් 32 ඇති දශම"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Prompt"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "එය මත ලියන්න"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Pipe"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "%s pixmap ගොනුව සොයාගත නොහැකිය"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "ගොනු(ව) විවෘත කරන්න..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "ධාවන ලැයිස්තුවට ගොනු(ව) එකතු කරන්න..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "ධාවන ලැයිස්තුවට ෆෝල්ඩර(ය) එකතු කරන්න..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "ගීත ලැයිස්තුව විවෘත කරන්න"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "ගීත ලැයිස්තුව මෙනමින් සුරකින්න"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeaDBeeF පිළිබඳ විස්තර %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s වෙනස්කම් ලොගය"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF පරිවර්තකයින්"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "අන්තර්ගත-වර්ග:"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "කෙවෙනි මෘදුකාංගය"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "වලංගු නොවන අගය(න්)"
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "අන්තර්ගත-වර්ග සහ කෙවෙනි මෘදුකාංග ක්ෂේත්‍ර හිස්ව නොතැබිය යුතුය, සහ නියමයන්ට අනුකූල විය යුතුය.\n\nඋදාහරණ අන්තර්ගත-වර්ග: 'audio/mpeg'.\n\nඋදාහරණ කෙවෙනි මෘදුකාංග අනන්‍යතාවයන්: 'stdmpg ffmpeg'.\n\nකෙවෙනි අනන්‍යතා ලැයිතුවේදී හිස් තැනක් වෙන් කිරීමේ කාරකය ලෙස භාවිතා කල යුතුය.\n\nඅන්තර්ගත වර්ගයන් අකුරු, අංක සහ '-' සළකුණින් පමණක් සමන්විත යුතුය.\n\nමෘදුකාංග අනන්‍යතාවයන් සඳහා පැවතිය හැක්කේ අකුරු සහ අංක පමණකි."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "කිසිවක් වරණය කර නොමැත."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "ගොනුව _F"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "ගොනු(ව) විවෘත කරන්න _O"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "ගොනු(ව) එකතු කරන්න"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "ෆෝල්ඩර(ය) එකතු කරන්න"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "ස්ථානය එකතු කරන්න"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "නව ගීත ලැයිස්තුව"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "ගීත ලැයිස්තුව විවෘත කරන්න"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "ගීත ලැයිස්තුව සුරකින්න"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "ඉවත්වන්න _Q"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "සංස්කරණය _E"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "පිරිසිදු කරන්න _C"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "සියල්ල තෝරන්න"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "සියල්ල තේරීම ඉවත් කරන්න"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "තෝරාගත් පිළිවෙළ ප්‍රතිවර්ත කරන්න"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "වරණය"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "ඉවත් කරන්න"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "අවශ්‍ය පරිදි කපා හරින්න"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "සොයන්න _F"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "පිළිවෙළට සකස් කල යුත්තේ"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "මාතෘකාව"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "ගීතයේ අංකය"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "ඇල්බමය"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "ගායකයා"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "දිනය"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "සසම්භාවී"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "රිසි ආකාරයට සකසන්න"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "අභිමතය"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "දර්ශනය කරන්න _V"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "තත්ව දර්ශන තීරුව"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "සමකාරකය"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "සැළසුම් කිරීමේ ප්‍රකාරය"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "නැවත ධාවනය _P"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "අනුපිළිවෙළ"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "රේඛීය"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "ගීත කලවම් කරන්න"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "ඇල්බම කලවම් කරන්න"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "නැවත නැවත ධාවනය කිරීම"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "සියලු ගීත නැවත නැවත ධාවනය කරන්න"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "ගීය නැවත නැවත ධාවනය කරන්න"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "නැවත නැවත ධාවනය නොකරන්න"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "අනුචලන පිලිවෙළින් ධාවනය පෙන්වන්න"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "කර්සරය මගින් ධාවන පිළිවෙළ පෙන්වන්න"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "ධාවනය කල ගීතයට යොමුකරන්න"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "උදව් _H"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "වෙනස්කම් ලොගය _C"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "පිළිබඳ තොරතුරු _A"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "පරිවර්තක _T"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "සොයන්න"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "නවතන්න"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "ධාවනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "මදකට නතර කරන්න"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "පෙර ගීතය"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "මීළඟ ගීතය"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "අහඹු ලෙස ධාවනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "පිළිබඳ තොරතුරු"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "නවතන්න"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "උදව්"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "ගීතයේ තොරතුරු"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "ස්ථානය:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "සැකසුම්"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "යොදන්න _A"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "නිමා කරන්න _C"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "පාර-දත්ත"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "වත්කම්"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "ශීර්ෂය:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "අවලංගු කරන්න _C"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "හරි _O"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "නව සිරස් තීරු ශීර්ෂය මෙහි ඇතුළත් කරන්න"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "වර්ගය:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "අයිතම අංකය"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "වාදනය වෙමින් පවතී"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "ඇල්බම රූපය"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "ගායකයා - ඇල්බමය"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "පවත්නා කාලය"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "ගීත අංකය"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "සංගීත කණ්ඩායම / ශිල්පියා"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "ආකෘතිය:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "පෙළගැස්ම:"
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "වම"
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "දකුණ"
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "පෙළගැස්ම:"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "අවලංගු කරන්න _C"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "හරි _O"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "අකුරු වල පැහැය:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "ප්‍රතිදාන පේනු මෘදුකාංගය"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "ප්‍රතිදාන උපකරණය"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "සෑමවිට ම බිට් 8 ශ්‍රව්‍ය ගොනු බිට් 16 ට පරිවර්තනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "සෑමවිට ම බිට් 16 ශ්‍රව්‍ය ගොනු බිට් 24 ට පරිවර්තනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "ශබ්දය"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "ශබ්ද පරිපාලන ආකාරය"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "අක්‍රීය කරන්න"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "ගීතය"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "ශබ්ද පරිපාලනය ඉහළ පරාස වලින්"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "ශබ්ද පරිපාලන පූර්ව වර්ධකය"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "සමස්ත පූර්ව වර්ධකය"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "විධාන තීරුව (හෝ ගොනු කළමනාකරණය) මගින්, ගීත ලැස්තුවට ගොනු ඇතුලත් කිරීම"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "පටන්ගන්මෙදී, පෙර සැසිය නැවත අරඹන්න"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "ෆෝල්ඩර එකතු කිරීමේදී, සංරක්ෂණාගාරයෙන් එකතු නොකරන්න"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "නැවත ධාවනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "හැඩගැස්වීම"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "DSP දාම පිහිටුවීම"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "ප්‍රවේශනය _L"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "වසා තැටිය තුලට හකුලුවන්න"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "පද්ධති තැටි අයිකනය සඟවන්න"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "රුසියානු CP1251 අනාවරණය කිරීම සහ ප්‍රතිකේතනය කිරීම සක්‍රීය කරන්න"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "චීන CP936 අනාවරණය කිරීම සහ ප්‍රතිකේතනය කිරීම සක්‍රීය කරන්න"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "අතුරු මුහුණත නැවුම් වීමේ අනුපාතය (තත්පරයකට වාර)"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "ධාවනය අතරතුර මාතෘකා තීරයේ ඇති වැකිය"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "ධාවනය නැවතූ විට මාතෘකා තීරයේ ඇති වැකිය"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "අතුරු මුහුණත් කෙවෙනිය (වෙනස් වීමට නැවත පණ ගැන්විය යුතුයි)"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "තනි ෆෝල්ඩරයක් තුළට එක් කිරීමේදී ගීත ලැයිස්තු වල නම් ස්වයංක්‍රීයව සකසන්න"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "ගීත ලැයිස්තුව"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "GUI/Misc"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "අතික්‍රමනය කරන්න"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "පෙරබිම"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "පසුබිම"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "සෙවුම් තීරු/ශබ්ද තීරු වර්ණ"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "මධ්‍යම පැහැ"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "ලා පැහැ"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "අඳුරු පැහැ"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "පාදම"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "පාඨය"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "පටි තීරු පැහැයන්"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "ප්‍රතික්ෂේප කරන්න (GTK රුක් දසුන් තේමාව නැතිවන නමුත් එය ගීතය පරිවර්ථනය පහසු කරවයි)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "ඉරට්ටේ පේළි"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "ඔත්තේ පේළි"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "තෝරාගත් පේළිය"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "තෝරාගත් අකුරු"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "කර්සරය"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "ගීත ලැයිස්තු පැහැයන්"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "පැහැයන්"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "නියුතු සේවාදායකය සක්‍රිය කරන්න"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "නියුතු සේවාදායක ලිපිනය:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "නියුතු සේවාදායක තොට:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "නියුතු සේවාදායක වර්ගය:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "නියුතු සේවාදායක භාවිත නාමය:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "නියුතු සේවාදායක මුරපදය:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP භාවිත ඒජන්තවරයා"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "අන්තර්ගත-වර්ග අතර සබැඳීම සංස්කරණය කරන්න"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "ජාලය"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "කෙටි යතුරු සංයෝජන ආදේශ කරන්න:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "ක්‍රියාවන්:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Not set>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "යතුරු සංයෝජන:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "ගෝලීය කෙටි යතුරු සංයෝජන"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -903,1184 +1462,1142 @@
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "කෙටි යතුරු සංයෝජන"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "සංස්කරණය"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "පිටපත් කිරීමේ අයිතිය"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "කෙවෙනි මෘදුකාංගය"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "සාමාන්‍යය භාවිත වලට නැවත සකසන්න"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "සංස්කරණය"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "සමුහ කල යුත්තේ ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "අනුපිළිවෙළට සකස් කල යුත්තේ ..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "ආකෘතිය"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "ආරෝහන"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "අවරෝහන"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "DSP කෙවෙනි මෘදුකාංගය තෝරන්න"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "කෙවෙනි මෘදුකාංගය"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "ආරෝහණ\n\nඅවරෝහණ"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "ටැග් ලියන සැකසුම්"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "ID3v2 ලියන්න"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "ID3v1 ලියන්න"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "APEv2 ලියන්න"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "ID3v2 ඉවත්කරන්න"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "ID3v1 ඉවත්කරන්න"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "APEv2 ඉවත්කරන්න"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 සංස්කරණය"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (නිර්දේශිත)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (නිර්දේෂිත)\n\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3vI සංකේත ආකේතනය (සාමාන්‍ය භාවිතය iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 ලියන්න"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "අන්තර්ගත-වර්ග අතර සබැඳීම"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"මෙම වගුව ජාලගත අන්තර්ගත වර්ග සහ DeaDBeeF හි විකේතක කෙවෙනි මෘදුකාංග අතර පවතින "
-"සහසම්බන්ධතාවයන් දැක්වීමට භාවිතා කරයි. උදාහරණ ලෙස, mp3 ගොනුවක \"audio/x-mpeg\" අන්තර්ගත "
-"වර්ගය පැවතිය හැකි අතර එය DeaDBeeF හි \"stdmpg\" හෝ \"ffmpeg\" කෙවෙනි මෘදුකාංග "
-"භාවිතයෙන් විකේතනය කල යුතුව පැවතිය හැකිය."
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "සාමාන්‍යය භාවිත වලට නැවත සකසන්න"
+msgstr "මෙම වගුව ජාලගත අන්තර්ගත වර්ග සහ DeaDBeeF හි විකේතක කෙවෙනි මෘදුකාංග අතර පවතින සහසම්බන්ධතාවයන් දැක්වීමට භාවිතා කරයි. උදාහරණ ලෙස, mp3 ගොනුවක \"audio/x-mpeg\" අන්තර්ගත වර්ගය පැවතිය හැකි අතර එය DeaDBeeF හි \"stdmpg\" හෝ \"ffmpeg\" කෙවෙනි මෘදුකාංග භාවිතයෙන් විකේතනය කල යුතුව පැවතිය හැකිය."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "අන්තර්ගත-වර්ග:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "කෙවෙනි මෘදුකාංග"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "බොත්තම් සතු ගුණාංග"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "වර්ණ:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "අකුරු වල පැහැය:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "අයිකන:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "ලේබල:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "ක්‍රියාව වරණය කරන්න"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "ගායකයා / ඇල්බම"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "සංස්කරණය කරන්න"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "ගීත අංකය"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "නව සිරස් තීරුවක් එකතු කරන්න"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "සිරස් තීරුව සංස්කරණය කරන්න"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "සිරස් තීරුව ඉවත් කරන්න"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "පාදක කරගෙන කණ්ඩායම් කිරීම"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "කිසිවක් නැත"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "ගයකයා/දිනය/ඇල්බමය"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "ගොනුව විවෘත කරන්න..."
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "වින්‍යාස කිරීම %s"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "සාමාන්‍යයෙන් භාවිතා කරන ශ්‍රව්‍ය උපාංගය"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "ගොනු එකතු කිරීම..."
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "ඇරඹීම..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "මෙම ගීතයට අදාළ දත්ත ඔබ විසින් වෙනස් කර ඇත."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "කවුළුව නිමාකිරීමට අවශ්‍යද?"
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "DeaDBeeF සමකාරක සැකසුම් සුරකින්න"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "බහු අගයන්"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF සමකාරක සැකසුම් ගොනුව (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "යතුර"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "DeaDBeeF සමකාරක සැකසුම් විවෘත කරන්න"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "වටිනාකම"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF සමකාරක සැකසුම් (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "බහු අගයන්"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 සමකාරක සැකසුම් ලබාගන්න..."
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "ටැග් ලිවීම..."
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 සමකාරක සැකසුම් (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "ක්ෂේත්‍ර නාමය"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "සැකසුම සුරකින්න"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "නම:"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "සැකසුම විවෘත කරන්න"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "ක්ෂේත්‍ර නාම : ලකුණකින් හෝ _ ලකුණකින් ආරම්භ නොකල යුතුය"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 සැකසුම් ලබාගන්න"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "ක්ෂේත්‍රය එකතු කල නොහැක"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "සක්‍රීය කරන්න"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "මෙනමින් දැනටමත් ක්ෂේත්‍රයක් පවතී, කරුණාකර වෙනත් නමක් භාවිතා කරන්න."
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "සියල්ල ශුන්‍යය කරන්න"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "ක්ෂේත්‍රය එකතු කරන්න"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "ක්ෂේත්‍රය ඉවත් කරන්න"
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "පූර්ව වර්ධකය ශුන්‍යය කරන්න"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "භාවිතය: deadbeef විකල්ප -- ගොනු(ව)\n"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "කලාප ශුන්‍යය කරන්න"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "විකල්ප:\n"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "නව ගීත ලැයිස්තුව"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr "--help හෝ -h ආධාරක විස්තර (මෙම පණිවිඩය) දර්ශනය කර ඉවත් වන්න\n"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "සහායක හඬ ආකෘති"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr "--quit ධාවකයෙන් ඉවත්වන්න\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "සියලුම ගොනු (*)"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr "--version සංස්කරණ තොරතුරු දර්ශනය කර ඉවත් වන්න\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr "--play ගීත ධාවනය අරඹන්න\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr "--stop ගීත ධාවනය නවත්වන්න\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "අනෙකුත් ගොනු (*)"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr "--pause ගීත ධාවනය මදකට නතර කරන්න\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF ගීත ලැයිස්තු ගොනු (*.dbpl)"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr "--toggle-pause ධාවනය මදකට නතර කිරීම හා නැවත ධාවනය කිරීම\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Symlinks අනුගමනය කරන්න"
 
-#: ../main.c:99
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr "--play-pause ගීත ධාවනය නවතා ඇත්නම් ධාවනය අරභන්න, නැතිනම් ධාවනය මදකට නවත්වන්න\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "දිනක් %d:%02d:%02d"
 
-#: ../main.c:100
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --next Next song in playlist\n"
-msgstr "--next ගීත ලැයිස්තුවේ ඇති ඊළඟ ගීතය ධාවනය කරන්න\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "දින %d %d:%02d:%02d"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr "--prev ගීත ලැයිස්තුවේ කළින් ඇති ගීතය ධාවනය කරන්න\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr "--random ගීත ලැයිස්තුවේ ඇති ගීත සසම්භාවී ලෙස ධාවනය කරන්න\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr "--queue පවතින ගීත(ය) ලැයිස්තුවට නව ගොනු එකතු කරන්න\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
 msgstr ""
-"--gui PLUGIN භාවිතා කිරීමට අවශ්‍යය අතුරු මුහුණත සඳහන් කරන්න, සාමාන්‍යයෙන් භාවිතා කරන්නේ \\"
-"\"GTK2\\\"\n"
 
-#: ../main.c:105
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr "--nowplaying FMT සම්මත ප්‍රතිදානයට ගීතයේ ආකෘතීකරණය කරන ලද නම දර්ශනය කරන්න\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../main.c:106
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
+msgid "New Playlist (%d)"
+msgstr "නව ගීත ලැයිස්තුව (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "ටැබ සහිත ගීත ලැයිස්තුව"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "විභේදකය (ඉහළ සහ පහළ)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "විභේදකය (වම සහ දකුණ)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "ගීත ලැයිස්තු ටැබ"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "වරණ සතු ගුණාංග"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "ඇල්බම රූප දර්ශනය"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "වර්ණාවලිය"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "බොත්තම"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "උපකාරක ගොනුව කියවීමට අසමත් විය"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "උපකාරක ගොනුව විවෘත කිරීමට නොහැකි විය"
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
 msgstr ""
-"FMT %%-ආකෘතිය: ගායන ශිල්පියාa, ගීත නාමයt, ඇල්බමයb,\n"
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "ඔබට තවමත් වසා දැමීමට අවශ්‍යය ද?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
 "\n"
-"ධාවන කාලයl, ගීත අංකයn, වර්ෂයy, අදහස් දැක්වීම්c,\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
 "\n"
-"පිටපත් කිරීමේ අයිතියr, ධාවනය කිරීමට ඉතිරිව ඇතිe\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../main.c:109
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
-"උදා: --nowplaying \"%%a - %%t\" විධානය \"ගායකයා හා ගීතයේ නම\" දර්ශනය කල යුතුය\n"
 
-#: ../main.c:110
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
 #, c-format
-msgid " for more info, see %s\n"
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "සාමාන්‍ය භාවිතය"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "ඔව්"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "නැහැ"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "මකා දමන්න"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "වම"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "දකුණ"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
 msgstr ""
-"අයිතම අංකය\n"
-"\n"
-"ධාවනය වෙමින් පවතී\n"
-"\n"
-"ඇල්බම රූපය\n"
-"\n"
-"ගායන ශිල්පියා - ඇල්බමය\n"
-"\n"
-"ගායන ශිල්පියා\n"
-"\n"
-"ඇල්බමය\n"
-"\n"
-"ගීතය\n"
-"\n"
-"කාලය\n"
-"\n"
-"ගීත අංකය\n"
-"\n"
-"කණ්ඩායම / ගායන ශිල්පියා\n"
-"\n"
-"රිසි ආකාරය"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
 msgstr ""
-"වම\n"
-"\n"
-"දකුණ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 msgstr ""
-"අක්‍රීය\n"
-"\n"
-"ගීතය\n"
-"\n"
-"ඇල්බමය"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
 msgstr ""
-"ආරෝහණ\n"
-"\n"
-"අවරෝහණ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
-"2.3 (නිර්දේෂිත)\n"
-"\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
 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"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Last.fm හි බලන්න"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "ගීතය"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "ALSA නැවත සාම්පල කිරීම භාවිතා කරන්න"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "කිසිවක් නැත"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "ධාවනය නවතා ඇති අතරේ උපාංගය නිදහස් කරන්න"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "වරණිත ආරෝධක ප්‍රමාණය"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "කැමති කාලාවර්ත ප්‍රමාණය"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Scrobbler සක්‍රීය කරන්න"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "ආරෝහන"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "nowplaying අක්‍රීය කරන්න"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "අවරෝහන"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "භාවිත නාමය"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (නිර්දේශිත)"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "මුර පදය"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble වෙබ් ලිපිනය"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "ගායකයා / ඇල්බම"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "ශිල්පී ක්ෂේත්‍රයේ ඇති කැමති ගායකයා"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "ගීත අංකය"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "උපාංග ගොනුව"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "පවත්නා කාලය"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 සාම්පල අනුපාතික දෝෂය මඟහැරයන්න"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "අයිතම අංකය"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "තාවකාලික මතක යාවත්කාලීන කාලාවර්තය (පැය)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "වාදනය වෙමින් පවතී"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "අන්තර්ගත ටැග් වලින් ලබා ගන්න"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "ඇල්බම රූපය"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "පරිස්ථානීය ෆෝල්ඩර වලින් ලබා ගන්න"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "ගායකයා - ඇල්බමය"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "ගොනු සඳහා පරිගණකයේ පවතින කවරයක් යොදන්න"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "last.fm හරහා ලබා ගන්න"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "albumart.org හරහා ලබා ගන්න"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "සිත්තම දිග පැත්තට දික් කරන්න"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "CDDB/FreeDB භාවිතා කරන්න"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "CD-Text, CDDB හරහා ඉදිරිපත් කරන්න"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "ගීත අංකය"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB වෙබ් ලිපිනය (උදා. 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB පෝර්ට් අංකය (උදා. '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "CDDB ප්‍රොටොකෝලය HTTP හරහා ඉදිරිපත් කරන්න"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "සංගීත කණ්ඩායම / ශිල්පියා"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "NGR රූප ගොනු සහාය සක්‍රීය කරන්න"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "ආකේතක විකේතක ක්‍රමය"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "නැවත සාම්පල කිරීමේ ගුණත්වය (0..2, වඩා වැඩිනම් හොඳයි)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "බිට් 8 ප්‍රතිදානය (සාමාන්‍ය භාවිතය බිට් 16)"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "ගීතයක උපරිම ධාවන කාලය (මිනිත්තු වලින්)"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "නව සිරස් තීරුවක් එකතු කරන්න"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "ගීතයක් ක්‍රමයෙන් නැතිවී යාමේ කාලය (තත්පර)"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "සිරස් තීරුව සංස්කරණය කරන්න"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "නැවත නැවත ධාවනය වීමේ වාර ගණන (ලබාගත හැකිනම්)"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "සිරස් තීරුව ඉවත් කරන්න"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "තැටියේ ඇති ගොනු මකා දැමීමට ප්‍රථම තහවුරු කර ගැනීමට විමසන්න"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "ශබ්ධය පාලනය කිරීමේ සංවේදීතා තත්වය සඳහා වූ සංකේතය"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "පාදක කරගෙන කණ්ඩායම් කිරීම"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "භාවිත තත්ව අයිකනය"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "ගයකයා/දිනය/ඇල්බමය"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "gtk_init වැරදි ඉවත් කිරීමේ ආකරය (--sync) සමඟ ක්‍රියාත්මක කරන්න"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "මෙනූ අයිකන අතර වෙන්කිරීමක් යොදන්න"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "දැනුම් දීමේ නාම ආකෘතිය"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "දැනුම් දීමේ අන්තර්ගතයන්ගේ ආකෘතිය"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "ඇල්බම සිතුවම් දර්ශනය කරන්න"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "ඇල්බම සිතුවම් වල ප්‍රමාණය (px)"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio සර්වරය"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "සාම්පල අනුපාතිකය"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "සාපේක්ෂ සෙවුම් වගුව ඇති ස්ථානය"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "නිරපේක්ෂ සෙවුම් වගුව ඇති ස්ථානය"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "ශ්‍රව්‍යය බයිට එකිනෙක මාරු කරන්න (ඔබට ශ්‍රවනය වන දේ වෙනසක් නැත්නම් නැවත මාරු කරන්න)"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "ගීත වල ධාවන කාලය අඩංගු HVSC දත්ත මූලය සක්‍රීය කරන්න"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (HVSC මඟින්)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "සාම්පලයකට ඇති බිට් ගණන (8 හෝ 16)"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "ගොනුව විවෘත කරන්න..."
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "ගීතයක සාමාන්‍ය ධාවන කාලය (තත්පර)"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "වින්‍යාස කිරීම %s"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ ගබඩා, වින්‍යාස ගොනුව"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "ගීත නාමය"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "ගායකයා"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "සාමාන්‍යයෙන් භාවිතා කරන ශ්‍රව්‍ය උපාංගය"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "සම්පූර්ණ ගීත ගණන"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "ගොනු එකතු කිරීම..."
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "ප්‍රභේදය"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "ඇරඹීම..."
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "තනු නිර්මාපකයා"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "තැටි අංකය"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "අදහස් දැක්වීම්"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "ආකේතකය / විකුණුම්කරු"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "ස්ථානය"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "උපගොනු අංකය"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "ටැග් වර්ග(ය)"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "එබ්බවූ, ගීත විහිදීම දැක්වෙන ගොනුව"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "ආකේතක විකේතක ක්‍රමය"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "ගොනු දිගු (';' ලකුණකින් වෙන් වූ)"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "පරිවර්ථනය කරන්න"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "තීරු ශීර්ෂයන් දර්ශනය කරන්න"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "ඉලක්ක සාම්පල අනුපාතිකය"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "වටිනාකම"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "තත්වය / ඇල්ගොරිතමය"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "මෙම ගීතයට අදාළ දත්ත ඔබ විසින් වෙනස් කර ඇත."
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "ස්වයංක්‍රීය Samplerate (ඉලක්ක Samplerate සංශෝධනය කරයි)"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "කවුළුව නිමාකිරීමට අවශ්‍යද?"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "බහු අගයන්"
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "යතුර"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "බහු අගයන්"
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "ටැග් ලිවීම..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "ගීත අතර නැවතීමක් නොමැතිව ධාවනය වීම අක්‍රීය කරන්න (ඉක්මන් පරිලෝකනය)"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "ශබ්දය වටෙන්ම ඇසීම ක්‍රියා කරන්නේ නැත"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "ක්ෂේත්‍ර නාමය"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "ශබ්දය වටෙන්ම ඇසීම සක්‍රීය කරන්න"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "නම:"
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "ක්ෂේත්‍ර නාම : ලකුණකින් හෝ _ ලකුණකින් ආරම්භ නොකල යුතුය"
 
-#: ../plugins/converter/convgui.c:84
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "ක්ෂේත්‍රය එකතු කල නොහැක"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "මෙනමින් දැනටමත් ක්ෂේත්‍රයක් පවතී, කරුණාකර වෙනත් නමක් භාවිතා කරන්න."
+
+#: ../plugins/gtkui/widgets.c:460
 #, c-format
-msgid "Built-in %s"
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "ගොනුව දැනටමත් පවතී. එය මතම ලියන්නද?"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "මෙයින් ප්‍රතිස්ථාපනය කරන්න..."
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "පරිවර්ථක අවවාදයක්"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "අඩංගු කරන්න..."
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "කරුණාකර ආකේතකය තෝරන්න"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "කපන්න"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "පරිවර්ථක දෝෂයක්"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "පිටපත් කරන්න"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "පරිවර්ථනය කරමින් පවතී..."
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "අලවන්න"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "ෆෝල්ඩරය සුරකින්න..."
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "ආකේතක පෙර සැකසුම සුරැකීමට නොහැකි විය"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
-"පෙර සැකසුම් ෆෝල්ඩරයේ අවසරයන් පරීක්ෂා කරන්න, වෙනත් නාමයක් ලබා ගැනීමට උත්සාහ කරන්න, හෝ දෘඩ "
-"තැටියේ යම් ඉඩ ප්‍රමාණයක් නිදහස් කරන්න"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "මෙම නමින් තවත් පෙර සැකසුමක් දැනටමත් පවතී. වෙනත් නාමයක් ලබා දෙන්න."
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "දෝෂයක්"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "නව ආකේතකය එකතු කරන්න"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "ආකේතකය සංස්කරණය කරන්න"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "පෙර සැකසුම ඉවත් කරන්න"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "මෙම ක්‍රියාව මඟින් තෝරන ලද පෙර සැකසුම මකාදැමීමට නියමිතයි. එය සිදුකරන්නද?"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "ආකේතක"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "DSP දාමයට කෙවෙනි මෘදුකාංගය ඇතුළත් කරන්න"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "DSP පෙර සැකසුම සුරැකීමට නොහැකි විය"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "නව DSP පෙර සැකසුම"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "DSP පෙර සැකසුම සංස්කරණය කරන්න"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP පෙර සැකසුම්"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "ප්‍රතිදාන ෆෝල්ඩරය:"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "ගීත අඩංගු ෆෝල්ඩරයට ලියන්න"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "සංරක්ෂිත ෆෝල්ඩර ආකෘතිය"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "ප්‍රතිදාන ගොනු නාමය:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "4x"
 msgstr ""
-"දිගුව (උදා .mp3) ස්වයංක්‍රීයව අගට එකතු වේවි.\n"
-"\n"
-"සාමාන්‍යයෙන් භාවිතා කරන දිගු සඳහා ක්ෂේත්‍රය හිස්ව තබන්න (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "ආකේතකය:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP පෙර සැකසුම"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "සමාන්තරව ක්‍රියාත්මක වන වැඩසටහන් ගණන:"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "ප්‍රතිදාන ආකෘති ආදර්ශය:"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "ප්‍රභව ආකෘතිය පවත්වා ගන්න"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "බිට් 8 ඇති ලකුණු සහිත නිඛිල"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "බිට් 16 ඇති ලකුණු සහිත නිඛිල"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "බිට් 24 ඇති ලකුණු සහිත නිඛිල"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "බිට් 32 ඇති ලකුණු සහිත නිඛිල"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "බිට් 32 ඇති දශම"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "ගොනුව පවතින විට:"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Prompt"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "එය මත ලියන්න"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "ආකේතක පෙර සැකසුම් සංස්කරණය කරන්න"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "නම් නොකල ආකේතකය"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "ප්‍රතිදාන ගොනු දිගුව:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "උදා. mp3"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "විධාන අතුරු මුහුණත"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
-"උදාහරණය: සිත් නොගන්නා - %o\n"
-"\n"
-"ආදාන ගොනු සඳහා %i, ප්‍රතිදාන ගොනු සඳහා %o, -සම්මත ආදානය සඳහා"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
-"%o - ප්‍රතිදාන ගොනු නාමය\n"
-"\n"
-"%i - තාවකාලික ආදාන ගොනු නාමය"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "ක්‍රම:"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Pipe"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "සජාතීය"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "තාවකාලික ගොනු"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "විහිදුවන්න"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "පුරවන්න"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "ටැග් ලියනය"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP පෙර සැකසුම් සංස්කාරකය"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "නම් නොකල DSP පෙර සැකසුම"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "එකතු කරන්න"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "%s pixmap ගොනුව සොයාගත නොහැකිය"
+msgid "%dd %d:%02d:%02d"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
 msgstr ""
-"ප්‍රභව ආකෘතිය පවත්වා ගන්න\n"
-"\n"
-"බිට් 8 ලකුණු සහිත නිඛිල\n"
-"\n"
-"බිට් 16 ලකුණු සහිත නිඛිල\n"
-"\n"
-"බිට් 24 ලකුණු සහිත නිඛිල\n"
-"\n"
-"බිට් 32 ලකුණු සහිත නිඛිල\n"
-"\n"
-"බිට් 32 ලකුණු සහිත දශම"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
 msgstr ""
-"Prompt\n"
-"\n"
-"මත ලියන්න"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
 msgstr ""
-"Pipe\n"
-"\n"
-"තාවකාලික ගොනු"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "ව්‍යවහාරික shell විධාන"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "සංස්කරණය කරන්න"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2103,9 +2620,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"අත්තනෝමතික shell විධානයකි. එය ප්‍රධාන වැඩසටහන ක්‍රියාත්මක වීම ආරම්භ වූ shell සංදර්හය තුළම "
-"ක්‍රියාත්මක වීමට නියමිතයි. ශීර්ෂ ආකෘතීකරණය භාවිතා කල හැකිය. උදාහරණ ලෙස: xdg-open %D"
+msgstr "අත්තනෝමතික shell විධානයකි. එය ප්‍රධාන වැඩසටහන ක්‍රියාත්මක වීම ආරම්භ වූ shell සංදර්හය තුළම ක්‍රියාත්මක වීමට නියමිතයි. ශීර්ෂ ආකෘතීකරණය භාවිතා කල හැකිය. උදාහරණ ලෙස: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2120,11 +2635,9 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"විධාන හැඳිනුම, සාමාන්‍යයෙන් එය කෙටි විය යුතුය, උදාහරණ ලෙස \"youtube_open\". සහ එය "
-"අද්විතීය විය යුතුයි."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "විධාන හැඳිනුම, සාමාන්‍යයෙන් එය කෙටි විය යුතුය, උදාහරණ ලෙස \"youtube_open\". සහ එය අද්විතීය විය යුතුයි."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2188,10 +2701,6 @@
 msgid "Add Command"
 msgstr "විධානය ඇතුලත් කරන්න"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "මකා දමන්න"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "මෙම ක්‍රියාව මඟින් තෝරන ලද shell විධානය මකාදැමීමට නියමිතයි. එය සිදුකරන්නද?"
@@ -2217,202 +2726,1240 @@
 msgid "Invalid Values"
 msgstr "වලංගු නොවන අගයන්"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "සහායක හඬ ආකෘති"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 පවතින ස්ථානය කෙවෙනි මෘදුකාංග සැකසුම් තුල සඳහන් කරන්න."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "සියලුම ගොනු (*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "ගොනු(ව) විවෘත කරන්න..."
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "ධාවන ලැයිස්තුවට ගොනු(ව) එකතු කරන්න..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "ගීත නාමය"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "ධාවන ලැයිස්තුවට ෆෝල්ඩර(ය) එකතු කරන්න..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "ගායකයා"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Symlinks අනුගමනය කරන්න"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "සම්පූර්ණ ගීත ගණන"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "ප්‍රභේදය"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "තැටියේ තිබෙන ගොනු ඉවත් කරන්න"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "තනු නිර්මාපකයා"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "තැටි අංකය"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
-"ගොනු විනාශ විය හැක. ක්‍රියාවට නංවන්නද?\n"
-"\n"
-"(මෙම කතිකාවත GTKUI මාර්ග අපගත කල හැක)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "ගීත ලැයිස්තුව විවෘත කරන්න"
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "අදහස් දැක්වීම්"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "අනෙකුත් ගොනු (*)"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "ආකේතකය / විකුණුම්කරු"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "ගීත ලැයිස්තුව මෙනමින් සුරකින්න"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "පිටපත් කිරීමේ අයිතිය"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "DeaDBeeF ගීත ලැයිස්තු ගොනු (*.dbpl)"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "ස්ථානය"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "අන්තර්ගත-වර්ග:"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "උපගොනු අංකය"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "වලංගු නොවන අගය(න්)"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "ටැග් වර්ග(ය)"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "එබ්බවූ, ගීත විහිදීම දැක්වෙන ගොනුව"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-"අන්තර්ගත-වර්ග සහ කෙවෙනි මෘදුකාංග ක්ෂේත්‍ර හිස්ව නොතැබිය යුතුය, සහ නියමයන්ට අනුකූල විය යුතුය.\n"
-"\n"
-"උදාහරණ අන්තර්ගත-වර්ග: 'audio/mpeg'.\n"
-"\n"
-"උදාහරණ කෙවෙනි මෘදුකාංග අනන්‍යතාවයන්: 'stdmpg ffmpeg'.\n"
-"\n"
-"කෙවෙනි අනන්‍යතා ලැයිතුවේදී හිස් තැනක් වෙන් කිරීමේ කාරකය ලෙස භාවිතා කල යුතුය.\n"
-"\n"
-"අන්තර්ගත වර්ගයන් අකුරු, අංක සහ '-' සළකුණින් පමණක් සමන්විත යුතුය.\n"
-"\n"
-"මෘදුකාංග අනන්‍යතාවයන් සඳහා පැවතිය හැක්කේ අකුරු සහ අංක පමණකි."
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "කිසිවක් වරණය කර නොමැත."
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "මෙයින් ප්‍රතිස්ථාපනය කරන්න..."
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "ශබ්දය වටෙන්ම ඇසීම ක්‍රියා කරන්නේ නැත"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "අඩංගු කරන්න..."
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "ශබ්දය වටෙන්ම ඇසීම සක්‍රීය කරන්න"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "කපන්න"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "ALSA නැවත සාම්පල කිරීම භාවිතා කරන්න"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "පිටපත් කරන්න"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "වරණිත ආරෝධක ප්‍රමාණය"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "අලවන්න"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "කැමති කාලාවර්ත ප්‍රමාණය"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "චලන නවතන්න"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "ටැබය වම් දෙසට චලනය කරවන්න"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "ටැබය දකුණු දෙසට චලනය කරවන්න"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "ටැබය ඉවත් කරන්න"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "ටැබයේ නම වෙනස් කරන්න"
-
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "නව ටැබයක් එකතු කරන්න"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "අන්තර්ගත ටැග් වලින් ලබා ගන්න"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "තීරු ශීර්ෂයන් දර්ශනය කරන්න"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "පරිස්ථානීය ෆෝල්ඩර වලින් ලබා ගන්න"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "පෙට්ටිය එක් අයිතමයකින් විහිදුවන්න"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "පෙට්ටිය එක් අයිතමයකින් හකුළුවන්න"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "සජාතීය"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "විහිදුවන්න"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "පුරවන්න"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "බොත්තම් හැඩගස්වන්න"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr ""
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
+
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "CD-Text, CDDB හරහා ඉදිරිපත් කරන්න"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
+
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "NGR රූප ගොනු සහාය සක්‍රීය කරන්න"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr ""
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr ""
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "පරිවර්ථනය කරන්න"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "තත්වය / ඇල්ගොරිතමය"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "ගොනු දිගු (';' ලකුණකින් වෙන් වූ)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "ගීතයක උපරිම ධාවන කාලය (මිනිත්තු වලින්)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "ගීතයක් ක්‍රමයෙන් නැතිවී යාමේ කාලය (තත්පර)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "නැවත නැවත ධාවනය වීමේ වාර ගණන (ලබාගත හැකිනම්)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "තැටියේ ඇති ගොනු මකා දැමීමට ප්‍රථම තහවුරු කර ගැනීමට විමසන්න"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "ශබ්ධය පාලනය කිරීමේ සංවේදීතා තත්වය සඳහා වූ සංකේතය"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "භාවිත තත්ව අයිකනය"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "මෙනූ අයිකන අතර වෙන්කිරීමක් යොදන්න"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Scrobbler සක්‍රීය කරන්න"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "nowplaying අක්‍රීය කරන්න"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "භාවිත නාමය"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "මුර පදය"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble වෙබ් ලිපිනය"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "ශිල්පී ක්ෂේත්‍රයේ ඇති කැමති ගායකයා"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "දැනුම් දීමේ නාම ආකෘතිය"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "දැනුම් දීමේ අන්තර්ගතයන්ගේ ආකෘතිය"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "ඇල්බම සිතුවම් දර්ශනය කරන්න"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "ඇල්බම සිතුවම් වල ප්‍රමාණය (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "උපාංග ගොනුව"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "සාම්පල අනුපාතිකය"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr ""
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr ""
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "සාපේක්ෂ සෙවුම් වගුව ඇති ස්ථානය"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "නිරපේක්ෂ සෙවුම් වගුව ඇති ස්ථානය"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "ශ්‍රව්‍යය බයිට එකිනෙක මාරු කරන්න (ඔබට ශ්‍රවනය වන දේ වෙනසක් නැත්නම් නැවත මාරු කරන්න)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "ගීත වල ධාවන කාලය අඩංගු HVSC දත්ත මූලය සක්‍රීය කරන්න"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "ගීතයක සාමාන්‍ය ධාවන කාලය (තත්පර)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ ගබඩා, වින්‍යාස ගොනුව"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/sk.po -> deadbeef-1.9.6.tar.bz2/po/sk.po Changed

@@ -1,2338 +1,3967 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# helix84 <helix84@centrum.sk>, 2010
-# helix84 <helix84@centrum.sk>, 2010
+# Ivan Masár <helix84@centrum.sk>, 2010
+# Igor Stefanko <citro33@zoznam.sk>, 2019
+# Ivan Masár <helix84@centrum.sk>, 2010
+# Jakub Záhorák <zagoslav@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/sk/)\n"
-"Language: sk\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Jakub Záhorák <zagoslav@gmail.com>, 2015\n"
+"Language-Team: Slovak (http://app.transifex.com/deadbeef-player/deadbeef-player/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "Možnosti:\n"
+
+#: ../src/main.c:136
+#, 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"
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Ukončí prehrávač\n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Vypíše informácie o verzii a skončí\n"
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Začne prehrávanie\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Zastaví prehrávanie\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pozastaví prehrávanie\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Ďalšia stopa v zozname\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Predošlá stopa v zozname\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Náhodná stopa v zozname\n"
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Pridá súbory do existujúceho zoznamu stôp\n"
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
+
+#: ../src/main.c:149
+#, 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"
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: a interpret, t názov, b album,\n l dĺžka, n č. stopy, y rok, c komentár,\n r autorské práva, e uplynulo\n"
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Predvolené"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Áno"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nie"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Názov:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Názov"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Pridať"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Odstrániť"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Nastaviť"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Predvoľby"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Upozornenie"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Pomocník"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Nepodarilo sa nájsť súbor pixmap: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Načítať zoznam stôp"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Uložiť zoznam stôp ako"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "O aplikácii DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Záznam zmien DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Prekladatelia DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Zásuvné moduly"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Súbor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Otvoriť súbor(y)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Pridať súbor(y)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Pridať priečinok/priečinky"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Pridať umiestnenie"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Nový zoznam stôp"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Načítať zoznam stôp"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Uložiť zoznam stôp"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Ukončiť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Upraviť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Vyčistiť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Vybrať všetky"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Zrušiť výber"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Invertovať výber"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Výber"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Orezať"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Nájsť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Interpret"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Dátum"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Náhodné"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Vlastné"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Nastavenia"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Zobraziť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Stavový panel"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Ekvalizér"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "_Prehrávanie"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Posúvať podľa prehrávanej stopy"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Kurzor podľa prehrávanej stopy"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Pomocník"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_Záznam zmien"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "O _aplikácii"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Prekladatelia"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Hľadať"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Zastaviť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Prehrať"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pozastaviť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Predošlá"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Ďalšia"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Prehrať náhodnú"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "O aplikácii"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Ukončiť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Vlastnosti stopy"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "Umiestnenie:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Použiť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Zatvoriť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadáta"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Sem zadajte názov stĺpca"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Typ:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Formát:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Zarovnanie:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Farba textu:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Výstupný zásuvný modul:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Výstupné zariadenie:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Zvuk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Zatvorenie minimalizuje do oznamovacej oblasti"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr "Prehrávač"
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Palylist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Prekonať"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Zapnúť proxy server"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Adresa proxy servera:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Port proxy servera:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Typ proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Používateľ proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Heslo pre proxy:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Sieť"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:353
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr "O aplikácii DeaDBeeF %s"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Záznam zmien DeaDBeeF %s"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:626
-#, c-format
-msgid "DeaDBeeF Translators"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Verzia:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Zapísať ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Zapísať ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Zapísať APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Odstrániť ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Odstrániť ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Odstrániť APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "Verzia ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (odporúča sa)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "Kódovanie znakov ID3v1 (predvolené je iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Zapísať ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "Farba:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "Ikona:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
 msgstr ""
 
-#: ../plugins/gtkui/eq.c:141
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Uložiť predvoľby ekvalizéru DeaDBeeF"
 
-#: ../plugins/gtkui/eq.c:148
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Predvoľby ekvalizéru DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:187
+#: ../plugins/gtkui/eq.c:183
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Načítať Predvoľby ekvalizéru DeaDBeeF..."
 
-#: ../plugins/gtkui/eq.c:191
+#: ../plugins/gtkui/eq.c:187
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Predvoľby ekvalizéru DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:252
+#: ../plugins/gtkui/eq.c:224
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Importovať predvoľby ekvalizéru Foobar2000..."
 
-#: ../plugins/gtkui/eq.c:256
+#: ../plugins/gtkui/eq.c:228
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Predvoľby ekvalizéru Foobar2000 (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:321
+#: ../plugins/gtkui/eq.c:269
 msgid "Save Preset"
 msgstr "Uložiť predvoľby"
 
-#: ../plugins/gtkui/eq.c:329
+#: ../plugins/gtkui/eq.c:277
 msgid "Load Preset"
 msgstr "Načítať predvoľby"
 
-#: ../plugins/gtkui/eq.c:337
+#: ../plugins/gtkui/eq.c:285
 msgid "Import Foobar2000 Preset"
 msgstr "Importovať predvoľby Foobar2000"
 
-#: ../plugins/gtkui/eq.c:362
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
 msgid "Enable"
 msgstr "Zapnúť"
 
-#: ../plugins/gtkui/eq.c:371
+#: ../plugins/gtkui/eq.c:320
 msgid "Zero All"
 msgstr "Znulovať všetky"
 
-#: ../plugins/gtkui/eq.c:378
+#: ../plugins/gtkui/eq.c:327
 msgid "Zero Preamp"
 msgstr "Znulovať predzos"
 
-#: ../plugins/gtkui/eq.c:385
+#: ../plugins/gtkui/eq.c:334
 msgid "Zero Bands"
 msgstr "Znulovať pásma"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nový zoznam stôp"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 deň %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dní %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:179
-#, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Zastavené | %d stôp | %s celkový čas"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pozastavené | "
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
-#, 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:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nový zoznam stôp"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nový zoznam stôp (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:956
+#: ../plugins/gtkui/gtkui.c:1452
 msgid "Playlist with tabs"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr ""
+msgstr "Playlist v záložkách"
 
-#: ../plugins/gtkui/gtkui.c:960
+#: ../plugins/gtkui/gtkui.c:1456
 msgid "Splitter (top and bottom)"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
+#: ../plugins/gtkui/gtkui.c:1457
 msgid "Splitter (left and right)"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Záložky"
+
+#: ../plugins/gtkui/gtkui.c:1460
 msgid "Playlist tabs"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:1461
 msgid "Selection properties"
-msgstr ""
+msgstr "Vlastnosti výberu"
 
-#: ../plugins/gtkui/gtkui.c:966
+#: ../plugins/gtkui/gtkui.c:1462
 msgid "Album art display"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
+#: ../plugins/gtkui/gtkui.c:1464
 msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:1465
 msgid "HBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:1466
 msgid "VBox"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
 msgid "Button"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
+#: ../plugins/gtkui/gtkui.c:1468
 msgid "Seekbar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:1469
 msgid "Playback controls"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:1470
 msgid "Volume bar"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Zlyhalo čítanie súboru Pomocníka"
-
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Zlyhalo načítanie súboru Pomocníka"
-
-#: ../plugins/gtkui/gtkui.c:1171
-msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Upozornenie"
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Súbor"
-
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Otvoriť súbor(y)"
-
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Pridať súbor(y)"
-
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Pridať priečinok/priečinky"
-
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Pridať umiestnenie"
-
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Nový zoznam stôp"
-
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Načítať zoznam stôp"
-
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Uložiť zoznam stôp"
-
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Ukončiť"
-
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Upraviť"
-
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Vyčistiť"
-
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Vybrať všetky"
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Zrušiť výber"
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Invertovať výber"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Výber"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Zlyhalo čítanie súboru Pomocníka"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Odstrániť"
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Zlyhalo načítanie súboru Pomocníka"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Orezať"
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Nájsť"
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Názov"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Album"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Interpret"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Náhodné"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Vlastné"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Nastavenia"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Vľavo"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Zobraziť"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Vpravo"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Stavový panel"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Ekvalizér"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "_Prehrávanie"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Poradie"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Lineárne"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Stopa"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Žiadne"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Opakovať"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Posúvať podľa prehrávanej stopy"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (odporúča sa)"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Kurzor podľa prehrávanej stopy"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Interpret/album"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Č. stopy"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Trvanie"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Pomocník"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Hrá"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_Záznam zmien"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Obal albumu"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Interpret - Album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "O _aplikácii"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Skupina/interpret"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Hľadať"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Zastaviť"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Pridať stĺpec"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Prehrať"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Upraviť stĺpec"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Pozastaviť"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Odstrániť stĺpec"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Predošlá"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Ďalšia"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Zoskupiť podľa"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Prehrať náhodnú"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Interpret/dátum/album"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "O aplikácii"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Ukončiť"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Pomocník"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Vlastnosti stopy"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Použiť"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Zatvoriť"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Metadáta"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Vlastnosti"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Názov:"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Sem zadajte názov stĺpca"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Typ:"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Otvoriť súbor..."
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Hrá"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Obal albumu"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Interpret - Album"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Predvolené zvukové zariadenie"
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Trvanie"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Pridávajú sa súbory..."
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr ""
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Inicializuje sa..."
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Skupina/interpret"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Formát:"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Zarovnanie:"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Vľavo"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Vpravo"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Zrušiť"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Výstupný zásuvný modul:"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Výstupné zariadenie:"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Zvuk"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Hodnota"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Režim replaygain:"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Zmenili ste dáta tejto stopy."
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Vypnúť"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Naozaj zatvoriť toto okno?"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Stopa"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Najvyšší replaygain:"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Kľúč"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Nastaviť"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Vystrihnúť"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Zatvorenie minimalizuje do oznamovacej oblasti"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopírovať"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Prilepiť"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Prekonať"
-
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Popredie"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Pozadie"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Farby lišty pozície a hlasitosti"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Stredné"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Svetlé"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Tmavé"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Základ"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Text"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Farby pruhu kariet"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
 msgstr ""
-"Prekonať (nepoužije témy vzhľadu stromového zobrazenia GTK, ale urýchli "
-"vykresľovanie)"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Párny riadok"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Nepárny riadok"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Vybraný riadok"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Vybraný text"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Kurzor"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Farby zoznamu stôp"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Zapnúť proxy server"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Adresa proxy servera:"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Port proxy servera:"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Typ proxy:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Používateľ proxy:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Heslo pre proxy:"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Sieť"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Zásuvné moduly"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Zapísať ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Zapísať ID3v1"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Zapísať APEv2"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "Odstrániť ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "Odstrániť ID3v1"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "Odstrániť APEv2"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "Verzia ID3v2"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (odporúča sa)"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "Kódovanie znakov ID3v1 (predvolené je iso8859-1)"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "Zapísať ID3v2.4"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Interpret/album"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Č. stopy"
-
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Pridať stĺpec"
-
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Upraviť stĺpec"
-
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Odstrániť stĺpec"
-
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Zoskupiť podľa"
-
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Žiadne"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Interpret/dátum/album"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Otvoriť súbor..."
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, c-format
-msgid "Configure %s"
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Predvolené zvukové zariadenie"
-
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Pridávajú sa súbory..."
-
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Inicializuje sa..."
-
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Zmenili ste dáta tejto stopy."
-
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Naozaj zatvoriť toto okno?"
-
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../translation/extra.c:3
+msgid "Track Title"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Kľúč"
-
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Hodnota"
-
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../translation/extra.c:4
+msgid "Performer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../translation/extra.c:10
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
+#: ../translation/extra.c:11
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#: ../translation/extra.c:12
+msgid "Disc Number"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#: ../translation/extra.c:14
+msgid "Comment"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../translation/extra.c:16
+msgid "Copyright"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../translation/extra.c:17
+msgid "Location"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Možnosti:\n"
-
-#: ../main.c:92
-#, 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:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Ukončí prehrávač\n"
-
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Vypíše informácie o verzii a skončí\n"
-
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Začne prehrávanie\n"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Zastaví prehrávanie\n"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Typ(y) značiek"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pozastaví prehrávanie\n"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Vložený cue"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Ďalšia stopa v zozname\n"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Predošlá stopa v zozname\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Náhodná stopa v zozname\n"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Pridá súbory do existujúceho zoznamu stôp\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
 msgstr ""
-" --nowplaying FMT Vypíše formátovaný názov stopy na štand. výstup\n"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
-" FMT %%-syntax: a interpret, t názov, b album,\n"
-" l dĺžka, n č. stopy, y rok, c komentár,\n"
-" r autorské práva, e uplynulo\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
 msgstr ""
-" napr.: --nowplaying „%%a - %%t“ by malo vypísať "
-"„interpret - názov“\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Predvolené"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Áno"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Nie"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
-"Vľavo\n"
-"Vpravo"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
-"Vypnúť\n"
-"Stopa\n"
-"Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
-"2.3 (odporúča sa)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 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"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Typ(y) značiek"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Vložený cue"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
 msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:277
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:315
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:317
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Pridať"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Nepodarilo sa nájsť súbor pixmap: %s"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:375
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Heslo"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/sl.po -> deadbeef-1.9.6.tar.bz2/po/sl.po Changed

@@ -1,2364 +1,3963 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/sl/)\n"
-"Language: sl\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian (http://app.transifex.com/deadbeef-player/deadbeef-player/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 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "O programu DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "Dnevnik sprememb programa DeaDBeeF %s"
+msgid "Options:\n"
+msgstr "Možnosti:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Prevajalci programa DeaDBeeF"
-
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Shrani predlogo nastavitev uravnalnika DeaDBeeF"
-
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Predloge nastavitev uravnalnika DeaDBeeF (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Naloži predlogo nastavitev uravnalnika DeaDBeeF ..."
-
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Predloge nastavitev uravnalnika DeaDBeeF (*.ddbeq)"
-
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Uvozi predlogo nastavitev uravnalnika Foobar2000 ..."
-
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Predloge nastavitev uravnalnika Foobar2000 (*.feq)"
-
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Shrani predlogo nastavitev"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ali -h Izpiše pomoč (to sporočilo).\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Naloži predlogo nastavitev"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Konča predvajalnik.\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Uvozi predlogo nastavitev za Foobar2000"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Izpiše podatke o različici.\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Omogočeno"
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Začne predvajanje.\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Ponastavi"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Zaustavi predvajanje.\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Ponastavi predojačevalnik"
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Prekine predvajanje.\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Ponastavi pasove"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Začne/prekine predvajanje\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Predloge nastavitev"
+#: ../src/main.c:143
+#, 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"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:144
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 dan %d:%02d:%02d"
+msgid " --next Next song in playlist\n"
+msgstr " --next Naslednja skladba s seznama predvajanja.\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:145
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d dni %d:%02d:%02d"
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Predhodna skladba s seznama predvajanja.\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:146
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Zaustavljeno | %d skladb | Skupni čas predvajanja: %s"
+msgid " --random Random song in playlist\n"
+msgstr " --random Naključna skladba s seznama predvajanja.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Pripne datoteko na seznam predvajanja.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:149
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying OBLIKA Izpiše oblikovano ime trenutno predvajane skladbe.\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Premor | "
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " OBLIKA (začnite z %%): izvajalec, t - naslov, album,\n l - trajanje, n - številka skladbe, y - leto,\n c - opomba, avtorske pravice, pretečen čas\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:153
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
 msgstr ""
-"%s%s %s| %d Hz | %d bitov | %s | %d:%02d / %s | %d skladb | Skupni čas "
-"predvajanja: %s"
-
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nov seznam predvajanja"
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:154
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Nov seznam predvajanja (%d)"
-
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
+msgid " for more info, see %s\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Privzeto"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Da"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Med branjem datoteke pomoči je prišlo do napake"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Ne"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Datoteke pomoči ni mogoče naložiti"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Izhodna mapa:"
 
-#: ../plugins/gtkui/gtkui.c:1171
-msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Opozorilo"
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Datoteka"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Odpri datoteko"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Dodaj datoteko"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Ime izhodne datoteke:"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Dodaj mapo"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Dodaj mesto"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Kodirnik:"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Nov seznam predvajanja"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Predloga nastavitev DSP:"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Naloži seznam predvajanja"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Število niti:"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Shrani seznam predvajanja"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Oblika izhodnega vzorca:"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Končaj"
+#: ../plugins/converter/converter.glade.h:14
+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 ""
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Uredi"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Če datoteka že obstaja:"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Počisti"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Izberi vse"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Uredi predlogo nastavitev kodirnika"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Prekliči izbor"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Naslov:"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Obrni izbor"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Neimenovan kodirnik"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Izbor"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Pripona izhodne datoteke:"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Odstrani"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Na primer: mp3"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Obreži"
-
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Najdi"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Ukazna vrstica:"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Naslov"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-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/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "Številka skladbe"
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Način:"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Album"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Izvajalec"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Datum"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Naključno"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "Ogg Vorbis"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Po meri"
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Možnosti"
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Pogled"
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Vrstica stanja"
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Zapisovalnik oznak"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Uravnalnik"
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Urejevalnik predlog nastavitev DSP"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Naslov"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "Pre_dvajanje"
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Neimenovana predloga nastavitev DSP"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Vrstni red"
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Dodaj"
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Zaporedno"
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Odstrani"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Premešaj skladbe"
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Nastavitve"
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Premešaj albume"
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Izberite vstavek DSP"
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Ponavljanje"
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Vstavek"
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Predloge nastavitev"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr ""
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Datoteka že obstaja. Ali jo želite prepisati?"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Drsnik sledi predvajanju"
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Opozorilo pretvornika"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Kazalnik sledi predvajanju"
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Prosimo, izberite kodirnik"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
-msgstr ""
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Napaka pretvornika"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
-msgstr ""
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Pretvarjanje ..."
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Skoči na trenutno skladbo"
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Izberite mapo ..."
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "Pomo_č"
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Predloge nastavitev kodirnika ni mogoče shraniti"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "Dnevnik _sprememb"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+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/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Predloga nastavitev s tem imenom že obstaja."
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Napaka"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "_O programu"
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Dodaj nov kodirnik"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "_Prevajalci"
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Uredi kodirnik"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Iskanje"
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Odstrani predlogo nastavitev"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Zaustavi"
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Ali ste prepričani, da želite izbrisati izbrano predlogo nastavitev?"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Predvajaj"
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Opozorilo"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Premor"
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Kodirniki"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Predhodna"
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Dodaj vstavek v verigo DSP"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Naslednja"
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Predloge nastavitev DSP ni mogoče shraniti."
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Predvajaj naključno"
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Nova predloga nastavitev DSP"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "O programu"
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Uredi predlogo nastavitev DSP"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Končaj"
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Predloge nastavitev DSP"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
 msgid "Help"
 msgstr "Pomoč"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Lastnosti skladbe"
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Ohrani izvirno obliko"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
-msgstr ""
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8-bitno predznačeno celo število"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "Nastavitve"
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16-bitno predznačeno celo število"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "_Uveljavi"
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24-bitno predznačeno celo število"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Zapri"
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32-bitno predznačeno celo število"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Metapodatki"
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32-bitna plavajoča vejica"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Lastnosti"
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Naslov:"
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Vprašaj"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Vnesite ime novega stolpca"
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Prepiši"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Vrsta:"
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Cevovod"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Številka skladbe"
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Predvajanje"
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Naslovnica albuma"
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Večbitne sličice ni mogoče najti: %s"
 
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Izvajalec - Album"
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Trajanje"
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Št. skladbe"
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Skupina / Izvajalec albuma"
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Oblika:"
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Poravnava:"
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Levo"
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "O programu DeaDBeeF %s"
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Desno"
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Dnevnik sprememb programa DeaDBeeF %s"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Prekliči"
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Prevajalci programa DeaDBeeF"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_V redu"
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Izhodni vstavek:"
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Izhodna naprava:"
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Vedno pretvori 8-bitni zvok v 16-bitnega"
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Vstavki"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Zvok"
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "ReplayGain:"
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Onemogočeno"
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Datoteka"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Skladba"
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Odpri datoteko"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Prilagajanje vrha ReplayGain"
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Dodaj datoteko"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
-msgstr "-12 dB"
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Dodaj mapo"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
-msgstr "+12 dB"
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Dodaj mesto"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Predojačanje ReplayGain:"
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Nov seznam predvajanja"
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Splošno predojačanje:"
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Naloži seznam predvajanja"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "Datoteke privzeto dodaj na ta seznam predvajanja:"
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Shrani seznam predvajanja"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "Ob zagonu nadaljuj prejšnjo sejo"
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Končaj"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
-msgstr "Med dodajanjem map ne dodaj datotek iz arhivov"
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Uredi"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Počisti"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Izberi vse"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Predvajanje"
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Prekliči izbor"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Nastavitve"
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Obrni izbor"
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
-msgstr "Predloga nastavitev verige DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Izbor"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
-msgstr "_Naloži"
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Obreži"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
-msgstr "DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Najdi"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Ob zaprtju skrči v sistemsko vrstico"
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Skrij ikono sistemske vrstice"
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Številka skladbe"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr ""
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Izvajalec"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
-msgstr "Hitrost osveževanja vmesnika:"
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Naključno"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "Besedilo nazivne vrstice med predvajanjem:"
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Po meri"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Besedilo nazivne vrstice, ko je predvajanje zaustavljeno:"
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Možnosti"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
-msgstr "Vstavek vmesnika (zahteva ponovni zagon):"
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Pogled"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Vrstica stanja"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Uravnalnik"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "Pre_dvajanje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
-msgstr "Samodejno poimenuj seznam prevajanja, ko je dodana le ena mapa"
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Omogoči"
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Barva"
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Ozadje"
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Barva vrstice iskanja/glasnosti"
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Drsnik sledi predvajanju"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Ozadje"
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Kazalnik sledi predvajanju"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "1. obroba"
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "2. obroba"
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Osnova"
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Skoči na trenutno skladbo"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Besedilo"
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "Pomo_č"
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Barva zavihkov"
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "Dnevnik _sprememb"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "Omogoči (prepiše temo GTK+, vendar pospeši izrisovanje)"
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Soda vrstica"
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Liha vrstica"
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "_O programu"
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Izbrana vrstica"
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Prevajalci"
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Izbrano besedilo"
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Iskanje"
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Kazalnik"
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Zaustavi"
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Barva seznama predvajanja"
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Predvajaj"
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Barve"
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Premor"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Omogoči posredniški strežnik"
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Predhodna"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Naslov:"
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Naslednja"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Vrata:"
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Predvajaj naključno"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Vrsta:"
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "O programu"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Uporabniško ime:"
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Končaj"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Geslo:"
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Lastnosti skladbe"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Nastavitve"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Omrežje"
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "_Uveljavi"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Zapri"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metapodatki"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Lastnosti"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Prekliči"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_V redu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Vnesite ime novega stolpca"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Oblika:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Poravnava:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Različica: "
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Izhodni vstavek:"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Avtorske pravice"
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Izhodna naprava:"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Vstavki"
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Vedno pretvori 8-bitni zvok v 16-bitnega"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Oblika"
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Naraščajoče"
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Padajoče"
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Izberite vstavek DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Vstavek"
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Zvok"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
-msgstr "Nastavitve zapisovalnika oznak"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Zapiši ID3v2"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Zapiši ID3v1"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Zapiši APEv2"
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "Odstrani ID3v2"
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "Odstrani ID3v1"
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "Odstrani APEv2"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "Različica ID3v2"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (priporočeno)"
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Datoteke privzeto dodaj na ta seznam predvajanja:"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "Kodiranje znakov ID3v1 (privzeto je iso8859-1)"
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Ob zagonu nadaljuj prejšnjo sejo"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "Zapiši ID3v2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Med dodajanjem map ne dodaj datotek iz arhivov"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
-msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Predvajanje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr "Predloga nastavitev verige DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "_Naloži"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Ob zaprtju skrči v sistemsko vrstico"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Skrij ikono sistemske vrstice"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr "Hitrost osveževanja vmesnika:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Besedilo nazivne vrstice med predvajanjem:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Besedilo nazivne vrstice, ko je predvajanje zaustavljeno:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr "Vstavek vmesnika (zahteva ponovni zagon):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Izvajalec / Album"
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Samodejno poimenuj seznam prevajanja, ko je dodana le ena mapa"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Št. skladbe"
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Dodaj stolpec"
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Omogoči"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Uredi stolpec"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Odstrani stolpec"
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Združi po"
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Ne združi"
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Izvajalec/Datum/Album"
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Odpri datoteko ..."
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "%s"
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Privzeta zvočna naprava"
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Dodajanje datotek ..."
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Začenjanje ..."
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Spremenili ste podatke te skladbe."
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Ali res želite zapreti to okno?"
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Več vrednosti "
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Ključ"
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Vrednost"
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Zapisovanje oznak ..."
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Ime:"
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Imena polj se ne smejo začeti z »:« ali »_«"
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Polja ni mogoče dodati"
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Polje s tem imenom že obstaja."
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Dodaj polje"
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Odstrani polje"
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
 msgstr ""
 
-#: ../main.c:91
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Omogoči posredniški strežnik"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Naslov:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Vrata:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Vrsta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Uporabniško ime:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Geslo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Omrežje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Različica: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Naraščajoče\nPadajoče"
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr "Nastavitve zapisovalnika oznak"
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Zapiši ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Zapiši ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Zapiši APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Odstrani ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Odstrani ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Odstrani APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "Različica ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (priporočeno)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "Kodiranje znakov ID3v1 (privzeto je iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Zapiši ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../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:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Naloži predlogo nastavitev uravnalnika DeaDBeeF ..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Predloge nastavitev uravnalnika DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Uvozi predlogo nastavitev uravnalnika Foobar2000 ..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Predloge nastavitev uravnalnika Foobar2000 (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Shrani predlogo nastavitev"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Naloži predlogo nastavitev"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Uvozi predlogo nastavitev za Foobar2000"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Omogočeno"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Ponastavi"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Ponastavi predojačevalnik"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Ponastavi pasove"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nov seznam predvajanja"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 dan %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dni %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Nov seznam predvajanja (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Med branjem datoteke pomoči je prišlo do napake"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Datoteke pomoči ni mogoče naložiti"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Levo"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Desno"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Skladba"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Ne združi"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Naraščajoče"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Padajoče"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (priporočeno)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Izvajalec / Album"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Št. skladbe"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Trajanje"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Številka skladbe"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Predvajanje"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Naslovnica albuma"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Izvajalec - Album"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Št. skladbe"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Skupina / Izvajalec albuma"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodek"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Dodaj stolpec"
+
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Uredi stolpec"
+
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Odstrani stolpec"
+
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Združi po"
+
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Izvajalec/Datum/Album"
+
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Odpri datoteko ..."
+
+#: ../plugins/gtkui/pluginconf.c:559
 #, c-format
-msgid "Options:\n"
-msgstr "Možnosti:\n"
+msgid "Configure %s"
+msgstr "%s"
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Privzeta zvočna naprava"
+
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Dodajanje datotek ..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Začenjanje ..."
+
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr ""
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Vrednost"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Spremenili ste podatke te skladbe."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Ali res želite zapreti to okno?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Več vrednosti "
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Ključ"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Zapisovanje oznak ..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Ime:"
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Imena polj se ne smejo začeti z »:« ali »_«"
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Polja ni mogoče dodati"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Polje s tem imenom že obstaja."
+
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr ""
+
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
+
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr ""
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help ali -h Izpiše pomoč (to sporočilo).\n"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Konča predvajalnik.\n"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Izpiše podatke o različici.\n"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Začne predvajanje.\n"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Zaustavi predvajanje.\n"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Prekine predvajanje.\n"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Začne/prekine predvajanje\n"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
-" --play-pause Začne predvajanje, če je zaustavljeno, v nasprotnem "
-"primeru ga prekine.\n"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Naslednja skladba s seznama predvajanja.\n"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Predhodna skladba s seznama predvajanja.\n"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Naključna skladba s seznama predvajanja.\n"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Pripne datoteko na seznam predvajanja.\n"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
-" --nowplaying OBLIKA Izpiše oblikovano ime trenutno predvajane skladbe.\n"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
-" OBLIKA (začnite z %%): izvajalec, t - naslov, "
-"album,\n"
-" l - trajanje, n - številka skladbe, y - leto,\n"
-" c - opomba, avtorske pravice, pretečen čas\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
-" npr.: --nowplaying »%%a - %%t« izpiše »izvajalec - "
-"naslov«\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Privzeto"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Da"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Ne"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
-"Levo\n"
-"Desno"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
 msgstr ""
-"Onemogočeno\n"
-"Skladba\n"
-"Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
 msgstr ""
-"Naraščajoče\n"
-"Padajoče"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
 msgstr ""
-"2.3 (priporočeno)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, 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."
+
+#: ../src/tf.c:2237
+msgid "mono"
 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"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Naslov skladbe"
+
 #: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Najdi na Last.fm"
+msgid "Performer"
+msgstr "Izvajalec"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Število skladb"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Zvrst"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Skladatelj"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Številka diska"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr ""
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Opomba"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Kodirnik"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Avtorske pravice"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Mesto"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Številka podskladbe"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Vrsta oznake"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Vgrajena predloga podatkov"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr ""
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr ""
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
 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:55
+#: ../translation/plugins.c:17
+#, no-c-format
 msgid "Preferred buffer size"
 msgstr "Prednostna velikost medpomnilnika"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Prednostna velikost obdobja"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Prednostna velikost obdobja"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
+
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Pridobi iz oznak"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Pridobi iz krajevne mape"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr ""
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Omogoči pošiljanje zgodovine predvajanja"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Onemogoči pošiljanje podatkov o trenutni skladbi"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Uporabniško ime"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Geslo"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Naslov URL"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Datoteka naprave"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Začasna rešitev napake v hitrosti vzorčenja za OSS4"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Hitrost osveževanja predpomnilnika (v urah)"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Pridobi iz oznak"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Pridobi iz krajevne mape"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Maska datotek z naslovnicami"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Pridobi z Last.fm"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Pridobi z Albumart.org"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Prilagodi velikost naslovnice daljši stranici"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Uporabi CDDB/FreeDB"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
 
-#: ../translation/extra.c:30
+#: ../translation/plugins.c:71
+#, no-c-format
 msgid "Prefer CD-Text over CDDB"
 msgstr "Uporabi CD-Text namesto CDDB"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "Naslov CDDB (npr. »freedb.org«)"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Številka vrat CDDB (npr. »888«)"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Uporabi protokol CDDB namesto HTTP"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
 
-#: ../translation/extra.c:34
+#: ../translation/plugins.c:79
+#, no-c-format
 msgid "Enable NRG image support"
 msgstr "Omogoči podporo za odtise NRG"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Kakovost prevzorčenja (0 ... 2, večje je boljše)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Največja dolžina skladbe (v minutah)"
-
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Vprašaj pred brisanjem datotek z diska"
-
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Občutljivost ikone za nadzor glasnosti"
-
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Ikona stanja po meri"
-
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Zaženi gtk_init z možnostjo --sync (način razhroščevanja)"
-
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Dodaj ločilnike med predmete vstavkov v vsebinskem meniju"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Oblika naziva obvestila"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Oblika vsebine obvestila"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Pretvori"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Pokaži naslovnico albuma"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Velikost naslovnice albuma (v slik. točkah)"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Strežnik PulseAudio"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Hitrost vzorčenja"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Relativna pot do razpredelnice iskalnih vrednosti"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Absolutna pot do razpredelnice iskalnih vrednosti"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Zamenjaj zvočne bajte (izberite, če slišite statiko)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Omogoči podatkovno zbirko dolžin pesmi HVSC"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (HVSC)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Bitov na vzorec (8 ali 16)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Privzeta dolžina skladbe (v sekundah)"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Pripone datotek (ločene s »;«)"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Nastavitvena datoteka za Timidity++"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Naslov skladbe"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Izvajalec"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Število skladb"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Največja dolžina skladbe (v minutah)"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Zvrst"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Skladatelj"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Številka diska"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Opomba"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Kodirnik"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Mesto"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Številka podskladbe"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Vrsta oznake"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Vgrajena predloga podatkov"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Kodek"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Pripone datotek (ločene s »;«)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Pretvori"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Ciljna hitrost vzorčenja"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Samodejna hitrost vzorčenja (prepiše ciljno hitrost vzorčenja)"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Datoteka že obstaja. Ali jo želite prepisati?"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Opozorilo pretvornika"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Prosimo, izberite kodirnik"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Napaka pretvornika"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Pretvarjanje ..."
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Izberite mapo ..."
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Predloge nastavitev kodirnika ni mogoče shraniti"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
-"Preverite dovoljenja mape predloge nastavitev, izberite drugo ime ali "
-"sprostite nekaj prostora na disku."
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "Predloga nastavitev s tem imenom že obstaja."
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Napaka"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Dodaj nov kodirnik"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Uredi kodirnik"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Odstrani predlogo nastavitev"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Ali ste prepričani, da želite izbrisati izbrano predlogo nastavitev?"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Kodirniki"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Dodaj vstavek v verigo DSP"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Predloge nastavitev DSP ni mogoče shraniti."
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Nova predloga nastavitev DSP"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Uredi predlogo nastavitev DSP"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Predloge nastavitev DSP"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Izhodna mapa:"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Ime izhodne datoteke:"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:244
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Show\\/Hide Log window"
 msgstr ""
-"Pripona (npr. mp3) bo pripeta samodejno.\n"
-"Za privzeto vrednost (%a - %t) pustite polje prazno."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Kodirnik:"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Vprašaj pred brisanjem datotek z diska"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Predloga nastavitev DSP:"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Število niti:"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Občutljivost ikone za nadzor glasnosti"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Oblika izhodnega vzorca:"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Ikona stanja po meri"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Ohrani izvirno obliko"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8-bitno predznačeno celo število"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Dodaj ločilnike med predmete vstavkov v vsebinskem meniju"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16-bitno predznačeno celo število"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24-bitno predznačeno celo število"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32-bitno predznačeno celo število"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32-bitna plavajoča vejica"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Če datoteka že obstaja:"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Vprašaj"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Prepiši"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Uredi predlogo nastavitev kodirnika"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Neimenovan kodirnik"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Pripona izhodne datoteke:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Na primer: mp3"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Ukazna vrstica:"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:285
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Next Artist"
 msgstr ""
-"Zgled: lame - %o\n"
-"%i = vhodna datoteka, %o = izhodna datoteka, - = standardni vhod"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:287
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Next Album"
 msgstr ""
-"%o - ime izhodne datoteke\n"
-"%i - začasno ime vhodne datoteke"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Način:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Cevovod"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Začasna datoteka"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "Ogg Vorbis"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Zapisovalnik oznak"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Urejevalnik predlog nastavitev DSP"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Neimenovana predloga nastavitev DSP"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Dodaj"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Večbitne sličice ni mogoče najti: %s"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:333
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Omogoči pošiljanje zgodovine predvajanja"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Onemogoči pošiljanje podatkov o trenutni skladbi"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Uporabniško ime"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Geslo"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Naslov URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Oblika naziva obvestila"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Oblika vsebine obvestila"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Pokaži naslovnico albuma"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Velikost naslovnice albuma (v slik. točkah)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Datoteka naprave"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Hitrost vzorčenja"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Relativna pot do razpredelnice iskalnih vrednosti"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Absolutna pot do razpredelnice iskalnih vrednosti"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Zamenjaj zvočne bajte (izberite, če slišite statiko)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Omogoči podatkovno zbirko dolžin pesmi HVSC"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Privzeta dolžina skladbe (v sekundah)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Nastavitvena datoteka za Timidity++"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/sr.po -> deadbeef-1.9.6.tar.bz2/po/sr.po Changed

@@ -1,2064 +1,2604 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Jay Alexander Fleming <tito.nehru.naser@gmail.com>, 2010
-# Jay Alexander Fleming <tito.nehru.naser@gmail.com>, 2010,2013
+# Jay Alexander Fleming <tito.nehru.naser@gmail.com>, 2010,2013,2015
+# Todor Grigoriadis <todor@gmx.co.in>, 2018
+# Todor Grigoriadis <todor@gmx.co.in>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/sr/)\n"
-"Language: sr\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Todor Grigoriadis <todor@gmx.co.in>, 2018\n"
+"Language-Team: Serbian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/sr/)\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"
+"Language: sr\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:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "O DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Употреба: deadbeef опције -- датотека(е) \n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s — Дневник измена"
+msgid "Options:\n"
+msgstr "Опције:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF преводиоци"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help или -h Прикажи ову помоћ и изађи\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Сачувај подешавања еквилајзера"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Напусти плејер\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Датотеке са подешавањима еквилајзера (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Прикажи инфо о верзији и изађи\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Учитавање подешавања еквилајзера..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Репродукуј\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Подешавања еквилајзера (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Заустави репродукцију\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Увоз Foobar2000 подешавања еквилајзера..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Паузирај репродукцију\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Подешавања еквилајзера - Foobar2000(*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Паузирај\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Сачувај подешавања"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Започни репродукцију ако је заустављена, и обратно\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Учитај подешавања"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Наредна песма из листе\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Увоз Foobar2000 подешавања"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Претходна песма из листе\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Омогући"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Насумично песма из листе\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "На нулу све"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Додај датотеку(е) у постојећу листу\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Претпојачало на нулу"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui ДОДАТАК Додатак граф. сучеља — подразумеван је „ГТК2“\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Подручја на нулу"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Испиши уређени назив песме на стд. излаз\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Поставке"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: a-извођач, t-наслов, b-албум,\n l-трајање, n-бр.песме, y-година, c-примедба,\n r-ауторска права, eпреостало време\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 дан %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " пример: --nowplaying \"%%a - %%t\" ће исписати „Извођач - Наслов“\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d дана %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " за више информација, видите %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Заустављено | %d песама | %s укупно време свирања"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " ПАЖЊА: --nowplaying је застарело\n.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Моно"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Штампај форматирано име песме на stdout, користећи нови начин форматирања\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Стерео"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " FMT синтакса: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d кбпс "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " пример: --nowplaying-tf \"%%artist%% - %%title%%\" треба да штампа \"извођач - име песма\"\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Паузирано | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Штампај или постави deadbeef ниво јачине звука.\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
-"%s%s %s| %d херца | %d бита | %s | %d:%02d / %s | %d песама | %s укупно "
-"време свирања"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Нова листа"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Нова листа (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Листа са језичцима"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Листа"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Делитељ (горе-доле)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Делитељ (лево-десно)"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Подразумевано"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Језичци листе"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Својства одабраног"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Приказ омотнице албума"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Да"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr ""
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Не"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Излазни директоријум:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Упиши у директоријум где је и изворна нумера"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Сачувај структуру директоријума"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Дугме"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Копирај ако се формат не мења"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Поновни таг након копирања"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Назив излазне датотеке:"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Екстензије (као. .mp3) ће бити аутоматски додате.\nОставите поље празно за подразумевано подешавање (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Кодер:"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Поставка диг. обраде звука:"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Неуспело читање датотеке помоћи"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Број нити:"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Неуспело отварање датотеке помоћи"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Излазна дубина бита узорка:"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:14
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"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-битно целобројна\n32-битно једнострука"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Да ли и даље желите да изађете?"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Уколико датотека већ постоји:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Прескочи\nУпитај\nПрепиши"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Уреди поставке кодера"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Назив:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Кодер без назива"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Наставак назива исходишне датотеке:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Нпр. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Линија наредбе:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - назив излазне датотеке\n%i - привренени назив улазне датотеке"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Метод:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Цев\nПривремена Датотека \n Изворна Датотека"
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "Уписуј АПЕв2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "Уписуј ИД3в1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "ОГГ-Ворбис"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "ФЛАК"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "Уписуј ИД3в2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Писач ознака"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Уређивач поставки за диг. обраду звука"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Наслов"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Неназвана поставка диг. обраде звука"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Додај"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Уклони"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Подеси"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Одабир додатка за диг. обраду звука"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Додатак"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Поставке"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Уграђено %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Датотека истог назива већ постоји. Да ли да препишем преко ње?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Упозорење прекодера"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Одаберите кодер"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Грешка прекодера"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Прекодирам..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Одаберите директоријум..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Није успело чување поставки кодера"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Проверите дозволе директоријума за чување поставки, дајте поставки други назив или ослободите мало простора на диску"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Поставка са истим називом већ постоји. Покушајте са другачијим називом."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Грешка"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Додај нови кодер"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Уреди кодер"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Уклони поставку"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Овом радњом ћете обрисати одабрану поставку. Да ли то заиста желите?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Кодери"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Додајте додатак у оквир за диг. обраду звука"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Неуспело чување поставки за диг. обраду звука"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Нова поставка за диг. обраду звука"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Уреди поставку за диг. обраду звука"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Поставке за диг. обраду звука"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Помоћ"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Као у изворној датотеци"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "Означена 8-битно целобројна"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "Означена 16-битно целобројна"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "Означена 24-битно целобројна"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "Означена 32-битно целобројна"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32-битно једнострука"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Прескочи"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Питај ме"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Препиши"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Цев"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr " Привремена Датотека "
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Изворна Датотека"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Не могу пронаћи датотеку са битмапираном сликом: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Отвори датотеку(е)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Додај датотеку(е) у листу..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Додај директоријум(е) у листу..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help_sr.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Учитај листу"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Сачувај листу као"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "O Дедбифу %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "Дедбиф %s — Дневник измена"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Дедбиф преводиоци"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Врста садржаја"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Додаци"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Неисправна вредност(и)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Поља врста садржаја и додаци не могу бити празна, а морају задовољити доња правила.\nПример врсте садржаја: „audio/mpeg“.\nПример ИБ-додатка: „stdmpg ffmpeg“.\nРазмак се мора употребити у листи ИБ-додатака.\nВрста садржаја може садржати само слова, бројке и знак „-“.\nИБ-додатка може садржати само слова и бројке."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Ништа није изабрано."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Отвори датотеку(е)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Додај датотеку(е)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Додај директоријум(е)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Додај место"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Нова листа"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Учитај листу"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Сачувај листу"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Излаз"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "О_чисти"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Изабери све"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Поништи избор"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Обрни избор"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Избор"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Уклони"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Одсеци"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Тражи"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Сложи по"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Наслов"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Број песме"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Албум"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Извођач"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Датум"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Случајно"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Прилагођено"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Подешавања"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "П_реглед"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Статусна трака"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Еквилајзер"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
-msgstr ""
+msgstr "Мењајте изглед програма"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Евиденција"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "Ре_продукција"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Редослед"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Линијски"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Насумично песме"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Насумично албуми"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Понављање"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Понављај све"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Понављај песму"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Без понављања"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Клизач прати репродукцију песама"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Показивач прати репродукцију песама"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Заустави после текуће песме"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Заустави после текућег албума"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Иди на песму која се репродукује"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "Дневник и_змена"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
-msgstr "_GPLv2"
+msgstr "_ГПЛв2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
+msgstr "_ЛГПЛв2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "О прогр_аму"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Преводиоци"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Тражи"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Заустави"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Пусти"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Паузирај"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Претходна"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Наредна"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Пусти насумично"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "О програму"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Излаз"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Помоћ"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Особине песме"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Место:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Подешавања"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "С_ачувај промене"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Подаци о песми"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Особине"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Наслов:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Поништи"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_У реду"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
-msgstr "Унесите име за нову колону овде"
+msgstr "Овде унесите назив нове колоне"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Врста:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Редни број"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Репродукује се"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Омотнице албума"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Извођач — Албум"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Трајање"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Број песме"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Група / Извођач"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Сортирај формат:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(ако није празно)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Поравнање:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Лево"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Десно"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Поништи"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Лево\nДесно\nЦентрирано"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_У реду"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Боја текста:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Излазни додаци:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Излазни уређај"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Увек претварај 8-битни у 16-битни аудио"
+msgstr "Увек претварај 8-битни у 16-битни звук"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "Увек претварај 16-битни у 24-битни звук"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Фреквенцијски опсег:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "За умножак од 48KHz (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "За умножак од 44.1KHz (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Базирано на фреквенцијском опсегу"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Прегази фреквенцијски опсег"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Replaygain мод:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Онемогући"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Izvorni режим:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Песма"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "По редоследу репродукције\nНумера\nАлбум"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Replaygain скала вршних вредности"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Процесира се:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Ниједно\nПримени појачало\nПримени појачало и спречи клипинг при врху\nСамо спречи клипинг"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
-msgstr "-12 dB"
+msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
-msgstr "+12 dB"
+msgstr "+12 дБ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Преамп са RG инфом:"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Replaygain претпојачавач:"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Преамп без RG infoa:"
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Претпојачавач:"
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-"Додај датотеке из линије за наредбе или управника датотека у ову листу:"
+msgstr "Додај датотеке из линије за наредбе или управника датотека у ову листу:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Врати претходну сесију при покретању"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Не учитавај дадотеке из архива приликом додавања директоријума"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "Поставка „Заустави после текуће песме“ биће онемогућена по пуштању нове песме"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "Поставка „Заустави после текућег албума“ биће онемогућена по пуштању нове песме"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Репродукција"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Подеси"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
-msgstr "Поставка за дигиталну обраду"
+msgstr "Поставка за диг. обраду звука"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "У_читај"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
-msgstr "Дигитална обрада звука (DSP)"
+msgstr "Дигитална обрада звука („DSP“)"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
-msgstr "Код клика на затвори смести у обавештајну зону"
+msgstr "Притиском на дугме за излазак смести у обавештајну зону"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Не приказуј икону у обавештајној зони"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Омогући препознавање и снимање за руску кодну страну CP1251"
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Омогући јапанске „Шифт-ЈИС“ препознавање и снимање"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr "Омогући препознавање и снимање за кинеску кодну страну CP936"
+msgstr "Омогући препознавање и снимање за кинеску кодну страну ЦП936"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Освежавање приказа (колико пута у секунди)"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
-msgstr "При репродукцији, испиши на насловној линији: "
+msgstr "При репродукцији, испиши на насловној линији:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
-msgstr "По заустављеној репродукцији, испиши на насловној линији: "
+msgstr "По заустављеној репродукцији, испиши на насловној линији:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "Додатак графичког корисничког интерфејса (неопходно поновно покретање)"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Прикажи укупно време репродукције у статусној траци"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr ""
+msgstr "Свирач"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Затвори листу притиском на точкић миша"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
-msgstr "Самоименовање листа песама при додавању само једног директоријума"
+msgstr "Сам назови листе песама при додавању само једног директоријума"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Сам прилагоди ширину колона према димензијама прозора"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Групно раздвајање:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "пиксели"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Листа"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "Графичко сучеље/Разно"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Замени подразумевано"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Боја текста"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Позадина"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Траке за премотавање/гласноћу"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Средње"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Светло"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Тамно"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Основа"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Текст"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Боје одвајања листова"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr ""
-"Замени подразумевано (губе се ГТК теме погледа стабла, али се добија бржи "
-"приказ)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Паран ред"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr " Непаран ред"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Одабран ред"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Одабран текст"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Показивач"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Боје листе"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Боје"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Trake"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Позадински (Еквилајзер)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Тракe за претрагу/гласноћу/еквилајзер"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "База:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Тамно:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Светло:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Средње:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Текст:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Подебљано"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Kurziv"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Репродукција текста:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Селектовани текст:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Скини таб"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Уопштена песма(е)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Репродукује се:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Селектована песма(е):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Колуме:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Заглавље групе:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Foreground:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Једнаке:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Неправилан:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Селектовано:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Показивач:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Background:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Прегази (губи се стандардна GTK тема, али се убрзава приказ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Изглед"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Омогући прокси сервер"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Адреса прокси сервера:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Порт прокси сервера:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
-msgstr "Тип проксија:"
+msgstr "Врста проксија:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
-msgstr "Прокси корисничко име:"
+msgstr "Прокси — корисничко име:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
-msgstr "Прокси лозинка:"
+msgstr "Прокси — лозинка:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "ХТТП кор. програм:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "Уреди мапирање по врсти садржаја"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "Придружене пречице тастатуре:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Радња:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
-msgstr ""
+msgstr "<Непостављено>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Комбинација тастера:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Опште пречице тастатуре"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "За чување измена притисните дугме \n„Примени“, а за опозив измена дугме „Врати“.\nАко не притиснете дугме „Примени“\nизмене неће бити сачуване!"
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "По_дразумевано"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Пречице тастатуре"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Издање:"
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Ауторска права"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Додаци"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Врати на подразумевано"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Издање:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
-msgstr "URL:"
+msgstr "УРЛ:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Постави произвољан наслов"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Групиши по..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Сложи по..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Облик:"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Растуће"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Опадајуће"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Избор додатка за дигиталну обраду"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Додатак"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Растући\nОпадајући"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Подешавања писача ознака"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
-msgstr "Уписуј ID3v2"
+msgstr "Уписуј ИД3в2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
-msgstr "Уписуј ID3v1"
+msgstr "Уписуј ИД3в1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
-msgstr "Уписуј APEv2"
+msgstr "Уписуј АПЕв2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
-msgstr "Уклони ID3v2"
+msgstr "Уклони ИД3в2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
-msgstr "Уклони ID3v1"
+msgstr "Уклони ИД3в1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
-msgstr "Уклони APEv2"
+msgstr "Уклони АПЕв2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
-msgstr "ID3v2 верзија"
-
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Препоручено)"
+msgstr "ИД3в2-издање"
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Препоручено)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 кодирање знакова (подразумевано је iso8859-1)"
+msgstr "ИД3в1 кодирање знакова (подразумевано је ИСО8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
-msgstr "Уписуј ID3v2.4"
+msgstr "Уписуј ИД3в2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "Мапирање по врсти садржаја"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Врати на подразумевано"
+msgstr "Ова табела одређује везу између врсте садржаја мрежног тока и Дедбиф-декодер додатка. Нпр., мп3 датотеке са врстом садржаја „audio/x-mpeg“ декодираће се дедбифовим „stdmpg“ додатком или „ffmpeg“ додатком."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "Врста садржаја:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "Додаци:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Својства дугмета"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Боја:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Боја текста:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "Икона:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Ознака:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Изаберите радњу"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "Овај прозор вам омогућава да поставите свој наслов за сваку песму. Врло корисна опција за радио станице. Прилагођено именовање песама је могуће у прозору опције „Додај Место...”. Сам наслов песме је видљив у колони са метаподатком \"Извођач\". То изгледа \"прилагођено извођач\" само ако поље Извођач постоји, или пак само \"прилагођено\"."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Извођач / Албум"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Уређивање"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Број песме"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Уреди (на месту)"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Додај ново поље..."
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Уреди Вредност"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Име поља:"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Вредност поља:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Додај колону"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF евиденција"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Уреди колону"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Очисти"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Уклони колону"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "ReplayGain прогрес скенера"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Тренутна датотека:"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Групиши по"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Статус"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Поништи груписање"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Откажи"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Извођач/Датум/Албум"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "ReplayGain резилтат скенирања"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Отвори датотеку..."
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Ажурирaj тагове датотека"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Подеси %s"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Подразумевани звучни уређај"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Додавање датотека..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Иницијализација..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Изменили сте податке за ову песму."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Сачувај подешавања еквилајзера"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Желите ли заиста да затворите овај прозор?"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Датотеке са подешавањима еквилајзера (*.ddbeq)"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "Вишеструке вредности "
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Учитавање подешавања еквилајзера..."
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Кључ"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Подешавања еквилајзера (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Вредност"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Увоз Фубар2000 подешавања еквилајзера..."
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "Вишеструке вредности "
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Подешавања еквилајзера - Фубар2000(*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "Уписујем ознаке..."
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Сачувај подешавања"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "Назив поља"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Учитај подешавања"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "Име:"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Увоз Фубар2000 подешавања"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "Имена поља не могу почињати знацима : или _"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Омогући"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "Не могу да додам поље"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "На нулу све"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "Поље са истим именом већ постоји. Дајте пољу друго име."
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Претпојачало на нулу"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Додај поље"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Подручја на нулу"
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Уклони поље"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Нова листа"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Употреба: deadbeef опције -- датотека(е) \n"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Подржане звучне датотеке"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Опције:\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Све датотеке (*)"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help или -h Прикажи ову помоћ и изађи\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Напусти плејер\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Прикажи инфо о верзији и изађи\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Друге датотеке (*)"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Репродукуј\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Датотека са листом (*.dbpl)"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Заустави репродукцију\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Прати меке везе"
 
-#: ../main.c:97
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Паузирај репродукцију\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 дан %d:%02d:%02d"
 
-#: ../main.c:98
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Паузирај\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d дана %d:%02d:%02d"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
 msgstr ""
-" --play-pause Започни репродукцију ако је заустављена, и обратно\n"
-
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Наредна песма из листе\n"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Претходна песма из листе\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Насумично песма из листе\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Додај датотеку(е) у постојећу листу\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr " --gui ДОДАТАК Додатак граф. сучеља — подразумеван је „GTK2“\n"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Испиши уређено име песме на стд. излаз\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Промени назив листе"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
 msgstr ""
-" FMT %%-syntax: a-извођач, t-наслов, b-албум,\n"
-" l-трајање, n-бр.песме, y-година, c-примедба,\n"
-" r-ауторска права, eпреостало време\n"
 
-#: ../main.c:109
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+msgid "Do you really want to remove the playlist '%s'?"
 msgstr ""
-" Н.пр.: --nowplaying \"%%a - %%t\" ће исписати "
-"\"Извођач - Наслов\"\n"
 
-#: ../main.c:110
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " for more info, see %s\n"
+msgid "New Playlist (%d)"
+msgstr "Нова листа (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Листа са језичцима"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Делитељ (горе-доле)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Делитељ (лево-десно)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Табови"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Језичци листе"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Својства одабраног"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Приказ омотнице албума"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Подразумевано"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Спектрограф"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Да"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "Хор. панои"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Не"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "Вер. панои"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Дугме"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Временска трака"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Контроле репродукције"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Трака управљања гласноћом"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Чиптјун гласови"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Преглед евиденције"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Неуспело читање датотеке помоћи"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Неуспело отварање датотеке помоћи"
+
+#: ../plugins/gtkui/gtkui.c:1712
 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"
-"Прилагођено"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Програм сад извршава позадинске радње. Уколико га искључите сада, ове радње биће поништене или прекинуте, што може довести и до губитка података!"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Да ли и даље желите да изађете?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Left\n"
-"Right"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Лево\n"
-"Десно"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"Онемогући\n"
-"Песма\n"
-"Албум"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
-"Растући\n"
-"Опадајући"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-"2.3 (Препоручено)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
 #, 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 "Do you really want to delete all %d files from the current playlist?%s"
 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Погледај на Last.fm страници"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "Користи ALSA претварања фреквенције узорковања"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Обриши"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Ослободи уређај након завршене репродукције"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Лево"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Најрадије користи бафер величине"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Десно"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Најрадије користи период величине"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Центрирано"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Омогући скроблер"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Онемогући сада се репродукује"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Корисничко име"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Лозинка"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Адреса за скроблер"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "Дај пољу „Извођач — Албум“ предност спрам поља „Извођач“"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "По редоследу репродукције"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Датотека уређаја"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Песма"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Заобиђи грешку код фреквенције узорковања у „OSS4“"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Поништи груписање"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Период освежавања привремене меморије (часова)"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Примени појачало"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Примени појачало и спречи клипинг при врху"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Само спречи клипинг"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Преузми из уграђених ознака"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Растуће"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Преузми из локалних директоријума"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Опадајуће"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Име датотека садржи речи"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Преузми са Last.fm страница"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Преузми са albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Промени величину омотнице према дужој страници"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Користи CDDB/FreeDB"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Препоручено)"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "Користи ЦД-текст, ако је доступан"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB адреса (нпр. 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Ослушкуј CDDB на порту (нпр. '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Најрадије користи CDDB протокол"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Извођач / Албум"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "Укључи подршку за NRG слике"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Број песме"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Квалитет промене фреквенције узорковања (0..2, више је боље)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-битни излаз (16-битни је подразумеван)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Трајање"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Најдуже трајање песме (минута)"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Редни број"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "Трајање утишавања (секунди)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Репродукује се"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "Понављај — колико пута (уколико је доступно)"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Омотнице албума"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Захтевај дозволу за брисање датотека са диска"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Извођач — Албум"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Осетљивост контроле гласноће преко иконе стања"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Година"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Прилагођена икона стања"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Број песме"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Покрени \"gtk_init\" са \"--sync\" (режим отклањања грешака)"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Група / Извођач"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Додај раздвајаче између ставки додатака у контекстном менију"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Кодек"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Облик наслова обавештења"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Битрејт"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Облик садржаја обавештења"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Додај колону"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Прикажи омотницу албума"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Уреди колону"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Величина омотнице албума (у пикселима)"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Уклони колону"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio звучни сервер"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Усидри „Обједини“ при листању"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Фреквенција узорковања (Samplerate)"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Обједини"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Релативна путања за претраживање"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Извођач/Датум/Албум"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Потпуна путања за претраживање"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Замени аудио-бајт редослед (искључити ако не чујете нормалан звук)"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Омогући HVSC Songlength DB"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (из HVSC)"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Освежи податке о песми"
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "бита по узорку (8 или 16)"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Подразумевано трајање песме (секунди)"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Подешавања за Timidity++"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Наслов песме"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Извођач"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Уклони листу"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Укупно песмама"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Додај нову листу"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Жанр"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Композитор"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Број диска"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Отвори датотеку..."
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Напомена"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Подеси %s"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Енкодер / Испоручилац"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Изменили сте поставке пречица тастатуре али их нисте сачували!"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Додај место"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Желите ли да наставите упркос несачуваним изменама?"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Ред.бр. нумере на албуму"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Подразумевани звучни уређај"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Тип(ови) ознаке"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Додавање датотека..."
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Угњеждени Cuesheet"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Иницијализација..."
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Кодек"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr " Процес ажурирања тагова датотека"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Наставци имена датотека (раздвоји са ;)"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Назив"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Прекодирај"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Појачало за албум"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Појачало за песму"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Врх Албума"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Врх Песама"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Успешно"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Датотека није нађена"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Покварена датотека"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Претражи (%list_total% results)"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Циљна фреквенција узорковања"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Прикажи заглавља колона"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Квалитет / Алгоритам"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Вредност"
+
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Изменили сте податке за ову песму."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Желите ли заиста да затворите овај прозор?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Вишеструке вредности "
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Кључ"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Вишеструке вредности "
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Уписујем ознаке..."
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
-"Аутоматска фреквенција узорковања (преклапа циљну фреквенцију узорковања)"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "Без паузе између нумера (брже скенирање)"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Назив поља"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
-"Радије користи „Ken“ него „Satoh“ емулацију (окружујући звук неће радити)"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Назив:"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Омогући окружујући звук"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Називи поља не могу почињати знацима : или _"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Не могу да додам поље"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Датотека са истим именом већ постоји. Да ли да препишем преко ње?"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Поље са истим називом већ постоји. Покушајте са другачијим називом."
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Упозорење прекодера"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "Пано „%s“ није доступан"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Одаберите кодер"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Замени са..."
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Грешка прекодера"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Уметни..."
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Прекодирам..."
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Исеци"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Одаберите директоријум..."
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Умножи"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Није успело чување поставки кодера"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Убаци"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
-"Проверите дозволе директоријума за чување поставки или дајте поставки друго "
-"име или проверите да ли имате довољно слободног простора на диску"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "Поставка са истим именом већ постоји. Дајте поставци друго име."
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Нису могуће вишеструке појаве паноа ове врсте"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Грешка"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr " Пропорционално увеличавање"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Додај нови кодер"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Закључајте висину горње секције"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Уреди кодер"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Закључајте ширину леве секције"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Уклони поставку"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Закључајте висину доње секције"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Овом радњом ћете обрисати одабрану поставку. Да ли то заиста желите?"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr " Закључајте ширину десне секције"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Кодери"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Преименуј Таб"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Додајте додатак у оквир за дигиталну обраду"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Уклони Таб"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Није успело чување поставки за дигиталну обраду"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Додај Нови Таб"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Нова поставка за дигиталну обраду"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Помери Таб Лево"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Уреди поставку за дигиталну обраду"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Помери Таб Десно"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Поставке за дигиталну обраду"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Излазни директоријум:"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "Упиши у директоријум где је и изворна нумера"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "Сачувај структуру директоријума"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Име датотеке на излазу:"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
-msgstr ""
-"Сам ћу додати наставак имена датотеке (нпр. .mp3).\n"
-"За подразумевано именовање датотеке (%a - %t) \n"
-"оставите ово поље празним."
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Кодер:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Поставка за дигиталну обраду:"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Број нити:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Излазна дубина бита узорка:"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Као у изворној датотеци"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "Означена 8-битно целобројна"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "Означена 16-битно целобројна"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "Означена 24-битно целобројна"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "Означена 32-битно целобројна"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32-битно једнострука"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Уколико датотека већ постоји:"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Питај ме"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Препиши"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Уреди поставке кодера"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Неименован кодер"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Наставак имена датотеке на излазу:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Нпр. mp3"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Линија наредбе:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
-"На пример: lame - %o\n"
-"%i за улазну датотеку, %o за излазну датотеку, - за стандардни улаз (stdin)"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
-"%o - име излазне датотеке\n"
-"%i - привренено име улазне датотеке"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Метод:"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Цев"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Проширите простор за 1 елемент"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Привремена датотека"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Скупите простор за 1 елемент"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "Уписуј APEv2"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Истородно"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "Уписуј ID3v1"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Прошири"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Попуни"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Подеси Дугме"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "Уписуј ID3v2"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Писач ознака"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Уређивач поставки за дигиталну обраду"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Неименована поставка за дигиталну обраду"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Гласови:"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Додај"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/hotkeys/actionhandlers.c:827
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не могу пронаћи датотеку са битмапираном сликом: %s"
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
-"Задржи изворни формат\n"
-"Означена 8-битно целобројна\n"
-"Означена 16-битно целобројна\n"
-"Означена 24-битно целобројна\n"
-"Означена 32-битно целобројна\n"
-"32-битно једнострука"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
-"Питај\n"
-"Препиши"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
-"Цев\n"
-"Привремена датотека"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Ставке"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Прегледник листе"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr "Прилагођене наредбене линије"
-
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Уређивање"
+msgstr "Прилагођене линије наредбе"
 
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
@@ -2082,9 +2622,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"Произвољна наредба љуске — Извршиће се у окружењу љуске из којег је и главни "
-"програм покренут. Форматирање наслова је могуће. Нпр: xdg-open %D"
+msgstr "Произвољна наредба љуске — Извршиће се у окружењу љуске из којег је и главни програм покренут. Форматирање назива је могуће. Нпр: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2094,16 +2632,14 @@
 #: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr "Слободно-дато име. Нпр. „Моја наредба љуске“"
+msgstr "Произвољан назив, нпр. „Моја наредба љуске“"
 
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
-"ИБ наредбе је обично је врло кратак (нпр. „youtube_open“), а мора бити "
-"јединствен."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "ИБ наредбе је обично је врло кратак (нпр. „youtube_open“), а мора бити јединствен."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
@@ -2148,12 +2684,12 @@
 #: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Опште (гл. изборник)"
 
 #: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
-msgstr "Ставка ће се приказати у главном менију"
+msgstr "Ставка ће се приказати у главном изборнику"
 
 #: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
@@ -2161,16 +2697,12 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
+msgstr "За додавање нове наредбе у гл. изборник, обезбедите да њен назив садржи путању као, нпр.: „Edit/НоваНаредба“, где је „Edit“ назив ставке главног изборника (на енглеском)."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "Додај наредбу"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Обриши"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "Овом радњом ћете обрисати одабрану наредбу. Да ли то заиста желите?"
@@ -2185,7 +2717,7 @@
 
 #: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr "Поље „Наслов“ не може бити празно\n"
+msgstr "Поље „Назив“ не може бити празно!\n"
 
 #: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
@@ -2196,190 +2728,1240 @@
 msgid "Invalid Values"
 msgstr "неисправна вредност"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Подржане звучне датотеке"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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“."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Све датотеке (*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "моно"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "стерео"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Отвори датотеку(е)..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Наслов песме"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Додај датотеку(е) у листу..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Извођач"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Додај директоријум(е) у листу..."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Укупно песмама"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "Прати меке везе"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Жанр"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Композитор"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Број диска"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Укупно Дискова"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Напомена"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Енкодер / Испоручилац"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Ауторска права"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Додај место"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Ред.бр. нумере на албуму"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Тип(ови) ознаке"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Угњеждени Cuesheet"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Обриши датотеке са диска"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
-"Датотеке ће бити обрисане. Да ли сте сигурни?\n"
-"(Овај дијалог може да се искључи у подешавањима додатка „GTKUI“)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Учитај листу"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Дај предност Кен уместо Сатох емулацији (окружујући звук неће радити)"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Друге датотеке (*)"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Омогући окружујући звук"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Сачувај листу као"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Употребљавај АЛСА-претварања учестаности узорковања"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Датотека са листом (*.dbpl)"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Најрадије користи бафер величине"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "Врста садржаја"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Најрадије користи период величине"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "Неисправна вредност(и)."
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Преузми из уграђених ознака"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Преузми из локалних директоријума"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Дохвати са Last.fm"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Дохвати са MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Дохвати са Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Ништа није изабрано."
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Када слике не постоје"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "остави празно"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "користи већ постојеће DeaDBeeF слике"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "приказуј слику коју сте убацили"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Прилагођени пут до слике"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Замени са..."
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Уметни..."
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Исеци"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Умножи"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Убаци"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "CD драјв за учитавање"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Аудио CD Драјв"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Датотека"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Додај звучни ЦД"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Закључај померања"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Помери језичак улево"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Помери језичак удесно"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Уклони језичак"
-
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Преименуј језичак"
-
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Додај нови језичак"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Користи ЦД-текст, ако је доступан"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Прикажи заглавља колона"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "Прошири бокс једном ставком"
-
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "Сузи бокс за 1 ставку"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "Истородно"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Користи CDDB протокол"
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Прошири"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Укључи подршку за НРГ слике"
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Попуни"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Брзина драјва за нормалну репродукцију"
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Подесите дугме"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Максимално"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Користи cdparanoia за преправку грешака при риповању"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Прекодирај"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Аутодетекција фреквенцијског опсега са излазног уређаја"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Постави фреквенцијски опсег директно"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Квалитет / Алгоритам"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Звуковни појачавач (рампинг)"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Само Укључено/Искључено"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Пуно"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Користи све ffmpeg подржане екстензије "
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Наставци назива датотека (раздвоји са ;)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Најдуже трајање песме (минута)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Трајање утишавања (секунди)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Понављај — колико пута (уколико је доступно)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (за SGC формат датотеке)"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Уклони ReplayGain информације"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Скенирај селектовано као албуме (По Таговима)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Скенирај селектовано као један албум"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Скенирај сваку песму као засебан појам"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Деселектуј све"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Селектуј све"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Додај Mesto"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Додај Директоријум(е)"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Додај Датотеку(е)"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Отвори Датотеку(е)"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Прикажи Страну за помоћ"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Укључи/Искључи да се показивач пребацује на место репродукције "
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Укључи/Искључи da скрол прати репродукцију"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Поглед"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Прикажи\\/Сакриј мени"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Прикажи\\/Сакриј статусну траку"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Укључи/Искључи Дизајнерски режим"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Сортирај Прилагођене"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Подрежи Селектоване"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Сачувај Плејлисту"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Уклоните Тренутну Плејлисту"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Прикажи\\/Сакриј Еквилајзер"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Сакриј Еквилајзер"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Прикажи еквилајзер"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Прикажи\\/Сакриј Прозор Програма"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Сакриј Прозор Програма"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Прикажи Прозор Програма"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Нађи"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Прикажи\\/Сакриј Прозор Евиденције"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Захтевај дозволу за брисање датотека са диска"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Осетљивост контроле гласноће преко иконе стања"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Прилагођена икона стања"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Додај раздвајаче између ставки додатака у везаном изборнику"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Користи уникод карактере уместо слика за тренутно стање песме"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Искључите текст на временској траци"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Прескочи на"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Следећа Плејлиста"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Сортирај Насумично"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Инвертуј Селекцију"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Очисти Плејлисту"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Помери"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Помери песме доле"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Помери песме горе"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Укључи/Искључи звук"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Укључи/Искључи паузу"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Репродукција\\/Пауза"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Напред за 1с"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Назад за 1с"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Напред за 5с"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Назад за 5с"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Напред за 1%"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Назад за 1%"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Напред за 5%"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Назад за 5%"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Појачај звук"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Утишај звук"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Укључи/Искључи заустави после тренутне песме"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Укључи/Искључи заустави после тренутног албума"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Омогући скроблер"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Онемогући сада се репродукује"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Корисничко име"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Лозинка"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Адреса за скроблер"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Дај пољу „Извођач — Албум“ предност спрам поља „Извођач“"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Пошаљи MusicBrainz ID"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Предај песме краће од 30 секунди (није препоручено)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Присили излазни звук на 16 бита"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Позадински рад"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Облик наслова обавештења"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Облик садржаја обавештења"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Прикажи омотницу албума"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Величина омотнице албума (у пикселима)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Датотека уређаја"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Означи тренутну плејлисту"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Репродукција на дупли клик"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Подразумевана дужина песме (у минутима)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Учестаност узорковања („Samplerate“)"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Прескочи када је краће од (секунде)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Подеси произвољне наредбе љуске"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Релативна путања за претраживање"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Потпуна путања за претраживање"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Замени аудио-бајт редослед (искључите ако не чујете нормалан звук)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Омогући ХВСЦ сонгленгт БП"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Бит по фреквенцији"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Подразумевано трајање песме (секунди)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Моно синтеза"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Преамп"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Подешавања за Тимидити++"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/sr@latin.po -> deadbeef-1.9.6.tar.bz2/po/sr@latin.po Changed

@@ -1,2344 +1,3967 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Jay Alexander Fleming <tito.nehru.naser@gmail.com>, 2010
 # Jay Alexander Fleming <tito.nehru.naser@gmail.com>, 2010
+# Todor Grigoriadis <todor@gmx.co.in>, 2018
+# Todor Grigoriadis <todor@gmx.co.in>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/sr@latin/)\n"
-"Language: sr@latin\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Todor Grigoriadis <todor@gmx.co.in>, 2018\n"
+"Language-Team: Serbian (Latin) (http://app.transifex.com/deadbeef-player/deadbeef-player/language/sr@latin/)\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"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../src/main.c:134
+#, c-format
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
+
+#: ../src/main.c:135
+#, c-format
+msgid "Options:\n"
+msgstr "Opcije:\n"
+
+#: ../src/main.c:136
+#, 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"
+
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Napusti plejer\n"
+
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Prikaži info o verziji i izađi\n"
+
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Reprodukuj\n"
+
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Zaustavi reprodukciju\n"
+
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pauziraj reprodukciju\n"
+
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
+
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
+
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Naredna pesma iz liste\n"
+
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Prethodna pesma iz liste\n"
+
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Nasumično pesma iz liste\n"
+
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Dodaj datoteku(e) u postojeću listu\n"
+
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
+
+#: ../src/main.c:149
+#, 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"
+
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: a-izvođač, t-naslov, b-album,\n l-trajanje, n-br.pesme, y-godina, c-primedba,\n r-autorska prava, epreostalo vreme\n"
+
+#: ../src/main.c:153
+#, c-format
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Podrazumevano"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Da"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Ne"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:14
+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 ""
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Naslov:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Naslov"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Dodaj"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Ukloni"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Podesi"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Početne postavke"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Upozorenje"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Pomoć"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Ne mogu pronaći datoteku sa bitmapiranom slikom: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "O DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s — Dnevnik izmena"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF prevodioci"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Dodaci"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Otvori datoteku(e)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Dodaj datoteku(e)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Dodaj direktorijum(e)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Dodaj mesto"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Nova lista"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Učitaj listu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Sačuvaj listu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "_Izlaz"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Uređivanje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "O_čisti"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Izaberi sve"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Poništi izbor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Obrni izbor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Izbor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Odseci"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "_Traži"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr "Sortirano po"
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Broj numere"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Izvođač"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Datum"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Slučajno"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Prilagođeno"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Podešavanja"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "P_regled"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Statusna traka"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Ekvilajzer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr "Dizajnerski režim"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Evidencija"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "Re_produkcija"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Klizač prati reprodukciju pesama"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Pokazivač prati reprodukciju pesama"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr "Zaustavi posle trenutne numere"
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr "Zaustavi posle trenutnog albuma"
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Idi na pesmu koja se reprodukuje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "_Pomoć"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "Dnevnik i_zmena"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "O progr_amu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Prevodioci"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Traži"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Zaustavi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Pusti"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Pauziraj"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Prethodna"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Naredna"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Pusti nasumično"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "O programu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Izlaz"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Osobine pesme"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "Lokacija:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Podešavanja"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "S_ačuvaj promene"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "_Zatvori"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Podaci o pesmi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Osobine"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Poništi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_U redu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Unesite ime za novu kolonu ovde"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Format:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Sortiraj po formatu:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(ako nije prazno)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Poravnanje:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Boja teksta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Izlazni dodaci:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Izlazni uređaj"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Zvučni zapis od 8-bita uvek konvertuj u 16-bita "
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Zvučni zapis od 16-bita uvek konvertuj u 24-bita"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Frekvencijski opseg"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Bazirano na izabranom frekvencijskom opsegu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Pregazi frekvencijski opseg"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Zvuk"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Procesiranje:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+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:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Vrati prethodnu sesiju pri pokretanju"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Ne učitavaj datoteke iz arhiva prilikom dodavanja direktorijuma"
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Reprodukcija"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Kod klika na zatvori smesti u obaveštajnu zonu"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Ne prikazuj ikonu u obaveštajnoj zoni"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Omogući Japansku „SHIFT-JIS detekciju i snimanje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr "Omogući Kinesku CP936 detekciju i snimanje"
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr "Pri reprodukciji, ispiši na naslovnoj liniji: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr "Po zaustavljenoj reprodukciji, ispiši na naslovnoj liniji: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr "Muzički program"
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr "Zatvori plejliste sa srednjim klikom"
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr "Automatski imenuj plejlistu kada se dodaje jedan direktorijum"
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr "Automatski podesi veličinu koluma kako bi odgovarale prozoru "
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pikseli"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Plejlista"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Zameni podrazumevano"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Tamno:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Svetlo:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Srednje:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Tekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Podebljano"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Italik"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Tekst reprodukcije:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Izabrani tekst:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Puštena numera:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Kolume:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Jednaki:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Pregazi (gubi se podrazumevana GTK tema, ali se ubrzava prikaz)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "Omogući proksi server"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "Adresa proksi servera:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "Port proksi servera:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "Tip proksija:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "Proksi korisničko ime:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "Proksi lozinka:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "Mreža"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "Upisuj ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "Upisuj ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "Upisuj APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr "Ukloni ID3v2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr "Ukloni ID3v1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr "Ukloni APEv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "ID3v2 verzija"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Preporučeno)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 kodiranje znakova (podrazumevano je iso8859-1)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "Upisuj ID3v2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr "Osobine dugmeta"
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:353
-#, c-format
-msgid "About DeaDBeeF %s"
-msgstr "O DeaDBeeF %s"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
-#, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s — Dnevnik izmena"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:626
-#, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF prevodioci"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:141
+#: ../plugins/gtkui/eq.c:136
 msgid "Save DeaDBeeF EQ Preset"
 msgstr "Sačuvaj podešavanja ekvilajzera"
 
-#: ../plugins/gtkui/eq.c:148
+#: ../plugins/gtkui/eq.c:143
 msgid "DeaDBeeF EQ preset files (*.ddbeq)"
 msgstr "Datoteke sa podešavanjima ekvilajzera (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:187
+#: ../plugins/gtkui/eq.c:183
 msgid "Load DeaDBeeF EQ Preset..."
 msgstr "Učitavanje podešavanja ekvilajzera..."
 
-#: ../plugins/gtkui/eq.c:191
+#: ../plugins/gtkui/eq.c:187
 msgid "DeaDBeeF EQ presets (*.ddbeq)"
 msgstr "Podešavanja ekvilajzera (*.ddbeq)"
 
-#: ../plugins/gtkui/eq.c:252
+#: ../plugins/gtkui/eq.c:224
 msgid "Import Foobar2000 EQ Preset..."
 msgstr "Uvoz Foobar2000 podešavanja ekvilajzera..."
 
-#: ../plugins/gtkui/eq.c:256
+#: ../plugins/gtkui/eq.c:228
 msgid "Foobar2000 EQ presets (*.feq)"
 msgstr "Podešavanja ekvilajzera - Foobar2000(*.feq)"
 
-#: ../plugins/gtkui/eq.c:321
+#: ../plugins/gtkui/eq.c:269
 msgid "Save Preset"
 msgstr "Sačuvaj podešavanja"
 
-#: ../plugins/gtkui/eq.c:329
+#: ../plugins/gtkui/eq.c:277
 msgid "Load Preset"
 msgstr "Učitaj podešavanja"
 
-#: ../plugins/gtkui/eq.c:337
+#: ../plugins/gtkui/eq.c:285
 msgid "Import Foobar2000 Preset"
 msgstr "Uvoz Foobar2000 podešavanja"
 
-#: ../plugins/gtkui/eq.c:362
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
 msgid "Enable"
 msgstr "Omogući"
 
-#: ../plugins/gtkui/eq.c:371
+#: ../plugins/gtkui/eq.c:320
 msgid "Zero All"
 msgstr "Na nulu sve"
 
-#: ../plugins/gtkui/eq.c:378
+#: ../plugins/gtkui/eq.c:327
 msgid "Zero Preamp"
 msgstr "Pretpojačalo na nulu"
 
-#: ../plugins/gtkui/eq.c:385
+#: ../plugins/gtkui/eq.c:334
 msgid "Zero Bands"
 msgstr "Područja na nulu"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Nova lista"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
 msgid "1 day %d:%02d:%02d"
 msgstr "1 dan %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
 msgid "%d days %d:%02d:%02d"
 msgstr "%d dana %d:%02d:%02d"
 
-#: ../plugins/gtkui/gtkui.c:179
-#, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Zaustavljeno | %d pesama | %s ukupno vreme sviranja"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pauzirano | "
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
-msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
 msgstr ""
-"%s%s %s| %d herca | %d bita | %s | %d:%02d / %s | %d pesama | %s ukupno "
-"vreme sviranja"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Nova lista"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
 msgid "New Playlist (%d)"
 msgstr "Nova lista (%d)"
 
 #. register widget types
-#: ../plugins/gtkui/gtkui.c:956
+#: ../plugins/gtkui/gtkui.c:1452
 msgid "Playlist with tabs"
-msgstr ""
+msgstr "Plejlista sa tabovima"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:960
+#: ../plugins/gtkui/gtkui.c:1456
 msgid "Splitter (top and bottom)"
-msgstr ""
+msgstr "Spliter (gornji i donji)"
 
-#: ../plugins/gtkui/gtkui.c:961
+#: ../plugins/gtkui/gtkui.c:1457
 msgid "Splitter (left and right)"
-msgstr ""
+msgstr "Spliter (levi i desni)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Tabovi"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
+#: ../plugins/gtkui/gtkui.c:1460
 msgid "Playlist tabs"
-msgstr ""
+msgstr "Tabovi u plejlisti"
 
-#: ../plugins/gtkui/gtkui.c:965
+#: ../plugins/gtkui/gtkui.c:1461
 msgid "Selection properties"
-msgstr ""
+msgstr "Osobine izabranih"
 
-#: ../plugins/gtkui/gtkui.c:966
+#: ../plugins/gtkui/gtkui.c:1462
 msgid "Album art display"
-msgstr ""
+msgstr "Prikaz omota albuma"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
+#: ../plugins/gtkui/gtkui.c:1464
 msgid "Spectrum"
-msgstr ""
+msgstr "Spektrum"
 
-#: ../plugins/gtkui/gtkui.c:969
+#: ../plugins/gtkui/gtkui.c:1465
 msgid "HBox"
-msgstr ""
+msgstr "HBox"
 
-#: ../plugins/gtkui/gtkui.c:970
+#: ../plugins/gtkui/gtkui.c:1466
 msgid "VBox"
-msgstr ""
+msgstr "VBox"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
 msgid "Button"
-msgstr ""
+msgstr "Dugme"
 
-#: ../plugins/gtkui/gtkui.c:972
+#: ../plugins/gtkui/gtkui.c:1468
 msgid "Seekbar"
-msgstr ""
+msgstr "Traka za pretragu"
 
-#: ../plugins/gtkui/gtkui.c:973
+#: ../plugins/gtkui/gtkui.c:1469
 msgid "Playback controls"
-msgstr ""
+msgstr "Kontrole reprodukcije"
 
-#: ../plugins/gtkui/gtkui.c:974
+#: ../plugins/gtkui/gtkui.c:1470
 msgid "Volume bar"
-msgstr ""
+msgstr "Traka za jačinu zvuka"
 
-#: ../plugins/gtkui/gtkui.c:975
+#: ../plugins/gtkui/gtkui.c:1471
 msgid "Chiptune voices"
+msgstr "Chiptune glasovi"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Pregled evidencije"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
+#: ../plugins/gtkui/gtkui.c:1685
 msgid "Failed while reading help file"
 msgstr "Neuspelo čitanje datoteke pomoći"
 
-#: ../plugins/gtkui/gtkui.c:1160
+#: ../plugins/gtkui/gtkui.c:1695
 msgid "Failed to load help file"
 msgstr "Neuspelo otvaranje datoteke pomoći"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Program trenutno obavlja pozadinske odredbe. Ako izađete sada, odredbe će biti prekinute ili otkazane. To se može rezultirati gubitkom podataka."
 
-#: ../plugins/gtkui/gtkui.c:1173
+#: ../plugins/gtkui/gtkui.c:1714
 msgid "Do you still want to quit?"
-msgstr ""
-
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Upozorenje"
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Otvori datoteku(e)"
-
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Dodaj datoteku(e)"
+msgstr "Da li još uvek želite izaći?"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Dodaj direktorijum(e)"
-
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Dodaj mesto"
-
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Nova lista"
-
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Učitaj listu"
-
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Sačuvaj listu"
-
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "_Izlaz"
-
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Uređivanje"
-
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "O_čisti"
-
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Izaberi sve"
-
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Poništi izbor"
-
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Obrni izbor"
-
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Izbor"
-
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Ukloni"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Odseci"
-
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "_Traži"
-
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Naslov"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Album"
-
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Izvođač"
-
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Datum"
-
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Slučajno"
-
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Prilagođeno"
-
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Podešavanja"
-
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "P_regled"
-
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Statusna traka"
-
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Ekvilajzer"
-
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "Re_produkcija"
-
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Redosled"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Linijski"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Ponavljanje"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Klizač prati reprodukciju pesama"
-
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Pokazivač prati reprodukciju pesama"
-
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Idi na pesmu koja se reprodukuje"
-
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "Dnevnik i_zmena"
-
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
-
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
-
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "O progr_amu"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "_Prevodioci"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Traži"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Levo"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Zaustavi"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Desno"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Pusti"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Središno"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Pauziraj"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Prethodna"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Naredna"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Pusti nasumično"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "O programu"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Izlaz"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Po redu reprodukcije"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Pomoć"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Pesma"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Osobine pesme"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Poništi grupisanje"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "S_ačuvaj promene"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "_Zatvori"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Podaci o pesmi"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Osobine"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Preporučeno)"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Naslov:"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Unesite ime za novu kolonu ovde"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Izvođač / Album"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Vrsta:"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Broj pesme"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Trajanje"
 
-#: ../plugins/gtkui/interface.c:1343
+#: ../plugins/gtkui/playlist/plcommon.c:73
 msgid "Item Index"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1344
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
 msgid "Playing"
 msgstr "Reprodukuje se"
 
-#: ../plugins/gtkui/interface.c:1345
+#: ../plugins/gtkui/playlist/plcommon.c:75
 msgid "Album Art"
 msgstr "Omotnice albuma"
 
-#: ../plugins/gtkui/interface.c:1346
+#: ../plugins/gtkui/playlist/plcommon.c:76
 msgid "Artist - Album"
 msgstr "Izvođač — Album"
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Trajanje"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
 msgid "Track Number"
 msgstr "Broj pesme"
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
 msgid "Band / Album Artist"
 msgstr "Grupa / Izvođač"
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Format:"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Kodek"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Poravnanje:"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Levo"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Dodaj kolonu"
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Desno"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Uredi kolonu"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Poništi"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Ukloni kolonu"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_U redu"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Izlazni dodaci:"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Grupiši po"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Izlazni uređaj"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Izvođač/Datum/Album"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Zvuk"
-
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Replaygain mod:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Onemogući"
-
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Pesma"
-
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Replaygain skala vršnih vrednosti"
-
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
 msgstr ""
-"Dodaj datoteke iz linije za naredbe ili upravnika datoteka u ovu listu:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "Vrati prethodnu sesiju pri pokretanju"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Reprodukcija"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Podesi"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Otvori datoteku..."
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Kod klika na zatvori smesti u obaveštajnu zonu"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Podrazumevani zvučni uređaj"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Ne prikazuj ikonu u obaveštajnoj zoni"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Dodavanje datoteka..."
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Inicijalizacija..."
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
-msgstr "Pri reprodukciji, ispiši na naslovnoj liniji: "
-
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
-msgstr "Po zaustavljenoj reprodukciji, ispiši na naslovnoj liniji: "
-
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Zameni podrazumevano"
-
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Boja teksta"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Pozadina"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Trake za premotavanje/glasnoću"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Srednje"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Svetlo"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Tamno"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Osnova"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Vrednost"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Tekst"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Izmenili ste podatke za ovu pesmu."
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Boje odvajanja listova"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Želite li zaista da zatvorite ovaj prozor?"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
 msgstr ""
-"Zameni podrazumevano (gube se GTK teme pogleda stabla, ali se dobija brži "
-"prikaz)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Paran red"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr " Neparan red"
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Odabran red"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Odabran tekst"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Pokazivač"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Ključ"
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Boje liste"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Boje"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "Omogući proksi server"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "Adresa proksi servera:"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "Port proksi servera:"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "Tip proksija:"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "Proksi korisničko ime:"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "Proksi lozinka:"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "Mreža"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Autorska prava"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Dodaci"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "Upisuj ID3v2"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "Upisuj ID3v1"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "Upisuj APEv2"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
-msgstr "Ukloni ID3v2"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
-msgstr "Ukloni ID3v1"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
-msgstr "Ukloni APEv2"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "ID3v2 verzija"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Preporučeno)"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 kodiranje znakova (podrazumevano je iso8859-1)"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "Upisuj ID3v2.4"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
-msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
-msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Izvođač / Album"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Broj pesme"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Dodaj kolonu"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Uredi kolonu"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Ukloni kolonu"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Grupiši po"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Poništi grupisanje"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Izvođač/Datum/Album"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Otvori datoteku..."
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
 #, c-format
-msgid "Configure %s"
+msgid "%dd %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Podrazumevani zvučni uređaj"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Dodavanje datoteka..."
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Inicijalizacija..."
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Izmenili ste podatke za ovu pesmu."
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Želite li zaista da zatvorite ovaj prozor?"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr ""
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Ključ"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Vrednost"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Opcije:\n"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr ""
 
-#: ../main.c:92
-#, 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/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Napusti plejer\n"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Prikaži info o verziji i izađi\n"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Reprodukuj\n"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Zaustavi reprodukciju\n"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pauziraj reprodukciju\n"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
 msgstr ""
 
-#: ../main.c:99
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, c-format
 msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+"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\"."
+
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Naredna pesma iz liste\n"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Prethodna pesma iz liste\n"
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Naslov pesme"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Nasumično pesma iz liste\n"
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Izvođač"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Dodaj datoteku(e) u postojeću listu\n"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Ukupno pesmama"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Žanr"
 
-#: ../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"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Kompozitor"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-syntax: a-izvođač, t-naslov, b-album,\n"
-" l-trajanje, n-br.pesme, y-godina, c-primedba,\n"
-" r-autorska prava, epreostalo vreme\n"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Broj diska"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
-" N.pr.: --nowplaying \"%%a - %%t\" će ispisati "
-"\"Izvođač - Naslov\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Napomena"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Podrazumevano"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Enkoder / Isporučilac"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Da"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Autorska prava"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Ne"
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Dodaj mesto"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
 msgstr ""
-"Levo\n"
-"Desno"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Onemogući\n"
-"Pesma\n"
-"Album"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tip(ovi) oznake"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Ugnježdeni Cuesheet"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
-"2.3 (Preporučeno)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 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
-#: ../translation/extra.c:3
-msgid "Add Audio CD"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Pogledaj na Last.fm stranici"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
 msgid "Use ALSA resampling"
 msgstr "Koristi ALSA pretvaranja frekvencije uzorkovanja"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Oslobodi uređaj nakon završene reprodukcije"
-
-#: ../translation/extra.c:8 ../translation/extra.c:55
+#: ../translation/plugins.c:17
+#, no-c-format
 msgid "Preferred buffer size"
 msgstr "Najradije koristi bafer veličine"
 
-#: ../translation/extra.c:9
+#: ../translation/plugins.c:19
+#, no-c-format
 msgid "Preferred period size"
 msgstr "Najradije koristi period veličine"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Omogući skrobler"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Onemogući sada se reprodukuje"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Preuzmi iz ugrađenih oznaka"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Korisničko ime"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Preuzmi iz lokalnih direktorijuma"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Lozinka"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Adresa za skrobler"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Period osvežavanja privremene memorije (časova)"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Preuzmi iz ugrađenih oznaka"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Preuzmi iz lokalnih direktorijuma"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Ime datoteka sadrži reči"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr ""
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr ""
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Preuzmi sa Last.fm stranica"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Preuzmi sa albumart.org"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "Koristi CDDB/FreeDB"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
 
-#: ../translation/extra.c:30
+#: ../translation/plugins.c:71
+#, no-c-format
 msgid "Prefer CD-Text over CDDB"
 msgstr "Koristi CD-tekst, ako je dostupan"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB adresa (npr. 'freedb.org')"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Osluškuj CDDB na portu (npr. '888')"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Najradije koristi CDDB protokol"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr ""
 
-#: ../translation/extra.c:34
+#: ../translation/plugins.c:79
+#, no-c-format
 msgid "Enable NRG image support"
 msgstr "Uključi podršku za NRG slike"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Kvalitet promene frekvencije uzorkovanja (0..2, više je bolje)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "Najduže trajanje pesme (minuta)"
-
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Zahtevaj dozvolu za brisanje datoteka sa diska"
-
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Osetljivost kontrole glasnoće preko ikone stanja"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Prilagođena ikona stanja"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Pokreni \"gtk_init\" sa \"--sync\" (režim otklanjanja grešaka)"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio zvučni server"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Frekvencija uzorkovanja (Samplerate)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Relativna putanja za pretraživanje"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Potpuna putanja za pretraživanje"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Zameni audio-bajt redosled (isključiti ako ne čujete normalan zvuk)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Podešavanja za Timidity++"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Najduže trajanje pesme (minuta)"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Naslov pesme"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Izvođač"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Ukupno pesmama"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Žanr"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Kompozitor"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Broj diska"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Napomena"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Enkoder / Isporučilac"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Dodaj mesto"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tip(ovi) oznake"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Ugnježdeni Cuesheet"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Kodek"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Zahtevaj dozvolu za brisanje datoteka sa diska"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Osetljivost kontrole glasnoće preko ikone stanja"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Prilagođena ikona stanja"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:256
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:297
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:299
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Dodaj"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Ne mogu pronaći datoteku sa bitmapiranom slikom: %s"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:355
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Play\\/Pause"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Omogući skrobler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Onemogući sada se reprodukuje"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Korisničko ime"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Lozinka"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Adresa za skrobler"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Frekvencija uzorkovanja (Samplerate)"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Relativna putanja za pretraživanje"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Potpuna putanja za pretraživanje"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Zameni audio-bajt redosled (isključiti ako ne čujete normalan zvuk)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Podešavanja za Timidity++"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/sv.po -> deadbeef-1.9.6.tar.bz2/po/sv.po Changed

@@ -1,2043 +1,2621 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Jonatan Nyberg, 2017
+# Jonatan Nyberg, 2021-2022
+# Jonatan Nyberg, 2018-2021
+# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2017-2018
 # Martin Bagge <brother@bsnet.se>, 2010
 # Martin Bagge <brother@bsnet.se>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/sv/)\n"
-"Language: sv\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Jonatan Nyberg, 2021-2022\n"
+"Language-Team: Swedish (http://app.transifex.com/deadbeef-player/deadbeef-player/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Om DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Usage: deadbeef alternativ -- fil(er)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeadBeeF %s Ändrligslogg"
+msgid "Options:\n"
+msgstr "Flaggor:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF översättare"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help eller -h Visa hjälp (detta meddelande) och avsluta\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Spara DeaDBeeF:s Equalizer-inställningar"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Stäng spelare\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Filer för DeaDBeeFs equalizer-inställningar (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Skriv ut versionsinformation och avsluta\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Läs in equalizer-inställningar för DeaDBeeF..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Påbörja uppspelning\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeFs equalizer-inställningar (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Stoppa uppspelning\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Importera equalizer-inställningar för Foobar2000..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Pausa uppspelning\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 equalizer-inställningar (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Växla paus\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Spara inställningar"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Starta uppspelningen om den är stoppad, växla paus annars\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Läs in inställningar"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Nästa låt i spellista\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Importera inställningar från Foobar2000"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Föregående låt i spellista\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Aktivera"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Slumpmässig låt i spellista\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Nollställ alla"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Lägg till fil(er) i nuvarande spellista\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Ingen förstärkning"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Berättar vilken GUI-insticksmodul som ska användas, standard är \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Nollställ band"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Skriv formaterat spårnamn till standard ut\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Inställningar"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: artist (a), titel (t), album (b),\n längd (l), spårnummer (n), år (y), kommentar (c),\n utgiven av (r), förfluten tid (e)\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 dag %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr " exempel: --nowplaying \"%%a - %%t\" ska skriva ut \"artist - titel\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d dagar %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " för mer info, se %s\n"
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " OBS: --nowplaying är föråldrad.\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:156
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Stoppad | %d spår | %s total speltid"
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying-tf FMT Skriv ut formaterat spårnamn till stdout med den nya titelformateringen\n"
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " FMT-syntax: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr " exempel: --nowplaying-tf \"%%artist%% - %%title%%\" bör skriva ut \"artist - title\"\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume NUM Skriv ut eller ställ in volymnivå för deadbeef.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " NUM-parametern kan anges i procent (absolut värde eller ökning/minskning)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " eller i dB -50, 0 (om med suffix).\n"
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Exempel: --volume 80, --volume +10, --volume -5 or --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr " --plugin=PLUG Skicka kommandon till en specifik insticksmodul. Använd PLUG=main för att skicka kommandon till deadbeef själv.\n"
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr " För att få insticksmodul specifika kommandon använd --plugin=PLUG --help\n"
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr " --plugin-list Lista alla tillgängliga insticksmoduler inklusive indikationer för insticksmoduler som stöder kommandon.\n"
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Standard"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Ja"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Pausad | "
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Nej"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Utmatningsmapp:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Skriv till källspårmappen"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Bevara mappstruktur"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Kopiera om formatet inte ändras"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Återtagga efter kopiering"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Utmatningsfilnamn:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-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"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Tillägg (t.ex. .mp3) läggs till automatiskt.\nLämna fältet tomt för standard (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Ny spellista"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Kodare:"
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Ny spellista (%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP-förinställning:"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Antal trådar:"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Utgångssamplingsformat:"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../plugins/converter/converter.glade.h:14
+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 ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "När filen finns:"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Hoppa över\nFråga\nSkriv över"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Redigera förinställning för kodare"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Titel:"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Namnlös kodare"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Filändelse för utgång:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "T.ex. mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Kommandorad:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Exempel: lame - %o\n%i för inmatningsfil, %o för utmatningsfil, - för stdin"
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - namn på utmatningsfil\n%i - namn på temporär inmatningsfil"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Metod:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Taggskrivare"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP-förinställningsredigerare"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Titel"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Namnlös DSP-förinställning"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Lägg till"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Ta bort"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Anpassa"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Välj DSP-insticksmodul"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Insticksmodul"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Förinställningar"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Built-in %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Filen finns redan. Skriva över?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Konverterar varning"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Välj kodare"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Konverteringsfel"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Konverterar..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Välj mapp..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Det gick inte att spara kodad förinställd"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Kontrollera förinställda mappbehörigheter, försök att välja annan titel, eller frigöra lite diskutrymme"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Förinställd med samma namn finns redan. Försök att välja en annan titel."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Fel"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Lägg till ny kodare"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Redigera kodare"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Ta bort förinställda"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Denna åtgärd kommer att ta bort den valda förinställningen. Är du säker?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Varning"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Kodare"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Det gick inte att spara DSP-förinställning"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Ny DSP-förinställning"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Redigera DSP-förinställning"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP-förinställningar"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Hjälp"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Behåll källformat"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Misslyckades vid läsning av hjälpfil"
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Hoppa över"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Kunde inte läsa hjälpfil"
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Skriv"
 
-#: ../plugins/gtkui/gtkui.c:1171
-msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Skriv över"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Temporär fil"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Källfil"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Kunde inte hitta pixmap-fil: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Öppna fil(er)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Lägg till fil(er) till spellista..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Lägg till mapp(ar) till spellista..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Läs in spellista"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Spara spellista som"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Om DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeadBeeF %s ändringslogg"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF-översättare"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr "Spelar spår"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr "Markerat spår"
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Innehållstyp"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Insticksmoduler"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Ogiltigt värde(n)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Varning"
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Inget är valt."
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Öppna fil(er)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Lägg till fil(er)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
-msgstr "Lägg till katalog(er)"
+msgstr "Lägg till mapp(ar)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Lägg till plats"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Ny spellista"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Läs in spellista"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Spara spellista"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "R_ensa"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
-msgstr "Markera allt"
+msgstr "Markera alla"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
-msgstr "Avmarkera allt"
+msgstr "Avmarkera alla"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Invertera markering"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Markering"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Ta bort"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Beskär"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Sök"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Titel"
+msgstr "Sortera efter"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Spårnummer"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Album"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Artist"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
-msgstr "Slumpa"
+msgstr "Slumpmässig"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Anpassad"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Egenskaper"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Visa"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Statusrad"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
-msgstr "Equalizer"
+msgstr "Frekvenskorrigerare"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
-msgstr ""
+msgstr "Designläge"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Logg"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Uppspelning"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Ordning"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Linjär"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Blanda"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Av"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Blanda spår"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Blanda albm"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Upprepning"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Spår"
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Album"
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Slumpmässiga spår"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Upprepa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Alla spår"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Ett spår"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Markering följer uppspelning"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Markering följer uppspelning"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Stoppa efter aktuellt spår"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Stoppa efter aktuellt album"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
-msgstr ""
+msgstr "Hoppa till aktuellt spår"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Ändringslogg"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
-msgstr ""
+msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
-msgstr ""
+msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Om"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
-msgstr ""
+msgstr "_Översättare"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Sök"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Spela"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Paus"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Föregående"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Nästa"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
-msgstr "Spela slumpad"
+msgstr "Spela slumpmässig"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Om"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Hjälp"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Spåregenskaper"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
-msgstr ""
+msgstr "Plats:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
-msgstr ""
+msgstr "Inställningar"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Verkställ"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Stäng"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Titel:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_OK"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Ange ny kolumntitel här"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Spelar"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Albumillustration"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Artist - Album"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Längd"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Spårnummer"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Artist"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Format:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Sortera format:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(om det inte är tomt)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Vänster"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Höger"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Avbryt"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Vänster\nHöger\nCentrerad"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_OK"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Textfärg:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
-msgstr "Instick för uppspelning:"
+msgstr "Utmatningsinsticksmodul:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
-msgstr "Enhet för uppspelning:"
+msgstr "Utmatningsenhet:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr ""
+msgstr "Konvertera alltid 8 bitars ljud till 16 bitar"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Konvertera alltid 16 bitars ljud till 24 bitar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Målets samplingshastiget:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "För multiplar av 48KHz (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "För multiplar av 44.1KHz (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Baserat på inmatnings samplingshastighet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Åsidosätt samplingshastighet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Läge för justering av uppspelningsvolym:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Avaktivera"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Ljudläge:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Spår"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Efter uppspelningsorder\nSpår\nAlbum"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Övre gräns för justering av uppspelningsvolym"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Bearbeta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Ingen\nApplicera förstärkning\nApplicera förstärkning och förhindra klippning beroende på topp\nUndvik endast klippning"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
-msgstr ""
+msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
-msgstr ""
+msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Läge för justering av förstärkning:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Förförstärkare med RG-info:"
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Förförstärkare utan RG-info:"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 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:"
+msgstr "Lägg till filer från kommandoraden (eller filhanteraren) till den här spellistan:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Återuppta föregående session vid uppstart"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
-msgstr ""
+msgstr "Lägg inte till från arkiv när du lägger till mappar"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "Alternativet \"Stoppa efter aktuellt spår\" stängs av efter utlösning"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "Alternativet \"Stoppa efter aktuellt album\" stängs av efter utlösning"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Uppspelning"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Inställningar"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
-msgstr "Inställningar för DSP-kedja"
+msgstr "Förinställningar för DSP-kedja"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
-msgstr ""
+msgstr "_Läs in"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
-msgstr ""
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Minimera till systemfältetet vid uppstart"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
-msgstr "Stäng minimerar till systembricka"
+msgstr "Stäng minimerar till systemfältet"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
-msgstr "Dölj ikon i systembrickan"
+msgstr "Dölj systemfältikonen"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "Ta bort från disk ska använda papperskorgen"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Aktivera japansk SHIFT-JIS-detektering och omkodning"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
+msgstr "Aktivera kinesisk CP936-detektering och omkodning"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
-msgstr ""
+msgstr "Gränssnittets uppdateringshastighet (gånger per sekund):"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Text i titelraden vid uppspelning:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
-msgstr "Text u titelraden utan uppspelning:"
+msgstr "Titelfältets text när den är stoppad:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr ""
+msgstr "GUI-insticksmodul (ändring kräver omstart):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Visa uppspelningstid för markering i statusfältet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr ""
+msgstr "Spelare"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Stäng spellistor med mitten musknappen"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr "Dölj \"Ta bort från disk\" i snabbmenyn"
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Byt till nästa låt när den för närvarande spelade tas bort från disk"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
-msgstr ""
+msgstr "Namnge spellistor automatiskt när du lägger till en enda mapp"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Ändra storlek på kolumner automatiskt så att de passar fönstret"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Gruppavstånd:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pixlar"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Överbrygga"
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Spellista"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Förgrund"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Bakgrund"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Färg på sök-/volym-fält"
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr "GUI/Övrigt"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Mitten"
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Åsidosätt"
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Ljus"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Mörk"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Bas"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Text"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Färg för flikrad"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-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:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Jämn rad"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Ojämn rad"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Markerad rad"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Markerad text"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Markör"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Spellistans färger"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Färger"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Staplar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Bakgrund (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Sökfält/Volymfält/EQ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Bas:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Mörk:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Ljus:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Mellan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Text:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Fet"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Spelar text:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "markerad text:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Flikhuvud"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Normala spår:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Spelar spår:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Markerade spår:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Kolumner:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Grupprubrik:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Förgrund:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Jämna:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Udda:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Markerade:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Markör:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Bakgrund:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Åsidosätt (förlorar GTK treeview-teman, men snabbare framställning)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr "Grundfärg för anpassad visualisering"
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Visualiseringar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Utseende"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Aktivera mediebibliotek"
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "Lägg till / ta bort musikmappar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Mediebibliotek"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Aktivera proxyserver"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Adress för proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Port för proxyserver:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Proxytyp:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Användarnamn för proxy:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Lösenord för proxy:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "HTTP-användaragent:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "Redigera innehållstypskartläggning"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Tilldelade snabbtangenter:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
-msgstr ""
+msgstr "Åtgärd:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
-msgstr ""
+msgstr "<Ej inställd>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
-msgstr ""
+msgstr "Tangentkombination:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr ""
+msgstr "Global snabbtangent"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "Använd Tillämpa-knappen för att spara dina ändringar,\neller Återgå-knappen för att ångra dina ändringar.\nÄndringarna kommer INTE att sparas\nom du inte trycker på Tillämpa."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "_Standardinställningarna"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
-msgstr ""
+msgstr "Snabbtangenter"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Info"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Licens"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Återställ till standardinställningar"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Instick"
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Version: "
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Ange anpassad titel"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
-msgstr ""
+msgstr "Gruppera efter ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr ""
+msgstr "Sortera efter ..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Format"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Välj DSP-instick"
-
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Instick"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Stigande\nFallande"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Inställningar för tagg-skrivare"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Skriv ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Skriv ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Skriv APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Rensa ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Rensa ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Rensa APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 version"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Rekomenderad)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (rekomenderad)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 teckenkodning (iso8859-1 är standard)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Skriv ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "Innehållstypskartläggning"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr ""
+msgstr "Denna tabell definierar bindningen mellan nätverksströminnehållstyper och DeaDBeeF-avkodarinsticksmoduler. Till exempel kan mp3-filer ha innehållstyp \"audio/x-mpeg\" och måste avkodas av DeaDBeeFs egna \"stdmpg\"-insticksmodul eller \"ffmpeg\"-insticksmodul."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr ""
+msgstr "Innehållstyp:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
-msgstr ""
+msgstr "Insticksmoduler:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
-msgstr ""
+msgstr "Knappegenskaper"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
-msgstr ""
+msgstr "Färg:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
-msgstr ""
+msgstr "Ikon:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
-msgstr ""
+msgstr "Etikett:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
-msgstr ""
+msgstr "Välj åtgärd"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "I den här dialogrutan kan du ställa in anpassad titel för alla spår. Detta är mest användbart för radiostationer. Ett alternativ för att ställa in den anpassade titeln finns också i dialogrutan \"Lägg till plats\". Titeln i sig är synlig i kolumner som visar metadatafältet \"Artist\". Det ska se ut som \"anpassad artist\" om fältet Artist är närvarande, eller bara \"anpassad\" annars."
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Artist / Album"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Redigera"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Spårnummer"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Redigera (på plats)"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Lägg till nytt fält..."
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Redigera värde"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Fältnamn:"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Fältvärde:"
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Lägg till kolumn"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Använd ;-tecken för att separera flera värden."
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Redigera kolumn"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF-logg"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Ta bort kolumn"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Rensa"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "ReplayGain-skanningsresultat"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Gruppera efter"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Nuvarande fil:"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Ingen"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Status"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Artist/Datum/Album"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Öppna fil..."
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "ReplayGain-skanningsresultat"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "Inställningar för %s"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Uppdatera filtaggar"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Standardljudenhet"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "Kopiera rapport"
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Visa endast insticksmoduler med konfiguration"
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr "Redigera flera spår"
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Fält namn:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Lägger till filer..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr "Individuella värden"
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Förbereder..."
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Spara frekvenskorrigeringsförinställning för DeaDBeeF"
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "Du har ändrat data för detta spår."
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Frekvenskorrigeringsförinställningsfiler för DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "Ska fönstret verkligen stängas?"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Läs in frekvenskorrigeringsförinställning för DeaDBeeF..."
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr ""
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Frekvenskorrigeringsförinställningar för DeaDBeeF (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Nyckel"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Importera Frekvenskorrigeringsförinställningar för Foobar2000..."
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Värde"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 frekvenskorrigeringsförinställningar (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr ""
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Spara förinställningar"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr ""
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Läs in förinställningar"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr ""
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Importera inställningar från Foobar2000"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr ""
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Aktivera"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr ""
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Nollställ alla"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr ""
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Ingen förstärkning"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr ""
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Nollställ band"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Lägg till fält"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Ta bort fält"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Ny spellista"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr ""
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Ljudformat som stöds"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Flaggor:\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Alla filer (*)"
 
-#: ../main.c:92
-#, 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"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Spellistformat som stöds"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Stäng spelare\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Alla filer"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Skriv ut versionsinformation och avsluta\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Andra filer (*)"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Påbörja uppspelning\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF-spellistsfiler ( *.dbpl)"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Stoppa uppspelning\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Följ symlinks"
 
-#: ../main.c:97
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Pausa uppspelning\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 dag %d:%02d:%02d"
 
-#: ../main.c:98
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr ""
+msgid "%d days %d:%02d:%02d"
+msgstr "%d dagar %d:%02d:%02d"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "total speltid"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Pausad"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "markeringens speltid"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Stoppad"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Nästa spår i spellista\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Byt namn på spellista"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Föregående spår i spellista\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Tar bort spellista"
 
-#: ../main.c:102
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Slumpa spår i spellista\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Vill du verkligen ta bort spellistan \"%s\"?"
 
-#: ../main.c:103
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Lägg till fil(er) i nuvarande spellista\n"
+msgid "New Playlist (%d)"
+msgstr "Ny spellista (%d)"
 
-#: ../main.c:104
-#, c-format
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Spellista med flikar"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Avskiljare (topp och botten)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Avskiljare (vänster och höger)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Flikar"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Flikar i spellistan"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Urvalsegenskaper"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Albumgrafik"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Oscilloskop"
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektrum"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Knapp"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Sökfält"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Uppspelningskontroller"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Volymfält"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune röster"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Loggvisare"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Mediebiblioteksvisare"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Misslyckades vid läsning av hjälpfil"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Misslyckades med att läsa hjälpfil"
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Spelaren kör för närvarande bakgrundsuppgifter. Om du avslutar nu, kommer uppgifterna att avbrytas. Det kan leda till dataförlust."
 
-#: ../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"
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Vill du fortfarande avsluta?"
 
-#: ../main.c:106
-#, c-format
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-syntax: artist (a), titel (t), album (b),\n"
-" längd (l), spårnummer (n), år (y), kommentar (c),\n"
-" utgiven av (r), förfluten tid (e)\n"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Filerna kommer att flyttas till papperskorgen.\n\n(Denna dialog kan stängas av i insticksmodulsinställningarna för GTKUI)"
 
-#: ../main.c:109
-#, c-format
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr ""
-" e.x.: --nowplaying \"%%a - %%t\" bör visa \"artist - "
-"titel\"\n"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Filerna kommer att gå förlorade.\n\n(Denna dialog kan stängas av i insticksmodulsinställningarna för GTKUI)"
 
-#: ../main.c:110
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+msgid "Do you really want to delete the selected file?%s"
+msgstr "Vill du verkligen ta bort den valda filen?%s"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Standard"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr "Vill du verkligen ta bort alla %d markerade filer?%s"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Ja"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr "Vill du verkligen ta bort alla %d filer från den aktuella spellistan?%s"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Nej"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "Vill du verkligen ta bort filen som spelas för närvarande?%s"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Ta bort filer från disken"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Vänster\n"
-"Höger"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Ta bort"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Avaktivera\n"
-"Spår\n"
-"Album"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Vänster"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
-msgstr ""
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Höger"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Mitten"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
 msgstr ""
-"2.3 (rekomenderad)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
 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"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Frigör enhet vid stopp"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Av uppspelningsordning"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr ""
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Spår"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr ""
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Ingen"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr ""
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Applicera vinst"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Applicera förstärkning och förhindra klippning beroende på topp"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Förhindra bara klippning"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr ""
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Stigande"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Användarnamn"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Fallande"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Lösenord"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Rekomenderad)"
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr ""
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Artist / Album"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Spårnummer"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Längd"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Artikelindex"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Spelar"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Albumillustration"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Artist - Album"
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "År"
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Spårnummer"
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Artist"
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Codec"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bithastighet"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Lägg till kolumn"
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Redigera kolumn"
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Ta bort kolumn"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "Fäst grupper vid rullning"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Gruppera efter"
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Artist/Datum/Album"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr ""
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Spela nästa"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Spela senare"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr ""
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Ta bort från uppspelningskö"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr ""
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Läs om metadata"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Fråga innan radering av filer från disk"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "Kl_ipp ut"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr ""
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "_Kopiera"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr ""
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "_Klistra in"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr ""
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Ta bort från disk"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr ""
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Ta bort spellista"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr ""
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Lägg till ny spellista"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr ""
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Aktivera automatisk sortering"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Albumillustration"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr "Använd den senaste sorteringen du valde igen varje gång när du lägger till nya filer till den här spellistan"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr ""
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Öppna fil..."
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr ""
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "Inställningar för %s"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr ""
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "Du har ändrat snabbtangentens inställningar, men sparade inte dina ändringar."
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr ""
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "Är du säker på att du vill fortsätta utan att spara?"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr ""
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Standardljudenhet"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr ""
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Lägger till filer..."
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr ""
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Förbereder..."
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr ""
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Uppdaterar filtaggar förlopp"
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr ""
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Namn"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Spårtitel"
-
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Artist"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Genre"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Lyckades"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Kompositör"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Filen hittades inte"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Skivnummer"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Ogiltig fil"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Kommentar"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Sök (%list_total% resultat)"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr ""
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Visa kolumnrubriker"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Plats"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Värde"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "Du har ändrat data för detta spår."
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Tagg-kategori(er)"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "Ska fönstret verkligen stängas?"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Inbäddat körschema"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "Flera värden "
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Codec"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Nyckel"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "Flera värden"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "Skriver taggar..."
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Fält"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Fältnamn"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "Namn:"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "Fältnamn får inte börja med : eller _"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "Kan inte lägga till fält"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "Fält med sådant namn finns redan, försök med annat namn."
 
-#: ../plugins/converter/convgui.c:84
+#: ../plugins/gtkui/widgets.c:460
 #, c-format
-msgid "Built-in %s"
-msgstr ""
+msgid "Widget \"%s\" is not available"
+msgstr "Gränssnittskomponenten \"%s\" är inte tillgänglig"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Ersätt med..."
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Infoga..."
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Klipp ut"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopiera"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr ""
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Klistra in"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Välj katalog..."
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Överordnad"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Flera gränssnittskomponenter av denna typ stöds inte"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Proportionell storlek"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Lås toppanelens höjd"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Lås vänsterpanelens bredd"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Lås bottenpanelens höjd"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Lås vänsterpanelens bredd"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Ta bort flik"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Ta bort flik"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Lägg till ny flik"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Flytta fliken till vänster"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Flytta fliken till höger"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr "Renderingsläge"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr "Multikanal"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr "Skala"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "Automatisk"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr "3x"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
-msgstr ""
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr "Fragmentvaraktighet"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 ms"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 ms"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 ms"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 ms"
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 ms"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr "1/12 oktavband"
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr "1/24 oktavband"
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Expandera låda med 1 artikel"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Krymp låda med 1 artikel"
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Homogen"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Expandera"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Fyll"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Konfigurera knappen"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr "_dB skala"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr "_Linjär skala"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr "_Kubisk skala"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr ""
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Röster:"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr ""
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr "Kopia av %s"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr ""
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr "Kopia av %s (%d)"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Lägg till"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr " (pausad)"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Kunde inte hitta pixmap-fil: %s"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr " (stoppad)"
 
-#: ../plugins/converter/converter.glade.h:12
-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 ""
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr " (spelar)"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
-msgstr ""
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Objekt"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Spellistsbläddrare"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
-msgstr ""
-
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr ""
+msgstr "Anpassade skalkommandon"
 
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
-msgstr ""
+msgstr "Stäng"
 
 #: ../plugins/shellexecui/interface.c:149
 #: ../plugins/shellexecui/shellexec.glade.h:6
 msgid "Edit Command"
-msgstr ""
+msgstr "Redigera kommando:"
 
 #: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr ""
+msgstr "Kommando:"
 
 #: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
@@ -2046,74 +2624,74 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
+msgstr "Godtyckligt skalkommando. Kommer att utföras i skalkontexten som huvudprogrammet startades från. Titelformatering kan användas. Exempel: xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr ""
+msgstr "Id:"
 
 #: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr ""
+msgstr "Friformsnamn, till exempel \"Mitt skalkommando\""
 
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Kommando-ID, normalt bör det vara något kort, till exempel \"youtube_open\". Det måste vara unikt."
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
-msgstr ""
+msgstr "Singelspår"
 
 #: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
-msgstr ""
+msgstr "Fungerar på singelspår."
 
 #: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
-msgstr ""
+msgstr "Flera spår"
 
 #: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
-msgstr ""
+msgstr "Fungerar på flera spår."
 
 #: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
-msgstr ""
+msgstr "Lokal"
 
 #: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
-msgstr ""
+msgstr "Fungerar på lokala filer."
 
 #: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr ""
+msgstr "Fjärr"
 
 #: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr ""
+msgstr "Fungerar på fjärrfiler (t.ex. http://-strömmar)"
 
 #: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "Generisk (huvudmeny)"
 
 #: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
-msgstr ""
+msgstr "Objektet ska visas i huvudmenyn"
 
 #: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
@@ -2121,223 +2699,1271 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
+msgstr "Om du vill lägga till kommandot i huvudmenyn, se till att titeln innehåller menysökvägen så här: \"File/My Command\", där File är menynamnet i den engelska versionen."
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr ""
-
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr ""
+msgstr "Lägg till kommando"
 
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
+msgstr "Den här åtgärden tar bort det valda skalkommandot. Är du säker?"
 
 #: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr ""
+msgstr "Bekräfta borttagning"
 
 #: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr ""
+msgstr "ID måste vara tomt och unikt.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr ""
+msgstr "Titeln kan inte vara tom.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr ""
+msgstr "Skalkommandot kan inte vara tomt.\n"
 
 #: ../plugins/shellexecui/shellexecui.c:248
 #: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
-msgstr ""
+msgstr "Ogiltiga värden"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr ""
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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. Installera paketet timidity-freepats eller ange sökväg till freepats.cfg i inställningarna för insticksmodulen."
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr ""
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "stereo"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr ""
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "Spårtitel"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr ""
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "Artist"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr ""
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "Totala spår"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr ""
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Genre"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr ""
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "Kompositör"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr ""
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "Skivnummer"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
-msgstr ""
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Skivor totalt"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr ""
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "Kommentar"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr ""
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "Kodare / Leverantör"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr ""
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Copyright"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr ""
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Plats"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr ""
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "Underspårindex"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr ""
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "Tagg-kategori(er)"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
-msgstr ""
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Inbäddat körschema"
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr ""
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Föredra Ken emu över Satoh (surround kommer inte att fungera)"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr ""
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Aktivera surround"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr ""
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Använd ALSA-omsampling"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr ""
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Föredragen buffertstorlek"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr ""
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Föredragen periodstorlek"
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr ""
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr "Uppdatera omslagsbild"
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr ""
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Hämta från inbäddade taggar"
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr ""
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Hämta från den lokala mappen"
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr ""
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Hämta från Last.fm"
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr ""
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Hämta från MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Hämta från Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "Hämta från World of Spectrum (AY-filer)"
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Spara hämtade filer i musikmappar"
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "När inget omslag finns"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "lämna tom"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "använd DeaDBeeF-standardomslag"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "visa anpassad bild"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Anpassad bildsökväg"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "Spara till filnamn"
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "Cacheuppdatering (timmar)"
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "Förenklade cache-filnamn"
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Bildstorlek"
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "CD-enhet att läsa in"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Ljud CD-enhet"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Arkiv"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Lägg till ljud-CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "Föredra CD-Text över CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Använd CDDB-protokoll"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "Aktivera NRG bildstöd"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Diskhastighet för normal uppspelning"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Max"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Använd cdparanoia felkorrigering när du rippar"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Konvertera"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Detektera automatiskt samplingshastighet från utmatningsenhet"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Ange samplingshastighet direkt"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Kvalitet / Algoritm"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Omsamplingskvalitet"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Intern DUMB-volym"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Volymökning"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "På/Av endast"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Full"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8-bitars utmatning"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Använd alla tillägg som stöds av ffmpeg"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Filtillägg (separade med ';')"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Ignorera fel för dåliga rubrik"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Ignorera fel för otolkningsbar ström"
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "Max låtlängd (i minuter)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Uttoningslängd (sekunder)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Spela slingor antal gånger (om tillgängligt)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (för SGC-filformat)"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Ta bort ReplayGain-information"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Skanna urval som album (efter etiketter)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Skanna urval som ett enskilda album"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Välj inga"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Välj alla"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Lägg till plats"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Lägg till mapp(ar)"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Lägg till fil(er)"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Öppna fil(er)"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Visa hjälpsida"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Cykelrepetitionsläge"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Upprepa - Av"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Upprepa - Enstaka spår"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Upprepa - Alla"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Cykelblandningsläge"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Blanda - Slumpmässiga spår"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Blanda - Album"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Blanda - Spår"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Blanda - Av"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Växla markör följer uppspelning"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Växla rullning följer uppspelning"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Visa"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Visa\\/Dölj menu"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Visa\\/Dölj statusfält"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Växla designläge"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Ange anpassad"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Beskär valda"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr "Ta bort spår från spellistan"
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Spara spellista"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Ta bort aktuell spellista"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "Byt namn på aktuell spellista"
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Visa\\/Dölj frekvenskorrigerare"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Dölj frekvenskorrigerare"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Visa frekvenskorrigerare"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Visa\\/Dölj spelarfönster"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Dölj spelarfönster"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Visa spelarfönster"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Hitta"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Visa\\/Dölj loggfönster"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Bekräfta för att ta bort filer från disk"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "Inställningar för statusikon:"
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Statusikon volymkontroll känslighet"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Anpassad statusikon"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr "Diverse:"
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Lägg till avskiljare mellan poster i snabbmenyn för insticksmoduler"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Använd unicode-tecken istället för bilder för spårtillstånd"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Inaktivera sökfältets överläggstext"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr "Föregående eller starta om aktuellt spår"
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "Duplicera spellista"
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr "Hoppa till det spår som spelas just nu"
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Hoppa till"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Föregående genre"
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Föregående kompositör"
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Föregående artist"
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Föregående album"
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Nästa genre"
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Nästa kompositör"
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Nästa artist"
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr "Nästa album"
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Nästa spellista"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Föregående spellista"
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "Växla till Spellista 10"
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr "Växla till Spellista 9"
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "Växla till Spellista 8"
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Växla till Spellista 7"
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "Växla till Spellista 6"
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Växla till Spellista 5"
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Växla till Spellista 4"
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Växla till Spellista 3"
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Växla till Spellista 2"
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Växla till Spellista 1"
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Sortera blandat"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Sortera efter datum"
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Sortera efter artist"
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Sortera efter album"
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Sortera efter spårnummer"
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Sortera efter titel"
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Invertera val"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Rensa spellista"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr "Lägg till i uppspelningskö"
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr "Växla i uppspelningskö"
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Flytta"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Flytta spår ner"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Flytta spår upp"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Växla ljud av/på"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Växla pausa"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Spela\\/Pausa"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Sök 1s framåt"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Sök 1s bakåt"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Sök 5s framåt"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Sök 5s bakåt"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Sök 1% framåt"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Sök 1% bakåt"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Sök 5% framåt"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Sök 5% bakåt"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Volym upp"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Volym ner"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Växla stopp efter aktuellt spår"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Växla stopp efter aktuellt album"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr "Slå up på Last.fm"
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Aktivera scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Inaktivera nowplaying"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Användarnamn"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Lösenord"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble-webbadress"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Föredra Album artist över Artist-fältet"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Skicka MusicBrainz-ID"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Skicka spår kortare än 30 sekunder (rekommenderas inte)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Vänster mix"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Höger mix"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Tvinga 16 bitars utmatning"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Bakände"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Titelformat för aviseringar"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Innehållsformat för aviseringar"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Albumillustration"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Albumkonststorlek (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Enhetsfil"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Markera aktuell spellista"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Spela på dubbelklick"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Buffertstorlek (-1 för att använda optimalt värde valt av portaudio)"
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Enhetsnamn kodning"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Definieras nedan"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Anpassat enhetsnamn kodning"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio-server (lämna tom för standard)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Standard låtlängd (i minuter)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Samplingshastighet"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Hoppa över när kortare än (sek)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Konfigurera anpassade skalkommandon"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Aktivera HVSC Songlength DB"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Hela sökvägen till Songlengths.md5/.txt"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Standard låtlängd (sek)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Mono-synth"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Aktivera loggning"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Förförstärkare"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ bankkonfigurationsfil"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "Filändelse"
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr "Kodarens kommandorad"
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr "Dataöverföringsmetod"
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "Temporär fil"
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "Källfil"
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "Skriv ID3v2-tagg"
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "Skriv ID3v1-tagg"
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "Skriv APEv2-tagg"
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "Skriv FLAC-tagg"
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "Skriv OggVorbis-tagg"
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "Skriv MP4-tagg"

deadbeef-0.6.2.tar.bz2/po/te.po -> deadbeef-1.9.6.tar.bz2/po/te.po Changed

@@ -1,2328 +1,3963 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Telugu (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/te/)\n"
-"Language: te\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Telugu (http://app.transifex.com/deadbeef-player/deadbeef-player/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "డెడ్‌బీఫ్ %s గురించి"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "డెడ్‌బీఫ్ %s మార్పులచిట్టా"
+msgid "Options:\n"
+msgstr "ఐచ్ఛికాలు:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "డెడ్‌బీఫ్ అనువాదకులు"
-
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "డెడ్‌బీఫ్ EQ ప్రిసెట్ భద్రపరుచు"
-
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "డెడ్‌బీఫ్ EQ ప్రిసెట్ ఫైళ్ళు (*.ddbeq)"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help or -h సహాయాన్ని ముద్రించు (ఈ సందేశమును) మరియు నిష్క్రమించు\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "డెడ్‌బీఫ్ EQ ప్రిసెట్ లోడుచేయి..."
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit ప్లేయర్ నుండి నిష్క్రమిస్తుంది\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "డెడ్‌బీఫ్ EQ ప్రిసెట్ (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version వర్షన్ సమాచారాన్ని ముద్రించి, నిష్క్రమించు\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Foobar2000 EQ ప్రిసెట్ దిగుమతిచేయి..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play ప్లేబాక్ ప్రారంభించు\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ ప్రిసెట్ (*.feq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop ప్లేబాక్ ఆపుము\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "ప్రిసెట్ భద్రపరుచు"
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause ప్లేబాక్ నిలిపివేయి\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "ప్రిసెట్ లోడుచేయి"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 EQ ప్రిసెట్ దిగుమతిచేయి"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "చేతనపరుచు"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next పాటలజాబితాలో తదుపరి పాట\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "అన్నీ సున్నాచేయి"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev పాటలజాబితాలో మునుపటి పాట\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "ప్రిఆంప్ సున్నాచేయి"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random పాటల జాబితాలో యాదృచ్ఛిక పాట\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "బ్రాండ్లను సున్నాచేయి"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue ఉన్నటువంటి పాటలజాబితాకు ఫైళ్ళను జతచేయి\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "ప్రిసెట్లు"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:149
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 రోజు %d:%02d:%02d"
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:150
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d రోజులు %d:%02d:%02d"
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:153
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "ఆపివేయబడింది | %d ట్రాక్‌లు | %s మొత్తం ప్లేటైమ్"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "మోనో"
+#: ../src/main.c:154
+#, c-format
+msgid " for more info, see %s\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "స్టీరియో"
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:156
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "నిలిపివేయబడింది | "
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:158
 #, 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 మొత్తం ప్లేటైమ్"
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "కొత్త పాటలజాబితా"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:160
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "కొత్త పాటలజాబితా (%d)"
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "అప్రమేయం"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "మోనో"
+
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "స్టీరియో"
+
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "అవును"
+
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "కాదు"
+
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "సహాయక ఫైలును చదువుతుండగా విఫలమైంది"
+#: ../plugins/converter/converter.glade.h:14
+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 ""
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "సహాయక ఫైల్ లోడుచేయుటలో విఫలమైంది"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:21
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"Skip\n"
+"Prompt\n"
+"Overwrite"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "హెచ్చరిక"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "శీర్షిక:"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "ఫైల్ (_F)"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "ఫైళ్ళ(ను) తెరువు (_O)"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "ఫైళ్ళ(ను) జతచేయి"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "సంచయా(ల)ను జతచేయి"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "స్థానమును జతచేయి"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "కొత్త పాటలజాబితా"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "పాటలజాబితాను నింపు"
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "పాటలజాబితాను దాచు"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "నిష్క్రమించు (_Q)"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "సవరించు(_E)"
-
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "శుభ్రంచేయి (_C)"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "అన్నీ ఎంచుకో"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "ఎంపికను రద్దుచేయి"
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "ఎంపికను తారుమారుచేయి"
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "ఎంపిక"
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
 #: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "శీర్షిక"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "జతచేయి"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
 #: ../plugins/shellexecui/shellexec.glade.h:4
 msgid "Remove"
 msgstr "తొలగించు"
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "కత్తిరించు"
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "స్వరూపించు"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "కనుగొను (_F)"
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "శీర్షిక"
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "ప్రిసెట్లు"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "పాట సంఖ్య"
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "ఆల్బమ్"
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "కళాకారుడు"
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "తేదీ"
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "యాదృచ్ఛికం"
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "అనురూపితం"
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "హెచ్చరిక"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "సహాయం"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "డెడ్‌బీఫ్ %s గురించి"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "డెడ్‌బీఫ్ %s మార్పులచిట్టా"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "డెడ్‌బీఫ్ అనువాదకులు"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "ప్లగిన్‌లు"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "ఫైల్ (_F)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "ఫైళ్ళ(ను) తెరువు (_O)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "ఫైళ్ళ(ను) జతచేయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "సంచయా(ల)ను జతచేయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "స్థానమును జతచేయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "కొత్త పాటలజాబితా"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "పాటలజాబితాను నింపు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "పాటలజాబితాను దాచు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "నిష్క్రమించు (_Q)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "సవరించు(_E)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "శుభ్రంచేయి (_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "అన్నీ ఎంచుకో"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "ఎంపికను రద్దుచేయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "ఎంపికను తారుమారుచేయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "ఎంపిక"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "కత్తిరించు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "కనుగొను (_F)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "పాట సంఖ్య"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "ఆల్బమ్"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "కళాకారుడు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "తేదీ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "యాదృచ్ఛికం"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "అనురూపితం"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "ప్రాధాన్యతలు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "వీక్షణం (_V)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "స్థితి పట్టీ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "ఈక్విలైజర్"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "ప్లేబాక్(_P)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "తరువాత పాటకి వెళ్ళు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "సహాయం (_H)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "మార్పుచిట్టా (_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "GPLv2 (_G)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "LGPLv2.1 (_L)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "గురించి (_A)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "అనువాదకులు (_T)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "వెతుకు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "ఆపు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "ప్లే"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "నిలిపివేయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "మునుపటి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "తరువాతి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "యాదృచ్ఛికంగా ప్లేచేయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "గురించి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "నిష్క్రమించు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "ట్రాక్ లక్షణాలు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "అమరికలు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "అనువర్తించు (_A)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "మూసివేయి (_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "మెటాడేటా"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "గుణములు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "రద్దుచేయి (_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "సరే (_O)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "కొత్త నిలువువరుస శీర్షికను ఇక్కడ ప్రవేశపెట్టండి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "రకం:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "ఫార్మేట్:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "అనుగుణం:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "అవుట్‌పుట్ ప్లగిన్:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "అవుట్‌పుట్ పరికరం:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "ఎల్పప్పుడూ 8 బిట్ ఆడియోని 16 బిట్‌కి పరివర్తించు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "ధ్వని"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "ఆదేశ వరుస (లేదా ఫైల్ నిర్వాహకము) నుండి ఫైళ్ళను ఈ పాటలజాబితాకు జతచేయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "ప్రారంభములో మునుపటి కొనసాగిన కాలాన్ని పునఃప్రారంభించు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "సంచయాలను జతచేస్తున్నపుడు సంగ్రహాలను జతచేయవద్దు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "ప్లేబాక్"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr "DSP చైన్ ప్రిసెట్"
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "నింపు (_L)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr ""
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "తిరస్కరించు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr "ప్రోక్సీ సేవికను చేతనపరుచు"
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr "ప్రోక్సీ సేవిక చిరునామా:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr "ప్రోక్సీ సేవిక పోర్టు:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr "ప్రోక్సీ రకం:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr "ప్రోక్సీ వాడుకరిపేరు:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr "ప్రోక్సీ సంకేతపదం:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr "నెట్‌వర్క్"
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr "ID3v2 వ్రాయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr "ID3v1 వ్రాయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr "APEv2 వ్రాయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr "ID3v2 వర్షన్"
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (సిఫారసుచేయబడింది)\n2.4"
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr "ID3v1 అక్షరపు ఎన్‌కోడింగ్ (iso8859-1 అనేది అప్రమేయము)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr "ID3v2.4 వ్రాయి"
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+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:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "డెడ్‌బీఫ్ EQ ప్రిసెట్ లోడుచేయి..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "డెడ్‌బీఫ్ EQ ప్రిసెట్ (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 EQ ప్రిసెట్ దిగుమతిచేయి..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ ప్రిసెట్ (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "ప్రిసెట్ భద్రపరుచు"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "ప్రిసెట్ లోడుచేయి"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 EQ ప్రిసెట్ దిగుమతిచేయి"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "చేతనపరుచు"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "అన్నీ సున్నాచేయి"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "ప్రిఆంప్ సున్నాచేయి"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "బ్రాండ్లను సున్నాచేయి"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "కొత్త పాటలజాబితా"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 రోజు %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d రోజులు %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "కొత్త పాటలజాబితా (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "ప్రాధాన్యతలు"
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "వీక్షణం (_V)"
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "స్థితి పట్టీ"
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "ఈక్విలైజర్"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "ప్లేబాక్(_P)"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "క్రమం"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "ఒకే వరుసలో ఉన్నవి"
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "పాటలను యాదృచ్ఛికపరుచు"
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "ఆల్బములను యాదృచ్ఛికపరుచు"
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "ఆవృతీకరణ"
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "సహాయక ఫైలును చదువుతుండగా విఫలమైంది"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "సహాయక ఫైల్ లోడుచేయుటలో విఫలమైంది"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "తరువాత పాటకి వెళ్ళు"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "సహాయం (_H)"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "మార్పుచిట్టా (_C)"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "GPLv2 (_G)"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "LGPLv2.1 (_L)"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "గురించి (_A)"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "అనువాదకులు (_T)"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "ఎడమ"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "వెతుకు"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "కుడి"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "ఆపు"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "ప్లే"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "నిలిపివేయి"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "మునుపటి"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "తరువాతి"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "యాదృచ్ఛికంగా ప్లేచేయి"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "గురించి"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "నిష్క్రమించు"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "ట్రాక్"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "సహాయం"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "ఏదీకాదు"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "ట్రాక్ లక్షణాలు"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "అమరికలు"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "అనువర్తించు (_A)"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "మూసివేయి (_C)"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "మెటాడేటా"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (సిఫారసుచేయబడింది)"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "గుణములు"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "శీర్షిక:"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "కళాకారుడు / ఆల్బమ్"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "కొత్త నిలువువరుస శీర్షికను ఇక్కడ ప్రవేశపెట్టండి"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "ట్రాక్ సంఖ్య"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "రకం:"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "నిడివి"
 
-#: ../plugins/gtkui/interface.c:1343
+#: ../plugins/gtkui/playlist/plcommon.c:73
 msgid "Item Index"
 msgstr "అంశపు సూచీ"
 
-#: ../plugins/gtkui/interface.c:1344
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
 msgid "Playing"
 msgstr "ప్లేచేస్తున్నది"
 
-#: ../plugins/gtkui/interface.c:1345
+#: ../plugins/gtkui/playlist/plcommon.c:75
 msgid "Album Art"
 msgstr "ఆల్బమ్ చిత్రం"
 
-#: ../plugins/gtkui/interface.c:1346
+#: ../plugins/gtkui/playlist/plcommon.c:76
 msgid "Artist - Album"
 msgstr "కళాకారుడు - ఆల్బమ్"
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "నిడివి"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
 msgid "Track Number"
 msgstr "పాట సంఖ్య"
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
 msgid "Band / Album Artist"
 msgstr "బ్యాండ్ / ఆల్బమ్ కళాకారుడు"
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "ఫార్మేట్:"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "కొడెక్"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "అనుగుణం:"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "ఎడమ"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "నిలువువరుసను జతచేయి"
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "కుడి"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "నిలువువరుసను సవరించు"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "రద్దుచేయి (_C)"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "నిలువువరుసను తొలగించు"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "సరే (_O)"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "అవుట్‌పుట్ ప్లగిన్:"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "అవుట్‌పుట్ పరికరం:"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "కళాకారుడు/తేదీ/ఆల్బమ్"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "ఎల్పప్పుడూ 8 బిట్ ఆడియోని 16 బిట్‌కి పరివర్తించు"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "ధ్వని"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "ఫైల్ తెరువు..."
+
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "అప్రమేయ ఆడియా పరికరం"
+
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "ఫైళ్ళను జతచేస్తున్నది..."
+
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "ఆరంభిస్తున్నది..."
+
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "రిప్లైగెయిన్ రీతి:"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "విలువ"
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "అచేతనంచేయి"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "ఈ ట్రాక్ డేటాను మీరు సవరించారు."
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "ట్రాక్"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "నిజంగానే విండో మూసివేయాలా?"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "రిప్లైగెయిన్ పీక్ స్కేల్"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
-msgstr "-12 dB"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "కీ"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
-msgstr "+12 dB"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "రిప్లైగెయిన్ ప్రీఆంప్:"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "గ్లోబల్ ప్రీఆంప్:"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "ఆదేశ వరుస (లేదా ఫైల్ నిర్వాహకము) నుండి ఫైళ్ళను ఈ పాటలజాబితాకు జతచేయి"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "ప్రారంభములో మునుపటి కొనసాగిన కాలాన్ని పునఃప్రారంభించు"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
-msgstr "సంచయాలను జతచేస్తున్నపుడు సంగ్రహాలను జతచేయవద్దు"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "ప్లేబాక్"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "స్వరూపించు"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
-msgstr "DSP చైన్ ప్రిసెట్"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
-msgstr "నింపు (_L)"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
-msgstr "DSP"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "తిరస్కరించు"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "ముందుభాగము"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "నేపథ్యం"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "పాఠ్యం"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "ఎంచుకున్న అడ్డవరుస"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "ఎంచుకున్న పాఠ్యం"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "కర్సరు"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "పాటలజాబితా రంగులు"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "రంగులు"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
-msgstr "ప్రోక్సీ సేవికను చేతనపరుచు"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
-msgstr "ప్రోక్సీ సేవిక చిరునామా:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
-msgstr "ప్రోక్సీ సేవిక పోర్టు:"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
-msgstr "ప్రోక్సీ రకం:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
-msgstr "ప్రోక్సీ వాడుకరిపేరు:"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
-msgstr "ప్రోక్సీ సంకేతపదం:"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
-msgstr "నెట్‌వర్క్"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "ప్లగిన్‌లు"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
-msgstr "ID3v2 వ్రాయి"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
-msgstr "ID3v1 వ్రాయి"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
-msgstr "APEv2 వ్రాయి"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
-msgstr "ID3v2 వర్షన్"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (సిఫారసుచేయబడింది)"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 అక్షరపు ఎన్‌కోడింగ్ (iso8859-1 అనేది అప్రమేయము)"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
-msgstr "ID3v2.4 వ్రాయి"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
-msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, c-format
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "కళాకారుడు / ఆల్బమ్"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "ట్రాక్ సంఖ్య"
-
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../translation/extra.c:3
+msgid "Track Title"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../translation/extra.c:4
+msgid "Performer"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "నిలువువరుసను జతచేయి"
-
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "నిలువువరుసను సవరించు"
-
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "నిలువువరుసను తొలగించు"
-
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
+#: ../translation/extra.c:10
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "ఏదీకాదు"
-
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "కళాకారుడు/తేదీ/ఆల్బమ్"
-
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "ఫైల్ తెరువు..."
-
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
+#: ../translation/extra.c:11
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "అప్రమేయ ఆడియా పరికరం"
-
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../translation/extra.c:12
+msgid "Disc Number"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "ఫైళ్ళను జతచేస్తున్నది..."
-
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "ఆరంభిస్తున్నది..."
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "ఈ ట్రాక్ డేటాను మీరు సవరించారు."
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "నిజంగానే విండో మూసివేయాలా?"
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr ""
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../translation/extra.c:17
+msgid "Location"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "కీ"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "విలువ"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "ట్యాగ్ రకము(లు)"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "ఐచ్ఛికాలు:\n"
-
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help or -h సహాయాన్ని ముద్రించు (ఈ సందేశమును) మరియు నిష్క్రమించు\n"
-
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit ప్లేయర్ నుండి నిష్క్రమిస్తుంది\n"
-
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version వర్షన్ సమాచారాన్ని ముద్రించి, నిష్క్రమించు\n"
-
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play ప్లేబాక్ ప్రారంభించు\n"
-
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop ప్లేబాక్ ఆపుము\n"
-
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause ప్లేబాక్ నిలిపివేయి\n"
-
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next పాటలజాబితాలో తదుపరి పాట\n"
-
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev పాటలజాబితాలో మునుపటి పాట\n"
-
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random పాటల జాబితాలో యాదృచ్ఛిక పాట\n"
-
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue ఉన్నటువంటి పాటలజాబితాకు ఫైళ్ళను జతచేయి\n"
-
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
 msgstr ""
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "అప్రమేయం"
-
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "అవును"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "కాదు"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
-"ఎడమ\n"
-"కుడి"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
-"అచేతనపరుచు\n"
-"ట్రాక్\n"
-"ఆల్బమ్"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
-"2.3 (సిఫారసుచేయబడింది)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 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"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
 msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "ట్యాగ్ రకము(లు)"
-
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
 msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "కొడెక్"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:283
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:321
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:323
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "జతచేయి"
-
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:377
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/tr.po -> deadbeef-1.9.6.tar.bz2/po/tr.po Changed

@@ -1,2366 +1,3972 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# abc Def <hdogan1974@gmail.com>, 2020
+# Ercan PEKER <bahadiroglu33@gmail.com>, 2017
+# Burak <public@burakgarci.net>, 2013
 # Burak <burakgarci@gmail.com>, 2013
-# Burak <burakgarci@gmail.com>, 2013
+# Burak <public@burakgarci.net>, 2013,2017
+# Ercan PEKER <bahadiroglu33@gmail.com>, 2017
+# 2b2d1a7bf8f9d50231c591a78a7cd57a_efebab2, 2020
+# 2b2d1a7bf8f9d50231c591a78a7cd57a_efebab2, 2020
+# Numan Demirdöğen <if.gnu.linux@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/tr/)\n"
-"Language: tr\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: 2b2d1a7bf8f9d50231c591a78a7cd57a_efebab2, 2020\n"
+"Language-Team: Turkish (http://app.transifex.com/deadbeef-player/deadbeef-player/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=2; plural=(n > 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "DeaDBeef %s Hakkında"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Kullanımı: deadbeef seçenekler -- dosya (lar)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s Sürüm Notları"
+msgid "Options:\n"
+msgstr "Seçenekler:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF'i Çevirenler"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help veya -h Yardımı yazdır (bu mesajı) ve çık\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "DeaDBeeF EQ Ayarlarını Kaydet"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Oynatıcıyı kapat\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF kaydedilmiş EQ dosyaları (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Sürüm bilgilerini yazdır ve çık\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "DeaDBeeF Hazır EQ ayarları yükle..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Oynatımı başlat\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ hazır ayarlar (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Oynatımı durdur\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Foobar2000 EQ ayarlarını içe aktar..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Oynatımı duraklat\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ hazır ayarları (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause Duraklamayı geç\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Ayarları Kaydet"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr "--play-pause Durdurulmuşsa çal, değilse duraklamayı geç\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Ayarları Yükle"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Çalma listesinde sonraki parça\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 EQ Ayarlarını İçe Aktar"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Çalma listesinde önceki parça\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Etkin"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Çalma listesinde rastgele parça\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Tümünü Sıfırla"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Çalma listesine parça(lar) ekle\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Ön Amfiyi Sıfırla"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr "--gui PLUGIN Hangi GUI eklentisini kullanacağını söyler, varsayılan \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Bantları Sıfırla"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Değiştirilmiş dosya adını standard çıktıya (stdout) yazdır\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Önayarlar:"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-sözdizimi: sanatçı, başlık, albüm,\n uzunluk, parçanumarası, yıl, yorum,\n telifhakkı, geçmiş\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 gün %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr "Örnek: --nowplaying \"%%a - %%t\" > \"sanatçı - parça\" yazdıracak\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d gün %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "Daha fazla bilgi için, bkz: %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Durduruldu | %d parça |toplam çalma zamanı: %s"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr " NOT: --nowplaying kulanımdan kaldırıldı.\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr "--nowplaying-tf FMT Yeni başlık biçimi kullanarak biçimlendirilmiş parça adını stdout'a yazdırın\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr "örnek: --nowplaying-tf \"%%artist%% - %%title%%\" > \"sanatçı - parça\" yazdıracak\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Duraklatıldı"
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --ses NUM Deadbeef ses seviyesini yazdırın veya ayarlayın.\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, 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ı"
-
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Yeni Çalma Listesi"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr "NUM parametresi yüzde cinsinden belirtilebilir (mutlak değer veya artış/azalma)\n"
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:161
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Yeni Çalma Listesi (%d)"
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Sekmeli çalma listesi"
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Çalma listesi"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Çalma listesi sekmeleri"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Varsayılan"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Seçim özellikleri"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Albüm kapağı görünümü"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Steryo"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr ""
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Evet"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr ""
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Hayır"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Çıktı dizini:"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Kaynak parça klasörüne yaz"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Buton"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Klasör yapısını koru"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Biçim değişmiyorsa kopyala"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Kopyalamadan sonra yeniden etiketleme"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Çıktı dosya adı:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Uzantı (ör. .Mp3) otomatik olarak eklenecektir.\nVarsayılan için alanı boş bırakın (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Kodlayıcı:"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Yardım dosyası okunurken hata oluştu"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP önayarı:"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Yardım dosyası yüklenirken hata oluştu"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Thread sayısı:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Çıktı örneği biçimi:"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:14
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"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 "Kaynak biçimi koru\n8 bit imzalı int\n16 bit imzalı int\n24 bit imzalı int\n32 bit imzalı int\n32 bit dalgalı"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Hala çıkmak istiyor musunuz?"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Dosya mevcut olduğunda:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Atla\nKomut\nÜzerine yaz"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Kodlayıcının Önayarlarını Düzenle"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Başlık:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "İsimsiz Kodlayıcı"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Oluşacak dosyanın uzantısı:"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "mp3 gibi"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Komut satırı:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Örnek: lame - %o\ngirdi dosyası için %i, çıktı dosyası için %o, stdin (standard girdi) için - for"
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - oluşacak dosyanın adı\n%i - geçici girdi dosyasının adı"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Yöntem:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Boru\nGeçici Dosya\nKaynak Dosya"
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Etiket yazıcı"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP Önayar Düzenleyicisi"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Başlık"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "İsimsiz DSP Önayarı"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Ekle"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Kaldır"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Yapılandırma"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "DSP Eklentisini Seçin"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Eklenti"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Önayarlar"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Yerleşik %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Dosya mevcut. Üzerine yazılsın mı?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Dönüştürücü uyarısı"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Lütfen bir kodlayıcı seçin"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Dönüştürücü hatası"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Dönüştürülüyor..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Dizin seçin..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Kodlayıcı önayarları kaydedilemedi"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Dizinin erişim izinlerini kontrol edin, başka bir isim deneyin veya yeterli disk alanını boşaltın"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Bu isimle bir önayar mevcut. Başka bir isim seçin."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Hata"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Yeni kodlayıcı ekle"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Kodlayıcıyı düzenle"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Önayarı kaldır"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Seçtiğiniz önayar silinecek. Bunu yapmak istediğinizden emin misiniz?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Uyarı"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Kodlayıcılar"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "DSP zincirine eklenti ekle"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "DSP önayarı kaydedilemedi"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Yeni DSP Önayarı"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "DSP Önayarını Düzenle"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP Önayarları"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Yardım"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Kaynak biçimini koru"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 bit signed int"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 bit signed int"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 bit signed int"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 bit signed int"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 bit float"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Atla"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "İstem"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Üstüne yaz"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Boru"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Geçici Dosya"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Kaynak Dosya"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Resim dosyası bulunamıyor: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Dosya(lar) aç ..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Çalma listesine dosya(lar) ekle"
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Çalma listesine dizin(ler) ekle..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Çalma Listesi Yükle"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Çalma Listesini Farklı Kaydet"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeaDBeef %s Hakkında"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s Sürüm Notları"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF Çevirmenleri"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "İçerik-Türü"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Eklentiler"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Geçersiz değer(ler)."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "İçerik türü ve Eklentileri alanları boş olmamalı ve kurallara uymalıdır.\nÖrnek içerik türü: 'audio/mpeg'.\nÖrnek eklenti kimliği: 'stdmpg ffmpeg'.\nBoşluklar, eklenti kimlikleri listesinde ayırıcılar olarak kullanılmalıdır.\nİçerik türü yalnızca harf, rakam ve '-' işareti olmalıdır.\nEklenti kimliği yalnızca harfler ve sayılar içerebilir."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Hiçbir şey seçilmedi."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Dosya"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "Dosy_a(lar) aç"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Dosya(lar) ekle"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Dizin(ler) ekle"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Konum ekle"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "Yeni çalma listesi"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "Çalma listesi yükle"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "Çalma listesini kaydet"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "_Çıkış"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "Düz_enle"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Temizle"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Tümünü seç"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Tüm seçimleri kaldır"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Seçimi ters çevir"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Seçim"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Kaldır"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Kes"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Bul"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Sırala"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Başlık"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "Parça Numarası"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Albüm"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Sanatçı"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Tarih"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Rastgele"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "Özel"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Görünüm"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Durum çubuğu"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Ekolayzır"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
-msgstr ""
+msgstr "Tasarım modu"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Günlük kaydı"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "_Oynatım"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Sıralama"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Sıralı"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Parçaları karıştır"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Albümleri karıştır"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Tekrar"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Karıştır"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Kapat"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Parçalar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Albümler"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Rasgele Parçalar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "Tekrarla"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Tüm Parçalar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Tek Parça"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Liste takibi oynatım"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "İmleç takibi oynatım"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "Çalan parçadan sonra dur"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "Çalan albümden sonra dur"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Çalan parçaya git"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Sürüm notları"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "_Hakkında"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "Çe_virenler"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Arama"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "Dur"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "Çal"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "Duraklat"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Önceki"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Sonraki"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "Rastgele Oynatım"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "Hakkında"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Çıkış"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Yardım"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Parça Özellikleri"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
-msgstr ""
+msgstr "Konum:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Uygula"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "_Kapat"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Üstveri"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Özellikler"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Başlık:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Vazgeç"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_Tamam"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Yeni sütun başlığını giriniz"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Yaz:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Öğe İndeksi"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Çalıyor"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Albüm Kapağı"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Sanatçı - Albüm"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Süre"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Parça Numarası"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Bant / Albüm Sanatçısı"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Biçim:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Sıralama biçimi:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(eğer boş değilse)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Hizalama:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Sol"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Sağ"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Vazgeç"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Sol\nSağ\nMerkez"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_Tamam"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Metin rengi:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "Çıktı eklentisi"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Çıktı aygıtı"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "8 bit sesi her zaman 16 bite çevir"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Herzaman 16 bit sesi 24 bit sese çevir"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Hedef örnek hızı:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "48KHz katları için (96K, 192K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "44.1KHz katları için (88.2K, 176.4K, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "Giriş örnekleme hızına göre"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Örnek hızını geçersiz kıl"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Ses"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Ses gücü sabitleme kipi:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Devre dışı"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Kaynak modu:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Parça"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "Oynatma sırasına göre\nParça\nAlbüm"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Ses gücü sabitleme en yüksek limit"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "İşlem yapılıyor:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Yok\nKazanç uygula\nKazanç uygula ve zirveye göre kırpmayı önle\nSadece kırpmayı önle"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "ReplayGain preamp:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Genel önamfi:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "RG ön bilgili amplifikatör:"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "RG ön bilgisi olmayan amplifikatör:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
 msgstr ""
-"Bu çalma listesine komut satırından (veya dosya yöneticisinden) dosyalar "
-"ekle:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+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:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Açılışta önceki oturum ile devam et"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Dizin eklerken arşivden ekleme"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "\"Geçerli parçadan sonra durdur\" seçeneği tetikledikten sonra kapanır"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "\"Geçerli albümden sonra durdur\" seçeneği tetikledikten sonra kapanır"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Oynatım"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Yapılandırma"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "DSP Zinciri Önayarları"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Yükle"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Başlangıçta tepsiye küçült"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Çıkışta bildirim alanına küçült"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Bildirim alanı simgesini gizle"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "Japonca SHIFT-JIS algılama ve kayıt çözme etkin"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr ""
+msgstr "Çince CP936 algılama ve kayıt çözme etkin"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Arayüz tazeleme oranı (saniyede defa)"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "Oynatım sırasındaki başlık çubuğu metni:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "Durdurulduğunda başlık çubuğu metni:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI Eklentisi (yeniden başlatınca geçerli olur)"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Durum çubuğunda seçim oynatma süresini görüntüle"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr ""
+msgstr "Oynatıcı"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "Orta fare düğmesiyle çalma listelerini kapat"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Çalınan şarkı diskten kaldırıldığında sonraki şarkıya geç"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "Bir dizin eklendiğinde şarkı listesini otomatik isimlendir"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "Sütunları pencereye sığacak şekilde otomatik yeniden boyutlandır"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Grup aralığı:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "pixel"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Çalma listesi"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
-msgstr ""
+msgstr "GUI/Çeşitli"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Üstüne bindir"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Önplan"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Arkaplan"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Gezinti-çubuğu/Ses çubuğu renkleri"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Orta"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Açık"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Çubuklar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Arkaplan (EQ)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Oynatma çubuğu/Ses çubuğu/EQ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Temel:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Koyu:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Açık:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Orta:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Metin:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
 msgstr "Koyu"
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Temel"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Metin"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Sekme şerit renkleri"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-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:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Tüm satırlar"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Tek satır"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Seçili satır"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Seçili metin"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "İmleç"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Çalma listesi rengi"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Renkler"
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Eğik"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Oynatma metni:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Seçilen metin:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Sekme şeridi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Normal parça(lar):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Çalan parça"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Seçilen parça(lar):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Sütunlar:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Grup başlığı"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Önplan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Sıralı:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Karışık:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Seçilen:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "İmleç:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Arkaplan:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Geçersiz kıl (GTK ağaç görüntüsü temasını kaybeder, ancak işlemeyi hızlandırır)"
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Görünüm"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Vekil Sunucu Etkin"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Vekil Sunucu Adresleri:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Vekil Sunucu Portu:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Vekil Türü:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Vekil Kullanıcı Adı:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Vekil Şifresi:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "HTTP Kullanıcı Aracısı:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "İçerik Türü Eşlemesini Düzenle"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Ağ"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "Atanmış Kısayollar:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
-msgstr ""
+msgstr "Eylem:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
-msgstr ""
+msgstr "<Ayarlanmadı>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
-msgstr ""
+msgstr "Tuş bileşimi:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr ""
+msgstr "Evrensel kısayol"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "Değişikliklerinizi kaydetmek için Uygula düğmesini kullanın,\nVeya değişikliklerinizi geri almak için Eskiye dön düğmesini kullanın.\nUygula düğmesine basmazsanız,\nDeğişiklikler kaydedilmeyecektir."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "_Varsayılanlar"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
+msgstr "Kısayollar"
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Sürüm:"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Telif hakkı"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Eklentiler"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Varsayılanlara sıfırla"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Sürüm:"
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Kişisel Başlık Ayarlayın"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
-msgstr ""
+msgstr "...' göre gruplandır"
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Biçim"
+msgstr "...' e göre sırala"
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "Artan"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "Azalan"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "DSP Eklentisini Seçin"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Eklenti"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "Artan\nAzalan"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Etiket Yazma Tercihleri"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "ID3v2 Yaz"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "ID3v1 Yaz"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "APEv2 Yaz"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "ID3v2 şeridi"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "ID3v1 şeridi"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "APEv2 şeridi"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 sürümü"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Önerilen)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Tavsiye edilen)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 karakter kodlaması (varsayılan iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 Yaz"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "İçerik Türü Eşlemesi"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
+msgstr "Bu tablo, ağ akış içerik türleri ile DeaDBeeF kod çözücü eklentileri arasındaki bağlanmayı tanımlar. Örneğin, mp3 dosyaları \"audio/x-mpeg\" içerik türüne sahip olabilir ve DeaDBeeF'in kendi \"stdmpg\" eklentisi veya \"ffmpeg\" eklentisi tarafından çözülmesi gerekir."
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr "İçerik-Türü:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr "Eklentiler:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr "Düğme özellikleri"
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr "Renk:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr "Simge:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr "Etiket:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr "Eylem seç"
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr "Bu iletişim kutusu, herhangi bir parça için özel başlık ayarlamanıza izin verir. Bu, radyo istasyonları için en kullanışlıdır. Özel başlığı ayarlama seçeneği \"Konum Ekle\" iletişim kutusunda da mevcuttur. Başlık, \"Sanatçı\" meta veri alanını gösteren sütunlarda görünür. Sanatçı alanı varsa \"özel sanatçı\" ya da aksi takdirde sadece \"özel\" gibi görünmelidir."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Düzenle"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Düzenle (yerinde)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Yeni alan ekle..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Değeri Düzenle"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Alan adı:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Alan değeri:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF Kayıtları"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Temizle"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Yeniden Oynatma Kazanç Taraması Sürüyor"
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Şuanki Dosya:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Durum"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "İptal"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Yeniden Oynatma Kazanç Tarama Sonuçları"
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Dosya Etiketlerini Güncelle"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "DeaDBeeF EQ Ayarlarını Kaydet"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF kaydedilmiş EQ dosyaları (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "DeaDBeeF Hazır EQ ayarları yükle..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ hazır ayarlar (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 EQ ayarlarını içe aktar..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ hazır ayarları (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Ayarları Kaydet"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Ayarları Yükle"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 Önayarlarını İçe Aktar"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Etkin"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Tümünü Sıfırla"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Ön Amfiyi Sıfırla"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Bantları Sıfırla"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Yeni Çalma Listesi"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Desteklenen ses biçimleri"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Tüm Dosyalar (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Desteklenen çalma listesi formatları"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Tüm dosyalar"
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Diğer dosyalar (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF çalma listesi dosyası (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Sembolik bağlantıları takip et"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 gün %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d gün %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "toplam çalma süresi"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Duraklatıldı"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "bit"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "seçim oynatma süresi"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Durdu"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Çalma listesini yeniden adlandır"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Oynatma listesini kaldır"
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Oynatma listesini gerçekten kaldırmak istiyor musunuz '%s'?"
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Yeni Çalma Listesi (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Sekmeli çalma listesi"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Bölümle (üst ve alt)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Bölümle (sol ve sağ)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Sekmeler"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Çalma listesi sekmeleri"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Seçim özellikleri"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Albüm kapağı görünümü"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Spektrum"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "Yatay Kutu"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "Dikey Kutu"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Düğme"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Oynatma çubuğu"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Oynatma kontrolleri"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Ses çubuğu"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Chiptune sesleri"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Günlük kaydı görüntüleyici"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Yardım dosyası okunurken hata oluştu"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Yardım dosyası yüklenirken hata oluştu"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Müzikçalar şu anda arka planda görevler çalıştırıyor. Şimdi çıkarsanız, görevler iptal edilir veya kesilir. Bu, veri kaybına neden olabilir."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Hâlâ çıkmak istiyor musunuz?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Sanatçı / Albüm"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Parça No"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Sil"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Sol"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Sağ"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Merkez"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "Oynatma sırasına göre"
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Parça"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Hiçbiri"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Kazanç uygula"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Kazanç uygula ve zirveye göre kırpmayı önle"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Sadece kırpmayı önle"
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "Artan"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "Azalan"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Önerilen)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Sanatçı / Albüm"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Parça No"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Süre"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Öğe İndeksi"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Çalıyor"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Albüm Kapağı"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Sanatçı - Albüm"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Yıl"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Parça Numarası"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Bant / Albüm Sanatçısı"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Çözücü"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Bit hızı"
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
 msgid "Add column"
 msgstr "Sütun ekle"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
 msgid "Edit column"
 msgstr "Sütunu düzenle"
 
-#: ../plugins/gtkui/plcommon.c:1224
+#: ../plugins/gtkui/playlist/plcommon.c:869
 msgid "Remove column"
 msgstr "Sütunu kaldır"
 
-#: ../plugins/gtkui/plcommon.c:1234
+#: ../plugins/gtkui/playlist/plcommon.c:884
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "Kaydırırken grupları birbirine tuttur."
 
-#: ../plugins/gtkui/plcommon.c:1239
+#: ../plugins/gtkui/playlist/plcommon.c:889
 msgid "Group by"
 msgstr "Gruplandırma ölçütü"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Hiçbiri"
-
-#: ../plugins/gtkui/plcommon.c:1250
+#: ../plugins/gtkui/playlist/plcommon.c:900
 msgid "Artist/Date/Album"
 msgstr "Sanatçı/Tarih/Albüm"
 
-#: ../plugins/gtkui/pluginconf.c:42
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Üstveriyi Tekrar Yükle"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Oynatma Listesini Kaldır"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Yeni Çalma Listesi Ekle"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Oto Sıralamayı Etkinleştir"
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
+
+#: ../plugins/gtkui/pluginconf.c:47
 msgid "Open file..."
 msgstr "Dosya aç..."
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/gtkui/pluginconf.c:559
 #, c-format
 msgid "Configure %s"
 msgstr "%s'i yapılandır"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Varsayılan Ses Aygıtı"
-
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin/prefwin.c:140
 msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr ""
+msgstr "Kısayol tuşlarının ayarlarını değiştirdiniz, ancak değişikliklerinizi kaydetmediniz."
 
-#: ../plugins/gtkui/prefwin.c:350
+#: ../plugins/gtkui/prefwin/prefwin.c:142
 msgid "Are you sure you want to continue without saving?"
-msgstr ""
+msgstr "Kaydetmeden devam etmek istediğinizden emin misiniz?"
+
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Varsayılan Ses Aygıtı"
 
-#: ../plugins/gtkui/progress.c:56
+#: ../plugins/gtkui/progress.c:62
 msgid "Adding files..."
 msgstr "Dosyalar ekleniyor..."
 
-#: ../plugins/gtkui/progress.c:89
+#: ../plugins/gtkui/progress.c:95
 msgid "Initializing..."
 msgstr "Başlatılıyor..."
 
-#: ../plugins/gtkui/trkproperties.c:168
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Dosya Etiketleri Güncelleme İlerlemesi"
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "İsim"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Albüm Kazancı"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Parça Kazancı"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Sonuçlandı"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Dosya bulunamadı"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Geçersiz dosya"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Arama (%list_total% sonuçları)"
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Sütun Başlıklarını Göster"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Değer"
+
+#: ../plugins/gtkui/trkproperties.c:116
 msgid "You've modified data for this track."
 msgstr "Bu parça için değiştirilmiş veri mevcut."
 
-#: ../plugins/gtkui/trkproperties.c:170
+#: ../plugins/gtkui/trkproperties.c:118
 msgid "Really close the window?"
 msgstr "Pencere gerçekten kapatılsın mı?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
 msgid "Multiple values "
 msgstr "çoklu değerler"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
+#: ../plugins/gtkui/trkproperties.c:455
 msgid "Key"
 msgstr "Tuş"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Değer"
-
-#: ../plugins/gtkui/trkproperties.c:522
+#: ../plugins/gtkui/trkproperties.c:473
 msgid "Multiple values"
-msgstr ""
+msgstr "Çoklu değerler"
 
-#: ../plugins/gtkui/trkproperties.c:701
+#: ../plugins/gtkui/trkproperties.c:662
 msgid "Writing tags..."
 msgstr "Etiketler yazılıyor..."
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
+
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "Alan adı"
+
+#: ../plugins/gtkui/trkproperties.c:1213
 msgid "Name:"
 msgstr "İsim:"
 
-#: ../plugins/gtkui/trkproperties.c:745
+#: ../plugins/gtkui/trkproperties.c:1226
 msgid "Field names must not start with : or _"
 msgstr "Alan isimleri : veya _ ile başlayamaz"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
 msgid "Cannot add field"
 msgstr "Alan eklenemez"
 
-#: ../plugins/gtkui/trkproperties.c:784
+#: ../plugins/gtkui/trkproperties.c:1267
 msgid "Field with such name already exists, please try different name."
 msgstr "Bu isimde bir alan mevcut, lütfen başka bir isimle tekrar deneyin."
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Alan ekle"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Alan sil"
-
-#: ../main.c:90
+#: ../plugins/gtkui/widgets.c:460
 #, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+msgid "Widget \"%s\" is not available"
+msgstr "\"%s\" aracı kullanılamıyor"
+
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "... ile değiştir"
+
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Ekle"
+
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Kes"
+
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Kopyala"
+
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Yapıştır"
+
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Seçenekler:\n"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Bu türden çoklu pencere öğeleri desteklenmiyor"
 
-#: ../main.c:92
-#, 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"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Oransal Boyutlandırma"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Oynatıcıyı kapat\n"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Üst Panel Yüksekliğini Kilitle"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Sürüm bilgilerini yazdır ve çık\n"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Sol Panel Genişliğini Kilitle"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Oynatımı başlat\n"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Alt Panel Yüksekliğini Kilitle"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Oynatımı durdur\n"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Sağ Panel Genişliğini Kilitle"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Oynatımı duraklat\n"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Sekmeyi Yeniden Adlandır"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause Duraklamayı geç\n"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Sekmeyi Sil"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr "--play-pause Durdurulmuşsa çal, değilse duraklamayı geç\n"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Yeni Sekme Ekle"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Çalma listesinde sonraki parça\n"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Sekmeyi Sola Taşı"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Çalma listesinde önceki parça\n"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Sekmeyi Sağa Taşı"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Çalma listesinde rastgele parça\n"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Çalma listesine parça(lar) ekle\n"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
 msgstr ""
-" --nowplaying FMT Değiştirilmiş dosya adını standard çıktıya (stdout) "
-"yazdır\n"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
+
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
+
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
 msgstr ""
-" FMT %%-sözdizimi: sanatçı, başlık, albüm,\n"
-" uzunluk, parçanumarası, yıl, yorum,\n"
-" telifhakkı, geçmiş\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
+
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
 msgstr ""
-" e.g.: --şimdi çalıyor \"%%a - %%t\" yazdırır \"sanatçı "
-"- başlık\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Varsayılan"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Evet"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Hayır"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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 ""
-"Öğe İndeksi\n"
-"Çalıyor\n"
-"Albüm Kapağı\n"
-"Sanatçı - Albüm\n"
-"Sanatçı\n"
-"Albüm\n"
-"Başlık\n"
-"Süre\n"
-"Parça Numarası\n"
-"Grup / Albüm Sanatçısı\n"
-"Özel"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
-"Sol\n"
-"Sağ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
 msgstr ""
-"Devre dışı\n"
-"Parça\n"
-"Albüm"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
 msgstr ""
-"Artan\n"
-"Azalan"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
-"2.3 (Tavsiye edilen)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 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
-#: ../translation/extra.c:3
-msgid "Add Audio CD"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "Last.fm'den bak"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "ALSA örneklemesini kullan"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "Aygıt durdurulduğunda"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "Tercih edilen tampon boyutu"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Tercih edilen döngü"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Scrobbler etkin"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Çalarken devredışı"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "Kullanıcıadı"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Kutuyu 1 Öğeye Göre Genişlet"
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "Parola"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Kutuyu 1 Öğeye Göre Küçült"
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Aynı yapıda olanlar"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Genişlet"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Doldur"
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Düğmeyi Yapılandırın"
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Aygıt dosyası"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 örnekleme hızı hatası için geçici çözüm"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Önbellek güncelleştirme döngüsü (saat)"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Sesler:"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "Gömülü etiketlerden getir"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "Yerel dizinlerden getir"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Yerel kapak dosya maskesi"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "(duraklatıldı)"
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Last.fm'den getir"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "(durdu)"
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "albumart.org'dan getir"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Kapağı uzun kenara göre ölçekle"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "CDDB/FreeDB kullan"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "(çalıyor)"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "CDDB'den CD-Metni tercih et"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (örn. 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB port numarası (örn. '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "HTTP için CDDB protokolünü tercih et"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Öğeler"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "NRG kalıp desteği etkin"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Çalma listesi tarayıcısı"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Örnekleme kalitesi (0..2, yüksek olan kalitelidir)"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Özel Kabuk Komutları"
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Kapat"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "En büyük parça uzunluğu (dakika cinsinden)"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Komutu Düzenle"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Komut:"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr ""
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr "İsteğe bağlı kabuk komutu. Ana uygulamanın başlatıldığı kabuk bağlamında yürütülecektir. Başlık biçimlendirmesi kullanılabilir. Örnek: xdg-open %D"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Diskten dosya silmek için onay iste"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Ses kontrol simgesi hassasiyet durumu"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Serbest form adı, örneğin \"Kabuk Komutu 1\""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Özel durum simgesi"
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
+msgid ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Komut Kimliği, normalde kısa bir şey olmalı, örneğin \"youtube_open\". Benzersiz olmalı."
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "--sync ile gtk_init çalıştır (hata ayıklama kipinde)"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Tek Parçalar"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Eklenti içeriği menü öğeleri arasına ayırıcı ekle"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Tek parça üzerinde çalışır."
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Bilgilendirme başlık biçimi"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Çoklu Parçalar"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Bilgineldirme içerik biçimi"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Çoklu parçalar üzerinde çalışır."
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Albüm kapağını göster"
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Yerel"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Albüm kapağı büyüklüğü (px)"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Yerel parçalar üzerinde çalışır."
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio sunucusu"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Uzaktan komut"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Örnekleme oranı"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Uzaktan komut dosyalarıyla çalışır (örneğin http:// akışlar)"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "İlgili tablo arama yolu"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Genel (Ana Menü)"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Tam tablo arama yolu"
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "Öğe ana menüde görünmelidir"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Ses takas baytları(duyduğunuz bütün geçiş statik ise)"
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
+msgid ""
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr " Komutu ana menüye eklemek isterseniz, başlığın şu şekilde menü yolunu içerdiğinden emin olun: \"File/My Command\", burada File, İngilizce sürümdeki menü adıdır. "
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "HVSC Songlength DB'yi etkinleştir"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Komut Ekle"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (HVSC'den)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Örnekleme başına bit (8 veya 16)"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "Bu eylem seçtiğiniz kabuk komutunu silecek. Emin misiniz?"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Öntanımlı parça uzunluğu (saniye)"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Kaldır'ı onayla"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity + + bank yapılandırma dosyası"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID boş olmamalı ve benzersiz olmalıdır.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Başlık boş olmamalı.\n"
 
-#: ../translation/extra.c:70
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "Kabuk komutu boş olmamalı.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Geçersiz Değerler"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "mono"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "steryo"
+
+#: ../translation/extra.c:3
 msgid "Track Title"
 msgstr "Parça Başlığı"
 
-#: ../translation/extra.c:71
+#: ../translation/extra.c:4
 msgid "Performer"
 msgstr "Sanatçı"
 
-#: ../translation/extra.c:76
+#: ../translation/extra.c:9
 msgid "Total Tracks"
 msgstr "Toplam Parça"
 
-#: ../translation/extra.c:77
+#: ../translation/extra.c:10
 msgid "Genre"
 msgstr "Tür"
 
-#: ../translation/extra.c:78
+#: ../translation/extra.c:11
 msgid "Composer"
 msgstr "Besteci"
 
-#: ../translation/extra.c:79
+#: ../translation/extra.c:12
 msgid "Disc Number"
 msgstr "Disk Numarası"
 
-#: ../translation/extra.c:80
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "Toplam Disk"
+
+#: ../translation/extra.c:14
 msgid "Comment"
 msgstr "Yorum"
 
-#: ../translation/extra.c:81
+#: ../translation/extra.c:15
 msgid "Encoder / Vendor"
 msgstr "Kodlayıcı / Sağlayıcı"
 
-#: ../translation/extra.c:83
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "Telif hakkı"
+
+#: ../translation/extra.c:17
 msgid "Location"
 msgstr "Konum"
 
-#: ../translation/extra.c:84
+#: ../translation/extra.c:18
 msgid "Subtrack Index"
 msgstr "Altparça İndeksi"
 
-#: ../translation/extra.c:85
+#: ../translation/extra.c:19
 msgid "Tag Type(s)"
 msgstr "Etiket Tür(leri)"
 
-#: ../translation/extra.c:86
+#: ../translation/extra.c:20
 msgid "Embedded Cuesheet"
 msgstr "Gömülü Çağrı Sayfası"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Çözücü"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Dosya Uzantıları (';' ile ayırın)"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Dönüştür"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Hedef örnekleme oranı"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Satoh üzerinden Ken öykünmesini tercih et (çevresel ses çalışmaz)"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Çevresel ses etkin"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "ALSA örneklemesini kullan"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Tercih edilen tampon boyutu"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Tercih edilen döngü"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "Otomatik örnekleme oranı (hedef örnekleme oranının üzerine yazılır)"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "Gömülü etiketlerden getir"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "Yerel dizinlerden getir"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Last.fm'den getir"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "MusicBrainz'den getir"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Albumart.org'dan getir"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Sanat eseri bulunmadığında"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "boş bırak"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "DeaDBeeF'in varsayılan kapağını kullan"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "özel resmi görüntüle"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Özel görüntü yolu"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Dosya mevcut. Üzerine yazılsın mı?"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Dönüştürücü uyarısı"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Lütfen bir kodlayıcı seçin"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Dönüştürücü hatası"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "Yüklenecek CD sürücüsü"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Dönüştürülüyor..."
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Ses CD Sürücüsü"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Dizin seçin..."
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Dosya"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Kodlayıcı önayarları kaydedilemedi"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Ses CD' si Ekle"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
-"Dizinin erişim izinlerini kontrol edin, başka bir isim deneyin veya yeterli "
-"disk alanını boşaltın"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "Bu isimle bir önayar mevcut. Başka bir isim seçin."
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "CDDB'den CD-Metni tercih et"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Hata"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Yeni kodlayıcı ekle"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Kodlayıcıyı düzenle"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "CDDB protokolünü kullan"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Önayarı kaldır"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "NRG kalıp desteği etkin"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Seçtiğiniz önayar silinecek. Bunu yapmak istediğinizden emin misiniz?"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Normal oynatma için sürüş hızı"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Kodlayıcılar"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "DSP zincirine eklenti ekle"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "DSP önayarı kaydedilemedi"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Maksimum"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Yeni DSP Önayarı"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Kopyalama sırasında cdparanoia hata düzeltmesi kullanma"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "DSP Önayarını Düzenle"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Dönüştür"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP Önayarları"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Çıkış cihazından örnek hızını otomatik algıla"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Çıktı dizini:"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Örnek hızını doğrudan ayarla"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Kalite / Algoritma"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Yeniden örnekleme kalitesi"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Hacim arttırma"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Yalnızca Aç/Kapat"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Çıktı dosya adı:"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Ffmpeg tarafından desteklenen tüm uzantıları kullan"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Dosya Uzantıları (';' ile ayırın)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
-"Dosya uzantısı (.mp3 gibi) otomatik olarak eklenecektir.\n"
-"Öntanımlı olanı kullanmak için bu alanı boş bırakın (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Kodlayıcı:"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Bozuk başlık hatalarını yoksay"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP önayarı:"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Çözümlenemeyen akış hatalarını yok say"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Thread sayısı:"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "En büyük parça uzunluğu (dakika cinsinden)"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Çıktı örneği biçimi:"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "Sesi azaltarak çıkma uzunluğu (saniye)"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Kaynak biçimini koru"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "Play loops nr. of times (if available)"
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 bit signed int"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS (SGC dosya formatı için)"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 bit signed int"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "Yeniden oynatma kazancı"
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 bit signed int"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Yeniden Oynatma Kazanç Blgilerini Kaldır"
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 bit signed int"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Seçimi Albüm Olarak Tara (Etikete Göre)"
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 bit float"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Seçimi Tek Albüm Olarak Tara"
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Dosya mevcut olduğunda:"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Dosya Başına Parça Kazancına göre Tara"
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "İstem"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Üstüne yaz"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Tüm Seçimleri Kaldır"
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Kodlayıcının Önayarlarını Düzenle"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Tümünü Seç"
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "İsimsiz Kodlayıcı"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Konum ekle"
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Oluşacak dosyanın uzantısı:"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Klasör(ler) Ekle"
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "mp3 gibi"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Dosya(lar) Ekle"
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Komut satırı:"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Dosya(lar) Aç"
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:178
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
-msgstr ""
-"Örnek: lame - %o\n"
-"girdi dosyası için %i, çıktı dosyası için %o, stdin (standard girdi) için - "
-"for"
+msgid "Show Help Page"
+msgstr "Yardım Sayfasını Göster"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:182
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
-msgstr ""
-"%o - oluşacak dosyanın adı\n"
-"%i - geçici girdi dosyasının adı"
+msgid "Cycle Repeat Mode"
+msgstr "Çevrim Tekrarlama Modu"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Yöntem:"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Tekrarla - Kapalı"
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Boru"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Tekrarla - Tek Parça"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Geçici dosya"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Tekrarla - Tümü"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Karışık Çevrim Modu"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Karışık - Rastgele Parçalar"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Karışık - Albümler"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Karışık - Parçalar"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Karışık - Kapalı"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Etiket yazıcı"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "İmlece Oynatmayı Takip Ettir"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP Önayar Düzenleyicisi"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Listeyi Oynatmayı Takip Ettir"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "İsimsiz DSP Önayarı"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Görünüm"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Ekle"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Mnüyü Göster\\/Gizle"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Resim dosyası bulunamıyor: %s"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Durum çubuğunu Göster\\/Gizle"
 
-#: ../plugins/converter/converter.glade.h:12
-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 ""
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Tasarım Modunu Değiştir"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
-msgstr ""
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Özel Sıralama"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Seçilenleri Kırp"
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr ""
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Çalma Listesini Kaydet"
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
-msgstr ""
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Mevcut Çalma Listesini Kaldır"
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
-msgstr ""
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Ekolayzer'i Göster\\/Gizle"
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:232
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
-msgstr ""
+msgid "Hide Equalizer"
+msgstr "Ekolayzer'i Gizle"
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
-msgstr ""
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Ekolayzer'i Göster"
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
-msgstr ""
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Oynatıcı Penceresini Göster\\/Gizle"
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Oynatıcı Penceresini Gizle"
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
-msgstr ""
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Oynatıcı Penceresini Göster"
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
-msgstr ""
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Bul"
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
-msgstr ""
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Günlük Penceresini Göster\\/Gizle"
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
-msgstr ""
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Diskten dosya silmek için onay iste"
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Ses kontrol simgesi hassasiyet durumu"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Özel durum simgesi"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Eklenti içeriği menü öğeleri arasına ayırıcı ekle"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Parça durumu için resimler yerine unicode karakterler kullanın"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Oynatma çubuğu yer paylaşımı metnini devre dışı bırak"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Şuraya atla"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Sonraki Çalma Listesi"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Rastgele Sırala"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "Seçimi Ters Çevir"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "Çalma Listesini Temizle"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Taşı"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Parçaları Aşağı Taşı"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Parçaları Yukarı Taşı"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Sesi Aç/Kapa"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Duraklatmayı Aç/Kapa"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Oynat\\/Durdur"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Sesi Arttır"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Sesi Azalt"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Geçerli Parçadan Sonra Dur"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Geçerli Albümden Sonra Dur"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Scrobbler etkin"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Çalarken devredışı"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Kullanıcıadı"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Parola"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Sanatçı alanı üzerinde Albüm Sanatçısı' nı tercih et"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "MusicBrainz Kimliği Gönder"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "30 saniyeden kısa parçalar gönder (önerilmez)"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Sol miks"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Sağ miks"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "16 bit çıkışı zorla"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Bilgilendirme başlık biçimi"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Bilgineldirme içerik biçimi"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Albüm kapağını göster"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Albüm kapağı büyüklüğü (px)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Aygıt dosyası"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Geçerli çalma listesini aydınlat"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Çift tıklamayla oynat"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Cihaz adı kodlaması"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Aşağıda tanımlanmış"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Özel cihaz adı kodlaması"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio sunucusu (varsayılan için boş bırakın)"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Varsayılan şarkı uzunluğu (dakika olarak)"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Örnekleme oranı"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Daha kısa olduğunda atla (sn)"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Özel Kabuk Komutlarını Yapılandırma"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "İlgili tablo arama yolu"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Tam tablo arama yolu"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Ses takas baytları(duyduğunuz bütün geçiş statik ise)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "HVSC Songlength DB'yi etkinleştir"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Songlengths.md5/.txt dosyasının tam yolu"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Örnek başına bit sayısı"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Varsayılan parça uzunluğu (saniye)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Günlük kaydını etkinleştir"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity + + bank yapılandırma dosyası"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/ug.po -> deadbeef-1.9.6.tar.bz2/po/ug.po Changed

@@ -1,905 +1,1458 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/deadbeef-player/"
-"language/ug/)\n"
-"Language: ug\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uyghur (http://app.transifex.com/deadbeef-player/deadbeef-player/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"
+"Language: ug\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "DeaDBeeF %s ھەققىدە"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s نى ئۆزگەرتىش خاتىرىسى"
+msgid "Options:\n"
+msgstr "تاللانمىلار:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF تەرجىمانلىرى"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help ياكى -h مۇشۇ ياردەمنى كۆرسىتىپ ئاخىرلىشىدۇ\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشىشىنى ساقلاش"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit قويغۇنى ئاخىرلاشتۇرىدۇ\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشەش ھۆججەتلىرى (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version نەشر ئۇچۇرىنى بېسىپ چىقىرىپ ئاخىرلىشىدۇ\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشىشىنى ئوقۇش…"
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play قويۇشنى باشلايدۇ\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشەشلىرى (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop قويۇشنى توختىتىدۇ\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Foobar2000 EQ نىڭ ئالدىن تەڭشىشىنى ئىمپورت قىلىش…"
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause قويۇشنى ۋاقىتلىق توختىتىدۇ\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ نىڭ ئالدىن تەڭشەشلىرى (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause ۋاقىتلىق توختىتىشنى ئالماشتۇرىدۇ\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "ئالدىن تەڭشەشنى ساقلاش"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause قويۇۋاتقان بولسا ۋاقىتلىق توختىتىدۇ، باشقا ھالەتنىمۇ ۋاقىتلىق توختىتىدۇ\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "ئالدىن تەڭشەشنى ئوقۇش"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next قويۇش تىزىمىدىكى كېيىنكى ناخشا\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Foobar2000 نىڭ ئالدىن تەڭشىشىنى ئىمپورت قىلىش"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev قويۇش تىزىمىدىكى ئالدىنقى ناخشا\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "ئىناۋەتلىك"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random قويۇش تىزىمىدىكى ناخشىنى تەرتىپسىز قويىدۇ\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "ھەممىنى نۆل قىلىش"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue ھۆججەت(لەر) نى قويۇش تىزىمىغا قوشىدۇ\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "ئالدىن كۈچەيتىشنى نۆل قىلىش"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "بەلۋاغلارنى نۆل قىلىش"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT پىچىلغان نەغمە ئاتىنى ئۆلچەملىك چىقىرىش ئۈسكۈنىسى(stdout) غا چىقىرىدۇ\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "ئالدىن تەڭشەشلەر"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-syntax: artist, title, album,\n length, tracknumber, year, comment,\n copyright, elapsed\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 كۈن %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d كۈن %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "توختىغان | %d نەغمە | %s جەمئىي قويۇش ۋاقتى"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "كۆڭۈلدىكى"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "يەككە يوللۇق ئاۋاز"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "ستېرېئو"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "ھەئە"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "ۋاقىتلىق توختىدى | "
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "ياق"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "چىقىرىش قىسقۇچى:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "چىقىرىش ھۆججىتىنىڭ ئاتى:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
 msgstr ""
-"%s%s %s| %d گېرتس | %d بىت | %s | %d:%02d / %s | %d نەغمە | %s جەمئىي قويۇش "
-"ۋاقتى"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "يېڭى قويۇش تىزىمى"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "كودلىغۇچ:"
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "يېڭى قويۇش تىزىمى(%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP ئالدىن تەڭشىشى"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "جەريان(threads) سانى:"
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "چىقىرىش ئەۋرىشكىسىنىڭ پىچىمى:"
+
+#: ../plugins/converter/converter.glade.h:14
+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 "مەنبە پىچىمى ئۆزگەرمىسۇن\n8 بىتلىق ئالامەتلىك پۈتۈن سان\n16 بىتلىق ئالامەتلىك پۈتۈن سان\n24 بىتلىق ئالامەتلىك پۈتۈن سان\n32 بىتلىق ئالامەتلىك پۈتۈن سان\n32 بىتلىق لەيلىمە كەسىر سان"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "ھۆججەت مەۋجۇت بولسا:"
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "كودلىغۇچ ئالدىن تەڭشىشىنى تەھرىرلەش"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "ماۋزۇ:"
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "ماۋزۇسىز كودلىغۇچ"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "چىقىرىش ھۆججىتىنىڭ كېڭەيتىلمە ئاتى:"
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "يەنى mp3 دېگەندەك"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "بۇيرۇق قۇرى:"
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - چىقىرىش ھۆججىتىنىڭ ئاتى\n%i - ۋاقىتلىق كىرگۈزۈش ھۆججىتىنىڭ ئاتى"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "ئۇسۇل:"
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "خەتكۈش يازغۇچ"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP ئالدىن تەڭشىكىنى تەھرىرلىگۈچ"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "ماۋزۇ"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "نامسىز DSP ئالدىن تەڭشىشى"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "قوش"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "چىقىرىۋەت"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "سەپلە"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "DSP قىستۇرمىسىنى تاللاش"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "قىستۇرما"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "ئالدىن تەڭشەشلەر"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
 msgstr ""
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "مەزكۇر ھۆججەت مەۋجۇت. قاپلامسىز؟"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "ئايلاندۇرغۇچ ئاگاھلاندۇرۇشى"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "كودلىغۇچ تاللاڭ"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "ئايلاندۇرغۇچ خاتالىقى"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "ئايلاندۇرۇۋاتىدۇ…"
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "قىسقۇچ تاللاش…"
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "كودلىغۇچ ئالدىن تەڭشىشىنى ساقلاش مەغلۇپ بولدى"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "ئالدىن تەڭشەش قىسقۇچىنىڭ ئىمتىيازلىرىنى تەكشۈرۈڭ، باشقا ماۋزۇ تاللاڭ ياكى دىسكىنى ئازراق بىكارلاڭ"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "ئوخشاش ئاتلىق ئالدىن تەڭشەش مەۋجۇت. باشقا بىرنى تاللاڭ."
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "خاتالىق"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "يېڭى كودلىغۇچ قوشۇش"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "كودلىغۇچ تەھرىرلەش"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "ئالدىن تەڭشەشنى چىقىرىۋېتىش"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "بۇ مەشغۇلاتتا تاللانغان ئالدىن تەڭشەش ئۆچۈرۈلىدۇ. راستلا ئۆچۈرەمسىز؟"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "ئاگاھلاندۇرۇش"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "كودلىغۇچ"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "يېڭى قىستۇرمىنى DSP زەنجىرىگە قوشۇش"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "DSP ئالدىن تەڭشىشىنى ساقلاش مەغلۇپ بولدى"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "يېڭى DSP ئالدىن تەڭشىشى"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "DSP ئالدىن تەڭشىشىنى تەھرىرلەش"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP ئالدىن تەڭشەشلىرى"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "ياردەم"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "مەنبەنىڭ پىچىمىدەك بولسۇن"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 بىتلىق ئالامىتى بار پۈتۈن سان"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 بىتلىق ئالامىتى بار پۈتۈن سان"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 بىتلىق ئالامىتى بار پۈتۈن سان"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 بىتلىق ئالامىتى بار پۈتۈن سان"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 بىتلىق لەيلىمە كەسىر سان"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "ئەسكەرتىش"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "قاپلاش"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "تۇرۇبا"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "pixmap ھۆججىتىنى تاپقىلى بولمىدى: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "DeaDBeeF %s ھەققىدە"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s نى ئۆزگەرتىش خاتىرىسى"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF تەرجىمانلىرى"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "ياردەم ھۆججىتىنى ئوقۇۋاتقاندا مەغلۇپ بولدى"
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "قىستۇرما"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "ياردەم ھۆججىتىنى ئوقۇش مەغلۇپ بولدى."
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/gtkui/ctmapping.c:201
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "ئاگاھلاندۇرۇش"
-
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "ھۆججەت(_F)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "ھۆججەت(لەر)نى ئاچ(_O)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "ھۆججەت(لەر)نى قوشۇش"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "قىسقۇچ(لار)نى قوشۇش"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "ئورۇن قوشۇش"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "يېڭى قويۇش تىزىمى"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "قويۇش تىزىمىنى ئوقۇش"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "قويۇش تىزىمىنى ساقلاش"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "چېكىن(_Q)"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "تەھرىر(_E)"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "تازىلا(_C)"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "ھەممىنى تاللا"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "ھەممىنى تاللىما"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "تاللاشنى ئۆرۈ"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "تاللانما"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "چىقىرىۋەت"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "قىرقىش"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "ئىزدە(_F)"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "ماۋزۇ"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "ناخشا نومۇرى"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "ئالبوم"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "ئورۇنلىغۇچى"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "چېسلا"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "قالايمىقان"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "ئىختىيارى"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "مايىللىق"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "كۆرۈنۈش(_V)"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "ھالەت بالدىقى"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "تەڭشىگۈچ"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "قوي(_P)"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "تەرتىپلە"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "سىزىقلىق"
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "نەغمىنى تەرتىپسىز قويۇش"
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "ئالبومنى تەرتىپسىز قويۇش"
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "قايتىلاۋاتىدۇ"
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "سىيرىغۇچ قويۇۋاتقىنىغا ئەگەشسۇن"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "نۇربەلگە قويۇۋاتقىنىغا ئەگەشسۇن"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "نۆۋەتتىكى نەغمىگە سەكرەش"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "ئۆزگىرىش خاتىرىسى(_C)"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "ھەققىدە(_A)"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "تەرجىمانلار(_T)"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "ئىزدە"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "توختا"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "قوي"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "ۋاقىتلىق توختا"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "ئالدىنقى"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "كېيىنكى"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "تەرتىپسىز قويۇش"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "ھەققىدە"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "ئاخىرلاشتۇرۇش"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "ياردەم"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "نەغمە خاسلىقى"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "قوللان(_A)"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "ياپ(_C)"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "مېتا سانلىق-مەلۇماتى"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "خاسلىق"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "ماۋزۇ:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "ئەمەلدىن قالدۇر(_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "جەزملە(_O)"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "يېڭى ئىستون ماۋزۇسىنى بۇ يەرگە كىرگۈزۈڭ"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "تىپى:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "تۈر ئىندېكسى"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "قويۇۋاتىدۇ"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "ئالبوم مۇقاۋىسى"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "ئورۇنلىغۇچى - ئالبوم"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "ۋاقتى"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "نەغمە نومۇرى"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "مۇزىكا ئەترىتى / ئالبوم ئورۇنلىغۇچى"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "پىچىم:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "توغرىلاش:"
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "سول"
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "ئوڭ"
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "توغرىلاش:"
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "ئەمەلدىن قالدۇر(_C)"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "جەزملە(_O)"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "چىقىرىش قىستۇرمىسى:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "چىقىرىش ئۈسكۈنىسى:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "8 بىتلىق ئۈننى ھەمىشە 16 بىتلىق ئۈنگە ئايلاندۇرۇش"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "ئاۋاز"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Replaygain ھالىتى:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "ئىناۋەتسىز"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "نەغمە"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "قويۇشنى كۈچەيتىش مىقدارىنىڭ ئەڭ چوڭ قىممىتىنى تەڭشەش"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "قويۇش مىقدارىنى ئالدىن كۈچەيتىش:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "ئومۇمىي ئالدىن كۈچەيتىش:"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
 msgstr ""
-"بۇيرۇق قۇرىدىن(ياكى ھۆججەت باشقۇرغۇدىن) ھۆججەت(لەر)نى بۇ قويۇش تىزىمىغا "
-"قوشۇش:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "بۇيرۇق قۇرىدىن(ياكى ھۆججەت باشقۇرغۇدىن) ھۆججەت(لەر)نى بۇ قويۇش تىزىمىغا قوشۇش:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "باشلانغاندا ئالدىنقى ئەڭگىمەنى داۋام قىلسۇن"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "قىسقۇچتىن قوشۇۋاتقاندا ئارخىپتىن قوشما"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "قويۇش"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "سەپلە"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "DSP زەنجىرىنىڭ ئالدىن تەڭشىشى"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "يۈكلە(_L)"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "كۆزنەك يېپىلغاندا سىستېما قوندىقىغا كىرسۇن"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "سىستېما قونداق سىنبەلگىسىنى يوشۇر"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "كۆرۈنمەيۈزنى يېڭىلاش تېزلىكى(ھەر سېكۇنتتىكى قېتىم سانى)"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "قويۇۋاتقان چاغدىكى ماۋزۇ بالدىقى تېكىستى:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "توختىغان چاغدىكى ماۋزۇ بالدىقى تېكىستى:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "GUI قىستۇرمىسى (ئۆزگەرتىلگەندىن كېيىن قايتا باشلاش زۆرۈر):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "يەككە مۇندەرىجە قوشۇلغاندا قويۇش تىزىمىنىڭ ئاتىنى ئاپتوماتىك بەلگىلە"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "قاپلاش"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "ئالدى كۆرۈنۈش"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "تەگلىك"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "ئىزدەش بالدىقى/ئاۋاز چوڭلۇقى بالدىقى"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "ئوتتۇرا"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "ئاق"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "قارا"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "ئاساسى"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "تېكىست"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "بەتكۈچنىڭ رەڭگى"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr ""
-"قاپلاش(GTK نىڭ دەرەخسىمان كۆرۈنۈشىنىڭ ئۆرنىكى يوقىلىدۇ، بىراق سىزىش تېزلىكى "
-"تېزلىشىدۇ)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "جۈپ قۇر"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "تاق قۇر"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "تاللانغان قۇر"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "تاللانغان تېكىست"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "نۇربەلگە"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "قويۇش تىزىمىنىڭ رەڭلىرى"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "رەڭلەر"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "ۋاكالەتچى مۇلازىمېتىرنى ئىناۋەتلىك قىلىش"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "ۋاكالەتچى مۇلازىمېتىرنىڭ ئادرېسى:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "ۋاكالەتچى مۇلازىمېتىرنىڭ ئېغىزى:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "ۋاكالەتچىنىڭ تىپى:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "ۋاكالەتچىنىڭ ئىشلەتكۈچى ئاتى:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "ۋاكالەتچى ئىمى:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "تور"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
@@ -907,128 +1460,124 @@
 "if you don't press Apply."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "نەشرى: "
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "نەشر ھوقۇقى"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "قىستۇرما"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "نەشرى: "
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "پىچىمى"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "ئۆسكۈچى"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "كېمەيگۈچى"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "DSP قىستۇرمىسىنى تاللاش"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "قىستۇرما"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "چوڭىيىش/كىچىكلەش"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "خەتكۈش يازغۇچ تەڭشىكى"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "ID3v2 نى يېزىش"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "ID3v1 نى يېزىش"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "APEv2 نى يېزىش"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "ID3v2 نى ئۆچۈرۈۋېتىش"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "ID3v1 نى ئۆچۈرۈۋېتىش"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "APEv2 نى ئۆچۈرۈۋېتىش"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 نەشرى"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (تەۋسىيە قىلىنىدۇ)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (تەۋسىيە قىلىنىدۇ)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 ھەرپ كودلىشى (كۆڭۈلدىكى قىممىتى iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "ID3v2.4 نى يېزىش"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
@@ -1036,1027 +1585,1017 @@
 "plugin, or \"ffmpeg\" plugin."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "ئورۇنلىغۇچى / ئالبوم"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "نەغمە نومۇرى"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "ئىستون قوشۇش"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "ئىستون تەھرىرلەش"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "ئىستوننى ئۆچۈر"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "گۇرۇپپىلاش"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "يوق"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "ئورۇنلىغۇچى/چېسلا/ئالبوم"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "ھۆججەت ئېچىش…"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "%s نى سەپلەش"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "كۆڭۈلدىكى ئۇن ئۈسكۈنىسى"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "ھۆججەتلەرنى قوشۇۋاتىدۇ…"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "دەسلەپلەشتۈرۈۋاتىدۇ…"
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "بۇ نەغمىنىڭ سانلىق-مەلۇماتلىرىنى ئۆزگەرتتىڭىز."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "كۆزنەكنى راستلا ياپامسىز؟"
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشىشىنى ساقلاش"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "بىر قانچە قىممەت "
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشەش ھۆججەتلىرى (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "ئاچقۇچ"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشىشىنى ئوقۇش…"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "قىممەت"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ نىڭ ئالدىن تەڭشەشلىرى (*.ddbeq)"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr ""
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Foobar2000 EQ نىڭ ئالدىن تەڭشىشىنى ئىمپورت قىلىش…"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "خەتكۈچلەرنى يېزىۋاتىدۇ…"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ نىڭ ئالدىن تەڭشەشلىرى (*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "ئالدىن تەڭشەشنى ساقلاش"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "ئالدىن تەڭشەشنى ئوقۇش"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Foobar2000 نىڭ ئالدىن تەڭشىشىنى ئىمپورت قىلىش"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "ئىناۋەتلىك"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "ھەممىنى نۆل قىلىش"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "ئالدىن كۈچەيتىشنى نۆل قىلىش"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "بەلۋاغلارنى نۆل قىلىش"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "يېڭى قويۇش تىزىمى"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "ئاتى:"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "سوز بۆلىكى ئاتى : ياكى _ بىلەن باشلانماسلىقى كېرەك"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "سوز بۆلىكى قوشقىلى بولمىدى"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "بۇنداق ئاتى بار سوز بۆلىكى مەۋجۇت، باشقا ئاتنى سىناپ كۆرۈڭ."
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "سوز بۆلىكى قوشۇش"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "سوز بۆلىكىنى چىقىرىۋېتىش"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
 msgstr ""
 
-#: ../main.c:91
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid "Options:\n"
-msgstr "تاللانمىلار:\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 كۈن %d:%02d:%02d"
 
-#: ../main.c:92
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help ياكى -h مۇشۇ ياردەمنى كۆرسىتىپ ئاخىرلىشىدۇ\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d كۈن %d:%02d:%02d"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit قويغۇنى ئاخىرلاشتۇرىدۇ\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version نەشر ئۇچۇرىنى بېسىپ چىقىرىپ ئاخىرلىشىدۇ\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play قويۇشنى باشلايدۇ\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop قويۇشنى توختىتىدۇ\n"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause قويۇشنى ۋاقىتلىق توختىتىدۇ\n"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause ۋاقىتلىق توختىتىشنى ئالماشتۇرىدۇ\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
 msgstr ""
-" --play-pause قويۇۋاتقان بولسا ۋاقىتلىق توختىتىدۇ، باشقا ھالەتنىمۇ "
-"ۋاقىتلىق توختىتىدۇ\n"
 
-#: ../main.c:100
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next قويۇش تىزىمىدىكى كېيىنكى ناخشا\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../main.c:101
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev قويۇش تىزىمىدىكى ئالدىنقى ناخشا\n"
+msgid "New Playlist (%d)"
+msgstr "يېڭى قويۇش تىزىمى(%d)"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random قويۇش تىزىمىدىكى ناخشىنى تەرتىپسىز قويىدۇ\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue ھۆججەت(لەر) نى قويۇش تىزىمىغا قوشىدۇ\n"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
 msgstr ""
-" --nowplaying FMT پىچىلغان نەغمە ئاتىنى ئۆلچەملىك چىقىرىش "
-"ئۈسكۈنىسى(stdout) غا چىقىرىدۇ\n"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
 msgstr ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
 msgstr ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "كۆڭۈلدىكى"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "ھەئە"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "ياق"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/gtkui.c:1466
+msgid "VBox"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
 msgstr ""
-"سول\n"
-"ئوڭ"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "ياردەم ھۆججىتىنى ئوقۇۋاتقاندا مەغلۇپ بولدى"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "ياردەم ھۆججىتىنى ئوقۇش مەغلۇپ بولدى."
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
 msgstr ""
-"ئىناۋەتسىز\n"
-"نەغمە\n"
-"ئالبوم"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Ascending\n"
-"Descending"
-msgstr "چوڭىيىش/كىچىكلەش"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"2.3 (تەۋسىيە قىلىنىدۇ)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, 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 "Do you really want to delete the selected file?%s"
 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "ئىزدەش (Last.fm) دىن"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "ئەۋرىشكىلەشكە ALSA ئىشلىتىش"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "توختىغاندا ئۈسكىنىنى قويۇۋېتىش"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "ئامراق يىغلەك چوڭلۇقى"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "ئامراق مەزگىل(period) چوڭلۇقى"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "سول"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "scrobbler نى ئىناۋەتلىك قىلىش"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "ئوڭ"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "nowplaying نى ئىناۋەتسىز قىلىش"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "ئىشلەتكۈچى ئاتى"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "ئىم"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "ئۈسكۈنە ھۆججىتى"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 ئەۋرىشكىلەش نىسبىتىدىكى كەمتۈكلەرنى تۈزىتىش"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "غەملەك يېڭىلاش ئىنتېرۋالى(سائەت)"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "نەغمە"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "سىڭدۈرۈلگەن خەتكۈچلەردىن ئېلىش"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "يوق"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "يەرلىك قىسقۇچتىن ئېلىش"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "يەرلىك مۇقاۋا ھۆججەت ماسكىسى"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "last.fm دىن ئېلىش"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "albumart.org دىن ئېلىش"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "سۈرەتنى ئۇزۇن تەرىپى بويىچە چوڭايتىش"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "CDDB/FreeDB نى ئىشلىتىش"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "CDDB نى ئەمەس CD-Text نى ئالدىن ئويلىشىش"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB تور ئادرېسى(URL)( ‹freedb.org› دېگەندەك)"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB ئېغىز نومۇرى( ‹888› دېگەندەك)"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "HTTP نى ئەمەس CDDB كېلىشىمىنى ئالدىن ئويلىشىش"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "ئۆسكۈچى"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "ئىناۋەتلىك قىلىش (NRG سۈرىتىنى قوللاشنى)"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "كېمەيگۈچى"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "ئەۋرىشكىلەش سۈپىتى (0..2, چوڭ بولسا ياخشى)"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (تەۋسىيە قىلىنىدۇ)"
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr ""
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "ئەڭ چوڭ ناخشا ئۇزۇنلۇقى( مىنۇت)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "ئورۇنلىغۇچى / ئالبوم"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "نەغمە نومۇرى"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "ۋاقتى"
+
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "تۈر ئىندېكسى"
+
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "قويۇۋاتىدۇ"
+
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "ئالبوم مۇقاۋىسى"
+
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "ئورۇنلىغۇچى - ئالبوم"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "نەغمە نومۇرى"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "مۇزىكا ئەترىتى / ئالبوم ئورۇنلىغۇچى"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "كودلىغۇچ-كودسىزلۇغۇچ"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "ھۆججەتلەرنى دىسكىدىن ئۆچۈرىدىغان چاغدا سورىسۇن"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "ئىستون قوشۇش"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "ئاۋاز كونترول ھالەت سىنبەلگىسىنىڭ سەزگۈرلۈكى"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "ئىستون تەھرىرلەش"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "ئىختىيارىي ھالەت سىنبەلگىسى"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "ئىستوننى ئۆچۈر"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "gtk_init نى --sync نىڭ بىلەن ئىجرا قىلىش(سازلاش ھالىتى)"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "قىستۇرما مەزمۇن تۈرلىرىنىڭ ئارىسىغا ئايرىغۇچ قوشۇش"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "گۇرۇپپىلاش"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "ئۇقتۇرۇش ماۋزۇسىنىڭ پىچىمى"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "ئورۇنلىغۇچى/چېسلا/ئالبوم"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "ئۇقتۇرۇش مەزمۇنىنىڭ پىچىمى"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "ئالبوم مۇقاۋىسىنى كۆرسىتىش"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "ئالبوم مۇقاۋىسىنىڭ چوڭلۇقى"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio مۇلازىمېتىرى"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "ئەۋرىشكە تېزلىكى"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "نىسپىي ئىزدەش جەدۋىلىنىڭ يولى"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "مۇتلەق ئىزدەش جەدۋىلىنىڭ يولى"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
 msgstr ""
-"ئۈن بايتلىرىنى ئالماشتۇرۇش (ئەگەر ئۆزگىرىش بولمىسا ئەسلىگە كەلتۈرسە بولىدۇ)"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "ئىناۋەتلىك قىلىش(HVSC Songlength DB نى)"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt ( HVSC نىڭدىن )"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "ھەر بىر ئەۋرىشكىدىكى بىت سانى(8 ياكى 16)"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "كۆڭۈلدىكى ناخشا ئۇزۇنلۇقى (سېكۇنت)"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ بانكا سەپلىمە ھۆججىتى"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "ھۆججەت ئېچىش…"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "نەغمە ئاتى"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "%s نى سەپلەش"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "ئورۇنلىغۇچى"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "جەمئىي نەغمە"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "ئېقىم"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "كۆڭۈلدىكى ئۇن ئۈسكۈنىسى"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "مۇزىكىسىنى ئىشلىگۈچى"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "ھۆججەتلەرنى قوشۇۋاتىدۇ…"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "دىسكا نومۇرى"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "دەسلەپلەشتۈرۈۋاتىدۇ…"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "ئىزاھات"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "كودلىغۇچ / تارقاتقۇچى"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "ئورنى"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "تارماق نەغمە ئىندېكسى"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "خەتكۈش تىپ(لىرى)ى"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "سىڭدۈرمە Cuesheet"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "كودلىغۇچ-كودسىزلۇغۇچ"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "ھۆججەت كېڭەيتىلگەن ئاتى(‹;› بىلەن ئايرىلىدۇ)"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "ئايلاندۇرۇش"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "نىشان ئەۋرىشكە تېزلىكى"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "ئاپتوماتىك ئەۋرىشكە تېزلىكى (‹نىشان ئەۋرىشكە تېزلىكى›نى قاپلىنىدۇ)"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "قىممەت"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "بۇ نەغمىنىڭ سانلىق-مەلۇماتلىرىنى ئۆزگەرتتىڭىز."
+
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "كۆزنەكنى راستلا ياپامسىز؟"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "بىر قانچە قىممەت "
+
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "ئاچقۇچ"
+
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "خەتكۈچلەرنى يېزىۋاتىدۇ…"
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "ئاتى:"
+
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "سوز بۆلىكى ئاتى : ياكى _ بىلەن باشلانماسلىقى كېرەك"
+
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "سوز بۆلىكى قوشقىلى بولمىدى"
+
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "بۇنداق ئاتى بار سوز بۆلىكى مەۋجۇت، باشقا ئاتنى سىناپ كۆرۈڭ."
+
+#: ../plugins/gtkui/widgets.c:460
 #, c-format
-msgid "Built-in %s"
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "مەزكۇر ھۆججەت مەۋجۇت. قاپلامسىز؟"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "ئايلاندۇرغۇچ ئاگاھلاندۇرۇشى"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "كودلىغۇچ تاللاڭ"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "ئايلاندۇرغۇچ خاتالىقى"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "ئايلاندۇرۇۋاتىدۇ…"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "قىسقۇچ تاللاش…"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "كودلىغۇچ ئالدىن تەڭشىشىنى ساقلاش مەغلۇپ بولدى"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
-"ئالدىن تەڭشەش قىسقۇچىنىڭ ئىمتىيازلىرىنى تەكشۈرۈڭ، باشقا ماۋزۇ تاللاڭ ياكى "
-"دىسكىنى ئازراق بىكارلاڭ"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "ئوخشاش ئاتلىق ئالدىن تەڭشەش مەۋجۇت. باشقا بىرنى تاللاڭ."
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "خاتالىق"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "يېڭى كودلىغۇچ قوشۇش"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "كودلىغۇچ تەھرىرلەش"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "ئالدىن تەڭشەشنى چىقىرىۋېتىش"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "بۇ مەشغۇلاتتا تاللانغان ئالدىن تەڭشەش ئۆچۈرۈلىدۇ. راستلا ئۆچۈرەمسىز؟"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "كودلىغۇچ"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "يېڭى قىستۇرمىنى DSP زەنجىرىگە قوشۇش"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "DSP ئالدىن تەڭشىشىنى ساقلاش مەغلۇپ بولدى"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "يېڭى DSP ئالدىن تەڭشىشى"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "DSP ئالدىن تەڭشىشىنى تەھرىرلەش"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP ئالدىن تەڭشەشلىرى"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "چىقىرىش قىسقۇچى:"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "چىقىرىش ھۆججىتىنىڭ ئاتى:"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "4x"
 msgstr ""
-"كېڭەيتىلمە ئاتى (.mp3 دېگەندەك) ئاپتوماتىك قوشۇلىدۇ.\n"
-"قۇرۇق بولسا كۆڭۈلدىكىسى ئىشلىتىلىدۇ (%a - %t)."
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "كودلىغۇچ:"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP ئالدىن تەڭشىشى"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "جەريان(threads) سانى:"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "چىقىرىش ئەۋرىشكىسىنىڭ پىچىمى:"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "مەنبەنىڭ پىچىمىدەك بولسۇن"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 بىتلىق ئالامىتى بار پۈتۈن سان"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 بىتلىق ئالامىتى بار پۈتۈن سان"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 بىتلىق ئالامىتى بار پۈتۈن سان"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 بىتلىق ئالامىتى بار پۈتۈن سان"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 بىتلىق لەيلىمە كەسىر سان"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "ھۆججەت مەۋجۇت بولسا:"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "ئەسكەرتىش"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "قاپلاش"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "كودلىغۇچ ئالدىن تەڭشىشىنى تەھرىرلەش"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "ماۋزۇسىز كودلىغۇچ"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "چىقىرىش ھۆججىتىنىڭ كېڭەيتىلمە ئاتى:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "يەنى mp3 دېگەندەك"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "بۇيرۇق قۇرى:"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
-"مىسال: lame - %o\n"
-"%i كىرىش ھۆججىتى، %o چىقىرىش ھۆججىتى, - for stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
-"%o - چىقىرىش ھۆججىتىنىڭ ئاتى\n"
-"%i - ۋاقىتلىق كىرگۈزۈش ھۆججىتىنىڭ ئاتى"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "ئۇسۇل:"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "تۇرۇبا"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "ۋاقىتلىق ھۆججەت"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "خەتكۈش يازغۇچ"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP ئالدىن تەڭشىكىنى تەھرىرلىگۈچ"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "نامسىز DSP ئالدىن تەڭشىشى"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "قوش"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr ""
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr ""
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
 #, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "pixmap ھۆججىتىنى تاپقىلى بولمىدى: %s"
+msgid "%dd %d:%02d:%02d"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
 msgstr ""
-"مەنبە پىچىمى ئۆزگەرمىسۇن\n"
-"8 بىتلىق ئالامەتلىك پۈتۈن سان\n"
-"16 بىتلىق ئالامەتلىك پۈتۈن سان\n"
-"24 بىتلىق ئالامەتلىك پۈتۈن سان\n"
-"32 بىتلىق ئالامەتلىك پۈتۈن سان\n"
-"32 بىتلىق لەيلىمە كەسىر سان"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
 msgstr ""
-"ئەسكەرتىش\n"
-"قاپلاش"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
 msgstr ""
-"نەيچە\n"
-"ۋاقىتلىق ھۆججەت"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr ""
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2094,8 +2633,8 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
 #: ../plugins/shellexecui/interface.c:208
@@ -2160,10 +2699,6 @@
 msgid "Add Command"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr ""
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
@@ -2189,188 +2724,1240 @@
 msgid "Invalid Values"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 نىڭ يولىنى قىستۇرما تەڭشىكىدە كۆرسىتىپ بېرىڭ."
+
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "نەغمە ئاتى"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "ئورۇنلىغۇچى"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "جەمئىي نەغمە"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "ئېقىم"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "مۇزىكىسىنى ئىشلىگۈچى"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "دىسكا نومۇرى"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "ئىزاھات"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "كودلىغۇچ / تارقاتقۇچى"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "نەشر ھوقۇقى"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "ئورنى"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "تارماق نەغمە ئىندېكسى"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "خەتكۈش تىپ(لىرى)ى"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "سىڭدۈرمە Cuesheet"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "ئەۋرىشكىلەشكە ALSA ئىشلىتىش"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "ئامراق يىغلەك چوڭلۇقى"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "ئامراق مەزگىل(period) چوڭلۇقى"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "سىڭدۈرۈلگەن خەتكۈچلەردىن ئېلىش"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "يەرلىك قىسقۇچتىن ئېلىش"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "CDDB نى ئەمەس CD-Text نى ئالدىن ئويلىشىش"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "ئىناۋەتلىك قىلىش (NRG سۈرىتىنى قوللاشنى)"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr ""
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "ئايلاندۇرۇش"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr ""
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr ""
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr ""
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr ""
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "ھۆججەت كېڭەيتىلگەن ئاتى(‹;› بىلەن ئايرىلىدۇ)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr ""
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr ""
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "ئەڭ چوڭ ناخشا ئۇزۇنلۇقى( مىنۇت)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr ""
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr ""
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr ""
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr ""
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr ""
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr ""
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr ""
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr ""
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr ""
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr ""
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr ""
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr ""
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr ""
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr ""
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr ""
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr ""
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr ""
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr ""
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr ""
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr ""
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr ""
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr ""
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr ""
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr ""
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr ""
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr ""
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr ""
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr ""
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr ""
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr ""
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr ""
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr ""
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr ""
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr ""
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "ھۆججەتلەرنى دىسكىدىن ئۆچۈرىدىغان چاغدا سورىسۇن"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "ئاۋاز كونترول ھالەت سىنبەلگىسىنىڭ سەزگۈرلۈكى"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "ئىختىيارىي ھالەت سىنبەلگىسى"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "قىستۇرما مەزمۇن تۈرلىرىنىڭ ئارىسىغا ئايرىغۇچ قوشۇش"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr ""
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr ""
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr ""
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr ""
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr ""
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr ""
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr ""
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr ""
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr ""
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr ""
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr ""
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr ""
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr ""
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr ""
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr ""
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr ""
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr ""
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr ""
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "scrobbler نى ئىناۋەتلىك قىلىش"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "nowplaying نى ئىناۋەتسىز قىلىش"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "ئىشلەتكۈچى ئاتى"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "ئىم"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr ""
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr ""
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr ""
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr ""
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr ""
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr ""
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "ئۇقتۇرۇش ماۋزۇسىنىڭ پىچىمى"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "ئۇقتۇرۇش مەزمۇنىنىڭ پىچىمى"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "ئالبوم مۇقاۋىسىنى كۆرسىتىش"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "ئالبوم مۇقاۋىسىنىڭ چوڭلۇقى"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "ئۈسكۈنە ھۆججىتى"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr ""
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr ""
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr ""
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr ""
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr ""
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr ""
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr ""
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr ""
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr ""
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "ئەۋرىشكە تېزلىكى"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr ""
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr ""
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "نىسپىي ئىزدەش جەدۋىلىنىڭ يولى"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "مۇتلەق ئىزدەش جەدۋىلىنىڭ يولى"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "ئۈن بايتلىرىنى ئالماشتۇرۇش (ئەگەر ئۆزگىرىش بولمىسا ئەسلىگە كەلتۈرسە بولىدۇ)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "ئىناۋەتلىك قىلىش(HVSC Songlength DB نى)"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr ""
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr ""
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "كۆڭۈلدىكى ناخشا ئۇزۇنلۇقى (سېكۇنت)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr ""
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr ""
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr ""
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ بانكا سەپلىمە ھۆججىتى"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/uk.po -> deadbeef-1.9.6.tar.bz2/po/uk.po Changed

@@ -1,2374 +1,3972 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Maks Lyashuk <m_lyashuk@ukr.net>, 2014
+# Alexey Yakovenko <wakeroid@gmail.com>, 2016,2022-2023
+# f977cb811fcf66493f48eac227fd7473_b98aa5d <2419f1d8d12d92441152e78ae3e3bde0_722180>, 2021
+# Gilah <superdj243@gmail.com>, 2021
+# Evolve32 <evolve32@yandex.ru>, 2014
+# Evolve32 <evolve32@yandex.ru>, 2014
+# Max Lyashuk <m_lyashuk@ukr.net>, 2014-2015
+# Vital Man <avitya@online.ua>, 2016
+# Vladislav Glinsky <cl0ne@mithril.org.ua>, 2018
 # Yarema aka Knedlyk <yupadmin@gmail.com>, 2010
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/uk/)\n"
-"Language: uk\n"
+"POT-Creation-Date: 2023-10-28 11:31+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>, 2016,2022-2023\n"
+"Language-Team: Ukrainian (http://app.transifex.com/deadbeef-player/deadbeef-player/language/uk/)\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"
+"Language: uk\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Про DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "Використання: deadbeef опції -- файл(и)\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s Список Змін"
+msgid "Options:\n"
+msgstr "Опції:\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "Перекладачі DeaDBeeF"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help або -h Показати цю допомогу (це повідомлення) і вийти\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Зберегти типові значення еквалайзера DeaDBeeF"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit Вийти з програвача\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Файли типових значень еквалайзера DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version Показати інформацію про версію і вийти\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Завантаження типові значення еквалайзера DeaDBeeF..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play Почати програвання\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "Типові значення еквалайзера DeaDBeeF (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop Зупинити програвання\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Імпорт типових значень еквалайзера Foobar2000..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause Призупинити програвання\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Типові значення еквалайзера Foobar2000 (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause перемикання паузи\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Зберегти типові значення"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause Почати програвання якщо зупинено, включити паузу в протилежному випадку\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Завантажити типові значення"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next Наступна пісня в списку програвання\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Імортувати типові значення Foobar2000"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev Попередня пісня в списку програвання\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Включити"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random Випадкова пісня в списку програвання\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Скинути все на нуль"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue Додати файл(и) до існуючого списку програвання\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Скинути підсилення на нуль"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN Вказує яке доповнення інтерфейсу використовувати, типовим є \"GTK2\"\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Скинути частоти на нуль"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT Показати форматовану назву треку до виводу\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Типові значення"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-синтаксис: aвиконавець, tназва, bальбом,\n lтривалість, nномер треку, yрік, cкоментар,\n rкопірайт, eчас що пройшов\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 день %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr "Наприклад: --nowplaying \"%%a - %%t\" повинно показати \"виконавець - назва\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d дні %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "для додаткової інформації див. %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Зупинено | %d треків | %s повна тривалість програвання"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "Примітка: опція --nowplaying застаріла.\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr " --nowplaying FMT Показати форматовану назву треку до виводу\n"
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " Синтаксис FMT: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr "наприклад: --nowplaying \"%%artist%% - %%title%%\" повинно показати \"виконавець - назва\"\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr " --volume ЧИСЛО Вивести або встановити рівень гучності deadbeef.\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " Параметр ЧИСЛО може бути вказаний у відсотках (абсолютне значення збільшення/зменшення)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr "або в дБ -50, 0 (якщо з суфіксом).\n"
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " Наприклад: --volume 80, --volume +10, --volume -5 або --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr " --plugin=PLUG Відправити команди зазначеному плагіну. Використовуйте PLUG=main для відправки команд самому deadbeef.\n"
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr " Щоб дійзнатися про команди зазначеного плагіну, використовуйте --plugin=PLUG --help\n"
+
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr " --plugin-list Відобразити усі доступні плагіни, включаючи індикацію якщо плагін підтримує команди.\n"
+
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Типово"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "Моно"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "Стерео"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Так"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "На паузі |"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Ні"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "Тека виводу:"
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "Записати результат до каталогу вихідних файлів"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "Зберегти структуру каталогів"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "Копіювати, якщо формат не змінюється"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "Перезаписати теги після копіювання"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "Назва файла виводу:"
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-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 повна тривалість "
-"програвання"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "Розширення (наприклад, .mp3) буде додано автоматично.\nЗалиште поле пустим для стандартних налаштувань (%tracknumber%. %artist% - %title%)."
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Новий список програвання"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "Енкодер:"
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "Новий список програвання (%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "Типові значення DSP"
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "Кількість потоків:"
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Список програвання"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "Формат зразка виводу:"
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:14
+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 "Зберегти оригінальний формат\n8 bit signed int\n16 bit signed int\n24 bit signed int\n32 bit signed int\n32 bit float"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "Коли файл існує:"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "Пропустити\nЗапитати\nПерезаписати"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "Редагувати типові значення енкодера"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Показ обкладинки альбому"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Назва:"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "Енкодер без назви"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Спектр"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "Розширення файла виводу:"
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "Наприклад mp3"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "Командна стрічка:"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "Приклад: lame - %o\n%i для вхідного файлу, %o для вихідного файлу, - для потокових даних"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - назва вихідного файлу\n%i - назва тимчасового вхідного файлу"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "Метод:"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "Панель гучності"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "Pipe\nТимчасовий файл\nВхідний файл"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Невдача при читанні файлу допомоги"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Не можу прочитати файл допомоги"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "Записувач мітки"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "Редактор типових значень DSP"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Назва"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "Типові значення DSP без назви"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Додати"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Вилучити"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Налаштувати"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "Вибрати втулку DSP"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "Втулка"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Типові значення"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "Вбудовано %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "Файл вже існує. Перезаписати?"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "Попередження конвертора"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "Будь ласка, виберіть інший енкодер"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "Помилка конвертора"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "Конвертування..."
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "Вибрати теку..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "Не можна зберегти типові параметри енкодера"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "Перевірте типові права доступу теки, спробуйте вибрати іншу назву, або звільніть трохи дискового простору"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Ви досі хочете вийти?"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "Типові параметри з тою самою назвою вже існують. Спробуйте вибрати іншу назву."
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "Помилка"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "Додати новий енкодер"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "Редагувати енкодер"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "Вилучити типові значення"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "Ця дія вилучить вибрані типові значення. Ви впевнені?"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "Попередження"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "Енкодери"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "Додати додаток до ланцюжка DSP"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "Не можу зберегти типові значення DSP"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "Нові типові значення DSP"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "Редагувати типові значення DSP"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "Типові значення DSP"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Довідка"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "Зберегти формат джерела"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 біт ціле"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 біт ціле"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 біт ціле"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 біт ціле"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 біт плаваюче"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "Пропустити"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "Питати"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "Перезаписати"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "Трубка"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "Тимчасовий файл"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "Вихідний файл"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "Не можу знайти файл pixmap: %s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "Відкрити файл(и)..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "Додати файл(и) до списку програвання..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "Додати теку(-ки) до списку програвання..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "Завантажити список"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "Зберегти список як"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Про DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s Список змін"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "Перекладачі DeaDBeeF"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr "Граючий трек"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr "Обраний трек"
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "Тип вмісту"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "Втулки"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "Невірне(і) значення."
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "Поля Тип Контенту і Плагіни повинні бути непорожніми і відповідати наступним правилам.\nПриклад поля Тип Контенту: 'audio/mpeg'.\nПриклад ідентифікаторів поля Плагіни: 'stdmpg ffmpeg'.\nУ рядку ідентифікаторів поля Плагіни пробіли повинні використовуватись як роздільники.\nПоле Тип Контенту має складатися з літер, цифр та знаку '-'.\nІдентифікатори поля Плагіни можуть містити лише літери та цифри."
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "Нічого не обрано."
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "_Файл"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "_Відкрити файл(и)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "Додати файл(и)"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "Додати теку(и)"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "Додати URL-посилання"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
-msgstr "Новий список програвання"
+msgstr "Новий список відтворення"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
-msgstr "Завантажити список програвання"
+msgstr "Завантажити список відтворення"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
-msgstr "Зберегти список програвання"
+msgstr "Зберегти список відтворення"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
-msgstr "_Закінчити"
+msgstr "Ви_йти"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
-msgstr "_Редагувати"
+msgstr "_Зміни"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "_Очистити"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "Вибрати все"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
 msgstr "Забрати вибирання всього"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "Інвертувати виділення"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "Вибір"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Вилучити"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "Вилучити невиділене"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "_Знайти"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "Сортувати за"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Назва"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
-msgstr "Номер треку"
+msgstr "Номер трека"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "Альбом"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "Виконавець"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "Дата"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "Випадково"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
-msgstr "Користувацьке"
+msgstr "Власне"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "_Вигляд"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "Рядок стану"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "Еквалайзер"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
-msgstr ""
+msgstr "Режим дизайну"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "Журнал"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
-msgstr "_Програвання"
+msgstr "Від_творення"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Порядок"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Одне за одним"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Перемішати треки"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Перемішати треки"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "Перетасувати"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "Відкл"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "Треки"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "Альбоми"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "Випадкові треки"
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
 msgstr "Повторювати"
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Повторювати все"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Повторювати одну пісню"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Не повторювати"
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "Усі треки"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "Один трек"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "Прокручувати поточну пісню"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "Виділяти поточну пісню"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
 msgstr "Зупинити після поточного треку"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
 msgstr "Зупинити після поточного альбому"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "Перескочити на поточний трек"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "_Допомога"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "_Впроваджені зміни"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
-msgstr "_Про"
+msgstr "_Про програму"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "_Перекладачі"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "Пошук"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
-msgstr "Стоп"
+msgstr "Зупинити"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
-msgstr "Програвати"
+msgstr "Грати"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
-msgstr "Пауза"
+msgstr "Призупинити"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "Попереднє"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "Наступне"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
-msgstr "Програвати випадково"
+msgstr "Грати випадково"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
-msgstr "Про"
+msgstr "Про програму"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "Вийти"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Допомога"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "Властивості треків"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "Розташування:"
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "Налаштування"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "_Застосувати"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "З_акрити"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "Метадані"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "Властивості"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Назва:"
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Скасувати"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "_ОК"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "Введіть назву нової колонки тут"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "Індекс"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "Програвання"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "Обкладинка альбому"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "Виконавець - Альбом"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Тривалість"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "Номер треку"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "Гурт / Альбом Виконавець"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "Формат сортування:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(якщо не пусто)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "Вирівнювання:"
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "По лівому краю"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "По правому краю"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Скасувати"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "Зліва\nСправа\nПо центру"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "_ОК"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "Колір тексту:"
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
-msgstr "Плагін виводу:"
+msgstr "Втулка виводу:"
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "Пристрій виводу:"
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Завжди конвертувати 8 біт аудіо до 16 біт"
+msgstr "Завжди конвертувати 8-бітний звук у 16 біт"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
-msgstr "Завжди конвертувати 16-бітне аудіо до 24-бітного"
+msgstr "Завжди конвертувати 16-бітний звук у 24 біти"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr "Перевизначити глибину бітності:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr "Вимкнено\n8 біт\n16 біт\n24 біт\n32 біт\n32 біт float"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "Частота дискретизації:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "Кратні 48КГц (96К, 192К, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "Кратні 44.1КГц (88.2К, 176.4К, ...):"
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "На основі вхідної частоти дискретизації"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "Перевизначити частоту дискретизації"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "Звук"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Режим автовирівнювання гучності:"
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Виключити"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "Режим джерела:"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Трек"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "В порядку програвання\nТрек\nАльбом"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Використовувати пікове значення"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "Обробляється:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "Нічого\nПідсилити\nПідсилити та запобігати кліппінгу відповідно до піку\nЛише запобігати кліппінгу"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 дБ"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 дБ"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Режим автовирівнювання гучності:"
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Глобальне вирівнювання"
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "Попереднє підсилення з даними RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "Попереднє підсилення без даних RG:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr ""
-"Додати файли з командної стрічки (або менеджера файлів) до цього списку "
-"програвання:"
+msgstr "Додати файли з командної стрічки (або менеджера файлів) до цього списку програвання:"
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "Відновити попередню сесію на старті"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "Не додавати з архіву при додаванні тек"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "Опція \"Зупинити після поточного треку\" вимкнеться після спрацьовування"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "Опція \"Зупинити після поточного альбому\" вимкнеться після спрацьовування"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "Програвання"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Налаштувати"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "Типові значення ланцюга DSP"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "_Завантаження"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "Згорнути в лоток під час запуску"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "Закрити мінімізує до сист. лотка"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "Ховати іконку системного лотка"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "Видаляти з диска в Кошик"
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
-msgstr ""
+msgstr "Увімкнути виявлення та перекодування японської SHIFT-JIS"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "Увімкнути виявлення та декодування кирилиці CP1251"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr "Включити детекцію та перекодировку кирилиці 1251"
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "Увімкнути виявлення та декодування китайської CP936"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "Частота оновлення інтерфейсу (разів за секунду)"
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
-msgstr "Текст заголовку панелі під час програвання:"
+msgstr "Текст панелі заголовку під час відтворення:"
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
-msgstr "Текст заголовку панелі під час призупинення:"
+msgstr "Текст панелі заголовку під час призупинення:"
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr "Додаток GUI (для змін потрібно перезавантажити):"
+msgstr "Втулка GUI (для змін потрібно перезавантажити):"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "Показувати час відтворення обраних доріжок у рядку стану"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "Програвач"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr "Закривати список програвання середньою клавішею миші"
+msgstr "Закривати список відтворення середньою клавішею миші"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "Використовувати жирний шрифт для треку, що програється"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr "Приховати пунт меню \"Видалити з диска\""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "Перейти до наступної пісні, якщо чинна видаляється з диску"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
-msgstr "Автоматично назвати список програвання при додаванні одної теки"
+msgstr "Автоматично назвати список відтворення при додаванні одної теки"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr ""
-"Автоматично підлаштовувати розміри колонок в залежності від розміру вікна"
+msgstr "Автоматично підлаштовувати розміри колонок в залежності від розміру вікна"
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "Проміжок між групами:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "пікселі"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Список програвання"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "GUI / Різне"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "Перезаписати"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Передній план"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Тло"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Кольори Рядка Пошуку/Регулятора Гучності"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Середньо"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Легко"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Темно"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "Основний"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Текст"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "Кольори смужки вкладок"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "Лінії"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "Фон (еквалайзер)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "Смуга перемотування/Регулятор гучності/Еквалайзер"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "Основний:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "Темний:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "Світлий:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "Середній:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "Текст:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "Жирний"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "Курсив"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "Текст відтворення:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "Виділений текст:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "Смуга вкладок"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "Звичайні треки"
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "Граючий трек:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "Обрані треки"
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "Колонки:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "Заголовок групи:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "Передній план:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "Парний:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "Непарний:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "Вибраний:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "Курсор:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "Фон:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "Перезаписати (втрачаються налаштування GTK, але пришвидшується візуалізація)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr "Перевизначений базовий колір"
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr "Перевизначений колір фону"
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr "Візуалізації"
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "Поява"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr "Включити медіа бібліотеку"
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr "Додати / вилучити папки з музикою"
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr "Медіа бібліотека"
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr ""
-"Перезаписати (втрачаються налаштування GTK, але пришвидшується візуалізація)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Парний рядок"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Непарний рядок"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Вибраний рядок"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Вибраний текст"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Курсор"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Кольори списку програвання"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "Кольори"
-
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "Включити сервер проксі"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "Адреса сервера проксі:"
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "Порт сервера проксі:"
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "Тип проксі:"
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "Назва користувача проксі:"
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "Пароль користувача проксі:"
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr ""
+msgstr "HTTP User Agent:"
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "Редагувати відповідність типу вмісту"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "Мережа"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "Задані комбінації клавіш:"
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "Дія:"
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Не встановлено>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "Комбінація клавіш:"
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "Глобальні гарячі клавіші"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "Натисніть кнопку Застосувати для збереження змін, або кнопку Відмінити Зміни для відміни зроблених змін.\nЗміни НЕ будуть збережені у разі ненатиснення кнопки Застосувати."
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "_Замовчування"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "Гарячі клавіші"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "Версія: "
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "Конфігурація"
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "Інфо"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "Ліцензія"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "Авторські права"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "Скинути до типових"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "Додатки"
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "Версія: "
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "Встановити свій заголовок"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "Групувати за ..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "Сортувати за..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "Формат"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "В порядку зростання"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "В порядку спадання"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "Вибрати додаток DSP"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr "Формат"
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "Додаток"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "В порядку зростання\nВ порядку спадання"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "Налаштування записувача мітки"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "Вписати ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "Вписати ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "Вписати APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "Вирізати ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "Вирізати ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "Вирізати APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "Версія ID3v2"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (Рекомендовано)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (Рекомендовано)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "Кодування символів у ID3v1 (типово є iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "Вписати ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr ""
+msgstr "Відповідність типу вмісту"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "Скинути до типових"
+msgstr "Ця таблиця встановлює відповідність між потоковими типами вмісту та втулками декодувальника DeaDBeeF. Наприклад, mp3 файли можуть бути типу \"audio/x-mpeg\" і при цьому бути декодованими DeaDBeeF'овим власним \"stdmpg\" плагіном або ж плагіном \"ffmpeg\"."
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr ""
+msgstr "Тип вмісту:"
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
-msgstr "Додатки:"
+msgstr "Втулки:"
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "Параметри кнопки"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "Колір:"
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "Колір тексту:"
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
-msgstr "Піктограма:"
+msgstr "Значок:"
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "Мітка:"
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "Оберіть дію"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "Цей діалог дозволяє встановити свій заголовок для будь-якого треку. Ця опція найбільш корисна для радіо станцій. Опція для встановлення власного заголовку також присутня в діалозі \"Додати URL-посилання\". Сам заголовок буде відображений в колонці \"Виконавець\". Він має виглядати накшталт \"користувацьке виконавець\", якщо поле Виконавець присутнє або просто \"користувацьке\", якщо ні."
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "Редагувати"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "Редагувати (на місці)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "Додати нове поле..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "Редагувати значення"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "Назва поля:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "Значення поля:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr "Використовуйте символ ; щоб розділяти кілька значень"
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "Журнал DeaDBeeF"
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "Очистити"
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "Прогрес сканування ReplayGain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "Поточний файл:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "Статус"
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "Результати сканування ReplayGain"
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "Оновити теги файлів"
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "Зкопіювати звіт"
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "Відображати тільки плагіни з конфігурацією"
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr "Редагувати декілька треків"
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr "Ім'я значення:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr "Єдине значення"
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr "Індивідуальні значення"
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Зберегти типові значення еквалайзера DeaDBeeF"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Файли типових значень еквалайзера DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Завантаження типові значення еквалайзера DeaDBeeF..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "Типові значення еквалайзера DeaDBeeF (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Імпорт типових значень еквалайзера Foobar2000..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Типові значення еквалайзера Foobar2000 (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Зберегти типові значення"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Завантажити типові значення"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Імортувати типові значення Foobar2000"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Включити"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Обнулити все"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Обнулити підсилення"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Обнулити частоти"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Новий список відтворення"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "Підтримувані аудіо-формати"
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "Всі файли (*)"
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "Підтримувані формати списків відтворення"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "Усі файли"
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "Інші файли (*)"
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "Файли списків DeaDBeeF (*.dbpl)"
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "Переходити по символічним посиланням"
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 день %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d дні %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "увесь час відтворення"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "Призупинено"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "біти"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "час програвання виділення"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "Зупинено"
+
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "Перейменувати список"
+
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "Вилучення списку відтворення"
+
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "Ви справді хочете вилучити список '%s'?"
+
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Новий список відтворення (%d)"
+
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Список програвання з вкладками"
+
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Роздільник (зверху і знизу)"
+
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Роздільник (зліва і справа)"
+
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "Вкладки"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Вкладки списку відтворення"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Властивості вибору"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Показ обкладинки альбому"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr "Осцилограф"
+
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Спектр"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "Горизонтальний контейнер"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "Вертикальний контейнер"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Кнопка"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Смужка пошуку"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Елементи управління програванням"
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Панель гучності"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Голоси чіптюн"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "Перегляд журналу"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr "Відображення медіа бібліотеки"
+
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Невдача при читанні файлу допомоги"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Не можу прочитати файл допомоги"
+
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Програвач на даний момент виконує фонові завдання. Якщо вийти зараз, то завдання будуть перервані, що може потягнути за собою втрату даних."
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Все ще хочете вийти?"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Ці файли будуть переміщені в кошик.\n\n(Цій діалог може бути вимкнено у налаштуваннях плагіна GTKUI)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr "Ці файли будуть втрачені.\n\n(Цій діалог може бути вимкнено у налаштуваннях плагіна GTKUI)"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr "Ви дійсно бажаєте видалити обраний файл?%s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr "Ви дійсно бажаєте видалити усі %d обраних файлів? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr "Ви дійсно бажаєте видалити усі %d файлів з поточного плейлісту? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr "Ви дійсно бажаєте видалити поточний граючий файл? %s"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr "Видалити файли з диску"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "Вилучити"
+
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "По лівому краю"
+
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "По правому краю"
+
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "Центр"
+
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr "Вимкнено"
+
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr "8 біт"
+
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr "16 біт"
+
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr "24 біт"
+
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr "32 біт"
+
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "У порядку відтворення"
+
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Трек"
+
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Нічого"
+
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "Підсилити"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "Підсилити та запобігати кліппінгу відповідно до піку"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "Лише запобігати кліппінгу"
+
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "У порядку зростання"
+
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "У порядку спадання"
+
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (Рекомендовано)"
+
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
+
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
 msgid "Artist / Album"
 msgstr "Виконавець / Альбом"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
 msgid "Track No"
-msgstr "Номер треку"
+msgstr "Номер трека"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Тривалість"
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "Індекс"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "Програвання"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr ""
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "Обкладинка альбому"
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "Виконавець - Альбом"
+
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "Рік"
+
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "Номер трека"
+
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "Гурт / Альбом Виконавець"
+
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "Кодек"
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "Бітрейт"
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
 msgid "Add column"
 msgstr "Додати колонку"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
 msgid "Edit column"
 msgstr "Редагувати колонку"
 
-#: ../plugins/gtkui/plcommon.c:1224
+#: ../plugins/gtkui/playlist/plcommon.c:869
 msgid "Remove column"
 msgstr "Вилучити колонку"
 
-#: ../plugins/gtkui/plcommon.c:1234
+#: ../plugins/gtkui/playlist/plcommon.c:884
 msgid "Pin groups when scrolling"
-msgstr ""
+msgstr "Закріпити групи під час прокручування"
 
-#: ../plugins/gtkui/plcommon.c:1239
+#: ../plugins/gtkui/playlist/plcommon.c:889
 msgid "Group by"
 msgstr "Групувати по"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Нічого"
-
-#: ../plugins/gtkui/plcommon.c:1250
+#: ../plugins/gtkui/playlist/plcommon.c:900
 msgid "Artist/Date/Album"
 msgstr "Виконавець/Дата/Альбом"
 
-#: ../plugins/gtkui/pluginconf.c:42
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr "Грати наступним"
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr "Грати пізніше"
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr "Видалити з черги відтворення"
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "Перезавантажити метадані"
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr "Вирізати"
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr "Зкопіювати"
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr "Вставити"
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr "Видалити з диску"
+
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "Вилучити список"
+
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "Додати новий список"
+
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "Дозволити автосортування"
+
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr "Повторно приміняти останню обрану вами сортировку, щоразу під час додавання нових файлів до цього плейлісту"
+
+#: ../plugins/gtkui/pluginconf.c:47
 msgid "Open file..."
 msgstr "Відкрити файл..."
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/gtkui/pluginconf.c:559
 #, c-format
 msgid "Configure %s"
 msgstr "Налаштувати %s"
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Типовий пристрій Аудіо"
-
-#: ../plugins/gtkui/prefwin.c:348
+#: ../plugins/gtkui/prefwin/prefwin.c:140
 msgid "You modified the hotkeys settings, but didn't save your changes."
 msgstr "Ви змінили комбінації клавіш, проте не зберегли внесені зміни."
 
-#: ../plugins/gtkui/prefwin.c:350
+#: ../plugins/gtkui/prefwin/prefwin.c:142
 msgid "Are you sure you want to continue without saving?"
 msgstr "Ви дійсно впевнені що хочете продовжити без збереження?"
 
-#: ../plugins/gtkui/progress.c:56
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Типовий пристрій звуку"
+
+#: ../plugins/gtkui/progress.c:62
 msgid "Adding files..."
 msgstr "Додавання файлів"
 
-#: ../plugins/gtkui/progress.c:89
+#: ../plugins/gtkui/progress.c:95
 msgid "Initializing..."
 msgstr "Ініціалізація..."
 
-#: ../plugins/gtkui/trkproperties.c:168
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "Прогрес оновлення тегів файлів"
+
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "Назва"
+
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "Підсилення альбома"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "Підсилення трека"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "Пік альбома"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "Пік трека"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "Успішно"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "Файл не знайдено"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "Файл не підтримується"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "Пошук (%list_total% результатів)"
+
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "Показати заголовки колонок"
+
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Значення"
+
+#: ../plugins/gtkui/trkproperties.c:116
 msgid "You've modified data for this track."
-msgstr "Ви змінили дані для цього треку."
+msgstr "Ви змінили дані для цього трека."
 
-#: ../plugins/gtkui/trkproperties.c:170
+#: ../plugins/gtkui/trkproperties.c:118
 msgid "Really close the window?"
 msgstr "Дійсно закрити вікно?"
 
 #. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
 msgid "Multiple values "
 msgstr "Різні значення "
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
+#: ../plugins/gtkui/trkproperties.c:455
 msgid "Key"
 msgstr "Клавіша"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Значення"
-
-#: ../plugins/gtkui/trkproperties.c:522
+#: ../plugins/gtkui/trkproperties.c:473
 msgid "Multiple values"
-msgstr ""
+msgstr "Декілька значень "
 
-#: ../plugins/gtkui/trkproperties.c:701
+#: ../plugins/gtkui/trkproperties.c:662
 msgid "Writing tags..."
 msgstr "Записую мітки..."
 
-#: ../plugins/gtkui/trkproperties.c:730
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr "Пункт"
+
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr "Поле"
+
+#: ../plugins/gtkui/trkproperties.c:1210
 msgid "Field name"
-msgstr "Назва файлу"
+msgstr "Поле назви"
 
-#: ../plugins/gtkui/trkproperties.c:733
+#: ../plugins/gtkui/trkproperties.c:1213
 msgid "Name:"
 msgstr "Назва:"
 
-#: ../plugins/gtkui/trkproperties.c:745
+#: ../plugins/gtkui/trkproperties.c:1226
 msgid "Field names must not start with : or _"
 msgstr "Назви полів не повинні починатися з : або _"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
 msgid "Cannot add field"
 msgstr "Неможливо додати поле"
 
-#: ../plugins/gtkui/trkproperties.c:784
+#: ../plugins/gtkui/trkproperties.c:1267
 msgid "Field with such name already exists, please try different name."
 msgstr "Поле з такою назвою вже існує, введіть іншу назву."
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "Додати поле"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "Вилучити поле"
-
-#: ../main.c:90
+#: ../plugins/gtkui/widgets.c:460
 #, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "Використання: deadbeef опції -- файл(и)\n"
+msgid "Widget \"%s\" is not available"
+msgstr "Віджет \"%s\" не доступний"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "Опції:\n"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "Замінити на..."
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr ""
-" --help або -h Показати цю допомогу (це повідомлення) і вийти\n"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "Вставити..."
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit Вийти з програвача\n"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "Вирізати"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version Показати інформацію про версію і вийти\n"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "Копіювати"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play Почати програвання\n"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "Вставити"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop Зупинити програвання\n"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "Батько"
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause Призупинити програвання\n"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "Декілька віджетів цього типу не підтримуються"
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause перемикання паузи\n"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "Пропорційний розмір"
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "Зафіксувати висоту верхньої панелі"
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "Зафіксувати ширину лівої панелі"
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "Зафіксувати висоту нижньої панелі"
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "Зафіксувати ширину правої панелі"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr ""
-" --play-pause Почати програвання якщо зупинено, включити паузу в "
-"протилежному випадку\n"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "Перейменувати вкладку"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next Наступна пісня в списку програвання\n"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "Видалити вкладку"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev Попередня пісня в списку програвання\n"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "Додати нову вкладку"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random Випадкова пісня в списку програвання\n"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "Перемістити вкладку вліво"
+
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "Перемістити вкладку вправо"
+
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
+msgstr "Режим відображення"
+
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr "Багатоканальний"
+
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr "Шкала"
+
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr "Авто"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue Додати файл(и) до існуючого списку програвання\n"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
-" --gui PLUGIN Вказує яке доповнення інтерфейсу використовувати, "
-"типовим є \"GTK2\"\n"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT Показати форматовану назву треку до виводу\n"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr "3x"
+
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../main.c:106
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr "Тривалість фрагменту"
+
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr "50 мс"
+
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr "100 мс"
+
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr "200 мс"
+
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr "300 мс"
+
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr "500 мс"
+
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr "Дискретні частоти"
+
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr "Полоси 1/12 октави"
+
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr "Полосы 1/24 октави"
+
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr "Розмір зазору"
+
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr "1/2 плитки"
+
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
+msgstr "1/3 плитки"
+
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
+msgstr "1/4 плитки"
+
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr "1/5 плитки"
+
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr "1/6 плитки"
+
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr "1/7 плитки"
+
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr "1/8 плитки"
+
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr "1/9 плитки"
+
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr "1/10 плитки"
+
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "Розширити контейнер на 1 елемент"
+
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "Звузити контейнер на 1 елемент"
+
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "Гомогенний"
+
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "Розгорнути"
+
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "Заповнити"
+
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "Налаштувати кнопку"
+
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr "Шкала дБ"
+
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
+msgstr "Лінійна шкала"
+
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
+msgstr "Кубічна шкала"
+
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "Голоси:"
+
+#: ../plugins/hotkeys/actionhandlers.c:824
 #, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-синтаксис: aвиконавець, tназва, bальбом,\n"
-" lтривалість, nномер треку, yрік, cкоментар,\n"
-" rкопірайт, eчас що пройшов\n"
+msgid "Copy of %s"
+msgstr "Копія %s"
 
-#: ../main.c:109
+#: ../plugins/hotkeys/actionhandlers.c:827
 #, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr ""
-" наприклад: --nowplaying \"%%a - %%t\" повинно показати "
-"\"виконавець - назва\"\n"
+msgid "Copy of %s (%d)"
+msgstr "Копія %s (%d)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "(призупинено)"
 
-#: ../main.c:110
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "(зупинено)"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "(грає)"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
 #, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+msgid "%dd %d:%02d:%02d"
+msgstr "%dd %d:%02d:%02d"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Типово"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "Елементи"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Так"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "Оглядач списку відтворення"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Ні"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
+msgstr "Користувацькі команди оболонки"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
+msgstr "Закрити"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
-msgstr ""
-"Зліва\n"
-"Справа"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
+msgstr "Редагувати команду"
+
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr "Команда:"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"Виключити\n"
-"Трек\n"
-"Альбом"
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
+msgstr "Довільна shell команда. Буде виконана у контексті оточення, в якому запущена головна програма. Можна використовувати форматування заголовків. Наприклад, xdg-open %D"
+
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
+msgstr "ID:"
+
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
+msgstr "Будь-яке ім'я, наприклад, \"Моя Shell Команда\""
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Ascending\n"
-"Descending"
-msgstr ""
-"В порядку зростання\n"
-"В порядку спадання"
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "Ідентифікатор Команди. Загалом, він повинен бути достатньо коротким, наприклад, \"youtube_open\". Він повинен бути унікальним."
+
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
+msgstr "Один трек"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
+msgstr "Працює на одному треку."
+
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
+msgstr "Декілька треків"
+
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr "Виконати з декількома треками."
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
+msgstr "Локальний"
+
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
+msgstr "Виконати з локальними файлами."
+
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
+msgstr "Віддалений"
+
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
+msgstr "Виконати з віддаленими файлами (наприклад, з http:// потоками)"
+
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
+msgstr "Загальні (Головне меню)"
+
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
+msgstr "Елемент повинен буде з'явитись у головному меню"
+
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
-msgstr ""
-"2.3 (Рекомендовано)\n"
-"2.4"
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
+msgstr "Якщо ви хочете додати команду до головного меню, переконайтеся, що заголовок містить шлях у меню. Наприклад: \"Файл/Моя Команда\"."
+
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
+msgstr "Додати команду"
+
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
+msgstr "Ця дія спричинить вилучення вибраної команди оболонки. Ви впевнені?"
+
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
+msgstr "Підтвердження вилучення"
+
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
+msgstr "ID має бути унікальним та не пустим.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
+msgstr "Заголовок має бути не порожнім.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr "Команда оболонки має бути не порожньою.\n"
+
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr "Невірні значення"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, 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 в настройках "
-"додатку."
+msgstr "wildmidi: не знайдено файлу конфігурації freepats. Встановіть пакунок timidity-freepats, або вкажіть шлях до файлу freepats.cfg в настройках додатку."
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "моно"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+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 ""
+msgid "Track Title"
+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:55
-msgid "Preferred buffer size"
-msgstr "Бажаний розмір буфера"
+msgid "Performer"
+msgstr "Виконавець"
 
 #: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "Бажаний розмір періоду"
+msgid "Total Tracks"
+msgstr "Всього треків"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "Жанр"
 
-#. Last.fm plugin
 #: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "Включити скроблер"
+msgid "Composer"
+msgstr "Композитор"
 
 #: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "Виключити програвання відразу"
+msgid "Disc Number"
+msgstr "Номер диску"
 
 #: ../translation/extra.c:13
-msgid "Username"
-msgstr "Користувач"
+msgid "Total Discs"
+msgstr "Всього дисків"
 
 #: ../translation/extra.c:14
-msgid "Password"
-msgstr "Пароль"
+msgid "Comment"
+msgstr "Коментар"
 
 #: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Адреса для скроблера"
+msgid "Encoder / Vendor"
+msgstr "Кодер / Продавець"
 
 #: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr ""
+msgid "Copyright"
+msgstr "Авторські права"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "Розташування"
 
-#. OSS output plugin
 #: ../translation/extra.c:18
-msgid "Device file"
-msgstr "Файл пристрою"
+msgid "Subtrack Index"
+msgstr "Індекс підтрека"
 
 #: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "Помилка OSS4 samplerate"
+msgid "Tag Type(s)"
+msgstr "Тип(и) мітки"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "Вбудований список"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
+msgstr "Ім'я віддаленого демона PipeWire (лишіть порожнім для замовчування)"
+
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr "Користувацькі properties (перевизначає вже існуючі):"
+
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr "Використовувати контроль гучності PipeWire "
+
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "Емулятор Prefer Ken на Satoh (оточення не працюватиме)"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "Увімкнути оточення"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "Використовувати зміну якості ALSA"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "Бажаний розмір буфера"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "Бажаний розмір періоду"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "Період оновлення кешу (год.)"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
+msgstr "Відновити обкладинку"
 
-#: ../translation/extra.c:22
+#: ../translation/plugins.c:24
+#, no-c-format
 msgid "Fetch from embedded tags"
 msgstr "Отримувати з вставлених тегів"
 
-#: ../translation/extra.c:23
+#: ../translation/plugins.c:26
+#, no-c-format
 msgid "Fetch from local folder"
 msgstr "Отримати з локальної теки"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "Маска файлу для локальних обкладинок"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "Отримати з last.fm"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "Отримати з albumart.org"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "Скалювати обкладинку стосовно довшої сторони"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "Отримати з Last.fm"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "Отримати з MusicBrainz"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "Отримати з Albumart.org"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr "Завантажувати з World of Spectrum (файли AY)"
+
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr "Зберігати завантажені файли у папки з музикою"
+
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "Якщо не вдалося знайти обкладинку"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "Залишити порожнім"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "Використати стандартну обкладинку DeaDBeeF"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "Використати користувацьке зображення"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "Шлях до користувацького зображення"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr "Зберігати у ім'я файла"
+
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr "Маски пошуку (розділяти ;)"
+
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr "Папки пошуку (розділяти ;)"
+
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr "Відновлення кешу (ч)"
+
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr "Спрощені имена файлів у кеші"
+
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr "Розмір зображень"
+
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "Дисковий привод для завантаження"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "Привід Audio CD"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "Файл"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "Додати диск з аудіо-файлами"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr "Використовувати CDDB/FreeDB"
 
-#: ../translation/extra.c:30
+#: ../translation/plugins.c:71
+#, no-c-format
 msgid "Prefer CD-Text over CDDB"
 msgstr "Використовувати CD-Text замість CDDB"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB лінк (наприклад 'freedb.org')"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "Порт для CDDB (наприклад '888')"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "Використовувати CDDB замість HTTP"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr "Лінк CDDB (наприклад 'gnudb.gnudb.org')"
+
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr "Порт для CDDB (наприклад '8880')"
 
-#: ../translation/extra.c:34
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "Використовувати протокол CDDB"
+
+#: ../translation/plugins.c:79
+#, no-c-format
 msgid "Enable NRG image support"
 msgstr "Включити підтримку образу NRG"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "Якість передискретизації (0..2, більше-краще)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-бітний вихід (типовим є 16)"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "Швидкість приводу при нормальному програванні"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "Максимум"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "Використовувати корекцію помилок cdparanoia при копіюванні"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "Конвертувати"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "Автоматично визначати частоту дискретизації з вихідного пристрою"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "Встановлювати частоту дискретизації напряму"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "Якість / Алгоритм"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "Якість ресемплінгу"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "Внутрішня гучність DUMB"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "Об'ємне нарощування гучності"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "Тільки увімк/вимк"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "Повний"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "Восьмибітний вихід"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "Використовувати всі розширення ffmpeg"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "Розширення файлу (розділити за допомогою ';')"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr "Увімкнути виведення DoP"
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "Ігнорувати помилки заголовків"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "Ігнорувати непридатні до аналізу помилки потоку"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
 msgid "Max song length (in minutes)"
 msgstr "Максимальна довжина пісні (хв.)"
 
-#: ../translation/extra.c:40
+#: ../translation/plugins.c:137
+#, no-c-format
 msgid "Fadeout length (seconds)"
-msgstr ""
+msgstr "Тривалість затухання в секундах"
 
-#: ../translation/extra.c:41
+#: ../translation/plugins.c:139
+#, no-c-format
 msgid "Play loops nr. of times (if available)"
-msgstr ""
-
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "Запистувати підтвердження перед вилученням файлів з диску"
-
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "Чутливість регулятора гучності в значку статусу"
-
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "Користувацький значок статусу"
+msgstr "Кількість програвань циклів (якщо доступно)"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "Запустити gtk_init з --sync (режим наладки)"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "BIOS ColecoVision (для файлів формату SGC)"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "Додати розділювачі між додатками контекстного меню"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "ReplayGain"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "Формат назви повідомлення"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "Видалити інформацію ReplayGain"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "Формат вмісту повідомлення"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "Сканувати вибране як альбоми (за тегами)"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "Показати обкладинку альбому"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "Сканувати вибране як один альбом"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "Розмір обкладинки (пікселі)"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "Сканувати пофайлове підсилення треку"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "Сервер PulseAudio"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "Сканувати пофайлово, якщо немає даних"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "Частота дискретизації"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "Зняти виділення"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "Відносний шлях таблиці пошуку"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "Виділити всі"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "Абсолютний шлях таблиці пошуку"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "Додати розташування"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "Переставити місцями аудіо байти"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "Додати теку(и)"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "Включити HVSC Songlength DB"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "Додати файл(и)"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (з HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "Біт на зразок (8 або 16)"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "Відкрити файл(и)"
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "Типова довжина пісні (сек)"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "Показати сторінку допомоги"
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Файл налаштувань для банку Timidity++"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "Режим циклічного повторення"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "Назва треку"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "Повтор - вимкнуто"
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "Виконавець"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "Повтор - один трек"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "Всіх треків"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "Повтор - всі"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "Жанр"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "Циклічне перетасування"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "Композитор"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "Перетасування - випадкові треки"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "Номер диску"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "Перетасування - альбоми"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "Коментар"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "Перетасування - треки"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "Кодер / Продавець"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "Перетасування - вимкнуто"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "Розташування"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "Перемикнути слідування курсора за відтворенням"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "Індекс субтреку"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "Перемикнути слідування прокрутки за відтворенням"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "Тип(и) мітки"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "Вигляд"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "Вбудований список"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "Показати\\/сховати меню"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "Кодек"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "Показати\\/сховаті рядок стану"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "Розширення файлу (розділити за допомогою ';')"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "Перемикнути режим дизайну"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "Конвертувати"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "Ручне сортування"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "Частота дискретизація цілі"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "Обрізати обране"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "Якість / Алгоритм"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr "Видалити трек(и) з плейлісту"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr ""
-"Автоматична частота дискретизації (перезапише Частоту дискретизації цілі)"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "Зберегти список відтворення"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "Вилучити чинний список відтворення"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr ""
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "Перейменувати поточний плейліст"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr ""
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "Показати\\/Сховати еквалайзер"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "Увімкнути оточення"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "Сховати еквалайзер"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr ""
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "Показати еквалайзер"
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "Файл вже існує. Перезаписати?"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "Показати\\/Сховати вікно програвача"
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "Попередження конвертора"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "Сховати вікно програвача"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "Будь ласка, виберіть інший енкодер"
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "Показати вікно програвача"
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "Помилка конвертора"
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "Шукати"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "Конвертування..."
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "Показати\\/Сховати вікно журналу"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "Вибрати теку..."
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "Запистувати підтвердження перед вилученням файлів з диску"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "Не можна зберегти типові параметри енкодера"
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr "Налаштування іконки статуса:"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
-msgstr ""
-"Перевірте типові права доступу теки, спробуйте вибрати іншу назву, або "
-"звільніть трохи дискового простору"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "Чутливість регулятора гучності в значку статусу"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr ""
-"Типові параметри з тою самою назвою вже існують. Спробуйте вибрати іншу "
-"назву."
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "Користувацький значок статусу"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "Помилка"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr "Інше:"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "Додати новий енкодер"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "Додати розділювачі між додатками контекстного меню"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "Редагувати енкодер"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "Використовувати символи Unicode замість зображень для стану треку"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "Вилучити типові значення"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "Вимкнути оверлей смуги пошуку"
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "Ця дія вилучить вибрані типові значення. Ви впевнені?"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr "Попередній або перезапустити поточний трек"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "Енкодери"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr "Продублювати плейліст"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "Додати додаток до ланцюжка DSP"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr "Перейти до поточного граючого треку"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "Не можу зберегти типові значення DSP"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "Перейти до"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "Нові типові значення DSP"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr "Попередній жанр"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "Редагувати типові значення DSP"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr "Попередній композитор"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "Типові значення DSP"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr "Попередній виконавець"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "Тека виводу:"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr "Попередній альбом"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr ""
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr "Наступний жанр"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr ""
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr "Наступний композитор"
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "Назва файла виводу:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr "Наступний виконавець"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:287
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
-msgstr ""
-"Розширення (наприклад .mp3) буде додано автоматично.\n"
-"Залишіть поле пустим для типових значень (%a - %t)."
+msgid "Next Album"
+msgstr "Наступний альбом"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "Енкодер:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "Наступний список відтворення"
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "Типові значення DSP"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr "Попередній плейліст"
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "Кількість потоків:"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr "Перейти до плейлісту 10"
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "Формат зразка виводу:"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr "Перейти до плейлісту 9"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "Зберегти формат джерела"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr "Перейти до плейлісту 8"
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 біт ціле"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr "Перейти до плейлісту 7"
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 біт ціле"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr "Перейти до плейлісту 6"
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 біт ціле"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr "Перейти до плейлісту 5"
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 біт ціле"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr "Перейти до плейлісту 4"
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 біт плаваюче"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr "Перейти до плейлісту 3"
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "Коли файл існує:"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr "Перейти до плейлісту 2"
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "Питати"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr "Перейти до плейлісту 1"
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "Перезаписати"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "Сортувати випадково"
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "Редагувати типові значення енкодера"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr "Сортувати по даті"
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "Енкодер без назви"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr "Сортувати по виконавцю"
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "Розширення файла виводу:"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr "Сортувати по альбому"
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "Наприклад mp3"
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr "Сортувати по номеру трека"
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "Командна стрічка:"
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr "Сортувати по назві"
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:325
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
-msgstr ""
-"Приклад: lame - %o\n"
-"%i для вхідного файлу, %o для вихідного файлу, - для потокових даних"
+msgid "Invert Selection"
+msgstr "Інвертувати виділене"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:327
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
-msgstr ""
-"%o - назва вихідного файлу\n"
-"%i - назва тимчасового вхідного файлу"
+msgid "Clear Playlist"
+msgstr "Очистити список"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "Метод:"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr "Додати до черги відтворення"
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "Трубка"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr "Додати наперед черги відтворення"
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "Тимчасовий файл"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr "Перемикнути у черзі відтворення"
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "Перемістити"
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "Перемістити трек нижче"
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "Перемістити трек вище"
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "Перемикнути вимикання звука"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "Перемикнути паузу"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "Записувач мітки"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "Грати\\/Павза"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "Редактор типових значень DSP"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "Перемотати 1с вперед"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "Типові значення DSP без назви"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "Перемотати 1с назад"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Додати"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "Перемотати 5с вперед"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "Не можу знайти файл pixmap: %s"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "Перемотати 5с назад"
 
-#: ../plugins/converter/converter.glade.h:12
-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 ""
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "Перемотати 1% вперед"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
-msgstr ""
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "Перемотати 1% назад"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
-msgstr ""
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "Перемотати 5% вперед"
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
-msgstr "Власні команди оболонки"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "Перемотати 5% назад"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "Редагувати"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "Збільшити гучність"
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
-msgstr "Закрит"
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "Зменшити гучність"
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
-msgstr "Редагувати команду"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "Перемикнути зупинку після поточного треку"
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
-msgstr "Команда:"
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "Перемикнути зупинку після поточного альбому"
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
-msgstr ""
+msgid "Lookup on Last.fm"
+msgstr "Знайти на Last.fm"
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
-msgstr "ID:"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "Включити скроблер"
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
-msgstr ""
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "Виключити програвання відразу"
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "Користувач"
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
-msgstr ""
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "Пароль"
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
-msgstr ""
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Адреса для скроблера"
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
-msgstr ""
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "Надавати перевагу полю Album Artist над Artist"
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
-msgstr ""
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "Надсилати MusicBrainz ID"
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
-msgstr ""
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "Надсилати треки коротші ніж 30 секунд (не рекомендовано)"
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
-msgstr ""
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "Лівий мікс"
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
-msgstr ""
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "Правий мікс"
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
-msgstr ""
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "Примусово виводити 16 біт"
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
-msgstr "Загальні (Головне меню)"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "Бекенд"
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
-msgstr ""
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "Формат назви повідомлення"
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
-msgstr ""
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "Формат вмісту повідомлення"
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
-msgstr "Додати команду"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "Показати обкладинку альбому"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "Вилучити"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "Розмір обкладинки (пікселі)"
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
-msgstr "Ця дія спричинить вилучення вибраної команди оболонки. Ви впевнені?"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr "Не перевикористовувати повідомлення (виверт KDE) "
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
-msgstr "Підтвердження вилучення"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "Файл пристрою"
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
-msgstr "ID має бути унікальним та не пустим.\n"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "Підсвічувати поточний плейліст"
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
-msgstr ""
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "Грати подвійним клацанням"
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
-msgstr "Команда оболонки має бути не порожньою.\n"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "Розмір буфера (-1 для оптимального значення обраного portaudio)"
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
-msgstr "Невірні значення"
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "Кодування назви пристрою"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "Підтримувані аудіо-формати"
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "Всі файли (*)"
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "Відкрити файл(и)..."
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "Визначене нижче"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "Додати файл(и) до списку програвання..."
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "Перевизначене кодування назви пристрою"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "Додати теку(-ки) до списку програвання..."
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "Сервер PulseAudio (залиште порожнім для дефолтного значення)"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr ""
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "Типова довжина пісні (в хвилинах)"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "help.txt"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "Частота дискретизації"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "Видалити файли з диска"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "Пропустити, якщо коротше ніж (сек)"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
-msgstr ""
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "Налаштувати власні команди оболонки"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "Завантажити список"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "Відносний шлях таблиці пошуку"
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "Інші файли (*)"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "Абсолютний шлях таблиці пошуку"
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "Зберегти список як"
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "Переставити місцями аудіо байти"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "Файли списків DeaDBeeF (*.dbpl)"
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "Включити HVSC Songlength DB"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr ""
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Повний шлях до Songlengths.md5/.txt"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr ""
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "Біт на семпл"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
-msgstr ""
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "Типова довжина пісні (сек)"
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "Нічого не обрано."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "Моно синтез"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr ""
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "Дозволити запис в журнал"
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "Замінити на..."
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "Преамп"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "Вставити..."
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "Вирізати"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "Копіювати"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "Вставити"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr ""
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "Заблокувати переміщення"
-
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "Перемістити вкладку ліворуч"
-
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "Перемістити вкладку праворуч"
-
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "Вилучити вкладку"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "Перейменувати вкладку"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "Додати нову вкладку"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "Показати заголовки колонок"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr ""
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Файл налаштувань для банку Timidity++"
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr ""
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr "Розширення файлу"
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr ""
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr "Командний рядок енкодера"
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "Розгорнути"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr "Метод передачі даних"
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "Заповнити"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr "Pipe (stdin)"
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "Налаштувати кнопку"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr "Тимчасовий файл"
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr ""
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr "Вхідний файл"
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "Редагувати список"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr "Писати тег ID3v2"
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "Перейменувати список"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr "Писати тег ID3v1"
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "Вилучити список"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr "Писати тег APEv2"
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "Додати новий список"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr "Писати тег FLAC"
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "Назва"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr "Писати тег OggVorbis"
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr ""
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr "Писати тег MP4"

deadbeef-0.6.2.tar.bz2/po/vi.po -> deadbeef-1.9.6.tar.bz2/po/vi.po Changed

@@ -1,11 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Anh Phan <vietnamesel10n@gmail.com>, 2013
 # Anh Phan <vietnamesel10n@gmail.com>, 2013-2014
 # TRAN Duy Hung <nguyentieuhau@gmail.com>, 2010
+# nguyen vui <vantienwin@gmail.com>, 2018
 # Anh Phan <vietnamesel10n@gmail.com>, 2013
 # Anh Phan <vietnamesel10n@gmail.com>, 2013
 # TRAN Duy Hung <nguyentieuhau@gmail.com>, 2010
@@ -14,2323 +15,3957 @@
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/vi/)\n"
-"Language: vi\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: TRAN Duy Hung <nguyentieuhau@gmail.com>, 2010\n"
+"Language-Team: Vietnamese (http://app.transifex.com/deadbeef-player/deadbeef-player/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "Về DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s Nhật ký thay đổi"
+msgid "Options:\n"
+msgstr ""
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF Dịch giả"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "Lưu DeaDBeeF EQ Preset"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "Tập tin DeaDBeeF EQ preset (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "Nạp DeaDBeeF EQ Preset..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ presets (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "Nhập Foobar2000 EQ Preset..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ presets (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "Lưu Preset"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "Nạp Preset"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "Nhập Foobar2000 Preset"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "Bật"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "Tất Cả Về 0"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "Preamp Về 0"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "Bands Về 0"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr ""
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "Presets"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 ngày %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d ngày %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "Dừng phát | %d bài | Tất cả %s"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "Mono"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "Stereo"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "Tạm dừng | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, 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"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "Playlist Mới"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "Playlist Mới (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "Danh sách phát dạng tab"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "Danh sách phát"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "Ngăn đôi (trên và dưới cùng)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "Ngăn đôi (trái và phải)"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "Mặc định"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "Danh sách phát dạng tab"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "Mono"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "Thuộc tính lựa chọn"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "Stereo"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "Hiển thị album nghệ thuật"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "Có"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "Phạm vi"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "Không"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "Phổ tần"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "Nút"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr "Thanh trượt"
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr "Điều khiển phát lại"
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "Thanh âm lượng"
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr "Giọng điện tử"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "Lỗi trong khi đọc tập tin trợ giúp"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "Không thể đọc tập tin trợ giúp"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:14
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"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 ""
-"Chương trình hiện đang chạy ở chế độ nền. Nếu bạn thoát bây giờ, thì tác vụ "
-"này sẽ bị hủy bỏ hoặc gián đoạn. Điều này có thể dẫn tới việc mất mát dữ "
-"liệu."
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "Bạn vẫn muốn thoát?"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
-msgid "Warning"
-msgstr "Cảnh báo"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
-msgid "_File"
-msgstr "_Tập tin"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
-msgid "_Open file(s)"
-msgstr "_Mở tập tin"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "Tiêu đề:"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
-msgid "Add file(s)"
-msgstr "Thêm tập tin"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
-msgid "Add folder(s)"
-msgstr "Thêm thư mục"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
-msgid "Add location"
-msgstr "Thêm vị trí"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
-msgid "New playlist"
-msgstr "Tạo playlist mới"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
-msgid "Load playlist"
-msgstr "Nạp playlist"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "Tiêu đề"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "Thêm"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "Xóa"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "Cấu hình"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "Presets"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr ""
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
+msgid "Warning"
+msgstr "Cảnh báo"
+
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr ""
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "Trợ giúp"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr ""
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr ""
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr ""
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr ""
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr ""
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr ""
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr ""
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr ""
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr ""
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr ""
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr ""
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "Về DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s Nhật ký thay đổi"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF Dịch giả"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
+msgid "_File"
+msgstr "_Tập tin"
+
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
+msgid "_Open file(s)"
+msgstr "_Mở tập tin"
+
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
+msgid "Add file(s)"
+msgstr "Thêm tập tin"
+
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
+msgid "Add folder(s)"
+msgstr "Thêm thư mục"
+
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
+msgid "Add location"
+msgstr "Thêm vị trí"
+
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
+msgid "New playlist"
+msgstr "Tạo playlist mới"
+
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
+msgid "Load playlist"
+msgstr "Nạp playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
+msgid "Save playlist"
+msgstr "Lưu playlist"
+
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
+msgid "_Quit"
+msgstr "T_hoát"
+
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
+msgid "_Edit"
+msgstr "_Sửa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
+msgid "_Clear"
+msgstr "_Xóa"
+
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
+msgid "Select all"
+msgstr "Chọn tất cả"
+
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
+msgid "Deselect all"
+msgstr "Bỏ chọn tất cả"
+
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
+msgid "Invert selection"
+msgstr "Đảo lựa chọn"
+
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
+msgid "Selection"
+msgstr "Lựa chọn"
+
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
+msgid "Crop"
+msgstr "Cắt"
+
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
+msgid "_Find"
+msgstr "Tì_m"
+
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
+msgid "Sort by"
+msgstr "Sắp xếp theo"
+
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
+msgid "Track number"
+msgstr "Thứ tự bài"
+
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
+msgid "Album"
+msgstr "Album"
+
+#. Track properties dialog
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
+msgid "Artist"
+msgstr "Nghệ sĩ"
+
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
+msgid "Date"
+msgstr "Ngày"
+
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
+msgid "Random"
+msgstr "Ngẫu nhiên"
+
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
+msgid "Custom"
+msgstr "Tùy chọn"
+
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
+msgid "Preferences"
+msgstr "Tùy chỉnh"
+
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
+msgid "_View"
+msgstr "_Hiển thị"
+
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
+msgid "Status bar"
+msgstr "Thanh trạng thái"
+
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
+msgid "Equalizer"
+msgstr "Equalizer"
+
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
+msgid "Design mode"
+msgstr "Chế độ thiết kế"
+
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "nhật ký"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
+msgid "_Playback"
+msgstr "Phát _lại"
+
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
+msgid "Scroll follows playback"
+msgstr "Trượt theo quá trình phát lại"
+
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
+msgid "Cursor follows playback"
+msgstr "Con trỏ đi theo quá trình phát lại"
+
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
+msgid "Stop after current track"
+msgstr "Dừng lại sau bài này"
+
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
+msgid "Stop after current album"
+msgstr "Dừng lại sau album này"
+
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
+msgid "Jump to current track"
+msgstr "Nhảy đến bài hiện tại"
+
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
+msgid "_Help"
+msgstr "T_rợ giúp"
+
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
+msgid "_ChangeLog"
+msgstr "_Nhật ký thay đổi"
+
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
+msgid "_GPLv2"
+msgstr "_GPLv2"
+
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
+msgid "_LGPLv2.1"
+msgstr "_LGPLv2.1"
+
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
+msgid "_About"
+msgstr "Thôn_g tin"
+
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
+msgid "_Translators"
+msgstr "_Dịch giả"
+
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
+msgid "Search"
+msgstr "Tìm kiếm"
+
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
+msgid "Stop"
+msgstr "Dừng"
+
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
+msgid "Play"
+msgstr "Phát"
+
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
+msgid "Pause"
+msgstr "Tạm dừng"
+
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
+msgid "Previous"
+msgstr "Trước"
+
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
+msgid "Next"
+msgstr "Sau"
+
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
+msgid "Play Random"
+msgstr "Phát Ngẫu Nhiên"
+
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
+msgid "About"
+msgstr "Thông tin"
+
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
+msgid "Quit"
+msgstr "Thoát"
+
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
+msgid "Track Properties"
+msgstr "Thông Tin Bài Nhạc"
+
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
+msgid "Location:"
+msgstr "Địa điểm:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
+msgid "Settings"
+msgstr "Thiết lập"
+
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
+msgid "_Apply"
+msgstr "Á_p dụng"
+
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
+msgid "_Close"
+msgstr "Đó_ng"
+
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
+msgid "Properties"
+msgstr "Thuộc tính"
+
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "_Hủy"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "Đồng _ý"
+
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
+msgid "Enter new column title here"
+msgstr "Nhập tiêu đề cột mới tại đây"
+
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
+msgid "Type:"
+msgstr "Loại:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
+msgid "Format:"
+msgstr "Định dạng:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
+msgid "Alignment:"
+msgstr "Canh chỉnh:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "màu chữ:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
+msgid "Output plugin:"
+msgstr "Plugin đầu ra:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
+msgid "Output device:"
+msgstr "Thiết bị đầu ra:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
+msgid "Always convert 8 bit audio to 16 bit"
+msgstr "Luôn luôn chuyển đổi âm thanh 8 bit sang 16 bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
+msgid "Always convert 16 bit audio to 24 bit"
+msgstr "Luôn chuyển đổi audio dạng 16 bit sang 24 bit"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
+msgid "Sound"
+msgstr "Âm thanh"
+
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "đang tiến hành:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
+msgid "-12 dB"
+msgstr "-12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
+msgid "+12 dB"
+msgstr "+12 dB"
+
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
+msgid "Add files from command line (or file manager) to this playlist:"
+msgstr "Thêm tập tin từ dòng lệnh (hay bộ quản lý tập tin) vào playlist này:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
+msgid "Resume previous session on startup"
+msgstr "Phục hội lại phiên làm việc cuối khi vừa khởi động"
+
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
+msgid "Don't add from archives when adding folders"
+msgstr "Không thêm từ các tập tin lưu trữ khi thêm thư mục"
+
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
+msgid "\"Stop after current track\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
+msgid "\"Stop after current album\" option will switch off after triggering"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
+msgid "Playback"
+msgstr "Phát lạ_i"
+
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
+msgid "DSP Chain Preset"
+msgstr "DSP Chain Preset"
+
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
+msgid "_Load"
+msgstr "_Nạp"
+
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
+msgid "DSP"
+msgstr "DSP"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
+msgid "Close minimizes to tray"
+msgstr "Thu nhỏ xuống khay hệ thống"
+
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
+msgid "Hide system tray icon"
+msgstr "Ẩn biểu tượng khay hệ thống"
+
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
+msgid "Enable Chinese CP936 detection and recoding"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
+msgid "Interface refresh rate (times per second):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
+msgid "Titlebar text while playing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
+msgid "Titlebar text while stopped:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
+msgid "GUI Plugin (changing requires restart):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
+msgid "Player"
+msgstr ""
+
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
+msgid "Close playlists with middle mouse button"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
+msgid "Auto-name playlists when adding a single folder"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
+msgid "Auto-resize columns to fit the window"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "Danh sách phát"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
+msgid "GUI/Misc"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
+msgid "Override"
+msgstr "Ghi đè"
+
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
+msgid "Enable Proxy Server"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
+msgid "Proxy Server Address:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
+msgid "Proxy Server Port:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
+msgid "Proxy Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
+msgid "Proxy Username:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
+msgid "Proxy Password:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
+msgid "HTTP User Agent:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
+msgid "Edit Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
+msgid "Network"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
+msgid "Assigned Hotkeys:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
-msgid "Save playlist"
-msgstr "Lưu playlist"
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
+msgid "Action:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
-msgid "_Quit"
-msgstr "T_hoát"
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
+msgid "<Not set>"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
-msgid "_Edit"
-msgstr "_Sửa"
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
+msgid "Key combination:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
-msgid "_Clear"
-msgstr "_Xóa"
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
+msgid "Global hotkey"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
-msgid "Select all"
-msgstr "Chọn tất cả"
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
+msgid ""
+"Use the Apply button to save your changes,\n"
+"or the Revert button to undo your changes.\n"
+"The changes will NOT be saved\n"
+"if you don't press Apply."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
-msgid "Deselect all"
-msgstr "Bỏ chọn tất cả"
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
+msgid "_Defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
+msgid "Hotkeys"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
+msgid "URL:"
+msgstr "URL:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
+msgid "Set Custom Title"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
+msgid "Group By ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
+msgid "Sort by ..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
+msgid "Tag Writer Settings"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
+msgid "Write ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
+msgid "Write ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
+msgid "Write APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
+msgid "Strip ID3v2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
+msgid "Strip ID3v1"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
+msgid "Strip APEv2"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
+msgid "ID3v2 version"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
+msgid "ID3v1 character encoding (default is iso8859-1)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
+msgid "Write ID3v2.4"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
+msgid "Content-Type Mapping"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
+msgid ""
+"This table defines the binding between network stream content types and "
+"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
+"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
+"plugin, or \"ffmpeg\" plugin."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
+msgid "Content-Type:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
+msgid "Plugins:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
+msgid "Button properties"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
+msgid "Color:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
+msgid "Icon:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
+msgid "Label:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
+msgid "Select action"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
+msgid ""
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
+"the \"Artist\" metadata field. It should look like \"custom artist\" if "
+"the Artist field is present, or just \"custom\" otherwise."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
+
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "Lưu DeaDBeeF EQ Preset"
+
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "Tập tin DeaDBeeF EQ preset (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "Nạp DeaDBeeF EQ Preset..."
+
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ presets (*.ddbeq)"
+
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "Nhập Foobar2000 EQ Preset..."
+
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ presets (*.feq)"
+
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "Lưu Preset"
+
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "Nạp Preset"
+
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "Nhập Foobar2000 Preset"
+
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "Bật"
+
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "Tất Cả Về 0"
+
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "Preamp Về 0"
+
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "Bands Về 0"
+
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "Playlist Mới"
+
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr ""
+
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
+#, c-format
+msgid "1 day %d:%02d:%02d"
+msgstr "1 ngày %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
+#, c-format
+msgid "%d days %d:%02d:%02d"
+msgstr "%d ngày %d:%02d:%02d"
+
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr ""
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
-msgid "Invert selection"
-msgstr "Đảo lựa chọn"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
-msgid "Selection"
-msgstr "Lựa chọn"
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "Xóa"
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
-msgid "Crop"
-msgstr "Cắt"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
-msgid "_Find"
-msgstr "Tì_m"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
-msgid "Sort by"
-msgstr "Sắp xếp theo"
+#: ../plugins/gtkui/gtkui.c:613
+#, c-format
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "Tiêu đề"
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
+#, c-format
+msgid "New Playlist (%d)"
+msgstr "Playlist Mới (%d)"
 
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
-msgid "Track number"
-msgstr "Thứ tự bài"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "Danh sách phát dạng tab"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
-msgid "Album"
-msgstr "Album"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "Ngăn đôi (trên và dưới cùng)"
 
-#. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
-msgid "Artist"
-msgstr "Nghệ sĩ"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "Ngăn đôi (trái và phải)"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
-msgid "Date"
-msgstr "Ngày"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
-msgid "Random"
-msgstr "Ngẫu nhiên"
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "Danh sách phát dạng tab"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
-msgid "Custom"
-msgstr "Tùy chọn"
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "Thuộc tính lựa chọn"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
-msgid "Preferences"
-msgstr "Tùy chỉnh"
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "Hiển thị album nghệ thuật"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
-msgid "_View"
-msgstr "_Hiển thị"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
-msgid "Status bar"
-msgstr "Thanh trạng thái"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "Phổ tần"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
-msgid "Equalizer"
-msgstr "Equalizer"
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
-msgid "Design mode"
-msgstr "Chế độ thiết kế"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
-msgid "_Playback"
-msgstr "Phát _lại"
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "Nút"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "Thứ tự"
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "Thanh trượt"
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "Theo thứ tự"
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "Điều khiển phát lại"
 
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "Bài hát ngẫu nhiên"
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "Thanh âm lượng"
 
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "Album ngẫu nhiên"
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "Giọng điện tử"
 
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "Lặp lại"
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "Lặp lại tất cả"
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "Lặp lại chỉ một đối tượng"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "Lỗi trong khi đọc tập tin trợ giúp"
 
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "Không lặp lại"
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "Không thể đọc tập tin trợ giúp"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
-msgid "Scroll follows playback"
-msgstr "Trượt theo quá trình phát lại"
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "Chương trình hiện đang chạy ở chế độ nền. Nếu bạn thoát bây giờ, thì tác vụ này sẽ bị hủy bỏ hoặc gián đoạn. Điều này có thể dẫn tới việc mất mát dữ liệu."
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
-msgid "Cursor follows playback"
-msgstr "Con trỏ đi theo quá trình phát lại"
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "Bạn vẫn muốn thoát?"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
-msgid "Stop after current track"
-msgstr "Dừng lại sau bài này"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
+msgid ""
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
-msgid "Stop after current album"
-msgstr "Dừng lại sau album này"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
+msgid ""
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
-msgid "Jump to current track"
-msgstr "Nhảy đến bài hiện tại"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
-msgid "_Help"
-msgstr "T_rợ giúp"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
-msgid "_ChangeLog"
-msgstr "_Nhật ký thay đổi"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
-msgid "_GPLv2"
-msgstr "_GPLv2"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
-msgid "_LGPLv2.1"
-msgstr "_LGPLv2.1"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
-msgid "_About"
-msgstr "Thôn_g tin"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
-msgid "_Translators"
-msgstr "_Dịch giả"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "Trái"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
-msgid "Search"
-msgstr "Tìm kiếm"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "Phải"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
-msgid "Stop"
-msgstr "Dừng"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
-msgid "Play"
-msgstr "Phát"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
-msgid "Pause"
-msgstr "Tạm dừng"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
-msgid "Previous"
-msgstr "Trước"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
-msgid "Next"
-msgstr "Sau"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
-msgid "Play Random"
-msgstr "Phát Ngẫu Nhiên"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
-msgid "About"
-msgstr "Thông tin"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
-msgid "Quit"
-msgstr "Thoát"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "Bài"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "Trợ giúp"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "Không"
 
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
-msgid "Track Properties"
-msgstr "Thông Tin Bài Nhạc"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
-msgid "Location:"
-msgstr "Địa điểm:"
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
-msgid "Settings"
-msgstr "Thiết lập"
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
-msgid "_Apply"
-msgstr "Á_p dụng"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
-msgid "_Close"
-msgstr "Đó_ng"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
-msgid "Metadata"
-msgstr "Metadata"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
-msgid "Properties"
-msgstr "Thuộc tính"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "Tiêu đề:"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "Nghệ sĩ / Album"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
-msgid "Enter new column title here"
-msgstr "Nhập tiêu đề cột mới tại đây"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "Bài Số"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
-msgid "Type:"
-msgstr "Loại:"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "Thời lượng"
 
-#: ../plugins/gtkui/interface.c:1343
+#: ../plugins/gtkui/playlist/plcommon.c:73
 msgid "Item Index"
 msgstr "Item Index"
 
-#: ../plugins/gtkui/interface.c:1344
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
 msgid "Playing"
 msgstr "Đang phát"
 
-#: ../plugins/gtkui/interface.c:1345
+#: ../plugins/gtkui/playlist/plcommon.c:75
 msgid "Album Art"
 msgstr "Bìa Album"
 
-#: ../plugins/gtkui/interface.c:1346
+#: ../plugins/gtkui/playlist/plcommon.c:76
 msgid "Artist - Album"
 msgstr "Nghệ sĩ - Album"
 
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "Thời lượng"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
 msgid "Track Number"
 msgstr "Thứ Tự Bài Hát"
 
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
 msgid "Band / Album Artist"
 msgstr "Nhóm / Nghệ sĩ"
 
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
-msgid "Format:"
-msgstr "Định dạng:"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "Thêm cột"
+
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "Sửa cột"
+
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "Xóa cột"
+
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr ""
+
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "Nhóm bởi"
+
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "Nghệ sĩ/Ngày/Album"
+
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
+
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
-msgid "Alignment:"
-msgstr "Canh chỉnh:"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "Trái"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "Phải"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "_Hủy"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "Đồng _ý"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "Mở tập tin..."
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
-msgid "Output plugin:"
-msgstr "Plugin đầu ra:"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
-msgid "Output device:"
-msgstr "Thiết bị đầu ra:"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
-msgid "Always convert 8 bit audio to 16 bit"
-msgstr "Luôn luôn chuyển đổi âm thanh 8 bit sang 16 bit"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
-msgid "Always convert 16 bit audio to 24 bit"
-msgstr "Luôn chuyển đổi audio dạng 16 bit sang 24 bit"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "Thiết bị Âm thanh Mặc định"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
-msgid "Sound"
-msgstr "Âm thanh"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "Thêm tập tin..."
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "Chế độ Replaygain:"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "Đang khởi tạo..."
 
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "Tắt"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "Bài"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "Tỉ lệ cao điểm Replaygain"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
-msgid "-12 dB"
-msgstr "-12 dB"
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
-msgid "+12 dB"
-msgstr "+12 dB"
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "Khuếch đại trước của Replaygain:"
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "Khuếch đại trước toàn cục:"
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
-msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "Thêm tập tin từ dòng lệnh (hay bộ quản lý tập tin) vào playlist này:"
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
-msgid "Resume previous session on startup"
-msgstr "Phục hội lại phiên làm việc cuối khi vừa khởi động"
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
-msgid "Don't add from archives when adding folders"
-msgstr "Không thêm từ các tập tin lưu trữ khi thêm thư mục"
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
-msgid "\"Stop after current track\" option will switch off after triggering"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
-msgid "\"Stop after current album\" option will switch off after triggering"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "Giá trị"
+
+#: ../plugins/gtkui/trkproperties.c:116
+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:118
+msgid "Really close the window?"
+msgstr "Bạn thật sự muốn đóng cửa sổ này?"
+
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
-msgid "Playback"
-msgstr "Phát lạ_i"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "Phím tắt"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "Cấu hình"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
-msgid "DSP Chain Preset"
-msgstr "DSP Chain Preset"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
-msgid "_Load"
-msgstr "_Nạp"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
-msgid "DSP"
-msgstr "DSP"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
-msgid "Close minimizes to tray"
-msgstr "Thu nhỏ xuống khay hệ thống"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
-msgid "Hide system tray icon"
-msgstr "Ẩn biểu tượng khay hệ thống"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
-msgid "Enable Chinese CP936 detection and recoding"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
-msgid "Interface refresh rate (times per second):"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
-msgid "Titlebar text while playing:"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
-msgid "Titlebar text while stopped:"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
-msgid "GUI Plugin (changing requires restart):"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
-msgid "Player"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
-msgid "Close playlists with middle mouse button"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
-msgid "Auto-name playlists when adding a single folder"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
-msgid "Auto-resize columns to fit the window"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
-msgid "GUI/Misc"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
-msgid "Override"
-msgstr "Ghi đè"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "Mặt trước"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "Mặt sau"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "Màu thanh trượt/thanh âm lượng"
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "Giữa"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "Sáng"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "Tối"
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "Văn bản"
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "Dòng chẵn"
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "Dòng lẻ"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "Dòng đã chọn"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "Văn bản đã chọn"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "Trỏ chuột"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "Màu playlist"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
-msgid "Enable Proxy Server"
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
-msgid "Proxy Server Address:"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
-msgid "Proxy Server Port:"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
-msgid "Proxy Type:"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
-msgid "Proxy Username:"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
-msgid "Proxy Password:"
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
-msgid "HTTP User Agent:"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
-msgid "Edit Content-Type Mapping"
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
-msgid "Network"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
-msgid "Assigned Hotkeys:"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
-msgid "Action:"
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
-msgid "<Not set>"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
-msgid "Key combination:"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
-msgid "Global hotkey"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
-msgid ""
-"Use the Apply button to save your changes,\n"
-"or the Revert button to undo your changes.\n"
-"The changes will NOT be saved\n"
-"if you don't press Apply."
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
-msgid "_Defaults"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
-msgid "Hotkeys"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
-msgid "URL:"
-msgstr "URL:"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
-msgid "Set Custom Title"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
-msgid "Group By ..."
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
-msgid "Sort by ..."
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
-msgid "Tag Writer Settings"
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
-msgid "Write ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
-msgid "Write ID3v1"
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
-msgid "Write APEv2"
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
-msgid "Strip ID3v2"
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
-msgid "Strip ID3v1"
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
-msgid "Strip APEv2"
+#: ../plugins/shellexecui/interface.c:46
+#: ../plugins/shellexecui/shellexec.glade.h:1
+msgid "Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
-msgid "ID3v2 version"
+#: ../plugins/shellexecui/interface.c:88
+#: ../plugins/shellexecui/shellexec.glade.h:2
+msgid "Close"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
+#: ../plugins/shellexecui/interface.c:149
+#: ../plugins/shellexecui/shellexec.glade.h:6
+msgid "Edit Command"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/shellexecui/interface.c:170
+#: ../plugins/shellexecui/shellexec.glade.h:8
+msgid "Command:"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
-msgid "ID3v1 character encoding (default is iso8859-1)"
+#: ../plugins/shellexecui/interface.c:182
+#: ../plugins/shellexecui/shellexec.glade.h:10
+#, no-c-format
+msgid ""
+"Arbitrary shell command. Will be executed in the shell context which the "
+"main application was started from. Title formatting can be used. Example: "
+"xdg-open %D"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
-msgid "Write ID3v2.4"
+#: ../plugins/shellexecui/interface.c:185
+#: ../plugins/shellexecui/shellexec.glade.h:11
+msgid "ID:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
-msgid "Content-Type Mapping"
+#: ../plugins/shellexecui/interface.c:197
+#: ../plugins/shellexecui/shellexec.glade.h:12
+msgid "Free-form name, for example \"My Shell Command\""
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/shellexecui/interface.c:205
+#: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"This table defines the binding between network stream content types and "
-"DeaDBeeF decoder plugins. For example, mp3 files can have content type "
-"\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
-"plugin, or \"ffmpeg\" plugin."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
+#: ../plugins/shellexecui/interface.c:208
+#: ../plugins/shellexecui/shellexec.glade.h:15
+msgid "Single Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
-msgid "Content-Type:"
+#: ../plugins/shellexecui/interface.c:211
+#: ../plugins/shellexecui/shellexec.glade.h:14
+msgid "Works on single track."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
-msgid "Plugins:"
+#: ../plugins/shellexecui/interface.c:213
+#: ../plugins/shellexecui/shellexec.glade.h:17
+msgid "Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
-msgid "Button properties"
+#: ../plugins/shellexecui/interface.c:216
+#: ../plugins/shellexecui/shellexec.glade.h:16
+msgid "Works on multiple tracks."
+msgstr ""
+
+#: ../plugins/shellexecui/interface.c:218
+#: ../plugins/shellexecui/shellexec.glade.h:19
+msgid "Local"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
-msgid "Color:"
+#: ../plugins/shellexecui/interface.c:221
+#: ../plugins/shellexecui/shellexec.glade.h:18
+msgid "Works on local files."
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
+#: ../plugins/shellexecui/interface.c:223
+#: ../plugins/shellexecui/shellexec.glade.h:21
+msgid "Remote"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
-msgid "Icon:"
+#: ../plugins/shellexecui/interface.c:226
+#: ../plugins/shellexecui/shellexec.glade.h:20
+msgid "Works on remote files (e.g. http:// streams)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
-msgid "Label:"
+#: ../plugins/shellexecui/interface.c:228
+#: ../plugins/shellexecui/shellexec.glade.h:23
+msgid "Generic (Main Menu)"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
-msgid "Select action"
+#: ../plugins/shellexecui/interface.c:231
+#: ../plugins/shellexecui/shellexec.glade.h:22
+msgid "Item should appear in the main menu"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/shellexecui/interface.c:233
+#: ../plugins/shellexecui/shellexec.glade.h:24
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
-"the \"Artist\" metadata field. It should look like \"custom artist\" if "
-"the Artist field is present, or just \"custom\" otherwise."
+"If you want to add the command to main menu, make sure that title "
+"contains the menu path like this: \"File/My Command\", where File is the "
+"menu name in the English version."
 msgstr ""
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "Nghệ sĩ / Album"
-
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "Bài Số"
-
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
+#: ../plugins/shellexecui/shellexecui.c:96
+msgid "Add Command"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
+#: ../plugins/shellexecui/shellexecui.c:141
+msgid "This action will delete the selected shell command. Are you sure?"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
+#: ../plugins/shellexecui/shellexecui.c:143
+msgid "Confirm Remove"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/shellexecui/shellexecui.c:229
+msgid "ID must be non-empty and unique.\n"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "Thêm cột"
-
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "Sửa cột"
-
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "Xóa cột"
-
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
+#: ../plugins/shellexecui/shellexecui.c:235
+msgid "Title must be non-empty.\n"
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "Nhóm bởi"
-
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "Không"
-
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "Nghệ sĩ/Ngày/Album"
+#: ../plugins/shellexecui/shellexecui.c:241
+msgid "Shell Command must be non-empty.\n"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "Mở tập tin..."
+#: ../plugins/shellexecui/shellexecui.c:248
+#: ../plugins/shellexecui/shellexecui.c:252
+msgid "Invalid Values"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
+#: ../plugins/wildmidi/wildmidiplug.c:192
 #, c-format
-msgid "Configure %s"
+msgid ""
+"wildmidi: freepats config file not found. Please install timidity-freepats "
+"package, or specify path to freepats.cfg in the plugin settings."
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "Thiết bị Âm thanh Mặc định"
-
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../src/tf.c:2237
+msgid "mono"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "Thêm tập tin..."
-
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "Đang khởi tạo..."
-
-#: ../plugins/gtkui/trkproperties.c:168
-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:170
-msgid "Really close the window?"
-msgstr "Bạn thật sự muốn đóng cửa sổ này?"
-
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
+#: ../translation/extra.c:3
+msgid "Track Title"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "Phím tắt"
-
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "Giá trị"
-
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
+#: ../translation/extra.c:4
+msgid "Performer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
+#: ../translation/extra.c:9
+msgid "Total Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
+#: ../translation/extra.c:10
+msgid "Genre"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
+#: ../translation/extra.c:11
+msgid "Composer"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
+#: ../translation/extra.c:12
+msgid "Disc Number"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
+#: ../translation/extra.c:13
+msgid "Total Discs"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
+#: ../translation/extra.c:14
+msgid "Comment"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
 msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
+#: ../translation/extra.c:16
+msgid "Copyright"
 msgstr ""
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
+#: ../translation/extra.c:17
+msgid "Location"
 msgstr ""
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
 msgstr ""
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
 msgstr ""
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
 msgstr ""
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../main.c:97
-#, c-format
-msgid " --pause Pause playback\n"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
 msgstr ""
 
-#: ../main.c:98
-#, c-format
-msgid " --toggle-pause Toggle pause\n"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
 msgstr ""
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
 msgstr ""
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
 msgstr ""
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
 msgstr ""
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
 msgstr ""
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
 msgstr ""
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
 msgstr ""
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
 msgstr ""
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
 msgstr ""
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "Mặc định"
-
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "Có"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "Không"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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:87
-msgid ""
-"Left\n"
-"Right"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
 msgstr ""
-"Trái\n"
-"Phải"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
 msgstr ""
-"Tắt\n"
-"Bài\n"
-"Album"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
 msgstr ""
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
 msgstr ""
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
-#, c-format
-msgid ""
-"wildmidi: freepats config file not found. Please install timidity-freepats "
-"package, or specify path to freepats.cfg in the plugin settings."
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 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"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
 msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
 msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
 msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
 msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
 msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
 msgstr ""
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
 msgstr ""
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
 msgstr ""
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
 msgstr ""
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
 msgstr ""
 
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
 msgstr ""
 
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
 msgstr ""
 
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
 msgstr ""
 
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
 msgstr ""
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
 msgstr ""
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
 msgstr ""
 
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
 msgstr ""
 
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
 msgstr ""
 
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
 msgstr ""
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
 msgstr ""
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
 msgstr ""
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
 msgstr ""
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
 msgstr ""
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
 msgstr ""
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
 msgstr ""
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
 msgstr ""
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
 msgstr ""
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../translation/extra.c:51
-msgid "Show album art"
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
 msgstr ""
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
 msgstr ""
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
 msgstr ""
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
 msgstr ""
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
 msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
 msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
 msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
 msgstr ""
 
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
 msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
 msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
 msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
 msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
 msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
 msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
 msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
 msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
 msgstr ""
 
-#: ../translation/extra.c:80
-msgid "Comment"
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
 msgstr ""
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
 msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
 msgstr ""
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
 msgstr ""
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
 msgstr ""
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
 msgstr ""
 
-#: ../translation/extra.c:87
-msgid "Codec"
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
 msgstr ""
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
 msgstr ""
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
 msgstr ""
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
 msgstr ""
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
 msgstr ""
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
 msgstr ""
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
 msgstr ""
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
 msgstr ""
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
+#: ../translation/plugins.c:283
 #, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
 msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
 msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
 msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
 msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
 msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
+#: ../translation/plugins.c:321
 #, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+msgid "Sort by Track Number"
 msgstr ""
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
+#: ../translation/plugins.c:323
 #, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+msgid "Sort by Title"
 msgstr ""
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
 msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
 msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
 msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
 msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
 msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
 msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
 msgstr ""
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
 msgstr ""
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "Thêm"
-
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
 msgstr ""
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:46
-#: ../plugins/shellexecui/shellexec.glade.h:1
-msgid "Custom Shell Commands"
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:88
-#: ../plugins/shellexecui/shellexec.glade.h:2
-msgid "Close"
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:149
-#: ../plugins/shellexecui/shellexec.glade.h:6
-msgid "Edit Command"
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:170
-#: ../plugins/shellexecui/shellexec.glade.h:8
-msgid "Command:"
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:182
-#: ../plugins/shellexecui/shellexec.glade.h:10
+#: ../translation/plugins.c:377
 #, no-c-format
-msgid ""
-"Arbitrary shell command. Will be executed in the shell context which the "
-"main application was started from. Title formatting can be used. Example: "
-"xdg-open %D"
+msgid "Volume Down"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:185
-#: ../plugins/shellexecui/shellexec.glade.h:11
-msgid "ID:"
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:197
-#: ../plugins/shellexecui/shellexec.glade.h:12
-msgid "Free-form name, for example \"My Shell Command\""
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:205
-#: ../plugins/shellexecui/shellexec.glade.h:13
-msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:208
-#: ../plugins/shellexecui/shellexec.glade.h:15
-msgid "Single Tracks"
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:211
-#: ../plugins/shellexecui/shellexec.glade.h:14
-msgid "Works on single track."
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:213
-#: ../plugins/shellexecui/shellexec.glade.h:17
-msgid "Multiple Tracks"
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:216
-#: ../plugins/shellexecui/shellexec.glade.h:16
-msgid "Works on multiple tracks."
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:218
-#: ../plugins/shellexecui/shellexec.glade.h:19
-msgid "Local"
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:221
-#: ../plugins/shellexecui/shellexec.glade.h:18
-msgid "Works on local files."
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:223
-#: ../plugins/shellexecui/shellexec.glade.h:21
-msgid "Remote"
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:226
-#: ../plugins/shellexecui/shellexec.glade.h:20
-msgid "Works on remote files (e.g. http:// streams)"
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:228
-#: ../plugins/shellexecui/shellexec.glade.h:23
-msgid "Generic (Main Menu)"
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:231
-#: ../plugins/shellexecui/shellexec.glade.h:22
-msgid "Item should appear in the main menu"
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
 msgstr ""
 
-#: ../plugins/shellexecui/interface.c:233
-#: ../plugins/shellexecui/shellexec.glade.h:24
-msgid ""
-"If you want to add the command to main menu, make sure that title "
-"contains the menu path like this: \"File/My Command\", where File is the "
-"menu name in the English version."
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:96
-msgid "Add Command"
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:141
-msgid "This action will delete the selected shell command. Are you sure?"
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:143
-msgid "Confirm Remove"
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:229
-msgid "ID must be non-empty and unique.\n"
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:235
-msgid "Title must be non-empty.\n"
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:241
-msgid "Shell Command must be non-empty.\n"
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
 msgstr ""
 
-#: ../plugins/shellexecui/shellexecui.c:248
-#: ../plugins/shellexecui/shellexecui.c:252
-msgid "Invalid Values"
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-0.6.2.tar.bz2/po/zh_CN.po -> deadbeef-1.9.6.tar.bz2/po/zh_CN.po Changed

@@ -1,2061 +1,2611 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Wylmer Wang <wantinghard@gmail.com>, 2013-2014
+# colindemian <colindemian@outlook.com>, 2016
+# colindemian <colindemian@outlook.com>, 2016
+# Kelvin Cooper <Zhu-Zhe-Yong@live.com>, 2017
+# oupula zheng <3078825@qq.com>, 2017
+# pingplug <pingplug@foxmail.com>, 2016-2018,2021
+# Tramsifex <sunnycode@protonmail.com>, 2020-2021
+# e0c668032ced196bd60f2b6a070d982d_8f72ae0, 2013-2014
+# xdtianyu <xdtianyu@gmail.com>, 2014
+# xdtianyu <xdtianyu@gmail.com>, 2014
+# pingplug <pingplug@foxmail.com>, 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/deadbeef-"
-"player/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: Tramsifex <sunnycode@protonmail.com>, 2020-2021\n"
+"Language-Team: Chinese (China) (http://app.transifex.com/deadbeef-player/deadbeef-player/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "关于 DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "用法：deadbeef 选项 -- 文件\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s 更新记录"
+msgid "Options:\n"
+msgstr "选项：\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF 翻译者"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help 或 -h 打印帮助(这条消息)并退出\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "保存 DeaDBeeF EQ 预设置"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit 退出播放器\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF EQ 预设置文件(*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version 打印版本信息并退出\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "加载 DeaDBeeF EQ 预设置..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play 开始播放\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF EQ 预设置(*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop 停止播放\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "导入 Foobar2000 EQ 预设置..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause 暂停播放\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 EQ 预设置(*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause 切换暂停状态\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "保存预设置"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause 若停止则开始播放，否则切换暂停状态\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "加载预设置"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next 播放列表中的下一首歌曲\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "导入 Foobar2000 预设置"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev 播放列表中的上一首歌曲\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "启用"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random 播放列表中的任一首歌曲\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "清零所有"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue 向现有的播放列表中追加文件\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "清零前置放大"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui PLUGIN 指定要使用的用户界面插件，默认为“GTK2”\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "清零频段"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT 向标准输出打印格式化的音轨名称\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "预设置"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-语法: a艺人, t标题, b专辑,\n l时长, n音轨号, y年代, c注释,\n r版权, e已播放时间\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 天 %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr "示例： -- 正在播放 \"%%a - %%t\" 将显示为 \"artist - title\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d 天 %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr " 更多信息，请参阅 %s\n"
+
+#: ../src/main.c:155
+#, c-format
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "注意： -- 正在播放已弃用。\n"
+
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr "-- 正在播放 使用 FMT 格式标准输出音轨名称\n"
+
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " FMT 语法:http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
+
+#: ../src/main.c:158
+#, c-format
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr "示例： -- 正在播放 \"%%artist%% - %%title%%\" 将显示为 “艺人 - 标题”\n"
+
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr "--volume NUM 打印或者设置 deadbeef 音量\n"
+
+#: ../src/main.c:160
+#, c-format
+msgid ""
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
+msgstr " 该NUM参数可以用百分比来指定(绝对值或增量/减量)\n"
+
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr " 或者使用 dB -50, 0 (如果使用后缀)。\n"
+
+#: ../src/main.c:162
+#, c-format
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr " 例如：--volume 80, --volume +10, --volume -5 or --volume -20dB\n"
+
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
+
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:165
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "已停止 | 音轨数 %d | 播放总时长 %s"
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "默认"
+
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
 msgid "Mono"
 msgstr "单声道"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
+#: ../src/playlist.c:3221
 msgid "Stereo"
 msgstr "立体声"
 
-#: ../plugins/gtkui/gtkui.c:215
-#, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "是"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "已暂停 | "
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "否"
 
-#: ../plugins/gtkui/gtkui.c:226
-#, c-format
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "输出文件夹："
+
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "写入源音轨文件夹"
+
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "保持文件夹结构"
+
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "当格式不变时复制"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "复制后修改标签"
+
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "输出文件名："
+
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-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"
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "后缀名 (如 .mp3) 会自动补全。\n不填写则使用默认 (%tracknumber%. %artist% - %title%)。"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "新播放列表"
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "编码器："
 
-#: ../plugins/gtkui/gtkui.c:699
-#, c-format
-msgid "New Playlist (%d)"
-msgstr "新播放列表(%d)"
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP 预设置："
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "标签页式播放列表"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "线程数："
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "播放列表"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "输出采样格式："
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "分割线(顶部和底部)"
+#: ../plugins/converter/converter.glade.h:14
+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 "保持源格式\n8 位有符号整型\n16 位有符号整型\n24 位有符号整型\n32 位有符号整型\n32 位浮点型"
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "分割线(左侧和右侧)"
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "若文件存在："
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "播放列表标签页"
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "跳过\n提示\n覆盖"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "所选项目属性"
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "编辑编码器预设置"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "专辑封面显示"
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "标题："
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "范围"
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "无标题编码器"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "频谱"
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "输出文件扩展名："
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "水平框"
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "如 mp3"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "垂直框"
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "命令行："
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "按钮"
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-c-format
+msgid ""
+"Example: lame - %o\n"
+"%i for input file, %o for output file, - for stdin"
+msgstr "例如：lame - %o\n%i 为输入文件，%o 为输出文件，- 为标准输入"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr "定位条"
+#: ../plugins/converter/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - 输出文件名\n%i - 临时输入文件名"
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr "播放控制"
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "方法："
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr "音量条"
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
+msgstr "管道\n临时文件\n源文件"
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr "芯片合成语音"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "读取帮助文件时出错"
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "加入帮助文件失败"
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
+
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "标签编辑器"
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP 预设置编辑器"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "标题"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "无标题的 DSP 预设置"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "添加"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "移除"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "配置"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "选择 DSP 插件"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "插件"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "预设置"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr "内建 %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "文件已存在。覆盖吗？"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "转换器警告"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "请选择编码器"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "转换器错误"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "正在转换..."
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "选择文件夹..."
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "保存编码器预设置失败"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
-msgstr ""
-"播放器正在执行后台任务。如果您现在退出，任务会取消或中断；这可能造成数据损"
-"失。"
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "请检查预设置文件夹权限，选择其他标题或清理出一些磁盘空间"
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "您依然要退出吗？"
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "同名的预设置已经存在。请另选一个标题。"
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "错误"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "添加新编码器"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "编辑编码器"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "移除预设置"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "此操作将删除所选的预设置。您确定吗？"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "警告"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "编码器"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "向 DSP 链上添加插件"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "保存 DSP 预设置失败"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "新建 DSP 预设置"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "编辑 DSP 预设置"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP 预设置"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "帮助"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "保持源格式"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 位有符号整型"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 位有符号整型"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 位有符号整型"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 位有符号整型"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 位浮点型"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "跳过"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "提示"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "管道"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "临时文件"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "源文件"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "找不到位图文件：%s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "打开文件;..."
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "向播放列表添加文件;..."
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "向播放列表添加文件夹;..."
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "帮助.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "加载播放列表"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "播放列表另存为"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "关于 DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s 更新记录"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF 翻译者"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "内容-类型"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "插件"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "无效的值。"
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "内容-类型 和 插件 字段不能为空，并且要符合规则。\n内容-类型 示例：'audio/mpeg'\n插件标识 示例：'stdmpg ffmpeg'\n插件标识列表中必须使用空格分隔。\n内容类型 只能包含字母、数字和“-”号。\n插件标识只能包含字母和数字。"
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "没有选择项目。"
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
 msgstr "打开文件(_O)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "添加文件"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "添加文件夹"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
 msgstr "添加位置"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "新播放列表"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "加载播放列表"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "保存播放列表"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
-msgstr "选择所有"
+msgstr "全部选择"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
-msgstr "去选所有"
+msgstr "全部不选"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
-msgstr "反转选择"
+msgstr "反选"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "选择"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "移除"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "剪切"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
 msgstr "查找(_F)"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "排序依据"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "标题"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
 msgstr "音轨号"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "专辑"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "艺人"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "日期"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "随机"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "自定义"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "偏好设置"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
 msgstr "状态栏"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "均衡器"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "设计模式"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "日志"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "顺序"
-
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "线性"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "打乱音轨"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "打乱专辑"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "循环"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "全部循环"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "单曲循环"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "不循环"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "打乱"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "关闭"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "音轨"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "专辑"
+
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "随机音轨"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "重复"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "所有音轨"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "单条音轨"
+
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "随播放滚动列表"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "光标定位在播放的曲目"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "当前音轨后停止"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
 msgstr "当前专辑后停止"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
 msgstr "跳到当前音轨"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
 msgstr "更新记录(_C)"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
 msgstr "翻译者(_T)"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "搜索"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "播放"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "暂停"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "上一曲"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "下一曲"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "随机播放"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "关于"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "帮助"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
 msgstr "音轨属性"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
 msgstr "位置："
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "设置"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
 msgstr "应用(_A)"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "元数据"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "属性"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "标题："
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "确定(_O)"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "在此输入新的列标题"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "类型："
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "项目索引"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "正在播放"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "专辑封面"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "艺人 - 专辑"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "时长"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "音轨号"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "乐队 / 专辑艺人"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "格式："
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "排序格式："
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "(若非空)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "对齐："
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "左"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "右"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "取消(_C)"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "左部\n右部\n中部"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "确定(_O)"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "文本颜色："
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
 msgstr "输出插件："
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "输出设备："
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
 msgstr "总是将 8 位音频转换为 16 位"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
 msgstr "总是将 16 位音频转换为 24 位"
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "目标采样率："
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "48KHz的整数倍（96K，192K，……）："
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "44.1KHz的整数倍（88.2K，176.4K，……）："
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "根据输入采样率"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "覆盖采样率"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "声音"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "回放增益方式："
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "禁用"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "源模式："
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "音轨"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "按播放顺序\n音轨\n专辑"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "回放增益峰值均衡"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "处理："
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "无\n应用增益\n应用增益并根据峰值阻止削波失真\n仅阻止削波失真"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "回放预增益："
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "全局预增益："
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "前置放大有回放增益信息:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "前置放大无回放增益信息:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "回放增益"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
 msgstr "通过命令行(或文件管理器)向此播放列表添加文件："
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "启动时恢复上一次会话"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "在添加文件夹时排除归档"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "“当前音轨后停止”选项在触发后将被关闭"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "“当前专辑后停止”选项在触发后将被关闭"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "回放"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "配置"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "DSP 链预设置"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
 msgstr "加载(_L)"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
-msgstr "DSP(数字信号处理)"
+msgstr "DSP (数字信号处理)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "启动时最小化到托盘"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
-msgstr "点击关闭时最小化到托盘"
+msgstr "关闭时最小化到托盘"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
-msgstr "隐藏系统托盘图标"
+msgstr "隐藏托盘图标"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
+msgstr "从磁盘删除时使用回收站"
+
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
 msgid "Enable Japanese SHIFT-JIS detection and recoding"
 msgstr "启用日文 SHIFT-JIS 编码检测和重新编码"
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "启用俄语 CP1251 字符集检测和重新编码"
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
-msgstr "启用中文 Chinese CP936 编码检测和重新编码"
+msgstr "启用中文 CP936 编码检测和重新编码"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
 msgstr "界面刷新频率(每秒的次数)："
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "播放时的标题栏文本："
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "停止时的标题栏文本："
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
 msgstr "图形用户界面插件(更改后需重启程序)："
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "在状态栏显示选中音乐时长"
+
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
 msgstr "播放器"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
 msgstr "用鼠标中键关闭播放列表"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
-msgstr "用粗体显示正在播放的音轨"
-
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr "隐藏“从磁盘移除”右键菜单项"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "当前播放的歌曲从磁盘移除时切换到下一首"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "在添加单个文件夹时自动命名播放列表"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
 msgstr "自动调整列宽以适应窗口"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "组间距:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "像素"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "播放列表"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
 msgstr "用户界面/杂项"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
 msgstr "覆盖"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "前景色"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "背景色"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "搜索条/音量条颜色"
-
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "中"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "右"
-
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
-msgstr "暗"
-
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "基础"
-
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
-msgstr "文本"
-
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "标签条颜色"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "条"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "背景色(均衡器)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "进度条/音量条/均衡器"
+
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "基础色："
+
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
+msgstr "深色："
+
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "浅色："
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "过渡色："
+
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
+msgstr "文本："
+
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "粗体"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "斜体"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "正在播放文本："
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "选中文本："
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "标签栏"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "普通曲目："
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "正在播放的曲目："
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "选中曲目："
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "列分栏："
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "组标题："
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "前景色："
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "偶数行："
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "奇数行："
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "已选中："
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "光标："
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "背景："
 
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
 msgstr "覆盖(不同于 GTK 树状视图风格，但渲染更快)"
 
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "偶数行"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "奇数行"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "选择的行"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "选择的文本"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "光标"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "播放列表颜色"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "颜色"
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "外观"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "启用代理服务器"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "代理服务器地址："
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "代理服务器端口："
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "代理类型："
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "代理用户名："
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "代理密码："
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
 msgstr "HTTP 用户代理："
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
 msgstr "编辑 内容-类型 映射"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "网络"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
 msgstr "已分配的快捷键："
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
 msgstr "操作："
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<未设置>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
 msgstr "按键组合："
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
 msgstr "全局快捷键"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
-"使用“应用”按钮保存您的更改，\n"
-"或使用“恢复”按钮撤消更改。\n"
-"在您按“应用”之前，更改不会保存。"
+msgstr "使用“应用”按钮保存您的更改，\n或使用“恢复”按钮撤消更改。\n在您按“应用”之前，更改不会保存。"
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
 msgstr "默认(_D)"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
 msgstr "快捷键"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "版本："
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr "配置"
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "版权"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr "信息"
+
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr "许可证"
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "插件"
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "复位为默认值"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "版本："
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "URL："
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
 msgstr "自定义标题"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
 msgstr "分组依据..."
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
 msgstr "排序依据..."
 
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "格式"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "升序"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "降序"
-
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "选择 DSP 插件"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "插件"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "升序\n降序"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
 msgstr "标签编辑器设置"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "写 ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "写 ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "写 APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "清除 ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "清除 ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "清除 APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 版本"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (推荐)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3 (推荐)\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
 msgstr "ID3v1 字符编码(默认为 iso8859-1)"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "写 ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
 msgstr "内容-类型 映射"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
-"这个表格定义了网络流媒体内容类型与 DeaDBeeF 解码器插件之间的绑定。例如，mp3 "
-"文件的内容类型会是“audio/x-mpeg”，它需要通过 DeaDBeeF 自己的“stdmpg”插件"
-"或“ffmpeg”插件解码。"
+msgstr "这个表格定义了网络流媒体内容类型与其对应的 DeaDBeeF 解码器插件。例如，mp3 文件的内容类型为“audio/x-mpeg”，需要 DeaDBeeF 自带的“stdmpg”插件或“ffmpeg”插件解码。"
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr "复位为默认值"
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
 msgstr "内容-类型："
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
 msgstr "插件："
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
 msgstr "按钮属性"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
 msgstr "颜色："
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr "文本颜色："
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
 msgstr "图标："
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
 msgstr "标签："
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
 msgstr "选择操作"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
+msgstr "此对话框可以自定义任何音轨的标题。这一功能对电台最有用。“添加位置”对话框中也有自定义标题的功能。标题将出现在显示“艺人”元数据的分栏中，其格式一般为“自定义 艺人”(如果有“艺人”字段)，或“自定义”。"
+
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "编辑"
+
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "就地编辑"
+
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "添加新字段..."
+
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "编辑值"
+
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "字段名:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "字段值:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
-"这一对话框可以自定义任何音轨的标题。这对电台最有用。“添加位置”对话框也有一个"
-"选项来设置自定义标题。标题将出现在显示“艺人”元数据的列中。它会显示为“自定"
-"义 艺人”(如果有“艺人”字段)，或“自定义”。"
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "艺人 / 专辑"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF 日志"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "音轨号"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "清除"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr "添加到播放队列"
-
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr "从播放队列中移除"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "回放增益扫描进度"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr "重新载入元数据"
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "当前文件:"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
-msgstr "从磁盘中移除"
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "状态"
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "添加列"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "取消"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "编辑列"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "回放增益扫描结果"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "移除列"
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "更新文件标签"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr "滚动时固顶组"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr "复制报告"
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "分组依据"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr "仅显示带有配置的插件"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "无"
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
+msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "艺人/日期/专辑"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "打开文件..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "配置 %s"
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "默认音频设备"
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "保存 DeaDBeeF EQ 预设置"
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
-msgstr "您修改了热键设置，但没有保存更改。"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF EQ 预设置文件(*.ddbeq)"
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
-msgstr "您确定要继续而不保存吗？"
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "加载 DeaDBeeF EQ 预设置..."
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "正在添加文件..."
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF EQ 预设置(*.ddbeq)"
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "正在初始化..."
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "导入 Foobar2000 EQ 预设置..."
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "您修改了此音轨的数据。"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 EQ 预设置(*.feq)"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "真的关闭该窗口吗？"
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "保存预设置"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "多个值 "
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "加载预设置"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "键"
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "导入 Foobar2000 预设置"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "值"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "启用"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "多个值 "
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "清零所有"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "正在写入标签..."
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "清零前置放大"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "字段名"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "清零频段"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "名称："
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "新播放列表"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "字段名称不能以 : 或 _ 开头"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "支持的声音格式"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "无法添加字段"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "所有文件;(*)"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "同名的字段已经存在，请尝试其他名称。"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "支持的播放列表格式"
+
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "所有文件"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "添加字段"
-
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "移除字段"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "其他文件;(*)"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "用法：deadbeef 选项 -- 文件\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF 播放列表文件(*.dbpl)"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "选项：\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "跟随符号链接"
 
-#: ../main.c:92
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help 或 -h 打印帮助(这条消息)并退出\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 天 %d:%02d:%02d"
 
-#: ../main.c:93
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit 退出播放器\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d 天 %d:%02d:%02d"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version 打印版本信息并退出\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "总播放时间"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "已暂停"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "位"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "选择播放时间"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "已停止"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play 开始播放\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "重命名播放列表"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop 停止播放\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "正在移除播放列表"
 
-#: ../main.c:97
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause 暂停播放\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "您确实要移除播放列表'%s'吗？"
 
-#: ../main.c:98
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause 切换暂停状态\n"
+msgid "New Playlist (%d)"
+msgstr "新播放列表(%d)"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr " --play-pause 若停止则开始播放，否则切换暂停状态\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "标签页式播放列表"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next 播放列表中的下一首歌曲\n"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "分割线(顶部和底部)"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev 播放列表中的上一首歌曲\n"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "分割线(左侧和右侧)"
 
-#: ../main.c:102
-#, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random 播放列表中的任一首歌曲\n"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "标签页"
 
-#: ../main.c:103
-#, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue 向现有的播放列表中追加文件\n"
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "播放列表标签页"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr " --gui PLUGIN 指定要使用的用户界面插件，默认为“GTK2”\n"
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "所选项目属性"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT 向标准输出打印格式化的音轨名称\n"
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "专辑封面显示"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
-" FMT %%-语法: a艺人, t标题, b专辑,\n"
-" l时长, n音轨号, y年代, c注释,\n"
-" r版权, e已播放时间\n"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
-msgstr ""
-" 例：--nowplaying \"%%a - %%t\" 将打印“艺人 - 标题”\n"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "频谱"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
-msgstr ""
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "水平框"
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "默认"
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "垂直框"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "是"
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "按钮"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "否"
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "拖动条"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
-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/gtkui.c:1469
+msgid "Playback controls"
+msgstr "播放控制"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
-msgid ""
-"Left\n"
-"Right"
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "音量条"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "芯片合成语音"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "日志查看器"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
-"左\n"
-"右"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "读取帮助文件时出错"
+
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "载入帮助文件失败"
+
+#: ../plugins/gtkui/gtkui.c:1712
 msgid ""
-"Disable\n"
-"Track\n"
-"Album"
-msgstr ""
-"禁用\n"
-"音轨\n"
-"专辑"
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "播放器正在执行后台任务。如果您现在退出，任务会取消或中断；这可能造成数据丢失。"
+
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "您仍然要退出吗？"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 msgid ""
-"Ascending\n"
-"Descending"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"升序\n"
-"降序"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"2.3 (推荐)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
 #, 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 "Do you really want to delete the selected file?%s"
 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "在 Last.fm 上查找"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
+msgstr ""
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "使用 ALSA 重采样"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
+#, c-format
+msgid "Do you really want to delete the currently playing file?%s"
+msgstr ""
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "停止时释放设备"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
+msgstr ""
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "首选的缓存大小"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "删除"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "首选的周期长度"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "左部"
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "启用 scrobbler"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "右部"
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "禁用现在播放"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "中部"
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "用户名"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "密码"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble URL"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "优先使用专辑艺人而不是艺人字段"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "设备文件"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "修正 OSS4 采样率问题"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "播放顺序"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "缓存更新周期(小时)"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "音轨"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "从内嵌标签中提取"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "无"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "从本地文件夹提取"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "应用增益"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "应用增益并根据峰值阻止削波失真"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "仅阻止削波失真"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "本地封面文件掩码"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "从 last.fm 获取"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "从 albumart.org 获取"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "按较长的边拉伸图片"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "使用 CDDB/FreeDB"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "升序"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "首选 CD-Text 而非 CDDB"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "降序"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (如“freedb.org”)"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB 端口号 (如“888”)"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "首选 CDDB 协议而非 HTTP"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3 (推荐)"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "启用 NRG 图像支持"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "重采样品质(0~2，越大品质越好)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8位输出(默认为16位)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "艺人 / 专辑"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "最大歌曲长度(分钟)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "音轨号"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "淡出时长(秒)"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "时长"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "播放循环次数(如果可用)"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "项目索引"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "从磁盘中删除文件时让我确认"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "正在播放"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "状态图标音量控制灵敏度"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "专辑封面"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "自定义状态图标"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "艺人 - 专辑"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "以 --sync 参数运行 gtk_init (调试模式)"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "年"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "在插件环境菜单项间添加分隔线"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "音轨号"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "通知标题格式"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "乐队 / 专辑艺人"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "通知内容格式"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "编解码器"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "显示专辑封面"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "比特率"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "专辑封面尺寸(像素)"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "添加列"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio 服务器"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "编辑列"
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "采样率"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "移除列"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "相对搜寻表路径"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "滚动时固顶组"
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "绝对搜寻表路径"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "分组依据"
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "交换音频字节(如果所听到的没有变化可切回)"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "艺人/日期/专辑"
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "启用 HVSC 歌曲长度数据库"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (来自 HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "采样位数(8 或 16)"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "默认歌曲长度(秒)"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ 音色库配置文件"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "重新载入元数据"
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "音轨标题"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "演奏/演唱"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "总音轨数"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "流派"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "作曲"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "移除播放列表"
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "盘片号"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "添加新播放列表"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "注释"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "启用自动排序"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "编码器 / 厂商"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "位置"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "打开文件..."
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "次音轨索引"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "配置 %s"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "标签类型"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "您修改了热键设置，但没有保存更改。"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "嵌入的 Cuesheet"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "您确定要继续而不保存吗？"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "编解码器"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "默认音频设备"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "文件扩展名(用;分隔)"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "正在添加文件..."
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "转换"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "正在初始化..."
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "目标采样率"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "更新文件标签进度"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "品质 / 算法"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "名称"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "自动采样率(替代目标采样率)"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "专辑增益"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "音轨增益"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "专辑峰值"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "音轨峰值"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "成功"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "文件不存在"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "无效文件"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "搜索 (%list_total% 结果)"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "显示列标题"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "禁用无缝播放(可加快扫描)"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "值"
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "优先使用 Ken 模拟器而非 Satoh (环绕效果将无法使用)"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "您修改了此音轨的数据。"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "启用环绕效果"
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "真的关闭该窗口吗？"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
-msgstr "内建 %s"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "多个值 "
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "文件已存在。覆盖吗？"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "项目"
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "转换器警告"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "多个值 "
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "请选择编码器"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "正在写入标签..."
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "转换器错误"
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "正在转换..."
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "选择文件夹..."
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "字段名"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "保存编码器预设置失败"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "名称："
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
-msgstr "请检查预设置文件夹权限，选择其他标题或清理出一些磁盘空间"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "字段名称不能以 : 或 _ 开头"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "同名的预设置已经存在。请另选一个标题。"
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "无法添加字段"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "错误"
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "同名的字段已经存在，请尝试其他名称。"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "添加新编码器"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "“%s”部件不可用"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "编辑编码器"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "替换为..."
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "移除预设置"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "插入..."
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "此操作将删除所选的预设置。您确定吗？"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "剪切"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "编码器"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "复制"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "向 DSP 链上添加插件"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "粘贴"
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "保存 DSP 预设置失败"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr "上一级"
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "新建 DSP 预设置"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "不支持此类部件的多个实例"
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "编辑 DSP 预设置"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "比例间距"
+
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr "锁定顶部面板高度"
+
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr "锁定左侧面板宽度"
+
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr "锁定底部面板高度"
+
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr "锁定右侧面板宽度"
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP 预设置"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "重命名标签"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "输出文件夹："
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "移除标签"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "写入源音轨文件夹"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "添加新标签"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "保持文件夹结构"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "标签左移"
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "输出文件名："
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "标签右移"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
-#, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
-"扩展名(如 .mp3)会自动追加。\n"
-"不填则使用默认(%a - %t)。"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "编码器："
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP 预设置："
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "线程数："
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "输出采样格式："
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1x"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "保持源格式"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2x"
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 位有符号整型"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 位有符号整型"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4x"
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 位有符号整型"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 位有符号整型"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 位浮点型"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "若文件存在："
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "提示"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "覆盖"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "编辑编码器预设置"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "无标题编码器"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "输出文件扩展名："
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "如 mp3"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "命令行："
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
-"例如：lame - %o\n"
-"%i 为输入文件，%o 为输出文件，- 为标准输入"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
-"%o - 输出文件名\n"
-"%i - 临时输入文件名"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "方法："
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "管道"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "临时文件"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr "向框中增加 1 项"
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr "从框中减少 1 项"
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "标签编辑器"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "平均"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP 预设置编辑器"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "扩展"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "无标题的 DSP 预设置"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "填充"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "添加"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "配置按钮"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "找不到位图文件：%s"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
-"保持源格式\n"
-"8 位有符号整型\n"
-"16 位有符号整型\n"
-"24 位有符号整型\n"
-"32 位有符号整型\n"
-"32 位浮点型"
 
-#: ../plugins/converter/converter.glade.h:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
-"覆盖前\n"
-"提示"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "语音："
+
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
 msgstr ""
-"对临时文件\n"
-"进行管道定向"
+
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
+msgstr ""
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "（已暂停）"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "（已停止）"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "（播放中）"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%d 天 %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "项目"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "播放列表浏览器"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "自定义 shell 命令"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "编辑"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2078,9 +2628,7 @@
 "Arbitrary shell command. Will be executed in the shell context which the "
 "main application was started from. Title formatting can be used. Example: "
 "xdg-open %D"
-msgstr ""
-"任意 shell 命令。命令将在主应用程序启动的 shell 环境中执行。可以使用标题格式"
-"化代码。例如：xdg-open %D"
+msgstr "任意 shell 命令。命令将在主应用程序启动的 shell 环境中执行。可以使用标题格式化代码。例如：xdg-open %D"
 
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
@@ -2095,8 +2643,8 @@
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
 msgstr "命令标识，通常应简短，如“youtube_open”。此标识应唯一。"
 
 #: ../plugins/shellexecui/interface.c:208
@@ -2155,18 +2703,12 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
-"如果您想向主菜单添加命令，请确保标题中包含“File/My Command”这样的菜单"
-"路径，例子中 File 是英文的菜单名。"
+msgstr "如果您想向主菜单添加命令，请确保标题中包含“File/My Command”这样的菜单路径，例子中 File 是英文的菜单名。"
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
 msgstr "添加命令"
 
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr "删除"
-
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
 msgstr "此操作将删除所选的 shell 命令。您确定吗？"
@@ -2192,196 +2734,1240 @@
 msgid "Invalid Values"
 msgstr "无效的值"
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
-msgstr "支持的声音格式"
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 的路径。"
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
-msgstr "所有文件;(*)"
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "单声道"
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
-msgstr "打开文件;..."
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "立体声"
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
-msgstr "向播放列表添加文件;..."
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "音轨标题"
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
-msgstr "向播放列表添加文件夹;..."
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "演奏/演唱"
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
-msgstr "跟随符号链接"
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "总音轨数"
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
-msgstr "帮助.txt"
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "流派"
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
-msgstr "从磁盘中删除文件"
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "作曲"
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "盘片号"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "总唱片数"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "注释"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "编码器 / 厂商"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "版权"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "位置"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "次音轨索引"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "标签类型"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "嵌入的 Cuesheet"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
-"文件将消失。继续吗？\n"
-"(可以在 GTKUI 插件设置中关掉这个对话框)"
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
-msgstr "加载播放列表"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
-msgstr "其他文件;(*)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
+msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
-msgstr "播放列表另存为"
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "优先使用 Ken 模拟器而非 Satoh (环绕效果将无法使用)"
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
-msgstr "DeaDBeeF 播放列表文件(*.dbpl)"
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "启用环绕效果"
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
-msgstr "内容-类型"
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "使用 ALSA 重采样"
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
-msgstr "无效的值。"
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "首选的缓存大小"
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "首选的周期长度"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
-"内容-类型 和 插件 字段不能为空，并且要符合规则。\n"
-"内容-类型 示例：'audio/mpeg'\n"
-"插件标识 示例：'stdmpg ffmpeg'\n"
-"插件标识列表中必须使用空格分隔。\n"
-"内容类型 只能包含字母、数字和“-”号。\n"
-"插件标识只能包含字母和数字。"
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
-msgstr "没有选择项目。"
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "从内嵌标签中提取"
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
-msgstr "“%s”部件不可用"
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "从本地文件夹提取"
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
-msgstr "替换为..."
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "从 Last.fm 获取"
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
-msgstr "插入..."
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "从 MusicBrainz 获取"
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
-msgstr "剪切"
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "从 Albumart.org 获取"
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
-msgstr "复制"
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
-msgstr "粘贴"
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
-msgstr "不支持此类部件的多个实例"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "当找不到图片时"
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
-msgstr "锁定移动"
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "留空"
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
-msgstr "标签左移"
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "使用 DeaDBeeF 默认封面图片"
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
-msgstr "标签右移"
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "显示自定义图片"
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
-msgstr "移除标签"
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "自定义图片路径"
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
-msgstr "重命名标签"
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
-msgstr "添加新标签"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
-msgstr "显示列标题"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
-msgstr "向框中增加 1 项"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
-msgstr "从框中减少 1 项"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
-msgstr "平均"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
+msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
-msgstr "扩展"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "载入的 CD 驱动器"
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
-msgstr "填充"
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "音频 CD 驱动器"
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
-msgstr "配置按钮"
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "文件"
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
-msgstr "语音："
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "添加音频 CD"
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
-msgstr "编辑播放列表"
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
-msgstr "重命名播放列表"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "首选 CD-Text 而非 CDDB"
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
-msgstr "移除播放列表"
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
+msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
-msgstr "添加新播放列表"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
+msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
-msgstr "名称"
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "使用 CDDB 协议"
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
-msgstr "播放列表浏览器"
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "启用 NRG 图像支持"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "正常播放时的驱动器速度"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8x"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16x"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "最高"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "抓取时使用 cdparanoia 的误差修正"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "转换"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "从输出设备自动检测采样率"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "直接设置采样率"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "品质 / 算法"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "重采样质量"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
+msgstr "内部 DUMB 音量"
+
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
+msgstr "淡入/淡出"
+
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "仅开/关"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "完全"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8位输出"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "使用 ffmpeg 支持全部的格式"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "文件扩展名(用;分隔)"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
+msgstr ""
+
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "忽略头部损坏错误"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "忽略无法解析的串流错误"
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "最大歌曲长度(分钟)"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "淡出时长(秒)"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "播放循环次数(如果可用)"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
+msgstr "ColecoVision BIOS（用于SGC格式）"
+
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "回放增益"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "删除回放增益信息"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "扫描所选项为专辑(按标签)"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "扫描所选项为单曲专辑"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "扫描每个文件的音轨增益"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
+msgstr "如未扫描，扫描每个文件的音轨增益"
+
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "全部不选"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "全部选择"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "添加位置"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "添加文件夹（们）"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "添加文件（们）"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "打开文件（们）"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "显示帮助页面"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "循环重复模式"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "重复 - 关"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "重复 - 单轨"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "重复 - 全部"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "循环随机播放模式"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "随机播放 - 随机音轨"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "随机播放 - 专辑"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "随机播放 - 音轨"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "随机播放 - 关"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "切换随播放移动光标"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "切换随播放滚动列表"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "查看"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "显示\\/隐藏菜单栏"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "显示\\/隐藏状态栏"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "切换设计模式"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "自定义排序"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "剪裁所选"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "保存播放列表"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "移除此播放列表"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
+msgstr "重命名当前播放列表"
+
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "显示\\/隐藏均衡器"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "隐藏均衡器"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "显示均衡器"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "显示\\/隐藏播放器窗口"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "隐藏播放器窗口"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "显示播放器窗口"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "查找"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "显示\\/隐藏日志窗口"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "从磁盘中删除文件时让我确认"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
+msgstr ""
+
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "状态图标音量控制灵敏度"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "自定义状态图标"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
+msgstr ""
+
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "在插件环境菜单项间添加分隔线"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "使用 Unicode 字符而不是图像显示音轨播放状态"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "禁用拖动条上方文字"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
+msgstr ""
+
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
+msgstr ""
+
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "跳至"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
+msgstr ""
+
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
+msgstr ""
+
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
+msgstr ""
+
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
+msgstr ""
+
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
+msgstr ""
+
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
+msgstr ""
+
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
+msgstr ""
+
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
+msgstr ""
+
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "下一播放列表"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
+msgstr ""
+
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
+msgstr ""
+
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
+msgstr ""
+
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
+msgstr ""
+
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
+msgstr ""
+
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
+msgstr ""
+
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
+msgstr ""
+
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
+msgstr ""
+
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
+msgstr ""
+
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "随机排序"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "反选"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "清空播放列表"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "移动"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "下移音轨"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "上移音轨"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "切换静音"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "切换暂停"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "播放\\/暂停"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "前进 1 秒"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "后退 1 秒"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "前进 5 秒"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "后退 5 秒"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "前进 1%"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "后退 1%"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "前进 5%"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "后退 5%"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "音量增"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "音量减"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "切换“当前曲目后停止”"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "切换“当前专辑后停止”"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "启用 scrobbler"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "禁用现在播放"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "用户名"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "密码"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble URL"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "优先使用专辑艺人而不是艺人字段"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "发送MusicBrainz ID"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr "提交短于30秒的音轨（不推荐）"
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "左混音"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "右混音"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "强制 16 位输出"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "后端"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "通知标题格式"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "通知内容格式"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "显示专辑封面"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "专辑封面尺寸(像素)"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "设备文件"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "高亮当前播放列表"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "双击时播放"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr "缓冲大小(-1由portaudio选择最佳值)"
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "设备名称编码"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "以下已定义"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "自定义设备名称编码"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio服务（留空为默认）"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "默认歌曲长度（分钟）"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "采样率"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "短于多少时间跳过（秒）"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "配置自定义 shell 命令"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "相对搜寻表路径"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "绝对搜寻表路径"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "交换音频字节(如果所听到的没有变化可切回)"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "启用 HVSC 歌曲长度数据库"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Songlengths.md5/.txt的完整路径"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "采样位数"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "默认歌曲长度(秒)"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "单声道合成"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "启用日志记录"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "前置放大"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr "1.2K"
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr "1.8K"
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr "2.5K"
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr "3.5K"
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr "5K"
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr "7K"
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr "10K"
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr "14K"
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr "20K"
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ 音色库配置文件"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
+msgstr ""

deadbeef-0.6.2.tar.bz2/po/zh_TW.po -> deadbeef-1.9.6.tar.bz2/po/zh_TW.po Changed

@@ -1,2047 +1,2610 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# 鍾宏慶 <earlycat@gmail.com>, 2019
 # BrLi <rainman59118@gmail.com>, 2013
 # BrLi <rainman59118@gmail.com>, 2013
+# Hiunn-hué <hiunnhue108@ymail.com>, 2015-2016,2019
 # PCMan <pcman.tw@gmail.com>, 2010
+# Julian Lai <laichiaheng@outlook.com>, 2015-2017,2019
+# Louis Chen <louistw@uab.edu>, 2019
 # PCMan <pcman.tw@gmail.com>, 2010
+# 鍾宏慶 <earlycat@gmail.com>, 2020,2022
 msgid ""
 msgstr ""
 "Project-Id-Version: DeaDBeeF Player\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 19:54+0200\n"
-"PO-Revision-Date: 2014-07-31 18:10+0000\n"
-"Last-Translator: Alexey Yakovenko <wakeroid@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
-"deadbeef-player/language/zh_TW/)\n"
-"Language: zh_TW\n"
+"POT-Creation-Date: 2023-10-28 11:29+0200\n"
+"PO-Revision-Date: 2013-08-15 06:35+0000\n"
+"Last-Translator: 鍾宏慶 <earlycat@gmail.com>, 2020,2022\n"
+"Language-Team: Chinese (Taiwan) (http://app.transifex.com/deadbeef-player/deadbeef-player/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../plugins/gtkui/callbacks.c:353
+#: ../src/main.c:134
 #, c-format
-msgid "About DeaDBeeF %s"
-msgstr "關於 DeaDBeeF %s"
+msgid "Usage: deadbeef options -- file(s)\n"
+msgstr "使用方法：deadbeef 選項 -- 檔案（複數）\n"
 
-#: ../plugins/gtkui/callbacks.c:366
+#: ../src/main.c:135
 #, c-format
-msgid "DeaDBeeF %s ChangeLog"
-msgstr "DeaDBeeF %s ChangeLog"
+msgid "Options:\n"
+msgstr "選項：\n"
 
-#: ../plugins/gtkui/callbacks.c:626
+#: ../src/main.c:136
 #, c-format
-msgid "DeaDBeeF Translators"
-msgstr "DeaDBeeF 翻譯者"
+msgid " --help or -h Print help (this message) and exit\n"
+msgstr " --help 或 -h 顯示說明（本訊息）並結束\n"
 
-#: ../plugins/gtkui/eq.c:141
-msgid "Save DeaDBeeF EQ Preset"
-msgstr "儲存 DeaDBeeF 等化器預設值"
+#: ../src/main.c:137
+#, c-format
+msgid " --quit Quit player\n"
+msgstr " --quit 結束播放器\n"
 
-#: ../plugins/gtkui/eq.c:148
-msgid "DeaDBeeF EQ preset files (*.ddbeq)"
-msgstr "DeaDBeeF 等化器預設值檔案 (*.ddbeq)"
+#: ../src/main.c:138
+#, c-format
+msgid " --version Print version info and exit\n"
+msgstr " --version 顯示版本資料並結束\n"
 
-#: ../plugins/gtkui/eq.c:187
-msgid "Load DeaDBeeF EQ Preset..."
-msgstr "載入 DeaDBeeF 等化器預設值..."
+#: ../src/main.c:139
+#, c-format
+msgid " --play Start playback\n"
+msgstr " --play 開始播放\n"
 
-#: ../plugins/gtkui/eq.c:191
-msgid "DeaDBeeF EQ presets (*.ddbeq)"
-msgstr "DeaDBeeF 等化器預設值 (*.ddbeq)"
+#: ../src/main.c:140
+#, c-format
+msgid " --stop Stop playback\n"
+msgstr " --stop 停止播放\n"
 
-#: ../plugins/gtkui/eq.c:252
-msgid "Import Foobar2000 EQ Preset..."
-msgstr "匯入 Foobar2000 等化器預設值..."
+#: ../src/main.c:141
+#, c-format
+msgid " --pause Pause playback\n"
+msgstr " --pause 暫停播放\n"
 
-#: ../plugins/gtkui/eq.c:256
-msgid "Foobar2000 EQ presets (*.feq)"
-msgstr "Foobar2000 等化器預設值 (*.feq)"
+#: ../src/main.c:142
+#, c-format
+msgid " --toggle-pause Toggle pause\n"
+msgstr " --toggle-pause 切換暫停狀態\n"
 
-#: ../plugins/gtkui/eq.c:321
-msgid "Save Preset"
-msgstr "儲存預設值"
+#: ../src/main.c:143
+#, c-format
+msgid ""
+" --play-pause Start playback if stopped, toggle pause otherwise\n"
+msgstr " --play-pause 如停止則開始播放，否則切換暫停狀態\n"
 
-#: ../plugins/gtkui/eq.c:329
-msgid "Load Preset"
-msgstr "載入預設值"
+#: ../src/main.c:144
+#, c-format
+msgid " --next Next song in playlist\n"
+msgstr " --next 播放清單下一首歌\n"
 
-#: ../plugins/gtkui/eq.c:337
-msgid "Import Foobar2000 Preset"
-msgstr "匯入 Foobar2000 預設值"
+#: ../src/main.c:145
+#, c-format
+msgid " --prev Previous song in playlist\n"
+msgstr " --prev 播放清單上一首歌\n"
 
-#: ../plugins/gtkui/eq.c:362
-msgid "Enable"
-msgstr "啟用"
+#: ../src/main.c:146
+#, c-format
+msgid " --random Random song in playlist\n"
+msgstr " --random 播放清單隨機歌曲\n"
 
-#: ../plugins/gtkui/eq.c:371
-msgid "Zero All"
-msgstr "全部歸零"
+#: ../src/main.c:147
+#, c-format
+msgid " --queue Append file(s) to existing playlist\n"
+msgstr " --queue 將檔案附加至播放清單\n"
 
-#: ../plugins/gtkui/eq.c:378
-msgid "Zero Preamp"
-msgstr "前級放大器歸零"
+#: ../src/main.c:148
+#, c-format
+msgid " --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
+msgstr " --gui 擴充 告訴程式您想使用哪個圖形界面，預設是 \"GTK2\"\n\n"
 
-#: ../plugins/gtkui/eq.c:385
-msgid "Zero Bands"
-msgstr "頻帶歸零"
+#: ../src/main.c:149
+#, c-format
+msgid " --nowplaying FMT Print formatted track name to stdout\n"
+msgstr " --nowplaying FMT 將格式化的歌曲名輸出至 stdout\n"
 
-#: ../plugins/gtkui/eq.c:392 ../plugins/converter/interface.c:805
-#: ../plugins/converter/converter.glade.h:50
-msgid "Presets"
-msgstr "預設值"
+#: ../src/main.c:150
+#, c-format
+msgid ""
+" FMT %%-syntax: artist, title, album,\n"
+" length, tracknumber, year, comment,\n"
+" copyright, elapsed\n"
+msgstr " FMT %%-句法：a藝人, t歌名, b專輯,\n l長度, n曲目, y年份, c評語,\n r版權, e已過時間\n"
 
-#: ../plugins/gtkui/gtkui.c:167
+#: ../src/main.c:153
 #, c-format
-msgid "1 day %d:%02d:%02d"
-msgstr "1 天 %d:%02d:%02d"
+msgid ""
+" example: --nowplaying \"%%a - %%t\" should print "
+"\"artist - title\"\n"
+msgstr "--nowplaying \"%%a - %%t\" 會顯示 \"藝人 - 歌名\"\n"
 
-#: ../plugins/gtkui/gtkui.c:170
+#: ../src/main.c:154
 #, c-format
-msgid "%d days %d:%02d:%02d"
-msgstr "%d 天 %d:%02d:%02d"
+msgid " for more info, see %s\n"
+msgstr "更多資訊請見 %s\n"
 
-#: ../plugins/gtkui/gtkui.c:179
+#: ../src/main.c:155
 #, c-format
-msgid "Stopped | %d tracks | %s total playtime"
-msgstr "停止 | 第 %d 軌 | 總播放時間：%s"
+msgid " NOTE: --nowplaying is deprecated.\n"
+msgstr "注意：--nowplaying 已經被遺棄。\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Mono"
-msgstr "單聲道"
+#: ../src/main.c:156
+#, c-format
+msgid ""
+" --nowplaying-tf FMT Print formatted track name to stdout, using the new "
+"title formatting\n"
+msgstr "--nowplaying-tf FMT 會使用新的標題格式將格式化的歌名輸出至 stdout\n"
 
-#: ../plugins/gtkui/gtkui.c:191 ../playlist.c:3212
-msgid "Stereo"
-msgstr "立體聲"
+#: ../src/main.c:157
+#, c-format
+msgid ""
+" FMT syntax: http://github.com/DeaDBeeF-"
+"Player/deadbeef/wiki/Title-formatting-2.0\n"
+msgstr " FMT 語法：http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"
 
-#: ../plugins/gtkui/gtkui.c:215
+#: ../src/main.c:158
 #, c-format
-msgid "| %4d kbps "
-msgstr "| %4d kbps "
+msgid ""
+" example: --nowplaying-tf \"%%artist%% - %%title%%\" "
+"should print \"artist - title\"\n"
+msgstr "例如：--nowplaying-tf \"%%artist%% - %%title%%\" 會顯示 \"藝人 - 歌名\"\n"
 
-#: ../plugins/gtkui/gtkui.c:221
-msgid "Paused | "
-msgstr "暫停 | "
+#: ../src/main.c:159
+#, c-format
+msgid " --volume NUM Print or set deadbeef volume level.\n"
+msgstr "--volume NUM 顯示或設定 deadbeef 的音量\n"
 
-#: ../plugins/gtkui/gtkui.c:226
+#: ../src/main.c:160
 #, c-format
 msgid ""
-"%s%s %s| %dHz | %d bit | %s | %d:%02d / %s | %d tracks | %s total playtime"
+" The NUM parameter can be specified in percents "
+"(absolute value or increment/decrement)\n"
 msgstr ""
-"%s%s %s| %dHz | %d 位元 | %s | %d:%02d / %s | 第 %d 首 | 總播放時間：%s"
 
-#: ../plugins/gtkui/gtkui.c:696 ../plugins/gtkui/fileman.c:41
-msgid "New Playlist"
-msgstr "新增播放清單"
+#: ../src/main.c:161
+#, c-format
+msgid " or in dB -50, 0 (if with suffix).\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:699
+#: ../src/main.c:162
 #, c-format
-msgid "New Playlist (%d)"
-msgstr "新增播放清單 (%d)"
+msgid ""
+" Examples: --volume 80, --volume +10, --volume -5 or "
+"--volume -20dB\n"
+msgstr ""
 
-#. register widget types
-#: ../plugins/gtkui/gtkui.c:956
-msgid "Playlist with tabs"
-msgstr "含分頁的播放清單"
+#: ../src/main.c:163
+#, c-format
+msgid ""
+" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to "
+"send commands to deadbeef itself.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:957 ../plugins/gtkui/interface.c:2042
-#: ../plugins/gtkui/deadbeef.glade.h:128
-msgid "Playlist"
-msgstr "播放清單"
+#: ../src/main.c:164
+#, c-format
+msgid ""
+" To get plugin specific commands use --plugin=PLUG "
+"--help\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:960
-msgid "Splitter (top and bottom)"
-msgstr "分隔線 (上與下)"
+#: ../src/main.c:165
+#, c-format
+msgid ""
+" --plugin-list List all available plugins including indication for "
+"plugins that support commands.\n"
+msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:961
-msgid "Splitter (left and right)"
-msgstr "分隔線 (左與右)"
+#: ../src/playlist.c:511 ../src/playlist.c:2533
+msgid "Default"
+msgstr "預設"
 
-#. w_reg_widget (_("Tabs"), 0, w_tabs_create, "tabs", NULL);
-#: ../plugins/gtkui/gtkui.c:964
-msgid "Playlist tabs"
-msgstr "播放清單分頁"
+#: ../src/playlist.c:3221 ../plugins/gtkui/widgets.c:2788
+msgid "Mono"
+msgstr "單聲道"
 
-#: ../plugins/gtkui/gtkui.c:965
-msgid "Selection properties"
-msgstr "選取屬性"
+#: ../src/playlist.c:3221
+msgid "Stereo"
+msgstr "立體聲"
 
-#: ../plugins/gtkui/gtkui.c:966
-msgid "Album art display"
-msgstr "顯示專輯封面"
+#: ../src/playlist.c:3744
+msgid "Yes"
+msgstr "是"
 
-#: ../plugins/gtkui/gtkui.c:967
-msgid "Scope"
-msgstr "範圍"
+#: ../src/playlist.c:3744
+msgid "No"
+msgstr "否"
 
-#: ../plugins/gtkui/gtkui.c:968
-msgid "Spectrum"
-msgstr "頻譜"
+#: ../plugins/converter/converter.glade.h:1
+#: ../plugins/converter/interface.c:103
+msgid "Output folder:"
+msgstr "輸出資料夾："
 
-#: ../plugins/gtkui/gtkui.c:969
-msgid "HBox"
-msgstr "HBox"
+#: ../plugins/converter/converter.glade.h:2
+#: ../plugins/converter/interface.c:120
+msgid "Write to source track folder"
+msgstr "寫入來源曲目資料夾"
 
-#: ../plugins/gtkui/gtkui.c:970
-msgid "VBox"
-msgstr "VBox"
+#: ../plugins/converter/converter.glade.h:3
+#: ../plugins/converter/interface.c:124
+msgid "Preserve folder structure"
+msgstr "保持資料夾結構"
 
-#: ../plugins/gtkui/gtkui.c:971 ../plugins/gtkui/widgets.c:3428
-msgid "Button"
-msgstr "按鈕"
+#: ../plugins/converter/converter.glade.h:4
+#: ../plugins/converter/interface.c:128
+msgid "Copy if the format is not changing"
+msgstr "當格式沒改變時複製來源"
+
+#: ../plugins/converter/converter.glade.h:5
+#: ../plugins/converter/interface.c:132
+msgid "Re-tag after copy"
+msgstr "複製後重新標注"
 
-#: ../plugins/gtkui/gtkui.c:972
-msgid "Seekbar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:6
+#: ../plugins/converter/interface.c:140
+msgid "Output file name:"
+msgstr "輸出檔案名稱："
 
-#: ../plugins/gtkui/gtkui.c:973
-msgid "Playback controls"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:8
+#: ../plugins/converter/interface.c:151
+#, no-c-format
+msgid ""
+"Extension (e.g. .mp3) will be appended automatically.\n"
+"Leave the field empty for default (%tracknumber%. %artist% - %title%)."
+msgstr "副檔名（例如 .mp3）會自動補上。\n留白代表使用預設值（%tracknumber%. %artist% - %title%）。"
 
-#: ../plugins/gtkui/gtkui.c:974
-msgid "Volume bar"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:10
+#: ../plugins/converter/interface.c:164
+msgid "Encoder:"
+msgstr "編碼器："
 
-#: ../plugins/gtkui/gtkui.c:975
-msgid "Chiptune voices"
-msgstr ""
+#: ../plugins/converter/converter.glade.h:11
+#: ../plugins/converter/interface.c:188
+msgid "DSP preset:"
+msgstr "DSP 預設值："
 
-#: ../plugins/gtkui/gtkui.c:1150
-msgid "Failed while reading help file"
-msgstr "未能讀取說明檔案"
+#: ../plugins/converter/converter.glade.h:12
+#: ../plugins/converter/interface.c:211
+msgid "Number of threads:"
+msgstr "執行緒數量："
 
-#: ../plugins/gtkui/gtkui.c:1160
-msgid "Failed to load help file"
-msgstr "未能載入說明檔案"
+#: ../plugins/converter/converter.glade.h:13
+#: ../plugins/converter/interface.c:224
+msgid "Output sample format:"
+msgstr "輸出取樣格式："
 
-#: ../plugins/gtkui/gtkui.c:1171
+#: ../plugins/converter/converter.glade.h:14
 msgid ""
-"The player is currently running background tasks. If you quit now, the tasks "
-"will be cancelled or interrupted. This may result in data loss."
+"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 "保持來源格式\n8 bit signed int\n16 bit signed int\n24 bit signed int\n32 bit signed int\n32 bit float"
+
+#: ../plugins/converter/converter.glade.h:20
+#: ../plugins/converter/interface.c:242
+msgid "When file exists:"
+msgstr "有同名檔案時："
+
+#: ../plugins/converter/converter.glade.h:21
+msgid ""
+"Skip\n"
+"Prompt\n"
+"Overwrite"
+msgstr "略過\n提示\n覆蓋"
+
+#: ../plugins/converter/converter.glade.h:24
+#: ../plugins/converter/interface.c:402
+msgid "Edit Encoder Preset"
+msgstr "編輯編碼器預設值"
+
+#: ../plugins/converter/converter.glade.h:25
+#: ../plugins/converter/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/gtkui.c:588 ../plugins/gtkui/interface.c:1335
+#: ../plugins/gtkui/interface.c:4010 ../plugins/gtkui/widgets.c:1675
+#: ../plugins/shellexecui/interface.c:163
+#: ../plugins/shellexecui/shellexec.glade.h:7
+msgid "Title:"
+msgstr "名稱："
+
+#: ../plugins/converter/converter.glade.h:26
+#: ../plugins/converter/interface.c:425
+msgid "Untitled Encoder"
+msgstr "未命名編碼器"
+
+#: ../plugins/converter/converter.glade.h:27
+#: ../plugins/converter/interface.c:433
+msgid "Output file extension:"
+msgstr "輸出檔案副檔名："
+
+#: ../plugins/converter/converter.glade.h:28
+#: ../plugins/converter/interface.c:440
+msgid "E.g. mp3"
+msgstr "例如 mp3"
+
+#: ../plugins/converter/converter.glade.h:29
+#: ../plugins/converter/interface.c:448
+msgid "Command line:"
+msgstr "指令列："
+
+#: ../plugins/converter/converter.glade.h:31
+#: ../plugins/converter/interface.c:459
+#, no-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/converter.glade.h:34
+#: ../plugins/converter/interface.c:469
+#, no-c-format
+msgid ""
+"%o - output file name\n"
+"%i - temporary input file name"
+msgstr "%o - 輸出檔案名稱\n%i - 臨時輸入檔案名稱"
+
+#: ../plugins/converter/converter.glade.h:36
+#: ../plugins/converter/interface.c:478
+msgid "Method:"
+msgstr "方法："
+
+#: ../plugins/converter/converter.glade.h:37
+msgid ""
+"Pipe\n"
+"Temp File\n"
+"Source File"
 msgstr ""
 
-#: ../plugins/gtkui/gtkui.c:1173
-msgid "Do you still want to quit?"
-msgstr "仍然要退出？"
+#: ../plugins/converter/converter.glade.h:40
+#: ../plugins/converter/interface.c:504
+msgid "APEv2"
+msgstr "APEv2"
+
+#: ../plugins/converter/converter.glade.h:41
+#: ../plugins/converter/interface.c:510
+msgid "ID3v1"
+msgstr "ID3v1"
+
+#: ../plugins/converter/converter.glade.h:42
+#: ../plugins/converter/interface.c:516
+msgid "OggVorbis"
+msgstr "OggVorbis"
+
+#: ../plugins/converter/converter.glade.h:43
+#: ../plugins/converter/interface.c:522
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../plugins/converter/converter.glade.h:44
+#: ../plugins/converter/interface.c:534
+msgid "ID3v2"
+msgstr "ID3v2"
+
+#: ../plugins/converter/converter.glade.h:45
+#: ../plugins/converter/interface.c:544
+msgid "MP4"
+msgstr "MP4"
 
-#: ../plugins/gtkui/gtkui.c:1174 ../plugins/gtkui/prefwin.c:351
-#: ../plugins/gtkui/trkproperties.c:171 ../plugins/converter/convgui.c:891
-#: ../plugins/converter/convgui.c:1462 ../plugins/gtkui/actionhandlers.c:550
+#: ../plugins/converter/converter.glade.h:46
+#: ../plugins/converter/interface.c:550
+msgid "Tag writer"
+msgstr "標籤寫入器"
+
+#: ../plugins/converter/converter.glade.h:47
+#: ../plugins/converter/interface.c:637
+msgid "DSP Preset Editor"
+msgstr "DSP 預設值編輯"
+
+#: ../plugins/converter/converter.glade.h:48
+#: ../plugins/converter/convgui.c:1195 ../plugins/converter/convgui.c:1763
+#: ../plugins/converter/interface.c:653 ../plugins/gtkui/deadbeef.glade.h:20
+#: ../plugins/gtkui/interface.c:259
+#: ../plugins/gtkui/playlist/mainplaylist.c:235
+#: ../plugins/gtkui/playlist/plcommon.c:79
+#: ../plugins/gtkui/playlist/searchplaylist.c:193
+#: ../plugins/gtkui/prefwin/prefwinplugins.c:275
+#: ../plugins/shellexecui/shellexecui.c:324
+msgid "Title"
+msgstr "標題"
+
+#: ../plugins/converter/converter.glade.h:49
+#: ../plugins/converter/interface.c:660
+msgid "Untitled DSP Preset"
+msgstr "未命名 DSP 預設值"
+
+#: ../plugins/converter/converter.glade.h:50
+#: ../plugins/converter/interface.c:672 ../plugins/shellexecui/interface.c:62
+#: ../plugins/shellexecui/shellexec.glade.h:3
+msgid "Add"
+msgstr "加入"
+
+#: ../plugins/converter/converter.glade.h:51
+#: ../plugins/converter/interface.c:676 ../plugins/gtkui/deadbeef.glade.h:16
+#: ../plugins/gtkui/interface.c:236 ../plugins/gtkui/interface.c:5426
+#: ../plugins/gtkui/plmenu.c:597 ../plugins/shellexecui/interface.c:66
+#: ../plugins/shellexecui/shellexec.glade.h:4
+msgid "Remove"
+msgstr "移除"
+
+#: ../plugins/converter/converter.glade.h:52
+#: ../plugins/converter/interface.c:680
+msgid "Configure"
+msgstr "設定"
+
+#: ../plugins/converter/converter.glade.h:53
+#: ../plugins/converter/interface.c:781 ../plugins/gtkui/deadbeef.glade.h:211
+#: ../plugins/gtkui/interface.c:4482
+msgid "Select DSP Plugin"
+msgstr "選取 DSP 外掛程式"
+
+#: ../plugins/converter/converter.glade.h:54
+#: ../plugins/converter/convgui.c:1499 ../plugins/converter/interface.c:797
+#: ../plugins/gtkui/deadbeef.glade.h:212 ../plugins/gtkui/dspconfig.c:293
+#: ../plugins/gtkui/interface.c:4498
+msgid "Plugin"
+msgstr "外掛程式"
+
+#: ../plugins/converter/converter.glade.h:55
+#: ../plugins/converter/interface.c:852 ../plugins/gtkui/eq.c:341
+msgid "Presets"
+msgstr "預設值"
+
+#: ../plugins/converter/convgui.c:92
+#, c-format
+msgid "Built-in %s"
+msgstr " 內建 %s"
+
+#: ../plugins/converter/convgui.c:146
+msgid "The file already exists. Overwrite?"
+msgstr "已有該檔案。是否覆寫？"
+
+#: ../plugins/converter/convgui.c:148
+msgid "Converter warning"
+msgstr "轉檔器警告"
+
+#: ../plugins/converter/convgui.c:322
+msgid "Please select encoder"
+msgstr "請選取編碼器"
+
+#: ../plugins/converter/convgui.c:324
+msgid "Converter error"
+msgstr "轉檔器出錯"
+
+#: ../plugins/converter/convgui.c:348
+msgid "Converting..."
+msgstr "正在轉檔…"
+
+#: ../plugins/converter/convgui.c:703
+msgid "Select folder..."
+msgstr "選取資料夾…"
+
+#: ../plugins/converter/convgui.c:969
+msgid "Failed to save encoder preset"
+msgstr "未能儲存編碼器預設值"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid ""
+"Check preset folder permissions, try to pick different title, or free up "
+"some disk space"
+msgstr "檢查預設值資料夾權限、嘗試揀選另一個歌名，又或空出一些磁碟空間"
+
+#: ../plugins/converter/convgui.c:971 ../plugins/converter/convgui.c:1542
+msgid "Preset with the same name already exists. Try to pick another title."
+msgstr "已有同名預設值。請揀選另一個。"
+
+#: ../plugins/converter/convgui.c:972 ../plugins/converter/convgui.c:1543
+#: ../plugins/gtkui/ctmapping.c:203 ../plugins/gtkui/ctmapping.c:231
+#: ../plugins/gtkui/ctmapping.c:263
+msgid "Error"
+msgstr "錯誤"
+
+#: ../plugins/converter/convgui.c:1026 ../plugins/converter/convgui.c:1170
+msgid "Add new encoder"
+msgstr "加入新編碼器"
+
+#: ../plugins/converter/convgui.c:1056
+msgid "Edit encoder"
+msgstr "編輯編碼器"
+
+#: ../plugins/converter/convgui.c:1088 ../plugins/converter/convgui.c:1684
+msgid "Remove preset"
+msgstr "移除預設值"
+
+#: ../plugins/converter/convgui.c:1090 ../plugins/converter/convgui.c:1686
+msgid "This action will delete the selected preset. Are you sure?"
+msgstr "此舉會刪除所選預設值。確定嗎？"
+
+#: ../plugins/converter/convgui.c:1091 ../plugins/converter/convgui.c:1687
+#: ../plugins/gtkui/gtkui.c:614 ../plugins/gtkui/gtkui.c:1715
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:71
+#: ../plugins/gtkui/prefwin/prefwin.c:143 ../plugins/gtkui/trkproperties.c:119
 msgid "Warning"
 msgstr "警告"
 
-#: ../plugins/gtkui/interface.c:131 ../plugins/gtkui/deadbeef.glade.h:1
+#: ../plugins/converter/convgui.c:1185
+msgid "Encoders"
+msgstr "編碼器"
+
+#: ../plugins/converter/convgui.c:1260
+msgid "Add plugin to DSP chain"
+msgstr "將外掛程式加入至 DSP 連鎖"
+
+#: ../plugins/converter/convgui.c:1541
+msgid "Failed to save DSP preset"
+msgstr "未能儲存 DSP 預設值"
+
+#: ../plugins/converter/convgui.c:1605 ../plugins/converter/convgui.c:1650
+msgid "New DSP Preset"
+msgstr "新增 DSP 預設值"
+
+#: ../plugins/converter/convgui.c:1734
+msgid "Edit DSP Preset"
+msgstr "編輯 DSP 預設值"
+
+#: ../plugins/converter/convgui.c:1754
+msgid "DSP Presets"
+msgstr "DSP 預設值"
+
+#: ../plugins/converter/convgui.c:1792 ../plugins/converter/convgui.c:1800
+#: ../plugins/gtkui/actionhandlers.c:322 ../plugins/gtkui/callbacks.c:647
+#: ../plugins/gtkui/deadbeef.glade.h:62 ../plugins/gtkui/interface.c:976
+#: ../translation/plugins.c:176
+#, no-c-format
+msgid "Help"
+msgstr "說明"
+
+#: ../plugins/converter/interface.c:231
+msgid "Keep source format"
+msgstr "保持來源格式"
+
+#: ../plugins/converter/interface.c:232
+msgid "8 bit signed int"
+msgstr "8 位元帶正負整數"
+
+#: ../plugins/converter/interface.c:233
+msgid "16 bit signed int"
+msgstr "16 位元帶正負整數"
+
+#: ../plugins/converter/interface.c:234
+msgid "24 bit signed int"
+msgstr "24 位元帶正負整數"
+
+#: ../plugins/converter/interface.c:235
+msgid "32 bit signed int"
+msgstr "32 位元帶正負整數"
+
+#: ../plugins/converter/interface.c:236 ../plugins/gtkui/interface.c:1898
+msgid "32 bit float"
+msgstr "32 位元浮點數"
+
+#: ../plugins/converter/interface.c:249
+msgid "Skip"
+msgstr "略過"
+
+#: ../plugins/converter/interface.c:250
+msgid "Prompt"
+msgstr "提示"
+
+#: ../plugins/converter/interface.c:251
+msgid "Overwrite"
+msgstr "覆寫"
+
+#: ../plugins/converter/interface.c:485
+msgid "Pipe"
+msgstr "管線"
+
+#: ../plugins/converter/interface.c:486
+msgid "Temp File"
+msgstr "暫存檔案"
+
+#: ../plugins/converter/interface.c:487
+msgid "Source File"
+msgstr "來源檔案"
+
+#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
+#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr "找不 pixmap 檔案：%s"
+
+#: ../plugins/gtkui/actionhandlers.c:59
+msgid "Open file(s)..."
+msgstr "開啟檔案…"
+
+#: ../plugins/gtkui/actionhandlers.c:74
+msgid "Add file(s) to playlist..."
+msgstr "新增檔案至播放清單…"
+
+#: ../plugins/gtkui/actionhandlers.c:89
+msgid "Add folder(s) to playlist..."
+msgstr "新增資料夾至播放清單…"
+
+#: ../plugins/gtkui/actionhandlers.c:321
+msgid "help.txt"
+msgstr "help.txt"
+
+#: ../plugins/gtkui/actionhandlers.c:509 ../translation/plugins.c:222
+#, no-c-format
+msgid "Load Playlist"
+msgstr "載入播放清單"
+
+#: ../plugins/gtkui/actionhandlers.c:531
+msgid "Save Playlist As"
+msgstr "儲存播放清單"
+
+#: ../plugins/gtkui/callbacks.c:363
+#, c-format
+msgid "About DeaDBeeF %s"
+msgstr "關於 DeaDBeeF %s"
+
+#: ../plugins/gtkui/callbacks.c:376
+#, c-format
+msgid "DeaDBeeF %s ChangeLog"
+msgstr "DeaDBeeF %s 更新日誌"
+
+#: ../plugins/gtkui/callbacks.c:636
+#, c-format
+msgid "DeaDBeeF Translators"
+msgstr "DeaDBeeF 譯者"
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:388
+msgid "Playing Track"
+msgstr ""
+
+#: ../plugins/gtkui/covermanager/albumartwidget.c:392
+msgid "Selected Track"
+msgstr ""
+
+#: ../plugins/gtkui/ctmapping.c:130
+msgid "Content-Type"
+msgstr "內容類型"
+
+#: ../plugins/gtkui/ctmapping.c:132 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/interface.c:3319
+msgid "Plugins"
+msgstr "外掛程式"
+
+#: ../plugins/gtkui/ctmapping.c:200
+msgid "Invalid value(s)."
+msgstr "無效的數值"
+
+#: ../plugins/gtkui/ctmapping.c:201
+msgid ""
+"Content-type and Plugins fields must be non-empty, and comply with the rules.\n"
+"Example content-type: 'audio/mpeg'.\n"
+"Example plugin ids: 'stdmpg ffmpeg'.\n"
+"Spaces must be used as separators in plugin ids list.\n"
+"Content type should be only letters, numbers and '-' sign.\n"
+"Plugin id can contain only letters and numbers."
+msgstr "內容類型和外掛程式欄位不得留白，而且必須遵守規則。\n內容類型範例：audio/mpeg\n外掛程式範例：stdmpg ffmpeg\n你可以指定多個外掛程式，但中間必須用半形空白隔開。\n內容類型欄位只能填入字母、數字和「-」符號。\n外掛程式欄位只能填入字母和數字。"
+
+#: ../plugins/gtkui/ctmapping.c:229 ../plugins/gtkui/ctmapping.c:261
+msgid "Nothing is selected."
+msgstr "沒有選擇項目"
+
+#: ../plugins/gtkui/deadbeef.glade.h:1 ../plugins/gtkui/interface.c:132
 msgid "_File"
-msgstr "檔案(_F)"
+msgstr "檔案 (_F)"
 
-#: ../plugins/gtkui/interface.c:138 ../plugins/gtkui/deadbeef.glade.h:2
+#: ../plugins/gtkui/deadbeef.glade.h:2 ../plugins/gtkui/interface.c:139
 msgid "_Open file(s)"
-msgstr "開啟檔案(_O)"
+msgstr "開啟檔案 (_O)"
 
-#: ../plugins/gtkui/interface.c:151 ../plugins/gtkui/deadbeef.glade.h:3
+#: ../plugins/gtkui/deadbeef.glade.h:3 ../plugins/gtkui/interface.c:152
 msgid "Add file(s)"
 msgstr "加入檔案"
 
-#: ../plugins/gtkui/interface.c:159 ../plugins/gtkui/deadbeef.glade.h:4
+#: ../plugins/gtkui/deadbeef.glade.h:4 ../plugins/gtkui/interface.c:160
 msgid "Add folder(s)"
 msgstr "加入資料夾"
 
-#: ../plugins/gtkui/interface.c:167 ../plugins/gtkui/interface.c:3199
-#: ../plugins/gtkui/deadbeef.glade.h:5
+#: ../plugins/gtkui/deadbeef.glade.h:5 ../plugins/gtkui/interface.c:168
+#: ../plugins/gtkui/interface.c:4113
 msgid "Add location"
-msgstr "加入位址"
+msgstr "添加位置"
 
-#: ../plugins/gtkui/interface.c:176 ../plugins/gtkui/deadbeef.glade.h:6
+#: ../plugins/gtkui/deadbeef.glade.h:6 ../plugins/gtkui/interface.c:177
 msgid "New playlist"
 msgstr "新播放清單"
 
-#: ../plugins/gtkui/interface.c:180 ../plugins/gtkui/deadbeef.glade.h:7
+#: ../plugins/gtkui/deadbeef.glade.h:7 ../plugins/gtkui/interface.c:181
 msgid "Load playlist"
 msgstr "載入播放清單"
 
-#: ../plugins/gtkui/interface.c:184 ../plugins/gtkui/deadbeef.glade.h:8
+#: ../plugins/gtkui/deadbeef.glade.h:8 ../plugins/gtkui/interface.c:185
 msgid "Save playlist"
 msgstr "儲存播放清單"
 
-#: ../plugins/gtkui/interface.c:193 ../plugins/gtkui/deadbeef.glade.h:9
+#: ../plugins/gtkui/deadbeef.glade.h:9 ../plugins/gtkui/interface.c:194
 msgid "_Quit"
-msgstr "結束(_Q)"
+msgstr "結束 (_Q)"
 
-#: ../plugins/gtkui/interface.c:201 ../plugins/gtkui/deadbeef.glade.h:10
+#: ../plugins/gtkui/deadbeef.glade.h:10 ../plugins/gtkui/interface.c:202
 msgid "_Edit"
-msgstr "編輯(_E)"
+msgstr "編輯 (_E)"
 
-#: ../plugins/gtkui/interface.c:208 ../plugins/gtkui/deadbeef.glade.h:11
+#: ../plugins/gtkui/deadbeef.glade.h:11 ../plugins/gtkui/interface.c:209
 msgid "_Clear"
-msgstr "清除(_C)"
+msgstr "清除 (_C)"
 
-#: ../plugins/gtkui/interface.c:216 ../plugins/gtkui/deadbeef.glade.h:12
+#: ../plugins/gtkui/deadbeef.glade.h:12 ../plugins/gtkui/interface.c:217
 msgid "Select all"
 msgstr "全選"
 
-#: ../plugins/gtkui/interface.c:220 ../plugins/gtkui/deadbeef.glade.h:13
+#: ../plugins/gtkui/deadbeef.glade.h:13 ../plugins/gtkui/interface.c:221
 msgid "Deselect all"
-msgstr "全部取消選取"
+msgstr "取消全選"
 
-#: ../plugins/gtkui/interface.c:224 ../plugins/gtkui/deadbeef.glade.h:14
+#: ../plugins/gtkui/deadbeef.glade.h:14 ../plugins/gtkui/interface.c:225
 msgid "Invert selection"
 msgstr "反向選取"
 
-#: ../plugins/gtkui/interface.c:228 ../plugins/gtkui/deadbeef.glade.h:15
+#: ../plugins/gtkui/deadbeef.glade.h:15 ../plugins/gtkui/interface.c:229
 msgid "Selection"
 msgstr "選取"
 
-#: ../plugins/gtkui/interface.c:235 ../plugins/gtkui/plcommon.c:660
-#: ../plugins/gtkui/deadbeef.glade.h:16 ../plugins/converter/interface.c:629
-#: ../plugins/converter/converter.glade.h:46
-#: ../plugins/shellexecui/interface.c:66
-#: ../plugins/shellexecui/shellexec.glade.h:4
-msgid "Remove"
-msgstr "移除"
-
-#: ../plugins/gtkui/interface.c:243 ../plugins/gtkui/deadbeef.glade.h:17
+#: ../plugins/gtkui/deadbeef.glade.h:17 ../plugins/gtkui/interface.c:244
+#: ../plugins/gtkui/interface.c:5430
 msgid "Crop"
 msgstr "剪裁"
 
-#: ../plugins/gtkui/interface.c:247 ../plugins/gtkui/deadbeef.glade.h:18
+#: ../plugins/gtkui/deadbeef.glade.h:18 ../plugins/gtkui/interface.c:248
 msgid "_Find"
-msgstr "尋找(_F)"
+msgstr "尋找 (_F)"
 
-#: ../plugins/gtkui/interface.c:251 ../plugins/gtkui/deadbeef.glade.h:19
+#: ../plugins/gtkui/deadbeef.glade.h:19 ../plugins/gtkui/interface.c:252
 msgid "Sort by"
 msgstr "排序依據"
 
-#: ../plugins/gtkui/interface.c:258 ../plugins/gtkui/interface.c:1349
-#: ../plugins/gtkui/mainplaylist.c:355 ../plugins/gtkui/prefwin.c:327
-#: ../plugins/gtkui/search.c:421 ../plugins/gtkui/deadbeef.glade.h:20
-#: ../plugins/converter/convgui.c:984 ../plugins/converter/convgui.c:1538
-#: ../plugins/converter/interface.c:606
-#: ../plugins/converter/converter.glade.h:43
-#: ../plugins/shellexecui/shellexecui.c:324
-msgid "Title"
-msgstr "歌名"
-
-#: ../plugins/gtkui/interface.c:262 ../plugins/gtkui/deadbeef.glade.h:21
+#: ../plugins/gtkui/deadbeef.glade.h:21 ../plugins/gtkui/interface.c:263
 msgid "Track number"
-msgstr "曲號"
+msgstr "曲目"
 
-#: ../plugins/gtkui/interface.c:266 ../plugins/gtkui/interface.c:1348
-#: ../plugins/gtkui/interface.c:1759 ../plugins/gtkui/deadbeef.glade.h:22
-#: ../translation/extra.c:73
+#: ../plugins/gtkui/deadbeef.glade.h:22 ../plugins/gtkui/interface.c:267
+#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/playlist/plcommon.c:78
+#: ../translation/extra.c:6
 msgid "Album"
 msgstr "專輯"
 
 #. Track properties dialog
-#: ../plugins/gtkui/interface.c:270 ../plugins/gtkui/interface.c:1347
-#: ../plugins/gtkui/plcommon.c:1254 ../plugins/gtkui/deadbeef.glade.h:23
-#: ../translation/extra.c:69
+#: ../plugins/gtkui/deadbeef.glade.h:23 ../plugins/gtkui/interface.c:271
+#: ../plugins/gtkui/playlist/plcommon.c:77
+#: ../plugins/gtkui/playlist/plcommon.c:904 ../translation/extra.c:2
 msgid "Artist"
 msgstr "藝人"
 
-#: ../plugins/gtkui/interface.c:274 ../plugins/gtkui/deadbeef.glade.h:24
-#: ../translation/extra.c:74
+#: ../plugins/gtkui/deadbeef.glade.h:24 ../plugins/gtkui/interface.c:275
+#: ../translation/extra.c:7
 msgid "Date"
 msgstr "日期"
 
-#: ../plugins/gtkui/interface.c:278 ../plugins/gtkui/interface.c:346
-#: ../plugins/gtkui/deadbeef.glade.h:25
+#: ../plugins/gtkui/deadbeef.glade.h:25 ../plugins/gtkui/interface.c:279
 msgid "Random"
 msgstr "隨機"
 
-#: ../plugins/gtkui/interface.c:282 ../plugins/gtkui/interface.c:1353
-#: ../plugins/gtkui/plcommon.c:1258 ../plugins/gtkui/deadbeef.glade.h:26
+#: ../plugins/gtkui/deadbeef.glade.h:26 ../plugins/gtkui/interface.c:283
+#: ../plugins/gtkui/playlist/plcommon.c:86
+#: ../plugins/gtkui/playlist/plcommon.c:908
 msgid "Custom"
 msgstr "自訂"
 
-#: ../plugins/gtkui/interface.c:291 ../plugins/gtkui/interface.c:1684
-#: ../plugins/gtkui/deadbeef.glade.h:27
+#: ../plugins/gtkui/deadbeef.glade.h:27 ../plugins/gtkui/interface.c:292
+#: ../plugins/gtkui/interface.c:1829 ../translation/plugins.c:212
+#, no-c-format
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../plugins/gtkui/interface.c:295 ../plugins/gtkui/deadbeef.glade.h:28
+#: ../plugins/gtkui/deadbeef.glade.h:28 ../plugins/gtkui/interface.c:296
 msgid "_View"
-msgstr "檢視(_V)"
+msgstr "檢視 (_V)"
 
-#: ../plugins/gtkui/interface.c:302 ../plugins/gtkui/deadbeef.glade.h:29
+#: ../plugins/gtkui/deadbeef.glade.h:29 ../plugins/gtkui/interface.c:303
 msgid "Status bar"
-msgstr "狀態列"
+msgstr "狀態欄"
 
-#: ../plugins/gtkui/interface.c:306 ../plugins/gtkui/deadbeef.glade.h:30
+#: ../plugins/gtkui/deadbeef.glade.h:30 ../plugins/gtkui/interface.c:307
 msgid "Equalizer"
 msgstr "等化器"
 
-#: ../plugins/gtkui/interface.c:310 ../plugins/gtkui/deadbeef.glade.h:31
+#: ../plugins/gtkui/deadbeef.glade.h:31 ../plugins/gtkui/interface.c:311
 msgid "Design mode"
 msgstr "設計模式"
 
-#: ../plugins/gtkui/interface.c:314 ../plugins/gtkui/deadbeef.glade.h:32
+#: ../plugins/gtkui/deadbeef.glade.h:32 ../plugins/gtkui/interface.c:315
+msgid "Log"
+msgstr "日誌"
+
+#: ../plugins/gtkui/deadbeef.glade.h:33 ../plugins/gtkui/interface.c:319
 msgid "_Playback"
-msgstr "播放(_P)"
+msgstr "播放 (_P)"
 
-#: ../plugins/gtkui/interface.c:321 ../plugins/gtkui/interface.c:3495
-#: ../plugins/gtkui/deadbeef.glade.h:33
-msgid "Order"
-msgstr "順序"
+#: ../plugins/gtkui/deadbeef.glade.h:34 ../plugins/gtkui/interface.c:326
+msgid "Shuffle"
+msgstr "跳躍"
+
+#: ../plugins/gtkui/deadbeef.glade.h:35 ../plugins/gtkui/interface.c:333
+#: ../plugins/gtkui/interface.c:376
+msgid "Off"
+msgstr "關閉"
+
+#: ../plugins/gtkui/deadbeef.glade.h:36 ../plugins/gtkui/interface.c:339
+msgid "Tracks"
+msgstr "曲目"
+
+#: ../plugins/gtkui/deadbeef.glade.h:37 ../plugins/gtkui/interface.c:345
+msgid "Albums"
+msgstr "專輯"
 
-#: ../plugins/gtkui/interface.c:328 ../plugins/gtkui/deadbeef.glade.h:34
-msgid "Linear"
-msgstr "線性"
-
-#: ../plugins/gtkui/interface.c:334 ../plugins/gtkui/deadbeef.glade.h:35
-msgid "Shuffle tracks"
-msgstr "調亂歌曲"
-
-#: ../plugins/gtkui/interface.c:340 ../plugins/gtkui/deadbeef.glade.h:36
-msgid "Shuffle albums"
-msgstr "調亂專輯"
-
-#: ../plugins/gtkui/interface.c:352 ../plugins/gtkui/deadbeef.glade.h:37
-msgid "Looping"
-msgstr "重複"
-
-#: ../plugins/gtkui/interface.c:359 ../plugins/gtkui/deadbeef.glade.h:38
-msgid "Loop all"
-msgstr "重複全部"
-
-#: ../plugins/gtkui/interface.c:365 ../plugins/gtkui/deadbeef.glade.h:39
-msgid "Loop single song"
-msgstr "重複單一曲目"
-
-#: ../plugins/gtkui/interface.c:371 ../plugins/gtkui/deadbeef.glade.h:40
-msgid "Don't loop"
-msgstr "不要重複播放"
+#: ../plugins/gtkui/deadbeef.glade.h:38 ../plugins/gtkui/interface.c:351
+msgid "Random Tracks"
+msgstr "隨機曲目"
+
+#: ../plugins/gtkui/deadbeef.glade.h:39 ../plugins/gtkui/interface.c:357
+msgid "Repeat"
+msgstr "重複播放"
+
+#: ../plugins/gtkui/deadbeef.glade.h:40 ../plugins/gtkui/interface.c:364
+msgid "All Tracks"
+msgstr "全部曲目"
+
+#: ../plugins/gtkui/deadbeef.glade.h:41 ../plugins/gtkui/interface.c:370
+msgid "One Track"
+msgstr "單一曲目"
 
-#: ../plugins/gtkui/interface.c:377 ../plugins/gtkui/deadbeef.glade.h:41
+#: ../plugins/gtkui/deadbeef.glade.h:42 ../plugins/gtkui/interface.c:382
 msgid "Scroll follows playback"
 msgstr "隨播放捲動"
 
-#: ../plugins/gtkui/interface.c:382 ../plugins/gtkui/deadbeef.glade.h:42
+#: ../plugins/gtkui/deadbeef.glade.h:43 ../plugins/gtkui/interface.c:387
 msgid "Cursor follows playback"
 msgstr "隨播放移動游標"
 
-#: ../plugins/gtkui/interface.c:386 ../plugins/gtkui/deadbeef.glade.h:43
+#: ../plugins/gtkui/deadbeef.glade.h:44 ../plugins/gtkui/interface.c:391
 msgid "Stop after current track"
-msgstr ""
+msgstr "播放當前曲目後停止"
 
-#: ../plugins/gtkui/interface.c:390 ../plugins/gtkui/deadbeef.glade.h:44
+#: ../plugins/gtkui/deadbeef.glade.h:45 ../plugins/gtkui/interface.c:395
 msgid "Stop after current album"
-msgstr ""
+msgstr "播放完此專輯後停止"
 
-#: ../plugins/gtkui/interface.c:399 ../plugins/gtkui/deadbeef.glade.h:45
+#: ../plugins/gtkui/deadbeef.glade.h:46 ../plugins/gtkui/interface.c:404
 msgid "Jump to current track"
-msgstr "跳至當前歌曲"
+msgstr "跳至當前曲目"
 
-#: ../plugins/gtkui/interface.c:403 ../plugins/gtkui/interface.c:410
-#: ../plugins/gtkui/deadbeef.glade.h:46
+#: ../plugins/gtkui/deadbeef.glade.h:47 ../plugins/gtkui/interface.c:408
+#: ../plugins/gtkui/interface.c:415
 msgid "_Help"
-msgstr "說明(_H)"
+msgstr "說明 (_H)"
 
-#: ../plugins/gtkui/interface.c:418 ../plugins/gtkui/deadbeef.glade.h:47
+#: ../plugins/gtkui/deadbeef.glade.h:48 ../plugins/gtkui/interface.c:423
 msgid "_ChangeLog"
-msgstr "_ChangeLog"
+msgstr "更新日誌 (_C)"
 
-#: ../plugins/gtkui/interface.c:427 ../plugins/gtkui/deadbeef.glade.h:48
+#: ../plugins/gtkui/deadbeef.glade.h:49 ../plugins/gtkui/interface.c:432
 msgid "_GPLv2"
 msgstr "_GPLv2"
 
-#: ../plugins/gtkui/interface.c:431 ../plugins/gtkui/deadbeef.glade.h:49
+#: ../plugins/gtkui/deadbeef.glade.h:50 ../plugins/gtkui/interface.c:436
 msgid "_LGPLv2.1"
 msgstr "_LGPLv2.1"
 
-#: ../plugins/gtkui/interface.c:440 ../plugins/gtkui/deadbeef.glade.h:50
+#: ../plugins/gtkui/deadbeef.glade.h:51 ../plugins/gtkui/interface.c:445
 msgid "_About"
-msgstr "關於(_A)"
+msgstr "關於 (_A)"
 
-#: ../plugins/gtkui/interface.c:448 ../plugins/gtkui/deadbeef.glade.h:51
+#: ../plugins/gtkui/deadbeef.glade.h:52 ../plugins/gtkui/interface.c:453
 msgid "_Translators"
-msgstr "翻譯者(_T)"
+msgstr "翻譯者 (_T)"
 
-#: ../plugins/gtkui/interface.c:713 ../plugins/gtkui/deadbeef.glade.h:52
+#: ../plugins/gtkui/deadbeef.glade.h:53 ../plugins/gtkui/interface.c:722
 msgid "Search"
 msgstr "搜尋"
 
-#: ../plugins/gtkui/interface.c:785 ../plugins/gtkui/deadbeef.glade.h:53
+#: ../plugins/gtkui/deadbeef.glade.h:54 ../plugins/gtkui/interface.c:794
+#: ../translation/plugins.c:347
+#, no-c-format
 msgid "Stop"
 msgstr "停止"
 
-#: ../plugins/gtkui/interface.c:793 ../plugins/gtkui/deadbeef.glade.h:54
+#: ../plugins/gtkui/deadbeef.glade.h:55 ../plugins/gtkui/interface.c:802
+#: ../translation/plugins.c:345
+#, no-c-format
 msgid "Play"
 msgstr "播放"
 
-#: ../plugins/gtkui/interface.c:801 ../plugins/gtkui/deadbeef.glade.h:55
+#: ../plugins/gtkui/deadbeef.glade.h:56 ../plugins/gtkui/interface.c:810
 msgid "Pause"
 msgstr "暫停"
 
-#: ../plugins/gtkui/interface.c:809 ../plugins/gtkui/deadbeef.glade.h:56
+#: ../plugins/gtkui/deadbeef.glade.h:57 ../plugins/gtkui/interface.c:818
+#: ../translation/plugins.c:349
+#, no-c-format
 msgid "Previous"
 msgstr "上一首"
 
-#: ../plugins/gtkui/interface.c:817 ../plugins/gtkui/deadbeef.glade.h:57
+#: ../plugins/gtkui/deadbeef.glade.h:58 ../plugins/gtkui/interface.c:826
+#: ../translation/plugins.c:351
+#, no-c-format
 msgid "Next"
 msgstr "下一首"
 
-#: ../plugins/gtkui/interface.c:825 ../plugins/gtkui/deadbeef.glade.h:58
+#: ../plugins/gtkui/deadbeef.glade.h:59 ../plugins/gtkui/interface.c:834
+#: ../translation/plugins.c:357
+#, no-c-format
 msgid "Play Random"
 msgstr "隨機播放"
 
-#: ../plugins/gtkui/interface.c:834 ../plugins/gtkui/deadbeef.glade.h:59
+#: ../plugins/gtkui/deadbeef.glade.h:60 ../plugins/gtkui/interface.c:843
 msgid "About"
 msgstr "關於"
 
-#: ../plugins/gtkui/interface.c:847 ../plugins/gtkui/deadbeef.glade.h:60
+#: ../plugins/gtkui/deadbeef.glade.h:61 ../plugins/gtkui/interface.c:856
+#: ../translation/plugins.c:162
+#, no-c-format
 msgid "Quit"
 msgstr "結束"
 
-#: ../plugins/gtkui/interface.c:967 ../plugins/gtkui/deadbeef.glade.h:61
-#: ../plugins/converter/convgui.c:1567 ../plugins/converter/convgui.c:1575
-#: ../plugins/gtkui/actionhandlers.c:476
-msgid "Help"
-msgstr "說明"
-
-#: ../plugins/gtkui/interface.c:1040 ../plugins/gtkui/plcommon.c:819
-#: ../plugins/gtkui/deadbeef.glade.h:62
+#: ../plugins/gtkui/deadbeef.glade.h:63 ../plugins/gtkui/interface.c:1049
+#: ../plugins/gtkui/plmenu.c:644 ../translation/plugins.c:174
+#, no-c-format
 msgid "Track Properties"
-msgstr "歌曲屬性"
+msgstr "曲目屬性"
 
-#: ../plugins/gtkui/interface.c:1058 ../plugins/gtkui/deadbeef.glade.h:63
+#: ../plugins/gtkui/deadbeef.glade.h:64 ../plugins/gtkui/interface.c:1067
 msgid "Location:"
-msgstr "位址:"
+msgstr "位址："
 
-#: ../plugins/gtkui/interface.c:1099 ../plugins/gtkui/deadbeef.glade.h:64
+#: ../plugins/gtkui/deadbeef.glade.h:65 ../plugins/gtkui/interface.c:1108
 msgid "Settings"
 msgstr "設定"
 
-#: ../plugins/gtkui/interface.c:1125 ../plugins/gtkui/deadbeef.glade.h:65
+#: ../plugins/gtkui/deadbeef.glade.h:66 ../plugins/gtkui/interface.c:1134
 msgid "_Apply"
-msgstr "套用(_A)"
+msgstr "套用 (_A)"
 
-#: ../plugins/gtkui/interface.c:1146 ../plugins/gtkui/interface.c:1192
-#: ../plugins/gtkui/deadbeef.glade.h:66
+#: ../plugins/gtkui/deadbeef.glade.h:67 ../plugins/gtkui/interface.c:1155
+#: ../plugins/gtkui/interface.c:1201
 msgid "_Close"
-msgstr "關閉(_C)"
+msgstr "關閉 (_C)"
 
-#: ../plugins/gtkui/interface.c:1150 ../plugins/gtkui/deadbeef.glade.h:67
+#: ../plugins/gtkui/deadbeef.glade.h:68 ../plugins/gtkui/interface.c:1159
+#: ../plugins/gtkui/selpropertieswidget.c:96
+#: ../plugins/gtkui/selpropertieswidget.c:324
 msgid "Metadata"
 msgstr "元數據"
 
-#: ../plugins/gtkui/interface.c:1196 ../plugins/gtkui/deadbeef.glade.h:68
+#: ../plugins/gtkui/deadbeef.glade.h:69 ../plugins/gtkui/interface.c:1205
+#: ../plugins/gtkui/selpropertieswidget.c:92
+#: ../plugins/gtkui/selpropertieswidget.c:322
 msgid "Properties"
 msgstr "屬性"
 
-#: ../plugins/gtkui/interface.c:1319 ../plugins/gtkui/interface.c:3096
-#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/converter/interface.c:379
-#: ../plugins/converter/converter.glade.h:22
-#: ../plugins/shellexecui/interface.c:163
-#: ../plugins/shellexecui/shellexec.glade.h:7 ../plugins/gtkui/pltmenu.c:65
-msgid "Title:"
-msgstr "歌名："
+#: ../plugins/gtkui/deadbeef.glade.h:70 ../plugins/gtkui/interface.c:1451
+#: ../plugins/gtkui/interface.c:4041 ../plugins/gtkui/interface.c:4172
+#: ../plugins/gtkui/interface.c:4302
+msgid "_Cancel"
+msgstr "取消 (_C)"
+
+#: ../plugins/gtkui/deadbeef.glade.h:71 ../plugins/gtkui/interface.c:1472
+#: ../plugins/gtkui/interface.c:4062 ../plugins/gtkui/interface.c:4193
+#: ../plugins/gtkui/interface.c:4323
+msgid "_OK"
+msgstr "確定 (_O)"
 
-#: ../plugins/gtkui/interface.c:1327 ../plugins/gtkui/deadbeef.glade.h:72
+#: ../plugins/gtkui/deadbeef.glade.h:73 ../plugins/gtkui/interface.c:1343
 msgid "Enter new column title here"
 msgstr "在此輸入欄位名稱"
 
-#: ../plugins/gtkui/interface.c:1335 ../plugins/gtkui/deadbeef.glade.h:73
+#: ../plugins/gtkui/deadbeef.glade.h:74 ../plugins/gtkui/interface.c:1351
 msgid "Type:"
 msgstr "類型："
 
-#: ../plugins/gtkui/interface.c:1343
-msgid "Item Index"
-msgstr "項目索引"
-
-#: ../plugins/gtkui/interface.c:1344
-msgid "Playing"
-msgstr "正在播放"
-
-#: ../plugins/gtkui/interface.c:1345
-msgid "Album Art"
-msgstr "專輯封面"
-
-#: ../plugins/gtkui/interface.c:1346
-msgid "Artist - Album"
-msgstr "藝人 - 專輯"
-
-#: ../plugins/gtkui/interface.c:1350 ../plugins/gtkui/mainplaylist.c:356
-#: ../plugins/gtkui/search.c:422
-msgid "Duration"
-msgstr "長度"
-
-#: ../plugins/gtkui/interface.c:1351 ../translation/extra.c:75
-msgid "Track Number"
-msgstr "歌曲編號"
-
-#: ../plugins/gtkui/interface.c:1352 ../translation/extra.c:72
-msgid "Band / Album Artist"
-msgstr "樂隊 / 專輯藝人"
-
-#: ../plugins/gtkui/interface.c:1359 ../plugins/gtkui/interface.c:3347
-#: ../plugins/gtkui/deadbeef.glade.h:85
+#: ../plugins/gtkui/deadbeef.glade.h:75 ../plugins/gtkui/interface.c:1364
+#: ../plugins/gtkui/interface.c:4261
 msgid "Format:"
 msgstr "格式："
 
-#: ../plugins/gtkui/interface.c:1384 ../plugins/gtkui/deadbeef.glade.h:86
+#: ../plugins/gtkui/deadbeef.glade.h:76 ../plugins/gtkui/interface.c:1389
+msgid "Sort format:"
+msgstr "排序格式："
+
+#: ../plugins/gtkui/deadbeef.glade.h:77 ../plugins/gtkui/interface.c:1398
+msgid "(if non-empty)"
+msgstr "（如果非為空）"
+
+#: ../plugins/gtkui/deadbeef.glade.h:78 ../plugins/gtkui/interface.c:1406
 msgid "Alignment:"
 msgstr "對齊："
 
-#: ../plugins/gtkui/interface.c:1392
-msgid "Left"
-msgstr "左"
-
-#: ../plugins/gtkui/interface.c:1393
-msgid "Right"
-msgstr "右"
-
-#: ../plugins/gtkui/interface.c:1416 ../plugins/gtkui/interface.c:3127
-#: ../plugins/gtkui/interface.c:3258 ../plugins/gtkui/interface.c:3388
-#: ../plugins/gtkui/deadbeef.glade.h:69
-msgid "_Cancel"
-msgstr "取消(_C)"
+#: ../plugins/gtkui/deadbeef.glade.h:79
+msgid ""
+"Left\n"
+"Right\n"
+"Center"
+msgstr "左\n右\n置中"
 
-#: ../plugins/gtkui/interface.c:1437 ../plugins/gtkui/interface.c:3148
-#: ../plugins/gtkui/interface.c:3279 ../plugins/gtkui/interface.c:3409
-#: ../plugins/gtkui/deadbeef.glade.h:70
-msgid "_OK"
-msgstr "確定(_O)"
+#: ../plugins/gtkui/deadbeef.glade.h:82 ../plugins/gtkui/interface.c:1422
+#: ../plugins/gtkui/interface.c:5173
+msgid "Text color:"
+msgstr "字體色彩："
 
-#: ../plugins/gtkui/interface.c:1705 ../plugins/gtkui/deadbeef.glade.h:89
+#: ../plugins/gtkui/deadbeef.glade.h:83 ../plugins/gtkui/interface.c:1851
 msgid "Output plugin:"
-msgstr "輸出外掛程式："
+msgstr "輸出外掛："
 
-#: ../plugins/gtkui/interface.c:1718 ../plugins/gtkui/deadbeef.glade.h:90
+#: ../plugins/gtkui/deadbeef.glade.h:84 ../plugins/gtkui/interface.c:1865
 msgid "Output device:"
 msgstr "輸出裝置："
 
-#: ../plugins/gtkui/interface.c:1727 ../plugins/gtkui/deadbeef.glade.h:91
+#: ../plugins/gtkui/deadbeef.glade.h:85 ../plugins/gtkui/interface.c:1874
 msgid "Always convert 8 bit audio to 16 bit"
-msgstr "將 8 位元音訊轉為 16 位元"
+msgstr "總是將 8 位元音訊轉為 16 位元"
 
-#: ../plugins/gtkui/interface.c:1731 ../plugins/gtkui/deadbeef.glade.h:92
+#: ../plugins/gtkui/deadbeef.glade.h:86 ../plugins/gtkui/interface.c:1878
 msgid "Always convert 16 bit audio to 24 bit"
+msgstr "總是將 16 位元音訊轉為 24 位元"
+
+#: ../plugins/gtkui/deadbeef.glade.h:87 ../plugins/gtkui/interface.c:1886
+msgid "Override bit depth:"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1735 ../plugins/gtkui/deadbeef.glade.h:93
+#: ../plugins/gtkui/deadbeef.glade.h:88
+msgid ""
+"Disabled\n"
+"8 bit\n"
+"16 bit\n"
+"24 bit\n"
+"32 bit\n"
+"32 bit float"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:94 ../plugins/gtkui/interface.c:1917
+msgid "Target samplerate:"
+msgstr "目標取樣率："
+
+#: ../plugins/gtkui/deadbeef.glade.h:95 ../plugins/gtkui/interface.c:1950
+msgid "For multiples of 48KHz (96K, 192K, ...):"
+msgstr "為 48KHz 的倍數時（96K、192K、…）："
+
+#: ../plugins/gtkui/deadbeef.glade.h:96 ../plugins/gtkui/interface.c:1969
+msgid "For multiples of 44.1KHz (88.2K, 176.4K, ...):"
+msgstr "為 44.1KHz 的倍數時（88.2K、176.4K、…）："
+
+#: ../plugins/gtkui/deadbeef.glade.h:97 ../plugins/gtkui/interface.c:1984
+msgid "Based on input samplerate"
+msgstr "基於輸入取樣率"
+
+#: ../plugins/gtkui/deadbeef.glade.h:98 ../plugins/gtkui/interface.c:1988
+msgid "Override samplerate"
+msgstr "覆蓋取樣率"
+
+#: ../plugins/gtkui/deadbeef.glade.h:99 ../plugins/gtkui/interface.c:1992
 msgid "Sound"
 msgstr "聲音"
 
-#: ../plugins/gtkui/interface.c:1748 ../plugins/gtkui/deadbeef.glade.h:94
-msgid "Replaygain mode:"
-msgstr "播放增益模式："
-
-#: ../plugins/gtkui/interface.c:1757
-msgid "Disable"
-msgstr "停用"
+#: ../plugins/gtkui/deadbeef.glade.h:100 ../plugins/gtkui/interface.c:2019
+msgid "Source mode:"
+msgstr "來源模式"
 
-#: ../plugins/gtkui/interface.c:1758
-msgid "Track"
-msgstr "歌曲"
+#: ../plugins/gtkui/deadbeef.glade.h:101
+msgid ""
+"By playback order\n"
+"Track\n"
+"Album"
+msgstr "播放順序依照\n曲目\n專輯"
 
-#: ../plugins/gtkui/interface.c:1761 ../plugins/gtkui/deadbeef.glade.h:98
-msgid "Replaygain peak scale"
-msgstr "播放增益峰值比例"
+#: ../plugins/gtkui/deadbeef.glade.h:104 ../plugins/gtkui/interface.c:2036
+msgid "Processing:"
+msgstr "運行方式："
+
+#: ../plugins/gtkui/deadbeef.glade.h:105
+msgid ""
+"None\n"
+"Apply gain\n"
+"Apply gain and prevent clipping according to peak\n"
+"Only prevent clipping"
+msgstr "關閉\n啟用音量標準化\n啟用音量標準化並防止爆音\n只防止爆音"
 
-#: ../plugins/gtkui/interface.c:1776 ../plugins/gtkui/interface.c:1810
-#: ../plugins/gtkui/deadbeef.glade.h:99
+#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/gtkui/interface.c:2061
+#: ../plugins/gtkui/interface.c:2095
 msgid "-12 dB"
 msgstr "-12 dB"
 
-#: ../plugins/gtkui/interface.c:1786 ../plugins/gtkui/interface.c:1820
-#: ../plugins/gtkui/deadbeef.glade.h:100
+#: ../plugins/gtkui/deadbeef.glade.h:110 ../plugins/gtkui/interface.c:2071
+#: ../plugins/gtkui/interface.c:2105
 msgid "+12 dB"
 msgstr "+12 dB"
 
-#: ../plugins/gtkui/interface.c:1790 ../plugins/gtkui/deadbeef.glade.h:101
-msgid "Replaygain preamp:"
-msgstr "播放增益前置放大器："
-
-#: ../plugins/gtkui/interface.c:1797 ../plugins/gtkui/deadbeef.glade.h:102
-msgid "Global preamp:"
-msgstr "全域前置放大器："
+#: ../plugins/gtkui/deadbeef.glade.h:111 ../plugins/gtkui/interface.c:2075
+msgid "Preamp with RG info:"
+msgstr "參照音量標準化放大："
+
+#: ../plugins/gtkui/deadbeef.glade.h:112 ../plugins/gtkui/interface.c:2082
+msgid "Preamp without RG info:"
+msgstr "不參照音量標準化放大："
+
+#: ../plugins/gtkui/deadbeef.glade.h:113 ../plugins/gtkui/interface.c:2109
+msgid "ReplayGain"
+msgstr "音量標準化"
 
-#: ../plugins/gtkui/interface.c:1828 ../plugins/gtkui/deadbeef.glade.h:103
+#: ../plugins/gtkui/deadbeef.glade.h:114 ../plugins/gtkui/interface.c:2118
 msgid "Add files from command line (or file manager) to this playlist:"
-msgstr "由指令列 (或檔案管理員) 將檔案加入至此播放清單："
+msgstr "由指令列（或檔案管理員）將檔案加入至此播放清單："
 
-#: ../plugins/gtkui/interface.c:1837 ../plugins/gtkui/deadbeef.glade.h:104
+#: ../plugins/gtkui/deadbeef.glade.h:115 ../plugins/gtkui/interface.c:2127
 msgid "Resume previous session on startup"
 msgstr "啟動時繼續前一作業"
 
-#: ../plugins/gtkui/interface.c:1841 ../plugins/gtkui/deadbeef.glade.h:105
+#: ../plugins/gtkui/deadbeef.glade.h:116 ../plugins/gtkui/interface.c:2131
 msgid "Don't add from archives when adding folders"
 msgstr "加入資料夾時不要加入壓縮檔"
 
-#: ../plugins/gtkui/interface.c:1845 ../plugins/gtkui/deadbeef.glade.h:106
+#: ../plugins/gtkui/deadbeef.glade.h:117 ../plugins/gtkui/interface.c:2135
 msgid "\"Stop after current track\" option will switch off after triggering"
-msgstr ""
+msgstr "觸發「播放當前曲目後停止」後將會停止"
 
-#: ../plugins/gtkui/interface.c:1849 ../plugins/gtkui/deadbeef.glade.h:107
+#: ../plugins/gtkui/deadbeef.glade.h:118 ../plugins/gtkui/interface.c:2139
 msgid "\"Stop after current album\" option will switch off after triggering"
-msgstr ""
+msgstr "「播放完此專輯後停止」選項在觸發後將會自動關閉"
 
-#: ../plugins/gtkui/interface.c:1853 ../plugins/gtkui/deadbeef.glade.h:108
+#: ../plugins/gtkui/deadbeef.glade.h:119 ../plugins/gtkui/interface.c:2143
+#: ../translation/plugins.c:180
+#, no-c-format
 msgid "Playback"
 msgstr "播放"
 
-#: ../plugins/gtkui/interface.c:1874 ../plugins/gtkui/interface.c:2588
-#: ../plugins/gtkui/deadbeef.glade.h:109 ../plugins/converter/interface.c:633
-#: ../plugins/converter/converter.glade.h:47
-msgid "Configure"
-msgstr "設定"
-
-#: ../plugins/gtkui/interface.c:1909 ../plugins/gtkui/deadbeef.glade.h:110
+#: ../plugins/gtkui/deadbeef.glade.h:120 ../plugins/gtkui/interface.c:2225
 msgid "DSP Chain Preset"
 msgstr "DSP 連鎖預設值"
 
-#: ../plugins/gtkui/interface.c:1921 ../plugins/gtkui/deadbeef.glade.h:111
+#: ../plugins/gtkui/deadbeef.glade.h:121 ../plugins/gtkui/interface.c:2237
 msgid "_Load"
-msgstr "載入(_L)"
+msgstr "載入 (_L)"
 
-#: ../plugins/gtkui/interface.c:1925 ../plugins/gtkui/deadbeef.glade.h:112
+#: ../plugins/gtkui/deadbeef.glade.h:122 ../plugins/gtkui/interface.c:2241
 msgid "DSP"
 msgstr "DSP"
 
-#: ../plugins/gtkui/interface.c:1939 ../plugins/gtkui/deadbeef.glade.h:113
+#: ../plugins/gtkui/deadbeef.glade.h:123 ../plugins/gtkui/interface.c:2255
+msgid "Minimize to tray on startup"
+msgstr "在啟動時縮小至工具列"
+
+#: ../plugins/gtkui/deadbeef.glade.h:124 ../plugins/gtkui/interface.c:2259
 msgid "Close minimizes to tray"
 msgstr "關閉時縮小至系統匣"
 
-#: ../plugins/gtkui/interface.c:1943 ../plugins/gtkui/deadbeef.glade.h:114
+#: ../plugins/gtkui/deadbeef.glade.h:125 ../plugins/gtkui/interface.c:2263
 msgid "Hide system tray icon"
 msgstr "隱藏系統匣圖示"
 
-#: ../plugins/gtkui/interface.c:1947 ../plugins/gtkui/deadbeef.glade.h:115
-msgid "Enable Japanese SHIFT-JIS detection and recoding"
+#: ../plugins/gtkui/deadbeef.glade.h:126 ../plugins/gtkui/interface.c:2267
+msgid "Delete from disk should use Trash"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:1951 ../plugins/gtkui/deadbeef.glade.h:116
-msgid "Enable Russian CP1251 detection and recoding"
-msgstr "啟用俄羅斯文 CP1251 偵測與重新編碼"
+#: ../plugins/gtkui/deadbeef.glade.h:127 ../plugins/gtkui/interface.c:2271
+msgid "Enable Japanese SHIFT-JIS detection and recoding"
+msgstr "啟用日文 SHIFT-JIS 偵測與重新編碼"
+
+#: ../plugins/gtkui/deadbeef.glade.h:128 ../plugins/gtkui/interface.c:2275
+msgid "Enable cyrillic CP1251 detection and recoding"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:1955 ../plugins/gtkui/deadbeef.glade.h:117
+#: ../plugins/gtkui/deadbeef.glade.h:129 ../plugins/gtkui/interface.c:2279
 msgid "Enable Chinese CP936 detection and recoding"
 msgstr "啟用中文 CP936 偵測與重新編碼"
 
-#: ../plugins/gtkui/interface.c:1963 ../plugins/gtkui/deadbeef.glade.h:118
+#: ../plugins/gtkui/deadbeef.glade.h:130 ../plugins/gtkui/interface.c:2287
 msgid "Interface refresh rate (times per second):"
-msgstr "介面重刷率 (每秒次數)："
+msgstr "介面重刷率（每秒次數）："
 
-#: ../plugins/gtkui/interface.c:1977 ../plugins/gtkui/deadbeef.glade.h:119
+#: ../plugins/gtkui/deadbeef.glade.h:131 ../plugins/gtkui/interface.c:2301
 msgid "Titlebar text while playing:"
 msgstr "播放時標題列文字："
 
-#: ../plugins/gtkui/interface.c:1991 ../plugins/gtkui/deadbeef.glade.h:120
+#: ../plugins/gtkui/deadbeef.glade.h:132 ../plugins/gtkui/interface.c:2315
 msgid "Titlebar text while stopped:"
 msgstr "停止時標題列文字："
 
-#: ../plugins/gtkui/interface.c:2005 ../plugins/gtkui/deadbeef.glade.h:121
+#: ../plugins/gtkui/deadbeef.glade.h:133 ../plugins/gtkui/interface.c:2329
 msgid "GUI Plugin (changing requires restart):"
-msgstr "圖像用戶介面外掛程式 (重新啟動始生效)："
+msgstr "圖形使用者介面（須重新啟動）："
+
+#: ../plugins/gtkui/deadbeef.glade.h:134 ../plugins/gtkui/interface.c:2337
+msgid "Display selection playback time in status bar"
+msgstr "在狀態欄顯示被選取曲目的總時數"
 
-#: ../plugins/gtkui/interface.c:2013 ../plugins/gtkui/deadbeef.glade.h:122
+#: ../plugins/gtkui/deadbeef.glade.h:135 ../plugins/gtkui/interface.c:2341
 msgid "Player"
-msgstr ""
+msgstr "播放器"
 
-#: ../plugins/gtkui/interface.c:2022 ../plugins/gtkui/deadbeef.glade.h:123
+#. plugins/pltbrowser/pltbrowser.c
+#: ../plugins/gtkui/deadbeef.glade.h:136 ../plugins/gtkui/interface.c:2350
+#: ../translation/plugins.c:429
+#, no-c-format
 msgid "Close playlists with middle mouse button"
-msgstr ""
+msgstr "用滑鼠中鍵關閉播放清單"
 
-#: ../plugins/gtkui/interface.c:2026 ../plugins/gtkui/deadbeef.glade.h:124
-msgid "Draw playing track using bold font"
+#: ../plugins/gtkui/deadbeef.glade.h:137 ../plugins/gtkui/interface.c:2354
+msgid "Hide \"Delete from Disk\" context menu item"
 msgstr ""
 
-#: ../plugins/gtkui/interface.c:2030 ../plugins/gtkui/deadbeef.glade.h:125
-msgid "Hide \"Remove From Disk\" context menu item"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:138 ../plugins/gtkui/interface.c:2358
+msgid ""
+"Switch to the next song when the currently played one is removed from disk"
+msgstr "當前播放的曲目從磁碟刪除時自動跳至下一首"
 
-#: ../plugins/gtkui/interface.c:2034 ../plugins/gtkui/deadbeef.glade.h:126
+#: ../plugins/gtkui/deadbeef.glade.h:139 ../plugins/gtkui/interface.c:2362
 msgid "Auto-name playlists when adding a single folder"
 msgstr "加入單一資料夾時自動為播放清單命名"
 
-#: ../plugins/gtkui/interface.c:2038 ../plugins/gtkui/deadbeef.glade.h:127
+#: ../plugins/gtkui/deadbeef.glade.h:140 ../plugins/gtkui/interface.c:2366
 msgid "Auto-resize columns to fit the window"
-msgstr ""
+msgstr "自動調整成適合視窗大小的欄位"
 
-#: ../plugins/gtkui/interface.c:2046 ../plugins/gtkui/deadbeef.glade.h:129
+#: ../plugins/gtkui/deadbeef.glade.h:141 ../plugins/gtkui/interface.c:2374
+msgid "Group spacing:"
+msgstr "群組間隔："
+
+#: ../plugins/gtkui/deadbeef.glade.h:142 ../plugins/gtkui/interface.c:2384
+msgid "pixels"
+msgstr "像素"
+
+#: ../plugins/gtkui/deadbeef.glade.h:143 ../plugins/gtkui/gtkui.c:1453
+#: ../plugins/gtkui/interface.c:2388 ../plugins/gtkui/interface.c:2833
+msgid "Playlist"
+msgstr "播放清單"
+
+#: ../plugins/gtkui/deadbeef.glade.h:144 ../plugins/gtkui/interface.c:2392
 msgid "GUI/Misc"
-msgstr "圖形介面/雜項"
+msgstr "圖形介面 / 雜項"
 
-#: ../plugins/gtkui/interface.c:2061 ../plugins/gtkui/interface.c:2105
-#: ../plugins/gtkui/deadbeef.glade.h:130
+#: ../plugins/gtkui/deadbeef.glade.h:145 ../plugins/gtkui/interface.c:2407
+#: ../plugins/gtkui/interface.c:2451
 msgid "Override"
-msgstr "優先於"
+msgstr "取代"
 
-#: ../plugins/gtkui/interface.c:2070 ../plugins/gtkui/deadbeef.glade.h:131
-msgid "Foreground"
-msgstr "前景"
-
-#: ../plugins/gtkui/interface.c:2077 ../plugins/gtkui/deadbeef.glade.h:132
-msgid "Background"
-msgstr "背景"
-
-#: ../plugins/gtkui/interface.c:2096 ../plugins/gtkui/deadbeef.glade.h:133
-msgid "Seekbar/Volumebar colors"
-msgstr "搜索列／音量列 色彩"
+#: ../plugins/gtkui/deadbeef.glade.h:146 ../plugins/gtkui/interface.c:2416
+msgid "Bars"
+msgstr "欄"
+
+#: ../plugins/gtkui/deadbeef.glade.h:147 ../plugins/gtkui/interface.c:2423
+msgid "Background (EQ)"
+msgstr "背景（EQ）"
+
+#: ../plugins/gtkui/deadbeef.glade.h:148 ../plugins/gtkui/interface.c:2442
+msgid "Seekbar/Volumebar/EQ"
+msgstr "進度列 / 音量列 / EQ"
 
-#: ../plugins/gtkui/interface.c:2114 ../plugins/gtkui/deadbeef.glade.h:134
-msgid "Middle"
-msgstr "中等"
-
-#: ../plugins/gtkui/interface.c:2121 ../plugins/gtkui/deadbeef.glade.h:135
-msgid "Light"
-msgstr "光亮"
+#: ../plugins/gtkui/deadbeef.glade.h:149 ../plugins/gtkui/interface.c:2467
+msgid "Base:"
+msgstr "基礎"
 
-#: ../plugins/gtkui/interface.c:2128 ../plugins/gtkui/deadbeef.glade.h:136
-msgid "Dark"
+#: ../plugins/gtkui/deadbeef.glade.h:150 ../plugins/gtkui/interface.c:2480
+msgid "Dark:"
 msgstr "暗淡"
 
-#: ../plugins/gtkui/interface.c:2159 ../plugins/gtkui/deadbeef.glade.h:137
-msgid "Base"
-msgstr "基礎"
+#: ../plugins/gtkui/deadbeef.glade.h:151 ../plugins/gtkui/interface.c:2493
+msgid "Light:"
+msgstr "光亮"
+
+#: ../plugins/gtkui/deadbeef.glade.h:152 ../plugins/gtkui/interface.c:2506
+msgid "Middle:"
+msgstr "中等"
 
-#: ../plugins/gtkui/interface.c:2166 ../plugins/gtkui/interface.c:2223
-#: ../plugins/gtkui/deadbeef.glade.h:138
-msgid "Text"
+#: ../plugins/gtkui/deadbeef.glade.h:153 ../plugins/gtkui/interface.c:2513
+msgid "Text:"
 msgstr "文字"
 
-#: ../plugins/gtkui/interface.c:2179 ../plugins/gtkui/deadbeef.glade.h:139
-msgid "Tab strip colors"
-msgstr "分頁條色彩"
-
-#: ../plugins/gtkui/interface.c:2188 ../plugins/gtkui/deadbeef.glade.h:140
-msgid "Override (looses GTK treeview theming, but speeds up rendering)"
-msgstr "優先於 (放鬆 GTK 樹狀目錄佈景主題，但會加速成像)"
-
-#: ../plugins/gtkui/interface.c:2197 ../plugins/gtkui/deadbeef.glade.h:141
-msgid "Even row"
-msgstr "偶數列"
-
-#: ../plugins/gtkui/interface.c:2204 ../plugins/gtkui/deadbeef.glade.h:142
-msgid "Odd row"
-msgstr "單數列"
-
-#: ../plugins/gtkui/interface.c:2230 ../plugins/gtkui/deadbeef.glade.h:143
-msgid "Selected row"
-msgstr "所選列"
-
-#: ../plugins/gtkui/interface.c:2249 ../plugins/gtkui/deadbeef.glade.h:144
-msgid "Selected text"
-msgstr "所選文字"
-
-#: ../plugins/gtkui/interface.c:2262 ../plugins/gtkui/deadbeef.glade.h:145
-msgid "Cursor"
-msgstr "游標"
-
-#: ../plugins/gtkui/interface.c:2275 ../plugins/gtkui/deadbeef.glade.h:146
-msgid "Playlist colors"
-msgstr "播放清單色彩"
-
-#: ../plugins/gtkui/interface.c:2279 ../plugins/gtkui/deadbeef.glade.h:147
-msgid "Colors"
-msgstr "色彩"
+#: ../plugins/gtkui/deadbeef.glade.h:154 ../plugins/gtkui/interface.c:2538
+#: ../plugins/gtkui/interface.c:2552 ../plugins/gtkui/interface.c:2809
+#: ../plugins/gtkui/interface.c:2815
+msgid "Bold"
+msgstr "粗體"
+
+#: ../plugins/gtkui/deadbeef.glade.h:155 ../plugins/gtkui/interface.c:2542
+#: ../plugins/gtkui/interface.c:2556 ../plugins/gtkui/interface.c:2821
+#: ../plugins/gtkui/interface.c:2827
+msgid "Italic"
+msgstr "斜體"
+
+#: ../plugins/gtkui/deadbeef.glade.h:156 ../plugins/gtkui/interface.c:2566
+msgid "Playing text:"
+msgstr "播放中的文字"
+
+#: ../plugins/gtkui/deadbeef.glade.h:157 ../plugins/gtkui/interface.c:2573
+msgid "Selected text:"
+msgstr "選擇的文字"
+
+#: ../plugins/gtkui/deadbeef.glade.h:158 ../plugins/gtkui/interface.c:2586
+msgid "Tab strip"
+msgstr "分頁標籤"
+
+#: ../plugins/gtkui/deadbeef.glade.h:159 ../plugins/gtkui/interface.c:2620
+msgid "Normal track(s):"
+msgstr "一般曲目："
+
+#: ../plugins/gtkui/deadbeef.glade.h:160 ../plugins/gtkui/interface.c:2633
+#: ../plugins/gtkui/interface.c:2795
+msgid "Playing track:"
+msgstr "播放中的曲目："
+
+#: ../plugins/gtkui/deadbeef.glade.h:161 ../plugins/gtkui/interface.c:2646
+#: ../plugins/gtkui/interface.c:2802
+msgid "Selected track(s):"
+msgstr "選擇的曲目："
+
+#: ../plugins/gtkui/deadbeef.glade.h:162 ../plugins/gtkui/interface.c:2659
+msgid "Columns:"
+msgstr "欄位名稱："
+
+#: ../plugins/gtkui/deadbeef.glade.h:163 ../plugins/gtkui/interface.c:2678
+msgid "Group header:"
+msgstr "分組名稱："
+
+#: ../plugins/gtkui/deadbeef.glade.h:164 ../plugins/gtkui/interface.c:2703
+msgid "Foreground:"
+msgstr "前景"
+
+#: ../plugins/gtkui/deadbeef.glade.h:165 ../plugins/gtkui/interface.c:2728
+msgid "Even:"
+msgstr "偶數列："
+
+#: ../plugins/gtkui/deadbeef.glade.h:166 ../plugins/gtkui/interface.c:2735
+msgid "Odd:"
+msgstr "奇數列："
+
+#: ../plugins/gtkui/deadbeef.glade.h:167 ../plugins/gtkui/interface.c:2748
+msgid "Selected:"
+msgstr "所選列："
+
+#: ../plugins/gtkui/deadbeef.glade.h:168 ../plugins/gtkui/interface.c:2761
+msgid "Cursor:"
+msgstr "游標："
+
+#: ../plugins/gtkui/deadbeef.glade.h:169 ../plugins/gtkui/interface.c:2780
+msgid "Background:"
+msgstr "背景"
+
+#: ../plugins/gtkui/deadbeef.glade.h:170 ../plugins/gtkui/interface.c:2785
+msgid "Override (loses GTK treeview theming, but speeds up rendering)"
+msgstr "取代（會失去 GTK 樹狀目錄佈景，但加速繪製）"
+
+#: ../plugins/gtkui/deadbeef.glade.h:171 ../plugins/gtkui/interface.c:2844
+msgid "Custom visualization base color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:172 ../plugins/gtkui/interface.c:2856
+msgid "Custom visualization background color"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:173 ../plugins/gtkui/interface.c:2868
+msgid "Visualizations"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:174 ../plugins/gtkui/interface.c:2872
+msgid "Appearance"
+msgstr "外觀"
+
+#: ../plugins/gtkui/deadbeef.glade.h:175 ../plugins/gtkui/interface.c:2881
+msgid "Enable media library"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:176 ../plugins/gtkui/interface.c:2889
+msgid "Add / remove music folders"
+msgstr ""
+
+#: ../plugins/gtkui/deadbeef.glade.h:177 ../plugins/gtkui/interface.c:2923
+msgid "Media Library"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2288 ../plugins/gtkui/deadbeef.glade.h:148
+#: ../plugins/gtkui/deadbeef.glade.h:178 ../plugins/gtkui/interface.c:2932
 msgid "Enable Proxy Server"
 msgstr "啟用代理伺服器"
 
-#: ../plugins/gtkui/interface.c:2296 ../plugins/gtkui/deadbeef.glade.h:149
+#: ../plugins/gtkui/deadbeef.glade.h:179 ../plugins/gtkui/interface.c:2940
 msgid "Proxy Server Address:"
 msgstr "代理伺服器位址："
 
-#: ../plugins/gtkui/interface.c:2310 ../plugins/gtkui/deadbeef.glade.h:150
+#: ../plugins/gtkui/deadbeef.glade.h:180 ../plugins/gtkui/interface.c:2954
 msgid "Proxy Server Port:"
 msgstr "代理伺服器連接埠："
 
-#: ../plugins/gtkui/interface.c:2324 ../plugins/gtkui/deadbeef.glade.h:151
+#: ../plugins/gtkui/deadbeef.glade.h:181 ../plugins/gtkui/interface.c:2968
 msgid "Proxy Type:"
 msgstr "代理類型："
 
-#: ../plugins/gtkui/interface.c:2343 ../plugins/gtkui/deadbeef.glade.h:152
+#: ../plugins/gtkui/deadbeef.glade.h:182 ../plugins/gtkui/interface.c:2987
 msgid "Proxy Username:"
 msgstr "代理使用者名稱："
 
-#: ../plugins/gtkui/interface.c:2356 ../plugins/gtkui/deadbeef.glade.h:153
+#: ../plugins/gtkui/deadbeef.glade.h:183 ../plugins/gtkui/interface.c:3000
 msgid "Proxy Password:"
 msgstr "代理密碼："
 
-#: ../plugins/gtkui/interface.c:2374 ../plugins/gtkui/deadbeef.glade.h:154
+#: ../plugins/gtkui/deadbeef.glade.h:184 ../plugins/gtkui/interface.c:3018
 msgid "HTTP User Agent:"
-msgstr "HTTP 使用者代理:"
+msgstr "HTTP 使用者代理："
 
-#: ../plugins/gtkui/interface.c:2387 ../plugins/gtkui/interface.c:4123
-#: ../plugins/gtkui/deadbeef.glade.h:155
+#: ../plugins/gtkui/deadbeef.glade.h:185 ../plugins/gtkui/interface.c:3031
+#: ../plugins/gtkui/interface.c:5049
 msgid "Edit Content-Type Mapping"
-msgstr ""
+msgstr "修改內容類型對應"
 
-#: ../plugins/gtkui/interface.c:2391 ../plugins/gtkui/deadbeef.glade.h:156
+#: ../plugins/gtkui/deadbeef.glade.h:186 ../plugins/gtkui/interface.c:3035
 msgid "Network"
 msgstr "網路"
 
-#: ../plugins/gtkui/interface.c:2404 ../plugins/gtkui/deadbeef.glade.h:157
+#: ../plugins/gtkui/deadbeef.glade.h:187 ../plugins/gtkui/interface.c:3048
 msgid "Assigned Hotkeys:"
-msgstr ""
+msgstr "設定快捷鍵："
 
-#: ../plugins/gtkui/interface.c:2439 ../plugins/gtkui/interface.c:4284
-#: ../plugins/gtkui/deadbeef.glade.h:158
+#: ../plugins/gtkui/deadbeef.glade.h:188 ../plugins/gtkui/interface.c:3083
+#: ../plugins/gtkui/interface.c:5210
 msgid "Action:"
-msgstr ""
+msgstr "動作："
 
-#: ../plugins/gtkui/interface.c:2444 ../plugins/gtkui/interface.c:2457
-#: ../plugins/gtkui/interface.c:4288 ../plugins/gtkui/deadbeef.glade.h:159
+#: ../plugins/gtkui/deadbeef.glade.h:189 ../plugins/gtkui/interface.c:3088
+#: ../plugins/gtkui/interface.c:3101 ../plugins/gtkui/interface.c:5214
 msgid "<Not set>"
 msgstr "<Not set>"
 
-#: ../plugins/gtkui/interface.c:2452 ../plugins/gtkui/deadbeef.glade.h:160
+#: ../plugins/gtkui/deadbeef.glade.h:190 ../plugins/gtkui/interface.c:3096
 msgid "Key combination:"
-msgstr ""
+msgstr "按鍵組合："
 
-#: ../plugins/gtkui/interface.c:2461 ../plugins/gtkui/deadbeef.glade.h:161
+#: ../plugins/gtkui/deadbeef.glade.h:191 ../plugins/gtkui/interface.c:3105
 msgid "Global hotkey"
-msgstr "全域快速鍵"
+msgstr "全域快捷鍵"
 
-#: ../plugins/gtkui/interface.c:2473 ../plugins/gtkui/deadbeef.glade.h:162
+#: ../plugins/gtkui/deadbeef.glade.h:192 ../plugins/gtkui/interface.c:3117
 msgid ""
 "Use the Apply button to save your changes,\n"
 "or the Revert button to undo your changes.\n"
 "The changes will NOT be saved\n"
 "if you don't press Apply."
-msgstr ""
+msgstr "請按「套用」儲存你的設定，\n或按「還原」恢復原本的設定。\n只要沒按套用鍵，你的設定就不會儲存。"
 
-#: ../plugins/gtkui/interface.c:2510 ../plugins/gtkui/deadbeef.glade.h:166
+#: ../plugins/gtkui/deadbeef.glade.h:196 ../plugins/gtkui/interface.c:3154
 msgid "_Defaults"
-msgstr ""
+msgstr "預設 (_D)"
 
-#: ../plugins/gtkui/interface.c:2514 ../plugins/gtkui/deadbeef.glade.h:167
+#: ../plugins/gtkui/deadbeef.glade.h:197 ../plugins/gtkui/interface.c:3158
 msgid "Hotkeys"
-msgstr "快速鍵"
+msgstr "快捷鍵"
 
-#: ../plugins/gtkui/interface.c:2545 ../plugins/gtkui/deadbeef.glade.h:168
-msgid "Version: "
-msgstr "版本："
+#: ../plugins/gtkui/deadbeef.glade.h:198 ../plugins/gtkui/interface.c:3201
+#: ../plugins/gtkui/interface.c:3255
+msgid "Configuration"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2609 ../plugins/gtkui/deadbeef.glade.h:169
-#: ../translation/extra.c:82
-msgid "Copyright"
-msgstr "版權"
+#: ../plugins/gtkui/deadbeef.glade.h:199 ../plugins/gtkui/interface.c:3209
+#: ../plugins/gtkui/interface.c:3299
+msgid "Info"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:2619 ../plugins/gtkui/deadbeef.glade.h:170
-#: ../plugins/gtkui/ctmapping.c:131
-msgid "Plugins"
-msgstr "外掛程式"
+#: ../plugins/gtkui/deadbeef.glade.h:200 ../plugins/gtkui/interface.c:3216
+#: ../plugins/gtkui/interface.c:3315
+msgid "License"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3214 ../plugins/gtkui/deadbeef.glade.h:171
+#: ../plugins/gtkui/deadbeef.glade.h:201 ../plugins/gtkui/interface.c:3250
+#: ../plugins/gtkui/interface.c:4970
+msgid "Reset to defaults"
+msgstr "重設為預設值"
+
+#: ../plugins/gtkui/deadbeef.glade.h:202 ../plugins/gtkui/interface.c:3267
+msgid "Version: "
+msgstr "版本："
+
+#: ../plugins/gtkui/deadbeef.glade.h:204 ../plugins/gtkui/interface.c:4128
 msgid "URL:"
 msgstr "網址："
 
-#: ../plugins/gtkui/interface.c:3228 ../plugins/gtkui/interface.c:4414
-#: ../plugins/gtkui/interface.c:4442 ../plugins/gtkui/plcommon.c:806
-#: ../plugins/gtkui/deadbeef.glade.h:172
+#: ../plugins/gtkui/deadbeef.glade.h:205 ../plugins/gtkui/interface.c:4142
+#: ../plugins/gtkui/interface.c:5340 ../plugins/gtkui/interface.c:5368
+#: ../plugins/gtkui/plmenu.c:631
 msgid "Set Custom Title"
-msgstr ""
+msgstr "自訂標題"
 
-#: ../plugins/gtkui/interface.c:3332 ../plugins/gtkui/deadbeef.glade.h:173
+#: ../plugins/gtkui/deadbeef.glade.h:206 ../plugins/gtkui/interface.c:4246
 msgid "Group By ..."
-msgstr "依據...分組"
+msgstr "依據…分組"
 
-#: ../plugins/gtkui/interface.c:3456 ../plugins/gtkui/deadbeef.glade.h:174
+#: ../plugins/gtkui/deadbeef.glade.h:207 ../plugins/gtkui/interface.c:4370
 msgid "Sort by ..."
-msgstr "依據...排序"
-
-#: ../plugins/gtkui/interface.c:3472 ../plugins/gtkui/deadbeef.glade.h:175
-msgid "Format"
-msgstr "格式"
-
-#: ../plugins/gtkui/interface.c:3502
-msgid "Ascending"
-msgstr "順序"
-
-#: ../plugins/gtkui/interface.c:3503
-msgid "Descending"
-msgstr "逆序"
+msgstr "依據…排序"
 
-#: ../plugins/gtkui/interface.c:3556 ../plugins/gtkui/deadbeef.glade.h:178
-#: ../plugins/converter/interface.c:734
-#: ../plugins/converter/converter.glade.h:48
-msgid "Select DSP Plugin"
-msgstr "選取 DSP 外掛程式"
+#: ../plugins/gtkui/deadbeef.glade.h:208 ../plugins/gtkui/interface.c:4400
+msgid "Format"
+msgstr ""
 
-#: ../plugins/gtkui/interface.c:3572 ../plugins/gtkui/deadbeef.glade.h:179
-#: ../plugins/converter/convgui.c:1287 ../plugins/converter/interface.c:750
-#: ../plugins/gtkui/dspconfig.c:139 ../plugins/converter/converter.glade.h:49
-msgid "Plugin"
-msgstr "外掛程式"
+#: ../plugins/gtkui/deadbeef.glade.h:209
+msgid ""
+"Ascending\n"
+"Descending"
+msgstr "順序\n逆序"
 
-#: ../plugins/gtkui/interface.c:3657 ../plugins/gtkui/deadbeef.glade.h:180
+#: ../plugins/gtkui/deadbeef.glade.h:213 ../plugins/gtkui/interface.c:4583
 msgid "Tag Writer Settings"
-msgstr "標記寫入器設定"
+msgstr "標籤寫入器設定"
 
-#: ../plugins/gtkui/interface.c:3688 ../plugins/gtkui/deadbeef.glade.h:181
+#: ../plugins/gtkui/deadbeef.glade.h:214 ../plugins/gtkui/interface.c:4614
 msgid "Write ID3v2"
 msgstr "寫入 ID3v2"
 
-#: ../plugins/gtkui/interface.c:3692 ../plugins/gtkui/interface.c:3819
-#: ../plugins/gtkui/deadbeef.glade.h:182
+#: ../plugins/gtkui/deadbeef.glade.h:215 ../plugins/gtkui/interface.c:4618
+#: ../plugins/gtkui/interface.c:4745
 msgid "Write ID3v1"
 msgstr "寫入 ID3v1"
 
-#: ../plugins/gtkui/interface.c:3696 ../plugins/gtkui/interface.c:3775
-#: ../plugins/gtkui/interface.c:3815 ../plugins/gtkui/deadbeef.glade.h:183
+#: ../plugins/gtkui/deadbeef.glade.h:216 ../plugins/gtkui/interface.c:4622
+#: ../plugins/gtkui/interface.c:4701 ../plugins/gtkui/interface.c:4741
 msgid "Write APEv2"
 msgstr "寫入 APEv2"
 
-#: ../plugins/gtkui/interface.c:3704 ../plugins/gtkui/interface.c:3783
-#: ../plugins/gtkui/deadbeef.glade.h:184
+#: ../plugins/gtkui/deadbeef.glade.h:217 ../plugins/gtkui/interface.c:4630
+#: ../plugins/gtkui/interface.c:4709
 msgid "Strip ID3v2"
 msgstr "砍掉 ID3v2"
 
-#: ../plugins/gtkui/interface.c:3708 ../plugins/gtkui/interface.c:3831
-#: ../plugins/gtkui/deadbeef.glade.h:185
+#: ../plugins/gtkui/deadbeef.glade.h:218 ../plugins/gtkui/interface.c:4634
+#: ../plugins/gtkui/interface.c:4757
 msgid "Strip ID3v1"
 msgstr "砍掉 ID3v1"
 
-#: ../plugins/gtkui/interface.c:3712 ../plugins/gtkui/interface.c:3787
-#: ../plugins/gtkui/interface.c:3827 ../plugins/gtkui/deadbeef.glade.h:186
+#: ../plugins/gtkui/deadbeef.glade.h:219 ../plugins/gtkui/interface.c:4638
+#: ../plugins/gtkui/interface.c:4713 ../plugins/gtkui/interface.c:4753
 msgid "Strip APEv2"
 msgstr "砍掉 APEv2"
 
-#: ../plugins/gtkui/interface.c:3720 ../plugins/gtkui/deadbeef.glade.h:187
+#: ../plugins/gtkui/deadbeef.glade.h:220 ../plugins/gtkui/interface.c:4646
+#: ../translation/plugins.c:519
+#, no-c-format
 msgid "ID3v2 version"
 msgstr "ID3v2 版本"
 
-#: ../plugins/gtkui/interface.c:3727
-msgid "2.3 (Recommended)"
-msgstr "2.3 (建議版本)"
-
-#: ../plugins/gtkui/interface.c:3728
-msgid "2.4"
-msgstr "2.4"
+#: ../plugins/gtkui/deadbeef.glade.h:221
+msgid ""
+"2.3 (Recommended)\n"
+"2.4"
+msgstr "2.3（建議版本）\n2.4"
 
-#: ../plugins/gtkui/interface.c:3734 ../plugins/gtkui/deadbeef.glade.h:190
+#: ../plugins/gtkui/deadbeef.glade.h:223 ../plugins/gtkui/interface.c:4660
 msgid "ID3v1 character encoding (default is iso8859-1)"
-msgstr "ID3v1 字元編碼 (預設為 iso8859-1)"
+msgstr "ID3v1 字元編碼（預設為 iso8859-1）"
 
-#: ../plugins/gtkui/interface.c:3771 ../plugins/gtkui/deadbeef.glade.h:191
+#: ../plugins/gtkui/deadbeef.glade.h:224 ../plugins/gtkui/interface.c:4697
 msgid "Write ID3v2.4"
 msgstr "寫入 ID3v2.4"
 
-#: ../plugins/gtkui/interface.c:3973 ../plugins/gtkui/deadbeef.glade.h:192
+#: ../plugins/gtkui/deadbeef.glade.h:225 ../plugins/gtkui/interface.c:4899
 msgid "Content-Type Mapping"
-msgstr "目錄類型取代"
+msgstr "內容類型對應"
 
-#: ../plugins/gtkui/interface.c:3996 ../plugins/gtkui/deadbeef.glade.h:193
+#: ../plugins/gtkui/deadbeef.glade.h:226 ../plugins/gtkui/interface.c:4922
 msgid ""
 "This table defines the binding between network stream content types and "
 "DeaDBeeF decoder plugins. For example, mp3 files can have content type "
 "\"audio/x-mpeg\", and need to be decoded by DeaDBeeF's own \"stdmpg\" "
 "plugin, or \"ffmpeg\" plugin."
-msgstr ""
+msgstr "這張表格定義了網路串流內容類型與 DeadBeeF 解碼外掛之間的對應關係。例如 MP3 檔案的內容類型可以是 audio/x-mpeg，需要使用 DeadBeeF 本身的 stdmpg 外掛或 ffmpeg 外掛來解碼。"
 
-#: ../plugins/gtkui/interface.c:4044 ../plugins/gtkui/deadbeef.glade.h:194
-msgid "Reset to defaults"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4139 ../plugins/gtkui/deadbeef.glade.h:195
+#: ../plugins/gtkui/deadbeef.glade.h:227 ../plugins/gtkui/interface.c:5065
 msgid "Content-Type:"
-msgstr ""
+msgstr "內容類型："
 
-#: ../plugins/gtkui/interface.c:4152 ../plugins/gtkui/deadbeef.glade.h:196
+#: ../plugins/gtkui/deadbeef.glade.h:228 ../plugins/gtkui/interface.c:5078
 msgid "Plugins:"
-msgstr ""
+msgstr "外掛程式："
 
-#: ../plugins/gtkui/interface.c:4220 ../plugins/gtkui/deadbeef.glade.h:197
+#: ../plugins/gtkui/deadbeef.glade.h:229 ../plugins/gtkui/interface.c:5146
 msgid "Button properties"
-msgstr ""
+msgstr "按鈕屬性"
 
-#: ../plugins/gtkui/interface.c:4235 ../plugins/gtkui/deadbeef.glade.h:198
+#: ../plugins/gtkui/deadbeef.glade.h:230 ../plugins/gtkui/interface.c:5161
 msgid "Color:"
-msgstr ""
+msgstr "色彩："
 
-#: ../plugins/gtkui/interface.c:4247 ../plugins/gtkui/deadbeef.glade.h:199
-msgid "Text color:"
-msgstr ""
-
-#: ../plugins/gtkui/interface.c:4259 ../plugins/gtkui/deadbeef.glade.h:200
+#: ../plugins/gtkui/deadbeef.glade.h:231 ../plugins/gtkui/interface.c:5185
 msgid "Icon:"
-msgstr ""
+msgstr "圖示："
 
-#: ../plugins/gtkui/interface.c:4271 ../plugins/gtkui/deadbeef.glade.h:201
+#: ../plugins/gtkui/deadbeef.glade.h:232 ../plugins/gtkui/interface.c:5197
 msgid "Label:"
-msgstr ""
+msgstr "標籤："
 
-#: ../plugins/gtkui/interface.c:4352 ../plugins/gtkui/deadbeef.glade.h:202
+#: ../plugins/gtkui/deadbeef.glade.h:233 ../plugins/gtkui/interface.c:5278
 msgid "Select action"
-msgstr ""
+msgstr "選擇動作"
 
-#: ../plugins/gtkui/interface.c:4436 ../plugins/gtkui/deadbeef.glade.h:203
+#: ../plugins/gtkui/deadbeef.glade.h:234 ../plugins/gtkui/interface.c:5362
 msgid ""
-"This dialog allows to set custom title for any track. This is most useful "
-"for radio stations. An option to set the custom title is also present in the "
-"\"Add Location\" dialog. The title itself is visible in columns displaying "
+"This dialog allows setting custom title for any track. This is most useful "
+"for radio stations. An option to set the custom title is also present in the"
+" \"Add Location\" dialog. The title itself is visible in columns displaying "
 "the \"Artist\" metadata field. It should look like \"custom artist\" if "
 "the Artist field is present, or just \"custom\" otherwise."
-msgstr ""
+msgstr "此對話框允許為任意音軌自訂標題。這功能在廣播電台最為實用。在「添加位置」對話框內也包含有自訂標題的選項。這標題會顯示在「藝人」元數據欄位內。它應該顯示成「自訂藝人」或者只有「自訂」。"
 
-#: ../plugins/gtkui/mainplaylist.c:353 ../plugins/gtkui/search.c:419
-msgid "Artist / Album"
-msgstr "藝人 / 專輯"
+#: ../plugins/gtkui/deadbeef.glade.h:235 ../plugins/gtkui/interface.c:5418
+#: ../plugins/shellexecui/interface.c:70
+#: ../plugins/shellexecui/shellexec.glade.h:5 ../translation/plugins.c:156
+#, no-c-format
+msgid "Edit"
+msgstr "編輯(_E)"
 
-#: ../plugins/gtkui/mainplaylist.c:354 ../plugins/gtkui/search.c:420
-msgid "Track No"
-msgstr "歌曲編號"
+#: ../plugins/gtkui/deadbeef.glade.h:236 ../plugins/gtkui/interface.c:5422
+msgid "Edit (in place)"
+msgstr "編輯 (in place)"
 
-#: ../plugins/gtkui/plcommon.c:637
-msgid "Add To Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:237 ../plugins/gtkui/interface.c:5434
+msgid "Add new field..."
+msgstr "新增欄位"
 
-#: ../plugins/gtkui/plcommon.c:642
-msgid "Remove From Playback Queue"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:238 ../plugins/gtkui/interface.c:5483
+msgid "Edit Value"
+msgstr "編輯參數"
 
-#: ../plugins/gtkui/plcommon.c:650
-msgid "Reload Metadata"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:239 ../plugins/gtkui/interface.c:5496
+msgid "Field name:"
+msgstr "欄位名稱:"
+
+#: ../plugins/gtkui/deadbeef.glade.h:240 ../plugins/gtkui/interface.c:5508
+msgid "Field value:"
+msgstr "欄位值:"
 
-#: ../plugins/gtkui/plcommon.c:668
-msgid "Remove From Disk"
+#: ../plugins/gtkui/deadbeef.glade.h:241 ../plugins/gtkui/interface.c:5522
+#: ../plugins/gtkui/interface.c:5867
+msgid "Use ; character to separate multiple values."
 msgstr ""
 
-#: ../plugins/gtkui/plcommon.c:1089 ../plugins/gtkui/plcommon.c:1216
-msgid "Add column"
-msgstr "加入欄位"
+#: ../plugins/gtkui/deadbeef.glade.h:242 ../plugins/gtkui/interface.c:5571
+msgid "DeaDBeeF Log"
+msgstr "DeaDBeeF 日誌"
 
-#: ../plugins/gtkui/plcommon.c:1119 ../plugins/gtkui/plcommon.c:1220
-msgid "Edit column"
-msgstr "編輯欄位"
+#: ../plugins/gtkui/deadbeef.glade.h:243 ../plugins/gtkui/interface.c:5600
+msgid "Clear"
+msgstr "清除"
 
-#: ../plugins/gtkui/plcommon.c:1224
-msgid "Remove column"
-msgstr "移除欄位"
+#: ../plugins/gtkui/deadbeef.glade.h:244 ../plugins/gtkui/interface.c:5637
+msgid "ReplayGain Scan Progress"
+msgstr "音量標準化掃描進度"
 
-#: ../plugins/gtkui/plcommon.c:1234
-msgid "Pin groups when scrolling"
-msgstr ""
+#: ../plugins/gtkui/deadbeef.glade.h:245 ../plugins/gtkui/interface.c:5648
+msgid "Current File:"
+msgstr "當前檔案："
 
-#: ../plugins/gtkui/plcommon.c:1239
-msgid "Group by"
-msgstr "分組根據："
+#: ../plugins/gtkui/deadbeef.glade.h:246 ../plugins/gtkui/interface.c:5666
+#: ../plugins/gtkui/interface.c:5726 ../plugins/gtkui/rg.c:310
+msgid "Status"
+msgstr "狀態"
 
-#: ../plugins/gtkui/plcommon.c:1246 ../plugins/gtkui/widgets.c:3524
-msgid "None"
-msgstr "無"
+#: ../plugins/gtkui/deadbeef.glade.h:247
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:67
+#: ../plugins/gtkui/interface.c:5673 ../plugins/gtkui/interface.c:5737
+msgid "Cancel"
+msgstr "取消"
 
-#: ../plugins/gtkui/plcommon.c:1250
-msgid "Artist/Date/Album"
-msgstr "藝人/日期/專輯"
+#: ../plugins/gtkui/deadbeef.glade.h:248 ../plugins/gtkui/interface.c:5705
+msgid "ReplayGain Scan Results"
+msgstr "音量標準化掃描結果"
 
-#: ../plugins/gtkui/pluginconf.c:42
-msgid "Open file..."
-msgstr "開啟檔案..."
+#: ../plugins/gtkui/deadbeef.glade.h:249 ../plugins/gtkui/interface.c:5733
+msgid "Update File Tags"
+msgstr "更新檔案標籤"
 
-#: ../plugins/gtkui/pluginconf.c:220
-#, c-format
-msgid "Configure %s"
-msgstr "設定 %s"
+#: ../plugins/gtkui/deadbeef.glade.h:250 ../plugins/gtkui/interface.c:5764
+msgid "Copy report"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:81
-msgid "Default Audio Device"
-msgstr "預設音訊裝置"
+#: ../plugins/gtkui/deadbeef.glade.h:251 ../plugins/gtkui/interface.c:5772
+msgid "Only show plugins with configuration"
+msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:348
-msgid "You modified the hotkeys settings, but didn't save your changes."
+#: ../plugins/gtkui/deadbeef.glade.h:252 ../plugins/gtkui/interface.c:5813
+msgid "Edit Multiple Tracks"
 msgstr ""
 
-#: ../plugins/gtkui/prefwin.c:350
-msgid "Are you sure you want to continue without saving?"
+#: ../plugins/gtkui/deadbeef.glade.h:253 ../plugins/gtkui/interface.c:5825
+msgid "Field Name:"
 msgstr ""
 
-#: ../plugins/gtkui/progress.c:56
-msgid "Adding files..."
-msgstr "正在加入檔案..."
+#: ../plugins/gtkui/deadbeef.glade.h:254 ../plugins/gtkui/interface.c:5850
+msgid "Single Value"
+msgstr ""
 
-#: ../plugins/gtkui/progress.c:89
-msgid "Initializing..."
-msgstr "正在初始化..."
+#: ../plugins/gtkui/deadbeef.glade.h:255 ../plugins/gtkui/interface.c:5863
+msgid "Individual Values"
+msgstr ""
 
-#: ../plugins/gtkui/trkproperties.c:168
-msgid "You've modified data for this track."
-msgstr "已修改此歌曲資料。"
+#: ../plugins/gtkui/eq.c:136
+msgid "Save DeaDBeeF EQ Preset"
+msgstr "儲存 DeaDBeeF 等化器預設值"
 
-#: ../plugins/gtkui/trkproperties.c:170
-msgid "Really close the window?"
-msgstr "真要關閉視窗？"
+#: ../plugins/gtkui/eq.c:143
+msgid "DeaDBeeF EQ preset files (*.ddbeq)"
+msgstr "DeaDBeeF 等化器預設值檔案（*.ddbeq）"
 
-#. get value to edit
-#: ../plugins/gtkui/trkproperties.c:299
-msgid "Multiple values "
-msgstr "多重值 "
+#: ../plugins/gtkui/eq.c:183
+msgid "Load DeaDBeeF EQ Preset..."
+msgstr "載入 DeaDBeeF 等化器預設值…"
 
-#: ../plugins/gtkui/trkproperties.c:490 ../plugins/gtkui/trkproperties.c:502
-#: ../plugins/gtkui/widgets.c:2200
-msgid "Key"
-msgstr "按鍵"
+#: ../plugins/gtkui/eq.c:187
+msgid "DeaDBeeF EQ presets (*.ddbeq)"
+msgstr "DeaDBeeF 等化器預設值（*.ddbeq）"
 
-#: ../plugins/gtkui/trkproperties.c:491 ../plugins/gtkui/trkproperties.c:503
-#: ../plugins/gtkui/widgets.c:2202
-msgid "Value"
-msgstr "值"
+#: ../plugins/gtkui/eq.c:224
+msgid "Import Foobar2000 EQ Preset..."
+msgstr "匯入 Foobar2000 等化器預設值…"
 
-#: ../plugins/gtkui/trkproperties.c:522
-msgid "Multiple values"
-msgstr "多重值"
+#: ../plugins/gtkui/eq.c:228
+msgid "Foobar2000 EQ presets (*.feq)"
+msgstr "Foobar2000 等化器預設值（*.feq）"
 
-#: ../plugins/gtkui/trkproperties.c:701
-msgid "Writing tags..."
-msgstr "正在寫入標記..."
+#: ../plugins/gtkui/eq.c:269
+msgid "Save Preset"
+msgstr "儲存預設值"
 
-#: ../plugins/gtkui/trkproperties.c:730
-msgid "Field name"
-msgstr "欄位名稱"
+#: ../plugins/gtkui/eq.c:277
+msgid "Load Preset"
+msgstr "載入預設值"
 
-#: ../plugins/gtkui/trkproperties.c:733
-msgid "Name:"
-msgstr "名稱："
+#: ../plugins/gtkui/eq.c:285
+msgid "Import Foobar2000 Preset"
+msgstr "匯入 Foobar2000 預設值"
 
-#: ../plugins/gtkui/trkproperties.c:745
-msgid "Field names must not start with : or _"
-msgstr "欄位名稱不能以 : 或 _ 開首"
+#. plugins/notify/notify.c
+#: ../plugins/gtkui/eq.c:311 ../translation/plugins.c:413
+#, no-c-format
+msgid "Enable"
+msgstr "啟用"
 
-#: ../plugins/gtkui/trkproperties.c:746 ../plugins/gtkui/trkproperties.c:785
-msgid "Cannot add field"
-msgstr "無法加入欄位"
+#: ../plugins/gtkui/eq.c:320
+msgid "Zero All"
+msgstr "全部歸零"
 
-#: ../plugins/gtkui/trkproperties.c:784
-msgid "Field with such name already exists, please try different name."
-msgstr "已有此名稱欄位，請選別個。"
+#: ../plugins/gtkui/eq.c:327
+msgid "Zero Preamp"
+msgstr "前級放大器歸零"
 
-#: ../plugins/gtkui/trkproperties.c:847
-msgid "Add field"
-msgstr "加入欄位"
+#: ../plugins/gtkui/eq.c:334
+msgid "Zero Bands"
+msgstr "頻帶歸零"
 
-#: ../plugins/gtkui/trkproperties.c:850
-msgid "Remove field"
-msgstr "移除欄位"
+#: ../plugins/gtkui/fileman.c:64 ../plugins/gtkui/gtkui.c:761
+#: ../plugins/pltbrowser/pltbrowser.c:65 ../translation/plugins.c:226
+#, no-c-format
+msgid "New Playlist"
+msgstr "新播放清單"
 
-#: ../main.c:90
-#, c-format
-msgid "Usage: deadbeef options -- file(s)\n"
-msgstr "使用方法: deadbeef 選項 -- 檔案(複數)\n"
+#: ../plugins/gtkui/fileman.c:316 ../plugins/gtkui/fileman.c:406
+msgid "Supported sound formats"
+msgstr "支援的音訊格式"
 
-#: ../main.c:91
-#, c-format
-msgid "Options:\n"
-msgstr "選項:\n"
+#: ../plugins/gtkui/fileman.c:340 ../plugins/gtkui/fileman.c:417
+msgid "All files (*)"
+msgstr "所有檔案（*）"
 
-#: ../main.c:92
-#, c-format
-msgid " --help or -h Print help (this message) and exit\n"
-msgstr " --help 或 -h 顯示說明 (本訊息) 並結束\n"
+#: ../plugins/gtkui/fileman.c:451 ../plugins/gtkui/fileman.c:495
+msgid "Supported playlist formats"
+msgstr "已支援的播放清單格式"
 
-#: ../main.c:93
-#, c-format
-msgid " --quit Quit player\n"
-msgstr " --quit 結束播放器\n"
+#: ../plugins/gtkui/fileman.c:458
+msgid "All files"
+msgstr "所有檔案"
 
-#: ../main.c:94
-#, c-format
-msgid " --version Print version info and exit\n"
-msgstr " --version 顯示版本資料並結束\n"
+#: ../plugins/gtkui/fileman.c:501
+msgid "Other files (*)"
+msgstr "其他檔案（*）"
 
-#: ../main.c:95
-#, c-format
-msgid " --play Start playback\n"
-msgstr " --play 開始播放\n"
+#: ../plugins/gtkui/fileman.c:512
+msgid "DeaDBeeF playlist files (*.dbpl)"
+msgstr "DeaDBeeF 播放清單（*.dbpl）"
 
-#: ../main.c:96
-#, c-format
-msgid " --stop Stop playback\n"
-msgstr " --stop 停止播放\n"
+#: ../plugins/gtkui/fileman.c:556
+msgid "Follow symlinks"
+msgstr "跟隨符號連結"
 
-#: ../main.c:97
+#: ../plugins/gtkui/gtkui.c:156 ../src/tf.c:2795
 #, c-format
-msgid " --pause Pause playback\n"
-msgstr " --pause 暫停播放\n"
+msgid "1 day %d:%02d:%02d"
+msgstr "1 天 %d:%02d:%02d"
 
-#: ../main.c:98
+#: ../plugins/gtkui/gtkui.c:159 ../src/tf.c:2798
 #, c-format
-msgid " --toggle-pause Toggle pause\n"
-msgstr " --toggle-pause 切換暫停狀態\n"
+msgid "%d days %d:%02d:%02d"
+msgstr "%d 天 %d:%02d:%02d"
 
-#: ../main.c:99
-#, c-format
-msgid ""
-" --play-pause Start playback if stopped, toggle pause otherwise\n"
-msgstr " --play-pause 如停止則開始播放，否則切換暫停狀態\n"
+#: ../plugins/gtkui/gtkui.c:205
+msgid "total playtime"
+msgstr "總播放時數"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "Paused"
+msgstr "已暫停"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:422
+msgid "bit"
+msgstr "位元"
+
+#: ../plugins/gtkui/gtkui.c:418 ../plugins/gtkui/gtkui.c:419
+msgid "selection playtime"
+msgstr "已選項目的播放長度"
+
+#: ../plugins/gtkui/gtkui.c:419 ../plugins/gtkui/gtkui.c:423
+msgid "Stopped"
+msgstr "已停止"
 
-#: ../main.c:100
-#, c-format
-msgid " --next Next song in playlist\n"
-msgstr " --next 播放清單下一首歌\n"
+#: ../plugins/gtkui/gtkui.c:585 ../plugins/gtkui/pltmenu.c:133
+msgid "Rename Playlist"
+msgstr "重新命名播放清單"
 
-#: ../main.c:101
-#, c-format
-msgid " --prev Previous song in playlist\n"
-msgstr " --prev 播放清單上一首歌\n"
+#: ../plugins/gtkui/gtkui.c:612
+msgid "Removing playlist"
+msgstr "移除播放清單"
 
-#: ../main.c:102
+#: ../plugins/gtkui/gtkui.c:613
 #, c-format
-msgid " --random Random song in playlist\n"
-msgstr " --random 播放清單隨機歌曲\n"
+msgid "Do you really want to remove the playlist '%s'?"
+msgstr "真的要移除播放清單 '%s'?"
 
-#: ../main.c:103
+#: ../plugins/gtkui/gtkui.c:764 ../plugins/pltbrowser/pltbrowser.c:68
 #, c-format
-msgid " --queue Append file(s) to existing playlist\n"
-msgstr " --queue 將檔案附加至播放清單\n"
+msgid "New Playlist (%d)"
+msgstr "新播放清單（%d）"
 
-#: ../main.c:104
-#, c-format
-msgid ""
-" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"
-msgstr ""
-" --gui 擴充 告訴程式您想使用哪個圖型介面擴充, 預設值是 \"GTK2\"\n"
-"\n"
+#. register widget types
+#: ../plugins/gtkui/gtkui.c:1452
+msgid "Playlist with tabs"
+msgstr "播放清單 (含分頁)"
 
-#: ../main.c:105
-#, c-format
-msgid " --nowplaying FMT Print formatted track name to stdout\n"
-msgstr " --nowplaying FMT 將格式化的歌曲名輸出至 stdout\n"
+#: ../plugins/gtkui/gtkui.c:1456
+msgid "Splitter (top and bottom)"
+msgstr "分隔線（上與下）"
 
-#: ../main.c:106
-#, c-format
-msgid ""
-" FMT %%-syntax: artist, title, album,\n"
-" length, tracknumber, year, comment,\n"
-" copyright, elapsed\n"
-msgstr ""
-" FMT %%-句法: a藝人, t歌名, b專輯,\n"
-" l長度, n歌曲編號, y年份, c評語,\n"
-" r版權, e已過時間\n"
+#: ../plugins/gtkui/gtkui.c:1457
+msgid "Splitter (left and right)"
+msgstr "分隔線（左與右）"
 
-#: ../main.c:109
-#, c-format
-msgid ""
-" e.g.: --nowplaying \"%%a - %%t\" should print \"artist "
-"- title\"\n"
+#: ../plugins/gtkui/gtkui.c:1459
+msgid "Tabs"
+msgstr "分頁"
+
+#: ../plugins/gtkui/gtkui.c:1460
+msgid "Playlist tabs"
+msgstr "播放清單分頁"
+
+#: ../plugins/gtkui/gtkui.c:1461
+msgid "Selection properties"
+msgstr "歌曲屬性"
+
+#: ../plugins/gtkui/gtkui.c:1462
+msgid "Album art display"
+msgstr "顯示專輯封面"
+
+#: ../plugins/gtkui/gtkui.c:1463
+msgid "Oscilloscope"
 msgstr ""
-" 例如: --nowplaying \"%%a - %%t\" 會顯示 \"藝人 - 歌名"
-"\"\n"
 
-#: ../main.c:110
-#, c-format
-msgid " for more info, see %s\n"
+#: ../plugins/gtkui/gtkui.c:1464
+msgid "Spectrum"
+msgstr "頻譜"
+
+#: ../plugins/gtkui/gtkui.c:1465
+msgid "HBox"
+msgstr "HBox"
+
+#: ../plugins/gtkui/gtkui.c:1466
+msgid "VBox"
+msgstr "VBox"
+
+#: ../plugins/gtkui/gtkui.c:1467 ../plugins/gtkui/widgets.c:3867
+#: ../plugins/gtkui/widgets.c:3954
+msgid "Button"
+msgstr "按鈕"
+
+#: ../plugins/gtkui/gtkui.c:1468
+msgid "Seekbar"
+msgstr "進度條"
+
+#: ../plugins/gtkui/gtkui.c:1469
+msgid "Playback controls"
+msgstr "播放控制按鈕"
+
+#: ../plugins/gtkui/gtkui.c:1470
+msgid "Volume bar"
+msgstr "音量條"
+
+#: ../plugins/gtkui/gtkui.c:1471
+msgid "Chiptune voices"
+msgstr "電子合成音"
+
+#: ../plugins/gtkui/gtkui.c:1472
+msgid "Log viewer"
+msgstr "日誌檢視器"
+
+#: ../plugins/gtkui/gtkui.c:1474
+msgid "Media library viewer"
 msgstr ""
 
-#: ../playlist.c:481 ../playlist.c:2557
-msgid "Default"
-msgstr "預設"
+#: ../plugins/gtkui/gtkui.c:1685
+msgid "Failed while reading help file"
+msgstr "未能讀取說明檔案"
 
-#: ../playlist.c:3981
-msgid "Yes"
-msgstr "是"
+#: ../plugins/gtkui/gtkui.c:1695
+msgid "Failed to load help file"
+msgstr "未能載入說明檔案"
 
-#: ../playlist.c:3981
-msgid "No"
-msgstr "否"
+#: ../plugins/gtkui/gtkui.c:1712
+msgid ""
+"The player is currently running background tasks. If you quit now, the tasks"
+" will be cancelled or interrupted. This may result in data loss."
+msgstr "播放器正在背景執行中。如果您現在退出，程式將會被取消或中斷。這可能導致資料遺失。"
 
-#: ../plugins/gtkui/deadbeef.glade.h:74
+#: ../plugins/gtkui/gtkui.c:1714
+msgid "Do you still want to quit?"
+msgstr "仍然要退出？"
+
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:46
 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"
+" The files will be moved to trash.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"項目索引\n"
-"正在播放專輯封面藝人 - 專輯藝人專輯歌名長度歌曲編號樂隊 / 專輯藝人自訂"
 
-#: ../plugins/gtkui/deadbeef.glade.h:87
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:47
 msgid ""
-"Left\n"
-"Right"
+" The files will be lost.\n"
+"\n"
+"(This dialog can be turned off in GTKUI plugin settings)"
 msgstr ""
-"左\n"
-"右"
 
-#: ../plugins/gtkui/deadbeef.glade.h:95
-msgid ""
-"Disable\n"
-"Track\n"
-"Album"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:52
+#, c-format
+msgid "Do you really want to delete the selected file?%s"
 msgstr ""
-"停用\n"
-"歌曲專輯"
 
-#: ../plugins/gtkui/deadbeef.glade.h:176
-msgid ""
-"Ascending\n"
-"Descending"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:54
+#, c-format
+msgid "Do you really want to delete all %d selected files?%s"
 msgstr ""
-"順序\n"
-"逆序"
 
-#: ../plugins/gtkui/deadbeef.glade.h:188
-msgid ""
-"2.3 (Recommended)\n"
-"2.4"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:59
+#, c-format
+msgid "Do you really want to delete all %d files from the current playlist?%s"
 msgstr ""
-"2.3 (建議版本)\n"
-"2.4"
 
-#: ../plugins/wildmidi/wildmidiplug.c:174
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:62
 #, 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 "Do you really want to delete the currently playing file?%s"
 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"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:65
+msgid "Delete files from disk"
 msgstr ""
 
-#: ../translation/extra.c:4
-msgid "Lookup on Last.fm"
-msgstr "在 Last.fm 查看"
+#: ../plugins/gtkui/gtkui_deletefromdisk.c:68 ../plugins/gtkui/widgets.c:901
+#: ../plugins/shellexecui/shellexecui.c:139
+msgid "Delete"
+msgstr "刪除"
 
-#. ALSA output plugin
-#: ../translation/extra.c:6
-msgid "Use ALSA resampling"
-msgstr "使用 ALSA 再取樣"
+#: ../plugins/gtkui/interface.c:1414
+msgid "Left"
+msgstr "左"
 
-#: ../translation/extra.c:7
-msgid "Release device while stopped"
-msgstr "停止時釋出裝置"
+#: ../plugins/gtkui/interface.c:1415
+msgid "Right"
+msgstr "右"
 
-#: ../translation/extra.c:8 ../translation/extra.c:55
-msgid "Preferred buffer size"
-msgstr "偏好的緩衝區大小"
+#: ../plugins/gtkui/interface.c:1416
+msgid "Center"
+msgstr "置中"
 
-#: ../translation/extra.c:9
-msgid "Preferred period size"
-msgstr "偏好的間隔大小"
+#: ../plugins/gtkui/interface.c:1893
+msgid "Disabled"
+msgstr ""
 
-#. Last.fm plugin
-#: ../translation/extra.c:11
-msgid "Enable scrobbler"
-msgstr "偏用歌曲記錄"
+#: ../plugins/gtkui/interface.c:1894
+msgid "8 bit"
+msgstr ""
 
-#: ../translation/extra.c:12
-msgid "Disable nowplaying"
-msgstr "停用 nowplaying"
+#: ../plugins/gtkui/interface.c:1895
+msgid "16 bit"
+msgstr ""
 
-#: ../translation/extra.c:13
-msgid "Username"
-msgstr "使用者名稱"
+#: ../plugins/gtkui/interface.c:1896
+msgid "24 bit"
+msgstr ""
 
-#: ../translation/extra.c:14
-msgid "Password"
-msgstr "密碼"
+#: ../plugins/gtkui/interface.c:1897
+msgid "32 bit"
+msgstr ""
 
-#: ../translation/extra.c:15
-msgid "Scrobble URL"
-msgstr "Scrobble 網址"
+#: ../plugins/gtkui/interface.c:2028
+msgid "By playback order"
+msgstr "依播放順序"
 
-#: ../translation/extra.c:16
-msgid "Prefer Album Artist over Artist field"
-msgstr "以專輯作者取代作者欄"
+#: ../plugins/gtkui/interface.c:2029
+msgid "Track"
+msgstr "曲目"
 
-#. OSS output plugin
-#: ../translation/extra.c:18
-msgid "Device file"
-msgstr "裝置檔案"
+#: ../plugins/gtkui/interface.c:2045 ../plugins/gtkui/playlist/plcommon.c:896
+#: ../plugins/gtkui/widgets.c:3293 ../plugins/gtkui/widgets.c:3964
+#: ../translation/plugins.c:114
+#, no-c-format
+msgid "None"
+msgstr "無"
 
-#: ../translation/extra.c:19
-msgid "OSS4 samplerate bug workaround"
-msgstr "OSS4 取樣率問題臨時解決辦法"
+#: ../plugins/gtkui/interface.c:2046
+msgid "Apply gain"
+msgstr "啟用音量標準化"
+
+#: ../plugins/gtkui/interface.c:2047
+msgid "Apply gain and prevent clipping according to peak"
+msgstr "啟用音量標準化並防止爆音"
+
+#: ../plugins/gtkui/interface.c:2048
+msgid "Only prevent clipping"
+msgstr "只防止爆音"
 
-#. Album Artwork plugin
-#: ../translation/extra.c:21
-msgid "Cache update period (hr)"
-msgstr "快取更新間隔 (小時)"
+#: ../plugins/gtkui/interface.c:4422
+msgid "Ascending"
+msgstr "順序"
 
-#: ../translation/extra.c:22
-msgid "Fetch from embedded tags"
-msgstr "由內置標記取得"
+#: ../plugins/gtkui/interface.c:4423
+msgid "Descending"
+msgstr "逆序"
 
-#: ../translation/extra.c:23
-msgid "Fetch from local folder"
-msgstr "由本機資料夾取得"
+#: ../plugins/gtkui/interface.c:4653
+msgid "2.3 (Recommended)"
+msgstr "2.3（建議版本）"
 
-#: ../translation/extra.c:24
-msgid "Local cover file mask"
-msgstr "本機封面檔案遮罩"
-
-#: ../translation/extra.c:25
-msgid "Fetch from last.fm"
-msgstr "由 last.fm 取得"
-
-#: ../translation/extra.c:26
-msgid "Fetch from albumart.org"
-msgstr "由 albumart.org 取得"
-
-#: ../translation/extra.c:27
-msgid "Scale artwork towards longer side"
-msgstr "依較長一邊縮放封面"
-
-#. Audio CD player
-#: ../translation/extra.c:29
-msgid "Use CDDB/FreeDB"
-msgstr "使用 CDDB/FreeDB"
+#: ../plugins/gtkui/interface.c:4654
+msgid "2.4"
+msgstr "2.4"
 
-#: ../translation/extra.c:30
-msgid "Prefer CD-Text over CDDB"
-msgstr "優先使用 CD-Text 而非 CDDB"
+#: ../plugins/gtkui/playlist/mainplaylist.c:233
+#: ../plugins/gtkui/playlist/searchplaylist.c:191
+msgid "Artist / Album"
+msgstr "藝人 / 專輯"
 
-#: ../translation/extra.c:31
-msgid "CDDB url (e.g. 'freedb.org')"
-msgstr "CDDB url (例如 freedb.org)"
-
-#: ../translation/extra.c:32
-msgid "CDDB port number (e.g. '888')"
-msgstr "CDDB 連接埠號碼 (例如 888)"
-
-#: ../translation/extra.c:33
-msgid "Prefer CDDB protocol over HTTP"
-msgstr "優先使用 CDDB 協定而非 HTTP"
+#: ../plugins/gtkui/playlist/mainplaylist.c:234
+#: ../plugins/gtkui/playlist/searchplaylist.c:192
+msgid "Track No"
+msgstr "曲目"
 
-#: ../translation/extra.c:34
-msgid "Enable NRG image support"
-msgstr "啟用支援 NRG 影像"
+#: ../plugins/gtkui/playlist/mainplaylist.c:236
+#: ../plugins/gtkui/playlist/plcommon.c:81
+#: ../plugins/gtkui/playlist/searchplaylist.c:194
+#: ../plugins/pltbrowser/pltbrowser.c:407
+#: ../plugins/pltbrowser/pltbrowser.c:864
+msgid "Duration"
+msgstr "長度"
 
-#. DUMB module player plugin
-#: ../translation/extra.c:36
-msgid "Resampling quality (0..2, higher is better)"
-msgstr "重取樣品質 (0..2，越高越好)"
-
-#: ../translation/extra.c:37
-msgid "8-bit output (default is 16)"
-msgstr "8-bit 輸出 (預設值是 16)"
+#: ../plugins/gtkui/playlist/plcommon.c:73
+msgid "Item Index"
+msgstr "項目索引"
 
-#. Game_Music_Emu decoder plugin
-#: ../translation/extra.c:39
-msgid "Max song length (in minutes)"
-msgstr "歌曲最大長度 (分鐘)"
+#: ../plugins/gtkui/playlist/plcommon.c:74
+#: ../plugins/pltbrowser/pltbrowser.c:405
+msgid "Playing"
+msgstr "正在播放"
 
-#: ../translation/extra.c:40
-msgid "Fadeout length (seconds)"
-msgstr "淡出長度 (單位:秒)"
+#: ../plugins/gtkui/playlist/plcommon.c:75
+msgid "Album Art"
+msgstr "專輯封面"
 
-#: ../translation/extra.c:41
-msgid "Play loops nr. of times (if available)"
-msgstr "重複播放 數字 次 (若支援)"
+#: ../plugins/gtkui/playlist/plcommon.c:76
+msgid "Artist - Album"
+msgstr "藝人 - 專輯"
 
-#. Standard GTK2 user interface plugin
-#: ../translation/extra.c:43
-msgid "Ask confirmation to delete files from disk"
-msgstr "自磁碟刪除檔案要先確認"
+#: ../plugins/gtkui/playlist/plcommon.c:80
+msgid "Year"
+msgstr "年"
 
-#: ../translation/extra.c:44
-msgid "Status icon volume control sensitivity"
-msgstr "狀態圖示音量控制敏感度"
+#: ../plugins/gtkui/playlist/plcommon.c:82 ../translation/extra.c:8
+msgid "Track Number"
+msgstr "曲目"
 
-#: ../translation/extra.c:45
-msgid "Custom status icon"
-msgstr "自訂狀態圖示"
+#: ../plugins/gtkui/playlist/plcommon.c:83 ../translation/extra.c:5
+msgid "Band / Album Artist"
+msgstr "樂隊 / 專輯藝人"
 
-#: ../translation/extra.c:46
-msgid "Run gtk_init with --sync (debug mode)"
-msgstr "以 --sync (除錯模式) 執行 gtk_init"
+#: ../plugins/gtkui/playlist/plcommon.c:84 ../translation/extra.c:21
+msgid "Codec"
+msgstr "編碼解碼器"
 
-#: ../translation/extra.c:47
-msgid "Add separators between plugin context menu items"
-msgstr "在外掛程式境況選單項目之間加入分隔符號"
+#: ../plugins/gtkui/playlist/plcommon.c:85
+msgid "Bitrate"
+msgstr "位元率"
 
-#. OSD Notify plugin
-#: ../translation/extra.c:49
-msgid "Notification title format"
-msgstr "通告標題格式"
+#: ../plugins/gtkui/playlist/plcommon.c:722
+#: ../plugins/gtkui/playlist/plcommon.c:861
+msgid "Add column"
+msgstr "加入欄位"
 
-#: ../translation/extra.c:50
-msgid "Notification content format"
-msgstr "通告內容格式"
+#: ../plugins/gtkui/playlist/plcommon.c:763
+#: ../plugins/gtkui/playlist/plcommon.c:865
+msgid "Edit column"
+msgstr "編輯欄位"
 
-#: ../translation/extra.c:51
-msgid "Show album art"
-msgstr "顯示專輯封面"
+#: ../plugins/gtkui/playlist/plcommon.c:869
+msgid "Remove column"
+msgstr "移除欄位"
 
-#: ../translation/extra.c:52
-msgid "Album art size (px)"
-msgstr "專輯封面尺寸 (像素)"
+#: ../plugins/gtkui/playlist/plcommon.c:884
+msgid "Pin groups when scrolling"
+msgstr "當滾動頁面時鎖定群組"
 
-#. PulseAudio output plugin
-#: ../translation/extra.c:54
-msgid "PulseAudio server"
-msgstr "PulseAudio 伺服器"
+#: ../plugins/gtkui/playlist/plcommon.c:889
+msgid "Group by"
+msgstr "分組根據："
 
-#: ../translation/extra.c:56
-msgid "Samplerate"
-msgstr "取樣率"
+#: ../plugins/gtkui/playlist/plcommon.c:900
+msgid "Artist/Date/Album"
+msgstr "藝人/日期/專輯"
 
-#. SHN player plugin
-#: ../translation/extra.c:58
-msgid "Relative seek table path"
-msgstr "相對搜索表格路徑"
+#: ../plugins/gtkui/plmenu.c:491
+msgid "Play Next"
+msgstr ""
 
-#: ../translation/extra.c:59
-msgid "Absolute seek table path"
-msgstr "絕對搜索表格路徑"
+#: ../plugins/gtkui/plmenu.c:496
+msgid "Play Later"
+msgstr ""
 
-#: ../translation/extra.c:60
-msgid "Swap audio bytes (toggle if all you hear is static)"
-msgstr "置換音訊位元組 (如聽到的只是雜訊則切換)"
+#: ../plugins/gtkui/plmenu.c:501 ../translation/plugins.c:329
+#, no-c-format
+msgid "Remove from Playback Queue"
+msgstr ""
 
-#. SID decoder plugin
-#: ../translation/extra.c:62
-msgid "Enable HVSC Songlength DB"
-msgstr "啟用 HVSC 歌曲長度資料庫"
+#: ../plugins/gtkui/plmenu.c:522 ../translation/plugins.c:267
+#, no-c-format
+msgid "Reload Metadata"
+msgstr "重整音樂資料"
 
-#: ../translation/extra.c:63
-msgid "Songlengths.txt (from HVSC)"
-msgstr "Songlengths.txt (來自 HVSC)"
-
-#: ../translation/extra.c:64
-msgid "Bits per sample (8 or 16)"
-msgstr "取樣位元 (8 或 16)"
+#: ../plugins/gtkui/plmenu.c:536
+msgid "Cu_t"
+msgstr ""
 
-#: ../translation/extra.c:65
-msgid "Default song length (sec)"
-msgstr "預設歌曲長度 (秒)"
+#: ../plugins/gtkui/plmenu.c:552
+msgid "_Copy"
+msgstr ""
 
-#. WildMidi player plugin
-#: ../translation/extra.c:67
-msgid "Timidity++ bank configuration file"
-msgstr "Timidity++ 樂器庫設定檔案"
+#: ../plugins/gtkui/plmenu.c:569
+msgid "_Paste"
+msgstr ""
 
-#: ../translation/extra.c:70
-msgid "Track Title"
-msgstr "歌曲名稱"
+#: ../plugins/gtkui/plmenu.c:610 ../translation/plugins.c:164
+#, no-c-format
+msgid "Delete from Disk"
+msgstr ""
 
-#: ../translation/extra.c:71
-msgid "Performer"
-msgstr "演唱"
+#: ../plugins/gtkui/pltmenu.c:140
+msgid "Remove Playlist"
+msgstr "移除播放清單"
 
-#: ../translation/extra.c:76
-msgid "Total Tracks"
-msgstr "總歌曲數"
+#: ../plugins/gtkui/pltmenu.c:148
+msgid "Add New Playlist"
+msgstr "新增播放清單"
 
-#: ../translation/extra.c:77
-msgid "Genre"
-msgstr "種類"
+#: ../plugins/gtkui/pltmenu.c:157
+msgid "Enable Autosort"
+msgstr "啟用自動排序"
 
-#: ../translation/extra.c:78
-msgid "Composer"
-msgstr "作曲"
+#: ../plugins/gtkui/pltmenu.c:158
+msgid ""
+"Re-apply the last sort you chose every time when adding new files to this "
+"playlist"
+msgstr ""
 
-#: ../translation/extra.c:79
-msgid "Disc Number"
-msgstr "碟號"
+#: ../plugins/gtkui/pluginconf.c:47
+msgid "Open file..."
+msgstr "開啟檔案…"
 
-#: ../translation/extra.c:80
-msgid "Comment"
-msgstr "評語"
+#: ../plugins/gtkui/pluginconf.c:559
+#, c-format
+msgid "Configure %s"
+msgstr "設定 %s"
 
-#: ../translation/extra.c:81
-msgid "Encoder / Vendor"
-msgstr "編碼器 / 生產者"
+#: ../plugins/gtkui/prefwin/prefwin.c:140
+msgid "You modified the hotkeys settings, but didn't save your changes."
+msgstr "您改變了快捷鍵設定，但尚未儲存。"
 
-#: ../translation/extra.c:83
-msgid "Location"
-msgstr "位址"
+#: ../plugins/gtkui/prefwin/prefwin.c:142
+msgid "Are you sure you want to continue without saving?"
+msgstr "您確定不儲存繼續嗎？"
 
-#: ../translation/extra.c:84
-msgid "Subtrack Index"
-msgstr "子曲目索引"
+#: ../plugins/gtkui/prefwin/prefwinsound.c:69
+msgid "Default Audio Device"
+msgstr "預設音訊裝置"
 
-#: ../translation/extra.c:85
-msgid "Tag Type(s)"
-msgstr "標記類型"
+#: ../plugins/gtkui/progress.c:62
+msgid "Adding files..."
+msgstr "正在加入檔案…"
 
-#: ../translation/extra.c:86
-msgid "Embedded Cuesheet"
-msgstr "內置提場紙(Cuesheet)"
+#: ../plugins/gtkui/progress.c:95
+msgid "Initializing..."
+msgstr "正在初始化…"
 
-#: ../translation/extra.c:87
-msgid "Codec"
-msgstr "編碼解碼器"
+#: ../plugins/gtkui/rg.c:281
+msgid "Updating File Tags Progress"
+msgstr "更新檔案標籤進度"
 
-#. FFmpeg deocder plugin
-#: ../translation/extra.c:89
-msgid "File Extensions (separate with ';')"
-msgstr "檔案副檔名 (以 ; 分隔)"
+#: ../plugins/gtkui/rg.c:309 ../plugins/gtkui/selpropertieswidget.c:310
+#: ../plugins/gtkui/trkproperties.c:442 ../plugins/pltbrowser/pltbrowser.c:850
+msgid "Name"
+msgstr "名稱"
 
-#. Converter GUI
-#: ../translation/extra.c:91
-msgid "Convert"
-msgstr "轉換"
+#: ../plugins/gtkui/rg.c:311
+msgid "Album Gain"
+msgstr "專輯音量標準化"
+
+#: ../plugins/gtkui/rg.c:312
+msgid "Track Gain"
+msgstr "單曲音量標準化"
+
+#: ../plugins/gtkui/rg.c:313
+msgid "Album Peak"
+msgstr "專輯音量峰值"
+
+#: ../plugins/gtkui/rg.c:314
+msgid "Track Peak"
+msgstr "單曲音量峰值"
+
+#: ../plugins/gtkui/rg.c:317
+msgid "Success"
+msgstr "成功"
+
+#: ../plugins/gtkui/rg.c:318
+msgid "File not found"
+msgstr "找不到檔案"
+
+#: ../plugins/gtkui/rg.c:319
+msgid "Invalid file"
+msgstr "無效的檔案"
+
+#: ../plugins/gtkui/search.c:469
+msgid "Search (%list_total% results)"
+msgstr "尋找 （共%list_total% 項結果）"
 
-#. Resampler (Secret Rabbit Code)
-#: ../translation/extra.c:93
-msgid "Target Samplerate"
-msgstr "目標取樣率"
+#: ../plugins/gtkui/selpropertieswidget.c:265 ../plugins/gtkui/widgets.c:2223
+#: ../plugins/pltbrowser/pltbrowser.c:806
+msgid "Show Column Headers"
+msgstr "顯示欄位名稱"
 
-#: ../translation/extra.c:94
-msgid "Quality / Algorithm"
-msgstr "品質 / 演算法"
+#: ../plugins/gtkui/selpropertieswidget.c:312
+#: ../plugins/gtkui/trkproperties.c:443 ../plugins/gtkui/trkproperties.c:456
+msgid "Value"
+msgstr "值"
 
-#: ../translation/extra.c:95
-msgid "Automatic Samplerate (overrides Target Samplerate)"
-msgstr "自動取樣率 (優先於「目標取樣率」)"
+#: ../plugins/gtkui/trkproperties.c:116
+msgid "You've modified data for this track."
+msgstr "已修改此曲目資料。"
 
-#. shellexecui
-#: ../translation/extra.c:97
-msgid "Configure Custom Shell Commands"
-msgstr ""
+#: ../plugins/gtkui/trkproperties.c:118
+msgid "Really close the window?"
+msgstr "真要關閉視窗？"
 
-#. mpgmad
-#: ../translation/extra.c:99
-msgid "Disable gapless playback (faster scanning)"
-msgstr "取消無間斷播放 (掃瞄更快速)"
+#. get value to edit
+#: ../plugins/gtkui/trkproperties.c:280 ../plugins/gtkui/trkproperties.c:1066
+msgid "Multiple values "
+msgstr "多重值 "
 
-#. adplug
-#: ../translation/extra.c:101
-msgid "Prefer Ken emu over Satoh (surround won't work)"
-msgstr "優先使用 Ken emu 取代 Satoh (環繞音效將無效)"
+#: ../plugins/gtkui/trkproperties.c:455
+msgid "Key"
+msgstr "按鍵"
 
-#: ../translation/extra.c:102
-msgid "Enable surround"
-msgstr "開啟環繞音效"
+#: ../plugins/gtkui/trkproperties.c:473
+msgid "Multiple values"
+msgstr "多重值"
 
-#: ../plugins/converter/convgui.c:84
-#, c-format
-msgid "Built-in %s"
+#: ../plugins/gtkui/trkproperties.c:662
+msgid "Writing tags..."
+msgstr "正在寫入標籤…"
+
+#: ../plugins/gtkui/trkproperties.c:996
+msgid "Item"
 msgstr ""
 
-#: ../plugins/converter/convgui.c:130
-msgid "The file already exists. Overwrite?"
-msgstr "已有該檔案。是否覆寫？"
+#: ../plugins/gtkui/trkproperties.c:997
+msgid "Field"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:132
-msgid "Converter warning"
-msgstr "轉換器警告"
+#: ../plugins/gtkui/trkproperties.c:1210
+msgid "Field name"
+msgstr "欄位名稱"
 
-#: ../plugins/converter/convgui.c:300
-msgid "Please select encoder"
-msgstr "請選取編碼器"
+#: ../plugins/gtkui/trkproperties.c:1213
+msgid "Name:"
+msgstr "名稱："
 
-#: ../plugins/converter/convgui.c:302
-msgid "Converter error"
-msgstr "轉換器出錯"
+#: ../plugins/gtkui/trkproperties.c:1226
+msgid "Field names must not start with : or _"
+msgstr "欄位名稱不能以 : 或 _ 開頭"
 
-#: ../plugins/converter/convgui.c:326
-msgid "Converting..."
-msgstr "正在轉換..."
+#: ../plugins/gtkui/trkproperties.c:1227 ../plugins/gtkui/trkproperties.c:1268
+msgid "Cannot add field"
+msgstr "無法加入欄位"
 
-#: ../plugins/converter/convgui.c:536
-msgid "Select folder..."
-msgstr "選取資料夾..."
+#: ../plugins/gtkui/trkproperties.c:1267
+msgid "Field with such name already exists, please try different name."
+msgstr "已有此名稱欄位，請選別個。"
 
-#: ../plugins/converter/convgui.c:769
-msgid "Failed to save encoder preset"
-msgstr "未能儲存編碼器預設值"
+#: ../plugins/gtkui/widgets.c:460
+#, c-format
+msgid "Widget \"%s\" is not available"
+msgstr "元件 \"%s\" 不被允許"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid ""
-"Check preset folder permissions, try to pick different title, or free up "
-"some disk space"
-msgstr "檢查預設值資料夾權限、嘗試揀選另一個歌名，又或空出一些磁碟空間"
+#: ../plugins/gtkui/widgets.c:875
+msgid "Replace with..."
+msgstr "取代為…"
 
-#: ../plugins/converter/convgui.c:771 ../plugins/converter/convgui.c:1324
-msgid "Preset with the same name already exists. Try to pick another title."
-msgstr "已有同名預設值。請揀選另一個。"
+#: ../plugins/gtkui/widgets.c:880
+msgid "Insert..."
+msgstr "插入…"
 
-#: ../plugins/converter/convgui.c:772 ../plugins/converter/convgui.c:1325
-#: ../plugins/gtkui/ctmapping.c:202 ../plugins/gtkui/ctmapping.c:230
-#: ../plugins/gtkui/ctmapping.c:262
-msgid "Error"
-msgstr "錯誤"
+#: ../plugins/gtkui/widgets.c:908
+msgid "Cut"
+msgstr "剪下"
 
-#: ../plugins/converter/convgui.c:826 ../plugins/converter/convgui.c:960
-msgid "Add new encoder"
-msgstr "加入新編碼器"
+#: ../plugins/gtkui/widgets.c:915
+msgid "Copy"
+msgstr "複製"
 
-#: ../plugins/converter/convgui.c:856
-msgid "Edit encoder"
-msgstr "編輯編碼器"
+#: ../plugins/gtkui/widgets.c:923
+msgid "Paste"
+msgstr "貼上"
 
-#: ../plugins/converter/convgui.c:888 ../plugins/converter/convgui.c:1459
-msgid "Remove preset"
-msgstr "移除預設值"
+#: ../plugins/gtkui/widgets.c:972
+msgid "Parent"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:890 ../plugins/converter/convgui.c:1461
-msgid "This action will delete the selected preset. Are you sure?"
-msgstr "此舉會刪除所選預設值。確定嗎？"
+#: ../plugins/gtkui/widgets.c:1090
+msgid "Multiple widgets of this type are not supported"
+msgstr "此類型的元件不能重複使用"
 
-#: ../plugins/converter/convgui.c:974
-msgid "Encoders"
-msgstr "編碼器"
+#: ../plugins/gtkui/widgets.c:1375
+msgid "Proportional Sizing"
+msgstr "等比例縮放"
 
-#: ../plugins/converter/convgui.c:1048 ../plugins/gtkui/dspconfig.c:186
-msgid "Add plugin to DSP chain"
-msgstr "將外掛程式加入至 DSP 連鎖"
+#: ../plugins/gtkui/widgets.c:1387
+msgid "Lock Top Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1323
-msgid "Failed to save DSP preset"
-msgstr "未能儲存 DSP 預設值"
+#: ../plugins/gtkui/widgets.c:1390
+msgid "Lock Left Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1387 ../plugins/converter/convgui.c:1425
-msgid "New DSP Preset"
-msgstr "新增 DSP 預設值"
+#: ../plugins/gtkui/widgets.c:1403
+msgid "Lock Bottom Pane Height"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1509
-msgid "Edit DSP Preset"
-msgstr "編輯 DSP 預設值"
+#: ../plugins/gtkui/widgets.c:1406
+msgid "Lock Right Pane Width"
+msgstr ""
 
-#: ../plugins/converter/convgui.c:1529
-msgid "DSP Presets"
-msgstr "DSP 預設值"
+#: ../plugins/gtkui/widgets.c:1672 ../plugins/gtkui/widgets.c:1787
+msgid "Rename Tab"
+msgstr "重命名分頁"
 
-#: ../plugins/converter/interface.c:93
-#: ../plugins/converter/converter.glade.h:1
-msgid "Output folder:"
-msgstr "輸出資料夾："
+#: ../plugins/gtkui/widgets.c:1794
+msgid "Remove Tab"
+msgstr "移除分頁"
 
-#: ../plugins/converter/interface.c:110
-#: ../plugins/converter/converter.glade.h:2
-msgid "Write to source track folder"
-msgstr "寫入來源曲目資料夾"
+#: ../plugins/gtkui/widgets.c:1801 ../plugins/gtkui/widgets.c:1980
+msgid "Add New Tab"
+msgstr "新增頁籤"
 
-#: ../plugins/converter/interface.c:114
-#: ../plugins/converter/converter.glade.h:3
-msgid "Preserve folder structure"
-msgstr "保持資料夾結構"
+#: ../plugins/gtkui/widgets.c:1810
+msgid "Move Tab Left"
+msgstr "頁籤左移"
 
-#: ../plugins/converter/interface.c:122
-#: ../plugins/converter/converter.glade.h:4
-msgid "Output file name:"
-msgstr "輸出檔案名稱："
+#: ../plugins/gtkui/widgets.c:1817
+msgid "Move Tab Right"
+msgstr "頁籤右移"
 
-#: ../plugins/converter/interface.c:133
-#: ../plugins/converter/converter.glade.h:6
-#, no-c-format
-msgid ""
-"Extension (e.g. .mp3) will be appended automatically.\n"
-"Leave the field empty for default (%a - %t)."
+#: ../plugins/gtkui/widgets.c:2780 ../plugins/gtkui/widgets.c:3270
+msgid "Rendering Mode"
 msgstr ""
-"會自動加上副檔名 (例如 .mp3)。\n"
-"留空使用預設值 (%a - %t)。"
 
-#: ../plugins/converter/interface.c:146
-#: ../plugins/converter/converter.glade.h:8
-msgid "Encoder:"
-msgstr "編碼器："
+#: ../plugins/gtkui/widgets.c:2785
+msgid "Multichannel"
+msgstr ""
 
-#: ../plugins/converter/interface.c:170
-#: ../plugins/converter/converter.glade.h:9
-msgid "DSP preset:"
-msgstr "DSP 預設值："
+#: ../plugins/gtkui/widgets.c:2794
+msgid "Scale"
+msgstr ""
 
-#: ../plugins/converter/interface.c:193
-#: ../plugins/converter/converter.glade.h:10
-msgid "Number of threads:"
-msgstr "線程數目："
+#: ../plugins/gtkui/widgets.c:2799
+msgid "Auto"
+msgstr ""
 
-#: ../plugins/converter/interface.c:206
-#: ../plugins/converter/converter.glade.h:11
-msgid "Output sample format:"
-msgstr "輸出取樣格式："
+#: ../plugins/gtkui/widgets.c:2801 ../translation/plugins.c:83
+#, no-c-format
+msgid "1x"
+msgstr "1 倍"
 
-#: ../plugins/converter/interface.c:213
-msgid "Keep source format"
-msgstr "保持來源格式"
+#: ../plugins/gtkui/widgets.c:2803 ../translation/plugins.c:85
+#, no-c-format
+msgid "2x"
+msgstr "2 倍"
 
-#: ../plugins/converter/interface.c:214
-msgid "8 bit signed int"
-msgstr "8 位元帶正負整數"
+#: ../plugins/gtkui/widgets.c:2805
+msgid "3x"
+msgstr ""
 
-#: ../plugins/converter/interface.c:215
-msgid "16 bit signed int"
-msgstr "16 位元帶正負整數"
+#: ../plugins/gtkui/widgets.c:2807 ../translation/plugins.c:87
+#, no-c-format
+msgid "4x"
+msgstr "4 倍"
 
-#: ../plugins/converter/interface.c:216
-msgid "24 bit signed int"
-msgstr "24 位元帶正負整數"
+#: ../plugins/gtkui/widgets.c:2816
+msgid "Fragment Duration"
+msgstr ""
 
-#: ../plugins/converter/interface.c:217
-msgid "32 bit signed int"
-msgstr "32 位元帶正負整數"
+#: ../plugins/gtkui/widgets.c:2821
+msgid "50 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:218
-msgid "32 bit float"
-msgstr "32 位元浮點數"
+#: ../plugins/gtkui/widgets.c:2823
+msgid "100 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:224
-#: ../plugins/converter/converter.glade.h:18
-msgid "When file exists:"
-msgstr "當有此檔案："
+#: ../plugins/gtkui/widgets.c:2825
+msgid "200 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:231
-msgid "Prompt"
-msgstr "提示"
+#: ../plugins/gtkui/widgets.c:2827
+msgid "300 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:232
-msgid "Overwrite"
-msgstr "覆寫"
+#: ../plugins/gtkui/widgets.c:2829
+msgid "500 ms"
+msgstr ""
 
-#: ../plugins/converter/interface.c:363
-#: ../plugins/converter/converter.glade.h:21
-msgid "Edit Encoder Preset"
-msgstr "編輯編碼器預設值"
+#: ../plugins/gtkui/widgets.c:3275
+msgid "Discrete Frequencies"
+msgstr ""
 
-#: ../plugins/converter/interface.c:386
-#: ../plugins/converter/converter.glade.h:23
-msgid "Untitled Encoder"
-msgstr "未命名編碼器"
+#: ../plugins/gtkui/widgets.c:3278
+msgid "1/12 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:394
-#: ../plugins/converter/converter.glade.h:24
-msgid "Output file extension:"
-msgstr "輸出檔案副檔名："
+#: ../plugins/gtkui/widgets.c:3281
+msgid "1/24 Octave Bands"
+msgstr ""
 
-#: ../plugins/converter/interface.c:401
-#: ../plugins/converter/converter.glade.h:25
-msgid "E.g. mp3"
-msgstr "例如 mp3"
+#: ../plugins/gtkui/widgets.c:3288
+msgid "Gap Size"
+msgstr ""
 
-#: ../plugins/converter/interface.c:409
-#: ../plugins/converter/converter.glade.h:26
-msgid "Command line:"
-msgstr "指令列："
+#: ../plugins/gtkui/widgets.c:3296
+msgid "1/2 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:420
-#: ../plugins/converter/converter.glade.h:28
-#, no-c-format
-msgid ""
-"Example: lame - %o\n"
-"%i for input file, %o for output file, - for stdin"
+#: ../plugins/gtkui/widgets.c:3299
+msgid "1/3 Bar"
 msgstr ""
-"例如: lame - %o\n"
-"%i 為輸入檔案、%o 為輸出檔案、- 為 stdin"
 
-#: ../plugins/converter/interface.c:430
-#: ../plugins/converter/converter.glade.h:31
-#, no-c-format
-msgid ""
-"%o - output file name\n"
-"%i - temporary input file name"
+#: ../plugins/gtkui/widgets.c:3302
+msgid "1/4 Bar"
 msgstr ""
-"%o - 輸出檔案名稱\n"
-"%i - 臨時輸入檔案名稱"
 
-#: ../plugins/converter/interface.c:439
-#: ../plugins/converter/converter.glade.h:33
-msgid "Method:"
-msgstr "方法："
+#: ../plugins/gtkui/widgets.c:3305
+msgid "1/5 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:446
-msgid "Pipe"
-msgstr "管線"
+#: ../plugins/gtkui/widgets.c:3308
+msgid "1/6 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:447
-msgid "Temporary file"
-msgstr "臨時檔案"
+#: ../plugins/gtkui/widgets.c:3311
+msgid "1/7 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:464
-#: ../plugins/converter/converter.glade.h:36
-msgid "APEv2"
-msgstr "APEv2"
+#: ../plugins/gtkui/widgets.c:3314
+msgid "1/8 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:470
-#: ../plugins/converter/converter.glade.h:37
-msgid "ID3v1"
-msgstr "ID3v1"
+#: ../plugins/gtkui/widgets.c:3317
+msgid "1/9 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:476
-#: ../plugins/converter/converter.glade.h:38
-msgid "OggVorbis"
-msgstr "OggVorbis"
+#: ../plugins/gtkui/widgets.c:3320
+msgid "1/10 Bar"
+msgstr ""
 
-#: ../plugins/converter/interface.c:482
-#: ../plugins/converter/converter.glade.h:39
-msgid "FLAC"
-msgstr "FLAC"
+#: ../plugins/gtkui/widgets.c:3584
+msgid "Expand Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:494
-#: ../plugins/converter/converter.glade.h:40
-msgid "ID3v2"
-msgstr "ID3v2"
+#: ../plugins/gtkui/widgets.c:3589
+msgid "Shrink Box by 1 Item"
+msgstr ""
 
-#: ../plugins/converter/interface.c:504
-#: ../plugins/converter/converter.glade.h:41
-msgid "Tag writer"
-msgstr "標記寫入器"
+#: ../plugins/gtkui/widgets.c:3594
+msgid "Homogeneous"
+msgstr "同性質"
 
-#: ../plugins/converter/interface.c:590
-#: ../plugins/converter/converter.glade.h:42
-msgid "DSP Preset Editor"
-msgstr "DSP 預設值編輯"
+#: ../plugins/gtkui/widgets.c:3634
+msgid "Expand"
+msgstr "擴充"
 
-#: ../plugins/converter/interface.c:613
-#: ../plugins/converter/converter.glade.h:44
-msgid "Untitled DSP Preset"
-msgstr "未命名 DSP 預設值"
+#: ../plugins/gtkui/widgets.c:3642
+msgid "Fill"
+msgstr "填入"
 
-#: ../plugins/converter/interface.c:625
-#: ../plugins/converter/converter.glade.h:45
-#: ../plugins/shellexecui/interface.c:62
-#: ../plugins/shellexecui/shellexec.glade.h:3
-msgid "Add"
-msgstr "加入"
+#: ../plugins/gtkui/widgets.c:4044
+msgid "Configure Button"
+msgstr "設定按鈕"
 
-#: ../plugins/converter/support.c:90 ../plugins/converter/support.c:114
-#: ../plugins/shellexecui/support.c:90 ../plugins/shellexecui/support.c:114
-#, c-format
-msgid "Couldn't find pixmap file: %s"
-msgstr "找不 pixmap 檔案：%s"
+#: ../plugins/gtkui/widgets.c:4317
+msgid "_dB Scale"
+msgstr ""
 
-#: ../plugins/converter/converter.glade.h:12
-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"
+#: ../plugins/gtkui/widgets.c:4328
+msgid "_Linear Scale"
 msgstr ""
-"保持來源格式\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:19
-msgid ""
-"Prompt\n"
-"Overwrite"
+#: ../plugins/gtkui/widgets.c:4339
+msgid "_Cubic Scale"
 msgstr ""
-"立刻\n"
-"覆寫"
 
-#: ../plugins/converter/converter.glade.h:34
-msgid ""
-"Pipe\n"
-"Temporary file"
+#: ../plugins/gtkui/widgets.c:4465
+msgid "Voices:"
+msgstr "聲音："
+
+#: ../plugins/hotkeys/actionhandlers.c:824
+#, c-format
+msgid "Copy of %s"
+msgstr ""
+
+#: ../plugins/hotkeys/actionhandlers.c:827
+#, c-format
+msgid "Copy of %s (%d)"
 msgstr ""
-"管道\n"
-"臨時檔案"
+
+#: ../plugins/pltbrowser/pltbrowser.c:170
+msgid " (paused)"
+msgstr "（已暫停）"
+
+#: ../plugins/pltbrowser/pltbrowser.c:173
+msgid " (stopped)"
+msgstr "（已停止）"
+
+#: ../plugins/pltbrowser/pltbrowser.c:176
+msgid " (playing)"
+msgstr "（播放中）"
+
+#. NOTE: localizable because of the "d" suffix for days
+#: ../plugins/pltbrowser/pltbrowser.c:213
+#, c-format
+msgid "%dd %d:%02d:%02d"
+msgstr "%d 天 %d:%02d:%02d"
+
+#: ../plugins/pltbrowser/pltbrowser.c:406
+#: ../plugins/pltbrowser/pltbrowser.c:859
+msgid "Items"
+msgstr "項目"
+
+#: ../plugins/pltbrowser/pltbrowser.c:853
+msgid "♫"
+msgstr "♫"
+
+#: ../plugins/pltbrowser/pltbrowser.c:911
+msgid "Playlist browser"
+msgstr "播放清單概覽"
 
 #: ../plugins/shellexecui/interface.c:46
 #: ../plugins/shellexecui/shellexec.glade.h:1
 msgid "Custom Shell Commands"
 msgstr "自訂 Shell 指令"
 
-#: ../plugins/shellexecui/interface.c:70
-#: ../plugins/shellexecui/shellexec.glade.h:5
-msgid "Edit"
-msgstr "編輯(_E)"
-
 #: ../plugins/shellexecui/interface.c:88
 #: ../plugins/shellexecui/shellexec.glade.h:2
 msgid "Close"
@@ -2055,7 +2618,7 @@
 #: ../plugins/shellexecui/interface.c:170
 #: ../plugins/shellexecui/shellexec.glade.h:8
 msgid "Command:"
-msgstr "指令: "
+msgstr "指令："
 
 #: ../plugins/shellexecui/interface.c:182
 #: ../plugins/shellexecui/shellexec.glade.h:10
@@ -2069,69 +2632,69 @@
 #: ../plugins/shellexecui/interface.c:185
 #: ../plugins/shellexecui/shellexec.glade.h:11
 msgid "ID:"
-msgstr "ID:"
+msgstr "ID："
 
 #: ../plugins/shellexecui/interface.c:197
 #: ../plugins/shellexecui/shellexec.glade.h:12
 msgid "Free-form name, for example \"My Shell Command\""
-msgstr ""
+msgstr "形式不拘，例如：我的 Shell 指令"
 
 #: ../plugins/shellexecui/interface.c:205
 #: ../plugins/shellexecui/shellexec.glade.h:13
 msgid ""
-"Command ID, normally it should be something short, for example \"youtube_open"
-"\". It must be unique."
-msgstr ""
+"Command ID, normally it should be something short, for example "
+"\"youtube_open\". It must be unique."
+msgstr "指令 ID，通常要簡短且不能重複，例如：youtube_open"
 
 #: ../plugins/shellexecui/interface.c:208
 #: ../plugins/shellexecui/shellexec.glade.h:15
 msgid "Single Tracks"
-msgstr ""
+msgstr "單一曲目"
 
 #: ../plugins/shellexecui/interface.c:211
 #: ../plugins/shellexecui/shellexec.glade.h:14
 msgid "Works on single track."
-msgstr ""
+msgstr "作用在單一曲目。"
 
 #: ../plugins/shellexecui/interface.c:213
 #: ../plugins/shellexecui/shellexec.glade.h:17
 msgid "Multiple Tracks"
-msgstr ""
+msgstr "多曲目"
 
 #: ../plugins/shellexecui/interface.c:216
 #: ../plugins/shellexecui/shellexec.glade.h:16
 msgid "Works on multiple tracks."
-msgstr ""
+msgstr "作用在多曲目。"
 
 #: ../plugins/shellexecui/interface.c:218
 #: ../plugins/shellexecui/shellexec.glade.h:19
 msgid "Local"
-msgstr ""
+msgstr "本機"
 
 #: ../plugins/shellexecui/interface.c:221
 #: ../plugins/shellexecui/shellexec.glade.h:18
 msgid "Works on local files."
-msgstr ""
+msgstr "作用在本機檔案。"
 
 #: ../plugins/shellexecui/interface.c:223
 #: ../plugins/shellexecui/shellexec.glade.h:21
 msgid "Remote"
-msgstr ""
+msgstr "遙控"
 
 #: ../plugins/shellexecui/interface.c:226
 #: ../plugins/shellexecui/shellexec.glade.h:20
 msgid "Works on remote files (e.g. http:// streams)"
-msgstr ""
+msgstr "作用在遠端操控檔案（例如：http:// streams）"
 
 #: ../plugins/shellexecui/interface.c:228
 #: ../plugins/shellexecui/shellexec.glade.h:23
 msgid "Generic (Main Menu)"
-msgstr ""
+msgstr "一般（主選單）"
 
 #: ../plugins/shellexecui/interface.c:231
 #: ../plugins/shellexecui/shellexec.glade.h:22
 msgid "Item should appear in the main menu"
-msgstr ""
+msgstr "應顯示在主選單中的項目"
 
 #: ../plugins/shellexecui/interface.c:233
 #: ../plugins/shellexecui/shellexec.glade.h:24
@@ -2139,223 +2702,1271 @@
 "If you want to add the command to main menu, make sure that title "
 "contains the menu path like this: \"File/My Command\", where File is the "
 "menu name in the English version."
-msgstr ""
+msgstr " 如果您想要將指令加入到主選單，請確保標題內含有清單路徑，像是：「檔案 / 我的指令」，當中的「檔案」是英文的清單名稱。"
 
 #: ../plugins/shellexecui/shellexecui.c:96
 msgid "Add Command"
-msgstr ""
-
-#: ../plugins/shellexecui/shellexecui.c:139 ../plugins/gtkui/widgets.c:797
-msgid "Delete"
-msgstr ""
+msgstr "加入指令"
 
 #: ../plugins/shellexecui/shellexecui.c:141
 msgid "This action will delete the selected shell command. Are you sure?"
-msgstr ""
+msgstr "即將刪除你選擇的 shell 指令。確定嗎？"
 
 #: ../plugins/shellexecui/shellexecui.c:143
 msgid "Confirm Remove"
-msgstr ""
+msgstr "確認刪除"
 
 #: ../plugins/shellexecui/shellexecui.c:229
 msgid "ID must be non-empty and unique.\n"
-msgstr ""
+msgstr "ID 不能留白或重複\n"
 
 #: ../plugins/shellexecui/shellexecui.c:235
 msgid "Title must be non-empty.\n"
-msgstr ""
+msgstr "名稱不能留白\n"
 
 #: ../plugins/shellexecui/shellexecui.c:241
 msgid "Shell Command must be non-empty.\n"
-msgstr ""
+msgstr "指令不能留白\n"
 
 #: ../plugins/shellexecui/shellexecui.c:248
 #: ../plugins/shellexecui/shellexecui.c:252
 msgid "Invalid Values"
+msgstr "無效的數值"
+
+#: ../plugins/wildmidi/wildmidiplug.c:192
+#, 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 的路徑。"
+
+#: ../src/tf.c:2237
+msgid "mono"
+msgstr "單聲道"
+
+#: ../src/tf.c:2240 ../src/tf.c:2244
+msgid "stereo"
+msgstr "立體聲"
+
+#: ../translation/extra.c:3
+msgid "Track Title"
+msgstr "歌曲名稱"
+
+#: ../translation/extra.c:4
+msgid "Performer"
+msgstr "演唱"
+
+#: ../translation/extra.c:9
+msgid "Total Tracks"
+msgstr "總歌曲數"
+
+#: ../translation/extra.c:10
+msgid "Genre"
+msgstr "種類"
+
+#: ../translation/extra.c:11
+msgid "Composer"
+msgstr "作曲"
+
+#: ../translation/extra.c:12
+msgid "Disc Number"
+msgstr "碟號"
+
+#: ../translation/extra.c:13
+msgid "Total Discs"
+msgstr "總碟數"
+
+#: ../translation/extra.c:14
+msgid "Comment"
+msgstr "評語"
+
+#: ../translation/extra.c:15
+msgid "Encoder / Vendor"
+msgstr "編碼器 / 生產者"
+
+#: ../translation/extra.c:16
+msgid "Copyright"
+msgstr "版權"
+
+#: ../translation/extra.c:17
+msgid "Location"
+msgstr "位址"
+
+#: ../translation/extra.c:18
+msgid "Subtrack Index"
+msgstr "子曲目索引"
+
+#: ../translation/extra.c:19
+msgid "Tag Type(s)"
+msgstr "標籤類型"
+
+#: ../translation/extra.c:20
+msgid "Embedded Cuesheet"
+msgstr "內置曲目表（Cuesheet）"
+
+#. external/ddb_output_pw/pw.c
+#: ../translation/plugins.c:3
+#, no-c-format
+msgid "PipeWire remote daemon name (empty for default)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:112
-msgid "Supported sound formats"
+#: ../translation/plugins.c:5
+#, no-c-format
+msgid "Custom properties (overrides existing ones):"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:123
-msgid "All files (*)"
+#: ../translation/plugins.c:7
+#, no-c-format
+msgid "Use PipeWire volume control"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:131
-msgid "Open file(s)..."
+#. plugins/adplug/plugin.c
+#: ../translation/plugins.c:10
+#, no-c-format
+msgid "Prefer Ken emu over Satoh (surround won't work)"
+msgstr "優先使用 Ken emu 取代 Satoh（環繞音效將無效）"
+
+#: ../translation/plugins.c:12
+#, no-c-format
+msgid "Enable surround"
+msgstr "開啟環繞音效"
+
+#. plugins/alsa/alsa.c
+#: ../translation/plugins.c:15
+#, no-c-format
+msgid "Use ALSA resampling"
+msgstr "使用 ALSA 再取樣"
+
+#: ../translation/plugins.c:17
+#, no-c-format
+msgid "Preferred buffer size"
+msgstr "偏好的緩衝區大小"
+
+#: ../translation/plugins.c:19
+#, no-c-format
+msgid "Preferred period size"
+msgstr "偏好的間隔大小"
+
+#. plugins/artwork/artwork.c
+#: ../translation/plugins.c:22
+#, no-c-format
+msgid "Refresh Cover Art"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:170
-msgid "Add file(s) to playlist..."
+#: ../translation/plugins.c:24
+#, no-c-format
+msgid "Fetch from embedded tags"
+msgstr "由內置標籤取得"
+
+#: ../translation/plugins.c:26
+#, no-c-format
+msgid "Fetch from local folder"
+msgstr "由本機資料夾取得"
+
+#: ../translation/plugins.c:28
+#, no-c-format
+msgid "Fetch from Last.fm"
+msgstr "從 Last.fm 取得"
+
+#: ../translation/plugins.c:30
+#, no-c-format
+msgid "Fetch from MusicBrainz"
+msgstr "從 MusicBrainz 取得"
+
+#: ../translation/plugins.c:32
+#, no-c-format
+msgid "Fetch from Albumart.org"
+msgstr "從 Albumart.org 取得"
+
+#: ../translation/plugins.c:34
+#, no-c-format
+msgid "Fetch from World of Spectrum (AY files)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:216
-msgid "Add folder(s) to playlist..."
+#: ../translation/plugins.c:36
+#, no-c-format
+msgid "Save downloaded files to music folders"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:221
-msgid "Follow symlinks"
+#: ../translation/plugins.c:38
+#, no-c-format
+msgid "When no artwork is found"
+msgstr "當找不到封面"
+
+#: ../translation/plugins.c:40
+#, no-c-format
+msgid "leave blank"
+msgstr "保留為空白"
+
+#: ../translation/plugins.c:42
+#, no-c-format
+msgid "use DeaDBeeF default cover"
+msgstr "使用 DeaDBeeF 預設封面"
+
+#: ../translation/plugins.c:44
+#, no-c-format
+msgid "display custom image"
+msgstr "顯示自訂影像"
+
+#: ../translation/plugins.c:46
+#, no-c-format
+msgid "Custom image path"
+msgstr "自訂影像路徑"
+
+#: ../translation/plugins.c:48
+#, no-c-format
+msgid "Save to file name"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:475
-msgid "help.txt"
+#: ../translation/plugins.c:50
+#, no-c-format
+msgid "Search masks (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:548
-msgid "Delete files from disk"
+#: ../translation/plugins.c:52
+#, no-c-format
+msgid "Search folders (; separated)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:549
-msgid ""
-"Files will be lost. Proceed?\n"
-"(This dialog can be turned off in GTKUI plugin settings)"
+#: ../translation/plugins.c:54
+#, no-c-format
+msgid "Cache refresh (hrs)"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:726
-msgid "Load Playlist"
+#: ../translation/plugins.c:56
+#, no-c-format
+msgid "Simplified cache file names"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:741
-msgid "Other files (*)"
+#: ../translation/plugins.c:58
+#, no-c-format
+msgid "Image size"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:775
-msgid "Save Playlist As"
+#. plugins/cdda/cdda.c
+#: ../translation/plugins.c:61
+#, no-c-format
+msgid "CD drive to load"
+msgstr "要載入的 CD 光碟機"
+
+#: ../translation/plugins.c:63
+#, no-c-format
+msgid "Audio CD Drive"
+msgstr "音訊 CD 光碟機"
+
+#: ../translation/plugins.c:65
+#, no-c-format
+msgid "File"
+msgstr "檔案"
+
+#: ../translation/plugins.c:67
+#, no-c-format
+msgid "Add Audio CD"
+msgstr "新增音樂 CD"
+
+#: ../translation/plugins.c:69
+#, no-c-format
+msgid "Use CDDB/GnuDb"
 msgstr ""
 
-#: ../plugins/gtkui/actionhandlers.c:786
-msgid "DeaDBeeF playlist files (*.dbpl)"
+#: ../translation/plugins.c:71
+#, no-c-format
+msgid "Prefer CD-Text over CDDB"
+msgstr "優先使用 CD-Text 而非 CDDB"
+
+#: ../translation/plugins.c:73
+#, no-c-format
+msgid "CDDB url (e.g. 'gnudb.gnudb.org')"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:129
-msgid "Content-Type"
+#: ../translation/plugins.c:75
+#, no-c-format
+msgid "CDDB port number (e.g. '8880')"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:199
-msgid "Invalid value(s)."
+#: ../translation/plugins.c:77
+#, no-c-format
+msgid "Use CDDB protocol"
+msgstr "使用 CDDB 協定"
+
+#: ../translation/plugins.c:79
+#, no-c-format
+msgid "Enable NRG image support"
+msgstr "啟用支援 NRG 影像"
+
+#: ../translation/plugins.c:81
+#, no-c-format
+msgid "Drive speed for normal playback"
+msgstr "光碟機正常播放速率"
+
+#: ../translation/plugins.c:89
+#, no-c-format
+msgid "8x"
+msgstr "8 倍"
+
+#: ../translation/plugins.c:91
+#, no-c-format
+msgid "16x"
+msgstr "16 倍"
+
+#: ../translation/plugins.c:93
+#, no-c-format
+msgid "Max"
+msgstr "最大"
+
+#: ../translation/plugins.c:95
+#, no-c-format
+msgid "Use cdparanoia error correction when ripping"
+msgstr "轉錄時使用 cdparanoia 修正錯誤"
+
+#. plugins/converter/convgui.c
+#: ../translation/plugins.c:98
+#, no-c-format
+msgid "Convert"
+msgstr "轉檔"
+
+#. plugins/dsp_libsrc/src.c
+#: ../translation/plugins.c:101
+#, no-c-format
+msgid "Autodetect samplerate from output device"
+msgstr "從輸出設備自動偵測取樣率"
+
+#: ../translation/plugins.c:103
+#, no-c-format
+msgid "Set samplerate directly"
+msgstr "直接設定取樣率"
+
+#: ../translation/plugins.c:105
+#, no-c-format
+msgid "Quality / Algorithm"
+msgstr "品質 / 演算法"
+
+#. plugins/dumb/cdumb.c
+#: ../translation/plugins.c:108
+#, no-c-format
+msgid "Resampling quality"
+msgstr "重新取樣品質"
+
+#: ../translation/plugins.c:110
+#, no-c-format
+msgid "Internal DUMB volume"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:200
-msgid ""
-"Content-type and Plugins fields must be non-empty, and comply with the "
-"rules.\n"
-"Example content-type: 'audio/mpeg'.\n"
-"Example plugin ids: 'stdmpg ffmpeg'.\n"
-"Spaces must be used as separators in plugin ids list.\n"
-"Content type should be only letters, numbers and '-' sign.\n"
-"Plugin id can contain only letters and numbers."
+#: ../translation/plugins.c:112
+#, no-c-format
+msgid "Volume ramping"
 msgstr ""
 
-#: ../plugins/gtkui/ctmapping.c:228 ../plugins/gtkui/ctmapping.c:260
-msgid "Nothing is selected."
+#: ../translation/plugins.c:116
+#, no-c-format
+msgid "On/Off Only"
+msgstr "僅 開/關"
+
+#: ../translation/plugins.c:118
+#, no-c-format
+msgid "Full"
+msgstr "完整"
+
+#: ../translation/plugins.c:120
+#, no-c-format
+msgid "8-bit output"
+msgstr "8位元輸出"
+
+#. plugins/ffmpeg/ffmpeg.c
+#: ../translation/plugins.c:123
+#, no-c-format
+msgid "Use all extensions supported by ffmpeg"
+msgstr "使用 ffmpeg 支援的所有擴充"
+
+#: ../translation/plugins.c:125
+#, no-c-format
+msgid "File Extensions (separate with ';')"
+msgstr "檔案副檔名（以 ; 分隔）"
+
+#: ../translation/plugins.c:127
+#, no-c-format
+msgid "Enable DoP output"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:444
-#, c-format
-msgid "Widget \"%s\" is not available"
+#. plugins/flac/flac.c
+#: ../translation/plugins.c:130
+#, no-c-format
+msgid "Ignore bad header errors"
+msgstr "忽略錯誤標頭訊息"
+
+#: ../translation/plugins.c:132
+#, no-c-format
+msgid "Ignore unparsable stream errors"
+msgstr "忽略無法剖析串流錯誤"
+
+#. plugins/gme/cgme.c
+#: ../translation/plugins.c:135
+#, no-c-format
+msgid "Max song length (in minutes)"
+msgstr "歌曲最大長度（分鐘）"
+
+#: ../translation/plugins.c:137
+#, no-c-format
+msgid "Fadeout length (seconds)"
+msgstr "淡出長度 （單位：秒）"
+
+#: ../translation/plugins.c:139
+#, no-c-format
+msgid "Play loops nr. of times (if available)"
+msgstr "循環播放次數（若支援）"
+
+#: ../translation/plugins.c:141
+#, no-c-format
+msgid "ColecoVision BIOS (for SGC file format)"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:772
-msgid "Replace with..."
+#. plugins/gtkui/gtkui.c
+#: ../translation/plugins.c:144
+#, no-c-format
+msgid "ReplayGain"
+msgstr "音量標準化"
+
+#: ../translation/plugins.c:146
+#, no-c-format
+msgid "Remove ReplayGain Information"
+msgstr "移除音量標準化資訊"
+
+#: ../translation/plugins.c:148
+#, no-c-format
+msgid "Scan Selection As Albums (By Tags)"
+msgstr "將掃描選取項目視為專輯（依標籤）"
+
+#: ../translation/plugins.c:150
+#, no-c-format
+msgid "Scan Selection As Single Album"
+msgstr "將掃描選取項目視為專輯"
+
+#: ../translation/plugins.c:152
+#, no-c-format
+msgid "Scan Per-file Track Gain"
+msgstr "掃描每首曲目"
+
+#: ../translation/plugins.c:154
+#, no-c-format
+msgid "Scan Per-file Track Gain If Not Scanned"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:777
-msgid "Insert..."
+#: ../translation/plugins.c:158
+#, no-c-format
+msgid "Deselect All"
+msgstr "反向全選"
+
+#: ../translation/plugins.c:160
+#, no-c-format
+msgid "Select All"
+msgstr "全選"
+
+#: ../translation/plugins.c:166
+#, no-c-format
+msgid "Add Location"
+msgstr "添加位置"
+
+#: ../translation/plugins.c:168
+#, no-c-format
+msgid "Add Folder(s)"
+msgstr "添加目錄"
+
+#: ../translation/plugins.c:170
+#, no-c-format
+msgid "Add File(s)"
+msgstr "添加檔案"
+
+#: ../translation/plugins.c:172
+#, no-c-format
+msgid "Open File(s)"
+msgstr "開啟檔案"
+
+#: ../translation/plugins.c:178
+#, no-c-format
+msgid "Show Help Page"
+msgstr "顯示說明頁"
+
+#: ../translation/plugins.c:182
+#, no-c-format
+msgid "Cycle Repeat Mode"
+msgstr "循環重複模式"
+
+#: ../translation/plugins.c:184
+#, no-c-format
+msgid "Repeat - Off"
+msgstr "重播 - 關"
+
+#: ../translation/plugins.c:186
+#, no-c-format
+msgid "Repeat - Single Track"
+msgstr "重播 - 單曲"
+
+#: ../translation/plugins.c:188
+#, no-c-format
+msgid "Repeat - All"
+msgstr "重播 - 全部"
+
+#: ../translation/plugins.c:190
+#, no-c-format
+msgid "Cycle Shuffle Mode"
+msgstr "循環跳躍播放模式"
+
+#: ../translation/plugins.c:192
+#, no-c-format
+msgid "Shuffle - Random Tracks"
+msgstr "跳躍 - 隨機曲目"
+
+#: ../translation/plugins.c:194
+#, no-c-format
+msgid "Shuffle - Albums"
+msgstr "跳躍 - 專輯"
+
+#: ../translation/plugins.c:196
+#, no-c-format
+msgid "Shuffle - Tracks"
+msgstr "跳躍 - 曲目"
+
+#: ../translation/plugins.c:198
+#, no-c-format
+msgid "Shuffle - Off"
+msgstr "跳躍 - 關閉"
+
+#: ../translation/plugins.c:200
+#, no-c-format
+msgid "Toggle Cursor Follows Playback"
+msgstr "隨播放移動游標"
+
+#: ../translation/plugins.c:202
+#, no-c-format
+msgid "Toggle Scroll Follows Playback"
+msgstr "隨播放捲動"
+
+#: ../translation/plugins.c:204
+#, no-c-format
+msgid "View"
+msgstr "檢視"
+
+#: ../translation/plugins.c:206
+#, no-c-format
+msgid "Show\\/Hide menu"
+msgstr "顯示\\/隱藏 選單"
+
+#: ../translation/plugins.c:208
+#, no-c-format
+msgid "Show\\/Hide statusbar"
+msgstr "顯示\\/隱藏 狀態列"
+
+#: ../translation/plugins.c:210
+#, no-c-format
+msgid "Toggle Design Mode"
+msgstr "切換為設計模式"
+
+#: ../translation/plugins.c:214
+#, no-c-format
+msgid "Sort Custom"
+msgstr "自訂排序"
+
+#: ../translation/plugins.c:216
+#, no-c-format
+msgid "Crop Selected"
+msgstr "剪下選取項目"
+
+#: ../translation/plugins.c:218
+#, no-c-format
+msgid "Remove Track(s) from Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:804
-msgid "Cut"
+#: ../translation/plugins.c:220
+#, no-c-format
+msgid "Save Playlist"
+msgstr "儲存播放清單"
+
+#: ../translation/plugins.c:224
+#, no-c-format
+msgid "Remove Current Playlist"
+msgstr "移除現有播放清單"
+
+#: ../translation/plugins.c:228
+#, no-c-format
+msgid "Rename Current Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:811
-msgid "Copy"
+#: ../translation/plugins.c:230
+#, no-c-format
+msgid "Show\\/Hide Equalizer"
+msgstr "顯示\\/隱藏 等化器"
+
+#: ../translation/plugins.c:232
+#, no-c-format
+msgid "Hide Equalizer"
+msgstr "隱藏等化器"
+
+#: ../translation/plugins.c:234
+#, no-c-format
+msgid "Show Equalizer"
+msgstr "顯示等化器"
+
+#: ../translation/plugins.c:236
+#, no-c-format
+msgid "Show\\/Hide Player Window"
+msgstr "顯示\\/隱藏 播放器視窗"
+
+#: ../translation/plugins.c:238
+#, no-c-format
+msgid "Hide Player Window"
+msgstr "隱藏播放器視窗"
+
+#: ../translation/plugins.c:240
+#, no-c-format
+msgid "Show Player Window"
+msgstr "顯示播放器視窗"
+
+#: ../translation/plugins.c:242
+#, no-c-format
+msgid "Find"
+msgstr "尋找"
+
+#: ../translation/plugins.c:244
+#, no-c-format
+msgid "Show\\/Hide Log window"
+msgstr "顯示\\/隱藏 日誌視窗"
+
+#: ../translation/plugins.c:246
+#, no-c-format
+msgid "Ask confirmation to delete files from disk"
+msgstr "自磁碟刪除檔案要先確認"
+
+#: ../translation/plugins.c:248
+#, no-c-format
+msgid "Status icon settings:"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:818
-msgid "Paste"
+#: ../translation/plugins.c:250
+#, no-c-format
+msgid "Status icon volume control sensitivity"
+msgstr "狀態圖示音量控制敏感度"
+
+#: ../translation/plugins.c:252
+#, no-c-format
+msgid "Custom status icon"
+msgstr "自訂狀態圖示"
+
+#: ../translation/plugins.c:254
+#, no-c-format
+msgid "Misc:"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:942
-msgid "Multiple widgets of this type are not supported"
+#: ../translation/plugins.c:256
+#, no-c-format
+msgid "Add separators between plugin context menu items"
+msgstr "在外掛選單項目之間加入分隔符號"
+
+#: ../translation/plugins.c:258
+#, no-c-format
+msgid "Use unicode chars instead of images for track state"
+msgstr "以萬國碼取代圖片顯示曲目狀態"
+
+#: ../translation/plugins.c:260
+#, no-c-format
+msgid "Disable seekbar overlay text"
+msgstr "禁用進度條的覆蓋文字"
+
+#. plugins/hotkeys/hotkeys.c
+#: ../translation/plugins.c:263
+#, no-c-format
+msgid "Previous or Restart Current Track"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1249
-msgid "Lock movement"
+#: ../translation/plugins.c:265
+#, no-c-format
+msgid "Duplicate Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1534
-msgid "Move tab left"
+#: ../translation/plugins.c:269
+#, no-c-format
+msgid "Jump to Currently Playing Track"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1541
-msgid "Move tab right"
+#: ../translation/plugins.c:271
+#, no-c-format
+msgid "Skip to"
+msgstr "跳至"
+
+#: ../translation/plugins.c:273
+#, no-c-format
+msgid "Previous Genre"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1548
-msgid "Remove tab"
+#: ../translation/plugins.c:275
+#, no-c-format
+msgid "Previous Composer"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1555
-msgid "Rename tab"
+#: ../translation/plugins.c:277
+#, no-c-format
+msgid "Previous Artist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:1616
-msgid "Add new tab"
+#: ../translation/plugins.c:279
+#, no-c-format
+msgid "Previous Album"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:2036
-msgid "Show Column Headers"
+#: ../translation/plugins.c:281
+#, no-c-format
+msgid "Next Genre"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3147
-msgid "Expand the box by 1 item"
+#: ../translation/plugins.c:283
+#, no-c-format
+msgid "Next Composer"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3152
-msgid "Shrink the box by 1 item"
+#: ../translation/plugins.c:285
+#, no-c-format
+msgid "Next Artist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3157
-msgid "Homogeneous"
+#: ../translation/plugins.c:287
+#, no-c-format
+msgid "Next Album"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3197
-msgid "Expand"
+#: ../translation/plugins.c:289
+#, no-c-format
+msgid "Next Playlist"
+msgstr "下一個播放清單"
+
+#: ../translation/plugins.c:291
+#, no-c-format
+msgid "Previous Playlist"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3205
-msgid "Fill"
+#: ../translation/plugins.c:293
+#, no-c-format
+msgid "Switch to Playlist 10"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3606
-msgid "Configure button"
+#: ../translation/plugins.c:295
+#, no-c-format
+msgid "Switch to Playlist 9"
 msgstr ""
 
-#: ../plugins/gtkui/widgets.c:3870
-msgid "Voices:"
+#: ../translation/plugins.c:297
+#, no-c-format
+msgid "Switch to Playlist 8"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:62
-msgid "Edit playlist"
+#: ../translation/plugins.c:299
+#, no-c-format
+msgid "Switch to Playlist 7"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:265
-msgid "Rename Playlist"
+#: ../translation/plugins.c:301
+#, no-c-format
+msgid "Switch to Playlist 6"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:272
-msgid "Remove Playlist"
+#: ../translation/plugins.c:303
+#, no-c-format
+msgid "Switch to Playlist 5"
 msgstr ""
 
-#: ../plugins/gtkui/pltmenu.c:279
-msgid "Add New Playlist"
+#: ../translation/plugins.c:305
+#, no-c-format
+msgid "Switch to Playlist 4"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:213
-msgid "Name"
+#: ../translation/plugins.c:307
+#, no-c-format
+msgid "Switch to Playlist 3"
 msgstr ""
 
-#: ../plugins/pltbrowser/pltbrowser.c:238
-msgid "Playlist browser"
+#: ../translation/plugins.c:309
+#, no-c-format
+msgid "Switch to Playlist 2"
+msgstr ""
+
+#: ../translation/plugins.c:311
+#, no-c-format
+msgid "Switch to Playlist 1"
+msgstr ""
+
+#: ../translation/plugins.c:313
+#, no-c-format
+msgid "Sort Randomize"
+msgstr "亂數排序"
+
+#: ../translation/plugins.c:315
+#, no-c-format
+msgid "Sort by Date"
+msgstr ""
+
+#: ../translation/plugins.c:317
+#, no-c-format
+msgid "Sort by Artist"
+msgstr ""
+
+#: ../translation/plugins.c:319
+#, no-c-format
+msgid "Sort by Album"
+msgstr ""
+
+#: ../translation/plugins.c:321
+#, no-c-format
+msgid "Sort by Track Number"
+msgstr ""
+
+#: ../translation/plugins.c:323
+#, no-c-format
+msgid "Sort by Title"
+msgstr ""
+
+#: ../translation/plugins.c:325
+#, no-c-format
+msgid "Invert Selection"
+msgstr "反轉選擇"
+
+#: ../translation/plugins.c:327
+#, no-c-format
+msgid "Clear Playlist"
+msgstr "清除播放清單"
+
+#: ../translation/plugins.c:331
+#, no-c-format
+msgid "Add to Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:333
+#, no-c-format
+msgid "Add to Front of Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:335
+#, no-c-format
+msgid "Toggle in Playback Queue"
+msgstr ""
+
+#: ../translation/plugins.c:337
+#, no-c-format
+msgid "Move"
+msgstr "移動"
+
+#: ../translation/plugins.c:339
+#, no-c-format
+msgid "Move Tracks Down"
+msgstr "下移音軌"
+
+#: ../translation/plugins.c:341
+#, no-c-format
+msgid "Move Tracks Up"
+msgstr "上移音軌"
+
+#: ../translation/plugins.c:343
+#, no-c-format
+msgid "Toggle Mute"
+msgstr "切換靜音"
+
+#: ../translation/plugins.c:353
+#, no-c-format
+msgid "Toggle Pause"
+msgstr "切換暫停"
+
+#: ../translation/plugins.c:355
+#, no-c-format
+msgid "Play\\/Pause"
+msgstr "播放/暫停"
+
+#: ../translation/plugins.c:359
+#, no-c-format
+msgid "Seek 1s Forward"
+msgstr "快進 1 秒"
+
+#: ../translation/plugins.c:361
+#, no-c-format
+msgid "Seek 1s Backward"
+msgstr "倒回 1 秒"
+
+#: ../translation/plugins.c:363
+#, no-c-format
+msgid "Seek 5s Forward"
+msgstr "快進 5 秒"
+
+#: ../translation/plugins.c:365
+#, no-c-format
+msgid "Seek 5s Backward"
+msgstr "倒回 5 秒"
+
+#: ../translation/plugins.c:367
+#, no-c-format
+msgid "Seek 1% Forward"
+msgstr "快進 1%"
+
+#: ../translation/plugins.c:369
+#, no-c-format
+msgid "Seek 1% Backward"
+msgstr "倒回 1%"
+
+#: ../translation/plugins.c:371
+#, no-c-format
+msgid "Seek 5% Forward"
+msgstr "快進 5%"
+
+#: ../translation/plugins.c:373
+#, no-c-format
+msgid "Seek 5% Backward"
+msgstr "倒回 5%"
+
+#: ../translation/plugins.c:375
+#, no-c-format
+msgid "Volume Up"
+msgstr "提昇音量"
+
+#: ../translation/plugins.c:377
+#, no-c-format
+msgid "Volume Down"
+msgstr "降低音量"
+
+#: ../translation/plugins.c:379
+#, no-c-format
+msgid "Toggle Stop After Current Track"
+msgstr "播放當前曲目後停止"
+
+#: ../translation/plugins.c:381
+#, no-c-format
+msgid "Toggle Stop After Current Album"
+msgstr "播放完此專輯後停止"
+
+#. plugins/lastfm/lastfm.c
+#: ../translation/plugins.c:384
+#, no-c-format
+msgid "Lookup on Last.fm"
+msgstr ""
+
+#: ../translation/plugins.c:386
+#, no-c-format
+msgid "Enable scrobbler"
+msgstr "偏用歌曲記錄"
+
+#: ../translation/plugins.c:388
+#, no-c-format
+msgid "Disable nowplaying"
+msgstr "停用正在播放"
+
+#: ../translation/plugins.c:390
+#, no-c-format
+msgid "Username"
+msgstr "使用者名稱"
+
+#: ../translation/plugins.c:392
+#, no-c-format
+msgid "Password"
+msgstr "密碼"
+
+#: ../translation/plugins.c:394
+#, no-c-format
+msgid "Scrobble URL"
+msgstr "Scrobble 網址"
+
+#: ../translation/plugins.c:396
+#, no-c-format
+msgid "Prefer Album Artist over Artist field"
+msgstr "以專輯作者取代作者欄"
+
+#: ../translation/plugins.c:398
+#, no-c-format
+msgid "Send MusicBrainz ID"
+msgstr "送出 MusicBrainz ID"
+
+#: ../translation/plugins.c:400
+#, no-c-format
+msgid "Submit tracks shorter than 30 seconds (not recommended)"
+msgstr ""
+
+#. plugins/mono2stereo/mono2stereo.c
+#: ../translation/plugins.c:403
+#, no-c-format
+msgid "Left mix"
+msgstr "左側混音"
+
+#: ../translation/plugins.c:405
+#, no-c-format
+msgid "Right mix"
+msgstr "右側混音"
+
+#. plugins/mp3/mp3.c
+#: ../translation/plugins.c:408
+#, no-c-format
+msgid "Force 16 bit output"
+msgstr "強制 16 位元輸出"
+
+#: ../translation/plugins.c:410
+#, no-c-format
+msgid "Backend"
+msgstr "後端"
+
+#: ../translation/plugins.c:415
+#, no-c-format
+msgid "Notification title format"
+msgstr "通告標題格式"
+
+#: ../translation/plugins.c:417
+#, no-c-format
+msgid "Notification content format"
+msgstr "通告內容格式"
+
+#: ../translation/plugins.c:419
+#, no-c-format
+msgid "Show album art"
+msgstr "顯示專輯封面"
+
+#: ../translation/plugins.c:421
+#, no-c-format
+msgid "Album art size (px)"
+msgstr "專輯封面尺寸（像素）"
+
+#: ../translation/plugins.c:423
+#, no-c-format
+msgid "Don't reuse notifications (KDE quirk)"
+msgstr ""
+
+#. plugins/oss/oss.c
+#: ../translation/plugins.c:426
+#, no-c-format
+msgid "Device file"
+msgstr "裝置檔案"
+
+#: ../translation/plugins.c:431
+#, no-c-format
+msgid "Highlight current playlist"
+msgstr "突顯目前的播放清單"
+
+#: ../translation/plugins.c:433
+#, no-c-format
+msgid "Play on double-click"
+msgstr "雙擊播放"
+
+#. plugins/portaudio/portaudio.c
+#: ../translation/plugins.c:436
+#, no-c-format
+msgid "Buffer size (-1 to use optimal value chosen by portaudio)"
+msgstr ""
+
+#: ../translation/plugins.c:438
+#, no-c-format
+msgid "Device name encoding"
+msgstr "裝置名稱編碼"
+
+#: ../translation/plugins.c:440
+#, no-c-format
+msgid "ASCII / UTF-8"
+msgstr "ASCII / UTF-8"
+
+#: ../translation/plugins.c:442
+#, no-c-format
+msgid "cp1250"
+msgstr "cp1250"
+
+#: ../translation/plugins.c:444
+#, no-c-format
+msgid "Defined below"
+msgstr "在下面定義"
+
+#: ../translation/plugins.c:446
+#, no-c-format
+msgid "Custom device name encoding"
+msgstr "自訂裝置名稱編碼"
+
+#. plugins/pulse/pulse.c
+#: ../translation/plugins.c:449
+#, no-c-format
+msgid "PulseAudio server (leave empty for default)"
+msgstr "PulseAudio 伺服器（預設為空）"
+
+#. plugins/sc68/in_sc68.c
+#: ../translation/plugins.c:452
+#, no-c-format
+msgid "Default song length (in minutes)"
+msgstr "預設歌曲長度（分鐘）"
+
+#: ../translation/plugins.c:454
+#, no-c-format
+msgid "Samplerate"
+msgstr "取樣率"
+
+#: ../translation/plugins.c:456
+#, no-c-format
+msgid "Skip when shorter than (sec)"
+msgstr "跳過歌曲如果時間短於（秒）"
+
+#. plugins/shellexecui/shellexecui.c
+#: ../translation/plugins.c:459
+#, no-c-format
+msgid "Configure Custom Shell Commands"
+msgstr "設定自訂 shell 指令"
+
+#. plugins/shn/shn.c
+#: ../translation/plugins.c:462
+#, no-c-format
+msgid "Relative seek table path"
+msgstr "相對搜索表格路徑"
+
+#: ../translation/plugins.c:464
+#, no-c-format
+msgid "Absolute seek table path"
+msgstr "絕對搜索表格路徑"
+
+#: ../translation/plugins.c:466
+#, no-c-format
+msgid "Swap audio bytes (toggle if all you hear is static)"
+msgstr "置換音訊位元組（如聽到的只是雜訊則切換）"
+
+#. plugins/sid/plugin.c
+#: ../translation/plugins.c:469
+#, no-c-format
+msgid "Enable HVSC Songlength DB"
+msgstr "啟用 HVSC 歌曲長度資料庫"
+
+#: ../translation/plugins.c:471
+#, no-c-format
+msgid "Full path to Songlengths.md5/.txt"
+msgstr "Songlengths.md5/.txt 的完整路徑"
+
+#: ../translation/plugins.c:473
+#, no-c-format
+msgid "Bits per sample"
+msgstr "取樣位元"
+
+#: ../translation/plugins.c:475
+#, no-c-format
+msgid "Default song length (sec)"
+msgstr "預設歌曲長度（秒）"
+
+#: ../translation/plugins.c:477
+#, no-c-format
+msgid "Mono synth"
+msgstr "單聲道合成器"
+
+#. plugins/sndfile/sndfile.c
+#: ../translation/plugins.c:480
+#, no-c-format
+msgid "Enable logging"
+msgstr "啟用日誌記錄"
+
+#. plugins/supereq/supereq.c
+#: ../translation/plugins.c:483
+#, no-c-format
+msgid "Preamp"
+msgstr "前級放大器"
+
+#: ../translation/plugins.c:485
+#, no-c-format
+msgid "1.2K"
+msgstr ""
+
+#: ../translation/plugins.c:487
+#, no-c-format
+msgid "1.8K"
+msgstr ""
+
+#: ../translation/plugins.c:489
+#, no-c-format
+msgid "2.5K"
+msgstr ""
+
+#: ../translation/plugins.c:491
+#, no-c-format
+msgid "3.5K"
+msgstr ""
+
+#: ../translation/plugins.c:493
+#, no-c-format
+msgid "5K"
+msgstr ""
+
+#: ../translation/plugins.c:495
+#, no-c-format
+msgid "7K"
+msgstr ""
+
+#: ../translation/plugins.c:497
+#, no-c-format
+msgid "10K"
+msgstr ""
+
+#: ../translation/plugins.c:499
+#, no-c-format
+msgid "14K"
+msgstr ""
+
+#: ../translation/plugins.c:501
+#, no-c-format
+msgid "20K"
+msgstr ""
+
+#. plugins/wildmidi/wildmidiplug.c
+#: ../translation/plugins.c:504
+#, no-c-format
+msgid "Timidity++ bank configuration file"
+msgstr "Timidity++ 樂器庫設定檔案"
+
+#. src/scriptable/scriptable_encoder.c
+#: ../translation/plugins.c:507
+#, no-c-format
+msgid "File extension"
+msgstr ""
+
+#: ../translation/plugins.c:509
+#, no-c-format
+msgid "Encoder command line"
+msgstr ""
+
+#: ../translation/plugins.c:511
+#, no-c-format
+msgid "Data transfer method"
+msgstr ""
+
+#: ../translation/plugins.c:513
+#, no-c-format
+msgid "Pipe (stdin)"
+msgstr ""
+
+#: ../translation/plugins.c:515
+#, no-c-format
+msgid "Temporary file"
+msgstr ""
+
+#: ../translation/plugins.c:517
+#, no-c-format
+msgid "Source file"
+msgstr ""
+
+#: ../translation/plugins.c:521
+#, no-c-format
+msgid "Write ID3v2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:523
+#, no-c-format
+msgid "Write ID3v1 tag"
+msgstr ""
+
+#: ../translation/plugins.c:525
+#, no-c-format
+msgid "Write APEv2 tag"
+msgstr ""
+
+#: ../translation/plugins.c:527
+#, no-c-format
+msgid "Write FLAC tag"
+msgstr ""
+
+#: ../translation/plugins.c:529
+#, no-c-format
+msgid "Write OggVorbis tag"
+msgstr ""
+
+#: ../translation/plugins.c:531
+#, no-c-format
+msgid "Write MP4 tag"
 msgstr ""

deadbeef-1.9.6.tar.bz2/shared Added

deadbeef-1.9.6.tar.bz2/shared/Makefile.am Added

deadbeef-1.9.6.tar.bz2/shared/Makefile.in Added

@@ -0,0 +1,917 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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 = shared
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libctmap_la_LIBADD =
+am_libctmap_la_OBJECTS = libctmap_la-ctmap.lo
+libctmap_la_OBJECTS = $(am_libctmap_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libctmap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libctmap_la_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+libdeletefromdisk_la_LIBADD =
+am_libdeletefromdisk_la_OBJECTS = \
+	libdeletefromdisk_la-deletefromdisk.lo
+libdeletefromdisk_la_OBJECTS = $(am_libdeletefromdisk_la_OBJECTS)
+libdeletefromdisk_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libdeletefromdisk_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+libeqpreset_la_LIBADD =
+am_libeqpreset_la_OBJECTS = libeqpreset_la-eqpreset.lo
+libeqpreset_la_OBJECTS = $(am_libeqpreset_la_OBJECTS)
+libeqpreset_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libeqpreset_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
+libmp4tagutil_la_LIBADD =
+am_libmp4tagutil_la_OBJECTS = libmp4tagutil_la-mp4tagutil.lo
+libmp4tagutil_la_OBJECTS = $(am_libmp4tagutil_la_OBJECTS)
+libmp4tagutil_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libmp4tagutil_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+libtftintutil_la_LIBADD =
+am_libtftintutil_la_OBJECTS = libtftintutil_la-tftintutil.lo
+libtftintutil_la_OBJECTS = $(am_libtftintutil_la_OBJECTS)
+libtftintutil_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libtftintutil_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+libtrkpropertiesutil_la_LIBADD =
+am_libtrkpropertiesutil_la_OBJECTS = \
+	libtrkpropertiesutil_la-trkproperties_shared.lo
+libtrkpropertiesutil_la_OBJECTS = \
+	$(am_libtrkpropertiesutil_la_OBJECTS)
+libtrkpropertiesutil_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libtrkpropertiesutil_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libctmap_la_SOURCES) $(libdeletefromdisk_la_SOURCES) \
+	$(libeqpreset_la_SOURCES) $(libmp4tagutil_la_SOURCES) \
+	$(libtftintutil_la_SOURCES) $(libtrkpropertiesutil_la_SOURCES)
+DIST_SOURCES = $(libctmap_la_SOURCES) $(libdeletefromdisk_la_SOURCES) \
+	$(libeqpreset_la_SOURCES) $(libmp4tagutil_la_SOURCES) \
+	$(libtftintutil_la_SOURCES) $(libtrkpropertiesutil_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+ distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in README
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^$^/*$/.*$$,\1,'; \
+ sed_rest='s,^^/*/*,,'; \
+ sed_last='s,^.*/$^/*$$$,\1,'; \
+ sed_butlast='s,/*^/*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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@
+SUBDIRS = analyzer scope
+noinst_LTLIBRARIES = libmp4tagutil.la libtrkpropertiesutil.la libeqpreset.la libctmap.la libdeletefromdisk.la libtftintutil.la
+libmp4tagutil_la_SOURCES = mp4tagutil.h mp4tagutil.c
+libmp4tagutil_la_CFLAGS = -fPIC -std=c99 -I@top_srcdir@/external/mp4p/include -I@top_srcdir@/include
+libtrkpropertiesutil_la_SOURCES = trkproperties_shared.h trkproperties_shared.c
+libtrkpropertiesutil_la_CFLAGS = -fPIC -std=c99 -I@top_srcdir@/include
+libeqpreset_la_SOURCES = eqpreset.h eqpreset.c
+libeqpreset_la_CFLAGS = -fPIC -std=c99 -I@top_srcdir@/include
+libctmap_la_SOURCES = ctmap.h ctmap.c
+libctmap_la_CFLAGS = -fPIC -std=c99 -I@top_srcdir@/include
+libdeletefromdisk_la_SOURCES = deletefromdisk.h deletefromdisk.c
+libdeletefromdisk_la_CFLAGS = -fPIC -std=c99 -I@top_srcdir@/include
+libtftintutil_la_SOURCES = tftintutil.h tftintutil.c
+libtftintutil_la_CFLAGS = -fPIC -std=c99 -I@top_srcdir@/include
+all: all-recursive
+
+.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 --ignore-deps shared/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps shared/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):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+
+libctmap.la: $(libctmap_la_OBJECTS) $(libctmap_la_DEPENDENCIES) $(EXTRA_libctmap_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libctmap_la_LINK) $(libctmap_la_OBJECTS) $(libctmap_la_LIBADD) $(LIBS)
+
+libdeletefromdisk.la: $(libdeletefromdisk_la_OBJECTS) $(libdeletefromdisk_la_DEPENDENCIES) $(EXTRA_libdeletefromdisk_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libdeletefromdisk_la_LINK) $(libdeletefromdisk_la_OBJECTS) $(libdeletefromdisk_la_LIBADD) $(LIBS)
+
+libeqpreset.la: $(libeqpreset_la_OBJECTS) $(libeqpreset_la_DEPENDENCIES) $(EXTRA_libeqpreset_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libeqpreset_la_LINK) $(libeqpreset_la_OBJECTS) $(libeqpreset_la_LIBADD) $(LIBS)
+
+libmp4tagutil.la: $(libmp4tagutil_la_OBJECTS) $(libmp4tagutil_la_DEPENDENCIES) $(EXTRA_libmp4tagutil_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmp4tagutil_la_LINK) $(libmp4tagutil_la_OBJECTS) $(libmp4tagutil_la_LIBADD) $(LIBS)
+
+libtftintutil.la: $(libtftintutil_la_OBJECTS) $(libtftintutil_la_DEPENDENCIES) $(EXTRA_libtftintutil_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libtftintutil_la_LINK) $(libtftintutil_la_OBJECTS) $(libtftintutil_la_LIBADD) $(LIBS)
+
+libtrkpropertiesutil.la: $(libtrkpropertiesutil_la_OBJECTS) $(libtrkpropertiesutil_la_DEPENDENCIES) $(EXTRA_libtrkpropertiesutil_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libtrkpropertiesutil_la_LINK) $(libtrkpropertiesutil_la_OBJECTS) $(libtrkpropertiesutil_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+libctmap_la-ctmap.lo: ctmap.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libctmap_la_CFLAGS) $(CFLAGS) -c -o libctmap_la-ctmap.lo `test -f 'ctmap.c' || echo '$(srcdir)/'`ctmap.c
+
+libdeletefromdisk_la-deletefromdisk.lo: deletefromdisk.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdeletefromdisk_la_CFLAGS) $(CFLAGS) -c -o libdeletefromdisk_la-deletefromdisk.lo `test -f 'deletefromdisk.c' || echo '$(srcdir)/'`deletefromdisk.c
+
+libeqpreset_la-eqpreset.lo: eqpreset.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeqpreset_la_CFLAGS) $(CFLAGS) -c -o libeqpreset_la-eqpreset.lo `test -f 'eqpreset.c' || echo '$(srcdir)/'`eqpreset.c
+
+libmp4tagutil_la-mp4tagutil.lo: mp4tagutil.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmp4tagutil_la_CFLAGS) $(CFLAGS) -c -o libmp4tagutil_la-mp4tagutil.lo `test -f 'mp4tagutil.c' || echo '$(srcdir)/'`mp4tagutil.c
+
+libtftintutil_la-tftintutil.lo: tftintutil.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtftintutil_la_CFLAGS) $(CFLAGS) -c -o libtftintutil_la-tftintutil.lo `test -f 'tftintutil.c' || echo '$(srcdir)/'`tftintutil.c
+
+libtrkpropertiesutil_la-trkproperties_shared.lo: trkproperties_shared.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtrkpropertiesutil_la_CFLAGS) $(CFLAGS) -c -o libtrkpropertiesutil_la-trkproperties_shared.lo `test -f 'trkproperties_shared.c' || echo '$(srcdir)/'`trkproperties_shared.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	 failcom='fail=yes'; \
+	else \
+	 failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	 *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	 echo "Making $$target in $$subdir"; \
+	 if test "$$subdir" = "."; then \
+	 dot_seen=yes; \
+	 local_target="$$target-am"; \
+	 else \
+	 local_target="$$target"; \
+	 fi; \
+	 ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	 || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	 include_option=--etags-include; \
+	 empty_fix=.; \
+	else \
+	 include_option=--include; \
+	 empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	 if test "$$subdir" = .; then :; else \
+	 test ! -f $$subdir/TAGS || \
+	 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	 fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	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-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	 if test "$$subdir" = .; then :; else \
+	 $(am__make_dryrun) \
+	 || test -d "$(distdir)/$$subdir" \
+	 || $(MKDIR_P) "$(distdir)/$$subdir" \
+	 || exit 1; \
+	 dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	 $(am__relativize); \
+	 new_distdir=$$reldir; \
+	 dir1=$$subdir; dir2="$(top_distdir)"; \
+	 $(am__relativize); \
+	 new_top_distdir=$$reldir; \
+	 echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	 echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	 ($(am__cd) $$subdir && \
+	 $(MAKE) $(AM_MAKEFLAGS) \
+	 top_distdir="$$new_top_distdir" \
+	 distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	 distdir) \
+	 || exit 1; \
+	 fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am 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-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/shared/README Added

deadbeef-1.9.6.tar.bz2/shared/analyzer Added

deadbeef-1.9.6.tar.bz2/shared/analyzer/Makefile.am Added

deadbeef-1.9.6.tar.bz2/shared/analyzer/Makefile.in Added

@@ -0,0 +1,719 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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 = shared/analyzer
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libanalyzer_la_LIBADD =
+am_libanalyzer_la_OBJECTS = libanalyzer_la-analyzer.lo
+libanalyzer_la_OBJECTS = $(am_libanalyzer_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libanalyzer_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libanalyzer_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
+	$@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libanalyzer_la_SOURCES)
+DIST_SOURCES = $(libanalyzer_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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@
+noinst_LTLIBRARIES = libanalyzer.la
+libanalyzer_la_SOURCES = analyzer.c analyzer.h
+libanalyzer_la_CFLAGS = -fPIC -std=c99 -I@top_srcdir@/include
+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 --ignore-deps shared/analyzer/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps shared/analyzer/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):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+
+libanalyzer.la: $(libanalyzer_la_OBJECTS) $(libanalyzer_la_DEPENDENCIES) $(EXTRA_libanalyzer_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libanalyzer_la_LINK) $(libanalyzer_la_OBJECTS) $(libanalyzer_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+libanalyzer_la-analyzer.lo: analyzer.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libanalyzer_la_CFLAGS) $(CFLAGS) -c -o libanalyzer_la-analyzer.lo `test -f 'analyzer.c' || echo '$(srcdir)/'`analyzer.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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:
+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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-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-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 -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:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am 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-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 tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/shared/analyzer/analyzer.c Added

@@ -0,0 +1,473 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "analyzer.h"
+#include <math.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define OCTAVES 11
+#define STEPS 24
+#define ROOT24 1.0293022366 // pow(2, 1.0 / STEPS)
+#define C0 16.3515978313 // 440 * pow(ROOT24, -114);
+
+#pragma mark - Forward declarations
+
+static float
+_get_bar_height (ddb_analyzer_t *analyzer, float normalized_height, int view_height);
+
+static void
+_generate_frequency_labels (ddb_analyzer_t *analyzer);
+
+static void
+_generate_frequency_bars (ddb_analyzer_t *analyzer);
+
+static void
+_generate_octave_note_bars (ddb_analyzer_t *analyzer);
+
+static void
+_tempered_scale_bands_precalc (ddb_analyzer_t *analyzer);
+
+static float _bin_for_freq_floor (ddb_analyzer_t *analyzer, float freq);
+
+static float _bin_for_freq_round (ddb_analyzer_t *analyzer, float freq);
+
+static float _freq_for_bin (ddb_analyzer_t *analyzer, int bin);
+
+static float
+_interpolate_bin_with_ratio (float *fft_data, int bin, float ratio);
+
+#pragma mark - Public
+
+ddb_analyzer_t *
+ddb_analyzer_alloc (void) {
+ return calloc(1, sizeof (ddb_analyzer_t));
+}
+
+ddb_analyzer_t *
+ddb_analyzer_init (ddb_analyzer_t *analyzer) {
+ analyzer->mode = DDB_ANALYZER_MODE_FREQUENCIES;
+ analyzer->min_freq = 50;
+ analyzer->max_freq = 22000;
+ analyzer->view_width = 1000;
+ analyzer->peak_hold = 10;
+ analyzer->peak_speed_scale = 1000.f;
+ analyzer->db_lower_bound = -80;
+ analyzer->octave_bars_step = 1;
+ analyzer->bar_gap_denominator = 3;
+ return analyzer;
+}
+
+void
+ddb_analyzer_dealloc (ddb_analyzer_t *analyzer) {
+ free (analyzer->tempered_scale_bands);
+ free (analyzer->fft_data);
+ memset (analyzer, 0, sizeof (ddb_analyzer_t));
+}
+
+void
+ddb_analyzer_free (ddb_analyzer_t *analyzer) {
+ free (analyzer);
+}
+
+void
+ddb_analyzer_process (ddb_analyzer_t *analyzer, int samplerate, int channels, const float *fft_data, int fft_size) {
+ int need_regenerate = 0;
+
+ if (channels > 2) {
+ channels = 2;
+ }
+
+ if (!analyzer->max_of_stereo_data) {
+ channels = 1;
+ }
+
+ if (analyzer->mode_did_change || channels != analyzer->channels || fft_size != analyzer->fft_size || samplerate/2 != analyzer->fft_samplerate) {
+ analyzer->channels = channels;
+ analyzer->fft_size = fft_size;
+ analyzer->fft_samplerate = samplerate/2;
+ free (analyzer->fft_data);
+ analyzer->fft_data = malloc (fft_size * channels * sizeof (float));
+ need_regenerate = 1;
+ analyzer->mode_did_change = 0;
+ }
+
+ memcpy (analyzer->fft_data, fft_data, fft_size * channels * sizeof (float));
+
+ if (need_regenerate) {
+ switch (analyzer->mode) {
+ case DDB_ANALYZER_MODE_FREQUENCIES:
+ _generate_frequency_bars (analyzer);
+ break;
+ case DDB_ANALYZER_MODE_OCTAVE_NOTE_BANDS:
+ _generate_octave_note_bars (analyzer);
+ break;
+ }
+
+ _generate_frequency_labels (analyzer);
+ }
+}
+
+/// Update bars and peaks for the next frame
+void
+ddb_analyzer_tick (ddb_analyzer_t *analyzer) {
+ if (analyzer->mode_did_change) {
+ return; // avoid ticks until the next data update
+ }
+ // frequency lines
+ for (int ch = 0; ch < analyzer->channels; ch++) {
+ float *fft_data = analyzer->fft_data + ch * analyzer->fft_size;
+ ddb_analyzer_bar_t *bar = analyzer->bars;
+ for (int i = 0; i < analyzer->bar_count; i++, bar++) {
+ float norm_h = _interpolate_bin_with_ratio (fft_data, bar->bin, bar->ratio);
+
+ // if the bar spans more than one bin, find the max value
+ for (int b = bar->bin+1; b <= bar->last_bin; b++) {
+ float val = analyzer->fft_datab;
+ if (val > norm_h) {
+ norm_h = val;
+ }
+ }
+
+ norm_h = norm_h;
+
+ float bound = -analyzer->db_lower_bound;
+ float height = (20*log10(norm_h) + bound)/bound;
+
+ if (ch == 0) {
+ bar->height = height;
+ }
+ else if (height > bar->height) {
+ bar->height = height;
+ }
+ }
+ }
+
+ // peaks
+ ddb_analyzer_bar_t *bar = analyzer->bars;
+ for (int i = 0; i < analyzer->bar_count; i++, bar++) {
+ if (bar->peak < bar->height) {
+ bar->peak = bar->height;
+ bar->peak_speed = analyzer->peak_hold;
+ }
+
+ if (bar->peak_speed-- < 0) {
+ bar->peak += bar->peak_speed / analyzer->peak_speed_scale;
+ if (bar->peak < bar->height) {
+ bar->peak = bar->height;
+ }
+ }
+ }
+}
+
+void
+ddb_analyzer_get_draw_data (ddb_analyzer_t *analyzer, int view_width, int view_height, ddb_analyzer_draw_data_t *draw_data) {
+ if (draw_data->bar_count != analyzer->bar_count) {
+ free (draw_data->bars);
+ draw_data->bars = calloc (analyzer->bar_count, sizeof (ddb_analyzer_draw_bar_t));
+ draw_data->bar_count = analyzer->bar_count;
+ }
+
+ draw_data->mode = analyzer->mode;
+
+ if (analyzer->mode == DDB_ANALYZER_MODE_FREQUENCIES) {
+ draw_data->bar_width = 1;
+
+ if (analyzer->enable_bar_index_lookup_table) {
+ if (draw_data->bar_index_for_x_coordinate_table_size != view_width) {
+ free (draw_data->bar_index_for_x_coordinate_table);
+ draw_data->bar_index_for_x_coordinate_table = calloc (view_width
+ , sizeof (int));
+ draw_data->bar_index_for_x_coordinate_table_size = view_width;
+ }
+ }
+
+ }
+ else if (analyzer->mode == DDB_ANALYZER_MODE_OCTAVE_NOTE_BANDS) {
+ if (analyzer->fractional_bars) {
+ float width = (float)view_width / analyzer->bar_count;
+ float gap = analyzer->bar_gap_denominator > 0 ? width/analyzer->bar_gap_denominator : 0;
+ draw_data->bar_width = width - gap;
+ }
+ else {
+ int width = view_width / analyzer->bar_count;
+ int gap = analyzer->bar_gap_denominator > 0 ? width/analyzer->bar_gap_denominator : 0;
+ if (gap < 1) {
+ gap = 1;
+ }
+ if (width <= 1) {
+ width = 1;
+ gap = 0;
+ }
+ draw_data->bar_width = width - gap;
+ }
+ }
+
+ if (draw_data->bar_index_for_x_coordinate_table != NULL) {
+ memset(draw_data->bar_index_for_x_coordinate_table, 0xff, sizeof (int) * view_width);
+ }
+
+ ddb_analyzer_bar_t *bar = analyzer->bars;
+ ddb_analyzer_draw_bar_t *draw_bar = draw_data->bars;
+ for (int i = 0; i < analyzer->bar_count; i++, bar++, draw_bar++) {
+ float height = bar->height;
+
+ float xpos = bar->xpos * view_width;
+
+ draw_bar->bar_height = _get_bar_height (analyzer, height, view_height);
+ draw_bar->xpos = xpos;
+ draw_bar->peak_ypos = _get_bar_height (analyzer, bar->peak, view_height);
+
+ if (analyzer->mode == DDB_ANALYZER_MODE_FREQUENCIES
+ && analyzer->enable_bar_index_lookup_table) {
+ int lookup_index = (int)draw_bar->xpos;
+ if (lookup_index < view_width
+ && draw_data->bar_index_for_x_coordinate_tablelookup_index == -1) {
+ draw_data->bar_index_for_x_coordinate_tablelookup_index = i;
+ }
+ if (lookup_index > 0
+ && draw_data->bar_index_for_x_coordinate_tablelookup_index-1 == -1) {
+ draw_data->bar_index_for_x_coordinate_tablelookup_index-1 = i;
+ }
+ if (lookup_index < view_width - 1
+ && draw_data->bar_index_for_x_coordinate_tablelookup_index+1 == -1) {
+ draw_data->bar_index_for_x_coordinate_tablelookup_index+1 = i;
+ }
+ }
+ }
+
+ memcpy (draw_data->label_freq_texts, analyzer->label_freq_texts, sizeof (analyzer->label_freq_texts));
+ for (int i = 0; i < analyzer->label_freq_count; i++) {
+ draw_data->label_freq_positionsi = analyzer->label_freq_positionsi * view_width;
+ }
+ draw_data->label_freq_count = analyzer->label_freq_count;
+}
+
+void
+ddb_analyzer_draw_data_dealloc (ddb_analyzer_draw_data_t *draw_data) {
+ free (draw_data->bars);
+ free (draw_data->bar_index_for_x_coordinate_table);
+ memset (draw_data, 0, sizeof(ddb_analyzer_draw_data_t));
+}
+
+#pragma mark - Private
+
+static float
+_get_bar_height (ddb_analyzer_t *analyzer, float normalized_height, int view_height) {
+ float height = normalized_height;
+ if (height < 0) {
+ height = 0;
+ }
+ else if (height > 1) {
+ height = 1;
+ }
+ height *= view_height;
+ return height;
+}
+
+static void
+_generate_frequency_labels (ddb_analyzer_t *analyzer) {
+ float min_freq_log = log10 (analyzer->min_freq);
+ float max_freq_log = log10 (analyzer->max_freq);
+ float view_width = analyzer->view_width;
+ float width_log = view_width / (max_freq_log - min_freq_log);
+
+ // calculate the distance between any 2 neighbour labels
+ float freq = 64000;
+ float freq2 = 32000;
+ float pos = width_log * (log10(freq) - min_freq_log) / view_width;
+ float pos2 = width_log * (log10(freq2) - min_freq_log) / view_width;
+ float dist = pos - pos2;
+
+ // generate position and text for each label
+ int index = 0;
+ while (freq > 30 && index < DDB_ANALYZER_MAX_LABEL_FREQS) {
+ analyzer->label_freq_positionsindex = pos;
+
+ if (freq < 1000) {
+ snprintf (analyzer->label_freq_textsindex, sizeof(analyzer->label_freq_textsindex), "%d", (int)round(freq));
+ }
+ else {
+ snprintf (analyzer->label_freq_textsindex, sizeof(analyzer->label_freq_textsindex), "%dk", ((int)freq)/1000);
+ }
+
+ pos -= dist;
+ freq /= 2;
+ index += 1;
+ }
+ analyzer->label_freq_count = index;
+}
+
+static void
+_generate_frequency_bars (ddb_analyzer_t *analyzer) {
+ float min_freq_log = log10 (analyzer->min_freq);
+ float max_freq_log = log10 (analyzer->max_freq);
+ float view_width = analyzer->view_width;
+ float width_log = view_width / (max_freq_log - min_freq_log);
+
+ float minIndex = _bin_for_freq_floor (analyzer, analyzer->min_freq);
+ float maxIndex = _bin_for_freq_round (analyzer, analyzer->max_freq);
+
+ int prev = -1;
+
+ analyzer->bar_count = 0;
+
+ if (analyzer->bar_count_max != analyzer->view_width) {
+ free (analyzer->bars);
+ analyzer->bars = calloc (analyzer->view_width, sizeof (ddb_analyzer_bar_t));
+ analyzer->bar_count_max = analyzer->view_width;
+ }
+
+ for (int i = minIndex; i <= maxIndex; i++) {
+ float freq = _freq_for_bin (analyzer, i);
+
+ // FIXME: only int position!
+ int pos = width_log * (log10(freq) - min_freq_log);
+
+ if (pos > prev && pos >= 0) {
+ // start accumulating frequencies for the new band
+ ddb_analyzer_bar_t *bar = analyzer->bars + analyzer->bar_count;
+
+ bar->xpos = pos / view_width; // normalized position
+ bar->bin = i;
+ bar->ratio = 0;
+ analyzer->bar_count += 1;
+
+ prev = pos;
+ }
+ }
+}
+
+static void
+_generate_octave_note_bars (ddb_analyzer_t *analyzer) {
+ analyzer->bar_count = 0;
+
+ _tempered_scale_bands_precalc (analyzer);
+
+ if (analyzer->bar_count_max != OCTAVES * STEPS) {
+ free (analyzer->bars);
+ analyzer->bars = calloc (OCTAVES * STEPS, sizeof (ddb_analyzer_bar_t));
+ analyzer->bar_count_max = OCTAVES * STEPS;
+ }
+
+ int minBand = -1;
+
+ ddb_analyzer_bar_t *prev_bar = NULL;
+ for (int i = 0; i < OCTAVES * STEPS; i += analyzer->octave_bars_step) {
+ ddb_analyzer_band_t *band = &analyzer->tempered_scale_bandsi;
+
+ if (band->freq < analyzer->min_freq || band->freq > analyzer->max_freq) {
+ continue;
+ }
+
+ if (minBand == -1) {
+ minBand = i;
+ }
+
+ ddb_analyzer_bar_t *bar = analyzer->bars + analyzer->bar_count;
+
+ int bin = _bin_for_freq_floor(analyzer, band->freq);
+
+ bar->bin = bin;
+ bar->last_bin = 0;
+ bar->ratio = 0;
+
+ // interpolation ratio of next bin of previous bar to the first bin of this bar
+ if (prev_bar && bin-1 > prev_bar->bin) {
+ prev_bar->last_bin = bin-1;
+ }
+
+ analyzer->bar_count += 1;
+
+ // get interpolation ratio to the next bin
+ int bin2 = bin+1;
+ if (bin2 < analyzer->fft_size) {
+ float p = log10(band->freq);
+ float p1 = log10(_freq_for_bin(analyzer, bin));
+ float p2 = log10(_freq_for_bin(analyzer, bin2));
+ float d = p2-p1;
+ bar->ratio = (p-p1)/d;
+ }
+
+ prev_bar = bar;
+ }
+
+ for (int i = 0; i < analyzer->bar_count; i++) {
+ analyzer->barsi.xpos = (float)i/analyzer->bar_count;
+ }
+}
+
+static float _bin_for_freq_floor (ddb_analyzer_t *analyzer, float freq) {
+ float max = analyzer->fft_size - 1;
+ float bin = floor (freq * analyzer->fft_size / analyzer->fft_samplerate);
+ return bin < max ? bin : max;
+}
+
+static float _bin_for_freq_round (ddb_analyzer_t *analyzer, float freq) {
+ float max = analyzer->fft_size - 1;
+ float bin = round (freq * analyzer->fft_size / analyzer->fft_samplerate);
+ return bin < max ? bin : max;
+}
+
+static float _freq_for_bin (ddb_analyzer_t *analyzer, int bin) {
+ return (int64_t)bin * analyzer->fft_samplerate / analyzer->fft_size;
+}
+
+// Precalculate data for tempered scale
+static void
+_tempered_scale_bands_precalc (ddb_analyzer_t *analyzer) {
+ if (analyzer->tempered_scale_bands != NULL) {
+ return;
+ }
+
+ analyzer->tempered_scale_bands = calloc (OCTAVES * STEPS, sizeof (ddb_analyzer_band_t));
+
+ for (int i = 0; i < OCTAVES * STEPS; i++) {
+ float f = C0 * pow(ROOT24, i);
+ float bin = _bin_for_freq_floor (analyzer, f);
+ float binf = _freq_for_bin (analyzer, bin);
+ float fn = _freq_for_bin (analyzer, bin+1);
+ float ratio = (f - binf) / (fn - binf);
+
+ analyzer->tempered_scale_bandsi.bin = bin;
+ analyzer->tempered_scale_bandsi.freq = f;
+ analyzer->tempered_scale_bandsi.ratio = ratio;
+ }
+}
+
+static float
+_interpolate_bin_with_ratio (float *fft_data, int bin, float ratio) {
+ float a = fft_databin;
+ float b = fft_databin + 1;
+ float result = a + (b - a) * ratio;
+
+ // Don't allow to go lower than 0,
+ // since log10(x<0) returns NaN,
+ // which may result in visual glitches
+ if (result < 0.f) {
+ return 0.f;
+ }
+ return result;
+}
+

deadbeef-1.9.6.tar.bz2/shared/analyzer/analyzer.h Added

@@ -0,0 +1,159 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef analyzer_h
+#define analyzer_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define DDB_ANALYZER_MAX_LABEL_FREQS 20
+
+typedef struct {
+    float freq;
+    float ratio;
+    int bin;
+} ddb_analyzer_band_t;
+
+typedef struct {
+    // interpolation data
+    int bin;
+    int last_bin;
+    float ratio;
+
+    // normalized position
+    float xpos;
+    float height;
+    float peak;
+    float peak_speed;
+} ddb_analyzer_bar_t;
+
+typedef struct {
+    float xpos;
+    float peak_ypos;
+    float bar_height;
+} ddb_analyzer_draw_bar_t;
+
+typedef enum {
+    DDB_ANALYZER_MODE_FREQUENCIES,
+    DDB_ANALYZER_MODE_OCTAVE_NOTE_BANDS,
+}  ddb_analyzer_mode_t;
+
+typedef struct {
+    ddb_analyzer_mode_t mode;
+    int bar_count;
+    ddb_analyzer_draw_bar_t *bars;
+    float bar_width;
+
+    // Reverse lookup table, to get bar position from pixel X coordinate.
+    // If there's no bar at the coordinate, value is -1.
+    // Size of the table equals to view_width.
+    // Only valid for DDB_ANALYZER_MODE_FREQUENCIES mode.
+    int *bar_index_for_x_coordinate_table;
+    int bar_index_for_x_coordinate_table_size;
+
+    // freq label drawing positions in view space
+    float label_freq_positionsDDB_ANALYZER_MAX_LABEL_FREQS;
+    char label_freq_textsDDB_ANALYZER_MAX_LABEL_FREQS4;
+    int label_freq_count;
+} ddb_analyzer_draw_data_t;
+
+typedef struct ddb_analyzer_s {
+    // Settings
+
+    float min_freq;
+    float max_freq;
+
+    ddb_analyzer_mode_t mode;
+
+    /// Set to 1 after changing the @c mode or @c octave_bars_step at runtime, to refresh the internal state
+    int mode_did_change;
+
+    /// Generate fractional bar positions and width. Default is 0.
+    int fractional_bars;
+
+    /// Process 2 channels, if available, and use the max value. Default is 0.
+    int max_of_stereo_data;
+
+    /// How to calculate the gap between bars. E.g. 10 means bar_width/10. Default is 3.
+    /// If this value is 0, no gap will be created.
+    /// If the gap is >=1, a gap of at least 1px will be created, unless the bar width itself is 1px.
+    int bar_gap_denominator;
+
+    /// Whether to calculate reverse lookup table to get bar index from pixel coordinate.
+    /// The table generated only for FREQUENCIES mode, and only in draw data.
+    int enable_bar_index_lookup_table;
+
+    /// Can be either a real or virtual view width.
+    /// The calculated values are normalized,
+    /// and are going to be converted to the real view size at the draw time.
+    int view_width;
+    float peak_hold; // how many frames to hold the peak in place
+    float peak_speed_scale;
+    float db_upper_bound; // dB value corresponding to the top of the view
+    float db_lower_bound; // dB value corresponding to the bottom of the view
+    int octave_bars_step; // how many notes in one bar (default 1)
+
+    /// The bars get created / updated by calling @c ddb_analyzer_process.
+    /// The same bars get updated on every call to @c ddb_analyzer_tick.
+    ddb_analyzer_bar_t *bars;
+    int bar_count;
+    int bar_count_max;
+    int fft_samplerate;
+    int channels;
+    int fft_size;
+    float *fft_data;
+
+    /// Calculated label texts and frequencies
+    float label_freq_positionsDDB_ANALYZER_MAX_LABEL_FREQS;
+    char label_freq_textsDDB_ANALYZER_MAX_LABEL_FREQS4;
+    int label_freq_count;
+
+    /// Tempered scale data, precalculated from fft pins
+    ddb_analyzer_band_t *tempered_scale_bands;
+
+} ddb_analyzer_t;
+
+ddb_analyzer_t *ddb_analyzer_alloc (void);
+
+ddb_analyzer_t *ddb_analyzer_init (ddb_analyzer_t *analyzer);
+
+void ddb_analyzer_dealloc (ddb_analyzer_t *analyzer);
+
+void ddb_analyzer_free (ddb_analyzer_t *analyzer);
+
+/// Process fft data into bars and peaks
+void ddb_analyzer_process (ddb_analyzer_t *analyzer, int samplerate, int channels, const float *fft_data, int fft_size);
+
+/// Update bars and peaks for the next frame
+void ddb_analyzer_tick (ddb_analyzer_t *analyzer);
+
+void ddb_analyzer_get_draw_data (ddb_analyzer_t *analyzer, int view_width, int view_height, ddb_analyzer_draw_data_t *draw_data);
+
+void ddb_analyzer_draw_data_dealloc (ddb_analyzer_draw_data_t *draw_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* analyzer_h */

deadbeef-1.9.6.tar.bz2/shared/ctmap.c Added

@@ -0,0 +1,121 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2019 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "ctmap.h"
+#include "../plugins/libparser/parser.h"
+
+void
+ddb_ctmap_free (ddb_ctmap_t *ctmap) {
+ while (ctmap) {
+ ddb_ctmap_t *ct = ctmap;
+ free (ct->ct);
+ for (int i = 0; ct->pluginsi; i++) {
+ free (ct->pluginsi);
+ }
+ ctmap = ct->next;
+ free (ct);
+ }
+ free (ctmap);
+}
+
+ddb_ctmap_t *
+ddb_ctmap_init_from_string (const char *mapstr) {
+ const char *p = mapstr;
+ char tMAX_TOKEN;
+ char pluginsMAX_TOKEN*5;
+
+ ddb_ctmap_t *tail = NULL;
+ ddb_ctmap_t *head = NULL;
+
+ for (;;) {
+ p = gettoken (p, t);
+
+ if (!p) {
+ break;
+ }
+
+ ddb_ctmap_t *ctmap = malloc (sizeof (ddb_ctmap_t));
+ memset (ctmap, 0, sizeof (ddb_ctmap_t));
+ ctmap->ct = strdup (t);
+
+ int n = 0;
+
+ p = gettoken (p, t);
+ if (!p || strcmp (t, "{")) {
+ free (ctmap->ct);
+ free (ctmap);
+ break;
+ }
+
+ if (!head) {
+ head = ctmap;
+ }
+
+ plugins0 = 0;
+ for (;;) {
+ p = gettoken (p, t);
+ if (!p || !strcmp (t, "}") || n >= DDB_CTMAP_MAX_PLUGINS-1) {
+ break;
+ }
+
+ ctmap->pluginsn++ = strdup (t);
+ }
+ ctmap->pluginsn = NULL;
+ if (tail) {
+ tail->next = ctmap;
+ }
+ tail = ctmap;
+ }
+
+ return head;
+}
+
+char *
+ddb_ctmap_to_string (const ddb_ctmap_t *ctmap) {
+ char mapstr2048 = "";
+ int s = sizeof (mapstr);
+ char *p = mapstr;
+
+ while (ctmap) {
+
+ char plugins100 = "";
+ for (int i = 0; ctmap->pluginsi; i++) {
+ if (i != 0) {
+ strncat(plugins, " ", sizeof (plugins) - strlen (plugins) - 1);
+ }
+ strncat(plugins, ctmap->pluginsi, sizeof (plugins) - strlen (plugins) - 1);
+ }
+
+ int l = snprintf (p, s, "%s {%s} ", ctmap->ct, plugins);
+ p += l;
+ s -= l;
+ if (s <= 0) {
+ break;
+ }
+ }
+
+ return strdup (mapstr);
+}

deadbeef-1.9.6.tar.bz2/shared/ctmap.h Added

@@ -0,0 +1,41 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2019 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef ctmapping_h
+#define ctmapping_h
+
+#define DDB_CTMAP_MAX_PLUGINS 5
+
+typedef struct ddb_ctmap_s {
+    char *ct;
+    char *pluginsDDB_CTMAP_MAX_PLUGINS;
+    struct ddb_ctmap_s *next;
+} ddb_ctmap_t;
+
+ddb_ctmap_t *
+ddb_ctmap_init_from_string (const char *mapstr);
+
+void
+ddb_ctmap_free (ddb_ctmap_t *ctmap);
+
+#endif /* ctmapping_h */

deadbeef-1.9.6.tar.bz2/shared/deletefromdisk.c Added

@@ -0,0 +1,295 @@
+//
+// deletefromdisk.c
+// ddbcore
+//
+// Created by Oleksiy Yakovenko on 24/01/2021.
+// Copyright © 2021 Oleksiy Yakovenko. All rights reserved.
+//
+
+#include <stdlib.h>
+#include <string.h>
+#include "deletefromdisk.h"
+
+extern DB_functions_t *deadbeef;
+
+#pragma mark - Track list
+
+typedef struct {
+ ddb_playlist_t *plt;
+ ddb_action_context_t ctx;
+ DB_playItem_t *it_current_song;
+ int idx_current_song;
+ DB_playItem_t **tracklist;
+ unsigned trackcount;
+} ddbUtilTrackListData_t;
+
+typedef struct {
+ ddbUtilTrackListData_t *trackList;
+ unsigned shouldSkipDeletedTracks;
+ unsigned trackListUnowned;
+ void *userData;
+ ddbDeleteFromDiskControllerDelegate_t delegate;
+} ddbDeleteFromDiskControllerData_t;
+
+ddbUtilTrackList_t
+ddbUtilTrackListAlloc (void) {
+ return calloc (1, sizeof (ddbUtilTrackListData_t));
+}
+
+ddbUtilTrackList_t
+ddbUtilTrackListInitWithPlaylist (ddbUtilTrackList_t trackList, ddb_playlist_t *plt, ddb_action_context_t ctx) {
+ ddbUtilTrackListData_t *data = trackList;
+
+ data->ctx = ctx;
+
+ deadbeef->plt_ref (plt);
+ data->plt = plt;
+
+ data->it_current_song = deadbeef->streamer_get_playing_track_safe ();
+ data->idx_current_song = -1;
+
+ if (ctx == DDB_ACTION_CTX_SELECTION) {
+ unsigned selcount = deadbeef->plt_getselcount (plt);
+ data->tracklist = calloc (selcount, sizeof (DB_playItem_t *));
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ if (data->trackcount == selcount) {
+ break;
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ const char *uri = deadbeef->pl_find_meta (it, ":URI");
+ if (deadbeef->pl_is_selected (it) && deadbeef->is_local_file (uri)) {
+ if (it == data->it_current_song) {
+ data->idx_current_song = deadbeef->plt_get_item_idx (plt, it, PL_MAIN);
+ }
+ deadbeef->pl_item_ref (it);
+ data->tracklistdata->trackcount++ = it;
+ }
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ }
+ else if (ctx == DDB_ACTION_CTX_PLAYLIST) {
+ unsigned count = deadbeef->plt_get_item_count (plt, PL_MAIN);
+ data->tracklist = calloc (count, sizeof (DB_playItem_t *));
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ if (data->trackcount == count) {
+ break;
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ const char *uri = deadbeef->pl_find_meta (it, ":URI");
+ if (deadbeef->is_local_file (uri)) {
+ deadbeef->pl_item_ref (it);
+ data->tracklistdata->trackcount++ = it;
+ }
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ }
+ else if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ DB_playItem_t *it = deadbeef->streamer_get_playing_track_safe ();
+ if (it) {
+ const char *uri = deadbeef->pl_find_meta (it, ":URI");
+ if (deadbeef->is_local_file (uri)) {
+ data->idx_current_song = deadbeef->plt_get_item_idx (plt, it, PL_MAIN);
+ if (data->idx_current_song != -1) {
+ data->tracklist = calloc (1, sizeof (DB_playItem_t *));
+ deadbeef->pl_item_ref (it);
+ data->tracklistdata->trackcount++ = it;
+ }
+ }
+ deadbeef->pl_item_unref (it);
+ }
+ }
+ return trackList;
+}
+
+ddbUtilTrackList_t
+ddbUtilTrackListInitWithWithTracks (ddbUtilTrackList_t trackList, ddb_playlist_t *plt, ddb_action_context_t ctx, ddb_playItem_t **tracks, unsigned count, ddb_playItem_t *currentTrack, int currentTrackIdx) {
+ ddbUtilTrackListData_t *data = trackList;
+
+ data->ctx = ctx;
+ if (plt) {
+ data->plt = plt;
+ deadbeef->plt_ref (plt);
+ }
+
+ if (currentTrack) {
+ deadbeef->pl_item_ref (currentTrack);
+ }
+ data->it_current_song = currentTrack;
+
+ data->idx_current_song = currentTrackIdx;
+
+ if (tracks) {
+ data->tracklist = calloc (count, sizeof (ddb_playItem_t *));
+ for (int i = 0; i < count; i++) {
+ ddb_playItem_t *track = tracksi;
+ deadbeef->pl_item_ref (track);
+ data->tracklisti = track;
+ }
+ }
+ data->trackcount = count;
+
+ return trackList;
+}
+
+void ddbUtilTrackListFree (ddbUtilTrackList_t trackList) {
+ ddbUtilTrackListData_t *data = trackList;
+
+ if (data->tracklist) {
+ for (unsigned i = 0; i < data->trackcount; i++) {
+ deadbeef->pl_item_unref (data->tracklisti);
+ }
+ free (data->tracklist);
+ }
+
+ if (data->it_current_song) {
+ deadbeef->pl_item_unref (data->it_current_song);
+ }
+
+ if (data->plt) {
+ deadbeef->plt_unref (data->plt);
+ }
+
+ free (data);
+}
+
+ddb_playItem_t **
+ddbUtilTrackListGetTracks (ddbUtilTrackList_t trackList) {
+ ddbUtilTrackListData_t *data = trackList;
+ return data->tracklist;
+}
+
+unsigned
+ddbUtilTrackListGetTrackCount (ddbUtilTrackList_t trackList) {
+ ddbUtilTrackListData_t *data = trackList;
+ return data->trackcount;
+}
+
+ddb_playlist_t *ddbUtilTrackListGetPlaylist (ddbUtilTrackList_t trackList) {
+ ddbUtilTrackListData_t *data = trackList;
+ return data->plt;
+}
+
+#pragma mark - Controller
+
+ddbDeleteFromDiskController_t ddbDeleteFromDiskControllerAlloc (void) {
+ return calloc(1, sizeof (ddbDeleteFromDiskControllerData_t));
+}
+
+ddbDeleteFromDiskController_t ddbDeleteFromDiskControllerInitWithPlaylist (ddbDeleteFromDiskController_t ctl, ddb_playlist_t *plt, ddb_action_context_t ctx) {
+ ddbDeleteFromDiskControllerData_t *data = ctl;
+ data->trackList = ddbUtilTrackListInitWithPlaylist(ddbUtilTrackListAlloc(), plt, ctx);
+ return ctl;
+}
+
+ddbDeleteFromDiskController_t ddbDeleteFromDiskControllerInitWithTrackList (ddbDeleteFromDiskController_t ctl, ddbUtilTrackList_t trackList) {
+ ddbDeleteFromDiskControllerData_t *data = ctl;
+ data->trackList = trackList;
+ data->trackListUnowned = 1;
+ return ctl;
+}
+
+static void
+_remove_file_from_all_playlists (const char *search_uri) {
+ // The caller is responsible for pl_lock
+ int n = deadbeef->plt_get_count ();
+ for (int i = 0; i < n; ++i) {
+ ddb_playlist_t *plt = deadbeef->plt_get_for_idx (i);
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ const char *uri = deadbeef->pl_find_meta (it, ":URI");
+ if (strcmp (uri, search_uri) == 0) {
+ deadbeef->plt_remove_item (plt, it);
+ }
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+
+ deadbeef->plt_unref (plt);
+ }
+}
+
+static void
+_delete_and_remove_track_from_all_playlists (ddbDeleteFromDiskController_t ctl, const char *uri, ddb_playlist_t *plt, ddb_playItem_t *it) {
+ ddbDeleteFromDiskControllerData_t *data = ctl;
+ int deleted = data->delegate.deleteFile(ctl, uri);
+
+ if (deleted) {
+ _remove_file_from_all_playlists (uri);
+ }
+}
+
+void ddbDeleteFromDiskControllerSetShouldSkipDeletedTracks (ddbDeleteFromDiskController_t ctl, int shouldSkipDeletedTracks) {
+ ddbDeleteFromDiskControllerData_t *data = ctl;
+ data->shouldSkipDeletedTracks = shouldSkipDeletedTracks;
+}
+
+void ddbDeleteFromDiskControllerSetUserData (ddbDeleteFromDiskController_t ctl, void *userData) {
+ ddbDeleteFromDiskControllerData_t *data = ctl;
+ data->userData = userData;
+}
+
+void *ddbDeleteFromDiskControllerGetUserData (ddbDeleteFromDiskController_t ctl) {
+ ddbDeleteFromDiskControllerData_t *data = ctl;
+ return data->userData;
+}
+
+static void
+_warningCallback (ddbDeleteFromDiskController_t ctl, int shouldCancel) {
+ ddbDeleteFromDiskControllerData_t *data = ctl;
+ ddbUtilTrackListData_t *trackListData = data->trackList;
+
+ if (shouldCancel) {
+ data->delegate.completed(ctl, shouldCancel);
+ return;
+ }
+
+ DB_playItem_t **tracklist = trackListData->tracklist;
+ unsigned trackcount = trackListData->trackcount;
+ ddb_playlist_t *plt = trackListData->plt;
+
+ if (tracklist) {
+ for (unsigned i = 0; i < trackcount; i++) {
+ const char *uri = deadbeef->pl_find_meta (tracklisti, ":URI");
+ _delete_and_remove_track_from_all_playlists (ctl, uri, plt, tracklisti);
+ }
+ }
+
+ if (data->shouldSkipDeletedTracks
+ && ((plt == NULL) || deadbeef->plt_get_item_idx (plt, trackListData->it_current_song, PL_MAIN) == -1)
+ && deadbeef->streamer_get_current_playlist () == deadbeef->plt_get_curr_idx ()
+ && deadbeef->get_output ()->state () == DDB_PLAYBACK_STATE_PLAYING) {
+
+ if (trackListData->idx_current_song != -1
+ && deadbeef->playqueue_get_count () == 0
+ && deadbeef->streamer_get_shuffle () == DDB_SHUFFLE_OFF) {
+ deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, trackListData->idx_current_song, 0);
+ }
+ else {
+ deadbeef->sendmessage(DB_EV_NEXT, 0, 0, 0);
+ }
+ }
+
+ data->delegate.completed(ctl, shouldCancel);
+}
+
+
+void ddbDeleteFromDiskControllerRunWithDelegate (ddbDeleteFromDiskController_t ctl, ddbDeleteFromDiskControllerDelegate_t delegate) {
+ ddbDeleteFromDiskControllerData_t *data = ctl;
+ data->delegate = delegate;
+ ddbUtilTrackListData_t *trackListData = data->trackList;
+
+ data->delegate.warningMessageForCtx (ctl, trackListData->ctx, trackListData->trackcount, _warningCallback);
+}
+
+void ddbDeleteFromDiskControllerFree (ddbDeleteFromDiskController_t ctl) {
+ ddbDeleteFromDiskControllerData_t *data = ctl;
+ if (data->trackList && !data->trackListUnowned) {
+ ddbUtilTrackListFree(data->trackList);
+ }
+ free (data);
+}

deadbeef-1.9.6.tar.bz2/shared/deletefromdisk.h Added

@@ -0,0 +1,49 @@
+//
+// deletefromdisk.h
+// ddbcore
+//
+// Created by Oleksiy Yakovenko on 24/01/2021.
+// Copyright © 2021 Oleksiy Yakovenko. All rights reserved.
+//
+
+#ifndef deletefromdisk_h
+#define deletefromdisk_h
+
+#include <deadbeef/deadbeef.h>
+
+#pragma mark - UtilTrackList
+
+typedef void *ddbUtilTrackList_t;
+
+ddbUtilTrackList_t ddbUtilTrackListAlloc (void);
+ddbUtilTrackList_t ddbUtilTrackListInitWithPlaylist (ddbUtilTrackList_t trackList, ddb_playlist_t *plt, ddb_action_context_t ctx);
+ddbUtilTrackList_t ddbUtilTrackListInitWithWithTracks (ddbUtilTrackList_t trackList, ddb_playlist_t *plt, ddb_action_context_t ctx, ddb_playItem_t **tracks, unsigned count, ddb_playItem_t *currentTrack, int currentTrackIdx);
+void ddbUtilTrackListFree (ddbUtilTrackList_t trackList);
+
+ddb_playItem_t **ddbUtilTrackListGetTracks (ddbUtilTrackList_t trackList);
+unsigned ddbUtilTrackListGetTrackCount (ddbUtilTrackList_t trackList);
+ddb_playlist_t *ddbUtilTrackListGetPlaylist (ddbUtilTrackList_t trackList);
+
+#pragma mark - DeleteFromDiskController
+
+typedef void *ddbDeleteFromDiskController_t;
+
+typedef void (*ddbDeleteFromDiskControllerWarningCallback_t)(ddbDeleteFromDiskController_t ctl, int shouldCancel);
+
+typedef struct {
+ void (*warningMessageForCtx) (ddbDeleteFromDiskController_t ctl, ddb_action_context_t ctx, unsigned trackcount, ddbDeleteFromDiskControllerWarningCallback_t callback);
+ int (*deleteFile) (ddbDeleteFromDiskController_t ctl, const char *uri);
+ void (*completed) (ddbDeleteFromDiskController_t ctl, int cancelled);
+} ddbDeleteFromDiskControllerDelegate_t;
+
+ddbDeleteFromDiskController_t ddbDeleteFromDiskControllerAlloc (void);
+ddbDeleteFromDiskController_t ddbDeleteFromDiskControllerInitWithPlaylist (ddbDeleteFromDiskController_t ctl, ddb_playlist_t *plt, ddb_action_context_t ctx);
+ddbDeleteFromDiskController_t ddbDeleteFromDiskControllerInitWithTrackList (ddbDeleteFromDiskController_t ctl, ddbUtilTrackList_t trackList);
+void ddbDeleteFromDiskControllerFree (ddbDeleteFromDiskController_t ctl);
+
+void ddbDeleteFromDiskControllerSetShouldSkipDeletedTracks (ddbDeleteFromDiskController_t ctl, int shouldSkipDeletedTracks);
+void ddbDeleteFromDiskControllerSetUserData (ddbDeleteFromDiskController_t ctl, void *userData);
+void *ddbDeleteFromDiskControllerGetUserData (ddbDeleteFromDiskController_t ctl);
+void ddbDeleteFromDiskControllerRunWithDelegate (ddbDeleteFromDiskController_t ctl, ddbDeleteFromDiskControllerDelegate_t delegate);
+
+#endif /* deletefromdisk_h */

deadbeef-1.9.6.tar.bz2/shared/eqpreset.c Added

@@ -0,0 +1,113 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2019 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+#include <stdlib.h>
+#include "eqpreset.h"
+#include <deadbeef/deadbeef.h>
+
+extern DB_functions_t *deadbeef;
+
+static ddb_dsp_context_t *
+get_supereq (void) {
+ ddb_dsp_context_t *dsp = deadbeef->streamer_get_dsp_chain ();
+ while (dsp) {
+ if (!strcmp (dsp->plugin->plugin.id, "supereq")) {
+ return dsp;
+ }
+ dsp = dsp->next;
+ }
+
+ return NULL;
+}
+
+void
+eq_preset_save (const char *fname) {
+ FILE *fp = fopen (fname, "w+b");
+ if (fp) {
+ ddb_dsp_context_t *eq = get_supereq ();
+ if (eq) {
+ char fv100;
+ float v;
+ for (int i = 0; i < 18; i++) {
+ eq->plugin->get_param (eq, i+1, fv, sizeof (fv));
+ v = (float)atof (fv);
+ fprintf (fp, "%f\n", v);
+ }
+ eq->plugin->get_param (eq, 0, fv, sizeof (fv));
+ v = (float)atof (fv);
+ fprintf (fp, "%f\n", v);
+ }
+ fclose (fp);
+ }
+}
+
+int
+eq_preset_load (const char *fname, float *preamp, float values18) {
+ FILE *fp = fopen (fname, "rt");
+ if (fp) {
+ int i = 0;
+ while (i < 19) {
+ char tmp20;
+ char *out = fgets (tmp, sizeof (tmp), fp);
+ if (!out) {
+ break;
+ }
+ float val = (float)atof (tmp);
+ if (i == 18) {
+ *preamp = val;
+ }
+ else {
+ valuesi = val;
+ }
+ i++;
+ }
+ fclose (fp);
+ if (i != 19) {
+ return -1;
+ }
+ }
+ return 0;
+}
+
+int
+eq_preset_load_fb2k (const char *fname, float values18) {
+ FILE *fp = fopen (fname, "rt");
+ if (fp) {
+ int i = 0;
+ while (i < 18) {
+ char tmp20;
+ char *out = fgets (tmp, sizeof (tmp), fp);
+ if (!out) {
+ break;
+ }
+ valuesi = (float)atoi (tmp);
+ i++;
+ }
+ fclose (fp);
+ if (i != 18) {
+ return -1;
+ }
+ }
+ return 0;
+}

deadbeef-1.9.6.tar.bz2/shared/eqpreset.h Added

@@ -0,0 +1,36 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2019 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef eqpreset_h
+#define eqpreset_h
+
+void
+eq_preset_save (const char *fname);
+
+int
+eq_preset_load (const char *fname, float *preamp, float values18);
+
+int
+eq_preset_load_fb2k (const char *fname, float values18);
+
+#endif /* eqpreset_h */

deadbeef-1.9.6.tar.bz2/shared/mp4tagutil.c Added

@@ -0,0 +1,706 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <assert.h>
+#include <stdlib.h>
+#include "mp4tagutil.h"
+#include <mp4p/mp4p.h>
+#include <deadbeef/strdupa.h>
+
+#ifndef __linux__
+#define off64_t off_t
+#define lseek64 lseek
+#define O_LARGEFILE 0
+#endif
+
+extern DB_functions_t *deadbeef;
+
+#define COPYRIGHT_SYM "\xa9"
+
+static const char *_mp4_atom_map = {
+ COPYRIGHT_SYM "alb", "album",
+ COPYRIGHT_SYM "ART", "artist",
+ "aART", "band",
+ COPYRIGHT_SYM "cmt", "comment",
+ COPYRIGHT_SYM "day", "year",
+ COPYRIGHT_SYM "nam", "title",
+ COPYRIGHT_SYM "gen", "genre",
+ "gnre", "genre",
+ "trkn", "track",
+ "disk", "disc",
+ COPYRIGHT_SYM "wrt", "composer",
+ COPYRIGHT_SYM "too", "encoder",
+ "tmpo", "bpm",
+ "cprt", "copyright",
+ COPYRIGHT_SYM "grp", "grouping",
+ "cpil", "compilation",
+ "pcst", "podcast",
+ "catg", "category",
+ "keyw", "keyword",
+ "desc", "description",
+ COPYRIGHT_SYM "lyr", "lyrics",
+ "purd", "purchase date",
+ "MusicBrainz Track Id", "musicbrainz_trackid",
+ "DISCID", "DISCID",
+ "iTunSMPB", "iTunSMPB",
+ // NOTE: these replaygain fields are read/written in a special way,
+ // but they need to be here to be "known" fields, so that they're cleaned up on write.
+ "replaygain_track_gain", "replaygain_track_gain",
+ "replaygain_track_peak", "replaygain_track_peak",
+ "replaygain_album_gain", "replaygain_album_gain",
+ "replaygain_album_peak", "replaygain_album_peak",
+
+ NULL, NULL
+};
+
+/* For writing:
+ * Load/get the existing udta atom
+ * If present:
+ * Find ilst
+ * Remove all known non-custom fields, keep the rest
+ * Remove all custom fields
+ * If not present:
+ * Create new udta/meta/ilst
+ * Re-append all new non-custom fields
+ * Re-append all new custom fields
+ * Generate data block
+ * If the new udta block can fit over the old one, with at least 8 bytes extra for the "free" atom:
+ * Overwrite the old block
+ * Pad with "free" atom if necessary
+ * If can't fit: the entire moov atom has to be relocated!
+ * Rename the existing moov into "free"
+ * Append the modified moov block to the end of file, after the last atom
+ * IMPORTANT: the entirety of moov atom with all sub atoms needs to be loaded and saved
+ * Further work:
+ * Find if there are "free" blocks between ftyp and mdat, and try to fit the moov there; If that works, truncate the file.
+ */
+
+static void
+_remove_known_fields (mp4p_atom_t *ilst) {
+ mp4p_atom_t *meta_atom = ilst->subatoms;
+ while (meta_atom) {
+ mp4p_atom_t *next = meta_atom->next;
+ mp4p_ilst_meta_t *meta = meta_atom->data;
+
+ char type5;
+ memcpy (type, meta_atom->type, 4);
+ type4 = 0;
+
+ for (int i = 0; _mp4_atom_mapi; i += 2) {
+ // NOTE: atom names are case sensitive,
+ // but custom fields are not
+ if ((!meta->custom && !strcmp (type, _mp4_atom_mapi)) // all non-custom mapped fields
+ || (meta->custom && meta->data_version_flags == 1)) { // all custom text fields
+ mp4p_atom_remove_subatom (ilst, meta_atom);
+ break;
+ }
+ }
+ meta_atom = next;
+ }
+}
+
+static mp4p_atom_t *
+mp4tagutil_find_udta (mp4p_atom_t *moov, mp4p_atom_t **pmeta, mp4p_atom_t **pilst) {
+ mp4p_atom_t *hdlr = NULL;
+ mp4p_atom_t *meta = NULL;
+ mp4p_atom_t *ilst = NULL;
+ // find an existing udta with \0\0\0\0 mdir appl handler
+ mp4p_atom_t *udta = mp4p_atom_find (moov, "moov/udta");
+ while (udta) {
+ if (mp4p_atom_type_compare (udta, "udta")) {
+ udta = udta->next;
+ continue;
+ }
+ // there can be multiple meta atoms
+ mp4p_atom_t *subatom = udta->subatoms;
+ while (subatom) {
+ // check each meta subatom
+ if (mp4p_atom_type_compare (subatom, "meta")) {
+ meta = hdlr = ilst = NULL;
+ subatom = subatom->next;
+ continue;
+ }
+ meta = subatom;
+ hdlr = mp4p_atom_find(subatom, "meta/hdlr");
+ if (hdlr) {
+ mp4p_hdlr_t *hdlr_data = hdlr->data;
+ if (!mp4p_fourcc_compare (hdlr_data->component_subtype, "mdir")) {
+ ilst = mp4p_atom_find(subatom, "meta/ilst");
+ *pmeta = meta;
+ *pilst = ilst;
+ return udta;
+ }
+ }
+ meta = hdlr = ilst = NULL;
+ subatom = subatom->next;
+ }
+ udta = udta->next;
+ }
+ *pmeta = NULL;
+ *pilst = NULL;
+ return NULL;
+}
+
+static int
+_mp4tagutil_file_editable (mp4p_atom_t *mp4file) {
+ mp4p_atom_t *moov = mp4p_atom_find(mp4file, "moov");
+ mp4p_atom_t *mdat = mp4p_atom_find(mp4file, "mdat");
+ if (!moov || !mdat || mp4p_atom_type_compare(mp4file, "ftyp")) {
+ return 0;
+ }
+
+ return 1;
+}
+
+// NOTE: This is unused, since we're not moving mdat. Useful for reference.
+//static void
+//_mp4tagutil_update_stco (mp4p_atom_t *stco_atom, off_t delta) {
+// mp4p_stco_t *stco = stco_atom->data;
+// for (uint32_t i = 0; i < stco->number_of_entries; i++) {
+// stco->entriesi.offset += delta;
+// }
+//}
+//
+//static void
+//_mp4gagutil_update_all_stco (mp4p_atom_t *moov, off_t delta) {
+// mp4p_atom_t *trak = mp4p_atom_find (moov, "trak");
+// for (; trak; trak = trak->next) {
+// if (mp4p_atom_type_compare(trak, "trak")) {
+// continue;
+// }
+// mp4p_atom_t *stbl = mp4p_atom_find (trak, "trak/mdia/minf/stbl");
+// if (stbl) {
+// mp4p_atom_t *stco = mp4p_atom_find(stbl, "stbl/stco");
+// if (stco) {
+// _mp4tagutil_update_stco(stco, delta);
+// }
+//
+// mp4p_atom_t *co64 = mp4p_atom_find(stbl, "stbl/co64");
+// if (co64) {
+// _mp4tagutil_update_stco(co64, delta);
+// }
+// }
+// }
+//}
+
+static void
+_mp4tagutil_add_metadata_fields(mp4p_atom_t *ilst, DB_playItem_t *it) {
+ deadbeef->pl_lock ();
+ DB_metaInfo_t *m = deadbeef->pl_get_metadata_head (it);
+ while (m) {
+ if (strchr (":!_", m->key0)) {
+ break;
+ }
+
+ if (!strcasecmp (m->key, "track")
+ || !strcasecmp (m->key, "numtracks")
+ || !strcasecmp (m->key, "disc")
+ || !strcasecmp (m->key, "numdiscs")
+ || !strcasecmp (m->key, "genre")) {
+ m = m->next;
+ continue;
+ }
+
+ int i;
+ for (i = 0; _mp4_atom_mapi; i += 2) {
+ if (!strcasecmp (_mp4_atom_mapi+1, m->key)) {
+ break;
+ }
+ }
+
+ const char *value = m->value;
+ const char *end = m->value + m->valuesize;
+ while (value < end) {
+ if (!_mp4_atom_mapi || strlen (_mp4_atom_mapi) != 4) {
+ mp4p_atom_append(ilst, mp4p_ilst_create_custom(_mp4_atom_mapi ? _mp4_atom_mapi : m->key, value));
+ }
+ else {
+ mp4p_atom_append(ilst, mp4p_ilst_create_text(_mp4_atom_mapi, value));
+ }
+ size_t l = strlen (value) + 1;
+ value += l;
+ }
+ m = m->next;
+ }
+
+ const char *genre = deadbeef->pl_find_meta (it, "genre");
+ if (genre) {
+ mp4p_atom_append(ilst, mp4p_ilst_create_genre (genre));
+ }
+ const char *track = deadbeef->pl_find_meta (it, "track");
+ const char *numtracks = deadbeef->pl_find_meta (it, "numtracks");
+ const char *disc = deadbeef->pl_find_meta (it, "disc");
+ const char *numdiscs = deadbeef->pl_find_meta (it, "numdiscs");
+
+ uint16_t itrack = 0, inumtracks = 0, idisc = 0, inumdiscs = 0;
+ if (track) {
+ itrack = atoi (track);
+ }
+ if (numtracks) {
+ inumtracks = atoi (numtracks);
+ }
+ if (disc) {
+ idisc = atoi (disc);
+ }
+ if (numdiscs) {
+ inumdiscs = atoi (numdiscs);
+ }
+ if (itrack || inumtracks) {
+ mp4p_atom_append (ilst, mp4p_ilst_create_track_disc ("trkn", itrack, inumtracks));
+ }
+ if (idisc || inumdiscs) {
+ mp4p_atom_append (ilst, mp4p_ilst_create_track_disc ("disk", idisc, inumdiscs));
+ }
+
+ static const char *tag_rg_names = {
+ "REPLAYGAIN_ALBUM_GAIN",
+ "REPLAYGAIN_ALBUM_PEAK",
+ "REPLAYGAIN_TRACK_GAIN",
+ "REPLAYGAIN_TRACK_PEAK",
+ NULL
+ };
+
+ // replaygain key names in deadbeef internal metadata
+ static const char *ddb_internal_rg_keys = {
+ ":REPLAYGAIN_ALBUMGAIN",
+ ":REPLAYGAIN_ALBUMPEAK",
+ ":REPLAYGAIN_TRACKGAIN",
+ ":REPLAYGAIN_TRACKPEAK",
+ NULL
+ };
+
+ // add replaygain values
+ for (int n = 0; ddb_internal_rg_keysn; n++) {
+ if (deadbeef->pl_find_meta (it, ddb_internal_rg_keysn)) {
+ float value = deadbeef->pl_get_item_replaygain (it, n);
+ char s100;
+ // https://wiki.hydrogenaud.io/index.php?title=ReplayGain_2.0_specification#Metadata_format
+ switch (n) {
+ case DDB_REPLAYGAIN_ALBUMGAIN:
+ case DDB_REPLAYGAIN_TRACKGAIN:
+ snprintf (s, sizeof (s), "%.2f dB", value);
+ break;
+ case DDB_REPLAYGAIN_ALBUMPEAK:
+ case DDB_REPLAYGAIN_TRACKPEAK:
+ snprintf (s, sizeof (s), "%.6f", value);
+ break;
+ }
+ mp4p_atom_append(ilst, mp4p_ilst_create_custom(tag_rg_namesn, s));
+ }
+ }
+
+ deadbeef->pl_unlock ();
+}
+
+// FIXME: much of this code should be moved to mp4parser lib when finalized
+mp4p_atom_t *
+mp4tagutil_modify_meta (mp4p_atom_t *mp4file, DB_playItem_t *it) {
+ if (!_mp4tagutil_file_editable (mp4file)) {
+ return NULL;
+ }
+
+ mp4p_atom_t *mp4file_orig = mp4file;
+
+ mp4file = mp4p_atom_clone_list (mp4file_orig);
+
+ mp4p_atom_t *meta = NULL;
+ mp4p_atom_t *ilst = NULL;
+
+ mp4p_atom_t *moov = mp4p_atom_find(mp4file, "moov");
+ mp4p_atom_t *mdat = mp4p_atom_find(mp4file, "mdat");
+
+ mp4p_atom_t *udta = mp4tagutil_find_udta (moov, &meta, &ilst);
+
+ // FIXME: atoms after "udta" are not unsupported
+ if (udta && udta->next) {
+ mp4p_atom_free_list (mp4file);
+ return NULL;
+ }
+
+ if (!udta) {
+ // delete any udta without meta
+ for (;;) {
+ mp4p_atom_t *invalid_udta = mp4p_atom_find(moov, "moov/udta");
+ if (!invalid_udta) {
+ break;
+ }
+ mp4p_atom_remove_subatom(moov, invalid_udta);
+ }
+
+ // create new udta
+ udta = mp4p_atom_append (moov, mp4p_atom_new ("udta"));
+ }
+
+ if (!meta) {
+ // append meta/hdlr/ilst if needed
+ meta = mp4p_atom_append (udta, mp4p_meta_create_atom());
+ mp4p_atom_t *hdlr = mp4p_atom_append (meta, mp4p_atom_new ("hdlr"));
+ mp4p_hdlr_init (hdlr, "\0\0\0\0", "mdir", "appl");
+ ilst = mp4p_atom_append (meta, mp4p_atom_new ("ilst"));
+ }
+ else {
+ // cleanup the pre-existing keyvalue list
+ _remove_known_fields (ilst);
+ }
+
+ _mp4tagutil_add_metadata_fields(ilst, it);
+
+ // find first padding, if present
+ mp4p_atom_t *padding = mp4p_atom_find(mp4file, "free");
+ if (padding && padding->pos > mdat->pos) {
+ padding = NULL;
+ }
+
+ // desired atom to insert moov after
+ mp4p_atom_t *before_moov_begin = NULL;
+ for (mp4p_atom_t *curr = mp4file; curr->next; curr = curr->next) {
+ if (mp4p_atom_type_compare(curr->next, "moov")
+ || mp4p_atom_type_compare(curr->next, "free")
+ || mp4p_atom_type_compare(curr->next, "mdat")) {
+ before_moov_begin = curr;
+ break;
+ }
+ }
+ if (!before_moov_begin) {
+ mp4p_atom_free(mp4file);
+ return NULL;
+ }
+
+ // calculate padding size, and find the end of padding (eop)
+ mp4p_atom_t *eop = moov->next;
+ for (mp4p_atom_t *curr = padding; curr && !mp4p_atom_type_compare(curr, "free"); curr = curr->next) {
+ eop = curr->next;
+ }
+
+ // calculate final size of moov
+ mp4p_atom_update_size (moov);
+
+ // remove old padding, only if moov is in the beginning
+ mp4p_atom_t *next = NULL;
+ while (padding && !mp4p_atom_type_compare(padding, "free")) {
+ next = padding->next;
+ if (padding->pos < mdat->pos) {
+ mp4p_atom_remove_sibling(mp4file, padding, 1);
+ }
+ padding = next;
+ }
+ padding = NULL;
+
+ // does moov + free fit before eop?
+ if (before_moov_begin->pos + before_moov_begin->size + moov->size == eop->pos
+ || before_moov_begin->pos + before_moov_begin->size + moov->size < eop->pos - 8) {
+ // moov fits: put to the beginning
+ mp4p_atom_remove_sibling(mp4file, moov, 0);
+ moov->pos = before_moov_begin->pos + before_moov_begin->size;
+ moov->next = before_moov_begin->next;
+ before_moov_begin->next = moov;
+
+ // add new padding
+ if (moov->pos + moov->size < eop->pos - 8) {
+ padding = mp4p_atom_new ("free");
+ padding->pos = moov->pos + moov->size;
+ padding->size = (uint32_t)(eop->pos - (moov->pos + moov->size));
+
+ padding->next = moov->next;
+ moov->next = padding;
+ }
+ }
+ // moov doesn't fit -- put to the end of file
+ else {
+ mp4p_atom_remove_sibling(mp4file, moov, 0);
+ mp4p_atom_t *tail = mp4file;
+ while (tail->next) {
+ tail = tail->next;
+ }
+ tail->next = moov;
+
+ // replace old moov with padding, only if moov is in the beginning
+ if (moov->pos < mdat->pos) {
+ padding = mp4p_atom_new ("free");
+ padding->pos = moov->pos;
+ padding->size = (uint32_t)(eop->pos - moov->pos);
+
+ for (mp4p_atom_t *before = mp4file; before; before = before->next) {
+ if (before->next == eop) {
+ before->next = padding;
+ padding->next = eop;
+ break;
+ }
+ }
+ }
+ moov->pos = tail->pos + tail->size;
+ }
+
+// printf ("------------orig\n");
+// mp4p_dbg_dump_atom(mp4file_orig);
+// printf ("------------new\n");
+// mp4p_dbg_dump_atom(mp4file);
+// printf ("------------\n");
+
+ return mp4file;
+}
+
+int
+mp4_write_metadata (DB_playItem_t *it) {
+ char fnamePATH_MAX;
+ deadbeef->pl_get_meta (it, ":URI", fname, sizeof (fname));
+
+ mp4p_file_callbacks_t *file = mp4p_file_open_readwrite (fname);
+
+ if (!file) {
+ return -1;
+ }
+
+ mp4p_atom_t *mp4file = mp4p_open(file);
+
+#if 0 // FIXME: skipping junk is unsupported yet with file callbacks (junklib can't read using this interface -- a VFS wrapper needed?
+ int junk = deadbeef->junk_get_leading_size (fp);
+ if (junk >= 0) {
+ deadbeef->fseek (fp, junk, SEEK_SET);
+ }
+ else {
+ junk = 0;
+ }
+#endif
+
+ if (!mp4file) {
+ mp4p_file_close(file);
+ return -1;
+ }
+
+ mp4p_atom_t *mp4file_updated = mp4tagutil_modify_meta(mp4file, it);
+ if (!mp4file_updated) {
+ mp4p_file_close(file);
+ return -1;
+ }
+
+ int res = mp4p_update_metadata (file, mp4file_updated);
+
+ int close_err = mp4p_file_close(file);
+
+ mp4p_atom_free_list(mp4file);
+ mp4p_atom_free_list(mp4file_updated);
+
+ if (res < 0) {
+ return -1;
+ }
+ if (close_err < 0) {
+ return -1;
+ }
+ return 0;
+}
+
+void
+mp4_load_tags (mp4p_atom_t *mp4file, DB_playItem_t *it) {
+ int got_itunes_tags = 0;
+ mp4p_atom_t *moov = mp4p_atom_find(mp4file, "moov");
+
+ mp4p_atom_t *unused = NULL;
+ mp4p_atom_t *ilst = NULL;
+
+ mp4p_atom_t *udta = mp4tagutil_find_udta (moov, &unused, &ilst);
+ if (!udta || !ilst) {
+ return;
+ }
+
+ for (mp4p_atom_t *meta_atom = ilst->subatoms; meta_atom; meta_atom = meta_atom->next) {
+ if (!meta_atom->write) {
+ // When the atom is not writable, it indicates it wasn't parsed
+ continue;
+ }
+ got_itunes_tags = 1;
+
+ mp4p_ilst_meta_t *meta = meta_atom->data;
+
+ char type5;
+ memcpy (type, meta_atom->type, 4);
+ type4 = 0;
+ const char *name = meta->name ? meta->name : type;
+
+ if (!strcasecmp (name, "replaygain_track_gain")) {
+ deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, atof (meta->text));
+ }
+ else if (!strcasecmp (name, "replaygain_album_gain")) {
+ deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, atof (meta->text));
+ }
+ else if (!strcasecmp (name, "replaygain_track_peak")) {
+ deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, atof (meta->text));
+ }
+ else if (!strcasecmp (name, "replaygain_album_peak")) {
+ deadbeef->pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, atof (meta->text));
+ }
+ else {
+ int i = 0;
+ for (; _mp4_atom_mapi; i += 2) {
+ if (!strcasecmp (name, _mp4_atom_mapi)) {
+ if (meta->text) {
+ deadbeef->pl_append_meta (it, _mp4_atom_mapi+1, meta->text);
+ }
+ else if (meta->values) {
+ if (!memcmp (meta_atom->type, "trkn", 4)) {
+ if (meta->data_size >= 6) { // leading + idx + total
+ uint16_t track = meta->values1;
+ uint16_t total = meta->values2;
+ char s10;
+ if (track) {
+ snprintf (s, sizeof (s), "%d", (int)track);
+ deadbeef->pl_replace_meta (it, "track", s);
+ }
+ if (total) {
+ snprintf (s, sizeof (s), "%d", (int)total);
+ deadbeef->pl_replace_meta (it, "numtracks", s);
+ }
+ }
+ }
+ else if (!memcmp (meta_atom->type, "disk", 4)) {
+ if (meta->data_size >= 6) { // leading + idx + total
+ uint16_t track = meta->values1;
+ uint16_t total = meta->values2;
+ char s10;
+ if (track) {
+ snprintf (s, sizeof (s), "%d", (int)track);
+ deadbeef->pl_replace_meta (it, "disc", s);
+ }
+ if (total) {
+ snprintf (s, sizeof (s), "%d", (int)total);
+ deadbeef->pl_replace_meta (it, "numdiscs", s);
+ }
+ }
+ }
+ else if (!strcmp (_mp4_atom_mapi+1, "genre")) {
+ if (meta->values0) {
+ const char *genre = mp4p_genre_name_for_index(meta->values0);
+ if (genre) {
+ deadbeef->pl_replace_meta (it, _mp4_atom_mapi+1, genre);
+ }
+ }
+ }
+ else {
+ char s10;
+ snprintf (s, sizeof (s), "%d", (int)meta->values0);
+ deadbeef->pl_replace_meta (it, _mp4_atom_mapi+1, s);
+ }
+ }
+ break;
+ }
+ }
+
+ if (!_mp4_atom_mapi && meta->name && meta->text) {
+ // unknown field
+ deadbeef->pl_append_meta (it, meta->name, meta->text);
+ }
+
+ }
+ }
+ if (got_itunes_tags) {
+ uint32_t f = deadbeef->pl_get_item_flags (it);
+ f |= DDB_TAG_ITUNES;
+ deadbeef->pl_set_item_flags (it, f);
+ }
+}
+
+
+
+int
+mp4_read_metadata_file (DB_playItem_t *it, mp4p_file_callbacks_t *cb) {
+ mp4p_atom_t *mp4file = mp4p_open (cb);
+
+ deadbeef->pl_delete_all_meta (it);
+
+ // convert
+ mp4_load_tags (mp4file, it);
+ mp4p_atom_free_list (mp4file);
+ return 0;
+}
+
+static ssize_t
+_file_read (mp4p_file_callbacks_t *stream, void *ptr, size_t size) {
+ return deadbeef->fread (ptr, 1, size, (DB_FILE *)stream->ptrhandle);
+}
+
+static off_t
+_file_seek (mp4p_file_callbacks_t *stream, off_t offset, int whence) {
+ return deadbeef->fseek ((DB_FILE *)stream->ptrhandle, offset, whence);
+}
+
+static off_t
+_file_tell (mp4p_file_callbacks_t *stream) {
+ return (off_t)deadbeef->ftell ((DB_FILE *)stream->ptrhandle);
+}
+
+void
+mp4_init_ddb_file_callbacks (mp4p_file_callbacks_t *cb) {
+ cb->read = _file_read;
+ cb->seek = _file_seek;
+ cb->tell = _file_tell;
+}
+
+int
+mp4_read_metadata (DB_playItem_t *it) {
+ char fnamePATH_MAX;
+ deadbeef->pl_get_meta (it, ":URI", fname, sizeof (fname));
+ DB_FILE *fp = deadbeef->fopen (fname);
+ if (!fp) {
+ return -1;
+ }
+
+ if (fp->vfs->is_streaming ()) {
+ deadbeef->fclose (fp);
+ return -1;
+ }
+
+ mp4p_file_callbacks_t cb;
+ memset (&cb, 0, sizeof (cb));
+ cb.ptrhandle = fp;
+ mp4_init_ddb_file_callbacks(&cb);
+
+ int res = mp4_read_metadata_file(it, &cb);
+ deadbeef->fclose (fp);
+
+ return res;
+}
+
+mp4p_atom_t *
+mp4_get_cover_atom (mp4p_atom_t *mp4file) {
+ mp4p_atom_t *moov = mp4p_atom_find(mp4file, "moov");
+ if (!moov) {
+ return NULL;
+ }
+ mp4p_atom_t *meta = NULL;
+ mp4p_atom_t *ilst = NULL;
+ mp4p_atom_t *udta = mp4tagutil_find_udta (moov, &meta, &ilst);
+ if (!udta || !ilst) {
+ return NULL;
+ }
+
+ for (mp4p_atom_t *curr = ilst->subatoms; curr; curr = curr->next) {
+ if (!mp4p_atom_type_compare(curr, "covr")) {
+ return curr;
+ }
+ }
+ return NULL;
+}

deadbeef-1.9.6.tar.bz2/shared/mp4tagutil.h Added

@@ -0,0 +1,51 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2016 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef mp4tagutil_h
+#define mp4tagutil_h
+
+#include <deadbeef/deadbeef.h>
+#include <mp4p/mp4p.h>
+
+int
+mp4_read_metadata (DB_playItem_t *it);
+
+int
+mp4_read_metadata_file (DB_playItem_t *it, mp4p_file_callbacks_t *cb);
+
+int
+mp4_write_metadata (DB_playItem_t *it);
+
+mp4p_atom_t *
+mp4tagutil_modify_meta (mp4p_atom_t *mp4file, DB_playItem_t *it);
+
+void
+mp4_init_ddb_file_callbacks (mp4p_file_callbacks_t *cb);
+
+void
+mp4_load_tags (mp4p_atom_t *mp4file, DB_playItem_t *it);
+
+mp4p_atom_t *
+mp4_get_cover_atom (mp4p_atom_t *mp4file);
+
+#endif /* mp4tagutil_h */

deadbeef-1.9.6.tar.bz2/shared/scope Added

deadbeef-1.9.6.tar.bz2/shared/scope/Makefile.am Added

deadbeef-1.9.6.tar.bz2/shared/scope/Makefile.in Added

@@ -0,0 +1,718 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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 = shared/scope
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libscope_la_LIBADD =
+am_libscope_la_OBJECTS = libscope_la-scope.lo
+libscope_la_OBJECTS = $(am_libscope_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libscope_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscope_la_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libscope_la_SOURCES)
+DIST_SOURCES = $(libscope_la_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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@
+noinst_LTLIBRARIES = libscope.la
+libscope_la_SOURCES = scope.c scope.h
+libscope_la_CFLAGS = -fPIC -std=c99 -I@top_srcdir@/include
+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 --ignore-deps shared/scope/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps shared/scope/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):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	 sed 's|^^/*$$|.|; s|/^/*$$||; s|$$|/so_locations|' | \
+	 sort -u`; \
+	test -z "$$locs" || { \
+	 echo rm -f $${locs}; \
+	 rm -f $${locs}; \
+	}
+
+libscope.la: $(libscope_la_OBJECTS) $(libscope_la_DEPENDENCIES) $(EXTRA_libscope_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libscope_la_LINK) $(libscope_la_OBJECTS) $(libscope_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+libscope_la-scope.lo: scope.c
+	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscope_la_CFLAGS) $(CFLAGS) -c -o libscope_la-scope.lo `test -f 'scope.c' || echo '$(srcdir)/'`scope.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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:
+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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-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-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 -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:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am 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-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 tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/shared/scope/scope.c Added

@@ -0,0 +1,233 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include "scope.h"
+#include <deadbeef/fastftoi.h>
+
+#pragma mark - Public
+
+ddb_scope_t *
+ddb_scope_alloc (void) {
+ return calloc(1, sizeof (ddb_scope_t));
+}
+
+ddb_scope_t *
+ddb_scope_init (ddb_scope_t *scope) {
+ return scope;
+}
+
+void
+ddb_scope_dealloc (ddb_scope_t *scope) {
+ free (scope->samples);
+ memset (scope, 0, sizeof (ddb_scope_t));
+}
+
+void
+ddb_scope_free (ddb_scope_t *scope) {
+ free (scope);
+}
+
+void
+ddb_scope_process (ddb_scope_t * restrict scope, int samplerate, int channels, const float * restrict samples, int sample_count) {
+
+ if (scope->fragment_duration == 0) {
+ scope->fragment_duration = 50;
+ }
+
+ int fragment_sample_count = (float)scope->fragment_duration / 1000.f * samplerate;
+ if (channels != scope->channels
+ || samplerate != scope->samplerate
+ || fragment_sample_count != scope->sample_count) {
+ scope->channels = channels;
+ scope->sample_count = fragment_sample_count;
+ scope->samplerate = samplerate;
+ free (scope->samples);
+ scope->samples = calloc (scope->sample_count * channels, sizeof (float));
+ scope->mode_did_change = 1;
+ }
+
+ // append samples
+
+ // input size larger than the buffer? copy the tail.
+ if (sample_count > scope->sample_count) {
+ memcpy (scope->samples, samples + (sample_count - scope->sample_count) * channels, scope->sample_count * channels * sizeof (float));
+ }
+ // otherwise append
+ else {
+ int move_samples = scope->sample_count - sample_count;
+ memmove (scope->samples, scope->samples + (scope->sample_count - move_samples) * channels, move_samples * channels * sizeof(float));
+ memcpy (scope->samples + move_samples * channels, samples, sample_count * channels * sizeof (float));
+ }
+}
+
+void
+ddb_scope_tick (ddb_scope_t * restrict scope) {
+}
+
+void
+ddb_scope_get_draw_data (ddb_scope_t * restrict scope, int view_width, int view_height, int y_axis_flip, ddb_scope_draw_data_t * restrict draw_data) {
+ if (scope->mode_did_change
+ || draw_data->point_count != view_width) {
+ free (draw_data->points);
+ int channels = scope->mode == DDB_SCOPE_MONO ? 1 : scope->channels;
+ draw_data->points = calloc (view_width * channels, sizeof (ddb_scope_point_t));
+ draw_data->point_count = view_width;
+ scope->mode_did_change = 0;
+ }
+
+ int output_channels;
+ int average_channels;
+ float faverage_channels_inv;
+ switch (scope->mode) {
+ case DDB_SCOPE_MONO:
+ output_channels = 1;
+ average_channels = scope->channels;
+ break;
+ case DDB_SCOPE_MULTICHANNEL:
+ output_channels = scope->channels;
+ average_channels = 1;
+ break;
+ }
+
+ faverage_channels_inv = 1.f / average_channels;
+
+ float channel_height = view_height / output_channels;
+ float pixel_amplitude = channel_height / 2;
+
+ fpu_control fpu;
+ (void)fpu;
+ fpu_setround(&fpu);
+
+ int left_a = 0;
+ int left_b = 0;
+ float leftfrac = 0;
+
+ float fpoint_count = (float)draw_data->point_count;
+ float fsample_count = (float)scope->sample_count;
+
+ for (int i = 0; i < draw_data->point_count; i++) {
+ float right = (float)(i+1) / fpoint_count * fsample_count;
+ if (right > scope->sample_count-1) {
+ right = scope->sample_count-1;
+ }
+
+ int right_a = ftoi(floorf(right));
+ float fright_b = ceilf(right);
+ int right_b = ftoi(fright_b);
+
+ float rightfrac = fright_b - right;
+
+ for (int c = 0; c < output_channels; c++) {
+ draw_data->pointsdraw_data->point_count * c + i.ymin = 1;
+ draw_data->pointsdraw_data->point_count * c + i.ymax = -1;
+ }
+
+ for (int c = 0; c < output_channels; c++) {
+ int output_channel = c;
+
+ ddb_scope_point_t * restrict minmax = &draw_data->pointsdraw_data->point_count * output_channel + i;
+ float minmax_ymin = minmax->ymin;
+ float minmax_ymax = minmax->ymax;
+
+ // Interpolated leftmost and rightmost samples
+ float leftsample = 0;
+ float rightsample = 0;
+
+ for (int ac = 0; ac < average_channels; ac++) {
+ float leftsample_a = scope->samplesleft_a * scope->channels + c + ac;
+ float leftsample_b = scope->samplesleft_b * scope->channels + c + ac;
+ leftsample += leftsample_a + (leftsample_b - leftsample_a) * leftfrac;
+
+ float rightsample_a = scope->samplesright_a * scope->channels + c + ac;
+ float rightsample_b = scope->samplesright_b * scope->channels + c + ac;
+ rightsample += rightsample_a + (rightsample_b - rightsample_a) * rightfrac;
+ }
+
+ leftsample *= faverage_channels_inv;
+ rightsample *= faverage_channels_inv;
+
+ if (leftsample > minmax_ymax) {
+ minmax_ymax = leftsample;
+ }
+ if (leftsample < minmax_ymin) {
+ minmax_ymin = leftsample;
+ }
+
+ if (rightsample > minmax_ymax) {
+ minmax_ymax = rightsample;
+ }
+ if (rightsample < minmax_ymin) {
+ minmax_ymin = rightsample;
+ }
+
+ // The rest of the "whole" samples
+ for (int n = left_b; n <= right_a; n++) {
+ float sample = 0;
+ for (int ac = 0; ac < average_channels; ac++) {
+ sample += scope->samplesn * scope->channels + c + ac;
+ }
+ sample *= faverage_channels_inv;
+
+ if (sample > minmax_ymax) {
+ minmax_ymax = sample;
+ }
+ if (sample < minmax_ymin) {
+ minmax_ymin = sample;
+ }
+ }
+
+ int offs;
+ float ymin;
+ float ymax;
+ if (y_axis_flip) {
+ offs = output_channel * channel_height;
+ ymin = -minmax_ymax;
+ ymax = -minmax_ymin;
+ }
+ else {
+ offs = (output_channels - output_channel - 1) * channel_height;
+ ymin = minmax_ymin;
+ ymax = minmax_ymax;
+ }
+ minmax->ymin = ymin * pixel_amplitude + pixel_amplitude + offs;
+ minmax->ymax = ymax * pixel_amplitude + pixel_amplitude + offs;
+ }
+ left_a = right_a;
+ left_b = right_b;
+ leftfrac = rightfrac;
+ }
+
+ fpu_restore(fpu);
+
+ draw_data->mode = scope->mode;
+ draw_data->channels = scope->channels;
+}
+
+void
+ddb_scope_draw_data_dealloc (ddb_scope_draw_data_t *draw_data) {
+ free (draw_data->points);
+ memset (draw_data, 0, sizeof(ddb_scope_draw_data_t));
+}

deadbeef-1.9.6.tar.bz2/shared/scope/scope.h Added

@@ -0,0 +1,77 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef scope_h
+#define scope_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    DDB_SCOPE_MONO,
+    DDB_SCOPE_MULTICHANNEL,
+} ddb_scope_mode_t;
+
+typedef struct {
+    float ymin, ymax;
+} ddb_scope_point_t;
+
+typedef struct {
+    ddb_scope_mode_t mode;
+    int channels;
+    int point_count;
+    ddb_scope_point_t *points; // real point count is multiplied by number of channels, in planar layout
+} ddb_scope_draw_data_t;
+
+typedef struct {
+    ddb_scope_mode_t mode;
+    int mode_did_change;
+    int fragment_duration; // ms
+    int samplerate;
+    int channels;
+    int sample_count;
+    float *samples;
+} ddb_scope_t;
+
+ddb_scope_t *ddb_scope_alloc (void);
+
+ddb_scope_t *ddb_scope_init (ddb_scope_t *scope);
+
+void ddb_scope_dealloc (ddb_scope_t *scope);
+
+void ddb_scope_free (ddb_scope_t *scope);
+
+void ddb_scope_process (ddb_scope_t *scope, int samplerate, int channels, const float *samples, int sample_count);
+
+void ddb_scope_tick (ddb_scope_t *scope);
+
+void ddb_scope_get_draw_data (ddb_scope_t *scope, int view_width, int view_height, int y_axis_flip, ddb_scope_draw_data_t *draw_data);
+
+void ddb_scope_draw_data_dealloc (ddb_scope_draw_data_t *draw_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* scope_h */

deadbeef-1.9.6.tar.bz2/shared/tftintutil.c Added

@@ -0,0 +1,166 @@
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include "tftintutil.h"
+#include "../src/utf8.h"
+
+static size_t
+get_stop_from_string(const char *string, size_t len, tint_stop_t *stop) {
+ const char *p = string;
+ const char *end = p + len;
+ const char marker_tint = "\0331;";
+ const char marker_rgb = "\0332;";
+
+ if (len < sizeof(marker_tint)+1) {
+ return 0;
+ }
+
+ if (!strncmp (p, marker_tint, sizeof(marker_tint)-1)) {
+ p += sizeof (marker_tint)-1;
+
+ const char *amount = p;
+
+ if (*p == '-' || *p == '+') {
+ p++;
+ }
+
+ if (!isdigit (*p)) {
+ return 0;
+ }
+
+ while (isdigit (*p)) {
+ p++;
+ }
+
+ if (*p != 'm') {
+ return 0;
+ }
+ p++;
+
+ stop->tint = atoi (amount);
+ }
+ else if (!strncmp (p, marker_rgb, sizeof(marker_rgb)-1)) {
+ p += sizeof (marker_rgb)-1;
+ int r = 0;
+ int g = 0;
+ int b = 0;
+ int sign = 1;
+ if (*p == '-') {
+ sign = -1;
+ p += 1;
+ }
+ while (p < end && isdigit(*p)) {
+ r = r * 10 + (*p)-'0';
+ p += 1;
+ }
+ if (*p != ';') {
+ return 0;
+ }
+ r *= sign;
+ p += 1;
+ if (*p == '-') {
+ sign = -1;
+ p += 1;
+ }
+ while (p < end && isdigit(*p)) {
+ g = g * 10 + (*p)-'0';
+ p += 1;
+ }
+ if (*p != ';') {
+ return 0;
+ }
+ g *= sign;
+ p += 1;
+ if (*p == '-') {
+ sign = -1;
+ p += 1;
+ }
+ while (p < end && isdigit(*p)) {
+ b = b * 10 + (*p)-'0';
+ p += 1;
+ }
+ if (*p != 'm') {
+ return 0;
+ }
+ p += 1;
+ b *= sign;
+
+ if (r < 0 || g < 0 || b < 0) {
+ stop->reset_rgb = 1;
+ }
+ else {
+ stop->has_rgb = 1;
+ stop->r = r <= 255 ? (uint8_t)r : 255;
+ stop->g = g <= 255 ? (uint8_t)g : 255;
+ stop->b = b <= 255 ? (uint8_t)b : 255;
+ }
+ }
+ else {
+ return 0;
+ }
+
+ return p - string;
+}
+
+unsigned
+calculate_tint_stops_from_string (const char *inputString, tint_stop_t *tintStops, unsigned maxStops, char** plainString) {
+ unsigned numTintStops = 0;
+
+ const char *p = inputString;
+ char *out = calloc (strlen(inputString) + 1, 1);
+ *plainString = out;
+ size_t remaining = strlen (inputString);
+
+ int currentTint = 0;
+ uint8_t currentR = 0;
+ uint8_t currentG = 0;
+ uint8_t currentB = 0;
+ unsigned has_rgb = 0;
+
+ int index = 0;
+ int byteindex = 0;
+ while (*p) {
+ tint_stop_t stop = {0};
+ size_t len = get_stop_from_string(p, remaining, &stop);
+
+ if (len != 0) {
+ if (numTintStops < maxStops) {
+ currentTint += stop.tint;
+ if (stop.has_rgb) {
+ has_rgb = 1;
+ currentR = stop.r;
+ currentG = stop.g;
+ currentB = stop.b;
+ }
+ if (stop.reset_rgb) {
+ has_rgb = 0;
+ currentR = currentG = currentB = 0;
+ }
+ tintStopsnumTintStops.tint = currentTint;
+ tintStopsnumTintStops.index = index;
+ tintStopsnumTintStops.byteindex = byteindex;
+ tintStopsnumTintStops.has_rgb = has_rgb;
+ tintStopsnumTintStops.r = currentR;
+ tintStopsnumTintStops.g = currentG;
+ tintStopsnumTintStops.b = currentB;
+ numTintStops += 1;
+ }
+ p += len;
+ remaining -= len;
+ continue;
+ }
+ if (remaining == 0) {
+ break;
+ }
+ uint32_t i = 0;
+ u8_nextchar(p, (int32_t *)&i);
+ memcpy (out, p, i);
+ out += i;
+ p += i;
+ remaining -= i;
+ index++;
+ byteindex+=i;
+ }
+ *out = 0;
+ return numTintStops;
+}

deadbeef-1.9.6.tar.bz2/shared/tftintutil.h Added

deadbeef-1.9.6.tar.bz2/shared/trkproperties_shared.c Added

@@ -0,0 +1,321 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2016 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+#include "trkproperties_shared.h"
+#include <deadbeef/deadbeef.h>
+#include "../src/utf8.h"
+
+extern DB_functions_t *deadbeef;
+
+// full metadata
+const char *trkproperties_types = {
+ "artist", "Artist Name",
+ "title", "Track Title",
+ "album", "Album Title",
+ "year", "Date",
+ "genre", "Genre",
+ "composer", "Composer",
+ "album artist", "Album Artist",
+ "track", "Track Number",
+ "numtracks", "Total Tracks",
+ "disc", "Disc Number",
+ "numdiscs", "Total Discs",
+ "comment", "Comment",
+ NULL
+};
+
+const char *trkproperties_hc_props = {
+ ":URI", "Location",
+ ":TRACKNUM", "Subtrack Index",
+ ":DURATION", "Duration",
+ ":TAGS", "Tag Type(s)",
+ ":HAS_EMBEDDED_CUESHEET", "Embedded Cuesheet",
+ ":DECODER", "Codec",
+ NULL
+};
+
+int
+trkproperties_build_key_list (const char ***pkeys, int props, DB_playItem_t **tracks, int numtracks) {
+ int sz = 20;
+ const char **keys = malloc (sizeof (const char *) * sz);
+ if (!keys) {
+ fprintf (stderr, "fatal: out of memory allocating key list\n");
+ assert (0);
+ return 0;
+ }
+
+ int n = 0;
+
+ for (int i = 0; i < numtracks; i++) {
+ DB_metaInfo_t *meta = deadbeef->pl_get_metadata_head (tracksi);
+ while (meta) {
+ if (meta->key0 != '!' && ((props && meta->key0 == ':') || (!props && meta->key0 != ':'))) {
+ int k = 0;
+ for (; k < n; k++) {
+ if (meta->key == keysk) {
+ break;
+ }
+ }
+ if (k == n) {
+ if (n >= sz) {
+ sz *= 2;
+ keys = realloc (keys, sizeof (const char *) * sz);
+ if (!keys) {
+ fprintf (stderr, "fatal: out of memory reallocating key list (%d keys)\n", sz);
+ assert (0);
+ }
+ }
+ keysn++ = meta->key;
+ }
+ }
+ meta = meta->next;
+ }
+ }
+
+ *pkeys = keys;
+ return n;
+}
+
+void
+trkproperties_free_track_list (DB_playItem_t ***_tracks, int *_numtracks) {
+ DB_playItem_t **tracks = *_tracks;
+ int numtracks = *_numtracks;
+
+ if (tracks) {
+ for (int i = 0; i < numtracks; i++) {
+ deadbeef->pl_item_unref (tracksi);
+ }
+ free (tracks);
+ }
+
+ *_tracks = NULL;
+ *_numtracks = 0;
+}
+
+void
+trkproperties_build_track_list_for_ctx (ddb_playlist_t *plt, int ctx, DB_playItem_t ***_tracks, int *_numtracks) {
+ DB_playItem_t *playing_track = NULL;
+ if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ playing_track = deadbeef->streamer_get_playing_track_safe ();
+ }
+
+ deadbeef->pl_lock ();
+
+ int num = 0;
+ if (ctx == DDB_ACTION_CTX_SELECTION) {
+ num = deadbeef->plt_getselcount (plt);
+ }
+ else if (ctx == DDB_ACTION_CTX_PLAYLIST) {
+ num = deadbeef->plt_get_item_count (plt, PL_MAIN);
+ }
+ else if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ num = 1;
+ }
+ if (num <= 0) {
+ deadbeef->pl_unlock ();
+ if (playing_track) {
+ deadbeef->pl_item_unref (playing_track);
+ }
+ return;
+ }
+
+ DB_playItem_t **tracks = calloc (num, sizeof (DB_playItem_t *));
+ if (!tracks) {
+ fprintf (stderr, "trkproperties: failed to alloc %d bytes to store selected tracks\n", (int)(num * sizeof (void *)));
+ deadbeef->pl_unlock ();
+ if (playing_track) {
+ deadbeef->pl_item_unref (playing_track);
+ }
+ return;
+ }
+
+ if (ctx == DDB_ACTION_CTX_NOWPLAYING) {
+ if (!playing_track) {
+ free (tracks);
+ tracks = NULL;
+ deadbeef->pl_unlock ();
+ return;
+ }
+ deadbeef->pl_item_ref (playing_track);
+ tracks0 = playing_track;
+ }
+ else {
+ int n = 0;
+ DB_playItem_t *it = deadbeef->plt_get_first (plt, PL_MAIN);
+ while (it) {
+ if (ctx == DDB_ACTION_CTX_PLAYLIST || deadbeef->pl_is_selected (it)) {
+ assert (n < num);
+ deadbeef->pl_item_ref (it);
+ tracksn++ = it;
+ }
+ DB_playItem_t *next = deadbeef->pl_get_next (it, PL_MAIN);
+ deadbeef->pl_item_unref (it);
+ it = next;
+ }
+ }
+ *_numtracks = num;
+ *_tracks = tracks;
+
+ deadbeef->pl_unlock ();
+
+ if (playing_track) {
+ deadbeef->pl_item_unref (playing_track);
+ }
+}
+
+void
+trkproperties_reload_tags (DB_playItem_t **tracks, int numtracks) {
+ for (int i = 0; i < numtracks; i++) {
+ DB_playItem_t *it = tracksi;
+ deadbeef->pl_lock ();
+ char decoder_id100;
+ const char *dec = deadbeef->pl_find_meta (it, ":DECODER");
+ if (dec) {
+ strncpy (decoder_id, dec, sizeof (decoder_id));
+ }
+ int match = deadbeef->pl_is_selected (it) && deadbeef->is_local_file (deadbeef->pl_find_meta (it, ":URI")) && dec;
+ deadbeef->pl_unlock ();
+
+ if (match) {
+ uint32_t f = deadbeef->pl_get_item_flags (it);
+ if (!(f & DDB_IS_SUBTRACK)) {
+ f &= ~DDB_TAG_MASK;
+ deadbeef->pl_set_item_flags (it, f);
+ DB_decoder_t **decoders = deadbeef->plug_get_decoder_list ();
+ for (int j = 0; decodersj; j++) {
+ if (!strcmp (decodersj->plugin.id, decoder_id)) {
+ if (decodersj->read_metadata) {
+ decodersj->read_metadata (it);
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
+}
+
+static int
+string_append_multivalue (char *out, int size, DB_metaInfo_t *meta, int *clipped) {
+ int initsize = size;
+ const char *p = meta->value;
+ const char *end = p + meta->valuesize;
+ while (p < end) {
+ int l = (int)strlen (p) + 1;
+ if (l > size) {
+ l = size-1;
+ *clipped = 1;
+ u8_strnbcpy (out, p, (int)l);
+ outl = 0;
+ out += l;
+ size -= l;
+ break;
+ }
+
+ memcpy (out, p, (int)l);
+
+ p += l;
+ out += l-1;
+ size -= l-1;
+
+ if (p != end) {
+ if (size < 3) {
+ *clipped = 1;
+ break;
+ }
+ memcpy (out, "; ", 3);
+ out += 2;
+ size -= 2;
+ }
+ }
+ return initsize - size;
+}
+
+int
+trkproperties_get_field_value (char *out, int size, const char *key, DB_playItem_t **tracks, int numtracks) {
+ int multiple = 0;
+ char *out_start = out;
+ int clipped = 0;
+ *out = 0;
+ if (numtracks == 0) {
+ return 0;
+ }
+ deadbeef->pl_lock ();
+ const char **prev = malloc (sizeof (const char *) * numtracks);
+ memset (prev, 0, sizeof (const char *) * numtracks);
+ for (int i = 0; i < numtracks; i++) {
+ DB_metaInfo_t *meta = deadbeef->pl_meta_for_key (tracksi, key);
+ if (meta && meta->valuesize == 1) {
+ meta = NULL;
+ }
+
+ if (i > 0) {
+ int n = 0;
+ for (; n < i; n++) {
+ if (prevn == (meta ? meta->value : NULL)) {
+ break;
+ }
+ }
+ if (n == i) {
+ multiple = 1;
+ if (meta) {
+ if (out != out_start) {
+ if (size < 3) {
+ clipped = 1;
+ break;
+ }
+ memcpy (out, "; ", 3);
+ out += 2;
+ size -= 2;
+ }
+ int len = string_append_multivalue (out, size, meta, &clipped);
+ out += len;
+ size -= len;
+ }
+ }
+ }
+ else if (meta) {
+ int n = string_append_multivalue (out, size, meta, &clipped);
+ out += n;
+ size -= n;
+ }
+ previ = meta ? meta->value : NULL;
+ if (size < 3) {
+ break;
+ }
+ }
+ deadbeef->pl_unlock ();
+ if (clipped) {
+ // FIXME: This is a hack for strings which don't fit in the preallocated 5K buffer
+ // When the code is converted to use dynamic buffer - this can be removed
+ int idx = (int)(out - 4 - out_start);
+ u8_dec (out_start, &idx);
+ char *p = out_start + idx;
+ strcpy (p, "...");
+ }
+ free (prev);
+ return multiple;
+}

deadbeef-1.9.6.tar.bz2/shared/trkproperties_shared.h Added

@@ -0,0 +1,48 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2016 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+
+#ifndef ____trkproperties_shared__
+#define ____trkproperties_shared__
+
+#include <deadbeef/deadbeef.h>
+
+extern const char *trkproperties_types;
+extern const char *trkproperties_hc_props;
+
+int
+trkproperties_build_key_list (const char ***pkeys, int props, DB_playItem_t **tracks, int numtracks);
+
+void
+trkproperties_free_track_list (DB_playItem_t ***tracks, int *numtracks);
+
+void
+trkproperties_build_track_list_for_ctx (ddb_playlist_t *plt, int ctx, DB_playItem_t ***_tracks, int *_numtracks);
+
+void
+trkproperties_reload_tags (DB_playItem_t **tracks, int numtracks);
+
+int
+trkproperties_get_field_value (char *out, int size, const char *key, DB_playItem_t **tracks, int numtracks);
+
+#endif /* defined(____trkproperties_shared__) */

deadbeef-1.9.6.tar.bz2/src Added

deadbeef-1.9.6.tar.bz2/src/Makefile.am Added

@@ -0,0 +1,44 @@
+bin_PROGRAMS = deadbeef
+
+deadbeef_SOURCES =\
+	buffered_file_writer.c buffered_file_writer.h\
+	conf.c  conf.h\
+	cueutil.c cueutil.h playlist.c playlist.h \
+	decodedblock.c decodedblock.h\
+	dsp.c dsp.h\
+	dsppreset.c dsppreset.h\
+	escape.c escape.h\
+	../external/wcwidth/wcwidth.c ../external/wcwidth/wcwidth.h\
+	fft.c fft.h\
+	handler.c handler.h\
+	junklib.h junklib.c utf8.c utf8.h\
+	logger.c logger.h\
+	main.c\
+	md5/md5.c md5/md5.h\
+	messagepump.c messagepump.h\
+	metacache.c metacache.h\
+	playmodes.c playmodes.h\
+	playqueue.c playqueue.h\
+	plmeta.c plmeta.h\
+	pltmeta.c pltmeta.h\
+	plugins.c plugins.h moduleconf.h\
+	premix.c premix.h\
+	replaygain.c replaygain.h\
+	resizable_buffer.c resizable_buffer.h\
+	ringbuf.c ringbuf.h\
+	sort.c sort.h\
+	streamer.c streamer.h\
+	streamreader.c streamreader.h\
+	tf.c tf.h\
+	threading_pthread.c threading.h\
+	u8_lc_map.h\
+	u8_uc_map.h\
+	vfs.c vfs.h vfs_stdio.c\
+	volume.c volume.h\
+	viz.c viz.h
+
+deadbeef_LDADD = $(LDADD) $(ICONV_LIB) $(DL_LIBS) -lm -lpthread $(DISPATCH_LIBS) $(LTLIBINTL) ../shared/libctmap.la ../plugins/libparser/libparser.la
+
+deadbeef_CFLAGS = $(DEPS_CFLAGS) $(DISPATCH_CFLAGS) -std=c99 -DLOCALEDIR=\"@localedir@\" -I@top_srcdir@/include -I@top_srcdir@
+
+EXTRA_DIST = sj_to_unicode.h

deadbeef-1.9.6.tar.bz2/src/Makefile.in Added

@@ -0,0 +1,1047 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 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@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\\ \	*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -dEDm) skip_next=yes;; \
+ -JT) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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@
+bin_PROGRAMS = deadbeef$(EXEEXT)
+subdir = src
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc2.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intl.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/lock.m4 \
+	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/threadlib.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/visibility.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am__dirstamp = $(am__leading_dot)dirstamp
+am_deadbeef_OBJECTS = deadbeef-buffered_file_writer.$(OBJEXT) \
+	deadbeef-conf.$(OBJEXT) deadbeef-cueutil.$(OBJEXT) \
+	deadbeef-playlist.$(OBJEXT) deadbeef-decodedblock.$(OBJEXT) \
+	deadbeef-dsp.$(OBJEXT) deadbeef-dsppreset.$(OBJEXT) \
+	deadbeef-escape.$(OBJEXT) \
+	../external/wcwidth/deadbeef-wcwidth.$(OBJEXT) \
+	deadbeef-fft.$(OBJEXT) deadbeef-handler.$(OBJEXT) \
+	deadbeef-junklib.$(OBJEXT) deadbeef-utf8.$(OBJEXT) \
+	deadbeef-logger.$(OBJEXT) deadbeef-main.$(OBJEXT) \
+	md5/deadbeef-md5.$(OBJEXT) deadbeef-messagepump.$(OBJEXT) \
+	deadbeef-metacache.$(OBJEXT) deadbeef-playmodes.$(OBJEXT) \
+	deadbeef-playqueue.$(OBJEXT) deadbeef-plmeta.$(OBJEXT) \
+	deadbeef-pltmeta.$(OBJEXT) deadbeef-plugins.$(OBJEXT) \
+	deadbeef-premix.$(OBJEXT) deadbeef-replaygain.$(OBJEXT) \
+	deadbeef-resizable_buffer.$(OBJEXT) deadbeef-ringbuf.$(OBJEXT) \
+	deadbeef-sort.$(OBJEXT) deadbeef-streamer.$(OBJEXT) \
+	deadbeef-streamreader.$(OBJEXT) deadbeef-tf.$(OBJEXT) \
+	deadbeef-threading_pthread.$(OBJEXT) deadbeef-vfs.$(OBJEXT) \
+	deadbeef-vfs_stdio.$(OBJEXT) deadbeef-volume.$(OBJEXT) \
+	deadbeef-viz.$(OBJEXT)
+deadbeef_OBJECTS = $(am_deadbeef_OBJECTS)
+am__DEPENDENCIES_1 =
+deadbeef_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	../shared/libctmap.la ../plugins/libparser/libparser.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+deadbeef_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(deadbeef_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp =
+am__depfiles_maybe =
+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_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 = 
+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_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 = 
+SOURCES = $(deadbeef_SOURCES)
+DIST_SOURCES = $(deadbeef_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items$$0 = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+ALLOCA_H_CFLAGS = @ALLOCA_H_CFLAGS@
+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@
+CDDA_CFLAGS = @CDDA_CFLAGS@
+CDDA_LIBS = @CDDA_LIBS@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+COREAUDIO_LIBS = @COREAUDIO_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_DEPS_CFLAGS = @DBUS_DEPS_CFLAGS@
+DBUS_DEPS_LIBS = @DBUS_DEPS_LIBS@
+DEFS = @DEFS@
+DISPATCH_CFLAGS = @DISPATCH_CFLAGS@
+DISPATCH_LIBS = @DISPATCH_LIBS@
+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_CFLAGS = @FAAD2_CFLAGS@
+FAAD2_LIBS = @FAAD2_LIBS@
+FFMPEG_DEPS_CFLAGS = @FFMPEG_DEPS_CFLAGS@
+FFMPEG_DEPS_LIBS = @FFMPEG_DEPS_LIBS@
+FGREP = @FGREP@
+FLAC_CFLAGS = @FLAC_CFLAGS@
+FLAC_LIBS = @FLAC_LIBS@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+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_CFLAGS = @HOTKEYS_CFLAGS@
+HOTKEYS_LIBS = @HOTKEYS_LIBS@
+ICONV_LIB = @ICONV_LIB@
+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@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_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@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAD_CFLAGS = @MAD_CFLAGS@
+MAD_LIBS = @MAD_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPG123_CFLAGS = @MPG123_CFLAGS@
+MPG123_LIBS = @MPG123_LIBS@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NOCPPLIB = @NOCPPLIB@
+NOTIFY_CFLAGS = @NOTIFY_CFLAGS@
+NOTIFY_LIBS = @NOTIFY_LIBS@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OGG_CFLAGS = @OGG_CFLAGS@
+OGG_LIBS = @OGG_LIBS@
+OPUS_CFLAGS = @OPUS_CFLAGS@
+OPUS_LIBS = @OPUS_LIBS@
+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@
+PIPEWIRE_DEPS_CFLAGS = @PIPEWIRE_DEPS_CFLAGS@
+PIPEWIRE_DEPS_LIBS = @PIPEWIRE_DEPS_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PLUGINS_DIRS = @PLUGINS_DIRS@
+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_CFLAGS = @SNDFILE_CFLAGS@
+SNDFILE_LIBS = @SNDFILE_LIBS@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+VORBIS_CFLAGS = @VORBIS_CFLAGS@
+VORBIS_LIBS = @VORBIS_LIBS@
+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@
+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_CFLAGS = @ZIP_CFLAGS@
+ZIP_LIBS = @ZIP_LIBS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+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@
+ac_ct_OBJC = @ac_ct_OBJC@
+am__leading_dot = @am__leading_dot@
+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@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
+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@
+runstatedir = @runstatedir@
+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@
+deadbeef_SOURCES = \
+	buffered_file_writer.c buffered_file_writer.h\
+	conf.c conf.h\
+	cueutil.c cueutil.h playlist.c playlist.h \
+	decodedblock.c decodedblock.h\
+	dsp.c dsp.h\
+	dsppreset.c dsppreset.h\
+	escape.c escape.h\
+	../external/wcwidth/wcwidth.c ../external/wcwidth/wcwidth.h\
+	fft.c fft.h\
+	handler.c handler.h\
+	junklib.h junklib.c utf8.c utf8.h\
+	logger.c logger.h\
+	main.c\
+	md5/md5.c md5/md5.h\
+	messagepump.c messagepump.h\
+	metacache.c metacache.h\
+	playmodes.c playmodes.h\
+	playqueue.c playqueue.h\
+	plmeta.c plmeta.h\
+	pltmeta.c pltmeta.h\
+	plugins.c plugins.h moduleconf.h\
+	premix.c premix.h\
+	replaygain.c replaygain.h\
+	resizable_buffer.c resizable_buffer.h\
+	ringbuf.c ringbuf.h\
+	sort.c sort.h\
+	streamer.c streamer.h\
+	streamreader.c streamreader.h\
+	tf.c tf.h\
+	threading_pthread.c threading.h\
+	u8_lc_map.h\
+	u8_uc_map.h\
+	vfs.c vfs.h vfs_stdio.c\
+	volume.c volume.h\
+	viz.c viz.h
+
+deadbeef_LDADD = $(LDADD) $(ICONV_LIB) $(DL_LIBS) -lm -lpthread $(DISPATCH_LIBS) $(LTLIBINTL) ../shared/libctmap.la ../plugins/libparser/libparser.la
+deadbeef_CFLAGS = $(DEPS_CFLAGS) $(DISPATCH_CFLAGS) -std=c99 -DLOCALEDIR=\"@localedir@\" -I@top_srcdir@/include -I@top_srcdir@
+EXTRA_DIST = sj_to_unicode.h 
+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 --ignore-deps src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	 $(AUTOMAKE) --gnu --ignore-deps src/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-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	 echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	 $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	 ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	 -e 's|.*|.|' \
+	 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files"." = ""; dirs"." = 1 } \
+	 { d=$$3; if (dirsd != 1) { print "d", d; dirsd = 1 } \
+	 if ($$2 == $$4) filesd = filesd " " $$1; \
+	 else { print "f", $$3 "/" $$4, $$1; } } \
+	 END { for (d in files) print "f", d, filesd }' | \
+	while read type dir files; do \
+	 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	 test -z "$$files" || { \
+	 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	 } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	 -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+../external/wcwidth/$(am__dirstamp):
+	@$(MKDIR_P) ../external/wcwidth
+	@: > ../external/wcwidth/$(am__dirstamp)
+../external/wcwidth/deadbeef-wcwidth.$(OBJEXT): \
+	../external/wcwidth/$(am__dirstamp)
+md5/$(am__dirstamp):
+	@$(MKDIR_P) md5
+	@: > md5/$(am__dirstamp)
+md5/deadbeef-md5.$(OBJEXT): md5/$(am__dirstamp)
+
+deadbeef$(EXEEXT): $(deadbeef_OBJECTS) $(deadbeef_DEPENDENCIES) $(EXTRA_deadbeef_DEPENDENCIES) 
+	@rm -f deadbeef$(EXEEXT)
+	$(AM_V_CCLD)$(deadbeef_LINK) $(deadbeef_OBJECTS) $(deadbeef_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f ../external/wcwidth/*.$(OBJEXT)
+	-rm -f md5/*.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+.c.o:
+	$(AM_V_CC)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+	$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
+
+deadbeef-buffered_file_writer.o: buffered_file_writer.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-buffered_file_writer.o `test -f 'buffered_file_writer.c' || echo '$(srcdir)/'`buffered_file_writer.c
+
+deadbeef-buffered_file_writer.obj: buffered_file_writer.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-buffered_file_writer.obj `if test -f 'buffered_file_writer.c'; then $(CYGPATH_W) 'buffered_file_writer.c'; else $(CYGPATH_W) '$(srcdir)/buffered_file_writer.c'; fi`
+
+deadbeef-conf.o: conf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-conf.o `test -f 'conf.c' || echo '$(srcdir)/'`conf.c
+
+deadbeef-conf.obj: conf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-conf.obj `if test -f 'conf.c'; then $(CYGPATH_W) 'conf.c'; else $(CYGPATH_W) '$(srcdir)/conf.c'; fi`
+
+deadbeef-cueutil.o: cueutil.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-cueutil.o `test -f 'cueutil.c' || echo '$(srcdir)/'`cueutil.c
+
+deadbeef-cueutil.obj: cueutil.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-cueutil.obj `if test -f 'cueutil.c'; then $(CYGPATH_W) 'cueutil.c'; else $(CYGPATH_W) '$(srcdir)/cueutil.c'; fi`
+
+deadbeef-playlist.o: playlist.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-playlist.o `test -f 'playlist.c' || echo '$(srcdir)/'`playlist.c
+
+deadbeef-playlist.obj: playlist.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-playlist.obj `if test -f 'playlist.c'; then $(CYGPATH_W) 'playlist.c'; else $(CYGPATH_W) '$(srcdir)/playlist.c'; fi`
+
+deadbeef-decodedblock.o: decodedblock.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-decodedblock.o `test -f 'decodedblock.c' || echo '$(srcdir)/'`decodedblock.c
+
+deadbeef-decodedblock.obj: decodedblock.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-decodedblock.obj `if test -f 'decodedblock.c'; then $(CYGPATH_W) 'decodedblock.c'; else $(CYGPATH_W) '$(srcdir)/decodedblock.c'; fi`
+
+deadbeef-dsp.o: dsp.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-dsp.o `test -f 'dsp.c' || echo '$(srcdir)/'`dsp.c
+
+deadbeef-dsp.obj: dsp.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-dsp.obj `if test -f 'dsp.c'; then $(CYGPATH_W) 'dsp.c'; else $(CYGPATH_W) '$(srcdir)/dsp.c'; fi`
+
+deadbeef-dsppreset.o: dsppreset.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-dsppreset.o `test -f 'dsppreset.c' || echo '$(srcdir)/'`dsppreset.c
+
+deadbeef-dsppreset.obj: dsppreset.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-dsppreset.obj `if test -f 'dsppreset.c'; then $(CYGPATH_W) 'dsppreset.c'; else $(CYGPATH_W) '$(srcdir)/dsppreset.c'; fi`
+
+deadbeef-escape.o: escape.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-escape.o `test -f 'escape.c' || echo '$(srcdir)/'`escape.c
+
+deadbeef-escape.obj: escape.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-escape.obj `if test -f 'escape.c'; then $(CYGPATH_W) 'escape.c'; else $(CYGPATH_W) '$(srcdir)/escape.c'; fi`
+
+../external/wcwidth/deadbeef-wcwidth.o: ../external/wcwidth/wcwidth.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o ../external/wcwidth/deadbeef-wcwidth.o `test -f '../external/wcwidth/wcwidth.c' || echo '$(srcdir)/'`../external/wcwidth/wcwidth.c
+
+../external/wcwidth/deadbeef-wcwidth.obj: ../external/wcwidth/wcwidth.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o ../external/wcwidth/deadbeef-wcwidth.obj `if test -f '../external/wcwidth/wcwidth.c'; then $(CYGPATH_W) '../external/wcwidth/wcwidth.c'; else $(CYGPATH_W) '$(srcdir)/../external/wcwidth/wcwidth.c'; fi`
+
+deadbeef-fft.o: fft.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-fft.o `test -f 'fft.c' || echo '$(srcdir)/'`fft.c
+
+deadbeef-fft.obj: fft.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-fft.obj `if test -f 'fft.c'; then $(CYGPATH_W) 'fft.c'; else $(CYGPATH_W) '$(srcdir)/fft.c'; fi`
+
+deadbeef-handler.o: handler.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-handler.o `test -f 'handler.c' || echo '$(srcdir)/'`handler.c
+
+deadbeef-handler.obj: handler.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-handler.obj `if test -f 'handler.c'; then $(CYGPATH_W) 'handler.c'; else $(CYGPATH_W) '$(srcdir)/handler.c'; fi`
+
+deadbeef-junklib.o: junklib.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-junklib.o `test -f 'junklib.c' || echo '$(srcdir)/'`junklib.c
+
+deadbeef-junklib.obj: junklib.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-junklib.obj `if test -f 'junklib.c'; then $(CYGPATH_W) 'junklib.c'; else $(CYGPATH_W) '$(srcdir)/junklib.c'; fi`
+
+deadbeef-utf8.o: utf8.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c
+
+deadbeef-utf8.obj: utf8.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi`
+
+deadbeef-logger.o: logger.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-logger.o `test -f 'logger.c' || echo '$(srcdir)/'`logger.c
+
+deadbeef-logger.obj: logger.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-logger.obj `if test -f 'logger.c'; then $(CYGPATH_W) 'logger.c'; else $(CYGPATH_W) '$(srcdir)/logger.c'; fi`
+
+deadbeef-main.o: main.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+
+deadbeef-main.obj: main.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+
+md5/deadbeef-md5.o: md5/md5.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o md5/deadbeef-md5.o `test -f 'md5/md5.c' || echo '$(srcdir)/'`md5/md5.c
+
+md5/deadbeef-md5.obj: md5/md5.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o md5/deadbeef-md5.obj `if test -f 'md5/md5.c'; then $(CYGPATH_W) 'md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/md5/md5.c'; fi`
+
+deadbeef-messagepump.o: messagepump.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-messagepump.o `test -f 'messagepump.c' || echo '$(srcdir)/'`messagepump.c
+
+deadbeef-messagepump.obj: messagepump.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-messagepump.obj `if test -f 'messagepump.c'; then $(CYGPATH_W) 'messagepump.c'; else $(CYGPATH_W) '$(srcdir)/messagepump.c'; fi`
+
+deadbeef-metacache.o: metacache.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-metacache.o `test -f 'metacache.c' || echo '$(srcdir)/'`metacache.c
+
+deadbeef-metacache.obj: metacache.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-metacache.obj `if test -f 'metacache.c'; then $(CYGPATH_W) 'metacache.c'; else $(CYGPATH_W) '$(srcdir)/metacache.c'; fi`
+
+deadbeef-playmodes.o: playmodes.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-playmodes.o `test -f 'playmodes.c' || echo '$(srcdir)/'`playmodes.c
+
+deadbeef-playmodes.obj: playmodes.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-playmodes.obj `if test -f 'playmodes.c'; then $(CYGPATH_W) 'playmodes.c'; else $(CYGPATH_W) '$(srcdir)/playmodes.c'; fi`
+
+deadbeef-playqueue.o: playqueue.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-playqueue.o `test -f 'playqueue.c' || echo '$(srcdir)/'`playqueue.c
+
+deadbeef-playqueue.obj: playqueue.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-playqueue.obj `if test -f 'playqueue.c'; then $(CYGPATH_W) 'playqueue.c'; else $(CYGPATH_W) '$(srcdir)/playqueue.c'; fi`
+
+deadbeef-plmeta.o: plmeta.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-plmeta.o `test -f 'plmeta.c' || echo '$(srcdir)/'`plmeta.c
+
+deadbeef-plmeta.obj: plmeta.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-plmeta.obj `if test -f 'plmeta.c'; then $(CYGPATH_W) 'plmeta.c'; else $(CYGPATH_W) '$(srcdir)/plmeta.c'; fi`
+
+deadbeef-pltmeta.o: pltmeta.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-pltmeta.o `test -f 'pltmeta.c' || echo '$(srcdir)/'`pltmeta.c
+
+deadbeef-pltmeta.obj: pltmeta.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-pltmeta.obj `if test -f 'pltmeta.c'; then $(CYGPATH_W) 'pltmeta.c'; else $(CYGPATH_W) '$(srcdir)/pltmeta.c'; fi`
+
+deadbeef-plugins.o: plugins.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-plugins.o `test -f 'plugins.c' || echo '$(srcdir)/'`plugins.c
+
+deadbeef-plugins.obj: plugins.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-plugins.obj `if test -f 'plugins.c'; then $(CYGPATH_W) 'plugins.c'; else $(CYGPATH_W) '$(srcdir)/plugins.c'; fi`
+
+deadbeef-premix.o: premix.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-premix.o `test -f 'premix.c' || echo '$(srcdir)/'`premix.c
+
+deadbeef-premix.obj: premix.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-premix.obj `if test -f 'premix.c'; then $(CYGPATH_W) 'premix.c'; else $(CYGPATH_W) '$(srcdir)/premix.c'; fi`
+
+deadbeef-replaygain.o: replaygain.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-replaygain.o `test -f 'replaygain.c' || echo '$(srcdir)/'`replaygain.c
+
+deadbeef-replaygain.obj: replaygain.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-replaygain.obj `if test -f 'replaygain.c'; then $(CYGPATH_W) 'replaygain.c'; else $(CYGPATH_W) '$(srcdir)/replaygain.c'; fi`
+
+deadbeef-resizable_buffer.o: resizable_buffer.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-resizable_buffer.o `test -f 'resizable_buffer.c' || echo '$(srcdir)/'`resizable_buffer.c
+
+deadbeef-resizable_buffer.obj: resizable_buffer.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-resizable_buffer.obj `if test -f 'resizable_buffer.c'; then $(CYGPATH_W) 'resizable_buffer.c'; else $(CYGPATH_W) '$(srcdir)/resizable_buffer.c'; fi`
+
+deadbeef-ringbuf.o: ringbuf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-ringbuf.o `test -f 'ringbuf.c' || echo '$(srcdir)/'`ringbuf.c
+
+deadbeef-ringbuf.obj: ringbuf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-ringbuf.obj `if test -f 'ringbuf.c'; then $(CYGPATH_W) 'ringbuf.c'; else $(CYGPATH_W) '$(srcdir)/ringbuf.c'; fi`
+
+deadbeef-sort.o: sort.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-sort.o `test -f 'sort.c' || echo '$(srcdir)/'`sort.c
+
+deadbeef-sort.obj: sort.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-sort.obj `if test -f 'sort.c'; then $(CYGPATH_W) 'sort.c'; else $(CYGPATH_W) '$(srcdir)/sort.c'; fi`
+
+deadbeef-streamer.o: streamer.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-streamer.o `test -f 'streamer.c' || echo '$(srcdir)/'`streamer.c
+
+deadbeef-streamer.obj: streamer.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-streamer.obj `if test -f 'streamer.c'; then $(CYGPATH_W) 'streamer.c'; else $(CYGPATH_W) '$(srcdir)/streamer.c'; fi`
+
+deadbeef-streamreader.o: streamreader.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-streamreader.o `test -f 'streamreader.c' || echo '$(srcdir)/'`streamreader.c
+
+deadbeef-streamreader.obj: streamreader.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-streamreader.obj `if test -f 'streamreader.c'; then $(CYGPATH_W) 'streamreader.c'; else $(CYGPATH_W) '$(srcdir)/streamreader.c'; fi`
+
+deadbeef-tf.o: tf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-tf.o `test -f 'tf.c' || echo '$(srcdir)/'`tf.c
+
+deadbeef-tf.obj: tf.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-tf.obj `if test -f 'tf.c'; then $(CYGPATH_W) 'tf.c'; else $(CYGPATH_W) '$(srcdir)/tf.c'; fi`
+
+deadbeef-threading_pthread.o: threading_pthread.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-threading_pthread.o `test -f 'threading_pthread.c' || echo '$(srcdir)/'`threading_pthread.c
+
+deadbeef-threading_pthread.obj: threading_pthread.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-threading_pthread.obj `if test -f 'threading_pthread.c'; then $(CYGPATH_W) 'threading_pthread.c'; else $(CYGPATH_W) '$(srcdir)/threading_pthread.c'; fi`
+
+deadbeef-vfs.o: vfs.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-vfs.o `test -f 'vfs.c' || echo '$(srcdir)/'`vfs.c
+
+deadbeef-vfs.obj: vfs.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-vfs.obj `if test -f 'vfs.c'; then $(CYGPATH_W) 'vfs.c'; else $(CYGPATH_W) '$(srcdir)/vfs.c'; fi`
+
+deadbeef-vfs_stdio.o: vfs_stdio.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-vfs_stdio.o `test -f 'vfs_stdio.c' || echo '$(srcdir)/'`vfs_stdio.c
+
+deadbeef-vfs_stdio.obj: vfs_stdio.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-vfs_stdio.obj `if test -f 'vfs_stdio.c'; then $(CYGPATH_W) 'vfs_stdio.c'; else $(CYGPATH_W) '$(srcdir)/vfs_stdio.c'; fi`
+
+deadbeef-volume.o: volume.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-volume.o `test -f 'volume.c' || echo '$(srcdir)/'`volume.c
+
+deadbeef-volume.obj: volume.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-volume.obj `if test -f 'volume.c'; then $(CYGPATH_W) 'volume.c'; else $(CYGPATH_W) '$(srcdir)/volume.c'; fi`
+
+deadbeef-viz.o: viz.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-viz.o `test -f 'viz.c' || echo '$(srcdir)/'`viz.c
+
+deadbeef-viz.obj: viz.c
+	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(deadbeef_CFLAGS) $(CFLAGS) -c -o deadbeef-viz.obj `if test -f 'viz.c'; then $(CYGPATH_W) 'viz.c'; else $(CYGPATH_W) '$(srcdir)/viz.c'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	 \\/* | ?:\\/*) sdir="$(srcdir)" ;; \
+	 *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	 if test -f "$$i"; then \
+	 echo "$(subdir)/$$i"; \
+	 else \
+	 echo "$$sdir/$$i"; \
+	 fi; \
+	done >> $(top_builddir)/cscope.files
+
+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 $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; 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:
+	if test -z '$(STRIP)'; then \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 install; \
+	else \
+	 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	 install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	 "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+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)
+	-rm -f ../external/wcwidth/$(am__dirstamp)
+	-rm -f md5/$(am__dirstamp)
+
+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-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-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-binPROGRAMS
+
+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 -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-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	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-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 tags-am uninstall uninstall-am uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
+
+
+# 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-1.9.6.tar.bz2/src/buffered_file_writer.c Added

@@ -0,0 +1,83 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2022 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include "buffered_file_writer.h"
+
+struct _buffered_file_writer_s {
+ FILE *fp;
+ char *buffer;
+ size_t size;
+ size_t written;
+};
+
+buffered_file_writer_t *
+buffered_file_writer_new (FILE *fp, size_t buffer_size) {
+ buffered_file_writer_t *writer = calloc (1, sizeof (buffered_file_writer_t));
+ writer->fp = fp;
+ writer->size = buffer_size;
+ writer->buffer = malloc (buffer_size);
+ return writer;
+}
+
+void
+buffered_file_writer_free (buffered_file_writer_t *writer) {
+ free (writer->buffer);
+ free (writer);
+}
+
+int
+buffered_file_writer_write (buffered_file_writer_t *writer, const void *bytes, size_t size) {
+ if (size > writer->size - writer->written) {
+ int res = buffered_file_writer_flush (writer);
+ if (res < 0) {
+ return -1;
+ }
+ }
+ if (size >= writer->size) {
+ size_t res = fwrite (bytes, 1, size, writer->fp);
+ if (res != size) {
+ return -1;
+ }
+ return 0;
+ }
+
+ memcpy (writer->buffer + writer->written, bytes, size);
+ writer->written += size;
+
+ return 0;
+}
+
+int
+buffered_file_writer_flush (buffered_file_writer_t *writer) {
+ if (writer->written == 0) {
+ return 0;
+ }
+ size_t res = fwrite (writer->buffer, 1, writer->written, writer->fp);
+ if (res != writer->written) {
+ return -1;
+ }
+ writer->written = 0;
+ return 0;
+}

deadbeef-1.9.6.tar.bz2/src/buffered_file_writer.h Added

@@ -0,0 +1,43 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2022 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef buffered_file_writer_h
+#define buffered_file_writer_h
+
+#include <stdio.h>
+
+typedef struct _buffered_file_writer_s buffered_file_writer_t;
+
+buffered_file_writer_t *
+buffered_file_writer_new (FILE *fp, size_t buffer_size);
+
+void
+buffered_file_writer_free (buffered_file_writer_t *writer);
+
+int
+buffered_file_writer_write (buffered_file_writer_t *writer, const void *bytes, size_t size);
+
+int
+buffered_file_writer_flush (buffered_file_writer_t *writer);
+
+#endif /* buffered_file_writer_h */

deadbeef-1.9.6.tar.bz2/src/conf.c Added

@@ -0,0 +1,439 @@
+/*
+ deadbeef config file manager
+ http://deadbeef.sourceforge.net
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <unistd.h>
+#include <limits.h>
+#include <sys/stat.h>
+#include "buffered_file_writer.h"
+#include "conf.h"
+#include "threading.h"
+#include <deadbeef/common.h>
+
+#define min(x,y) ((x)<(y)?(x):(y))
+
+static DB_conf_item_t *conf_items;
+static int changed;
+static uintptr_t mutex;
+static int disable_saving;
+
+void
+conf_init (void) {
+ mutex = mutex_create ();
+}
+
+void
+conf_lock (void) {
+ mutex_lock (mutex);
+}
+
+void
+conf_unlock (void) {
+ mutex_unlock (mutex);
+}
+
+void
+conf_free (void) {
+ mutex_lock (mutex);
+ DB_conf_item_t *next = NULL;
+ for (DB_conf_item_t *it = conf_items; it; it = next) {
+ next = it->next;
+ conf_item_free (it);
+ }
+ conf_items = NULL;
+ changed = 0;
+ mutex_unlock (mutex);
+ mutex_free (mutex);
+ mutex = 0;
+}
+
+int
+conf_load (void) {
+ size_t l = strlen (dbconfdir);
+ const char configfile = "/config";
+ char fnamel + sizeof(configfile);
+ memcpy (fname, dbconfdir, l);
+ memcpy (fname + l, configfile, sizeof (configfile));
+ FILE *fp = fopen (fname, "rb");
+ if (!fp) {
+ // we're not logging the error when config could not be loaded -- it's the first run
+ fp = fopen (fname, "w+b");
+ if (!fp) {
+ // we do log the error when we could not create the file
+ trace_err ("Configuration file could not be created: %s\n", fname);
+ return -1;
+ }
+ fclose (fp);
+ return 0;
+ }
+ conf_lock ();
+ int line = 0;
+
+ fseek (fp, 0, SEEK_END);
+ l = ftell (fp);
+ rewind (fp);
+
+ uint8_t *buffer = malloc (l+1);
+ if (l != fread (buffer, 1, l, fp)) {
+ free (buffer);
+ trace_err ("failed to read entire config file to memory\n");
+ fclose (fp);
+ conf_unlock ();
+ return -1;
+ }
+ bufferl = 0;
+ fclose (fp);
+ fp = NULL;
+
+ uint8_t *str = buffer;
+
+ while (*str) {
+ line++;
+ uint8_t *estr = str;
+ while (*estr >= 0x20) {
+ estr++;
+ }
+ *estr = 0;
+
+ if (str0 == '#' || str0 <= 0x20) {
+ str = estr+1;
+ continue;
+ }
+ uint8_t *p = (uint8_t *)str;
+ while (*p && *p > 0x20) {
+ p++;
+ }
+ if (!*p) {
+ trace_err ("error in config file line %d\n", line);
+ str = estr+1;
+ continue;
+ }
+ *p = 0;
+ p++;
+ // skip whitespace
+ while (*p && *p <= 0x20) {
+ p++;
+ }
+ uint8_t *value = p;
+ // remove trailing trash
+ while (*p && *p >= 0x20) {
+ p++;
+ }
+ *p = 0;
+ // new items are appended, to preserve order
+ conf_set_str ((const char *)str, (const char *)value);
+ str = estr+1;
+ }
+ changed = 0;
+ free (buffer);
+ conf_unlock ();
+ return 0;
+}
+
+int
+conf_save (void) {
+ if (disable_saving) {
+ return 0;
+ }
+ char tempfilePATH_MAX;
+ char strPATH_MAX;
+ FILE *fp = NULL;
+ buffered_file_writer_t *writer = NULL;
+
+ if (!mutex) {
+ return 0;
+ }
+
+ snprintf (tempfile, sizeof (tempfile), "%s/config.tmp", dbconfdir);
+ snprintf (str, sizeof (str), "%s/config", dbconfdir);
+
+ conf_lock ();
+
+ if (!changed) {
+ conf_unlock();
+ return 0;
+ }
+
+ changed = 0;
+ fp = fopen (tempfile, "w+b");
+ if (!fp) {
+ trace_err ("failed to open config file %s for writing\n", tempfile);
+ conf_unlock ();
+ return -1;
+ }
+
+ writer = buffered_file_writer_new(fp, 64*1024);
+
+ for (DB_conf_item_t *it = conf_items; it; it = it->next) {
+ if (buffered_file_writer_write(writer, it->key, strlen(it->key)) < 0) {
+ goto error;
+ }
+ if (buffered_file_writer_write(writer, " ", 1) < 0) {
+ goto error;
+ }
+ if (buffered_file_writer_write(writer, it->value, strlen(it->value)) < 0) {
+ goto error;
+ }
+ if (buffered_file_writer_write(writer, "\n", 1) < 0) {
+ goto error;
+ }
+ }
+ if (buffered_file_writer_flush(writer) < 0) {
+ goto error;
+ }
+ buffered_file_writer_free(writer);
+ writer = NULL;
+ if (EOF == fclose (fp)) {
+ fp = NULL;
+ goto error;
+ }
+ int err = rename (tempfile, str);
+ if (err != 0) {
+ trace_err ("config rename %s -> %s failed: %s\n", tempfile, str, strerror (errno));
+ }
+ else {
+ chmod (str, 0600);
+ }
+ conf_unlock ();
+ return 0;
+error:
+ conf_unlock ();
+ trace_err ("failed to write to file %s (%s)\n", tempfile, strerror (errno));
+ if (writer != NULL) {
+ buffered_file_writer_free(writer);
+ }
+ if (fp != NULL) {
+ fclose (fp);
+ }
+ return -1;
+}
+
+void
+conf_item_free (DB_conf_item_t *it) {
+ conf_lock ();
+ if (it) {
+ if (it->key) {
+ free (it->key);
+ }
+ if (it->value) {
+ free (it->value);
+ }
+ free (it);
+ }
+ conf_unlock ();
+}
+
+const char *
+conf_get_str_fast (const char *key, const char *def) {
+ for (DB_conf_item_t *it = conf_items; it; it = it->next) {
+ if (!strcasecmp (key, it->key)) {
+ return it->value;
+ }
+ }
+ return def;
+}
+
+void
+conf_get_str (const char *key, const char *def, char *buffer, int buffer_size) {
+ conf_lock ();
+ const char *out = conf_get_str_fast (key, def);
+ if (out) {
+ size_t n = strlen (out)+1;
+ n = min (n, buffer_size);
+ memcpy (buffer, out, n);
+ bufferbuffer_size-1 = 0;
+ }
+ else {
+ *buffer = 0;
+ }
+ conf_unlock ();
+}
+
+float
+conf_get_float (const char *key, float def) {
+ conf_lock ();
+ const char *v = conf_get_str_fast (key, NULL);
+ float res = v ? (float)atof (v) : def;
+ conf_unlock ();
+ return res;
+}
+
+int
+conf_get_int (const char *key, int def) {
+ conf_lock ();
+ const char *v = conf_get_str_fast (key, NULL);
+ int res = v ? atoi (v) : def;
+ conf_unlock ();
+ return res;
+}
+
+int64_t
+conf_get_int64 (const char *key, int64_t def) {
+ conf_lock ();
+ const char *v = conf_get_str_fast (key, NULL);
+ int64_t res = v ? atoll (v) : def;
+ conf_unlock ();
+ return res;
+}
+
+DB_conf_item_t *
+conf_find (const char *group, DB_conf_item_t *prev) {
+ size_t l = strlen (group);
+ for (DB_conf_item_t *it = prev ? prev->next : conf_items; it; it = it->next) {
+ if (!strncasecmp (group, it->key, l)) {
+ return it;
+ }
+ }
+ return NULL;
+}
+
+void
+conf_set_str (const char *key, const char *val) {
+ conf_lock ();
+ DB_conf_item_t *prev = NULL;
+ for (DB_conf_item_t *it = conf_items; it; it = it->next) {
+ int cmp = strcasecmp (key, it->key);
+ if (!cmp) {
+ if (val == NULL) {
+ if (prev != NULL) {
+ prev->next = it->next;
+ }
+ else {
+ conf_items = it->next;
+ }
+ conf_item_free (it);
+ conf_unlock ();
+ return;
+ }
+
+ if (!strcmp (it->value, val)) {
+ conf_unlock ();
+ return;
+ }
+ free (it->value);
+ it->value = strdup (val);
+ conf_unlock ();
+ changed = 1;
+ return;
+ }
+ else if (cmp < 0) {
+ break;
+ }
+ prev = it;
+ }
+ if (!val) {
+ conf_unlock ();
+ return;
+ }
+ DB_conf_item_t *it = malloc (sizeof (DB_conf_item_t));
+ memset (it, 0, sizeof (DB_conf_item_t));
+ it->key = strdup (key);
+ it->value = strdup (val);
+ changed = 1;
+ if (prev) {
+ DB_conf_item_t *next = prev->next;
+ prev->next = it;
+ it->next = next;
+ }
+ else {
+ it->next = conf_items;
+ conf_items = it;
+ }
+ conf_unlock ();
+}
+
+void
+conf_set_int (const char *key, int val) {
+ char s10;
+ snprintf (s, sizeof (s), "%d", val);
+ conf_set_str (key, s);
+}
+
+void
+conf_set_int64 (const char *key, int64_t val) {
+ char s20;
+ snprintf (s, sizeof (s), "%"PRId64, val);
+ conf_set_str (key, s);
+}
+
+void
+conf_set_float (const char *key, float val) {
+ char s10;
+ snprintf (s, sizeof (s), "%0.7f", val);
+ conf_set_str (key, s);
+}
+
+int
+conf_ischanged (void) {
+ return changed;
+}
+
+void
+conf_setchanged (int c) {
+ changed = c;
+}
+
+void
+conf_remove_items (const char *key) {
+ size_t l = strlen (key);
+ conf_lock ();
+ DB_conf_item_t *prev = NULL;
+ DB_conf_item_t *it;
+ for (it = conf_items; it; prev = it, it = it->next) {
+ if (!strncasecmp (key, it->key, l)) {
+ changed = 1;
+ break;
+ }
+ }
+ DB_conf_item_t *next = NULL;
+ while (it) {
+ next = it->next;
+ conf_item_free (it);
+ it = next;
+ if (!it || strncasecmp (key, it->key, l)) {
+ break;
+ }
+ }
+ if (prev) {
+ prev->next = next;
+ }
+ else {
+ conf_items = next;
+ }
+ conf_unlock ();
+}
+
+void
+conf_enable_saving (int enable) {
+ disable_saving = !enable;
+}

deadbeef-1.9.6.tar.bz2/src/conf.h Added

@@ -0,0 +1,104 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ config file manager
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __CONF_H
+#define __CONF_H
+
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int
+conf_load (void);
+
+int
+conf_save (void);
+
+void
+conf_init (void);
+
+void
+conf_free (void);
+
+void
+conf_lock (void);
+
+void
+conf_unlock (void);
+
+int
+conf_ischanged (void);
+
+void
+conf_setchanged (int c);
+
+void
+conf_get_str (const char *key, const char *def, char *buffer, int buffer_size);
+
+const char *
+conf_get_str_fast (const char *key, const char *def);
+
+float
+conf_get_float (const char *key, float def);
+
+int
+conf_get_int (const char *key, int def);
+
+int64_t
+conf_get_int64 (const char *key, int64_t def);
+
+void
+conf_set_str (const char *key, const char *val);
+
+void
+conf_set_int (const char *key, int val);
+
+void
+conf_set_int64 (const char *key, int64_t val);
+
+void
+conf_set_float (const char *key, float val);
+
+DB_conf_item_t *
+conf_find (const char *group, DB_conf_item_t *prev);
+
+// remove all items starting with key
+void
+conf_remove_items (const char *key);
+
+void
+conf_item_free (DB_conf_item_t *it);
+
+void
+conf_enable_saving (int enable);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __CONF_H

deadbeef-1.9.6.tar.bz2/src/cueutil.c Added

@@ -0,0 +1,954 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <math.h>
+#include <sys/stat.h>
+#include "plugins.h"
+#include <deadbeef/common.h>
+#include "plmeta.h"
+#include "junklib.h"
+#include "vfs.h"
+#include "playlist.h"
+#include "cueutil.h"
+
+#define SKIP_BLANK_CUE_TRACKS 0
+#define MAX_CUE_TRACKS 99
+
+enum {
+ CUE_FIELD_ALBUM_PERFORMER,
+ CUE_FIELD_PERFORMER,
+ CUE_FIELD_ALBUM_SONGWRITER,
+ CUE_FIELD_SONGWRITER,
+ CUE_FIELD_ALBUM_TITLE,
+ CUE_FIELD_FILE,
+ CUE_FIELD_TRACK,
+ CUE_FIELD_TITLE,
+ CUE_FIELD_PREGAP,
+ CUE_FIELD_INDEX00,
+ CUE_FIELD_INDEX01,
+ CUE_FIELD_REPLAYGAIN_ALBUM_GAIN,
+ CUE_FIELD_REPLAYGAIN_ALBUM_PEAK,
+ CUE_FIELD_REPLAYGAIN_TRACK_GAIN,
+ CUE_FIELD_REPLAYGAIN_TRACK_PEAK,
+ CUE_FIELD_TOTALTRACKS,
+ CUE_FIELD_ISRC,
+ CUE_MAX_FIELDS,
+};
+
+#define CUE_FIELD_INDEX_X 100
+
+const char *cue_field_map = {
+ "CATALOG ", "CATALOG",
+ "REM DATE ", "year",
+ "REM GENRE ", "genre",
+ "REM COMMENT ", "comment",
+ "REM COMPOSER ", "composer",
+ "REM DISCNUMBER ", "disc",
+ "REM TOTALDISCS ", "numdiscs",
+ "REM DISCID ", "DISCID",
+ NULL, NULL,
+};
+#define MAX_EXTRA_TAGS_FROM_CUE ((sizeof(cue_field_map) / sizeof(cue_field_map0)))
+
+#define CUE_FIELD_LEN 255
+
+typedef struct {
+ // initial values
+ const char *fname; // cue of parent file name
+ playItem_t *embedded_origin; // parent track of embedded cue
+ int64_t embedded_numsamples;
+ int embedded_samplerate;
+ const char *cue_file_dir; // directory containing cue file or parent file (FIXME: looks like a dupe with `dirname`)
+ const char *dirname; // directory path being loaded
+ struct dirent **namelist;
+ int n;
+ int ncuefiles; // number of FILEs in cue
+ int ncuetracks; // number of TRACKs in cue
+ const char *cue_fname; // just the filename of cue file (or parent file)
+ playlist_t *target_playlist; // for filtering
+ playlist_t *temp_plt; // temporary playlist, for loading tracks before splitting
+
+ // intermediate / output values
+ char fullpathPATH_MAX; // current file name to be split
+
+ char cuefieldsCUE_MAX_FIELDSCUE_FIELD_LEN;
+ char extra_tagsMAX_EXTRA_TAGS_FROM_CUECUE_FIELD_LEN;
+ int extra_tag_index;
+ char extra_track_tagsMAX_EXTRA_TAGS_FROM_CUECUE_FIELD_LEN;
+ int extra_track_tag_index;
+
+ int64_t numsamples;
+ int samplerate;
+ playItem_t *origin; // current unsplit track, loaded from last FILE
+ int first_track; // set to 1 immediately after loading a FILE, reset to 0 after processing first track
+ const char *dec; // decoder of the origin
+ const char *filetype; // filetype of the origin
+ playItem_t *prev; // previous added track
+
+ const uint8_t *p; // buffer ptr
+ const char *charset; // detected charset
+ int have_track; // whether track info has been found, before encountering the TRACK field
+ playItem_t *cuetracksMAX_CUE_TRACKS; // all loaded cue tracks after splitting
+ int ntracks; // count of cuetracks
+
+ int64_t currsample;
+ int last_round;
+} cueparser_t;
+
+
+static const uint8_t *
+skipspaces (const uint8_t *p, const uint8_t *end) {
+ while (p < end && *p <= ' ') {
+ p++;
+ }
+ return p;
+}
+
+static const uint8_t *
+pl_cue_skipspaces (const uint8_t *p) {
+ while (*p && *p <= ' ') {
+ p++;
+ }
+ return p;
+}
+
+static void
+pl_get_qvalue_from_cue (const uint8_t *p, int sz, char *out, const char *charset) {
+ char *str = out;
+ if (*p == 0) {
+ *out = 0;
+ return;
+ }
+ p = pl_cue_skipspaces (p);
+ if (*p == 0) {
+ *out = 0;
+ return;
+ }
+
+ if (*p == '"') {
+ p++;
+ p = pl_cue_skipspaces (p);
+ while (*p && *p != '"' && sz > 1) {
+ sz--;
+ *out++ = *p++;
+ }
+ *out = 0;
+ }
+ else {
+ while (*p && *p >= 0x20) {
+ sz--;
+ *out++ = *p++;
+ }
+ out--;
+ while (out > str && *out == 0x20) {
+ out--;
+ }
+ out++;
+ *out = 0;
+ }
+
+ if (!charset) {
+ return;
+ }
+
+ // recode
+ size_t l = strlen (str);
+ if (l == 0) {
+ return;
+ }
+
+ char recbufl*10;
+ int res = junk_recode (str, (int)l, recbuf, (int)(sizeof (recbuf)-1), charset);
+ if (res >= 0) {
+ strcpy (str, recbuf);
+ }
+ else
+ {
+ strcpy (str, "<UNRECOGNIZED CHARSET>");
+ }
+}
+
+static void
+pl_get_value_from_cue (const char *p, int sz, char *out) {
+ while (*p >= ' ' && sz > 1) {
+ sz--;
+ *out++ = *p++;
+ }
+ while (out > p && (*(out-1) == 0x20 || *(out-1) == 0x8)) {
+ out--;
+ }
+ *out = 0;
+}
+
+static float
+pl_cue_parse_time (const char *p) {
+ char *endptr;
+ long mins = strtol(p, &endptr, 10);
+ if (endptr - p < 1 || *endptr != ':') {
+ return -1;
+ }
+ p = endptr + 1;
+ long sec = strtol(p, &endptr, 10);
+ if (endptr - p != 2 || *endptr != ':') {
+ return -1;
+ }
+ p = endptr + 1;
+ long frm = strtol(p, &endptr, 10);
+ if (endptr - p != 2 || *endptr != '\0') {
+ return -1;
+ }
+ return mins * 60.f + sec + frm / 75.f;
+}
+
+static void
+pl_cue_get_total_tracks_and_files(const uint8_t *buffer, const uint8_t *buffer_end, int *ncuefiles, int *ncuetracks) {
+ const uint8_t *p = buffer;
+ *ncuetracks = 0;
+ *ncuefiles = 0;
+ while (p < buffer_end) {
+ p = skipspaces (p, buffer_end);
+ if (p >= buffer_end) {
+ break;
+ }
+ if (!strncasecmp (p, "FILE ", 5)) {
+ *ncuefiles = *ncuefiles + 1;
+ }
+ if (!strncasecmp (p, "TRACK ", 6)) {
+ *ncuetracks = *ncuetracks + 1;
+ }
+ // move pointer to the next line
+ while (p < buffer_end && *p >= 0x20) {
+ p++;
+ }
+ }
+}
+
+static void
+pl_cue_set_track_field_values(playItem_t *it, cueparser_t *cue) {
+ if (cue->cuefieldsCUE_FIELD_PERFORMER0) {
+ pl_add_meta (it, "artist", cue->cuefieldsCUE_FIELD_PERFORMER);
+ if (cue->cuefieldsCUE_FIELD_ALBUM_PERFORMER0 && strcmp (cue->cuefieldsCUE_FIELD_ALBUM_PERFORMER, cue->cuefieldsCUE_FIELD_PERFORMER)) {
+ pl_add_meta (it, "album artist", cue->cuefieldsCUE_FIELD_ALBUM_PERFORMER);
+ }
+ }
+ else if (cue->cuefieldsCUE_FIELD_ALBUM_PERFORMER0) {
+ pl_add_meta (it, "artist", cue->cuefieldsCUE_FIELD_ALBUM_PERFORMER);
+ }
+ if (cue->cuefieldsCUE_FIELD_SONGWRITER0) {
+ pl_add_meta (it, "composer", cue->cuefieldsCUE_FIELD_SONGWRITER);
+ }
+ else if (cue->cuefieldsCUE_FIELD_ALBUM_SONGWRITER0) {
+ pl_add_meta (it, "composer", cue->cuefieldsCUE_FIELD_ALBUM_SONGWRITER);
+ }
+ if (cue->cuefieldsCUE_FIELD_ALBUM_TITLE0) {
+ pl_add_meta (it, "album", cue->cuefieldsCUE_FIELD_ALBUM_TITLE);
+ }
+ if (cue->cuefieldsCUE_FIELD_TRACK0) {
+ pl_add_meta (it, "track", cue->cuefieldsCUE_FIELD_TRACK);
+ }
+ if (cue->cuefieldsCUE_FIELD_TITLE0) {
+ pl_add_meta (it, "title", cue->cuefieldsCUE_FIELD_TITLE);
+ }
+ if (cue->cuefieldsCUE_FIELD_ISRC) {
+ pl_add_meta (it, "ISRC", cue->cuefieldsCUE_FIELD_ISRC);
+ }
+ if (cue->cuefieldsCUE_FIELD_REPLAYGAIN_ALBUM_GAIN0) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, (float)atof (cue->cuefieldsCUE_FIELD_REPLAYGAIN_ALBUM_GAIN));
+ }
+ if (cue->cuefieldsCUE_FIELD_REPLAYGAIN_ALBUM_PEAK0) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, (float)atof (cue->cuefieldsCUE_FIELD_REPLAYGAIN_ALBUM_PEAK));
+ }
+ if (cue->cuefieldsCUE_FIELD_REPLAYGAIN_TRACK_GAIN0) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, (float)atof (cue->cuefieldsCUE_FIELD_REPLAYGAIN_TRACK_GAIN));
+ }
+ if (cue->cuefieldsCUE_FIELD_REPLAYGAIN_TRACK_PEAK0) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, (float)atof (cue->cuefieldsCUE_FIELD_REPLAYGAIN_TRACK_PEAK));
+ }
+
+ // add extra tags to tracks
+ for (int y = 0; y < cue->extra_tag_index; y += 2) {
+ if (cue->extra_tagsy+1) {
+ pl_add_meta (it, cue->extra_tagsy, cue->extra_tagsy+1);
+ }
+ }
+ for (int y = 0; y < cue->extra_track_tag_index; y += 2) {
+ if (cue->extra_track_tagsy+1) {
+ pl_add_meta (it, cue->extra_track_tagsy, cue->extra_track_tagsy+1);
+ }
+ }
+ cue->extra_track_tag_index = 0;
+ memset (cue->extra_track_tags, 0, sizeof (cue->extra_track_tags));
+
+ // generated "total tracks" field
+ pl_add_meta(it, "numtracks", cue->cuefieldsCUE_FIELD_TOTALTRACKS);
+
+ pl_items_copy_junk (cue->origin, it, it);
+}
+
+static void
+pl_cue_reset_per_track_fields(char cuefieldsCUE_MAX_FIELDS255) {
+ //cuefieldsCUE_FIELD_TRACK0 = 0;
+ cuefieldsCUE_FIELD_TITLE0 = 0;
+ cuefieldsCUE_FIELD_PREGAP0 = 0;
+ cuefieldsCUE_FIELD_INDEX000 = 0;
+ cuefieldsCUE_FIELD_INDEX010 = 0;
+ cuefieldsCUE_FIELD_REPLAYGAIN_TRACK_GAIN0 = 0;
+ cuefieldsCUE_FIELD_REPLAYGAIN_TRACK_PEAK0 = 0;
+ cuefieldsCUE_FIELD_PERFORMER0 = 0;
+ cuefieldsCUE_FIELD_SONGWRITER0 = 0;
+ cuefieldsCUE_FIELD_ISRC0 = 0;
+}
+
+// success:
+// CUE_FIELD_*
+// error:
+// -1
+static int
+pl_cue_get_field_value(cueparser_t *cue) {
+ if (!strncasecmp (cue->p, "FILE ", 5)) {
+ pl_get_qvalue_from_cue (cue->p + 5, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_FILE, cue->charset);
+ const char *ext = strrchr (cue->cuefieldsCUE_FIELD_FILE, '.');
+ if (ext && !strcasecmp(ext, ".cue")) {
+ trace_err("Cuesheet %s refers to another cuesheet, which is not allowed\n", cue->fname);
+ return -1;
+ }
+ return CUE_FIELD_FILE;
+ }
+ else if (!strncasecmp (cue->p, "TRACK ", 6)) {
+ // this requires some post-processing
+ // and the previous value must not be lost..
+ return CUE_FIELD_TRACK;
+ }
+ else if (!strncasecmp (cue->p, "PERFORMER ", 10)) {
+ if (!cue->cuefieldsCUE_FIELD_TRACK0) {
+ pl_get_qvalue_from_cue (cue->p + 10, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_ALBUM_PERFORMER, cue->charset);
+ return CUE_FIELD_ALBUM_PERFORMER;
+ }
+ else {
+ pl_get_qvalue_from_cue (cue->p + 10, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_PERFORMER, cue->charset);
+ return CUE_FIELD_PERFORMER;
+ }
+ }
+ else if (!strncasecmp (cue->p, "SONGWRITER ", 11)) {
+ if (!cue->cuefieldsCUE_FIELD_TRACK0) {
+ pl_get_qvalue_from_cue (cue->p + 11, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_ALBUM_SONGWRITER, cue->charset);
+ return CUE_FIELD_ALBUM_SONGWRITER;
+ }
+ else {
+ pl_get_qvalue_from_cue (cue->p + 11, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_SONGWRITER, cue->charset);
+ return CUE_FIELD_SONGWRITER;
+ }
+ }
+ else if (!strncasecmp (cue->p, "TITLE ", 6)) {
+ if (!cue->have_track && !cue->cuefieldsCUE_FIELD_ALBUM_TITLE0) {
+ pl_get_qvalue_from_cue (cue->p + 6, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_ALBUM_TITLE, cue->charset);
+ return CUE_FIELD_ALBUM_TITLE;
+ }
+ else {
+ pl_get_qvalue_from_cue (cue->p + 6, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_TITLE, cue->charset);
+ return CUE_FIELD_TITLE;
+ }
+ }
+ else if (!strncasecmp (cue->p, "REM REPLAYGAIN_ALBUM_GAIN ", 26)) {
+ pl_get_value_from_cue (cue->p + 26, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_REPLAYGAIN_ALBUM_GAIN);
+ return CUE_FIELD_REPLAYGAIN_ALBUM_GAIN;
+ }
+ else if (!strncasecmp (cue->p, "REM REPLAYGAIN_ALBUM_PEAK ", 26)) {
+ pl_get_value_from_cue (cue->p + 26, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_REPLAYGAIN_ALBUM_PEAK);
+ return CUE_FIELD_REPLAYGAIN_ALBUM_PEAK;
+ }
+ else if (!strncasecmp (cue->p, "REM REPLAYGAIN_TRACK_GAIN ", 26)) {
+ pl_get_value_from_cue (cue->p + 26, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_REPLAYGAIN_TRACK_GAIN);
+ return CUE_FIELD_REPLAYGAIN_TRACK_GAIN;
+ }
+ else if (!strncasecmp (cue->p, "REM REPLAYGAIN_TRACK_PEAK ", 26)) {
+ pl_get_value_from_cue (cue->p + 26, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_REPLAYGAIN_TRACK_PEAK);
+ return CUE_FIELD_REPLAYGAIN_TRACK_PEAK;
+ }
+ else if (!strncasecmp (cue->p, "PREGAP ", 7)) {
+ pl_get_value_from_cue (cue->p + 7, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_PREGAP);
+ return CUE_FIELD_PREGAP;
+ }
+ else if (!strncasecmp (cue->p, "INDEX 00 ", 9)) {
+ pl_get_value_from_cue (cue->p + 9, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_INDEX00);
+ return CUE_FIELD_INDEX00;
+ }
+ else if (!strncasecmp (cue->p, "INDEX 01 ", 9)) {
+ pl_get_value_from_cue (cue->p + 9, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_INDEX01);
+ return CUE_FIELD_INDEX01;
+ }
+ else if (!strncasecmp (cue->p, "INDEX ", 6)) {
+ // INDEX 02, INDEX 03, INDEX 04, etc...
+ // for practical purposes, store value of INDEX XX in fieldsCUE_FIELD_INDEX01
+ pl_get_value_from_cue (cue->p + 9, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_INDEX01);
+ return CUE_FIELD_INDEX_X;
+ }
+ else if (!strncasecmp (cue->p, "ISRC ", 5)) {
+ pl_get_value_from_cue (cue->p + 5, CUE_FIELD_LEN, cue->cuefieldsCUE_FIELD_ISRC);
+ return CUE_FIELD_ISRC;
+ }
+ else {
+ // determine and get extra tags
+ for (int m = 0; cue_field_mapm; m += 2) {
+ if (!strncasecmp (cue->p, cue_field_mapm, strlen(cue_field_mapm))) {
+ char *key = NULL;
+ char *value = NULL;
+ if (!cue->have_track) {
+ if (cue->extra_tag_index >= MAX_EXTRA_TAGS_FROM_CUE) {
+ break;
+ }
+ key = cue->extra_tagscue->extra_tag_index;
+ value = cue->extra_tagscue->extra_tag_index+1;
+ cue->extra_tag_index = cue->extra_tag_index + 2;
+ }
+ else {
+ if (cue->extra_track_tag_index >= MAX_EXTRA_TAGS_FROM_CUE) {
+ break;
+ }
+ key = cue->extra_track_tagscue->extra_track_tag_index;
+ value = cue->extra_track_tagscue->extra_track_tag_index+1;
+ cue->extra_track_tag_index = cue->extra_track_tag_index + 2;
+ }
+
+ strcpy(key,cue_field_mapm+1);
+ pl_get_qvalue_from_cue (cue->p + strlen(cue_field_mapm), CUE_FIELD_LEN, value, cue->charset);
+ return CUE_MAX_FIELDS;
+ }
+ }
+
+ // ignore unsupported fields
+ while (*(cue->p) && *(cue->p) >= 0x20) {
+ cue->p++;
+ }
+ return CUE_MAX_FIELDS;
+ }
+}
+
+//========================================================================
+
+static int
+_file_exists (const char *fname) {
+ if (!plug_is_local_file(fname)) {
+ return 0;
+ }
+ DB_FILE *fp = vfs_fopen(fname);
+ if (!fp) {
+ return 0;
+ }
+ vfs_fclose (fp);
+ return 1;
+}
+
+static int
+_set_last_item_region (playlist_t *plt, playItem_t *it, playItem_t *origin, int64_t totalsamples, int samplerate) {
+ pl_item_set_endsample (it, pl_item_get_startsample (origin) + totalsamples - 1);
+ if ((pl_item_get_endsample (it) - pl_item_get_startsample (origin)) >= totalsamples || (pl_item_get_startsample (it)-pl_item_get_startsample (origin)) >= totalsamples) {
+ return -1;
+ }
+ plt_set_item_duration (plt, it, (float)(pl_item_get_endsample (it) - pl_item_get_startsample (it) + 1) / samplerate);
+ return 0;
+}
+
+playItem_t *
+plt_load_cue_file (playlist_t *plt, playItem_t *after, const char *fname, const char *dirname, struct dirent **namelist, int n) {
+ char resolved_fnamePATH_MAX;
+
+ uint8_t *membuffer = NULL;
+
+ char *res = realpath (fname, resolved_fname);
+ if (res) {
+ fname = resolved_fname;
+ }
+
+ DB_FILE *fp = vfs_fopen (fname);
+ if (!fp) {
+ goto error;
+ }
+
+ int sz = (int)vfs_fgetlength (fp);
+ membuffer = malloc (sz + 1);
+ if (!membuffer) {
+ vfs_fclose (fp);
+ trace ("failed to allocate %d bytes to read the file %s\n", sz, fname);
+ goto error;
+ }
+ uint8_t *buffer = membuffer;
+ size_t rb = vfs_fread (buffer, sz, 1, fp);
+ buffersz = 0;
+ vfs_fclose (fp);
+ fp = NULL;
+ if (rb != 1) {
+ goto error;
+ }
+
+ after = plt_load_cuesheet_from_buffer (plt, after, fname, NULL, 0, 0, buffer, sz, dirname, namelist, n);
+error:
+ if (fp) {
+ vfs_fclose (fp);
+ }
+ if (membuffer) {
+ free (membuffer);
+ }
+ return after;
+}
+
+static int
+_file_present_in_namelist (const char *fullpath, cueparser_t *cue) {
+ int i = 0;
+ for (i = 0; i < cue->n; i++) {
+ if (cue->namelisti->d_name0) {
+ char pathPATH_MAX;
+ snprintf (path, sizeof (path), "%s/%s", cue->dirname, cue->namelisti->d_name);
+ if (!strcmp (path, cue->fullpath)) {
+ // file present
+ break;
+ }
+ // poor's man vfs detection -- directory ends with ':'
+ snprintf (path, sizeof (path), "%s%s", cue->dirname, cue->namelisti->d_name);
+ if (!strcmp (path, cue->fullpath)) {
+ // file present
+ break;
+ }
+ }
+ }
+ if (i == cue->n) {
+ return 0;
+ }
+ return 1;
+}
+
+
+static int
+cue_addfile_filter (cueparser_t *cue) {
+ ddb_file_found_data_t dt;
+ dt.filename = cue->fullpath;
+ dt.plt = (ddb_playlist_t *)cue->target_playlist;
+ dt.is_dir = 0;
+ int res = fileadd_filter_test (&dt);
+ return res;
+}
+
+static int
+_load_nextfile (cueparser_t *cue) {
+ cue->origin = NULL;
+ char *audio_file = cue->cuefieldsCUE_FIELD_FILE;
+ if (cue->embedded_origin) {
+ // embedded cuesheet
+ strcpy (cue->fullpath, cue->fname);
+ cue->origin = cue->embedded_origin;
+ cue->numsamples = cue->embedded_numsamples;
+ cue->samplerate = cue->embedded_samplerate;
+ }
+ // full path in CUE entry
+ else if (audio_file0 == '/' && _file_exists (audio_file)) {
+ strcpy (cue->fullpath, audio_file);
+ }
+ else {
+ // try relative path
+ snprintf(cue->fullpath, sizeof(cue->fullpath), "%s/%s", cue->cue_file_dir, audio_file);
+
+ if (!_file_exists (cue->fullpath)) {
+ cue->fullpath0 = 0;
+ if (cue->namelist) {
+ // for image+cue, try guessing the audio filename from cuesheet filename
+ int image_found = 0;
+ if (cue->ncuefiles == 1) {
+ size_t l = strlen (cue->cue_fname);
+ for (int i = 0; i < cue->n; i++) {
+ const char *ext = strrchr (cue->namelisti->d_name, '.');
+ if (!ext || !strcasecmp (ext, ".cue")) {
+ continue;
+ }
+
+ if (!strncasecmp (cue->cue_fname, cue->namelisti->d_name, l-4)) {
+ // have to try loading each of these files
+ snprintf (cue->fullpath, sizeof (cue->fullpath), "%s/%s", cue->dirname, cue->namelisti->d_name);
+ int res = cue_addfile_filter(cue);
+ if (res >= 0) {
+ cue->origin = plt_insert_file2 (-1, cue->temp_plt, NULL, cue->fullpath, NULL, NULL, NULL);
+ }
+ if (cue->origin) {
+ image_found = 1;
+ cue->namelisti->d_name0 = 0;
+ break;
+ }
+ }
+ }
+ }
+ if (!image_found) {
+ // for tracks+cue, try guessing the extension of the FILE value
+ char *ext = strrchr (audio_file, '.');
+ if (ext) {
+ *ext = 0;
+ }
+ for (int i = 0; i < cue->n; i++) {
+ const char *cueext = strrchr (cue->namelisti->d_name, '.');
+ if (!cueext || !strcasecmp (cueext, ".cue")) {
+ continue;
+ }
+
+ if (!strncasecmp (audio_file, cue->namelisti->d_name, ext-audio_file)
+ && cue->namelisti->d_nameext-audio_file == '.') {
+ // have to try loading each of these files
+ snprintf (cue->fullpath, sizeof (cue->fullpath), "%s/%s", cue->dirname, cue->namelisti->d_name);
+
+ // adding to temp playlist will fail file add filters, so need to call this manually here
+ int res = cue_addfile_filter(cue);
+ if (res >= 0) {
+ cue->origin = plt_insert_file2 (-1, cue->temp_plt, NULL, cue->fullpath, NULL, NULL, NULL);
+ }
+ if (cue->origin) {
+ cue->namelisti->d_name0 = 0;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if (cue->fullpath0 && !cue->origin) {
+ // if we have namelist - means we're loading cue as part of the folder
+ // need to check if the fullpath file is present in the list, to avoid double-loading
+
+ if (cue->namelist && !_file_present_in_namelist (cue->fullpath, cue)) {
+ cue->fullpath0 = 0;
+ }
+ }
+
+ if (cue->fullpath0 && !cue->origin) {
+ // adding to temp playlist will fail file add filters, so need to call this manually here
+ int res = cue_addfile_filter (cue);
+ if (res >= 0) {
+ cue->origin = plt_insert_file2 (-1, cue->temp_plt, NULL, cue->fullpath, NULL, NULL, NULL);
+ }
+ if (cue->origin) {
+ // mark the file as used
+ if (cue->namelist) {
+ const char *fn_vfs = NULL;
+ const char *fn_nonvfs = NULL;
+
+ const char *fn_slash = strrchr (cue->fullpath, '/');
+ const char *fn_col = strrchr (cue->fullpath, ':');
+ const char *fn_fslash = strchr (cue->fullpath, '/');
+
+ // this is for files inside of VFS containers, e.g. zip://file.zip:path/to/the/file
+ if (fn_col) {
+ fn_vfs = fn_col + 1;
+ }
+ else if (fn_slash) {
+ fn_vfs = fn_slash + 1;
+ }
+ else {
+ fn_vfs = cue->fullpath;
+ }
+
+ // this is for local FS paths which contain colons, like gvfs mounts
+ if (fn_col && (!fn_fslash || fn_fslash > fn_col)) {
+ fn_nonvfs = fn_col + 1;
+ }
+ else if (fn_slash) {
+ fn_nonvfs = fn_slash + 1;
+ }
+ else {
+ fn_nonvfs = cue->fullpath;
+ }
+
+ for (int i = 0; i < cue->n; i++) {
+ if (!strcmp (fn_vfs, cue->namelisti->d_name) || !strcmp (fn_nonvfs, cue->namelisti->d_name)) {
+ cue->namelisti->d_name0 = 0;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if (!cue->origin) {
+ if (!cue->namelist) {
+ // only display error if adding individual file;
+ // this is to prevent bogus errors when auto-scanning for cuesheets in folders.
+ trace_err("Invalid FILE entry %s in cuesheet %s, and could not guess any suitable file name.\n", audio_file, cue->fname);
+ }
+ cue->dec = cue->filetype = NULL;
+ return -1;
+ }
+ else {
+ // now we got the image + totalsamples + samplerate,
+ // process each track until next file
+ if (!cue->prev) {
+ cue->dec = pl_find_meta_raw (cue->origin, ":DECODER");
+ cue->filetype = pl_find_meta_raw (cue->origin, ":FILETYPE");
+ if (!cue->embedded_origin) {
+ cue->numsamples = cue->temp_plt->cue_numsamples;
+ cue->samplerate = cue->temp_plt->cue_samplerate;
+ }
+ }
+ }
+ cue->first_track = 1;
+
+ return 0;
+}
+
+static int
+plt_process_cue_track (playlist_t *plt, cueparser_t *cue) {
+ // fix track number
+ char *p = cue->cuefieldsCUE_FIELD_TRACK;
+ while (*p && isdigit (*p)) {
+ p++;
+ }
+ *p = 0;
+
+ float f_pregap = cue->cuefieldsCUE_FIELD_PREGAP0 ? pl_cue_parse_time (cue->cuefieldsCUE_FIELD_PREGAP) : 0;
+
+ if (cue->prev) {
+ // knowing the startsample of the current track,
+ // now it's possible to calculate startsample and duration of the previous one.
+ if (cue->currsample >= cue->numsamples) {
+ return -1;
+ }
+ pl_item_set_endsample (cue->prev, cue->currsample - 1);
+ plt_set_item_duration (plt, cue->prev, (float)(cue->currsample - pl_item_get_startsample (cue->prev)) / cue->samplerate);
+ }
+
+ playItem_t *it = pl_item_alloc_init (cue->fullpath, cue->dec);
+ pl_set_meta_int (it, ":TRACKNUM", atoi (cue->cuefieldsCUE_FIELD_TRACK));
+ pl_item_set_startsample (it, cue->currsample + (int64_t)(f_pregap * cue->samplerate));
+ pl_item_set_endsample (it, -1); // will be filled by next read, or by decoder
+ pl_replace_meta (it, ":FILETYPE", cue->filetype);
+
+ pl_cue_set_track_field_values(it, cue);
+
+ if (cue->last_round) {
+ int res = _set_last_item_region (plt, it, cue->origin, cue->numsamples, cue->samplerate);
+ if (res < 0) {
+ return res;
+ }
+ }
+
+ uint32_t f = pl_get_item_flags (cue->origin);
+ f |= DDB_TAG_CUESHEET;
+ if (!cue->first_track) {
+ // First track in a FILE is not a subtrack, but subsequent tracks are.
+ // That's necessary to be able to write tags to tracks+cue albums.
+ f |= DDB_IS_SUBTRACK;
+ }
+ cue->first_track = 0;
+ if (cue->embedded_origin) {
+ f |= DDB_HAS_EMBEDDED_CUESHEET;
+ }
+ pl_set_item_flags (it, f);
+
+ cue->cuetrackscue->ntracks++ = it;
+
+ cue->prev = it;
+ return 0;
+}
+
+static int
+_is_audio_track (const char *track) {
+ return !strcmp (track + strlen (track) - 6, " AUDIO");
+}
+
+playItem_t *
+plt_load_cuesheet_from_buffer (playlist_t *plt, playItem_t *after, const char *fname, playItem_t *embedded_origin, int64_t embedded_numsamples, int embedded_samplerate, const uint8_t *buffer, int sz, const char *dirname, struct dirent **namelist, int n) {
+ playItem_t *result = NULL;
+ cueparser_t cue;
+ memset (&cue, 0, sizeof (cue));
+
+ cue.fname = fname;
+ cue.embedded_origin = embedded_origin;
+ cue.embedded_numsamples = embedded_numsamples;
+ cue.embedded_samplerate = embedded_samplerate;
+
+ playItem_t *ins = after;
+ char cue_file_dirstrlen(fname); // can't be longer than fname
+ cue.cue_file_dir = cue_file_dir;
+
+ cue_file_dir0 = 0;
+ const char *slash = strrchr (fname, '/');
+
+ if (slash && slash > fname) {
+ strncat (cue_file_dir, fname, slash - fname);
+ cue.cue_fname = slash+1;
+ }
+
+
+ cue.dirname = dirname;
+ cue.namelist = namelist;
+ cue.n = n;
+
+ cue.target_playlist = plt;
+
+ cue.temp_plt = calloc (1, sizeof (playlist_t));
+ cue.temp_plt->loading_cue = 1;
+
+ if (sz >= 3 && !memcmp (buffer, "\xef\xbb\xbf", 3)) {
+ buffer += 3;
+ sz -= 3;
+ }
+
+ cue.charset = junk_detect_charset (buffer);
+ cue.p = buffer;
+
+ const uint8_t *end = buffer+sz;
+
+ // determine total tracks/files
+ pl_cue_get_total_tracks_and_files(cue.p, end, &cue.ncuefiles, &cue.ncuetracks);
+ if (!cue.ncuefiles) {
+ trace_err("Cuesheet has zero FILE entries (%s)\n", fname);
+ goto error;
+ }
+
+ if (!cue.ncuetracks) {
+ trace_err("Cuesheet has zero TRACK entries (%s)\n", fname);
+ goto error;
+ }
+
+ if (cue.ncuefiles > 1 && embedded_origin) {
+ trace_err("Can't load embedded cuesheet referencing multiple audio files (%s)\n", fname);
+ goto error;
+ }
+
+
+ snprintf(cue.cuefieldsCUE_FIELD_TOTALTRACKS, CUE_FIELD_LEN, "%d", cue.ncuetracks);
+
+ int filefield = 0;
+
+ while (!cue.last_round) {
+ cue.p = skipspaces (cue.p, end);
+ int field;
+ if (cue.p >= end) {
+ field = CUE_FIELD_TRACK;
+ cue.last_round = 1;
+ }
+ else {
+ field = pl_cue_get_field_value(&cue);
+ if (field < 0) {
+ goto error;
+ }
+ }
+
+ // Next field immediately after FILE, indicates whether current TRACK belongs to previous or next FILE
+ if (filefield) {
+ filefield = 0;
+ // If FILE is immediately followed by TRACK, that next TRACK is from the new FILE
+ if (field == CUE_FIELD_TRACK
+ && _is_audio_track(cue.cuefieldsCUE_FIELD_TRACK)) {
+ if (plt_process_cue_track (plt, &cue) < 0) {
+ goto error;
+ }
+ }
+ if (cue.prev) {
+ _set_last_item_region (plt, cue.prev, cue.origin, cue.numsamples, cue.samplerate);
+ cue.prev = NULL;
+ }
+ if (_load_nextfile (&cue)) {
+ break;
+ }
+ if (field == CUE_FIELD_TRACK) {
+ cue.have_track = 0;
+ }
+ cue.currsample = pl_item_get_startsample (cue.origin);
+ }
+
+ if (field == CUE_FIELD_INDEX01) {
+ float sec = cue.cuefieldsCUE_FIELD_INDEX010 ? pl_cue_parse_time (cue.cuefieldsCUE_FIELD_INDEX01) : 0;
+ // that's the startsample of the current track, and endsample-1 of the next one.
+ // relative to the beginning of previous file
+
+ if (cue.origin == NULL) {
+ trace_err ("CUE: ignoring malformed cuesheet in file %s", fname);
+ goto error;
+ }
+
+ int64_t val = pl_item_get_startsample (cue.origin) + (int64_t)(sec * cue.samplerate);
+ if (val > cue.currsample) {
+ cue.currsample = val;
+ }
+ }
+ else if (field == CUE_FIELD_FILE) {
+ if (!cue.have_track) {
+ if (_load_nextfile (&cue)) {
+ break;
+ }
+ }
+ else {
+ filefield = 1;
+ }
+ }
+ else if (field == CUE_FIELD_TRACK) {
+ if (cue.origin && cue.have_track) {
+ if (_is_audio_track(cue.cuefieldsCUE_FIELD_TRACK)) {
+ if (plt_process_cue_track (plt, &cue) < 0) {
+ goto error;
+ }
+ }
+ else if (cue.prev && cue.last_round) {
+ // set duration for last item
+ _set_last_item_region (plt, cue.prev, cue.origin, cue.numsamples, cue.samplerate);
+ }
+ }
+
+ if (cue.last_round) {
+ break;
+ }
+
+ pl_cue_reset_per_track_fields(cue.cuefields);
+ pl_get_value_from_cue (cue.p + 6, CUE_FIELD_LEN, cue.cuefieldsCUE_FIELD_TRACK);
+ cue.have_track = 1;
+ }
+
+ // move pointer to the next line
+ while (cue.p < end && *cue.p >= 0x20) {
+ cue.p++;
+ }
+ }
+ for (int i = 0; i < cue.ntracks; i++) {
+ after = plt_insert_item (plt, after, cue.cuetracksi);
+ pl_item_unref (cue.cuetracksi);
+ }
+ cue.ntracks = 0;
+ playItem_t *first = ins ? ins->nextPL_MAIN : plt->headPL_MAIN;
+ if (!first) {
+ after = NULL;
+ }
+
+ result = after;
+
+error:
+ for (int i = 0; i < cue.ntracks; i++) {
+ pl_item_unref (cue.cuetracksi);
+ }
+ if (cue.temp_plt) {
+ plt_free (cue.temp_plt);
+ }
+ return result;
+}
+

deadbeef-1.9.6.tar.bz2/src/cueutil.h Added

@@ -0,0 +1,55 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2017 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <deadbeef/deadbeef.h>
+
+// Load cuesheet, find the corresponding audiofiles, and add them as tracks into playlist, if they can be found.
+//
+// If namelist is not NULL (result of scandir), it helps to find the audio files in the cuesheet directory,
+// and allows to mark them as used to avoid adding the same files multiple times.
+//
+// Internally, the function finds and loads the cue file, and passes it to `plt_load_cuesheet_from_buffer`, see below for more information.
+//
+// Argument breakdown:
+// `playlist` where to add files.
+// The item `after` which to insert the files. NULL means beginning of playlist.
+// `fullname` is the fully qualified path to the cuesheet file.
+// `dirname` is full directory path, in which scandir was performed.
+// `namelist` and `n` is the scandir output.
+// The `dirname`, `namelist` and `n` can be either all set to NULL, otherwise they all must be valid values.
+playItem_t *
+plt_load_cue_file (playlist_t *playlist, playItem_t *after, const char *fullname, const char *dirname, struct dirent **namelist, int n);
+
+// This is a more internal function, to load cuesheet from buffer.
+// Semantics are the same as `plt_load_cue_file`.
+//
+// Additional arguments:
+// `fname`: the file from which the cuesheet was loaded, either the cue file itself, or its audio file.
+// `embedded_origin`: the track from which the embedded cuesheet was extracted.
+// `embedded_numsamples`: number of samples in the whole track.
+// `embedded_samplerate`: samplerate of the track.
+// `buffer`: pointer to the string containing cuesheet.
+// `buffersize`: size of the buffer.
+playItem_t *
+plt_load_cuesheet_from_buffer (playlist_t *playlist, playItem_t *after, const char *fname, playItem_t *embedded_origin, int64_t embedded_numsamples, int embedded_samplerate, const uint8_t *buffer, int buffersize, const char *dirname, struct dirent **namelist, int n);
+

deadbeef-1.9.6.tar.bz2/src/decodedblock.c Added

@@ -0,0 +1,162 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "decodedblock.h"
+#include <assert.h>
+#include <stdlib.h>
+
+#define BLOCK_COUNT 48 // FIXME: must be the same or more than streamreader block count
+
+static decoded_block_t *_decoded_blocks; // list of all _decoded_blocks
+
+static decoded_block_t *_decoded_blocks_queued; // first available block with data (can be NULL)
+
+static decoded_block_t *_decoded_blocks_free; // next block available to be read into / queued
+
+void
+decoded_blocks_init (void) {
+ for (int i = 0; i < BLOCK_COUNT; i++) {
+ decoded_block_t *b = calloc (1, sizeof (decoded_block_t));
+ b->next = _decoded_blocks;
+ _decoded_blocks = b;
+ }
+ _decoded_blocks_free = _decoded_blocks;
+}
+
+void
+decoded_blocks_free (void) {
+ while (_decoded_blocks) {
+ decoded_block_t *next = _decoded_blocks->next;
+ if (_decoded_blocks->track != NULL) {
+ pl_item_unref(_decoded_blocks->track);
+ _decoded_blocks->track = NULL;
+ }
+ free (_decoded_blocks);
+ _decoded_blocks = next;
+ }
+ _decoded_blocks_free = _decoded_blocks_queued = NULL;
+}
+
+void
+decoded_blocks_release (decoded_block_t *b) {
+ b->is_silent_header = 0;
+ b->last = 0;
+ b->first = 0;
+ b->remaining_bytes = 0;
+ b->total_bytes = 0;
+ b->queued = 0;
+ b->playback_time = 0;
+ if (b->track != NULL) {
+ pl_item_unref (b->track);
+ }
+ b->track = NULL;
+}
+
+// Recycle all _decoded_blocks / empty queue.
+// Should be called from streamer_reset and similar situations.
+void
+decoded_blocks_reset (void) {
+ decoded_block_t *b = _decoded_blocks;
+ while (b) {
+ decoded_blocks_release (b);
+ b = b->next;
+ }
+ _decoded_blocks_free = _decoded_blocks;
+ _decoded_blocks_queued = NULL;
+}
+
+decoded_block_t *
+decoded_blocks_current (void) {
+ return _decoded_blocks_queued;
+}
+
+void
+decoded_blocks_next (void) {
+ if (_decoded_blocks_queued) {
+ decoded_blocks_release (_decoded_blocks_queued);
+
+ _decoded_blocks_queued = _decoded_blocks_queued->next;
+ if (!_decoded_blocks_queued) {
+ _decoded_blocks_queued = _decoded_blocks;
+ }
+ }
+
+ if (_decoded_blocks_queued && !_decoded_blocks_queued->queued) {
+ _decoded_blocks_queued = NULL; // no available _decoded_blocks with data
+ }
+}
+
+decoded_block_t *
+decoded_blocks_append(void) {
+ if (_decoded_blocks_free->queued) {
+ return NULL; // all buffers full
+ }
+
+ if (!_decoded_blocks_queued) {
+ _decoded_blocks_queued = _decoded_blocks_free;
+ }
+
+ decoded_block_t *queued_block = _decoded_blocks_free;
+
+ queued_block->queued = 1;
+
+ _decoded_blocks_free = _decoded_blocks_free->next;
+ if (!_decoded_blocks_free) {
+ _decoded_blocks_free = _decoded_blocks;
+ }
+
+ return queued_block;
+}
+
+int
+decoded_blocks_have_free (void) {
+ return _decoded_blocks_free != NULL;
+}
+
+float
+decoded_blocks_playback_time_total (void) {
+ decoded_block_t *first = _decoded_blocks_queued;
+
+ if (first == NULL) {
+ return 0;
+ }
+
+ decoded_block_t *curr = first;
+
+ float time = 0;
+
+ int wrap = 0;
+ while (curr->queued && !(wrap && curr == first)) {
+ time += curr->playback_time;
+
+ if (curr == first) {
+ wrap = 1;
+ }
+
+ curr = curr->next;
+ if (curr == NULL) {
+ curr = _decoded_blocks;
+ }
+ }
+
+ return time;
+}

deadbeef-1.9.6.tar.bz2/src/decodedblock.h Added

@@ -0,0 +1,69 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef decodedblock_h
+#define decodedblock_h
+
+#include "playlist.h"
+
+// Each decoded block directly corresponds to encoded block.
+// The decoded blocks don't hold the data, which is stored in the _output_buffer.
+// As the data is consumed, playpos/playtime should advance, and the blocks should be recycled.
+typedef struct decoded_block_s {
+    int is_silent_header; // set to 1 if the block represents the added silence
+    int last;
+    int first;
+    int remaining_bytes;
+    int total_bytes;
+    int queued;
+    float playback_time;
+    playItem_t *track;
+    struct decoded_block_s *next;
+} decoded_block_t;
+
+void
+decoded_blocks_init (void);
+
+void
+decoded_blocks_free (void);
+
+// Recycle all blocks / empty queue.
+// Should be called from streamer_reset and similar situations.
+void
+decoded_blocks_reset (void);
+
+decoded_block_t *
+decoded_blocks_current (void);
+
+void
+decoded_blocks_next (void);
+
+decoded_block_t *
+decoded_blocks_append (void);
+
+int
+decoded_blocks_have_free (void);
+
+float
+decoded_blocks_playback_time_total (void);
+
+#endif /* decodedblock_h */

deadbeef-1.9.6.tar.bz2/src/dsp.c Added

@@ -0,0 +1,574 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+#include <limits.h>
+#include <errno.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <deadbeef/deadbeef.h>
+#include "dsp.h"
+#include "streamer.h"
+#include "messagepump.h"
+#include "plugins.h"
+#include "conf.h"
+#include "premix.h"
+
+static ddb_dsp_context_t *_current_dsp_chain;
+static DB_dsp_t *_eqplug;
+static ddb_dsp_context_t *_eq;
+static int _dsp_on = 0;
+
+static char *_dsp_input_buffer;
+static int _dsp_input_buffer_size;
+
+static char *_dsp_temp_buffer;
+static int _dsp_temp_buffer_size;
+
+void
+streamer_dsp_postinit (void);
+
+static void
+free_dsp_buffers (void);
+
+void
+dsp_free (void) {
+ dsp_chain_free (_current_dsp_chain);
+ _current_dsp_chain = NULL;
+
+ free_dsp_buffers ();
+
+ _eqplug = NULL;
+ _eq = NULL;
+}
+
+void
+dsp_reset (void) {
+ // reset dsp
+ ddb_dsp_context_t *dsp = _current_dsp_chain;
+ while (dsp) {
+ if (dsp->plugin->reset) {
+ dsp->plugin->reset (dsp);
+ }
+ dsp = dsp->next;
+ }
+}
+
+static char *
+ensure_dsp_input_buffer (int size) {
+ if (!size) {
+ if (_dsp_input_buffer) {
+ free (_dsp_input_buffer);
+ _dsp_input_buffer = NULL;
+ }
+ return 0;
+ }
+ if (size != _dsp_input_buffer_size) {
+ _dsp_input_buffer = realloc (_dsp_input_buffer, size);
+ _dsp_input_buffer_size = size;
+ }
+ return _dsp_input_buffer;
+}
+
+static char *
+ensure_dsp_temp_buffer (int size) {
+ if (!size) {
+ if (_dsp_temp_buffer) {
+ free (_dsp_temp_buffer);
+ _dsp_temp_buffer = NULL;
+ }
+ _dsp_temp_buffer_size = 0;
+ return NULL;
+ }
+ if (size != _dsp_temp_buffer_size) {
+ _dsp_temp_buffer = realloc (_dsp_temp_buffer, size);
+ _dsp_temp_buffer_size = size;
+ }
+ assert (_dsp_temp_buffer);
+ return _dsp_temp_buffer;
+}
+
+static void
+free_dsp_buffers (void) {
+ ensure_dsp_input_buffer (0);
+ ensure_dsp_temp_buffer (0);
+}
+
+ddb_dsp_context_t *
+streamer_get_dsp_chain (void) {
+ return _current_dsp_chain;
+}
+
+ddb_dsp_context_t *
+dsp_clone (ddb_dsp_context_t *from) {
+ ddb_dsp_context_t *dsp = from->plugin->open ();
+ char param2000;
+ if (from->plugin->num_params) {
+ int n = from->plugin->num_params ();
+ for (int i = 0; i < n; i++) {
+ from->plugin->get_param (from, i, param, sizeof (param));
+ dsp->plugin->set_param (dsp, i, param);
+ }
+ }
+ dsp->enabled = from->enabled;
+ return dsp;
+}
+
+void
+streamer_set_dsp_chain_real (ddb_dsp_context_t *chain) {
+ streamer_lock ();
+ dsp_chain_free (_current_dsp_chain);
+ _current_dsp_chain = chain;
+ _eq = NULL;
+
+ streamer_dsp_postinit ();
+ streamer_dsp_chain_save();
+
+ streamer_unlock ();
+
+ messagepump_push (DB_EV_DSPCHAINCHANGED, 0, 0, 0);
+}
+
+void
+dsp_chain_free (ddb_dsp_context_t *dsp_chain) {
+ while (dsp_chain) {
+ ddb_dsp_context_t *next = dsp_chain->next;
+ dsp_chain->plugin->close (dsp_chain);
+ dsp_chain = next;
+ }
+}
+
+ddb_dsp_context_t *
+streamer_dsp_chain_load (const char *fname) {
+ int err = 1;
+ FILE *fp = fopen (fname, "rt");
+ if (!fp) {
+ return NULL;
+ }
+
+ char temp100;
+ ddb_dsp_context_t *chain = NULL;
+ ddb_dsp_context_t *tail = NULL;
+ for (;;) {
+ // plugin enabled {
+ int enabled = 0;
+ int res = fscanf (fp, "%99s %d {\n", temp, &enabled);
+ if (res == EOF) {
+ break;
+ }
+ else if (2 != res) {
+ fprintf (stderr, "error plugin name\n");
+ goto error;
+ }
+
+ DB_dsp_t *plug = (DB_dsp_t *)plug_get_for_id (temp);
+ if (!plug) {
+ fprintf (stderr, "streamer_dsp_chain_load: plugin %s not found. preset will not be loaded\n", temp);
+ goto error;
+ }
+ ddb_dsp_context_t *ctx = plug->open ();
+ if (!ctx) {
+ fprintf (stderr, "streamer_dsp_chain_load: failed to open ctxance of plugin %s\n", temp);
+ goto error;
+ }
+
+ if (tail) {
+ tail->next = ctx;
+ tail = ctx;
+ }
+ else {
+ tail = chain = ctx;
+ }
+
+ int n = 0;
+ for (;;) {
+ char value1000;
+ if (!fgets (temp, sizeof (temp), fp)) {
+ fprintf (stderr, "streamer_dsp_chain_load: unexpected eof while reading plugin params\n");
+ goto error;
+ }
+ if (!strcmp (temp, "}\n")) {
+ break;
+ }
+ else if (1 != sscanf (temp, "\t%999^\n\n", value)) {
+ fprintf (stderr, "streamer_dsp_chain_load: error loading param %d\n", n);
+ goto error;
+ }
+ if (plug->num_params) {
+ plug->set_param (ctx, n, value);
+ }
+ n++;
+ }
+ ctx->enabled = enabled;
+ }
+
+ err = 0;
+error:
+ if (err) {
+ fprintf (stderr, "streamer_dsp_chain_load: error loading %s\n", fname);
+ }
+ if (fp) {
+ fclose (fp);
+ }
+ if (err && chain) {
+ dsp_chain_free (chain);
+ chain = NULL;
+ }
+ return chain;
+}
+
+int
+streamer_dsp_chain_save_internal (const char *fname, ddb_dsp_context_t *chain) {
+ char tempfilePATH_MAX;
+ snprintf (tempfile, sizeof (tempfile), "%s.tmp", fname);
+ FILE *fp = fopen (tempfile, "w+t");
+ if (!fp) {
+ return -1;
+ }
+
+ ddb_dsp_context_t *ctx = chain;
+ while (ctx) {
+ if (fprintf (fp, "%s %d {\n", ctx->plugin->plugin.id, (int)ctx->enabled) < 0) {
+ fprintf (stderr, "write to %s failed (%s)\n", tempfile, strerror (errno));
+ goto error;
+ }
+ if (ctx->plugin->num_params) {
+ int n = ctx->plugin->num_params ();
+ int i;
+ for (i = 0; i < n; i++) {
+ char v1000;
+ ctx->plugin->get_param (ctx, i, v, sizeof (v));
+ if (fprintf (fp, "\t%s\n", v) < 0) {
+ fprintf (stderr, "write to %s failed (%s)\n", tempfile, strerror (errno));
+ goto error;
+ }
+ }
+ }
+ if (fprintf (fp, "}\n") < 0) {
+ fprintf (stderr, "write to %s failed (%s)\n", tempfile, strerror (errno));
+ goto error;
+ }
+ ctx = ctx->next;
+ }
+
+ fclose (fp);
+ if (rename (tempfile, fname) != 0) {
+ fprintf (stderr, "dspconfig rename %s -> %s failed: %s\n", tempfile, fname, strerror (errno));
+ return -1;
+ }
+ return 0;
+error:
+ fclose (fp);
+ return -1;
+}
+
+int
+streamer_dsp_chain_save (void) {
+ char fnamePATH_MAX;
+ snprintf (fname, sizeof (fname), "%s/dspconfig", plug_get_config_dir ());
+ return streamer_dsp_chain_save_internal (fname, _current_dsp_chain);
+}
+
+void
+streamer_dsp_postinit (void) {
+ // note about EQ hack:
+ // we 1st check if there's an EQ in dsp chain, and just use it
+ // if not -- we add our own
+
+ // eq plug
+ if (_eqplug) {
+ ddb_dsp_context_t *p;
+
+ for (p = _current_dsp_chain; p; p = p->next) {
+ if (!strcmp (p->plugin->plugin.id, "supereq")) {
+ break;
+ }
+ }
+ if (p) {
+ _eq = p;
+ }
+ else {
+ _eq = _eqplug->open ();
+ _eq->enabled = 0;
+ _eq->next = _current_dsp_chain;
+ _current_dsp_chain = _eq;
+ }
+
+ }
+ ddb_dsp_context_t *ctx = _current_dsp_chain;
+ while (ctx) {
+ if (ctx->enabled) {
+ break;
+ }
+ ctx = ctx->next;
+ }
+ if (ctx) {
+ _dsp_on = 1;
+ }
+ else if (!ctx) {
+ _dsp_on = 0;
+ }
+
+}
+
+void
+streamer_dsp_init (void) {
+ // load dsp chain from file
+ char fnamePATH_MAX;
+ snprintf (fname, sizeof (fname), "%s/dspconfig", plug_get_config_dir ());
+ _current_dsp_chain = streamer_dsp_chain_load (fname);
+ if (!_current_dsp_chain) {
+ // first run, let's add resampler
+ DB_dsp_t *src = (DB_dsp_t *)plug_get_for_id ("SRC");
+ if (src) {
+ ddb_dsp_context_t *inst = src->open ();
+ inst->enabled = 1;
+ src->set_param (inst, 0, "48000"); // samplerate
+ src->set_param (inst, 1, "2"); // quality=SINC_FASTEST
+ src->set_param (inst, 2, "1"); // auto
+ inst->next = _current_dsp_chain;
+ _current_dsp_chain = inst;
+ }
+ }
+
+ _eqplug = (DB_dsp_t *)plug_get_for_id ("supereq");
+ streamer_dsp_postinit ();
+
+ // load legacy eq settings from pre-0.5
+ if (_eq && _eqplug && conf_find ("eq.", NULL)) {
+ _eq->enabled = deadbeef->conf_get_int ("eq.enable", 0);
+ char s50;
+
+ // 0.4.4 was writing buggy settings, need to multiply by 2 to compensate
+ conf_get_str ("eq.preamp", "0", s, sizeof (s));
+ snprintf (s, sizeof (s), "%f", atof(s)*2);
+ _eqplug->set_param (_eq, 0, s);
+ for (int i = 0; i < 18; i++) {
+ char key100;
+ snprintf (key, sizeof (key), "eq.band%d", i);
+ conf_get_str (key, "0", s, sizeof (s));
+ snprintf (s, sizeof (s), "%f", atof(s)*2);
+ _eqplug->set_param (_eq, 1+i, s);
+ }
+ // delete obsolete settings
+ conf_remove_items ("eq.");
+ }
+}
+
+
+int
+dsp_apply (ddb_waveformat_t *input_fmt, char *input, int inputsize,
+ ddb_waveformat_t *out_fmt, char **out_bytes, int *out_numbytes, float *out_dsp_ratio) {
+
+ *out_dsp_ratio = 1;
+
+ if (input_fmt->flags & DDB_WAVEFORMAT_FLAG_IS_DOP) {
+ memcpy(out_fmt, input_fmt, sizeof(ddb_waveformat_t));
+ *out_bytes = (char*)malloc(inputsize);
+ *out_numbytes = inputsize;
+ memcpy(*out_bytes, input, inputsize);
+ return 1;
+ }
+
+ ddb_waveformat_t dspfmt;
+ memcpy (&dspfmt, input_fmt, sizeof (ddb_waveformat_t));
+ dspfmt.bps = 32;
+ dspfmt.is_float = 1;
+
+ // number of channels needs to be at least as much as the channelmask says
+
+ uint32_t mask = input_fmt->channelmask;
+ int dspfmt_ch = 0;
+ while (mask != 0) {
+ mask >>= 1;
+ dspfmt_ch += 1;
+ }
+
+ dspfmt.channels = dspfmt_ch;
+ dspfmt.channelmask = 0;
+ for (int i = 0; i < dspfmt_ch; i++) {
+ dspfmt.channelmask |= (1<<i);
+ }
+
+ int can_bypass = 0;
+ if (_dsp_on) {
+ // check if DSP can be passed through
+ ddb_dsp_context_t *dsp = _current_dsp_chain;
+ while (dsp) {
+ if (dsp->enabled) {
+ if (dsp->plugin->plugin.api_vminor >= 1) {
+ if (!dsp->plugin->can_bypass || !dsp->plugin->can_bypass (dsp, &dspfmt)) {
+ break;
+ }
+ }
+ else {
+ break;
+ }
+ }
+ dsp = dsp->next;
+ }
+ if (!dsp) {
+ can_bypass = 1;
+ }
+ }
+
+ if (!_dsp_on || can_bypass) {
+ return 0;
+ }
+
+ int inputsamplesize = input_fmt->channels * input_fmt->bps / 8;
+
+ // convert to float, pass through streamer DSP chain
+ int dspsamplesize = dspfmt_ch * sizeof (float);
+
+ // make *MAX_DSP_RATIO sized buffer for float data
+ int tempbuf_size = inputsize/inputsamplesize * dspsamplesize * MAX_DSP_RATIO;
+ char *tempbuf = ensure_dsp_temp_buffer (tempbuf_size);
+
+ // convert to float
+ /*int tempsize = */pcm_convert (input_fmt, input, &dspfmt, tempbuf, inputsize);
+ int nframes = inputsize / inputsamplesize;
+ ddb_dsp_context_t *dsp = _current_dsp_chain;
+ float ratio = 1.f;
+ int maxframes = tempbuf_size / dspsamplesize;
+ while (dsp) {
+ if (dsp->enabled) {
+ float r = 1;
+ nframes = dsp->plugin->process (dsp, (float *)tempbuf, nframes, maxframes, &dspfmt, &r);
+ ratio *= r;
+ }
+ dsp = dsp->next;
+ }
+
+ *out_dsp_ratio = ratio;
+
+ memcpy (out_fmt, &dspfmt, sizeof (ddb_waveformat_t));
+ *out_bytes = tempbuf;
+ *out_numbytes = nframes * dspfmt.channels * sizeof (float);
+
+ return 1;
+}
+
+void
+dsp_get_output_format (ddb_waveformat_t *in_fmt, ddb_waveformat_t *out_fmt) {
+ memcpy (out_fmt, in_fmt, sizeof (ddb_waveformat_t));
+ if (_dsp_on) {
+ // check if DSP can be passed through
+ ddb_dsp_context_t *dsp = _current_dsp_chain;
+ while (dsp) {
+ if (dsp->enabled) {
+ float ratio;
+ if (dsp->plugin->plugin.api_vminor >= 1) {
+ if (dsp->plugin->can_bypass && !dsp->plugin->can_bypass (dsp, out_fmt)) {
+ dsp->plugin->process (dsp, NULL, 0, 0, out_fmt, &ratio);
+ }
+ }
+ else {
+ dsp->plugin->process (dsp, NULL, 0, 0, out_fmt, &ratio);
+ }
+ }
+ dsp = dsp->next;
+ }
+ }
+}
+
+// NOTE: input must go in the same sample format as the output is set to.
+// Only int16 is supported, any number of channels
+// Returns number of bytes consumed from input.
+int
+dsp_apply_simple_downsampler (int input_samplerate, int channels, char *input, int inputsize, int output_samplerate, char **out_bytes, int *out_numbytes) {
+ if (input_samplerate == output_samplerate) {
+ *out_bytes = input;
+ *out_numbytes = inputsize;
+ return inputsize; // nothing to do
+ }
+
+ // NOTE: output samplerate is expected to be set to a multiple of input samplerate, which can be played by device
+ // E.g. input 192000 -> output 48000
+ // Anything else is an error.
+
+ // 2x downsample
+ if ((input_samplerate / output_samplerate) == 2 && (input_samplerate % output_samplerate) == 0) {
+ // clip to multiple of 2 samples
+ int outsamplesize = channels * 2 * 2;
+ if ((inputsize % outsamplesize) != 0) {
+ inputsize -= (inputsize % outsamplesize);
+ }
+
+ // allocate output buffer
+ int outsize = inputsize / 2;
+ char *bytes = ensure_dsp_temp_buffer (outsize);
+ // return output buffer and its size
+ *out_bytes = bytes;
+ *out_numbytes = outsize;
+
+ // 2x downsample
+ int nframes = inputsize / 2 / channels;
+ int16_t *in = (int16_t *)input;
+ int16_t *out = (int16_t *)bytes;
+ for (int f = 0; f < nframes/2; f++) {
+ for (int c = 0; c < channels; c++) {
+ outf*channels+c = (inf*2*channels+c + in(f*2+1)*channels+c) >> 1;
+ }
+ }
+ return inputsize;
+ }
+ // 4x downsample
+ else if ((input_samplerate / output_samplerate) == 4 && (input_samplerate % output_samplerate) == 0) {
+ // clip to multiple of 4 samples
+ int outsamplesize = channels * 2 * 4;
+ if ((inputsize % outsamplesize) != 0) {
+ inputsize -= (inputsize % outsamplesize);
+ }
+
+ // allocate output buffer
+ int outsize = inputsize / 4;
+ char *bytes = ensure_dsp_temp_buffer (outsize);
+ // return output buffer and its size
+ *out_bytes = bytes;
+ *out_numbytes = outsize;
+
+ // 4x downsample
+ int nframes = inputsize / 2 / channels;
+ assert (inputsize % (2 * channels) == 0);
+ int16_t *in = (int16_t *)input;
+ int16_t *out = (int16_t *)bytes;
+ for (int f = 0; f < nframes/4; f++) {
+ for (int c = 0; c < channels; c++) {
+ outf*channels+c = (inf*4*channels+c
+ + in(f*4+1)*channels+c
+ + in(f*4+2)*channels+c
+ + in(f*4+3)*channels+c) >> 2;
+ }
+ }
+ return inputsize;
+ }
+ else {
+ // can't perform downsampling, return unaltered input buffer
+ *out_bytes = input;
+ *out_numbytes = inputsize;
+ }
+ 
+ return inputsize;
+}
+

deadbeef-1.9.6.tar.bz2/src/dsp.h Added

@@ -0,0 +1,80 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef dsp_h
+#define dsp_h
+
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// how much bigger should read-buffer be to allow upsampling.
+// e.g. 8000Hz -> 192000Hz upsampling requires 24x buffer size,
+// so if we originally request 4096 bytes blocks -
+// that will require 24x buffer size, which is 98304 bytes buffer
+#define MAX_DSP_RATIO 24
+
+void
+dsp_free (void);
+
+void
+dsp_reset (void);
+
+int
+streamer_dsp_chain_save (void);
+
+void
+dsp_chain_free (ddb_dsp_context_t *dsp_chain);
+
+void
+streamer_dsp_postinit (void);
+
+void
+streamer_set_dsp_chain_real (ddb_dsp_context_t *chain);
+
+void
+streamer_dsp_init (void);
+
+void
+streamer_set_dsp_chain_real (ddb_dsp_context_t *chain);
+
+ddb_dsp_context_t *
+dsp_clone (ddb_dsp_context_t *from);
+
+int
+dsp_apply (ddb_waveformat_t *input_fmt, char *input, int inputsize,
+ ddb_waveformat_t *out_fmt, char **out_bytes, int *out_numbytes, float *out_dsp_ratio);
+
+void
+dsp_get_output_format (ddb_waveformat_t *in_fmt, ddb_waveformat_t *out_fmt);
+
+int
+dsp_apply_simple_downsampler (int input_samplerate, int channels, char *input, int inputsize, int output_samplerate, char **out_bytes, int *out_numbytes);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* dsp_h */

deadbeef-1.9.6.tar.bz2/src/dsppreset.c Added

@@ -0,0 +1,148 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ dsp preset manager
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <deadbeef/deadbeef.h>
+#include "plugins.h"
+
+void
+dsp_preset_free (ddb_dsp_context_t *head) {
+ while (head) {
+ ddb_dsp_context_t *next = head->next;
+ head->plugin->close (head);
+ head = next;
+ }
+}
+
+int
+dsp_preset_load (const char *fname, ddb_dsp_context_t **head) {
+ if (!head) {
+ return -1;
+ }
+ int err = 1;
+ FILE *fp = fopen (fname, "rb");
+ if (!fp) {
+ return -1;
+ }
+
+ ddb_dsp_context_t *tail = NULL;
+
+ char temp100;
+ for (;;) {
+ // plugin {
+ int fscanf_res = fscanf (fp, "%99s {\n", temp);
+ if (fscanf_res == EOF) {
+ break;
+ }
+ else if (1 != fscanf_res) {
+ fprintf (stderr, "error plugin name\n");
+ goto error;
+ }
+
+ DB_dsp_t *plug = (DB_dsp_t *)plug_get_for_id (temp);
+ if (!plug) {
+ fprintf (stderr, "ddb_dsp_preset_load: plugin %s not found. preset will not be loaded\n", temp);
+ goto error;
+ }
+ ddb_dsp_context_t *ctx = plug->open ();
+ if (!ctx) {
+ fprintf (stderr, "ddb_dsp_preset_load: failed to open ctxance of plugin %s\n", temp);
+ goto error;
+ }
+
+ if (tail) {
+ tail->next = ctx;
+ tail = ctx;
+ }
+ else {
+ tail = *head = ctx;
+ }
+
+ int n = 0;
+ for (;;) {
+ char value1000;
+ if (!fgets (temp, sizeof (temp), fp)) {
+ fprintf (stderr, "unexpected eof while reading plugin params\n");
+ goto error;
+ }
+ if (!strcmp (temp, "}\n")) {
+ break;
+ }
+ else if (1 != sscanf (temp, "\t%100^\n\n", value)) {
+ fprintf (stderr, "error loading param %d\n", n);
+ goto error;
+ }
+ if (plug->num_params) {
+ plug->set_param (ctx, n, value);
+ }
+ n++;
+ }
+ }
+
+ err = 0;
+error:
+ if (err) {
+ fprintf (stderr, "error loading %s\n", fname);
+ }
+ if (fp) {
+ fclose (fp);
+ }
+ if (err && *head) {
+ dsp_preset_free (*head);
+ *head = NULL;
+ }
+ return err ? -1 : 0;
+}
+
+int
+dsp_preset_save (const char *path, ddb_dsp_context_t *head) {
+ FILE *fp = fopen (path, "w+b");
+ if (!fp) {
+ return -1;
+ }
+
+ ddb_dsp_context_t *ctx = head;
+ while (ctx) {
+ fprintf (fp, "%s {\n", ctx->plugin->plugin.id);
+ if (ctx->plugin->num_params) {
+ int n = ctx->plugin->num_params ();
+ int i;
+ for (i = 0; i < n; i++) {
+ char v1000;
+ ctx->plugin->get_param (ctx, i, v, sizeof (v));
+ fprintf (fp, "\t%s\n", v);
+ }
+ }
+ fprintf (fp, "}\n");
+ ctx = ctx->next;
+ }
+
+ fclose (fp);
+ return 0;
+}

deadbeef-1.9.6.tar.bz2/src/dsppreset.h Added

@@ -0,0 +1,39 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  dsp preset manager
+
+  Copyright (C) 2009-2013 Oleksiy 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
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __DSPPRESET_H
+#define __DSPPRESET_H
+
+void
+dsp_preset_free (ddb_dsp_context_t *head);
+
+int
+dsp_preset_load (const char *fname, ddb_dsp_context_t **head);
+
+int
+dsp_preset_save (const char *path, ddb_dsp_context_t *head);
+
+#endif

deadbeef-1.9.6.tar.bz2/src/escape.c Changed

deadbeef-1.9.6.tar.bz2/src/escape.h Added

@@ -0,0 +1,29 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2014 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef __ESCAPE_H
+#define __ESCAPE_H
+
+char *uri_escape(const char *string, int inlength);
+char *uri_unescape(const char *string, int inlength);
+
+#endif

deadbeef-1.9.6.tar.bz2/src/fft.c Added

@@ -0,0 +1,142 @@
+/*
+ * fft.c
+ * Copyright 2011 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+// this version has a few changes compared to the original audacious fft.c
+// please find the original file in audacious
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <complex.h>
+#include "fft.h"
+#include <math.h>
+#include <stdlib.h>
+
+static int _fft_size;
+static float *_hamming; /* hamming window, scaled to sum to 1 */
+static int *_reversed; /* bit-reversal table */
+static float complex *_roots; /* N-th roots of unity */
+static int LOGN; /* log N (base 2) */
+static int N; /* _fft_size * 2 */
+
+#ifndef HAVE_LOG2
+static inline float log2(float x) {return (float)log(x)/M_LN2;}
+#endif
+
+static void
+_free_buffers (void) {
+ free (_hamming);
+ free (_reversed);
+ free (_roots);
+ _hamming = NULL;
+ _reversed = NULL;
+ _roots = NULL;
+}
+
+/* Reverse the order of the lowest LOGN bits in an integer. */
+
+static int
+_bit_reverse (int x)
+{
+ int y = 0;
+
+ for (int n = LOGN; n --; )
+ {
+ y = (y << 1) | (x & 1);
+ x >>= 1;
+ }
+
+ return y;
+}
+
+/* Generate lookup tables. */
+
+static void
+_generate_tables (void)
+{
+ for (int n = 0; n < N; n ++)
+ _hammingn = 1 - 0.85f * cosf (2 * (float)M_PI * n / N);
+ for (int n = 0; n < N; n ++)
+ _reversedn = _bit_reverse (n);
+ for (int n = 0; n < N / 2; n ++)
+ _rootsn = cexpf (2 * (float)M_PI * I * n / N);
+}
+
+static void
+_init_buffers (int fft_size) {
+ if (_fft_size != fft_size) {
+ _free_buffers();
+ _fft_size = fft_size;
+ N = fft_size * 2;
+ _hamming = calloc (N, sizeof (float));
+ _reversed = calloc (N, sizeof (float));
+ _roots = calloc (fft_size, sizeof (float complex));
+ LOGN = (int)log2(N);
+ _generate_tables();
+ }
+}
+
+static void
+_do_fft (float complex *a)
+{
+ int half = 1; /* (2^s)/2 */
+ int inv = N / 2; /* N/(2^s) */
+
+ /* loop through steps */
+ while (inv)
+ {
+ /* loop through groups */
+ for (int g = 0; g < N; g += half << 1)
+ {
+ /* loop through butterflies */
+ for (int b = 0, r = 0; b < half; b ++, r += inv)
+ {
+ float complex even = ag + b;
+ float complex odd = _rootsr * ag + half + b;
+ ag + b = even + odd;
+ ag + half + b = even - odd;
+ }
+ }
+
+ half <<= 1;
+ inv >>= 1;
+ }
+}
+
+void
+fft_calculate (const float *data, float *freq, int fft_size) {
+ _init_buffers(fft_size);
+
+ // fft code shamelessly stolen from audacious
+ // thanks, John
+ float complex aN;
+ for (int n = 0; n < N; n ++) {
+ a_reversedn = datan * _hammingn;
+ }
+ _do_fft(a);
+
+ for (int n = 0; n < N / 2 - 1; n ++)
+ freqn = 2 * cabsf (a1 + n) / N;
+ freqN / 2 - 1 = cabsf(aN / 2) / N;
+}
+
+void
+fft_free (void) {
+ _free_buffers();
+}

deadbeef-1.9.6.tar.bz2/src/fft.h Added

@@ -0,0 +1,42 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef FFT_H
+#define FFT_H
+
+#ifdef __cplusplus
+extern "C" {
+}
+#endif
+
+void
+fft_calculate (const float *data, float *freq, int fft_size);
+
+void
+fft_free (void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

deadbeef-1.9.6.tar.bz2/src/handler.c Added

@@ -0,0 +1,152 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ generic message queue implementation
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include "handler.h"
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
+#include "handler.h"
+#include "threading.h"
+
+typedef struct message_s {
+ uint32_t id;
+ uintptr_t ctx;
+ uint32_t p1;
+ uint32_t p2;
+ struct message_s *next;
+} message_t;
+
+typedef struct handler_s {
+ int queue_size;
+ message_t *mfree;
+ message_t *mqueue;
+ message_t *mqtail;
+ uintptr_t mutex;
+ uintptr_t cond;
+ message_t pool1;
+} handler_t;
+
+void
+handler_reset (handler_t *h) {
+ h->mqueue = NULL;
+ h->mfree = NULL;
+ h->mqtail = NULL;
+ memset (h->pool, 0, sizeof (message_t) * h->queue_size);
+ for (int i = 0; i < h->queue_size; i++) {
+ h->pooli.next = h->mfree;
+ h->mfree = &h->pooli;
+ }
+}
+
+handler_t *
+handler_alloc (int queue_size) {
+ int sz = sizeof (handler_t) + (queue_size-1) * sizeof (message_t);
+ handler_t *h = malloc (sz);
+ memset (h, 0, sz);
+ h->queue_size = queue_size;
+ h->mutex = mutex_create ();
+ h->cond = cond_create ();
+ handler_reset (h);
+ return h;
+}
+
+void
+handler_free (handler_t *h) {
+ mutex_lock (h->mutex);
+ handler_reset (h);
+ mutex_unlock (h->mutex);
+ mutex_free (h->mutex);
+ cond_free (h->cond);
+ free (h);
+}
+
+int
+handler_push (handler_t *h, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ if (!h) {
+ return -1;
+ }
+ mutex_lock (h->mutex);
+ if (!h->mfree) {
+ mutex_unlock (h->mutex);
+ return -1;
+ }
+ message_t *msg = h->mfree;
+ h->mfree = h->mfree->next;
+ if (h->mqtail) {
+ h->mqtail->next = msg;
+ }
+ h->mqtail = msg;
+ if (!h->mqueue) {
+ h->mqueue = msg;
+ }
+
+ msg->next = NULL;
+ msg->id = id;
+ msg->ctx = ctx;
+ msg->p1 = p1;
+ msg->p2 = p2;
+ mutex_unlock (h->mutex);
+ cond_signal (h->cond);
+ return 0;
+}
+
+void
+handler_wait (handler_t *h) {
+ cond_wait (h->cond, h->mutex);
+ mutex_unlock (h->mutex);
+}
+
+int
+handler_pop (handler_t *h, uint32_t *id, uintptr_t *ctx, uint32_t *p1, uint32_t *p2) {
+ mutex_lock (h->mutex);
+ if (!h->mqueue) {
+ mutex_unlock (h->mutex);
+ return -1;
+ }
+ *id = h->mqueue->id;
+ *ctx = h->mqueue->ctx;
+ *p1 = h->mqueue->p1;
+ *p2 = h->mqueue->p2;
+ message_t *next = h->mqueue->next;
+ h->mqueue->next = h->mfree;
+ h->mfree = h->mqueue;
+ h->mqueue = next;
+ if (!h->mqueue) {
+ h->mqtail = NULL;
+ }
+ mutex_unlock (h->mutex);
+ return 0;
+}
+
+int
+handler_hasmessages (handler_t *h) {
+ mutex_lock (h->mutex);
+ int res = h->mqueue ? 1 : 0;
+ mutex_unlock (h->mutex);
+ return res;
+}
+

deadbeef-1.9.6.tar.bz2/src/handler.h Added

@@ -0,0 +1,53 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ generic message queue implementation
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __HANDLER_H
+#define __HANDLER_H
+
+#include <stdint.h>
+
+struct handler_s *
+handler_alloc (int queue_size);
+
+void
+handler_reset (struct handler_s *h);
+
+void
+handler_free (struct handler_s *h);
+
+int
+handler_push (struct handler_s *h, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
+
+int
+handler_pop (struct handler_s *h, uint32_t *id, uintptr_t *ctx, uint32_t *p1, uint32_t *p2);
+
+void
+handler_wait (struct handler_s *h);
+
+int
+handler_hasmessages (struct handler_s *h);
+
+#endif // __HANDLER_H

deadbeef-1.9.6.tar.bz2/src/junklib.c Added

@@ -0,0 +1,5279 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ library for reading tags from various audio files
+
+ Copyright (C) 2009-2016 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "junklib.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#if HAVE_ICONV
+ #if !defined(__MINGW32__) && !defined(__OpenBSD__)
+ #define LIBICONV_PLUG
+ #endif
+ #include <iconv.h>
+#elif HAVE_ICU
+ #warning icu
+ #include <unicode/utypes.h>
+ #include <unicode/ucnv.h>
+#else
+ #define DDB_RECODE
+ #include "ConvertUTF/ConvertUTF.h"
+uint16_t sj_to_unicode = {
+ #include "sj_to_unicode.h"
+};
+#endif
+#include <limits.h>
+#include <errno.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <assert.h>
+#include <fcntl.h>
+#ifndef __linux__
+#define O_LARGEFILE 0
+#endif
+#include <sys/stat.h>
+#include "playlist.h"
+#include "plmeta.h"
+#include "utf8.h"
+#include "plugins.h"
+#include "conf.h"
+
+int enable_cp1251_detection = 1;
+int enable_cp936_detection = 0;
+int enable_shift_jis_detection = 0;
+
+#define MAX_TEXT_FRAME_SIZE 10000
+#define MAX_CUESHEET_FRAME_SIZE 10000
+#define MAX_APEV2_FRAME_SIZE 2000000
+#define MAX_ID3V2_FRAME_SIZE 100000
+
+#define UTF8_STR "utf-8"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+#define min(x,y) ((x)<(y)?(x):(y))
+#define max(x,y) ((x)>(y)?(x):(y))
+
+#ifndef _O_BINARY
+#define _O_BINARY 0
+#endif
+
+// mapping between ddb metadata names and id3v2/apev2 names
+#define FRAME_MAPPINGS 5
+enum {
+ MAP_DDB = 0,
+ MAP_ID3V23 = 1,
+ MAP_ID3V24 = 2,
+ MAP_ID3V22 = 3,
+ MAP_APEV2 = 4
+};
+
+// map of known id3v2 and apev2 text tags
+// order: ddb, id3-2.3, 2.4, 2.2, apev2
+static const char *frame_mapping = {
+// these tags will be displayed and edited uniformly for all tag types
+ "artist", "TPE1", "TPE1", "TP1", "Artist",
+ "disc", "TPOS", "TPOS", "TPA", "Disc", // NOTE: this is special case when writing id3v2
+ "title", "TIT2", "TIT2", "TT2", "Title",
+ "album", "TALB", "TALB", "TAL", "Album",
+ "copyright", "TCOP", "TCOP", "TCO", "Copyright",
+ "genre", "TCON", "TCON", "TCO", "Genre",
+ "composer", "TCOM", "TCOM", "TCM", "Composer",
+ "year", "TYER", "TDRC", "TYE", "Year", // NOTE: TDRC and TYER are slightly different, and are converted on read/write
+ "track", "TRCK", "TRCK", "TRK", "Track", // NOTE: this is special case when writing id3v2
+// misc id3v2 fields
+// these might or might not have appropriate fields in every tag type
+ "BAND", "TPE2", "TPE2", "TP2", NULL,
+ "ENCODER", "TENC", "TENC", "TEN", NULL,
+ "BEATS_PER_MINUTE", "TBPM", "TBPM", "TBP", NULL,
+ "PLAYLIST_DELAY", "TDLY", "TDLY", "TDY", NULL,
+ "TEXT_WRITERS", "TEXT", "TEXT", "TXT", NULL,
+ "FILE_TYPE", "TFLT", "TFLT", "TFT", NULL,
+ "CONTENT_GROUP_DESCRIPTION", "TIT1", "TIT1", "TT1", NULL,
+ "SUBTITLE", "TIT3", "TIT3", "TT3", NULL,
+ "INITIAL_KEY", "TKEY", "TKEY", "TKE", NULL,
+ "LANGUAGE", "TLAN", "TLAN", "TLA", NULL,
+ "LENGTH", "TLEN", "TLEN", "TLE", NULL,
+ "MEDIA TYPE", "TMED", "TMED", "TMT", NULL,
+ "ORIGINAL_ALBUM_TITLE", "TOAL", "TOAL", "TOT", NULL,
+ "ORIGINAL_FILENAME", "TOFN", "TOFN", "TOF", NULL,
+ "ORIGINAL_TEXT_WRITERS", "TOLY", "TOLY", "TOL", NULL,
+ "ORIGINAL_ARTISTS", "TOPE", "TOPE", "TOA", NULL,
+ "FILE_OWNER", "TOWN", "TOWN", NULL, NULL,
+ "PERFORMER_REFINEMENT", "TPE3", "TPE3", "TP3", NULL,
+ "MODIFIED_BY", "TPE4", "TPE4", "TP4", NULL,
+ "PUBLISHER", "TPUB", "TPUB", "TPB", NULL,
+ "INTERNET_RADIO_STATION_NAME", "TRSN", "TRSN", NULL, NULL,
+ "INTERNET_RADIO_STATION_OWNER", "TRSO", "TRSO", NULL, NULL,
+ "ISRC", "TSRC", "TSRC", NULL, NULL,
+ "ENCODING_SOFTWARE_HARDWARE", "TSSE", "TSSE", "TSS", NULL,
+ "RECORDING_TIME", NULL, "TDRC", NULL, NULL,
+ "RELEASE_TIME", NULL, "TDRL", NULL, NULL,
+ "TAGGING_TIME", NULL, "TDTG", NULL, NULL,
+ "ALBUM_SORT_ORDER", NULL, "TSOA", NULL, NULL,
+ "PERFORMER_SORT_ORDER", NULL, "TSOP", NULL, NULL,
+ "TITLE_SORT_ORDER", NULL, "TSOT", NULL, NULL,
+ "SIZE", "TSIZ", NULL, "TSI", NULL,
+ "RECORDING_DATES", "TRDA", NULL, "TRD", NULL,
+ "INVOLVED_PEOPLE_LIST", NULL, "TIPL", NULL, NULL,
+ "MUSICIAN_CREDITS_LIST", NULL, "TMCL", NULL, NULL,
+ "ENCODING_TIME", NULL, "TDEN", NULL, NULL,
+ "ORIGINAL_RELEASE_TIME", NULL, "TDOR", NULL, NULL,
+ "ORIGINAL_RELEASE_YEAR", NULL, NULL, NULL, "ORIGINALYEAR",
+ "MOOD", NULL, "TMOO", NULL, NULL,
+ "PRODUCED_NOTICE", NULL, "TPRO", NULL, NULL,
+ "musicbrainz_trackid", NULL, NULL, NULL, NULL,
+ "rating", NULL, NULL, NULL, NULL,
+ "DISCSUBTITLE", "TSST", "TSST", NULL, "DiscSubtitle",
+ NULL
+};
+
+// replaygain key names in both id3v2.3+ TXX and APEv2
+static const char *tag_rg_names = {
+ "REPLAYGAIN_ALBUM_GAIN",
+ "REPLAYGAIN_ALBUM_PEAK",
+ "REPLAYGAIN_TRACK_GAIN",
+ "REPLAYGAIN_TRACK_PEAK",
+ NULL
+};
+
+// replaygain key names in deadbeef internal metadata
+const char *ddb_internal_rg_keys = {
+ ":REPLAYGAIN_ALBUMGAIN",
+ ":REPLAYGAIN_ALBUMPEAK",
+ ":REPLAYGAIN_TRACKGAIN",
+ ":REPLAYGAIN_TRACKPEAK",
+ NULL
+};
+
+static const char wmp_popm_email = "Windows Media Player 9 Series";
+
+static inline uint32_t
+extract_i32_le (unsigned char *buf)
+{
+ uint32_t x;
+ // little endian extract
+
+ x = buf3;
+ x <<= 8;
+ x |= buf2;
+ x <<= 8;
+ x |= buf1;
+ x <<= 8;
+ x |= buf0;
+
+ return x;
+}
+
+static inline uint16_t
+extract_i16 (const uint8_t *buf)
+{
+ uint16_t x;
+ // big endian extract
+
+ x = buf0;
+ x <<= 8;
+ x |= buf1;
+
+ return x;
+}
+
+// When reading from tags which don't support multivalue fields natively,
+// these fields will be split on '/' symbol,
+// and leading and trailing whitespace will get stripped
+#define DEFAULT_MULTIVALUE_FIELDS "ARTIST;ALBUM ARTIST;PRODUCER;COMPOSER;PERFORMER;GENRE"
+char junk_multivalue_fields200 = DEFAULT_MULTIVALUE_FIELDS;
+
+static int
+_is_multivalue_field (const char *key) {
+ const char *p = junk_multivalue_fields;
+ do {
+ p = strcasestr (p, key);
+ const char *semicolon = NULL;
+ if (p) {
+ semicolon = strchr (p, ';');
+ if ((p == junk_multivalue_fields || *(p-1) == ';')
+ && (
+ (!semicolon && strlen (p) == strlen (key))
+ || (semicolon && semicolon - p == strlen (key))
+ )
+ ) {
+ return 1;
+ }
+ }
+ p = semicolon;
+ } while (p);
+ return 0;
+}
+
+void
+_split_multivalue (char *text, size_t text_size) {
+ for (size_t i = 0; i < text_size; i++) {
+ if (i < text_size - 3 && !memcmp (&texti, " / ", 3)) {
+ // remove trailing spaces
+ char *p = text + i - 1;
+ while (p >= text && *p == ' ') {
+ *p = 0;
+ p--;
+ }
+
+ memset (text+i, 0, 3);
+
+ // remove leading spaces
+ p = text + i + 3;
+ while (p < text + text_size && *p == ' ') {
+ *p = 0;
+ p++;
+ }
+ i = p - text - 1;
+ }
+ }
+}
+
+static const char *
+_get_combined_meta_value (DB_metaInfo_t *meta, int * restrict out_size, const char *separator, size_t separator_len, int *needs_free) {
+ *out_size = 0;
+
+ if (separator_len == 1 && *separator == 0) {
+ *out_size = meta->valuesize;
+ *needs_free = 0;
+ return meta->value;
+ }
+
+ const char *p = meta->value;
+ const char *e = p + meta->valuesize;
+ while (p < e) {
+ size_t l = strlen (p);
+ *out_size += l;
+ *out_size += separator_len;
+ p += l + 1;
+ }
+
+ if (*out_size > 0) {
+ (*out_size) -= separator_len; // don't write trailing separator
+ }
+
+ if (!(*out_size)) {
+ *needs_free = 0;
+ return "";
+ }
+
+ char *out = malloc (*out_size);
+ if (!out) {
+ *needs_free = 0;
+ return "";
+ }
+
+ char *pp = out;
+
+ p = meta->value;
+ e = p + meta->valuesize;
+ while (p < e) {
+ size_t l = strlen (p);
+ memcpy (pp, p, l);
+ pp += l;
+ if (p + l + 1 != e) {
+ memcpy (pp, separator, separator_len);
+ pp += separator_len;
+ }
+ p += l + 1;
+ }
+
+ *needs_free = 1;
+ return out;
+}
+
+#ifdef DDB_RECODE
+
+static int
+cp1251_to_utf8(const uint8_t *in, int inlen, uint8_t *out, int outlen) {
+ static const long utf256 = {
+		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,127,1026,1027,8218,
+		1107,8222,8230,8224,8225,8364,8240,1033,8249,1034,1036,1035,1039,1106,8216,8217,
+		8220,8221,8226,8211,8212,8250,8482,1113,8250,1114,1116,1115,1119,160,1038,1118,1032,
+		164,1168,166,167,1025,169,1028,171,172,173,174,1031,176,177,1030,1110,1169,181,182,
+		183,1105,8470,1108,187,1112,1029,1109,1111,1040,1041,1042,1043,1044,1045,1046,1047,
+		1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,
+		1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,
+		1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,
+		1096,1097,1098,1099,1100,1101,1102,1103
+	};
+
+ uint8_t *out_start = out;
+ uint8_t *end = out + outlen;
+
+	for(int i = 0; i < inlen && out < end - 4; i++) {
+		long c = utf*in++;
+		if (c < 0x80) {
+			*out++ = (uint8_t)c;
+		}
+		else if (c < 0x800) {
+			*out++ = (uint8_t)((c >> 6) | 0xc0);
+			*out++ = (c & 0x3f) | 0x80;
+		}
+		else if( c < 0x10000 ) {
+			*out++ = (uint8_t)((c >> 12) | 0xe0);
+			*out++ = ((c >> 6) & 0x3f) | 0x80;
+			*out++ = (c & 0x3f) | 0x80;
+		}
+	}
+	*out++ = 0;
+ return (int)(out - out_start);
+}
+
+int
+junk_cp1252_to_utf8(const uint8_t *in, int inlen, uint8_t *out, int outlen) {
+ int len = 0;
+ while (inlen > 0 && outlen-len > 2) {
+ uint8_t c=*in;
+
+ switch (c) {
+ case 192 ... 255:
+ *out++ = 195;
+ *out++ = c - 64;
+ len += 2;
+ break;
+ case 160 ... 191:
+ *out++ = 0xc2;
+ *out++ = c;
+ len += 2;
+ break;
+#define CONV2(x,y,z) case x:\
+ *out++ = y;\
+ *out++ = z;\
+ len += 2;\
+ break;
+#define CONV3(x,y,z,w) case x:\
+ *out++ = y;\
+ *out++ = z;\
+ *out++ = w;\
+ len += 3;\
+ break;
+ CONV2(0x9f,0xc5,0xb8);
+ CONV2(0x9e,0xc5,0xbe);
+ CONV3(0x9d,0xef,0xbf,0xbd);
+ CONV3(0x80,0xe2,0x82,0xac);
+ CONV3(0x81,0xef,0xbf,0xbd);
+ CONV3(0x82,0xe2,0x80,0x9a);
+ CONV2(0x83,0xc6,0x92);
+ CONV3(0x84,0xe2,0x80,0x9e);
+ CONV3(0x85,0xe2,0x80,0xa6);
+ CONV3(0x86,0xe2,0x80,0xa0);
+ CONV3(0x87,0xe2,0x80,0xa1);
+ CONV2(0x88,0xcb,0x86);
+ CONV3(0x89,0xe2,0x80,0xb0);
+ CONV2(0x8a,0xc5,0xa0);
+ CONV3(0x8b,0xe2,0x80,0xb9);
+ CONV2(0x8c,0xc5,0x92);
+ CONV3(0x8d,0xef,0xbf,0xbd);
+ CONV2(0x8e,0xc5,0xbd);
+ CONV3(0x8f,0xef,0xbf,0xbd);
+ CONV3(0x90,0xef,0xbf,0xbd);
+ CONV3(0x91,0xe2,0x80,0x98);
+ CONV3(0x92,0xe2,0x80,0x99);
+ CONV3(0x93,0xe2,0x80,0x9c);
+ CONV3(0x94,0xe2,0x80,0x9d);
+ CONV3(0x95,0xe2,0x80,0xa2);
+ CONV3(0x96,0xe2,0x80,0x93);
+ CONV3(0x97,0xe2,0x80,0x94);
+ CONV2(0x98,0xcb,0x9c);
+ CONV3(0x99,0xe2,0x84,0xa2);
+ CONV2(0x9a,0xc5,0xa1);
+ CONV3(0x9b,0xe2,0x80,0xba);
+ CONV2(0x9c,0xc5,0x93);
+#undef CONV2
+#undef CONV3
+ default:
+ if (c >= 127) {
+ trace ("iso8859 char: %d\n", c);
+ }
+ *out++ = c;
+ len++;
+ break;
+ }
+
+ in++;
+ inlen--;
+ }
+ *out = 0;
+ return len;
+}
+
+int
+junk_utf8_to_cp1252(const uint8_t *in, int inlen, uint8_t *out, int outlen) {
+ uint8_t *outptr = out;
+ const char *cp1252_charset = {"€", "", "‚", "ƒ", "„", "…", "†", "‡", "ˆ", "‰", "Š", "‹", "Œ", "", "Ž", "", "", "‘", "’", "“", "”", "•", "–", "—", "˜", "™", "š", "›", "œ", "", "ž", "Ÿ", " ", "¡", "¢", "£", "¤", "¥", "¦", "§", "¨", "©", "ª", "«", "¬", "", "®", "¯", "°", "±", "²", "³", "´", "µ", "¶", "·", "¸", "¹", "º", "»", "¼", "½", "¾", "¿", "À", "Á", "Â", "Ã", "Ä", "Å", "Æ", "Ç", "È", "É", "Ê", "Ë", "Ì", "Í", "Î", "Ï", "Ð", "Ñ", "Ò", "Ó", "Ô", "Õ", "Ö", "×", "Ø", "Ù", "Ú", "Û", "Ü", "Ý", "Þ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "÷", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ", NULL};
+ while (inlen && outlen > 0) {
+ if (*in < 0x80) {
+ *out++ = *in++;
+ outlen--;
+ inlen--;
+ }
+ else {
+ int idx = 0;
+ u8_inc((char *)in, &idx);
+ int i;
+ for (i = 0; cp1252_charseti; i++) {
+ if (strlen (cp1252_charseti) == idx && !memcmp (in, cp1252_charseti, idx)) {
+ *out++ = (uint8_t)(i + 0x80);
+ outlen--;
+ break;
+ }
+ }
+ if (!cp1252_charseti) {
+ return -1;
+ }
+ in += idx;
+ inlen -= idx;
+ }
+ }
+ *out = 0;
+ return (int)(out-outptr);
+}
+
+int
+junk_utf8_to_ascii(const uint8_t *in, int inlen, uint8_t *out, int outlen) {
+ uint8_t *outptr = out;
+ while (inlen && outlen > 0) {
+ if (*in < 0x80) {
+ *out++ = *in++;
+ outlen--;
+ inlen--;
+ }
+ else {
+ int idx = 0;
+ u8_inc((char *)in, &idx);
+ in += idx;
+ inlen -= idx;
+ }
+ }
+ *out = 0;
+ return (int)(out-outptr);
+}
+
+ConversionResult
+ConvertUTF16BEtoUTF8 (const UTF16** sourceStart, const UTF16* sourceEnd, UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
+ // swap to make it little endian
+ size_t sourceLESize = (size_t)(sourceEnd - *sourceStart) * sizeof (UTF16);
+ UTF16 sourceLEsourceLESize;
+ UTF16 *pLE = sourceLE;
+ for (const UTF16 *p = *sourceStart; p != sourceEnd; p++) {
+ *pLE++ = extract_i16((const uint8_t *)p);
+ }
+ const UTF16 *leStart = sourceLE;
+ ConversionResult res = ConvertUTF16toUTF8(&leStart, pLE, targetStart, targetEnd, flags);
+ *sourceStart += pLE - sourceLE;
+ return res;
+}
+
+ConversionResult
+ConvertUTF8toUTF16BE (const UTF8** sourceStart, const UTF8* sourceEnd, UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
+ UTF16 *output = *targetStart;
+ ConversionResult res = ConvertUTF8toUTF16(sourceStart, sourceEnd, targetStart, targetEnd, flags);
+ if (res == conversionOK) {
+ for (UTF16 *p = output; p != *targetStart; p++) {
+ *p = extract_i16((const uint8_t *)p);
+ }
+ }
+ return res;
+}
+
+// Copy a buffer to a memory address which is (at least) 2-byte aligned.
+// If the input buffer is already aligned -- return NULL.
+static char *
+_get_aligned_copy (const char *in, size_t inlen) {
+ if (((uintptr_t)in&1) == 0 || inlen == 0 || in == NULL) {
+ return NULL;
+ }
+
+ char *aligned = malloc (inlen);
+ if (aligned == NULL) {
+ return NULL;
+ }
+ memcpy (aligned, in, inlen);
+ return aligned;
+}
+
+int
+ddb_iconv (const char *cs_out, const char *cs_in, char *out, int outlen, const char *in, int inlen) {
+ long len = -1;
+ *out = 0;
+ if (inlen==0) {
+ return 0;
+ }
+
+
+ if (!strcmp (cs_in, "UTF-16")) {
+ if ((uint8_t)in0 == 0xfe && (uint8_t)in1 == 0xff) {
+ cs_in = "UTF-16BE";
+ in += 2;
+ inlen -= 2;
+ }
+ else if ((uint8_t)in0 == 0xff && (uint8_t)in1 == 0xfe) {
+ cs_in = "UTF-16LE";
+ in += 2;
+ inlen -= 2;
+ }
+ else {
+ cs_in = "UTF-16LE";
+ }
+ }
+
+ // to utf8 branch
+ if (!strcasecmp (cs_out, UTF8_STR)) {
+ if (!strcasecmp (cs_in, UTF8_STR)) {
+ memcpy (out, in, inlen);
+ outinlen = 0;
+ int valid = u8_valid (out, inlen, NULL);
+ if (valid) {
+ len = inlen;
+ }
+ }
+ else if (!strcasecmp (cs_in, "cp1251")) {
+ len = cp1251_to_utf8 (in, inlen, out, outlen);
+ }
+ else if (!strcasecmp (cs_in, "iso8859-1") || !strcasecmp (cs_in, "cp1252")) {
+ len = junk_cp1252_to_utf8 (in, inlen, out, outlen);
+ }
+ else if (!strcasecmp (cs_in, "UTF-16LE") || !strcasecmp (cs_in, "UCS-2LE")) {
+ char *target = out;
+
+ char *aligned_in = _get_aligned_copy (in, inlen);
+ if (aligned_in != NULL) {
+ in = aligned_in;
+ }
+
+ ConversionResult result = ConvertUTF16toUTF8 ((const UTF16**)&in, (const UTF16*)(in + inlen), (UTF8**)&target, (UTF8*)(out + outlen), strictConversion);
+
+ free (aligned_in);
+
+ if (result == conversionOK) {
+ *target = 0;
+ len = target - out;
+ }
+ }
+ else if (!strcasecmp (cs_in, "UTF-16BE") || !strcasecmp (cs_in, "UCS-2BE")) {
+ // convert to big endian
+ char *temp = malloc(inlen);
+ for (int i = 0; i < inlen; i += 2) {
+ tempi = ini+1;
+ tempi+1 = ini;
+ }
+ in = temp;
+ char *target = out;
+ ConversionResult result = ConvertUTF16toUTF8 ((const UTF16**)&in, (const UTF16*)(in + inlen), (UTF8**)&target, (UTF8*)(out + outlen), strictConversion);
+ free (temp);
+ if (result == conversionOK) {
+ *target = 0;
+ len = target - out;
+ }
+ }
+ else if (!strcasecmp (cs_in, "SHIFT-JIS")) {
+ int sj_len = 0;
+ while (inlen > 0 && sj_len < outlen) {
+ if (*in > 0) {
+ *out++ = *in++;
+ inlen--;
+ sj_len++;
+ }
+ else if (inlen < 2) {
+ return -1;
+ }
+ else {
+ // find character in table
+ uint16_t c = (uint16_t)((((uint8_t*)in)0 << 8) | ((uint8_t*)in)1);
+ int i;
+ for (i = 0; sj_to_unicodei; i += 2) {
+ if (c == sj_to_unicodei) {
+ break;
+ }
+ }
+ if (sj_to_unicodei) {
+ // slow conversion!
+ char unicode_val2 = { (sj_to_unicodei+1 & 0xff00) >> 8, sj_to_unicodei+1 & 0xff };
+ char utf8_val5;
+ char *src = unicode_val, *dst = utf8_val;
+
+ ConversionResult res = ConvertUTF16toUTF8 ((const UTF16**)&src, (const UTF16 *)(src+2), (UTF8**)&dst, dst+5, strictConversion);
+ if (res == conversionOK) {
+ size_t converted_len = dst - utf8_val;
+ if (converted_len < outlen-sj_len) {
+ memcpy (out, utf8_val, converted_len);
+ out += converted_len;
+ sj_len += converted_len;
+ inlen -= 2;
+ in += 2;
+ }
+ else {
+ return -1;
+ }
+ }
+ else {
+ return -1;
+ }
+ }
+ else {
+ return -1; // error
+ }
+ }
+ }
+ }
+ else {
+ fprintf (stderr, "invalid conversion request: %s -> %s\n", cs_in, cs_out);
+ }
+ }
+ else if (!strcasecmp (cs_in, UTF8_STR)) {
+ if (!strcasecmp (cs_out, "UTF-16LE") || !strcasecmp (cs_out, "UCS-2LE")) {
+ char *target = out;
+ ConversionResult result = ConvertUTF8toUTF16 ((const UTF8**)&in, (const UTF8*)(in + inlen), (UTF16**)&target, (UTF16*)(out + outlen), strictConversion);
+ if (result == conversionOK) {
+ *target = 0;
+ *(target+1) = 0;
+ len = target - out;
+ }
+ }
+ else if (!strcasecmp (cs_out, "UTF-16BE") || !strcasecmp (cs_out, "UCS-2BE")) {
+ char *target = out;
+ ConversionResult result = ConvertUTF8toUTF16BE ((const UTF8**)&in, (const UTF8*)(in + inlen), (UTF16**)&target, (UTF16*)(out + outlen), strictConversion);
+ if (result == conversionOK) {
+ *target = 0;
+ *(target+1) = 0;
+ len = target - out;
+ }
+ }
+ else if (!strcasecmp (cs_out, "cp1252") || !strcasecmp (cs_out, "iso8859-1")) {
+ int res = junk_utf8_to_cp1252((uint8_t *)in, inlen, (uint8_t *)out, outlen);
+ if (res >= 0) {
+ len = res;
+ }
+ }
+ else if (!strcasecmp (cs_out, "ascii")) {
+ int res = junk_utf8_to_ascii((uint8_t *)in, inlen, (uint8_t *)out, outlen);
+ if (res >= 0) {
+ len = res;
+ }
+ }
+ else {
+ fprintf (stderr, "invalid conversion request: %s -> %s\n", cs_in, cs_out);
+ }
+ }
+ else {
+ fprintf (stderr, "invalid conversion request: %s -> %s\n", cs_in, cs_out);
+ }
+ trace ("\0330;31mddb_iconv: %s -> %s, in: %s, out: %s\03337;0m\n", cs_in, cs_out, in, out);
+ return (int)len;
+}
+#endif
+
+int
+junk_iconv (const char *in, int inlen, char *out, int outlen, const char *cs_in, const char *cs_out) {
+// NOTE: this function must support utf8->utf8 conversion, used for validation
+#if HAVE_ICONV
+ iconv_t cd = iconv_open (cs_out, cs_in);
+ if (cd == (iconv_t)-1) {
+ return -1;
+ }
+#if defined(__linux__) || defined(__OpenBSD__)
+ char *pin = (char*)in;
+#else
+ const char *pin = in;
+#endif
+
+ size_t inbytesleft = inlen;
+ size_t outbytesleft = outlen;
+
+ char *pout = out;
+
+ size_t res = iconv (cd, &pin, &inbytesleft, &pout, &outbytesleft);
+ int err = errno;
+ iconv_close (cd);
+
+ //trace ("iconv -f %s -t %s '%s': returned %d, inbytes %d/%d, outbytes %d/%d, errno=%d\n", cs_in, cs_out, in, (int)res, inlen, (int)inbytesleft, outlen, (int)outbytesleft, err);
+ if (res == -1) {
+ return -1;
+ }
+ outpout-out = 0;
+ //trace ("iconv out: %s (len=%d)\n", out, pout - out);
+ return pout - out;
+#elif defined(HAVE_ICU)
+ int status = 0;
+ trace ("ICU convert from %s to %s input %s\n", cs_in, cs_out, in);
+ int32_t len = ucnv_convert (cs_out, cs_in, out, outlen, in, inlen, &status);
+ outlen = 0;
+ trace ("ICU out: %s\n", out);
+ return len;
+#else
+ int len = ddb_iconv (cs_out, cs_in, out, outlen, in, inlen);
+ return len;
+#endif
+}
+
+#define ID3V1_GENRE_COUNT (sizeof(junk_genretbl) / sizeof (char *) - 1)
+static const char *junk_genretbl = {
+ "Blues",
+ "Classic Rock",
+ "Country",
+ "Dance",
+ "Disco",
+ "Funk",
+ "Grunge",
+ "Hip-Hop",
+ "Jazz",
+ "Metal",
+ "New Age",
+ "Oldies",
+ "Other",
+ "Pop",
+ "R&B",
+ "Rap",
+ "Reggae",
+ "Rock",
+ "Techno",
+ "Industrial",
+ "Alternative",
+ "Ska",
+ "Death Metal",
+ "Pranks",
+ "Soundtrack",
+ "Euro-Techno",
+ "Ambient",
+ "Trip-Hop",
+ "Vocal",
+ "Jazz+Funk",
+ "Fusion",
+ "Trance",
+ "Classical",
+ "Instrumental",
+ "Acid",
+ "House",
+ "Game",
+ "Sound Clip",
+ "Gospel",
+ "Noise",
+ "AlternRock",
+ "Bass",
+ "Soul",
+ "Punk",
+ "Space",
+ "Meditative",
+ "Instrumental Pop",
+ "Instrumental Rock",
+ "Ethnic",
+ "Gothic",
+ "Darkwave",
+ "Techno-Industrial",
+ "Electronic",
+ "Pop-Folk",
+ "Eurodance",
+ "Dream",
+ "Southern Rock",
+ "Comedy",
+ "Cult",
+ "Gangsta",
+ "Top 40",
+ "Christian Rap",
+ "Pop/Funk",
+ "Jungle",
+ "Native American",
+ "Cabaret",
+ "New Wave",
+ "Psychedelic",
+ "Rave",
+ "Showtunes",
+ "Trailer",
+ "Lo-Fi",
+ "Tribal",
+ "Acid Punk",
+ "Acid Jazz",
+ "Polka",
+ "Retro",
+ "Musical",
+ "Rock & Roll",
+ "Hard Rock",
+ "Folk",
+ "Folk-Rock",
+ "National Folk",
+ "Swing",
+ "Fast Fusion",
+ "Bebob",
+ "Latin",
+ "Revival",
+ "Celtic",
+ "Bluegrass",
+ "Avantgarde",
+ "Gothic Rock",
+ "Progressive Rock",
+ "Psychedelic Rock",
+ "Symphonic Rock",
+ "Slow Rock",
+ "Big Band",
+ "Chorus",
+ "Easy Listening",
+ "Acoustic",
+ "Humour",
+ "Speech",
+ "Chanson",
+ "Opera",
+ "Chamber Music",
+ "Sonata",
+ "Symphony",
+ "Booty Bass",
+ "Primus",
+ "Porn Groove",
+ "Satire",
+ "Slow Jam",
+ "Club",
+ "Tango",
+ "Samba",
+ "Folklore",
+ "Ballad",
+ "Power Ballad",
+ "Rhythmic Soul",
+ "Freestyle",
+ "Duet",
+ "Punk Rock",
+ "Drum Solo",
+ "Acapella",
+ "Euro-House",
+ "Dance Hall",
+ "Goa",
+ "Drum & Bass",
+ "Club-House",
+ "Hardcore",
+ "Terror",
+ "Indie",
+ "BritPop",
+ "Negerpunk",
+ "Polsk Punk",
+ "Beat",
+ "Christian Gangsta",
+ "Heavy Metal",
+ "Black Metal",
+ "Crossover",
+ "Contemporary C",
+ "Christian Rock",
+ "Merengue",
+ "Salsa",
+ "Thrash Metal",
+ "Anime",
+ "JPop",
+ "SynthPop",
+ "Abstract",
+ "Art Rock",
+ "Baroque",
+ "Bhangra",
+ "Big Beat",
+ "Breakbeat",
+ "Chillout",
+ "Downtempo",
+ "Dub",
+ "EBM",
+ "Eclectic",
+ "Electro",
+ "Electroclash",
+ "Emo",
+ "Experimental",
+ "Garage",
+ "Global",
+ "IDM",
+ "Illbient",
+ "Industro-Goth",
+ "Jam Band",
+ "Krautrock",
+ "Leftfield",
+ "Lounge",
+ "Math Rock",
+ "New Romantic",
+ "Nu-Breakz",
+ "Post-Punk",
+ "Post-Rock",
+ "Psytrance",
+ "Shoegaze",
+ "Space Rock",
+ "Trop Rock",
+ "World Music",
+ "Neoclassical",
+ "Audiobook",
+ "Audio Theatre",
+ "Neue Deutsche Welle",
+ "Podcast",
+ "Indie Rock",
+ "G-Funk",
+ "Dubstep",
+ "Garage Rock",
+ "Psybient",
+ NULL
+};
+
+static int
+can_be_cp1251 (const signed char *str, int size) {
+ if (!enable_cp1251_detection) {
+ return 0;
+ }
+ int latin = 0;
+ int rus = 0;
+ int rus_in_row = 0;
+ int max_rus_row = 0;
+ int n = 0;
+ for (; n < size; str++, n++) {
+ if ((*str >= 'A' && *str <= 'Z')
+ || (*str >= 'a' && *str <= 'z')) {
+ if (rus_in_row > max_rus_row) {
+ max_rus_row = rus_in_row;
+ }
+ rus_in_row = 0;
+ latin++;
+ }
+ else if (*str < 0) {
+ rus_in_row++;
+ rus++;
+ }
+ }
+ if (rus > latin/2 || (max_rus_row > 4)) {
+ return 1;
+ }
+ return 0;
+}
+
+static int
+can_be_chinese (const uint8_t *str, int sz) {
+ if (!enable_cp936_detection) {
+ return 0;
+ }
+ size_t len = strlen (str);
+ for (int i = 0; i < sz; str++, i++) {
+ if (i < len-3
+ && (*str >= 0x81 && *str <= 0xFE )
+ && (*(str+1) >= 0x30 && *(str+1) <= 0x39)
+ && (*(str+2) >= 0x81 && *(str+2) <= 0xFE)
+ && (*(str+3) >= 0x30 && *(str+3) <= 0x39)) {
+ return 1;
+ }
+ if (i < len - 1
+ && (*str >= 0x81 && *str <= 0xFE )
+ && ((*(str+1) >= 0x40 && *(str+1) <= 0x7E)
+ || (*(str+1) >= 0x80 && *(str+1) <= 0xFE))) {
+ return 1;
+ }
+ }
+ return 0;
+}
+
+static int
+can_be_shift_jis (const unsigned char *str, int size) {
+ if (!size) {
+ return 0;
+ }
+
+ unsigned char outsize*4;
+
+ if (size < 2) {
+ return 0;
+ }
+
+ const unsigned char *p = str;
+ int s = size;
+ while (s >= 2) {
+ if ((((p0 >= 0x81 && p0 <= 0x84) || (p0 >= 0x87 && p0 <= 0x9f))
+ && ((p1 >= 0x40 && p1 <= 0x9e) || (p1 >= 0x9f && p1 <= 0xfc)))
+ || ((p0 >= 0xe0 && p0 <= 0xef)
+ && ((p1 >= 0x40 && p1 <= 0x9e) || (p1 >= 0x9f && p1 <= 0xfc)))) {
+ break;
+ }
+ s--;
+ p++;
+ }
+
+ if (s >= 2) {
+ if (junk_iconv (str, size, out, (int)sizeof (out), "shift-jis", UTF8_STR) >= 0) {
+ return 1;
+ }
+ }
+ return 0;
+
+}
+
+
+static char *
+convstr_id3v2 (const char *sb_charset, int version, uint8_t encoding, const uint8_t *str, int sz, int *out_size) {
+ const char *enc = NULL;
+
+ // detect encoding
+ if (version == 4 && encoding == 2) {
+ enc = "UTF-16BE";
+ }
+ else if (version == 4 && encoding == 3) {
+ enc = UTF8_STR;
+ }
+ else if (encoding == 0) {
+ if (sb_charset) {
+ enc = sb_charset;
+ }
+ else if (can_be_chinese (str, sz)) {
+ // hack to add cp936 support
+ enc = "cp936";
+ }
+ else if (can_be_cp1251 (str, sz)) {
+ // hack to add limited cp1251 recoding support
+ enc = "cp1251";
+ }
+ else {
+ enc = "cp1252";
+ }
+ }
+ else if (encoding != 1 && !(version == 4 && encoding == 3)){
+ return NULL; // invalid encoding
+ }
+
+ if (encoding == 1) { // detect kind of unicode used
+ if (sz < 2) {
+ return NULL;
+ }
+ if (version < 4) {
+ if (str0 == 0xff && str1 == 0xfe) {
+ enc = "UCS-2LE";
+ str += 2;
+ sz -= 2;
+ }
+ else if (str1 == 0xff && str0 == 0xfe) {
+ enc = "UCS-2BE";
+ str += 2;
+ sz -= 2;
+ }
+ else {
+ trace ("invalid ucs-2 signature %x %x\n", (int)str0, (int)str1);
+ enc = "UCS-2LE";
+ // NOTE: this is an assumption, might break in the future.
+ }
+ }
+ else {
+ enc = "UTF-16";
+ }
+ }
+
+ trace ("encoding: %s\n", enc);
+
+ int converted_sz = 0;
+
+ int outlen = sz*4+1;
+ char *out = malloc (outlen);
+ if ((converted_sz = junk_iconv (str, sz, out, outlen, enc, UTF8_STR)) < 0) {
+ free (out);
+ return NULL;
+ }
+
+ // trim trailing linebreaks
+ while (converted_sz > 0 && (uint8_t)outconverted_sz-1 <= 32) {
+ out--converted_sz = 0;
+ }
+ if (out_size) {
+ *out_size = converted_sz;
+ }
+ return out;
+}
+
+static const char *
+convstr_id3v1 (const char* str, int sz, const char *charset, char *out, int outsize) {
+ if (!charset) {
+ return str;
+ }
+ int i;
+ for (i = 0; i < sz; i++) {
+ if (stri != ' ') {
+ break;
+ }
+ }
+ if (i == sz) {
+ out0 = 0;
+ return out;
+ }
+
+ int len = junk_iconv (str, sz, out, outsize, charset, UTF8_STR);
+ if (len >= 0) {
+ return out;
+ }
+ return NULL;
+}
+
+static void
+str_trim_right (uint8_t *str, int len) {
+ uint8_t *p = str + len - 1;
+ while (p >= str && *p <= 0x20) {
+ p--;
+ }
+ p++;
+ *p = 0;
+}
+
+int
+junk_id3v1_read_int (playItem_t *it, char *buffer, const char **charset) {
+ const char *cs = NULL;
+
+ if (!buffer) {
+ return -1;
+ }
+
+ if (it) {
+ if (memcmp (buffer, "TAG", 3)) {
+ return -1; // no tag
+ }
+ charset = &cs;
+ int res = junk_id3v1_read_int (NULL, buffer, charset);
+ if (res) {
+ return res;
+ }
+ }
+
+ if (!charset) {
+ return -1;
+ }
+
+ char title31;
+ char artist31;
+ char album31;
+ char year5;
+ char comment31;
+ uint8_t genreid;
+ uint8_t tracknum;
+ const char *genre = NULL;
+ memset (title, 0, 31);
+ memset (artist, 0, 31);
+ memset (album, 0, 31);
+ memset (year, 0, 5);
+ memset (comment, 0, 31);
+ memcpy (title, &buffer3, 30);
+ str_trim_right (title, 30);
+ memcpy (artist, &buffer3+30, 30);
+ str_trim_right (artist, 30);
+ memcpy (album, &buffer3+60, 30);
+ str_trim_right (album, 30);
+ memcpy (year, &buffer3+90, 4);
+ str_trim_right (year, 4);
+ memcpy (comment, &buffer3+94, 30);
+ str_trim_right (comment, 30);
+ genreid = buffer3+124;
+ tracknum = 0;
+ if (it) {
+ if (comment28 == 0 && comment29 != 0) {
+ tracknum = comment29;
+ }
+
+ // 255 = "None",
+ // "CR" = "Cover" (id3v2)
+ // "RX" = "Remix" (id3v2)
+ if (genreid == 0xff) {
+ //genre = "None";
+ }
+ else if (genreid < ID3V1_GENRE_COUNT) {
+ genre = junk_genretblgenreid;
+ }
+ }
+
+ // add meta
+// trace ("%s - %s - %s - %s - %s - %s\n", title, artist, album, year, comment, genre);
+ if (!it) {
+ char buf129;
+ char *p = buf;
+ strcpy (p, title);
+ p += strlen (title);
+ strcpy (p, artist);
+ p += strlen (artist);
+ strcpy (p, album);
+ p += strlen (album);
+ strcpy (p, year);
+ p += strlen (year);
+ strcpy (p, comment);
+ *charset = junk_detect_charset (buf);
+ return 0;
+ }
+
+ char utf8_value150;
+
+ if (*title) {
+ pl_add_meta (it, "title", convstr_id3v1 (title, (int)strlen (title), *charset, utf8_value, sizeof (utf8_value)));
+ }
+ if (*artist) {
+ pl_add_meta (it, "artist", convstr_id3v1 (artist, (int)strlen (artist), *charset, utf8_value, sizeof (utf8_value)));
+ }
+ if (*album) {
+ pl_add_meta (it, "album", convstr_id3v1 (album, (int)strlen (album), *charset, utf8_value, sizeof (utf8_value)));
+ }
+ if (*year) {
+ pl_add_meta (it, "year", convstr_id3v1 (year, (int)strlen (year), *charset, utf8_value, sizeof (utf8_value)));
+ }
+ if (*comment) {
+ pl_add_meta (it, "comment", convstr_id3v1 (comment, (int)strlen (comment), *charset, utf8_value, sizeof (utf8_value)));
+ }
+ if (genre && *genre) {
+ pl_add_meta (it, "genre", convstr_id3v1 (genre, (int)strlen (genre), *charset, utf8_value, sizeof (utf8_value)));
+ }
+ if (tracknum != 0) {
+ char s4;
+ snprintf (s, 4, "%d", tracknum);
+ pl_add_meta (it, "track", s);
+ }
+
+ uint32_t f = pl_get_item_flags (it);
+ f |= DDB_TAG_ID3V1;
+ pl_set_item_flags (it, f);
+
+ return 0;
+}
+
+// should read both id3v1 and id3v1.1
+int
+junk_id3v1_read (playItem_t *it, DB_FILE *fp) {
+ uint8_t id3128;
+
+ if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
+ return -1;
+ }
+ if (deadbeef->fread (id3, 1, 128, fp) != 128) {
+ return -1;
+ }
+
+ return junk_id3v1_read_int (it, id3, NULL);
+}
+
+
+static void
+id3v2_conv(playItem_t *it, const char *name, char store, size_t store_len, const char *enc) {
+ memset (store, 0x20, store_len);
+ const char *meta = pl_find_meta (it, name);
+ if (meta) {
+ char temp1000;
+ int l = junk_iconv (meta, (int)strlen (meta), temp, (int)sizeof (temp), UTF8_STR, enc);
+ if (l == -1) {
+ memset (store, 0, store_len);
+ }
+ else {
+ strncpy (store, temp, store_len);
+ }
+ for (char *cr = store; cr < store+store_len; cr++) {
+ if (*cr == '\n') {
+ *cr = 0;
+ break;
+ }
+ }
+ }
+}
+
+
+int
+junk_id3v1_write2 (int fd, playItem_t *it, const char *enc) {
+ char title30 = "";
+ char artist30 = "";
+ char album30 = "";
+ char year4 = "";
+ char comment28 = "";
+ uint8_t genreid = 0xff;
+ uint8_t tracknum = 0;
+
+ const char *meta;
+
+ pl_lock ();
+
+ id3v2_conv (it, "title", title, sizeof (title), enc);
+ id3v2_conv (it, "artist", artist, sizeof (artist), enc);
+ id3v2_conv (it, "album", album, sizeof (album), enc);
+ id3v2_conv (it, "year", year, sizeof (year), enc);
+ id3v2_conv (it, "comment", comment, sizeof (comment), enc);
+
+ // tracknum
+ meta = pl_find_meta (it, "track");
+ if (meta) {
+ tracknum = (uint8_t)min(0xff, atoi (meta));
+ }
+
+ // find genre
+ meta = pl_find_meta (it, "genre");
+ if (meta) {
+ for (int i = 0; junk_genretbli; i++) {
+ if (!strcasecmp (meta, junk_genretbli)) {
+ genreid = (uint8_t)i;
+ break;
+ }
+ }
+ // workaround for the id3v1 std spelling error
+ if (genreid == 0xff && !strcasecmp (meta, "Psychadelic")) {
+ genreid = 67;
+ }
+ }
+
+ pl_unlock ();
+
+ if (write (fd, "TAG", 3) != 3) {
+ trace ("junk_id3v1_write: failed to write signature\n");
+ return -1;
+ }
+ if (write (fd, title, sizeof (title)) != sizeof (title)) {
+ trace ("junk_id3v1_write: failed to write title\n");
+ return -1;
+ }
+ if (write (fd, artist, sizeof (artist)) != sizeof (artist)) {
+ trace ("junk_id3v1_write: failed to write artist\n");
+ return -1;
+ }
+ if (write (fd, album, sizeof (album)) != sizeof (album)) {
+ trace ("junk_id3v1_write: failed to write album\n");
+ return -1;
+ }
+ if (write (fd, year, sizeof (year)) != sizeof (year)) {
+ trace ("junk_id3v1_write: failed to write year\n");
+ return -1;
+ }
+ if (write (fd, comment, sizeof (comment)) != sizeof (comment)) {
+ trace ("junk_id3v1_write: failed to write comment\n");
+ return -1;
+ }
+ uint8_t zero = 0;
+ if (write (fd, &zero, 1) != 1) {
+ trace ("junk_id3v1_write: failed to write id3v1.1 marker\n");
+ return -1;
+ }
+ if (write (fd, &tracknum, 1) != 1) {
+ trace ("junk_id3v1_write: failed to write track\n");
+ return -1;
+ }
+ if (write (fd, &genreid, 1) != 1) {
+ trace ("junk_id3v1_write: failed to write genre\n");
+ return -1;
+ }
+ return 0;
+}
+
+int
+junk_id3v1_write (FILE *fp, playItem_t *it, const char *enc) {
+ char title30 = "";
+ char artist30 = "";
+ char album30 = "";
+ char year4 = "";
+ char comment28 = "";
+ uint8_t genreid = 0xff;
+ uint8_t tracknum = 0;
+
+ const char *meta;
+
+ pl_lock ();
+
+ id3v2_conv (it, "title", title, sizeof (title), enc);
+ id3v2_conv (it, "artist", artist, sizeof (artist), enc);
+ id3v2_conv (it, "album", album, sizeof (album), enc);
+ id3v2_conv (it, "year", year, sizeof (year), enc);
+ id3v2_conv (it, "comment", comment, sizeof (comment), enc);
+
+ // tracknum
+ meta = pl_find_meta (it, "track");
+ if (meta) {
+ tracknum = (uint8_t)min(0xff, atoi (meta));
+ }
+
+ // find genre
+ meta = pl_find_meta (it, "genre");
+ if (meta) {
+ for (int i = 0; junk_genretbli; i++) {
+ if (!strcasecmp (meta, junk_genretbli)) {
+ genreid = (uint8_t)i;
+ break;
+ }
+ }
+ // workaround for the id3v1 std spelling error
+ if (genreid == 0xff && !strcasecmp (meta, "Psychadelic")) {
+ genreid = 67;
+ }
+ }
+
+ pl_unlock ();
+
+ if (fwrite ("TAG", 1, 3, fp) != 3) {
+ trace ("junk_id3v1_write: failed to write signature\n");
+ return -1;
+ }
+ if (fwrite (title, 1, sizeof (title), fp) != sizeof (title)) {
+ trace ("junk_id3v1_write: failed to write title\n");
+ return -1;
+ }
+ if (fwrite (artist, 1, sizeof (artist), fp) != sizeof (artist)) {
+ trace ("junk_id3v1_write: failed to write artist\n");
+ return -1;
+ }
+ if (fwrite (album, 1, sizeof (album), fp) != sizeof (album)) {
+ trace ("junk_id3v1_write: failed to write album\n");
+ return -1;
+ }
+ if (fwrite (year, 1, sizeof (year), fp) != sizeof (year)) {
+ trace ("junk_id3v1_write: failed to write year\n");
+ return -1;
+ }
+ if (fwrite (comment, 1, sizeof (comment), fp) != sizeof (comment)) {
+ trace ("junk_id3v1_write: failed to write comment\n");
+ return -1;
+ }
+ uint8_t zero = 0;
+ if (fwrite (&zero, 1, 1, fp) != 1) {
+ trace ("junk_id3v1_write: failed to write id3v1.1 marker\n");
+ return -1;
+ }
+ if (fwrite (&tracknum, 1, 1, fp) != 1) {
+ trace ("junk_id3v1_write: failed to write track\n");
+ return -1;
+ }
+ if (fwrite (&genreid, 1, 1, fp) != 1) {
+ trace ("junk_id3v1_write: failed to write genre\n");
+ return -1;
+ }
+ return 0;
+}
+
+int64_t
+junk_id3v1_find2 (DB_FILE *fp) {
+ uint8_t buffer3;
+ if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
+ return -1;
+ }
+ if (deadbeef->fread (buffer, 1, 3, fp) != 3) {
+ return -1;
+ }
+ if (memcmp (buffer, "TAG", 3)) {
+ return -1; // no tag
+ }
+ return deadbeef->ftell (fp) - 3;
+}
+
+int
+junk_id3v1_find (DB_FILE *fp) {
+ int64_t pos = junk_id3v1_find2 (fp);
+ // 32 bit overflow protection
+ if (pos > 0x7fffffff) {
+ return -1;
+ }
+ return (int)pos;
+}
+
+int64_t
+junk_apev2_find2 (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems) {
+ uint8_t header32;
+ if (deadbeef->fseek (fp, -32, SEEK_END) == -1) {
+ return -1; // something bad happened
+ }
+
+ if (deadbeef->fread (header, 1, 32, fp) != 32) {
+ return -1; // something bad happened
+ }
+ if (strncmp (header, "APETAGEX", 8)) {
+ // try to skip 128 bytes backwards (id3v1)
+ if (deadbeef->fseek (fp, -128-32, SEEK_END) == -1) {
+ return -1; // something bad happened
+ }
+ if (deadbeef->fread (header, 1, 32, fp) != 32) {
+ return -1; // something bad happened
+ }
+ if (strncmp (header, "APETAGEX", 8)) {
+ return -1; // no ape tag here
+ }
+ }
+
+ // FIXME: version needs to be checked?
+ uint32_t version = extract_i32_le (&header8);
+#pragma unused(version)
+ int32_t size = extract_i32_le (&header12);
+ uint32_t numitems = extract_i32_le (&header16);
+ uint32_t flags = extract_i32_le (&header20);
+
+ trace ("APEv%d, size=%d, items=%d, flags=%x\n", version, size, numitems, flags);
+
+ // size contains footer, but not header, so add header size
+ if (flags & (1<<31)) {
+ size += 32;
+ }
+
+ // seek to beginning of the tag/header
+ if (deadbeef->fseek (fp, -size, SEEK_CUR) == -1) {
+ trace ("failed to seek to tag start (-%d)\n", size);
+ return -1;
+ }
+ *psize = size;
+ *pflags = flags;
+ *pnumitems = numitems;
+ return deadbeef->ftell (fp);
+}
+
+int
+junk_apev2_find (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems) {
+ int64_t pos = junk_apev2_find2 (fp, psize, pflags, pnumitems);
+ // 32 bit overflow protection
+ if (pos > 0x7fffffff) {
+ return -1;
+ }
+ return (int)pos;
+}
+
+int
+junk_find_id3v1 (DB_FILE *fp) {
+ if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
+ return -1;
+ }
+ char buffer3;
+ if (deadbeef->fread (buffer, 1, 3, fp) != 3) {
+ return -1;
+ }
+ if (memcmp (buffer, "TAG", 3)) {
+ return -1; // no tag
+ }
+ return (int)(deadbeef->ftell (fp) - 3);
+}
+
+int
+junk_add_track_meta (playItem_t *it, const char *track) {
+ char *slash = strchr (track, '/');
+ if (slash) {
+ // split into track/number
+ *slash = 0;
+ slash++;
+ pl_add_meta (it, "numtracks", slash);
+ }
+ pl_add_meta (it, "track", track);
+ return 0;
+}
+
+int
+junk_add_disc_meta (playItem_t *it, const char *disc) {
+ char *slash = strchr (disc, '/');
+ if (slash) {
+ // split into disc/number
+ *slash = 0;
+ slash++;
+ pl_add_meta (it, "numdiscs", slash);
+ }
+ pl_add_meta (it, "disc", disc);
+ return 0;
+}
+
+int
+junk_apev2_add_frame (playItem_t *it, DB_apev2_tag_t *tag_store, DB_apev2_frame_t **tail, uint32_t itemsize, uint32_t itemflags, const char *key, const uint8_t *value) {
+ if (tag_store) {
+ DB_apev2_frame_t *frm = malloc (sizeof (DB_apev2_frame_t) + itemsize);
+ memset (frm, 0, sizeof (DB_apev2_tag_t));
+ frm->flags = itemflags;
+ strcpy (frm->key, key);
+ trace ("*** stored frame %s flags %X\n", key, itemflags);
+ frm->size = itemsize;
+ memcpy (frm->data, value, itemsize);
+ if (*tail) {
+ (*tail)->next = frm;
+ }
+ else {
+ tag_store->frames = frm;
+ }
+ *tail = frm;
+ }
+
+ if (it) {
+ int valuetype = ((itemflags >> 1) & 3);
+ // add metainfo only if it's textual
+ if (valuetype == 0 && (itemsize < MAX_TEXT_FRAME_SIZE || (!strcasecmp (key, "cuesheet") && itemsize < MAX_CUESHEET_FRAME_SIZE))) {
+ if (!u8_valid (value, itemsize, NULL)) {
+ trace ("junk_read_ape_full: bad encoding in text frame %s\n", key);
+ return -1;
+ }
+
+ int m;
+ for (m = 0; frame_mappingm; m += FRAME_MAPPINGS) {
+ if (frame_mappingm + MAP_APEV2 && !strcasecmp (key, frame_mappingm + MAP_APEV2)) {
+ if (!strcmp (frame_mappingm+MAP_DDB, "track")) {
+ junk_add_track_meta (it, value);
+ }
+ else if (!strcmp (frame_mappingm+MAP_DDB, "disc")) {
+ junk_add_disc_meta (it, value);
+ }
+ else {
+ trace ("pl_append_meta %s %s\n", frame_mappingm+MAP_DDB, value);
+ pl_append_meta_full (it, frame_mappingm+MAP_DDB, value, itemsize+1);
+ }
+ break;
+ }
+ }
+
+ trace ("apev2 %s=%s\n", key, value);
+
+ if (!frame_mappingm) {
+ if (!strncasecmp (key, "replaygain_album_gain", 21)) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, (float)atof (value));
+ trace ("album_gain=%s\n", value);
+ }
+ else if (!strncasecmp (key, "replaygain_album_peak", 21)) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, (float)atof (value));
+ trace ("album_peak=%s\n", value);
+ }
+ else if (!strncasecmp (key, "replaygain_track_gain", 21)) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, (float)atof (value));
+ trace ("track_gain=%s\n", value);
+ }
+ else if (!strncasecmp (key, "replaygain_track_peak", 21)) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, (float)atof (value));
+ trace ("track_peak=%s\n", value);
+ }
+ else {
+ trace ("%s=%s\n", key, value);
+ pl_append_meta_full (it, key, value, itemsize+1);
+ }
+ }
+ }
+ }
+ return 0;
+}
+
+int
+junk_apev2_read_full_mem (playItem_t *it, DB_apev2_tag_t *tag_store, char *mem, int memsize) {
+ char *end = mem+memsize;
+#define STEP(x,y) {mem+=(x);if(mem+(y)>end) {trace ("fail %d\n", (x));return -1;}}
+
+ char *header = mem;
+
+ DB_apev2_frame_t *tail = NULL;
+
+ // FIXME: version needs to be checked?
+ uint32_t version = extract_i32_le (&header0);
+ int32_t size = extract_i32_le (&header4);
+ uint32_t numitems = extract_i32_le (&header8);
+ uint32_t flags = extract_i32_le (&header12);
+#pragma unused(version)
+#pragma unused(size)
+#pragma unused(flags)
+
+ trace ("APEv%d, size=%d, items=%d, flags=%x\n", version, size, numitems, flags);
+ if (it) {
+ uint32_t f = pl_get_item_flags (it);
+ f |= DDB_TAG_APEV2;
+ pl_set_item_flags (it, f);
+ }
+
+ STEP(24, 8);
+
+ int i;
+ for (i = 0; i < numitems; i++) {
+ trace ("reading item %d\n", i);
+ uint8_t *buffer = mem;
+
+ uint32_t itemsize = extract_i32_le (&buffer0);
+ uint32_t itemflags = extract_i32_le (&buffer4);
+
+ STEP(8, 1);
+ trace ("size=%d, flags=%x\n", itemsize, itemflags);
+
+ // read key until 0 (stupid and slow)
+ char key256;
+ int keysize = 0;
+ while (keysize <= 255 && mem < end) {
+ keykeysize = *mem;
+ mem++;
+ if (keykeysize == 0) {
+ break;
+ }
+ if (keykeysize < 0x20) {
+ trace ("nonascii chars\n");
+ return -1; // non-ascii chars and chars with codes 0..0x1f not allowed in ape item keys
+ }
+ keysize++;
+ }
+ key255 = 0;
+ trace ("item %d, size %d, flags %08x, keysize %d, key %s\n", i, itemsize, itemflags, keysize, key);
+ // read value
+ if (itemsize <= MAX_APEV2_FRAME_SIZE) // just a sanity check
+ {
+ STEP(0,itemsize);
+ uint8_t *value = malloc (itemsize+1);
+ if (!value) {
+ trace ("junk_read_ape_full: failed to allocate %d bytes\n", itemsize+1);
+ return -1;
+ }
+ memcpy (value, mem, itemsize);
+ valueitemsize = 0;
+
+ junk_apev2_add_frame (it, tag_store, &tail, itemsize, itemflags, key, value);
+
+ free (value);
+ STEP(itemsize, 8);
+ }
+ else {
+ STEP(itemsize,8);
+ }
+ }
+ return 0;
+}
+
+int
+junk_apev2_read_full (playItem_t *it, DB_apev2_tag_t *tag_store, DB_FILE *fp) {
+ // try to read footer, position must be already at the EOF right before
+ // id3v1 (if present)
+
+ DB_apev2_frame_t *tail = NULL;
+
+ uint8_t header32;
+ if (deadbeef->fseek (fp, -32, SEEK_END) == -1) {
+ return -1; // something bad happened
+ }
+
+ if (deadbeef->fread (header, 1, 32, fp) != 32) {
+ return -1; // something bad happened
+ }
+ if (strncmp (header, "APETAGEX", 8)) {
+ // try to skip 128 bytes backwards (id3v1)
+ if (deadbeef->fseek (fp, -128-32, SEEK_END) == -1) {
+ return -1; // something bad happened
+ }
+ if (deadbeef->fread (header, 1, 32, fp) != 32) {
+ return -1; // something bad happened
+ }
+ if (strncmp (header, "APETAGEX", 8)) {
+ return -1; // no ape tag here
+ }
+ }
+
+ // end of footer must be 0
+// if (memcmp (&header24, "\0\0\0\0\0\0\0\0", 8)) {
+// trace ("bad footer\n");
+// return -1;
+// }
+
+ // FIXME: version needs to be checked?
+ uint32_t version = extract_i32_le (&header8);
+ int32_t size = extract_i32_le (&header12);
+ uint32_t numitems = extract_i32_le (&header16);
+ uint32_t flags = extract_i32_le (&header20);
+ #pragma unused(version)
+ #pragma unused(flags)
+
+ trace ("APEv%d, size=%d, items=%d, flags=%x\n", version, size, numitems, flags);
+ if (it) {
+ uint32_t f = pl_get_item_flags (it);
+ f |= DDB_TAG_APEV2;
+ pl_set_item_flags (it, f);
+ }
+
+ // now seek to beginning of the tag (excluding header)
+ if (deadbeef->fseek (fp, -size, SEEK_CUR) == -1) {
+ trace ("failed to seek to tag start (-%d)\n", size);
+ return -1;
+ }
+
+ int i;
+ for (i = 0; i < numitems; i++) {
+ uint8_t buffer8;
+ if (deadbeef->fread (buffer, 1, 8, fp) != 8) {
+ return -1;
+ }
+ uint32_t itemsize = extract_i32_le (&buffer0);
+ uint32_t itemflags = extract_i32_le (&buffer4);
+
+ // read key until 0 (stupid and slow)
+ char key256;
+ int keysize = 0;
+ while (keysize <= 255) {
+ if (deadbeef->fread (&keykeysize, 1, 1, fp) != 1) {
+ return -1;
+ }
+ if (keykeysize == 0) {
+ break;
+ }
+ if (keykeysize < 0x20) {
+ return -1; // non-ascii chars and chars with codes 0..0x1f not allowed in ape item keys
+ }
+ keysize++;
+ }
+ key255 = 0;
+ trace ("item %d, size %d, flags %08x, keysize %d, key %s\n", i, itemsize, itemflags, keysize, key);
+ // read value
+ if (itemsize <= MAX_APEV2_FRAME_SIZE) // just a sanity check
+ {
+ uint8_t *value = malloc (itemsize+1);
+ if (!value) {
+ trace ("junk_read_ape_full: failed to allocate %d bytes\n", itemsize+1);
+ return -1;
+ }
+ if (deadbeef->fread (value, 1, itemsize, fp) != itemsize) {
+ trace ("junk_read_ape_full: failed to read %d bytes from file\n", itemsize);
+ free (value);
+ return -1;
+ }
+ valueitemsize = 0;
+
+ junk_apev2_add_frame (it, tag_store, &tail, itemsize, itemflags, key, value);
+ free (value);
+ }
+ else {
+ // try to skip
+ int err = deadbeef->fseek (fp, itemsize, SEEK_CUR);
+ if (0 != err) {
+ perror ("junklib: corrupted APEv2 tag\n");
+ return -1;
+ }
+ }
+ }
+
+ return 0;
+}
+
+int
+junk_apev2_read (playItem_t *it, DB_FILE *fp) {
+ return junk_apev2_read_full (it, NULL, fp);
+}
+
+int
+junk_apev2_read_mem (playItem_t *it, char *mem, int size) {
+ return junk_apev2_read_full_mem (it, NULL, mem, size);
+}
+
+int
+junk_id3v2_find (DB_FILE *fp, int *psize) {
+ if (deadbeef->fseek (fp, 0, SEEK_SET) == -1) {
+ trace ("junk_id3v2_find: seek error\n");
+ return -1;
+ }
+ uint8_t header10;
+ int64_t pos = deadbeef->ftell (fp);
+ if (pos == -1) {
+ trace ("junk_id3v2_find: ftell error\n");
+ return -1;
+ }
+ if (deadbeef->fread (header, 1, 10, fp) != 10) {
+ trace ("junk_id3v2_find: read error\n");
+ return -1; // too short
+ }
+ if (strncmp (header, "ID3", 3)) {
+ return -1; // no tag
+ }
+ uint8_t flags = header5;
+ if (flags & 15) {
+ return -1; // unsupported
+ }
+ int footerpresent = (flags & (1<<4)) ? 1 : 0;
+ // check for bad size
+ if ((header9 & 0x80) || (header8 & 0x80) || (header7 & 0x80) || (header6 & 0x80)) {
+ return -1; // bad header
+ }
+ uint32_t size = (header9 << 0) | (header8 << 7) | (header7 << 14) | (header6 << 21);
+ //trace ("junklib: leading junk size %d\n", size);
+ *psize = size + 10 + 10 * footerpresent;
+ return (int)pos;
+}
+
+int
+junk_get_leading_size_stdio (FILE *fp) {
+ uint8_t header10;
+ size_t pos = ftell (fp);
+ if (fread (header, 1, 10, fp) != 10) {
+ fseek (fp, pos, SEEK_SET);
+ return 0; // too short
+ }
+ fseek (fp, pos, SEEK_SET);
+ if (strncmp (header, "ID3", 3)) {
+ return 0; // no tag
+ }
+ uint8_t flags = header5;
+ if (flags & 15) {
+ return 0; // unsupported
+ }
+ int footerpresent = (flags & (1<<4)) ? 1 : 0;
+ // check for bad size
+ if ((header9 & 0x80) || (header8 & 0x80) || (header7 & 0x80) || (header6 & 0x80)) {
+ return 0; // bad header
+ }
+ uint32_t size = (header9 << 0) | (header8 << 7) | (header7 << 14) | (header6 << 21);
+ //trace ("junklib: leading junk size %d\n", size);
+ return size + 10 + 10 * footerpresent;
+}
+
+int
+junk_get_leading_size (DB_FILE *fp) {
+ uint8_t header10;
+ int64_t pos = deadbeef->ftell (fp);
+ if (deadbeef->fread (header, 1, 10, fp) != 10) {
+ deadbeef->fseek (fp, pos, SEEK_SET);
+ trace ("junk_get_leading_size: file is too short\n");
+ return 0; // too short
+ }
+ deadbeef->fseek (fp, pos, SEEK_SET);
+ if (strncmp (header, "ID3", 3)) {
+ trace ("junk_get_leading_size: no id3v2 found\n");
+ return 0; // no tag
+ }
+ uint8_t flags = header5;
+ if (flags & 15) {
+ trace ("unsupported flags in id3v2\n");
+ return 0; // unsupported
+ }
+ int footerpresent = (flags & (1<<4)) ? 1 : 0;
+ // check for bad size
+ if ((header9 & 0x80) || (header8 & 0x80) || (header7 & 0x80) || (header6 & 0x80)) {
+ trace ("bad header in id3v2\n");
+ return 0; // bad header
+ }
+ uint32_t size = (header9 << 0) | (header8 << 7) | (header7 << 14) | (header6 << 21);
+ //trace ("junklib: leading junk size %d\n", size);
+ return size + 10 + 10 * footerpresent;
+}
+
+int
+junk_get_tail_size (DB_FILE *fp) {
+ int offs = 0;
+ int64_t pos = deadbeef->ftell (fp);
+
+ // id3v1 check
+ if (deadbeef->fseek (fp, -128, SEEK_END) == -1) {
+ return -1;
+ }
+ char buf3;
+ if (deadbeef->fread (buf, 1, 3, fp) != 3) {
+ return -1;
+ }
+ if (!memcmp (buf, "TAG", 3)) {
+ // id3v1 found
+ offs = 128;
+ }
+
+ // apev2 check
+ uint8_t header32;
+ if (deadbeef->fseek (fp, -32-offs, SEEK_END) == -1) {
+ return -1; // something bad happened
+ }
+
+ if (deadbeef->fread (header, 1, 32, fp) != 32) {
+ return -1; // something bad happened
+ }
+
+ // restore original offs
+ deadbeef->fseek (fp, pos, SEEK_SET);
+ if (strncmp (header, "APETAGEX", 8)) {
+ // no apev2
+ return offs;
+ }
+
+ // FIXME: version needs to be checked?
+ uint32_t version = extract_i32_le (&header8);
+ int32_t size = extract_i32_le (&header12);
+ uint32_t numitems = extract_i32_le (&header16);
+ uint32_t flags = extract_i32_le (&header20);
+#pragma unused(version)
+#pragma unused(numitems)
+#pragma unused(flags)
+
+ return offs + size;
+}
+
+void
+junk_get_tag_offsets (DB_FILE *fp, uint32_t *head, uint32_t *tail) {
+ int ihead = junk_get_leading_size(fp);
+ int itail = junk_get_tail_size (fp);
+ if (ihead < 0) {
+ ihead = 0;
+ }
+ if (itail < 0) {
+ itail = 0;
+ }
+ *head = ihead;
+ *tail = itail;
+}
+
+int
+junk_id3v2_unsync (uint8_t *out, int len, int maxlen) {
+ uint8_t buf maxlen;
+ uint8_t *p = buf;
+ int res = -1;
+ for (int i = 0; i < len; i++) {
+ *p++ = outi;
+ if (i < len - 1 && outi == 0xff && (outi+1 & 0xe0) == 0xe0) {
+ *p++ = 0;
+ res = 0;
+ }
+ }
+ if (!res) {
+ res = (int)(p-buf);
+ memcpy (out, buf, res);
+ }
+ return res;
+}
+
+int
+junk_id3v2_remove_frames (DB_id3v2_tag_t *tag, const char *frame_id) {
+ DB_id3v2_frame_t *prev = NULL;
+ for (DB_id3v2_frame_t *f = tag->frames; f; ) {
+ DB_id3v2_frame_t *next = f->next;
+ if (!strcmp (f->id, frame_id)) {
+ if (prev) {
+ prev->next = f->next;
+ }
+ else {
+ tag->frames = f->next;
+ }
+ free (f);
+ }
+ else {
+ prev = f;
+ }
+ f = next;
+ }
+ return 0;
+}
+
+static DB_id3v2_frame_t *
+junk_id3v2_append_frame (DB_id3v2_tag_t *tag, DB_id3v2_frame_t *f) {
+ DB_id3v2_frame_t *tail;
+ for (tail = tag->frames; tail && tail->next; tail = tail->next);
+ if (tail) {
+ tail->next = f;
+ }
+ else {
+ tag->frames = f;
+ }
+ return f;
+}
+
+DB_id3v2_frame_t *
+junk_id3v2_add_text_frame2 (DB_id3v2_tag_t *tag, const char *frame_id, const char *value, size_t inlen) {
+ // copy value to handle multiline strings
+ if (!inlen) {
+ return NULL;
+ }
+ uint8_t *out = NULL;
+
+ trace ("junklib: setting id3v2.%d text frame '%s' = '%s'\n", tag->version0, frame_id, value);
+
+ uint8_t encoding = 0;
+
+ int outlen = -1;
+ if (tag->version0 == 4) {
+ outlen = (int)inlen;
+ out = (uint8_t *)value;
+ encoding = 3;
+ }
+ else {
+ size_t bufsize = inlen * 4 + 1;
+ out = malloc (bufsize);
+ outlen = junk_iconv (value, (int)inlen, out, (int)bufsize, UTF8_STR, "cp1252");
+ if (outlen == -1) {
+ outlen = junk_iconv (value, (int)inlen, out+2, (int)(bufsize - 2), UTF8_STR, "UCS-2LE");
+ if (outlen <= 0) {
+ return NULL;
+ }
+ out0 = 0xff;
+ out1 = 0xfe;
+ outlen += 2;
+ trace ("successfully converted to ucs-2le (size=%d, bom: %x %x)\n", (int)outlen, out0, out1);
+ encoding = 1;
+ }
+ else {
+ trace ("successfully converted to cp1252 (size=%d)\n", (int)outlen);
+ }
+ }
+
+ // make a frame
+ size_t size = outlen + 1;
+ trace ("calculated frame size = %d\n", size);
+ DB_id3v2_frame_t *f = malloc (size + sizeof (DB_id3v2_frame_t));
+ memset (f, 0, sizeof (DB_id3v2_frame_t));
+ strcpy (f->id, frame_id);
+ f->size = (int)size;
+ f->data0 = encoding;
+ memcpy (f->data + 1, out, outlen);
+
+ if (tag->version0 != 4) {
+ free (out);
+ }
+
+ return junk_id3v2_append_frame(tag, f);
+}
+
+DB_id3v2_frame_t *
+junk_id3v2_add_text_frame (DB_id3v2_tag_t *tag, const char *frame_id, const char *value) {
+ return junk_id3v2_add_text_frame2 (tag, frame_id, value, strlen (value));
+}
+
+static void
+_id3v2_append_combined_text_frame_from_meta (DB_id3v2_tag_t *id3v2, const char *key, DB_metaInfo_t *meta) {
+ int out_size;
+
+ int needs_free;
+
+ const char *tag_value;
+ if (id3v2->version0 == 4) {
+ tag_value = _get_combined_meta_value (meta, &out_size, "\0", 1, &needs_free);
+ }
+ else if (id3v2->version0 == 3) {
+ tag_value = _get_combined_meta_value (meta, &out_size, " / ", 3, &needs_free);
+ }
+ else {
+ assert (0);
+ }
+ junk_id3v2_add_text_frame2 (id3v2, key, tag_value, out_size);
+
+ if (needs_free) {
+ free ((char *)tag_value);
+ }
+}
+
+DB_id3v2_frame_t *
+junk_id3v2_add_comment_frame (DB_id3v2_tag_t *tag, const char *frame_id, const char *lang, const char *descr, const char *value) {
+ trace ("junklib: setting 2.3 %s frame lang=%s, descr='%s', data='%s'\n", frame_id, lang, descr, value);
+
+ // make a frame
+ size_t descrlen = strlen (descr);
+ size_t outlen = strlen (value);
+
+ size_t inputsize = descrlen+outlen+1;
+ char *input = malloc (inputsize);
+
+ memcpy (input, descr, descrlen);
+ inputdescrlen = 0;
+ memcpy (input+descrlen+1, value, outlen);
+
+ size_t buffersize = inputsize * 4;
+ char *buffer = malloc (buffersize);
+
+ uint8_t enc = 0;
+ int l;
+
+ if (tag->version0 == 4) {
+ // utf8
+ enc = 3;
+ memcpy (buffer, input, inputsize);
+ l = (int)inputsize;
+ }
+ else {
+ l = junk_iconv (input, (int)inputsize, buffer, (int)buffersize, UTF8_STR, "cp1252");
+ if (l <= 0) {
+ l = junk_iconv (input, (int)inputsize, buffer+2, (int)buffersize - 2, UTF8_STR, "UCS-2LE");
+ if (l <= 0) {
+ trace ("failed to encode to ucs2 or cp1252\n");
+ free (input);
+ free (buffer);
+ return NULL;
+ }
+ else {
+ enc = 1;
+ buffer0 = 0xff;
+ buffer1 = 0xfe;
+ l += 2;
+ }
+ }
+ }
+
+ free (input);
+
+ trace ("calculated frame size = %d\n", l + 4);
+ DB_id3v2_frame_t *f = malloc (l + 4 + sizeof (DB_id3v2_frame_t));
+ memset (f, 0, sizeof (DB_id3v2_frame_t));
+ strcpy (f->id, frame_id);
+ // flags are all zero
+ f->size = (int)(l + 4);
+ f->data0 = enc; // encoding=utf8
+ memcpy (&f->data1, lang, 3);
+ memcpy (&f->data4, buffer, l);
+
+ free (buffer);
+
+ return junk_id3v2_append_frame(tag, f);
+}
+
+int
+junk_id3v2_remove_txxx_frame (DB_id3v2_tag_t *tag, const char *key) {
+ DB_id3v2_frame_t *prev = NULL;
+ for (DB_id3v2_frame_t *f = tag->frames; f; ) {
+ DB_id3v2_frame_t *next = f->next;
+ if (!strcmp (f->id, "TXXX")) {
+ char *txx = convstr_id3v2 (NULL, tag->version0, f->data0, f->data+1, f->size-1, NULL);
+ if (txx && !strncasecmp (txx, key, strlen (key))) {
+ if (prev) {
+ prev->next = f->next;
+ }
+ else {
+ tag->frames = f->next;
+ }
+ free (f);
+ }
+ if (txx) {
+ free (txx);
+ }
+ }
+ else {
+ prev = f;
+ }
+ f = next;
+ }
+ return 0;
+}
+
+int
+junk_id3v2_remove_all_txxx_frames (DB_id3v2_tag_t *tag) {
+ DB_id3v2_frame_t *prev = NULL;
+ for (DB_id3v2_frame_t *f = tag->frames; f; ) {
+ DB_id3v2_frame_t *next = f->next;
+ if (!strcmp (f->id, "TXXX")) {
+ if (prev) {
+ prev->next = f->next;
+ }
+ else {
+ tag->frames = f->next;
+ }
+ free (f);
+ }
+ else {
+ prev = f;
+ }
+ f = next;
+ }
+ return 0;
+}
+
+static DB_id3v2_frame_t *
+junk_id3v2_add_txxx_frame (DB_id3v2_tag_t *tag, const char *key, const char *value, size_t valuelen) {
+ size_t keylen = strlen (key);
+ size_t len = keylen + valuelen + 1;
+ uint8_t bufferlen;
+ memcpy (buffer, key, keylen);
+ bufferkeylen = 0;
+ memcpy (buffer+keylen+1, value, valuelen);
+
+ size_t outsize = (keylen + valuelen) * 4 + 1;
+ uint8_t *out = malloc (outsize);
+
+ uint8_t encoding = 0;
+
+ int res;
+
+ if (tag->version0 == 4) {
+ res = (int)len;
+ encoding = 3;
+ memcpy (out, key, keylen);
+ outkeylen = 0;
+ memcpy (out + keylen + 1, value, valuelen);
+ }
+ else { // version 3
+ res = junk_iconv (buffer, (int)len, out, (int)outsize, UTF8_STR, "iso8859-1");
+ if (res == -1) {
+ res = junk_iconv (buffer, (int)len, out+2, (int)(outsize - 2), UTF8_STR, "UCS-2LE");
+ if (res == -1) {
+ return NULL;
+ }
+ out0 = 0xff;
+ out1 = 0xfe;
+ res += 2;
+ trace ("successfully converted to ucs-2le (size=%d, bom: %x %x)\n", res, out0, out1);
+ encoding = 1;
+ }
+ else {
+ trace ("successfully converted to cp1252 (size=%d)\n", res);
+ }
+ }
+
+ // make a frame
+ size_t size = res + 1;
+ trace ("calculated frame size = %d\n", size);
+ DB_id3v2_frame_t *f = malloc (size + sizeof (DB_id3v2_frame_t));
+ memset (f, 0, sizeof (DB_id3v2_frame_t));
+ strcpy (f->id, "TXXX");
+ f->size = (int)size;
+ f->data0 = encoding;
+ memcpy (&f->data1, out, res);
+
+ junk_id3v2_append_frame(tag, f);
+
+ free (out);
+
+ return f;
+}
+
+// TODO: some non-Txxx frames might still need charset conversion
+// TODO: 2.4 TDTG frame (tagging time) should not be converted, but might be useful to create it
+int
+junk_id3v2_convert_24_to_23 (DB_id3v2_tag_t *tag24, DB_id3v2_tag_t *tag23) {
+ DB_id3v2_frame_t *f24;
+ DB_id3v2_frame_t *tail = tag23->frames;
+ assert (tag24->version0 == 4);
+ tag23->version0 = 3;
+ tag23->version1 = 0;
+
+ while (tail && tail->next) {
+ tail = tail->next;
+ }
+
+ const char *copy_frames = {
+ "AENC", "APIC",
+ "COMR", "ENCR",
+ "ETCO", "GEOB", "GRID",
+ "LINK", "MCDI", "MLLT", "OWNE", "PRIV",
+ "POPM", "POSS", "RBUF",
+ "RVRB",
+ "SYLT", "SYTC",
+ "UFID", "USER", "USLT",
+ NULL
+ };
+
+ // NOTE: 2.4 ASPI, EQU2, RVA2, SEEK, SIGN are discarded for 2.3
+ // NOTE: 2.4 PCNT is discarded because it is useless
+ // NOTE: all Wxxx frames are copy_frames, handled as special case
+
+
+ // "TDRC" TDAT with conversion from ID3v2-strct timestamp to DDMM format
+ // "TDOR" TORY with conversion from ID3v2-strct timestamp to year
+ // TODO: "TIPL" IPLS with conversion to non-text format
+
+ const char *text_frames = {
+ "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TEXT", "TFLT", "TIT1", "TIT2", "TIT3", "TKEY", "TLAN", "TLEN", "TMED", "TOAL", "TOFN", "TOLY", "TOPE", "TOWN", "TPE1", "TPE2", "TPE3", "TPE4", "TPOS", "TPUB", "TRCK", "TRSN", "TRSO", "TSRC", "TSSE", "TSST", "TXXX", "TDRC", NULL
+ };
+
+ for (f24 = tag24->frames; f24; f24 = f24->next) {
+ DB_id3v2_frame_t *f23 = NULL;
+ // we are altering the tag, so check for tag alter preservation
+ if (tag24->flags & (1<<6)) {
+ continue; // discard the frame
+ }
+
+ int simplecopy = 0; // means format is the same in 2.3 and 2.4
+ int text = 0; // means this is a text frame
+
+ int i;
+
+ if (f24->id0 == 'W') { // covers all W000..WZZZ tags
+ simplecopy = 1;
+ }
+
+ if (!simplecopy) {
+ for (i = 0; copy_framesi; i++) {
+ if (!strcmp (f24->id, copy_framesi)) {
+ simplecopy = 1;
+ break;
+ }
+ }
+ }
+
+ if (!simplecopy) {
+ // check if this is a text frame
+ for (i = 0; text_framesi; i++) {
+ if (!strcmp (f24->id, text_framesi)) {
+ text = 1;
+ break;
+ }
+ }
+ }
+
+
+ if (!simplecopy && !text) {
+ if (!strcmp (f24->id, "COMM") || !strcmp (f24->id, "USLT")) {
+ uint8_t enc = f24->data0;
+ char lang4 = {f24->data1, f24->data2, f24->data3, 0};
+ trace ("COMM enc is: %d\n", (int)enc);
+ trace ("COMM language is: %s\n", lang);
+
+ int outsize = 0;
+ char *descr = convstr_id3v2 (NULL, 4, enc, f24->data+4, f24->size-4, &outsize);
+ if (!descr) {
+ trace ("failed to decode COMM frame, probably wrong encoding (%d)\n", enc);
+ }
+ else {
+ // find value
+ char *value = descr;
+ while (*value && outsize-- > 0) {
+ value++;
+ }
+ if (*value != 0) {
+ trace ("failed to parse COMM frame, descr was \"%s\"\n", descr);
+ }
+ else {
+ *value = 0;
+ value++;
+ f23 = junk_id3v2_add_comment_frame (tag23, f24->id, lang, descr, value);
+ if (f23) {
+ tail = f23;
+ f23 = NULL;
+ }
+ }
+ free (descr);
+ }
+ }
+ continue; // unknown frame
+ }
+
+ // convert flags
+ uint8_t flags2;
+ // 1st byte (status flags) is the same, but shifted by 1 bit to the left
+ flags0 = (uint8_t)(f24->flags0 << 1);
+ 
+ // 2nd byte (format flags) is quite different
+ // 2.4 format is %0h00kmnp (6:grouping, 3:compression, 2:encryption, 1:unsync, 0:datalen)
+ // 2.3 format is %ijk00000 (7:compression, 6:encryption, 5:grouping)
+ flags1 = 0;
+ if (f24->flags1 & (1 << 6)) {
+ flags1 |= (1 << 5);
+ }
+ if (f24->flags1 & (1 << 3)) {
+ flags1 |= (1 << 7);
+ }
+ if (f24->flags1 & (1 << 2)) {
+ flags1 |= (1 << 6);
+ }
+ if (f24->flags1 & (1 << 1)) {
+ // 2.3 doesn't support per-frame unsyncronyzation
+ }
+ if (f24->flags1 & (1 << 0)) {
+ // 2.3 doesn't support data length, but remember to skip 4 bytes of
+ // the frame
+ }
+
+ if (simplecopy) {
+ f23 = malloc (sizeof (DB_id3v2_frame_t) + f24->size);
+ memset (f23, 0, sizeof (DB_id3v2_frame_t) + f24->size);
+ strcpy (f23->id, f24->id);
+ if (f24->flags1 & (1<<0)) {
+ // skip 1st 4 bytes (2.4 data length indicator)
+ memcpy (f23->data, f24->data+4, f24->size-4);
+ f23->size = f24->size-4;
+ }
+ else {
+ f23->size = f24->size;
+ memcpy (f23->data, f24->data, f24->size);
+ }
+ f23->flags0 = flags0;
+ f23->flags1 = flags1;
+ }
+ else if (text) {
+ int decoded_size;
+ char *decoded = convstr_id3v2 (NULL, 4, f24->data0, f24->data+1, f24->size-1, &decoded_size);
+ if (!decoded) {
+ trace ("junk_id3v2_convert_24_to_23: failed to decode text frame %s\n", f24->id);
+ continue; // failed, discard it
+ }
+ if (!strcmp (f24->id, "TDRC")) {
+ trace ("junk_id3v2_convert_24_to_23: TDRC text: %s\n", decoded);
+ int year, month, day;
+ int c = sscanf (decoded, "%4d-%2d-%2d", &year, &month, &day);
+ if (c >= 1) {
+ char s5;
+ snprintf (s, sizeof (s), "%04d", year);
+ f23 = junk_id3v2_add_text_frame (tag23, "TYER", s);
+ if (f23) {
+ tail = f23;
+ f23 = NULL;
+ }
+ }
+ if (c == 3) {
+ char s5;
+ snprintf (s, sizeof (s), "%02d%02d", month, day);
+ f23 = junk_id3v2_add_text_frame (tag23, "TDAT", s);
+ if (f23) {
+ tail = f23;
+ f23 = NULL;
+ }
+ }
+ else {
+ trace ("junk_id3v2_add_text_frame: 2.4 TDRC doesn't have month/day info; discarded\n");
+ }
+ }
+ else if (!strcmp (f24->id, "TDOR")) {
+ trace ("junk_id3v2_convert_24_to_23: TDOR text: %s\n", decoded);
+ int year;
+ int c = sscanf (decoded, "%4d", &year);
+ if (c == 1) {
+ char s5;
+ snprintf (s, sizeof (s), "%04d", year);
+ f23 = junk_id3v2_add_text_frame (tag23, "TORY", s);
+ if (f23) {
+ tail = f23;
+ f23 = NULL;
+ }
+ }
+ else {
+ trace ("junk_id3v2_add_text_frame: 2.4 TDOR doesn't have month/day info; discarded\n");
+ }
+ }
+ else if (f24->id0 == 'T') {
+ for (int f = 0; frame_mappingf; f += FRAME_MAPPINGS) {
+ if (frame_mappingf+MAP_ID3V24 && !strcmp (frame_mappingf+MAP_ID3V24, f24->id)) {
+ if (!frame_mappingf+MAP_ID3V23) {
+ f23 = junk_id3v2_add_text_frame (tag23, frame_mappingf+MAP_DDB, decoded);
+ }
+ break;
+ }
+ }
+ }
+ else {
+ // encode for 2.3
+ f23 = junk_id3v2_add_text_frame2 (tag23, f24->id, decoded, decoded_size);
+ if (f23) {
+ tail = f23;
+ f23 = NULL;
+ }
+ }
+ free (decoded);
+ }
+ if (f23) {
+ if (tail) {
+ tail->next = f23;
+ }
+ else {
+ tag23->frames = f23;
+ }
+ tail = f23;
+ }
+ }
+
+ // convert tag header
+ tag23->flags = tag24->flags;
+ tag23->flags &= ~(1<<4); // no footer (unsupported in 2.3)
+ tag23->flags &= ~(1<<7); // no unsync
+
+ return 0;
+}
+
+int
+junk_id3v2_convert_23_to_24 (DB_id3v2_tag_t *tag23, DB_id3v2_tag_t *tag24) {
+ DB_id3v2_frame_t *f23;
+ DB_id3v2_frame_t *tail = tag24->frames;
+
+ while (tail && tail->next) {
+ tail = tail->next;
+ }
+
+ const char *copy_frames = {
+ "AENC", "APIC",
+ "COMM", "COMR", "ENCR",
+ "ETCO", "GEOB", "GRID",
+ "LINK", "MCDI", "MLLT", "OWNE", "PRIV",
+ "POPM", "POSS", "RBUF",
+ "RVRB",
+ "SYLT", "SYTC",
+ "UFID", "USER", "USLT",
+ NULL
+ };
+
+ // NOTE: all Wxxx frames are copy_frames, handled as special case
+
+ // "TDRC" TDAT with conversion from ID3v2-strct timestamp to DDMM format
+ // "TDOR" TORY with conversion from ID3v2-strct timestamp to year
+ // TODO: "TIPL" IPLS with conversion to non-text format
+
+ const char *text_frames = {
+ "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TEXT", "TFLT", "TIT1", "TIT2", "TIT3", "TKEY", "TLAN", "TLEN", "TMED", "TOAL", "TOFN", "TOLY", "TOPE", "TOWN", "TPE1", "TPE2", "TPE3", "TPE4", "TPOS", "TPUB", "TRCK", "TRSN", "TRSO", "TSRC", "TSSE", "TXXX", "TDRC", NULL
+ };
+
+ for (f23 = tag23->frames; f23; f23 = f23->next) {
+ // we are altering the tag, so check for tag alter preservation
+ if (tag23->flags & (1<<7)) {
+ continue; // discard the frame
+ }
+
+ int simplecopy = 0; // means format is the same in 2.3 and 2.4
+ int text = 0; // means this is a text frame
+
+ int i;
+
+ if (f23->id0 == 'W') { // covers all W000..WZZZ tags
+ simplecopy = 1;
+ }
+
+ if (!simplecopy) {
+ for (i = 0; copy_framesi; i++) {
+ if (!strcmp (f23->id, copy_framesi)) {
+ simplecopy = 1;
+ break;
+ }
+ }
+ }
+
+ if (!simplecopy) {
+ // check if this is a text frame
+ for (i = 0; text_framesi; i++) {
+ if (!strcmp (f23->id, text_framesi)) {
+ text = 1;
+ break;
+ }
+ }
+ }
+
+
+ if (!simplecopy && !text) {
+ continue; // unknown frame
+ }
+
+ // convert flags
+ uint8_t flags2;
+ // 1st byte (status flags) is the same, but shifted by 1 bit to the
+ // right
+ flags0 = f23->flags0 >> 1;
+ 
+ // 2nd byte (format flags) is quite different
+ // 2.4 format is %0h00kmnp (6:grouping, 3:compression, 2:encryption, 1:unsync, 0:datalen)
+ // 2.3 format is %ijk00000 (7:compression, 6:encryption, 5:grouping)
+ flags1 = 0;
+ if (f23->flags1 & (1 << 7)) {
+ flags1 |= (1 << 3);
+ }
+ if (f23->flags1 & (1 << 6)) {
+ flags1 |= (1 << 2);
+ }
+ if (f23->flags1 & (1 << 5)) {
+ flags1 |= (1 << 6);
+ }
+
+ DB_id3v2_frame_t *f24 = NULL;
+ if (simplecopy) {
+ f24 = malloc (sizeof (DB_id3v2_frame_t) + f23->size);
+ memset (f24, 0, sizeof (DB_id3v2_frame_t) + f23->size);
+ strcpy (f24->id, f23->id);
+ f24->size = f23->size;
+ memcpy (f24->data, f23->data, f23->size);
+ f24->flags0 = flags0;
+ f24->flags1 = flags1;
+ }
+ else if (text) {
+ // decode text into utf8
+ int decoded_size;
+ char *decoded = convstr_id3v2 (NULL, 3, f23->data0, f23->data+1, f23->size-1, &decoded_size);
+ if (!decoded) {
+ trace ("junk_id3v2_convert_23_to_24: failed to decode text frame %s\n", f23->id);
+ continue; // failed, discard it
+ }
+ if (!strcmp (f23->id, "TDRC")) {
+ trace ("junk_id3v2_convert_23_to_24: TDRC text: %s\n", decoded);
+ int year, month, day;
+ int c = sscanf (decoded, "%4d-%2d-%2d", &year, &month, &day);
+ if (c >= 1) {
+ char s5;
+ snprintf (s, sizeof (s), "%04d", year);
+ f24 = junk_id3v2_add_text_frame (tag24, "TYER", s);
+ if (f24) {
+ tail = f24;
+ f24 = NULL;
+ }
+ }
+ if (c == 3) {
+ char s5;
+ snprintf (s, sizeof (s), "%02d%02d", month, day);
+ f24 = junk_id3v2_add_text_frame (tag24, "TDAT", s);
+ if (f24) {
+ tail = f24;
+ f24 = NULL;
+ }
+ }
+ else {
+ trace ("junk_id3v2_add_text_frame: 2.4 TDRC doesn't have month/day info; discarded\n");
+ }
+ }
+ else if (!strcmp (f23->id, "TORY")) {
+ trace ("junk_id3v2_convert_23_to_24: TDOR text: %s\n", decoded);
+ int year;
+ int c = sscanf (decoded, "%4d", &year);
+ if (c == 1) {
+ char s5;
+ snprintf (s, sizeof (s), "%04d", year);
+ f24 = junk_id3v2_add_text_frame (tag24, "TDOR", s);
+ if (f24) {
+ tail = f24;
+ f24 = NULL;
+ }
+ }
+ else {
+ trace ("junk_id3v2_add_text_frame: 2.4 TDOR doesn't have month/day info; discarded\n");
+ }
+ }
+ else {
+ int added = 0;
+ if (!strcmp (f23->id, "TXXX")) {
+ // does TXXX map to another frame name in 2.4?
+ for (int f = 0; frame_mappingf; f += FRAME_MAPPINGS) {
+ if (!strcasecmp (decoded, frame_mappingf+MAP_DDB)) {
+ if (!frame_mappingf+MAP_ID3V23 && frame_mappingf+MAP_ID3V24 && frame_mappingf+MAP_ID3V240 == 'T') {
+ // add the appropriate t-frame
+ const char *value = decoded + strlen (decoded) + 1;
+ f24 = junk_id3v2_add_text_frame (tag24, frame_mappingf+MAP_ID3V24, value);
+ if (f24) {
+ tail = f24;
+ f24 = NULL;
+ }
+ added = 1;
+ }
+ break;
+ }
+ }
+ }
+ // encode as TXXX for 2.4
+ if (!added) {
+ f24 = junk_id3v2_add_text_frame2 (tag24, f23->id, decoded, decoded_size);
+ if (f24) {
+ tail = f24;
+ f24 = NULL;
+ }
+ }
+ }
+ free (decoded);
+ }
+ if (f24) {
+ if (tail) {
+ tail->next = f24;
+ }
+ else {
+ tag24->frames = f24;
+ }
+ tail = f24;
+ }
+ }
+
+ // convert tag header
+ tag24->version0 = 4;
+ tag24->version1 = 0;
+ tag24->flags = tag23->flags;
+ tag24->flags &= ~(1<<4); // no footer (unsupported in 2.3)
+ tag24->flags &= ~(1<<7); // no unsync
+
+ return 0;
+}
+
+void
+junk_make_tdrc_string(char *tdrc, size_t tdrc_size, int year, int month, int day, int hour, int minute) {
+ if (year <= 0 || month <= 0 || day <= 0) {
+ tdrc0 = 0;
+ return;
+ }
+ int n = snprintf (tdrc, tdrc_size, "%04d-%02d-%02d", year, month, day);
+ if (tdrc_size < n) {
+ tdrc0 = 0;
+ return;
+ }
+
+ tdrc += n;
+ tdrc_size -= n;
+
+ if (hour < 0 || minute < 0) {
+ return;
+ }
+ if (hour == 0 && minute == 0) {
+ return;
+ }
+ n = snprintf (tdrc, tdrc_size, "-T%02d:%02d", hour, minute);
+ if (tdrc_size < n) {
+ tdrc0 = 0;
+ return;
+ }
+}
+
+int
+junk_id3v2_convert_22_to_24 (DB_id3v2_tag_t *tag22, DB_id3v2_tag_t *tag24) {
+ DB_id3v2_frame_t *f22;
+ DB_id3v2_frame_t *tail = tag24->frames;
+
+ while (tail && tail->next) {
+ tail = tail->next;
+ }
+
+ const char *copy_frames = {
+ "BUF", "COM", "CRA", "ETC", "GEO", "IPL", "MCI", "MLL", "POP", "REV", "SLT", "STC", "UFI", "ULT",
+ NULL
+ };
+
+ const char *copy_frames_24 = {
+ "RBUF", "COMM", "AENC", "ETCO", "GEOB", "TIPL", "MCDI", "MLLT", "POPM", "RVRB", "SYLT", "SYTC", "UFID", "USLT",
+ NULL
+ };
+
+ // NOTE: BUF is discarded (no match in 2.4)
+ // NOTE: CNT is discarded (useless)
+ // NOTE: CRM is discarded (no match in 2.4)
+ // NOTE: EQU is discarded (difficult to convert to EQU2)
+ // NOTE: LNK is discarded (maybe later)
+ // NOTE: PIC is discarded (needs conversion from custom image-format field to mime-type)
+ // NOTE: RVA is discarded (subjective, and difficult to convert to RVA2)
+
+ const char *text_frames = {
+ "TAL", "TBP", "TCM", "TCO", "TCR", "TDY", "TEN", "TFT", "TKE", "TLA", "TLE", "TMT", "TOA", "TOF", "TOL", "TOT", "TP1", "TP2", "TP3", "TP4", "TPA", "TPB", "TRC", "TRK", "TSS", "TT1", "TT2", "TT3", "TXT", "TXX", "TOR", NULL
+ };
+
+ const char *text_frames_24 = {
+ "TALB", "TBPM", "TCOM", "TCON", "TCOP", "TDLY", "TENC", "TFLT", "TKEY", "TLAN", "TLEN", "TMED", "TOPE", "TOFN", "TOLY", "TOAL", "TPE1", "TPE2", "TPE3", "TPE4", "TPOS", "TPUB", "TSRC", "TRCK", "TSSE", "TIT1", "TIT2", "TIT3", "TEXT", "TXXX", "TDOR"
+ };
+
+ // NOTE: TRD is discarded (no match in 2.4)
+ // NOTE: TSI is discarded (no match in 2.4)
+
+ int year = 0;
+ int month = 0;
+ int day = 0;
+ int hour = 0;
+ int minute = 0;
+
+ for (f22 = tag22->frames; f22; f22 = f22->next) {
+ int simplecopy = -1; // means format is the same in 2.2 and 2.4
+ int text = -1; // means this is a text frame
+
+ int i;
+
+ if (f22->id0 == 'W') { // covers all W00..WZZ tags
+ simplecopy = 0;
+ }
+
+ if (simplecopy == -1) {
+ for (i = 0; copy_framesi; i++) {
+ if (!strcmp (f22->id, copy_framesi)) {
+ simplecopy = i;
+ break;
+ }
+ }
+ }
+
+ if (simplecopy == -1) {
+ // check if this is a text frame
+ for (i = 0; text_framesi; i++) {
+ if (!strcmp (f22->id, text_framesi)) {
+ text = i;
+ break;
+ }
+ }
+ }
+
+
+ if (simplecopy == -1 && text == -1) {
+ continue; // unknown frame
+ }
+
+ // convert flags
+ uint8_t flags2;
+ // 1st byte (status flags) is the same, but shifted by 1 bit to the
+ // right
+ flags0 = f22->flags0 >> 1;
+ 
+ // 2nd byte (format flags) is quite different
+ // 2.4 format is %0h00kmnp (grouping, compression, encryption, unsync)
+ // 2.3 format is %ijk00000 (compression, encryption, grouping)
+ flags1 = 0;
+ if (f22->flags1 & (1 << 4)) {
+ flags1 |= (1 << 6);
+ }
+ if (f22->flags1 & (1 << 7)) {
+ flags1 |= (1 << 3);
+ }
+ if (f22->flags1 & (1 << 6)) {
+ flags1 |= (1 << 2);
+ }
+ if (f22->flags1 & (1 << 5)) {
+ flags1 |= (1 << 1);
+ }
+
+ DB_id3v2_frame_t *f24 = NULL;
+ if (simplecopy != -1) {
+ f24 = malloc (sizeof (DB_id3v2_frame_t) + f22->size);
+ memset (f24, 0, sizeof (DB_id3v2_frame_t) + f22->size);
+ if (f22->id0 == 'W') { // duplicate last letter of W00-WZZ frames
+ strcpy (f24->id, f22->id);
+ f24->id3 = f24->id2;
+ f24->id4 = 0;
+ }
+ else {
+ strcpy (f24->id, copy_frames_24simplecopy);
+ }
+ f24->size = f22->size;
+ memcpy (f24->data, f22->data, f22->size);
+ f24->flags0 = flags0;
+ f24->flags1 = flags1;
+ }
+ else if (text != -1) {
+ // decode text into utf8
+ int decoded_size;
+ char *decoded = convstr_id3v2 (NULL, 2, f22->data0, f22->data+1, f22->size-1, &decoded_size);
+ if (!decoded) {
+ trace ("junk_id3v2_convert_23_to_24: failed to decode text frame %s\n", f22->id);
+ continue; // failed, discard it
+ }
+ // encode for 2.4
+ f24 = junk_id3v2_add_text_frame2 (tag24, text_frames_24text, decoded, decoded_size);
+ if (f24) {
+ tail = f24;
+ f24 = NULL;
+ }
+ free (decoded);
+ }
+ else if (!strcmp (f22->id, "TYE")) {
+ char *decoded = convstr_id3v2 (NULL, 2, f22->data0, f22->data+1, f22->size-1, NULL);
+ if (decoded) {
+ year = atoi (decoded);
+ free (decoded);
+ }
+ }
+ else if (!strcmp (f22->id, "TDA")) {
+ char *decoded = convstr_id3v2 (NULL, 2, f22->data0, f22->data+1, f22->size-1, NULL);
+ if (decoded) {
+ sscanf (decoded, "%02d%02d", &month, &day);
+ free (decoded);
+ }
+ }
+ else if (!strcmp (f22->id, "TIM")) {
+ char *decoded = convstr_id3v2 (NULL, 2, f22->data0, f22->data+1, f22->size-1, NULL);
+ if (decoded) {
+ sscanf (decoded, "%02d%02d", &hour, &minute);
+ free (decoded);
+ }
+ }
+ if (f24) {
+ if (tail) {
+ tail->next = f24;
+ }
+ else {
+ tag24->frames = f24;
+ }
+ tail = f24;
+ }
+ }
+
+ char tdrc100;
+ tdrc0 = 0;
+ junk_make_tdrc_string(tdrc, sizeof (tdrc), year, month, day, hour, minute);
+
+ if (tdrc0) {
+ DB_id3v2_frame_t *f24 = junk_id3v2_add_text_frame (tag24, "TDRC", tdrc);
+ if (f24) {
+ tail = f24;
+ }
+ }
+
+ // convert tag header
+ tag24->version0 = 4;
+ tag24->version1 = 0;
+ tag24->flags = tag22->flags;
+ tag24->flags &= ~(1<<4); // no footer (unsupported in 2.3)
+ tag24->flags &= ~(1<<7); // no unsync
+
+ return 0;
+}
+
+int
+junk_apev2_remove_frames (DB_apev2_tag_t *tag, const char *frame_id) {
+ DB_apev2_frame_t *prev = NULL;
+ for (DB_apev2_frame_t *f = tag->frames; f; ) {
+ DB_apev2_frame_t *next = f->next;
+ if (!strcasecmp (f->key, frame_id)) {
+ if (prev) {
+ prev->next = f->next;
+ }
+ else {
+ tag->frames = f->next;
+ }
+ free (f);
+ }
+ else {
+ prev = f;
+ }
+ f = next;
+ }
+ return 0;
+}
+
+int
+junk_apev2_remove_all_text_frames (DB_apev2_tag_t *tag) {
+ DB_apev2_frame_t *prev = NULL;
+ for (DB_apev2_frame_t *f = tag->frames; f; ) {
+ DB_apev2_frame_t *next = f->next;
+ int valuetype = ((f->flags >> 1) & 3);
+ if (valuetype == 0) {
+ if (prev) {
+ prev->next = f->next;
+ }
+ else {
+ tag->frames = f->next;
+ }
+ free (f);
+ }
+ else {
+ prev = f;
+ }
+ f = next;
+ }
+ return 0;
+}
+
+DB_apev2_frame_t *
+junk_apev2_add_text_frame2 (DB_apev2_tag_t *tag, const char *frame_id, const char *value, size_t size) {
+ trace ("adding apev2 frame %s %s\n", frame_id, value);
+ if (!*value) {
+ return NULL;
+ }
+ DB_apev2_frame_t *tail = tag->frames;
+ while (tail && tail->next) {
+ tail = tail->next;
+ }
+
+ DB_apev2_frame_t *f = malloc (sizeof (DB_apev2_frame_t) + size);
+ if (!f) {
+ trace ("junk_apev2_add_text_frame: failed to allocate %d bytes\n", size);
+ return NULL;
+ }
+ memset (f, 0, sizeof (DB_apev2_frame_t));
+ f->flags = 0;
+ strcpy (f->key, frame_id);
+ f->size = (int)size;
+ memcpy (f->data, value, size);
+
+ if (tail) {
+ tail->next = f;
+ }
+ else {
+ tag->frames = f;
+ }
+ tail = f;
+ return tail;
+}
+
+DB_apev2_frame_t *
+junk_apev2_add_text_frame (DB_apev2_tag_t *tag, const char *frame_id, const char *value) {
+ return junk_apev2_add_text_frame2(tag, frame_id, value, strlen (value));
+}
+
+static void
+_apev2_append_combined_text_frame_from_meta (DB_apev2_tag_t *apev2, const char *key, DB_metaInfo_t *meta) {
+ int out_size;
+ int needs_free;
+ const char *tag_value = _get_combined_meta_value (meta, &out_size, "\0", 1, &needs_free);
+ junk_apev2_add_text_frame2 (apev2, key, tag_value, out_size);
+ if (needs_free) {
+ free ((char *)tag_value);
+ }
+}
+
+int
+junk_id3v2_convert_apev2_to_24 (DB_apev2_tag_t *ape, DB_id3v2_tag_t *tag24) {
+ DB_apev2_frame_t *f_ape;
+ DB_id3v2_frame_t *tail = tag24->frames;
+
+ while (tail && tail->next) {
+ tail = tail->next;
+ }
+
+ const char *text_keys = {
+ "Title", "Subtitle", "Artist", "Album", "Publisher", "Conductor", "Track", "Composer", "Copyright", "Genre", "Disc", "ISRC", "Language", "Year", "DiscSubtitle", NULL
+ };
+
+ const char *text_keys_24 = {
+ "TIT2", "TIT3", "TPE1", "TALB", "TPUB", "TPE3", "TRCK", "TCOM", "TCOP", "TCON", "TPOS", "TSRC", "TLAN", "TDRC", "TSST"
+ };
+
+ const char *comm_frames = {
+ "Comment", "Unsynced lyrics", "EAN/UPC", "ISBN", "Catalog", "LC", "Publicationright", "Record Location", "Related", "Abstract", "Bibliography", NULL
+ };
+
+ // FIXME: additional frames: File->WOAF 
+ // converted to COMM: Comment, Unsynced Lyrics, EAN/UPC, ISBN, Catalog, LC, Publicationright, Record Location, Related, Abstract, Bibliography
+ // "Debut album" is discarded
+ // "Index" is discarded
+ // "Introplay" is discarded
+
+ for (f_ape = ape->frames; f_ape; f_ape = f_ape->next) {
+ int i;
+
+ for (i = 0; text_keysi; i++) {
+ if (!strcasecmp (text_keysi, f_ape->key)) {
+ break;
+ }
+ }
+
+ DB_id3v2_frame_t *f24 = NULL;
+
+ if (text_keysi) {
+ char strf_ape->size+1;
+ memcpy (str, f_ape->data, f_ape->size);
+ strf_ape->size = 0;
+ f24 = junk_id3v2_add_text_frame2 (tag24, text_keys_24i, str, f_ape->size);
+ if (f24) {
+ tail = f24;
+ f24 = NULL;
+ }
+ }
+ else {
+ for (i = 0; comm_framesi; i++) {
+ if (!strcasecmp (f_ape->key, comm_framesi)) {
+ char strf_ape->size+1;
+ memcpy (str, f_ape->data, f_ape->size);
+ strf_ape->size = 0;
+ if (!strcasecmp (f_ape->key, "Comment")) {
+ junk_id3v2_add_comment_frame (tag24, "COMM", "eng", "", str);
+ }
+ else if (!strcasecmp (f_ape->key, "Unsynced Lyrics")) {
+ junk_id3v2_add_comment_frame (tag24, "USLT", "eng", "", str);
+ }
+ else {
+ junk_id3v2_add_comment_frame (tag24, "COMM", "eng", comm_framesi, str);
+ }
+ break;
+ }
+ }
+ }
+
+ if (f24) {
+ if (tail) {
+ tail->next = f24;
+ }
+ else {
+ tag24->frames = f24;
+ }
+ tail = f24;
+ }
+ }
+
+ // convert tag header
+ tag24->version0 = 4;
+ tag24->version1 = 0;
+ tag24->flags = 0;
+
+ return 0;
+}
+
+int
+junk_apev2_write_i32_le2 (int fd, uint32_t data) {
+ int shift = 0;
+ for (int i = 0; i < 4; i++) {
+ uint8_t d = (data >> shift) & 0xff;
+ if (write (fd, &d, 1) != 1) {
+ return -1;
+ }
+ shift += 8;
+ }
+
+ return 0;
+}
+
+int
+junk_apev2_write_i32_le (FILE *fp, uint32_t data) {
+ int shift = 0;
+ for (int i = 0; i < 4; i++) {
+ uint8_t d = (data >> shift) & 0xff;
+ if (fwrite (&d, 1, 1, fp) != 1) {
+ return -1;
+ }
+ shift += 8;
+ }
+
+ return 0;
+}
+
+int
+junk_apev2_write2 (int fd, DB_apev2_tag_t *tag, int write_header, int write_footer) {
+ // calc size and numitems
+ uint32_t numframes = 0;
+ uint32_t size = 0;
+ DB_apev2_frame_t *f = tag->frames;
+ while (f) {
+ size += 8 + strlen (f->key) + 1 + f->size;
+ numframes++;
+ f = f->next;
+ }
+ size += 32;
+
+ trace ("junk_apev2_write2: writing apev2 tag, size=%d, numframes=%d\n", size, numframes);
+
+
+ if (write_header) {
+ if (write (fd, "APETAGEX", 8) != 8) {
+ trace ("junk_apev2_write2: failed to write apev2 header signature\n");
+ goto error;
+ }
+ uint32_t flags = (1 << 31) | (1 << 29); // contains header, this is header
+ if (!write_footer) {
+ flags |= 1 << 30; // contains no footer
+ }
+ uint32_t header4 = {
+ 2000, // version
+ size,
+ numframes,
+ flags
+ };
+ for (int i = 0; i < 4; i++) {
+ if (junk_apev2_write_i32_le2 (fd, headeri) != 0) {
+ trace ("junk_apev2_write_i32_le2: failed to write apev2 header\n");
+ goto error;
+ }
+ }
+ // write 8 bytes of padding
+ header0 = header1 = 0;
+ if (write (fd, header, 8) != 8) {
+ trace ("junk_apev2_write2: failed to write apev2 header padding\n");
+ goto error;
+ }
+ }
+
+ // write items
+ f = tag->frames;
+ while (f) {
+ if (junk_apev2_write_i32_le2 (fd, f->size) != 0) {
+ trace ("junk_apev2_write_i32_le2: failed to write apev2 item size\n");
+ goto error;
+ }
+ if (junk_apev2_write_i32_le2 (fd, f->flags) != 0) {
+ trace ("junk_apev2_write_i32_le2: failed to write apev2 item flags\n");
+ goto error;
+ }
+ size_t l = strlen (f->key) + 1;
+ if (write (fd, f->key, l) != l) {
+ trace ("junk_apev2_write2: failed to write apev2 item key\n");
+ goto error;
+ }
+ if (write (fd, f->data, f->size) != f->size) {
+ trace ("junk_apev2_write2: failed to write apev2 item value\n");
+ goto error;
+ }
+ f = f->next;
+ }
+
+ if (write_footer) {
+ if (write (fd, "APETAGEX", 8) != 8) {
+ trace ("junk_apev2_write: failed to write apev2 footer signature\n");
+ goto error;
+ }
+ uint32_t flags = 0;
+ if (write_header) {
+ flags |= 1 << 31;
+ }
+ uint32_t header4 = {
+ 2000, // version
+ size,
+ numframes,
+ flags
+ };
+ for (int i = 0; i < 4; i++) {
+ if (junk_apev2_write_i32_le2 (fd, headeri) != 0) {
+ trace ("junk_apev2_write_i32_le2: failed to write apev2 footer\n");
+ goto error;
+ }
+ }
+ // write 8 bytes of padding
+ header0 = header1 = 0;
+ if (write (fd, header, 8) != 8) {
+ trace ("junk_apev2_write2: failed to write apev2 footer padding\n");
+ goto error;
+ }
+ }
+ return 0;
+error:
+ return -1;
+}
+
+
+int
+junk_apev2_write (FILE *fp, DB_apev2_tag_t *tag, int write_header, int write_footer) {
+ // calc size and numitems
+ uint32_t numframes = 0;
+ uint32_t size = 0;
+ DB_apev2_frame_t *f = tag->frames;
+ while (f) {
+ size += 8 + strlen (f->key) + 1 + f->size;
+ numframes++;
+ f = f->next;
+ }
+ size += 32;
+
+ trace ("junk_apev2_write: writing apev2 tag, size=%d, numframes=%d\n", size, numframes);
+
+
+ if (write_header) {
+ if (fwrite ("APETAGEX", 1, 8, fp) != 8) {
+ trace ("junk_apev2_write: failed to write apev2 header signature\n");
+ goto error;
+ }
+ uint32_t flags = (1 << 31) | (1 << 29); // contains header, this is header
+ if (!write_footer) {
+ flags |= 1 << 30; // contains no footer
+ }
+ uint32_t header4 = {
+ 2000, // version
+ size,
+ numframes,
+ flags
+ };
+ for (int i = 0; i < 4; i++) {
+ if (junk_apev2_write_i32_le (fp, headeri) != 0) {
+ trace ("junk_apev2_write_i32_le: failed to write apev2 header\n");
+ goto error;
+ }
+ }
+ // write 8 bytes of padding
+ header0 = header1 = 0;
+ if (fwrite (header, 1, 8, fp) != 8) {
+ trace ("junk_apev2_write_i32_le: failed to write apev2 header padding\n");
+ goto error;
+ }
+ }
+
+ // write items
+ f = tag->frames;
+ while (f) {
+ if (junk_apev2_write_i32_le (fp, f->size) != 0) {
+ trace ("junk_apev2_write_i32_le: failed to write apev2 item size\n");
+ goto error;
+ }
+ if (junk_apev2_write_i32_le (fp, f->flags) != 0) {
+ trace ("junk_apev2_write_i32_le: failed to write apev2 item flags\n");
+ goto error;
+ }
+ size_t l = strlen (f->key) + 1;
+ if (fwrite (f->key, 1, l, fp) != l) {
+ trace ("junk_apev2_write_i32_le: failed to write apev2 item key\n");
+ goto error;
+ }
+ if (fwrite (f->data, 1, f->size, fp) != f->size) {
+ trace ("junk_apev2_write_i32_le: failed to write apev2 item value\n");
+ goto error;
+ }
+ f = f->next;
+ }
+
+ if (write_footer) {
+ if (fwrite ("APETAGEX", 1, 8, fp) != 8) {
+ trace ("junk_apev2_write: failed to write apev2 footer signature\n");
+ goto error;
+ }
+ uint32_t flags = 0;
+ if (write_header) {
+ flags |= 1 << 31;
+ }
+ uint32_t header4 = {
+ 2000, // version
+ size,
+ numframes,
+ flags
+ };
+ for (int i = 0; i < 4; i++) {
+ if (junk_apev2_write_i32_le (fp, headeri) != 0) {
+ trace ("junk_apev2_write_i32_le: failed to write apev2 footer\n");
+ goto error;
+ }
+ }
+ // write 8 bytes of padding
+ header0 = header1 = 0;
+ if (fwrite (header, 1, 8, fp) != 8) {
+ trace ("junk_apev2_write_i32_le: failed to write apev2 footer padding\n");
+ goto error;
+ }
+ }
+ return 0;
+error:
+ return -1;
+}
+
+int
+junk_id3v2_write2 (int out, DB_id3v2_tag_t *tag) {
+ if (tag->version0 < 3) {
+ fprintf (stderr, "junk_write_id3v2: writing id3v2.2 is not supported\n");
+ return -1;
+ }
+
+ char *buffer = NULL;
+ int err = -1;
+
+ // write tag header
+ if (write (out, "ID3", 3) != 3) {
+ fprintf (stderr, "junk_write_id3v2: failed to write ID3 signature\n");
+ goto error;
+ }
+
+ if (write (out, tag->version, 2) != 2) {
+ fprintf (stderr, "junk_write_id3v2: failed to write tag version\n");
+ goto error;
+ }
+ uint8_t flags = tag->flags;
+ flags &= ~(1<<6); // we don't (yet?) write ext header
+ flags &= ~(1<<4); // we don't write footer
+
+ if (write (out, &flags, 1) != 1) {
+ fprintf (stderr, "junk_write_id3v2: failed to write tag flags\n");
+ goto error;
+ }
+ // run through list of frames, and calculate size
+ uint32_t sz = 0;
+ for (DB_id3v2_frame_t *f = tag->frames; f; f = f->next) {
+ // each tag has 10 bytes header
+ if (tag->version0 > 2) {
+ sz += 10;
+ }
+ else {
+ sz += 6;
+ }
+ sz += f->size;
+ }
+
+ trace ("calculated tag size: %d bytes\n", sz);
+ uint8_t tagsize4;
+ tagsize0 = (sz >> 21) & 0x7f;
+ tagsize1 = (sz >> 14) & 0x7f;
+ tagsize2 = (sz >> 7) & 0x7f;
+ tagsize3 = sz & 0x7f;
+ if (write (out, tagsize, 4) != 4) {
+ fprintf (stderr, "junk_write_id3v2: failed to write tag size\n");
+ goto error;
+ }
+
+ trace ("writing frames\n");
+ // write frames
+ for (DB_id3v2_frame_t *f = tag->frames; f; f = f->next) {
+ trace ("writing frame %s size %d\n", f->id, f->size);
+ int id_size = 3;
+ uint8_t frame_size4;
+ if (tag->version0 > 2) {
+ id_size = 4;
+ }
+ if (tag->version0 == 3) {
+ frame_size0 = (f->size >> 24) & 0xff;
+ frame_size1 = (f->size >> 16) & 0xff;
+ frame_size2 = (f->size >> 8) & 0xff;
+ frame_size3 = f->size & 0xff;
+ }
+ else if (tag->version0 == 4) {
+ frame_size0 = (f->size >> 21) & 0x7f;
+ frame_size1 = (f->size >> 14) & 0x7f;
+ frame_size2 = (f->size >> 7) & 0x7f;
+ frame_size3 = f->size & 0x7f;
+ }
+ if (write (out, f->id, 4) != 4) {
+ fprintf (stderr, "junk_write_id3v2: failed to write frame id %s\n", f->id);
+ goto error;
+ }
+ if (write (out, frame_size, 4) != 4) {
+ fprintf (stderr, "junk_write_id3v2: failed to write frame size, id %s, size %d\n", f->id, f->size);
+ goto error;
+ }
+ if (write (out, f->flags, 2) != 2) {
+ fprintf (stderr, "junk_write_id3v2: failed to write frame header flags, id %s, size %d\n", f->id, f->size);
+ goto error;
+ }
+ if (write (out, f->data, f->size) != f->size) {
+ fprintf (stderr, "junk_write_id3v2: failed to write frame data, id %s, size %d\n", f->id, f->size);
+ goto error;
+ }
+ sz += f->size;
+ }
+
+ return 0;
+
+error:
+ if (buffer) {
+ free (buffer);
+ }
+ return err;
+}
+
+int
+junk_id3v2_write (FILE *out, DB_id3v2_tag_t *tag) {
+ if (tag->version0 < 3) {
+ fprintf (stderr, "junk_write_id3v2: writing id3v2.2 is not supported\n");
+ return -1;
+ }
+
+ char *buffer = NULL;
+ int err = -1;
+
+ // write tag header
+ if (fwrite ("ID3", 1, 3, out) != 3) {
+ fprintf (stderr, "junk_write_id3v2: failed to write ID3 signature\n");
+ goto error;
+ }
+
+ if (fwrite (tag->version, 1, 2, out) != 2) {
+ fprintf (stderr, "junk_write_id3v2: failed to write tag version\n");
+ goto error;
+ }
+ uint8_t flags = tag->flags;
+ flags &= ~(1<<6); // we don't (yet?) write ext header
+ flags &= ~(1<<4); // we don't write footer
+
+ if (fwrite (&flags, 1, 1, out) != 1) {
+ fprintf (stderr, "junk_write_id3v2: failed to write tag flags\n");
+ goto error;
+ }
+ // run through list of frames, and calculate size
+ uint32_t sz = 0;
+ for (DB_id3v2_frame_t *f = tag->frames; f; f = f->next) {
+ // each tag has 10 bytes header
+ if (tag->version0 > 2) {
+ sz += 10;
+ }
+ else {
+ sz += 6;
+ }
+ sz += f->size;
+ }
+
+ trace ("calculated tag size: %d bytes\n", sz);
+ uint8_t tagsize4;
+ tagsize0 = (sz >> 21) & 0x7f;
+ tagsize1 = (sz >> 14) & 0x7f;
+ tagsize2 = (sz >> 7) & 0x7f;
+ tagsize3 = sz & 0x7f;
+ if (fwrite (tagsize, 1, 4, out) != 4) {
+ fprintf (stderr, "junk_write_id3v2: failed to write tag size\n");
+ goto error;
+ }
+
+ trace ("writing frames\n");
+ // write frames
+ for (DB_id3v2_frame_t *f = tag->frames; f; f = f->next) {
+ trace ("writing frame %s size %d\n", f->id, f->size);
+ int id_size = 3;
+ uint8_t frame_size4;
+ if (tag->version0 > 2) {
+ id_size = 4;
+ }
+ if (tag->version0 == 3) {
+ frame_size0 = (f->size >> 24) & 0xff;
+ frame_size1 = (f->size >> 16) & 0xff;
+ frame_size2 = (f->size >> 8) & 0xff;
+ frame_size3 = f->size & 0xff;
+ }
+ else if (tag->version0 == 4) {
+ frame_size0 = (f->size >> 21) & 0x7f;
+ frame_size1 = (f->size >> 14) & 0x7f;
+ frame_size2 = (f->size >> 7) & 0x7f;
+ frame_size3 = f->size & 0x7f;
+ }
+ if (fwrite (f->id, 1, 4, out) != 4) {
+ fprintf (stderr, "junk_write_id3v2: failed to write frame id %s\n", f->id);
+ goto error;
+ }
+ if (fwrite (frame_size, 1, 4, out) != 4) {
+ fprintf (stderr, "junk_write_id3v2: failed to write frame size, id %s, size %d\n", f->id, f->size);
+ goto error;
+ }
+ if (fwrite (f->flags, 1, 2, out) != 2) {
+ fprintf (stderr, "junk_write_id3v2: failed to write frame header flags, id %s, size %d\n", f->id, f->size);
+ goto error;
+ }
+ if (fwrite (f->data, 1, f->size, out) != f->size) {
+ fprintf (stderr, "junk_write_id3v2: failed to write frame data, id %s, size %d\n", f->id, f->size);
+ goto error;
+ }
+ sz += f->size;
+ }
+
+ return 0;
+
+error:
+ if (buffer) {
+ free (buffer);
+ }
+ return err;
+}
+
+void
+junk_id3v2_free (DB_id3v2_tag_t *tag) {
+ while (tag->frames) {
+ DB_id3v2_frame_t *next = tag->frames->next;
+ free (tag->frames);
+ tag->frames = next;
+ }
+}
+
+void
+junk_apev2_free (DB_apev2_tag_t *tag) {
+ while (tag->frames) {
+ DB_apev2_frame_t *next = tag->frames->next;
+ free (tag->frames);
+ tag->frames = next;
+ }
+}
+
+static int
+junklib_id3v2_sync_frame (const int version_major, uint8_t *data, const int synced_size, int *consumed_size) {
+ char *writeptr = data;
+ int written = 0;
+ int consumed = 0;
+ while (written < synced_size) {
+ *writeptr++ = *data;
+ written++;
+ if (data0 == 0xff && synced_size-written >= 2 && data1 == 0) {
+ data++;
+ consumed++;
+ }
+ data++;
+ consumed++;
+ }
+
+ *consumed_size = consumed;
+
+ return written;
+}
+
+char *
+junk_append_meta (const char *old, const char *new) {
+ size_t sz = strlen (old) + strlen (new) + 2;
+ char *appended = malloc (sz);
+ if (!appended) {
+ trace ("junk_append_meta: failed to allocate %d bytes\n");
+ return NULL;
+ }
+ snprintf (appended, sz, "%s\n%s", old, new);
+ return appended;
+}
+
+int
+junk_load_comm_frame (int version_major, const char *field_name, playItem_t *it, uint8_t *readptr, int synched_size) {
+ uint8_t enc = readptr0;
+ char lang4 = {readptr1, readptr2, readptr3, 0};
+#pragma unused(lang)
+ trace ("COMM enc: %d\n", (int)enc);
+ trace ("COMM language: %s\n", lang);
+ trace ("COMM data size: %d\n", synched_size);
+
+ int outsize = 0;
+ char *descr = convstr_id3v2 (NULL, version_major, enc, readptr+4, synched_size-4, &outsize);
+ if (!descr) {
+ trace ("failed to decode COMM frame, probably wrong encoding (%d)\n", enc);
+ return -1;
+ }
+
+ trace ("COMM raw data: %s\n", descr);
+ // find value
+ char *value = descr;
+ while (*value && outsize-- > 0) {
+ value++;
+ }
+ if (*value != 0) {
+ trace ("failed to parse COMM frame, descr was \"%s\"\n", descr);
+ free (descr);
+ return -1;
+ }
+
+ *value = 0;
+ value++;
+
+ size_t len = strlen (descr) + strlen (value) + 3;
+ char commentlen;
+
+// FIXME: COMM frames can have multiple unique content descriptors,
+// which uniquely identify each comment,
+// but there's no UI to display or edit this, so they are ignored.
+// if (*descr) {
+// snprintf (comment, len, "%s: %s", descr, value);
+// }
+// else
+ {
+ strcpy (comment, value);
+ }
+
+ trace ("COMM combined: %s\n", comment);
+ // skip utf8 BOM (can be produced by iconv FEFF/FFFE)
+ size_t l = strlen (comment);
+ uint8_t bom = { 0xEF, 0xBB, 0xBF };
+ if (l >= 3 && !memcmp (comment, bom, 3)) {
+ pl_append_meta (it, field_name, comment+3);
+ }
+ else {
+ pl_append_meta (it, field_name, comment);
+ }
+
+ free (descr);
+ return 0;
+}
+
+
+/* Parse RVA2 tag */
+/* Currently only supports tags wich set master volume and are labeled "track"
+ * or "album". Also only supports peak value if stored as 16 bits. */
+static int junk_id3v2_load_rva2 (int version_major, playItem_t *it, uint8_t *readptr, int synched_size) {
+ uint8_t *rva_desc = readptr;
+ unsigned rva_desc_len = 0;
+ const uint8_t *p = rva_desc;
+ while (*p++ && rva_desc_len < synched_size) {
+ rva_desc_len++;
+ }
+
+ if(rva_desc_len == synched_size) { /* tag too short */
+ return -1;
+ }
+ if(rva_desc_len != 5) { /* only support track or album labeled ones */
+ return 0;
+ }
+
+ if(synched_size < rva_desc_len + 1 + 4) return -1; /* at least 4 bytes after zero-terminated label */
+
+ uint8_t *rva_data = rva_desc + rva_desc_len + 1;
+
+ uint8_t vol_type = rva_data0;
+
+ if(vol_type != 1) return 0;
+
+ int16_t volume_adjust = (int16_t)(((int16_t)rva_data1 << 8) | rva_data2); /* this is little-endian safe :) */
+ uint8_t peak_bits = rva_data3;
+ uint16_t peak_val = 0;
+
+ if(peak_bits == 16 && synched_size >= rva_desc_len + 1 + 6) {
+ peak_val = (uint16_t)((rva_data4 << 8) | rva_data5);
+ }
+
+ if (!strcasecmp (rva_desc, "album")) {
+ if (!pl_find_meta (it, ddb_internal_rg_keysDDB_REPLAYGAIN_ALBUMGAIN)) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, volume_adjust / 512.f);
+ }
+ if (!pl_find_meta (it, ddb_internal_rg_keysDDB_REPLAYGAIN_ALBUMPEAK) && peak_val) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, peak_val / 32767.f); /* NOTE: this is a guess based on mp3gain 1.5.2 written tags */
+ }
+ }
+ else if (!strcasecmp (rva_desc, "track")) {
+ if (!pl_find_meta (it, ddb_internal_rg_keysDDB_REPLAYGAIN_TRACKGAIN)) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, volume_adjust / 512.f);
+ }
+ if (!pl_find_meta (it, ddb_internal_rg_keysDDB_REPLAYGAIN_TRACKPEAK) && peak_val) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, peak_val / 32767.f);
+ }
+ }
+
+ return 0;
+}
+
+int
+junk_id3v2_load_ufid (int version_major, playItem_t *it, uint8_t *readptr, unsigned synched_size) {
+ char *owner = readptr;
+ while (*readptr && synched_size > 0) {
+ readptr++;
+ synched_size--;
+ }
+ if (!synched_size) {
+ trace ("UFID owner is not null-terminated\n");
+ return -1;
+ }
+ readptr++;
+ synched_size--;
+
+ if (!synched_size) {
+ trace ("UFID is incomplete, no data after owner\n");
+ return -1;
+ }
+
+ char idsynched_size+1;
+ memcpy (id, readptr, synched_size);
+ idsynched_size = 0;
+
+ // verify that owner is musicbrainz and that content is ascii
+ if (strcmp (owner, "http://musicbrainz.org")) {
+ return -1;
+ }
+ for (int i = 0; i < synched_size; i++) {
+ if (!isascii (idi)) {
+ return -1;
+ }
+ }
+
+ pl_replace_meta (it, "musicbrainz_trackid", id);
+ return 0;
+}
+
+unsigned
+junk_stars_from_popm_rating (uint8_t rating) {
+ if (rating == 0) {
+ return 0;
+ }
+ else if (rating < 64) {
+ return 1;
+ }
+ else if (rating < 128) {
+ return 2;
+ }
+ else if (rating < 196) {
+ return 3;
+ }
+ else if (rating < 255) {
+ return 4;
+ }
+ else {
+ return 5;
+ }
+}
+
+uint8_t
+junk_popm_rating_from_stars (unsigned stars) {
+ switch (stars) {
+ case 0:
+ return 0;
+ case 1:
+ return 63;
+ case 2:
+ return 127;
+ case 3:
+ return 195;
+ case 4:
+ return 254;
+ default:
+ return 255;
+ }
+}
+
+int
+junk_id3v2_load_popm (int version_major, playItem_t *it, uint8_t *readptr, unsigned synched_size, int *found_wmp_popm) {
+ char *email = readptr;
+
+ // fetch the email
+ while (*readptr && synched_size > 0) {
+ readptr++;
+ synched_size--;
+ }
+ if (!synched_size) {
+ trace ("POPM id is not null-terminated\n");
+ return -1;
+ }
+ readptr++;
+ synched_size--;
+
+ if (!synched_size) {
+ trace ("POPM doesn't have rating\n");
+ return -1;
+ }
+
+ // fetch rating
+ uint8_t rating = *readptr;
+ readptr++;
+ synched_size--;
+
+ // map to 0..5, compatible with WMP
+ unsigned stars = junk_stars_from_popm_rating (rating);
+
+ char str2;
+ snprintf (str, sizeof (str), "%d", stars);
+ pl_replace_meta(it, "RATING", str);
+
+ if (!strcasecmp (email, wmp_popm_email)) {
+ *found_wmp_popm = 1;
+ }
+
+ return 0;
+}
+
+static int
+junk_id3v2_remove_popm_with_email (DB_id3v2_tag_t *tag, const char *email) {
+ DB_id3v2_frame_t *frame = tag->frames;
+ DB_id3v2_frame_t *prev = NULL;
+
+ while (frame) {
+ DB_id3v2_frame_t *next = frame->next;
+ if (!strcmp (frame->id, "POPM") && !strcasecmp(frame->data, wmp_popm_email)) {
+ if (prev) {
+ prev->next = frame->next;
+ }
+ else {
+ tag->frames = frame->next;
+ }
+ free (frame);
+ }
+ else {
+ prev = frame;
+ }
+ frame = next;
+ }
+ return 0;
+}
+
+static DB_id3v2_frame_t *
+junk_id3v2_add_popm_with_email (DB_id3v2_tag_t *tag, const char *email, uint8_t rating, int have_playcount, uint8_t playcount) {
+ size_t l = strlen (email);
+ size_t s = l + 2;
+ if (have_playcount) {
+ s++;
+ }
+ DB_id3v2_frame_t *frame = calloc (1, sizeof(DB_id3v2_frame_t)+s);
+ strcpy (frame->id, "POPM");
+ frame->size = (uint32_t)s;
+
+ strcpy (frame->data, email);
+ frame->datal+1 = rating;
+
+ if (have_playcount) {
+ frame->datal+2 = playcount;
+ }
+
+ return junk_id3v2_append_frame (tag, frame);
+}
+
+int
+junk_id3v2_remove_ufid_frames (DB_id3v2_tag_t *tag, const char *frame_id, const char *owner) {
+ DB_id3v2_frame_t *prev = NULL;
+ for (DB_id3v2_frame_t *f = tag->frames; f; ) {
+ DB_id3v2_frame_t *next = f->next;
+ if (!strcmp (f->id, frame_id) && f->size >= strlen(owner) && !strcmp (f->data, owner)) {
+ if (prev) {
+ prev->next = f->next;
+ }
+ else {
+ tag->frames = f->next;
+ }
+ free (f);
+ }
+ else {
+ prev = f;
+ }
+ f = next;
+ }
+ return 0;
+}
+
+DB_id3v2_frame_t *
+junk_id3v2_add_ufid_frame (DB_id3v2_tag_t *tag, const char *owner, const char *id, int id_len) {
+ size_t ownerlen = strlen (owner);
+ size_t len = ownerlen + 1 + id_len;
+
+ // make a frame
+ trace ("calculated frame size = %d\n", len);
+ DB_id3v2_frame_t *f = malloc (len + sizeof (DB_id3v2_frame_t));
+ memset (f, 0, sizeof (DB_id3v2_frame_t));
+ strcpy (f->id, "UFID");
+ f->size = (int)len;
+ memcpy (f->data, owner, ownerlen+1);
+ memcpy (f->data+ownerlen+1, id, id_len);
+
+ return junk_id3v2_append_frame (tag, f);
+}
+
+static int
+junk_id3v2_load_txx (const char *sb_charset, int version_major, playItem_t *it, uint8_t *readptr, int synched_size) {
+ int decoded_size;
+ char *txx = convstr_id3v2 (sb_charset, version_major, *readptr, readptr+1, synched_size-1, &decoded_size);
+ if (!txx) {
+ return -1;
+ }
+
+ char *val = NULL;
+ for (char *p = txx; synched_size-- > 0; p++) {
+ if (*p == 0) {
+ val = p+1;
+ break;
+ }
+ }
+
+ if (val) {
+ // skip utf8 BOM (can be produced by iconv FEFF/FFFE)
+ size_t l = strlen (val);
+ uint8_t bom = { 0xEF, 0xBB, 0xBF };
+ if (l >= 3 && !memcmp (val, bom, 3)) {
+ val += 3;
+ }
+
+ if (!strcasecmp (txx, "replaygain_album_gain")) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, (float)atof (val));
+ }
+ else if (!strcasecmp (txx, "replaygain_album_peak")) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, (float)atof (val));
+ }
+ else if (!strcasecmp (txx, "replaygain_track_gain")) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, (float)atof (val));
+ }
+ else if (!strcasecmp (txx, "replaygain_track_peak")) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, (float)atof (val));
+ }
+ else if (!strcasecmp (txx, "date")) { // HACK: fb2k date support
+ pl_append_meta (it, "year", val);
+ }
+ else {
+ pl_append_meta_full (it, txx, val, (int)(decoded_size - (val - txx)+1));
+ }
+ }
+
+ free (txx);
+
+ return 0;
+}
+
+int
+junk_id3v2_add_genre (playItem_t *it, char *genre, int text_size, int version_major) {
+ int numeric = 0;
+ if (genre0 == '(') {
+ // find matching parenthesis
+ char *p = &genre1;
+ while (*p && *p != ')') {
+ if (!isdigit (*p)) {
+ break;
+ }
+ p++;
+ }
+ if (*p == ')') {
+ *p = 0;
+ memmove (genre, genre+1, p-genre);
+ numeric = 1;
+ }
+ }
+ if (!numeric) {
+ // check if it is numeric
+ const char *p = genre;
+ while (*p) {
+ if (!isdigit (*p)) {
+ break;
+ }
+ p++;
+ }
+ if (*p == 0 && p > genre) {
+ numeric = 1;
+ }
+ }
+
+ if (numeric) {
+ int genre_id = atoi (genre);
+ if (genre_id >= 0) {
+ const char *genre_str = NULL;
+ if (genre_id < ID3V1_GENRE_COUNT) {
+ genre_str = junk_genretblgenre_id;
+ }
+ else if (genre_id == 0xff) {
+ // genre_str = "None";
+ }
+ if (genre_str) {
+ pl_add_meta (it, "genre", genre_str);
+ return 0;
+ }
+ }
+ }
+ else if (!strcmp (genre, "CR")) {
+ pl_add_meta (it, "genre", "Cover");
+ }
+ else if (!strcmp (genre, "RX")) {
+ pl_add_meta (it, "genre", "Remix");
+ }
+ else {
+ if (version_major == 3) {
+ _split_multivalue (genre, text_size+1);
+ }
+ pl_append_meta_full (it, "genre", genre, text_size+1);
+ }
+
+ return 0;
+}
+
+
+static int
+junk_id3v2_set_metadata_from_frame (playItem_t *it, DB_id3v2_tag_t *id3v2_tag, DB_id3v2_frame_t *frame, const char *sb_charset, int *found_wmp_popm) {
+ int added = 0;
+
+ int version_major = id3v2_tag->version0;
+ int synched_size = frame->size;
+
+ uint8_t *readptr = frame->data;
+
+ const char *frameid = frame->id;
+
+ // parse basic 2.3/2.4 text frames
+ //const char *text_frames = { "TPE1", "TPE2", "TPOS", "TIT2", "TALB", "TCOP", "TCON", "TENC", "TPE3", "TCOM", "TRCK", "TYER", "TDRC", NULL };
+ //char **text_holders = { &artist, &band, &disc, &title, &album, &copyright, &genre, &vendor, &performer, &composer, &track, version_major == 3 ? &year : NULL, version_major == 4 ? &year : NULL, };
+ if (version_major == 3 || version_major == 4) {
+ if (strcmp (frameid, "TXXX")) {
+ for (int f = 0; frame_mappingf; f += FRAME_MAPPINGS) {
+ const char *frm_name = version_major == 3 ? frame_mappingf+MAP_ID3V23 : frame_mappingf+MAP_ID3V24;
+ if (frm_name && !strcmp (frameid, frm_name)) {
+ added = 1;
+ if (synched_size > MAX_TEXT_FRAME_SIZE) {
+ trace ("frame %s is too big, discard\n", frameid);
+ break;
+ }
+
+ int text_size;
+ char *text = convstr_id3v2 (sb_charset, version_major, readptr0, readptr+1, synched_size-1, &text_size);
+
+ // couple of simple tests
+ //char *text = convstr_id3v2 (4, 3, "текст1\0текст2", strlen ("текст1")*2+2);
+ //const char ucstext = { 0x42, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x41, 0x04, 0x42, 0x04, 0x31, 0x00, 0x00, 0x00, 0x42, 0x04, 0x35, 0x04, 0x3a, 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, 0x00 };
+ //char *text = convstr_id3v2 (4, 1, ucstext, sizeof (ucstext));
+
+ if (text && *text) {
+ if (!strcmp (frameid, "TRCK")) { // special case for track/totaltracks
+ junk_add_track_meta (it, text);
+ }
+ else if (!strcmp (frameid, "TPOS")) { // special case for disc/totaldiscs
+ junk_add_disc_meta (it, text);
+ }
+ else if (!strcmp (frameid, "TCON")) {
+ junk_id3v2_add_genre (it, text, text_size, version_major);
+ }
+ else {
+ if (version_major == 3 && _is_multivalue_field (frame_mappingf+MAP_DDB)) {
+ _split_multivalue (text, text_size+1);
+ }
+ pl_append_meta_full (it, frame_mappingf+MAP_DDB, text, text_size+1);
+ }
+ // if (text) {
+ // trace ("%s = %s\n", frameid, text);
+ // }
+ }
+ if (text) {
+ free (text);
+ }
+ break;
+ }
+ }
+ }
+
+ if (added) {
+ return 0;
+ }
+
+ if (!strcmp (frameid, "COMM")) {
+ if (synched_size < 4) {
+ trace ("COMM frame is too short, skipped\n");
+ return -1;
+ }
+
+ return junk_load_comm_frame (version_major, "comment", it, readptr, synched_size);
+ }
+ else if (!strcmp (frameid, "USLT")) {
+ if (synched_size < 4) {
+ trace ("COMM frame is too short, skipped\n");
+ return -1;
+ }
+
+ return junk_load_comm_frame (version_major, "UNSYNCED LYRICS", it, readptr, synched_size);
+ }
+ else if (it && !strcmp (frameid, "RVA2")) {
+ if (synched_size < 5) {
+ trace ("RVA2 frame is too short, skipped\n");
+ return -1;
+ }
+
+ return junk_id3v2_load_rva2(version_major, it, readptr, synched_size);
+ }
+ else if (it && !strcmp (frameid, "UFID")) {
+ if (synched_size < 2) {
+ trace ("UFID frame is too short, skipped\n");
+ return -1;
+ }
+ return junk_id3v2_load_ufid (version_major, it, readptr, synched_size);
+ }
+ else if (it && !strcmp (frameid, "POPM")) {
+ if (synched_size < 2) {
+ trace ("POPM frame is too short, skipped\n");
+ return -1;
+ }
+ if (*found_wmp_popm) {
+ return 0;
+ }
+ return junk_id3v2_load_popm (version_major, it, readptr, synched_size, found_wmp_popm);
+ }
+ else if (it && !strcmp (frameid, "TXXX")) {
+ if (synched_size < 2) {
+ trace ("TXXX frame is too short, skipped\n");
+ return -1;
+ }
+ return junk_id3v2_load_txx (sb_charset, version_major, it, readptr, synched_size);
+ }
+ }
+
+ // parse basic 2.2 text frames
+ else if (version_major == 2) {
+ int txx_added = 0;
+ if (strcmp (frameid, "TXX")) {
+ for (int f = 0; frame_mappingf; f++) {
+ if (frame_mappingf+MAP_ID3V22 && !strcmp (frameid, frame_mappingf+MAP_ID3V22)) {
+ txx_added = 1;
+ if (synched_size > MAX_TEXT_FRAME_SIZE) {
+ trace ("frame %s is too big, discard\n", frameid);
+ break;
+ }
+ int text_size;
+ char *text = convstr_id3v2 (sb_charset, version_major, readptr0, readptr+1, synched_size-1, &text_size);
+ if (text && *text) {
+ if (!strcmp (frameid, "TRK")) { // special case for track/totaltracks
+ junk_add_track_meta (it, text);
+ }
+ else if (!strcmp (frameid, "TPA")) { // special case for disc/totaldiscs
+ junk_add_disc_meta (it, text);
+ }
+ else if (!strcmp (frameid, "TCO")) {
+ junk_id3v2_add_genre (it, text, text_size, version_major);
+ }
+ else {
+ if (_is_multivalue_field (frame_mappingf+MAP_DDB)) {
+ _split_multivalue (text, text_size);
+ }
+ pl_append_meta_full(it, frame_mappingf+MAP_DDB, text, text_size+1);
+ }
+ free (text);
+ }
+ break;
+ }
+ }
+ }
+
+ if (txx_added) {
+ return 0;
+ }
+
+ if (!strcmp (frameid, "COM")) {
+ if (synched_size < 6) {
+ return -1;
+ }
+ return junk_load_comm_frame (version_major, "comment", it, readptr, synched_size);
+ }
+ else if (!strcmp (frameid, "ULT")) {
+ if (synched_size < 6) {
+ return -1;
+ }
+ return junk_load_comm_frame (version_major, "unsynced lyrics", it, readptr, synched_size);
+ }
+ else if (it && !strcmp (frameid, "TXX")) {
+ if (synched_size < 2) {
+ trace ("TXX frame is too short, skipped\n");
+ return -1;
+ }
+ return junk_id3v2_load_txx (sb_charset, version_major, it, readptr, synched_size);
+ }
+ }
+
+ // otherwise unknown frame
+ return -1;
+}
+
+// Detect single-byte charset for the whole tag.
+// Ignore unicode and non-text frames.
+static const char *
+junk_id3v2_detect_charset (DB_id3v2_tag_t *id3v2_tag) {
+ int sz = 1000*200;
+ char *buf = calloc (1, sz);
+ char *p = buf;
+
+ for (DB_id3v2_frame_t *frm = id3v2_tag->frames; frm; frm = frm->next) {
+ if (frm->id0 == 'T' && sz >= frm->size && frm->data0 == 0) {
+ memcpy (p, frm->data+1, frm->size-1);
+ p += frm->size-1;
+ sz -= frm->size-1;
+ }
+ }
+
+ const char *cs = junk_detect_charset_len (buf, (int)(p-buf));
+
+ free (buf);
+ return cs;
+}
+
+static int
+junk_id3v2_set_metadata (playItem_t *it, DB_id3v2_tag_t *id3v2_tag, const char *charset, int *found_wmp_popm) {
+ for (DB_id3v2_frame_t *f = id3v2_tag->frames; f; f = f->next) {
+ junk_id3v2_set_metadata_from_frame (it, id3v2_tag, f, charset, found_wmp_popm);
+ }
+ return 0;
+}
+
+int
+junk_id3v2_read_full (playItem_t *it, DB_id3v2_tag_t *tag_store, DB_FILE *fp) {
+ int err = -1;
+ if (!tag_store) {
+ return -1;
+ }
+ DB_id3v2_frame_t *tail = NULL;
+ if (!fp) {
+ trace ("bad call to junk_id3v2_read!\n");
+ return -1;
+ }
+ deadbeef->rewind (fp);
+ uint8_t header10;
+ if (deadbeef->fread (header, 1, 10, fp) != 10) {
+ return -1; // too short
+ }
+ if (strncmp (header, "ID3", 3)) {
+ return -1; // no tag
+ }
+ uint8_t version_major = header3;
+ uint8_t version_minor = header4;
+ if (version_major > 4 || version_major < 2) {
+ trace ("id3v2.%d.%d is unsupported\n", version_major, version_minor);
+ return -1; // unsupported
+ }
+ uint8_t flags = header5;
+ if (flags & 15) {
+ trace ("unrecognized flags: one of low 15 bits is set, value=0x%x\n", (int)flags);
+ return -1; // unsupported
+ }
+ int unsync = (flags & (1<<7)) ? 1 : 0;
+ int extheader = (flags & (1<<6)) ? 1 : 0;
+ int expindicator = (flags & (1<<5)) ? 1 : 0;
+ int footerpresent = (flags & (1<<4)) ? 1 : 0;
+#pragma unused(expindicator)
+#pragma unused(footerpresent)
+ // check for bad size
+ if ((header9 & 0x80) || (header8 & 0x80) || (header7 & 0x80) || (header6 & 0x80)) {
+ trace ("bad header size\n");
+ return -1; // bad header
+ }
+ uint32_t size = (header9 << 0) | (header8 << 7) | (header7 << 14) | (header6 << 21);
+
+ trace ("tag size: %d\n", size);
+ if (size == 0) {
+ return -1;
+ }
+
+ tag_store->version0 = version_major;
+ tag_store->version1 = version_minor;
+ tag_store->flags = flags;
+ // remove unsync flag
+ tag_store->flags &= ~ (1<<7);
+
+ uint8_t *tag = malloc (size);
+ if (!tag) {
+ fprintf (stderr, "junklib: out of memory while reading id3v2, tried to alloc %d bytes\n", size);
+ goto error;
+ }
+ if (deadbeef->fread (tag, 1, size, fp) != size) {
+ goto error; // bad size
+ }
+ uint8_t *readptr = tag;
+ trace ("version: 2.%d.%d, unsync: %d, extheader: %d, experimental: %d\n", version_major, version_minor, unsync, extheader, expindicator);
+ 
+ if (extheader) {
+ uint32_t sz = (readptr3 << 0) | (readptr2 << 7) | (readptr1 << 14) | (readptr0 << 21);
+ if (size < sz) {
+ trace ("error: size of ext header (%d) is greater than tag size\n", sz);
+ goto error; // bad size
+ }
+ readptr += sz;
+ }
+
+ int found_wmp_popm = 0;
+
+ while (readptr - tag <= size - 4 && *readptr) {
+ if (version_major == 3 || version_major == 4) {
+ trace ("pos %d of %d\n", readptr - tag, size);
+ char frameid5;
+ memcpy (frameid, readptr, 4);
+ frameid4 = 0;
+ readptr += 4;
+ if (readptr - tag >= size - 4) {
+ trace ("reached the end of tag\n");
+ break;
+ }
+
+ // a hack to support malformed ID3v2.2 frame names in 2.3+ tags
+ // find the correct frame names, and rename if possible
+ for (int f = 0; frame_mappingf; f += FRAME_MAPPINGS) {
+ const char *frm_name = version_major == 3 ? frame_mappingf+MAP_ID3V23 : frame_mappingf+MAP_ID3V24;
+ const char *frm_name22 = frame_mappingf+MAP_ID3V22;
+ if (frm_name && !strcmp (frameid, frm_name)) {
+ break;
+ }
+ else if (frm_name && frm_name22 && !strcmp (frameid, frm_name22)) {
+ strcpy (frameid, frm_name);
+ break;
+ }
+ }
+
+ uint32_t sz;
+ if (version_major == 4) {
+ sz = (readptr3 << 0) | (readptr2 << 7) | (readptr1 << 14) | (readptr0 << 21);
+ }
+ else if (version_major == 3) {
+ sz = (readptr3 << 0) | (readptr2 << 8) | (readptr1 << 16) | (readptr0 << 24);
+ }
+ else {
+ trace ("unknown id3v2 version (2.%d.%d)\n", version_major, version_minor);
+ goto error;
+ }
+ readptr += 4;
+ trace ("got frame %s, size %d, pos %d, tagsize %d\n", frameid, sz, readptr-tag, size);
+ if (readptr - tag >= size - sz) {
+ trace ("frame is out of tag bounds\n");
+ err = -1;
+ goto error; // size of frame is more than size of tag
+ }
+ if (sz < 1) {
+// err = 1;
+ break; // frame must be at least 1 byte long
+ }
+ uint8_t flags1 = readptr0;
+ uint8_t flags2 = readptr1;
+ readptr += 2;
+
+ if (!strcmp (frameid, "APIC")) {
+ // don't attempt to parse APIC when we're not planning to use it
+ if (tag_store == NULL) {
+ readptr += sz;
+ continue;
+ }
+ }
+ else if (sz > MAX_ID3V2_FRAME_SIZE) {
+ trace ("junk_id3v2_read_full: frame %s size is too big (%d), discarded\n", frameid, sz);
+ readptr += sz;
+ continue;
+ }
+
+ if (readptr - tag + sz > size) {
+ trace ("junk_id3v2_read_full: frame %s size is crossing beyond the end of tag (%d), discarded\n", frameid, sz);
+ readptr += sz;
+ continue;
+ }
+
+ int synched_size = sz;
+ if (unsync) {
+ int consumed = 0;
+ synched_size = junklib_id3v2_sync_frame (version_major, readptr, sz, &consumed);
+ sz = consumed;
+
+ trace ("size: %d/%d\n", synched_size, sz);
+ }
+
+ DB_id3v2_frame_t *frm = NULL;
+ frm = malloc (sizeof (DB_id3v2_frame_t) + sz);
+ if (!frm) {
+ fprintf (stderr, "junklib: failed to alloc %d bytes for id3v2 frame %s\n", (int)(sizeof (DB_id3v2_frame_t) + sz), frameid);
+ goto error;
+ }
+
+ memset (frm, 0, sizeof (DB_id3v2_frame_t));
+ if (tail) {
+ tail->next = frm;
+ }
+ tail = frm;
+ if (!tag_store->frames) {
+ tag_store->frames = frm;
+ }
+ strcpy (frm->id, frameid);
+ memcpy (frm->data, readptr, sz);
+ frm->size = synched_size;
+
+ frm->flags0 = flags1;
+ frm->flags1 = flags2;
+
+ if (version_major == 4) {
+ if (flags1 & 0x8f) {
+ // unknown flags
+ trace ("unknown status flags: %02x\n", flags1);
+ readptr += sz;
+ continue;
+ }
+ if (flags2 & 0xb0) {
+ // unknown flags
+ trace ("unknown format flags: %02x\n", flags2);
+ readptr += sz;
+ continue;
+ }
+
+ if (flags2 & 0x40) { // group id
+ trace ("frame has group id\n");
+ readptr++; // skip id
+ sz--;
+ }
+ if (flags2 & 0x08) { // compressed frame, ignore
+ trace ("frame is compressed, skipping\n");
+ readptr += sz;
+ continue;
+ }
+ if (flags2 & 0x04) { // encrypted frame, skip
+ trace ("frame is encrypted, skipping\n");
+ readptr += sz;
+ continue;
+ }
+ if (flags2 & 0x02) { // unsync, just do nothing
+ }
+ if (flags2 & 0x01) { // data size
+ synched_size = (readptr3 << 0) | (readptr2 << 7) | (readptr1 << 14) | (readptr0 << 21);
+ trace ("frame has extra size field = %d\n", synched_size);
+ readptr += 4;
+ sz -= 4;
+ }
+ }
+ else if (version_major == 3) {
+ if (flags1 & 0x1F) {
+ trace ("unknown status flags: %02x\n", flags1);
+ readptr += sz;
+ continue;
+ }
+ if (flags2 & 0x1F) {
+ trace ("unknown format flags: %02x\n", flags2);
+ readptr += sz;
+ continue;
+ }
+ if (flags2 & 0x80) {
+ trace ("frame is compressed, skipping\n");
+ readptr += sz;
+ continue;
+ }
+ if (flags2 & 0x40) {
+ trace ("frame is encrypted, skipping\n");
+ readptr += sz;
+ continue;
+ }
+ if (flags2 & 0x20) {
+ trace ("frame has group id\n");
+ readptr++; // skip id
+ sz--;
+ }
+ }
+
+ readptr += sz;
+
+ if (it) {
+ junk_id3v2_set_metadata_from_frame(it, tag_store, frm, "cp1252", &found_wmp_popm);
+ }
+ if (!tag_store) {
+ free (frm);
+ }
+ }
+ else if (version_major == 2) {
+ char frameid4;
+ memcpy (frameid, readptr, 3);
+ frameid3 = 0;
+ readptr += 3;
+ if (readptr - tag >= size - 3) {
+ break;
+ }
+ uint32_t sz = (readptr2 << 0) | (readptr1 << 8) | (readptr0 << 16);
+ readptr += 3;
+ if (readptr - tag >= size - sz) {
+ break; // size of frame is less than size of tag
+ }
+ if (sz < 1) {
+ break; // frame must be at least 1 byte long
+ }
+ if (!strcmp (frameid, "PIC")) {
+ // don't attempt to parse APIC when we're not planning to use it
+ if (tag_store == NULL) {
+ trace ("junk_id3v2_read_full: frame %s size is too big (%d), discarded\n", frameid, sz);
+ readptr += sz;
+ continue;
+ }
+ }
+ else if (sz > MAX_ID3V2_FRAME_SIZE) {
+ trace ("junk_id3v2_read_full: frame %s size is too big, discarded\n", frameid);
+ readptr += sz;
+ continue;
+ }
+
+ if (readptr - tag + sz > size) {
+ trace ("junk_id3v2_read_full: frame %s size is crossing beyond the end of tag (%d), discarded\n", frameid, sz);
+ readptr += sz;
+ continue;
+ }
+
+ int synched_size = sz;
+ if (unsync) {
+ int consumed = 0;
+ synched_size = junklib_id3v2_sync_frame (version_major, readptr, sz, &consumed);
+ sz = consumed;
+ }
+
+ DB_id3v2_frame_t *frm = malloc (sizeof (DB_id3v2_frame_t) + sz);
+ if (!frm) {
+ fprintf (stderr, "junklib: failed to alloc %d bytes for id3v2.2 frame %s\n", (int)(sizeof (DB_id3v2_frame_t) + sz), frameid);
+ goto error;
+ }
+
+ memset (frm, 0, sizeof (DB_id3v2_frame_t));
+ if (tail) {
+ tail->next = frm;
+ }
+ tail = frm;
+ if (!tag_store->frames) {
+ tag_store->frames = frm;
+ }
+ strcpy (frm->id, frameid);
+ memcpy (frm->data, readptr, synched_size);
+ frm->size = sz;
+// trace ("found id3v2.2 frame: %s, size=%d\n", frameid, sz);
+
+ readptr += sz;
+
+ if (it) {
+ junk_id3v2_set_metadata_from_frame(it, tag_store, frm, "cp1252", &found_wmp_popm);
+ }
+ if (!tag_store) {
+ free (frm);
+ }
+ }
+ else {
+ trace ("id3v2.%d (unsupported!)\n", version_minor);
+ }
+ }
+ err = 0;
+error:
+ if (err != 0) {
+ trace ("error parsing id3v2\n");
+ }
+
+ if (tag) {
+ free (tag);
+ }
+ if (tag_store && err != 0) {
+ while (tag_store->frames) {
+ DB_id3v2_frame_t *next = tag_store->frames->next;
+ free (tag_store->frames);
+ tag_store->frames = next;
+ }
+ }
+ return err;
+}
+
+int
+junk_id3v2_read (playItem_t *it, DB_FILE *fp) {
+ DB_id3v2_tag_t id3v2_tag;
+ memset (&id3v2_tag, 0, sizeof (id3v2_tag));
+ int res = junk_id3v2_read_full (NULL, &id3v2_tag, fp);
+ if (!res) {
+ // detect charset on all text fields
+ const char *charset = junk_id3v2_detect_charset (&id3v2_tag);
+ int found_wmp_popm = 0;
+ junk_id3v2_set_metadata (it, &id3v2_tag, charset, &found_wmp_popm);
+ }
+ if (id3v2_tag.version0 == 2) {
+ uint32_t f = pl_get_item_flags (it);
+ f |= DDB_TAG_ID3V22;
+ pl_set_item_flags (it, f);
+ }
+ else if (id3v2_tag.version0 == 3) {
+ uint32_t f = pl_get_item_flags (it);
+ f |= DDB_TAG_ID3V23;
+ pl_set_item_flags (it, f);
+ }
+ else if (id3v2_tag.version0 == 4) {
+ uint32_t f = pl_get_item_flags (it);
+ f |= DDB_TAG_ID3V24;
+ pl_set_item_flags (it, f);
+ }
+ deadbeef->junk_id3v2_free (&id3v2_tag);
+ return res;
+}
+
+const char *
+junk_detect_charset_len (const char *s, int len) {
+ // check if that's already utf8
+ if (u8_valid (s, len, NULL)) {
+ return NULL; // means no recoding required
+ }
+ // try shift-jis
+ if (enable_shift_jis_detection && can_be_shift_jis (s, len)) {
+ return "shift-jis";
+ }
+ // hack to add cp936 support
+ if (can_be_chinese (s, len)) {
+ return "cp936";
+ }
+ // check if that could be non-latin1 (too many nonascii chars)
+ if (can_be_cp1251 (s, len)) {
+ return "cp1251";
+ }
+
+ return "cp1252";
+}
+
+const char *
+junk_detect_charset (const char *s) {
+ size_t len = strlen (s);
+ return junk_detect_charset_len (s, (int)len);
+}
+
+int
+junk_recode (const char *in, int inlen, char *out, int outlen, const char *cs) {
+ return junk_iconv (in, inlen, out, outlen, cs, UTF8_STR);
+}
+
+int
+junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const char *id3v1_encoding) {
+ trace ("junk_rewrite_tags %X\n", junk_flags);
+ int err = -1;
+ char *buffer = NULL;
+ DB_FILE *fp = NULL;
+ int out = -1;
+
+ uint32_t item_flags = pl_get_item_flags (it);
+
+ // get options
+ int strip_id3v2 = junk_flags & JUNK_STRIP_ID3V2;
+ int strip_id3v1 = junk_flags & JUNK_STRIP_ID3V1;
+ int strip_apev2 = junk_flags & JUNK_STRIP_APEV2;
+ int write_id3v2 = junk_flags & JUNK_WRITE_ID3V2;
+ int write_id3v1 = junk_flags & JUNK_WRITE_ID3V1;
+ int write_apev2 = junk_flags & JUNK_WRITE_APEV2;
+
+ char tmppathPATH_MAX;
+ // find the beginning and the end of audio data
+ char fnamePATH_MAX;
+ pl_get_meta (it, ":URI", fname, sizeof (fname));
+ snprintf (tmppath, sizeof (tmppath), "%s.temp", fname);
+ fp = deadbeef->fopen (fname);
+ if (!fp) {
+ trace ("file not found %s\n", fname);
+ return -1;
+ }
+
+ int64_t fsize = deadbeef->fgetlength (fp);
+ int id3v2_size = 0;
+ int id3v2_start = junk_id3v2_find (fp, &id3v2_size);
+ if (id3v2_start == -1) {
+ id3v2_size = -1;
+ }
+
+ int32_t apev2_size;
+ uint32_t flags, numitems;
+ int64_t apev2_start = junk_apev2_find2 (fp, &apev2_size, &flags, &numitems);
+ if (apev2_start == -1) {
+ apev2_start = 0;
+ }
+
+ if (!strip_apev2 && !write_apev2) {
+ apev2_start = 0;
+ }
+
+ int64_t id3v1_start = junk_id3v1_find2 (fp);
+ if (id3v1_start == -1) {
+ id3v1_start = 0;
+ }
+
+ int64_t header = 0;
+ if (id3v2_size > 0) {
+ header = id3v2_start + id3v2_size;
+ }
+
+ int64_t footer = fsize;
+
+ if (id3v1_start > 0) {
+ footer = id3v1_start;
+ }
+ if (apev2_start > 0) {
+ footer = min (footer, apev2_start);
+ }
+
+ trace ("header size: %lld, footer size: %lld\n", header, fsize-footer);
+
+ // "TRCK" -- special case
+ // "TYER"/"TDRC" -- special case
+
+ // open output file
+ struct stat stat_struct;
+ if (stat(fname, &stat_struct) != 0) {
+ stat_struct.st_mode = 00640;
+ }
+ out = open (tmppath, O_CREAT | O_LARGEFILE | O_WRONLY | _O_BINARY, stat_struct.st_mode);
+ trace ("will write tags into %s\n", tmppath);
+ if (out < 0) {
+ fprintf (stderr, "cmp3_write_metadata: failed to open temp file %s\n", tmppath);
+ goto error;
+ }
+
+ DB_id3v2_tag_t id3v2;
+ DB_apev2_tag_t apev2;
+
+ memset (&id3v2, 0, sizeof (id3v2));
+ memset (&apev2, 0, sizeof (apev2));
+
+ if (!strip_id3v2 && !write_id3v2 && id3v2_size > 0) {
+ if (deadbeef->fseek (fp, id3v2_start, SEEK_SET) == -1) {
+ trace ("cmp3_write_metadata: failed to seek to original id3v2 tag position in %s\n", pl_find_meta (it, ":URI"));
+ goto error;
+ }
+ uint8_t *buf = malloc (id3v2_size);
+ if (!buf) {
+ trace ("cmp3_write_metadata: failed to alloc %d bytes for id3v2 tag\n", id3v2_size);
+ goto error;
+ }
+ if (deadbeef->fread (buf, 1, id3v2_size, fp) != id3v2_size) {
+ trace ("cmp3_write_metadata: failed to read original id3v2 tag from %s\n", pl_find_meta (it, ":URI"));
+ free (buf);
+ goto error;
+ }
+ if (write (out, buf, id3v2_size) != id3v2_size) {
+ trace ("cmp3_write_metadata: failed to copy original id3v2 tag from %s to temp file\n", pl_find_meta (it, ":URI"));
+ free (buf);
+ goto error;
+ }
+ free (buf);
+ }
+ else if (write_id3v2) {
+ trace ("writing id3v2\n");
+ if (id3v2_size <= 0 || strip_id3v2 || deadbeef->junk_id3v2_read_full (NULL, &id3v2, fp) != 0) {
+ deadbeef->junk_id3v2_free (&id3v2);
+ memset (&id3v2, 0, sizeof (id3v2));
+ id3v2.version0 = (uint8_t)id3v2_version;
+ }
+ // convert to required version
+ while (id3v2.version0 != id3v2_version) {
+ DB_id3v2_tag_t converted;
+ memset (&converted, 0, sizeof (converted));
+ if (id3v2.version0 == 2) {
+ if (deadbeef->junk_id3v2_convert_22_to_24 (&id3v2, &converted) != 0) {
+ goto error;
+ }
+ deadbeef->junk_id3v2_free (&id3v2);
+ memcpy (&id3v2, &converted, sizeof (DB_id3v2_tag_t));
+ continue;
+ }
+ else if (id3v2.version0 == 3) {
+ if (deadbeef->junk_id3v2_convert_23_to_24 (&id3v2, &converted) != 0) {
+ goto error;
+ }
+ deadbeef->junk_id3v2_free (&id3v2);
+ memcpy (&id3v2, &converted, sizeof (DB_id3v2_tag_t));
+ continue;
+ }
+ else if (id3v2.version0 == 4) {
+ if (deadbeef->junk_id3v2_convert_24_to_23 (&id3v2, &converted) != 0) {
+ goto error;
+ }
+ deadbeef->junk_id3v2_free (&id3v2);
+ memcpy (&id3v2, &converted, sizeof (DB_id3v2_tag_t));
+ continue;
+ }
+ }
+
+ junk_id3v2_remove_all_txxx_frames (&id3v2);
+
+ pl_lock ();
+ {
+ // COMM
+ junk_id3v2_remove_frames (&id3v2, "COMM");
+ const char *val = pl_find_meta (it, "comment");
+ if (val && *val) {
+ junk_id3v2_add_comment_frame (&id3v2, "COMM", "eng", "", val);
+ }
+ // USLT
+ junk_id3v2_remove_frames (&id3v2, "USLT");
+ val = pl_find_meta (it, "unsynced lyrics");
+ if (val && *val) {
+ junk_id3v2_add_comment_frame (&id3v2, "USLT", "eng", "", val);
+ }
+ // UFID
+ junk_id3v2_remove_ufid_frames (&id3v2, "UFID", "http://musicbrainz.org");
+ val = pl_find_meta (it, "musicbrainz_trackid");
+ if (val && *val) {
+ junk_id3v2_add_ufid_frame (&id3v2, "http://musicbrainz.org", val, (int)strlen (val));
+ }
+
+ // POPM
+ val = pl_find_meta(it, "rating");
+ if (val && *val) {
+ // find and update an existing frame, keep playcount
+ DB_id3v2_frame_t *frame = id3v2.frames;
+ DB_id3v2_frame_t *frame_popm = NULL;
+ for (; frame; frame = frame->next) {
+ if (!strcmp (frame->id, "POPM")) {
+ frame_popm = frame;
+ if (!strcasecmp(frame->data, wmp_popm_email)) {
+ break;
+ }
+ }
+ }
+
+ int have_playcount = 0;
+ uint8_t pcnt = 0;
+
+ if (frame_popm) {
+ // has playcount?
+ const char *email = frame_popm->data;
+ size_t len = strlen(email)+1;
+ if (len+1 < frame_popm->size) {
+ have_playcount = 1;
+ pcnt = frame_popm->datalen;
+ }
+ }
+
+
+ junk_id3v2_remove_popm_with_email(&id3v2, wmp_popm_email);
+ junk_id3v2_add_popm_with_email (&id3v2, wmp_popm_email, junk_popm_rating_from_stars(atoi(val)), have_playcount, pcnt);
+ }
+ else {
+ junk_id3v2_remove_frames (&id3v2, "POPM");
+ }
+ }
+ pl_unlock ();
+
+ // remove all known normal frames (they will be refilled from track metadata)
+ int idx = id3v2.version0 == 3 ? MAP_ID3V23 : MAP_ID3V24;
+ for (int i = 0; frame_mappingi; i += FRAME_MAPPINGS) {
+ if (frame_mappingi+idx) {
+ junk_id3v2_remove_frames (&id3v2, frame_mappingi+idx);
+ trace ("removed frame %s\n", frame_mappingi+idx);
+ }
+ }
+
+ DB_metaInfo_t *meta = pl_get_metadata_head (it);
+ while (meta) {
+ if (strchr (":!_", meta->key0)) {
+ break;
+ }
+
+ int noremap = 0;
+ int mapidx = -1;
+ for (int i = 0; frame_mappingi; i += FRAME_MAPPINGS) {
+ if (!strcasecmp (meta->key, frame_mappingi+MAP_DDB)) {
+ const char *frm_name = id3v2_version == 3 ? frame_mappingi+MAP_ID3V23 : frame_mappingi+MAP_ID3V24;
+ if (frm_name) {
+ // field is known and supported for this tag version
+ trace ("add_frame %s %s\n", frm_name, meta->value);
+ _id3v2_append_combined_text_frame_from_meta (&id3v2, frm_name, meta);
+ noremap = 1;
+ }
+ mapidx = i;
+ break;
+ }
+ }
+
+ // frames which should not remap to TXXX
+ static const char *txxx_no_fallbacks = {
+ "comment",
+ "unsynced lyrics",
+ "track"
+ "numtracks"
+ "disc"
+ "numdiscs",
+ NULL
+ };
+
+ if (!noremap) {
+ if (mapidx >= 0) {
+ for (int i = 0; txxx_no_fallbacksi; i++) {
+ if (!strcasecmp (txxx_no_fallbacksi, meta->key)) {
+ noremap = 1;
+ break;
+ }
+ }
+ }
+ }
+
+ // is this a text frame that needs remapping to TXXX?
+ if (!noremap) {
+ if (!frame_mappingmapidx+MAP_ID3V24 || frame_mappingmapidx+MAP_ID3V240 != 'T') {
+ noremap = 1;
+ }
+ }
+
+ if (!noremap) {
+ // add as txxx
+ int out_size;
+
+ int needs_free;
+ const char *tag_value;
+ if (id3v2.version0 == 4) {
+ tag_value = _get_combined_meta_value (meta, &out_size, "\0", 1, &needs_free);
+ }
+ else if (id3v2.version0 == 3) {
+ tag_value = _get_combined_meta_value (meta, &out_size, " / ", 3, &needs_free);
+ }
+ else {
+ assert (0);
+ }
+ trace ("adding unknown frame as TXX %s=%s\n", meta->key, tag_value);
+ junk_id3v2_remove_txxx_frame (&id3v2, meta->key);
+ junk_id3v2_add_txxx_frame (&id3v2, meta->key, tag_value, out_size);
+ if (needs_free) {
+ free ((char *)tag_value);
+ }
+ }
+ meta = meta->next;
+ }
+
+ pl_lock ();
+ {
+ // add tracknumber/totaltracks
+ const char *track = pl_find_meta (it, "track");
+ const char *totaltracks = pl_find_meta (it, "numtracks");
+ if (track && totaltracks) {
+ char s100;
+ snprintf (s, sizeof (s), "%s/%s", track, totaltracks);
+ junk_id3v2_remove_frames (&id3v2, "TRCK");
+ junk_id3v2_add_text_frame (&id3v2, "TRCK", s);
+ }
+ else if (track) {
+ junk_id3v2_remove_frames (&id3v2, "TRCK");
+ junk_id3v2_add_text_frame (&id3v2, "TRCK", track);
+ }
+ // add discnumber/totaldiscs
+ const char *disc = pl_find_meta (it, "disc");
+ const char *totaldiscs = pl_find_meta (it, "numdiscs");
+ if (disc && totaldiscs) {
+ char s100;
+ snprintf (s, sizeof (s), "%s/%s", disc, totaldiscs);
+ junk_id3v2_remove_frames (&id3v2, "TPOS");
+ junk_id3v2_add_text_frame (&id3v2, "TPOS", s);
+ }
+ else if (disc) {
+ junk_id3v2_remove_frames (&id3v2, "TPOS");
+ junk_id3v2_add_text_frame (&id3v2, "TPOS", disc);
+ }
+ }
+ pl_unlock ();
+
+ // remove and re-add replaygain id3v2 frames
+ for (int n = 0; ddb_internal_rg_keysn; n++) {
+ junk_id3v2_remove_txxx_frame (&id3v2, tag_rg_namesn);
+ if (pl_find_meta (it, ddb_internal_rg_keysn)) {
+ float value = pl_get_item_replaygain (it, n);
+ char s100;
+ // https://wiki.hydrogenaud.io/index.php?title=ReplayGain_2.0_specification#Metadata_format
+ switch (n) {
+ case DDB_REPLAYGAIN_ALBUMGAIN:
+ case DDB_REPLAYGAIN_TRACKGAIN:
+ snprintf (s, sizeof (s), "%.2f dB", value);
+ break;
+ case DDB_REPLAYGAIN_ALBUMPEAK:
+ case DDB_REPLAYGAIN_TRACKPEAK:
+ snprintf (s, sizeof (s), "%.6f", value);
+ break;
+ }
+ junk_id3v2_add_txxx_frame (&id3v2, tag_rg_namesn, s, strlen (s));
+ }
+ }
+
+ // write tag
+ if (junk_id3v2_write2 (out, &id3v2) != 0) {
+ trace ("cmp3_write_metadata: failed to write id3v2 tag to %s\n", pl_find_meta (it, ":URI"))
+ goto error;
+ }
+ }
+
+ // now write audio data
+ buffer = malloc (8192);
+ deadbeef->fseek (fp, header, SEEK_SET);
+ int64_t writesize = fsize;
+ if (footer > 0) {
+ writesize -= (fsize - footer);
+ }
+ writesize -= header;
+ trace ("writesize: %d, id3v1_start: %d(%d), apev2_start: %d, footer: %d\n", writesize, id3v1_start, fsize-id3v1_start, apev2_start, footer);
+
+ while (writesize > 0) {
+ size_t rb = min (8192, writesize);
+ rb = deadbeef->fread (buffer, 1, rb, fp);
+ if (rb < 0) {
+ fprintf (stderr, "junk_write_id3v2: error reading input data\n");
+ goto error;
+ }
+ if (write (out, buffer, rb) != rb) {
+ fprintf (stderr, "junk_write_id3v2: error writing output file\n");
+ goto error;
+ }
+ if (rb == 0) {
+ break; // eof
+ }
+ writesize -= rb;
+ }
+
+ if (!write_apev2 && !strip_apev2 && apev2_start != 0) {
+ trace ("copying original apev2 tag\n");
+ if (deadbeef->fseek (fp, apev2_start, SEEK_SET) == -1) {
+ trace ("cmp3_write_metadata: failed to seek to original apev2 tag position in %s\n", pl_find_meta (it, ":URI"));
+ goto error;
+ }
+ uint8_t *buf = malloc (apev2_size);
+ if (!buf) {
+ trace ("cmp3_write_metadata: failed to alloc %d bytes for apev2 tag\n", apev2_size);
+ goto error;
+ }
+ if (deadbeef->fread (buf, 1, apev2_size, fp) != apev2_size) {
+ trace ("cmp3_write_metadata: failed to read original apev2 tag from %s\n", pl_find_meta (it, ":URI"));
+ free (buf);
+ goto error;
+ }
+ if (write (out, buf, apev2_size) != apev2_size) {
+ trace ("cmp3_write_metadata: failed to copy original apev2 tag from %s to temp file\n", pl_find_meta (it, ":URI"));
+ free (buf);
+ goto error;
+ }
+ free (buf);
+ }
+ else if (write_apev2) {
+ trace ("writing new apev2 tag (strip=%d)\n", strip_apev2);
+ if (strip_apev2 || junk_apev2_read_full (NULL, &apev2, fp) != 0) {
+ deadbeef->junk_apev2_free (&apev2);
+ memset (&apev2, 0, sizeof (apev2));
+ }
+
+ // remove all text frames
+ junk_apev2_remove_all_text_frames (&apev2);
+
+ // add all basic frames
+ DB_metaInfo_t *meta = pl_get_metadata_head (it);
+ while (meta) {
+ if (strchr (":!_", meta->key0)) {
+ break;
+ }
+ int i;
+ for (i = 0; frame_mappingi; i += FRAME_MAPPINGS) {
+ if (!strcasecmp (meta->key, frame_mappingi+MAP_DDB) && frame_mappingi+MAP_APEV2) {
+ trace ("apev2 appending known field: %s=%s\n", meta->key, meta->value);
+ _apev2_append_combined_text_frame_from_meta (&apev2, frame_mappingi+MAP_APEV2, meta);
+ break;
+ }
+ }
+ if (!frame_mappingi
+ && strcasecmp (meta->key, "track")
+ && strcasecmp (meta->key, "numtracks")
+ && strcasecmp (meta->key, "disc")
+ && strcasecmp (meta->key, "numdiscs")
+ ) {
+ trace ("apev2 writing unknown field: %s=%s\n", meta->key, meta->value);
+ _apev2_append_combined_text_frame_from_meta (&apev2, meta->key, meta);
+ }
+ meta = meta->next;
+ }
+
+ {
+ pl_lock ();
+ // add tracknumber/totaltracks
+ const char *track = pl_find_meta (it, "track");
+ const char *totaltracks = pl_find_meta (it, "numtracks");
+ if (track && totaltracks) {
+ char s100;
+ snprintf (s, sizeof (s), "%s/%s", track, totaltracks);
+ junk_apev2_remove_frames (&apev2, "Track");
+ junk_apev2_add_text_frame (&apev2, "Track", s);
+ }
+ else if (track) {
+ junk_apev2_remove_frames (&apev2, "Track");
+ junk_apev2_add_text_frame (&apev2, "Track", track);
+ }
+ // add discnumber/totaldiscs
+ const char *disc = pl_find_meta (it, "disc");
+ const char *totaldiscs = pl_find_meta (it, "numdiscs");
+ if (disc && totaldiscs) {
+ char s100;
+ snprintf (s, sizeof (s), "%s/%s", disc, totaldiscs);
+ junk_apev2_remove_frames (&apev2, "disc");
+ junk_apev2_add_text_frame (&apev2, "disc", s);
+ }
+ else if (disc) {
+ junk_apev2_remove_frames (&apev2, "disc");
+ junk_apev2_add_text_frame (&apev2, "disc", disc);
+ }
+ pl_unlock ();
+ }
+
+ // remove and re-add replaygain apev2 frames
+ for (int n = 0; ddb_internal_rg_keysn; n++) {
+ junk_apev2_remove_frames (&apev2, tag_rg_namesn);
+ if (pl_find_meta (it, ddb_internal_rg_keysn)) {
+ float value = pl_get_item_replaygain (it, n);
+ char s100;
+ // https://wiki.hydrogenaud.io/index.php?title=ReplayGain_2.0_specification#Metadata_format
+ switch (n) {
+ case DDB_REPLAYGAIN_ALBUMGAIN:
+ case DDB_REPLAYGAIN_TRACKGAIN:
+ snprintf (s, sizeof (s), "%.2f dB", value);
+ break;
+ case DDB_REPLAYGAIN_ALBUMPEAK:
+ case DDB_REPLAYGAIN_TRACKPEAK:
+ snprintf (s, sizeof (s), "%.6f", value);
+ break;
+ }
+ junk_apev2_add_text_frame (&apev2, tag_rg_namesn, s);
+ }
+ }
+
+ // write tag
+ if (junk_apev2_write2 (out, &apev2, 0, 1) != 0) {
+ trace ("cmp3_write_metadata: failed to write apev2 tag to %s\n", pl_find_meta (it, ":URI"))
+ goto error;
+ }
+ }
+
+ if (!write_id3v1 && !strip_id3v1 && id3v1_start != 0) {
+ trace ("copying original id3v1 tag %d %d %d\n", write_id3v1, strip_id3v1, id3v1_start);
+ if (deadbeef->fseek (fp, id3v1_start, SEEK_SET) == -1) {
+ trace ("cmp3_write_metadata: failed to seek to original id3v1 tag position in %s\n", pl_find_meta (it, ":URI"));
+ goto error;
+ }
+ char buf128;
+ if (deadbeef->fread (buf, 1, 128, fp) != 128) {
+ trace ("cmp3_write_metadata: failed to read original id3v1 tag from %s\n", pl_find_meta (it, ":URI"));
+ goto error;
+ }
+ if (write (out, buf, 128) != 128) {
+ trace ("cmp3_write_metadata: failed to copy id3v1 tag from %s to temp file\n", pl_find_meta (it, ":URI"));
+ goto error;
+ }
+ }
+ else if (write_id3v1) {
+ trace ("writing new id3v1 tag\n");
+ if (junk_id3v1_write2 (out, it, id3v1_encoding) != 0) {
+ trace ("cmp3_write_metadata: failed to write id3v1 tag to %s\n", pl_find_meta (it, ":URI"))
+ goto error;
+ }
+ }
+
+ if (strip_id3v1 && !write_id3v1) {
+ item_flags &= ~DDB_TAG_ID3V1;
+ }
+ if (strip_id3v2 && !write_id3v2) {
+ item_flags &= ~(DDB_TAG_ID3V22|DDB_TAG_ID3V23|DDB_TAG_ID3V24);
+ }
+ if (strip_apev2 && !write_apev2) {
+ item_flags &= ~DDB_TAG_APEV2;
+ }
+
+ if (write_id3v1) {
+ item_flags |= DDB_TAG_ID3V1;
+ }
+ if (write_id3v2) {
+ item_flags &= ~(DDB_TAG_ID3V22|DDB_TAG_ID3V23|DDB_TAG_ID3V24);
+ item_flags |= id3v2_version == 3 ? DDB_TAG_ID3V23 : DDB_TAG_ID3V24;
+ }
+ if (write_apev2) {
+ item_flags |= DDB_TAG_APEV2;
+ }
+
+ pl_set_item_flags (it, item_flags);
+ err = 0;
+error:
+ if (fp) {
+ deadbeef->fclose (fp);
+ }
+ if (out) {
+ close (out);
+ out = -1;
+ }
+ if (buffer) {
+ free (buffer);
+ }
+ if (!err) {
+ rename (tmppath, fname);
+ }
+ else {
+ unlink (tmppath);
+ }
+ return err;
+}
+
+void
+junk_enable_cp1251_detection (int enable) {
+ enable_cp1251_detection = enable;
+}
+
+void
+junk_enable_cp936_detection (int enable) {
+ enable_cp936_detection = enable;
+}
+
+void
+junk_enable_shift_jis_detection (int enable) {
+ enable_shift_jis_detection = enable;
+}
+
+void
+junk_configchanged (void) {
+ int cp1251 = conf_get_int ("junk.enable_cp1251_detection", 1);
+ int cp936 = conf_get_int ("junk.enable_cp936_detection", 0);
+ int shift_jis = conf_get_int ("junk.enable_shift_jis_detection", 0);
+ conf_get_str("junk.multivalue_fields", DEFAULT_MULTIVALUE_FIELDS, junk_multivalue_fields, sizeof (junk_multivalue_fields));
+ junk_enable_cp1251_detection (cp1251);
+ junk_enable_cp936_detection (cp936);
+ junk_enable_shift_jis_detection (shift_jis);
+}

deadbeef-1.9.6.tar.bz2/src/junklib.h Added

@@ -0,0 +1,159 @@
+/* junklib -- library for reading tags from various audio files for deadbeef player
+ http://deadbeef.sourceforge.net
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __JUNKLIB_H
+#define __JUNKLIB_H
+
+#include <stdio.h>
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct playItem_s;
+
+extern const char *ddb_internal_rg_keys;
+
+int
+junk_id3v1_read (struct playItem_s *it, DB_FILE *fp);
+
+int
+junk_id3v1_find (DB_FILE *fp);
+
+int
+junk_id3v1_write (FILE *fp, struct playItem_s *it, const char *enc);
+
+int
+junk_id3v2_find (DB_FILE *fp, int *psize);
+
+int
+junk_id3v2_read_full (struct playItem_s *it, DB_id3v2_tag_t *tag, DB_FILE *fp);
+
+int
+junk_id3v2_convert_24_to_23 (DB_id3v2_tag_t *tag24, DB_id3v2_tag_t *tag23);
+
+int
+junk_id3v2_convert_23_to_24 (DB_id3v2_tag_t *tag23, DB_id3v2_tag_t *tag24);
+
+int
+junk_id3v2_convert_22_to_24 (DB_id3v2_tag_t *tag22, DB_id3v2_tag_t *tag24);
+
+int
+junk_id3v2_convert_apev2_to_24 (DB_apev2_tag_t *ape, DB_id3v2_tag_t *tag24);
+
+DB_id3v2_frame_t *
+junk_id3v2_add_text_frame (DB_id3v2_tag_t *tag, const char *frame_id, const char *value);
+
+DB_id3v2_frame_t *
+junk_id3v2_add_text_frame2 (DB_id3v2_tag_t *tag, const char *frame_id, const char *value, size_t value_size);
+
+int
+junk_id3v2_remove_frames (DB_id3v2_tag_t *tag, const char *frame_id);
+
+int
+junk_id3v2_write (FILE *file, DB_id3v2_tag_t *tag);
+
+void
+junk_id3v2_free (DB_id3v2_tag_t *tag);
+
+int
+junk_id3v2_read (struct playItem_s *it, DB_FILE *fp);
+
+int
+junk_apev2_read_full (struct playItem_s *it, DB_apev2_tag_t *tag_store, DB_FILE *fp);
+
+int
+junk_apev2_read_full_mem (struct playItem_s *it, DB_apev2_tag_t *tag_store, char *mem, int memsize);
+
+int
+junk_apev2_read (struct playItem_s *it, DB_FILE *fp);
+
+int
+junk_apev2_read_mem (struct playItem_s *it, char *mem, int size);
+
+int
+junk_apev2_find (DB_FILE *fp, int32_t *psize, uint32_t *pflags, uint32_t *pnumitems);
+
+DB_apev2_frame_t *
+junk_apev2_add_text_frame (DB_apev2_tag_t *tag, const char *frame_id, const char *value);
+
+int
+junk_apev2_remove_frames (DB_apev2_tag_t *tag, const char *frame_id);
+
+void
+junk_apev2_free (DB_apev2_tag_t *tag);
+
+int
+junk_apev2_write (FILE *fp, DB_apev2_tag_t *tag, int write_header, int write_footer);
+
+int
+junk_get_leading_size_stdio (FILE *fp);
+
+int
+junk_get_leading_size (DB_FILE *fp);
+
+const char *
+junk_detect_charset (const char *s);
+
+int
+junk_iconv (const char *in, int inlen, char *out, int outlen, const char *cs_in, const char *cs_out);
+
+int
+junk_recode (const char *in, int inlen, char *out, int outlen, const char *cs);
+
+int
+junk_rewrite_tags (struct playItem_s *it, uint32_t junk_flags, int id3v2_version, const char *id3v1_encoding);
+
+void
+junk_enable_cp1251_detection (int enable);
+
+void
+junk_configchanged (void);
+
+void
+junk_enable_cp936_detection (int enable);
+
+const char *
+junk_detect_charset_len (const char *s, int len);
+
+int
+junk_get_tail_size (DB_FILE *fp);
+
+void
+junk_get_tag_offsets (DB_FILE *fp, uint32_t *head, uint32_t *tail);
+
+unsigned
+junk_stars_from_popm_rating (uint8_t rating);
+
+uint8_t
+junk_popm_rating_from_stars (unsigned stars);
+
+void
+junk_make_tdrc_string(char *tdrc, size_t tdrc_size, int year, int month, int day, int hour, int minute);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __JUNKLIB_H

deadbeef-1.9.6.tar.bz2/src/logger.c Added

@@ -0,0 +1,246 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2016 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdlib.h>
+#include "logger.h"
+#include <deadbeef/deadbeef.h>
+#include "threading.h"
+
+typedef struct logger_s {
+ void (*log) (DB_plugin_t *plugin, uint32_t layers, const char *text, void *ctx);
+ void *ctx;
+ struct logger_s *next;
+} logger_t;
+
+static uint32_t _log_layers = DDB_LOG_LAYER_DEFAULT | DDB_LOG_LAYER_INFO;
+static logger_t *_loggers;
+static uint64_t _mutex;
+
+// This buffer is used during the initialization time, before there are any listeners.
+// As soon as the first listener registers -- it gets a callback with this buffer, then buffering stops.
+// Only error messages are buffered (DDB_LOG_LAYER_DEFAULT)
+#define INIT_BUFFER_SIZE 32768
+static char *init_buffer;
+static char *init_buffer_ptr;
+
+static char *init_buffer_info;
+static char *init_buffer_info_ptr;
+
+
+#ifdef ANDROID
+#include <android/log.h>
+static void
+console_write (const char *text) {
+ __android_log_write(ANDROID_LOG_INFO,ANDROID_LOGGER_TAG,text);
+}
+#else
+static void
+console_write (const char *text) {
+ fwrite (text, strlen(text), 1, stderr);
+ fflush (stderr);
+}
+#endif
+
+static void
+_log_internal (DB_plugin_t *plugin, uint32_t layers, const char *text) {
+ mutex_lock (_mutex);
+ console_write (text);
+ size_t len = strlen (text);
+ for (logger_t *l = _loggers; l; l = l->next) {
+ l->log (plugin, layers, text, l->ctx);
+ }
+ if (init_buffer && (layers == DDB_LOG_LAYER_DEFAULT)) {
+ if (init_buffer_ptr - init_buffer + len + 1 < INIT_BUFFER_SIZE) {
+ memcpy (init_buffer_ptr, text, len);
+ init_buffer_ptr += len;
+ *init_buffer_ptr = 0;
+ }
+ }
+ if (init_buffer_info && (layers == DDB_LOG_LAYER_INFO)) {
+ if (init_buffer_info_ptr - init_buffer_info + len + 1 < INIT_BUFFER_SIZE) {
+ memcpy (init_buffer_info_ptr, text, len);
+ init_buffer_info_ptr += len;
+ *init_buffer_info_ptr = 0;
+ }
+ }
+ mutex_unlock(_mutex);
+}
+
+static int
+_is_log_visible (DB_plugin_t *plugin, uint32_t layers) {
+ if (plugin && !(plugin->flags&DDB_PLUGIN_FLAG_LOGGING)) {
+ return 0;
+ }
+ if (layers && !(layers & _log_layers)) {
+ return 0;
+ }
+
+ return 1;
+}
+
+int
+ddb_logger_init (void) {
+ _mutex = mutex_create ();
+ if (!_mutex) {
+ return -1;
+ }
+ init_buffer = calloc(1, INIT_BUFFER_SIZE);
+ init_buffer_ptr = init_buffer;
+ init_buffer_info = calloc(1, INIT_BUFFER_SIZE);
+ init_buffer_info_ptr = init_buffer_info;
+ return 0;
+}
+
+void
+ddb_logger_stop_buffering (void) {
+ mutex_lock (_mutex);
+ if (init_buffer) {
+ free (init_buffer);
+ init_buffer = init_buffer_ptr = NULL;
+ }
+ if (init_buffer_info) {
+ free (init_buffer_info);
+ init_buffer_info = init_buffer_info_ptr = NULL;
+ }
+ mutex_unlock (_mutex);
+}
+
+void
+ddb_logger_free (void) {
+ if (_mutex) {
+ mutex_lock (_mutex);
+
+ ddb_logger_stop_buffering ();
+
+ while (_loggers) {
+ ddb_log_viewer_unregister(_loggers->log, _loggers->ctx);
+ }
+
+ mutex_free (_mutex);
+ _mutex = 0;
+ }
+}
+
+void
+ddb_log_detailed (DB_plugin_t *plugin, uint32_t layers, const char *fmt, ...) {
+ if (!_is_log_visible(plugin, layers)) {
+ return;
+ }
+
+ char text2048;
+ va_list ap;
+ va_start(ap, fmt);
+ (void) vsnprintf(text, sizeof (text), fmt, ap);
+ va_end(ap);
+
+ _log_internal (plugin, layers, text);
+}
+
+void
+ddb_vlog_detailed (DB_plugin_t *plugin, uint32_t layers, const char *fmt, va_list ap) {
+ if (!_is_log_visible(plugin, layers)) {
+ return;
+ }
+
+ char text2048;
+ (void) vsnprintf(text, sizeof (text), fmt, ap);
+
+ _log_internal (plugin, layers, text);
+}
+
+void
+ddb_log (const char *fmt, ...) {
+ char text2048;
+ va_list ap;
+ va_start(ap, fmt);
+ (void) vsnprintf(text, sizeof (text), fmt, ap);
+ va_end(ap);
+
+ _log_internal (NULL, 0, text);
+}
+
+void
+ddb_vlog (const char *fmt, va_list ap) {
+ char text2048;
+ (void) vsnprintf(text, sizeof (text), fmt, ap);
+
+ _log_internal (NULL, 0, text);
+}
+
+void
+ddb_log_viewer_register (void (*callback)(DB_plugin_t *plugin, uint32_t layers, const char *text, void *ctx), void *ctx) {
+ mutex_lock(_mutex);
+
+ for (logger_t *l = _loggers; l; l = l->next) {
+ if (l->log == callback && l->ctx == ctx) {
+ mutex_unlock(_mutex);
+ return;
+ }
+ }
+
+ logger_t *logger = calloc (1, sizeof (logger_t));
+ logger->log = callback;
+ logger->ctx = ctx;
+ logger->next = _loggers;
+
+ _loggers = logger;
+
+ if (init_buffer) {
+ if (*init_buffer) {
+ callback (NULL, DDB_LOG_LAYER_DEFAULT, init_buffer, ctx);
+ }
+ }
+
+ if (init_buffer_info) {
+ if (*init_buffer_info) {
+ callback (NULL, DDB_LOG_LAYER_INFO, init_buffer_info, ctx);
+ }
+ }
+
+ ddb_logger_stop_buffering ();
+
+ mutex_unlock(_mutex);
+}
+
+void
+ddb_log_viewer_unregister (void (*callback)(DB_plugin_t *plugin, uint32_t layers, const char *text, void *ctx), void *ctx) {
+ mutex_lock(_mutex);
+ logger_t *prev = NULL;
+ for (logger_t *l = _loggers; l; l = l->next) {
+ if (l->log == callback && l->ctx == ctx) {
+ if (prev) {
+ prev->next = l->next;
+ }
+ else {
+ _loggers = l->next;
+ }
+ free (l);
+ break;
+ }
+ prev = l;
+ }
+ mutex_unlock(_mutex);
+}

deadbeef-1.9.6.tar.bz2/src/logger.h Added

@@ -0,0 +1,64 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2016 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef logger_h
+#define logger_h
+
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int
+ddb_logger_init (void);
+
+void
+ddb_logger_free (void);
+
+void
+ddb_logger_stop_buffering (void);
+
+void
+ddb_log_detailed (DB_plugin_t *plugin, uint32_t layers, const char *fmt, ...);
+
+void
+ddb_vlog_detailed (DB_plugin_t *plugin, uint32_t layers, const char *fmt, va_list ap);
+
+void
+ddb_log (const char *fmt, ...);
+
+void
+ddb_vlog (const char *fmt, va_list ap);
+
+void
+ddb_log_viewer_register (void (*callback)(DB_plugin_t *plugin, uint32_t layers, const char *text, void *ctx), void *ctx);
+
+void
+ddb_log_viewer_unregister (void (*callback)(DB_plugin_t *plugin, uint32_t layers, const char *text, void *ctx), void *ctx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* logger_h */

deadbeef-1.9.6.tar.bz2/src/main.c Added

@@ -0,0 +1,1567 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ application launcher, compatible with GNU/Linux and most other POSIX systems
+
+ Copyright (C) 2009-2017 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <time.h>
+#include <utime.h>
+#include <locale.h>
+#include <sys/time.h>
+#ifdef __linux__
+#include <sys/prctl.h>
+#endif
+#if !defined(__linux__) && !defined(_POSIX_C_SOURCE)
+#define _POSIX_C_SOURCE 1
+#endif
+#include <limits.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+// #define USE_INET_SOCKET
+#define DEFAULT_LISTENING_PORT 48879
+
+#ifdef __MINGW32__
+#define USE_INET_SOCKET
+#include <winsock2.h>
+#else
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <sys/un.h>
+#include <sys/errno.h>
+#ifdef USE_INET_SOCKET
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+#endif
+
+#include <sys/fcntl.h>
+#include <signal.h>
+#ifdef __GLIBC__
+#include <execinfo.h>
+#endif
+#include <unistd.h>
+#include "gettext.h"
+#include "playlist.h"
+#include "threading.h"
+#include "messagepump.h"
+#include "streamer.h"
+#include "playmodes.h"
+#include "conf.h"
+#include "volume.h"
+#include "plugins.h"
+#include <deadbeef/common.h>
+#include "junklib.h"
+#ifdef OSX_APPBUNDLE
+#include "cocoautil.h"
+#endif
+#include "playqueue.h"
+#include "tf.h"
+#include "logger.h"
+
+#ifdef OSX_APPBUNDLE
+#include "scriptable/scriptable.h"
+#include "scriptable/scriptable_dsp.h"
+#include "scriptable/scriptable_encoder.h"
+#endif
+
+#ifndef PREFIX
+#error PREFIX must be defined
+#endif
+
+#ifdef OSX_APPBUNDLE
+#define SYS_CONFIG_DIR "Library/Preferences"
+#elif defined(__MINGW32__)
+#define SYS_CONFIG_DIR "AppData/Roaming"
+#else
+#define SYS_CONFIG_DIR ".config"
+#endif
+
+#ifdef __MINGW32__
+#include "../shared/windows/utils.h"
+#endif
+
+// some common global variables
+char sys_install_pathPATH_MAX; // see deadbeef->get_prefix
+char confdirPATH_MAX; // $HOME/.config
+char dbconfdirPATH_MAX; // $HOME/.config/deadbeef
+char dbinstalldirPATH_MAX; // see deadbeef->get_prefix
+char dbdocdirPATH_MAX; // see deadbeef->get_doc_dir
+char dbplugindirPATH_MAX; // see deadbeef->get_plugin_dir
+char dbpixmapdirPATH_MAX; // see deadbeef->get_pixmap_dir
+char dbcachedirPATH_MAX;
+char dbruntimedirPATH_MAX; // /run/user/<uid>/deadbeef
+char dbresourcedirPATH_MAX;
+
+char use_gui_plugin100;
+
+static int _previous_session_did_crash;
+
+static void
+print_help (void) {
+#ifdef ENABLE_NLS
+ bind_textdomain_codeset (PACKAGE, "");
+#endif
+ fprintf (stdout, _("Usage: deadbeef options -- file(s)\n"));
+ fprintf (stdout, _("Options:\n"));
+ fprintf (stdout, _(" --help or -h Print help (this message) and exit\n"));
+ fprintf (stdout, _(" --quit Quit player\n"));
+ fprintf (stdout, _(" --version Print version info and exit\n"));
+ fprintf (stdout, _(" --play Start playback\n"));
+ fprintf (stdout, _(" --stop Stop playback\n"));
+ fprintf (stdout, _(" --pause Pause playback\n"));
+ fprintf (stdout, _(" --toggle-pause Toggle pause\n"));
+ fprintf (stdout, _(" --play-pause Start playback if stopped, toggle pause otherwise\n"));
+ fprintf (stdout, _(" --next Next song in playlist\n"));
+ fprintf (stdout, _(" --prev Previous song in playlist\n"));
+ fprintf (stdout, _(" --random Random song in playlist\n"));
+ fprintf (stdout, _(" --queue Append file(s) to existing playlist\n"));
+ fprintf (stdout, _(" --gui PLUGIN Tells which GUI plugin to use, default is \"GTK2\"\n"));
+ fprintf (stdout, _(" --nowplaying FMT Print formatted track name to stdout\n"));
+ fprintf (stdout, _(" FMT %%-syntax: artist, title, album,\n"
+ " length, tracknumber, year, comment,\n"
+ " copyright, elapsed\n"));
+ fprintf (stdout, _(" example: --nowplaying \"%%a - %%t\" should print \"artist - title\"\n"));
+ fprintf (stdout, _(" for more info, see %s\n"), "http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting");
+ fprintf (stdout, _(" NOTE: --nowplaying is deprecated.\n"));
+ fprintf (stdout, _(" --nowplaying-tf FMT Print formatted track name to stdout, using the new title formatting\n"));
+ fprintf (stdout, _(" FMT syntax: http://github.com/DeaDBeeF-Player/deadbeef/wiki/Title-formatting-2.0\n"));
+ fprintf (stdout, _(" example: --nowplaying-tf \"%%artist%% - %%title%%\" should print \"artist - title\"\n"));
+ fprintf (stdout, _(" --volume NUM Print or set deadbeef volume level.\n"));
+ fprintf (stdout, _(" The NUM parameter can be specified in percents (absolute value or increment/decrement)\n"));
+ fprintf (stdout, _(" or in dB -50, 0 (if with suffix).\n"));
+ fprintf (stdout, _(" Examples: --volume 80, --volume +10, --volume -5 or --volume -20dB\n"));
+ fprintf (stdout, _(" --plugin=PLUG Send commands to a specific plugin. Use PLUG=main to send commands to deadbeef itself.\n"));
+ fprintf (stdout, _(" To get plugin specific commands use --plugin=PLUG --help\n"));
+ fprintf (stdout, _(" --plugin-list List all available plugins including indication for plugins that support commands.\n"));
+#ifdef ENABLE_NLS
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
+#endif
+}
+
+// Parse command line an return a single buffer with all
+// parameters concatenated (separated by \0). File names
+// are resolved.
+char*
+prepare_command_line (int argc, char *argv, int *size) {
+ int seen_ddash = 0;
+
+ // initial buffer limit, will expand if needed
+ size_t limit = 4096;
+ char *buf = (char*) malloc (limit);
+
+ if (argc <= 1) {
+ buf0 = 0;
+ *size = 1;
+ return buf;
+ }
+
+ int p = 0;
+ for (int i = 1; i < argc; i++) {
+ // if argument is a filename, try to resolve it
+ char resolvedPATH_MAX;
+ char *arg;
+ if ((!strncmp ("--", argvi, 2) && !seen_ddash) || !realpath (argvi, resolved)) {
+ arg = argvi;
+ }
+ else {
+ arg = resolved;
+ }
+
+ // make sure that there is enough space in the buffer;
+ // re-allocate, if needed
+ size_t arglen = strlen(arg) + 1;
+ while (p + arglen >= limit) {
+ char *newbuf = (char*) malloc (limit * 2);
+ memcpy (newbuf, buf, p);
+ free (buf);
+ limit *= 2;
+ buf = newbuf;
+ }
+
+ memcpy (buf + p, arg, arglen);
+ p += arglen;
+
+ if (!strcmp("--", argvi)) {
+ seen_ddash = 1;
+ }
+ }
+
+ *size = p;
+ return buf;
+}
+
+typedef struct {
+ ddb_response_t base;
+ char *buffer;
+ size_t buffer_size;
+ size_t buffer_capacity;
+} ddb_response_impl_t;
+
+static int
+_append_response(ddb_response_t *response, char *buffer, size_t size) {
+ ddb_response_impl_t *impl = (ddb_response_impl_t *)response;
+ size_t new_size = impl->buffer_size + size;
+ if (new_size > impl->buffer_capacity) {
+ impl->buffer_capacity = new_size + 1000;
+ impl->buffer = realloc (impl->buffer, impl->buffer_capacity);
+ }
+
+ memcpy (impl->buffer + impl->buffer_size, buffer, size);
+ impl->buffer_size = new_size;
+ return 0;
+}
+
+// this function executes server-side commands only
+// must be called only from within server
+// -1 error, program must exit with error code -1
+// 0 proceed normally as nothing happened
+// 1 no error, but program must exit with error code 0
+// 2 don't load playlist on startup
+// when executed in remote server -- error code will be ignored
+int
+server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsize) {
+ if (sendback) {
+ sendback0 = 0;
+ }
+ const char *parg = cmdline;
+ const char *pend = cmdline + len;
+ int queue = 0;
+ while (parg < pend) {
+ if (strlen (parg) >= 2 && parg0 == '-' && parg1 != '-') {
+ parg += strlen (parg);
+ parg++;
+ return 0; // running under osx debugger?
+ }
+ else if (!strcmp (parg, "--nowplaying")) {
+ parg += strlen (parg);
+ parg++;
+ if (parg >= pend) {
+ const char *errtext = "--nowplaying expects format argument";
+ if (sendback) {
+ snprintf (sendback, sbsize, "\2%s\n", errtext);
+ return 0;
+ }
+ else {
+ trace_err ("%s\n", errtext);
+ return -1;
+ }
+ }
+ char out2048;
+ playItem_t *curr = streamer_get_playing_track ();
+ if (curr) {
+ pl_format_title (curr, -1, out, sizeof (out), -1, parg);
+ pl_item_unref (curr);
+ }
+ else {
+ strcpy (out, "nothing");
+ }
+ if (sendback) {
+ snprintf (sendback, sbsize, "\1%s", out);
+ }
+ else {
+ fwrite (out, 1, strlen (out), stdout);
+ return 1; // exit
+ }
+ }
+ else if (!strcmp (parg, "--nowplaying-tf")) {
+ parg += strlen (parg);
+ parg++;
+ if (parg >= pend) {
+ const char *errtext = "--nowplaying-tf expects format argument";
+ if (sendback) {
+ snprintf (sendback, sbsize, "\2%s\n", errtext);
+ return 0;
+ }
+ else {
+ trace_err ("%s\n", errtext);
+ return -1;
+ }
+ }
+ char out2048;
+ playItem_t *curr = streamer_get_playing_track ();
+ char *script = tf_compile (parg);
+ if (script) {
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .it = (DB_playItem_t *)curr,
+ };
+ tf_eval (&ctx, script, out, sizeof (out));
+ tf_free (script);
+ }
+ else {
+ *out = 0;
+ }
+ if (curr) {
+ pl_item_unref (curr);
+ }
+ if (sendback) {
+ snprintf (sendback, sbsize, "\1%s", out);
+ }
+ else {
+ fwrite (out, 1, strlen (out), stdout);
+ return 1; // exit
+ }
+ }
+ else if (!strcmp (parg, "--next")) {
+ messagepump_push (DB_EV_NEXT, 0, 0, 0);
+ return 0;
+ }
+ else if (!strcmp (parg, "--prev")) {
+ messagepump_push (DB_EV_PREV, 0, 0, 0);
+ return 0;
+ }
+ else if (!strcmp (parg, "--play")) {
+ messagepump_push (DB_EV_PLAY_CURRENT, 0, 0, 0);
+ return 0;
+ }
+ else if (!strcmp (parg, "--stop")) {
+ messagepump_push (DB_EV_STOP, 0, 0, 0);
+ return 0;
+ }
+ else if (!strcmp (parg, "--pause")) {
+ messagepump_push (DB_EV_PAUSE, 0, 0, 0);
+ return 0;
+ }
+ else if (!strcmp (parg, "--toggle-pause")) {
+ messagepump_push (DB_EV_TOGGLE_PAUSE, 0, 0, 0);
+ return 0;
+ }
+ else if (!strcmp (parg, "--play-pause")) {
+ ddb_playback_state_t state = deadbeef->get_output ()->state ();
+ if (state == DDB_PLAYBACK_STATE_PLAYING) {
+ deadbeef->sendmessage (DB_EV_PAUSE, 0, 0, 0);
+ }
+ else {
+ deadbeef->sendmessage (DB_EV_PLAY_CURRENT, 0, 0, 0);
+ }
+ return 0;
+ }
+ else if (!strcmp (parg, "--random")) {
+ messagepump_push (DB_EV_PLAY_RANDOM, 0, 0, 0);
+ return 0;
+ }
+ else if (!strcmp (parg, "--queue")) {
+ queue = 1;
+ }
+ else if (!strcmp (parg, "--quit")) {
+ messagepump_push (DB_EV_TERMINATE, 0, 0, 0);
+ }
+ else if (!strcmp (parg, "--gui")) {
+ // need to skip --gui here, it is handled in the client cmdline
+ parg += strlen (parg);
+ parg++;
+ if (parg >= pend) {
+ break;
+ }
+ parg += strlen (parg);
+ parg++;
+ continue;
+ }
+ else if (!strcmp (parg, "--volume")) {
+ parg += strlen (parg);
+ parg++;
+
+ if (parg < pend) {
+ char *end;
+ const int pct = (int)strtol (parg, &end, 10);
+ if (!strcasecmp(end, "db")) {
+ deadbeef->volume_set_db (pct);
+ } else {
+ const char is_increment = (parg0 == '-' || parg0 == '+');
+ const float new_volume = is_increment ? deadbeef->volume_get_db() * 2 + 100 + pct : pct;
+ deadbeef->volume_set_db ((new_volume/100.0 * 50) - 50);
+ }
+ }
+ if (sendback) {
+ snprintf (sendback, sbsize, "\1%.0f%% (%.2f dB)", deadbeef->volume_get_db() * 2 + 100 , deadbeef->volume_get_db());
+ }
+ return 0;
+ }
+ else if (!strncmp(parg, "--plugin=", strlen("--plugin="))) {
+ if (!strcmp(parg + strlen("--plugin="), "main")) {
+ parg += strlen(parg) + 1;
+ continue;
+ }
+
+ // get length until pend or next "--plugin" occurrence
+ int parg_len = 0;
+ while ((parg + parg_len) < pend) {
+ if (parg_len && !strncmp(parg + parg_len, "--plugin=", strlen("--plugin="))) {
+ break;
+ }
+ parg_len += strlen(parg + parg_len) + 1;
+ }
+ parg_len--;
+
+ const char *plugid = parg + strlen("--plugin=");
+ DB_plugin_t *p = plug_get_for_id(plugid);
+ if (p && p->api_vmajor == 1 && p->api_vminor >= 15 && p->exec_cmdline != NULL) {
+
+ ddb_response_impl_t response = {
+ .base._size = sizeof (ddb_response_t),
+ .base.append = _append_response,
+ };
+
+ size_t plugarg_len = parg_len - strlen(parg) - 1;
+ int ret = p->exec_cmdline(parg + strlen(parg) + 1, (int) plugarg_len, &response.base);
+
+ off_t out_size = response.buffer_size;
+ if (out_size > sbsize - 2) {
+ out_size = sbsize - 2;
+ }
+ // copy plugin output to sendback (if any output produced)
+ if (out_size > 0 && sendback) {
+ sendback0='\1';
+
+ memcpy (sendback + 1, response.buffer, out_size);
+ sendbackout_size + 1 = 0;
+ }
+ if (ret && sendback) {
+ // TODO have specific error codes sent to client?
+ sendback0 = '\2';
+ }
+
+ free (response.buffer);
+ }
+ parg += parg_len + 1;
+ continue;
+ }
+ else if (!strcmp(parg, "--plugin-list")) {
+ char out2048;
+ int out_pos = 0;
+ int i = 0;
+ DB_plugin_t ** plugins = plug_get_list();
+ while (pluginsi && (2048 - out_pos) >= 0) {
+ const char *format = pluginsi->exec_cmdline ? "\03332m%s\0330m, " : "%s, ";
+ out_pos += snprintf (out + out_pos, 2048 - out_pos, format, pluginsi->id);
+ i++;
+ }
+ outout_pos - 1 = '\0';
+ outout_pos - 2 = '\n';
+ if (sendback) {
+ snprintf (sendback, sbsize, "\1%s", out);
+ }
+ }
+ else if (parg0 != '-') {
+ break; // unknown option is filename
+ }
+ parg += strlen (parg);
+ parg++;
+ }
+ if (parg < pend) {
+ if (add_paths(parg, (int)(pend - parg), queue, sendback, sbsize) > 0) {
+ return 0; // files not loaded, but continue normally
+ }
+ if (!queue) {
+ return 2; // don't reload playlist at startup
+ }
+ }
+ return 0;
+}
+
+// parses a list of paths and adds them to deadbeef
+// 0 - no error, files loaded
+// 1 - no error, but files not loaded
+int
+add_paths(const char *paths, int len, int queue, char *sendback, int sbsize) {
+ const char *parg = paths;
+ const char *pend = paths + len;
+
+ if (conf_get_int ("cli_add_to_specific_playlist", 1)) {
+ char str200;
+ conf_get_str ("cli_add_playlist_name", "Default", str, sizeof (str));
+ int idx = plt_find (str);
+ if (idx < 0) {
+ idx = plt_add (plt_get_count (), str);
+ }
+ if (idx >= 0) {
+ plt_set_curr_idx (idx);
+ }
+ }
+ playlist_t *curr_plt = plt_get_curr ();
+ if (plt_add_files_begin (curr_plt, 0) != 0) {
+ plt_unref (curr_plt);
+ snprintf (sendback, sbsize, "it's not allowed to add files to playlist right now, because another file adding operation is in progress. please try again later.");
+ return 1;
+ }
+ // add files
+ if (!queue) {
+ plt_clear (curr_plt);
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+ plt_reset_cursor (curr_plt);
+ }
+ while (parg < pend) {
+ char resolvedPATH_MAX;
+ const char *pname;
+ if (realpath (parg, resolved)) {
+ pname = resolved;
+ }
+ else {
+ pname = parg;
+ }
+ if (deadbeef->plt_add_dir2 (0, (ddb_playlist_t*)curr_plt, pname, NULL, NULL) < 0) {
+ if (deadbeef->plt_add_file2 (0, (ddb_playlist_t*)curr_plt, pname, NULL, NULL) < 0) {
+ int ab = 0;
+ playItem_t *after = plt_get_last (curr_plt, PL_MAIN);
+ playItem_t *it = plt_load2 (0, curr_plt, after, pname, &ab, NULL, NULL);
+ if (after) {
+ pl_item_unref (after);
+ }
+ if (!it) {
+ trace_err ("failed to add file or folder %s\n", pname);
+ }
+ }
+ }
+ parg += strlen (parg);
+ parg++;
+ }
+ pl_save_current ();
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+ plt_add_files_end (curr_plt, 0);
+ plt_unref (curr_plt);
+ if (!queue) {
+ messagepump_push (DB_EV_PLAY_NUM, 0, 0, 0);
+ }
+ return 0;
+}
+
+#if USE_ABSTRACT_SOCKET_NAME
+static char server_id = "\0deadbeefplayer";
+#endif
+
+static unsigned srv_socket;
+
+#ifdef USE_INET_SOCKET
+static struct sockaddr_in srv_local;
+static struct sockaddr_in srv_remote;
+
+int db_socket_init_inet () {
+#ifdef __MINGW32__
+ // initiate winsock
+ WSADATA wsaData;
+ if (WSAStartup(MAKEWORD(2,2), &wsaData) != 0) {
+ trace_err ("Error with WSAStartup(), WinSock startup failed.\n");
+ return -1;
+ }
+#endif
+
+ return 0;
+}
+
+int db_socket_set_inet (struct sockaddr_in *remote, int *len) {
+ int s;
+ if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
+ perror("socket");
+ exit(1);
+ }
+
+ memset (remote, 0, sizeof (*remote));
+
+ remote->sin_family = AF_INET;
+ remote->sin_addr.s_addr = inet_addr("127.0.0.1");
+ remote->sin_port = htons(DEFAULT_LISTENING_PORT);
+
+ *len = sizeof(*remote);
+
+ return s;
+}
+
+#else
+static struct sockaddr_un srv_local;
+static struct sockaddr_un srv_remote;
+
+int db_socket_set_unix (struct sockaddr_un *remote, int *len) {
+ int s;
+ if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+ perror("socket");
+ exit(1);
+ }
+
+ memset (remote, 0, sizeof (struct sockaddr_un));
+ remote->sun_family = AF_UNIX;
+
+#if USE_ABSTRACT_SOCKET_NAME
+ memcpy (remote->sun_path, server_id, sizeof (server_id));
+ *len = offsetof(struct sockaddr_un, sun_path) + sizeof (server_id)-1;
+#else
+ char *socketdirenv = getenv ("DDB_SOCKET_DIR");
+ snprintf (remote->sun_path, sizeof (remote->sun_path), "%s/socket", socketdirenv ? socketdirenv : dbruntimedir);
+ *len = offsetof(struct sockaddr_un, sun_path) + (int)strlen (remote->sun_path);
+#endif
+ return s;
+}
+#endif
+
+void db_socket_close (int s) {
+#ifdef __MINGW32__
+ closesocket (s);
+#else
+ close (s);
+#endif
+}
+
+int
+server_start (void) {
+ int len;
+
+ trace ("server_start\n");
+
+#ifdef USE_INET_SOCKET
+ srv_socket = db_socket_set_inet (&srv_local, &len);
+
+#ifdef __MINGW32__
+ unsigned long flags = 1;
+ if (ioctlsocket(srv_socket, FIONBIO, &flags) == SOCKET_ERROR) {
+ perror ("ioctlsocket FIONBIO");
+ return -1;
+ }
+#endif
+#else
+ srv_socket = db_socket_set_unix (&srv_local, &len);
+#ifndef USE_ABSTRACT_SOCKET_NAME
+ if (unlink(srv_local.sun_path) < 0) {
+ perror ("INFO: unlink socket");
+ }
+ len = offsetof(struct sockaddr_un, sun_path) + (int)strlen (srv_local.sun_path);
+#endif
+
+ int flags;
+ flags = fcntl (srv_socket, F_GETFL,0);
+ if (flags == -1) {
+ perror ("fcntl F_GETFL");
+ return -1;
+ }
+ if (fcntl(srv_socket, F_SETFL, flags | O_NONBLOCK) < 0) {
+ perror ("fcntl F_SETFL");
+ return -1;
+ }
+#endif
+
+ if (len == -1) {
+ return -1;
+ }
+
+ if (bind(srv_socket, (struct sockaddr *)&srv_local, len) < 0) {
+ perror ("bind");
+ return -1;
+ }
+
+ if (listen(srv_socket, 5) == -1) {
+ perror("listen");
+ return -1;
+ }
+ return 0;
+}
+
+void
+server_close (void) {
+ if (srv_socket) {
+ db_socket_close (srv_socket);
+ srv_socket = 0;
+ }
+}
+
+// Read the whole message till end-of-stream
+char*
+read_entire_message (int sockfd, int *size) {
+ int bufsize = 4096; // initial buffer size, will expand if
+ // the actual package turns out to be bigger
+ char *buf = (char*) malloc(bufsize);
+ int rdp = 0;
+
+ for (;;) {
+ if (rdp >= bufsize) {
+ int newsize = bufsize * 2;
+ char *newbuf = (char*) malloc(newsize);
+ memcpy(newbuf, buf, rdp);
+ free(buf);
+ buf = newbuf;
+ bufsize = newsize;
+ }
+
+ ssize_t rd = recv(sockfd, buf + rdp, bufsize - rdp, 0);
+ if (rd < 0) {
+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ usleep (50000);
+ continue;
+ }
+ free(buf);
+ return NULL;
+ }
+ if (rd == 0) {
+ break;
+ }
+ rdp += rd;
+ }
+
+ *size = rdp;
+ return buf;
+}
+
+int
+server_update (void) {
+ // handle remote stuff
+ int t = sizeof (srv_remote);
+ int s2;
+ s2 = accept(srv_socket, (struct sockaddr *)&srv_remote, &t);
+ if (s2 == -1 && errno != EAGAIN && errno != EWOULDBLOCK) {
+ perror("accept");
+ return -1;
+ }
+ else if (s2 != -1) {
+ int size = -1;
+ char *buf = read_entire_message(s2, &size);
+ char sendback1024 = "";
+ if (size > 0) {
+ if (size == 1 && buf0 == 0) {
+ // FIXME: that should be called right after activation of gui plugin
+ messagepump_push (DB_EV_ACTIVATED, 0, 0, 0);
+ }
+ else {
+ server_exec_command_line (buf, size, sendback, sizeof (sendback));
+ }
+ }
+ if (sendback0) {
+ // send nowplaying back to client
+ send (s2, sendback, strlen (sendback)+1, 0);
+ }
+ else {
+ send (s2, "", 1, 0);
+ }
+ db_socket_close(s2);
+
+ if (buf) {
+ free(buf);
+ }
+ }
+ return 0;
+}
+
+static uintptr_t server_tid;
+static int server_terminate;
+
+void
+server_loop (void *ctx) {
+#ifdef __linux__
+ prctl (PR_SET_NAME, "deadbeef-server", 0, 0, 0, 0);
+#endif
+ fd_set rds;
+ int ret;
+ struct timeval timeout = {0, 0};
+
+ FD_ZERO(&rds);
+ while (!server_terminate) {
+ FD_SET(srv_socket, &rds);
+ timeout.tv_usec = 500000;
+ if ((ret = select(srv_socket + 1, &rds, NULL, NULL, &timeout)) < 0 && errno != EINTR) {
+ perror("select");
+ exit (-1);
+ }
+ if (ret > 0) {
+ if (server_update () < 0) {
+ messagepump_push (DB_EV_TERMINATE, 0, 0, 0);
+ }
+ }
+ }
+}
+
+void
+save_resume_state (void) {
+ playItem_t *trk = streamer_get_playing_track ();
+ DB_output_t *output = plug_get_output ();
+ float playpos = -1;
+ int playtrack = -1;
+ int playlist = -1;
+ playlist_t *plt = pl_get_playlist (trk);
+ int paused = (output->state () == DDB_PLAYBACK_STATE_PAUSED);
+ if (trk && plt) {
+ playlist = plt_get_idx_of(plt);
+ playtrack = plt_get_item_idx(plt, trk, PL_MAIN);
+ playpos = streamer_get_playpos ();
+ pl_item_unref (trk);
+ }
+
+ if (plt) {
+ plt_unref (plt);
+ plt = NULL;
+ }
+
+ conf_set_float ("resume.position", playpos);
+ conf_set_int ("resume.track", playtrack);
+ conf_set_int ("resume.playlist", playlist);
+ conf_set_int ("resume.paused", paused);
+}
+
+void
+player_mainloop (void) {
+ for (;;) {
+ uint32_t msg;
+ uintptr_t ctx;
+ uint32_t p1;
+ uint32_t p2;
+ int term = 0;
+ while (messagepump_pop(&msg, &ctx, &p1, &p2) != -1) {
+ // broadcast to all plugins
+ DB_plugin_t **plugs = plug_get_list ();
+ for (int n = 0; plugsn; n++) {
+ if (plugsn->message) {
+ plugsn->message (msg, ctx, p1, p2);
+ }
+ }
+ if (!term) {
+ DB_output_t *output = plug_get_output ();
+ switch (msg) {
+ case DB_EV_REINIT_SOUND:
+ plug_reinit_sound ();
+ conf_save ();
+ break;
+ case DB_EV_TERMINATE:
+ {
+ save_resume_state ();
+
+ playqueue_clear ();
+
+ term = 1;
+ }
+ break;
+ case DB_EV_PLAY_CURRENT:
+ streamer_play_current_track ();
+ break;
+ case DB_EV_PLAY_NUM:
+ playqueue_clear ();
+ streamer_set_nextsong (p1, 0);
+ break;
+ case DB_EV_STOP:
+ streamer_set_nextsong (-1, 0);
+ break;
+ case DB_EV_NEXT:
+ streamer_move_to_nextsong (1);
+ break;
+ case DB_EV_PREV:
+ streamer_move_to_prevsong (1);
+ break;
+ case DB_EV_PAUSE:
+ if (output->state () != DDB_PLAYBACK_STATE_PAUSED) {
+ output->pause ();
+ messagepump_push (DB_EV_PAUSED, 0, 1, 0);
+ }
+ break;
+ case DB_EV_TOGGLE_PAUSE:
+ if (output->state () != DDB_PLAYBACK_STATE_PLAYING) {
+ streamer_play_current_track ();
+ }
+ else {
+ output->pause ();
+ messagepump_push (DB_EV_PAUSED, 0, 1, 0);
+ }
+ break;
+ case DB_EV_PLAY_RANDOM:
+ streamer_move_to_randomsong (1);
+ break;
+ case DB_EV_CONFIGCHANGED:
+ conf_save ();
+ streamer_configchanged ();
+ pl_configchanged ();
+ junk_configchanged ();
+ break;
+ case DB_EV_SEEK:
+ {
+ int32_t pos = (int32_t)p1;
+ if (pos < 0) {
+ pos = 0;
+ }
+ streamer_set_seek (p1 / 1000.f);
+ }
+ break;
+ case DB_EV_PLAYLISTCHANGED:
+ switch (p1) {
+ case DDB_PLAYLIST_CHANGE_CONTENT:
+ case DDB_PLAYLIST_CHANGE_CREATED:
+ case DDB_PLAYLIST_CHANGE_DELETED:
+ streamer_notify_track_deleted ();
+ break;
+ }
+ case DB_EV_PAUSED:
+ case DB_EV_SONGFINISHED:
+ save_resume_state();
+ conf_save();
+ break;
+ }
+ }
+ if (msg >= DB_EV_FIRST && ctx) {
+ messagepump_event_free ((ddb_event_t *)ctx);
+ }
+ }
+ if (term) {
+ break;
+ }
+ messagepump_wait ();
+ }
+}
+
+#ifdef __GLIBC__
+void
+sigsegv_handler (int sig) {
+ trace_err ("Segmentation Fault\n");
+ int j, nptrs;
+#define SIZE 100
+ void *buffer100;
+ char **strings;
+
+ nptrs = backtrace(buffer, SIZE);
+ printf("backtrace() returned %d addresses\n", nptrs);
+
+ /* The call
+ * backtrace_symbols_fd(buffer,
+ * nptrs,
+ * STDOUT_FILENO)
+ would produce similar output to the following: */
+
+ strings = backtrace_symbols(buffer, nptrs);
+ if (strings == NULL) {
+ perror("backtrace_symbols");
+ exit(EXIT_FAILURE);
+ }
+
+ for (j = 0; j < nptrs; j++)
+ printf("%s\n", stringsj);
+
+ free(strings);
+ exit (0);
+}
+#endif
+
+void
+restore_resume_state (void) {
+ DB_output_t *output = plug_get_output ();
+ if (conf_get_int ("resume_last_session", 1) && output->state () == DDB_PLAYBACK_STATE_STOPPED) {
+ int plt = conf_get_int ("resume.playlist", -1);
+ int track = conf_get_int ("resume.track", -1);
+ float pos = conf_get_float ("resume.position", -1);
+ int paused = conf_get_int ("resume.paused", 0);
+ trace ("resume: track %d pos %f playlist %d\n", track, pos, plt);
+ if (plt >= 0 && track >= 0 && pos >= 0) {
+ plt_set_curr_idx(plt);
+ streamer_set_current_playlist (plt);
+ if (!_previous_session_did_crash) {
+ streamer_yield ();
+ streamer_set_nextsong (track, paused);
+ streamer_yield ();
+ streamer_set_seek (pos);
+ }
+ }
+ }
+}
+
+uintptr_t mainloop_tid;
+
+DB_plugin_t *
+plug_get_gui (void) {
+ struct DB_plugin_s **plugs = plug_get_list ();
+ for (int i = 0; plugsi; i++) {
+ if (plugsi->type == DB_PLUGIN_GUI) {
+ return plugsi;
+ }
+ }
+ return NULL;
+}
+
+#if !_DEBUG
+static void
+_touch(const char *path) {
+ struct stat stat_struct;
+ if (0 != stat (path, &stat_struct)) {
+ FILE *fp = fopen(path,"w+b");
+ if (fp != NULL) {
+ (void)fclose(fp);
+ }
+ }
+ else {
+ (void)utime(path, NULL);
+ }
+}
+#endif
+
+void
+main_cleanup_and_quit (void) {
+ // stop streaming and playback before unloading plugins
+ DB_output_t *output = plug_get_output ();
+ output->stop ();
+ streamer_free ();
+
+ // drain main message queue
+ uint32_t msg;
+ uintptr_t ctx;
+ uint32_t p1;
+ uint32_t p2;
+ while (messagepump_pop(&msg, &ctx, &p1, &p2) != -1) {
+ if (msg >= DB_EV_FIRST && ctx) {
+ messagepump_event_free ((ddb_event_t *)ctx);
+ }
+ }
+
+ output->free ();
+
+ // terminate server and wait for completion
+ if (server_tid) {
+ server_terminate = 1;
+ thread_join (server_tid);
+ server_tid = 0;
+ }
+
+ // save config
+ pl_save_all ();
+ conf_save ();
+
+ // delete legacy session file
+ {
+ char sessfile1024; // $HOME/.config/deadbeef/session
+ if (snprintf (sessfile, sizeof (sessfile), "%s/deadbeef/session", confdir) < (int)sizeof (sessfile)) {
+ unlink (sessfile);
+ }
+ }
+
+ // stop receiving messages from outside
+ server_close ();
+
+ // plugins might still hold references to playitems,
+ // and query configuration in background
+ // so unload everything 1st before final cleanup
+ plug_disconnect_all ();
+ plug_unload_all (^{
+ // at this point we can simply do exit(0), but let's clean up for debugging
+ pl_free (); // may access conf_*
+ conf_free ();
+
+ trace ("messagepump_free\n");
+ messagepump_free ();
+ trace ("plug_cleanup\n");
+ plug_cleanup ();
+ trace ("logger_free\n");
+
+ trace ("💛💙\n");
+ ddb_logger_free();
+
+ char crash_markerPATH_MAX;
+ snprintf (crash_marker, sizeof (crash_marker), "%s/running", dbconfdir);
+ unlink(crash_marker);
+
+ exit(0);
+ });
+}
+
+static void
+mainloop_thread (void *ctx) {
+ // this runs until DB_EV_TERMINATE is sent (blocks right here)
+ player_mainloop ();
+
+ // tell the gui thread to finish
+ DB_plugin_t *gui = plug_get_gui ();
+ if (gui) {
+ gui->stop ();
+ }
+
+ return;
+}
+
+int
+main (int argc, char *argv) {
+#if __MINGW32__
+ windows_arg_fix(&argc, argv);
+#endif
+ ddb_logger_init ();
+ int portable = 0;
+ int staticlink = 0;
+ int portable_full = 0;
+#if STATICLINK
+ staticlink = 1;
+#endif
+#if PORTABLE
+ portable = 1;
+#endif
+#if PORTABLE_FULL
+ portable_full = 1;
+#endif
+
+ if (!realpath (argv0, dbinstalldir)) {
+ strcpy (dbinstalldir, argv0);
+ }
+ char *e = strrchr (dbinstalldir, '/');
+ if (e) {
+ *e = 0;
+ }
+ else {
+ strcpy (dbinstalldir, PREFIX);
+ }
+
+ // detect portable version by looking for plugins/ and deadbeef.png and portable_full by config/
+ while (!portable || !portable_full) {
+ struct stat st;
+ char checkpathPATH_MAX;
+ if (!portable) {
+ snprintf (checkpath, sizeof (checkpath), "%s/plugins", dbinstalldir);
+ if (stat (checkpath, &st) || !S_ISDIR (st.st_mode)) {
+ break;
+ }
+ snprintf (checkpath, sizeof (checkpath), "%s/deadbeef.png", dbinstalldir);
+ if (stat (checkpath, &st) || !S_ISREG (st.st_mode)) {
+ break;
+ }
+ portable = 1;
+ }
+ if (!portable_full) {
+ snprintf (checkpath, sizeof (checkpath), "%s/config", dbinstalldir);
+ if (stat (checkpath, &st) || !S_ISDIR (st.st_mode)) {
+ break;
+ }
+ portable_full = 1;
+ }
+ break;
+ }
+ if (!portable) {
+ strcpy (dbinstalldir, PREFIX);
+ }
+
+#ifdef __GLIBC__
+ signal (SIGSEGV, sigsegv_handler);
+#endif
+ setlocale (LC_ALL, "");
+ setlocale (LC_NUMERIC, "C");
+#ifdef ENABLE_NLS
+// trace ("enabling gettext support: package=" PACKAGE ", dir=" LOCALEDIR "...\n");
+ if (portable) {
+ char localedirPATH_MAX;
+ snprintf (localedir, sizeof (localedir), "%s/locale", dbinstalldir);
+ bindtextdomain (PACKAGE, localedir);
+ }
+ else {
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ }
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
+ textdomain (PACKAGE);
+#endif
+
+#ifndef VERSION
+#define VERSION "devel"
+#endif
+
+ trace ("starting deadbeef " VERSION "%s%s\n", staticlink ? " static" : "", portable ? " portable" : "");
+ srand ((unsigned int)time (NULL));
+#ifdef __linux__
+ prctl (PR_SET_NAME, "deadbeef-main", 0, 0, 0, 0);
+#endif
+
+ char *homedir = getenv (HOMEDIR);
+ if (!homedir) {
+ trace_err ("unable to find home directory. stopping.\n");
+ return -1;
+ }
+
+ // Get config directory
+ if (portable_full) {
+ if (snprintf (confdir, sizeof (confdir), "%s/config", dbinstalldir) > (int)sizeof (confdir)) {
+ trace_err ("fatal: install path is too long: %s\n", dbinstalldir);
+ return -1;
+ }
+ strcpy (dbconfdir, confdir);
+ }
+ else {
+ char *xdg_conf_dir = getenv (CONFIGDIR);
+ if (xdg_conf_dir) {
+ if (snprintf (confdir, sizeof (confdir), "%s", xdg_conf_dir) > (int)sizeof (confdir)) {
+ trace_err ("fatal: XDG_CONFIG_HOME value is too long: %s\n", xdg_conf_dir);
+ return -1;
+ }
+ }
+ else {
+ if (snprintf (confdir, sizeof (confdir), "%s/" SYS_CONFIG_DIR, homedir) > (int)sizeof (confdir)) {
+ trace_err ("fatal: HOME value is too long: %s\n", homedir);
+ return -1;
+ }
+ }
+
+ if (snprintf (dbconfdir, sizeof (dbconfdir), "%s/deadbeef", confdir) > (int)sizeof (dbconfdir)) {
+ trace_err ("fatal: config path is too long: %s\n", dbconfdir);
+ return -1;
+ }
+ }
+ mkdir (confdir, 0755);
+
+#if __APPLE__
+ char appcachepathPATH_MAX;
+ cocoautil_get_cache_path (appcachepath, sizeof (appcachepath));
+ if (snprintf (dbcachedir, sizeof (dbcachedir), "%s/Deadbeef/", appcachepath) > (int)sizeof (dbcachedir)) {
+ trace_err ("fatal: cache path is too long: %s\n", dbcachedir);
+ return -1;
+ }
+#else
+ // Get cache directory
+ if (portable_full) {
+ if (snprintf (dbcachedir, sizeof (dbcachedir), "%s/cache", dbconfdir) > (int)sizeof (dbcachedir)) {
+ trace_err ("fatal: cache path is too long: %s\n", dbcachedir);
+ return -1;
+ }
+ }
+ else {
+ const char *xdg_cache = getenv (CACHEDIR);
+ if (xdg_cache) {
+ if (snprintf (dbcachedir, sizeof (dbcachedir), "%s/deadbeef/", xdg_cache) > (int)sizeof (dbcachedir)) {
+ trace_err ("fatal: cache path is too long: %s\n", dbcachedir);
+ return -1;
+ }
+ }
+ else {
+ if (snprintf (dbcachedir, sizeof (dbcachedir), "%s/.cache/deadbeef", homedir) > (int)sizeof (dbcachedir)) {
+ trace_err ("fatal: cache path is too long: %s\n", dbcachedir);
+ return -1;
+ }
+ }
+ }
+#endif
+
+ // Get runtime directory
+ const char *xdg_runtime = getenv (RUNTIMEDIR);
+ if (xdg_runtime)
+ {
+ if (snprintf(dbruntimedir, sizeof (dbruntimedir), "%s/deadbeef/", xdg_runtime) >= (int)sizeof (dbruntimedir)) {
+ trace_err ("fatal: cache path is too long: %s\n", dbruntimedir);
+ return -1;
+ }
+ mkdir (dbruntimedir, 0755);
+ }
+ else {
+ strcpy (dbruntimedir, dbconfdir);
+ }
+
+ // Get plugins dir from environment variable, portable directory or library dir
+ char *env_plugin_dir = getenv ("DEADBEEF_PLUGIN_DIR");
+ if (env_plugin_dir) {
+ strncpy (dbplugindir, env_plugin_dir, sizeof(dbplugindir));
+ if (dbplugindirsizeof(dbplugindir) - 1 != 0) {
+ trace_err ("fatal: plugin path is too long: %s\n", env_plugin_dir);
+ return -1;
+ }
+ }
+ else if (portable) {
+#ifdef OSX_APPBUNDLE
+ cocoautil_get_plugins_path (dbplugindir, sizeof (dbplugindir));
+#else
+ if (snprintf (dbplugindir, sizeof (dbplugindir), "%s/plugins", dbinstalldir) > sizeof (dbplugindir)) {
+ trace_err ("fatal: install path is too long: %s\n", dbinstalldir);
+ return -1;
+ }
+#endif
+ mkdir (dbplugindir, 0755);
+ }
+ else {
+ if (snprintf (dbplugindir, sizeof (dbplugindir), "%s/deadbeef", LIBDIR) > (int)sizeof (dbplugindir)) {
+ trace_err ("fatal: install path is too long: %s\n", dbinstalldir);
+ return -1;
+ }
+ }
+
+ if (portable) {
+#ifdef OSX_APPBUNDLE
+ cocoautil_get_resources_path (dbresourcedir, sizeof (dbresourcedir));
+#else
+ if (snprintf (dbresourcedir, sizeof (dbresourcedir), "%s/plugins", dbinstalldir) > sizeof (dbresourcedir)) {
+ trace_err ("fatal: install path is too long: %s\n", dbinstalldir);
+ return -1;
+ }
+#endif
+ mkdir (dbresourcedir, 0755);
+ }
+ else {
+ strcpy (dbresourcedir, dbplugindir);
+ }
+
+ // Get doc and pixmaps dirs
+ if (portable) {
+#ifdef OSX_APPBUNDLE
+ if (snprintf (dbdocdir, sizeof (dbdocdir), "%s/doc", dbresourcedir) > (int)sizeof (dbdocdir)) {
+ trace_err ("fatal: install path is too long: %s\n", dbresourcedir);
+ return -1;
+ }
+ if (snprintf (dbpixmapdir, sizeof (dbpixmapdir), "%s/pixmaps", dbresourcedir) > (int)sizeof (dbpixmapdir)) {
+ trace_err ("fatal: install path is too long: %s\n", dbresourcedir);
+ return -1;
+ }
+#else
+ if (snprintf (dbdocdir, sizeof (dbdocdir), "%s/doc", dbinstalldir) > sizeof (dbdocdir)) {
+ trace_err ("fatal: install path is too long: %s\n", dbinstalldir);
+ return -1;
+ }
+ if (snprintf (dbpixmapdir, sizeof (dbpixmapdir), "%s/pixmaps", dbinstalldir) > sizeof (dbpixmapdir)) {
+ trace_err ("fatal: install path is too long: %s\n", dbinstalldir);
+ return -1;
+ }
+#endif
+ }
+ else {
+ if (snprintf (dbdocdir, sizeof (dbdocdir), "%s", DOCDIR) > (int)sizeof (dbdocdir)) {
+ trace_err ("fatal: install path is too long: %s\n", dbinstalldir);
+ return -1;
+ }
+ if (snprintf (dbpixmapdir, sizeof (dbpixmapdir), "%s/share/deadbeef/pixmaps", PREFIX) > (int)sizeof (dbpixmapdir)) {
+ trace_err ("fatal: install path is too long: %s\n", dbinstalldir);
+ return -1;
+ }
+ }
+
+ const char *plugname = "main";
+ for (int i = 1; i < argc; i++) {
+ if (!strncmp (argvi, "--plugin=", strlen("--plugin="))) {
+ plugname = argvi + strlen("--plugin=");
+ }
+ // help, version and nowplaying are executed with any filter
+ if (!strcmp (argvi, "--help") || !strcmp (argvi, "-h")) {
+ if (!strcmp (plugname, "main")) {
+ print_help ();
+ return 0;
+ }
+ }
+ else if (!strcmp (argvi, "--version")) {
+ printf ("DeaDBeeF " VERSION " Copyright © 2009-2021 Oleksiy Yakovenko\n");
+ return 0;
+ }
+ else if (!strcmp (argvi, "--gui")) {
+ if (i == argc-1) {
+ break;
+ }
+ i++;
+ strncpy (use_gui_plugin, argvi, sizeof(use_gui_plugin) - 1);
+ use_gui_pluginsizeof(use_gui_plugin) - 1 = 0;
+ }
+ }
+
+// trace ("installdir: %s\n", dbinstalldir);
+// trace ("confdir: %s\n", confdir);
+// trace ("docdir: %s\n", dbdocdir);
+// trace ("plugindir: %s\n", dbplugindir);
+// trace ("pixmapdir: %s\n", dbpixmapdir);
+
+#ifdef __MINGW32__
+ char *directories = {dbconfdir, dbinstalldir, dbdocdir, dbplugindir, dbpixmapdir, dbcachedir, dbresourcedir, NULL};
+ for (int i = 0; directoriesi != NULL; i++) {
+ // replace backslashes with normal slashes
+ if (strchr(directoriesi, '\\')) {
+ char *slash_p = directoriesi;
+ while (slash_p = strchr(slash_p, '\\')) {
+ *slash_p = '/';
+ slash_p++;
+ }
+ }
+ }
+#endif
+
+ mkdir (dbconfdir, 0755);
+
+ int size = 0;
+ char *cmdline = prepare_command_line (argc, argv, &size);
+
+ // try to connect to remote player
+ int s;
+ unsigned int len;
+#ifdef USE_INET_SOCKET
+ struct sockaddr_in remote;
+ if (db_socket_init_inet() < 0) {
+ exit (-1);
+ }
+ s = db_socket_set_inet (&remote, &len);
+#else
+ struct sockaddr_un remote;
+ s = db_socket_set_unix (&remote, &len);
+#endif
+ if (connect(s, (struct sockaddr *)&remote, len) == 0) {
+ // pass args to remote and exit
+ if (send(s, cmdline, size, 0) == -1) {
+ perror ("send");
+ exit (-1);
+ }
+ // end of message
+ shutdown(s, SHUT_WR);
+
+ int sz = -1;
+ char *out = read_entire_message(s, &sz);
+ if (sz == -1) {
+ trace_err ("failed to pass args to remote!\n");
+ exit (-1);
+ }
+ else {
+ // check if that's nowplaying response
+ if (*out == '\1') {
+ const char *prn = out + 1;
+ fwrite (prn, 1, strlen (prn), stdout);
+ }
+ else if (*out == '\2') {
+ const char *prn = out + 1;
+ trace_err ("%s", prn);
+ }
+ else if (sz > 0 && out0) {
+ trace_err ("%s\n", out);
+ }
+ }
+ int exit_code = out0 ? out0 - 1 : 0;
+ if (out) {
+ free (out);
+ }
+ db_socket_close (s);
+ exit (exit_code);
+ }
+// else {
+// perror ("INFO: failed to connect to existing session:");
+// }
+ db_socket_close(s);
+
+ // become a server
+ if (server_start () < 0) {
+ exit (-1);
+ }
+
+ // hack: report nowplaying
+ if (!strcmp (cmdline, "--nowplaying")) {
+ char nothing = "nothing";
+ fwrite (nothing, 1, sizeof (nothing)-1, stdout);
+ free (cmdline);
+ cmdline = NULL;
+ return 0;
+ }
+
+ char crash_markerPATH_MAX;
+ snprintf (crash_marker, sizeof (crash_marker), "%s/running", dbconfdir);
+
+#if !_DEBUG
+ struct stat crash_marker_stat = {0};
+ if (!stat(crash_marker, &crash_marker_stat)) {
+ trace_err ("We had a crash. Will not resume the saved session to avoid a crash cycle.\n");
+ _previous_session_did_crash = 1;
+ }
+
+ _touch(crash_marker);
+#endif
+
+ pl_init ();
+ conf_init ();
+ conf_load (); // required by some plugins at startup
+
+ if (use_gui_plugin0) {
+ conf_set_str ("gui_plugin", use_gui_plugin);
+ }
+
+ conf_set_str ("deadbeef_version", VERSION);
+
+ // Volume needs to be initialized before the plugins start
+
+ int volume_needs_migration = conf_get_str_fast("playback.volume.normalized", NULL) == NULL;
+ if (volume_needs_migration) {
+ // migrate the volume from dB to normalized / amplitude
+ float vol_db = conf_get_float("playback.volume", 0);
+ volume_set_db (vol_db);
+ }
+ else {
+ volume_set_amp (conf_get_float("playback.volume.normalized", 1));
+ }
+
+ messagepump_init (); // required to push messages while handling commandline
+ if (plug_load_all ()) { // required to add files to playlist from commandline
+ exit (-1);
+ }
+
+ streamer_playmodes_init ();
+
+ pl_load_all ();
+
+ // execute server commands in local context
+ int noloadpl = 0;
+ if (argc > 1) {
+ int res = server_exec_command_line (cmdline, size, NULL, 0);
+ // some of the server commands ran on 1st instance should terminate it
+ if (res == 2) {
+ noloadpl = 1;
+ }
+ else if (res > 0) {
+ exit (0);
+ }
+ else if (res < 0) {
+ exit (-1);
+ }
+ }
+
+ free (cmdline);
+
+
+#ifdef OSX_APPBUNDLE
+ scriptableInit();
+ scriptableDspLoadPresets();
+ scriptableEncoderLoadPresets();
+#endif
+
+ streamer_init ();
+
+ plug_connect_all ();
+ messagepump_push (DB_EV_PLUGINSLOADED, 0, 0, 0);
+
+ if (!noloadpl) {
+ restore_resume_state ();
+ plt_set_curr_idx (conf_get_int ("playlist.current", 0));
+ }
+
+ server_tid = thread_start (server_loop, NULL);
+
+ mainloop_tid = thread_start (mainloop_thread, NULL);
+
+ messagepump_push (DB_EV_CONFIGCHANGED, 0, 0, 0);
+
+ DB_plugin_t *gui = plug_get_gui ();
+ if (gui) {
+ gui->start ();
+ }
+
+ ddb_logger_stop_buffering ();
+
+ // NOTE: It's not guaranteed that the code after this line will be called.
+ // On some platforms (cocoa), main_cleanup_and_quit is called directly before quit.
+ 
+ trace ("gui plugin has quit; waiting for mainloop thread to finish\n");
+ thread_join (mainloop_tid);
+
+ main_cleanup_and_quit ();
+
+ // main_cleanup_and_quit will call "exit" after async jobs finish, which may occur on another thread.
+ // Therefore infinite wait here.
+ for (;;) {
+ usleep(10000000);
+ }
+ return 0;
+}
+

deadbeef-1.9.6.tar.bz2/src/md5 Added

deadbeef-1.9.6.tar.bz2/src/md5/md5.c Changed

deadbeef-1.9.6.tar.bz2/src/md5/md5.h Changed

deadbeef-1.9.6.tar.bz2/src/messagepump.c Added

@@ -0,0 +1,232 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ message pump implementation
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
+#include "messagepump.h"
+#include "threading.h"
+#include "playlist.h"
+#include <deadbeef/common.h>
+
+typedef struct message_s {
+ uint32_t id;
+ uintptr_t ctx;
+ uint32_t p1;
+ uint32_t p2;
+ struct message_s *next;
+} message_t;
+
+enum { MAX_MESSAGES = 100 };
+static message_t poolMAX_MESSAGES;
+static message_t *mfree;
+static message_t *mqueue;
+static message_t *mqtail;
+static uintptr_t mutex;
+static uintptr_t cond;
+
+static void
+messagepump_reset (void);
+
+int
+messagepump_init (void) {
+ messagepump_reset ();
+ mutex = mutex_create ();
+ cond = cond_create ();
+ return 0;
+}
+
+void
+messagepump_free (void) {
+ mutex_lock (mutex);
+
+ // this helps catching any ref leaks caused by messages sent at exit
+ for (message_t *m = mqueue; m; m = m->next) {
+ switch (m->id) {
+ case DB_EV_SONGCHANGED:
+ case DB_EV_SONGSTARTED:
+ case DB_EV_SONGFINISHED:
+ case DB_EV_TRACKINFOCHANGED:
+ case DB_EV_CURSOR_MOVED:
+ case DB_EV_SEEKED:
+ assert (0);
+ }
+ }
+
+ messagepump_reset ();
+ mutex_unlock (mutex);
+ mutex_free (mutex);
+ cond_free (cond);
+ mutex = 0;
+}
+
+static void
+messagepump_reset (void) {
+ mqueue = NULL;
+ mfree = NULL;
+ mqtail = NULL;
+ memset (pool, 0, sizeof (pool));
+ for (int i = 0; i < MAX_MESSAGES; i++) {
+ pooli.next = mfree;
+ mfree = &pooli;
+ }
+}
+
+int
+messagepump_push (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
+ mutex_lock (mutex);
+ if (!mfree) {
+ mutex_unlock (mutex);
+ //fprintf (stderr, "WARNING: message queue is full! message ignored (%d %p %d %d)\n", id, (void*)ctx, p1, p2);
+ if (id >= DB_EV_FIRST && ctx) {
+ messagepump_event_free ((ddb_event_t *)ctx);
+ }
+ return -1;
+ }
+ message_t *msg = mfree;
+ mfree = mfree->next;
+ if (mqtail) {
+ mqtail->next = msg;
+ }
+ mqtail = msg;
+ if (!mqueue) {
+ mqueue = msg;
+ }
+
+ msg->next = NULL;
+ msg->id = id;
+ msg->ctx = ctx;
+ msg->p1 = p1;
+ msg->p2 = p2;
+ mutex_unlock (mutex);
+ cond_signal (cond);
+ return 0;
+}
+
+void
+messagepump_wait (void) {
+ cond_wait (cond, mutex);
+ mutex_unlock (mutex);
+}
+
+int
+messagepump_pop (uint32_t *id, uintptr_t *ctx, uint32_t *p1, uint32_t *p2) {
+ mutex_lock (mutex);
+ if (!mqueue) {
+ mutex_unlock (mutex);
+ return -1;
+ }
+ *id = mqueue->id;
+ *ctx = mqueue->ctx;
+ *p1 = mqueue->p1;
+ *p2 = mqueue->p2;
+ message_t *next = mqueue->next;
+ mqueue->next = mfree;
+ mfree = mqueue;
+ mqueue = next;
+ if (!mqueue) {
+ mqtail = NULL;
+ }
+ mutex_unlock (mutex);
+ return 0;
+}
+
+int
+messagepump_hasmessages (void) {
+ return mqueue ? 1 : 0;
+}
+
+ddb_event_t *
+messagepump_event_alloc (uint32_t id) {
+ int sz = 0;
+ ddb_event_t *ev;
+ switch (id) {
+ case DB_EV_SONGCHANGED:
+ sz = sizeof (ddb_event_trackchange_t);
+ break;
+ case DB_EV_SONGSTARTED:
+ case DB_EV_SONGFINISHED:
+ case DB_EV_TRACKINFOCHANGED:
+ case DB_EV_CURSOR_MOVED:
+ sz = sizeof (ddb_event_track_t);
+ break;
+ case DB_EV_SEEKED:
+ sz = sizeof (ddb_event_playpos_t);
+ break;
+ default:
+ trace ("Invalid event %d to use with messagepump_event_alloc, use sendmessage instead\n", id);
+ return NULL;
+ }
+ ev = malloc (sz);
+ memset (ev, 0, sz);
+ ev->event = id;
+ ev->size = sz;
+ return ev;
+}
+
+void
+messagepump_event_free (ddb_event_t *ev) {
+ switch (ev->event) {
+ case DB_EV_SONGCHANGED:
+ {
+ ddb_event_trackchange_t *tc = (ddb_event_trackchange_t*)ev;
+ if (tc->from) {
+ pl_item_unref ((playItem_t *)tc->from);
+ }
+ if (tc->to) {
+ pl_item_unref ((playItem_t *)tc->to);
+ }
+ }
+ break;
+ case DB_EV_SONGSTARTED:
+ case DB_EV_SONGFINISHED:
+ case DB_EV_TRACKINFOCHANGED:
+ case DB_EV_CURSOR_MOVED:
+ {
+ ddb_event_track_t *tc = (ddb_event_track_t*)ev;
+ if (tc->track) {
+ pl_item_unref ((playItem_t *)tc->track);
+ }
+ }
+ break;
+ case DB_EV_SEEKED:
+ {
+ ddb_event_playpos_t *tc = (ddb_event_playpos_t*)ev;
+ if (tc->track) {
+ pl_item_unref ((playItem_t *)tc->track);
+ }
+ }
+ break;
+ }
+ free (ev);
+}
+
+int
+messagepump_push_event (ddb_event_t *ev, uint32_t p1, uint32_t p2) {
+ return messagepump_push (ev->event, (uintptr_t)ev, p1, p2);
+}
+

deadbeef-1.9.6.tar.bz2/src/messagepump.h Added

@@ -0,0 +1,51 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ message pump implementation
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __MESSAGEPUMP_H
+#define __MESSAGEPUMP_H
+
+#include <stdint.h>
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int messagepump_init (void);
+void messagepump_free (void);
+int messagepump_push (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2);
+int messagepump_pop (uint32_t *id, uintptr_t *ctx, uint32_t *p1, uint32_t *p2);
+void messagepump_wait (void);
+
+ddb_event_t *messagepump_event_alloc (uint32_t id);
+void messagepump_event_free (ddb_event_t *ev);
+int messagepump_push_event (ddb_event_t *ev, uint32_t p1, uint32_t p2);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __MESSAGEPUMP_H

deadbeef-1.9.6.tar.bz2/src/metacache.c Added

@@ -0,0 +1,172 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ metadata string cache/database
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "metacache.h"
+
+typedef struct metacache_str_s {
+ struct metacache_str_s *next;
+ size_t value_length;
+ uint32_t refcount;
+ char cmpidx; // positive means "equals", negative means "notequals"
+ char str1;
+} metacache_str_t;
+
+typedef struct {
+// uint32_t hash;
+ metacache_str_t *chain;
+} metacache_hash_t;
+
+#define HASH_SIZE 4096
+
+static metacache_hash_t hashHASH_SIZE;
+
+static uint32_t
+metacache_get_hash_sdbm (const char *str, size_t len) {
+ uint32_t h = 0;
+ int c;
+
+ const char *end = str+len;
+
+ while (str < end) {
+ c = *str++;
+ h = c + (h << 6) + (h << 16) - h;
+ }
+
+ return h;
+}
+
+static metacache_str_t *
+metacache_find_in_bucket (uint32_t h, const char *value, size_t len) {
+ metacache_hash_t *bucket = &hashh;
+ metacache_str_t *chain = bucket->chain;
+ while (chain) {
+ if (chain->value_length == len && !memcmp (chain->str, value, len)) {
+ return chain;
+ }
+ chain = chain->next;
+ }
+ return NULL;
+}
+
+static int n_strings = 0;
+static int n_inserts = 0;
+static int n_buckets = 0;
+
+const char *
+metacache_add_value (const char *value, size_t len) {
+ // printf ("n_strings=%d, n_inserts=%d, n_buckets=%d\n", n_strings, n_inserts, n_buckets);
+ uint32_t h = metacache_get_hash_sdbm (value, len);
+ metacache_str_t *data = metacache_find_in_bucket (h & (HASH_SIZE-1), value, len);
+ n_inserts++;
+ if (data) {
+ data->refcount++;
+ return data->str;
+ }
+ metacache_hash_t *bucket = &hashh & (HASH_SIZE-1);
+ if (!bucket->chain) {
+ n_buckets++;
+ }
+ data = malloc (sizeof (metacache_str_t) + len);
+ memset (data, 0, sizeof (metacache_str_t) + len);
+ data->refcount = 1;
+ memcpy (data->str, value, len);
+ data->value_length = len;
+ data->next = bucket->chain;
+ bucket->chain = data;
+ n_strings++;
+ return data->str;
+}
+
+const char *
+metacache_add_string (const char *str) {
+ return metacache_add_value (str, (int)strlen (str) + 1);
+}
+
+void
+metacache_remove_value (const char *value, size_t valuesize) {
+ uint32_t h = metacache_get_hash_sdbm (value, valuesize);
+ metacache_hash_t *bucket = &hashh & (HASH_SIZE-1);
+ metacache_str_t *chain = bucket->chain;
+ metacache_str_t *prev = NULL;
+ while (chain) {
+ if (chain->value_length == valuesize && !memcmp (chain->str, value, valuesize)) {
+ chain->refcount--;
+ if (chain->refcount == 0) {
+ if (prev) {
+ prev->next = chain->next;
+ }
+ else {
+ bucket->chain = chain->next;
+ }
+ free (chain);
+ }
+ break;
+ }
+ prev = chain;
+ chain = chain->next;
+ }
+}
+
+void
+metacache_remove_string (const char *str) {
+ return metacache_remove_value (str, strlen (str) + 1);
+}
+
+// DEPRECATED_113
+void
+metacache_ref (const char *str) {
+ uint32_t *refc = (uint32_t *)(str-5);
+ (*refc)++;
+}
+
+// DEPRECATED_113
+void
+metacache_unref (const char *str) {
+ uint32_t *refc = (uint32_t *)(str-5);
+ (*refc)--;
+}
+
+const char *
+metacache_get_string (const char *str) {
+ return metacache_get_value (str, strlen (str)+1);
+}
+
+const char *
+metacache_get_value (const char *value, size_t len) {
+ uint32_t h = metacache_get_hash_sdbm (value, len);
+ metacache_str_t *data = metacache_find_in_bucket (h & (HASH_SIZE-1), value, len);
+ n_inserts++;
+ if (data) {
+ data->refcount++;
+ return data->str;
+ }
+
+ return NULL;
+}

deadbeef-1.9.6.tar.bz2/src/metacache.h Added

@@ -0,0 +1,62 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  metadata string cache/database
+
+  Copyright (C) 2009-2013 Oleksiy 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
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __METACACHE_H
+#define __METACACHE_H
+
+// Adds a new NULL-terminated string, or finds an existing one
+const char *
+metacache_add_string (const char *str);
+
+// Returns an existing NULL-terminated string, or NULL if it doesn't exist
+const char *
+metacache_get_string (const char *str);
+
+// Removes an existing string, ignoring refcount
+void
+metacache_remove_string (const char *str);
+
+// Adds a new value of specified size, or finds an existing one
+const char *
+metacache_add_value (const char *value, size_t valuesize);
+
+// Returns an existing value of specified size, or NULL if it doesn't exist
+const char *
+metacache_get_value (const char *value, size_t valuesize);
+
+// Removes an existing value of specified size, ignoring refcount
+void
+metacache_remove_value (const char *value, size_t valuesize);
+
+// Increases reference count of the specified value
+void
+metacache_ref (const char *str);
+
+// Decreases reference count of the specified value
+void
+metacache_unref (const char *str);
+
+#endif

deadbeef-1.9.6.tar.bz2/src/moduleconf.h Added

deadbeef-1.9.6.tar.bz2/src/playlist.c Added

@@ -0,0 +1,4172 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ playlist management
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#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>
+#include <fnmatch.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <assert.h>
+#include <time.h>
+#include <sys/time.h>
+#ifndef __linux__
+#define _POSIX_C_SOURCE 1
+#endif
+#include <limits.h>
+#include <errno.h>
+#include <math.h>
+#include "buffered_file_writer.h"
+#include "gettext.h"
+#include "playlist.h"
+#include "plmeta.h"
+#include "streamer.h"
+#include "messagepump.h"
+#include "plugins.h"
+#include "junklib.h"
+#include "vfs.h"
+#include "conf.h"
+#include "utf8.h"
+#include <deadbeef/common.h>
+#include "threading.h"
+#include "metacache.h"
+#include "volume.h"
+#include "pltmeta.h"
+#include "escape.h"
+#include <deadbeef/strdupa.h>
+#include "tf.h"
+#include "playqueue.h"
+#include "sort.h"
+#include "cueutil.h"
+#include "playmodes.h"
+
+// disable custom title function, until we have new title formatting (0.7)
+#define DISABLE_CUSTOM_TITLE
+
+#define DISABLE_LOCKING 0
+#define DEBUG_LOCKING 0
+#define DETECT_PL_LOCK_RC 0
+
+#if DETECT_PL_LOCK_RC
+#include <pthread.h>
+#endif
+
+// file format revision history
+// 1.1->1.2 changelog:
+// added flags field
+// 1.0->1.1 changelog:
+// added sample-accurate seek positions for sub-tracks
+// 1.1->1.2 changelog:
+// added flags field
+// 1.2->1.3 changelog:
+// removed legacy data used for compat with 0.4.4
+// note: ddb-0.5.0 should keep using 1.2 playlist format
+// 1.3 support is designed for transition to ddb-0.6.0
+#define PLAYLIST_MAJOR_VER 1
+#define PLAYLIST_MINOR_VER 2
+
+#if (PLAYLIST_MINOR_VER<2)
+#error writing playlists in format <1.2 is not supported
+#endif
+
+#define min(x,y) ((x)<(y)?(x):(y))
+
+static int _playlists_count = 0;
+static playlist_t *_playlists_head = NULL;
+static playlist_t *_current_playlist = NULL; // current playlist
+static int _plt_loading = 0; // disable sending event about playlist switch, config regen, etc
+
+#if !DISABLE_LOCKING
+static uintptr_t _playlist_mutex;
+#endif
+
+#define LOCK {pl_lock();}
+#define UNLOCK {pl_unlock();}
+
+// used at startup to prevent crashes
+static playlist_t _dummy_playlist = {
+ .refc = 1
+};
+
+static int no_remove_notify;
+
+static playlist_t *addfiles_playlist; // current playlist for adding files/folders; set in pl_add_files_begin
+
+int conf_cue_prefer_embedded = 0;
+
+typedef struct ddb_fileadd_listener_s {
+ int id;
+ int (*callback)(ddb_fileadd_data_t *data, void *user_data);
+ void *user_data;
+ struct ddb_fileadd_listener_s *next;
+} ddb_fileadd_listener_t;
+
+typedef struct ddb_fileadd_filter_s {
+ int id;
+ int (*callback)(ddb_file_found_data_t *data, void *user_data);
+ void *user_data;
+ struct ddb_fileadd_filter_s *next;
+} ddb_fileadd_filter_t;
+
+static ddb_fileadd_listener_t *file_add_listeners;
+static ddb_fileadd_filter_t *file_add_filters;
+
+typedef struct ddb_fileadd_beginend_listener_s {
+ int id;
+ void (*callback_begin)(ddb_fileadd_data_t *data, void *user_data);
+ void (*callback_end)(ddb_fileadd_data_t *data, void *user_data);
+ void *user_data;
+ struct ddb_fileadd_beginend_listener_s *next;
+} ddb_fileadd_beginend_listener_t;
+
+static ddb_fileadd_beginend_listener_t *file_add_beginend_listeners;
+
+static void
+_plt_set_curr_int(playlist_t *plt);
+
+void
+pl_reshuffle_all (void) {
+ for (playlist_t *plt = _playlists_head; plt; plt = plt->next) {
+ plt_reshuffle (plt, NULL, NULL);
+ }
+}
+
+int
+pl_init (void) {
+ if (_current_playlist) {
+ return 0; // avoid double init
+ }
+ _current_playlist = &_dummy_playlist;
+#if !DISABLE_LOCKING
+ _playlist_mutex = mutex_create ();
+#endif
+ return 0;
+}
+
+void
+pl_free (void) {
+ LOCK;
+ playqueue_clear ();
+ _plt_loading = 1;
+ while (_playlists_head) {
+
+ for (playItem_t *it = _playlists_head->headPL_MAIN; it; it = it->nextPL_MAIN) {
+ if (it->_refc > 1) {
+ fprintf (stderr, "\0330;31mWARNING: playitem %p %s(%s) has refc=%d at delete time\03337;0m\n", it, pl_find_meta_raw (it, ":URI"), pl_find_meta_raw (it, "track"), it->_refc);
+ }
+ }
+
+ //fprintf (stderr, "\0330;31mplt refc %d\03337;0m\n", playlists_head->refc);
+
+ if (_playlists_head->refc > 1) {
+ fprintf (stderr, "\0330;31mWARNING: PLAYLIST %p %s has refc=%d at delete time\03337;0m\n", _playlists_head, _playlists_head->title, _playlists_head->refc);
+ }
+
+ plt_remove (0);
+ }
+ _plt_loading = 0;
+ UNLOCK;
+#if !DISABLE_LOCKING
+ if (_playlist_mutex) {
+ mutex_free (_playlist_mutex);
+ _playlist_mutex = 0;
+ }
+#endif
+ _current_playlist = NULL;
+}
+
+#if DEBUG_LOCKING
+volatile int pl_lock_cnt = 0;
+#endif
+#if DETECT_PL_LOCK_RC
+static pthread_t tids1000;
+static int ntids = 0;
+pthread_t pl_lock_tid = 0;
+#endif
+void
+pl_lock (void) {
+#if !DISABLE_LOCKING
+ mutex_lock (_playlist_mutex);
+#if DETECT_PL_LOCK_RC
+ pl_lock_tid = pthread_self ();
+ tidsntids++ = pl_lock_tid;
+#endif
+
+#if DEBUG_LOCKING
+ pl_lock_cnt++;
+ printf ("pcnt: %d\n", pl_lock_cnt);
+#endif
+#endif
+}
+
+void
+pl_unlock (void) {
+#if !DISABLE_LOCKING
+#if DETECT_PL_LOCK_RC
+ if (ntids > 0) {
+ ntids--;
+ }
+ if (ntids > 0) {
+ pl_lock_tid = tidsntids-1;
+ }
+ else {
+ pl_lock_tid = 0;
+ }
+#endif
+ mutex_unlock (_playlist_mutex);
+#if DEBUG_LOCKING
+ pl_lock_cnt--;
+ printf ("pcnt: %d\n", pl_lock_cnt);
+#endif
+#endif
+}
+
+static void
+pl_item_free (playItem_t *it);
+
+static void
+plt_gen_conf (void) {
+ if (_plt_loading) {
+ return;
+ }
+ LOCK;
+ int cnt = plt_get_count ();
+ int i;
+ conf_remove_items ("playlist.tab.");
+
+ playlist_t *p = _playlists_head;
+ for (i = 0; i < cnt; i++, p = p->next) {
+ char s100;
+ snprintf (s, sizeof (s), "playlist.tab.%05d", i);
+ conf_set_str (s, p->title);
+ snprintf (s, sizeof (s), "playlist.cursor.%d", i);
+ conf_set_int (s, p->current_rowPL_MAIN);
+ snprintf (s, sizeof (s), "playlist.scroll.%d", i);
+ conf_set_int (s, p->scroll);
+ }
+ UNLOCK;
+}
+
+playlist_t *
+plt_get_list (void) {
+ return _playlists_head;
+}
+
+playlist_t *
+plt_get_curr (void) {
+ LOCK;
+ if (!_current_playlist) {
+ _current_playlist = _playlists_head;
+ }
+ playlist_t *plt = _current_playlist;
+ if (plt) {
+ plt_ref (plt);
+ assert (plt->refc > 1);
+ }
+ UNLOCK;
+ return plt;
+}
+
+playlist_t *
+plt_get_for_idx (int idx) {
+ LOCK;
+ playlist_t *p = _playlists_head;
+ for (int i = 0; p && i <= idx; i++, p = p->next) {
+ if (i == idx) {
+ plt_ref (p);
+ UNLOCK;
+ return p;
+ }
+ }
+ UNLOCK;
+ return NULL;
+}
+
+void
+plt_ref (playlist_t *plt) {
+ __atomic_fetch_add(&plt->refc, 1, __ATOMIC_SEQ_CST);
+}
+
+void
+plt_unref (playlist_t *plt) {
+ int refc = __atomic_fetch_sub(&plt->refc, 1, __ATOMIC_SEQ_CST);
+ assert(refc > 0);
+ if (refc <= 0) {
+ trace ("\0330;31mplaylist: bad refcount on playlist %p (%s)\03337;0m\n", plt, plt->title);
+ }
+ if (refc <= 1) {
+ plt_free (plt);
+ }
+}
+
+int
+plt_get_count (void) {
+ return _playlists_count;
+}
+
+playItem_t *plt_get_head_item(playlist_t *p, int iter) {
+ pl_lock ();
+ playItem_t *head = p->headiter;
+ if (head) {
+ pl_item_ref (head);
+ }
+ pl_unlock ();
+ return head;
+}
+
+playItem_t *plt_get_tail_item(playlist_t *p, int iter) {
+ pl_lock ();
+ playItem_t *tail = p->tailiter;
+ if (tail) {
+ pl_item_ref (tail);
+ }
+ pl_unlock ();
+ return tail;
+}
+
+playItem_t *
+plt_get_head (int plt) {
+ playlist_t *p = _playlists_head;
+ for (int i = 0; p && i <= plt; i++, p = p->next) {
+ if (i == plt) {
+ return plt_get_head_item(p, PL_MAIN);
+ }
+ }
+ return NULL;
+}
+
+int
+plt_get_sel_count (int plt) {
+ playlist_t *p = _playlists_head;
+ for (int i = 0; p && i <= plt; i++, p = p->next) {
+ if (i == plt) {
+ return plt_getselcount (p);
+ }
+ }
+ 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);
+ playlist_t *plt = plt_alloc (title);
+ plt_modified (plt);
+
+ LOCK;
+ playlist_t *p_before = NULL;
+ playlist_t *p_after = _playlists_head;
+
+ for (int i = 0; i < before; i++) {
+ if (i >= before+1) {
+ break;
+ }
+ p_before = p_after;
+ if (p_after) {
+ p_after = p_after->next;
+ }
+ else {
+ p_after = _playlists_head;
+ }
+ }
+
+ if (p_before) {
+ p_before->next = plt;
+ }
+ else {
+ _playlists_head = plt;
+ }
+ plt->next = p_after;
+ _playlists_count++;
+
+ if (!_current_playlist) {
+ _current_playlist = plt;
+ if (!_plt_loading) {
+ // shift files
+ for (int i = _playlists_count-1; i >= before+1; i--) {
+ char path1PATH_MAX;
+ char path2PATH_MAX;
+ if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path1)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ continue;
+ }
+ if (snprintf (path2, sizeof (path2), "%s/playlists/%d.dbpl", dbconfdir, i+1) > sizeof (path2)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ continue;
+ }
+ int err = rename (path1, path2);
+ if (err != 0) {
+ fprintf (stderr, "playlist rename failed: %s\n", strerror (errno));
+ }
+ }
+ }
+ }
+ UNLOCK;
+
+ plt_gen_conf ();
+ if (!_plt_loading) {
+ plt_save_n (before);
+ conf_save ();
+ messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CREATED, 0);
+ }
+ return before;
+}
+
+playlist_t *
+plt_append (const char *title) {
+ plt_add(plt_get_count(), title);
+ playlist_t *p;
+ for (p = _playlists_head; p && p->next; p = p->next);
+ plt_ref (p);
+ return p;
+}
+
+// NOTE: caller must ensure that configuration is saved after that call
+void
+plt_remove (int plt) {
+ LOCK;
+ if (plt < 0 || plt >= _playlists_count) {
+ UNLOCK;
+ return;
+ }
+
+ // find playlist and notify streamer
+ playlist_t *p = _playlists_head;
+ playlist_t *prev = NULL;
+ for (int i = 0; p && i < plt; i++) {
+ prev = p;
+ p = p->next;
+ }
+
+ if (!p) {
+ UNLOCK;
+ return;
+ }
+
+ streamer_notify_playlist_deleted (p);
+ if (!_plt_loading) {
+ // move files (will decrease number of files by 1)
+ for (int i = plt+1; i < _playlists_count; i++) {
+ char path1PATH_MAX;
+ char path2PATH_MAX;
+ if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, i-1) > sizeof (path1)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ continue;
+ }
+ if (snprintf (path2, sizeof (path2), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path2)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ continue;
+ }
+ int err = rename (path2, path1);
+ if (err != 0) {
+ fprintf (stderr, "playlist rename failed: %s\n", strerror (errno));
+ }
+ }
+ }
+
+ if (!_plt_loading && (_playlists_head && !_playlists_head->next)) {
+ pl_clear ();
+ free (_current_playlist->title);
+ _current_playlist->title = strdup (_("Default"));
+ UNLOCK;
+ plt_gen_conf ();
+ conf_save ();
+ plt_save_n (0);
+ messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_DELETED, 0);
+ return;
+ }
+ if (p) {
+ if (!prev) {
+ _playlists_head = p->next;
+ }
+ else {
+ prev->next = p->next;
+ }
+ }
+ playlist_t *next = p->next;
+ playlist_t *old = _current_playlist;
+ _current_playlist = p;
+ _current_playlist = old;
+
+
+ playlist_t *new_current_playlist = _current_playlist;
+
+ // deleted the current playlist?
+ if (p == new_current_playlist) {
+ if (next) {
+ new_current_playlist = next;
+ }
+ else {
+ new_current_playlist = prev ? prev : _playlists_head;
+ }
+ }
+
+ _plt_set_curr_int(new_current_playlist);
+
+ plt_unref (p);
+ _playlists_count--;
+ UNLOCK;
+
+ plt_gen_conf ();
+ conf_save ();
+ if (!_plt_loading) {
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_DELETED, 0);
+ }
+}
+
+int
+plt_find (const char *name) {
+ playlist_t *p = _playlists_head;
+ int i = -1;
+ for (i = 0; p; i++, p = p->next) {
+ if (!strcmp (p->title, name)) {
+ return i;
+ }
+ }
+ return -1;
+}
+
+playlist_t *
+plt_find_by_name (const char *name) {
+ playlist_t *p = _playlists_head;
+ for (; p; p = p->next) {
+ if (!strcmp (p->title, name)) {
+ plt_ref (p);
+ return p;
+ }
+ }
+ return NULL;
+}
+
+static void
+_plt_set_curr_int(playlist_t *plt) {
+ int old_index = conf_get_int ("playlist.current", 0);
+
+ playlist_t *new_playlist = plt ? plt : &_dummy_playlist;
+
+ int playlist_switched = new_playlist != _current_playlist;
+
+ _current_playlist = new_playlist;
+
+ int new_index = plt_get_idx(_current_playlist);
+
+ if (!_plt_loading) {
+ if (old_index != new_index) {
+ conf_set_int ("playlist.current", plt_get_curr_idx ());
+ conf_save ();
+ }
+ if (playlist_switched) {
+ messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
+ }
+ }
+}
+
+void
+plt_set_curr (playlist_t *plt) {
+ LOCK;
+ _plt_set_curr_int(plt);
+ UNLOCK;
+}
+
+void
+plt_set_curr_idx (int plt) {
+ int i;
+ LOCK;
+ playlist_t *p = _playlists_head;
+ for (i = 0; p && p->next && i < plt; i++) {
+ p = p->next;
+ }
+
+ _plt_set_curr_int(p);
+
+ UNLOCK;
+}
+
+int
+plt_get_curr_idx(void) {
+ int i;
+ LOCK;
+ playlist_t *p = _playlists_head;
+ for (i = 0; p && i < _playlists_count; i++) {
+ if (p == _current_playlist) {
+ UNLOCK;
+ return i;
+ }
+ p = p->next;
+ }
+ UNLOCK;
+ return -1;
+}
+
+int
+plt_get_idx_of (playlist_t *plt) {
+ int i;
+ LOCK;
+ playlist_t *p = _playlists_head;
+ for (i = 0; p && i < _playlists_count; i++) {
+ if (p == plt) {
+ UNLOCK;
+ return i;
+ }
+ p = p->next;
+ }
+ UNLOCK;
+ return -1;
+}
+
+int
+plt_get_title (playlist_t *p, char *buffer, int bufsize) {
+ LOCK;
+ if (!buffer) {
+ int l = (int)strlen (p->title);
+ UNLOCK;
+ return l;
+ }
+ strncpy (buffer, p->title, bufsize);
+ bufferbufsize-1 = 0;
+ UNLOCK;
+ return 0;
+}
+
+int
+plt_set_title (playlist_t *p, const char *title) {
+ LOCK;
+ free (p->title);
+ p->title = strdup (title);
+ plt_gen_conf ();
+ UNLOCK;
+ conf_save ();
+ if (!_plt_loading) {
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_TITLE, 0);
+ }
+ return 0;
+}
+
+void
+plt_modified (playlist_t *plt) {
+ pl_lock ();
+ plt->modification_idx++;
+ pl_unlock ();
+}
+
+int
+plt_get_modification_idx (playlist_t *plt) {
+ pl_lock ();
+ int idx = plt->modification_idx;
+ pl_unlock ();
+ return idx;
+}
+
+void
+plt_free (playlist_t *plt) {
+ LOCK;
+
+ plt_clear (plt);
+
+ if (plt->title) {
+ free (plt->title);
+ }
+
+ while (plt->meta) {
+ DB_metaInfo_t *m = plt->meta;
+ plt->meta = m->next;
+ metacache_remove_string (m->key);
+ metacache_remove_string (m->value);
+ free (m);
+ }
+
+ free (plt);
+ UNLOCK;
+}
+
+void
+plt_move (int from, int to) {
+ if (from == to) {
+ return;
+ }
+ if (from >= _playlists_count || to >= _playlists_count) {
+ fprintf (stderr, "plt_move: attempt to move playlist to/from out of bounds index; from=%d, to=%d, count=%d\n", from, to, _playlists_count);
+ return;
+ }
+ LOCK;
+ playlist_t *p = _playlists_head;
+
+ playlist_t *pfrom = NULL;
+ playlist_t *prev = NULL;
+
+ // move 'from' to temp file
+ char path1PATH_MAX;
+ char tempPATH_MAX;
+ if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, from) > sizeof (path1)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ UNLOCK;
+ return;
+ }
+ if (snprintf (temp, sizeof (temp), "%s/playlists/temp.dbpl", dbconfdir) > sizeof (temp)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ UNLOCK;
+ return;
+ }
+
+ struct stat st;
+ int err = stat (path1, &st);
+ if (err == 0) {
+ err = rename (path1, temp);
+ if (err != 0) {
+ fprintf (stderr, "playlist rename %s->%s failed: %s\n", path1, temp, strerror (errno));
+ UNLOCK;
+ return;
+ }
+ }
+
+ // remove 'from' from list
+ for (int i = 0; p && i <= from; i++) {
+ if (i == from) {
+ pfrom = p;
+ if (prev) {
+ prev->next = p->next;
+ }
+ else {
+ _playlists_head = p->next;
+ }
+ break;
+ }
+ prev = p;
+ p = p->next;
+ }
+
+ if (!pfrom) {
+ UNLOCK;
+ return;
+ }
+
+ // shift files to fill the gap
+ for (int i = from; i < _playlists_count-1; i++) {
+ char path2PATH_MAX;
+ if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path1)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ continue;
+ }
+ if (snprintf (path2, sizeof (path2), "%s/playlists/%d.dbpl", dbconfdir, i+1) > sizeof (path2)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ continue;
+ }
+ err = stat (path2, &st);
+ if (err == 0) {
+ err = rename (path2, path1);
+ if (err != 0) {
+ fprintf (stderr, "playlist rename %s->%s failed: %s\n", path2, path1, strerror (errno));
+ }
+ }
+ }
+ // open new gap
+ for (int i = _playlists_count-2; i >= to; i--) {
+ char path2PATH_MAX;
+ if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path1)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ continue;
+ }
+ if (snprintf (path2, sizeof (path2), "%s/playlists/%d.dbpl", dbconfdir, i+1) > sizeof (path2)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ continue;
+ }
+ err = stat (path1, &st);
+ if (err == 0) {
+ err = rename (path1, path2);
+ if (err != 0) {
+ fprintf (stderr, "playlist rename %s->%s failed: %s\n", path1, path2, strerror (errno));
+ }
+ }
+ }
+ // move temp file
+ if (snprintf (path1, sizeof (path1), "%s/playlists/%d.dbpl", dbconfdir, to) > sizeof (path1)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ }
+ else {
+ err = stat (temp, &st);
+ if (err == 0) {
+ err = rename (temp, path1);
+ if (err != 0) {
+ fprintf (stderr, "playlist rename %s->%s failed: %s\n", temp, path1, strerror (errno));
+ }
+ }
+ }
+
+ // move pointers
+ if (to == 0) {
+ // insert 'from' as head
+ pfrom->next = _playlists_head;
+ _playlists_head = pfrom;
+ }
+ else {
+ // insert 'from' in the middle
+ p = _playlists_head;
+ for (int i = 0; p && i < to; i++) {
+ if (i == to-1) {
+ playlist_t *next = p->next;
+ p->next = pfrom;
+ pfrom->next = next;
+ break;
+ }
+ p = p->next;
+ }
+ }
+
+ UNLOCK;
+ plt_gen_conf ();
+ conf_save ();
+}
+
+void
+plt_clear (playlist_t *plt) {
+ pl_lock ();
+ while (plt->headPL_MAIN) {
+ plt_remove_item (plt, plt->headPL_MAIN);
+ }
+ plt->current_rowPL_MAIN = -1;
+ plt->current_rowPL_SEARCH = -1;
+ plt_modified (plt);
+ pl_unlock ();
+}
+
+void
+pl_clear (void) {
+ LOCK;
+ plt_clear (_current_playlist);
+ UNLOCK;
+}
+
+
+playItem_t * /* insert internal cuesheet - called by plugins */
+plt_insert_cue_from_buffer (playlist_t *plt, playItem_t *after, playItem_t *origin, const uint8_t *buffer, int buffersize, int numsamples, int samplerate) {
+ if (plt->loading_cue) {
+ // means it was called from _load_cue
+ plt->cue_numsamples = numsamples;
+ plt->cue_samplerate = samplerate;
+ }
+ return NULL;
+}
+
+playItem_t * /* insert external cuesheet - called by plugins */
+plt_insert_cue (playlist_t *plt, playItem_t *after, playItem_t *origin, int numsamples, int samplerate) {
+ if (plt->loading_cue) {
+ // means it was called from _load_cue
+ plt->cue_numsamples = numsamples;
+ plt->cue_samplerate = samplerate;
+ }
+ return NULL;
+}
+
+static playItem_t *
+plt_insert_dir_int (
+ int visibility,
+ uint32_t flags,
+ playlist_t *playlist,
+ DB_vfs_t *vfs,
+ playItem_t *after,
+ const char *dirname,
+ int *pabort,
+ int (*callback)(playItem_t *it, void *data),
+ int (*callback_with_result)(ddb_insert_file_result_t result, const char *fname, void *user_data),
+ void *user_data
+ );
+
+static playItem_t *
+plt_load_int (int visibility, playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data);
+
+int
+fileadd_filter_test (ddb_file_found_data_t *data) {
+ for (ddb_fileadd_filter_t *f = file_add_filters; f; f = f->next) {
+ int res = f->callback (data, f->user_data);
+ if (res < 0) {
+ return res;
+ }
+ }
+ return 0;
+}
+
+static playItem_t *
+plt_insert_file_int (
+ int visibility,
+ uint32_t flags,
+ playlist_t *plt,
+ playItem_t *after,
+ const char *fname,
+ int *pabort,
+ int (*callback)(playItem_t *it, void *data),
+ int (*callback_with_result)(ddb_insert_file_result_t result, const char *fname, void *user_data),
+ void *user_data
+ ) {
+ if (!fname || !(*fname)) {
+ if (callback_with_result) {
+ callback_with_result(DDB_INSERT_FILE_RESULT_NULL_FILENAME, fname, user_data);
+ }
+ return NULL;
+ }
+
+ // check if that is supported container format
+ if (!plt->ignore_archives) {
+ DB_vfs_t **vfsplugs = plug_get_vfs_list ();
+ for (int i = 0; vfsplugsi; i++) {
+ if (vfsplugsi->is_container) {
+ if (vfsplugsi->is_container (fname)) {
+ playItem_t *it = plt_insert_dir_int (visibility, flags, plt, vfsplugsi, after, fname, pabort, callback, NULL, user_data);
+ if (it) {
+ if (callback_with_result) {
+ callback_with_result(DDB_INSERT_FILE_RESULT_SUCCESS, fname, user_data);
+ }
+ return it;
+ }
+ }
+ }
+ }
+ }
+
+ const char *fn = strrchr (fname, '/');
+ if (!fn) {
+ fn = fname;
+ }
+ else {
+ fn++;
+ }
+
+ // add all possible streams as special-case:
+ // set decoder to NULL, and filetype to "content"
+ // streamer is responsible to determine content type on 1st access and
+ // update decoder and filetype fields
+ if (strncasecmp (fname, "file://", 7)) {
+ const char *p = fname;
+ int detect_on_access = 1;
+
+ // check if it's URI
+ for (; *p; p++) {
+ if (!strncmp (p, "://", 3)) {
+ break;
+ }
+ if (!isalpha (*p)) {
+ detect_on_access = 0;
+ break;
+ }
+ }
+
+ if (detect_on_access) {
+ // find vfs plugin
+ DB_vfs_t **vfsplugs = plug_get_vfs_list ();
+ for (int i = 0; vfsplugsi; i++) {
+ if (vfsplugsi->get_schemes) {
+ const char **sch = vfsplugsi->get_schemes ();
+ int s = 0;
+ for (s = 0; schs; s++) {
+ if (!strncasecmp (schs, fname, strlen (schs))) {
+ break;
+ }
+ }
+ if (schs) {
+ if (!vfsplugsi->is_streaming || !vfsplugsi->is_streaming()) {
+ detect_on_access = 0;
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ if (detect_on_access && *p == ':') {
+ // check for wrong chars like CR/LF, TAB, etc
+ // they are not allowed and might lead to corrupt display in GUI
+ int32_t i = 0;
+ while (fnamei) {
+ uint32_t c = u8_nextchar (fname, &i);
+ if (c < 0x20) {
+ if (callback_with_result) {
+ callback_with_result(DDB_INSERT_FILE_RESULT_NULL_FILENAME, fname, user_data);
+ }
+ return NULL;
+ }
+ }
+
+ playItem_t *it = pl_item_alloc_init (fname, NULL);
+ pl_replace_meta (it, ":FILETYPE", "content");
+ after = plt_insert_item (addfiles_playlist ? addfiles_playlist : plt, after, it);
+ pl_item_unref (it);
+ if (callback_with_result) {
+ callback_with_result(DDB_INSERT_FILE_RESULT_SUCCESS, fname, user_data);
+ }
+ return after;
+ }
+ }
+ else {
+ char *escaped = uri_unescape (fname, (int)strlen (fname));
+ if (escaped) {
+ fname = strdupa (escaped);
+ free (escaped);
+ }
+ fname += 7;
+ }
+
+ #ifdef __MINGW32__
+ // replace backslashes with normal slashes
+ char fname_convstrlen(fname)+1;
+ if (strchr(fname, '\\')) {
+ trace ("plt_insert_file_int: backslash(es) detected: %s\n", fname);
+ strcpy (fname_conv, fname);
+ char *slash_p = fname_conv;
+ while (slash_p = strchr(slash_p, '\\')) {
+ *slash_p = '/';
+ slash_p++;
+ }
+ fname = fname_conv;
+ }
+ // path should start with "X:/", not "/X:/", fixing to avoid file opening problems
+ if (fname0 == '/' && isalpha(fname1) && fname2 == ':') {
+ fname++;
+ }
+ #endif
+
+ // now that it's known we're not dealing with URL, check if it's a relative path
+ if (is_relative_path (fname)) {
+ if (callback_with_result) {
+ callback_with_result(DDB_INSERT_FILE_RESULT_RELATIVE_PATH, fname, user_data);
+ }
+ return NULL;
+ }
+
+ // detect decoder
+ const char *eol = strrchr (fname, '.');
+ if (!eol) {
+ if (callback_with_result) {
+ callback_with_result(DDB_INSERT_FILE_RESULT_NO_FILE_EXTENSION, fname, user_data);
+ }
+ return NULL;
+ }
+ eol++;
+
+ // handle cue files
+ if (!strcasecmp (eol, "cue")) {
+ playItem_t *inserted = plt_load_cue_file(plt, after, fname, NULL, NULL, 0);
+ if (callback_with_result) {
+ callback_with_result(inserted ? DDB_INSERT_FILE_RESULT_SUCCESS : DDB_INSERT_FILE_RESULT_CUESHEET_ERROR, fname, user_data);
+ }
+ return inserted;
+ }
+
+ int filter_done = 0;
+ int file_recognized = 0;
+
+ DB_decoder_t **decoders = plug_get_decoder_list ();
+ // match by decoder
+ for (int i = 0; decodersi; i++) {
+ if (decodersi->exts && decodersi->insert) {
+ const char **exts = decodersi->exts;
+ for (int e = 0; extse; e++) {
+ if (!strcasecmp (extse, eol) || !strcmp (extse, "*")) {
+ if (!filter_done) {
+ ddb_file_found_data_t dt;
+ dt.filename = fname;
+ dt.plt = (ddb_playlist_t *)plt;
+ dt.is_dir = 0;
+ if (fileadd_filter_test (&dt) < 0) {
+ return NULL;
+ }
+ filter_done = 1;
+ }
+
+ file_recognized = 1;
+
+ playItem_t *inserted = (playItem_t *)decodersi->insert ((ddb_playlist_t *)plt, DB_PLAYITEM (after), fname);
+ if (inserted != NULL) {
+ if (callback && callback (inserted, user_data) < 0) {
+ *pabort = 1;
+ }
+ else if (callback_with_result && callback_with_result(DDB_INSERT_FILE_RESULT_SUCCESS, fname, user_data) < 0) {
+ *pabort = 1;
+ }
+ if (file_add_listeners) {
+ ddb_fileadd_data_t d;
+ memset (&d, 0, sizeof (d));
+ d.visibility = visibility;
+ d.plt = (ddb_playlist_t *)plt;
+ d.track = (ddb_playItem_t *)inserted;
+ for (ddb_fileadd_listener_t *l = file_add_listeners; l; l = l->next) {
+ if (pabort && l->callback (&d, l->user_data) < 0) {
+ *pabort = 1;
+ break;
+ }
+ }
+ }
+ return inserted;
+ }
+ }
+ }
+ }
+ if (decodersi->prefixes && decodersi->insert) {
+ const char **prefixes = decodersi->prefixes;
+ for (int e = 0; prefixese; e++) {
+ if (!strncasecmp (prefixese, fn, strlen(prefixese)) && *(fn + strlen (prefixese)) == '.') {
+ if (!filter_done) {
+ ddb_file_found_data_t dt;
+ dt.filename = fname;
+ dt.plt = (ddb_playlist_t *)plt;
+ dt.is_dir = 0;
+ if (fileadd_filter_test (&dt) < 0) {
+ return NULL;
+ }
+ filter_done = 1;
+ }
+
+ file_recognized = 1;
+ playItem_t *inserted = (playItem_t *)decodersi->insert ((ddb_playlist_t *)plt, DB_PLAYITEM (after), fname);
+ if (inserted != NULL) {
+ if (callback && callback (inserted, user_data) < 0) {
+ *pabort = 1;
+ }
+ else if (callback_with_result && callback_with_result(DDB_INSERT_FILE_RESULT_SUCCESS, fname, user_data) < 0) {
+ *pabort = 1;
+ }
+ if (file_add_listeners) {
+ ddb_fileadd_data_t d;
+ memset (&d, 0, sizeof (d));
+ d.visibility = visibility;
+ d.plt = (ddb_playlist_t *)plt;
+ d.track = (ddb_playItem_t *)inserted;
+ for (ddb_fileadd_listener_t *l = file_add_listeners; l; l = l->next) {
+ if (l->callback (&d, l->user_data) < 0) {
+ *pabort = 1;
+ break;
+ }
+ }
+ }
+ return inserted;
+ }
+ }
+ }
+ }
+ }
+ if (file_recognized) {
+ if (callback_with_result) {
+ callback_with_result (DDB_INSERT_FILE_RESULT_RECOGNIZED_FAILED, fname, user_data);
+ }
+ else {
+ trace_err ("ERROR: could not load: %s\n", fname);
+ }
+ }
+ else if (callback_with_result) {
+ callback_with_result (DDB_INSERT_FILE_RESULT_UNRECOGNIZED_FILE, fname, user_data);
+ }
+ return NULL;
+}
+
+static uint32_t
+_get_insert_file_flags_from_config (void) {
+ uint32_t flags = 0;
+ if (conf_get_int ("add_folders_follow_symlinks", 0)) {
+ flags |= DDB_INSERT_FILE_FLAG_FOLLOW_SYMLINKS;
+ }
+ if (!conf_get_int ("ignore_archives", 1)) {
+ flags |= DDB_INSERT_FILE_FLAG_ENTER_ARCHIVES;
+ }
+ return flags;
+}
+
+playItem_t *
+plt_insert_file (playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
+ return plt_insert_file_int (0, _get_insert_file_flags_from_config(), plt, after, fname, pabort, cb, NULL, user_data);
+}
+
+static int dirent_alphasort (const struct dirent **a, const struct dirent **b) {
+ return strcmp ((*a)->d_name, (*b)->d_name);
+}
+
+static void
+_get_fullname_and_dir (char *fullname, int sz, char *dir, int dirsz, DB_vfs_t *vfs, const char *dirname, const char *d_name) {
+ char resolved_dirnamePATH_MAX;
+
+ char *res = realpath (dirname, resolved_dirname);
+ if (res) {
+ dirname = resolved_dirname;
+ }
+
+ if (!vfs) {
+ // prevent double-slashes
+ char *stripped_dirname = strdupa (dirname);
+ char *p = stripped_dirname + strlen(stripped_dirname) - 1;
+ while (p > stripped_dirname && (*p == '/' || *p == '\\')) {
+ p--;
+ }
+ p++;
+ *p = 0;
+
+ snprintf (fullname, sz, "%s/%s", stripped_dirname, d_name);
+ if (dir) {
+ *dir = 0;
+ strncat (dir, stripped_dirname, dirsz - 1);
+ }
+ }
+ else {
+ const char *sch = NULL;
+ if (vfs->plugin.api_vminor >= 6 && vfs->get_scheme_for_name) {
+ sch = vfs->get_scheme_for_name (dirname);
+ }
+ if (sch && strncmp (sch, d_name, strlen (sch))) {
+ snprintf (fullname, sz, "%s%s:%s", sch, dirname, d_name);
+ if (dir) {
+ snprintf (dir, dirsz, "%s%s:", sch, dirname);
+ }
+ }
+ else {
+ *fullname = 0;
+ strncat (fullname, d_name, sz - 1);
+ if (dir) {
+ *dir = 0;
+ strncat (dir, dirname, dirsz - 1);
+ }
+ }
+ }
+
+ #ifdef __MINGW32__
+ if (fullname && strchr(fullname, '\\')) {
+ char *slash_p = fullname;
+ while (slash_p = strchr(slash_p, '\\')) {
+ *slash_p = '/';
+ slash_p++;
+ }
+ trace ("_get_fullname_and_dir backslash(es) found, converted: %s\n", fullname);
+ }
+ if (dir && strchr(dir, '\\')) {
+ char *slash_p = dir;
+ while (slash_p = strchr(slash_p, '\\')) {
+ *slash_p = '/';
+ slash_p++;
+ }
+ trace ("_get_fullname_and_dir backslash(es) found, converted: %s\n", dir);
+ }
+ #endif
+}
+
+static playItem_t *
+plt_insert_dir_int (
+ int visibility,
+ uint32_t flags,
+ playlist_t *plt,
+ DB_vfs_t *vfs,
+ playItem_t *after,
+ const char *dirname,
+ int *pabort,
+ int (*callback)(playItem_t *it, void *data),
+ int (*callback_with_result)(ddb_insert_file_result_t result, const char *fname, void *user_data),
+ void *user_data
+ ) {
+ plt->follow_symlinks = (flags&DDB_INSERT_FILE_FLAG_FOLLOW_SYMLINKS) ? 1 : 0;
+ plt->ignore_archives = (flags&DDB_INSERT_FILE_FLAG_ENTER_ARCHIVES) ? 0 : 1;
+
+ if (!strncmp (dirname, "file://", 7)) {
+ dirname += 7;
+ }
+
+ #ifdef __MINGW32__
+ // replace backslashes with normal slashes
+ char dirname_convstrlen(dirname)+1;
+ if (strchr(dirname, '\\')) {
+ trace ("plt_insert_dir_int: backslash(es) detected: %s\n", dirname);
+ strcpy (dirname_conv, dirname);
+ char *slash_p = dirname_conv;
+ while (slash_p = strchr(slash_p, '\\')) {
+ *slash_p = '/';
+ slash_p++;
+ }
+ dirname = dirname_conv;
+ }
+ // path should start with "X:/", not "/X:/", fixing to avoid file opening problems
+ if (dirname0 == '/' && isalpha(dirname1) && dirname2 == ':') {
+ dirname++;
+ }
+ #endif
+
+ if (is_relative_path (dirname)) {
+ return NULL;
+ }
+
+ if (!plt->follow_symlinks && !vfs) {
+ struct stat buf;
+ lstat (dirname, &buf);
+ if (S_ISLNK(buf.st_mode)) {
+ return NULL;
+ }
+ }
+
+ ddb_file_found_data_t dt;
+ dt.filename = dirname;
+ dt.plt = (ddb_playlist_t *)plt;
+ dt.is_dir = 1;
+ if (fileadd_filter_test (&dt) < 0) {
+ return NULL;
+ }
+
+ struct dirent **namelist = NULL;
+ int n;
+
+ if (vfs && vfs->scandir) {
+ n = vfs->scandir (dirname, &namelist, NULL, dirent_alphasort);
+ // we can't rely on vfs plugins to set d_type
+ // windows/svr4 unixes: missing dirent->d_type
+ #if !defined(__MINGW32__) && !defined(__SVR4)
+ for (int i = 0; i < n; i++) {
+ namelisti->d_type = DT_REG;
+ }
+ #endif
+ }
+ else {
+ n = scandir (dirname, &namelist, NULL, dirent_alphasort);
+ }
+ if (n < 0) {
+ if (namelist) {
+ free (namelist);
+ }
+ return NULL;	// not a dir or no read access
+ }
+
+ // find all cue files in the folder
+ int cuefilesn;
+ int ncuefiles = 0;
+
+ for (int i = 0; i < n; i++) {
+ // no hidden files
+ // windows/svr4 unixes: missing dirent->d_type
+ #if defined(__MINGW32__) || defined(__SVR4)
+ if (namelisti->d_name0 == '.') {
+ #else
+ if (namelisti->d_name0 == '.' || (namelisti->d_type != DT_REG && namelisti->d_type != DT_UNKNOWN)) {
+ #endif
+ continue;
+ }
+
+ size_t l = strlen (namelisti->d_name);
+ if (l > 4 && !strcasecmp (namelisti->d_name + l - 4, ".cue")) {
+ cuefilesncuefiles++ = i;
+ }
+ }
+
+ char fullnamePATH_MAX;
+ char fulldirPATH_MAX;
+
+ // try loading cuesheets first
+ for (int c = 0; c < ncuefiles; c++) {
+ int i = cuefilesc;
+ _get_fullname_and_dir (fullname, sizeof (fullname), fulldir, sizeof(fulldir), vfs, dirname, namelisti->d_name);
+
+ playItem_t *inserted = plt_load_cue_file (plt, after, fullname, fulldir, namelist, n);
+ namelisti->d_name0 = 0;
+
+ if (inserted) {
+ after = inserted;
+ }
+ if (pabort && *pabort) {
+ break;
+ }
+ }
+
+ // load the rest of the files
+ if (!pabort || !*pabort) {
+ for (int i = 0; i < n; i++) {
+ // no hidden files
+ if (!namelisti->d_name0 || namelisti->d_name0 == '.') {
+ continue;
+ }
+ _get_fullname_and_dir (fullname, sizeof (fullname), NULL, 0, vfs, dirname, namelisti->d_name);
+ playItem_t *inserted = NULL;
+ if (!vfs) {
+ inserted = plt_insert_dir_int (visibility, flags, plt, vfs, after, fullname, pabort, callback, callback_with_result, user_data);
+ }
+ if (!inserted) {
+ inserted = plt_insert_file_int (visibility, flags, plt, after, fullname, pabort, callback, callback_with_result, user_data);
+ }
+
+ if (inserted) {
+ after = inserted;
+ }
+
+ if (pabort && *pabort) {
+ break;
+ }
+ }
+ }
+
+ // free data
+ for (int i = 0; i < n; i++) {
+ free (namelisti);
+ }
+ free (namelist);
+
+ return after;
+}
+
+playItem_t *
+plt_insert_dir (playlist_t *playlist, playItem_t *after, const char *dirname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
+
+ playItem_t *ret = plt_insert_dir_int (0, _get_insert_file_flags_from_config(), playlist, NULL, after, dirname, pabort, cb, NULL, user_data);
+
+ return ret;
+}
+
+static int
+plt_add_file_int (int visibility, uint32_t flags, playlist_t *plt, const char *fname, int (*cb)(playItem_t *it, void *data), void *user_data) {
+ int abort = 0;
+ playItem_t *it = plt_insert_file_int (visibility, flags, plt, plt->tailPL_MAIN, fname, &abort, cb, NULL, user_data);
+ if (it) {
+ // pl_insert_file doesn't hold reference, don't unref here
+ return 0;
+ }
+ return -1;
+}
+
+int
+plt_add_file (playlist_t *plt, const char *fname, int (*cb)(playItem_t *it, void *data), void *user_data) {
+ return plt_add_file_int (0, _get_insert_file_flags_from_config(), plt, fname, cb, user_data);
+}
+
+int
+plt_add_dir (playlist_t *plt, const char *dirname, int (*cb)(playItem_t *it, void *data), void *user_data) {
+ int abort = 0;
+ playItem_t *it = plt_insert_dir (plt, plt->tailPL_MAIN, dirname, &abort, cb, user_data);
+ if (it) {
+ // pl_insert_file doesn't hold reference, don't unref here
+ return 0;
+ }
+ return -1;
+}
+
+int
+pl_add_files_begin (playlist_t *plt) {
+ return plt_add_files_begin (plt, 0);
+}
+
+void
+pl_add_files_end (void) {
+ return plt_add_files_end (addfiles_playlist, 0);
+}
+
+int
+plt_remove_item (playlist_t *playlist, playItem_t *it) {
+ if (!it)
+ return -1;
+
+ if (!no_remove_notify) {
+ streamer_song_removed_notify (it);
+ playqueue_remove (it);
+ }
+
+ // remove from both lists
+ LOCK;
+ for (int iter = PL_MAIN; iter <= PL_SEARCH; iter++) {
+ if (it->previter || it->nextiter || playlist->headiter == it || playlist->tailiter == it) {
+ playlist->countiter--;
+ }
+
+ playItem_t *next = it->nextiter;
+ playItem_t *prev = it->previter;
+
+ if (prev) {
+ prev->nextiter = next;
+ }
+ else {
+ playlist->headiter = next;
+ }
+ if (next) {
+ next->previter = prev;
+ }
+ else {
+ playlist->tailiter = prev;
+ }
+
+ it->nextiter = NULL;
+ it->previter = NULL;
+ }
+
+ float dur = pl_get_item_duration (it);
+ if (dur > 0) {
+ // totaltime
+ playlist->totaltime -= dur;
+ if (playlist->totaltime < 0) {
+ playlist->totaltime = 0;
+ }
+
+ // selected time
+ if (it->selected) {
+ playlist->seltime -= dur;
+ if (playlist->seltime < 0) {
+ playlist->seltime = 0;
+ }
+ }
+ }
+
+ plt_modified (playlist);
+ pl_item_unref (it);
+ UNLOCK;
+ return 0;
+}
+
+int
+plt_get_item_count (playlist_t *plt, int iter) {
+ return plt->countiter;
+}
+
+int
+pl_getcount (int iter) {
+ LOCK;
+ if (!_current_playlist) {
+ UNLOCK;
+ return 0;
+ }
+
+ int cnt = _current_playlist->countiter;
+ UNLOCK;
+ return cnt;
+}
+
+int
+plt_getselcount (playlist_t *playlist) {
+ LOCK;
+ int cnt = 0;
+ for (playItem_t *it = playlist->headPL_MAIN; it; it = it->nextPL_MAIN) {
+ if (it->selected) {
+ cnt++;
+ }
+ }
+ UNLOCK;
+ return cnt;
+}
+
+int
+pl_getselcount (void) {
+ LOCK;
+ int cnt = plt_getselcount (_current_playlist);
+ UNLOCK;
+ return cnt;
+}
+
+playItem_t *
+plt_get_item_for_idx (playlist_t *playlist, int idx, int iter) {
+ LOCK;
+ playItem_t *it = playlist->headiter;
+ while (idx--) {
+ if (!it) {
+ UNLOCK;
+ return NULL;
+ }
+ it = it->nextiter;
+ }
+ if (it) {
+ pl_item_ref (it);
+ }
+ UNLOCK;
+ return it;
+}
+
+playItem_t *
+pl_get_for_idx_and_iter (int idx, int iter) {
+ LOCK;
+ playItem_t *it = plt_get_item_for_idx (_current_playlist, idx, iter);
+ UNLOCK;
+ return it;
+}
+
+playItem_t *
+pl_get_for_idx (int idx) {
+ return pl_get_for_idx_and_iter (idx, PL_MAIN);
+}
+
+int
+plt_get_item_idx (playlist_t *playlist, playItem_t *it, int iter) {
+ LOCK;
+ playItem_t *c = playlist->headiter;
+ int idx = 0;
+ while (c && c != it) {
+ c = c->nextiter;
+ idx++;
+ }
+ if (!c) {
+ UNLOCK;
+ return -1;
+ }
+ UNLOCK;
+ return idx;
+}
+
+int
+pl_get_idx_of (playItem_t *it) {
+ return pl_get_idx_of_iter (it, PL_MAIN);
+}
+
+int
+pl_get_idx_of_iter (playItem_t *it, int iter) {
+ LOCK;
+ int idx = plt_get_item_idx (_current_playlist, it, iter);
+ UNLOCK;
+ return idx;
+}
+
+playItem_t *
+plt_insert_item (playlist_t *playlist, playItem_t *after, playItem_t *it) {
+ LOCK;
+ pl_item_ref (it);
+ if (!after) {
+ it->nextPL_MAIN = playlist->headPL_MAIN;
+ it->prevPL_MAIN = NULL;
+ if (playlist->headPL_MAIN) {
+ playlist->headPL_MAIN->prevPL_MAIN = it;
+ }
+ else {
+ playlist->tailPL_MAIN = it;
+ }
+ playlist->headPL_MAIN = it;
+ }
+ else {
+ it->prevPL_MAIN = after;
+ it->nextPL_MAIN = after->nextPL_MAIN;
+ if (after->nextPL_MAIN) {
+ after->nextPL_MAIN->prevPL_MAIN = it;
+ }
+ after->nextPL_MAIN = it;
+ if (after == playlist->tailPL_MAIN) {
+ playlist->tailPL_MAIN = it;
+ }
+ }
+ it->in_playlist = 1;
+
+ playlist->countPL_MAIN++;
+
+ // shuffle
+ playItem_t *prev = it->prevPL_MAIN;
+ 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 (streamer_get_shuffle () == DDB_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 {
+ it->shufflerating = rand ();
+ }
+ it->played = 0;
+
+ // totaltime
+ float dur = pl_get_item_duration (it);
+ if (dur > 0) {
+ playlist->totaltime += dur;
+ }
+
+ plt_modified (playlist);
+
+ UNLOCK;
+ return it;
+}
+
+playItem_t *
+pl_insert_item (playItem_t *after, playItem_t *it) {
+ return plt_insert_item (addfiles_playlist ? addfiles_playlist : _current_playlist, after, it);
+}
+
+void
+pl_item_copy (playItem_t *out, playItem_t *it) {
+ LOCK;
+ out->startsample = it->startsample;
+ out->endsample = it->endsample;
+ out->startsample64 = it->startsample64;
+ out->endsample64 = it->endsample64;
+ out->shufflerating = it->shufflerating;
+ out->_duration = it->_duration;
+ out->nextPL_MAIN = it->nextPL_MAIN;
+ out->prevPL_MAIN = it->prevPL_MAIN;
+ out->nextPL_SEARCH = it->nextPL_SEARCH;
+ out->prevPL_SEARCH = it->prevPL_SEARCH;
+
+ for (DB_metaInfo_t *meta = it->meta; meta; meta = meta->next) {
+ pl_add_meta_copy (out, meta);
+ }
+ UNLOCK;
+}
+
+playItem_t *
+pl_item_alloc (void) {
+ playItem_t *it = malloc (sizeof (playItem_t));
+ memset (it, 0, sizeof (playItem_t));
+ it->_duration = -1;
+ it->_refc = 1;
+ return it;
+}
+
+playItem_t *
+pl_item_alloc_init (const char *fname, const char *decoder_id) {
+ playItem_t *it = pl_item_alloc ();
+ pl_add_meta (it, ":URI", fname);
+ pl_add_meta (it, ":DECODER", decoder_id);
+ return it;
+}
+
+void
+pl_item_ref (playItem_t *it) {
+ __atomic_fetch_add(&it->_refc, 1, __ATOMIC_SEQ_CST);
+ //fprintf (stderr, "\0330;34m+it %p: refc=%d: %s\03337;0m\n", it, it->_refc, pl_find_meta_raw (it, ":URI"));
+}
+
+static void
+pl_item_free (playItem_t *it) {
+ LOCK;
+ if (it) {
+ while (it->meta) {
+ pl_meta_free_values (it->meta);
+ DB_metaInfo_t *m = it->meta;
+ it->meta = m->next;
+ free (m);
+ }
+
+ free (it);
+ }
+ UNLOCK;
+}
+
+void
+pl_item_unref (playItem_t *it) {
+ int refc = __atomic_fetch_sub(&it->_refc, 1, __ATOMIC_SEQ_CST);
+ if (refc <= 0) {
+ trace ("\0330;31mplaylist: bad refcount on item %p\03337;0m\n", it);
+ assert(0);
+ }
+ if (refc <= 1) {
+ pl_item_free (it);
+ }
+}
+
+int
+plt_delete_selected (playlist_t *playlist) {
+
+ LOCK;
+ int count = plt_getselcount (playlist);
+ if (count == 0) {
+ UNLOCK;
+ return -1;
+ }
+ playItem_t **items_to_delete = calloc(count, sizeof (playItem_t *));
+ playItem_t *next = NULL;
+ int i = 0;
+ for (playItem_t *it = playlist->headPL_MAIN; it; it = next) {
+ next = it->nextPL_MAIN;
+ if (it->selected) {
+ items_to_deletei++ = it;
+ pl_item_ref(it);
+ }
+ }
+ UNLOCK;
+
+ for (i = 0; i < count; i++) {
+ plt_remove_item (playlist, items_to_deletei);
+ pl_item_unref(items_to_deletei);
+ }
+ free (items_to_delete);
+
+ LOCK;
+ if (playlist->current_rowPL_MAIN >= playlist->countPL_MAIN) {
+ playlist->current_rowPL_MAIN = playlist->countPL_MAIN - 1;
+ }
+ if (playlist->current_rowPL_SEARCH >= playlist->countPL_SEARCH) {
+ playlist->current_rowPL_SEARCH = playlist->countPL_SEARCH - 1;
+ }
+ UNLOCK;
+ return count - 1;
+}
+
+int
+pl_delete_selected (void) {
+ LOCK;
+ playlist_t *curr = _current_playlist;
+ plt_ref (curr);
+ UNLOCK;
+ int res = plt_delete_selected (curr);
+ plt_unref (curr);
+ return res;
+}
+
+void
+plt_crop_selected (playlist_t *playlist) {
+ LOCK;
+ int count = plt_get_item_count(playlist, PL_MAIN) - plt_getselcount (playlist);
+ if (count == 0) {
+ UNLOCK;
+ return;
+ }
+ playItem_t **items_to_delete = calloc(count, sizeof (playItem_t *));
+ playItem_t *next = NULL;
+ int i = 0;
+ for (playItem_t *it = playlist->headPL_MAIN; it; it = next) {
+ next = it->nextPL_MAIN;
+ if (!it->selected) {
+ items_to_deletei++ = it;
+ pl_item_ref(it);
+ }
+ }
+ UNLOCK;
+
+ for (i = 0; i < count; i++) {
+ plt_remove_item (playlist, items_to_deletei);
+ pl_item_unref(items_to_deletei);
+ }
+ free (items_to_delete);
+}
+
+void
+pl_crop_selected (void) {
+ plt_crop_selected (_current_playlist);
+}
+
+static uint16_t
+length_to_uint16 (size_t len) {
+ return (uint16_t)min(0xffff, len);
+}
+
+static uint8_t
+length_to_uint8 (size_t len) {
+ return (uint8_t)min(0xff, len);
+}
+
+int
+plt_save (playlist_t *plt, playItem_t *first, playItem_t *last, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
+ LOCK;
+ plt->last_save_modification_idx = plt->modification_idx;
+ const char *ext = strrchr (fname, '.');
+ if (ext) {
+ DB_playlist_t **plug = deadbeef->plug_get_playlist_list ();
+ for (int i = 0; plugi; i++) {
+ if (plugi->extensions && plugi->load) {
+ const char **exts = plugi->extensions;
+ if (exts && plugi->save) {
+ for (int e = 0; extse; e++) {
+ if (!strcasecmp (extse, ext+1)) {
+ int res = plugi->save ((ddb_playlist_t *)plt, fname, (DB_playItem_t *)_current_playlist->headPL_MAIN, NULL);
+ UNLOCK;
+ return res;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ char tempfilePATH_MAX;
+ snprintf (tempfile, sizeof (tempfile), "%s.tmp", fname);
+ const char magic = "DBPL";
+ uint8_t majorver = PLAYLIST_MAJOR_VER;
+ uint8_t minorver = PLAYLIST_MINOR_VER;
+ buffered_file_writer_t *writer = NULL;
+ FILE *fp = fopen (tempfile, "w+b");
+ if (!fp) {
+ UNLOCK;
+ return -1;
+ }
+
+ writer = buffered_file_writer_new(fp, 64*1024);
+
+ if (buffered_file_writer_write(writer, magic, 4) < 0) {
+ goto save_fail;
+ }
+ if (buffered_file_writer_write(writer, &majorver, 1) < 0) {
+ goto save_fail;
+ }
+ if (buffered_file_writer_write(writer, &minorver, 1) < 0) {
+ goto save_fail;
+ }
+ uint32_t cnt = plt->countPL_MAIN;
+ if (buffered_file_writer_write(writer, &cnt, 4) < 0) {
+ goto save_fail;
+ }
+ for (playItem_t *it = plt->headPL_MAIN; it; it = it->nextPL_MAIN) {
+ uint16_t l;
+ uint8_t ll;
+ if (cb) {
+ cb(it, user_data);
+ }
+#if (PLAYLIST_MINOR_VER==2)
+ const char *item_uri = pl_find_meta_raw (it, ":URI");
+ l = length_to_uint16(strlen (item_uri));
+ if (buffered_file_writer_write(writer, &l, 2) < 0) {
+ goto save_fail;
+ }
+ if (buffered_file_writer_write(writer, item_uri, l) < 0) {
+ goto save_fail;
+ }
+ const char *decoder_id = pl_find_meta_raw (it, ":DECODER");
+ if (decoder_id) {
+ ll = length_to_uint8(strlen (decoder_id));
+ if (buffered_file_writer_write(writer, &ll, 1) < 0) {
+ goto save_fail;
+ }
+ if (buffered_file_writer_write(writer, decoder_id, ll) < 0) {
+ goto save_fail;
+ }
+ }
+ else
+ {
+ ll = 0;
+ if (buffered_file_writer_write(writer, &ll, 1) < 0) {
+ goto save_fail;
+ }
+ }
+ l = length_to_uint8(pl_find_meta_int (it, ":TRACKNUM", 0));
+ if (buffered_file_writer_write(writer, &l, 2) < 0) {
+ goto save_fail;
+ }
+#endif
+ if (buffered_file_writer_write(writer, &it->startsample, 4) < 0) {
+ goto save_fail;
+ }
+ if (buffered_file_writer_write(writer, &it->endsample, 4) < 0) {
+ goto save_fail;
+ }
+ if (buffered_file_writer_write(writer, &it->_duration, 4) < 0) {
+ goto save_fail;
+ }
+#if (PLAYLIST_MINOR_VER==2)
+ const char *filetype = pl_find_meta_raw (it, ":FILETYPE");
+ if (!filetype) {
+ filetype = "";
+ }
+ uint8_t ft = length_to_uint8(strlen (filetype));
+ if (buffered_file_writer_write(writer, &ft, 1) < 0) {
+ goto save_fail;
+ }
+ if (ft) {
+ if (buffered_file_writer_write(writer, filetype, ft) < 0) {
+ goto save_fail;
+ }
+ }
+ float rg_albumgain = pl_get_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN);
+ float rg_albumpeak = pl_get_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK);
+ float rg_trackgain = pl_get_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN);
+ float rg_trackpeak = pl_get_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK);
+ if (buffered_file_writer_write(writer, &rg_albumgain, 4) < 0) {
+ goto save_fail;
+ }
+ if (buffered_file_writer_write(writer, &rg_albumpeak, 4) < 0) {
+ goto save_fail;
+ }
+ if (buffered_file_writer_write(writer, &rg_trackgain, 4) < 0) {
+ goto save_fail;
+ }
+ if (buffered_file_writer_write(writer, &rg_trackpeak, 4) < 0) {
+ goto save_fail;
+ }
+#endif
+ if (buffered_file_writer_write(writer, &it->_flags, 4) < 0) {
+ goto save_fail;
+ }
+
+ int16_t nm = 0;
+ DB_metaInfo_t *m;
+ for (m = it->meta; m; m = m->next) {
+ if (m->key0 == '_' || m->key0 == '!') {
+ continue; // skip reserved names
+ }
+ nm++;
+ }
+ if (buffered_file_writer_write(writer, &nm, 2) < 0) {
+ goto save_fail;
+ }
+ for (m = it->meta; m; m = m->next) {
+ if (m->key0 == '_' || m->key0 == '!') {
+ continue; // skip reserved names
+ }
+
+ l = length_to_uint16(strlen (m->key));
+ if (buffered_file_writer_write(writer, &l, 2) < 0) {
+ goto save_fail;
+ }
+ if (l) {
+ if (buffered_file_writer_write(writer, m->key, l) < 0) {
+ goto save_fail;
+ }
+ }
+ int value_length = max(0, m->valuesize - 1);
+ l = length_to_uint16(value_length);
+ if (buffered_file_writer_write(writer, &l, 2) < 0) {
+ goto save_fail;
+ }
+ if (l) {
+ if (buffered_file_writer_write(writer, m->value, l) < 0) {
+ goto save_fail;
+ }
+ }
+ }
+ }
+
+ // write playlist metadata
+ int16_t nm = 0;
+ DB_metaInfo_t *m;
+ for (m = plt->meta; m; m = m->next) {
+ nm++;
+ }
+ if (buffered_file_writer_write(writer, &nm, 2) < 0) {
+ goto save_fail;
+ }
+
+ for (m = plt->meta; m; m = m->next) {
+ uint16_t l;
+ l = length_to_uint16(strlen (m->key));
+ if (buffered_file_writer_write(writer, &l, 2) < 0) {
+ goto save_fail;
+ }
+ if (l) {
+ if (buffered_file_writer_write(writer, m->key, l) < 0) {
+ goto save_fail;
+ }
+ }
+ l = length_to_uint16(strlen (m->value));
+ if (buffered_file_writer_write(writer, &l, 2) < 0) {
+ goto save_fail;
+ }
+ if (l) {
+ if (buffered_file_writer_write(writer, m->value, l) < 0) {
+ goto save_fail;
+ }
+ }
+ }
+
+ if (buffered_file_writer_flush(writer) < 0) {
+ goto save_fail;
+ }
+ buffered_file_writer_free(writer);
+ writer = NULL;
+ if (EOF == fclose (fp)) {
+ fp = NULL;
+ goto save_fail;
+ }
+ UNLOCK;
+ if (rename (tempfile, fname) != 0) {
+ fprintf (stderr, "playlist rename %s -> %s failed: %s\n", tempfile, fname, strerror (errno));
+ return -1;
+ }
+ return 0;
+save_fail:
+ UNLOCK;
+ if (writer != NULL) {
+ buffered_file_writer_free(writer);
+ }
+ if (fp != NULL) {
+ fclose (fp);
+ }
+ unlink (tempfile);
+ return -1;
+}
+
+int
+plt_save_n (int n) {
+ char pathPATH_MAX;
+ if (snprintf (path, sizeof (path), "%s/playlists", dbconfdir) > sizeof (path)) {
+ fprintf (stderr, "error: failed to make path string for playlists folder\n");
+ return -1;
+ }
+ // make folder
+ mkdir (path, 0755);
+
+ LOCK;
+ int err = 0;
+
+ _plt_loading = 1;
+ if (snprintf (path, sizeof (path), "%s/playlists/%d.dbpl", dbconfdir, n) > sizeof (path)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ UNLOCK;
+ return -1;
+ }
+
+ int i;
+ playlist_t *plt;
+ for (i = 0, plt = _playlists_head; plt && i < n; i++, plt = plt->next);
+ err = plt_save (plt, NULL, NULL, path, NULL, NULL, NULL);
+ _plt_loading = 0;
+ UNLOCK;
+ return err;
+}
+
+int
+pl_save_current (void) {
+ return plt_save_n (plt_get_curr_idx ());
+}
+
+int
+pl_save_all (void) {
+ char pathPATH_MAX;
+ if (snprintf (path, sizeof (path), "%s/playlists", dbconfdir) > sizeof (path)) {
+ fprintf (stderr, "error: failed to make path string for playlists folder\n");
+ return -1;
+ }
+ // make folder
+ mkdir (path, 0755);
+
+ LOCK;
+ playlist_t *p = _playlists_head;
+ int i;
+ int cnt = plt_get_count ();
+ int err = 0;
+
+ plt_gen_conf ();
+ _plt_loading = 1;
+ for (i = 0; i < cnt; i++, p = p->next) {
+ if (snprintf (path, sizeof (path), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path)) {
+ fprintf (stderr, "error: failed to make path string for playlist file\n");
+ err = -1;
+ break;
+ }
+ if (p->last_save_modification_idx == p->modification_idx) {
+ continue;
+ }
+ err = plt_save (p, NULL, NULL, path, NULL, NULL, NULL);
+ if (err < 0) {
+ break;
+ }
+ }
+ _plt_loading = 0;
+ UNLOCK;
+ return err;
+}
+
+static playItem_t *
+plt_load_int (int visibility, playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data) {
+ playItem_t *it = NULL;
+ playItem_t *last_added = NULL;
+
+ #ifdef __MINGW32__
+ if (!strncmp (fname, "file://", 7)) {
+ fname += 7;
+ }
+ // replace backslashes with normal slashes
+ char fname_convstrlen(fname)+1;
+ if (strchr(fname, '\\')) {
+ trace ("plt_load_int: backslash(es) detected: %s\n", fname);
+ strcpy (fname_conv, fname);
+ char *slash_p = fname_conv;
+ while (slash_p = strchr(slash_p, '\\')) {
+ *slash_p = '/';
+ slash_p++;
+ }
+ fname = fname_conv;
+ }
+ // path should start with "X:/", not "/X:/", fixing to avoid file opening problems
+ if (fname0 == '/' && isalpha(fname1) && fname2 == ':') {
+ fname++;
+ }
+ #endif
+
+ // try plugins 1st
+ char *escaped = uri_unescape (fname, (int)strlen (fname));
+ if (escaped) {
+ fname = strdupa (escaped);
+ free (escaped);
+ }
+
+ const char *ext = strrchr (fname, '.');
+ if (ext) {
+ ext++;
+ DB_playlist_t **plug = plug_get_playlist_list ();
+ int p, e;
+ for (p = 0; plugp; p++) {
+ for (e = 0; plugp->extensionse; e++) {
+ if (plugp->load && !strcasecmp (ext, plugp->extensionse)) {
+ DB_playItem_t *loaded_it = NULL;
+ if (cb || (plugp->load && !plugp->load2)) {
+ loaded_it = plugp->load ((ddb_playlist_t *)plt, (DB_playItem_t *)after, fname, pabort, (int (*)(DB_playItem_t *, void *))cb, user_data);
+ }
+ else if (plugp->plugin.api_vminor >= 5 && plugp->load2) {
+ loaded_it = plugp->load2 (visibility, (ddb_playlist_t *)plt, (DB_playItem_t *)after, fname, pabort);
+ }
+ return (playItem_t *)loaded_it;
+ }
+ }
+ }
+ }
+ FILE *fp = fopen (fname, "rb");
+ if (!fp) {
+// trace ("plt_load: failed to open %s\n", fname);
+ return NULL;
+ }
+
+ uint8_t majorver;
+ uint8_t minorver;
+ char magic4;
+ if (fread (magic, 1, 4, fp) != 4) {
+// trace ("failed to read magic\n");
+ goto load_fail;
+ }
+ if (strncmp (magic, "DBPL", 4)) {
+// trace ("bad signature\n");
+ goto load_fail;
+ }
+ if (fread (&majorver, 1, 1, fp) != 1) {
+ goto load_fail;
+ }
+ if (majorver != PLAYLIST_MAJOR_VER) {
+// trace ("bad majorver=%d\n", majorver);
+ goto load_fail;
+ }
+ if (fread (&minorver, 1, 1, fp) != 1) {
+ goto load_fail;
+ }
+ if (minorver < 1) {
+// trace ("bad minorver=%d\n", minorver);
+ goto load_fail;
+ }
+ uint32_t cnt;
+ if (fread (&cnt, 1, 4, fp) != 4) {
+ goto load_fail;
+ }
+
+ for (uint32_t i = 0; i < cnt; i++) {
+ it = pl_item_alloc ();
+ if (!it) {
+ goto load_fail;
+ }
+ uint16_t l;
+ int16_t tracknum = 0;
+ if (minorver <= 2) {
+ // fname
+ if (fread (&l, 1, 2, fp) != 2) {
+ goto load_fail;
+ }
+ char uril+1;
+ if (fread (uri, 1, l, fp) != l) {
+ goto load_fail;
+ }
+ uril = 0;
+ pl_add_meta (it, ":URI", uri);
+ // decoder
+ uint8_t ll;
+ if (fread (&ll, 1, 1, fp) != 1) {
+ goto load_fail;
+ }
+ if (ll >= 20) {
+ goto load_fail;
+ }
+ char decoder_id20 = "";
+ if (ll) {
+ if (fread (decoder_id, 1, ll, fp) != ll) {
+ goto load_fail;
+ }
+ decoder_idll = 0;
+ pl_add_meta (it, ":DECODER", decoder_id);
+ }
+ // tracknum
+ if (fread (&tracknum, 1, 2, fp) != 2) {
+ goto load_fail;
+ }
+ pl_set_meta_int (it, ":TRACKNUM", tracknum);
+ }
+ // startsample
+ if (fread (&it->startsample, 1, 4, fp) != 4) {
+ goto load_fail;
+ }
+ // endsample
+ if (fread (&it->endsample, 1, 4, fp) != 4) {
+ goto load_fail;
+ }
+ // duration
+ if (fread (&it->_duration, 1, 4, fp) != 4) {
+ goto load_fail;
+ }
+ char s100;
+ pl_format_time (it->_duration, s, sizeof(s));
+ pl_replace_meta (it, ":DURATION", s);
+
+ if (minorver <= 2) {
+ // legacy filetype support
+ uint8_t ft;
+ if (fread (&ft, 1, 1, fp) != 1) {
+ goto load_fail;
+ }
+ if (ft) {
+ char ftypeft+1;
+ if (fread (ftype, 1, ft, fp) != ft) {
+ goto load_fail;
+ }
+ ftypeft = 0;
+ pl_replace_meta (it, ":FILETYPE", ftype);
+ }
+
+ float f;
+
+ if (fread (&f, 1, 4, fp) != 4) {
+ goto load_fail;
+ }
+ if (f != 0) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMGAIN, f);
+ }
+
+ if (fread (&f, 1, 4, fp) != 4) {
+ goto load_fail;
+ }
+ if (f == 0) {
+ f = 1;
+ }
+ if (f != 1) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_ALBUMPEAK, f);
+ }
+
+ if (fread (&f, 1, 4, fp) != 4) {
+ goto load_fail;
+ }
+ if (f != 0) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKGAIN, f);
+ }
+
+ if (fread (&f, 1, 4, fp) != 4) {
+ goto load_fail;
+ }
+ if (f == 0) {
+ f = 1;
+ }
+ if (f != 1) {
+ pl_set_item_replaygain (it, DDB_REPLAYGAIN_TRACKPEAK, f);
+ }
+ }
+
+ uint32_t flg = 0;
+ if (minorver >= 2) {
+ if (fread (&flg, 1, 4, fp) != 4) {
+ goto load_fail;
+ }
+ }
+ else {
+ if (pl_item_get_startsample (it) > 0 || pl_item_get_endsample (it) > 0 || tracknum > 0) {
+ flg |= DDB_IS_SUBTRACK;
+ }
+ }
+ pl_set_item_flags (it, flg);
+
+ int16_t nm = 0;
+ if (fread (&nm, 1, 2, fp) != 2) {
+ goto load_fail;
+ }
+ for (int j = 0; j < nm; j++) {
+ if (fread (&l, 1, 2, fp) != 2) {
+ goto load_fail;
+ }
+ if (l >= 20000) {
+ goto load_fail;
+ }
+ char keyl+1;
+ if (fread (key, 1, l, fp) != l) {
+ goto load_fail;
+ }
+ keyl = 0;
+ if (fread (&l, 1, 2, fp) != 2) {
+ goto load_fail;
+ }
+ if (l >= 20000) {
+ // skip
+ fseek (fp, l, SEEK_CUR);
+ }
+ else {
+ char valuel+1;
+ int res = (int)fread (value, 1, l, fp);
+ if (res != l) {
+// trace ("playlist read error: requested %d, got %d\n", l, res);
+ goto load_fail;
+ }
+ valuel = 0;
+ if (key0 == ':') {
+ if (!strcmp (key, ":STARTSAMPLE")) {
+ pl_item_set_startsample (it, atoll (value));
+ }
+ else if (!strcmp (key, ":ENDSAMPLE")) {
+ pl_item_set_endsample (it, atoll (value));
+ }
+ else {
+ // some values are stored twice:
+ // once in legacy format, and once in metadata format
+ // here, we delete what was set from legacy, and overwrite with metadata
+ pl_replace_meta (it, key, value);
+ }
+ }
+ else {
+ pl_add_meta_full (it, key, value, l+1);
+ }
+ }
+ }
+ plt_insert_item (plt, plt->tailPL_MAIN, it);
+ if (last_added) {
+ pl_item_unref (last_added);
+ }
+ last_added = it;
+ it = NULL;
+ }
+
+ // load playlist metadata
+ int16_t nm = 0;
+ // for backwards format compatibility, don't fail if metadata is not found
+ if (fread (&nm, 1, 2, fp) == 2) {
+ for (int i = 0; i < nm; i++) {
+ int16_t l;
+ if (fread (&l, 1, 2, fp) != 2) {
+ goto load_fail;
+ }
+ if (l < 0 || l >= 20000) {
+ goto load_fail;
+ }
+ char keyl+1;
+ if (fread (key, 1, l, fp) != l) {
+ goto load_fail;
+ }
+ keyl = 0;
+ if (fread (&l, 1, 2, fp) != 2) {
+ goto load_fail;
+ }
+ if (l<0 || l >= 20000) {
+ // skip
+ fseek (fp, l, SEEK_CUR);
+ }
+ else {
+ char valuel+1;
+ int res = (int)fread (value, 1, l, fp);
+ if (res != l) {
+// trace ("playlist read error: requested %d, got %d\n", l, res);
+ goto load_fail;
+ }
+ valuel = 0;
+ // FIXME: multivalue support
+ plt_add_meta (plt, key, value);
+ }
+ }
+ }
+
+ if (fp) {
+ fclose (fp);
+ }
+ if (last_added) {
+ pl_item_unref (last_added);
+ }
+ return last_added;
+load_fail:
+ if (it) {
+ pl_item_unref (it);
+ it = NULL;
+ }
+// trace ("playlist load fail (%s)!\n", fname);
+ if (fp) {
+ fclose (fp);
+ }
+ if (last_added) {
+ pl_item_unref (last_added);
+ }
+ return last_added;
+}
+
+
+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) {
+ return plt_load_int (0, plt, after, fname, pabort, cb, user_data);
+}
+
+int
+pl_load_all (void) {
+ int i = 0;
+ int err = 0;
+ char path1024;
+ DB_conf_item_t *it = conf_find ("playlist.tab.", NULL);
+ if (!it) {
+ // legacy (0.3.3 and earlier)
+ char defpl1024; // $HOME/.config/deadbeef/default.dbpl
+ if (snprintf (defpl, sizeof (defpl), "%s/default.dbpl", dbconfdir) > sizeof (defpl)) {
+ fprintf (stderr, "error: cannot make string with default playlist path\n");
+ return -1;
+ }
+ if (plt_add (plt_get_count (), _("Default")) < 0) {
+ return -1;
+ }
+
+ playlist_t *plt = plt_get_for_idx (0);
+ /*playItem_t *it = */ plt_load (plt, NULL, defpl, NULL, NULL, NULL);
+ plt_unref (plt);
+ return 0;
+ }
+ LOCK;
+ _plt_loading = 1;
+ while (it) {
+ if (!err) {
+ if (plt_add (plt_get_count (), it->value) < 0) {
+ return -1;
+ }
+ plt_set_curr_idx (plt_get_count () - 1);
+ }
+ err = 0;
+ if (snprintf (path, sizeof (path), "%s/playlists/%d.dbpl", dbconfdir, i) > sizeof (path)) {
+ fprintf (stderr, "error: failed to make path string for playlist filename\n");
+ err = -1;
+ }
+ else {
+ fprintf (stderr, "INFO: from file %s\n", path);
+
+ playlist_t *plt = plt_get_curr ();
+ /* playItem_t *trk = */ plt_load (plt, NULL, path, NULL, NULL, NULL);
+ char conf100;
+ snprintf (conf, sizeof (conf), "playlist.cursor.%d", i);
+ plt->current_rowPL_MAIN = deadbeef->conf_get_int (conf, -1);
+ snprintf (conf, sizeof (conf), "playlist.scroll.%d", i);
+ plt->scroll = deadbeef->conf_get_int (conf, 0);
+ plt->last_save_modification_idx = plt->modification_idx = 0;
+ plt_unref (plt);
+
+ if (!it) {
+ fprintf (stderr, "WARNING: there were errors while loading playlist '%s' (%s)\n", it->value, path);
+ }
+ }
+ it = conf_find ("playlist.tab.", it);
+ i++;
+ }
+ plt_set_curr_idx (0);
+ _plt_loading = 0;
+ plt_gen_conf ();
+ messagepump_push (DB_EV_PLAYLISTSWITCHED, 0, 0, 0);
+ UNLOCK;
+ return err;
+}
+
+void
+pl_set_selected_in_playlist (playlist_t *playlist, playItem_t *it, int sel)
+{
+ it->selected = sel;
+ playlist->recalc_seltime = 1;
+}
+
+void
+plt_select_all (playlist_t *playlist) {
+ LOCK;
+ for (playItem_t *it = playlist->headPL_MAIN; it; it = it->nextPL_MAIN) {
+ pl_set_selected_in_playlist (playlist, it, 1);
+ }
+ UNLOCK;
+}
+
+void
+pl_select_all (void) {
+ LOCK;
+ plt_select_all (_current_playlist);
+ UNLOCK;
+}
+
+void
+plt_reshuffle (playlist_t *playlist, playItem_t **ppmin, playItem_t **ppmax) {
+ LOCK;
+ 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->headPL_MAIN; it; it = it->nextPL_MAIN) {
+ 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 (streamer_get_shuffle () == DDB_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;
+ }
+ if (!pmax || it->shufflerating > pmax->shufflerating) {
+ pmax = it;
+ }
+ it->played = 0;
+ }
+ if (ppmin) {
+ *ppmin = pmin;
+ }
+ if (ppmax) {
+ *ppmax = pmax;
+ }
+ UNLOCK;
+}
+
+void
+plt_set_item_duration (playlist_t *playlist, playItem_t *it, float duration) {
+ LOCK;
+ if (it->in_playlist && playlist) {
+ if (it->_duration > 0) {
+ playlist->totaltime -= it->_duration;
+ }
+ if (duration > 0) {
+ playlist->totaltime += duration;
+ }
+ if (playlist->totaltime < 0) {
+ playlist->totaltime = 0;
+ }
+ }
+ it->_duration = duration;
+ char s100;
+ pl_format_time (it->_duration, s, sizeof(s));
+ pl_replace_meta (it, ":DURATION", s);
+ UNLOCK;
+}
+
+float
+pl_get_item_duration (playItem_t *it) {
+ LOCK;
+ float res = it->_duration;
+ UNLOCK;
+ return res;
+}
+
+void
+pl_set_item_replaygain (playItem_t *it, int idx, float value) {
+ char s100;
+ switch (idx) {
+ case DDB_REPLAYGAIN_ALBUMGAIN:
+ case DDB_REPLAYGAIN_TRACKGAIN:
+ snprintf (s, sizeof (s), "%0.2f dB", value);
+ break;
+ case DDB_REPLAYGAIN_ALBUMPEAK:
+ case DDB_REPLAYGAIN_TRACKPEAK:
+ snprintf (s, sizeof (s), "%0.6f", value);
+ break;
+ default:
+ return;
+ }
+ pl_replace_meta (it, ddb_internal_rg_keysidx, s);
+}
+
+float
+pl_get_item_replaygain (playItem_t *it, int idx) {
+ if (idx < 0 || idx > DDB_REPLAYGAIN_TRACKPEAK) {
+ return 0;
+ }
+
+ switch (idx) {
+ case DDB_REPLAYGAIN_ALBUMGAIN:
+ case DDB_REPLAYGAIN_TRACKGAIN:
+ return pl_find_meta_float (it, ddb_internal_rg_keysidx, 0);
+ case DDB_REPLAYGAIN_ALBUMPEAK:
+ case DDB_REPLAYGAIN_TRACKPEAK:
+ return pl_find_meta_float (it, ddb_internal_rg_keysidx, 1);
+ }
+ return 0;
+}
+
+int
+pl_format_item_queue (playItem_t *it, char *s, int size) {
+ LOCK;
+ *s = 0;
+ int initsize = size;
+ const char *val = pl_find_meta_raw (it, "_playing");
+ while (val && *val) {
+ while (*val && *val != '=') {
+ val++;
+ }
+ if (*val == '=') {
+ // found value
+ val++;
+ if (!(*val)) {
+ break;
+ }
+ const char *e = NULL;
+ if (*val == '"') {
+ val++;
+ e = val;
+ while (*e && *e != '"') {
+ e++;
+ }
+ }
+ else {
+ e = val;
+ while (*e && *e != ' ') {
+ e++;
+ }
+ }
+ int n = (int)(e - val);
+ if (n > size-1) {
+ n = size-1;
+ }
+ strncpy (s, val, n);
+ s += n;
+ *s++ = ' ';
+ *s = 0;
+ size -= n+1;
+ val = e;
+ if (*val) {
+ val++;
+ }
+ while (*val && *val == ' ') {
+ val++;
+ }
+ }
+ }
+
+ int pq_cnt = playqueue_getcount ();
+
+ if (!pq_cnt) {
+ UNLOCK;
+ return 0;
+ }
+
+ int qinitsize = size;
+ int init = 1;
+ int len;
+ for (int i = 0; i < pq_cnt; i++) {
+ if (size <= 0) {
+ break;
+ }
+
+ playItem_t *pqitem = playqueue_get_item (i);
+ if (pqitem == it) {
+ if (init) {
+ init = 0;
+ s0 = '(';
+ s++;
+ size--;
+ len = snprintf (s, size, "%d", i+1);
+ }
+ else {
+ len = snprintf (s, size, ",%d", i+1);
+ }
+ s += len;
+ size -= len;
+ }
+ pl_item_unref (pqitem);
+ }
+ if (size != qinitsize && size > 0) {
+ len = snprintf (s, size, ")");
+ s += len;
+ size -= len;
+ }
+ UNLOCK;
+ return initsize-size;
+}
+
+void
+pl_format_time (float t, char *dur, int size) {
+ if (t >= 0) {
+ t = roundf (t);
+ int hourdur = (int)floor(t / (60 * 60));
+ int mindur = (int)floor((t - hourdur * 60 * 60) / 60);
+ int secdur = (int)floor(t - hourdur*60*60 - mindur * 60);
+
+ if (hourdur) {
+ snprintf (dur, size, "%d:%02d:%02d", hourdur, mindur, secdur);
+ }
+ else {
+ snprintf (dur, size, "%d:%02d", mindur, secdur);
+ }
+ }
+ else {
+ strcpy (dur, "∞");
+ }
+}
+
+const char *
+pl_format_duration (playItem_t *it, const char *ret, char *dur, int size) {
+ if (ret) {
+ return ret;
+ }
+ pl_format_time (pl_get_item_duration (it), dur, size);
+ return dur;
+}
+
+static const char *
+pl_format_elapsed (const char *ret, char *elapsed, int size) {
+ if (ret) {
+ return ret;
+ }
+ float playpos = streamer_get_playpos ();
+ pl_format_time (playpos, elapsed, size);
+ return elapsed;
+}
+
+// this function allows to escape special chars substituted for conversions
+// @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 tmp50;
+ char tags200;
+ char dirnamePATH_MAX;
+ const char *duration = NULL;
+ const char *elapsed = NULL;
+ int escape_slash = 0;
+
+ char *ss = s;
+
+ LOCK;
+ if (id != -1 && it) {
+ const char *text = NULL;
+ switch (id) {
+ case DB_COLUMN_FILENUMBER:
+ if (idx == -1) {
+ idx = pl_get_idx_of (it);
+ }
+ snprintf (tmp, sizeof (tmp), "%d", idx+1);
+ text = tmp;
+ break;
+ case DB_COLUMN_PLAYING:
+ UNLOCK;
+ return pl_format_item_queue (it, s, size);
+ }
+ if (text) {
+ strncpy (s, text, size);
+ UNLOCK;
+ for (ss = s; *ss; ss++) {
+ if (*ss == '\n') {
+ *ss = ';';
+ }
+ }
+ return (int)strlen (s);
+ }
+ else {
+ s0 = 0;
+ }
+ UNLOCK;
+ return 0;
+ }
+ int n = size-1;
+ while (*fmt && n > 0) {
+ if (*fmt != '%') {
+ *s++ = *fmt;
+ n--;
+ }
+ else {
+ fmt++;
+ const char *meta = NULL;
+ if (*fmt == 0) {
+ break;
+ }
+ else if (!it && *fmt != 'V') {
+ // only %V (version) works without track pointer
+ }
+ else if (*fmt == '@') {
+ const char *e = fmt;
+ e++;
+ while (*e && *e != '@') {
+ e++;
+ }
+ if (*e == '@') {
+ char nm100;
+ int l = (int)(e-fmt-1);
+ l = min (l, sizeof (nm)-1);
+ strncpy (nm, fmt+1, l);
+ nml = 0;
+ meta = pl_find_meta_raw (it, nm);
+ if (!meta) {
+ meta = "";
+ }
+ fmt = e;
+ }
+ }
+ else if (*fmt == '/') {
+ // this means all '/' in the ongoing fields must be replaced with '\'
+ escape_slash = 1;
+ }
+ else if (*fmt == 'a') {
+ meta = pl_find_meta_raw (it, "artist");
+#ifndef DISABLE_CUSTOM_TITLE
+ const char *custom = pl_find_meta_raw (it, ":CUSTOM_TITLE");
+#endif
+ if (!meta
+#ifndef DISABLE_CUSTOM_TITLE
+ && !custom
+#endif
+ ) {
+ meta = "Unknown artist";
+ }
+
+#ifndef DISABLE_CUSTOM_TITLE
+ if (custom) {
+ if (!meta) {
+ meta = custom;
+ }
+ else {
+ int l = strlen (custom) + strlen (meta) + 4;
+ char *out = alloca (l);
+ snprintf (out, l, "%s %s", custom, meta);
+ meta = out;
+ }
+ }
+#endif
+ }
+ else if (*fmt == 't') {
+ meta = pl_find_meta_raw (it, "title");
+ if (!meta) {
+ const char *f = pl_find_meta_raw (it, ":URI");
+ if (f) {
+ const char *start = strrchr (f, '/');
+ if (start) {
+ start++;
+ }
+ else {
+ start = f;
+ }
+ const char *end = strrchr (start, '.');
+ if (end) {
+ int m = (int)(end-start);
+ m = min (m, sizeof (dirname)-1);
+ strncpy (dirname, start, m);
+ dirnamem = 0;
+ meta = dirname;
+ }
+ else {
+ meta = "";
+ }
+ }
+ else {
+ meta = "";
+ }
+ }
+ }
+ else if (*fmt == 'b') {
+ meta = pl_find_meta_raw (it, "album");
+ if (!meta) {
+ meta = "Unknown album";
+ }
+ }
+ else if (*fmt == 'B') {
+ meta = pl_find_meta_raw (it, "band");
+ if (!meta) {
+ meta = pl_find_meta_raw (it, "album artist");
+ if (!meta) {
+ meta = pl_find_meta_raw (it, "albumartist");
+ if (!meta) {
+ meta = pl_find_meta_raw (it, "artist");
+ }
+ }
+ }
+
+#ifndef DISABLE_CUSTOM_TITLE
+ const char *custom = pl_find_meta_raw (it, ":CUSTOM_TITLE");
+ if (custom) {
+ if (!meta) {
+ meta = custom;
+ }
+ else {
+ int l = strlen (custom) + strlen (meta) + 4;
+ char *out = alloca (l);
+ snprintf (out, l, "%s %s", custom, meta);
+ meta = out;
+ }
+ }
+#endif
+ }
+ else if (*fmt == 'C') {
+ meta = pl_find_meta_raw (it, "composer");
+ }
+ else if (*fmt == 'n') {
+ meta = pl_find_meta_raw (it, "track");
+ if (meta) {
+ // check if it's numbers only
+ const char *p = meta;
+ while (*p) {
+ if (!isdigit (*p)) {
+ break;
+ }
+ p++;
+ }
+ if (!(*p)) {
+ snprintf (tmp, sizeof (tmp), "%02d", atoi (meta));
+ meta = tmp;
+ }
+ }
+ }
+ else if (*fmt == 'N') {
+ meta = pl_find_meta_raw (it, "numtracks");
+ }
+ else if (*fmt == 'y') {
+ meta = pl_find_meta_raw (it, "year");
+ }
+ else if (*fmt == 'Y') {
+ meta = pl_find_meta_raw (it, "original_release_time");
+ if (!meta) {
+ meta = pl_find_meta_raw (it, "original_release_year");
+ if (!meta) {
+ meta = pl_find_meta_raw (it, "year");
+ }
+ }
+ }
+ else if (*fmt == 'g') {
+ meta = pl_find_meta_raw (it, "genre");
+ }
+ else if (*fmt == 'c') {
+ meta = pl_find_meta_raw (it, "comment");
+ }
+ else if (*fmt == 'r') {
+ meta = pl_find_meta_raw (it, "copyright");
+ }
+ else if (*fmt == 'l') {
+ const char *value = (duration = pl_format_duration (it, duration, tmp, sizeof (tmp)));
+ while (n > 0 && *value) {
+ *s++ = *value++;
+ n--;
+ }
+ }
+ else if (*fmt == 'e') {
+ // what a hack..
+ 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_raw (it, ":URI");
+ meta = strrchr (f, '/');
+ if (meta) {
+ meta++;
+ }
+ else {
+ meta = f;
+ }
+ }
+ else if (*fmt == 'F') {
+ meta = pl_find_meta_raw (it, ":URI");
+ #ifdef __MINGW32__
+ int len = strlen(meta);
+ strncpy (dirname, meta, len);
+ dirnamelen = 0;
+ // Convert to backslashes on windows
+ char *str_p = dirname;
+ while (str_p = strchr(str_p,'/')) {
+ *str_p = '\\';
+ }
+ meta = dirname;
+ #endif
+ }
+ else if (*fmt == 'T') {
+ char *t = tags;
+ char *e = tags + sizeof (tags);
+ int c;
+ *t = 0;
+
+ if (it->_flags & DDB_TAG_ID3V1) {
+ c = snprintf (t, e-t, "ID3v1 | ");
+ t += c;
+ }
+ if (it->_flags & DDB_TAG_ID3V22) {
+ c = snprintf (t, e-t, "ID3v2.2 | ");
+ t += c;
+ }
+ if (it->_flags & DDB_TAG_ID3V23) {
+ c = snprintf (t, e-t, "ID3v2.3 | ");
+ t += c;
+ }
+ if (it->_flags & DDB_TAG_ID3V24) {
+ c = snprintf (t, e-t, "ID3v2.4 | ");
+ t += c;
+ }
+ if (it->_flags & DDB_TAG_APEV2) {
+ c = snprintf (t, e-t, "APEv2 | ");
+ t += c;
+ }
+ if (it->_flags & DDB_TAG_VORBISCOMMENTS) {
+ c = snprintf (t, e-t, "VorbisComments | ");
+ t += c;
+ }
+ if (it->_flags & DDB_TAG_CUESHEET) {
+ c = snprintf (t, e-t, "CueSheet | ");
+ t += c;
+ }
+ if (it->_flags & DDB_TAG_ICY) {
+ c = snprintf (t, e-t, "Icy | ");
+ t += c;
+ }
+ if (it->_flags & DDB_TAG_ITUNES) {
+ c = snprintf (t, e-t, "iTunes | ");
+ t += c;
+ }
+ if (t != tags) {
+ *(t - 3) = 0;
+ }
+ meta = tags;
+ }
+ else if (*fmt == 'd') {
+ // directory
+ 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)
+ }
+ else {
+ const char *start = end;
+ start--;
+ while (start > f && (*start != '/')) {
+ start--;
+ }
+
+ if (*start == '/') {
+ start++;
+ }
+
+ // copy
+ int len = (int)(end-start);
+ len = min (len, sizeof (dirname)-1);
+ strncpy (dirname, start, len);
+ dirnamelen = 0;
+ meta = dirname;
+ }
+ }
+ else if (*fmt == 'D') {
+ const char *f = pl_find_meta_raw (it, ":URI");
+ // directory with path
+ const char *end = strrchr (f, '/');
+ if (!end) {
+ meta = ""; // got relative path without folder (should not happen)
+ }
+ else {
+ // copy
+ int len = (int)(end - f);
+ len = min (len, sizeof (dirname)-1);
+ strncpy (dirname, f, len);
+ dirnamelen = 0;
+ #ifdef __MINGW32__
+ {
+ // Convert to backslashes on windows
+ char *str_p = dirname;
+ while (str_p = strchr(str_p,'/')) {
+ *str_p = '\\';
+ }
+ }
+ #endif
+ meta = dirname;
+ }
+ }
+ else if (*fmt == 'L') {
+ float l = 0;
+ for (playItem_t *trk = _current_playlist->headPL_MAIN; trk; trk = trk->nextPL_MAIN) {
+ if (trk->selected) {
+ l += trk->_duration;
+ }
+ }
+ pl_format_time (l, tmp, sizeof(tmp));
+ meta = tmp;
+ }
+ else if (*fmt == 'X') {
+ int m = 0;
+ for (playItem_t *trk = _current_playlist->headPL_MAIN; trk; trk = trk->nextPL_MAIN) {
+ if (trk->selected) {
+ m++;
+ }
+ }
+ snprintf (tmp, sizeof (tmp), "%d", m);
+ meta = tmp;
+ }
+ else if (*fmt == 'Z') {
+ DB_fileinfo_t *c = deadbeef->streamer_get_current_fileinfo (); // FIXME: might crash streamer
+ if (c) {
+ if (c->fmt.channels <= 2) {
+ meta = c->fmt.channels == 1 ? _("Mono") : _("Stereo");
+ }
+ else {
+ snprintf (tmp, sizeof (tmp), "%dch Multichannel", c->fmt.channels);
+ meta = tmp;
+ }
+ }
+ }
+#ifdef VERSION
+ else if (*fmt == 'V') {
+ meta = VERSION;
+ }
+#endif
+ else {
+ *s++ = *fmt;
+ n--;
+ }
+
+ if (meta) {
+ const char *value = meta;
+ if (escape_chars) {
+ // need space for at least 2 single-quotes
+ if (n < 2) {
+ goto error;
+ }
+ *s++ = '\'';
+ n--;
+ while (n > 2 && *value) {
+ if (strchr (escape_chars, *value)) {
+ *s++ = '\\';
+ n--;
+ *s++ = *value++;
+ n--;
+ }
+ else if (escape_slash && *value == '/') {
+ *s++ = '\\';
+ n--;
+ *s++ = '\\';
+ n--;
+ break;
+ }
+ else {
+ *s++ = *value++;
+ }
+ }
+ if (n < 1) {
+ fprintf (stderr, "pl_format_title_int: got unpredicted state while formatting escaped string. please report a bug.\n");
+ *ss = 0; // should never happen
+ return -1;
+ }
+ *s++ = '\'';
+ n--;
+ }
+ else {
+ while (n > 0 && *value) {
+ if (escape_slash && *value == '/') {
+ *s++ = '\\';
+ n--;
+ value++;
+ }
+ else {
+ *s++ = *value++;
+ n--;
+ }
+ }
+ }
+ }
+ }
+ fmt++;
+ }
+error:
+ *s = 0;
+ UNLOCK;
+
+ // replace all \n with ;
+ while (*ss) {
+ if (*ss == '\n') {
+ *ss = ';';
+ }
+ ss++;
+ }
+
+ return size - n - 1;
+}
+
+int
+pl_format_title (playItem_t *it, int idx, char *s, int size, int id, const char *fmt) {
+ return pl_format_title_int (NULL, it, idx, s, size, id, fmt);
+}
+
+int
+pl_format_title_escaped (playItem_t *it, int idx, char *s, int size, int id, const char *fmt) {
+ return pl_format_title_int ("'", it, idx, s, size, id, fmt);
+}
+
+void
+plt_reset_cursor (playlist_t *playlist) {
+ int i;
+ LOCK;
+ for (i = 0; i < PL_MAX_ITERATORS; i++) {
+ playlist->current_rowi = -1;
+ }
+ UNLOCK;
+}
+
+float
+plt_get_totaltime (playlist_t *playlist) {
+ if (!playlist) {
+ return 0;
+ }
+ return playlist->totaltime;
+}
+
+float
+pl_get_totaltime (void) {
+ LOCK;
+ float t = plt_get_totaltime (_current_playlist);
+ UNLOCK;
+ return t;
+}
+
+float
+plt_get_selection_playback_time (playlist_t *playlist) {
+ LOCK;
+
+ float t = 0;
+ 
+ if (!playlist->recalc_seltime) {
+ t = playlist->seltime;
+ UNLOCK;
+ return roundf(t);
+ }
+
+ for (playItem_t *it = playlist->headPL_MAIN; it; it = it->nextPL_MAIN) {
+ if (it->selected){
+ t += roundf(it->_duration);
+ }
+ }
+
+ playlist->seltime = t;
+ playlist->recalc_seltime = 0;
+
+ UNLOCK;
+
+ return t;
+}
+
+void
+pl_set_selected (playItem_t *it, int sel) {
+ LOCK;
+ // NOTE: it's not really known here, which playlist the item belongs to, but we're assuming it's in the current playlist.
+ // If the item is in another playlist -- this call will make selection playback time
+ // to be recalculated for the current playlist, next time it's requested,
+ // while the same value will be off in the playlist which the item belongs to.
+ pl_set_selected_in_playlist(_current_playlist, it, sel);
+ UNLOCK;
+}
+
+int
+pl_is_selected (playItem_t *it) {
+ pl_lock();
+ int res = it->selected;
+ pl_unlock();
+ return res;
+}
+
+playItem_t *
+plt_get_first (playlist_t *playlist, int iter) {
+ if (!playlist) {
+ return NULL;
+ }
+ playItem_t *p = playlist->headiter;
+ if (p) {
+ pl_item_ref (p);
+ }
+ return p;
+}
+
+playItem_t *
+pl_get_first (int iter) {
+ LOCK;
+ playItem_t *it = plt_get_first (_current_playlist, iter);
+ UNLOCK;
+ return it;
+}
+
+playItem_t *
+plt_get_last (playlist_t *playlist, int iter) {
+ playItem_t *p = playlist->tailiter;
+ if (p) {
+ pl_item_ref (p);
+ }
+ return p;
+}
+
+playItem_t *
+pl_get_last (int iter) {
+ LOCK;
+ playItem_t *it = plt_get_last (_current_playlist, iter);
+ UNLOCK;
+ return it;
+}
+
+playItem_t *
+pl_get_next (playItem_t *it, int iter) {
+ playItem_t *next = it ? it->nextiter : NULL;
+ if (next) {
+ pl_item_ref (next);
+ }
+ return next;
+}
+
+playItem_t *
+pl_get_prev (playItem_t *it, int iter) {
+ playItem_t *prev = it ? it->previter : NULL;
+ if (prev) {
+ pl_item_ref (prev);
+ }
+ return prev;
+}
+
+int
+plt_get_cursor (playlist_t *playlist, int iter) {
+ if (!playlist) {
+ return -1;
+ }
+ return playlist->current_rowiter;
+}
+
+int
+pl_get_cursor (int iter) {
+ LOCK;
+ int c = plt_get_cursor (_current_playlist, iter);
+ UNLOCK;
+ return c;
+}
+
+void
+plt_set_cursor (playlist_t *playlist, int iter, int cursor) {
+ playlist->current_rowiter = cursor;
+}
+
+void
+pl_set_cursor (int iter, int cursor) {
+ LOCK;
+ plt_set_cursor (_current_playlist, iter, cursor);
+ UNLOCK;
+}
+
+// this function must move items in playlist
+// list of items is indexescount
+// drop_before is insertion point
+void
+plt_move_items (playlist_t *to, int iter, playlist_t *from, playItem_t *drop_before, uint32_t *indexes, int count) {
+ playItem_t *playing = streamer_get_playing_track ();
+
+ LOCK;
+
+ if (!from || !to) {
+ if (playing) {
+ pl_item_unref (playing);
+ }
+ UNLOCK;
+ return;
+ }
+
+ // don't let streamer think that current song was removed
+ no_remove_notify = 1;
+
+ // unlink items from from, and link together
+ int processed = 0;
+ int idx = 0;
+ playItem_t *next = NULL;
+
+ // find insertion point
+ playItem_t *drop_after = NULL;
+ if (drop_before) {
+ drop_after = drop_before->previter;
+ }
+ else {
+ drop_after = to->tailiter;
+ }
+
+ for (playItem_t *it = from->headiter; it && processed < count; it = next, idx++) {
+ next = it->nextiter;
+ if (idx == indexesprocessed) {
+ if (it == playing && to != from) {
+ streamer_set_streamer_playlist (to);
+ }
+ pl_item_ref (it);
+ if (drop_after == it) {
+ drop_after = it->prevPL_MAIN;
+ }
+ plt_remove_item (from, it);
+ plt_insert_item (to, drop_after, it);
+ pl_item_unref (it);
+ drop_after = it;
+ processed++;
+ }
+ }
+
+ if (playing) {
+ pl_item_unref (playing);
+ }
+
+ no_remove_notify = 0;
+ UNLOCK;
+}
+
+void
+plt_copy_items (playlist_t *to, int iter, playlist_t *from, playItem_t *before, uint32_t *indices, int cnt) {
+ pl_lock ();
+
+ if (!from || !to || cnt == 0) {
+ pl_unlock ();
+ return;
+ }
+
+ playItem_t **items = malloc (cnt * sizeof(playItem_t *));
+ for (int i = 0; i < cnt; i++) {
+ playItem_t *it = from->headiter;
+ for (int idx = 0; it && idx < indicesi; idx++) {
+ it = it->nextiter;
+ }
+ itemsi = it;
+ if (!it) {
+ trace ("plt_copy_items: warning: item %d not found in source plt_to\n", indicesi);
+ }
+ }
+ playItem_t *after = before ? before->previter : to->tailiter;
+ for (int i = 0; i < cnt; i++) {
+ if (itemsi) {
+ playItem_t *new_it = pl_item_alloc();
+ pl_item_copy (new_it, itemsi);
+ pl_insert_item (after, new_it);
+ pl_item_unref (new_it);
+ after = new_it;
+ }
+ }
+ free(items);
+
+ pl_unlock ();
+}
+
+static void
+plt_search_reset_int (playlist_t *playlist, int clear_selection) {
+ LOCK;
+ while (playlist->headPL_SEARCH) {
+ playItem_t *next = playlist->headPL_SEARCH->nextPL_SEARCH;
+ if (clear_selection) {
+ pl_set_selected_in_playlist(playlist, playlist->headPL_SEARCH, 0);
+ }
+ playlist->headPL_SEARCH->nextPL_SEARCH = NULL;
+ playlist->headPL_SEARCH->prevPL_SEARCH = NULL;
+ playlist->headPL_SEARCH = next;
+ }
+ playlist->tailPL_SEARCH = NULL;
+ playlist->countPL_SEARCH = 0;
+ UNLOCK;
+}
+
+void
+plt_search_reset (playlist_t *playlist) {
+ plt_search_reset_int (playlist, 1);
+}
+
+static void
+_plsearch_append (playlist_t *plt, playItem_t *it, int select_results) {
+ it->nextPL_SEARCH = NULL;
+ it->prevPL_SEARCH = plt->tailPL_SEARCH;
+ if (plt->tailPL_SEARCH) {
+ plt->tailPL_SEARCH->nextPL_SEARCH = it;
+ plt->tailPL_SEARCH = it;
+ }
+ else {
+ plt->headPL_SEARCH = plt->tailPL_SEARCH = it;
+ }
+ if (select_results) {
+ pl_set_selected_in_playlist(plt, it, 1);
+ }
+ plt->countPL_SEARCH++;
+}
+
+void
+plt_search_process2 (playlist_t *playlist, const char *text, int select_results) {
+ LOCK;
+ plt_search_reset_int (playlist, select_results);
+
+ // convert text to lowercase, to save some cycles
+ char lc1000;
+ int n = sizeof (lc)-1;
+ const char *p = text;
+ char *out = lc;
+ while (*p) {
+ int32_t i = 0;
+ char s10;
+ u8_nextchar (p, &i);
+ int l = u8_tolower ((const int8_t *)p, i, s);
+ n -= l;
+ if (n < 0) {
+ break;
+ }
+ memcpy (out, s, l);
+ p += i;
+ out += l;
+ }
+ *out = 0;
+
+ int lc_is_valid_u8 = u8_valid (lc, (int)strlen (lc), NULL);
+
+ playlist->search_cmpidx++;
+ if (playlist->search_cmpidx > 127) {
+ playlist->search_cmpidx = 1;
+ }
+
+ for (playItem_t *it = playlist->headPL_MAIN; it; it = it->nextPL_MAIN) {
+ if (select_results) {
+ pl_set_selected_in_playlist(playlist, it, 0);
+ }
+ if (*text) {
+ DB_metaInfo_t *m = NULL;
+ for (m = it->meta; m; m = m->next) {
+ int is_uri = !strcmp (m->key, ":URI");
+ if ((m->key0 == ':' && !is_uri) || m->key0 == '_' || m->key0 == '!') {
+ break;
+ }
+ if (!strcasecmp(m->key, "cuesheet") || !strcasecmp (m->key, "log")) {
+ continue;
+ }
+
+ const char *value = m->value;
+ const char *end = value + m->valuesize;
+
+ if (is_uri) {
+ value = strrchr (value, '/');
+ if (value) {
+ value++;
+ }
+ else {
+ value = m->value;
+ }
+ }
+
+ char cmp = *(m->value-1);
+
+ if (abs (cmp) == playlist->search_cmpidx) { // string was already compared in this search
+ if (cmp > 0) { // it's a match -- append to search results
+ _plsearch_append (playlist, it, select_results);
+ break;
+ }
+ }
+ else {
+ int match = -playlist->search_cmpidx; // assume no match
+ do {
+ int len = (int)strlen(value);
+ if (lc_is_valid_u8 && u8_valid(value, len, NULL) && utfcasestr_fast (value, lc)) {
+ _plsearch_append (playlist, it, select_results);
+ match = playlist->search_cmpidx; // it's a match
+ break;
+ }
+ value += len+1;
+ } while (value < end);
+ *((char *)m->value-1) = (int8_t)match;
+ if (match > 0) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ UNLOCK;
+}
+
+void
+plt_search_process (playlist_t *playlist, const char *text) {
+ plt_search_process2 (playlist, text, 1);
+}
+
+void
+send_trackinfochanged (playItem_t *track) {
+ ddb_event_track_t *ev = (ddb_event_track_t *)messagepump_event_alloc (DB_EV_TRACKINFOCHANGED);
+ ev->track = DB_PLAYITEM (track);
+ if (track) {
+ pl_item_ref (track);
+ }
+
+ messagepump_push_event ((ddb_event_t*)ev, 0, 0);
+}
+
+void
+pl_items_copy_junk (playItem_t *from, playItem_t *first, playItem_t *last) {
+ LOCK;
+ DB_metaInfo_t *meta = from->meta;
+ while (meta) {
+ playItem_t *i;
+ for (i = first; i; i = i->nextPL_MAIN) {
+ i->_flags = from->_flags;
+ pl_add_meta_copy (i, meta);
+ if (i == last) {
+ break;
+ }
+ }
+ meta = meta->next;
+ }
+ UNLOCK;
+}
+
+uint32_t
+pl_get_item_flags (playItem_t *it) {
+ LOCK;
+ uint32_t flags = it->_flags;
+ UNLOCK;
+ return flags;
+}
+
+void
+pl_set_item_flags (playItem_t *it, uint32_t flags) {
+ LOCK;
+ it->_flags = flags;
+
+ char s200;
+ pl_format_title (it, -1, s, sizeof (s), -1, "%T");
+ pl_replace_meta (it, ":TAGS", s);
+ pl_replace_meta (it, ":HAS_EMBEDDED_CUESHEET", (flags & DDB_HAS_EMBEDDED_CUESHEET) ? _("Yes") : _("No"));
+ UNLOCK;
+}
+
+playlist_t *
+pl_get_playlist (playItem_t *it) {
+ LOCK;
+ playlist_t *p = _playlists_head;
+ while (p) {
+ int idx = plt_get_item_idx (p, it, PL_MAIN);
+ if (idx != -1) {
+ plt_ref (p);
+ UNLOCK;
+ return p;
+ }
+ p = p->next;
+ }
+ UNLOCK;
+ return NULL;
+}
+
+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;
+}
+
+void
+pl_ensure_lock (void) {
+#if DETECT_PL_LOCK_RC
+ pthread_t tid = pthread_self ();
+ for (int i = 0; i < ntids; i++) {
+ if (tidsi == tid) {
+ return;
+ }
+ }
+ fprintf (stderr, "\0330;31mnon-thread-safe playlist access function was called outside of pl_lock. please make a backtrace and post a bug. thank you.\03337;0m\n");
+ assert(0);
+#endif
+}
+
+int
+plt_get_idx (playlist_t *plt) {
+ int i;
+ playlist_t *p;
+ for (i = 0, p = _playlists_head; p && p != plt; i++, p = p->next);
+ if (p == 0) {
+ return -1;
+ }
+ return i;
+}
+
+int
+plt_save_config (playlist_t *plt) {
+ int i = plt_get_idx (plt);
+ if (i == -1) {
+ return -1;
+ }
+ return plt_save_n (i);
+}
+
+int
+listen_file_added (int (*callback)(ddb_fileadd_data_t *data, void *user_data), void *user_data) {
+ ddb_fileadd_listener_t *l;
+
+ int id = 1;
+ for (l = file_add_listeners; l; l = l->next) {
+ if (l->id > id) {
+ id = l->id+1;
+ }
+ }
+
+ l = malloc (sizeof (ddb_fileadd_listener_t));
+ memset (l, 0, sizeof (ddb_fileadd_listener_t));
+ l->id = id;
+ l->callback = callback;
+ l->user_data = user_data;
+ l->next = file_add_listeners;
+ file_add_listeners = l;
+ return id;
+}
+
+void
+unlisten_file_added (int id) {
+ ddb_fileadd_listener_t *prev = NULL;
+ for (ddb_fileadd_listener_t *l = file_add_listeners; l; prev = l, l = l->next) {
+ if (l->id == id) {
+ if (prev) {
+ prev->next = l->next;
+ }
+ else {
+ file_add_listeners = l->next;
+ }
+ free (l);
+ break;
+ }
+ }
+}
+
+int
+listen_file_add_beginend (void (*callback_begin) (ddb_fileadd_data_t *data, void *user_data), void (*callback_end)(ddb_fileadd_data_t *data, void *user_data), void *user_data) {
+ ddb_fileadd_beginend_listener_t *l;
+
+ int id = 1;
+ for (l = file_add_beginend_listeners; l; l = l->next) {
+ if (l->id > id) {
+ id = l->id+1;
+ }
+ }
+
+ l = malloc (sizeof (ddb_fileadd_beginend_listener_t));
+ memset (l, 0, sizeof (ddb_fileadd_beginend_listener_t));
+ l->id = id;
+ l->callback_begin = callback_begin;
+ l->callback_end = callback_end;
+ l->user_data = user_data;
+ l->next = file_add_beginend_listeners;
+ file_add_beginend_listeners = l;
+ return id;
+}
+
+void
+unlisten_file_add_beginend (int id) {
+ ddb_fileadd_beginend_listener_t *prev = NULL;
+ for (ddb_fileadd_beginend_listener_t *l = file_add_beginend_listeners; l; prev = l, l = l->next) {
+ if (l->id == id) {
+ if (prev) {
+ prev->next = l->next;
+ }
+ else {
+ file_add_beginend_listeners = l->next;
+ }
+ free (l);
+ break;
+ }
+ }
+}
+
+int
+register_fileadd_filter (int (*callback)(ddb_file_found_data_t *data, void *user_data), void *user_data) {
+ ddb_fileadd_filter_t *l;
+
+ int id = 1;
+ for (l = file_add_filters; l; l = l->next) {
+ if (l->id > id) {
+ id = l->id+1;
+ }
+ }
+
+ l = malloc (sizeof (ddb_fileadd_filter_t));
+ memset (l, 0, sizeof (ddb_fileadd_filter_t));
+ l->id = id;
+ l->callback = callback;
+ l->user_data = user_data;
+ l->next = file_add_filters;
+ file_add_filters = l;
+ return id;
+}
+
+void
+unregister_fileadd_filter (int id) {
+ ddb_fileadd_filter_t *prev = NULL;
+ for (ddb_fileadd_filter_t *l = file_add_filters; l; prev = l, l = l->next) {
+ if (l->id == id) {
+ if (prev) {
+ prev->next = l->next;
+ }
+ else {
+ file_add_filters = l->next;
+ }
+ free (l);
+ break;
+ }
+ }
+}
+
+playItem_t *
+plt_load2 (int visibility, playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data) {
+ return plt_load_int (visibility, plt, after, fname, pabort, callback, user_data);
+}
+
+int
+plt_add_file2 (int visibility, playlist_t *plt, const char *fname, int (*callback)(playItem_t *it, void *user_data), void *user_data) {
+ int res = plt_add_file_int (visibility, _get_insert_file_flags_from_config(), plt, fname, callback, user_data);
+ return res;
+}
+
+playItem_t *
+pl_item_init (const char *fname) {
+ playlist_t plt;
+ memset (&plt, 0, sizeof (plt));
+ return plt_insert_file_int (-1, _get_insert_file_flags_from_config(), &plt, NULL, fname, NULL, NULL, NULL, NULL);
+}
+
+int
+plt_add_dir2 (int visibility, playlist_t *plt, const char *dirname, int (*callback)(playItem_t *it, void *user_data), void *user_data) {
+ int prev_sl = plt->follow_symlinks;
+ plt->follow_symlinks = conf_get_int ("add_folders_follow_symlinks", 0);
+
+ int prev = plt->ignore_archives;
+ plt->ignore_archives = conf_get_int ("ignore_archives", 1);
+
+ int abort = 0;
+ playItem_t *it = plt_insert_dir_int (visibility, _get_insert_file_flags_from_config(), plt, NULL, plt->tailPL_MAIN, dirname, &abort, callback, NULL, user_data);
+
+ plt->ignore_archives = prev;
+ plt->follow_symlinks = prev_sl;
+ if (it) {
+ // pl_insert_file doesn't hold reference, don't unref here
+ return 0;
+ }
+ return -1;
+}
+
+playItem_t *
+plt_insert_file2 (int visibility, playlist_t *playlist, playItem_t *after, const char *fname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data) {
+ return plt_insert_file_int (visibility, _get_insert_file_flags_from_config(), playlist, after, fname, pabort, callback, NULL, user_data);
+}
+
+playItem_t *
+plt_insert_dir2 (int visibility, playlist_t *plt, playItem_t *after, const char *dirname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data) {
+ int prev_sl = plt->follow_symlinks;
+ plt->follow_symlinks = conf_get_int ("add_folders_follow_symlinks", 0);
+ plt->ignore_archives = conf_get_int ("ignore_archives", 1);
+
+ playItem_t *ret = plt_insert_dir_int (visibility, _get_insert_file_flags_from_config(), plt, NULL, after, dirname, pabort, callback, NULL, user_data);
+
+ plt->follow_symlinks = prev_sl;
+ plt->ignore_archives = 0;
+ return ret;
+}
+
+playItem_t *
+plt_insert_dir3 (int visibility, uint32_t flags, playlist_t *plt, playItem_t *after, const char *dirname, int *pabort, int (*callback)(ddb_insert_file_result_t result, const char *fname, void *user_data), void *user_data) {
+ return plt_insert_dir_int (visibility, flags, plt, NULL, after, dirname, pabort, NULL, callback, user_data);
+}
+
+int
+plt_add_files_begin (playlist_t *plt, int visibility) {
+ pl_lock ();
+ if (addfiles_playlist) {
+ pl_unlock ();
+ return -1;
+ }
+ if (plt->files_adding) {
+ pl_unlock ();
+ return -1;
+ }
+ addfiles_playlist = plt;
+ plt_ref (addfiles_playlist);
+ plt->files_adding = 1;
+ plt->files_add_visibility = visibility;
+ pl_unlock ();
+ ddb_fileadd_data_t d;
+ memset (&d, 0, sizeof (d));
+ d.visibility = visibility;
+ d.plt = (ddb_playlist_t *)plt;
+ for (ddb_fileadd_beginend_listener_t *l = file_add_beginend_listeners; l; l = l->next) {
+ l->callback_begin (&d, l->user_data);
+ }
+ background_job_increment ();
+ return 0;
+}
+
+void
+plt_add_files_end (playlist_t *plt, int visibility) {
+ pl_lock ();
+ if (addfiles_playlist) {
+ plt_unref (addfiles_playlist);
+ }
+ addfiles_playlist = NULL;
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+ plt->files_adding = 0;
+ pl_unlock ();
+ ddb_fileadd_data_t d;
+ memset (&d, 0, sizeof (d));
+ d.visibility = visibility;
+ d.plt = (ddb_playlist_t *)plt;
+ for (ddb_fileadd_beginend_listener_t *l = file_add_beginend_listeners; l; l = l->next) {
+ l->callback_end (&d, l->user_data);
+ }
+ background_job_decrement ();
+ 
+ plt_autosort (plt);
+}
+
+
+void
+plt_deselect_all (playlist_t *playlist) {
+ LOCK;
+ for (playItem_t *it = playlist->headPL_MAIN; it; it = it->nextPL_MAIN) {
+ it->selected = 0;
+ }
+ playlist->seltime = 0;
+ playlist->recalc_seltime = 0;
+ UNLOCK;
+}
+
+void
+plt_set_scroll (playlist_t *plt, int scroll) {
+ plt->scroll = scroll;
+}
+
+int
+plt_get_scroll (playlist_t *plt) {
+ return plt->scroll;
+}
+
+static playItem_t *
+plt_process_embedded_cue (playlist_t *plt, playItem_t *after, playItem_t *it, int64_t totalsamples, int samplerate) {
+ if (plt->loading_cue) {
+ // means it was called from _load_cue
+ plt->cue_numsamples = totalsamples;
+ plt->cue_samplerate = samplerate;
+ return NULL;
+ }
+ playItem_t *cue = NULL;
+ pl_lock();
+ const char *cuesheet = pl_find_meta (it, "cuesheet");
+ if (cuesheet) {
+ const char *fname = pl_find_meta (it, ":URI");
+ cue = plt_load_cuesheet_from_buffer (plt, after, fname, it, totalsamples, samplerate, (const uint8_t *)cuesheet, (int)strlen (cuesheet), NULL, 0, 0);
+ }
+ pl_unlock();
+ return cue;
+}
+
+playItem_t * /* called by plugins */
+plt_process_cue (playlist_t *plt, playItem_t *after, playItem_t *it, uint64_t totalsamples, int samplerate) {
+ if (plt->loading_cue) {
+ // means it was called from _load_cue
+ plt->cue_numsamples = totalsamples;
+ plt->cue_samplerate = samplerate;
+ return NULL;
+ }
+ return plt_process_embedded_cue (plt, after, it, (int64_t)totalsamples, samplerate);
+}
+
+void
+pl_configchanged (void) {
+ conf_cue_prefer_embedded = conf_get_int ("cue.prefer_embedded", 0);
+}
+
+int64_t
+pl_item_get_startsample (playItem_t *it) {
+ int64_t res;
+ pl_lock ();
+ if (!it->has_startsample64) {
+ res = it->startsample;
+ }
+ else {
+ res = it->startsample64;
+ }
+ pl_unlock();
+ return res;
+}
+
+int64_t
+pl_item_get_endsample (playItem_t *it) {
+ int64_t res = 0;
+ pl_lock ();
+ if (!it->has_endsample64) {
+ res = it->endsample;
+ }
+ else {
+ res = it->endsample64;
+ }
+ pl_unlock();
+ return res;
+}
+
+void
+pl_item_set_startsample (playItem_t *it, int64_t sample) {
+ pl_lock ();
+ it->startsample64 = sample;
+ it->startsample = sample >= 0x7fffffff ? 0x7fffffff : (int32_t)sample;
+ it->has_startsample64 = 1;
+ pl_set_meta_int64 (it, ":STARTSAMPLE", sample);
+ pl_unlock ();
+}
+
+void
+pl_item_set_endsample (playItem_t *it, int64_t sample) {
+ pl_lock ();
+ it->endsample64 = sample;
+ it->endsample = sample >= 0x7fffffff ? 0x7fffffff : (int32_t)sample;
+ it->has_endsample64 = 1;
+ pl_set_meta_int64 (it, ":ENDSAMPLE", sample);
+ pl_unlock();
+}
+
+int
+plt_is_loading_cue (playlist_t *plt) {
+ return plt->loading_cue;
+}
+
+int
+pl_get_played(playItem_t *it) {
+ pl_lock();
+ int ret = it->played;
+ pl_unlock();
+ return ret;
+}
+
+void
+pl_set_played(playItem_t *it, int played) {
+ pl_lock();
+ it->played = played;
+ pl_unlock();
+}
+
+int
+pl_get_shufflerating (playItem_t *it) {
+ pl_lock();
+ int ret = it->shufflerating;
+ pl_unlock();
+ return ret;
+}
+
+void
+pl_set_shufflerating (playItem_t *it, int rating) {
+ pl_lock();
+ it->shufflerating = rating;
+ pl_unlock();
+}

deadbeef-1.9.6.tar.bz2/src/playlist.h Added

@@ -0,0 +1,570 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ playlist management
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+#ifndef __PLAYLIST_H
+#define __PLAYLIST_H
+
+#include <stdint.h>
+#include <time.h>
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define PL_MAX_ITERATORS 2
+
+// predefined properties stored in metadata for storage unification:
+// :URI - full pathname
+// :DECODER - decoder id
+// :TRACKNUM - subsong index (sid, nsf, cue, etc)
+// :DURATION - length in seconds
+
+typedef struct playItem_s {
+ int32_t startsample;
+ int32_t endsample;
+ int32_t shufflerating; // sort order for shuffle mode
+
+ int64_t startsample64;
+ int64_t endsample64;
+ // private area, must not be visible to plugins
+ float _duration;
+ uint32_t _flags;
+ int _refc;
+ struct playItem_s *nextPL_MAX_ITERATORS; // next item in linked list
+ struct playItem_s *prevPL_MAX_ITERATORS; // prev item in linked list
+ struct DB_metaInfo_s *meta; // linked list storing metainfo
+ unsigned selected : 1;
+ unsigned played : 1; // mark as played in shuffle mode
+ unsigned in_playlist : 1; // 1 if item is in playlist
+ unsigned has_startsample64 : 1;
+ unsigned has_endsample64 : 1;
+} playItem_t;
+
+typedef struct playlist_s {
+ char *title;
+ struct playlist_s *next;
+ int count2;
+ float totaltime;
+ float seltime;
+ int modification_idx; // this value gets incremented each time playlist changes, and requires to be saved
+ int last_save_modification_idx; // a value of modification_idx at the time when the playlist was saved last time
+ playItem_t *headPL_MAX_ITERATORS; // head of linked list
+ playItem_t *tailPL_MAX_ITERATORS; // tail of linked list
+ int current_rowPL_MAX_ITERATORS; // current row (cursor)
+ int scroll;
+ struct DB_metaInfo_s *meta; // linked list storing metainfo
+ int refc;
+ int files_add_visibility;
+
+ int64_t cue_numsamples;
+ int cue_samplerate;
+
+ int search_cmpidx;
+ 
+ unsigned fast_mode : 1;
+ unsigned files_adding : 1;
+ unsigned recalc_seltime : 1;
+ unsigned loading_cue : 1;
+ unsigned ignore_archives : 1;
+ unsigned follow_symlinks : 1;
+} playlist_t;
+
+// global playlist control functions
+int
+pl_init (void);
+
+void
+pl_free (void);
+
+void
+pl_lock (void);
+
+void
+pl_unlock (void);
+
+//void
+//plt_lock (void);
+//
+//void
+//plt_unlock (void);
+
+// playlist management functions
+
+// it is highly recommended to access that from inside plt_lock/unlock block
+playlist_t *
+plt_get_curr_ptr (void);
+
+playlist_t *
+plt_get_for_idx (int idx);
+
+void
+plt_ref (playlist_t *plt);
+
+void
+plt_unref (playlist_t *plt);
+
+playlist_t *
+plt_alloc (const char *title);
+
+void
+plt_free (playlist_t *plt);
+
+int
+plt_get_count (void);
+
+playlist_t *
+plt_get_list (void);
+
+playItem_t *
+plt_get_head (int plt);
+
+int
+plt_get_sel_count (int plt);
+
+int
+plt_add (int before, const char *title);
+
+playlist_t *
+plt_append (const char *title);
+
+void
+plt_remove (int plt);
+
+int
+plt_find (const char *name);
+
+playlist_t *
+plt_find_by_name (const char *name);
+
+void
+plt_set_curr_idx (int plt);
+
+int
+plt_get_curr_idx (void);
+
+void
+plt_set_curr (playlist_t *plt);
+
+playlist_t *
+plt_get_curr (void);
+
+int
+plt_get_idx_of (playlist_t *plt);
+
+int
+plt_get_title (playlist_t *plt, char *buffer, int bufsize);
+
+int
+plt_set_title (playlist_t *plt, const char *title);
+
+void
+plt_modified (playlist_t *plt);
+
+int
+plt_get_modification_idx (playlist_t *plt);
+
+// moves playlist #from to position #to
+void
+plt_move (int from, int to);
+
+// playlist access functions
+void
+pl_clear (void);
+
+void
+plt_clear (playlist_t *plt);
+
+int
+plt_add_dir (playlist_t *plt, const char *dirname, int (*cb)(playItem_t *it, void *data), void *user_data);
+
+int
+plt_add_file (playlist_t *plt, const char *fname, int (*cb)(playItem_t *it, void *data), void *user_data);
+
+int
+pl_add_files_begin (playlist_t *plt);
+
+void
+pl_add_files_end (void);
+
+playItem_t *
+plt_insert_dir (playlist_t *plt, playItem_t *after, const char *dirname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data);
+
+playItem_t *
+plt_insert_file (playlist_t *playlist, playItem_t *after, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data);
+
+playItem_t *
+pl_insert_item (playItem_t *after, playItem_t *it);
+
+playItem_t *
+plt_insert_item (playlist_t *playlist, playItem_t *after, playItem_t *it);
+
+int
+plt_remove_item (playlist_t *playlist, playItem_t *it);
+
+playItem_t *
+pl_item_alloc (void);
+
+playItem_t *
+pl_item_alloc_init (const char *fname, const char *decoder_id);
+
+void
+pl_item_ref (playItem_t *it);
+
+void
+pl_item_unref (playItem_t *it);
+
+void
+pl_item_copy (playItem_t *out, playItem_t *it);
+
+int
+pl_getcount (int iter);
+
+int
+plt_get_item_count (playlist_t *plt, int iter);
+
+int
+pl_getselcount (void);
+
+int
+plt_getselcount (playlist_t *playlist);
+
+playItem_t *
+pl_get_for_idx (int idx);
+
+playItem_t *
+plt_get_item_for_idx (playlist_t *playlist, int idx, int iter);
+
+playItem_t *
+pl_get_for_idx_and_iter (int idx, int iter);
+
+int
+plt_get_item_idx (playlist_t *playlist, playItem_t *it, int iter);
+
+int
+pl_get_idx_of (playItem_t *it);
+
+int
+pl_get_idx_of_iter (playItem_t *it, int iter);
+
+playItem_t *
+plt_insert_cue_from_buffer (playlist_t *plt, playItem_t *after, playItem_t *origin, const uint8_t *buffer, int buffersize, int numsamples, int samplerate);
+
+playItem_t *
+plt_insert_cue (playlist_t *plt, playItem_t *after, playItem_t *origin, int numsamples, int samplerate);
+
+// if value is NULL or empty - do nothing
+// if key already exists - do nothing
+// otherwise, add new meta field
+void
+pl_add_meta (playItem_t *it, const char *key, const char *value);
+
+// returns index of 1st deleted item
+int
+plt_delete_selected (playlist_t *plt);
+
+int
+pl_delete_selected (void);
+
+void
+plt_crop_selected (playlist_t *playlist);
+
+void
+pl_crop_selected (void);
+
+int
+plt_save (playlist_t *plt, playItem_t *first, playItem_t *last, const char *fname, int *pabort, int (*cb)(playItem_t *it, void *data), void *user_data);
+
+int
+plt_save_n (int n);
+
+int
+pl_save_current (void);
+
+int
+pl_save_all (void);
+
+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);
+
+int
+pl_load_all (void);
+
+void
+plt_select_all (playlist_t *plt);
+
+void
+pl_select_all (void);
+
+void
+plt_reshuffle (playlist_t *playlist, playItem_t **ppmin, playItem_t **ppmax);
+
+// required to calculate total playtime
+void
+plt_set_item_duration (playlist_t *playlist, playItem_t *it, float duration);
+
+float
+pl_get_item_duration (playItem_t *it);
+
+void
+pl_set_item_replaygain (playItem_t *it, int idx, float value);
+
+float
+pl_get_item_replaygain (playItem_t *it, int idx);
+
+uint32_t
+pl_get_item_flags (playItem_t *it);
+
+void
+pl_set_item_flags (playItem_t *it, uint32_t flags);
+
+// returns number of characters printed, not including trailing 0
+// artist, title, album, length, tracknumber
+int
+pl_format_title (playItem_t *it, int idx, char *s, int size, int id, const char *fmt);
+
+int
+pl_format_title_escaped (playItem_t *it, int idx, char *s, int size, int id, const char *fmt);
+
+void
+pl_format_time (float t, char *dur, int size);
+
+void
+plt_reset_cursor (playlist_t *plt);
+
+float
+plt_get_totaltime (playlist_t *plt);
+
+float
+pl_get_totaltime (void);
+
+float
+plt_get_selection_playback_time (playlist_t *plt);
+
+void
+pl_set_selected (playItem_t *it, int sel);
+
+int
+pl_is_selected (playItem_t *it);
+
+playItem_t *
+plt_get_first (playlist_t *playlist, int iter);
+
+playItem_t *
+pl_get_first (int iter);
+
+playItem_t *
+plt_get_last (playlist_t *playlist, int iter);
+
+playItem_t *
+pl_get_last (int iter);
+
+playItem_t *
+pl_get_next (playItem_t *it, int iter);
+
+playItem_t *
+pl_get_prev (playItem_t *it, int iter);
+
+int
+plt_get_cursor (playlist_t *plt, int iter);
+
+int
+pl_get_cursor (int iter);
+
+void
+plt_set_cursor (playlist_t *plt, int iter, int cursor);
+
+void
+pl_set_cursor (int iter, int cursor);
+
+void
+plt_move_items (playlist_t *to, int iter, playlist_t *from, playItem_t *drop_before, uint32_t *indexes, int count);
+
+void
+plt_copy_items (playlist_t *to, int iter, playlist_t *from, playItem_t *before, uint32_t *indices, int cnt);
+
+void
+plt_search_reset (playlist_t *plt);
+
+void
+plt_search_process (playlist_t *plt, const char *text);
+
+void
+plt_search_process2 (playlist_t *plt, const char *text, int select_results);
+
+void
+plt_sort (playlist_t *plt, int iter, int id, const char *format, int order);
+
+void
+plt_sort_random (playlist_t *plt, int iter);
+
+void
+pl_items_copy_junk (struct playItem_s *from, struct playItem_s *first, struct playItem_s *last);
+
+struct DB_metaInfo_s *
+pl_get_metadata_head (playItem_t *it);
+
+void
+pl_delete_metadata (playItem_t *it, struct DB_metaInfo_s *meta);
+
+void
+pl_reshuffle_all (void);
+
+playlist_t *
+pl_get_playlist (playItem_t *it);
+
+void
+plt_set_fast_mode (playlist_t *plt, int fast);
+
+int
+plt_is_fast_mode (playlist_t *plt);
+
+void
+pl_ensure_lock (void);
+
+int
+plt_get_meta (playlist_t *handle, const char *key, char *val, int size);
+
+int
+plt_get_idx (playlist_t *plt);
+
+int
+plt_save_config (playlist_t *plt);
+
+int
+listen_file_added (int (*callback)(ddb_fileadd_data_t *data, void *user_data), void *user_data);
+
+void
+unlisten_file_added (int id);
+
+int
+listen_file_add_beginend (void (*callback_begin) (ddb_fileadd_data_t *data, void *user_data), void (*callback_end)(ddb_fileadd_data_t *data, void *user_data), void *user_data);
+
+void
+unlisten_file_add_beginend (int id);
+
+playItem_t *
+plt_load2 (int visibility, playlist_t *plt, playItem_t *after, const char *fname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data);
+
+int
+plt_add_file2 (int visibility, playlist_t *plt, const char *fname, int (*callback)(playItem_t *it, void *user_data), void *user_data);
+
+int
+plt_add_dir2 (int visibility, playlist_t *plt, const char *dirname, int (*callback)(playItem_t *it, void *user_data), void *user_data);
+
+playItem_t *
+plt_insert_file2 (int visibility, playlist_t *playlist, playItem_t *after, const char *fname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data);
+
+playItem_t *
+plt_insert_dir2 (int visibility, playlist_t *plt, playItem_t *after, const char *dirname, int *pabort, int (*callback)(playItem_t *it, void *user_data), void *user_data);
+
+playItem_t *
+plt_insert_dir3 (int visibility, uint32_t flags, playlist_t *plt, playItem_t *after, const char *dirname, int *pabort, int (*callback)(ddb_insert_file_result_t result, const char *fname, void *user_data), void *user_data);
+
+int
+plt_add_files_begin (playlist_t *plt, int visibility);
+
+void
+plt_add_files_end (playlist_t *plt, int visibility);
+
+void
+plt_deselect_all (playlist_t *plt);
+
+void
+plt_set_scroll (playlist_t *plt, int scroll);
+
+int
+plt_get_scroll (playlist_t *plt);
+
+const char *
+pl_format_duration (playItem_t *it, const char *ret, char *dur, int size);
+
+int
+pl_format_item_queue (playItem_t *it, char *s, int size);
+
+void
+send_trackinfochanged (playItem_t *track);
+
+playItem_t *
+plt_process_cue (playlist_t *plt, playItem_t *after, playItem_t *it, uint64_t totalsamples, int samplerate);
+
+void
+pl_configchanged (void);
+
+int
+register_fileadd_filter (int (*callback)(ddb_file_found_data_t *data, void *user_data), void *user_data);
+
+void
+unregister_fileadd_filter (int id);
+
+playItem_t *
+pl_item_init (const char *fname);
+
+int64_t
+pl_item_get_startsample (playItem_t *it);
+
+int64_t
+pl_item_get_endsample (playItem_t *it);
+
+void
+pl_item_set_startsample (playItem_t *it, int64_t sample);
+
+void
+pl_item_set_endsample (playItem_t *it, int64_t sample);
+
+int
+plt_is_loading_cue (playlist_t *plt);
+
+int
+fileadd_filter_test (ddb_file_found_data_t *data);
+
+void
+pl_set_selected_in_playlist (playlist_t *playlist, playItem_t *it, int sel);
+
+playItem_t *
+plt_get_head_item(playlist_t *p, int iter);
+
+playItem_t *
+plt_get_tail_item(playlist_t *p, int iter);
+
+int
+pl_get_played (playItem_t *it);
+
+void
+pl_set_played (playItem_t *it, int played);
+
+int
+pl_get_shufflerating (playItem_t *it);
+
+void
+pl_set_shufflerating (playItem_t *it, int rating);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __PLAYLIST_H

deadbeef-1.9.6.tar.bz2/src/playmodes.c Added

@@ -0,0 +1,68 @@
+#include "playmodes.h"
+#include "conf.h"
+#include "messagepump.h"
+#include "threading.h"
+
+static ddb_shuffle_t _shuffle;
+static ddb_repeat_t _repeat;
+static uintptr_t mutex;
+
+void
+streamer_playmodes_init (void) {
+    mutex = mutex_create ();
+}
+
+void
+streamer_playmodes_free (void) {
+    mutex_free (mutex);
+    mutex = 0;
+}
+
+void
+streamer_set_shuffle (ddb_shuffle_t shuffle) {
+    mutex_lock (mutex);
+    ddb_shuffle_t prev = _shuffle;
+    if (prev == shuffle) {
+        mutex_unlock (mutex);
+        return;
+    }
+
+    _shuffle = shuffle;
+    mutex_unlock (mutex);
+
+    conf_set_int ("playback.order", shuffle);
+
+    messagepump_push (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+ddb_shuffle_t
+streamer_get_shuffle (void) {
+    mutex_lock (mutex);
+    ddb_shuffle_t shuffle = _shuffle;
+    mutex_unlock (mutex);
+    return shuffle;
+}
+
+void
+streamer_set_repeat (ddb_repeat_t repeat) {
+    mutex_lock (mutex);
+    ddb_repeat_t prev = _repeat;
+    if (prev == repeat) {
+        mutex_unlock (mutex);
+        return;
+    }
+
+    _repeat = repeat;
+    mutex_unlock (mutex);
+
+    conf_set_int ("playback.loop", repeat);
+    messagepump_push (DB_EV_CONFIGCHANGED, 0, 0, 0);
+}
+
+ddb_repeat_t
+streamer_get_repeat (void) {
+    mutex_lock (mutex);
+    ddb_repeat_t repeat = _repeat;
+    mutex_unlock (mutex);
+    return repeat;
+}

deadbeef-1.9.6.tar.bz2/src/playmodes.h Added

deadbeef-1.9.6.tar.bz2/src/playqueue.c Added

@@ -0,0 +1,195 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ playback queue management
+
+ Copyright (C) 2009-2015 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include "playqueue.h"
+#include "messagepump.h"
+
+#define PLAYQUEUE_SIZE 100
+static playItem_t *playqueue100;
+static int playqueue_count = 0;
+
+#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+//#define trace(fmt,...)
+
+static void
+playqueue_send_trackinfochanged (playItem_t *track) {
+ ddb_event_track_t *ev = (ddb_event_track_t *)messagepump_event_alloc (DB_EV_TRACKINFOCHANGED);
+ ev->track = DB_PLAYITEM (track);
+ if (track) {
+ pl_item_ref (track);
+ }
+ messagepump_push_event ((ddb_event_t*)ev, DDB_PLAYLIST_CHANGE_PLAYQUEUE, 0);
+}
+
+int
+playqueue_push (playItem_t *it) {
+ if (playqueue_count == PLAYQUEUE_SIZE) {
+ trace ("playqueue is full\n");
+ return -1;
+ }
+ pl_lock ();
+ pl_item_ref (it);
+ playqueueplayqueue_count++ = it;
+ pl_unlock ();
+ playqueue_send_trackinfochanged (it);
+ return 0;
+}
+
+void
+playqueue_clear (void) {
+ pl_lock ();
+ for (int i = 0; i < playqueue_count; i++) {
+ pl_item_unref (playqueuei);
+ playqueuei = NULL;
+ }
+ playqueue_count = 0;
+ pl_unlock ();
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_PLAYQUEUE, 0);
+}
+
+void
+playqueue_pop (void) {
+ if (!playqueue_count) {
+ return;
+ }
+ pl_lock ();
+ if (playqueue_count == 1) {
+ playqueue_count = 0;
+ playqueue_send_trackinfochanged (playqueue0);
+ pl_item_unref (playqueue0);
+ pl_unlock ();
+ return;
+ }
+ playItem_t *it = playqueue0;
+ memmove (&playqueue0, &playqueue1, (playqueue_count-1) * sizeof (playItem_t*));
+ playqueue_count--;
+ pl_item_unref (it);
+ pl_unlock ();
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_PLAYQUEUE, 0);
+}
+
+void
+playqueue_remove (playItem_t *it) {
+ pl_lock ();
+ for (;;) {
+ int i;
+ for (i = 0; i < playqueue_count; i++) {
+ if (playqueuei == it) {
+ if (i < playqueue_count-1) {
+ memmove (&playqueuei, &playqueuei+1, (playqueue_count-i) * sizeof (playItem_t*));
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_PLAYQUEUE, 0);
+ }
+ else {
+ playqueue_send_trackinfochanged (it);
+ }
+ pl_item_unref (it);
+ playqueue_count--;
+ break;
+ }
+ }
+ if (i == playqueue_count) {
+ break;
+ }
+ }
+ pl_unlock ();
+}
+
+int
+playqueue_test (playItem_t *it) {
+ pl_lock ();
+ for (int i = 0; i < playqueue_count; i++) {
+ if (playqueuei == it) {
+ pl_unlock ();
+ return i;
+ }
+ }
+ pl_unlock ();
+ return -1;
+}
+
+playItem_t *
+playqueue_getnext (void) {
+ pl_lock ();
+ if (playqueue_count > 0) {
+ playItem_t *val = playqueue0;
+ pl_item_ref (val);
+ pl_unlock ();
+ return val;
+ }
+ pl_unlock ();
+ return NULL;
+}
+
+int
+playqueue_getcount (void) {
+ return playqueue_count;
+}
+
+playItem_t *
+playqueue_get_item (int i) {
+ pl_lock ();
+ playItem_t *it = playqueuei;
+ pl_item_ref (it);
+ pl_unlock ();
+ return it;
+}
+
+void
+playqueue_remove_nth (int n) {
+ pl_lock ();
+ playItem_t *it = playqueuen;
+ if (n < playqueue_count-1) {
+ memmove (playqueue + n, playqueue + n + 1, (playqueue_count-n) * sizeof (playItem_t*));
+ }
+ playqueue_count--;
+
+ pl_item_unref (it);
+ pl_unlock ();
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_PLAYQUEUE, 0);
+}
+
+void
+playqueue_insert_at (int n, playItem_t *it) {
+ if (playqueue_count == PLAYQUEUE_SIZE) {
+ trace ("playqueue is full\n");
+ return;
+ }
+ pl_lock ();
+ if (n == playqueue_count) {
+ playqueue_push(it);
+ pl_unlock ();
+ return;
+ }
+ memmove (playqueue+n+1, playqueue+n, (playqueue_count - n) * sizeof (playItem_t *));
+ playqueuen = it;
+ pl_item_ref (it);
+ playqueue_count++;
+ pl_unlock ();
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_PLAYQUEUE, 0);
+}

deadbeef-1.9.6.tar.bz2/src/playqueue.h Added

@@ -0,0 +1,71 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  playback queue management
+
+  Copyright (C) 2009-2015 Oleksiy 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
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+  claim that you wrote the original software. If you use this software
+  in a product, an acknowledgment in the product documentation would be
+  appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+  misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+#ifndef __deadbeef__playqueue__
+#define __deadbeef__playqueue__
+
+#include "playlist.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int
+playqueue_push (playItem_t *it);
+
+void
+playqueue_clear (void);
+
+void
+playqueue_pop (void);
+
+void
+playqueue_remove (playItem_t *it);
+
+int
+playqueue_test (playItem_t *it);
+
+playItem_t *
+playqueue_getnext (void);
+
+int
+playqueue_getcount (void);
+
+playItem_t *
+playqueue_get_item (int i);
+
+void
+playqueue_remove_nth (int n);
+
+void
+playqueue_insert_at (int n, playItem_t *it);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* defined(__deadbeef__playqueue__) */

deadbeef-1.9.6.tar.bz2/src/plmeta.c Added

@@ -0,0 +1,543 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ track metadata management
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+#include <string.h>
+#include <stdlib.h>
+#include "plmeta.h"
+#include <deadbeef/deadbeef.h>
+#include "metacache.h"
+
+#define LOCK {pl_lock();}
+#define UNLOCK {pl_unlock();}
+
+DB_metaInfo_t *
+pl_meta_for_key_with_override (playItem_t *it, const char *key) {
+ pl_ensure_lock ();
+ DB_metaInfo_t *m = it->meta;
+
+ // try to find an override
+ while (m) {
+ if (m->key0 == '!' && !strcasecmp (key, m->key+1)) {
+ return m;
+ }
+ m = m->next;
+ }
+
+ m = it->meta;
+ while (m) {
+ if (key && !strcasecmp (key, m->key)) {
+ return m;
+ }
+ m = m->next;
+ }
+ return NULL;}
+
+
+DB_metaInfo_t *
+pl_meta_for_key (playItem_t *it, const char *key) {
+ pl_ensure_lock ();
+ DB_metaInfo_t *m = it->meta;
+ while (m) {
+ if (!strcasecmp (key, m->key)) {
+ return m;
+ }
+ m = m->next;
+ }
+ return NULL;
+}
+
+void
+pl_meta_free_values (DB_metaInfo_t *meta) {
+ metacache_remove_value (meta->value, meta->valuesize);
+ meta->value = NULL;
+ meta->valuesize = 0;
+}
+
+DB_metaInfo_t *
+pl_add_empty_meta_for_key (playItem_t *it, const char *key) {
+ // check if it's already set
+ DB_metaInfo_t *normaltail = NULL;
+ DB_metaInfo_t *propstart = NULL;
+ DB_metaInfo_t *tail = NULL;
+ DB_metaInfo_t *m = it->meta;
+ while (m) {
+ if (!strcasecmp (key, m->key)) {
+ // duplicate key
+ return NULL;
+ }
+ // find end of normal metadata
+ if (!normaltail && (!m->next || m->key0 == ':' || m->key0 == '_' || m->key0 == '!')) {
+ normaltail = tail;
+ propstart = m;
+ if (key0 != ':' && key0 != '_' && key0 != '!') {
+ break;
+ }
+ }
+ // find end of properties
+ tail = m;
+ m = m->next;
+ }
+ // add
+ m = calloc (1, sizeof (DB_metaInfo_t));
+ m->key = metacache_add_string (key);
+
+ if (key0 == ':' || key0 == '_' || key0 == '!') {
+ if (tail) {
+ tail->next = m;
+ }
+ else {
+ it->meta = m;
+ }
+ }
+ else {
+ m->next = propstart;
+ if (normaltail) {
+ normaltail->next = m;
+ }
+ else {
+ it->meta = m;
+ }
+ }
+
+ return m;
+}
+
+static char *
+_strip_empty (const char *value, int size, int *outsize) {
+ char *data = malloc (size);
+ if (!data) {
+ return NULL;
+ }
+
+ *outsize = 0;
+ const char *p = value;
+ const char *e = value + size;
+ char *out = data;
+ while (p < e) {
+ size_t l = strlen (p) + 1;
+ if (l > 1) {
+ memcpy (out, p, l);
+ out += l;
+ *outsize += l;
+ }
+ p += l;
+ }
+
+ return data;
+}
+
+static void
+_meta_set_value (DB_metaInfo_t *m, const char *value, int size) {
+ size_t len = strlen (value) + 1;
+ if (len != size) {
+ // multivalue -- need to strip empty parts
+ char *data = _strip_empty (value, size, &m->valuesize);
+
+ if (m->valuesize > 0) {
+ m->value = metacache_add_value (data, m->valuesize);
+ }
+ else {
+ m->value = metacache_add_value ("", 1);
+ m->valuesize = 1;
+ }
+ free (data);
+ }
+ else {
+ m->value = metacache_add_value (value, size);
+ m->valuesize = size;
+ }
+}
+
+void
+pl_add_meta_full (playItem_t *it, const char *key, const char *value, int valuesize) {
+ if (!value || !*value) {
+ return;
+ }
+
+ DB_metaInfo_t *meta = pl_add_empty_meta_for_key (it, key);
+ if (!meta) {
+ return;
+ }
+
+ _meta_set_value (meta, value, valuesize);
+}
+
+void
+pl_add_meta (playItem_t *it, const char *key, const char *value) {
+ if (!value || !*value) {
+ return;
+ }
+
+ pl_add_meta_full (it, key, value, (int)strlen (value) + 1);
+}
+
+static char *
+_combine_into_unique_multivalue (const char *value1, int size1, const char *value2, int size2, int *outsize) {
+ char *buf = NULL;
+ size_t buflen = 0;
+
+ const char *v = value2;
+ const char *ve = value2 + size2;
+ while (v < ve) {
+ const char *p = value1;
+ const char *e = value1 + size1;
+ while (p < e) {
+ if (!strcmp (p, v)) {
+ // dupe
+ break;
+ }
+ p += strlen (p) + 1;
+ }
+ size_t len = strlen (v);
+ if (p >= e) {
+ // append
+ if (!buf) {
+ buf = malloc (size1 + len + 1);
+ buflen = size1;
+ memcpy (buf, value1, size1);
+ }
+ else {
+ buf = realloc (buf, buflen + len + 1);
+ }
+ memcpy (buf + buflen, v, len + 1);
+ buflen += len + 1;
+ }
+
+ v += len + 1;
+ }
+
+ *outsize = (int)buflen;
+ return buf;
+}
+
+
+// append zero-divided multivalue data to existing data
+// skip duplicates
+void
+pl_append_meta_full (playItem_t *it, const char *key, const char *value, int size) {
+ if (!value || size == 0 || *value == 0) {
+ return;
+ }
+ pl_lock ();
+ DB_metaInfo_t *m = pl_meta_for_key (it, key);
+ if (!m) {
+ m = pl_add_empty_meta_for_key(it, key);
+ }
+
+ if (!m->value) {
+ _meta_set_value (m, value, size);
+ pl_unlock ();
+ return;
+ }
+
+ int buflen;
+ char *buf = _combine_into_unique_multivalue(m->value, m->valuesize, value, size, &buflen);
+
+ if (!buf) {
+ pl_unlock ();
+ return;
+ }
+
+ metacache_remove_value (m->value, m->valuesize);
+ m->value = metacache_add_value (buf, buflen);
+ m->valuesize = (int)buflen;
+ free (buf);
+ pl_unlock ();
+}
+
+void
+pl_append_meta (playItem_t *it, const char *key, const char *value) {
+ pl_append_meta_full(it, key, value, (int)strlen (value)+1);
+}
+
+void
+pl_replace_meta (playItem_t *it, const char *key, const char *value) {
+ LOCK;
+ // check if it's already set
+ DB_metaInfo_t *m = pl_meta_for_key (it, key);
+
+ if (m) {
+ pl_meta_free_values (m);
+ int l = (int)strlen (value) + 1;
+ m->value = metacache_add_value(value, l);
+ m->valuesize = l;
+ UNLOCK;
+ return;
+ }
+ else {
+ pl_add_meta (it, key, value);
+ }
+ UNLOCK;
+}
+
+void
+pl_set_meta_int (playItem_t *it, const char *key, int value) {
+ char s20;
+ snprintf (s, sizeof (s), "%d", value);
+ pl_replace_meta (it, key, s);
+}
+
+void
+pl_set_meta_int64 (playItem_t *it, const char *key, int64_t value) {
+ char s20;
+ snprintf (s, sizeof (s), "%lld", (long long)value);
+ pl_replace_meta (it, key, s);
+}
+
+void
+pl_set_meta_float (playItem_t *it, const char *key, float value) {
+ char s20;
+ snprintf (s, sizeof (s), "%f", value);
+ pl_replace_meta (it, key, s);
+}
+
+void
+pl_delete_meta (playItem_t *it, const char *key) {
+ pl_lock ();
+ DB_metaInfo_t *prev = NULL;
+ DB_metaInfo_t *m = it->meta;
+ while (m) {
+ if (!strcasecmp (key, m->key)) {
+ if (prev) {
+ prev->next = m->next;
+ }
+ else {
+ it->meta = m->next;
+ }
+ metacache_remove_string (m->key);
+ pl_meta_free_values(m);
+ free (m);
+ break;
+ }
+ prev = m;
+ m = m->next;
+ }
+ pl_unlock ();
+}
+
+const char *
+pl_find_meta (playItem_t *it, const char *key) {
+ pl_ensure_lock ();
+ DB_metaInfo_t *m = it->meta;
+
+ if (key && key0 == ':') {
+ // try to find an override
+ while (m) {
+ if (m->key0 == '!' && !strcasecmp (key+1, m->key+1)) {
+ return m->value;
+ }
+ m = m->next;
+ }
+ }
+
+ m = it->meta;
+ while (m) {
+ if (key && !strcasecmp (key, m->key)) {
+ return m->value;
+ }
+ m = m->next;
+ }
+ return NULL;
+}
+
+const char *
+pl_find_meta_with_override (playItem_t *it, const char *key) {
+ pl_ensure_lock ();
+ DB_metaInfo_t *m = pl_meta_for_key_with_override(it, key);
+ if (m) {
+ return m->value;
+ }
+ return NULL;
+}
+
+const char *
+pl_find_meta_raw (playItem_t *it, const char *key) {
+ DB_metaInfo_t *m = pl_meta_for_key (it, key);
+ return m ? m->value : NULL;
+}
+
+int
+pl_find_meta_int (playItem_t *it, const char *key, int def) {
+ pl_lock ();
+ const char *val = pl_find_meta (it, key);
+ int res = val ? atoi (val) : def;
+ pl_unlock ();
+ return res;
+}
+
+int64_t
+pl_find_meta_int64 (playItem_t *it, const char *key, int64_t def) {
+ pl_lock ();
+ const char *val = pl_find_meta (it, key);
+ int64_t res = val ? atoll (val) : def;
+ pl_unlock ();
+ return res;
+}
+
+float
+pl_find_meta_float (playItem_t *it, const char *key, float def) {
+ pl_lock ();
+ const char *val = pl_find_meta (it, key);
+ float res = val ? (float)atof (val) : def;
+ pl_unlock ();
+ return res;
+}
+
+DB_metaInfo_t *
+pl_get_metadata_head (playItem_t *it) {
+ return it->meta;
+}
+
+void
+pl_delete_metadata (playItem_t *it, DB_metaInfo_t *meta) {
+ pl_lock ();
+ DB_metaInfo_t *prev = NULL;
+ DB_metaInfo_t *m = it->meta;
+ while (m) {
+ if (m == meta) {
+ if (prev) {
+ prev->next = m->next;
+ }
+ else {
+ it->meta = m->next;
+ }
+ metacache_remove_string (m->key);
+ pl_meta_free_values(m);
+ free (m);
+ break;
+ }
+ prev = m;
+ m = m->next;
+ }
+ pl_unlock ();
+}
+
+void
+pl_delete_all_meta (playItem_t *it) {
+ LOCK;
+ DB_metaInfo_t *m = it->meta;
+ DB_metaInfo_t *prev = NULL;
+ while (m) {
+ DB_metaInfo_t *next = m->next;
+ if (m->key0 == ':' || m->key0 == '_' || m->key0 == '!') {
+ prev = m;
+ }
+ else {
+ if (prev) {
+ prev->next = next;
+ }
+ else {
+ it->meta = next;
+ }
+ metacache_remove_string (m->key);
+ pl_meta_free_values (m);
+ free (m);
+ }
+ m = next;
+ }
+
+ // delete replaygain fields
+ extern const char *ddb_internal_rg_keys;
+ pl_delete_meta(it, ddb_internal_rg_keysDDB_REPLAYGAIN_ALBUMGAIN);
+ pl_delete_meta(it, ddb_internal_rg_keysDDB_REPLAYGAIN_ALBUMPEAK);
+ pl_delete_meta(it, ddb_internal_rg_keysDDB_REPLAYGAIN_TRACKGAIN);
+ pl_delete_meta(it, ddb_internal_rg_keysDDB_REPLAYGAIN_TRACKPEAK);
+
+ uint32_t f = pl_get_item_flags (it);
+ f &= ~DDB_TAG_MASK;
+ pl_set_item_flags (it, f);
+ UNLOCK;
+}
+
+int
+pl_get_meta (playItem_t *it, const char *key, char *val, int size) {
+ *val = 0;
+ pl_lock ();
+ const char *v = pl_find_meta (it, key);
+ if (!v) {
+ pl_unlock ();
+ return 0;
+ }
+ strncpy (val, v, size);
+ pl_unlock ();
+ return 1;
+}
+
+int
+pl_get_meta_with_override (playItem_t *it, const char *key, char *val, size_t size) {
+ *val = 0;
+ pl_lock ();
+ DB_metaInfo_t *meta = pl_meta_for_key_with_override (it, key);
+ if (!meta) {
+ pl_unlock ();
+ return 0;
+ }
+ strncpy (val, meta->value, size);
+ pl_unlock ();
+ return 1;
+}
+
+int
+pl_get_meta_raw (playItem_t *it, const char *key, char *val, int size) {
+ *val = 0;
+ pl_lock ();
+ const char *v = pl_find_meta_raw (it, key);
+ if (!v) {
+ pl_unlock ();
+ return 0;
+ }
+ strncpy (val, v, size);
+ pl_unlock ();
+ return 1;
+}
+
+int
+pl_meta_exists (playItem_t *it, const char *key) {
+ pl_lock ();
+ const char *v = pl_find_meta (it, key);
+ pl_unlock ();
+ return v ? 1 : 0;
+}
+
+int
+pl_meta_exists_with_override (playItem_t *it, const char *key) {
+ pl_lock ();
+ const char *v = pl_find_meta_with_override (it, key);
+ pl_unlock ();
+ return v ? 1 : 0;
+}
+
+void
+pl_add_meta_copy (playItem_t *it, DB_metaInfo_t *meta) {
+ DB_metaInfo_t *m = pl_add_empty_meta_for_key(it, meta->key);
+ if (!m) {
+ return; // dupe
+ }
+
+ m->value = metacache_add_value (meta->value, meta->valuesize);
+ m->valuesize = meta->valuesize;
+}

deadbeef-1.9.6.tar.bz2/src/plmeta.h Added

@@ -0,0 +1,91 @@
+#ifndef plmeta_h
+#define plmeta_h
+
+#include "playlist.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void
+pl_add_meta_full (playItem_t *it, const char *key, const char *value, int valuesize);
+
+// if it already exists, append new value(s)
+// otherwise, call pl_add_meta
+void
+pl_append_meta (playItem_t *it, const char *key, const char *value);
+
+void
+pl_append_meta_full (playItem_t *it, const char *key, const char *value, int valuesize);
+
+// must be used in explicit pl_lock/unlock block
+// that makes it possible to avoid copying metadata on every access
+// pl_find_meta may return overridden value (where the key is prefixed with '!')
+const char *
+pl_find_meta (playItem_t *it, const char *key);
+
+const char *
+pl_find_meta_raw (playItem_t *it, const char *key);
+
+int
+pl_find_meta_int (playItem_t *it, const char *key, int def);
+
+int64_t
+pl_find_meta_int64 (playItem_t *it, const char *key, int64_t def);
+
+float
+pl_find_meta_float (playItem_t *it, const char *key, float def);
+
+void
+pl_replace_meta (playItem_t *it, const char *key, const char *value);
+
+void
+pl_set_meta_int (playItem_t *it, const char *key, int value);
+
+void
+pl_set_meta_int64 (playItem_t *it, const char *key, int64_t value);
+
+void
+pl_set_meta_float (playItem_t *it, const char *key, float value);
+
+void
+pl_delete_meta (playItem_t *it, const char *key);
+
+void
+pl_delete_all_meta (playItem_t *it);
+
+int
+pl_get_meta (playItem_t *it, const char *key, char *val, int size);
+
+int
+pl_get_meta_raw (playItem_t *it, const char *key, char *val, int size);
+
+int
+pl_meta_exists (playItem_t *it, const char *key);
+
+int
+pl_meta_exists_with_override (playItem_t *it, const char *key);
+
+DB_metaInfo_t *
+pl_meta_for_key (playItem_t *it, const char *key);
+
+DB_metaInfo_t *
+pl_meta_for_key_with_override (playItem_t *it, const char *key);
+
+int
+pl_get_meta_with_override (playItem_t *it, const char *key, char *val, size_t size);
+
+const char *
+pl_find_meta_with_override (playItem_t *it, const char *key);
+
+void
+pl_meta_free_values (DB_metaInfo_t *meta);
+
+void
+pl_add_meta_copy (playItem_t *it, DB_metaInfo_t *meta);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* plmeta_h */

deadbeef-1.9.6.tar.bz2/src/pltmeta.c Added

@@ -0,0 +1,265 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ playlist metadata management
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+#include <string.h>
+#include <stdlib.h>
+#include "playlist.h"
+#include <deadbeef/deadbeef.h>
+#include "metacache.h"
+#include "pltmeta.h"
+
+#define LOCK {pl_lock();}
+#define UNLOCK {pl_unlock();}
+
+void
+plt_add_meta (playlist_t *it, const char *key, const char *value) {
+ LOCK;
+ // check if it's already set
+ DB_metaInfo_t *tail = NULL;
+ DB_metaInfo_t *m = it->meta;
+ while (m) {
+ if (!strcasecmp (key, m->key)) {
+ // duplicate key
+ UNLOCK;
+ return;
+ }
+ tail = m;
+ m = m->next;
+ }
+ // add
+ if (!value || !*value) {
+ UNLOCK;
+ return;
+ }
+ m = malloc (sizeof (DB_metaInfo_t));
+ memset (m, 0, sizeof (DB_metaInfo_t));
+ m->key = metacache_add_string (key); //key;
+ m->value = metacache_add_string (value); //strdup (value);
+
+ if (tail) {
+ tail->next = m;
+ }
+ else {
+ it->meta = m;
+ }
+ UNLOCK;
+}
+
+void
+plt_append_meta (playlist_t *it, const char *key, const char *value) {
+ pl_lock ();
+ const char *old = plt_find_meta (it, key);
+ size_t newlen = strlen (value);
+ if (!old) {
+ plt_add_meta (it, key, value);
+ }
+ else {
+ // check for duplicate data
+ const char *str = old;
+ size_t len;
+ while (str) {
+ char *next = strchr (str, '\n');
+
+ if (next) {
+ len = next - str;
+ next++;
+ }
+ else {
+ len = strlen (str);
+ }
+
+ if (len == newlen && !memcmp (str, value, len)) {
+ pl_unlock ();
+ return;
+ }
+
+ str = next;
+ }
+ size_t sz = strlen (old) + newlen + 2;
+ char outsz;
+ snprintf (out, sz, "%s\n%s", old, value);
+ plt_replace_meta (it, key, out);
+ }
+ pl_unlock ();
+}
+
+void
+plt_replace_meta (playlist_t *it, const char *key, const char *value) {
+ LOCK;
+ // check if it's already set
+ DB_metaInfo_t *m = it->meta;
+ while (m) {
+ if (!strcasecmp (key, m->key)) {
+ break;
+ }
+ m = m->next;
+ }
+ if (m) {
+ metacache_remove_string (m->value);
+ m->value = metacache_add_string (value);
+ UNLOCK;
+ return;
+ }
+ else {
+ plt_add_meta (it, key, value);
+ }
+ UNLOCK;
+}
+
+void
+plt_set_meta_int (playlist_t *it, const char *key, int value) {
+ char s20;
+ snprintf (s, sizeof (s), "%d", value);
+ plt_replace_meta (it, key, s);
+}
+
+void
+plt_set_meta_float (playlist_t *it, const char *key, float value) {
+ char s20;
+ snprintf (s, sizeof (s), "%f", value);
+ plt_replace_meta (it, key, s);
+}
+
+void
+plt_delete_meta (playlist_t *it, const char *key) {
+ DB_metaInfo_t *prev = NULL;
+ DB_metaInfo_t *m = it->meta;
+ while (m) {
+ if (!strcasecmp (key, m->key)) {
+ if (prev) {
+ prev->next = m->next;
+ }
+ else {
+ it->meta = m->next;
+ }
+ metacache_remove_string (m->key);
+ metacache_remove_string (m->value);
+ free (m);
+ break;
+ }
+ prev = m;
+ m = m->next;
+ }
+}
+
+const char *
+plt_find_meta (playlist_t *it, const char *key) {
+ DB_metaInfo_t *m = it->meta;
+ while (m) {
+ if (!strcasecmp (key, m->key)) {
+ return m->value;
+ }
+ m = m->next;
+ }
+ return NULL;
+}
+
+int
+plt_find_meta_int (playlist_t *it, const char *key, int def) {
+ pl_lock ();
+ const char *val = plt_find_meta (it, key);
+ int res = val ? atoi (val) : def;
+ pl_unlock ();
+ return res;
+}
+
+float
+plt_find_meta_float (playlist_t *it, const char *key, float def) {
+ pl_lock ();
+ const char *val = plt_find_meta (it, key);
+ float res = val ? (float)atof (val) : def;
+ pl_unlock ();
+ return res;
+}
+
+DB_metaInfo_t *
+plt_get_metadata_head (playlist_t *it) {
+ return it->meta;
+}
+
+void
+plt_delete_metadata (playlist_t *it, DB_metaInfo_t *meta) {
+ DB_metaInfo_t *prev = NULL;
+ DB_metaInfo_t *m = it->meta;
+ while (m) {
+ if (m == meta) {
+ if (prev) {
+ prev->next = m->next;
+ }
+ else {
+ it->meta = m->next;
+ }
+ metacache_remove_string (m->key);
+ metacache_remove_string (m->value);
+ free (m);
+ break;
+ }
+ prev = m;
+ m = m->next;
+ }
+}
+
+
+void
+plt_delete_all_meta (playlist_t *it) {
+ LOCK;
+ DB_metaInfo_t *m = it->meta;
+ DB_metaInfo_t *prev = NULL;
+ while (m) {
+ DB_metaInfo_t *next = m->next;
+ if (m->key0 == ':') {
+ prev = m;
+ }
+ else {
+ if (prev) {
+ prev->next = next;
+ }
+ else {
+ it->meta = next;
+ }
+ metacache_remove_string (m->key);
+ metacache_remove_string (m->value);
+ free (m);
+ }
+ m = next;
+ }
+ UNLOCK;
+}
+
+int
+plt_get_meta (playlist_t *handle, const char *key, char *val, int size) {
+ *val = 0;
+ LOCK;
+ const char *v = plt_find_meta (handle, key);
+ if (!v) {
+ UNLOCK;
+ return 0;
+ }
+ strncpy (val, v, size);
+ UNLOCK;
+ return 1;
+}

deadbeef-1.9.6.tar.bz2/src/pltmeta.h Added

@@ -0,0 +1,66 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  playlist metadata management
+
+  Copyright (C) 2009-2013 Oleksiy 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
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __PLMETA_H
+#define __PLMETA_H
+
+void
+plt_add_meta (playlist_t *it, const char *key, const char *value);
+
+void
+plt_append_meta (playlist_t *it, const char *key, const char *value);
+
+void
+plt_replace_meta (playlist_t *it, const char *key, const char *value);
+
+void
+plt_set_meta_int (playlist_t *it, const char *key, int value);
+
+void
+plt_set_meta_float (playlist_t *it, const char *key, float value);
+
+void
+plt_delete_meta (playlist_t *it, const char *key);
+
+const char *
+plt_find_meta (playlist_t *it, const char *key);
+
+int
+plt_find_meta_int (playlist_t *it, const char *key, int def);
+
+float
+plt_find_meta_float (playlist_t *it, const char *key, float def);
+
+DB_metaInfo_t *
+plt_get_metadata_head (playlist_t *it);
+
+void
+plt_delete_metadata (playlist_t *it, DB_metaInfo_t *meta);
+
+void
+plt_delete_all_meta (playlist_t *it);
+
+#endif

deadbeef-1.9.6.tar.bz2/src/plugins.c Added

@@ -0,0 +1,1829 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ plugin management
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include <Block.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <dispatch/dispatch.h>
+#include <dlfcn.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#ifndef __linux__
+#define _POSIX_C_SOURCE 1
+#endif
+#include <limits.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "gettext.h"
+#include "plugins.h"
+#include "md5/md5.h"
+#include "messagepump.h"
+#include "threading.h"
+#include "playlist.h"
+#include "plmeta.h"
+#include "volume.h"
+#include "streamer.h"
+#include <deadbeef/common.h>
+#include "conf.h"
+#include "junklib.h"
+#include "vfs.h"
+#include "premix.h"
+#include "dsppreset.h"
+#include "pltmeta.h"
+#include "metacache.h"
+#include "tf.h"
+#include "playqueue.h"
+#include "sort.h"
+#include "logger.h"
+#include "replaygain.h"
+#include "playmodes.h"
+#ifdef __APPLE__
+#include "cocoautil.h"
+#endif
+#include "viz.h"
+
+DB_plugin_t main_plugin = {
+ .type = DB_PLUGIN_MISC,
+ .version_major = DB_API_VERSION_MAJOR,
+ .version_minor = DB_API_VERSION_MINOR,
+ .name = "deadbeef",
+ .id = "deadbeef",
+ .flags = DDB_PLUGIN_FLAG_LOGGING,
+};
+
+//#define DISABLE_VERSIONCHECK 1
+
+#if defined(HAVE_COCOAUI) || defined(OSX_APPBUNDLE)
+#define PLUGINEXT ".dylib"
+#elif defined __MINGW32__
+#define PLUGINEXT ".dll"
+#else
+#define PLUGINEXT ".so"
+#endif
+
+const char *lowprio_plugin_ids = {
+ "ffmpeg",
+ NULL
+};
+
+// internal plugin list
+typedef struct plugin_s {
+ void *handle;
+ char *filepath;
+ DB_plugin_t *plugin;
+ struct plugin_s *next;
+} plugin_t;
+
+static plugin_t *plugins;
+static plugin_t *plugins_tail;
+
+// this list only gets used during plugin loading,
+// then it gets appended to the above "plugins" list,
+// and set to NULL
+static plugin_t *plugins_lowprio;
+static plugin_t *plugins_lowprio_tail;
+
+#define MAX_PLUGINS 100
+static DB_plugin_t *g_pluginsMAX_PLUGINS+1;
+
+#define MAX_GUI_PLUGINS 10
+static char *g_gui_namesMAX_GUI_PLUGINS+1;
+static int g_num_gui_names;
+
+#define MAX_DECODER_PLUGINS 50
+static DB_decoder_t *g_decoder_pluginsMAX_DECODER_PLUGINS+1;
+
+#define MAX_VFS_PLUGINS 10
+static DB_vfs_t *g_vfs_pluginsMAX_VFS_PLUGINS+1;
+
+#define MAX_DSP_PLUGINS 10
+static DB_dsp_t *g_dsp_pluginsMAX_DSP_PLUGINS+1;
+
+#define MAX_OUTPUT_PLUGINS 10
+static DB_output_t *g_output_pluginsMAX_OUTPUT_PLUGINS+1;
+static DB_output_t *output_plugin = NULL;
+
+#define MAX_PLAYLIST_PLUGINS 10
+static DB_playlist_t *g_playlist_pluginsMAX_PLAYLIST_PLUGINS+1;
+
+static uintptr_t background_jobs_mutex;
+static int num_background_jobs;
+
+static void
+_viz_spectrum_listen_stub (void *ctx, void (*callback)(void *ctx, const ddb_audio_data_t *data)) {
+}
+
+// deadbeef api
+static DB_functions_t deadbeef_api = {
+ .vmajor = DB_API_VERSION_MAJOR,
+ .vminor = DB_API_VERSION_MINOR,
+ .md5 = plug_md5,
+ .md5_to_str = plug_md5_to_str,
+ .md5_init = (void (*)(DB_md5_t *s))md5_init,
+ .md5_append = (void (*)(DB_md5_t *s, const uint8_t *daya, int nbytes))md5_append,
+ .md5_finish = (void (*)(DB_md5_t *s, uint8_t digest16))md5_finish,
+ .get_output = plug_get_output,
+ .playback_get_pos = plug_playback_get_pos,
+ .playback_set_pos = plug_playback_set_pos,
+ // streamer access
+ .streamer_get_playing_track = (DB_playItem_t *(*) (void))streamer_get_playing_track_unsafe,
+ .streamer_get_streaming_track = (DB_playItem_t *(*) (void))streamer_get_streaming_track,
+ .streamer_get_playpos = streamer_get_playpos,
+ .streamer_ok_to_read = streamer_ok_to_read,
+ .streamer_reset = streamer_reset,
+ .streamer_read = streamer_read,
+ .streamer_set_bitrate = streamer_set_bitrate,
+ .streamer_get_apx_bitrate = streamer_get_apx_bitrate,
+ .streamer_get_current_fileinfo = streamer_get_current_fileinfo,
+ .streamer_get_current_playlist = streamer_get_current_playlist,
+ .streamer_get_dsp_chain = streamer_get_dsp_chain,
+ .streamer_set_dsp_chain = streamer_set_dsp_chain,
+ .streamer_dsp_refresh = streamer_dsp_refresh,
+ // folders
+ .get_config_dir = plug_get_config_dir,
+ .get_prefix = plug_get_prefix,
+ .get_doc_dir = plug_get_doc_dir,
+ .get_plugin_dir = plug_get_plugin_dir,
+ .get_pixmap_dir = plug_get_pixmap_dir,
+ // threading
+ .thread_start = thread_start,
+ .thread_start_low_priority = thread_start_low_priority,
+ .thread_join = thread_join,
+ .thread_detach = thread_detach,
+ .thread_exit = thread_exit,
+ .mutex_create = mutex_create,
+ .mutex_create_nonrecursive = mutex_create_nonrecursive,
+ .mutex_free = mutex_free,
+ .mutex_lock = mutex_lock,
+ .mutex_unlock = mutex_unlock,
+ .cond_create = cond_create,
+ .cond_free = cond_free,
+ .cond_wait = cond_wait,
+ .cond_signal = cond_signal,
+ .cond_broadcast = cond_broadcast,
+ // playlist management
+ .plt_ref = (void (*) (ddb_playlist_t *plt))plt_ref,
+ .plt_unref = (void (*) (ddb_playlist_t *plt))plt_unref,
+ .plt_get_count = plt_get_count,
+ .plt_get_head = (DB_playItem_t * (*) (int plt))plt_get_head,
+ .plt_get_sel_count = plt_get_sel_count,
+ .plt_add = plt_add,
+ .plt_remove = plt_remove,
+ .plt_clear = (void (*)(ddb_playlist_t *))plt_clear,
+ .pl_clear = pl_clear,
+ .plt_set_curr = (void (*) (ddb_playlist_t *plt))plt_set_curr,
+ .plt_get_curr = (ddb_playlist_t *(*) (void))plt_get_curr,
+ .plt_set_curr_idx = (void (*) (int plt))plt_set_curr_idx,
+ .plt_get_curr_idx = (int (*) (void))plt_get_curr_idx,
+ .plt_move = plt_move,
+ // playlist saving and loading
+ .plt_load = (DB_playItem_t * (*) (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data))plt_load,
+ .plt_save = (int (*)(ddb_playlist_t *plt, DB_playItem_t *first, DB_playItem_t *last, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data))plt_save,
+ // getting and working with a handle must be guarded using plt_lock/unlock
+ .plt_get_for_idx = (ddb_playlist_t *(*)(int idx))plt_get_for_idx,
+ .plt_get_title = (int (*)(ddb_playlist_t *handle, char *buffer, int sz))plt_get_title,
+ .plt_set_title = (int (*)(ddb_playlist_t *handle, const char *buffer))plt_set_title,
+ .plt_modified = (void (*) (ddb_playlist_t *handle))plt_modified,
+ .plt_get_modification_idx = (int (*) (ddb_playlist_t *handle))plt_get_modification_idx,
+ .plt_get_item_idx = (int (*) (ddb_playlist_t *plt, DB_playItem_t *it, int iter))plt_get_item_idx,
+
+ // playlist metadata
+ .plt_add_meta = (void (*) (ddb_playlist_t *handle, const char *key, const char *value))plt_add_meta,
+ .plt_replace_meta = (void (*) (ddb_playlist_t *handle, const char *key, const char *value))plt_replace_meta,
+ .plt_append_meta = (void (*) (ddb_playlist_t *handle, const char *key, const char *value))plt_append_meta,
+ .plt_set_meta_int = (void (*) (ddb_playlist_t *handle, const char *key, int value))plt_set_meta_int,
+ .plt_set_meta_float = (void (*) (ddb_playlist_t *handle, const char *key, float value))plt_set_meta_float,
+ .plt_find_meta = (const char *(*) (ddb_playlist_t *handle, const char *key))plt_find_meta,
+ .plt_get_metadata_head = (DB_metaInfo_t * (*) (ddb_playlist_t *handle))plt_get_metadata_head,
+ .plt_delete_metadata = (void (*) (ddb_playlist_t *handle, DB_metaInfo_t *meta))plt_delete_metadata,
+ .plt_find_meta_int = (int (*) (ddb_playlist_t *handle, const char *key, int def))plt_find_meta_int,
+ .plt_find_meta_float = (float (*) (ddb_playlist_t *handle, const char *key, float def))plt_find_meta_float,
+ .plt_delete_all_meta = (void (*) (ddb_playlist_t *handle))plt_delete_all_meta,
+
+ // operating on playlist items
+ .plt_insert_item = (DB_playItem_t *(*) (ddb_playlist_t *playlist, DB_playItem_t *after, DB_playItem_t *it))plt_insert_item,
+ .plt_insert_file = (DB_playItem_t *(*) (ddb_playlist_t *playlist, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data))plt_insert_file,
+ .plt_insert_dir = (DB_playItem_t *(*) (ddb_playlist_t *plt, DB_playItem_t *after, const char *dirname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data))plt_insert_dir,
+ .plt_set_item_duration = (void (*) (ddb_playlist_t *plt, DB_playItem_t *it, float duration))plt_set_item_duration,
+ .plt_remove_item = (int (*) (ddb_playlist_t *playlist, DB_playItem_t *it))plt_remove_item,
+ .plt_getselcount = (int (*) (ddb_playlist_t *playlist))plt_getselcount,
+
+ // playlist access
+ .pl_lock = pl_lock,
+ .pl_unlock = pl_unlock,
+ //.plt_lock = plt_lock,
+ //.plt_unlock = plt_unlock,
+ .pl_item_alloc = (DB_playItem_t* (*)(void))pl_item_alloc,
+ .pl_item_alloc_init = (DB_playItem_t* (*)(const char *fname, const char *decoder_id))pl_item_alloc_init,
+ .pl_item_ref = (void (*)(DB_playItem_t *))pl_item_ref,
+ .pl_item_unref = (void (*)(DB_playItem_t *))pl_item_unref,
+ .pl_item_copy = (void (*)(DB_playItem_t *, DB_playItem_t *))pl_item_copy,
+ .plt_add_file = (int (*) (ddb_playlist_t *plt, const char *, int (*cb)(DB_playItem_t *it, void *data), void *))plt_add_file,
+ .plt_add_dir = (int (*) (ddb_playlist_t *plt, const char *dirname, int (*cb)(DB_playItem_t *it, void *data), void *user_data))plt_add_dir,
+ .pl_add_files_begin = (int (*) (ddb_playlist_t *plt))pl_add_files_begin,
+ .pl_add_files_end = pl_add_files_end,
+ .pl_get_idx_of = (int (*) (DB_playItem_t *it))pl_get_idx_of,
+ .pl_get_idx_of_iter = (int (*) (DB_playItem_t *it, int iter))pl_get_idx_of_iter,
+ .pl_get_for_idx = (DB_playItem_t * (*)(int))pl_get_for_idx,
+ .pl_get_for_idx_and_iter = (DB_playItem_t * (*) (int idx, int iter))pl_get_for_idx_and_iter,
+ .pl_get_item_duration = (float (*) (DB_playItem_t *it))pl_get_item_duration,
+ .pl_get_item_flags = (uint32_t (*) (DB_playItem_t *it))pl_get_item_flags,
+ .pl_set_item_flags = (void (*) (DB_playItem_t *it, uint32_t flags))pl_set_item_flags,
+ .plt_sort = (void (*) (ddb_playlist_t *plt, int iter, int id, const char *format, int order))plt_sort,
+ .pl_items_copy_junk = (void (*)(DB_playItem_t *from, DB_playItem_t *first, DB_playItem_t *last))pl_items_copy_junk,
+ .pl_set_item_replaygain = (void (*)(DB_playItem_t *it, int idx, float value))pl_set_item_replaygain,
+ .pl_get_item_replaygain = (float (*)(DB_playItem_t *it, int idx))pl_get_item_replaygain,
+ .plt_get_totaltime = (float (*) (ddb_playlist_t *plt))plt_get_totaltime,
+ .plt_get_item_for_idx = (DB_playItem_t * (*) (ddb_playlist_t *playlist, int idx, int iter))plt_get_item_for_idx,
+ .pl_get_totaltime = pl_get_totaltime,
+ .pl_getcount = pl_getcount,
+ .plt_get_item_count = (int (*)(ddb_playlist_t *plt, int iter))plt_get_item_count,
+ .plt_delete_selected = (int (*) (ddb_playlist_t *plt))plt_delete_selected,
+ .pl_delete_selected = pl_delete_selected,
+ .plt_set_cursor = (void (*)(ddb_playlist_t *plt, int iter, int cursor))plt_set_cursor,
+ .pl_set_cursor = pl_set_cursor,
+ .plt_get_cursor = (int (*)(ddb_playlist_t *plt, int iter))plt_get_cursor,
+ .pl_get_cursor = pl_get_cursor,
+ .pl_set_selected = (void (*) (DB_playItem_t *, int))pl_set_selected,
+ .pl_is_selected = (int (*) (DB_playItem_t *))pl_is_selected,
+ .pl_save_current = pl_save_current,
+ .pl_save_all = pl_save_all,
+ .plt_select_all = (void (*) (ddb_playlist_t *plt))plt_select_all,
+ .pl_select_all = pl_select_all,
+ .plt_crop_selected = (void (*) (ddb_playlist_t *plt))plt_crop_selected,
+ .pl_crop_selected = pl_crop_selected,
+ .pl_getselcount = pl_getselcount,
+ .plt_get_first = (DB_playItem_t *(*) (ddb_playlist_t *plt, int))plt_get_first,
+ .pl_get_first = (DB_playItem_t *(*) (int))pl_get_first,
+ .plt_get_last = (DB_playItem_t *(*) (ddb_playlist_t *plt, int))plt_get_last,
+ .pl_get_last = (DB_playItem_t *(*) (int))pl_get_last,
+ .pl_get_next = (DB_playItem_t *(*) (DB_playItem_t *, int))pl_get_next,
+ .pl_get_prev = (DB_playItem_t *(*) (DB_playItem_t *, int))pl_get_prev,
+ .pl_format_title = (int (*) (DB_playItem_t *it, int idx, char *s, int size, int id, const char *fmt))pl_format_title,
+ .pl_format_title_escaped = (int (*) (DB_playItem_t *it, int idx, char *s, int size, int id, const char *fmt))pl_format_title_escaped,
+ .pl_format_time = pl_format_time,
+ .plt_move_items = (void (*) (ddb_playlist_t *to, int iter, ddb_playlist_t *from, DB_playItem_t *drop_before, uint32_t *indexes, int count))plt_move_items,
+ .plt_copy_items = (void (*) (ddb_playlist_t *to, int iter, ddb_playlist_t *from, DB_playItem_t *before, uint32_t *indices, int cnt))plt_copy_items,
+ .plt_search_reset = (void (*)(ddb_playlist_t *plt))plt_search_reset,
+ .plt_search_process = (void (*)(ddb_playlist_t *plt, const char *t))plt_search_process,
+ .pl_get_playlist = (ddb_playlist_t * (*) (DB_playItem_t *it))pl_get_playlist,
+ // metainfo
+ .pl_add_meta = (void (*) (DB_playItem_t *, const char *, const char *))pl_add_meta,
+ .pl_append_meta = (void (*) (DB_playItem_t *, const char *, const char *))pl_append_meta,
+ .pl_set_meta_int = (void (*) (DB_playItem_t *it, const char *key, int value))pl_set_meta_int,
+ .pl_set_meta_float = (void (*) (DB_playItem_t *it, const char *key, float value))pl_set_meta_float,
+ .pl_delete_meta = (void (*)(DB_playItem_t *, const char *key))pl_delete_meta,
+ .pl_find_meta = (const char *(*) (DB_playItem_t *, const char *))pl_find_meta,
+ .pl_find_meta_int = (int (*) (DB_playItem_t *it, const char *key, int def))pl_find_meta_int,
+ .pl_find_meta_float = (float (*) (DB_playItem_t *it, const char *key, float def))pl_find_meta_float,
+ .pl_replace_meta = (void (*) (DB_playItem_t *, const char *, const char *))pl_replace_meta,
+ .pl_delete_all_meta = (void (*) (DB_playItem_t *it))pl_delete_all_meta,
+ .pl_get_metadata_head = (DB_metaInfo_t *(*)(DB_playItem_t *it))pl_get_metadata_head,
+ .pl_delete_metadata = (void (*)(DB_playItem_t *, DB_metaInfo_t *))pl_delete_metadata,
+ // cuesheet support
+ .plt_insert_cue_from_buffer = (DB_playItem_t *(*) (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, const uint8_t *buffer, int buffersize, int numsamples, int samplerate))plt_insert_cue_from_buffer,
+ .plt_insert_cue = (DB_playItem_t *(*)(ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *origin, int numsamples, int samplerate))plt_insert_cue,
+ // playqueue support
+ .pl_playqueue_push = (int (*) (DB_playItem_t *))playqueue_push,
+ .pl_playqueue_clear = playqueue_clear,
+ .pl_playqueue_pop = playqueue_pop,
+ .pl_playqueue_remove = (void (*) (DB_playItem_t *))playqueue_remove,
+ .pl_playqueue_test = (int (*) (DB_playItem_t *))playqueue_test,
+ // volume control
+ .volume_set_db = plug_volume_set_db,
+ .volume_get_db = volume_get_db,
+ .volume_set_amp = plug_volume_set_amp,
+ .volume_get_amp = volume_get_amp,
+ .volume_get_min_db = volume_get_min_db,
+ // junk reading
+ .junk_id3v1_read = (int (*)(DB_playItem_t *it, DB_FILE *fp))junk_id3v1_read,
+ .junk_id3v1_find = junk_id3v1_find,
+ .junk_id3v1_write = (int (*) (FILE *, DB_playItem_t *, const char *))junk_id3v1_write,
+ .junk_id3v2_find = junk_id3v2_find,
+ .junk_id3v2_read = (int (*)(DB_playItem_t *it, DB_FILE *fp))junk_id3v2_read,
+ .junk_id3v2_read_full = (int (*)(DB_playItem_t *, DB_id3v2_tag_t *tag, DB_FILE *fp))junk_id3v2_read_full,
+ .junk_id3v2_convert_24_to_23 = junk_id3v2_convert_24_to_23,
+ .junk_id3v2_convert_23_to_24 = junk_id3v2_convert_23_to_24,
+ .junk_id3v2_convert_22_to_24 = junk_id3v2_convert_22_to_24,
+ .junk_id3v2_free = junk_id3v2_free,
+ .junk_id3v2_write = junk_id3v2_write,
+ .junk_id3v2_remove_frames = junk_id3v2_remove_frames,
+ .junk_id3v2_add_text_frame = junk_id3v2_add_text_frame,
+ .junk_apev2_read = (int (*)(DB_playItem_t *it, DB_FILE *fp))junk_apev2_read,
+ .junk_apev2_read_mem = (int (*) (DB_playItem_t *it, char *mem, int size))junk_apev2_read_mem,
+ .junk_apev2_read_full = (int (*) (DB_playItem_t *it, DB_apev2_tag_t *tag_store, DB_FILE *fp))junk_apev2_read_full,
+ .junk_apev2_read_full_mem = (int (*) (DB_playItem_t *it, DB_apev2_tag_t *tag_store, char *mem, int memsize))junk_apev2_read_full_mem,
+ .junk_apev2_find = junk_apev2_find,
+ .junk_apev2_remove_frames = junk_apev2_remove_frames,
+ .junk_apev2_add_text_frame = junk_apev2_add_text_frame,
+ .junk_apev2_free = junk_apev2_free,
+ .junk_apev2_write = junk_apev2_write,
+ .junk_get_leading_size = junk_get_leading_size,
+ .junk_get_leading_size_stdio = junk_get_leading_size_stdio,
+ .junk_detect_charset = junk_detect_charset,
+ .junk_recode = junk_recode,
+ .junk_iconv = junk_iconv,
+ .junk_rewrite_tags = (int (*) (DB_playItem_t *it, uint32_t flags, int id3v2_version, const char *id3v1_encoding))junk_rewrite_tags,
+ // vfs
+ .fopen = vfs_fopen,
+ .fclose = vfs_fclose,
+ .fread = vfs_fread,
+ .fseek = vfs_fseek,
+ .ftell = vfs_ftell,
+ .rewind = vfs_rewind,
+ .fgetlength = vfs_fgetlength,
+ .fget_content_type = vfs_get_content_type,
+ .fset_track = (void (*) (DB_FILE *stream, DB_playItem_t *it))vfs_set_track,
+ .fabort = vfs_fabort,
+ // message passing
+ .sendmessage = messagepump_push,
+ .event_alloc = messagepump_event_alloc,
+ .event_free = messagepump_event_free,
+ .event_send = messagepump_push_event,
+ // configuration access
+ .conf_lock = conf_lock,
+ .conf_unlock = conf_unlock,
+ .conf_get_str_fast = conf_get_str_fast,
+ .conf_get_str = conf_get_str,
+ .conf_get_float = conf_get_float,
+ .conf_get_int = conf_get_int,
+ .conf_get_int64 = conf_get_int64,
+ .conf_set_str = conf_set_str,
+ .conf_set_int = conf_set_int,
+ .conf_set_int64 = conf_set_int64,
+ .conf_set_float = conf_set_float,
+ .conf_find = conf_find,
+ .conf_remove_items = conf_remove_items,
+ .conf_save = conf_save,
+ // plugin communication
+ .plug_get_decoder_list = plug_get_decoder_list,
+ .plug_get_vfs_list = plug_get_vfs_list,
+ .plug_get_output_list = plug_get_output_list,
+ .plug_get_dsp_list = plug_get_dsp_list,
+ .plug_get_playlist_list = plug_get_playlist_list,
+ .plug_get_list = plug_get_list,
+ .plug_get_gui_names = plug_get_gui_names,
+ .plug_get_decoder_id = plug_get_decoder_id,
+ .plug_remove_decoder_id = plug_remove_decoder_id,
+ .plug_get_for_id = plug_get_for_id,
+ // misc utilities
+ .is_local_file = plug_is_local_file,
+ // pcm utilities
+ .pcm_convert = pcm_convert,
+ // dsp preset management
+ .dsp_preset_load = dsp_preset_load,
+ .dsp_preset_save = dsp_preset_save,
+ .dsp_preset_free = dsp_preset_free,
+ // new 1.2 APIs
+ .plt_alloc = (ddb_playlist_t *(*)(const char *title))plt_alloc,
+ .plt_free = (void (*)(ddb_playlist_t *plt))plt_free,
+ //.plt_insert = plt_insert,
+ .plt_set_fast_mode = (void (*)(ddb_playlist_t *plt, int fast))plt_set_fast_mode,
+ .plt_is_fast_mode = (int (*)(ddb_playlist_t *plt))plt_is_fast_mode,
+ .metacache_add_string = metacache_add_string,
+ .metacache_remove_string = metacache_remove_string,
+ .metacache_ref = metacache_ref,
+ .metacache_unref = metacache_unref,
+ .pl_find_meta_raw = (const char *(*) (DB_playItem_t *it, const char *key))pl_find_meta_raw,
+ // ******* new 1.3 APIs ********
+ .streamer_dsp_chain_save = streamer_dsp_chain_save,
+ // ******* new 1.4 APIs ********
+ .pl_get_meta = (int (*) (DB_playItem_t *it, const char *key, char *val, int size))pl_get_meta,
+ .pl_get_meta_raw = (int (*) (DB_playItem_t *it, const char *key, char *val, int size))pl_get_meta_raw,
+ .plt_get_meta = (int (*) (ddb_playlist_t *handle, const char *key, char *val, int size))plt_get_meta,
+ .pl_meta_exists = (int (*) (DB_playItem_t *it, const char *key))pl_meta_exists,
+ // ******* new 1.5 APIs ********
+ .vis_waveform_listen = viz_waveform_listen,
+ .vis_waveform_unlisten = viz_waveform_unlisten,
+ .vis_spectrum_listen = _viz_spectrum_listen_stub,
+ .vis_spectrum_listen2 = viz_spectrum_listen,
+ .vis_spectrum_unlisten = viz_spectrum_unlisten,
+ .audio_set_mute = audio_set_mute,
+ .audio_is_mute = audio_is_mute,
+ .background_job_increment = background_job_increment,
+ .background_job_decrement = background_job_decrement,
+ .have_background_jobs = have_background_jobs,
+ .plt_get_idx = (int (*)(ddb_playlist_t *))plt_get_idx,
+ .plt_save_n = plt_save_n,
+ .plt_save_config = (int (*)(ddb_playlist_t *))plt_save_config,
+ .listen_file_added = listen_file_added,
+ .unlisten_file_added = unlisten_file_added,
+ .listen_file_add_beginend = listen_file_add_beginend,
+ .unlisten_file_add_beginend = unlisten_file_add_beginend,
+ .plt_load2 = (DB_playItem_t * (*) (int visibility, ddb_playlist_t *plt, ddb_playItem_t *after, const char *fname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data))plt_load2,
+ .plt_add_file2 = (int (*) (int visibility, ddb_playlist_t *plt, const char *fname, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data))plt_add_file2,
+ .plt_add_dir2 = (int (*) (int visibility, ddb_playlist_t *plt, const char *dirname, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data))plt_add_dir2,
+ .plt_insert_file2 = (ddb_playItem_t * (*) (int visibility, ddb_playlist_t *playlist, ddb_playItem_t *after, const char *fname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data))plt_insert_file2,
+ .plt_insert_dir2 = (ddb_playItem_t *(*) (int visibility, ddb_playlist_t *plt, ddb_playItem_t *after, const char *dirname, int *pabort, int (*callback)(DB_playItem_t *it, void *user_data), void *user_data))plt_insert_dir2,
+ .plt_add_files_begin = (int (*) (ddb_playlist_t *plt, int visibility))plt_add_files_begin,
+ .plt_add_files_end = (void (*) (ddb_playlist_t *plt, int visibility))plt_add_files_end,
+ .plt_deselect_all = (void (*) (ddb_playlist_t *plt))plt_deselect_all,
+ // ******* new 1.6 APIs ********
+ .plt_set_scroll = (void (*) (ddb_playlist_t *plt, int scroll))plt_set_scroll,
+ .plt_get_scroll = (int (*) (ddb_playlist_t *plt))plt_get_scroll,
+ .tf_compile = tf_compile,
+ .tf_free = tf_free,
+ .tf_eval= tf_eval,
+
+ .plt_sort_v2 = (void (*) (ddb_playlist_t *plt, int iter, int id, const char *format, int order))plt_sort_v2,
+
+ .playqueue_push = (int (*) (DB_playItem_t *))playqueue_push,
+ .playqueue_clear = playqueue_clear,
+ .playqueue_pop = playqueue_pop,
+ .playqueue_remove = (void (*) (DB_playItem_t *))playqueue_remove,
+ .playqueue_test = (int (*) (DB_playItem_t *))playqueue_test,
+ .playqueue_get_count = (int (*) (void))playqueue_getcount,
+ .playqueue_get_item = (DB_playItem_t *(*) (int n))playqueue_get_item,
+ .playqueue_remove_nth = (int (*) (int n))playqueue_remove_nth,
+ .playqueue_insert_at = (void (*) (int n, DB_playItem_t *it))playqueue_insert_at,
+
+ .get_system_dir = plug_get_system_dir,
+
+ .action_set_playlist = action_set_playlist,
+ .action_get_playlist = action_get_playlist,
+
+ .tf_import_legacy = tf_import_legacy,
+
+ .plt_search_process2 = (void (*) (ddb_playlist_t *plt, const char *text, int select_results))plt_search_process2,
+ .plt_process_cue = (DB_playItem_t * (*) (ddb_playlist_t *plt, DB_playItem_t *after, DB_playItem_t *it, uint64_t numsamples, int samplerate))plt_process_cue,
+ .pl_meta_for_key = (DB_metaInfo_t * (*) (DB_playItem_t *it, const char *key))pl_meta_for_key,
+
+ .log_detailed = ddb_log_detailed,
+ .vlog_detailed = ddb_vlog_detailed,
+ .log = ddb_log,
+ .vlog = ddb_vlog,
+
+ .log_viewer_register = ddb_log_viewer_register,
+ .log_viewer_unregister = ddb_log_viewer_unregister,
+
+ .register_fileadd_filter = register_fileadd_filter,
+ .unregister_fileadd_filter = unregister_fileadd_filter,
+
+ .metacache_get_string = metacache_get_string,
+ .metacache_add_value = metacache_add_value,
+ .metacache_get_value = metacache_get_value,
+ .metacache_remove_value = metacache_remove_value,
+
+ .replaygain_apply = replaygain_apply,
+ .replaygain_apply_with_settings = replaygain_apply_with_settings,
+ .replaygain_init_settings = (void (*) (ddb_replaygain_settings_t *settings, DB_playItem_t *it))replaygain_init_settings,
+
+ .sort_track_array = (void (*) (ddb_playlist_t *playlist, DB_playItem_t **tracks, int num_tracks, const char *format, int order))sort_track_array,
+
+ .pl_item_init = (DB_playItem_t *(*)(const char *fname))pl_item_init,
+
+ .pl_item_get_startsample = (int64_t (*) (DB_playItem_t *it))pl_item_get_startsample,
+ .pl_item_get_endsample = (int64_t (*) (DB_playItem_t *it))pl_item_get_endsample,
+ .pl_item_set_startsample = (void (*) (DB_playItem_t *it, int64_t sample))pl_item_set_startsample,
+ .pl_item_set_endsample = (void (*) (DB_playItem_t *it, int64_t sample))pl_item_set_endsample,
+
+ .plt_get_selection_playback_time = (float (*) (ddb_playlist_t *plt))plt_get_selection_playback_time,
+
+ .junk_get_tail_size = junk_get_tail_size,
+ .junk_get_tag_offsets = junk_get_tag_offsets,
+
+ .plt_is_loading_cue = (int (*)(ddb_playlist_t *))plt_is_loading_cue,
+
+ .streamer_set_shuffle = streamer_set_shuffle,
+ .streamer_get_shuffle = streamer_get_shuffle,
+ .streamer_set_repeat = streamer_set_repeat,
+ .streamer_get_repeat = streamer_get_repeat,
+
+ .pl_meta_for_key_with_override = (DB_metaInfo_t *(*) (ddb_playItem_t *it, const char *key))pl_meta_for_key_with_override,
+ .pl_find_meta_with_override = (const char *(*) (ddb_playItem_t *it, const char *key))pl_find_meta_with_override,
+ .pl_get_meta_with_override = (int (*) (ddb_playItem_t *it, const char *key, char *val, size_t size))pl_get_meta_with_override,
+ .pl_meta_exists_with_override = (int (*) (ddb_playItem_t *it, const char *key))pl_meta_exists_with_override,
+
+ .plt_item_set_selected = (void (*)(ddb_playlist_t *plt, ddb_playItem_t *it, int sel))pl_set_selected_in_playlist,
+ .plt_find_by_name = (ddb_playlist_t * (*) (const char *name))plt_find_by_name,
+ .plt_append = (ddb_playlist_t * (*) (const char *title))plt_append,
+
+ .plt_get_head_item = (ddb_playItem_t * (*) (ddb_playlist_t *p, int iter))plt_get_head_item,
+ .plt_get_tail_item = (ddb_playItem_t * (*) (ddb_playlist_t *p, int iter))plt_get_tail_item,
+
+ .plug_get_path_for_plugin_ptr = (const char* (*) (DB_plugin_t *plugin_ptr))plug_get_path_for_plugin_ptr,
+ .plt_insert_dir3 = (ddb_playItem_t *(*) (int visibility, uint32_t flags, ddb_playlist_t *plt, ddb_playItem_t *after, const char *dirname, int *pabort, int (*callback)(ddb_insert_file_result_t result, const char *fname, void *user_data), void *user_data))plt_insert_dir3,
+
+ .streamer_get_playing_track_safe = (DB_playItem_t *(*) (void))streamer_get_playing_track,
+};
+
+DB_functions_t *deadbeef = &deadbeef_api;
+
+const char *
+plug_get_config_dir (void) {
+ return dbconfdir;
+}
+
+const char *
+plug_get_prefix (void) {
+ return dbinstalldir;
+}
+
+const char *
+plug_get_doc_dir (void) {
+ return dbdocdir;
+}
+
+const char *
+plug_get_plugin_dir (void) {
+ return dbplugindir;
+}
+
+const char *
+plug_get_pixmap_dir (void) {
+ return dbpixmapdir;
+}
+
+const char *
+plug_get_system_dir (int dir_id) {
+ switch (dir_id) {
+ case DDB_SYS_DIR_CONFIG:
+ return dbconfdir;
+ case DDB_SYS_DIR_PREFIX:
+ return dbinstalldir;
+ case DDB_SYS_DIR_DOC:
+ return dbdocdir;
+ case DDB_SYS_DIR_PLUGIN:
+ return dbplugindir;
+ case DDB_SYS_DIR_PIXMAP:
+ return dbpixmapdir;
+ case DDB_SYS_DIR_CACHE:
+ return dbcachedir;
+ case DDB_SYS_DIR_PLUGIN_RESOURCES:
+ return dbresourcedir;
+ }
+ return NULL;
+}
+
+void
+plug_volume_set_db (float db) {
+ volume_set_db (db);
+ messagepump_push (DB_EV_VOLUMECHANGED, 0, 0, 0);
+}
+
+void
+plug_volume_set_amp (float amp) {
+ volume_set_amp (amp);
+ messagepump_push (DB_EV_VOLUMECHANGED, 0, 0, 0);
+}
+
+void
+plug_md5 (uint8_t sig16, const char *in, int len) {
+ md5_state_t st;
+ md5_init (&st);
+ md5_append (&st, in, len);
+ md5_finish (&st, sig);
+}
+
+void
+plug_md5_to_str (char *str, const uint8_t sig16) {
+ int i = 0;
+ static const char hex = "0123456789abcdef";
+ for (i = 0; i < 16; i++) {
+ *str++ = hex(sigi&0xf0)>>4;
+ *str++ = hexsigi&0xf;
+ }
+ *str = 0;
+}
+
+float
+plug_playback_get_pos (void) {
+ playItem_t *trk = streamer_get_playing_track ();
+ float dur = trk ? pl_get_item_duration (trk) : -1;
+ if (!trk || dur <= 0) {
+ if (trk) {
+ pl_item_unref (trk);
+ }
+ return 0;
+ }
+ if (trk) {
+ pl_item_unref (trk);
+ }
+ return streamer_get_playpos () * 100 / dur;
+}
+
+void
+plug_playback_set_pos (float pos) {
+ playItem_t *trk = streamer_get_playing_track ();
+ float dur = trk ? pl_get_item_duration (trk) : -1;
+ if (!trk || dur <= 0) {
+ if (trk) {
+ pl_item_unref (trk);
+ }
+ return;
+ }
+ float t = pos * dur / 100.f;
+ if (trk) {
+ pl_item_unref (trk);
+ }
+ streamer_set_seek (t);
+}
+
+int
+plug_init_plugin (DB_plugin_t* (*loadfunc)(DB_functions_t *), void *handle) {
+ DB_plugin_t *plugin_api = loadfunc (&deadbeef_api);
+ if (!plugin_api) {
+ return -1;
+ }
+
+ // check if same plugin with the same or bigger version is loaded already
+ plugin_t *prev = NULL;
+ for (plugin_t *p = plugins; p; prev = p, p = p->next) {
+ int same_id = p->plugin->id && plugin_api->id && !strcmp (p->plugin->id, plugin_api->id);
+ int same_name = (!p->plugin->id || !plugin_api->id) && p->plugin->name && plugin_api->name && !strcmp (p->plugin->name, plugin_api->name);
+ if (same_id || same_name) {
+ if (plugin_api->version_major > p->plugin->version_major || (plugin_api->version_major == p->plugin->version_major && plugin_api->version_minor > p->plugin->version_minor)) {
+ trace_err ("found newer version of plugin \"%s\" (%s), replacing\n", plugin_api->id, plugin_api->name);
+ // unload older plugin before replacing
+ dlclose (p->handle);
+ if (prev) {
+ prev->next = p->next;
+ }
+ else {
+ plugins = p->next;
+ }
+ if (p->handle) {
+ dlclose (p->handle);
+ }
+ free (p);
+ break;
+ }
+ else {
+ trace_err ("found copy of plugin \"%s\" (%s), but newer version is already loaded\n", plugin_api->id, plugin_api->name)
+ return -1;
+ }
+ }
+ }
+
+#if !DISABLE_VERSIONCHECK
+ if (plugin_api->api_vmajor != 0 || plugin_api->api_vminor != 0) {
+ // version check enabled
+ if (DB_API_VERSION_MAJOR != 9 || DB_API_VERSION_MINOR != 9) {
+ if (plugin_api->api_vmajor != DB_API_VERSION_MAJOR || plugin_api->api_vminor > DB_API_VERSION_MINOR) {
+ trace_err ("WARNING: plugin \"%s\" wants API v%d.%d (got %d.%d), will not be loaded\n", plugin_api->name, plugin_api->api_vmajor, plugin_api->api_vminor, DB_API_VERSION_MAJOR, DB_API_VERSION_MINOR);
+ return -1;
+ }
+ }
+ }
+ else {
+ trace_err ("WARNING: plugin \"%s\" has disabled version check. please don't distribute it!\n", plugin_api->name);
+ }
+#endif
+
+ plugin_t *plug = malloc (sizeof (plugin_t));
+ memset (plug, 0, sizeof (plugin_t));
+ plug->plugin = plugin_api;
+ plug->handle = handle;
+
+ int lowprio = 0;
+ for (int n = 0; lowprio_plugin_idsn; n++) {
+ if (plugin_api->id && !strcmp (lowprio_plugin_idsn, plugin_api->id)) {
+ lowprio = 1;
+ break;
+ }
+ }
+
+ if (lowprio) {
+ if (plugins_lowprio_tail) {
+ plugins_lowprio_tail->next = plug;
+ plugins_lowprio_tail = plug;
+ }
+ else {
+ plugins_lowprio = plugins_lowprio_tail = plug;
+ }
+ }
+ else {
+ if (plugins_tail) {
+ plugins_tail->next = plug;
+ plugins_tail = plug;
+ }
+ else {
+ plugins = plugins_tail = plug;
+ }
+ }
+
+ return 0;
+}
+
+static int dirent_alphasort (const struct dirent **a, const struct dirent **b) {
+ return strcmp ((*a)->d_name, (*b)->d_name);
+}
+
+void
+plug_remove_plugin (void *p) {
+ int i;
+ for (i = 0; g_pluginsi; i++) {
+ if (g_pluginsi == p) {
+ memmove (&g_pluginsi, &g_pluginsi+1, (MAX_PLUGINS+1-i-1) * sizeof (void*));
+ }
+ }
+ for (i = 0; g_decoder_pluginsi; i++) {
+ if (g_decoder_pluginsi == p) {
+ memmove (&g_decoder_pluginsi, &g_decoder_pluginsi+1, (MAX_DECODER_PLUGINS+1-i-1) * sizeof (void*));
+ break;
+ }
+ }
+ for (i = 0; g_vfs_pluginsi; i++) {
+ if (g_vfs_pluginsi == p) {
+ memmove (&g_vfs_pluginsi, &g_vfs_pluginsi+1, (MAX_VFS_PLUGINS+1-i-1) * sizeof (void*));
+ break;
+ }
+ }
+ for (i = 0; g_dsp_pluginsi; i++) {
+ if (g_dsp_pluginsi == p) {
+ memmove (&g_dsp_pluginsi, &g_dsp_pluginsi+1, (MAX_DSP_PLUGINS+1-i-1) * sizeof (void*));
+ break;
+ }
+ }
+ for (i = 0; g_output_pluginsi; i++) {
+ if (g_output_pluginsi == p) {
+ memmove (&g_output_pluginsi, &g_output_pluginsi+1, (MAX_OUTPUT_PLUGINS+1-i-1) * sizeof (void*));
+ break;
+ }
+ }
+ for (i = 0; g_playlist_pluginsi; i++) {
+ if (g_playlist_pluginsi == p) {
+ memmove (&g_playlist_pluginsi, &g_playlist_pluginsi+1, (MAX_PLAYLIST_PLUGINS+1-i-1) * sizeof (void*));
+ break;
+ }
+ }
+}
+
+// d_name must be writable w/o sideeffects; contain valid .so name
+// l must be strlen(d_name)
+static int
+load_plugin (const char *plugdir, char *d_name, int l) {
+ // hack for osx to skip *.0.so files
+ if (strstr (d_name, ".0.so")) {
+ return -1;
+ }
+
+ char fullnamePATH_MAX;
+ snprintf (fullname, PATH_MAX, "%s/%s", plugdir, d_name);
+
+ // check if the file exists, to avoid printing bogus errors
+ struct stat s;
+ if (0 != stat (fullname, &s)) {
+ return -1;
+ }
+
+ trace ("loading plugin %s/%s\n", plugdir, d_name);
+ void *handle = dlopen (fullname, RTLD_NOW);
+ if (!handle) {
+ trace ("dlopen error: %s\n", dlerror ());
+#if defined(ANDROID) || defined(OSX_APPBUNDLE)
+ return -1;
+#else
+ strcpy (fullname + strlen(fullname) - sizeof (PLUGINEXT)+1, ".fallback.so");
+ trace ("trying %s...\n", fullname);
+ handle = dlopen (fullname, RTLD_NOW);
+ if (!handle) {
+ //trace ("dlopen error: %s\n", dlerror ());
+ return -1;
+ }
+ else {
+ trace ("successfully started fallback plugin %s\n", fullname);
+ }
+#endif
+ }
+ d_namel-sizeof (PLUGINEXT)+1 = 0;
+ strcat (d_name, "_load");
+#ifndef ANDROID
+ DB_plugin_t *(*plug_load)(DB_functions_t *api) = dlsym (handle, d_name);
+#else
+ DB_plugin_t *(*plug_load)(DB_functions_t *api) = dlsym (handle, d_name+3);
+#endif
+ if (!plug_load) {
+ int android = 0;
+#ifdef ANDROID
+ android = 1;
+#endif
+ dlclose (handle);
+ // don't error after failing to load plugins starting with "lib",
+ // e.g. attempting to load a plugin from "libmp4ff.so",
+ // except android, where all plugins have lib prefix
+ if (android || strlen (d_name) < 3 || memcmp (d_name, "lib", 3)) {
+ trace ("dlsym error: %s (%s)\n", dlerror (), d_name + 3);
+ return -1;
+ }
+ return 0;
+ }
+ if (plug_init_plugin (plug_load, handle) < 0) {
+ d_namel-sizeof (PLUGINEXT)+1 = 0;
+ dlclose (handle);
+ return -1;
+ }
+ plugins_tail->filepath = strdup (fullname);
+ return 0;
+}
+
+static int
+load_gui_plugin (const char **plugdirs) {
+#if defined HAVE_COCOAUI || defined HAVE_XGUI
+ return 0;
+#else
+
+ char conf_gui_plug100;
+ conf_get_str ("gui_plugin", "GTK2", conf_gui_plug, sizeof (conf_gui_plug));
+ char name100;
+
+ // try to load selected plugin
+ for (int i = 0; g_gui_namesi; i++) {
+ trace ("checking GUI plugin: %s\n", g_gui_namesi);
+ if (!strcmp (g_gui_namesi, conf_gui_plug)) {
+ trace ("found selected GUI plugin: %s\n", g_gui_namesi);
+ for (int n = 0; plugdirsn; n++) {
+ snprintf (name, sizeof (name), "ddb_gui_%s" PLUGINEXT, conf_gui_plug);
+ if (!load_plugin (plugdirsn, name, (int)strlen (name))) {
+ return 0;
+ }
+ }
+ break;
+ }
+ }
+ trace ("selected GUI plugin not found or failed to load, trying to find another GUI plugin\n");
+
+ // try any plugin
+ for (int i = 0; g_gui_namesi; i++) {
+ for (int n = 0; plugdirsn; n++) {
+ snprintf (name, sizeof (name), "ddb_gui_%s" PLUGINEXT, g_gui_namesi);
+ if (!load_plugin (plugdirsn, name, (int)strlen (name))) {
+ return 0;
+ }
+ else {
+ trace ("the plugin not found or failed to load\n");
+ }
+ }
+ }
+ return -1;
+#endif
+}
+
+static int
+load_plugin_dir (const char *plugdir, int gui_scan) {
+ int n = 0;
+ char conf_blacklist_plugins1000;
+ conf_get_str ("blacklist_plugins", "", conf_blacklist_plugins, sizeof (conf_blacklist_plugins));
+ if (gui_scan) {
+ trace ("searching for GUI plugins in %s\n", plugdir);
+ }
+ else {
+ trace ("loading plugins from %s\n", plugdir);
+ }
+ struct dirent **namelist = NULL;
+ n = scandir (plugdir, &namelist, NULL, dirent_alphasort);
+ if (n < 0)
+ {
+ if (namelist) {
+ free (namelist);
+ }
+ return 0;
+ }
+ else
+ {
+ trace ("load_plugin_dir %s: scandir found %d files\n", plugdir, n);
+ int i;
+ for (i = 0; i < n; i++)
+ {
+ // skip hidden files and fallback plugins
+ while (namelisti->d_name0 != '.'
+#if !defined(ANDROID) && !defined(OSX_APPBUNDLE)
+ && !strstr (namelisti->d_name, ".fallback.")
+#elif !defined(ANDROID)
+ && !strstr (namelisti->d_name, "libdeadbeef")
+#endif
+ )
+ {
+ size_t l = strlen (namelisti->d_name);
+ if (l < (sizeof(PLUGINEXT)-1)) {
+ break;
+ }
+ if (strcasecmp (namelisti->d_name + l - sizeof(PLUGINEXT) + 1, PLUGINEXT)) {
+ break;
+ }
+ char d_name256;
+ memcpy (d_name, namelisti->d_name, l+1);
+#ifndef ANDROID
+ // no blacklisted
+ const uint8_t *p = conf_blacklist_plugins;
+ while (*p) {
+ const uint8_t *e = p;
+ while (*e && *e > 0x20) {
+ e++;
+ }
+ if (l-sizeof (PLUGINEXT)+1 == (uintptr_t)(e-p)) {
+ if (!strncmp (p, d_name, e-p)) {
+ p = NULL;
+ break;
+ }
+ }
+ p = e;
+ while (*p && *p <= 0x20) {
+ p++;
+ }
+ }
+ if (!p) {
+ trace ("plugin %s is blacklisted in config file\n", d_name);
+ break;
+ }
+#endif
+
+ // add gui plugin names
+ if (!strncmp (d_name, "ddb_gui_", 8)) {
+ if (gui_scan) {
+ trace ("found gui plugin %s\n", d_name);
+ if (g_num_gui_names >= MAX_GUI_PLUGINS) {
+ trace_err ("too many gui plugins\n");
+ break; // no more gui plugins allowed
+ }
+ char *nm = d_name + 8;
+ char *e = strrchr (nm, '.');
+ if (!e) {
+ break;
+ }
+ if (strcmp (e, PLUGINEXT)) {
+ break;
+ }
+ *e = 0;
+ // ignore fallbacks
+ e = strrchr (nm, '.');
+ if (e && !strcasecmp (e, ".fallback")) {
+ break;
+ }
+ // add to list of unique names
+ size_t idx;
+ for (idx = 0; g_gui_namesidx && strcmp(g_gui_namesidx, nm); idx++);
+ if (!g_gui_namesidx) {
+ g_gui_namesidx = strdup (nm);
+ g_gui_names++g_num_gui_names = NULL;
+ trace ("added %s gui plugin\n", nm);
+ }
+ }
+ break;
+ }
+
+ if (!gui_scan) {
+ if (0 != load_plugin (plugdir, d_name, (int)l)) {
+ trace ("plugin %s not found or failed to load\n", d_name);
+ }
+ }
+ break;
+ }
+ free (namelisti);
+ }
+ free (namelist);
+ }
+ return 0;
+}
+
+int
+plug_load_all (void) {
+#if DISABLE_VERSIONCHECK
+ trace ("\0330;31mDISABLE_VERSIONCHECK=1! do not distribute!\0330;m\n");
+#endif
+
+ background_jobs_mutex = mutex_create ();
+
+ const char *dirname = plug_get_system_dir (DDB_SYS_DIR_PLUGIN);
+
+ // remember how many plugins to skip if called Nth time
+ plugin_t *prev_plugins_tail = plugins_tail;
+
+#ifdef OSX_APPBUNDLE
+ char libpathPATH_MAX;
+ int res = cocoautil_get_application_support_path (libpath, sizeof (libpath));
+ if (!res) {
+ strncat (libpath, "/Deadbeef/Plugins", sizeof (libpath) - strlen (libpath) - 1);
+ }
+ const char *plugins_dirs = { dirname, !res ? libpath : NULL, NULL };
+#else
+#ifndef ANDROID
+ char *xdg_local_home = getenv (LOCALDIR);
+ char xdg_plugin_dir1024;
+ char xdg_plugin_dir_explicit_arch1024;
+
+ if (xdg_local_home) {
+ strncpy (xdg_plugin_dir, xdg_local_home, sizeof (xdg_plugin_dir));
+ xdg_plugin_dirsizeof(xdg_plugin_dir)-1 = 0;
+ } else {
+ char *homedir = getenv (HOMEDIR);
+
+ if (!homedir) {
+ trace_err ("plug_load_all: warning: unable to find home directory\n");
+ xdg_plugin_dir0 = 0;
+ }
+ else {
+ // multilib support:
+ // 1. load from lib$ARCH if present
+ // 2. load from lib if present
+ int written = snprintf (xdg_plugin_dir, sizeof (xdg_plugin_dir), LOCAL_PLUGINS_DIR, homedir);
+ if (written > sizeof (xdg_plugin_dir)) {
+ trace_err ("warning: XDG_LOCAL_HOME value is too long: %s. Ignoring.", xdg_local_home);
+ xdg_plugin_dir0 = 0;
+ }
+#ifdef __x86_64__
+#define ARCH_BITS 64
+#elif defined(__i386__)
+#define ARCH_BITS 32
+#else
+#define ARCH_BITS (int)(sizeof (long) * 8)
+#endif
+ written = snprintf (xdg_plugin_dir_explicit_arch, sizeof (xdg_plugin_dir_explicit_arch), LOCAL_ARCH_PLUGINS_DIR, homedir, ARCH_BITS);
+ if (written > sizeof (xdg_plugin_dir_explicit_arch)) {
+ trace_err ("warning: XDG_LOCAL_HOME value is too long: %s. Ignoring.", xdg_local_home);
+ xdg_plugin_dir_explicit_arch0 = 0;
+ }
+ }
+ }
+
+ // load from HOME 1st, than replace from installdir if needed
+ const char *plugins_dirs = { xdg_plugin_dir_explicit_arch, xdg_plugin_dir, dirname, NULL };
+
+ // If xdg_plugin_dir and dirname is the same, we should avoid each plugin
+ // to be load twice.
+ // XXX: Here absolute path is assumed, however if dirname is a relative
+ // path it won't work.
+ if (strcmp(xdg_plugin_dir, dirname) == 0) {
+ plugins_dirs1 = NULL;
+ }
+#else
+ const char *plugins_dirs = { dirname, NULL };
+#endif
+#endif
+
+#ifndef ANDROID
+// this filepath is always in the android.plugin_path config var
+ int k = 0;
+#ifndef ANDROID
+ // load gui plugin before others
+ while (plugins_dirsk) {
+ const char *plugdir = plugins_dirsk++;
+ if (!(*plugdir)) {
+ continue;
+ }
+ load_plugin_dir (plugdir, 1);
+ }
+ trace ("load gui plugin\n");
+ load_gui_plugin (plugins_dirs);
+#endif
+
+ k = 0;
+ while (plugins_dirsk) {
+ const char *plugdir = plugins_dirsk++;
+ if (!(*plugdir)) {
+ continue;
+ }
+ load_plugin_dir (plugdir, 0);
+ }
+#endif
+
+#ifdef ANDROID
+ char plugin_path1000;
+ strncpy (plugin_path, conf_get_str_fast ("android.plugin_path", ""), sizeof (plugin_path)-1);
+ plugin_pathsizeof(plugin_path)-1 = 0;
+ char *p = plugin_path;
+ while (*p) {
+ while (*p == ':') {
+ p++;
+ }
+ if (!(*p)) {
+ break;
+ }
+ char *e = strchr (p, ':');
+ if (e) {
+ *e = 0;
+ }
+
+ char pathPATH_MAX;
+ snprintf (path, sizeof (path), "/data/data/%s/lib", p);
+ load_plugin_dir (path, 0);
+ if (!e) {
+ break;
+ }
+ p = e+1;
+ }
+#endif
+
+// load all compiled-in modules
+#define PLUG(n) extern DB_plugin_t * n##_load (DB_functions_t *api);
+#include "moduleconf.h"
+#undef PLUG
+#define PLUG(n) plug_init_plugin (n##_load, NULL);
+#include "moduleconf.h"
+#undef PLUG
+
+ if (plugins_lowprio) {
+ if (plugins_tail) {
+ plugins_tail->next = plugins_lowprio;
+ }
+ else {
+ plugins = plugins_tail = plugins_lowprio;
+ }
+ while (plugins_tail->next) {
+ plugins_tail = plugins_tail->next;
+ }
+ plugins_lowprio = plugins_lowprio_tail = NULL;
+ }
+
+ plugin_t *plug;
+ // categorize plugins
+ int numplugins = 0;
+ int numdecoders = 0;
+ int numvfs = 0;
+ int numoutput = 0;
+ int numdsp = 0;
+ int numplaylist = 0;
+ for (plug = plugins; plug; plug = plug->next) {
+ g_pluginsnumplugins++ = plug->plugin;
+ if (plug->plugin->type == DB_PLUGIN_DECODER) {
+// trace ("found decoder plugin %s\n", plug->plugin->name);
+ if (numdecoders >= MAX_DECODER_PLUGINS) {
+ break;
+ }
+ g_decoder_pluginsnumdecoders++ = (DB_decoder_t *)plug->plugin;
+ }
+ else if (plug->plugin->type == DB_PLUGIN_VFS) {
+// trace ("found vfs plugin %s\n", plug->plugin->name);
+ if (numvfs >= MAX_VFS_PLUGINS) {
+ break;
+ }
+ g_vfs_pluginsnumvfs++ = (DB_vfs_t *)plug->plugin;
+ }
+ else if (plug->plugin->type == DB_PLUGIN_OUTPUT) {
+// trace ("found output plugin %s\n", plug->plugin->name);
+ if (numoutput >= MAX_OUTPUT_PLUGINS) {
+ break;
+ }
+ g_output_pluginsnumoutput++ = (DB_output_t *)plug->plugin;
+ }
+ else if (plug->plugin->type == DB_PLUGIN_DSP) {
+// trace ("found dsp plugin %s\n", plug->plugin->name);
+ if (numdsp >= MAX_DSP_PLUGINS) {
+ break;
+ }
+ g_dsp_pluginsnumdsp++ = (DB_dsp_t *)plug->plugin;
+ }
+ else if (plug->plugin->type == DB_PLUGIN_PLAYLIST) {
+ if (numplaylist >= MAX_PLAYLIST_PLUGINS) {
+ break;
+ }
+ g_playlist_pluginsnumplaylist++ = (DB_playlist_t *)plug->plugin;
+ }
+ }
+ // start plugins
+ plugin_t *prev = NULL;
+ plugin_t *head = prev_plugins_tail ? prev_plugins_tail->next : plugins;
+ for (plug = head; plug;) {
+ trace ("starting plugin %s\n", plug->plugin->name);
+ if (plug->plugin->type != DB_PLUGIN_GUI && plug->plugin->start) {
+ if (plug->plugin->start () < 0) {
+ trace_err ("plugin %s failed to start, deactivated.\n", plug->plugin->name);
+ if (plug->plugin->stop) {
+ plug->plugin->stop ();
+ }
+ if (plug->handle) {
+ dlclose (plug->handle);
+ }
+ plug_remove_plugin (plug->plugin);
+ if (prev) {
+ prev->next = plug->next;
+ }
+ else {
+ plugins = plug->next;
+ }
+ plugin_t *next = plug->next;
+ free (plug);
+ plug = next;
+ continue;
+ }
+ }
+ prev = plug;
+ plug = plug->next;
+ }
+// trace ("numplugins: %d, numdecoders: %d, numvfs: %d\n", numplugins, numdecoders, numvfs);
+ g_pluginsnumplugins = NULL;
+ g_decoder_pluginsnumdecoders = NULL;
+ g_vfs_pluginsnumvfs = NULL;
+ g_output_pluginsnumoutput = NULL;
+ g_dsp_pluginsnumdsp = NULL;
+ g_playlist_pluginsnumplaylist = NULL;
+
+ // select output plugin
+#ifndef XCTEST
+ if (plug_reinit_sound () < 0) {
+ trace ("failed to find output plugin!\n");
+ return -1;
+ }
+#endif
+ return 0;
+}
+
+void
+plug_connect_all (void) {
+ plugin_t *plug;
+ plugin_t *prev = NULL;
+ for (plug = plugins; plug;) {
+ if (plug->plugin->connect) {
+ if (plug->plugin->connect () < 0) {
+ // NOTE: This message is confusing, and looks like a serious error.
+ // Potentially, it should be logged at some additional verbose log level.
+ // trace ("plugin %s failed to connect to dependencies, deactivated.\n", plug->plugin->name);
+
+ if (plug->plugin->disconnect) {
+ plug->plugin->disconnect ();
+ }
+ if (plug->plugin->type != DB_PLUGIN_GUI && plug->plugin->stop) {
+ plug->plugin->stop ();
+ }
+ if (plug->handle) {
+ dlclose (plug->handle);
+ }
+ plug_remove_plugin (plug->plugin);
+
+ if (prev) {
+ prev->next = plug->next;
+ }
+ else {
+ plugins = plug->next;
+ }
+ plugin_t *next = plug->next;
+ free (plug);
+ plug = next;
+ continue;
+ }
+ }
+ prev = plug;
+ plug = plug->next;
+ }
+
+}
+
+void
+plug_disconnect_all (void) {
+ trace ("plug_disconnect_all\n");
+ plugin_t *plug;
+ for (plug = plugins; plug;) {
+ if (plug->plugin->disconnect) {
+ if (plug->plugin->disconnect () < 0) {
+ trace ("plugin %s failed to disconnect\n", plug->plugin->name);
+ }
+ }
+ plug = plug->next;
+ }
+}
+
+static void
+_plug_unload_stop_complete (void);
+
+static int _async_stop_count = 0;
+static void (^_async_stop_completion_block)(void);
+
+static void
+_handle_async_stop (void) {
+ _async_stop_count -= 1;
+ if (_async_stop_count == 0) {
+ _plug_unload_stop_complete();
+ }
+}
+
+static void
+_plug_unload_stop_complete (void) {
+ // Stop the normal plugins with synchronous stop
+ for (plugin_t *p = plugins; p; p = p->next) {
+ if (p->plugin->stop && !(p->plugin->flags & DDB_PLUGIN_FLAG_ASYNC_STOP)) {
+ trace ("Stopping %s...\n", p->plugin->name);
+ fflush (stderr);
+#if HAVE_COCOAUI
+ if (p->plugin->type == DB_PLUGIN_GUI) {
+ continue;
+ }
+#endif
+ p->plugin->stop ();
+ }
+ }
+
+ while (plugins) {
+ plugin_t *next = plugins->next;
+ if (plugins->handle) {
+ dlclose (plugins->handle);
+ }
+ free (plugins->filepath);
+ free (plugins);
+ plugins = next;
+ }
+ for (int i = 0; g_gui_namesi; i++) {
+ free (g_gui_namesi);
+ g_gui_namesi = NULL;
+ }
+ plugins_tail = NULL;
+
+ memset (g_plugins, 0, sizeof (g_plugins));
+ memset (g_gui_names, 0, sizeof (g_gui_names));
+ g_num_gui_names = 0;
+ memset (g_decoder_plugins, 0, sizeof (g_decoder_plugins));
+ memset (g_vfs_plugins, 0, sizeof (g_vfs_plugins));
+ memset (g_dsp_plugins, 0, sizeof (g_dsp_plugins));
+ memset (g_output_plugins, 0, sizeof (g_output_plugins));
+ output_plugin = NULL;
+ memset (g_playlist_plugins, 0, sizeof (g_playlist_plugins));
+
+ trace ("All plugins had been unloaded\n");
+ if (background_jobs_mutex) {
+ mutex_free (background_jobs_mutex);
+ background_jobs_mutex = 0;
+ }
+ _async_stop_completion_block();
+ Block_release(_async_stop_completion_block);
+ _async_stop_completion_block = NULL;
+}
+
+void
+plug_unload_all (void(^completion_block)(void)) {
+ _async_stop_completion_block = Block_copy(completion_block);
+ action_set_playlist (NULL);
+ trace ("plug_unload_all\n");
+ trace ("Waiting for async plugins to finish...\n");
+ _async_stop_count = 1;
+ for (plugin_t *p = plugins; p; p = p->next) {
+ if ((p->plugin->flags & DDB_PLUGIN_FLAG_ASYNC_STOP) && p->plugin->command) {
+ _async_stop_count += 1;
+ if (0 > p->plugin->command(DDB_COMMAND_PLUGIN_ASYNC_STOP, ^{
+ trace ("Stopped %s...\n", p->plugin->name);
+ _handle_async_stop();
+ })) {
+ _async_stop_count -= 1;
+ }
+ }
+ }
+ _handle_async_stop();
+}
+
+void
+plug_cleanup (void) {
+ plug_free_decoder_ids ();
+}
+
+struct DB_decoder_s **
+plug_get_decoder_list (void) {
+ return g_decoder_plugins;
+}
+
+struct DB_vfs_s **
+plug_get_vfs_list (void) {
+ return g_vfs_plugins;
+}
+
+struct DB_output_s **
+plug_get_output_list (void) {
+ return g_output_plugins;
+}
+
+struct DB_dsp_s **
+plug_get_dsp_list (void) {
+ return g_dsp_plugins;
+}
+
+struct DB_playlist_s **
+plug_get_playlist_list (void) {
+ return g_playlist_plugins;
+}
+
+struct DB_plugin_s **
+plug_get_list (void) {
+ return g_plugins;
+}
+
+const char **
+plug_get_gui_names (void) {
+ return (const char **)g_gui_names;
+}
+
+#pragma mark - Output proxy
+
+// A proxy output plugin which helps to catch output state changes and convert them to events.
+
+static ddb_playback_state_t _curr_playback_state = (ddb_playback_state_t)-1;
+
+static void
+call_notify_state_change(void (^block)(void)) {
+ block();
+ ddb_playback_state_t state = output_plugin->state();
+ if (state != _curr_playback_state) {
+ _curr_playback_state = state;
+ deadbeef->sendmessage(DB_EV_PLAYBACK_STATE_DID_CHANGE, 0, state, 0);
+ }
+}
+
+static int _out_init (void) {
+ return output_plugin->init();
+}
+
+static int _out_free (void) {
+ return output_plugin->free();
+}
+
+static int _out_setformat (ddb_waveformat_t *fmt) {
+ __block ddb_playback_state_t result;
+ call_notify_state_change(^{
+ result = output_plugin->setformat(fmt);
+ });
+ return result;
+}
+
+static int _out_play (void) {
+ __block ddb_playback_state_t result;
+ call_notify_state_change(^{
+ result = output_plugin->play();
+ });
+ return result;
+}
+
+static int _out_stop (void) {
+ __block ddb_playback_state_t result;
+ call_notify_state_change(^{
+ result = output_plugin->stop();
+ });
+ return result;
+}
+
+static int _out_pause (void) {
+ __block ddb_playback_state_t result;
+ call_notify_state_change(^{
+ result = output_plugin->pause();
+ });
+ return result;
+}
+
+static int _out_unpause (void) {
+ __block ddb_playback_state_t result;
+ call_notify_state_change(^{
+ result = output_plugin->unpause();
+ });
+ return result;
+}
+
+static ddb_playback_state_t _out_state (void) {
+ __block ddb_playback_state_t result;
+ call_notify_state_change(^{
+ result = output_plugin->state();
+ });
+ return result;
+}
+
+static void _out_enum_soundcards (void (*callback)(const char *name, const char *desc, void*), void *userdata) {
+ if (output_plugin->enum_soundcards) {
+ call_notify_state_change(^{
+ output_plugin->enum_soundcards(callback, userdata);
+ });
+ }
+}
+
+static DB_output_t _output_proxy = {
+ DDB_PLUGIN_SET_API_VERSION
+ .init = _out_init,
+ .free = _out_free,
+ .setformat = _out_setformat,
+ .play = _out_play,
+ .stop = _out_stop,
+ .pause = _out_pause,
+ .unpause = _out_unpause,
+ .state = _out_state,
+ .enum_soundcards = _out_enum_soundcards
+};
+
+#pragma mark - Current output plugin
+
+DB_output_t *
+plug_get_output (void) {
+ if (output_plugin == NULL) {
+ return NULL;
+ }
+ memcpy (&_output_proxy.plugin, &output_plugin->plugin, sizeof (DB_plugin_t));
+ memcpy (&_output_proxy.fmt, &output_plugin->fmt, sizeof (ddb_waveformat_t));
+ _output_proxy.has_volume = output_plugin->has_volume;
+ return &_output_proxy;
+}
+
+void
+plug_set_output (DB_output_t *out) {
+ call_notify_state_change(^{
+ output_plugin = out;
+ conf_set_str ("output_plugin", output_plugin->plugin.id);
+ trace ("selected output plugin: %s\n", output_plugin->plugin.name);
+ });
+}
+
+static DB_output_t *
+_select_output_plugin (void) {
+#ifndef ANDROID
+ char outplugname100;
+#ifdef OSX_APPBUNDLE
+ conf_get_str ("output_plugin", "coreaudio", outplugname, sizeof (outplugname));
+#else
+ conf_get_str ("output_plugin", "alsa", outplugname, sizeof (outplugname));
+#endif
+ for (int i = 0; g_output_pluginsi; i++) {
+ DB_output_t *p = g_output_pluginsi;
+ if (!strcmp (p->plugin.id, outplugname)
+ || !strcmp (p->plugin.name, outplugname)) {
+ return p;
+ }
+ }
+#endif
+ return g_output_plugins0;
+}
+
+int
+plug_reinit_sound (void) {
+ DB_output_t *new_out = _select_output_plugin ();
+ if (!new_out) {
+ return -1;
+ }
+
+ streamer_set_output (new_out);
+ return 0;
+}
+
+#pragma mark -
+
+// list of all unique decoder ids used in current session
+static char *decoder_idsMAX_DECODER_PLUGINS;
+
+const char *
+plug_get_decoder_id (const char *id) {
+ int i;
+ char **lastnull = NULL;
+ for (i = 0; i < MAX_DECODER_PLUGINS; i++) {
+ if (decoder_idsi && !strcmp (id, decoder_idsi)) {
+ return decoder_idsi;
+ }
+ else if (!lastnull && !decoder_idsi) {
+ lastnull = &decoder_idsi;
+ }
+ }
+ if (!lastnull) {
+ return NULL;
+ }
+ char *newid = strdup (id);
+ *lastnull = newid;
+ return newid;
+}
+
+void
+plug_remove_decoder_id (const char *id) {
+ int i;
+ for (i = 0; i < MAX_DECODER_PLUGINS; i++) {
+ if (decoder_idsi && !strcmp (decoder_idsi, id)) {
+ free (decoder_idsi);
+ decoder_idsi = NULL;
+ }
+ }
+}
+
+void
+plug_free_decoder_ids (void) {
+ int i;
+ for (i = 0; i < MAX_DECODER_PLUGINS; i++) {
+ if (decoder_idsi) {
+ free (decoder_idsi);
+ decoder_idsi = NULL;
+ }
+ }
+}
+
+DB_decoder_t *
+plug_get_decoder_for_id (const char *id) {
+ if (!id) {
+ return NULL;
+ }
+ DB_decoder_t **decoder_plugins = plug_get_decoder_list ();
+ for (int c = 0; decoder_pluginsc; c++) {
+ if (!strcmp (id, decoder_pluginsc->plugin.id)) {
+ return decoder_pluginsc;
+ }
+ }
+ return NULL;
+}
+
+DB_plugin_t *
+plug_get_for_id (const char *id) {
+ DB_plugin_t **all_plugins = plug_get_list ();
+ for (int c = 0; all_pluginsc; c++) {
+ if (all_pluginsc->id && !strcmp (id, all_pluginsc->id)) {
+ return all_pluginsc;
+ }
+ }
+ return NULL;
+}
+
+const char *
+plug_get_path_for_plugin_ptr (DB_plugin_t *plugin_ptr) {
+ plugin_t *p;
+ for (p = plugins; p; p = p->next) {
+ if (p->plugin == plugin_ptr) {
+ return p->filepath;
+ }
+ }
+ return NULL;
+}
+
+int
+plug_is_local_file (const char *fname) {
+ if (!strncasecmp (fname, "file://", 7)) {
+ return 1;
+ }
+
+ const char *f = fname;
+ for (; *f; f++) {
+ if (*f != ':' && !isalpha (*f)) {
+ break;
+ }
+ if (!strncmp (f, "://", 3)) {
+ DB_vfs_t **plug = plug_get_vfs_list ();
+ for (int i = 0; plugi; i++) {
+ if (plugi->get_schemes && plugi->is_streaming && plugi->is_streaming()) {
+ const char **sch = plugi->get_schemes ();
+ for (int k = 0; schk; k++) {
+ if (!strncmp (schk, fname, strlen (schk))) {
+ return 0;
+ }
+ }
+ }
+ }
+ break;
+ }
+ }
+
+ return 1;
+}
+
+static int is_url (const char *path_or_url) {
+ const char *f = path_or_url;
+ for (; *f; f++) {
+ if (*f != ':' && !isalpha (*f)) {
+ break; // not a URL
+ }
+ if (!strncmp (f, "://", 3)) {
+ return 1; // some URL
+ }
+ }
+ return 0;
+}
+
+int
+is_relative_path_posix (const char *path_or_url) {
+ // file url?
+ if (!strncasecmp (path_or_url, "file://", 7)) {
+ path_or_url += 7;
+ }
+
+ // other url?
+ if (is_url (path_or_url)) {
+ return 0;
+ }
+
+ // path starts with a '/'?
+ return *path_or_url != '/';
+}
+
+int
+is_relative_path_win32 (const char *path_or_url) {
+ // file url?
+ if (!strncasecmp (path_or_url, "file://", 7)) {
+ path_or_url += 7;
+ }
+ else {
+ // other url?
+ if (is_url (path_or_url)) {
+ return 0;
+ }
+ }
+
+ // absolute paths start with "C:\" (or any other letter)
+ // UNC paths can also be absolute (starting with "\\")
+ // NOTE: this test won't cover \\? relative path and absolute path starting with "\"
+ if (strlen (path_or_url) >= 3) {
+ if (isalpha(path_or_url0) && path_or_url1 == ':' && (path_or_url2 == '\\' || path_or_url2 == '/')) {
+ return 0;
+ }
+ else if ((path_or_url0 == '\\' && path_or_url1 == '\\') || (path_or_url0 == '/' && path_or_url1 == '/')) {
+ return 0;
+ }
+ }
+ return 1;
+}
+
+#ifndef _WIN32
+int
+is_relative_path (const char *path_or_url) {
+ return is_relative_path_posix (path_or_url);
+}
+#else
+int
+is_relative_path (const char *path_or_url) {
+ return is_relative_path_win32 (path_or_url);
+}
+#endif
+
+void
+background_job_increment (void) {
+ mutex_lock (background_jobs_mutex);
+ num_background_jobs++;
+ mutex_unlock (background_jobs_mutex);
+}
+
+void
+background_job_decrement (void) {
+ mutex_lock (background_jobs_mutex);
+ num_background_jobs--;
+ mutex_unlock (background_jobs_mutex);
+}
+
+int
+have_background_jobs (void) {
+ return num_background_jobs;
+}
+
+static ddb_playlist_t *action_playlist;
+
+void
+action_set_playlist (ddb_playlist_t *plt) {
+ if (action_playlist) {
+ plt_unref ((playlist_t *)action_playlist);
+ }
+ action_playlist = plt;
+ if (action_playlist) {
+ plt_ref ((playlist_t *)action_playlist);
+ }
+}
+
+ddb_playlist_t *
+action_get_playlist (void) {
+ if (!action_playlist) {
+ return (ddb_playlist_t *)plt_get_curr ();
+ }
+
+ plt_ref ((playlist_t *)action_playlist);
+ return action_playlist;
+}
+
+// for tests
+void
+plug_register_in (DB_plugin_t *inplug) {
+ int i;
+ for (i = 0; g_pluginsi; i++);
+ g_pluginsi++ = inplug;
+ g_pluginsi = NULL;
+
+ for (i = 0; g_decoder_pluginsi; i++);
+ g_decoder_pluginsi++ = (DB_decoder_t *)inplug;
+ g_decoder_pluginsi = NULL;
+}
+
+// for tests
+void
+plug_register_out (DB_plugin_t *outplug) {
+ int i;
+ for (i = 0; g_pluginsi; i++);
+ g_pluginsi++ = outplug;
+ g_pluginsi = NULL;
+
+ for (i = 0; g_output_pluginsi; i++);
+ g_output_pluginsi++ = (DB_output_t *)outplug;
+ g_output_pluginsi = NULL;
+}
+
+// for tests
+DB_functions_t *
+plug_get_api (void) {
+ return &deadbeef_api;
+}
+

deadbeef-1.9.6.tar.bz2/src/plugins.h Added

@@ -0,0 +1,183 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ plugin management
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __PLUGINS_H
+#define __PLUGINS_H
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern DB_functions_t *deadbeef;
+
+struct playItem_s;
+
+int
+plug_load_all (void);
+
+void
+plug_unload_all (void(^completion_block)(void));
+
+void
+plug_connect_all (void);
+
+void
+plug_disconnect_all (void);
+
+void
+plug_cleanup (void);
+
+void
+plug_md5 (uint8_t sig16, const char *in, int len);
+
+void
+plug_md5_to_str (char *str, const uint8_t sig16);
+
+float
+plug_playback_get_pos (void);
+
+void
+plug_playback_set_pos (float pos);
+
+struct DB_plugin_s **
+plug_get_list (void);
+
+struct DB_decoder_s **
+plug_get_decoder_list (void);
+
+struct DB_output_s **
+plug_get_output_list (void);
+
+struct DB_vfs_s **
+plug_get_vfs_list (void);
+
+struct DB_dsp_s **
+plug_get_dsp_list (void);
+
+struct DB_playlist_s **
+plug_get_playlist_list (void);
+
+void
+plug_volume_set_db (float db);
+
+void
+plug_volume_set_amp (float amp);
+
+const char *
+plug_get_config_dir (void);
+const char *
+plug_get_prefix (void);
+const char *
+plug_get_doc_dir (void);
+const char *
+plug_get_plugin_dir (void);
+const char *
+plug_get_pixmap_dir (void);
+
+const char *
+plug_get_system_dir (int dir_id);
+
+int
+plug_activate (DB_plugin_t *plug, int activate);
+
+DB_output_t *
+plug_get_output (void);
+
+int
+plug_reinit_sound (void);
+
+void
+plug_set_output (DB_output_t *out);
+
+const char *
+plug_get_decoder_id (const char *id);
+
+void
+plug_remove_decoder_id (const char *id);
+
+void
+plug_free_decoder_ids (void);
+
+DB_decoder_t *
+plug_get_decoder_for_id (const char *id);
+
+DB_plugin_t *
+plug_get_for_id (const char *id);
+
+int
+plug_is_local_file (const char *fname);
+
+int
+is_relative_path_posix (const char *path_or_url);
+
+int
+is_relative_path_win32 (const char *path_or_url);
+
+int
+is_relative_path (const char *path_or_url);
+
+const char **
+plug_get_gui_names (void);
+
+void
+plug_event_call (ddb_event_t *ev);
+
+void
+background_job_increment (void);
+
+void
+background_job_decrement (void);
+
+int
+have_background_jobs (void);
+
+void
+action_set_playlist (ddb_playlist_t *plt);
+
+ddb_playlist_t *
+action_get_playlist (void);
+
+void
+plug_register_in (DB_plugin_t *inplug);
+
+void
+plug_register_out (DB_plugin_t *outplug);
+
+DB_functions_t *
+plug_get_api (void);
+
+int
+plug_init_plugin (DB_plugin_t* (*loadfunc)(DB_functions_t *), void *handle);
+
+const char *
+plug_get_path_for_plugin_ptr (DB_plugin_t *plugin_ptr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __PLUGINS_H

deadbeef-1.9.6.tar.bz2/src/premix.c Added

@@ -0,0 +1,594 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ routines for converting between wave formats and channel configurations
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+#include <deadbeef/deadbeef.h>
+#include <deadbeef/fastftoi.h>
+#include "premix.h"
+
+#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+//#define trace(fmt,...)
+
+
+static inline void
+pcm_write_samples_8_to_8 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ *(output + c) = *(input + channelmapc);
+ }
+ input += inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_8_to_16 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ *((int16_t*)(output + 2 * c)) = (int16_t)(*(input + channelmapc) << 8);
+ }
+ input += inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_8_to_24 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ char *out = output + 3 * c;
+ out0 = 0;
+ out1 = 0;
+ out2 = *(input + channelmapc);
+ }
+ input += inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_8_to_32 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ char *out = output + 4 * c;
+ out0 = 0;
+ out1 = 0;
+ out2 = 0;
+ out3 = *(input + channelmapc);
+ }
+ input += inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_8_to_float (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ float sample = (*(input+channelmapc)) / (float)0x80;
+ *((float *)(output + 4 * c)) = sample;
+ }
+ input += inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_16_to_16 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ *((int16_t*)(output + 2 * c)) = *((int16_t*)(input + channelmapc*2));
+ }
+ input += 2 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_16_to_8 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ *((int8_t*)(output + c)) = *((int16_t*)(input + channelmapc*2)) >> 8;
+ }
+ input += 2 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_16_to_24 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ char *out = output + 3 * c;
+ const char *in = input + channelmapc*2;
+ out0 = 0;
+ out1 = in0;
+ out2 = in1;
+ }
+ input += 2 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_16_to_32 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ char *out = output + 4 * c;
+ const char *in = input + channelmapc*2;
+ out0 = 0;
+ out1 = 0;
+ out2 = in0;
+ out3 = in1;
+ }
+ input += 2 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_16_to_float (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ float sample = (*((int16_t*)(input + channelmapc*2))) / (float)0x8000;
+ *((float *)(output + 4 * c)) = sample;
+ }
+ input += 2 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_24_to_8 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ char *out = output + c;
+ *out = (input + channelmapc * 3)2;
+ }
+ input += 3 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_24_to_24 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ char *out = output + 3 * c;
+ const char *in = input + channelmapc * 3;
+ out0 = in0;
+ out1 = in1;
+ out2 = in2;
+ }
+ input += 3 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_24_to_32 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ char *out = output + 4 * c;
+ const char *in = input + 3 * channelmapc;
+ out0 = 0;
+ out1 = in0;
+ out2 = in1;
+ out3 = in2;
+ }
+ input += inputfmt->channels * 3;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_24_to_16 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ char *out = output + 2 * c;
+ const char *in = input + 3 * channelmapc;
+ out0 = in1;
+ out1 = in2;
+ }
+ input += inputfmt->channels * 3;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_24_to_float (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ float *out = (float *)(output + 4 * c);
+ const char *in = input + 3 * channelmapc;
+ int32_t sample = ((unsigned char)in0) | ((unsigned char)in1<<8) | ((signed char)in2<<16);
+ *out = sample / (float)0x800000;
+ }
+ input += inputfmt->channels * 3;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_32_to_8 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ int8_t *out = (int8_t*)(output + c);
+ int32_t sample = *((int32_t*)(input + 4 * channelmapc));
+ *out = (int8_t)(sample>>24);
+ }
+ input += 4 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_32_to_16 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ int16_t *out = (int16_t*)(output + 2 * c);
+ int32_t sample = *((int32_t*)(input + 4 * channelmapc));
+ *out = (int16_t)(sample>>16);
+ }
+ input += 4 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_32_to_24 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ char *out = output + 3 * c;
+ const char *in = input + 4 * channelmapc;
+ out0 = in1;
+ out1 = in2;
+ out2 = in3;
+ }
+ input += 4 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+static inline void
+pcm_write_samples_32_to_32 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ *((int32_t*)(output + 4 * c)) = *((int32_t*)(input + channelmapc * 4));
+ }
+ input += 4 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+
+static inline void
+pcm_write_samples_32_to_float (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ float *out = (float *)(output + 4 * c);
+ int32_t sample = *((int32_t*)(input + channelmapc * 4));
+ *out = sample / (float)0x80000000;
+ }
+ input += 4 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+static inline void
+pcm_write_samples_float_to_8 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ fpu_control ctl = 0;
+ (void)ctl;
+ fpu_setround (&ctl);
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ int8_t *out = (int8_t*)(output + c);
+ float sample = *((float*)(input + channelmapc * 4));
+ int isample = ftoi(sample * 0x80);
+ if (isample > 0x7f) {
+ isample = 0x7f;
+ }
+ else if (isample < -0x80) {
+ isample = -0x80;
+ }
+ *out = (int8_t)ftoi (isample);
+ }
+ input += 4 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+ fpu_restore (ctl);
+}
+
+static inline void
+pcm_write_samples_float_to_16 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ fpu_control ctl = 0;
+ (void)ctl;
+ fpu_setround (&ctl);
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ int16_t *out = (int16_t*)(output + 2 * c);
+ float sample = *((float*)(input + 4 * channelmapc));
+ int isample = ftoi (sample*0x8000);
+ if (isample > 0x7fff) {
+ isample = 0x7fff;
+ }
+ else if (isample < -0x8000) {
+ isample = -0x8000;
+ }
+ *out = (int16_t)isample;
+ }
+ input += 4 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+ fpu_restore (ctl);
+}
+
+static inline void
+pcm_write_samples_float_to_24 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ fpu_control ctl = 0;
+ (void)ctl;
+ fpu_setround (&ctl);
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ char *out = output + 3 * c;
+ float sample = *((float*)(input + channelmapc * 4));
+ int32_t outsample = (int32_t)ftoi (sample * 0x800000);
+ if (outsample >= 0x7fffff) {
+ outsample = 0x7fffff;
+ }
+ else if (outsample < -0x800000) {
+ outsample = -0x800000;
+ }
+ out0 = (outsample&0x0000ff);
+ out1 = (outsample&0x00ff00)>>8;
+ out2 = (outsample&0xff0000)>>16;
+ }
+ input += 4 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+ fpu_restore (ctl);
+}
+
+
+static inline void
+pcm_write_samples_float_to_32 (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize) {
+ for (int s = 0; s < nsamples; s++) {
+ for (int c = 0; c < outputfmt->channels; c++) {
+ if (channelmapc < 0) {
+ continue;
+ }
+ float fsample = (*((float*)(input + channelmapc * 4)));
+ if (fsample > (float)0x7fffffff/0x80000000) {
+ fsample = (float)0x7fffffff/0x80000000;
+ }
+ else if (fsample < -1.f) {
+ fsample = -1.f;
+ }
+ int32_t sample = ftoi(fsample * (float)0x80000000);
+ *((int32_t *)(output + 4 * c)) = sample;
+ }
+ input += 4 * inputfmt->channels;
+ output += outputsamplesize;
+ }
+}
+
+typedef void (*remap_fn_t) (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int nsamples, int * restrict channelmap, int outputsamplesize);
+
+
+remap_fn_t remappers88 = {
+ {
+ pcm_write_samples_8_to_8,
+ pcm_write_samples_8_to_16,
+ pcm_write_samples_8_to_24,
+ pcm_write_samples_8_to_32,
+ NULL,
+ NULL,
+ NULL,
+ pcm_write_samples_8_to_float,
+ },
+ {
+ pcm_write_samples_16_to_8,
+ pcm_write_samples_16_to_16,
+ pcm_write_samples_16_to_24,
+ pcm_write_samples_16_to_32,
+ NULL,
+ NULL,
+ NULL,
+ pcm_write_samples_16_to_float,
+ },
+ {
+ pcm_write_samples_24_to_8,
+ pcm_write_samples_24_to_16,
+ pcm_write_samples_24_to_24,
+ pcm_write_samples_24_to_32,
+ NULL,
+ NULL,
+ NULL,
+ pcm_write_samples_24_to_float,
+ },
+ {
+ pcm_write_samples_32_to_8,
+ pcm_write_samples_32_to_16,
+ pcm_write_samples_32_to_24,
+ pcm_write_samples_32_to_32,
+ NULL,
+ NULL,
+ NULL,
+ pcm_write_samples_32_to_float,
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ pcm_write_samples_float_to_8,
+ pcm_write_samples_float_to_16,
+ pcm_write_samples_float_to_24,
+ pcm_write_samples_float_to_32,
+ NULL,
+ NULL,
+ NULL,
+ pcm_write_samples_32_to_32,
+ }
+};
+
+int
+pcm_convert (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int inputsize) {
+ // calculate output size
+ int inputsamplesize = (inputfmt->bps >> 3) * inputfmt->channels;
+ int outputsamplesize = (outputfmt->bps >> 3) * outputfmt->channels;
+ int nsamples = inputsize / inputsamplesize;
+
+ // The conversion preserves the speaker mapping,
+ // which means that if a channel doesn't map to a speaker in the output -- it will be discarded.
+
+ uint32_t outchannels = 0;
+
+ if (output) {
+ // build channelmap
+ int channelmap32;
+ for (int i = 0; i < 32; i++) {
+ channelmapi = -1;
+ }
+ uint32_t inputbitmask = 1;
+
+ for (int i = 0; i < inputfmt->channels; i++) {
+ // find next input channel
+ while (inputbitmask < 0x80000000 && !(inputfmt->channelmask & inputbitmask)) {
+ inputbitmask <<= 1;
+ }
+ if (!(inputfmt->channelmask & inputbitmask)) {
+ trace ("pcm_convert: channelmask doesn't correspond to the inputfmt (channels=%d, channelmask=%X)!\n", inputfmt->channels, inputfmt->channelmask);
+ break;
+ }
+ if (outputfmt->channelmask & inputbitmask) {
+ int o = 0;
+ uint32_t outputbitmask = 1;
+ while (outputbitmask < 0x80000000 && (outputfmt->channelmask & outputbitmask) != inputbitmask) {
+ outputbitmask <<= 1;
+ o++;
+ }
+ if (!(inputfmt->channelmask & outputbitmask)) {
+ // no corresponding output channel -- ignore
+ continue;
+ }
+ outchannels |= outputbitmask;
+ channelmapo = i; // input channel i going to output channel o
+ //trace ("channelmap%d=%d\n", i, o);
+ }
+ inputbitmask <<= 1;
+ }
+
+ if (outchannels != outputfmt->channelmask) {
+ // some of the channels are not used
+ memset (output, 0, nsamples * outputsamplesize);
+ }
+
+ int outidx = ((outputfmt->bps >> 3) - 1) | (outputfmt->is_float << 2);
+ int inidx = ((inputfmt->bps >> 3) - 1) | (inputfmt->is_float << 2);
+ if (remappersinidxoutidx) {
+ remappersinidxoutidx (inputfmt, input, outputfmt, output, nsamples, channelmap, outputsamplesize);
+ }
+ else {
+ trace ("no converter from %d %s to %d %s (%d%d)\n", inputfmt->bps, inputfmt->is_float ? "float" : "", outputfmt->bps, outputfmt->is_float ? "float" : "", inidx, outidx);
+ }
+ }
+ return nsamples * outputsamplesize;
+}
+

deadbeef-1.9.6.tar.bz2/src/premix.h Added

@@ -0,0 +1,46 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ routines for converting between wave formats and channel configurations
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+#ifndef __PREMIX_H
+#define __PREMIX_H
+
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+#define restrict
+extern "C" {
+#endif
+
+// @returns number of output bytes
+int
+pcm_convert (const ddb_waveformat_t * restrict inputfmt, const char * restrict input, const ddb_waveformat_t * restrict outputfmt, char * restrict output, int inputsize);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

deadbeef-1.9.6.tar.bz2/src/replaygain.c Added

@@ -0,0 +1,311 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ replaygain support
+
+ Copyright (C) 2009-2016 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include <string.h>
+#include <stdlib.h>
+#include "streamer.h"
+#include "volume.h"
+#include "replaygain.h"
+#include "conf.h"
+#include <deadbeef/common.h>
+#include "playmodes.h"
+#include "plmeta.h"
+
+static ddb_replaygain_settings_t current_settings;
+
+void
+replaygain_apply_with_settings (ddb_replaygain_settings_t *settings, ddb_waveformat_t *fmt, char *bytes, int numbytes) {
+ if (settings->processing_flags == 0) {
+ return;
+ }
+ if (fmt->flags & DDB_WAVEFORMAT_FLAG_IS_DOP) {
+ return;
+ }
+ if (fmt->bps == 16) {
+ apply_replay_gain_int16 (settings, bytes, numbytes);
+ }
+ else if (fmt->bps == 24) {
+ apply_replay_gain_int24 (settings, bytes, numbytes);
+ }
+ else if (fmt->bps == 8) {
+ apply_replay_gain_int8 (settings, bytes, numbytes);
+ }
+ else if (fmt->bps == 32 && !fmt->is_float) {
+ apply_replay_gain_int32 (settings, bytes, numbytes);
+ }
+ else if (fmt->bps == 32 && fmt->is_float) {
+ apply_replay_gain_float32 (settings, bytes, numbytes);
+ }
+}
+
+void
+replaygain_apply (ddb_waveformat_t *fmt, char *bytes, int numbytes) {
+ replaygain_apply_with_settings(&current_settings, fmt, bytes, numbytes);
+}
+
+void
+replaygain_set_current (ddb_replaygain_settings_t *settings) {
+ memcpy (&current_settings, settings, sizeof (ddb_replaygain_settings_t));
+}
+
+void
+replaygain_init_settings (ddb_replaygain_settings_t *settings, playItem_t *it) {
+ memset (((char *)settings) + sizeof (settings->_size), 0, settings->_size - sizeof (settings->_size));
+ settings->source_mode = conf_get_int ("replaygain.source_mode", 0);
+ settings->processing_flags = conf_get_int ("replaygain.processing_flags", 0);
+ settings->preamp_with_rg = db_to_amp (conf_get_float ("replaygain.preamp_with_rg", 0));
+ settings->preamp_without_rg = db_to_amp (conf_get_float ("replaygain.preamp_without_rg", 0));
+ settings->albumgain = 1;
+ settings->trackgain = 1;
+ settings->albumpeak = 1;
+ settings->trackpeak = 1;
+
+ if (!it) {
+ return;
+ }
+
+ pl_lock ();
+ const char *albumgain = pl_find_meta (it, ":REPLAYGAIN_ALBUMGAIN");
+ const char *trackgain = pl_find_meta (it, ":REPLAYGAIN_TRACKGAIN");
+ const char *albumpeak = pl_find_meta (it, ":REPLAYGAIN_ALBUMPEAK");
+ const char *trackpeak = pl_find_meta (it, ":REPLAYGAIN_TRACKPEAK");
+
+ if (settings->processing_flags & DDB_RG_PROCESSING_GAIN) {
+ if (albumgain) {
+ settings->albumgain = db_to_amp((float)atof (albumgain));
+ settings->has_album_gain = 1;
+ }
+ else if (trackgain) {
+ settings->albumgain = db_to_amp((float)atof (trackgain));
+ settings->has_album_gain = 1;
+ }
+
+ if (trackgain) {
+ settings->trackgain = db_to_amp((float)atof (trackgain));
+ settings->has_track_gain = 1;
+ }
+ else if (albumgain) {
+ settings->trackgain = db_to_amp((float)atof (albumgain));
+ settings->has_track_gain = 1;
+ }
+ }
+
+ if (settings->processing_flags & DDB_RG_PROCESSING_PREVENT_CLIPPING) {
+ if (albumpeak) {
+ settings->albumpeak = (float)atof (albumpeak);
+ }
+ else if (trackpeak) {
+ settings->albumpeak = (float)atof (trackpeak);
+ }
+
+ if (trackpeak) {
+ settings->trackpeak = (float)atof (trackpeak);
+ }
+ else if (albumpeak) {
+ settings->trackpeak = (float)atof (albumpeak);
+ }
+ }
+
+ pl_unlock ();
+}
+
+static int
+_get_source_mode (int mode) {
+ if (mode != DDB_RG_SOURCE_MODE_PLAYBACK_ORDER) {
+ return mode;
+ }
+ ddb_shuffle_t shuffle = streamer_get_shuffle ();
+ if (shuffle == DDB_SHUFFLE_ALBUMS || shuffle == DDB_SHUFFLE_OFF) {
+ return DDB_RG_SOURCE_MODE_ALBUM;
+ }
+ else {
+ return DDB_RG_SOURCE_MODE_TRACK;
+ }
+}
+
+static inline int
+get_int_volume (ddb_replaygain_settings_t *settings) {
+ int vol = 1000;
+
+ int mode = _get_source_mode (settings->source_mode);
+ switch (mode) {
+ case DDB_RG_SOURCE_MODE_TRACK:
+ if (!settings->has_track_gain) {
+ vol = (int)(settings->preamp_without_rg * 1000);
+ } else {
+ vol = (int)(settings->preamp_with_rg * settings->trackgain * 1000);
+ }
+ if (settings->processing_flags & DDB_RG_PROCESSING_PREVENT_CLIPPING) {
+ if (vol * settings->trackpeak > 1000) {
+ vol = (int)(1000 / settings->trackpeak);
+ }
+ }
+ break;
+ case DDB_RG_SOURCE_MODE_ALBUM:
+ if (!settings->has_album_gain) {
+ vol = (int)(settings->preamp_without_rg * 1000);
+ } else {
+ vol = (int)(settings->preamp_with_rg * settings->albumgain * 1000);
+ }
+ if (settings->processing_flags & DDB_RG_PROCESSING_PREVENT_CLIPPING) {
+ if (vol * settings->albumpeak > 1000) {
+ vol = (int)(1000 / settings->albumpeak);
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ return vol == 1000 ? -1 : vol;
+}
+
+void
+apply_replay_gain_int8 (ddb_replaygain_settings_t *settings, char *bytes, int size) {
+ int vol = get_int_volume (settings);
+ if (vol < 0) {
+ return;
+ }
+ int8_t *s = (int8_t*)bytes;
+ for (int j = 0; j < size; j++) {
+ int32_t sample = ((int8_t)(*s)) * vol / 1000;
+ if (sample > 0x7f) {
+ sample = 0x7f;
+ }
+ else if (sample < -0x80) {
+ sample = -0x80;
+ }
+ *s = (int8_t)sample;
+ s++;
+ }
+}
+
+void
+apply_replay_gain_int16 (ddb_replaygain_settings_t *settings, char *bytes, int size) {
+ int vol = get_int_volume (settings);
+ if (vol < 0) {
+ return;
+ }
+ int16_t *s = (int16_t*)bytes;
+ for (int j = 0; j < size/2; j++) {
+ int32_t sample = ((int32_t)(*s)) * vol / 1000;
+ if (sample > 0x7fff) {
+ sample = 0x7fff;
+ }
+ else if (sample < -0x8000) {
+ sample = -0x8000;
+ }
+ *s = (int16_t)sample;
+ s++;
+ }
+}
+
+void
+apply_replay_gain_int24 (ddb_replaygain_settings_t *settings, char *bytes, int size) {
+ int64_t vol = get_int_volume (settings);
+ if (vol < 0) {
+ return;
+ }
+ char *s = (char*)bytes;
+ for (int j = 0; j < size/3; j++) {
+ int32_t sample = ((unsigned char)s0) | ((unsigned char)s1<<8) | ((signed char)s2<<16);
+ sample = (int32_t)(sample * vol / 1000);
+ if (sample > 0x7fffff) {
+ sample = 0x7fffff;
+ }
+ else if (sample < -0x800000) {
+ sample = -0x800000;
+ }
+ s0 = (sample&0x0000ff);
+ s1 = (sample&0x00ff00)>>8;
+ s2 = (sample&0xff0000)>>16;
+ s += 3;
+ }
+}
+
+void
+apply_replay_gain_int32 (ddb_replaygain_settings_t *settings, char *bytes, int size) {
+ int64_t vol = get_int_volume (settings);
+ if (vol < 0) {
+ return;
+ }
+ int32_t *s = (int32_t*)bytes;
+ for (int j = 0; j < size/4; j++) {
+ int64_t sample = ((int32_t)(*s)) * vol / 1000;
+ *s = (int32_t)sample;
+ s++;
+ }
+}
+
+void
+apply_replay_gain_float32 (ddb_replaygain_settings_t *settings, char *bytes, int size) {
+ float vol = 1.f;
+ int mode = _get_source_mode (settings->source_mode);
+ switch (mode) {
+ case DDB_RG_SOURCE_MODE_TRACK:
+ if (!settings->has_track_gain) {
+ vol = settings->preamp_without_rg;
+ } else {
+ vol = settings->preamp_with_rg * settings->trackgain;
+ }
+ if (settings->processing_flags & DDB_RG_PROCESSING_PREVENT_CLIPPING) {
+ if (vol * settings->trackpeak > 1.f) {
+ vol = 1.f / settings->trackpeak;
+ }
+ }
+ break;
+ case DDB_RG_SOURCE_MODE_ALBUM:
+ if (!settings->has_album_gain) {
+ vol = settings->preamp_without_rg;
+ } else {
+ vol = settings->preamp_with_rg * settings->albumgain;
+ }
+ if (settings->processing_flags & DDB_RG_PROCESSING_PREVENT_CLIPPING) {
+ if (vol * settings->albumpeak > 1.f) {
+ vol = 1.f / settings->albumpeak;
+ }
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (vol == 1) {
+ return;
+ }
+
+ float *s = (float*)bytes;
+ for (int j = 0; j < size/4; j++) {
+ float sample = ((float)*s) * vol;
+ if (sample > 1.f) {
+ sample = 1.f;
+ }
+ else if (sample < -1.f) {
+ sample = -1.f;
+ }
+ *s = sample;
+ s++;
+ }
+}

deadbeef-1.9.6.tar.bz2/src/replaygain.h Added

@@ -0,0 +1,59 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ replaygain support
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __REPLAYGAIN_H
+#define __REPLAYGAIN_H
+
+#include <deadbeef/deadbeef.h>
+
+void
+replaygain_init_settings (ddb_replaygain_settings_t *settings, playItem_t *it);
+
+void
+replaygain_apply (ddb_waveformat_t *fmt, char *bytes, int numbytes);
+
+void
+replaygain_apply_with_settings (ddb_replaygain_settings_t *settings, ddb_waveformat_t *fmt, char *bytes, int numbytes);
+
+void
+replaygain_set_current (ddb_replaygain_settings_t *settings);
+
+void
+apply_replay_gain_int8 (ddb_replaygain_settings_t *settings, char *bytes, int size);
+
+void
+apply_replay_gain_int16 (ddb_replaygain_settings_t *settings, char *bytes, int size);
+
+void
+apply_replay_gain_int24 (ddb_replaygain_settings_t *settings, char *bytes, int size);
+
+void
+apply_replay_gain_int32 (ddb_replaygain_settings_t *settings, char *bytes, int size);
+
+void
+apply_replay_gain_float32 (ddb_replaygain_settings_t *settings, char *bytes, int size);
+
+#endif

deadbeef-1.9.6.tar.bz2/src/resizable_buffer.c Added

@@ -0,0 +1,40 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2022 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "resizable_buffer.h"
+#include <string.h>
+
+void
+resizable_buffer_ensure_size(resizable_buffer_t *buffer, size_t size) {
+ if (buffer->size < size) {
+ free (buffer->buffer);
+ buffer->buffer = calloc (1, size);
+ buffer->size = size;
+ }
+}
+
+void
+resizable_buffer_deinit (resizable_buffer_t *buffer) {
+ free (buffer->buffer);
+ memset (buffer, 0, sizeof (resizable_buffer_t));
+}

deadbeef-1.9.6.tar.bz2/src/resizable_buffer.h Added

@@ -0,0 +1,40 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2022 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef resizable_buffer_h
+#define resizable_buffer_h
+
+#include <stdlib.h>
+
+typedef struct {
+ char *buffer;
+ size_t size;
+} resizable_buffer_t;
+
+void
+resizable_buffer_ensure_size (resizable_buffer_t *buffer, size_t size);
+
+void
+resizable_buffer_deinit (resizable_buffer_t *buffer);
+
+#endif /* resizable_buffer_h */

deadbeef-1.9.6.tar.bz2/src/ringbuf.c Added

@@ -0,0 +1,123 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ basic ring buffer implementation
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+#include <string.h>
+#include "ringbuf.h"
+
+void
+ringbuf_init (ringbuf_t *p, char *buffer, size_t size) {
+ memset (p, 0, sizeof (ringbuf_t));
+ p->bytes = buffer;
+ p->size = size;
+}
+
+void
+ringbuf_deinit (ringbuf_t *p) {
+ memset (p, 0, sizeof (ringbuf_t));
+}
+
+
+void
+ringbuf_flush (ringbuf_t *p) {
+ p->cursor = 0;
+ p->remaining = 0;
+ memset (p->bytes, 0, p->size);
+}
+
+int
+ringbuf_write (ringbuf_t *p, char *bytes, size_t size) {
+ if (p->size - p->remaining < size) {
+ return -1;
+ }
+
+ size_t cursor = p->cursor + p->remaining;
+ cursor %= p->size;
+
+ if (p->size - cursor >= size) { // split
+ memcpy (p->bytes + cursor, bytes, size);
+ p->remaining += size;
+ }
+ else {
+ size_t n = p->size - cursor;
+ if (n > 0) {
+ memcpy (p->bytes + cursor, bytes, n);
+ p->remaining += n;
+ size -= n;
+ bytes += n;
+ }
+ memcpy (p->bytes, bytes, size);
+ p->remaining += size;
+ }
+ return 0;
+}
+
+size_t
+ringbuf_read_int (ringbuf_t * restrict p, char *bytes, size_t size, int keep, off_t offset) {
+ if (p->remaining < size) {
+ size = p->remaining;
+ }
+
+ off_t cursor = p->cursor + offset;
+ if (cursor < 0) {
+ cursor += p->size;
+ }
+
+ size_t readsize1 = p->size - cursor;
+ size_t readsize2 = 0;
+ if (readsize1 < size) {
+ readsize2 = size - readsize1;
+ }
+ else {
+ readsize1 = size;
+ }
+ memcpy (bytes, p->bytes + cursor, readsize1);
+ if (readsize2 != 0) {
+ memcpy (bytes + readsize1, p->bytes, readsize2);
+ }
+
+ if (!keep) {
+ p->remaining -= size;
+ p->cursor += size;
+ p->cursor %= p->size;
+ }
+ return size;
+}
+
+size_t
+ringbuf_read (ringbuf_t *p, char *bytes, size_t size) {
+ return ringbuf_read_int(p, bytes, size, 0, 0);
+}
+
+size_t
+ringbuf_read_keep (ringbuf_t *p, char *bytes, size_t size) {
+ return ringbuf_read_int(p, bytes, size, 1, 0);
+}
+
+size_t
+ringbuf_read_keep_offset (ringbuf_t *p, char *bytes, size_t size, off_t offset) {
+ return ringbuf_read_int(p, bytes, size, 1, offset);
+}

deadbeef-1.9.6.tar.bz2/src/ringbuf.h Added

@@ -0,0 +1,68 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ basic ring buffer implementation
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __RINGBUF_H
+#define __RINGBUF_H
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+ char *bytes;
+ size_t size;
+ size_t cursor;
+ size_t remaining;
+} ringbuf_t;
+
+void
+ringbuf_init (ringbuf_t *p, char *buffer, size_t size);
+
+void
+ringbuf_deinit (ringbuf_t *p);
+
+void
+ringbuf_flush (ringbuf_t *p);
+
+int
+ringbuf_write (ringbuf_t *p, char *bytes, size_t size);
+
+size_t
+ringbuf_read (ringbuf_t *p, char *bytes, size_t size);
+
+size_t
+ringbuf_read_keep (ringbuf_t *p, char *bytes, size_t size);
+
+size_t
+ringbuf_read_keep_offset (ringbuf_t *p, char *bytes, size_t size, off_t offset);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

deadbeef-1.9.6.tar.bz2/src/sj_to_unicode.h Changed

deadbeef-1.9.6.tar.bz2/src/sort.c Added

@@ -0,0 +1,389 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <sys/time.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include "utf8.h"
+#include "sort.h"
+#include "tf.h"
+#include "pltmeta.h"
+#include "plmeta.h"
+#include "messagepump.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+static void
+plt_sort_internal (playlist_t *playlist, int iter, int id, const char *format, int order, int version);
+
+void
+plt_sort_v2 (playlist_t *plt, int iter, int id, const char *format, int order) {
+ plt_sort_internal (plt, iter, id, format, order, 1);
+}
+
+// sort for title formatting v1
+void
+plt_sort (playlist_t *playlist, int iter, int id, const char *format, int order) {
+ plt_sort_internal (playlist, iter, id, format, order, 0);
+}
+
+static int pl_sort_is_duration;
+static int pl_sort_is_track;
+static int pl_sort_ascending;
+static int pl_sort_id;
+static int pl_sort_version; // 0: use pl_sort_format, 1: use pl_sort_tf_bytecode
+static const char *pl_sort_format;
+static char *pl_sort_tf_bytecode;
+static ddb_tf_context_t pl_sort_tf_ctx;
+
+static int
+strcasecmp_numeric (const char *a, const char *b) {
+ if (isdigit (*a) && isdigit (*b)) {
+ int anum = *a-'0';
+ const char *ae = a+1;
+ while (*ae && isdigit (*ae)) {
+ anum *= 10;
+ anum += *ae-'0';
+ ae++;
+ }
+ int bnum = *b-'0';
+ const char *be = b+1;
+ while (*be && isdigit (*be)) {
+ bnum *= 10;
+ bnum += *be-'0';
+ be++;
+ }
+ if (anum == bnum) {
+ return u8_strcasecmp (ae, be);
+ }
+ return anum - bnum;
+ }
+ return u8_strcasecmp (a,b);
+}
+
+static int
+pl_sort_compare_str (playItem_t *a, playItem_t *b) {
+ if (pl_sort_is_duration) {
+ int64_t dur_a = (int64_t)((double)a->_duration * 100000);
+ int64_t dur_b = (int64_t)((double)b->_duration * 100000);
+ return !pl_sort_ascending ? (int)(dur_b - dur_a) : (int)(dur_a - dur_b);
+ }
+ else if (pl_sort_is_track) {
+ int t1;
+ int t2;
+ const char *t;
+ t = pl_find_meta_raw (a, "track");
+ if (t && !isdigit (*t)) {
+ t1 = 999999;
+ }
+ else {
+ t1 = t ? atoi (t) : -1;
+ }
+ t = pl_find_meta_raw (b, "track");
+ if (t && !isdigit (*t)) {
+ t2 = 999999;
+ }
+ else {
+ t2 = t ? atoi (t) : -1;
+ }
+ return !pl_sort_ascending ? t2 - t1 : t1 - t2;
+ }
+ else {
+ char tmp11024;
+ char tmp21024;
+ if (pl_sort_version == 0) {
+ pl_format_title (a, -1, tmp1, sizeof (tmp1), pl_sort_id, pl_sort_format);
+ pl_format_title (b, -1, tmp2, sizeof (tmp2), pl_sort_id, pl_sort_format);
+ }
+ else {
+ pl_sort_tf_ctx.id = pl_sort_id;
+ pl_sort_tf_ctx.it = (ddb_playItem_t *)a;
+ tf_eval(&pl_sort_tf_ctx, pl_sort_tf_bytecode, tmp1, sizeof(tmp1));
+ pl_sort_tf_ctx.it = (ddb_playItem_t *)b;
+ tf_eval(&pl_sort_tf_ctx, pl_sort_tf_bytecode, tmp2, sizeof(tmp2));
+ }
+ int res = strcasecmp_numeric (tmp1, tmp2);
+ if (!pl_sort_ascending) {
+ res = -res;
+ }
+ return res;
+ }
+}
+
+static int
+qsort_cmp_func (const void *a, const void *b) {
+ playItem_t *aa = *((playItem_t **)a);
+ playItem_t *bb = *((playItem_t **)b);
+ return pl_sort_compare_str (aa, bb);
+}
+
+void
+plt_sort_random (playlist_t *playlist, int iter) {
+ plt_replace_meta (playlist, "autosort_mode", "random");
+ if (!playlist->headiter || !playlist->headiter->nextiter) {
+ return;
+ }
+
+ pl_lock ();
+
+ const int playlist_count = playlist->countiter;
+ playItem_t **array = calloc (playlist_count, sizeof (playItem_t *));
+ int idx = 0;
+ int count = 0;
+ for (playItem_t *it = playlist->headiter; it; it = it->nextiter, idx++, count++) {
+ arrayidx = it;
+ }
+
+ //randomize array
+ for (int swap_a = 0; swap_a < playlist_count - 1; swap_a++) {
+ //select random item above swap_a-1
+ const int swap_b = (int)(swap_a + (rand() / (float)RAND_MAX * (playlist_count - swap_a)));
+
+ //swap a with b
+ playItem_t* const swap_temp = arrayswap_a;
+ arrayswap_a = arrayswap_b;
+ arrayswap_b = swap_temp;
+
+ }
+
+ playItem_t *prev = NULL;
+ playlist->headiter = 0;
+ for (idx = 0; idx < count; idx++) {
+ playItem_t *it = arrayidx;
+ it->previter = prev;
+ it->nextiter = NULL;
+ if (!prev) {
+ playlist->headiter = it;
+ }
+ else {
+ prev->nextiter = it;
+ }
+ prev = it;
+ }
+ playlist->tailiter = arrayplaylist->countiter-1;
+
+ free (array);
+
+ plt_modified (playlist);
+
+ pl_unlock ();
+}
+
+// version 0: title formatting v1
+// version 1: title formatting v2
+void
+plt_sort_internal (playlist_t *playlist, int iter, int id, const char *format, int order, int version) {
+ if (order == DDB_SORT_RANDOM) {
+ plt_sort_random (playlist, iter);
+ return;
+ }
+ int ascending = order == DDB_SORT_DESCENDING ? 0 : 1;
+ plt_set_meta_int (playlist, "autosort_ascending", ascending);
+ if (version != 0 && format != NULL) {
+ plt_replace_meta (playlist, "autosort_mode", "tf");
+ plt_replace_meta (playlist, "autosort_tf", format);
+ }
+
+ if (format == NULL || id == DB_COLUMN_FILENUMBER || !playlist->headiter || !playlist->headiter->nextiter) {
+ return;
+ }
+ pl_lock ();
+ struct timeval tm1;
+ gettimeofday (&tm1, NULL);
+ pl_sort_ascending = ascending;
+ trace ("ascending: %d\n", ascending);
+ pl_sort_id = id;
+
+ pl_sort_version = version;
+ if (version == 0) {
+ pl_sort_format = format;
+ pl_sort_tf_bytecode = NULL;
+ }
+ else {
+ pl_sort_format = NULL;
+ pl_sort_tf_bytecode = tf_compile (format);
+ pl_sort_tf_ctx._size = sizeof (pl_sort_tf_ctx);
+ pl_sort_tf_ctx.it = NULL;
+ pl_sort_tf_ctx.plt = (ddb_playlist_t *)playlist;
+ pl_sort_tf_ctx.idx = -1;
+ pl_sort_tf_ctx.id = id;
+ }
+
+ if (format && id == -1
+ && ((version == 0 && !strcmp (format, "%l"))
+ || (version == 1 && !strcmp (format, "%length%")))
+ ) {
+ pl_sort_is_duration = 1;
+ }
+ else {
+ pl_sort_is_duration = 0;
+ }
+ if (format && id == -1
+ && ((version == 0 && !strcmp (format, "%n"))
+ || (version == 1 && (!strcmp (format, "%track number%") || !strcmp (format, "%tracknumber%"))))
+ ) {
+ pl_sort_is_track = 1;
+ }
+ else {
+ pl_sort_is_track = 0;
+ }
+
+ int cursor = plt_get_cursor (playlist, PL_MAIN);
+ playItem_t *track_under_cursor = NULL;
+ if (cursor != -1) {
+ track_under_cursor = plt_get_item_for_idx (playlist, cursor, PL_MAIN);
+ }
+ playItem_t **array = malloc (playlist->countiter * sizeof (playItem_t *));
+ int idx = 0;
+ for (playItem_t *it = playlist->headiter; it; it = it->nextiter, idx++) {
+ arrayidx = it;
+ }
+
+#if HAVE_MERGESORT
+ mergesort (array, playlist->countiter, sizeof (playItem_t *), qsort_cmp_func);
+#else
+ qsort (array, playlist->countiter, sizeof (playItem_t *), qsort_cmp_func);
+#endif
+ playItem_t *prev = NULL;
+ playlist->headiter = 0;
+ for (idx = 0; idx < playlist->countiter; idx++) {
+ playItem_t *it = arrayidx;
+ it->previter = prev;
+ it->nextiter = NULL;
+ if (!prev) {
+ playlist->headiter = it;
+ }
+ else {
+ prev->nextiter = it;
+ }
+ prev = it;
+ }
+
+ playlist->tailiter = arrayplaylist->countiter-1;
+
+ free (array);
+
+ if (track_under_cursor) {
+ cursor = plt_get_item_idx (playlist, track_under_cursor, PL_MAIN);
+ plt_set_cursor (playlist, PL_MAIN, cursor);
+ pl_item_unref (track_under_cursor);
+ }
+
+ plt_modified (playlist);
+
+ if (version == 0) {
+ pl_sort_format = NULL;
+ }
+
+ if (version == 1) {
+ tf_free (pl_sort_tf_bytecode);
+ pl_sort_tf_bytecode = NULL;
+ memset (&pl_sort_tf_ctx, 0, sizeof (pl_sort_tf_ctx));
+ }
+
+ pl_unlock ();
+}
+
+void
+sort_track_array (playlist_t *playlist, playItem_t **tracks, int num_tracks, const char *format, int order) {
+ if (order != DDB_SORT_DESCENDING && order != DDB_SORT_ASCENDING) {
+ // unsupported
+ return;
+ }
+ int ascending = order == DDB_SORT_DESCENDING ? 0 : 1;
+
+ if (format == NULL || !tracks || !num_tracks) {
+ return;
+ }
+
+ pl_lock ();
+ pl_sort_ascending = ascending;
+ pl_sort_id = -1;
+
+ pl_sort_version = 1;
+ pl_sort_format = NULL;
+ pl_sort_tf_bytecode = tf_compile (format);
+ pl_sort_tf_ctx._size = sizeof (pl_sort_tf_ctx);
+ pl_sort_tf_ctx.it = NULL;
+ pl_sort_tf_ctx.plt = (ddb_playlist_t *)playlist;
+ pl_sort_tf_ctx.idx = -1;
+ pl_sort_tf_ctx.id = -1;
+
+ if (format
+ && !strcmp (format, "%length%")) {
+ pl_sort_is_duration = 1;
+ }
+ else {
+ pl_sort_is_duration = 0;
+ }
+ if (format
+ && (!strcmp (format, "%track number%") || !strcmp (format, "%tracknumber%"))) {
+ pl_sort_is_track = 1;
+ }
+ else {
+ pl_sort_is_track = 0;
+ }
+
+#if HAVE_MERGESORT
+ mergesort (tracks, num_tracks, sizeof (playItem_t *), qsort_cmp_func);
+#else
+ qsort (tracks, num_tracks, sizeof (playItem_t *), qsort_cmp_func);
+#endif
+
+ tf_free (pl_sort_tf_bytecode);
+ pl_sort_tf_bytecode = NULL;
+ memset (&pl_sort_tf_ctx, 0, sizeof (pl_sort_tf_ctx));
+
+ pl_unlock ();
+}
+
+void
+plt_autosort (playlist_t *plt) {
+ int autosort_enabled = plt_find_meta_int (plt, "autosort_enabled", 0);
+ if (!autosort_enabled) {
+ return;
+ }
+
+ const char *autosort_mode = plt_find_meta (plt, "autosort_mode");
+ if (!autosort_mode) {
+ return;
+ }
+
+ if (!strcmp (autosort_mode, "tf")) {
+ int ascending = plt_find_meta_int (plt, "autosort_ascending", 0);
+ const char *fmt = plt_find_meta (plt, "autosort_tf");
+ if (!fmt) {
+ return;
+ }
+ plt_sort_v2 (plt, PL_MAIN, -1, fmt, ascending ? DDB_SORT_ASCENDING : DDB_SORT_DESCENDING);
+ }
+ else if (!strcmp (autosort_mode, "random")) {
+ plt_sort_v2 (plt, PL_MAIN, -1, NULL, DDB_SORT_RANDOM);
+ }
+
+ plt_save_config (plt);
+
+ messagepump_push (DB_EV_PLAYLISTCHANGED, 0, DDB_PLAYLIST_CHANGE_CONTENT, 0);
+}

deadbeef-1.9.6.tar.bz2/src/sort.h Added

@@ -0,0 +1,38 @@
+/*
+    DeaDBeeF -- the music player
+    Copyright (C) 2009-2015 Oleksiy Yakovenko and other contributors
+
+    This software is provided 'as-is', without any express or implied
+    warranty.  In no event will the authors be held liable for any damages
+    arising from the use of this software.
+
+    Permission is granted to anyone to use this software for any purpose,
+    including commercial applications, and to alter it and redistribute it
+    freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __deadbeef__sort__
+#define __deadbeef__sort__
+
+#include "playlist.h"
+
+void
+plt_sort_v2 (playlist_t *plt, int iter, int id, const char *format, int order);
+
+void
+sort_track_array (playlist_t *playlist, playItem_t **tracks, int num_tracks, const char *format, int order);
+
+void
+plt_autosort (playlist_t *plt);
+
+#endif /* defined(__deadbeef__sort__) */

deadbeef-1.9.6.tar.bz2/src/streamer.c Added

@@ -0,0 +1,2952 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ streamer implementation
+
+ Copyright (C) 2009-2017 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <assert.h>
+#include <unistd.h>
+#ifdef __linux__
+#include <sys/prctl.h>
+#endif
+#include <sys/time.h>
+#include <errno.h>
+#include "threading.h"
+#include "playlist.h"
+#include "plmeta.h"
+#include <deadbeef/common.h>
+#include "shared/ctmap.h"
+#include "streamer.h"
+#include "messagepump.h"
+#include "conf.h"
+#include "plugins.h"
+#include "volume.h"
+#include "vfs.h"
+#include "premix.h"
+#include "handler.h"
+#include "plugins/libparser/parser.h"
+#include "resizable_buffer.h"
+#include "ringbuf.h"
+#include <deadbeef/strdupa.h>
+#include "playqueue.h"
+#include "streamreader.h"
+#include "decodedblock.h"
+#include "dsp.h"
+#include "playmodes.h"
+#include "tf.h"
+#include "viz.h"
+#include "fft.h"
+#ifdef __APPLE__
+#include "coreaudio.h"
+#endif
+
+#ifdef trace
+#undef trace
+#define trace(...)
+#endif
+
+//#define WRITE_DUMP 1
+//#define DETECT_PL_LOCK_RC 1
+
+#if WRITE_DUMP
+FILE *out;
+#endif
+
+#define MAX_PLAYLIST_DOWNLOAD_SIZE 25000
+#define STREAMER_HINTS (DDB_DECODER_HINT_NEED_BITRATE|DDB_DECODER_HINT_CAN_LOOP)
+
+static intptr_t streamer_tid;
+
+static int autoconv_8_to_16 = 1;
+
+static int autoconv_16_to_24 = 0;
+
+static int bit_override = 0;
+
+static int conf_streamer_override_samplerate = 0;
+static int conf_streamer_use_dependent_samplerate = 0;
+static int conf_streamer_samplerate = 44100;
+static int conf_streamer_samplerate_mult_48 = 48000;
+static int conf_streamer_samplerate_mult_44 = 44100;
+static float conf_format_silence = -1.f;
+static float conf_playback_buffer_size = 0.3f;
+
+static int trace_bufferfill = 0;
+
+static int stop_after_current = 0;
+static int stop_after_album = 0;
+
+static int streaming_terminate;
+
+static uintptr_t mutex;
+
+static float last_seekpos = -1;
+
+static float playpos = 0; // play position of current song
+static int avg_bitrate = -1; // avg bitrate of current song
+
+static int streamer_is_buffering;
+
+static playlist_t *streamer_playlist;
+static playItem_t *playing_track;
+
+// If streaming_track has been removed from playlist, fallback to one of those tracks to pick next/prev.
+static playItem_t *next_track_to_play;
+static playItem_t *prev_track_to_play;
+
+static playItem_t *buffering_track;
+static float playtime; // total playtime of playing track
+static time_t started_timestamp; // result of calling time(NULL)
+static playItem_t *streaming_track;
+static playItem_t *last_played; // this is the last track that was played, should avoid setting this to NULL
+
+static ddb_waveformat_t prev_output_format; // last format that was sent to output via streamer_set_output_format
+static ddb_waveformat_t last_block_fmt; // input file format corresponding to the current output
+
+static char *_artist_tf;
+static char *_album_tf;
+
+static DB_fileinfo_t *fileinfo_curr;
+static uint64_t fileinfo_file_identifier;
+static DB_vfs_t *fileinfo_file_vfs;
+static DB_fileinfo_t *new_fileinfo;
+static uint64_t new_fileinfo_file_identifier;
+static DB_vfs_t *new_fileinfo_file_vfs;
+
+// This counter is incremented by one for each streamer_read call, which returns -1,
+// which means audio should stop, but we need to wait a bit until buffered data has finished playing,
+// so we wait AUDIO_STALL_WAIT periods
+#define AUDIO_STALL_WAIT 20
+static int _audio_stall_count;
+
+// to allow interruption of stall file requests
+static uint64_t streamer_file_identifier;
+static DB_vfs_t *streamer_file_vfs;
+
+static char *_int_output_buffer;
+static ringbuf_t _output_ringbuf;
+
+static resizable_buffer_t _dsp_process_buffer;
+static resizable_buffer_t _viz_read_buffer;
+
+#if defined(HAVE_XGUI) || defined(ANDROID)
+#include "equalizer.h"
+#endif
+
+// message queue
+static struct handler_s *handler;
+
+#if DETECT_PL_LOCK_RC
+volatile pthread_t streamer_lock_tid = 0;
+#endif
+void
+streamer_lock (void) {
+#if DETECT_PL_LOCK_RC
+ extern pthread_t pl_lock_tid;
+ assert (pl_lock_tid != pthread_self()); // not permitted to lock streamer from inside of pl_lock
+#endif
+ mutex_lock (mutex);
+#if DETECT_PL_LOCK_RC
+ streamer_lock_tid = pthread_self();
+#endif
+}
+
+void
+streamer_unlock (void) {
+#if DETECT_PL_LOCK_RC
+ streamer_lock_tid = 0;
+#endif
+ mutex_unlock (mutex);
+}
+
+static void
+play_index (int idx, int startpaused);
+
+static void
+play_current (void);
+
+static void
+play_next (int dir, ddb_shuffle_t shuffle, ddb_repeat_t repeat);
+
+static void
+streamer_set_current_playlist_real (int plt);
+
+static int
+stream_track (playItem_t *track, int startpaused);
+
+static void
+_handle_playback_stopped (void);
+
+static void
+_streamer_mark_album_played_up_to (playItem_t *item);
+
+static void
+streamer_abort_files (void) {
+ streamer_lock ();
+ DB_vfs_t *file_vfs = fileinfo_file_vfs;
+ uint64_t file_identifier = fileinfo_file_identifier;
+
+ DB_vfs_t *newfile_vfs = new_fileinfo_file_vfs;
+ uint64_t newfile_identifier = new_fileinfo_file_identifier;
+
+ DB_vfs_t *strfile_vfs =streamer_file_vfs;
+ uint64_t strfile_identifier = streamer_file_identifier;
+ streamer_unlock();
+
+ trace ("\0330;33mstreamer_abort_files\03337;0m\n");
+ trace ("%lld %lld %lld\n", file_identifier, newfile_identifier, strfile_identifier);
+
+ if (file_vfs && file_identifier) {
+ vfs_abort_with_identifier(file_vfs, file_identifier);
+ }
+ if (newfile_vfs && newfile_identifier) {
+ vfs_abort_with_identifier(newfile_vfs, newfile_identifier);
+ }
+ if (strfile_vfs && strfile_identifier) {
+ vfs_abort_with_identifier(strfile_vfs, strfile_identifier);
+ }
+
+}
+
+static void
+send_songstarted (playItem_t *trk) {
+ ddb_event_track_t *pev = (ddb_event_track_t *)messagepump_event_alloc (DB_EV_SONGSTARTED);
+ pev->track = DB_PLAYITEM (trk);
+ pl_item_ref (trk);
+ pev->playtime = 0;
+ pev->started_timestamp = time(NULL);
+ messagepump_push_event ((ddb_event_t*)pev, 0, 0);
+}
+
+static void
+send_songfinished (playItem_t *trk) {
+ ddb_event_track_t *pev = (ddb_event_track_t *)messagepump_event_alloc (DB_EV_SONGFINISHED);
+ pev->track = DB_PLAYITEM (trk);
+ pl_item_ref (trk);
+ pev->playtime = playtime;
+ pev->started_timestamp = started_timestamp;
+ messagepump_push_event ((ddb_event_t*)pev, 0, 0);
+}
+
+static void
+send_trackchanged (playItem_t *from, playItem_t *to) {
+ ddb_event_trackchange_t *event = (ddb_event_trackchange_t *)messagepump_event_alloc (DB_EV_SONGCHANGED);
+ event->playtime = playtime;
+ event->started_timestamp = started_timestamp;
+ if (from) {
+ pl_item_ref (from);
+ }
+ if (to) {
+ pl_item_ref (to);
+ }
+ event->from = (DB_playItem_t *)from;
+ event->to = (DB_playItem_t *)to;
+ messagepump_push_event ((ddb_event_t *)event, 0, 0);
+}
+
+void
+streamer_set_last_played (playItem_t *track) {
+ streamer_lock();
+ if (last_played) {
+ pl_item_unref (last_played);
+ }
+ last_played = track;
+ if (last_played) {
+ pl_item_ref (last_played);
+ }
+ streamer_unlock();
+}
+
+static void
+streamer_start_playback (playItem_t *from, playItem_t *it) {
+ if (from) {
+ pl_item_ref (from);
+ }
+ if (it) {
+ pl_item_ref (it);
+ }
+
+ streamer_set_playing_track (it);
+ if (playing_track) {
+ streamer_set_last_played (playing_track);
+
+ playItem_t *qnext = playqueue_getnext();
+ if (qnext == playing_track) {
+ playqueue_pop ();
+ }
+ if (qnext) {
+ // playlist change?
+ int idx = plt_get_item_idx(streamer_playlist, qnext, PL_MAIN);
+ if (idx == -1) {
+ playlist_t *plt = pl_get_playlist(qnext);
+ if (plt != NULL) {
+ streamer_set_streamer_playlist (plt);
+ plt_unref (plt);
+ }
+ }
+ pl_item_unref (qnext);
+ }
+
+ trace ("from=%p (%s), to=%p (%s) 2\n", from, from ? pl_find_meta (from, ":URI") : "null", it, it ? pl_find_meta (it, ":URI") : "null");
+ send_trackchanged (from, it);
+ started_timestamp = time (NULL);
+ }
+ if (from) {
+ pl_item_unref (from);
+ }
+ if (it) {
+ pl_item_unref (it);
+ }
+ trace ("streamer_start_playback %s\n", playing_track ? pl_find_meta (playing_track, ":URI") : "null");
+}
+
+
+static void
+streamer_set_streaming_track(playItem_t *it) {
+ streamer_lock();
+ if (streaming_track) {
+ pl_item_unref (streaming_track);
+ }
+ streaming_track = it;
+ if (streaming_track) {
+ pl_item_ref (streaming_track);
+ }
+ streamer_unlock();
+}
+
+playItem_t *
+streamer_get_streaming_track (void) {
+ if (streaming_track) {
+ pl_item_ref (streaming_track);
+ }
+ return streaming_track;
+}
+
+playItem_t *
+streamer_get_playing_track_unsafe (void) {
+ playItem_t *it = (buffering_track && !playing_track) ? buffering_track : playing_track;
+ if (it) {
+ pl_item_ref (it);
+ }
+ return it;
+}
+
+playItem_t *
+streamer_get_playing_track (void) {
+ // some plugins may call this from plugin.start, before streamer is initialized
+ if (mutex == 0) {
+ return NULL;
+ }
+ streamer_lock();
+ playItem_t *it = streamer_get_playing_track_unsafe();
+ streamer_unlock();
+ return it;
+}
+
+
+void
+streamer_set_playing_track (playItem_t *it) {
+ if (it == playing_track) {
+ return;
+ }
+
+ streamer_lock();
+ playItem_t *prev = playing_track;
+ playing_track = it;
+ streamer_unlock();
+
+ if (it) {
+ pl_item_ref (it);
+ }
+
+ if (prev) {
+ send_trackinfochanged(prev);
+ pl_item_unref (prev);
+ }
+
+ if (it) {
+ send_trackinfochanged(it);
+ }
+}
+
+playItem_t *
+streamer_get_buffering_track (void) {
+ playItem_t *it = buffering_track;
+ if (it) {
+ pl_item_ref (it);
+ }
+ return it;
+}
+
+void
+streamer_set_buffering_track (playItem_t *it) {
+ streamer_lock();
+ if (it == buffering_track) {
+ streamer_unlock();
+ return;
+ }
+
+ playItem_t *prev = buffering_track;
+
+ buffering_track = it;
+ if (buffering_track) {
+ pl_item_ref (buffering_track);
+ }
+ streamer_unlock();
+
+ send_trackinfochanged(prev);
+
+ if (it) {
+ send_trackinfochanged(it);
+ }
+
+ if (prev) {
+ pl_item_unref (prev);
+ }
+}
+
+int
+str_get_idx_of (playItem_t *it) {
+ pl_lock ();
+ if (!streamer_playlist) {
+ playlist_t *plt = plt_get_curr ();
+ streamer_set_streamer_playlist (plt);
+ plt_unref (plt);
+ }
+ playItem_t *c = streamer_playlist->headPL_MAIN;
+ int idx = 0;
+ while (c && c != it) {
+ c = c->nextPL_MAIN;
+ idx++;
+ }
+ if (!c) {
+ pl_unlock ();
+ return -1;
+ }
+ pl_unlock ();
+ return idx;
+}
+
+playItem_t *
+str_get_for_idx (int idx) {
+ pl_lock ();
+ if (!streamer_playlist) {
+ playlist_t *plt = plt_get_curr ();
+ streamer_set_streamer_playlist (plt);
+ plt_unref (plt);
+ }
+ playItem_t *it = streamer_playlist->headPL_MAIN;
+ while (idx--) {
+ if (!it) {
+ pl_unlock ();
+ return NULL;
+ }
+ it = it->nextPL_MAIN;
+ }
+ if (it) {
+ pl_item_ref (it);
+ }
+ pl_unlock ();
+ return it;
+}
+
+static int
+stop_after_album_check (playItem_t *cur, playItem_t *next) {
+ if (!stop_after_album) {
+ return 0;
+ }
+
+ if (!cur) {
+ return 0;
+ }
+
+ if (!next) {
+ stream_track (NULL, 0);
+ if (conf_get_int ("playlist.stop_after_album_reset", 0)) {
+ conf_set_int ("playlist.stop_after_album", 0);
+ stop_after_album = 0;
+ messagepump_push (DB_EV_CONFIGCHANGED, 0, 0, 0);
+ }
+ return 1;
+ }
+
+ const char *cur_album = pl_find_meta_raw (cur, "album");
+ const char *next_album = pl_find_meta_raw (next, "album");
+
+ const char *keys = {
+ "band",
+ "album artist",
+ "albumartist",
+ "artist",
+ NULL
+ };
+
+ const char *cur_artist = NULL;
+ const char *next_artist = NULL;
+ for (int i = 0; keysi; i++) {
+ if (!cur_artist) {
+ cur_artist = pl_find_meta_raw (cur, keysi);
+ }
+ if (!next_artist) {
+ next_artist = pl_find_meta_raw (next, keysi);
+ }
+ if (cur_artist && next_artist) {
+ break;
+ }
+ }
+
+ if (cur_artist == next_artist && cur_album == next_album) {
+ return 0;
+ }
+
+ stream_track (NULL, 0);
+ if (conf_get_int ("playlist.stop_after_album_reset", 0)) {
+ conf_set_int ("playlist.stop_after_album", 0);
+ stop_after_album = 0;
+ messagepump_push (DB_EV_CONFIGCHANGED, 0, 0, 0);
+ }
+
+ return 1;
+}
+
+static playItem_t *
+get_random_track (void) {
+ if (!streamer_playlist) {
+ playlist_t *plt = plt_get_curr ();
+ streamer_set_streamer_playlist (plt);
+ plt_unref (plt);
+ }
+ playlist_t *plt = streamer_playlist;
+ int cnt = plt->countPL_MAIN;
+ if (!cnt) {
+ trace ("empty playlist\n");
+ return NULL;
+ }
+ int curr = str_get_idx_of (streaming_track);
+ int r = (int)(rand () / (double)RAND_MAX * cnt);
+ if (r == curr) {
+ r++;
+ if (r >= cnt) {
+ r = 0;
+ }
+ }
+
+ return plt_get_item_for_idx (plt, r, PL_MAIN);
+}
+
+static playItem_t *
+get_next_track (playItem_t *curr, ddb_shuffle_t shuffle, ddb_repeat_t repeat) {
+ pl_lock ();
+
+ if (next_track_to_play != NULL) {
+ pl_item_ref(next_track_to_play);
+ pl_unlock();
+ return next_track_to_play;
+ }
+
+ if (!streamer_playlist) {
+ playlist_t *plt = plt_get_curr ();
+ streamer_set_streamer_playlist (plt);
+ plt_unref (plt);
+ }
+
+ while (playqueue_getcount ()) {
+ trace ("playqueue_getnext\n");
+ playItem_t *it = playqueue_getnext ();
+ if (it) {
+ pl_unlock ();
+ return it; // from playqueue
+ }
+ }
+
+ playlist_t *plt = streamer_playlist;
+ if (!plt->headPL_MAIN) {
+ pl_unlock ();
+ return NULL; // empty playlist
+ }
+
+ if (plt_get_item_idx (streamer_playlist, curr, PL_MAIN) == -1) {
+ playlist_t *item_plt = pl_get_playlist(curr);
+ if (!item_plt) {
+ curr = NULL;
+ }
+ if (item_plt) {
+ plt_unref (item_plt);
+ }
+ }
+
+ if (shuffle == DDB_SHUFFLE_TRACKS || shuffle == DDB_SHUFFLE_ALBUMS) { // shuffle
+ playItem_t *it = NULL;
+ if (!curr || shuffle == DDB_SHUFFLE_TRACKS) {
+ // find minimal notplayed
+ playItem_t *pmin = NULL; // notplayed minimum
+ for (playItem_t *i = plt->headPL_MAIN; i; i = i->nextPL_MAIN) {
+ if (pl_get_played (i)) {
+ continue;
+ }
+ if (!pmin || pl_get_shufflerating(i) < pl_get_shufflerating(pmin)) {
+ pmin = i;
+ }
+ }
+ it = pmin;
+ if (!it) {
+ // all songs played, reshuffle and try again
+ if (repeat == DDB_REPEAT_ALL) { // loop
+ plt_reshuffle (streamer_playlist, &it, NULL);
+ }
+ }
+ if (!it) { // nothing found after reshuffle
+ pl_unlock ();
+ return NULL;
+ }
+ }
+ else {
+ // find minimal notplayed above current
+ int rating = pl_get_shufflerating(curr);
+ playItem_t *pmin = NULL; // notplayed minimum
+ for (playItem_t *i = plt->headPL_MAIN; i; i = i->nextPL_MAIN) {
+ if (pl_get_played(i) || pl_get_shufflerating (i) < rating) {
+ continue;
+ }
+ if (!pmin || pl_get_shufflerating (i) < pl_get_shufflerating (pmin)) {
+ pmin = i;
+ }
+ }
+ it = pmin;
+ if (!it) {
+ // all songs played, reshuffle and try again
+ if (repeat == DDB_REPEAT_ALL) { // loop
+ trace ("all songs played! reshuffle\n");
+ plt_reshuffle (streamer_playlist, &it, NULL);
+ }
+ }
+ if (!it) {
+ playItem_t *temp;
+ plt_reshuffle (streamer_playlist, &temp, NULL);
+ pl_unlock ();
+ return NULL;
+ }
+ }
+ // prevent repeating the same track after reshuffle
+ if (it == curr) {
+ if (it->nextPL_MAIN) {
+ it = it->nextPL_MAIN;
+ }
+ else if (plt->headPL_MAIN && plt->headPL_MAIN != it) {
+ it = plt->headPL_MAIN;
+ }
+ }
+
+ // plt_reshuffle doesn't add ref
+ pl_item_ref (it);
+ pl_unlock ();
+ return it;
+ }
+ else if (shuffle == DDB_SHUFFLE_OFF) { // linear
+ playItem_t *it = NULL;
+ if (curr) {
+ it = curr->nextPL_MAIN;
+ }
+ else {
+ it = plt->headPL_MAIN;
+ }
+ if (!it) {
+ trace ("streamer_move_nextsong: was last track\n");
+ if (repeat == DDB_REPEAT_ALL) {
+ it = plt->headPL_MAIN;
+ }
+ else {
+ pl_unlock ();
+ return NULL;
+ }
+ }
+ if (!it) {
+ pl_unlock ();
+ return NULL;
+ }
+ pl_item_ref (it);
+ pl_unlock ();
+ return it;
+ }
+ else if (shuffle == DDB_SHUFFLE_RANDOM) { // random
+ pl_unlock ();
+ return get_random_track ();
+ }
+ pl_unlock ();
+ return NULL;
+}
+
+static playItem_t *
+get_prev_track (playItem_t *curr, ddb_shuffle_t shuffle, ddb_repeat_t repeat) {
+ pl_lock ();
+ 
+ if (prev_track_to_play != NULL) {
+ pl_item_ref(prev_track_to_play);
+ pl_unlock();
+ return prev_track_to_play;
+ }
+
+ // check if prev song is in this playlist
+ if (curr && -1 == str_get_idx_of (curr)) {
+ curr = NULL;
+ }
+
+ if (!streamer_playlist) {
+ playlist_t *plt = plt_get_curr ();
+ streamer_set_streamer_playlist (plt);
+ plt_unref (plt);
+ }
+ 
+ playlist_t *plt = streamer_playlist;
+
+ if (!plt->headPL_MAIN) {
+ pl_unlock ();
+ return NULL;
+ }
+ if (shuffle == DDB_SHUFFLE_TRACKS || shuffle == DDB_SHUFFLE_ALBUMS) { // shuffle
+ if (!curr) {
+ playItem_t *it = plt->headPL_MAIN;
+ pl_item_ref(it);
+ pl_unlock ();
+ return it;
+ }
+ else {
+ pl_set_played(curr, 0);
+ // find already played song with maximum shuffle rating below prev song
+ int rating = pl_get_shufflerating(curr);
+ playItem_t *pmax = NULL; // played maximum
+ playItem_t *amax = NULL; // absolute maximum
+ for (playItem_t *i = plt->headPL_MAIN; i; i = i->nextPL_MAIN) {
+ int played = pl_get_played(i);
+ if (i != curr && played && (!amax || pl_get_shufflerating (i) > pl_get_shufflerating (amax))) {
+ amax = i;
+ }
+ if (i == curr || pl_get_shufflerating (i) > rating || !played) {
+ continue;
+ }
+ if (!pmax || pl_get_shufflerating (i) > pl_get_shufflerating (pmax)) {
+ pmax = i;
+ }
+ }
+
+ if (pmax && shuffle == DDB_SHUFFLE_ALBUMS) {
+ while (pmax && pmax->nextPL_MAIN && pl_get_played(pmax->nextPL_MAIN) && pl_get_shufflerating (pmax) == pl_get_shufflerating ( pmax->nextPL_MAIN)) {
+ pmax = pmax->nextPL_MAIN;
+ }
+ }
+
+ playItem_t *it = pmax;
+ if (!it) {
+ // that means 1st in playlist, take amax
+ if (repeat == DDB_REPEAT_ALL) {
+ if (!amax) {
+ plt_reshuffle (streamer_playlist, NULL, &amax);
+ }
+ it = amax;
+ }
+ }
+
+ if (!it) {
+ pl_unlock ();
+ return NULL;
+ }
+ pl_item_ref (it);
+ pl_unlock ();
+ return it;
+ }
+ }
+ else if (shuffle == DDB_SHUFFLE_OFF) { // linear
+ playItem_t *it = NULL;
+ if (curr) {
+ it = curr->prevPL_MAIN;
+ }
+ else {
+ it = plt->tailPL_MAIN;
+ }
+ if (!it) {
+ pl_unlock ();
+ return NULL;
+ }
+ pl_item_ref(it);
+ pl_unlock ();
+ return it;
+ }
+ else if (shuffle == DDB_SHUFFLE_RANDOM) { // random
+ pl_unlock();
+ return get_random_track();
+ }
+ pl_unlock ();
+ return NULL;
+}
+
+int
+streamer_move_to_nextsong (int r) {
+ if (r) {
+ streamer_abort_files ();
+ }
+ handler_push (handler, STR_EV_NEXT, 0, r, 0);
+ return 0;
+}
+
+int
+streamer_move_to_prevsong (int r) {
+ if (r) {
+ streamer_abort_files ();
+ }
+ handler_push (handler, STR_EV_PREV, 0, r, 0);
+ return 0;
+}
+
+int
+streamer_move_to_randomsong (int r) {
+ if (r) {
+ streamer_abort_files ();
+ }
+ handler_push (handler, STR_EV_RAND, 0, r, 0);
+ return 0;
+}
+
+static void
+streamer_set_next_track_to_play(playItem_t *next) {
+ if (next_track_to_play != NULL) {
+ pl_item_unref(next_track_to_play);
+ next_track_to_play = NULL;
+ }
+ next_track_to_play = next;
+ if (next_track_to_play) {
+ pl_item_ref(next_track_to_play);
+ }
+}
+
+static void
+streamer_set_prev_track_to_play(playItem_t *prev) {
+ if (prev_track_to_play != NULL) {
+ pl_item_unref(prev_track_to_play);
+ prev_track_to_play = NULL;
+ }
+ prev_track_to_play = prev;
+ if (prev_track_to_play) {
+ pl_item_ref(prev_track_to_play);
+ }
+}
+
+// playlist must call that whenever item was removed
+void
+streamer_song_removed_notify (playItem_t *it) {
+ if (!mutex) {
+ return; // streamer is not running
+ }
+ streamer_lock();
+
+ playItem_t *next = NULL;
+ playItem_t *prev = NULL;
+
+ if (streaming_track == it || next_track_to_play == it) {
+ ddb_shuffle_t shuffle = streamer_get_shuffle ();
+ ddb_repeat_t repeat = streamer_get_repeat ();
+ streamer_set_next_track_to_play (NULL);
+ next = get_next_track (it, shuffle, repeat);
+ prev = get_prev_track (it, shuffle, repeat);
+ }
+ streamer_set_next_track_to_play (next);
+ streamer_set_prev_track_to_play (prev);
+
+ if (next != NULL) {
+ pl_item_unref(next);
+ }
+ if (prev != NULL) {
+ pl_item_unref(prev);
+ }
+
+ streamer_unlock();
+}
+
+static ddb_ctmap_t *streamer_ctmap;
+static char conf_network_ctmapping2048;
+static uintptr_t ctmap_mutex;
+
+static void
+ctmap_init_mutex (void) {
+ ctmap_mutex = mutex_create ();
+}
+
+static void
+ctmap_free_mutex (void) {
+ if (ctmap_mutex) {
+ mutex_free (ctmap_mutex);
+ ctmap_mutex = 0;
+ }
+}
+
+static void
+ctmap_lock (void) {
+ mutex_lock (ctmap_mutex);
+}
+
+static void
+ctmap_unlock (void) {
+ mutex_unlock (ctmap_mutex);
+}
+
+static int
+is_remote_stream (playItem_t *it) {
+ int remote = 0;
+ pl_lock ();
+ const char *uri = pl_find_meta (it, ":URI");
+ if (uri && !plug_is_local_file (uri)) {
+ remote = 1;
+ }
+ pl_unlock ();
+ return remote;
+}
+
+static DB_fileinfo_t *dec_open (DB_decoder_t *dec, uint32_t hints, playItem_t *it) {
+ if (dec->plugin.api_vminor >= 7 && dec->open2) {
+ DB_fileinfo_t *fi = dec->open2 (hints, DB_PLAYITEM (it));
+ return fi;
+ }
+ return dec->open (hints);
+}
+
+static playItem_t *first_failed_track;
+
+// handle "first failed track" logic,
+// and initialize dummy fileinfo for handling track switching for the tracks which can't be played
+static void
+streamer_play_failed (playItem_t *failed_track) {
+ streamer_lock();
+ if (!first_failed_track) {
+ first_failed_track = failed_track;
+ if (first_failed_track) {
+ pl_item_ref (first_failed_track);
+ }
+ }
+ else if (!failed_track) { // reset fail check
+ if (first_failed_track) {
+ pl_item_unref (first_failed_track);
+ first_failed_track = NULL;
+ }
+ }
+
+ if (failed_track) {
+ streamer_set_last_played (failed_track);
+ // the track has failed to be played,
+ // but we want to send it down to streamreader for proper track switching etc.
+ fileinfo_curr = calloc(1, sizeof (DB_fileinfo_t));
+
+ fileinfo_file_vfs = NULL;
+ fileinfo_file_identifier = 0;
+
+ new_fileinfo = NULL;
+ new_fileinfo_file_vfs = NULL;
+ new_fileinfo_file_identifier = 0;
+
+ streamer_set_streaming_track(failed_track);
+ }
+ streamer_unlock();
+}
+
+static void
+fileinfo_free (DB_fileinfo_t *fileinfo) {
+ if (fileinfo->plugin) {
+ fileinfo->plugin->free (fileinfo);
+ }
+ else {
+ free (fileinfo);
+ }
+}
+
+static int
+stream_track (playItem_t *it, int startpaused) {
+ streamer_lock();
+ if (fileinfo_curr) {
+ fileinfo_free (fileinfo_curr);
+ fileinfo_curr = NULL;
+ fileinfo_file_vfs = NULL;
+ fileinfo_file_identifier = 0;
+ }
+ streamer_unlock();
+ trace ("stream_track %s\n", playing_track ? pl_find_meta (playing_track, ":URI") : "null");
+ int err = 0;
+ playItem_t *from = NULL;
+ playItem_t *to = NULL;
+
+ if (first_failed_track && first_failed_track == it) {
+ // looped to the first failed track
+ _handle_playback_stopped();
+ goto error;
+ }
+
+ // need to add refs here, because streamer_start_playback can destroy items
+ from = playing_track;
+ to = it;
+ if (from) {
+ pl_item_ref (from);
+ }
+ if (to) {
+ pl_set_played(to, 1);
+ pl_item_ref (to);
+ }
+
+ streamer_set_streaming_track(NULL);
+
+ int paused_stream = 0;
+ if (it && startpaused) {
+ paused_stream = is_remote_stream (it);
+ }
+
+ if (!it || paused_stream) {
+ goto success;
+ }
+
+ char decoder_id100 = "";
+ char filetype100 = "";
+ pl_lock ();
+ const char *dec_id = pl_find_meta (it, ":DECODER");
+ if (dec_id) {
+ strncpy (decoder_id, dec_id, sizeof (decoder_id));
+ }
+
+ if (!decoder_id0) {
+ // some decoders set filetype override,
+ // but the override is invalid when decoder is not set.
+ // reset to default here, so that tracks become playable after failures
+ pl_delete_meta(it, "!FILETYPE");
+ }
+
+ const char *ft = pl_find_meta (it, ":FILETYPE");
+ if (ft) {
+ strncpy (filetype, ft, sizeof (filetype));
+ }
+ pl_unlock ();
+ char *cct = "undefined";
+ char *plugsDDB_CTMAP_MAX_PLUGINS = {NULL};
+ if (!decoder_id0 && (!strcmp (filetype, "content") || !filetype0)) {
+ // try to get content-type
+ trace ("\0330;34mopening file %s\03337;0m\n", pl_find_meta (it, ":URI"));
+ pl_lock ();
+ char *uri = strdupa (pl_find_meta (it, ":URI"));
+ pl_unlock ();
+ DB_FILE *fp = vfs_fopen (uri);
+ trace ("\0330;34mgetting content-type\03337;0m\n");
+ if (!fp) {
+ err = -1;
+ goto error;
+ }
+ streamer_file_vfs = fp->vfs;
+ streamer_file_identifier = vfs_get_identifier (fp);
+
+ const char *ct = vfs_get_content_type (fp);
+ if (!ct) {
+ vfs_fclose (fp);
+ fp = NULL;
+
+ streamer_file_vfs = NULL;
+ streamer_file_identifier = 0;
+
+ if (!startpaused) {
+ streamer_play_failed (it);
+ }
+ else {
+ err = -1;
+ }
+
+ pl_lock ();
+ trace_err ("Failed to play track: %s\n", pl_find_meta(it, ":URI"));
+ pl_unlock ();
+
+ goto error;
+ }
+ trace ("got content-type: %s\n", ct);
+ cct = strdupa (ct);
+ char *sc = strchr (cct, ';');
+ if (sc) {
+ *sc = 0;
+ }
+
+ ctmap_lock ();
+ ddb_ctmap_t *ctmap = streamer_ctmap;
+ while (ctmap) {
+ if (!strcmp (cct, ctmap->ct)) {
+ break;
+ }
+ ctmap = ctmap->next;
+ }
+ if (ctmap) {
+ int i;
+ for (i = 0; ctmap->pluginsi; i++) {
+ plugsi = strdupa (ctmap->pluginsi);
+ }
+ plugsi = NULL;
+ }
+ ctmap_unlock ();
+
+ if (!plugs0 && (!strcmp (cct, "audio/x-mpegurl") || !strncmp (cct, "text/html", 9) || !strncmp (cct, "audio/x-scpls", 13) || !strncmp (cct, "application/octet-stream", 9))) {
+ // download playlist into temp file
+ trace ("downloading playlist into temp file...\n");
+ char *buf = NULL;
+ int fd = -1;
+ FILE *out = NULL;
+ char tempfile1000 = "";
+
+ int64_t size = vfs_fgetlength (fp);
+ if (size <= 0) {
+ size = MAX_PLAYLIST_DOWNLOAD_SIZE;
+ }
+ buf = malloc (size);
+ if (!buf) {
+ trace ("failed to alloc %d bytes for playlist buffer\n", size);
+ goto m3u_error;
+ }
+ trace ("reading %d bytes\n", size);
+ int64_t rd = vfs_fread (buf, 1, size, fp);
+ if (rd <= 0) {
+ trace ("failed to download %d bytes (got %d bytes)\n", size, rd);
+ goto m3u_error;
+ }
+#ifndef ANDROID
+ const char *tmpdir = getenv ("TMPDIR");
+ if (!tmpdir) {
+ tmpdir = "/tmp";
+ }
+#else
+ const char *tmpdir = dbconfdir;
+#endif
+ snprintf (tempfile, sizeof (tempfile), "%s/ddbm3uXXXXXX", tmpdir);
+
+ fd = mkstemp (tempfile);
+ if (fd == -1) {
+ trace ("failed to open temp file %s\n", tempfile);
+ goto m3u_error;
+ }
+ trace ("writing to %s\n", tempfile);
+ out = fdopen (fd, "w+b");
+ if (!out) {
+ trace ("fdopen failed for %s\n", tempfile);
+ goto m3u_error;
+ }
+ int64_t rw = fwrite (buf, 1, rd, out);
+ if (rw != rd) {
+ trace ("failed to write %d bytes into file %s\n", size, tempfile);
+ goto m3u_error;
+ }
+ fclose (out);
+ fd = -1;
+ out = NULL;
+
+ trace ("loading playlist from %s\n", tempfile);
+ // load playlist
+ playlist_t *plt = plt_alloc ("temp");
+ DB_playlist_t **plug = plug_get_playlist_list ();
+ int p;
+ DB_playItem_t *m3u = NULL;
+ for (p = 0; plugp; p++) {
+ if (plugp->load) {
+ m3u = plugp->load ((ddb_playlist_t *)plt, NULL, tempfile, NULL, NULL, NULL);
+ if (m3u) {
+ break;
+ }
+ }
+ }
+ if (!m3u) {
+ trace ("failed to load playlist from %s using any of the installed playlist plugins\n", tempfile);
+ plt_free (plt);
+ goto m3u_error;
+ }
+
+ // hack: need to sleep here, some servers like to reject frequent connections
+ usleep(conf_get_int ("streamer.wait_ms_after_m3u_link", 400000));
+
+ // for every playlist uri: override stream uri with the one from playlist, and try to play it
+ playItem_t *i = (playItem_t *)m3u;
+ pl_item_ref (i);
+ int res = -1;
+ while (i) {
+ pl_lock ();
+ pl_replace_meta (it, "!URI", pl_find_meta_raw (i, ":URI"));
+ pl_unlock ();
+ res = stream_track (it, 0);
+ if (!res) {
+ pl_item_unref (i);
+ break;
+ }
+ playItem_t *next = pl_get_next (i, PL_MAIN);
+ pl_item_unref (i);
+ i = next;
+ }
+ plt_free (plt);
+ if (res == 0) {
+ // succeeded -- playing now
+ streamer_play_failed (NULL); // reset failed track
+ if (from) {
+ pl_item_unref (from);
+ }
+ if (to) {
+ pl_item_unref (to);
+ }
+ if (buf) {
+ free (buf);
+ }
+ unlink (tempfile);
+ return res;
+ }
+
+m3u_error:
+ if (*tempfile) {
+ unlink (tempfile);
+ }
+ if (buf) {
+ free (buf);
+ }
+ if (out) {
+ fclose (out);
+ }
+ else if (fd != -1) {
+ close (fd);
+ }
+
+ if (!startpaused) {
+ streamer_play_failed (it);
+ }
+ else {
+ err = -1;
+ }
+
+ pl_lock ();
+ trace_err ("Failed to play track: %s\n", pl_find_meta(it, ":URI"));
+ pl_unlock ();
+
+ goto error;
+
+ }
+
+ streamer_file_vfs = NULL;
+ streamer_file_identifier = 0;
+
+ vfs_fclose (fp);
+ }
+
+ int plug_idx = 0;
+ for (;;) {
+ if (!decoder_id0 && plugs0 && !plugsplug_idx) {
+ pl_set_played(it, 1);
+ trace_err ("No suitable decoder found for stream %s of content-type %s\n", pl_find_meta (playing_track, ":URI"), cct);
+
+ if (!startpaused) {
+ streamer_play_failed (it);
+ }
+ else {
+ err = -1;
+ }
+ goto error;
+ }
+
+ DB_decoder_t *dec = NULL;
+
+ if (decoder_id0) {
+ dec = plug_get_decoder_for_id (decoder_id);
+ decoder_id0 = 0;
+ if (!dec) {
+ // find new decoder by file extension
+ pl_lock ();
+ const char *fname = pl_find_meta (it, ":URI");
+ const char *ext = strrchr (fname, '.');
+ if (ext) {
+ ext++;
+ DB_decoder_t **decs = plug_get_decoder_list ();
+ for (int i = 0; decsi; i++) {
+ const char **exts = decsi->exts;
+ if (exts) {
+ for (int j = 0; extsj; j++) {
+ if (!strcasecmp (extsj, ext) || !strcmp (extsj, "*")) {
+ fprintf (stderr, "streamer: %s : changed decoder plugin to %s\n", fname, decsi->plugin.id);
+ pl_replace_meta (it, "!DECODER", decsi->plugin.id);
+ pl_replace_meta (it, "!FILETYPE", ext);
+ dec = decsi;
+ break;
+ }
+ }
+ }
+ }
+ }
+ pl_unlock ();
+ }
+ }
+ else if (plugs0) {
+ // match by decoder
+ dec = plug_get_decoder_for_id (plugsplug_idx);
+ if (dec) {
+ pl_replace_meta (it, "!DECODER", dec->plugin.id);
+ }
+ plug_idx++;
+ }
+
+ if (!dec) {
+ trace ("no decoder in playitem!\n");
+
+ if (!startpaused) {
+ streamer_play_failed (it);
+ }
+ else {
+ err = -1;
+ }
+
+ pl_lock ();
+ trace_err ("Failed to play track: %s\n", pl_find_meta(it, ":URI"));
+ pl_unlock ();
+
+ goto error;
+ }
+
+ trace ("\0330;33minit decoder for %s (%s)\03337;0m\n", pl_find_meta (it, ":URI"), dec->plugin.id);
+ DB_fileinfo_t *temp_fileinfo = dec_open (dec, STREAMER_HINTS, it);
+ streamer_lock();
+ new_fileinfo = temp_fileinfo;
+ if (new_fileinfo && new_fileinfo->file) {
+ new_fileinfo_file_vfs = new_fileinfo->file->vfs;
+ new_fileinfo_file_identifier = vfs_get_identifier(new_fileinfo->file);
+ }
+ else {
+ new_fileinfo_file_vfs = NULL;
+ new_fileinfo_file_identifier = 0;
+ }
+ int have_new_fileinfo = new_fileinfo != NULL;
+ streamer_unlock();
+ if (have_new_fileinfo && dec->init (new_fileinfo, DB_PLAYITEM (it)) != 0) {
+ trace ("\0330;31mfailed to init decoder\03337;0m\n");
+ pl_delete_meta (it, "!DECODER");
+ streamer_lock();
+ dec->free (new_fileinfo);
+ new_fileinfo = NULL;
+ new_fileinfo_file_vfs = NULL;
+ new_fileinfo_file_identifier = 0;
+ have_new_fileinfo = 0;
+ streamer_unlock();
+ }
+
+ if (!have_new_fileinfo) {
+ trace ("decoder %s failed\n", dec->plugin.id);
+ continue;
+ }
+ else {
+ streamer_lock();
+ if (new_fileinfo->file) {
+ new_fileinfo_file_vfs = new_fileinfo->file->vfs;
+ new_fileinfo_file_identifier = vfs_get_identifier (new_fileinfo->file);
+ }
+ else {
+ new_fileinfo_file_vfs = NULL;
+ new_fileinfo_file_identifier = 0;
+ }
+
+ streamer_set_streaming_track (it);
+ streamer_unlock();
+
+ trace ("bps=%d, channels=%d, samplerate=%d\n", new_fileinfo->fmt.bps, new_fileinfo->fmt.channels, new_fileinfo->fmt.samplerate);
+ break;
+ }
+ }
+success:
+ streamer_play_failed (NULL);
+ streamer_lock();
+ if (new_fileinfo) {
+ fileinfo_curr = new_fileinfo;
+ new_fileinfo = NULL;
+ new_fileinfo_file_vfs = NULL;
+ new_fileinfo_file_identifier = 0;
+ }
+ streamer_unlock();
+
+error:
+ if (from) {
+ pl_item_unref (from);
+ }
+ if (to) {
+ pl_item_unref (to);
+ }
+
+ return err;
+}
+
+float
+streamer_get_playpos (void) {
+ streamer_lock();
+ float seek = last_seekpos;
+ if (seek >= 0) {
+ streamer_unlock();
+ return seek;
+ }
+ float ret = playpos;
+ streamer_unlock();
+ return ret;
+}
+
+int
+streamer_get_apx_bitrate (void) {
+ streamer_lock ();
+ int res = avg_bitrate;
+ streamer_unlock ();
+ return res;
+}
+
+void
+streamer_set_nextsong (int song, int startpaused) {
+ streamer_abort_files ();
+ if (song == -1) {
+ // this is a stop query -- clear the queue
+ handler_reset (handler);
+ }
+ handler_push (handler, STR_EV_PLAY_TRACK_IDX, 0, song, startpaused);
+}
+
+void
+streamer_set_seek (float pos) {
+ streamer_lock();
+ last_seekpos = pos;
+ streamer_unlock();
+ handler_push (handler, STR_EV_SEEK, 0, *((uint32_t *)&pos), 0);
+}
+
+static void
+update_stop_after_current (void) {
+ if (conf_get_int ("playlist.stop_after_current_reset", 0)) {
+ conf_set_int ("playlist.stop_after_current", 0);
+ stop_after_current = 0;
+ messagepump_push (DB_EV_CONFIGCHANGED, 0, 0, 0);
+ }
+}
+
+static void
+streamer_next (ddb_shuffle_t shuffle, ddb_repeat_t repeat, playItem_t *next) {
+ if (playing_track) {
+ if (repeat == DDB_REPEAT_SINGLE) { // song finished, loop mode is "loop 1 track"
+ next = playing_track;
+ }
+ }
+ if (!next) {
+ next = get_next_track (streaming_track, shuffle, repeat);
+ }
+ else {
+ pl_item_ref (next);
+ }
+ stream_track (next, 0);
+ if (next) {
+ pl_item_unref (next);
+ }
+}
+
+static void
+streamer_shuffle_changed (ddb_shuffle_t prev, ddb_shuffle_t shuffle);
+
+static void
+streamer_seek_real (float seekpos) {
+ // Some fileinfos can exist without plugin bound to them,
+ // for example when a track failed to play.
+ // Don't attempt seeking in them.
+ if (!fileinfo_curr || !fileinfo_curr->plugin) {
+ return;
+ }
+ float seek = seekpos;
+ playItem_t *track = playing_track;
+ if (!playing_track) {
+ track = streaming_track;
+ }
+ float dur = track ? pl_get_item_duration (track) : -1;
+ if (seek >= 0 && dur > 0) {
+ if (seek >= dur) {
+ seek = dur - 0.000001f;
+ }
+
+ streamer_lock ();
+ playpos = seek;
+ streamer_unlock ();
+ trace ("seeking to %f\n", seek);
+
+ if (track == playing_track && track != streaming_track) {
+ // restart streaming the playing track
+ if (stream_track (playing_track, 0) < 0) {
+ streamer_move_to_nextsong (0);
+ return;
+ }
+ }
+
+ if (fileinfo_curr && track && dur > 0) {
+ streamer_lock ();
+ float seek_to_playpos = playpos;
+ streamer_unlock();
+
+ if (fileinfo_curr->plugin->seek (fileinfo_curr, seek_to_playpos) >= 0) {
+ streamer_reset (1);
+ }
+ streamer_lock ();
+ playpos = fileinfo_curr->readpos;
+ avg_bitrate = -1;
+ streamer_unlock();
+ }
+ ddb_event_playpos_t *ev = (ddb_event_playpos_t *)messagepump_event_alloc (DB_EV_SEEKED);
+ ev->track = DB_PLAYITEM (track);
+ if (track) {
+ pl_item_ref (track);
+ }
+ ev->playpos = playpos;
+ messagepump_push_event ((ddb_event_t*)ev, 0, 0);
+ }
+ streamer_lock();
+ last_seekpos = -1;
+ streamer_unlock();
+}
+
+static void
+_update_buffering_state (void) {
+ streamer_lock ();
+ int blocks_ready = streamreader_num_blocks_ready ();
+ streamer_unlock ();
+ int buffering = (blocks_ready < 4) && streaming_track;
+
+ if (buffering != streamer_is_buffering) {
+ streamer_lock();
+ streamer_is_buffering = buffering;
+ streamer_unlock();
+
+ // update buffering UI
+ if (!buffering) {
+ if (buffering_track) {
+ playItem_t *prev = buffering_track;
+ pl_item_ref (prev);
+ streamer_set_buffering_track (NULL);
+ send_trackinfochanged (prev);
+ pl_item_unref (prev);
+ }
+ else if (playing_track) {
+ send_trackinfochanged (playing_track);
+ }
+ }
+ else if (buffering_track) {
+ send_trackinfochanged (buffering_track);
+ }
+ }
+}
+
+static void
+handle_track_change (playItem_t *from, playItem_t *track) {
+ // next track started
+ if (from) {
+ send_songfinished (from);
+ streamer_lock();
+ playpos = 0;
+ streamer_unlock();
+ }
+
+ streamer_start_playback (from, track);
+
+ // only reset playpos/bitrate if track changing to another,
+ // otherwise the track is the first one, and playpos is pre-set
+ playtime = 0;
+ avg_bitrate = -1;
+ streamer_lock();
+ last_seekpos = -1;
+ streamer_unlock();
+ if (playing_track) {
+ send_songstarted (playing_track);
+ }
+}
+
+static void
+get_desired_output_format (ddb_waveformat_t *in_fmt, ddb_waveformat_t *out_fmt) {
+ memcpy (out_fmt, in_fmt, sizeof (ddb_waveformat_t));
+
+ if (autoconv_8_to_16) {
+ if (out_fmt->bps == 8) {
+ out_fmt->bps = 16;
+ }
+ }
+ if (autoconv_16_to_24) {
+ if (out_fmt->bps == 16) {
+ out_fmt->bps = 24;
+ }
+ }
+ if (bit_override == 1) {
+ out_fmt->bps = 8;
+ out_fmt->is_float = 0;
+ }
+ else if (bit_override == 2) {
+ out_fmt->bps = 16;
+ out_fmt->is_float = 0;
+ }
+ else if (bit_override == 3) {
+ out_fmt->bps = 24;
+ out_fmt->is_float = 0;
+ }
+ else if (bit_override == 4) {
+ out_fmt->bps = 32;
+ out_fmt->is_float = 0;
+ }
+ else if (bit_override == 5) {
+ out_fmt->bps = 32;
+ out_fmt->is_float = 1;
+ }
+
+#if !defined(ANDROID) && !defined(HAVE_XGUI)
+ // samplerate override
+ if (conf_streamer_override_samplerate) {
+ out_fmt->samplerate = conf_streamer_samplerate;
+ if (conf_streamer_use_dependent_samplerate) {
+ if (0 == (in_fmt->samplerate % 48000)) {
+ out_fmt->samplerate = conf_streamer_samplerate_mult_48;
+ }
+ else if (0 == (in_fmt->samplerate % 44100)) {
+ out_fmt->samplerate = conf_streamer_samplerate_mult_44;
+ }
+ }
+ }
+#endif
+
+ // android simulation on PC: force 16 bit and 44100 or 48000 only, to force format conversion
+#if !defined(ANDROID) && defined(HAVE_XGUI)
+ out_fmt->bps = 16;
+ if (!(out_fmt->samplerate % 48000)) {
+ out_fmt->samplerate = 48000;
+ }
+ else if (!(out_fmt->samplerate % 44100)) {
+ out_fmt->samplerate = 44100;
+ }
+#endif
+}
+
+static void
+streamer_set_output_format (ddb_waveformat_t *fmt) {
+ ddb_waveformat_t outfmt;
+ get_desired_output_format (fmt, &outfmt);
+ if (memcmp (&prev_output_format, &outfmt, sizeof (ddb_waveformat_t))) {
+ memcpy (&prev_output_format, &outfmt, sizeof (ddb_waveformat_t));
+ DB_output_t *output = plug_get_output ();
+ output->setformat (&outfmt);
+ }
+}
+
+static void
+_streamer_requeue_after_current (ddb_repeat_t repeat, ddb_shuffle_t shuffle) {
+ if (!playing_track) {
+ return;
+ }
+ streamer_lock ();
+ streamreader_flush_after (playing_track);
+
+ if (playing_track == streaming_track) {
+ streamer_unlock ();
+ return;
+ }
+
+ streamer_set_streaming_track(playing_track);
+ streamer_unlock ();
+ streamer_next (shuffle, repeat, NULL);
+}
+
+static void
+_streamer_track_deleted (ddb_repeat_t repeat, ddb_shuffle_t shuffle) {
+ // cancel buffering of next track, if it's not in playlist anymore
+
+ if (!streaming_track) {
+ return;
+ }
+
+ if (playing_track && streaming_track == playing_track) {
+ return;
+ }
+
+ playlist_t *plt = pl_get_playlist (streaming_track);
+ if (!plt) {
+ _streamer_requeue_after_current (repeat, shuffle);
+ }
+ else {
+ plt_unref (plt);
+ }
+}
+
+void
+streamer_thread (void *unused) {
+#if defined(__linux__) && !defined(ANDROID)
+ prctl (PR_SET_NAME, "deadbeef-stream", 0, 0, 0, 0);
+#endif
+
+ ddb_shuffle_t shuffle = (ddb_shuffle_t)-1;
+ ddb_repeat_t repeat = (ddb_repeat_t)-1;
+
+ uint32_t id;
+ uintptr_t ctx;
+ uint32_t p1, p2;
+
+ ddb_waveformat_t prev_block_fmt = {0};
+ double _add_format_silence = .0;
+
+ while (!streaming_terminate) {
+ struct timeval tm1;
+ DB_output_t *output = plug_get_output ();
+ gettimeofday (&tm1, NULL);
+
+ while (!handler_pop (handler, &id, &ctx, &p1, &p2)) {
+ switch (id) {
+ case STR_EV_PLAY_TRACK_IDX:
+ play_index (p1, p2);
+ break;
+ case STR_EV_PLAY_CURR:
+ play_current ();
+ break;
+ case STR_EV_NEXT:
+ play_next (1, shuffle, repeat);
+ break;
+ case STR_EV_PREV:
+ play_next (-1, shuffle, repeat);
+ break;
+ case STR_EV_RAND:
+ play_next (0, shuffle, repeat);
+ break;
+ case STR_EV_SEEK:
+ streamer_seek_real(*((float *)&p1));
+ break;
+ case STR_EV_SET_CURR_PLT:
+ streamer_set_current_playlist_real (p1);
+ break;
+ case STR_EV_DSP_RELOAD:
+ streamer_dsp_postinit ();
+ break;
+ case STR_EV_SET_DSP_CHAIN:
+ streamer_set_dsp_chain_real ((ddb_dsp_context_t *)ctx);
+ break;
+ case STR_EV_TRACK_DELETED:
+ _streamer_track_deleted (repeat, shuffle);
+ break;
+ }
+ }
+
+ // each event can modify shuffle/repeat, so update them here, so that subsequent event handlers use new values
+ ddb_shuffle_t new_shuffle = streamer_get_shuffle ();
+ ddb_repeat_t new_repeat = streamer_get_repeat ();
+
+ int need_requeue = 0;
+ if (new_shuffle != shuffle || new_repeat != repeat) {
+ need_requeue = 1;
+ }
+
+ if (new_shuffle != shuffle) {
+ pl_reshuffle_all ();
+ streamer_shuffle_changed (shuffle, new_shuffle);
+ shuffle = new_shuffle;
+ }
+
+ repeat = new_repeat;
+
+ if (need_requeue) {
+ _streamer_requeue_after_current(repeat, shuffle);
+ }
+
+ if (output->state () == DDB_PLAYBACK_STATE_STOPPED) {
+ if (!handler_hasmessages (handler)) {
+ usleep (50000);
+ }
+ continue;
+ }
+
+ _update_buffering_state ();
+
+ if (!fileinfo_curr) {
+ // HACK: This is to overcome the output plugin API limitation.
+ // We count the number of times the output plugin has starved,
+ // and stop playback after counter reaches the limit.
+ // The correct way to solve this is to add a `drain` API.
+ if (_audio_stall_count >= AUDIO_STALL_WAIT) {
+ output->stop ();
+ streamer_lock ();
+ _handle_playback_stopped();
+ _audio_stall_count = 0;
+ streamer_unlock ();
+ continue;
+ }
+ usleep (50000); // nothing is streaming -- about to stop
+ continue;
+ }
+
+ streamer_lock();
+ streamblock_t *block = streamreader_get_next_block ();
+ streamer_unlock();
+
+ if (!block) {
+ usleep (50000); // all blocks are full
+ continue;
+ }
+
+ int res = 0;
+
+ // insert silence at the format change
+ if (memcmp (&fileinfo_curr->fmt, &prev_block_fmt, sizeof (ddb_waveformat_t))
+ && conf_format_silence > 0) {
+ memcpy (&prev_block_fmt, &fileinfo_curr->fmt, sizeof (ddb_waveformat_t));
+
+ _add_format_silence = conf_format_silence;
+ }
+ if (_add_format_silence > 0) {
+ res = streamreader_silence_block (block, streaming_track, fileinfo_curr, mutex);
+ int bytes_per_sec = fileinfo_curr->fmt.samplerate * fileinfo_curr->fmt.channels * (fileinfo_curr->fmt.bps / 8);
+ _add_format_silence -= block->size / (double)bytes_per_sec;
+ }
+ else {
+ res = streamreader_read_block (block, streaming_track, fileinfo_curr, mutex);
+ }
+
+ // streamreader has locked the mutex on success
+ int last = 0;
+
+ if (res >= 0) {
+ streamreader_enqueue_block (block);
+ last = block->last;
+ streamer_unlock ();
+ }
+
+ if (res < 0 || last) {
+ // error or eof
+
+ playItem_t *next = NULL;
+
+ // handle stop after current
+ int stop = 0;
+ if (block->last) {
+ if (stop_after_current) {
+ stop = 1;
+ }
+ else {
+ next = get_next_track(streaming_track, shuffle, repeat);
+
+ if (stop_after_album_check (streaming_track, next)) {
+ stop = 1;
+ }
+
+ if (next) {
+ pl_item_unref (next);
+ }
+ }
+ }
+
+ if (stop) {
+ stream_track (NULL, 0);
+ }
+ else {
+ streamer_next (shuffle, repeat, next);
+ }
+ }
+
+ }
+
+ // drain event queue
+ while (!handler_pop (handler, &id, &ctx, &p1, &p2));
+
+ // stop streaming song
+ streamer_lock ();
+ if (fileinfo_curr) {
+ fileinfo_free (fileinfo_curr);
+ fileinfo_curr = NULL;
+ fileinfo_file_vfs = NULL;
+ fileinfo_file_identifier = 0;
+ }
+ streamer_set_streaming_track(NULL);
+ streamer_set_playing_track(NULL);
+ streamer_unlock ();
+}
+
+void
+streamer_dsp_refresh (void) {
+ handler_push (handler, STR_EV_DSP_RELOAD, 0, 0, 0);
+}
+
+int
+streamer_init (void) {
+ streaming_terminate = 0;
+ handler = handler_alloc (100);
+#if WRITE_DUMP
+ out = fopen ("out.raw", "w+b");
+#endif
+ mutex = mutex_create ();
+
+ viz_init();
+
+ streamreader_init ();
+ decoded_blocks_init ();
+
+ streamer_dsp_init ();
+
+ ctmap_init_mutex ();
+ conf_get_str ("network.ctmapping", DDB_DEFAULT_CTMAPPING, conf_network_ctmapping, sizeof (conf_network_ctmapping));
+ ddb_ctmap_free (streamer_ctmap);
+ streamer_ctmap = NULL;
+ streamer_ctmap = ddb_ctmap_init_from_string (conf_network_ctmapping);
+
+ _artist_tf = tf_compile("%album artist%");
+ _album_tf = tf_compile("%album%");
+
+ streamer_tid = thread_start (streamer_thread, NULL);
+ return 0;
+}
+
+void
+streamer_free (void) {
+#if WRITE_DUMP
+ fclose (out);
+#endif
+
+ streamer_abort_files ();
+ streaming_terminate = 1;
+ thread_join (streamer_tid);
+
+ tf_free(_album_tf);
+ _album_tf = NULL;
+ tf_free(_artist_tf);
+ _artist_tf = NULL;
+
+ streamreader_free ();
+ decoded_blocks_free ();
+
+ if (first_failed_track) {
+ pl_item_unref (first_failed_track);
+ first_failed_track = NULL;
+ }
+ streamer_set_streaming_track(NULL);
+ streamer_set_next_track_to_play(NULL);
+ streamer_set_prev_track_to_play(NULL);
+ streamer_set_playing_track(NULL);
+ streamer_set_buffering_track(NULL);
+ streamer_set_last_played(NULL);
+ streamer_set_streamer_playlist (NULL);
+
+ ddb_ctmap_free (streamer_ctmap);
+ streamer_ctmap = NULL;
+ ctmap_free_mutex ();
+
+ mutex_free (mutex);
+ mutex = 0;
+ viz_free ();
+ fft_free();
+
+ streamer_dsp_chain_save();
+
+ dsp_free ();
+
+ if (handler) {
+ handler_free (handler);
+ handler = NULL;
+ }
+
+ playpos = 0;
+ playtime = 0;
+
+ ringbuf_deinit(&_output_ringbuf);
+ free (_int_output_buffer);
+ _int_output_buffer = NULL;
+
+ resizable_buffer_deinit(&_dsp_process_buffer);
+ resizable_buffer_deinit(&_viz_read_buffer);
+}
+
+void
+streamer_reset (int full) { // must be called when current song changes by external reasons
+ if (!mutex) {
+ fprintf (stderr, "ERROR: someone called streamer_reset after exit\n");
+ return; // failsafe, in case someone calls streamer reset after deinit
+ }
+
+ streamer_lock();
+ streamreader_reset ();
+ decoded_blocks_reset();
+ dsp_reset ();
+ ringbuf_flush(&_output_ringbuf);
+ streamer_unlock();
+ viz_reset ();
+}
+
+static int
+process_output_block (streamblock_t *block, char *bytes, int bytes_available_size) {
+ DB_output_t *output = plug_get_output ();
+
+ if (block->pos < 0) {
+ return 0;
+ }
+
+ // A block with 0 size is a valid block, and needs to be processed as usual (code above this line).
+ // But here we do early exit, because there's no data to process in it.
+ if (!block->size) {
+ decoded_block_t *decoded_block = decoded_blocks_append();
+ if (decoded_block != NULL) {
+ decoded_block->track = block->track;
+ if (decoded_block->track != NULL) {
+ pl_item_ref (decoded_block->track);
+ }
+ decoded_block->last = block->last;
+ decoded_block->first = block->first;
+ }
+
+ streamreader_next_block ();
+ _update_buffering_state ();
+ return 0;
+ }
+
+ decoded_block_t *decoded_block = decoded_blocks_append();
+ if (decoded_block == NULL) {
+ return 0; // queue is full!
+ }
+
+ assert (block->size > block->pos);
+ int sz = block->size - block->pos;
+
+ ddb_waveformat_t datafmt; // comes either from dsp, or from input plugin
+ memcpy (&datafmt, &block->fmt, sizeof (ddb_waveformat_t));
+
+ char *dspbytes = NULL;
+ int dspsize = 0;
+ float dspratio = 1;
+
+
+#if defined(ANDROID) || defined(HAVE_XGUI)
+ // android EQ and resampling require 16 bit, so convert here if needed
+ int tempsize = sz * 16 / block->fmt.bps;
+ int16_t *temp_audio_data = NULL;
+ char *input = block->buf + block->pos;
+ if (block->fmt.bps != 16) {
+ temp_audio_data = alloca (tempsize);
+ ddb_waveformat_t out_fmt = {
+ .bps = 16,
+ .channels = block->fmt.channels,
+ .samplerate = block->fmt.samplerate,
+ .channelmask = block->fmt.channelmask,
+ .is_float = 0,
+ };
+
+ pcm_convert (&block->fmt, (char *)input, &out_fmt, (char *)temp_audio_data, sz);
+ input = (char *)temp_audio_data;
+ memcpy (&datafmt, &out_fmt, sizeof (ddb_waveformat_t));
+ sz = tempsize;
+ }
+
+ extern void android_eq_apply (char *dspbytes, int dspsize);
+ android_eq_apply (input, sz);
+
+ dsp_apply_simple_downsampler(datafmt.samplerate, datafmt.channels, input, sz, output->fmt.samplerate, &dspbytes, &dspsize);
+ datafmt.samplerate = output->fmt.samplerate;
+ sz = dspsize;
+#else
+ int dsp_res = dsp_apply (&block->fmt, block->buf + block->pos, sz,
+ &datafmt, &dspbytes, &dspsize, &dspratio);
+ if (dsp_res) {
+ sz = dspsize;
+ }
+ else {
+ memcpy (&datafmt, &block->fmt, sizeof (ddb_waveformat_t));
+ dspbytes = block->buf+block->pos;
+ }
+#endif
+
+ int need_convert = memcmp (&output->fmt, &datafmt, sizeof (ddb_waveformat_t));
+ int required_size = 0;
+ if (need_convert) {
+ int input_ss = datafmt.channels * datafmt.bps/8;
+ int output_ss = output->fmt.channels * output->fmt.bps/8;
+ required_size = sz / input_ss * output_ss;
+ }
+ else {
+ required_size = sz;
+ }
+
+ // Crash here to catch the buffer issues early, instead of corrupting sound.
+ assert(bytes_available_size >= required_size);
+
+ if (need_convert) {
+ sz = pcm_convert (&datafmt, dspbytes, &output->fmt, bytes, sz);
+ }
+ else {
+ memcpy (bytes, dspbytes, sz);
+ }
+
+ streamer_lock();
+ decoded_block->track = block->track;
+ if (decoded_block->track != NULL) {
+ pl_item_ref (decoded_block->track);
+ }
+ decoded_block->last = block->last;
+ decoded_block->first = block->first;
+ decoded_block->total_bytes = decoded_block->remaining_bytes = sz;
+ decoded_block->is_silent_header = block->is_silent_header;
+ decoded_block->playback_time = (float)sz/output->fmt.samplerate/((output->fmt.bps>>3)*output->fmt.channels) * dspratio;
+
+ block->pos = block->size;
+ streamreader_next_block ();
+ streamer_unlock();
+
+ _update_buffering_state ();
+
+ return sz;
+}
+
+
+static float (*streamer_volume_modifier) (float delta_time);
+
+// used in android branch, do not delete
+void
+streamer_set_volume_modifier (float (*modifier) (float delta_time)) {
+ streamer_volume_modifier = modifier;
+}
+
+static void
+streamer_apply_soft_volume (char *bytes, int sz) {
+ if (audio_is_mute ()) {
+ memset (bytes, 0, sz);
+ return;
+ }
+ DB_output_t *output = plug_get_output ();
+ if (output->has_volume) {
+ return;
+ }
+
+ if (output->fmt.flags & DDB_WAVEFORMAT_FLAG_IS_DOP) {
+ return;
+ }
+
+ float mod = 1.f;
+
+ if (streamer_volume_modifier) {
+ float dt = sz * (output->fmt.bps >> 3) / output->fmt.channels / (float)output->fmt.samplerate;
+ mod = streamer_volume_modifier (dt);
+ }
+
+ float vol = volume_get_amp () * mod;
+
+ char *stream = bytes;
+ int bytesread = sz;
+ if (output->fmt.bps == 16) {
+ int16_t ivolume = (int16_t)(vol * 1000);
+ if (ivolume != 1000) {
+ int half = bytesread/2;
+ for (int i = 0; i < half; i++) {
+ int16_t sample = *((int16_t*)stream);
+ *((int16_t*)stream) = (int16_t)(((int32_t)sample) * ivolume / 1000);
+ stream += 2;
+ }
+ }
+ }
+ else if (output->fmt.bps == 8) {
+ int16_t ivolume = (int16_t)(vol * 255);
+ if (ivolume != 255) {
+ for (int i = 0; i < bytesread; i++) {
+ *stream = (int8_t)(((int32_t)(*stream)) * ivolume / 255);
+ stream++;
+ }
+ }
+ }
+ else if (output->fmt.bps == 24) {
+ int16_t ivolume = (int16_t)(vol * 1000);
+ if (ivolume != 1000) {
+ int third = bytesread/3;
+ for (int i = 0; i < third; i++) {
+ int32_t sample = ((unsigned char)stream0) | ((unsigned char)stream1<<8) | ((signed char)stream2<<16);
+ int32_t newsample = (int32_t)((int64_t)sample * ivolume / 1000);
+ stream0 = (newsample&0x0000ff);
+ stream1 = (newsample&0x00ff00)>>8;
+ stream2 = (newsample&0xff0000)>>16;
+ stream += 3;
+ }
+ }
+ }
+ else if (output->fmt.bps == 32 && !output->fmt.is_float) {
+ int16_t ivolume = (int16_t)(vol * 1000);
+ if (ivolume != 1000) {
+ for (int i = 0; i < bytesread/4; i++) {
+ int32_t sample = *((int32_t*)stream);
+ int32_t newsample = (int32_t)((int64_t)sample * ivolume / 1000);
+ *((int32_t*)stream) = newsample;
+ stream += 4;
+ }
+ }
+ }
+ else if (output->fmt.bps == 32 && output->fmt.is_float) {
+ if (vol != 1.f) {
+ for (int i = 0; i < bytesread/4; i++) {
+ *((float*)stream) = (*((float*)stream)) * vol;
+ stream += 4;
+ }
+ }
+ }
+}
+
+static int
+_streamer_get_bytes (char *bytes, int size) {
+ DB_output_t *output = plug_get_output ();
+
+ // consume decoded data
+ int sz = size;
+ if (!sz) {
+ // no data available
+ memset (bytes, 0, size);
+ return size;
+ }
+
+ // clip to frame size
+ int ss = output->fmt.channels * output->fmt.bps / 8;
+ if ((sz % ss) != 0) {
+ sz -= (sz % ss);
+ }
+
+ int rb = sz;
+ char *writeptr = bytes;
+
+ // streamer_reset may clear all blocks, therefore need a lock
+ streamer_lock();
+ while (rb > 0) {
+ decoded_block_t *decoded_block = decoded_blocks_current();
+ if (decoded_block == NULL) {
+ break;
+ }
+
+ // handle change of track
+ if (decoded_block->first) {
+ handle_track_change (playing_track, decoded_block->track);
+ }
+
+ if (decoded_block->remaining_bytes != 0) {
+ size_t got_bytes = min (rb, decoded_block->remaining_bytes);
+ got_bytes = ringbuf_read(&_output_ringbuf, writeptr, got_bytes);
+ writeptr += got_bytes;
+ rb -= got_bytes;
+
+ decoded_block->remaining_bytes -= got_bytes;
+ }
+
+ if (decoded_block->remaining_bytes == 0) {
+ if (decoded_block->last) {
+ update_stop_after_current ();
+ }
+
+ if (!decoded_block->is_silent_header) {
+ playpos += decoded_block->playback_time;
+ playtime += decoded_block->playback_time;
+ }
+
+ decoded_blocks_next();
+ }
+ }
+
+ sz -= rb; // how many bytes we actually got
+
+ streamer_unlock();
+
+ streamer_apply_soft_volume (bytes, sz);
+
+ return sz;
+}
+
+// @return latency buffer size
+static size_t
+_output_ringbuf_setup(const ddb_waveformat_t *fmt) {
+ // Need to be able to upsample from 8000 mono to the current format.
+ // Add some padding to allow multiple blocks to be decoded.
+ // FIXME: this could be improved by walking the current dsp chain, and calculating the real ratio.
+ size_t size = (size_t)(16384 * 1.5 * MAX_DSP_RATIO);
+ size_t latency = 0;
+#ifdef __APPLE__
+ // add 3 seconds of history for airplay latency / visualization compensation
+ latency = 3 * fmt->channels * fmt->samplerate * fmt->bps / 8;
+#endif
+ size += latency;
+
+ if (size != _output_ringbuf.size) {
+ free (_int_output_buffer);
+ _int_output_buffer = malloc (size);
+ ringbuf_init(&_output_ringbuf, _int_output_buffer, size);
+ decoded_blocks_reset();
+ }
+
+ return latency;
+}
+
+// Decode enough blocks to fill the _output_buffer, and update avg_bitrate
+static void
+_streamer_fill_playback_buffer(void) {
+ streamer_lock ();
+ streamblock_t *block = streamreader_get_curr_block();
+ if (!block) {
+ // NULL streaming_track means playback stopped,
+ // otherwise just a buffer starvation (e.g. after seeking)
+ if (!streaming_track) {
+ update_stop_after_current ();
+ _handle_playback_stopped();
+ playpos = 0;
+ playtime = 0;
+ avg_bitrate = -1;
+ last_seekpos = -1;
+ }
+ else {
+ // this message is printed in more cases, than if output is broken, so disable it
+ // but keep for reference -- this is a good place to set breakpoint
+// fprintf (stderr, "streamer: streamer_read has starved. The current output plugin might be broken\n");
+ }
+ streamer_unlock();
+
+ if (streaming_track) {
+ return;
+ }
+ _audio_stall_count++;
+ return;
+ }
+
+ _audio_stall_count = 0;
+
+ int block_bitrate = -1;
+
+ // only decode until the next format change
+ // decode enough blocks to fill the output buffer
+ resizable_buffer_ensure_size(&_dsp_process_buffer, block->size * MAX_DSP_RATIO);
+
+ size_t latency = _output_ringbuf_setup(&plug_get_output ()->fmt);
+
+ while (block != NULL
+ && decoded_blocks_have_free()
+ && decoded_blocks_playback_time_total() < conf_playback_buffer_size
+ && (_output_ringbuf.size - _output_ringbuf.remaining - latency) >= block->size * MAX_DSP_RATIO
+ && !memcmp (&block->fmt, &last_block_fmt, sizeof (ddb_waveformat_t))) {
+ int rb = process_output_block (block, _dsp_process_buffer.buffer, block->size * MAX_DSP_RATIO);
+ if (rb <= 0) {
+ break;
+ }
+ ringbuf_write(&_output_ringbuf, _dsp_process_buffer.buffer, rb);
+
+ block_bitrate = block->bitrate;
+ block = streamreader_get_curr_block();
+ }
+ // empty buffer and the next block format differs? request format change!
+
+ if (_output_ringbuf.remaining == 0 && block && memcmp (&block->fmt, &last_block_fmt, sizeof (ddb_waveformat_t))) {
+ streamer_set_output_format (&block->fmt);
+ memcpy (&last_block_fmt, &block->fmt, sizeof (ddb_waveformat_t));
+
+ streamer_unlock();
+ return;
+ }
+
+ // approximate bitrate
+ if (block_bitrate != -1) {
+ if (avg_bitrate == -1) {
+ avg_bitrate = block_bitrate;
+ }
+ else {
+ if (avg_bitrate < block_bitrate) {
+ avg_bitrate += 5;
+ if (avg_bitrate > block_bitrate) {
+ avg_bitrate = block_bitrate;
+ }
+ }
+ else if (avg_bitrate > block_bitrate) {
+ avg_bitrate -= 5;
+ if (avg_bitrate < block_bitrate) {
+ avg_bitrate = block_bitrate;
+ }
+ }
+ }
+ // printf ("apx bitrate: %d (last %d)\n", avg_bitrate, last_bitrate);
+ }
+ streamer_unlock ();
+}
+
+int
+streamer_read (char *bytes, int size) {
+ DB_output_t *output = plug_get_output ();
+
+ // Ensure that the buffer has enough data for analysis
+ int ss = output->fmt.channels * output->fmt.bps / 8;
+ int max_bytes = output->fmt.samplerate * ss;
+
+ // Read into the output buffer
+ _streamer_fill_playback_buffer();
+
+ // Process
+#ifndef ANDROID
+ // Read extra bytes from output buffer
+ size_t viz_bytes = min (_output_ringbuf.size, max_bytes);
+ int wave_size = size / ss;
+ resizable_buffer_ensure_size(&_viz_read_buffer, max_bytes);
+ size_t offset = 0;
+
+#ifdef __APPLE__
+ const int AIRPLAY_LATENCY = 2;
+ if (output->plugin.flags & DDB_COREAUDIO_FLAG_AIRPLAY) {
+ offset = AIRPLAY_LATENCY * output->fmt.samplerate * output->fmt.channels * output->fmt.bps/8;
+ }
+#endif
+ ringbuf_read_keep_offset(&_output_ringbuf, _viz_read_buffer.buffer, viz_bytes, -offset);
+ viz_process (_viz_read_buffer.buffer, (int)viz_bytes, output, 4096, wave_size); // FIXME: fft size needs to be configurable
+#endif
+
+ // Play
+ return _streamer_get_bytes(bytes, size);
+}
+
+int
+streamer_ok_to_read (int len) {
+ streamer_lock();
+ int res = !streamer_is_buffering;
+ streamer_unlock();
+ return res;
+}
+
+static int
+clamp_samplerate (int val) {
+ if (val < 8000) {
+ return 8000;
+ }
+ else if (val > 768000) {
+ return 768000;
+ }
+ return val;
+}
+
+void
+streamer_configchanged (void) {
+ streamer_lock ();
+
+ ddb_shuffle_t shuffle = conf_get_int ("playback.order", DDB_SHUFFLE_OFF);
+ ddb_repeat_t repeat = conf_get_int ("playback.loop", DDB_REPEAT_OFF);
+
+ // legacy handling, in case repeat/shuffle values change via config directly
+ streamer_set_shuffle (shuffle);
+ streamer_set_repeat (repeat);
+
+ if (playing_track) {
+ pl_set_played(playing_track, 1);
+ }
+
+ int formatchanged = 0;
+
+ int conf_autoconv_8_to_16 = conf_get_int ("streamer.8_to_16", 1);
+ if (conf_autoconv_8_to_16 != autoconv_8_to_16) {
+ autoconv_8_to_16 = conf_autoconv_8_to_16;
+ formatchanged = 1;
+ }
+ int conf_autoconv_16_to_24 = conf_get_int ("streamer.16_to_24",0);
+ if (conf_autoconv_16_to_24 != autoconv_16_to_24) {
+ autoconv_16_to_24 = conf_autoconv_16_to_24;
+ formatchanged = 1;
+ }
+ int conf_bit_override = conf_get_int ("streamer.bit_override",0);
+ if (conf_bit_override != bit_override) {
+ bit_override = conf_bit_override;
+ formatchanged = 1;
+ }
+
+ trace_bufferfill = conf_get_int ("streamer.trace_buffer_fill",0);
+
+ stop_after_current = conf_get_int ("playlist.stop_after_current", 0);
+ stop_after_album = conf_get_int ("playlist.stop_after_album", 0);
+
+ char mapstr2048;
+ conf_get_str ("network.ctmapping", DDB_DEFAULT_CTMAPPING, mapstr, sizeof (mapstr));
+ if (strcmp (mapstr, conf_network_ctmapping)) {
+ strcpy(conf_network_ctmapping, mapstr);
+ streamer_ctmap = ddb_ctmap_init_from_string (conf_network_ctmapping);
+ }
+
+ int new_conf_streamer_override_samplerate = conf_get_int ("streamer.override_samplerate", 0);
+ int new_conf_streamer_use_dependent_samplerate = conf_get_int ("streamer.use_dependent_samplerate", 0);
+ int new_conf_streamer_samplerate = clamp_samplerate (conf_get_int ("streamer.samplerate", 44100));
+ int new_conf_streamer_samplerate_mult_48 = clamp_samplerate (conf_get_int ("streamer.samplerate_mult_48", 48000));
+ int new_conf_streamer_samplerate_mult_44 = clamp_samplerate (conf_get_int ("streamer.samplerate_mult_44", 44100));
+
+ if (conf_streamer_override_samplerate != new_conf_streamer_override_samplerate
+ || conf_streamer_use_dependent_samplerate != new_conf_streamer_use_dependent_samplerate
+ || conf_streamer_samplerate != new_conf_streamer_samplerate
+ || conf_streamer_samplerate_mult_48 != new_conf_streamer_samplerate_mult_48
+ || conf_streamer_samplerate_mult_44 != new_conf_streamer_samplerate_mult_44
+ || formatchanged) {
+ memset (&last_block_fmt, 0, sizeof (last_block_fmt));
+ }
+
+ conf_streamer_override_samplerate = new_conf_streamer_override_samplerate;
+ conf_streamer_use_dependent_samplerate = new_conf_streamer_use_dependent_samplerate;
+ conf_streamer_samplerate = new_conf_streamer_samplerate;
+ conf_streamer_samplerate_mult_48 = new_conf_streamer_samplerate_mult_48;
+ conf_streamer_samplerate_mult_44 = new_conf_streamer_samplerate_mult_44;
+
+ conf_format_silence = conf_get_float ("streamer.format_change_silence", -1.f);
+
+ int playback_buffer_size = conf_get_int ("streamer.playback_buffer_size", 300);
+ if (playback_buffer_size < 100) {
+ playback_buffer_size = 100;
+ }
+ else if (playback_buffer_size > 2000) {
+ playback_buffer_size = 2000;
+ }
+ conf_playback_buffer_size = playback_buffer_size / 1000.f;
+
+ streamreader_configchanged ();
+
+ streamer_unlock ();
+}
+
+static void
+_handle_playback_stopped (void) {
+ if (playing_track) {
+ playItem_t *trk = playing_track;
+ pl_item_ref (trk);
+ send_songfinished (trk);
+ streamer_is_buffering = 0;
+ streamer_start_playback (playing_track, NULL);
+ streamer_set_buffering_track (NULL);
+ send_trackchanged (trk, NULL);
+ pl_item_unref (trk);
+ }
+ streamer_play_failed (NULL);
+}
+
+static void
+_play_track (playItem_t *it, int startpaused) {
+ DB_output_t *output = plug_get_output();
+ output->stop ();
+ streamer_lock();
+ streamer_reset(1);
+ streamer_is_buffering = 1;
+ streamer_unlock();
+
+ playItem_t *prev = playing_track;
+ if (prev) {
+ pl_item_ref (prev);
+ }
+
+ streamer_set_playing_track(NULL);
+ streamer_set_next_track_to_play(NULL);
+ streamer_set_prev_track_to_play(NULL);
+ streamer_set_buffering_track (it);
+ handle_track_change (prev, it);
+
+ if (prev) {
+ pl_item_unref (prev);
+ prev = NULL;
+ }
+
+ if (!stream_track(it, startpaused)) {
+ playpos = 0;
+ playtime = 0;
+ if (startpaused) {
+ output->pause ();
+ messagepump_push(DB_EV_PAUSED, 0, 1, 0);
+ streamer_start_playback (NULL, it);
+ send_songstarted (playing_track);
+ }
+ else {
+ int st = output->state();
+ output->play ();
+ if (st == DDB_PLAYBACK_STATE_PAUSED) {
+ messagepump_push(DB_EV_PAUSED, 0, 0, 0);
+ }
+ }
+ }
+ else {
+ streamer_set_buffering_track (NULL);
+ }
+}
+
+static void
+_rebuild_shuffle_albums_after_manual_trigger(playlist_t *plt, playItem_t *it) {
+ plt_reshuffle (plt, NULL, NULL);
+
+ ddb_shuffle_t shuffle = streamer_get_shuffle ();
+ if (shuffle == DDB_SHUFFLE_ALBUMS) {
+ pl_lock ();
+ _streamer_mark_album_played_up_to (it);
+ pl_unlock ();
+ }
+ else {
+ // This ensures that the manually triggered item becomes first in shuffle queue.
+ // It works because shufflerating is generated using rand(), which gives only numbers in the 0..RAND_MAX range.
+ pl_set_shufflerating (it, -1);
+ }
+}
+
+// play track in current playlist by index;
+// negative index will stop playback
+static void
+play_index (int idx, int startpaused) {
+ DB_output_t *output = plug_get_output ();
+ playItem_t *it = NULL;
+ playlist_t *plt = NULL;
+
+ playqueue_clear ();
+
+ plt = plt_get_curr ();
+
+ streamer_set_streamer_playlist (plt);
+
+ if (idx < 0) {
+ plt_reshuffle (plt, NULL, NULL);
+ streamer_set_last_played(NULL);
+ goto error;
+ }
+
+ it = plt_get_item_for_idx (plt, idx, PL_MAIN);
+ if (!it) {
+ goto error;
+ }
+
+ // rebuild shuffle order
+ _rebuild_shuffle_albums_after_manual_trigger (plt, it);
+
+ _play_track(it, startpaused);
+
+ pl_item_unref(it);
+ plt_unref (plt);
+ return;
+
+error:
+ output->stop ();
+ streamer_reset (1);
+ viz_reset();
+ viz_process(NULL, 0, output, 0, 0);
+
+ streamer_lock();
+ _handle_playback_stopped ();
+ stream_track (NULL, 0);
+ if (plt) {
+ plt_unref (plt);
+ }
+ streamer_unlock();
+}
+
+playItem_t *
+streamer_get_current_track_to_play (playlist_t *plt) {
+ int idx = plt->current_rowPL_MAIN;
+ if (plt->current_rowPL_MAIN == -1 && plt->countPL_MAIN) {
+ idx = 0;
+ }
+
+ playItem_t *it = NULL;
+
+ if (idx >= 0) {
+ // currently selected track in current playlist
+ it = plt_get_item_for_idx (plt, idx, PL_MAIN);
+ }
+
+ return it;
+}
+
+// if a track is playing: restart
+// if a track is paused: unpause
+// if no track is playing: do what comes first:
+// play next in queue
+// play track under cursor
+// stop playback
+static void
+play_current (void) {
+ DB_output_t *output = plug_get_output ();
+ if (output->state () == DDB_PLAYBACK_STATE_PAUSED && playing_track) {
+ // restart if network stream
+ if (is_remote_stream (playing_track) && pl_get_item_duration (playing_track) < 0) {
+ streamer_reset (1);
+ stream_track (playing_track, 0);
+ }
+ // unpause currently paused track
+ output->unpause ();
+ messagepump_push (DB_EV_PAUSED, 0, 0, 0);
+ return;
+ }
+
+ playlist_t *plt = plt_get_curr ();
+ playItem_t *it = streamer_get_current_track_to_play(plt);
+
+ streamer_reset(1);
+ if (it) {
+ pl_lock ();
+ if (plt != streamer_playlist) {
+ streamer_set_streamer_playlist (plt);
+ }
+ pl_unlock ();
+ _play_track(it, 0);
+ pl_item_unref (it);
+ }
+
+ if (plt) {
+ plt_unref (plt);
+ }
+}
+
+playItem_t *
+streamer_get_next_track_with_direction (int dir, ddb_shuffle_t shuffle, ddb_repeat_t repeat) {
+ playItem_t *origin = NULL;
+ if (buffering_track) {
+ origin = buffering_track;
+ }
+ else {
+ origin = last_played;
+ }
+
+ playItem_t *next = NULL;
+ if (dir > 0) {
+ next = get_next_track (origin, shuffle, repeat);
+ }
+ else if (dir < 0) {
+ next = get_prev_track (origin, shuffle, repeat);
+ }
+ else {
+ next = get_random_track ();
+ }
+
+ // possibly need a reshuffle
+ if (!next && streamer_playlist->countPL_MAIN != 0) {
+ if (repeat == DDB_REPEAT_OFF) {
+ if (shuffle == DDB_SHUFFLE_ALBUMS || shuffle == DDB_SHUFFLE_TRACKS) {
+ plt_reshuffle (streamer_playlist, dir > 0 ? &next : NULL, dir < 0 ? &next : NULL);
+ if (next && dir < 0) {
+ // mark all songs as played except the current one
+ playItem_t *it = streamer_playlist->headPL_MAIN;
+ while (it) {
+ if (it != next) {
+ pl_set_played (it, 1);
+ }
+ it = it->nextPL_MAIN;
+ }
+ }
+ if (next) {
+ pl_item_ref (next);
+ }
+ }
+ }
+ }
+ return next;
+}
+
+static void
+play_next (int dir, ddb_shuffle_t shuffle, ddb_repeat_t repeat) {
+ DB_output_t *output = plug_get_output ();
+
+ playItem_t *next = streamer_get_next_track_with_direction (dir, shuffle, repeat);
+
+ if (!next) {
+ streamer_set_last_played (NULL);
+ output->stop ();
+ streamer_reset(1);
+ _handle_playback_stopped ();
+ return;
+ }
+
+ if (dir == 0) {
+ // rebuild shuffle order
+ _rebuild_shuffle_albums_after_manual_trigger (streamer_playlist, next);
+ }
+ _play_track(next, 0);
+ pl_item_unref(next);
+}
+
+void
+streamer_play_current_track (void) {
+ handler_push (handler, STR_EV_PLAY_CURR, 0, 0, 0);
+}
+
+struct DB_fileinfo_s *
+streamer_get_current_fileinfo (void) {
+ return fileinfo_curr;
+}
+
+static void
+streamer_set_current_playlist_real (int plt) {
+ pl_lock ();
+ if (streamer_playlist) {
+ plt_unref (streamer_playlist);
+ }
+ streamer_playlist = plt_get_for_idx (plt);
+ pl_unlock ();
+}
+
+void
+streamer_set_current_playlist (int plt) {
+ handler_push (handler, STR_EV_SET_CURR_PLT, 0, plt, 0);
+}
+
+int
+streamer_get_current_playlist (void) {
+ pl_lock ();
+ if (!streamer_playlist) {
+ streamer_playlist = plt_get_curr ();
+ }
+ int idx = plt_get_idx_of (streamer_playlist);
+ pl_unlock ();
+ return idx;
+}
+
+void
+streamer_notify_playlist_deleted (playlist_t *plt) {
+ // this is only called from playlist code, no lock required
+ if (plt == streamer_playlist) {
+ plt_unref (streamer_playlist);
+ streamer_playlist = NULL;
+ }
+}
+
+void
+streamer_set_dsp_chain (ddb_dsp_context_t *chain) {
+ ddb_dsp_context_t *new_chain = NULL;
+ ddb_dsp_context_t *tail = NULL;
+ while (chain) {
+ ddb_dsp_context_t *new = dsp_clone (chain);
+ if (tail) {
+ tail->next = new;
+ tail = new;
+ }
+ else {
+ new_chain = tail = new;
+ }
+ chain = chain->next;
+ }
+ handler_push (handler, STR_EV_SET_DSP_CHAIN, (uintptr_t)new_chain, 0, 0);
+}
+
+static void
+_streamer_mark_album_played_up_to (playItem_t *item) {
+ pl_lock ();
+
+ ddb_tf_context_t ctx = {
+ ._size = sizeof (ddb_tf_context_t),
+ .flags = DDB_TF_CONTEXT_NO_MUTEX_LOCK | DDB_TF_CONTEXT_NO_DYNAMIC,
+ };
+
+ char album100;
+ char artist100;
+ char other_album100;
+ char other_artist100;
+
+ ctx.it = (ddb_playItem_t *)item;
+ tf_eval(&ctx, _album_tf, album, sizeof(album));
+ tf_eval(&ctx, _artist_tf, artist, sizeof(artist));
+
+ pl_set_played(item, 1);
+ playItem_t *next = item->prevPL_MAIN;
+ while (next) {
+ ctx.it = (ddb_playItem_t *)next;
+ tf_eval(&ctx, _album_tf, other_album, sizeof(other_album));
+ tf_eval(&ctx, _artist_tf, other_artist, sizeof(artist));
+
+ int same_album = 1;
+
+ if (*album == 0 || strcmp (album, other_album)) {
+ same_album = 0;
+ }
+ else if (*artist == 0 || strcmp (artist, other_artist)) {
+ same_album = 0;
+ }
+
+ if (same_album) {
+ pl_set_played(next, 1);
+ next = next->prevPL_MAIN;
+ }
+ else {
+ break;
+ }
+ }
+ pl_unlock ();
+}
+
+static void
+streamer_shuffle_changed (ddb_shuffle_t prev, ddb_shuffle_t shuffle) {
+ if (prev != DDB_SHUFFLE_ALBUMS && shuffle == DDB_SHUFFLE_ALBUMS) {
+
+ streamer_lock ();
+
+ playItem_t *curr = playing_track;
+ if (curr) {
+ _streamer_mark_album_played_up_to (curr);
+ }
+
+ streamer_unlock ();
+ }
+}
+
+void
+streamer_set_streamer_playlist (playlist_t *plt) {
+ pl_lock ();
+ if (streamer_playlist) {
+ plt_unref (streamer_playlist);
+ }
+ streamer_playlist = plt;
+ if (streamer_playlist) {
+ plt_ref (streamer_playlist);
+ }
+ pl_unlock ();
+}
+
+struct handler_s *
+streamer_get_handler (void) {
+ return handler;
+}
+
+void
+streamer_yield (void) {
+ while (handler_hasmessages(handler)) {
+ usleep(50000);
+ }
+}
+
+void
+streamer_set_output (DB_output_t *output) {
+ DB_output_t *prev = plug_get_output ();
+ ddb_playback_state_t state = DDB_PLAYBACK_STATE_STOPPED;
+ ddb_waveformat_t fmt = {0};
+ if (prev) {
+ state = prev->state ();
+ memcpy (&fmt, &prev->fmt, sizeof (ddb_waveformat_t));
+ prev->free ();
+ }
+
+ if (mutex) {
+ streamer_lock ();
+ }
+ plug_set_output (output);
+
+ if (fmt.channels) {
+ output->setformat (&fmt);
+ }
+
+ int res = 0;
+ if (state == DDB_PLAYBACK_STATE_PLAYING) {
+ res = output->play ();
+ }
+ else if (state == DDB_PLAYBACK_STATE_PAUSED) {
+ res = output->pause ();
+ }
+
+ if (res < 0) {
+ trace_err ("failed to init sound output\n");
+ streamer_set_nextsong (-1, 0);
+ }
+ if (mutex) {
+ streamer_unlock ();
+ }
+ messagepump_push (DB_EV_OUTPUTCHANGED, 0, 0, 0);
+}
+
+void
+streamer_notify_track_deleted (void) {
+ handler_push (handler, STR_EV_TRACK_DELETED, 0, 0, 0);
+}

deadbeef-1.9.6.tar.bz2/src/streamer.h Added

@@ -0,0 +1,194 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ streamer implementation
+
+ Copyright (C) 2009-2017 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __STREAMER_H
+#define __STREAMER_H
+
+#include "playlist.h"
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// events to pass to streamer thread
+enum {
+ STR_EV_PLAY_TRACK_IDX, // p1 = idx, or -1 to stop
+ STR_EV_PLAY_CURR, // will play the current streamer track (playing_track), see more details in streamer_play_current_track
+ STR_EV_NEXT, // streamer_move_to_nextsong
+ STR_EV_PREV, // streamer_move_to_prevsong
+ STR_EV_RAND, // streamer_move_to_randomsong
+ STR_EV_SEEK, // streamer_set_seek; p1: float pos
+ STR_EV_SET_CURR_PLT, // streamer_set_current_playlist
+ STR_EV_DSP_RELOAD, // reload dsp settings
+ STR_EV_SET_DSP_CHAIN, // set new dsp chain
+ STR_EV_TRACK_DELETED, // sent if a track, or multiple tracks, get deleted from playlist, or a playlist itself gets deleted
+};
+
+int
+streamer_init (void);
+
+void
+streamer_free (void);
+
+int
+streamer_read (char *bytes, int size);
+
+void
+streamer_reset (int full);
+
+void
+streamer_lock (void);
+
+void
+streamer_unlock (void);
+
+// song == -1 means "stop and clear streamer message queue"
+void
+streamer_set_nextsong (int song, int startpaused);
+
+playItem_t *
+streamer_get_current_track_to_play (playlist_t *plt);
+
+// returns next track according to repeat and shuffle settings, with specified direction
+playItem_t *
+streamer_get_next_track_with_direction (int dir, ddb_shuffle_t shuffle, ddb_repeat_t repeat);
+
+void
+streamer_set_last_played (playItem_t *track);
+
+void
+streamer_set_seek (float pos);
+
+int
+streamer_ok_to_read (int len);
+
+float
+streamer_get_playpos (void);
+
+void
+streamer_song_removed_notify (playItem_t *it);
+
+playItem_t *
+streamer_get_streaming_track (void);
+
+playItem_t *
+streamer_get_playing_track_unsafe (void);
+
+playItem_t *
+streamer_get_playing_track (void);
+
+playItem_t *
+streamer_get_buffering_track (void);
+
+void
+streamer_configchanged (void);
+
+// if paused -- resume
+// else, if have cursor track -- stop current, play cursor
+// else, play next
+void
+streamer_play_current_track (void);
+
+void
+streamer_set_bitrate (int bitrate);
+
+int
+streamer_get_apx_bitrate (void);
+
+// returns -1 if there's no next song, or playlist finished
+// reason 0 means "prev song finished", 1 means "interrupt"
+int
+streamer_move_to_nextsong (int r);
+
+int
+streamer_move_to_prevsong (int r);
+
+int
+streamer_move_to_randomsong (int r);
+
+struct DB_fileinfo_s *
+streamer_get_current_fileinfo (void);
+
+void
+streamer_set_current_playlist (int plt);
+
+int
+streamer_get_current_playlist (void);
+
+// returns track index in current streamer playlist
+int
+str_get_idx_of (playItem_t *it);
+
+void
+streamer_notify_playlist_deleted (playlist_t *plt);
+
+struct ddb_dsp_context_s *
+streamer_get_dsp_chain (void);
+
+void
+streamer_set_dsp_chain (struct ddb_dsp_context_s *chain);
+
+void
+streamer_dsp_refresh (void);
+
+int
+streamer_dsp_chain_save (void);
+
+void
+audio_get_waveform_data (int type, float *data);
+
+void
+streamer_set_streamer_playlist (playlist_t *plt);
+
+struct handler_s *
+streamer_get_handler (void);
+
+void
+streamer_set_playing_track (playItem_t *it);
+
+// sets a callback function, which would be called before applying software volume
+void
+streamer_set_volume_modifier (float (*modifier) (float delta_time));
+
+void
+streamer_set_buffering_track (playItem_t *it);
+
+// force streamer to flush its msg queue
+void
+streamer_yield (void);
+
+void
+streamer_set_output (DB_output_t *output);
+
+void
+streamer_notify_track_deleted (void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __STREAMER_H

deadbeef-1.9.6.tar.bz2/src/streamreader.c Added

@@ -0,0 +1,323 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
+#include "streamreader.h"
+#include "replaygain.h"
+#include "threading.h"
+
+// read ahead about 5 sec at 44100/16/2
+#define BLOCK_SIZE 16384
+#define BLOCK_COUNT 48
+
+static streamblock_t *blocks; // list of all blocks
+
+static streamblock_t *block_data; // first available block with data (can be NULL)
+
+static streamblock_t *block_next; // next block available to be read into / queued
+
+static int numblocks_ready;
+
+static int curr_block_bitrate;
+
+static playItem_t *_prev_rg_track;
+static int _rg_settingschanged = 1;
+static int _firstblock = 0;
+
+void
+streamreader_init (void) {
+ _prev_rg_track = NULL;
+ _rg_settingschanged = 1;
+ for (int i = 0; i < BLOCK_COUNT; i++) {
+ streamblock_t *b = calloc (1, sizeof (streamblock_t));
+ b->pos = -1;
+ b->buf = malloc (BLOCK_SIZE);
+ b->next = blocks;
+ blocks = b;
+ }
+ block_next = blocks;
+ numblocks_ready = 0;
+ _firstblock = 0;
+}
+
+void
+streamreader_free (void) {
+ streamreader_reset ();
+ while (blocks) {
+ streamblock_t *next = blocks->next;
+ free (blocks->buf);
+ free (blocks);
+ blocks = next;
+ }
+ block_next = block_data = NULL;
+ numblocks_ready = 0;
+ _prev_rg_track = NULL;
+ _rg_settingschanged = 1;
+ _firstblock = 0;
+}
+
+streamblock_t *
+streamreader_get_next_block (void) {
+ if (block_next->pos >= 0) {
+ return NULL; // all buffers full
+ }
+
+ // FIXME: initialize
+ block_next->is_silent_header = 0;
+ return block_next;
+}
+
+void
+streamreader_configchanged (void) {
+ _rg_settingschanged = 1;
+}
+
+int
+streamreader_read_block (streamblock_t *block, playItem_t *track, DB_fileinfo_t *fileinfo, uint64_t mutex) {
+ int size = BLOCK_SIZE;
+ int samplesize = fileinfo->fmt.channels * (fileinfo->fmt.bps>>3);
+
+ // NOTE: samplesize has to be checked to protect against faulty input plugins
+
+ if (!fileinfo->plugin || samplesize <= 0) {
+ // return dummy block for a failed track
+ _firstblock = 1;
+ size = 0;
+ }
+ else {
+ // clip size to max possible, with current sample format
+ int mod = size % samplesize;
+ if (mod) {
+ size -= mod;
+ }
+ }
+
+ // replaygain settings
+ mutex_lock (mutex);
+ if (_rg_settingschanged || _prev_rg_track != track) {
+ _prev_rg_track = track;
+ _rg_settingschanged = 0;
+ ddb_replaygain_settings_t rg_settings;
+ rg_settings._size = sizeof (rg_settings);
+ replaygain_init_settings (&rg_settings, track);
+ replaygain_set_current (&rg_settings);
+ }
+ mutex_unlock (mutex);
+
+ // NOTE: streamer_set_bitrate may be called during decoder->read, and set immediated bitrate of the block
+ curr_block_bitrate = -1;
+ int rb;
+ if (size > 0) {
+ rb = fileinfo->plugin->read (fileinfo, block->buf, size);
+ }
+ else {
+ rb = -1;
+ }
+
+ mutex_lock (mutex);
+
+ block->bitrate = curr_block_bitrate;
+
+ block->pos = 0;
+ if (rb >= 0) {
+ block->size = rb;
+ }
+ else {
+ // this handles both a failed dummy track,
+ // and an interrupted corrupt stream.
+ block->size = 0;
+ }
+ memcpy (&block->fmt, &fileinfo->fmt, sizeof (ddb_waveformat_t));
+ block->track = track;
+ if (block->track != NULL) {
+ pl_item_ref(block->track);
+ }
+
+ if (size > 0) {
+ int input_does_rg = fileinfo->plugin->plugin.flags & DDB_PLUGIN_FLAG_REPLAYGAIN;
+ if (!input_does_rg) {
+ replaygain_apply (&fileinfo->fmt, block->buf, block->size);
+ }
+ }
+
+ if (_firstblock) {
+ block->first = 1;
+ _firstblock = 0;
+ }
+ else {
+ block->first = 0;
+ }
+
+ if (rb != size) {
+ block->last = 1;
+ _firstblock = 1;
+ }
+ else {
+ block->last = 0;
+ }
+
+ return 0;
+}
+
+int
+streamreader_silence_block (streamblock_t *block, playItem_t *track, DB_fileinfo_t *fileinfo, uint64_t mutex) {
+ curr_block_bitrate = -1;
+ mutex_lock (mutex);
+ block->bitrate = -1;
+ block->pos = 0;
+ memset (block->buf, 0, BLOCK_SIZE);
+ block->size = BLOCK_SIZE;
+
+ memcpy (&block->fmt, &fileinfo->fmt, sizeof (ddb_waveformat_t));
+ block->track = track;
+ if (block->track != NULL) {
+ pl_item_ref(block->track);
+ }
+ block->is_silent_header = 1;
+
+ if (_firstblock) {
+ block->first = 1;
+ _firstblock = 0;
+ }
+ else {
+ block->first = 0;
+ }
+
+ block->last = 0;
+
+ return 0;
+}
+
+void
+streamreader_enqueue_block (streamblock_t *block) {
+ // block is passed just for sanity checking
+ assert (block->track);
+ if (!block_data) {
+ block_data = block_next;
+ }
+
+ block_next = block_next->next;
+ if (!block_next) {
+ block_next = blocks;
+ }
+
+ block->queued = 1;
+ numblocks_ready++;
+}
+
+void
+streamer_set_bitrate (int bitrate) {
+ curr_block_bitrate = bitrate;
+}
+
+streamblock_t *
+streamreader_get_curr_block (void) {
+ return block_data;
+}
+
+static void
+_streamreader_release_block (streamblock_t *block) {
+ block->pos = -1;
+ if (block->track != NULL) {
+ pl_item_unref(block->track);
+ }
+ block->track = NULL;
+ block->queued = 0;
+
+ numblocks_ready--;
+ if (numblocks_ready < 0) {
+ numblocks_ready = 0;
+ }
+}
+
+void
+streamreader_next_block (void) {
+ if (block_data) {
+ _streamreader_release_block (block_data);
+
+ block_data = block_data->next;
+ if (!block_data) {
+ block_data = blocks;
+ }
+ }
+
+ if (block_data && !block_data->queued) {
+ block_data = NULL; // no available blocks with data
+ }
+}
+
+
+void
+streamreader_reset (void) {
+ streamblock_t *b = blocks;
+ while (b) {
+ b->pos = -1;
+ if (b->track != NULL) {
+ pl_item_unref(b->track);
+ b->track = NULL;
+ }
+ b->queued = 0;
+ b = b->next;
+ }
+ block_next = blocks;
+ block_data = NULL;
+ numblocks_ready = 0;
+ _firstblock = 0;
+}
+
+int
+streamreader_num_blocks_ready (void) {
+ return numblocks_ready;
+}
+
+void
+streamreader_flush_after (playItem_t *it) {
+ if (!block_data) {
+ return;
+ }
+
+ streamblock_t *b = block_data;
+
+ int n = numblocks_ready;
+ while (b->track == it && n > 0) {
+ b = b->next;
+ if (!b) {
+ b = blocks;
+ }
+ n--;
+ }
+
+ block_next = b;
+
+ while (n > 0) {
+ _streamreader_release_block (b);
+ _firstblock = 1;
+ b = b->next;
+ if (!b) {
+ b = blocks;
+ }
+ n--;
+ }
+}

deadbeef-1.9.6.tar.bz2/src/streamreader.h Added

@@ -0,0 +1,96 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2017 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef streamreader_h
+#define streamreader_h
+
+#include <deadbeef/deadbeef.h>
+#include "playlist.h"
+
+typedef struct streamblock_s {
+ struct streamblock_s *next;
+ char *buf;
+ int size; // how much bytes total in the buffer, up to BLOCK_SIZE, but can be less
+ int pos; // read position in the buffer
+ int first; // set to 1 for the first buffer of the stream, following the block with last=1
+ int last; // set to 1 for last buffer of the stream
+ int bitrate;
+ int is_silent_header; // set to 1 if the block represents the added silence
+
+ playItem_t *track;
+ ddb_waveformat_t fmt;
+
+ int queued;
+} streamblock_t;
+
+void
+streamreader_init (void);
+
+void
+streamreader_free (void);
+
+// returns next available (free) block, or NULL.
+streamblock_t *
+streamreader_get_next_block (void);
+
+// Reads data from stream to the specified block.
+// The mutex must NOT be locked when this function is called.
+// It will get locked if successful.
+// Returns negative value on error.
+int
+streamreader_read_block (streamblock_t *block, playItem_t *track, DB_fileinfo_t *fileinfo, uint64_t mutex);
+
+int
+streamreader_silence_block (streamblock_t *block, playItem_t *track, DB_fileinfo_t *fileinfo, uint64_t mutex);
+
+// Appends (enqueues) the block to the list of blocks containing data.
+// The passed block pointer must be the same as returned by `streamreader_get_next_block`.
+void
+streamreader_enqueue_block (streamblock_t *block);
+
+// Get the first (current) block with data from the queue.
+// Can return NULL.
+streamblock_t *
+streamreader_get_curr_block (void);
+
+// Release (unqueue) the current data block, move to next one
+void
+streamreader_next_block (void);
+
+// Resets the queue
+void
+streamreader_reset (void);
+
+// Number of blocks in the queue
+int
+streamreader_num_blocks_ready (void);
+
+// Notify streamreader that some configuration has changed
+void
+streamreader_configchanged (void);
+
+// Remove any blocks after the ones referencing `it`
+void
+streamreader_flush_after (playItem_t *it);
+
+#endif /* streamreader_h */

deadbeef-1.9.6.tar.bz2/src/tf.c Added

@@ -0,0 +1,4091 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2014 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+// basic syntax:
+// function call: $function(arg1,arg2,...)
+// meta fields, with spaces allowed: %field name%
+// if_defined block: text$func()%field%more text
+// plain text: anywhere outside of the above
+// escaping: $, %, , , \ must be escaped
+
+// bytecode format
+// 0: indicates start of special block
+// 1: function call
+// func_idx:byte, num_args:byte, arg1_len:uint16,arg2_len:byte,...
+// 2: meta field
+// len:byte, data
+// 3: if_defined block
+// len:int32, data
+// 4: pre-interpreted text
+// len:int32, data
+// 5: text dimming block
+// dim_amount:int8, len:int32, data
+// !0: plain text
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <ctype.h>
+#include <inttypes.h>
+#include <math.h>
+#include <assert.h>
+#include <sys/stat.h>
+#include "streamer.h"
+#include "utf8.h"
+#include "playlist.h"
+#include "plmeta.h"
+#include "playqueue.h"
+#include "tf.h"
+#include "gettext.h"
+#include "plugins.h"
+#include "junklib.h"
+#include "external/wcwidth/wcwidth.h"
+
+#define min(x,y) ((x)<(y)?(x):(y))
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+#define TEMP_BUFFER_SIZE 1000
+#define TF_INTERNAL_FLAG_LOCKED (1<<16)
+
+typedef struct ddb_tf_var_t {
+ char *key;
+ char *value;
+ struct ddb_tf_var_t *next;
+} ddb_tf_var_t;
+
+typedef struct {
+ ddb_tf_context_t _ctx;
+
+ /// indicates that current code is evaluated as the argument of $itematindex
+ unsigned getting_item_at_index;
+
+ /// the index parameter of $itematindex
+ int item_at_index;
+
+ /// variable data, for $put/$puts/$get
+ ddb_tf_var_t *vars;
+} ddb_tf_context_int_t;
+
+typedef struct {
+ const char *i;
+ uint8_t *o;
+ int eol;
+} tf_compiler_t;
+
+/*
+ * String functions: Returns the number of bytes in the output buffer,
+ * not including a null terminator, which is not written.
+ * Integer functions: As with string functions. Returns a number in string format.
+ * Boolean functions: Returns a positive value to indicate truthiness,
+ * but with an empty output string (*out == 0).
+ *
+ * In any context, -1 indicates an error.
+ * The output string is sometimes, but not always, set to the empty string (*out == 0) in such cases.
+ * Use of TF_EVAL_CHECK will always ensure that the output string is always
+ * null terminated in such cases, once reached.
+ *
+ * @param outlen Available bytes in `out`, not including space for any terminating null.
+ */
+typedef int (*tf_func_ptr_t)(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef);
+
+#define TF_MAX_FUNCS 0xff
+
+typedef struct {
+ const char *name;
+ tf_func_ptr_t func;
+} tf_func_def;
+
+
+/*
+ * @param out output buffer to write to
+ * @param outlen Available bytes in the buffer `out`, not including the terminating null byte.
+ */
+static int
+tf_eval_int (ddb_tf_context_t *ctx, const char *code, int size, char *out, int outlen, int *bool_out, int fail_on_undef);
+
+static const char *
+_tf_get_combined_value (playItem_t *it, const char *key, int *needs_free, int item_index);
+
+static void
+_tf_vars_free(ddb_tf_context_int_t *ctx);
+
+#define TF_EVAL_CHECK(res, ctx, arg, arg_len, out, outlen, fail_on_undef)\
+res = tf_eval_int (ctx, arg, arg_len, out, outlen, &bool_out, fail_on_undef);\
+if (res < 0) { *out = 0; return -1; }
+
+// empty track is used when ctx.it is null
+static playItem_t empty_track;
+// empty playlist is used when ctx.plt is null
+static playlist_t empty_playlist;
+// empty code is used when "code" argument is null
+static char empty_code4 = {0};
+
+static int
+snprintf_clip (char *buf, size_t len, const char *fmt, ...) {
+ va_list ap;
+ va_start(ap, fmt);
+ int n = vsnprintf(buf, len, fmt, ap);
+ va_end(ap);
+ if (n < 0) {
+ *buf = 0;
+ return 0;
+ }
+ return (int)min (n, len-1);
+}
+
+/*
+ * @param outlen bytes available in the buffer `out`, including the terminating null byte
+ */
+int
+tf_eval (ddb_tf_context_t *_ctx, const char *code, char *out, int outlen) {
+ // ensure the size is valid
+ if (_ctx->_size < (char *)&_ctx->dimmed - (char *)_ctx) {
+ *out = 0;
+ return -1;
+ }
+
+ // normalize the context
+ ddb_tf_context_int_t ctx = {0};
+ ctx._ctx._size = sizeof (ddb_tf_context_t);
+ ctx._ctx.flags = _ctx->flags;
+ ctx._ctx.it = _ctx->it;
+ ctx._ctx.plt = _ctx->plt;
+ ctx._ctx.idx = _ctx->idx;
+ ctx._ctx.id = _ctx->id;
+ ctx._ctx.iter = _ctx->iter;
+ ctx._ctx.update = _ctx->update;
+ if (_ctx->_size >= (char *)&_ctx->metadata_transformer - (char *)_ctx + sizeof(_ctx->metadata_transformer)) {
+ ctx._ctx.metadata_transformer = _ctx->metadata_transformer;
+ }
+
+
+ if (!code) {
+ code = empty_code;
+ }
+
+ if (!ctx._ctx.it) {
+ ctx._ctx.it = (ddb_playItem_t *)&empty_track;
+ }
+
+ if (!ctx._ctx.plt) {
+ ctx._ctx.plt = (ddb_playlist_t *)&empty_playlist;
+ }
+
+ int32_t codelen = *((int32_t *)code);
+ code += 4;
+ memset (out, 0, outlen);
+ int l = 0;
+
+ int bool_out = 0;
+ int id = -1;
+ if (_ctx->flags & DDB_TF_CONTEXT_HAS_ID) {
+ id = _ctx->id;
+ }
+
+ switch (id) {
+ case DB_COLUMN_FILENUMBER:
+ if (ctx._ctx.flags & DDB_TF_CONTEXT_HAS_INDEX) {
+ l = snprintf_clip (out, outlen, "%d", ctx._ctx.idx+1);
+ }
+ else if (ctx._ctx.plt) {
+ int idx = plt_get_item_idx ((playlist_t *)ctx._ctx.plt, (playItem_t *)ctx._ctx.it, PL_MAIN);
+ l = snprintf_clip (out, outlen, "%d", idx+1);
+ }
+ break;
+ case DB_COLUMN_PLAYING:
+ l = pl_format_item_queue ((playItem_t *)ctx._ctx.it, out, outlen);
+ break;
+ default:
+ // tf_eval_int expects outlen to not include the terminating zero
+ TF_EVAL_CHECK(l, &ctx._ctx, code, codelen, out, outlen - 1, 0);
+ break;
+ }
+
+ if (!(ctx._ctx.flags & DDB_TF_CONTEXT_MULTILINE)) {
+ // replace any unprintable char with '_'
+ for (; *out; out++) {
+ if ((uint8_t)(*out) < ' ') {
+ if (*out == '\033' && (ctx._ctx.flags & DDB_TF_CONTEXT_TEXT_DIM)) {
+ continue;
+ }
+ *out = '_';
+ }
+ }
+ }
+
+ _ctx->update = ctx._ctx.update;
+ if (_ctx->_size >= (char *)&_ctx->dimmed - (char *)_ctx + sizeof(_ctx->dimmed)) {
+ _ctx->dimmed = ctx._ctx.dimmed;
+ }
+
+ _tf_vars_free(&ctx);
+
+ return l;
+}
+
+// $greater(a,b) returns true if a is greater than b, otherwise false
+int
+tf_func_greater (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 2) {
+ return -1;
+ }
+ const char *arg = args;
+
+ int bool_out = 0;
+
+ char aTEMP_BUFFER_SIZE;
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, a, sizeof (a) - 1, fail_on_undef);
+
+ int aa = atoi (a);
+
+ arg += arglens0;
+ char bTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, arg, arglens1, b, sizeof (b) - 1, fail_on_undef);
+ int bb = atoi (b);
+
+ *out = 0;
+ return aa > bb;
+}
+
+// $strcmp(s1,s2) compares s1 and s2, returns true if equal, otherwise false
+int
+tf_func_strcmp (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 2) {
+ return -1;
+ }
+ const char *arg = args;
+
+ int bool_out = 0;
+
+ char s1TEMP_BUFFER_SIZE;
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, s1, sizeof (s1) - 1, fail_on_undef);
+
+ arg += arglens0;
+ char s2TEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, arg, arglens1, s2, sizeof (s2) - 1, fail_on_undef);
+
+ int res = strcmp (s1, s2);
+ *out = 0;
+ return !res;
+}
+
+int
+tf_func_stricmp (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 2) {
+ return -1;
+ }
+ const char *arg = args;
+
+ int bool_out = 0;
+
+ char s1TEMP_BUFFER_SIZE;
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, s1, sizeof (s1) - 1, fail_on_undef);
+
+ arg += arglens0;
+ char s2TEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, arg, arglens1, s2, sizeof (s2) - 1, fail_on_undef);
+
+ int res = u8_strcasecmp (s1, s2);
+ *out = 0;
+ return !res;
+}
+
+static int
+tf_prefix_helper (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef, int swap) {
+ if (argc == 0) {
+ return -1;
+ }
+
+ const char *arg = args;
+ int bool_out = 0;
+ int i;
+
+ char strTEMP_BUFFER_SIZE;
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, str, sizeof (str) - 1, fail_on_undef);
+ arg += arglens0;
+
+ int prefix_count;
+ size_t buffer_size;
+ char *buf = NULL;
+
+ if (argc == 1) {
+ prefix_count = 2;
+ buffer_size = 0;
+ }
+ else {
+ prefix_count = argc - 1;
+ buffer_size = 2000;
+ buf = alloca(buffer_size);
+ }
+
+ const char *prefixesprefix_count;
+ int prefix_lengthsprefix_count;
+
+ if (argc == 1) {
+ prefixes0 = "A";
+ prefix_lengths0 = 1;
+ prefixes1 = "The";
+ prefix_lengths1 = 3;
+ }
+ else {
+ char *ptr = buf;
+ for (i = 0; i < prefix_count; ++i) {
+ prefixesi = ptr;
+ TF_EVAL_CHECK (prefix_lengthsi, ctx, arg, arglensi+1, ptr, (int)(buf+buffer_size-ptr-1), fail_on_undef);
+ ptr += prefix_lengthsi+1;
+ arg += arglensi+1;
+ }
+ }
+
+ for (i = 0; i < prefix_count; i++) {
+ if (prefix_lengthsi + 1 > len) {
+ continue;
+ }
+
+ if (!strncasecmp(str, prefixesi, prefix_lengthsi) && strprefix_lengthsi == ' ') {
+ int stripped_length = len - prefix_lengthsi - 1;
+ int new_len;
+ if (swap) {
+ new_len = len + 1;
+ }
+ else {
+ new_len = stripped_length;
+ }
+
+ if (new_len > outlen) {
+ return -1;
+ }
+
+ memcpy(out, str + prefix_lengthsi + 1, stripped_length);
+
+ if (swap) {
+ outstripped_length = ',';
+ outstripped_length+1 = ' ';
+ memcpy(out+stripped_length+2, str, prefix_lengthsi);
+ }
+
+ return new_len;
+ }
+ }
+
+ if (len > outlen) {
+ return -1;
+ }
+
+ memcpy(out, str, len);
+
+ return len;
+}
+
+// $stripprefix(str,...) strips a list of prefixes from a string. If no prefixes are supplied, 'A' and 'The' are used.
+int
+tf_func_stripprefix (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_prefix_helper (ctx, argc, arglens, args, out, outlen, fail_on_undef, 0);
+}
+
+// $swapprefix(str,...) moves a list of prefixes to the end of a string. If no prefixes are supplied, 'A' and 'The' are used.
+int
+tf_func_swapprefix (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_prefix_helper (ctx, argc, arglens, args, out, outlen, fail_on_undef, 1);
+}
+
+// $upper(str) converts a string to uppercase
+int
+tf_func_upper (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ char temp_strTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, temp_str, sizeof (temp_str) - 1, fail_on_undef);
+
+ char *pout = out;
+ char *p = temp_str;
+ while (*p && outlen > 0) {
+ uint32_t i = 0;
+ u8_nextchar (p, &i);
+ if (i > outlen) {
+ break;
+ }
+ int l = u8_toupper (p, i, pout);
+ p += i;
+ pout += l;
+ outlen -= l;
+ }
+
+ return (int)(pout - out);
+}
+
+// $lower(str) converts a string to lowercase
+int
+tf_func_lower (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ char temp_strTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, temp_str, sizeof (temp_str) - 1, fail_on_undef);
+
+ char *pout = out;
+ char *p = temp_str;
+ while (*p && outlen > 0) {
+ uint32_t i = 0;
+ u8_nextchar (p, &i);
+ if (i > outlen) {
+ break;
+ }
+ int l = u8_tolower (p, i, pout);
+ p += i;
+ pout += l;
+ outlen -= l;
+ }
+
+ return (int)(pout - out);
+}
+
+// $num(n,len) Formats the integer number n in decimal notation with len characters. Pads with zeros
+// from the left if necessary. len includes the dash when the number is negative. If n is not numeric, it is treated as zero.
+int
+tf_func_num (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ const char *arg = args;
+ int bool_out = 0;
+ int len;
+
+ if (argc != 2) {
+ return -1;
+ }
+
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, out, outlen, fail_on_undef);
+ arg += arglens0;
+ int n = atoi (out);
+
+ TF_EVAL_CHECK(len, ctx, arg, arglens1, out, outlen, fail_on_undef);
+ int n_len = atoi (out);
+
+ if (outlen < 1 || outlen < n_len) {
+ *out = 0;
+ return -1;
+ }
+
+ if (n_len < 0) {
+ n_len = 0;
+ }
+
+ char *out_w = out;
+ int is_negative = n < 0;
+ int num_len = 0;
+
+ int cnt = n;
+ do {
+ num_len++;
+ cnt /= 10;
+ } while (cnt);
+
+ if (is_negative) {
+ *out_w++ = '-';
+ num_len++;
+ n *= -1;
+ }
+
+ int num_len_plus_padding = num_len;
+ while (num_len_plus_padding < n_len) {
+ *out_w++ = '0';
+ num_len_plus_padding++;
+ }
+
+ out_w += num_len - is_negative;
+ do {
+ *--out_w = (n % 10) + '0';
+ n /= 10;
+ } while (n);
+
+ return n_len > num_len ? n_len : num_len;
+}
+
+// $replace(subject, search, replace, ...) Replaces all occurrences of `search`
+// substring in `subject` with `replace`. Accepts multiple search and replace
+// substrings
+int
+tf_func_replace (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc < 3 || argc % 2 == 0) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int i;
+
+ const char *arg = args;
+ char buf2000;
+ char *linesargc;
+ int lensargc;
+ char *ptr = buf;
+
+ for (i = 0; i < argc; ++i) {
+ linesi = ptr;
+ TF_EVAL_CHECK (lensi, ctx, arg, arglensi, ptr, (int)(buf+sizeof(buf)-ptr-1), fail_on_undef);
+ ptr += lensi+1;
+ arg += arglensi;
+ }
+
+ char *optr = out;
+ const char *iptr = lines0;
+
+ for (;;) {
+ int chunklen = (int)(lines0 + lens0 - iptr); //chunk is a substring before the found needle
+ int idx = -1; //index of the found needle
+
+ for (i = 0; i < (argc - 1) / 2; ++i) {
+ // Check for empty string -- can't replace it with anything
+ if (*linesi*2+1 == 0) {
+ break;
+ }
+ char *found = strstr (iptr, linesi*2+1);
+ if (found && found - iptr < chunklen) {
+ chunklen = (int)(found - iptr);
+ idx = i;
+ }
+ }
+
+ if (chunklen > out + outlen - optr)
+ return -1;
+ memcpy (optr, iptr, chunklen);
+ optr += chunklen;
+
+ if (idx == -1) //nothing found
+ break;
+
+ if (lensidx*2+2 > out + outlen - optr)
+ return -1;
+
+ memcpy (optr, linesidx*2+2, lensidx*2+2);
+ optr += lensidx*2+2;
+
+ iptr += chunklen + lensidx*2+1;
+ }
+ *optr = 0;
+ return (int)(optr - out);
+}
+
+int
+tf_func_abbr (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1 && argc != 2) {
+ return -1;
+ }
+
+ const char *arg = args;
+
+ int bool_out = 0;
+
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, out, outlen, fail_on_undef);
+
+ if (argc == 2) {
+ char num_chars_strTEMP_BUFFER_SIZE;
+ arg += arglens0;
+ int l;
+ TF_EVAL_CHECK(l, ctx, arg, arglens1, num_chars_str, sizeof (num_chars_str) - 1, fail_on_undef);
+ int num_chars = atoi (num_chars_str);
+ if (len <= num_chars) {
+ return len;
+ }
+ }
+
+ char *p = out;
+ char *pout = out;
+ const char skipchars = "() ,/\\|";
+ while (*p) {
+ // skip whitespace/paren
+ while (*p && strchr (skipchars, *p)) {
+ p++;
+ }
+ if (!*p) {
+ break;
+ }
+
+ // take the first letter for abbrev
+ int is_bracket = *p == '' || *p == '';
+ int32_t size = 0;
+ u8_nextchar(p, &size);
+ memmove (pout, p, size);
+ pout += size;
+ p += size;
+
+ // skip to the end of word
+ while (*p && !strchr (skipchars, *p)) {
+ if (!is_bracket) {
+ p++;
+ }
+ else {
+ size = 0;
+ u8_nextchar(p, &size);
+ memmove (pout, p, size);
+ pout += size;
+ p += size;
+ }
+ }
+ }
+
+ *pout = 0;
+ return (int)(pout - out);
+}
+
+int
+tf_func_ansi (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+ return len;
+}
+
+int
+tf_func_ascii (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ char temp_strTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, temp_str, sizeof (temp_str) - 1, fail_on_undef);
+
+ len = junk_iconv (temp_str, len, out, outlen, "utf-8", "ascii");
+
+ return len;
+}
+
+int
+tf_caps_impl (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef, int do_lowercasing) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ char *p = out;
+ char *end = p + len;
+ const char skipchars = "() ,/\\|";
+ while (*p) {
+ // skip whitespace/paren
+ while (*p && strchr (skipchars, *p)) {
+ p++;
+ }
+ if (!*p) {
+ break;
+ }
+
+ int is_bracket = *p == '' || *p == '';
+
+ char temp5;
+
+ // uppercase the first letter
+ int32_t size = 0;
+ u8_nextchar (p, &size);
+ int32_t uppersize = u8_toupper ((const signed char *)p, size, temp);
+ if (uppersize != size) {
+ memmove (p+uppersize, p+size, end-(p+size));
+ end += uppersize - size;
+ *end = 0;
+ }
+ memcpy (p, temp, uppersize);
+
+ p += uppersize;
+
+ // lowercase to the end of word
+ while (*p && !strchr (skipchars, *p)) {
+ if (is_bracket) {
+ p++;
+ }
+ else {
+ size = 0;
+ u8_nextchar ((const char *)p, &size);
+ if (do_lowercasing) {
+ int32_t lowersize = u8_tolower ((const signed char *)p, size, temp);
+ if (lowersize != size) {
+ memmove (p+lowersize, p+size, end-(p+size));
+ end += lowersize - size;
+ *end = 0;
+ }
+ memcpy (p, temp, lowersize);
+ p += lowersize;
+ }
+ else {
+ p += size;
+ }
+ }
+ }
+ }
+
+ return (int)(end - out);
+}
+
+int
+tf_func_caps (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_caps_impl (ctx, argc, arglens, args, out, outlen, fail_on_undef, 1);
+}
+
+int
+tf_func_caps2 (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_caps_impl (ctx, argc, arglens, args, out, outlen, fail_on_undef, 0);
+}
+
+int
+tf_func_char (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ int n = atoi (out);
+ *out = 0;
+
+ if (outlen < 5) {
+ return -1;
+ }
+ len = u8_wc_toutf8 (out, n);
+ return len;
+}
+
+int
+tf_func_crc32 (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ static const uint32_t tab256 = {
+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+ 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+ 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+ 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+ 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+ 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+ 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+ 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+ 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+ 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+ 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+ 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+ 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+ 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+ 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+ 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+ 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+ 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+ 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+ 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+ 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+ 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+ 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+ 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+ 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+ 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+ 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+ 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+ 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+ 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+ 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+ 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+ 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+ 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+ 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+ 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+ 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+ 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+ 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+ 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+ 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+ };
+
+ int bool_out = 0;
+
+ int len;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ uint32_t crc = 0xffffffff;
+
+ for (int i = 0; i < len; i++) {
+ crc = (crc >> 8) ^ tab(crc ^ (uint8_t)outi) & 0xff;
+ }
+
+ crc ^= 0xffffffff;
+
+ return snprintf_clip (out, outlen, "%u", crc);
+}
+
+int
+tf_func_crlf (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 0 || outlen < 2) {
+ return -1;
+ }
+ out0 = '\n';
+ out1 = 0;
+ return 1;
+}
+
+// $left(text,n) returns the first n characters of text
+int
+tf_func_left (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 2) {
+ return -1;
+ }
+ const char *arg = args;
+
+ int bool_out = 0;
+
+ // get number of characters
+ char num_chars_strTEMP_BUFFER_SIZE;
+ arg += arglens0;
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens1, num_chars_str, sizeof (num_chars_str) - 1, fail_on_undef);
+ int num_chars = atoi (num_chars_str);
+ if (num_chars <= 0 || num_chars > outlen) {
+ *out = 0;
+ return -1;
+ }
+
+ // get text
+ char textTEMP_BUFFER_SIZE;
+ arg = args;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, text, sizeof (text) - 1, fail_on_undef);
+
+ // convert num_chars to num_bytes
+ int num_bytes = u8_offset(text, num_chars);
+
+ int res = u8_strnbcpy (out, text, min(num_bytes, outlen));
+ return res;
+}
+
+// $repeat(expr,count): repeat `count` copies of `expr`
+int
+tf_func_repeat (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 2) {
+ return -1;
+ }
+ const char *arg = args;
+
+ int bool_out = 0;
+
+ // get repeat count
+ char num_chars_strTEMP_BUFFER_SIZE;
+ arg += arglens0;
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens1, num_chars_str, sizeof (num_chars_str) - 1, fail_on_undef);
+ int repeat_count = atoi (num_chars_str);
+ if (repeat_count < 0) {
+ *out = 0;
+ return -1;
+ }
+ else if (repeat_count == 0) {
+ // early out on zero repeat count
+ *out = 0;
+ return 0;
+ }
+
+ // get expr
+ char textTEMP_BUFFER_SIZE;
+ arg = args;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, text, sizeof (text) - 1, fail_on_undef);
+
+ int res=0;
+ for (int i = 0; i < repeat_count; i++) {
+ if (res + len > outlen) {
+ break;
+ }
+ res += u8_strnbcpy (out + len * i, text, len);
+ }
+
+ return res;
+}
+
+// $insert(str,insert,n): Inserts `insert` into `str` after `n` characters.
+int
+tf_func_insert (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 3) {
+ return -1;
+ }
+ const char *arg = args;
+
+ int bool_out = 0;
+
+ int len, str_len, insert_len;
+
+ // get str
+ char strTEMP_BUFFER_SIZE;
+ arg = args;
+ TF_EVAL_CHECK(str_len, ctx, arg, arglens0, str, sizeof (str) - 1, fail_on_undef);
+ int str_chars = u8_strlen(str);
+
+ // get insert
+ char insertTEMP_BUFFER_SIZE;
+ arg += arglens0;
+ TF_EVAL_CHECK(insert_len, ctx, arg, arglens1, insert, sizeof (insert) - 1, fail_on_undef);
+
+ // get insertion point
+ char num_chars_strTEMP_BUFFER_SIZE;
+ arg += arglens1;
+ TF_EVAL_CHECK(len, ctx, arg, arglens2, num_chars_str, sizeof (num_chars_str) - 1, fail_on_undef);
+ int insertion_point = atoi (num_chars_str);
+ if (insertion_point < 0) {
+ *out = 0;
+ return -1;
+ }
+ if (insertion_point > str_chars) {
+ insertion_point = str_chars;
+ }
+
+ // convert num_chars to num_bytes
+ int nb_before = u8_offset (str, insertion_point);
+ int nb_after = u8_offset (str + nb_before, str_chars - insertion_point);
+
+ int l;
+ int res = 0;
+
+ l = u8_strnbcpy(out, str, min (nb_before, outlen));
+ outlen -= l;
+ out += l;
+ res += l;
+
+ l = u8_strnbcpy(out, insert, min (insert_len, outlen));
+ outlen -= l;
+ out += l;
+ res += l;
+
+ l = u8_strnbcpy(out, str + nb_before, min (nb_after, outlen));
+ outlen -= l;
+ out += l;
+ res += l;
+
+ return res;
+}
+
+// $len(expr): returns length of `expr`
+int
+tf_func_len (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ return snprintf_clip(out, outlen, "%d", u8_strlen(out));
+}
+
+int
+tf_func_len2 (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ int wcsz = 0;
+ int32_t i = 0;
+ uint32_t c;
+ while (outi && (c = u8_nextchar(out, &i)) != 0) {
+ wcsz += mk_wcwidth(c);
+ }
+
+ return snprintf_clip(out, outlen, "%d", wcsz);
+}
+
+int
+tf_func_extremest_impl(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef, int shortest) {
+ if (argc < 1) {
+ return -1;
+ }
+ int bool_out = 0;
+ int this_blen, this_clen;
+ int best_blen = arglens0;
+ const char *pos = args;
+
+ char tmpoutlen + 1;
+
+ TF_EVAL_CHECK(best_blen, ctx, pos, arglens0, out, outlen, fail_on_undef);
+ int best_clen = u8_strlen(out);
+
+ for (int i = 1; i != argc; ++i) {
+ pos += arglensi - 1;
+ TF_EVAL_CHECK(this_blen, ctx, pos, arglensi, tmp, outlen, fail_on_undef);
+ this_clen = u8_strlen(tmp);
+ if (shortest ? this_clen < best_clen : this_clen > best_clen) {
+ best_clen = this_clen;
+ best_blen = this_blen;
+ u8_strnbcpy(out, tmp, min(best_blen, outlen));
+ }
+ }
+
+ return best_blen;
+}
+
+int
+tf_func_shortest(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_func_extremest_impl(ctx, argc, arglens, args, out, outlen, fail_on_undef, 1);
+}
+
+int
+tf_func_longest(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_func_extremest_impl(ctx, argc, arglens, args, out, outlen, fail_on_undef, 0);
+}
+
+int
+tf_func_longer(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 2) {
+ return -1;
+ }
+ return tf_func_longest(ctx, argc, arglens, args, out, outlen, fail_on_undef);
+}
+
+// $pad(expr,len, char): If `expr` is shorter than len characters, the function adds `char` characters (if present otherwise
+// spaces) to the right of `expr` to make the result `len` characters long. Otherwise the function returns str unchanged.
+int
+tf_func_pad_impl (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef, int right, int cut) {
+ if (argc < 1 || argc > 3) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len, str_len;
+ const char *arg = args;
+ char pad_char_strTEMP_BUFFER_SIZE = " ";
+ int nb_pad_char=1;
+
+ // get expr
+ char stroutlen;
+ TF_EVAL_CHECK(str_len, ctx, args, arglens0, str, outlen, fail_on_undef);
+
+ // get len
+ char num_chars_strTEMP_BUFFER_SIZE;
+ arg += arglens0;
+ TF_EVAL_CHECK(len, ctx, arg, arglens1, num_chars_str, sizeof (num_chars_str) - 1, fail_on_undef);
+ int padlen_chars = atoi (num_chars_str);
+ if (padlen_chars < 0) {
+ *out = 0;
+ return -1;
+ }
+ // get char
+ if (argc == 3) {
+ arg += arglens1;
+ TF_EVAL_CHECK(len, ctx, arg, arglens2, pad_char_str, sizeof (pad_char_str) - 1, fail_on_undef);
+ // only accept first character
+ nb_pad_char = u8_offset(pad_char_str, 1);
+ pad_char_strnb_pad_char = 0;
+ }
+
+ int str_chars = u8_strlen(str);
+
+ if (str_chars >= padlen_chars) {
+ if (str_chars > padlen_chars && cut) {
+ // u8_strncpy has no limiter in byte units available. We rely on str being of size outlen above for safety
+ return u8_strncpy(out, str, padlen_chars);
+ }
+ return u8_strnbcpy(out, str, min (str_len, outlen));
+ }
+
+ int res=0,l;
+ int repeat_count = padlen_chars-str_chars;
+
+
+ if (!right) {
+ l = u8_strnbcpy(out, str, min (str_len, outlen));
+ outlen -= l;
+ out += l;
+ res += l;
+ }
+
+ for (int i = 0; i < repeat_count && outlen; i++) {
+ l = u8_charcpy (out, pad_char_str, nb_pad_char);
+ outlen -= l;
+ out += l;
+ res += l;
+ }
+
+ if (right) {
+ l = u8_strnbcpy(out, str, min (str_len, outlen));
+ outlen -= l;
+ out += l;
+ res += l;
+ }
+
+ return res;
+}
+
+int
+tf_func_pad (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_func_pad_impl (ctx, argc, arglens, args, out, outlen, fail_on_undef, 0, 0);
+}
+
+// $pad_right(expr,len,char): same as $pad but right aligns string
+int
+tf_func_pad_right (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_func_pad_impl (ctx, argc, arglens, args, out, outlen, fail_on_undef, 1, 0);
+}
+
+// _cut variants: same as above, but truncates string if too long
+int
+tf_func_padcut (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_func_pad_impl (ctx, argc, arglens, args, out, outlen, fail_on_undef, 0, 1);
+}
+
+int
+tf_func_padcut_right (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_func_pad_impl (ctx, argc, arglens, args, out, outlen, fail_on_undef, 1, 1);
+}
+
+int
+tf_func_progress_impl(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef, int alt) {
+ if (argc != 5) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+
+ int progress, range;
+ int barsize;
+ char *notch;
+ char *bar;
+
+ const char *argpos = args;
+
+ TF_EVAL_CHECK(len, ctx, argpos, arglens0, out, outlen - 1, fail_on_undef);
+ progress = atoi(out);
+ if (progress < 0) {
+ return -1;
+ }
+ argpos += arglens0;
+
+ TF_EVAL_CHECK(len, ctx, argpos, arglens1, out, outlen - 1, fail_on_undef);
+ range = atoi(out);
+ if (range < 0) {
+ return -1;
+ }
+ if (range == 0) {
+ range = 1;
+ }
+ argpos += arglens1;
+
+ TF_EVAL_CHECK(len, ctx, argpos, arglens2, out, outlen - 1, fail_on_undef);
+ barsize = atoi(out);
+ if (range < 0) {
+ return -1;
+ }
+ argpos += arglens2;
+
+ TF_EVAL_CHECK(len, ctx, argpos, arglens3, out, outlen - 1, fail_on_undef);
+ notch = strdup (out);
+ argpos += arglens3;
+
+ len = tf_eval_int (ctx, argpos, arglens4, out, outlen - 1, &bool_out, fail_on_undef);
+ if (len < 0) {
+ free (notch);
+ *out = 0;
+ return -1;
+ }
+ bar = strdup (out);
+ argpos += arglens4;
+
+ int replaced = progress * barsize / range;
+ /*
+ * Alt mode fills a bar. Normal mode draws a single notch.
+ * This adjustment sets what happens once we've reached the end, whether we should:
+ * - fill up completely, or
+ * - replace the last character.
+ */
+ if (!alt && replaced >= barsize) {
+ replaced = barsize - 1;
+ }
+ char *cur = out;
+ int remaining = outlen;
+ for (int i = 0; i != barsize; ++i) {
+ /*
+ * Experimenting in fb2k, it looks like:
+ * What would strictly precede the mark's normal mode position gets marked in alt mode,
+ * with the exception of a full bar.
+ */
+ // Try to replicate this.
+ char *p = NULL;
+ if (alt ? i < replaced : i == replaced) {
+ p = notch;
+ } else {
+ p = bar;
+ }
+ size_t l = min(strlen (p), remaining);
+ l = u8_strncpy (cur, p, (int)l);
+ cur += l;
+ remaining -= l;
+ }
+
+ free (bar);
+ free (notch);
+
+ return outlen - remaining;
+}
+
+int
+tf_func_progress (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_func_progress_impl (ctx, argc, arglens, args, out, outlen, fail_on_undef, 0);
+}
+
+int
+tf_func_progress2 (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return tf_func_progress_impl (ctx, argc, arglens, args, out, outlen, fail_on_undef, 1);
+}
+
+int
+tf_func_right (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 2) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+
+ TF_EVAL_CHECK(len, ctx, args + arglens0, arglens1, out, outlen, fail_on_undef);
+ int desired_chars = atoi(out);
+ if (desired_chars < 0) {
+ return -1;
+ }
+
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+ int clen = u8_strlen(out);
+
+ if (clen < desired_chars) {
+ return len;
+ }
+
+ int32_t index = 0;
+ for (int remaining = clen - desired_chars; remaining; --remaining) {
+ u8_nextchar(out, &index);
+ }
+
+ int newblen = len - index;
+
+ memmove(out, out + index, newblen);
+ return newblen;
+}
+
+int
+tf_func_roman (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+ int value = atoi(out);
+ // fb2k (presumably, it goes off my screen) formats 100000; but not 100001
+ if (value < 0 || value > 100000) {
+ return -1;
+ }
+
+ int pos = 0;
+ while (pos < outlen - 1) {
+ if (value <= 0) {
+ break;
+ }
+ if (value >= 1000) {
+ outpos++ = 'M';
+ value -= 1000;
+ } else if (value >= 900) {
+ outpos++ = 'C';
+ value += 100;
+ } else if (value >= 500) {
+ outpos++ = 'D';
+ value -= 500;
+ } else if (value >= 400) {
+ outpos++ = 'C';
+ value += 100;
+ } else if (value >= 100) {
+ outpos++ = 'C';
+ value -= 100;
+ } else if (value >= 90) {
+ outpos++ = 'X';
+ value += 10;
+ } else if (value >= 50) {
+ outpos++ = 'L';
+ value -= 50;
+ } else if (value >= 40) {
+ outpos++ = 'X';
+ value += 10;
+ } else if (value >= 10) {
+ outpos++ = 'X';
+ value -= 10;
+ } else if (value >= 9) {
+ outpos++ = 'I';
+ value += 1;
+ } else if (value >= 5) {
+ outpos++ = 'V';
+ value -= 5;
+ } else if (value >= 4) {
+ outpos++ = 'I';
+ value += 1;
+ } else if (value >= 1) {
+ outpos++ = 'I';
+ value -= 1;
+ }
+ }
+
+ return pos;
+}
+
+int
+tf_func_rot13 (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ int32_t offset = 0;
+ while (offset < outlen && outoffset) {
+ char c = outoffset;
+ if (c >= 'A' && c <= 'M') {
+ outoffset++ += 13;
+ } else if (c >= 'N' && c <= 'Z') {
+ outoffset++ -= 13;
+ } else if (c >= 'a' && c <= 'm') {
+ outoffset++ += 13;
+ } else if (c >= 'n' && c <= 'z') {
+ outoffset++ -= 13;
+ } else {
+ u8_nextchar(out, &offset);
+ }
+ }
+
+ return offset;
+}
+
+int
+tf_func_strchr(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc < 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+
+ TF_EVAL_CHECK(len, ctx, args + arglens0, arglens1, out, outlen, fail_on_undef);
+ int dummy = 0;
+ // fb2k permits strings with many characters as the needle, but uses exactly the first character from them.
+ uint32_t needle = u8_nextchar(out, &dummy);
+
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ int32_t charpos;
+ char *pos = u8_strchr(out, needle, &charpos);
+
+ if (!pos) {
+ // 0 is used to indicate not found
+ charpos = 0;
+ } else {
+ // Convert from 0- to 1- based indexing.
+ charpos += 1;
+ }
+
+ return snprintf_clip(out, outlen, "%" PRId32, charpos);
+}
+
+int
+tf_func_strrchr(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc < 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ char strTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, args + arglens0, arglens1, str, sizeof(str) - 1, fail_on_undef);
+ int dummy = 0;
+ uint32_t needle = u8_nextchar(str, &dummy);
+
+ int32_t acc = 0, charpos;
+ char *pos = out;
+ do {
+ pos = u8_strchr(pos, needle, &charpos);
+ if (pos) {
+ /*
+ * Simultaneously and efficiently:
+ * - prevent finding the same character repeatedly
+ * - preserve 0 = not found as a return string
+ * - convert from 0- to 1- based indexing
+ * The second and third points are effected on the first iteration,
+ * with the +1 on the accumulator converting indexing and marking
+ * found when found.
+ * The first point is effected on later iterations, with the +1 on
+ * the accumulator covering the increment in character position
+ * from the previous iteration.
+ */
+ acc += charpos + 1;
+ pos = pos + 1;
+ }
+ } while (pos);
+
+ return snprintf_clip(out, outlen, "%" PRId32, acc);
+}
+
+int
+tf_func_strstr(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 2) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ char needleTEMP_BUFFER_SIZE;
+
+ TF_EVAL_CHECK(len, ctx, args + arglens0, arglens1, needle, sizeof(needle) - 1, fail_on_undef);
+
+ char *pos = strstr(out, needle);
+
+ int clen = 0;
+ if (pos) {
+ /*
+ * Terminate the string at the occurrence of the needle, then find the new
+ * overall length to find the offset in characters
+ */
+ *pos = 0;
+ clen = u8_strlen(out);
+ // Convert from 0-based offset to 1-based indexing
+ clen += 1;
+ }
+ return snprintf_clip(out, outlen, "%d", clen);
+}
+
+// fb2k uses 1-based indexing for $substr, with both points inclusive, and all arguments mandatory.
+int
+tf_func_substr(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 3) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ char strTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, args + arglens0, arglens1, str, sizeof(str) - 1, fail_on_undef);
+ int from = atoi(str);
+ if (from <= 0) {
+ // fb2k tolerates negative 'from' values
+ from = 1;
+ }
+ // Convert to a 0-based offset
+ from -= 1;
+
+ char *temp = malloc (outlen);
+ TF_EVAL_CHECK(len, ctx, args + arglens0 + arglens1, arglens2, temp, outlen, fail_on_undef);
+ int to = atoi(temp);
+ free (temp);
+ if (to <= 0) {
+ // If we don't want anything, finish early
+ return 0;
+ }
+ // Convert to a 0-based offset
+ to -= 1;
+
+ int bpos = 0;
+ int chars;
+ for (chars = 0; outbpos && chars != from; ++chars) {
+ u8_nextchar(out, &bpos);
+ }
+ int bfrom = bpos;
+
+ for ( ; outbpos && chars <= to; ++chars) {
+ u8_nextchar(out, &bpos);
+ }
+ int bto = bpos;
+
+ int bdiff = bto - bfrom;
+
+ memmove(out, out + bfrom, bdiff);
+
+ return bdiff;
+
+}
+
+int
+tf_func_tab(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc > 1) {
+ return -1;
+ }
+
+ volatile int amount = 1;
+ if (argc == 1) {
+ int bool_out = 0;
+ int len;
+
+ char strTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, str, sizeof(str) - 1, fail_on_undef);
+ amount = atoi(str);
+ if (amount < 0) {
+ return -1;
+ }
+ }
+ if (amount > outlen) {
+ amount = outlen;
+ }
+
+ memset(out, '\t', amount);
+ return amount;
+}
+
+int
+tf_func_trim(ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc == 0) {
+ return 0;
+ }
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+ int len;
+
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ int bfrom = -1, bto = 0;
+
+ for (int offset = 0; offset != len && outoffset; ) {
+ const int last = offset;
+ u8_nextchar(out, &offset);
+ if (outlast != ' ') {
+ if (bfrom == -1) {
+ bfrom = last;
+ }
+ bto = offset;
+ }
+ }
+
+ if (bfrom == -1) {
+ return 0;
+ }
+
+ int bdiff = bto - bfrom;
+ memmove(out, out + bfrom, bdiff);
+ return bdiff;
+}
+
+int
+tf_func_directory (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc < 1 || argc > 2) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ int path_len = len;
+
+ int levels = 1;
+ if (argc == 2) {
+ char temp20;
+ args += arglens0;
+ TF_EVAL_CHECK(len, ctx, args, arglens1, temp, sizeof (temp) - 1, fail_on_undef);
+ levels = atoi (temp);
+ if (levels < 0) {
+ return -1;
+ }
+ }
+
+ char *end = out + path_len - 1;
+ char *start = end;
+
+ while (levels--) {
+ // get to the last delimiter
+ while (end >= out && *end != '/') {
+ end--;
+ }
+
+ if (end < out) {
+ *out = 0;
+ return -1;
+ }
+
+ // skip multiple delimiters
+ while (end >= out && *end == '/') {
+ end--;
+ }
+ end++;
+
+ if (end < out) {
+ *out = 0;
+ return -1;
+ }
+
+ // find another delimiter
+ start = end - 1;
+ while (start > out && *start != '/') {
+ start--;
+ }
+
+ if (*start == '/') {
+ start++;
+ }
+
+ if (levels) {
+ end = start;
+ while (end >= out && *end == '/') {
+ end--;
+ }
+ }
+ }
+
+ memmove (out, start, end-start);
+ return (int)(end-start);
+}
+
+int
+tf_func_directory_path (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc < 1 || argc > 2) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ char *p = out + len - 1;
+
+ while (p >= out && *p != '/') {
+ p--;
+ }
+ while (p >= out && *p == '/') {
+ p--;
+ }
+ if (p < out) {
+ *out = 0;
+ return -1;
+ }
+
+ p++;
+ return (int)(p-out);
+}
+
+int
+tf_func_ext (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc < 1 || argc > 2) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+ 
+ char *e = out + len;
+ char *c = e - 1;
+ char *p = NULL;
+
+ while (c >= out && *c != '/') {
+ if (*c == '.') {
+ p = c+1;
+ break;
+ }
+ c--;
+ }
+
+ if (!p) {
+ *out = 0;
+ return 0;
+ }
+
+ memmove (out, p, e-p+1);
+ return (int)(e-p);
+}
+
+int
+tf_func_filename (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc < 1 || argc > 2) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ char *e = out + len;
+ char *p = e - 1;
+ while (p >= out && *p != '/') {
+ p--;
+ }
+
+ p++;
+
+ memmove (out, p, e-p+1);
+ return (int)(e-p);
+}
+
+int
+tf_func_add (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+
+ int outval = 0;
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ outval += atoi (out);
+ arg += arglensi;
+ }
+ return snprintf_clip (out, outlen, "%d", outval);
+}
+
+int
+tf_func_div (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+
+ if (argc < 2) {
+ return -1;
+ }
+
+ float outval = 0;
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ if (i == 0) {
+ outval = atoi (out);
+ }
+ else {
+ int divider = atoi (out);
+ if (divider == 0) {
+ out0 = 0;
+ return -1;
+ }
+ outval /= divider;
+ }
+ arg += arglensi;
+ }
+ int res = snprintf_clip (out, outlen, "%d", (int)round (outval));
+ return res;
+}
+
+int
+tf_func_max (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+
+ if (argc == 0) {
+ return -1;
+ }
+
+ int nmax = -1;
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ int n = atoi (out);
+ if (n > nmax) {
+ nmax = n;
+ }
+ arg += arglensi;
+ }
+ int res = snprintf_clip (out, outlen, "%d", nmax);
+ return res;
+}
+
+int
+tf_func_min (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+
+ if (argc == 0) {
+ return -1;
+ }
+
+ int nmin = 0x7fffffff;
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ int n = atoi (out);
+ if (n < nmin) {
+ nmin = n;
+ }
+ arg += arglensi;
+ }
+ int res = snprintf_clip (out, outlen, "%d", nmin);
+ return res;
+}
+
+int
+tf_func_mod (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+
+ if (argc < 2) {
+ return -1;
+ }
+
+ int outval = 0;
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ if (i == 0) {
+ outval = atoi (out);
+ }
+ else {
+ int divider = atoi (out);
+ if (divider == 0) {
+ *out = 0;
+ return -1;
+ }
+ outval %= divider;
+ }
+ arg += arglensi;
+ }
+ int res = snprintf_clip (out, outlen, "%d", outval);
+ return res;
+}
+
+int
+tf_func_mul (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+
+ if (argc < 2) {
+ return -1;
+ }
+
+ int outval = 0;
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ if (i == 0) {
+ outval = atoi (out);
+ }
+ else {
+ outval *= atoi (out);
+ }
+ arg += arglensi;
+ }
+ int res = snprintf_clip (out, outlen, "%d", outval);
+ return res;
+}
+
+int
+tf_func_muldiv (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+
+ if (argc != 3) {
+ return -1;
+ }
+
+ int vals3;
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ valsi = atoi (out);
+ arg += arglensi;
+ }
+
+ if (vals2 == 0) {
+ *out = 0;
+ return -1;
+ }
+
+ int outval = (int)round(vals0 * vals1 / (float)vals2);
+
+ int res = snprintf_clip (out, outlen, "%d", outval);
+ return res;
+}
+
+int
+tf_func_rand (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 0) {
+ return -1;
+ }
+
+ int outval = rand ();
+
+ int res = snprintf_clip (out, outlen, "%d", outval);
+ return res;
+}
+
+int
+tf_func_sub (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+
+ if (argc < 2) {
+ return -1;
+ }
+
+ int outval = 0;
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ if (i == 0) {
+ outval = atoi (out);
+ }
+ else {
+ outval -= atoi (out);
+ }
+ arg += arglensi;
+ }
+ int res = snprintf_clip (out, outlen, "%d", outval);
+ return res;
+}
+
+int
+tf_func_if (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc < 2 || argc > 3) {
+ return -1;
+ }
+ int bool_out = 0;
+
+ const char *arg = args;
+ int res;
+ TF_EVAL_CHECK(res, ctx, arg, arglens0, out, outlen, fail_on_undef);
+ arg += arglens0;
+ if (bool_out) {
+ trace ("condition true, eval then block\n");
+ TF_EVAL_CHECK(res, ctx, arg, arglens1, out, outlen, fail_on_undef);
+ }
+ else if (argc == 3) {
+ trace ("condition false, eval else block\n");
+ arg += arglens1;
+ TF_EVAL_CHECK(res, ctx, arg, arglens2, out, outlen, fail_on_undef);
+ }
+
+ return res;
+}
+
+int
+tf_func_if2 (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 2) {
+ return -1;
+ }
+ int bool_out = 0;
+
+ const char *arg = args;
+ int res;
+ TF_EVAL_CHECK(res, ctx, arg, arglens0, out, outlen, fail_on_undef);
+ arg += arglens0;
+ if (bool_out) {
+ return res;
+ }
+ else {
+ TF_EVAL_CHECK(res, ctx, arg, arglens1, out, outlen, fail_on_undef);
+ }
+
+ return res;
+}
+
+int
+tf_func_if3 (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc < 2) {
+ return -1;
+ }
+ int bool_out = 0;
+
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int res;
+ TF_EVAL_CHECK(res, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ arg += arglensi;
+ if (bool_out || i == argc-1) {
+ return res;
+ }
+ }
+ *out = 0;
+ return -1;
+}
+
+int
+tf_func_ifequal (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 4) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ const char *arg = args;
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, out, outlen, fail_on_undef);
+
+ int arg1 = atoi (out);
+
+ arg += arglens0;
+ TF_EVAL_CHECK(len, ctx, arg, arglens1, out, outlen, fail_on_undef);
+
+ int arg2 = atoi (out);
+
+ arg += arglens1;
+
+ int idx = 2;
+ if (arg1 != arg2) {
+ arg += arglens2;
+ idx = 3;
+ }
+
+ TF_EVAL_CHECK(len, ctx, arg, arglensidx, out, outlen, fail_on_undef);
+ return len;
+}
+
+int
+tf_func_ifgreater (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 4) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ const char *arg = args;
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, out, outlen, fail_on_undef);
+
+ int arg1 = atoi (out);
+
+ arg += arglens0;
+ TF_EVAL_CHECK(len, ctx, arg, arglens1, out, outlen, fail_on_undef);
+
+ int arg2 = atoi (out);
+
+ arg += arglens1;
+
+ int idx = 2;
+ if (arg1 <= arg2) {
+ arg += arglens2;
+ idx = 3;
+ }
+
+ TF_EVAL_CHECK(len, ctx, arg, arglensidx, out, outlen, fail_on_undef);
+ return len;
+}
+
+int
+tf_func_iflonger (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 4) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ const char *arg = args;
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, out, outlen, fail_on_undef);
+ int l1 = (int)strlen (out);
+
+ arg += arglens0;
+ TF_EVAL_CHECK(len, ctx, arg, arglens1, out, outlen, fail_on_undef);
+ int l2 = (int)atoi (out);
+
+ arg += arglens1;
+ int idx = 2;
+ if (l1 <= l2) {
+ arg += arglens2;
+ idx = 3;
+ }
+
+ TF_EVAL_CHECK(len, ctx, arg, arglensidx, out, outlen, fail_on_undef);
+ return len;
+}
+
+int
+tf_func_select (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc < 3) {
+ return -1;
+ }
+
+ const char *arg = args;
+
+ int bool_out = 0;
+
+ int res;
+ TF_EVAL_CHECK(res, ctx, arg, arglens0, out, outlen, fail_on_undef);
+
+ int n = atoi (out);
+ if (n < 1 || n >= argc) {
+ return 0;
+ }
+
+ arg += arglens0;
+
+ for (int i = 1; i < n; i++) {
+ arg += arglensi;
+ }
+ TF_EVAL_CHECK(res, ctx, arg, arglensn, out, outlen, fail_on_undef);
+ return res;
+}
+
+static void
+tf_append_out (char **out, int *out_len, const char *in, int in_len) {
+ in_len = min (in_len, *out_len);
+ in_len = u8_strnbcpy (*out, in, in_len);
+ *out_len -= in_len;
+ *out += in_len;
+}
+
+static int
+tf_item_index_for_context(ddb_tf_context_t *_ctx) {
+ ddb_tf_context_int_t *ctx = (ddb_tf_context_int_t *)_ctx;
+ if (ctx->getting_item_at_index) {
+ return ctx->item_at_index;
+ }
+ return -1;
+}
+
+int
+tf_func_meta (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ if (!ctx->it) {
+ return 0;
+ }
+
+ int bool_out = 0;
+
+ const char *arg = args;
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglens0, out, outlen, fail_on_undef);
+
+ int needs_free = 0;
+ const char *meta = _tf_get_combined_value ((playItem_t *)ctx->it, out, &needs_free, tf_item_index_for_context(ctx));
+ if (!meta) {
+ return 0;
+ }
+
+ int res = u8_strnbcpy(out, meta, outlen);
+ if (needs_free) {
+ free ((char *)meta);
+ }
+ return res;
+}
+
+const char *
+tf_get_channels_string_for_track (playItem_t *it) {
+ const char *val = pl_find_meta_raw (it, ":CHANNELS");
+ if (val) {
+ int ch = atoi (val);
+ if (ch == 1) {
+ val = _("mono");
+ }
+ else if (ch == 2) {
+ val = _("stereo");
+ }
+ }
+ else {
+ val = _("stereo");
+ }
+ return val;
+}
+
+int
+tf_func_channels (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 0) {
+ return -1;
+ }
+
+ if (!ctx->it) {
+ return 0;
+ }
+
+ const char *val = tf_get_channels_string_for_track ((playItem_t *)ctx->it);
+ return u8_strnbcpy(out, val, outlen);
+}
+
+// Boolean
+int
+tf_func_and (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ if (!bool_out) {
+ return 0;
+ }
+ arg += arglensi;
+ }
+ *out = 0;
+ return 1;
+}
+
+int
+tf_func_or (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ if (bool_out) {
+ *out = 0;
+ return 1;
+ }
+ arg += arglensi;
+ }
+ *out = 0;
+ return 0;
+}
+
+int
+tf_func_not (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+ int bool_out = 0;
+
+ int len;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+ *out = 0;
+ return !bool_out;
+}
+
+int
+tf_func_xor (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ int bool_out = 0;
+ int result = 0;
+
+ const char *arg = args;
+ for (int i = 0; i < argc; i++) {
+ int len;
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ if (i == 0) {
+ result = bool_out;
+ }
+ else {
+ result ^= bool_out;
+ }
+ arg += arglensi;
+ }
+ *out = 0;
+ return result;
+}
+
+int
+tf_func_fix_eol (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1 && argc != 2) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+
+ char *p = out;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+
+ char indTEMP_BUFFER_SIZE;
+ int indlen = sizeof (ind);
+ if (argc == 2) {
+ TF_EVAL_CHECK(indlen, ctx, args + arglens0, arglens1, ind, indlen - 1, fail_on_undef);
+ }
+ else {
+ strcpy (ind, " (...)");
+ indlen = (int)strlen (ind);
+ }
+
+ for (int n = 0; n < len; n++, p++) {
+ if (*p == '\n') {
+ if (outlen-n < indlen) {
+ *out = 0;
+ return -1;
+ }
+ memcpy (p, ind, indlen);
+ len = n + indlen;
+ break;
+ }
+ }
+
+ return len;
+}
+
+int
+tf_func_hex (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1 && argc != 2) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+
+ TF_EVAL_CHECK(len, ctx, args, arglens0, out, outlen, fail_on_undef);
+ int num = atoi (out);
+ int pad = 0;
+ *out = 0;
+
+ if (argc == 2) {
+ TF_EVAL_CHECK(len, ctx, args + arglens0, arglens1, out, outlen, fail_on_undef);
+ if (!isdigit (*out)) {
+ *out = 0;
+ return -1;
+ }
+ pad = atoi (out);
+ *out = 0;
+ }
+
+ int n = num;
+ int cnt = 0;
+ do {
+ n >>= 4;
+ cnt++;
+ } while (n);
+
+ char *p = out;
+
+ if (pad > outlen || cnt > outlen) {
+ return -1;
+ }
+
+ if (pad > cnt) {
+ for (n = 0; n < pad-cnt; n++, p++) {
+ *p = '0';
+ }
+ }
+ p += cnt;
+ *p-- = 0;
+
+ n = num;
+
+ const char hex = "0123456789abcdef";
+
+ do {
+ *p-- = hexn & 0x0f;
+ n >>= 4;
+ } while (n);
+
+ return (int)strlen (out);
+}
+
+int
+tf_func_rgb (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 0 && argc != 3) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ const char *arg = args;
+ int len;
+
+ int rgb3;
+
+ if (argc == 3) {
+ int i;
+ for (i = 0; i < 3; i++) {
+ TF_EVAL_CHECK(len, ctx, arg, arglensi, out, outlen, fail_on_undef);
+ rgbi = atoi (out);
+ *out = 0;
+
+ arg += arglensi;
+ }
+ } else {
+ // Use -1 as use fg color marker
+ rgb0 = rgb1 = rgb2 = -1;
+ }
+
+ char rgbseq20 = "";
+ int rgbseqlen = 0;
+
+ if (ctx->flags & DDB_TF_CONTEXT_TEXT_DIM) {
+ // rgb color esc sequence
+ // `\e2;R;G;Bm`
+ snprintf (rgbseq, sizeof(rgbseq), "\033%d;%d;%d;%dm", DDB_TF_ESC_RGB, rgb0, rgb1, rgb2);
+ rgbseqlen = (int)strlen (rgbseq);
+
+ if (rgbseqlen > outlen) {
+ return -1;
+ }
+
+ memcpy (out, rgbseq, rgbseqlen);
+ out += rgbseqlen;
+ ctx->dimmed = 1;
+ }
+ *out = 0;
+ return rgbseqlen;
+}
+
+int
+tf_func_year (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ char temp_strTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, temp_str, sizeof (temp_str) - 1, fail_on_undef);
+
+ // Shorter than 4 characters? return nothing
+ if (len < 4) {
+ return 0;
+ }
+
+ // First 4 characters are digits? extract
+ for (int i = 0; i < 4; i++) {
+ if (!isdigit(temp_stri)) {
+ return 0;
+ }
+ }
+
+ memcpy (out, temp_str, 4);
+ return 4;
+}
+
+int
+tf_func_itematindex (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 2) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ char temp_strTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, temp_str, sizeof (temp_str) - 1, fail_on_undef);
+
+ ddb_tf_context_int_t *priv = (ddb_tf_context_int_t *)ctx;
+ priv->getting_item_at_index = 1;
+ priv->item_at_index = atoi(temp_str);
+
+ TF_EVAL_CHECK(len, ctx, args+arglens0, arglens1, out, outlen, fail_on_undef);
+
+ priv->getting_item_at_index = 0;
+
+ return len;
+}
+
+// Variable operations
+
+static void
+_tf_var_init (ddb_tf_var_t *var, const char *key, const char *value){
+ var->key = strdup (key);
+ var->value = strdup (value);
+}
+
+static void
+_tf_var_deinit (ddb_tf_var_t *var) {
+ free (var->key);
+ free (var->value);
+}
+
+static const char *
+_tf_var_get_value_for_key (ddb_tf_context_int_t *ctx, const char *key) {
+ ddb_tf_var_t *var = ctx->vars;
+ while (var != NULL) {
+ if (!u8_strcasecmp (key, var->key)) {
+ return var->value;
+ }
+ var = var->next;
+ }
+ return NULL;
+}
+
+static void
+_tf_vars_set_value_for_key (ddb_tf_context_int_t *ctx, const char *key, const char *value) {
+ // check if key is already defined, if so, overwrite it
+ ddb_tf_var_t *cur = ctx->vars;
+ while (cur != NULL) {
+ if (!u8_strcasecmp (key, cur->key)) {
+ size_t len = strlen (value) + 1;
+ cur->value = realloc (cur->value, len);
+ memcpy(cur->value, value, len);
+ return;
+ }
+ cur = cur->next;
+ }
+
+ ddb_tf_var_t *out = calloc(1, sizeof (ddb_tf_var_t));
+ out->next = ctx->vars;
+ ctx->vars = out;
+ _tf_var_init (out, key, value);
+}
+
+static void
+_tf_vars_free (ddb_tf_context_int_t *ctx) {
+ while (ctx->vars) {
+ ddb_tf_var_t *next = ctx->vars->next;
+ ddb_tf_var_t *var = ctx->vars;
+ _tf_var_deinit (var);
+ free (var);
+ ctx->vars = next;
+ }
+}
+
+static int
+tf_func_get (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ if (argc != 1) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ char temp_keyTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, temp_key, sizeof (temp_key) - 1, fail_on_undef);
+
+ const char *value = _tf_var_get_value_for_key ((ddb_tf_context_int_t *)ctx, temp_key);
+ if (value == NULL) {
+ *out = '\0';
+ return 0;
+ }
+ len = u8_strnbcpy (out, value, outlen);
+
+ return len;
+}
+
+static int
+_tf_func_put (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef, int should_return) {
+ if (argc != 2) {
+ return -1;
+ }
+
+ int bool_out = 0;
+
+ int len;
+ char temp_keyTEMP_BUFFER_SIZE;
+ char temp_valueTEMP_BUFFER_SIZE;
+ TF_EVAL_CHECK(len, ctx, args, arglens0, temp_key, sizeof (temp_key) - 1, fail_on_undef);
+ TF_EVAL_CHECK(len, ctx, args+arglens0, arglens1, temp_value, sizeof (temp_value) - 1, fail_on_undef);
+
+ _tf_vars_set_value_for_key ((ddb_tf_context_int_t *)ctx, temp_key, temp_value);
+ if (should_return) {
+ len = u8_strncpy (out, temp_value, outlen);
+ return len;
+ } else {
+ return 0;
+ }
+}
+
+static int
+tf_func_put (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return _tf_func_put (ctx, argc, arglens, args, out, outlen, fail_on_undef, 1);
+}
+
+static int
+tf_func_puts (ddb_tf_context_t *ctx, int argc, const uint16_t *arglens, const char *args, char *out, int outlen, int fail_on_undef) {
+ return _tf_func_put (ctx, argc, arglens, args, out, outlen, fail_on_undef, 0);
+}
+
+tf_func_def tf_funcsTF_MAX_FUNCS = {
+ // Control flow
+ { "if", tf_func_if },
+ { "if2", tf_func_if2 },
+ { "if3", tf_func_if3 },
+ { "ifequal", tf_func_ifequal },
+ { "ifgreater", tf_func_ifgreater },
+ { "iflonger", tf_func_iflonger },
+ { "select", tf_func_select },
+ // Arithmetic
+ { "add", tf_func_add },
+ { "div", tf_func_div },
+ { "greater", tf_func_greater },
+ { "max", tf_func_max },
+ { "min", tf_func_min },
+ { "mod", tf_func_mod },
+ { "mul", tf_func_mul },
+ { "muldiv", tf_func_muldiv },
+ { "rand", tf_func_rand },
+ { "sub", tf_func_sub },
+ // Boolean
+ { "and", tf_func_and },
+ { "or", tf_func_or },
+ { "not", tf_func_not },
+ { "xor", tf_func_xor },
+ // String
+ { "abbr", tf_func_abbr },
+ { "ansi", tf_func_ansi },
+ { "ascii", tf_func_ascii },
+ { "caps", tf_func_caps },
+ { "caps2", tf_func_caps2 },
+ { "char", tf_func_char },
+ { "crc32", tf_func_crc32 },
+ { "crlf", tf_func_crlf },
+ { "cut", tf_func_left },
+ { "directory", tf_func_directory },
+ { "directory_path", tf_func_directory_path },
+ { "ext", tf_func_ext },
+ { "filename", tf_func_filename },
+ { "fix_eol", tf_func_fix_eol },
+ { "hex", tf_func_hex },
+ { "insert", tf_func_insert },
+ { "left", tf_func_left }, // alias of 'cut'
+ { "len", tf_func_len },
+ { "len2", tf_func_len2 },
+ { "longer", tf_func_longer },
+ { "longest", tf_func_longest },
+ { "lower", tf_func_lower },
+ { "num", tf_func_num },
+ { "pad", tf_func_pad },
+ { "pad_right", tf_func_pad_right },
+ { "padcut", tf_func_padcut },
+ { "padcut_right", tf_func_padcut_right },
+ { "progress", tf_func_progress },
+ { "progress2", tf_func_progress2 },
+ { "repeat", tf_func_repeat },
+ { "replace", tf_func_replace },
+ { "right", tf_func_right },
+ { "roman", tf_func_roman },
+ { "rot13", tf_func_rot13 },
+ { "shortest", tf_func_shortest },
+ { "strchr", tf_func_strchr },
+ { "strcmp", tf_func_strcmp },
+ { "stricmp", tf_func_stricmp },
+ { "stripprefix", tf_func_stripprefix },
+ { "strrchr", tf_func_strrchr },
+ { "strstr", tf_func_strstr },
+ { "substr", tf_func_substr },
+ { "swapprefix", tf_func_swapprefix },
+ { "tab", tf_func_tab },
+ { "trim", tf_func_trim },
+ { "upper", tf_func_upper },
+ // Track info
+ { "meta", tf_func_meta },
+ { "channels", tf_func_channels },
+ { "rgb", tf_func_rgb },
+ { "year", tf_func_year },
+ { "itematindex", tf_func_itematindex },
+ // Variable operations
+ { "get", tf_func_get },
+ { "put", tf_func_put },
+ { "puts", tf_func_puts },
+ { NULL, NULL }
+};
+
+static const char *
+_tf_get_combined_value (playItem_t *it, const char *key, int *needs_free, int item_index) {
+ DB_metaInfo_t *meta = pl_meta_for_key_with_override (it, key);
+
+ if (!meta) {
+ *needs_free = 0;
+ return NULL;
+ }
+
+ size_t len = 0;
+
+ const char *value = meta->value;
+ const char *end = meta->value +meta->valuesize;
+
+ // calculate size or return single value
+ while (value < end) {
+ size_t l = strlen (value);
+
+ if (l+1 == meta->valuesize) {
+ *needs_free = 0;
+ return meta->value;
+ }
+
+ len += l;
+ len += 2; // ", "
+ value += l + 1;
+ }
+
+ char *out = malloc (len + 1);
+
+ char *p = out;
+
+ value = meta->value;
+ end = meta->value +meta->valuesize;
+
+ int index = 0;
+
+ while (value < end) {
+ len = strlen (value);
+ if (item_index == -1 || index == item_index) {
+ memcpy (p, value, value + len + 1 != end ? len : len + 1);
+ p += len;
+ if (item_index != -1) {
+ break;
+ }
+ }
+ if (item_index == -1 && value + len + 1 != end) {
+ memcpy (p, ", ", 2);
+ p += 2;
+ }
+ value += len + 1;
+ index += 1;
+ }
+ *p = 0;
+ *needs_free = 1;
+ return out;
+}
+
+static int
+format_playback_time (char *out, int outlen, float t) {
+ int daystotal = (int)t / (3600*24);
+ int hourtotal = ((int)t / 3600) % 24;
+ int mintotal = ((int)t / 60) % 60;
+ int sectotal = ((int)t) % 60;
+
+ int len = 0;
+ if (daystotal == 0) {
+ len = snprintf_clip (out, outlen, "%d:%02d:%02d", hourtotal, mintotal, sectotal);
+ }
+ else if (daystotal == 1) {
+ len = snprintf_clip (out, outlen, _("1 day %d:%02d:%02d"), hourtotal, mintotal, sectotal);
+ }
+ else {
+ len = snprintf_clip (out, outlen, _("%d days %d:%02d:%02d"), daystotal, hourtotal, mintotal, sectotal);
+ }
+
+ return len;
+}
+
+/*
+ * @param outlen bytes available in the buffer `out`, not including the terminating null byte
+ * @returns bytes written to `out`, not including the terminating null byte,
+ * which is always written on nonnegative return
+ */
+static int
+tf_eval_int (ddb_tf_context_t *ctx, const char *code, int size, char *out, int outlen, int *bool_out, int fail_on_undef) {
+ playItem_t *it = (playItem_t *)ctx->it;
+ char *init_out = out;
+ *bool_out = 0;
+
+ int count_true_conditionals = 0;
+ int count_false_conditionals = 0;
+
+ while (size) {
+ if (*code) {
+ // Plain text
+ int len = u8_charcpy (out, code, outlen);
+ if (len == 0) {
+ break;
+ }
+ code += len;
+ size -= len;
+ out += len;
+ outlen -= len;
+ }
+ else {
+ // Start of special block
+ code++;
+ size--;
+ if (*code == 1) {
+ // Function call
+ code++;
+ size--;
+ tf_func_ptr_t func = tf_funcs*code.func;
+ code++;
+ size--;
+ uint16_t *arglens = NULL;
+ char numargs = *code;
+ if (numargs) {
+ // copy arg lengths, to make sure they're aligned
+ arglens = alloca (numargs * sizeof (uint16_t));
+ memcpy (arglens, code+1, numargs * sizeof (uint16_t));
+ };
+ int res = func (ctx, numargs, arglens, code+1+numargs*sizeof (uint16_t), out, outlen, fail_on_undef);
+ if (res == -1) {
+ return -1;
+ }
+ if (res > 0) {
+ *bool_out = 1;
+ // hack for returning true + empty string result (e.g. tf_func_and)
+ if (*out == 0) {
+ res = 0;
+ }
+ }
+
+ out += res;
+ outlen -= res;
+
+ int blocksize = 1 + numargs*2;
+ for (int i = 0; i < numargs; i++) {
+ blocksize += arglensi;
+ }
+ code += blocksize;
+ size -= blocksize;
+ }
+ else if (*code == 2) {
+ // Meta field
+ code++;
+ size--;
+ uint8_t len = *code;
+ code++;
+ size--;
+
+ char namelen+1;
+ memcpy (name, code, len);
+ namelen = 0;
+
+ // special cases
+ // most if not all of this stuff is to make tf scripts
+ // compatible with fb2k syntax
+
+ // locking: necessary because we use fast non-thread-safe APIs to access track metadata
+ // warning: calling streamer requires unlocking.
+
+ int pl_locked = 0;
+
+ if (!(ctx->flags&DDB_TF_CONTEXT_NO_MUTEX_LOCK)
+ && !(ctx->flags&TF_INTERNAL_FLAG_LOCKED)) {
+ pl_lock ();
+ ctx->flags |= TF_INTERNAL_FLAG_LOCKED;
+ pl_locked = 1;
+ }
+ const char *val = NULL;
+ int needs_free = 0;
+ const char *aa_fields = { "album artist", "albumartist", "band", "artist", "composer", "performer", NULL };
+ const char *a_fields = { "artist", "album artist", "albumartist", "band", "composer", "performer", NULL };
+ const char *alb_fields = { "album", "venue", NULL };
+
+ // set to 1 if special case handler successfully wrote the output
+ int skip_out = 0;
+
+ // temp vars used for strcmp optimizations
+ int tmp_a = 0, tmp_b = 0, tmp_c = 0, tmp_d = 0, tmp_e = 0;
+ int item_index = tf_item_index_for_context(ctx);
+ if (!strcmp (name, aa_fields0)) {
+ for (int i = 0; !val && aa_fieldsi; i++) {
+ val = _tf_get_combined_value(it, aa_fieldsi, &needs_free, item_index);
+ }
+ }
+ else if (!strcmp (name, a_fields0)) {
+ for (int i = 0; !val && a_fieldsi; i++) {
+ val = _tf_get_combined_value(it, a_fieldsi, &needs_free, item_index);
+ }
+ }
+ else if (!strcmp (name, "album")) {
+ for (int i = 0; !val && alb_fieldsi; i++) {
+ val = _tf_get_combined_value (it, alb_fieldsi, &needs_free, item_index);
+ }
+ }
+ else if (!strcmp (name, "track artist")) {
+ const char *aa = NULL;
+ for (int i = 0; !val && aa_fieldsi; i++) {
+ val = _tf_get_combined_value (it, aa_fieldsi, &needs_free, item_index);
+ }
+ aa = val;
+ val = NULL;
+ for (int i = 0; !val && a_fieldsi; i++) {
+ val = _tf_get_combined_value (it, a_fieldsi, &needs_free, item_index);
+ }
+ if (val && aa && !strcmp (val, aa)) {
+ val = NULL;
+ }
+ }
+ else if (!strcmp (name, "tracknumber")) {
+ const char *v = pl_find_meta_raw (it, "track");
+ if (v) {
+ const char *p = v;
+ while (*p) {
+ if (!isdigit (*p)) {
+ break;
+ }
+ p++;
+ }
+ if (p > v && *p == 0 && p-v == 1) {
+ int l = snprintf_clip (out, outlen, "%02d", atoi(v));
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ else {
+ val = v;
+ }
+ }
+ }
+ else if (!strcmp (name, "title")) {
+ val = _tf_get_combined_value (it, "title", &needs_free, item_index);
+ if (!val) {
+ const char *v = pl_find_meta_raw (it, ":URI");
+ if (v) {
+ const char *start = strrchr (v, '/');
+ if (start) {
+ start++;
+ }
+ else {
+ start = v;
+ }
+ const char *startcol = strrchr (v, ':');
+ if (startcol > start) {
+ start = startcol+1;
+ }
+ const char *end = strrchr (start, '.');
+ if (end) {
+ int n = (int)(end-start);
+ n = min (n, outlen);
+ n = u8_strnbcpy (out, start, n);
+ outlen -= n;
+ out += n;
+ }
+ }
+ }
+ }
+ else if (!strcmp (name, "discnumber")) {
+ val = pl_find_meta_raw (it, "disc");
+ }
+ else if (!strcmp (name, "totaldiscs")) {
+ val = pl_find_meta_raw (it, "numdiscs");
+ }
+ else if (!strcmp (name, "track number")) {
+ const char *v = pl_find_meta_raw (it, "track");
+ if (v) {
+ val = v;
+ }
+ }
+ else if (!strcmp (name, "date")) {
+ // NOTE: foobar2000 uses "date" instead of "year"
+ // so for %date% we simply return the content of "year"
+ val = pl_find_meta_raw (it, "year");
+ }
+ else if (!strcmp (name, "samplerate")) {
+ val = pl_find_meta_raw (it, ":SAMPLERATE");
+ }
+ else if (!strcmp (name, "playback_bitrate")) {
+ if (ctx->flags & TF_INTERNAL_FLAG_LOCKED) {
+ pl_unlock();
+ }
+
+ playItem_t *playing_track = streamer_get_playing_track();
+
+ if (playing_track) {
+ int br = streamer_get_apx_bitrate();
+ if (br >= 0) {
+ int l = snprintf_clip (out, outlen, "%d", br);
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ pl_item_unref (playing_track);
+ }
+ if (ctx->flags & TF_INTERNAL_FLAG_LOCKED) {
+ pl_lock ();
+ }
+ }
+ else if (!strcmp (name, "bitrate")) {
+ val = pl_find_meta_raw (it, ":BITRATE");
+ }
+ else if (!strcmp (name, "filesize")) {
+ val = pl_find_meta_raw (it, ":FILE_SIZE");
+ }
+ else if (!strcmp (name, "filesize_natural")) {
+ const char *v = pl_find_meta_raw (it, ":FILE_SIZE");
+ if (v) {
+ int64_t bs = atoll (v);
+ int l;
+ if (bs >= 1024*1024*1024) {
+ double gb = (double)bs / (double)(1024*1024*1024);
+ l = snprintf_clip (out, outlen, "%.3lf GB", gb);
+ }
+ else if (bs >= 1024*1024) {
+ double mb = (double)bs / (double)(1024*1024);
+ l = snprintf_clip (out, outlen, "%.3lf MB", mb);
+ }
+ else if (bs >= 1024) {
+ double kb = (double)bs / (double)(1024);
+ l = snprintf_clip (out, outlen, "%.3lf KB", kb);
+ }
+ else {
+ l = snprintf_clip (out, outlen, "%lld B", bs);
+ }
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ }
+ else if (!strcmp (name, "channels")) {
+ val = tf_get_channels_string_for_track (it);
+ }
+ else if (!strcmp (name, "codec")) {
+ val = pl_find_meta (it, ":FILETYPE");
+ }
+ else if (!strcmp (name, "replaygain_album_gain")) {
+ val = pl_find_meta_raw (it, ":REPLAYGAIN_ALBUMGAIN");
+ }
+ else if (!strcmp (name, "replaygain_album_peak")) {
+ val = pl_find_meta_raw (it, ":REPLAYGAIN_ALBUMPEAK");
+ }
+ else if (!strcmp (name, "replaygain_track_gain")) {
+ val = pl_find_meta_raw (it, ":REPLAYGAIN_TRACKGAIN");
+ }
+ else if (!strcmp (name, "replaygain_track_peak")) {
+ val = pl_find_meta_raw (it, ":REPLAYGAIN_TRACKPEAK");
+ }
+ else if ((tmp_a = !strcmp (name, "playback_time")) || (tmp_b = !strcmp (name, "playback_time_seconds")) || (tmp_c = !strcmp (name, "playback_time_remaining")) || (tmp_d = !strcmp (name, "playback_time_remaining_seconds")) || (tmp_e = !strcmp (name, "playback_time_ms"))) {
+ if (ctx->flags & TF_INTERNAL_FLAG_LOCKED) {
+ pl_unlock();
+ }
+ playItem_t *playing = streamer_get_playing_track ();
+ if (it && playing == it && !(ctx->flags & DDB_TF_CONTEXT_NO_DYNAMIC)) {
+ float t = streamer_get_playpos ();
+ if (tmp_c || tmp_d) {
+ float dur = pl_get_item_duration (it);
+ t = dur - t;
+ }
+ if (t >= 0) {
+ int l = 0;
+ if (tmp_a || tmp_c || tmp_e) {
+ int hr = (int)(t/3600);
+ int mn = (int)((t-hr*3600)/60);
+ int sc = (int)(t-hr*3600-mn*60);
+ if (tmp_e) {
+ int ms = (int)((t-hr*3600-mn*60-sc)*1000);
+ if (hr) {
+ l = snprintf_clip (out, outlen, "%d:%02d:%02d.%03d", hr, mn, sc, ms);
+ }
+ else {
+ l = snprintf_clip (out, outlen, "%d:%02d.%03d", mn, sc, ms);
+ }
+ } else {
+ if (hr) {
+ l = snprintf_clip (out, outlen, "%d:%02d:%02d", hr, mn, sc);
+ }
+ else {
+ l = snprintf_clip (out, outlen, "%d:%02d", mn, sc);
+ }
+ }
+ }
+ else if (tmp_b || tmp_d) {
+ l = snprintf_clip (out, outlen, "%0.2f", t);
+ }
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ // notify the caller about update interval
+ if (!ctx->update || (ctx->update > 1000)) {
+ ctx->update = tmp_e ? 100 : 1000;
+ }
+ }
+ }
+ if (playing) {
+ pl_item_unref (playing);
+ }
+ if (ctx->flags & TF_INTERNAL_FLAG_LOCKED) {
+ pl_lock();
+ }
+
+ }
+ else if ((tmp_a = !strcmp (name, "length")) || (tmp_b = !strcmp (name, "length_ex"))) {
+ float t = pl_get_item_duration (it);
+ if (tmp_a) {
+ t = roundf (t);
+ }
+ else if (tmp_b) {
+ t = roundf(t * 1000) / 1000.f;
+ }
+ if (t >= 0) {
+ int hr = (int)(t/3600);
+ int mn = (int)((t-hr*3600)/60);
+ int sc = (int)(tmp_a ? t-hr*3600-mn*60 : t-hr*3600-mn*60);
+ int ms = (int)(tmp_b ? (t-hr*3600-mn*60-sc) * 1000.f : 0);
+ int l = 0;
+ if (tmp_a) {
+ if (hr) {
+ l = snprintf_clip (out, outlen, "%d:%02d:%02d", hr, mn, sc);
+ }
+ else {
+ l = snprintf_clip (out, outlen, "%d:%02d", mn, sc);
+ }
+ }
+ else if (tmp_b) {
+ if (hr) {
+ l = snprintf_clip (out, outlen, "%d:%02d:%02d.%03d", hr, mn, sc, ms);
+ }
+ else {
+ l = snprintf_clip (out, outlen, "%d:%02d.%03d", mn, sc, ms);
+ }
+ }
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ }
+ else if ((tmp_a = !strcmp (name, "length_seconds") || (tmp_b = !strcmp (name, "length_seconds_fp")))) {
+ float t = pl_get_item_duration (it);
+ if (t >= 0) {
+ int l;
+ if (tmp_a) {
+ l = snprintf_clip (out, outlen, "%d", (int)roundf(t));
+ }
+ else {
+ l = snprintf_clip (out, outlen, "%0.3f", t);
+ }
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ }
+ else if (!strcmp (name, "length_samples")) {
+ int l = snprintf_clip (out, outlen, "%lld", pl_item_get_endsample ((playItem_t *)ctx->it) - pl_item_get_startsample ((playItem_t *)ctx->it));
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ else if (!strcmp (name, "isplaying")) {
+ if (ctx->flags & TF_INTERNAL_FLAG_LOCKED) {
+ pl_unlock();
+ }
+
+ playItem_t *playing = streamer_get_playing_track ();
+ if (ctx->flags & TF_INTERNAL_FLAG_LOCKED) {
+ pl_lock();
+ }
+
+ if (playing != NULL && ctx->it == (ddb_playItem_t *)playing) {
+ *out++ = '1';
+ outlen--;
+ skip_out = 1;
+ }
+ if (playing != NULL) {
+ pl_item_unref (playing);
+ }
+ }
+ else if (!strcmp (name, "ispaused")) {
+ if (ctx->flags & TF_INTERNAL_FLAG_LOCKED) {
+ pl_unlock();
+ }
+ playItem_t *playing = streamer_get_playing_track ();
+ if (ctx->flags & TF_INTERNAL_FLAG_LOCKED) {
+ pl_lock();
+ }
+
+ if (playing != NULL && ctx->it == (ddb_playItem_t *)playing && plug_get_output ()->state () == DDB_PLAYBACK_STATE_PAUSED) {
+ *out++ = '1';
+ outlen--;
+ skip_out = 1;
+ }
+ if (playing != NULL) {
+ pl_item_unref (playing);
+ }
+ }
+ else if (!strcmp (name, "filename")) {
+ const char *v = pl_find_meta_raw (it, ":URI");
+ if (v) {
+ const char *start = strrchr (v, '/');
+ if (start) {
+ start++;
+ }
+ else {
+ start = v;
+ }
+ const char *end = strrchr (start, '.');
+ if (end) {
+ tf_append_out(&out, &outlen, start, (int)(end-start));
+ skip_out = 1;
+ }
+ }
+ }
+ else if (!strcmp (name, "filename_ext")) {
+ const char *v = pl_find_meta_raw (it, ":URI");
+ if (v) {
+ const char *start = strrchr (v, '/');
+ if (start) {
+ start++;
+ }
+ else {
+ start = v;
+ }
+ tf_append_out (&out, &outlen, start, (int)strlen (start));
+ skip_out = 1;
+ }
+ }
+ else if (!strcmp (name, "directoryname")) {
+ const char *v = pl_find_meta_raw (it, ":URI");
+ if (v) {
+ const char *end = strrchr (v, '/');
+ if (end) {
+ const char *start = end - 1;
+ while (start >= v && *start != '/') {
+ start--;
+ }
+ if (start && start != end) {
+ start++;
+ tf_append_out(&out, &outlen, start, (int)(end-start));
+ skip_out = 1;
+ }
+ }
+ }
+ }
+ else if (!strcmp (name, "last_modified")) {
+ const char *v = pl_find_meta_raw (it, ":URI");
+ if (v) {
+ if (!strncmp (v, "file://", 7)) {
+ v += 7;
+ }
+ struct stat sb;
+ struct tm localtm;
+ char mtime20;
+ if (!stat (v, &sb) && localtime_r (&sb.st_mtime, &localtm) != NULL
+ && strftime (mtime, sizeof(mtime), "%F %T", &localtm)) {
+ tf_append_out (&out, &outlen, mtime, (int)strlen (mtime));
+ skip_out = 1;
+ }
+ }
+ }
+ else if (!strcmp (name, "_path_raw")) {
+ const char *v = pl_find_meta_raw (it, ":URI");
+
+ if (v) {
+ #ifdef _WIN32
+ int is_absolute = (isalpha (v0) && v1 == ':' && v2 == '/');
+ #else
+ int is_absolute = (v0 == '/');
+ #endif
+
+ if (is_absolute) {
+ // This is an absolute path, just prepend proper prefix
+ #ifdef _WIN32
+ const char prefix = "file:///";
+ #else
+ const char prefix = "file://";
+ #endif
+ tf_append_out (&out, &outlen, prefix, sizeof (prefix) - 1);
+ tf_append_out (&out, &outlen, v, (int)strlen (v));
+ }
+ else {
+ int is_uri = 1;
+
+ for (const char *p = v; p; p++) {
+ if (!strncmp (p, "://", 3)) {
+ break;
+ }
+
+ if (!isalpha (*p)) {
+ is_uri = 0;
+ break;
+ }
+ }
+
+ if (is_uri) {
+ // This is already a URI, just copy as is
+ tf_append_out (&out, &outlen, v, (int)strlen (v));
+ }
+ else {
+ // Relative paths are considered invalid
+ }
+ }
+
+ skip_out = 1;
+ }
+ }
+ else if (!strcmp (name, "path")) {
+ val = pl_find_meta_raw (it, ":URI");
+
+ // strip file://
+ if (val && !strncmp (val, "file://", 7)) {
+ val += 7;
+ }
+#if 0
+ // strip any URI scheme
+ if (isalpha (*val)) {
+ const char *slash = strchr (val, ':');
+ if (slash && strlen (slash) > 3 && slash1 == '/' && slash2 == '/') {
+ const char *p = val;
+ while (p < slash) {
+ if (!isalpha (*p) && !isdigit (*p) && !strchr ("+.-", *p)) {
+ p = NULL;
+ break;
+ }
+ p++;
+ }
+ if (p) {
+ val = slash + 3;
+ }
+ }
+ }
+#endif
+ }
+ // index of track in playlist (zero-padded)
+ else if (!strcmp (name, "list_index")) {
+ if (it) {
+ int total_tracks = plt_get_item_count ((playlist_t *)ctx->plt, ctx->iter);
+ int digits = 0;
+ do {
+ total_tracks /= 10;
+ digits++;
+ } while (total_tracks);
+
+ int idx = 0;
+ if (ctx->flags & DDB_TF_CONTEXT_HAS_INDEX) {
+ idx = ctx->idx + 1;
+ }
+ else {
+ idx = pl_get_idx_of_iter (it, ctx->iter) + 1;
+ }
+ int l = snprintf_clip (out, outlen, "%0*d", digits, idx);
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ }
+ // total number of tracks in playlist
+ else if (!strcmp (name, "list_total")) {
+ int total_tracks = -1;
+ if (ctx->plt) {
+ total_tracks = plt_get_item_count ((playlist_t *)ctx->plt, ctx->iter);
+ }
+ else {
+ playlist_t *plt = plt_get_curr ();
+ if (plt) {
+ total_tracks = plt_get_item_count (plt, ctx->iter);
+ plt_unref (plt);
+ }
+ }
+ if (total_tracks >= 0) {
+ int l = snprintf_clip (out, outlen, "%d", total_tracks);
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ }
+ // index of track in queue
+ else if (!strcmp (name, "queue_index")) {
+ if (it) {
+ int idx = playqueue_test (it) + 1;
+ if (idx >= 1) {
+ int l = snprintf_clip (out, outlen, "%d", idx);
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ }
+ }
+ // indexes of track in queue
+ else if (!strcmp (name, "queue_indexes")) {
+ if (it) {
+ int idx = playqueue_test (it) + 1;
+ if (idx >= 1) {
+ int l = snprintf_clip (out, outlen, "%d", idx);
+ out += l;
+ outlen -= l;
+ int count = playqueue_getcount ();
+ for (int i = idx; i < count; i++) {
+ playItem_t *trk = playqueue_get_item (i);
+ if (trk) {
+ if (it == trk) {
+ l = snprintf_clip (out, outlen, ",%d", i + 1);
+ out += l;
+ outlen -= l;
+ }
+ pl_item_unref (trk);
+ }
+ }
+ skip_out = 1;
+ }
+ }
+ }
+ // total amount of tracks in queue
+ else if (!strcmp (name, "queue_total")) {
+ int count = playqueue_getcount ();
+ if (count >= 0) {
+ int l = snprintf_clip (out, outlen, "%d", count);
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ }
+ else if (!strcmp (name, "_deadbeef_version")) {
+ val = VERSION;
+ }
+ else if (!strcmp (name, "_playlist_name")) {
+ val = ((playlist_t *)ctx->plt)->title;
+ }
+ else if (!strcmp (name, "selection_playback_time")) {
+ float seltime = plt_get_selection_playback_time((playlist_t *)ctx->plt);
+
+ int l = format_playback_time (out, outlen, seltime);
+
+ out += l;
+ outlen -= l;
+ skip_out = 1;
+ }
+ else {
+ val = _tf_get_combined_value (it, name, &needs_free, item_index);
+ }
+
+ if (val || (!val && out > init_out)) {
+ *bool_out = 1;
+ }
+
+ // default case
+ if (!skip_out && val) {
+ int32_t l = u8_strnbcpy (out, val, outlen);
+
+ if (ctx->metadata_transformer != NULL && outlen > 0) {
+ ctx->metadata_transformer(ctx, out, l);
+ }
+
+ out += l;
+ outlen -= l;
+ }
+ if (pl_locked) {
+ pl_unlock ();
+ ctx->flags &= ~TF_INTERNAL_FLAG_LOCKED;
+ }
+ if (!skip_out && !val && fail_on_undef) {
+ return -1;
+ }
+
+ if (val && needs_free) {
+ free ((char *)val);
+ }
+
+ code += len;
+ size -= len;
+ }
+ else if (*code == 3) { // conditional expression
+ code++;
+ size--;
+ int32_t len;
+ memcpy (&len, code, 4);
+ code += 4;
+ size -= 4;
+
+ int ignored_bool_out = 0;
+ int res = tf_eval_int (ctx, code, len, out, outlen, &ignored_bool_out, 1);
+ if (res >= 0) {
+ out += res;
+ outlen -= res;
+ count_true_conditionals++;
+ }
+ else if (res < 0) {
+ count_false_conditionals++;
+ }
+
+ code += len;
+ size -= len;
+ }
+ else if (*code == 4) { // preformatted text
+ code++;
+ size--;
+ int32_t len;
+ memcpy (&len, code, 4);
+ code += 4;
+ size -= 4;
+ int32_t l = u8_strnbcpy(out, code, len);
+ out += l;
+ outlen -= l;
+ code += len;
+ size -= len;
+ }
+ else if (*code == 5) { // dimming of text
+ code++;
+ size--;
+
+ int8_t amount = *code;
+
+ code++;
+ size--;
+
+ char dim10 = "";
+ char undim10 = "";
+ int dimlen = 0;
+ int undimlen = 0;
+
+ if (ctx->flags & DDB_TF_CONTEXT_TEXT_DIM) {
+ // text dimming esc sequence
+ // `\eX,Ym` where X and Y are numbers, which can be negative
+ snprintf (dim, sizeof(dim), "\033%d;%dm", DDB_TF_ESC_DIM, (int)amount);
+ snprintf (undim, sizeof(undim), "\033%d;%dm", DDB_TF_ESC_DIM, -(int)amount);
+ dimlen = (int)strlen (dim);
+ undimlen = (int)strlen (undim);
+
+ if (dimlen + undimlen > outlen) {
+ return -1;
+ }
+
+ memcpy (out, dim, dimlen);
+ out += dimlen;
+ outlen -= dimlen;
+ ctx->dimmed = 1;
+ }
+
+ int32_t len;
+ memcpy (&len, code, 4);
+ code += 4;
+ size -= 4;
+
+ int ignored_bool_out = 0;
+ int res = tf_eval_int (ctx, code, len, out, outlen - dimlen, &ignored_bool_out, fail_on_undef);
+ if (res >= 0) {
+ out += res;
+ outlen -= res;
+ count_true_conditionals++;
+ }
+ else if (res < 0) {
+ count_false_conditionals++;
+ }
+ code += len;
+ size -= len;
+
+ if ((ctx->flags & DDB_TF_CONTEXT_TEXT_DIM) && outlen >= undimlen) {
+ memcpy (out, undim, undimlen);
+ out += undimlen;
+ outlen -= undimlen;
+ }
+ }
+ else {
+ return -1;
+ }
+ }
+ }
+ // Always null terminate when there's no error
+ *out = 0;
+
+ if (fail_on_undef && count_false_conditionals > 0 && count_true_conditionals == 0) {
+ return -1;
+ }
+
+ return (int)(out-init_out);
+}
+
+int
+tf_compile_plain (tf_compiler_t *c);
+
+int
+tf_compile_func (tf_compiler_t *c) {
+ c->i++;
+
+ // function marker
+ *(c->o++) = 0;
+ *(c->o++) = 1;
+
+ const char *name_start = c->i;
+
+ // find opening (
+ while (*(c->i) && *(c->i) != '(') {
+ c->i++;
+ }
+
+ if (!*(c->i)) {
+ return -1;
+ }
+
+ int i;
+ for (i = 0; tf_funcsi.name; i++) {
+ int l = (int)strlen (tf_funcsi.name);
+ if (c->i - name_start == l && !memcmp (tf_funcsi.name, name_start, l)) {
+ *(c->o++) = (char)i;
+ break;
+ }
+ }
+ if (!tf_funcsi.name) {
+ return -1;
+ }
+
+ char func_namec->i - name_start + 1;
+ memcpy (func_name, name_start, c->i-name_start);
+ func_namec->i-name_start = 0;
+
+ c->i++;
+
+ // remember ptr and start reading args
+ uint8_t *start = c->o;
+ *(c->o++) = 0; // num args
+ uint8_t *argstart = c->o;
+
+ uint16_t *arglens = (uint16_t *)c->o;
+
+ //parse comma separated args until )
+ while (*(c->i)) {
+ if (*(c->i) == ',' || *(c->i) == ')') {
+ // next arg
+ int len = (int)(c->o - argstart);
+
+ // special case for empty argument list
+ if (len == 0 && *(c->i) == ')' && (*start) == 0) {
+ break;
+ }
+ assert(len<=0xffff);
+
+ // expand arg lengths buffer by 1
+ int num_args = *start;
+
+ memmove (arglens+num_args+1, arglens+num_args, c->o - start - num_args*sizeof(uint16_t));
+ c->o += 2;
+ // store arg length
+ // FIXME: `arglens` comes in a byte stream without 16 bit alignment, this may cause unaligned access and crash.
+ uint16_t len16 = (uint16_t)len;
+ memcpy(&arglens*start, &len16, sizeof (uint16_t));
+ (*start)++; // num args++
+ argstart = c->o;
+
+ if (*(c->i) == ')') {
+ break;
+ }
+ c->i++;
+ }
+ else if (tf_compile_plain (c)) {
+ return -1;
+ }
+ }
+ if (*(c->i) != ')') {
+ return -1;
+ }
+ c->i++;
+
+ return 0;
+}
+
+int
+tf_compile_field (tf_compiler_t *c) {
+ c->i++;
+ *(c->o++) = 0;
+ *(c->o++) = 2;
+
+ const char *fstart = c->i;
+ uint8_t *plen = c->o;
+ c->o += 1;
+ while (*(c->i)) {
+ if (*(c->i) == '%') {
+ break;
+ }
+ else {
+ *(c->o++) = *(c->i++);
+ }
+ }
+ if (*(c->i) != '%') {
+ return -1;
+ }
+ c->i++;
+
+ int32_t len = (int32_t)(c->o - plen - 1);
+ if (len > 0xff) {
+ return -1;
+ }
+ *plen = (char)len;
+
+ char fieldlen+1;
+ memcpy (field, fstart, len);
+ fieldlen = 0;
+ return 0;
+}
+
+int
+tf_compile_ifdef (tf_compiler_t *c) {
+ c->i++;
+ *(c->o++) = 0;
+ *(c->o++) = 3;
+
+ uint8_t *plen = c->o;
+ c->o += 4;
+
+ char *start = c->o;
+
+ while (*(c->i)) {
+ if (*(c->i) == '\\') {
+ c->i++;
+ if (*(c->i) != 0) {
+ *(c->o++) = *(c->i++);
+ }
+ }
+ else if (*(c->i) == '') {
+ break;
+ }
+ else if (tf_compile_plain (c)) {
+ return -1;
+ }
+ }
+
+ if (*(c->i) != '') {
+ return -1;
+ }
+ c->i++;
+
+ int32_t len = (int32_t)(c->o - plen - 4);
+ memcpy (plen, &len, 4);
+
+ char valuelen+1;
+ memcpy (value, start, len);
+ valuelen = 0;
+ return 0;
+}
+
+int
+tf_compile_text_dim (tf_compiler_t *c) {
+ *(c->o++) = 0;
+ *(c->o++) = 5;
+
+ uint8_t *pamount = c->o;
+ c->o++;
+
+ uint8_t *plen = c->o;
+ c->o += 4;
+
+ char *start = c->o;
+
+ char marker = *(c->i);
+ // count number of leading '<'
+ int count = 0;
+ while (*(c->i) && *(c->i) == marker) {
+ c->i++;
+ count++;
+ }
+
+ marker = marker == '<' ? '>' : '<';
+
+ while (*(c->i)) {
+ if (*(c->i) == '\\') {
+ c->i++;
+ if (*(c->i) != 0) {
+ *(c->o++) = *(c->i++);
+ }
+ }
+ else if (*(c->i) == marker) {
+ int cnt = 0;
+ while (*(c->i) && *(c->i) == marker && cnt < count) {
+ cnt ++;
+ c->i++;
+ }
+ if (cnt != count) {
+ return -1;
+ }
+ break;
+ }
+ else if (tf_compile_plain (c)) {
+ return -1;
+ }
+ }
+
+ if (marker == '>') {
+ count = -count;
+ }
+
+ *pamount = (int8_t)count;
+
+ int32_t len = (int32_t)(c->o - plen - 4);
+ memcpy (plen, &len, 4);
+
+ char valuelen+1;
+ memcpy (value, start, len);
+ valuelen = 0;
+ return 0;
+}
+
+int
+tf_compile_plain (tf_compiler_t *c) {
+ int eol = c->eol;
+ c->eol = 0;
+ char i = *(c->i);
+ if (i == '$') {
+ if (c->i1 == '$') {
+ c->i++;
+ *(c->o++) = *(c->i++);
+ }
+ else if (tf_compile_func (c)) {
+ return -1;
+ }
+ }
+ else if (i == '') {
+ if (tf_compile_ifdef (c)) {
+ return -1;
+ }
+ }
+ else if (i == '%') {
+ if (c->i1 == '%') {
+ c->i++;
+ *(c->o++) = *(c->i++);
+ return 0;
+ }
+ if (tf_compile_field (c)) {
+ return -1;
+ }
+ }
+ // FIXME this is not fb2k spec
+ else if (*(c->i) == '\\') {
+ c->i++;
+ if (*(c->i) != 0) {
+ *(c->o++) = *(c->i++);
+ }
+ }
+ else if (eol && i == '/' && c->i1 == '/') {
+ // skip to end of line
+ while (c->i0 && c->i0 != '\n') {
+ c->i++;
+ }
+ c->eol = 1;
+ }
+ else if (i == '\'') {
+ // copy as plain text to next single-quote
+ c->i++;
+
+ if (c->i0 == '\'') {
+ *(c->o++) = *(c->i++);
+ }
+ else {
+ while (c->i0 && c->i0 != '\'') {
+ *(c->o++) = *(c->i++);
+ }
+ if (c->i0 == '\'') {
+ c->i++;
+ }
+ }
+ }
+ else if (i == '\n') {
+ c->i++;
+ c->eol = 1;
+ }
+ else if (i == '<' || i == '>') {
+ if (tf_compile_text_dim (c)) {
+ return -1;
+ }
+ }
+ else {
+ *(c->o++) = *(c->i++);
+ }
+ return 0;
+}
+
+char *
+tf_compile (const char *script) {
+ tf_compiler_t c;
+ memset (&c, 0, sizeof (c));
+
+ c.i = script;
+
+ size_t len = strlen(script);
+ if (len == 0) {
+ return calloc(1,4);
+ }
+ uint8_t *code = calloc(len * 3, 1);
+
+ c.o = code;
+
+ c.eol = 1;
+
+ while (*(c.i)) {
+ if (tf_compile_plain (&c)) {
+ trace ("tf: compilation failed <%s>\n", c.i);
+ free (code);
+ return NULL;
+ }
+ }
+
+ size_t size = c.o - code;
+ char *out = malloc (size + 8);
+ memcpy (out + 4, code, size);
+ memset (out + 4 + size, 0, 4); // FIXME: this is the padding for possible buffer overflow bug fix
+ *((int32_t *)out) = (int32_t)(size);
+
+ free (code);
+
+ return out;
+}
+
+void
+tf_free (char *code) {
+ free (code);
+}
+
+void
+tf_import_legacy (const char *fmt, char *out, int outsize) {
+ while (*fmt && outsize > 1) {
+ if (*fmt == '\'' || *fmt == '$') {
+ if (outsize < 3) {
+ break;
+ }
+ *out++ = *fmt;
+ *out++ = *fmt++;
+ outsize -= 2;
+ }
+ else if (*fmt == '\n') {
+ if (outsize < 7) {
+ break;
+ }
+ strcpy (out, "$crlf()");
+ out += 7;
+ outsize -= 7;
+ fmt++;
+ }
+ else if (*fmt == '') {
+ if (outsize < 3) {
+ break;
+ }
+ strcpy (out, "''");
+ out += 3;
+ outsize -= 3;
+ fmt++;
+ }
+ else if (*fmt == '') {
+ if (outsize < 3) {
+ break;
+ }
+ strcpy (out, "''");
+ out += 3;
+ outsize -= 3;
+ fmt++;
+ }
+ else if (*fmt != '%') {
+ *out++ = *fmt++;
+ outsize--;
+ }
+ else {
+ fmt++;
+ if (!*fmt) {
+ break;
+ }
+ if (*fmt == '@') {
+ const char *e = fmt;
+ e++;
+ while (*e && *e != '@') {
+ e++;
+ }
+#define APPEND(x) {size_t size = strlen (x); if (size >= outsize-1) break; memcpy (out, x, size); out += size; outsize -= size;}
+ if (*e == '@') {
+ char nm100;
+ size_t l = e-fmt-1;
+ l = min (l, sizeof (nm)-3);
+ strncpy (nm+1, fmt+1, l);
+ nml+2 = 0;
+ nm0 = '%';
+ nml+1 = '%';
+
+ APPEND (nm);
+ fmt = e+1;
+ }
+ continue;
+ }
+ else if (*fmt == 'a') {
+ APPEND ("%artist%");
+ }
+ else if (*fmt == 't') {
+ APPEND ("%title%");
+ }
+ else if (*fmt == 'b') {
+ APPEND ("%album%");
+ }
+ else if (*fmt == 'B') {
+ APPEND ("%album artist%");
+ }
+ else if (*fmt == 'C') {
+ APPEND ("%composer%");
+ }
+ else if (*fmt == 'n') {
+ APPEND ("%tracknumber%");
+ }
+ else if (*fmt == 'N') {
+ APPEND ("%numtracks%");
+ }
+ else if (*fmt == 'y') {
+ APPEND ("%date%");
+ }
+ else if (*fmt == 'Y') {
+ APPEND ("%original_release_time%");
+ }
+ else if (*fmt == 'g') {
+ APPEND ("%genre%");
+ }
+ else if (*fmt == 'c') {
+ APPEND ("%comment%");
+ }
+ else if (*fmt == 'r') {
+ APPEND ("%copyright%");
+ }
+ else if (*fmt == 'l') {
+ APPEND ("%length%");
+ }
+ else if (*fmt == 'e') {
+ APPEND ("%playback_time%");
+ }
+ else if (*fmt == 'f') {
+ APPEND ("%filename_ext%");
+ }
+ else if (*fmt == 'F') {
+ APPEND ("%_path_raw%");
+ }
+ else if (*fmt == 'T') {
+ APPEND ("$info(tagtype)");
+ }
+ else if (*fmt == 'd') {
+ APPEND ("%directoryname%");
+ }
+ else if (*fmt == 'D') {
+ APPEND ("$directory_path(%_path_raw%)");
+ }
+ else if (*fmt == 'L') {
+ APPEND ("%list_length%"); // TODO
+ }
+ else if (*fmt == 'X') {
+ APPEND ("%list_selected%"); // TODO
+ }
+ else if (*fmt == 'Z') {
+ APPEND ("$channels()");
+ }
+ else if (*fmt == 'V') {
+ APPEND ("%_deadbeef_version%");
+ }
+ else if (*fmt == '%') {
+ APPEND ("%%");
+ }
+ else {
+ *out++ = *fmt;
+ outsize--;
+ }
+#undef APPEND
+ fmt++;
+ }
+ }
+ *out = 0;
+}

deadbeef-1.9.6.tar.bz2/src/tf.h Added

@@ -0,0 +1,59 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2014 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __TF_H
+#define __TF_H
+
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// compile the input title formatting string into bytecode
+// script: freeform string with title formatting special characters in it
+// returns the pointer to compiled bytecode, which must be tf_free'd by the caller.
+char *
+tf_compile (const char *script);
+
+void
+tf_free (char *code);
+
+// evaluate the titleformatting script in a given context
+// ctx: a pointer to ddb_tf_context_t structure initialized by the caller
+// code: the bytecode data created by tf_compile
+// out: buffer allocated by the caller, must be big enough to fit the output string
+// outlen: the size of out buffer
+// returns -1 on fail, output size on success
+int
+tf_eval (ddb_tf_context_t *ctx, const char *code, char *out, int outlen);
+
+// convert legacy title formatting to the new format, usable with tf_compile
+void
+tf_import_legacy (const char *fmt, char *out, int outsize);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __TF_H

deadbeef-1.9.6.tar.bz2/src/threading.h Added

@@ -0,0 +1,86 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ threading functions wrapper
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __THREADING_H
+#define __THREADING_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+intptr_t
+thread_start (void (*fn)(void *ctx), void *ctx);
+
+intptr_t
+thread_start_low_priority (void (*fn)(void *ctx), void *ctx);
+
+int
+thread_join (intptr_t tid);
+
+int
+thread_detach (intptr_t tid);
+
+void
+thread_exit (void *retval);
+
+uintptr_t
+mutex_create (void);
+
+uintptr_t
+mutex_create_nonrecursive (void);
+
+void
+mutex_free (uintptr_t mtx);
+
+int
+mutex_lock (uintptr_t mtx);
+
+int
+mutex_unlock (uintptr_t mtx);
+
+uintptr_t
+cond_create (void);
+
+void
+cond_free (uintptr_t cond);
+
+int
+cond_wait (uintptr_t cond, uintptr_t mutex);
+
+int
+cond_signal (uintptr_t cond);
+
+int
+cond_broadcast (uintptr_t cond);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

deadbeef-1.9.6.tar.bz2/src/threading_pthread.c Added

@@ -0,0 +1,246 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ pthread wrapper
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include <stdio.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include "threading.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+intptr_t
+thread_start (void (*fn)(void *ctx), void *ctx) {
+ pthread_t tid;
+ pthread_attr_t attr;
+ int s = pthread_attr_init (&attr);
+ if (s != 0) {
+ fprintf (stderr, "pthread_attr_init failed: %s\n", strerror (s));
+ return 0;
+ }
+
+ s = pthread_create (&tid, &attr, (void *(*)(void *))fn, (void*)ctx);
+ if (s != 0) {
+ fprintf (stderr, "pthread_create failed: %s\n", strerror (s));
+ return 0;
+ }
+ s = pthread_attr_destroy (&attr);
+ if (s != 0) {
+ fprintf (stderr, "pthread_attr_destroy failed: %s\n", strerror (s));
+ return 0;
+ }
+ return (intptr_t)tid;
+}
+
+intptr_t
+thread_start_low_priority (void (*fn)(void *ctx), void *ctx) {
+#if defined(__linux__) && !defined(ANDROID)
+ pthread_t tid;
+ pthread_attr_t attr;
+ int s = pthread_attr_init (&attr);
+ if (s != 0) {
+ fprintf (stderr, "pthread_attr_init failed: %s\n", strerror (s));
+ return 0;
+ }
+#if !STATICLINK && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 4
+ int policy;
+ s = pthread_attr_getschedpolicy (&attr, &policy);
+ if (s != 0) {
+ fprintf (stderr, "pthread_attr_getschedpolicy failed: %s\n", strerror (s));
+ return 0;
+ }
+ int minprio = sched_get_priority_min (policy);
+#endif
+
+ s = pthread_create (&tid, &attr, (void *(*)(void *))fn, (void*)ctx);
+ if (s != 0) {
+ fprintf (stderr, "pthread_create failed: %s\n", strerror (s));
+ return 0;
+ }
+#if !STATICLINK && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 4
+ s = pthread_setschedprio (tid, minprio);
+ if (s != 0) {
+ fprintf (stderr, "pthread_setschedprio failed: %s\n", strerror (s));
+ pthread_cancel (tid);
+ return 0;
+ }
+#endif
+
+ s = pthread_attr_destroy (&attr);
+ if (s != 0) {
+ fprintf (stderr, "pthread_attr_destroy failed: %s\n", strerror (s));
+ pthread_cancel (tid);
+ return 0;
+ }
+ return (intptr_t)tid;
+#else
+ return thread_start (fn, ctx);
+#endif
+}
+
+int
+thread_join (intptr_t tid) {
+ void *retval;
+ int s = pthread_join ((pthread_t)tid, &retval);
+ if (s) {
+ fprintf (stderr, "pthread_join failed: %s\n", strerror (s));
+ return -1;
+ }
+ return 0;
+}
+
+int
+thread_detach (intptr_t tid) {
+ int s = pthread_detach ((pthread_t)tid);
+ if (s) {
+ fprintf (stderr, "pthread_detach failed: %s\n", strerror (s));
+ return -1;
+ }
+ return 0;
+}
+
+void
+thread_exit (void *retval) {
+ pthread_exit (retval);
+}
+
+uintptr_t
+mutex_create_nonrecursive (void) {
+ pthread_mutex_t *mtx = malloc (sizeof (pthread_mutex_t));
+ pthread_mutexattr_t attr = {0};
+ pthread_mutexattr_init (&attr);
+ pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_NORMAL);
+ int err = pthread_mutex_init (mtx, &attr);
+ if (err != 0) {
+ fprintf (stderr, "pthread_mutex_init failed: %s\n", strerror (err));
+ free (mtx);
+ return 0;
+ }
+ pthread_mutexattr_destroy (&attr);
+ return (uintptr_t)mtx;
+}
+
+uintptr_t
+mutex_create (void) {
+ pthread_mutex_t *mtx = malloc (sizeof (pthread_mutex_t));
+ pthread_mutexattr_t attr = {0};
+ pthread_mutexattr_init (&attr);
+ pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
+ int err = pthread_mutex_init (mtx, &attr);
+ if (err != 0) {
+ fprintf (stderr, "pthread_mutex_init failed: %s\n", strerror (err));
+ free (mtx);
+ return 0;
+ }
+ pthread_mutexattr_destroy (&attr);
+ return (uintptr_t)mtx;
+}
+
+void
+mutex_free (uintptr_t _mtx) {
+ pthread_mutex_t *mtx = (pthread_mutex_t *)_mtx;
+ pthread_mutex_destroy (mtx);
+ free (mtx);
+}
+
+int
+mutex_lock (uintptr_t _mtx) {
+ pthread_mutex_t *mtx = (pthread_mutex_t *)_mtx;
+ int err = pthread_mutex_lock (mtx);
+ if (err != 0) {
+ fprintf (stderr, "pthread_mutex_lock failed: %s\n", strerror (err));
+ }
+ return err;
+}
+
+int
+mutex_unlock (uintptr_t _mtx) {
+ pthread_mutex_t *mtx = (pthread_mutex_t *)_mtx;
+ int err = pthread_mutex_unlock (mtx);
+ if (err != 0) {
+ fprintf (stderr, "pthread_mutex_unlock failed: %s\n", strerror (err));
+ }
+ return err;
+}
+
+uintptr_t
+cond_create (void) {
+ pthread_cond_t *cond = malloc (sizeof (pthread_cond_t));
+ int err = pthread_cond_init (cond, NULL);
+ if (err != 0) {
+ fprintf (stderr, "pthread_cond_init failed: %s\n", strerror (err));
+ free (cond);
+ return 0;
+ }
+ return (uintptr_t)cond;
+}
+
+void
+cond_free (uintptr_t c) {
+ if (c) {
+ pthread_cond_t *cond = (pthread_cond_t *)c;
+ pthread_cond_destroy (cond);
+ free (cond);
+ }
+}
+
+int
+cond_wait (uintptr_t c, uintptr_t m) {
+ pthread_cond_t *cond = (pthread_cond_t *)c;
+ pthread_mutex_t *mutex = (pthread_mutex_t *)m;
+ int err = mutex_lock (m);
+ if (err != 0) {
+ fprintf (stderr, "pthread_cond_wait mutex_lock failed: %s\n", strerror (err));
+ return err;
+ }
+ err = pthread_cond_wait (cond, mutex);
+ if (err != 0) {
+ fprintf (stderr, "pthread_cond_wait failed: %s\n", strerror (err));
+ }
+ return err;
+}
+
+int
+cond_signal (uintptr_t c) {
+ pthread_cond_t *cond = (pthread_cond_t *)c;
+ int err = pthread_cond_signal (cond);
+ if (err != 0) {
+ fprintf (stderr, "pthread_cond_signal failed: %s\n", strerror (err));
+ }
+ return err;
+}
+
+int
+cond_broadcast (uintptr_t c) {
+ pthread_cond_t *cond = (pthread_cond_t *)c;
+ int err = pthread_cond_broadcast (cond);
+ if (err != 0) {
+ fprintf (stderr, "pthread_cond_broadcast failed: %s\n", strerror (err));
+ }
+ return err;
+}

deadbeef-1.9.6.tar.bz2/src/u8_lc_map.h Added

@@ -0,0 +1,2702 @@
+/* ANSI-C code produced by gperf version 3.0.3 */
+/* Command-line: /Applications/Xcode_12_4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/gperf -E -L ANSI-C -c -t -H u8_lc_hash -N u8_lc_in_word_set u8_lc_map.txt */
+/* Computed positions: -k'1-2,$' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+ && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+ && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+ && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+ && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+ && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+ && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+ && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+ && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+ && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+ && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+ && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+ && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+ && ('Z' == 90) && ('' == 91) && ('\\' == 92) && ('' == 93) \
+ && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+ && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+ && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+ && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+ && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+ && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+ && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+ && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646. */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+#line 1 "u8_lc_map.txt"
+struct u8_case_map_t {
+ const char *name;
+ const char *lower;
+};
+/* maximum key range = 2519, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+u8_lc_hash (register const char *str, register unsigned int len)
+{
+ static unsigned short asso_values =
+ {
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 135, 130, 125, 120, 115,
+ 110, 105, 100, 95, 90, 85, 80, 75, 70, 65,
+ 60, 55, 50, 45, 40, 35, 30, 25, 20, 15,
+ 0, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 973, 70,
+ 3, 662, 532, 480, 232, 540, 137, 920, 155, 785,
+ 215, 421, 405, 275, 42, 420, 20, 665, 2, 475,
+ 512, 765, 201, 860, 135, 720, 195, 961, 370, 882,
+ 676, 991, 310, 825, 6, 858, 136, 876, 835, 85,
+ 75, 362, 40, 10, 345, 1015, 741, 770, 901, 50,
+ 406, 500, 976, 511, 900, 742, 645, 257, 81, 457,
+ 975, 775, 191, 796, 25, 15, 170, 425, 620, 750,
+ 5, 0, 565, 460, 875, 867, 105, 550, 405, 580,
+ 155, 320, 765, 660, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 0, 390, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 5, 2520, 2520, 2520, 2520, 340,
+ 30, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520, 2520,
+ 2520, 2520
+ };
+ register unsigned int hval = len;
+
+ switch (hval)
+ {
+ default:
+ hval += asso_values(unsigned char)str1+16;
+ /*FALLTHROUGH*/
+ case 1:
+ hval += asso_values(unsigned char)str0;
+ break;
+ }
+ return hval + asso_values(unsigned char)strlen - 1;
+}
+
+struct u8_case_map_t *
+u8_lc_in_word_set (register const char *str, register unsigned int len)
+{
+ enum
+ {
+ TOTAL_KEYWORDS = 1007,
+ MIN_WORD_LENGTH = 1,
+ MAX_WORD_LENGTH = 4,
+ MIN_HASH_VALUE = 1,
+ MAX_HASH_VALUE = 2519
+ };
+
+ static struct u8_case_map_t wordlist =
+ {
+ {""},
+#line 31 "u8_lc_map.txt"
+ {"Z", "z"},
+ {""}, {""}, {""},
+#line 539 "u8_lc_map.txt"
+ {"\341\271\224", "ṕ"},
+#line 530 "u8_lc_map.txt"
+ {"\341\271\202", "ṃ"},
+ {""}, {""},
+#line 547 "u8_lc_map.txt"
+ {"\341\271\244", "ṥ"},
+#line 507 "u8_lc_map.txt"
+ {"\341\270\224", "ḕ"},
+#line 498 "u8_lc_map.txt"
+ {"\341\270\202", "ḃ"},
+ {""}, {""},
+#line 515 "u8_lc_map.txt"
+ {"\341\270\244", "ḥ"},
+#line 194 "u8_lc_map.txt"
+ {"\310\224", "ȕ"},
+ {""}, {""}, {""}, {""},
+#line 917 "u8_lc_map.txt"
+ {"\352\235\224", "ꝕ"},
+#line 908 "u8_lc_map.txt"
+ {"\352\235\202", "ꝃ"},
+ {""},
+#line 538 "u8_lc_map.txt"
+ {"\341\271\222", "ṓ"},
+#line 925 "u8_lc_map.txt"
+ {"\352\235\244", "ꝥ"},
+#line 52 "u8_lc_map.txt"
+ {"\303\224", "ô"},
+ {""}, {""},
+#line 506 "u8_lc_map.txt"
+ {"\341\270\222", "ḓ"},
+#line 463 "u8_lc_map.txt"
+ {"\341\202\244", "ⴄ"},
+#line 185 "u8_lc_map.txt"
+ {"\310\202", "ȃ"},
+#line 30 "u8_lc_map.txt"
+ {"Y", "y"},
+ {""},
+#line 472 "u8_lc_map.txt"
+ {"\341\202\255", "ⴍ"},
+ {""}, {""}, {""}, {""},
+#line 916 "u8_lc_map.txt"
+ {"\352\235\222", "ꝓ"},
+ {""},
+#line 34 "u8_lc_map.txt"
+ {"\303\202", "â"},
+#line 29 "u8_lc_map.txt"
+ {"X", "x"},
+ {""},
+#line 551 "u8_lc_map.txt"
+ {"\341\271\254", "ṭ"},
+ {""},
+#line 537 "u8_lc_map.txt"
+ {"\341\271\220", "ṑ"},
+ {""}, {""},
+#line 519 "u8_lc_map.txt"
+ {"\341\270\254", "ḭ"},
+ {""},
+#line 505 "u8_lc_map.txt"
+ {"\341\270\220", "ḑ"},
+#line 28 "u8_lc_map.txt"
+ {"W", "w"},
+ {""}, {""},
+#line 894 "u8_lc_map.txt"
+ {"\352\234\244", "ꜥ"},
+ {""}, {""}, {""},
+#line 929 "u8_lc_map.txt"
+ {"\352\235\254", "ꝭ"},
+ {""},
+#line 915 "u8_lc_map.txt"
+ {"\352\235\220", "ꝑ"},
+#line 27 "u8_lc_map.txt"
+ {"V", "v"},
+ {""},
+#line 471 "u8_lc_map.txt"
+ {"\341\202\254", "ⴌ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 26 "u8_lc_map.txt"
+ {"U", "u"},
+ {""},
+#line 478 "u8_lc_map.txt"
+ {"\341\202\263", "ⴓ"},
+ {""}, {""}, {""}, {""},
+#line 550 "u8_lc_map.txt"
+ {"\341\271\252", "ṫ"},
+ {""}, {""},
+#line 25 "u8_lc_map.txt"
+ {"T", "t"},
+ {""},
+#line 518 "u8_lc_map.txt"
+ {"\341\270\252", "ḫ"},
+#line 559 "u8_lc_map.txt"
+ {"\341\271\274", "ṽ"},
+#line 891 "u8_lc_map.txt"
+ {"\352\232\224", "ꚕ"},
+#line 882 "u8_lc_map.txt"
+ {"\352\232\202", "ꚃ"},
+ {""},
+#line 898 "u8_lc_map.txt"
+ {"\352\234\254", "ꜭ"},
+#line 527 "u8_lc_map.txt"
+ {"\341\270\274", "ḽ"},
+ {""},
+#line 24 "u8_lc_map.txt"
+ {"S", "s"},
+ {""},
+#line 928 "u8_lc_map.txt"
+ {"\352\235\252", "ꝫ"},
+ {""},
+#line 868 "u8_lc_map.txt"
+ {"\352\231\224", "ꙕ"},
+#line 859 "u8_lc_map.txt"
+ {"\352\231\202", "ꙃ"},
+ {""},
+#line 469 "u8_lc_map.txt"
+ {"\341\202\252", "ⴊ"},
+#line 876 "u8_lc_map.txt"
+ {"\352\231\244", "ꙥ"},
+ {""},
+#line 23 "u8_lc_map.txt"
+ {"R", "r"},
+ {""},
+#line 890 "u8_lc_map.txt"
+ {"\352\232\222", "ꚓ"},
+#line 487 "u8_lc_map.txt"
+ {"\341\202\274", "ⴜ"},
+ {""}, {""}, {""},
+#line 468 "u8_lc_map.txt"
+ {"\341\202\251", "ⴉ"},
+ {""}, {""},
+#line 22 "u8_lc_map.txt"
+ {"Q", "q"},
+ {""},
+#line 867 "u8_lc_map.txt"
+ {"\352\231\222", "ꙓ"},
+ {""},
+#line 236 "u8_lc_map.txt"
+ {"\316\224", "δ"},
+ {""}, {""},
+#line 690 "u8_lc_map.txt"
+ {"\341\276\255", "ᾥ"},
+ {""}, {""},
+#line 21 "u8_lc_map.txt"
+ {"P", "p"},
+ {""},
+#line 897 "u8_lc_map.txt"
+ {"\352\234\252", "ꜫ"},
+ {""},
+#line 889 "u8_lc_map.txt"
+ {"\352\232\220", "ꚑ"},
+ {""}, {""},
+#line 206 "u8_lc_map.txt"
+ {"\310\254", "ȭ"},
+#line 905 "u8_lc_map.txt"
+ {"\352\234\274", "ꜽ"},
+ {""},
+#line 20 "u8_lc_map.txt"
+ {"O", "o"},
+ {""},
+#line 880 "u8_lc_map.txt"
+ {"\352\231\254", "ꙭ"},
+ {""},
+#line 866 "u8_lc_map.txt"
+ {"\352\231\220", "ꙑ"},
+ {""}, {""},
+#line 542 "u8_lc_map.txt"
+ {"\341\271\232", "ṛ"},
+#line 548 "u8_lc_map.txt"
+ {"\341\271\246", "ṧ"},
+#line 533 "u8_lc_map.txt"
+ {"\341\271\210", "ṉ"},
+#line 19 "u8_lc_map.txt"
+ {"N", "n"},
+ {""},
+#line 510 "u8_lc_map.txt"
+ {"\341\270\232", "ḛ"},
+#line 516 "u8_lc_map.txt"
+ {"\341\270\246", "ḧ"},
+#line 501 "u8_lc_map.txt"
+ {"\341\270\210", "ḉ"},
+ {""}, {""},
+#line 689 "u8_lc_map.txt"
+ {"\341\276\254", "ᾤ"},
+ {""}, {""},
+#line 18 "u8_lc_map.txt"
+ {"M", "m"},
+ {""},
+#line 920 "u8_lc_map.txt"
+ {"\352\235\232", "ꝛ"},
+#line 926 "u8_lc_map.txt"
+ {"\352\235\246", "ꝧ"},
+#line 911 "u8_lc_map.txt"
+ {"\352\235\210", "ꝉ"},
+ {""}, {""},
+#line 534 "u8_lc_map.txt"
+ {"\341\271\212", "ṋ"},
+#line 465 "u8_lc_map.txt"
+ {"\341\202\246", "ⴆ"},
+ {""},
+#line 17 "u8_lc_map.txt"
+ {"L", "l"},
+ {""},
+#line 502 "u8_lc_map.txt"
+ {"\341\270\212", "ḋ"},
+ {""},
+#line 348 "u8_lc_map.txt"
+ {"\322\224", "ҕ"},
+ {""}, {""},
+#line 879 "u8_lc_map.txt"
+ {"\352\231\252", "ꙫ"},
+ {""}, {""},
+#line 16 "u8_lc_map.txt"
+ {"K", "k"},
+ {""},
+#line 912 "u8_lc_map.txt"
+ {"\352\235\212", "ꝋ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 72 "u8_lc_map.txt"
+ {"\304\224", "ĕ"},
+#line 15 "u8_lc_map.txt"
+ {"J", "j"},
+ {""},
+#line 687 "u8_lc_map.txt"
+ {"\341\276\252", "ᾢ"},
+#line 895 "u8_lc_map.txt"
+ {"\352\234\246", "ꜧ"},
+ {""}, {""}, {""}, {""},
+#line 697 "u8_lc_map.txt"
+ {"\341\276\274", "ᾳ"},
+ {""},
+#line 14 "u8_lc_map.txt"
+ {"I", "i"},
+ {""},
+#line 686 "u8_lc_map.txt"
+ {"\341\276\251", "ᾡ"},
+ {""},
+#line 63 "u8_lc_map.txt"
+ {"\304\202", "ă"},
+ {""}, {""},
+#line 543 "u8_lc_map.txt"
+ {"\341\271\234", "ṝ"},
+ {""}, {""},
+#line 13 "u8_lc_map.txt"
+ {"H", "h"},
+ {""},
+#line 511 "u8_lc_map.txt"
+ {"\341\270\234", "ḝ"},
+#line 541 "u8_lc_map.txt"
+ {"\341\271\230", "ṙ"},
+ {""}, {""}, {""}, {""},
+#line 509 "u8_lc_map.txt"
+ {"\341\270\230", "ḙ"},
+ {""},
+#line 12 "u8_lc_map.txt"
+ {"G", "g"},
+ {""},
+#line 921 "u8_lc_map.txt"
+ {"\352\235\234", "ꝝ"},
+ {""}, {""}, {""},
+#line 197 "u8_lc_map.txt"
+ {"\310\232", "ț"},
+#line 535 "u8_lc_map.txt"
+ {"\341\271\214", "ṍ"},
+#line 919 "u8_lc_map.txt"
+ {"\352\235\230", "ꝙ"},
+#line 885 "u8_lc_map.txt"
+ {"\352\232\210", "ꚉ"},
+#line 11 "u8_lc_map.txt"
+ {"F", "f"},
+ {""},
+#line 503 "u8_lc_map.txt"
+ {"\341\270\214", "ḍ"},
+ {""}, {""}, {""},
+#line 57 "u8_lc_map.txt"
+ {"\303\232", "ú"},
+#line 871 "u8_lc_map.txt"
+ {"\352\231\232", "ꙛ"},
+#line 877 "u8_lc_map.txt"
+ {"\352\231\246", "ꙧ"},
+#line 862 "u8_lc_map.txt"
+ {"\352\231\210", "ꙉ"},
+#line 10 "u8_lc_map.txt"
+ {"E", "e"},
+ {""},
+#line 913 "u8_lc_map.txt"
+ {"\352\235\214", "ꝍ"},
+ {""},
+#line 532 "u8_lc_map.txt"
+ {"\341\271\206", "ṇ"},
+ {""}, {""},
+#line 886 "u8_lc_map.txt"
+ {"\352\232\212", "ꚋ"},
+ {""},
+#line 500 "u8_lc_map.txt"
+ {"\341\270\206", "ḇ"},
+#line 9 "u8_lc_map.txt"
+ {"D", "d"},
+#line 198 "u8_lc_map.txt"
+ {"\310\234", "ȝ"},
+#line 679 "u8_lc_map.txt"
+ {"\341\276\232", "ᾒ"},
+ {""},
+#line 669 "u8_lc_map.txt"
+ {"\341\276\210", "ᾀ"},
+ {""}, {""},
+#line 863 "u8_lc_map.txt"
+ {"\352\231\212", "ꙋ"},
+ {""},
+#line 910 "u8_lc_map.txt"
+ {"\352\235\206", "ꝇ"},
+#line 8 "u8_lc_map.txt"
+ {"C", "c"},
+#line 59 "u8_lc_map.txt"
+ {"\303\234", "ü"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 7 "u8_lc_map.txt"
+ {"B", "b"},
+ {""},
+#line 671 "u8_lc_map.txt"
+ {"\341\276\212", "ᾂ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 6 "u8_lc_map.txt"
+ {"A", "a"},
+ {""}, {""}, {""},
+#line 932 "u8_lc_map.txt"
+ {"\352\235\273", "ꝼ"},
+ {""}, {""},
+#line 360 "u8_lc_map.txt"
+ {"\322\254", "ҭ"},
+ {""},
+#line 486 "u8_lc_map.txt"
+ {"\341\202\273", "ⴛ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 872 "u8_lc_map.txt"
+ {"\352\231\234", "ꙝ"},
+ {""}, {""}, {""},
+#line 220 "u8_lc_map.txt"
+ {"\311\212", "ɋ"},
+#line 84 "u8_lc_map.txt"
+ {"\304\254", "ĭ"},
+#line 870 "u8_lc_map.txt"
+ {"\352\231\230", "ꙙ"},
+ {""}, {""},
+#line 189 "u8_lc_map.txt"
+ {"\310\212", "ȋ"},
+#line 887 "u8_lc_map.txt"
+ {"\352\232\214", "ꚍ"},
+ {""}, {""}, {""}, {""},
+#line 681 "u8_lc_map.txt"
+ {"\341\276\234", "ᾔ"},
+ {""}, {""}, {""},
+#line 42 "u8_lc_map.txt"
+ {"\303\212", "ê"},
+#line 864 "u8_lc_map.txt"
+ {"\352\231\214", "ꙍ"},
+#line 677 "u8_lc_map.txt"
+ {"\341\276\230", "ᾐ"},
+ {""}, {""}, {""},
+#line 546 "u8_lc_map.txt"
+ {"\341\271\242", "ṣ"},
+ {""},
+#line 884 "u8_lc_map.txt"
+ {"\352\232\206", "ꚇ"},
+ {""},
+#line 242 "u8_lc_map.txt"
+ {"\316\232", "κ"},
+#line 514 "u8_lc_map.txt"
+ {"\341\270\242", "ḣ"},
+ {""}, {""}, {""}, {""},
+#line 673 "u8_lc_map.txt"
+ {"\341\276\214", "ᾄ"},
+ {""},
+#line 861 "u8_lc_map.txt"
+ {"\352\231\206", "ꙇ"},
+ {""}, {""},
+#line 924 "u8_lc_map.txt"
+ {"\352\235\242", "ꝣ"},
+ {""},
+#line 379 "u8_lc_map.txt"
+ {"\323\224", "ӕ"},
+ {""}, {""},
+#line 461 "u8_lc_map.txt"
+ {"\341\202\242", "ⴂ"},
+ {""}, {""}, {""},
+#line 193 "u8_lc_map.txt"
+ {"\310\222", "ȓ"},
+ {""}, {""},
+#line 219 "u8_lc_map.txt"
+ {"\311\210", "ɉ"},
+ {""},
+#line 244 "u8_lc_map.txt"
+ {"\316\234", "μ"},
+ {""}, {""},
+#line 188 "u8_lc_map.txt"
+ {"\310\210", "ȉ"},
+ {""},
+#line 50 "u8_lc_map.txt"
+ {"\303\222", "ò"},
+#line 552 "u8_lc_map.txt"
+ {"\341\271\256", "ṯ"},
+ {""}, {""}, {""}, {""},
+#line 520 "u8_lc_map.txt"
+ {"\341\270\256", "ḯ"},
+ {""},
+#line 40 "u8_lc_map.txt"
+ {"\303\210", "è"},
+#line 936 "u8_lc_map.txt"
+ {"\352\236\202", "ꞃ"},
+ {""},
+#line 893 "u8_lc_map.txt"
+ {"\352\234\242", "ꜣ"},
+#line 944 "u8_lc_map.txt"
+ {"\352\236\244", "ꞥ"},
+ {""}, {""}, {""},
+#line 930 "u8_lc_map.txt"
+ {"\352\235\256", "ꝯ"},
+ {""},
+#line 696 "u8_lc_map.txt"
+ {"\341\276\273", "ά"},
+ {""},
+#line 351 "u8_lc_map.txt"
+ {"\322\232", "қ"},
+#line 473 "u8_lc_map.txt"
+ {"\341\202\256", "ⴎ"},
+ {""}, {""}, {""}, {""},
+#line 544 "u8_lc_map.txt"
+ {"\341\271\236", "ṟ"},
+ {""}, {""}, {""}, {""},
+#line 512 "u8_lc_map.txt"
+ {"\341\270\236", "ḟ"},
+ {""}, {""}, {""},
+#line 75 "u8_lc_map.txt"
+ {"\304\232", "ě"},
+#line 676 "u8_lc_map.txt"
+ {"\341\276\217", "ᾇ"},
+ {""},
+#line 470 "u8_lc_map.txt"
+ {"\341\202\253", "ⴋ"},
+ {""}, {""},
+#line 922 "u8_lc_map.txt"
+ {"\352\235\236", "ꝟ"},
+ {""}, {""}, {""},
+#line 352 "u8_lc_map.txt"
+ {"\322\234", "ҝ"},
+#line 899 "u8_lc_map.txt"
+ {"\352\234\256", "ꜯ"},
+ {""},
+#line 941 "u8_lc_map.txt"
+ {"\352\236\220", "ꞑ"},
+ {""},
+#line 229 "u8_lc_map.txt"
+ {"\316\212", "ί"},
+ {""}, {""}, {""}, {""}, {""},
+#line 875 "u8_lc_map.txt"
+ {"\352\231\242", "ꙣ"},
+ {""}, {""}, {""},
+#line 76 "u8_lc_map.txt"
+ {"\304\234", "ĝ"},
+#line 536 "u8_lc_map.txt"
+ {"\341\271\216", "ṏ"},
+#line 555 "u8_lc_map.txt"
+ {"\341\271\264", "ṵ"},
+#line 848 "u8_lc_map.txt"
+ {"\342\263\224", "ⳕ"},
+#line 839 "u8_lc_map.txt"
+ {"\342\263\202", "ⳃ"},
+#line 221 "u8_lc_map.txt"
+ {"\311\214", "ɍ"},
+#line 504 "u8_lc_map.txt"
+ {"\341\270\216", "ḏ"},
+#line 523 "u8_lc_map.txt"
+ {"\341\270\264", "ḵ"},
+#line 298 "u8_lc_map.txt"
+ {"\320\224", "д"},
+ {""},
+#line 190 "u8_lc_map.txt"
+ {"\310\214", "ȍ"},
+#line 857 "u8_lc_map.txt"
+ {"\342\263\255", "ⳮ"},
+#line 202 "u8_lc_map.txt"
+ {"\310\244", "ȥ"},
+#line 816 "u8_lc_map.txt"
+ {"\342\262\224", "ⲕ"},
+#line 807 "u8_lc_map.txt"
+ {"\342\262\202", "ⲃ"},
+ {""},
+#line 914 "u8_lc_map.txt"
+ {"\352\235\216", "ꝏ"},
+#line 824 "u8_lc_map.txt"
+ {"\342\262\244", "ⲥ"},
+ {""}, {""},
+#line 44 "u8_lc_map.txt"
+ {"\303\214", "ì"},
+#line 847 "u8_lc_map.txt"
+ {"\342\263\222", "ⳓ"},
+#line 479 "u8_lc_map.txt"
+ {"\341\202\264", "ⴔ"},
+#line 280 "u8_lc_map.txt"
+ {"\320\202", "ђ"},
+ {""}, {""}, {""}, {""},
+#line 103 "u8_lc_map.txt"
+ {"\305\224", "ŕ"},
+ {""},
+#line 234 "u8_lc_map.txt"
+ {"\316\222", "β"},
+#line 815 "u8_lc_map.txt"
+ {"\342\262\222", "ⲓ"},
+ {""}, {""}, {""}, {""},
+#line 391 "u8_lc_map.txt"
+ {"\323\254", "ӭ"},
+ {""},
+#line 227 "u8_lc_map.txt"
+ {"\316\210", "έ"},
+ {""},
+#line 343 "u8_lc_map.txt"
+ {"\322\212", "ҋ"},
+ {""}, {""},
+#line 846 "u8_lc_map.txt"
+ {"\342\263\220", "ⳑ"},
+ {""}, {""},
+#line 691 "u8_lc_map.txt"
+ {"\341\276\256", "ᾦ"},
+#line 901 "u8_lc_map.txt"
+ {"\352\234\264", "ꜵ"},
+ {""}, {""}, {""},
+#line 828 "u8_lc_map.txt"
+ {"\342\262\254", "ⲭ"},
+ {""},
+#line 814 "u8_lc_map.txt"
+ {"\342\262\220", "ⲑ"},
+ {""},
+#line 67 "u8_lc_map.txt"
+ {"\304\212", "ċ"},
+#line 873 "u8_lc_map.txt"
+ {"\352\231\236", "ꙟ"},
+ {""},
+#line 599 "u8_lc_map.txt"
+ {"\341\273\224", "ổ"},
+#line 590 "u8_lc_map.txt"
+ {"\341\273\202", "ể"},
+ {""}, {""},
+#line 607 "u8_lc_map.txt"
+ {"\341\273\244", "ụ"},
+#line 688 "u8_lc_map.txt"
+ {"\341\276\253", "ᾣ"},
+ {""}, {""}, {""}, {""},
+#line 933 "u8_lc_map.txt"
+ {"\352\235\275", "ᵹ"},
+ {""}, {""},
+#line 683 "u8_lc_map.txt"
+ {"\341\276\236", "ᾖ"},
+ {""},
+#line 488 "u8_lc_map.txt"
+ {"\341\202\275", "ⴝ"},
+ {""}, {""},
+#line 598 "u8_lc_map.txt"
+ {"\341\273\222", "ồ"},
+ {""}, {""}, {""},
+#line 347 "u8_lc_map.txt"
+ {"\322\222", "ғ"},
+#line 888 "u8_lc_map.txt"
+ {"\352\232\216", "ꚏ"},
+#line 945 "u8_lc_map.txt"
+ {"\352\236\246", "ꞧ"},
+ {""}, {""},
+#line 214 "u8_lc_map.txt"
+ {"\311\201", "ɂ"},
+#line 827 "u8_lc_map.txt"
+ {"\342\262\252", "ⲫ"},
+ {""}, {""}, {""}, {""},
+#line 865 "u8_lc_map.txt"
+ {"\352\231\216", "ꙏ"},
+#line 836 "u8_lc_map.txt"
+ {"\342\262\274", "ⲽ"},
+ {""}, {""},
+#line 71 "u8_lc_map.txt"
+ {"\304\222", "ē"},
+#line 611 "u8_lc_map.txt"
+ {"\341\273\254", "ử"},
+ {""},
+#line 597 "u8_lc_map.txt"
+ {"\341\273\220", "ố"},
+ {""},
+#line 33 "u8_lc_map.txt"
+ {"\303\201", "á"},
+ {""}, {""},
+#line 66 "u8_lc_map.txt"
+ {"\304\210", "ĉ"},
+ {""}, {""},
+#line 675 "u8_lc_map.txt"
+ {"\341\276\216", "ᾆ"},
+ {""},
+#line 540 "u8_lc_map.txt"
+ {"\341\271\226", "ṗ"},
+ {""},
+#line 230 "u8_lc_map.txt"
+ {"\316\214", "ό"},
+ {""},
+#line 251 "u8_lc_map.txt"
+ {"\316\244", "τ"},
+#line 508 "u8_lc_map.txt"
+ {"\341\270\226", "ḗ"},
+ {""}, {""},
+#line 480 "u8_lc_map.txt"
+ {"\341\202\265", "ⴕ"},
+ {""}, {""}, {""}, {""},
+#line 322 "u8_lc_map.txt"
+ {"\320\254", "ь"},
+#line 674 "u8_lc_map.txt"
+ {"\341\276\215", "ᾅ"},
+#line 918 "u8_lc_map.txt"
+ {"\352\235\226", "ꝗ"},
+ {""},
+#line 382 "u8_lc_map.txt"
+ {"\323\232", "ӛ"},
+ {""},
+#line 482 "u8_lc_map.txt"
+ {"\341\202\267", "ⴗ"},
+#line 531 "u8_lc_map.txt"
+ {"\341\271\204", "ṅ"},
+#line 216 "u8_lc_map.txt"
+ {"\311\204", "ʉ"},
+ {""},
+#line 610 "u8_lc_map.txt"
+ {"\341\273\252", "ừ"},
+ {""},
+#line 499 "u8_lc_map.txt"
+ {"\341\270\204", "ḅ"},
+#line 186 "u8_lc_map.txt"
+ {"\310\204", "ȅ"},
+ {""},
+#line 851 "u8_lc_map.txt"
+ {"\342\263\232", "ⳛ"},
+#line 619 "u8_lc_map.txt"
+ {"\341\273\274", "ỽ"},
+#line 842 "u8_lc_map.txt"
+ {"\342\263\210", "ⳉ"},
+ {""}, {""},
+#line 115 "u8_lc_map.txt"
+ {"\305\254", "ŭ"},
+ {""},
+#line 909 "u8_lc_map.txt"
+ {"\352\235\204", "ꝅ"},
+#line 36 "u8_lc_map.txt"
+ {"\303\204", "ä"},
+ {""},
+#line 819 "u8_lc_map.txt"
+ {"\342\262\232", "ⲛ"},
+#line 825 "u8_lc_map.txt"
+ {"\342\262\246", "ⲧ"},
+#line 810 "u8_lc_map.txt"
+ {"\342\262\210", "ⲉ"},
+ {""},
+#line 383 "u8_lc_map.txt"
+ {"\323\234", "ӝ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 843 "u8_lc_map.txt"
+ {"\342\263\212", "ⳋ"},
+ {""}, {""}, {""},
+#line 344 "u8_lc_map.txt"
+ {"\322\214", "ҍ"},
+ {""},
+#line 356 "u8_lc_map.txt"
+ {"\322\244", "ҥ"},
+#line 571 "u8_lc_map.txt"
+ {"\341\272\224", "ẕ"},
+#line 562 "u8_lc_map.txt"
+ {"\341\272\202", "ẃ"},
+ {""},
+#line 811 "u8_lc_map.txt"
+ {"\342\262\212", "ⲋ"},
+#line 575 "u8_lc_map.txt"
+ {"\341\272\244", "ấ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 68 "u8_lc_map.txt"
+ {"\304\214", "č"},
+ {""},
+#line 80 "u8_lc_map.txt"
+ {"\304\244", "ĥ"},
+#line 938 "u8_lc_map.txt"
+ {"\352\236\206", "ꞇ"},
+#line 764 "u8_lc_map.txt"
+ {"\342\260\224", "ⱄ"},
+#line 746 "u8_lc_map.txt"
+ {"\342\260\202", "ⰲ"},
+#line 570 "u8_lc_map.txt"
+ {"\341\272\222", "ẓ"},
+ {""},
+#line 780 "u8_lc_map.txt"
+ {"\342\260\244", "ⱔ"},
+ {""}, {""},
+#line 711 "u8_lc_map.txt"
+ {"\341\277\254", "ῥ"},
+#line 789 "u8_lc_map.txt"
+ {"\342\260\255", "ⱝ"},
+#line 892 "u8_lc_map.txt"
+ {"\352\232\226", "ꚗ"},
+ {""}, {""},
+#line 602 "u8_lc_map.txt"
+ {"\341\273\232", "ớ"},
+#line 608 "u8_lc_map.txt"
+ {"\341\273\246", "ủ"},
+#line 593 "u8_lc_map.txt"
+ {"\341\273\210", "ỉ"},
+ {""}, {""},
+#line 852 "u8_lc_map.txt"
+ {"\342\263\234", "ⳝ"},
+#line 762 "u8_lc_map.txt"
+ {"\342\260\222", "ⱂ"},
+#line 869 "u8_lc_map.txt"
+ {"\352\231\226", "ꙗ"},
+ {""}, {""},
+#line 579 "u8_lc_map.txt"
+ {"\341\272\254", "ậ"},
+#line 850 "u8_lc_map.txt"
+ {"\342\263\230", "ⳙ"},
+#line 569 "u8_lc_map.txt"
+ {"\341\272\220", "ẑ"},
+ {""}, {""},
+#line 820 "u8_lc_map.txt"
+ {"\342\262\234", "ⲝ"},
+ {""},
+#line 883 "u8_lc_map.txt"
+ {"\352\232\204", "ꚅ"},
+ {""},
+#line 304 "u8_lc_map.txt"
+ {"\320\232", "к"},
+#line 594 "u8_lc_map.txt"
+ {"\341\273\212", "ị"},
+#line 818 "u8_lc_map.txt"
+ {"\342\262\230", "ⲙ"},
+ {""}, {""}, {""},
+#line 844 "u8_lc_map.txt"
+ {"\342\263\214", "ⳍ"},
+#line 788 "u8_lc_map.txt"
+ {"\342\260\254", "ⱜ"},
+#line 860 "u8_lc_map.txt"
+ {"\352\231\204", "ꙅ"},
+#line 760 "u8_lc_map.txt"
+ {"\342\260\220", "ⱀ"},
+ {""},
+#line 709 "u8_lc_map.txt"
+ {"\341\277\252", "ὺ"},
+ {""},
+#line 138 "u8_lc_map.txt"
+ {"\306\224", "ɣ"},
+ {""}, {""},
+#line 812 "u8_lc_map.txt"
+ {"\342\262\214", "ⲍ"},
+#line 716 "u8_lc_map.txt"
+ {"\341\277\274", "ῳ"},
+ {""}, {""},
+#line 106 "u8_lc_map.txt"
+ {"\305\232", "ś"},
+#line 708 "u8_lc_map.txt"
+ {"\341\277\251", "ῡ"},
+ {""},
+#line 841 "u8_lc_map.txt"
+ {"\342\263\206", "ⳇ"},
+ {""},
+#line 306 "u8_lc_map.txt"
+ {"\320\234", "м"},
+#line 578 "u8_lc_map.txt"
+ {"\341\272\252", "ẫ"},
+ {""},
+#line 126 "u8_lc_map.txt"
+ {"\306\202", "ƃ"},
+ {""}, {""},
+#line 558 "u8_lc_map.txt"
+ {"\341\271\272", "ṻ"},
+#line 587 "u8_lc_map.txt"
+ {"\341\272\274", "ẽ"},
+#line 809 "u8_lc_map.txt"
+ {"\342\262\206", "ⲇ"},
+ {""},
+#line 378 "u8_lc_map.txt"
+ {"\323\222", "ӓ"},
+#line 526 "u8_lc_map.txt"
+ {"\341\270\272", "ḻ"},
+#line 745 "u8_lc_map.txt"
+ {"\342\260\201", "ⰱ"},
+#line 195 "u8_lc_map.txt"
+ {"\310\226", "ȗ"},
+ {""}, {""},
+#line 603 "u8_lc_map.txt"
+ {"\341\273\234", "ờ"},
+#line 786 "u8_lc_map.txt"
+ {"\342\260\252", "ⱚ"},
+ {""}, {""},
+#line 107 "u8_lc_map.txt"
+ {"\305\234", "ŝ"},
+#line 943 "u8_lc_map.txt"
+ {"\352\236\242", "ꞣ"},
+#line 601 "u8_lc_map.txt"
+ {"\341\273\230", "ộ"},
+#line 54 "u8_lc_map.txt"
+ {"\303\226", "ö"},
+ {""}, {""},
+#line 485 "u8_lc_map.txt"
+ {"\341\202\272", "ⴚ"},
+#line 785 "u8_lc_map.txt"
+ {"\342\260\251", "ⱙ"},
+#line 456 "u8_lc_map.txt"
+ {"\325\224", "ք"},
+#line 493 "u8_lc_map.txt"
+ {"\341\203\202", "ⴢ"},
+ {""},
+#line 269 "u8_lc_map.txt"
+ {"\317\254", "ϭ"},
+ {""}, {""}, {""}, {""},
+#line 595 "u8_lc_map.txt"
+ {"\341\273\214", "ọ"},
+#line 545 "u8_lc_map.txt"
+ {"\341\271\240", "ṡ"},
+ {""}, {""}, {""}, {""},
+#line 513 "u8_lc_map.txt"
+ {"\341\270\240", "ḡ"},
+#line 438 "u8_lc_map.txt"
+ {"\325\202", "ղ"},
+ {""},
+#line 155 "u8_lc_map.txt"
+ {"\306\263", "ƴ"},
+#line 705 "u8_lc_map.txt"
+ {"\341\277\232", "ὶ"},
+ {""},
+#line 698 "u8_lc_map.txt"
+ {"\341\277\210", "ὲ"},
+ {""}, {""},
+#line 904 "u8_lc_map.txt"
+ {"\352\234\272", "ꜻ"},
+#line 923 "u8_lc_map.txt"
+ {"\352\235\240", "ꝡ"},
+#line 592 "u8_lc_map.txt"
+ {"\341\273\206", "ệ"},
+ {""},
+#line 288 "u8_lc_map.txt"
+ {"\320\212", "њ"},
+ {""},
+#line 459 "u8_lc_map.txt"
+ {"\341\202\240", "ⴀ"},
+ {""}, {""}, {""},
+#line 332 "u8_lc_map.txt"
+ {"\321\254", "ѭ"},
+#line 576 "u8_lc_map.txt"
+ {"\341\272\246", "ầ"},
+#line 565 "u8_lc_map.txt"
+ {"\341\272\210", "ẉ"},
+#line 64 "u8_lc_map.txt"
+ {"\304\204", "ą"},
+ {""},
+#line 700 "u8_lc_map.txt"
+ {"\341\277\212", "ὴ"},
+ {""}, {""}, {""},
+#line 993 "u8_lc_map.txt"
+ {"\360\220\220\224", "𐐼"},
+#line 975 "u8_lc_map.txt"
+ {"\360\220\220\202", "𐐪"},
+ {""}, {""},
+#line 1009 "u8_lc_map.txt"
+ {"\360\220\220\244", "𐑌"},
+#line 98 "u8_lc_map.txt"
+ {"\305\212", "ŋ"},
+#line 855 "u8_lc_map.txt"
+ {"\342\263\242", "ⳣ"},
+#line 770 "u8_lc_map.txt"
+ {"\342\260\232", "ⱊ"},
+#line 782 "u8_lc_map.txt"
+ {"\342\260\246", "ⱖ"},
+#line 752 "u8_lc_map.txt"
+ {"\342\260\210", "ⰸ"},
+#line 199 "u8_lc_map.txt"
+ {"\310\236", "ȟ"},
+#line 566 "u8_lc_map.txt"
+ {"\341\272\212", "ẋ"},
+#line 211 "u8_lc_map.txt"
+ {"\310\273", "ȼ"},
+#line 192 "u8_lc_map.txt"
+ {"\310\220", "ȑ"},
+#line 258 "u8_lc_map.txt"
+ {"\316\253", "ϋ"},
+#line 205 "u8_lc_map.txt"
+ {"\310\252", "ȫ"},
+#line 823 "u8_lc_map.txt"
+ {"\342\262\242", "ⲣ"},
+ {""},
+#line 991 "u8_lc_map.txt"
+ {"\360\220\220\222", "𐐺"},
+ {""},
+#line 61 "u8_lc_map.txt"
+ {"\303\236", "þ"},
+#line 364 "u8_lc_map.txt"
+ {"\322\264", "ҵ"},
+#line 387 "u8_lc_map.txt"
+ {"\323\244", "ӥ"},
+#line 48 "u8_lc_map.txt"
+ {"\303\220", "ð"},
+ {""},
+#line 296 "u8_lc_map.txt"
+ {"\320\222", "в"},
+#line 492 "u8_lc_map.txt"
+ {"\341\203\201", "ⴡ"},
+#line 754 "u8_lc_map.txt"
+ {"\342\260\212", "ⰺ"},
+ {""}, {""}, {""},
+#line 150 "u8_lc_map.txt"
+ {"\306\254", "ƭ"},
+#line 553 "u8_lc_map.txt"
+ {"\341\271\260", "ṱ"},
+#line 286 "u8_lc_map.txt"
+ {"\320\210", "ј"},
+#line 218 "u8_lc_map.txt"
+ {"\311\206", "ɇ"},
+ {""},
+#line 88 "u8_lc_map.txt"
+ {"\304\264", "ĵ"},
+#line 521 "u8_lc_map.txt"
+ {"\341\270\260", "ḱ"},
+ {""},
+#line 187 "u8_lc_map.txt"
+ {"\310\206", "ȇ"},
+#line 989 "u8_lc_map.txt"
+ {"\360\220\220\220", "𐐸"},
+#line 695 "u8_lc_map.txt"
+ {"\341\276\272", "ὰ"},
+#line 703 "u8_lc_map.txt"
+ {"\341\277\230", "ῐ"},
+#line 238 "u8_lc_map.txt"
+ {"\316\226", "ζ"},
+ {""},
+#line 102 "u8_lc_map.txt"
+ {"\305\222", "œ"},
+ {""}, {""},
+#line 931 "u8_lc_map.txt"
+ {"\352\235\271", "ꝺ"},
+#line 38 "u8_lc_map.txt"
+ {"\303\206", "æ"},
+#line 260 "u8_lc_map.txt"
+ {"\317\232", "ϛ"},
+#line 829 "u8_lc_map.txt"
+ {"\342\262\256", "ⲯ"},
+#line 475 "u8_lc_map.txt"
+ {"\341\202\260", "ⴐ"},
+#line 484 "u8_lc_map.txt"
+ {"\341\202\271", "ⴙ"},
+ {""}, {""},
+#line 702 "u8_lc_map.txt"
+ {"\341\277\214", "ῃ"},
+#line 874 "u8_lc_map.txt"
+ {"\352\231\240", "ꙡ"},
+#line 856 "u8_lc_map.txt"
+ {"\342\263\253", "ⳬ"},
+ {""}, {""},
+#line 606 "u8_lc_map.txt"
+ {"\341\273\242", "ợ"},
+#line 940 "u8_lc_map.txt"
+ {"\352\236\215", "ɥ"},
+#line 411 "u8_lc_map.txt"
+ {"\324\224", "ԕ"},
+ {""},
+#line 222 "u8_lc_map.txt"
+ {"\311\216", "ɏ"},
+#line 853 "u8_lc_map.txt"
+ {"\342\263\236", "ⳟ"},
+#line 772 "u8_lc_map.txt"
+ {"\342\260\234", "ⱌ"},
+#line 974 "u8_lc_map.txt"
+ {"\360\220\220\201", "𐐩"},
+ {""},
+#line 191 "u8_lc_map.txt"
+ {"\310\216", "ȏ"},
+#line 567 "u8_lc_map.txt"
+ {"\341\272\214", "ẍ"},
+#line 724 "u8_lc_map.txt"
+ {"\342\222\274", "ⓖ"},
+#line 768 "u8_lc_map.txt"
+ {"\342\260\230", "ⱈ"},
+ {""},
+#line 261 "u8_lc_map.txt"
+ {"\317\234", "ϝ"},
+#line 821 "u8_lc_map.txt"
+ {"\342\262\236", "ⲟ"},
+ {""},
+#line 402 "u8_lc_map.txt"
+ {"\324\202", "ԃ"},
+ {""},
+#line 46 "u8_lc_map.txt"
+ {"\303\216", "î"},
+#line 476 "u8_lc_map.txt"
+ {"\341\202\261", "ⴑ"},
+ {""}, {""}, {""}, {""},
+#line 490 "u8_lc_map.txt"
+ {"\341\202\277", "ⴟ"},
+#line 756 "u8_lc_map.txt"
+ {"\342\260\214", "ⰼ"},
+#line 564 "u8_lc_map.txt"
+ {"\341\272\206", "ẇ"},
+ {""}, {""}, {""}, {""},
+#line 349 "u8_lc_map.txt"
+ {"\322\226", "җ"},
+ {""}, {""},
+#line 612 "u8_lc_map.txt"
+ {"\341\273\256", "ữ"},
+ {""},
+#line 715 "u8_lc_map.txt"
+ {"\341\277\273", "ώ"},
+ {""},
+#line 370 "u8_lc_map.txt"
+ {"\323\201", "ӂ"},
+#line 845 "u8_lc_map.txt"
+ {"\342\263\216", "ⳏ"},
+ {""}, {""},
+#line 750 "u8_lc_map.txt"
+ {"\342\260\206", "ⰶ"},
+#line 290 "u8_lc_map.txt"
+ {"\320\214", "ќ"},
+ {""},
+#line 314 "u8_lc_map.txt"
+ {"\320\244", "ф"},
+#line 73 "u8_lc_map.txt"
+ {"\304\226", "ė"},
+ {""},
+#line 246 "u8_lc_map.txt"
+ {"\316\236", "ξ"},
+#line 813 "u8_lc_map.txt"
+ {"\342\262\216", "ⲏ"},
+#line 832 "u8_lc_map.txt"
+ {"\342\262\264", "ⲵ"},
+ {""}, {""},
+#line 257 "u8_lc_map.txt"
+ {"\316\252", "ϊ"},
+#line 680 "u8_lc_map.txt"
+ {"\341\276\233", "ᾓ"},
+ {""}, {""}, {""},
+#line 423 "u8_lc_map.txt"
+ {"\324\263", "գ"},
+#line 604 "u8_lc_map.txt"
+ {"\341\273\236", "ở"},
+ {""}, {""}, {""},
+#line 99 "u8_lc_map.txt"
+ {"\305\214", "ō"},
+#line 549 "u8_lc_map.txt"
+ {"\341\271\250", "ṩ"},
+#line 111 "u8_lc_map.txt"
+ {"\305\244", "ť"},
+ {""}, {""}, {""},
+#line 517 "u8_lc_map.txt"
+ {"\341\270\250", "ḩ"},
+ {""},
+#line 999 "u8_lc_map.txt"
+ {"\360\220\220\232", "𐑂"},
+#line 1011 "u8_lc_map.txt"
+ {"\360\220\220\246", "𐑎"},
+#line 981 "u8_lc_map.txt"
+ {"\360\220\220\210", "𐐰"},
+#line 462 "u8_lc_map.txt"
+ {"\341\202\243", "ⴃ"},
+ {""},
+#line 694 "u8_lc_map.txt"
+ {"\341\276\271", "ᾱ"},
+#line 226 "u8_lc_map.txt"
+ {"\316\206", "ά"},
+ {""},
+#line 927 "u8_lc_map.txt"
+ {"\352\235\250", "ꝩ"},
+ {""}, {""}, {""},
+#line 142 "u8_lc_map.txt"
+ {"\306\234", "ɯ"},
+#line 467 "u8_lc_map.txt"
+ {"\341\202\250", "ⴈ"},
+#line 759 "u8_lc_map.txt"
+ {"\342\260\217", "ⰿ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 983 "u8_lc_map.txt"
+ {"\360\220\220\212", "𐐲"},
+ {""}, {""},
+#line 596 "u8_lc_map.txt"
+ {"\341\273\216", "ỏ"},
+#line 615 "u8_lc_map.txt"
+ {"\341\273\264", "ỵ"},
+ {""}, {""},
+#line 353 "u8_lc_map.txt"
+ {"\322\236", "ҟ"},
+#line 175 "u8_lc_map.txt"
+ {"\307\254", "ǭ"},
+#line 323 "u8_lc_map.txt"
+ {"\320\255", "э"},
+#line 346 "u8_lc_map.txt"
+ {"\322\220", "ґ"},
+ {""},
+#line 359 "u8_lc_map.txt"
+ {"\322\252", "ҫ"},
+#line 574 "u8_lc_map.txt"
+ {"\341\272\242", "ả"},
+ {""},
+#line 666 "u8_lc_map.txt"
+ {"\341\275\255", "ὥ"},
+#line 464 "u8_lc_map.txt"
+ {"\341\202\245", "ⴅ"},
+#line 231 "u8_lc_map.txt"
+ {"\316\216", "ύ"},
+#line 896 "u8_lc_map.txt"
+ {"\352\234\250", "ꜩ"},
+ {""},
+#line 937 "u8_lc_map.txt"
+ {"\352\236\204", "ꞅ"},
+ {""},
+#line 77 "u8_lc_map.txt"
+ {"\304\236", "ğ"},
+#line 640 "u8_lc_map.txt"
+ {"\341\274\255", "ἥ"},
+#line 91 "u8_lc_map.txt"
+ {"\304\273", "ļ"},
+#line 70 "u8_lc_map.txt"
+ {"\304\220", "đ"},
+ {""},
+#line 83 "u8_lc_map.txt"
+ {"\304\252", "ī"},
+#line 672 "u8_lc_map.txt"
+ {"\341\276\213", "ᾃ"},
+#line 778 "u8_lc_map.txt"
+ {"\342\260\242", "ⱒ"},
+ {""}, {""},
+#line 279 "u8_lc_map.txt"
+ {"\320\201", "ё"},
+#line 395 "u8_lc_map.txt"
+ {"\323\264", "ӵ"},
+#line 466 "u8_lc_map.txt"
+ {"\341\202\247", "ⴇ"},
+ {""}, {""}, {""},
+#line 557 "u8_lc_map.txt"
+ {"\341\271\270", "ṹ"},
+#line 554 "u8_lc_map.txt"
+ {"\341\271\262", "ṳ"},
+#line 1001 "u8_lc_map.txt"
+ {"\360\220\220\234", "𐑄"},
+ {""}, {""},
+#line 525 "u8_lc_map.txt"
+ {"\341\270\270", "ḹ"},
+#line 522 "u8_lc_map.txt"
+ {"\341\270\262", "ḳ"},
+#line 665 "u8_lc_map.txt"
+ {"\341\275\254", "ὤ"},
+#line 997 "u8_lc_map.txt"
+ {"\360\220\220\230", "𐑀"},
+#line 131 "u8_lc_map.txt"
+ {"\306\212", "ɗ"},
+#line 580 "u8_lc_map.txt"
+ {"\341\272\256", "ắ"},
+#line 90 "u8_lc_map.txt"
+ {"\304\271", "ĺ"},
+#line 710 "u8_lc_map.txt"
+ {"\341\277\253", "ύ"},
+#line 65 "u8_lc_map.txt"
+ {"\304\206", "ć"},
+#line 94 "u8_lc_map.txt"
+ {"\305\201", "ł"},
+#line 639 "u8_lc_map.txt"
+ {"\341\274\254", "ἤ"},
+ {""},
+#line 849 "u8_lc_map.txt"
+ {"\342\263\226", "ⳗ"},
+ {""}, {""},
+#line 483 "u8_lc_map.txt"
+ {"\341\202\270", "ⴘ"},
+#line 477 "u8_lc_map.txt"
+ {"\341\202\262", "ⴒ"},
+#line 985 "u8_lc_map.txt"
+ {"\360\220\220\214", "𐐴"},
+ {""}, {""},
+#line 878 "u8_lc_map.txt"
+ {"\352\231\250", "ꙩ"},
+#line 790 "u8_lc_map.txt"
+ {"\342\260\256", "ⱞ"},
+#line 817 "u8_lc_map.txt"
+ {"\342\262\226", "ⲗ"},
+ {""},
+#line 345 "u8_lc_map.txt"
+ {"\322\216", "ҏ"},
+#line 209 "u8_lc_map.txt"
+ {"\310\262", "ȳ"},
+#line 256 "u8_lc_map.txt"
+ {"\316\251", "ω"},
+ {""}, {""}, {""},
+#line 572 "u8_lc_map.txt"
+ {"\341\272\236", "ß"},
+#line 208 "u8_lc_map.txt"
+ {"\310\260", "ȱ"},
+#line 840 "u8_lc_map.txt"
+ {"\342\263\204", "ⳅ"},
+#line 282 "u8_lc_map.txt"
+ {"\320\204", "є"},
+#line 979 "u8_lc_map.txt"
+ {"\360\220\220\206", "𐐮"},
+#line 685 "u8_lc_map.txt"
+ {"\341\276\250", "ᾠ"},
+ {""},
+#line 663 "u8_lc_map.txt"
+ {"\341\275\252", "ὢ"},
+#line 787 "u8_lc_map.txt"
+ {"\342\260\253", "ⱛ"},
+#line 69 "u8_lc_map.txt"
+ {"\304\216", "ď"},
+#line 903 "u8_lc_map.txt"
+ {"\352\234\270", "ꜹ"},
+#line 900 "u8_lc_map.txt"
+ {"\352\234\262", "ꜳ"},
+#line 808 "u8_lc_map.txt"
+ {"\342\262\204", "ⲅ"},
+ {""},
+#line 446 "u8_lc_map.txt"
+ {"\325\212", "պ"},
+#line 637 "u8_lc_map.txt"
+ {"\341\274\252", "ἢ"},
+#line 774 "u8_lc_map.txt"
+ {"\342\260\236", "ⱎ"},
+#line 662 "u8_lc_map.txt"
+ {"\341\275\251", "ὡ"},
+ {""},
+#line 217 "u8_lc_map.txt"
+ {"\311\205", "ʌ"},
+ {""},
+#line 647 "u8_lc_map.txt"
+ {"\341\274\274", "ἴ"},
+#line 723 "u8_lc_map.txt"
+ {"\342\222\273", "ⓕ"},
+ {""},
+#line 56 "u8_lc_map.txt"
+ {"\303\231", "ù"},
+#line 636 "u8_lc_map.txt"
+ {"\341\274\251", "ἡ"},
+#line 265 "u8_lc_map.txt"
+ {"\317\244", "ϥ"},
+ {""}, {""}, {""},
+#line 678 "u8_lc_map.txt"
+ {"\341\276\231", "ᾑ"},
+ {""},
+#line 380 "u8_lc_map.txt"
+ {"\323\226", "ӗ"},
+ {""},
+#line 37 "u8_lc_map.txt"
+ {"\303\205", "å"},
+#line 568 "u8_lc_map.txt"
+ {"\341\272\216", "ẏ"},
+#line 583 "u8_lc_map.txt"
+ {"\341\272\264", "ẵ"},
+#line 600 "u8_lc_map.txt"
+ {"\341\273\226", "ỗ"},
+#line 529 "u8_lc_map.txt"
+ {"\341\271\200", "ṁ"},
+#line 414 "u8_lc_map.txt"
+ {"\324\232", "ԛ"},
+#line 560 "u8_lc_map.txt"
+ {"\341\271\276", "ṿ"},
+#line 556 "u8_lc_map.txt"
+ {"\341\271\266", "ṷ"},
+ {""},
+#line 497 "u8_lc_map.txt"
+ {"\341\270\200", "ḁ"},
+#line 250 "u8_lc_map.txt"
+ {"\316\243", "σ"},
+#line 528 "u8_lc_map.txt"
+ {"\341\270\276", "ḿ"},
+#line 524 "u8_lc_map.txt"
+ {"\341\270\266", "ḷ"},
+#line 988 "u8_lc_map.txt"
+ {"\360\220\220\217", "𐐷"},
+ {""}, {""},
+#line 60 "u8_lc_map.txt"
+ {"\303\235", "ý"},
+#line 758 "u8_lc_map.txt"
+ {"\342\260\216", "ⰾ"},
+#line 684 "u8_lc_map.txt"
+ {"\341\276\237", "ᾗ"},
+#line 907 "u8_lc_map.txt"
+ {"\352\235\200", "ꝁ"},
+#line 454 "u8_lc_map.txt"
+ {"\325\222", "ւ"},
+#line 934 "u8_lc_map.txt"
+ {"\352\235\276", "ꝿ"},
+#line 328 "u8_lc_map.txt"
+ {"\321\244", "ѥ"},
+#line 591 "u8_lc_map.txt"
+ {"\341\273\204", "ễ"},
+ {""}, {""},
+#line 489 "u8_lc_map.txt"
+ {"\341\202\276", "ⴞ"},
+#line 481 "u8_lc_map.txt"
+ {"\341\202\266", "ⴖ"},
+#line 444 "u8_lc_map.txt"
+ {"\325\210", "ո"},
+ {""},
+#line 415 "u8_lc_map.txt"
+ {"\324\234", "ԝ"},
+#line 119 "u8_lc_map.txt"
+ {"\305\264", "ŵ"},
+#line 761 "u8_lc_map.txt"
+ {"\342\260\221", "ⱁ"},
+#line 757 "u8_lc_map.txt"
+ {"\342\260\215", "ⰽ"},
+ {""},
+#line 651 "u8_lc_map.txt"
+ {"\341\275\210", "ὀ"},
+#line 693 "u8_lc_map.txt"
+ {"\341\276\270", "ᾰ"},
+ {""}, {""}, {""}, {""},
+#line 631 "u8_lc_map.txt"
+ {"\341\274\232", "ἒ"},
+#line 460 "u8_lc_map.txt"
+ {"\341\202\241", "ⴁ"},
+#line 621 "u8_lc_map.txt"
+ {"\341\274\210", "ἀ"},
+ {""}, {""}, {""}, {""},
+#line 1007 "u8_lc_map.txt"
+ {"\360\220\220\242", "𐑊"},
+ {""},
+#line 184 "u8_lc_map.txt"
+ {"\310\200", "ȁ"},
+#line 906 "u8_lc_map.txt"
+ {"\352\234\276", "ꜿ"},
+#line 902 "u8_lc_map.txt"
+ {"\352\234\266", "ꜷ"},
+#line 653 "u8_lc_map.txt"
+ {"\341\275\212", "ὂ"},
+#line 321 "u8_lc_map.txt"
+ {"\320\253", "ы"},
+ {""},
+#line 670 "u8_lc_map.txt"
+ {"\341\276\211", "ᾁ"},
+#line 942 "u8_lc_map.txt"
+ {"\352\236\240", "ꞡ"},
+ {""}, {""},
+#line 32 "u8_lc_map.txt"
+ {"\303\200", "à"},
+#line 623 "u8_lc_map.txt"
+ {"\341\274\212", "ἂ"},
+#line 147 "u8_lc_map.txt"
+ {"\306\244", "ƥ"},
+ {""}, {""},
+#line 384 "u8_lc_map.txt"
+ {"\323\236", "ӟ"},
+#line 474 "u8_lc_map.txt"
+ {"\341\202\257", "ⴏ"},
+ {""},
+#line 377 "u8_lc_map.txt"
+ {"\323\220", "ӑ"},
+ {""},
+#line 390 "u8_lc_map.txt"
+ {"\323\252", "ӫ"},
+#line 196 "u8_lc_map.txt"
+ {"\310\230", "ș"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 241 "u8_lc_map.txt"
+ {"\316\231", "ι"},
+#line 55 "u8_lc_map.txt"
+ {"\303\230", "ø"},
+ {""},
+#line 300 "u8_lc_map.txt"
+ {"\320\226", "ж"},
+#line 881 "u8_lc_map.txt"
+ {"\352\232\200", "ꚁ"},
+#line 406 "u8_lc_map.txt"
+ {"\324\212", "ԋ"},
+ {""},
+#line 765 "u8_lc_map.txt"
+ {"\342\260\225", "ⱅ"},
+ {""}, {""},
+#line 366 "u8_lc_map.txt"
+ {"\322\270", "ҹ"},
+#line 835 "u8_lc_map.txt"
+ {"\342\262\272", "ⲻ"},
+#line 749 "u8_lc_map.txt"
+ {"\342\260\205", "ⰵ"},
+ {""},
+#line 858 "u8_lc_map.txt"
+ {"\352\231\200", "ꙁ"},
+ {""}, {""},
+#line 682 "u8_lc_map.txt"
+ {"\341\276\235", "ᾕ"},
+ {""}, {""},
+#line 448 "u8_lc_map.txt"
+ {"\325\214", "ռ"},
+#line 633 "u8_lc_map.txt"
+ {"\341\274\234", "ἔ"},
+ {""},
+#line 104 "u8_lc_map.txt"
+ {"\305\226", "ŗ"},
+ {""}, {""},
+#line 245 "u8_lc_map.txt"
+ {"\316\235", "ν"},
+#line 629 "u8_lc_map.txt"
+ {"\341\274\230", "ἐ"},
+#line 1003 "u8_lc_map.txt"
+ {"\360\220\220\236", "𐑆"},
+ {""}, {""},
+#line 363 "u8_lc_map.txt"
+ {"\322\262", "ҳ"},
+#line 854 "u8_lc_map.txt"
+ {"\342\263\240", "ⳡ"},
+#line 655 "u8_lc_map.txt"
+ {"\341\275\214", "ὄ"},
+ {""},
+#line 213 "u8_lc_map.txt"
+ {"\310\276", "ⱦ"},
+ {""},
+#line 362 "u8_lc_map.txt"
+ {"\322\260", "ұ"},
+ {""}, {""}, {""},
+#line 625 "u8_lc_map.txt"
+ {"\341\274\214", "ἄ"},
+#line 822 "u8_lc_map.txt"
+ {"\342\262\240", "ⲡ"},
+ {""},
+#line 766 "u8_lc_map.txt"
+ {"\342\260\226", "ⱆ"},
+#line 410 "u8_lc_map.txt"
+ {"\324\222", "ԓ"},
+#line 87 "u8_lc_map.txt"
+ {"\304\262", "ĳ"},
+#line 58 "u8_lc_map.txt"
+ {"\303\233", "û"},
+#line 563 "u8_lc_map.txt"
+ {"\341\272\204", "ẅ"},
+ {""}, {""}, {""},
+#line 86 "u8_lc_map.txt"
+ {"\304\260", "i"},
+#line 405 "u8_lc_map.txt"
+ {"\324\210", "ԉ"},
+ {""}, {""},
+#line 618 "u8_lc_map.txt"
+ {"\341\273\272", "ỻ"},
+ {""}, {""}, {""},
+#line 125 "u8_lc_map.txt"
+ {"\306\201", "ɓ"},
+#line 368 "u8_lc_map.txt"
+ {"\322\274", "ҽ"},
+ {""},
+#line 987 "u8_lc_map.txt"
+ {"\360\220\220\216", "𐐶"},
+#line 748 "u8_lc_map.txt"
+ {"\342\260\204", "ⰴ"},
+ {""}, {""},
+#line 203 "u8_lc_map.txt"
+ {"\310\246", "ȧ"},
+ {""}, {""},
+#line 308 "u8_lc_map.txt"
+ {"\320\236", "о"},
+#line 692 "u8_lc_map.txt"
+ {"\341\276\257", "ᾧ"},
+#line 751 "u8_lc_map.txt"
+ {"\342\260\207", "ⰷ"},
+#line 294 "u8_lc_map.txt"
+ {"\320\220", "а"},
+ {""},
+#line 320 "u8_lc_map.txt"
+ {"\320\252", "ъ"},
+#line 271 "u8_lc_map.txt"
+ {"\317\264", "θ"},
+ {""},
+#line 990 "u8_lc_map.txt"
+ {"\360\220\220\221", "𐐹"},
+#line 986 "u8_lc_map.txt"
+ {"\360\220\220\215", "𐐵"},
+ {""}, {""}, {""},
+#line 646 "u8_lc_map.txt"
+ {"\341\274\273", "ἳ"},
+ {""}, {""},
+#line 939 "u8_lc_map.txt"
+ {"\352\236\213", "ꞌ"},
+#line 605 "u8_lc_map.txt"
+ {"\341\273\240", "ỡ"},
+ {""}, {""},
+#line 108 "u8_lc_map.txt"
+ {"\305\236", "ş"},
+#line 240 "u8_lc_map.txt"
+ {"\316\230", "θ"},
+#line 123 "u8_lc_map.txt"
+ {"\305\273", "ż"},
+#line 101 "u8_lc_map.txt"
+ {"\305\220", "ő"},
+ {""},
+#line 114 "u8_lc_map.txt"
+ {"\305\252", "ū"},
+#line 496 "u8_lc_map.txt"
+ {"\341\203\205", "ⴥ"},
+ {""}, {""},
+#line 284 "u8_lc_map.txt"
+ {"\320\206", "і"},
+#line 437 "u8_lc_map.txt"
+ {"\325\201", "ձ"},
+#line 628 "u8_lc_map.txt"
+ {"\341\274\217", "ἇ"},
+ {""}, {""},
+#line 127 "u8_lc_map.txt"
+ {"\306\204", "ƅ"},
+ {""},
+#line 336 "u8_lc_map.txt"
+ {"\321\264", "ѵ"},
+#line 830 "u8_lc_map.txt"
+ {"\342\262\260", "ⲱ"},
+#line 725 "u8_lc_map.txt"
+ {"\342\222\275", "ⓗ"},
+ {""}, {""}, {""},
+#line 171 "u8_lc_map.txt"
+ {"\307\244", "ǥ"},
+ {""}, {""}, {""}, {""},
+#line 122 "u8_lc_map.txt"
+ {"\305\271", "ź"},
+ {""}, {""},
+#line 342 "u8_lc_map.txt"
+ {"\322\200", "ҁ"},
+ {""},
+#line 47 "u8_lc_map.txt"
+ {"\303\217", "ï"},
+ {""}, {""},
+#line 407 "u8_lc_map.txt"
+ {"\324\214", "ԍ"},
+ {""},
+#line 419 "u8_lc_map.txt"
+ {"\324\244", "ԥ"},
+ {""}, {""},
+#line 292 "u8_lc_map.txt"
+ {"\320\216", "ў"},
+ {""}, {""},
+#line 994 "u8_lc_map.txt"
+ {"\360\220\220\225", "𐐽"},
+ {""},
+#line 62 "u8_lc_map.txt"
+ {"\304\200", "ā"},
+#line 946 "u8_lc_map.txt"
+ {"\352\236\250", "ꞩ"},
+#line 243 "u8_lc_map.txt"
+ {"\316\233", "λ"},
+#line 978 "u8_lc_map.txt"
+ {"\360\220\220\205", "𐐭"},
+ {""}, {""},
+#line 350 "u8_lc_map.txt"
+ {"\322\230", "ҙ"},
+ {""},
+#line 794 "u8_lc_map.txt"
+ {"\342\261\244", "ɽ"},
+#line 440 "u8_lc_map.txt"
+ {"\325\204", "մ"},
+ {""},
+#line 714 "u8_lc_map.txt"
+ {"\341\277\272", "ὼ"},
+#line 798 "u8_lc_map.txt"
+ {"\342\261\255", "ɑ"},
+#line 495 "u8_lc_map.txt"
+ {"\341\203\204", "ⴤ"},
+ {""},
+#line 100 "u8_lc_map.txt"
+ {"\305\216", "ŏ"},
+ {""},
+#line 613 "u8_lc_map.txt"
+ {"\341\273\260", "ự"},
+ {""}, {""}, {""},
+#line 74 "u8_lc_map.txt"
+ {"\304\230", "ę"},
+ {""}, {""}, {""}, {""},
+#line 586 "u8_lc_map.txt"
+ {"\341\272\272", "ẻ"},
+#line 719 "u8_lc_map.txt"
+ {"\342\222\267", "ⓑ"},
+#line 667 "u8_lc_map.txt"
+ {"\341\275\256", "ὦ"},
+ {""},
+#line 210 "u8_lc_map.txt"
+ {"\310\272", "ⱥ"},
+#line 201 "u8_lc_map.txt"
+ {"\310\242", "ȣ"},
+#line 253 "u8_lc_map.txt"
+ {"\316\246", "φ"},
+ {""},
+#line 730 "u8_lc_map.txt"
+ {"\342\223\202", "ⓜ"},
+#line 995 "u8_lc_map.txt"
+ {"\360\220\220\226", "𐐾"},
+#line 641 "u8_lc_map.txt"
+ {"\341\274\256", "ἦ"},
+#line 950 "u8_lc_map.txt"
+ {"\357\274\244", "ｄ"},
+ {""}, {""},
+#line 397 "u8_lc_map.txt"
+ {"\323\270", "ӹ"},
+#line 959 "u8_lc_map.txt"
+ {"\357\274\255", "ｍ"},
+ {""}, {""}, {""},
+#line 664 "u8_lc_map.txt"
+ {"\341\275\253", "ὣ"},
+ {""},
+#line 319 "u8_lc_map.txt"
+ {"\320\251", "щ"},
+ {""}, {""},
+#line 369 "u8_lc_map.txt"
+ {"\322\276", "ҿ"},
+ {""}, {""},
+#line 638 "u8_lc_map.txt"
+ {"\341\274\253", "ἣ"},
+ {""},
+#line 977 "u8_lc_map.txt"
+ {"\360\220\220\204", "𐐬"},
+ {""},
+#line 573 "u8_lc_map.txt"
+ {"\341\272\240", "ạ"},
+ {""},
+#line 747 "u8_lc_map.txt"
+ {"\342\260\203", "ⰳ"},
+ {""},
+#line 394 "u8_lc_map.txt"
+ {"\323\262", "ӳ"},
+#line 763 "u8_lc_map.txt"
+ {"\342\260\223", "ⱃ"},
+#line 980 "u8_lc_map.txt"
+ {"\360\220\220\207", "𐐯"},
+ {""}, {""},
+#line 826 "u8_lc_map.txt"
+ {"\342\262\250", "ⲩ"},
+#line 393 "u8_lc_map.txt"
+ {"\323\260", "ӱ"},
+ {""}, {""}, {""},
+#line 958 "u8_lc_map.txt"
+ {"\357\274\254", "ｌ"},
+ {""},
+#line 776 "u8_lc_map.txt"
+ {"\342\260\240", "ⱐ"},
+ {""}, {""}, {""},
+#line 232 "u8_lc_map.txt"
+ {"\316\217", "ώ"},
+ {""}, {""},
+#line 262 "u8_lc_map.txt"
+ {"\317\236", "ϟ"},
+#line 965 "u8_lc_map.txt"
+ {"\357\274\263", "ｓ"},
+#line 357 "u8_lc_map.txt"
+ {"\322\246", "ҧ"},
+#line 139 "u8_lc_map.txt"
+ {"\306\226", "ɩ"},
+ {""},
+#line 268 "u8_lc_map.txt"
+ {"\317\252", "ϫ"},
+#line 706 "u8_lc_map.txt"
+ {"\341\277\233", "ί"},
+#line 796 "u8_lc_map.txt"
+ {"\342\261\251", "ⱪ"},
+ {""}, {""},
+#line 372 "u8_lc_map.txt"
+ {"\323\205", "ӆ"},
+#line 399 "u8_lc_map.txt"
+ {"\323\274", "ӽ"},
+ {""}, {""}, {""},
+#line 313 "u8_lc_map.txt"
+ {"\320\243", "у"},
+#line 627 "u8_lc_map.txt"
+ {"\341\274\216", "ἆ"},
+#line 81 "u8_lc_map.txt"
+ {"\304\246", "ħ"},
+ {""}, {""}, {""},
+#line 729 "u8_lc_map.txt"
+ {"\342\223\201", "ⓛ"},
+ {""}, {""},
+#line 656 "u8_lc_map.txt"
+ {"\341\275\215", "ὅ"},
+ {""},
+#line 956 "u8_lc_map.txt"
+ {"\357\274\252", "ｊ"},
+#line 273 "u8_lc_map.txt"
+ {"\317\271", "ϲ"},
+#line 713 "u8_lc_map.txt"
+ {"\341\277\271", "ό"},
+#line 717 "u8_lc_map.txt"
+ {"\342\204\262", "ⅎ"},
+ {""},
+#line 609 "u8_lc_map.txt"
+ {"\341\273\250", "ứ"},
+#line 626 "u8_lc_map.txt"
+ {"\341\274\215", "ἅ"},
+ {""},
+#line 403 "u8_lc_map.txt"
+ {"\324\204", "ԅ"},
+#line 331 "u8_lc_map.txt"
+ {"\321\252", "ѫ"},
+#line 955 "u8_lc_map.txt"
+ {"\357\274\251", "ｉ"},
+#line 771 "u8_lc_map.txt"
+ {"\342\260\233", "ⱋ"},
+ {""}, {""}, {""}, {""},
+#line 581 "u8_lc_map.txt"
+ {"\341\272\260", "ằ"},
+#line 458 "u8_lc_map.txt"
+ {"\325\226", "ֆ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 834 "u8_lc_map.txt"
+ {"\342\262\270", "ⲹ"},
+#line 831 "u8_lc_map.txt"
+ {"\342\262\262", "ⲳ"},
+ {""}, {""},
+#line 39 "u8_lc_map.txt"
+ {"\303\207", "ç"},
+ {""}, {""}, {""},
+#line 935 "u8_lc_map.txt"
+ {"\352\236\200", "ꞁ"},
+#line 207 "u8_lc_map.txt"
+ {"\310\256", "ȯ"},
+#line 177 "u8_lc_map.txt"
+ {"\307\264", "ǵ"},
+#line 215 "u8_lc_map.txt"
+ {"\311\203", "ƀ"},
+#line 494 "u8_lc_map.txt"
+ {"\341\203\203", "ⴣ"},
+#line 212 "u8_lc_map.txt"
+ {"\310\275", "ƚ"},
+#line 121 "u8_lc_map.txt"
+ {"\305\270", "ÿ"},
+ {""}, {""},
+#line 648 "u8_lc_map.txt"
+ {"\341\274\275", "ἵ"},
+ {""}, {""},
+#line 701 "u8_lc_map.txt"
+ {"\341\277\213", "ή"},
+ {""},
+#line 135 "u8_lc_map.txt"
+ {"\306\220", "ɛ"},
+ {""}, {""},
+#line 424 "u8_lc_map.txt"
+ {"\324\264", "դ"},
+#line 35 "u8_lc_map.txt"
+ {"\303\203", "ã"},
+ {""}, {""}, {""},
+#line 722 "u8_lc_map.txt"
+ {"\342\222\272", "ⓔ"},
+#line 767 "u8_lc_map.txt"
+ {"\342\260\227", "ⱇ"},
+#line 53 "u8_lc_map.txt"
+ {"\303\225", "õ"},
+ {""},
+#line 303 "u8_lc_map.txt"
+ {"\320\231", "й"},
+#line 118 "u8_lc_map.txt"
+ {"\305\262", "ų"},
+#line 952 "u8_lc_map.txt"
+ {"\357\274\246", "ｆ"},
+#line 736 "u8_lc_map.txt"
+ {"\342\223\210", "ⓢ"},
+ {""}, {""},
+#line 381 "u8_lc_map.txt"
+ {"\323\230", "ә"},
+#line 117 "u8_lc_map.txt"
+ {"\305\260", "ű"},
+ {""}, {""},
+#line 283 "u8_lc_map.txt"
+ {"\320\205", "ѕ"},
+#line 617 "u8_lc_map.txt"
+ {"\341\273\270", "ỹ"},
+#line 614 "u8_lc_map.txt"
+ {"\341\273\262", "ỳ"},
+ {""},
+#line 128 "u8_lc_map.txt"
+ {"\306\206", "ɔ"},
+#line 367 "u8_lc_map.txt"
+ {"\322\272", "һ"},
+#line 355 "u8_lc_map.txt"
+ {"\322\242", "ң"},
+#line 755 "u8_lc_map.txt"
+ {"\342\260\213", "ⰻ"},
+ {""}, {""},
+#line 976 "u8_lc_map.txt"
+ {"\360\220\220\203", "𐐫"},
+#line 738 "u8_lc_map.txt"
+ {"\342\223\212", "ⓤ"},
+ {""},
+#line 992 "u8_lc_map.txt"
+ {"\360\220\220\223", "𐐻"},
+ {""}, {""},
+#line 307 "u8_lc_map.txt"
+ {"\320\235", "н"},
+ {""},
+#line 452 "u8_lc_map.txt"
+ {"\325\220", "ր"},
+#line 838 "u8_lc_map.txt"
+ {"\342\263\200", "ⳁ"},
+#line 96 "u8_lc_map.txt"
+ {"\305\205", "ņ"},
+#line 79 "u8_lc_map.txt"
+ {"\304\242", "ģ"},
+ {""}, {""},
+#line 1005 "u8_lc_map.txt"
+ {"\360\220\220\240", "𐑈"},
+ {""},
+#line 707 "u8_lc_map.txt"
+ {"\341\277\250", "ῠ"},
+ {""}, {""},
+#line 806 "u8_lc_map.txt"
+ {"\342\262\200", "ⲁ"},
+ {""},
+#line 837 "u8_lc_map.txt"
+ {"\342\262\276", "ⲿ"},
+#line 833 "u8_lc_map.txt"
+ {"\342\262\266", "ⲷ"},
+ {""}, {""},
+#line 133 "u8_lc_map.txt"
+ {"\306\216", "ǝ"},
+ {""},
+#line 45 "u8_lc_map.txt"
+ {"\303\215", "í"},
+ {""}, {""},
+#line 400 "u8_lc_map.txt"
+ {"\323\276", "ӿ"},
+#line 577 "u8_lc_map.txt"
+ {"\341\272\250", "ẩ"},
+ {""}, {""},
+#line 442 "u8_lc_map.txt"
+ {"\325\206", "ն"},
+ {""}, {""},
+#line 779 "u8_lc_map.txt"
+ {"\342\260\243", "ⱓ"},
+ {""}, {""}, {""},
+#line 704 "u8_lc_map.txt"
+ {"\341\277\231", "ῑ"},
+ {""},
+#line 412 "u8_lc_map.txt"
+ {"\324\226", "ԗ"},
+ {""}, {""}, {""},
+#line 784 "u8_lc_map.txt"
+ {"\342\260\250", "ⱘ"},
+ {""}, {""},
+#line 278 "u8_lc_map.txt"
+ {"\320\200", "ѐ"},
+ {""},
+#line 200 "u8_lc_map.txt"
+ {"\310\240", "ƞ"},
+ {""}, {""}, {""},
+#line 49 "u8_lc_map.txt"
+ {"\303\221", "ñ"},
+ {""},
+#line 1000 "u8_lc_map.txt"
+ {"\360\220\220\233", "𐑃"},
+ {""}, {""},
+#line 740 "u8_lc_map.txt"
+ {"\342\223\214", "ⓦ"},
+#line 388 "u8_lc_map.txt"
+ {"\323\246", "ӧ"},
+ {""},
+#line 589 "u8_lc_map.txt"
+ {"\341\273\200", "ề"},
+#line 450 "u8_lc_map.txt"
+ {"\325\216", "վ"},
+#line 620 "u8_lc_map.txt"
+ {"\341\273\276", "ỿ"},
+#line 616 "u8_lc_map.txt"
+ {"\341\273\266", "ỷ"},
+#line 237 "u8_lc_map.txt"
+ {"\316\225", "ε"},
+ {""},
+#line 781 "u8_lc_map.txt"
+ {"\342\260\245", "ⱕ"},
+#line 302 "u8_lc_map.txt"
+ {"\320\230", "и"},
+#line 769 "u8_lc_map.txt"
+ {"\342\260\231", "ⱉ"},
+#line 721 "u8_lc_map.txt"
+ {"\342\222\271", "ⓓ"},
+ {""}, {""}, {""},
+#line 149 "u8_lc_map.txt"
+ {"\306\251", "ʃ"},
+#line 734 "u8_lc_map.txt"
+ {"\342\223\206", "ⓠ"},
+ {""}, {""},
+#line 712 "u8_lc_map.txt"
+ {"\341\277\270", "ὸ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 783 "u8_lc_map.txt"
+ {"\342\260\247", "ⱗ"},
+ {""}, {""},
+#line 105 "u8_lc_map.txt"
+ {"\305\230", "ř"},
+ {""},
+#line 252 "u8_lc_map.txt"
+ {"\316\245", "υ"},
+#line 775 "u8_lc_map.txt"
+ {"\342\260\237", "ⱏ"},
+#line 168 "u8_lc_map.txt"
+ {"\307\236", "ǟ"},
+#line 585 "u8_lc_map.txt"
+ {"\341\272\270", "ẹ"},
+#line 582 "u8_lc_map.txt"
+ {"\341\272\262", "ẳ"},
+ {""}, {""},
+#line 174 "u8_lc_map.txt"
+ {"\307\252", "ǫ"},
+#line 699 "u8_lc_map.txt"
+ {"\341\277\211", "έ"},
+ {""},
+#line 996 "u8_lc_map.txt"
+ {"\360\220\220\227", "𐐿"},
+ {""},
+#line 361 "u8_lc_map.txt"
+ {"\322\256", "ү"},
+#line 727 "u8_lc_map.txt"
+ {"\342\222\277", "ⓙ"},
+ {""}, {""}, {""},
+#line 416 "u8_lc_map.txt"
+ {"\324\236", "ԟ"},
+ {""},
+#line 431 "u8_lc_map.txt"
+ {"\324\273", "ի"},
+#line 409 "u8_lc_map.txt"
+ {"\324\220", "ԑ"},
+ {""},
+#line 338 "u8_lc_map.txt"
+ {"\321\270", "ѹ"},
+ {""},
+#line 305 "u8_lc_map.txt"
+ {"\320\233", "л"},
+ {""}, {""},
+#line 85 "u8_lc_map.txt"
+ {"\304\256", "į"},
+#line 743 "u8_lc_map.txt"
+ {"\342\223\217", "ⓩ"},
+#line 254 "u8_lc_map.txt"
+ {"\316\247", "χ"},
+#line 984 "u8_lc_map.txt"
+ {"\360\220\220\213", "𐐳"},
+#line 92 "u8_lc_map.txt"
+ {"\304\275", "ľ"},
+#line 93 "u8_lc_map.txt"
+ {"\304\277", "ŀ"},
+ {""},
+#line 792 "u8_lc_map.txt"
+ {"\342\261\242", "ɫ"},
+ {""}, {""}, {""}, {""},
+#line 753 "u8_lc_map.txt"
+ {"\342\260\211", "ⰹ"},
+ {""}, {""},
+#line 51 "u8_lc_map.txt"
+ {"\303\223", "ó"},
+#line 335 "u8_lc_map.txt"
+ {"\321\262", "ѳ"},
+#line 429 "u8_lc_map.txt"
+ {"\324\271", "թ"},
+ {""},
+#line 404 "u8_lc_map.txt"
+ {"\324\206", "ԇ"},
+ {""}, {""},
+#line 334 "u8_lc_map.txt"
+ {"\321\260", "ѱ"},
+ {""}, {""}, {""},
+#line 233 "u8_lc_map.txt"
+ {"\316\221", "α"},
+#line 316 "u8_lc_map.txt"
+ {"\320\246", "ц"},
+ {""}, {""},
+#line 43 "u8_lc_map.txt"
+ {"\303\213", "ë"},
+#line 645 "u8_lc_map.txt"
+ {"\341\274\272", "ἲ"},
+#line 248 "u8_lc_map.txt"
+ {"\316\240", "π"},
+ {""}, {""},
+#line 158 "u8_lc_map.txt"
+ {"\306\270", "ƹ"},
+#line 948 "u8_lc_map.txt"
+ {"\357\274\242", "ｂ"},
+ {""}, {""}, {""},
+#line 398 "u8_lc_map.txt"
+ {"\323\272", "ӻ"},
+#line 386 "u8_lc_map.txt"
+ {"\323\242", "ӣ"},
+#line 799 "u8_lc_map.txt"
+ {"\342\261\256", "ɱ"},
+#line 1008 "u8_lc_map.txt"
+ {"\360\220\220\243", "𐑋"},
+ {""}, {""},
+#line 340 "u8_lc_map.txt"
+ {"\321\274", "ѽ"},
+#line 112 "u8_lc_map.txt"
+ {"\305\246", "ŧ"},
+ {""},
+#line 561 "u8_lc_map.txt"
+ {"\341\272\200", "ẁ"},
+#line 408 "u8_lc_map.txt"
+ {"\324\216", "ԏ"},
+#line 588 "u8_lc_map.txt"
+ {"\341\272\276", "ế"},
+#line 584 "u8_lc_map.txt"
+ {"\341\272\266", "ặ"},
+#line 773 "u8_lc_map.txt"
+ {"\342\260\235", "ⱍ"},
+ {""},
+#line 156 "u8_lc_map.txt"
+ {"\306\265", "ƶ"},
+#line 154 "u8_lc_map.txt"
+ {"\306\262", "ʋ"},
+ {""}, {""},
+#line 797 "u8_lc_map.txt"
+ {"\342\261\253", "ⱬ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 744 "u8_lc_map.txt"
+ {"\342\260\200", "ⰰ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 960 "u8_lc_map.txt"
+ {"\357\274\256", "ｎ"},
+#line 293 "u8_lc_map.txt"
+ {"\320\217", "џ"},
+ {""}, {""}, {""},
+#line 1010 "u8_lc_map.txt"
+ {"\360\220\220\245", "𐑍"},
+ {""},
+#line 998 "u8_lc_map.txt"
+ {"\360\220\220\231", "𐑁"},
+ {""}, {""}, {""},
+#line 354 "u8_lc_map.txt"
+ {"\322\240", "ҡ"},
+#line 777 "u8_lc_map.txt"
+ {"\342\260\241", "ⱑ"},
+ {""}, {""},
+#line 159 "u8_lc_map.txt"
+ {"\306\274", "ƽ"},
+ {""},
+#line 957 "u8_lc_map.txt"
+ {"\357\274\253", "ｋ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 1012 "u8_lc_map.txt"
+ {"\360\220\220\247", "𐑏"},
+ {""}, {""},
+#line 78 "u8_lc_map.txt"
+ {"\304\240", "ġ"},
+#line 658 "u8_lc_map.txt"
+ {"\341\275\233", "ὓ"},
+ {""},
+#line 1004 "u8_lc_map.txt"
+ {"\360\220\220\237", "𐑇"},
+#line 143 "u8_lc_map.txt"
+ {"\306\235", "ɲ"},
+ {""}, {""}, {""},
+#line 235 "u8_lc_map.txt"
+ {"\316\223", "γ"},
+#line 632 "u8_lc_map.txt"
+ {"\341\274\233", "ἓ"},
+ {""}, {""}, {""}, {""},
+#line 720 "u8_lc_map.txt"
+ {"\342\222\270", "ⓒ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""},
+#line 441 "u8_lc_map.txt"
+ {"\325\205", "յ"},
+#line 312 "u8_lc_map.txt"
+ {"\320\242", "т"},
+ {""},
+#line 644 "u8_lc_map.txt"
+ {"\341\274\271", "ἱ"},
+ {""}, {""},
+#line 742 "u8_lc_map.txt"
+ {"\342\223\216", "ⓨ"},
+#line 966 "u8_lc_map.txt"
+ {"\357\274\264", "ｔ"},
+ {""}, {""},
+#line 373 "u8_lc_map.txt"
+ {"\323\207", "ӈ"},
+ {""}, {""},
+#line 982 "u8_lc_map.txt"
+ {"\360\220\220\211", "𐐱"},
+ {""},
+#line 276 "u8_lc_map.txt"
+ {"\317\276", "ͼ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 110 "u8_lc_map.txt"
+ {"\305\242", "ţ"},
+#line 741 "u8_lc_map.txt"
+ {"\342\223\215", "ⓧ"},
+ {""},
+#line 491 "u8_lc_map.txt"
+ {"\341\203\200", "ⴠ"},
+#line 392 "u8_lc_map.txt"
+ {"\323\256", "ӯ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 371 "u8_lc_map.txt"
+ {"\323\203", "ӄ"},
+ {""}, {""}, {""},
+#line 650 "u8_lc_map.txt"
+ {"\341\274\277", "ἷ"},
+ {""},
+#line 654 "u8_lc_map.txt"
+ {"\341\275\213", "ὃ"},
+ {""},
+#line 180 "u8_lc_map.txt"
+ {"\307\270", "ǹ"},
+#line 141 "u8_lc_map.txt"
+ {"\306\230", "ƙ"},
+ {""}, {""}, {""},
+#line 341 "u8_lc_map.txt"
+ {"\321\276", "ѿ"},
+#line 624 "u8_lc_map.txt"
+ {"\341\274\213", "ἃ"},
+#line 266 "u8_lc_map.txt"
+ {"\317\246", "ϧ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 1002 "u8_lc_map.txt"
+ {"\360\220\220\235", "𐑅"},
+#line 428 "u8_lc_map.txt"
+ {"\324\270", "ը"},
+ {""}, {""}, {""}, {""},
+#line 436 "u8_lc_map.txt"
+ {"\325\200", "հ"},
+#line 726 "u8_lc_map.txt"
+ {"\342\222\276", "ⓘ"},
+#line 718 "u8_lc_map.txt"
+ {"\342\222\266", "ⓐ"},
+ {""}, {""}, {""},
+#line 973 "u8_lc_map.txt"
+ {"\360\220\220\200", "𐐨"},
+ {""}, {""}, {""}, {""}, {""},
+#line 803 "u8_lc_map.txt"
+ {"\342\261\265", "ⱶ"},
+ {""}, {""},
+#line 425 "u8_lc_map.txt"
+ {"\324\265", "ե"},
+#line 422 "u8_lc_map.txt"
+ {"\324\262", "բ"},
+#line 329 "u8_lc_map.txt"
+ {"\321\246", "ѧ"},
+ {""}, {""},
+#line 166 "u8_lc_map.txt"
+ {"\307\231", "ǚ"},
+#line 733 "u8_lc_map.txt"
+ {"\342\223\205", "ⓟ"},
+ {""}, {""},
+#line 1006 "u8_lc_map.txt"
+ {"\360\220\220\241", "𐑉"},
+ {""}, {""},
+#line 376 "u8_lc_map.txt"
+ {"\323\215", "ӎ"},
+#line 661 "u8_lc_map.txt"
+ {"\341\275\250", "ὠ"},
+ {""}, {""},
+#line 182 "u8_lc_map.txt"
+ {"\307\274", "ǽ"},
+#line 259 "u8_lc_map.txt"
+ {"\317\217", "ϗ"},
+ {""}, {""},
+#line 285 "u8_lc_map.txt"
+ {"\320\207", "ї"},
+#line 635 "u8_lc_map.txt"
+ {"\341\274\250", "ἠ"},
+ {""}, {""}, {""}, {""},
+#line 967 "u8_lc_map.txt"
+ {"\357\274\265", "ｕ"},
+ {""}, {""}, {""}, {""},
+#line 432 "u8_lc_map.txt"
+ {"\324\274", "լ"},
+ {""}, {""}, {""},
+#line 324 "u8_lc_map.txt"
+ {"\320\256", "ю"},
+ {""},
+#line 969 "u8_lc_map.txt"
+ {"\357\274\267", "ｗ"},
+#line 657 "u8_lc_map.txt"
+ {"\341\275\231", "ὑ"},
+ {""},
+#line 97 "u8_lc_map.txt"
+ {"\305\207", "ň"},
+ {""},
+#line 281 "u8_lc_map.txt"
+ {"\320\203", "ѓ"},
+ {""}, {""}, {""},
+#line 630 "u8_lc_map.txt"
+ {"\341\274\231", "ἑ"},
+#line 385 "u8_lc_map.txt"
+ {"\323\240", "ӡ"},
+#line 299 "u8_lc_map.txt"
+ {"\320\225", "е"},
+ {""},
+#line 204 "u8_lc_map.txt"
+ {"\310\250", "ȩ"},
+ {""}, {""}, {""}, {""},
+#line 116 "u8_lc_map.txt"
+ {"\305\256", "ů"},
+#line 239 "u8_lc_map.txt"
+ {"\316\227", "η"},
+ {""},
+#line 732 "u8_lc_map.txt"
+ {"\342\223\204", "ⓞ"},
+#line 124 "u8_lc_map.txt"
+ {"\305\275", "ž"},
+#line 660 "u8_lc_map.txt"
+ {"\341\275\237", "ὗ"},
+#line 365 "u8_lc_map.txt"
+ {"\322\266", "ҷ"},
+#line 95 "u8_lc_map.txt"
+ {"\305\203", "ń"},
+ {""}, {""}, {""},
+#line 735 "u8_lc_map.txt"
+ {"\342\223\207", "ⓡ"},
+ {""}, {""}, {""},
+#line 274 "u8_lc_map.txt"
+ {"\317\272", "ϻ"},
+#line 264 "u8_lc_map.txt"
+ {"\317\242", "ϣ"},
+ {""},
+#line 315 "u8_lc_map.txt"
+ {"\320\245", "х"},
+ {""}, {""},
+#line 89 "u8_lc_map.txt"
+ {"\304\266", "ķ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 643 "u8_lc_map.txt"
+ {"\341\274\270", "ἰ"},
+#line 134 "u8_lc_map.txt"
+ {"\306\217", "ə"},
+ {""}, {""},
+#line 401 "u8_lc_map.txt"
+ {"\324\200", "ԁ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 291 "u8_lc_map.txt"
+ {"\320\215", "ѝ"},
+#line 652 "u8_lc_map.txt"
+ {"\341\275\211", "ὁ"},
+ {""},
+#line 339 "u8_lc_map.txt"
+ {"\321\272", "ѻ"},
+#line 327 "u8_lc_map.txt"
+ {"\321\242", "ѣ"},
+#line 317 "u8_lc_map.txt"
+ {"\320\247", "ч"},
+#line 224 "u8_lc_map.txt"
+ {"\315\262", "ͳ"},
+ {""},
+#line 41 "u8_lc_map.txt"
+ {"\303\211", "é"},
+#line 622 "u8_lc_map.txt"
+ {"\341\274\211", "ἁ"},
+ {""}, {""},
+#line 223 "u8_lc_map.txt"
+ {"\315\260", "ͱ"},
+ {""},
+#line 413 "u8_lc_map.txt"
+ {"\324\230", "ԙ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 272 "u8_lc_map.txt"
+ {"\317\267", "ϸ"},
+ {""}, {""}, {""}, {""},
+#line 295 "u8_lc_map.txt"
+ {"\320\221", "б"},
+#line 451 "u8_lc_map.txt"
+ {"\325\217", "տ"},
+ {""}, {""}, {""}, {""},
+#line 310 "u8_lc_map.txt"
+ {"\320\240", "р"},
+ {""}, {""},
+#line 375 "u8_lc_map.txt"
+ {"\323\213", "ӌ"},
+ {""}, {""}, {""},
+#line 659 "u8_lc_map.txt"
+ {"\341\275\235", "ὕ"},
+#line 183 "u8_lc_map.txt"
+ {"\307\276", "ǿ"},
+#line 146 "u8_lc_map.txt"
+ {"\306\242", "ƣ"},
+#line 167 "u8_lc_map.txt"
+ {"\307\233", "ǜ"},
+ {""}, {""}, {""}, {""},
+#line 634 "u8_lc_map.txt"
+ {"\341\274\235", "ἕ"},
+ {""}, {""},
+#line 255 "u8_lc_map.txt"
+ {"\316\250", "ψ"},
+ {""},
+#line 109 "u8_lc_map.txt"
+ {"\305\240", "š"},
+ {""}, {""},
+#line 434 "u8_lc_map.txt"
+ {"\324\276", "ծ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 649 "u8_lc_map.txt"
+ {"\341\274\276", "ἶ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 972 "u8_lc_map.txt"
+ {"\357\274\272", "ｚ"},
+#line 172 "u8_lc_map.txt"
+ {"\307\246", "ǧ"},
+#line 791 "u8_lc_map.txt"
+ {"\342\261\240", "ⱡ"},
+ {""}, {""},
+#line 249 "u8_lc_map.txt"
+ {"\316\241", "ρ"},
+ {""}, {""}, {""},
+#line 270 "u8_lc_map.txt"
+ {"\317\256", "ϯ"},
+ {""}, {""}, {""},
+#line 275 "u8_lc_map.txt"
+ {"\317\275", "ͻ"},
+#line 277 "u8_lc_map.txt"
+ {"\317\277", "ͽ"},
+ {""},
+#line 420 "u8_lc_map.txt"
+ {"\324\246", "ԧ"},
+#line 731 "u8_lc_map.txt"
+ {"\342\223\203", "ⓝ"},
+ {""}, {""},
+#line 157 "u8_lc_map.txt"
+ {"\306\267", "ʒ"},
+ {""},
+#line 668 "u8_lc_map.txt"
+ {"\341\275\257", "ὧ"},
+ {""},
+#line 228 "u8_lc_map.txt"
+ {"\316\211", "ή"},
+ {""}, {""}, {""}, {""},
+#line 358 "u8_lc_map.txt"
+ {"\322\250", "ҩ"},
+#line 642 "u8_lc_map.txt"
+ {"\341\274\257", "ἧ"},
+ {""}, {""}, {""},
+#line 297 "u8_lc_map.txt"
+ {"\320\223", "г"},
+ {""}, {""}, {""}, {""},
+#line 333 "u8_lc_map.txt"
+ {"\321\256", "ѯ"},
+ {""}, {""}, {""}, {""},
+#line 82 "u8_lc_map.txt"
+ {"\304\250", "ĩ"},
+ {""},
+#line 161 "u8_lc_map.txt"
+ {"\307\217", "ǐ"},
+ {""}, {""},
+#line 289 "u8_lc_map.txt"
+ {"\320\213", "ћ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 396 "u8_lc_map.txt"
+ {"\323\266", "ӷ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 129 "u8_lc_map.txt"
+ {"\306\207", "ƈ"},
+ {""}, {""},
+#line 801 "u8_lc_map.txt"
+ {"\342\261\260", "ɒ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 151 "u8_lc_map.txt"
+ {"\306\256", "ʈ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 962 "u8_lc_map.txt"
+ {"\357\274\260", "ｐ"},
+#line 971 "u8_lc_map.txt"
+ {"\357\274\271", "ｙ"},
+ {""},
+#line 181 "u8_lc_map.txt"
+ {"\307\272", "ǻ"},
+#line 170 "u8_lc_map.txt"
+ {"\307\242", "ǣ"},
+#line 805 "u8_lc_map.txt"
+ {"\342\261\277", "ɀ"},
+ {""}, {""},
+#line 443 "u8_lc_map.txt"
+ {"\325\207", "շ"},
+ {""},
+#line 263 "u8_lc_map.txt"
+ {"\317\240", "ϡ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 430 "u8_lc_map.txt"
+ {"\324\272", "ժ"},
+#line 418 "u8_lc_map.txt"
+ {"\324\242", "ԣ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 963 "u8_lc_map.txt"
+ {"\357\274\261", "ｑ"},
+#line 439 "u8_lc_map.txt"
+ {"\325\203", "ճ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 457 "u8_lc_map.txt"
+ {"\325\225", "օ"},
+ {""}, {""}, {""},
+#line 326 "u8_lc_map.txt"
+ {"\321\240", "ѡ"},
+ {""}, {""}, {""},
+#line 739 "u8_lc_map.txt"
+ {"\342\223\213", "ⓥ"},
+#line 247 "u8_lc_map.txt"
+ {"\316\237", "ο"},
+ {""}, {""}, {""}, {""},
+#line 148 "u8_lc_map.txt"
+ {"\306\247", "ƨ"},
+ {""}, {""}, {""},
+#line 179 "u8_lc_map.txt"
+ {"\307\267", "ƿ"},
+#line 793 "u8_lc_map.txt"
+ {"\342\261\243", "ᵽ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 120 "u8_lc_map.txt"
+ {"\305\266", "ŷ"},
+ {""}, {""}, {""}, {""},
+#line 427 "u8_lc_map.txt"
+ {"\324\267", "է"},
+ {""}, {""}, {""}, {""},
+#line 136 "u8_lc_map.txt"
+ {"\306\221", "ƒ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 145 "u8_lc_map.txt"
+ {"\306\240", "ơ"},
+ {""}, {""}, {""},
+#line 949 "u8_lc_map.txt"
+ {"\357\274\243", "ｃ"},
+#line 449 "u8_lc_map.txt"
+ {"\325\215", "ս"},
+ {""}, {""}, {""},
+#line 301 "u8_lc_map.txt"
+ {"\320\227", "з"},
+ {""}, {""}, {""}, {""},
+#line 954 "u8_lc_map.txt"
+ {"\357\274\250", "ｈ"},
+ {""}, {""}, {""},
+#line 389 "u8_lc_map.txt"
+ {"\323\250", "ө"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 795 "u8_lc_map.txt"
+ {"\342\261\247", "ⱨ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 176 "u8_lc_map.txt"
+ {"\307\256", "ǯ"},
+#line 453 "u8_lc_map.txt"
+ {"\325\221", "ց"},
+ {""}, {""},
+#line 951 "u8_lc_map.txt"
+ {"\357\274\245", "ｅ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 164 "u8_lc_map.txt"
+ {"\307\225", "ǖ"},
+ {""}, {""}, {""}, {""},
+#line 802 "u8_lc_map.txt"
+ {"\342\261\262", "ⱳ"},
+#line 433 "u8_lc_map.txt"
+ {"\324\275", "խ"},
+#line 435 "u8_lc_map.txt"
+ {"\324\277", "կ"},
+ {""},
+#line 953 "u8_lc_map.txt"
+ {"\357\274\247", "ｇ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 374 "u8_lc_map.txt"
+ {"\323\211", "ӊ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 137 "u8_lc_map.txt"
+ {"\306\223", "ɠ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 970 "u8_lc_map.txt"
+ {"\357\274\270", "ｘ"},
+#line 964 "u8_lc_map.txt"
+ {"\357\274\262", "ｒ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 132 "u8_lc_map.txt"
+ {"\306\213", "ƌ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 160 "u8_lc_map.txt"
+ {"\307\215", "ǎ"},
+ {""}, {""}, {""},
+#line 737 "u8_lc_map.txt"
+ {"\342\223\211", "ⓣ"},
+ {""}, {""}, {""},
+#line 318 "u8_lc_map.txt"
+ {"\320\250", "ш"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 455 "u8_lc_map.txt"
+ {"\325\223", "փ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 113 "u8_lc_map.txt"
+ {"\305\250", "ũ"},
+#line 162 "u8_lc_map.txt"
+ {"\307\221", "ǒ"},
+#line 804 "u8_lc_map.txt"
+ {"\342\261\276", "ȿ"},
+ {""}, {""},
+#line 447 "u8_lc_map.txt"
+ {"\325\213", "ջ"},
+#line 311 "u8_lc_map.txt"
+ {"\320\241", "с"},
+#line 169 "u8_lc_map.txt"
+ {"\307\240", "ǡ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 337 "u8_lc_map.txt"
+ {"\321\266", "ѷ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 417 "u8_lc_map.txt"
+ {"\324\240", "ԡ"},
+ {""}, {""},
+#line 287 "u8_lc_map.txt"
+ {"\320\211", "љ"},
+#line 153 "u8_lc_map.txt"
+ {"\306\261", "ʊ"},
+ {""}, {""},
+#line 728 "u8_lc_map.txt"
+ {"\342\223\200", "ⓚ"},
+ {""}, {""},
+#line 968 "u8_lc_map.txt"
+ {"\357\274\266", "ｖ"},
+ {""}, {""},
+#line 325 "u8_lc_map.txt"
+ {"\320\257", "я"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 800 "u8_lc_map.txt"
+ {"\342\261\257", "ɐ"},
+ {""}, {""}, {""}, {""},
+#line 947 "u8_lc_map.txt"
+ {"\357\274\241", "ａ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+#line 961 "u8_lc_map.txt"
+ {"\357\274\257", "ｏ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 163 "u8_lc_map.txt"
+ {"\307\223", "ǔ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 140 "u8_lc_map.txt"
+ {"\306\227", "ɨ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+#line 267 "u8_lc_map.txt"
+ {"\317\250", "ϩ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 309 "u8_lc_map.txt"
+ {"\320\237", "п"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+#line 330 "u8_lc_map.txt"
+ {"\321\250", "ѩ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 421 "u8_lc_map.txt"
+ {"\324\261", "ա"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+#line 178 "u8_lc_map.txt"
+ {"\307\266", "ƕ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+#line 426 "u8_lc_map.txt"
+ {"\324\266", "զ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 165 "u8_lc_map.txt"
+ {"\307\227", "ǘ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 130 "u8_lc_map.txt"
+ {"\306\211", "ɖ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 152 "u8_lc_map.txt"
+ {"\306\257", "ư"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 445 "u8_lc_map.txt"
+ {"\325\211", "չ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""},
+#line 225 "u8_lc_map.txt"
+ {"\315\266", "ͷ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+#line 173 "u8_lc_map.txt"
+ {"\307\250", "ǩ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""},
+#line 144 "u8_lc_map.txt"
+ {"\306\237", "ɵ"}
+ };
+
+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+ {
+ unsigned int key = u8_lc_hash (str, len);
+
+ if (key <= MAX_HASH_VALUE)
+ {
+ register const char *s = wordlistkey.name;
+
+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && slen == '\0')
+ return &wordlistkey;
+ }
+ }
+ return 0;
+}

deadbeef-1.9.6.tar.bz2/src/u8_uc_map.h Added

@@ -0,0 +1,2704 @@
+/* ANSI-C code produced by gperf version 3.0.3 */
+/* Command-line: /Applications/Xcode_12_4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/gperf -E -L ANSI-C -c -t -H u8_uc_hash -N u8_uc_in_word_set u8_uc_map.txt */
+/* Computed positions: -k'1-2,$' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+ && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+ && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+ && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+ && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+ && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+ && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+ && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+ && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+ && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+ && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+ && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+ && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+ && ('Z' == 90) && ('' == 91) && ('\\' == 92) && ('' == 93) \
+ && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+ && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+ && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+ && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+ && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+ && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+ && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+ && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646. */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+#line 1 "u8_uc_map.txt"
+struct u8_uppercase_map_t {
+ const char *name;
+ const char *upper;
+};
+/* maximum key range = 2780, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+u8_uc_hash (register const char *str, register unsigned int len)
+{
+ static unsigned short asso_values =
+ {
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 570, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 565,
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 155, 145, 135,
+ 130, 125, 120, 115, 110, 105, 95, 90, 85, 80,
+ 75, 70, 65, 60, 55, 50, 45, 35, 30, 15,
+ 10, 5, 0, 2781, 2781, 2781, 2781, 2781, 1294, 2,
+ 591, 866, 1010, 42, 925, 262, 726, 563, 475, 532,
+ 980, 988, 630, 33, 397, 781, 855, 700, 462, 147,
+ 502, 67, 211, 905, 526, 667, 850, 1001, 1529, 295,
+ 811, 815, 380, 105, 232, 215, 12, 26, 625, 666,
+ 695, 250, 195, 435, 943, 555, 645, 146, 120, 56,
+ 170, 150, 945, 880, 1015, 75, 175, 360, 260, 45,
+ 325, 15, 925, 20, 131, 15, 135, 375, 430, 10,
+ 5, 0, 250, 480, 25, 575, 30, 905, 58, 765,
+ 940, 875, 300, 80, 25, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 2781, 0, 0, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 125, 2781, 2781, 2781, 2781, 2781,
+ 0, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781, 2781,
+ 2781
+ };
+ register unsigned int hval = len;
+
+ switch (hval)
+ {
+ default:
+ hval += asso_values(unsigned char)str1+15;
+ /*FALLTHROUGH*/
+ case 1:
+ hval += asso_values(unsigned char)str0;
+ break;
+ }
+ return hval + asso_values(unsigned char)strlen - 1;
+}
+
+struct u8_uppercase_map_t *
+u8_uc_in_word_set (register const char *str, register unsigned int len)
+{
+ enum
+ {
+ TOTAL_KEYWORDS = 1006,
+ MIN_WORD_LENGTH = 1,
+ MAX_WORD_LENGTH = 7,
+ MIN_HASH_VALUE = 1,
+ MAX_HASH_VALUE = 2780
+ };
+
+ static struct u8_uppercase_map_t wordlist =
+ {
+ {""},
+#line 31 "u8_uc_map.txt"
+ {"z", "Z"},
+ {""}, {""}, {""},
+#line 560 "u8_uc_map.txt"
+ {"\341\272\201", "Ẁ"},
+ {""}, {""}, {""}, {""},
+#line 528 "u8_uc_map.txt"
+ {"\341\271\201", "Ṁ"},
+#line 30 "u8_uc_map.txt"
+ {"y", "Y"},
+ {""}, {""}, {""},
+#line 496 "u8_uc_map.txt"
+ {"\341\270\201", "Ḁ"},
+ {""}, {""},
+#line 587 "u8_uc_map.txt"
+ {"\341\272\277", "Ế"},
+ {""},
+#line 459 "u8_uc_map.txt"
+ {"\342\264\201", "Ⴁ"},
+#line 29 "u8_uc_map.txt"
+ {"x", "X"},
+ {""},
+#line 559 "u8_uc_map.txt"
+ {"\341\271\277", "Ṿ"},
+ {""},
+#line 805 "u8_uc_map.txt"
+ {"\342\262\201", "Ⲁ"},
+ {""}, {""},
+#line 527 "u8_uc_map.txt"
+ {"\341\270\277", "Ḿ"},
+#line 575 "u8_uc_map.txt"
+ {"\341\272\247", "Ầ"},
+#line 651 "u8_uc_map.txt"
+ {"\341\275\201", "Ὁ"},
+#line 28 "u8_uc_map.txt"
+ {"w", "W"},
+ {""},
+#line 758 "u8_uc_map.txt"
+ {"\342\260\277", "Ⰿ"},
+#line 547 "u8_uc_map.txt"
+ {"\341\271\247", "Ṧ"},
+ {""},
+#line 567 "u8_uc_map.txt"
+ {"\341\272\217", "Ẏ"},
+ {""},
+#line 836 "u8_uc_map.txt"
+ {"\342\262\277", "Ⲿ"},
+#line 515 "u8_uc_map.txt"
+ {"\341\270\247", "Ḧ"},
+#line 666 "u8_uc_map.txt"
+ {"\341\275\246", "Ὦ"},
+#line 535 "u8_uc_map.txt"
+ {"\341\271\217", "Ṏ"},
+ {""}, {""}, {""},
+#line 562 "u8_uc_map.txt"
+ {"\341\272\205", "Ẅ"},
+#line 503 "u8_uc_map.txt"
+ {"\341\270\217", "Ḏ"},
+ {""},
+#line 586 "u8_uc_map.txt"
+ {"\341\272\275", "Ẽ"},
+#line 824 "u8_uc_map.txt"
+ {"\342\262\247", "Ⲧ"},
+#line 530 "u8_uc_map.txt"
+ {"\341\271\205", "Ṅ"},
+#line 473 "u8_uc_map.txt"
+ {"\342\264\217", "Ⴏ"},
+#line 803 "u8_uc_map.txt"
+ {"\310\277", "Ȿ"},
+#line 558 "u8_uc_map.txt"
+ {"\341\271\275", "Ṽ"},
+#line 667 "u8_uc_map.txt"
+ {"\341\275\247", "Ὧ"},
+#line 498 "u8_uc_map.txt"
+ {"\341\270\205", "Ḅ"},
+#line 812 "u8_uc_map.txt"
+ {"\342\262\217", "Ⲏ"},
+#line 182 "u8_uc_map.txt"
+ {"\307\277", "Ǿ"},
+#line 526 "u8_uc_map.txt"
+ {"\341\270\275", "Ḽ"},
+#line 581 "u8_uc_map.txt"
+ {"\341\272\263", "Ẳ"},
+#line 463 "u8_uc_map.txt"
+ {"\342\264\205", "Ⴅ"},
+#line 27 "u8_uc_map.txt"
+ {"v", "V"},
+#line 120 "u8_uc_map.txt"
+ {"\303\277", "Ÿ"},
+#line 756 "u8_uc_map.txt"
+ {"\342\260\275", "Ⰽ"},
+#line 553 "u8_uc_map.txt"
+ {"\341\271\263", "Ṳ"},
+#line 807 "u8_uc_map.txt"
+ {"\342\262\205", "Ⲅ"},
+ {""}, {""},
+#line 835 "u8_uc_map.txt"
+ {"\342\262\275", "Ⲽ"},
+#line 521 "u8_uc_map.txt"
+ {"\341\270\263", "Ḳ"},
+#line 655 "u8_uc_map.txt"
+ {"\341\275\205", "Ὅ"},
+#line 26 "u8_uc_map.txt"
+ {"u", "U"},
+#line 793 "u8_uc_map.txt"
+ {"\311\275", "Ɽ"},
+#line 714 "u8_uc_map.txt"
+ {"\341\275\275", "Ώ"},
+#line 746 "u8_uc_map.txt"
+ {"\342\260\263", "Ⰳ"},
+#line 539 "u8_uc_map.txt"
+ {"\341\271\227", "Ṗ"},
+ {""},
+#line 246 "u8_uc_map.txt"
+ {"\316\277", "Ο"},
+#line 584 "u8_uc_map.txt"
+ {"\341\272\271", "Ẹ"},
+#line 830 "u8_uc_map.txt"
+ {"\342\262\263", "Ⲳ"},
+#line 507 "u8_uc_map.txt"
+ {"\341\270\227", "Ḗ"},
+#line 130 "u8_uc_map.txt"
+ {"\311\227", "Ɗ"},
+#line 181 "u8_uc_map.txt"
+ {"\307\275", "Ǽ"},
+#line 556 "u8_uc_map.txt"
+ {"\341\271\271", "Ṹ"},
+#line 698 "u8_uc_map.txt"
+ {"\341\275\263", "Έ"},
+#line 481 "u8_uc_map.txt"
+ {"\342\264\227", "Ⴗ"},
+#line 194 "u8_uc_map.txt"
+ {"\310\227", "Ȗ"},
+#line 60 "u8_uc_map.txt"
+ {"\303\275", "Ý"},
+#line 524 "u8_uc_map.txt"
+ {"\341\270\271", "Ḹ"},
+#line 715 "u8_uc_map.txt"
+ {"\341\277\263", "ῼ"},
+#line 816 "u8_uc_map.txt"
+ {"\342\262\227", "Ⲗ"},
+#line 25 "u8_uc_map.txt"
+ {"t", "T"},
+#line 179 "u8_uc_map.txt"
+ {"\307\271", "Ǹ"},
+#line 752 "u8_uc_map.txt"
+ {"\342\260\271", "Ⰹ"},
+ {""},
+#line 659 "u8_uc_map.txt"
+ {"\341\275\227", "Ὗ"},
+ {""},
+#line 56 "u8_uc_map.txt"
+ {"\303\271", "Ù"},
+#line 833 "u8_uc_map.txt"
+ {"\342\262\271", "Ⲹ"},
+ {""}, {""},
+#line 24 "u8_uc_map.txt"
+ {"s", "S"},
+#line 244 "u8_uc_map.txt"
+ {"\316\275", "Ν"},
+#line 712 "u8_uc_map.txt"
+ {"\341\275\271", "Ό"},
+ {""},
+#line 308 "u8_uc_map.txt"
+ {"\320\277", "П"},
+ {""}, {""},
+#line 573 "u8_uc_map.txt"
+ {"\341\272\243", "Ả"},
+ {""}, {""},
+#line 23 "u8_uc_map.txt"
+ {"r", "R"},
+#line 240 "u8_uc_map.txt"
+ {"\316\271", "Ι"},
+#line 545 "u8_uc_map.txt"
+ {"\341\271\243", "Ṣ"},
+ {""}, {""}, {""}, {""},
+#line 513 "u8_uc_map.txt"
+ {"\341\270\243", "Ḣ"},
+ {""}, {""},
+#line 22 "u8_uc_map.txt"
+ {"q", "Q"},
+ {""},
+#line 493 "u8_uc_map.txt"
+ {"\342\264\243", "Ⴣ"},
+ {""}, {""}, {""},
+#line 450 "u8_uc_map.txt"
+ {"\325\277", "Տ"},
+#line 822 "u8_uc_map.txt"
+ {"\342\262\243", "Ⲣ"},
+ {""},
+#line 306 "u8_uc_map.txt"
+ {"\320\275", "Н"},
+#line 21 "u8_uc_map.txt"
+ {"p", "P"},
+ {""},
+#line 663 "u8_uc_map.txt"
+ {"\341\275\243", "Ὣ"},
+ {""}, {""},
+#line 837 "u8_uc_map.txt"
+ {"\342\263\201", "Ⳁ"},
+ {""},
+#line 745 "u8_uc_map.txt"
+ {"\342\260\262", "Ⰲ"},
+ {""},
+#line 302 "u8_uc_map.txt"
+ {"\320\271", "Й"},
+#line 20 "u8_uc_map.txt"
+ {"o", "O"},
+#line 142 "u8_uc_map.txt"
+ {"\311\262", "Ɲ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 697 "u8_uc_map.txt"
+ {"\341\275\262", "Ὲ"},
+#line 580 "u8_uc_map.txt"
+ {"\341\272\261", "Ằ"},
+#line 570 "u8_uc_map.txt"
+ {"\341\272\225", "Ẕ"},
+#line 19 "u8_uc_map.txt"
+ {"n", "N"},
+#line 448 "u8_uc_map.txt"
+ {"\325\275", "Ս"},
+#line 582 "u8_uc_map.txt"
+ {"\341\272\265", "Ẵ"},
+#line 552 "u8_uc_map.txt"
+ {"\341\271\261", "Ṱ"},
+#line 538 "u8_uc_map.txt"
+ {"\341\271\225", "Ṕ"},
+ {""},
+#line 50 "u8_uc_map.txt"
+ {"\303\262", "Ò"},
+#line 554 "u8_uc_map.txt"
+ {"\341\271\265", "Ṵ"},
+#line 520 "u8_uc_map.txt"
+ {"\341\270\261", "Ḱ"},
+#line 506 "u8_uc_map.txt"
+ {"\341\270\225", "Ḕ"},
+#line 18 "u8_uc_map.txt"
+ {"m", "M"},
+#line 444 "u8_uc_map.txt"
+ {"\325\271", "Չ"},
+#line 522 "u8_uc_map.txt"
+ {"\341\270\265", "Ḵ"},
+#line 744 "u8_uc_map.txt"
+ {"\342\260\261", "Ⰱ"},
+#line 479 "u8_uc_map.txt"
+ {"\342\264\225", "Ⴕ"},
+ {""},
+#line 844 "u8_uc_map.txt"
+ {"\342\263\217", "Ⳏ"},
+#line 748 "u8_uc_map.txt"
+ {"\342\260\265", "Ⰵ"},
+#line 829 "u8_uc_map.txt"
+ {"\342\262\261", "Ⲱ"},
+#line 815 "u8_uc_map.txt"
+ {"\342\262\225", "Ⲕ"},
+#line 17 "u8_uc_map.txt"
+ {"l", "L"},
+#line 233 "u8_uc_map.txt"
+ {"\316\262", "Β"},
+#line 831 "u8_uc_map.txt"
+ {"\342\262\265", "Ⲵ"},
+#line 695 "u8_uc_map.txt"
+ {"\341\275\261", "Ά"},
+#line 658 "u8_uc_map.txt"
+ {"\341\275\225", "Ὕ"},
+#line 839 "u8_uc_map.txt"
+ {"\342\263\205", "Ⳅ"},
+ {""},
+#line 700 "u8_uc_map.txt"
+ {"\341\275\265", "Ή"},
+#line 38 "u8_uc_map.txt"
+ {"\303\246", "Æ"},
+ {""},
+#line 16 "u8_uc_map.txt"
+ {"k", "K"},
+ {""},
+#line 792 "u8_uc_map.txt"
+ {"\341\265\275", "Ᵽ"},
+ {""}, {""}, {""}, {""},
+#line 747 "u8_uc_map.txt"
+ {"\342\260\264", "Ⰴ"},
+ {""}, {""},
+#line 15 "u8_uc_map.txt"
+ {"j", "J"},
+#line 57 "u8_uc_map.txt"
+ {"\303\272", "Ú"},
+#line 753 "u8_uc_map.txt"
+ {"\342\260\272", "Ⰺ"},
+#line 208 "u8_uc_map.txt"
+ {"\310\263", "Ȳ"},
+ {""}, {""}, {""},
+#line 699 "u8_uc_map.txt"
+ {"\341\275\264", "Ὴ"},
+ {""},
+#line 295 "u8_uc_map.txt"
+ {"\320\262", "В"},
+#line 848 "u8_uc_map.txt"
+ {"\342\263\227", "Ⳗ"},
+#line 52 "u8_uc_map.txt"
+ {"\303\264", "Ô"},
+#line 708 "u8_uc_map.txt"
+ {"\341\275\272", "Ὺ"},
+#line 51 "u8_uc_map.txt"
+ {"\303\263", "Ó"},
+ {""}, {""},
+#line 241 "u8_uc_map.txt"
+ {"\316\272", "Κ"},
+ {""}, {""}, {""},
+#line 14 "u8_uc_map.txt"
+ {"i", "I"},
+ {""},
+#line 932 "u8_uc_map.txt"
+ {"\341\265\271", "Ᵹ"},
+ {""}, {""},
+#line 73 "u8_uc_map.txt"
+ {"\304\227", "Ė"},
+#line 235 "u8_uc_map.txt"
+ {"\316\264", "Δ"},
+#line 574 "u8_uc_map.txt"
+ {"\341\272\245", "Ấ"},
+#line 234 "u8_uc_map.txt"
+ {"\316\263", "Γ"},
+ {""},
+#line 13 "u8_uc_map.txt"
+ {"h", "H"},
+#line 437 "u8_uc_map.txt"
+ {"\325\262", "Ղ"},
+#line 546 "u8_uc_map.txt"
+ {"\341\271\245", "Ṥ"},
+ {""}, {""}, {""},
+#line 137 "u8_uc_map.txt"
+ {"\311\243", "Ɣ"},
+#line 514 "u8_uc_map.txt"
+ {"\341\270\245", "Ḥ"},
+#line 482 "u8_uc_map.txt"
+ {"\342\264\230", "Ⴘ"},
+ {""},
+#line 12 "u8_uc_map.txt"
+ {"g", "G"},
+#line 200 "u8_uc_map.txt"
+ {"\310\243", "Ȣ"},
+#line 495 "u8_uc_map.txt"
+ {"\342\264\245", "Ⴥ"},
+ {""},
+#line 303 "u8_uc_map.txt"
+ {"\320\272", "К"},
+ {""},
+#line 169 "u8_uc_map.txt"
+ {"\307\243", "Ǣ"},
+#line 823 "u8_uc_map.txt"
+ {"\342\262\245", "Ⲥ"},
+#line 854 "u8_uc_map.txt"
+ {"\342\263\243", "Ⳣ"},
+ {""},
+#line 11 "u8_uc_map.txt"
+ {"f", "F"},
+#line 35 "u8_uc_map.txt"
+ {"\303\243", "Ã"},
+#line 665 "u8_uc_map.txt"
+ {"\341\275\245", "Ὥ"},
+#line 425 "u8_uc_map.txt"
+ {"\325\246", "Զ"},
+#line 297 "u8_uc_map.txt"
+ {"\320\264", "Д"},
+ {""},
+#line 296 "u8_uc_map.txt"
+ {"\320\263", "Г"},
+#line 710 "u8_uc_map.txt"
+ {"\341\277\245", "Ῥ"},
+#line 164 "u8_uc_map.txt"
+ {"\307\230", "Ǘ"},
+#line 494 "u8_uc_map.txt"
+ {"\342\264\244", "Ⴤ"},
+#line 10 "u8_uc_map.txt"
+ {"e", "E"},
+ {""},
+#line 577 "u8_uc_map.txt"
+ {"\341\272\253", "Ẫ"},
+ {""},
+#line 588 "u8_uc_map.txt"
+ {"\341\273\201", "Ề"},
+ {""},
+#line 445 "u8_uc_map.txt"
+ {"\325\272", "Պ"},
+#line 549 "u8_uc_map.txt"
+ {"\341\271\253", "Ṫ"},
+ {""},
+#line 664 "u8_uc_map.txt"
+ {"\341\275\244", "Ὤ"},
+#line 9 "u8_uc_map.txt"
+ {"d", "D"},
+ {""},
+#line 517 "u8_uc_map.txt"
+ {"\341\270\253", "Ḫ"},
+ {""},
+#line 563 "u8_uc_map.txt"
+ {"\341\272\207", "Ẇ"},
+ {""},
+#line 439 "u8_uc_map.txt"
+ {"\325\264", "Մ"},
+#line 619 "u8_uc_map.txt"
+ {"\341\273\277", "Ỿ"},
+#line 438 "u8_uc_map.txt"
+ {"\325\263", "Ճ"},
+#line 531 "u8_uc_map.txt"
+ {"\341\271\207", "Ṇ"},
+#line 8 "u8_uc_map.txt"
+ {"c", "C"},
+ {""},
+#line 826 "u8_uc_map.txt"
+ {"\342\262\253", "Ⲫ"},
+ {""},
+#line 499 "u8_uc_map.txt"
+ {"\341\270\207", "Ḇ"},
+ {""}, {""},
+#line 755 "u8_uc_map.txt"
+ {"\342\260\274", "Ⰼ"},
+#line 607 "u8_uc_map.txt"
+ {"\341\273\247", "Ủ"},
+#line 465 "u8_uc_map.txt"
+ {"\342\264\207", "Ⴇ"},
+#line 847 "u8_uc_map.txt"
+ {"\342\263\225", "Ⳕ"},
+ {""}, {""}, {""},
+#line 808 "u8_uc_map.txt"
+ {"\342\262\207", "Ⲇ"},
+#line 595 "u8_uc_map.txt"
+ {"\341\273\217", "Ỏ"},
+#line 143 "u8_uc_map.txt"
+ {"\311\265", "Ɵ"},
+#line 713 "u8_uc_map.txt"
+ {"\341\275\274", "Ὼ"},
+ {""}, {""},
+#line 7 "u8_uc_map.txt"
+ {"b", "B"},
+ {""}, {""}, {""},
+#line 590 "u8_uc_map.txt"
+ {"\341\273\205", "Ễ"},
+ {""},
+#line 176 "u8_uc_map.txt"
+ {"\307\265", "Ǵ"},
+#line 618 "u8_uc_map.txt"
+ {"\341\273\275", "Ỽ"},
+ {""}, {""},
+#line 997 "u8_uc_map.txt"
+ {"\360\220\221\201", "𐐙"},
+#line 53 "u8_uc_map.txt"
+ {"\303\265", "Õ"},
+#line 543 "u8_uc_map.txt"
+ {"\341\271\237", "Ṟ"},
+ {""},
+#line 36 "u8_uc_map.txt"
+ {"\303\244", "Ä"},
+ {""},
+#line 422 "u8_uc_map.txt"
+ {"\325\243", "Գ"},
+#line 511 "u8_uc_map.txt"
+ {"\341\270\237", "Ḟ"},
+#line 613 "u8_uc_map.txt"
+ {"\341\273\263", "Ỳ"},
+ {""},
+#line 6 "u8_uc_map.txt"
+ {"a", "A"},
+#line 89 "u8_uc_map.txt"
+ {"\304\272", "Ĺ"},
+#line 489 "u8_uc_map.txt"
+ {"\342\264\237", "Ⴟ"},
+#line 995 "u8_uc_map.txt"
+ {"\360\220\220\277", "𐐗"},
+ {""}, {""},
+#line 236 "u8_uc_map.txt"
+ {"\316\265", "Ε"},
+#line 820 "u8_uc_map.txt"
+ {"\342\262\237", "Ⲟ"},
+ {""},
+#line 599 "u8_uc_map.txt"
+ {"\341\273\227", "Ỗ"},
+ {""}, {""}, {""},
+#line 86 "u8_uc_map.txt"
+ {"\304\263", "Ĳ"},
+#line 906 "u8_uc_map.txt"
+ {"\352\235\201", "Ꝁ"},
+ {""}, {""},
+#line 616 "u8_uc_map.txt"
+ {"\341\273\271", "Ỹ"},
+#line 855 "u8_uc_map.txt"
+ {"\342\263\254", "Ⳬ"},
+ {""}, {""},
+#line 1011 "u8_uc_map.txt"
+ {"\360\220\221\217", "𐐧"},
+ {""}, {""}, {""}, {""}, {""},
+#line 933 "u8_uc_map.txt"
+ {"\352\235\277", "Ꝿ"},
+ {""}, {""},
+#line 1001 "u8_uc_map.txt"
+ {"\360\220\221\205", "𐐝"},
+ {""},
+#line 757 "u8_uc_map.txt"
+ {"\342\260\276", "Ⰾ"},
+#line 993 "u8_uc_map.txt"
+ {"\360\220\220\275", "𐐕"},
+#line 298 "u8_uc_map.txt"
+ {"\320\265", "Е"},
+ {""}, {""}, {""},
+#line 925 "u8_uc_map.txt"
+ {"\352\235\247", "Ꝧ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 983 "u8_uc_map.txt"
+ {"\360\220\220\263", "𐐋"},
+#line 913 "u8_uc_map.txt"
+ {"\352\235\217", "Ꝏ"},
+ {""},
+#line 605 "u8_uc_map.txt"
+ {"\341\273\243", "Ợ"},
+ {""}, {""}, {""},
+#line 79 "u8_uc_map.txt"
+ {"\304\243", "Ģ"},
+#line 585 "u8_uc_map.txt"
+ {"\341\272\273", "Ẻ"},
+ {""},
+#line 908 "u8_uc_map.txt"
+ {"\352\235\205", "Ꝅ"},
+ {""},
+#line 440 "u8_uc_map.txt"
+ {"\325\265", "Յ"},
+#line 557 "u8_uc_map.txt"
+ {"\341\271\273", "Ṻ"},
+ {""},
+#line 423 "u8_uc_map.txt"
+ {"\325\244", "Դ"},
+ {""}, {""},
+#line 525 "u8_uc_map.txt"
+ {"\341\270\273", "Ḻ"},
+#line 989 "u8_uc_map.txt"
+ {"\360\220\220\271", "𐐑"},
+ {""}, {""}, {""},
+#line 754 "u8_uc_map.txt"
+ {"\342\260\273", "Ⰻ"},
+ {""}, {""},
+#line 411 "u8_uc_map.txt"
+ {"\324\227", "Ԗ"},
+ {""},
+#line 834 "u8_uc_map.txt"
+ {"\342\262\273", "Ⲻ"},
+ {""}, {""},
+#line 193 "u8_uc_map.txt"
+ {"\310\225", "Ȕ"},
+#line 939 "u8_uc_map.txt"
+ {"\311\245", "Ɥ"},
+#line 709 "u8_uc_map.txt"
+ {"\341\275\273", "Ύ"},
+ {""},
+#line 917 "u8_uc_map.txt"
+ {"\352\235\227", "Ꝗ"},
+ {""},
+#line 201 "u8_uc_map.txt"
+ {"\310\245", "Ȥ"},
+#line 905 "u8_uc_map.txt"
+ {"\352\234\277", "Ꜿ"},
+ {""},
+#line 739 "u8_uc_map.txt"
+ {"\342\223\246", "Ⓦ"},
+#line 840 "u8_uc_map.txt"
+ {"\342\263\207", "Ⳇ"},
+#line 170 "u8_uc_map.txt"
+ {"\307\245", "Ǥ"},
+#line 492 "u8_uc_map.txt"
+ {"\342\264\242", "Ⴢ"},
+#line 612 "u8_uc_map.txt"
+ {"\341\273\261", "Ự"},
+#line 598 "u8_uc_map.txt"
+ {"\341\273\225", "Ổ"},
+ {""},
+#line 37 "u8_uc_map.txt"
+ {"\303\245", "Å"},
+#line 614 "u8_uc_map.txt"
+ {"\341\273\265", "Ỵ"},
+#line 894 "u8_uc_map.txt"
+ {"\352\234\247", "Ꜧ"},
+ {""},
+#line 183 "u8_uc_map.txt"
+ {"\310\201", "Ȁ"},
+ {""},
+#line 662 "u8_uc_map.txt"
+ {"\341\275\242", "Ὢ"},
+#line 740 "u8_uc_map.txt"
+ {"\342\223\247", "Ⓧ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 474 "u8_uc_map.txt"
+ {"\342\264\220", "Ⴐ"},
+ {""}, {""}, {""},
+#line 982 "u8_uc_map.txt"
+ {"\360\220\220\262", "𐐊"},
+ {""}, {""},
+#line 87 "u8_uc_map.txt"
+ {"\304\265", "Ĵ"},
+#line 904 "u8_uc_map.txt"
+ {"\352\234\275", "Ꜽ"},
+ {""}, {""},
+#line 452 "u8_uc_map.txt"
+ {"\326\201", "Ց"},
+#line 791 "u8_uc_map.txt"
+ {"\311\253", "Ɫ"},
+#line 923 "u8_uc_map.txt"
+ {"\352\235\243", "Ꝣ"},
+#line 852 "u8_uc_map.txt"
+ {"\342\263\237", "Ⳟ"},
+#line 702 "u8_uc_map.txt"
+ {"\341\277\220", "Ῐ"},
+ {""},
+#line 204 "u8_uc_map.txt"
+ {"\310\253", "Ȫ"},
+ {""},
+#line 899 "u8_uc_map.txt"
+ {"\352\234\263", "Ꜳ"},
+ {""}, {""},
+#line 173 "u8_uc_map.txt"
+ {"\307\253", "Ǫ"},
+#line 578 "u8_uc_map.txt"
+ {"\341\272\255", "Ậ"},
+ {""}, {""}, {""},
+#line 43 "u8_uc_map.txt"
+ {"\303\253", "Ë"},
+#line 550 "u8_uc_map.txt"
+ {"\341\271\255", "Ṭ"},
+ {""},
+#line 981 "u8_uc_map.txt"
+ {"\360\220\220\261", "𐐉"},
+ {""}, {""},
+#line 518 "u8_uc_map.txt"
+ {"\341\270\255", "Ḭ"},
+#line 985 "u8_uc_map.txt"
+ {"\360\220\220\265", "𐐍"},
+#line 724 "u8_uc_map.txt"
+ {"\342\223\227", "Ⓗ"},
+ {""}, {""},
+#line 902 "u8_uc_map.txt"
+ {"\352\234\271", "Ꜹ"},
+ {""}, {""},
+#line 103 "u8_uc_map.txt"
+ {"\305\227", "Ŗ"},
+ {""},
+#line 827 "u8_uc_map.txt"
+ {"\342\262\255", "Ⲭ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 424 "u8_uc_map.txt"
+ {"\325\245", "Ե"},
+#line 606 "u8_uc_map.txt"
+ {"\341\273\245", "Ụ"},
+#line 984 "u8_uc_map.txt"
+ {"\360\220\220\264", "𐐌"},
+#line 916 "u8_uc_map.txt"
+ {"\352\235\225", "Ꝕ"},
+ {""}, {""}, {""},
+#line 990 "u8_uc_map.txt"
+ {"\360\220\220\272", "𐐒"},
+ {""}, {""},
+#line 178 "u8_uc_map.txt"
+ {"\306\277", "Ƿ"},
+ {""}, {""},
+#line 478 "u8_uc_map.txt"
+ {"\342\264\224", "Ⴔ"},
+ {""}, {""},
+#line 892 "u8_uc_map.txt"
+ {"\352\234\243", "Ꜣ"},
+ {""},
+#line 621 "u8_uc_map.txt"
+ {"\341\274\201", "Ἁ"},
+ {""}, {""},
+#line 736 "u8_uc_map.txt"
+ {"\342\223\243", "Ⓣ"},
+ {""}, {""}, {""}, {""},
+#line 468 "u8_uc_map.txt"
+ {"\342\264\212", "Ⴊ"},
+#line 976 "u8_uc_map.txt"
+ {"\360\220\220\254", "𐐄"},
+#line 640 "u8_uc_map.txt"
+ {"\341\274\246", "Ἦ"},
+ {""}, {""},
+#line 930 "u8_uc_map.txt"
+ {"\352\235\272", "Ꝺ"},
+ {""}, {""}, {""},
+#line 158 "u8_uc_map.txt"
+ {"\306\275", "Ƽ"},
+#line 609 "u8_uc_map.txt"
+ {"\341\273\253", "Ừ"},
+ {""}, {""}, {""},
+#line 430 "u8_uc_map.txt"
+ {"\325\253", "Ի"},
+ {""},
+#line 641 "u8_uc_map.txt"
+ {"\341\274\247", "Ἧ"},
+ {""},
+#line 185 "u8_uc_map.txt"
+ {"\310\205", "Ȅ"},
+#line 157 "u8_uc_map.txt"
+ {"\306\271", "Ƹ"},
+ {""}, {""},
+#line 591 "u8_uc_map.txt"
+ {"\341\273\207", "Ệ"},
+#line 72 "u8_uc_map.txt"
+ {"\304\225", "Ĕ"},
+ {""}, {""}, {""},
+#line 480 "u8_uc_map.txt"
+ {"\342\264\226", "Ⴖ"},
+ {""},
+#line 80 "u8_uc_map.txt"
+ {"\304\245", "Ĥ"},
+ {""}, {""},
+#line 625 "u8_uc_map.txt"
+ {"\341\274\205", "Ἅ"},
+ {""},
+#line 417 "u8_uc_map.txt"
+ {"\324\243", "Ԣ"},
+#line 900 "u8_uc_map.txt"
+ {"\352\234\265", "Ꜵ"},
+ {""},
+#line 722 "u8_uc_map.txt"
+ {"\342\223\225", "Ⓕ"},
+#line 456 "u8_uc_map.txt"
+ {"\326\205", "Օ"},
+ {""}, {""}, {""},
+#line 565 "u8_uc_map.txt"
+ {"\341\272\213", "Ẋ"},
+#line 62 "u8_uc_map.txt"
+ {"\304\201", "Ā"},
+ {""},
+#line 924 "u8_uc_map.txt"
+ {"\352\235\245", "Ꝥ"},
+#line 645 "u8_uc_map.txt"
+ {"\341\274\263", "Ἳ"},
+#line 533 "u8_uc_map.txt"
+ {"\341\271\213", "Ṋ"},
+ {""}, {""},
+#line 34 "u8_uc_map.txt"
+ {"\303\242", "Â"},
+#line 484 "u8_uc_map.txt"
+ {"\342\264\232", "Ⴚ"},
+#line 501 "u8_uc_map.txt"
+ {"\341\270\213", "Ḋ"},
+ {""}, {""},
+#line 603 "u8_uc_map.txt"
+ {"\341\273\237", "Ở"},
+#line 975 "u8_uc_map.txt"
+ {"\360\220\220\253", "𐐃"},
+#line 469 "u8_uc_map.txt"
+ {"\342\264\213", "Ⴋ"},
+ {""},
+#line 121 "u8_uc_map.txt"
+ {"\305\272", "Ź"},
+ {""}, {""},
+#line 810 "u8_uc_map.txt"
+ {"\342\262\213", "Ⲋ"},
+ {""}, {""},
+#line 579 "u8_uc_map.txt"
+ {"\341\272\257", "Ắ"},
+#line 992 "u8_uc_map.txt"
+ {"\360\220\220\274", "𐐔"},
+ {""},
+#line 1003 "u8_uc_map.txt"
+ {"\360\220\221\207", "𐐟"},
+#line 83 "u8_uc_map.txt"
+ {"\304\253", "Ī"},
+#line 551 "u8_uc_map.txt"
+ {"\341\271\257", "Ṯ"},
+#line 117 "u8_uc_map.txt"
+ {"\305\263", "Ų"},
+#line 934 "u8_uc_map.txt"
+ {"\352\236\201", "Ꞁ"},
+#line 564 "u8_uc_map.txt"
+ {"\341\272\211", "Ẉ"},
+ {""},
+#line 519 "u8_uc_map.txt"
+ {"\341\270\257", "Ḯ"},
+#line 127 "u8_uc_map.txt"
+ {"\311\224", "Ɔ"},
+ {""},
+#line 532 "u8_uc_map.txt"
+ {"\341\271\211", "Ṉ"},
+#line 44 "u8_uc_map.txt"
+ {"\303\254", "Ì"},
+#line 927 "u8_uc_map.txt"
+ {"\352\235\253", "Ꝫ"},
+ {""}, {""},
+#line 500 "u8_uc_map.txt"
+ {"\341\270\211", "Ḉ"},
+ {""},
+#line 828 "u8_uc_map.txt"
+ {"\342\262\257", "Ⲯ"},
+#line 162 "u8_uc_map.txt"
+ {"\307\224", "Ǔ"},
+#line 669 "u8_uc_map.txt"
+ {"\341\276\201", "ᾉ"},
+#line 467 "u8_uc_map.txt"
+ {"\342\264\211", "Ⴉ"},
+ {""},
+#line 931 "u8_uc_map.txt"
+ {"\352\235\274", "Ꝼ"},
+ {""},
+#line 909 "u8_uc_map.txt"
+ {"\352\235\207", "Ꝇ"},
+#line 809 "u8_uc_map.txt"
+ {"\342\262\211", "Ⲉ"},
+#line 225 "u8_uc_map.txt"
+ {"\316\254", "Ά"},
+#line 637 "u8_uc_map.txt"
+ {"\341\274\243", "Ἣ"},
+#line 944 "u8_uc_map.txt"
+ {"\352\236\247", "Ꞧ"},
+#line 690 "u8_uc_map.txt"
+ {"\341\276\246", "ᾮ"},
+ {""}, {""},
+#line 893 "u8_uc_map.txt"
+ {"\352\234\245", "Ꜥ"},
+#line 725 "u8_uc_map.txt"
+ {"\342\223\230", "Ⓘ"},
+ {""}, {""}, {""},
+#line 738 "u8_uc_map.txt"
+ {"\342\223\245", "Ⓥ"},
+ {""}, {""}, {""},
+#line 109 "u8_uc_map.txt"
+ {"\305\243", "Ţ"},
+#line 644 "u8_uc_map.txt"
+ {"\341\274\262", "Ἲ"},
+#line 691 "u8_uc_map.txt"
+ {"\341\276\247", "ᾯ"},
+#line 936 "u8_uc_map.txt"
+ {"\352\236\205", "Ꞅ"},
+ {""}, {""},
+#line 421 "u8_uc_map.txt"
+ {"\325\242", "Բ"},
+#line 460 "u8_uc_map.txt"
+ {"\342\264\202", "Ⴂ"},
+ {""}, {""}, {""},
+#line 617 "u8_uc_map.txt"
+ {"\341\273\273", "Ỻ"},
+ {""},
+#line 737 "u8_uc_map.txt"
+ {"\342\223\244", "Ⓤ"},
+ {""},
+#line 154 "u8_uc_map.txt"
+ {"\306\264", "Ƴ"},
+#line 921 "u8_uc_map.txt"
+ {"\352\235\237", "Ꝟ"},
+#line 652 "u8_uc_map.txt"
+ {"\341\275\202", "Ὂ"},
+#line 673 "u8_uc_map.txt"
+ {"\341\276\205", "ᾍ"},
+ {""},
+#line 180 "u8_uc_map.txt"
+ {"\307\273", "Ǻ"},
+ {""},
+#line 994 "u8_uc_map.txt"
+ {"\360\220\220\276", "𐐖"},
+ {""}, {""},
+#line 58 "u8_uc_map.txt"
+ {"\303\273", "Û"},
+#line 896 "u8_uc_map.txt"
+ {"\352\234\253", "Ꜫ"},
+#line 643 "u8_uc_map.txt"
+ {"\341\274\261", "Ἱ"},
+#line 633 "u8_uc_map.txt"
+ {"\341\274\225", "Ἕ"},
+ {""}, {""},
+#line 647 "u8_uc_map.txt"
+ {"\341\274\265", "Ἵ"},
+#line 696 "u8_uc_map.txt"
+ {"\341\276\263", "ᾼ"},
+ {""}, {""},
+#line 431 "u8_uc_map.txt"
+ {"\325\254", "Լ"},
+ {""}, {""}, {""},
+#line 64 "u8_uc_map.txt"
+ {"\304\205", "Ą"},
+#line 242 "u8_uc_map.txt"
+ {"\316\273", "Λ"},
+ {""}, {""},
+#line 683 "u8_uc_map.txt"
+ {"\341\276\227", "ᾟ"},
+ {""},
+#line 276 "u8_uc_map.txt"
+ {"\315\275", "Ͽ"},
+#line 472 "u8_uc_map.txt"
+ {"\342\264\216", "Ⴎ"},
+ {""}, {""}, {""}, {""},
+#line 646 "u8_uc_map.txt"
+ {"\341\274\264", "Ἴ"},
+ {""}, {""}, {""},
+#line 145 "u8_uc_map.txt"
+ {"\306\243", "Ƣ"},
+ {""},
+#line 991 "u8_uc_map.txt"
+ {"\360\220\220\273", "𐐓"},
+ {""}, {""},
+#line 118 "u8_uc_map.txt"
+ {"\305\265", "Ŵ"},
+#line 743 "u8_uc_map.txt"
+ {"\342\260\260", "Ⰰ"},
+ {""}, {""},
+#line 842 "u8_uc_map.txt"
+ {"\342\263\213", "Ⳋ"},
+ {""},
+#line 942 "u8_uc_map.txt"
+ {"\352\236\243", "Ꞣ"},
+#line 576 "u8_uc_map.txt"
+ {"\341\272\251", "Ẩ"},
+#line 304 "u8_uc_map.txt"
+ {"\320\273", "Л"},
+ {""}, {""},
+#line 694 "u8_uc_map.txt"
+ {"\341\275\260", "Ὰ"},
+#line 548 "u8_uc_map.txt"
+ {"\341\271\251", "Ṩ"},
+#line 541 "u8_uc_map.txt"
+ {"\341\271\233", "Ṛ"},
+ {""},
+#line 48 "u8_uc_map.txt"
+ {"\303\260", "Ð"},
+#line 732 "u8_uc_map.txt"
+ {"\342\223\237", "Ⓟ"},
+#line 516 "u8_uc_map.txt"
+ {"\341\270\251", "Ḩ"},
+#line 509 "u8_uc_map.txt"
+ {"\341\270\233", "Ḛ"},
+#line 410 "u8_uc_map.txt"
+ {"\324\225", "Ԕ"},
+ {""},
+#line 687 "u8_uc_map.txt"
+ {"\341\276\243", "ᾫ"},
+ {""},
+#line 485 "u8_uc_map.txt"
+ {"\342\264\233", "Ⴛ"},
+ {""},
+#line 418 "u8_uc_map.txt"
+ {"\324\245", "Ԥ"},
+#line 610 "u8_uc_map.txt"
+ {"\341\273\255", "Ử"},
+#line 825 "u8_uc_map.txt"
+ {"\342\262\251", "Ⲩ"},
+#line 818 "u8_uc_map.txt"
+ {"\342\262\233", "Ⲛ"},
+ {""},
+#line 446 "u8_uc_map.txt"
+ {"\325\273", "Ջ"},
+ {""},
+#line 799 "u8_uc_map.txt"
+ {"\311\220", "Ɐ"},
+ {""}, {""},
+#line 841 "u8_uc_map.txt"
+ {"\342\263\211", "Ⳉ"},
+#line 639 "u8_uc_map.txt"
+ {"\341\274\245", "Ἥ"},
+ {""}, {""},
+#line 400 "u8_uc_map.txt"
+ {"\324\201", "Ԁ"},
+#line 205 "u8_uc_map.txt"
+ {"\310\255", "Ȭ"},
+#line 569 "u8_uc_map.txt"
+ {"\341\272\223", "Ẓ"},
+#line 160 "u8_uc_map.txt"
+ {"\307\220", "Ǐ"},
+ {""}, {""},
+#line 174 "u8_uc_map.txt"
+ {"\307\255", "Ǭ"},
+#line 537 "u8_uc_map.txt"
+ {"\341\271\223", "Ṓ"},
+ {""}, {""}, {""},
+#line 45 "u8_uc_map.txt"
+ {"\303\255", "Í"},
+#line 505 "u8_uc_map.txt"
+ {"\341\270\223", "Ḓ"},
+ {""},
+#line 638 "u8_uc_map.txt"
+ {"\341\274\244", "Ἤ"},
+ {""}, {""},
+#line 477 "u8_uc_map.txt"
+ {"\342\264\223", "Ⴓ"},
+#line 129 "u8_uc_map.txt"
+ {"\311\226", "Ɖ"},
+#line 293 "u8_uc_map.txt"
+ {"\320\260", "А"},
+ {""}, {""},
+#line 814 "u8_uc_map.txt"
+ {"\342\262\223", "Ⲓ"},
+#line 693 "u8_uc_map.txt"
+ {"\341\276\261", "Ᾱ"},
+#line 681 "u8_uc_map.txt"
+ {"\341\276\225", "ᾝ"},
+ {""},
+#line 226 "u8_uc_map.txt"
+ {"\316\255", "Έ"},
+#line 657 "u8_uc_map.txt"
+ {"\341\275\223", "Ὓ"},
+#line 163 "u8_uc_map.txt"
+ {"\307\226", "Ǖ"},
+ {""}, {""}, {""}, {""},
+#line 977 "u8_uc_map.txt"
+ {"\360\220\220\255", "𐐅"},
+ {""}, {""}, {""},
+#line 903 "u8_uc_map.txt"
+ {"\352\234\273", "Ꜻ"},
+ {""}, {""}, {""},
+#line 435 "u8_uc_map.txt"
+ {"\325\260", "Հ"},
+ {""},
+#line 466 "u8_uc_map.txt"
+ {"\342\264\210", "Ⴈ"},
+#line 627 "u8_uc_map.txt"
+ {"\341\274\207", "Ἇ"},
+ {""},
+#line 210 "u8_uc_map.txt"
+ {"\310\274", "Ȼ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 857 "u8_uc_map.txt"
+ {"\352\231\201", "Ꙁ"},
+#line 102 "u8_uc_map.txt"
+ {"\305\225", "Ŕ"},
+#line 59 "u8_uc_map.txt"
+ {"\303\274", "Ü"},
+#line 928 "u8_uc_map.txt"
+ {"\352\235\255", "Ꝭ"},
+ {""}, {""}, {""},
+#line 110 "u8_uc_map.txt"
+ {"\305\245", "Ť"},
+#line 735 "u8_uc_map.txt"
+ {"\342\223\242", "Ⓢ"},
+#line 223 "u8_uc_map.txt"
+ {"\315\263", "Ͳ"},
+ {""},
+#line 217 "u8_uc_map.txt"
+ {"\311\207", "Ɇ"},
+ {""}, {""}, {""}, {""},
+#line 186 "u8_uc_map.txt"
+ {"\310\207", "Ȇ"},
+#line 243 "u8_uc_map.txt"
+ {"\316\274", "Μ"},
+ {""},
+#line 1006 "u8_uc_map.txt"
+ {"\360\220\221\212", "𐐢"},
+ {""},
+#line 218 "u8_uc_map.txt"
+ {"\311\211", "Ɉ"},
+#line 432 "u8_uc_map.txt"
+ {"\325\255", "Խ"},
+#line 943 "u8_uc_map.txt"
+ {"\352\236\245", "Ꞥ"},
+#line 876 "u8_uc_map.txt"
+ {"\352\231\247", "Ꙧ"},
+#line 717 "u8_uc_map.txt"
+ {"\342\223\220", "Ⓐ"},
+#line 187 "u8_uc_map.txt"
+ {"\310\211", "Ȉ"},
+ {""}, {""},
+#line 568 "u8_uc_map.txt"
+ {"\341\272\221", "Ẑ"},
+#line 593 "u8_uc_map.txt"
+ {"\341\273\213", "Ị"},
+#line 864 "u8_uc_map.txt"
+ {"\352\231\217", "Ꙏ"},
+#line 42 "u8_uc_map.txt"
+ {"\303\252", "Ê"},
+ {""},
+#line 536 "u8_uc_map.txt"
+ {"\341\271\221", "Ṑ"},
+ {""}, {""}, {""},
+#line 689 "u8_uc_map.txt"
+ {"\341\276\245", "ᾭ"},
+#line 504 "u8_uc_map.txt"
+ {"\341\270\221", "Ḑ"},
+#line 859 "u8_uc_map.txt"
+ {"\352\231\205", "Ꙅ"},
+#line 880 "u8_uc_map.txt"
+ {"\352\232\201", "Ꚁ"},
+ {""}, {""},
+#line 475 "u8_uc_map.txt"
+ {"\342\264\221", "Ⴑ"},
+#line 305 "u8_uc_map.txt"
+ {"\320\274", "М"},
+#line 850 "u8_uc_map.txt"
+ {"\342\263\233", "Ⳛ"},
+#line 113 "u8_uc_map.txt"
+ {"\305\253", "Ū"},
+ {""},
+#line 813 "u8_uc_map.txt"
+ {"\342\262\221", "Ⲑ"},
+ {""},
+#line 402 "u8_uc_map.txt"
+ {"\324\205", "Ԅ"},
+ {""},
+#line 611 "u8_uc_map.txt"
+ {"\341\273\257", "Ữ"},
+#line 656 "u8_uc_map.txt"
+ {"\341\275\221", "Ὑ"},
+#line 688 "u8_uc_map.txt"
+ {"\341\276\244", "ᾬ"},
+#line 177 "u8_uc_map.txt"
+ {"\306\225", "Ƕ"},
+#line 340 "u8_uc_map.txt"
+ {"\321\277", "Ѿ"},
+#line 897 "u8_uc_map.txt"
+ {"\352\234\255", "Ꜭ"},
+#line 703 "u8_uc_map.txt"
+ {"\341\277\221", "Ῑ"},
+ {""},
+#line 592 "u8_uc_map.txt"
+ {"\341\273\211", "Ỉ"},
+#line 146 "u8_uc_map.txt"
+ {"\306\245", "Ƥ"},
+#line 572 "u8_uc_map.txt"
+ {"\341\272\241", "Ạ"},
+ {""},
+#line 868 "u8_uc_map.txt"
+ {"\352\231\227", "Ꙗ"},
+ {""},
+#line 447 "u8_uc_map.txt"
+ {"\325\274", "Ռ"},
+#line 544 "u8_uc_map.txt"
+ {"\341\271\241", "Ṡ"},
+ {""},
+#line 937 "u8_uc_map.txt"
+ {"\352\236\207", "Ꞇ"},
+ {""},
+#line 887 "u8_uc_map.txt"
+ {"\352\232\217", "Ꚏ"},
+#line 512 "u8_uc_map.txt"
+ {"\341\270\241", "Ḡ"},
+#line 490 "u8_uc_map.txt"
+ {"\342\264\240", "Ⴠ"},
+ {""},
+#line 1007 "u8_uc_map.txt"
+ {"\360\220\221\213", "𐐣"},
+#line 84 "u8_uc_map.txt"
+ {"\304\255", "Ĭ"},
+#line 491 "u8_uc_map.txt"
+ {"\342\264\241", "Ⴡ"},
+#line 846 "u8_uc_map.txt"
+ {"\342\263\223", "Ⳓ"},
+ {""},
+#line 882 "u8_uc_map.txt"
+ {"\352\232\205", "Ꚅ"},
+#line 339 "u8_uc_map.txt"
+ {"\321\275", "Ѽ"},
+#line 821 "u8_uc_map.txt"
+ {"\342\262\241", "Ⲡ"},
+#line 660 "u8_uc_map.txt"
+ {"\341\275\240", "Ὠ"},
+#line 675 "u8_uc_map.txt"
+ {"\341\276\207", "ᾏ"},
+ {""}, {""},
+#line 661 "u8_uc_map.txt"
+ {"\341\275\241", "Ὡ"},
+#line 706 "u8_uc_map.txt"
+ {"\341\277\240", "Ῠ"},
+#line 721 "u8_uc_map.txt"
+ {"\342\223\224", "Ⓔ"},
+#line 284 "u8_uc_map.txt"
+ {"\321\227", "Ї"},
+#line 337 "u8_uc_map.txt"
+ {"\321\271", "Ѹ"},
+#line 707 "u8_uc_map.txt"
+ {"\341\277\241", "Ῡ"},
+ {""}, {""}, {""},
+#line 429 "u8_uc_map.txt"
+ {"\325\252", "Ժ"},
+ {""},
+#line 979 "u8_uc_map.txt"
+ {"\360\220\220\257", "𐐇"},
+#line 911 "u8_uc_map.txt"
+ {"\352\235\213", "Ꝋ"},
+ {""}, {""},
+#line 874 "u8_uc_map.txt"
+ {"\352\231\243", "Ꙣ"},
+ {""}, {""},
+#line 891 "u8_uc_map.txt"
+ {"\352\232\227", "Ꚗ"},
+#line 1005 "u8_uc_map.txt"
+ {"\360\220\221\211", "𐐡"},
+#line 636 "u8_uc_map.txt"
+ {"\341\274\242", "Ἢ"},
+ {""}, {""}, {""}, {""},
+#line 486 "u8_uc_map.txt"
+ {"\342\264\234", "Ⴜ"},
+#line 561 "u8_uc_map.txt"
+ {"\341\272\203", "Ẃ"},
+ {""}, {""}, {""},
+#line 476 "u8_uc_map.txt"
+ {"\342\264\222", "Ⴒ"},
+#line 529 "u8_uc_map.txt"
+ {"\341\271\203", "Ṃ"},
+ {""}, {""},
+#line 90 "u8_uc_map.txt"
+ {"\304\274", "Ļ"},
+#line 929 "u8_uc_map.txt"
+ {"\352\235\257", "Ꝯ"},
+#line 497 "u8_uc_map.txt"
+ {"\341\270\203", "Ḃ"},
+#line 628 "u8_uc_map.txt"
+ {"\341\274\220", "Ἐ"},
+ {""},
+#line 141 "u8_uc_map.txt"
+ {"\311\257", "Ɯ"},
+#line 583 "u8_uc_map.txt"
+ {"\341\272\267", "Ặ"},
+#line 461 "u8_uc_map.txt"
+ {"\342\264\203", "Ⴃ"},
+#line 723 "u8_uc_map.txt"
+ {"\342\223\226", "Ⓖ"},
+#line 910 "u8_uc_map.txt"
+ {"\352\235\211", "Ꝉ"},
+#line 206 "u8_uc_map.txt"
+ {"\310\257", "Ȯ"},
+#line 555 "u8_uc_map.txt"
+ {"\341\271\267", "Ṷ"},
+#line 806 "u8_uc_map.txt"
+ {"\342\262\203", "Ⲃ"},
+#line 998 "u8_uc_map.txt"
+ {"\360\220\221\202", "𐐚"},
+ {""},
+#line 175 "u8_uc_map.txt"
+ {"\307\257", "Ǯ"},
+#line 523 "u8_uc_map.txt"
+ {"\341\270\267", "Ḷ"},
+#line 653 "u8_uc_map.txt"
+ {"\341\275\203", "Ὃ"},
+ {""}, {""},
+#line 47 "u8_uc_map.txt"
+ {"\303\257", "Ï"},
+#line 750 "u8_uc_map.txt"
+ {"\342\260\267", "Ⰷ"},
+#line 701 "u8_uc_map.txt"
+ {"\341\277\203", "ῌ"},
+#line 867 "u8_uc_map.txt"
+ {"\352\231\225", "Ꙕ"},
+#line 65 "u8_uc_map.txt"
+ {"\304\207", "Ć"},
+ {""},
+#line 832 "u8_uc_map.txt"
+ {"\342\262\267", "Ⲷ"},
+ {""}, {""}, {""}, {""},
+#line 705 "u8_uc_map.txt"
+ {"\341\275\267", "Ί"},
+#line 727 "u8_uc_map.txt"
+ {"\342\223\232", "Ⓚ"},
+ {""},
+#line 66 "u8_uc_map.txt"
+ {"\304\211", "Ĉ"},
+#line 228 "u8_uc_map.txt"
+ {"\316\257", "Ί"},
+#line 540 "u8_uc_map.txt"
+ {"\341\271\231", "Ṙ"},
+ {""},
+#line 845 "u8_uc_map.txt"
+ {"\342\263\221", "Ⳑ"},
+ {""},
+#line 61 "u8_uc_map.txt"
+ {"\303\276", "Þ"},
+#line 508 "u8_uc_map.txt"
+ {"\341\270\231", "Ḙ"},
+#line 608 "u8_uc_map.txt"
+ {"\341\273\251", "Ứ"},
+#line 601 "u8_uc_map.txt"
+ {"\341\273\233", "Ớ"},
+ {""},
+#line 399 "u8_uc_map.txt"
+ {"\323\277", "Ӿ"},
+#line 483 "u8_uc_map.txt"
+ {"\342\264\231", "Ⴙ"},
+#line 972 "u8_uc_map.txt"
+ {"\360\220\220\250", "𐐀"},
+ {""}, {""}, {""},
+#line 817 "u8_uc_map.txt"
+ {"\342\262\231", "Ⲙ"},
+#line 1010 "u8_uc_map.txt"
+ {"\360\220\221\216", "𐐦"},
+#line 760 "u8_uc_map.txt"
+ {"\342\261\201", "Ⱁ"},
+ {""},
+#line 245 "u8_uc_map.txt"
+ {"\316\276", "Ξ"},
+#line 898 "u8_uc_map.txt"
+ {"\352\234\257", "Ꜯ"},
+ {""}, {""},
+#line 126 "u8_uc_map.txt"
+ {"\306\205", "Ƅ"},
+ {""}, {""}, {""},
+#line 212 "u8_uc_map.txt"
+ {"\342\261\246", "Ⱦ"},
+#line 890 "u8_uc_map.txt"
+ {"\352\232\225", "Ꚕ"},
+ {""},
+#line 464 "u8_uc_map.txt"
+ {"\342\264\206", "Ⴆ"},
+#line 980 "u8_uc_map.txt"
+ {"\360\220\220\260", "𐐈"},
+#line 632 "u8_uc_map.txt"
+ {"\341\274\224", "Ἔ"},
+ {""},
+#line 398 "u8_uc_map.txt"
+ {"\323\275", "Ӽ"},
+ {""},
+#line 853 "u8_uc_map.txt"
+ {"\342\263\241", "Ⳡ"},
+ {""}, {""}, {""},
+#line 597 "u8_uc_map.txt"
+ {"\341\273\223", "Ồ"},
+#line 334 "u8_uc_map.txt"
+ {"\321\263", "Ѳ"},
+ {""},
+#line 379 "u8_uc_map.txt"
+ {"\323\227", "Ӗ"},
+#line 396 "u8_uc_map.txt"
+ {"\323\271", "Ӹ"},
+#line 686 "u8_uc_map.txt"
+ {"\341\276\242", "ᾪ"},
+ {""},
+#line 307 "u8_uc_map.txt"
+ {"\320\276", "О"},
+#line 774 "u8_uc_map.txt"
+ {"\342\261\217", "Ⱏ"},
+#line 434 "u8_uc_map.txt"
+ {"\325\257", "Կ"},
+#line 749 "u8_uc_map.txt"
+ {"\342\260\266", "Ⰶ"},
+ {""},
+#line 973 "u8_uc_map.txt"
+ {"\360\220\220\251", "𐐁"},
+ {""}, {""},
+#line 875 "u8_uc_map.txt"
+ {"\352\231\245", "Ꙥ"},
+ {""},
+#line 764 "u8_uc_map.txt"
+ {"\342\261\205", "Ⱅ"},
+ {""}, {""},
+#line 704 "u8_uc_map.txt"
+ {"\341\275\266", "Ὶ"},
+ {""},
+#line 676 "u8_uc_map.txt"
+ {"\341\276\220", "ᾘ"},
+ {""}, {""},
+#line 202 "u8_uc_map.txt"
+ {"\310\247", "Ȧ"},
+ {""}, {""}, {""},
+#line 449 "u8_uc_map.txt"
+ {"\325\276", "Վ"},
+#line 171 "u8_uc_map.txt"
+ {"\307\247", "Ǧ"},
+#line 801 "u8_uc_map.txt"
+ {"\342\261\263", "Ⱳ"},
+ {""},
+#line 259 "u8_uc_map.txt"
+ {"\317\227", "Ϗ"},
+#line 368 "u8_uc_map.txt"
+ {"\322\277", "Ҿ"},
+#line 39 "u8_uc_map.txt"
+ {"\303\247", "Ç"},
+#line 926 "u8_uc_map.txt"
+ {"\352\235\251", "Ꝩ"},
+#line 919 "u8_uc_map.txt"
+ {"\352\235\233", "Ꝛ"},
+#line 566 "u8_uc_map.txt"
+ {"\341\272\215", "Ẍ"},
+#line 326 "u8_uc_map.txt"
+ {"\321\243", "Ѣ"},
+ {""},
+#line 974 "u8_uc_map.txt"
+ {"\360\220\220\252", "𐐂"},
+#line 782 "u8_uc_map.txt"
+ {"\342\261\227", "Ⱗ"},
+#line 534 "u8_uc_map.txt"
+ {"\341\271\215", "Ṍ"},
+ {""},
+#line 470 "u8_uc_map.txt"
+ {"\342\264\214", "Ⴌ"},
+ {""},
+#line 838 "u8_uc_map.txt"
+ {"\342\263\203", "Ⳃ"},
+#line 502 "u8_uc_map.txt"
+ {"\341\270\215", "Ḍ"},
+ {""},
+#line 878 "u8_uc_map.txt"
+ {"\352\231\253", "Ꙫ"},
+#line 285 "u8_uc_map.txt"
+ {"\321\230", "Ј"},
+#line 46 "u8_uc_map.txt"
+ {"\303\256", "Î"},
+#line 471 "u8_uc_map.txt"
+ {"\342\264\215", "Ⴍ"},
+ {""},
+#line 741 "u8_uc_map.txt"
+ {"\342\223\250", "Ⓨ"},
+#line 542 "u8_uc_map.txt"
+ {"\341\271\235", "Ṝ"},
+ {""},
+#line 811 "u8_uc_map.txt"
+ {"\342\262\215", "Ⲍ"},
+#line 367 "u8_uc_map.txt"
+ {"\322\275", "Ҽ"},
+ {""},
+#line 510 "u8_uc_map.txt"
+ {"\341\270\235", "Ḝ"},
+#line 860 "u8_uc_map.txt"
+ {"\352\231\207", "Ꙇ"},
+ {""},
+#line 85 "u8_uc_map.txt"
+ {"\304\257", "Į"},
+ {""},
+#line 487 "u8_uc_map.txt"
+ {"\342\264\235", "Ⴝ"},
+#line 227 "u8_uc_map.txt"
+ {"\316\256", "Ή"},
+#line 348 "u8_uc_map.txt"
+ {"\322\227", "Җ"},
+#line 365 "u8_uc_map.txt"
+ {"\322\271", "Ҹ"},
+#line 915 "u8_uc_map.txt"
+ {"\352\235\223", "Ꝓ"},
+#line 819 "u8_uc_map.txt"
+ {"\342\262\235", "Ⲝ"},
+#line 1004 "u8_uc_map.txt"
+ {"\360\220\221\210", "𐐠"},
+#line 215 "u8_uc_map.txt"
+ {"\312\211", "Ʉ"},
+ {""},
+#line 462 "u8_uc_map.txt"
+ {"\342\264\204", "Ⴄ"},
+ {""}, {""}, {""}, {""},
+#line 751 "u8_uc_map.txt"
+ {"\342\260\270", "Ⰸ"},
+#line 596 "u8_uc_map.txt"
+ {"\341\273\221", "Ố"},
+ {""}, {""},
+#line 91 "u8_uc_map.txt"
+ {"\304\276", "Ľ"},
+#line 654 "u8_uc_map.txt"
+ {"\341\275\204", "Ὄ"},
+#line 849 "u8_uc_map.txt"
+ {"\342\263\231", "Ⳙ"},
+#line 680 "u8_uc_map.txt"
+ {"\341\276\224", "ᾜ"},
+ {""},
+#line 55 "u8_uc_map.txt"
+ {"\303\270", "Ø"},
+#line 711 "u8_uc_map.txt"
+ {"\341\275\270", "Ὸ"},
+#line 895 "u8_uc_map.txt"
+ {"\352\234\251", "Ꜩ"},
+#line 150 "u8_uc_map.txt"
+ {"\312\210", "Ʈ"},
+ {""},
+#line 272 "u8_uc_map.txt"
+ {"\317\262", "Ϲ"},
+#line 872 "u8_uc_map.txt"
+ {"\352\231\237", "Ꙟ"},
+#line 742 "u8_uc_map.txt"
+ {"\342\223\251", "Ⓩ"},
+#line 728 "u8_uc_map.txt"
+ {"\342\223\233", "Ⓛ"},
+ {""},
+#line 335 "u8_uc_map.txt"
+ {"\321\265", "Ѵ"},
+#line 426 "u8_uc_map.txt"
+ {"\325\247", "Է"},
+ {""}, {""},
+#line 883 "u8_uc_map.txt"
+ {"\352\232\207", "Ꚇ"},
+#line 239 "u8_uc_map.txt"
+ {"\316\270", "Θ"},
+ {""}, {""},
+#line 219 "u8_uc_map.txt"
+ {"\311\213", "Ɋ"},
+ {""}, {""}, {""},
+#line 393 "u8_uc_map.txt"
+ {"\323\263", "Ӳ"},
+#line 188 "u8_uc_map.txt"
+ {"\310\213", "Ȋ"},
+#line 403 "u8_uc_map.txt"
+ {"\324\207", "Ԇ"},
+ {""},
+#line 604 "u8_uc_map.txt"
+ {"\341\273\241", "Ỡ"},
+ {""},
+#line 433 "u8_uc_map.txt"
+ {"\325\256", "Ծ"},
+ {""},
+#line 114 "u8_uc_map.txt"
+ {"\305\255", "Ŭ"},
+#line 798 "u8_uc_map.txt"
+ {"\311\261", "Ɱ"},
+#line 622 "u8_uc_map.txt"
+ {"\341\274\202", "Ἂ"},
+#line 780 "u8_uc_map.txt"
+ {"\342\261\225", "Ⱕ"},
+#line 404 "u8_uc_map.txt"
+ {"\324\211", "Ԉ"},
+#line 856 "u8_uc_map.txt"
+ {"\342\263\256", "Ⳮ"},
+#line 207 "u8_uc_map.txt"
+ {"\310\261", "Ȱ"},
+ {""},
+#line 682 "u8_uc_map.txt"
+ {"\341\276\226", "ᾞ"},
+ {""},
+#line 124 "u8_uc_map.txt"
+ {"\311\223", "Ɓ"},
+#line 720 "u8_uc_map.txt"
+ {"\342\223\223", "Ⓓ"},
+ {""},
+#line 301 "u8_uc_map.txt"
+ {"\320\270", "И"},
+ {""},
+#line 192 "u8_uc_map.txt"
+ {"\310\223", "Ȓ"},
+#line 49 "u8_uc_map.txt"
+ {"\303\261", "Ñ"},
+ {""}, {""}, {""},
+#line 151 "u8_uc_map.txt"
+ {"\306\260", "Ư"},
+ {""}, {""},
+#line 716 "u8_uc_map.txt"
+ {"\342\205\216", "Ⅎ"},
+ {""}, {""}, {""},
+#line 457 "u8_uc_map.txt"
+ {"\326\206", "Ֆ"},
+ {""}, {""},
+#line 385 "u8_uc_map.txt"
+ {"\323\243", "Ӣ"},
+#line 232 "u8_uc_map.txt"
+ {"\316\261", "Α"},
+#line 914 "u8_uc_map.txt"
+ {"\352\235\221", "Ꝑ"},
+ {""}, {""},
+#line 443 "u8_uc_map.txt"
+ {"\325\270", "Ո"},
+#line 81 "u8_uc_map.txt"
+ {"\304\247", "Ħ"},
+ {""}, {""}, {""},
+#line 166 "u8_uc_map.txt"
+ {"\307\234", "Ǜ"},
+ {""}, {""}, {""}, {""},
+#line 122 "u8_uc_map.txt"
+ {"\305\274", "Ż"},
+ {""},
+#line 589 "u8_uc_map.txt"
+ {"\341\273\203", "Ể"},
+ {""}, {""},
+#line 843 "u8_uc_map.txt"
+ {"\342\263\215", "Ⳍ"},
+#line 796 "u8_uc_map.txt"
+ {"\342\261\254", "Ⱬ"},
+ {""}, {""}, {""},
+#line 149 "u8_uc_map.txt"
+ {"\306\255", "Ƭ"},
+#line 642 "u8_uc_map.txt"
+ {"\341\274\260", "Ἰ"},
+#line 362 "u8_uc_map.txt"
+ {"\322\263", "Ҳ"},
+ {""},
+#line 294 "u8_uc_map.txt"
+ {"\320\261", "Б"},
+#line 264 "u8_uc_map.txt"
+ {"\317\243", "Ϣ"},
+#line 615 "u8_uc_map.txt"
+ {"\341\273\267", "Ỷ"},
+ {""},
+#line 851 "u8_uc_map.txt"
+ {"\342\263\235", "Ⳝ"},
+ {""}, {""},
+#line 922 "u8_uc_map.txt"
+ {"\352\235\241", "Ꝡ"},
+#line 783 "u8_uc_map.txt"
+ {"\342\261\230", "Ⱘ"},
+ {""}, {""}, {""},
+#line 209 "u8_uc_map.txt"
+ {"\342\261\245", "Ⱥ"},
+#line 946 "u8_uc_map.txt"
+ {" , \357\275\201"},
+ {""},
+#line 282 "u8_uc_map.txt"
+ {"\321\225", "Ѕ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 327 "u8_uc_map.txt"
+ {"\321\245", "Ѥ"},
+#line 436 "u8_uc_map.txt"
+ {"\325\261", "Ձ"},
+ {""}, {""}, {""}, {""},
+#line 600 "u8_uc_map.txt"
+ {"\341\273\231", "Ộ"},
+ {""}, {""}, {""},
+#line 394 "u8_uc_map.txt"
+ {"\323\265", "Ӵ"},
+ {""},
+#line 718 "u8_uc_map.txt"
+ {"\342\223\221", "Ⓑ"},
+#line 999 "u8_uc_map.txt"
+ {"\360\220\221\203", "𐐛"},
+#line 310 "u8_uc_map.txt"
+ {"\321\201", "С"},
+#line 354 "u8_uc_map.txt"
+ {"\322\243", "Ң"},
+ {""},
+#line 670 "u8_uc_map.txt"
+ {"\341\276\202", "ᾊ"},
+#line 96 "u8_uc_map.txt"
+ {"\305\210", "Ň"},
+ {""}, {""}, {""}, {""},
+#line 960 "u8_uc_map.txt"
+ {" , \357\275\217"},
+ {""}, {""}, {""},
+#line 987 "u8_uc_map.txt"
+ {"\360\220\220\267", "𐐏"},
+ {""}, {""}, {""},
+#line 631 "u8_uc_map.txt"
+ {"\341\274\223", "Ἓ"},
+#line 950 "u8_uc_map.txt"
+ {" , \357\275\205"},
+ {""}, {""},
+#line 274 "u8_uc_map.txt"
+ {"\315\273", "Ͻ"},
+#line 879 "u8_uc_map.txt"
+ {"\352\231\255", "Ꙭ"},
+#line 907 "u8_uc_map.txt"
+ {"\352\235\203", "Ꝃ"},
+#line 766 "u8_uc_map.txt"
+ {"\342\261\207", "Ⱇ"},
+ {""},
+#line 330 "u8_uc_map.txt"
+ {"\321\253", "Ѫ"},
+ {""},
+#line 733 "u8_uc_map.txt"
+ {"\342\223\240", "Ⓠ"},
+#line 67 "u8_uc_map.txt"
+ {"\304\213", "Ċ"},
+ {""}, {""},
+#line 734 "u8_uc_map.txt"
+ {"\342\223\241", "Ⓡ"},
+ {""}, {""}, {""}, {""},
+#line 197 "u8_uc_map.txt"
+ {"\310\235", "Ȝ"},
+#line 165 "u8_uc_map.txt"
+ {"\307\232", "Ǚ"},
+ {""}, {""}, {""},
+#line 132 "u8_uc_map.txt"
+ {"\307\235", "Ǝ"},
+#line 968 "u8_uc_map.txt"
+ {" , \357\275\227"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 71 "u8_uc_map.txt"
+ {"\304\223", "Ē"},
+ {""}, {""}, {""}, {""}, {""},
+#line 692 "u8_uc_map.txt"
+ {"\341\276\260", "Ᾰ"},
+#line 1002 "u8_uc_map.txt"
+ {"\360\220\221\206", "𐐞"},
+#line 128 "u8_uc_map.txt"
+ {"\306\210", "Ƈ"},
+ {""},
+#line 363 "u8_uc_map.txt"
+ {"\322\265", "Ҵ"},
+#line 918 "u8_uc_map.txt"
+ {"\352\235\231", "Ꝙ"},
+#line 945 "u8_uc_map.txt"
+ {"\352\236\251", "Ꞩ"},
+ {""}, {""}, {""},
+#line 729 "u8_uc_map.txt"
+ {"\342\223\234", "Ⓜ"},
+ {""}, {""}, {""}, {""},
+#line 719 "u8_uc_map.txt"
+ {"\342\223\222", "Ⓒ"},
+ {""}, {""},
+#line 594 "u8_uc_map.txt"
+ {"\341\273\215", "Ọ"},
+#line 978 "u8_uc_map.txt"
+ {"\360\220\220\256", "𐐆"},
+ {""},
+#line 986 "u8_uc_map.txt"
+ {"\360\220\220\266", "𐐎"},
+#line 198 "u8_uc_map.txt"
+ {"\310\237", "Ȟ"},
+ {""}, {""}, {""}, {""},
+#line 167 "u8_uc_map.txt"
+ {"\307\237", "Ǟ"},
+ {""}, {""}, {""},
+#line 602 "u8_uc_map.txt"
+ {"\341\273\235", "Ờ"},
+#line 571 "u8_uc_map.txt"
+ {"\303\237", "ẞ"},
+#line 378 "u8_uc_map.txt"
+ {"\323\225", "Ӕ"},
+#line 115 "u8_uc_map.txt"
+ {"\305\257", "Ů"},
+#line 901 "u8_uc_map.txt"
+ {"\352\234\267", "Ꜷ"},
+ {""}, {""}, {""},
+#line 386 "u8_uc_map.txt"
+ {"\323\245", "Ӥ"},
+ {""},
+#line 629 "u8_uc_map.txt"
+ {"\341\274\221", "Ἑ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 314 "u8_uc_map.txt"
+ {"\321\205", "Х"},
+ {""},
+#line 419 "u8_uc_map.txt"
+ {"\324\247", "Ԧ"},
+ {""}, {""}, {""},
+#line 123 "u8_uc_map.txt"
+ {"\305\276", "Ž"},
+#line 679 "u8_uc_map.txt"
+ {"\341\276\223", "ᾛ"},
+#line 1008 "u8_uc_map.txt"
+ {"\360\220\221\214", "𐐤"},
+ {""}, {""}, {""}, {""}, {""},
+#line 862 "u8_uc_map.txt"
+ {"\352\231\213", "Ꙋ"},
+ {""},
+#line 1009 "u8_uc_map.txt"
+ {"\360\220\221\215", "𐐥"},
+#line 726 "u8_uc_map.txt"
+ {"\342\223\231", "Ⓙ"},
+#line 966 "u8_uc_map.txt"
+ {" , \357\275\225"},
+ {""}, {""},
+#line 265 "u8_uc_map.txt"
+ {"\317\245", "Ϥ"},
+ {""},
+#line 634 "u8_uc_map.txt"
+ {"\341\274\240", "Ἠ"},
+ {""}, {""}, {""},
+#line 635 "u8_uc_map.txt"
+ {"\341\274\241", "Ἡ"},
+ {""}, {""}, {""},
+#line 389 "u8_uc_map.txt"
+ {"\323\253", "Ӫ"},
+ {""}, {""}, {""},
+#line 248 "u8_uc_map.txt"
+ {"\317\201", "Ρ"},
+ {""}, {""},
+#line 1000 "u8_uc_map.txt"
+ {"\360\220\221\204", "𐐜"},
+#line 153 "u8_uc_map.txt"
+ {"\312\213", "Ʋ"},
+#line 912 "u8_uc_map.txt"
+ {"\352\235\215", "Ꝍ"},
+#line 458 "u8_uc_map.txt"
+ {"\342\264\200", "Ⴀ"},
+ {""},
+#line 988 "u8_uc_map.txt"
+ {"\360\220\220\270", "𐐐"},
+ {""},
+#line 861 "u8_uc_map.txt"
+ {"\352\231\211", "Ꙉ"},
+#line 275 "u8_uc_map.txt"
+ {"\315\274", "Ͼ"},
+ {""}, {""}, {""},
+#line 347 "u8_uc_map.txt"
+ {"\322\225", "Ҕ"},
+#line 650 "u8_uc_map.txt"
+ {"\341\275\200", "Ὀ"},
+ {""},
+#line 920 "u8_uc_map.txt"
+ {"\352\235\235", "Ꝝ"},
+#line 775 "u8_uc_map.txt"
+ {"\342\261\220", "Ⱐ"},
+#line 885 "u8_uc_map.txt"
+ {"\352\232\213", "Ꚋ"},
+#line 355 "u8_uc_map.txt"
+ {"\322\245", "Ҥ"},
+ {""},
+#line 804 "u8_uc_map.txt"
+ {"\311\200", "Ɀ"},
+ {""}, {""},
+#line 268 "u8_uc_map.txt"
+ {"\317\253", "Ϫ"},
+#line 76 "u8_uc_map.txt"
+ {"\304\235", "Ĝ"},
+#line 281 "u8_uc_map.txt"
+ {"\321\224", "Є"},
+ {""}, {""},
+#line 54 "u8_uc_map.txt"
+ {"\303\266", "Ö"},
+#line 630 "u8_uc_map.txt"
+ {"\341\274\222", "Ἒ"},
+ {""}, {""},
+#line 341 "u8_uc_map.txt"
+ {"\322\201", "Ҁ"},
+#line 238 "u8_uc_map.txt"
+ {"\316\267", "Η"},
+ {""},
+#line 940 "u8_uc_map.txt"
+ {"\352\236\221", "Ꞑ"},
+ {""}, {""}, {""},
+#line 111 "u8_uc_map.txt"
+ {"\305\247", "Ŧ"},
+#line 623 "u8_uc_map.txt"
+ {"\341\274\203", "Ἃ"},
+ {""}, {""},
+#line 237 "u8_uc_map.txt"
+ {"\316\266", "Ζ"},
+#line 969 "u8_uc_map.txt"
+ {" , \357\275\230"},
+#line 451 "u8_uc_map.txt"
+ {"\326\200", "Ր"},
+ {""}, {""},
+#line 884 "u8_uc_map.txt"
+ {"\352\232\211", "Ꚉ"},
+ {""},
+#line 677 "u8_uc_map.txt"
+ {"\341\276\221", "ᾙ"},
+#line 405 "u8_uc_map.txt"
+ {"\324\213", "Ԋ"},
+ {""}, {""},
+#line 649 "u8_uc_map.txt"
+ {"\341\274\267", "Ἷ"},
+#line 134 "u8_uc_map.txt"
+ {"\311\233", "Ɛ"},
+ {""}, {""},
+#line 358 "u8_uc_map.txt"
+ {"\322\253", "Ҫ"},
+#line 136 "u8_uc_map.txt"
+ {"\311\240", "Ɠ"},
+#line 196 "u8_uc_map.txt"
+ {"\310\233", "Ț"},
+#line 300 "u8_uc_map.txt"
+ {"\320\267", "З"},
+ {""}, {""}, {""},
+#line 213 "u8_uc_map.txt"
+ {"\311\202", "Ɂ"},
+#line 77 "u8_uc_map.txt"
+ {"\304\237", "Ğ"},
+ {""},
+#line 338 "u8_uc_map.txt"
+ {"\321\273", "Ѻ"},
+#line 941 "u8_uc_map.txt"
+ {"\352\236\241", "Ꞡ"},
+ {""},
+#line 299 "u8_uc_map.txt"
+ {"\320\266", "Ж"},
+ {""},
+#line 409 "u8_uc_map.txt"
+ {"\324\223", "Ԓ"},
+#line 32 "u8_uc_map.txt"
+ {"\303\240", "À"},
+#line 730 "u8_uc_map.txt"
+ {"\342\223\235", "Ⓝ"},
+ {""}, {""}, {""}, {""},
+#line 684 "u8_uc_map.txt"
+ {"\341\276\240", "ᾨ"},
+#line 779 "u8_uc_map.txt"
+ {"\342\261\224", "Ⱔ"},
+ {""},
+#line 442 "u8_uc_map.txt"
+ {"\325\267", "Շ"},
+#line 685 "u8_uc_map.txt"
+ {"\341\276\241", "ᾩ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 453 "u8_uc_map.txt"
+ {"\326\202", "Ւ"},
+ {""}, {""},
+#line 441 "u8_uc_map.txt"
+ {"\325\266", "Ն"},
+#line 769 "u8_uc_map.txt"
+ {"\342\261\212", "Ⱊ"},
+#line 952 "u8_uc_map.txt"
+ {" , \357\275\207"},
+ {""}, {""}, {""},
+#line 626 "u8_uc_map.txt"
+ {"\341\274\206", "Ἆ"},
+ {""}, {""},
+#line 252 "u8_uc_map.txt"
+ {"\317\205", "Υ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 877 "u8_uc_map.txt"
+ {"\352\231\251", "Ꙩ"},
+#line 870 "u8_uc_map.txt"
+ {"\352\231\233", "Ꙛ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 648 "u8_uc_map.txt"
+ {"\341\274\266", "Ἶ"},
+#line 935 "u8_uc_map.txt"
+ {"\352\236\203", "Ꞃ"},
+#line 781 "u8_uc_map.txt"
+ {"\342\261\226", "Ⱖ"},
+ {""}, {""},
+#line 678 "u8_uc_map.txt"
+ {"\341\276\222", "ᾚ"},
+ {""},
+#line 97 "u8_uc_map.txt"
+ {"\305\213", "Ŋ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 671 "u8_uc_map.txt"
+ {"\341\276\203", "ᾋ"},
+ {""}, {""},
+#line 88 "u8_uc_map.txt"
+ {"\304\267", "Ķ"},
+#line 116 "u8_uc_map.txt"
+ {"\305\261", "Ű"},
+#line 95 "u8_uc_map.txt"
+ {"\305\206", "Ņ"},
+ {""}, {""}, {""},
+#line 866 "u8_uc_map.txt"
+ {"\352\231\223", "Ꙓ"},
+#line 785 "u8_uc_map.txt"
+ {"\342\261\232", "Ⱚ"},
+ {""}, {""},
+#line 101 "u8_uc_map.txt"
+ {"\305\223", "Œ"},
+ {""},
+#line 277 "u8_uc_map.txt"
+ {"\321\220", "Ѐ"},
+#line 770 "u8_uc_map.txt"
+ {"\342\261\213", "Ⱋ"},
+ {""},
+#line 331 "u8_uc_map.txt"
+ {"\321\255", "Ѭ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 168 "u8_uc_map.txt"
+ {"\307\241", "Ǡ"},
+ {""}, {""}, {""}, {""},
+#line 33 "u8_uc_map.txt"
+ {"\303\241", "Á"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 283 "u8_uc_map.txt"
+ {"\321\226", "І"},
+ {""}, {""},
+#line 397 "u8_uc_map.txt"
+ {"\323\273", "Ӻ"},
+ {""}, {""}, {""},
+#line 768 "u8_uc_map.txt"
+ {"\342\261\211", "Ⱉ"},
+ {""},
+#line 624 "u8_uc_map.txt"
+ {"\341\274\204", "Ἄ"},
+#line 889 "u8_uc_map.txt"
+ {"\352\232\223", "Ꚓ"},
+ {""}, {""}, {""},
+#line 414 "u8_uc_map.txt"
+ {"\324\235", "Ԝ"},
+#line 75 "u8_uc_map.txt"
+ {"\304\233", "Ě"},
+ {""}, {""}, {""},
+#line 674 "u8_uc_map.txt"
+ {"\341\276\206", "ᾎ"},
+ {""}, {""}, {""},
+#line 139 "u8_uc_map.txt"
+ {"\311\250", "Ɨ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 273 "u8_uc_map.txt"
+ {"\317\273", "Ϻ"},
+ {""},
+#line 761 "u8_uc_map.txt"
+ {"\342\261\202", "Ⱂ"},
+ {""}, {""},
+#line 40 "u8_uc_map.txt"
+ {"\303\250", "È"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 316 "u8_uc_map.txt"
+ {"\321\207", "Ч"},
+#line 133 "u8_uc_map.txt"
+ {"\311\231", "Ə"},
+ {""},
+#line 865 "u8_uc_map.txt"
+ {"\352\231\221", "Ꙑ"},
+ {""}, {""},
+#line 195 "u8_uc_map.txt"
+ {"\310\231", "Ș"},
+ {""},
+#line 961 "u8_uc_map.txt"
+ {" , \357\275\220"},
+#line 415 "u8_uc_map.txt"
+ {"\324\237", "Ԟ"},
+#line 318 "u8_uc_map.txt"
+ {"\321\211", "Щ"},
+#line 420 "u8_uc_map.txt"
+ {"\325\241", "Ա"},
+#line 938 "u8_uc_map.txt"
+ {"\352\236\214", "Ꞌ"},
+ {""}, {""}, {""},
+#line 488 "u8_uc_map.txt"
+ {"\342\264\236", "Ⴞ"},
+ {""}, {""}, {""}, {""},
+#line 366 "u8_uc_map.txt"
+ {"\322\273", "Һ"},
+#line 794 "u8_uc_map.txt"
+ {"\342\261\250", "Ⱨ"},
+ {""}, {""}, {""}, {""},
+#line 773 "u8_uc_map.txt"
+ {"\342\261\216", "Ⱎ"},
+ {""},
+#line 317 "u8_uc_map.txt"
+ {"\321\210", "Ш"},
+ {""}, {""}, {""},
+#line 221 "u8_uc_map.txt"
+ {"\311\217", "Ɏ"},
+ {""}, {""}, {""},
+#line 873 "u8_uc_map.txt"
+ {"\352\231\241", "Ꙡ"},
+#line 190 "u8_uc_map.txt"
+ {"\310\217", "Ȏ"},
+ {""}, {""},
+#line 390 "u8_uc_map.txt"
+ {"\323\255", "Ӭ"},
+#line 106 "u8_uc_map.txt"
+ {"\305\235", "Ŝ"},
+ {""},
+#line 888 "u8_uc_map.txt"
+ {"\352\232\221", "Ꚑ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 427 "u8_uc_map.txt"
+ {"\325\250", "Ը"},
+#line 672 "u8_uc_map.txt"
+ {"\341\276\204", "ᾌ"},
+ {""}, {""}, {""}, {""},
+#line 996 "u8_uc_map.txt"
+ {"\360\220\221\200", "𐐘"},
+#line 797 "u8_uc_map.txt"
+ {"\311\221", "Ɑ"},
+#line 786 "u8_uc_map.txt"
+ {"\342\261\233", "Ⱛ"},
+ {""},
+#line 78 "u8_uc_map.txt"
+ {"\304\241", "Ġ"},
+ {""},
+#line 191 "u8_uc_map.txt"
+ {"\310\221", "Ȑ"},
+ {""}, {""},
+#line 269 "u8_uc_map.txt"
+ {"\317\255", "Ϭ"},
+ {""},
+#line 965 "u8_uc_map.txt"
+ {" , \357\275\224"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""},
+#line 107 "u8_uc_map.txt"
+ {"\305\237", "Ş"},
+ {""},
+#line 955 "u8_uc_map.txt"
+ {" , \357\275\212"},
+ {""},
+#line 858 "u8_uc_map.txt"
+ {"\352\231\203", "Ꙃ"},
+ {""}, {""}, {""},
+#line 795 "u8_uc_map.txt"
+ {"\342\261\252", "Ⱪ"},
+#line 211 "u8_uc_map.txt"
+ {"\306\232", "Ƚ"},
+ {""}, {""}, {""},
+#line 778 "u8_uc_map.txt"
+ {"\342\261\223", "Ⱓ"},
+ {""}, {""}, {""},
+#line 152 "u8_uc_map.txt"
+ {"\312\212", "Ʊ"},
+ {""}, {""}, {""}, {""},
+#line 359 "u8_uc_map.txt"
+ {"\322\255", "Ҭ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 159 "u8_uc_map.txt"
+ {"\307\216", "Ǎ"},
+#line 967 "u8_uc_map.txt"
+ {" , \357\275\226"},
+ {""}, {""},
+#line 332 "u8_uc_map.txt"
+ {"\321\257", "Ѯ"},
+#line 222 "u8_uc_map.txt"
+ {"\315\261", "Ͱ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 767 "u8_uc_map.txt"
+ {"\342\261\210", "Ⱈ"},
+ {""}, {""}, {""},
+#line 869 "u8_uc_map.txt"
+ {"\352\231\231", "Ꙙ"},
+ {""},
+#line 881 "u8_uc_map.txt"
+ {"\352\232\203", "Ꚃ"},
+ {""}, {""}, {""},
+#line 413 "u8_uc_map.txt"
+ {"\324\233", "Ԛ"},
+ {""}, {""},
+#line 74 "u8_uc_map.txt"
+ {"\304\231", "Ę"},
+#line 971 "u8_uc_map.txt"
+ {" , \357\275\232"},
+ {""},
+#line 372 "u8_uc_map.txt"
+ {"\323\210", "Ӈ"},
+#line 254 "u8_uc_map.txt"
+ {"\317\207", "Χ"},
+#line 800 "u8_uc_map.txt"
+ {"\311\222", "Ɒ"},
+ {""},
+#line 956 "u8_uc_map.txt"
+ {" , \357\275\213"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 256 "u8_uc_map.txt"
+ {"\317\211", "Ω"},
+#line 161 "u8_uc_map.txt"
+ {"\307\222", "Ǒ"},
+#line 138 "u8_uc_map.txt"
+ {"\311\251", "Ɩ"},
+ {""}, {""}, {""},
+#line 119 "u8_uc_map.txt"
+ {"\305\267", "Ŷ"},
+#line 203 "u8_uc_map.txt"
+ {"\310\251", "Ȩ"},
+ {""}, {""}, {""}, {""},
+#line 172 "u8_uc_map.txt"
+ {"\307\251", "Ǩ"},
+ {""}, {""}, {""}, {""},
+#line 41 "u8_uc_map.txt"
+ {"\303\251", "É"},
+#line 69 "u8_uc_map.txt"
+ {"\304\217", "Ď"},
+#line 255 "u8_uc_map.txt"
+ {"\317\210", "Ψ"},
+ {""}, {""}, {""},
+#line 92 "u8_uc_map.txt"
+ {"\305\200", "Ŀ"},
+#line 954 "u8_uc_map.txt"
+ {" , \357\275\211"},
+ {""}, {""}, {""},
+#line 776 "u8_uc_map.txt"
+ {"\342\261\221", "Ⱑ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 184 "u8_uc_map.txt"
+ {"\310\203", "Ȃ"},
+#line 70 "u8_uc_map.txt"
+ {"\304\221", "Đ"},
+ {""}, {""}, {""},
+#line 947 "u8_uc_map.txt"
+ {" , \357\275\202"},
+ {""}, {""}, {""},
+#line 455 "u8_uc_map.txt"
+ {"\326\204", "Ք"},
+#line 328 "u8_uc_map.txt"
+ {"\321\247", "Ѧ"},
+#line 105 "u8_uc_map.txt"
+ {"\305\233", "Ś"},
+ {""},
+#line 863 "u8_uc_map.txt"
+ {"\352\231\215", "Ꙍ"},
+ {""},
+#line 790 "u8_uc_map.txt"
+ {"\342\261\241", "Ⱡ"},
+ {""}, {""}, {""}, {""},
+#line 454 "u8_uc_map.txt"
+ {"\326\203", "Փ"},
+#line 93 "u8_uc_map.txt"
+ {"\305\202", "Ł"},
+ {""}, {""},
+#line 155 "u8_uc_map.txt"
+ {"\306\266", "Ƶ"},
+ {""},
+#line 871 "u8_uc_map.txt"
+ {"\352\231\235", "Ꙝ"},
+ {""}, {""},
+#line 391 "u8_uc_map.txt"
+ {"\323\257", "Ӯ"},
+ {""},
+#line 214 "u8_uc_map.txt"
+ {"\306\200", "Ƀ"},
+ {""}, {""},
+#line 416 "u8_uc_map.txt"
+ {"\324\241", "Ԡ"},
+#line 428 "u8_uc_map.txt"
+ {"\325\251", "Թ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 959 "u8_uc_map.txt"
+ {" , \357\275\216"},
+ {""}, {""}, {""}, {""},
+#line 620 "u8_uc_map.txt"
+ {"\341\274\200", "Ἀ"},
+#line 787 "u8_uc_map.txt"
+ {"\342\261\234", "Ⱜ"},
+ {""}, {""}, {""},
+#line 886 "u8_uc_map.txt"
+ {"\352\232\215", "Ꚍ"},
+#line 777 "u8_uc_map.txt"
+ {"\342\261\222", "Ⱒ"},
+ {""}, {""}, {""},
+#line 270 "u8_uc_map.txt"
+ {"\317\257", "Ϯ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 762 "u8_uc_map.txt"
+ {"\342\261\203", "Ⱃ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+#line 82 "u8_uc_map.txt"
+ {"\304\251", "Ĩ"},
+ {""}, {""}, {""},
+#line 360 "u8_uc_map.txt"
+ {"\322\257", "Ү"},
+ {""}, {""},
+#line 320 "u8_uc_map.txt"
+ {"\321\213", "Ы"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 412 "u8_uc_map.txt"
+ {"\324\231", "Ԙ"},
+#line 784 "u8_uc_map.txt"
+ {"\342\261\231", "Ⱙ"},
+ {""}, {""}, {""},
+#line 108 "u8_uc_map.txt"
+ {"\305\241", "Š"},
+#line 333 "u8_uc_map.txt"
+ {"\321\261", "Ѱ"},
+#line 315 "u8_uc_map.txt"
+ {"\321\206", "Ц"},
+#line 220 "u8_uc_map.txt"
+ {"\311\215", "Ɍ"},
+ {""},
+#line 964 "u8_uc_map.txt"
+ {" , \357\275\223"},
+ {""}, {""},
+#line 189 "u8_uc_map.txt"
+ {"\310\215", "Ȍ"},
+ {""},
+#line 280 "u8_uc_map.txt"
+ {"\321\223", "Ѓ"},
+#line 387 "u8_uc_map.txt"
+ {"\323\247", "Ӧ"},
+ {""}, {""}, {""}, {""},
+#line 765 "u8_uc_map.txt"
+ {"\342\261\206", "Ⱆ"},
+ {""}, {""}, {""}, {""},
+#line 63 "u8_uc_map.txt"
+ {"\304\203", "Ă"},
+ {""}, {""}, {""}, {""}, {""},
+#line 407 "u8_uc_map.txt"
+ {"\324\217", "Ԏ"},
+ {""}, {""},
+#line 289 "u8_uc_map.txt"
+ {"\321\234", "Ќ"},
+#line 953 "u8_uc_map.txt"
+ {" , \357\275\210"},
+ {""}, {""}, {""},
+#line 668 "u8_uc_map.txt"
+ {"\341\276\200", "ᾈ"},
+#line 802 "u8_uc_map.txt"
+ {"\342\261\266", "Ⱶ"},
+ {""}, {""}, {""}, {""},
+#line 266 "u8_uc_map.txt"
+ {"\317\247", "Ϧ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 224 "u8_uc_map.txt"
+ {"\315\267", "Ͷ"},
+ {""}, {""}, {""}, {""},
+#line 144 "u8_uc_map.txt"
+ {"\306\241", "Ơ"},
+ {""},
+#line 408 "u8_uc_map.txt"
+ {"\324\221", "Ԑ"},
+ {""}, {""}, {""}, {""},
+#line 216 "u8_uc_map.txt"
+ {"\312\214", "Ʌ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 104 "u8_uc_map.txt"
+ {"\305\231", "Ř"},
+#line 771 "u8_uc_map.txt"
+ {"\342\261\214", "Ⱌ"},
+ {""}, {""}, {""},
+#line 731 "u8_uc_map.txt"
+ {"\342\223\236", "Ⓞ"},
+#line 356 "u8_uc_map.txt"
+ {"\322\247", "Ҧ"},
+ {""}, {""},
+#line 772 "u8_uc_map.txt"
+ {"\342\261\215", "Ⱍ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 156 "u8_uc_map.txt"
+ {"\312\222", "Ʒ"},
+#line 962 "u8_uc_map.txt"
+ {" , \357\275\221"},
+ {""}, {""}, {""}, {""}, {""},
+#line 788 "u8_uc_map.txt"
+ {"\342\261\235", "Ⱝ"},
+ {""}, {""},
+#line 271 "u8_uc_map.txt"
+ {"\317\270", "Ϸ"},
+ {""}, {""}, {""}, {""},
+#line 147 "u8_uc_map.txt"
+ {"\306\250", "Ƨ"},
+#line 763 "u8_uc_map.txt"
+ {"\342\261\204", "Ⱄ"},
+#line 99 "u8_uc_map.txt"
+ {"\305\217", "Ŏ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 392 "u8_uc_map.txt"
+ {"\323\261", "Ӱ"},
+#line 371 "u8_uc_map.txt"
+ {"\323\206", "Ӆ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 377 "u8_uc_map.txt"
+ {"\323\223", "Ӓ"},
+ {""},
+#line 287 "u8_uc_map.txt"
+ {"\321\232", "Њ"},
+ {""}, {""},
+#line 140 "u8_uc_map.txt"
+ {"\306\231", "Ƙ"},
+#line 290 "u8_uc_map.txt"
+ {"\321\235", "Ѝ"},
+ {""},
+#line 258 "u8_uc_map.txt"
+ {"\317\213", "Ϋ"},
+ {""}, {""}, {""},
+#line 100 "u8_uc_map.txt"
+ {"\305\221", "Ő"},
+ {""}, {""}, {""},
+#line 148 "u8_uc_map.txt"
+ {"\312\203", "Ʃ"},
+ {""},
+#line 68 "u8_uc_map.txt"
+ {"\304\215", "Č"},
+ {""}, {""}, {""},
+#line 253 "u8_uc_map.txt"
+ {"\317\206", "Φ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 963 "u8_uc_map.txt"
+ {" , \357\275\222"},
+ {""}, {""},
+#line 342 "u8_uc_map.txt"
+ {"\322\213", "Ҋ"},
+ {""}, {""}, {""}, {""},
+#line 292 "u8_uc_map.txt"
+ {"\321\237", "Џ"},
+ {""}, {""},
+#line 948 "u8_uc_map.txt"
+ {" , \357\275\203"},
+ {""}, {""}, {""}, {""},
+#line 361 "u8_uc_map.txt"
+ {"\322\261", "Ұ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 346 "u8_uc_map.txt"
+ {"\322\223", "Ғ"},
+#line 401 "u8_uc_map.txt"
+ {"\324\203", "Ԃ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+#line 970 "u8_uc_map.txt"
+ {" , \357\275\231"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""},
+#line 112 "u8_uc_map.txt"
+ {"\305\251", "Ũ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 951 "u8_uc_map.txt"
+ {" , \357\275\206"},
+ {""}, {""}, {""}, {""}, {""},
+#line 382 "u8_uc_map.txt"
+ {"\323\235", "Ӝ"},
+ {""}, {""}, {""},
+#line 336 "u8_uc_map.txt"
+ {"\321\267", "Ѷ"},
+ {""},
+#line 131 "u8_uc_map.txt"
+ {"\306\214", "Ƌ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 94 "u8_uc_map.txt"
+ {"\305\204", "Ń"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 309 "u8_uc_map.txt"
+ {"\321\200", "Р"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 135 "u8_uc_map.txt"
+ {"\306\222", "Ƒ"},
+#line 261 "u8_uc_map.txt"
+ {"\317\235", "Ϝ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 383 "u8_uc_map.txt"
+ {"\323\237", "Ӟ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 957 "u8_uc_map.txt"
+ {" , \357\275\214"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 288 "u8_uc_map.txt"
+ {"\321\233", "Ћ"},
+#line 958 "u8_uc_map.txt"
+ {" , \357\275\215"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 351 "u8_uc_map.txt"
+ {"\322\235", "Ҝ"},
+#line 311 "u8_uc_map.txt"
+ {"\321\202", "Т"},
+#line 406 "u8_uc_map.txt"
+ {"\324\215", "Ԍ"},
+ {""}, {""}, {""}, {""},
+#line 262 "u8_uc_map.txt"
+ {"\317\237", "Ϟ"},
+ {""},
+#line 319 "u8_uc_map.txt"
+ {"\321\212", "Ъ"},
+ {""}, {""}, {""}, {""},
+#line 949 "u8_uc_map.txt"
+ {" , \357\275\204"},
+#line 125 "u8_uc_map.txt"
+ {"\306\203", "Ƃ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 352 "u8_uc_map.txt"
+ {"\322\237", "Ҟ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 395 "u8_uc_map.txt"
+ {"\323\267", "Ӷ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 98 "u8_uc_map.txt"
+ {"\305\215", "Ō"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 759 "u8_uc_map.txt"
+ {"\342\261\200", "Ⱀ"},
+ {""}, {""}, {""}, {""},
+#line 325 "u8_uc_map.txt"
+ {"\321\241", "Ѡ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 247 "u8_uc_map.txt"
+ {"\317\200", "Π"},
+ {""}, {""}, {""}, {""},
+#line 381 "u8_uc_map.txt"
+ {"\323\233", "Ӛ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 369 "u8_uc_map.txt"
+ {"\323\202", "Ӂ"},
+ {""}, {""},
+#line 364 "u8_uc_map.txt"
+ {"\322\267", "Ҷ"},
+ {""}, {""}, {""}, {""},
+#line 373 "u8_uc_map.txt"
+ {"\323\212", "Ӊ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 260 "u8_uc_map.txt"
+ {"\317\233", "Ϛ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 250 "u8_uc_map.txt"
+ {"\317\202", "Σ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 257 "u8_uc_map.txt"
+ {"\317\212", "Ϊ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 286 "u8_uc_map.txt"
+ {"\321\231", "Љ"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 350 "u8_uc_map.txt"
+ {"\322\233", "Қ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 324 "u8_uc_map.txt"
+ {"\321\217", "Я"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 384 "u8_uc_map.txt"
+ {"\323\241", "Ӡ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+#line 278 "u8_uc_map.txt"
+ {"\321\221", "Ё"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 263 "u8_uc_map.txt"
+ {"\317\241", "Ϡ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""},
+#line 199 "u8_uc_map.txt"
+ {"\306\236", "Ƞ"},
+ {""},
+#line 323 "u8_uc_map.txt"
+ {"\321\216", "Ю"},
+ {""}, {""}, {""},
+#line 353 "u8_uc_map.txt"
+ {"\322\241", "Ҡ"},
+ {""}, {""}, {""}, {""},
+#line 380 "u8_uc_map.txt"
+ {"\323\231", "Ә"},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 321 "u8_uc_map.txt"
+ {"\321\214", "Ь"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""},
+#line 279 "u8_uc_map.txt"
+ {"\321\222", "Ђ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""},
+#line 329 "u8_uc_map.txt"
+ {"\321\251", "Ѩ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 789 "u8_uc_map.txt"
+ {"\342\261\236", "Ⱞ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 376 "u8_uc_map.txt"
+ {"\323\221", "Ӑ"},
+ {""}, {""},
+#line 349 "u8_uc_map.txt"
+ {"\322\231", "Ҙ"},
+ {""}, {""}, {""}, {""},
+#line 313 "u8_uc_map.txt"
+ {"\321\204", "Ф"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""},
+#line 312 "u8_uc_map.txt"
+ {"\321\203", "У"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 344 "u8_uc_map.txt"
+ {"\322\217", "Ҏ"},
+ {""}, {""}, {""},
+#line 375 "u8_uc_map.txt"
+ {"\323\216", "Ӎ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 374 "u8_uc_map.txt"
+ {"\323\214", "Ӌ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 345 "u8_uc_map.txt"
+ {"\322\221", "Ґ"},
+ {""}, {""}, {""},
+#line 231 "u8_uc_map.txt"
+ {"\317\216", "Ώ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 229 "u8_uc_map.txt"
+ {"\317\214", "Ό"},
+ {""}, {""}, {""},
+#line 388 "u8_uc_map.txt"
+ {"\323\251", "Ө"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""},
+#line 370 "u8_uc_map.txt"
+ {"\323\204", "Ӄ"},
+#line 267 "u8_uc_map.txt"
+ {"\317\251", "Ϩ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 322 "u8_uc_map.txt"
+ {"\321\215", "Э"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 251 "u8_uc_map.txt"
+ {"\317\204", "Τ"},
+ {""}, {""}, {""}, {""}, {""},
+#line 357 "u8_uc_map.txt"
+ {"\322\251", "Ҩ"},
+ {""}, {""}, {""}, {""},
+#line 249 "u8_uc_map.txt"
+ {"\317\203", "Σ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+#line 291 "u8_uc_map.txt"
+ {"\321\236", "Ў"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""},
+#line 230 "u8_uc_map.txt"
+ {"\317\215", "Ύ"},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 343 "u8_uc_map.txt"
+ {"\322\215", "Ҍ"}
+ };
+
+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+ {
+ unsigned int key = u8_uc_hash (str, len);
+
+ if (key <= MAX_HASH_VALUE)
+ {
+ register const char *s = wordlistkey.name;
+
+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && slen == '\0')
+ return &wordlistkey;
+ }
+ }
+ return 0;
+}

deadbeef-1.9.6.tar.bz2/src/utf8.c Added

@@ -0,0 +1,871 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ utf8 string manipulation
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+/* 
+ based on Basic UTF-8 manipulation routines
+ by Jeff Bezanson
+ placed in the public domain Fall 2005
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+//#include <alloca.h>
+#include "ctype.h"
+#include "utf8.h"
+#include "u8_lc_map.h"
+#include "u8_uc_map.h"
+
+static const uint32_t offsetsFromUTF86 = {
+ 0x00000000UL, 0x00003080UL, 0x000E2080UL,
+ 0x03C82080UL, 0xFA082080UL, 0x82082080UL
+};
+
+static const char trailingBytesForUTF8256 = {
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+/* conversions without error checking
+ only works for valid UTF-8, i.e. no 5- or 6-byte sequences
+ srcsz = source size in bytes, or -1 if 0-terminated
+ sz = dest size in # of wide characters
+
+ returns # characters converted
+ dest will always be L'\0'-terminated, even if there isn't enough room
+ for all the characters.
+ if sz = srcsz+1 (i.e. 4*srcsz+4 bytes), there will always be enough space.
+*/
+int u8_toucs(uint32_t *dest, int32_t sz, const char *src, int32_t srcsz)
+{
+ uint32_t ch;
+ const char *src_end = src + srcsz;
+ int32_t nb;
+ int32_t i=0;
+
+ while (i < sz-1) {
+ nb = trailingBytesForUTF8(unsigned char)*src;
+ if (srcsz == -1) {
+ if (*src == 0)
+ goto done_toucs;
+ }
+ else {
+ if (src + nb >= src_end)
+ goto done_toucs;
+ }
+ ch = 0;
+ switch (nb) {
+ /* these fall through deliberately */
+ case 3: ch += (unsigned char)*src++; ch <<= 6;
+ case 2: ch += (unsigned char)*src++; ch <<= 6;
+ case 1: ch += (unsigned char)*src++; ch <<= 6;
+ case 0: ch += (unsigned char)*src++;
+ }
+ ch -= offsetsFromUTF8nb;
+ desti++ = ch;
+ }
+ done_toucs:
+ desti = 0;
+ return i;
+}
+
+/* srcsz = number of source characters, or -1 if 0-terminated
+ sz = size of dest buffer in bytes
+
+ returns # characters converted
+ dest will only be '\0'-terminated if there is enough space. this is
+ for consistency; imagine there are 2 bytes of space left, but the next
+ character requires 3 bytes. in this case we could NUL-terminate, but in
+ general we can't when there's insufficient space. therefore this function
+ only NUL-terminates if all the characters fit, and there's space for
+ the NUL as well.
+ the destination string will never be bigger than the source string.
+*/
+int u8_toutf8(char *dest, int32_t sz, uint32_t *src, int32_t srcsz)
+{
+ uint32_t ch;
+ int32_t i = 0;
+ char *dest_end = dest + sz;
+
+ while (srcsz<0 ? srci!=0 : i < srcsz) {
+ ch = srci;
+ if (ch < 0x80) {
+ if (dest >= dest_end)
+ return i;
+ *dest++ = (char)ch;
+ }
+ else if (ch < 0x800) {
+ if (dest >= dest_end-1)
+ return i;
+ *dest++ = (char)((ch>>6) | 0xC0);
+ *dest++ = (ch & 0x3F) | 0x80;
+ }
+ else if (ch < 0x10000) {
+ if (dest >= dest_end-2)
+ return i;
+ *dest++ = (char)((ch>>12) | 0xE0);
+ *dest++ = ((ch>>6) & 0x3F) | 0x80;
+ *dest++ = (ch & 0x3F) | 0x80;
+ }
+ else if (ch < 0x200000) {
+ if (dest >= dest_end-3)
+ return i;
+ *dest++ = (char)((ch>>18) | 0xF0);
+ *dest++ = ((ch>>12) & 0x3F) | 0x80;
+ *dest++ = ((ch>>6) & 0x3F) | 0x80;
+ *dest++ = (ch & 0x3F) | 0x80;
+ }
+ i++;
+ }
+ if (dest < dest_end)
+ *dest = '\0';
+ return i;
+}
+
+int u8_wc_toutf8(char *dest, uint32_t ch)
+{
+ if (ch < 0x80) {
+ dest0 = (char)ch;
+ return 1;
+ }
+ if (ch < 0x800) {
+ dest0 = (char)((ch>>6) | 0xC0);
+ dest1 = (ch & 0x3F) | 0x80;
+ return 2;
+ }
+ if (ch < 0x10000) {
+ dest0 = (char)((ch>>12) | 0xE0);
+ dest1 = ((ch>>6) & 0x3F) | 0x80;
+ dest2 = (ch & 0x3F) | 0x80;
+ return 3;
+ }
+ if (ch < 0x200000) {
+ dest0 = (char)((ch>>18) | 0xF0);
+ dest1 = ((ch>>12) & 0x3F) | 0x80;
+ dest2 = ((ch>>6) & 0x3F) | 0x80;
+ dest3 = (ch & 0x3F) | 0x80;
+ return 4;
+ }
+ return 0;
+}
+
+/* charnum => byte offset */
+int u8_offset(char *str, int32_t charnum)
+{
+ int32_t offs=0;
+
+ while (charnum > 0 && stroffs) {
+ (void)(isutf(str++offs) || isutf(str++offs) ||
+ isutf(str++offs) || ++offs);
+ charnum--;
+ }
+ return offs;
+}
+
+/* byte offset => charnum */
+int u8_charnum(char *s, int32_t offset)
+{
+ int32_t charnum = 0, offs=0;
+
+ while (offs < offset && soffs) {
+ (void)(isutf(s++offs) || isutf(s++offs) ||
+ isutf(s++offs) || ++offs);
+ charnum++;
+ }
+ return charnum;
+}
+
+/* number of characters, not including a null terminator */
+int u8_strlen(char *s)
+{
+ int32_t count = 0;
+ int32_t i = 0;
+
+ while (si && u8_nextchar(s, &i) != 0)
+ count++;
+
+ return count;
+}
+
+/* reads the next utf-8 sequence out of a string, updating an index */
+// NOTE: a valid UTF8 sequence is expected, no validity or 0 checks are performed.
+uint32_t u8_nextchar(const char *s, int32_t *i)
+{
+ uint32_t ch = 0;
+ int32_t sz = 0;
+
+ do {
+ ch <<= 6;
+ ch += (unsigned char)s(*i)++;
+ sz++;
+ } while (s*i && !isutf(s*i));
+ ch -= offsetsFromUTF8sz-1;
+
+ return ch;
+}
+
+/* copies num_chars characters from src to dest, return bytes written */
+/* returns the number of bytes copied, not counting a null terminator, which is always written */
+int u8_strncpy (char *dest, const char* src, int num_chars)
+{
+ const char *s = src;
+ int32_t num_bytes = 0;
+ while (num_chars && *s) {
+ int32_t i = 0;
+ u8_nextchar (s, &i);
+ num_chars--;
+ num_bytes += i;
+ s += i;
+ }
+ strncpy (dest, src, s - src);
+ dests - src = 0;
+ return num_bytes;
+}
+
+/* copies as many characters from src as would not exceed num_bytes in the destination */
+/* returns the number of bytes copied, not counting a null terminator, which is not written */
+int u8_strnbcpy (char *dest, const char* src, int num_bytes) {
+ int32_t prev_index = 0;
+ int32_t index = 0;
+ int32_t nb = num_bytes;
+ while (srcindex && num_bytes > 0) {
+ u8_inc (src, &index);
+ int32_t charlen = index - prev_index;
+ if (charlen > num_bytes) {
+ break;
+ }
+ memcpy (dest, &srcprev_index, charlen);
+ prev_index = index;
+ dest += charlen;
+ num_bytes -= charlen;
+ }
+ return nb - num_bytes;
+}
+
+/* copies a character from src to dest provided it does not exceed num_bytes */
+/* returns the number of bytes copied, not counting a null terminator, which is not written */
+int u8_charcpy (char *dest, const char *src, int num_bytes) {
+ int32_t index = 0;
+ u8_inc (src, &index);
+ if (index > num_bytes) {
+ return 0;
+ }
+ memcpy (dest, src, index);
+ return index;
+}
+
+void u8_inc(const char *s, int32_t *i)
+{
+ (void)(isutf(s++(*i)) || isutf(s++(*i)) ||
+ isutf(s++(*i)) || ++(*i));
+}
+
+void u8_dec(const char *s, int32_t *i)
+{
+ (void)(isutf(s--(*i)) || isutf(s--(*i)) ||
+ isutf(s--(*i)) || --(*i));
+}
+
+int octal_digit(char c)
+{
+ return (c >= '0' && c <= '7');
+}
+
+int hex_digit(char c)
+{
+ return ((c >= '0' && c <= '9') ||
+ (c >= 'A' && c <= 'F') ||
+ (c >= 'a' && c <= 'f'));
+}
+
+/* assumes that src points to the character after a backslash
+ returns number of input characters processed */
+int u8_read_escape_sequence(const char *str, uint32_t *dest)
+{
+ long ch;
+ char digs="\0\0\0\0\0\0\0\0\0";
+ int32_t dno=0, i=1;
+
+ ch = (uint32_t)str0; /* take literal character */
+ if (str0 == 'n')
+ ch = L'\n';
+ else if (str0 == 't')
+ ch = L'\t';
+ else if (str0 == 'r')
+ ch = L'\r';
+ else if (str0 == 'b')
+ ch = L'\b';
+ else if (str0 == 'f')
+ ch = L'\f';
+ else if (str0 == 'v')
+ ch = L'\v';
+ else if (str0 == 'a')
+ ch = L'\a';
+ else if (octal_digit(str0)) {
+ i = 0;
+ do {
+ digsdno++ = stri++;
+ } while (octal_digit(stri) && dno < 3);
+ ch = strtol(digs, NULL, 8);
+ }
+ else if (str0 == 'x') {
+ while (hex_digit(stri) && dno < 2) {
+ digsdno++ = stri++;
+ }
+ if (dno > 0)
+ ch = strtol(digs, NULL, 16);
+ }
+ else if (str0 == 'u') {
+ while (hex_digit(stri) && dno < 4) {
+ digsdno++ = stri++;
+ }
+ if (dno > 0)
+ ch = strtol(digs, NULL, 16);
+ }
+ else if (str0 == 'U') {
+ while (hex_digit(stri) && dno < 8) {
+ digsdno++ = stri++;
+ }
+ if (dno > 0)
+ ch = strtol(digs, NULL, 16);
+ }
+ *dest = (uint32_t)ch;
+
+ return i;
+}
+
+// convert a string with literal \uxxxx or \Uxxxxxxxx characters to UTF-8
+// example: u8_unescape(mybuf, 256, "hello\\u220e")
+// note the double backslash is needed if called on a C string literal
+int u8_unescape(char *buf, int32_t sz, const char *src)
+{
+ int32_t c=0, amt;
+ uint32_t ch;
+ char temp4;
+
+ while (*src && c < sz) {
+ if (*src == '\\') {
+ src++;
+ amt = u8_read_escape_sequence(src, &ch);
+ }
+ else {
+ ch = (uint32_t)*src;
+ amt = 1;
+ }
+ src += amt;
+ amt = u8_wc_toutf8(temp, ch);
+ if (amt > sz-c)
+ break;
+ memcpy(&bufc, temp, amt);
+ c += amt;
+ }
+ if (c < sz)
+ bufc = '\0';
+ return c;
+}
+
+int u8_escape_wchar(char *buf, int32_t sz, uint32_t ch)
+{
+ if (ch == L'\n')
+ return snprintf(buf, sz, "\\n");
+ else if (ch == L'\t')
+ return snprintf(buf, sz, "\\t");
+ else if (ch == L'\r')
+ return snprintf(buf, sz, "\\r");
+ else if (ch == L'\b')
+ return snprintf(buf, sz, "\\b");
+ else if (ch == L'\f')
+ return snprintf(buf, sz, "\\f");
+ else if (ch == L'\v')
+ return snprintf(buf, sz, "\\v");
+ else if (ch == L'\a')
+ return snprintf(buf, sz, "\\a");
+ else if (ch == L'\\')
+ return snprintf(buf, sz, "\\\\");
+ else if (ch < 32 || ch == 0x7f)
+ return snprintf(buf, sz, "\\x%hhX", (unsigned char)ch);
+ else if (ch > 0xFFFF)
+ return snprintf(buf, sz, "\\U%.8X", (uint32_t)ch);
+ else if (ch >= 0x80 && ch <= 0xFFFF)
+ return snprintf(buf, sz, "\\u%.4hX", (unsigned short)ch);
+
+ return snprintf(buf, sz, "%c", (char)ch);
+}
+
+int u8_escape(char *buf, int32_t sz, const char *src, int32_t escape_quotes)
+{
+ int32_t c=0, i=0, amt;
+
+ while (srci && c < sz) {
+ if (escape_quotes && srci == '"') {
+ amt = snprintf(buf, sz - c, "\\\"");
+ i++;
+ }
+ else {
+ amt = u8_escape_wchar(buf, sz - c, u8_nextchar(src, &i));
+ }
+ c += amt;
+ buf += amt;
+ }
+ if (c < sz)
+ *buf = '\0';
+ return c;
+}
+
+char *u8_strchr(char *s, uint32_t ch, int32_t *charn)
+{
+ int32_t i = 0, lasti=0;
+ uint32_t c;
+
+ *charn = 0;
+ while (si) {
+ c = u8_nextchar(s, &i);
+ if (c == ch) {
+ return &slasti;
+ }
+ lasti = i;
+ (*charn)++;
+ }
+ return NULL;
+}
+
+char *u8_memchr(char *s, uint32_t ch, size_t sz, int32_t *charn)
+{
+ int32_t i = 0, lasti=0;
+ uint32_t c;
+ int32_t csz;
+
+ *charn = 0;
+ while (i < sz) {
+ c = csz = 0;
+ do {
+ c <<= 6;
+ c += (unsigned char)si++;
+ csz++;
+ } while (i < sz && !isutf(si));
+ c -= offsetsFromUTF8csz-1;
+
+ if (c == ch) {
+ return &slasti;
+ }
+ lasti = i;
+ (*charn)++;
+ }
+ return NULL;
+}
+
+int u8_is_locale_utf8(char *locale)
+{
+ /* this code based on libutf8 */
+ const char* cp = locale;
+
+ for (; *cp != '\0' && *cp != '@' && *cp != '+' && *cp != ','; cp++) {
+ if (*cp == '.') {
+ const char* encoding = ++cp;
+ for (; *cp != '\0' && *cp != '@' && *cp != '+' && *cp != ','; cp++)
+ ;
+ if ((cp-encoding == 5 && !strncmp(encoding, "UTF-8", 5))
+ || (cp-encoding == 4 && !strncmp(encoding, "utf8", 4)))
+ return 1; /* it's UTF-8 */
+ break;
+ }
+ }
+ return 0;
+}
+
+int u8_vprintf(char *fmt, va_list ap)
+{
+ int32_t cnt, sz=0;
+ char *buf;
+ uint32_t *wcs;
+
+ sz = 512;
+ buf = (char*)alloca(sz);
+ try_print:
+ cnt = vsnprintf(buf, sz, fmt, ap);
+ if (cnt >= sz) {
+ buf = (char*)alloca(cnt - sz + 1);
+ sz = cnt + 1;
+ goto try_print;
+ }
+ wcs = (uint32_t*)alloca((cnt+1) * sizeof(uint32_t));
+ cnt = u8_toucs(wcs, cnt+1, buf, cnt);
+ printf("%ls", (wchar_t*)wcs);
+ return cnt;
+}
+
+int u8_printf(char *fmt, ...)
+{
+ int32_t cnt;
+ va_list args;
+
+ va_start(args, fmt);
+
+ cnt = u8_vprintf(fmt, args);
+
+ va_end(args);
+ return cnt;
+}
+
+// adaptation of g_utf8_validate
+
+#define UTF8_COMPUTE(Char, Mask, Len) \
+ if (Char < 128) \
+ { \
+ Len = 1; \
+ Mask = 0x7f; \
+ } \
+ else if ((Char & 0xe0) == 0xc0) \
+ { \
+ Len = 2; \
+ Mask = 0x1f; \
+ } \
+ else if ((Char & 0xf0) == 0xe0) \
+ { \
+ Len = 3; \
+ Mask = 0x0f; \
+ } \
+ else if ((Char & 0xf8) == 0xf0) \
+ { \
+ Len = 4; \
+ Mask = 0x07; \
+ } \
+ else if ((Char & 0xfc) == 0xf8) \
+ { \
+ Len = 5; \
+ Mask = 0x03; \
+ } \
+ else if ((Char & 0xfe) == 0xfc) \
+ { \
+ Len = 6; \
+ Mask = 0x01; \
+ } \
+ else \
+ Len = -1;
+
+#define UTF8_LENGTH(Char) \
+ ((Char) < 0x80 ? 1 : \
+ ((Char) < 0x800 ? 2 : \
+ ((Char) < 0x10000 ? 3 : \
+ ((Char) < 0x200000 ? 4 : \
+ ((Char) < 0x4000000 ? 5 : 6)))))
+
+
+#define UTF8_GET(Result, Chars, Count, Mask, Len) \
+ (Result) = (Chars)0 & (Mask); \
+ for ((Count) = 1; (Count) < (Len); ++(Count)) \
+ { \
+ if (((Chars)(Count) & 0xc0) != 0x80) \
+ { \
+ (Result) = -1; \
+ break; \
+ } \
+ (Result) <<= 6; \
+ (Result) |= ((Chars)(Count) & 0x3f); \
+ }
+
+#define UNICODE_VALID(Char) \
+ ((Char) < 0x110000 && \
+ (((Char) & 0xFFFFF800) != 0xD800) && \
+ ((Char) < 0xFDD0 || (Char) > 0xFDEF) && \
+ ((Char) & 0xFFFE) != 0xFFFE)
+
+
+int u8_valid (const char *str,
+ int max_len,
+ const char **end)
+{
+
+ const char *p;
+
+ if (!str) {
+ return 0;
+ }
+
+ if (end)
+ *end = str;
+
+ p = str;
+
+ while ((max_len < 0 || (p - str) < max_len) && *p)
+ {
+ int i, mask = 0, len;
+ int32_t result;
+ unsigned char c = (unsigned char) *p;
+
+ UTF8_COMPUTE (c, mask, len);
+
+ if (len == -1)
+ break;
+
+ /* check that the expected number of bytes exists in str */
+ if (max_len >= 0 &&
+ ((max_len - (p - str)) < len))
+ break;
+
+ UTF8_GET (result, p, i, mask, len);
+
+ if (UTF8_LENGTH (result) != len) /* Check for overlong UTF-8 */
+ break;
+
+ if (result == (int32_t)-1)
+ break;
+
+ if (!UNICODE_VALID (result))
+ break;
+
+ p += len;
+ }
+
+ if (end)
+ *end = p;
+
+ /* See that we covered the entire length if a length was
+ * passed in, or that we ended on a nul if not
+ */
+ if (max_len >= 0 && p != (str + max_len) && *p != 0) {
+ return 0;
+ }
+ else if (max_len < 0 && *p != '\0') {
+ return 0;
+ }
+ return 1;
+}
+
+#if 0
+static const char lowerchars = "áéíñóúüäöåæøàçèêабвгдеёжзийклмнорпстуфхцчшщъыьэюя";
+static const char upperchars = "ÁÉÍÑÓÚÜÄÖÅÆØÀÇÈÊАБВГДЕЁЖЗИЙКЛМНОРПСТУФХЦЧШЩЪЫЬЭЮЯ";
+#endif
+
+int
+u8_tolower_slow (const char *input, int len, char *out) {
+ struct u8_case_map_t *lc = u8_lc_in_word_set (input, len);
+ if (lc) {
+ size_t ll = strlen (lc->lower);
+ memcpy (out, lc->lower, ll);
+ outll = 0;
+ return (int)ll;
+ }
+ return 0;
+}
+
+int
+u8_tolower (const signed char *c, int l, char *out) {
+ if (*c >= 65 && *c <= 90) {
+ *out = *c + 0x20;
+ out1 = 0;
+ return 1;
+ }
+ else if (*c > 0) {
+ *out = *c;
+ out1 = 0;
+ return 1;
+ }
+ else {
+ int ll = u8_tolower_slow ((const char *)c, l, out);
+ if (ll) {
+ return ll;
+ }
+ memcpy (out, c, l);
+ outl = 0;
+ return l;
+ }
+}
+
+int
+u8_toupper_slow (const char *input, int len, char *out) {
+ struct u8_uppercase_map_t *uc = u8_uc_in_word_set (input, len);
+ if (uc) {
+ size_t ll = strlen (uc->upper);
+ memcpy (out, uc->upper, ll);
+ outll = 0;
+ return (int)ll;
+ }
+ return 0;
+}
+
+int
+u8_toupper (const signed char *c, int l, char *out) {
+ if (*c >= 97 && *c <= 122) {
+ *out = *c - 0x20;
+ out1 = 0;
+ return 1;
+ }
+ else if (*c > 0) {
+ *out = *c;
+ out1 = 0;
+ return 1;
+ }
+ else {
+ int ll = u8_toupper_slow ((const char *)c, l, out);
+ if (ll) {
+ return ll;
+ }
+ memcpy (out, c, l);
+ outl = 0;
+ return l;
+ }
+}
+
+const char *
+utfcasestr (const char *s1, const char *s2) {
+#if 0 // small u8_tolower test
+ while (*s2) {
+ int32_t i = 0;
+ u8_nextchar (s2, &i);
+ const char *next = s2 + i;
+ char lw10;
+ int l = u8_tolower (s2, next-s2, lw);
+ s2 = next;
+ fprintf (stderr, "%s", lw);
+ }
+ fprintf (stderr, "\n");
+ return NULL;
+#endif
+ while (*s1) {
+ const char *p1 = s1;
+ const char *p2 = s2;
+ while (*p2 && *p1) {
+ int32_t i1 = 0;
+ int32_t i2 = 0;
+ char lw110;
+ char lw210;
+ u8_nextchar (p1, &i1);
+ u8_nextchar (p2, &i2);
+ u8_tolower ((const signed char *)p1, i1, lw1);
+ u8_tolower ((const signed char *)p2, i2, lw2);
+ if (strcmp (lw1, lw2)) {
+ break;
+ }
+ p1 += i1;
+ p2 += i2;
+ }
+ if (*p2 == 0) {
+ return p1;
+ }
+ int32_t i = 0;
+ u8_nextchar (s1, &i);
+ s1 += i;
+ }
+ return NULL;
+}
+
+#define min(x,y) ((x)<(y)?(x):(y))
+// s2 must be lowercase
+const char *
+utfcasestr_fast (const char *s1, const char *s2) {
+ while (*s1) {
+ const char *p1 = s1;
+ const char *p2 = s2;
+ while (*p2 && *p1) {
+ int32_t i1 = 0;
+ int32_t i2 = 0;
+ char lw110;
+ u8_nextchar (p1, &i1);
+ u8_nextchar (p2, &i2);
+ int l1 = u8_tolower ((const signed char *)p1, i1, lw1);
+ if (memcmp (lw1, p2, min(i2,l1))) {
+ break;
+ }
+ p1 += i1;
+ p2 += i2;
+ }
+ if (*p2 == 0) {
+ return p1;
+ }
+ int32_t i = 0;
+ u8_nextchar (s1, &i);
+ s1 += i;
+ }
+ return NULL;
+}
+
+int
+u8_strcasecmp (const char *a, const char *b) {
+ const char *p1 = a, *p2 = b;
+ while (*p1 && *p2) {
+ int32_t i1 = 0;
+ int32_t i2 = 0;
+ char s110, s210;
+ u8_nextchar (p1, &i1);
+ u8_nextchar (p2, &i2);
+ int l1 = u8_tolower ((const signed char *)p1, i1, s1);
+ int l2 = u8_tolower ((const signed char *)p2, i2, s2);
+ int res = 0;
+ if (l1 != l2) {
+ res = l1-l2;
+ }
+ else {
+ res = memcmp (s1, s2, l1);
+ }
+ if (res) {
+ return res;
+ }
+ p1 += i1;
+ p2 += i2;
+ }
+
+ if (*p1) {
+ return 1;
+ }
+ else if (*p2) {
+ return -1;
+ }
+
+ return 0;
+}
+
+void
+u8_lc_map_test (void) {
+ struct u8_case_map_t *lc;
+ lc = u8_lc_in_word_set ("Á", 2);
+ printf ("%s -> %s\n", lc->name, lc->lower);
+ lc = u8_lc_in_word_set ("É", 2);
+ printf ("%s -> %s\n", lc->name, lc->lower);
+ lc = u8_lc_in_word_set ("Í", 2);
+ printf ("%s -> %s\n", lc->name, lc->lower);
+ lc = u8_lc_in_word_set ("Ñ", 2);
+ printf ("%s -> %s\n", lc->name, lc->lower);
+ lc = u8_lc_in_word_set ("П", 2);
+ printf ("%s -> %s\n", lc->name, lc->lower);
+ lc = u8_lc_in_word_set ("Л", 2);
+ printf ("%s -> %s\n", lc->name, lc->lower);
+ lc = u8_lc_in_word_set ("А", 2);
+ printf ("%s -> %s\n", lc->name, lc->lower);
+}

deadbeef-1.9.6.tar.bz2/src/utf8.h Added

@@ -0,0 +1,142 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ utf8 string manipulation
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+/* 
+ based on Basic UTF-8 manipulation routines
+ by Jeff Bezanson
+ placed in the public domain Fall 2005
+*/
+
+#ifndef __UTF8_H
+#define __UTF8_H
+
+#include <stdint.h>
+#include <stdarg.h>
+
+/* is c the start of a utf8 sequence? */
+#define isutf(c) (((c)&0xC0)!=0x80)
+
+/* convert UTF-8 data to wide character */
+int u8_toucs(uint32_t *dest, int32_t sz, const char *src, int32_t srcsz);
+
+/* the opposite conversion */
+int u8_toutf8(char *dest, int32_t sz, uint32_t *src, int32_t srcsz);
+
+/* single character to UTF-8 */
+int u8_wc_toutf8(char *dest, uint32_t ch);
+
+/* character number to byte offset */
+int u8_offset(char *str, int32_t charnum);
+
+/* byte offset to character number */
+int u8_charnum(char *s, int32_t offset);
+
+/* return next character, updating an index variable */
+uint32_t u8_nextchar(const char *s, int32_t *i);
+
+/* copies num_chars characters from src to dest, return bytes written */
+int u8_strncpy (char *dest, const char* src, int num_chars);
+
+/* copy num_bytes maximum bytes from src to dest, but always stop at the last possible utf8 character boundary;
+ return number of bytes copied
+ */
+int u8_strnbcpy (char *dest, const char* src, int num_bytes);
+
+/* copy single utf8 character of up to num_bytes bytes large, only if num_bytes is large enough;
+ return number of bytes copied
+ */
+int u8_charcpy (char *dest, const char *src, int num_bytes);
+
+/* move to next character */
+void u8_inc(const char *s, int32_t *i);
+
+/* move to previous character */
+void u8_dec(const char *s, int32_t *i);
+
+/* assuming src points to the character after a backslash, read an
+ escape sequence, storing the result in dest and returning the number of
+ input characters processed */
+int u8_read_escape_sequence(const char *src, uint32_t *dest);
+
+/* given a wide character, convert it to an ASCII escape sequence stored in
+ buf, where buf is "sz" bytes. returns the number of characters output. */
+int u8_escape_wchar(char *buf, int32_t sz, uint32_t ch);
+
+/* convert a string "src" containing escape sequences to UTF-8 */
+int u8_unescape(char *buf, int32_t sz, const char *src);
+
+/* convert UTF-8 "src" to ASCII with escape sequences.
+ if escape_quotes is nonzero, quote characters will be preceded by
+ backslashes as well. */
+int u8_escape(char *buf, int32_t sz, const char *src, int32_t escape_quotes);
+
+/* utility predicates used by the above */
+int octal_digit(char c);
+int hex_digit(char c);
+
+/* return a pointer to the first occurrence of ch in s, or NULL if not
+ found. character index of found character returned in *charn. */
+char *u8_strchr(char *s, uint32_t ch, int32_t *charn);
+
+/* same as the above, but searches a buffer of a given size instead of
+ a NUL-terminated string. */
+char *u8_memchr(char *s, uint32_t ch, size_t sz, int32_t *charn);
+
+/* count the number of characters in a UTF-8 string */
+int u8_strlen(char *s);
+
+int u8_is_locale_utf8(char *locale);
+
+/* printf where the format string and arguments may be in UTF-8.
+ you can avoid this function and just use ordinary printf() if the current
+ locale is UTF-8. */
+int u8_vprintf(char *fmt, va_list ap);
+int u8_printf(char *fmt, ...);
+
+// validate utf8 string
+// returns 1 if valid, 0 otherwise
+int u8_valid (const char *str,
+ int max_len,
+ const char **end);
+
+int
+u8_tolower (const signed char *c, int l, char *out);
+
+int
+u8_toupper (const signed char *c, int l, char *out);
+
+int
+u8_strcasecmp (const char *a, const char *b);
+
+const char *
+utfcasestr (const char *s1, const char *s2);
+
+// s2 must be lowercase
+const char *
+utfcasestr_fast (const char *s1, const char *s2);
+
+#endif

deadbeef-1.9.6.tar.bz2/src/vfs.c Added

@@ -0,0 +1,176 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ high-level vfs access interface
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include <string.h>
+#include <stdio.h>
+#include "vfs.h"
+#include "plugins.h"
+
+//#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+#define trace(fmt,...)
+
+#if defined(HAVE_XGUI)
+extern int android_use_only_wifi;
+extern int android_wifi_status;
+extern int android_network_access_request;
+#endif
+
+static int
+can_use_filename (const char *fname) {
+#if defined(HAVE_XGUI)
+ int res = (plug_is_local_file (fname) || !android_use_only_wifi || android_wifi_status);
+ if (!res) {
+ android_network_access_request = 1;
+ }
+ return res;
+#else
+ return 1;
+#endif
+}
+
+static int
+can_use_file (DB_FILE *fp) {
+#if defined(HAVE_XGUI)
+ int res = (!fp->vfs->is_streaming () || !android_use_only_wifi || android_wifi_status);
+ if (!res) {
+ android_network_access_request = 1;
+ }
+ return res;
+#else
+ return 1;
+#endif
+}
+
+DB_FILE *
+vfs_fopen (const char *fname) {
+ trace ("vfs_open %s\n", fname);
+
+ if (!can_use_filename (fname)) {
+ return NULL;
+ }
+
+ DB_vfs_t **plugs = plug_get_vfs_list ();
+ DB_vfs_t *fallback = NULL;
+ int i;
+ for (i = 0; plugsi; i++) {
+ DB_vfs_t *p = plugsi;
+ if (!p->get_schemes) {
+ fallback = p;
+ continue;
+ }
+ int n;
+ const char **scheme_names = p->get_schemes ();
+ for (n = 0; scheme_namesn; n++) {
+ size_t l = strlen (scheme_namesn);
+ if (!strncasecmp (scheme_namesn, fname, l)) {
+ return p->open (fname);
+ }
+ }
+ }
+ if (fallback) {
+ return fallback->open (fname);
+ }
+ return NULL;
+}
+
+void vfs_set_track (DB_FILE *stream, DB_playItem_t *it) {
+ if (stream->vfs->set_track) {
+ stream->vfs->set_track (stream, it);
+ }
+}
+
+void
+vfs_fclose (DB_FILE *stream) {
+ return stream->vfs->close (stream);
+}
+
+size_t
+vfs_fread (void *ptr, size_t size, size_t nmemb, DB_FILE *stream) {
+ if (!size || !nmemb) {
+ return 0;
+ }
+
+ if (!can_use_file (stream)) {
+ return 0;
+ }
+ return stream->vfs->read (ptr, size, nmemb, stream);
+}
+
+int
+vfs_fseek (DB_FILE *stream, int64_t offset, int whence) {
+ if (!can_use_file (stream)) {
+ return -1;
+ }
+ return stream->vfs->seek (stream, offset, whence);
+}
+
+int64_t
+vfs_ftell (DB_FILE *stream) {
+ if (!can_use_file (stream)) {
+ return -1;
+ }
+ return stream->vfs->tell (stream);
+}
+
+void
+vfs_rewind (DB_FILE *stream) {
+ stream->vfs->rewind (stream);
+}
+
+int64_t
+vfs_fgetlength (DB_FILE *stream) {
+ if (!can_use_file (stream)) {
+ return -1;
+ }
+ return stream->vfs->getlength (stream);
+}
+
+const char *
+vfs_get_content_type (DB_FILE *stream) {
+ if (!can_use_file (stream)) {
+ return NULL;
+ }
+ return stream->vfs->get_content_type (stream);
+}
+
+void
+vfs_fabort (DB_FILE *stream) {
+}
+
+uint64_t
+vfs_get_identifier (DB_FILE *stream) {
+ if (stream->vfs->get_identifier) {
+ return stream->vfs->get_identifier (stream);
+ }
+ return 0;
+}
+
+void
+vfs_abort_with_identifier (DB_vfs_t *vfs, uint64_t identifier) {
+ if (vfs->abort_with_identifier) {
+ vfs->abort_with_identifier (identifier);
+ }
+}

deadbeef-1.9.6.tar.bz2/src/vfs.h Added

@@ -0,0 +1,54 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ high-level vfs access interface
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+
+#ifndef __VFS_H
+#define __VFS_H
+
+#include <deadbeef/deadbeef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+DB_FILE* vfs_fopen (const char *fname);
+void vfs_set_track (DB_FILE *stream, DB_playItem_t *it);
+void vfs_fclose (DB_FILE *f);
+size_t vfs_fread (void *ptr, size_t size, size_t nmemb, DB_FILE *stream);
+int vfs_fseek (DB_FILE *stream, int64_t offset, int whence);
+int64_t vfs_ftell (DB_FILE *stream);
+void vfs_rewind (DB_FILE *stream);
+int64_t vfs_fgetlength (DB_FILE *stream);
+const char *vfs_get_content_type (DB_FILE *stream);
+void vfs_fabort (DB_FILE *stream);
+uint64_t vfs_get_identifier (DB_FILE *stream);
+void vfs_abort_with_identifier (DB_vfs_t *vfs, uint64_t identifier);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __VFS_H

deadbeef-1.9.6.tar.bz2/src/vfs_stdio.c Added

@@ -0,0 +1,286 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ standard file vfs implementation
+
+ Copyright (C) 2009-2015 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include <deadbeef/deadbeef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#ifndef __linux__
+#define O_LARGEFILE 0
+#endif
+
+//#define USE_STDIO
+#define USE_BUFFERING
+
+#ifndef USE_STDIO
+#define BUFSIZE 1024
+#endif
+
+static DB_functions_t *deadbeef;
+typedef struct {
+ DB_vfs_t *vfs;
+#ifdef USE_STDIO
+ FILE *stream;
+#else
+ int stream;
+ int64_t offs;
+#ifdef USE_BUFFERING
+ uint8_t bufferBUFSIZE;
+ uint8_t *bufptr;
+ int bufremaining;
+#endif
+ int have_size;
+ size_t size;
+#endif
+} STDIO_FILE;
+
+static DB_vfs_t plugin;
+
+static DB_FILE *
+stdio_open (const char *fname) {
+ if (!memcmp (fname, "file://", 7)) {
+ fname += 7;
+ }
+#ifdef USE_STDIO
+ FILE *file = fopen (fname, "rb");
+ if (!file) {
+ return NULL;
+ }
+#else
+ int file = open (fname, O_LARGEFILE);
+ if (file == -1) {
+ return NULL;
+ }
+#endif
+ STDIO_FILE *fp = malloc (sizeof (STDIO_FILE));
+ memset (fp, 0, sizeof (STDIO_FILE));
+ fp->vfs = &plugin;
+ fp->stream = file;
+ return (DB_FILE*)fp;
+}
+
+static void
+stdio_close (DB_FILE *stream) {
+ assert (stream);
+#ifdef USE_STDIO
+ fclose (((STDIO_FILE *)stream)->stream);
+#else
+ close (((STDIO_FILE *)stream)->stream);
+#endif
+ free (stream);
+}
+
+#ifndef USE_STDIO
+#ifdef USE_BUFFERING
+static int
+fillbuffer (STDIO_FILE *f) {
+ assert (f->bufremaining >= 0);
+ if (f->bufremaining == 0) {
+ f->bufremaining = (int)read (f->stream, f->buffer, BUFSIZE);
+ if (f->bufremaining < 0) {
+ f->bufremaining = 0;
+ return -1;
+ }
+ f->bufptr = f->buffer;
+ }
+ return f->bufremaining;
+}
+#endif
+#endif
+
+static size_t
+stdio_read (void *ptr, size_t size, size_t nmemb, DB_FILE *stream) {
+ assert (stream);
+ assert (ptr);
+#ifdef USE_STDIO
+ return fread (ptr, size, nmemb, ((STDIO_FILE*)stream)->stream);
+#else
+ STDIO_FILE *f = (STDIO_FILE*)stream;
+
+ size_t nb = size * nmemb;
+#ifdef USE_BUFFERING
+ while (nb > 0) {
+ if (fillbuffer (f) <= 0) {
+ break;
+ }
+ int r = f->bufremaining;
+ if (r > nb) {
+ r = (int)nb;
+ }
+ memcpy (ptr, f->bufptr, r);
+ f->bufremaining -= r;
+ f->bufptr += r;
+ ptr += r;
+ f->offs += r;
+ nb -= r;
+ }
+ size_t ret = ((size * nmemb) - nb) / size;
+#else
+ ssize_t ret = read (f->stream, ptr, nb);
+ if (ret < 0) {
+ return -1;
+ }
+ f->offs += ret;
+ ret = ret / size;
+#endif
+ return ret;
+#endif
+}
+
+static int
+stdio_seek (DB_FILE *stream, int64_t offset, int whence) {
+ assert (stream);
+#ifdef USE_STDIO
+ return fseek (((STDIO_FILE *)stream)->stream, offset, whence);
+#else
+ // convert offset to absolute
+ if (whence == SEEK_CUR) {
+ whence = SEEK_SET;
+ offset = ((STDIO_FILE*)stream)->offs + offset;
+ }
+ off_t res = lseek (((STDIO_FILE *)stream)->stream, offset, whence);
+ if (res == -1) {
+ return -1;
+ }
+// printf ("lseek res: %lld (%lld, %d, prev=%lld)\n", res, offset, whence, ((STDIO_FILE*)stream)->offs);
+ ((STDIO_FILE*)stream)->offs = res;
+#ifdef USE_BUFFERING
+ ((STDIO_FILE*)stream)->bufremaining = 0;
+#endif
+#endif
+ return 0;
+}
+
+static int64_t
+stdio_tell (DB_FILE *stream) {
+ assert (stream);
+#ifdef USE_STDIO
+ return ftell (((STDIO_FILE*)stream)->stream);
+#else
+ return ((STDIO_FILE*)stream)->offs;
+#endif
+}
+
+static void
+stdio_rewind (DB_FILE *stream) {
+ assert (stream);
+#ifdef USE_STDIO
+ rewind (((STDIO_FILE*)stream)->stream);
+#else
+ stdio_seek (stream, 0, SEEK_SET);
+#endif
+}
+
+static int64_t
+stdio_getlength (DB_FILE *stream) {
+ assert (stream);
+ STDIO_FILE *f = (STDIO_FILE *)stream;
+#ifdef USE_STDIO
+ size_t offs = ftell (f->stream);
+ fseek (f->stream, 0, SEEK_END);
+ size_t l = ftell (f->stream);
+ fseek (f->stream, offs, SEEK_SET);
+ return l;
+#else
+ if (!f->have_size) {
+ int64_t size = lseek (f->stream, 0, SEEK_END);
+ lseek (f->stream, f->offs, SEEK_SET);
+#ifdef USE_BUFFERING
+ f->bufremaining = 0;
+#endif
+ f->have_size = 1;
+ f->size = size;
+ }
+ return f->size;
+#endif
+}
+
+const char *
+stdio_get_content_type (DB_FILE *stream) {
+ return NULL;
+}
+
+int
+stdio_is_streaming (void) {
+ return 0;
+}
+
+// standard stdio vfs
+static DB_vfs_t plugin = {
+ DB_PLUGIN_SET_API_VERSION
+ .plugin.version_major = 1,
+ .plugin.version_minor = 0,
+ .plugin.type = DB_PLUGIN_VFS,
+ .plugin.name = "stdio vfs",
+ .plugin.id = "vfs_stdio",
+ .plugin.descr = "Standard IO plugin\nUsed for reading normal local files\nIt is statically linked, so you can't delete it.",
+ .plugin.copyright = 
+ "standard file vfs implementation\n"
+ "\n"
+ "Copyright (C) 2009-2015 Oleksiy Yakovenko\n"
+ "\n"
+ "This software is provided 'as-is', without any express or implied\n"
+ "warranty. In no event will the authors be held liable for any damages\n"
+ "arising from the use of this software.\n"
+ "\n"
+ "Permission is granted to anyone to use this software for any purpose,\n"
+ "including commercial applications, and to alter it and redistribute it\n"
+ "freely, subject to the following restrictions:\n"
+ "\n"
+ "1. The origin of this software must not be misrepresented; you must not\n"
+ " claim that you wrote the original software. If you use this software\n"
+ " in a product, an acknowledgment in the product documentation would be\n"
+ " appreciated but is not required.\n"
+ "2. Altered source versions must be plainly marked as such, and must not be\n"
+ " misrepresented as being the original software.\n"
+ "3. This notice may not be removed or altered from any source distribution.\n"
+ "\n"
+ "Oleksiy Yakovenko waker@users.sourceforge.net\n"
+ ,
+ .plugin.website = "http://deadbeef.sf.net",
+ .open = stdio_open,
+ .close = stdio_close,
+ .read = stdio_read,
+ .seek = stdio_seek,
+ .tell = stdio_tell,
+ .rewind = stdio_rewind,
+ .getlength = stdio_getlength,
+ .get_content_type = stdio_get_content_type,
+ .is_streaming = stdio_is_streaming
+};
+
+DB_plugin_t *
+stdio_load (DB_functions_t *api) {
+ deadbeef = api;
+ return DB_PLUGIN (&plugin);
+}
+

deadbeef-1.9.6.tar.bz2/src/viz.c Added

@@ -0,0 +1,246 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include <assert.h>
+#include <dispatch/dispatch.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "fft.h"
+#include "premix.h"
+#include "threading.h"
+#include "viz.h"
+
+static dispatch_queue_t sync_queue;
+static dispatch_queue_t process_queue;
+
+// Listeners
+typedef struct wavedata_listener_s {
+ void *ctx;
+ void (*callback)(void *ctx, const ddb_audio_data_t *data);
+ struct wavedata_listener_s *next;
+} wavedata_listener_t;
+
+static wavedata_listener_t *waveform_listeners;
+static wavedata_listener_t *spectrum_listeners;
+
+//#define HISTORY_FRAMES 100000
+
+static int _fft_size = 0;
+static float *_freq_data;
+static float *_audio_data;
+static int _need_reset = 0;
+static int audio_data_channels = 0;
+
+static void
+_free_buffers (void) {
+ free (_freq_data);
+ free (_audio_data);
+ _freq_data = NULL;
+ _audio_data = NULL;
+}
+
+static void
+_init_buffers (int fft_size) {
+ if (fft_size != _fft_size) {
+ _free_buffers ();
+ if (fft_size != 0) {
+ _freq_data = calloc(fft_size * DDB_FREQ_MAX_CHANNELS, sizeof (float));
+ _audio_data = calloc(fft_size * 2 * DDB_FREQ_MAX_CHANNELS, sizeof (float));
+ }
+ _fft_size = fft_size;
+ }
+}
+
+void
+viz_init (void) {
+ sync_queue = dispatch_queue_create("Viz Sync Queue", NULL);
+ process_queue = dispatch_queue_create("Viz Process Queue", NULL);
+}
+
+void
+viz_free (void) {
+ dispatch_release(process_queue);
+ dispatch_release(sync_queue);
+ _free_buffers();
+}
+
+void
+viz_waveform_listen (void *ctx, void (*callback)(void *ctx, const ddb_audio_data_t *data)) {
+ dispatch_sync(sync_queue, ^{
+ wavedata_listener_t *l = malloc (sizeof (wavedata_listener_t));
+ memset (l, 0, sizeof (wavedata_listener_t));
+ l->ctx = ctx;
+ l->callback = callback;
+ l->next = waveform_listeners;
+ waveform_listeners = l;
+ });
+}
+
+void
+viz_waveform_unlisten (void *ctx) {
+ dispatch_sync(sync_queue, ^{
+ wavedata_listener_t *l, *prev = NULL;
+ for (l = waveform_listeners; l; prev = l, l = l->next) {
+ if (l->ctx == ctx) {
+ if (prev) {
+ prev->next = l->next;
+ }
+ else {
+ waveform_listeners = l->next;
+ }
+ free (l);
+ break;
+ }
+ }
+ });
+}
+
+void
+viz_spectrum_listen (void *ctx, void (*callback)(void *ctx, const ddb_audio_data_t *data)) {
+ dispatch_sync(sync_queue, ^{
+ wavedata_listener_t *l = malloc (sizeof (wavedata_listener_t));
+ memset (l, 0, sizeof (wavedata_listener_t));
+ l->ctx = ctx;
+ l->callback = callback;
+ l->next = spectrum_listeners;
+ spectrum_listeners = l;
+ });
+}
+
+void
+viz_spectrum_unlisten (void *ctx) {
+ dispatch_sync(sync_queue, ^{
+ wavedata_listener_t *l, *prev = NULL;
+ for (l = spectrum_listeners; l; prev = l, l = l->next) {
+ if (l->ctx == ctx) {
+ if (prev) {
+ prev->next = l->next;
+ }
+ else {
+ spectrum_listeners = l->next;
+ }
+ free (l);
+ break;
+ }
+ }
+ });
+}
+
+void
+viz_reset (void) {
+ dispatch_sync(sync_queue, ^{
+ _need_reset = 1;
+ });
+}
+
+void
+viz_process (char * restrict _bytes, int _bytes_size, DB_output_t *output, int fft_size, int wave_size) {
+ dispatch_sync(sync_queue, ^{
+ _init_buffers(fft_size);
+ if (!waveform_listeners && !spectrum_listeners) {
+ return;
+ }
+
+ char *bytes = _bytes;
+ if (output->fmt.flags & DDB_WAVEFORMAT_FLAG_IS_DOP) {
+ bytes = NULL;
+ }
+ 
+ // convert to float
+ ddb_waveformat_t *out_fmt = calloc (1, sizeof (ddb_waveformat_t));
+ out_fmt->bps = 32;
+ out_fmt->channels = output->fmt.channels;
+ out_fmt->samplerate = output->fmt.samplerate;
+ out_fmt->channelmask = output->fmt.channelmask;
+ out_fmt->is_float = 1;
+
+ const int fft_nframes = fft_size * 2;
+
+ // calculate the size which can fit either the FFT input, or the wave data.
+ const int output_nframes = fft_nframes > wave_size ? fft_nframes : wave_size;
+
+ const int final_output_size = output_nframes * out_fmt->channels * sizeof (float);
+ const int final_input_size = output_nframes * output->fmt.channels * (output->fmt.bps/8);
+ float *data = calloc(1, final_output_size);
+
+ if (bytes != NULL) {
+ // take only as much bytes as we have available.
+ const int convert_size = _bytes_size < final_input_size ? _bytes_size : final_input_size;
+
+ // After this runs, we'll have a buffer with enough samples for FFT, padded with 0s if needed.
+ pcm_convert (&output->fmt, bytes, out_fmt, (char *)data, convert_size);
+ }
+
+ ddb_audio_data_t *waveform_data = calloc(1, sizeof(ddb_audio_data_t));
+ waveform_data->fmt = out_fmt;
+ waveform_data->data = data;
+ waveform_data->nframes = wave_size;
+
+ if (_need_reset || out_fmt->channels != audio_data_channels || !spectrum_listeners) {
+ // reset
+ audio_data_channels = out_fmt->channels;
+ memset (_freq_data, 0, sizeof (float) * _fft_size * DDB_FREQ_MAX_CHANNELS);
+ memset (_audio_data, 0, sizeof (float) * _fft_size * 2 * DDB_FREQ_MAX_CHANNELS);
+ _need_reset = 0;
+ }
+
+ if (spectrum_listeners) {
+ // convert samples in planar layout
+ assert (fft_nframes == _fft_size * 2);
+ for (int c = 0; c < audio_data_channels; c++) {
+ float *channel = &_audio_data_fft_size * 2 * c;
+ for (int s = 0; s < fft_nframes; s++) {
+ channels = datas * audio_data_channels + c;
+ }
+ }
+
+ // calc fft
+ if (_audio_data != NULL) {
+ for (int c = 0; c < audio_data_channels; c++) {
+ fft_calculate (&_audio_data_fft_size * 2 * c, &_freq_data_fft_size * c, _fft_size);
+ }
+ }
+ ddb_audio_data_t spectrum_data = {
+ .fmt = out_fmt,
+ .data = _freq_data,
+ .nframes = _fft_size
+ };
+ for (wavedata_listener_t *l = spectrum_listeners; l; l = l->next) {
+ l->callback (l->ctx, &spectrum_data);
+ }
+ }
+
+ // Pass to async queue for processing and callbacks
+ dispatch_async (process_queue, ^{
+ for (wavedata_listener_t *l = waveform_listeners; l; l = l->next) {
+ l->callback (l->ctx, waveform_data);
+ }
+
+ free (data);
+ free (out_fmt);
+ free (waveform_data);
+ });
+
+ });
+}
+

deadbeef-1.9.6.tar.bz2/src/viz.h Added

@@ -0,0 +1,52 @@
+/*
+ DeaDBeeF -- the music player
+ Copyright (C) 2009-2021 Oleksiy Yakovenko and other contributors
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef viz_h
+#define viz_h
+
+#include <deadbeef/deadbeef.h>
+
+void
+viz_process (char * restrict bytes, int bytes_size, DB_output_t *output, int fft_size, int wave_size);
+
+void
+viz_init (void);
+
+void
+viz_free (void);
+
+void
+viz_reset (void);
+
+void
+viz_waveform_listen (void *ctx, void (*callback)(void *ctx, const ddb_audio_data_t *data));
+
+void
+viz_waveform_unlisten (void *ctx);
+
+void
+viz_spectrum_listen (void *ctx, void (*callback)(void *ctx, const ddb_audio_data_t *data));
+
+void
+viz_spectrum_unlisten (void *ctx);
+
+#endif /* viz_h */

deadbeef-1.9.6.tar.bz2/src/volume.c Added

@@ -0,0 +1,110 @@
+/*
+ This file is part of Deadbeef Player source code
+ http://deadbeef.sourceforge.net
+
+ pcm volume manipulation routines
+
+ Copyright (C) 2009-2013 Oleksiy 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
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#include <math.h>
+#include <stdio.h>
+#include "volume.h"
+#include "conf.h"
+
+#define VOLUME_MIN (-50.f)
+
+static float volume_db = 0; // in dB
+static float volume_amp = 1; // amplitude 0..1
+static int audio_mute = 0;
+
+void
+volume_set_db (float dB) {
+ if (dB < VOLUME_MIN) {
+ dB = VOLUME_MIN;
+ }
+ if (dB > 0) {
+ dB = 0;
+ }
+ volume_amp = dB > VOLUME_MIN ? db_to_amp (dB) : 0;
+ volume_db = dB;
+ audio_mute = 0;
+ conf_set_float ("playback.volume.normalized", volume_amp);
+}
+
+float
+volume_get_db (void) {
+ return volume_db;
+}
+
+void
+volume_set_amp (float amp) {
+ if (amp < 0) {
+ amp = 0;
+ }
+ if (amp > 1) {
+ amp = 1;
+ }
+ volume_amp = amp;
+ volume_db = amp > 0 ? amp_to_db (amp) : VOLUME_MIN;
+
+ if (volume_db < VOLUME_MIN) {
+ volume_db = VOLUME_MIN;
+ }
+ else if (volume_db > 0) {
+ volume_db = 0;
+ }
+
+ audio_mute = 0;
+ conf_set_float ("playback.volume.normalized", volume_amp);
+}
+
+float
+volume_get_amp (void) {
+ return volume_amp;
+}
+
+float
+db_to_amp (float dB) {
+// return pow (10, dB/20.f);
+ // thanks to he for this hack
+ const float ln10=2.3025850929940002f;
+ return (float)exp(ln10*dB/20.f);
+}
+
+float
+amp_to_db (float amp) {
+ return (float)(20*log10 (amp));
+}
+
+float
+volume_get_min_db (void) {
+ return VOLUME_MIN;
+}
+
+void
+audio_set_mute (int mute) {
+ audio_mute = mute;
+}
+
+int
+audio_is_mute (void) {
+ return audio_mute;
+}

deadbeef-1.9.6.tar.bz2/src/volume.h Added

@@ -0,0 +1,57 @@
+/*
+  This file is part of Deadbeef Player source code
+  http://deadbeef.sourceforge.net
+
+  pcm volume manipulation routines
+
+  Copyright (C) 2009-2013 Oleksiy 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
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Oleksiy Yakovenko waker@users.sourceforge.net
+*/
+#ifndef __VOLUME_H
+#define __VOLUME_H
+
+void
+volume_set_db (float dB);
+
+float
+volume_get_db (void);
+
+void
+volume_set_amp (float amp);
+
+float
+volume_get_amp (void);
+
+float
+db_to_amp (float dB);
+
+float
+amp_to_db (float amp);
+
+float
+volume_get_min_db (void);
+
+void
+audio_set_mute (int mute);
+
+int
+audio_is_mute (void);
+
+#endif // __VOLUME_H

deadbeef-0.6.2.tar.bz2/translation/extra.c -> deadbeef-1.9.6.tar.bz2/translation/extra.c Changed

@@ -1,70 +1,3 @@
-// this file should list extra translatable strings that are not referenced
-// directly in source code, e.g. scripted plugin configuration strings
-_("Add Audio CD")
-_("Lookup on Last.fm")
-// ALSA output plugin
-_("Use ALSA resampling")
-_("Release device while stopped")
-_("Preferred buffer size")
-_("Preferred period size")
-// Last.fm plugin
-_("Enable scrobbler")
-_("Disable nowplaying")
-_("Username")
-_("Password")
-_("Scrobble URL")
-_("Prefer Album Artist over Artist field")
-// OSS output plugin
-_("Device file")
-_("OSS4 samplerate bug workaround")
-// Album Artwork plugin
-_("Cache update period (hr)")
-_("Fetch from embedded tags")
-_("Fetch from local folder")
-_("Local cover file mask")
-_("Fetch from last.fm")
-_("Fetch from albumart.org")
-_("Scale artwork towards longer side")
-// Audio CD player
-_("Use CDDB/FreeDB")
-_("Prefer CD-Text over CDDB")
-_("CDDB url (e.g. 'freedb.org')")
-_("CDDB port number (e.g. '888')")
-_("Prefer CDDB protocol over HTTP")
-_("Enable NRG image support")
-// DUMB module player plugin
-_("Resampling quality (0..2, higher is better)")
-_("8-bit output (default is 16)")
-// Game_Music_Emu decoder plugin
-_("Max song length (in minutes)")
-_("Fadeout length (seconds)")
-_("Play loops nr. of times (if available)")
-// Standard GTK2 user interface plugin
-_("Ask confirmation to delete files from disk")
-_("Status icon volume control sensitivity")
-_("Custom status icon")
-_("Run gtk_init with --sync (debug mode)")
-_("Add separators between plugin context menu items")
-// OSD Notify plugin
-_("Notification title format")
-_("Notification content format")
-_("Show album art")
-_("Album art size (px)")
-// PulseAudio output plugin
-_("PulseAudio server")
-_("Preferred buffer size")
-_("Samplerate")
-// SHN player plugin
-_("Relative seek table path")
-_("Absolute seek table path")
-_("Swap audio bytes (toggle if all you hear is static)")
-// SID decoder plugin
-_("Enable HVSC Songlength DB")
-_("Songlengths.txt (from HVSC)")
-_("Bits per sample (8 or 16)")
-_("Default song length (sec)")
-// WildMidi player plugin
-_("Timidity++ bank configuration file")
 // Track properties dialog
 _("Artist")
 _("Track Title")
@@ -77,6 +10,7 @@
 _("Genre")
 _("Composer")
 _("Disc Number")
+_("Total Discs")
 _("Comment")
 _("Encoder / Vendor")
 _("Copyright")
@@ -85,18 +19,3 @@
 _("Tag Type(s)")
 _("Embedded Cuesheet")
 _("Codec")
-// FFmpeg deocder plugin
-_("File Extensions (separate with ';')")
-//Converter GUI
-_("Convert")
-// Resampler (Secret Rabbit Code)
-_("Target Samplerate")
-_("Quality / Algorithm")
-_("Automatic Samplerate (overrides Target Samplerate)")
-// shellexecui
-_("Configure Custom Shell Commands")
-// mpgmad
-_("Disable gapless playback (faster scanning)")
-// adplug
-_("Prefer Ken emu over Satoh (surround won't work)")
-_("Enable surround")

deadbeef-1.9.6.tar.bz2/translation/plugins.c Added

@@ -0,0 +1,531 @@
+// external/ddb_output_pw/pw.c
+// xgettext:no-c-format
+_("PipeWire remote daemon name (empty for default)");
+// xgettext:no-c-format
+_("Custom properties (overrides existing ones):");
+// xgettext:no-c-format
+_("Use PipeWire volume control");
+// plugins/adplug/plugin.c
+// xgettext:no-c-format
+_("Prefer Ken emu over Satoh (surround won't work)");
+// xgettext:no-c-format
+_("Enable surround");
+// plugins/alsa/alsa.c
+// xgettext:no-c-format
+_("Use ALSA resampling");
+// xgettext:no-c-format
+_("Preferred buffer size");
+// xgettext:no-c-format
+_("Preferred period size");
+// plugins/artwork/artwork.c
+// xgettext:no-c-format
+_("Refresh Cover Art");
+// xgettext:no-c-format
+_("Fetch from embedded tags");
+// xgettext:no-c-format
+_("Fetch from local folder");
+// xgettext:no-c-format
+_("Fetch from Last.fm");
+// xgettext:no-c-format
+_("Fetch from MusicBrainz");
+// xgettext:no-c-format
+_("Fetch from Albumart.org");
+// xgettext:no-c-format
+_("Fetch from World of Spectrum (AY files)");
+// xgettext:no-c-format
+_("Save downloaded files to music folders");
+// xgettext:no-c-format
+_("When no artwork is found");
+// xgettext:no-c-format
+_("leave blank");
+// xgettext:no-c-format
+_("use DeaDBeeF default cover");
+// xgettext:no-c-format
+_("display custom image");
+// xgettext:no-c-format
+_("Custom image path");
+// xgettext:no-c-format
+_("Save to file name");
+// xgettext:no-c-format
+_("Search masks (; separated)");
+// xgettext:no-c-format
+_("Search folders (; separated)");
+// xgettext:no-c-format
+_("Cache refresh (hrs)");
+// xgettext:no-c-format
+_("Simplified cache file names");
+// xgettext:no-c-format
+_("Image size");
+// plugins/cdda/cdda.c
+// xgettext:no-c-format
+_("CD drive to load");
+// xgettext:no-c-format
+_("Audio CD Drive");
+// xgettext:no-c-format
+_("File");
+// xgettext:no-c-format
+_("Add Audio CD");
+// xgettext:no-c-format
+_("Use CDDB/GnuDb");
+// xgettext:no-c-format
+_("Prefer CD-Text over CDDB");
+// xgettext:no-c-format
+_("CDDB url (e.g. 'gnudb.gnudb.org')");
+// xgettext:no-c-format
+_("CDDB port number (e.g. '8880')");
+// xgettext:no-c-format
+_("Use CDDB protocol");
+// xgettext:no-c-format
+_("Enable NRG image support");
+// xgettext:no-c-format
+_("Drive speed for normal playback");
+// xgettext:no-c-format
+_("1x");
+// xgettext:no-c-format
+_("2x");
+// xgettext:no-c-format
+_("4x");
+// xgettext:no-c-format
+_("8x");
+// xgettext:no-c-format
+_("16x");
+// xgettext:no-c-format
+_("Max");
+// xgettext:no-c-format
+_("Use cdparanoia error correction when ripping");
+// plugins/converter/convgui.c
+// xgettext:no-c-format
+_("Convert");
+// plugins/dsp_libsrc/src.c
+// xgettext:no-c-format
+_("Autodetect samplerate from output device");
+// xgettext:no-c-format
+_("Set samplerate directly");
+// xgettext:no-c-format
+_("Quality / Algorithm");
+// plugins/dumb/cdumb.c
+// xgettext:no-c-format
+_("Resampling quality");
+// xgettext:no-c-format
+_("Internal DUMB volume");
+// xgettext:no-c-format
+_("Volume ramping");
+// xgettext:no-c-format
+_("None");
+// xgettext:no-c-format
+_("On/Off Only");
+// xgettext:no-c-format
+_("Full");
+// xgettext:no-c-format
+_("8-bit output");
+// plugins/ffmpeg/ffmpeg.c
+// xgettext:no-c-format
+_("Use all extensions supported by ffmpeg");
+// xgettext:no-c-format
+_("File Extensions (separate with ';')");
+// xgettext:no-c-format
+_("Enable DoP output");
+// plugins/flac/flac.c
+// xgettext:no-c-format
+_("Ignore bad header errors");
+// xgettext:no-c-format
+_("Ignore unparsable stream errors");
+// plugins/gme/cgme.c
+// xgettext:no-c-format
+_("Max song length (in minutes)");
+// xgettext:no-c-format
+_("Fadeout length (seconds)");
+// xgettext:no-c-format
+_("Play loops nr. of times (if available)");
+// xgettext:no-c-format
+_("ColecoVision BIOS (for SGC file format)");
+// plugins/gtkui/gtkui.c
+// xgettext:no-c-format
+_("ReplayGain");
+// xgettext:no-c-format
+_("Remove ReplayGain Information");
+// xgettext:no-c-format
+_("Scan Selection As Albums (By Tags)");
+// xgettext:no-c-format
+_("Scan Selection As Single Album");
+// xgettext:no-c-format
+_("Scan Per-file Track Gain");
+// xgettext:no-c-format
+_("Scan Per-file Track Gain If Not Scanned");
+// xgettext:no-c-format
+_("Edit");
+// xgettext:no-c-format
+_("Deselect All");
+// xgettext:no-c-format
+_("Select All");
+// xgettext:no-c-format
+_("Quit");
+// xgettext:no-c-format
+_("Delete from Disk");
+// xgettext:no-c-format
+_("Add Location");
+// xgettext:no-c-format
+_("Add Folder(s)");
+// xgettext:no-c-format
+_("Add File(s)");
+// xgettext:no-c-format
+_("Open File(s)");
+// xgettext:no-c-format
+_("Track Properties");
+// xgettext:no-c-format
+_("Help");
+// xgettext:no-c-format
+_("Show Help Page");
+// xgettext:no-c-format
+_("Playback");
+// xgettext:no-c-format
+_("Cycle Repeat Mode");
+// xgettext:no-c-format
+_("Repeat - Off");
+// xgettext:no-c-format
+_("Repeat - Single Track");
+// xgettext:no-c-format
+_("Repeat - All");
+// xgettext:no-c-format
+_("Cycle Shuffle Mode");
+// xgettext:no-c-format
+_("Shuffle - Random Tracks");
+// xgettext:no-c-format
+_("Shuffle - Albums");
+// xgettext:no-c-format
+_("Shuffle - Tracks");
+// xgettext:no-c-format
+_("Shuffle - Off");
+// xgettext:no-c-format
+_("Toggle Cursor Follows Playback");
+// xgettext:no-c-format
+_("Toggle Scroll Follows Playback");
+// xgettext:no-c-format
+_("View");
+// xgettext:no-c-format
+_("Show\\/Hide menu");
+// xgettext:no-c-format
+_("Show\\/Hide statusbar");
+// xgettext:no-c-format
+_("Toggle Design Mode");
+// xgettext:no-c-format
+_("Preferences");
+// xgettext:no-c-format
+_("Sort Custom");
+// xgettext:no-c-format
+_("Crop Selected");
+// xgettext:no-c-format
+_("Remove Track(s) from Playlist");
+// xgettext:no-c-format
+_("Save Playlist");
+// xgettext:no-c-format
+_("Load Playlist");
+// xgettext:no-c-format
+_("Remove Current Playlist");
+// xgettext:no-c-format
+_("New Playlist");
+// xgettext:no-c-format
+_("Rename Current Playlist");
+// xgettext:no-c-format
+_("Show\\/Hide Equalizer");
+// xgettext:no-c-format
+_("Hide Equalizer");
+// xgettext:no-c-format
+_("Show Equalizer");
+// xgettext:no-c-format
+_("Show\\/Hide Player Window");
+// xgettext:no-c-format
+_("Hide Player Window");
+// xgettext:no-c-format
+_("Show Player Window");
+// xgettext:no-c-format
+_("Find");
+// xgettext:no-c-format
+_("Show\\/Hide Log window");
+// xgettext:no-c-format
+_("Ask confirmation to delete files from disk");
+// xgettext:no-c-format
+_("Status icon settings:");
+// xgettext:no-c-format
+_("Status icon volume control sensitivity");
+// xgettext:no-c-format
+_("Custom status icon");
+// xgettext:no-c-format
+_("Misc:");
+// xgettext:no-c-format
+_("Add separators between plugin context menu items");
+// xgettext:no-c-format
+_("Use unicode chars instead of images for track state");
+// xgettext:no-c-format
+_("Disable seekbar overlay text");
+// plugins/hotkeys/hotkeys.c
+// xgettext:no-c-format
+_("Previous or Restart Current Track");
+// xgettext:no-c-format
+_("Duplicate Playlist");
+// xgettext:no-c-format
+_("Reload Metadata");
+// xgettext:no-c-format
+_("Jump to Currently Playing Track");
+// xgettext:no-c-format
+_("Skip to");
+// xgettext:no-c-format
+_("Previous Genre");
+// xgettext:no-c-format
+_("Previous Composer");
+// xgettext:no-c-format
+_("Previous Artist");
+// xgettext:no-c-format
+_("Previous Album");
+// xgettext:no-c-format
+_("Next Genre");
+// xgettext:no-c-format
+_("Next Composer");
+// xgettext:no-c-format
+_("Next Artist");
+// xgettext:no-c-format
+_("Next Album");
+// xgettext:no-c-format
+_("Next Playlist");
+// xgettext:no-c-format
+_("Previous Playlist");
+// xgettext:no-c-format
+_("Switch to Playlist 10");
+// xgettext:no-c-format
+_("Switch to Playlist 9");
+// xgettext:no-c-format
+_("Switch to Playlist 8");
+// xgettext:no-c-format
+_("Switch to Playlist 7");
+// xgettext:no-c-format
+_("Switch to Playlist 6");
+// xgettext:no-c-format
+_("Switch to Playlist 5");
+// xgettext:no-c-format
+_("Switch to Playlist 4");
+// xgettext:no-c-format
+_("Switch to Playlist 3");
+// xgettext:no-c-format
+_("Switch to Playlist 2");
+// xgettext:no-c-format
+_("Switch to Playlist 1");
+// xgettext:no-c-format
+_("Sort Randomize");
+// xgettext:no-c-format
+_("Sort by Date");
+// xgettext:no-c-format
+_("Sort by Artist");
+// xgettext:no-c-format
+_("Sort by Album");
+// xgettext:no-c-format
+_("Sort by Track Number");
+// xgettext:no-c-format
+_("Sort by Title");
+// xgettext:no-c-format
+_("Invert Selection");
+// xgettext:no-c-format
+_("Clear Playlist");
+// xgettext:no-c-format
+_("Remove from Playback Queue");
+// xgettext:no-c-format
+_("Add to Playback Queue");
+// xgettext:no-c-format
+_("Add to Front of Playback Queue");
+// xgettext:no-c-format
+_("Toggle in Playback Queue");
+// xgettext:no-c-format
+_("Move");
+// xgettext:no-c-format
+_("Move Tracks Down");
+// xgettext:no-c-format
+_("Move Tracks Up");
+// xgettext:no-c-format
+_("Toggle Mute");
+// xgettext:no-c-format
+_("Play");
+// xgettext:no-c-format
+_("Stop");
+// xgettext:no-c-format
+_("Previous");
+// xgettext:no-c-format
+_("Next");
+// xgettext:no-c-format
+_("Toggle Pause");
+// xgettext:no-c-format
+_("Play\\/Pause");
+// xgettext:no-c-format
+_("Play Random");
+// xgettext:no-c-format
+_("Seek 1s Forward");
+// xgettext:no-c-format
+_("Seek 1s Backward");
+// xgettext:no-c-format
+_("Seek 5s Forward");
+// xgettext:no-c-format
+_("Seek 5s Backward");
+// xgettext:no-c-format
+_("Seek 1% Forward");
+// xgettext:no-c-format
+_("Seek 1% Backward");
+// xgettext:no-c-format
+_("Seek 5% Forward");
+// xgettext:no-c-format
+_("Seek 5% Backward");
+// xgettext:no-c-format
+_("Volume Up");
+// xgettext:no-c-format
+_("Volume Down");
+// xgettext:no-c-format
+_("Toggle Stop After Current Track");
+// xgettext:no-c-format
+_("Toggle Stop After Current Album");
+// plugins/lastfm/lastfm.c
+// xgettext:no-c-format
+_("Lookup on Last.fm");
+// xgettext:no-c-format
+_("Enable scrobbler");
+// xgettext:no-c-format
+_("Disable nowplaying");
+// xgettext:no-c-format
+_("Username");
+// xgettext:no-c-format
+_("Password");
+// xgettext:no-c-format
+_("Scrobble URL");
+// xgettext:no-c-format
+_("Prefer Album Artist over Artist field");
+// xgettext:no-c-format
+_("Send MusicBrainz ID");
+// xgettext:no-c-format
+_("Submit tracks shorter than 30 seconds (not recommended)");
+// plugins/mono2stereo/mono2stereo.c
+// xgettext:no-c-format
+_("Left mix");
+// xgettext:no-c-format
+_("Right mix");
+// plugins/mp3/mp3.c
+// xgettext:no-c-format
+_("Force 16 bit output");
+// xgettext:no-c-format
+_("Backend");
+// plugins/notify/notify.c
+// xgettext:no-c-format
+_("Enable");
+// xgettext:no-c-format
+_("Notification title format");
+// xgettext:no-c-format
+_("Notification content format");
+// xgettext:no-c-format
+_("Show album art");
+// xgettext:no-c-format
+_("Album art size (px)");
+// xgettext:no-c-format
+_("Don't reuse notifications (KDE quirk)");
+// plugins/oss/oss.c
+// xgettext:no-c-format
+_("Device file");
+// plugins/pltbrowser/pltbrowser.c
+// xgettext:no-c-format
+_("Close playlists with middle mouse button");
+// xgettext:no-c-format
+_("Highlight current playlist");
+// xgettext:no-c-format
+_("Play on double-click");
+// plugins/portaudio/portaudio.c
+// xgettext:no-c-format
+_("Buffer size (-1 to use optimal value chosen by portaudio)");
+// xgettext:no-c-format
+_("Device name encoding");
+// xgettext:no-c-format
+_("ASCII / UTF-8");
+// xgettext:no-c-format
+_("cp1250");
+// xgettext:no-c-format
+_("Defined below");
+// xgettext:no-c-format
+_("Custom device name encoding");
+// plugins/pulse/pulse.c
+// xgettext:no-c-format
+_("PulseAudio server (leave empty for default)");
+// plugins/sc68/in_sc68.c
+// xgettext:no-c-format
+_("Default song length (in minutes)");
+// xgettext:no-c-format
+_("Samplerate");
+// xgettext:no-c-format
+_("Skip when shorter than (sec)");
+// plugins/shellexecui/shellexecui.c
+// xgettext:no-c-format
+_("Configure Custom Shell Commands");
+// plugins/shn/shn.c
+// xgettext:no-c-format
+_("Relative seek table path");
+// xgettext:no-c-format
+_("Absolute seek table path");
+// xgettext:no-c-format
+_("Swap audio bytes (toggle if all you hear is static)");
+// plugins/sid/plugin.c
+// xgettext:no-c-format
+_("Enable HVSC Songlength DB");
+// xgettext:no-c-format
+_("Full path to Songlengths.md5/.txt");
+// xgettext:no-c-format
+_("Bits per sample");
+// xgettext:no-c-format
+_("Default song length (sec)");
+// xgettext:no-c-format
+_("Mono synth");
+// plugins/sndfile/sndfile.c
+// xgettext:no-c-format
+_("Enable logging");
+// plugins/supereq/supereq.c
+// xgettext:no-c-format
+_("Preamp");
+// xgettext:no-c-format
+_("1.2K");
+// xgettext:no-c-format
+_("1.8K");
+// xgettext:no-c-format
+_("2.5K");
+// xgettext:no-c-format
+_("3.5K");
+// xgettext:no-c-format
+_("5K");
+// xgettext:no-c-format
+_("7K");
+// xgettext:no-c-format
+_("10K");
+// xgettext:no-c-format
+_("14K");
+// xgettext:no-c-format
+_("20K");
+// plugins/wildmidi/wildmidiplug.c
+// xgettext:no-c-format
+_("Timidity++ bank configuration file");
+// src/scriptable/scriptable_encoder.c
+// xgettext:no-c-format
+_("File extension");
+// xgettext:no-c-format
+_("Encoder command line");
+// xgettext:no-c-format
+_("Data transfer method");
+// xgettext:no-c-format
+_("Pipe (stdin)");
+// xgettext:no-c-format
+_("Temporary file");
+// xgettext:no-c-format
+_("Source file");
+// xgettext:no-c-format
+_("ID3v2 version");
+// xgettext:no-c-format
+_("Write ID3v2 tag");
+// xgettext:no-c-format
+_("Write ID3v1 tag");
+// xgettext:no-c-format
+_("Write APEv2 tag");
+// xgettext:no-c-format
+_("Write FLAC tag");
+// xgettext:no-c-format
+_("Write OggVorbis tag");
+// xgettext:no-c-format
+_("Write MP4 tag");

deadbeef-0.6.2.tar.bz2/translators.txt -> deadbeef-1.9.6.tar.bz2/translators.txt Changed

@@ -49,6 +49,7 @@
 Juhani <juhaninumminen0@gmail.com>
 
 French
+ Charles Monzat <c.monzat@laposte.net>
 Cilyan Olowen <gaknar@gmail.com>
 
 Gallegan
@@ -71,6 +72,9 @@
 
 Kazakh
 Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+ 
+Korean
+ Junghee Lee <daemul72@gmail.com>
 
 Central Khmer
 SatyaN <satyathavy@gmail.com>
@@ -82,9 +86,6 @@
 Algimantas Margevičius <margevicius.algimantas@gmail.com>
 Julius <zadintuvas@gmail.com>
 
-Bokmal, Norwegian
- Sam <wilsonsamm@hotmail.com>
-
 Dutch
 depaz <depazzz@gmail.com>
 
@@ -102,11 +103,6 @@
 Romanian
 Mișu Moldovan <dumol@xfce.org>
 
-Russian
- Alexey Yakovenko <wakeroid@gmail.com>
- Andrei Stepanov
- Dmitriy Simbiriatin <slpiv@mail.ru>
-
 Sinhala
 amscata <amith@compsoc.lk>
 
@@ -124,6 +120,7 @@
 
 Swedish
 Martin <brother@bsnet.se>
+ Jonatan Nyberg
 
 Telugu
 PraveenIlla <mail2ipn@gmail.com>
@@ -136,6 +133,7 @@
 
 Ukrainian
 Yarema aka Knedlyk <yupadmin@gmail.com>
+ Oleksiy Yakovenko <waker@users.sf.net>
 
 Vietnamese
 Tran Duy Hung <nguyentieuhau@gmail.com>

deadbeef.appdata.xml Added

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id type="desktop">deadbeef.desktop</id>
+ <project_license>Zlib and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause</project_license>
+ <metadata_license>CC0-1.0</metadata_license>
+ <name>DeaDBeeF Player</name>
+ <summary>The Ultimate Music Player</summary>
+ <description>
+ 
+ DeaDBeeF (as in 0xDEADBEEF) is an audio player with the following main
+ features.
+ 
+ <ul>
+ <li>mp3, ogg vorbis, flac, ape, wv/iso.wv, wav, m4a/mp3 (aac and alac),
+ mpc, tta, cd audio, and many more</li>
+ <li>nsf, ay, vtx, vgm/vgz, spc and many other popular chiptune formats</li>
+ <li>SID with HVSC song length database support for sid</li>
+ <li>tracker modules - mod, s3m, it, xm, etc</li>
+ <li>ID3v1, ID3v2.2, ID3v2.3, ID3v2.4, APEv2, Xing/Info, VorbisComments
+ tag reading and writing, as well as reading many other tag/metadata
+ formats in most supported formats</li>
+ <li>automatic character set detection for non-unicode id3 tags -
+ supports cp1251, iso8859-1, and now chinese cp936 (optional), as
+ well as SHIFT-JIS and MS-DOS CP866 for selected formats</li>
+ <li>unicode tags are fully supported as well (both utf8 and ucs2)</li>
+ <li>cuesheet (.cue files) support, including charset
+ detection/conversion</li>
+ <li>minimisation to system tray, with scrollwheel volume control,
+ etc</li>
+ <li>drag and drop, both in playlist, and from other applications</li>
+ <li>control playback from command line</li>
+ <li>global hotkeys</li>
+ <li>multiple playlists using tabbed interface</li>
+ <li>album cover display</li>
+ <li>OSD notifications about current playing songs</li>
+ <li>18-band graphical equaliser and other DSP plugins</li>
+ <li>built-in high quality tag editor, with custom fields support</li>
+ <li>customizable groups in playlists</li>
+ <li>customizable columns with flexible title formatting</li>
+ <li>streaming radio support for ogg vorbis, mp3 and aac streams</li>
+ <li>gapless playback for correctly encoded files</li>
+ <li>lots of plugin, such as global hotkeys, last.fm scrobbler,
+ converter, and many more, sdk is included</li>
+ <li>comes with advanced Converter plugin, which allows to transcode
+ files to other formats</li>
+ </ul>
+ </description>
+ <releases>
+ <release version="1.8.4" date="2020-06-28">
+ <description>
+ 
+ <li>Soundtouch plugin has been updated, and is now included in the releases</li>
+ <li>Added %last_modified% title formatting keyword (Cristian Ciocaltea)</li>
+ <li>Fixed stack overflow bug in converter</li>
+ <li>Fixed buffer overflow bug in mp3 parser</li>
+ <li>Fixed handling of leading forward shash character in zipper file names</li>
+ <li>Fixed handling user-specified file mask in artwork plugin</li>
+ <li>Fixed CBR MP3 scanning performance</li>
+ <li>Fixed stack overflow in title formatting tint range calculation</li>
+ <li>Fixed pulseaudio plugin configuration backwards compatibility issue</li>
+ <li>Fixed last.fm scrobbling of streaming shoutcast tracks</li>
+ <li>Fixed deadlock when loading cuesheets which recursively reference themselves</li>
+ <li>Fixed a false-positive when detecting free format MP3 files</li>
+ <li>Fixed skipping unsupported fields in cuesheets</li>
+ <li>Fixed a regression which caused MP3 tag editing to crash when text can't be represented as CP1252</li>
+ <li>Fixed playback of certain network streams</li>
+ <li>Fixed handling of ID3v2 COMM frame content description data</li>
+ 
+ </description>
+ </release>
+ </releases>
+ <developer_name>
+ <li>Alexey Yakovenko <waker@users.sourceforge.net></li>
+ <li>Viktor Semykin <thesame.ml@gmail.com></li>
+ <li>and many others, please see about.txt</li>
+ </developer_name>
+ <screenshots>
+ <screenshot type="default">
+ <image>http://deadbeef.sf.net/screenshots/0.6/01.png</image>
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://deadbeef.sf.net/</url>
+</component>